From cb50d7fbe9ca68d0a6c5fa3953ecc2b5f9875922 Mon Sep 17 00:00:00 2001
From: Luohao Wang <luohaothu@live.com>
Date: Sat, 31 May 2025 17:49:14 +0800
Subject: [PATCH 01/31] [Doc] Adds Chinese README translation and updates links

---
 README.md    |  4 +---
 README_zh.md | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 3 deletions(-)
 create mode 100644 README_zh.md

diff --git a/README.md b/README.md
index c8a20247..12bcbb11 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,11 @@
 <div align="center">
   <img width="800px" src="doc/assets/opflow_banner_slice.png" alt="OpFlow banner">
-  <h3> <a href="https://opflow.cc/"> HomePage </a> | <a href="https://opflow.cc/doc"> Document </a> </h3>
+  <h3> <a href="https://opflow.cc/"> HomePage </a> | <a href="https://opflow.cc/doc"> Document </a> | <a href="README_zh.md"> 中文介绍 </a> </h3>
 </div>
 
 [![Latest Release](https://img.shields.io/github/v/release/OpFlow-dev/OpFlow?color=blue&label=Latest%20Release)](https://github.com/OpFlow-dev/OpFlow/releases/latest)
 [![License](https://img.shields.io/badge/license-MPL--2.0-blue)](https://github.com/OpFlow-dev/OpFlow/blob/master/LICENSE)
 [![Downloads](https://img.shields.io/github/downloads/OpFlow-dev/OpFlow/total?color=blue&label=Downloads)](https://github.com/OpFlow-dev/OpFlow/releases/latest)
-[![Format](https://img.shields.io/github/actions/workflow/status/OpFlow-dev/OpFlow/AutoFormat.yml?branch=master?color=green&label=Format)](https://github.com/OpFlow-dev/OpFlow/actions/workflows/AutoFormat.yml)
-[![Build](https://img.shields.io/github/actions/workflow/status/OpFlow-dev/OpFlow/Build.yml?branch=master?color=green&label=Build)](https://github.com/OpFlow-dev/OpFlow/actions/workflows/Build.yml)
 
 ## Overview
 
diff --git a/README_zh.md b/README_zh.md
new file mode 100644
index 00000000..7b3f1501
--- /dev/null
+++ b/README_zh.md
@@ -0,0 +1,56 @@
+<div align="center">
+  <img width="800px" src="doc/assets/opflow_banner_slice.png" alt="OpFlow banner">
+  <h3> <a href="https://opflow.cc/"> 主页 </a> | <a href="https://opflow.cc/doc"> 文档 </a> | <a href="README.md"> English </a> </h3>
+</div>
+
+[![最新版本](https://img.shields.io/github/v/release/OpFlow-dev/OpFlow?color=blue&label=Latest%20Release)](https://github.com/OpFlow-dev/OpFlow/releases/latest)
+[![许可证](https://img.shields.io/badge/license-MPL--2.0-blue)](https://github.com/OpFlow-dev/OpFlow/blob/master/LICENSE)
+[![下载次数](https://img.shields.io/github/downloads/OpFlow-dev/OpFlow/total?color=blue&label=Downloads)](https://github.com/OpFlow-dev/OpFlow/releases/latest)
+
+## 概述
+
+**OpFlow** (运筹) 是一个面向偏微分方程(PDE)求解器开发的嵌入式领域特定语言(EDSL)。它深度应用现代C++元编程技术，提供富有表现力的前端接口。通过**表达式模板**和**模板元编程**技术，OpFlow支持**显式**表达式求值与**隐式**线性系统求解。通过解耦表达式、算子及求值引擎的实现，OpFlow实现了算法、数据结构与执行调度的完全分离。其核心优势包括：
+
+- **完全静态**：关键路径零动态调度开销
+- **零成本抽象**：所有操作在编译期明确定义并强制内联
+- **自动并行化**：基于用户定义策略自动并行化表达式分区与求值
+- **隐式方程求解**：支持任意定义良好的隐式方程求解
+- **仅头文件 & 原生C++嵌入**：纯头文件实现，与C++生态无缝集成
+- **数学化API设计**：前端接口高度贴近数学表示法，最小化语言噪声
+- **精准抽象层级**：在避免底层编码的同时，保持所有转换操作在前端可见，离散化过程直观透明
+
+## 示例
+[<img src="doc/03_Examples/assets/weno.gif" height="192px">](examples/CONV1D/CONV1D.cpp)
+[<img src="doc/03_Examples/assets/heattransfer.gif" height="192px">](examples/FTCS2D/FTCS-OMP.cpp)
+[<img src="doc/03_Examples/assets/liddriven.gif" height="192px">](examples/LidDriven/LidDriven2D.cpp)
+[<img src="doc/03_Examples/assets/amrls.gif" height="192px">](examples/LevelSet/AMRLS.cpp)
+
+## 快速开始
+
+0. 安装依赖：
+
+- Linux：（以Ubuntu为例）
+```bash
+sudo apt install -y gcc-10 g++-10
+```
+- macOS：（使用Homebrew）
+```bash
+brew install gcc
+```
+1. 配置项目：
+```bash
+mkdir build && cd build && cmake -DCMAKE_C_COMPILER=gcc-10 -DCMAKE_CXX_COMPILER=g++-10 -DOPFLOW_BUILD_EXAMPLES=ON ..
+```
+2. 构建与运行：
+```bash
+cmake --build . -t CONV1D && ./examples/CONV1D/CONV1D
+```
+
+## 安装
+
+完整安装指南请参阅文档。
+
+## 致谢
+特别感谢JetBrains提供免费的[开源开发许可证](https://jb.gg/OpenSourceSupport)支持OpFlow开发。CLion是优秀的跨平台C/C++ IDE，强烈推荐用于OpFlow开发。
+
+<img src="https://resources.jetbrains.com/storage/products/company/brand/logos/jb_beam.png" alt="JetBrains Logo (Main) logo." height="192px">

From 1004c613d2fc27af01ee080ad50ea8d82e92fa16 Mon Sep 17 00:00:00 2001
From: Luohao Wang <luohaothu@live.com>
Date: Sat, 31 May 2025 18:04:15 +0800
Subject: [PATCH 02/31] [Core] Remove dependence on fmtlib

---
 CMakeLists.txt | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e766ec80..d80e6e8e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -184,20 +184,6 @@ if (NOT c++20support)
 endif ()
 target_compile_options(opflow INTERFACE -std=c++20)
 
-# ----------------------------------------------------------------------------
-# Use fmt package
-# ----------------------------------------------------------------------------
-if (OPFLOW_INSTALL)
-    # Build, install & link to the installed libfmt
-    include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/FMTConfig.cmake)
-    CONFIG_AND_INSTALL_FMT()
-    find_package(fmt REQUIRED PATHS ${CMAKE_INSTALL_PREFIX} NO_DEFAULT_PATH)
-else ()
-    # Add the bundled fmt library as a subproject
-    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/external/fmt EXCLUDE_FROM_ALL)
-endif ()
-target_link_libraries(opflow INTERFACE fmt::fmt)
-
 # ----------------------------------------------------------------------------
 # Use spdlog package
 # ----------------------------------------------------------------------------
@@ -207,7 +193,6 @@ if (OPFLOW_INSTALL)
     CONFIG_AND_INSTALL_SPDLOG()
     find_package(spdlog REQUIRED PATHS ${CMAKE_INSTALL_PREFIX} NO_DEFAULT_PATH)
 else ()
-    set(SPDLOG_FMT_EXTERNAL ON)
     add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/external/spdlog EXCLUDE_FROM_ALL)
 endif ()
 target_link_libraries(opflow INTERFACE spdlog::spdlog)

From f553771babcf217580e701a3f99dda2775b2a632 Mon Sep 17 00:00:00 2001
From: Luohao Wang <luohaothu@live.com>
Date: Sat, 31 May 2025 18:04:33 +0800
Subject: [PATCH 03/31] [Ext] Update HYPRE to v2.33.0

---
 .gitignore                                    |     3 +-
 cmake/HYPREConfig.cmake                       |     8 +-
 external/hypre/.gitignore                     |    74 +
 external/hypre/.readthedocs.yml               |    29 +
 external/hypre/AUTOTEST/README.txt            |    96 +-
 external/hypre/AUTOTEST/basic.sh              |     4 +-
 external/hypre/AUTOTEST/check-case.sh         |     4 +-
 external/hypre/AUTOTEST/check-double.sh       |     7 +-
 external/hypre/AUTOTEST/check-glob-symb.sh    |     4 +-
 external/hypre/AUTOTEST/check-headers.filters |     1 +
 external/hypre/AUTOTEST/check-headers.sh      |     4 +-
 external/hypre/AUTOTEST/check-int.filters     |     4 +-
 external/hypre/AUTOTEST/check-int.sh          |     5 +-
 external/hypre/AUTOTEST/check-license.filters |     3 +-
 external/hypre/AUTOTEST/check-license.sh      |    12 +-
 external/hypre/AUTOTEST/check-mem.sh          |    10 +-
 external/hypre/AUTOTEST/check-mpi.sh          |     5 +-
 external/hypre/AUTOTEST/cleantest.sh          |     4 +-
 external/hypre/AUTOTEST/cmake.bat             |     2 +-
 external/hypre/AUTOTEST/cmake.filters         |     3 +
 external/hypre/AUTOTEST/cmake.sh              |    54 +-
 external/hypre/AUTOTEST/configure.filters     |     2 +
 external/hypre/AUTOTEST/configure.sh          |     4 +-
 external/hypre/AUTOTEST/docs.sh               |     4 +-
 external/hypre/AUTOTEST/examples.sh           |     6 +-
 external/hypre/AUTOTEST/klocwork.sh           |     4 +-
 external/hypre/AUTOTEST/link.sh               |     4 +-
 external/hypre/AUTOTEST/machine-aurora.sh     |   101 +
 .../hypre/AUTOTEST/machine-lassen-cuda.sh     |   148 +
 .../hypre/AUTOTEST/machine-lassen-exlibs.sh   |    92 +
 external/hypre/AUTOTEST/machine-lassen.sh     |   108 +-
 external/hypre/AUTOTEST/machine-mac.sh        |    38 +-
 external/hypre/AUTOTEST/machine-ray.sh        |   118 -
 ...{machine-rztopaz.sh => machine-rzhound.sh} |     8 +-
 external/hypre/AUTOTEST/machine-syrah.sh      |     4 +-
 external/hypre/AUTOTEST/machine-tioga.sh      |   100 +
 .../hypre/AUTOTEST/machine-tux-compilers.sh   |     4 +-
 external/hypre/AUTOTEST/machine-tux-exlibs.sh |     4 +-
 external/hypre/AUTOTEST/machine-tux-spack.sh  |    18 +-
 external/hypre/AUTOTEST/machine-tux.sh        |    23 +-
 external/hypre/AUTOTEST/machine-vs-pro.bat    |     2 +-
 external/hypre/AUTOTEST/make.sh               |     4 +-
 external/hypre/AUTOTEST/renametest.sh         |     4 +-
 external/hypre/AUTOTEST/run.sh                |     4 +-
 external/hypre/AUTOTEST/runtests-error        |     1 +
 external/hypre/AUTOTEST/runtests-gpumemcheck  |     2 +
 external/hypre/AUTOTEST/runtests-ij-gpu       |     3 +-
 external/hypre/AUTOTEST/runtests-ij-noilu     |     3 +
 external/hypre/AUTOTEST/runtests-struct       |     3 +-
 external/hypre/AUTOTEST/test.sh               |     4 +-
 external/hypre/CHANGELOG                      |   145 +-
 external/hypre/INSTALL.md                     |    22 +-
 external/hypre/LICENSE-MIT                    |     2 +-
 external/hypre/README.md                      |    10 +-
 external/hypre/SUPPORT.md                     |     7 +-
 external/hypre/src/CMakeLists.txt             |   754 +-
 external/hypre/src/FEI_mv/CMakeLists.txt      |     8 +-
 external/hypre/src/FEI_mv/fei-hypre/CHANGELOG |     2 +-
 .../hypre/src/FEI_mv/fei-hypre/CMakeLists.txt |     8 +-
 .../src/FEI_mv/fei-hypre/FEI_HYPRE_Impl.cxx   |     2 +-
 .../src/FEI_mv/fei-hypre/FEI_HYPRE_Impl.h     |     2 +-
 .../src/FEI_mv/fei-hypre/FEI_HYPRE_include.h  |     2 +-
 .../src/FEI_mv/fei-hypre/HYPRE_Builder.h      |     2 +-
 .../hypre/src/FEI_mv/fei-hypre/HYPRE_FEI.doc  |     4 +-
 .../hypre/src/FEI_mv/fei-hypre/HYPRE_FEI.h    |     2 +-
 .../src/FEI_mv/fei-hypre/HYPRE_FEI_includes.h |     2 +-
 .../src/FEI_mv/fei-hypre/HYPRE_LSC_aux.cxx    |     2 +-
 .../src/FEI_mv/fei-hypre/HYPRE_LSI_Dsuperlu.c |   260 +-
 .../src/FEI_mv/fei-hypre/HYPRE_LSI_Dsuperlu.h |     2 +-
 .../src/FEI_mv/fei-hypre/HYPRE_LSI_UZAWA.cxx  |     2 +-
 .../src/FEI_mv/fei-hypre/HYPRE_LSI_UZAWA.h    |     2 +-
 .../src/FEI_mv/fei-hypre/HYPRE_LSI_Uzawa_c.h  |     2 +-
 .../FEI_mv/fei-hypre/HYPRE_LSI_blkprec.cxx    |     2 +-
 .../src/FEI_mv/fei-hypre/HYPRE_LSI_blkprec.h  |     2 +-
 .../src/FEI_mv/fei-hypre/HYPRE_LSI_block.h    |     2 +-
 .../src/FEI_mv/fei-hypre/HYPRE_LSI_ddict.c    |     2 +-
 .../src/FEI_mv/fei-hypre/HYPRE_LSI_ddict.h    |     2 +-
 .../src/FEI_mv/fei-hypre/HYPRE_LSI_ddilut.c   |     2 +-
 .../src/FEI_mv/fei-hypre/HYPRE_LSI_ddilut.h   |     2 +-
 .../hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_ml.c |     2 +-
 .../src/FEI_mv/fei-hypre/HYPRE_LSI_mli.cxx    |     2 +-
 .../src/FEI_mv/fei-hypre/HYPRE_LSI_mli.h      |     2 +-
 .../FEI_mv/fei-hypre/HYPRE_LSI_mlmaxwell.c    |     2 +-
 .../src/FEI_mv/fei-hypre/HYPRE_LSI_poly.c     |     2 +-
 .../src/FEI_mv/fei-hypre/HYPRE_LSI_poly.h     |     2 +-
 .../src/FEI_mv/fei-hypre/HYPRE_LSI_schur.cxx  |     2 +-
 .../src/FEI_mv/fei-hypre/HYPRE_LSI_schur.h    |     2 +-
 .../src/FEI_mv/fei-hypre/HYPRE_LSI_schwarz.c  |     2 +-
 .../src/FEI_mv/fei-hypre/HYPRE_LSI_schwarz.h  |     2 +-
 .../src/FEI_mv/fei-hypre/HYPRE_LinSysCore.cxx |     3 +-
 .../src/FEI_mv/fei-hypre/HYPRE_LinSysCore.h   |     2 +-
 .../src/FEI_mv/fei-hypre/HYPRE_MHMatrix.h     |     2 +-
 .../src/FEI_mv/fei-hypre/HYPRE_MLMatrix.h     |     2 +-
 .../src/FEI_mv/fei-hypre/HYPRE_MLMaxwell.h    |     2 +-
 .../FEI_mv/fei-hypre/HYPRE_SlideReduction.cxx |     2 +-
 .../FEI_mv/fei-hypre/HYPRE_SlideReduction.h   |     2 +-
 .../src/FEI_mv/fei-hypre/HYPRE_fei_matrix.cxx |     2 +-
 .../src/FEI_mv/fei-hypre/HYPRE_fei_mesh.cxx   |     2 +-
 .../hypre/src/FEI_mv/fei-hypre/HYPRE_fei_mv.h |     2 +-
 .../src/FEI_mv/fei-hypre/HYPRE_fei_vector.cxx |     2 +-
 .../src/FEI_mv/fei-hypre/HYPRE_parcsr_TFQmr.c |     2 +-
 .../src/FEI_mv/fei-hypre/HYPRE_parcsr_TFQmr.h |     2 +-
 .../src/FEI_mv/fei-hypre/HYPRE_parcsr_bicgs.c |     2 +-
 .../src/FEI_mv/fei-hypre/HYPRE_parcsr_bicgs.h |     2 +-
 .../FEI_mv/fei-hypre/HYPRE_parcsr_bicgstabl.c |     2 +-
 .../FEI_mv/fei-hypre/HYPRE_parcsr_bicgstabl.h |     2 +-
 .../FEI_mv/fei-hypre/HYPRE_parcsr_fgmres.c    |     2 +-
 .../FEI_mv/fei-hypre/HYPRE_parcsr_fgmres.h    |     2 +-
 .../src/FEI_mv/fei-hypre/HYPRE_parcsr_lsicg.c |     2 +-
 .../src/FEI_mv/fei-hypre/HYPRE_parcsr_lsicg.h |     2 +-
 .../FEI_mv/fei-hypre/HYPRE_parcsr_maxwell.c   |     2 +-
 .../FEI_mv/fei-hypre/HYPRE_parcsr_superlu.c   |     2 +-
 .../FEI_mv/fei-hypre/HYPRE_parcsr_superlu.h   |     2 +-
 .../FEI_mv/fei-hypre/HYPRE_parcsr_symqmr.c    |     2 +-
 .../FEI_mv/fei-hypre/HYPRE_parcsr_symqmr.h    |     2 +-
 .../hypre/src/FEI_mv/fei-hypre/LLNL_FEI.doc   |     2 +-
 .../src/FEI_mv/fei-hypre/LLNL_FEI_Fei.cxx     |     2 +-
 .../hypre/src/FEI_mv/fei-hypre/LLNL_FEI_Fei.h |     2 +-
 .../src/FEI_mv/fei-hypre/LLNL_FEI_Impl.cxx    |     2 +-
 .../src/FEI_mv/fei-hypre/LLNL_FEI_Impl.h      |     2 +-
 .../src/FEI_mv/fei-hypre/LLNL_FEI_LSCore.cxx  |     2 +-
 .../src/FEI_mv/fei-hypre/LLNL_FEI_LSCore.h    |     2 +-
 .../src/FEI_mv/fei-hypre/LLNL_FEI_Matrix.cxx  |     2 +-
 .../src/FEI_mv/fei-hypre/LLNL_FEI_Matrix.h    |     2 +-
 .../src/FEI_mv/fei-hypre/LLNL_FEI_Solver.cxx  |     2 +-
 .../src/FEI_mv/fei-hypre/LLNL_FEI_Solver.h    |     2 +-
 external/hypre/src/FEI_mv/fei-hypre/SymQMR.c  |     2 +-
 external/hypre/src/FEI_mv/fei-hypre/TFQmr.c   |     2 +-
 .../hypre/src/FEI_mv/fei-hypre/_hypre_FEI.h   |     2 +-
 external/hypre/src/FEI_mv/fei-hypre/bicgs.c   |     2 +-
 .../hypre/src/FEI_mv/fei-hypre/bicgstabl.c    |     2 +-
 .../hypre/src/FEI_mv/fei-hypre/cfei-hypre.h   |     2 +-
 .../hypre/src/FEI_mv/fei-hypre/cfei_hypre.cxx |     2 +-
 .../hypre/src/FEI_mv/fei-hypre/cfei_hypre.h   |     2 +-
 external/hypre/src/FEI_mv/fei-hypre/driver.C  |     2 +-
 .../hypre/src/FEI_mv/fei-hypre/driver.cxx     |     2 +-
 external/hypre/src/FEI_mv/fei-hypre/fei_mv.h  |     2 +-
 external/hypre/src/FEI_mv/fei-hypre/fgmres.c  |     2 +-
 .../hypre/src/FEI_mv/fei-hypre/hypre_cfei.cxx |     2 +-
 .../hypre/src/FEI_mv/fei-hypre/hypre_cfei.h   |     2 +-
 .../src/FEI_mv/fei-hypre/hypre_lsi_amge.c     |     2 +-
 .../src/FEI_mv/fei-hypre/hypre_lsi_ddamg.c    |     2 +-
 .../src/FEI_mv/fei-hypre/hypre_lsi_misc.c     |     2 +-
 .../FEI_mv/fei-hypre/hypre_schur_reduce.cxx   |     2 +-
 .../FEI_mv/fei-hypre/hypre_slide_reduce.cxx   |     2 +-
 external/hypre/src/FEI_mv/fei-hypre/lsicg.c   |     2 +-
 .../hypre/src/FEI_mv/fei-hypre/ml_maxwell.cxx |     2 +-
 .../hypre/src/FEI_mv/femli/CMakeLists.txt     |     2 +-
 external/hypre/src/FEI_mv/femli/Usage_amgs    |     2 +-
 external/hypre/src/FEI_mv/femli/Usage_solver  |     2 +-
 external/hypre/src/FEI_mv/femli/cmli.cxx      |     2 +-
 external/hypre/src/FEI_mv/femli/cmli.h        |     2 +-
 .../hypre/src/FEI_mv/femli/driver_fedata.cxx  |     2 +-
 .../hypre/src/FEI_mv/femli/driver_matrix.cxx  |     2 +-
 external/hypre/src/FEI_mv/femli/driver_util.c |     2 +-
 external/hypre/src/FEI_mv/femli/genTecPlot.c  |     2 +-
 external/hypre/src/FEI_mv/femli/mli.cxx       |     2 +-
 external/hypre/src/FEI_mv/femli/mli.h         |     2 +-
 .../src/FEI_mv/femli/mli_amgsa_calib.cxx      |     2 +-
 .../src/FEI_mv/femli/mli_amgsa_coarsen1.cxx   |     2 +-
 .../src/FEI_mv/femli/mli_amgsa_dd_fedata.cxx  |     2 +-
 .../src/FEI_mv/femli/mli_amgsa_dd_sfei.cxx    |     2 +-
 .../hypre/src/FEI_mv/femli/mli_amgsa_elem.cxx |     2 +-
 external/hypre/src/FEI_mv/femli/mli_defs.h    |     2 +-
 .../hypre/src/FEI_mv/femli/mli_febase.cxx     |     2 +-
 external/hypre/src/FEI_mv/femli/mli_febase.h  |     2 +-
 .../hypre/src/FEI_mv/femli/mli_fedata.cxx     |     2 +-
 external/hypre/src/FEI_mv/femli/mli_fedata.h  |     2 +-
 .../src/FEI_mv/femli/mli_fedata_utils.cxx     |     2 +-
 .../hypre/src/FEI_mv/femli/mli_fedata_utils.h |     2 +-
 .../hypre/src/FEI_mv/femli/mli_festruct.h     |     2 +-
 .../hypre/src/FEI_mv/femli/mli_mapper.cxx     |     2 +-
 external/hypre/src/FEI_mv/femli/mli_mapper.h  |     2 +-
 .../hypre/src/FEI_mv/femli/mli_matrix.cxx     |     2 +-
 external/hypre/src/FEI_mv/femli/mli_matrix.h  |     2 +-
 .../hypre/src/FEI_mv/femli/mli_matrix_misc.h  |     2 +-
 .../src/FEI_mv/femli/mli_matrix_mult.cxx      |     2 +-
 .../src/FEI_mv/femli/mli_matrix_utils.cxx     |     2 +-
 .../hypre/src/FEI_mv/femli/mli_method.cxx     |     2 +-
 external/hypre/src/FEI_mv/femli/mli_method.h  |     2 +-
 .../src/FEI_mv/femli/mli_method_amgcr.cxx     |     2 +-
 .../hypre/src/FEI_mv/femli/mli_method_amgcr.h |     2 +-
 .../src/FEI_mv/femli/mli_method_amgrs.cxx     |     2 +-
 .../hypre/src/FEI_mv/femli/mli_method_amgrs.h |     2 +-
 .../src/FEI_mv/femli/mli_method_amgsa.cxx     |     2 +-
 .../hypre/src/FEI_mv/femli/mli_method_amgsa.h |     2 +-
 external/hypre/src/FEI_mv/femli/mli_olapdd.c  |     2 +-
 .../hypre/src/FEI_mv/femli/mli_oneLevel.cxx   |     2 +-
 .../hypre/src/FEI_mv/femli/mli_oneLevel.h     |     2 +-
 external/hypre/src/FEI_mv/femli/mli_sfei.cxx  |     2 +-
 external/hypre/src/FEI_mv/femli/mli_sfei.h    |     2 +-
 .../hypre/src/FEI_mv/femli/mli_solver.cxx     |     2 +-
 external/hypre/src/FEI_mv/femli/mli_solver.h  |     2 +-
 .../hypre/src/FEI_mv/femli/mli_solver_amg.cxx |     2 +-
 .../hypre/src/FEI_mv/femli/mli_solver_amg.h   |     2 +-
 .../FEI_mv/femli/mli_solver_arpacksuperlu.cxx |     2 +-
 .../FEI_mv/femli/mli_solver_arpacksuperlu.h   |     2 +-
 .../src/FEI_mv/femli/mli_solver_bjacobi.cxx   |     2 +-
 .../src/FEI_mv/femli/mli_solver_bjacobi.h     |     2 +-
 .../src/FEI_mv/femli/mli_solver_bsgs.cxx      |     2 +-
 .../hypre/src/FEI_mv/femli/mli_solver_bsgs.h  |     2 +-
 .../hypre/src/FEI_mv/femli/mli_solver_cg.cxx  |     2 +-
 .../hypre/src/FEI_mv/femli/mli_solver_cg.h    |     2 +-
 .../src/FEI_mv/femli/mli_solver_chebyshev.cxx |     2 +-
 .../src/FEI_mv/femli/mli_solver_chebyshev.h   |     2 +-
 .../src/FEI_mv/femli/mli_solver_gmres.cxx     |     2 +-
 .../hypre/src/FEI_mv/femli/mli_solver_gmres.h |     2 +-
 .../hypre/src/FEI_mv/femli/mli_solver_gs.cxx  |     2 +-
 .../hypre/src/FEI_mv/femli/mli_solver_gs.h    |     2 +-
 .../src/FEI_mv/femli/mli_solver_hschwarz.cxx  |     2 +-
 .../src/FEI_mv/femli/mli_solver_hschwarz.h    |     2 +-
 .../src/FEI_mv/femli/mli_solver_hsgs.cxx      |     2 +-
 .../hypre/src/FEI_mv/femli/mli_solver_hsgs.h  |     2 +-
 .../src/FEI_mv/femli/mli_solver_jacobi.cxx    |     2 +-
 .../src/FEI_mv/femli/mli_solver_jacobi.h      |     2 +-
 .../src/FEI_mv/femli/mli_solver_kaczmarz.cxx  |     2 +-
 .../src/FEI_mv/femli/mli_solver_kaczmarz.h    |     2 +-
 .../hypre/src/FEI_mv/femli/mli_solver_mli.cxx |     2 +-
 .../hypre/src/FEI_mv/femli/mli_solver_mli.h   |     2 +-
 .../hypre/src/FEI_mv/femli/mli_solver_mls.cxx |     2 +-
 .../hypre/src/FEI_mv/femli/mli_solver_mls.h   |     2 +-
 .../src/FEI_mv/femli/mli_solver_parasails.cxx |     2 +-
 .../src/FEI_mv/femli/mli_solver_parasails.h   |     2 +-
 .../FEI_mv/femli/mli_solver_seqsuperlu.cxx    |     2 +-
 .../src/FEI_mv/femli/mli_solver_seqsuperlu.h  |     2 +-
 .../hypre/src/FEI_mv/femli/mli_solver_sgs.cxx |     2 +-
 .../hypre/src/FEI_mv/femli/mli_solver_sgs.h   |     2 +-
 .../src/FEI_mv/femli/mli_solver_superlu.cxx   |     2 +-
 .../src/FEI_mv/femli/mli_solver_superlu.h     |     2 +-
 external/hypre/src/FEI_mv/femli/mli_utils.c   |     2 +-
 external/hypre/src/FEI_mv/femli/mli_utils.h   |     2 +-
 .../src/FEI_mv/femli/mli_utils_fortran.f      |     2 +-
 .../hypre/src/FEI_mv/femli/mli_vector.cxx     |     2 +-
 external/hypre/src/FEI_mv/femli/mli_vector.h  |     2 +-
 external/hypre/src/HYPRE.h                    |     2 +-
 external/hypre/src/HYPREf.h                   |    11 +-
 external/hypre/src/IJ_mv/CMakeLists.txt       |    10 +-
 external/hypre/src/IJ_mv/F90_HYPRE_IJMatrix.c |   360 +-
 external/hypre/src/IJ_mv/F90_HYPRE_IJVector.c |   244 +-
 external/hypre/src/IJ_mv/F90_IJMatrix.c       |    18 +-
 external/hypre/src/IJ_mv/HYPRE_IJMatrix.c     |   554 +-
 external/hypre/src/IJ_mv/HYPRE_IJVector.c     |   379 +-
 external/hypre/src/IJ_mv/HYPRE_IJ_mv.h        |   239 +-
 external/hypre/src/IJ_mv/IJMatrix.c           |   448 +-
 external/hypre/src/IJ_mv/IJMatrix_isis.c      |   706 +-
 external/hypre/src/IJ_mv/IJMatrix_parcsr.c    |  1135 +-
 .../hypre/src/IJ_mv/IJMatrix_parcsr_device.c  |   907 +-
 external/hypre/src/IJ_mv/IJMatrix_petsc.c     |   640 +-
 external/hypre/src/IJ_mv/IJVector.c           |   183 +-
 external/hypre/src/IJ_mv/IJVector_parcsr.c    |   444 +-
 .../hypre/src/IJ_mv/IJVector_parcsr_device.c  |   623 +-
 external/hypre/src/IJ_mv/IJ_assumed_part.c    |    31 +-
 external/hypre/src/IJ_mv/IJ_matrix.h          |     4 +-
 external/hypre/src/IJ_mv/IJ_vector.h          |    16 +-
 external/hypre/src/IJ_mv/_hypre_IJ_mv.h       |   323 +-
 external/hypre/src/IJ_mv/aux_par_vector.c     |    86 +-
 external/hypre/src/IJ_mv/aux_par_vector.h     |     8 +-
 external/hypre/src/IJ_mv/aux_parcsr_matrix.c  |    29 +-
 external/hypre/src/IJ_mv/aux_parcsr_matrix.h  |    14 +-
 external/hypre/src/IJ_mv/headers              |     4 +-
 external/hypre/src/IJ_mv/protos.h             |   281 +-
 external/hypre/src/blas/CMakeLists.txt        |     2 +-
 external/hypre/src/blas/README                |     6 +-
 external/hypre/src/blas/_hypre_blas.h         |    28 +-
 external/hypre/src/blas/dasum.c               |    22 +-
 external/hypre/src/blas/daxpy.c               |    20 +-
 external/hypre/src/blas/dcopy.c               |     2 +-
 external/hypre/src/blas/ddot.c                |     8 +-
 external/hypre/src/blas/dgemm.c               |   336 +-
 external/hypre/src/blas/dgemv.c               |   166 +-
 external/hypre/src/blas/dger.c                |   118 +-
 external/hypre/src/blas/dnrm2.c               |    20 +-
 external/hypre/src/blas/drot.c                |     6 +-
 external/hypre/src/blas/dscal.c               |    20 +-
 external/hypre/src/blas/dswap.c               |    20 +-
 external/hypre/src/blas/dsymm.c               |   216 +-
 external/hypre/src/blas/dsymv.c               |   164 +-
 external/hypre/src/blas/dsyr2.c               |   174 +-
 external/hypre/src/blas/dsyr2k.c              |   220 +-
 external/hypre/src/blas/dsyrk.c               |   300 +-
 external/hypre/src/blas/dtrmm.c               |   184 +-
 external/hypre/src/blas/dtrmv.c               |   150 +-
 external/hypre/src/blas/dtrsm.c               |   272 +-
 external/hypre/src/blas/dtrsv.c               |   168 +-
 external/hypre/src/blas/f2c.h                 |    32 +-
 external/hypre/src/blas/hypre_blas.h          |     2 +-
 external/hypre/src/blas/idamax.c              |    16 +-
 external/hypre/src/blas/xerbla.c              |     6 +-
 external/hypre/src/cmbuild/README.txt         |     1 -
 .../hypre/src/config/HYPREConfig.cmake.in     |   204 +-
 .../hypre/src/config/HYPRE_config.h.cmake.in  |    84 +-
 external/hypre/src/config/HYPRE_config.h.in   |    68 +-
 external/hypre/src/config/Makefile.config.in  |    19 +-
 external/hypre/src/config/astyle-apply.sh     |    79 +
 external/hypre/src/config/astylerc            |    26 +
 .../config/cmake/HYPRE_CMakeUtilities.cmake   |   571 +-
 .../config/cmake/HYPRE_SetupCUDAToolkit.cmake |   316 +-
 .../config/cmake/HYPRE_SetupGPUToolkit.cmake  |    91 +
 .../config/cmake/HYPRE_SetupHIPToolkit.cmake  |   211 +
 .../config/cmake/HYPRE_SetupSYCLToolkit.cmake |   104 +
 external/hypre/src/config/config.guess        |  1660 +-
 external/hypre/src/config/config.sub          |  2676 +-
 external/hypre/src/config/configure.in        |   967 +-
 external/hypre/src/config/githooks/README.md  |    19 +
 external/hypre/src/config/githooks/pre-commit |     9 +
 .../hypre/src/config/hypre_blas_macros.m4     |     2 +-
 .../hypre/src/config/hypre_lapack_macros.m4   |     2 +-
 .../hypre/src/config/hypre_macros_misc.m4     |   120 +-
 external/hypre/src/config/install-sh          |     2 +-
 external/hypre/src/config/mkinstalldirs       |     2 +-
 external/hypre/src/config/update-cmake.py     |   115 +
 external/hypre/src/config/update-cmake.sh     |    19 +
 external/hypre/src/config/update.sh           |     7 +-
 external/hypre/src/config/version.sh          |     8 +-
 external/hypre/src/configure                  |  6795 ++++--
 .../hypre/src/distributed_ls/CMakeLists.txt   |     2 +-
 .../src/distributed_ls/Euclid/CMakeLists.txt  |     2 +-
 .../src/distributed_ls/Euclid/Euclid_apply.c  |     2 +-
 .../src/distributed_ls/Euclid/Euclid_dh.c     |     2 +-
 .../src/distributed_ls/Euclid/Euclid_dh.h     |     2 +-
 .../distributed_ls/Euclid/ExternalRows_dh.c   |    48 +-
 .../distributed_ls/Euclid/ExternalRows_dh.h   |     2 +-
 .../src/distributed_ls/Euclid/Factor_dh.c     |   125 +-
 .../src/distributed_ls/Euclid/Factor_dh.h     |     2 +-
 .../hypre/src/distributed_ls/Euclid/Hash_dh.c |     4 +-
 .../hypre/src/distributed_ls/Euclid/Hash_dh.h |     2 +-
 .../src/distributed_ls/Euclid/Hash_i_dh.c     |     4 +-
 .../src/distributed_ls/Euclid/Hash_i_dh.h     |     2 +-
 .../src/distributed_ls/Euclid/MatGenFD.c      |    84 +-
 .../src/distributed_ls/Euclid/MatGenFD.h      |     2 +-
 .../hypre/src/distributed_ls/Euclid/Mat_dh.c  |   165 +-
 .../hypre/src/distributed_ls/Euclid/Mat_dh.h  |     2 +-
 .../hypre/src/distributed_ls/Euclid/Mem_dh.c  |    16 +-
 .../hypre/src/distributed_ls/Euclid/Mem_dh.h  |     2 +-
 .../src/distributed_ls/Euclid/Numbering_dh.c  |     4 +-
 .../src/distributed_ls/Euclid/Numbering_dh.h  |     2 +-
 .../src/distributed_ls/Euclid/Parser_dh.c     |     4 +-
 .../src/distributed_ls/Euclid/Parser_dh.h     |     2 +-
 .../src/distributed_ls/Euclid/README.hypre    |     2 +-
 .../src/distributed_ls/Euclid/SortedList_dh.c |     4 +-
 .../src/distributed_ls/Euclid/SortedList_dh.h |     2 +-
 .../src/distributed_ls/Euclid/SortedSet_dh.c  |     2 +-
 .../src/distributed_ls/Euclid/SortedSet_dh.h  |     2 +-
 .../distributed_ls/Euclid/SubdomainGraph_dh.c |    20 +-
 .../distributed_ls/Euclid/SubdomainGraph_dh.h |     2 +-
 .../src/distributed_ls/Euclid/TimeLog_dh.c    |     2 +-
 .../src/distributed_ls/Euclid/TimeLog_dh.h    |     2 +-
 .../src/distributed_ls/Euclid/Timer_dh.c      |    20 +-
 .../src/distributed_ls/Euclid/Timer_dh.h      |     2 +-
 .../hypre/src/distributed_ls/Euclid/Vec_dh.c  |    10 +-
 .../hypre/src/distributed_ls/Euclid/Vec_dh.h  |     2 +-
 .../src/distributed_ls/Euclid/_hypre_Euclid.h |    71 +-
 .../hypre/src/distributed_ls/Euclid/blas_dh.c |     4 +-
 .../hypre/src/distributed_ls/Euclid/blas_dh.h |     2 +-
 .../src/distributed_ls/Euclid/euclid_common.h |     8 +-
 .../src/distributed_ls/Euclid/euclid_config.h |     2 +-
 .../src/distributed_ls/Euclid/getRow_dh.c     |    53 +-
 .../src/distributed_ls/Euclid/getRow_dh.h     |     2 +-
 .../src/distributed_ls/Euclid/globalObjects.c |    16 +-
 .../src/distributed_ls/Euclid/guards_dh.h     |     2 +-
 .../hypre/src/distributed_ls/Euclid/headers   |     4 +-
 .../hypre/src/distributed_ls/Euclid/ilu_dh.h  |     2 +-
 .../src/distributed_ls/Euclid/ilu_mpi_bj.c    |    54 +-
 .../src/distributed_ls/Euclid/ilu_mpi_pilu.c  |     4 +-
 .../hypre/src/distributed_ls/Euclid/ilu_seq.c |   134 +-
 .../hypre/src/distributed_ls/Euclid/io_dh.c   |    40 +-
 .../hypre/src/distributed_ls/Euclid/io_dh.h   |     8 +-
 .../src/distributed_ls/Euclid/krylov_dh.c     |    18 +-
 .../src/distributed_ls/Euclid/krylov_dh.h     |     2 +-
 .../src/distributed_ls/Euclid/macros_dh.h     |     9 +-
 .../distributed_ls/Euclid/mat_dh_private.c    |    10 +-
 .../distributed_ls/Euclid/mat_dh_private.h    |     2 +-
 .../src/distributed_ls/Euclid/shellSort_dh.c  |     2 +-
 .../src/distributed_ls/Euclid/shellSort_dh.h  |     2 +-
 .../hypre/src/distributed_ls/Euclid/sig_dh.c  |     6 +-
 .../hypre/src/distributed_ls/Euclid/sig_dh.h  |     2 +-
 .../distributed_ls/ParaSails/CMakeLists.txt   |     2 +-
 .../src/distributed_ls/ParaSails/Common.h     |     2 +-
 .../src/distributed_ls/ParaSails/ConjGrad.c   |     6 +-
 .../src/distributed_ls/ParaSails/ConjGrad.h   |     2 +-
 .../src/distributed_ls/ParaSails/DiagScale.c  |     4 +-
 .../src/distributed_ls/ParaSails/DiagScale.h  |     2 +-
 .../src/distributed_ls/ParaSails/FGmres.c     |    12 +-
 .../hypre/src/distributed_ls/ParaSails/Hash.c |     2 +-
 .../hypre/src/distributed_ls/ParaSails/Hash.h |     2 +-
 .../src/distributed_ls/ParaSails/LoadBal.c    |     2 +-
 .../src/distributed_ls/ParaSails/LoadBal.h    |     2 +-
 .../src/distributed_ls/ParaSails/Matrix.c     |    12 +-
 .../src/distributed_ls/ParaSails/Matrix.h     |     2 +-
 .../hypre/src/distributed_ls/ParaSails/Mem.c  |     4 +-
 .../hypre/src/distributed_ls/ParaSails/Mem.h  |     4 +-
 .../src/distributed_ls/ParaSails/Numbering.c  |     2 +-
 .../src/distributed_ls/ParaSails/Numbering.h  |     2 +-
 .../src/distributed_ls/ParaSails/OrderStat.c  |     2 +-
 .../src/distributed_ls/ParaSails/OrderStat.h  |     2 +-
 .../src/distributed_ls/ParaSails/ParaSails.c  |   132 +-
 .../src/distributed_ls/ParaSails/ParaSails.h  |    10 +-
 .../src/distributed_ls/ParaSails/PrunedRows.c |     2 +-
 .../src/distributed_ls/ParaSails/PrunedRows.h |     2 +-
 .../src/distributed_ls/ParaSails/RowPatt.c    |     2 +-
 .../src/distributed_ls/ParaSails/RowPatt.h    |     2 +-
 .../src/distributed_ls/ParaSails/StoredRows.c |     2 +-
 .../src/distributed_ls/ParaSails/StoredRows.h |     2 +-
 .../src/distributed_ls/ParaSails/convert.c    |     2 +-
 .../ParaSails/hypre_ParaSails.c               |    29 +-
 .../ParaSails/hypre_ParaSails.h               |     2 +-
 .../src/distributed_ls/ParaSails/permute.c    |     2 +-
 .../src/distributed_ls/pilut/CMakeLists.txt   |     2 +-
 .../pilut/DistributedMatrixPilutSolver.h      |     4 +-
 .../HYPRE_DistributedMatrixPilutSolver.c      |    81 +-
 ...YPRE_DistributedMatrixPilutSolver_protos.h |     2 +-
 ...HYPRE_DistributedMatrixPilutSolver_types.h |     2 +-
 .../hypre/src/distributed_ls/pilut/comm.c     |     2 +-
 .../hypre/src/distributed_ls/pilut/const.h    |     2 +-
 .../hypre/src/distributed_ls/pilut/debug.c    |     2 +-
 .../distributed_ls/pilut/distributed_qsort.c  |     2 +-
 .../pilut/distributed_qsort_si.c              |     2 +-
 external/hypre/src/distributed_ls/pilut/ilu.h |     4 +-
 .../hypre/src/distributed_ls/pilut/ilut.c     |    16 +-
 .../distributed_ls/pilut/internal_protos.h    |     2 +-
 .../hypre/src/distributed_ls/pilut/macros.h   |    11 +-
 .../hypre/src/distributed_ls/pilut/parilut.c  |    50 +-
 .../hypre/src/distributed_ls/pilut/parutil.c  |     6 +-
 .../hypre/src/distributed_ls/pilut/pblas1.c   |    10 +-
 .../hypre/src/distributed_ls/pilut/serilut.c  |   126 +-
 .../hypre/src/distributed_ls/pilut/struct.h   |    31 +-
 .../src/distributed_ls/pilut/trifactor.c      |     2 +-
 .../hypre/src/distributed_ls/pilut/util.c     |    10 +-
 .../src/distributed_matrix/CMakeLists.txt     |     2 +-
 .../HYPRE_distributed_matrix.c                |     2 +-
 .../HYPRE_distributed_matrix_mv.h             |     2 +-
 .../HYPRE_distributed_matrix_protos.h         |     2 +-
 .../HYPRE_distributed_matrix_types.h          |     2 +-
 .../distributed_matrix/distributed_matrix.c   |     2 +-
 .../distributed_matrix/distributed_matrix.h   |     2 +-
 .../distributed_matrix_ISIS.c                 |    74 +-
 .../distributed_matrix_ISIS.cc                |     2 +-
 .../distributed_matrix_PETSc.c                |    55 +-
 .../distributed_matrix_parcsr.c               |    53 +-
 .../src/distributed_matrix/internal_protos.h  |     2 +-
 external/hypre/src/docs/README.md             |    14 +-
 external/hypre/src/docs/copyright.txt         |     2 +-
 external/hypre/src/docs/hypre.bib             |     2 +-
 .../hypre/src/docs/ref-manual/conf.doxygen    |  1066 +-
 external/hypre/src/docs/update-release.sh     |     8 +-
 .../src/docs/usr-manual/_static/custom.css    |    13 +-
 .../hypre/src/docs/usr-manual/api-int-ij.rst  |     2 +-
 .../src/docs/usr-manual/api-int-sstruct.rst   |     2 +-
 .../src/docs/usr-manual/api-int-struct.rst    |     2 +-
 .../src/docs/usr-manual/api-sol-eigen.rst     |     2 +-
 .../src/docs/usr-manual/api-sol-krylov.rst    |     2 +-
 .../src/docs/usr-manual/api-sol-parcsr.rst    |     2 +-
 .../src/docs/usr-manual/api-sol-sstruct.rst   |     2 +-
 .../src/docs/usr-manual/api-sol-struct.rst    |     2 +-
 .../docs/usr-manual/bw-hypre-nwords.512.png   |   Bin 0 -> 20618 bytes
 external/hypre/src/docs/usr-manual/ch-api.rst |    18 +-
 external/hypre/src/docs/usr-manual/ch-fei.rst |    38 +-
 external/hypre/src/docs/usr-manual/ch-ij.rst  |     6 +-
 .../hypre/src/docs/usr-manual/ch-intro.rst    |   102 +-
 .../hypre/src/docs/usr-manual/ch-misc.rst     |   771 +-
 .../src/docs/usr-manual/ch-references.rst     |    21 +-
 .../hypre/src/docs/usr-manual/ch-solvers.rst  |    35 +-
 .../hypre/src/docs/usr-manual/ch-sstruct.rst  |   543 +-
 .../hypre/src/docs/usr-manual/ch-struct.rst   |   186 +-
 external/hypre/src/docs/usr-manual/conf.py    |   115 +-
 external/hypre/src/docs/usr-manual/dummy.png  |   Bin 0 -> 69 bytes
 .../src/docs/usr-manual/hypre-nwords.512.png  |   Bin 0 -> 18577 bytes
 .../hypre/src/docs/usr-manual/hypre_wiw.svg   |   217 -
 external/hypre/src/docs/usr-manual/index.rst  |     6 +-
 .../src/docs/usr-manual/requirements.txt      |     9 +-
 .../hypre/src/docs/usr-manual/solvers-ads.rst |     2 +-
 .../hypre/src/docs/usr-manual/solvers-ams.rst |    47 +-
 .../src/docs/usr-manual/solvers-boomeramg.rst |   109 +-
 .../src/docs/usr-manual/solvers-euclid.rst    |    44 +-
 .../hypre/src/docs/usr-manual/solvers-fac.rst |     2 +-
 .../hypre/src/docs/usr-manual/solvers-fei.rst |    52 +-
 .../src/docs/usr-manual/solvers-fsai.rst      |   101 +
 .../src/docs/usr-manual/solvers-hybrid.rst    |    17 +-
 .../src/docs/usr-manual/solvers-hypre-ilu.rst |    53 -
 .../hypre/src/docs/usr-manual/solvers-ilu.rst |   245 +
 .../src/docs/usr-manual/solvers-lobpcg.rst    |    20 +-
 .../src/docs/usr-manual/solvers-maxwell.rst   |     2 +-
 .../hypre/src/docs/usr-manual/solvers-mgr.rst |     2 +-
 .../hypre/src/docs/usr-manual/solvers-mli.rst |    18 +-
 .../src/docs/usr-manual/solvers-parasails.rst |    12 +-
 .../src/docs/usr-manual/solvers-pilut.rst     |    30 +-
 .../src/docs/usr-manual/solvers-smg-pfmg.rst  |     2 +-
 .../src/docs/usr-manual/solvers-split.rst     |    25 +-
 external/hypre/src/examples/CMakeLists.txt    |     2 +-
 external/hypre/src/examples/Makefile_gpu      |   248 -
 external/hypre/src/examples/cudaf.f           |    64 +
 external/hypre/src/examples/docs/build_doc.sh |     2 +-
 .../hypre/src/examples/docs/code2html.perl    |     0
 .../hypre/src/examples/docs/replace-ssi.perl  |     0
 external/hypre/src/examples/ex.h              |    13 +-
 external/hypre/src/examples/ex1.c             |    74 +-
 external/hypre/src/examples/ex10.cxx          |   154 +-
 external/hypre/src/examples/ex11.c            |    54 +-
 external/hypre/src/examples/ex12.c            |    74 +-
 external/hypre/src/examples/ex12cuf.cuf       |   492 +
 external/hypre/src/examples/ex12f.f           |    36 +-
 external/hypre/src/examples/ex12f_cptr.f      |   502 +
 external/hypre/src/examples/ex13.c            |   123 +-
 external/hypre/src/examples/ex14.c            |   115 +-
 external/hypre/src/examples/ex15.c            |   209 +-
 external/hypre/src/examples/ex15big.c         |   173 +-
 external/hypre/src/examples/ex16.c            |   405 +-
 external/hypre/src/examples/ex17.c            |    22 +-
 external/hypre/src/examples/ex18.c            |    37 +-
 external/hypre/src/examples/ex18comp.c        |    39 +-
 external/hypre/src/examples/ex2.c             |    62 +-
 external/hypre/src/examples/ex3.c             |    82 +-
 external/hypre/src/examples/ex4.c             |   276 +-
 external/hypre/src/examples/ex5.c             |    86 +-
 external/hypre/src/examples/ex5big.c          |    68 +-
 external/hypre/src/examples/ex5cuf.cuf        |   487 +
 external/hypre/src/examples/ex5f.f            |    47 +-
 external/hypre/src/examples/ex5f_cptr.f       |   510 +
 external/hypre/src/examples/ex6.c             |    70 +-
 external/hypre/src/examples/ex7.c             |   274 +-
 external/hypre/src/examples/ex8.c             |   145 +-
 external/hypre/src/examples/ex9.c             |   112 +-
 external/hypre/src/examples/vis.c             |   391 +-
 external/hypre/src/examples/vis/README        |     2 +-
 external/hypre/src/examples/vis/glvis-ex1.sh  |     4 +-
 external/hypre/src/examples/vis/glvis-ex10.sh |     4 +-
 external/hypre/src/examples/vis/glvis-ex11.sh |     4 +-
 external/hypre/src/examples/vis/glvis-ex12.sh |     4 +-
 external/hypre/src/examples/vis/glvis-ex13.sh |     4 +-
 external/hypre/src/examples/vis/glvis-ex14.sh |     4 +-
 external/hypre/src/examples/vis/glvis-ex15.sh |     4 +-
 external/hypre/src/examples/vis/glvis-ex16.sh |     4 +-
 external/hypre/src/examples/vis/glvis-ex2.sh  |     4 +-
 external/hypre/src/examples/vis/glvis-ex3.sh  |     4 +-
 external/hypre/src/examples/vis/glvis-ex4.sh  |     4 +-
 external/hypre/src/examples/vis/glvis-ex5.sh  |     4 +-
 external/hypre/src/examples/vis/glvis-ex6.sh  |     4 +-
 external/hypre/src/examples/vis/glvis-ex7.sh  |     4 +-
 external/hypre/src/examples/vis/glvis-ex8.sh  |     4 +-
 external/hypre/src/examples/vis/glvis-ex9.sh  |     4 +-
 external/hypre/src/krylov/CMakeLists.txt      |     2 +-
 .../hypre/src/krylov/HYPRE_MatvecFunctions.h  |     4 +-
 external/hypre/src/krylov/HYPRE_bicgstab.c    |    94 +-
 external/hypre/src/krylov/HYPRE_cgnr.c        |    78 +-
 external/hypre/src/krylov/HYPRE_cogmres.c     |   151 +-
 external/hypre/src/krylov/HYPRE_flexgmres.c   |   135 +-
 external/hypre/src/krylov/HYPRE_gmres.c       |   122 +-
 external/hypre/src/krylov/HYPRE_krylov.h      |   114 +-
 external/hypre/src/krylov/HYPRE_lgmres.c      |   134 +-
 external/hypre/src/krylov/HYPRE_lobpcg.c      |   235 +-
 external/hypre/src/krylov/HYPRE_lobpcg.h      |    37 +-
 external/hypre/src/krylov/HYPRE_pcg.c         |   127 +-
 external/hypre/src/krylov/bicgstab.c          |   457 +-
 external/hypre/src/krylov/bicgstab.h          |    52 +-
 external/hypre/src/krylov/cgnr.c              |   114 +-
 external/hypre/src/krylov/cgnr.h              |     4 +-
 external/hypre/src/krylov/cogmres.c           |   434 +-
 external/hypre/src/krylov/cogmres.h           |    20 +-
 external/hypre/src/krylov/flexgmres.c         |   734 +-
 external/hypre/src/krylov/flexgmres.h         |     8 +-
 external/hypre/src/krylov/gmres.c             |   361 +-
 external/hypre/src/krylov/gmres.h             |     6 +-
 external/hypre/src/krylov/headers             |    76 -
 external/hypre/src/krylov/krylov.h            |  2985 +--
 external/hypre/src/krylov/lgmres.c            |   984 +-
 external/hypre/src/krylov/lgmres.h            |    10 +-
 external/hypre/src/krylov/lobpcg.c            |  1818 +-
 external/hypre/src/krylov/lobpcg.h            |    86 +-
 external/hypre/src/krylov/pcg.c               |   563 +-
 external/hypre/src/krylov/pcg.h               |     9 +-
 external/hypre/src/lapack/CMakeLists.txt      |     2 +-
 external/hypre/src/lapack/README              |     2 +-
 external/hypre/src/lapack/_hypre_lapack.h     |     2 +-
 external/hypre/src/lapack/dbdsqr.c            |   387 +-
 external/hypre/src/lapack/dgebd2.c            |   198 +-
 external/hypre/src/lapack/dgebrd.c            |   240 +-
 external/hypre/src/lapack/dgelq2.c            |     4 +-
 external/hypre/src/lapack/dgelqf.c            |    20 +-
 external/hypre/src/lapack/dgels.c             |   304 +-
 external/hypre/src/lapack/dgeqr2.c            |    98 +-
 external/hypre/src/lapack/dgeqrf.c            |   144 +-
 external/hypre/src/lapack/dgesvd.c            |  1455 +-
 external/hypre/src/lapack/dgetf2.c            |    96 +-
 external/hypre/src/lapack/dgetrf.c            |   110 +-
 external/hypre/src/lapack/dgetri.c            |   135 +-
 external/hypre/src/lapack/dgetrs.c            |   102 +-
 external/hypre/src/lapack/dlabrd.c            |   274 +-
 external/hypre/src/lapack/dlacpy.c            |    62 +-
 external/hypre/src/lapack/dlae2.c             |    80 +-
 external/hypre/src/lapack/dlaev2.c            |    98 +-
 external/hypre/src/lapack/dlamch.c            |   645 +-
 external/hypre/src/lapack/dlange.c            |   101 +-
 external/hypre/src/lapack/dlanst.c            |    87 +-
 external/hypre/src/lapack/dlansy.c            |   119 +-
 external/hypre/src/lapack/dlapy2.c            |    28 +-
 external/hypre/src/lapack/dlarf.c             |   102 +-
 external/hypre/src/lapack/dlarfb.c            |    10 +-
 external/hypre/src/lapack/dlarfg.c            |    84 +-
 external/hypre/src/lapack/dlarft.c            |     8 +-
 external/hypre/src/lapack/dlartg.c            |    74 +-
 external/hypre/src/lapack/dlas2.c             |     2 +-
 external/hypre/src/lapack/dlascl.c            |   132 +-
 external/hypre/src/lapack/dlaset.c            |    74 +-
 external/hypre/src/lapack/dlasq1.c            |   118 +-
 external/hypre/src/lapack/dlasq2.c            |   199 +-
 external/hypre/src/lapack/dlasq3.c            |   126 +-
 external/hypre/src/lapack/dlasq4.c            |    98 +-
 external/hypre/src/lapack/dlasq5.c            |    80 +-
 external/hypre/src/lapack/dlasq6.c            |     8 +-
 external/hypre/src/lapack/dlasr.c             |   190 +-
 external/hypre/src/lapack/dlasrt.c            |    68 +-
 external/hypre/src/lapack/dlassq.c            |    72 +-
 external/hypre/src/lapack/dlasv2.c            |   128 +-
 external/hypre/src/lapack/dlaswp.c            |    82 +-
 external/hypre/src/lapack/dlatrd.c            |   260 +-
 external/hypre/src/lapack/dorg2l.c            |     6 +-
 external/hypre/src/lapack/dorg2r.c            |    84 +-
 external/hypre/src/lapack/dorgbr.c            |   226 +-
 external/hypre/src/lapack/dorgl2.c            |    78 +-
 external/hypre/src/lapack/dorglq.c            |   136 +-
 external/hypre/src/lapack/dorgql.c            |   140 +-
 external/hypre/src/lapack/dorgqr.c            |   136 +-
 external/hypre/src/lapack/dorgtr.c            |   126 +-
 external/hypre/src/lapack/dorm2r.c            |    12 +-
 external/hypre/src/lapack/dormbr.c            |   228 +-
 external/hypre/src/lapack/dorml2.c            |   134 +-
 external/hypre/src/lapack/dormlq.c            |   198 +-
 external/hypre/src/lapack/dormqr.c            |   196 +-
 external/hypre/src/lapack/dpotf2.c            |   112 +-
 external/hypre/src/lapack/dpotrf.c            |   126 +-
 external/hypre/src/lapack/dpotrs.c            |    84 +-
 external/hypre/src/lapack/dsteqr.c            |   252 +-
 external/hypre/src/lapack/dsterf.c            |   136 +-
 external/hypre/src/lapack/dsyev.c             |   174 +-
 external/hypre/src/lapack/dsygs2.c            |   136 +-
 external/hypre/src/lapack/dsygst.c            |   160 +-
 external/hypre/src/lapack/dsygv.c             |    20 +-
 external/hypre/src/lapack/dsytd2.c            |   202 +-
 external/hypre/src/lapack/dsytrd.c            |   246 +-
 external/hypre/src/lapack/dtrti2.c            |    98 +-
 external/hypre/src/lapack/dtrtri.c            |    18 +-
 external/hypre/src/lapack/f2c.h               |    30 +-
 external/hypre/src/lapack/hypre_lapack.h      |     2 +-
 external/hypre/src/lapack/ieeeck.c            |    52 +-
 external/hypre/src/lapack/ilaenv.c            |   266 +-
 external/hypre/src/lapack/lsame.c             |    54 +-
 .../hypre/src/matrix_matrix/CMakeLists.txt    |     2 +-
 ...HYPRE_BuildIJMatrixFromDistributedMatrix.c |    48 +-
 ...RE_ConvertPETScMatrixToDistributedMatrix.c |    15 +-
 ...E_ConvertParCSRMatrixToDistributedMatrix.c |     2 +-
 .../HYPRE_matrix_matrix_protos.h              |     8 +-
 .../hypre/src/matrix_matrix/internal_protos.h |     5 +-
 external/hypre/src/multivector/CMakeLists.txt |     2 +-
 external/hypre/src/multivector/backup.c       |   945 +-
 .../hypre/src/multivector/csr_matmultivec.c   |   128 +-
 .../hypre/src/multivector/csr_matmultivec.h   |     6 +-
 external/hypre/src/multivector/interpreter.h  |    75 +-
 external/hypre/src/multivector/multivector.c  |   222 +-
 external/hypre/src/multivector/multivector.h  |    94 +-
 .../src/multivector/par_csr_matmultivec.c     |    74 +-
 .../src/multivector/par_csr_matmultivec.h     |    10 +-
 .../hypre/src/multivector/par_csr_pmvcomm.c   |    54 +-
 .../hypre/src/multivector/par_csr_pmvcomm.h   |    20 +-
 .../hypre/src/multivector/par_multivector.c   |   136 +-
 .../hypre/src/multivector/par_multivector.h   |    46 +-
 .../hypre/src/multivector/seq_multivector.c   |   236 +-
 .../hypre/src/multivector/seq_multivector.h   |    51 +-
 .../hypre/src/multivector/temp_multivector.c  |   861 +-
 .../hypre/src/multivector/temp_multivector.h  |    32 +-
 external/hypre/src/nopoe                      |     0
 .../hypre/src/parcsr_block_mv/CMakeLists.txt  |     2 +-
 .../parcsr_block_mv/_hypre_parcsr_block_mv.h  |     4 +-
 .../src/parcsr_block_mv/csr_block_matop.c     |    84 +-
 .../src/parcsr_block_mv/csr_block_matrix.c    |   920 +-
 .../src/parcsr_block_mv/csr_block_matrix.h    |   112 +-
 .../src/parcsr_block_mv/csr_block_matvec.c    |    90 +-
 .../hypre/src/parcsr_block_mv/driver_matvec.c |   258 +-
 .../parcsr_block_mv/par_block_nodal_systems.c |    88 +-
 .../src/parcsr_block_mv/par_csr_block_comm.c  |    30 +-
 .../parcsr_block_mv/par_csr_block_interp.c    |  1797 +-
 .../parcsr_block_mv/par_csr_block_matrix.c    |   332 +-
 .../parcsr_block_mv/par_csr_block_matrix.h    |    14 +-
 .../parcsr_block_mv/par_csr_block_matvec.c    |    56 +-
 .../src/parcsr_block_mv/par_csr_block_rap.c   |   683 +-
 .../par_csr_block_rap_communication.c         |   200 +-
 .../src/parcsr_block_mv/par_csr_block_relax.c |   974 +-
 external/hypre/src/parcsr_ls/CMakeLists.txt   |    40 +-
 external/hypre/src/parcsr_ls/Common.h         |     2 +-
 external/hypre/src/parcsr_ls/F90_HYPRE_ams.c  |   334 +-
 .../src/parcsr_ls/F90_HYPRE_parcsr_Euclid.c   |   164 +-
 .../parcsr_ls/F90_HYPRE_parcsr_ParaSails.c    |   264 +-
 .../src/parcsr_ls/F90_HYPRE_parcsr_amg.c      |  1656 +-
 .../src/parcsr_ls/F90_HYPRE_parcsr_bicgstab.c |   271 +-
 .../src/parcsr_ls/F90_HYPRE_parcsr_block.c    |   108 +-
 .../src/parcsr_ls/F90_HYPRE_parcsr_cgnr.c     |   260 +-
 .../src/parcsr_ls/F90_HYPRE_parcsr_cogmres.c  |   312 +-
 .../parcsr_ls/F90_HYPRE_parcsr_flexgmres.c    |   271 +-
 .../src/parcsr_ls/F90_HYPRE_parcsr_gmres.c    |   287 +-
 .../src/parcsr_ls/F90_HYPRE_parcsr_hybrid.c   |   704 +-
 .../src/parcsr_ls/F90_HYPRE_parcsr_ilu.c      |   316 +
 .../src/parcsr_ls/F90_HYPRE_parcsr_int.c      |    90 +-
 .../src/parcsr_ls/F90_HYPRE_parcsr_lgmres.c   |   271 +-
 .../src/parcsr_ls/F90_HYPRE_parcsr_mgr.c      |   807 +
 .../src/parcsr_ls/F90_HYPRE_parcsr_pcg.c      |   323 +-
 .../src/parcsr_ls/F90_HYPRE_parcsr_pilut.c    |   110 +-
 .../src/parcsr_ls/F90_HYPRE_parcsr_schwarz.c  |   144 +-
 .../hypre/src/parcsr_ls/F90_hypre_laplace.c   |    56 +-
 external/hypre/src/parcsr_ls/HYPRE_ads.c      |     4 +-
 external/hypre/src/parcsr_ls/HYPRE_ame.c      |    14 +-
 external/hypre/src/parcsr_ls/HYPRE_ams.c      |     4 +-
 .../hypre/src/parcsr_ls/HYPRE_parcsr_Euclid.c |   566 +-
 .../src/parcsr_ls/HYPRE_parcsr_ParaSails.c    |   328 +-
 .../hypre/src/parcsr_ls/HYPRE_parcsr_amg.c    |   708 +-
 .../hypre/src/parcsr_ls/HYPRE_parcsr_amgdd.c  |    58 +-
 .../src/parcsr_ls/HYPRE_parcsr_bicgstab.c     |    67 +-
 .../hypre/src/parcsr_ls/HYPRE_parcsr_block.c  |    30 +-
 .../hypre/src/parcsr_ls/HYPRE_parcsr_cgnr.c   |    70 +-
 .../src/parcsr_ls/HYPRE_parcsr_cogmres.c      |   127 +-
 .../src/parcsr_ls/HYPRE_parcsr_flexgmres.c    |    82 +-
 .../hypre/src/parcsr_ls/HYPRE_parcsr_fsai.c   |   375 +
 .../hypre/src/parcsr_ls/HYPRE_parcsr_gmres.c  |   122 +-
 .../hypre/src/parcsr_ls/HYPRE_parcsr_hybrid.c |   158 +-
 .../hypre/src/parcsr_ls/HYPRE_parcsr_ilu.c    |   149 +-
 .../hypre/src/parcsr_ls/HYPRE_parcsr_int.c    |   255 +-
 .../hypre/src/parcsr_ls/HYPRE_parcsr_lgmres.c |    81 +-
 .../hypre/src/parcsr_ls/HYPRE_parcsr_ls.h     |  1175 +-
 .../hypre/src/parcsr_ls/HYPRE_parcsr_mgr.c    |   733 +-
 .../hypre/src/parcsr_ls/HYPRE_parcsr_pcg.c    |   128 +-
 .../hypre/src/parcsr_ls/HYPRE_parcsr_pilut.c  |    89 +-
 .../src/parcsr_ls/HYPRE_parcsr_schwarz.c      |    44 +-
 .../hypre/src/parcsr_ls/_hypre_parcsr_ls.h    |  4513 +++-
 external/hypre/src/parcsr_ls/ads.c            |   347 +-
 external/hypre/src/parcsr_ls/ads.h            |     2 +-
 external/hypre/src/parcsr_ls/ame.c            |   227 +-
 external/hypre/src/parcsr_ls/ame.h            |     3 +-
 external/hypre/src/parcsr_ls/amg_hybrid.c     |   230 +-
 external/hypre/src/parcsr_ls/ams.c            |  1713 +-
 external/hypre/src/parcsr_ls/ams.h            |    42 +-
 external/hypre/src/parcsr_ls/aux_interp.c     |  1138 +-
 external/hypre/src/parcsr_ls/aux_interp.h     |    51 +-
 external/hypre/src/parcsr_ls/block_tridiag.c  |   102 +-
 external/hypre/src/parcsr_ls/block_tridiag.h  |    16 +-
 .../hypre/src/parcsr_ls/csr_block_matrix.h    |   112 +-
 external/hypre/src/parcsr_ls/driver.c         |   411 +-
 external/hypre/src/parcsr_ls/dsuperlu.c       |   257 +-
 external/hypre/src/parcsr_ls/dsuperlu.h       |    24 +-
 external/hypre/src/parcsr_ls/gen_redcs_mat.c  |   222 +-
 external/hypre/src/parcsr_ls/headers          |     8 +-
 external/hypre/src/parcsr_ls/par_2s_interp.c  |   439 +-
 .../src/parcsr_ls/par_2s_interp_device.c      |   508 +-
 external/hypre/src/parcsr_ls/par_add_cycle.c  |   446 +-
 external/hypre/src/parcsr_ls/par_amg.c        |  1450 +-
 external/hypre/src/parcsr_ls/par_amg.h        |    70 +-
 external/hypre/src/parcsr_ls/par_amg_setup.c  |  1940 +-
 external/hypre/src/parcsr_ls/par_amg_solve.c  |   196 +-
 external/hypre/src/parcsr_ls/par_amg_solveT.c |   214 +-
 external/hypre/src/parcsr_ls/par_amgdd.c      |     6 +-
 external/hypre/src/parcsr_ls/par_amgdd.h      |     5 +-
 .../hypre/src/parcsr_ls/par_amgdd_comp_grid.c |   433 +-
 .../hypre/src/parcsr_ls/par_amgdd_comp_grid.h |    12 +-
 .../hypre/src/parcsr_ls/par_amgdd_fac_cycle.c |   189 +-
 .../parcsr_ls/par_amgdd_fac_cycle_device.c    |    23 +-
 .../hypre/src/parcsr_ls/par_amgdd_helpers.c   |  1184 +-
 .../hypre/src/parcsr_ls/par_amgdd_setup.c     |    56 +-
 .../hypre/src/parcsr_ls/par_amgdd_solve.c     |    63 +-
 .../hypre/src/parcsr_ls/par_cg_relax_wt.c     |   174 +-
 .../hypre/src/parcsr_ls/par_cgc_coarsen.c     |   782 +-
 external/hypre/src/parcsr_ls/par_cheby.c      |   153 +-
 .../hypre/src/parcsr_ls/par_cheby_device.c    |    92 +-
 .../hypre/src/parcsr_ls/par_coarse_parms.c    |    85 +-
 .../src/parcsr_ls/par_coarse_parms_device.c   |    69 +-
 external/hypre/src/parcsr_ls/par_coarsen.c    |   676 +-
 .../hypre/src/parcsr_ls/par_coarsen_device.c  |   262 +-
 .../hypre/src/parcsr_ls/par_coordinates.c     |    86 +-
 external/hypre/src/parcsr_ls/par_cr.c         |  1212 +-
 external/hypre/src/parcsr_ls/par_cycle.c      |   169 +-
 external/hypre/src/parcsr_ls/par_difconv.c    |   138 +-
 external/hypre/src/parcsr_ls/par_fsai.c       |   798 +
 external/hypre/src/parcsr_ls/par_fsai.h       |    88 +
 .../hypre/src/parcsr_ls/par_fsai_device.c     |  1338 +
 external/hypre/src/parcsr_ls/par_fsai_setup.c |  1357 ++
 external/hypre/src/parcsr_ls/par_fsai_solve.c |   179 +
 external/hypre/src/parcsr_ls/par_gauss_elim.c |   866 +-
 external/hypre/src/parcsr_ls/par_ge_device.c  |   356 +
 external/hypre/src/parcsr_ls/par_gsmg.c       |  1593 +-
 external/hypre/src/parcsr_ls/par_ilu.c        |  4910 ++--
 external/hypre/src/parcsr_ls/par_ilu.h        |   296 +-
 external/hypre/src/parcsr_ls/par_ilu_setup.c  |  6207 ++---
 .../src/parcsr_ls/par_ilu_setup_device.c      |   605 +
 external/hypre/src/parcsr_ls/par_ilu_solve.c  |  2317 +-
 .../src/parcsr_ls/par_ilu_solve_device.c      |  1226 +
 external/hypre/src/parcsr_ls/par_indepset.c   |    16 +-
 .../hypre/src/parcsr_ls/par_indepset_device.c |   102 +-
 external/hypre/src/parcsr_ls/par_interp.c     |  1240 +-
 .../hypre/src/parcsr_ls/par_interp_device.c   |   636 +-
 .../src/parcsr_ls/par_interp_trunc_device.c   |   682 +-
 .../hypre/src/parcsr_ls/par_jacobi_interp.c   |   310 +-
 .../hypre/src/parcsr_ls/par_krylov_func.c     |    82 +-
 external/hypre/src/parcsr_ls/par_laplace.c    |   829 +-
 .../hypre/src/parcsr_ls/par_laplace_27pt.c    |   876 +-
 .../hypre/src/parcsr_ls/par_laplace_9pt.c     |   246 +-
 external/hypre/src/parcsr_ls/par_lr_interp.c  |  1431 +-
 .../src/parcsr_ls/par_lr_interp_device.c      |  2373 +-
 external/hypre/src/parcsr_ls/par_lr_restr.c   |   252 +-
 .../hypre/src/parcsr_ls/par_lr_restr_device.c |   255 +-
 external/hypre/src/parcsr_ls/par_mgr.c        |  8402 +++----
 external/hypre/src/parcsr_ls/par_mgr.h        |   343 +-
 .../hypre/src/parcsr_ls/par_mgr_coarsen.c     |    54 +
 external/hypre/src/parcsr_ls/par_mgr_device.c |  1007 +
 external/hypre/src/parcsr_ls/par_mgr_interp.c |  2637 ++
 external/hypre/src/parcsr_ls/par_mgr_rap.c    |   692 +
 external/hypre/src/parcsr_ls/par_mgr_setup.c  |  3455 +--
 external/hypre/src/parcsr_ls/par_mgr_solve.c  |  1335 +-
 external/hypre/src/parcsr_ls/par_mgr_stats.c  |   745 +
 .../hypre/src/parcsr_ls/par_mod_lr_interp.c   |   671 +-
 .../src/parcsr_ls/par_mod_multi_interp.c      |  1318 +
 .../parcsr_ls/par_mod_multi_interp_device.c   |  2492 ++
 .../hypre/src/parcsr_ls/par_multi_interp.c    |   877 +-
 .../hypre/src/parcsr_ls/par_nodal_systems.c   |   403 +-
 .../hypre/src/parcsr_ls/par_nongalerkin.c     |  4102 ++--
 external/hypre/src/parcsr_ls/par_rap.c        |   634 +-
 .../src/parcsr_ls/par_rap_communication.c     |   194 +-
 external/hypre/src/parcsr_ls/par_relax.c      |   949 +-
 external/hypre/src/parcsr_ls/par_relax.h      |    55 +-
 .../hypre/src/parcsr_ls/par_relax_device.c    |   110 +-
 .../hypre/src/parcsr_ls/par_relax_interface.c |     5 +-
 external/hypre/src/parcsr_ls/par_relax_more.c |   183 +-
 .../src/parcsr_ls/par_relax_more_device.c     |   206 +-
 external/hypre/src/parcsr_ls/par_restr.c      |   203 +-
 external/hypre/src/parcsr_ls/par_rotate_7pt.c |   192 +-
 .../hypre/src/parcsr_ls/par_scaled_matnorm.c  |    70 +-
 external/hypre/src/parcsr_ls/par_schwarz.c    |   136 +-
 external/hypre/src/parcsr_ls/par_stats.c      |   796 +-
 external/hypre/src/parcsr_ls/par_strength.c   |   844 +-
 .../src/parcsr_ls/par_strength2nd_device.c    |    58 +-
 .../hypre/src/parcsr_ls/par_strength_device.c |   440 +-
 external/hypre/src/parcsr_ls/par_sv_interp.c  |  1489 +-
 .../hypre/src/parcsr_ls/par_sv_interp_ln.c    |  1392 +-
 .../hypre/src/parcsr_ls/par_sv_interp_lsfit.c |   346 +-
 external/hypre/src/parcsr_ls/par_vardifconv.c |   342 +-
 .../hypre/src/parcsr_ls/par_vardifconv_rs.c   |   286 +-
 external/hypre/src/parcsr_ls/partial.c        |   884 +-
 external/hypre/src/parcsr_ls/protos.h         |  3803 ++-
 external/hypre/src/parcsr_ls/schwarz.c        |  2202 +-
 external/hypre/src/parcsr_ls/schwarz.h        |     8 +-
 external/hypre/src/parcsr_mv/CMakeLists.txt   |    20 +-
 .../src/parcsr_mv/F90_HYPRE_parcsr_matrix.c   |   319 +-
 .../src/parcsr_mv/F90_HYPRE_parcsr_vector.c   |   186 +-
 external/hypre/src/parcsr_mv/F90_par_vector.c |   120 +-
 .../hypre/src/parcsr_mv/F90_parcsr_matrix.c   |    28 +-
 .../hypre/src/parcsr_mv/HYPRE_parcsr_matrix.c |    34 +-
 .../hypre/src/parcsr_mv/HYPRE_parcsr_mv.h     |    65 +-
 .../hypre/src/parcsr_mv/HYPRE_parcsr_vector.c |    21 +-
 .../hypre/src/parcsr_mv/_hypre_parcsr_mv.h    |   857 +-
 external/hypre/src/parcsr_mv/communicationT.c |   558 +-
 external/hypre/src/parcsr_mv/driver.c         |    78 +-
 external/hypre/src/parcsr_mv/driver_aat.c     |    20 +-
 external/hypre/src/parcsr_mv/driver_boolaat.c |    20 +-
 .../hypre/src/parcsr_mv/driver_boolmatmul.c   |    55 +-
 .../hypre/src/parcsr_mv/driver_mat_multivec.c |    50 +-
 external/hypre/src/parcsr_mv/driver_matmul.c  |    24 +-
 external/hypre/src/parcsr_mv/driver_matvec.c  |    86 +-
 .../hypre/src/parcsr_mv/driver_multivec.c     |    64 +-
 external/hypre/src/parcsr_mv/gen_fffc.c       |   639 +-
 external/hypre/src/parcsr_mv/headers          |     6 +-
 external/hypre/src/parcsr_mv/new_commpkg.c    |   354 +-
 external/hypre/src/parcsr_mv/new_commpkg.h    |     2 +-
 external/hypre/src/parcsr_mv/numbers.c        |    90 +-
 external/hypre/src/parcsr_mv/numbers.h        |     2 +-
 .../hypre/src/parcsr_mv/par_chord_matrix.h    |     2 +-
 external/hypre/src/parcsr_mv/par_csr_aat.c    |   308 +-
 .../src/parcsr_mv/par_csr_assumed_part.c      |   135 +-
 .../src/parcsr_mv/par_csr_assumed_part.h      |     2 +-
 .../hypre/src/parcsr_mv/par_csr_bool_matop.c  |   761 +-
 .../hypre/src/parcsr_mv/par_csr_bool_matrix.c |   660 +-
 .../src/parcsr_mv/par_csr_communication.c     |   715 +-
 .../src/parcsr_mv/par_csr_communication.h     |    66 +-
 .../hypre/src/parcsr_mv/par_csr_fffc_device.c |   857 +-
 external/hypre/src/parcsr_mv/par_csr_filter.c |   218 +
 .../src/parcsr_mv/par_csr_filter_device.c     |   358 +
 external/hypre/src/parcsr_mv/par_csr_matmat.c |   159 +
 .../src/parcsr_mv/par_csr_matmat_device.c     |   152 +
 external/hypre/src/parcsr_mv/par_csr_matop.c  |  2402 +-
 .../src/parcsr_mv/par_csr_matop_device.c      |  2180 +-
 .../src/parcsr_mv/par_csr_matop_marked.c      |   335 +-
 external/hypre/src/parcsr_mv/par_csr_matrix.c |  1410 +-
 external/hypre/src/parcsr_mv/par_csr_matrix.h |    50 +-
 .../src/parcsr_mv/par_csr_matrix_stats.c      |   497 +
 external/hypre/src/parcsr_mv/par_csr_matvec.c |   746 +-
 .../src/parcsr_mv/par_csr_matvec_device.c     |   593 +
 .../hypre/src/parcsr_mv/par_csr_triplemat.c   |   517 +-
 .../src/parcsr_mv/par_csr_triplemat_device.c  |  1240 +-
 .../hypre/src/parcsr_mv/par_make_system.c     |   148 +-
 .../hypre/src/parcsr_mv/par_make_system.h     |     2 +-
 external/hypre/src/parcsr_mv/par_vector.c     |   754 +-
 external/hypre/src/parcsr_mv/par_vector.h     |    16 +-
 .../hypre/src/parcsr_mv/par_vector_batched.c  |    21 +-
 .../hypre/src/parcsr_mv/par_vector_device.c   |    66 +-
 .../hypre/src/parcsr_mv/parchord_to_parcsr.c  |   522 +-
 external/hypre/src/parcsr_mv/protos.h         |   714 +-
 .../hypre/src/seq_block_mv/CMakeLists.txt     |    29 +
 .../src/seq_block_mv/_hypre_seq_block_mv.h    |   114 +
 .../src/seq_block_mv/dense_block_matmult.c    |   136 +
 .../src/seq_block_mv/dense_block_matrix.c     |   335 +
 .../src/seq_block_mv/dense_block_matrix.h     |    65 +
 external/hypre/src/seq_block_mv/headers       |    49 +
 external/hypre/src/seq_block_mv/protos.h      |    24 +
 external/hypre/src/seq_mv/.gitignore          |     7 +
 external/hypre/src/seq_mv/CMakeLists.txt      |   109 +-
 external/hypre/src/seq_mv/HYPRE_csr_matrix.c  |     6 +-
 .../hypre/src/seq_mv/HYPRE_mapped_matrix.c    |    30 +-
 .../src/seq_mv/HYPRE_multiblock_matrix.c      |    38 +-
 external/hypre/src/seq_mv/HYPRE_seq_mv.h      |    42 +-
 external/hypre/src/seq_mv/HYPRE_vector.c      |     8 +-
 external/hypre/src/seq_mv/MakeIRIX            |     2 +-
 external/hypre/src/seq_mv/csr_filter.c        |    52 +
 external/hypre/src/seq_mv/csr_matop.c         |   542 +-
 external/hypre/src/seq_mv/csr_matop_device.c  |  3563 ++-
 external/hypre/src/seq_mv/csr_matrix.c        |   722 +-
 external/hypre/src/seq_mv/csr_matrix.h        |    22 +-
 .../hypre/src/seq_mv/csr_matrix_cuda_utils.c  |    58 +-
 external/hypre/src/seq_mv/csr_matvec.c        |   485 +-
 external/hypre/src/seq_mv/csr_matvec_device.c |   401 +-
 external/hypre/src/seq_mv/csr_matvec_oomp.c   |    12 +-
 external/hypre/src/seq_mv/csr_spadd_device.c  |    29 +-
 external/hypre/src/seq_mv/csr_spgemm_device.c |   137 +-
 external/hypre/src/seq_mv/csr_spgemm_device.h |   428 +-
 .../src/seq_mv/csr_spgemm_device_attempt.c    |   632 -
 .../src/seq_mv/csr_spgemm_device_confident.c  |   589 -
 .../src/seq_mv/csr_spgemm_device_cusparse.c   |   115 +-
 .../src/seq_mv/csr_spgemm_device_numblocks.c  |   149 +
 .../src/seq_mv/csr_spgemm_device_numer.c      |   238 +
 .../src/seq_mv/csr_spgemm_device_numer.h      |   889 +
 .../src/seq_mv/csr_spgemm_device_numer.in     |    50 +
 .../seq_mv/csr_spgemm_device_onemklsparse.c   |   257 +
 .../src/seq_mv/csr_spgemm_device_rocsparse.c  |    85 +-
 .../src/seq_mv/csr_spgemm_device_rowbound.c   |   407 -
 .../src/seq_mv/csr_spgemm_device_rowest.c     |   268 +-
 .../src/seq_mv/csr_spgemm_device_symbl.c      |   426 +
 .../src/seq_mv/csr_spgemm_device_symbl.h      |   629 +
 .../src/seq_mv/csr_spgemm_device_symbl.in     |    40 +
 .../hypre/src/seq_mv/csr_spgemm_device_util.c |   296 +-
 external/hypre/src/seq_mv/csr_spmv_device.c   |   685 +-
 external/hypre/src/seq_mv/csr_spmv_device.h   |   123 +
 .../hypre/src/seq_mv/csr_sptrans_device.c     |   123 +-
 external/hypre/src/seq_mv/genpart.c           |    20 +-
 external/hypre/src/seq_mv/headers             |     4 +-
 external/hypre/src/seq_mv/mapped_matrix.c     |    69 +-
 external/hypre/src/seq_mv/mapped_matrix.h     |     2 +-
 external/hypre/src/seq_mv/multiblock_matrix.c |    86 +-
 external/hypre/src/seq_mv/multiblock_matrix.h |     2 +-
 external/hypre/src/seq_mv/protos.h            |   388 +-
 external/hypre/src/seq_mv/seq_mv.h            |   443 +-
 external/hypre/src/seq_mv/seq_mv.hpp          |    62 +-
 external/hypre/src/seq_mv/vector.c            |   980 +-
 external/hypre/src/seq_mv/vector.h            |    25 +-
 external/hypre/src/seq_mv/vector_batched.c    |   950 +-
 external/hypre/src/seq_mv/vector_device.c     |   403 +
 external/hypre/src/sstruct_ls/CMakeLists.txt  |    10 +-
 .../sstruct_ls/F90_HYPRE_sstruct_InterFAC.c   |   342 +-
 .../sstruct_ls/F90_HYPRE_sstruct_bicgstab.c   |   230 +-
 .../sstruct_ls/F90_HYPRE_sstruct_flexgmres.c  |   230 +-
 .../src/sstruct_ls/F90_HYPRE_sstruct_gmres.c  |   240 +-
 .../src/sstruct_ls/F90_HYPRE_sstruct_int.c    |    54 +-
 .../src/sstruct_ls/F90_HYPRE_sstruct_lgmres.c |   240 +-
 .../sstruct_ls/F90_HYPRE_sstruct_maxwell.c    |   322 +-
 .../src/sstruct_ls/F90_HYPRE_sstruct_pcg.c    |   268 +-
 .../src/sstruct_ls/F90_HYPRE_sstruct_split.c  |   140 +-
 .../sstruct_ls/F90_HYPRE_sstruct_sys_pfmg.c   |   236 +-
 .../src/sstruct_ls/HYPRE_sstruct_InterFAC.c   |    74 +-
 .../src/sstruct_ls/HYPRE_sstruct_bicgstab.c   |    66 +-
 .../src/sstruct_ls/HYPRE_sstruct_flexgmres.c  |    65 +-
 .../src/sstruct_ls/HYPRE_sstruct_gmres.c      |    64 +-
 .../hypre/src/sstruct_ls/HYPRE_sstruct_int.c  |    81 +-
 .../src/sstruct_ls/HYPRE_sstruct_lgmres.c     |    98 +-
 .../hypre/src/sstruct_ls/HYPRE_sstruct_ls.h   |    24 +-
 .../src/sstruct_ls/HYPRE_sstruct_maxwell.c    |    96 +-
 .../hypre/src/sstruct_ls/HYPRE_sstruct_pcg.c  |    79 +-
 .../src/sstruct_ls/HYPRE_sstruct_split.c      |   112 +-
 .../src/sstruct_ls/HYPRE_sstruct_sys_pfmg.c   |    66 +-
 .../hypre/src/sstruct_ls/_hypre_sstruct_ls.h  |   728 +-
 external/hypre/src/sstruct_ls/bsearch.c       |    38 +-
 .../hypre/src/sstruct_ls/eliminate_rowscols.c |    76 +-
 .../hypre/src/sstruct_ls/eliminate_rowscols.h |    20 +-
 external/hypre/src/sstruct_ls/fac.c           |    78 +-
 external/hypre/src/sstruct_ls/fac.h           |     4 +-
 .../src/sstruct_ls/fac_CFInterfaceExtents.c   |   166 +-
 .../hypre/src/sstruct_ls/fac_amr_fcoarsen.c   |  1863 +-
 external/hypre/src/sstruct_ls/fac_amr_rap.c   |   216 +-
 .../hypre/src/sstruct_ls/fac_amr_zero_data.c  |   316 +-
 .../hypre/src/sstruct_ls/fac_cf_coarsen.c     |   208 +-
 .../hypre/src/sstruct_ls/fac_cfstencil_box.c  |    88 +-
 external/hypre/src/sstruct_ls/fac_interp2.c   |   712 +-
 external/hypre/src/sstruct_ls/fac_relax.c     |     2 +-
 external/hypre/src/sstruct_ls/fac_restrict2.c |   342 +-
 external/hypre/src/sstruct_ls/fac_setup2.c    |   429 +-
 external/hypre/src/sstruct_ls/fac_solve3.c    |   337 +-
 .../hypre/src/sstruct_ls/fac_zero_cdata.c     |   118 +-
 .../src/sstruct_ls/fac_zero_stencilcoef.c     |    83 +-
 external/hypre/src/sstruct_ls/headers         |    60 -
 external/hypre/src/sstruct_ls/krylov.c        |    27 +-
 .../hypre/src/sstruct_ls/krylov_sstruct.c     |    53 +-
 .../hypre/src/sstruct_ls/maxwell_PNedelec.c   |   938 +-
 .../src/sstruct_ls/maxwell_PNedelec_bdy.c     |   318 +-
 .../hypre/src/sstruct_ls/maxwell_PTopology.h  |    16 +-
 external/hypre/src/sstruct_ls/maxwell_TV.c    |   162 +-
 external/hypre/src/sstruct_ls/maxwell_TV.h    |    14 +-
 .../hypre/src/sstruct_ls/maxwell_TV_setup.c   |   819 +-
 external/hypre/src/sstruct_ls/maxwell_grad.c  |   267 +-
 .../hypre/src/sstruct_ls/maxwell_physbdy.c    |   428 +-
 .../src/sstruct_ls/maxwell_semi_interp.c      |  2050 +-
 external/hypre/src/sstruct_ls/maxwell_solve.c |   144 +-
 .../hypre/src/sstruct_ls/maxwell_solve2.c     |   234 +-
 .../hypre/src/sstruct_ls/maxwell_zeroBC.c     |    10 +-
 .../src/sstruct_ls/nd1_amge_interpolation.c   |   259 +-
 .../src/sstruct_ls/nd1_amge_interpolation.h   |    26 +-
 external/hypre/src/sstruct_ls/node_relax.c    |   255 +-
 .../sstruct_amr_intercommunication.c          |    21 +-
 .../hypre/src/sstruct_ls/sstruct_owninfo.c    |   222 +-
 .../hypre/src/sstruct_ls/sstruct_owninfo.h    |     4 +-
 .../hypre/src/sstruct_ls/sstruct_recvinfo.c   |   102 +-
 .../hypre/src/sstruct_ls/sstruct_recvinfo.h   |     4 +-
 .../hypre/src/sstruct_ls/sstruct_sendinfo.c   |   119 +-
 .../hypre/src/sstruct_ls/sstruct_sendinfo.h   |     4 +-
 .../src/sstruct_ls/sstruct_sharedDOFComm.c    |   510 +-
 .../src/sstruct_ls/sstruct_sharedDOFComm.h    |     6 +-
 external/hypre/src/sstruct_ls/sys_pfmg.c      |    82 +-
 external/hypre/src/sstruct_ls/sys_pfmg.h      |    12 +-
 .../hypre/src/sstruct_ls/sys_pfmg_relax.c     |    12 +-
 .../hypre/src/sstruct_ls/sys_pfmg_setup.c     |   106 +-
 .../src/sstruct_ls/sys_pfmg_setup_interp.c    |     6 +-
 .../hypre/src/sstruct_ls/sys_pfmg_setup_rap.c |    18 +-
 .../hypre/src/sstruct_ls/sys_pfmg_solve.c     |    24 +-
 .../hypre/src/sstruct_ls/sys_semi_interp.c    |     4 +-
 .../hypre/src/sstruct_ls/sys_semi_restrict.c  |     6 +-
 external/hypre/src/sstruct_mv/CMakeLists.txt  |    10 +-
 .../src/sstruct_mv/F90_HYPRE_sstruct_graph.c  |   144 +-
 .../src/sstruct_mv/F90_HYPRE_sstruct_grid.c   |   228 +-
 .../src/sstruct_mv/F90_HYPRE_sstruct_matrix.c |   370 +-
 .../sstruct_mv/F90_HYPRE_sstruct_stencil.c    |    48 +-
 .../src/sstruct_mv/F90_HYPRE_sstruct_vector.c |   316 +-
 .../src/sstruct_mv/HYPRE_sstruct_graph.c      |   248 +-
 .../hypre/src/sstruct_mv/HYPRE_sstruct_grid.c |    60 +-
 .../src/sstruct_mv/HYPRE_sstruct_matrix.c     |   444 +-
 .../hypre/src/sstruct_mv/HYPRE_sstruct_mv.h   |   103 +-
 .../src/sstruct_mv/HYPRE_sstruct_stencil.c    |    54 +-
 .../src/sstruct_mv/HYPRE_sstruct_vector.c     |   249 +-
 .../hypre/src/sstruct_mv/_hypre_sstruct_mv.h  |   413 +-
 external/hypre/src/sstruct_mv/headers         |     4 +-
 external/hypre/src/sstruct_mv/protos.h        |   383 +-
 external/hypre/src/sstruct_mv/sstruct_axpy.c  |     8 +-
 external/hypre/src/sstruct_mv/sstruct_copy.c  |     8 +-
 external/hypre/src/sstruct_mv/sstruct_graph.c |    36 +-
 external/hypre/src/sstruct_mv/sstruct_graph.h |     4 +-
 external/hypre/src/sstruct_mv/sstruct_grid.c  |   598 +-
 external/hypre/src/sstruct_mv/sstruct_grid.h  |    30 +-
 .../hypre/src/sstruct_mv/sstruct_innerprod.c  |    12 +-
 .../hypre/src/sstruct_mv/sstruct_matrix.c     |   296 +-
 .../hypre/src/sstruct_mv/sstruct_matrix.h     |     4 +-
 .../hypre/src/sstruct_mv/sstruct_matvec.c     |    28 +-
 external/hypre/src/sstruct_mv/sstruct_scale.c |     6 +-
 .../hypre/src/sstruct_mv/sstruct_stencil.c    |     3 +-
 .../hypre/src/sstruct_mv/sstruct_stencil.h    |     2 +-
 .../hypre/src/sstruct_mv/sstruct_vector.c     |    57 +-
 .../hypre/src/sstruct_mv/sstruct_vector.h     |    16 +-
 external/hypre/src/struct_ls/CMakeLists.txt   |    12 +-
 .../src/struct_ls/F90_HYPRE_struct_bicgstab.c |   206 +-
 .../src/struct_ls/F90_HYPRE_struct_cycred.c   |   104 +-
 .../struct_ls/F90_HYPRE_struct_flexgmres.c    |   206 +-
 .../src/struct_ls/F90_HYPRE_struct_gmres.c    |   206 +-
 .../src/struct_ls/F90_HYPRE_struct_hybrid.c   |   302 +-
 .../src/struct_ls/F90_HYPRE_struct_int.c      |    46 +-
 .../src/struct_ls/F90_HYPRE_struct_jacobi.c   |   172 +-
 .../src/struct_ls/F90_HYPRE_struct_lgmres.c   |   218 +-
 .../src/struct_ls/F90_HYPRE_struct_pcg.c      |   258 +-
 .../src/struct_ls/F90_HYPRE_struct_pfmg.c     |   418 +-
 .../src/struct_ls/F90_HYPRE_struct_smg.c      |   320 +-
 .../struct_ls/F90_HYPRE_struct_sparse_msg.c   |   244 +-
 .../src/struct_ls/HYPRE_struct_bicgstab.c     |    57 +-
 .../hypre/src/struct_ls/HYPRE_struct_cycred.c |    34 +-
 .../src/struct_ls/HYPRE_struct_flexgmres.c    |    57 +-
 .../hypre/src/struct_ls/HYPRE_struct_gmres.c  |    54 +-
 .../hypre/src/struct_ls/HYPRE_struct_hybrid.c |    74 +-
 .../hypre/src/struct_ls/HYPRE_struct_int.c    |    89 +-
 .../hypre/src/struct_ls/HYPRE_struct_jacobi.c |    50 +-
 .../hypre/src/struct_ls/HYPRE_struct_lgmres.c |    58 +-
 .../hypre/src/struct_ls/HYPRE_struct_ls.h     |   420 +-
 .../hypre/src/struct_ls/HYPRE_struct_pcg.c    |    56 +-
 .../hypre/src/struct_ls/HYPRE_struct_pfmg.c   |    84 +-
 .../hypre/src/struct_ls/HYPRE_struct_smg.c    |    62 +-
 .../src/struct_ls/HYPRE_struct_sparse_msg.c   |    82 +-
 .../hypre/src/struct_ls/_hypre_struct_ls.h    |   781 +-
 external/hypre/src/struct_ls/coarsen.c        |    92 +-
 .../hypre/src/struct_ls/cyclic_reduction.c    |   137 +-
 external/hypre/src/struct_ls/headers          |     4 +-
 external/hypre/src/struct_ls/hybrid.c         |    36 +-
 external/hypre/src/struct_ls/jacobi.c         |     6 +-
 external/hypre/src/struct_ls/pcg_struct.c     |    33 +-
 external/hypre/src/struct_ls/pfmg.c           |    70 +-
 external/hypre/src/struct_ls/pfmg.h           |     5 +-
 .../hypre/src/struct_ls/pfmg2_setup_rap.c     |   724 +-
 .../hypre/src/struct_ls/pfmg3_setup_rap.c     |  2171 +-
 external/hypre/src/struct_ls/pfmg_relax.c     |    28 +-
 external/hypre/src/struct_ls/pfmg_setup.c     |   500 +-
 .../hypre/src/struct_ls/pfmg_setup_interp.c   |   574 +-
 external/hypre/src/struct_ls/pfmg_setup_rap.c |    72 +-
 .../hypre/src/struct_ls/pfmg_setup_rap5.c     |    79 +-
 .../hypre/src/struct_ls/pfmg_setup_rap7.c     |    99 +-
 external/hypre/src/struct_ls/pfmg_solve.c     |    40 +-
 external/hypre/src/struct_ls/point_relax.c    |   198 +-
 external/hypre/src/struct_ls/protos.h         |   778 +-
 .../src/struct_ls/red_black_constantcoef_gs.c |   170 +-
 external/hypre/src/struct_ls/red_black_gs.c   |    65 +-
 external/hypre/src/struct_ls/red_black_gs.h   |    65 +-
 external/hypre/src/struct_ls/semi.c           |    34 +-
 external/hypre/src/struct_ls/semi_interp.c    |    38 +-
 external/hypre/src/struct_ls/semi_restrict.c  |    42 +-
 external/hypre/src/struct_ls/semi_setup_rap.c |   154 +-
 external/hypre/src/struct_ls/smg.c            |    36 +-
 external/hypre/src/struct_ls/smg.h            |     8 +-
 external/hypre/src/struct_ls/smg2_setup_rap.c |   253 +-
 external/hypre/src/struct_ls/smg3_setup_rap.c |   895 +-
 external/hypre/src/struct_ls/smg_axpy.c       |     2 +-
 external/hypre/src/struct_ls/smg_relax.c      |    22 +-
 external/hypre/src/struct_ls/smg_residual.c   |    14 +-
 .../src/struct_ls/smg_residual_unrolled.c     |   400 +-
 external/hypre/src/struct_ls/smg_setup.c      |   200 +-
 .../hypre/src/struct_ls/smg_setup_interp.c    |     4 +-
 external/hypre/src/struct_ls/smg_setup_rap.c  |    20 +-
 .../hypre/src/struct_ls/smg_setup_restrict.c  |    13 +-
 external/hypre/src/struct_ls/smg_solve.c      |    36 +-
 external/hypre/src/struct_ls/sparse_msg.c     |   106 +-
 external/hypre/src/struct_ls/sparse_msg.h     |    11 +-
 .../src/struct_ls/sparse_msg2_setup_rap.c     |   224 +-
 .../src/struct_ls/sparse_msg3_setup_rap.c     |   648 +-
 .../hypre/src/struct_ls/sparse_msg_filter.c   |    42 +-
 .../hypre/src/struct_ls/sparse_msg_interp.c   |    11 +-
 .../hypre/src/struct_ls/sparse_msg_restrict.c |    19 +-
 .../hypre/src/struct_ls/sparse_msg_setup.c    |   101 +-
 .../src/struct_ls/sparse_msg_setup_rap.c      |    77 +-
 .../hypre/src/struct_ls/sparse_msg_solve.c    |    71 +-
 external/hypre/src/struct_mv/CMakeLists.txt   |    10 +-
 .../src/struct_mv/F90_HYPRE_struct_grid.c     |    78 +-
 .../src/struct_mv/F90_HYPRE_struct_matrix.c   |   306 +-
 .../src/struct_mv/F90_HYPRE_struct_stencil.c  |    40 +-
 .../src/struct_mv/F90_HYPRE_struct_vector.c   |   282 +-
 .../hypre/src/struct_mv/HYPRE_struct_grid.c   |     2 +-
 .../hypre/src/struct_mv/HYPRE_struct_matrix.c |    36 +-
 .../hypre/src/struct_mv/HYPRE_struct_mv.h     |    31 +-
 .../src/struct_mv/HYPRE_struct_stencil.c      |     8 +-
 .../hypre/src/struct_mv/HYPRE_struct_vector.c |    32 +-
 .../hypre/src/struct_mv/_hypre_struct_mv.h    |  1373 +-
 .../hypre/src/struct_mv/_hypre_struct_mv.hpp  |  1887 +-
 external/hypre/src/struct_mv/assumed_part.c   |   232 +-
 external/hypre/src/struct_mv/assumed_part.h   |    28 +-
 external/hypre/src/struct_mv/box.c            |   207 +-
 external/hypre/src/struct_mv/box.h            |   360 +-
 external/hypre/src/struct_mv/box_algebra.c    |   194 +-
 external/hypre/src/struct_mv/box_boundary.c   |    28 +-
 external/hypre/src/struct_mv/box_manager.c    |   900 +-
 external/hypre/src/struct_mv/box_manager.h    |    34 +-
 external/hypre/src/struct_mv/boxloop_cuda.h   |   302 +-
 external/hypre/src/struct_mv/boxloop_host.h   |   243 +-
 external/hypre/src/struct_mv/boxloop_kokkos.h |    31 +-
 .../hypre/src/struct_mv/boxloop_omp_device.h  |    24 +-
 external/hypre/src/struct_mv/boxloop_raja.h   |    35 +-
 external/hypre/src/struct_mv/boxloop_sycl.h   |   437 +
 .../hypre/src/struct_mv/communication_info.c  |   245 +-
 external/hypre/src/struct_mv/computation.c    |     8 +-
 external/hypre/src/struct_mv/computation.h    |     6 +-
 external/hypre/src/struct_mv/headers          |    54 +-
 external/hypre/src/struct_mv/project.c        |    14 +-
 external/hypre/src/struct_mv/protos.h         |   547 +-
 external/hypre/src/struct_mv/struct_axpy.c    |    17 +-
 .../src/struct_mv/struct_communication.c      |   439 +-
 .../src/struct_mv/struct_communication.h      |    68 +-
 external/hypre/src/struct_mv/struct_copy.c    |     2 +-
 external/hypre/src/struct_mv/struct_grid.c    |    69 +-
 external/hypre/src/struct_mv/struct_grid.h    |     7 +-
 .../hypre/src/struct_mv/struct_innerprod.c    |     6 +-
 external/hypre/src/struct_mv/struct_io.c      |    96 +-
 external/hypre/src/struct_mv/struct_matrix.c  |   558 +-
 external/hypre/src/struct_mv/struct_matrix.h  |     6 +-
 .../hypre/src/struct_mv/struct_matrix_mask.c  |    22 +-
 external/hypre/src/struct_mv/struct_matvec.c  |   468 +-
 external/hypre/src/struct_mv/struct_scale.c   |     2 +-
 external/hypre/src/struct_mv/struct_stencil.c |    16 +-
 external/hypre/src/struct_mv/struct_stencil.h |     4 +-
 external/hypre/src/struct_mv/struct_vector.c  |   268 +-
 external/hypre/src/struct_mv/struct_vector.h  |    48 +-
 external/hypre/src/tarch                      |     4 +-
 external/hypre/src/test/CMakeLists.txt        |   121 +-
 external/hypre/src/test/TEST_ams/solvers.jobs |     4 +-
 .../hypre/src/test/TEST_ams/solvers.saved     |    90 +-
 .../src/test/TEST_ams/solvers.saved.lassen    |   154 +-
 .../test/TEST_ams/solvers.saved.lassen_cpu    |   117 +
 .../hypre/src/test/TEST_ams/solvers.saved.ray |   117 -
 .../src/test/TEST_ams/solvers.saved.tioga     |   117 +
 external/hypre/src/test/TEST_ams/solvers.sh   |     4 +-
 .../src/test/TEST_bench/benchmark_ij.jobs     |    63 +-
 .../TEST_bench/benchmark_ij.perf.saved.lassen |   106 +-
 .../TEST_bench/benchmark_ij.perf.saved.ray    |    75 -
 .../TEST_bench/benchmark_ij.perf.saved.tioga  |    81 +
 .../test/TEST_bench/benchmark_ij.saved.lassen |   176 +-
 .../test/TEST_bench/benchmark_ij.saved.ray    |   200 -
 .../test/TEST_bench/benchmark_ij.saved.tioga  |   107 +
 .../hypre/src/test/TEST_bench/benchmark_ij.sh |    23 +-
 .../src/test/TEST_bench/benchmark_spgemm.jobs |    65 +
 .../benchmark_spgemm.perf.saved.lassen        |    72 +
 .../benchmark_spgemm.perf.saved.tioga         |    72 +
 .../TEST_bench/benchmark_spgemm.saved.lassen  |   108 +
 .../TEST_bench/benchmark_spgemm.saved.tioga   |   108 +
 .../src/test/TEST_bench/benchmark_spgemm.sh   |    78 +
 .../src/test/TEST_bench/benchmark_struct.jobs |    20 +-
 .../benchmark_struct.perf.saved.lassen        |    32 +-
 .../benchmark_struct.perf.saved.ray           |    24 -
 .../benchmark_struct.perf.saved.tioga         |    24 +
 ...saved.ray => benchmark_struct.saved.tioga} |     0
 .../src/test/TEST_bench/benchmark_struct.sh   |    19 +-
 external/hypre/src/test/TEST_error/error.jobs |    22 +
 .../hypre/src/test/TEST_error/error.saved     |    97 +
 .../src/test/TEST_error/error.saved.lassen    |    71 +
 external/hypre/src/test/TEST_error/error.sh   |    43 +
 .../hypre/src/test/TEST_examples/bigint.jobs  |     4 +-
 .../hypre/src/test/TEST_examples/bigint.saved |     1 +
 .../hypre/src/test/TEST_examples/bigint.sh    |     4 +-
 .../hypre/src/test/TEST_examples/complex.jobs |     4 +-
 .../hypre/src/test/TEST_examples/complex.sh   |     4 +-
 .../hypre/src/test/TEST_examples/default.jobs |     4 +-
 .../src/test/TEST_examples/default.saved      |     1 +
 .../hypre/src/test/TEST_examples/default.sh   |     4 +-
 .../test/TEST_examples/fortran_examples.jobs  |     4 +-
 .../test/TEST_examples/fortran_examples.sh    |     4 +-
 .../hypre/src/test/TEST_examples/gpu.jobs     |     8 +-
 .../src/test/TEST_examples/gpu.saved.lassen   |    20 +-
 .../src/test/TEST_examples/gpu.saved.ray      |    78 -
 external/hypre/src/test/TEST_examples/gpu.sh  |     8 +-
 .../hypre/src/test/TEST_examples/maxdim.jobs  |     4 +-
 .../hypre/src/test/TEST_examples/maxdim.sh    |     4 +-
 external/hypre/src/test/TEST_fac/3lev.in      |     2 +-
 .../hypre/src/test/TEST_fac/3lev_multibox.in  |     2 +-
 external/hypre/src/test/TEST_fac/4lev.in      |     2 +-
 external/hypre/src/test/TEST_fac/5lev.in      |     2 +-
 external/hypre/src/test/TEST_fac/6lev.in      |     2 +-
 external/hypre/src/test/TEST_fac/7lev.in      |     2 +-
 .../hypre/src/test/TEST_fac/sstruct_fac.jobs  |    14 +-
 .../hypre/src/test/TEST_fac/sstruct_fac.saved |    16 -
 .../hypre/src/test/TEST_fac/sstruct_fac.sh    |    28 +-
 external/hypre/src/test/TEST_fei/solvers.jobs |     4 +-
 external/hypre/src/test/TEST_fei/solvers.sh   |     4 +-
 .../hypre/src/test/TEST_gpumemcheck/gpu.jobs  |    13 +
 .../test/TEST_gpumemcheck/gpu.saved.lassen    |    40 +
 .../hypre/src/test/TEST_gpumemcheck/gpu.sh    |    34 +
 .../hypre/src/test/TEST_ij/agg_interp.jobs    |    40 +-
 .../hypre/src/test/TEST_ij/agg_interp.saved   |    72 +
 .../src/test/TEST_ij/agg_interp.saved.aurora  |   192 +
 .../src/test/TEST_ij/agg_interp.saved.lassen  |   104 +-
 .../test/TEST_ij/agg_interp.saved.lassen_cpu  |   192 +
 .../src/test/TEST_ij/agg_interp.saved.ray     |   120 -
 external/hypre/src/test/TEST_ij/agg_interp.sh |    16 +-
 external/hypre/src/test/TEST_ij/air.jobs      |     4 +-
 .../hypre/src/test/TEST_ij/air.saved.aurora   |    48 +
 .../hypre/src/test/TEST_ij/air.saved.lassen   |    12 +-
 .../src/test/TEST_ij/air.saved.lassen_cpu     |    48 +
 external/hypre/src/test/TEST_ij/air.saved.ray |    48 -
 external/hypre/src/test/TEST_ij/air.sh        |     4 +-
 external/hypre/src/test/TEST_ij/amgdd.jobs    |     4 +-
 .../hypre/src/test/TEST_ij/amgdd.saved.aurora |    64 +
 .../hypre/src/test/TEST_ij/amgdd.saved.lassen |    38 +-
 .../src/test/TEST_ij/amgdd.saved.lassen_cpu   |    64 +
 .../hypre/src/test/TEST_ij/amgdd.saved.ray    |    64 -
 external/hypre/src/test/TEST_ij/amgdd.sh      |     4 +-
 external/hypre/src/test/TEST_ij/assembly.jobs |    20 +
 external/hypre/src/test/TEST_ij/assembly.sh   |    49 +
 .../hypre/src/test/TEST_ij/coarsening.jobs    |     4 +-
 ...ning.saved.ray => coarsening.saved.aurora} |    38 +-
 .../src/test/TEST_ij/coarsening.saved.lassen  |    34 +-
 .../test/TEST_ij/coarsening.saved.lassen_cpu  |    74 +
 external/hypre/src/test/TEST_ij/coarsening.sh |     4 +-
 .../data/beam_hex_dof459_np2/A.IJ.00000       | 11467 +++++++++
 .../data/beam_hex_dof459_np2/A.IJ.00001       | 10142 ++++++++
 .../data/beam_hex_dof459_np2/b.IJ.00000       |   244 +
 .../data/beam_hex_dof459_np2/b.IJ.00001       |   217 +
 .../TEST_ij/data/beam_hex_dof459_np2/mfem.txt |    19 +
 .../data/beam_hex_dof459_np2/rbms.0.00000     |   244 +
 .../data/beam_hex_dof459_np2/rbms.0.00001     |   217 +
 .../data/beam_hex_dof459_np2/rbms.1.00000     |   244 +
 .../data/beam_hex_dof459_np2/rbms.1.00001     |   217 +
 .../data/beam_hex_dof459_np2/rbms.2.00000     |   244 +
 .../data/beam_hex_dof459_np2/rbms.2.00001     |   217 +
 .../data/beam_tet_dof2475_np4/A.IJ.00000      | 20224 ++++++++++++++++
 .../data/beam_tet_dof2475_np4/A.IJ.00001      | 17368 +++++++++++++
 .../data/beam_tet_dof2475_np4/A.IJ.00002      | 17977 ++++++++++++++
 .../data/beam_tet_dof2475_np4/A.IJ.00003      | 17368 +++++++++++++
 .../data/beam_tet_dof2475_np4/b.IJ.00000      |   676 +
 .../data/beam_tet_dof2475_np4/b.IJ.00001      |   601 +
 .../data/beam_tet_dof2475_np4/b.IJ.00002      |   601 +
 .../data/beam_tet_dof2475_np4/b.IJ.00003      |   601 +
 .../data/beam_tet_dof2475_np4/mfem.txt        |    19 +
 .../data/beam_tet_dof2475_np4/rbms.0.00000    |   676 +
 .../data/beam_tet_dof2475_np4/rbms.0.00001    |   601 +
 .../data/beam_tet_dof2475_np4/rbms.0.00002    |   601 +
 .../data/beam_tet_dof2475_np4/rbms.0.00003    |   601 +
 .../data/beam_tet_dof2475_np4/rbms.1.00000    |   676 +
 .../data/beam_tet_dof2475_np4/rbms.1.00001    |   601 +
 .../data/beam_tet_dof2475_np4/rbms.1.00002    |   601 +
 .../data/beam_tet_dof2475_np4/rbms.1.00003    |   601 +
 .../data/beam_tet_dof2475_np4/rbms.2.00000    |   676 +
 .../data/beam_tet_dof2475_np4/rbms.2.00001    |   601 +
 .../data/beam_tet_dof2475_np4/rbms.2.00002    |   601 +
 .../data/beam_tet_dof2475_np4/rbms.2.00003    |   601 +
 .../data/beam_tet_dof459_np1/A.IJ.00000       | 11278 +++++++++
 .../data/beam_tet_dof459_np1/b.IJ.00000       |   460 +
 .../TEST_ij/data/beam_tet_dof459_np1/mfem.txt |    19 +
 .../data/beam_tet_dof459_np1/rbms.0.00000     |   460 +
 .../data/beam_tet_dof459_np1/rbms.1.00000     |   460 +
 .../data/beam_tet_dof459_np1/rbms.2.00000     |   460 +
 .../TEST_ij/data/generate_poisson_10x10x10.sh |    54 +
 .../poisson_10x10x10_np1/IJ.A.i4f4.00000.bin  |   Bin 0 -> 76888 bytes
 .../poisson_10x10x10_np1/IJ.A.i4f8.00000.bin  |   Bin 0 -> 102488 bytes
 .../poisson_10x10x10_np1/IJ.A.i8f4.00000.bin  |   Bin 0 -> 128088 bytes
 .../poisson_10x10x10_np1/IJ.A.i8f8.00000.bin  |   Bin 0 -> 153688 bytes
 .../poisson_10x10x10_np1/IJ.b.i4f4.00000.bin  |   Bin 0 -> 4064 bytes
 .../poisson_10x10x10_np1/IJ.b.i4f8.00000.bin  |   Bin 0 -> 8064 bytes
 .../poisson_10x10x10_np1/IJ.b.i8f4.00000.bin  |   Bin 0 -> 4064 bytes
 .../poisson_10x10x10_np1/IJ.b.i8f8.00000.bin  |   Bin 0 -> 8064 bytes
 .../poisson_10x10x10_np1/IJ.x0.i4f4.00000.bin |   Bin 0 -> 4064 bytes
 .../poisson_10x10x10_np1/IJ.x0.i4f8.00000.bin |   Bin 0 -> 8064 bytes
 .../poisson_10x10x10_np1/IJ.x0.i8f4.00000.bin |   Bin 0 -> 4064 bytes
 .../poisson_10x10x10_np1/IJ.x0.i8f8.00000.bin |   Bin 0 -> 8064 bytes
 .../poisson_10x10x10_np4/IJ.A.i4f4.00000.bin  |   Bin 0 -> 19288 bytes
 .../poisson_10x10x10_np4/IJ.A.i4f4.00001.bin  |   Bin 0 -> 19288 bytes
 .../poisson_10x10x10_np4/IJ.A.i4f4.00002.bin  |   Bin 0 -> 19288 bytes
 .../poisson_10x10x10_np4/IJ.A.i4f4.00003.bin  |   Bin 0 -> 19288 bytes
 .../poisson_10x10x10_np4/IJ.A.i4f8.00000.bin  |   Bin 0 -> 25688 bytes
 .../poisson_10x10x10_np4/IJ.A.i4f8.00001.bin  |   Bin 0 -> 25688 bytes
 .../poisson_10x10x10_np4/IJ.A.i4f8.00002.bin  |   Bin 0 -> 25688 bytes
 .../poisson_10x10x10_np4/IJ.A.i4f8.00003.bin  |   Bin 0 -> 25688 bytes
 .../poisson_10x10x10_np4/IJ.A.i8f4.00000.bin  |   Bin 0 -> 32088 bytes
 .../poisson_10x10x10_np4/IJ.A.i8f4.00001.bin  |   Bin 0 -> 32088 bytes
 .../poisson_10x10x10_np4/IJ.A.i8f4.00002.bin  |   Bin 0 -> 32088 bytes
 .../poisson_10x10x10_np4/IJ.A.i8f4.00003.bin  |   Bin 0 -> 32088 bytes
 .../poisson_10x10x10_np4/IJ.A.i8f8.00000.bin  |   Bin 0 -> 38488 bytes
 .../poisson_10x10x10_np4/IJ.A.i8f8.00001.bin  |   Bin 0 -> 38488 bytes
 .../poisson_10x10x10_np4/IJ.A.i8f8.00002.bin  |   Bin 0 -> 38488 bytes
 .../poisson_10x10x10_np4/IJ.A.i8f8.00003.bin  |   Bin 0 -> 38488 bytes
 .../poisson_10x10x10_np4/IJ.b.i4f4.00000.bin  |   Bin 0 -> 1064 bytes
 .../poisson_10x10x10_np4/IJ.b.i4f4.00001.bin  |   Bin 0 -> 1064 bytes
 .../poisson_10x10x10_np4/IJ.b.i4f4.00002.bin  |   Bin 0 -> 1064 bytes
 .../poisson_10x10x10_np4/IJ.b.i4f4.00003.bin  |   Bin 0 -> 1064 bytes
 .../poisson_10x10x10_np4/IJ.b.i4f8.00000.bin  |   Bin 0 -> 2064 bytes
 .../poisson_10x10x10_np4/IJ.b.i4f8.00001.bin  |   Bin 0 -> 2064 bytes
 .../poisson_10x10x10_np4/IJ.b.i4f8.00002.bin  |   Bin 0 -> 2064 bytes
 .../poisson_10x10x10_np4/IJ.b.i4f8.00003.bin  |   Bin 0 -> 2064 bytes
 .../poisson_10x10x10_np4/IJ.b.i8f4.00000.bin  |   Bin 0 -> 1064 bytes
 .../poisson_10x10x10_np4/IJ.b.i8f4.00001.bin  |   Bin 0 -> 1064 bytes
 .../poisson_10x10x10_np4/IJ.b.i8f4.00002.bin  |   Bin 0 -> 1064 bytes
 .../poisson_10x10x10_np4/IJ.b.i8f4.00003.bin  |   Bin 0 -> 1064 bytes
 .../poisson_10x10x10_np4/IJ.b.i8f8.00000.bin  |   Bin 0 -> 2064 bytes
 .../poisson_10x10x10_np4/IJ.b.i8f8.00001.bin  |   Bin 0 -> 2064 bytes
 .../poisson_10x10x10_np4/IJ.b.i8f8.00002.bin  |   Bin 0 -> 2064 bytes
 .../poisson_10x10x10_np4/IJ.b.i8f8.00003.bin  |   Bin 0 -> 2064 bytes
 .../poisson_10x10x10_np4/IJ.x0.i4f4.00000.bin |   Bin 0 -> 1064 bytes
 .../poisson_10x10x10_np4/IJ.x0.i4f4.00001.bin |   Bin 0 -> 1064 bytes
 .../poisson_10x10x10_np4/IJ.x0.i4f4.00002.bin |   Bin 0 -> 1064 bytes
 .../poisson_10x10x10_np4/IJ.x0.i4f4.00003.bin |   Bin 0 -> 1064 bytes
 .../poisson_10x10x10_np4/IJ.x0.i4f8.00000.bin |   Bin 0 -> 2064 bytes
 .../poisson_10x10x10_np4/IJ.x0.i4f8.00001.bin |   Bin 0 -> 2064 bytes
 .../poisson_10x10x10_np4/IJ.x0.i4f8.00002.bin |   Bin 0 -> 2064 bytes
 .../poisson_10x10x10_np4/IJ.x0.i4f8.00003.bin |   Bin 0 -> 2064 bytes
 .../poisson_10x10x10_np4/IJ.x0.i8f4.00000.bin |   Bin 0 -> 1064 bytes
 .../poisson_10x10x10_np4/IJ.x0.i8f4.00001.bin |   Bin 0 -> 1064 bytes
 .../poisson_10x10x10_np4/IJ.x0.i8f4.00002.bin |   Bin 0 -> 1064 bytes
 .../poisson_10x10x10_np4/IJ.x0.i8f4.00003.bin |   Bin 0 -> 1064 bytes
 .../poisson_10x10x10_np4/IJ.x0.i8f8.00000.bin |   Bin 0 -> 2064 bytes
 .../poisson_10x10x10_np4/IJ.x0.i8f8.00001.bin |   Bin 0 -> 2064 bytes
 .../poisson_10x10x10_np4/IJ.x0.i8f8.00002.bin |   Bin 0 -> 2064 bytes
 .../poisson_10x10x10_np4/IJ.x0.i8f8.00003.bin |   Bin 0 -> 2064 bytes
 .../test/TEST_ij/data/tucker21935/IJ.A.00000  |  8570 +++++++
 .../test/TEST_ij/data/tucker21935/IJ.A.00001  | 16687 +++++++++++++
 .../test/TEST_ij/data/tucker21935/IJ.A.00002  |  9372 +++++++
 .../test/TEST_ij/data/tucker21935/IJ.A.00003  | 16553 +++++++++++++
 external/hypre/src/test/TEST_ij/default.jobs  |     4 +-
 .../src/test/TEST_ij/default.saved.aurora     |    21 +
 .../src/test/TEST_ij/default.saved.lassen_cpu |    21 +
 .../hypre/src/test/TEST_ij/default.saved.ray  |    21 -
 external/hypre/src/test/TEST_ij/default.sh    |     4 +-
 external/hypre/src/test/TEST_ij/elast.jobs    |     4 +-
 .../hypre/src/test/TEST_ij/elast.saved.aurora |    84 +
 .../hypre/src/test/TEST_ij/elast.saved.lassen |    36 +-
 ...elast.saved.ray => elast.saved.lassen_cpu} |    58 +-
 external/hypre/src/test/TEST_ij/elast.sh      |     4 +-
 external/hypre/src/test/TEST_ij/fsai.jobs     |    89 +
 external/hypre/src/test/TEST_ij/fsai.saved    |   152 +
 .../hypre/src/test/TEST_ij/fsai.saved.aurora  |   152 +
 .../hypre/src/test/TEST_ij/fsai.saved.lassen  |   151 +
 .../src/test/TEST_ij/fsai.saved.lassen_cpu    |   152 +
 external/hypre/src/test/TEST_ij/fsai.sh       |    67 +
 external/hypre/src/test/TEST_ij/ilu.jobs      |    49 +
 external/hypre/src/test/TEST_ij/ilu.saved     |   104 +
 .../hypre/src/test/TEST_ij/ilu.saved.aurora   |   104 +
 .../hypre/src/test/TEST_ij/ilu.saved.lassen   |   104 +
 .../src/test/TEST_ij/ilu.saved.lassen_cpu     |   104 +
 external/hypre/src/test/TEST_ij/ilu.sh        |    56 +
 external/hypre/src/test/TEST_ij/interp.jobs   |    14 +-
 external/hypre/src/test/TEST_ij/interp.saved  |    27 +
 .../src/test/TEST_ij/interp.saved.aurora      |    91 +
 .../src/test/TEST_ij/interp.saved.lassen      |    59 +-
 .../src/test/TEST_ij/interp.saved.lassen_cpu  |    90 +
 .../hypre/src/test/TEST_ij/interp.saved.ray   |    63 -
 external/hypre/src/test/TEST_ij/interp.sh     |     8 +-
 external/hypre/src/test/TEST_ij/io.jobs       |    71 +
 external/hypre/src/test/TEST_ij/io.saved      |    47 +
 external/hypre/src/test/TEST_ij/io.sh         |    43 +
 external/hypre/src/test/TEST_ij/lazy.jobs     |    16 +
 external/hypre/src/test/TEST_ij/lazy.sh       |    29 +
 external/hypre/src/test/TEST_ij/matrix.jobs   |    26 +-
 external/hypre/src/test/TEST_ij/matrix.saved  |    23 +
 .../{matrix.saved.ray => matrix.saved.aurora} |    36 +-
 .../src/test/TEST_ij/matrix.saved.lassen      |    35 +-
 .../src/test/TEST_ij/matrix.saved.lassen_cpu  |    75 +
 external/hypre/src/test/TEST_ij/matrix.sh     |    10 +-
 .../hypre/src/test/TEST_ij/nonmixedint.jobs   |     4 +-
 ...int.saved.ray => nonmixedint.saved.aurora} |     2 +-
 .../src/test/TEST_ij/nonmixedint.saved.lassen |     2 +-
 .../test/TEST_ij/nonmixedint.saved.lassen_cpu |    12 +
 .../hypre/src/test/TEST_ij/nonmixedint.sh     |     4 +-
 external/hypre/src/test/TEST_ij/posneg.jobs   |    17 +
 external/hypre/src/test/TEST_ij/posneg.sh     |    46 +
 external/hypre/src/test/TEST_ij/smoother.jobs |    10 +-
 .../hypre/src/test/TEST_ij/smoother.saved     |    14 +-
 .../src/test/TEST_ij/smoother.saved.aurora    |   120 +
 .../src/test/TEST_ij/smoother.saved.lassen    |    84 +-
 .../test/TEST_ij/smoother.saved.lassen_cpu    |   120 +
 .../hypre/src/test/TEST_ij/smoother.saved.ray |   112 -
 external/hypre/src/test/TEST_ij/smoother.sh   |     6 +-
 external/hypre/src/test/TEST_ij/solvers.jobs  |    77 +-
 external/hypre/src/test/TEST_ij/solvers.saved |   178 +-
 .../src/test/TEST_ij/solvers.saved.aurora     |   327 +
 .../src/test/TEST_ij/solvers.saved.lassen     |   311 +-
 .../src/test/TEST_ij/solvers.saved.lassen_cpu |   326 +
 .../hypre/src/test/TEST_ij/solvers.saved.ray  |   359 -
 external/hypre/src/test/TEST_ij/solvers.sh    |    77 +-
 external/hypre/src/test/TEST_ij/state.jobs    |    13 +
 external/hypre/src/test/TEST_ij/state.saved   |    13 +
 .../hypre/src/test/TEST_ij/state.saved.aurora |     8 +
 .../hypre/src/test/TEST_ij/state.saved.lassen |    13 +
 .../src/test/TEST_ij/state.saved.lassen_cpu   |    13 +
 external/hypre/src/test/TEST_ij/state.sh      |    23 +
 external/hypre/src/test/TEST_ij/tst.00000     |    21 +
 external/hypre/src/test/TEST_ij/tst.00001     |    20 +
 external/hypre/src/test/TEST_ij/vector.jobs   |    51 +
 external/hypre/src/test/TEST_ij/vector.saved  |   121 +
 .../src/test/TEST_ij/vector.saved.aurora      |   121 +
 .../src/test/TEST_ij/vector.saved.lassen      |   121 +
 .../src/test/TEST_ij/vector.saved.lassen_cpu  |   121 +
 external/hypre/src/test/TEST_ij/vector.sh     |    85 +
 .../hypre/src/test/TEST_ij/versioncheck.jobs  |    12 +
 .../hypre/src/test/TEST_ij/versioncheck.sh    |    36 +
 .../hypre/src/test/TEST_lobpcg/ijdefault.jobs |     4 +-
 .../hypre/src/test/TEST_lobpcg/ijdefault.sh   |     4 +-
 .../hypre/src/test/TEST_lobpcg/ijoptions.jobs |     4 +-
 .../hypre/src/test/TEST_lobpcg/ijoptions.sh   |     6 +-
 .../src/test/TEST_lobpcg/nonmixedint.jobs     |     4 +-
 .../hypre/src/test/TEST_lobpcg/nonmixedint.sh |     4 +-
 .../src/test/TEST_lobpcg/sstruct.in.default   |     2 +-
 .../hypre/src/test/TEST_lobpcg/sstruct.jobs   |     4 +-
 .../hypre/src/test/TEST_lobpcg/sstruct.sh     |     4 +-
 .../hypre/src/test/TEST_lobpcg/struct.jobs    |     4 +-
 external/hypre/src/test/TEST_lobpcg/struct.sh |     4 +-
 .../src/test/TEST_longdouble/solvers_ij.jobs  |     4 +-
 .../src/test/TEST_longdouble/solvers_ij.saved |    55 +-
 .../src/test/TEST_longdouble/solvers_ij.sh    |     4 +-
 .../test/TEST_longdouble/solvers_struct.jobs  |     4 +-
 .../test/TEST_longdouble/solvers_struct.saved |    12 +-
 .../test/TEST_longdouble/solvers_struct.sh    |     4 +-
 .../src/test/TEST_single/solvers_ij.jobs      |     4 +-
 .../src/test/TEST_single/solvers_ij.saved     |    21 +-
 .../test/TEST_single/solvers_ij.saved.lassen  |   145 +
 .../hypre/src/test/TEST_single/solvers_ij.sh  |     4 +-
 .../src/test/TEST_single/solvers_struct.jobs  |     4 +-
 .../TEST_single/solvers_struct.saved.lassen   |   120 +
 .../src/test/TEST_single/solvers_struct.sh    |     4 +-
 .../src/test/TEST_sstruct/addtovalues.jobs    |     2 +-
 .../TEST_sstruct/addtovalues.saved.lassen     |     8 +-
 ...saved.ray => addtovalues.saved.lassen_cpu} |    16 +-
 .../src/test/TEST_sstruct/addtovalues.sh      |     4 +-
 .../hypre/src/test/TEST_sstruct/amr2d.jobs    |     4 +-
 .../src/test/TEST_sstruct/amr2d.saved.lassen  |    12 +-
 ...amr2d.saved.ray => amr2d.saved.lassen_cpu} |    24 +-
 external/hypre/src/test/TEST_sstruct/amr2d.sh |     4 +-
 .../hypre/src/test/TEST_sstruct/cube.jobs     |     4 +-
 .../{cube.saved.ray => cube.saved.lassen_cpu} |     0
 external/hypre/src/test/TEST_sstruct/cube.sh  |     4 +-
 .../hypre/src/test/TEST_sstruct/cycred.jobs   |     4 +-
 ...cred.saved.ray => cycred.saved.lassen_cpu} |     0
 .../hypre/src/test/TEST_sstruct/cycred.sh     |     4 +-
 .../src/test/TEST_sstruct/default2d.jobs      |     4 +-
 ...d.saved.ray => default2d.saved.lassen_cpu} |     0
 .../hypre/src/test/TEST_sstruct/default2d.sh  |     4 +-
 .../src/test/TEST_sstruct/default3d.jobs      |     4 +-
 ...d.saved.ray => default3d.saved.lassen_cpu} |     0
 .../hypre/src/test/TEST_sstruct/default3d.sh  |     4 +-
 .../src/test/TEST_sstruct/emptyProc.jobs      |     2 +-
 .../test/TEST_sstruct/emptyProc.saved.lassen  |     6 +-
 ...c.saved.ray => emptyProc.saved.lassen_cpu} |    12 +-
 .../hypre/src/test/TEST_sstruct/emptyProc.sh  |     4 +-
 external/hypre/src/test/TEST_sstruct/io.jobs  |    61 +
 external/hypre/src/test/TEST_sstruct/io.saved |   127 +
 .../src/test/TEST_sstruct/io.saved.lassen     |   128 +
 .../src/test/TEST_sstruct/io.saved.lassen_cpu |   128 +
 external/hypre/src/test/TEST_sstruct/io.sh    |    61 +
 .../hypre/src/test/TEST_sstruct/maxwell.jobs  |     2 +-
 .../test/TEST_sstruct/maxwell.saved.lassen    |     6 +-
 ...ell.saved.ray => maxwell.saved.lassen_cpu} |     6 +-
 .../hypre/src/test/TEST_sstruct/maxwell.sh    |     4 +-
 .../hypre/src/test/TEST_sstruct/miller.jobs   |     4 +-
 .../src/test/TEST_sstruct/miller.saved.lassen |     6 +-
 ...ller.saved.ray => miller.saved.lassen_cpu} |    16 +-
 .../hypre/src/test/TEST_sstruct/miller.sh     |     4 +-
 .../src/test/TEST_sstruct/neighborpart.jobs   |     4 +-
 .../src/test/TEST_sstruct/neighborpart.saved  |     6 +-
 .../TEST_sstruct/neighborpart.saved.lassen    |     6 +-
 ...aved.ray => neighborpart.saved.lassen_cpu} |     6 +-
 .../src/test/TEST_sstruct/neighborpart.sh     |     4 +-
 .../hypre/src/test/TEST_sstruct/neumann.jobs  |     4 +-
 ...ann.saved.ray => neumann.saved.lassen_cpu} |     0
 .../hypre/src/test/TEST_sstruct/neumann.sh    |     4 +-
 .../src/test/TEST_sstruct/nonmixedint.jobs    |     4 +-
 ...saved.ray => nonmixedint.saved.lassen_cpu} |     0
 .../src/test/TEST_sstruct/nonmixedint.sh      |     4 +-
 .../hypre/src/test/TEST_sstruct/periodic.jobs |     4 +-
 ...ic.saved.ray => periodic.saved.lassen_cpu} |     0
 .../hypre/src/test/TEST_sstruct/periodic.sh   |     4 +-
 .../src/test/TEST_sstruct/sharedpart.jobs     |     4 +-
 .../src/test/TEST_sstruct/sharedpart.saved    |     6 +-
 .../test/TEST_sstruct/sharedpart.saved.lassen |     6 +-
 ....saved.ray => sharedpart.saved.lassen_cpu} |    16 +-
 .../hypre/src/test/TEST_sstruct/sharedpart.sh |     4 +-
 .../hypre/src/test/TEST_sstruct/solvers.jobs  |     4 +-
 .../test/TEST_sstruct/solvers.saved.lassen    |    10 +-
 ...ers.saved.ray => solvers.saved.lassen_cpu} |    20 +-
 .../hypre/src/test/TEST_sstruct/solvers.sh    |     4 +-
 .../src/test/TEST_sstruct/sstruct.in.19aniso  |     2 +-
 .../src/test/TEST_sstruct/sstruct.in.19iso    |     2 +-
 .../src/test/TEST_sstruct/sstruct.in.7aniso   |     2 +-
 .../src/test/TEST_sstruct/sstruct.in.7iso     |     2 +-
 .../src/test/TEST_sstruct/sstruct.in.7zero-x  |     2 +-
 .../src/test/TEST_sstruct/sstruct.in.7zero-y  |     2 +-
 .../src/test/TEST_sstruct/sstruct.in.7zero-z  |     2 +-
 .../sstruct.in.addtoval_cellcentre            |     2 +-
 .../TEST_sstruct/sstruct.in.addtoval_edges    |     2 +-
 .../src/test/TEST_sstruct/sstruct.in.amr.2D   |     2 +-
 .../src/test/TEST_sstruct/sstruct.in.amr.2Db  |     2 +-
 .../src/test/TEST_sstruct/sstruct.in.amr.2Dc  |     2 +-
 .../src/test/TEST_sstruct/sstruct.in.amr.2De  |     2 +-
 .../test/TEST_sstruct/sstruct.in.amr.graphadd |     2 +-
 .../src/test/TEST_sstruct/sstruct.in.bcube    |     2 +-
 .../test/TEST_sstruct/sstruct.in.bcube-fem    |     2 +-
 .../src/test/TEST_sstruct/sstruct.in.block    |     2 +-
 .../src/test/TEST_sstruct/sstruct.in.cube     |     2 +-
 .../src/test/TEST_sstruct/sstruct.in.cube-fem |    45 +
 .../src/test/TEST_sstruct/sstruct.in.cube21   |     2 +-
 .../test/TEST_sstruct/sstruct.in.cubes2_aniso |    99 +
 .../test/TEST_sstruct/sstruct.in.cubes4_27pt  |   266 +
 .../test/TEST_sstruct/sstruct.in.cycred-1Dx   |     2 +-
 .../test/TEST_sstruct/sstruct.in.cycred-2Dx   |     2 +-
 .../test/TEST_sstruct/sstruct.in.cycred-2Dy   |     2 +-
 .../test/TEST_sstruct/sstruct.in.cycred-3Dx   |     2 +-
 .../test/TEST_sstruct/sstruct.in.cycred-3Dy   |     2 +-
 .../test/TEST_sstruct/sstruct.in.cycred-3Dz   |     2 +-
 .../src/test/TEST_sstruct/sstruct.in.default  |     2 +-
 .../test/TEST_sstruct/sstruct.in.default_2D   |     2 +-
 .../test/TEST_sstruct/sstruct.in.dirichlet    |     2 +-
 .../test/TEST_sstruct/sstruct.in.emptyProc1   |     2 +-
 .../test/TEST_sstruct/sstruct.in.emptyProc2   |     2 +-
 .../test/TEST_sstruct/sstruct.in.emptyProc3   |     2 +-
 .../test/TEST_sstruct/sstruct.in.enhanced3D   |     2 +-
 .../test/TEST_sstruct/sstruct.in.fe_all2_2D   |     2 +-
 .../TEST_sstruct/sstruct.in.fe_all2_2D_coord  |     2 +-
 .../test/TEST_sstruct/sstruct.in.fe_all2_2Ds  |     2 +-
 .../test/TEST_sstruct/sstruct.in.fe_all2_2Dss |     2 +-
 .../test/TEST_sstruct/sstruct.in.fe_all2_3D   |     2 +-
 .../TEST_sstruct/sstruct.in.fe_all2_3D_coord  |     2 +-
 .../test/TEST_sstruct/sstruct.in.fe_all3_3D   |     2 +-
 .../TEST_sstruct/sstruct.in.fe_all3_3D_coord  |     2 +-
 .../test/TEST_sstruct/sstruct.in.fe_node1_2D  |     2 +-
 .../test/TEST_sstruct/sstruct.in.fe_node2_2D  |     2 +-
 .../TEST_sstruct/sstruct.in.fe_node2_2D_coord |     2 +-
 .../test/TEST_sstruct/sstruct.in.fe_rhombus5  |     2 +-
 .../src/test/TEST_sstruct/sstruct.in.laps     |     2 +-
 .../TEST_sstruct/sstruct.in.laps.periodic     |     2 +-
 .../src/test/TEST_sstruct/sstruct.in.marinak  |     2 +-
 .../sstruct.in.maxwell3d_unscaled             |     2 +-
 .../test/TEST_sstruct/sstruct.in.miller_2blk  |     2 +-
 .../test/TEST_sstruct/sstruct.in.miller_2blk1 |     2 +-
 .../test/TEST_sstruct/sstruct.in.miller_2stk  |     2 +-
 .../test/TEST_sstruct/sstruct.in.miller_3blk  |    19 +-
 .../test/TEST_sstruct/sstruct.in.miller_diag  |     2 +-
 .../src/test/TEST_sstruct/sstruct.in.neumann  |     2 +-
 .../test/TEST_sstruct/sstruct.in.neumann-yz   |     2 +-
 .../sstruct.in.noaddtoval_cellcentre          |     2 +-
 .../TEST_sstruct/sstruct.in.noaddtoval_edges  |     2 +-
 .../src/test/TEST_sstruct/sstruct.in.p19aniso |     2 +-
 .../src/test/TEST_sstruct/sstruct.in.p19iso   |     2 +-
 .../src/test/TEST_sstruct/sstruct.in.p7aniso  |     2 +-
 .../src/test/TEST_sstruct/sstruct.in.p7iso    |     2 +-
 .../src/test/TEST_sstruct/sstruct.in.pcube    |     2 +-
 .../src/test/TEST_sstruct/sstruct.in.periodic |     2 +-
 .../test/TEST_sstruct/sstruct.in.periodic.2D  |     2 +-
 .../test/TEST_sstruct/sstruct.in.periodic.add |     2 +-
 .../TEST_sstruct/sstruct.in.periodic.bigA     |     2 +-
 .../TEST_sstruct/sstruct.in.periodic.bigB     |     2 +-
 .../TEST_sstruct/sstruct.in.periodic.cellA    |     2 +-
 .../TEST_sstruct/sstruct.in.periodic.cellB    |     2 +-
 .../TEST_sstruct/sstruct.in.periodic.nodeA    |     2 +-
 .../TEST_sstruct/sstruct.in.periodic.nodeB    |     2 +-
 .../test/TEST_sstruct/sstruct.in.reduced3D    |     2 +-
 .../test/TEST_sstruct/sstruct.in.reduced3D-4  |     2 +-
 .../src/test/TEST_sstruct/sstruct.in.struct   |     2 +-
 .../src/test/TEST_sstruct/sstruct.in.symm0    |     2 +-
 .../src/test/TEST_sstruct/sstruct.in.symm0.2D |     2 +-
 .../src/test/TEST_sstruct/sstruct.in.symm1    |     2 +-
 .../src/test/TEST_sstruct/sstruct.in.symm1.2D |     2 +-
 .../src/test/TEST_sstruct/sstruct.in.symm2    |     2 +-
 .../src/test/TEST_sstruct/sstruct.in.symm2.2D |     2 +-
 .../src/test/TEST_sstruct/sstruct.in.symm3    |     2 +-
 .../src/test/TEST_sstruct/sstruct.in.symm3.2D |     2 +-
 .../src/test/TEST_sstruct/sstruct.in.wide.2D  |     2 +-
 .../src/test/TEST_sstruct/sstruct_struct.jobs |     4 +-
 ...ed.ray => sstruct_struct.saved.lassen_cpu} |     0
 .../src/test/TEST_sstruct/sstruct_struct.sh   |     4 +-
 .../hypre/src/test/TEST_sstruct/symm.jobs     |     4 +-
 .../{symm.saved.ray => symm.saved.lassen_cpu} |     0
 external/hypre/src/test/TEST_sstruct/symm.sh  |     4 +-
 .../src/test/TEST_sstruct/versioncheck.jobs   |    12 +
 .../src/test/TEST_sstruct/versioncheck.sh     |    36 +
 .../hypre/src/test/TEST_sstruct/wide.jobs     |     4 +-
 .../{wide.saved.ray => wide.saved.lassen_cpu} |     0
 external/hypre/src/test/TEST_sstruct/wide.sh  |     4 +-
 .../hypre/src/test/TEST_sstruct/zcube.jobs    |     4 +-
 ...zcube.saved.ray => zcube.saved.lassen_cpu} |     0
 external/hypre/src/test/TEST_sstruct/zcube.sh |     4 +-
 .../src/test/TEST_sstruct/zsstruct.in.bcube   |     2 +-
 .../src/test/TEST_sstruct/zsstruct.in.cube    |     2 +-
 .../hypre/src/test/TEST_struct/cgpfmg3d.jobs  |     4 +-
 ...g3d.saved.ray => cgpfmg3d.saved.florentia} |     0
 .../TEST_struct/cgpfmg3d.saved.lassen_cpu     |     8 +
 .../src/test/TEST_struct/cgpfmg3d.saved.tioga |     8 +
 .../hypre/src/test/TEST_struct/cgpfmg3d.sh    |     4 +-
 .../hypre/src/test/TEST_struct/emptyproc.jobs |     4 +-
 ...oc.saved.ray => emptyproc.saved.florentia} |     0
 .../TEST_struct/emptyproc.saved.lassen_cpu    |    68 +
 .../test/TEST_struct/emptyproc.saved.tioga    |    68 +
 .../hypre/src/test/TEST_struct/emptyproc.sh   |     4 +-
 .../hypre/src/test/TEST_struct/hybrid.jobs    |     4 +-
 ...ybrid.saved.ray => hybrid.saved.florentia} |     0
 .../test/TEST_struct/hybrid.saved.lassen_cpu  |    20 +
 .../src/test/TEST_struct/hybrid.saved.tioga   |    20 +
 external/hypre/src/test/TEST_struct/hybrid.sh |     4 +-
 .../src/test/TEST_struct/hybridswitch.jobs    |     4 +-
 ...saved.ray => hybridswitch.saved.florentia} |     0
 .../TEST_struct/hybridswitch.saved.lassen_cpu |    32 +
 .../test/TEST_struct/hybridswitch.saved.tioga |    32 +
 .../src/test/TEST_struct/hybridswitch.sh      |     4 +-
 external/hypre/src/test/TEST_struct/lazy.jobs |    16 +
 external/hypre/src/test/TEST_struct/lazy.sh   |    21 +
 .../hypre/src/test/TEST_struct/migrate.jobs   |     4 +-
 ...rate.saved.ray => migrate.saved.florentia} |     0
 .../test/TEST_struct/migrate.saved.lassen_cpu |    27 +
 .../src/test/TEST_struct/migrate.saved.tioga  |    27 +
 .../hypre/src/test/TEST_struct/migrate.sh     |     4 +-
 .../hypre/src/test/TEST_struct/parflow.jobs   |     4 +-
 ...flow.saved.ray => parflow.saved.florentia} |     0
 .../test/TEST_struct/parflow.saved.lassen_cpu |    24 +
 .../src/test/TEST_struct/parflow.saved.tioga  |    24 +
 .../hypre/src/test/TEST_struct/parflow.sh     |     4 +-
 .../hypre/src/test/TEST_struct/periodic.jobs  |     4 +-
 .../test/TEST_struct/periodic.saved.florentia |    67 +
 ...ic.saved.ray => periodic.saved.lassen_cpu} |     0
 .../src/test/TEST_struct/periodic.saved.tioga |    68 +
 .../hypre/src/test/TEST_struct/periodic.sh    |     4 +-
 .../src/test/TEST_struct/pfmgbase1d.jobs      |     4 +-
 ...d.saved.ray => pfmgbase1d.saved.florentia} |     0
 .../TEST_struct/pfmgbase1d.saved.lassen_cpu   |     8 +
 .../test/TEST_struct/pfmgbase1d.saved.tioga   |     8 +
 .../hypre/src/test/TEST_struct/pfmgbase1d.sh  |     4 +-
 .../src/test/TEST_struct/pfmgbase2d.jobs      |     4 +-
 ...d.saved.ray => pfmgbase2d.saved.florentia} |     0
 .../TEST_struct/pfmgbase2d.saved.lassen_cpu   |    24 +
 .../test/TEST_struct/pfmgbase2d.saved.tioga   |    24 +
 .../hypre/src/test/TEST_struct/pfmgbase2d.sh  |     4 +-
 .../src/test/TEST_struct/pfmgbase3d.jobs      |     4 +-
 ...d.saved.ray => pfmgbase3d.saved.florentia} |     0
 .../TEST_struct/pfmgbase3d.saved.lassen_cpu   |    32 +
 .../test/TEST_struct/pfmgbase3d.saved.tioga   |    32 +
 .../hypre/src/test/TEST_struct/pfmgbase3d.sh  |     4 +-
 .../test/TEST_struct/pfmgconstcoeffmp.jobs    |     4 +-
 ...d.ray => pfmgconstcoeffmp.saved.florentia} |     0
 .../pfmgconstcoeffmp.saved.lassen_cpu         |    80 +
 .../TEST_struct/pfmgconstcoeffmp.saved.tioga  |    80 +
 .../src/test/TEST_struct/pfmgconstcoeffmp.sh  |     4 +-
 .../src/test/TEST_struct/pfmgorient.jobs      |     4 +-
 ...t.saved.ray => pfmgorient.saved.florentia} |     0
 .../TEST_struct/pfmgorient.saved.lassen_cpu   |    12 +
 .../test/TEST_struct/pfmgorient.saved.tioga   |    12 +
 .../hypre/src/test/TEST_struct/pfmgorient.sh  |     4 +-
 .../src/test/TEST_struct/pfmgtest1d.jobs      |     4 +-
 ...d.saved.ray => pfmgtest1d.saved.florentia} |     0
 .../TEST_struct/pfmgtest1d.saved.lassen_cpu   |    12 +
 .../test/TEST_struct/pfmgtest1d.saved.tioga   |    12 +
 .../hypre/src/test/TEST_struct/pfmgtest1d.sh  |     4 +-
 .../src/test/TEST_struct/pfmgvcycle.jobs      |     4 +-
 ...e.saved.ray => pfmgvcycle.saved.florentia} |     0
 .../TEST_struct/pfmgvcycle.saved.lassen_cpu   |     8 +
 .../test/TEST_struct/pfmgvcycle.saved.tioga   |     8 +
 .../hypre/src/test/TEST_struct/pfmgvcycle.sh  |     4 +-
 .../src/test/TEST_struct/psmgbase3d.jobs      |     4 +-
 ...d.saved.ray => psmgbase3d.saved.florentia} |     0
 .../TEST_struct/psmgbase3d.saved.lassen_cpu   |    20 +
 .../test/TEST_struct/psmgbase3d.saved.tioga   |    20 +
 .../hypre/src/test/TEST_struct/psmgbase3d.sh  |     4 +-
 .../src/test/TEST_struct/psmgtest3d.jobs      |     4 +-
 ...d.saved.ray => psmgtest3d.saved.florentia} |     0
 .../TEST_struct/psmgtest3d.saved.lassen_cpu   |     8 +
 .../test/TEST_struct/psmgtest3d.saved.tioga   |     8 +
 .../hypre/src/test/TEST_struct/psmgtest3d.sh  |     4 +-
 .../hypre/src/test/TEST_struct/smgbase1d.jobs |     4 +-
 ...1d.saved.ray => smgbase1d.saved.florentia} |     0
 .../TEST_struct/smgbase1d.saved.lassen_cpu    |     8 +
 .../test/TEST_struct/smgbase1d.saved.tioga    |     8 +
 .../hypre/src/test/TEST_struct/smgbase1d.sh   |     4 +-
 .../hypre/src/test/TEST_struct/smgbase2d.jobs |     4 +-
 ...2d.saved.ray => smgbase2d.saved.florentia} |     0
 .../TEST_struct/smgbase2d.saved.lassen_cpu    |    20 +
 .../test/TEST_struct/smgbase2d.saved.tioga    |    20 +
 .../hypre/src/test/TEST_struct/smgbase2d.sh   |     4 +-
 .../hypre/src/test/TEST_struct/smgbase3d.jobs |     4 +-
 ...3d.saved.ray => smgbase3d.saved.florentia} |     0
 .../TEST_struct/smgbase3d.saved.lassen_cpu    |    24 +
 .../test/TEST_struct/smgbase3d.saved.tioga    |    24 +
 .../hypre/src/test/TEST_struct/smgbase3d.sh   |     4 +-
 .../hypre/src/test/TEST_struct/smgtest1d.jobs |     4 +-
 ...1d.saved.ray => smgtest1d.saved.florentia} |     0
 .../TEST_struct/smgtest1d.saved.lassen_cpu    |    12 +
 .../test/TEST_struct/smgtest1d.saved.tioga    |    12 +
 .../hypre/src/test/TEST_struct/smgtest1d.sh   |     4 +-
 .../hypre/src/test/TEST_struct/smgvcycle.jobs |     4 +-
 ...le.saved.ray => smgvcycle.saved.florentia} |     0
 .../TEST_struct/smgvcycle.saved.lassen_cpu    |     4 +
 .../test/TEST_struct/smgvcycle.saved.tioga    |     4 +
 .../hypre/src/test/TEST_struct/smgvcycle.sh   |     4 +-
 .../hypre/src/test/TEST_struct/solvers.jobs   |     4 +-
 ...vers.saved.ray => solvers.saved.florentia} |     0
 .../test/TEST_struct/solvers.saved.lassen_cpu |    20 +
 .../src/test/TEST_struct/solvers.saved.tioga  |    20 +
 .../hypre/src/test/TEST_struct/solvers.sh     |     4 +-
 .../test/TEST_struct/vcpfmgRedBlackGS.jobs    |     4 +-
 ...d.ray => vcpfmgRedBlackGS.saved.florentia} |     0
 .../vcpfmgRedBlackGS.saved.lassen_cpu         |    48 +
 .../TEST_struct/vcpfmgRedBlackGS.saved.tioga  |    48 +
 .../src/test/TEST_struct/vcpfmgRedBlackGS.sh  |     4 +-
 .../test/TEST_struct/vdpfmgRedBlackGS.jobs    |     4 +-
 ...d.ray => vdpfmgRedBlackGS.saved.florentia} |     0
 .../vdpfmgRedBlackGS.saved.lassen_cpu         |    48 +
 .../TEST_struct/vdpfmgRedBlackGS.saved.tioga  |    48 +
 .../src/test/TEST_struct/vdpfmgRedBlackGS.sh  |     4 +-
 .../src/test/TEST_struct/versioncheck.jobs    |    12 +
 .../src/test/TEST_struct/versioncheck.sh      |    36 +
 .../hypre/src/test/TEST_superlu/sludist.jobs  |     4 +-
 .../hypre/src/test/TEST_superlu/sludist.saved |     2 +-
 .../hypre/src/test/TEST_superlu/sludist.sh    |     4 +-
 .../src/test/TEST_timing/efficiency.jobs      |     4 +-
 .../hypre/src/test/TEST_timing/efficiency.sh  |     4 +-
 external/hypre/src/test/ams_driver.c          |   293 +-
 external/hypre/src/test/checktest.sh          |    26 +-
 external/hypre/src/test/cleantest.sh          |    21 +-
 external/hypre/src/test/driver_commpkg.c      |   511 +-
 external/hypre/src/test/ex1_for.c             |    82 +-
 external/hypre/src/test/ex3_for.c             |   108 +-
 external/hypre/src/test/ex5_for.c             |    72 +-
 external/hypre/src/test/ex6_for.c             |    52 +-
 external/hypre/src/test/ex7_for.c             |   262 +-
 external/hypre/src/test/f77_ij.f              |    64 +-
 external/hypre/src/test/f77_ij_mv.f           |   434 -
 external/hypre/src/test/f77_struct.f          |     2 +-
 external/hypre/src/test/fei.cxx               |   244 +-
 external/hypre/src/test/fei_lscore.c          |   134 +-
 external/hypre/src/test/fij_mv.f              |     2 +-
 external/hypre/src/test/for_maxwell.c         |   220 +-
 external/hypre/src/test/fparcsr_ls.f          |     2 +-
 external/hypre/src/test/fparcsr_mv.f          |     2 +-
 external/hypre/src/test/fsstruct_ls.f         |     2 +-
 external/hypre/src/test/fsstruct_mv.f         |     2 +-
 external/hypre/src/test/fstruct_ls.f          |     2 +-
 external/hypre/src/test/fstruct_mv.f          |     2 +-
 .../hypre/src/test/hypre_ij_fortran_test.h    |    62 +-
 .../src/test/hypre_parcsr_fortran_test.h      |   609 +-
 external/hypre/src/test/hypre_set_precond.c   |  1231 +-
 .../src/test/hypre_sstruct_fortran_test.h     |   314 +-
 .../src/test/hypre_struct_fortran_test.h      |   406 +-
 external/hypre/src/test/hypre_test.h          |    16 +-
 external/hypre/src/test/ij.c                  |  4258 +++-
 external/hypre/src/test/ij_assembly.c         |  1012 +-
 external/hypre/src/test/ij_device.c           |   384 +-
 external/hypre/src/test/ij_mm.c               |  1085 +-
 external/hypre/src/test/ij_mv.c               |  1527 --
 external/hypre/src/test/maxwell_unscaled.c    |   236 +-
 external/hypre/src/test/new_ij.c              |  1758 +-
 external/hypre/src/test/runcheck.sh           |     4 +-
 external/hypre/src/test/runtest.sh            |    72 +-
 external/hypre/src/test/sstruct.c             |  5745 ++---
 external/hypre/src/test/sstruct.in.README     |     2 +-
 external/hypre/src/test/sstruct_fac.c         |   229 +-
 external/hypre/src/test/struct.c              |  1098 +-
 external/hypre/src/test/struct_migrate.c      |   117 +-
 external/hypre/src/test/struct_newboxloop.c   |   600 +-
 external/hypre/src/test/test_ij.c             |  3367 +--
 external/hypre/src/test/test_mgr.c            |  1313 -
 external/hypre/src/test/zboxloop.c            |   240 +-
 external/hypre/src/utilities/CMakeLists.txt   |    32 +-
 .../hypre/src/utilities/F90_HYPRE_error.c     |    24 +-
 .../hypre/src/utilities/F90_HYPRE_general.c   |    39 +-
 external/hypre/src/utilities/HYPRE_error_f.h  |     2 +-
 external/hypre/src/utilities/HYPRE_handle.c   |    53 +-
 .../hypre/src/utilities/HYPRE_utilities.h     |   391 +-
 external/hypre/src/utilities/HYPRE_version.c  |     2 +-
 .../hypre/src/utilities/_hypre_onedpl.hpp     |   284 +
 .../hypre/src/utilities/_hypre_utilities.h    |  3207 ++-
 .../hypre/src/utilities/_hypre_utilities.hpp  |  4032 ++-
 external/hypre/src/utilities/amg_linklist.c   |    54 +-
 external/hypre/src/utilities/amg_linklist.h   |     2 +-
 external/hypre/src/utilities/ap.c             |     4 +-
 external/hypre/src/utilities/base.h           |    33 +
 external/hypre/src/utilities/binsearch.c      |    49 +-
 .../src/utilities/caliper_instrumentation.h   |    12 +-
 external/hypre/src/utilities/complex.c        |    38 +-
 external/hypre/src/utilities/cuda_utils.c     |  1420 --
 external/hypre/src/utilities/cuda_utils.h     |   919 -
 .../hypre/src/utilities/device_allocator.h    |    10 +-
 .../{cuda_reducer.h => device_reducer.h}      |   119 +-
 external/hypre/src/utilities/device_utils.c   |  3078 +++
 external/hypre/src/utilities/device_utils.h   |  2063 ++
 external/hypre/src/utilities/error.c          |   291 +-
 external/hypre/src/utilities/error.h          |    42 +-
 .../hypre/src/utilities/exchange_data.README  |     2 +-
 external/hypre/src/utilities/exchange_data.c  |   209 +-
 external/hypre/src/utilities/exchange_data.h  |    16 +-
 external/hypre/src/utilities/fortran.h        |    39 +-
 external/hypre/src/utilities/fortran_matrix.c |   273 +-
 external/hypre/src/utilities/fortran_matrix.h |   122 +-
 external/hypre/src/utilities/functors.h       |   100 +
 external/hypre/src/utilities/general.c        |   607 +-
 external/hypre/src/utilities/general.h        |   147 +-
 external/hypre/src/utilities/gselim.h         |     2 +-
 external/hypre/src/utilities/handle.c         |   174 +-
 external/hypre/src/utilities/handle.h         |   119 +-
 external/hypre/src/utilities/headers          |    24 +-
 external/hypre/src/utilities/hopscotch_hash.c |   403 +-
 external/hypre/src/utilities/hopscotch_hash.h |  1484 +-
 external/hypre/src/utilities/int_array.c      |   621 +-
 external/hypre/src/utilities/int_array.h      |    33 +-
 .../hypre/src/utilities/int_array_device.c    |   225 +
 external/hypre/src/utilities/log.c            |     2 +-
 external/hypre/src/utilities/magma.c          |    46 +
 external/hypre/src/utilities/magma.h          |    71 +
 external/hypre/src/utilities/matrix_stats.c   |   477 +
 external/hypre/src/utilities/matrix_stats.h   |   130 +
 external/hypre/src/utilities/memory.c         |  1366 +-
 external/hypre/src/utilities/memory.h         |   163 +-
 external/hypre/src/utilities/memory_dmalloc.c |     8 +-
 external/hypre/src/utilities/memory_tracker.c |   638 +
 external/hypre/src/utilities/memory_tracker.h |   176 +
 external/hypre/src/utilities/merge_sort.c     |   185 +-
 external/hypre/src/utilities/mmio.c           |   175 +
 external/hypre/src/utilities/mmio.h           |   120 +
 external/hypre/src/utilities/mpi_comm_f2c.c   |    10 +-
 external/hypre/src/utilities/mpistubs.c       |   428 +-
 external/hypre/src/utilities/mpistubs.h       |   142 +-
 external/hypre/src/utilities/nvtx.c           |    31 +-
 external/hypre/src/utilities/omp_device.c     |     5 +-
 external/hypre/src/utilities/omp_device.h     |    11 +-
 external/hypre/src/utilities/predicates.h     |    43 +
 external/hypre/src/utilities/prefix_sum.c     |    80 +-
 external/hypre/src/utilities/printf.c         |    77 +-
 external/hypre/src/utilities/printf.h         |    16 +-
 external/hypre/src/utilities/protos           |     4 +-
 external/hypre/src/utilities/protos.h         |   316 +-
 external/hypre/src/utilities/qsort.c          |   170 +-
 external/hypre/src/utilities/qsplit.c         |    38 +-
 external/hypre/src/utilities/random.c         |    14 +-
 external/hypre/src/utilities/smp.h            |     2 +-
 external/hypre/src/utilities/state.c          |    88 +
 external/hypre/src/utilities/state.h          |    24 +
 external/hypre/src/utilities/stl_ops.c        |    53 +
 .../hypre/src/utilities/thread_protos.awk     |     2 +-
 .../hypre/src/utilities/thread_wrappers.awk   |     2 +-
 external/hypre/src/utilities/threading.c      |    14 +-
 external/hypre/src/utilities/threading.h      |     2 +-
 external/hypre/src/utilities/timer.c          |    24 +-
 external/hypre/src/utilities/timing.c         |   125 +-
 external/hypre/src/utilities/timing.h         |     8 +-
 external/hypre/src/utilities/utilities.c      |   209 +-
 external/hypre/src/utilities/version.sh       |     4 +-
 1904 files changed, 371814 insertions(+), 124561 deletions(-)
 create mode 100644 external/hypre/.gitignore
 create mode 100644 external/hypre/.readthedocs.yml
 mode change 100644 => 100755 external/hypre/AUTOTEST/basic.sh
 mode change 100644 => 100755 external/hypre/AUTOTEST/check-case.sh
 mode change 100644 => 100755 external/hypre/AUTOTEST/check-double.sh
 mode change 100644 => 100755 external/hypre/AUTOTEST/check-glob-symb.sh
 mode change 100644 => 100755 external/hypre/AUTOTEST/check-headers.sh
 mode change 100644 => 100755 external/hypre/AUTOTEST/check-int.sh
 mode change 100644 => 100755 external/hypre/AUTOTEST/check-license.sh
 mode change 100644 => 100755 external/hypre/AUTOTEST/check-mem.sh
 mode change 100644 => 100755 external/hypre/AUTOTEST/check-mpi.sh
 mode change 100644 => 100755 external/hypre/AUTOTEST/cleantest.sh
 mode change 100644 => 100755 external/hypre/AUTOTEST/cmake.bat
 create mode 100644 external/hypre/AUTOTEST/cmake.filters
 mode change 100644 => 100755 external/hypre/AUTOTEST/cmake.sh
 mode change 100644 => 100755 external/hypre/AUTOTEST/configure.sh
 mode change 100644 => 100755 external/hypre/AUTOTEST/docs.sh
 mode change 100644 => 100755 external/hypre/AUTOTEST/examples.sh
 mode change 100644 => 100755 external/hypre/AUTOTEST/klocwork.sh
 mode change 100644 => 100755 external/hypre/AUTOTEST/link.sh
 create mode 100755 external/hypre/AUTOTEST/machine-aurora.sh
 create mode 100755 external/hypre/AUTOTEST/machine-lassen-cuda.sh
 create mode 100755 external/hypre/AUTOTEST/machine-lassen-exlibs.sh
 mode change 100644 => 100755 external/hypre/AUTOTEST/machine-lassen.sh
 mode change 100644 => 100755 external/hypre/AUTOTEST/machine-mac.sh
 delete mode 100644 external/hypre/AUTOTEST/machine-ray.sh
 rename external/hypre/AUTOTEST/{machine-rztopaz.sh => machine-rzhound.sh} (89%)
 mode change 100644 => 100755
 mode change 100644 => 100755 external/hypre/AUTOTEST/machine-syrah.sh
 create mode 100755 external/hypre/AUTOTEST/machine-tioga.sh
 mode change 100644 => 100755 external/hypre/AUTOTEST/machine-tux-compilers.sh
 mode change 100644 => 100755 external/hypre/AUTOTEST/machine-tux-exlibs.sh
 mode change 100644 => 100755 external/hypre/AUTOTEST/machine-tux-spack.sh
 mode change 100644 => 100755 external/hypre/AUTOTEST/machine-tux.sh
 mode change 100644 => 100755 external/hypre/AUTOTEST/machine-vs-pro.bat
 mode change 100644 => 100755 external/hypre/AUTOTEST/make.sh
 mode change 100644 => 100755 external/hypre/AUTOTEST/renametest.sh
 mode change 100644 => 100755 external/hypre/AUTOTEST/run.sh
 create mode 100644 external/hypre/AUTOTEST/runtests-error
 create mode 100644 external/hypre/AUTOTEST/runtests-gpumemcheck
 create mode 100644 external/hypre/AUTOTEST/runtests-ij-noilu
 mode change 100644 => 100755 external/hypre/AUTOTEST/test.sh
 mode change 100644 => 100755 external/hypre/src/IJ_mv/headers
 delete mode 100644 external/hypre/src/cmbuild/README.txt
 create mode 100755 external/hypre/src/config/astyle-apply.sh
 create mode 100644 external/hypre/src/config/astylerc
 create mode 100644 external/hypre/src/config/cmake/HYPRE_SetupGPUToolkit.cmake
 create mode 100644 external/hypre/src/config/cmake/HYPRE_SetupHIPToolkit.cmake
 create mode 100644 external/hypre/src/config/cmake/HYPRE_SetupSYCLToolkit.cmake
 mode change 100644 => 100755 external/hypre/src/config/config.guess
 mode change 100644 => 100755 external/hypre/src/config/config.sub
 create mode 100644 external/hypre/src/config/githooks/README.md
 create mode 100755 external/hypre/src/config/githooks/pre-commit
 mode change 100644 => 100755 external/hypre/src/config/install-sh
 mode change 100644 => 100755 external/hypre/src/config/mkinstalldirs
 create mode 100755 external/hypre/src/config/update-cmake.py
 create mode 100755 external/hypre/src/config/update-cmake.sh
 mode change 100644 => 100755 external/hypre/src/config/update.sh
 mode change 100644 => 100755 external/hypre/src/config/version.sh
 mode change 100644 => 100755 external/hypre/src/configure
 mode change 100644 => 100755 external/hypre/src/distributed_ls/Euclid/headers
 mode change 100644 => 100755 external/hypre/src/docs/update-release.sh
 create mode 100644 external/hypre/src/docs/usr-manual/bw-hypre-nwords.512.png
 create mode 100644 external/hypre/src/docs/usr-manual/dummy.png
 create mode 100644 external/hypre/src/docs/usr-manual/hypre-nwords.512.png
 delete mode 100644 external/hypre/src/docs/usr-manual/hypre_wiw.svg
 create mode 100644 external/hypre/src/docs/usr-manual/solvers-fsai.rst
 delete mode 100644 external/hypre/src/docs/usr-manual/solvers-hypre-ilu.rst
 create mode 100644 external/hypre/src/docs/usr-manual/solvers-ilu.rst
 delete mode 100644 external/hypre/src/examples/Makefile_gpu
 create mode 100644 external/hypre/src/examples/cudaf.f
 mode change 100644 => 100755 external/hypre/src/examples/docs/build_doc.sh
 mode change 100644 => 100755 external/hypre/src/examples/docs/code2html.perl
 mode change 100644 => 100755 external/hypre/src/examples/docs/replace-ssi.perl
 create mode 100644 external/hypre/src/examples/ex12cuf.cuf
 create mode 100644 external/hypre/src/examples/ex12f_cptr.f
 create mode 100644 external/hypre/src/examples/ex5cuf.cuf
 create mode 100644 external/hypre/src/examples/ex5f_cptr.f
 mode change 100644 => 100755 external/hypre/src/examples/vis/glvis-ex1.sh
 mode change 100644 => 100755 external/hypre/src/examples/vis/glvis-ex10.sh
 mode change 100644 => 100755 external/hypre/src/examples/vis/glvis-ex11.sh
 mode change 100644 => 100755 external/hypre/src/examples/vis/glvis-ex12.sh
 mode change 100644 => 100755 external/hypre/src/examples/vis/glvis-ex13.sh
 mode change 100644 => 100755 external/hypre/src/examples/vis/glvis-ex14.sh
 mode change 100644 => 100755 external/hypre/src/examples/vis/glvis-ex15.sh
 mode change 100644 => 100755 external/hypre/src/examples/vis/glvis-ex16.sh
 mode change 100644 => 100755 external/hypre/src/examples/vis/glvis-ex2.sh
 mode change 100644 => 100755 external/hypre/src/examples/vis/glvis-ex3.sh
 mode change 100644 => 100755 external/hypre/src/examples/vis/glvis-ex4.sh
 mode change 100644 => 100755 external/hypre/src/examples/vis/glvis-ex5.sh
 mode change 100644 => 100755 external/hypre/src/examples/vis/glvis-ex6.sh
 mode change 100644 => 100755 external/hypre/src/examples/vis/glvis-ex7.sh
 mode change 100644 => 100755 external/hypre/src/examples/vis/glvis-ex8.sh
 mode change 100644 => 100755 external/hypre/src/examples/vis/glvis-ex9.sh
 delete mode 100644 external/hypre/src/krylov/headers
 mode change 100644 => 100755 external/hypre/src/nopoe
 create mode 100644 external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_ilu.c
 create mode 100644 external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_mgr.c
 create mode 100644 external/hypre/src/parcsr_ls/HYPRE_parcsr_fsai.c
 mode change 100644 => 100755 external/hypre/src/parcsr_ls/headers
 create mode 100644 external/hypre/src/parcsr_ls/par_fsai.c
 create mode 100644 external/hypre/src/parcsr_ls/par_fsai.h
 create mode 100644 external/hypre/src/parcsr_ls/par_fsai_device.c
 create mode 100644 external/hypre/src/parcsr_ls/par_fsai_setup.c
 create mode 100644 external/hypre/src/parcsr_ls/par_fsai_solve.c
 create mode 100644 external/hypre/src/parcsr_ls/par_ge_device.c
 create mode 100644 external/hypre/src/parcsr_ls/par_ilu_setup_device.c
 create mode 100644 external/hypre/src/parcsr_ls/par_ilu_solve_device.c
 create mode 100644 external/hypre/src/parcsr_ls/par_mgr_coarsen.c
 create mode 100644 external/hypre/src/parcsr_ls/par_mgr_device.c
 create mode 100644 external/hypre/src/parcsr_ls/par_mgr_interp.c
 create mode 100644 external/hypre/src/parcsr_ls/par_mgr_rap.c
 create mode 100644 external/hypre/src/parcsr_ls/par_mgr_stats.c
 create mode 100644 external/hypre/src/parcsr_ls/par_mod_multi_interp.c
 create mode 100644 external/hypre/src/parcsr_ls/par_mod_multi_interp_device.c
 mode change 100644 => 100755 external/hypre/src/parcsr_mv/headers
 create mode 100644 external/hypre/src/parcsr_mv/par_csr_filter.c
 create mode 100644 external/hypre/src/parcsr_mv/par_csr_filter_device.c
 create mode 100644 external/hypre/src/parcsr_mv/par_csr_matmat.c
 create mode 100644 external/hypre/src/parcsr_mv/par_csr_matmat_device.c
 create mode 100644 external/hypre/src/parcsr_mv/par_csr_matrix_stats.c
 create mode 100644 external/hypre/src/parcsr_mv/par_csr_matvec_device.c
 create mode 100644 external/hypre/src/seq_block_mv/CMakeLists.txt
 create mode 100644 external/hypre/src/seq_block_mv/_hypre_seq_block_mv.h
 create mode 100644 external/hypre/src/seq_block_mv/dense_block_matmult.c
 create mode 100644 external/hypre/src/seq_block_mv/dense_block_matrix.c
 create mode 100644 external/hypre/src/seq_block_mv/dense_block_matrix.h
 create mode 100755 external/hypre/src/seq_block_mv/headers
 create mode 100644 external/hypre/src/seq_block_mv/protos.h
 create mode 100644 external/hypre/src/seq_mv/.gitignore
 create mode 100644 external/hypre/src/seq_mv/csr_filter.c
 delete mode 100644 external/hypre/src/seq_mv/csr_spgemm_device_attempt.c
 delete mode 100644 external/hypre/src/seq_mv/csr_spgemm_device_confident.c
 create mode 100644 external/hypre/src/seq_mv/csr_spgemm_device_numblocks.c
 create mode 100644 external/hypre/src/seq_mv/csr_spgemm_device_numer.c
 create mode 100644 external/hypre/src/seq_mv/csr_spgemm_device_numer.h
 create mode 100644 external/hypre/src/seq_mv/csr_spgemm_device_numer.in
 create mode 100644 external/hypre/src/seq_mv/csr_spgemm_device_onemklsparse.c
 delete mode 100644 external/hypre/src/seq_mv/csr_spgemm_device_rowbound.c
 create mode 100644 external/hypre/src/seq_mv/csr_spgemm_device_symbl.c
 create mode 100644 external/hypre/src/seq_mv/csr_spgemm_device_symbl.h
 create mode 100644 external/hypre/src/seq_mv/csr_spgemm_device_symbl.in
 create mode 100644 external/hypre/src/seq_mv/csr_spmv_device.h
 mode change 100644 => 100755 external/hypre/src/seq_mv/headers
 create mode 100644 external/hypre/src/seq_mv/vector_device.c
 delete mode 100644 external/hypre/src/sstruct_ls/headers
 mode change 100644 => 100755 external/hypre/src/sstruct_mv/headers
 mode change 100644 => 100755 external/hypre/src/struct_ls/headers
 create mode 100644 external/hypre/src/struct_mv/boxloop_sycl.h
 mode change 100644 => 100755 external/hypre/src/struct_mv/headers
 mode change 100644 => 100755 external/hypre/src/tarch
 mode change 100644 => 100755 external/hypre/src/test/TEST_ams/solvers.jobs
 create mode 100644 external/hypre/src/test/TEST_ams/solvers.saved.lassen_cpu
 delete mode 100644 external/hypre/src/test/TEST_ams/solvers.saved.ray
 create mode 100644 external/hypre/src/test/TEST_ams/solvers.saved.tioga
 mode change 100644 => 100755 external/hypre/src/test/TEST_ams/solvers.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_bench/benchmark_ij.jobs
 delete mode 100644 external/hypre/src/test/TEST_bench/benchmark_ij.perf.saved.ray
 create mode 100644 external/hypre/src/test/TEST_bench/benchmark_ij.perf.saved.tioga
 delete mode 100644 external/hypre/src/test/TEST_bench/benchmark_ij.saved.ray
 create mode 100644 external/hypre/src/test/TEST_bench/benchmark_ij.saved.tioga
 mode change 100644 => 100755 external/hypre/src/test/TEST_bench/benchmark_ij.sh
 create mode 100755 external/hypre/src/test/TEST_bench/benchmark_spgemm.jobs
 create mode 100644 external/hypre/src/test/TEST_bench/benchmark_spgemm.perf.saved.lassen
 create mode 100644 external/hypre/src/test/TEST_bench/benchmark_spgemm.perf.saved.tioga
 create mode 100644 external/hypre/src/test/TEST_bench/benchmark_spgemm.saved.lassen
 create mode 100644 external/hypre/src/test/TEST_bench/benchmark_spgemm.saved.tioga
 create mode 100755 external/hypre/src/test/TEST_bench/benchmark_spgemm.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_bench/benchmark_struct.jobs
 delete mode 100644 external/hypre/src/test/TEST_bench/benchmark_struct.perf.saved.ray
 create mode 100644 external/hypre/src/test/TEST_bench/benchmark_struct.perf.saved.tioga
 rename external/hypre/src/test/TEST_bench/{benchmark_struct.saved.ray => benchmark_struct.saved.tioga} (100%)
 mode change 100644 => 100755 external/hypre/src/test/TEST_bench/benchmark_struct.sh
 create mode 100755 external/hypre/src/test/TEST_error/error.jobs
 create mode 100644 external/hypre/src/test/TEST_error/error.saved
 create mode 100644 external/hypre/src/test/TEST_error/error.saved.lassen
 create mode 100755 external/hypre/src/test/TEST_error/error.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_examples/bigint.jobs
 mode change 100644 => 100755 external/hypre/src/test/TEST_examples/bigint.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_examples/complex.jobs
 mode change 100644 => 100755 external/hypre/src/test/TEST_examples/complex.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_examples/default.jobs
 mode change 100644 => 100755 external/hypre/src/test/TEST_examples/default.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_examples/fortran_examples.jobs
 mode change 100644 => 100755 external/hypre/src/test/TEST_examples/fortran_examples.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_examples/gpu.jobs
 delete mode 100644 external/hypre/src/test/TEST_examples/gpu.saved.ray
 mode change 100644 => 100755 external/hypre/src/test/TEST_examples/gpu.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_examples/maxdim.jobs
 mode change 100644 => 100755 external/hypre/src/test/TEST_examples/maxdim.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_fac/sstruct_fac.jobs
 mode change 100644 => 100755 external/hypre/src/test/TEST_fac/sstruct_fac.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_fei/solvers.jobs
 mode change 100644 => 100755 external/hypre/src/test/TEST_fei/solvers.sh
 create mode 100644 external/hypre/src/test/TEST_gpumemcheck/gpu.jobs
 create mode 100644 external/hypre/src/test/TEST_gpumemcheck/gpu.saved.lassen
 create mode 100755 external/hypre/src/test/TEST_gpumemcheck/gpu.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_ij/agg_interp.jobs
 create mode 100644 external/hypre/src/test/TEST_ij/agg_interp.saved.aurora
 create mode 100644 external/hypre/src/test/TEST_ij/agg_interp.saved.lassen_cpu
 delete mode 100644 external/hypre/src/test/TEST_ij/agg_interp.saved.ray
 mode change 100644 => 100755 external/hypre/src/test/TEST_ij/agg_interp.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_ij/air.jobs
 create mode 100644 external/hypre/src/test/TEST_ij/air.saved.aurora
 create mode 100644 external/hypre/src/test/TEST_ij/air.saved.lassen_cpu
 delete mode 100644 external/hypre/src/test/TEST_ij/air.saved.ray
 mode change 100644 => 100755 external/hypre/src/test/TEST_ij/air.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_ij/amgdd.jobs
 create mode 100644 external/hypre/src/test/TEST_ij/amgdd.saved.aurora
 create mode 100644 external/hypre/src/test/TEST_ij/amgdd.saved.lassen_cpu
 delete mode 100644 external/hypre/src/test/TEST_ij/amgdd.saved.ray
 mode change 100644 => 100755 external/hypre/src/test/TEST_ij/amgdd.sh
 create mode 100755 external/hypre/src/test/TEST_ij/assembly.jobs
 create mode 100755 external/hypre/src/test/TEST_ij/assembly.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_ij/coarsening.jobs
 rename external/hypre/src/test/TEST_ij/{coarsening.saved.ray => coarsening.saved.aurora} (61%)
 create mode 100644 external/hypre/src/test/TEST_ij/coarsening.saved.lassen_cpu
 mode change 100644 => 100755 external/hypre/src/test/TEST_ij/coarsening.sh
 create mode 100644 external/hypre/src/test/TEST_ij/data/beam_hex_dof459_np2/A.IJ.00000
 create mode 100644 external/hypre/src/test/TEST_ij/data/beam_hex_dof459_np2/A.IJ.00001
 create mode 100644 external/hypre/src/test/TEST_ij/data/beam_hex_dof459_np2/b.IJ.00000
 create mode 100644 external/hypre/src/test/TEST_ij/data/beam_hex_dof459_np2/b.IJ.00001
 create mode 100644 external/hypre/src/test/TEST_ij/data/beam_hex_dof459_np2/mfem.txt
 create mode 100644 external/hypre/src/test/TEST_ij/data/beam_hex_dof459_np2/rbms.0.00000
 create mode 100644 external/hypre/src/test/TEST_ij/data/beam_hex_dof459_np2/rbms.0.00001
 create mode 100644 external/hypre/src/test/TEST_ij/data/beam_hex_dof459_np2/rbms.1.00000
 create mode 100644 external/hypre/src/test/TEST_ij/data/beam_hex_dof459_np2/rbms.1.00001
 create mode 100644 external/hypre/src/test/TEST_ij/data/beam_hex_dof459_np2/rbms.2.00000
 create mode 100644 external/hypre/src/test/TEST_ij/data/beam_hex_dof459_np2/rbms.2.00001
 create mode 100644 external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/A.IJ.00000
 create mode 100644 external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/A.IJ.00001
 create mode 100644 external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/A.IJ.00002
 create mode 100644 external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/A.IJ.00003
 create mode 100644 external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/b.IJ.00000
 create mode 100644 external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/b.IJ.00001
 create mode 100644 external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/b.IJ.00002
 create mode 100644 external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/b.IJ.00003
 create mode 100644 external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/mfem.txt
 create mode 100644 external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/rbms.0.00000
 create mode 100644 external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/rbms.0.00001
 create mode 100644 external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/rbms.0.00002
 create mode 100644 external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/rbms.0.00003
 create mode 100644 external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/rbms.1.00000
 create mode 100644 external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/rbms.1.00001
 create mode 100644 external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/rbms.1.00002
 create mode 100644 external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/rbms.1.00003
 create mode 100644 external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/rbms.2.00000
 create mode 100644 external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/rbms.2.00001
 create mode 100644 external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/rbms.2.00002
 create mode 100644 external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/rbms.2.00003
 create mode 100644 external/hypre/src/test/TEST_ij/data/beam_tet_dof459_np1/A.IJ.00000
 create mode 100644 external/hypre/src/test/TEST_ij/data/beam_tet_dof459_np1/b.IJ.00000
 create mode 100644 external/hypre/src/test/TEST_ij/data/beam_tet_dof459_np1/mfem.txt
 create mode 100644 external/hypre/src/test/TEST_ij/data/beam_tet_dof459_np1/rbms.0.00000
 create mode 100644 external/hypre/src/test/TEST_ij/data/beam_tet_dof459_np1/rbms.1.00000
 create mode 100644 external/hypre/src/test/TEST_ij/data/beam_tet_dof459_np1/rbms.2.00000
 create mode 100755 external/hypre/src/test/TEST_ij/data/generate_poisson_10x10x10.sh
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np1/IJ.A.i4f4.00000.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np1/IJ.A.i4f8.00000.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np1/IJ.A.i8f4.00000.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np1/IJ.A.i8f8.00000.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np1/IJ.b.i4f4.00000.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np1/IJ.b.i4f8.00000.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np1/IJ.b.i8f4.00000.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np1/IJ.b.i8f8.00000.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np1/IJ.x0.i4f4.00000.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np1/IJ.x0.i4f8.00000.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np1/IJ.x0.i8f4.00000.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np1/IJ.x0.i8f8.00000.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.A.i4f4.00000.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.A.i4f4.00001.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.A.i4f4.00002.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.A.i4f4.00003.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.A.i4f8.00000.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.A.i4f8.00001.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.A.i4f8.00002.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.A.i4f8.00003.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.A.i8f4.00000.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.A.i8f4.00001.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.A.i8f4.00002.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.A.i8f4.00003.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.A.i8f8.00000.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.A.i8f8.00001.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.A.i8f8.00002.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.A.i8f8.00003.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.b.i4f4.00000.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.b.i4f4.00001.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.b.i4f4.00002.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.b.i4f4.00003.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.b.i4f8.00000.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.b.i4f8.00001.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.b.i4f8.00002.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.b.i4f8.00003.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.b.i8f4.00000.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.b.i8f4.00001.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.b.i8f4.00002.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.b.i8f4.00003.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.b.i8f8.00000.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.b.i8f8.00001.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.b.i8f8.00002.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.b.i8f8.00003.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.x0.i4f4.00000.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.x0.i4f4.00001.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.x0.i4f4.00002.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.x0.i4f4.00003.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.x0.i4f8.00000.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.x0.i4f8.00001.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.x0.i4f8.00002.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.x0.i4f8.00003.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.x0.i8f4.00000.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.x0.i8f4.00001.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.x0.i8f4.00002.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.x0.i8f4.00003.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.x0.i8f8.00000.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.x0.i8f8.00001.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.x0.i8f8.00002.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.x0.i8f8.00003.bin
 create mode 100644 external/hypre/src/test/TEST_ij/data/tucker21935/IJ.A.00000
 create mode 100644 external/hypre/src/test/TEST_ij/data/tucker21935/IJ.A.00001
 create mode 100644 external/hypre/src/test/TEST_ij/data/tucker21935/IJ.A.00002
 create mode 100644 external/hypre/src/test/TEST_ij/data/tucker21935/IJ.A.00003
 mode change 100644 => 100755 external/hypre/src/test/TEST_ij/default.jobs
 create mode 100644 external/hypre/src/test/TEST_ij/default.saved.aurora
 create mode 100644 external/hypre/src/test/TEST_ij/default.saved.lassen_cpu
 delete mode 100644 external/hypre/src/test/TEST_ij/default.saved.ray
 mode change 100644 => 100755 external/hypre/src/test/TEST_ij/default.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_ij/elast.jobs
 create mode 100644 external/hypre/src/test/TEST_ij/elast.saved.aurora
 rename external/hypre/src/test/TEST_ij/{elast.saved.ray => elast.saved.lassen_cpu} (51%)
 mode change 100644 => 100755 external/hypre/src/test/TEST_ij/elast.sh
 create mode 100755 external/hypre/src/test/TEST_ij/fsai.jobs
 create mode 100644 external/hypre/src/test/TEST_ij/fsai.saved
 create mode 100644 external/hypre/src/test/TEST_ij/fsai.saved.aurora
 create mode 100644 external/hypre/src/test/TEST_ij/fsai.saved.lassen
 create mode 100644 external/hypre/src/test/TEST_ij/fsai.saved.lassen_cpu
 create mode 100755 external/hypre/src/test/TEST_ij/fsai.sh
 create mode 100755 external/hypre/src/test/TEST_ij/ilu.jobs
 create mode 100644 external/hypre/src/test/TEST_ij/ilu.saved
 create mode 100644 external/hypre/src/test/TEST_ij/ilu.saved.aurora
 create mode 100644 external/hypre/src/test/TEST_ij/ilu.saved.lassen
 create mode 100644 external/hypre/src/test/TEST_ij/ilu.saved.lassen_cpu
 create mode 100755 external/hypre/src/test/TEST_ij/ilu.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_ij/interp.jobs
 create mode 100644 external/hypre/src/test/TEST_ij/interp.saved.aurora
 create mode 100644 external/hypre/src/test/TEST_ij/interp.saved.lassen_cpu
 delete mode 100644 external/hypre/src/test/TEST_ij/interp.saved.ray
 mode change 100644 => 100755 external/hypre/src/test/TEST_ij/interp.sh
 create mode 100755 external/hypre/src/test/TEST_ij/io.jobs
 create mode 100644 external/hypre/src/test/TEST_ij/io.saved
 create mode 100755 external/hypre/src/test/TEST_ij/io.sh
 create mode 100755 external/hypre/src/test/TEST_ij/lazy.jobs
 create mode 100755 external/hypre/src/test/TEST_ij/lazy.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_ij/matrix.jobs
 rename external/hypre/src/test/TEST_ij/{matrix.saved.ray => matrix.saved.aurora} (54%)
 create mode 100644 external/hypre/src/test/TEST_ij/matrix.saved.lassen_cpu
 mode change 100644 => 100755 external/hypre/src/test/TEST_ij/matrix.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_ij/nonmixedint.jobs
 rename external/hypre/src/test/TEST_ij/{nonmixedint.saved.ray => nonmixedint.saved.aurora} (85%)
 create mode 100644 external/hypre/src/test/TEST_ij/nonmixedint.saved.lassen_cpu
 mode change 100644 => 100755 external/hypre/src/test/TEST_ij/nonmixedint.sh
 create mode 100755 external/hypre/src/test/TEST_ij/posneg.jobs
 create mode 100755 external/hypre/src/test/TEST_ij/posneg.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_ij/smoother.jobs
 create mode 100644 external/hypre/src/test/TEST_ij/smoother.saved.aurora
 create mode 100644 external/hypre/src/test/TEST_ij/smoother.saved.lassen_cpu
 delete mode 100644 external/hypre/src/test/TEST_ij/smoother.saved.ray
 mode change 100644 => 100755 external/hypre/src/test/TEST_ij/smoother.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_ij/solvers.jobs
 create mode 100644 external/hypre/src/test/TEST_ij/solvers.saved.aurora
 create mode 100644 external/hypre/src/test/TEST_ij/solvers.saved.lassen_cpu
 delete mode 100644 external/hypre/src/test/TEST_ij/solvers.saved.ray
 mode change 100644 => 100755 external/hypre/src/test/TEST_ij/solvers.sh
 create mode 100755 external/hypre/src/test/TEST_ij/state.jobs
 create mode 100644 external/hypre/src/test/TEST_ij/state.saved
 create mode 100644 external/hypre/src/test/TEST_ij/state.saved.aurora
 create mode 100644 external/hypre/src/test/TEST_ij/state.saved.lassen
 create mode 100644 external/hypre/src/test/TEST_ij/state.saved.lassen_cpu
 create mode 100755 external/hypre/src/test/TEST_ij/state.sh
 create mode 100644 external/hypre/src/test/TEST_ij/tst.00000
 create mode 100644 external/hypre/src/test/TEST_ij/tst.00001
 create mode 100755 external/hypre/src/test/TEST_ij/vector.jobs
 create mode 100644 external/hypre/src/test/TEST_ij/vector.saved
 create mode 100644 external/hypre/src/test/TEST_ij/vector.saved.aurora
 create mode 100644 external/hypre/src/test/TEST_ij/vector.saved.lassen
 create mode 100644 external/hypre/src/test/TEST_ij/vector.saved.lassen_cpu
 create mode 100755 external/hypre/src/test/TEST_ij/vector.sh
 create mode 100755 external/hypre/src/test/TEST_ij/versioncheck.jobs
 create mode 100755 external/hypre/src/test/TEST_ij/versioncheck.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_lobpcg/ijdefault.jobs
 mode change 100644 => 100755 external/hypre/src/test/TEST_lobpcg/ijdefault.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_lobpcg/ijoptions.jobs
 mode change 100644 => 100755 external/hypre/src/test/TEST_lobpcg/ijoptions.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_lobpcg/nonmixedint.jobs
 mode change 100644 => 100755 external/hypre/src/test/TEST_lobpcg/nonmixedint.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_lobpcg/sstruct.jobs
 mode change 100644 => 100755 external/hypre/src/test/TEST_lobpcg/sstruct.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_lobpcg/struct.jobs
 mode change 100644 => 100755 external/hypre/src/test/TEST_lobpcg/struct.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_longdouble/solvers_ij.jobs
 mode change 100644 => 100755 external/hypre/src/test/TEST_longdouble/solvers_ij.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_longdouble/solvers_struct.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_single/solvers_ij.jobs
 create mode 100644 external/hypre/src/test/TEST_single/solvers_ij.saved.lassen
 mode change 100644 => 100755 external/hypre/src/test/TEST_single/solvers_ij.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_single/solvers_struct.jobs
 create mode 100644 external/hypre/src/test/TEST_single/solvers_struct.saved.lassen
 mode change 100644 => 100755 external/hypre/src/test/TEST_single/solvers_struct.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_sstruct/addtovalues.jobs
 rename external/hypre/src/test/TEST_sstruct/{addtovalues.saved.ray => addtovalues.saved.lassen_cpu} (68%)
 mode change 100644 => 100755 external/hypre/src/test/TEST_sstruct/addtovalues.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_sstruct/amr2d.jobs
 rename external/hypre/src/test/TEST_sstruct/{amr2d.saved.ray => amr2d.saved.lassen_cpu} (69%)
 mode change 100644 => 100755 external/hypre/src/test/TEST_sstruct/amr2d.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_sstruct/cube.jobs
 rename external/hypre/src/test/TEST_sstruct/{cube.saved.ray => cube.saved.lassen_cpu} (100%)
 mode change 100644 => 100755 external/hypre/src/test/TEST_sstruct/cube.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_sstruct/cycred.jobs
 rename external/hypre/src/test/TEST_sstruct/{cycred.saved.ray => cycred.saved.lassen_cpu} (100%)
 mode change 100644 => 100755 external/hypre/src/test/TEST_sstruct/cycred.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_sstruct/default2d.jobs
 rename external/hypre/src/test/TEST_sstruct/{default2d.saved.ray => default2d.saved.lassen_cpu} (100%)
 mode change 100644 => 100755 external/hypre/src/test/TEST_sstruct/default2d.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_sstruct/default3d.jobs
 rename external/hypre/src/test/TEST_sstruct/{default3d.saved.ray => default3d.saved.lassen_cpu} (100%)
 mode change 100644 => 100755 external/hypre/src/test/TEST_sstruct/default3d.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_sstruct/emptyProc.jobs
 rename external/hypre/src/test/TEST_sstruct/{emptyProc.saved.ray => emptyProc.saved.lassen_cpu} (94%)
 mode change 100644 => 100755 external/hypre/src/test/TEST_sstruct/emptyProc.sh
 create mode 100644 external/hypre/src/test/TEST_sstruct/io.jobs
 create mode 100644 external/hypre/src/test/TEST_sstruct/io.saved
 create mode 100644 external/hypre/src/test/TEST_sstruct/io.saved.lassen
 create mode 100644 external/hypre/src/test/TEST_sstruct/io.saved.lassen_cpu
 create mode 100755 external/hypre/src/test/TEST_sstruct/io.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_sstruct/maxwell.jobs
 rename external/hypre/src/test/TEST_sstruct/{maxwell.saved.ray => maxwell.saved.lassen_cpu} (51%)
 mode change 100644 => 100755 external/hypre/src/test/TEST_sstruct/maxwell.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_sstruct/miller.jobs
 rename external/hypre/src/test/TEST_sstruct/{miller.saved.ray => miller.saved.lassen_cpu} (73%)
 mode change 100644 => 100755 external/hypre/src/test/TEST_sstruct/miller.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_sstruct/neighborpart.jobs
 rename external/hypre/src/test/TEST_sstruct/{neighborpart.saved.ray => neighborpart.saved.lassen_cpu} (92%)
 mode change 100644 => 100755 external/hypre/src/test/TEST_sstruct/neighborpart.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_sstruct/neumann.jobs
 rename external/hypre/src/test/TEST_sstruct/{neumann.saved.ray => neumann.saved.lassen_cpu} (100%)
 mode change 100644 => 100755 external/hypre/src/test/TEST_sstruct/neumann.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_sstruct/nonmixedint.jobs
 rename external/hypre/src/test/TEST_sstruct/{nonmixedint.saved.ray => nonmixedint.saved.lassen_cpu} (100%)
 mode change 100644 => 100755 external/hypre/src/test/TEST_sstruct/nonmixedint.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_sstruct/periodic.jobs
 rename external/hypre/src/test/TEST_sstruct/{periodic.saved.ray => periodic.saved.lassen_cpu} (100%)
 mode change 100644 => 100755 external/hypre/src/test/TEST_sstruct/periodic.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_sstruct/sharedpart.jobs
 rename external/hypre/src/test/TEST_sstruct/{sharedpart.saved.ray => sharedpart.saved.lassen_cpu} (76%)
 mode change 100644 => 100755 external/hypre/src/test/TEST_sstruct/sharedpart.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_sstruct/solvers.jobs
 rename external/hypre/src/test/TEST_sstruct/{solvers.saved.ray => solvers.saved.lassen_cpu} (80%)
 mode change 100644 => 100755 external/hypre/src/test/TEST_sstruct/solvers.sh
 create mode 100644 external/hypre/src/test/TEST_sstruct/sstruct.in.cube-fem
 create mode 100644 external/hypre/src/test/TEST_sstruct/sstruct.in.cubes2_aniso
 create mode 100644 external/hypre/src/test/TEST_sstruct/sstruct.in.cubes4_27pt
 mode change 100644 => 100755 external/hypre/src/test/TEST_sstruct/sstruct_struct.jobs
 rename external/hypre/src/test/TEST_sstruct/{sstruct_struct.saved.ray => sstruct_struct.saved.lassen_cpu} (100%)
 mode change 100644 => 100755 external/hypre/src/test/TEST_sstruct/sstruct_struct.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_sstruct/symm.jobs
 rename external/hypre/src/test/TEST_sstruct/{symm.saved.ray => symm.saved.lassen_cpu} (100%)
 mode change 100644 => 100755 external/hypre/src/test/TEST_sstruct/symm.sh
 create mode 100755 external/hypre/src/test/TEST_sstruct/versioncheck.jobs
 create mode 100755 external/hypre/src/test/TEST_sstruct/versioncheck.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_sstruct/wide.jobs
 rename external/hypre/src/test/TEST_sstruct/{wide.saved.ray => wide.saved.lassen_cpu} (100%)
 mode change 100644 => 100755 external/hypre/src/test/TEST_sstruct/wide.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_sstruct/zcube.jobs
 rename external/hypre/src/test/TEST_sstruct/{zcube.saved.ray => zcube.saved.lassen_cpu} (100%)
 mode change 100644 => 100755 external/hypre/src/test/TEST_sstruct/zcube.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_struct/cgpfmg3d.jobs
 rename external/hypre/src/test/TEST_struct/{cgpfmg3d.saved.ray => cgpfmg3d.saved.florentia} (100%)
 create mode 100644 external/hypre/src/test/TEST_struct/cgpfmg3d.saved.lassen_cpu
 create mode 100644 external/hypre/src/test/TEST_struct/cgpfmg3d.saved.tioga
 mode change 100644 => 100755 external/hypre/src/test/TEST_struct/cgpfmg3d.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_struct/emptyproc.jobs
 rename external/hypre/src/test/TEST_struct/{emptyproc.saved.ray => emptyproc.saved.florentia} (100%)
 create mode 100644 external/hypre/src/test/TEST_struct/emptyproc.saved.lassen_cpu
 create mode 100644 external/hypre/src/test/TEST_struct/emptyproc.saved.tioga
 mode change 100644 => 100755 external/hypre/src/test/TEST_struct/emptyproc.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_struct/hybrid.jobs
 rename external/hypre/src/test/TEST_struct/{hybrid.saved.ray => hybrid.saved.florentia} (100%)
 create mode 100644 external/hypre/src/test/TEST_struct/hybrid.saved.lassen_cpu
 create mode 100644 external/hypre/src/test/TEST_struct/hybrid.saved.tioga
 mode change 100644 => 100755 external/hypre/src/test/TEST_struct/hybrid.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_struct/hybridswitch.jobs
 rename external/hypre/src/test/TEST_struct/{hybridswitch.saved.ray => hybridswitch.saved.florentia} (100%)
 create mode 100644 external/hypre/src/test/TEST_struct/hybridswitch.saved.lassen_cpu
 create mode 100644 external/hypre/src/test/TEST_struct/hybridswitch.saved.tioga
 mode change 100644 => 100755 external/hypre/src/test/TEST_struct/hybridswitch.sh
 create mode 100644 external/hypre/src/test/TEST_struct/lazy.jobs
 create mode 100755 external/hypre/src/test/TEST_struct/lazy.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_struct/migrate.jobs
 rename external/hypre/src/test/TEST_struct/{migrate.saved.ray => migrate.saved.florentia} (100%)
 create mode 100644 external/hypre/src/test/TEST_struct/migrate.saved.lassen_cpu
 create mode 100644 external/hypre/src/test/TEST_struct/migrate.saved.tioga
 mode change 100644 => 100755 external/hypre/src/test/TEST_struct/migrate.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_struct/parflow.jobs
 rename external/hypre/src/test/TEST_struct/{parflow.saved.ray => parflow.saved.florentia} (100%)
 create mode 100644 external/hypre/src/test/TEST_struct/parflow.saved.lassen_cpu
 create mode 100644 external/hypre/src/test/TEST_struct/parflow.saved.tioga
 mode change 100644 => 100755 external/hypre/src/test/TEST_struct/parflow.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_struct/periodic.jobs
 create mode 100644 external/hypre/src/test/TEST_struct/periodic.saved.florentia
 rename external/hypre/src/test/TEST_struct/{periodic.saved.ray => periodic.saved.lassen_cpu} (100%)
 create mode 100644 external/hypre/src/test/TEST_struct/periodic.saved.tioga
 mode change 100644 => 100755 external/hypre/src/test/TEST_struct/periodic.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_struct/pfmgbase1d.jobs
 rename external/hypre/src/test/TEST_struct/{pfmgbase1d.saved.ray => pfmgbase1d.saved.florentia} (100%)
 create mode 100644 external/hypre/src/test/TEST_struct/pfmgbase1d.saved.lassen_cpu
 create mode 100644 external/hypre/src/test/TEST_struct/pfmgbase1d.saved.tioga
 mode change 100644 => 100755 external/hypre/src/test/TEST_struct/pfmgbase1d.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_struct/pfmgbase2d.jobs
 rename external/hypre/src/test/TEST_struct/{pfmgbase2d.saved.ray => pfmgbase2d.saved.florentia} (100%)
 create mode 100644 external/hypre/src/test/TEST_struct/pfmgbase2d.saved.lassen_cpu
 create mode 100644 external/hypre/src/test/TEST_struct/pfmgbase2d.saved.tioga
 mode change 100644 => 100755 external/hypre/src/test/TEST_struct/pfmgbase2d.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_struct/pfmgbase3d.jobs
 rename external/hypre/src/test/TEST_struct/{pfmgbase3d.saved.ray => pfmgbase3d.saved.florentia} (100%)
 create mode 100644 external/hypre/src/test/TEST_struct/pfmgbase3d.saved.lassen_cpu
 create mode 100644 external/hypre/src/test/TEST_struct/pfmgbase3d.saved.tioga
 mode change 100644 => 100755 external/hypre/src/test/TEST_struct/pfmgbase3d.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_struct/pfmgconstcoeffmp.jobs
 rename external/hypre/src/test/TEST_struct/{pfmgconstcoeffmp.saved.ray => pfmgconstcoeffmp.saved.florentia} (100%)
 create mode 100644 external/hypre/src/test/TEST_struct/pfmgconstcoeffmp.saved.lassen_cpu
 create mode 100644 external/hypre/src/test/TEST_struct/pfmgconstcoeffmp.saved.tioga
 mode change 100644 => 100755 external/hypre/src/test/TEST_struct/pfmgconstcoeffmp.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_struct/pfmgorient.jobs
 rename external/hypre/src/test/TEST_struct/{pfmgorient.saved.ray => pfmgorient.saved.florentia} (100%)
 create mode 100644 external/hypre/src/test/TEST_struct/pfmgorient.saved.lassen_cpu
 create mode 100644 external/hypre/src/test/TEST_struct/pfmgorient.saved.tioga
 mode change 100644 => 100755 external/hypre/src/test/TEST_struct/pfmgorient.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_struct/pfmgtest1d.jobs
 rename external/hypre/src/test/TEST_struct/{pfmgtest1d.saved.ray => pfmgtest1d.saved.florentia} (100%)
 create mode 100644 external/hypre/src/test/TEST_struct/pfmgtest1d.saved.lassen_cpu
 create mode 100644 external/hypre/src/test/TEST_struct/pfmgtest1d.saved.tioga
 mode change 100644 => 100755 external/hypre/src/test/TEST_struct/pfmgtest1d.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_struct/pfmgvcycle.jobs
 rename external/hypre/src/test/TEST_struct/{pfmgvcycle.saved.ray => pfmgvcycle.saved.florentia} (100%)
 create mode 100644 external/hypre/src/test/TEST_struct/pfmgvcycle.saved.lassen_cpu
 create mode 100644 external/hypre/src/test/TEST_struct/pfmgvcycle.saved.tioga
 mode change 100644 => 100755 external/hypre/src/test/TEST_struct/pfmgvcycle.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_struct/psmgbase3d.jobs
 rename external/hypre/src/test/TEST_struct/{psmgbase3d.saved.ray => psmgbase3d.saved.florentia} (100%)
 create mode 100644 external/hypre/src/test/TEST_struct/psmgbase3d.saved.lassen_cpu
 create mode 100644 external/hypre/src/test/TEST_struct/psmgbase3d.saved.tioga
 mode change 100644 => 100755 external/hypre/src/test/TEST_struct/psmgbase3d.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_struct/psmgtest3d.jobs
 rename external/hypre/src/test/TEST_struct/{psmgtest3d.saved.ray => psmgtest3d.saved.florentia} (100%)
 create mode 100644 external/hypre/src/test/TEST_struct/psmgtest3d.saved.lassen_cpu
 create mode 100644 external/hypre/src/test/TEST_struct/psmgtest3d.saved.tioga
 mode change 100644 => 100755 external/hypre/src/test/TEST_struct/psmgtest3d.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_struct/smgbase1d.jobs
 rename external/hypre/src/test/TEST_struct/{smgbase1d.saved.ray => smgbase1d.saved.florentia} (100%)
 create mode 100644 external/hypre/src/test/TEST_struct/smgbase1d.saved.lassen_cpu
 create mode 100644 external/hypre/src/test/TEST_struct/smgbase1d.saved.tioga
 mode change 100644 => 100755 external/hypre/src/test/TEST_struct/smgbase1d.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_struct/smgbase2d.jobs
 rename external/hypre/src/test/TEST_struct/{smgbase2d.saved.ray => smgbase2d.saved.florentia} (100%)
 create mode 100644 external/hypre/src/test/TEST_struct/smgbase2d.saved.lassen_cpu
 create mode 100644 external/hypre/src/test/TEST_struct/smgbase2d.saved.tioga
 mode change 100644 => 100755 external/hypre/src/test/TEST_struct/smgbase2d.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_struct/smgbase3d.jobs
 rename external/hypre/src/test/TEST_struct/{smgbase3d.saved.ray => smgbase3d.saved.florentia} (100%)
 create mode 100644 external/hypre/src/test/TEST_struct/smgbase3d.saved.lassen_cpu
 create mode 100644 external/hypre/src/test/TEST_struct/smgbase3d.saved.tioga
 mode change 100644 => 100755 external/hypre/src/test/TEST_struct/smgbase3d.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_struct/smgtest1d.jobs
 rename external/hypre/src/test/TEST_struct/{smgtest1d.saved.ray => smgtest1d.saved.florentia} (100%)
 create mode 100644 external/hypre/src/test/TEST_struct/smgtest1d.saved.lassen_cpu
 create mode 100644 external/hypre/src/test/TEST_struct/smgtest1d.saved.tioga
 mode change 100644 => 100755 external/hypre/src/test/TEST_struct/smgtest1d.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_struct/smgvcycle.jobs
 rename external/hypre/src/test/TEST_struct/{smgvcycle.saved.ray => smgvcycle.saved.florentia} (100%)
 create mode 100644 external/hypre/src/test/TEST_struct/smgvcycle.saved.lassen_cpu
 create mode 100644 external/hypre/src/test/TEST_struct/smgvcycle.saved.tioga
 mode change 100644 => 100755 external/hypre/src/test/TEST_struct/smgvcycle.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_struct/solvers.jobs
 rename external/hypre/src/test/TEST_struct/{solvers.saved.ray => solvers.saved.florentia} (100%)
 create mode 100644 external/hypre/src/test/TEST_struct/solvers.saved.lassen_cpu
 create mode 100644 external/hypre/src/test/TEST_struct/solvers.saved.tioga
 mode change 100644 => 100755 external/hypre/src/test/TEST_struct/solvers.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_struct/vcpfmgRedBlackGS.jobs
 rename external/hypre/src/test/TEST_struct/{vcpfmgRedBlackGS.saved.ray => vcpfmgRedBlackGS.saved.florentia} (100%)
 create mode 100644 external/hypre/src/test/TEST_struct/vcpfmgRedBlackGS.saved.lassen_cpu
 create mode 100644 external/hypre/src/test/TEST_struct/vcpfmgRedBlackGS.saved.tioga
 mode change 100644 => 100755 external/hypre/src/test/TEST_struct/vcpfmgRedBlackGS.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_struct/vdpfmgRedBlackGS.jobs
 rename external/hypre/src/test/TEST_struct/{vdpfmgRedBlackGS.saved.ray => vdpfmgRedBlackGS.saved.florentia} (100%)
 create mode 100644 external/hypre/src/test/TEST_struct/vdpfmgRedBlackGS.saved.lassen_cpu
 create mode 100644 external/hypre/src/test/TEST_struct/vdpfmgRedBlackGS.saved.tioga
 mode change 100644 => 100755 external/hypre/src/test/TEST_struct/vdpfmgRedBlackGS.sh
 create mode 100755 external/hypre/src/test/TEST_struct/versioncheck.jobs
 create mode 100755 external/hypre/src/test/TEST_struct/versioncheck.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_superlu/sludist.jobs
 mode change 100644 => 100755 external/hypre/src/test/TEST_superlu/sludist.sh
 mode change 100644 => 100755 external/hypre/src/test/TEST_timing/efficiency.jobs
 mode change 100644 => 100755 external/hypre/src/test/TEST_timing/efficiency.sh
 mode change 100644 => 100755 external/hypre/src/test/checktest.sh
 mode change 100644 => 100755 external/hypre/src/test/cleantest.sh
 delete mode 100644 external/hypre/src/test/f77_ij_mv.f
 delete mode 100644 external/hypre/src/test/ij_mv.c
 mode change 100644 => 100755 external/hypre/src/test/runcheck.sh
 mode change 100644 => 100755 external/hypre/src/test/runtest.sh
 delete mode 100644 external/hypre/src/test/test_mgr.c
 create mode 100644 external/hypre/src/utilities/_hypre_onedpl.hpp
 create mode 100644 external/hypre/src/utilities/base.h
 delete mode 100644 external/hypre/src/utilities/cuda_utils.c
 delete mode 100644 external/hypre/src/utilities/cuda_utils.h
 rename external/hypre/src/utilities/{cuda_reducer.h => device_reducer.h} (64%)
 create mode 100644 external/hypre/src/utilities/device_utils.c
 create mode 100644 external/hypre/src/utilities/device_utils.h
 create mode 100644 external/hypre/src/utilities/functors.h
 mode change 100644 => 100755 external/hypre/src/utilities/headers
 create mode 100644 external/hypre/src/utilities/int_array_device.c
 create mode 100644 external/hypre/src/utilities/magma.c
 create mode 100644 external/hypre/src/utilities/magma.h
 create mode 100644 external/hypre/src/utilities/matrix_stats.c
 create mode 100644 external/hypre/src/utilities/matrix_stats.h
 create mode 100644 external/hypre/src/utilities/memory_tracker.c
 create mode 100644 external/hypre/src/utilities/memory_tracker.h
 create mode 100644 external/hypre/src/utilities/mmio.c
 create mode 100644 external/hypre/src/utilities/mmio.h
 create mode 100644 external/hypre/src/utilities/predicates.h
 mode change 100644 => 100755 external/hypre/src/utilities/protos
 create mode 100644 external/hypre/src/utilities/state.c
 create mode 100644 external/hypre/src/utilities/state.h
 create mode 100644 external/hypre/src/utilities/stl_ops.c
 mode change 100644 => 100755 external/hypre/src/utilities/version.sh

diff --git a/.gitignore b/.gitignore
index 12c54b30..317c740d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -370,4 +370,5 @@ doc/build
 doc/*.html
 venv
 build*/
-.vscode/
\ No newline at end of file
+.vscode/
+install/
\ No newline at end of file
diff --git a/cmake/HYPREConfig.cmake b/cmake/HYPREConfig.cmake
index 69c9e2e7..9e789c02 100644
--- a/cmake/HYPREConfig.cmake
+++ b/cmake/HYPREConfig.cmake
@@ -20,8 +20,8 @@ macro(CONFIG_AND_INSTALL_HYPRE)
             "-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}"
             "-DHYPRE_BUILD_TYPE=${CMAKE_BUILD_TYPE}"
             "-DHYPRE_ENABLE_SINGLE=${OPFLOW_SINGLE_PRECISION}"
-            "-DHYPRE_WITH_OPENMP=${OPFLOW_WITH_OPENMP}"
-            "-DHYPRE_WITH_MPI=${OPFLOW_WITH_MPI}"
+            "-DHYPRE_ENABLE_OPENMP=${OPFLOW_WITH_OPENMP}"
+            "-DHYPRE_ENABLE_MPI=${OPFLOW_WITH_MPI}"
             "-DHYPRE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}")
     string(REPLACE " " "\t\n" _hypre_options ${HYPRE_OPTIONS})
     message(STATUS "HYPRE is to be configured with:\t\n${_hypre_options}")
@@ -32,8 +32,8 @@ macro(CONFIG_AND_INSTALL_HYPRE)
             -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
             -DHYPRE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
             -DHYPRE_ENABLE_SINGLE=${OPFLOW_SINGLE_PRECISION}
-            -DHYPRE_WITH_OPENMP=${OPFLOW_WITH_OPENMP}
-            -DHYPRE_WITH_MPI=${OPFLOW_WITH_MPI}
+            -DHYPRE_ENABLE_OPENMP=${OPFLOW_WITH_OPENMP}
+            -DHYPRE_ENABLE_MPI=${OPFLOW_WITH_MPI}
             -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
             ${CMAKE_CURRENT_SOURCE_DIR}/external/hypre/src
             RESULT_VARIABLE _result
diff --git a/external/hypre/.gitignore b/external/hypre/.gitignore
new file mode 100644
index 00000000..1962e925
--- /dev/null
+++ b/external/hypre/.gitignore
@@ -0,0 +1,74 @@
+*.o
+*.obj
+*.a
+*.so
+*.out.*
+*.err.*
+*.err
+*.out
+*.perf
+*.btr
+*.patch
+.gdbinit
+build.sh
+update.sh
+make.log
+config.log
+config.status
+Makefile.config
+HYPRE_config.h
+autom4te.cache
+src/TAGS
+hypre/
+install/
+AUTOTEST/*.dir
+out/
+.vscode
+.vs
+
+###############
+# Documentation
+###############
+src/docs/ref-manual/html/
+src/docs/ref-manual-html/
+src/docs/ref-manual.pdf
+src/docs/ref-manual/latex/
+src/docs/ref-manual/xml/
+src/docs/usr-manual-html/
+src/docs/usr-manual/html/
+src/docs/usr-manual.pdf
+src/docs/usr-manual/_build/
+
+###############
+# Executables
+###############
+src/test/ams_driver
+src/test/ams_driver.exe
+src/test/ij
+src/test/ij.exe
+src/test/ij_assembly
+src/test/ij_assembly.exe
+src/test/ij_mv
+src/test/ij_mv.exe
+src/test/ij_mm
+src/test/ij_mm.exe
+src/test/maxwell_unscaled
+src/test/maxwell_unscaled.exe
+src/test/sstruct
+src/test/sstruct.exe
+src/test/sstruct_fac
+src/test/sstruct_fac.exe
+src/test/struct
+src/test/struct.exe
+src/test/struct_migrate
+src/test/struct_migrate.exe
+src/test/zboxloop
+src/test/zboxloop.exe
+src/examples/ex[0-9]
+src/examples/ex[0-9].exe
+src/examples/ex1[0-8]
+src/examples/ex1[0-8].exe
+src/examples/ex5f
+src/examples/ex5f.exe
+src/examples/ex12f
+src/examples/ex12f.exe
diff --git a/external/hypre/.readthedocs.yml b/external/hypre/.readthedocs.yml
new file mode 100644
index 00000000..85287ed9
--- /dev/null
+++ b/external/hypre/.readthedocs.yml
@@ -0,0 +1,29 @@
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+# .readthedocs.yml
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Set the version of Python and other tools you might need
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.11"
+
+# Build documentation in the docs/ directory with Sphinx
+sphinx:
+  configuration: src/docs/usr-manual/conf.py
+
+# Optionally build your docs in additional formats such as PDF and ePub
+formats: all
+
+# Optionally set the version of Python and requirements required to build your docs
+python:
+  install:
+    - requirements: src/docs/usr-manual/requirements.txt
diff --git a/external/hypre/AUTOTEST/README.txt b/external/hypre/AUTOTEST/README.txt
index d8540b5c..248bf955 100644
--- a/external/hypre/AUTOTEST/README.txt
+++ b/external/hypre/AUTOTEST/README.txt
@@ -1,52 +1,52 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-
-This directory contains scripts for running various tests on the hypre library.
-The scripts augment the 'runtest.sh' runtime tests in 'test/TEST_*'.
-
-Every test in this directory may be run manually by developers.  Many of the
-scripts are also run as part of the nightly regression testing, currently
-developed and maintained in a separate git repository called 'hypre/autotest'.
-
-=====================
-
-Organization:
-
-This directory mainly consists of a number of simple Bourne-shell scripts (the
-files with a '.sh' extension).  Except for a few "special scripts" (below), each
-represents an individual test written by a hypre developer.  The special scripts
-are as follows (note that they are the only scripts with "test" in their names):
-
-1. 'test.sh'       - Used to run individual tests.
-2. 'cleantest.sh'  - Used to clean up the output from a test (or tests).
-3. 'renametest.sh' - Used to rename the output from a test.
-
-Usage information for every script (special or individual test) can be obtained
-by running it with the '-h' option (e.g., 'test.sh -h' or 'make.sh -h').
-
-=====================
-
-Writing tests:
-
-The rules for writing tests are given in the 'test.sh -h' usage information.
-When writing tests, keep in mind the design goals below, especially with respect
-to simplicity, flexibility, and portability.
-
-To write a new test, just use an existing test (e.g., 'default.sh') as a
-template and make the appropriate modifications.  Try not to use the word "test"
-in the name of the script so that we can keep the convention of only the special
-scripts having this in their names.  Try not to use absolute directory paths in
-the script.
-
-=====================
-
-Design goals:
-
-- Minimal limitations on the types of tests that are possible.
-- Developers should be able to run the tests manually.
-- Minimal dependence on operating system and software tools (for portability).
-- Developers should be able to easily add new tests.
-- Simplicity and flexibility.
+
+This directory contains scripts for running various tests on the hypre library.
+The scripts augment the 'runtest.sh' runtime tests in 'test/TEST_*'.
+
+Every test in this directory may be run manually by developers.  Many of the
+scripts are also run as part of the nightly regression testing, currently
+developed and maintained in a separate git repository called 'hypre/autotest'.
+
+=====================
+
+Organization:
+
+This directory mainly consists of a number of simple Bourne-shell scripts (the
+files with a '.sh' extension).  Except for a few "special scripts" (below), each
+represents an individual test written by a hypre developer.  The special scripts
+are as follows (note that they are the only scripts with "test" in their names):
+
+1. 'test.sh'       - Used to run individual tests.
+2. 'cleantest.sh'  - Used to clean up the output from a test (or tests).
+3. 'renametest.sh' - Used to rename the output from a test.
+
+Usage information for every script (special or individual test) can be obtained
+by running it with the '-h' option (e.g., 'test.sh -h' or 'make.sh -h').
+
+=====================
+
+Writing tests:
+
+The rules for writing tests are given in the 'test.sh -h' usage information.
+When writing tests, keep in mind the design goals below, especially with respect
+to simplicity, flexibility, and portability.
+
+To write a new test, just use an existing test (e.g., 'default.sh') as a
+template and make the appropriate modifications.  Try not to use the word "test"
+in the name of the script so that we can keep the convention of only the special
+scripts having this in their names.  Try not to use absolute directory paths in
+the script.
+
+=====================
+
+Design goals:
+
+- Minimal limitations on the types of tests that are possible.
+- Developers should be able to run the tests manually.
+- Minimal dependence on operating system and software tools (for portability).
+- Developers should be able to easily add new tests.
+- Simplicity and flexibility.
diff --git a/external/hypre/AUTOTEST/basic.sh b/external/hypre/AUTOTEST/basic.sh
old mode 100644
new mode 100755
index e3620d2f..0cec385f
--- a/external/hypre/AUTOTEST/basic.sh
+++ b/external/hypre/AUTOTEST/basic.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/AUTOTEST/check-case.sh b/external/hypre/AUTOTEST/check-case.sh
old mode 100644
new mode 100755
index 8c6b41f9..67aa45b3
--- a/external/hypre/AUTOTEST/check-case.sh
+++ b/external/hypre/AUTOTEST/check-case.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/AUTOTEST/check-double.sh b/external/hypre/AUTOTEST/check-double.sh
old mode 100644
new mode 100755
index 8f6d74c6..86123092
--- a/external/hypre/AUTOTEST/check-double.sh
+++ b/external/hypre/AUTOTEST/check-double.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -32,12 +32,11 @@ shift
 cd $src_dir
 
 find . -type f -print | egrep '[.]*[.](c|cc|cpp|cxx|C|h|hpp|hxx|H)$' |
-  egrep -v '/cmbuild' |
   egrep -v '/docs' |
   egrep -v '/examples' |
   egrep -v '/FEI_mv' |
   egrep -v '/hypre/include' > check-double.files
 
-egrep '(^|[^[:alnum:]_]+)double([^[:alnum:]_]+|$)' `cat check-double.files` >&2
+egrep '(^|[^[:alnum:]_-]+)double([^[:alnum:]_-]+|$)' `cat check-double.files` >&2
 
 rm -f check-double.files
diff --git a/external/hypre/AUTOTEST/check-glob-symb.sh b/external/hypre/AUTOTEST/check-glob-symb.sh
old mode 100644
new mode 100755
index 8d899c33..4188ed75
--- a/external/hypre/AUTOTEST/check-glob-symb.sh
+++ b/external/hypre/AUTOTEST/check-glob-symb.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/AUTOTEST/check-headers.filters b/external/hypre/AUTOTEST/check-headers.filters
index 580e2dff..ded74f6e 100644
--- a/external/hypre/AUTOTEST/check-headers.filters
+++ b/external/hypre/AUTOTEST/check-headers.filters
@@ -4,3 +4,4 @@ include/fortran_matrix.h
 include/multivector.h
 include/interpreter.h
 include/temp_multivector.h
+fatal: No names found, cannot describe anything.
diff --git a/external/hypre/AUTOTEST/check-headers.sh b/external/hypre/AUTOTEST/check-headers.sh
old mode 100644
new mode 100755
index c0db0d66..3c1b52fe
--- a/external/hypre/AUTOTEST/check-headers.sh
+++ b/external/hypre/AUTOTEST/check-headers.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/AUTOTEST/check-int.filters b/external/hypre/AUTOTEST/check-int.filters
index 78c6eae6..e2a6e79a 100644
--- a/external/hypre/AUTOTEST/check-int.filters
+++ b/external/hypre/AUTOTEST/check-int.filters
@@ -12,5 +12,5 @@ long-range interpolation
 monstrously long
 get a long msg
 long rows
-utilities/hopscotch_hash.h:  //return _InterlockedCompareExchange
-utilities/hopscotch_hash.h:  //return _InterlockedExchangeAdd
+return _InterlockedCompareExchange
+return _InterlockedExchangeAdd
diff --git a/external/hypre/AUTOTEST/check-int.sh b/external/hypre/AUTOTEST/check-int.sh
old mode 100644
new mode 100755
index bbf0b010..2d3b2493
--- a/external/hypre/AUTOTEST/check-int.sh
+++ b/external/hypre/AUTOTEST/check-int.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -32,7 +32,6 @@ shift
 cd $src_dir
 
 find . -type f -print | egrep '[.]*[.](c|cc|cpp|cxx|C|h|hpp|hxx|H)$' |
-  egrep -v '/cmbuild' |
   egrep -v '/docs' |
   egrep -v '/examples' |
   egrep -v '/FEI_mv' |
diff --git a/external/hypre/AUTOTEST/check-license.filters b/external/hypre/AUTOTEST/check-license.filters
index 99d2f8ae..de18d6a2 100644
--- a/external/hypre/AUTOTEST/check-license.filters
+++ b/external/hypre/AUTOTEST/check-license.filters
@@ -9,10 +9,11 @@
 ./src/test/ams_driver
 ./src/test/zboxloop
 ./src/test/ij
-./src/test/ij_mv
 ./src/test/struct
 ./src/test/sstruct
 ./src/zerr
 ./src/config.log
 ./src/config.status
+.gitignore
 TVD.v3breakpoints
+.vscode
diff --git a/external/hypre/AUTOTEST/check-license.sh b/external/hypre/AUTOTEST/check-license.sh
old mode 100644
new mode 100755
index 1e7c0807..bc2e9e87
--- a/external/hypre/AUTOTEST/check-license.sh
+++ b/external/hypre/AUTOTEST/check-license.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -33,13 +33,14 @@ cd $top_dir
 
 ### First check for files that do not have the license, but should
 
-#LicStr='Copyright 1998-2019 Lawrence Livermore'
+#LicStr='Copyright (c) 1998 Lawrence Livermore'
 LicStr='SPDX-License-Identifier: \(Apache-2.0 OR MIT\)'
 
 # Remove these files from the list of all files without 'SPDX'
 
-egrep -LR "$LicStr" . | egrep -v '[.](o|a|filters|pdf|svg|gif)$' |
+egrep -LR "$LicStr" . | egrep -v '[.](o|obj|a|filters|pdf|svg|gif|png)$' |
   egrep -v '[.]/[.]git' |
+  egrep -v '[.]/.*HYPRE_config[.]h' |
   egrep -v '[.]/src/(blas|lapack)/.*[.]c' |
   egrep -v '[.]/src/examples/docs' |
   egrep -v '[.]/src/test/TEST_.*'    > check-license.files
@@ -61,7 +62,6 @@ cat > check-license.remove <<EOF
 ./LICENSE-MIT
 ./NOTICE
 ./src/blas/COPYING
-./src/cmbuild/README.txt
 ./src/config/cmake/hypre_CMakeUtilities.cmake
 ./src/config/compile
 ./src/config/config.guess
@@ -72,13 +72,11 @@ cat > check-license.remove <<EOF
 ./src/config/missing
 ./src/config/mkinstalldirs
 ./src/configure
-./src/docs/hypre-wwords.png
 ./src/docs/ref-manual/conf.doxygen
 ./src/docs/usr-manual/Makefile
 ./src/docs/usr-manual/_static/custom.css
 ./src/docs/usr-manual/conf.py
 ./src/docs/usr-manual/zREADME
-./src/examples/vis.c
 ./src/utilities/cub_allocator.h
 ./src/lapack/COPYING
 ./src/nopoe
diff --git a/external/hypre/AUTOTEST/check-mem.sh b/external/hypre/AUTOTEST/check-mem.sh
old mode 100644
new mode 100755
index ed90058d..7f1c9662
--- a/external/hypre/AUTOTEST/check-mem.sh
+++ b/external/hypre/AUTOTEST/check-mem.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -32,12 +32,14 @@ shift
 cd $src_dir
 
 find . -type f -print | egrep '[.]*[.](c|cc|cpp|cxx|C|h|hpp|hxx|H)$' |
-  egrep -v '/cmbuild' |
   egrep -v '/docs' |
   egrep -v '/examples' |
   egrep -v '/FEI_mv' |
   egrep -v '/hypre/include' |
-  egrep -v '/utilities/memory.c' > check-mem.files
+  egrep -v '/utilities/memory_tracker.c' |
+  egrep -v '/utilities/memory.c' |
+  egrep -v '/utilities/general.c' |
+  egrep -v '/utilities/device_utils.c' > check-mem.files
 
 egrep '(^|[^[:alnum:]_]+)malloc[[:space:]]*\('  `cat check-mem.files` >&2
 egrep '(^|[^[:alnum:]_]+)calloc[[:space:]]*\('  `cat check-mem.files` >&2
diff --git a/external/hypre/AUTOTEST/check-mpi.sh b/external/hypre/AUTOTEST/check-mpi.sh
old mode 100644
new mode 100755
index f3b4244b..0a96c85e
--- a/external/hypre/AUTOTEST/check-mpi.sh
+++ b/external/hypre/AUTOTEST/check-mpi.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -32,7 +32,6 @@ shift
 cd $src_dir
 
 find . -type f -print | egrep '[.]*[.](c|cc|cpp|cxx|C|h|hpp|hxx|H)$' |
-  egrep -v '/cmbuild' |
   egrep -v '/docs' |
   egrep -v '/examples' |
   egrep -v '/FEI_mv' |
diff --git a/external/hypre/AUTOTEST/cleantest.sh b/external/hypre/AUTOTEST/cleantest.sh
old mode 100644
new mode 100755
index 3d987f25..2c76070a
--- a/external/hypre/AUTOTEST/cleantest.sh
+++ b/external/hypre/AUTOTEST/cleantest.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/AUTOTEST/cmake.bat b/external/hypre/AUTOTEST/cmake.bat
old mode 100644
new mode 100755
index 30284c93..d79d1a9a
--- a/external/hypre/AUTOTEST/cmake.bat
+++ b/external/hypre/AUTOTEST/cmake.bat
@@ -1,5 +1,5 @@
 @echo off
-rem Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+rem Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 rem HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 rem
 rem SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/AUTOTEST/cmake.filters b/external/hypre/AUTOTEST/cmake.filters
new file mode 100644
index 00000000..7e55edf7
--- /dev/null
+++ b/external/hypre/AUTOTEST/cmake.filters
@@ -0,0 +1,3 @@
+fatal: No names found, cannot describe anything.
+Additional optimization may be attained by recompiling and specifying MAXMEM option with a value greater than 8192.
+warning: 1501-264 The options qsmp and O0 are incompatible. Option O0 is ignored.
diff --git a/external/hypre/AUTOTEST/cmake.sh b/external/hypre/AUTOTEST/cmake.sh
old mode 100644
new mode 100755
index 3f6ab0f7..ce1d66fe
--- a/external/hypre/AUTOTEST/cmake.sh
+++ b/external/hypre/AUTOTEST/cmake.sh
@@ -1,39 +1,39 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 testname=`basename $0 .sh`
 
-drivers="ij sstruct struct ams_driver maxwell_unscaled sstruct_fac ij_mv struct_migrate"
+drivers="ij sstruct struct ams_driver maxwell_unscaled sstruct_fac struct_migrate ij_assembly"
 
 # Echo usage information
 case $1 in
    -h|-help)
       cat <<EOF
 
-   $0 [-h] {src_dir} [options]
+   $0 [-h] {root_dir} [options]
 
-   where: {src_dir}     is the hypre source directory
+   where: {root_dir}    is the hypre root directory
           -co: <opts>   configuration options
           -mo: <opts>   make options
           -ro: <opts>   call the run script with these options
           -eo: <opts>   call the examples script with these options
           -h|-help      prints this usage information and exits
 
-   This script uses cmake to configure and compile the source in {src_dir}, then
+   This script uses cmake to configure and compile the source in {root_dir}/src, then
    optionally runs driver and example tests.
 
-   Example usage: $0 ../src -co -DCMAKE_BUILD_TYPE=Debug -ro: -ij
+   Example usage: $0 .. -co -DCMAKE_BUILD_TYPE=Debug -ro: -ij
 
 EOF
       exit
       ;;
 esac
 
-# Set src_dir
-src_dir=`cd $1; pwd`
+# Set root_dir
+root_dir=`cd $1; pwd`
 shift
 
 # Parse the rest of the command line
@@ -68,38 +68,33 @@ test_dir=`pwd`
 output_dir=`pwd`/$testname.dir
 rm -fr $output_dir
 mkdir -p $output_dir
-cd $src_dir
-src_dir=`pwd`
+cd $root_dir
+root_dir=`pwd`
 
-# Clean up the cmbuild directories (do it from src_dir as a precaution)
-cd $src_dir
-rm -fr `echo cmbuild/* | sed 's/[^ ]*README.txt//g'`
+# Clean up the build directories (do it from root_dir as a precaution)
+cd $root_dir
+rm -fr build/*
 
 # Clean up the previous install
-cd $src_dir
-rm -fr hypre
+cd $root_dir
+rm -fr src/hypre
 
 # Configure
-cd $src_dir/cmbuild
-eval cmake $copts ..
+cd $root_dir/build
+eval cmake $copts ../src
 make $mopts install
 
-# Make
-cd $src_dir/cmbuild/test
-make $mopts
-mv -f $drivers ../../test
-
 cd $test_dir
 
 # Run
 if [ -n "$rset" ]; then
-   ./test.sh run.sh $src_dir $ropts
+   ./test.sh run.sh $root_dir/src $ropts
    mv -f run.??? $output_dir
 fi
 
 # Examples
 if [ -n "$eset" ]; then
-   ./test.sh examples.sh $src_dir $eopts
+   ./test.sh examples.sh $root_dir/src $eopts
    mv -f examples.??? $output_dir
 fi
 
@@ -110,8 +105,7 @@ do
 done
 
 # Clean up
-cd $src_dir
-rm -fr `echo cmbuild/* | sed 's/[^ ]*README.txt//g'`
-rm -fr hypre
-( cd $src_dir/test; rm -f $drivers; ./cleantest.sh )
-
+cd $root_dir
+rm -fr build/*
+rm -fr src/hypre
+( cd $root_dir/src/test; rm -f $drivers; ./cleantest.sh )
diff --git a/external/hypre/AUTOTEST/configure.filters b/external/hypre/AUTOTEST/configure.filters
index e69de29b..be5d0e21 100644
--- a/external/hypre/AUTOTEST/configure.filters
+++ b/external/hypre/AUTOTEST/configure.filters
@@ -0,0 +1,2 @@
+fatal: No names found, cannot describe anything.
+WARNING: unknown Fortran name-mangling scheme
diff --git a/external/hypre/AUTOTEST/configure.sh b/external/hypre/AUTOTEST/configure.sh
old mode 100644
new mode 100755
index 90bc0a59..55ec6518
--- a/external/hypre/AUTOTEST/configure.sh
+++ b/external/hypre/AUTOTEST/configure.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/AUTOTEST/docs.sh b/external/hypre/AUTOTEST/docs.sh
old mode 100644
new mode 100755
index bd28a72e..0fac8b2d
--- a/external/hypre/AUTOTEST/docs.sh
+++ b/external/hypre/AUTOTEST/docs.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/AUTOTEST/examples.sh b/external/hypre/AUTOTEST/examples.sh
old mode 100644
new mode 100755
index 610766fa..96e5e6af
--- a/external/hypre/AUTOTEST/examples.sh
+++ b/external/hypre/AUTOTEST/examples.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -72,7 +72,7 @@ fi
 for tname in $tests
 do
    if [ "$tname" = "gpu" ]; then
-      make -j -f Makefile_gpu $mopt $tname
+      make -j "use_cuda=1" $mopt $tname
    else
       make $mopt $tname
    fi
diff --git a/external/hypre/AUTOTEST/klocwork.sh b/external/hypre/AUTOTEST/klocwork.sh
old mode 100644
new mode 100755
index 578c59e1..9c925b3e
--- a/external/hypre/AUTOTEST/klocwork.sh
+++ b/external/hypre/AUTOTEST/klocwork.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/AUTOTEST/link.sh b/external/hypre/AUTOTEST/link.sh
old mode 100644
new mode 100755
index 4b5d58a6..80660144
--- a/external/hypre/AUTOTEST/link.sh
+++ b/external/hypre/AUTOTEST/link.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/AUTOTEST/machine-aurora.sh b/external/hypre/AUTOTEST/machine-aurora.sh
new file mode 100755
index 00000000..94c1ce3e
--- /dev/null
+++ b/external/hypre/AUTOTEST/machine-aurora.sh
@@ -0,0 +1,101 @@
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+testname=`basename $0 .sh`
+
+# Echo usage information
+case $1 in
+   -h|-help)
+      cat <<EOF
+
+   **** Only run this script on Aurora nodes                      ****
+   **** Successful regressions with default software env          ****
+   **** as of 10/14/2024                                          ****
+   **** Test with:                                                ****
+   ****     export SYCL_CACHE_PERSISTENT=1                        ****
+   ****     export SYCL_CACHE_THRESHOLD=0                         ****
+   ****     module load oneapi/eng-compiler/2024.07.30.002        ****
+
+   $0 [-h|-help] {src_dir}
+
+   where: -h|-help   prints this usage information and exits
+          {src_dir}  is the hypre source directory
+
+   This script runs a number of tests suitable for the syrah cluster.
+
+   Example usage: $0 ../src
+
+EOF
+      exit
+      ;;
+esac
+
+# Setup
+test_dir=`pwd`
+output_dir=`pwd`/$testname.dir
+rm -fr $output_dir
+mkdir -p $output_dir
+src_dir=`cd $1; pwd`
+shift
+
+# Basic build and run tests
+mo="-j test"
+eo=""
+
+rtol="0.0"
+atol="3e-15"
+
+#save=`echo $(hostname) | sed 's/[0-9]\+$//'`
+save="aurora"
+
+##########
+## SYCL ##
+##########
+
+# SYCL with UM in debug mode [ij, struct]
+# WM: I suppress all warnings for sycl files for now
+co="--enable-debug --with-sycl --enable-unified-memory --with-extra-CFLAGS=\\'-Wno-unused-but-set-variable -Wno-unused-variable -Wno-builtin-macro-redefined -Rno-debug-disables-optimization\\' --with-extra-CUFLAGS=\\'-w\\'"
+ro="-ij-gpu -struct -rt -save ${save} -script gpu_tile_compact.sh -rtol ${rtol} -atol ${atol}"
+./test.sh basic.sh $src_dir -co: $co -mo: $mo -ro: $ro
+./renametest.sh basic $output_dir/basic-sycl-um
+
+# SYCL with bigint (compile only)
+# WM: I suppress all warnings for sycl files for now
+co="--enable-bigint --with-sycl --enable-unified-memory --with-extra-CFLAGS=\\'-Wno-unused-but-set-variable -Wno-unused-variable -Wno-builtin-macro-redefined -Rno-debug-disables-optimization\\' --with-extra-CUFLAGS=\\'-w\\'"
+./test.sh basic.sh $src_dir -co: $co -mo: $mo
+./renametest.sh basic $output_dir/basic-sycl-bigint
+
+
+############
+## OMP4.5 ##
+############
+
+# WM: todo
+# OMP 4.5 without UM in debug mode [struct]
+# co="--with-device-openmp --enable-debug --enable-fortran=no --with-extra-CXXFLAGS=\\'-Wno-missing-prototype-for-cc\\' --with-extra-CFLAGS=\\'-Wno-missing-prototype-for-cc\\' CC= CXX= --with-MPI-include=${MPI_ROOT}/include --with-MPI-libs=mpi --with-MPI-lib-dirs=${MPI_ROOT}/lib"
+# ro="-struct -rt -save ${save} -script gpu_tile_compact.sh"
+# ./test.sh basic.sh $src_dir -co: $co -mo: $mo -ro: $ro
+# ./renametest.sh basic $output_dir/basic-deviceomp-nonum-debug-struct
+
+############
+## KOKKOS ##
+############
+
+# WM: todo
+# Kokkos without UM in debug mode [struct]
+# co="--with-device-openmp --with-kokkos --enable-debug --with-kokkos-include=$KOKKOS_HOME/include --with-kokkos-lib=$KOKKOS_HOME/lib64/libkokkoscore.a --with-cxxstandard=17 --with-extra-CXXFLAGS=\\'-fno-exceptions -D__STRICT_ANSI__\\' --enable-fortran=no CC= CXX= --with-MPI-include=${MPI_ROOT}/include --with-MPI-libs=mpi --with-MPI-lib-dirs=${MPI_ROOT}/lib"
+# ro="-struct -rt -save ${save} -script gpu_tile_compact.sh"
+# ./test.sh basic.sh $src_dir -co: $co -mo: $mo -ro: $ro
+# ./renametest.sh basic $output_dir/basic-kokkos-nonum-debug-struct
+
+##########################################################
+# Echo to stderr all nonempty error files in $output_dir #
+##########################################################
+for errfile in $( find $output_dir ! -size 0 -name "*.err" )
+do
+   echo $errfile >&2
+done
+
diff --git a/external/hypre/AUTOTEST/machine-lassen-cuda.sh b/external/hypre/AUTOTEST/machine-lassen-cuda.sh
new file mode 100755
index 00000000..fc9e462e
--- /dev/null
+++ b/external/hypre/AUTOTEST/machine-lassen-cuda.sh
@@ -0,0 +1,148 @@
+#!/bin/sh
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+testname=`basename $0 .sh`
+
+# Echo usage information
+case $1 in
+   -h|-help)
+      cat <<EOF
+
+   **** Only run this script on the lassen cluster ****
+
+   $0 [-h|-help] {src_dir}
+
+   where: -h|-help   prints this usage information and exits
+          {src_dir}  is the hypre source directory
+
+   This script runs a number of tests suitable for the lassen cluster.
+
+   Example usage: $0 ../src
+
+EOF
+      exit
+      ;;
+esac
+
+# Setup
+test_dir=`pwd`
+output_dir=`pwd`/$testname.dir
+rm -fr $output_dir
+mkdir -p $output_dir
+src_dir=`cd $1; pwd`
+shift
+
+# Basic build and run tests
+mo="-j test"
+
+############################################
+## Various CUDA verion build (only) tests ##
+############################################
+
+# CUDA 9.0 with UM [no run]
+module -q load cuda/9.0
+module list cuda/9.0 |& grep "None found"
+module -q load xl
+co="--with-cuda --enable-unified-memory --with-gpu-arch=70 --with-extra-CFLAGS=\\'-qsuppress=1500-029\\' --with-extra-CXXFLAGS=\\'-qsuppress=1500-029\\' --with-extra-CUFLAGS=\\'--Wno-deprecated-declarations\\'"
+./test.sh basic.sh $src_dir -co: $co -mo: $mo
+./renametest.sh basic $output_dir/basic-cuda9_0
+
+# CUDA 9.1 with UM [no run]
+module -q load cuda/9.1
+module list cuda/9.1 |& grep "None found"
+module -q load gcc
+co="--with-cuda --enable-unified-memory --with-gpu-arch=70 --with-extra-CUFLAGS=\\'--Wno-deprecated-declarations\\' CC=mpicc CXX=mpicxx"
+./test.sh basic.sh $src_dir -co: $co -mo: $mo
+./renametest.sh basic $output_dir/basic-cuda9_1
+
+# CUDA 9.2 with UM [no run]
+module -q load cuda/9.2
+module list cuda/9.2 |& grep "None found"
+module -q load xl
+co="--with-cuda --enable-unified-memory --with-gpu-arch=70 --with-extra-CFLAGS=\\'-qsuppress=1500-029\\' --with-extra-CXXFLAGS=\\'-qsuppress=1500-029\\' --with-extra-CUFLAGS=\\'--Wno-deprecated-declarations\\'"
+./test.sh basic.sh $src_dir -co: $co -mo: $mo
+./renametest.sh basic $output_dir/basic-cuda9_2
+
+# CUDA 10.2 with UM [no run]
+module -q load cuda/10.2
+module list cuda/10.2 |& grep "None found"
+module -q load xl
+co="--with-cuda --enable-unified-memory --with-gpu-arch=70 --with-extra-CFLAGS=\\'-qsuppress=1500-029\\' --with-extra-CXXFLAGS=\\'-qsuppress=1500-029\\' --with-extra-CUFLAGS=\\'--Wno-deprecated-declarations\\'"
+./test.sh basic.sh $src_dir -co: $co -mo: $mo
+./renametest.sh basic $output_dir/basic-cuda10_2
+
+# CUDA 11.0 with UM [no run]
+module -q load cuda/11.0
+module list cuda/11.0 |& grep "None found"
+module -q load xl
+co="--with-cuda --enable-unified-memory --with-gpu-arch=70 --with-extra-CFLAGS=\\'-qsuppress=1500-029\\' --with-extra-CXXFLAGS=\\'-qsuppress=1500-029\\' --with-extra-CUFLAGS=\\'--Wno-deprecated-declarations\\'"
+./test.sh basic.sh $src_dir -co: $co -mo: $mo
+./renametest.sh basic $output_dir/basic-cuda11_0
+
+# CUDA 11.1 with UM [no run]
+module -q load cuda/11.1
+module list cuda/11.1 |& grep "None found"
+module -q load xl
+co="--with-cuda --enable-unified-memory --with-gpu-arch=70 --with-extra-CFLAGS=\\'-qsuppress=1500-029\\' --with-extra-CXXFLAGS=\\'-qsuppress=1500-029\\' --with-extra-CUFLAGS=\\'--Wno-deprecated-declarations\\'"
+./test.sh basic.sh $src_dir -co: $co -mo: $mo
+./renametest.sh basic $output_dir/basic-cuda11_1
+
+# CUDA 11.2 with UM with async malloc [no run]
+module -q load cuda/11.2
+module list cuda/11.2 |& grep "None found"
+module -q load xl
+co="--with-cuda --enable-unified-memory --enable-device-malloc-async --with-gpu-arch=70 --with-extra-CFLAGS=\\'-qsuppress=1500-029\\' --with-extra-CXXFLAGS=\\'-qsuppress=1500-029\\' --with-extra-CUFLAGS=\\'--Wno-deprecated-declarations\\'"
+./test.sh basic.sh $src_dir -co: $co -mo: $mo
+./renametest.sh basic $output_dir/basic-cuda11_2
+
+# CUDA 11.3 with UM with async malloc [no run]
+module -q load cuda/11.3
+module list cuda/11.3 |& grep "None found"
+module -q load xl
+co="--with-cuda --enable-unified-memory --enable-device-malloc-async --with-gpu-arch=70 --with-extra-CFLAGS=\\'-qsuppress=1500-029\\' --with-extra-CXXFLAGS=\\'-qsuppress=1500-029\\' --with-extra-CUFLAGS=\\'--Wno-deprecated-declarations\\'"
+./test.sh basic.sh $src_dir -co: $co -mo: $mo
+./renametest.sh basic $output_dir/basic-cuda11_3
+
+# CUDA 11.4 with UM with async malloc [no run]
+module -q load cuda/11.4
+module list cuda/11.4 |& grep "None found"
+module -q load xl
+co="--with-cuda --enable-unified-memory --enable-device-malloc-async --with-gpu-arch=70 --with-extra-CFLAGS=\\'-qsuppress=1500-029\\' --with-extra-CXXFLAGS=\\'-qsuppress=1500-029\\' --with-extra-CUFLAGS=\\'--Wno-deprecated-declarations\\'"
+./test.sh basic.sh $src_dir -co: $co -mo: $mo
+./renametest.sh basic $output_dir/basic-cuda11_4
+
+# CUDA 11.5 with UM with async malloc [no run]
+module -q load cuda/11.5
+module list cuda/11.5 |& grep "None found"
+module -q load xl
+co="--with-cuda --enable-unified-memory --enable-device-malloc-async --with-gpu-arch=70 --with-extra-CFLAGS=\\'-qsuppress=1500-029\\' --with-extra-CXXFLAGS=\\'-qsuppress=1500-029\\' --with-extra-CUFLAGS=\\'--Wno-deprecated-declarations\\'"
+./test.sh basic.sh $src_dir -co: $co -mo: $mo
+./renametest.sh basic $output_dir/basic-cuda11_5
+
+# CUDA 11.6 with UM with async malloc [no run]
+module -q load cuda/11.6
+module list cuda/11.6 |& grep "None found"
+module -q load xl
+co="--with-cuda --enable-unified-memory --enable-device-malloc-async --with-gpu-arch=70 --with-extra-CFLAGS=\\'-qsuppress=1500-029\\' --with-extra-CXXFLAGS=\\'-qsuppress=1500-029\\' --with-extra-CUFLAGS=\\'--Wno-deprecated-declarations\\'"
+./test.sh basic.sh $src_dir -co: $co -mo: $mo
+./renametest.sh basic $output_dir/basic-cuda11_6
+
+# CUDA 11.7 with UM with async malloc [no run]
+module -q load cuda/11.7
+module list cuda/11.7 |& grep "None found"
+module -q load xl
+co="--with-cuda --enable-unified-memory --enable-device-malloc-async --with-gpu-arch=70 --with-extra-CFLAGS=\\'-qsuppress=1500-029\\' --with-extra-CXXFLAGS=\\'-qsuppress=1500-029\\' --with-extra-CUFLAGS=\\'--Wno-deprecated-declarations\\'"
+./test.sh basic.sh $src_dir -co: $co -mo: $mo
+./renametest.sh basic $output_dir/basic-cuda11_7
+
+# CUDA 11.8 with UM with async malloc [no run]
+module -q load cuda/11.8
+module list cuda/11.8 |& grep "None found"
+module -q load xl
+co="--with-cuda --enable-unified-memory --enable-device-malloc-async --with-gpu-arch=70 --with-extra-CFLAGS=\\'-qsuppress=1500-029\\' --with-extra-CXXFLAGS=\\'-qsuppress=1500-029\\' --with-extra-CUFLAGS=\\'--Wno-deprecated-declarations\\'"
+./test.sh basic.sh $src_dir -co: $co -mo: $mo
+./renametest.sh basic $output_dir/basic-cuda11_8
+
diff --git a/external/hypre/AUTOTEST/machine-lassen-exlibs.sh b/external/hypre/AUTOTEST/machine-lassen-exlibs.sh
new file mode 100755
index 00000000..3f0590b9
--- /dev/null
+++ b/external/hypre/AUTOTEST/machine-lassen-exlibs.sh
@@ -0,0 +1,92 @@
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+testname=`basename $0 .sh`
+
+# Echo usage information
+case $1 in
+   -h|-help)
+      cat <<EOF
+
+   **** Only run this script on the lassen cluster ****
+
+   $0 [-h|-help] {src_dir}
+
+   where: -h|-help   prints this usage information and exits
+          {src_dir}  is the hypre source directory
+
+   This script runs a number of tests suitable for the syrah cluster.
+
+   Example usage: $0 ../src
+
+EOF
+      exit
+      ;;
+esac
+
+# Setup
+test_dir=`pwd`
+output_dir=`pwd`/$testname.dir
+rm -fr $output_dir
+mkdir -p $output_dir
+src_dir=`cd $1; pwd`
+shift
+
+# Basic build and run tests
+mo="-j test"
+eo=""
+
+rtol="0.0"
+atol="3e-15"
+
+#save=`echo $(hostname) | sed 's/[0-9]\+$//'`
+save="lassen"
+
+##########
+## CUDA ##
+##########
+
+# CUDA without UM with Umpire [benchmark]
+# build Umpire
+# cmake3 -DCMAKE_INSTALL_PREFIX=../install_xlC_lassen -DENABLE_CUDA=On -DENABLE_OPENMP=Off -DCMAKE_CXX_COMPILER=xlC -DCMAKE_C_COMPILER=xlc -DENABLE_CUDA=On -DCMAKE_CUDA_FLAGS="-arch sm_70" -DENABLE_C=On ../
+# make
+# make install
+
+UMPIRE_DIR=/usr/workspace/hypre/ext-libs/Umpire/5.0.1-nvcc10.1.243-sm_70-xl2021.03.11/
+co="--with-cuda --enable-debug --with-umpire --with-umpire-include=${UMPIRE_DIR}/include --with-umpire-lib-dirs=${UMPIRE_DIR}/lib --with-umpire-libs=umpire --with-gpu-arch=70 --with-extra-CFLAGS=\\'-qmaxmem=-1 -qsuppress=1500-029\\' --with-extra-CXXFLAGS=\\'-qmaxmem=-1 -qsuppress=1500-029\\'"
+ro="-bench -rt -mpibind -save ${save}"
+./test.sh basic.sh $src_dir -co: $co -mo: $mo #-ro: $ro
+./renametest.sh basic $output_dir/basic-cuda-nonum-umpire
+
+# CUDA without UM with RAJA [struct]
+# build RAJA
+# cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=$(which xlC) -DENABLE_OPENMP=Off -DENABLE_CUDA=On -DCUDA_ARCH=sm_70 -DCMAKE_INSTALL_PREFIX=../install_lassen ../
+
+RAJA_DIR=/usr/workspace/hypre/ext-libs/RAJA/nvcc10.1.243-sm_70-xl2021.03.11/
+co="--with-cuda --enable-debug --with-raja --with-raja-include=${RAJA_DIR}/include --with-raja-lib-dirs=${RAJA_DIR}/lib --with-raja-libs=RAJA --with-gpu-arch=70 --with-extra-CFLAGS=\\'-qmaxmem=-1 -qsuppress=1500-029\\' --with-extra-CXXFLAGS=\\'-qmaxmem=-1 -qsuppress=1500-029\\'"
+ro="-struct -rt -mpibind -save ${save}"
+./test.sh basic.sh $src_dir -co: $co -mo: $mo -ro: $ro
+./renametest.sh basic $output_dir/basic-cuda-nonum-raja
+
+# CUDA without UM with Kokkos [struct]
+#-DKokkos_ENABLE_CUDA_RELOCATABLE_DEVICE_CODE=ON ..
+
+#cmake -DCMAKE_CXX_COMPILER=${PWD}/../bin/nvcc_wrapper -DCMAKE_CXX_FLAGS= -DCMAKE_EXE_LINKER_FLAGS= -DCMAKE_INSTALL_PREFIX=${PWD}/../install_lassen_cuda -DKokkos_ENABLE_CUDA=ON -DKokkos_ARCH_POWER9=ON -DKokkos_ARCH_VOLTA70=ON -DKokkos_ENABLE_TESTS=ON -DKokkos_ENABLE_EXAMPLES=OFF -DKokkos_ENABLE_CUDA_LAMBDA=ON -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_CXX_EXTENSIONS=OFF -DCMAKE_BUILD_TYPE=RELEASE ..
+
+#../generate_makefile.bash --with-cuda=${CUDA_HOME} --prefix=${PWD}/../install_lassen_cuda --arch=Volta70 --compiler=${PWD}/../bin/nvcc_wrapper --with-cuda-options=enable_lambda,rdc
+
+module load gcc/8.3.1
+module load cmake/3.16
+KOKKOS_DIR=/usr/workspace/hypre/ext-libs/Kokkos/nvcc10.1.243-sm_70-gcc8.3.1/
+co="--with-cuda --enable-debug --with-kokkos --with-kokkos-include=${KOKKOS_DIR}/include --with-kokkos-lib-dirs=${KOKKOS_DIR}/lib64 --with-kokkos-libs=kokkoscore --with-cxxstandard=14 --with-gpu-arch=70 CC=mpicc CXX=mpicxx"
+ro="-struct -rt -mpibind -save ${save}"
+./test.sh basic.sh $src_dir -co: $co -mo: $mo -ro: $ro
+./renametest.sh basic $output_dir/basic-cuda-nonum-kokkos
+
+############
+## OMP4.5 ##
+############
+
diff --git a/external/hypre/AUTOTEST/machine-lassen.sh b/external/hypre/AUTOTEST/machine-lassen.sh
old mode 100644
new mode 100755
index 121e60f3..b778e4ba
--- a/external/hypre/AUTOTEST/machine-lassen.sh
+++ b/external/hypre/AUTOTEST/machine-lassen.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -18,7 +18,7 @@ case $1 in
    where: -h|-help   prints this usage information and exits
           {src_dir}  is the hypre source directory
 
-   This script runs a number of tests suitable for the syrah cluster.
+   This script runs a number of tests suitable for the lassen cluster.
 
    Example usage: $0 ../src
 
@@ -33,6 +33,7 @@ output_dir=`pwd`/$testname.dir
 rm -fr $output_dir
 mkdir -p $output_dir
 src_dir=`cd $1; pwd`
+root_dir=`cd $src_dir/..; pwd`
 shift
 
 # Basic build and run tests
@@ -45,74 +46,127 @@ atol="3e-15"
 #save=`echo $(hostname) | sed 's/[0-9]\+$//'`
 save="lassen"
 
-##########
-## CUDA ##
-##########
+######################
+##   DEFAULT CUDA   ##
+##  (cuda/11.2.0)   ##
+######################
+
+module -q load cuda
+module -q load xl
 
 # CUDA with UM in debug mode [ij, ams, struct, sstruct]
-co="--with-cuda --enable-unified-memory --enable-persistent --enable-debug --with-gpu-arch=\\'60 70\\' --with-extra-CFLAGS=\\'-qmaxmem=-1 -qsuppress=1500-029\\' --with-extra-CXXFLAGS=\\'-qmaxmem=-1 -qsuppress=1500-029\\'"
+co="--with-cuda --enable-unified-memory --enable-persistent --enable-debug --with-gpu-arch=70 --with-memory-tracker --with-extra-CFLAGS=\\'-qsuppress=1500-029\\' --with-extra-CXXFLAGS=\\'-qsuppress=1500-029\\'"
 ro="-ij-gpu -ams -struct -sstruct -rt -mpibind -save ${save} -rtol ${rtol} -atol ${atol}"
 eo="-gpu -rt -mpibind -save ${save} -rtol ${rtol} -atol ${atol}"
 ./test.sh basic.sh $src_dir -co: $co -mo: $mo -ro: $ro -eo: $eo
 ./renametest.sh basic $output_dir/basic-cuda-um
 
-#CUDA with UM and mixed-int
-co="--with-cuda --enable-unified-memory --enable-mixedint --enable-debug --with-gpu-arch=\\'60 70\\' --with-extra-CFLAGS=\\'-qmaxmem=-1 -qsuppress=1500-029\\' --with-extra-CXXFLAGS=\\'-qmaxmem=-1 -qsuppress=1500-029\\'"
+# CUDA with UM in debug mode [ij, ams, struct, sstruct]
+co="--with-cuda --enable-unified-memory --enable-persistent --enable-debug --with-print-errors --with-gpu-arch=70 --with-memory-tracker --with-extra-CFLAGS=\\'-qsuppress=1500-029\\' --with-extra-CXXFLAGS=\\'-qsuppress=1500-029\\'"
+ro="-error -rt -mpibind -save ${save} -rtol ${rtol} -atol ${atol}"
+./test.sh basic.sh $src_dir -co: $co -mo: $mo -ro: $ro
+./renametest.sh basic $output_dir/basic-cuda-um-with-errors
+
+# CUDA with UM and mixed-int
+co="--with-cuda --enable-unified-memory --enable-mixedint --enable-debug --with-gpu-arch=70 --with-extra-CFLAGS=\\'-qsuppress=1500-029\\' --with-extra-CXXFLAGS=\\'-qsuppress=1500-029\\'"
 ro="-ij-mixed -ams -struct -sstruct-mixed -rt -mpibind -save ${save} -rtol ${rtol} -atol ${atol}"
 ./test.sh basic.sh $src_dir -co: $co -mo: $mo -ro: $ro
 ./renametest.sh basic $output_dir/basic-cuda-um-mixedint
 
-# CUDA with UM with shared library [no run]
-co="--with-cuda --enable-unified-memory --with-openmp --enable-hopscotch --enable-shared --with-gpu-arch=\\'60 70\\' --with-extra-CFLAGS=\\'-qmaxmem=-1 -qsuppress=1500-029\\' --with-extra-CXXFLAGS=\\'-qmaxmem=-1 -qsuppress=1500-029\\'"
-./test.sh basic.sh $src_dir -co: $co -mo: $mo
+# CUDA with UM with shared library
+co="--with-cuda --enable-unified-memory --with-openmp --enable-hopscotch --enable-shared --with-gpu-arch=70 --with-extra-CFLAGS=\\'-qsuppress=1500-029\\' --with-extra-CXXFLAGS=\\'-qsuppress=1500-029\\'"
+ro="-gpumemcheck -rt -mpibind -cudamemcheck -save ${save}"
+./test.sh basic.sh $src_dir -co: $co -mo: $mo -ro: $ro
 ./renametest.sh basic $output_dir/basic-cuda-um-shared
 
+# CUDA with UM and single precision
+co="--with-cuda --enable-unified-memory --enable-single --enable-debug --with-gpu-arch=70 --with-extra-CFLAGS=\\'-qsuppress=1500-029\\' --with-extra-CXXFLAGS=\\'-qsuppress=1500-029\\'"
+ro="-single -rt -mpibind -save ${save}"
+./test.sh basic.sh $src_dir -co: $co -mo: $mo -ro: ${ro}
+./renametest.sh basic $output_dir/basic-cuda-um-single
+
 # CUDA with UM without MPI [no run]
-#co="--with-cuda --enable-unified-memory --without-MPI --with-gpu-arch=\\'60 70\\' --with-extra-CXXFLAGS=\\'-qmaxmem=-1 -qsuppress=1500-029\\'"
+#co="--with-cuda --enable-unified-memory --without-MPI --with-gpu-arch=70 --with-extra-CXXFLAGS=\\'-qsuppress=1500-029\\'"
 #./test.sh basic.sh $src_dir -co: $co -mo: $mo
 #./renametest.sh basic $output_dir/basic-cuda-um-without-MPI
 
-# CUDA without UM with device memory pool [benchmark, struct]
-co="--with-cuda --enable-device-memory-pool --with-gpu-arch=\\'60 70\\' --with-extra-CFLAGS=\\'-qmaxmem=-1 -qsuppress=1500-029\\' --with-extra-CXXFLAGS=\\'-qmaxmem=-1 -qsuppress=1500-029\\'"
-ro="-bench -struct -rt -mpibind -save ${save}"
+# CUDA without UM with device memory pool [struct]
+co="--with-cuda --enable-device-memory-pool --with-gpu-arch=70 --with-extra-CFLAGS=\\'-qsuppress=1500-029\\' --with-extra-CXXFLAGS=\\'-qsuppress=1500-029\\'"
+ro="-struct -rt -mpibind -save ${save}"
 ./test.sh basic.sh $src_dir -co: $co -mo: $mo -ro: $ro
 ./renametest.sh basic $output_dir/basic-cuda-nonum
 
+# CUDA without UM with umpire [benchmark]
+UMPIRE_DIR=/usr/workspace/hypre/ext-libs/Umpire/2022.03.1-nvcc11.2-sm_70-xl2023.06.28-cuda-11.2.0-gcc-8.3.1
+co="--with-cuda --with-gpu-arch=70 --with-umpire --with-umpire-include=${UMPIRE_DIR}/include --with-umpire-lib-dirs=${UMPIRE_DIR}/lib --with-umpire-libs=umpire --with-extra-CFLAGS=\\'-qsuppress=1500-029\\' --with-extra-CXXFLAGS=\\'-qsuppress=1500-029\\'"
+ro="-bench -rt -mpibind -save ${save}"
+./test.sh basic.sh $src_dir -co: $co -mo: $mo -ro: $ro
+./renametest.sh basic $output_dir/basic-cuda-bench
+
+# run on CPU
+co="--with-cuda --with-test-using-host --with-memory-tracker --enable-debug --with-gpu-arch=70"
+ro="-ij-noilu -ams -struct -sstruct -rt -mpibind -save lassen_cpu"
+./test.sh basic.sh $src_dir -co: $co -mo: $mo -ro: $ro
+./renametest.sh basic $output_dir/basic-cuda-cpu
+
 ############
 ## OMP4.5 ##
 ############
 
 # OMP 4.5 with UM with shared library [no run]
-#co="--with-device-openmp --enable-unified-memory --enable-shared --with-extra-CFLAGS=\\'-qmaxmem=-1 -qsuppress=1500-029:1500-030:1501-308\\' --with-extra-CXXFLAGS=\\'-qmaxmem=-1 -qsuppress=1500-029:1500-030:1501-308\\'"
+#co="--with-device-openmp --enable-unified-memory --enable-shared --with-extra-CFLAGS=\\'-qsuppress=1500-029:1500-030:1501-308\\' --with-extra-CXXFLAGS=\\'-qsuppress=1500-029:1500-030:1501-308\\'"
 #./test.sh basic.sh $src_dir -co: $co -mo: $mo
 #./renametest.sh basic $output_dir/basic-deviceomp-um-shared
 
 # OMP 4.5 without UM in debug mode [struct]
-co="--with-device-openmp --enable-debug --with-gpu-arch=\\'60 70\\' --with-extra-CFLAGS=\\'-qmaxmem=-1 -qsuppress=1500-029\\' --with-extra-CXXFLAGS=\\'-qmaxmem=-1 -qsuppress=1500-029\\'"
-ro="-struct -rt -mpibind -save ${host}"
+co="--with-device-openmp --enable-debug --with-gpu-arch=70 --with-extra-CFLAGS=\\'-qsuppress=1500-029\\' --with-extra-CXXFLAGS=\\'-qsuppress=1500-029\\'"
+ro="-struct -rt -mpibind -save ${save}"
 ./test.sh basic.sh $src_dir -co: $co -mo: $mo -ro: $ro
 ./renametest.sh basic $output_dir/basic-deviceomp-nonum-debug-struct
 
-# CUDA + CMake build (only) tests
+#####################################
+## CUDA + CMake build (only) tests ##
+#####################################
+module -q load cmake/3.22
+module list cmake/3.22 |& grep "None found"
+
 mo="-j"
+
 # CUDA with UM + CMake
-co="-DCMAKE_C_COMPILER=$(which xlc) -DCMAKE_CXX_COMPILER=$(which xlc++) -DCMAKE_CUDA_COMPILER=$(which nvcc) -DMPI_C_COMPILER=$(which mpicc) -DMPI_CXX_COMPILER=$(which mpicxx) -DHYPRE_WITH_CUDA=ON -DHYPRE_ENABLE_UNIFIED_MEMORY=ON -DCMAKE_BUILD_TYPE=Debug -DHYPRE_ENABLE_PERSISTENT_COMM=ON -DHYPRE_ENABLE_DEVICE_POOL=ON -DHYPRE_WITH_EXTRA_CFLAGS="\'"-qmaxmem=-1 -qsuppress=1500-029"\'" -DHYPRE_WITH_EXTRA_CXXFLAGS="\'"-qmaxmem=-1 -qsuppress=1500-029"\'" -DHYPRE_CUDA_SM=70"
-./test.sh cmake.sh $src_dir -co: $co -mo: $mo
+co="-DCMAKE_C_COMPILER=$(which xlc) -DCMAKE_CXX_COMPILER=$(which xlc++) -DCMAKE_CUDA_COMPILER=$(which nvcc) -DMPI_C_COMPILER=$(which mpicc) -DMPI_CXX_COMPILER=$(which mpicxx) -DHYPRE_ENABLE_CUDA=ON -DHYPRE_ENABLE_UNIFIED_MEMORY=ON -DCMAKE_BUILD_TYPE=Debug -DHYPRE_ENABLE_PERSISTENT_COMM=ON -DHYPRE_ENABLE_DEVICE_POOL=ON -DHYPRE_WITH_EXTRA_CFLAGS="\'"-qsuppress=1500-029"\'" -DHYPRE_WITH_EXTRA_CXXFLAGS="\'"-qsuppress=1500-029"\'" -DCMAKE_CUDA_ARCHITECTURES=70"
+./test.sh cmake.sh $root_dir -co: $co -mo: $mo
 ./renametest.sh cmake $output_dir/cmake-cuda-um-ij
 
 # CUDA with UM [shared library] + CMake
-co="-DCMAKE_C_COMPILER=$(which xlc) -DCMAKE_CXX_COMPILER=$(which xlc++) -DCMAKE_CUDA_COMPILER=$(which nvcc) -DMPI_C_COMPILER=$(which mpicc) -DMPI_CXX_COMPILER=$(which mpicxx) -DHYPRE_WITH_CUDA=ON -DHYPRE_ENABLE_UNIFIED_MEMORY=ON -DCMAKE_BUILD_TYPE=Debug -DHYPRE_WITH_OPENMP=ON -DHYPRE_ENABLE_HOPSCOTCH=ON -DHYPRE_ENABLE_SHARED=ON -DHYPRE_WITH_EXTRA_CFLAGS="\'"-qmaxmem=-1 -qsuppress=1500-029"\'" -DHYPRE_WITH_EXTRA_CXXFLAGS="\'"-qmaxmem=-1 -qsuppress=1500-029 "\'" -DHYPRE_CUDA_SM=70"
-./test.sh cmake.sh $src_dir -co: $co -mo: $mo
+co="-DCMAKE_C_COMPILER=$(which xlc) -DCMAKE_CXX_COMPILER=$(which xlc++) -DCMAKE_CUDA_COMPILER=$(which nvcc) -DMPI_C_COMPILER=$(which mpicc) -DMPI_CXX_COMPILER=$(which mpicxx) -DHYPRE_ENABLE_CUDA=ON -DHYPRE_ENABLE_UNIFIED_MEMORY=ON -DCMAKE_BUILD_TYPE=Debug -DHYPRE_ENABLE_OPENMP=ON -DHYPRE_ENABLE_HOPSCOTCH=ON -DBUILD_SHARED_LIBS=ON -DHYPRE_WITH_EXTRA_CFLAGS="\'"-qsuppress=1500-029"\'" -DHYPRE_WITH_EXTRA_CXXFLAGS="\'"-qsuppress=1500-029 "\'" -DCMAKE_CUDA_ARCHITECTURES=70"
+./test.sh cmake.sh $root_dir -co: $co -mo: $mo
 ./renametest.sh cmake $output_dir/cmake-cuda-um-shared
 
 # CUDA w.o UM + CMake
-co="-DCMAKE_C_COMPILER=$(which xlc) -DCMAKE_CXX_COMPILER=$(which xlc++) -DCMAKE_CUDA_COMPILER=$(which nvcc) -DMPI_C_COMPILER=$(which mpicc) -DMPI_CXX_COMPILER=$(which mpicxx) -DHYPRE_WITH_CUDA=ON -DCMAKE_BUILD_TYPE=Debug -DHYPRE_WITH_EXTRA_CFLAGS="\'"-qmaxmem=-1 -qsuppress=1500-029"\'" -DHYPRE_WITH_EXTRA_CXXFLAGS="\'"-qmaxmem=-1 -qsuppress=1500-029"\'" -DHYPRE_CUDA_SM=70"
-./test.sh cmake.sh $src_dir -co: $co -mo: $mo
+co="-DCMAKE_C_COMPILER=$(which xlc) -DCMAKE_CXX_COMPILER=$(which xlc++) -DCMAKE_CUDA_COMPILER=$(which nvcc) -DMPI_C_COMPILER=$(which mpicc) -DMPI_CXX_COMPILER=$(which mpicxx) -DHYPRE_ENABLE_CUDA=ON -DCMAKE_BUILD_TYPE=Debug -DHYPRE_WITH_EXTRA_CFLAGS="\'"-qsuppress=1500-029"\'" -DHYPRE_WITH_EXTRA_CXXFLAGS="\'"-qsuppress=1500-029"\'" -DCMAKE_CUDA_ARCHITECTURES=70"
+./test.sh cmake.sh $root_dir -co: $co -mo: $mo
 ./renametest.sh cmake $output_dir/cmake-cuda-nonum-struct
 
+#######################
+## latest CUDA tests ##
+##    cuda/12.0.0    ##
+#######################
+
+rtol="1e-2"
+atol="1e-6"
+mo="-j test"
+
+# CUDA 12.0 + GCC with UM in debug mode, thrust nosync [ij, ams, struct, sstruct]
+module -q load gcc/8.3.1
+module -q load cuda/12.0
+module list cuda/12.0 |& grep "None found"
+co="--with-cuda --enable-unified-memory --enable-thrust-nosync --enable-debug --with-gpu-arch=70 CC=mpicc CXX=mpicxx"
+ro="-ij-gpu -ams -struct -sstruct -rt -mpibind -save ${save} -rtol ${rtol} -atol ${atol}"
+./test.sh basic.sh $src_dir -co: $co -mo: $mo -ro: $ro
+./renametest.sh basic $output_dir/basic-cuda12_0
+
 # Echo to stderr all nonempty error files in $output_dir
 for errfile in $( find $output_dir ! -size 0 -name "*.err" )
 do
    echo $errfile >&2
 done
-
diff --git a/external/hypre/AUTOTEST/machine-mac.sh b/external/hypre/AUTOTEST/machine-mac.sh
old mode 100644
new mode 100755
index 2e7d4400..746e3dc9
--- a/external/hypre/AUTOTEST/machine-mac.sh
+++ b/external/hypre/AUTOTEST/machine-mac.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -35,40 +35,18 @@ mkdir -p $output_dir
 src_dir=`cd $1; pwd`
 shift
 
-# This is needed for some reason
-export CXX="mpicxx"
-
 # Basic build and run tests
-# Make sure that we don't check for a working Fortran compiler
-mo="test"
-ro="-ams -ij -sstruct -struct -rt -D HYPRE_NO_SAVED"
+mo="-j test"
+ro="-ams -ij -sstruct -struct -lobpcg -rt -rtol 0.0 -atol 1e-3"
 
-co="--disable-fortran"
-./test.sh basic.sh $src_dir -co: $co -mo: $mo -ro: $ro
+co=""
+./test.sh basic.sh $src_dir -co: $co -mo: $mo
 ./renametest.sh basic $output_dir/basic-default
 
-co="--enable-debug --disable-fortran"
-./test.sh basic.sh $src_dir -co: $co -mo: $mo
+co="--enable-debug"
+./test.sh basic.sh $src_dir -co: $co -mo: $mo -ro: $ro
 ./renametest.sh basic $output_dir/basic--enable-debug
 
-co="--enable-bigint --disable-fortran"
-./test.sh basic.sh $src_dir -co: $co -mo: $mo
-./renametest.sh basic $output_dir/basic--enable-bigint
-
-co="--enable-mixedint --disable-fortran"
-./test.sh basic.sh $src_dir -co: $co -mo: $mo
-./renametest.sh basic $output_dir/basic--enable-mixedint
-
-# Test linking for different languages
-link_opts="all++"
-for opt in $link_opts
-do
-   output_subdir=$output_dir/link$opt
-   mkdir -p $output_subdir
-   ./test.sh link.sh $src_dir $opt
-   mv -f link.??? $output_subdir
-done
-
 # Echo to stderr all nonempty error files in $output_dir
 for errfile in $( find $output_dir ! -size 0 -name "*.err" )
 do
diff --git a/external/hypre/AUTOTEST/machine-ray.sh b/external/hypre/AUTOTEST/machine-ray.sh
deleted file mode 100644
index 9af1d413..00000000
--- a/external/hypre/AUTOTEST/machine-ray.sh
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
-# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
-#
-# SPDX-License-Identifier: (Apache-2.0 OR MIT)
-
-testname=`basename $0 .sh`
-
-# Echo usage information
-case $1 in
-   -h|-help)
-      cat <<EOF
-
-   **** Only run this script on the ray cluster ****
-
-   $0 [-h|-help] {src_dir}
-
-   where: -h|-help   prints this usage information and exits
-          {src_dir}  is the hypre source directory
-
-   This script runs a number of tests suitable for the syrah cluster.
-
-   Example usage: $0 ../src
-
-EOF
-      exit
-      ;;
-esac
-
-# Setup
-test_dir=`pwd`
-output_dir=`pwd`/$testname.dir
-rm -fr $output_dir
-mkdir -p $output_dir
-src_dir=`cd $1; pwd`
-shift
-
-# Basic build and run tests
-mo="-j test"
-eo=""
-
-rtol="0.0"
-atol="3e-15"
-
-#save=`echo $(hostname) | sed 's/[0-9]\+$//'`
-save="ray"
-
-##########
-## CUDA ##
-##########
-
-# CUDA with UM in debug mode [ij, ams, struct, sstruct]
-co="--with-cuda --enable-unified-memory --enable-persistent --enable-debug --with-gpu-arch=\\'60 70\\' --with-extra-CFLAGS=\\'-qmaxmem=-1 -qsuppress=1500-029\\' --with-extra-CXXFLAGS=\\'-qmaxmem=-1 -qsuppress=1500-029\\'"
-ro="-ij-gpu -ams -struct -sstruct -rt -mpibind -save ${save} -rtol ${rtol} -atol ${atol}"
-eo="-gpu -rt -mpibind -save ${save} -rtol ${rtol} -atol ${atol}"
-./test.sh basic.sh $src_dir -co: $co -mo: $mo -ro: $ro -eo: $eo
-./renametest.sh basic $output_dir/basic-cuda-um
-
-#CUDA with UM and mixed-int
-co="--with-cuda --enable-unified-memory --enable-mixedint --enable-debug --with-gpu-arch=\\'60 70\\' --with-extra-CFLAGS=\\'-qmaxmem=-1 -qsuppress=1500-029\\' --with-extra-CXXFLAGS=\\'-qmaxmem=-1 -qsuppress=1500-029\\'"
-ro="-ij-mixed -ams -struct -sstruct-mixed -rt -mpibind -save ${save} -rtol ${rtol} -atol ${atol}"
-./test.sh basic.sh $src_dir -co: $co -mo: $mo -ro: $ro
-./renametest.sh basic $output_dir/basic-cuda-um-mixedint
-
-# CUDA with UM with shared library [no run]
-co="--with-cuda --enable-unified-memory --with-openmp --enable-hopscotch --enable-shared --with-gpu-arch=\\'60 70\\' --with-extra-CFLAGS=\\'-qmaxmem=-1 -qsuppress=1500-029\\' --with-extra-CXXFLAGS=\\'-qmaxmem=-1 -qsuppress=1500-029\\'"
-./test.sh basic.sh $src_dir -co: $co -mo: $mo
-./renametest.sh basic $output_dir/basic-cuda-um-shared
-
-# CUDA with UM without MPI [no run]
-#co="--with-cuda --enable-unified-memory --without-MPI --with-gpu-arch=\\'60 70\\' --with-extra-CXXFLAGS=\\'-qmaxmem=-1 -qsuppress=1500-029\\'"
-#./test.sh basic.sh $src_dir -co: $co -mo: $mo
-#./renametest.sh basic $output_dir/basic-cuda-um-without-MPI
-
-# CUDA without UM with device memory pool [benchmark, struct]
-co="--with-cuda --enable-device-memory-pool --with-gpu-arch=\\'60 70\\' --with-extra-CFLAGS=\\'-qmaxmem=-1 -qsuppress=1500-029\\' --with-extra-CXXFLAGS=\\'-qmaxmem=-1 -qsuppress=1500-029\\'"
-ro="-bench -struct -rt -mpibind -save ${save}"
-./test.sh basic.sh $src_dir -co: $co -mo: $mo -ro: $ro
-./renametest.sh basic $output_dir/basic-cuda-nonum
-
-############
-## OMP4.5 ##
-############
-
-# OMP 4.5 with UM with shared library [no run]
-#co="--with-device-openmp --enable-unified-memory --enable-shared --with-extra-CFLAGS=\\'-qmaxmem=-1 -qsuppress=1500-029:1500-030:1501-308\\' --with-extra-CXXFLAGS=\\'-qmaxmem=-1 -qsuppress=1500-029:1500-030:1501-308\\'"
-#./test.sh basic.sh $src_dir -co: $co -mo: $mo
-#./renametest.sh basic $output_dir/basic-deviceomp-um-shared
-
-# OMP 4.5 without UM in debug mode [struct]
-co="--with-device-openmp --enable-debug --with-gpu-arch=\\'60 70\\' --with-extra-CFLAGS=\\'-qmaxmem=-1 -qsuppress=1500-029\\' --with-extra-CXXFLAGS=\\'-qmaxmem=-1 -qsuppress=1500-029\\'"
-ro="-struct -rt -mpibind -save ${host}"
-./test.sh basic.sh $src_dir -co: $co -mo: $mo -ro: $ro
-./renametest.sh basic $output_dir/basic-deviceomp-nonum-debug-struct
-
-# CUDA + CMake build (only) tests
-mo="-j"
-# CUDA with UM + CMake
-co="-DCMAKE_C_COMPILER=$(which xlc) -DCMAKE_CXX_COMPILER=$(which xlc++) -DCMAKE_CUDA_COMPILER=$(which nvcc) -DMPI_C_COMPILER=$(which mpicc) -DMPI_CXX_COMPILER=$(which mpicxx) -DHYPRE_WITH_CUDA=ON -DHYPRE_ENABLE_UNIFIED_MEMORY=ON -DCMAKE_BUILD_TYPE=Debug -DHYPRE_ENABLE_PERSISTENT_COMM=ON -DHYPRE_ENABLE_DEVICE_POOL=ON -DHYPRE_WITH_EXTRA_CFLAGS="\'"-qmaxmem=-1 -qsuppress=1500-029"\'" -DHYPRE_WITH_EXTRA_CXXFLAGS="\'"-qmaxmem=-1 -qsuppress=1500-029"\'" -DHYPRE_CUDA_SM=70"
-./test.sh cmake.sh $src_dir -co: $co -mo: $mo
-./renametest.sh cmake $output_dir/cmake-cuda-um-ij
-
-# CUDA with UM [shared library] + CMake
-co="-DCMAKE_C_COMPILER=$(which xlc) -DCMAKE_CXX_COMPILER=$(which xlc++) -DCMAKE_CUDA_COMPILER=$(which nvcc) -DMPI_C_COMPILER=$(which mpicc) -DMPI_CXX_COMPILER=$(which mpicxx) -DHYPRE_WITH_CUDA=ON -DHYPRE_ENABLE_UNIFIED_MEMORY=ON -DCMAKE_BUILD_TYPE=Debug -DHYPRE_WITH_OPENMP=ON -DHYPRE_ENABLE_HOPSCOTCH=ON -DHYPRE_ENABLE_SHARED=ON -DHYPRE_WITH_EXTRA_CFLAGS="\'"-qmaxmem=-1 -qsuppress=1500-029"\'" -DHYPRE_WITH_EXTRA_CXXFLAGS="\'"-qmaxmem=-1 -qsuppress=1500-029 "\'" -DHYPRE_CUDA_SM=70"
-./test.sh cmake.sh $src_dir -co: $co -mo: $mo
-./renametest.sh cmake $output_dir/cmake-cuda-um-shared
-
-# CUDA w.o UM + CMake
-co="-DCMAKE_C_COMPILER=$(which xlc) -DCMAKE_CXX_COMPILER=$(which xlc++) -DCMAKE_CUDA_COMPILER=$(which nvcc) -DMPI_C_COMPILER=$(which mpicc) -DMPI_CXX_COMPILER=$(which mpicxx) -DHYPRE_WITH_CUDA=ON -DCMAKE_BUILD_TYPE=Debug -DHYPRE_WITH_EXTRA_CFLAGS="\'"-qmaxmem=-1 -qsuppress=1500-029"\'" -DHYPRE_WITH_EXTRA_CXXFLAGS="\'"-qmaxmem=-1 -qsuppress=1500-029"\'" -DHYPRE_CUDA_SM=70"
-./test.sh cmake.sh $src_dir -co: $co -mo: $mo
-./renametest.sh cmake $output_dir/cmake-cuda-nonum-struct
-
-# Echo to stderr all nonempty error files in $output_dir
-for errfile in $( find $output_dir ! -size 0 -name "*.err" )
-do
-   echo $errfile >&2
-done
-
diff --git a/external/hypre/AUTOTEST/machine-rztopaz.sh b/external/hypre/AUTOTEST/machine-rzhound.sh
old mode 100644
new mode 100755
similarity index 89%
rename from external/hypre/AUTOTEST/machine-rztopaz.sh
rename to external/hypre/AUTOTEST/machine-rzhound.sh
index 9d79ae0e..98dd9798
--- a/external/hypre/AUTOTEST/machine-rztopaz.sh
+++ b/external/hypre/AUTOTEST/machine-rzhound.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -11,14 +11,14 @@ case $1 in
    -h|-help)
       cat <<EOF
 
-   **** Only run this script on the rztopaz machine ****
+   **** Only run this script on the rzhound machine ****
 
    $0 [-h|-help] {src_dir}
 
    where: -h|-help   prints this usage information and exits
           {src_dir}  is the hypre source directory
 
-   This script runs a number of tests suitable for the rztopaz machine.
+   This script runs a number of tests suitable for the rzhound machine.
 
    Example usage: $0 ../src
 
diff --git a/external/hypre/AUTOTEST/machine-syrah.sh b/external/hypre/AUTOTEST/machine-syrah.sh
old mode 100644
new mode 100755
index c36e0896..272d43f2
--- a/external/hypre/AUTOTEST/machine-syrah.sh
+++ b/external/hypre/AUTOTEST/machine-syrah.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/AUTOTEST/machine-tioga.sh b/external/hypre/AUTOTEST/machine-tioga.sh
new file mode 100755
index 00000000..a54bd33f
--- /dev/null
+++ b/external/hypre/AUTOTEST/machine-tioga.sh
@@ -0,0 +1,100 @@
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+testname=`basename $0 .sh`
+
+# Echo usage information
+case $1 in
+   -h|-help)
+      cat <<EOF
+
+   **** Only run this script on the tioga cluster ****
+
+   $0 [-h|-help] {src_dir}
+
+   where: -h|-help   prints this usage information and exits
+          {src_dir}  is the hypre source directory
+
+   This script runs a number of tests suitable for the tioga cluster.
+
+   Example usage: $0 ../src
+
+EOF
+      exit
+      ;;
+esac
+
+# Setup
+test_dir=`pwd`
+output_dir=`pwd`/$testname.dir
+rm -fr $output_dir
+mkdir -p $output_dir
+src_dir=`cd $1; pwd`
+root_dir=`cd $src_dir/..; pwd`
+shift
+
+# Basic build and run tests
+mo="-j test"
+eo=""
+
+rtol="0.0"
+atol="3e-15"
+
+#save=`echo $(hostname) | sed 's/[0-9]\+$//'`
+save="tioga"
+
+##########
+## HIP  ##
+##########
+
+module -q load rocm/6.2.1
+
+# HIP without UM [benchmark, struct, ams]
+co="--with-hip --with-MPI-include=${MPICH_DIR}/include --with-MPI-lib-dirs=${MPICH_DIR}/lib --with-MPI-libs=mpi --with-gpu-arch='gfx90a' CC=cc CXX=CC"
+ro="-ams -bench -struct -rt -save ${save}"
+./test.sh basic.sh $src_dir -co: $co -mo: $mo -ro: $ro
+./renametest.sh basic $output_dir/basic-hip-nonum
+
+#HIP with UM and single precision [no run]
+co="--with-hip --enable-unified-memory --enable-single --enable-debug --with-MPI-include=${MPICH_DIR}/include --with-MPI-lib-dirs=${MPICH_DIR}/lib --with-MPI-libs=mpi --with-gpu-arch='gfx90a' CC=cc CXX=CC"
+./test.sh basic.sh $src_dir -co: $co -mo: $mo
+./renametest.sh basic $output_dir/basic-hip-um-single
+
+# run on CPU
+co="--with-hip --with-test-using-host --with-memory-tracker --enable-debug --with-MPI-include=${MPICH_DIR}/include --with-MPI-lib-dirs=${MPICH_DIR}/lib --with-MPI-libs=mpi --with-gpu-arch='gfx90a' CC=cc CXX=CC"
+ro="-ij-noilu -ams -struct -sstruct -rt -D HYPRE_NO_SAVED"
+./test.sh basic.sh $src_dir -co: $co -mo: $mo -ro: $ro
+./renametest.sh basic $output_dir/basic-hip-cpu
+
+####################################
+## HIP + CMake build (only) tests ##
+####################################
+
+module -q load cmake/3.24.2
+
+# Basic build and check library
+mo="-j all check"
+
+# HIP without UM + CMake (no full run, but with basic "make check")
+co="-DCMAKE_C_COMPILER=cc -DCMAKE_CXX_COMPILER=CC -DMPI_C_COMPILER=cc -DMPI_CXX_COMPILER=CC -DHYPRE_ENABLE_HIP=ON -DCMAKE_HIP_ARCHITECTURES=gfx90a -DCMAKE_BUILD_TYPE=Debug -DHYPRE_BUILD_TESTS=ON"
+./test.sh cmake.sh $root_dir -co: $co -mo: $mo
+./renametest.sh cmake $output_dir/cmake-hip-nonum
+
+# HIP with UM + Shared library + CMake (no full run, but with basic "make check")
+co="-DBUILD_SHARED_LIBS=ON -DCMAKE_C_COMPILER=cc -DCMAKE_CXX_COMPILER=CC -DMPI_C_COMPILER=cc -DMPI_CXX_COMPILER=CC -DHYPRE_ENABLE_HIP=ON -DCMAKE_HIP_ARCHITECTURES=gfx90a -DHYPRE_ENABLE_UNIFIED_MEMORY=ON -DCMAKE_BUILD_TYPE=Debug -DHYPRE_BUILD_TESTS=ON"
+./test.sh cmake.sh $root_dir -co: $co -mo: $mo
+./renametest.sh cmake $output_dir/cmake-hip-um-shared
+
+# CPU + CMake (no full run, but with basic "make check")
+co="-DCMAKE_C_COMPILER=cc -DCMAKE_CXX_COMPILER=CC -DMPI_C_COMPILER=cc -DMPI_CXX_COMPILER=CC -DCMAKE_BUILD_TYPE=Debug -DHYPRE_BUILD_TESTS=ON"
+./test.sh cmake.sh $root_dir -co: $co -mo: $mo
+./renametest.sh cmake $output_dir/cmake-cpu
+
+# Echo to stderr all nonempty error files in $output_dir
+for errfile in $( find $output_dir ! -size 0 -name "*.err" )
+do
+   echo $errfile >&2
+done
diff --git a/external/hypre/AUTOTEST/machine-tux-compilers.sh b/external/hypre/AUTOTEST/machine-tux-compilers.sh
old mode 100644
new mode 100755
index 54f8b087..4b2e83f6
--- a/external/hypre/AUTOTEST/machine-tux-compilers.sh
+++ b/external/hypre/AUTOTEST/machine-tux-compilers.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/AUTOTEST/machine-tux-exlibs.sh b/external/hypre/AUTOTEST/machine-tux-exlibs.sh
old mode 100644
new mode 100755
index 30e105d0..b7fa0fe2
--- a/external/hypre/AUTOTEST/machine-tux-exlibs.sh
+++ b/external/hypre/AUTOTEST/machine-tux-exlibs.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/AUTOTEST/machine-tux-spack.sh b/external/hypre/AUTOTEST/machine-tux-spack.sh
old mode 100644
new mode 100755
index 0800559f..1ced7341
--- a/external/hypre/AUTOTEST/machine-tux-spack.sh
+++ b/external/hypre/AUTOTEST/machine-tux-spack.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -37,7 +37,9 @@ src_dir=`cd $1; pwd`
 shift
 
 # OpenMPI limits the number of processes available by default - override
+# RDF: The first environment variable didn't work for me
 export OMPI_MCA_rmaps_base_oversubscribe=1
+export PRTE_MCA_rmaps_default_mapping_policy=:oversubscribe
 
 # Basic build and run tests
 
@@ -53,11 +55,21 @@ export OMPI_MCA_rmaps_base_oversubscribe=1
 # Use the develop branch for superlu-dist
 superludistspec="superlu-dist@develop"
 spackspec="hypre@develop~debug+superlu-dist ^$superludistspec"
-spack install $spackspec
+# The --fresh option will ensure the latest versions of dependencies are used
+spack install --fresh $spackspec
 spack load    $spackspec
 spackdir=`spack location -i $spackspec`
 test.sh basic.sh ../src -co: -mo: -spack $spackdir -ro: -superlu
 ./renametest.sh basic $output_dir/basic-dsuperlu
+
+# Clean-up spack build
+# RDF: Commenting out PR #481 (for now) to test the '--fresh' option above (faster)
+# spack spec --yaml $spackspec > test.yaml
+# grep ' hash:' test.yaml | sed -e 's/^.*: /\//' | xargs spack mark -e
+# spack gc -y
+# grep ' hash:' test.yaml | sed -e 's/^.*: /\//' | xargs spack mark -i
+# rm -f test.yaml
+# spack clean --all
 spack uninstall -yR $superludistspec
 
 # Echo to stderr all nonempty error files in $output_dir
diff --git a/external/hypre/AUTOTEST/machine-tux.sh b/external/hypre/AUTOTEST/machine-tux.sh
old mode 100644
new mode 100755
index 8914cd9c..ed08800e
--- a/external/hypre/AUTOTEST/machine-tux.sh
+++ b/external/hypre/AUTOTEST/machine-tux.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -34,6 +34,7 @@ output_dir=`pwd`/$testname.dir
 rm -fr $output_dir
 mkdir -p $output_dir
 src_dir=`cd $1; pwd`
+root_dir=`cd $src_dir/..; pwd`
 shift
 
 # Organizing the tests from "fast" to "slow"
@@ -96,7 +97,7 @@ co="--enable-shared"
 ./test.sh basic.sh $src_dir -co: $co -mo: $mo
 ./renametest.sh basic $output_dir/basic--enable-shared
 
-co="--enable-debug"
+co="--enable-debug --with-extra-CFLAGS=\\'-Wstrict-prototypes\\'"
 ./test.sh basic.sh $src_dir -co: $co -mo: $mo -eo: $eo
 ./renametest.sh basic $output_dir/basic-debug1
 
@@ -144,7 +145,7 @@ RO="-ams -ij-mixed -sstruct-mixed -struct -lobpcg-mixed"
 ./renametest.sh basic $output_dir/basic--enable-mixedint
 
 co="--enable-debug --with-print-errors"
-./test.sh basic.sh $src_dir -co: $co -mo: $mo -ro: $ro -rt -valgrind
+./test.sh basic.sh $src_dir -co: $co -mo: $mo -ro: $ro -error -rt -valgrind
 ./renametest.sh basic $output_dir/basic--valgrind
 
 # CMake build and run tests
@@ -153,31 +154,31 @@ ro="-ams -ij -sstruct -struct -lobpcg"
 eo=""
 
 co=""
-./test.sh cmake.sh $src_dir -co: $co -mo: $mo
+./test.sh cmake.sh $root_dir -co: $co -mo: $mo
 ./renametest.sh cmake $output_dir/cmake-default
 
 co="-DHYPRE_SEQUENTIAL=ON"
-./test.sh cmake.sh $src_dir -co: $co -mo: $mo
+./test.sh cmake.sh $root_dir -co: $co -mo: $mo
 ./renametest.sh cmake $output_dir/cmake-sequential
 
 co="-DHYPRE_SHARED=ON"
-./test.sh cmake.sh $src_dir -co: $co -mo: $mo
+./test.sh cmake.sh $root_dir -co: $co -mo: $mo
 ./renametest.sh cmake $output_dir/cmake-shared
 
 co="-DHYPRE_SINGLE=ON"
-./test.sh cmake.sh $src_dir -co: $co -mo: $mo -ro: -single
+./test.sh cmake.sh $root_dir -co: $co -mo: $mo -ro: -single
 ./renametest.sh cmake $output_dir/cmake-single
 
 co="-DHYPRE_LONG_DOUBLE=ON"
-./test.sh cmake.sh $src_dir -co: $co -mo: $mo -ro: -longdouble
+./test.sh cmake.sh $root_dir -co: $co -mo: $mo -ro: -longdouble
 ./renametest.sh cmake $output_dir/cmake-longdouble
 
 co="-DCMAKE_BUILD_TYPE=Debug"
-./test.sh cmake.sh $src_dir -co: $co -mo: $mo -ro: $ro
+./test.sh cmake.sh $root_dir -co: $co -mo: $mo -ro: $ro
 ./renametest.sh cmake $output_dir/cmake-debug
 
 co="-DHYPRE_BIGINT=ON"
-./test.sh cmake.sh $src_dir -co: $co -mo: $mo -ro: $ro
+./test.sh cmake.sh $root_dir -co: $co -mo: $mo -ro: $ro
 ./renametest.sh cmake $output_dir/cmake-bigint
 
 # cmake build doesn't currently support maxdim
diff --git a/external/hypre/AUTOTEST/machine-vs-pro.bat b/external/hypre/AUTOTEST/machine-vs-pro.bat
old mode 100644
new mode 100755
index 59188ea7..ef02b6aa
--- a/external/hypre/AUTOTEST/machine-vs-pro.bat
+++ b/external/hypre/AUTOTEST/machine-vs-pro.bat
@@ -1,5 +1,5 @@
 @echo off
-rem Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+rem Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 rem HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 rem
 rem SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/AUTOTEST/make.sh b/external/hypre/AUTOTEST/make.sh
old mode 100644
new mode 100755
index 6dd7e660..39f785c8
--- a/external/hypre/AUTOTEST/make.sh
+++ b/external/hypre/AUTOTEST/make.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/AUTOTEST/renametest.sh b/external/hypre/AUTOTEST/renametest.sh
old mode 100644
new mode 100755
index 9d7f5f8d..13d8f40a
--- a/external/hypre/AUTOTEST/renametest.sh
+++ b/external/hypre/AUTOTEST/renametest.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/AUTOTEST/run.sh b/external/hypre/AUTOTEST/run.sh
old mode 100644
new mode 100755
index 1ac1f7b0..f7c54456
--- a/external/hypre/AUTOTEST/run.sh
+++ b/external/hypre/AUTOTEST/run.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/AUTOTEST/runtests-error b/external/hypre/AUTOTEST/runtests-error
new file mode 100644
index 00000000..97aeafbb
--- /dev/null
+++ b/external/hypre/AUTOTEST/runtests-error
@@ -0,0 +1 @@
+TEST_error/*.sh
diff --git a/external/hypre/AUTOTEST/runtests-gpumemcheck b/external/hypre/AUTOTEST/runtests-gpumemcheck
new file mode 100644
index 00000000..8915428b
--- /dev/null
+++ b/external/hypre/AUTOTEST/runtests-gpumemcheck
@@ -0,0 +1,2 @@
+TEST_gpumemcheck/*.sh
+
diff --git a/external/hypre/AUTOTEST/runtests-ij-gpu b/external/hypre/AUTOTEST/runtests-ij-gpu
index 9205a9a1..6326bb24 100644
--- a/external/hypre/AUTOTEST/runtests-ij-gpu
+++ b/external/hypre/AUTOTEST/runtests-ij-gpu
@@ -1,2 +1 @@
-TEST_ij/*.sh
-
+TEST_ij/[^f]*.sh
diff --git a/external/hypre/AUTOTEST/runtests-ij-noilu b/external/hypre/AUTOTEST/runtests-ij-noilu
new file mode 100644
index 00000000..340f6e8a
--- /dev/null
+++ b/external/hypre/AUTOTEST/runtests-ij-noilu
@@ -0,0 +1,3 @@
+TEST_ij/[^i]*.sh
+TEST_ij/interp.sh
+
diff --git a/external/hypre/AUTOTEST/runtests-struct b/external/hypre/AUTOTEST/runtests-struct
index 0d28db49..ac43572d 100644
--- a/external/hypre/AUTOTEST/runtests-struct
+++ b/external/hypre/AUTOTEST/runtests-struct
@@ -1,2 +1 @@
-TEST_struct/[^b]*.sh
-
+TEST_struct/*.sh
diff --git a/external/hypre/AUTOTEST/test.sh b/external/hypre/AUTOTEST/test.sh
old mode 100644
new mode 100755
index 76f87909..0f1accea
--- a/external/hypre/AUTOTEST/test.sh
+++ b/external/hypre/AUTOTEST/test.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/CHANGELOG b/external/hypre/CHANGELOG
index bc336a8f..a6e149b7 100644
--- a/external/hypre/CHANGELOG
+++ b/external/hypre/CHANGELOG
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -7,6 +7,149 @@
 # This file chronicles user-level changes, beginning with the most recent.
 # =============================================================================
 
+Version 2.33.0 released 2025/04/03
+
+- Added verbosity control to error printing
+- Updated cmake to provide full build support (matches autotools)
+- Added early assembly feature to IJ to minimize memory use
+- Added new IJ matrix and vector APIs
+- Various bug fixes
+
+#====================================
+
+Version 2.32.0 released 2024/10/08
+
+- New MGR features and updates
+- New filtering option to AMG for block-diagonal preconditioning
+- New memory usage monitoring functions
+- Added non-UVM support for ILUT and HMIS coarsening
+- Various bug fixes
+
+#====================================
+
+Version 2.31.0 released 2024/02/14
+
+- Added iterative ILU0 option
+- Refactored MGR interpolation, added column-sum restriction, improved robustness
+- Added new print level options for MGR
+- Updated IJ vector I/O functions
+- Updated default compiler list for configure
+- Added a feature to avoid GPU device initialization for CPU runs
+- Improved FSAI performance on GPUs
+- Added MGR function to set the F-relaxation solver on a specific level
+- Various bug fixes
+
+#====================================
+
+Version 2.30.0 released 2023/11/06
+
+- Added FSAI support with CUDA and HIP
+- Added MAGMA option to FSAI
+- Added Binary I/O functions for IJ matrices and vectors
+- Added a convergent l1-hybrid symmetric Gauss-Seidel smoother to BoomerAMG
+- Added CUDA support to dense direct solver options in BoomerAMG and MGR
+- Added SYCL support for triangular solves (enabling Gauss-Seidel, ILU, etc.)
+  and Chebyshev relaxation
+- Improved MGR statistics and data printing
+- Added CG options to ignore errors, and added a flexible CG version
+- Added superlu_dist support on GPUs
+- Various bug fixes
+
+#====================================
+
+Version 2.29.0 released 2023/06/22
+
+- Added ILU support for AMD GPUs
+- Added new error handling feature to print messages to a memory buffer
+- Enabled more support with SYCL: MGR, AMS/ADS/ADE, AIR, ...
+- Added MAGMA support
+- Added support for CUDA 12
+- Added HYPRE_Initialized/HYPRE_Finalized functions
+- Ported MGR features to CUDA and HIP: Non-Galerkin options, block diagonal
+  interpolation, and block Jacobi relaxation
+- Added non-UVM device support for ILU and MGR
+- Added cuSOLVER and rocSOLVER support
+- Various bug fixes
+
+#====================================
+
+Version 2.28.0 released 2023/03/17
+
+- Added new Gaussian elimination options for F-relaxation in MGR.
+- Switched to read-the-docs theme for documentation.
+- Using autoconf 2.71 now to generate 'configure' script.
+- Improved error handling for multi-component vectors.
+- Various bug fixes
+
+#====================================
+
+Version 2.27.0 released 2022/12/20
+
+- New SStructMatrix and SStructVector AddFEMBoxValues() routines to set finite
+  element stiffness matrices a box at a time for better performance.
+- Added environment variable HYPRE_BRANCH_NAME.
+- Added HIP support to the MGR solver.
+- Added Jacobi iterative solver approach for ILU smoothing/preconditioning.
+- Various optimizations for IJ solvers
+- Various CMake build system updates
+- Various bug fixes
+
+#====================================
+
+Version 2.26.0 released 2022/10/14
+
+- Added a new feature of BoomerAMG (L1-Jacobi and Chebyshev smoothers) and
+  Krylov subspace solvers with multiple right-hand-side vectors;
+- Optimized parallel sparse matrix/multi-component vector multiplication
+  on CPUs and GPUs.
+- Added SYCL support for the IJ interface and various AMG operators;
+- Added a runtime switch feature between CPU and GPU;
+- Added CMAKE support for CUDA;
+- Optimized the performance of AMG interpolation truncation routines with CUDA/HIP;
+- Optimized the performance of hypre's SpGEMM kernels on NVIDIA/AMD GPUs;
+- Various bug fixes
+
+#====================================
+
+Version 2.25.0 released 2022/06/15
+
+- New features in MGR: multilevel assignment of solver options, block Jacobi for
+  smoothers and inter-grid transfer, CPR, non-Galerkin.
+- New factorized sparse approximate inverse (FSAI) solver/preconditioner.  Can
+  also be used as a smoother in BoomerAMG.
+- Added various optimizations for Nvidia and AMD GPUs by removing synchronizations,
+  reducing memory transfers, and adding faster custom kernels.
+- Ported parallel matrix matrix multiplicaton to SYCL.
+- Infrastructure changes to unify GPU implementations across CUDA/HIP/SYCL.
+- Added SStruct I/O routines.
+- Various bug fixes.
+
+#====================================
+
+Version 2.24.0 released 2022/02/11
+
+- Added SYCL support for the structured interface and solvers
+- Added SYCL support for AMG solve phase.
+- Enabled GPU setup for the MGR solver.
+- Enabled new interpolation options for MGR (L1-Jacobi, MM-ext, MM-ext+i,
+  MM-ext+e) for both CPU and GPU.
+- Added GPU examples for Fortran users ('ex5f.f' and 'ex12f.f').
+- Added source file indentation with Artistic Style (astyle).
+- Various bug fixes.
+
+#====================================
+
+Version 2.23.0 released 2021/10/01
+
+- Added GPU support for multipass interpolation.
+- Added new header file variables (HYPRE_DEVELOP_STRING, HYPRE_DEVELOP_NUMBER,
+  HYPRE_DEVELOP_BRANCH) to help users working with the development branch.
+- Added rocsparse triangular solve required for Gauss-Seidel relaxation when
+  using hip and rocsparse on AMD GPUs.
+- Various bug fixes.
+
+#====================================
+
 Version 2.22.1 released 2021/08/20
 
 - Ported Neumann version of AIR to the GPU.
diff --git a/external/hypre/INSTALL.md b/external/hypre/INSTALL.md
index 260a2ecc..bb13edb6 100644
--- a/external/hypre/INSTALL.md
+++ b/external/hypre/INSTALL.md
@@ -1,5 +1,5 @@
 <!--
-Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 
 SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -37,7 +37,7 @@ by running `make help`.
 
 When building HYPRE without the install target, the libraries and include files
 are copied into the directories, `src/hypre/lib` and `src/hypre/include`.
- 
+
 When building with the install target, the libraries and files are copied into
 the directories specified by the configure option, --prefix=/usr/apps.  If none
 were specified, the default directories are used, hypre/lib and hypre/include.
@@ -52,23 +52,23 @@ configuration options on different platforms.  It does not actually build the
 code, but generates input for other "native" build systems such as Make (Unix
 platforms) or Visual Studio (Windows).  Here are the basic steps:
 
-1. First, ensure that CMake version 2.8.8 or later is installed on the system.
+1. First, ensure that CMake version 3.13.0 or later is installed on the system.
 
 2. To build the library, run CMake on the top-level HYPRE source directory to
    generate files appropriate for the native build system.  To prevent writing
    over the Makefiles in HYPRE's configure/make system above, only out-of-source
-   builds are currently allowed with CMake.  Directories `src/cmbuild` and
-   `src/test/cmbuild` are provided in the release for convenience, but
-   alternative build directories may be created by the user:
+   builds are currently allowed with CMake. The directory `build` is provided in
+   the release for convenience, but alternative build directories may be created
+   by the user:
 
-   - Unix: From the `src/cmbuild` directory, type `cmake ..`.
+   - Unix: From the `build` directory, type `cmake ../src`.
 
-   - Windows: Set the source and build directories to `src` and `src/cmbuild`,
-     then click on 'Configure' following by 'Generate'.
+   - Windows: Set the source and build directories to `src` and `build`, then
+     click on 'Configure' following by 'Generate'.
 
 3. To complete the build of the library, compile with the native build system:
 
-   - Unix: From the `src/cmbuild` directory, type `make install`.
+   - Unix: From the `build` directory, type `make install`.
 
    - Windows Visual Studio: Open the 'hypre' VS solution file generated by CMake
      and build the 'ALL_BUILD' target, then the 'INSTALL' target.
@@ -78,7 +78,7 @@ Optional Features:
 Various configuration options can be set from within CMake.  Change these as
 appropriate, then reconfigure/generate:
 
-- Unix: From the `src/cmbuild` directory, type `ccmake ..`, change options, then
+- Unix: From the `build` directory, type `ccmake ../src`, change options, then
   type `c` then `q`.
 
 - Windows VS: Change options, then click on 'Configure' then 'Generate'.
diff --git a/external/hypre/LICENSE-MIT b/external/hypre/LICENSE-MIT
index b90b1902..d24d1c20 100644
--- a/external/hypre/LICENSE-MIT
+++ b/external/hypre/LICENSE-MIT
@@ -1,4 +1,4 @@
-Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 
 Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/external/hypre/README.md b/external/hypre/README.md
index 54bab09e..74461530 100644
--- a/external/hypre/README.md
+++ b/external/hypre/README.md
@@ -1,5 +1,5 @@
 <!--
-Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 
 SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -14,13 +14,14 @@ large, sparse linear systems of equations on massively parallel computers.
 
 For documentation, see our [readthedocs page](https://hypre.readthedocs.io/en/latest/).
 
+For information on code development, build requirements, publications, and more,
+see our [Wiki page](https://github.com/hypre-space/hypre/wiki).
+
 To install HYPRE, please see either the documentation or the file [INSTALL.md](./INSTALL.md).
 
 An overview of the HYPRE release history can be found in the file [CHANGELOG](./CHANGELOG).
 
-We appreciate feedback from users.  Please submit comments, suggestions, and
-report issues on our [issues page](https://github.com/hypre-space/hypre/issues).
-See also [SUPPORT.md](./SUPPORT.md).
+Support information can be found in the file [SUPPORT.md](./SUPPORT.md).
 
 
 License
@@ -37,4 +38,3 @@ See [LICENSE-MIT](./LICENSE-MIT), [LICENSE-APACHE](./LICENSE-APACHE),
 SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 LLNL-CODE-778117
-
diff --git a/external/hypre/SUPPORT.md b/external/hypre/SUPPORT.md
index 3d52f59d..05a0d541 100644
--- a/external/hypre/SUPPORT.md
+++ b/external/hypre/SUPPORT.md
@@ -1,5 +1,5 @@
 <!--
-Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 
 SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -8,5 +8,6 @@ SPDX-License-Identifier: (Apache-2.0 OR MIT)
 HYPRE Support Information
 =========================
 
-For any questions or issues concerning hypre, submit an issue at
-https://github.com/hypre-space/hypre/issues.
+We appreciate feedback from users. Please submit comments, suggestions, and
+report issues on our [issues page](https://github.com/hypre-space/hypre/issues).
+
diff --git a/external/hypre/src/CMakeLists.txt b/external/hypre/src/CMakeLists.txt
index 96a9c1fe..015a8355 100644
--- a/external/hypre/src/CMakeLists.txt
+++ b/external/hypre/src/CMakeLists.txt
@@ -1,349 +1,448 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-cmake_minimum_required(VERSION 3.13...3.16)
+cmake_minimum_required(VERSION 3.21)
+message(STATUS "CMake Executable: ${CMAKE_COMMAND}")
+message(STATUS "CMake Version: ${CMAKE_VERSION}")
 
-if (${CMAKE_VERSION} VERSION_LESS 3.16)
-  cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
-else ()
-  cmake_policy(VERSION 3.16)
-endif ()
+# Include hypre's CMake utilities
+include("${CMAKE_CURRENT_SOURCE_DIR}/config/cmake/HYPRE_CMakeUtilities.cmake")
+
+# Set cmake policies
+if(POLICY CMP0146)
+  cmake_policy(SET CMP0146 NEW) # Ensure CUDA toolkit is found
+endif()
+if(POLICY CMP0104)
+  cmake_policy(SET CMP0104 NEW) # CUDA_ARCHITECTURES is allowed to be set in cache
+endif()
 
 # The version number.
-set(HYPRE_VERSION 2.22.1)
-set(HYPRE_NUMBER  22201)
-set(HYPRE_DATE    2021/08/20)
+set(HYPRE_VERSION 2.33.0)
+set(HYPRE_NUMBER  23300)
+set(HYPRE_DATE    2025/04/03)
 set(HYPRE_TIME    00:00:00)
 set(HYPRE_BUGS    https://github.com/hypre-space/hypre/issues)
 set(HYPRE_SRCDIR  "${PROJECT_SOURCE_DIR}")
 
+# Display the hypre version
+setup_git_version_info("${CMAKE_CURRENT_SOURCE_DIR}/../.git")
+if (GIT_VERSION_FOUND)
+  message(STATUS "Hypre Version: ${HYPRE_DEVELOP_STRING} (${HYPRE_BRANCH_NAME})")
+else()
+  message(STATUS "NOTE: Could not find .git directory")
+  message(STATUS "Hypre Version: ${HYPRE_VERSION}")
+endif()
+
+# Set the project name
 set(PROJECT_NAME HYPRE)
 project(${PROJECT_NAME}
   VERSION ${HYPRE_VERSION}
   LANGUAGES C)
 
+# Create the HYPRE library object
+add_library(${PROJECT_NAME})
+
+# We use C99 by default, but users are free to specify any newer standard version
+if (NOT CMAKE_C_STANDARD)
+  set(CMAKE_C_STANDARD 99 CACHE STRING "Standard to use for the C compiler")
+  set(CMAKE_C_STANDARD_REQUIRED ON)
+endif ()
+
+# Raise an error if the source and binary directories are the same
 if (${HYPRE_SOURCE_DIR} STREQUAL ${HYPRE_BINARY_DIR})
   message(FATAL_ERROR "In-place build not allowed! Please use a separate build directory. See the Users Manual or INSTALL file for details.")
 endif ()
 
-# Set cmake module path
-set(CMAKE_MODULE_PATH "${HYPRE_SOURCE_DIR}/config/cmake" "${CMAKE_MODULE_PATH}")
-include(HYPRE_CMakeUtilities)
-
 # Set default installation directory, but provide a means for users to change
-set(HYPRE_INSTALL_PREFIX "${PROJECT_SOURCE_DIR}/hypre" CACHE PATH
-    "Installation directory for HYPRE")
-if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-  set(CMAKE_INSTALL_PREFIX "${HYPRE_INSTALL_PREFIX}" CACHE INTERNAL "" FORCE)
+if (NOT CMAKE_INSTALL_PREFIX OR CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+  set(CMAKE_INSTALL_PREFIX "${HYPRE_SOURCE_DIR}/hypre" CACHE PATH "Installation directory for HYPRE" FORCE)
 endif ()
 
-# Set default compile optimization flag
-set(HYPRE_BUILD_TYPE "Release" CACHE STRING
-    "Optimization flags: set to Debug, Release, RelWithDebInfo, or MinSizeRel")
+# Ensure RPATH/RUNPATH is set properly during the build
+set(CMAKE_SKIP_BUILD_RPATH FALSE CACHE BOOL "Include rpath in the binaries being built")
+set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE CACHE BOOL "Use different paths for build and install")
+set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE CACHE BOOL "Use link-time paths for install rpath")
+set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib" CACHE STRING "Where binaries look for shared libraries")
 
-if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-  set(CMAKE_BUILD_TYPE "${HYPRE_BUILD_TYPE}" CACHE INTERNAL "" FORCE)
-  # Set the possible values of build type for cmake-gui
-  set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS
-    "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
-endif ()
+# Build static library by default
+option(BUILD_SHARED_LIBS "Build shared libraries" OFF)
+
+# Set cmake module path
+set(CMAKE_MODULE_PATH "${HYPRE_SOURCE_DIR}/config/cmake" "${CMAKE_MODULE_PATH}")
 
-# Configuration options
-option(HYPRE_ENABLE_SHARED           "Build a shared library" OFF)
-option(HYPRE_ENABLE_BIGINT           "Use long long int for HYPRE_Int" OFF)
-option(HYPRE_ENABLE_MIXEDINT         "Use long long int for HYPRE_BigInt, int for HYPRE_INT" OFF)
-option(HYPRE_ENABLE_SINGLE           "Use float for HYPRE_Real" OFF)
-option(HYPRE_ENABLE_LONG_DOUBLE      "Use long double for HYPRE_Real" OFF)
-option(HYPRE_ENABLE_COMPLEX          "Use complex values" OFF)
-option(HYPRE_ENABLE_HYPRE_BLAS       "Use internal BLAS library" ON)
-option(HYPRE_ENABLE_HYPRE_LAPACK     "Use internal LAPACK library" ON)
-option(HYPRE_ENABLE_PERSISTENT_COMM  "Use persistent communication" OFF)
-option(HYPRE_ENABLE_FEI              "Use FEI" OFF) # TODO: Add this cmake feature
-option(HYPRE_WITH_MPI                "Compile with MPI" ON)
-option(HYPRE_WITH_OPENMP             "Use OpenMP" OFF)
-option(HYPRE_ENABLE_HOPSCOTCH        "Use hopscotch hashing with OpenMP" OFF)
-option(HYPRE_WITH_DSUPERLU           "Use TPL SuperLU_Dist" OFF)
-option(HYPRE_WITH_CALIPER            "Use Caliper" OFF)  # TODO: Finish this cmake feature
-option(HYPRE_PRINT_ERRORS            "Print HYPRE errors" OFF)
-option(HYPRE_TIMING                  "Use HYPRE timing routines" OFF)
-option(HYPRE_BUILD_EXAMPLES          "Build examples" OFF)
-option(HYPRE_BUILD_TESTS             "Build tests" OFF)
-option(HYPRE_USING_HOST_MEMORY       "Use host memory" ON)
-set(HYPRE_WITH_EXTRA_CFLAGS       "" CACHE STRING "Define extra C compile flags")
-set(HYPRE_WITH_EXTRA_CXXFLAGS     "" CACHE STRING "Define extra CXX compile flags")
+# Set CMAKE_BUILD_TYPE to default to Release if not already specified
+if (NOT CMAKE_BUILD_TYPE)
+  set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Build type options: Debug, Release, RelWithDebInfo, or MinSizeRel." FORCE)
+endif()
+
+# Set the possible values of build type for ccmake/cmake-gui
+set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
+
+# Set debug flags based on compiler
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+  if(CMAKE_C_COMPILER_ID MATCHES "Intel")
+    target_compile_options(${PROJECT_NAME} PRIVATE
+      $<$<COMPILE_LANGUAGE:C>:-O0 -Wall -Wremarks>
+      $<$<COMPILE_LANGUAGE:CXX>:
+        -O0 -Wall -Wremarks
+        -Wno-unused-lambda-capture
+        -Wno-unused-local-typedef
+        -Wno-unused-variable
+        -Wno-unused-parameter
+        -Wno-unused-function
+      >)
+
+  elseif(CMAKE_C_COMPILER_ID MATCHES "GNU|Clang")
+    target_compile_options(${PROJECT_NAME} PRIVATE
+      $<$<COMPILE_LANGUAGE:C>:-O0 -Wall>
+      $<$<COMPILE_LANGUAGE:CXX>:-O0 -Wall>
+      $<$<COMPILE_LANGUAGE:CUDA>:-O0 -Xcompiler=-Wall>
+      $<$<COMPILE_LANGUAGE:HIP>:-O0 -Wall>)
+
+  elseif(CMAKE_C_COMPILER_ID MATCHES "MSVC")
+    target_compile_options(${PROJECT_NAME} PRIVATE
+      $<$<COMPILE_LANGUAGE:C>:/Od /Zi /W4>
+      $<$<COMPILE_LANGUAGE:CXX>:/Od /Zi /W4>)
+
+  elseif(CMAKE_C_COMPILER_ID MATCHES "PGI|NVHPC")
+    target_compile_options(${PROJECT_NAME} PRIVATE
+      $<$<COMPILE_LANGUAGE:C>:-O0 -Minform=warn>
+      $<$<COMPILE_LANGUAGE:CXX>:-O0 -Minform=warn>
+      $<$<COMPILE_LANGUAGE:CUDA>:-O0 -g -Minform=warn>)
+
+  elseif(CMAKE_C_COMPILER_ID MATCHES "XL|XLClang")
+    target_compile_options(${PROJECT_NAME} PRIVATE
+      $<$<COMPILE_LANGUAGE:C>:-O0-qinfo=all>
+      $<$<COMPILE_LANGUAGE:CXX>:-O0 -qinfo=all>)
+
+  else()
+    message(WARNING "Unknown C compiler '${CMAKE_C_COMPILER_ID}', using default debug flags")
+    target_compile_options(${PROJECT_NAME} PRIVATE
+      $<$<COMPILE_LANGUAGE:C>:-O0>
+      $<$<COMPILE_LANGUAGE:CXX>:-O0>)
+  endif()
+endif()
+
+# Print the configuration
+message(STATUS "Build type: ${CMAKE_BUILD_TYPE}")
+message(STATUS "Shared library: ${BUILD_SHARED_LIBS}")
+message(STATUS "Installation directory: ${CMAKE_INSTALL_PREFIX}")
+message(STATUS "Using C standard: ${CMAKE_C_STANDARD}")
+
+# Base boolean configuration options
+set_hypre_option(BASE HYPRE_ENABLE_BIGINT               "Use long long int for HYPRE_Int and HYPRE_BigInt" OFF)
+set_hypre_option(BASE HYPRE_ENABLE_MIXEDINT             "Use long long int for HYPRE_BigInt, int for HYPRE_Int" OFF)
+set_hypre_option(BASE HYPRE_ENABLE_SINGLE               "Use float for HYPRE_Real" OFF)
+set_hypre_option(BASE HYPRE_ENABLE_LONG_DOUBLE          "Use long double for HYPRE_Real" OFF)
+set_hypre_option(BASE HYPRE_ENABLE_COMPLEX              "Use complex values" OFF)
+set_hypre_option(BASE HYPRE_ENABLE_HYPRE_BLAS           "Use internal BLAS library" ON)
+set_hypre_option(BASE HYPRE_ENABLE_HYPRE_LAPACK         "Use internal LAPACK library" ON)
+set_hypre_option(BASE HYPRE_ENABLE_PERSISTENT_COMM      "Use persistent communication" OFF)
+set_hypre_option(BASE HYPRE_ENABLE_FEI                  "Use FEI" OFF) # TODO: Add this cmake feature
+set_hypre_option(BASE HYPRE_ENABLE_HOPSCOTCH            "Use hopscotch hashing with OpenMP" OFF)
+set_hypre_option(BASE HYPRE_ENABLE_OPENMP               "Use OpenMP" OFF)
+set_hypre_option(BASE HYPRE_ENABLE_MPI                  "Use MPI" ON)
+set_hypre_option(BASE HYPRE_ENABLE_LTO                  "Use Link-Time Optimization (LTO)" OFF)
+set_hypre_option(BASE HYPRE_ENABLE_PRINT_ERRORS         "Print HYPRE errors" OFF)
+set_hypre_option(SKIP HYPRE_ENABLE_TIMING               "Use HYPRE timing routines" OFF)
+set_hypre_option(SKIP HYPRE_ENABLE_STRICT_CHECKING      "Use strict error checking (Sequential only)" OFF)
+set_hypre_option(BASE HYPRE_ENABLE_TEST_USING_HOST      "Execute tests on host (CPU)" OFF)
+set_hypre_option(BASE HYPRE_ENABLE_HOST_MEMORY          "Use host memory" ON)
+set_hypre_option(BASE HYPRE_BUILD_EXAMPLES              "Build examples" OFF)
+set_hypre_option(BASE HYPRE_BUILD_TESTS                 "Build tests" OFF)
+
+# GPU options
+set_hypre_option(GPU  HYPRE_ENABLE_CUDA                 "Use CUDA. Require cuda-10.0 or higher" OFF)
+set_hypre_option(GPU  HYPRE_ENABLE_HIP                  "Use HIP" OFF)
+set_hypre_option(GPU  HYPRE_ENABLE_SYCL                 "Use SYCL" OFF)
+set_hypre_option(GPU  HYPRE_ENABLE_GPU_AWARE_MPI        "Use device aware MPI support" OFF)
+set_hypre_option(GPU  HYPRE_ENABLE_UNIFIED_MEMORY       "Use unified memory for allocating the memory" OFF)
+set_hypre_option(GPU  HYPRE_ENABLE_DEVICE_MALLOC_ASYNC  "Use device async malloc" OFF)
+set_hypre_option(GPU  HYPRE_ENABLE_THRUST_ASYNC         "Use Thrust par_nosync policy" OFF)
+set_hypre_option(GPU  HYPRE_ENABLE_GPU_PROFILING        "Use NVTX on CUDA or rocTX on HIP" OFF)
 # CUDA options
-option(HYPRE_WITH_CUDA               "Use CUDA. Require cuda-8.0 or higher" OFF)
-option(HYPRE_ENABLE_UNIFIED_MEMORY   "Use unified memory for allocating the memory" OFF)
-option(HYPRE_ENABLE_CUDA_STREAMS     "Use CUDA streams" ON)
-option(HYPRE_ENABLE_CUSPARSE         "Use cuSPARSE" ON)
-option(HYPRE_ENABLE_DEVICE_POOL      "Use device memory pool" OFF)
-option(HYPRE_ENABLE_CUBLAS           "Use cuBLAS" OFF)
-option(HYPRE_ENABLE_CURAND           "Use cuRAND" ON)
-option(HYPRE_ENABLE_GPU_PROFILING    "Use NVTX on CUDA" OFF)
-set(HYPRE_CUDA_SM "70" CACHE STRING  "Target CUDA architecture.")
-
-option(TPL_DSUPERLU_LIBRARIES        "List of absolute paths to SuperLU_Dist link libraries [].")
-option(TPL_DSUPERLU_INCLUDE_DIRS     "List of absolute paths to SuperLU_Dist include directories [].")
-option(TPL_BLAS_LIBRARIES            "Optional list of absolute paths to BLAS libraries, otherwise use FindBLAS to locate [].")
-option(TPL_LAPACK_LIBRARIES          "Optional list of absolute paths to LAPACK libraries, otherwise use FindLAPACK to locate [].")
+set_hypre_option(CUDA HYPRE_ENABLE_CUDA_STREAMS         "Use CUDA streams" ON)
+set_hypre_option(CUDA HYPRE_ENABLE_CUSPARSE             "Use cuSPARSE" ON)
+set_hypre_option(CUDA HYPRE_ENABLE_CUSOLVER             "Use cuSOLVER" ON)
+set_hypre_option(CUDA HYPRE_ENABLE_CUBLAS               "Use cuBLAS" ON)
+set_hypre_option(CUDA HYPRE_ENABLE_CURAND               "Use cuRAND" ON)
+set_hypre_option(CUDA HYPRE_ENABLE_DEVICE_POOL          "Use CUB's device memory pool" OFF)
+# HIP options
+set_hypre_option(HIP  HYPRE_ENABLE_ROCBLAS              "Use rocBLAS" ON)
+set_hypre_option(HIP  HYPRE_ENABLE_ROCSPARSE            "Use rocSPARSE" ON)
+set_hypre_option(HIP  HYPRE_ENABLE_ROCRAND              "Use rocRAND" ON)
+set_hypre_option(HIP  HYPRE_ENABLE_ROCSOLVER            "Use rocSOLVER" ON)
+# oneAPI options
+set_hypre_option(SYCL HYPRE_ENABLE_ONEMKLSPARSE         "Use oneMKL sparse" ON)
+set_hypre_option(SYCL HYPRE_ENABLE_ONEMKLBLAS           "Use oneMKL blas" ON)
+set_hypre_option(SYCL HYPRE_ENABLE_ONEMKLRAND           "Use oneMKL rand" ON)
+# TPL options
+set_hypre_option(TPL  HYPRE_ENABLE_UMPIRE               "Use Umpire Allocator for device and unified memory" OFF)
+set_hypre_option(TPL  HYPRE_ENABLE_UMPIRE_HOST          "Use Umpire Allocator for host memory" OFF)
+set_hypre_option(TPL  HYPRE_ENABLE_UMPIRE_PINNED        "Use Umpire Allocator for pinned memory" OFF)
+set_hypre_option(TPL  HYPRE_ENABLE_UMPIRE_DEVICE        "Use Umpire Allocator for device memory" OFF)
+set_hypre_option(TPL  HYPRE_ENABLE_UMPIRE_UM            "Use Umpire Allocator for unified memory" OFF)
+set_hypre_option(TPL  HYPRE_ENABLE_SUPERLU              "Use TPL SuperLU" OFF)
+set_hypre_option(TPL  HYPRE_ENABLE_DSUPERLU             "Use TPL SuperLU_Dist" OFF)
+set_hypre_option(TPL  HYPRE_ENABLE_MAGMA                "Use TPL MAGMA" OFF)
+set_hypre_option(TPL  HYPRE_ENABLE_CALIPER              "Use TPL Caliper" OFF)
+set_hypre_option(SKIP TPL_UMPIRE_LIBRARIES              "Absolute paths to Umpire link libraries [Optional]." "")
+set_hypre_option(SKIP TPL_UMPIRE_INCLUDE_DIRS           "Absolute paths to Umpire include directories [Optional]." "")
+set_hypre_option(SKIP TPL_SUPERLU_LIBRARIES             "Absolute paths to SuperLU link libraries [Optional]." "")
+set_hypre_option(SKIP TPL_SUPERLU_INCLUDE_DIRS          "Absolute paths to SuperLU include directories [Optional]." "")
+set_hypre_option(SKIP TPL_DSUPERLU_LIBRARIES            "Absolute paths to SuperLU_Dist link libraries [Optional]." "")
+set_hypre_option(SKIP TPL_DSUPERLU_INCLUDE_DIRS         "Absolute paths to SuperLU_Dist include directories [Optional]." "")
+set_hypre_option(SKIP TPL_MAGMA_LIBRARIES               "Absolute paths to MAGMA link libraries [Optional]." "")
+set_hypre_option(SKIP TPL_MAGMA_INCLUDE_DIRS            "Absolute paths to MAGMA include directories [Optional]." "")
+set_hypre_option(SKIP TPL_CALIPER_LIBRARIES             "Absolute paths to Caliper link libraries [Optional]." "")
+set_hypre_option(SKIP TPL_CALIPER_INCLUDE_DIRS          "Absolute paths to Caliper include directories [Optional]." "")
+set_hypre_option(SKIP TPL_BLAS_LIBRARIES                "Absolute paths to BLAS link libraries [Optional]." "")
+set_hypre_option(SKIP TPL_LAPACK_LIBRARIES              "Absolute paths to LAPACK link libraries [Optional]." "")
+set_hypre_option(SKIP TPL_FEI_INCLUDE_DIRS              "Absolute paths to FEI include directories [Optional]." "")
+
+# Extra flags
+set(HYPRE_WITH_EXTRA_CFLAGS "" CACHE STRING             "Define extra C compile flags")
+set(HYPRE_WITH_EXTRA_CXXFLAGS "" CACHE STRING           "Define extra CXX compile flags")
+set(HYPRE_SYCL_TARGET "" CACHE STRING                   "Target SYCL architecture, e.g. 'spir64_gen'.")
+set(HYPRE_SYCL_TARGET_BACKEND "" CACHE STRING           "Additional SYCL backend options, e.g. '-device 12.1.0,12.4.0'.")
+
+# Set possible values for the Fortran name mangling schemes
+set(HYPRE_ENABLE_FMANGLE "UNSPECIFIED" CACHE STRING         "Set the Fortran name mangling scheme")
+set(HYPRE_ENABLE_FMANGLE_BLAS "UNSPECIFIED" CACHE STRING   "Set the Fortran BLAS name mangling scheme")
+set(HYPRE_ENABLE_FMANGLE_LAPACK "UNSPECIFIED" CACHE STRING "Set the Fortran LAPACK name mangling scheme")
+foreach(VARNAME IN ITEMS FMANGLE FMANGLE_BLAS FMANGLE_LAPACK)
+  set_property(CACHE HYPRE_ENABLE_${VARNAME} PROPERTY STRINGS UNSPECIFIED NONE ONE_UNDERSCORE TWO_UNDERSCORES CAPS PRE_POST_UNDERSCORE 0 1 2 3 4 5)
+endforeach()
+
+# Set internal hypre variable for each Fortran mangling scheme
+process_fmangling_scheme(FMANGLE "name")
+process_fmangling_scheme(FMANGLE_BLAS "BLAS")
+process_fmangling_scheme(FMANGLE_LAPACK "LAPACK")
 
 # Set config name values
-if (HYPRE_ENABLE_SHARED)
-  set(HYPRE_SHARED ON CACHE BOOL "" FORCE)
-endif ()
-
-if (HYPRE_ENABLE_BIGINT)
-  set(HYPRE_BIGINT ON CACHE BOOL "" FORCE)
-endif ()
-
-if (HYPRE_ENABLE_MIXEDINT)
-  set(HYPRE_MIXEDINT ON CACHE BOOL "" FORCE)
-endif ()
+set_internal_hypre_option("" BIGINT)
+set_internal_hypre_option("" MIXEDINT)
+set_internal_hypre_option("" SINGLE)
+set_internal_hypre_option("" LONG_DOUBLE)
+set_internal_hypre_option("" COMPLEX)
+set_internal_hypre_option("" TEST_USING_HOST)
+set_internal_hypre_option(USING HYPRE_BLAS)
+set_internal_hypre_option(USING HYPRE_LAPACK)
+set_internal_hypre_option(USING HOPSCOTCH)
+set_internal_hypre_option(USING GPU_AWARE_MPI)
+set_internal_hypre_option(USING GPU_STREAMS)
+set_internal_hypre_option(USING DEVICE_POOL)
+set_internal_hypre_option(USING OPENMP)
+set_internal_hypre_option(USING CUDA)
+set_internal_hypre_option(USING HIP)
+set_internal_hypre_option(USING SYCL)
+set_internal_hypre_option(USING MAGMA)
+set_internal_hypre_option(USING CALIPER)
+
+# Check for conflicting options
+ensure_options_differ(HYPRE_ENABLE_SINGLE HYPRE_ENABLE_LONG_DOUBLE)
+ensure_options_differ(HYPRE_ENABLE_CUDA   HYPRE_ENABLE_HIP)
+ensure_options_differ(HYPRE_ENABLE_CUDA   HYPRE_ENABLE_SYCL)
+ensure_options_differ(HYPRE_ENABLE_CUDA   HYPRE_ENABLE_BIGINT)
+ensure_options_differ(HYPRE_ENABLE_CUDA   HYPRE_ENABLE_LONG_DOUBLE)
+ensure_options_differ(HYPRE_ENABLE_SYCL   HYPRE_ENABLE_HIP )
+ensure_options_differ(HYPRE_ENABLE_SYCL   HYPRE_ENABLE_BIGINT)
+ensure_options_differ(HYPRE_ENABLE_SYCL   HYPRE_ENABLE_LONG_DOUBLE)
+ensure_options_differ(HYPRE_ENABLE_HIP    HYPRE_ENABLE_BIGINT)
+ensure_options_differ(HYPRE_ENABLE_HIP    HYPRE_ENABLE_LONG_DOUBLE)
+ensure_options_differ(HYPRE_ENABLE_LTO    HYPRE_ENABLE_SYCL) # TODO: allow LTO with SYCL
+
+# Enable CTest support if tests are being built
+if (HYPRE_BUILD_TESTS)
+  include(CTest)
+  enable_testing()
+endif()
 
-if (HYPRE_ENABLE_SINGLE)
-  set(HYPRE_SINGLE ON CACHE BOOL "" FORCE)
+if (BUILD_SHARED_LIBS)
+  set(HYPRE_SHARED ON CACHE INTERNAL "")
 endif ()
 
-if (HYPRE_ENABLE_LONG_DOUBLE)
-  set(HYPRE_LONG_DOUBLE ON CACHE BOOL "" FORCE)
-endif ()
+if (HYPRE_ENABLE_MPI)
+  set(HYPRE_HAVE_MPI ON CACHE INTERNAL "")
+  set(HYPRE_SEQUENTIAL OFF CACHE INTERNAL "")
+else ()
+  set(HYPRE_SEQUENTIAL ON CACHE INTERNAL "")
+endif ()
+
+# Add strict checking option
+if (HYPRE_ENABLE_STRICT_CHECKING)
+  set(HYPRE_ENABLE_MPI OFF CACHE INTERNAL "")
+  set(HYPRE_HAVE_MPI OFF CACHE INTERNAL "")
+  set(HYPRE_SEQUENTIAL ON CACHE INTERNAL "")
+  set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "" FORCE)
+  if(CMAKE_C_COMPILER_ID MATCHES "GNU|Clang")
+    target_compile_options(${PROJECT_NAME} PRIVATE
+      $<$<COMPILE_LANGUAGE:C>:-O0 -Wall -Wextra -pedantic -Wfloat-conversion -fsingle-precision-constant -Werror>
+      $<$<COMPILE_LANGUAGE:CXX>:-Wall -Wshadow -fno-implicit-templates -Woverloaded-virtual -ansi -pedantic>)
+
+  elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
+    target_compile_options(${PROJECT_NAME} PRIVATE
+      $<$<COMPILE_LANGUAGE:C>:-O0 -Wall -Werror>
+      $<$<COMPILE_LANGUAGE:CXX>:-O0 -Wall -Werror>)
+
+  elseif(CMAKE_C_COMPILER_ID MATCHES "XL|XLClang")
+    target_compile_options(${PROJECT_NAME} PRIVATE
+      $<$<COMPILE_LANGUAGE:C>:-O0 -qinfo=all>
+      $<$<COMPILE_LANGUAGE:CXX>:-O0 -qinfo=all>)
+
+  else()
+    message(WARNING "Unknown C compiler '${CMAKE_C_COMPILER_ID}', using default debug flags")
+    target_compile_options(${PROJECT_NAME} PRIVATE
+      $<$<COMPILE_LANGUAGE:C>:-O0>
+      $<$<COMPILE_LANGUAGE:CXX>:-O0>)
+  endif()
 
-if (HYPRE_ENABLE_COMPLEX)
-  set(HYPRE_COMPLEX ON CACHE BOOL "" FORCE)
-endif ()
+  message(STATUS "Enabled strict error checking")
+endif()
 
-if (CMAKE_BUILD_TYPE STREQUAL "Debug")
-  set(HYPRE_DEBUG ON CACHE BOOL "" FORCE)
+if (HYPRE_ENABLE_SUPERLU)
+  set(HYPRE_USING_SUPERLU ON CACHE INTERNAL "")
+  add_compile_definitions(HAVE_SUPERLU)
 endif ()
 
-if (HYPRE_ENABLE_HYPRE_BLAS)
-  set(HYPRE_USING_HYPRE_BLAS ON CACHE BOOL "" FORCE)
+if (HYPRE_ENABLE_DSUPERLU)
+  set(HYPRE_USING_DSUPERLU ON CACHE INTERNAL "")
+  set(HYPRE_USING_HYPRE_BLAS OFF CACHE INTERNAL "")
+  set(HYPRE_USING_HYPRE_LAPACK OFF CACHE INTERNAL "")
 endif ()
 
-if (HYPRE_ENABLE_HYPRE_LAPACK)
-  set(HYPRE_USING_HYPRE_LAPACK ON CACHE BOOL "" FORCE)
+if (HYPRE_ENABLE_FEI)
+  set(HYPRE_USING_FEI ON CACHE INTERNAL "")
+  message(WARNING "CMake support for FEI is not complete!")
 endif ()
 
-if (HYPRE_ENABLE_PERSISTENT_COMM)
-  set(HYPRE_USING_PERSISTENT_COMM ON CACHE BOOL "" FORCE)
+# FEI doesn't currently compile with shared
+if (HYPRE_SHARED OR HYPRE_BIGINT OR HYPRE_SINGLE OR HYPRE_LONG_DOUBLE)
+  set(HYPRE_USING_FEI OFF CACHE INTERNAL "")
+  set(HYPRE_ENABLE_FEI OFF CACHE BOOL "Add FEI support" FORCE)
 endif ()
 
-if (HYPRE_WITH_MPI)
-  set(HYPRE_HAVE_MPI ON CACHE BOOL "" FORCE)
-  set(HYPRE_SEQUENTIAL OFF CACHE BOOL "" FORCE)
-else ()
-  set(HYPRE_SEQUENTIAL ON CACHE BOOL "" FORCE)
+if (HYPRE_SEQUENTIAL)
+  set(HYPRE_BUILD_EXAMPLES OFF CACHE BOOL "Build examples" FORCE)
 endif ()
 
-if (HYPRE_WITH_OPENMP)
-  set(HYPRE_USING_OPENMP ON CACHE BOOL "" FORCE)
+if (HYPRE_ENABLE_UMPIRE)
+  set(HYPRE_USING_UMPIRE ON CACHE INTERNAL "")
+  set(HYPRE_USING_UMPIRE_DEVICE ON CACHE INTERNAL "")
+  set(HYPRE_USING_UMPIRE_UM ON CACHE INTERNAL "")
 endif ()
 
-if (HYPRE_ENABLE_HOPSCOTCH)
-  set(HYPRE_HOPSCOTCH ON CACHE BOOL "" FORCE)
+if (HYPRE_ENABLE_UMPIRE_HOST)
+  set(HYPRE_ENABLE_UMPIRE ON CACHE INTERNAL "")
+  set(HYPRE_USING_UMPIRE ON CACHE INTERNAL "")
+  set(HYPRE_USING_UMPIRE_HOST ON CACHE INTERNAL "")
 endif ()
 
-if (HYPRE_WITH_DSUPERLU)
-  set(HYPRE_USING_DSUPERLU ON CACHE BOOL "" FORCE)
-  set(HYPRE_USING_HYPRE_BLAS OFF CACHE BOOL "" FORCE)
-  set(HYPRE_USING_HYPRE_LAPACK OFF CACHE BOOL "" FORCE)
+if (HYPRE_ENABLE_UMPIRE_DEVICE)
+  set(HYPRE_ENABLE_UMPIRE ON CACHE INTERNAL "")
+  set(HYPRE_USING_UMPIRE ON CACHE INTERNAL "")
+  set(HYPRE_USING_UMPIRE_DEVICE ON CACHE INTERNAL "")
 endif ()
 
-if (HYPRE_ENABLE_FEI)
-  set(HYPRE_USING_FEI ON CACHE BOOL "" FORCE)
-  message(WARNING "CMake support for FEI is not complete!")
+if (HYPRE_ENABLE_UMPIRE_UM)
+  set(HYPRE_ENABLE_UMPIRE ON CACHE INTERNAL "")
+  set(HYPRE_USING_UMPIRE ON CACHE INTERNAL "")
+  set(HYPRE_USING_UMPIRE_UM ON CACHE INTERNAL "")
 endif ()
 
-if (HYPRE_WITH_CALIPER)
-  set(HYPRE_USING_CALIPER ON CACHE BOOL "" FORCE)
+if (HYPRE_ENABLE_UMPIRE_PINNED)
+  set(HYPRE_ENABLE_UMPIRE ON CACHE INTERNAL "")
+  set(HYPRE_USING_UMPIRE ON CACHE INTERNAL "")
+  set(HYPRE_USING_UMPIRE_PINNED ON CACHE INTERNAL "")
 endif ()
 
-if (HYPRE_SHARED OR HYPRE_BIGINT OR HYPRE_SINGLE OR HYPRE_LONG_DOUBLE)
-  # FEI doesn't currently compile with shared
-  set(HYPRE_USING_FEI OFF CACHE BOOL "" FORCE)
+# Set MPI compile flags
+if (HYPRE_ENABLE_MPI)
+  configure_mpi_target()
 endif ()
 
-if (HYPRE_SEQUENTIAL)
-  set(HYPRE_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
+# Set OpenMP compile flags
+if (HYPRE_ENABLE_OPENMP)
+  find_package(OpenMP REQUIRED)
+  target_link_libraries(${PROJECT_NAME} PUBLIC OpenMP::OpenMP_C)
 endif ()
 
-# CUDA
-if (HYPRE_WITH_CUDA)
-  enable_language(CXX)
-  message(STATUS "Enabled support for CXX.")
-
-  # Enforce C++11
-  if (NOT CMAKE_CXX_STANDARD OR CMAKE_CXX_STANDARD LESS 11)
-    set(CMAKE_CXX_STANDARD 11)
-  endif ()
-  set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
-  message(STATUS "Using CXX standard: c++${CMAKE_CXX_STANDARD}")
-
-  # Use ${CMAKE_CXX_COMPILER} as the cuda host compiler.
-  if (NOT CMAKE_CUDA_HOST_COMPILER)
-    set(CMAKE_CUDA_HOST_COMPILER ${CMAKE_CXX_COMPILER})
-  endif ()
-
-  # Add any extra CXX compiler flags HYPRE_WITH_EXTRA_CXXFLAGS
-  if (NOT HYPRE_WITH_EXTRA_CXXFLAGS STREQUAL "")
-    string(REPLACE " " ";" HYPRE_WITH_EXTRA_CXXFLAGS "${HYPRE_WITH_EXTRA_CXXFLAGS}")
-    add_compile_options("$<$<COMPILE_LANGUAGE:CXX>:${HYPRE_WITH_EXTRA_CXXFLAGS}>")
-  endif ()
-
-  # Check if CUDA is available, then enable it
-  include(CheckLanguage)
-  check_language(CUDA)
-  if (CMAKE_CUDA_COMPILER)
-
-    enable_language(CUDA)
-    message(STATUS "Enabled support for CUDA.")
-
-    if (NOT CMAKE_CUDA_STANDARD OR CMAKE_CUDA_STANDARD EQUAL 98)
-      set(CMAKE_CUDA_STANDARD 11)
-    endif ()
-
-    set(CMAKE_CUDA_STANDARD_REQUIRED ON CACHE BOOL "" FORCE)
-
-    set(HYPRE_USING_CUDA ON CACHE BOOL "" FORCE)
-    set(HYPRE_USING_GPU ON CACHE BOOL "" FORCE)
-
-    if (HYPRE_ENABLE_UNIFIED_MEMORY)
-      set(HYPRE_USING_UNIFIED_MEMORY ON CACHE BOOL "" FORCE)
-    else ()
-      set(HYPRE_USING_DEVICE_MEMORY ON CACHE BOOL "" FORCE)
-    endif ()
-
-    # Check if examples are enabled, but not unified memory
-    if (HYPRE_BUILD_EXAMPLES AND NOT HYPRE_ENABLE_UNIFIED_MEMORY)
-      message(WARNING "Running the examples on GPUs requires Unified Memory!
-        Examples will not be built!")
-      set(HYPRE_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
-    endif ()
-
-    if (CMAKE_VERSION VERSION_LESS 3.18.0)
-      add_compile_options("$<$<COMPILE_LANGUAGE:CUDA>:-arch=sm_${HYPRE_CUDA_SM}>")
-    else ()
-      set(CMAKE_CUDA_ARCHITECTURES "${HYPRE_CUDA_SM}")
-    endif ()
-    message(STATUS "Using CUDA architecture: ${HYPRE_CUDA_SM}")
-
-    add_compile_options("$<$<COMPILE_LANGUAGE:CUDA>:-expt-extended-lambda>")
-
-    set(HYPRE_USING_HOST_MEMORY OFF CACHE BOOL "" FORCE)
-
-    if (HYPRE_ENABLE_CUDA_STREAMS)
-      set(HYPRE_USING_CUDA_STREAMS ON CACHE BOOL "" FORCE)
-    endif (HYPRE_ENABLE_CUDA_STREAMS)
+# Add LTO-related flags to hypre if requested
+if (HYPRE_ENABLE_LTO)
+  # Additional checks before enabling LTO
+  include(CheckIPOSupported)
+  check_ipo_supported(RESULT LTO_SUPPORTED OUTPUT LTO_ERROR)
 
-    if (HYPRE_ENABLE_DEVICE_POOL)
-      set(HYPRE_USING_DEVICE_POOL ON CACHE BOOL "" FORCE)
-    endif (HYPRE_ENABLE_DEVICE_POOL)
-
-    # TODO Eventually should require cmake>=3.17
-    # and use cmake's FindCUDAToolkit. Now collect
-    # CUDA optional libraries.
-    include(HYPRE_SetupCUDAToolkit)
+  if (LTO_SUPPORTED)
+    message(STATUS "Link-Time Optimization (LTO) enabled for Hypre")
   else ()
-    message(WARNING "No CUDA support!")
-    set(HYPRE_USING_HOST_MEMORY ON CACHE BOOL "" FORCE)
-  endif (CMAKE_CUDA_COMPILER)
-endif (HYPRE_WITH_CUDA)
+    message(WARNING "Link-Time Optimization (LTO) requested but not supported: ${LTO_ERROR}. Turning it off...")
+    set(HYPRE_ENABLE_LTO OFF)
+  endif ()
 
-# Add any extra C compiler flags HYPRE_WITH_EXTRA_CFLAGS
-if (NOT HYPRE_WITH_EXTRA_CFLAGS STREQUAL "")
-  string(REPLACE " " ";" HYPRE_WITH_EXTRA_CFLAGS "${HYPRE_WITH_EXTRA_CFLAGS}")
-  add_compile_options("$<$<COMPILE_LANGUAGE:C>:${HYPRE_WITH_EXTRA_CFLAGS}>")
+  set_target_properties(${PROJECT_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION TRUE)
+else ()
+  set_target_properties(${PROJECT_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION FALSE)
+  message(STATUS "Link-Time Optimization (LTO) disabled")
 endif ()
 
-# Set library build type (must appear before add_library calls)
-if (HYPRE_SHARED)
-  set(BUILD_SHARED_LIBS ON CACHE INTERNAL "" FORCE)
+# Setup GPU build options: CUDA, HIP, SYCL are mutually exclusive
+if (HYPRE_ENABLE_CUDA OR HYPRE_ENABLE_HIP OR HYPRE_ENABLE_SYCL)
+  include(HYPRE_SetupGPUToolkit)
 else ()
-  set(BUILD_SHARED_LIBS OFF CACHE INTERNAL "" FORCE)
+  message(STATUS "GPU support not enabled")
+  set(HYPRE_USING_HOST_MEMORY ON CACHE INTERNAL "")
 endif ()
 
-# Create the HYPRE library object
-add_library(${PROJECT_NAME})
+# Add any extra C compiler flags HYPRE_WITH_EXTRA_CFLAGS
+if (NOT HYPRE_WITH_EXTRA_CFLAGS STREQUAL "")
+  string(REPLACE " " ";" HYPRE_WITH_EXTRA_CFLAGS_LIST ${HYPRE_WITH_EXTRA_CFLAGS})
+  target_compile_options(${PROJECT_NAME} PRIVATE
+    $<$<COMPILE_LANGUAGE:C>:${HYPRE_WITH_EXTRA_CFLAGS_LIST}>)
+endif ()
 
-# Headers and sources
-set(HYPRE_HEADERS "")
+# Set output directory for the library
+set_target_properties(${PROJECT_NAME} PROPERTIES
+  VERSION "${HYPRE_VERSION}"
+  SOVERSION "${HYPRE_VERSION_MAJOR}${HYPRE_VERSION_MINOR}"
+  ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
+  LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
+  RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
+)
 
-# Headers and sources: .
+# Set headers
 set(HYPRE_MAIN_HEADERS
   ${CMAKE_CURRENT_BINARY_DIR}/HYPRE_config.h
   HYPREf.h
   HYPRE.h
-  )
-
-set(HYPRE_HEADERS ${HYPRE_HEADERS} ${HYPRE_MAIN_HEADERS})
-
-# Headers and sources: blas
-if (HYPRE_USING_HYPRE_BLAS)
-  add_subdirectory(blas)
-else ()
-  # Use TPL_BLAS_LIBRARIES if set.
-  if (TPL_BLAS_LIBRARIES)
-    message(STATUS "Using TPL_BLAS_LIBRARIES='${TPL_BLAS_LIBRARIES}'")
-    target_link_libraries(${PROJECT_NAME} PUBLIC "${TPL_BLAS_LIBRARIES}")
-  else ()
-    # Find system blas
-    find_package(BLAS REQUIRED)
-    target_link_libraries(${PROJECT_NAME} PUBLIC "${BLAS_LIBRARIES}")
-  endif ()
-  target_compile_definitions(${PROJECT_NAME} PUBLIC "USE_VENDOR_BLAS")
-endif ()
-
-# Headers and sources: lapack
-if (HYPRE_USING_HYPRE_LAPACK)
-  add_subdirectory(lapack)
-else ()
-  # Use TPL_LAPACK_LIBRARIES if set.
-  if (TPL_LAPACK_LIBRARIES)
-    message(STATUS "Using TPL_LAPACK_LIBRARIES='${TPL_LAPACK_LIBRARIES}'")
-    target_link_libraries(${PROJECT_NAME} PUBLIC "${TPL_LAPACK_LIBRARIES}")
-  else ()
-    # Find system lapack
-    find_package(LAPACK REQUIRED)
-    target_link_libraries(${PROJECT_NAME} PUBLIC "${LAPACK_LIBRARIES}")
-  endif ()
-endif ()
-
-# Find DSUPERLU, if requested
-if (HYPRE_USING_DSUPERLU)
-  if (NOT TPL_DSUPERLU_LIBRARIES)
-    message(FATAL_ERROR "TPL_DSUPERLU_LIBRARIES option should be set for SuperLU_Dist support.")
-  endif ()
+)
+list(APPEND HYPRE_HEADERS ${HYPRE_MAIN_HEADERS})
+
+# TPL variables
+set(HYPRE_DEPENDENCY_DIRS "" CACHE INTERNAL "List of absolute paths to third-party libraries (TPLs) directories")
+set(HYPRE_NEEDS_CXX OFF CACHE INTERNAL "Flag to indicate if C++ is needed for TPLs")
+
+# Setup third-party libraries (TPLs)
+setup_fei()
+setup_tpl_or_internal(blas)
+setup_tpl_or_internal(lapack)
+setup_tpl(superlu)
+setup_tpl(dsuperlu)
+setup_tpl(magma)
+setup_tpl(caliper)
+setup_tpl(umpire)
+
+# Some TPLs need C++ to be enabled (GPU already enables C++ by default)
+if(HYPRE_NEEDS_CXX AND NOT HYPRE_USING_GPU)
+  enable_language(CXX)
+endif()
 
-  if (NOT TPL_DSUPERLU_INCLUDE_DIRS)
-    message(FATAL_ERROR "TPL_DSUPERLU_INCLUDE_DIRS option be set for SuperLU_Dist support.")
-  endif ()
-
-  foreach (dir ${TPL_DSUPERLU_INCLUDE_DIRS})
-    if (NOT EXISTS ${dir})
-      message(FATAL_ERROR "SuperLU_Dist include directory not found: ${dir}")
-    endif ()
-    set(CMAKE_C_FLAGS "-I${dir} ${CMAKE_C_FLAGS}")
-  endforeach ()
-  message(STATUS "Enabled support for using DSUPERLU.")
-  set(DSUPERLU_FOUND TRUE)
-  target_link_libraries(${PROJECT_NAME} PUBLIC ${TPL_DSUPERLU_LIBRARIES} stdc++)
-  target_include_directories(${PROJECT_NAME} PUBLIC ${TPL_DSUPERLU_INCLUDE_DIRS})
-endif (HYPRE_USING_DSUPERLU)
-
-if (DSUPERLU_FOUND)
-  set(HYPRE_USING_DSUPERLU TRUE)
-endif ()
-
-if (HYPRE_USING_CUDA)
-  target_link_libraries(${PROJECT_NAME} PUBLIC "${EXPORT_INTERFACE_CUDA_LIBS}")
-  if (HYPRE_HAVE_MPI)
-    target_include_directories(${PROJECT_NAME} PUBLIC
-      ${MPI_CXX_INCLUDE_DIRS})
-  endif ()
-endif ()
+# Print the directories used to hint the user about the active TPLs
+if (HYPRE_DEPENDENCY_DIRS)
+  message(STATUS "Dependency directories: ${HYPRE_DEPENDENCY_DIRS}")
+endif()
 
 # Configure a header file to pass CMake settings to the source code
 configure_file(
@@ -352,39 +451,32 @@ configure_file(
   )
 
 # Headers and sources: remaining subdirectories
-set(HYPRE_DIRS utilities multivector krylov seq_mv parcsr_mv parcsr_block_mv distributed_matrix IJ_mv matrix_matrix distributed_ls parcsr_ls struct_mv struct_ls sstruct_mv sstruct_ls)
+set(HYPRE_DIRS utilities multivector krylov seq_mv seq_block_mv parcsr_mv parcsr_block_mv distributed_matrix IJ_mv matrix_matrix distributed_ls parcsr_ls struct_mv struct_ls sstruct_mv sstruct_ls)
 foreach (DIR IN LISTS HYPRE_DIRS)
   add_subdirectory(${DIR})
   target_include_directories(${PROJECT_NAME} PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/${DIR}>)
 endforeach ()
 
-# BINARY must be first in order to get the correct HYPRE_config.h file
-target_include_directories(${PROJECT_NAME} PUBLIC
-  $<BUILD_INTERFACE:${HYPRE_BINARY_DIR}>
-  $<BUILD_INTERFACE:${HYPRE_SOURCE_DIR}>
-  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/blas>
-  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/lapack>
-  $<INSTALL_INTERFACE:include>
-  )
-
-if (HYPRE_USING_CUDA)
-  set_source_files_properties(${HYPRE_CUDA_SOURCES} PROPERTIES LANGUAGE CUDA)
-endif ()
-
-# Set MPI compile flags
-if (NOT HYPRE_SEQUENTIAL)
-  find_program(MPIEXEC_EXECUTABLE NAMES mpiexec mpirun)
-  find_package(MPI REQUIRED)
-  target_link_libraries(${PROJECT_NAME} PUBLIC MPI::MPI_C)
-endif (NOT HYPRE_SEQUENTIAL)
-
-# Set OpenMP compile flags
-if (HYPRE_USING_OPENMP)
-  find_package(OpenMP REQUIRED)
-  target_link_libraries(${PROJECT_NAME} PUBLIC OpenMP::OpenMP_C)
-endif (HYPRE_USING_OPENMP)
+# Set the language for GPU sources (has to be done after the subdirectories are added)
+if (HYPRE_ENABLE_CUDA)
+  set_source_files_properties(${HYPRE_GPU_SOURCES} PROPERTIES LANGUAGE CUDA)
+elseif (HYPRE_ENABLE_HIP)
+  set_source_files_properties(${HYPRE_GPU_SOURCES} PROPERTIES LANGUAGE HIP)
+elseif (HYPRE_ENABLE_SYCL)
+  set_source_files_properties(${HYPRE_GPU_SOURCES} PROPERTIES LANGUAGE CXX)
+endif()
 
+# Include directories
+target_include_directories(${PROJECT_NAME} PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/blas>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/lapack>
+    $<INSTALL_INTERFACE:include>
+)
+
+# Set file properties for MSVC
 if (MSVC)
   target_compile_definitions(${PROJECT_NAME} PRIVATE _CRT_SECURE_NO_WARNINGS)
   if (MSVC_VERSION LESS 1928) # Visual Studio 2019 version 16.8 claims full C11 support
@@ -412,6 +504,7 @@ if (MSVC)
   endif()
 endif ()
 
+# Build FEI, if requested (to be phased out)
 if (HYPRE_USING_FEI)
   add_subdirectory(FEI_mv)
 endif ()
@@ -426,42 +519,63 @@ if (HYPRE_BUILD_TESTS)
   add_subdirectory(test)
 endif ()
 
+# Add targets for tags, distclean, and uninstall
+add_hypre_target_tags()
+add_hypre_target_distclean()
+add_hypre_target_uninstall()
+
+# Installation
 include(GNUInstallDirs)
 install(TARGETS ${PROJECT_NAME}
   EXPORT HYPRETargets
-  LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-  ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-  RUNTIME DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-  INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+  INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+)
 install(FILES ${HYPRE_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
 
+# Export the package
 include(CMakePackageConfigHelpers)
 write_basic_package_version_file(
-  HYPREConfigVersion.cmake
+  "${CMAKE_CURRENT_BINARY_DIR}/HYPREConfigVersion.cmake"
   VERSION ${PACKAGE_VERSION}
   COMPATIBILITY SameMajorVersion
-  )
-
+)
+configure_package_config_file(
+  "${CMAKE_CURRENT_SOURCE_DIR}/config/HYPREConfig.cmake.in"
+  "${CMAKE_CURRENT_BINARY_DIR}/HYPREConfig.cmake"
+  INSTALL_DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/HYPREConfig.cmake"
+)
+install(FILES
+  "${CMAKE_CURRENT_BINARY_DIR}/HYPREConfig.cmake"
+  "${CMAKE_CURRENT_BINARY_DIR}/HYPREConfigVersion.cmake"
+  DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/HYPRE"
+)
+# Install the CMake export file
 install(EXPORT HYPRETargets
   FILE HYPRETargets.cmake
   NAMESPACE HYPRE::
   DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/HYPRE"
-  )
-
-configure_package_config_file(
-  config/HYPREConfig.cmake.in HYPREConfig.cmake
-  INSTALL_DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/HYPREConfig.cmake"
-  )
-install(
-  FILES
-      "${CMAKE_CURRENT_BINARY_DIR}/HYPREConfig.cmake"
-      "${CMAKE_CURRENT_BINARY_DIR}/HYPREConfigVersion.cmake"
-  DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/HYPRE"
-  )
+)
 
+# Export from build tree
 export(EXPORT HYPRETargets
   FILE "${CMAKE_CURRENT_BINARY_DIR}/HYPRETargets.cmake"
   NAMESPACE HYPRE::
-  )
+)
 
+# Declare an alias so that consumers can depend on HYPRE::HYPRE target
+# also when using HYPRE via add_directory or FetchContent
+add_library(HYPRE::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
+
+# Ensure the C standard is set on the target
+set_target_properties(${PROJECT_NAME} PROPERTIES
+  C_STANDARD ${CMAKE_C_STANDARD}
+  C_STANDARD_REQUIRED ON)
+
+# Export the package
 export(PACKAGE ${PROJECT_NAME})
+
+# Print status of the build options
+print_option_status(${BASE_OPTIONS} ${GPU_OPTIONS} ${TPL_OPTIONS})
diff --git a/external/hypre/src/FEI_mv/CMakeLists.txt b/external/hypre/src/FEI_mv/CMakeLists.txt
index 6512b224..5ddacc98 100644
--- a/external/hypre/src/FEI_mv/CMakeLists.txt
+++ b/external/hypre/src/FEI_mv/CMakeLists.txt
@@ -1,11 +1,8 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-
-project(HYPRE_FEI C CXX)
-
 include_directories(fei-hypre)
 
 # option(HYPRE_USING_SUPERLU "Use internal SuperLU routines" ON)
@@ -29,6 +26,3 @@ include_directories(fei-hypre)
 # endif()
 
 add_subdirectory(fei-hypre)
-set(FEI_LIBS ${FEI_LIBS} $<TARGET_OBJECTS:HYPRE_fei>)
-
-set(FEI_LIBS ${FEI_LIBS} PARENT_SCOPE)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/CHANGELOG b/external/hypre/src/FEI_mv/fei-hypre/CHANGELOG
index 8d54f9fe..33d8bf51 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/CHANGELOG
+++ b/external/hypre/src/FEI_mv/fei-hypre/CHANGELOG
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/CMakeLists.txt b/external/hypre/src/FEI_mv/fei-hypre/CMakeLists.txt
index 512027aa..76fdc9d4 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/CMakeLists.txt
+++ b/external/hypre/src/FEI_mv/fei-hypre/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -62,6 +62,8 @@ set(HYPRE_fei_SRCS
   HYPRE_fei_vector.cxx 
 )
 
-add_library(HYPRE_fei OBJECT ${HYPRE_fei_SRCS})
-
 install (FILES ${HYPRE_fei_HEADERS} DESTINATION include)
+
+target_sources(${PROJECT_NAME}
+  PRIVATE ${HYPRE_fei_SRCS}
+)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/FEI_HYPRE_Impl.cxx b/external/hypre/src/FEI_mv/fei-hypre/FEI_HYPRE_Impl.cxx
index 0984e0e4..7e4a1bbd 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/FEI_HYPRE_Impl.cxx
+++ b/external/hypre/src/FEI_mv/fei-hypre/FEI_HYPRE_Impl.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/FEI_HYPRE_Impl.h b/external/hypre/src/FEI_mv/fei-hypre/FEI_HYPRE_Impl.h
index 1a56de76..87b7bade 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/FEI_HYPRE_Impl.h
+++ b/external/hypre/src/FEI_mv/fei-hypre/FEI_HYPRE_Impl.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/FEI_HYPRE_include.h b/external/hypre/src/FEI_mv/fei-hypre/FEI_HYPRE_include.h
index c2206be2..71a7f808 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/FEI_HYPRE_include.h
+++ b/external/hypre/src/FEI_mv/fei-hypre/FEI_HYPRE_include.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_Builder.h b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_Builder.h
index ae285ce3..0b2abd40 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_Builder.h
+++ b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_Builder.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_FEI.doc b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_FEI.doc
index 25e77d72..5f30d9b1 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_FEI.doc
+++ b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_FEI.doc
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -396,7 +396,7 @@ int HYPRE_FEVectorSetSol( HYPRE_FEVector vector, void *object );
 /*@{*/
 
 /**
-  * Here the various options for solvers and perconditioners
+  * Here the various options for solvers and preconditioners
   * are defined.
   * 
   *\begin{description}
diff --git a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_FEI.h b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_FEI.h
index bb7f83e7..86f520e8 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_FEI.h
+++ b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_FEI.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_FEI_includes.h b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_FEI_includes.h
index 25b55952..644cbc04 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_FEI_includes.h
+++ b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_FEI_includes.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSC_aux.cxx b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSC_aux.cxx
index 1e5a3f8e..02cb71cd 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSC_aux.cxx
+++ b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSC_aux.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_Dsuperlu.c b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_Dsuperlu.c
index 0cd5a7ba..cfc97bad 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_Dsuperlu.c
+++ b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_Dsuperlu.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -26,6 +26,7 @@
  *-------------------------------------------------------------------------*/
 
 #ifdef HYPRE_USING_DSUPERLU
+#include "parcsr_ls/dsuperlu.h"
 #include "superlu_ddefs.h"
 
 typedef struct HYPRE_LSI_DSuperLU_Struct
@@ -34,10 +35,10 @@ typedef struct HYPRE_LSI_DSuperLU_Struct
    HYPRE_ParCSRMatrix Amat_;
    superlu_dist_options_t  options_;
    SuperMatrix        sluAmat_;
-   ScalePermstruct_t  ScalePermstruct_;
+   dScalePermstruct_t ScalePermstruct_;
    SuperLUStat_t      stat_;
-   LUstruct_t         LUstruct_;
-   SOLVEstruct_t      SOLVEstruct_;
+   dLUstruct_t        LUstruct_;
+   dSOLVEstruct_t     SOLVEstruct_;
    int                globalNRows_;
    int                localNRows_;
    int                startRow_;
@@ -56,18 +57,9 @@ int HYPRE_LSI_DSuperLUGenMatrix(HYPRE_Solver solver);
 
 int HYPRE_LSI_DSuperLUCreate( MPI_Comm comm, HYPRE_Solver *solver )
 {
-   HYPRE_LSI_DSuperLU *sluPtr;
-   sluPtr = hypre_TAlloc(HYPRE_LSI_DSuperLU, 1, HYPRE_MEMORY_HOST);
-   hypre_assert ( sluPtr != NULL );
-   sluPtr->comm_        = comm;
-   sluPtr->Amat_        = NULL;
-   sluPtr->localNRows_  = 0;
-   sluPtr->globalNRows_ = 0;
-   sluPtr->startRow_    = 0;
-   sluPtr->outputLevel_ = 0;
-   sluPtr->setupFlag_   = 0;
-   sluPtr->berr_ = hypre_TAlloc(double, 1, HYPRE_MEMORY_HOST);
-   *solver = (HYPRE_Solver) sluPtr;
+   hypre_DSLUData *dslu_data = NULL;
+   dslu_data = hypre_CTAlloc(hypre_DSLUData, 1, HYPRE_MEMORY_HOST);
+   *solver = (HYPRE_Solver) dslu_data;
    return 0;
 }
 
@@ -77,23 +69,21 @@ int HYPRE_LSI_DSuperLUCreate( MPI_Comm comm, HYPRE_Solver *solver )
 
 int HYPRE_LSI_DSuperLUDestroy( HYPRE_Solver solver )
 {
-   HYPRE_LSI_DSuperLU *sluPtr;
-   sluPtr = (HYPRE_LSI_DSuperLU *) solver;
-   sluPtr->Amat_ = NULL;
-   if (sluPtr->setupFlag_ == 1)
+   hypre_DSLUData *dslu_data = (hypre_DSLUData *) solver;
+
+   PStatFree(&(dslu_data->dslu_data_stat));
+   Destroy_CompRowLoc_Matrix_dist(&(dslu_data->A_dslu));
+   dScalePermstructFree(&(dslu_data->dslu_ScalePermstruct));
+   dDestroy_LU(dslu_data->global_num_rows, &(dslu_data->dslu_data_grid), &(dslu_data->dslu_data_LU));
+   dLUstructFree(&(dslu_data->dslu_data_LU));
+   if (dslu_data->dslu_options.SolveInitialized)
    {
-      PStatFree(&(sluPtr->stat_));
-      Destroy_CompRowLoc_Matrix_dist(&(sluPtr->sluAmat_));
-      ScalePermstructFree(&(sluPtr->ScalePermstruct_));
-      Destroy_LU(sluPtr->globalNRows_, &(sluPtr->sluGrid_), &(sluPtr->LUstruct_));
-      LUstructFree(&(sluPtr->LUstruct_));
-      if (sluPtr->options_.SolveInitialized)
-         dSolveFinalize(&(sluPtr->options_), &(sluPtr->SOLVEstruct_));
-      superlu_gridexit(&(sluPtr->sluGrid_));
+      dSolveFinalize(&(dslu_data->dslu_options), &(dslu_data->dslu_solve));
    }
-   hypre_TFree(sluPtr->berr_, HYPRE_MEMORY_HOST);
-   hypre_TFree(sluPtr, HYPRE_MEMORY_HOST);
-   return 0;
+   superlu_gridexit(&(dslu_data->dslu_data_grid));
+   hypre_TFree(dslu_data->berr, HYPRE_MEMORY_HOST);
+   hypre_TFree(dslu_data, HYPRE_MEMORY_HOST);
+   return hypre_error_flag;
 }
 
 /***************************************************************************
@@ -114,94 +104,100 @@ int HYPRE_LSI_DSuperLUSetOutputLevel(HYPRE_Solver solver, int level)
 int HYPRE_LSI_DSuperLUSetup(HYPRE_Solver solver, HYPRE_ParCSRMatrix A_csr,
                             HYPRE_ParVector b, HYPRE_ParVector x )
 {
-   int                nprocs, mypid, nprow, npcol, info, iZero=0;
-   HYPRE_LSI_DSuperLU *sluPtr = (HYPRE_LSI_DSuperLU *) solver;
-   MPI_Comm           mpiComm;
+   /* Par Data Structure variables */
+   HYPRE_BigInt global_num_rows = hypre_ParCSRMatrixGlobalNumRows(A_csr);
+   MPI_Comm comm = hypre_ParCSRMatrixComm(A_csr);
+   hypre_CSRMatrix *A_local;
+   HYPRE_Int num_rows;
+   HYPRE_Int num_procs, my_id;
+   HYPRE_Int pcols = 1, prows = 1;
+   HYPRE_BigInt *big_rowptr = NULL;
+   hypre_DSLUData *dslu_data = (hypre_DSLUData *) solver;
+
+   HYPRE_Int info = 0;
+   HYPRE_Int nrhs = 0;
+
+   hypre_MPI_Comm_size(comm, &num_procs);
+   hypre_MPI_Comm_rank(comm, &my_id);
+
+   /* Merge diag and offd into one matrix (global ids) */
+   A_local = hypre_MergeDiagAndOffd(A_csr);
+
+   num_rows = hypre_CSRMatrixNumRows(A_local);
+   /* Now convert hypre matrix to a SuperMatrix */
+#ifdef HYPRE_MIXEDINT
+   {
+      HYPRE_Int *rowptr = NULL;
+      HYPRE_Int  i;
+      rowptr = hypre_CSRMatrixI(A_local);
+      big_rowptr = hypre_CTAlloc(HYPRE_BigInt, (num_rows + 1), HYPRE_MEMORY_HOST);
+      for (i = 0; i < (num_rows + 1); i++)
+      {
+         big_rowptr[i] = (HYPRE_BigInt)rowptr[i];
+      }
+   }
+#else
+   big_rowptr = hypre_CSRMatrixI(A_local);
+#endif
+   dCreate_CompRowLoc_Matrix_dist(
+      &(dslu_data->A_dslu), global_num_rows, global_num_rows,
+      hypre_CSRMatrixNumNonzeros(A_local),
+      num_rows,
+      hypre_ParCSRMatrixFirstRowIndex(A_csr),
+      hypre_CSRMatrixData(A_local),
+      hypre_CSRMatrixBigJ(A_local), big_rowptr,
+      SLU_NR_loc, SLU_D, SLU_GE);
+
+   /* DOK: SuperLU frees assigned data, so set them to null before
+    * calling hypre_CSRMatrixdestroy on A_local to avoid memory errors.
+   */
+#ifndef HYPRE_MIXEDINT
+   hypre_CSRMatrixI(A_local) = NULL;
+#endif
+   hypre_CSRMatrixData(A_local) = NULL;
+   hypre_CSRMatrixBigJ(A_local) = NULL;
+   hypre_CSRMatrixDestroy(A_local);
+
+   /*Create process grid */
+   while (prows * pcols <= num_procs) { ++prows; }
+   --prows;
+   pcols = num_procs / prows;
+   while (prows * pcols != num_procs)
+   {
+      prows -= 1;
+      pcols = num_procs / prows;
+   }
+   //hypre_printf(" prows %d pcols %d\n", prows, pcols);
 
-   /* ---------------------------------------------------------------- */
-   /* get machine information                                          */
-   /* ---------------------------------------------------------------- */
+   superlu_gridinit(comm, prows, pcols, &(dslu_data->dslu_data_grid));
 
-   mpiComm = sluPtr->comm_;
-   MPI_Comm_size(mpiComm, &nprocs);
-   MPI_Comm_rank(mpiComm, &mypid);
+   set_default_options_dist(&(dslu_data->dslu_options));
 
-   /* ---------------------------------------------------------------- */
-   /* compute grid information                                         */
-   /* ---------------------------------------------------------------- */
+   dslu_data->dslu_options.Fact = DOFACT;
+   dslu_data->dslu_options.PrintStat = NO;
+   /*dslu_data->dslu_options.IterRefine = SLU_DOUBLE;
+   dslu_data->dslu_options.ColPerm = MMD_AT_PLUS_A;
+   dslu_data->dslu_options.DiagPivotThresh = 1.0;
+   dslu_data->dslu_options.ReplaceTinyPivot = NO; */
 
-   nprow = sluPtr->sluGrid_.nprow = 1;
-   npcol = sluPtr->sluGrid_.npcol = nprocs;
-   superlu_gridinit(mpiComm, nprow, npcol, &(sluPtr->sluGrid_));
-   if (mypid != sluPtr->sluGrid_.iam)
-   {
-      printf("DSuperLU ERROR: mismatched mypid and SuperLU iam.\n");
-      exit(1);
-   }
+   dScalePermstructInit(global_num_rows, global_num_rows, &(dslu_data->dslu_ScalePermstruct));
 
-   /* ---------------------------------------------------------------- */
-   /* get whole matrix and compose SuperLU matrix                      */
-   /* ---------------------------------------------------------------- */
+   dLUstructInit(global_num_rows, &(dslu_data->dslu_data_LU));
 
-   sluPtr->Amat_ = A_csr;
-   HYPRE_LSI_DSuperLUGenMatrix(solver);
+   PStatInit(&(dslu_data->dslu_data_stat));
 
-   /* ---------------------------------------------------------------- */
-   /* set solver options                                               */
-   /* ---------------------------------------------------------------- */
+   dslu_data->global_num_rows = global_num_rows;
 
-   set_default_options_dist(&(sluPtr->options_));
-   /* options->Fact              = DOFACT (SamePattern,FACTORED}
-      options->Equil             = YES (NO, ROW, COL, BOTH)
-                                   (YES not robust)
-      options->ParSymbFact       = NO;
-      options->ColPerm           = MMD_AT_PLUS_A (NATURAL, MMD_ATA,
-                                   METIS_AT_PLUS_A, PARMETIS, MY_PERMC}
-                                   (MMD_AT_PLUS_A the fastest, a factor
-                                    of 3+ better than MMD_ATA, which in
-                                    turn is 25% better than NATURAL)
-      options->RowPerm           = LargeDiag (NOROWPERM, MY_PERMR)
-      options->ReplaceTinyPivot  = YES (NO)
-      options->IterRefine        = DOUBLE (NOREFINE, SINGLE, EXTRA)
-                                   (EXTRA not supported, DOUBLE more
-                                    accurate)
-      options->Trans             = NOTRANS (TRANS, CONJ)
-      options->SolveInitialized  = NO;
-      options->RefineInitialized = NO;
-      options->PrintStat         = YES;
-   */
-   sluPtr->options_.Fact = DOFACT;
-   sluPtr->options_.Equil = YES;
-   sluPtr->options_.IterRefine = SLU_DOUBLE;
-   sluPtr->options_.ColPerm = MMD_AT_PLUS_A;
-   sluPtr->options_.DiagPivotThresh = 1.0;
-   sluPtr->options_.ReplaceTinyPivot = NO;
-   if (sluPtr->outputLevel_ < 2) sluPtr->options_.PrintStat = NO;
-   ScalePermstructInit(sluPtr->globalNRows_, sluPtr->globalNRows_,
-                       &(sluPtr->ScalePermstruct_));
-//   LUstructInit(sluPtr->globalNRows_, sluPtr->globalNRows_,
-//                &(sluPtr->LUstruct_));
-   LUstructInit(sluPtr->globalNRows_, &(sluPtr->LUstruct_));
-   sluPtr->berr_[0] = 0.0;
-   PStatInit(&(sluPtr->stat_));
-   pdgssvx(&(sluPtr->options_), &(sluPtr->sluAmat_),
-           &(sluPtr->ScalePermstruct_), NULL, sluPtr->localNRows_, iZero,
-           &(sluPtr->sluGrid_), &(sluPtr->LUstruct_),
-           &(sluPtr->SOLVEstruct_), sluPtr->berr_, &(sluPtr->stat_), &info);
-   sluPtr->options_.Fact = FACTORED;
-   if (sluPtr->outputLevel_ >= 2)
-      PStatPrint(&(sluPtr->options_),&(sluPtr->stat_),&(sluPtr->sluGrid_));
-
-   sluPtr->setupFlag_ = 1;
-
-   if (mypid == 0 && sluPtr->outputLevel_ >=2)
-   {
-      printf("DSuperLUSetup: diagScale = %d\n",
-             sluPtr->ScalePermstruct_.DiagScale);
-      printf("DSuperLUSetup: berr = %e\n", sluPtr->berr_[0]);
-      printf("DSuperLUSetup: info = %d\n", info);
-   }
-   return 0;
+   dslu_data->berr = hypre_CTAlloc(HYPRE_Real, 1, HYPRE_MEMORY_HOST);
+   dslu_data->berr[0] = 0.0;
+
+   pdgssvx(&(dslu_data->dslu_options), &(dslu_data->A_dslu),
+           &(dslu_data->dslu_ScalePermstruct), NULL, num_rows, nrhs,
+           &(dslu_data->dslu_data_grid), &(dslu_data->dslu_data_LU),
+           &(dslu_data->dslu_solve), dslu_data->berr, &(dslu_data->dslu_data_stat), &info);
+
+   dslu_data->dslu_options.Fact = FACTORED;
+   return hypre_error_flag;
 }
 
 /***************************************************************************
@@ -211,40 +207,20 @@ int HYPRE_LSI_DSuperLUSetup(HYPRE_Solver solver, HYPRE_ParCSRMatrix A_csr,
 int HYPRE_LSI_DSuperLUSolve( HYPRE_Solver solver, HYPRE_ParCSRMatrix A,
                              HYPRE_ParVector b, HYPRE_ParVector x )
 {
-   int                localNRows, irow, iOne=1, info, mypid;
-   double             *rhs, *soln;
-   HYPRE_LSI_DSuperLU *sluPtr = (HYPRE_LSI_DSuperLU *) solver;
-
-   /* ---------------------------------------------------------------- */
-   /* get machine, matrix, and vector information                      */
-   /* ---------------------------------------------------------------- */
-
-   MPI_Comm_rank(sluPtr->comm_, &mypid);
-   localNRows  = sluPtr->localNRows_;
-   rhs  = hypre_VectorData(hypre_ParVectorLocalVector((hypre_ParVector *) b));
-   soln = hypre_VectorData(hypre_ParVectorLocalVector((hypre_ParVector *) x));
-   for (irow = 0; irow < localNRows; irow++) soln[irow] = rhs[irow];
+   hypre_DSLUData *dslu_data = (hypre_DSLUData *) solver;
+   HYPRE_Int info = 0;
+   HYPRE_Real *B = hypre_VectorData(hypre_ParVectorLocalVector(x));
+   HYPRE_Int size = hypre_VectorSize(hypre_ParVectorLocalVector(x));
+   HYPRE_Int nrhs = 1;
 
-   /* ---------------------------------------------------------------- */
-   /* solve                                                            */
-   /* ---------------------------------------------------------------- */
+   hypre_ParVectorCopy(b, x);
 
-   pdgssvx(&(sluPtr->options_), &(sluPtr->sluAmat_),
-           &(sluPtr->ScalePermstruct_), soln, localNRows, iOne,
-           &(sluPtr->sluGrid_), &(sluPtr->LUstruct_),
-           &(sluPtr->SOLVEstruct_), sluPtr->berr_, &(sluPtr->stat_), &info);
+   pdgssvx(&(dslu_data->dslu_options), &(dslu_data->A_dslu),
+           &(dslu_data->dslu_ScalePermstruct), B, size, nrhs,
+           &(dslu_data->dslu_data_grid), &(dslu_data->dslu_data_LU),
+           &(dslu_data->dslu_solve), dslu_data->berr, &(dslu_data->dslu_data_stat), &info);
 
-   /* ---------------------------------------------------------------- */
-   /* diagnostics message                                              */
-   /* ---------------------------------------------------------------- */
-
-   if (mypid == 0 && sluPtr->outputLevel_ >=2)
-   {
-      printf("DSuperLUSolve: info = %d\n", info);
-      printf("DSuperLUSolve: diagScale = %d\n",
-             sluPtr->ScalePermstruct_.DiagScale);
-   }
-   return 0;
+   return hypre_error_flag;
 }
 
 /****************************************************************************
diff --git a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_Dsuperlu.h b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_Dsuperlu.h
index 4c0a4be1..39a89d16 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_Dsuperlu.h
+++ b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_Dsuperlu.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_UZAWA.cxx b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_UZAWA.cxx
index b35cc199..e1b81c0e 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_UZAWA.cxx
+++ b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_UZAWA.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_UZAWA.h b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_UZAWA.h
index c6a65c37..51e4d927 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_UZAWA.h
+++ b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_UZAWA.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_Uzawa_c.h b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_Uzawa_c.h
index 01c64d93..89916beb 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_Uzawa_c.h
+++ b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_Uzawa_c.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_blkprec.cxx b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_blkprec.cxx
index 72e9bb86..516cd2f8 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_blkprec.cxx
+++ b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_blkprec.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_blkprec.h b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_blkprec.h
index 8c364f14..5dd49cf7 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_blkprec.h
+++ b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_blkprec.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_block.h b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_block.h
index b1c47990..be8bce33 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_block.h
+++ b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_block.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_ddict.c b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_ddict.c
index ab33690e..41717b19 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_ddict.c
+++ b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_ddict.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_ddict.h b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_ddict.h
index 9260eb1b..d1271211 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_ddict.h
+++ b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_ddict.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_ddilut.c b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_ddilut.c
index bcb80ddd..e951fa7d 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_ddilut.c
+++ b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_ddilut.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_ddilut.h b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_ddilut.h
index 9677d77c..4ff31187 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_ddilut.h
+++ b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_ddilut.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_ml.c b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_ml.c
index f78a07eb..64ecdcb7 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_ml.c
+++ b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_ml.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_mli.cxx b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_mli.cxx
index c7707c16..1ed403a2 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_mli.cxx
+++ b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_mli.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_mli.h b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_mli.h
index d3172549..f7e0e329 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_mli.h
+++ b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_mli.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_mlmaxwell.c b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_mlmaxwell.c
index 37c89374..2d6442a0 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_mlmaxwell.c
+++ b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_mlmaxwell.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_poly.c b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_poly.c
index 167e72c6..31518419 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_poly.c
+++ b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_poly.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_poly.h b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_poly.h
index cbaa01f5..9063a6a5 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_poly.h
+++ b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_poly.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_schur.cxx b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_schur.cxx
index ed562bb6..b602a5db 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_schur.cxx
+++ b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_schur.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_schur.h b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_schur.h
index 78a04882..c96c7a41 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_schur.h
+++ b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_schur.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_schwarz.c b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_schwarz.c
index c54b1387..ddc690a3 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_schwarz.c
+++ b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_schwarz.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_schwarz.h b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_schwarz.h
index 171434d5..dc0fa3a1 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_schwarz.h
+++ b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LSI_schwarz.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LinSysCore.cxx b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LinSysCore.cxx
index 467e94bc..769d6f3d 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LinSysCore.cxx
+++ b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LinSysCore.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -4937,6 +4937,7 @@ int HYPRE_LinSysCore::launchSolver(int& solveStatus, int &iterations)
 
    MPI_Barrier(comm_);
    status = 1;
+   solveStatus = status; //set for early return
    stime  = LSC_Wtime();
    ptime  = stime;
 
diff --git a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LinSysCore.h b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LinSysCore.h
index c8fa799c..b8b8ddce 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LinSysCore.h
+++ b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_LinSysCore.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_MHMatrix.h b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_MHMatrix.h
index 88e586fe..8e971895 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_MHMatrix.h
+++ b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_MHMatrix.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_MLMatrix.h b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_MLMatrix.h
index 53b6bbba..30125fe3 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_MLMatrix.h
+++ b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_MLMatrix.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_MLMaxwell.h b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_MLMaxwell.h
index ea34bff7..e3a1b5f6 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_MLMaxwell.h
+++ b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_MLMaxwell.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_SlideReduction.cxx b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_SlideReduction.cxx
index acf8258a..b66306a4 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_SlideReduction.cxx
+++ b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_SlideReduction.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_SlideReduction.h b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_SlideReduction.h
index 1915b3d1..eef16655 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_SlideReduction.h
+++ b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_SlideReduction.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_fei_matrix.cxx b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_fei_matrix.cxx
index e8a134a6..2ac7bf06 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_fei_matrix.cxx
+++ b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_fei_matrix.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_fei_mesh.cxx b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_fei_mesh.cxx
index a8032f77..8ff1f8b6 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_fei_mesh.cxx
+++ b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_fei_mesh.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_fei_mv.h b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_fei_mv.h
index 68e735f1..19b1cb50 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_fei_mv.h
+++ b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_fei_mv.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_fei_vector.cxx b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_fei_vector.cxx
index 4f49ed9a..a4baf301 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_fei_vector.cxx
+++ b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_fei_vector.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_TFQmr.c b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_TFQmr.c
index cae95956..1a85e86d 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_TFQmr.c
+++ b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_TFQmr.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_TFQmr.h b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_TFQmr.h
index d2e8a6b5..ee64fa3c 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_TFQmr.h
+++ b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_TFQmr.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_bicgs.c b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_bicgs.c
index fec15ee1..f69521d1 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_bicgs.c
+++ b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_bicgs.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_bicgs.h b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_bicgs.h
index 03759f96..bb6a4109 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_bicgs.h
+++ b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_bicgs.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_bicgstabl.c b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_bicgstabl.c
index c0e7da3d..ddbefc41 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_bicgstabl.c
+++ b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_bicgstabl.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_bicgstabl.h b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_bicgstabl.h
index 98db1f58..8bd4cc53 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_bicgstabl.h
+++ b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_bicgstabl.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_fgmres.c b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_fgmres.c
index 4eab4a90..fa5e93e5 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_fgmres.c
+++ b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_fgmres.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_fgmres.h b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_fgmres.h
index 49d86fca..89436951 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_fgmres.h
+++ b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_fgmres.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_lsicg.c b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_lsicg.c
index b45926b9..a4490c68 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_lsicg.c
+++ b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_lsicg.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_lsicg.h b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_lsicg.h
index 62462a70..5d437cb8 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_lsicg.h
+++ b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_lsicg.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_maxwell.c b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_maxwell.c
index eb9298b4..142e3330 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_maxwell.c
+++ b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_maxwell.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_superlu.c b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_superlu.c
index 67500ee7..44f472f2 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_superlu.c
+++ b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_superlu.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_superlu.h b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_superlu.h
index bdecc635..8c9f34b4 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_superlu.h
+++ b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_superlu.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_symqmr.c b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_symqmr.c
index b304bb35..40558c67 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_symqmr.c
+++ b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_symqmr.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_symqmr.h b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_symqmr.h
index 68c023ec..61219c20 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_symqmr.h
+++ b/external/hypre/src/FEI_mv/fei-hypre/HYPRE_parcsr_symqmr.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/LLNL_FEI.doc b/external/hypre/src/FEI_mv/fei-hypre/LLNL_FEI.doc
index 4f3bea60..b4c5f2c8 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/LLNL_FEI.doc
+++ b/external/hypre/src/FEI_mv/fei-hypre/LLNL_FEI.doc
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/LLNL_FEI_Fei.cxx b/external/hypre/src/FEI_mv/fei-hypre/LLNL_FEI_Fei.cxx
index b84f99ba..e4910a14 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/LLNL_FEI_Fei.cxx
+++ b/external/hypre/src/FEI_mv/fei-hypre/LLNL_FEI_Fei.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/LLNL_FEI_Fei.h b/external/hypre/src/FEI_mv/fei-hypre/LLNL_FEI_Fei.h
index 9c46115b..4c3cd589 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/LLNL_FEI_Fei.h
+++ b/external/hypre/src/FEI_mv/fei-hypre/LLNL_FEI_Fei.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/LLNL_FEI_Impl.cxx b/external/hypre/src/FEI_mv/fei-hypre/LLNL_FEI_Impl.cxx
index 76ab462f..4972b5ad 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/LLNL_FEI_Impl.cxx
+++ b/external/hypre/src/FEI_mv/fei-hypre/LLNL_FEI_Impl.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/LLNL_FEI_Impl.h b/external/hypre/src/FEI_mv/fei-hypre/LLNL_FEI_Impl.h
index 45eec063..08bf5c5f 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/LLNL_FEI_Impl.h
+++ b/external/hypre/src/FEI_mv/fei-hypre/LLNL_FEI_Impl.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/LLNL_FEI_LSCore.cxx b/external/hypre/src/FEI_mv/fei-hypre/LLNL_FEI_LSCore.cxx
index aaa6897f..4b3860f7 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/LLNL_FEI_LSCore.cxx
+++ b/external/hypre/src/FEI_mv/fei-hypre/LLNL_FEI_LSCore.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/LLNL_FEI_LSCore.h b/external/hypre/src/FEI_mv/fei-hypre/LLNL_FEI_LSCore.h
index c40598dc..f70617f2 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/LLNL_FEI_LSCore.h
+++ b/external/hypre/src/FEI_mv/fei-hypre/LLNL_FEI_LSCore.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/LLNL_FEI_Matrix.cxx b/external/hypre/src/FEI_mv/fei-hypre/LLNL_FEI_Matrix.cxx
index cfee6875..623fefde 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/LLNL_FEI_Matrix.cxx
+++ b/external/hypre/src/FEI_mv/fei-hypre/LLNL_FEI_Matrix.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/LLNL_FEI_Matrix.h b/external/hypre/src/FEI_mv/fei-hypre/LLNL_FEI_Matrix.h
index f0a1bc26..3cf8bb77 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/LLNL_FEI_Matrix.h
+++ b/external/hypre/src/FEI_mv/fei-hypre/LLNL_FEI_Matrix.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/LLNL_FEI_Solver.cxx b/external/hypre/src/FEI_mv/fei-hypre/LLNL_FEI_Solver.cxx
index caf107ad..f3da8981 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/LLNL_FEI_Solver.cxx
+++ b/external/hypre/src/FEI_mv/fei-hypre/LLNL_FEI_Solver.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/LLNL_FEI_Solver.h b/external/hypre/src/FEI_mv/fei-hypre/LLNL_FEI_Solver.h
index 31ad55c1..23d64f5d 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/LLNL_FEI_Solver.h
+++ b/external/hypre/src/FEI_mv/fei-hypre/LLNL_FEI_Solver.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/SymQMR.c b/external/hypre/src/FEI_mv/fei-hypre/SymQMR.c
index d171f3c8..f8013c9d 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/SymQMR.c
+++ b/external/hypre/src/FEI_mv/fei-hypre/SymQMR.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/TFQmr.c b/external/hypre/src/FEI_mv/fei-hypre/TFQmr.c
index e2ac2ad3..1702f2a0 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/TFQmr.c
+++ b/external/hypre/src/FEI_mv/fei-hypre/TFQmr.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/_hypre_FEI.h b/external/hypre/src/FEI_mv/fei-hypre/_hypre_FEI.h
index 17f13140..9215a424 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/_hypre_FEI.h
+++ b/external/hypre/src/FEI_mv/fei-hypre/_hypre_FEI.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/bicgs.c b/external/hypre/src/FEI_mv/fei-hypre/bicgs.c
index f8e4f6b7..901b9b8d 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/bicgs.c
+++ b/external/hypre/src/FEI_mv/fei-hypre/bicgs.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/bicgstabl.c b/external/hypre/src/FEI_mv/fei-hypre/bicgstabl.c
index d8ff5aae..d2fb8333 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/bicgstabl.c
+++ b/external/hypre/src/FEI_mv/fei-hypre/bicgstabl.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/cfei-hypre.h b/external/hypre/src/FEI_mv/fei-hypre/cfei-hypre.h
index b6da6afd..e859d311 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/cfei-hypre.h
+++ b/external/hypre/src/FEI_mv/fei-hypre/cfei-hypre.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/cfei_hypre.cxx b/external/hypre/src/FEI_mv/fei-hypre/cfei_hypre.cxx
index 24d8ccb0..2d11c914 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/cfei_hypre.cxx
+++ b/external/hypre/src/FEI_mv/fei-hypre/cfei_hypre.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/cfei_hypre.h b/external/hypre/src/FEI_mv/fei-hypre/cfei_hypre.h
index a4d96676..36d3efd3 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/cfei_hypre.h
+++ b/external/hypre/src/FEI_mv/fei-hypre/cfei_hypre.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/driver.C b/external/hypre/src/FEI_mv/fei-hypre/driver.C
index aa94c054..420b0a00 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/driver.C
+++ b/external/hypre/src/FEI_mv/fei-hypre/driver.C
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/driver.cxx b/external/hypre/src/FEI_mv/fei-hypre/driver.cxx
index 1fad7d41..18eec836 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/driver.cxx
+++ b/external/hypre/src/FEI_mv/fei-hypre/driver.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/fei_mv.h b/external/hypre/src/FEI_mv/fei-hypre/fei_mv.h
index 07d54aa8..68de7080 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/fei_mv.h
+++ b/external/hypre/src/FEI_mv/fei-hypre/fei_mv.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/fgmres.c b/external/hypre/src/FEI_mv/fei-hypre/fgmres.c
index 4d4c57bf..4d3f561b 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/fgmres.c
+++ b/external/hypre/src/FEI_mv/fei-hypre/fgmres.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/hypre_cfei.cxx b/external/hypre/src/FEI_mv/fei-hypre/hypre_cfei.cxx
index 4223c6ed..9f940d0c 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/hypre_cfei.cxx
+++ b/external/hypre/src/FEI_mv/fei-hypre/hypre_cfei.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/hypre_cfei.h b/external/hypre/src/FEI_mv/fei-hypre/hypre_cfei.h
index d13cddec..8dd8ec64 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/hypre_cfei.h
+++ b/external/hypre/src/FEI_mv/fei-hypre/hypre_cfei.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/hypre_lsi_amge.c b/external/hypre/src/FEI_mv/fei-hypre/hypre_lsi_amge.c
index 4360b22a..6aa032af 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/hypre_lsi_amge.c
+++ b/external/hypre/src/FEI_mv/fei-hypre/hypre_lsi_amge.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/hypre_lsi_ddamg.c b/external/hypre/src/FEI_mv/fei-hypre/hypre_lsi_ddamg.c
index f0931b9c..c1cd5724 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/hypre_lsi_ddamg.c
+++ b/external/hypre/src/FEI_mv/fei-hypre/hypre_lsi_ddamg.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/hypre_lsi_misc.c b/external/hypre/src/FEI_mv/fei-hypre/hypre_lsi_misc.c
index d4c0e24a..97a502b3 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/hypre_lsi_misc.c
+++ b/external/hypre/src/FEI_mv/fei-hypre/hypre_lsi_misc.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/hypre_schur_reduce.cxx b/external/hypre/src/FEI_mv/fei-hypre/hypre_schur_reduce.cxx
index 967f3d6f..c7bf6767 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/hypre_schur_reduce.cxx
+++ b/external/hypre/src/FEI_mv/fei-hypre/hypre_schur_reduce.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/hypre_slide_reduce.cxx b/external/hypre/src/FEI_mv/fei-hypre/hypre_slide_reduce.cxx
index ed2ad10c..9c00da0c 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/hypre_slide_reduce.cxx
+++ b/external/hypre/src/FEI_mv/fei-hypre/hypre_slide_reduce.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/lsicg.c b/external/hypre/src/FEI_mv/fei-hypre/lsicg.c
index f8a16215..9355ef67 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/lsicg.c
+++ b/external/hypre/src/FEI_mv/fei-hypre/lsicg.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/fei-hypre/ml_maxwell.cxx b/external/hypre/src/FEI_mv/fei-hypre/ml_maxwell.cxx
index 18cd0e34..8d13cb5a 100644
--- a/external/hypre/src/FEI_mv/fei-hypre/ml_maxwell.cxx
+++ b/external/hypre/src/FEI_mv/fei-hypre/ml_maxwell.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/CMakeLists.txt b/external/hypre/src/FEI_mv/femli/CMakeLists.txt
index 928c7e84..599ca1c2 100644
--- a/external/hypre/src/FEI_mv/femli/CMakeLists.txt
+++ b/external/hypre/src/FEI_mv/femli/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/Usage_amgs b/external/hypre/src/FEI_mv/femli/Usage_amgs
index 539a1c90..d1bac135 100644
--- a/external/hypre/src/FEI_mv/femli/Usage_amgs
+++ b/external/hypre/src/FEI_mv/femli/Usage_amgs
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/Usage_solver b/external/hypre/src/FEI_mv/femli/Usage_solver
index 926bc63b..c154886e 100644
--- a/external/hypre/src/FEI_mv/femli/Usage_solver
+++ b/external/hypre/src/FEI_mv/femli/Usage_solver
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/cmli.cxx b/external/hypre/src/FEI_mv/femli/cmli.cxx
index 9e4cfe89..c5cb3f26 100644
--- a/external/hypre/src/FEI_mv/femli/cmli.cxx
+++ b/external/hypre/src/FEI_mv/femli/cmli.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/cmli.h b/external/hypre/src/FEI_mv/femli/cmli.h
index 41811461..0c9acce2 100644
--- a/external/hypre/src/FEI_mv/femli/cmli.h
+++ b/external/hypre/src/FEI_mv/femli/cmli.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/driver_fedata.cxx b/external/hypre/src/FEI_mv/femli/driver_fedata.cxx
index de28ea1a..027e50ab 100644
--- a/external/hypre/src/FEI_mv/femli/driver_fedata.cxx
+++ b/external/hypre/src/FEI_mv/femli/driver_fedata.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/driver_matrix.cxx b/external/hypre/src/FEI_mv/femli/driver_matrix.cxx
index adc5eb8c..043f059a 100644
--- a/external/hypre/src/FEI_mv/femli/driver_matrix.cxx
+++ b/external/hypre/src/FEI_mv/femli/driver_matrix.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/driver_util.c b/external/hypre/src/FEI_mv/femli/driver_util.c
index d4ba5edf..a927d451 100644
--- a/external/hypre/src/FEI_mv/femli/driver_util.c
+++ b/external/hypre/src/FEI_mv/femli/driver_util.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/genTecPlot.c b/external/hypre/src/FEI_mv/femli/genTecPlot.c
index 85c53501..b97a07e3 100644
--- a/external/hypre/src/FEI_mv/femli/genTecPlot.c
+++ b/external/hypre/src/FEI_mv/femli/genTecPlot.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli.cxx b/external/hypre/src/FEI_mv/femli/mli.cxx
index eaed4cc8..bfcc99d1 100644
--- a/external/hypre/src/FEI_mv/femli/mli.cxx
+++ b/external/hypre/src/FEI_mv/femli/mli.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli.h b/external/hypre/src/FEI_mv/femli/mli.h
index 92cb6690..2eab95ea 100644
--- a/external/hypre/src/FEI_mv/femli/mli.h
+++ b/external/hypre/src/FEI_mv/femli/mli.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_amgsa_calib.cxx b/external/hypre/src/FEI_mv/femli/mli_amgsa_calib.cxx
index 7c1737ca..b1831347 100644
--- a/external/hypre/src/FEI_mv/femli/mli_amgsa_calib.cxx
+++ b/external/hypre/src/FEI_mv/femli/mli_amgsa_calib.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_amgsa_coarsen1.cxx b/external/hypre/src/FEI_mv/femli/mli_amgsa_coarsen1.cxx
index 8dd264d3..8d14e430 100644
--- a/external/hypre/src/FEI_mv/femli/mli_amgsa_coarsen1.cxx
+++ b/external/hypre/src/FEI_mv/femli/mli_amgsa_coarsen1.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_amgsa_dd_fedata.cxx b/external/hypre/src/FEI_mv/femli/mli_amgsa_dd_fedata.cxx
index a4167818..7739af95 100644
--- a/external/hypre/src/FEI_mv/femli/mli_amgsa_dd_fedata.cxx
+++ b/external/hypre/src/FEI_mv/femli/mli_amgsa_dd_fedata.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_amgsa_dd_sfei.cxx b/external/hypre/src/FEI_mv/femli/mli_amgsa_dd_sfei.cxx
index 6dbd2f07..bbe9aec3 100644
--- a/external/hypre/src/FEI_mv/femli/mli_amgsa_dd_sfei.cxx
+++ b/external/hypre/src/FEI_mv/femli/mli_amgsa_dd_sfei.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_amgsa_elem.cxx b/external/hypre/src/FEI_mv/femli/mli_amgsa_elem.cxx
index e08b6ede..9e1445e3 100644
--- a/external/hypre/src/FEI_mv/femli/mli_amgsa_elem.cxx
+++ b/external/hypre/src/FEI_mv/femli/mli_amgsa_elem.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_defs.h b/external/hypre/src/FEI_mv/femli/mli_defs.h
index f54792e7..4ae1274a 100644
--- a/external/hypre/src/FEI_mv/femli/mli_defs.h
+++ b/external/hypre/src/FEI_mv/femli/mli_defs.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_febase.cxx b/external/hypre/src/FEI_mv/femli/mli_febase.cxx
index a94d8a82..a940c535 100644
--- a/external/hypre/src/FEI_mv/femli/mli_febase.cxx
+++ b/external/hypre/src/FEI_mv/femli/mli_febase.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_febase.h b/external/hypre/src/FEI_mv/femli/mli_febase.h
index 593ac15c..c81e6230 100644
--- a/external/hypre/src/FEI_mv/femli/mli_febase.h
+++ b/external/hypre/src/FEI_mv/femli/mli_febase.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_fedata.cxx b/external/hypre/src/FEI_mv/femli/mli_fedata.cxx
index fb5f7639..c3098f42 100644
--- a/external/hypre/src/FEI_mv/femli/mli_fedata.cxx
+++ b/external/hypre/src/FEI_mv/femli/mli_fedata.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_fedata.h b/external/hypre/src/FEI_mv/femli/mli_fedata.h
index b2341bb4..6e9f2179 100644
--- a/external/hypre/src/FEI_mv/femli/mli_fedata.h
+++ b/external/hypre/src/FEI_mv/femli/mli_fedata.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_fedata_utils.cxx b/external/hypre/src/FEI_mv/femli/mli_fedata_utils.cxx
index 834e06e3..9ac51361 100644
--- a/external/hypre/src/FEI_mv/femli/mli_fedata_utils.cxx
+++ b/external/hypre/src/FEI_mv/femli/mli_fedata_utils.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_fedata_utils.h b/external/hypre/src/FEI_mv/femli/mli_fedata_utils.h
index e7d51647..a05e9419 100644
--- a/external/hypre/src/FEI_mv/femli/mli_fedata_utils.h
+++ b/external/hypre/src/FEI_mv/femli/mli_fedata_utils.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_festruct.h b/external/hypre/src/FEI_mv/femli/mli_festruct.h
index a6ccee0a..6eda5cfe 100644
--- a/external/hypre/src/FEI_mv/femli/mli_festruct.h
+++ b/external/hypre/src/FEI_mv/femli/mli_festruct.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_mapper.cxx b/external/hypre/src/FEI_mv/femli/mli_mapper.cxx
index 7e3c4846..d285e6a5 100644
--- a/external/hypre/src/FEI_mv/femli/mli_mapper.cxx
+++ b/external/hypre/src/FEI_mv/femli/mli_mapper.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_mapper.h b/external/hypre/src/FEI_mv/femli/mli_mapper.h
index 1e2223f2..80dd3c2e 100644
--- a/external/hypre/src/FEI_mv/femli/mli_mapper.h
+++ b/external/hypre/src/FEI_mv/femli/mli_mapper.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_matrix.cxx b/external/hypre/src/FEI_mv/femli/mli_matrix.cxx
index 8ec10d53..cd606380 100644
--- a/external/hypre/src/FEI_mv/femli/mli_matrix.cxx
+++ b/external/hypre/src/FEI_mv/femli/mli_matrix.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_matrix.h b/external/hypre/src/FEI_mv/femli/mli_matrix.h
index d9d4a91e..c277667b 100644
--- a/external/hypre/src/FEI_mv/femli/mli_matrix.h
+++ b/external/hypre/src/FEI_mv/femli/mli_matrix.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_matrix_misc.h b/external/hypre/src/FEI_mv/femli/mli_matrix_misc.h
index 27f1b2fe..c762f649 100644
--- a/external/hypre/src/FEI_mv/femli/mli_matrix_misc.h
+++ b/external/hypre/src/FEI_mv/femli/mli_matrix_misc.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_matrix_mult.cxx b/external/hypre/src/FEI_mv/femli/mli_matrix_mult.cxx
index 3ab16573..5e707052 100644
--- a/external/hypre/src/FEI_mv/femli/mli_matrix_mult.cxx
+++ b/external/hypre/src/FEI_mv/femli/mli_matrix_mult.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_matrix_utils.cxx b/external/hypre/src/FEI_mv/femli/mli_matrix_utils.cxx
index f2fb139c..af0d8419 100644
--- a/external/hypre/src/FEI_mv/femli/mli_matrix_utils.cxx
+++ b/external/hypre/src/FEI_mv/femli/mli_matrix_utils.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_method.cxx b/external/hypre/src/FEI_mv/femli/mli_method.cxx
index dd442541..d29d4c96 100644
--- a/external/hypre/src/FEI_mv/femli/mli_method.cxx
+++ b/external/hypre/src/FEI_mv/femli/mli_method.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_method.h b/external/hypre/src/FEI_mv/femli/mli_method.h
index 43a8bb50..25bf059e 100644
--- a/external/hypre/src/FEI_mv/femli/mli_method.h
+++ b/external/hypre/src/FEI_mv/femli/mli_method.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_method_amgcr.cxx b/external/hypre/src/FEI_mv/femli/mli_method_amgcr.cxx
index a692df3e..aac3aa16 100644
--- a/external/hypre/src/FEI_mv/femli/mli_method_amgcr.cxx
+++ b/external/hypre/src/FEI_mv/femli/mli_method_amgcr.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_method_amgcr.h b/external/hypre/src/FEI_mv/femli/mli_method_amgcr.h
index d85a1af4..2106c008 100644
--- a/external/hypre/src/FEI_mv/femli/mli_method_amgcr.h
+++ b/external/hypre/src/FEI_mv/femli/mli_method_amgcr.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_method_amgrs.cxx b/external/hypre/src/FEI_mv/femli/mli_method_amgrs.cxx
index 89fdb3de..0029de13 100644
--- a/external/hypre/src/FEI_mv/femli/mli_method_amgrs.cxx
+++ b/external/hypre/src/FEI_mv/femli/mli_method_amgrs.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_method_amgrs.h b/external/hypre/src/FEI_mv/femli/mli_method_amgrs.h
index d594e7f3..e3f68500 100644
--- a/external/hypre/src/FEI_mv/femli/mli_method_amgrs.h
+++ b/external/hypre/src/FEI_mv/femli/mli_method_amgrs.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_method_amgsa.cxx b/external/hypre/src/FEI_mv/femli/mli_method_amgsa.cxx
index b3f00bae..9ad3b87f 100644
--- a/external/hypre/src/FEI_mv/femli/mli_method_amgsa.cxx
+++ b/external/hypre/src/FEI_mv/femli/mli_method_amgsa.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_method_amgsa.h b/external/hypre/src/FEI_mv/femli/mli_method_amgsa.h
index 6d5dae27..5257df3e 100644
--- a/external/hypre/src/FEI_mv/femli/mli_method_amgsa.h
+++ b/external/hypre/src/FEI_mv/femli/mli_method_amgsa.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_olapdd.c b/external/hypre/src/FEI_mv/femli/mli_olapdd.c
index 46da3294..15765ecc 100644
--- a/external/hypre/src/FEI_mv/femli/mli_olapdd.c
+++ b/external/hypre/src/FEI_mv/femli/mli_olapdd.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_oneLevel.cxx b/external/hypre/src/FEI_mv/femli/mli_oneLevel.cxx
index b4c689c2..dd602fba 100644
--- a/external/hypre/src/FEI_mv/femli/mli_oneLevel.cxx
+++ b/external/hypre/src/FEI_mv/femli/mli_oneLevel.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_oneLevel.h b/external/hypre/src/FEI_mv/femli/mli_oneLevel.h
index 80f69b8e..7b0efa00 100644
--- a/external/hypre/src/FEI_mv/femli/mli_oneLevel.h
+++ b/external/hypre/src/FEI_mv/femli/mli_oneLevel.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_sfei.cxx b/external/hypre/src/FEI_mv/femli/mli_sfei.cxx
index 3ef7066f..b48dc8ff 100644
--- a/external/hypre/src/FEI_mv/femli/mli_sfei.cxx
+++ b/external/hypre/src/FEI_mv/femli/mli_sfei.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_sfei.h b/external/hypre/src/FEI_mv/femli/mli_sfei.h
index c89573d6..8d64057e 100644
--- a/external/hypre/src/FEI_mv/femli/mli_sfei.h
+++ b/external/hypre/src/FEI_mv/femli/mli_sfei.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_solver.cxx b/external/hypre/src/FEI_mv/femli/mli_solver.cxx
index db3495bf..57d65dca 100644
--- a/external/hypre/src/FEI_mv/femli/mli_solver.cxx
+++ b/external/hypre/src/FEI_mv/femli/mli_solver.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_solver.h b/external/hypre/src/FEI_mv/femli/mli_solver.h
index 03e7d03c..9c022084 100644
--- a/external/hypre/src/FEI_mv/femli/mli_solver.h
+++ b/external/hypre/src/FEI_mv/femli/mli_solver.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_solver_amg.cxx b/external/hypre/src/FEI_mv/femli/mli_solver_amg.cxx
index 98996d74..36ddd819 100644
--- a/external/hypre/src/FEI_mv/femli/mli_solver_amg.cxx
+++ b/external/hypre/src/FEI_mv/femli/mli_solver_amg.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_solver_amg.h b/external/hypre/src/FEI_mv/femli/mli_solver_amg.h
index c46319ac..9ab8f180 100644
--- a/external/hypre/src/FEI_mv/femli/mli_solver_amg.h
+++ b/external/hypre/src/FEI_mv/femli/mli_solver_amg.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_solver_arpacksuperlu.cxx b/external/hypre/src/FEI_mv/femli/mli_solver_arpacksuperlu.cxx
index bbf3de06..cff7a027 100644
--- a/external/hypre/src/FEI_mv/femli/mli_solver_arpacksuperlu.cxx
+++ b/external/hypre/src/FEI_mv/femli/mli_solver_arpacksuperlu.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_solver_arpacksuperlu.h b/external/hypre/src/FEI_mv/femli/mli_solver_arpacksuperlu.h
index db7375ca..53e1cc9e 100644
--- a/external/hypre/src/FEI_mv/femli/mli_solver_arpacksuperlu.h
+++ b/external/hypre/src/FEI_mv/femli/mli_solver_arpacksuperlu.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_solver_bjacobi.cxx b/external/hypre/src/FEI_mv/femli/mli_solver_bjacobi.cxx
index 70a4fdfe..d86b8a8c 100644
--- a/external/hypre/src/FEI_mv/femli/mli_solver_bjacobi.cxx
+++ b/external/hypre/src/FEI_mv/femli/mli_solver_bjacobi.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_solver_bjacobi.h b/external/hypre/src/FEI_mv/femli/mli_solver_bjacobi.h
index dee27351..209a2ee4 100644
--- a/external/hypre/src/FEI_mv/femli/mli_solver_bjacobi.h
+++ b/external/hypre/src/FEI_mv/femli/mli_solver_bjacobi.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_solver_bsgs.cxx b/external/hypre/src/FEI_mv/femli/mli_solver_bsgs.cxx
index 6dad840f..543bb119 100644
--- a/external/hypre/src/FEI_mv/femli/mli_solver_bsgs.cxx
+++ b/external/hypre/src/FEI_mv/femli/mli_solver_bsgs.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_solver_bsgs.h b/external/hypre/src/FEI_mv/femli/mli_solver_bsgs.h
index c75836f7..261d7131 100644
--- a/external/hypre/src/FEI_mv/femli/mli_solver_bsgs.h
+++ b/external/hypre/src/FEI_mv/femli/mli_solver_bsgs.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_solver_cg.cxx b/external/hypre/src/FEI_mv/femli/mli_solver_cg.cxx
index ec526193..0069be87 100644
--- a/external/hypre/src/FEI_mv/femli/mli_solver_cg.cxx
+++ b/external/hypre/src/FEI_mv/femli/mli_solver_cg.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_solver_cg.h b/external/hypre/src/FEI_mv/femli/mli_solver_cg.h
index 3887967f..3059736b 100644
--- a/external/hypre/src/FEI_mv/femli/mli_solver_cg.h
+++ b/external/hypre/src/FEI_mv/femli/mli_solver_cg.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_solver_chebyshev.cxx b/external/hypre/src/FEI_mv/femli/mli_solver_chebyshev.cxx
index 53f14451..73200c28 100644
--- a/external/hypre/src/FEI_mv/femli/mli_solver_chebyshev.cxx
+++ b/external/hypre/src/FEI_mv/femli/mli_solver_chebyshev.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_solver_chebyshev.h b/external/hypre/src/FEI_mv/femli/mli_solver_chebyshev.h
index 9a5dc92a..b0b77641 100644
--- a/external/hypre/src/FEI_mv/femli/mli_solver_chebyshev.h
+++ b/external/hypre/src/FEI_mv/femli/mli_solver_chebyshev.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_solver_gmres.cxx b/external/hypre/src/FEI_mv/femli/mli_solver_gmres.cxx
index 79e59deb..4d069c1b 100644
--- a/external/hypre/src/FEI_mv/femli/mli_solver_gmres.cxx
+++ b/external/hypre/src/FEI_mv/femli/mli_solver_gmres.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_solver_gmres.h b/external/hypre/src/FEI_mv/femli/mli_solver_gmres.h
index 6e5b67f1..427ca204 100644
--- a/external/hypre/src/FEI_mv/femli/mli_solver_gmres.h
+++ b/external/hypre/src/FEI_mv/femli/mli_solver_gmres.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_solver_gs.cxx b/external/hypre/src/FEI_mv/femli/mli_solver_gs.cxx
index 496329b0..784046bd 100644
--- a/external/hypre/src/FEI_mv/femli/mli_solver_gs.cxx
+++ b/external/hypre/src/FEI_mv/femli/mli_solver_gs.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_solver_gs.h b/external/hypre/src/FEI_mv/femli/mli_solver_gs.h
index e87f4593..b5c5021f 100644
--- a/external/hypre/src/FEI_mv/femli/mli_solver_gs.h
+++ b/external/hypre/src/FEI_mv/femli/mli_solver_gs.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_solver_hschwarz.cxx b/external/hypre/src/FEI_mv/femli/mli_solver_hschwarz.cxx
index 10e9982b..d49538a4 100644
--- a/external/hypre/src/FEI_mv/femli/mli_solver_hschwarz.cxx
+++ b/external/hypre/src/FEI_mv/femli/mli_solver_hschwarz.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_solver_hschwarz.h b/external/hypre/src/FEI_mv/femli/mli_solver_hschwarz.h
index 4b79360d..7549dade 100644
--- a/external/hypre/src/FEI_mv/femli/mli_solver_hschwarz.h
+++ b/external/hypre/src/FEI_mv/femli/mli_solver_hschwarz.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_solver_hsgs.cxx b/external/hypre/src/FEI_mv/femli/mli_solver_hsgs.cxx
index 40c19fc3..9fd8fdac 100644
--- a/external/hypre/src/FEI_mv/femli/mli_solver_hsgs.cxx
+++ b/external/hypre/src/FEI_mv/femli/mli_solver_hsgs.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_solver_hsgs.h b/external/hypre/src/FEI_mv/femli/mli_solver_hsgs.h
index 7d50c36d..2318851d 100644
--- a/external/hypre/src/FEI_mv/femli/mli_solver_hsgs.h
+++ b/external/hypre/src/FEI_mv/femli/mli_solver_hsgs.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_solver_jacobi.cxx b/external/hypre/src/FEI_mv/femli/mli_solver_jacobi.cxx
index b55fbc53..6c91b456 100644
--- a/external/hypre/src/FEI_mv/femli/mli_solver_jacobi.cxx
+++ b/external/hypre/src/FEI_mv/femli/mli_solver_jacobi.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_solver_jacobi.h b/external/hypre/src/FEI_mv/femli/mli_solver_jacobi.h
index 6cbed060..37f7e265 100644
--- a/external/hypre/src/FEI_mv/femli/mli_solver_jacobi.h
+++ b/external/hypre/src/FEI_mv/femli/mli_solver_jacobi.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_solver_kaczmarz.cxx b/external/hypre/src/FEI_mv/femli/mli_solver_kaczmarz.cxx
index 9ea371bf..2db2481e 100644
--- a/external/hypre/src/FEI_mv/femli/mli_solver_kaczmarz.cxx
+++ b/external/hypre/src/FEI_mv/femli/mli_solver_kaczmarz.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_solver_kaczmarz.h b/external/hypre/src/FEI_mv/femli/mli_solver_kaczmarz.h
index 623a4ddf..a2bf4b36 100644
--- a/external/hypre/src/FEI_mv/femli/mli_solver_kaczmarz.h
+++ b/external/hypre/src/FEI_mv/femli/mli_solver_kaczmarz.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_solver_mli.cxx b/external/hypre/src/FEI_mv/femli/mli_solver_mli.cxx
index 2e75c4d0..79842972 100644
--- a/external/hypre/src/FEI_mv/femli/mli_solver_mli.cxx
+++ b/external/hypre/src/FEI_mv/femli/mli_solver_mli.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_solver_mli.h b/external/hypre/src/FEI_mv/femli/mli_solver_mli.h
index 184b490d..124991e9 100644
--- a/external/hypre/src/FEI_mv/femli/mli_solver_mli.h
+++ b/external/hypre/src/FEI_mv/femli/mli_solver_mli.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_solver_mls.cxx b/external/hypre/src/FEI_mv/femli/mli_solver_mls.cxx
index fb4eab97..5495f0a8 100644
--- a/external/hypre/src/FEI_mv/femli/mli_solver_mls.cxx
+++ b/external/hypre/src/FEI_mv/femli/mli_solver_mls.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_solver_mls.h b/external/hypre/src/FEI_mv/femli/mli_solver_mls.h
index 8800d433..6fb0e28a 100644
--- a/external/hypre/src/FEI_mv/femli/mli_solver_mls.h
+++ b/external/hypre/src/FEI_mv/femli/mli_solver_mls.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_solver_parasails.cxx b/external/hypre/src/FEI_mv/femli/mli_solver_parasails.cxx
index beb7ec5a..00a6b2c8 100644
--- a/external/hypre/src/FEI_mv/femli/mli_solver_parasails.cxx
+++ b/external/hypre/src/FEI_mv/femli/mli_solver_parasails.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_solver_parasails.h b/external/hypre/src/FEI_mv/femli/mli_solver_parasails.h
index b3169e89..be53492d 100644
--- a/external/hypre/src/FEI_mv/femli/mli_solver_parasails.h
+++ b/external/hypre/src/FEI_mv/femli/mli_solver_parasails.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_solver_seqsuperlu.cxx b/external/hypre/src/FEI_mv/femli/mli_solver_seqsuperlu.cxx
index 8767f944..585664f3 100644
--- a/external/hypre/src/FEI_mv/femli/mli_solver_seqsuperlu.cxx
+++ b/external/hypre/src/FEI_mv/femli/mli_solver_seqsuperlu.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_solver_seqsuperlu.h b/external/hypre/src/FEI_mv/femli/mli_solver_seqsuperlu.h
index 9a56e46e..6eb0236d 100644
--- a/external/hypre/src/FEI_mv/femli/mli_solver_seqsuperlu.h
+++ b/external/hypre/src/FEI_mv/femli/mli_solver_seqsuperlu.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_solver_sgs.cxx b/external/hypre/src/FEI_mv/femli/mli_solver_sgs.cxx
index 6f9d874e..9d6548ac 100644
--- a/external/hypre/src/FEI_mv/femli/mli_solver_sgs.cxx
+++ b/external/hypre/src/FEI_mv/femli/mli_solver_sgs.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_solver_sgs.h b/external/hypre/src/FEI_mv/femli/mli_solver_sgs.h
index 92fe381c..8c0e39f1 100644
--- a/external/hypre/src/FEI_mv/femli/mli_solver_sgs.h
+++ b/external/hypre/src/FEI_mv/femli/mli_solver_sgs.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_solver_superlu.cxx b/external/hypre/src/FEI_mv/femli/mli_solver_superlu.cxx
index 66bfbf1e..3e9ed7f9 100644
--- a/external/hypre/src/FEI_mv/femli/mli_solver_superlu.cxx
+++ b/external/hypre/src/FEI_mv/femli/mli_solver_superlu.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_solver_superlu.h b/external/hypre/src/FEI_mv/femli/mli_solver_superlu.h
index 7a38932c..3867a7d3 100644
--- a/external/hypre/src/FEI_mv/femli/mli_solver_superlu.h
+++ b/external/hypre/src/FEI_mv/femli/mli_solver_superlu.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_utils.c b/external/hypre/src/FEI_mv/femli/mli_utils.c
index 51adae71..1956d4f8 100644
--- a/external/hypre/src/FEI_mv/femli/mli_utils.c
+++ b/external/hypre/src/FEI_mv/femli/mli_utils.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_utils.h b/external/hypre/src/FEI_mv/femli/mli_utils.h
index b57902d8..16b2db38 100644
--- a/external/hypre/src/FEI_mv/femli/mli_utils.h
+++ b/external/hypre/src/FEI_mv/femli/mli_utils.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_utils_fortran.f b/external/hypre/src/FEI_mv/femli/mli_utils_fortran.f
index 535214e8..0bd897b1 100644
--- a/external/hypre/src/FEI_mv/femli/mli_utils_fortran.f
+++ b/external/hypre/src/FEI_mv/femli/mli_utils_fortran.f
@@ -1,4 +1,4 @@
-!     Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+!     Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 !     HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 !
 !     SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_vector.cxx b/external/hypre/src/FEI_mv/femli/mli_vector.cxx
index f48fbe7d..e08dd12b 100644
--- a/external/hypre/src/FEI_mv/femli/mli_vector.cxx
+++ b/external/hypre/src/FEI_mv/femli/mli_vector.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/FEI_mv/femli/mli_vector.h b/external/hypre/src/FEI_mv/femli/mli_vector.h
index f1da8f07..a6d292d4 100644
--- a/external/hypre/src/FEI_mv/femli/mli_vector.h
+++ b/external/hypre/src/FEI_mv/femli/mli_vector.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/HYPRE.h b/external/hypre/src/HYPRE.h
index 9031c41f..5d22f191 100644
--- a/external/hypre/src/HYPRE.h
+++ b/external/hypre/src/HYPRE.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/HYPREf.h b/external/hypre/src/HYPREf.h
index 562b44f9..79476512 100644
--- a/external/hypre/src/HYPREf.h
+++ b/external/hypre/src/HYPREf.h
@@ -1,4 +1,4 @@
-!     Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+!     Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 !     HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 !
 !     SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -45,3 +45,12 @@
       integer HYPRE_SMG
       parameter( HYPRE_SMG =     11 )
 
+      integer HYPRE_MEMORY_HOST
+      parameter( HYPRE_MEMORY_HOST =   0 )
+      integer HYPRE_MEMORY_DEVICE
+      parameter( HYPRE_MEMORY_DEVICE = 1 )
+
+      integer HYPRE_EXEC_HOST
+      parameter( HYPRE_EXEC_HOST =   0 )
+      integer HYPRE_EXEC_DEVICE
+      parameter( HYPRE_EXEC_DEVICE = 1 )
diff --git a/external/hypre/src/IJ_mv/CMakeLists.txt b/external/hypre/src/IJ_mv/CMakeLists.txt
index 5a7c4d5e..7449654a 100644
--- a/external/hypre/src/IJ_mv/CMakeLists.txt
+++ b/external/hypre/src/IJ_mv/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -34,13 +34,13 @@ target_sources(${PROJECT_NAME}
           ${HDRS}
 )
 
-if (HYPRE_USING_CUDA)
-  set(CUDA_SRCS
+if (HYPRE_USING_GPU)
+  set(GPU_SRCS
     IJMatrix_parcsr_device.c
     IJVector_parcsr_device.c
   )
-  convert_filenames_to_full_paths(CUDA_SRCS)
-  set(HYPRE_CUDA_SOURCES ${HYPRE_CUDA_SOURCES} ${CUDA_SRCS} PARENT_SCOPE)
+  convert_filenames_to_full_paths(GPU_SRCS)
+  set(HYPRE_GPU_SOURCES ${HYPRE_GPU_SOURCES} ${GPU_SRCS} PARENT_SCOPE)
 endif ()
 
 convert_filenames_to_full_paths(HDRS)
diff --git a/external/hypre/src/IJ_mv/F90_HYPRE_IJMatrix.c b/external/hypre/src/IJ_mv/F90_HYPRE_IJMatrix.c
index 6cd6707b..051284ae 100644
--- a/external/hypre/src/IJ_mv/F90_HYPRE_IJMatrix.c
+++ b/external/hypre/src/IJ_mv/F90_HYPRE_IJMatrix.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -24,36 +24,36 @@ extern "C" {
 
 void
 hypre_F90_IFACE(hypre_ijmatrixcreate, HYPRE_IJMATRIXCREATE)
-   ( hypre_F90_Comm *comm,
-     hypre_F90_BigInt *ilower,
-     hypre_F90_BigInt *iupper,
-     hypre_F90_BigInt *jlower,
-     hypre_F90_BigInt *jupper,
-     hypre_F90_Obj *matrix,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Comm *comm,
+  hypre_F90_BigInt *ilower,
+  hypre_F90_BigInt *iupper,
+  hypre_F90_BigInt *jlower,
+  hypre_F90_BigInt *jupper,
+  hypre_F90_Obj *matrix,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_IJMatrixCreate(
-           hypre_F90_PassComm (comm),
-           hypre_F90_PassBigInt (ilower),
-           hypre_F90_PassBigInt (iupper),
-           hypre_F90_PassBigInt (jlower),
-           hypre_F90_PassBigInt (jupper),
-           hypre_F90_PassObjRef (HYPRE_IJMatrix, matrix) ) );
+           ( HYPRE_IJMatrixCreate(
+                hypre_F90_PassComm (comm),
+                hypre_F90_PassBigInt (ilower),
+                hypre_F90_PassBigInt (iupper),
+                hypre_F90_PassBigInt (jlower),
+                hypre_F90_PassBigInt (jupper),
+                hypre_F90_PassObjRef (HYPRE_IJMatrix, matrix) ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_IJMatrixDestroy
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_ijmatrixdestroy, HYPRE_IJMATRIXDESTROY)
-   ( hypre_F90_Obj *matrix,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *matrix,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_IJMatrixDestroy(
-           hypre_F90_PassObj (HYPRE_IJMatrix, matrix) ) );
+           ( HYPRE_IJMatrixDestroy(
+                hypre_F90_PassObj (HYPRE_IJMatrix, matrix) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -62,12 +62,44 @@ hypre_F90_IFACE(hypre_ijmatrixdestroy, HYPRE_IJMATRIXDESTROY)
 
 void
 hypre_F90_IFACE(hypre_ijmatrixinitialize, HYPRE_IJMATRIXINITIALIZE)
-   ( hypre_F90_Obj *matrix,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *matrix,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_IJMatrixInitialize(
-           hypre_F90_PassObj (HYPRE_IJMatrix, matrix) ) );
+           ( HYPRE_IJMatrixInitialize(
+                hypre_F90_PassObj (HYPRE_IJMatrix, matrix) ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_IJMatrixInitialize_v2
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_ijmatrixinitialize_v2, HYPRE_IJMATRIXINITIALIZE_V2)
+( hypre_F90_Obj *matrix,
+  hypre_F90_Int *memory_location,
+  hypre_F90_Int *ierr    )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_IJMatrixInitialize_v2(
+                hypre_F90_PassObj (HYPRE_IJMatrix, matrix),
+                hypre_F90_PassObj (HYPRE_MemoryLocation, memory_location) ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_IJMatrixMigrate
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_ijmatrixmigrate, HYPRE_IJMATRIXMIGRATE)
+( hypre_F90_Obj *matrix,
+  hypre_F90_Int *memory_location,
+  hypre_F90_Int *ierr    )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_IJMatrixMigrate(
+                hypre_F90_PassObj (HYPRE_IJMatrix, matrix),
+                hypre_F90_PassObj (HYPRE_MemoryLocation, memory_location) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -76,22 +108,22 @@ hypre_F90_IFACE(hypre_ijmatrixinitialize, HYPRE_IJMATRIXINITIALIZE)
 
 void
 hypre_F90_IFACE(hypre_ijmatrixsetvalues, HYPRE_IJMATRIXSETVALUES)
-   ( hypre_F90_Obj *matrix,
-     hypre_F90_Int *nrows,
-     hypre_F90_IntArray *ncols,
-     hypre_F90_BigIntArray *rows,
-     hypre_F90_BigIntArray *cols,
-     hypre_F90_ComplexArray *values,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *matrix,
+  hypre_F90_Int *nrows,
+  hypre_F90_IntArray *ncols,
+  hypre_F90_BigIntArray *rows,
+  hypre_F90_BigIntArray *cols,
+  hypre_F90_ComplexArray *values,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_IJMatrixSetValues(
-           hypre_F90_PassObj (HYPRE_IJMatrix, matrix),
-           hypre_F90_PassInt (nrows),
-           hypre_F90_PassIntArray (ncols),
-           hypre_F90_PassBigIntArray (rows),
-           hypre_F90_PassBigIntArray (cols),
-           hypre_F90_PassComplexArray (values)  ) );
+           ( HYPRE_IJMatrixSetValues(
+                hypre_F90_PassObj (HYPRE_IJMatrix, matrix),
+                hypre_F90_PassInt (nrows),
+                hypre_F90_PassIntArray (ncols),
+                hypre_F90_PassBigIntArray (rows),
+                hypre_F90_PassBigIntArray (cols),
+                hypre_F90_PassComplexArray (values)  ) );
 
 }
 
@@ -101,14 +133,14 @@ hypre_F90_IFACE(hypre_ijmatrixsetvalues, HYPRE_IJMATRIXSETVALUES)
 
 void
 hypre_F90_IFACE(hypre_ijmatrixsetconstantvalues, HYPRE_IJMATRIXSETCONSTANTVALUES)
-   ( hypre_F90_Obj *matrix,
-     hypre_F90_Complex *value,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *matrix,
+  hypre_F90_Complex *value,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_IJMatrixSetConstantValues(
-           hypre_F90_PassObj (HYPRE_IJMatrix, matrix),
-           hypre_F90_PassComplex (value)  ) );
+           ( HYPRE_IJMatrixSetConstantValues(
+                hypre_F90_PassObj (HYPRE_IJMatrix, matrix),
+                hypre_F90_PassComplex (value)  ) );
 
 }
 
@@ -118,22 +150,22 @@ hypre_F90_IFACE(hypre_ijmatrixsetconstantvalues, HYPRE_IJMATRIXSETCONSTANTVALUES
 
 void
 hypre_F90_IFACE(hypre_ijmatrixaddtovalues, HYPRE_IJMATRIXADDTOVALUES)
-   ( hypre_F90_Obj *matrix,
-     hypre_F90_Int *nrows,
-     hypre_F90_IntArray *ncols,
-     hypre_F90_BigIntArray *rows,
-     hypre_F90_BigIntArray *cols,
-     hypre_F90_ComplexArray *values,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *matrix,
+  hypre_F90_Int *nrows,
+  hypre_F90_IntArray *ncols,
+  hypre_F90_BigIntArray *rows,
+  hypre_F90_BigIntArray *cols,
+  hypre_F90_ComplexArray *values,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_IJMatrixAddToValues(
-           hypre_F90_PassObj (HYPRE_IJMatrix, matrix),
-           hypre_F90_PassInt (nrows),
-           hypre_F90_PassIntArray (ncols),
-           hypre_F90_PassBigIntArray (rows),
-           hypre_F90_PassBigIntArray (cols),
-           hypre_F90_PassComplexArray (values)  ) );
+           ( HYPRE_IJMatrixAddToValues(
+                hypre_F90_PassObj (HYPRE_IJMatrix, matrix),
+                hypre_F90_PassInt (nrows),
+                hypre_F90_PassIntArray (ncols),
+                hypre_F90_PassBigIntArray (rows),
+                hypre_F90_PassBigIntArray (cols),
+                hypre_F90_PassComplexArray (values)  ) );
 
 }
 
@@ -141,34 +173,34 @@ hypre_F90_IFACE(hypre_ijmatrixaddtovalues, HYPRE_IJMATRIXADDTOVALUES)
  * HYPRE_IJMatrixAssemble
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_ijmatrixassemble, HYPRE_IJMATRIXASSEMBLE)
-   ( hypre_F90_Obj *matrix,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *matrix,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_IJMatrixAssemble(
-           hypre_F90_PassObj (HYPRE_IJMatrix, matrix) ) );
+           ( HYPRE_IJMatrixAssemble(
+                hypre_F90_PassObj (HYPRE_IJMatrix, matrix) ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_IJMatrixGetRowCounts
  *--------------------------------------------------------------------------*/
- 
+
 void
 hypre_F90_IFACE(hypre_ijmatrixgetrowcounts, HYPRE_IJMATRIXGETROWCOUNTS)
-   ( hypre_F90_Obj *matrix,
-     hypre_F90_Int *nrows,
-     hypre_F90_BigIntArray *rows,
-     hypre_F90_IntArray *ncols,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *matrix,
+  hypre_F90_Int *nrows,
+  hypre_F90_BigIntArray *rows,
+  hypre_F90_IntArray *ncols,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_IJMatrixGetRowCounts(
-           hypre_F90_PassObj (HYPRE_IJMatrix, matrix),
-           hypre_F90_PassInt (nrows),
-           hypre_F90_PassBigIntArray (rows),
-           hypre_F90_PassIntArray (ncols) ) );
+           ( HYPRE_IJMatrixGetRowCounts(
+                hypre_F90_PassObj (HYPRE_IJMatrix, matrix),
+                hypre_F90_PassInt (nrows),
+                hypre_F90_PassBigIntArray (rows),
+                hypre_F90_PassIntArray (ncols) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -177,22 +209,22 @@ hypre_F90_IFACE(hypre_ijmatrixgetrowcounts, HYPRE_IJMATRIXGETROWCOUNTS)
 
 void
 hypre_F90_IFACE(hypre_ijmatrixgetvalues, HYPRE_IJMATRIXGETVALUES)
-   ( hypre_F90_Obj *matrix,
-     hypre_F90_Int *nrows,
-     hypre_F90_IntArray *ncols,
-     hypre_F90_BigIntArray *rows,
-     hypre_F90_BigIntArray *cols,
-     hypre_F90_ComplexArray *values,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *matrix,
+  hypre_F90_Int *nrows,
+  hypre_F90_IntArray *ncols,
+  hypre_F90_BigIntArray *rows,
+  hypre_F90_BigIntArray *cols,
+  hypre_F90_ComplexArray *values,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_IJMatrixGetValues(
-           hypre_F90_PassObj (HYPRE_IJMatrix, matrix),
-           hypre_F90_PassInt (nrows),
-           hypre_F90_PassIntArray (ncols),
-           hypre_F90_PassBigIntArray (rows),
-           hypre_F90_PassBigIntArray (cols),
-           hypre_F90_PassComplexArray (values)  ) );
+           ( HYPRE_IJMatrixGetValues(
+                hypre_F90_PassObj (HYPRE_IJMatrix, matrix),
+                hypre_F90_PassInt (nrows),
+                hypre_F90_PassIntArray (ncols),
+                hypre_F90_PassBigIntArray (rows),
+                hypre_F90_PassBigIntArray (cols),
+                hypre_F90_PassComplexArray (values)  ) );
 
 }
 
@@ -200,157 +232,157 @@ hypre_F90_IFACE(hypre_ijmatrixgetvalues, HYPRE_IJMATRIXGETVALUES)
  * HYPRE_IJMatrixSetObjectType
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_ijmatrixsetobjecttype, HYPRE_IJMATRIXSETOBJECTTYPE)
-   ( hypre_F90_Obj *matrix,
-     hypre_F90_Int *type,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *matrix,
+  hypre_F90_Int *type,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_IJMatrixSetObjectType(
-           hypre_F90_PassObj (HYPRE_IJMatrix, matrix),
-           hypre_F90_PassInt (type)    ) );
+           ( HYPRE_IJMatrixSetObjectType(
+                hypre_F90_PassObj (HYPRE_IJMatrix, matrix),
+                hypre_F90_PassInt (type)    ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_IJMatrixGetObjectType
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_ijmatrixgetobjecttype, HYPRE_IJMATRIXGETOBJECTTYPE)
-   ( hypre_F90_Obj *matrix,
-     hypre_F90_Int *type,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *matrix,
+  hypre_F90_Int *type,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_IJMatrixGetObjectType(
-           hypre_F90_PassObj (HYPRE_IJMatrix, matrix),
-           hypre_F90_PassIntRef (type)    ) );
+           ( HYPRE_IJMatrixGetObjectType(
+                hypre_F90_PassObj (HYPRE_IJMatrix, matrix),
+                hypre_F90_PassIntRef (type)    ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_IJMatrixGetLocalRange
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_ijmatrixgetlocalrange, HYPRE_IJMATRIXGETLOCALRANGE)
-   ( hypre_F90_Obj *matrix,
-     hypre_F90_BigInt *ilower,
-     hypre_F90_BigInt *iupper,
-     hypre_F90_BigInt *jlower,
-     hypre_F90_BigInt *jupper,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *matrix,
+  hypre_F90_BigInt *ilower,
+  hypre_F90_BigInt *iupper,
+  hypre_F90_BigInt *jlower,
+  hypre_F90_BigInt *jupper,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_IJMatrixGetLocalRange(
-           hypre_F90_PassObj (HYPRE_IJMatrix, matrix),
-           hypre_F90_PassBigIntRef (ilower),
-           hypre_F90_PassBigIntRef (iupper),
-           hypre_F90_PassBigIntRef (jlower),
-           hypre_F90_PassBigIntRef (jupper) ) );
+           ( HYPRE_IJMatrixGetLocalRange(
+                hypre_F90_PassObj (HYPRE_IJMatrix, matrix),
+                hypre_F90_PassBigIntRef (ilower),
+                hypre_F90_PassBigIntRef (iupper),
+                hypre_F90_PassBigIntRef (jlower),
+                hypre_F90_PassBigIntRef (jupper) ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_IJMatrixGetObject
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_ijmatrixgetobject, HYPRE_IJMATRIXGETOBJECT)
-   ( hypre_F90_Obj *matrix,
-     hypre_F90_Obj *object,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *matrix,
+  hypre_F90_Obj *object,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_IJMatrixGetObject(
-           hypre_F90_PassObj (HYPRE_IJMatrix, matrix),
-           (void **)         object  ) );
+           ( HYPRE_IJMatrixGetObject(
+                hypre_F90_PassObj (HYPRE_IJMatrix, matrix),
+                (void **)         object  ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_IJMatrixSetRowSizes
  *--------------------------------------------------------------------------*/
- 
+
 void
 hypre_F90_IFACE(hypre_ijmatrixsetrowsizes, HYPRE_IJMATRIXSETROWSIZES)
-   ( hypre_F90_Obj *matrix,
-     hypre_F90_IntArray *sizes,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *matrix,
+  hypre_F90_IntArray *sizes,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_IJMatrixSetRowSizes(
-           hypre_F90_PassObj (HYPRE_IJMatrix, matrix),
-           hypre_F90_PassIntArray (sizes)   ) );
+           ( HYPRE_IJMatrixSetRowSizes(
+                hypre_F90_PassObj (HYPRE_IJMatrix, matrix),
+                hypre_F90_PassIntArray (sizes)   ) );
 
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_IJMatrixSetDiagOffdSizes
  *--------------------------------------------------------------------------*/
- 
+
 void
 hypre_F90_IFACE(hypre_ijmatrixsetdiagoffdsizes, HYPRE_IJMATRIXSETDIAGOFFDSIZES)
-   ( hypre_F90_Obj *matrix,
-     hypre_F90_IntArray *diag_sizes,
-     hypre_F90_IntArray *offd_sizes,
-     hypre_F90_Int *ierr        )
+( hypre_F90_Obj *matrix,
+  hypre_F90_IntArray *diag_sizes,
+  hypre_F90_IntArray *offd_sizes,
+  hypre_F90_Int *ierr        )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_IJMatrixSetDiagOffdSizes(
-           hypre_F90_PassObj (HYPRE_IJMatrix, matrix),
-           hypre_F90_PassIntArray (diag_sizes),
-           hypre_F90_PassIntArray (offd_sizes) ) );
+           ( HYPRE_IJMatrixSetDiagOffdSizes(
+                hypre_F90_PassObj (HYPRE_IJMatrix, matrix),
+                hypre_F90_PassIntArray (diag_sizes),
+                hypre_F90_PassIntArray (offd_sizes) ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_IJMatrixSetMaxOffProcElmts
  *--------------------------------------------------------------------------*/
- 
+
 void
 hypre_F90_IFACE(hypre_ijmatrixsetmaxoffprocelmt, HYPRE_IJMATRIXSETMAXOFFPROCELMT)
-   ( hypre_F90_Obj *matrix,
-     hypre_F90_Int *max_off_proc_elmts,
-     hypre_F90_Int *ierr        )
+( hypre_F90_Obj *matrix,
+  hypre_F90_Int *max_off_proc_elmts,
+  hypre_F90_Int *ierr        )
 {
-   *ierr = (hypre_F90_Int) 
-      ( HYPRE_IJMatrixSetMaxOffProcElmts(
-           hypre_F90_PassObj (HYPRE_IJMatrix, matrix),
-           hypre_F90_PassInt (max_off_proc_elmts) ) );
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_IJMatrixSetMaxOffProcElmts(
+                hypre_F90_PassObj (HYPRE_IJMatrix, matrix),
+                hypre_F90_PassInt (max_off_proc_elmts) ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_IJMatrixRead
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_ijmatrixread, HYPRE_IJMATRIXREAD)
-   ( char     *filename,
-     hypre_F90_Comm *comm,
-     hypre_F90_Int *object_type,
-     hypre_F90_Obj *matrix,
-     hypre_F90_Int *ierr      )
+( char     *filename,
+  hypre_F90_Comm *comm,
+  hypre_F90_Int *object_type,
+  hypre_F90_Obj *matrix,
+  hypre_F90_Int *ierr      )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_IJMatrixRead(
-           (char *)            filename,
-           hypre_F90_PassComm (comm),
-           hypre_F90_PassInt (object_type),
-           hypre_F90_PassObjRef (HYPRE_IJMatrix, matrix)    ) );
+           ( HYPRE_IJMatrixRead(
+                (char *)            filename,
+                hypre_F90_PassComm (comm),
+                hypre_F90_PassInt (object_type),
+                hypre_F90_PassObjRef (HYPRE_IJMatrix, matrix)    ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_IJMatrixPrint
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_ijmatrixprint, HYPRE_IJMATRIXPRINT)
-   ( hypre_F90_Obj *matrix,
-     char     *filename,
-     hypre_F90_Int *ierr      )
+( hypre_F90_Obj *matrix,
+  char     *filename,
+  hypre_F90_Int *ierr      )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_IJMatrixPrint(
-           hypre_F90_PassObj (HYPRE_IJMatrix, matrix),
-           (char *)          filename ) );
+           ( HYPRE_IJMatrixPrint(
+                hypre_F90_PassObj (HYPRE_IJMatrix, matrix),
+                (char *)          filename ) );
 }
 
 #ifdef __cplusplus
diff --git a/external/hypre/src/IJ_mv/F90_HYPRE_IJVector.c b/external/hypre/src/IJ_mv/F90_HYPRE_IJVector.c
index 9595b451..856b9ca4 100644
--- a/external/hypre/src/IJ_mv/F90_HYPRE_IJVector.c
+++ b/external/hypre/src/IJ_mv/F90_HYPRE_IJVector.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -17,39 +17,39 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-    
+
 /*--------------------------------------------------------------------------
  * HYPRE_IJVectorCreate
  *--------------------------------------------------------------------------*/
 
 void
 hypre_F90_IFACE(hypre_ijvectorcreate, HYPRE_IJVECTORCREATE)
-   ( hypre_F90_Comm *comm,
-     hypre_F90_BigInt *jlower,
-     hypre_F90_BigInt *jupper,
-     hypre_F90_Obj *vector,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Comm *comm,
+  hypre_F90_BigInt *jlower,
+  hypre_F90_BigInt *jupper,
+  hypre_F90_Obj *vector,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_IJVectorCreate(
-           hypre_F90_PassComm (comm),
-           hypre_F90_PassBigInt (jlower),
-           hypre_F90_PassBigInt (jupper), 
-           hypre_F90_PassObjRef (HYPRE_IJVector, vector)  ) );
+           ( HYPRE_IJVectorCreate(
+                hypre_F90_PassComm (comm),
+                hypre_F90_PassBigInt (jlower),
+                hypre_F90_PassBigInt (jupper),
+                hypre_F90_PassObjRef (HYPRE_IJVector, vector)  ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_IJVectorDestroy
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_ijvectordestroy, HYPRE_IJVECTORDESTROY)
-   ( hypre_F90_Obj *vector,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *vector,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_IJVectorDestroy(
-           hypre_F90_PassObj (HYPRE_IJVector, vector) ) );
+           ( HYPRE_IJVectorDestroy(
+                hypre_F90_PassObj (HYPRE_IJVector, vector) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -58,12 +58,44 @@ hypre_F90_IFACE(hypre_ijvectordestroy, HYPRE_IJVECTORDESTROY)
 
 void
 hypre_F90_IFACE(hypre_ijvectorinitialize, HYPRE_IJVECTORINITIALIZE)
-   ( hypre_F90_Obj *vector,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *vector,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_IJVectorInitialize(
-           hypre_F90_PassObj (HYPRE_IJVector, vector) ) );
+           ( HYPRE_IJVectorInitialize(
+                hypre_F90_PassObj (HYPRE_IJVector, vector) ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_IJVectorInitialize_v2
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_ijvectorinitialize_v2, HYPRE_IJVECTORINITIALIZE_V2)
+( hypre_F90_Obj *vector,
+  hypre_F90_Int *memory_location,
+  hypre_F90_Int *ierr    )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_IJVectorInitialize_v2(
+                hypre_F90_PassObj (HYPRE_IJVector, vector),
+                hypre_F90_PassObj (HYPRE_MemoryLocation, memory_location) ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_IJVectorMigrate
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_ijvectormigrate, HYPRE_IJVECTORMIGRATE)
+( hypre_F90_Obj *vector,
+  hypre_F90_Int *memory_location,
+  hypre_F90_Int *ierr    )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_IJVectorMigrate(
+                hypre_F90_PassObj (HYPRE_IJVector, vector),
+                hypre_F90_PassObj (HYPRE_MemoryLocation, memory_location) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -72,18 +104,18 @@ hypre_F90_IFACE(hypre_ijvectorinitialize, HYPRE_IJVECTORINITIALIZE)
 
 void
 hypre_F90_IFACE(hypre_ijvectorsetvalues, HYPRE_IJVECTORSETVALUES)
-   ( hypre_F90_Obj *vector,
-     hypre_F90_Int *num_values,
-     hypre_F90_BigIntArray *indices,
-     hypre_F90_ComplexArray *values,
-     hypre_F90_Int *ierr        )
+( hypre_F90_Obj *vector,
+  hypre_F90_Int *num_values,
+  hypre_F90_BigIntArray *indices,
+  hypre_F90_ComplexArray *values,
+  hypre_F90_Int *ierr        )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_IJVectorSetValues(
-           hypre_F90_PassObj (HYPRE_IJVector, vector),
-           hypre_F90_PassInt (num_values),
-           hypre_F90_PassBigIntArray (indices),
-           hypre_F90_PassComplexArray (values)      ) );
+           ( HYPRE_IJVectorSetValues(
+                hypre_F90_PassObj (HYPRE_IJVector, vector),
+                hypre_F90_PassInt (num_values),
+                hypre_F90_PassBigIntArray (indices),
+                hypre_F90_PassComplexArray (values)      ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -92,18 +124,18 @@ hypre_F90_IFACE(hypre_ijvectorsetvalues, HYPRE_IJVECTORSETVALUES)
 
 void
 hypre_F90_IFACE(hypre_ijvectoraddtovalues, HYPRE_IJVECTORADDTOVALUES)
-   ( hypre_F90_Obj *vector,
-     hypre_F90_Int *num_values,
-     hypre_F90_BigIntArray *indices,
-     hypre_F90_ComplexArray *values,
-     hypre_F90_Int *ierr        )
+( hypre_F90_Obj *vector,
+  hypre_F90_Int *num_values,
+  hypre_F90_BigIntArray *indices,
+  hypre_F90_ComplexArray *values,
+  hypre_F90_Int *ierr        )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_IJVectorAddToValues(
-           hypre_F90_PassObj (HYPRE_IJVector, vector),
-           hypre_F90_PassInt (num_values),
-           hypre_F90_PassBigIntArray (indices),
-           hypre_F90_PassComplexArray (values)      ) );
+           ( HYPRE_IJVectorAddToValues(
+                hypre_F90_PassObj (HYPRE_IJVector, vector),
+                hypre_F90_PassInt (num_values),
+                hypre_F90_PassBigIntArray (indices),
+                hypre_F90_PassComplexArray (values)      ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -112,12 +144,12 @@ hypre_F90_IFACE(hypre_ijvectoraddtovalues, HYPRE_IJVECTORADDTOVALUES)
 
 void
 hypre_F90_IFACE(hypre_ijvectorassemble, HYPRE_IJVECTORASSEMBLE)
-   ( hypre_F90_Obj *vector,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *vector,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_IJVectorAssemble(
-           hypre_F90_PassObj (HYPRE_IJVector, vector) ) );
+           ( HYPRE_IJVectorAssemble(
+                hypre_F90_PassObj (HYPRE_IJVector, vector) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -126,50 +158,50 @@ hypre_F90_IFACE(hypre_ijvectorassemble, HYPRE_IJVECTORASSEMBLE)
 
 void
 hypre_F90_IFACE(hypre_ijvectorgetvalues, HYPRE_IJVECTORGETVALUES)
-   ( hypre_F90_Obj *vector,
-     hypre_F90_Int *num_values,
-     hypre_F90_BigIntArray *indices,
-     hypre_F90_ComplexArray *values,
-     hypre_F90_Int *ierr        )
+( hypre_F90_Obj *vector,
+  hypre_F90_Int *num_values,
+  hypre_F90_BigIntArray *indices,
+  hypre_F90_ComplexArray *values,
+  hypre_F90_Int *ierr        )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_IJVectorGetValues(
-           hypre_F90_PassObj (HYPRE_IJVector, vector),
-           hypre_F90_PassInt (num_values),
-           hypre_F90_PassBigIntArray (indices),
-           hypre_F90_PassComplexArray (values)      ) );
+           ( HYPRE_IJVectorGetValues(
+                hypre_F90_PassObj (HYPRE_IJVector, vector),
+                hypre_F90_PassInt (num_values),
+                hypre_F90_PassBigIntArray (indices),
+                hypre_F90_PassComplexArray (values)      ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_IJVectorSetMaxOffProcElmts
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_ijvectorsetmaxoffprocelmt, HYPRE_IJVECTORSETMAXOFFPROCELMT)
-   ( hypre_F90_Obj *vector,
-     hypre_F90_Int *max_off_proc_elmts,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *vector,
+  hypre_F90_Int *max_off_proc_elmts,
+  hypre_F90_Int *ierr    )
 {
-   *ierr = (hypre_F90_Int) 
-      ( HYPRE_IJVectorSetMaxOffProcElmts(
-           hypre_F90_PassObj (HYPRE_IJVector, vector),
-           hypre_F90_PassInt (max_off_proc_elmts) ) );
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_IJVectorSetMaxOffProcElmts(
+                hypre_F90_PassObj (HYPRE_IJVector, vector),
+                hypre_F90_PassInt (max_off_proc_elmts) ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_IJVectorSetObjectType
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_ijvectorsetobjecttype, HYPRE_IJVECTORSETOBJECTTYPE)
-   ( hypre_F90_Obj *vector,
-     hypre_F90_Int *type,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *vector,
+  hypre_F90_Int *type,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_IJVectorSetObjectType(
-           hypre_F90_PassObj (HYPRE_IJVector, vector),
-           hypre_F90_PassInt (type)    ) );
+           ( HYPRE_IJVectorSetObjectType(
+                hypre_F90_PassObj (HYPRE_IJVector, vector),
+                hypre_F90_PassInt (type)    ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -178,14 +210,14 @@ hypre_F90_IFACE(hypre_ijvectorsetobjecttype, HYPRE_IJVECTORSETOBJECTTYPE)
 
 void
 hypre_F90_IFACE(hypre_ijvectorgetobjecttype, HYPRE_IJVECTORGETOBJECTTYPE)
-   ( hypre_F90_Obj *vector,
-     hypre_F90_Int *type,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *vector,
+  hypre_F90_Int *type,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_IJVectorGetObjectType(
-          hypre_F90_PassObj (HYPRE_IJVector, vector),
-          hypre_F90_PassIntRef (type)    ) );
+           (HYPRE_IJVectorGetObjectType(
+               hypre_F90_PassObj (HYPRE_IJVector, vector),
+               hypre_F90_PassIntRef (type)    ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -194,16 +226,16 @@ hypre_F90_IFACE(hypre_ijvectorgetobjecttype, HYPRE_IJVECTORGETOBJECTTYPE)
 
 void
 hypre_F90_IFACE(hypre_ijvectorgetlocalrange, HYPRE_IJVECTORGETLOCALRANGE)
-   ( hypre_F90_Obj *vector,
-     hypre_F90_BigInt *jlower,
-     hypre_F90_BigInt *jupper,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *vector,
+  hypre_F90_BigInt *jlower,
+  hypre_F90_BigInt *jupper,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_IJVectorGetLocalRange(
-          hypre_F90_PassObj (HYPRE_IJVector, vector),
-          hypre_F90_PassBigIntRef (jlower),
-          hypre_F90_PassBigIntRef (jupper)  ) );
+           (HYPRE_IJVectorGetLocalRange(
+               hypre_F90_PassObj (HYPRE_IJVector, vector),
+               hypre_F90_PassBigIntRef (jlower),
+               hypre_F90_PassBigIntRef (jupper)  ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -212,14 +244,14 @@ hypre_F90_IFACE(hypre_ijvectorgetlocalrange, HYPRE_IJVECTORGETLOCALRANGE)
 
 void
 hypre_F90_IFACE(hypre_ijvectorgetobject, HYPRE_IJVECTORGETOBJECT)
-   ( hypre_F90_Obj *vector,
-     hypre_F90_Obj *object,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *vector,
+  hypre_F90_Obj *object,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_IJVectorGetObject(
-          hypre_F90_PassObj (HYPRE_IJVector, vector),
-          (void **)         object  ) );
+           (HYPRE_IJVectorGetObject(
+               hypre_F90_PassObj (HYPRE_IJVector, vector),
+               (void **)         object  ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -228,18 +260,18 @@ hypre_F90_IFACE(hypre_ijvectorgetobject, HYPRE_IJVECTORGETOBJECT)
 
 void
 hypre_F90_IFACE(hypre_ijvectorread, HYPRE_IJVECTORREAD)
-   ( char     *filename,
-     hypre_F90_Comm *comm,
-     hypre_F90_Int *object_type,
-     hypre_F90_Obj *vector,
-     hypre_F90_Int *ierr      )
+( char     *filename,
+  hypre_F90_Comm *comm,
+  hypre_F90_Int *object_type,
+  hypre_F90_Obj *vector,
+  hypre_F90_Int *ierr      )
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_IJVectorRead(
-          (char *)            filename,
-          hypre_F90_PassComm (comm),
-          hypre_F90_PassInt (object_type),
-          hypre_F90_PassObjRef (HYPRE_IJVector, vector)       ) );
+           (HYPRE_IJVectorRead(
+               (char *)            filename,
+               hypre_F90_PassComm (comm),
+               hypre_F90_PassInt (object_type),
+               hypre_F90_PassObjRef (HYPRE_IJVector, vector)       ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -248,14 +280,14 @@ hypre_F90_IFACE(hypre_ijvectorread, HYPRE_IJVECTORREAD)
 
 void
 hypre_F90_IFACE(hypre_ijvectorprint, HYPRE_IJVECTORPRINT)
-   ( hypre_F90_Obj *vector,
-     char     *filename,
-     hypre_F90_Int *ierr      )
+( hypre_F90_Obj *vector,
+  char     *filename,
+  hypre_F90_Int *ierr      )
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_IJVectorPrint(
-          hypre_F90_PassObj (HYPRE_IJVector, vector),
-          (char *)          filename ) );
+           (HYPRE_IJVectorPrint(
+               hypre_F90_PassObj (HYPRE_IJVector, vector),
+               (char *)          filename ) );
 }
 
 #ifdef __cplusplus
diff --git a/external/hypre/src/IJ_mv/F90_IJMatrix.c b/external/hypre/src/IJ_mv/F90_IJMatrix.c
index 36779da5..a5a098a4 100644
--- a/external/hypre/src/IJ_mv/F90_IJMatrix.c
+++ b/external/hypre/src/IJ_mv/F90_IJMatrix.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -17,21 +17,21 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-    
+
 /*--------------------------------------------------------------------------
  * hypre_IJMatrixSetObject
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_ijmatrixsetobject, HYPRE_IJMATRIXSETOBJECT)
-   ( hypre_F90_Obj *matrix,
-     hypre_F90_Obj *object,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *matrix,
+  hypre_F90_Obj *object,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( hypre_IJMatrixSetObject(
-           hypre_F90_PassObj (HYPRE_IJMatrix, matrix),
-           (void *)         *object  ) );
+           ( hypre_IJMatrixSetObject(
+                hypre_F90_PassObj (HYPRE_IJMatrix, matrix),
+                (void *)         *object  ) );
 }
 
 #ifdef __cplusplus
diff --git a/external/hypre/src/IJ_mv/HYPRE_IJMatrix.c b/external/hypre/src/IJ_mv/HYPRE_IJMatrix.c
index 91030943..10c2a8bd 100644
--- a/external/hypre/src/IJ_mv/HYPRE_IJMatrix.c
+++ b/external/hypre/src/IJ_mv/HYPRE_IJMatrix.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -27,7 +27,7 @@ HYPRE_IJMatrixCreate( MPI_Comm        comm,
                       HYPRE_BigInt    jupper,
                       HYPRE_IJMatrix *matrix )
 {
-   HYPRE_BigInt *info;
+   HYPRE_BigInt info[2];
    HYPRE_Int num_procs;
    HYPRE_Int myid;
 
@@ -35,7 +35,7 @@ HYPRE_IJMatrixCreate( MPI_Comm        comm,
 
    HYPRE_BigInt  row0, col0, rowN, colN;
 
-   ijmatrix = hypre_CTAlloc(hypre_IJMatrix,  1, HYPRE_MEMORY_HOST);
+   ijmatrix = hypre_CTAlloc(hypre_IJMatrix, 1, HYPRE_MEMORY_HOST);
 
    hypre_IJMatrixComm(ijmatrix)           = comm;
    hypre_IJMatrixObject(ijmatrix)         = NULL;
@@ -46,11 +46,11 @@ HYPRE_IJMatrixCreate( MPI_Comm        comm,
    hypre_IJMatrixPrintLevel(ijmatrix)     = 0;
    hypre_IJMatrixOMPFlag(ijmatrix)        = 0;
 
-   hypre_MPI_Comm_size(comm,&num_procs);
+   hypre_MPI_Comm_size(comm, &num_procs);
    hypre_MPI_Comm_rank(comm, &myid);
 
 
-   if (ilower > iupper+1 || ilower < 0)
+   if (ilower > iupper + 1 || ilower < 0)
    {
       hypre_error_in_arg(2);
       hypre_TFree(ijmatrix, HYPRE_MEMORY_HOST);
@@ -64,7 +64,7 @@ HYPRE_IJMatrixCreate( MPI_Comm        comm,
       return hypre_error_flag;
    }
 
-   if (jlower > jupper+1 || jlower < 0)
+   if (jlower > jupper + 1 || jlower < 0)
    {
       hypre_error_in_arg(4);
       hypre_TFree(ijmatrix, HYPRE_MEMORY_HOST);
@@ -78,12 +78,10 @@ HYPRE_IJMatrixCreate( MPI_Comm        comm,
       return hypre_error_flag;
    }
 
-   info = hypre_CTAlloc(HYPRE_BigInt, 2, HYPRE_MEMORY_HOST);
-
    hypre_IJMatrixRowPartitioning(ijmatrix)[0] = ilower;
-   hypre_IJMatrixRowPartitioning(ijmatrix)[1] = iupper+1;
+   hypre_IJMatrixRowPartitioning(ijmatrix)[1] = iupper + 1;
    hypre_IJMatrixColPartitioning(ijmatrix)[0] = jlower;
-   hypre_IJMatrixColPartitioning(ijmatrix)[1] = jupper+1;
+   hypre_IJMatrixColPartitioning(ijmatrix)[1] = jupper + 1;
 
    /* now we need the global number of rows and columns as well
       as the global first row and column index */
@@ -99,12 +97,12 @@ HYPRE_IJMatrixCreate( MPI_Comm        comm,
    col0 = info[1];
 
    /* proc (num_procs-1) has the last row and col */
-   if (myid == (num_procs-1))
+   if (myid == (num_procs - 1))
    {
       info[0] = iupper;
       info[1] = jupper;
    }
-   hypre_MPI_Bcast(info, 2, HYPRE_MPI_BIG_INT, num_procs-1, comm);
+   hypre_MPI_Bcast(info, 2, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
 
    rowN = info[0];
    colN = info[1];
@@ -114,13 +112,64 @@ HYPRE_IJMatrixCreate( MPI_Comm        comm,
    hypre_IJMatrixGlobalNumRows(ijmatrix) = rowN - row0 + 1;
    hypre_IJMatrixGlobalNumCols(ijmatrix) = colN - col0 + 1;
 
-   hypre_TFree(info, HYPRE_MEMORY_HOST);
-
    *matrix = (HYPRE_IJMatrix) ijmatrix;
 
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ * HYPRE_IJMatrixPartialClone
+ *
+ * Creates a new IJMatrix with data copied from an existing matrix except
+ * for the members:
+ *    1) hypre_IJMatrixObject
+ *    2) hypre_IJMatrixTranslator
+ *    3) hypre_IJMatrixAssumedPart
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_IJMatrixPartialClone( HYPRE_IJMatrix  matrix_in,
+                            HYPRE_IJMatrix *matrix_out )
+{
+   hypre_IJMatrix *ijmatrix_in = (hypre_IJMatrix *) matrix_in;
+   hypre_IJMatrix *ijmatrix_out;
+   HYPRE_BigInt    ilower;
+   HYPRE_BigInt    iupper;
+   HYPRE_BigInt    jlower;
+   HYPRE_BigInt    jupper;
+
+   if (!ijmatrix_in)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   HYPRE_IJMatrixGetLocalRange(ijmatrix_in, &ilower, &iupper, &jlower, &jupper);
+
+   ijmatrix_out = hypre_CTAlloc(hypre_IJMatrix, 1, HYPRE_MEMORY_HOST);
+
+   hypre_IJMatrixComm(ijmatrix_out)               = hypre_IJMatrixComm(ijmatrix_in);
+   hypre_IJMatrixObject(ijmatrix_out)             = NULL;
+   hypre_IJMatrixTranslator(ijmatrix_out)         = NULL;
+   hypre_IJMatrixAssumedPart(ijmatrix_out)        = NULL;
+   hypre_IJMatrixObjectType(ijmatrix_out)         = hypre_IJMatrixObjectType(ijmatrix_in);
+   hypre_IJMatrixAssembleFlag(ijmatrix_out)       = 0;
+   hypre_IJMatrixPrintLevel(ijmatrix_out)         = hypre_IJMatrixPrintLevel(ijmatrix_in);
+   hypre_IJMatrixOMPFlag(ijmatrix_out)            = hypre_IJMatrixOMPFlag(ijmatrix_in);
+   hypre_IJMatrixGlobalFirstRow(ijmatrix_out)     = hypre_IJMatrixGlobalFirstRow(ijmatrix_in);
+   hypre_IJMatrixGlobalFirstCol(ijmatrix_out)     = hypre_IJMatrixGlobalFirstCol(ijmatrix_in);
+   hypre_IJMatrixGlobalNumRows(ijmatrix_out)      = hypre_IJMatrixGlobalNumRows(ijmatrix_in);
+   hypre_IJMatrixGlobalNumCols(ijmatrix_out)      = hypre_IJMatrixGlobalNumCols(ijmatrix_in);
+   hypre_IJMatrixRowPartitioning(ijmatrix_out)[0] = ilower;
+   hypre_IJMatrixRowPartitioning(ijmatrix_out)[1] = iupper + 1;
+   hypre_IJMatrixColPartitioning(ijmatrix_out)[0] = jlower;
+   hypre_IJMatrixColPartitioning(ijmatrix_out)[1] = jupper + 1;
+
+   *matrix_out = (HYPRE_IJMatrix) ijmatrix_out;
+
+   return hypre_error_flag;
+}
+
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
 
@@ -181,7 +230,6 @@ HYPRE_IJMatrixInitialize( HYPRE_IJMatrix matrix )
    }
 
    return hypre_error_flag;
-
 }
 
 HYPRE_Int
@@ -205,7 +253,6 @@ HYPRE_IJMatrixInitialize_v2( HYPRE_IJMatrix matrix, HYPRE_MemoryLocation memory_
    }
 
    return hypre_error_flag;
-
 }
 
 /*--------------------------------------------------------------------------
@@ -223,7 +270,8 @@ HYPRE_IJMatrixSetPrintLevel( HYPRE_IJMatrix matrix,
       return hypre_error_flag;
    }
 
-   hypre_IJMatrixPrintLevel(ijmatrix) = 1;
+   hypre_IJMatrixPrintLevel(ijmatrix) = (print_level > 0) ? print_level : 0;
+
    return hypre_error_flag;
 }
 
@@ -246,42 +294,44 @@ hypre_PrefixSumInt(HYPRE_Int   nvals,
    if (nvals < nthreads || bsize == 1)
    {
       sums[0] = 0;
-      for (j=1; j < nvals; j++)
-         sums[j] += sums[j-1] + vals[j-1];
+      for (j = 1; j < nvals; j++)
+      {
+         sums[j] += sums[j - 1] + vals[j - 1];
+      }
    }
    else
    {
 
       /* Compute preliminary partial sums (in parallel) within each interval */
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(j) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(j) HYPRE_SMP_SCHEDULE
 #endif
       for (j = 0; j < nvals; j += bsize)
       {
-         HYPRE_Int  i, n = hypre_min((j+bsize), nvals);
+         HYPRE_Int  i, n = hypre_min((j + bsize), nvals);
 
-         sums[0] = 0;
-         for (i = j+1; i < n; i++)
+         sums[j] = 0;
+         for (i = j + 1; i < n; i++)
          {
-            sums[i] = sums[i-1] + vals[i-1];
+            sums[i] = sums[i - 1] + vals[i - 1];
          }
       }
 
       /* Compute final partial sums (in serial) for the first entry of every interval */
       for (j = bsize; j < nvals; j += bsize)
       {
-         sums[j] = sums[j-bsize] + sums[j-1] + vals[j-1];
+         sums[j] = sums[j - bsize] + sums[j - 1] + vals[j - 1];
       }
 
       /* Compute final partial sums (in parallel) for the remaining entries */
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(j) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(j) HYPRE_SMP_SCHEDULE
 #endif
       for (j = bsize; j < nvals; j += bsize)
       {
-         HYPRE_Int  i, n = hypre_min((j+bsize), nvals);
+         HYPRE_Int  i, n = hypre_min((j + bsize), nvals);
 
-         for (i = j+1; i < n; i++)
+         for (i = j + 1; i < n; i++)
          {
             sums[i] += sums[j];
          }
@@ -415,12 +465,13 @@ HYPRE_IJMatrixSetValues2( HYPRE_IJMatrix       matrix,
       return hypre_error_flag;
    }
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
    HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_IJMatrixMemoryLocation(matrix) );
 
    if (exec == HYPRE_EXEC_DEVICE)
    {
-      hypre_IJMatrixSetAddValuesParCSRDevice(ijmatrix, nrows, ncols, rows, row_indexes, cols, values, "set");
+      hypre_IJMatrixSetAddValuesParCSRDevice(ijmatrix, nrows, ncols, rows, row_indexes, cols, values,
+                                             "set");
    }
    else
 #endif
@@ -464,6 +515,8 @@ HYPRE_IJMatrixSetValues2( HYPRE_IJMatrix       matrix,
       }
    }
 
+   HYPRE_PRINT_MEMORY_USAGE(hypre_IJMatrixComm(ijmatrix));
+
    return hypre_error_flag;
 }
 
@@ -482,7 +535,7 @@ HYPRE_IJMatrixSetConstantValues( HYPRE_IJMatrix matrix, HYPRE_Complex value)
 
    if ( hypre_IJMatrixObjectType(ijmatrix) == HYPRE_PARCSR )
    {
-      return( hypre_IJMatrixSetConstantValuesParCSR( ijmatrix, value));
+      return ( hypre_IJMatrixSetConstantValuesParCSR( ijmatrix, value));
    }
    else
    {
@@ -622,12 +675,13 @@ HYPRE_IJMatrixAddToValues2( HYPRE_IJMatrix       matrix,
       return hypre_error_flag;
    }
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
    HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_IJMatrixMemoryLocation(matrix) );
 
    if (exec == HYPRE_EXEC_DEVICE)
    {
-      hypre_IJMatrixSetAddValuesParCSRDevice(ijmatrix, nrows, ncols, rows, row_indexes, cols, values, "add");
+      hypre_IJMatrixSetAddValuesParCSRDevice(ijmatrix, nrows, ncols, rows, row_indexes, cols, values,
+                                             "add");
    }
    else
 #endif
@@ -671,6 +725,8 @@ HYPRE_IJMatrixAddToValues2( HYPRE_IJMatrix       matrix,
       }
    }
 
+   HYPRE_PRINT_MEMORY_USAGE(hypre_IJMatrixComm(ijmatrix));
+
    return hypre_error_flag;
 }
 
@@ -688,19 +744,19 @@ HYPRE_IJMatrixAssemble( HYPRE_IJMatrix matrix )
       return hypre_error_flag;
    }
 
-   if ( hypre_IJMatrixObjectType(ijmatrix) == HYPRE_PARCSR )
+   if (hypre_IJMatrixObjectType(ijmatrix) == HYPRE_PARCSR)
    {
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-      HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_IJMatrixMemoryLocation(matrix) );
+#if defined(HYPRE_USING_GPU)
+      HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1(hypre_IJMatrixMemoryLocation(matrix));
 
       if (exec == HYPRE_EXEC_DEVICE)
       {
-         return( hypre_IJMatrixAssembleParCSRDevice( ijmatrix ) );
+         hypre_IJMatrixAssembleParCSRDevice(ijmatrix);
       }
       else
 #endif
       {
-         return( hypre_IJMatrixAssembleParCSR( ijmatrix ) );
+         hypre_IJMatrixAssembleParCSR(ijmatrix);
       }
    }
    else
@@ -708,6 +764,8 @@ HYPRE_IJMatrixAssemble( HYPRE_IJMatrix matrix )
       hypre_error_in_arg(1);
    }
 
+   HYPRE_PRINT_MEMORY_USAGE(hypre_IJMatrixComm(ijmatrix));
+
    return hypre_error_flag;
 }
 
@@ -814,7 +872,7 @@ HYPRE_IJMatrixGetValues( HYPRE_IJMatrix matrix,
    if ( hypre_IJMatrixObjectType(ijmatrix) == HYPRE_PARCSR )
    {
       hypre_IJMatrixGetValuesParCSR( ijmatrix, nrows, ncols,
-                                     rows, cols, values );
+                                     rows, NULL, cols, values, 0 );
    }
    else
    {
@@ -825,6 +883,154 @@ HYPRE_IJMatrixGetValues( HYPRE_IJMatrix matrix,
 
 }
 
+/*--------------------------------------------------------------------------
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_IJMatrixGetValues2( HYPRE_IJMatrix matrix,
+                          HYPRE_Int      nrows,
+                          HYPRE_Int     *ncols,
+                          HYPRE_BigInt  *rows,
+                          HYPRE_Int     *row_indexes,
+                          HYPRE_BigInt  *cols,
+                          HYPRE_Complex *values )
+{
+   hypre_IJMatrix *ijmatrix = (hypre_IJMatrix *) matrix;
+
+   if (nrows == 0)
+   {
+      return hypre_error_flag;
+   }
+
+   if (!ijmatrix)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   if (!ncols)
+   {
+      hypre_error_in_arg(3);
+      return hypre_error_flag;
+   }
+
+   if (!rows)
+   {
+      hypre_error_in_arg(4);
+      return hypre_error_flag;
+   }
+
+   if (!cols)
+   {
+      hypre_error_in_arg(5);
+      return hypre_error_flag;
+   }
+
+   if (!values)
+   {
+      hypre_error_in_arg(6);
+      return hypre_error_flag;
+   }
+
+#if defined(HYPRE_USING_GPU)
+   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_IJMatrixMemoryLocation(matrix) );
+
+   if (exec == HYPRE_EXEC_DEVICE)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "HYPRE_IJMatrixGetValues not implemented for GPUs!");
+   }
+   else
+#endif
+   {
+      if ( hypre_IJMatrixObjectType(ijmatrix) == HYPRE_PARCSR )
+      {
+         hypre_IJMatrixGetValuesParCSR( ijmatrix, nrows, ncols,
+                                        rows, row_indexes, cols, values, 0 );
+      }
+      else
+      {
+         hypre_error_in_arg(1);
+      }
+   }
+
+   return hypre_error_flag;
+
+}
+
+/*--------------------------------------------------------------------------
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_IJMatrixGetValuesAndZeroOut( HYPRE_IJMatrix matrix,
+                                   HYPRE_Int      nrows,
+                                   HYPRE_Int     *ncols,
+                                   HYPRE_BigInt  *rows,
+                                   HYPRE_Int     *row_indexes,
+                                   HYPRE_BigInt  *cols,
+                                   HYPRE_Complex *values )
+{
+   hypre_IJMatrix *ijmatrix = (hypre_IJMatrix *) matrix;
+
+   if (nrows == 0)
+   {
+      return hypre_error_flag;
+   }
+
+   if (!ijmatrix)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   if (!ncols)
+   {
+      hypre_error_in_arg(3);
+      return hypre_error_flag;
+   }
+
+   if (!rows)
+   {
+      hypre_error_in_arg(4);
+      return hypre_error_flag;
+   }
+
+   if (!cols)
+   {
+      hypre_error_in_arg(5);
+      return hypre_error_flag;
+   }
+
+   if (!values)
+   {
+      hypre_error_in_arg(6);
+      return hypre_error_flag;
+   }
+
+#if defined(HYPRE_USING_GPU)
+   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_IJMatrixMemoryLocation(matrix) );
+
+   if (exec == HYPRE_EXEC_DEVICE)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "HYPRE_IJMatrixGetValues not implemented for GPUs!");
+   }
+   else
+#endif
+   {
+      if ( hypre_IJMatrixObjectType(ijmatrix) == HYPRE_PARCSR )
+      {
+         hypre_IJMatrixGetValuesParCSR( ijmatrix, nrows, ncols,
+                                        rows, row_indexes, cols, values, 1 );
+      }
+      else
+      {
+         hypre_error_in_arg(1);
+      }
+   }
+
+   return hypre_error_flag;
+
+}
+
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
 
@@ -888,9 +1094,51 @@ HYPRE_IJMatrixGetLocalRange( HYPRE_IJMatrix  matrix,
    col_partitioning = hypre_IJMatrixColPartitioning(ijmatrix);
 
    *ilower = row_partitioning[0];
-   *iupper = row_partitioning[1]-1;
+   *iupper = row_partitioning[1] - 1;
    *jlower = col_partitioning[0];
-   *jupper = col_partitioning[1]-1;
+   *jupper = col_partitioning[1] - 1;
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_IJMatrixGetGlobalInfo( HYPRE_IJMatrix matrix,
+                             HYPRE_BigInt  *global_num_rows,
+                             HYPRE_BigInt  *global_num_cols,
+                             HYPRE_BigInt  *global_num_nonzeros )
+{
+   hypre_IJMatrix *ijmatrix = (hypre_IJMatrix *) matrix;
+
+   if (!ijmatrix)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   *global_num_rows = hypre_IJMatrixGlobalNumRows(ijmatrix);
+   *global_num_cols = hypre_IJMatrixGlobalNumCols(ijmatrix);
+
+   if (hypre_IJMatrixObjectType(ijmatrix) == HYPRE_PARCSR)
+   {
+      hypre_ParCSRMatrix *par_matrix = (hypre_ParCSRMatrix *) hypre_IJMatrixObject(ijmatrix);
+
+      if (!par_matrix)
+      {
+         hypre_error_in_arg(1);
+         return hypre_error_flag;
+      }
+
+      hypre_ParCSRMatrixSetNumNonzeros(par_matrix);
+      *global_num_nonzeros = hypre_ParCSRMatrixNumNonzeros(par_matrix);
+   }
+   else
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
 
    return hypre_error_flag;
 }
@@ -942,7 +1190,7 @@ HYPRE_IJMatrixSetRowSizes( HYPRE_IJMatrix   matrix,
 
    if ( hypre_IJMatrixObjectType(ijmatrix) == HYPRE_PARCSR )
    {
-      return( hypre_IJMatrixSetRowSizesParCSR( ijmatrix , sizes ) );
+      return ( hypre_IJMatrixSetRowSizesParCSR( ijmatrix, sizes ) );
    }
    else
    {
@@ -998,8 +1246,8 @@ HYPRE_IJMatrixSetMaxOffProcElmts( HYPRE_IJMatrix matrix,
 
    if ( hypre_IJMatrixObjectType(ijmatrix) == HYPRE_PARCSR )
    {
-      return( hypre_IJMatrixSetMaxOffProcElmtsParCSR(ijmatrix,
-                                                     max_off_proc_elmts) );
+      return ( hypre_IJMatrixSetMaxOffProcElmtsParCSR(ijmatrix,
+                                                      max_off_proc_elmts) );
    }
    else
    {
@@ -1010,67 +1258,138 @@ HYPRE_IJMatrixSetMaxOffProcElmts( HYPRE_IJMatrix matrix,
 }
 
 /*--------------------------------------------------------------------------
- * HYPRE_IJMatrixRead
- * create IJMatrix on host memory
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-HYPRE_IJMatrixRead( const char     *filename,
-                    MPI_Comm        comm,
-                    HYPRE_Int       type,
-                    HYPRE_IJMatrix *matrix_ptr )
+HYPRE_IJMatrixSetInitAllocation(hypre_IJMatrix *matrix,
+                                HYPRE_Int       factor)
 {
-   HYPRE_IJMatrix  matrix;
-   HYPRE_BigInt    ilower, iupper, jlower, jupper;
-   HYPRE_BigInt    I, J;
-   HYPRE_Int       ncols;
-   HYPRE_Complex   value;
-   HYPRE_Int       myid, ret;
-   char            new_filename[255];
-   FILE           *file;
+   hypre_IJMatrix *ijmatrix = (hypre_IJMatrix *) matrix;
 
-   hypre_MPI_Comm_rank(comm, &myid);
+   if (!ijmatrix)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   if ( hypre_IJMatrixObjectType(ijmatrix) == HYPRE_PARCSR )
+   {
+      return ( hypre_IJMatrixSetInitAllocationParCSR(ijmatrix,
+                                                     factor) );
+   }
+   else
+   {
+      hypre_error_in_arg(1);
+   }
 
-   hypre_sprintf(new_filename,"%s.%05d", filename, myid);
+   return hypre_error_flag;
+}
 
-   if ((file = fopen(new_filename, "r")) == NULL)
+/*--------------------------------------------------------------------------
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_IJMatrixSetEarlyAssemble(hypre_IJMatrix *matrix,
+                               HYPRE_Int       early_assemble)
+{
+   hypre_IJMatrix *ijmatrix = (hypre_IJMatrix *) matrix;
+
+   if (!ijmatrix)
    {
       hypre_error_in_arg(1);
       return hypre_error_flag;
    }
 
-   hypre_fscanf(file, "%b %b %b %b", &ilower, &iupper, &jlower, &jupper);
-   HYPRE_IJMatrixCreate(comm, ilower, iupper, jlower, jupper, &matrix);
+   if ( hypre_IJMatrixObjectType(ijmatrix) == HYPRE_PARCSR )
+   {
+      return ( hypre_IJMatrixSetEarlyAssembleParCSR(ijmatrix,
+                                                    early_assemble) );
+   }
+   else
+   {
+      hypre_error_in_arg(1);
+   }
 
-   HYPRE_IJMatrixSetObjectType(matrix, type);
+   return hypre_error_flag;
+}
 
-   HYPRE_IJMatrixInitialize_v2(matrix, HYPRE_MEMORY_HOST);
+/*--------------------------------------------------------------------------
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_IJMatrixSetGrowFactor(hypre_IJMatrix *matrix,
+                            HYPRE_Real      factor)
+{
+   hypre_IJMatrix *ijmatrix = (hypre_IJMatrix *) matrix;
 
-   /* It is important to ensure that whitespace follows the index value to help
-    * catch mistakes in the input file.  See comments in IJVectorRead(). */
-   ncols = 1;
-   while ( (ret = hypre_fscanf(file, "%b %b%*[ \t]%le", &I, &J, &value)) != EOF )
+   if (!ijmatrix)
    {
-      if (ret != 3)
-      {
-         hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Error in IJ matrix input file.");
-         return hypre_error_flag;
-      }
-      if (I < ilower || I > iupper)
-      {
-         HYPRE_IJMatrixAddToValues(matrix, 1, &ncols, &I, &J, &value);
-      }
-      else
-      {
-         HYPRE_IJMatrixSetValues(matrix, 1, &ncols, &I, &J, &value);
-      }
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   if ( hypre_IJMatrixObjectType(ijmatrix) == HYPRE_PARCSR )
+   {
+      return ( hypre_IJMatrixSetGrowFactorParCSR(ijmatrix,
+                                                 factor) );
+   }
+   else
+   {
+      hypre_error_in_arg(1);
    }
 
-   HYPRE_IJMatrixAssemble(matrix);
+   return hypre_error_flag;
+}
 
-   fclose(file);
+/*--------------------------------------------------------------------------
+ * HYPRE_IJMatrixRead
+ *
+ * Reads data from file in ASCII format and creates an IJMatrix on host memory
+ *--------------------------------------------------------------------------*/
 
-   *matrix_ptr = matrix;
+HYPRE_Int
+HYPRE_IJMatrixRead( const char     *filename,
+                    MPI_Comm        comm,
+                    HYPRE_Int       type,
+                    HYPRE_IJMatrix *matrix_ptr )
+{
+   hypre_IJMatrixRead(filename, comm, type, matrix_ptr, 0);
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_IJMatrixReadBinary
+ *
+ * Reads data from file in binary format and creates an IJMatrix
+ * on host memory.
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_IJMatrixReadBinary( const char     *filename,
+                          MPI_Comm        comm,
+                          HYPRE_Int       type,
+                          HYPRE_IJMatrix *matrix_ptr )
+{
+   hypre_IJMatrixReadBinary(filename, comm, type, matrix_ptr);
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_IJMatrixReadMM
+ *
+ * Reads matrix-market data from file in ASCII format and creates an
+ * IJMatrix on host memory.
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_IJMatrixReadMM( const char     *filename,
+                      MPI_Comm        comm,
+                      HYPRE_Int       type,
+                      HYPRE_IJMatrix *matrix_ptr )
+{
+   hypre_IJMatrixRead(filename, comm, type, matrix_ptr, 1);
 
    return hypre_error_flag;
 }
@@ -1083,6 +1402,8 @@ HYPRE_Int
 HYPRE_IJMatrixPrint( HYPRE_IJMatrix  matrix,
                      const char     *filename )
 {
+   void   *object;
+
    if (!matrix)
    {
       hypre_error_in_arg(1);
@@ -1095,23 +1416,37 @@ HYPRE_IJMatrixPrint( HYPRE_IJMatrix  matrix,
       return hypre_error_flag;
    }
 
-   void *object;
    HYPRE_IJMatrixGetObject(matrix, &object);
-   HYPRE_ParCSRMatrix par_csr = (HYPRE_ParCSRMatrix) object;
+   hypre_ParCSRMatrixPrintIJ((hypre_ParCSRMatrix*) object, 0, 0, filename);
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_IJMatrixPrintBinary
+ *--------------------------------------------------------------------------*/
 
-   HYPRE_MemoryLocation memory_location = hypre_IJMatrixMemoryLocation(matrix);
+HYPRE_Int
+HYPRE_IJMatrixPrintBinary( HYPRE_IJMatrix  matrix,
+                           const char     *filename )
+{
+   void    *object;
 
-   if ( hypre_GetActualMemLocation(memory_location) == hypre_MEMORY_HOST )
+   if (!matrix)
    {
-      hypre_ParCSRMatrixPrintIJ(par_csr, 0, 0, filename);
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
    }
-   else
+
+   if ( (hypre_IJMatrixObjectType(matrix) != HYPRE_PARCSR) )
    {
-      HYPRE_ParCSRMatrix par_csr2 = hypre_ParCSRMatrixClone_v2(par_csr, 1, HYPRE_MEMORY_HOST);
-      hypre_ParCSRMatrixPrintIJ(par_csr2, 0, 0, filename);
-      hypre_ParCSRMatrixDestroy(par_csr2);
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
    }
 
+   HYPRE_IJMatrixGetObject(matrix, &object);
+   hypre_ParCSRMatrixPrintBinaryIJ((hypre_ParCSRMatrix*) object, 0, 0, filename);
+
    return hypre_error_flag;
 }
 
@@ -1297,3 +1632,34 @@ HYPRE_IJMatrixAdd( HYPRE_Complex    alpha,
 
    return hypre_error_flag;
 }
+
+/*--------------------------------------------------------------------------
+ * HYPRE_IJMatrixMigrate
+ *
+ * Migrates an IJMatrix to the specified memory location
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_IJMatrixMigrate(HYPRE_IJMatrix       matrix,
+                      HYPRE_MemoryLocation memory_location)
+{
+   hypre_IJMatrix *ijmatrix = (hypre_IJMatrix *) matrix;
+
+   if (!ijmatrix)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   /* Only implemented for ParCSR matrices */
+   if (hypre_IJMatrixObjectType(ijmatrix) == HYPRE_PARCSR)
+   {
+      hypre_IJMatrixMigrateParCSR(ijmatrix, memory_location);
+   }
+   else
+   {
+      hypre_error_in_arg(1);
+   }
+
+   return hypre_error_flag;
+}
diff --git a/external/hypre/src/IJ_mv/HYPRE_IJVector.c b/external/hypre/src/IJ_mv/HYPRE_IJVector.c
index ef023478..a909596a 100644
--- a/external/hypre/src/IJ_mv/HYPRE_IJVector.c
+++ b/external/hypre/src/IJ_mv/HYPRE_IJVector.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -40,7 +40,7 @@ HYPRE_IJVectorCreate( MPI_Comm        comm,
    hypre_MPI_Comm_size(comm, &num_procs);
    hypre_MPI_Comm_rank(comm, &my_id);
 
-   if (jlower > jupper+1 || jlower < 0)
+   if (jlower > jupper + 1 || jlower < 0)
    {
       hypre_error_in_arg(2);
       hypre_TFree(vec, HYPRE_MEMORY_HOST);
@@ -56,35 +56,92 @@ HYPRE_IJVectorCreate( MPI_Comm        comm,
       as the global first row index */
 
    /* proc 0 has the first row  */
-   if (my_id==0)
+   if (my_id == 0)
    {
       row0 = jlower;
    }
    hypre_MPI_Bcast(&row0, 1, HYPRE_MPI_BIG_INT, 0, comm);
    /* proc (num_procs-1) has the last row  */
-   if (my_id == (num_procs-1))
+   if (my_id == (num_procs - 1))
    {
       rowN = jupper;
    }
-   hypre_MPI_Bcast(&rowN, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
+   hypre_MPI_Bcast(&rowN, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
 
    hypre_IJVectorGlobalFirstRow(vec) = row0;
    hypre_IJVectorGlobalNumRows(vec) = rowN - row0 + 1;
 
    hypre_IJVectorComm(vec)            = comm;
+   hypre_IJVectorNumComponents(vec)   = 1;
    hypre_IJVectorObjectType(vec)      = HYPRE_UNITIALIZED;
    hypre_IJVectorObject(vec)          = NULL;
    hypre_IJVectorTranslator(vec)      = NULL;
    hypre_IJVectorAssumedPart(vec)     = NULL;
    hypre_IJVectorPrintLevel(vec)      = 0;
    hypre_IJVectorPartitioning(vec)[0] = jlower;
-   hypre_IJVectorPartitioning(vec)[1] = jupper+1;
+   hypre_IJVectorPartitioning(vec)[1] = jupper + 1;
 
    *vector = (HYPRE_IJVector) vec;
 
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ * HYPRE_IJVectorSetNumComponents
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_IJVectorSetNumComponents( HYPRE_IJVector vector,
+                                HYPRE_Int      num_components )
+{
+   hypre_IJVector *vec = (hypre_IJVector *) vector;
+
+   if (!vec)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   if (num_components < 0)
+   {
+      hypre_error_in_arg(2);
+      return hypre_error_flag;
+   }
+
+   hypre_IJVectorNumComponents(vector) = num_components;
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_IJVectorSetComponent
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_IJVectorSetComponent( HYPRE_IJVector vector,
+                            HYPRE_Int      component )
+{
+   hypre_IJVector *vec = (hypre_IJVector *) vector;
+
+   if (!vec)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   if (hypre_IJVectorObjectType(vec) == HYPRE_PARCSR)
+   {
+      hypre_IJVectorSetComponentPar(vector, component);
+   }
+   else
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   return hypre_error_flag;
+}
+
 /*--------------------------------------------------------------------------
  * HYPRE_IJVectorDestroy
  *--------------------------------------------------------------------------*/
@@ -125,6 +182,66 @@ HYPRE_IJVectorDestroy( HYPRE_IJVector vector )
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ * HYPRE_IJVectorInitializeShell
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_IJVectorInitializeShell(HYPRE_IJVector vector)
+{
+   hypre_IJVector *vec = (hypre_IJVector *) vector;
+
+   if (!vec)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   if ( hypre_IJVectorObjectType(vec) == HYPRE_PARCSR )
+   {
+      if (!hypre_IJVectorObject(vec))
+      {
+         hypre_IJVectorCreatePar(vec, hypre_IJVectorPartitioning(vec));
+      }
+
+      hypre_IJVectorInitializeParShell(vec);
+   }
+   else
+   {
+      hypre_error_in_arg(1);
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_IJVectorSetData
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_IJVectorSetData(HYPRE_IJVector  vector,
+                      HYPRE_Complex  *data)
+{
+   hypre_IJVector *vec = (hypre_IJVector *) vector;
+
+   if (!vec)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   if ( hypre_IJVectorObjectType(vec) == HYPRE_PARCSR )
+   {
+      hypre_IJVectorSetParData(vec, data);
+   }
+   else
+   {
+      hypre_error_in_arg(1);
+   }
+
+   return hypre_error_flag;
+}
+
 /*--------------------------------------------------------------------------
  * HYPRE_IJVectorInitialize
  *--------------------------------------------------------------------------*/
@@ -157,8 +274,13 @@ HYPRE_IJVectorInitialize( HYPRE_IJVector vector )
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ * HYPRE_IJVectorInitialize_v2
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-HYPRE_IJVectorInitialize_v2( HYPRE_IJVector vector, HYPRE_MemoryLocation memory_location )
+HYPRE_IJVectorInitialize_v2( HYPRE_IJVector       vector,
+                             HYPRE_MemoryLocation memory_location )
 {
    hypre_IJVector *vec = (hypre_IJVector *) vector;
 
@@ -201,11 +323,11 @@ HYPRE_IJVectorSetPrintLevel( HYPRE_IJVector vector,
       return hypre_error_flag;
    }
 
-   hypre_IJVectorPrintLevel(ijvector) = 1;
+   hypre_IJVectorPrintLevel(ijvector) = (print_level > 0) ? print_level : 0;
+
    return hypre_error_flag;
 }
 
-
 /*--------------------------------------------------------------------------
  * HYPRE_IJVectorSetValues
  *--------------------------------------------------------------------------*/
@@ -218,7 +340,7 @@ HYPRE_IJVectorSetValues( HYPRE_IJVector        vector,
 {
    hypre_IJVector *vec = (hypre_IJVector *) vector;
 
-   if (nvalues == 0) return hypre_error_flag;
+   if (nvalues == 0) { return hypre_error_flag; }
 
    if (!vec)
    {
@@ -240,7 +362,7 @@ HYPRE_IJVectorSetValues( HYPRE_IJVector        vector,
 
    if ( hypre_IJVectorObjectType(vec) == HYPRE_PARCSR )
    {
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
       HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_IJVectorMemoryLocation(vector) );
 
       if (exec == HYPRE_EXEC_DEVICE)
@@ -250,7 +372,7 @@ HYPRE_IJVectorSetValues( HYPRE_IJVector        vector,
       else
 #endif
       {
-         return( hypre_IJVectorSetValuesPar(vec, nvalues, indices, values) );
+         return ( hypre_IJVectorSetValuesPar(vec, nvalues, indices, values) );
       }
    }
    else
@@ -261,6 +383,34 @@ HYPRE_IJVectorSetValues( HYPRE_IJVector        vector,
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ * HYPRE_IJVectorSetConstantValues
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_IJVectorSetConstantValues( HYPRE_IJVector  vector,
+                                 HYPRE_Complex   value )
+{
+   hypre_IJVector *vec = (hypre_IJVector *) vector;
+
+   if (!vec)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   if ( hypre_IJVectorObjectType(vec) == HYPRE_PARCSR )
+   {
+      return ( hypre_IJVectorSetConstantValuesPar(vec, value) );
+   }
+   else
+   {
+      hypre_error_in_arg(1);
+   }
+
+   return hypre_error_flag;
+}
+
 /*--------------------------------------------------------------------------
  * HYPRE_IJVectorAddToValues
  *--------------------------------------------------------------------------*/
@@ -273,7 +423,7 @@ HYPRE_IJVectorAddToValues( HYPRE_IJVector        vector,
 {
    hypre_IJVector *vec = (hypre_IJVector *) vector;
 
-   if (nvalues == 0) return hypre_error_flag;
+   if (nvalues == 0) { return hypre_error_flag; }
 
    if (!vec)
    {
@@ -295,7 +445,7 @@ HYPRE_IJVectorAddToValues( HYPRE_IJVector        vector,
 
    if ( hypre_IJVectorObjectType(vec) == HYPRE_PARCSR )
    {
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
       HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_IJVectorMemoryLocation(vector) );
 
       if (exec == HYPRE_EXEC_DEVICE)
@@ -333,17 +483,80 @@ HYPRE_IJVectorAssemble( HYPRE_IJVector vector )
 
    if ( hypre_IJVectorObjectType(vec) == HYPRE_PARCSR )
    {
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
       HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_IJVectorMemoryLocation(vector) );
 
       if (exec == HYPRE_EXEC_DEVICE)
       {
-         return( hypre_IJVectorAssembleParDevice(vec) );
+         return ( hypre_IJVectorAssembleParDevice(vec) );
       }
       else
 #endif
       {
-         return( hypre_IJVectorAssemblePar(vec) );
+         return ( hypre_IJVectorAssemblePar(vec) );
+      }
+   }
+   else
+   {
+      hypre_error_in_arg(1);
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_IJVectorUpdateValues
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_IJVectorUpdateValues( HYPRE_IJVector        vector,
+                            HYPRE_Int             nvalues,
+                            const HYPRE_BigInt   *indices,
+                            const HYPRE_Complex  *values,
+                            HYPRE_Int             action )
+{
+   hypre_IJVector *vec = (hypre_IJVector *) vector;
+
+   if (nvalues == 0) { return hypre_error_flag; }
+
+   if (!vec)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   if (nvalues < 0)
+   {
+      hypre_error_in_arg(2);
+      return hypre_error_flag;
+   }
+
+   if (!values)
+   {
+      hypre_error_in_arg(4);
+      return hypre_error_flag;
+   }
+
+   if ( hypre_IJVectorObjectType(vec) == HYPRE_PARCSR )
+   {
+#if defined(HYPRE_USING_GPU)
+      HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_IJVectorMemoryLocation(vector) );
+
+      if (exec == HYPRE_EXEC_DEVICE)
+      {
+         return ( hypre_IJVectorUpdateValuesDevice(vec, nvalues, indices, values, action) );
+      }
+      else
+#endif
+      {
+         if (action == 1)
+         {
+            return ( hypre_IJVectorSetValuesPar(vec, nvalues, indices, values) );
+         }
+         else
+         {
+            return ( hypre_IJVectorAddToValuesPar(vec, nvalues, indices, values) );
+         }
       }
    }
    else
@@ -366,7 +579,7 @@ HYPRE_IJVectorGetValues( HYPRE_IJVector      vector,
 {
    hypre_IJVector *vec = (hypre_IJVector *) vector;
 
-   if (nvalues == 0) return hypre_error_flag;
+   if (nvalues == 0) { return hypre_error_flag; }
 
    if (!vec)
    {
@@ -388,7 +601,7 @@ HYPRE_IJVectorGetValues( HYPRE_IJVector      vector,
 
    if ( hypre_IJVectorObjectType(vec) == HYPRE_PARCSR )
    {
-      return( hypre_IJVectorGetValuesPar(vec, nvalues, indices, values) );
+      return ( hypre_IJVectorGetValuesPar(vec, nvalues, indices, values) );
    }
    else
    {
@@ -416,7 +629,7 @@ HYPRE_IJVectorSetMaxOffProcElmts( HYPRE_IJVector vector,
 
    if ( hypre_IJVectorObjectType(vec) == HYPRE_PARCSR )
    {
-      return( hypre_IJVectorSetMaxOffProcElmtsPar(vec, max_off_proc_elmts));
+      return ( hypre_IJVectorSetMaxOffProcElmtsPar(vec, max_off_proc_elmts));
    }
    else
    {
@@ -486,7 +699,7 @@ HYPRE_IJVectorGetLocalRange( HYPRE_IJVector  vector,
    }
 
    *jlower = hypre_IJVectorPartitioning(vec)[0];
-   *jupper = hypre_IJVectorPartitioning(vec)[1]-1;
+   *jupper = hypre_IJVectorPartitioning(vec)[1] - 1;
 
    return hypre_error_flag;
 }
@@ -532,7 +745,7 @@ HYPRE_IJVectorRead( const char     *filename,
 
    hypre_MPI_Comm_rank(comm, &myid);
 
-   hypre_sprintf(new_filename,"%s.%05d", filename, myid);
+   hypre_sprintf(new_filename, "%s.%05d", filename, myid);
 
    if ((file = fopen(new_filename, "r")) == NULL)
    {
@@ -577,6 +790,19 @@ HYPRE_IJVectorRead( const char     *filename,
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ * HYPRE_IJVectorReadBinary
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_IJVectorReadBinary( const char     *filename,
+                          MPI_Comm        comm,
+                          HYPRE_Int       type,
+                          HYPRE_IJVector *vector_ptr )
+{
+   return hypre_IJVectorReadBinary(comm, filename, type, vector_ptr);
+}
+
 /*--------------------------------------------------------------------------
  * HYPRE_IJVectorPrint
  *--------------------------------------------------------------------------*/
@@ -602,7 +828,7 @@ HYPRE_IJVectorPrint( HYPRE_IJVector  vector,
    comm = hypre_IJVectorComm(vector);
    hypre_MPI_Comm_rank(comm, &myid);
 
-   hypre_sprintf(new_filename,"%s.%05d", filename, myid);
+   hypre_sprintf(new_filename, "%s.%05d", filename, myid);
 
    if ((file = fopen(new_filename, "w")) == NULL)
    {
@@ -636,7 +862,7 @@ HYPRE_IJVectorPrint( HYPRE_IJVector  vector,
 
    for (j = jlower; j <= jupper; j++)
    {
-      hypre_fprintf(file, "%b %.14e\n", j, values[j-jlower]);
+      hypre_fprintf(file, "%b %.14e\n", j, values[j - jlower]);
    }
 
    hypre_TFree(d_values, memory_location);
@@ -646,3 +872,108 @@ HYPRE_IJVectorPrint( HYPRE_IJVector  vector,
 
    return hypre_error_flag;
 }
+
+/*--------------------------------------------------------------------------
+ * HYPRE_IJVectorPrintBinary
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_IJVectorPrintBinary( HYPRE_IJVector  vector,
+                           const char     *filename )
+{
+   if (!vector)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   if (hypre_IJVectorObjectType(vector) == HYPRE_PARCSR)
+   {
+      hypre_ParVectorPrintBinaryIJ((hypre_ParVector*) hypre_IJVectorObject(vector),
+                                   filename);
+   }
+   else
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_IJVectorInnerProd
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_IJVectorInnerProd( HYPRE_IJVector  x,
+                         HYPRE_IJVector  y,
+                         HYPRE_Real     *prod )
+{
+   hypre_IJVector *xvec = (hypre_IJVector *) x;
+   hypre_IJVector *yvec = (hypre_IJVector *) y;
+
+   if (!xvec)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   if (!yvec)
+   {
+      hypre_error_in_arg(2);
+      return hypre_error_flag;
+   }
+
+   if (hypre_IJVectorObjectType(xvec) != hypre_IJVectorObjectType(yvec))
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Input vectors don't have the same object type!");
+      return hypre_error_flag;
+   }
+
+   if (hypre_IJVectorObjectType(xvec) == HYPRE_PARCSR)
+   {
+      hypre_ParVector *par_x = (hypre_ParVector*) hypre_IJVectorObject(xvec);
+      hypre_ParVector *par_y = (hypre_ParVector*) hypre_IJVectorObject(yvec);
+
+      HYPRE_ParVectorInnerProd(par_x, par_y, prod);
+   }
+   else
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_IJVectorMigrate
+ *
+ * Migrates an IJVector to the specified memory location
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_IJVectorMigrate(HYPRE_IJVector       vector,
+                      HYPRE_MemoryLocation memory_location)
+{
+   hypre_IJVector *ijvector = (hypre_IJVector *) vector;
+
+   if (!ijvector)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   /* Only implemented for ParVector */
+   if (hypre_IJVectorObjectType(ijvector) == HYPRE_PARCSR)
+   {
+      hypre_IJVectorMigrateParCSR(ijvector, memory_location);
+   }
+   else
+   {
+      hypre_error_in_arg(1);
+   }
+
+   return hypre_error_flag;
+}
diff --git a/external/hypre/src/IJ_mv/HYPRE_IJ_mv.h b/external/hypre/src/IJ_mv/HYPRE_IJ_mv.h
index 19da9412..1295faf6 100644
--- a/external/hypre/src/IJ_mv/HYPRE_IJ_mv.h
+++ b/external/hypre/src/IJ_mv/HYPRE_IJ_mv.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -21,11 +21,9 @@ extern "C" {
 /**
  * @defgroup IJSystemInterface IJ System Interface
  *
- * This interface represents a linear-algebraic conceptual view of a
- * linear system.  The 'I' and 'J' in the name are meant to be
- * mnemonic for the traditional matrix notation A(I,J).
- *
- * @memo A linear-algebraic conceptual interface
+ * A linear-algebraic conceptual interface. This interface represents a
+ * linear-algebraic conceptual view of a linear system.  The 'I' and 'J' in the
+ * name are meant to be mnemonic for the traditional matrix notation A(I,J).
  *
  * @{
  **/
@@ -132,15 +130,15 @@ HYPRE_Int HYPRE_IJMatrixSetValues(HYPRE_IJMatrix       matrix,
                                   const HYPRE_Complex *values);
 
 /**
- * Sets all  matrix coefficients of an already assembled matrix to
+ * Sets all matrix coefficients of an already assembled matrix to
  * \e value
  **/
 HYPRE_Int HYPRE_IJMatrixSetConstantValues(HYPRE_IJMatrix matrix,
                                           HYPRE_Complex value);
 
 /**
- * Adds to values for \e nrows rows or partial rows of the matrix.  
- * Usage details are analogous to \ref HYPRE_IJMatrixSetValues.  
+ * Adds to values for \e nrows rows or partial rows of the matrix.
+ * Usage details are analogous to \ref HYPRE_IJMatrixSetValues.
  * Adds to any previous values at the specified locations, or, if
  * there was no value there before, inserts a new one.
  * AddToValues can be used to add to values on other processors.
@@ -179,7 +177,7 @@ HYPRE_Int HYPRE_IJMatrixSetValues2(HYPRE_IJMatrix       matrix,
                                    const HYPRE_Complex *values);
 
 /**
- * Adds to values for \e nrows rows or partial rows of the matrix.  
+ * Adds to values for \e nrows rows or partial rows of the matrix.
  *
  * Same as IJMatrixAddToValues, but with an additional \e row_indexes array
  * that provides indexes into the \e cols and \e values arrays.  Because
@@ -210,7 +208,7 @@ HYPRE_Int HYPRE_IJMatrixGetRowCounts(HYPRE_IJMatrix  matrix,
                                      HYPRE_Int      *ncols);
 
 /**
- * Gets values for \e nrows rows or partial rows of the matrix.  
+ * Gets values for \e nrows rows or partial rows of the matrix.
  * Usage details are mostly
  * analogous to \ref HYPRE_IJMatrixSetValues.
  * Note that if nrows is negative, the routine will return
@@ -224,6 +222,37 @@ HYPRE_Int HYPRE_IJMatrixGetValues(HYPRE_IJMatrix  matrix,
                                   HYPRE_BigInt   *cols,
                                   HYPRE_Complex  *values);
 
+/**
+ * Gets values for \e nrows rows or partial rows of the matrix.
+ *
+ * Same as IJMatrixGetValues, but with an additional \e row_indexes array
+ * that provides indexes into the \e cols and \e values arrays.  Because
+ * of this, there can be gaps between the row data in these latter two arrays.
+ *
+ **/
+HYPRE_Int HYPRE_IJMatrixGetValues2(HYPRE_IJMatrix  matrix,
+                                   HYPRE_Int       nrows,
+                                   HYPRE_Int      *ncols,
+                                   HYPRE_BigInt   *rows,
+                                   HYPRE_Int      *row_indexes,
+                                   HYPRE_BigInt   *cols,
+                                   HYPRE_Complex  *values);
+
+/**
+ * Gets values for \e nrows rows or partial rows of the matrix
+ * and zeros out those entries in the matrix.
+ *
+ * Same as IJMatrixGetValues2, but zeros out the entries after getting them.
+ *
+ **/
+HYPRE_Int HYPRE_IJMatrixGetValuesAndZeroOut(HYPRE_IJMatrix  matrix,
+                                            HYPRE_Int       nrows,
+                                            HYPRE_Int      *ncols,
+                                            HYPRE_BigInt   *rows,
+                                            HYPRE_Int      *row_indexes,
+                                            HYPRE_BigInt   *cols,
+                                            HYPRE_Complex  *values);
+
 /**
  * Set the storage type of the matrix object to be constructed.
  * Currently, \e type can only be \c HYPRE_PARCSR.
@@ -251,6 +280,24 @@ HYPRE_Int HYPRE_IJMatrixGetLocalRange(HYPRE_IJMatrix  matrix,
                                       HYPRE_BigInt   *jlower,
                                       HYPRE_BigInt   *jupper);
 
+/**
+ * Gets global information about the matrix, including the total number of rows,
+ * columns, and nonzero elements across all processes.
+ *
+ * @param matrix The IJMatrix object to query.
+ * @param global_num_rows Pointer to store the total number of rows in the matrix.
+ * @param global_num_cols Pointer to store the total number of columns in the matrix.
+ * @param global_num_nonzeros Pointer to store the total number of nonzero elements in the matrix.
+ *
+ * @return HYPRE_Int Error code.
+ *
+ * Collective (must be called by all processes).
+ **/
+HYPRE_Int HYPRE_IJMatrixGetGlobalInfo(HYPRE_IJMatrix  matrix,
+                                      HYPRE_BigInt   *global_num_rows,
+                                      HYPRE_BigInt   *global_num_cols,
+                                      HYPRE_BigInt   *global_num_nonzeros);
+
 /**
  * Get a reference to the constructed matrix object.
  *
@@ -297,6 +344,32 @@ HYPRE_Int HYPRE_IJMatrixSetDiagOffdSizes(HYPRE_IJMatrix   matrix,
 HYPRE_Int HYPRE_IJMatrixSetMaxOffProcElmts(HYPRE_IJMatrix matrix,
                                            HYPRE_Int      max_off_proc_elmts);
 
+/**
+ * (Optional, GPU only) Sets the initial memory allocation for matrix
+ * assemble, which factor * local number of rows
+ * Not collective.
+ **/
+HYPRE_Int HYPRE_IJMatrixSetInitAllocation(HYPRE_IJMatrix matrix,
+                                          HYPRE_Int      factor);
+
+/**
+ * (Optional, GPU only) Sets if matrix assemble routine does reductions
+ * during the accumulation of the entries before calling HYPRE_IJMatrixAssemble.
+ * This early assemble feature may save the peak memory usage but requires
+ * extra work.
+ * Not collective.
+ **/
+HYPRE_Int HYPRE_IJMatrixSetEarlyAssemble(HYPRE_IJMatrix matrix,
+                                         HYPRE_Int      early_assemble);
+
+/**
+ * (Optional, GPU only) Sets the grow factor of memory in matrix assemble when
+ * running out of memory.
+ * Not collective.
+ **/
+HYPRE_Int HYPRE_IJMatrixSetGrowFactor(HYPRE_IJMatrix matrix,
+                                      HYPRE_Real     factor);
+
 /**
  * (Optional) Sets the print level, if the user wants to print
  * error messages. The default is 0, i.e. no error messages are printed.
@@ -332,11 +405,63 @@ HYPRE_Int HYPRE_IJMatrixRead(const char     *filename,
                              HYPRE_IJMatrix *matrix);
 
 /**
- * Print the matrix to file.  This is mainly for debugging purposes.
+ * Read the matrix from MM file.  This is mainly for debugging purposes.
+ **/
+HYPRE_Int HYPRE_IJMatrixReadMM(const char     *filename,
+                               MPI_Comm        comm,
+                               HYPRE_Int       type,
+                               HYPRE_IJMatrix *matrix);
+
+/**
+ * Print the matrix to file. This is mainly for debugging purposes.
  **/
 HYPRE_Int HYPRE_IJMatrixPrint(HYPRE_IJMatrix  matrix,
                               const char     *filename);
 
+/**
+ * Transpose an IJMatrix.
+ **/
+HYPRE_Int
+HYPRE_IJMatrixTranspose( HYPRE_IJMatrix  matrix_A,
+                         HYPRE_IJMatrix *matrix_AT );
+
+/**
+ * Computes the infinity norm of an IJMatrix
+ **/
+HYPRE_Int
+HYPRE_IJMatrixNorm( HYPRE_IJMatrix  matrix,
+                    HYPRE_Real     *norm );
+
+/**
+ * Performs C = alpha*A + beta*B
+ **/
+HYPRE_Int
+HYPRE_IJMatrixAdd( HYPRE_Complex    alpha,
+                   HYPRE_IJMatrix   matrix_A,
+                   HYPRE_Complex    beta,
+                   HYPRE_IJMatrix   matrix_B,
+                   HYPRE_IJMatrix  *matrix_C );
+
+/**
+ * Print the matrix to file in binary format. This is mainly for debugging purposes.
+ **/
+HYPRE_Int HYPRE_IJMatrixPrintBinary(HYPRE_IJMatrix  matrix,
+                                    const char     *filename);
+
+/**
+ * Read the matrix from file stored in binary format.  This is mainly for debugging purposes.
+ **/
+HYPRE_Int HYPRE_IJMatrixReadBinary(const char     *filename,
+                                   MPI_Comm        comm,
+                                   HYPRE_Int       type,
+                                   HYPRE_IJMatrix *matrix_ptr);
+
+/**
+ * Migrate the matrix to a given memory location.
+ **/
+HYPRE_Int HYPRE_IJMatrixMigrate(HYPRE_IJMatrix       matrix,
+                                HYPRE_MemoryLocation memory_location);
+
 /**@}*/
 
 /*--------------------------------------------------------------------------
@@ -382,7 +507,30 @@ HYPRE_Int HYPRE_IJVectorCreate(MPI_Comm        comm,
 HYPRE_Int HYPRE_IJVectorDestroy(HYPRE_IJVector vector);
 
 /**
- * Prepare a vector object for setting coefficient values.  This
+ * This function should be called before `HYPRE_IJVectorSetData`
+ * if users intend to reuse an existing data pointer, thereby avoiding
+ * unnecessary memory copies. It configures the vector to accept external
+ * data without allocating new storage.
+ **/
+HYPRE_Int HYPRE_IJVectorInitializeShell(HYPRE_IJVector vector);
+
+/**
+ * This function sets the internal data pointer of the vector to an external
+ * array, allowing direct control over the vector's data storage without
+ * transferring ownership. Users are responsible for managing the memory
+ * of the `data` array, which must remain valid for the vector's lifetime.
+ *
+ * Users should call `HYPRE_IJVectorInitializeShell` before this function
+ * to prepare the vector for external data. The memory location of the `data`
+ * array is expected to be on the host when hypre is configured without GPU
+ * support. If hypre is configured with GPU support, it is assumed that `data`
+ * resides in device memory.
+ **/
+HYPRE_Int HYPRE_IJVectorSetData(HYPRE_IJVector  vector,
+                                HYPRE_Complex  *data);
+
+/**
+ * Prepare a vector object for setting coefficient values. This
  * routine will also re-initialize an already assembled vector,
  * allowing users to modify coefficient values.
  **/
@@ -394,7 +542,8 @@ HYPRE_Int HYPRE_IJVectorInitialize(HYPRE_IJVector vector);
  * allowing users to modify coefficient values. This routine
  * also specifies the memory location, i.e. host or device.
  **/
-HYPRE_Int HYPRE_IJVectorInitialize_v2( HYPRE_IJVector vector, HYPRE_MemoryLocation memory_location );
+HYPRE_Int HYPRE_IJVectorInitialize_v2( HYPRE_IJVector vector,
+                                       HYPRE_MemoryLocation memory_location );
 
 /**
  * (Optional) Sets the maximum number of elements that are expected to be set
@@ -407,6 +556,21 @@ HYPRE_Int HYPRE_IJVectorInitialize_v2( HYPRE_IJVector vector, HYPRE_MemoryLocati
 HYPRE_Int HYPRE_IJVectorSetMaxOffProcElmts(HYPRE_IJVector vector,
                                            HYPRE_Int      max_off_proc_elmts);
 
+/**
+ * (Optional) Sets the number of components (vectors) of a multivector. A vector
+ * is assumed to have a single component when this function is not called.
+ * This function must be called prior to HYPRE_IJVectorInitialize.
+ **/
+HYPRE_Int HYPRE_IJVectorSetNumComponents(HYPRE_IJVector  vector,
+                                         HYPRE_Int       num_components);
+
+/**
+ * (Optional) Sets the component identifier of a vector with multiple components (multivector).
+ * This can be used for Set/AddTo/Get purposes.
+ **/
+HYPRE_Int HYPRE_IJVectorSetComponent(HYPRE_IJVector  vector,
+                                     HYPRE_Int       component);
+
 /**
  * Sets values in vector.  The arrays \e values and \e indices
  * are of dimension \e nvalues and contain the vector values to be
@@ -425,6 +589,12 @@ HYPRE_Int HYPRE_IJVectorSetValues(HYPRE_IJVector       vector,
                                   const HYPRE_BigInt  *indices,
                                   const HYPRE_Complex *values);
 
+/**
+ * Sets all vector coefficients to \e value
+ **/
+HYPRE_Int HYPRE_IJVectorSetConstantValues(HYPRE_IJVector vector,
+                                          HYPRE_Complex  value);
+
 /**
  * Adds to values in vector.  Usage details are analogous to
  * \ref HYPRE_IJVectorSetValues.
@@ -444,6 +614,20 @@ HYPRE_Int HYPRE_IJVectorAddToValues(HYPRE_IJVector       vector,
  **/
 HYPRE_Int HYPRE_IJVectorAssemble(HYPRE_IJVector vector);
 
+/**
+ * Update vectors by setting (action 1) or
+ * adding to (action 0) values in 'vector'.
+ * Note that this function cannot update values owned by other processes
+ * and does not allow repeated index values in 'indices'.
+ *
+ * Not collective.
+ **/
+HYPRE_Int HYPRE_IJVectorUpdateValues(HYPRE_IJVector       vector,
+                                     HYPRE_Int            nvalues,
+                                     const HYPRE_BigInt  *indices,
+                                     const HYPRE_Complex *values,
+                                     HYPRE_Int            action);
+
 /**
  * Gets values in vector.  Usage details are analogous to
  * \ref HYPRE_IJVectorSetValues.
@@ -503,12 +687,39 @@ HYPRE_Int HYPRE_IJVectorRead(const char     *filename,
                              HYPRE_Int       type,
                              HYPRE_IJVector *vector);
 
+/**
+ * Read the vector from binary file.  This is mainly for debugging purposes.
+ **/
+HYPRE_Int HYPRE_IJVectorReadBinary(const char     *filename,
+                                   MPI_Comm        comm,
+                                   HYPRE_Int       type,
+                                   HYPRE_IJVector *vector);
+
 /**
  * Print the vector to file.  This is mainly for debugging purposes.
  **/
 HYPRE_Int HYPRE_IJVectorPrint(HYPRE_IJVector  vector,
                               const char     *filename);
 
+/**
+ * Print the vector to binary file.  This is mainly for debugging purposes.
+ **/
+HYPRE_Int HYPRE_IJVectorPrintBinary(HYPRE_IJVector  vector,
+                                    const char     *filename);
+
+/**
+ * Computes the inner product between two vectors
+ **/
+HYPRE_Int HYPRE_IJVectorInnerProd(HYPRE_IJVector  x,
+                                  HYPRE_IJVector  y,
+                                  HYPRE_Real     *prod);
+
+/**
+ * Migrate the vector to a given memory location.
+ **/
+HYPRE_Int HYPRE_IJVectorMigrate(HYPRE_IJVector       vector,
+                                HYPRE_MemoryLocation memory_location);
+
 /**@}*/
 /**@}*/
 
diff --git a/external/hypre/src/IJ_mv/IJMatrix.c b/external/hypre/src/IJ_mv/IJMatrix.c
index 1dc6d483..8d3c77d0 100644
--- a/external/hypre/src/IJ_mv/IJMatrix.c
+++ b/external/hypre/src/IJ_mv/IJMatrix.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -11,36 +11,32 @@
  *
  *****************************************************************************/
 
-#include "./_hypre_IJ_mv.h"
-
+#include "_hypre_IJ_mv.h"
 #include "../HYPRE.h"
 
 /*--------------------------------------------------------------------------
  * hypre_IJMatrixGetRowPartitioning
+ *
+ * Returns a pointer to the row partitioning of an IJMatrix
  *--------------------------------------------------------------------------*/
 
-/**
-Returns a pointer to the row partitioning
-
-@return integer error code
-@param IJMatrix [IN]
-The ijmatrix to be pointed to.
-*/
-
 HYPRE_Int
-hypre_IJMatrixGetRowPartitioning( HYPRE_IJMatrix matrix ,
+hypre_IJMatrixGetRowPartitioning( HYPRE_IJMatrix matrix,
                                   HYPRE_BigInt **row_partitioning )
 {
    hypre_IJMatrix *ijmatrix = (hypre_IJMatrix *) matrix;
 
    if (!ijmatrix)
    {
-      hypre_error_w_msg(HYPRE_ERROR_GENERIC,"Variable ijmatrix is NULL -- hypre_IJMatrixGetRowPartitioning\n");
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                        "Variable ijmatrix is NULL -- hypre_IJMatrixGetRowPartitioning\n");
       return hypre_error_flag;
    }
 
    if ( hypre_IJMatrixRowPartitioning(ijmatrix))
+   {
       *row_partitioning = hypre_IJMatrixRowPartitioning(ijmatrix);
+   }
    else
    {
       hypre_error(HYPRE_ERROR_GENERIC);
@@ -49,32 +45,30 @@ hypre_IJMatrixGetRowPartitioning( HYPRE_IJMatrix matrix ,
 
    return hypre_error_flag;
 }
+
 /*--------------------------------------------------------------------------
  * hypre_IJMatrixGetColPartitioning
+ *
+ * Returns a pointer to the column partitioning of an IJMatrix
  *--------------------------------------------------------------------------*/
 
-/**
-Returns a pointer to the column partitioning
-
-@return integer error code
-@param IJMatrix [IN]
-The ijmatrix to be pointed to.
-*/
-
 HYPRE_Int
-hypre_IJMatrixGetColPartitioning( HYPRE_IJMatrix matrix ,
+hypre_IJMatrixGetColPartitioning( HYPRE_IJMatrix matrix,
                                   HYPRE_BigInt **col_partitioning )
 {
    hypre_IJMatrix *ijmatrix = (hypre_IJMatrix *) matrix;
 
    if (!ijmatrix)
    {
-      hypre_error_w_msg(HYPRE_ERROR_GENERIC,"Variable ijmatrix is NULL -- hypre_IJMatrixGetColPartitioning\n");
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                        "Variable ijmatrix is NULL -- hypre_IJMatrixGetColPartitioning\n");
       return hypre_error_flag;
    }
 
    if ( hypre_IJMatrixColPartitioning(ijmatrix))
+   {
       *col_partitioning = hypre_IJMatrixColPartitioning(ijmatrix);
+   }
    else
    {
       hypre_error(HYPRE_ERROR_GENERIC);
@@ -83,6 +77,7 @@ hypre_IJMatrixGetColPartitioning( HYPRE_IJMatrix matrix ,
 
    return hypre_error_flag;
 }
+
 /*--------------------------------------------------------------------------
  * hypre_IJMatrixSetObject
  *--------------------------------------------------------------------------*/
@@ -105,3 +100,410 @@ hypre_IJMatrixSetObject( HYPRE_IJMatrix  matrix,
 
    return hypre_error_flag;
 }
+
+/*--------------------------------------------------------------------------
+ * hypre_IJMatrixRead
+ *
+ * Reads a matrix from file, HYPRE's IJ format or MM format. The resulting
+ * IJMatrix is stored on host memory.
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_IJMatrixRead( const char     *filename,
+                    MPI_Comm        comm,
+                    HYPRE_Int       type,
+                    HYPRE_IJMatrix *matrix_ptr,
+                    HYPRE_Int       is_mm )
+{
+   HYPRE_IJMatrix  matrix;
+   HYPRE_BigInt    ilower, iupper, jlower, jupper;
+   HYPRE_BigInt    I, J;
+   HYPRE_Int       ncols;
+   HYPRE_Complex   value;
+   HYPRE_Int       myid, ret;
+   HYPRE_Int       isSym = 0;
+   char            new_filename[255];
+   FILE           *file;
+
+   hypre_MPI_Comm_rank(comm, &myid);
+
+   if (is_mm)
+   {
+      hypre_sprintf(new_filename, "%s", filename);
+   }
+   else
+   {
+      hypre_sprintf(new_filename, "%s.%05d", filename, myid);
+   }
+
+   if ((file = fopen(new_filename, "r")) == NULL)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   if (is_mm)
+   {
+      MM_typecode matcode;
+      HYPRE_Int nrow, ncol, nnz;
+
+      if (hypre_mm_read_banner(file, &matcode) != 0)
+      {
+         hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Could not process Matrix Market banner.");
+         return hypre_error_flag;
+      }
+
+      if (!hypre_mm_is_valid(matcode))
+      {
+         hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Invalid Matrix Market file.");
+         return hypre_error_flag;
+      }
+
+      if ( !( (hypre_mm_is_real(matcode) || hypre_mm_is_integer(matcode)) &&
+              hypre_mm_is_coordinate(matcode) && hypre_mm_is_sparse(matcode) ) )
+      {
+         hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                           "Only sparse real-valued/integer coordinate matrices are supported");
+         return hypre_error_flag;
+      }
+
+      if (hypre_mm_is_symmetric(matcode))
+      {
+         isSym = 1;
+      }
+
+      if (hypre_mm_read_mtx_crd_size(file, &nrow, &ncol, &nnz) != 0)
+      {
+         hypre_error_w_msg(HYPRE_ERROR_GENERIC, "MM read size error !");
+         return hypre_error_flag;
+      }
+
+      ilower = 0;
+      iupper = ilower + nrow - 1;
+      jlower = 0;
+      jupper = jlower + ncol - 1;
+   }
+   else
+   {
+      hypre_fscanf(file, "%b %b %b %b", &ilower, &iupper, &jlower, &jupper);
+   }
+
+   HYPRE_IJMatrixCreate(comm, ilower, iupper, jlower, jupper, &matrix);
+
+   HYPRE_IJMatrixSetObjectType(matrix, type);
+
+   HYPRE_IJMatrixInitialize_v2(matrix, HYPRE_MEMORY_HOST);
+
+   /* It is important to ensure that whitespace follows the index value to help
+    * catch mistakes in the input file.  See comments in IJVectorRead(). */
+   ncols = 1;
+   while ( (ret = hypre_fscanf(file, "%b %b%*[ \t]%le", &I, &J, &value)) != EOF )
+   {
+      if (ret != 3)
+      {
+         hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Error in IJ matrix input file.");
+         return hypre_error_flag;
+      }
+
+      if (is_mm)
+      {
+         I --;
+         J --;
+      }
+
+      if (I < ilower || I > iupper)
+      {
+         HYPRE_IJMatrixAddToValues(matrix, 1, &ncols, &I, &J, &value);
+      }
+      else
+      {
+         HYPRE_IJMatrixSetValues(matrix, 1, &ncols, &I, &J, &value);
+      }
+
+      if (isSym && I != J)
+      {
+         if (J < ilower || J > iupper)
+         {
+            HYPRE_IJMatrixAddToValues(matrix, 1, &ncols, &J, &I, &value);
+         }
+         else
+         {
+            HYPRE_IJMatrixSetValues(matrix, 1, &ncols, &J, &I, &value);
+         }
+      }
+   }
+
+   HYPRE_IJMatrixAssemble(matrix);
+
+   fclose(file);
+
+   *matrix_ptr = matrix;
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_IJMatrixReadBinary
+ *
+ * Reads a matrix from file stored in binary format. The resulting IJMatrix
+ * is stored on host memory. For information about the metadata contents
+ * contained in the file header, see hypre_ParCSRMatrixPrintBinaryIJ.
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_IJMatrixReadBinary( const char      *prefixname,
+                          MPI_Comm         comm,
+                          HYPRE_Int        type,
+                          HYPRE_IJMatrix  *matrix_ptr )
+{
+   HYPRE_IJMatrix  matrix;
+
+   /* Local buffers */
+   hypre_uint32   *i32buffer = NULL;
+   hypre_uint64   *i64buffer = NULL;
+   hypre_float    *f32buffer = NULL;
+   hypre_double   *f64buffer = NULL;
+
+   /* Matrix buffers */
+   HYPRE_Int       num_nonzeros;
+   HYPRE_BigInt   *rows;
+   HYPRE_BigInt   *cols;
+   HYPRE_Complex  *vals;
+
+   /* Local variables */
+   HYPRE_Int       one = 1;
+   HYPRE_Int       myid;
+   char            filename[1024], msg[1024];
+   HYPRE_BigInt    i, ilower, iupper, jlower, jupper;
+   size_t          count;
+   hypre_uint64    header[11];
+   FILE           *fp;
+
+   /* Exit if trying to read from big-endian machine */
+   if ((*(char*)&one) == 0)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Support to big-endian machines is incomplete!");
+      return hypre_error_flag;
+   }
+
+   /* Set filename */
+   hypre_MPI_Comm_rank(comm, &myid);
+   hypre_sprintf(filename, "%s.%05d.bin", prefixname, myid);
+
+   /* Open file */
+   if ((fp = fopen(filename, "rb")) == NULL)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Could not open input file\n");
+      return hypre_error_flag;
+   }
+
+   /*---------------------------------------------
+    * Read header (88 bytes) from file
+    *---------------------------------------------*/
+
+   count = 11;
+   if (fread(header, sizeof(hypre_uint64), count, fp) != count)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Could not read header entries\n");
+      return EXIT_FAILURE;
+   }
+
+   /* Check for header version */
+   if (header[0] != 1)
+   {
+      hypre_sprintf(msg, "Unsupported header version: %d", header[0]);
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, msg);
+      return hypre_error_flag;
+   }
+
+   /* Check for integer overflow */
+   if (header[6] > HYPRE_INT_MAX)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Detected integer overflow at 7th header entry");
+      return hypre_error_flag;
+   }
+   num_nonzeros = (HYPRE_Int) header[6];
+
+   /* Set variables */
+   ilower = (HYPRE_BigInt) header[7];
+   iupper = (HYPRE_BigInt) header[8];
+   jlower = (HYPRE_BigInt) header[9];
+   jupper = (HYPRE_BigInt) header[10];
+
+   /* Allocate memory for row/col buffers */
+   if (header[1] == sizeof(hypre_uint32))
+   {
+      i32buffer = hypre_TAlloc(hypre_uint32, num_nonzeros, HYPRE_MEMORY_HOST);
+   }
+   else if (header[1] == sizeof(hypre_uint64))
+   {
+      i64buffer = hypre_TAlloc(hypre_uint64, num_nonzeros, HYPRE_MEMORY_HOST);
+   }
+   else
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Unsupported data type for row/column indices");
+      return hypre_error_flag;
+   }
+
+   /* Allocate memory for buffers */
+   if (header[2] == sizeof(hypre_float))
+   {
+      f32buffer = hypre_TAlloc(hypre_float, num_nonzeros, HYPRE_MEMORY_HOST);
+   }
+   else if (header[2] == sizeof(hypre_double))
+   {
+      f64buffer = hypre_TAlloc(hypre_double, num_nonzeros, HYPRE_MEMORY_HOST);
+   }
+   else
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Unsupported data type for matrix coefficients");
+      return hypre_error_flag;
+   }
+
+   /*---------------------------------------------
+    * Read indices from file
+    *---------------------------------------------*/
+
+   count = (size_t) num_nonzeros;
+   rows = hypre_TAlloc(HYPRE_BigInt, num_nonzeros, HYPRE_MEMORY_HOST);
+   if (i32buffer)
+   {
+      if (fread(i32buffer, sizeof(hypre_uint32), count, fp) != count)
+      {
+         hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Could not read all row indices");
+         return hypre_error_flag;
+      }
+
+#ifdef HYPRE_USING_OPENMP
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+#endif
+      for (i = 0; i < num_nonzeros; i++)
+      {
+         rows[i] = (HYPRE_BigInt) i32buffer[i];
+      }
+   }
+   else
+   {
+      if (fread(i64buffer, sizeof(hypre_uint64), count, fp) != count)
+      {
+         hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Could not read all row indices");
+         return hypre_error_flag;
+      }
+
+#ifdef HYPRE_USING_OPENMP
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+#endif
+      for (i = 0; i < num_nonzeros; i++)
+      {
+         rows[i] = (HYPRE_BigInt) i64buffer[i];
+      }
+   }
+
+   /*---------------------------------------------
+    * Read column indices from file
+    *---------------------------------------------*/
+
+   count = (size_t) num_nonzeros;
+   cols = hypre_TAlloc(HYPRE_BigInt, num_nonzeros, HYPRE_MEMORY_HOST);
+   if (i32buffer)
+   {
+      if (fread(i32buffer, sizeof(hypre_uint32), count, fp) != count)
+      {
+         hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Could not read all column indices");
+         return hypre_error_flag;
+      }
+
+#ifdef HYPRE_USING_OPENMP
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+#endif
+      for (i = 0; i < num_nonzeros; i++)
+      {
+         cols[i] = (HYPRE_BigInt) i32buffer[i];
+      }
+   }
+   else
+   {
+      if (fread(i64buffer, sizeof(hypre_uint64), count, fp) != count)
+      {
+         hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Could not read all column indices");
+         return hypre_error_flag;
+      }
+
+#ifdef HYPRE_USING_OPENMP
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+#endif
+      for (i = 0; i < num_nonzeros; i++)
+      {
+         cols[i] = (HYPRE_BigInt) i64buffer[i];
+      }
+   }
+
+   /* Free integer buffers */
+   hypre_TFree(i32buffer, HYPRE_MEMORY_HOST);
+   hypre_TFree(i64buffer, HYPRE_MEMORY_HOST);
+
+   /*---------------------------------------------
+    * Read matrix coefficients from file
+    *---------------------------------------------*/
+
+   vals = hypre_TAlloc(HYPRE_Complex, num_nonzeros, HYPRE_MEMORY_HOST);
+   if (f32buffer)
+   {
+      if (fread(f32buffer, sizeof(hypre_float), count, fp) != count)
+      {
+         hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Could not read all matrix coefficients");
+         return hypre_error_flag;
+      }
+
+#ifdef HYPRE_USING_OPENMP
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+#endif
+      for (i = 0; i < num_nonzeros; i++)
+      {
+         vals[i] = (HYPRE_Complex) f32buffer[i];
+      }
+   }
+   else
+   {
+      if (fread(f64buffer, sizeof(hypre_double), count, fp) != count)
+      {
+         hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Could not read all matrix coefficients");
+         return hypre_error_flag;
+      }
+
+#ifdef HYPRE_USING_OPENMP
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+#endif
+      for (i = 0; i < num_nonzeros; i++)
+      {
+         vals[i] = (HYPRE_Complex) f64buffer[i];
+      }
+   }
+
+   /* Close file stream */
+   fclose(fp);
+
+   /* Free floating-point buffers */
+   hypre_TFree(f32buffer, HYPRE_MEMORY_HOST);
+   hypre_TFree(f64buffer, HYPRE_MEMORY_HOST);
+
+   /*---------------------------------------------
+    * Build IJMatrix
+    *---------------------------------------------*/
+
+   HYPRE_IJMatrixCreate(comm, ilower, iupper, jlower, jupper, &matrix);
+   HYPRE_IJMatrixSetObjectType(matrix, type);
+   HYPRE_IJMatrixInitialize_v2(matrix, HYPRE_MEMORY_HOST);
+   HYPRE_IJMatrixSetValues(matrix, num_nonzeros, NULL, rows, cols, vals);
+   HYPRE_IJMatrixAssemble(matrix);
+
+   /* Set output pointer */
+   *matrix_ptr = matrix;
+
+   /* Free memory */
+   hypre_TFree(rows, HYPRE_MEMORY_HOST);
+   hypre_TFree(cols, HYPRE_MEMORY_HOST);
+   hypre_TFree(vals, HYPRE_MEMORY_HOST);
+
+   return hypre_error_flag;
+}
diff --git a/external/hypre/src/IJ_mv/IJMatrix_isis.c b/external/hypre/src/IJ_mv/IJMatrix_isis.c
index 3feddd55..543f388d 100644
--- a/external/hypre/src/IJ_mv/IJMatrix_isis.c
+++ b/external/hypre/src/IJ_mv/IJMatrix_isis.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -10,7 +10,7 @@
  * IJMatrix_ISIS interface
  *
  *****************************************************************************/
- 
+
 #include "_hypre_IJ_mv.h"
 
 /******************************************************************************
@@ -24,8 +24,8 @@
 
 HYPRE_Int
 hypre_IJMatrixSetLocalSizeISIS(hypre_IJMatrix *matrix,
-			       HYPRE_Int       local_m,
-			       HYPRE_Int       local_n)
+                               HYPRE_Int       local_m,
+                               HYPRE_Int       local_n)
 {
    HYPRE_Int ierr = 0;
    hypre_AuxParCSRMatrix *aux_data;
@@ -37,8 +37,8 @@ hypre_IJMatrixSetLocalSizeISIS(hypre_IJMatrix *matrix,
    }
    else
    {
-      hypre_IJMatrixTranslator(matrix) = 
-			hypre_AuxParCSRMatrixCreate(local_m,local_n,NULL);
+      hypre_IJMatrixTranslator(matrix) =
+         hypre_AuxParCSRMatrixCreate(local_m, local_n, NULL);
    }
    return ierr;
 }
@@ -57,11 +57,11 @@ HYPRE_Int
 hypre_IJMatrixCreateISIS(hypre_IJMatrix *matrix)
 {
    MPI_Comm comm = hypre_IJMatrixContext(matrix);
-   HYPRE_BigInt global_m = hypre_IJMatrixM(matrix); 
-   HYPRE_BigInt global_n = hypre_IJMatrixN(matrix); 
+   HYPRE_BigInt global_m = hypre_IJMatrixM(matrix);
+   HYPRE_BigInt global_n = hypre_IJMatrixN(matrix);
    hypre_AuxParCSRMatrix *aux_matrix = hypre_IJMatrixTranslator(matrix);
-   HYPRE_Int local_m;   
-   HYPRE_Int local_n;   
+   HYPRE_Int local_m;
+   HYPRE_Int local_n;
    HYPRE_Int ierr = 0;
 
 
@@ -78,12 +78,12 @@ hypre_IJMatrixCreateISIS(hypre_IJMatrix *matrix)
 
    if (aux_matrix)
    {
-      local_m = hypre_AuxParCSRMatrixLocalNumRows(aux_matrix);   
+      local_m = hypre_AuxParCSRMatrixLocalNumRows(aux_matrix);
       local_n = hypre_AuxParCSRMatrixLocalNumCols(aux_matrix);
    }
    else
    {
-      aux_matrix = hypre_AuxParCSRMatrixCreate(-1,-1,NULL);
+      aux_matrix = hypre_AuxParCSRMatrixCreate(-1, -1, NULL);
       local_m = -1;
       local_n = -1;
       hypre_IJMatrixTranslator(matrix) = aux_matrix;
@@ -95,7 +95,7 @@ hypre_IJMatrixCreateISIS(hypre_IJMatrix *matrix)
    }
    else
    {
-      row_starts = hypre_CTAlloc(HYPRE_Int, num_procs+1, HYPRE_MEMORY_HOST);
+      row_starts = hypre_CTAlloc(HYPRE_Int, num_procs + 1, HYPRE_MEMORY_HOST);
 
       if (my_id == 0 && (HYPRE_BigInt)local_m == global_m)
       {
@@ -104,7 +104,7 @@ hypre_IJMatrixCreateISIS(hypre_IJMatrix *matrix)
       else
       {
          HYPRE_BigInt big_local_m = (HYPRE_BigInt) local_m;
-         hypre_MPI_Allgather(&big_local_m,1,HYPRE_MPI_BIG_INT,&row_starts[1],1,HYPRE_MPI_BIG_INT,comm);
+         hypre_MPI_Allgather(&big_local_m, 1, HYPRE_MPI_BIG_INT, &row_starts[1], 1, HYPRE_MPI_BIG_INT, comm);
       }
 
    }
@@ -114,7 +114,7 @@ hypre_IJMatrixCreateISIS(hypre_IJMatrix *matrix)
    }
    else
    {
-      col_starts = hypre_CTAlloc(HYPRE_Int, num_procs+1, HYPRE_MEMORY_HOST);
+      col_starts = hypre_CTAlloc(HYPRE_Int, num_procs + 1, HYPRE_MEMORY_HOST);
 
       if (my_id == 0 && local_n == global_n)
       {
@@ -123,19 +123,21 @@ hypre_IJMatrixCreateISIS(hypre_IJMatrix *matrix)
       else
       {
          HYPRE_BigInt big_local_n = (HYPRE_BigInt) local_n;
-         hypre_MPI_Allgather(&big_local_n,1,HYPRE_MPI_BIG_INT,&col_starts[1],1,HYPRE_MPI_BIG_INT,comm);
+         hypre_MPI_Allgather(&big_local_n, 1, HYPRE_MPI_BIG_INT, &col_starts[1], 1, HYPRE_MPI_BIG_INT, comm);
       }
    }
 
    if (row_starts && col_starts)
    {
       equal = 1;
-      for (i=0; i < num_procs; i++)
+      for (i = 0; i < num_procs; i++)
       {
-         row_starts[i+1] += row_starts[i];
-         col_starts[i+1] += col_starts[i];
-         if (row_starts[i+1] != col_starts[i+1])
-	 equal = 0;
+         row_starts[i + 1] += row_starts[i];
+         col_starts[i + 1] += col_starts[i];
+         if (row_starts[i + 1] != col_starts[i + 1])
+         {
+            equal = 0;
+         }
       }
       if (equal)
       {
@@ -144,9 +146,9 @@ hypre_IJMatrixCreateISIS(hypre_IJMatrix *matrix)
       }
    }
 
-   hypre_IJMatrixLocalStorage(matrix) = hypre_ParCSRMatrixCreate(comm,global_m,
-		global_n,row_starts, col_starts, num_cols_offd, 
-		num_nonzeros_diag, num_nonzeros_offd);
+   hypre_IJMatrixLocalStorage(matrix) = hypre_ParCSRMatrixCreate(comm, global_m,
+                                                                 global_n, row_starts, col_starts, num_cols_offd,
+                                                                 num_nonzeros_diag, num_nonzeros_offd);
    return ierr;
 }
 
@@ -157,7 +159,7 @@ hypre_IJMatrixCreateISIS(hypre_IJMatrix *matrix)
  *****************************************************************************/
 HYPRE_Int
 hypre_IJMatrixSetRowSizesISIS(hypre_IJMatrix *matrix,
-			      HYPRE_Int	       *sizes)
+                              HYPRE_Int          *sizes)
 {
    HYPRE_Int *row_space;
    HYPRE_Int local_num_rows;
@@ -165,15 +167,23 @@ hypre_IJMatrixSetRowSizesISIS(hypre_IJMatrix *matrix,
    hypre_AuxParCSRMatrix *aux_matrix;
    aux_matrix = hypre_IJMatrixTranslator(matrix);
    if (aux_matrix)
+   {
       local_num_rows = hypre_AuxParCSRMatrixLocalNumRows(aux_matrix);
+   }
    else
+   {
       return -1;
-   
+   }
+
    row_space =  hypre_AuxParCSRMatrixRowSpace(aux_matrix);
    if (!row_space)
+   {
       row_space = hypre_CTAlloc(HYPRE_Int,  local_num_rows, HYPRE_MEMORY_HOST);
+   }
    for (i = 0; i < local_num_rows; i++)
+   {
       row_space[i] = sizes[i];
+   }
    hypre_AuxParCSRMatrixRowSpace(aux_matrix) = row_space;
    return 0;
 }
@@ -187,7 +197,7 @@ hypre_IJMatrixSetRowSizesISIS(hypre_IJMatrix *matrix,
  *****************************************************************************/
 HYPRE_Int
 hypre_IJMatrixSetDiagRowSizesISIS(hypre_IJMatrix *matrix,
-			      	    HYPRE_Int	           *sizes)
+                                  HYPRE_Int             *sizes)
 {
    HYPRE_Int local_num_rows;
    HYPRE_Int i;
@@ -196,15 +206,21 @@ hypre_IJMatrixSetDiagRowSizesISIS(hypre_IJMatrix *matrix,
    HYPRE_Int *diag_i;
    par_matrix = hypre_IJMatrixLocalStorage(matrix);
    if (!par_matrix)
+   {
       return -1;
-   
+   }
+
    diag =  hypre_ParCSRMatrixDiag(par_matrix);
    diag_i =  hypre_CSRMatrixI(diag);
    local_num_rows = hypre_CSRMatrixNumRows(diag);
    if (!diag_i)
-      diag_i = hypre_CTAlloc(HYPRE_Int,  local_num_rows+1, HYPRE_MEMORY_HOST);
-   for (i = 0; i < local_num_rows+1; i++)
+   {
+      diag_i = hypre_CTAlloc(HYPRE_Int,  local_num_rows + 1, HYPRE_MEMORY_HOST);
+   }
+   for (i = 0; i < local_num_rows + 1; i++)
+   {
       diag_i[i] = sizes[i];
+   }
    hypre_CSRMatrixI(diag) = diag_i;
    hypre_CSRMatrixNumNonzeros(diag) = diag_i[local_num_rows];
    return 0;
@@ -219,7 +235,7 @@ hypre_IJMatrixSetDiagRowSizesISIS(hypre_IJMatrix *matrix,
  *****************************************************************************/
 HYPRE_Int
 hypre_IJMatrixSetOffDiagRowSizesISIS(hypre_IJMatrix *matrix,
-			      	     HYPRE_Int	      *sizes)
+                                     HYPRE_Int       *sizes)
 {
    HYPRE_Int local_num_rows;
    HYPRE_Int i;
@@ -228,15 +244,21 @@ hypre_IJMatrixSetOffDiagRowSizesISIS(hypre_IJMatrix *matrix,
    HYPRE_Int *offd_i;
    par_matrix = hypre_IJMatrixLocalStorage(matrix);
    if (!par_matrix)
+   {
       return -1;
-   
+   }
+
    offd =  hypre_ParCSRMatrixOffd(par_matrix);
    offd_i =  hypre_CSRMatrixI(offd);
    local_num_rows = hypre_CSRMatrixNumRows(offd);
    if (!offd_i)
-      offd_i = hypre_CTAlloc(HYPRE_Int,  local_num_rows+1, HYPRE_MEMORY_HOST);
-   for (i = 0; i < local_num_rows+1; i++)
+   {
+      offd_i = hypre_CTAlloc(HYPRE_Int,  local_num_rows + 1, HYPRE_MEMORY_HOST);
+   }
+   for (i = 0; i < local_num_rows + 1; i++)
+   {
       offd_i[i] = sizes[i];
+   }
    hypre_CSRMatrixI(offd) = offd_i;
    hypre_CSRMatrixNumNonzeros(offd) = offd_i[local_num_rows];
    return 0;
@@ -265,16 +287,16 @@ hypre_IJMatrixInitializeISIS(hypre_IJMatrix *matrix)
    MPI_Comm  comm = hypre_IJMatrixContext(matrix);
    HYPRE_BigInt global_num_rows = hypre_IJMatrixM(matrix);
 
-   hypre_MPI_Comm_size(comm,&num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
-   
-   local_nnz = (num_nonzeros/global_num_rows+1)*local_num_rows;
+   hypre_MPI_Comm_size(comm, &num_procs);
+   hypre_MPI_Comm_rank(comm, &my_id);
+
+   local_nnz = (num_nonzeros / global_num_rows + 1) * local_num_rows;
    if (local_num_rows < 0)
-      hypre_AuxParCSRMatrixLocalNumRows(aux_matrix) = 
-		hypre_CSRMatrixNumRows(hypre_ParCSRMatrixDiag(par_matrix));
+      hypre_AuxParCSRMatrixLocalNumRows(aux_matrix) =
+         hypre_CSRMatrixNumRows(hypre_ParCSRMatrixDiag(par_matrix));
    if (local_num_cols < 0)
-      hypre_AuxParCSRMatrixLocalNumCols(aux_matrix) = 
-		hypre_CSRMatrixNumCols(hypre_ParCSRMatrixDiag(par_matrix));
+      hypre_AuxParCSRMatrixLocalNumCols(aux_matrix) =
+         hypre_CSRMatrixNumCols(hypre_ParCSRMatrixDiag(par_matrix));
    ierr = hypre_AuxParCSRMatrixInitialize(aux_matrix);
    ierr += hypre_ParCSRMatrixBigInitialize(par_matrix);
    return ierr;
@@ -290,18 +312,18 @@ hypre_IJMatrixInitializeISIS(hypre_IJMatrix *matrix)
  *****************************************************************************/
 HYPRE_Int
 hypre_IJMatrixInsertBlockISIS(hypre_IJMatrix *matrix,
-		       	      HYPRE_Int	        m,
-		              HYPRE_Int	        n,
-		              HYPRE_BigInt	*rows,
-		              HYPRE_BigInt	*cols,
-		              HYPRE_Complex	*coeffs)
+                              HYPRE_Int           m,
+                              HYPRE_Int         n,
+                              HYPRE_BigInt *rows,
+                              HYPRE_BigInt *cols,
+                              HYPRE_Complex   *coeffs)
 {
    HYPRE_Int ierr = 0;
    HYPRE_Int i, in;
-   for (i=0; i < m; i++)
+   for (i = 0; i < m; i++)
    {
-      in = i*n;
-      hypre_IJMatrixInsertRowISIS(matrix,n,rows[i],&cols[in],&coeffs[in]);
+      in = i * n;
+      hypre_IJMatrixInsertRowISIS(matrix, n, rows[i], &cols[in], &coeffs[in]);
    }
    return ierr;
 }
@@ -316,18 +338,18 @@ hypre_IJMatrixInsertBlockISIS(hypre_IJMatrix *matrix,
 
 HYPRE_Int
 hypre_IJMatrixAddToBlockISIS(hypre_IJMatrix *matrix,
-		       	       HYPRE_Int	       m,
-		               HYPRE_Int	       n,
-		               HYPRE_BigInt	      *rows,
-		               HYPRE_BigInt	      *cols,
-		               HYPRE_Complex	      *coeffs)
+                             HYPRE_Int         m,
+                             HYPRE_Int          n,
+                             HYPRE_BigInt         *rows,
+                             HYPRE_BigInt         *cols,
+                             HYPRE_Complex        *coeffs)
 {
    HYPRE_Int ierr = 0;
    HYPRE_Int i, in;
-   for (i=0; i < m; i++)
+   for (i = 0; i < m; i++)
    {
-      in = i*n;
-      hypre_IJMatrixAddToRowISIS(matrix,n,rows[i],&cols[in],&coeffs[in]);
+      in = i * n;
+      hypre_IJMatrixAddToRowISIS(matrix, n, rows[i], &cols[in], &coeffs[in]);
    }
    return ierr;
 }
@@ -336,7 +358,7 @@ hypre_IJMatrixAddToBlockISIS(hypre_IJMatrix *matrix,
  *
  * hypre_IJMatrixInsertRowISIS
  *
- * inserts a row into an IJMatrix, 
+ * inserts a row into an IJMatrix,
  * if diag_i and offd_i are known, those values are inserted directly
  * into the ParCSRMatrix,
  * if they are not known, an auxiliary structure, AuxParCSRMatrix is used
@@ -344,10 +366,10 @@ hypre_IJMatrixAddToBlockISIS(hypre_IJMatrix *matrix,
  *****************************************************************************/
 HYPRE_Int
 hypre_IJMatrixInsertRowISIS(hypre_IJMatrix *matrix,
-		              HYPRE_Int	      n,
-		              HYPRE_BigInt    row,
-		              HYPRE_BigInt   *indices,
-		              HYPRE_Complex  *coeffs)
+                            HYPRE_Int       n,
+                            HYPRE_BigInt    row,
+                            HYPRE_BigInt   *indices,
+                            HYPRE_Complex  *coeffs)
 {
    HYPRE_Int ierr = 0;
    hypre_ParCSRMatrix *par_matrix;
@@ -390,10 +412,10 @@ hypre_IJMatrixInsertRowISIS(hypre_IJMatrix *matrix,
    row_starts = hypre_ParCSRMatrixRowStarts(par_matrix);
    col_starts = hypre_ParCSRMatrixColStarts(par_matrix);
    col_0 = col_starts[my_id];
-   col_n = col_starts[my_id+1]-1;
+   col_n = col_starts[my_id + 1] - 1;
    need_aux = hypre_AuxParCSRMatrixNeedAux(aux_matrix);
 
-   if (row >= row_starts[my_id] && row < row_starts[my_id+1])
+   if (row >= row_starts[my_id] && row < row_starts[my_id + 1])
    {
       if (need_aux)
       {
@@ -402,83 +424,83 @@ hypre_IJMatrixInsertRowISIS(hypre_IJMatrix *matrix,
          aux_data = hypre_AuxParCSRMatrixAuxData(aux_matrix);
          local_j = aux_j[row_local];
          local_data = aux_data[row_local];
-            
+
          row_length[row_local] = n;
-         
+
          if ( row_space[row_local] < n)
          {
-   	    hypre_TFree(local_j, HYPRE_MEMORY_HOST);
-   	    hypre_TFree(local_data, HYPRE_MEMORY_HOST);
-   	    local_j = hypre_CTAlloc(HYPRE_Int, n, HYPRE_MEMORY_HOST);
-   	    local_data = hypre_CTAlloc(HYPRE_Complex, n, HYPRE_MEMORY_HOST);
+            hypre_TFree(local_j, HYPRE_MEMORY_HOST);
+            hypre_TFree(local_data, HYPRE_MEMORY_HOST);
+            local_j = hypre_CTAlloc(HYPRE_Int, n, HYPRE_MEMORY_HOST);
+            local_data = hypre_CTAlloc(HYPRE_Complex, n, HYPRE_MEMORY_HOST);
             row_space[row_local] = n;
          }
-         
-         for (i=0; i < n; i++)
+
+         for (i = 0; i < n; i++)
          {
-   	    local_j[i] = indices[i];
-   	    local_data[i] = coeffs[i];
+            local_j[i] = indices[i];
+            local_data[i] = coeffs[i];
          }
-   
-   /* make sure first element is diagonal element, if not, find it and
-      exchange it with first element */
+
+         /* make sure first element is diagonal element, if not, find it and
+            exchange it with first element */
          if (local_j[0] != row_local)
          {
-            for (i=1; i < n; i++)
-     	    {
-   	       if (local_j[i] == row_local)
-   	       {
-   		   local_j[i] = local_j[0];
-   		   local_j[0] = (HYPRE_BigInt)row_local;
-   		   temp = local_data[0];
-   		   local_data[0] = local_data[i];
-   		   local_data[i] = temp;
-   		   break;
-   	       }
-     	    }
+            for (i = 1; i < n; i++)
+            {
+               if (local_j[i] == row_local)
+               {
+                  local_j[i] = local_j[0];
+                  local_j[0] = (HYPRE_BigInt)row_local;
+                  temp = local_data[0];
+                  local_data[0] = local_data[i];
+                  local_data[i] = temp;
+                  break;
+               }
+            }
          }
-      /* sort data according to column indices, except for first element */
+         /* sort data according to column indices, except for first element */
+
+         BigQsort1(local_j, local_data, 1, n - 1);
 
-         BigQsort1(local_j,local_data,1,n-1);
- 
       }
       else /* insert immediately into data into ParCSRMatrix structure */
       {
-	 diag = hypre_ParCSRMatrixDiag(par_matrix);
-	 offd = hypre_ParCSRMatrixOffd(par_matrix);
+         diag = hypre_ParCSRMatrixDiag(par_matrix);
+         offd = hypre_ParCSRMatrixOffd(par_matrix);
          diag_i = hypre_CSRMatrixI(diag);
          diag_j = hypre_CSRMatrixJ(diag);
          diag_data = hypre_CSRMatrixData(diag);
          offd_i = hypre_CSRMatrixI(offd);
          big_offd_j = hypre_CSRMatrixBigJ(offd);
          offd_data = hypre_CSRMatrixData(offd);
-	 offd_indx = offd_i[row_local];
-	 indx_0 = diag_i[row_local];
-	 diag_indx = indx_0+1;
-	
-  	 for (i=0; i < n; i++)
-	 {
-	    if (indices[i] < col_0 || indices[i] > col_n)/* insert into offd */	
-	    {
-	       big_offd_j[offd_indx] = indices[i];
-	       offd_data[offd_indx++] = coeffs[i];
-	    }
-	    else if (indices[i] == row) /* diagonal element */
-	    {
-	       diag_j[indx_0] = (HYPRE_Int)(indices[i] - col_0);
-	       diag_data[indx_0] = coeffs[i];
-	    }
-	    else  /* insert into diag */
-	    {
-	       diag_j[diag_indx] = (HYPRE_Int)(indices[i] - col_0);
-	       diag_data[diag_indx++] = coeffs[i];
-	    }
-	 }
-	 BigQsort1(big_offd_j, offd_data, 0, offd_indx-1);
-	 qsort1(diag_j, diag_data, 1, diag_indx-1);
-
-	 hypre_AuxParCSRMatrixIndxDiag(aux_matrix)[row_local] = diag_indx;
-	 hypre_AuxParCSRMatrixIndxOffd(aux_matrix)[row_local] = offd_indx;
+         offd_indx = offd_i[row_local];
+         indx_0 = diag_i[row_local];
+         diag_indx = indx_0 + 1;
+
+         for (i = 0; i < n; i++)
+         {
+            if (indices[i] < col_0 || indices[i] > col_n)/* insert into offd */
+            {
+               big_offd_j[offd_indx] = indices[i];
+               offd_data[offd_indx++] = coeffs[i];
+            }
+            else if (indices[i] == row) /* diagonal element */
+            {
+               diag_j[indx_0] = (HYPRE_Int)(indices[i] - col_0);
+               diag_data[indx_0] = coeffs[i];
+            }
+            else  /* insert into diag */
+            {
+               diag_j[diag_indx] = (HYPRE_Int)(indices[i] - col_0);
+               diag_data[diag_indx++] = coeffs[i];
+            }
+         }
+         BigQsort1(big_offd_j, offd_data, 0, offd_indx - 1);
+         qsort1(diag_j, diag_data, 1, diag_indx - 1);
+
+         hypre_AuxParCSRMatrixIndxDiag(aux_matrix)[row_local] = diag_indx;
+         hypre_AuxParCSRMatrixIndxOffd(aux_matrix)[row_local] = offd_indx;
       }
    }
    return ierr;
@@ -488,15 +510,15 @@ hypre_IJMatrixInsertRowISIS(hypre_IJMatrix *matrix,
  *
  * hypre_IJMatrixAddToRowISIS
  *
- * adds a row to an IJMatrix before assembly, 
- * 
+ * adds a row to an IJMatrix before assembly,
+ *
  *****************************************************************************/
 HYPRE_Int
 hypre_IJMatrixAddToRowISIS(hypre_IJMatrix *matrix,
-	                 HYPRE_Int         n,
-		         HYPRE_BigInt      row,
-		         HYPRE_BigInt     *indices,
-		         HYPRE_Complex  *coeffs)
+                           HYPRE_Int         n,
+                           HYPRE_BigInt      row,
+                           HYPRE_BigInt     *indices,
+                           HYPRE_Complex  *coeffs)
 {
    HYPRE_Int ierr = 0;
    hypre_ParCSRMatrix *par_matrix;
@@ -545,10 +567,10 @@ hypre_IJMatrixAddToRowISIS(hypre_IJMatrix *matrix,
    row_starts = hypre_ParCSRMatrixRowStarts(par_matrix);
    col_starts = hypre_ParCSRMatrixColStarts(par_matrix);
    col_0 = col_starts[my_id];
-   col_n = col_starts[my_id+1]-1;
+   col_n = col_starts[my_id + 1] - 1;
    need_aux = hypre_AuxParCSRMatrixNeedAux(aux_matrix);
 
-   if (row >= row_starts[my_id] && row < row_starts[my_id+1])
+   if (row >= row_starts[my_id] && row < row_starts[my_id + 1])
    {
       if (need_aux)
       {
@@ -557,89 +579,91 @@ hypre_IJMatrixAddToRowISIS(hypre_IJMatrix *matrix,
          aux_data = hypre_AuxParCSRMatrixAuxData(aux_matrix);
          local_j = aux_j[row_local];
          local_data = aux_data[row_local];
-	 tmp_j = hypre_CTAlloc(HYPRE_BigInt, n, HYPRE_MEMORY_HOST);
-	 tmp_data = hypre_CTAlloc(HYPRE_Complex, n, HYPRE_MEMORY_HOST);
-	 tmp_indx = 0;
-         for (i=0; i < n; i++)
-	 {
-	    if (indices[i] == row)
-	       local_data[0] += coeffs[i];
-	    else
-	    {
-	       tmp_j[tmp_indx] = indices[i];
-	       tmp_data[tmp_indx++] = coeffs[i];
-	    }
-	 }
-	 BigQsort1(tmp_j,tmp_data,0,tmp_indx-1);
-	 indx = 0;
-	 size = 0;
-	 for (i=1; i < row_length[row_local]; i++)
-	 {
-	    while (local_j[i] > tmp_j[indx])
-	    {
-	       size++;
-	       indx++;
-	    }
-	    if (local_j[i] == tmp_j[indx])
-	    {
-	       size++;
-	       indx++;
-	    }
-	 }
-	 size += tmp_indx-indx;
-	    
-         old_size = row_length[row_local];   
+         tmp_j = hypre_CTAlloc(HYPRE_BigInt, n, HYPRE_MEMORY_HOST);
+         tmp_data = hypre_CTAlloc(HYPRE_Complex, n, HYPRE_MEMORY_HOST);
+         tmp_indx = 0;
+         for (i = 0; i < n; i++)
+         {
+            if (indices[i] == row)
+            {
+               local_data[0] += coeffs[i];
+            }
+            else
+            {
+               tmp_j[tmp_indx] = indices[i];
+               tmp_data[tmp_indx++] = coeffs[i];
+            }
+         }
+         BigQsort1(tmp_j, tmp_data, 0, tmp_indx - 1);
+         indx = 0;
+         size = 0;
+         for (i = 1; i < row_length[row_local]; i++)
+         {
+            while (local_j[i] > tmp_j[indx])
+            {
+               size++;
+               indx++;
+            }
+            if (local_j[i] == tmp_j[indx])
+            {
+               size++;
+               indx++;
+            }
+         }
+         size += tmp_indx - indx;
+
+         old_size = row_length[row_local];
          row_length[row_local] = size;
-         
+
          if ( row_space[row_local] < size)
          {
-   	    tmp2_j = hypre_CTAlloc(HYPRE_BigInt, size, HYPRE_MEMORY_HOST);
-   	    tmp2_data = hypre_CTAlloc(HYPRE_Complex, size, HYPRE_MEMORY_HOST);
-	    for (i=0; i < old_size; i++)
-	    {
-	       tmp2_j[i] = local_j[i];
-	       tmp2_data[i] = local_data[i];
-	    }
-   	    hypre_TFree(local_j, HYPRE_MEMORY_HOST);
-   	    hypre_TFree(local_data, HYPRE_MEMORY_HOST);
-	    local_j = tmp2_j;
-	    local_data = tmp2_data;
+            tmp2_j = hypre_CTAlloc(HYPRE_BigInt, size, HYPRE_MEMORY_HOST);
+            tmp2_data = hypre_CTAlloc(HYPRE_Complex, size, HYPRE_MEMORY_HOST);
+            for (i = 0; i < old_size; i++)
+            {
+               tmp2_j[i] = local_j[i];
+               tmp2_data[i] = local_data[i];
+            }
+            hypre_TFree(local_j, HYPRE_MEMORY_HOST);
+            hypre_TFree(local_data, HYPRE_MEMORY_HOST);
+            local_j = tmp2_j;
+            local_data = tmp2_data;
             row_space[row_local] = n;
          }
-        /* merge local and tmp into local */
-
-         indx = 0; 
-	 cnt = row_length[row_local];
-
-	 for (i=1; i < old_size; i++)
-	 {
-	    while (local_j[i] > tmp_j[indx])
-	    {
-	       local_j[cnt] = tmp_j[indx];
-	       local_data[cnt++] = tmp_data[indx++];
-	    }
-	    if (local_j[i] == tmp_j[indx])
-	    {
-	       local_j[i] += tmp_j[indx];
-	       local_data[i] += tmp_data[indx++];
-	    }
-	 }
-         for (i=indx; i < tmp_indx; i++)
+         /* merge local and tmp into local */
+
+         indx = 0;
+         cnt = row_length[row_local];
+
+         for (i = 1; i < old_size; i++)
+         {
+            while (local_j[i] > tmp_j[indx])
+            {
+               local_j[cnt] = tmp_j[indx];
+               local_data[cnt++] = tmp_data[indx++];
+            }
+            if (local_j[i] == tmp_j[indx])
+            {
+               local_j[i] += tmp_j[indx];
+               local_data[i] += tmp_data[indx++];
+            }
+         }
+         for (i = indx; i < tmp_indx; i++)
          {
-   	    local_j[cnt] = tmp_j[i];
-   	    local_data[cnt++] = tmp_data[i];
+            local_j[cnt] = tmp_j[i];
+            local_data[cnt++] = tmp_data[i];
          }
-   
-      /* sort data according to column indices, except for first element */
 
-         BigQsort1(local_j,local_data,1,n-1);
-	 hypre_TFree(tmp_j, HYPRE_MEMORY_HOST); 
-	 hypre_TFree(tmp_data, HYPRE_MEMORY_HOST); 
+         /* sort data according to column indices, except for first element */
+
+         BigQsort1(local_j, local_data, 1, n - 1);
+         hypre_TFree(tmp_j, HYPRE_MEMORY_HOST);
+         hypre_TFree(tmp_data, HYPRE_MEMORY_HOST);
       }
       else /* insert immediately into data into ParCSRMatrix structure */
       {
-	 offd_indx = hypre_AuxParCSRMatrixIndxOffd(aux_matrix)[row_local];
-	 diag_indx = hypre_AuxParCSRMatrixIndxDiag(aux_matrix)[row_local];
+         offd_indx = hypre_AuxParCSRMatrixIndxOffd(aux_matrix)[row_local];
+         diag_indx = hypre_AuxParCSRMatrixIndxDiag(aux_matrix)[row_local];
          diag = hypre_ParCSRMatrixDiag(par_matrix);
          diag_i = hypre_CSRMatrixI(diag);
          diag_j = hypre_CSRMatrixJ(diag);
@@ -649,95 +673,95 @@ hypre_IJMatrixAddToRowISIS(hypre_IJMatrix *matrix,
          big_offd_j = hypre_CSRMatrixBigJ(offd);
          offd_data = hypre_CSRMatrixData(offd);
 
-	 indx_0 = diag_i[row_local];
-	 diag_indx = indx_0+1;
-	 
-	 tmp_diag_j = hypre_CTAlloc(HYPRE_Int, n, HYPRE_MEMORY_HOST);
-	 tmp_diag_data = hypre_CTAlloc(HYPRE_Complex, n, HYPRE_MEMORY_HOST);
-	 cnt_diag = 0;
-	 tmp_offd_j = hypre_CTAlloc(HYPRE_BigInt, n, HYPRE_MEMORY_HOST);
-	 tmp_offd_data = hypre_CTAlloc(HYPRE_Complex, n, HYPRE_MEMORY_HOST);
-	 cnt_offd = 0;
-  	 for (i=0; i < n; i++)
-	 {
-	    if (indices[i] < col_0 || indices[i] > col_n)/* insert into offd */	
-	    {
-	       tmp_offd_j[cnt_offd] = indices[i];
-	       tmp_offd_data[cnt_offd++] = coeffs[i];
-	    }
-	    else if (indices[i] == row) /* diagonal element */
-	    {
-	       diag_j[indx_0] = (HYPRE_Int)(indices[i] - col_0);
-	       diag_data[indx_0] += coeffs[i];
-	    }
-	    else  /* insert into diag */
-	    {
-	       tmp_diag_j[cnt_diag] = (HYPRE_Int)(indices[i] - col_0);
-	       tmp_diag_data[cnt_diag++] = coeffs[i];
-	    }
-	 }
-	 qsort1(tmp_diag_j,tmp_diag_data,0,cnt_diag-1);
-	 BigQsort1(tmp_offd_j,tmp_offd_data,0,cnt_offd-1);
+         indx_0 = diag_i[row_local];
+         diag_indx = indx_0 + 1;
+
+         tmp_diag_j = hypre_CTAlloc(HYPRE_Int, n, HYPRE_MEMORY_HOST);
+         tmp_diag_data = hypre_CTAlloc(HYPRE_Complex, n, HYPRE_MEMORY_HOST);
+         cnt_diag = 0;
+         tmp_offd_j = hypre_CTAlloc(HYPRE_BigInt, n, HYPRE_MEMORY_HOST);
+         tmp_offd_data = hypre_CTAlloc(HYPRE_Complex, n, HYPRE_MEMORY_HOST);
+         cnt_offd = 0;
+         for (i = 0; i < n; i++)
+         {
+            if (indices[i] < col_0 || indices[i] > col_n)/* insert into offd */
+            {
+               tmp_offd_j[cnt_offd] = indices[i];
+               tmp_offd_data[cnt_offd++] = coeffs[i];
+            }
+            else if (indices[i] == row) /* diagonal element */
+            {
+               diag_j[indx_0] = (HYPRE_Int)(indices[i] - col_0);
+               diag_data[indx_0] += coeffs[i];
+            }
+            else  /* insert into diag */
+            {
+               tmp_diag_j[cnt_diag] = (HYPRE_Int)(indices[i] - col_0);
+               tmp_diag_data[cnt_diag++] = coeffs[i];
+            }
+         }
+         qsort1(tmp_diag_j, tmp_diag_data, 0, cnt_diag - 1);
+         BigQsort1(tmp_offd_j, tmp_offd_data, 0, cnt_offd - 1);
 
          diag_indx = hypre_AuxParCSRMatrixIndxDiag(aux_matrix)[row_local];
-	 cnt = diag_indx;
-	 indx = 0;
-	 for (i=diag_i[row_local]+1; i < diag_indx; i++)
-	 {
-	    while (diag_j[i] > tmp_diag_j[indx])
-	    {
-	       diag_j[cnt] = tmp_diag_j[indx];
-	       diag_data[cnt++] = tmp_diag_data[indx++];
-	    }
-	    if (diag_j[i] == tmp_diag_j[indx])
-	    {
-	       diag_j[i] += tmp_diag_j[indx];
-	       diag_data[i] += tmp_diag_data[indx++];
-	    }
-	 }
-         for (i=indx; i < cnt_diag; i++)
+         cnt = diag_indx;
+         indx = 0;
+         for (i = diag_i[row_local] + 1; i < diag_indx; i++)
          {
-   	    diag_j[cnt] = tmp_diag_j[i];
-   	    diag_data[cnt++] = tmp_diag_data[i];
+            while (diag_j[i] > tmp_diag_j[indx])
+            {
+               diag_j[cnt] = tmp_diag_j[indx];
+               diag_data[cnt++] = tmp_diag_data[indx++];
+            }
+            if (diag_j[i] == tmp_diag_j[indx])
+            {
+               diag_j[i] += tmp_diag_j[indx];
+               diag_data[i] += tmp_diag_data[indx++];
+            }
          }
-   
-      /* sort data according to column indices, except for first element */
+         for (i = indx; i < cnt_diag; i++)
+         {
+            diag_j[cnt] = tmp_diag_j[i];
+            diag_data[cnt++] = tmp_diag_data[i];
+         }
+
+         /* sort data according to column indices, except for first element */
 
-         qsort1(diag_j,diag_data,1,cnt-1);
-	 hypre_TFree(tmp_diag_j, HYPRE_MEMORY_HOST); 
-	 hypre_TFree(tmp_diag_data, HYPRE_MEMORY_HOST); 
+         qsort1(diag_j, diag_data, 1, cnt - 1);
+         hypre_TFree(tmp_diag_j, HYPRE_MEMORY_HOST);
+         hypre_TFree(tmp_diag_data, HYPRE_MEMORY_HOST);
 
-	 hypre_AuxParCSRMatrixIndxOffd(aux_matrix)[row_local] = cnt;
+         hypre_AuxParCSRMatrixIndxOffd(aux_matrix)[row_local] = cnt;
 
          offd_indx = hypre_AuxParCSRMatrixIndxOffd(aux_matrix)[row_local];
-	 cnt = offd_indx;
-	 indx = 0;
-	 for (i=offd_i[row_local]+1; i < offd_indx; i++)
-	 {
-	    while (big_offd_j[i] > tmp_offd_j[indx])
-	    {
-	       big_offd_j[cnt] = tmp_offd_j[indx];
-	       offd_data[cnt++] = tmp_offd_data[indx++];
-	    }
-	    if (big_offd_j[i] == tmp_offd_j[indx])
-	    {
-	       big_offd_j[i] += tmp_offd_j[indx];
-	       offd_data[i] += tmp_offd_data[indx++];
-	    }
-	 }
-         for (i=indx; i < cnt_offd; i++)
+         cnt = offd_indx;
+         indx = 0;
+         for (i = offd_i[row_local] + 1; i < offd_indx; i++)
          {
-   	    big_offd_j[cnt] = tmp_offd_j[i];
-   	    offd_data[cnt++] = tmp_offd_data[i];
+            while (big_offd_j[i] > tmp_offd_j[indx])
+            {
+               big_offd_j[cnt] = tmp_offd_j[indx];
+               offd_data[cnt++] = tmp_offd_data[indx++];
+            }
+            if (big_offd_j[i] == tmp_offd_j[indx])
+            {
+               big_offd_j[i] += tmp_offd_j[indx];
+               offd_data[i] += tmp_offd_data[indx++];
+            }
+         }
+         for (i = indx; i < cnt_offd; i++)
+         {
+            big_offd_j[cnt] = tmp_offd_j[i];
+            offd_data[cnt++] = tmp_offd_data[i];
          }
-   
-      /* sort data according to column indices, except for first element */
 
-         BigQsort1(big_offd_j,offd_data,1,cnt-1);
-	 hypre_TFree(tmp_offd_j, HYPRE_MEMORY_HOST); 
-	 hypre_TFree(tmp_offd_data, HYPRE_MEMORY_HOST); 
+         /* sort data according to column indices, except for first element */
 
-	 hypre_AuxParCSRMatrixIndxOffd(aux_matrix)[row_local] = cnt;
+         BigQsort1(big_offd_j, offd_data, 1, cnt - 1);
+         hypre_TFree(tmp_offd_j, HYPRE_MEMORY_HOST);
+         hypre_TFree(tmp_offd_data, HYPRE_MEMORY_HOST);
+
+         hypre_AuxParCSRMatrixIndxOffd(aux_matrix)[row_local] = cnt;
       }
    }
    return ierr;
@@ -786,29 +810,33 @@ hypre_IJMatrixAssembleISIS(hypre_IJMatrix *matrix)
    HYPRE_Int nnz_offd;
    HYPRE_BigInt *aux_offd_j;
 
-   hypre_MPI_Comm_size(comm, &num_procs); 
+   hypre_MPI_Comm_size(comm, &num_procs);
    hypre_MPI_Comm_rank(comm, &my_id);
-   num_rows = row_starts[my_id+1] - row_starts[my_id]; 
-/* move data into ParCSRMatrix if not there already */ 
+   num_rows = row_starts[my_id + 1] - row_starts[my_id];
+   /* move data into ParCSRMatrix if not there already */
    if (need_aux)
    {
       col_0 = col_starts[my_id];
-      col_n = col_starts[my_id+1]-1;
+      col_n = col_starts[my_id + 1] - 1;
       i_diag = 0;
       i_offd = 0;
-      for (i=0; i < num_rows; i++)
+      for (i = 0; i < num_rows; i++)
       {
-	 local_j = aux_j[i];
-	 local_data = aux_data[i];
-	 for (j=0; j < row_length[i]; j++)
-	 {
-	    if (local_j[j] < col_0 || local_j[j] > col_n)
-	       i_offd++;
-	    else
-	       i_diag++;
-	 }
-	 diag_i[i] = i_diag;
-	 offd_i[i] = i_offd;
+         local_j = aux_j[i];
+         local_data = aux_data[i];
+         for (j = 0; j < row_length[i]; j++)
+         {
+            if (local_j[j] < col_0 || local_j[j] > col_n)
+            {
+               i_offd++;
+            }
+            else
+            {
+               i_diag++;
+            }
+         }
+         diag_i[i] = i_diag;
+         offd_i[i] = i_offd;
       }
       diag_j = hypre_CTAlloc(HYPRE_Int, i_diag, HYPRE_MEMORY_HOST);
       diag_data = hypre_CTAlloc(HYPRE_Complex, i_diag, HYPRE_MEMORY_HOST);
@@ -817,60 +845,64 @@ hypre_IJMatrixAssembleISIS(hypre_IJMatrix *matrix)
       offd_data = hypre_CTAlloc(HYPRE_Complex, i_offd, HYPRE_MEMORY_HOST);
       i_diag = 0;
       i_offd = 0;
-      for (i=0; i < num_rows; i++)
+      for (i = 0; i < num_rows; i++)
       {
-	 local_j = aux_j[i];
-	 local_data = aux_data[i];
-	 for (j=0; j < row_length[i]; j++)
-	 {
-	    if (local_j[j] < col_0 || local_j[j] > col_n)
-	    {
-	       big_offd_j[i_offd] = local_j[j];
-	       offd_data[i_offd++] = local_data[j];
-	    }
-	    else
-	    {
-	       diag_j[i_diag] = local_j[j];
-	       diag_data[i_diag++] = local_data[j];
-	    }
-	 }
+         local_j = aux_j[i];
+         local_data = aux_data[i];
+         for (j = 0; j < row_length[i]; j++)
+         {
+            if (local_j[j] < col_0 || local_j[j] > col_n)
+            {
+               big_offd_j[i_offd] = local_j[j];
+               offd_data[i_offd++] = local_data[j];
+            }
+            else
+            {
+               diag_j[i_diag] = local_j[j];
+               diag_data[i_diag++] = local_data[j];
+            }
+         }
       }
-      hypre_CSRMatrixJ(diag) = diag_j;      
-      hypre_CSRMatrixData(diag) = diag_data;      
-      hypre_CSRMatrixNumNonzeros(diag) = diag_i[num_rows];      
-      hypre_CSRMatrixBigJ(offd) = big_offd_j;      
-      hypre_CSRMatrixJ(offd) = offd_j;      
-      hypre_CSRMatrixData(offd) = offd_data;      
-      hypre_CSRMatrixNumNonzeros(offd) = offd_i[num_rows];      
+      hypre_CSRMatrixJ(diag) = diag_j;
+      hypre_CSRMatrixData(diag) = diag_data;
+      hypre_CSRMatrixNumNonzeros(diag) = diag_i[num_rows];
+      hypre_CSRMatrixBigJ(offd) = big_offd_j;
+      hypre_CSRMatrixJ(offd) = offd_j;
+      hypre_CSRMatrixData(offd) = offd_data;
+      hypre_CSRMatrixNumNonzeros(offd) = offd_i[num_rows];
    }
 
-/*  generate col_map_offd */
+   /*  generate col_map_offd */
    nnz_offd = offd_i[num_rows];
    aux_offd_j = hypre_CTAlloc(HYPRE_BigInt,  nnz_offd, HYPRE_MEMORY_HOST);
-   for (i=0; i < nnz_offd; i++)
+   for (i = 0; i < nnz_offd; i++)
+   {
       aux_offd_j[i] = big_offd_j[i];
-   BigQsort0(aux_offd_j,0,nnz_offd-1);
+   }
+   BigQsort0(aux_offd_j, 0, nnz_offd - 1);
    num_cols_offd = 1;
    cnt = 0;
-   for (i=0; i < nnz_offd-1; i++)
+   for (i = 0; i < nnz_offd - 1; i++)
    {
-      if (aux_offd_j[i+1] > aux_offd_j[i])
+      if (aux_offd_j[i + 1] > aux_offd_j[i])
       {
          cnt++;
-         aux_offd_j[cnt] = aux_offd_j[i+1];
+         aux_offd_j[cnt] = aux_offd_j[i + 1];
          num_cols_offd++;
       }
    }
    col_map_offd = hypre_CTAlloc(HYPRE_BigInt, num_cols_offd, HYPRE_MEMORY_HOST);
-   for (i=0; i < num_cols_offd; i++)
-	 col_map_offd[i] = aux_offd_j[i];
-   
-   for (i=0; i < nnz_offd; i++)
+   for (i = 0; i < num_cols_offd; i++)
+   {
+      col_map_offd[i] = aux_offd_j[i];
+   }
+
+   for (i = 0; i < nnz_offd; i++)
    {
-      offd_j[i] = hypre_BigBinarySearch(col_map_offd,big_offd_j[i],num_cols_offd);
+      offd_j[i] = hypre_BigBinarySearch(col_map_offd, big_offd_j[i], num_cols_offd);
    }
-   hypre_ParCSRMatrixColMapOffd(par_matrix) = col_map_offd;    
-   hypre_CSRMatrixNumCols(offd) = num_cols_offd;    
+   hypre_ParCSRMatrixColMapOffd(par_matrix) = col_map_offd;
+   hypre_CSRMatrixNumCols(offd) = num_cols_offd;
 
    hypre_AuxParCSRMatrixDestroy(aux_matrix);
    hypre_TFree(aux_offd_j, HYPRE_MEMORY_HOST);
@@ -891,15 +923,15 @@ hypre_IJMatrixAssembleISIS(hypre_IJMatrix *matrix)
  *****************************************************************************/
 HYPRE_Int
 hypre_IJMatrixDistributeISIS(hypre_IJMatrix *matrix,
-			     HYPRE_BigInt   *row_starts,
-			     HYPRE_BigInt   *col_starts)
+                             HYPRE_BigInt   *row_starts,
+                             HYPRE_BigInt   *col_starts)
 {
    HYPRE_Int ierr = 0;
    hypre_ParCSRMatrix *old_matrix = hypre_IJMatrixLocalStorage(matrix);
    hypre_ParCSRMatrix *par_matrix;
    hypre_CSRMatrix *diag = hypre_ParCSRMatrixDiag(old_matrix);
    par_matrix = hypre_CSRMatrixToParCSRMatrix(hypre_ParCSRMatrixComm(old_matrix)
-		, diag, row_starts, col_starts);
+                                              , diag, row_starts, col_starts);
    ierr = hypre_ParCSRMatrixDestroy(old_matrix);
    hypre_IJMatrixLocalStorage(matrix) = par_matrix;
    return ierr;
@@ -914,8 +946,8 @@ hypre_IJMatrixDistributeISIS(hypre_IJMatrix *matrix,
  *****************************************************************************/
 HYPRE_Int
 hypre_IJMatrixApplyISIS(hypre_IJMatrix  *matrix,
-		        hypre_ParVector *x,
-		          hypre_ParVector *b)
+                        hypre_ParVector *x,
+                        hypre_ParVector *b)
 {
    HYPRE_Int ierr = 0;
 
@@ -945,7 +977,7 @@ hypre_IJMatrixDestroyISIS(hypre_IJMatrix *matrix)
  *****************************************************************************/
 HYPRE_Int
 hypre_IJMatrixSetTotalSizeISIS(hypre_IJMatrix *matrix,
-			   	 HYPRE_Int     	 size)
+                               HYPRE_Int         size)
 {
    HYPRE_Int ierr = 0;
    hypre_ParCSRMatrix *par_matrix;
diff --git a/external/hypre/src/IJ_mv/IJMatrix_parcsr.c b/external/hypre/src/IJ_mv/IJMatrix_parcsr.c
index c6dcdc6d..24edb706 100644
--- a/external/hypre/src/IJ_mv/IJMatrix_parcsr.c
+++ b/external/hypre/src/IJ_mv/IJMatrix_parcsr.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -86,8 +86,8 @@ hypre_IJMatrixSetRowSizesParCSR(hypre_IJMatrix  *matrix,
    HYPRE_Int local_num_rows, local_num_cols, i, *row_space = NULL;
    HYPRE_BigInt *row_partitioning = hypre_IJMatrixRowPartitioning(matrix);
    HYPRE_BigInt *col_partitioning = hypre_IJMatrixColPartitioning(matrix);
-   local_num_rows = (HYPRE_Int)(row_partitioning[1]-row_partitioning[0]);
-   local_num_cols = (HYPRE_Int)(col_partitioning[1]-col_partitioning[0]);
+   local_num_rows = (HYPRE_Int)(row_partitioning[1] - row_partitioning[0]);
+   local_num_cols = (HYPRE_Int)(col_partitioning[1] - col_partitioning[0]);
    hypre_AuxParCSRMatrix *aux_matrix = (hypre_AuxParCSRMatrix *) hypre_IJMatrixTranslator(matrix);
 
    if (aux_matrix)
@@ -109,7 +109,7 @@ hypre_IJMatrixSetRowSizesParCSR(hypre_IJMatrix  *matrix,
    }
    hypre_AuxParCSRMatrixRowSpace(aux_matrix) = row_space;
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
    hypre_AuxParCSRMatrixUsrOnProcElmts(aux_matrix) = 0;
    for (i = 0; i < local_num_rows; i++)
    {
@@ -137,8 +137,8 @@ hypre_IJMatrixSetDiagOffdSizesParCSR(hypre_IJMatrix  *matrix,
    HYPRE_Int local_num_rows, local_num_cols;
    HYPRE_BigInt *row_partitioning = hypre_IJMatrixRowPartitioning(matrix);
    HYPRE_BigInt *col_partitioning = hypre_IJMatrixColPartitioning(matrix);
-   local_num_rows = (HYPRE_Int)(row_partitioning[1]-row_partitioning[0]);
-   local_num_cols = (HYPRE_Int)(col_partitioning[1]-col_partitioning[0]);
+   local_num_rows = (HYPRE_Int)(row_partitioning[1] - row_partitioning[0]);
+   local_num_cols = (HYPRE_Int)(col_partitioning[1] - col_partitioning[0]);
    hypre_AuxParCSRMatrix *aux_matrix = (hypre_AuxParCSRMatrix *)hypre_IJMatrixTranslator(matrix);
 
    if (!aux_matrix)
@@ -149,12 +149,14 @@ hypre_IJMatrixSetDiagOffdSizesParCSR(hypre_IJMatrix  *matrix,
 
    if ( hypre_AuxParCSRMatrixDiagSizes(aux_matrix) == NULL)
    {
-      hypre_AuxParCSRMatrixDiagSizes(aux_matrix) = hypre_TAlloc(HYPRE_Int, local_num_rows, HYPRE_MEMORY_HOST);
+      hypre_AuxParCSRMatrixDiagSizes(aux_matrix) = hypre_TAlloc(HYPRE_Int, local_num_rows,
+                                                                HYPRE_MEMORY_HOST);
    }
 
    if ( hypre_AuxParCSRMatrixOffdSizes(aux_matrix) == NULL)
    {
-      hypre_AuxParCSRMatrixOffdSizes(aux_matrix) = hypre_TAlloc(HYPRE_Int, local_num_rows, HYPRE_MEMORY_HOST);
+      hypre_AuxParCSRMatrixOffdSizes(aux_matrix) = hypre_TAlloc(HYPRE_Int, local_num_rows,
+                                                                HYPRE_MEMORY_HOST);
    }
 
    hypre_TMemcpy(hypre_AuxParCSRMatrixDiagSizes(aux_matrix), diag_sizes, HYPRE_Int, local_num_rows,
@@ -178,23 +180,28 @@ HYPRE_Int
 hypre_IJMatrixSetMaxOnProcElmtsParCSR(hypre_IJMatrix *matrix,
                                       HYPRE_Int       max_on_proc_elmts)
 {
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-   hypre_AuxParCSRMatrix *aux_matrix;
-   HYPRE_Int local_num_rows, local_num_cols, my_id;
-   HYPRE_BigInt *row_partitioning = hypre_IJMatrixRowPartitioning(matrix);
-   HYPRE_BigInt *col_partitioning = hypre_IJMatrixColPartitioning(matrix);
-   MPI_Comm comm = hypre_IJMatrixComm(matrix);
+#if defined(HYPRE_USING_GPU)
+   MPI_Comm                 comm             = hypre_IJMatrixComm(matrix);
+   HYPRE_BigInt            *row_partitioning = hypre_IJMatrixRowPartitioning(matrix);
+   HYPRE_BigInt            *col_partitioning = hypre_IJMatrixColPartitioning(matrix);
+   hypre_AuxParCSRMatrix   *aux_matrix;
+   HYPRE_Int                local_num_rows, local_num_cols, my_id;
 
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_rank(comm, &my_id);
    aux_matrix = (hypre_AuxParCSRMatrix *) hypre_IJMatrixTranslator(matrix);
    if (!aux_matrix)
    {
-      local_num_rows = (HYPRE_Int)(row_partitioning[1]-row_partitioning[0]);
-      local_num_cols = (HYPRE_Int)(col_partitioning[1]-col_partitioning[0]);
+      local_num_rows = (HYPRE_Int)(row_partitioning[1] - row_partitioning[0]);
+      local_num_cols = (HYPRE_Int)(col_partitioning[1] - col_partitioning[0]);
+
       hypre_AuxParCSRMatrixCreate(&aux_matrix, local_num_rows, local_num_cols, NULL);
       hypre_IJMatrixTranslator(matrix) = aux_matrix;
    }
    hypre_AuxParCSRMatrixUsrOnProcElmts(aux_matrix) = max_on_proc_elmts;
+
+#else
+   HYPRE_UNUSED_VAR(matrix);
+   HYPRE_UNUSED_VAR(max_on_proc_elmts);
 #endif
 
    return hypre_error_flag;
@@ -216,25 +223,118 @@ hypre_IJMatrixSetMaxOffProcElmtsParCSR(hypre_IJMatrix *matrix,
    HYPRE_BigInt *col_partitioning = hypre_IJMatrixColPartitioning(matrix);
    MPI_Comm comm = hypre_IJMatrixComm(matrix);
 
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_rank(comm, &my_id);
    aux_matrix = (hypre_AuxParCSRMatrix *) hypre_IJMatrixTranslator(matrix);
    if (!aux_matrix)
    {
-      local_num_rows = (HYPRE_Int)(row_partitioning[1]-row_partitioning[0]);
-      local_num_cols = (HYPRE_Int)(col_partitioning[1]-col_partitioning[0]);
+      local_num_rows = (HYPRE_Int)(row_partitioning[1] - row_partitioning[0]);
+      local_num_cols = (HYPRE_Int)(col_partitioning[1] - col_partitioning[0]);
       hypre_AuxParCSRMatrixCreate(&aux_matrix, local_num_rows,
                                   local_num_cols, NULL);
       hypre_IJMatrixTranslator(matrix) = aux_matrix;
    }
    hypre_AuxParCSRMatrixMaxOffProcElmts(aux_matrix) = max_off_proc_elmts;
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
    hypre_AuxParCSRMatrixUsrOffProcElmts(aux_matrix) = max_off_proc_elmts;
 #endif
 
    return hypre_error_flag;
 }
 
+/******************************************************************************
+ *
+ * hypre_IJMatrixSetInitAllocationParCSR
+ *
+ *****************************************************************************/
+
+HYPRE_Int
+hypre_IJMatrixSetInitAllocationParCSR(hypre_IJMatrix *matrix,
+                                      HYPRE_Int       factor)
+{
+#if defined(HYPRE_USING_GPU)
+   hypre_AuxParCSRMatrix *aux_matrix = (hypre_AuxParCSRMatrix *) hypre_IJMatrixTranslator(matrix);
+   HYPRE_BigInt *row_partitioning = hypre_IJMatrixRowPartitioning(matrix);
+   HYPRE_BigInt *col_partitioning = hypre_IJMatrixColPartitioning(matrix);
+
+   if (!aux_matrix)
+   {
+      HYPRE_Int local_num_rows = (HYPRE_Int)(row_partitioning[1] - row_partitioning[0]);
+      HYPRE_Int local_num_cols = (HYPRE_Int)(col_partitioning[1] - col_partitioning[0]);
+      hypre_AuxParCSRMatrixCreate(&aux_matrix, local_num_rows, local_num_cols, NULL);
+      hypre_IJMatrixTranslator(matrix) = aux_matrix;
+   }
+   hypre_AuxParCSRMatrixInitAllocFactor(aux_matrix) = factor;
+#else
+   HYPRE_UNUSED_VAR(matrix);
+   HYPRE_UNUSED_VAR(factor);
+#endif
+
+   return hypre_error_flag;
+}
+
+/******************************************************************************
+ *
+ * hypre_IJMatrixSetEarlyAssembleParCSR
+ *
+ *****************************************************************************/
+
+HYPRE_Int
+hypre_IJMatrixSetEarlyAssembleParCSR(hypre_IJMatrix *matrix,
+                                     HYPRE_Int       early_assemble)
+{
+#if defined(HYPRE_USING_GPU)
+   hypre_AuxParCSRMatrix *aux_matrix = (hypre_AuxParCSRMatrix *) hypre_IJMatrixTranslator(matrix);
+   HYPRE_BigInt *row_partitioning = hypre_IJMatrixRowPartitioning(matrix);
+   HYPRE_BigInt *col_partitioning = hypre_IJMatrixColPartitioning(matrix);
+
+   if (!aux_matrix)
+   {
+      HYPRE_Int local_num_rows = (HYPRE_Int)(row_partitioning[1] - row_partitioning[0]);
+      HYPRE_Int local_num_cols = (HYPRE_Int)(col_partitioning[1] - col_partitioning[0]);
+      hypre_AuxParCSRMatrixCreate(&aux_matrix, local_num_rows, local_num_cols, NULL);
+      hypre_IJMatrixTranslator(matrix) = aux_matrix;
+   }
+   hypre_AuxParCSRMatrixEarlyAssemble(aux_matrix) = early_assemble;
+#else
+   HYPRE_UNUSED_VAR(matrix);
+   HYPRE_UNUSED_VAR(early_assemble);
+#endif
+
+   return hypre_error_flag;
+}
+
+/******************************************************************************
+ *
+ * hypre_IJMatrixSetGrowFactorParCSR
+ *
+ *****************************************************************************/
+
+HYPRE_Int
+hypre_IJMatrixSetGrowFactorParCSR(hypre_IJMatrix *matrix,
+                                  HYPRE_Real      factor)
+{
+#if defined(HYPRE_USING_GPU)
+   hypre_AuxParCSRMatrix *aux_matrix = (hypre_AuxParCSRMatrix *) hypre_IJMatrixTranslator(matrix);
+   HYPRE_BigInt *row_partitioning = hypre_IJMatrixRowPartitioning(matrix);
+   HYPRE_BigInt *col_partitioning = hypre_IJMatrixColPartitioning(matrix);
+
+   if (!aux_matrix)
+   {
+      HYPRE_Int local_num_rows = (HYPRE_Int)(row_partitioning[1] - row_partitioning[0]);
+      HYPRE_Int local_num_cols = (HYPRE_Int)(col_partitioning[1] - col_partitioning[0]);
+      hypre_AuxParCSRMatrixCreate(&aux_matrix, local_num_rows, local_num_cols, NULL);
+      hypre_IJMatrixTranslator(matrix) = aux_matrix;
+   }
+   hypre_AuxParCSRMatrixGrowFactor(aux_matrix) = factor;
+#else
+   HYPRE_UNUSED_VAR(matrix);
+   HYPRE_UNUSED_VAR(factor);
+#endif
+
+   return hypre_error_flag;
+}
+
 /******************************************************************************
  *
  * hypre_IJMatrixInitializeParCSR
@@ -272,40 +372,46 @@ hypre_IJMatrixInitializeParCSR_v2(hypre_IJMatrix *matrix, HYPRE_MemoryLocation m
 
       if (!aux_matrix)
       {
-         hypre_AuxParCSRMatrixCreate(&aux_matrix, local_num_rows, hypre_ParCSRMatrixNumCols(par_matrix), NULL);
+         hypre_AuxParCSRMatrixCreate(&aux_matrix, local_num_rows,
+                                     hypre_ParCSRMatrixNumCols(par_matrix),
+                                     NULL);
          hypre_IJMatrixTranslator(matrix) = aux_matrix;
       }
 
       hypre_ParCSRMatrixInitialize_v2(par_matrix, memory_location);
       hypre_AuxParCSRMatrixInitialize_v2(aux_matrix, memory_location_aux);
 
-      if (memory_location_aux == HYPRE_MEMORY_HOST)
+#if defined(HYPRE_USING_GPU)
+      if (hypre_GetExecPolicy1(memory_location_aux) == HYPRE_EXEC_HOST)
+#endif
       {
          if (hypre_AuxParCSRMatrixDiagSizes(aux_matrix))
          {
             for (i = 0; i < local_num_rows; i++)
             {
-               hypre_CSRMatrixI(diag)[i+1] = hypre_CSRMatrixI(diag)[i] + hypre_AuxParCSRMatrixDiagSizes(aux_matrix)[i];
+               hypre_CSRMatrixI(diag)[i + 1] = hypre_CSRMatrixI(diag)[i] +
+                                               hypre_AuxParCSRMatrixDiagSizes(aux_matrix)[i];
             }
             hypre_CSRMatrixNumNonzeros(diag) = hypre_CSRMatrixI(diag)[local_num_rows];
-            hypre_CSRMatrixInitialize(diag);
+            hypre_CSRMatrixInitialize_v2(diag, 0, memory_location);
          }
 
          if (hypre_AuxParCSRMatrixOffdSizes(aux_matrix))
          {
             for (i = 0; i < local_num_rows; i++)
             {
-               hypre_CSRMatrixI(offd)[i+1] = hypre_CSRMatrixI(offd)[i] + hypre_AuxParCSRMatrixOffdSizes(aux_matrix)[i];
+               hypre_CSRMatrixI(offd)[i + 1] = hypre_CSRMatrixI(offd)[i] +
+                                               hypre_AuxParCSRMatrixOffdSizes(aux_matrix)[i];
             }
             hypre_CSRMatrixNumNonzeros(offd) = hypre_CSRMatrixI(offd)[local_num_rows];
-            hypre_CSRMatrixInitialize(offd);
+            hypre_CSRMatrixInitialize_v2(offd, 0, memory_location);
          }
       }
 
       if (!hypre_AuxParCSRMatrixNeedAux(aux_matrix))
       {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+         #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
          for (i = 0; i < local_num_rows; i++)
          {
@@ -360,12 +466,12 @@ HYPRE_Int hypre_IJMatrixGetRowCountsParCSR( hypre_IJMatrix *matrix,
    HYPRE_Int i, my_id, index;
    HYPRE_Int print_level = hypre_IJMatrixPrintLevel(matrix);
 
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_rank(comm, &my_id);
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i, row_index) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i, row_index) HYPRE_SMP_SCHEDULE
 #endif
-   for (i=0; i < nrows; i++)
+   for (i = 0; i < nrows; i++)
    {
       row_index = rows[i];
       if (row_index >= row_partitioning[0] &&
@@ -373,7 +479,7 @@ HYPRE_Int hypre_IJMatrixGetRowCountsParCSR( hypre_IJMatrix *matrix,
       {
          /* compute local row number */
          index = (HYPRE_Int)(row_index - row_partitioning[0]);
-         ncols[i] = diag_i[index+1]-diag_i[index]+offd_i[index+1]-offd_i[index];
+         ncols[i] = diag_i[index + 1] - diag_i[index] + offd_i[index + 1] - offd_i[index];
       }
       else
       {
@@ -402,38 +508,39 @@ hypre_IJMatrixGetValuesParCSR( hypre_IJMatrix *matrix,
                                HYPRE_Int       nrows,
                                HYPRE_Int      *ncols,
                                HYPRE_BigInt   *rows,
+                               HYPRE_Int      *row_indexes,
                                HYPRE_BigInt   *cols,
-                               HYPRE_Complex  *values)
+                               HYPRE_Complex  *values,
+                               HYPRE_Int       zero_out)
 {
-   MPI_Comm comm = hypre_IJMatrixComm(matrix);
-   hypre_ParCSRMatrix *par_matrix = (hypre_ParCSRMatrix *) hypre_IJMatrixObject(matrix);
-   HYPRE_Int assemble_flag = hypre_IJMatrixAssembleFlag(matrix);
-
-   hypre_CSRMatrix *diag;
-   HYPRE_Int *diag_i;
-   HYPRE_Int *diag_j;
-   HYPRE_Complex *diag_data;
+   MPI_Comm             comm = hypre_IJMatrixComm(matrix);
+   hypre_ParCSRMatrix  *par_matrix = (hypre_ParCSRMatrix *) hypre_IJMatrixObject(matrix);
+   HYPRE_Int            assemble_flag = hypre_IJMatrixAssembleFlag(matrix);
 
-   hypre_CSRMatrix *offd;
-   HYPRE_Int *offd_i;
-   HYPRE_Int *offd_j;
-   HYPRE_Complex *offd_data;
+   hypre_CSRMatrix     *diag;
+   HYPRE_Int           *diag_i    = NULL;
+   HYPRE_Int           *diag_j    = NULL;
+   HYPRE_Complex       *diag_data = NULL;
 
-   HYPRE_BigInt *col_map_offd;
-   HYPRE_BigInt *col_starts = hypre_ParCSRMatrixColStarts(par_matrix);
+   hypre_CSRMatrix     *offd;
+   HYPRE_Int           *offd_i    = NULL;
+   HYPRE_Int           *offd_j    = NULL;
+   HYPRE_Complex       *offd_data = NULL;
 
-   HYPRE_BigInt *row_partitioning = hypre_IJMatrixRowPartitioning(matrix);
+   HYPRE_BigInt        *col_map_offd = NULL;
+   HYPRE_BigInt        *col_starts = hypre_ParCSRMatrixColStarts(par_matrix);
+   HYPRE_BigInt        *row_partitioning = hypre_IJMatrixRowPartitioning(matrix);
 
-   HYPRE_Int i, j, n, ii, indx;
-   HYPRE_Int num_procs, my_id;
-   HYPRE_BigInt col_0, col_n, row, col_indx, first;
-   HYPRE_Int row_local, row_size;
-   HYPRE_Int warning = 0;
-   HYPRE_Int *counter;
-   HYPRE_Int print_level = hypre_IJMatrixPrintLevel(matrix);
+   HYPRE_Int            i, j, n, ii, indx;
+   HYPRE_Int            num_procs, my_id;
+   HYPRE_BigInt         col_0, col_n, row, col_indx, first;
+   HYPRE_Int            row_local, row_size;
+   HYPRE_Int            warning = 0;
+   HYPRE_Int           *counter;
+   HYPRE_Int            print_level = hypre_IJMatrixPrintLevel(matrix);
 
-   hypre_MPI_Comm_size(comm,&num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_size(comm, &num_procs);
+   hypre_MPI_Comm_rank(comm, &my_id);
 
    if (assemble_flag == 0)
    {
@@ -445,7 +552,7 @@ hypre_IJMatrixGetValuesParCSR( hypre_IJMatrix *matrix,
    }
 
    col_0 = col_starts[0];
-   col_n = col_starts[1]-1;
+   col_n = col_starts[1] - 1;
    first = hypre_IJMatrixGlobalFirstCol(matrix);
 
    diag = hypre_ParCSRMatrixDiag(par_matrix);
@@ -466,23 +573,23 @@ hypre_IJMatrixGetValuesParCSR( hypre_IJMatrix *matrix,
    {
       nrows = -nrows;
 
-      counter = hypre_CTAlloc(HYPRE_Int, nrows+1, HYPRE_MEMORY_HOST);
+      counter = hypre_CTAlloc(HYPRE_Int, nrows + 1, HYPRE_MEMORY_HOST);
       counter[0] = 0;
-      for (i=0; i < nrows; i++)
+      for (i = 0; i < nrows; i++)
       {
-         counter[i+1] = counter[i]+ncols[i];
+         counter[i + 1] = counter[i] + ncols[i];
       }
 
       indx = 0;
-      for (i=0; i < nrows; i++)
+      for (i = 0; i < nrows; i++)
       {
          row = rows[i];
          if (row >= row_partitioning[0] && row < row_partitioning[1])
          {
             row_local = (HYPRE_Int)(row - row_partitioning[0]);
-            row_size = diag_i[row_local+1] - diag_i[row_local] +
-                       offd_i[row_local+1] - offd_i[row_local];
-            if (counter[i]+row_size > counter[nrows])
+            row_size = diag_i[row_local + 1] - diag_i[row_local] +
+                       offd_i[row_local + 1] - offd_i[row_local];
+            if (counter[i] + row_size > counter[nrows])
             {
                hypre_error_in_arg(1);
                if (print_level)
@@ -494,17 +601,25 @@ hypre_IJMatrixGetValuesParCSR( hypre_IJMatrix *matrix,
             {
                warning = 1;
             }
-            for (j = diag_i[row_local]; j < diag_i[row_local+1]; j++)
+            for (j = diag_i[row_local]; j < diag_i[row_local + 1]; j++)
             {
                cols[indx] = (HYPRE_BigInt)diag_j[j] + col_0;
                values[indx++] = diag_data[j];
+               if (zero_out)
+               {
+                  diag_data[j] = 0.0;
+               }
             }
-            for (j = offd_i[row_local]; j < offd_i[row_local+1]; j++)
+            for (j = offd_i[row_local]; j < offd_i[row_local + 1]; j++)
             {
                cols[indx] = col_map_offd[offd_j[j]];
                values[indx++] = offd_data[j];
+               if (zero_out)
+               {
+                  offd_data[j] = 0.0;
+               }
             }
-            counter[i+1] = indx;
+            counter[i + 1] = indx;
          }
          else
          {
@@ -516,9 +631,9 @@ hypre_IJMatrixGetValuesParCSR( hypre_IJMatrix *matrix,
       }
       if (warning)
       {
-         for (i=0; i < nrows; i++)
+         for (i = 0; i < nrows; i++)
          {
-            ncols[i] = counter[i+1] - counter[i];
+            ncols[i] = counter[i + 1] - counter[i];
          }
          if (print_level)
          {
@@ -530,7 +645,7 @@ hypre_IJMatrixGetValuesParCSR( hypre_IJMatrix *matrix,
    else
    {
       indx = 0;
-      for (ii=0; ii < nrows; ii++)
+      for (ii = 0; ii < nrows; ii++)
       {
          row = rows[ii];
          n = ncols[ii];
@@ -538,22 +653,27 @@ hypre_IJMatrixGetValuesParCSR( hypre_IJMatrix *matrix,
          {
             continue;
          }
+         indx = (row_indexes) ? row_indexes[ii] : indx;
          if (row >= row_partitioning[0] && row < row_partitioning[1])
          {
             row_local = (HYPRE_Int)(row - row_partitioning[0]);
             /* compute local row number */
-            for (i=0; i < n; i++)
+            for (i = 0; i < n; i++)
             {
                col_indx = cols[indx] - first;
                values[indx] = 0.0;
                if (col_indx < col_0 || col_indx > col_n)
                   /* search in offd */
                {
-                  for (j=offd_i[row_local]; j < offd_i[row_local+1]; j++)
+                  for (j = offd_i[row_local]; j < offd_i[row_local + 1]; j++)
                   {
                      if (col_map_offd[offd_j[j]] == col_indx)
                      {
                         values[indx] = offd_data[j];
+                        if (zero_out)
+                        {
+                           offd_data[j] = 0.0;
+                        }
                         break;
                      }
                   }
@@ -561,11 +681,15 @@ hypre_IJMatrixGetValuesParCSR( hypre_IJMatrix *matrix,
                else  /* search in diag */
                {
                   col_indx = col_indx - col_0;
-                  for (j=diag_i[row_local]; j < diag_i[row_local+1]; j++)
+                  for (j = diag_i[row_local]; j < diag_i[row_local + 1]; j++)
                   {
                      if (diag_j[j] == (HYPRE_Int)col_indx)
                      {
                         values[indx] = diag_data[j];
+                        if (zero_out)
+                        {
+                           diag_data[j] = 0.0;
+                        }
                         break;
                      }
                   }
@@ -620,7 +744,7 @@ hypre_IJMatrixSetValuesParCSR( hypre_IJMatrix       *matrix,
    HYPRE_BigInt *tmp_j;
    HYPRE_Complex **aux_data;
    HYPRE_Complex  *local_data;
-   HYPRE_Complex  *tmp_data;
+   HYPRE_Complex  *tmp_data = NULL;
    HYPRE_Int diag_space, offd_space;
    HYPRE_Int *row_length, *row_space;
    HYPRE_Int need_aux;
@@ -630,12 +754,12 @@ hypre_IJMatrixSetValuesParCSR( hypre_IJMatrix       *matrix,
    HYPRE_Int pos_diag, pos_offd;
    HYPRE_Int len_diag, len_offd;
    HYPRE_Int offd_indx, diag_indx;
-   HYPRE_Int *diag_i;
-   HYPRE_Int *diag_j;
-   HYPRE_Complex *diag_data;
-   HYPRE_Int *offd_i;
-   HYPRE_Int *offd_j;
-   HYPRE_Complex *offd_data;
+   HYPRE_Int *diag_i = NULL;
+   HYPRE_Int *diag_j = NULL;
+   HYPRE_Complex *diag_data = NULL;
+   HYPRE_Int *offd_i = NULL;
+   HYPRE_Int *offd_j = NULL;
+   HYPRE_Complex *offd_data = NULL;
    HYPRE_BigInt first;
    /*HYPRE_Int current_num_elmts;*/
    /*HYPRE_Int max_off_proc_elmts;*/
@@ -651,7 +775,7 @@ hypre_IJMatrixSetValuesParCSR( hypre_IJMatrix       *matrix,
    col_partitioning = hypre_IJMatrixColPartitioning(matrix);
 
    col_0 = col_partitioning[0];
-   col_n = col_partitioning[1]-1;
+   col_n = col_partitioning[1] - 1;
    first =  hypre_IJMatrixGlobalFirstCol(matrix);
    if (nrows < 0)
    {
@@ -664,10 +788,10 @@ hypre_IJMatrixSetValuesParCSR( hypre_IJMatrix       *matrix,
 
    if (hypre_IJMatrixAssembleFlag(matrix))  /* matrix already assembled*/
    {
-      HYPRE_BigInt *col_map_offd;
+      HYPRE_BigInt *col_map_offd = NULL;
       HYPRE_Int num_cols_offd;
       HYPRE_Int j_offd;
-      for (ii=0; ii < nrows; ii++)
+      for (ii = 0; ii < nrows; ii++)
       {
          row = rows[ii];
          n = ncols ? ncols[ii] : 1;
@@ -696,8 +820,8 @@ hypre_IJMatrixSetValuesParCSR( hypre_IJMatrix       *matrix,
                offd_j = hypre_CSRMatrixJ(offd);
                offd_data = hypre_CSRMatrixData(offd);
             }
-            size = diag_i[row_local+1] - diag_i[row_local] +
-                   offd_i[row_local+1] - offd_i[row_local];
+            size = diag_i[row_local + 1] - diag_i[row_local] +
+                   offd_i[row_local + 1] - offd_i[row_local];
 
             if (n > size)  /* Should we change this and allow this?
                               This could be same column index, i.e. only last
@@ -713,17 +837,17 @@ hypre_IJMatrixSetValuesParCSR( hypre_IJMatrix       *matrix,
 
             pos_diag = diag_i[row_local];
             pos_offd = offd_i[row_local];
-            len_diag = diag_i[row_local+1];
-            len_offd = offd_i[row_local+1];
+            len_diag = diag_i[row_local + 1];
+            len_offd = offd_i[row_local + 1];
             not_found = 1;
 
-            for (i=0; i < n; i++)
+            for (i = 0; i < n; i++)
             {
                if (cols[indx] < col_0 || cols[indx] > col_n)
                   /* insert into offd */
                {
-                  j_offd = hypre_BigBinarySearch(col_map_offd,cols[indx]-first,
-                                              num_cols_offd);
+                  j_offd = hypre_BigBinarySearch(col_map_offd, cols[indx] - first,
+                                                 num_cols_offd);
                   if (j_offd == -1)
                   {
                      hypre_error(HYPRE_ERROR_GENERIC);
@@ -734,7 +858,7 @@ hypre_IJMatrixSetValuesParCSR( hypre_IJMatrix       *matrix,
                      }
                      return hypre_error_flag;
                   }
-                  for (j=pos_offd; j < len_offd; j++)
+                  for (j = pos_offd; j < len_offd; j++)
                   {
                      if (offd_j[j] == j_offd)
                      {
@@ -773,9 +897,9 @@ hypre_IJMatrixSetValuesParCSR( hypre_IJMatrix       *matrix,
                }
                else  /* insert into diag */
                {
-                  for (j=pos_diag; j < len_diag; j++)
+                  for (j = pos_diag; j < len_diag; j++)
                   {
-                     if (diag_j[j] == (HYPRE_Int)(cols[indx]-col_0))
+                     if (diag_j[j] == (HYPRE_Int)(cols[indx] - col_0))
                      {
                         diag_data[j] = values[indx];
                         not_found = 0;
@@ -805,7 +929,7 @@ hypre_IJMatrixSetValuesParCSR( hypre_IJMatrix       *matrix,
       row_space = hypre_AuxParCSRMatrixRowSpace(aux_matrix);
       row_length = hypre_AuxParCSRMatrixRowLength(aux_matrix);
       need_aux = hypre_AuxParCSRMatrixNeedAux(aux_matrix);
-      for (ii=0; ii < nrows; ii++)
+      for (ii = 0; ii < nrows; ii++)
       {
          row = rows[ii];
          n = ncols ? ncols[ii] : 1;
@@ -818,6 +942,7 @@ hypre_IJMatrixSetValuesParCSR( hypre_IJMatrix       *matrix,
          if (row >= row_partitioning[0] && row < row_partitioning[1])
          {
             row_local = (HYPRE_Int)(row - row_partitioning[0]);
+
             /* compute local row number */
             if (need_aux)
             {
@@ -841,9 +966,9 @@ hypre_IJMatrixSetValuesParCSR( hypre_IJMatrix       *matrix,
                tmp_indx = 0;
                not_found = 1;
                size = old_size;
-               for (i=0; i < n; i++)
+               for (i = 0; i < n; i++)
                {
-                  for (j=0; j < old_size; j++)
+                  for (j = 0; j < old_size; j++)
                   {
                      if (local_j[j] == cols[indx])
                      {
@@ -869,22 +994,23 @@ hypre_IJMatrixSetValuesParCSR( hypre_IJMatrix       *matrix,
                   indx++;
                }
 
-               row_length[row_local] = size+tmp_indx;
+               row_length[row_local] = size + tmp_indx;
 
                if (tmp_indx)
                {
                   aux_j[row_local] = hypre_TReAlloc(aux_j[row_local], HYPRE_BigInt,
-                                                    size+tmp_indx, HYPRE_MEMORY_HOST);
+                                                    size + tmp_indx, HYPRE_MEMORY_HOST);
                   aux_data[row_local] = hypre_TReAlloc(aux_data[row_local],
-                                                       HYPRE_Complex, size+tmp_indx, HYPRE_MEMORY_HOST);
-                  row_space[row_local] = size+tmp_indx;
+                                                       HYPRE_Complex, size + tmp_indx,
+                                                       HYPRE_MEMORY_HOST);
+                  row_space[row_local] = size + tmp_indx;
                   local_j = aux_j[row_local];
                   local_data = aux_data[row_local];
                }
 
                cnt = size;
 
-               for (i=0; i < tmp_indx; i++)
+               for (i = 0; i < tmp_indx; i++)
                {
                   local_j[cnt] = tmp_j[i];
                   local_data[cnt++] = tmp_data[i];
@@ -898,10 +1024,11 @@ hypre_IJMatrixSetValuesParCSR( hypre_IJMatrix       *matrix,
             }
             else /* insert immediately into data in ParCSRMatrix structure */
             {
-               HYPRE_BigInt *big_offd_j;
-               HYPRE_Int col_j;
-               offd_indx =hypre_AuxParCSRMatrixIndxOffd(aux_matrix)[row_local];
-               diag_indx =hypre_AuxParCSRMatrixIndxDiag(aux_matrix)[row_local];
+               HYPRE_BigInt *big_offd_j = NULL;
+               HYPRE_Int     col_j;
+
+               offd_indx = hypre_AuxParCSRMatrixIndxOffd(aux_matrix)[row_local];
+               diag_indx = hypre_AuxParCSRMatrixIndxDiag(aux_matrix)[row_local];
                diag = hypre_ParCSRMatrixDiag(par_matrix);
                diag_i = hypre_CSRMatrixI(diag);
                diag_j = hypre_CSRMatrixJ(diag);
@@ -914,22 +1041,23 @@ hypre_IJMatrixSetValuesParCSR( hypre_IJMatrix       *matrix,
                   offd_data = hypre_CSRMatrixData(offd);
                   if (!big_offd_j)
                   {
-                     big_offd_j = hypre_CTAlloc(HYPRE_BigInt, offd_i[hypre_CSRMatrixNumRows(offd)],
+                     big_offd_j = hypre_CTAlloc(HYPRE_BigInt,
+                                                offd_i[hypre_CSRMatrixNumRows(offd)],
                                                 hypre_CSRMatrixMemoryLocation(offd));
                      hypre_CSRMatrixBigJ(offd) = big_offd_j;
                   }
                }
                cnt_diag = diag_indx;
                cnt_offd = offd_indx;
-               diag_space = diag_i[row_local+1];
-               offd_space = offd_i[row_local+1];
+               diag_space = diag_i[row_local + 1];
+               offd_space = offd_i[row_local + 1];
                not_found = 1;
-               for (i=0; i < n; i++)
+               for (i = 0; i < n; i++)
                {
                   if (cols[indx] < col_0 || cols[indx] > col_n)
                      /* insert into offd */
                   {
-                     for (j=offd_i[row_local]; j < offd_indx; j++)
+                     for (j = offd_i[row_local]; j < offd_indx; j++)
                      {
                         if (big_offd_j[j] == cols[indx])
                         {
@@ -961,8 +1089,8 @@ hypre_IJMatrixSetValuesParCSR( hypre_IJMatrix       *matrix,
                   }
                   else  /* insert into diag */
                   {
-                     col_j = (HYPRE_Int)(cols[indx]-col_0);
-                     for (j=diag_i[row_local]; j < diag_indx; j++)
+                     col_j = (HYPRE_Int)(cols[indx] - col_0);
+                     for (j = diag_i[row_local]; j < diag_indx; j++)
                      {
                         if (diag_j[j] == col_j)
                         {
@@ -1002,6 +1130,8 @@ hypre_IJMatrixSetValuesParCSR( hypre_IJMatrix       *matrix,
       }
    }
 
+   HYPRE_PRINT_MEMORY_USAGE(comm);
+
    return hypre_error_flag;
 }
 
@@ -1027,14 +1157,14 @@ hypre_IJMatrixSetConstantValuesParCSRHost( hypre_IJMatrix *matrix,
    HYPRE_Int           ii;
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(ii) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(ii) HYPRE_SMP_SCHEDULE
 #endif
    for (ii = 0; ii < nnz_diag; ii++)
    {
       diag_data[ii] = value;
    }
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(ii) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(ii) HYPRE_SMP_SCHEDULE
 #endif
    for (ii = 0; ii < nnz_offd; ii++)
    {
@@ -1048,7 +1178,7 @@ hypre_IJMatrixSetConstantValuesParCSR( hypre_IJMatrix *matrix,
 {
    if (hypre_IJMatrixAssembleFlag(matrix))  /* matrix already assembled*/
    {
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
       if (hypre_GetExecPolicy1(hypre_IJMatrixMemoryLocation(matrix)) == HYPRE_EXEC_DEVICE)
       {
          hypre_IJMatrixSetConstantValuesParCSRDevice(matrix, value);
@@ -1101,7 +1231,7 @@ hypre_IJMatrixAddToValuesParCSR( hypre_IJMatrix       *matrix,
    HYPRE_BigInt *tmp_j;
    HYPRE_Complex **aux_data;
    HYPRE_Complex  *local_data;
-   HYPRE_Complex  *tmp_data;
+   HYPRE_Complex  *tmp_data = NULL;
    HYPRE_Int diag_space, offd_space;
    HYPRE_Int *row_length, *row_space;
    HYPRE_Int need_aux;
@@ -1112,12 +1242,12 @@ hypre_IJMatrixAddToValuesParCSR( hypre_IJMatrix       *matrix,
    HYPRE_Int len_diag, len_offd;
    HYPRE_Int offd_indx, diag_indx;
    HYPRE_BigInt first;
-   HYPRE_Int *diag_i;
-   HYPRE_Int *diag_j;
-   HYPRE_Complex *diag_data;
-   HYPRE_Int *offd_i;
-   HYPRE_Int *offd_j;
-   HYPRE_Complex *offd_data;
+   HYPRE_Int *diag_i = NULL;
+   HYPRE_Int *diag_j = NULL;
+   HYPRE_Complex *diag_data = NULL;
+   HYPRE_Int *offd_i = NULL;
+   HYPRE_Int *offd_j = NULL;
+   HYPRE_Complex *offd_data = NULL;
    HYPRE_Int current_num_elmts;
    HYPRE_Int max_off_proc_elmts;
    HYPRE_Int off_proc_i_indx;
@@ -1132,18 +1262,18 @@ hypre_IJMatrixAddToValuesParCSR( hypre_IJMatrix       *matrix,
    row_partitioning = hypre_IJMatrixRowPartitioning(matrix);
    col_partitioning = hypre_IJMatrixColPartitioning(matrix);
    col_0 = col_partitioning[0];
-   col_n = col_partitioning[1]-1;
+   col_n = col_partitioning[1] - 1;
    first = hypre_IJMatrixGlobalFirstCol(matrix);
    if (hypre_IJMatrixAssembleFlag(matrix))
    {
       HYPRE_Int num_cols_offd;
-      HYPRE_BigInt *col_map_offd;
+      HYPRE_BigInt *col_map_offd = NULL;
       HYPRE_Int j_offd;
 
       /* AB - 4/06 - need to get this object*/
       aux_matrix = (hypre_AuxParCSRMatrix *) hypre_IJMatrixTranslator(matrix);
 
-      for (ii=0; ii < nrows; ii++)
+      for (ii = 0; ii < nrows; ii++)
       {
          row = rows[ii];
          n = ncols ? ncols[ii] : 1;
@@ -1169,8 +1299,8 @@ hypre_IJMatrixAddToValuesParCSR( hypre_IJMatrix       *matrix,
                offd_j = hypre_CSRMatrixJ(offd);
                offd_data = hypre_CSRMatrixData(offd);
             }
-            size = diag_i[row_local+1] - diag_i[row_local] +
-                   offd_i[row_local+1] - offd_i[row_local];
+            size = diag_i[row_local + 1] - diag_i[row_local] +
+                   offd_i[row_local + 1] - offd_i[row_local];
 
             if (n > size)  /* Should we change this and allow this?
                               This could be same column index, i.e. only last
@@ -1186,17 +1316,17 @@ hypre_IJMatrixAddToValuesParCSR( hypre_IJMatrix       *matrix,
 
             pos_diag = diag_i[row_local];
             pos_offd = offd_i[row_local];
-            len_diag = diag_i[row_local+1];
-            len_offd = offd_i[row_local+1];
+            len_diag = diag_i[row_local + 1];
+            len_offd = offd_i[row_local + 1];
             not_found = 1;
 
-            for (i=0; i < n; i++)
+            for (i = 0; i < n; i++)
             {
                if (cols[indx] < col_0 || cols[indx] > col_n)
                   /* insert into offd */
                {
-                  j_offd = hypre_BigBinarySearch(col_map_offd,cols[indx]-first,
-                                              num_cols_offd);
+                  j_offd = hypre_BigBinarySearch(col_map_offd, cols[indx] - first,
+                                                 num_cols_offd);
                   if (j_offd == -1)
                   {
                      hypre_error(HYPRE_ERROR_GENERIC);
@@ -1208,7 +1338,7 @@ hypre_IJMatrixAddToValuesParCSR( hypre_IJMatrix       *matrix,
                      return hypre_error_flag;
                      /* return -1; */
                   }
-                  for (j=pos_offd; j < len_offd; j++)
+                  for (j = pos_offd; j < len_offd; j++)
                   {
                      if (offd_j[j] == j_offd)
                      {
@@ -1246,9 +1376,9 @@ hypre_IJMatrixAddToValuesParCSR( hypre_IJMatrix       *matrix,
                }
                else  /* insert into diag */
                {
-                  for (j=pos_diag; j < len_diag; j++)
+                  for (j = pos_diag; j < len_diag; j++)
                   {
-                     if (diag_j[j] == (HYPRE_Int)(cols[indx]-col_0))
+                     if (diag_j[j] == (HYPRE_Int)(cols[indx] - col_0))
                      {
                         diag_data[j] += values[indx];
                         not_found = 0;
@@ -1274,7 +1404,7 @@ hypre_IJMatrixAddToValuesParCSR( hypre_IJMatrix       *matrix,
          {
             if (!aux_matrix)
             {
-               size = (HYPRE_Int)(row_partitioning[1]-row_partitioning[0]);
+               size = (HYPRE_Int)(row_partitioning[1] - row_partitioning[0]);
                hypre_AuxParCSRMatrixCreate(&aux_matrix, size, size, NULL);
                hypre_AuxParCSRMatrixNeedAux(aux_matrix) = 0;
                hypre_IJMatrixTranslator(matrix) = aux_matrix;
@@ -1290,10 +1420,10 @@ hypre_IJMatrixAddToValuesParCSR( hypre_IJMatrix       *matrix,
 
             if (!max_off_proc_elmts)
             {
-               max_off_proc_elmts = hypre_max(n,1000);
+               max_off_proc_elmts = hypre_max(n, 1000);
                hypre_AuxParCSRMatrixMaxOffProcElmts(aux_matrix) = max_off_proc_elmts;
                hypre_AuxParCSRMatrixOffProcI(aux_matrix)
-                  = hypre_CTAlloc(HYPRE_BigInt, 2*max_off_proc_elmts, HYPRE_MEMORY_HOST);
+                  = hypre_CTAlloc(HYPRE_BigInt, 2 * max_off_proc_elmts, HYPRE_MEMORY_HOST);
                hypre_AuxParCSRMatrixOffProcJ(aux_matrix)
                   = hypre_CTAlloc(HYPRE_BigInt, max_off_proc_elmts, HYPRE_MEMORY_HOST);
                hypre_AuxParCSRMatrixOffProcData(aux_matrix)
@@ -1304,10 +1434,10 @@ hypre_IJMatrixAddToValuesParCSR( hypre_IJMatrix       *matrix,
             }
             else if (current_num_elmts + n > max_off_proc_elmts)
             {
-               max_off_proc_elmts += 3*n;
-               off_proc_i = hypre_TReAlloc(off_proc_i, HYPRE_BigInt, 2*max_off_proc_elmts, HYPRE_MEMORY_HOST);
+               max_off_proc_elmts += 3 * n;
+               off_proc_i = hypre_TReAlloc(off_proc_i, HYPRE_BigInt, 2 * max_off_proc_elmts, HYPRE_MEMORY_HOST);
                off_proc_j = hypre_TReAlloc(off_proc_j, HYPRE_BigInt, max_off_proc_elmts, HYPRE_MEMORY_HOST);
-               off_proc_data = hypre_TReAlloc(off_proc_data,HYPRE_Complex,
+               off_proc_data = hypre_TReAlloc(off_proc_data, HYPRE_Complex,
                                               max_off_proc_elmts, HYPRE_MEMORY_HOST);
                hypre_AuxParCSRMatrixMaxOffProcElmts(aux_matrix) = max_off_proc_elmts;
                hypre_AuxParCSRMatrixOffProcI(aux_matrix) = off_proc_i;
@@ -1322,7 +1452,7 @@ hypre_IJMatrixAddToValuesParCSR( hypre_IJMatrix       *matrix,
             off_proc_i[off_proc_i_indx++] = row;
 
             off_proc_i[off_proc_i_indx++] = n;
-            for (i=0; i < n; i++)
+            for (i = 0; i < n; i++)
             {
                off_proc_j[current_num_elmts] = cols[indx];
                off_proc_data[current_num_elmts++] = values[indx++];
@@ -1341,7 +1471,7 @@ hypre_IJMatrixAddToValuesParCSR( hypre_IJMatrix       *matrix,
       row_space = hypre_AuxParCSRMatrixRowSpace(aux_matrix);
       row_length = hypre_AuxParCSRMatrixRowLength(aux_matrix);
       need_aux = hypre_AuxParCSRMatrixNeedAux(aux_matrix);
-      for (ii=0; ii < nrows; ii++)
+      for (ii = 0; ii < nrows; ii++)
       {
          row = rows[ii];
          n = ncols ? ncols[ii] : 1;
@@ -1376,9 +1506,9 @@ hypre_IJMatrixAddToValuesParCSR( hypre_IJMatrix       *matrix,
                tmp_indx = 0;
                not_found = 1;
                size = old_size;
-               for (i=0; i < n; i++)
+               for (i = 0; i < n; i++)
                {
-                  for (j=0; j < old_size; j++)
+                  for (j = 0; j < old_size; j++)
                   {
                      if (local_j[j] == cols[indx])
                      {
@@ -1404,22 +1534,23 @@ hypre_IJMatrixAddToValuesParCSR( hypre_IJMatrix       *matrix,
                   indx++;
                }
 
-               row_length[row_local] = size+tmp_indx;
+               row_length[row_local] = size + tmp_indx;
 
                if (tmp_indx)
                {
                   aux_j[row_local] = hypre_TReAlloc(aux_j[row_local], HYPRE_BigInt,
-                                                    size+tmp_indx, HYPRE_MEMORY_HOST);
+                                                    size + tmp_indx, HYPRE_MEMORY_HOST);
                   aux_data[row_local] = hypre_TReAlloc(aux_data[row_local],
-                                                       HYPRE_Complex, size+tmp_indx, HYPRE_MEMORY_HOST);
-                  row_space[row_local] = size+tmp_indx;
+                                                       HYPRE_Complex, size + tmp_indx,
+                                                       HYPRE_MEMORY_HOST);
+                  row_space[row_local] = size + tmp_indx;
                   local_j = aux_j[row_local];
                   local_data = aux_data[row_local];
                }
 
                cnt = size;
 
-               for (i=0; i < tmp_indx; i++)
+               for (i = 0; i < tmp_indx; i++)
                {
                   local_j[cnt] = tmp_j[i];
                   local_data[cnt++] = tmp_data[i];
@@ -1433,7 +1564,8 @@ hypre_IJMatrixAddToValuesParCSR( hypre_IJMatrix       *matrix,
             }
             else /* insert immediately into data in ParCSRMatrix structure */
             {
-               HYPRE_BigInt *big_offd_j;
+               HYPRE_BigInt *big_offd_j = NULL;
+
                offd_indx = hypre_AuxParCSRMatrixIndxOffd(aux_matrix)[row_local];
                diag_indx = hypre_AuxParCSRMatrixIndxDiag(aux_matrix)[row_local];
                diag = hypre_ParCSRMatrixDiag(par_matrix);
@@ -1448,22 +1580,23 @@ hypre_IJMatrixAddToValuesParCSR( hypre_IJMatrix       *matrix,
                   offd_data = hypre_CSRMatrixData(offd);
                   if (!big_offd_j)
                   {
-                     big_offd_j = hypre_CTAlloc(HYPRE_BigInt, offd_i[hypre_CSRMatrixNumRows(offd)],
+                     big_offd_j = hypre_CTAlloc(HYPRE_BigInt,
+                                                offd_i[hypre_CSRMatrixNumRows(offd)],
                                                 hypre_CSRMatrixMemoryLocation(offd));
                      hypre_CSRMatrixBigJ(offd) = big_offd_j;
                   }
                }
                cnt_diag = diag_indx;
                cnt_offd = offd_indx;
-               diag_space = diag_i[row_local+1];
-               offd_space = offd_i[row_local+1];
+               diag_space = diag_i[row_local + 1];
+               offd_space = offd_i[row_local + 1];
                not_found = 1;
-               for (i=0; i < n; i++)
+               for (i = 0; i < n; i++)
                {
                   if (cols[indx] < col_0 || cols[indx] > col_n)
                      /* insert into offd */
                   {
-                     for (j=offd_i[row_local]; j < offd_indx; j++)
+                     for (j = offd_i[row_local]; j < offd_indx; j++)
                      {
                         if (big_offd_j[j] == cols[indx])
                         {
@@ -1496,7 +1629,7 @@ hypre_IJMatrixAddToValuesParCSR( hypre_IJMatrix       *matrix,
                   else  /* insert into diag */
                   {
                      HYPRE_Int col_j = (HYPRE_Int)( cols[indx] - col_0);
-                     for (j=diag_i[row_local]; j < diag_indx; j++)
+                     for (j = diag_i[row_local]; j < diag_indx; j++)
                      {
                         if (diag_j[j] == col_j)
                         {
@@ -1548,11 +1681,11 @@ hypre_IJMatrixAddToValuesParCSR( hypre_IJMatrix       *matrix,
 
             if (!max_off_proc_elmts)
             {
-               max_off_proc_elmts = hypre_max(n,1000);
+               max_off_proc_elmts = hypre_max(n, 1000);
                hypre_AuxParCSRMatrixMaxOffProcElmts(aux_matrix) =
                   max_off_proc_elmts;
                hypre_AuxParCSRMatrixOffProcI(aux_matrix)
-                  = hypre_CTAlloc(HYPRE_BigInt, 2*max_off_proc_elmts, HYPRE_MEMORY_HOST);
+                  = hypre_CTAlloc(HYPRE_BigInt, 2 * max_off_proc_elmts, HYPRE_MEMORY_HOST);
                hypre_AuxParCSRMatrixOffProcJ(aux_matrix)
                   = hypre_CTAlloc(HYPRE_BigInt, max_off_proc_elmts, HYPRE_MEMORY_HOST);
                hypre_AuxParCSRMatrixOffProcData(aux_matrix)
@@ -1563,10 +1696,10 @@ hypre_IJMatrixAddToValuesParCSR( hypre_IJMatrix       *matrix,
             }
             else if (current_num_elmts + n > max_off_proc_elmts)
             {
-               max_off_proc_elmts += 3*n;
-               off_proc_i = hypre_TReAlloc(off_proc_i, HYPRE_BigInt, 2*max_off_proc_elmts, HYPRE_MEMORY_HOST);
+               max_off_proc_elmts += 3 * n;
+               off_proc_i = hypre_TReAlloc(off_proc_i, HYPRE_BigInt, 2 * max_off_proc_elmts, HYPRE_MEMORY_HOST);
                off_proc_j = hypre_TReAlloc(off_proc_j, HYPRE_BigInt, max_off_proc_elmts, HYPRE_MEMORY_HOST);
-               off_proc_data = hypre_TReAlloc(off_proc_data,HYPRE_Complex,
+               off_proc_data = hypre_TReAlloc(off_proc_data, HYPRE_Complex,
                                               max_off_proc_elmts, HYPRE_MEMORY_HOST);
                hypre_AuxParCSRMatrixMaxOffProcElmts(aux_matrix)
                   = max_off_proc_elmts;
@@ -1576,7 +1709,7 @@ hypre_IJMatrixAddToValuesParCSR( hypre_IJMatrix       *matrix,
             }
             off_proc_i[off_proc_i_indx++] = row;
             off_proc_i[off_proc_i_indx++] = n;
-            for (i=0; i < n; i++)
+            for (i = 0; i < n; i++)
             {
                off_proc_j[current_num_elmts] = cols[indx];
                off_proc_data[current_num_elmts++] = values[indx++];
@@ -1588,6 +1721,8 @@ hypre_IJMatrixAddToValuesParCSR( hypre_IJMatrix       *matrix,
       }
    }
 
+   HYPRE_PRINT_MEMORY_USAGE(comm);
+
    return hypre_error_flag;
 }
 
@@ -1605,6 +1740,10 @@ hypre_IJMatrixDestroyParCSR(hypre_IJMatrix *matrix)
    hypre_ParCSRMatrixDestroy((hypre_ParCSRMatrix *)hypre_IJMatrixObject(matrix));
    hypre_AuxParCSRMatrixDestroy((hypre_AuxParCSRMatrix*)hypre_IJMatrixTranslator(matrix));
 
+   /* Reset pointers to NULL */
+   hypre_IJMatrixObject(matrix)     = NULL;
+   hypre_IJMatrixTranslator(matrix) = NULL;
+
    return hypre_error_flag;
 }
 
@@ -1723,6 +1862,8 @@ hypre_IJMatrixAssembleOffProcValsParCSR( hypre_IJMatrix       *matrix,
                                          HYPRE_BigInt         *off_proc_j,
                                          HYPRE_Complex        *off_proc_data )
 {
+   HYPRE_UNUSED_VAR(max_off_proc_elmts);
+
    MPI_Comm comm = hypre_IJMatrixComm(matrix);
 
    HYPRE_Int i, j, k, in_i;
@@ -1746,15 +1887,15 @@ hypre_IJMatrixAssembleOffProcValsParCSR( hypre_IJMatrix       *matrix,
    HYPRE_Int num_real_procs;
    HYPRE_Int /*current_proc,*/ original_proc_indx;
 
-   HYPRE_BigInt *row_list=NULL;
-   HYPRE_Int *row_list_num_elements=NULL;
-   HYPRE_Int *a_proc_id=NULL, *orig_order=NULL;
+   HYPRE_BigInt *row_list = NULL;
+   HYPRE_BigInt *row_list_num_elements = NULL;
+   HYPRE_Int *a_proc_id = NULL, *orig_order = NULL;
    HYPRE_Int *real_proc_id = NULL, *us_real_proc_id = NULL;
    HYPRE_Int *ex_contact_procs = NULL, *ex_contact_vec_starts = NULL;
    HYPRE_BigInt *ex_contact_buf = NULL;
-   HYPRE_Int *recv_starts=NULL;
+   HYPRE_Int *recv_starts = NULL;
    HYPRE_BigInt *response_buf = NULL;
-   HYPRE_Int *response_buf_starts=NULL;
+   HYPRE_Int *response_buf_starts = NULL;
    HYPRE_Int *num_rows_per_proc = NULL, *num_elements_total = NULL;
    HYPRE_Int *argsort_contact_procs = NULL;
 
@@ -1786,24 +1927,34 @@ hypre_IJMatrixAssembleOffProcValsParCSR( hypre_IJMatrix       *matrix,
 
    if (memory_location == HYPRE_MEMORY_DEVICE)
    {
-      HYPRE_BigInt  *tmp             = hypre_TAlloc(HYPRE_BigInt,    current_num_elmts, HYPRE_MEMORY_HOST);
-      HYPRE_BigInt  *off_proc_i_h    = hypre_TAlloc(HYPRE_BigInt,  2*current_num_elmts, HYPRE_MEMORY_HOST);
-      HYPRE_BigInt  *off_proc_j_h    = hypre_TAlloc(HYPRE_BigInt,    current_num_elmts, HYPRE_MEMORY_HOST);
-      HYPRE_Complex *off_proc_data_h = hypre_TAlloc(HYPRE_Complex,   current_num_elmts, HYPRE_MEMORY_HOST);
-
-      hypre_TMemcpy(tmp,             off_proc_i,    HYPRE_BigInt,  current_num_elmts, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
-      hypre_TMemcpy(off_proc_j_h,    off_proc_j,    HYPRE_BigInt,  current_num_elmts, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
-      hypre_TMemcpy(off_proc_data_h, off_proc_data, HYPRE_Complex, current_num_elmts, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
+      HYPRE_BigInt  *tmp             = hypre_TAlloc(HYPRE_BigInt,    current_num_elmts,
+                                                    HYPRE_MEMORY_HOST);
+      HYPRE_BigInt  *off_proc_i_h    = hypre_TAlloc(HYPRE_BigInt,  2 * current_num_elmts,
+                                                    HYPRE_MEMORY_HOST);
+      HYPRE_BigInt  *off_proc_j_h    = hypre_TAlloc(HYPRE_BigInt,    current_num_elmts,
+                                                    HYPRE_MEMORY_HOST);
+      HYPRE_Complex *off_proc_data_h = hypre_TAlloc(HYPRE_Complex,   current_num_elmts,
+                                                    HYPRE_MEMORY_HOST);
+
+      hypre_TMemcpy(tmp,             off_proc_i,    HYPRE_BigInt,  current_num_elmts, HYPRE_MEMORY_HOST,
+                    HYPRE_MEMORY_DEVICE);
+      hypre_TMemcpy(off_proc_j_h,    off_proc_j,    HYPRE_BigInt,  current_num_elmts, HYPRE_MEMORY_HOST,
+                    HYPRE_MEMORY_DEVICE);
+      hypre_TMemcpy(off_proc_data_h, off_proc_data, HYPRE_Complex, current_num_elmts, HYPRE_MEMORY_HOST,
+                    HYPRE_MEMORY_DEVICE);
 
       for (i = 0; i < current_num_elmts; i++)
       {
 #if defined(HYPRE_DEBUG)
-         hypre_assert(tmp[i] < hypre_IJMatrixRowPartitioning(matrix)[0] || tmp[i] >= hypre_IJMatrixRowPartitioning(matrix)[1]);
-         hypre_assert(tmp[i] >= global_first_row && tmp[i] < global_first_row + hypre_IJMatrixGlobalNumRows(matrix));
-         hypre_assert(off_proc_j_h[i] >= global_first_col && off_proc_j_h[i] < global_first_col + global_num_cols);
+         hypre_assert(tmp[i] < hypre_IJMatrixRowPartitioning(matrix)[0] ||
+                      tmp[i] >= hypre_IJMatrixRowPartitioning(matrix)[1]);
+         hypre_assert(tmp[i] >= global_first_row &&
+                      tmp[i] < global_first_row + hypre_IJMatrixGlobalNumRows(matrix));
+         hypre_assert(off_proc_j_h[i] >= global_first_col &&
+                      off_proc_j_h[i] < global_first_col + global_num_cols);
 #endif
-         off_proc_i_h[2*i]   = tmp[i];
-         off_proc_i_h[2*i+1] = 1;
+         off_proc_i_h[2 * i]   = tmp[i];
+         off_proc_i_h[2 * i + 1] = 1;
       }
 
       off_proc_i_indx = current_num_elmts * 2;
@@ -1826,7 +1977,7 @@ hypre_IJMatrixAssembleOffProcValsParCSR( hypre_IJMatrix       *matrix,
    HYPRE_BigInt  *off_proc_j_recv_d = NULL;
    HYPRE_Complex *off_proc_data_recv_d = NULL;
 
-   num_rows = off_proc_i_indx/2;
+   num_rows = off_proc_i_indx / 2;
 
    /* verify that we have created the assumed partition */
    if  (hypre_IJMatrixAssumedPart(matrix) == NULL)
@@ -1843,21 +1994,21 @@ hypre_IJMatrixAssembleOffProcValsParCSR( hypre_IJMatrix       *matrix,
 
      apart = hypre_ParCSRMatrixAssumedPartition(par_matrix);*/
 
-   row_list = hypre_CTAlloc(HYPRE_BigInt,  num_rows, HYPRE_MEMORY_HOST);
-   row_list_num_elements = hypre_CTAlloc(HYPRE_Int,  num_rows, HYPRE_MEMORY_HOST);
-   a_proc_id = hypre_CTAlloc(HYPRE_Int,  num_rows, HYPRE_MEMORY_HOST);
-   orig_order =  hypre_CTAlloc(HYPRE_Int,  num_rows, HYPRE_MEMORY_HOST);
-   real_proc_id = hypre_CTAlloc(HYPRE_Int,  num_rows, HYPRE_MEMORY_HOST);
+   row_list              = hypre_CTAlloc(HYPRE_BigInt, num_rows, HYPRE_MEMORY_HOST);
+   row_list_num_elements = hypre_CTAlloc(HYPRE_BigInt, num_rows, HYPRE_MEMORY_HOST);
+   a_proc_id             = hypre_CTAlloc(HYPRE_Int, num_rows, HYPRE_MEMORY_HOST);
+   orig_order            = hypre_CTAlloc(HYPRE_Int, num_rows, HYPRE_MEMORY_HOST);
+   real_proc_id          = hypre_CTAlloc(HYPRE_Int, num_rows, HYPRE_MEMORY_HOST);
 
    /* get the assumed processor id for each row */
    if (num_rows > 0 )
    {
-      for (i=0; i < num_rows; i++)
+      for (i = 0; i < num_rows; i++)
       {
-         row = off_proc_i[i*2];
+         row = off_proc_i[i * 2];
          //if (row < 0) row = -row - 1;
          row_list[i] = row;
-         row_list_num_elements[i] = off_proc_i[i*2+1];
+         row_list_num_elements[i] = off_proc_i[i * 2 + 1];
 
          hypre_GetAssumedPartitionProcFromRow(comm, row, global_first_row,
                                               global_num_cols, &proc_id);
@@ -1868,12 +2019,12 @@ hypre_IJMatrixAssembleOffProcValsParCSR( hypre_IJMatrix       *matrix,
       /* now we need to find the actual order of each row  - sort on row -
          this will result in proc ids sorted also...*/
 
-      hypre_BigQsortb2i(row_list, a_proc_id, orig_order, 0, num_rows -1);
+      hypre_BigQsortb2i(row_list, a_proc_id, orig_order, 0, num_rows - 1);
 
       /* calculate the number of contacts */
       ex_num_contacts = 1;
       last_proc = a_proc_id[0];
-      for (i=1; i < num_rows; i++)
+      for (i = 1; i < num_rows; i++)
       {
          if (a_proc_id[i] > last_proc)
          {
@@ -1888,12 +2039,12 @@ hypre_IJMatrixAssembleOffProcValsParCSR( hypre_IJMatrix       *matrix,
       a range (2 numbers) */
 
    ex_contact_procs = hypre_CTAlloc(HYPRE_Int,  ex_num_contacts, HYPRE_MEMORY_HOST);
-   ex_contact_vec_starts =  hypre_CTAlloc(HYPRE_Int,  ex_num_contacts+1, HYPRE_MEMORY_HOST);
-   ex_contact_buf =  hypre_CTAlloc(HYPRE_BigInt,  ex_num_contacts*2, HYPRE_MEMORY_HOST);
+   ex_contact_vec_starts =  hypre_CTAlloc(HYPRE_Int,  ex_num_contacts + 1, HYPRE_MEMORY_HOST);
+   ex_contact_buf =  hypre_CTAlloc(HYPRE_BigInt,  ex_num_contacts * 2, HYPRE_MEMORY_HOST);
 
    counter = 0;
    range_end = -1;
-   for (i=0; i< num_rows; i++)
+   for (i = 0; i < num_rows; i++)
    {
       if (row_list[i] > range_end)
       {
@@ -1903,13 +2054,13 @@ hypre_IJMatrixAssembleOffProcValsParCSR( hypre_IJMatrix       *matrix,
          /* end of prev. range */
          if (counter > 0)
          {
-            ex_contact_buf[counter*2 - 1] = row_list[i-1];
+            ex_contact_buf[counter * 2 - 1] = row_list[i - 1];
          }
 
          /*start new range*/
          ex_contact_procs[counter] = proc_id;
-         ex_contact_vec_starts[counter] = counter*2;
-         ex_contact_buf[counter*2] =  row_list[i];
+         ex_contact_vec_starts[counter] = counter * 2;
+         ex_contact_buf[counter * 2] =  row_list[i];
          counter++;
 
          hypre_GetAssumedPartitionRowRange(comm, proc_id, global_first_col, global_num_cols,
@@ -1917,11 +2068,11 @@ hypre_IJMatrixAssembleOffProcValsParCSR( hypre_IJMatrix       *matrix,
       }
    }
    /* finish the starts */
-   ex_contact_vec_starts[counter] = counter*2;
+   ex_contact_vec_starts[counter] = counter * 2;
    /* finish the last range */
    if (counter > 0)
    {
-      ex_contact_buf[counter*2 - 1] = row_list[num_rows - 1];
+      ex_contact_buf[counter * 2 - 1] = row_list[num_rows - 1];
    }
 
    /* don't allocate space for responses */
@@ -1949,7 +2100,7 @@ hypre_IJMatrixAssembleOffProcValsParCSR( hypre_IJMatrix       *matrix,
 
    /*how many ranges were returned?*/
    num_ranges = response_buf_starts[ex_num_contacts];
-   num_ranges = num_ranges/2;
+   num_ranges = num_ranges / 2;
 
    prev_id = -1;
    j = 0;
@@ -1957,11 +2108,11 @@ hypre_IJMatrixAssembleOffProcValsParCSR( hypre_IJMatrix       *matrix,
    num_real_procs = 0;
 
    /* loop through ranges - create a list of actual processor ids*/
-   for (i=0; i<num_ranges; i++)
+   for (i = 0; i < num_ranges; i++)
    {
-      upper_bound = response_buf[i*2+1];
+      upper_bound = response_buf[i * 2 + 1];
       counter = 0;
-      tmp_id = response_buf[i*2];
+      tmp_id = response_buf[i * 2];
 
       /* loop through row_list entries - counting how many are in the range */
       while (j < num_rows && row_list[j] <= upper_bound)
@@ -1999,7 +2150,7 @@ hypre_IJMatrixAssembleOffProcValsParCSR( hypre_IJMatrix       *matrix,
       num_elements_total[0] = row_list_num_elements[orig_order[0]];
 
       /* loop through real procs - these are sorted (row_list is sorted also)*/
-      for (i=1; i < num_rows; i++)
+      for (i = 1; i < num_rows; i++)
       {
          if (real_proc_id[i] == ex_contact_procs[counter]) /* same processor */
          {
@@ -2024,7 +2175,7 @@ hypre_IJMatrixAssembleOffProcValsParCSR( hypre_IJMatrix       *matrix,
    big_int_size = sizeof(HYPRE_BigInt);
    complex_size = sizeof(HYPRE_Complex);
 
-   obj_size_bytes = hypre_max(big_int_size, complex_size);
+   obj_size_bytes = (HYPRE_Int) hypre_max(big_int_size, complex_size);
 
    /* set up data to be sent to send procs */
    /* for each proc, ex_contact_buf contains #rows, row #,
@@ -2036,16 +2187,16 @@ hypre_IJMatrixAssembleOffProcValsParCSR( hypre_IJMatrix       *matrix,
    ex_contact_vec_starts = hypre_CTAlloc(HYPRE_Int,  num_real_procs + 1, HYPRE_MEMORY_HOST);
    ex_contact_vec_starts[0] = -1;
 
-   for (i=0; i < num_real_procs; i++)
+   for (i = 0; i < num_real_procs; i++)
    {
-      storage += 1 + 2 * num_rows_per_proc[i] + 2* num_elements_total[i];
-      ex_contact_vec_starts[i+1] = -storage-1; /* need negative for next loop */
+      storage += 1 + 2 * num_rows_per_proc[i] + 2 * num_elements_total[i];
+      ex_contact_vec_starts[i + 1] = -storage - 1; /* need negative for next loop */
    }
 
    hypre_TFree(num_elements_total, HYPRE_MEMORY_HOST);
 
-   /*void_contact_buf = hypre_MAlloc(storage*obj_size_bytes);*/
-   void_contact_buf = hypre_CTAlloc(char, storage*obj_size_bytes, HYPRE_MEMORY_HOST);
+   /*void_contact_buf = hypre_TAlloc(char, storage*obj_size_bytes);*/
+   void_contact_buf = hypre_CTAlloc(char, storage * obj_size_bytes, HYPRE_MEMORY_HOST);
    index_ptr = void_contact_buf; /* step through with this index */
 
    /* for each proc: #rows, row #, no. elements,
@@ -2054,7 +2205,7 @@ hypre_IJMatrixAssembleOffProcValsParCSR( hypre_IJMatrix       *matrix,
    /* un-sort real_proc_id - we want to access data arrays in order, so
       cheaper to do this*/
    us_real_proc_id =  hypre_CTAlloc(HYPRE_Int,  num_rows, HYPRE_MEMORY_HOST);
-   for (i=0; i < num_rows; i++)
+   for (i = 0; i < num_rows; i++)
    {
       us_real_proc_id[orig_order[i]] = real_proc_id[i];
    }
@@ -2062,25 +2213,25 @@ hypre_IJMatrixAssembleOffProcValsParCSR( hypre_IJMatrix       *matrix,
 
    counter = 0; /* index into data arrays */
    prev_id = -1;
-   for (i=0; i < num_rows; i++)
+   for (i = 0; i < num_rows; i++)
    {
       proc_id = us_real_proc_id[i];
       /* can't use row list[i] - you loose the negative signs that differentiate
          add/set values */
-      row = off_proc_i[i*2];
+      row = off_proc_i[i * 2];
       num_elements = row_list_num_elements[i];
       /* find position of this processor */
       indx = hypre_BinarySearch(ex_contact_procs, proc_id, num_real_procs);
       in_i = ex_contact_vec_starts[indx];
 
-      index_ptr = (void *) ((char *) void_contact_buf + in_i*obj_size_bytes);
+      index_ptr = (void *) ((char *) void_contact_buf + in_i * obj_size_bytes);
 
       /* first time for this processor - add the number of rows to the buffer */
       if (in_i < 0)
       {
          in_i = -in_i - 1;
          /* re-calc. index_ptr since in_i was negative */
-         index_ptr = (void *) ((char *) void_contact_buf + in_i*obj_size_bytes);
+         index_ptr = (void *) ((char *) void_contact_buf + in_i * obj_size_bytes);
 
          tmp_int =  num_rows_per_proc[indx];
          hypre_TMemcpy( index_ptr,  &tmp_int, HYPRE_Int, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
@@ -2099,9 +2250,9 @@ hypre_IJMatrixAssembleOffProcValsParCSR( hypre_IJMatrix       *matrix,
       in_i++;
 
       /* now add col indices  */
-      for (j=0; j< num_elements; j++)
+      for (j = 0; j < num_elements; j++)
       {
-         tmp_big_int = off_proc_j[counter+j]; /* col number */
+         tmp_big_int = off_proc_j[counter + j]; /* col number */
 
          hypre_TMemcpy( index_ptr,  &tmp_big_int, HYPRE_BigInt, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
          index_ptr = (void *) ((char *) index_ptr + obj_size_bytes);
@@ -2109,7 +2260,7 @@ hypre_IJMatrixAssembleOffProcValsParCSR( hypre_IJMatrix       *matrix,
       }
 
       /* now add data */
-      for (j=0; j< num_elements; j++)
+      for (j = 0; j < num_elements; j++)
       {
          tmp_complex = off_proc_data[counter++]; /* value */
 
@@ -2134,9 +2285,9 @@ hypre_IJMatrixAssembleOffProcValsParCSR( hypre_IJMatrix       *matrix,
    hypre_TFree(row_list_num_elements, HYPRE_MEMORY_HOST);
    hypre_TFree(num_rows_per_proc, HYPRE_MEMORY_HOST);
 
-   for (i=num_real_procs; i > 0; i--)
+   for (i = num_real_procs; i > 0; i--)
    {
-      ex_contact_vec_starts[i] =   ex_contact_vec_starts[i-1];
+      ex_contact_vec_starts[i] =   ex_contact_vec_starts[i - 1];
    }
 
    ex_contact_vec_starts[0] = 0;
@@ -2164,7 +2315,7 @@ hypre_IJMatrixAssembleOffProcValsParCSR( hypre_IJMatrix       *matrix,
    send_proc_obj.vec_starts[0] = 0;
    send_proc_obj.element_storage_length = storage + 20;
    send_proc_obj.v_elements =
-      hypre_TAlloc(char, obj_size_bytes*send_proc_obj.element_storage_length, HYPRE_MEMORY_HOST);
+      hypre_TAlloc(char, obj_size_bytes * send_proc_obj.element_storage_length, HYPRE_MEMORY_HOST);
 
    response_obj2.fill_response = hypre_FillResponseIJOffProcVals;
    response_obj2.data1 = NULL;
@@ -2190,26 +2341,26 @@ hypre_IJMatrixAssembleOffProcValsParCSR( hypre_IJMatrix       *matrix,
 
    num_recvs = send_proc_obj.length;
    argsort_contact_procs = hypre_CTAlloc(HYPRE_Int,  num_recvs, HYPRE_MEMORY_HOST);
-   for(i=0; i < num_recvs; i++)
+   for (i = 0; i < num_recvs; i++)
    {
       argsort_contact_procs[i] = i;
    }
    /* This sort's the id array, but the original indices are stored in
     * argsort_contact_procs */
-   hypre_qsort2i( send_proc_obj.id, argsort_contact_procs, 0, num_recvs-1 );
+   hypre_qsort2i( send_proc_obj.id, argsort_contact_procs, 0, num_recvs - 1 );
 
    /* alias */
    recv_data_ptr = send_proc_obj.v_elements;
    recv_starts = send_proc_obj.vec_starts;
 
-   for (i=0; i < num_recvs; i++)
+   for (i = 0; i < num_recvs; i++)
    {
 
       /* Find the current processor in order, and reset recv_data_ptr to that processor's message */
       original_proc_indx = argsort_contact_procs[i];
       /*current_proc = send_proc_obj.id[i];*/
       indx = recv_starts[original_proc_indx];
-      recv_data_ptr = (void *) ((char *) send_proc_obj.v_elements + indx*obj_size_bytes);
+      recv_data_ptr = (void *) ((char *) send_proc_obj.v_elements + indx * obj_size_bytes);
 
       /* get the number of rows for this recv */
       hypre_TMemcpy( &num_rows, recv_data_ptr, HYPRE_Int, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
@@ -2217,7 +2368,7 @@ hypre_IJMatrixAssembleOffProcValsParCSR( hypre_IJMatrix       *matrix,
       indx++;
 
 
-      for (j=0; j < num_rows; j++) /* for each row: unpack info */
+      for (j = 0; j < num_rows; j++) /* for each row: unpack info */
       {
          /* row # */
          hypre_TMemcpy( &row,  recv_data_ptr, HYPRE_BigInt, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
@@ -2233,7 +2384,7 @@ hypre_IJMatrixAssembleOffProcValsParCSR( hypre_IJMatrix       *matrix,
          if (big_int_size == obj_size_bytes)
          {
             col_ptr = (HYPRE_BigInt *) recv_data_ptr;
-            recv_data_ptr = (void *) ((char *)recv_data_ptr + num_elements*obj_size_bytes);
+            recv_data_ptr = (void *) ((char *)recv_data_ptr + num_elements * obj_size_bytes);
          }
          else /* copy data */
          {
@@ -2241,9 +2392,10 @@ hypre_IJMatrixAssembleOffProcValsParCSR( hypre_IJMatrix       *matrix,
             {
                big_int_data = hypre_TReAlloc(big_int_data,  HYPRE_BigInt,  num_elements + 10, HYPRE_MEMORY_HOST);
             }
-            for (k=0; k< num_elements; k++)
+            for (k = 0; k < num_elements; k++)
             {
-               hypre_TMemcpy( &big_int_data[k],  recv_data_ptr, HYPRE_BigInt, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
+               hypre_TMemcpy( &big_int_data[k],  recv_data_ptr, HYPRE_BigInt, 1, HYPRE_MEMORY_HOST,
+                              HYPRE_MEMORY_HOST);
                recv_data_ptr = (void *) ((char *)recv_data_ptr + obj_size_bytes);
             }
             col_ptr = big_int_data;
@@ -2253,7 +2405,7 @@ hypre_IJMatrixAssembleOffProcValsParCSR( hypre_IJMatrix       *matrix,
          if (complex_size == obj_size_bytes)
          {
             col_data_ptr = (HYPRE_Complex *) recv_data_ptr;
-            recv_data_ptr = (void *) ((char *)recv_data_ptr + num_elements*obj_size_bytes);
+            recv_data_ptr = (void *) ((char *)recv_data_ptr + num_elements * obj_size_bytes);
          }
          else /* copy data */
          {
@@ -2262,9 +2414,10 @@ hypre_IJMatrixAssembleOffProcValsParCSR( hypre_IJMatrix       *matrix,
                complex_data =
                   hypre_TReAlloc(complex_data,  HYPRE_Complex,  num_elements + 10, HYPRE_MEMORY_HOST);
             }
-            for (k=0; k< num_elements; k++)
+            for (k = 0; k < num_elements; k++)
             {
-               hypre_TMemcpy( &complex_data[k],  recv_data_ptr, HYPRE_Complex, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
+               hypre_TMemcpy( &complex_data[k],  recv_data_ptr, HYPRE_Complex, 1, HYPRE_MEMORY_HOST,
+                              HYPRE_MEMORY_HOST);
                recv_data_ptr = (void *) ((char *)recv_data_ptr + obj_size_bytes);
             }
             col_data_ptr = complex_data;
@@ -2282,9 +2435,12 @@ hypre_IJMatrixAssembleOffProcValsParCSR( hypre_IJMatrix       *matrix,
             if (nelm_new > off_proc_nelm_recv_max)
             {
                off_proc_nelm_recv_max = nelm_new * 2;
-               off_proc_i_recv    = hypre_TReAlloc(off_proc_i_recv,    HYPRE_BigInt,  off_proc_nelm_recv_max, HYPRE_MEMORY_HOST);
-               off_proc_j_recv    = hypre_TReAlloc(off_proc_j_recv,    HYPRE_BigInt,  off_proc_nelm_recv_max, HYPRE_MEMORY_HOST);
-               off_proc_data_recv = hypre_TReAlloc(off_proc_data_recv, HYPRE_Complex, off_proc_nelm_recv_max, HYPRE_MEMORY_HOST);
+               off_proc_i_recv    = hypre_TReAlloc(off_proc_i_recv,    HYPRE_BigInt,  off_proc_nelm_recv_max,
+                                                   HYPRE_MEMORY_HOST);
+               off_proc_j_recv    = hypre_TReAlloc(off_proc_j_recv,    HYPRE_BigInt,  off_proc_nelm_recv_max,
+                                                   HYPRE_MEMORY_HOST);
+               off_proc_data_recv = hypre_TReAlloc(off_proc_data_recv, HYPRE_Complex, off_proc_nelm_recv_max,
+                                                   HYPRE_MEMORY_HOST);
             }
 
             HYPRE_Int i;
@@ -2293,14 +2449,15 @@ hypre_IJMatrixAssembleOffProcValsParCSR( hypre_IJMatrix       *matrix,
                off_proc_i_recv[off_proc_nelm_recv_cur + i] = row;
             }
             hypre_TMemcpy(off_proc_j_recv + off_proc_nelm_recv_cur, col_ptr, HYPRE_BigInt, num_elements,
-                           HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
-            hypre_TMemcpy(off_proc_data_recv + off_proc_nelm_recv_cur, col_data_ptr, HYPRE_Complex, num_elements,
-                           HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
+                          HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
+            hypre_TMemcpy(off_proc_data_recv + off_proc_nelm_recv_cur, col_data_ptr, HYPRE_Complex,
+                          num_elements,
+                          HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
 
             off_proc_nelm_recv_cur = nelm_new;
          }
 
-         indx += (num_elements*2);
+         indx += (num_elements * 2);
       }
    }
 
@@ -2317,8 +2474,9 @@ hypre_IJMatrixAssembleOffProcValsParCSR( hypre_IJMatrix       *matrix,
       hypre_TMemcpy(off_proc_data_recv_d, off_proc_data_recv, HYPRE_Complex, off_proc_nelm_recv_cur,
                     HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-      hypre_IJMatrixSetAddValuesParCSRDevice(matrix, off_proc_nelm_recv_cur, NULL, off_proc_i_recv_d, NULL, off_proc_j_recv_d,
+#if defined(HYPRE_USING_GPU)
+      hypre_IJMatrixSetAddValuesParCSRDevice(matrix, off_proc_nelm_recv_cur, NULL, off_proc_i_recv_d,
+                                             NULL, off_proc_j_recv_d,
                                              off_proc_data_recv_d, "add");
 #endif
    }
@@ -2372,6 +2530,8 @@ hypre_FillResponseIJOffProcVals(void      *p_recv_contact_buf,
 
 
 {
+   HYPRE_UNUSED_VAR(p_send_response_buf);
+
    HYPRE_Int    myid;
    HYPRE_Int    index, count, elength;
 
@@ -2391,10 +2551,10 @@ hypre_FillResponseIJOffProcVals(void      *p_recv_contact_buf,
     * and id */
    if (send_proc_obj->length == send_proc_obj->storage_length)
    {
-      send_proc_obj->storage_length +=20; /*add space for 20 more contact*/
-      send_proc_obj->vec_starts = hypre_TReAlloc(send_proc_obj->vec_starts,HYPRE_Int,
+      send_proc_obj->storage_length += 20; /*add space for 20 more contact*/
+      send_proc_obj->vec_starts = hypre_TReAlloc(send_proc_obj->vec_starts, HYPRE_Int,
                                                  send_proc_obj->storage_length + 1, HYPRE_MEMORY_HOST);
-      if( send_proc_obj->id != NULL)
+      if ( send_proc_obj->id != NULL)
       {
          send_proc_obj->id = hypre_TReAlloc(send_proc_obj->id, HYPRE_Int,
                                             send_proc_obj->storage_length + 1, HYPRE_MEMORY_HOST);
@@ -2404,7 +2564,7 @@ hypre_FillResponseIJOffProcVals(void      *p_recv_contact_buf,
    /*initialize*/
    count = send_proc_obj->length;
    index = send_proc_obj->vec_starts[count]; /* current number of elements */
-   if( send_proc_obj->id != NULL)
+   if ( send_proc_obj->id != NULL)
    {
       send_proc_obj->id[count] = contact_proc;
    }
@@ -2415,15 +2575,16 @@ hypre_FillResponseIJOffProcVals(void      *p_recv_contact_buf,
       elength = hypre_max(contact_size, 100);
       elength += index;
       send_proc_obj->v_elements = hypre_TReAlloc((char*)send_proc_obj->v_elements,
-                                                 char, elength*object_size, HYPRE_MEMORY_HOST);
+                                                 char, elength * object_size, HYPRE_MEMORY_HOST);
       send_proc_obj->element_storage_length = elength;
    }
    /*populate send_proc_obj*/
-   index_ptr = (void *) ((char *) send_proc_obj->v_elements + index*object_size);
+   index_ptr = (void *) ((char *) send_proc_obj->v_elements + index * object_size);
 
-   hypre_TMemcpy(index_ptr,  p_recv_contact_buf , char, object_size*contact_size, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
+   hypre_TMemcpy(index_ptr,  p_recv_contact_buf, char, object_size * contact_size, HYPRE_MEMORY_HOST,
+                 HYPRE_MEMORY_HOST);
 
-   send_proc_obj->vec_starts[count+1] = index + contact_size;
+   send_proc_obj->vec_starts[count + 1] = index + contact_size;
    send_proc_obj->length++;
 
    /* output - no message to return (confirmation) */
@@ -2446,7 +2607,7 @@ HYPRE_Int hypre_FindProc(HYPRE_BigInt *list, HYPRE_BigInt value, HYPRE_Int list_
    }
    else
    {
-      while (low+1 < high)
+      while (low + 1 < high)
       {
          m = (low + high) / 2;
          if (value < list[m])
@@ -2593,13 +2754,13 @@ hypre_IJMatrixAssembleParCSR(hypre_IJMatrix *matrix)
                           hypre_MPI_SUM, comm);
       if (offd_proc_elmts)
       {
-         max_off_proc_elmts=hypre_AuxParCSRMatrixMaxOffProcElmts(aux_matrix);
-         current_num_elmts=hypre_AuxParCSRMatrixCurrentOffProcElmts(aux_matrix);
-         off_proc_i=hypre_AuxParCSRMatrixOffProcI(aux_matrix);
-         off_proc_j=hypre_AuxParCSRMatrixOffProcJ(aux_matrix);
-         off_proc_data=hypre_AuxParCSRMatrixOffProcData(aux_matrix);
+         max_off_proc_elmts = hypre_AuxParCSRMatrixMaxOffProcElmts(aux_matrix);
+         current_num_elmts = hypre_AuxParCSRMatrixCurrentOffProcElmts(aux_matrix);
+         off_proc_i = hypre_AuxParCSRMatrixOffProcI(aux_matrix);
+         off_proc_j = hypre_AuxParCSRMatrixOffProcJ(aux_matrix);
+         off_proc_data = hypre_AuxParCSRMatrixOffProcData(aux_matrix);
          hypre_IJMatrixAssembleOffProcValsParCSR(
-            matrix,off_proc_i_indx, max_off_proc_elmts, current_num_elmts,
+            matrix, off_proc_i_indx, max_off_proc_elmts, current_num_elmts,
             HYPRE_MEMORY_HOST,
             off_proc_i, off_proc_j, off_proc_data);
       }
@@ -2611,7 +2772,7 @@ hypre_IJMatrixAssembleParCSR(hypre_IJMatrix *matrix)
       hypre_MPI_Comm_rank(comm, &my_id);
       num_rows = (HYPRE_Int)(row_partitioning[1] - row_partitioning[0]);
       col_0 = col_partitioning[0];
-      col_n = col_partitioning[1]-1;
+      col_n = col_partitioning[1] - 1;
       /* move data into ParCSRMatrix if not there already */
       if (hypre_AuxParCSRMatrixNeedAux(aux_matrix))
       {
@@ -2633,7 +2794,7 @@ hypre_IJMatrixAssembleParCSR(hypre_IJMatrix *matrix)
 
          i_diag = i_offd = 0;
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel private(i, j, i_diag, i_offd)
+         #pragma omp parallel private(i, j, i_diag, i_offd)
 #endif
          {
             HYPRE_BigInt *local_j;
@@ -2643,18 +2804,18 @@ hypre_IJMatrixAssembleParCSR(hypre_IJMatrix *matrix)
             num_threads = hypre_NumActiveThreads();
             my_thread_num = hypre_GetThreadNum();
 
-            size = num_rownnz/num_threads;
-            rest = num_rownnz - size*num_threads;
+            size = num_rownnz / num_threads;
+            rest = num_rownnz - size * num_threads;
 
             if (my_thread_num < rest)
             {
-               ns = my_thread_num*(size + 1);
-               ne = (my_thread_num+1)*(size + 1);
+               ns = my_thread_num * (size + 1);
+               ne = (my_thread_num + 1) * (size + 1);
             }
             else
             {
-               ns = my_thread_num*size + rest;
-               ne = (my_thread_num+1)*size + rest;
+               ns = my_thread_num * size + rest;
+               ne = (my_thread_num + 1) * size + rest;
             }
 
             i_diag = i_offd = 0;
@@ -2683,7 +2844,7 @@ hypre_IJMatrixAssembleParCSR(hypre_IJMatrix *matrix)
             diag_array[my_thread_num] = i_diag;
             offd_array[my_thread_num] = i_offd;
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+            #pragma omp barrier
 #endif
             if (my_thread_num == 0)
             {
@@ -2712,12 +2873,12 @@ hypre_IJMatrixAssembleParCSR(hypre_IJMatrix *matrix)
                big_offd_j = hypre_CTAlloc(HYPRE_BigInt,  i_offd, hypre_CSRMatrixMemoryLocation(offd));
             }
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+            #pragma omp barrier
 #endif
             if (my_thread_num)
             {
-               i_diag = diag_array[my_thread_num-1];
-               i_offd = offd_array[my_thread_num-1];
+               i_diag = diag_array[my_thread_num - 1];
+               i_offd = offd_array[my_thread_num - 1];
             }
             else
             {
@@ -2756,20 +2917,20 @@ hypre_IJMatrixAssembleParCSR(hypre_IJMatrix *matrix)
             if (rownnz != NULL)
             {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+               #pragma omp barrier
 #endif
-               for (i = ns; i < (ne-1); i++)
+               for (i = ns; i < (ne - 1); i++)
                {
-                  for (ii = rownnz[i] + 1; ii < rownnz[i+1]; ii++)
+                  for (ii = rownnz[i] + 1; ii < rownnz[i + 1]; ii++)
                   {
-                     diag_i[ii] = diag_i[rownnz[i+1]];
-                     offd_i[ii] = offd_i[rownnz[i+1]];
+                     diag_i[ii] = diag_i[rownnz[i + 1]];
+                     offd_i[ii] = offd_i[rownnz[i + 1]];
                   }
                }
 
                if (my_thread_num < (num_threads - 1))
                {
-                  for (ii = rownnz[ne-1] + 1; ii < rownnz[ne]; ii++)
+                  for (ii = rownnz[ne - 1] + 1; ii < rownnz[ne]; ii++)
                   {
                      diag_i[ii] = diag_i[rownnz[ne]];
                      offd_i[ii] = offd_i[rownnz[ne]];
@@ -2777,7 +2938,7 @@ hypre_IJMatrixAssembleParCSR(hypre_IJMatrix *matrix)
                }
                else
                {
-                  for (ii = rownnz[ne-1] + 1; ii < num_rows; ii++)
+                  for (ii = rownnz[ne - 1] + 1; ii < num_rows; ii++)
                   {
                      diag_i[ii] = diag_i[num_rows];
                      offd_i[ii] = offd_i[num_rows];
@@ -2808,12 +2969,12 @@ hypre_IJMatrixAssembleParCSR(hypre_IJMatrix *matrix)
          diag_j = hypre_CSRMatrixJ(diag);
          diag_data = hypre_CSRMatrixData(diag);
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private (i,j,j0,temp)
+         #pragma omp parallel for private (i,j,j0,temp)
 #endif
          for (i = 0; i < num_rows; i++)
          {
             j0 = diag_i[i];
-            for (j = j0; j < diag_i[i+1]; j++)
+            for (j = j0; j < diag_i[i + 1]; j++)
             {
                if (diag_j[j] == i)
                {
@@ -2835,10 +2996,6 @@ hypre_IJMatrixAssembleParCSR(hypre_IJMatrix *matrix)
          }
       }
 
-      /*  generate the nonzero rows inside offd and diag by calling */
-      hypre_CSRMatrixSetRownnz(diag);
-      hypre_CSRMatrixSetRownnz(offd);
-
       /*  generate col_map_offd */
       nnz_offd = offd_i[num_rows];
       if (nnz_offd)
@@ -2848,13 +3005,13 @@ hypre_IJMatrixAssembleParCSR(hypre_IJMatrix *matrix)
          {
             tmp_j[i] = big_offd_j[i];
          }
-         hypre_BigQsort0(tmp_j,0,nnz_offd-1);
+         hypre_BigQsort0(tmp_j, 0, nnz_offd - 1);
          num_cols_offd = 1;
-         for (i = 0; i < nnz_offd-1; i++)
+         for (i = 0; i < nnz_offd - 1; i++)
          {
-            if (tmp_j[i+1] > tmp_j[i])
+            if (tmp_j[i + 1] > tmp_j[i])
             {
-               tmp_j[num_cols_offd++] = tmp_j[i+1];
+               tmp_j[num_cols_offd++] = tmp_j[i + 1];
             }
          }
          col_map_offd = hypre_CTAlloc(HYPRE_BigInt, num_cols_offd, HYPRE_MEMORY_HOST);
@@ -2863,11 +3020,11 @@ hypre_IJMatrixAssembleParCSR(hypre_IJMatrix *matrix)
             col_map_offd[i] = tmp_j[i];
          }
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i)
+         #pragma omp parallel for private(i)
 #endif
          for (i = 0; i < nnz_offd; i++)
          {
-            offd_j[i] = hypre_BigBinarySearch(col_map_offd,big_offd_j[i],num_cols_offd);
+            offd_j[i] = hypre_BigBinarySearch(col_map_offd, big_offd_j[i], num_cols_offd);
          }
 
          if (base)
@@ -2884,11 +3041,17 @@ hypre_IJMatrixAssembleParCSR(hypre_IJMatrix *matrix)
          hypre_CSRMatrixBigJ(offd) = NULL;
       }
       hypre_IJMatrixAssembleFlag(matrix) = 1;
+
+      /* Generate the nonzero rows in the diag and offd matrices */
+      hypre_CSRMatrixSetRownnz(diag);
+      hypre_CSRMatrixSetRownnz(offd);
    }
 
+   /* Free memory */
    hypre_AuxParCSRMatrixDestroy(aux_matrix);
    hypre_IJMatrixTranslator(matrix) = NULL;
 
+   HYPRE_PRINT_MEMORY_USAGE(comm);
    HYPRE_ANNOTATE_FUNC_END;
 
    return hypre_error_flag;
@@ -2934,17 +3097,17 @@ hypre_IJMatrixSetValuesOMPParCSR( hypre_IJMatrix       *matrix,
    HYPRE_Int num_procs, my_id;
    HYPRE_BigInt col_0, col_n, first;
    //HYPRE_Int cancel_indx;
-   HYPRE_BigInt **aux_j;
-   HYPRE_Complex **aux_data;
+   HYPRE_BigInt **aux_j = NULL;
+   HYPRE_Complex **aux_data = NULL;
    HYPRE_Int *row_length, *row_space;
    HYPRE_Int need_aux;
-   HYPRE_Int *diag_i;
-   HYPRE_Int *diag_j;
-   HYPRE_Complex *diag_data;
-   HYPRE_Int *offd_i;
-   HYPRE_Int *offd_j;
-   HYPRE_BigInt *big_offd_j;
-   HYPRE_Complex *offd_data;
+   HYPRE_Int *diag_i = NULL;
+   HYPRE_Int *diag_j = NULL;
+   HYPRE_Complex *diag_data = NULL;
+   HYPRE_Int *offd_i = NULL;
+   HYPRE_Int *offd_j = NULL;
+   HYPRE_BigInt *big_offd_j = NULL;
+   HYPRE_Complex *offd_data = NULL;
    /*HYPRE_Int current_num_elmts;*/
    /*HYPRE_Int max_off_proc_elmts;*/
    //HYPRE_Int off_proc_i_indx;
@@ -2954,7 +3117,7 @@ hypre_IJMatrixSetValuesOMPParCSR( hypre_IJMatrix       *matrix,
 
    HYPRE_Int print_level = hypre_IJMatrixPrintLevel(matrix);
    //HYPRE_Int max_num_threads;
-   HYPRE_Int error_flag = 0;
+   //HYPRE_Int error_flag = 0;
 
    /*HYPRE_Complex *off_proc_data;*/
    hypre_MPI_Comm_size(comm, &num_procs);
@@ -2967,7 +3130,7 @@ hypre_IJMatrixSetValuesOMPParCSR( hypre_IJMatrix       *matrix,
    //offproc_cnt = hypre_CTAlloc(HYPRE_Int,  max_num_threads, HYPRE_MEMORY_HOST);
 
    col_0 = col_partitioning[0];
-   col_n = col_partitioning[1]-1;
+   col_n = col_partitioning[1] - 1;
    first =  hypre_IJMatrixGlobalFirstCol(matrix);
    if (nrows < 0)
    {
@@ -2981,7 +3144,7 @@ hypre_IJMatrixSetValuesOMPParCSR( hypre_IJMatrix       *matrix,
 
    if (hypre_IJMatrixAssembleFlag(matrix))  /* matrix already assembled*/
    {
-      HYPRE_BigInt *col_map_offd;
+      HYPRE_BigInt *col_map_offd = NULL;
       HYPRE_Int num_cols_offd;
 
       diag = hypre_ParCSRMatrixDiag(par_matrix);
@@ -3009,7 +3172,7 @@ hypre_IJMatrixSetValuesOMPParCSR( hypre_IJMatrix       *matrix,
       }*/
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel
+      #pragma omp parallel
 #endif
       {
          HYPRE_Int j_offd;
@@ -3026,21 +3189,21 @@ hypre_IJMatrixSetValuesOMPParCSR( hypre_IJMatrix       *matrix,
          num_threads = hypre_NumActiveThreads();
          my_thread_num = hypre_GetThreadNum();
 
-         len = nrows/num_threads;
-         rest = nrows - len*num_threads;
+         len = nrows / num_threads;
+         rest = nrows - len * num_threads;
 
          if (my_thread_num < rest)
          {
-            ns = my_thread_num*(len+1);
-            ne = (my_thread_num+1)*(len+1);
+            ns = my_thread_num * (len + 1);
+            ne = (my_thread_num + 1) * (len + 1);
          }
          else
          {
-            ns = my_thread_num*len+rest;
-            ne = (my_thread_num+1)*len+rest;
+            ns = my_thread_num * len + rest;
+            ne = (my_thread_num + 1) * len + rest;
          }
 
-         for (ii=ns; ii < ne; ii++)
+         for (ii = ns; ii < ne; ii++)
          {
             row = rows[ii];
             n = ncols ? ncols[ii] : 1;
@@ -3055,16 +3218,18 @@ hypre_IJMatrixSetValuesOMPParCSR( hypre_IJMatrix       *matrix,
                row_local = (HYPRE_Int)(row - row_partitioning[0]);
 
                /* compute local row number */
-               size = diag_i[row_local+1] - diag_i[row_local]
-                  + offd_i[row_local+1] - offd_i[row_local];
+               size = diag_i[row_local + 1] - diag_i[row_local]
+                      + offd_i[row_local + 1] - offd_i[row_local];
 
                if (n > size)
                {
                   hypre_error(HYPRE_ERROR_GENERIC);
+#if 0 /* error_flag is currently not used anywhere */
 #ifdef HYPRE_USING_OPENMP
-#pragma omp atomic
+                  #pragma omp atomic
 #endif
                   error_flag++;
+#endif
                   if (print_level)
                   {
                      hypre_printf (" row %b too long! \n", row);
@@ -3075,24 +3240,26 @@ hypre_IJMatrixSetValuesOMPParCSR( hypre_IJMatrix       *matrix,
 
                pos_diag = diag_i[row_local];
                pos_offd = offd_i[row_local];
-               len_diag = diag_i[row_local+1];
-               len_offd = offd_i[row_local+1];
+               len_diag = diag_i[row_local + 1];
+               len_offd = offd_i[row_local + 1];
                not_found = 1;
 
-               for (i=0; i < n; i++)
+               for (i = 0; i < n; i++)
                {
                   if (cols[indx] < col_0 || cols[indx] > col_n)
                      /* insert into offd */
                   {
-                     j_offd = hypre_BigBinarySearch(col_map_offd,cols[indx]-first,
-                                                 num_cols_offd);
+                     j_offd = hypre_BigBinarySearch(col_map_offd, cols[indx] - first,
+                                                    num_cols_offd);
                      if (j_offd == -1)
                      {
                         hypre_error(HYPRE_ERROR_GENERIC);
+#if 0 /* error_flag is currently not used anywhere */
 #ifdef HYPRE_USING_OPENMP
-#pragma omp atomic
+                        #pragma omp atomic
 #endif
                         error_flag++;
+#endif
                         if (print_level)
                         {
                            hypre_printf (" Error, element %b %b does not exist\n",
@@ -3101,7 +3268,7 @@ hypre_IJMatrixSetValuesOMPParCSR( hypre_IJMatrix       *matrix,
                         break;
                         /*return hypre_error_flag; */
                      }
-                     for (j=pos_offd; j < len_offd; j++)
+                     for (j = pos_offd; j < len_offd; j++)
                      {
                         if (offd_j[j] == j_offd)
                         {
@@ -3113,10 +3280,12 @@ hypre_IJMatrixSetValuesOMPParCSR( hypre_IJMatrix       *matrix,
                      if (not_found)
                      {
                         hypre_error(HYPRE_ERROR_GENERIC);
+#if 0 /* error_flag is currently not used anywhere */
 #ifdef HYPRE_USING_OPENMP
-#pragma omp atomic
+                        #pragma omp atomic
 #endif
                         error_flag++;
+#endif
                         if (print_level)
                         {
                            hypre_printf (" Error, element %b %b does not exist\n",
@@ -3133,10 +3302,12 @@ hypre_IJMatrixSetValuesOMPParCSR( hypre_IJMatrix       *matrix,
                      if (diag_j[pos_diag] != row_local)
                      {
                         hypre_error(HYPRE_ERROR_GENERIC);
+#if 0 /* error_flag is currently not used anywhere */
 #ifdef HYPRE_USING_OPENMP
-#pragma omp atomic
+                        #pragma omp atomic
 #endif
                         error_flag++;
+#endif
                         if (print_level)
                         {
                            hypre_printf (" Error, element %b %b does not exist\n",
@@ -3149,9 +3320,9 @@ hypre_IJMatrixSetValuesOMPParCSR( hypre_IJMatrix       *matrix,
                   }
                   else  /* insert into diag */
                   {
-                     for (j=pos_diag; j < len_diag; j++)
+                     for (j = pos_diag; j < len_diag; j++)
                      {
-                        if (diag_j[j] == (HYPRE_Int)(cols[indx]-col_0))
+                        if (diag_j[j] == (HYPRE_Int)(cols[indx] - col_0))
                         {
                            diag_data[j] = values[indx];
                            not_found = 0;
@@ -3161,10 +3332,12 @@ hypre_IJMatrixSetValuesOMPParCSR( hypre_IJMatrix       *matrix,
                      if (not_found)
                      {
                         hypre_error(HYPRE_ERROR_GENERIC);
+#if 0 /* error_flag is currently not used anywhere */
 #ifdef HYPRE_USING_OPENMP
-#pragma omp atomic
+                        #pragma omp atomic
 #endif
                         error_flag++;
+#endif
                         if (print_level)
                         {
                            hypre_printf (" Error, element %b %b does not exist\n",
@@ -3199,27 +3372,27 @@ hypre_IJMatrixSetValuesOMPParCSR( hypre_IJMatrix       *matrix,
                               {
                                  off_proc_j[cnt1++] = -1;
                                  offproc_cnt[my_thread_num]++; */
-                                 /*cancel_indx++;*/
-                                 /* if no repetition allowed */
-                                 /* off_proc_j[col_indx] = -1;
-                                    col_indx -= k;
-                                    break; */
-                              /*}
-                              else
-                              {
-                                 cnt1++;
-                              }
-                           }
-                        }
-                        col_indx += row_len;
-                     }
-                     else
-                     {
-                        col_indx += row_len;
-                     }
-                  }*/
-                  /*hypre_AuxParCSRMatrixCancelIndx(aux_matrix) = cancel_indx;*/
-               //}
+            /*cancel_indx++;*/
+            /* if no repetition allowed */
+            /* off_proc_j[col_indx] = -1;
+               col_indx -= k;
+               break; */
+            /*}
+            else
+            {
+               cnt1++;
+            }
+            }
+            }
+            col_indx += row_len;
+            }
+            else
+            {
+            col_indx += row_len;
+            }
+            }*/
+            /*hypre_AuxParCSRMatrixCancelIndx(aux_matrix) = cancel_indx;*/
+            //}
             //}
          }
       } /*end parallel region */
@@ -3265,7 +3438,7 @@ hypre_IJMatrixSetValuesOMPParCSR( hypre_IJMatrix       *matrix,
          }
       }
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel
+      #pragma omp parallel
 #endif
       {
          HYPRE_Int num_threads, my_thread_num;
@@ -3285,21 +3458,21 @@ hypre_IJMatrixSetValuesOMPParCSR( hypre_IJMatrix       *matrix,
          num_threads = hypre_NumActiveThreads();
          my_thread_num = hypre_GetThreadNum();
 
-         len = nrows/num_threads;
-         rest = nrows - len*num_threads;
+         len = nrows / num_threads;
+         rest = nrows - len * num_threads;
 
          if (my_thread_num < rest)
          {
-            ns = my_thread_num*(len+1);
-            ne = (my_thread_num+1)*(len+1);
+            ns = my_thread_num * (len + 1);
+            ne = (my_thread_num + 1) * (len + 1);
          }
          else
          {
-            ns = my_thread_num*len+rest;
-            ne = (my_thread_num+1)*len+rest;
+            ns = my_thread_num * len + rest;
+            ne = (my_thread_num + 1) * len + rest;
          }
 
-         for (ii=ns; ii < ne; ii++)
+         for (ii = ns; ii < ne; ii++)
          {
             row = rows[ii];
             n = ncols ? ncols[ii] : 1;
@@ -3329,9 +3502,9 @@ hypre_IJMatrixSetValuesOMPParCSR( hypre_IJMatrix       *matrix,
                   tmp_indx = 0;
                   not_found = 1;
                   size = old_size;
-                  for (i=0; i < n; i++)
+                  for (i = 0; i < n; i++)
                   {
-                     for (j=0; j < old_size; j++)
+                     for (j = 0; j < old_size; j++)
                      {
                         if (local_j[j] == cols[indx])
                         {
@@ -3357,22 +3530,22 @@ hypre_IJMatrixSetValuesOMPParCSR( hypre_IJMatrix       *matrix,
                      indx++;
                   }
 
-                  row_length[row_local] = size+tmp_indx;
+                  row_length[row_local] = size + tmp_indx;
 
                   if (tmp_indx)
                   {
-                     aux_j[row_local] = hypre_TReAlloc(aux_j[row_local],HYPRE_BigInt,
-                                                       size+tmp_indx, HYPRE_MEMORY_HOST);
+                     aux_j[row_local] = hypre_TReAlloc(aux_j[row_local], HYPRE_BigInt,
+                                                       size + tmp_indx, HYPRE_MEMORY_HOST);
                      aux_data[row_local] = hypre_TReAlloc(aux_data[row_local],
-                                                          HYPRE_Complex, size+tmp_indx, HYPRE_MEMORY_HOST);
-                     row_space[row_local] = size+tmp_indx;
+                                                          HYPRE_Complex, size + tmp_indx, HYPRE_MEMORY_HOST);
+                     row_space[row_local] = size + tmp_indx;
                      local_j = aux_j[row_local];
                      local_data = aux_data[row_local];
                   }
 
                   cnt = size;
 
-                  for (i=0; i < tmp_indx; i++)
+                  for (i = 0; i < tmp_indx; i++)
                   {
                      local_j[cnt] = tmp_j[i];
                      local_data[cnt++] = tmp_data[i];
@@ -3393,15 +3566,15 @@ hypre_IJMatrixSetValuesOMPParCSR( hypre_IJMatrix       *matrix,
                   diag_indx = hypre_AuxParCSRMatrixIndxDiag(aux_matrix)[row_local];
                   cnt_diag = diag_indx;
                   cnt_offd = offd_indx;
-                  diag_space = diag_i[row_local+1];
-                  offd_space = offd_i[row_local+1];
+                  diag_space = diag_i[row_local + 1];
+                  offd_space = offd_i[row_local + 1];
                   not_found = 1;
-                  for (i=0; i < n; i++)
+                  for (i = 0; i < n; i++)
                   {
                      if (cols[indx] < col_0 || cols[indx] > col_n)
                         /* insert into offd */
                      {
-                        for (j=offd_i[row_local]; j < offd_indx; j++)
+                        for (j = offd_i[row_local]; j < offd_indx; j++)
                         {
                            if (big_offd_j[j] == cols[indx])
                            {
@@ -3420,10 +3593,12 @@ hypre_IJMatrixSetValuesOMPParCSR( hypre_IJMatrix       *matrix,
                            else
                            {
                               hypre_error(HYPRE_ERROR_GENERIC);
+#if 0 /* error_flag is currently not used anywhere */
 #ifdef HYPRE_USING_OPENMP
-#pragma omp atomic
+                              #pragma omp atomic
 #endif
                               error_flag++;
+#endif
                               if (print_level)
                               {
                                  hypre_printf("Error in row %b ! Too many elements!\n",
@@ -3437,9 +3612,9 @@ hypre_IJMatrixSetValuesOMPParCSR( hypre_IJMatrix       *matrix,
                      }
                      else  /* insert into diag */
                      {
-                        for (j=diag_i[row_local]; j < diag_indx; j++)
+                        for (j = diag_i[row_local]; j < diag_indx; j++)
                         {
-                           if (diag_j[j] == (HYPRE_Int)(cols[indx]-col_0))
+                           if (diag_j[j] == (HYPRE_Int)(cols[indx] - col_0))
                            {
                               diag_data[j] = values[indx];
                               not_found = 0;
@@ -3450,16 +3625,18 @@ hypre_IJMatrixSetValuesOMPParCSR( hypre_IJMatrix       *matrix,
                         {
                            if (cnt_diag < diag_space)
                            {
-                              diag_j[cnt_diag] = (HYPRE_Int)(cols[indx]-col_0);
+                              diag_j[cnt_diag] = (HYPRE_Int)(cols[indx] - col_0);
                               diag_data[cnt_diag++] = values[indx];
                            }
                            else
                            {
                               hypre_error(HYPRE_ERROR_GENERIC);
+#if 0 /* error_flag is currently not used anywhere */
 #ifdef HYPRE_USING_OPENMP
-#pragma omp atomic
+                              #pragma omp atomic
 #endif
                               error_flag++;
+#endif
                               if (print_level)
                               {
                                  hypre_printf("Error in row %b ! Too many elements !\n",
@@ -3499,28 +3676,28 @@ hypre_IJMatrixSetValuesOMPParCSR( hypre_IJMatrix       *matrix,
                               if (off_proc_j[cnt1] == cols[j])
                               {
                                  off_proc_j[cnt1++] = -1; */
-                                 /*cancel_indx++;*/
-                                 //offproc_cnt[my_thread_num]++;
-                                 /* if no repetition allowed */
-                                 /* off_proc_j[col_indx] = -1;
-                                    col_indx -= k;
-                                    break; */
-                    /*          }
-                              else
-                              {
-                                 cnt1++;
-                              }
-                           }
-                        }
-                        col_indx += row_len;
-                     }
-                     else
-                     {
-                        col_indx += row_len;
-                     }
-                  }*/
-                  /*hypre_AuxParCSRMatrixCancelIndx(aux_matrix) = cancel_indx;*/
-               /*}
+            /*cancel_indx++;*/
+            //offproc_cnt[my_thread_num]++;
+            /* if no repetition allowed */
+            /* off_proc_j[col_indx] = -1;
+               col_indx -= k;
+               break; */
+            /*          }
+                      else
+                      {
+                         cnt1++;
+                      }
+                   }
+                }
+                col_indx += row_len;
+             }
+             else
+             {
+                col_indx += row_len;
+             }
+            }*/
+            /*hypre_AuxParCSRMatrixCancelIndx(aux_matrix) = cancel_indx;*/
+            /*}
             }*/
          }
       } /* end parallel region */
@@ -3567,17 +3744,17 @@ hypre_IJMatrixAddToValuesOMPParCSR( hypre_IJMatrix       *matrix,
    MPI_Comm comm = hypre_IJMatrixComm(matrix);
    HYPRE_Int num_procs, my_id;
    HYPRE_BigInt col_0, col_n, first;
-   HYPRE_BigInt **aux_j;
-   HYPRE_Complex **aux_data;
+   HYPRE_BigInt **aux_j = NULL;
+   HYPRE_Complex **aux_data = NULL;
    HYPRE_Int *row_length, *row_space;
    HYPRE_Int need_aux;
-   HYPRE_Int *diag_i;
-   HYPRE_Int *diag_j;
-   HYPRE_Complex *diag_data;
-   HYPRE_Int *offd_i;
-   HYPRE_Int *offd_j;
-   HYPRE_BigInt *big_offd_j;
-   HYPRE_Complex *offd_data;
+   HYPRE_Int *diag_i = NULL;
+   HYPRE_Int *diag_j = NULL;
+   HYPRE_Complex *diag_data = NULL;
+   HYPRE_Int *offd_i = NULL;
+   HYPRE_Int *offd_j = NULL;
+   HYPRE_BigInt *big_offd_j = NULL;
+   HYPRE_Complex *offd_data = NULL;
    HYPRE_Int current_num_elmts;
    HYPRE_Int max_off_proc_elmts;
    HYPRE_Int off_proc_i_indx;
@@ -3600,16 +3777,18 @@ hypre_IJMatrixAddToValuesOMPParCSR( hypre_IJMatrix       *matrix,
 
    offproc_cnt = hypre_CTAlloc(HYPRE_Int *,  max_num_threads, HYPRE_MEMORY_HOST);
 
-   for (i1=0; i1 < max_num_threads; i1++)
+   for (i1 = 0; i1 < max_num_threads; i1++)
+   {
       offproc_cnt[i1] = NULL;
+   }
 
    col_0 = col_partitioning[0];
-   col_n = col_partitioning[1]-1;
+   col_n = col_partitioning[1] - 1;
    first = hypre_IJMatrixGlobalFirstCol(matrix);
    if (hypre_IJMatrixAssembleFlag(matrix)) /* matrix already assembled */
    {
       HYPRE_Int num_cols_offd;
-      HYPRE_BigInt *col_map_offd;
+      HYPRE_BigInt *col_map_offd = NULL;
 
       diag = hypre_ParCSRMatrixDiag(par_matrix);
       diag_i = hypre_CSRMatrixI(diag);
@@ -3634,7 +3813,7 @@ hypre_IJMatrixAddToValuesOMPParCSR( hypre_IJMatrix       *matrix,
          off_proc_j = hypre_AuxParCSRMatrixOffProcJ(aux_matrix);
       }
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel
+      #pragma omp parallel
 #endif
       {
          HYPRE_Int j_offd;
@@ -3651,21 +3830,21 @@ hypre_IJMatrixAddToValuesOMPParCSR( hypre_IJMatrix       *matrix,
          num_threads = hypre_NumActiveThreads();
          my_thread_num = hypre_GetThreadNum();
 
-         len = nrows/num_threads;
-         rest = nrows - len*num_threads;
+         len = nrows / num_threads;
+         rest = nrows - len * num_threads;
 
          if (my_thread_num < rest)
          {
-            ns = my_thread_num*(len+1);
-            ne = (my_thread_num+1)*(len+1);
+            ns = my_thread_num * (len + 1);
+            ne = (my_thread_num + 1) * (len + 1);
          }
          else
          {
-            ns = my_thread_num*len+rest;
-            ne = (my_thread_num+1)*len+rest;
+            ns = my_thread_num * len + rest;
+            ne = (my_thread_num + 1) * len + rest;
          }
 
-         for (ii=ns; ii < ne; ii++)
+         for (ii = ns; ii < ne; ii++)
          {
             row = rows[ii];
             n = ncols ? ncols[ii] : 1;
@@ -3678,14 +3857,14 @@ hypre_IJMatrixAddToValuesOMPParCSR( hypre_IJMatrix       *matrix,
             {
                row_local = (HYPRE_Int)(row - row_partitioning[0]);
                /* compute local row number */
-               size = diag_i[row_local+1] - diag_i[row_local]
-                  + offd_i[row_local+1] - offd_i[row_local];
+               size = diag_i[row_local + 1] - diag_i[row_local]
+                      + offd_i[row_local + 1] - offd_i[row_local];
 
                if (n > size)
                {
                   hypre_error(HYPRE_ERROR_GENERIC);
 #ifdef HYPRE_USING_OPENMP
-#pragma omp atomic
+                  #pragma omp atomic
 #endif
                   error_flag++;
                   if (print_level)
@@ -3698,22 +3877,22 @@ hypre_IJMatrixAddToValuesOMPParCSR( hypre_IJMatrix       *matrix,
 
                pos_diag = diag_i[row_local];
                pos_offd = offd_i[row_local];
-               len_diag = diag_i[row_local+1];
-               len_offd = offd_i[row_local+1];
+               len_diag = diag_i[row_local + 1];
+               len_offd = offd_i[row_local + 1];
                not_found = 1;
 
-               for (i=0; i < n; i++)
+               for (i = 0; i < n; i++)
                {
                   if (cols[indx] < col_0 || cols[indx] > col_n)
                      /* insert into offd */
                   {
-                     j_offd = hypre_BigBinarySearch(col_map_offd,cols[indx]-first,
-                                                 num_cols_offd);
+                     j_offd = hypre_BigBinarySearch(col_map_offd, cols[indx] - first,
+                                                    num_cols_offd);
                      if (j_offd == -1)
                      {
                         hypre_error(HYPRE_ERROR_GENERIC);
 #ifdef HYPRE_USING_OPENMP
-#pragma omp atomic
+                        #pragma omp atomic
 #endif
                         error_flag++;
                         if (print_level)
@@ -3724,7 +3903,7 @@ hypre_IJMatrixAddToValuesOMPParCSR( hypre_IJMatrix       *matrix,
                         break;
                         /*return hypre_error_flag;*/
                      }
-                     for (j=pos_offd; j < len_offd; j++)
+                     for (j = pos_offd; j < len_offd; j++)
                      {
                         if (offd_j[j] == j_offd)
                         {
@@ -3737,7 +3916,7 @@ hypre_IJMatrixAddToValuesOMPParCSR( hypre_IJMatrix       *matrix,
                      {
                         hypre_error(HYPRE_ERROR_GENERIC);
 #ifdef HYPRE_USING_OPENMP
-#pragma omp atomic
+                        #pragma omp atomic
 #endif
                         error_flag++;
                         if (print_level)
@@ -3757,7 +3936,7 @@ hypre_IJMatrixAddToValuesOMPParCSR( hypre_IJMatrix       *matrix,
                      {
                         hypre_error(HYPRE_ERROR_GENERIC);
 #ifdef HYPRE_USING_OPENMP
-#pragma omp atomic
+                        #pragma omp atomic
 #endif
                         error_flag++;
                         if (print_level)
@@ -3772,9 +3951,9 @@ hypre_IJMatrixAddToValuesOMPParCSR( hypre_IJMatrix       *matrix,
                   }
                   else  /* insert into diag */
                   {
-                     for (j=pos_diag; j < len_diag; j++)
+                     for (j = pos_diag; j < len_diag; j++)
                      {
-                        if (diag_j[j] == (HYPRE_Int)(cols[indx]-col_0))
+                        if (diag_j[j] == (HYPRE_Int)(cols[indx] - col_0))
                         {
                            diag_data[j] += values[indx];
                            not_found = 0;
@@ -3785,7 +3964,7 @@ hypre_IJMatrixAddToValuesOMPParCSR( hypre_IJMatrix       *matrix,
                      {
                         hypre_error(HYPRE_ERROR_GENERIC);
 #ifdef HYPRE_USING_OPENMP
-#pragma omp atomic
+                        #pragma omp atomic
 #endif
                         error_flag++;
                         if (print_level)
@@ -3813,19 +3992,19 @@ hypre_IJMatrixAddToValuesOMPParCSR( hypre_IJMatrix       *matrix,
                   my_offproc_cnt[1] = 2;
                }
                i = my_offproc_cnt[1];
-               if (i+2 < my_offproc_cnt[0])
+               if (i + 2 < my_offproc_cnt[0])
                {
                   my_offproc_cnt[i] = ii;
-                  my_offproc_cnt[i+1] = indx;
+                  my_offproc_cnt[i + 1] = indx;
                   my_offproc_cnt[1] += 2;
                }
                else
                {
                   size = my_offproc_cnt[0];
-                  my_offproc_cnt = hypre_TReAlloc(my_offproc_cnt, HYPRE_Int, size+200, HYPRE_MEMORY_HOST);
+                  my_offproc_cnt = hypre_TReAlloc(my_offproc_cnt, HYPRE_Int, size + 200, HYPRE_MEMORY_HOST);
                   my_offproc_cnt[0] += 200;
                   my_offproc_cnt[i] = ii;
-                  my_offproc_cnt[i+1] = indx;
+                  my_offproc_cnt[i + 1] = indx;
                   my_offproc_cnt[1] += 2;
                }
             }
@@ -3874,7 +4053,7 @@ hypre_IJMatrixAddToValuesOMPParCSR( hypre_IJMatrix       *matrix,
          }
       }
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel
+      #pragma omp parallel
 #endif
       {
          HYPRE_Int num_threads, my_thread_num;
@@ -3894,21 +4073,21 @@ hypre_IJMatrixAddToValuesOMPParCSR( hypre_IJMatrix       *matrix,
          num_threads = hypre_NumActiveThreads();
          my_thread_num = hypre_GetThreadNum();
 
-         len = nrows/num_threads;
-         rest = nrows - len*num_threads;
+         len = nrows / num_threads;
+         rest = nrows - len * num_threads;
 
          if (my_thread_num < rest)
          {
-            ns = my_thread_num*(len+1);
-            ne = (my_thread_num+1)*(len+1);
+            ns = my_thread_num * (len + 1);
+            ne = (my_thread_num + 1) * (len + 1);
          }
          else
          {
-            ns = my_thread_num*len+rest;
-            ne = (my_thread_num+1)*len+rest;
+            ns = my_thread_num * len + rest;
+            ne = (my_thread_num + 1) * len + rest;
          }
 
-         for (ii=ns; ii < ne; ii++)
+         for (ii = ns; ii < ne; ii++)
          {
             row = rows[ii];
             n = ncols ? ncols[ii] : 1;
@@ -3937,9 +4116,9 @@ hypre_IJMatrixAddToValuesOMPParCSR( hypre_IJMatrix       *matrix,
                   tmp_indx = 0;
                   not_found = 1;
                   size = old_size;
-                  for (i=0; i < n; i++)
+                  for (i = 0; i < n; i++)
                   {
-                     for (j=0; j < old_size; j++)
+                     for (j = 0; j < old_size; j++)
                      {
                         if (local_j[j] == cols[indx])
                         {
@@ -3965,22 +4144,22 @@ hypre_IJMatrixAddToValuesOMPParCSR( hypre_IJMatrix       *matrix,
                      indx++;
                   }
 
-                  row_length[row_local] = size+tmp_indx;
+                  row_length[row_local] = size + tmp_indx;
 
                   if (tmp_indx)
                   {
-                     aux_j[row_local] = hypre_TReAlloc(aux_j[row_local],HYPRE_BigInt,
-                                                       size+tmp_indx, HYPRE_MEMORY_HOST);
+                     aux_j[row_local] = hypre_TReAlloc(aux_j[row_local], HYPRE_BigInt,
+                                                       size + tmp_indx, HYPRE_MEMORY_HOST);
                      aux_data[row_local] = hypre_TReAlloc(aux_data[row_local],
-                                                          HYPRE_Complex, size+tmp_indx, HYPRE_MEMORY_HOST);
-                     row_space[row_local] = size+tmp_indx;
+                                                          HYPRE_Complex, size + tmp_indx, HYPRE_MEMORY_HOST);
+                     row_space[row_local] = size + tmp_indx;
                      local_j = aux_j[row_local];
                      local_data = aux_data[row_local];
                   }
 
                   cnt = size;
 
-                  for (i=0; i < tmp_indx; i++)
+                  for (i = 0; i < tmp_indx; i++)
                   {
                      local_j[cnt] = tmp_j[i];
                      local_data[cnt++] = tmp_data[i];
@@ -4001,15 +4180,15 @@ hypre_IJMatrixAddToValuesOMPParCSR( hypre_IJMatrix       *matrix,
                   diag_indx = hypre_AuxParCSRMatrixIndxDiag(aux_matrix)[row_local];
                   cnt_diag = diag_indx;
                   cnt_offd = offd_indx;
-                  diag_space = diag_i[row_local+1];
-                  offd_space = offd_i[row_local+1];
+                  diag_space = diag_i[row_local + 1];
+                  offd_space = offd_i[row_local + 1];
                   not_found = 1;
-                  for (i=0; i < n; i++)
+                  for (i = 0; i < n; i++)
                   {
                      if (cols[indx] < col_0 || cols[indx] > col_n)
                         /* insert into offd */
                      {
-                        for (j=offd_i[row_local]; j < offd_indx; j++)
+                        for (j = offd_i[row_local]; j < offd_indx; j++)
                         {
                            if (big_offd_j[j] == cols[indx])
                            {
@@ -4029,7 +4208,7 @@ hypre_IJMatrixAddToValuesOMPParCSR( hypre_IJMatrix       *matrix,
                            {
                               hypre_error(HYPRE_ERROR_GENERIC);
 #ifdef HYPRE_USING_OPENMP
-#pragma omp atomic
+                              #pragma omp atomic
 #endif
                               error_flag++;
                               if (print_level)
@@ -4045,9 +4224,9 @@ hypre_IJMatrixAddToValuesOMPParCSR( hypre_IJMatrix       *matrix,
                      }
                      else  /* insert into diag */
                      {
-                        for (j=diag_i[row_local]; j < diag_indx; j++)
+                        for (j = diag_i[row_local]; j < diag_indx; j++)
                         {
-                           if (diag_j[j] == (HYPRE_Int)(cols[indx]-col_0))
+                           if (diag_j[j] == (HYPRE_Int)(cols[indx] - col_0))
                            {
                               diag_data[j] += values[indx];
                               not_found = 0;
@@ -4058,14 +4237,14 @@ hypre_IJMatrixAddToValuesOMPParCSR( hypre_IJMatrix       *matrix,
                         {
                            if (cnt_diag < diag_space)
                            {
-                              diag_j[cnt_diag] = (HYPRE_Int)(cols[indx]-col_0);
+                              diag_j[cnt_diag] = (HYPRE_Int)(cols[indx] - col_0);
                               diag_data[cnt_diag++] = values[indx];
                            }
                            else
                            {
                               hypre_error(HYPRE_ERROR_GENERIC);
 #ifdef HYPRE_USING_OPENMP
-#pragma omp atomic
+                              #pragma omp atomic
 #endif
                               error_flag++;
                               if (print_level)
@@ -4098,19 +4277,21 @@ hypre_IJMatrixAddToValuesOMPParCSR( hypre_IJMatrix       *matrix,
                   my_offproc_cnt[1] = 2;
                }
                i = my_offproc_cnt[1];
-               if (i+2 < my_offproc_cnt[0])
+               if (i + 2 < my_offproc_cnt[0])
                {
                   my_offproc_cnt[i] = ii;
-                  my_offproc_cnt[i+1] = indx;
+                  my_offproc_cnt[i + 1] = indx;
                   my_offproc_cnt[1] += 2;
                }
                else
                {
                   size = my_offproc_cnt[0];
-                  my_offproc_cnt = hypre_TReAlloc(my_offproc_cnt, HYPRE_Int, size+200, HYPRE_MEMORY_HOST);
+                  my_offproc_cnt = hypre_TReAlloc(my_offproc_cnt, HYPRE_Int,
+                                                  size + 200, HYPRE_MEMORY_HOST);
+                  offproc_cnt[my_thread_num] = my_offproc_cnt;
                   my_offproc_cnt[0] += 200;
                   my_offproc_cnt[i] = ii;
-                  my_offproc_cnt[i+1] = indx;
+                  my_offproc_cnt[i + 1] = indx;
                   my_offproc_cnt[1] += 2;
                }
             }
@@ -4123,7 +4304,7 @@ hypre_IJMatrixAddToValuesOMPParCSR( hypre_IJMatrix       *matrix,
    }
    if (!aux_matrix)
    {
-      HYPRE_Int size = (HYPRE_Int)(row_partitioning[1]-row_partitioning[0]);
+      HYPRE_Int size = (HYPRE_Int)(row_partitioning[1] - row_partitioning[0]);
       hypre_AuxParCSRMatrixCreate(&aux_matrix, size, size, NULL);
       hypre_AuxParCSRMatrixNeedAux(aux_matrix) = 0;
       hypre_IJMatrixTranslator(matrix) = aux_matrix;
@@ -4135,7 +4316,7 @@ hypre_IJMatrixAddToValuesOMPParCSR( hypre_IJMatrix       *matrix,
          HYPRE_Int *my_offproc_cnt = offproc_cnt[i1];
          HYPRE_Int i, i2, ii, n, indx;
          HYPRE_BigInt row;
-         for (i2 = 2; i2 < my_offproc_cnt[1]; i2+=2)
+         for (i2 = 2; i2 < my_offproc_cnt[1]; i2 += 2)
          {
             ii = my_offproc_cnt[i2];
             row = rows[ii];
@@ -4144,7 +4325,7 @@ hypre_IJMatrixAddToValuesOMPParCSR( hypre_IJMatrix       *matrix,
             {
                continue;
             }
-            indx = my_offproc_cnt[i2+1];
+            indx = my_offproc_cnt[i2 + 1];
             current_num_elmts
                = hypre_AuxParCSRMatrixCurrentOffProcElmts(aux_matrix);
             max_off_proc_elmts
@@ -4156,11 +4337,11 @@ hypre_IJMatrixAddToValuesOMPParCSR( hypre_IJMatrix       *matrix,
 
             if (!max_off_proc_elmts)
             {
-               max_off_proc_elmts = hypre_max(n,1000);
+               max_off_proc_elmts = hypre_max(n, 1000);
                hypre_AuxParCSRMatrixMaxOffProcElmts(aux_matrix) =
                   max_off_proc_elmts;
                hypre_AuxParCSRMatrixOffProcI(aux_matrix)
-                  = hypre_CTAlloc(HYPRE_BigInt, 2*max_off_proc_elmts, HYPRE_MEMORY_HOST);
+                  = hypre_CTAlloc(HYPRE_BigInt, 2 * max_off_proc_elmts, HYPRE_MEMORY_HOST);
                hypre_AuxParCSRMatrixOffProcJ(aux_matrix)
                   = hypre_CTAlloc(HYPRE_BigInt, max_off_proc_elmts, HYPRE_MEMORY_HOST);
                hypre_AuxParCSRMatrixOffProcData(aux_matrix)
@@ -4171,10 +4352,10 @@ hypre_IJMatrixAddToValuesOMPParCSR( hypre_IJMatrix       *matrix,
             }
             else if (current_num_elmts + n > max_off_proc_elmts)
             {
-               max_off_proc_elmts += 3*n;
-               off_proc_i = hypre_TReAlloc(off_proc_i, HYPRE_BigInt, 2*max_off_proc_elmts, HYPRE_MEMORY_HOST);
+               max_off_proc_elmts += 3 * n;
+               off_proc_i = hypre_TReAlloc(off_proc_i, HYPRE_BigInt, 2 * max_off_proc_elmts, HYPRE_MEMORY_HOST);
                off_proc_j = hypre_TReAlloc(off_proc_j, HYPRE_BigInt, max_off_proc_elmts, HYPRE_MEMORY_HOST);
-               off_proc_data = hypre_TReAlloc(off_proc_data,HYPRE_Complex,
+               off_proc_data = hypre_TReAlloc(off_proc_data, HYPRE_Complex,
                                               max_off_proc_elmts, HYPRE_MEMORY_HOST);
                hypre_AuxParCSRMatrixMaxOffProcElmts(aux_matrix)
                   = max_off_proc_elmts;
@@ -4184,7 +4365,7 @@ hypre_IJMatrixAddToValuesOMPParCSR( hypre_IJMatrix       *matrix,
             }
             off_proc_i[off_proc_i_indx++] = row;
             off_proc_i[off_proc_i_indx++] = n;
-            for (i=0; i < n; i++)
+            for (i = 0; i < n; i++)
             {
                off_proc_j[current_num_elmts] = cols[indx];
                off_proc_data[current_num_elmts++] = values[indx++];
@@ -4199,3 +4380,19 @@ hypre_IJMatrixAddToValuesOMPParCSR( hypre_IJMatrix       *matrix,
 
    return hypre_error_flag;
 }
+
+/*--------------------------------------------------------------------------
+ * hypre_IJMatrixMigrateParCSR
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_IJMatrixMigrateParCSR(hypre_IJMatrix       *matrix,
+                            HYPRE_MemoryLocation  memory_location)
+{
+   hypre_ParCSRMatrix *par_matrix = (hypre_ParCSRMatrix *) hypre_IJMatrixObject(matrix);
+
+   /* Migrate the ParCSR matrix */
+   hypre_ParCSRMatrixMigrate(par_matrix, memory_location);
+
+   return hypre_error_flag;
+}
diff --git a/external/hypre/src/IJ_mv/IJMatrix_parcsr_device.c b/external/hypre/src/IJ_mv/IJMatrix_parcsr_device.c
index 157701dc..f8ef7c53 100644
--- a/external/hypre/src/IJ_mv/IJMatrix_parcsr_device.c
+++ b/external/hypre/src/IJ_mv/IJMatrix_parcsr_device.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -11,15 +11,18 @@
  *
  *****************************************************************************/
 
+#include "_hypre_onedpl.hpp"
 #include "_hypre_IJ_mv.h"
 #include "_hypre_utilities.hpp"
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
 
 __global__ void
-hypreCUDAKernel_IJMatrixValues_dev1(HYPRE_Int n, HYPRE_Int *rowind, HYPRE_Int *row_ptr, HYPRE_Int *row_len, HYPRE_Int *mark)
+hypreGPUKernel_IJMatrixValues_dev1(hypre_DeviceItem &item, HYPRE_Int n, HYPRE_Int *rowind,
+                                   HYPRE_Int *row_ptr,
+                                   HYPRE_Int *row_len, HYPRE_Int *mark)
 {
-   HYPRE_Int global_thread_id = hypre_cuda_get_grid_thread_id<1,1>();
+   HYPRE_Int global_thread_id = hypre_gpu_get_grid_thread_id<1, 1>(item);
 
    if (global_thread_id < n)
    {
@@ -35,6 +38,49 @@ hypreCUDAKernel_IJMatrixValues_dev1(HYPRE_Int n, HYPRE_Int *rowind, HYPRE_Int *r
    }
 }
 
+HYPRE_Int
+hypre_AuxParCSRMatrixStackReallocate(hypre_AuxParCSRMatrix *aux_matrix,
+                                     HYPRE_BigInt           new_stack_max)
+{
+   HYPRE_BigInt stack_max = hypre_AuxParCSRMatrixMaxStackElmts(aux_matrix);
+
+   hypre_AuxParCSRMatrixStackI(aux_matrix) =
+      hypre_TReAlloc_v2(hypre_AuxParCSRMatrixStackI(aux_matrix),
+                        HYPRE_BigInt,
+                        stack_max, HYPRE_BigInt,  new_stack_max, HYPRE_MEMORY_DEVICE);
+
+   hypre_AuxParCSRMatrixStackJ(aux_matrix) =
+      hypre_TReAlloc_v2(hypre_AuxParCSRMatrixStackJ(aux_matrix),
+                        HYPRE_BigInt,
+                        stack_max, HYPRE_BigInt,  new_stack_max, HYPRE_MEMORY_DEVICE);
+
+   hypre_AuxParCSRMatrixStackData(aux_matrix) =
+      hypre_TReAlloc_v2(hypre_AuxParCSRMatrixStackData(aux_matrix),
+                        HYPRE_Complex,
+                        stack_max, HYPRE_Complex, new_stack_max, HYPRE_MEMORY_DEVICE);
+
+   hypre_AuxParCSRMatrixStackSorA(aux_matrix) =
+      hypre_TReAlloc_v2(hypre_AuxParCSRMatrixStackSorA(aux_matrix),
+                        char,
+                        stack_max, char, new_stack_max, HYPRE_MEMORY_DEVICE);
+
+   hypre_AuxParCSRMatrixMaxStackElmts(aux_matrix) = new_stack_max;
+
+   return hypre_error_flag;
+}
+
+inline void
+hypre_AuxParCSRMatrixStackPrintInfo(hypre_IJMatrix *matrix)
+{
+   static HYPRE_Int counter = 0;
+   hypre_AuxParCSRMatrix *aux_matrix = (hypre_AuxParCSRMatrix *) hypre_IJMatrixTranslator(matrix);
+
+   hypre_ParPrintf(hypre_IJMatrixComm(matrix),
+                   " %d, %d, %d\n", ++counter,
+                   hypre_AuxParCSRMatrixMaxStackElmts(aux_matrix),
+                   hypre_AuxParCSRMatrixCurrentStackElmts(aux_matrix));
+}
+
 /* E.g. nrows = 3
  *      ncols = 2 3 4
  *      rows  = 10 20 30
@@ -68,6 +114,7 @@ hypre_IJMatrixSetAddValuesParCSRDevice( hypre_IJMatrix       *matrix,
 
    HYPRE_Int  nelms;
    HYPRE_Int *row_ptr = NULL;
+   HYPRE_Int  early_assemble_flag = 0;
 
    /* expand rows into full expansion of rows based on ncols
     * if ncols == NULL, ncols is all ones, so rows are indeed full expansion */
@@ -75,11 +122,11 @@ hypre_IJMatrixSetAddValuesParCSRDevice( hypre_IJMatrix       *matrix,
    {
       row_ptr = hypre_TAlloc(HYPRE_Int, nrows + 1, HYPRE_MEMORY_DEVICE);
       hypre_TMemcpy(row_ptr, ncols, HYPRE_Int, nrows, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
-      /* RL: have to init the last entry; cuda-memcheck --tool initcheck complains otherwise
-       * but why? exclusive scan does not need it */
-      /* hypre_Memset(row_ptr + nrows, 0, sizeof(HYPRE_Int), HYPRE_MEMORY_DEVICE); */
+
+      /* RL: have to init the last entry !!! */
+      hypre_Memset(row_ptr + nrows, 0, sizeof(HYPRE_Int), HYPRE_MEMORY_DEVICE);
       hypreDevice_IntegerExclusiveScan(nrows + 1, row_ptr);
-      hypre_TMemcpy(&nelms, row_ptr+nrows, HYPRE_Int, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
+      hypre_TMemcpy(&nelms, row_ptr + nrows, HYPRE_Int, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
    }
    else
    {
@@ -88,6 +135,7 @@ hypre_IJMatrixSetAddValuesParCSRDevice( hypre_IJMatrix       *matrix,
 
    if (nelms <= 0)
    {
+      hypre_TFree(row_ptr, HYPRE_MEMORY_DEVICE);
       return hypre_error_flag;
    }
 
@@ -98,51 +146,77 @@ hypre_IJMatrixSetAddValuesParCSRDevice( hypre_IJMatrix       *matrix,
       hypre_IJMatrixTranslator(matrix) = aux_matrix;
    }
 
-   HYPRE_Int      stack_elmts_max      = hypre_AuxParCSRMatrixMaxStackElmts(aux_matrix);
-   HYPRE_Int      stack_elmts_current  = hypre_AuxParCSRMatrixCurrentStackElmts(aux_matrix);
-   HYPRE_Int      stack_elmts_required = stack_elmts_current + nelms;
+   HYPRE_BigInt   stack_elmts_max      = hypre_AuxParCSRMatrixMaxStackElmts(aux_matrix);
+   HYPRE_BigInt   stack_elmts_current  = hypre_AuxParCSRMatrixCurrentStackElmts(aux_matrix);
+   HYPRE_BigInt   stack_elmts_required = stack_elmts_current + (HYPRE_BigInt) nelms;
    HYPRE_BigInt  *stack_i              = hypre_AuxParCSRMatrixStackI(aux_matrix);
    HYPRE_BigInt  *stack_j              = hypre_AuxParCSRMatrixStackJ(aux_matrix);
    HYPRE_Complex *stack_data           = hypre_AuxParCSRMatrixStackData(aux_matrix);
    char          *stack_sora           = hypre_AuxParCSRMatrixStackSorA(aux_matrix);
+   HYPRE_Int      early_assemble       = hypre_AuxParCSRMatrixEarlyAssemble(aux_matrix);
 
    if ( stack_elmts_max < stack_elmts_required )
    {
-      HYPRE_Int stack_elmts_max_new = hypre_max(hypre_AuxParCSRMatrixUsrOnProcElmts (aux_matrix), 0) +
-                                      hypre_max(hypre_AuxParCSRMatrixUsrOffProcElmts(aux_matrix), 0);
-      if ( hypre_AuxParCSRMatrixUsrOnProcElmts (aux_matrix) < 0 ||
-           hypre_AuxParCSRMatrixUsrOffProcElmts(aux_matrix) < 0 )
+      HYPRE_BigInt stack_elmts_max_new = 0;
+
+      if (stack_elmts_max == 0)
       {
-         stack_elmts_max_new = hypre_max(num_local_rows * hypre_AuxParCSRMatrixInitAllocFactor(aux_matrix), stack_elmts_max_new);
-         stack_elmts_max_new = hypre_max(stack_elmts_max * hypre_AuxParCSRMatrixGrowFactor(aux_matrix), stack_elmts_max_new);
+         /* intial allocation */
+         if ( hypre_AuxParCSRMatrixUsrOnProcElmts (aux_matrix) > 0 &&
+              hypre_AuxParCSRMatrixUsrOffProcElmts(aux_matrix) > 0 )
+         {
+            stack_elmts_max_new = hypre_AuxParCSRMatrixUsrOnProcElmts (aux_matrix) +
+                                  hypre_AuxParCSRMatrixUsrOffProcElmts(aux_matrix);
+         }
+         else
+         {
+            stack_elmts_max_new = num_local_rows *
+                                  hypre_AuxParCSRMatrixInitAllocFactor(aux_matrix);
+         }
+         stack_elmts_max_new = hypre_max(stack_elmts_required, stack_elmts_max_new);
+      }
+      else
+      {
+         if (early_assemble)
+         {
+            stack_elmts_max_new = stack_elmts_required;
+            early_assemble_flag = 1;
+         }
+         else
+         {
+            stack_elmts_max_new = stack_elmts_required *
+                                  hypre_AuxParCSRMatrixGrowFactor(aux_matrix);
+         }
       }
-      stack_elmts_max_new = hypre_max(stack_elmts_required, stack_elmts_max_new);
 
-      hypre_AuxParCSRMatrixStackI(aux_matrix)    = stack_i    = hypre_TReAlloc_v2(stack_i,    HYPRE_BigInt,  stack_elmts_max, HYPRE_BigInt,  stack_elmts_max_new, HYPRE_MEMORY_DEVICE);
-      hypre_AuxParCSRMatrixStackJ(aux_matrix)    = stack_j    = hypre_TReAlloc_v2(stack_j,    HYPRE_BigInt,  stack_elmts_max, HYPRE_BigInt,  stack_elmts_max_new, HYPRE_MEMORY_DEVICE);
-      hypre_AuxParCSRMatrixStackData(aux_matrix) = stack_data = hypre_TReAlloc_v2(stack_data, HYPRE_Complex, stack_elmts_max, HYPRE_Complex, stack_elmts_max_new, HYPRE_MEMORY_DEVICE);
-      hypre_AuxParCSRMatrixStackSorA(aux_matrix) = stack_sora = hypre_TReAlloc_v2(stack_sora,          char, stack_elmts_max,          char, stack_elmts_max_new, HYPRE_MEMORY_DEVICE);
-      hypre_AuxParCSRMatrixMaxStackElmts(aux_matrix) = stack_elmts_max_new;
+      hypre_AuxParCSRMatrixStackReallocate(aux_matrix, stack_elmts_max_new);
+      stack_i = hypre_AuxParCSRMatrixStackI(aux_matrix);
+      stack_j = hypre_AuxParCSRMatrixStackJ(aux_matrix);
+      stack_data = hypre_AuxParCSRMatrixStackData(aux_matrix);
+      stack_sora = hypre_AuxParCSRMatrixStackSorA(aux_matrix);
+      stack_elmts_max = hypre_AuxParCSRMatrixMaxStackElmts(aux_matrix);
    }
 
-   HYPRE_THRUST_CALL(fill_n, stack_sora + stack_elmts_current, nelms, SorA);
+   hypreDevice_CharFilln(stack_sora + stack_elmts_current, nelms, SorA);
 
    if (ncols)
    {
-      hypreDevice_CsrRowPtrsToIndicesWithRowNum(nrows, nelms, row_ptr, (HYPRE_BigInt *) rows, stack_i + stack_elmts_current);
+      hypreDevice_CsrRowPtrsToIndicesWithRowNum(nrows, nelms, row_ptr, (HYPRE_BigInt *) rows,
+                                                stack_i + stack_elmts_current);
    }
    else
    {
-      hypre_TMemcpy(stack_i + stack_elmts_current, rows, HYPRE_BigInt, nelms, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+      hypre_TMemcpy(stack_i + stack_elmts_current, rows, HYPRE_BigInt, nelms, HYPRE_MEMORY_DEVICE,
+                    HYPRE_MEMORY_DEVICE);
    }
 
    if (row_indexes)
    {
       HYPRE_Int len, len1;
-      hypre_TMemcpy(&len1, &row_indexes[nrows-1], HYPRE_Int, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
+      hypre_TMemcpy(&len1, &row_indexes[nrows - 1], HYPRE_Int, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
       if (ncols)
       {
-         hypre_TMemcpy(&len, &ncols[nrows-1], HYPRE_Int, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
+         hypre_TMemcpy(&len, &ncols[nrows - 1], HYPRE_Int, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
       }
       else
       {
@@ -151,22 +225,36 @@ hypre_IJMatrixSetAddValuesParCSRDevice( hypre_IJMatrix       *matrix,
       /* this is the *effective* length of cols and values */
       len += len1;
       HYPRE_Int *indicator = hypre_CTAlloc(HYPRE_Int, len, HYPRE_MEMORY_DEVICE);
-      hypreDevice_CsrRowPtrsToIndices_v2(nrows-1, len1, (HYPRE_Int *) row_indexes, indicator);
+      hypreDevice_CsrRowPtrsToIndices_v2(nrows - 1, len1, (HYPRE_Int *) row_indexes, indicator);
       /* mark unwanted elements as -1 */
-      dim3 bDim = hypre_GetDefaultCUDABlockDimension();
-      dim3 gDim = hypre_GetDefaultCUDAGridDimension(len1, "thread", bDim);
-      HYPRE_CUDA_LAUNCH( hypreCUDAKernel_IJMatrixValues_dev1, gDim, bDim, len1, indicator, (HYPRE_Int *) row_indexes, ncols, indicator );
-
+      dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+      dim3 gDim = hypre_GetDefaultDeviceGridDimension(len1, "thread", bDim);
+      HYPRE_GPU_LAUNCH( hypreGPUKernel_IJMatrixValues_dev1, gDim, bDim, len1, indicator,
+                        (HYPRE_Int *) row_indexes, ncols, indicator );
+
+#if defined(HYPRE_USING_SYCL)
+      auto zip_in = oneapi::dpl::make_zip_iterator(cols, values);
+      auto zip_out = oneapi::dpl::make_zip_iterator(stack_j + stack_elmts_current,
+                                                    stack_data + stack_elmts_current);
+      auto new_end = hypreSycl_copy_if( zip_in,
+                                        zip_in + len,
+                                        indicator,
+                                        zip_out,
+                                        is_nonnegative<HYPRE_Int>() );
+
+      HYPRE_Int nnz_tmp = std::get<0>(new_end.base()) - (stack_j + stack_elmts_current);
+#else
       auto new_end = HYPRE_THRUST_CALL(
-            copy_if,
-            thrust::make_zip_iterator(thrust::make_tuple(cols,       values)),
-            thrust::make_zip_iterator(thrust::make_tuple(cols + len, values + len)),
-            indicator,
-            thrust::make_zip_iterator(thrust::make_tuple(stack_j    + stack_elmts_current,
-                                                         stack_data + stack_elmts_current)),
-            is_nonnegative<HYPRE_Int>() );
+                        copy_if,
+                        thrust::make_zip_iterator(thrust::make_tuple(cols,       values)),
+                        thrust::make_zip_iterator(thrust::make_tuple(cols + len, values + len)),
+                        indicator,
+                        thrust::make_zip_iterator(thrust::make_tuple(stack_j    + stack_elmts_current,
+                                                                     stack_data + stack_elmts_current)),
+                        is_nonnegative<HYPRE_Int>() );
 
       HYPRE_Int nnz_tmp = thrust::get<0>(new_end.get_iterator_tuple()) - (stack_j + stack_elmts_current);
+#endif
 
       hypre_assert(nnz_tmp == nelms);
 
@@ -174,87 +262,200 @@ hypre_IJMatrixSetAddValuesParCSRDevice( hypre_IJMatrix       *matrix,
    }
    else
    {
-      hypre_TMemcpy(stack_j    + stack_elmts_current, cols,   HYPRE_BigInt,  nelms, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
-      hypre_TMemcpy(stack_data + stack_elmts_current, values, HYPRE_Complex, nelms, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+      hypre_TMemcpy(stack_j    + stack_elmts_current, cols,   HYPRE_BigInt,  nelms, HYPRE_MEMORY_DEVICE,
+                    HYPRE_MEMORY_DEVICE);
+      hypre_TMemcpy(stack_data + stack_elmts_current, values, HYPRE_Complex, nelms, HYPRE_MEMORY_DEVICE,
+                    HYPRE_MEMORY_DEVICE);
    }
 
-   hypre_AuxParCSRMatrixCurrentStackElmts(aux_matrix) += nelms;
+   stack_elmts_current += (HYPRE_BigInt) nelms;
+   hypre_AuxParCSRMatrixCurrentStackElmts(aux_matrix) = stack_elmts_current;
+
+   /* for debug */
+   // hypre_AuxParCSRMatrixStackPrintInfo(matrix);
+
+   if (early_assemble_flag)
+   {
+      hypre_IJMatrixAssembleCompressDevice(matrix, 0);
+
+      stack_elmts_current = hypre_AuxParCSRMatrixCurrentStackElmts(aux_matrix);
+      stack_elmts_max = hypre_AuxParCSRMatrixMaxStackElmts(aux_matrix);
+
+      HYPRE_BigInt stack_elmts_max_new = stack_elmts_current * hypre_AuxParCSRMatrixGrowFactor(
+                                            aux_matrix);
+
+      if (stack_elmts_max_new != stack_elmts_max)
+      {
+         hypre_AuxParCSRMatrixStackReallocate(aux_matrix, stack_elmts_max_new);
+      }
+
+      //hypre_AuxParCSRMatrixStackPrintInfo(matrix);
+   }
 
    hypre_TFree(row_ptr, HYPRE_MEMORY_DEVICE);
 
    return hypre_error_flag;
 }
 
+#if defined(HYPRE_USING_SYCL)
+template<typename T1, typename T2>
+struct hypre_IJMatrixAssembleFunctor
+{
+   typedef std::tuple<T1, T2> Tuple;
+
+   Tuple operator()(const Tuple& x, const Tuple& y ) const
+   {
+      return std::make_tuple( hypre_max(std::get<0>(x), std::get<0>(y)),
+                              std::get<1>(x) + std::get<1>(y) );
+   }
+};
+#else
 template<typename T1, typename T2>
-struct hypre_IJMatrixAssembleFunctor : public thrust::binary_function< thrust::tuple<T1, T2>, thrust::tuple<T1, T2>, thrust::tuple<T1, T2> >
+struct hypre_IJMatrixAssembleFunctor : public
+   thrust::binary_function< thrust::tuple<T1, T2>, thrust::tuple<T1, T2>, thrust::tuple<T1, T2> >
 {
    typedef thrust::tuple<T1, T2> Tuple;
 
    __device__ Tuple operator()(const Tuple& x, const Tuple& y )
    {
-      return thrust::make_tuple( hypre_max(thrust::get<0>(x), thrust::get<0>(y)), thrust::get<1>(x) + thrust::get<1>(y) );
+      return thrust::make_tuple( hypre_max(thrust::get<0>(x), thrust::get<0>(y)),
+                                 thrust::get<1>(x) + thrust::get<1>(y) );
    }
 };
+#endif
 
-/* helper routine used in hypre_IJMatrixAssembleParCSRDevice:
+/* This helper routine is used in hypre_IJMatrixAssembleParCSRDevice on on-proc entries:
  * 1. sort (X0, A0) with key (I0, J0)
- *    [put the diagonal first; see the comments in cuda_utils.c]
+ *    put the diagonal first by hypreDevice_StableSortTupleByTupleKey(..., 2)
+ *    see the comments in cuda_utils.c
  * 2. for each segment in (I0, J0), zero out in A0 all before the last `set'
  * 3. reduce A0 [with sum] and reduce X0 [with max]
- * N0: input size; N1: size after reduction (<= N0)
- * Note: (I1, J1, X1, A1) are not resized to N1 but have size N0
+ *    The reason of using max for X0 is that once an entry has a set (1), which may be
+ *    combined with adds, should continue to be considered as a set.
+ *    This is the correct behavior when combined with existing CSR
+ * On entry
+ * N: size of I, J, X, A
+ * On return
+ * N: the number of entries in I, J, X, A, after reduction
+ * Note: (I, J, X, A) have length "size"
  */
 HYPRE_Int
-hypre_IJMatrixAssembleSortAndReduce1(HYPRE_Int  N0, HYPRE_BigInt  *I0, HYPRE_BigInt  *J0, char  *X0, HYPRE_Complex  *A0,
-                                     HYPRE_Int *N1, HYPRE_BigInt **I1, HYPRE_BigInt **J1, char **X1, HYPRE_Complex **A1 )
+hypre_IJMatrixAssembleSortAndReduce1(HYPRE_Int      *Nptr,
+                                     HYPRE_BigInt  **Iptr,
+                                     HYPRE_BigInt  **Jptr,
+                                     char          **Xptr,
+                                     HYPRE_Complex **Aptr,
+                                     HYPRE_Int       size)
 {
+   HYPRE_Int      N0 = *Nptr;
+   HYPRE_BigInt  *I0 = *Iptr;
+   HYPRE_BigInt  *J0 = *Jptr;
+   char          *X0 = *Xptr;
+   HYPRE_Complex *A0 = *Aptr;
+
    hypreDevice_StableSortTupleByTupleKey(N0, I0, J0, X0, A0, 2);
 
-   HYPRE_BigInt  *I = hypre_TAlloc(HYPRE_BigInt,  N0, HYPRE_MEMORY_DEVICE);
-   HYPRE_BigInt  *J = hypre_TAlloc(HYPRE_BigInt,  N0, HYPRE_MEMORY_DEVICE);
-   char          *X = hypre_TAlloc(char,          N0, HYPRE_MEMORY_DEVICE);
-   HYPRE_Complex *A = hypre_TAlloc(HYPRE_Complex, N0, HYPRE_MEMORY_DEVICE);
+   HYPRE_BigInt  *I = hypre_TAlloc(HYPRE_BigInt,  size, HYPRE_MEMORY_DEVICE);
+   HYPRE_BigInt  *J = hypre_TAlloc(HYPRE_BigInt,  size, HYPRE_MEMORY_DEVICE);
+   char          *X = hypre_TAlloc(char,          size, HYPRE_MEMORY_DEVICE);
+   HYPRE_Complex *A = hypre_TAlloc(HYPRE_Complex, size, HYPRE_MEMORY_DEVICE);
 
    /*
-   dim3 bDim = hypre_GetDefaultCUDABlockDimension();
-   dim3 gDim = hypre_GetDefaultCUDAGridDimension(N0, "thread", bDim);
-   HYPRE_CUDA_LAUNCH( hypreCUDAKernel_IJMatrixAssembleSortAndReduce1, gDim, bDim, N0, I0, J0, X0, A0 );
+   dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+   dim3 gDim = hypre_GetDefaultDeviceGridDimension(N0, "thread", bDim);
+   HYPRE_GPU_LAUNCH( hypreGPUKernel_IJMatrixAssembleSortAndReduce1, gDim, bDim, N0, I0, J0, X0, A0 );
    */
 
    /* output X: 0: keep, 1: zero-out */
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_ONEDPL_CALL( oneapi::dpl::exclusive_scan_by_segment,
+                      oneapi::dpl::make_reverse_iterator(
+                         oneapi::dpl::make_zip_iterator(I0 + N0, J0 + N0)), /* key begin */
+                      oneapi::dpl::make_reverse_iterator(
+                         oneapi::dpl::make_zip_iterator(I0, J0)),           /* key end */
+                      oneapi::dpl::make_reverse_iterator(X0 + N0),          /* input value begin */
+                      oneapi::dpl::make_reverse_iterator(X + N0),           /* output value begin */
+                      char(0),                                              /* init */
+                      std::equal_to< std::tuple<HYPRE_BigInt, HYPRE_BigInt> >(),
+                      oneapi::dpl::maximum<char>() );
+
+   hypreSycl_transform_if(A0,
+                          A0 + N0,
+                          X,
+                          A0,
+   [] (const auto & x) {return 0.0;},
+   [] (const auto & x) {return x;} );
+
+   auto I0_J0_zip = oneapi::dpl::make_zip_iterator(I0, J0);
+   auto new_end = HYPRE_ONEDPL_CALL( oneapi::dpl::reduce_by_segment,
+                                     I0_J0_zip,                                                    /* keys_first */
+                                     I0_J0_zip + N0,                                               /* keys_last */
+                                     oneapi::dpl::make_zip_iterator(X0, A0),                       /* values_first */
+                                     oneapi::dpl::make_zip_iterator(I, J),                         /* keys_output */
+                                     oneapi::dpl::make_zip_iterator(X, A),                         /* values_output */
+                                     std::equal_to< std::tuple<HYPRE_BigInt, HYPRE_BigInt> >(),    /* binary_pred */
+                                     hypre_IJMatrixAssembleFunctor<char, HYPRE_Complex>()          /* binary_op */);
+
+   *Nptr = std::get<0>(new_end.first.base()) - I;
+#else
    HYPRE_THRUST_CALL(
-         exclusive_scan_by_key,
-         make_reverse_iterator(thrust::make_zip_iterator(thrust::make_tuple(I0+N0, J0+N0))),
-         make_reverse_iterator(thrust::make_zip_iterator(thrust::make_tuple(I0,    J0))),
-         make_reverse_iterator(thrust::device_pointer_cast<char>(X0)+N0),
-         make_reverse_iterator(thrust::device_pointer_cast<char>(X) +N0),
-         char(0),
-         thrust::equal_to< thrust::tuple<HYPRE_BigInt, HYPRE_BigInt> >(),
-         thrust::maximum<char>() );
+      exclusive_scan_by_key,
+      thrust::make_reverse_iterator(thrust::make_zip_iterator(thrust::make_tuple(I0 + N0, J0 + N0))),
+      thrust::make_reverse_iterator(thrust::make_zip_iterator(thrust::make_tuple(I0,    J0))),
+      thrust::make_reverse_iterator(thrust::device_pointer_cast<char>(X0) + N0),
+      thrust::make_reverse_iterator(thrust::device_pointer_cast<char>(X) + N0),
+      char(0),
+      thrust::equal_to< thrust::tuple<HYPRE_BigInt, HYPRE_BigInt> >(),
+      thrust::maximum<char>() );
 
    HYPRE_THRUST_CALL(replace_if, A0, A0 + N0, X, thrust::identity<char>(), 0.0);
 
    auto new_end = HYPRE_THRUST_CALL(
-         reduce_by_key,
-         thrust::make_zip_iterator(thrust::make_tuple(I0,      J0     )), /* keys_first */
-         thrust::make_zip_iterator(thrust::make_tuple(I0 + N0, J0 + N0)), /* keys_last */
-         thrust::make_zip_iterator(thrust::make_tuple(X0,      A0     )), /* values_first */
-         thrust::make_zip_iterator(thrust::make_tuple(I,       J      )), /* keys_output */
-         thrust::make_zip_iterator(thrust::make_tuple(X,       A      )), /* values_output */
-         thrust::equal_to< thrust::tuple<HYPRE_BigInt, HYPRE_BigInt> >(), /* binary_pred */
-         hypre_IJMatrixAssembleFunctor<char, HYPRE_Complex>()             /* binary_op */);
-
-   *N1 = thrust::get<0>(new_end.first.get_iterator_tuple()) - I;
-   *I1 = I;
-   *J1 = J;
-   *X1 = X;
-   *A1 = A;
+                     reduce_by_key,
+                     thrust::make_zip_iterator(thrust::make_tuple(I0,      J0     )), /* keys_first */
+                     thrust::make_zip_iterator(thrust::make_tuple(I0 + N0, J0 + N0)), /* keys_last */
+                     thrust::make_zip_iterator(thrust::make_tuple(X0,      A0     )), /* values_first */
+                     thrust::make_zip_iterator(thrust::make_tuple(I,       J      )), /* keys_output */
+                     thrust::make_zip_iterator(thrust::make_tuple(X,       A      )), /* values_output */
+                     thrust::equal_to< thrust::tuple<HYPRE_BigInt, HYPRE_BigInt> >(), /* binary_pred */
+                     hypre_IJMatrixAssembleFunctor<char, HYPRE_Complex>()             /* binary_op */);
+
+   *Nptr = thrust::get<0>(new_end.first.get_iterator_tuple()) - I;
+#endif
+
+   hypre_TFree(I0, HYPRE_MEMORY_DEVICE);
+   hypre_TFree(J0, HYPRE_MEMORY_DEVICE);
+   hypre_TFree(X0, HYPRE_MEMORY_DEVICE);
+   hypre_TFree(A0, HYPRE_MEMORY_DEVICE);
+
+   *Iptr = I;
+   *Jptr = J;
+   *Xptr = X;
+   *Aptr = A;
 
    return hypre_error_flag;
 }
 
+#if defined(HYPRE_USING_SYCL)
+template<typename T1, typename T2>
+struct hypre_IJMatrixAssembleFunctor2
+{
+   typedef std::tuple<T1, T2> Tuple;
+
+   __device__ Tuple operator()(const Tuple& x, const Tuple& y) const
+   {
+      const char          tx = std::get<0>(x);
+      const char          ty = std::get<0>(y);
+      const HYPRE_Complex vx = std::get<1>(x);
+      const HYPRE_Complex vy = std::get<1>(y);
+      const HYPRE_Complex vz = tx == 0 && ty == 0 ? vx + vy : tx ? vx : vy;
+      return std::make_tuple(0, vz);
+   }
+};
+#else
 template<typename T1, typename T2>
-struct hypre_IJMatrixAssembleFunctor2 : public thrust::binary_function< thrust::tuple<T1, T2>, thrust::tuple<T1, T2>, thrust::tuple<T1, T2> >
+struct hypre_IJMatrixAssembleFunctor2 : public
+   thrust::binary_function< thrust::tuple<T1, T2>, thrust::tuple<T1, T2>, thrust::tuple<T1, T2> >
 {
    typedef thrust::tuple<T1, T2> Tuple;
 
@@ -268,42 +469,93 @@ struct hypre_IJMatrixAssembleFunctor2 : public thrust::binary_function< thrust::
       return thrust::make_tuple(0, vz);
    }
 };
+#endif
 
+/* This helper routine is for combining new entries with existing CSR.
+ * Opt = 2 for diag part to keep diagonal first
+       = 0 for offd part
+ */
 HYPRE_Int
-hypre_IJMatrixAssembleSortAndReduce2(HYPRE_Int  N0, HYPRE_Int  *I0, HYPRE_Int  *J0, char  *X0, HYPRE_Complex  *A0,
-                                     HYPRE_Int *N1, HYPRE_Int **I1, HYPRE_Int **J1,            HYPRE_Complex **A1,
-                                     HYPRE_Int  opt )
+hypre_IJMatrixAssembleSortAndReduce2(HYPRE_Int      *Nptr,
+                                     HYPRE_Int     **Iptr,
+                                     HYPRE_Int     **Jptr,
+                                     char           *X0,
+                                     HYPRE_Complex **Aptr,
+                                     HYPRE_Int       opt)
 {
+   HYPRE_Int      N0 = *Nptr;
+   HYPRE_Int     *I0 = *Iptr;
+   HYPRE_Int     *J0 = *Jptr;
+   HYPRE_Complex *A0 = *Aptr;
+
    hypreDevice_StableSortTupleByTupleKey(N0, I0, J0, X0, A0, opt);
 
    HYPRE_Int     *I = hypre_TAlloc(HYPRE_Int,     N0, HYPRE_MEMORY_DEVICE);
    HYPRE_Int     *J = hypre_TAlloc(HYPRE_Int,     N0, HYPRE_MEMORY_DEVICE);
+   /* RL: no need to have X. No use before the free at the end */
    char          *X = hypre_TAlloc(char,          N0, HYPRE_MEMORY_DEVICE);
    HYPRE_Complex *A = hypre_TAlloc(HYPRE_Complex, N0, HYPRE_MEMORY_DEVICE);
 
+#if defined(HYPRE_USING_SYCL)
+   auto new_end = HYPRE_ONEDPL_CALL( oneapi::dpl::reduce_by_segment,
+                                     oneapi::dpl::make_zip_iterator(I0, J0),                 /* keys_first */
+                                     oneapi::dpl::make_zip_iterator(I0 + N0, J0 + N0),       /* keys_last */
+                                     oneapi::dpl::make_zip_iterator(X0, A0),                 /* values_first */
+                                     oneapi::dpl::make_zip_iterator(I, J),                   /* keys_output */
+                                     oneapi::dpl::make_zip_iterator(X, A),                   /* values_output */
+                                     std::equal_to< std::tuple<HYPRE_Int, HYPRE_Int> >(),    /* binary_pred */
+                                     hypre_IJMatrixAssembleFunctor2<char, HYPRE_Complex>()   /* binary_op */);
+
+   HYPRE_Int N = std::get<0>(new_end.first.base()) - I;
+#else
    auto new_end = HYPRE_THRUST_CALL(
-         reduce_by_key,
-         thrust::make_zip_iterator(thrust::make_tuple(I0,      J0     )), /* keys_first */
-         thrust::make_zip_iterator(thrust::make_tuple(I0 + N0, J0 + N0)), /* keys_last */
-         thrust::make_zip_iterator(thrust::make_tuple(X0,      A0     )), /* values_first */
-         thrust::make_zip_iterator(thrust::make_tuple(I,       J      )), /* keys_output */
-         thrust::make_zip_iterator(thrust::make_tuple(X,       A      )), /* values_output */
-         thrust::equal_to< thrust::tuple<HYPRE_Int, HYPRE_Int> >(),       /* binary_pred */
-         hypre_IJMatrixAssembleFunctor2<char, HYPRE_Complex>()            /* binary_op */);
-
-   *N1 = thrust::get<0>(new_end.first.get_iterator_tuple()) - I;
-   *I1 = I;
-   *J1 = J;
-   *A1 = A;
+                     reduce_by_key,
+                     thrust::make_zip_iterator(thrust::make_tuple(I0,      J0     )), /* keys_first */
+                     thrust::make_zip_iterator(thrust::make_tuple(I0 + N0, J0 + N0)), /* keys_last */
+                     thrust::make_zip_iterator(thrust::make_tuple(X0,      A0     )), /* values_first */
+                     thrust::make_zip_iterator(thrust::make_tuple(I,       J      )), /* keys_output */
+                     thrust::make_zip_iterator(thrust::make_tuple(X,       A      )), /* values_output */
+                     thrust::equal_to< thrust::tuple<HYPRE_Int, HYPRE_Int> >(),       /* binary_pred */
+                     hypre_IJMatrixAssembleFunctor2<char, HYPRE_Complex>()            /* binary_op */);
+
+   HYPRE_Int N = thrust::get<0>(new_end.first.get_iterator_tuple()) - I;
+#endif
+
+   hypre_TFree(I0, HYPRE_MEMORY_DEVICE);
+   hypre_TFree(J0, HYPRE_MEMORY_DEVICE);
+   hypre_TFree(A0, HYPRE_MEMORY_DEVICE);
+
+   J = hypre_TReAlloc_v2(J, HYPRE_Int, N0, HYPRE_Int, N, HYPRE_MEMORY_DEVICE);
+   A = hypre_TReAlloc_v2(A, HYPRE_Complex, N0, HYPRE_Complex, N, HYPRE_MEMORY_DEVICE);
+
+   *Nptr = N;
+   *Iptr = I;
+   *Jptr = J;
+   *Aptr = A;
 
    hypre_TFree(X, HYPRE_MEMORY_DEVICE);
 
    return hypre_error_flag;
 }
 
+/* This is used on off-proc entries before sending them to other procs
+ * 1. StableSort
+ * 2. Zero out all prior to the last set (including the set itself), since off-proc set is not allowed
+ * 3. Reduce A (sum) by key (I, J).
+ * 4. Remove numerical zeros
+ * On return:
+ *    N1 is the new length of I, J and A
+ *    Content of X0 is destroyed
+ * Note:
+ *    No need to reduce X, since all should be add
+ */
 HYPRE_Int
-hypre_IJMatrixAssembleSortAndReduce3(HYPRE_Int  N0, HYPRE_BigInt  *I0, HYPRE_BigInt  *J0,  char *X0, HYPRE_Complex  *A0,
-                                     HYPRE_Int *N1)
+hypre_IJMatrixAssembleSortAndReduce3(HYPRE_Int       N0,
+                                     HYPRE_BigInt   *I0,
+                                     HYPRE_BigInt   *J0,
+                                     char           *X0,
+                                     HYPRE_Complex  *A0,
+                                     HYPRE_Int      *N1)
 {
    hypreDevice_StableSortTupleByTupleKey(N0, I0, J0, X0, A0, 0);
 
@@ -311,40 +563,79 @@ hypre_IJMatrixAssembleSortAndReduce3(HYPRE_Int  N0, HYPRE_BigInt  *I0, HYPRE_Big
    HYPRE_BigInt  *J = hypre_TAlloc(HYPRE_BigInt,  N0, HYPRE_MEMORY_DEVICE);
    HYPRE_Complex *A = hypre_TAlloc(HYPRE_Complex, N0, HYPRE_MEMORY_DEVICE);
 
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_ONEDPL_CALL( oneapi::dpl::inclusive_scan_by_segment,
+                      oneapi::dpl::make_reverse_iterator(
+                         oneapi::dpl::make_zip_iterator(I0 + N0, J0 + N0)), /* key begin */
+                      oneapi::dpl::make_reverse_iterator(
+                         oneapi::dpl::make_zip_iterator(I0, J0)),           /* key end */
+                      oneapi::dpl::make_reverse_iterator(X0 + N0),          /* input value begin */
+                      oneapi::dpl::make_reverse_iterator(X0 + N0),          /* output value begin */
+                      std::equal_to< std::tuple<HYPRE_BigInt, HYPRE_BigInt> >(),
+                      oneapi::dpl::maximum<char>() );
+
+   hypreSycl_transform_if(A0,
+                          A0 + N0,
+                          X0,
+                          A0,
+   [] (const auto & x) {return 0.0;},
+   [] (const auto & x) {return x;} );
+
+   auto I0_J0_zip = oneapi::dpl::make_zip_iterator(I0, J0);
+
+   auto new_end = HYPRE_ONEDPL_CALL( oneapi::dpl::reduce_by_segment,
+                                     I0_J0_zip,                                                    /* keys_first */
+                                     I0_J0_zip + N0,                                               /* keys_last */
+                                     A0,                                                           /* values_first */
+                                     oneapi::dpl::make_zip_iterator(I, J),                         /* keys_output */
+                                     A,                                                            /* values_output */
+                                     std::equal_to< std::tuple<HYPRE_BigInt, HYPRE_BigInt> >()     /* binary_pred */);
+#else
    /* output in X0: 0: keep, 1: zero-out */
    HYPRE_THRUST_CALL(
-         inclusive_scan_by_key,
-         make_reverse_iterator(thrust::make_zip_iterator(thrust::make_tuple(I0+N0, J0+N0))),
-         make_reverse_iterator(thrust::make_zip_iterator(thrust::make_tuple(I0,    J0))),
-         make_reverse_iterator(thrust::device_pointer_cast<char>(X0)+N0),
-         make_reverse_iterator(thrust::device_pointer_cast<char>(X0)+N0),
-         thrust::equal_to< thrust::tuple<HYPRE_BigInt, HYPRE_BigInt> >(),
-         thrust::maximum<char>() );
+      inclusive_scan_by_key,
+      thrust::make_reverse_iterator(thrust::make_zip_iterator(thrust::make_tuple(I0 + N0, J0 + N0))),
+      thrust::make_reverse_iterator(thrust::make_zip_iterator(thrust::make_tuple(I0,    J0))),
+      thrust::make_reverse_iterator(thrust::device_pointer_cast<char>(X0) + N0),
+      thrust::make_reverse_iterator(thrust::device_pointer_cast<char>(X0) + N0),
+      thrust::equal_to< thrust::tuple<HYPRE_BigInt, HYPRE_BigInt> >(),
+      thrust::maximum<char>() );
 
    HYPRE_THRUST_CALL(replace_if, A0, A0 + N0, X0, thrust::identity<char>(), 0.0);
 
    auto new_end = HYPRE_THRUST_CALL(
-         reduce_by_key,
-         thrust::make_zip_iterator(thrust::make_tuple(I0,      J0     )), /* keys_first */
-         thrust::make_zip_iterator(thrust::make_tuple(I0 + N0, J0 + N0)), /* keys_last */
-         A0,                                                              /* values_first */
-         thrust::make_zip_iterator(thrust::make_tuple(I,       J      )), /* keys_output */
-         A,                                                               /* values_output */
-         thrust::equal_to< thrust::tuple<HYPRE_Int, HYPRE_Int> >()        /* binary_pred */);
+                     reduce_by_key,
+                     thrust::make_zip_iterator(thrust::make_tuple(I0,      J0     )), /* keys_first */
+                     thrust::make_zip_iterator(thrust::make_tuple(I0 + N0, J0 + N0)), /* keys_last */
+                     A0,                                                              /* values_first */
+                     thrust::make_zip_iterator(thrust::make_tuple(I,       J      )), /* keys_output */
+                     A,                                                               /* values_output */
+                     thrust::equal_to< thrust::tuple<HYPRE_Int, HYPRE_Int> >()        /* binary_pred */);
+#endif
 
    HYPRE_Int Nt = new_end.second - A;
 
    hypre_assert(Nt <= N0);
 
    /* remove numrical zeros */
+#if defined(HYPRE_USING_SYCL)
+   auto new_end2 = hypreSycl_copy_if( oneapi::dpl::make_zip_iterator(I, J, A),
+                                      oneapi::dpl::make_zip_iterator(I + Nt, J + Nt, A + Nt),
+                                      A,
+                                      oneapi::dpl::make_zip_iterator(I0, J0, A0),
+   [] (const auto & x) {return x;});
+
+   *N1 = std::get<0>(new_end2.base()) - I0;
+#else
    auto new_end2 = HYPRE_THRUST_CALL( copy_if,
                                       thrust::make_zip_iterator(thrust::make_tuple(I,    J,    A)),
-                                      thrust::make_zip_iterator(thrust::make_tuple(I+Nt, J+Nt, A+Nt)),
+                                      thrust::make_zip_iterator(thrust::make_tuple(I + Nt, J + Nt, A + Nt)),
                                       A,
                                       thrust::make_zip_iterator(thrust::make_tuple(I0, J0, A0)),
                                       thrust::identity<HYPRE_Complex>() );
 
    *N1 = thrust::get<0>(new_end2.get_iterator_tuple()) - I0;
+#endif
 
    hypre_assert(*N1 <= Nt);
 
@@ -355,71 +646,26 @@ hypre_IJMatrixAssembleSortAndReduce3(HYPRE_Int  N0, HYPRE_BigInt  *I0, HYPRE_Big
    return hypre_error_flag;
 }
 
-#if 0
 HYPRE_Int
-hypre_IJMatrixAssembleSortAndRemove(HYPRE_Int N0, HYPRE_BigInt *I0, HYPRE_BigInt *J0, char *X0, HYPRE_Complex *A0)
+hypre_IJMatrixAssembleCommunicate(hypre_IJMatrix *matrix)
 {
-   hypreDevice_StableSortTupleByTupleKey(N0, I0, J0, X0, A0, 0);
-
-   /* output in X0: 0: keep, 1: remove */
-   HYPRE_THRUST_CALL(
-         inclusive_scan_by_key,
-         make_reverse_iterator(thrust::make_zip_iterator(thrust::make_tuple(I0+N0, J0+N0))),
-         make_reverse_iterator(thrust::make_zip_iterator(thrust::make_tuple(I0,    J0))),
-         make_reverse_iterator(thrust::device_pointer_cast<char>(X0)+N0),
-         make_reverse_iterator(thrust::device_pointer_cast<char>(X0)+N0),
-         thrust::equal_to< thrust::tuple<HYPRE_BigInt, HYPRE_BigInt> >(),
-         thrust::maximum<char>() );
-
-   auto new_end = HYPRE_THRUST_CALL(
-         remove_if,
-         thrust::make_zip_iterator(thrust::make_tuple(I0,    J0,    A0)),
-         thrust::make_zip_iterator(thrust::make_tuple(I0+N0, J0+N0, A0+N0)),
-         X0,
-         thrust::identity<char>());
-
-   HYPRE_Int N1 = thrust::get<0>(new_end.get_iterator_tuple()) - I0;
-
-   hypre_assert(N1 >= 0 && N1 <= N0);
-
-   return N1;
-}
+   MPI_Comm               comm             = hypre_IJMatrixComm(matrix);
+   HYPRE_BigInt          *row_partitioning = hypre_IJMatrixRowPartitioning(matrix);
+   HYPRE_BigInt           row_start        = row_partitioning[0];
+   HYPRE_BigInt           row_end          = row_partitioning[1];
+   hypre_AuxParCSRMatrix *aux_matrix       = (hypre_AuxParCSRMatrix*) hypre_IJMatrixTranslator(matrix);
+   HYPRE_Int              nelms            = hypre_AuxParCSRMatrixCurrentStackElmts(aux_matrix);
+   HYPRE_BigInt          *stack_i          = hypre_AuxParCSRMatrixStackI(aux_matrix);
+   HYPRE_BigInt          *stack_j          = hypre_AuxParCSRMatrixStackJ(aux_matrix);
+   HYPRE_Complex         *stack_data       = hypre_AuxParCSRMatrixStackData(aux_matrix);
+   char                  *stack_sora       = hypre_AuxParCSRMatrixStackSorA(aux_matrix);
+
+   in_range<HYPRE_BigInt> pred(row_start, row_end - 1);
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_Int nelms_on = HYPRE_ONEDPL_CALL(std::count_if, stack_i, stack_i + nelms, pred);
+#else
+   HYPRE_Int nelms_on = HYPRE_THRUST_CALL(count_if, stack_i, stack_i + nelms, pred);
 #endif
-
-HYPRE_Int
-hypre_IJMatrixAssembleParCSRDevice(hypre_IJMatrix *matrix)
-{
-   MPI_Comm comm = hypre_IJMatrixComm(matrix);
-   HYPRE_BigInt *row_partitioning = hypre_IJMatrixRowPartitioning(matrix);
-   HYPRE_BigInt *col_partitioning = hypre_IJMatrixColPartitioning(matrix);
-   HYPRE_BigInt row_start = row_partitioning[0];
-   HYPRE_BigInt row_end   = row_partitioning[1];
-   HYPRE_BigInt col_start = col_partitioning[0];
-   HYPRE_BigInt col_end   = col_partitioning[1];
-   HYPRE_Int nrows = row_end - row_start;
-   HYPRE_Int ncols = col_end - col_start;
-
-   hypre_ParCSRMatrix    *par_matrix = (hypre_ParCSRMatrix*)    hypre_IJMatrixObject(matrix);
-   hypre_AuxParCSRMatrix *aux_matrix = (hypre_AuxParCSRMatrix*) hypre_IJMatrixTranslator(matrix);
-
-   if (!aux_matrix)
-   {
-      return hypre_error_flag;
-   }
-
-   if (!par_matrix)
-   {
-      return hypre_error_flag;
-   }
-
-   HYPRE_Int      nelms      = hypre_AuxParCSRMatrixCurrentStackElmts(aux_matrix);
-   HYPRE_BigInt  *stack_i    = hypre_AuxParCSRMatrixStackI(aux_matrix);
-   HYPRE_BigInt  *stack_j    = hypre_AuxParCSRMatrixStackJ(aux_matrix);
-   HYPRE_Complex *stack_data = hypre_AuxParCSRMatrixStackData(aux_matrix);
-   char          *stack_sora = hypre_AuxParCSRMatrixStackSorA(aux_matrix);
-
-   in_range<HYPRE_BigInt> pred(row_start, row_end-1);
-   HYPRE_Int nelms_on = HYPRE_THRUST_CALL(count_if, stack_i, stack_i+nelms, pred);
    HYPRE_Int nelms_off = nelms - nelms_on;
    HYPRE_Int nelms_off_max;
    hypre_MPI_Allreduce(&nelms_off, &nelms_off_max, 1, HYPRE_MPI_INT, hypre_MPI_MAX, comm);
@@ -441,82 +687,195 @@ hypre_IJMatrixAssembleParCSRDevice(hypre_IJMatrix *matrix)
          char *off_proc_sora = hypre_TAlloc(char,          nelms_off, HYPRE_MEMORY_DEVICE);
          char *is_on_proc    = hypre_TAlloc(char,          nelms,     HYPRE_MEMORY_DEVICE);
 
+#if defined(HYPRE_USING_SYCL)
+         HYPRE_ONEDPL_CALL(std::transform, stack_i, stack_i + nelms, is_on_proc, pred);
+         auto zip_in = oneapi::dpl::make_zip_iterator(stack_i, stack_j, stack_data, stack_sora);
+         auto zip_out = oneapi::dpl::make_zip_iterator(off_proc_i, off_proc_j, off_proc_data, off_proc_sora);
+         auto new_end1 = hypreSycl_copy_if( zip_in,         /* first */
+                                            zip_in + nelms, /* last */
+                                            is_on_proc,     /* stencil */
+                                            zip_out,        /* result */
+         [] (const auto & x) {return !x;} );
+
+         hypre_assert(std::get<0>(new_end1.base()) - off_proc_i == nelms_off);
+
+         /* remove off-proc entries from stack */
+         auto new_end2 = hypreSycl_remove_if( zip_in,          /* first */
+                                              zip_in + nelms,  /* last */
+                                              is_on_proc,      /* stencil */
+         [] (const auto & x) {return !x;} );
+
+         hypre_assert(std::get<0>(new_end2.base()) - stack_i == nelms_on);
+#else
          HYPRE_THRUST_CALL(transform, stack_i, stack_i + nelms, is_on_proc, pred);
 
          auto new_end1 = HYPRE_THRUST_CALL(
-               copy_if,
-               thrust::make_zip_iterator(thrust::make_tuple(stack_i,         stack_j,         stack_data,         stack_sora        )),  /* first */
-               thrust::make_zip_iterator(thrust::make_tuple(stack_i + nelms, stack_j + nelms, stack_data + nelms, stack_sora + nelms)),  /* last */
-               is_on_proc,                                                                                                               /* stencil */
-               thrust::make_zip_iterator(thrust::make_tuple(off_proc_i,      off_proc_j,      off_proc_data,      off_proc_sora)),       /* result */
-               thrust::not1(thrust::identity<char>()) );
+                            copy_if,
+                            thrust::make_zip_iterator(thrust::make_tuple(stack_i,         stack_j,         stack_data,
+                                                                         stack_sora        )),  /* first */
+                            thrust::make_zip_iterator(thrust::make_tuple(stack_i + nelms, stack_j + nelms, stack_data + nelms,
+                                                                         stack_sora + nelms)),  /* last */
+                            is_on_proc,                                                         /* stencil */
+                            thrust::make_zip_iterator(thrust::make_tuple(off_proc_i,      off_proc_j,      off_proc_data,
+                                                                         off_proc_sora)),       /* result */
+                            thrust::not1(thrust::identity<char>()) );
 
          hypre_assert(thrust::get<0>(new_end1.get_iterator_tuple()) - off_proc_i == nelms_off);
 
          /* remove off-proc entries from stack */
          auto new_end2 = HYPRE_THRUST_CALL(
-               remove_if,
-               thrust::make_zip_iterator(thrust::make_tuple(stack_i,         stack_j,         stack_data,         stack_sora        )),  /* first */
-               thrust::make_zip_iterator(thrust::make_tuple(stack_i + nelms, stack_j + nelms, stack_data + nelms, stack_sora + nelms)),  /* last */
-               is_on_proc,                                                                                                               /* stencil */
-               thrust::not1(thrust::identity<char>()) );
+                            remove_if,
+                            thrust::make_zip_iterator(thrust::make_tuple(stack_i,         stack_j,         stack_data,
+                                                                         stack_sora        )),  /* first */
+                            thrust::make_zip_iterator(thrust::make_tuple(stack_i + nelms, stack_j + nelms, stack_data + nelms,
+                                                                         stack_sora + nelms)),  /* last */
+                            is_on_proc,                                                         /* stencil */
+                            thrust::not1(thrust::identity<char>()) );
 
          hypre_assert(thrust::get<0>(new_end2.get_iterator_tuple()) - stack_i == nelms_on);
+#endif
 
          hypre_AuxParCSRMatrixCurrentStackElmts(aux_matrix) = nelms_on;
 
          hypre_TFree(is_on_proc, HYPRE_MEMORY_DEVICE);
 
-         /* sort and reduce */
-         hypre_IJMatrixAssembleSortAndReduce3(nelms_off, off_proc_i, off_proc_j, off_proc_sora, off_proc_data, &new_nnz);
-         // new_nnz = hypre_IJMatrixAssembleSortAndRemove(nelms_off, off_proc_i, off_proc_j, off_proc_sora, off_proc_data);
+         hypre_IJMatrixAssembleSortAndReduce3(nelms_off, off_proc_i, off_proc_j, off_proc_sora,
+                                              off_proc_data, &new_nnz);
 
          hypre_TFree(off_proc_sora, HYPRE_MEMORY_DEVICE);
       }
 
       /* send new_i/j/data to remote processes and the receivers call addtovalues */
-      hypre_IJMatrixAssembleOffProcValsParCSR(matrix, -1, -1, new_nnz, HYPRE_MEMORY_DEVICE, off_proc_i, off_proc_j, off_proc_data);
+      hypre_IJMatrixAssembleOffProcValsParCSR(matrix, -1, -1, new_nnz, HYPRE_MEMORY_DEVICE, off_proc_i,
+                                              off_proc_j, off_proc_data);
 
       hypre_TFree(off_proc_i,    HYPRE_MEMORY_DEVICE);
       hypre_TFree(off_proc_j,    HYPRE_MEMORY_DEVICE);
       hypre_TFree(off_proc_data, HYPRE_MEMORY_DEVICE);
    }
+   return hypre_error_flag;
+}
 
-   /* Note: the stack might have been changed in hypre_IJMatrixAssembleOffProcValsParCSR,
-    * so must get the size and the pointers again */
-   nelms      = hypre_AuxParCSRMatrixCurrentStackElmts(aux_matrix);
-   stack_i    = hypre_AuxParCSRMatrixStackI(aux_matrix);
-   stack_j    = hypre_AuxParCSRMatrixStackJ(aux_matrix);
-   stack_data = hypre_AuxParCSRMatrixStackData(aux_matrix);
-   stack_sora = hypre_AuxParCSRMatrixStackSorA(aux_matrix);
-
-#ifdef HYPRE_DEBUG
-   /* the stack should only have on-proc elements now */
-   HYPRE_Int tmp = HYPRE_THRUST_CALL(count_if, stack_i, stack_i+nelms, pred);
-   hypre_assert(nelms == tmp);
+HYPRE_Int
+hypre_IJMatrixAssembleCompressDevice(hypre_IJMatrix *matrix,
+                                     HYPRE_Int       reduce_stack_size)
+{
+   hypre_AuxParCSRMatrix *aux_matrix = (hypre_AuxParCSRMatrix*) hypre_IJMatrixTranslator(matrix);
+   HYPRE_Int              nelms      = hypre_AuxParCSRMatrixCurrentStackElmts(aux_matrix);
+   HYPRE_BigInt          *stack_i    = hypre_AuxParCSRMatrixStackI(aux_matrix);
+   HYPRE_BigInt          *stack_j    = hypre_AuxParCSRMatrixStackJ(aux_matrix);
+   HYPRE_Complex         *stack_data = hypre_AuxParCSRMatrixStackData(aux_matrix);
+   char                  *stack_sora = hypre_AuxParCSRMatrixStackSorA(aux_matrix);
+
+#if defined(HYPRE_DEBUG)
+   /* in the final assembly, at this stage, the stack should only have on-proc elements */
+   if (reduce_stack_size)
+   {
+      HYPRE_BigInt *row_partitioning = hypre_IJMatrixRowPartitioning(matrix);
+      HYPRE_BigInt  row_start        = row_partitioning[0];
+      HYPRE_BigInt  row_end          = row_partitioning[1];
+      in_range<HYPRE_BigInt> pred(row_start, row_end - 1);
+#if defined(HYPRE_USING_SYCL)
+      HYPRE_Int tmp = HYPRE_ONEDPL_CALL(std::count_if, stack_i, stack_i + nelms, pred);
+#else
+      HYPRE_Int tmp = HYPRE_THRUST_CALL(count_if, stack_i, stack_i + nelms, pred);
+#endif
+      hypre_assert(nelms == tmp);
+   }
 #endif
 
    if (nelms)
    {
-      HYPRE_Int      new_nnz;
-      HYPRE_BigInt  *new_i;
-      HYPRE_BigInt  *new_j;
-      HYPRE_Complex *new_data;
-      char          *new_sora;
+      if (reduce_stack_size)
+      {
+         hypre_AuxParCSRMatrixMaxStackElmts(aux_matrix) = nelms;
+      }
+
+      hypre_IJMatrixAssembleSortAndReduce1(&nelms, &stack_i, &stack_j, &stack_sora, &stack_data,
+                                           hypre_AuxParCSRMatrixMaxStackElmts(aux_matrix));
+
+      hypre_AuxParCSRMatrixCurrentStackElmts(aux_matrix) = nelms;
+      hypre_AuxParCSRMatrixStackI(aux_matrix) = stack_i;
+      hypre_AuxParCSRMatrixStackJ(aux_matrix) = stack_j;
+      hypre_AuxParCSRMatrixStackData(aux_matrix) = stack_data;
+      hypre_AuxParCSRMatrixStackSorA(aux_matrix) = stack_sora;
+   }
 
-      /* sort and reduce */
-      hypre_IJMatrixAssembleSortAndReduce1(nelms, stack_i, stack_j, stack_sora, stack_data,
-                                           &new_nnz, &new_i, &new_j, &new_sora, &new_data);
+   return hypre_error_flag;
+}
 
+HYPRE_Int
+hypre_IJMatrixAssembleParCSRDevice(hypre_IJMatrix *matrix)
+{
+   HYPRE_BigInt *row_partitioning = hypre_IJMatrixRowPartitioning(matrix);
+   HYPRE_BigInt *col_partitioning = hypre_IJMatrixColPartitioning(matrix);
+   HYPRE_BigInt row_start = row_partitioning[0];
+   HYPRE_BigInt row_end   = row_partitioning[1];
+   HYPRE_BigInt col_start = col_partitioning[0];
+   HYPRE_BigInt col_end   = col_partitioning[1];
+   HYPRE_BigInt col_first = hypre_IJMatrixGlobalFirstCol(matrix);
+   HYPRE_Int nrows = row_end - row_start;
+   HYPRE_Int ncols = col_end - col_start;
+   hypre_ParCSRMatrix    *par_matrix = (hypre_ParCSRMatrix*)    hypre_IJMatrixObject(matrix);
+   hypre_AuxParCSRMatrix *aux_matrix = (hypre_AuxParCSRMatrix*) hypre_IJMatrixTranslator(matrix);
+
+   if (!aux_matrix)
+   {
+      return hypre_error_flag;
+   }
+
+   if (!par_matrix)
+   {
+      return hypre_error_flag;
+   }
+
+   hypre_IJMatrixAssembleCommunicate(matrix);
+   hypre_IJMatrixAssembleCompressDevice(matrix, 1);
+
+   // hypre_AuxParCSRMatrixStackPrintInfo(matrix);
+
+   HYPRE_Int      nelms      = hypre_AuxParCSRMatrixCurrentStackElmts(aux_matrix);
+   HYPRE_BigInt  *stack_i    = hypre_AuxParCSRMatrixStackI(aux_matrix);
+   HYPRE_BigInt  *stack_j    = hypre_AuxParCSRMatrixStackJ(aux_matrix);
+   HYPRE_Complex *stack_data = hypre_AuxParCSRMatrixStackData(aux_matrix);
+   char          *stack_sora = hypre_AuxParCSRMatrixStackSorA(aux_matrix);
+
+   if (nelms)
+   {
       /* adjust row indices from global to local */
-      HYPRE_Int *new_i_local = hypre_TAlloc(HYPRE_Int, new_nnz, HYPRE_MEMORY_DEVICE);
+      HYPRE_Int *stack_i_local = hypre_TAlloc(HYPRE_Int, nelms, HYPRE_MEMORY_DEVICE);
+
+#if defined(HYPRE_USING_SYCL)
+      HYPRE_ONEDPL_CALL( std::transform,
+                         stack_i,
+                         stack_i + nelms,
+                         stack_i_local,
+      [row_start = row_start] (const auto & x) {return x - row_start;} );
+#else
       HYPRE_THRUST_CALL( transform,
-                         new_i,
-                         new_i + new_nnz,
-                         new_i_local,
+                         stack_i,
+                         stack_i + nelms,
+                         stack_i_local,
                          _1 - row_start );
+#endif
 
-      hypre_TFree(new_i, HYPRE_MEMORY_DEVICE);
+      /* adjust column indices wrt the global first index */
+      if (col_first)
+      {
+#if defined(HYPRE_USING_SYCL)
+         HYPRE_ONEDPL_CALL( std::transform,
+                            stack_j,
+                            stack_j + nelms,
+                            stack_j,
+         [col_first = col_first] (const auto & x) {return x - col_first;} );
+#else
+         HYPRE_THRUST_CALL( transform,
+                            stack_j,
+                            stack_j + nelms,
+                            stack_j,
+                            _1 - col_first );
+#endif
+      }
 
       HYPRE_Int      num_cols_offd_new;
       HYPRE_BigInt  *col_map_offd_new;
@@ -537,14 +896,14 @@ hypre_IJMatrixAssembleParCSRDevice(hypre_IJMatrix *matrix)
 
       hypre_CSRMatrixSplitDevice_core( 0,
                                        nrows,
-                                       new_nnz,
+                                       nelms,
                                        NULL,
-                                       new_j,
+                                       stack_j,
                                        NULL,
                                        NULL,
-                                       col_start,
-                                       col_end - 1,
-                                       hypre_CSRMatrixNumCols(hypre_ParCSRMatrixOffd(par_matrix)),
+                                       col_start - col_first,
+                                       col_end - col_first - 1,
+                                       -1,
                                        NULL,
                                        NULL,
                                        NULL,
@@ -585,13 +944,13 @@ hypre_IJMatrixAssembleParCSRDevice(hypre_IJMatrix *matrix)
       /* split IJ into diag and offd */
       hypre_CSRMatrixSplitDevice_core( 1,
                                        nrows,
-                                       new_nnz,
-                                       new_i_local,
-                                       new_j,
-                                       new_data,
-                                       diag_nnz_existed || offd_nnz_existed ? new_sora : NULL,
-                                       col_start,
-                                       col_end - 1,
+                                       nelms,
+                                       stack_i_local,
+                                       stack_j,
+                                       stack_data,
+                                       diag_nnz_existed || offd_nnz_existed ? stack_sora : NULL,
+                                       col_start - col_first,
+                                       col_end - col_first - 1,
                                        hypre_CSRMatrixNumCols(hypre_ParCSRMatrixOffd(par_matrix)),
                                        hypre_ParCSRMatrixDeviceColMapOffd(par_matrix),
                                        &col_map_offd_map,
@@ -608,19 +967,13 @@ hypre_IJMatrixAssembleParCSRDevice(hypre_IJMatrix *matrix)
                                        offd_a_new + offd_nnz_existed,
                                        offd_nnz_existed ? offd_sora_new + offd_nnz_existed : NULL );
 
-      hypre_TFree(new_i_local, HYPRE_MEMORY_DEVICE);
-      hypre_TFree(new_j,       HYPRE_MEMORY_DEVICE);
-      hypre_TFree(new_data,    HYPRE_MEMORY_DEVICE);
-      hypre_TFree(new_sora,    HYPRE_MEMORY_DEVICE);
-
-      HYPRE_Int      nnz_new;
-      HYPRE_Int     *tmp_i;
-      HYPRE_Int     *tmp_j;
-      HYPRE_Complex *tmp_a;
+      hypre_TFree(stack_i_local, HYPRE_MEMORY_DEVICE);
 
-      /* expand the existing diag/offd and compress with the new one */
+      /* expand the existing Parcsr's diag/offd and compress with the stack */
       if (diag_nnz_new > 0)
       {
+         HYPRE_Int diag_nnz = diag_nnz_existed + diag_nnz_new;
+
          if (diag_nnz_existed)
          {
             /* the existing parcsr should come first and the entries are "add" */
@@ -633,39 +986,28 @@ hypre_IJMatrixAssembleParCSRDevice(hypre_IJMatrix *matrix)
             hypre_TMemcpy(diag_a_new, hypre_CSRMatrixData(hypre_ParCSRMatrixDiag(par_matrix)), HYPRE_Complex,
                           diag_nnz_existed, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
 
-            HYPRE_THRUST_CALL(fill_n, diag_sora_new, diag_nnz_existed, 0);
-
-            hypre_IJMatrixAssembleSortAndReduce2(diag_nnz_existed + diag_nnz_new, diag_i_new, diag_j_new, diag_sora_new, diag_a_new,
-                                                 &nnz_new, &tmp_i, &tmp_j, &tmp_a, 2);
-
-            hypre_TFree(diag_i_new,    HYPRE_MEMORY_DEVICE);
-            hypre_TFree(diag_j_new,    HYPRE_MEMORY_DEVICE);
-            hypre_TFree(diag_sora_new, HYPRE_MEMORY_DEVICE);
-            hypre_TFree(diag_a_new,    HYPRE_MEMORY_DEVICE);
+            hypreDevice_CharFilln(diag_sora_new, diag_nnz_existed, 0);
 
-            tmp_j = hypre_TReAlloc_v2(tmp_j, HYPRE_Int,     diag_nnz_existed + diag_nnz_new, HYPRE_Int,     nnz_new, HYPRE_MEMORY_DEVICE);
-            tmp_a = hypre_TReAlloc_v2(tmp_a, HYPRE_Complex, diag_nnz_existed + diag_nnz_new, HYPRE_Complex, nnz_new, HYPRE_MEMORY_DEVICE);
-
-            diag_nnz_new = nnz_new;
-            diag_i_new   = tmp_i;
-            diag_j_new   = tmp_j;
-            diag_a_new   = tmp_a;
+            hypre_IJMatrixAssembleSortAndReduce2(&diag_nnz, &diag_i_new, &diag_j_new, diag_sora_new,
+                                                 &diag_a_new, 2);
          }
 
-         hypre_CSRMatrix *diag               = hypre_CSRMatrixCreate(nrows, ncols, diag_nnz_new);
-         hypre_CSRMatrixI(diag)              = hypreDevice_CsrRowIndicesToPtrs(nrows, diag_nnz_new, diag_i_new);
-         hypre_CSRMatrixJ(diag)              = diag_j_new;
-         hypre_CSRMatrixData(diag)           = diag_a_new;
+         hypre_CSRMatrix *diag = hypre_CSRMatrixCreate(nrows, ncols, diag_nnz);
+         hypre_CSRMatrixI(diag) = hypreDevice_CsrRowIndicesToPtrs(nrows, diag_nnz, diag_i_new);
+         hypre_CSRMatrixJ(diag) = diag_j_new;
+         hypre_CSRMatrixData(diag) = diag_a_new;
          hypre_CSRMatrixMemoryLocation(diag) = HYPRE_MEMORY_DEVICE;
 
          hypre_TFree(diag_i_new, HYPRE_MEMORY_DEVICE);
-
+         hypre_TFree(diag_sora_new, HYPRE_MEMORY_DEVICE);
          hypre_CSRMatrixDestroy(hypre_ParCSRMatrixDiag(par_matrix));
          hypre_ParCSRMatrixDiag(par_matrix) = diag;
       }
 
       if (offd_nnz_new > 0)
       {
+         HYPRE_Int offd_nnz = offd_nnz_existed + offd_nnz_new;
+
          if (offd_nnz_existed)
          {
             /* the existing parcsr should come first and the entries are "add" */
@@ -673,42 +1015,36 @@ hypre_IJMatrixAssembleParCSRDevice(hypre_IJMatrix *matrix)
                                                hypre_CSRMatrixI(hypre_ParCSRMatrixOffd(par_matrix)), offd_i_new);
 
             /* adjust with the new col_map_offd_map */
+#if defined(HYPRE_USING_SYCL)
+            hypreSycl_gather( hypre_CSRMatrixJ(hypre_ParCSRMatrixOffd(par_matrix)),
+                              hypre_CSRMatrixJ(hypre_ParCSRMatrixOffd(par_matrix)) + offd_nnz_existed,
+                              col_map_offd_map,
+                              offd_j_new );
+#else
             HYPRE_THRUST_CALL( gather,
                                hypre_CSRMatrixJ(hypre_ParCSRMatrixOffd(par_matrix)),
                                hypre_CSRMatrixJ(hypre_ParCSRMatrixOffd(par_matrix)) + offd_nnz_existed,
                                col_map_offd_map,
                                offd_j_new );
+#endif
 
             hypre_TMemcpy(offd_a_new, hypre_CSRMatrixData(hypre_ParCSRMatrixOffd(par_matrix)), HYPRE_Complex,
                           offd_nnz_existed, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
 
-            HYPRE_THRUST_CALL(fill_n, offd_sora_new, offd_nnz_existed, 0);
-
-            hypre_IJMatrixAssembleSortAndReduce2(offd_nnz_existed + offd_nnz_new, offd_i_new, offd_j_new, offd_sora_new, offd_a_new,
-                                                 &nnz_new, &tmp_i, &tmp_j, &tmp_a, 0);
-
-            hypre_TFree(offd_i_new,    HYPRE_MEMORY_DEVICE);
-            hypre_TFree(offd_j_new,    HYPRE_MEMORY_DEVICE);
-            hypre_TFree(offd_sora_new, HYPRE_MEMORY_DEVICE);
-            hypre_TFree(offd_a_new,    HYPRE_MEMORY_DEVICE);
+            hypreDevice_CharFilln(offd_sora_new, offd_nnz_existed, 0);
 
-            tmp_j = hypre_TReAlloc_v2(tmp_j, HYPRE_Int,     offd_nnz_existed + offd_nnz_new, HYPRE_Int,     nnz_new, HYPRE_MEMORY_DEVICE);
-            tmp_a = hypre_TReAlloc_v2(tmp_a, HYPRE_Complex, offd_nnz_existed + offd_nnz_new, HYPRE_Complex, nnz_new, HYPRE_MEMORY_DEVICE);
-
-            offd_nnz_new = nnz_new;
-            offd_i_new   = tmp_i;
-            offd_j_new   = tmp_j;
-            offd_a_new   = tmp_a;
+            hypre_IJMatrixAssembleSortAndReduce2(&offd_nnz, &offd_i_new, &offd_j_new, offd_sora_new,
+                                                 &offd_a_new, 0);
          }
 
-         hypre_CSRMatrix *offd               = hypre_CSRMatrixCreate(nrows, num_cols_offd_new, offd_nnz_new);
-         hypre_CSRMatrixI(offd)              = hypreDevice_CsrRowIndicesToPtrs(nrows, offd_nnz_new, offd_i_new);
-         hypre_CSRMatrixJ(offd)              = offd_j_new;
-         hypre_CSRMatrixData(offd)           = offd_a_new;
+         hypre_CSRMatrix *offd = hypre_CSRMatrixCreate(nrows, num_cols_offd_new, offd_nnz);
+         hypre_CSRMatrixI(offd) = hypreDevice_CsrRowIndicesToPtrs(nrows, offd_nnz, offd_i_new);
+         hypre_CSRMatrixJ(offd) = offd_j_new;
+         hypre_CSRMatrixData(offd) = offd_a_new;
          hypre_CSRMatrixMemoryLocation(offd) = HYPRE_MEMORY_DEVICE;
 
          hypre_TFree(offd_i_new, HYPRE_MEMORY_DEVICE);
-
+         hypre_TFree(offd_sora_new, HYPRE_MEMORY_DEVICE);
          hypre_CSRMatrixDestroy(hypre_ParCSRMatrixOffd(par_matrix));
          hypre_ParCSRMatrixOffd(par_matrix) = offd;
 
@@ -716,9 +1052,10 @@ hypre_IJMatrixAssembleParCSRDevice(hypre_IJMatrix *matrix)
          hypre_ParCSRMatrixDeviceColMapOffd(par_matrix) = col_map_offd_new;
 
          hypre_TFree(hypre_ParCSRMatrixColMapOffd(par_matrix), HYPRE_MEMORY_HOST);
-         hypre_ParCSRMatrixColMapOffd(par_matrix) = hypre_TAlloc(HYPRE_BigInt, num_cols_offd_new, HYPRE_MEMORY_HOST);
-         hypre_TMemcpy(hypre_ParCSRMatrixColMapOffd(par_matrix), col_map_offd_new, HYPRE_BigInt, num_cols_offd_new,
-                       HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
+         hypre_ParCSRMatrixColMapOffd(par_matrix) = hypre_TAlloc(HYPRE_BigInt, num_cols_offd_new,
+                                                                 HYPRE_MEMORY_HOST);
+         hypre_TMemcpy(hypre_ParCSRMatrixColMapOffd(par_matrix), col_map_offd_new, HYPRE_BigInt,
+                       num_cols_offd_new, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
 
          col_map_offd_new = NULL;
       }
@@ -746,8 +1083,8 @@ hypre_IJMatrixSetConstantValuesParCSRDevice( hypre_IJMatrix *matrix,
    HYPRE_Int           nnz_diag   = hypre_CSRMatrixNumNonzeros(diag);
    HYPRE_Int           nnz_offd   = hypre_CSRMatrixNumNonzeros(offd);
 
-   HYPRE_THRUST_CALL( fill_n, diag_data, nnz_diag, value );
-   HYPRE_THRUST_CALL( fill_n, offd_data, nnz_offd, value );
+   hypreDevice_ComplexFilln( diag_data, nnz_diag, value );
+   hypreDevice_ComplexFilln( offd_data, nnz_offd, value );
 
    return hypre_error_flag;
 }
diff --git a/external/hypre/src/IJ_mv/IJMatrix_petsc.c b/external/hypre/src/IJ_mv/IJMatrix_petsc.c
index 83b5f1e0..bd106f45 100644
--- a/external/hypre/src/IJ_mv/IJMatrix_petsc.c
+++ b/external/hypre/src/IJ_mv/IJMatrix_petsc.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -10,7 +10,7 @@
  * IJMatrix_PETSc interface
  *
  *****************************************************************************/
- 
+
 #include "_hypre_IJ_mv.h"
 
 /******************************************************************************
@@ -24,8 +24,8 @@
 
 HYPRE_Int
 hypre_IJMatrixSetLocalSizePETSc(hypre_IJMatrix *matrix,
-			        HYPRE_Int     	local_m,
-			        HYPRE_Int     	local_n)
+                                HYPRE_Int       local_m,
+                                HYPRE_Int       local_n)
 {
    HYPRE_Int ierr = 0;
    hypre_AuxParCSRMatrix *aux_data;
@@ -37,8 +37,8 @@ hypre_IJMatrixSetLocalSizePETSc(hypre_IJMatrix *matrix,
    }
    else
    {
-      hypre_IJMatrixTranslator(matrix) = 
-         hypre_AuxParCSRMatrixCreate(local_m,local_n,NULL);
+      hypre_IJMatrixTranslator(matrix) =
+         hypre_AuxParCSRMatrixCreate(local_m, local_n, NULL);
    }
    return ierr;
 }
@@ -58,11 +58,11 @@ HYPRE_Int
 hypre_IJMatrixCreatePETSc(hypre_IJMatrix *matrix)
 {
    MPI_Comm comm = hypre_IJMatrixContext(matrix);
-   HYPRE_BigInt global_m = hypre_IJMatrixM(matrix); 
-   HYPRE_BigInt global_n = hypre_IJMatrixN(matrix); 
+   HYPRE_BigInt global_m = hypre_IJMatrixM(matrix);
+   HYPRE_BigInt global_n = hypre_IJMatrixN(matrix);
    hypre_AuxParCSRMatrix *aux_matrix = hypre_IJMatrixTranslator(matrix);
-   HYPRE_Int local_m;   
-   HYPRE_Int local_n;   
+   HYPRE_Int local_m;
+   HYPRE_Int local_n;
    HYPRE_Int ierr = 0;
 
 
@@ -79,12 +79,12 @@ hypre_IJMatrixCreatePETSc(hypre_IJMatrix *matrix)
 
    if (aux_matrix)
    {
-      local_m = hypre_AuxParCSRMatrixLocalNumRows(aux_matrix);   
+      local_m = hypre_AuxParCSRMatrixLocalNumRows(aux_matrix);
       local_n = hypre_AuxParCSRMatrixLocalNumCols(aux_matrix);
    }
    else
    {
-      aux_matrix = hypre_AuxParCSRMatrixCreate(-1,-1,NULL);
+      aux_matrix = hypre_AuxParCSRMatrixCreate(-1, -1, NULL);
       local_m = -1;
       local_n = -1;
       hypre_IJMatrixTranslator(matrix) = aux_matrix;
@@ -96,7 +96,7 @@ hypre_IJMatrixCreatePETSc(hypre_IJMatrix *matrix)
    }
    else
    {
-      row_starts = hypre_CTAlloc(HYPRE_BigInt, num_procs+1, HYPRE_MEMORY_HOST);
+      row_starts = hypre_CTAlloc(HYPRE_BigInt, num_procs + 1, HYPRE_MEMORY_HOST);
 
       if (my_id == 0 && local_m == global_m)
       {
@@ -105,8 +105,8 @@ hypre_IJMatrixCreatePETSc(hypre_IJMatrix *matrix)
       else
       {
          HYPRE_BigInt big_local_m = (HYPRE_BigInt) local_m;
-         hypre_MPI_Allgather(&big_local_m,1,HYPRE_MPI_BIG_INT,&row_starts[1],1,
-                             HYPRE_MPI_BIG_INT,comm);
+         hypre_MPI_Allgather(&big_local_m, 1, HYPRE_MPI_BIG_INT, &row_starts[1], 1,
+                             HYPRE_MPI_BIG_INT, comm);
       }
 
    }
@@ -116,7 +116,7 @@ hypre_IJMatrixCreatePETSc(hypre_IJMatrix *matrix)
    }
    else
    {
-      col_starts = hypre_CTAlloc(HYPRE_BigInt, num_procs+1, HYPRE_MEMORY_HOST);
+      col_starts = hypre_CTAlloc(HYPRE_BigInt, num_procs + 1, HYPRE_MEMORY_HOST);
 
       if (my_id == 0 && local_n == global_n)
       {
@@ -125,20 +125,22 @@ hypre_IJMatrixCreatePETSc(hypre_IJMatrix *matrix)
       else
       {
          HYPRE_BigInt big_local_n = (HYPRE_BigInt) local_n;
-         hypre_MPI_Allgather(&big_local_n,1,HYPRE_MPI_BIG_INT,&col_starts[1],1,
-                             HYPRE_MPI_BIG_INT,comm);
+         hypre_MPI_Allgather(&big_local_n, 1, HYPRE_MPI_BIG_INT, &col_starts[1], 1,
+                             HYPRE_MPI_BIG_INT, comm);
       }
    }
 
    if (row_starts && col_starts)
    {
       equal = 1;
-      for (i=0; i < num_procs; i++)
+      for (i = 0; i < num_procs; i++)
       {
-         row_starts[i+1] += row_starts[i];
-         col_starts[i+1] += col_starts[i];
-         if (row_starts[i+1] != col_starts[i+1])
+         row_starts[i + 1] += row_starts[i];
+         col_starts[i + 1] += col_starts[i];
+         if (row_starts[i + 1] != col_starts[i + 1])
+         {
             equal = 0;
+         }
       }
       if (equal)
       {
@@ -161,7 +163,7 @@ hypre_IJMatrixCreatePETSc(hypre_IJMatrix *matrix)
 
 HYPRE_Int
 hypre_IJMatrixSetRowSizesPETSc(hypre_IJMatrix *matrix,
-			       HYPRE_Int      *sizes)
+                               HYPRE_Int      *sizes)
 {
    HYPRE_Int *row_space;
    HYPRE_Int local_num_rows;
@@ -169,15 +171,23 @@ hypre_IJMatrixSetRowSizesPETSc(hypre_IJMatrix *matrix,
    hypre_AuxParCSRMatrix *aux_matrix;
    aux_matrix = hypre_IJMatrixTranslator(matrix);
    if (aux_matrix)
+   {
       local_num_rows = hypre_AuxParCSRMatrixLocalNumRows(aux_matrix);
+   }
    else
+   {
       return -1;
-   
+   }
+
    row_space =  hypre_AuxParCSRMatrixRowSpace(aux_matrix);
    if (!row_space)
+   {
       row_space = hypre_CTAlloc(HYPRE_Int,  local_num_rows, HYPRE_MEMORY_HOST);
+   }
    for (i = 0; i < local_num_rows; i++)
+   {
       row_space[i] = sizes[i];
+   }
    hypre_AuxParCSRMatrixRowSpace(aux_matrix) = row_space;
    return 0;
 }
@@ -192,7 +202,7 @@ hypre_IJMatrixSetRowSizesPETSc(hypre_IJMatrix *matrix,
 
 HYPRE_Int
 hypre_IJMatrixSetDiagRowSizesPETSc(hypre_IJMatrix *matrix,
-			      	   HYPRE_Int      *sizes)
+                                   HYPRE_Int      *sizes)
 {
    HYPRE_Int local_num_rows;
    HYPRE_Int i;
@@ -201,15 +211,21 @@ hypre_IJMatrixSetDiagRowSizesPETSc(hypre_IJMatrix *matrix,
    HYPRE_Int *diag_i;
    par_matrix = hypre_IJMatrixLocalStorage(matrix);
    if (!par_matrix)
+   {
       return -1;
-   
+   }
+
    diag =  hypre_ParCSRMatrixDiag(par_matrix);
    diag_i =  hypre_CSRMatrixI(diag);
    local_num_rows = hypre_CSRMatrixNumRows(diag);
    if (!diag_i)
-      diag_i = hypre_CTAlloc(HYPRE_Int,  local_num_rows+1, HYPRE_MEMORY_HOST);
-   for (i = 0; i < local_num_rows+1; i++)
+   {
+      diag_i = hypre_CTAlloc(HYPRE_Int,  local_num_rows + 1, HYPRE_MEMORY_HOST);
+   }
+   for (i = 0; i < local_num_rows + 1; i++)
+   {
       diag_i[i] = sizes[i];
+   }
    hypre_CSRMatrixI(diag) = diag_i;
    hypre_CSRMatrixNumNonzeros(diag) = diag_i[local_num_rows];
    return 0;
@@ -225,7 +241,7 @@ hypre_IJMatrixSetDiagRowSizesPETSc(hypre_IJMatrix *matrix,
 
 HYPRE_Int
 hypre_IJMatrixSetOffDiagRowSizesPETSc(hypre_IJMatrix *matrix,
-			      	      HYPRE_Int	     *sizes)
+                                      HYPRE_Int        *sizes)
 {
    HYPRE_Int local_num_rows;
    HYPRE_Int i;
@@ -234,15 +250,21 @@ hypre_IJMatrixSetOffDiagRowSizesPETSc(hypre_IJMatrix *matrix,
    HYPRE_Int *offd_i;
    par_matrix = hypre_IJMatrixLocalStorage(matrix);
    if (!par_matrix)
+   {
       return -1;
-   
+   }
+
    offd =  hypre_ParCSRMatrixOffd(par_matrix);
    offd_i =  hypre_CSRMatrixI(offd);
    local_num_rows = hypre_CSRMatrixNumRows(offd);
    if (!offd_i)
-      offd_i = hypre_CTAlloc(HYPRE_Int,  local_num_rows+1, HYPRE_MEMORY_HOST);
-   for (i = 0; i < local_num_rows+1; i++)
+   {
+      offd_i = hypre_CTAlloc(HYPRE_Int,  local_num_rows + 1, HYPRE_MEMORY_HOST);
+   }
+   for (i = 0; i < local_num_rows + 1; i++)
+   {
       offd_i[i] = sizes[i];
+   }
    hypre_CSRMatrixI(offd) = offd_i;
    hypre_CSRMatrixNumNonzeros(offd) = offd_i[local_num_rows];
    return 0;
@@ -271,15 +293,15 @@ hypre_IJMatrixInitializePETSc(hypre_IJMatrix *matrix)
    MPI_Comm  comm = hypre_IJMatrixContext(matrix);
    HYPRE_BigInt global_num_rows = hypre_IJMatrixM(matrix);
 
-   hypre_MPI_Comm_size(comm,&num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
-   
-   local_nnz = (num_nonzeros/global_num_rows+1)*local_num_rows;
+   hypre_MPI_Comm_size(comm, &num_procs);
+   hypre_MPI_Comm_rank(comm, &my_id);
+
+   local_nnz = (num_nonzeros / global_num_rows + 1) * local_num_rows;
    if (local_num_rows < 0)
-      hypre_AuxParCSRMatrixLocalNumRows(aux_matrix) = 
+      hypre_AuxParCSRMatrixLocalNumRows(aux_matrix) =
          hypre_CSRMatrixNumRows(hypre_ParCSRMatrixDiag(par_matrix));
    if (local_num_cols < 0)
-      hypre_AuxParCSRMatrixLocalNumCols(aux_matrix) = 
+      hypre_AuxParCSRMatrixLocalNumCols(aux_matrix) =
          hypre_CSRMatrixNumCols(hypre_ParCSRMatrixDiag(par_matrix));
    ierr = hypre_AuxParCSRMatrixInitialize(aux_matrix);
    ierr += hypre_ParCSRMatrixBigInitialize(par_matrix);
@@ -296,18 +318,18 @@ hypre_IJMatrixInitializePETSc(hypre_IJMatrix *matrix)
  *****************************************************************************/
 HYPRE_Int
 hypre_IJMatrixInsertBlockPETSc(hypre_IJMatrix *matrix,
-		       	       HYPRE_Int       m,
-		               HYPRE_Int       n,
-		               HYPRE_BigInt   *rows,
-		               HYPRE_BigInt   *cols,
-		               HYPRE_Complex  *coeffs)
+                               HYPRE_Int       m,
+                               HYPRE_Int       n,
+                               HYPRE_BigInt   *rows,
+                               HYPRE_BigInt   *cols,
+                               HYPRE_Complex  *coeffs)
 {
    HYPRE_Int ierr = 0;
    HYPRE_Int i, in;
-   for (i=0; i < m; i++)
+   for (i = 0; i < m; i++)
    {
-      in = i*n;
-      hypre_IJMatrixInsertRowPETSc(matrix,n,rows[i],&cols[in],&coeffs[in]);
+      in = i * n;
+      hypre_IJMatrixInsertRowPETSc(matrix, n, rows[i], &cols[in], &coeffs[in]);
    }
    return ierr;
 }
@@ -322,18 +344,18 @@ hypre_IJMatrixInsertBlockPETSc(hypre_IJMatrix *matrix,
 
 HYPRE_Int
 hypre_IJMatrixAddToBlockPETSc(hypre_IJMatrix *matrix,
-                              HYPRE_Int	      m,
-                              HYPRE_Int	      n,
+                              HYPRE_Int         m,
+                              HYPRE_Int         n,
                               HYPRE_BigInt   *rows,
                               HYPRE_BigInt   *cols,
                               HYPRE_Complex  *coeffs)
 {
    HYPRE_Int ierr = 0;
    HYPRE_Int i, in;
-   for (i=0; i < m; i++)
+   for (i = 0; i < m; i++)
    {
-      in = i*n;
-      hypre_IJMatrixAddToRowPETSc(matrix,n,rows[i],&cols[in],&coeffs[in]);
+      in = i * n;
+      hypre_IJMatrixAddToRowPETSc(matrix, n, rows[i], &cols[in], &coeffs[in]);
    }
    return ierr;
 }
@@ -342,7 +364,7 @@ hypre_IJMatrixAddToBlockPETSc(hypre_IJMatrix *matrix,
  *
  * hypre_IJMatrixInsertRowPETSc
  *
- * inserts a row into an IJMatrix, 
+ * inserts a row into an IJMatrix,
  * if diag_i and offd_i are known, those values are inserted directly
  * into the ParCSRMatrix,
  * if they are not known, an auxiliary structure, AuxParCSRMatrix is used
@@ -397,10 +419,10 @@ hypre_IJMatrixInsertRowPETSc(hypre_IJMatrix *matrix,
    row_starts = hypre_ParCSRMatrixRowStarts(par_matrix);
    col_starts = hypre_ParCSRMatrixColStarts(par_matrix);
    col_0 = col_starts[my_id];
-   col_n = col_starts[my_id+1]-1;
+   col_n = col_starts[my_id + 1] - 1;
    need_aux = hypre_AuxParCSRMatrixNeedAux(aux_matrix);
 
-   if (row >= row_starts[my_id] && row < row_starts[my_id+1])
+   if (row >= row_starts[my_id] && row < row_starts[my_id + 1])
    {
       if (need_aux)
       {
@@ -409,83 +431,83 @@ hypre_IJMatrixInsertRowPETSc(hypre_IJMatrix *matrix,
          aux_data = hypre_AuxParCSRMatrixAuxData(aux_matrix);
          local_j = aux_j[row_local];
          local_data = aux_data[row_local];
-            
+
          row_length[row_local] = n;
-         
+
          if ( row_space[row_local] < n)
          {
-   	    hypre_TFree(local_j, HYPRE_MEMORY_HOST);
-   	    hypre_TFree(local_data, HYPRE_MEMORY_HOST);
-   	    local_j = hypre_CTAlloc(HYPRE_Int, n, HYPRE_MEMORY_HOST);
-   	    local_data = hypre_CTAlloc(HYPRE_Complex, n, HYPRE_MEMORY_HOST);
+            hypre_TFree(local_j, HYPRE_MEMORY_HOST);
+            hypre_TFree(local_data, HYPRE_MEMORY_HOST);
+            local_j = hypre_CTAlloc(HYPRE_Int, n, HYPRE_MEMORY_HOST);
+            local_data = hypre_CTAlloc(HYPRE_Complex, n, HYPRE_MEMORY_HOST);
             row_space[row_local] = n;
          }
-         
-         for (i=0; i < n; i++)
+
+         for (i = 0; i < n; i++)
          {
-   	    local_j[i] = indices[i];
-   	    local_data[i] = coeffs[i];
+            local_j[i] = indices[i];
+            local_data[i] = coeffs[i];
          }
-   
+
          /* make sure first element is diagonal element, if not, find it and
             exchange it with first element */
          if (local_j[0] != row_local)
          {
-            for (i=1; i < n; i++)
-     	    {
-   	       if (local_j[i] == row_local)
-   	       {
+            for (i = 1; i < n; i++)
+            {
+               if (local_j[i] == row_local)
+               {
                   local_j[i] = local_j[0];
                   local_j[0] = (HYPRE_BigInt)row_local;
                   temp = local_data[0];
                   local_data[0] = local_data[i];
                   local_data[i] = temp;
                   break;
-   	       }
-     	    }
+               }
+            }
          }
          /* sort data according to column indices, except for first element */
 
-         BigQsort1(local_j,local_data,1,n-1);
- 
+         BigQsort1(local_j, local_data, 1, n - 1);
+
       }
       else /* insert immediately into data into ParCSRMatrix structure */
       {
-	 diag = hypre_ParCSRMatrixDiag(par_matrix);
-	 offd = hypre_ParCSRMatrixOffd(par_matrix);
+         diag = hypre_ParCSRMatrixDiag(par_matrix);
+         offd = hypre_ParCSRMatrixOffd(par_matrix);
          diag_i = hypre_CSRMatrixI(diag);
          diag_j = hypre_CSRMatrixJ(diag);
          diag_data = hypre_CSRMatrixData(diag);
          offd_i = hypre_CSRMatrixI(offd);
          big_offd_j = hypre_CSRMatrixBigJ(offd);
          offd_data = hypre_CSRMatrixData(offd);
-	 offd_indx = offd_i[row_local];
-	 indx_0 = diag_i[row_local];
-	 diag_indx = indx_0+1;
-	 
-  	 for (i=0; i < n; i++)
-	 {
-	    if (indices[i] < col_0 || indices[i] > col_n)/* insert into offd */	
-	    {
-	       big_offd_j[offd_indx] = indices[i];
-	       offd_data[offd_indx++] = coeffs[i];
-	    }
-	    else if (indices[i] == row) /* diagonal element */
-	    {
-	       diag_j[indx_0] = (HYPRE_Int)(indices[i] - col_0);
-	       diag_data[indx_0] = coeffs[i];
-	    }
-	    else  /* insert into diag */
-	    {
-	       diag_j[diag_indx] = (HYPRE_Int)(indices[i] - col_0);
-	       diag_data[diag_indx++] = coeffs[i];
-	    }
-	 }
-	 BigQsort1(big_offd_j, offd_data, 0, offd_indx-1);
-	 qsort1(diag_j, diag_data, 1, diag_indx-1);
-
-	 hypre_AuxParCSRMatrixIndxDiag(aux_matrix)[row_local] = diag_indx;
-	 hypre_AuxParCSRMatrixIndxOffd(aux_matrix)[row_local] = offd_indx;
+         offd_indx = offd_i[row_local];
+         indx_0 = diag_i[row_local];
+         diag_indx = indx_0 + 1;
+
+         for (i = 0; i < n; i++)
+         {
+            if (indices[i] < col_0 || indices[i] > col_n)/* insert into offd */
+            {
+               big_offd_j[offd_indx] = indices[i];
+               offd_data[offd_indx++] = coeffs[i];
+            }
+            else if (indices[i] == row) /* diagonal element */
+            {
+               diag_j[indx_0] = (HYPRE_Int)(indices[i] - col_0);
+               diag_data[indx_0] = coeffs[i];
+            }
+            else  /* insert into diag */
+            {
+               diag_j[diag_indx] = (HYPRE_Int)(indices[i] - col_0);
+               diag_data[diag_indx++] = coeffs[i];
+            }
+         }
+         BigQsort1(big_offd_j, offd_data, 0, offd_indx - 1);
+         qsort1(diag_j, diag_data, 1, diag_indx - 1);
+
+         hypre_AuxParCSRMatrixIndxDiag(aux_matrix)[row_local] = diag_indx;
+         hypre_AuxParCSRMatrixIndxOffd(aux_matrix)[row_local] = offd_indx;
       }
    }
    return ierr;
@@ -495,8 +517,8 @@ hypre_IJMatrixInsertRowPETSc(hypre_IJMatrix *matrix,
  *
  * hypre_IJMatrixAddToRowPETSc
  *
- * adds a row to an IJMatrix before assembly, 
- * 
+ * adds a row to an IJMatrix before assembly,
+ *
  *****************************************************************************/
 
 HYPRE_Int
@@ -553,10 +575,10 @@ hypre_IJMatrixAddToRowPETSc(hypre_IJMatrix *matrix,
    row_starts = hypre_ParCSRMatrixRowStarts(par_matrix);
    col_starts = hypre_ParCSRMatrixColStarts(par_matrix);
    col_0 = col_starts[my_id];
-   col_n = col_starts[my_id+1]-1;
+   col_n = col_starts[my_id + 1] - 1;
    need_aux = hypre_AuxParCSRMatrixNeedAux(aux_matrix);
 
-   if (row >= row_starts[my_id] && row < row_starts[my_id+1])
+   if (row >= row_starts[my_id] && row < row_starts[my_id + 1])
    {
       if (need_aux)
       {
@@ -565,89 +587,91 @@ hypre_IJMatrixAddToRowPETSc(hypre_IJMatrix *matrix,
          aux_data = hypre_AuxParCSRMatrixAuxData(aux_matrix);
          local_j = aux_j[row_local];
          local_data = aux_data[row_local];
-	 tmp_j = hypre_CTAlloc(HYPRE_BigInt, n, HYPRE_MEMORY_HOST);
-	 tmp_data = hypre_CTAlloc(HYPRE_Complex, n, HYPRE_MEMORY_HOST);
-	 tmp_indx = 0;
-         for (i=0; i < n; i++)
-	 {
-	    if (indices[i] == row)
-	       local_data[0] += coeffs[i];
-	    else
-	    {
-	       tmp_j[tmp_indx] = indices[i];
-	       tmp_data[tmp_indx++] = coeffs[i];
-	    }
-	 }
-	 BigQsort1(tmp_j,tmp_data,0,tmp_indx-1);
-	 indx = 0;
-	 size = 0;
-	 for (i=1; i < row_length[row_local]; i++)
-	 {
-	    while (local_j[i] > tmp_j[indx])
-	    {
-	       size++;
-	       indx++;
-	    }
-	    if (local_j[i] == tmp_j[indx])
-	    {
-	       size++;
-	       indx++;
-	    }
-	 }
-	 size += tmp_indx-indx;
-	    
-         old_size = row_length[row_local];   
+         tmp_j = hypre_CTAlloc(HYPRE_BigInt, n, HYPRE_MEMORY_HOST);
+         tmp_data = hypre_CTAlloc(HYPRE_Complex, n, HYPRE_MEMORY_HOST);
+         tmp_indx = 0;
+         for (i = 0; i < n; i++)
+         {
+            if (indices[i] == row)
+            {
+               local_data[0] += coeffs[i];
+            }
+            else
+            {
+               tmp_j[tmp_indx] = indices[i];
+               tmp_data[tmp_indx++] = coeffs[i];
+            }
+         }
+         BigQsort1(tmp_j, tmp_data, 0, tmp_indx - 1);
+         indx = 0;
+         size = 0;
+         for (i = 1; i < row_length[row_local]; i++)
+         {
+            while (local_j[i] > tmp_j[indx])
+            {
+               size++;
+               indx++;
+            }
+            if (local_j[i] == tmp_j[indx])
+            {
+               size++;
+               indx++;
+            }
+         }
+         size += tmp_indx - indx;
+
+         old_size = row_length[row_local];
          row_length[row_local] = size;
-         
+
          if ( row_space[row_local] < size)
          {
-   	    tmp2_j = hypre_CTAlloc(HYPRE_BigInt, size, HYPRE_MEMORY_HOST);
-   	    tmp2_data = hypre_CTAlloc(HYPRE_Complex, size, HYPRE_MEMORY_HOST);
-	    for (i=0; i < old_size; i++)
-	    {
-	       tmp2_j[i] = local_j[i];
-	       tmp2_data[i] = local_data[i];
-	    }
-   	    hypre_TFree(local_j, HYPRE_MEMORY_HOST);
-   	    hypre_TFree(local_data, HYPRE_MEMORY_HOST);
-	    local_j = tmp2_j;
-	    local_data = tmp2_data;
+            tmp2_j = hypre_CTAlloc(HYPRE_BigInt, size, HYPRE_MEMORY_HOST);
+            tmp2_data = hypre_CTAlloc(HYPRE_Complex, size, HYPRE_MEMORY_HOST);
+            for (i = 0; i < old_size; i++)
+            {
+               tmp2_j[i] = local_j[i];
+               tmp2_data[i] = local_data[i];
+            }
+            hypre_TFree(local_j, HYPRE_MEMORY_HOST);
+            hypre_TFree(local_data, HYPRE_MEMORY_HOST);
+            local_j = tmp2_j;
+            local_data = tmp2_data;
             row_space[row_local] = n;
          }
          /* merge local and tmp into local */
 
-         indx = 0; 
-	 cnt = row_length[row_local];
-
-	 for (i=1; i < old_size; i++)
-	 {
-	    while (local_j[i] > tmp_j[indx])
-	    {
-	       local_j[cnt] = tmp_j[indx];
-	       local_data[cnt++] = tmp_data[indx++];
-	    }
-	    if (local_j[i] == tmp_j[indx])
-	    {
-	       local_j[i] += tmp_j[indx];
-	       local_data[i] += tmp_data[indx++];
-	    }
-	 }
-         for (i=indx; i < tmp_indx; i++)
+         indx = 0;
+         cnt = row_length[row_local];
+
+         for (i = 1; i < old_size; i++)
+         {
+            while (local_j[i] > tmp_j[indx])
+            {
+               local_j[cnt] = tmp_j[indx];
+               local_data[cnt++] = tmp_data[indx++];
+            }
+            if (local_j[i] == tmp_j[indx])
+            {
+               local_j[i] += tmp_j[indx];
+               local_data[i] += tmp_data[indx++];
+            }
+         }
+         for (i = indx; i < tmp_indx; i++)
          {
-   	    local_j[cnt] = tmp_j[i];
-   	    local_data[cnt++] = tmp_data[i];
+            local_j[cnt] = tmp_j[i];
+            local_data[cnt++] = tmp_data[i];
          }
-   
+
          /* sort data according to column indices, except for first element */
 
-         BigQsort1(local_j,local_data,1,n-1);
-	 hypre_TFree(tmp_j, HYPRE_MEMORY_HOST); 
-	 hypre_TFree(tmp_data, HYPRE_MEMORY_HOST); 
+         BigQsort1(local_j, local_data, 1, n - 1);
+         hypre_TFree(tmp_j, HYPRE_MEMORY_HOST);
+         hypre_TFree(tmp_data, HYPRE_MEMORY_HOST);
       }
       else /* insert immediately into data into ParCSRMatrix structure */
       {
-	 offd_indx = hypre_AuxParCSRMatrixIndxOffd(aux_matrix)[row_local];
-	 diag_indx = hypre_AuxParCSRMatrixIndxDiag(aux_matrix)[row_local];
+         offd_indx = hypre_AuxParCSRMatrixIndxOffd(aux_matrix)[row_local];
+         diag_indx = hypre_AuxParCSRMatrixIndxDiag(aux_matrix)[row_local];
          diag = hypre_ParCSRMatrixDiag(par_matrix);
          diag_i = hypre_CSRMatrixI(diag);
          diag_j = hypre_CSRMatrixJ(diag);
@@ -657,95 +681,95 @@ hypre_IJMatrixAddToRowPETSc(hypre_IJMatrix *matrix,
          big_offd_j = hypre_CSRMatrixBigJ(offd);
          offd_data = hypre_CSRMatrixData(offd);
 
-	 indx_0 = diag_i[row_local];
-	 diag_indx = indx_0+1;
-	 
-	 tmp_diag_j = hypre_CTAlloc(HYPRE_Int, n, HYPRE_MEMORY_HOST);
-	 tmp_diag_data = hypre_CTAlloc(HYPRE_Complex, n, HYPRE_MEMORY_HOST);
-	 cnt_diag = 0;
-	 tmp_offd_j = hypre_CTAlloc(HYPRE_BigInt, n, HYPRE_MEMORY_HOST);
-	 tmp_offd_data = hypre_CTAlloc(HYPRE_Complex, n, HYPRE_MEMORY_HOST);
-	 cnt_offd = 0;
-  	 for (i=0; i < n; i++)
-	 {
-	    if (indices[i] < col_0 || indices[i] > col_n)/* insert into offd */	
-	    {
-	       tmp_offd_j[cnt_offd] = indices[i];
-	       tmp_offd_data[cnt_offd++] = coeffs[i];
-	    }
-	    else if (indices[i] == row) /* diagonal element */
-	    {
-	       diag_j[indx_0] = (HYPRE_Int)(indices[i] - col_0);
-	       diag_data[indx_0] += coeffs[i];
-	    }
-	    else  /* insert into diag */
-	    {
-	       tmp_diag_j[cnt_diag] = (HYPRE_Int)(indices[i] - col_0);
-	       tmp_diag_data[cnt_diag++] = coeffs[i];
-	    }
-	 }
-	 qsort1(tmp_diag_j,tmp_diag_data,0,cnt_diag-1);
-	 BigQsort1(tmp_offd_j,tmp_offd_data,0,cnt_offd-1);
+         indx_0 = diag_i[row_local];
+         diag_indx = indx_0 + 1;
+
+         tmp_diag_j = hypre_CTAlloc(HYPRE_Int, n, HYPRE_MEMORY_HOST);
+         tmp_diag_data = hypre_CTAlloc(HYPRE_Complex, n, HYPRE_MEMORY_HOST);
+         cnt_diag = 0;
+         tmp_offd_j = hypre_CTAlloc(HYPRE_BigInt, n, HYPRE_MEMORY_HOST);
+         tmp_offd_data = hypre_CTAlloc(HYPRE_Complex, n, HYPRE_MEMORY_HOST);
+         cnt_offd = 0;
+         for (i = 0; i < n; i++)
+         {
+            if (indices[i] < col_0 || indices[i] > col_n)/* insert into offd */
+            {
+               tmp_offd_j[cnt_offd] = indices[i];
+               tmp_offd_data[cnt_offd++] = coeffs[i];
+            }
+            else if (indices[i] == row) /* diagonal element */
+            {
+               diag_j[indx_0] = (HYPRE_Int)(indices[i] - col_0);
+               diag_data[indx_0] += coeffs[i];
+            }
+            else  /* insert into diag */
+            {
+               tmp_diag_j[cnt_diag] = (HYPRE_Int)(indices[i] - col_0);
+               tmp_diag_data[cnt_diag++] = coeffs[i];
+            }
+         }
+         qsort1(tmp_diag_j, tmp_diag_data, 0, cnt_diag - 1);
+         BigQsort1(tmp_offd_j, tmp_offd_data, 0, cnt_offd - 1);
 
          diag_indx = hypre_AuxParCSRMatrixIndxDiag(aux_matrix)[row_local];
-	 cnt = diag_indx;
-	 indx = 0;
-	 for (i=diag_i[row_local]+1; i < diag_indx; i++)
-	 {
-	    while (diag_j[i] > tmp_diag_j[indx])
-	    {
-	       diag_j[cnt] = tmp_diag_j[indx];
-	       diag_data[cnt++] = tmp_diag_data[indx++];
-	    }
-	    if (diag_j[i] == tmp_diag_j[indx])
-	    {
-	       diag_j[i] += tmp_diag_j[indx];
-	       diag_data[i] += tmp_diag_data[indx++];
-	    }
-	 }
-         for (i=indx; i < cnt_diag; i++)
+         cnt = diag_indx;
+         indx = 0;
+         for (i = diag_i[row_local] + 1; i < diag_indx; i++)
          {
-   	    diag_j[cnt] = tmp_diag_j[i];
-   	    diag_data[cnt++] = tmp_diag_data[i];
+            while (diag_j[i] > tmp_diag_j[indx])
+            {
+               diag_j[cnt] = tmp_diag_j[indx];
+               diag_data[cnt++] = tmp_diag_data[indx++];
+            }
+            if (diag_j[i] == tmp_diag_j[indx])
+            {
+               diag_j[i] += tmp_diag_j[indx];
+               diag_data[i] += tmp_diag_data[indx++];
+            }
          }
-   
+         for (i = indx; i < cnt_diag; i++)
+         {
+            diag_j[cnt] = tmp_diag_j[i];
+            diag_data[cnt++] = tmp_diag_data[i];
+         }
+
          /* sort data according to column indices, except for first element */
 
-         qsort1(diag_j,diag_data,1,cnt-1);
-	 hypre_TFree(tmp_diag_j, HYPRE_MEMORY_HOST); 
-	 hypre_TFree(tmp_diag_data, HYPRE_MEMORY_HOST); 
+         qsort1(diag_j, diag_data, 1, cnt - 1);
+         hypre_TFree(tmp_diag_j, HYPRE_MEMORY_HOST);
+         hypre_TFree(tmp_diag_data, HYPRE_MEMORY_HOST);
 
-	 hypre_AuxParCSRMatrixIndxOffd(aux_matrix)[row_local] = cnt;
+         hypre_AuxParCSRMatrixIndxOffd(aux_matrix)[row_local] = cnt;
 
          offd_indx = hypre_AuxParCSRMatrixIndxOffd(aux_matrix)[row_local];
-	 cnt = offd_indx;
-	 indx = 0;
-	 for (i=offd_i[row_local]+1; i < offd_indx; i++)
-	 {
-	    while (big_offd_j[i] > tmp_offd_j[indx])
-	    {
-	       big_offd_j[cnt] = tmp_offd_j[indx];
-	       offd_data[cnt++] = tmp_offd_data[indx++];
-	    }
-	    if (big_offd_j[i] == tmp_offd_j[indx])
-	    {
-	       big_offd_j[i] += tmp_offd_j[indx];
-	       offd_data[i] += tmp_offd_data[indx++];
-	    }
-	 }
-         for (i=indx; i < cnt_offd; i++)
+         cnt = offd_indx;
+         indx = 0;
+         for (i = offd_i[row_local] + 1; i < offd_indx; i++)
          {
-   	    big_offd_j[cnt] = tmp_offd_j[i];
-   	    offd_data[cnt++] = tmp_offd_data[i];
+            while (big_offd_j[i] > tmp_offd_j[indx])
+            {
+               big_offd_j[cnt] = tmp_offd_j[indx];
+               offd_data[cnt++] = tmp_offd_data[indx++];
+            }
+            if (big_offd_j[i] == tmp_offd_j[indx])
+            {
+               big_offd_j[i] += tmp_offd_j[indx];
+               offd_data[i] += tmp_offd_data[indx++];
+            }
          }
-   
+         for (i = indx; i < cnt_offd; i++)
+         {
+            big_offd_j[cnt] = tmp_offd_j[i];
+            offd_data[cnt++] = tmp_offd_data[i];
+         }
+
          /* sort data according to column indices, except for first element */
 
-         BigQsort1(big_offd_j,offd_data,1,cnt-1);
-	 hypre_TFree(tmp_offd_j, HYPRE_MEMORY_HOST); 
-	 hypre_TFree(tmp_offd_data, HYPRE_MEMORY_HOST); 
+         BigQsort1(big_offd_j, offd_data, 1, cnt - 1);
+         hypre_TFree(tmp_offd_j, HYPRE_MEMORY_HOST);
+         hypre_TFree(tmp_offd_data, HYPRE_MEMORY_HOST);
 
-	 hypre_AuxParCSRMatrixIndxOffd(aux_matrix)[row_local] = cnt;
+         hypre_AuxParCSRMatrixIndxOffd(aux_matrix)[row_local] = cnt;
       }
    }
    return ierr;
@@ -795,29 +819,33 @@ hypre_IJMatrixAssemblePETSc(hypre_IJMatrix *matrix)
    HYPRE_Int nnz_offd;
    HYPRE_BigInt *aux_offd_j;
 
-   hypre_MPI_Comm_size(comm, &num_procs); 
+   hypre_MPI_Comm_size(comm, &num_procs);
    hypre_MPI_Comm_rank(comm, &my_id);
-   num_rows = (HYPRE_Int)(row_starts[my_id+1] - row_starts[my_id]); 
-   /* move data into ParCSRMatrix if not there already */ 
+   num_rows = (HYPRE_Int)(row_starts[my_id + 1] - row_starts[my_id]);
+   /* move data into ParCSRMatrix if not there already */
    if (need_aux)
    {
       col_0 = col_starts[my_id];
-      col_n = col_starts[my_id+1]-1;
+      col_n = col_starts[my_id + 1] - 1;
       i_diag = 0;
       i_offd = 0;
-      for (i=0; i < num_rows; i++)
+      for (i = 0; i < num_rows; i++)
       {
-	 local_j = aux_j[i];
-	 local_data = aux_data[i];
-	 for (j=0; j < row_length[i]; j++)
-	 {
-	    if (local_j[j] < col_0 || local_j[j] > col_n)
-	       i_offd++;
-	    else
-	       i_diag++;
-	 }
-	 diag_i[i] = i_diag;
-	 offd_i[i] = i_offd;
+         local_j = aux_j[i];
+         local_data = aux_data[i];
+         for (j = 0; j < row_length[i]; j++)
+         {
+            if (local_j[j] < col_0 || local_j[j] > col_n)
+            {
+               i_offd++;
+            }
+            else
+            {
+               i_diag++;
+            }
+         }
+         diag_i[i] = i_diag;
+         offd_i[i] = i_offd;
       }
       diag_j = hypre_CTAlloc(HYPRE_Int, i_diag, HYPRE_MEMORY_HOST);
       diag_data = hypre_CTAlloc(HYPRE_Complex, i_diag, HYPRE_MEMORY_HOST);
@@ -826,60 +854,64 @@ hypre_IJMatrixAssemblePETSc(hypre_IJMatrix *matrix)
       offd_data = hypre_CTAlloc(HYPRE_Complex, i_offd, HYPRE_MEMORY_HOST);
       i_diag = 0;
       i_offd = 0;
-      for (i=0; i < num_rows; i++)
+      for (i = 0; i < num_rows; i++)
       {
-	 local_j = aux_j[i];
-	 local_data = aux_data[i];
-	 for (j=0; j < row_length[i]; j++)
-	 {
-	    if (local_j[j] < col_0 || local_j[j] > col_n)
-	    {
-	       big_offd_j[i_offd] = local_j[j];
-	       offd_data[i_offd++] = local_data[j];
-	    }
-	    else
-	    {
-	       diag_j[i_diag] = local_j[j];
-	       diag_data[i_diag++] = local_data[j];
-	    }
-	 }
+         local_j = aux_j[i];
+         local_data = aux_data[i];
+         for (j = 0; j < row_length[i]; j++)
+         {
+            if (local_j[j] < col_0 || local_j[j] > col_n)
+            {
+               big_offd_j[i_offd] = local_j[j];
+               offd_data[i_offd++] = local_data[j];
+            }
+            else
+            {
+               diag_j[i_diag] = local_j[j];
+               diag_data[i_diag++] = local_data[j];
+            }
+         }
       }
-      hypre_CSRMatrixJ(diag) = diag_j;      
-      hypre_CSRMatrixData(diag) = diag_data;      
-      hypre_CSRMatrixNumNonzeros(diag) = diag_i[num_rows];      
-      hypre_CSRMatrixJ(offd) = offd_j;      
-      hypre_CSRMatrixBigJ(offd) = big_offd_j;      
-      hypre_CSRMatrixData(offd) = offd_data;      
-      hypre_CSRMatrixNumNonzeros(offd) = offd_i[num_rows];      
+      hypre_CSRMatrixJ(diag) = diag_j;
+      hypre_CSRMatrixData(diag) = diag_data;
+      hypre_CSRMatrixNumNonzeros(diag) = diag_i[num_rows];
+      hypre_CSRMatrixJ(offd) = offd_j;
+      hypre_CSRMatrixBigJ(offd) = big_offd_j;
+      hypre_CSRMatrixData(offd) = offd_data;
+      hypre_CSRMatrixNumNonzeros(offd) = offd_i[num_rows];
    }
 
    /* generate col_map_offd */
    nnz_offd = offd_i[num_rows];
    aux_offd_j = hypre_CTAlloc(HYPRE_BigInt,  nnz_offd, HYPRE_MEMORY_HOST);
-   for (i=0; i < nnz_offd; i++)
+   for (i = 0; i < nnz_offd; i++)
+   {
       aux_offd_j[i] = big_offd_j[i];
-   BigQsort0(aux_offd_j,0,nnz_offd-1);
+   }
+   BigQsort0(aux_offd_j, 0, nnz_offd - 1);
    num_cols_offd = 1;
    cnt = 0;
-   for (i=0; i < nnz_offd-1; i++)
+   for (i = 0; i < nnz_offd - 1; i++)
    {
-      if (aux_offd_j[i+1] > aux_offd_j[i])
+      if (aux_offd_j[i + 1] > aux_offd_j[i])
       {
-	 cnt++;
-	 aux_offd_j[cnt] = aux_offd_j[i+1];
+         cnt++;
+         aux_offd_j[cnt] = aux_offd_j[i + 1];
          num_cols_offd++;
       }
    }
    col_map_offd = hypre_CTAlloc(HYPRE_Int, num_cols_offd, HYPRE_MEMORY_HOST);
-   for (i=0; i < num_cols_offd; i++)
+   for (i = 0; i < num_cols_offd; i++)
+   {
       col_map_offd[i] = aux_offd_j[i];
-   
-   for (i=0; i < nnz_offd; i++)
+   }
+
+   for (i = 0; i < nnz_offd; i++)
    {
-      offd_j[i] = hypre_BigBinarySearch(col_map_offd,big_offd_j[i],num_cols_offd);
+      offd_j[i] = hypre_BigBinarySearch(col_map_offd, big_offd_j[i], num_cols_offd);
    }
-   hypre_ParCSRMatrixColMapOffd(par_matrix) = col_map_offd;    
-   hypre_CSRMatrixNumCols(offd) = num_cols_offd;    
+   hypre_ParCSRMatrixColMapOffd(par_matrix) = col_map_offd;
+   hypre_CSRMatrixNumCols(offd) = num_cols_offd;
 
    hypre_AuxParCSRMatrixDestroy(aux_matrix);
    hypre_TFree(aux_offd_j, HYPRE_MEMORY_HOST);
@@ -901,8 +933,8 @@ hypre_IJMatrixAssemblePETSc(hypre_IJMatrix *matrix)
 
 HYPRE_Int
 hypre_IJMatrixDistributePETSc(hypre_IJMatrix *matrix,
-			      HYPRE_BigInt   *row_starts,
-			      HYPRE_BigInt   *col_starts)
+                              HYPRE_BigInt   *row_starts,
+                              HYPRE_BigInt   *col_starts)
 {
    HYPRE_Int ierr = 0;
    hypre_ParCSRMatrix *old_matrix = hypre_IJMatrixLocalStorage(matrix);
@@ -925,7 +957,7 @@ hypre_IJMatrixDistributePETSc(hypre_IJMatrix *matrix,
 
 HYPRE_Int
 hypre_IJMatrixApplyPETSc(hypre_IJMatrix  *matrix,
-		         hypre_ParVector *x,
+                         hypre_ParVector *x,
                          hypre_ParVector *b)
 {
    HYPRE_Int ierr = 0;
diff --git a/external/hypre/src/IJ_mv/IJVector.c b/external/hypre/src/IJ_mv/IJVector.c
index 988b4892..bc9a1d03 100644
--- a/external/hypre/src/IJ_mv/IJVector.c
+++ b/external/hypre/src/IJ_mv/IJVector.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -32,7 +32,9 @@ hypre_IJVectorDistribute( HYPRE_IJVector vector, const HYPRE_Int *vec_starts )
 
    if ( hypre_IJVectorObjectType(vec) == HYPRE_PARCSR )
 
-      return( hypre_IJVectorDistributePar(vec, vec_starts) );
+   {
+      return ( hypre_IJVectorDistributePar(vec, vec_starts) );
+   }
 
    else
    {
@@ -70,7 +72,7 @@ hypre_IJVectorZeroValues( HYPRE_IJVector vector )
 
    if ( hypre_IJVectorObjectType(vec) == HYPRE_PARCSR )
    {
-      return( hypre_IJVectorZeroValuesPar(vec) );
+      return ( hypre_IJVectorZeroValuesPar(vec) );
    }
    else
    {
@@ -80,3 +82,178 @@ hypre_IJVectorZeroValues( HYPRE_IJVector vector )
 
    return -99;
 }
+
+/*--------------------------------------------------------------------------
+ * hypre_IJVectorReadBinary
+ *
+ * Reads a vector from file stored in binary format. The resulting IJVector
+ * is stored on host memory. For information about the metadata contents
+ * contained in the file header, see hypre_ParVectorPrintBinaryIJ.
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_IJVectorReadBinary( MPI_Comm         comm,
+                          const char      *filename,
+                          HYPRE_Int        type,
+                          HYPRE_IJVector  *vector_ptr )
+{
+   /* Vector variables */
+   HYPRE_IJVector         vector;
+   HYPRE_BigInt           partitioning[2];
+   HYPRE_BigInt           global_size;
+   HYPRE_Int              size;
+   HYPRE_Int              num_components;
+   HYPRE_Int              total_size;
+   HYPRE_Int              storage_method;
+
+   /* Buffers */
+   hypre_float           *f32buffer = NULL;
+   hypre_double          *f64buffer = NULL;
+   HYPRE_Complex         *buffer;
+
+   /* Local variables */
+   FILE                  *fp;
+   char                   new_filename[HYPRE_MAX_FILE_NAME_LEN];
+   char                   msg[HYPRE_MAX_MSG_LEN];
+   hypre_uint64           header[8];
+   HYPRE_Int              myid;
+   size_t                 count;
+   HYPRE_Int              i, c;
+   HYPRE_Int              one = 1;
+
+   /* Exit if trying to read from big-endian machine */
+   if ((*(char*)&one) == 0)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Support to big-endian machines is incomplete!");
+      return hypre_error_flag;
+   }
+
+   /* Open binary file */
+   hypre_MPI_Comm_rank(comm, &myid);
+   hypre_sprintf(new_filename, "%s.%05d.bin", filename, myid);
+   if ((fp = fopen(new_filename, "r")) == NULL)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Could not open input file!");
+      return hypre_error_flag;
+   }
+
+   /*---------------------------------------------
+    * Read header (64 bytes)
+    *---------------------------------------------*/
+
+   count = 8;
+   if (fread((void*) header, sizeof(hypre_uint64), count, fp) != count)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Could not read header entries\n");
+      return hypre_error_flag;
+   }
+
+   /* Check for header version */
+   if (header[0] != 1)
+   {
+      hypre_sprintf(msg, "Unsupported header version: %d", header[0]);
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, msg);
+      return hypre_error_flag;
+   }
+
+   /* Set local variables */
+   partitioning[0] = (HYPRE_BigInt) header[2];
+   partitioning[1] = (HYPRE_BigInt) header[3];
+   global_size     = (HYPRE_BigInt) header[4];
+   size            = (HYPRE_Int) header[5];
+   num_components  = (HYPRE_Int) header[6];
+   storage_method  = (HYPRE_Int) header[7];
+   total_size      = size * num_components;
+
+   /* Sanity checks */
+   if (storage_method == 1)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "row-wise ordering is not supported!\n");
+      return hypre_error_flag;
+   }
+
+   if (size > global_size)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Invalid vector size!\n");
+      return hypre_error_flag;
+   }
+
+   /*---------------------------------------------
+    * Read data
+    *---------------------------------------------*/
+
+   /* Allocate memory for buffers */
+   count  = total_size;
+   buffer = hypre_TAlloc(HYPRE_Complex, total_size, HYPRE_MEMORY_HOST);
+
+   /* Read data */
+   if (header[1] == sizeof(hypre_float))
+   {
+      f32buffer = hypre_TAlloc(hypre_float, total_size, HYPRE_MEMORY_HOST);
+      if (fread((void*) f32buffer, sizeof(hypre_float), count, fp) != count)
+      {
+         hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Could not read all vector coefficients");
+         return hypre_error_flag;
+      }
+
+#ifdef HYPRE_USING_OPENMP
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+#endif
+      for (i = 0; i < total_size; i++)
+      {
+         buffer[i] = (HYPRE_Complex) f32buffer[i];
+      }
+   }
+   else if (header[1] == sizeof(hypre_double))
+   {
+      f64buffer = hypre_TAlloc(hypre_double, total_size, HYPRE_MEMORY_HOST);
+      if (fread((void*) f64buffer, sizeof(hypre_double), count, fp) != count)
+      {
+         hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Could not read all vector coefficients");
+         return hypre_error_flag;
+      }
+
+#ifdef HYPRE_USING_OPENMP
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+#endif
+      for (i = 0; i < total_size; i++)
+      {
+         buffer[i] = (HYPRE_Complex) f64buffer[i];
+      }
+   }
+   else
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Unsupported data type for vector entries");
+      return hypre_error_flag;
+   }
+
+   /* Close file */
+   fclose(fp);
+
+   /*---------------------------------------------
+    * Create vector
+    *---------------------------------------------*/
+
+   HYPRE_IJVectorCreate(comm, partitioning[0], partitioning[1] - 1, &vector);
+   HYPRE_IJVectorSetObjectType(vector, type);
+   HYPRE_IJVectorSetNumComponents(vector, num_components);
+   HYPRE_IJVectorInitialize_v2(vector, HYPRE_MEMORY_HOST);
+   for (c = 0; c < num_components; c++)
+   {
+      HYPRE_IJVectorSetComponent(vector, c);
+      HYPRE_IJVectorSetValues(vector, size, NULL, buffer + c * size);
+   }
+   HYPRE_IJVectorAssemble(vector);
+
+   *vector_ptr = vector;
+
+   /*---------------------------------------------
+    * Finalize
+    *---------------------------------------------*/
+
+   hypre_TFree(f32buffer, HYPRE_MEMORY_HOST);
+   hypre_TFree(f64buffer, HYPRE_MEMORY_HOST);
+   hypre_TFree(buffer, HYPRE_MEMORY_HOST);
+
+   return hypre_error_flag;
+}
diff --git a/external/hypre/src/IJ_mv/IJVector_parcsr.c b/external/hypre/src/IJ_mv/IJVector_parcsr.c
index 4672a32d..13c4ff8c 100644
--- a/external/hypre/src/IJ_mv/IJVector_parcsr.c
+++ b/external/hypre/src/IJ_mv/IJVector_parcsr.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -41,7 +41,7 @@ hypre_IJVectorCreatePar(hypre_IJVector *vector,
       partitioning[j] = IJpartitioning[j] - jmin;
    }
 
-   hypre_IJVectorObject(vector) = hypre_ParVectorCreate(comm, global_n, partitioning);
+   hypre_IJVectorObject(vector) = (void*) hypre_ParVectorCreate(comm, global_n, partitioning);
 
    return hypre_error_flag;
 }
@@ -67,27 +67,25 @@ hypre_IJVectorDestroyPar(hypre_IJVector *vector)
  * initializes ParVector of IJVectorPar
  *
  *****************************************************************************/
-HYPRE_Int
-hypre_IJVectorInitializePar(hypre_IJVector *vector)
-{
-   return hypre_IJVectorInitializePar_v2(vector, hypre_IJVectorMemoryLocation(vector));
-}
+
+/*--------------------------------------------------------------------------
+ * hypre_IJVectorInitializeParShell
+ *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_IJVectorInitializePar_v2(hypre_IJVector *vector, HYPRE_MemoryLocation memory_location)
+hypre_IJVectorInitializeParShell(hypre_IJVector *vector)
 {
-   hypre_ParVector *par_vector = (hypre_ParVector*) hypre_IJVectorObject(vector);
-   hypre_AuxParVector *aux_vector = (hypre_AuxParVector*) hypre_IJVectorTranslator(vector);
-   HYPRE_BigInt *partitioning = hypre_ParVectorPartitioning(par_vector);
-   hypre_Vector *local_vector = hypre_ParVectorLocalVector(par_vector);
-   HYPRE_Int print_level = hypre_IJVectorPrintLevel(vector);
+   MPI_Comm            comm         = hypre_IJVectorComm(vector);
+   hypre_ParVector    *par_vector   = (hypre_ParVector*) hypre_IJVectorObject(vector);
+   HYPRE_Int           print_level  = hypre_IJVectorPrintLevel(vector);
+   HYPRE_Int           num_vectors  = hypre_IJVectorNumComponents(vector);
 
-   HYPRE_Int my_id;
-   MPI_Comm  comm = hypre_IJVectorComm(vector);
-   hypre_MPI_Comm_rank(comm, &my_id);
+   HYPRE_BigInt       *partitioning = hypre_ParVectorPartitioning(par_vector);
+   hypre_Vector       *local_vector = hypre_ParVectorLocalVector(par_vector);
 
-   HYPRE_MemoryLocation memory_location_aux =
-      hypre_GetExecPolicy1(memory_location) == HYPRE_EXEC_HOST ? HYPRE_MEMORY_HOST : HYPRE_MEMORY_DEVICE;
+   HYPRE_Int           my_id;
+
+   hypre_MPI_Comm_rank(comm, &my_id);
 
    if (!partitioning)
    {
@@ -100,16 +98,63 @@ hypre_IJVectorInitializePar_v2(hypre_IJVector *vector, HYPRE_MemoryLocation memo
       return hypre_error_flag;
    }
 
+   hypre_VectorNumVectors(local_vector) = num_vectors;
    hypre_VectorSize(local_vector) = (HYPRE_Int)(partitioning[1] - partitioning[0]);
 
-   hypre_ParVectorInitialize_v2(par_vector, memory_location);
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_IJVectorSetParData
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_IJVectorSetParData(hypre_IJVector *vector,
+                         HYPRE_Complex  *data)
+{
+   hypre_ParVector *par_vector = (hypre_ParVector*) hypre_IJVectorObject(vector);
+
+   hypre_ParVectorSetData(par_vector, data);
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_IJVectorInitializePar
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_IJVectorInitializePar(hypre_IJVector *vector)
+{
+   return hypre_IJVectorInitializePar_v2(vector, hypre_IJVectorMemoryLocation(vector));
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_IJVectorInitializePar_v2
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_IJVectorInitializePar_v2(hypre_IJVector       *vector,
+                               HYPRE_MemoryLocation  memory_location)
+{
+   hypre_ParVector      *par_vector;
+   hypre_AuxParVector   *aux_vector;
+
+   /* Set up the basic structure and metadata for the vector */
+   hypre_IJVectorInitializeParShell(vector);
+   par_vector = (hypre_ParVector*) hypre_IJVectorObject(vector);
+   aux_vector = (hypre_AuxParVector*) hypre_IJVectorTranslator(vector);
 
+   /* Check if auxiliary vectors needs to be created */
    if (!aux_vector)
    {
       hypre_AuxParVectorCreate(&aux_vector);
       hypre_IJVectorTranslator(vector) = aux_vector;
    }
-   hypre_AuxParVectorInitialize_v2(aux_vector, memory_location_aux);
+
+   /* Memory allocations */
+   hypre_ParVectorInitialize_v2(par_vector, memory_location);
+   hypre_AuxParVectorInitialize_v2(aux_vector, memory_location);
 
    return hypre_error_flag;
 }
@@ -134,7 +179,7 @@ hypre_IJVectorSetMaxOffProcElmtsPar(hypre_IJVector *vector,
    }
    hypre_AuxParVectorMaxOffProcElmts(aux_vector) = max_off_proc_elmts;
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
    hypre_AuxParVectorUsrOffProcElmts(aux_vector) = max_off_proc_elmts;
 #endif
 
@@ -203,64 +248,43 @@ hypre_IJVectorDistributePar(hypre_IJVector  *vector,
 HYPRE_Int
 hypre_IJVectorZeroValuesPar(hypre_IJVector *vector)
 {
-   HYPRE_Int my_id;
-   HYPRE_BigInt vec_start, vec_stop;
+   hypre_IJVectorSetConstantValuesPar(vector, 0.0);
 
-   hypre_ParVector *par_vector = (hypre_ParVector*) hypre_IJVectorObject(vector);
-   MPI_Comm comm = hypre_IJVectorComm(vector);
-   HYPRE_BigInt *partitioning;
-   hypre_Vector *local_vector;
-   HYPRE_Int print_level = hypre_IJVectorPrintLevel(vector);
+   return hypre_error_flag;
+}
 
-   hypre_MPI_Comm_rank(comm, &my_id);
+/******************************************************************************
+ *
+ * hypre_IJVectorSetComponentPar
+ *
+ * Set the component identifier of a vector with multiple components
+ * (multivector)
+ *
+ *****************************************************************************/
 
-   /* If par_vector == NULL or partitioning == NULL or local_vector == NULL
-      let user know of catastrophe and exit */
+HYPRE_Int
+hypre_IJVectorSetComponentPar(hypre_IJVector *vector,
+                              HYPRE_Int       component)
+{
+   HYPRE_Int        print_level = hypre_IJVectorPrintLevel(vector);
+   hypre_ParVector *par_vector  = (hypre_ParVector*) hypre_IJVectorObject(vector);
+   HYPRE_Int        num_vectors = hypre_ParVectorNumVectors(par_vector);
 
-   if (!par_vector)
-   {
-      if (print_level)
-      {
-         hypre_printf("par_vector == NULL -- ");
-         hypre_printf("hypre_IJVectorZeroValuesPar\n");
-         hypre_printf("**** Vector storage is either unallocated or orphaned ****\n");
-      }
-      hypre_error_in_arg(1);
-      return hypre_error_flag;
-   }
-   partitioning = hypre_ParVectorPartitioning(par_vector);
-   local_vector = hypre_ParVectorLocalVector(par_vector);
-   if (!local_vector)
+   if (component < 0 || component > num_vectors)
    {
       if (print_level)
       {
-         hypre_printf("local_vector == NULL -- ");
-         hypre_printf("hypre_IJVectorZeroValuesPar\n");
-         hypre_printf("**** Vector local data is either unallocated or orphaned ****\n");
+         hypre_printf("component < 0 || component > num_vectors -- ");
+         hypre_printf("hypre_IJVectorSetComponentPar\n");
       }
-      hypre_error_in_arg(1);
+      hypre_error_in_arg(2);
       return hypre_error_flag;
    }
-
-   vec_start = partitioning[0];
-   vec_stop  = partitioning[1];
-
-   if (vec_start > vec_stop)
+   else
    {
-      if (print_level)
-      {
-         hypre_printf("vec_start > vec_stop -- ");
-         hypre_printf("hypre_IJVectorZeroValuesPar\n");
-         hypre_printf("**** This vector partitioning should not occur ****\n");
-      }
-      hypre_error_in_arg(1);
-      return hypre_error_flag;
+      hypre_ParVectorSetComponent(par_vector, component);
    }
 
-   hypre_assert(hypre_VectorSize(local_vector) == (HYPRE_Int)(vec_stop - vec_start));
-
-   hypre_SeqVectorSetConstantValues(local_vector, 0.0);
-
    return hypre_error_flag;
 }
 
@@ -287,10 +311,14 @@ hypre_IJVectorSetValuesPar(hypre_IJVector       *vector,
    HYPRE_BigInt *IJpartitioning = hypre_IJVectorPartitioning(vector);
    hypre_ParVector *par_vector = (hypre_ParVector*) hypre_IJVectorObject(vector);
    MPI_Comm comm = hypre_IJVectorComm(vector);
+   HYPRE_Int component;
    hypre_Vector *local_vector;
+   HYPRE_Int vecoffset;
+   HYPRE_Int vecstride;
+   HYPRE_Int idxstride;
 
    /* If no components are to be set, perform no checking and return */
-   if (num_values < 1) return 0;
+   if (num_values < 1) { return 0; }
 
    hypre_MPI_Comm_rank(comm, &my_id);
 
@@ -322,7 +350,7 @@ hypre_IJVectorSetValuesPar(hypre_IJVector       *vector,
    }
 
    vec_start = IJpartitioning[0];
-   vec_stop  = IJpartitioning[1]-1;
+   vec_stop  = IJpartitioning[1] - 1;
 
    if (vec_start > vec_stop)
    {
@@ -342,16 +370,19 @@ hypre_IJVectorSetValuesPar(hypre_IJVector       *vector,
       vec_start.  NOTE: If indices == NULL off proc values are ignored!!! */
 
    data = hypre_VectorData(local_vector);
-
+   component = hypre_VectorComponent(local_vector);
+   vecstride = hypre_VectorVectorStride(local_vector);
+   idxstride = hypre_VectorIndexStride(local_vector);
+   vecoffset = component * vecstride;
    if (indices)
    {
       for (j = 0; j < num_values; j++)
       {
          i = indices[j];
-         if (i >= vec_start && i <= vec_stop)
+         if (vec_start <= i && i <= vec_stop)
          {
-            k = (HYPRE_Int)( i- vec_start);
-            data[k] = values[j];
+            k = (HYPRE_Int)(i - vec_start);
+            data[vecoffset + k * idxstride] = values[j];
          }
       }
    }
@@ -364,15 +395,51 @@ hypre_IJVectorSetValuesPar(hypre_IJVector       *vector,
             hypre_printf("Warning! Indices beyond local range  not identified!\n ");
             hypre_printf("Off processor values have been ignored!\n");
          }
-         num_values = (HYPRE_Int)(vec_stop - vec_start) +1;
+         num_values = (HYPRE_Int)(vec_stop - vec_start) + 1;
       }
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(j) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(j) HYPRE_SMP_SCHEDULE
 #endif
       for (j = 0; j < num_values; j++)
-         data[j] = values[j];
+      {
+         data[vecoffset + j * idxstride] = values[j];
+      }
+   }
+
+   return hypre_error_flag;
+}
+
+/******************************************************************************
+ *
+ * hypre_IJVectorSetConstantValuesPar
+ *
+ * sets all vector coefficients to a given value
+ *
+ *****************************************************************************/
+
+HYPRE_Int
+hypre_IJVectorSetConstantValuesPar(hypre_IJVector *vector,
+                                   HYPRE_Complex   value)
+{
+   HYPRE_Int        print_level = hypre_IJVectorPrintLevel(vector);
+   hypre_ParVector *par_vector  = (hypre_ParVector*) hypre_IJVectorObject(vector);
+
+   /* Sanity check for par_vector */
+   if (!par_vector)
+   {
+      if (print_level)
+      {
+         hypre_printf("par_vector == NULL -- ");
+         hypre_printf("hypre_IJVectorSetValuesPar\n");
+         hypre_printf("**** Vector storage is either unallocated or orphaned ****\n");
+      }
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
    }
 
+   /* Set vector coefficients to "value" */
+   hypre_ParVectorSetConstantValues(par_vector, value);
+
    return hypre_error_flag;
 }
 
@@ -390,19 +457,26 @@ hypre_IJVectorAddToValuesPar(hypre_IJVector       *vector,
                              const HYPRE_BigInt   *indices,
                              const HYPRE_Complex  *values)
 {
-   HYPRE_Int my_id;
-   HYPRE_Int i, j, vec_start, vec_stop;
-   HYPRE_Complex *data;
-   HYPRE_Int print_level = hypre_IJVectorPrintLevel(vector);
-
-   HYPRE_BigInt *IJpartitioning = hypre_IJVectorPartitioning(vector);
-   hypre_ParVector *par_vector = (hypre_ParVector*) hypre_IJVectorObject(vector);
+   MPI_Comm            comm = hypre_IJVectorComm(vector);
+   hypre_ParVector    *par_vector = (hypre_ParVector*) hypre_IJVectorObject(vector);
    hypre_AuxParVector *aux_vector = (hypre_AuxParVector*) hypre_IJVectorTranslator(vector);
-   MPI_Comm comm = hypre_IJVectorComm(vector);
-   hypre_Vector *local_vector;
+   HYPRE_BigInt       *IJpartitioning = hypre_IJVectorPartitioning(vector);
+   HYPRE_Int           print_level = hypre_IJVectorPrintLevel(vector);
+
+   hypre_Vector       *local_vector;
+   HYPRE_Int           idxstride, vecstride;
+   HYPRE_Int           component, vecoffset;
+   HYPRE_Int           num_vectors;
+   HYPRE_Int           my_id;
+   HYPRE_Int           j;
+   HYPRE_BigInt        big_i, vec_start, vec_stop;
+   HYPRE_Complex      *data;
 
    /* If no components are to be retrieved, perform no checking and return */
-   if (num_values < 1) return 0;
+   if (num_values < 1)
+   {
+      return hypre_error_flag;
+   }
 
    hypre_MPI_Comm_rank(comm, &my_id);
 
@@ -420,6 +494,7 @@ hypre_IJVectorAddToValuesPar(hypre_IJVector       *vector,
       hypre_error_in_arg(1);
       return hypre_error_flag;
    }
+
    local_vector = hypre_ParVectorLocalVector(par_vector);
    if (!local_vector)
    {
@@ -434,7 +509,7 @@ hypre_IJVectorAddToValuesPar(hypre_IJVector       *vector,
    }
 
    vec_start = IJpartitioning[0];
-   vec_stop  = IJpartitioning[1]-1;
+   vec_stop  = IJpartitioning[1] - 1;
 
    if (vec_start > vec_stop)
    {
@@ -449,6 +524,11 @@ hypre_IJVectorAddToValuesPar(hypre_IJVector       *vector,
    }
 
    data = hypre_VectorData(local_vector);
+   num_vectors = hypre_VectorNumVectors(local_vector);
+   component   = hypre_VectorComponent(local_vector);
+   vecstride   = hypre_VectorVectorStride(local_vector);
+   idxstride   = hypre_VectorIndexStride(local_vector);
+   vecoffset   = component * vecstride;
 
    if (indices)
    {
@@ -462,44 +542,52 @@ hypre_IJVectorAddToValuesPar(hypre_IJVector       *vector,
 
       for (j = 0; j < num_values; j++)
       {
-         i = indices[j];
-         if (i < vec_start || i > vec_stop)
+         big_i = indices[j];
+         if (big_i < vec_start || big_i > vec_stop)
          {
             /* if elements outside processor boundaries, store in off processor
                stash */
             if (!max_off_proc_elmts)
             {
                max_off_proc_elmts = 100;
-               hypre_AuxParVectorMaxOffProcElmts(aux_vector) =
-                  max_off_proc_elmts;
-               hypre_AuxParVectorOffProcI(aux_vector)
-                  = hypre_CTAlloc(HYPRE_BigInt, max_off_proc_elmts, HYPRE_MEMORY_HOST);
-               hypre_AuxParVectorOffProcData(aux_vector)
-                  = hypre_CTAlloc(HYPRE_Complex, max_off_proc_elmts, HYPRE_MEMORY_HOST);
+               hypre_AuxParVectorMaxOffProcElmts(aux_vector) = max_off_proc_elmts;
+               hypre_AuxParVectorOffProcI(aux_vector) = hypre_CTAlloc(HYPRE_BigInt,
+                                                                      max_off_proc_elmts,
+                                                                      HYPRE_MEMORY_HOST);
+               hypre_AuxParVectorOffProcData(aux_vector) = hypre_CTAlloc(HYPRE_Complex,
+                                                                         max_off_proc_elmts,
+                                                                         HYPRE_MEMORY_HOST);
                off_proc_i = hypre_AuxParVectorOffProcI(aux_vector);
                off_proc_data = hypre_AuxParVectorOffProcData(aux_vector);
             }
             else if (current_num_elmts + 1 > max_off_proc_elmts)
             {
                max_off_proc_elmts += 10;
-               off_proc_i = hypre_TReAlloc(off_proc_i, HYPRE_BigInt, max_off_proc_elmts, HYPRE_MEMORY_HOST);
+               off_proc_i = hypre_TReAlloc(off_proc_i, HYPRE_BigInt, max_off_proc_elmts,
+                                           HYPRE_MEMORY_HOST);
                off_proc_data = hypre_TReAlloc(off_proc_data, HYPRE_Complex,
                                               max_off_proc_elmts, HYPRE_MEMORY_HOST);
-               hypre_AuxParVectorMaxOffProcElmts(aux_vector)
-                  = max_off_proc_elmts;
+               hypre_AuxParVectorMaxOffProcElmts(aux_vector) = max_off_proc_elmts;
                hypre_AuxParVectorOffProcI(aux_vector) = off_proc_i;
                hypre_AuxParVectorOffProcData(aux_vector) = off_proc_data;
             }
-            off_proc_i[current_num_elmts] = i;
+            off_proc_i[current_num_elmts] = big_i;
             off_proc_data[current_num_elmts++] = values[j];
-            hypre_AuxParVectorCurrentOffProcElmts(aux_vector)=current_num_elmts;
+            hypre_AuxParVectorCurrentOffProcElmts(aux_vector) = current_num_elmts;
          }
          else /* local values are added to the vector */
          {
-            k = (HYPRE_Int)(i - vec_start);
-            data[k] += values[j];
+            k = (HYPRE_Int)(big_i - vec_start);
+            data[vecoffset + k * idxstride] += values[j];
          }
       }
+
+      if (current_num_elmts > 0 && num_vectors > 1)
+      {
+         hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                           "Off processor AddToValues not implemented for multivectors!\n");
+         return hypre_error_flag;
+      }
    }
    else
    {
@@ -510,13 +598,16 @@ hypre_IJVectorAddToValuesPar(hypre_IJVector       *vector,
             hypre_printf("Warning! Indices beyond local range  not identified!\n ");
             hypre_printf("Off processor values have been ignored!\n");
          }
-         num_values = (HYPRE_Int)(vec_stop - vec_start) +1;
+         num_values = (HYPRE_Int)(vec_stop - vec_start) + 1;
       }
+
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(j) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(j) HYPRE_SMP_SCHEDULE
 #endif
       for (j = 0; j < num_values; j++)
-         data[j] += values[j];
+      {
+         data[vecoffset + j * idxstride] += values[j];
+      }
    }
 
    return hypre_error_flag;
@@ -556,13 +647,13 @@ hypre_IJVectorAssemblePar(hypre_IJVector *vector)
       HYPRE_BigInt *off_proc_i;
       HYPRE_Complex *off_proc_data;
       current_num_elmts = hypre_AuxParVectorCurrentOffProcElmts(aux_vector);
-      hypre_MPI_Allreduce(&current_num_elmts,&off_proc_elmts,1,HYPRE_MPI_INT,
-                          hypre_MPI_SUM,comm);
+      hypre_MPI_Allreduce(&current_num_elmts, &off_proc_elmts, 1, HYPRE_MPI_INT,
+                          hypre_MPI_SUM, comm);
       if (off_proc_elmts)
       {
-         max_off_proc_elmts=hypre_AuxParVectorMaxOffProcElmts(aux_vector);
-         off_proc_i=hypre_AuxParVectorOffProcI(aux_vector);
-         off_proc_data=hypre_AuxParVectorOffProcData(aux_vector);
+         max_off_proc_elmts = hypre_AuxParVectorMaxOffProcElmts(aux_vector);
+         off_proc_i = hypre_AuxParVectorOffProcI(aux_vector);
+         off_proc_data = hypre_AuxParVectorOffProcData(aux_vector);
          hypre_IJVectorAssembleOffProcValsPar(vector, max_off_proc_elmts,
                                               current_num_elmts, HYPRE_MEMORY_HOST,
                                               off_proc_i, off_proc_data);
@@ -585,10 +676,10 @@ hypre_IJVectorAssemblePar(hypre_IJVector *vector)
  *****************************************************************************/
 
 HYPRE_Int
-hypre_IJVectorGetValuesPar(hypre_IJVector *vector,
-                           HYPRE_Int       num_values,
-                     const HYPRE_BigInt   *indices,
-                           HYPRE_Complex  *values)
+hypre_IJVectorGetValuesPar(hypre_IJVector      *vector,
+                           HYPRE_Int            num_values,
+                           const HYPRE_BigInt  *indices,
+                           HYPRE_Complex       *values)
 {
    HYPRE_Int        my_id;
    MPI_Comm         comm           = hypre_IJVectorComm(vector);
@@ -671,6 +762,8 @@ hypre_IJVectorAssembleOffProcValsPar( hypre_IJVector       *vector,
                                       HYPRE_BigInt         *off_proc_i,
                                       HYPRE_Complex        *off_proc_data)
 {
+   HYPRE_UNUSED_VAR(max_off_proc_elmts);
+
    HYPRE_Int myid;
    HYPRE_BigInt global_first_row, global_num_rows;
    HYPRE_Int i, j, in, k;
@@ -687,13 +780,13 @@ hypre_IJVectorAssembleOffProcValsPar( hypre_IJVector       *vector,
    HYPRE_BigInt upper_bound;
    HYPRE_Int num_real_procs;
 
-   HYPRE_BigInt *row_list=NULL;
-   HYPRE_Int *a_proc_id=NULL, *orig_order=NULL;
+   HYPRE_BigInt *row_list = NULL;
+   HYPRE_Int *a_proc_id = NULL, *orig_order = NULL;
    HYPRE_Int *real_proc_id = NULL, *us_real_proc_id = NULL;
    HYPRE_Int *ex_contact_procs = NULL, *ex_contact_vec_starts = NULL;
-   HYPRE_Int *recv_starts=NULL;
+   HYPRE_Int *recv_starts = NULL;
    HYPRE_BigInt *response_buf = NULL;
-   HYPRE_Int *response_buf_starts=NULL;
+   HYPRE_Int *response_buf_starts = NULL;
    HYPRE_Int *num_rows_per_proc = NULL;
    HYPRE_Int  tmp_int;
    HYPRE_Int  obj_size_bytes, big_int_size, complex_size;
@@ -704,7 +797,7 @@ hypre_IJVectorAssembleOffProcValsPar( hypre_IJVector       *vector,
    void *recv_data_ptr;
 
    HYPRE_Complex tmp_complex;
-   HYPRE_BigInt *ex_contact_buf=NULL;
+   HYPRE_BigInt *ex_contact_buf = NULL;
    HYPRE_Complex *vector_data;
    HYPRE_Complex value;
 
@@ -726,8 +819,10 @@ hypre_IJVectorAssembleOffProcValsPar( hypre_IJVector       *vector,
       HYPRE_BigInt  *off_proc_i_h    = hypre_TAlloc(HYPRE_BigInt,  current_num_elmts, HYPRE_MEMORY_HOST);
       HYPRE_Complex *off_proc_data_h = hypre_TAlloc(HYPRE_Complex, current_num_elmts, HYPRE_MEMORY_HOST);
 
-      hypre_TMemcpy(off_proc_i_h,    off_proc_i,    HYPRE_BigInt,  current_num_elmts, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
-      hypre_TMemcpy(off_proc_data_h, off_proc_data, HYPRE_Complex, current_num_elmts, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
+      hypre_TMemcpy(off_proc_i_h,    off_proc_i,    HYPRE_BigInt,  current_num_elmts, HYPRE_MEMORY_HOST,
+                    HYPRE_MEMORY_DEVICE);
+      hypre_TMemcpy(off_proc_data_h, off_proc_data, HYPRE_Complex, current_num_elmts, HYPRE_MEMORY_HOST,
+                    HYPRE_MEMORY_DEVICE);
 
       off_proc_i    = off_proc_i_h;
       off_proc_data = off_proc_data_h;
@@ -758,7 +853,7 @@ hypre_IJVectorAssembleOffProcValsPar( hypre_IJVector       *vector,
 
    if (current_num_elmts > 0)
    {
-      for (i=0; i < current_num_elmts; i++)
+      for (i = 0; i < current_num_elmts; i++)
       {
          row = off_proc_i[i];
          row_list[i] = row;
@@ -771,12 +866,12 @@ hypre_IJVectorAssembleOffProcValsPar( hypre_IJVector       *vector,
       /* now we need to find the actual order of each row  - sort on row -
          this will result in proc ids sorted also...*/
 
-      hypre_BigQsortb2i(row_list, a_proc_id, orig_order, 0, current_num_elmts -1);
+      hypre_BigQsortb2i(row_list, a_proc_id, orig_order, 0, current_num_elmts - 1);
 
       /* calculate the number of contacts */
       ex_num_contacts = 1;
       last_proc = a_proc_id[0];
-      for (i=1; i < current_num_elmts; i++)
+      for (i = 1; i < current_num_elmts; i++)
       {
          if (a_proc_id[i] > last_proc)
          {
@@ -792,12 +887,12 @@ hypre_IJVectorAssembleOffProcValsPar( hypre_IJVector       *vector,
       will contact with a range (2 numbers) */
 
    ex_contact_procs = hypre_CTAlloc(HYPRE_Int,  ex_num_contacts, HYPRE_MEMORY_HOST);
-   ex_contact_vec_starts =  hypre_CTAlloc(HYPRE_Int,  ex_num_contacts+1, HYPRE_MEMORY_HOST);
-   ex_contact_buf =  hypre_CTAlloc(HYPRE_BigInt,  ex_num_contacts*2, HYPRE_MEMORY_HOST);
+   ex_contact_vec_starts =  hypre_CTAlloc(HYPRE_Int,  ex_num_contacts + 1, HYPRE_MEMORY_HOST);
+   ex_contact_buf =  hypre_CTAlloc(HYPRE_BigInt,  ex_num_contacts * 2, HYPRE_MEMORY_HOST);
 
    counter = 0;
    range_end = -1;
-   for (i=0; i< current_num_elmts; i++)
+   for (i = 0; i < current_num_elmts; i++)
    {
       if (row_list[i] > range_end)
       {
@@ -805,12 +900,12 @@ hypre_IJVectorAssembleOffProcValsPar( hypre_IJVector       *vector,
          proc_id = a_proc_id[i];
 
          /* end of prev. range */
-         if (counter > 0)  ex_contact_buf[counter*2 - 1] = row_list[i-1];
+         if (counter > 0) { ex_contact_buf[counter * 2 - 1] = row_list[i - 1]; }
 
          /*start new range*/
          ex_contact_procs[counter] = proc_id;
-         ex_contact_vec_starts[counter] = counter*2;
-         ex_contact_buf[counter*2] =  row_list[i];
+         ex_contact_vec_starts[counter] = counter * 2;
+         ex_contact_buf[counter * 2] =  row_list[i];
          counter++;
 
          hypre_GetAssumedPartitionRowRange(comm, proc_id, global_first_row,
@@ -819,10 +914,12 @@ hypre_IJVectorAssembleOffProcValsPar( hypre_IJVector       *vector,
    }
 
    /*finish the starts*/
-   ex_contact_vec_starts[counter] =  counter*2;
+   ex_contact_vec_starts[counter] =  counter * 2;
    /*finish the last range*/
    if (counter > 0)
-      ex_contact_buf[counter*2 - 1] = row_list[current_num_elmts - 1];
+   {
+      ex_contact_buf[counter * 2 - 1] = row_list[current_num_elmts - 1];
+   }
 
    /* create response object - can use same fill response as used in the commpkg
       routine */
@@ -849,7 +946,7 @@ hypre_IJVectorAssembleOffProcValsPar( hypre_IJVector       *vector,
 
    /*how many ranges were returned?*/
    num_ranges = response_buf_starts[ex_num_contacts];
-   num_ranges = num_ranges/2;
+   num_ranges = num_ranges / 2;
 
    prev_id = -1;
    j = 0;
@@ -857,11 +954,11 @@ hypre_IJVectorAssembleOffProcValsPar( hypre_IJVector       *vector,
    num_real_procs = 0;
 
    /* loop through ranges - create a list of actual processor ids*/
-   for (i=0; i<num_ranges; i++)
+   for (i = 0; i < num_ranges; i++)
    {
-      upper_bound = response_buf[i*2+1];
+      upper_bound = response_buf[i * 2 + 1];
       counter = 0;
-      tmp_id = (HYPRE_Int)response_buf[i*2];
+      tmp_id = (HYPRE_Int)response_buf[i * 2];
 
       /* loop through row_list entries - counting how many are in the range */
       while (j < current_num_elmts && row_list[j] <= upper_bound)
@@ -902,7 +999,7 @@ hypre_IJVectorAssembleOffProcValsPar( hypre_IJVector       *vector,
       num_rows_per_proc[0] = 1;
 
       /* loop through real procs - these are sorted (row_list is sorted also)*/
-      for (i=1; i < current_num_elmts; i++)
+      for (i = 1; i < current_num_elmts; i++)
       {
          if (real_proc_id[i] == ex_contact_procs[counter]) /* same processor */
          {
@@ -922,14 +1019,14 @@ hypre_IJVectorAssembleOffProcValsPar( hypre_IJVector       *vector,
    ex_contact_vec_starts = hypre_CTAlloc(HYPRE_Int,  num_real_procs + 1, HYPRE_MEMORY_HOST);
    ex_contact_vec_starts[0] = -1;
 
-   for (i=0; i < num_real_procs; i++)
+   for (i = 0; i < num_real_procs; i++)
    {
-      storage += 1 + 2*  num_rows_per_proc[i];
-      ex_contact_vec_starts[i+1] = -storage-1; /* need negative for next loop */
+      storage += 1 + 2 *  num_rows_per_proc[i];
+      ex_contact_vec_starts[i + 1] = -storage - 1; /* need negative for next loop */
    }
 
-   /*void_contact_buf = hypre_MAlloc(storage*obj_size_bytes);*/
-   void_contact_buf = hypre_CTAlloc(char, storage*obj_size_bytes, HYPRE_MEMORY_HOST);
+   /*void_contact_buf = hypre_TAlloc(char, storage*obj_size_bytes);*/
+   void_contact_buf = hypre_CTAlloc(char, storage * obj_size_bytes, HYPRE_MEMORY_HOST);
    index_ptr = void_contact_buf; /* step through with this index */
 
    /* set up data to be sent to send procs */
@@ -938,14 +1035,14 @@ hypre_IJVectorAssembleOffProcValsPar( hypre_IJVector       *vector,
    /* un-sort real_proc_id  - we want to access data arrays in order */
 
    us_real_proc_id =  hypre_CTAlloc(HYPRE_Int,  current_num_elmts, HYPRE_MEMORY_HOST);
-   for (i=0; i < current_num_elmts; i++)
+   for (i = 0; i < current_num_elmts; i++)
    {
       us_real_proc_id[orig_order[i]] = real_proc_id[i];
    }
    hypre_TFree(real_proc_id, HYPRE_MEMORY_HOST);
 
    prev_id = -1;
-   for (i=0; i < current_num_elmts; i++)
+   for (i = 0; i < current_num_elmts; i++)
    {
       proc_id = us_real_proc_id[i];
       /* can't use row list[i] - you loose the negative signs that differentiate
@@ -955,29 +1052,30 @@ hypre_IJVectorAssembleOffProcValsPar( hypre_IJVector       *vector,
       indx = hypre_BinarySearch(ex_contact_procs, proc_id, num_real_procs);
       in =  ex_contact_vec_starts[indx];
 
-      index_ptr = (void *) ((char *) void_contact_buf + in*obj_size_bytes);
+      index_ptr = (void *) ((char *) void_contact_buf + in * obj_size_bytes);
 
       /* first time for this processor - add the number of rows to the buffer */
       if (in < 0)
       {
          in = -in - 1;
          /* re-calc. index_ptr since in_i was negative */
-         index_ptr = (void *) ((char *) void_contact_buf + in*obj_size_bytes);
+         index_ptr = (void *) ((char *) void_contact_buf + in * obj_size_bytes);
 
-         tmp_int =  num_rows_per_proc[indx];
-         hypre_TMemcpy( index_ptr,  &tmp_int,  HYPRE_Int, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
+         tmp_int = num_rows_per_proc[indx];
+         hypre_TMemcpy(index_ptr, &tmp_int,  HYPRE_Int, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
          index_ptr = (void *) ((char *) index_ptr + obj_size_bytes);
 
          in++;
       }
       /* add row # */
-      hypre_TMemcpy( index_ptr,  &row,  HYPRE_BigInt,1 , HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
+      hypre_TMemcpy(index_ptr, &row, HYPRE_BigInt, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
       index_ptr = (void *) ((char *) index_ptr + obj_size_bytes);
       in++;
 
       /* add value */
       tmp_complex = off_proc_data[i];
-      hypre_TMemcpy( index_ptr,  &tmp_complex, HYPRE_Complex, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
+      hypre_TMemcpy(index_ptr, &tmp_complex, HYPRE_Complex, 1,
+                    HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
       index_ptr = (void *) ((char *) index_ptr + obj_size_bytes);
       in++;
 
@@ -995,9 +1093,9 @@ hypre_IJVectorAssembleOffProcValsPar( hypre_IJVector       *vector,
    hypre_TFree(row_list, HYPRE_MEMORY_HOST);
    hypre_TFree(num_rows_per_proc, HYPRE_MEMORY_HOST);
 
-   for (i=num_real_procs; i > 0; i--)
+   for (i = num_real_procs; i > 0; i--)
    {
-      ex_contact_vec_starts[i] =   ex_contact_vec_starts[i-1];
+      ex_contact_vec_starts[i] =   ex_contact_vec_starts[i - 1];
    }
 
    ex_contact_vec_starts[0] = 0;
@@ -1024,7 +1122,7 @@ hypre_IJVectorAssembleOffProcValsPar( hypre_IJVector       *vector,
    send_proc_obj.vec_starts[0] = 0;
    send_proc_obj.element_storage_length = storage + 20;
    send_proc_obj.v_elements =
-      hypre_TAlloc(char, obj_size_bytes*send_proc_obj.element_storage_length, HYPRE_MEMORY_HOST);
+      hypre_TAlloc(char, obj_size_bytes * send_proc_obj.element_storage_length, HYPRE_MEMORY_HOST);
 
    response_obj2.fill_response = hypre_FillResponseIJOffProcVals;
    response_obj2.data1 = NULL;
@@ -1056,26 +1154,29 @@ hypre_IJVectorAssembleOffProcValsPar( hypre_IJVector       *vector,
    recv_starts = send_proc_obj.vec_starts;
 
    vector_data = hypre_VectorData(hypre_ParVectorLocalVector(par_vector));
-   first_index =  hypre_ParVectorFirstIndex(par_vector);
+   first_index = hypre_ParVectorFirstIndex(par_vector);
 
-   for (i=0; i < num_recvs; i++)
+   for (i = 0; i < num_recvs; i++)
    {
       indx = recv_starts[i];
 
       /* get the number of rows for  this recv */
-      hypre_TMemcpy( &row_count,  recv_data_ptr, HYPRE_Int, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
+      hypre_TMemcpy(&row_count, recv_data_ptr, HYPRE_Int, 1,
+                    HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
       recv_data_ptr = (void *) ((char *)recv_data_ptr + obj_size_bytes);
       indx++;
 
-      for (j=0; j < row_count; j++) /* for each row: unpack info */
+      for (j = 0; j < row_count; j++) /* for each row: unpack info */
       {
          /* row # */
-         hypre_TMemcpy( &row,  recv_data_ptr, HYPRE_BigInt, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
+         hypre_TMemcpy(&row, recv_data_ptr, HYPRE_BigInt, 1,
+                       HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
          recv_data_ptr = (void *) ((char *)recv_data_ptr + obj_size_bytes);
          indx++;
 
          /* value */
-         hypre_TMemcpy( &value,  recv_data_ptr, HYPRE_Complex, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
+         hypre_TMemcpy(&value, recv_data_ptr, HYPRE_Complex, 1,
+                       HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
          recv_data_ptr = (void *) ((char *)recv_data_ptr + obj_size_bytes);
          indx++;
 
@@ -1089,8 +1190,10 @@ hypre_IJVectorAssembleOffProcValsPar( hypre_IJVector       *vector,
             if (off_proc_nelm_recv_cur >= off_proc_nelm_recv_max)
             {
                off_proc_nelm_recv_max = 2 * (off_proc_nelm_recv_cur + 1);
-               off_proc_i_recv    = hypre_TReAlloc(off_proc_i_recv,    HYPRE_BigInt,  off_proc_nelm_recv_max, HYPRE_MEMORY_HOST);
-               off_proc_data_recv = hypre_TReAlloc(off_proc_data_recv, HYPRE_Complex, off_proc_nelm_recv_max, HYPRE_MEMORY_HOST);
+               off_proc_i_recv    = hypre_TReAlloc(off_proc_i_recv,    HYPRE_BigInt,  off_proc_nelm_recv_max,
+                                                   HYPRE_MEMORY_HOST);
+               off_proc_data_recv = hypre_TReAlloc(off_proc_data_recv, HYPRE_Complex, off_proc_nelm_recv_max,
+                                                   HYPRE_MEMORY_HOST);
             }
             off_proc_i_recv[off_proc_nelm_recv_cur] = row;
             off_proc_data_recv[off_proc_nelm_recv_cur] = value;
@@ -1109,8 +1212,9 @@ hypre_IJVectorAssembleOffProcValsPar( hypre_IJVector       *vector,
       hypre_TMemcpy(off_proc_data_recv_d, off_proc_data_recv, HYPRE_Complex, off_proc_nelm_recv_cur,
                     HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-      hypre_IJVectorSetAddValuesParDevice(vector, off_proc_nelm_recv_cur, off_proc_i_recv_d, off_proc_data_recv_d, "add");
+#if defined(HYPRE_USING_GPU)
+      hypre_IJVectorSetAddValuesParDevice(vector, off_proc_nelm_recv_cur, off_proc_i_recv_d,
+                                          off_proc_data_recv_d, "add");
 #endif
    }
 
@@ -1131,3 +1235,19 @@ hypre_IJVectorAssembleOffProcValsPar( hypre_IJVector       *vector,
 
    return hypre_error_flag;
 }
+
+/*--------------------------------------------------------------------------
+ * hypre_IJVectorMigrateParCSR
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_IJVectorMigrateParCSR(hypre_IJVector       *vector,
+                            HYPRE_MemoryLocation  memory_location)
+{
+   hypre_ParVector *par_vector = (hypre_ParVector *) hypre_IJVectorObject(vector);
+
+   /* Migrate the ParVector */
+   hypre_ParVectorMigrate(par_vector, memory_location);
+
+   return hypre_error_flag;
+}
diff --git a/external/hypre/src/IJ_mv/IJVector_parcsr_device.c b/external/hypre/src/IJ_mv/IJVector_parcsr_device.c
index a57bd936..39533da3 100644
--- a/external/hypre/src/IJ_mv/IJVector_parcsr_device.c
+++ b/external/hypre/src/IJ_mv/IJVector_parcsr_device.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -11,30 +11,282 @@
  *
  *****************************************************************************/
 
+#include "_hypre_onedpl.hpp"
 #include "_hypre_IJ_mv.h"
 #include "_hypre_utilities.hpp"
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
 
+/*--------------------------------------------------------------------
+ * hypre_IJVectorAssembleFunctor
+ *--------------------------------------------------------------------*/
+
+#if defined(HYPRE_USING_SYCL)
+template<typename T1, typename T2>
+struct hypre_IJVectorAssembleFunctor
+{
+   typedef std::tuple<T1, T2> Tuple;
+
+   __device__ Tuple operator() (const Tuple& x, const Tuple& y ) const
+   {
+      return std::make_tuple( hypre_max(std::get<0>(x), std::get<0>(y)),
+                              std::get<1>(x) + std::get<1>(y) );
+   }
+};
+#else
 template<typename T1, typename T2>
-struct hypre_IJVectorAssembleFunctor : public thrust::binary_function< thrust::tuple<T1, T2>, thrust::tuple<T1, T2>, thrust::tuple<T1, T2> >
+struct hypre_IJVectorAssembleFunctor : public
+   thrust::binary_function< thrust::tuple<T1, T2>, thrust::tuple<T1, T2>, thrust::tuple<T1, T2> >
 {
    typedef thrust::tuple<T1, T2> Tuple;
 
-   __device__ Tuple operator()(const Tuple& x, const Tuple& y )
+   __device__ Tuple operator() (const Tuple& x, const Tuple& y )
    {
-      return thrust::make_tuple( hypre_max(thrust::get<0>(x), thrust::get<0>(y)), thrust::get<1>(x) + thrust::get<1>(y) );
+      return thrust::make_tuple( hypre_max(thrust::get<0>(x), thrust::get<0>(y)),
+                                 thrust::get<1>(x) + thrust::get<1>(y) );
    }
 };
+#endif
+
+/*--------------------------------------------------------------------
+ * hypre_IJVectorAssembleSortAndReduce1
+ *
+ * helper routine used in hypre_IJVectorAssembleParCSRDevice:
+ *   1. sort (X0, A0) with key I0
+ *   2. for each segment in I0, zero out in A0 all before the last `set'
+ *   3. reduce A0 [with sum] and reduce X0 [with max]
+ *
+ * N0: input size; N1: size after reduction (<= N0)
+ * Note: (I1, X1, A1) are not resized to N1 but have size N0
+ *--------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_IJVectorAssembleSortAndReduce1( HYPRE_Int       N0,
+                                      HYPRE_BigInt   *I0,
+                                      char           *X0,
+                                      HYPRE_Complex  *A0,
+                                      HYPRE_Int      *N1,
+                                      HYPRE_BigInt  **I1,
+                                      char          **X1,
+                                      HYPRE_Complex **A1 )
+{
+#if defined(HYPRE_USING_SYCL)
+   auto zipped_begin = oneapi::dpl::make_zip_iterator(I0, X0, A0);
+   HYPRE_ONEDPL_CALL( std::stable_sort,
+                      zipped_begin, zipped_begin + N0,
+   [](auto lhs, auto rhs) { return std::get<0>(lhs) < std::get<0>(rhs); } );
+#else
+   HYPRE_THRUST_CALL( stable_sort_by_key,
+                      I0,
+                      I0 + N0,
+                      thrust::make_zip_iterator(thrust::make_tuple(X0, A0)) );
+#endif
+
+   HYPRE_BigInt  *I = hypre_TAlloc(HYPRE_BigInt,  N0, HYPRE_MEMORY_DEVICE);
+   char          *X = hypre_TAlloc(char,          N0, HYPRE_MEMORY_DEVICE);
+   HYPRE_Complex *A = hypre_TAlloc(HYPRE_Complex, N0, HYPRE_MEMORY_DEVICE);
+
+   /* output X: 0: keep, 1: zero-out */
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_ONEDPL_CALL( oneapi::dpl::exclusive_scan_by_segment,
+                      oneapi::dpl::make_reverse_iterator(I0 + N0), /* key begin */
+                      oneapi::dpl::make_reverse_iterator(I0),      /* key end */
+                      oneapi::dpl::make_reverse_iterator(X0 + N0), /* input value begin */
+                      oneapi::dpl::make_reverse_iterator(X + N0),  /* output value begin */
+                      char(0),                                     /* init */
+                      std::equal_to<HYPRE_BigInt>(),
+                      oneapi::dpl::maximum<char>() );
+
+   hypreSycl_transform_if(A0,
+                          A0 + N0,
+                          X,
+                          A0,
+   [] (const auto & x) {return 0.0;},
+   [] (const auto & x) {return x;} );
+
+   auto new_end = HYPRE_ONEDPL_CALL( oneapi::dpl::reduce_by_segment,
+                                     I0,                                                         /* keys_first */
+                                     I0 + N0,                                                    /* keys_last */
+                                     oneapi::dpl::make_zip_iterator(X0, A0),                     /* values_first */
+                                     I,                                                          /* keys_output */
+                                     oneapi::dpl::make_zip_iterator(X, A),                       /* values_output */
+                                     std::equal_to<HYPRE_BigInt>(),                              /* binary_pred */
+                                     hypre_IJVectorAssembleFunctor<char, HYPRE_Complex>()        /* binary_op */);
+#else
+   HYPRE_THRUST_CALL(
+      exclusive_scan_by_key,
+      thrust::make_reverse_iterator(thrust::device_pointer_cast<HYPRE_BigInt>(I0) + N0), /* key begin */
+      thrust::make_reverse_iterator(thrust::device_pointer_cast<HYPRE_BigInt>(I0)),      /* key end */
+      thrust::make_reverse_iterator(thrust::device_pointer_cast<char>(X0) +
+                                    N0),         /* input value begin */
+      thrust::make_reverse_iterator(thrust::device_pointer_cast<char>(X) +
+                                    N0),          /* output value begin */
+      char(0),                                                                           /* init */
+      thrust::equal_to<HYPRE_BigInt>(),
+      thrust::maximum<char>() );
+
+   HYPRE_THRUST_CALL(replace_if, A0, A0 + N0, X, thrust::identity<char>(), 0.0);
+
+   auto new_end = HYPRE_THRUST_CALL(
+                     reduce_by_key,
+                     I0,                                                              /* keys_first */
+                     I0 + N0,                                                         /* keys_last */
+                     thrust::make_zip_iterator(thrust::make_tuple(X0,      A0     )), /* values_first */
+                     I,                                                               /* keys_output */
+                     thrust::make_zip_iterator(thrust::make_tuple(X,       A      )), /* values_output */
+                     thrust::equal_to<HYPRE_BigInt>(),                                /* binary_pred */
+                     hypre_IJVectorAssembleFunctor<char, HYPRE_Complex>()             /* binary_op */);
+#endif
+
+   *N1 = new_end.first - I;
+   *I1 = I;
+   *X1 = X;
+   *A1 = A;
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------
+ * hypre_IJVectorAssembleSortAndReduce3
+ *--------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_IJVectorAssembleSortAndReduce3( HYPRE_Int      N0,
+                                      HYPRE_BigInt  *I0,
+                                      char          *X0,
+                                      HYPRE_Complex *A0,
+                                      HYPRE_Int     *N1 )
+{
+#if defined(HYPRE_USING_SYCL)
+   auto zipped_begin = oneapi::dpl::make_zip_iterator(I0, X0, A0);
+   HYPRE_ONEDPL_CALL( std::stable_sort,
+                      zipped_begin, zipped_begin + N0,
+   [](auto lhs, auto rhs) { return std::get<0>(lhs) < std::get<0>(rhs); } );
+#else
+   HYPRE_THRUST_CALL( stable_sort_by_key,
+                      I0,
+                      I0 + N0,
+                      thrust::make_zip_iterator(thrust::make_tuple(X0, A0)) );
+#endif
+
+   HYPRE_BigInt  *I = hypre_TAlloc(HYPRE_BigInt,  N0, HYPRE_MEMORY_DEVICE);
+   HYPRE_Complex *A = hypre_TAlloc(HYPRE_Complex, N0, HYPRE_MEMORY_DEVICE);
+
+   /* output in X0: 0: keep, 1: zero-out */
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_ONEDPL_CALL( oneapi::dpl::inclusive_scan_by_segment,
+                      oneapi::dpl::make_reverse_iterator(I0 + N0),      /* key begin */
+                      oneapi::dpl::make_reverse_iterator(I0),           /* key end */
+                      oneapi::dpl::make_reverse_iterator(X0 + N0),      /* input value begin */
+                      oneapi::dpl::make_reverse_iterator(X0 + N0),      /* output value begin */
+                      std::equal_to<HYPRE_BigInt>(),
+                      oneapi::dpl::maximum<char>() );
+
+   hypreSycl_transform_if(A0,
+                          A0 + N0,
+                          X0,
+                          A0,
+   [] (const auto & x) {return 0.0;},
+   [] (const auto & x) {return x;} );
+
+   auto new_end = HYPRE_ONEDPL_CALL( oneapi::dpl::reduce_by_segment,
+                                     I0,      /* keys_first */
+                                     I0 + N0, /* keys_last */
+                                     A0,      /* values_first */
+                                     I,       /* keys_output */
+                                     A );     /* values_output */
+#else
+   HYPRE_THRUST_CALL(
+      inclusive_scan_by_key,
+      thrust::make_reverse_iterator(thrust::device_pointer_cast<HYPRE_BigInt>(I0) + N0), /* key begin */
+      thrust::make_reverse_iterator(thrust::device_pointer_cast<HYPRE_BigInt>(I0)),      /* key end */
+      thrust::make_reverse_iterator(thrust::device_pointer_cast<char>(X0) +
+                                    N0),         /* input value begin */
+      thrust::make_reverse_iterator(thrust::device_pointer_cast<char>(X0) +
+                                    N0),         /* output value begin */
+      thrust::equal_to<HYPRE_BigInt>(),
+      thrust::maximum<char>() );
 
-HYPRE_Int hypre_IJVectorAssembleSortAndReduce3(HYPRE_Int N0, HYPRE_BigInt *I0, char *X0, HYPRE_Complex *A0, HYPRE_Int *N1);
+   HYPRE_THRUST_CALL(replace_if, A0, A0 + N0, X0, thrust::identity<char>(), 0.0);
+
+   auto new_end = HYPRE_THRUST_CALL(
+                     reduce_by_key,
+                     I0,      /* keys_first */
+                     I0 + N0, /* keys_last */
+                     A0,      /* values_first */
+                     I,       /* keys_output */
+                     A        /* values_output */);
+#endif
+
+   HYPRE_Int Nt = new_end.second - A;
+
+   hypre_assert(Nt <= N0);
+
+   /* remove numerical zeros */
+#if defined(HYPRE_USING_SYCL)
+   auto new_end2 = hypreSycl_copy_if( oneapi::dpl::make_zip_iterator(I, A),
+                                      oneapi::dpl::make_zip_iterator(I, A) + Nt,
+                                      A,
+                                      oneapi::dpl::make_zip_iterator(I0, A0),
+   [] (const auto & x) {return x;} );
+
+   *N1 = std::get<0>(new_end2.base()) - I0;
+#else
+   auto new_end2 = HYPRE_THRUST_CALL( copy_if,
+                                      thrust::make_zip_iterator(thrust::make_tuple(I, A)),
+                                      thrust::make_zip_iterator(thrust::make_tuple(I, A)) + Nt,
+                                      A,
+                                      thrust::make_zip_iterator(thrust::make_tuple(I0, A0)),
+                                      thrust::identity<HYPRE_Complex>() );
+
+   *N1 = thrust::get<0>(new_end2.get_iterator_tuple()) - I0;
+#endif
+
+   hypre_assert(*N1 <= Nt);
+
+   hypre_TFree(I, HYPRE_MEMORY_DEVICE);
+   hypre_TFree(A, HYPRE_MEMORY_DEVICE);
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------
+ * hypreGPUKernel_IJVectorAssemblePar
+ *
+ * y[map[i]-offset] = x[i] or y[map[i]] += x[i] depending on SorA,
+ * same index cannot appear more than once in map
+ *--------------------------------------------------------------------*/
+
+__global__ void
+hypreGPUKernel_IJVectorAssemblePar( hypre_DeviceItem &item,
+                                    HYPRE_Int         n,
+                                    HYPRE_Complex    *x,
+                                    HYPRE_BigInt     *map,
+                                    HYPRE_BigInt      offset,
+                                    char             *SorA,
+                                    HYPRE_Complex    *y )
+{
+   HYPRE_Int i = hypre_gpu_get_grid_thread_id<1, 1>(item);
+
+   if (i >= n)
+   {
+      return;
+   }
 
-HYPRE_Int hypre_IJVectorAssembleSortAndReduce1(HYPRE_Int N0, HYPRE_BigInt *I0, char *X0, HYPRE_Complex *A0, HYPRE_Int *N1, HYPRE_BigInt **I1, char **X1, HYPRE_Complex **A1 );
+   if (SorA[i])
+   {
+      y[map[i] - offset] = x[i];
+   }
+   else
+   {
+      y[map[i] - offset] += x[i];
+   }
+}
 
-__global__ void hypreCUDAKernel_IJVectorAssemblePar(HYPRE_Int n, HYPRE_Complex *x, HYPRE_BigInt *map, HYPRE_BigInt offset, char *SorA, HYPRE_Complex *y);
+/*--------------------------------------------------------------------
+ * hypre_IJVectorSetAddValuesParDevice
+ *--------------------------------------------------------------------*/
 
-/*
- */
 HYPRE_Int
 hypre_IJVectorSetAddValuesParDevice(hypre_IJVector       *vector,
                                     HYPRE_Int             num_values,
@@ -42,12 +294,17 @@ hypre_IJVectorSetAddValuesParDevice(hypre_IJVector       *vector,
                                     const HYPRE_Complex  *values,
                                     const char           *action)
 {
-   HYPRE_BigInt *IJpartitioning = hypre_IJVectorPartitioning(vector);
-   HYPRE_BigInt  vec_start, vec_stop;
-   vec_start = IJpartitioning[0];
-   vec_stop  = IJpartitioning[1]-1;
-   HYPRE_Int nrows = vec_stop - vec_start + 1;
-   const char SorA = action[0] == 's' ? 1 : 0;
+   HYPRE_BigInt    *IJpartitioning = hypre_IJVectorPartitioning(vector);
+   HYPRE_BigInt     vec_start      = IJpartitioning[0];
+
+   hypre_ParVector *par_vector     = (hypre_ParVector*) hypre_IJVectorObject(vector);
+   hypre_Vector    *local_vector   = hypre_ParVectorLocalVector(par_vector);
+   HYPRE_Int        size           = hypre_VectorSize(local_vector);
+   HYPRE_Int        num_vectors    = hypre_VectorNumVectors(local_vector);
+   HYPRE_Int        component      = hypre_VectorComponent(local_vector);
+   HYPRE_Int        vecstride      = hypre_VectorVectorStride(local_vector);
+
+   const char       SorA           = action[0] == 's' ? 1 : 0;
 
    if (num_values <= 0)
    {
@@ -57,11 +314,14 @@ hypre_IJVectorSetAddValuesParDevice(hypre_IJVector       *vector,
    /* this is a special use to set/add local values */
    if (!indices)
    {
-      hypre_ParVector *par_vector = (hypre_ParVector*) hypre_IJVectorObject(vector);
-      hypre_Vector    *local_vector = hypre_ParVectorLocalVector(par_vector);
-      HYPRE_Int        num_values2 = hypre_min( hypre_VectorSize(local_vector), num_values );
-      HYPRE_BigInt    *indices2 = hypre_TAlloc(HYPRE_BigInt, num_values2, HYPRE_MEMORY_DEVICE);
+      HYPRE_Int     num_values2 = hypre_min(size, num_values);
+      HYPRE_BigInt *indices2    = hypre_TAlloc(HYPRE_BigInt, num_values2, HYPRE_MEMORY_DEVICE);
+
+#if defined(HYPRE_USING_SYCL)
+      hypreSycl_sequence(indices2, indices2 + num_values2, vec_start);
+#else
       HYPRE_THRUST_CALL(sequence, indices2, indices2 + num_values2, vec_start);
+#endif
 
       hypre_IJVectorSetAddValuesParDevice(vector, num_values2, indices2, values, action);
 
@@ -83,33 +343,53 @@ hypre_IJVectorSetAddValuesParDevice(hypre_IJVector       *vector,
    HYPRE_Int      stack_elmts_current  = hypre_AuxParVectorCurrentStackElmts(aux_vector);
    HYPRE_Int      stack_elmts_required = stack_elmts_current + num_values;
    HYPRE_BigInt  *stack_i              = hypre_AuxParVectorStackI(aux_vector);
+   HYPRE_BigInt  *stack_voff           = hypre_AuxParVectorStackVoff(aux_vector);
    HYPRE_Complex *stack_data           = hypre_AuxParVectorStackData(aux_vector);
    char          *stack_sora           = hypre_AuxParVectorStackSorA(aux_vector);
 
-   if ( stack_elmts_max < stack_elmts_required )
+   if (stack_elmts_max < stack_elmts_required)
    {
-      HYPRE_Int stack_elmts_max_new = nrows * hypre_AuxParVectorInitAllocFactor(aux_vector);
+      HYPRE_Int stack_elmts_max_new = size * hypre_AuxParVectorInitAllocFactor(aux_vector);
+
       if (hypre_AuxParVectorUsrOffProcElmts(aux_vector) >= 0)
       {
          stack_elmts_max_new += hypre_AuxParVectorUsrOffProcElmts(aux_vector);
       }
-      stack_elmts_max_new = hypre_max(stack_elmts_max * hypre_AuxParVectorGrowFactor(aux_vector), stack_elmts_max_new);
+      stack_elmts_max_new = hypre_max(stack_elmts_max * hypre_AuxParVectorGrowFactor(aux_vector),
+                                      stack_elmts_max_new);
       stack_elmts_max_new = hypre_max(stack_elmts_required, stack_elmts_max_new);
 
-      hypre_AuxParVectorStackI(aux_vector)    = stack_i    =
-         hypre_TReAlloc_v2(stack_i,    HYPRE_BigInt,  stack_elmts_max, HYPRE_BigInt,  stack_elmts_max_new, HYPRE_MEMORY_DEVICE);
-      hypre_AuxParVectorStackData(aux_vector) = stack_data =
-         hypre_TReAlloc_v2(stack_data, HYPRE_Complex, stack_elmts_max, HYPRE_Complex, stack_elmts_max_new, HYPRE_MEMORY_DEVICE);
-      hypre_AuxParVectorStackSorA(aux_vector) = stack_sora =
-         hypre_TReAlloc_v2(stack_sora,          char, stack_elmts_max,          char, stack_elmts_max_new, HYPRE_MEMORY_DEVICE);
+      stack_i    = hypre_TReAlloc_v2(stack_i,     HYPRE_BigInt, stack_elmts_max,  HYPRE_BigInt,
+                                     stack_elmts_max_new, HYPRE_MEMORY_DEVICE);
+      stack_data = hypre_TReAlloc_v2(stack_data, HYPRE_Complex, stack_elmts_max, HYPRE_Complex,
+                                     stack_elmts_max_new, HYPRE_MEMORY_DEVICE);
+      stack_sora = hypre_TReAlloc_v2(stack_sora,          char, stack_elmts_max,          char,
+                                     stack_elmts_max_new, HYPRE_MEMORY_DEVICE);
 
+      if (num_vectors > 1)
+      {
+         stack_voff = hypre_TReAlloc_v2(stack_voff, HYPRE_BigInt, stack_elmts_max, HYPRE_BigInt,
+                                        stack_elmts_max_new, HYPRE_MEMORY_DEVICE);
+      }
+
+      hypre_AuxParVectorStackI(aux_vector)        = stack_i;
+      hypre_AuxParVectorStackVoff(aux_vector)     = stack_voff;
+      hypre_AuxParVectorStackData(aux_vector)     = stack_data;
+      hypre_AuxParVectorStackSorA(aux_vector)     = stack_sora;
       hypre_AuxParVectorMaxStackElmts(aux_vector) = stack_elmts_max_new;
    }
 
-   HYPRE_THRUST_CALL(fill_n, stack_sora + stack_elmts_current, num_values, SorA);
+   hypreDevice_CharFilln(stack_sora + stack_elmts_current, num_values, SorA);
+   if (num_vectors > 1)
+   {
+      hypreDevice_BigIntFilln(stack_voff + stack_elmts_current, num_values,
+                              (HYPRE_BigInt) component * vecstride);
+   }
 
-   hypre_TMemcpy(stack_i    + stack_elmts_current, indices, HYPRE_BigInt,  num_values, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
-   hypre_TMemcpy(stack_data + stack_elmts_current, values,  HYPRE_Complex, num_values, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+   hypre_TMemcpy(stack_i    + stack_elmts_current, indices, HYPRE_BigInt,  num_values,
+                 HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+   hypre_TMemcpy(stack_data + stack_elmts_current, values,  HYPRE_Complex, num_values,
+                 HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
 
    hypre_AuxParVectorCurrentStackElmts(aux_vector) += num_values;
 
@@ -117,20 +397,22 @@ hypre_IJVectorSetAddValuesParDevice(hypre_IJVector       *vector,
 }
 
 /******************************************************************************
- *
- *
+ * hypre_IJVectorAssembleParDevice
  *****************************************************************************/
 
 HYPRE_Int
 hypre_IJVectorAssembleParDevice(hypre_IJVector *vector)
 {
-   MPI_Comm comm = hypre_IJVectorComm(vector);
-   HYPRE_BigInt *IJpartitioning = hypre_IJVectorPartitioning(vector);
-   HYPRE_BigInt  vec_start, vec_stop;
-   vec_start = IJpartitioning[0];
-   vec_stop  = IJpartitioning[1]-1;
-   hypre_ParVector *par_vector = (hypre_ParVector*) hypre_IJVectorObject(vector);
-   hypre_AuxParVector *aux_vector = (hypre_AuxParVector*) hypre_IJVectorTranslator(vector);
+   MPI_Comm            comm           = hypre_IJVectorComm(vector);
+   hypre_ParVector    *par_vector     = (hypre_ParVector*) hypre_IJVectorObject(vector);
+   hypre_AuxParVector *aux_vector     = (hypre_AuxParVector*) hypre_IJVectorTranslator(vector);
+   HYPRE_BigInt       *IJpartitioning = hypre_IJVectorPartitioning(vector);
+   HYPRE_BigInt        vec_start      = IJpartitioning[0];
+   HYPRE_BigInt        vec_stop       = IJpartitioning[1] - 1;
+
+   hypre_Vector       *local_vector   = hypre_ParVectorLocalVector(par_vector);
+   HYPRE_Int           num_vectors    = hypre_VectorNumVectors(local_vector);
+   HYPRE_Complex      *data           = hypre_VectorData(local_vector);
 
    if (!aux_vector)
    {
@@ -144,11 +426,16 @@ hypre_IJVectorAssembleParDevice(hypre_IJVector *vector)
 
    HYPRE_Int      nelms      = hypre_AuxParVectorCurrentStackElmts(aux_vector);
    HYPRE_BigInt  *stack_i    = hypre_AuxParVectorStackI(aux_vector);
+   HYPRE_BigInt  *stack_voff = hypre_AuxParVectorStackVoff(aux_vector);
    HYPRE_Complex *stack_data = hypre_AuxParVectorStackData(aux_vector);
    char          *stack_sora = hypre_AuxParVectorStackSorA(aux_vector);
 
    in_range<HYPRE_BigInt> pred(vec_start, vec_stop);
-   HYPRE_Int nelms_on = HYPRE_THRUST_CALL(count_if, stack_i, stack_i+nelms, pred);
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_Int nelms_on = HYPRE_ONEDPL_CALL(std::count_if, stack_i, stack_i + nelms, pred);
+#else
+   HYPRE_Int nelms_on = HYPRE_THRUST_CALL(count_if, stack_i, stack_i + nelms, pred);
+#endif
    HYPRE_Int nelms_off = nelms - nelms_on;
    HYPRE_Int nelms_off_max;
    hypre_MPI_Allreduce(&nelms_off, &nelms_off_max, 1, HYPRE_MPI_INT, hypre_MPI_MAX, comm);
@@ -160,6 +447,13 @@ hypre_IJVectorAssembleParDevice(hypre_IJVector *vector)
       HYPRE_BigInt  *off_proc_i    = NULL;
       HYPRE_Complex *off_proc_data = NULL;
 
+      if (num_vectors > 1)
+      {
+         hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                           "Off proc IJVectorAssembleParDevice not implemented for multivectors!\n");
+         return hypre_error_flag;
+      }
+
       if (nelms_off)
       {
          /* copy off-proc entries out of stack and remove from stack */
@@ -168,27 +462,53 @@ hypre_IJVectorAssembleParDevice(hypre_IJVector *vector)
          char *off_proc_sora = hypre_TAlloc(char,          nelms_off, HYPRE_MEMORY_DEVICE);
          char *is_on_proc    = hypre_TAlloc(char,          nelms,     HYPRE_MEMORY_DEVICE);
 
+#if defined(HYPRE_USING_SYCL)
+         HYPRE_ONEDPL_CALL(std::transform, stack_i, stack_i + nelms, is_on_proc, pred);
+         auto zip_in = oneapi::dpl::make_zip_iterator(stack_i, stack_data, stack_sora);
+         auto zip_out = oneapi::dpl::make_zip_iterator(off_proc_i, off_proc_data, off_proc_sora);
+         auto new_end1 = hypreSycl_copy_if( zip_in,  /* first */
+                                            zip_in + nelms, /* last */
+                                            is_on_proc, /* stencil */
+                                            zip_out, /* result */
+         [] (const auto & x) {return !x;} );
+
+         hypre_assert(std::get<0>(new_end1.base()) - off_proc_i == nelms_off);
+
+         /* remove off-proc entries from stack */
+         auto new_end2 = hypreSycl_remove_if( zip_in,         /* first */
+                                              zip_in + nelms, /* last */
+                                              is_on_proc,     /* stencil */
+         [] (const auto & x) {return !x;} );
+
+         hypre_assert(std::get<0>(new_end2.base()) - stack_i == nelms_on);
+#else
          HYPRE_THRUST_CALL(transform, stack_i, stack_i + nelms, is_on_proc, pred);
 
          auto new_end1 = HYPRE_THRUST_CALL(
-               copy_if,
-               thrust::make_zip_iterator(thrust::make_tuple(stack_i,         stack_data,         stack_sora        )),  /* first */
-               thrust::make_zip_iterator(thrust::make_tuple(stack_i + nelms, stack_data + nelms, stack_sora + nelms)),  /* last */
-               is_on_proc,                                                                                              /* stencil */
-               thrust::make_zip_iterator(thrust::make_tuple(off_proc_i,      off_proc_data,      off_proc_sora)),       /* result */
-               thrust::not1(thrust::identity<char>()) );
+                            copy_if,
+                            thrust::make_zip_iterator(thrust::make_tuple(stack_i,         stack_data,
+                                                                         stack_sora        )),  /* first */
+                            thrust::make_zip_iterator(thrust::make_tuple(stack_i + nelms, stack_data + nelms,
+                                                                         stack_sora + nelms)),  /* last */
+                            is_on_proc,                                                         /* stencil */
+                            thrust::make_zip_iterator(thrust::make_tuple(off_proc_i,      off_proc_data,
+                                                                         off_proc_sora)),       /* result */
+                            HYPRE_THRUST_NOT(thrust::identity<char>()) );
 
          hypre_assert(thrust::get<0>(new_end1.get_iterator_tuple()) - off_proc_i == nelms_off);
 
          /* remove off-proc entries from stack */
          auto new_end2 = HYPRE_THRUST_CALL(
-               remove_if,
-               thrust::make_zip_iterator(thrust::make_tuple(stack_i,         stack_data,         stack_sora        )),  /* first */
-               thrust::make_zip_iterator(thrust::make_tuple(stack_i + nelms, stack_data + nelms, stack_sora + nelms)),  /* last */
-               is_on_proc,                                                                                              /* stencil */
-               thrust::not1(thrust::identity<char>()) );
+                            remove_if,
+                            thrust::make_zip_iterator(thrust::make_tuple(stack_i,         stack_data,
+                                                                         stack_sora        )),  /* first */
+                            thrust::make_zip_iterator(thrust::make_tuple(stack_i + nelms, stack_data + nelms,
+                                                                         stack_sora + nelms)),  /* last */
+                            is_on_proc,                                                         /* stencil */
+                            HYPRE_THRUST_NOT(thrust::identity<char>()) );
 
          hypre_assert(thrust::get<0>(new_end2.get_iterator_tuple()) - stack_i == nelms_on);
+#endif
 
          hypre_AuxParVectorCurrentStackElmts(aux_vector) = nelms_on;
 
@@ -201,7 +521,8 @@ hypre_IJVectorAssembleParDevice(hypre_IJVector *vector)
       }
 
       /* send off_proc_i/data to remote processes and the receivers call addtovalues */
-      hypre_IJVectorAssembleOffProcValsPar(vector, -1, new_nnz, HYPRE_MEMORY_DEVICE, off_proc_i, off_proc_data);
+      hypre_IJVectorAssembleOffProcValsPar(vector, -1, new_nnz, HYPRE_MEMORY_DEVICE,
+                                           off_proc_i, off_proc_data);
 
       hypre_TFree(off_proc_i,    HYPRE_MEMORY_DEVICE);
       hypre_TFree(off_proc_data, HYPRE_MEMORY_DEVICE);
@@ -211,12 +532,17 @@ hypre_IJVectorAssembleParDevice(hypre_IJVector *vector)
     * so must get the size and the pointers again */
    nelms      = hypre_AuxParVectorCurrentStackElmts(aux_vector);
    stack_i    = hypre_AuxParVectorStackI(aux_vector);
+   stack_voff = hypre_AuxParVectorStackVoff(aux_vector);
    stack_data = hypre_AuxParVectorStackData(aux_vector);
    stack_sora = hypre_AuxParVectorStackSorA(aux_vector);
 
 #ifdef HYPRE_DEBUG
    /* the stack should only have on-proc elements now */
-   HYPRE_Int tmp = HYPRE_THRUST_CALL(count_if, stack_i, stack_i+nelms, pred);
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_Int tmp = HYPRE_ONEDPL_CALL(std::count_if, stack_i, stack_i + nelms, pred);
+#else
+   HYPRE_Int tmp = HYPRE_THRUST_CALL(count_if, stack_i, stack_i + nelms, pred);
+#endif
    hypre_assert(nelms == tmp);
 #endif
 
@@ -227,14 +553,23 @@ hypre_IJVectorAssembleParDevice(hypre_IJVector *vector)
       HYPRE_Complex *new_data;
       char          *new_sora;
 
+      /* Shift stack_i with multivector component offsets */
+      if (num_vectors > 1)
+      {
+         hypreDevice_BigIntAxpyn(stack_voff, nelms, stack_i, stack_i, 1);
+      }
+
       /* sort and reduce */
-      hypre_IJVectorAssembleSortAndReduce1(nelms, stack_i, stack_sora, stack_data, &new_nnz, &new_i, &new_sora, &new_data);
+      hypre_IJVectorAssembleSortAndReduce1(nelms, stack_i, stack_sora, stack_data,
+                                           &new_nnz, &new_i, &new_sora, &new_data);
 
       /* set/add to local vector */
-      dim3 bDim = hypre_GetDefaultCUDABlockDimension();
-      dim3 gDim = hypre_GetDefaultCUDAGridDimension(new_nnz, "thread", bDim);
-      HYPRE_CUDA_LAUNCH( hypreCUDAKernel_IJVectorAssemblePar, gDim, bDim, new_nnz, new_data, new_i, vec_start, new_sora,
-                         hypre_VectorData(hypre_ParVectorLocalVector(par_vector)) );
+      dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+      dim3 gDim = hypre_GetDefaultDeviceGridDimension(new_nnz, "thread", bDim);
+      HYPRE_GPU_LAUNCH( hypreGPUKernel_IJVectorAssemblePar, gDim, bDim,
+                        new_nnz, new_data, new_i,
+                        vec_start, new_sora,
+                        data );
 
       hypre_TFree(new_i,    HYPRE_MEMORY_DEVICE);
       hypre_TFree(new_data, HYPRE_MEMORY_DEVICE);
@@ -247,131 +582,83 @@ hypre_IJVectorAssembleParDevice(hypre_IJVector *vector)
    return hypre_error_flag;
 }
 
-/* helper routine used in hypre_IJVectorAssembleParCSRDevice:
- * 1. sort (X0, A0) with key I0
- * 2. for each segment in I0, zero out in A0 all before the last `set'
- * 3. reduce A0 [with sum] and reduce X0 [with max]
- * N0: input size; N1: size after reduction (<= N0)
- * Note: (I1, X1, A1) are not resized to N1 but have size N0
- */
-HYPRE_Int
-hypre_IJVectorAssembleSortAndReduce1(HYPRE_Int  N0, HYPRE_BigInt  *I0, char  *X0, HYPRE_Complex  *A0,
-                                     HYPRE_Int *N1, HYPRE_BigInt **I1, char **X1, HYPRE_Complex **A1 )
+__global__ void
+hypreCUDAKernel_IJVectorUpdateValues( hypre_DeviceItem    &item,
+                                      HYPRE_Int            n,
+                                      const HYPRE_Complex *x,
+                                      const HYPRE_BigInt  *indices,
+                                      HYPRE_BigInt         start,
+                                      HYPRE_BigInt         stop,
+                                      HYPRE_Int            action,
+                                      HYPRE_Complex       *y )
 {
-   HYPRE_THRUST_CALL( stable_sort_by_key,
-                      I0,
-                      I0 + N0,
-                      thrust::make_zip_iterator(thrust::make_tuple(X0, A0)) );
+   HYPRE_Int i = hypre_gpu_get_grid_thread_id<1, 1>(item);
 
-   HYPRE_BigInt  *I = hypre_TAlloc(HYPRE_BigInt,  N0, HYPRE_MEMORY_DEVICE);
-   char          *X = hypre_TAlloc(char,          N0, HYPRE_MEMORY_DEVICE);
-   HYPRE_Complex *A = hypre_TAlloc(HYPRE_Complex, N0, HYPRE_MEMORY_DEVICE);
-
-   /* output X: 0: keep, 1: zero-out */
-   HYPRE_THRUST_CALL(
-         exclusive_scan_by_key,
-         make_reverse_iterator(thrust::device_pointer_cast<HYPRE_BigInt>(I0)+N0),  /* key begin */
-         make_reverse_iterator(thrust::device_pointer_cast<HYPRE_BigInt>(I0)),     /* key end */
-         make_reverse_iterator(thrust::device_pointer_cast<char>(X0)+N0),          /* input value begin */
-         make_reverse_iterator(thrust::device_pointer_cast<char>(X) +N0),          /* output value begin */
-         char(0),                                                                  /* init */
-         thrust::equal_to<HYPRE_BigInt>(),
-         thrust::maximum<char>() );
+   if (i >= n)
+   {
+      return;
+   }
 
-   HYPRE_THRUST_CALL(replace_if, A0, A0 + N0, X, thrust::identity<char>(), 0.0);
+   HYPRE_Int j;
 
-   auto new_end = HYPRE_THRUST_CALL(
-         reduce_by_key,
-         I0,                                                              /* keys_first */
-         I0 + N0,                                                         /* keys_last */
-         thrust::make_zip_iterator(thrust::make_tuple(X0,      A0     )), /* values_first */
-         I,                                                               /* keys_output */
-         thrust::make_zip_iterator(thrust::make_tuple(X,       A      )), /* values_output */
-         thrust::equal_to<HYPRE_BigInt>(),                                /* binary_pred */
-         hypre_IJVectorAssembleFunctor<char, HYPRE_Complex>()             /* binary_op */);
+   if (indices)
+   {
+      j = (HYPRE_Int) (read_only_load(&indices[i]) - start);
+   }
+   else
+   {
+      j = i;
+   }
 
-   *N1 = new_end.first - I;
-   *I1 = I;
-   *X1 = X;
-   *A1 = A;
+   if (j < 0 || j > (HYPRE_Int) (stop - start))
+   {
+      return;
+   }
 
-   return hypre_error_flag;
+   if (action)
+   {
+      y[j] = x[i];
+   }
+   else
+   {
+      y[j] += x[i];
+   }
 }
 
 HYPRE_Int
-hypre_IJVectorAssembleSortAndReduce3(HYPRE_Int  N0, HYPRE_BigInt  *I0, char *X0, HYPRE_Complex  *A0,
-                                     HYPRE_Int *N1)
+hypre_IJVectorUpdateValuesDevice( hypre_IJVector      *vector,
+                                  HYPRE_Int            num_values,
+                                  const HYPRE_BigInt  *indices,
+                                  const HYPRE_Complex *values,
+                                  HYPRE_Int            action)
 {
-   HYPRE_THRUST_CALL( stable_sort_by_key,
-                      I0,
-                      I0 + N0,
-                      thrust::make_zip_iterator(thrust::make_tuple(X0, A0)) );
-
-   HYPRE_BigInt  *I = hypre_TAlloc(HYPRE_BigInt,  N0, HYPRE_MEMORY_DEVICE);
-   HYPRE_Complex *A = hypre_TAlloc(HYPRE_Complex, N0, HYPRE_MEMORY_DEVICE);
-
-   /* output in X0: 0: keep, 1: zero-out */
-   HYPRE_THRUST_CALL(
-         inclusive_scan_by_key,
-         make_reverse_iterator(thrust::device_pointer_cast<HYPRE_BigInt>(I0)+N0), /* key begin */
-         make_reverse_iterator(thrust::device_pointer_cast<HYPRE_BigInt>(I0)),    /* key end */
-         make_reverse_iterator(thrust::device_pointer_cast<char>(X0)+N0),         /* input value begin */
-         make_reverse_iterator(thrust::device_pointer_cast<char>(X0)+N0),         /* output value begin */
-         thrust::equal_to<HYPRE_BigInt>(),
-         thrust::maximum<char>() );
-
-   HYPRE_THRUST_CALL(replace_if, A0, A0 + N0, X0, thrust::identity<char>(), 0.0);
-
-   auto new_end = HYPRE_THRUST_CALL(
-         reduce_by_key,
-         I0,      /* keys_first */
-         I0 + N0, /* keys_last */
-         A0,      /* values_first */
-         I,       /* keys_output */
-         A        /* values_output */);
-
-   HYPRE_Int Nt = new_end.second - A;
+   HYPRE_BigInt *IJpartitioning = hypre_IJVectorPartitioning(vector);
+   HYPRE_BigInt  vec_start = IJpartitioning[0];
+   HYPRE_BigInt  vec_stop  = IJpartitioning[1] - 1;
 
-   hypre_assert(Nt <= N0);
+   if (!indices)
+   {
+      num_values = vec_stop - vec_start + 1;
+   }
 
-   /* remove numerical zeros */
-   auto new_end2 = HYPRE_THRUST_CALL( copy_if,
-                                      thrust::make_zip_iterator(thrust::make_tuple(I, A)),
-                                      thrust::make_zip_iterator(thrust::make_tuple(I, A)) + Nt,
-                                      A,
-                                      thrust::make_zip_iterator(thrust::make_tuple(I0, A0)),
-                                      thrust::identity<HYPRE_Complex>() );
+   if (num_values <= 0)
+   {
+      return hypre_error_flag;
+   }
 
-   *N1 = thrust::get<0>(new_end2.get_iterator_tuple()) - I0;
+   /* set/add to local vector */
+   dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+   dim3 gDim = hypre_GetDefaultDeviceGridDimension(num_values, "thread", bDim);
 
-   hypre_assert(*N1 <= Nt);
+   hypre_ParVector *par_vector = (hypre_ParVector*) hypre_IJVectorObject(vector);
 
-   hypre_TFree(I, HYPRE_MEMORY_DEVICE);
-   hypre_TFree(A, HYPRE_MEMORY_DEVICE);
+   HYPRE_GPU_LAUNCH( hypreCUDAKernel_IJVectorUpdateValues,
+                     gDim, bDim,
+                     num_values, values, indices,
+                     vec_start, vec_stop, action,
+                     hypre_VectorData(hypre_ParVectorLocalVector(par_vector)) );
 
    return hypre_error_flag;
 }
 
-/* y[map[i]-offset] = x[i] or y[map[i]] += x[i] depending on SorA,
- * same index cannot appear more than once in map */
-__global__ void
-hypreCUDAKernel_IJVectorAssemblePar(HYPRE_Int n, HYPRE_Complex *x, HYPRE_BigInt *map, HYPRE_BigInt offset, char *SorA, HYPRE_Complex *y)
-{
-   HYPRE_Int i = hypre_cuda_get_grid_thread_id<1,1>();
-
-   if (i >= n)
-   {
-      return;
-   }
-
-   if (SorA[i])
-   {
-      y[map[i]-offset] = x[i];
-   }
-   else
-   {
-      y[map[i]-offset] += x[i];
-   }
-}
-
 #endif
diff --git a/external/hypre/src/IJ_mv/IJ_assumed_part.c b/external/hypre/src/IJ_mv/IJ_assumed_part.c
index c818ac7d..a0185517 100644
--- a/external/hypre/src/IJ_mv/IJ_assumed_part.c
+++ b/external/hypre/src/IJ_mv/IJ_assumed_part.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -39,7 +39,7 @@ hypre_IJMatrixCreateAssumedPartition( hypre_IJMatrix *matrix)
 
    /* find out my actual range of rows and rowumns */
    row_start = row_partitioning[0];
-   row_end = row_partitioning[1]-1;
+   row_end = row_partitioning[1] - 1;
    hypre_MPI_Comm_rank(comm, &myid );
 
    /* allocate space */
@@ -51,7 +51,7 @@ hypre_IJMatrixCreateAssumedPartition( hypre_IJMatrix *matrix)
       which needs it for matvec multiplications and therefore needs to do it for
       the col partitioning */
    hypre_GetAssumedPartitionRowRange( comm, myid, global_first_row,
-			global_num_rows, &(apart->row_start), &(apart->row_end));
+                                      global_num_rows, &(apart->row_start), &(apart->row_end));
 
    /*allocate some space for the partition of the assumed partition */
    apart->length = 0;
@@ -63,7 +63,7 @@ hypre_IJMatrixCreateAssumedPartition( hypre_IJMatrix *matrix)
 
    /* now we want to reconcile our actual partition with the assumed partition */
    hypre_LocateAssumedPartition(comm, row_start, row_end, global_first_row,
-                                 global_num_rows, apart, myid);
+                                global_num_rows, apart, myid);
 
    /* this partition will be saved in the matrix data structure until the matrix is destroyed */
    hypre_IJMatrixAssumedPart(matrix) = apart;
@@ -85,12 +85,11 @@ hypre_IJMatrixCreateAssumedPartition( hypre_IJMatrix *matrix)
 HYPRE_Int
 hypre_IJVectorCreateAssumedPartition( hypre_IJVector *vector)
 {
-   HYPRE_BigInt global_num, global_first_row;
-   HYPRE_Int myid;
-   HYPRE_Int  start=0, end=0;
+   HYPRE_BigInt  global_num, global_first_row;
+   HYPRE_Int     myid;
+   HYPRE_BigInt  start, end;
    HYPRE_BigInt *partitioning = hypre_IJVectorPartitioning(vector);
-
-   MPI_Comm   comm;
+   MPI_Comm      comm;
 
    hypre_IJAssumedPart *apart;
 
@@ -99,13 +98,13 @@ hypre_IJVectorCreateAssumedPartition( hypre_IJVector *vector)
    comm = hypre_ParVectorComm(vector);
 
    /* find out my actualy range of rows */
-   start =  partitioning[0];
-   end = partitioning[1]-1;
+   start = partitioning[0];
+   end   = partitioning[1] - 1;
 
-   hypre_MPI_Comm_rank(comm, &myid );
+   hypre_MPI_Comm_rank(comm, &myid);
 
    /* allocate space */
-   apart = hypre_CTAlloc(hypre_IJAssumedPart,  1, HYPRE_MEMORY_HOST);
+   apart = hypre_CTAlloc(hypre_IJAssumedPart, 1, HYPRE_MEMORY_HOST);
 
    /* get my assumed partitioning  - we want partitioning of the vector that the
       matrix multiplies - so we use the col start and end */
@@ -116,9 +115,9 @@ hypre_IJVectorCreateAssumedPartition( hypre_IJVector *vector)
    apart->length = 0;
    /*room for 10 owners of the assumed partition*/
    apart->storage_length = 10; /*need to be >=1 */
-   apart->proc_list = hypre_TAlloc(HYPRE_Int,  apart->storage_length, HYPRE_MEMORY_HOST);
-   apart->row_start_list =   hypre_TAlloc(HYPRE_BigInt,  apart->storage_length, HYPRE_MEMORY_HOST);
-   apart->row_end_list =   hypre_TAlloc(HYPRE_BigInt,  apart->storage_length, HYPRE_MEMORY_HOST);
+   apart->proc_list      = hypre_TAlloc(HYPRE_Int, apart->storage_length, HYPRE_MEMORY_HOST);
+   apart->row_start_list = hypre_TAlloc(HYPRE_BigInt, apart->storage_length, HYPRE_MEMORY_HOST);
+   apart->row_end_list   = hypre_TAlloc(HYPRE_BigInt, apart->storage_length, HYPRE_MEMORY_HOST);
 
    /* now we want to reconcile our actual partition with the assumed partition */
    hypre_LocateAssumedPartition(comm, start, end, global_first_row,
diff --git a/external/hypre/src/IJ_mv/IJ_matrix.h b/external/hypre/src/IJ_mv/IJ_matrix.h
index a1265112..c2de468c 100644
--- a/external/hypre/src/IJ_mv/IJ_matrix.h
+++ b/external/hypre/src/IJ_mv/IJ_matrix.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -64,7 +64,7 @@ typedef struct hypre_IJMatrix_struct
 #define hypre_IJMatrixOMPFlag(matrix)          ((matrix) -> omp_flag)
 #define hypre_IJMatrixPrintLevel(matrix)       ((matrix) -> print_level)
 
-static inline HYPRE_MemoryLocation
+static inline HYPRE_MAYBE_UNUSED_FUNC HYPRE_MemoryLocation
 hypre_IJMatrixMemoryLocation(hypre_IJMatrix *matrix)
 {
    if ( hypre_IJMatrixObject(matrix) && hypre_IJMatrixObjectType(matrix) == HYPRE_PARCSR)
diff --git a/external/hypre/src/IJ_mv/IJ_vector.h b/external/hypre/src/IJ_mv/IJ_vector.h
index 9da2ce86..760d9eda 100644
--- a/external/hypre/src/IJ_mv/IJ_vector.h
+++ b/external/hypre/src/IJ_mv/IJ_vector.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -21,23 +21,16 @@
 typedef struct hypre_IJVector_struct
 {
    MPI_Comm      comm;
-
    HYPRE_BigInt  partitioning[2];   /* Indicates partitioning over tasks */
-
+   HYPRE_Int     num_components;    /* Number of components of a multivector */
    HYPRE_Int     object_type;       /* Indicates the type of "local storage" */
-
    void         *object;            /* Structure for storing local portion */
-
    void         *translator;        /* Structure for storing off processor
                                        information */
-
    void         *assumed_part;      /* IJ Vector assumed partition */
-
    HYPRE_BigInt  global_first_row;  /* these for data items are necessary */
-   HYPRE_BigInt  global_num_rows;   /* to be able to avoid using the global */
-                                    /* global partition */
+   HYPRE_BigInt  global_num_rows;   /* to be able to avoid using the global partition */
    HYPRE_Int     print_level;
-
 } hypre_IJVector;
 
 /*--------------------------------------------------------------------------
@@ -46,6 +39,7 @@ typedef struct hypre_IJVector_struct
 
 #define hypre_IJVectorComm(vector)            ((vector) -> comm)
 #define hypre_IJVectorPartitioning(vector)    ((vector) -> partitioning)
+#define hypre_IJVectorNumComponents(vector)   ((vector) -> num_components)
 #define hypre_IJVectorObjectType(vector)      ((vector) -> object_type)
 #define hypre_IJVectorObject(vector)          ((vector) -> object)
 #define hypre_IJVectorTranslator(vector)      ((vector) -> translator)
@@ -54,7 +48,7 @@ typedef struct hypre_IJVector_struct
 #define hypre_IJVectorGlobalNumRows(vector)   ((vector) -> global_num_rows)
 #define hypre_IJVectorPrintLevel(vector)      ((vector) -> print_level)
 
-static inline HYPRE_MemoryLocation
+static inline HYPRE_MAYBE_UNUSED_FUNC HYPRE_MemoryLocation
 hypre_IJVectorMemoryLocation(hypre_IJVector *vector)
 {
    if ( hypre_IJVectorObject(vector) && hypre_IJVectorObjectType(vector) == HYPRE_PARCSR)
diff --git a/external/hypre/src/IJ_mv/_hypre_IJ_mv.h b/external/hypre/src/IJ_mv/_hypre_IJ_mv.h
index 7de370ff..0846f14b 100644
--- a/external/hypre/src/IJ_mv/_hypre_IJ_mv.h
+++ b/external/hypre/src/IJ_mv/_hypre_IJ_mv.h
@@ -14,7 +14,7 @@ extern "C" {
 #endif
 
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -80,16 +80,17 @@ typedef struct
 
    HYPRE_MemoryLocation memory_location;
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-   HYPRE_Int            max_stack_elmts;
-   HYPRE_Int            current_stack_elmts;
+#if defined(HYPRE_USING_GPU)
+   HYPRE_BigInt         max_stack_elmts;
+   HYPRE_BigInt         current_stack_elmts;
    HYPRE_BigInt        *stack_i;
    HYPRE_BigInt        *stack_j;
    HYPRE_Complex       *stack_data;
    char                *stack_sora;              /* Set (1) or Add (0) */
    HYPRE_Int            usr_on_proc_elmts;       /* user given num elmt on-proc */
    HYPRE_Int            usr_off_proc_elmts;      /* user given num elmt off-proc */
-   HYPRE_Real           init_alloc_factor;
+   HYPRE_Int            early_assemble;
+   HYPRE_Int            init_alloc_factor;
    HYPRE_Real           grow_factor;
 #endif
 } hypre_AuxParCSRMatrix;
@@ -124,7 +125,7 @@ typedef struct
 
 #define hypre_AuxParCSRMatrixMemoryLocation(matrix)       ((matrix) -> memory_location)
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
 #define hypre_AuxParCSRMatrixMaxStackElmts(matrix)        ((matrix) -> max_stack_elmts)
 #define hypre_AuxParCSRMatrixCurrentStackElmts(matrix)    ((matrix) -> current_stack_elmts)
 #define hypre_AuxParCSRMatrixStackI(matrix)               ((matrix) -> stack_i)
@@ -133,13 +134,14 @@ typedef struct
 #define hypre_AuxParCSRMatrixStackSorA(matrix)            ((matrix) -> stack_sora)
 #define hypre_AuxParCSRMatrixUsrOnProcElmts(matrix)       ((matrix) -> usr_on_proc_elmts)
 #define hypre_AuxParCSRMatrixUsrOffProcElmts(matrix)      ((matrix) -> usr_off_proc_elmts)
+#define hypre_AuxParCSRMatrixEarlyAssemble(matrix)        ((matrix) -> early_assemble)
 #define hypre_AuxParCSRMatrixInitAllocFactor(matrix)      ((matrix) -> init_alloc_factor)
 #define hypre_AuxParCSRMatrixGrowFactor(matrix)           ((matrix) -> grow_factor)
 #endif
 
 #endif /* #ifndef hypre_AUX_PARCSR_MATRIX_HEADER */
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -170,10 +172,11 @@ typedef struct
 
    HYPRE_MemoryLocation memory_location;
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
    HYPRE_Int            max_stack_elmts;      /* length of stash for SetValues and AddToValues*/
    HYPRE_Int            current_stack_elmts;  /* current no. of elements stored in stash */
    HYPRE_BigInt        *stack_i;              /* contains row indices */
+   HYPRE_BigInt        *stack_voff;           /* contains vector offsets for multivectors */
    HYPRE_Complex       *stack_data;           /* contains corresponding data */
    char                *stack_sora;
    HYPRE_Int            usr_off_proc_elmts;   /* the num of off-proc elements usr guided */
@@ -193,10 +196,11 @@ typedef struct
 
 #define hypre_AuxParVectorMemoryLocation(vector)       ((vector) -> memory_location)
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
 #define hypre_AuxParVectorMaxStackElmts(vector)        ((vector) -> max_stack_elmts)
 #define hypre_AuxParVectorCurrentStackElmts(vector)    ((vector) -> current_stack_elmts)
 #define hypre_AuxParVectorStackI(vector)               ((vector) -> stack_i)
+#define hypre_AuxParVectorStackVoff(vector)            ((vector) -> stack_voff)
 #define hypre_AuxParVectorStackData(vector)            ((vector) -> stack_data)
 #define hypre_AuxParVectorStackSorA(vector)            ((vector) -> stack_sora)
 #define hypre_AuxParVectorUsrOffProcElmts(vector)      ((vector) -> usr_off_proc_elmts)
@@ -206,7 +210,7 @@ typedef struct
 
 #endif /* #ifndef hypre_AUX_PAR_VECTOR_HEADER */
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -271,7 +275,7 @@ typedef struct hypre_IJMatrix_struct
 #define hypre_IJMatrixOMPFlag(matrix)          ((matrix) -> omp_flag)
 #define hypre_IJMatrixPrintLevel(matrix)       ((matrix) -> print_level)
 
-static inline HYPRE_MemoryLocation
+static inline HYPRE_MAYBE_UNUSED_FUNC HYPRE_MemoryLocation
 hypre_IJMatrixMemoryLocation(hypre_IJMatrix *matrix)
 {
    if ( hypre_IJMatrixObject(matrix) && hypre_IJMatrixObjectType(matrix) == HYPRE_PARCSR)
@@ -300,7 +304,7 @@ hypre_GetIJMatrixISISMatrix( HYPRE_IJMatrix IJmatrix, RowMatrix *reference )
 
 #endif /* #ifndef hypre_IJ_MATRIX_HEADER */
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -322,23 +326,16 @@ hypre_GetIJMatrixISISMatrix( HYPRE_IJMatrix IJmatrix, RowMatrix *reference )
 typedef struct hypre_IJVector_struct
 {
    MPI_Comm      comm;
-
    HYPRE_BigInt  partitioning[2];   /* Indicates partitioning over tasks */
-
+   HYPRE_Int     num_components;    /* Number of components of a multivector */
    HYPRE_Int     object_type;       /* Indicates the type of "local storage" */
-
    void         *object;            /* Structure for storing local portion */
-
    void         *translator;        /* Structure for storing off processor
                                        information */
-
    void         *assumed_part;      /* IJ Vector assumed partition */
-
    HYPRE_BigInt  global_first_row;  /* these for data items are necessary */
-   HYPRE_BigInt  global_num_rows;   /* to be able to avoid using the global */
-                                    /* global partition */
+   HYPRE_BigInt  global_num_rows;   /* to be able to avoid using the global partition */
    HYPRE_Int     print_level;
-
 } hypre_IJVector;
 
 /*--------------------------------------------------------------------------
@@ -347,6 +344,7 @@ typedef struct hypre_IJVector_struct
 
 #define hypre_IJVectorComm(vector)            ((vector) -> comm)
 #define hypre_IJVectorPartitioning(vector)    ((vector) -> partitioning)
+#define hypre_IJVectorNumComponents(vector)   ((vector) -> num_components)
 #define hypre_IJVectorObjectType(vector)      ((vector) -> object_type)
 #define hypre_IJVectorObject(vector)          ((vector) -> object)
 #define hypre_IJVectorTranslator(vector)      ((vector) -> translator)
@@ -355,7 +353,7 @@ typedef struct hypre_IJVector_struct
 #define hypre_IJVectorGlobalNumRows(vector)   ((vector) -> global_num_rows)
 #define hypre_IJVectorPrintLevel(vector)      ((vector) -> print_level)
 
-static inline HYPRE_MemoryLocation
+static inline HYPRE_MAYBE_UNUSED_FUNC HYPRE_MemoryLocation
 hypre_IJVectorMemoryLocation(hypre_IJVector *vector)
 {
    if ( hypre_IJVectorObject(vector) && hypre_IJVectorObjectType(vector) == HYPRE_PARCSR)
@@ -373,155 +371,256 @@ hypre_IJVectorMemoryLocation(hypre_IJVector *vector)
 
 #endif /* #ifndef hypre_IJ_VECTOR_HEADER */
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
  ******************************************************************************/
 
 /* aux_parcsr_matrix.c */
-HYPRE_Int hypre_AuxParCSRMatrixCreate ( hypre_AuxParCSRMatrix **aux_matrix , HYPRE_Int local_num_rows , HYPRE_Int local_num_cols , HYPRE_Int *sizes );
+HYPRE_Int hypre_AuxParCSRMatrixCreate ( hypre_AuxParCSRMatrix **aux_matrix,
+                                        HYPRE_Int local_num_rows, HYPRE_Int local_num_cols, HYPRE_Int *sizes );
 HYPRE_Int hypre_AuxParCSRMatrixDestroy ( hypre_AuxParCSRMatrix *matrix );
 HYPRE_Int hypre_AuxParCSRMatrixSetRownnz ( hypre_AuxParCSRMatrix *matrix );
 HYPRE_Int hypre_AuxParCSRMatrixInitialize ( hypre_AuxParCSRMatrix *matrix );
-HYPRE_Int hypre_AuxParCSRMatrixInitialize_v2( hypre_AuxParCSRMatrix *matrix, HYPRE_MemoryLocation memory_location );
+HYPRE_Int hypre_AuxParCSRMatrixInitialize_v2( hypre_AuxParCSRMatrix *matrix,
+                                              HYPRE_MemoryLocation memory_location );
 
 /* aux_par_vector.c */
 HYPRE_Int hypre_AuxParVectorCreate ( hypre_AuxParVector **aux_vector );
 HYPRE_Int hypre_AuxParVectorDestroy ( hypre_AuxParVector *vector );
 HYPRE_Int hypre_AuxParVectorInitialize ( hypre_AuxParVector *vector );
-HYPRE_Int hypre_AuxParVectorInitialize_v2( hypre_AuxParVector *vector, HYPRE_MemoryLocation memory_location );
+HYPRE_Int hypre_AuxParVectorInitialize_v2( hypre_AuxParVector *vector,
+                                           HYPRE_MemoryLocation memory_location );
 
 /* IJ_assumed_part.c */
 HYPRE_Int hypre_IJMatrixCreateAssumedPartition ( hypre_IJMatrix *matrix );
 HYPRE_Int hypre_IJVectorCreateAssumedPartition ( hypre_IJVector *vector );
 
 /* IJMatrix.c */
-HYPRE_Int hypre_IJMatrixGetRowPartitioning ( HYPRE_IJMatrix matrix , HYPRE_BigInt **row_partitioning );
-HYPRE_Int hypre_IJMatrixGetColPartitioning ( HYPRE_IJMatrix matrix , HYPRE_BigInt **col_partitioning );
-HYPRE_Int hypre_IJMatrixSetObject ( HYPRE_IJMatrix matrix , void *object );
+HYPRE_Int hypre_IJMatrixGetRowPartitioning ( HYPRE_IJMatrix matrix,
+                                             HYPRE_BigInt **row_partitioning );
+HYPRE_Int hypre_IJMatrixGetColPartitioning ( HYPRE_IJMatrix matrix,
+                                             HYPRE_BigInt **col_partitioning );
+HYPRE_Int hypre_IJMatrixSetObject ( HYPRE_IJMatrix matrix, void *object );
+HYPRE_Int hypre_IJMatrixRead( const char *filename, MPI_Comm comm, HYPRE_Int type,
+                              HYPRE_IJMatrix *matrix_ptr, HYPRE_Int is_mm );
+HYPRE_Int hypre_IJMatrixReadBinary( const char *prefixname, MPI_Comm comm,
+                                    HYPRE_Int type, HYPRE_IJMatrix *matrix_ptr );
 
 /* IJMatrix_isis.c */
-HYPRE_Int hypre_IJMatrixSetLocalSizeISIS ( hypre_IJMatrix *matrix , HYPRE_Int local_m , HYPRE_Int local_n );
+HYPRE_Int hypre_IJMatrixSetLocalSizeISIS ( hypre_IJMatrix *matrix, HYPRE_Int local_m,
+                                           HYPRE_Int local_n );
 HYPRE_Int hypre_IJMatrixCreateISIS ( hypre_IJMatrix *matrix );
-HYPRE_Int hypre_IJMatrixSetRowSizesISIS ( hypre_IJMatrix *matrix , HYPRE_Int *sizes );
-HYPRE_Int hypre_IJMatrixSetDiagRowSizesISIS ( hypre_IJMatrix *matrix , HYPRE_Int *sizes );
-HYPRE_Int hypre_IJMatrixSetOffDiagRowSizesISIS ( hypre_IJMatrix *matrix , HYPRE_Int *sizes );
+HYPRE_Int hypre_IJMatrixSetRowSizesISIS ( hypre_IJMatrix *matrix, HYPRE_Int *sizes );
+HYPRE_Int hypre_IJMatrixSetDiagRowSizesISIS ( hypre_IJMatrix *matrix, HYPRE_Int *sizes );
+HYPRE_Int hypre_IJMatrixSetOffDiagRowSizesISIS ( hypre_IJMatrix *matrix, HYPRE_Int *sizes );
 HYPRE_Int hypre_IJMatrixInitializeISIS ( hypre_IJMatrix *matrix );
-HYPRE_Int hypre_IJMatrixInsertBlockISIS ( hypre_IJMatrix *matrix , HYPRE_Int m , HYPRE_Int n , HYPRE_Int *rows , HYPRE_Int *cols , HYPRE_Complex *coeffs );
-HYPRE_Int hypre_IJMatrixAddToBlockISIS ( hypre_IJMatrix *matrix , HYPRE_Int m , HYPRE_Int n , HYPRE_BigInt *rows , HYPRE_BigInt *cols , HYPRE_Complex *coeffs );
-HYPRE_Int hypre_IJMatrixInsertRowISIS ( hypre_IJMatrix *matrix , HYPRE_Int n , HYPRE_BigInt row , HYPRE_BigInt *indices , HYPRE_Complex *coeffs );
-HYPRE_Int hypre_IJMatrixAddToRowISIS ( hypre_IJMatrix *matrix , HYPRE_Int n , HYPRE_BigInt row , HYPRE_BigInt *indices , HYPRE_Complex *coeffs );
+HYPRE_Int hypre_IJMatrixInsertBlockISIS ( hypre_IJMatrix *matrix, HYPRE_Int m, HYPRE_Int n,
+                                          HYPRE_Int *rows, HYPRE_Int *cols, HYPRE_Complex *coeffs );
+HYPRE_Int hypre_IJMatrixAddToBlockISIS ( hypre_IJMatrix *matrix, HYPRE_Int m, HYPRE_Int n,
+                                         HYPRE_BigInt *rows, HYPRE_BigInt *cols, HYPRE_Complex *coeffs );
+HYPRE_Int hypre_IJMatrixInsertRowISIS ( hypre_IJMatrix *matrix, HYPRE_Int n, HYPRE_BigInt row,
+                                        HYPRE_BigInt *indices, HYPRE_Complex *coeffs );
+HYPRE_Int hypre_IJMatrixAddToRowISIS ( hypre_IJMatrix *matrix, HYPRE_Int n, HYPRE_BigInt row,
+                                       HYPRE_BigInt *indices, HYPRE_Complex *coeffs );
 HYPRE_Int hypre_IJMatrixAssembleISIS ( hypre_IJMatrix *matrix );
-HYPRE_Int hypre_IJMatrixDistributeISIS ( hypre_IJMatrix *matrix , HYPRE_BigInt *row_starts , HYPRE_BigInt *col_starts );
-HYPRE_Int hypre_IJMatrixApplyISIS ( hypre_IJMatrix *matrix , hypre_ParVector *x , hypre_ParVector *b );
+HYPRE_Int hypre_IJMatrixDistributeISIS ( hypre_IJMatrix *matrix, HYPRE_BigInt *row_starts,
+                                         HYPRE_BigInt *col_starts );
+HYPRE_Int hypre_IJMatrixApplyISIS ( hypre_IJMatrix *matrix, hypre_ParVector *x,
+                                    hypre_ParVector *b );
 HYPRE_Int hypre_IJMatrixDestroyISIS ( hypre_IJMatrix *matrix );
-HYPRE_Int hypre_IJMatrixSetTotalSizeISIS ( hypre_IJMatrix *matrix , HYPRE_Int size );
+HYPRE_Int hypre_IJMatrixSetTotalSizeISIS ( hypre_IJMatrix *matrix, HYPRE_Int size );
 
 /* IJMatrix_parcsr.c */
 HYPRE_Int hypre_IJMatrixCreateParCSR ( hypre_IJMatrix *matrix );
-HYPRE_Int hypre_IJMatrixSetRowSizesParCSR ( hypre_IJMatrix *matrix , const HYPRE_Int *sizes );
-HYPRE_Int hypre_IJMatrixSetDiagOffdSizesParCSR ( hypre_IJMatrix *matrix , const HYPRE_Int *diag_sizes , const HYPRE_Int *offdiag_sizes );
-HYPRE_Int hypre_IJMatrixSetMaxOffProcElmtsParCSR ( hypre_IJMatrix *matrix , HYPRE_Int max_off_proc_elmts );
+HYPRE_Int hypre_IJMatrixSetRowSizesParCSR ( hypre_IJMatrix *matrix, const HYPRE_Int *sizes );
+HYPRE_Int hypre_IJMatrixSetDiagOffdSizesParCSR ( hypre_IJMatrix *matrix,
+                                                 const HYPRE_Int *diag_sizes, const HYPRE_Int *offdiag_sizes );
+HYPRE_Int hypre_IJMatrixSetMaxOffProcElmtsParCSR ( hypre_IJMatrix *matrix,
+                                                   HYPRE_Int max_off_proc_elmts );
+HYPRE_Int hypre_IJMatrixSetInitAllocationParCSR(hypre_IJMatrix *matrix,
+                                                HYPRE_Int       factor);
+HYPRE_Int hypre_IJMatrixSetEarlyAssembleParCSR(hypre_IJMatrix *matrix,
+                                               HYPRE_Int       early_assemble);
+HYPRE_Int hypre_IJMatrixSetGrowFactorParCSR(hypre_IJMatrix *matrix,
+                                            HYPRE_Real      factor);
 HYPRE_Int hypre_IJMatrixInitializeParCSR ( hypre_IJMatrix *matrix );
-HYPRE_Int hypre_IJMatrixGetRowCountsParCSR ( hypre_IJMatrix *matrix , HYPRE_Int nrows , HYPRE_BigInt *rows , HYPRE_Int *ncols );
-HYPRE_Int hypre_IJMatrixGetValuesParCSR ( hypre_IJMatrix *matrix , HYPRE_Int nrows , HYPRE_Int *ncols , HYPRE_BigInt *rows , HYPRE_BigInt *cols , HYPRE_Complex *values );
-HYPRE_Int hypre_IJMatrixSetValuesParCSR ( hypre_IJMatrix *matrix , HYPRE_Int nrows , HYPRE_Int *ncols , const HYPRE_BigInt *rows , const HYPRE_Int *row_indexes , const HYPRE_BigInt *cols , const HYPRE_Complex *values );
-HYPRE_Int hypre_IJMatrixSetAddValuesParCSRDevice ( hypre_IJMatrix *matrix , HYPRE_Int nrows , HYPRE_Int *ncols , const HYPRE_BigInt *rows , const HYPRE_Int *row_indexes , const HYPRE_BigInt *cols , const HYPRE_Complex *values, const char *action );
-HYPRE_Int hypre_IJMatrixSetConstantValuesParCSR ( hypre_IJMatrix *matrix , HYPRE_Complex value );
-HYPRE_Int hypre_IJMatrixAddToValuesParCSR ( hypre_IJMatrix *matrix , HYPRE_Int nrows , HYPRE_Int *ncols , const HYPRE_BigInt *rows , const HYPRE_Int *row_indexes , const HYPRE_BigInt *cols , const HYPRE_Complex *values );
+HYPRE_Int hypre_IJMatrixGetRowCountsParCSR ( hypre_IJMatrix *matrix, HYPRE_Int nrows,
+                                             HYPRE_BigInt *rows, HYPRE_Int *ncols );
+HYPRE_Int hypre_IJMatrixGetValuesParCSR ( hypre_IJMatrix *matrix, HYPRE_Int nrows, HYPRE_Int *ncols,
+                                          HYPRE_BigInt *rows,
+                                          HYPRE_Int *row_indexes, HYPRE_BigInt *cols, HYPRE_Complex *values, HYPRE_Int zero_out );
+HYPRE_Int hypre_IJMatrixSetValuesParCSR ( hypre_IJMatrix *matrix, HYPRE_Int nrows, HYPRE_Int *ncols,
+                                          const HYPRE_BigInt *rows, const HYPRE_Int *row_indexes, const HYPRE_BigInt *cols,
+                                          const HYPRE_Complex *values );
+HYPRE_Int hypre_IJMatrixSetAddValuesParCSRDevice ( hypre_IJMatrix *matrix, HYPRE_Int nrows,
+                                                   HYPRE_Int *ncols, const HYPRE_BigInt *rows, const HYPRE_Int *row_indexes, const HYPRE_BigInt *cols,
+                                                   const HYPRE_Complex *values, const char *action );
+HYPRE_Int hypre_IJMatrixSetConstantValuesParCSR ( hypre_IJMatrix *matrix, HYPRE_Complex value );
+HYPRE_Int hypre_IJMatrixAddToValuesParCSR ( hypre_IJMatrix *matrix, HYPRE_Int nrows,
+                                            HYPRE_Int *ncols, const HYPRE_BigInt *rows, const HYPRE_Int *row_indexes, const HYPRE_BigInt *cols,
+                                            const HYPRE_Complex *values );
 HYPRE_Int hypre_IJMatrixDestroyParCSR ( hypre_IJMatrix *matrix );
-HYPRE_Int hypre_IJMatrixTransposeParCSR ( hypre_IJMatrix  *matrix_A , hypre_IJMatrix *matrix_AT );
-HYPRE_Int hypre_IJMatrixNormParCSR ( hypre_IJMatrix *matrix , HYPRE_Real *norm );
-HYPRE_Int hypre_IJMatrixAddParCSR ( HYPRE_Complex alpha , hypre_IJMatrix *matrix_A , HYPRE_Complex beta , hypre_IJMatrix *matrix_B , hypre_IJMatrix *matrix_C );
-HYPRE_Int hypre_IJMatrixAssembleOffProcValsParCSR ( hypre_IJMatrix *matrix , HYPRE_Int off_proc_i_indx , HYPRE_Int max_off_proc_elmts , HYPRE_Int current_num_elmts , HYPRE_MemoryLocation memory_location , HYPRE_BigInt *off_proc_i , HYPRE_BigInt *off_proc_j , HYPRE_Complex *off_proc_data );
-HYPRE_Int hypre_FillResponseIJOffProcVals ( void *p_recv_contact_buf , HYPRE_Int contact_size , HYPRE_Int contact_proc , void *ro , MPI_Comm comm , void **p_send_response_buf , HYPRE_Int *response_message_size );
-HYPRE_Int hypre_FindProc ( HYPRE_BigInt *list , HYPRE_BigInt value , HYPRE_Int list_length );
+HYPRE_Int hypre_IJMatrixTransposeParCSR ( hypre_IJMatrix  *matrix_A, hypre_IJMatrix *matrix_AT );
+HYPRE_Int hypre_IJMatrixNormParCSR ( hypre_IJMatrix *matrix, HYPRE_Real *norm );
+HYPRE_Int hypre_IJMatrixAddParCSR ( HYPRE_Complex alpha, hypre_IJMatrix *matrix_A,
+                                    HYPRE_Complex beta, hypre_IJMatrix *matrix_B, hypre_IJMatrix *matrix_C );
+HYPRE_Int hypre_IJMatrixAssembleOffProcValsParCSR ( hypre_IJMatrix *matrix,
+                                                    HYPRE_Int off_proc_i_indx, HYPRE_Int max_off_proc_elmts, HYPRE_Int current_num_elmts,
+                                                    HYPRE_MemoryLocation memory_location, HYPRE_BigInt *off_proc_i, HYPRE_BigInt *off_proc_j,
+                                                    HYPRE_Complex *off_proc_data );
+HYPRE_Int hypre_FillResponseIJOffProcVals ( void *p_recv_contact_buf, HYPRE_Int contact_size,
+                                            HYPRE_Int contact_proc, void *ro, MPI_Comm comm, void **p_send_response_buf,
+                                            HYPRE_Int *response_message_size );
+HYPRE_Int hypre_FindProc ( HYPRE_BigInt *list, HYPRE_BigInt value, HYPRE_Int list_length );
 HYPRE_Int hypre_IJMatrixAssembleParCSR ( hypre_IJMatrix *matrix );
-HYPRE_Int hypre_IJMatrixSetValuesOMPParCSR ( hypre_IJMatrix *matrix , HYPRE_Int nrows , HYPRE_Int *ncols , const HYPRE_BigInt *rows , const HYPRE_Int *row_indexes , const HYPRE_BigInt *cols , const HYPRE_Complex *values );
-HYPRE_Int hypre_IJMatrixAddToValuesOMPParCSR ( hypre_IJMatrix *matrix , HYPRE_Int nrows , HYPRE_Int *ncols , const HYPRE_BigInt *rows , const HYPRE_Int *row_indexes , const HYPRE_BigInt *cols , const HYPRE_Complex *values );
+HYPRE_Int hypre_IJMatrixSetValuesOMPParCSR ( hypre_IJMatrix *matrix, HYPRE_Int nrows,
+                                             HYPRE_Int *ncols, const HYPRE_BigInt *rows, const HYPRE_Int *row_indexes, const HYPRE_BigInt *cols,
+                                             const HYPRE_Complex *values );
+HYPRE_Int hypre_IJMatrixAddToValuesOMPParCSR ( hypre_IJMatrix *matrix, HYPRE_Int nrows,
+                                               HYPRE_Int *ncols, const HYPRE_BigInt *rows, const HYPRE_Int *row_indexes, const HYPRE_BigInt *cols,
+                                               const HYPRE_Complex *values );
 HYPRE_Int hypre_IJMatrixAssembleParCSRDevice(hypre_IJMatrix *matrix);
-HYPRE_Int hypre_IJMatrixInitializeParCSR_v2(hypre_IJMatrix *matrix, HYPRE_MemoryLocation memory_location);
-HYPRE_Int hypre_IJMatrixSetConstantValuesParCSRDevice( hypre_IJMatrix *matrix, HYPRE_Complex value );
+HYPRE_Int hypre_IJMatrixInitializeParCSR_v2(hypre_IJMatrix *matrix,
+                                            HYPRE_MemoryLocation memory_location);
+HYPRE_Int hypre_IJMatrixSetConstantValuesParCSRDevice( hypre_IJMatrix *matrix,
+                                                       HYPRE_Complex value );
+HYPRE_Int hypre_IJMatrixMigrateParCSR(hypre_IJMatrix *matrix, HYPRE_MemoryLocation memory_location);
+
+HYPRE_Int hypre_IJMatrixAssembleCommunicate(hypre_IJMatrix *matrix);
+HYPRE_Int hypre_IJMatrixAssembleCompressDevice(hypre_IJMatrix *matrix, HYPRE_Int reduce_stack_size);
 
 /* IJMatrix_petsc.c */
-HYPRE_Int hypre_IJMatrixSetLocalSizePETSc ( hypre_IJMatrix *matrix , HYPRE_Int local_m , HYPRE_Int local_n );
+HYPRE_Int hypre_IJMatrixSetLocalSizePETSc ( hypre_IJMatrix *matrix, HYPRE_Int local_m,
+                                            HYPRE_Int local_n );
 HYPRE_Int hypre_IJMatrixCreatePETSc ( hypre_IJMatrix *matrix );
-HYPRE_Int hypre_IJMatrixSetRowSizesPETSc ( hypre_IJMatrix *matrix , HYPRE_Int *sizes );
-HYPRE_Int hypre_IJMatrixSetDiagRowSizesPETSc ( hypre_IJMatrix *matrix , HYPRE_Int *sizes );
-HYPRE_Int hypre_IJMatrixSetOffDiagRowSizesPETSc ( hypre_IJMatrix *matrix , HYPRE_Int *sizes );
+HYPRE_Int hypre_IJMatrixSetRowSizesPETSc ( hypre_IJMatrix *matrix, HYPRE_Int *sizes );
+HYPRE_Int hypre_IJMatrixSetDiagRowSizesPETSc ( hypre_IJMatrix *matrix, HYPRE_Int *sizes );
+HYPRE_Int hypre_IJMatrixSetOffDiagRowSizesPETSc ( hypre_IJMatrix *matrix, HYPRE_Int *sizes );
 HYPRE_Int hypre_IJMatrixInitializePETSc ( hypre_IJMatrix *matrix );
-HYPRE_Int hypre_IJMatrixInsertBlockPETSc ( hypre_IJMatrix *matrix , HYPRE_Int m , HYPRE_Int n , HYPRE_BigInt *rows , HYPRE_BigInt *cols , HYPRE_Complex *coeffs );
-HYPRE_Int hypre_IJMatrixAddToBlockPETSc ( hypre_IJMatrix *matrix , HYPRE_Int m , HYPRE_Int n , HYPRE_Int *rows , HYPRE_Int *cols , HYPRE_Complex *coeffs );
-HYPRE_Int hypre_IJMatrixInsertRowPETSc ( hypre_IJMatrix *matrix , HYPRE_Int n , HYPRE_BigInt row , HYPRE_BigInt *indices , HYPRE_Complex *coeffs );
-HYPRE_Int hypre_IJMatrixAddToRowPETSc ( hypre_IJMatrix *matrix , HYPRE_Int n , HYPRE_BigInt row , HYPRE_BigInt *indices , HYPRE_Complex *coeffs );
+HYPRE_Int hypre_IJMatrixInsertBlockPETSc ( hypre_IJMatrix *matrix, HYPRE_Int m, HYPRE_Int n,
+                                           HYPRE_BigInt *rows, HYPRE_BigInt *cols, HYPRE_Complex *coeffs );
+HYPRE_Int hypre_IJMatrixAddToBlockPETSc ( hypre_IJMatrix *matrix, HYPRE_Int m, HYPRE_Int n,
+                                          HYPRE_Int *rows, HYPRE_Int *cols, HYPRE_Complex *coeffs );
+HYPRE_Int hypre_IJMatrixInsertRowPETSc ( hypre_IJMatrix *matrix, HYPRE_Int n, HYPRE_BigInt row,
+                                         HYPRE_BigInt *indices, HYPRE_Complex *coeffs );
+HYPRE_Int hypre_IJMatrixAddToRowPETSc ( hypre_IJMatrix *matrix, HYPRE_Int n, HYPRE_BigInt row,
+                                        HYPRE_BigInt *indices, HYPRE_Complex *coeffs );
 HYPRE_Int hypre_IJMatrixAssemblePETSc ( hypre_IJMatrix *matrix );
-HYPRE_Int hypre_IJMatrixDistributePETSc ( hypre_IJMatrix *matrix , HYPRE_BigInt *row_starts , HYPRE_BigInt *col_starts );
-HYPRE_Int hypre_IJMatrixApplyPETSc ( hypre_IJMatrix *matrix , hypre_ParVector *x , hypre_ParVector *b );
+HYPRE_Int hypre_IJMatrixDistributePETSc ( hypre_IJMatrix *matrix, HYPRE_BigInt *row_starts,
+                                          HYPRE_BigInt *col_starts );
+HYPRE_Int hypre_IJMatrixApplyPETSc ( hypre_IJMatrix *matrix, hypre_ParVector *x,
+                                     hypre_ParVector *b );
 HYPRE_Int hypre_IJMatrixDestroyPETSc ( hypre_IJMatrix *matrix );
-HYPRE_Int hypre_IJMatrixSetTotalSizePETSc ( hypre_IJMatrix *matrix , HYPRE_Int size );
+HYPRE_Int hypre_IJMatrixSetTotalSizePETSc ( hypre_IJMatrix *matrix, HYPRE_Int size );
 
 /* IJVector.c */
-HYPRE_Int hypre_IJVectorDistribute ( HYPRE_IJVector vector , const HYPRE_Int *vec_starts );
+HYPRE_Int hypre_IJVectorDistribute ( HYPRE_IJVector vector, const HYPRE_Int *vec_starts );
 HYPRE_Int hypre_IJVectorZeroValues ( HYPRE_IJVector vector );
+HYPRE_Int hypre_IJVectorReadBinary ( MPI_Comm comm, const char *filename, HYPRE_Int type,
+                                     HYPRE_IJVector *vector_ptr );
 
 /* IJVector_parcsr.c */
-HYPRE_Int hypre_IJVectorCreatePar ( hypre_IJVector *vector , HYPRE_BigInt *IJpartitioning );
+HYPRE_Int hypre_IJVectorCreatePar ( hypre_IJVector *vector, HYPRE_BigInt *IJpartitioning );
 HYPRE_Int hypre_IJVectorDestroyPar ( hypre_IJVector *vector );
+HYPRE_Int hypre_IJVectorInitializeParShell (hypre_IJVector *vector );
+HYPRE_Int hypre_IJVectorSetParData( hypre_IJVector *vector, HYPRE_Complex *data );
 HYPRE_Int hypre_IJVectorInitializePar ( hypre_IJVector *vector );
-HYPRE_Int hypre_IJVectorInitializePar_v2(hypre_IJVector *vector, HYPRE_MemoryLocation memory_location);
-HYPRE_Int hypre_IJVectorSetMaxOffProcElmtsPar ( hypre_IJVector *vector , HYPRE_Int max_off_proc_elmts );
-HYPRE_Int hypre_IJVectorDistributePar ( hypre_IJVector *vector , const HYPRE_Int *vec_starts );
+HYPRE_Int hypre_IJVectorInitializePar_v2(hypre_IJVector *vector,
+                                         HYPRE_MemoryLocation memory_location);
+HYPRE_Int hypre_IJVectorSetMaxOffProcElmtsPar ( hypre_IJVector *vector,
+                                                HYPRE_Int max_off_proc_elmts );
+HYPRE_Int hypre_IJVectorDistributePar ( hypre_IJVector *vector, const HYPRE_Int *vec_starts );
 HYPRE_Int hypre_IJVectorZeroValuesPar ( hypre_IJVector *vector );
-HYPRE_Int hypre_IJVectorSetValuesPar ( hypre_IJVector *vector , HYPRE_Int num_values , const HYPRE_BigInt *indices , const HYPRE_Complex *values );
-HYPRE_Int hypre_IJVectorAddToValuesPar ( hypre_IJVector *vector , HYPRE_Int num_values , const HYPRE_BigInt *indices , const HYPRE_Complex *values );
+HYPRE_Int hypre_IJVectorSetComponentPar ( hypre_IJVector *vector, HYPRE_Int component);
+HYPRE_Int hypre_IJVectorSetValuesPar ( hypre_IJVector *vector, HYPRE_Int num_values,
+                                       const HYPRE_BigInt *indices, const HYPRE_Complex *values );
+HYPRE_Int hypre_IJVectorSetConstantValuesPar ( hypre_IJVector *vector, HYPRE_Complex value );
+HYPRE_Int hypre_IJVectorAddToValuesPar ( hypre_IJVector *vector, HYPRE_Int num_values,
+                                         const HYPRE_BigInt *indices, const HYPRE_Complex *values );
 HYPRE_Int hypre_IJVectorAssemblePar ( hypre_IJVector *vector );
-HYPRE_Int hypre_IJVectorGetValuesPar ( hypre_IJVector *vector , HYPRE_Int num_values , const HYPRE_BigInt *indices , HYPRE_Complex *values );
-HYPRE_Int hypre_IJVectorAssembleOffProcValsPar ( hypre_IJVector *vector , HYPRE_Int max_off_proc_elmts , HYPRE_Int current_num_elmts , HYPRE_MemoryLocation memory_location , HYPRE_BigInt *off_proc_i , HYPRE_Complex *off_proc_data );
-HYPRE_Int hypre_IJVectorSetAddValuesParDevice(hypre_IJVector *vector, HYPRE_Int num_values, const HYPRE_BigInt *indices, const HYPRE_Complex *values, const char *action);
+HYPRE_Int hypre_IJVectorGetValuesPar ( hypre_IJVector *vector, HYPRE_Int num_values,
+                                       const HYPRE_BigInt *indices, HYPRE_Complex *values );
+HYPRE_Int hypre_IJVectorAssembleOffProcValsPar ( hypre_IJVector *vector,
+                                                 HYPRE_Int max_off_proc_elmts, HYPRE_Int current_num_elmts, HYPRE_MemoryLocation memory_location,
+                                                 HYPRE_BigInt *off_proc_i, HYPRE_Complex *off_proc_data );
+HYPRE_Int hypre_IJVectorSetAddValuesParDevice(hypre_IJVector *vector, HYPRE_Int num_values,
+                                              const HYPRE_BigInt *indices, const HYPRE_Complex *values, const char *action);
 HYPRE_Int hypre_IJVectorAssembleParDevice(hypre_IJVector *vector);
+HYPRE_Int hypre_IJVectorUpdateValuesDevice( hypre_IJVector *vector, HYPRE_Int num_values,
+                                            const HYPRE_BigInt *indices, const HYPRE_Complex *values, HYPRE_Int action);
+HYPRE_Int hypre_IJVectorMigrateParCSR(hypre_IJVector *vector, HYPRE_MemoryLocation memory_location);
 
 /* HYPRE_IJMatrix.c */
-HYPRE_Int HYPRE_IJMatrixCreate ( MPI_Comm comm , HYPRE_BigInt ilower , HYPRE_BigInt iupper , HYPRE_BigInt jlower , HYPRE_BigInt jupper , HYPRE_IJMatrix *matrix );
+HYPRE_Int HYPRE_IJMatrixCreate ( MPI_Comm comm, HYPRE_BigInt ilower, HYPRE_BigInt iupper,
+                                 HYPRE_BigInt jlower, HYPRE_BigInt jupper, HYPRE_IJMatrix *matrix );
+HYPRE_Int HYPRE_IJMatrixPartialClone ( HYPRE_IJMatrix matrix_in, HYPRE_IJMatrix *matrix_out );
 HYPRE_Int HYPRE_IJMatrixDestroy ( HYPRE_IJMatrix matrix );
 HYPRE_Int HYPRE_IJMatrixInitialize ( HYPRE_IJMatrix matrix );
-HYPRE_Int HYPRE_IJMatrixSetPrintLevel ( HYPRE_IJMatrix matrix , HYPRE_Int print_level );
-HYPRE_Int HYPRE_IJMatrixSetValues ( HYPRE_IJMatrix matrix , HYPRE_Int nrows , HYPRE_Int *ncols , const HYPRE_BigInt *rows , const HYPRE_BigInt *cols , const HYPRE_Complex *values );
-HYPRE_Int HYPRE_IJMatrixSetConstantValues ( HYPRE_IJMatrix matrix , HYPRE_Complex value );
-HYPRE_Int HYPRE_IJMatrixAddToValues ( HYPRE_IJMatrix matrix , HYPRE_Int nrows , HYPRE_Int *ncols , const HYPRE_BigInt *rows , const HYPRE_BigInt *cols , const HYPRE_Complex *values );
+HYPRE_Int HYPRE_IJMatrixSetPrintLevel ( HYPRE_IJMatrix matrix, HYPRE_Int print_level );
+HYPRE_Int HYPRE_IJMatrixSetValues ( HYPRE_IJMatrix matrix, HYPRE_Int nrows, HYPRE_Int *ncols,
+                                    const HYPRE_BigInt *rows, const HYPRE_BigInt *cols, const HYPRE_Complex *values );
+HYPRE_Int HYPRE_IJMatrixSetConstantValues ( HYPRE_IJMatrix matrix, HYPRE_Complex value );
+HYPRE_Int HYPRE_IJMatrixAddToValues ( HYPRE_IJMatrix matrix, HYPRE_Int nrows, HYPRE_Int *ncols,
+                                      const HYPRE_BigInt *rows, const HYPRE_BigInt *cols, const HYPRE_Complex *values );
 HYPRE_Int HYPRE_IJMatrixAssemble ( HYPRE_IJMatrix matrix );
-HYPRE_Int HYPRE_IJMatrixGetRowCounts ( HYPRE_IJMatrix matrix , HYPRE_Int nrows , HYPRE_BigInt *rows , HYPRE_Int *ncols );
-HYPRE_Int HYPRE_IJMatrixGetValues ( HYPRE_IJMatrix matrix , HYPRE_Int nrows , HYPRE_Int *ncols , HYPRE_BigInt *rows , HYPRE_BigInt *cols , HYPRE_Complex *values );
-HYPRE_Int HYPRE_IJMatrixSetObjectType ( HYPRE_IJMatrix matrix , HYPRE_Int type );
-HYPRE_Int HYPRE_IJMatrixGetObjectType ( HYPRE_IJMatrix matrix , HYPRE_Int *type );
-HYPRE_Int HYPRE_IJMatrixGetLocalRange ( HYPRE_IJMatrix matrix , HYPRE_BigInt *ilower , HYPRE_BigInt *iupper , HYPRE_BigInt *jlower , HYPRE_BigInt *jupper );
-HYPRE_Int HYPRE_IJMatrixGetObject ( HYPRE_IJMatrix matrix , void **object );
-HYPRE_Int HYPRE_IJMatrixSetRowSizes ( HYPRE_IJMatrix matrix , const HYPRE_Int *sizes );
-HYPRE_Int HYPRE_IJMatrixSetDiagOffdSizes ( HYPRE_IJMatrix matrix , const HYPRE_Int *diag_sizes , const HYPRE_Int *offdiag_sizes );
-HYPRE_Int HYPRE_IJMatrixSetMaxOffProcElmts ( HYPRE_IJMatrix matrix , HYPRE_Int max_off_proc_elmts );
-HYPRE_Int HYPRE_IJMatrixRead ( const char *filename , MPI_Comm comm , HYPRE_Int type , HYPRE_IJMatrix *matrix_ptr );
-HYPRE_Int HYPRE_IJMatrixPrint ( HYPRE_IJMatrix matrix , const char *filename );
-HYPRE_Int HYPRE_IJMatrixSetOMPFlag ( HYPRE_IJMatrix matrix , HYPRE_Int omp_flag );
-HYPRE_Int HYPRE_IJMatrixTranspose ( HYPRE_IJMatrix  matrix_A , HYPRE_IJMatrix *matrix_AT );
-HYPRE_Int HYPRE_IJMatrixNorm ( HYPRE_IJMatrix matrix , HYPRE_Real *norm );
-HYPRE_Int HYPRE_IJMatrixAdd ( HYPRE_Complex alpha , HYPRE_IJMatrix matrix_A , HYPRE_Complex beta , HYPRE_IJMatrix matrix_B , HYPRE_IJMatrix *matrix_C );
+HYPRE_Int HYPRE_IJMatrixGetRowCounts ( HYPRE_IJMatrix matrix, HYPRE_Int nrows, HYPRE_BigInt *rows,
+                                       HYPRE_Int *ncols );
+HYPRE_Int HYPRE_IJMatrixGetValues ( HYPRE_IJMatrix matrix, HYPRE_Int nrows, HYPRE_Int *ncols,
+                                    HYPRE_BigInt *rows, HYPRE_BigInt *cols, HYPRE_Complex *values );
+HYPRE_Int HYPRE_IJMatrixSetObjectType ( HYPRE_IJMatrix matrix, HYPRE_Int type );
+HYPRE_Int HYPRE_IJMatrixGetObjectType ( HYPRE_IJMatrix matrix, HYPRE_Int *type );
+HYPRE_Int HYPRE_IJMatrixGetLocalRange ( HYPRE_IJMatrix matrix, HYPRE_BigInt *ilower,
+                                        HYPRE_BigInt *iupper, HYPRE_BigInt *jlower, HYPRE_BigInt *jupper );
+HYPRE_Int HYPRE_IJMatrixGetObject ( HYPRE_IJMatrix matrix, void **object );
+HYPRE_Int HYPRE_IJMatrixSetRowSizes ( HYPRE_IJMatrix matrix, const HYPRE_Int *sizes );
+HYPRE_Int HYPRE_IJMatrixSetDiagOffdSizes ( HYPRE_IJMatrix matrix, const HYPRE_Int *diag_sizes,
+                                           const HYPRE_Int *offdiag_sizes );
+HYPRE_Int HYPRE_IJMatrixSetMaxOffProcElmts ( HYPRE_IJMatrix matrix, HYPRE_Int max_off_proc_elmts );
+HYPRE_Int HYPRE_IJMatrixRead ( const char *filename, MPI_Comm comm, HYPRE_Int type,
+                               HYPRE_IJMatrix *matrix_ptr );
+HYPRE_Int HYPRE_IJMatrixReadBinary ( const char *filename, MPI_Comm comm, HYPRE_Int type,
+                                     HYPRE_IJMatrix *matrix_ptr );
+HYPRE_Int HYPRE_IJMatrixReadMM( const char *filename, MPI_Comm comm, HYPRE_Int type,
+                                HYPRE_IJMatrix *matrix_ptr );
+HYPRE_Int HYPRE_IJMatrixPrint ( HYPRE_IJMatrix matrix, const char *filename );
+HYPRE_Int HYPRE_IJMatrixPrintBinary ( HYPRE_IJMatrix matrix, const char *filename );
+HYPRE_Int HYPRE_IJMatrixSetOMPFlag ( HYPRE_IJMatrix matrix, HYPRE_Int omp_flag );
+HYPRE_Int HYPRE_IJMatrixTranspose ( HYPRE_IJMatrix  matrix_A, HYPRE_IJMatrix *matrix_AT );
+HYPRE_Int HYPRE_IJMatrixNorm ( HYPRE_IJMatrix matrix, HYPRE_Real *norm );
+HYPRE_Int HYPRE_IJMatrixAdd ( HYPRE_Complex alpha, HYPRE_IJMatrix matrix_A, HYPRE_Complex beta,
+                              HYPRE_IJMatrix matrix_B, HYPRE_IJMatrix *matrix_C );
 
 /* HYPRE_IJVector.c */
-HYPRE_Int HYPRE_IJVectorCreate ( MPI_Comm comm , HYPRE_BigInt jlower , HYPRE_BigInt jupper , HYPRE_IJVector *vector );
+HYPRE_Int HYPRE_IJVectorCreate ( MPI_Comm comm, HYPRE_BigInt jlower, HYPRE_BigInt jupper,
+                                 HYPRE_IJVector *vector );
+HYPRE_Int HYPRE_IJVectorSetNumComponents ( HYPRE_IJVector vector, HYPRE_Int num_components );
+HYPRE_Int HYPRE_IJVectorSetComponent ( HYPRE_IJVector vector, HYPRE_Int component );
 HYPRE_Int HYPRE_IJVectorDestroy ( HYPRE_IJVector vector );
 HYPRE_Int HYPRE_IJVectorInitialize ( HYPRE_IJVector vector );
-HYPRE_Int HYPRE_IJVectorSetPrintLevel ( HYPRE_IJVector vector , HYPRE_Int print_level );
-HYPRE_Int HYPRE_IJVectorSetValues ( HYPRE_IJVector vector , HYPRE_Int nvalues , const HYPRE_BigInt *indices , const HYPRE_Complex *values );
-HYPRE_Int HYPRE_IJVectorAddToValues ( HYPRE_IJVector vector , HYPRE_Int nvalues , const HYPRE_BigInt *indices , const HYPRE_Complex *values );
+HYPRE_Int HYPRE_IJVectorSetPrintLevel ( HYPRE_IJVector vector, HYPRE_Int print_level );
+HYPRE_Int HYPRE_IJVectorSetValues ( HYPRE_IJVector vector, HYPRE_Int nvalues,
+                                    const HYPRE_BigInt *indices, const HYPRE_Complex *values );
+HYPRE_Int HYPRE_IJVectorSetConstantValues ( HYPRE_IJVector vector, HYPRE_Complex value );
+HYPRE_Int HYPRE_IJVectorAddToValues ( HYPRE_IJVector vector, HYPRE_Int nvalues,
+                                      const HYPRE_BigInt *indices, const HYPRE_Complex *values );
 HYPRE_Int HYPRE_IJVectorAssemble ( HYPRE_IJVector vector );
-HYPRE_Int HYPRE_IJVectorGetValues ( HYPRE_IJVector vector , HYPRE_Int nvalues , const HYPRE_BigInt *indices , HYPRE_Complex *values );
-HYPRE_Int HYPRE_IJVectorSetMaxOffProcElmts ( HYPRE_IJVector vector , HYPRE_Int max_off_proc_elmts );
-HYPRE_Int HYPRE_IJVectorSetObjectType ( HYPRE_IJVector vector , HYPRE_Int type );
-HYPRE_Int HYPRE_IJVectorGetObjectType ( HYPRE_IJVector vector , HYPRE_Int *type );
-HYPRE_Int HYPRE_IJVectorGetLocalRange ( HYPRE_IJVector vector , HYPRE_BigInt *jlower , HYPRE_BigInt *jupper );
-HYPRE_Int HYPRE_IJVectorGetObject ( HYPRE_IJVector vector , void **object );
-HYPRE_Int HYPRE_IJVectorRead ( const char *filename , MPI_Comm comm , HYPRE_Int type , HYPRE_IJVector *vector_ptr );
-HYPRE_Int HYPRE_IJVectorPrint ( HYPRE_IJVector vector , const char *filename );
+HYPRE_Int HYPRE_IJVectorGetValues ( HYPRE_IJVector vector, HYPRE_Int nvalues,
+                                    const HYPRE_BigInt *indices, HYPRE_Complex *values );
+HYPRE_Int HYPRE_IJVectorSetMaxOffProcElmts ( HYPRE_IJVector vector, HYPRE_Int max_off_proc_elmts );
+HYPRE_Int HYPRE_IJVectorSetObjectType ( HYPRE_IJVector vector, HYPRE_Int type );
+HYPRE_Int HYPRE_IJVectorGetObjectType ( HYPRE_IJVector vector, HYPRE_Int *type );
+HYPRE_Int HYPRE_IJVectorGetLocalRange ( HYPRE_IJVector vector, HYPRE_BigInt *jlower,
+                                        HYPRE_BigInt *jupper );
+HYPRE_Int HYPRE_IJVectorGetObject ( HYPRE_IJVector vector, void **object );
+HYPRE_Int HYPRE_IJVectorRead ( const char *filename, MPI_Comm comm, HYPRE_Int type,
+                               HYPRE_IJVector *vector_ptr );
+HYPRE_Int HYPRE_IJVectorReadBinary ( const char *filename, MPI_Comm comm, HYPRE_Int type,
+                                     HYPRE_IJVector *vector_ptr );
+HYPRE_Int HYPRE_IJVectorPrint ( HYPRE_IJVector vector, const char *filename );
+HYPRE_Int HYPRE_IJVectorPrintBinary ( HYPRE_IJVector vector, const char *filename );
+HYPRE_Int HYPRE_IJVectorInnerProd ( HYPRE_IJVector x, HYPRE_IJVector y, HYPRE_Real *prod );
 
 #ifdef __cplusplus
 }
diff --git a/external/hypre/src/IJ_mv/aux_par_vector.c b/external/hypre/src/IJ_mv/aux_par_vector.c
index a2e20f56..aaf9b411 100644
--- a/external/hypre/src/IJ_mv/aux_par_vector.c
+++ b/external/hypre/src/IJ_mv/aux_par_vector.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -19,32 +19,36 @@
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_AuxParVectorCreate( hypre_AuxParVector **aux_vector)
+hypre_AuxParVectorCreate( hypre_AuxParVector **aux_vector_ptr)
 {
-   hypre_AuxParVector  *vector;
+   hypre_AuxParVector  *aux_vector;
 
-   vector = hypre_CTAlloc(hypre_AuxParVector, 1, HYPRE_MEMORY_HOST);
+   aux_vector = hypre_CTAlloc(hypre_AuxParVector, 1, HYPRE_MEMORY_HOST);
 
    /* set defaults */
-   hypre_AuxParVectorMaxOffProcElmts(vector) = 0;
-   hypre_AuxParVectorCurrentOffProcElmts(vector) = 0;
+   hypre_AuxParVectorMaxOffProcElmts(aux_vector)     = 0;
+   hypre_AuxParVectorCurrentOffProcElmts(aux_vector) = 0;
+
    /* stash for setting or adding off processor values */
-   hypre_AuxParVectorOffProcI(vector) = NULL;
-   hypre_AuxParVectorOffProcData(vector) = NULL;
-   hypre_AuxParVectorMemoryLocation(vector) = HYPRE_MEMORY_HOST;
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-   hypre_AuxParVectorMaxStackElmts(vector) = 0;
-   hypre_AuxParVectorCurrentStackElmts(vector) = 0;
-   hypre_AuxParVectorStackI(vector) = NULL;
-   hypre_AuxParVectorStackData(vector) = NULL;
-   hypre_AuxParVectorStackSorA(vector) = NULL;
-   hypre_AuxParVectorUsrOffProcElmts(vector) = -1;
-   hypre_AuxParVectorInitAllocFactor(vector) = 1.5;
-   hypre_AuxParVectorGrowFactor(vector) = 2.0;
+   hypre_AuxParVectorOffProcI(aux_vector)            = NULL;
+   hypre_AuxParVectorOffProcData(aux_vector)         = NULL;
+   hypre_AuxParVectorMemoryLocation(aux_vector)      = HYPRE_MEMORY_HOST;
+
+#if defined(HYPRE_USING_GPU)
+   hypre_AuxParVectorMaxStackElmts(aux_vector)       = 0;
+   hypre_AuxParVectorCurrentStackElmts(aux_vector)   = 0;
+   hypre_AuxParVectorStackI(aux_vector)              = NULL;
+   hypre_AuxParVectorStackVoff(aux_vector)           = NULL;
+   hypre_AuxParVectorStackData(aux_vector)           = NULL;
+   hypre_AuxParVectorStackSorA(aux_vector)           = NULL;
+   hypre_AuxParVectorUsrOffProcElmts(aux_vector)     = -1;
+   hypre_AuxParVectorInitAllocFactor(aux_vector)     = 1.5;
+   hypre_AuxParVectorGrowFactor(aux_vector)          = 2.0;
 #endif
 
-   *aux_vector = vector;
-   return 0;
+   *aux_vector_ptr = aux_vector;
+
+   return hypre_error_flag;
 }
 
 /*--------------------------------------------------------------------------
@@ -52,25 +56,26 @@ hypre_AuxParVectorCreate( hypre_AuxParVector **aux_vector)
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_AuxParVectorDestroy( hypre_AuxParVector *vector )
+hypre_AuxParVectorDestroy( hypre_AuxParVector *aux_vector )
 {
-   HYPRE_Int ierr=0;
-
-   if (vector)
+   if (aux_vector)
    {
-      hypre_TFree(hypre_AuxParVectorOffProcI(vector),    HYPRE_MEMORY_HOST);
-      hypre_TFree(hypre_AuxParVectorOffProcData(vector), HYPRE_MEMORY_HOST);
+      hypre_TFree(hypre_AuxParVectorOffProcI(aux_vector),    HYPRE_MEMORY_HOST);
+      hypre_TFree(hypre_AuxParVectorOffProcData(aux_vector), HYPRE_MEMORY_HOST);
+
+#if defined(HYPRE_USING_GPU)
+      HYPRE_MemoryLocation  memory_location = hypre_AuxParVectorMemoryLocation(aux_vector);
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-      hypre_TFree(hypre_AuxParVectorStackI(vector),    hypre_AuxParVectorMemoryLocation(vector));
-      hypre_TFree(hypre_AuxParVectorStackData(vector), hypre_AuxParVectorMemoryLocation(vector));
-      hypre_TFree(hypre_AuxParVectorStackSorA(vector), hypre_AuxParVectorMemoryLocation(vector));
+      hypre_TFree(hypre_AuxParVectorStackI(aux_vector),    memory_location);
+      hypre_TFree(hypre_AuxParVectorStackVoff(aux_vector), memory_location);
+      hypre_TFree(hypre_AuxParVectorStackData(aux_vector), memory_location);
+      hypre_TFree(hypre_AuxParVectorStackSorA(aux_vector), memory_location);
 #endif
 
-      hypre_TFree(vector, HYPRE_MEMORY_HOST);
+      hypre_TFree(aux_vector, HYPRE_MEMORY_HOST);
    }
 
-   return ierr;
+   return hypre_error_flag;
 }
 
 /*--------------------------------------------------------------------------
@@ -78,21 +83,24 @@ hypre_AuxParVectorDestroy( hypre_AuxParVector *vector )
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_AuxParVectorInitialize_v2( hypre_AuxParVector *vector, HYPRE_MemoryLocation memory_location )
+hypre_AuxParVectorInitialize_v2( hypre_AuxParVector   *aux_vector,
+                                 HYPRE_MemoryLocation  memory_location )
 {
-   hypre_AuxParVectorMemoryLocation(vector) = memory_location;
+   hypre_AuxParVectorMemoryLocation(aux_vector) = memory_location;
 
-   if ( memory_location == HYPRE_MEMORY_HOST )
+   if (memory_location == HYPRE_MEMORY_HOST)
    {
       /* CPU assembly */
       /* allocate stash for setting or adding off processor values */
-      HYPRE_Int max_off_proc_elmts = hypre_AuxParVectorMaxOffProcElmts(vector);
+      HYPRE_Int max_off_proc_elmts = hypre_AuxParVectorMaxOffProcElmts(aux_vector);
       if (max_off_proc_elmts > 0)
       {
-         hypre_AuxParVectorOffProcI(vector)    = hypre_CTAlloc(HYPRE_BigInt,  max_off_proc_elmts, HYPRE_MEMORY_HOST);
-         hypre_AuxParVectorOffProcData(vector) = hypre_CTAlloc(HYPRE_Complex, max_off_proc_elmts, HYPRE_MEMORY_HOST);
+         hypre_AuxParVectorOffProcI(aux_vector)    = hypre_CTAlloc(HYPRE_BigInt,  max_off_proc_elmts,
+                                                                   HYPRE_MEMORY_HOST);
+         hypre_AuxParVectorOffProcData(aux_vector) = hypre_CTAlloc(HYPRE_Complex, max_off_proc_elmts,
+                                                                   HYPRE_MEMORY_HOST);
       }
    }
 
-   return 0;
+   return hypre_error_flag;
 }
diff --git a/external/hypre/src/IJ_mv/aux_par_vector.h b/external/hypre/src/IJ_mv/aux_par_vector.h
index 96a06ee9..0d0d93e4 100644
--- a/external/hypre/src/IJ_mv/aux_par_vector.h
+++ b/external/hypre/src/IJ_mv/aux_par_vector.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -30,10 +30,11 @@ typedef struct
 
    HYPRE_MemoryLocation memory_location;
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
    HYPRE_Int            max_stack_elmts;      /* length of stash for SetValues and AddToValues*/
    HYPRE_Int            current_stack_elmts;  /* current no. of elements stored in stash */
    HYPRE_BigInt        *stack_i;              /* contains row indices */
+   HYPRE_BigInt        *stack_voff;           /* contains vector offsets for multivectors */
    HYPRE_Complex       *stack_data;           /* contains corresponding data */
    char                *stack_sora;
    HYPRE_Int            usr_off_proc_elmts;   /* the num of off-proc elements usr guided */
@@ -53,10 +54,11 @@ typedef struct
 
 #define hypre_AuxParVectorMemoryLocation(vector)       ((vector) -> memory_location)
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
 #define hypre_AuxParVectorMaxStackElmts(vector)        ((vector) -> max_stack_elmts)
 #define hypre_AuxParVectorCurrentStackElmts(vector)    ((vector) -> current_stack_elmts)
 #define hypre_AuxParVectorStackI(vector)               ((vector) -> stack_i)
+#define hypre_AuxParVectorStackVoff(vector)            ((vector) -> stack_voff)
 #define hypre_AuxParVectorStackData(vector)            ((vector) -> stack_data)
 #define hypre_AuxParVectorStackSorA(vector)            ((vector) -> stack_sora)
 #define hypre_AuxParVectorUsrOffProcElmts(vector)      ((vector) -> usr_off_proc_elmts)
diff --git a/external/hypre/src/IJ_mv/aux_parcsr_matrix.c b/external/hypre/src/IJ_mv/aux_parcsr_matrix.c
index 83a150bc..66fe607f 100644
--- a/external/hypre/src/IJ_mv/aux_parcsr_matrix.c
+++ b/external/hypre/src/IJ_mv/aux_parcsr_matrix.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -52,7 +52,7 @@ hypre_AuxParCSRMatrixCreate( hypre_AuxParCSRMatrix **aux_matrix,
    hypre_AuxParCSRMatrixOffProcJ(matrix) = NULL;
    hypre_AuxParCSRMatrixOffProcData(matrix) = NULL;
    hypre_AuxParCSRMatrixMemoryLocation(matrix) = HYPRE_MEMORY_HOST;
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
    hypre_AuxParCSRMatrixMaxStackElmts(matrix) = 0;
    hypre_AuxParCSRMatrixCurrentStackElmts(matrix) = 0;
    hypre_AuxParCSRMatrixStackI(matrix) = NULL;
@@ -61,7 +61,8 @@ hypre_AuxParCSRMatrixCreate( hypre_AuxParCSRMatrix **aux_matrix,
    hypre_AuxParCSRMatrixStackSorA(matrix) = NULL;
    hypre_AuxParCSRMatrixUsrOnProcElmts(matrix) = -1;
    hypre_AuxParCSRMatrixUsrOffProcElmts(matrix) = -1;
-   hypre_AuxParCSRMatrixInitAllocFactor(matrix) = 5.0;
+   hypre_AuxParCSRMatrixInitAllocFactor(matrix) = 0;
+   hypre_AuxParCSRMatrixEarlyAssemble(matrix) = 0;
    hypre_AuxParCSRMatrixGrowFactor(matrix) = 2.0;
 #endif
 
@@ -142,7 +143,7 @@ hypre_AuxParCSRMatrixDestroy( hypre_AuxParCSRMatrix *matrix )
       hypre_TFree(hypre_AuxParCSRMatrixOffProcJ(matrix),    HYPRE_MEMORY_HOST);
       hypre_TFree(hypre_AuxParCSRMatrixOffProcData(matrix), HYPRE_MEMORY_HOST);
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
       hypre_TFree(hypre_AuxParCSRMatrixStackI(matrix),    hypre_AuxParCSRMatrixMemoryLocation(matrix));
       hypre_TFree(hypre_AuxParCSRMatrixStackJ(matrix),    hypre_AuxParCSRMatrixMemoryLocation(matrix));
       hypre_TFree(hypre_AuxParCSRMatrixStackData(matrix), hypre_AuxParCSRMatrixMemoryLocation(matrix));
@@ -173,7 +174,7 @@ hypre_AuxParCSRMatrixSetRownnz( hypre_AuxParCSRMatrix *matrix )
    /* Count number of nonzero rows */
    local_num_rownnz = 0;
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) reduction(+:local_num_rownnz) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i) reduction(+:local_num_rownnz) HYPRE_SMP_SCHEDULE
 #endif
    for (i = 0; i < local_num_rows; i++)
    {
@@ -264,20 +265,25 @@ hypre_AuxParCSRMatrixInitialize_v2( hypre_AuxParCSRMatrix *matrix,
       return 0;
    }
 
+#if defined(HYPRE_USING_GPU)
    if (memory_location != HYPRE_MEMORY_HOST)
    {
       /* GPU assembly */
       hypre_AuxParCSRMatrixNeedAux(matrix) = 1;
    }
    else
+#endif
    {
       /* CPU assembly */
       /* allocate stash for setting or adding off processor values */
       if (max_off_proc_elmts > 0)
       {
-         hypre_AuxParCSRMatrixOffProcI(matrix)    = hypre_CTAlloc(HYPRE_BigInt, 2*max_off_proc_elmts, HYPRE_MEMORY_HOST);
-         hypre_AuxParCSRMatrixOffProcJ(matrix)    = hypre_CTAlloc(HYPRE_BigInt,   max_off_proc_elmts, HYPRE_MEMORY_HOST);
-         hypre_AuxParCSRMatrixOffProcData(matrix) = hypre_CTAlloc(HYPRE_Complex,  max_off_proc_elmts, HYPRE_MEMORY_HOST);
+         hypre_AuxParCSRMatrixOffProcI(matrix)    = hypre_CTAlloc(HYPRE_BigInt, 2 * max_off_proc_elmts,
+                                                                  HYPRE_MEMORY_HOST);
+         hypre_AuxParCSRMatrixOffProcJ(matrix)    = hypre_CTAlloc(HYPRE_BigInt,   max_off_proc_elmts,
+                                                                  HYPRE_MEMORY_HOST);
+         hypre_AuxParCSRMatrixOffProcData(matrix) = hypre_CTAlloc(HYPRE_Complex,  max_off_proc_elmts,
+                                                                  HYPRE_MEMORY_HOST);
       }
 
       if (hypre_AuxParCSRMatrixNeedAux(matrix))
@@ -323,7 +329,8 @@ hypre_AuxParCSRMatrixInitialize_v2( hypre_AuxParCSRMatrix *matrix,
 
          if (!hypre_AuxParCSRMatrixRowLength(matrix))
          {
-            hypre_AuxParCSRMatrixRowLength(matrix) = hypre_CTAlloc(HYPRE_Int, local_num_rows, HYPRE_MEMORY_HOST);
+            hypre_AuxParCSRMatrixRowLength(matrix) = hypre_CTAlloc(HYPRE_Int, local_num_rows,
+                                                                   HYPRE_MEMORY_HOST);
          }
 
          if (row_space)
@@ -352,8 +359,8 @@ hypre_AuxParCSRMatrixInitialize_v2( hypre_AuxParCSRMatrix *matrix,
             for (i = 0; i < local_num_rows; i++)
             {
                row_space[i] = 30;
-               aux_j[i] = hypre_CTAlloc(HYPRE_BigInt, 30, HYPRE_MEMORY_HOST);
-               aux_data[i] = hypre_CTAlloc(HYPRE_Complex, 30, HYPRE_MEMORY_HOST);
+               aux_j[i] = hypre_CTAlloc(HYPRE_BigInt, row_space[i], HYPRE_MEMORY_HOST);
+               aux_data[i] = hypre_CTAlloc(HYPRE_Complex, row_space[i], HYPRE_MEMORY_HOST);
             }
             hypre_AuxParCSRMatrixRowSpace(matrix) = row_space;
          }
diff --git a/external/hypre/src/IJ_mv/aux_parcsr_matrix.h b/external/hypre/src/IJ_mv/aux_parcsr_matrix.h
index 7cdeb7b1..04609828 100644
--- a/external/hypre/src/IJ_mv/aux_parcsr_matrix.h
+++ b/external/hypre/src/IJ_mv/aux_parcsr_matrix.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -65,16 +65,17 @@ typedef struct
 
    HYPRE_MemoryLocation memory_location;
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-   HYPRE_Int            max_stack_elmts;
-   HYPRE_Int            current_stack_elmts;
+#if defined(HYPRE_USING_GPU)
+   HYPRE_BigInt         max_stack_elmts;
+   HYPRE_BigInt         current_stack_elmts;
    HYPRE_BigInt        *stack_i;
    HYPRE_BigInt        *stack_j;
    HYPRE_Complex       *stack_data;
    char                *stack_sora;              /* Set (1) or Add (0) */
    HYPRE_Int            usr_on_proc_elmts;       /* user given num elmt on-proc */
    HYPRE_Int            usr_off_proc_elmts;      /* user given num elmt off-proc */
-   HYPRE_Real           init_alloc_factor;
+   HYPRE_Int            early_assemble;
+   HYPRE_Int            init_alloc_factor;
    HYPRE_Real           grow_factor;
 #endif
 } hypre_AuxParCSRMatrix;
@@ -109,7 +110,7 @@ typedef struct
 
 #define hypre_AuxParCSRMatrixMemoryLocation(matrix)       ((matrix) -> memory_location)
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
 #define hypre_AuxParCSRMatrixMaxStackElmts(matrix)        ((matrix) -> max_stack_elmts)
 #define hypre_AuxParCSRMatrixCurrentStackElmts(matrix)    ((matrix) -> current_stack_elmts)
 #define hypre_AuxParCSRMatrixStackI(matrix)               ((matrix) -> stack_i)
@@ -118,6 +119,7 @@ typedef struct
 #define hypre_AuxParCSRMatrixStackSorA(matrix)            ((matrix) -> stack_sora)
 #define hypre_AuxParCSRMatrixUsrOnProcElmts(matrix)       ((matrix) -> usr_on_proc_elmts)
 #define hypre_AuxParCSRMatrixUsrOffProcElmts(matrix)      ((matrix) -> usr_off_proc_elmts)
+#define hypre_AuxParCSRMatrixEarlyAssemble(matrix)        ((matrix) -> early_assemble)
 #define hypre_AuxParCSRMatrixInitAllocFactor(matrix)      ((matrix) -> init_alloc_factor)
 #define hypre_AuxParCSRMatrixGrowFactor(matrix)           ((matrix) -> grow_factor)
 #endif
diff --git a/external/hypre/src/IJ_mv/headers b/external/hypre/src/IJ_mv/headers
old mode 100644
new mode 100755
index 04544958..7e345761
--- a/external/hypre/src/IJ_mv/headers
+++ b/external/hypre/src/IJ_mv/headers
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/IJ_mv/protos.h b/external/hypre/src/IJ_mv/protos.h
index ed29ddd5..c5e8ff4a 100644
--- a/external/hypre/src/IJ_mv/protos.h
+++ b/external/hypre/src/IJ_mv/protos.h
@@ -1,150 +1,251 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
  ******************************************************************************/
 
 /* aux_parcsr_matrix.c */
-HYPRE_Int hypre_AuxParCSRMatrixCreate ( hypre_AuxParCSRMatrix **aux_matrix , HYPRE_Int local_num_rows , HYPRE_Int local_num_cols , HYPRE_Int *sizes );
+HYPRE_Int hypre_AuxParCSRMatrixCreate ( hypre_AuxParCSRMatrix **aux_matrix,
+                                        HYPRE_Int local_num_rows, HYPRE_Int local_num_cols, HYPRE_Int *sizes );
 HYPRE_Int hypre_AuxParCSRMatrixDestroy ( hypre_AuxParCSRMatrix *matrix );
 HYPRE_Int hypre_AuxParCSRMatrixSetRownnz ( hypre_AuxParCSRMatrix *matrix );
 HYPRE_Int hypre_AuxParCSRMatrixInitialize ( hypre_AuxParCSRMatrix *matrix );
-HYPRE_Int hypre_AuxParCSRMatrixInitialize_v2( hypre_AuxParCSRMatrix *matrix, HYPRE_MemoryLocation memory_location );
+HYPRE_Int hypre_AuxParCSRMatrixInitialize_v2( hypre_AuxParCSRMatrix *matrix,
+                                              HYPRE_MemoryLocation memory_location );
 
 /* aux_par_vector.c */
 HYPRE_Int hypre_AuxParVectorCreate ( hypre_AuxParVector **aux_vector );
 HYPRE_Int hypre_AuxParVectorDestroy ( hypre_AuxParVector *vector );
 HYPRE_Int hypre_AuxParVectorInitialize ( hypre_AuxParVector *vector );
-HYPRE_Int hypre_AuxParVectorInitialize_v2( hypre_AuxParVector *vector, HYPRE_MemoryLocation memory_location );
+HYPRE_Int hypre_AuxParVectorInitialize_v2( hypre_AuxParVector *vector,
+                                           HYPRE_MemoryLocation memory_location );
 
 /* IJ_assumed_part.c */
 HYPRE_Int hypre_IJMatrixCreateAssumedPartition ( hypre_IJMatrix *matrix );
 HYPRE_Int hypre_IJVectorCreateAssumedPartition ( hypre_IJVector *vector );
 
 /* IJMatrix.c */
-HYPRE_Int hypre_IJMatrixGetRowPartitioning ( HYPRE_IJMatrix matrix , HYPRE_BigInt **row_partitioning );
-HYPRE_Int hypre_IJMatrixGetColPartitioning ( HYPRE_IJMatrix matrix , HYPRE_BigInt **col_partitioning );
-HYPRE_Int hypre_IJMatrixSetObject ( HYPRE_IJMatrix matrix , void *object );
+HYPRE_Int hypre_IJMatrixGetRowPartitioning ( HYPRE_IJMatrix matrix,
+                                             HYPRE_BigInt **row_partitioning );
+HYPRE_Int hypre_IJMatrixGetColPartitioning ( HYPRE_IJMatrix matrix,
+                                             HYPRE_BigInt **col_partitioning );
+HYPRE_Int hypre_IJMatrixSetObject ( HYPRE_IJMatrix matrix, void *object );
+HYPRE_Int hypre_IJMatrixRead( const char *filename, MPI_Comm comm, HYPRE_Int type,
+                              HYPRE_IJMatrix *matrix_ptr, HYPRE_Int is_mm );
+HYPRE_Int hypre_IJMatrixReadBinary( const char *prefixname, MPI_Comm comm,
+                                    HYPRE_Int type, HYPRE_IJMatrix *matrix_ptr );
 
 /* IJMatrix_isis.c */
-HYPRE_Int hypre_IJMatrixSetLocalSizeISIS ( hypre_IJMatrix *matrix , HYPRE_Int local_m , HYPRE_Int local_n );
+HYPRE_Int hypre_IJMatrixSetLocalSizeISIS ( hypre_IJMatrix *matrix, HYPRE_Int local_m,
+                                           HYPRE_Int local_n );
 HYPRE_Int hypre_IJMatrixCreateISIS ( hypre_IJMatrix *matrix );
-HYPRE_Int hypre_IJMatrixSetRowSizesISIS ( hypre_IJMatrix *matrix , HYPRE_Int *sizes );
-HYPRE_Int hypre_IJMatrixSetDiagRowSizesISIS ( hypre_IJMatrix *matrix , HYPRE_Int *sizes );
-HYPRE_Int hypre_IJMatrixSetOffDiagRowSizesISIS ( hypre_IJMatrix *matrix , HYPRE_Int *sizes );
+HYPRE_Int hypre_IJMatrixSetRowSizesISIS ( hypre_IJMatrix *matrix, HYPRE_Int *sizes );
+HYPRE_Int hypre_IJMatrixSetDiagRowSizesISIS ( hypre_IJMatrix *matrix, HYPRE_Int *sizes );
+HYPRE_Int hypre_IJMatrixSetOffDiagRowSizesISIS ( hypre_IJMatrix *matrix, HYPRE_Int *sizes );
 HYPRE_Int hypre_IJMatrixInitializeISIS ( hypre_IJMatrix *matrix );
-HYPRE_Int hypre_IJMatrixInsertBlockISIS ( hypre_IJMatrix *matrix , HYPRE_Int m , HYPRE_Int n , HYPRE_Int *rows , HYPRE_Int *cols , HYPRE_Complex *coeffs );
-HYPRE_Int hypre_IJMatrixAddToBlockISIS ( hypre_IJMatrix *matrix , HYPRE_Int m , HYPRE_Int n , HYPRE_BigInt *rows , HYPRE_BigInt *cols , HYPRE_Complex *coeffs );
-HYPRE_Int hypre_IJMatrixInsertRowISIS ( hypre_IJMatrix *matrix , HYPRE_Int n , HYPRE_BigInt row , HYPRE_BigInt *indices , HYPRE_Complex *coeffs );
-HYPRE_Int hypre_IJMatrixAddToRowISIS ( hypre_IJMatrix *matrix , HYPRE_Int n , HYPRE_BigInt row , HYPRE_BigInt *indices , HYPRE_Complex *coeffs );
+HYPRE_Int hypre_IJMatrixInsertBlockISIS ( hypre_IJMatrix *matrix, HYPRE_Int m, HYPRE_Int n,
+                                          HYPRE_Int *rows, HYPRE_Int *cols, HYPRE_Complex *coeffs );
+HYPRE_Int hypre_IJMatrixAddToBlockISIS ( hypre_IJMatrix *matrix, HYPRE_Int m, HYPRE_Int n,
+                                         HYPRE_BigInt *rows, HYPRE_BigInt *cols, HYPRE_Complex *coeffs );
+HYPRE_Int hypre_IJMatrixInsertRowISIS ( hypre_IJMatrix *matrix, HYPRE_Int n, HYPRE_BigInt row,
+                                        HYPRE_BigInt *indices, HYPRE_Complex *coeffs );
+HYPRE_Int hypre_IJMatrixAddToRowISIS ( hypre_IJMatrix *matrix, HYPRE_Int n, HYPRE_BigInt row,
+                                       HYPRE_BigInt *indices, HYPRE_Complex *coeffs );
 HYPRE_Int hypre_IJMatrixAssembleISIS ( hypre_IJMatrix *matrix );
-HYPRE_Int hypre_IJMatrixDistributeISIS ( hypre_IJMatrix *matrix , HYPRE_BigInt *row_starts , HYPRE_BigInt *col_starts );
-HYPRE_Int hypre_IJMatrixApplyISIS ( hypre_IJMatrix *matrix , hypre_ParVector *x , hypre_ParVector *b );
+HYPRE_Int hypre_IJMatrixDistributeISIS ( hypre_IJMatrix *matrix, HYPRE_BigInt *row_starts,
+                                         HYPRE_BigInt *col_starts );
+HYPRE_Int hypre_IJMatrixApplyISIS ( hypre_IJMatrix *matrix, hypre_ParVector *x,
+                                    hypre_ParVector *b );
 HYPRE_Int hypre_IJMatrixDestroyISIS ( hypre_IJMatrix *matrix );
-HYPRE_Int hypre_IJMatrixSetTotalSizeISIS ( hypre_IJMatrix *matrix , HYPRE_Int size );
+HYPRE_Int hypre_IJMatrixSetTotalSizeISIS ( hypre_IJMatrix *matrix, HYPRE_Int size );
 
 /* IJMatrix_parcsr.c */
 HYPRE_Int hypre_IJMatrixCreateParCSR ( hypre_IJMatrix *matrix );
-HYPRE_Int hypre_IJMatrixSetRowSizesParCSR ( hypre_IJMatrix *matrix , const HYPRE_Int *sizes );
-HYPRE_Int hypre_IJMatrixSetDiagOffdSizesParCSR ( hypre_IJMatrix *matrix , const HYPRE_Int *diag_sizes , const HYPRE_Int *offdiag_sizes );
-HYPRE_Int hypre_IJMatrixSetMaxOffProcElmtsParCSR ( hypre_IJMatrix *matrix , HYPRE_Int max_off_proc_elmts );
+HYPRE_Int hypre_IJMatrixSetRowSizesParCSR ( hypre_IJMatrix *matrix, const HYPRE_Int *sizes );
+HYPRE_Int hypre_IJMatrixSetDiagOffdSizesParCSR ( hypre_IJMatrix *matrix,
+                                                 const HYPRE_Int *diag_sizes, const HYPRE_Int *offdiag_sizes );
+HYPRE_Int hypre_IJMatrixSetMaxOffProcElmtsParCSR ( hypre_IJMatrix *matrix,
+                                                   HYPRE_Int max_off_proc_elmts );
+HYPRE_Int hypre_IJMatrixSetInitAllocationParCSR(hypre_IJMatrix *matrix,
+                                                HYPRE_Int       factor);
+HYPRE_Int hypre_IJMatrixSetEarlyAssembleParCSR(hypre_IJMatrix *matrix,
+                                               HYPRE_Int       early_assemble);
+HYPRE_Int hypre_IJMatrixSetGrowFactorParCSR(hypre_IJMatrix *matrix,
+                                            HYPRE_Real      factor);
 HYPRE_Int hypre_IJMatrixInitializeParCSR ( hypre_IJMatrix *matrix );
-HYPRE_Int hypre_IJMatrixGetRowCountsParCSR ( hypre_IJMatrix *matrix , HYPRE_Int nrows , HYPRE_BigInt *rows , HYPRE_Int *ncols );
-HYPRE_Int hypre_IJMatrixGetValuesParCSR ( hypre_IJMatrix *matrix , HYPRE_Int nrows , HYPRE_Int *ncols , HYPRE_BigInt *rows , HYPRE_BigInt *cols , HYPRE_Complex *values );
-HYPRE_Int hypre_IJMatrixSetValuesParCSR ( hypre_IJMatrix *matrix , HYPRE_Int nrows , HYPRE_Int *ncols , const HYPRE_BigInt *rows , const HYPRE_Int *row_indexes , const HYPRE_BigInt *cols , const HYPRE_Complex *values );
-HYPRE_Int hypre_IJMatrixSetAddValuesParCSRDevice ( hypre_IJMatrix *matrix , HYPRE_Int nrows , HYPRE_Int *ncols , const HYPRE_BigInt *rows , const HYPRE_Int *row_indexes , const HYPRE_BigInt *cols , const HYPRE_Complex *values, const char *action );
-HYPRE_Int hypre_IJMatrixSetConstantValuesParCSR ( hypre_IJMatrix *matrix , HYPRE_Complex value );
-HYPRE_Int hypre_IJMatrixAddToValuesParCSR ( hypre_IJMatrix *matrix , HYPRE_Int nrows , HYPRE_Int *ncols , const HYPRE_BigInt *rows , const HYPRE_Int *row_indexes , const HYPRE_BigInt *cols , const HYPRE_Complex *values );
+HYPRE_Int hypre_IJMatrixGetRowCountsParCSR ( hypre_IJMatrix *matrix, HYPRE_Int nrows,
+                                             HYPRE_BigInt *rows, HYPRE_Int *ncols );
+HYPRE_Int hypre_IJMatrixGetValuesParCSR ( hypre_IJMatrix *matrix, HYPRE_Int nrows, HYPRE_Int *ncols,
+                                          HYPRE_BigInt *rows,
+                                          HYPRE_Int *row_indexes, HYPRE_BigInt *cols, HYPRE_Complex *values, HYPRE_Int zero_out );
+HYPRE_Int hypre_IJMatrixSetValuesParCSR ( hypre_IJMatrix *matrix, HYPRE_Int nrows, HYPRE_Int *ncols,
+                                          const HYPRE_BigInt *rows, const HYPRE_Int *row_indexes, const HYPRE_BigInt *cols,
+                                          const HYPRE_Complex *values );
+HYPRE_Int hypre_IJMatrixSetAddValuesParCSRDevice ( hypre_IJMatrix *matrix, HYPRE_Int nrows,
+                                                   HYPRE_Int *ncols, const HYPRE_BigInt *rows, const HYPRE_Int *row_indexes, const HYPRE_BigInt *cols,
+                                                   const HYPRE_Complex *values, const char *action );
+HYPRE_Int hypre_IJMatrixSetConstantValuesParCSR ( hypre_IJMatrix *matrix, HYPRE_Complex value );
+HYPRE_Int hypre_IJMatrixAddToValuesParCSR ( hypre_IJMatrix *matrix, HYPRE_Int nrows,
+                                            HYPRE_Int *ncols, const HYPRE_BigInt *rows, const HYPRE_Int *row_indexes, const HYPRE_BigInt *cols,
+                                            const HYPRE_Complex *values );
 HYPRE_Int hypre_IJMatrixDestroyParCSR ( hypre_IJMatrix *matrix );
-HYPRE_Int hypre_IJMatrixTransposeParCSR ( hypre_IJMatrix  *matrix_A , hypre_IJMatrix *matrix_AT );
-HYPRE_Int hypre_IJMatrixNormParCSR ( hypre_IJMatrix *matrix , HYPRE_Real *norm );
-HYPRE_Int hypre_IJMatrixAddParCSR ( HYPRE_Complex alpha , hypre_IJMatrix *matrix_A , HYPRE_Complex beta , hypre_IJMatrix *matrix_B , hypre_IJMatrix *matrix_C );
-HYPRE_Int hypre_IJMatrixAssembleOffProcValsParCSR ( hypre_IJMatrix *matrix , HYPRE_Int off_proc_i_indx , HYPRE_Int max_off_proc_elmts , HYPRE_Int current_num_elmts , HYPRE_MemoryLocation memory_location , HYPRE_BigInt *off_proc_i , HYPRE_BigInt *off_proc_j , HYPRE_Complex *off_proc_data );
-HYPRE_Int hypre_FillResponseIJOffProcVals ( void *p_recv_contact_buf , HYPRE_Int contact_size , HYPRE_Int contact_proc , void *ro , MPI_Comm comm , void **p_send_response_buf , HYPRE_Int *response_message_size );
-HYPRE_Int hypre_FindProc ( HYPRE_BigInt *list , HYPRE_BigInt value , HYPRE_Int list_length );
+HYPRE_Int hypre_IJMatrixTransposeParCSR ( hypre_IJMatrix  *matrix_A, hypre_IJMatrix *matrix_AT );
+HYPRE_Int hypre_IJMatrixNormParCSR ( hypre_IJMatrix *matrix, HYPRE_Real *norm );
+HYPRE_Int hypre_IJMatrixAddParCSR ( HYPRE_Complex alpha, hypre_IJMatrix *matrix_A,
+                                    HYPRE_Complex beta, hypre_IJMatrix *matrix_B, hypre_IJMatrix *matrix_C );
+HYPRE_Int hypre_IJMatrixAssembleOffProcValsParCSR ( hypre_IJMatrix *matrix,
+                                                    HYPRE_Int off_proc_i_indx, HYPRE_Int max_off_proc_elmts, HYPRE_Int current_num_elmts,
+                                                    HYPRE_MemoryLocation memory_location, HYPRE_BigInt *off_proc_i, HYPRE_BigInt *off_proc_j,
+                                                    HYPRE_Complex *off_proc_data );
+HYPRE_Int hypre_FillResponseIJOffProcVals ( void *p_recv_contact_buf, HYPRE_Int contact_size,
+                                            HYPRE_Int contact_proc, void *ro, MPI_Comm comm, void **p_send_response_buf,
+                                            HYPRE_Int *response_message_size );
+HYPRE_Int hypre_FindProc ( HYPRE_BigInt *list, HYPRE_BigInt value, HYPRE_Int list_length );
 HYPRE_Int hypre_IJMatrixAssembleParCSR ( hypre_IJMatrix *matrix );
-HYPRE_Int hypre_IJMatrixSetValuesOMPParCSR ( hypre_IJMatrix *matrix , HYPRE_Int nrows , HYPRE_Int *ncols , const HYPRE_BigInt *rows , const HYPRE_Int *row_indexes , const HYPRE_BigInt *cols , const HYPRE_Complex *values );
-HYPRE_Int hypre_IJMatrixAddToValuesOMPParCSR ( hypre_IJMatrix *matrix , HYPRE_Int nrows , HYPRE_Int *ncols , const HYPRE_BigInt *rows , const HYPRE_Int *row_indexes , const HYPRE_BigInt *cols , const HYPRE_Complex *values );
+HYPRE_Int hypre_IJMatrixSetValuesOMPParCSR ( hypre_IJMatrix *matrix, HYPRE_Int nrows,
+                                             HYPRE_Int *ncols, const HYPRE_BigInt *rows, const HYPRE_Int *row_indexes, const HYPRE_BigInt *cols,
+                                             const HYPRE_Complex *values );
+HYPRE_Int hypre_IJMatrixAddToValuesOMPParCSR ( hypre_IJMatrix *matrix, HYPRE_Int nrows,
+                                               HYPRE_Int *ncols, const HYPRE_BigInt *rows, const HYPRE_Int *row_indexes, const HYPRE_BigInt *cols,
+                                               const HYPRE_Complex *values );
 HYPRE_Int hypre_IJMatrixAssembleParCSRDevice(hypre_IJMatrix *matrix);
-HYPRE_Int hypre_IJMatrixInitializeParCSR_v2(hypre_IJMatrix *matrix, HYPRE_MemoryLocation memory_location);
-HYPRE_Int hypre_IJMatrixSetConstantValuesParCSRDevice( hypre_IJMatrix *matrix, HYPRE_Complex value );
+HYPRE_Int hypre_IJMatrixInitializeParCSR_v2(hypre_IJMatrix *matrix,
+                                            HYPRE_MemoryLocation memory_location);
+HYPRE_Int hypre_IJMatrixSetConstantValuesParCSRDevice( hypre_IJMatrix *matrix,
+                                                       HYPRE_Complex value );
+HYPRE_Int hypre_IJMatrixMigrateParCSR(hypre_IJMatrix *matrix, HYPRE_MemoryLocation memory_location);
+
+HYPRE_Int hypre_IJMatrixAssembleCommunicate(hypre_IJMatrix *matrix);
+HYPRE_Int hypre_IJMatrixAssembleCompressDevice(hypre_IJMatrix *matrix, HYPRE_Int reduce_stack_size);
 
 /* IJMatrix_petsc.c */
-HYPRE_Int hypre_IJMatrixSetLocalSizePETSc ( hypre_IJMatrix *matrix , HYPRE_Int local_m , HYPRE_Int local_n );
+HYPRE_Int hypre_IJMatrixSetLocalSizePETSc ( hypre_IJMatrix *matrix, HYPRE_Int local_m,
+                                            HYPRE_Int local_n );
 HYPRE_Int hypre_IJMatrixCreatePETSc ( hypre_IJMatrix *matrix );
-HYPRE_Int hypre_IJMatrixSetRowSizesPETSc ( hypre_IJMatrix *matrix , HYPRE_Int *sizes );
-HYPRE_Int hypre_IJMatrixSetDiagRowSizesPETSc ( hypre_IJMatrix *matrix , HYPRE_Int *sizes );
-HYPRE_Int hypre_IJMatrixSetOffDiagRowSizesPETSc ( hypre_IJMatrix *matrix , HYPRE_Int *sizes );
+HYPRE_Int hypre_IJMatrixSetRowSizesPETSc ( hypre_IJMatrix *matrix, HYPRE_Int *sizes );
+HYPRE_Int hypre_IJMatrixSetDiagRowSizesPETSc ( hypre_IJMatrix *matrix, HYPRE_Int *sizes );
+HYPRE_Int hypre_IJMatrixSetOffDiagRowSizesPETSc ( hypre_IJMatrix *matrix, HYPRE_Int *sizes );
 HYPRE_Int hypre_IJMatrixInitializePETSc ( hypre_IJMatrix *matrix );
-HYPRE_Int hypre_IJMatrixInsertBlockPETSc ( hypre_IJMatrix *matrix , HYPRE_Int m , HYPRE_Int n , HYPRE_BigInt *rows , HYPRE_BigInt *cols , HYPRE_Complex *coeffs );
-HYPRE_Int hypre_IJMatrixAddToBlockPETSc ( hypre_IJMatrix *matrix , HYPRE_Int m , HYPRE_Int n , HYPRE_Int *rows , HYPRE_Int *cols , HYPRE_Complex *coeffs );
-HYPRE_Int hypre_IJMatrixInsertRowPETSc ( hypre_IJMatrix *matrix , HYPRE_Int n , HYPRE_BigInt row , HYPRE_BigInt *indices , HYPRE_Complex *coeffs );
-HYPRE_Int hypre_IJMatrixAddToRowPETSc ( hypre_IJMatrix *matrix , HYPRE_Int n , HYPRE_BigInt row , HYPRE_BigInt *indices , HYPRE_Complex *coeffs );
+HYPRE_Int hypre_IJMatrixInsertBlockPETSc ( hypre_IJMatrix *matrix, HYPRE_Int m, HYPRE_Int n,
+                                           HYPRE_BigInt *rows, HYPRE_BigInt *cols, HYPRE_Complex *coeffs );
+HYPRE_Int hypre_IJMatrixAddToBlockPETSc ( hypre_IJMatrix *matrix, HYPRE_Int m, HYPRE_Int n,
+                                          HYPRE_Int *rows, HYPRE_Int *cols, HYPRE_Complex *coeffs );
+HYPRE_Int hypre_IJMatrixInsertRowPETSc ( hypre_IJMatrix *matrix, HYPRE_Int n, HYPRE_BigInt row,
+                                         HYPRE_BigInt *indices, HYPRE_Complex *coeffs );
+HYPRE_Int hypre_IJMatrixAddToRowPETSc ( hypre_IJMatrix *matrix, HYPRE_Int n, HYPRE_BigInt row,
+                                        HYPRE_BigInt *indices, HYPRE_Complex *coeffs );
 HYPRE_Int hypre_IJMatrixAssemblePETSc ( hypre_IJMatrix *matrix );
-HYPRE_Int hypre_IJMatrixDistributePETSc ( hypre_IJMatrix *matrix , HYPRE_BigInt *row_starts , HYPRE_BigInt *col_starts );
-HYPRE_Int hypre_IJMatrixApplyPETSc ( hypre_IJMatrix *matrix , hypre_ParVector *x , hypre_ParVector *b );
+HYPRE_Int hypre_IJMatrixDistributePETSc ( hypre_IJMatrix *matrix, HYPRE_BigInt *row_starts,
+                                          HYPRE_BigInt *col_starts );
+HYPRE_Int hypre_IJMatrixApplyPETSc ( hypre_IJMatrix *matrix, hypre_ParVector *x,
+                                     hypre_ParVector *b );
 HYPRE_Int hypre_IJMatrixDestroyPETSc ( hypre_IJMatrix *matrix );
-HYPRE_Int hypre_IJMatrixSetTotalSizePETSc ( hypre_IJMatrix *matrix , HYPRE_Int size );
+HYPRE_Int hypre_IJMatrixSetTotalSizePETSc ( hypre_IJMatrix *matrix, HYPRE_Int size );
 
 /* IJVector.c */
-HYPRE_Int hypre_IJVectorDistribute ( HYPRE_IJVector vector , const HYPRE_Int *vec_starts );
+HYPRE_Int hypre_IJVectorDistribute ( HYPRE_IJVector vector, const HYPRE_Int *vec_starts );
 HYPRE_Int hypre_IJVectorZeroValues ( HYPRE_IJVector vector );
+HYPRE_Int hypre_IJVectorReadBinary ( MPI_Comm comm, const char *filename, HYPRE_Int type,
+                                     HYPRE_IJVector *vector_ptr );
 
 /* IJVector_parcsr.c */
-HYPRE_Int hypre_IJVectorCreatePar ( hypre_IJVector *vector , HYPRE_BigInt *IJpartitioning );
+HYPRE_Int hypre_IJVectorCreatePar ( hypre_IJVector *vector, HYPRE_BigInt *IJpartitioning );
 HYPRE_Int hypre_IJVectorDestroyPar ( hypre_IJVector *vector );
+HYPRE_Int hypre_IJVectorInitializeParShell (hypre_IJVector *vector );
+HYPRE_Int hypre_IJVectorSetParData( hypre_IJVector *vector, HYPRE_Complex *data );
 HYPRE_Int hypre_IJVectorInitializePar ( hypre_IJVector *vector );
-HYPRE_Int hypre_IJVectorInitializePar_v2(hypre_IJVector *vector, HYPRE_MemoryLocation memory_location);
-HYPRE_Int hypre_IJVectorSetMaxOffProcElmtsPar ( hypre_IJVector *vector , HYPRE_Int max_off_proc_elmts );
-HYPRE_Int hypre_IJVectorDistributePar ( hypre_IJVector *vector , const HYPRE_Int *vec_starts );
+HYPRE_Int hypre_IJVectorInitializePar_v2(hypre_IJVector *vector,
+                                         HYPRE_MemoryLocation memory_location);
+HYPRE_Int hypre_IJVectorSetMaxOffProcElmtsPar ( hypre_IJVector *vector,
+                                                HYPRE_Int max_off_proc_elmts );
+HYPRE_Int hypre_IJVectorDistributePar ( hypre_IJVector *vector, const HYPRE_Int *vec_starts );
 HYPRE_Int hypre_IJVectorZeroValuesPar ( hypre_IJVector *vector );
-HYPRE_Int hypre_IJVectorSetValuesPar ( hypre_IJVector *vector , HYPRE_Int num_values , const HYPRE_BigInt *indices , const HYPRE_Complex *values );
-HYPRE_Int hypre_IJVectorAddToValuesPar ( hypre_IJVector *vector , HYPRE_Int num_values , const HYPRE_BigInt *indices , const HYPRE_Complex *values );
+HYPRE_Int hypre_IJVectorSetComponentPar ( hypre_IJVector *vector, HYPRE_Int component);
+HYPRE_Int hypre_IJVectorSetValuesPar ( hypre_IJVector *vector, HYPRE_Int num_values,
+                                       const HYPRE_BigInt *indices, const HYPRE_Complex *values );
+HYPRE_Int hypre_IJVectorSetConstantValuesPar ( hypre_IJVector *vector, HYPRE_Complex value );
+HYPRE_Int hypre_IJVectorAddToValuesPar ( hypre_IJVector *vector, HYPRE_Int num_values,
+                                         const HYPRE_BigInt *indices, const HYPRE_Complex *values );
 HYPRE_Int hypre_IJVectorAssemblePar ( hypre_IJVector *vector );
-HYPRE_Int hypre_IJVectorGetValuesPar ( hypre_IJVector *vector , HYPRE_Int num_values , const HYPRE_BigInt *indices , HYPRE_Complex *values );
-HYPRE_Int hypre_IJVectorAssembleOffProcValsPar ( hypre_IJVector *vector , HYPRE_Int max_off_proc_elmts , HYPRE_Int current_num_elmts , HYPRE_MemoryLocation memory_location , HYPRE_BigInt *off_proc_i , HYPRE_Complex *off_proc_data );
-HYPRE_Int hypre_IJVectorSetAddValuesParDevice(hypre_IJVector *vector, HYPRE_Int num_values, const HYPRE_BigInt *indices, const HYPRE_Complex *values, const char *action);
+HYPRE_Int hypre_IJVectorGetValuesPar ( hypre_IJVector *vector, HYPRE_Int num_values,
+                                       const HYPRE_BigInt *indices, HYPRE_Complex *values );
+HYPRE_Int hypre_IJVectorAssembleOffProcValsPar ( hypre_IJVector *vector,
+                                                 HYPRE_Int max_off_proc_elmts, HYPRE_Int current_num_elmts, HYPRE_MemoryLocation memory_location,
+                                                 HYPRE_BigInt *off_proc_i, HYPRE_Complex *off_proc_data );
+HYPRE_Int hypre_IJVectorSetAddValuesParDevice(hypre_IJVector *vector, HYPRE_Int num_values,
+                                              const HYPRE_BigInt *indices, const HYPRE_Complex *values, const char *action);
 HYPRE_Int hypre_IJVectorAssembleParDevice(hypre_IJVector *vector);
+HYPRE_Int hypre_IJVectorUpdateValuesDevice( hypre_IJVector *vector, HYPRE_Int num_values,
+                                            const HYPRE_BigInt *indices, const HYPRE_Complex *values, HYPRE_Int action);
+HYPRE_Int hypre_IJVectorMigrateParCSR(hypre_IJVector *vector, HYPRE_MemoryLocation memory_location);
 
 /* HYPRE_IJMatrix.c */
-HYPRE_Int HYPRE_IJMatrixCreate ( MPI_Comm comm , HYPRE_BigInt ilower , HYPRE_BigInt iupper , HYPRE_BigInt jlower , HYPRE_BigInt jupper , HYPRE_IJMatrix *matrix );
+HYPRE_Int HYPRE_IJMatrixCreate ( MPI_Comm comm, HYPRE_BigInt ilower, HYPRE_BigInt iupper,
+                                 HYPRE_BigInt jlower, HYPRE_BigInt jupper, HYPRE_IJMatrix *matrix );
+HYPRE_Int HYPRE_IJMatrixPartialClone ( HYPRE_IJMatrix matrix_in, HYPRE_IJMatrix *matrix_out );
 HYPRE_Int HYPRE_IJMatrixDestroy ( HYPRE_IJMatrix matrix );
 HYPRE_Int HYPRE_IJMatrixInitialize ( HYPRE_IJMatrix matrix );
-HYPRE_Int HYPRE_IJMatrixSetPrintLevel ( HYPRE_IJMatrix matrix , HYPRE_Int print_level );
-HYPRE_Int HYPRE_IJMatrixSetValues ( HYPRE_IJMatrix matrix , HYPRE_Int nrows , HYPRE_Int *ncols , const HYPRE_BigInt *rows , const HYPRE_BigInt *cols , const HYPRE_Complex *values );
-HYPRE_Int HYPRE_IJMatrixSetConstantValues ( HYPRE_IJMatrix matrix , HYPRE_Complex value );
-HYPRE_Int HYPRE_IJMatrixAddToValues ( HYPRE_IJMatrix matrix , HYPRE_Int nrows , HYPRE_Int *ncols , const HYPRE_BigInt *rows , const HYPRE_BigInt *cols , const HYPRE_Complex *values );
+HYPRE_Int HYPRE_IJMatrixSetPrintLevel ( HYPRE_IJMatrix matrix, HYPRE_Int print_level );
+HYPRE_Int HYPRE_IJMatrixSetValues ( HYPRE_IJMatrix matrix, HYPRE_Int nrows, HYPRE_Int *ncols,
+                                    const HYPRE_BigInt *rows, const HYPRE_BigInt *cols, const HYPRE_Complex *values );
+HYPRE_Int HYPRE_IJMatrixSetConstantValues ( HYPRE_IJMatrix matrix, HYPRE_Complex value );
+HYPRE_Int HYPRE_IJMatrixAddToValues ( HYPRE_IJMatrix matrix, HYPRE_Int nrows, HYPRE_Int *ncols,
+                                      const HYPRE_BigInt *rows, const HYPRE_BigInt *cols, const HYPRE_Complex *values );
 HYPRE_Int HYPRE_IJMatrixAssemble ( HYPRE_IJMatrix matrix );
-HYPRE_Int HYPRE_IJMatrixGetRowCounts ( HYPRE_IJMatrix matrix , HYPRE_Int nrows , HYPRE_BigInt *rows , HYPRE_Int *ncols );
-HYPRE_Int HYPRE_IJMatrixGetValues ( HYPRE_IJMatrix matrix , HYPRE_Int nrows , HYPRE_Int *ncols , HYPRE_BigInt *rows , HYPRE_BigInt *cols , HYPRE_Complex *values );
-HYPRE_Int HYPRE_IJMatrixSetObjectType ( HYPRE_IJMatrix matrix , HYPRE_Int type );
-HYPRE_Int HYPRE_IJMatrixGetObjectType ( HYPRE_IJMatrix matrix , HYPRE_Int *type );
-HYPRE_Int HYPRE_IJMatrixGetLocalRange ( HYPRE_IJMatrix matrix , HYPRE_BigInt *ilower , HYPRE_BigInt *iupper , HYPRE_BigInt *jlower , HYPRE_BigInt *jupper );
-HYPRE_Int HYPRE_IJMatrixGetObject ( HYPRE_IJMatrix matrix , void **object );
-HYPRE_Int HYPRE_IJMatrixSetRowSizes ( HYPRE_IJMatrix matrix , const HYPRE_Int *sizes );
-HYPRE_Int HYPRE_IJMatrixSetDiagOffdSizes ( HYPRE_IJMatrix matrix , const HYPRE_Int *diag_sizes , const HYPRE_Int *offdiag_sizes );
-HYPRE_Int HYPRE_IJMatrixSetMaxOffProcElmts ( HYPRE_IJMatrix matrix , HYPRE_Int max_off_proc_elmts );
-HYPRE_Int HYPRE_IJMatrixRead ( const char *filename , MPI_Comm comm , HYPRE_Int type , HYPRE_IJMatrix *matrix_ptr );
-HYPRE_Int HYPRE_IJMatrixPrint ( HYPRE_IJMatrix matrix , const char *filename );
-HYPRE_Int HYPRE_IJMatrixSetOMPFlag ( HYPRE_IJMatrix matrix , HYPRE_Int omp_flag );
-HYPRE_Int HYPRE_IJMatrixTranspose ( HYPRE_IJMatrix  matrix_A , HYPRE_IJMatrix *matrix_AT );
-HYPRE_Int HYPRE_IJMatrixNorm ( HYPRE_IJMatrix matrix , HYPRE_Real *norm );
-HYPRE_Int HYPRE_IJMatrixAdd ( HYPRE_Complex alpha , HYPRE_IJMatrix matrix_A , HYPRE_Complex beta , HYPRE_IJMatrix matrix_B , HYPRE_IJMatrix *matrix_C );
+HYPRE_Int HYPRE_IJMatrixGetRowCounts ( HYPRE_IJMatrix matrix, HYPRE_Int nrows, HYPRE_BigInt *rows,
+                                       HYPRE_Int *ncols );
+HYPRE_Int HYPRE_IJMatrixGetValues ( HYPRE_IJMatrix matrix, HYPRE_Int nrows, HYPRE_Int *ncols,
+                                    HYPRE_BigInt *rows, HYPRE_BigInt *cols, HYPRE_Complex *values );
+HYPRE_Int HYPRE_IJMatrixSetObjectType ( HYPRE_IJMatrix matrix, HYPRE_Int type );
+HYPRE_Int HYPRE_IJMatrixGetObjectType ( HYPRE_IJMatrix matrix, HYPRE_Int *type );
+HYPRE_Int HYPRE_IJMatrixGetLocalRange ( HYPRE_IJMatrix matrix, HYPRE_BigInt *ilower,
+                                        HYPRE_BigInt *iupper, HYPRE_BigInt *jlower, HYPRE_BigInt *jupper );
+HYPRE_Int HYPRE_IJMatrixGetObject ( HYPRE_IJMatrix matrix, void **object );
+HYPRE_Int HYPRE_IJMatrixSetRowSizes ( HYPRE_IJMatrix matrix, const HYPRE_Int *sizes );
+HYPRE_Int HYPRE_IJMatrixSetDiagOffdSizes ( HYPRE_IJMatrix matrix, const HYPRE_Int *diag_sizes,
+                                           const HYPRE_Int *offdiag_sizes );
+HYPRE_Int HYPRE_IJMatrixSetMaxOffProcElmts ( HYPRE_IJMatrix matrix, HYPRE_Int max_off_proc_elmts );
+HYPRE_Int HYPRE_IJMatrixRead ( const char *filename, MPI_Comm comm, HYPRE_Int type,
+                               HYPRE_IJMatrix *matrix_ptr );
+HYPRE_Int HYPRE_IJMatrixReadBinary ( const char *filename, MPI_Comm comm, HYPRE_Int type,
+                                     HYPRE_IJMatrix *matrix_ptr );
+HYPRE_Int HYPRE_IJMatrixReadMM( const char *filename, MPI_Comm comm, HYPRE_Int type,
+                                HYPRE_IJMatrix *matrix_ptr );
+HYPRE_Int HYPRE_IJMatrixPrint ( HYPRE_IJMatrix matrix, const char *filename );
+HYPRE_Int HYPRE_IJMatrixPrintBinary ( HYPRE_IJMatrix matrix, const char *filename );
+HYPRE_Int HYPRE_IJMatrixSetOMPFlag ( HYPRE_IJMatrix matrix, HYPRE_Int omp_flag );
+HYPRE_Int HYPRE_IJMatrixTranspose ( HYPRE_IJMatrix  matrix_A, HYPRE_IJMatrix *matrix_AT );
+HYPRE_Int HYPRE_IJMatrixNorm ( HYPRE_IJMatrix matrix, HYPRE_Real *norm );
+HYPRE_Int HYPRE_IJMatrixAdd ( HYPRE_Complex alpha, HYPRE_IJMatrix matrix_A, HYPRE_Complex beta,
+                              HYPRE_IJMatrix matrix_B, HYPRE_IJMatrix *matrix_C );
 
 /* HYPRE_IJVector.c */
-HYPRE_Int HYPRE_IJVectorCreate ( MPI_Comm comm , HYPRE_BigInt jlower , HYPRE_BigInt jupper , HYPRE_IJVector *vector );
+HYPRE_Int HYPRE_IJVectorCreate ( MPI_Comm comm, HYPRE_BigInt jlower, HYPRE_BigInt jupper,
+                                 HYPRE_IJVector *vector );
+HYPRE_Int HYPRE_IJVectorSetNumComponents ( HYPRE_IJVector vector, HYPRE_Int num_components );
+HYPRE_Int HYPRE_IJVectorSetComponent ( HYPRE_IJVector vector, HYPRE_Int component );
 HYPRE_Int HYPRE_IJVectorDestroy ( HYPRE_IJVector vector );
 HYPRE_Int HYPRE_IJVectorInitialize ( HYPRE_IJVector vector );
-HYPRE_Int HYPRE_IJVectorSetPrintLevel ( HYPRE_IJVector vector , HYPRE_Int print_level );
-HYPRE_Int HYPRE_IJVectorSetValues ( HYPRE_IJVector vector , HYPRE_Int nvalues , const HYPRE_BigInt *indices , const HYPRE_Complex *values );
-HYPRE_Int HYPRE_IJVectorAddToValues ( HYPRE_IJVector vector , HYPRE_Int nvalues , const HYPRE_BigInt *indices , const HYPRE_Complex *values );
+HYPRE_Int HYPRE_IJVectorSetPrintLevel ( HYPRE_IJVector vector, HYPRE_Int print_level );
+HYPRE_Int HYPRE_IJVectorSetValues ( HYPRE_IJVector vector, HYPRE_Int nvalues,
+                                    const HYPRE_BigInt *indices, const HYPRE_Complex *values );
+HYPRE_Int HYPRE_IJVectorSetConstantValues ( HYPRE_IJVector vector, HYPRE_Complex value );
+HYPRE_Int HYPRE_IJVectorAddToValues ( HYPRE_IJVector vector, HYPRE_Int nvalues,
+                                      const HYPRE_BigInt *indices, const HYPRE_Complex *values );
 HYPRE_Int HYPRE_IJVectorAssemble ( HYPRE_IJVector vector );
-HYPRE_Int HYPRE_IJVectorGetValues ( HYPRE_IJVector vector , HYPRE_Int nvalues , const HYPRE_BigInt *indices , HYPRE_Complex *values );
-HYPRE_Int HYPRE_IJVectorSetMaxOffProcElmts ( HYPRE_IJVector vector , HYPRE_Int max_off_proc_elmts );
-HYPRE_Int HYPRE_IJVectorSetObjectType ( HYPRE_IJVector vector , HYPRE_Int type );
-HYPRE_Int HYPRE_IJVectorGetObjectType ( HYPRE_IJVector vector , HYPRE_Int *type );
-HYPRE_Int HYPRE_IJVectorGetLocalRange ( HYPRE_IJVector vector , HYPRE_BigInt *jlower , HYPRE_BigInt *jupper );
-HYPRE_Int HYPRE_IJVectorGetObject ( HYPRE_IJVector vector , void **object );
-HYPRE_Int HYPRE_IJVectorRead ( const char *filename , MPI_Comm comm , HYPRE_Int type , HYPRE_IJVector *vector_ptr );
-HYPRE_Int HYPRE_IJVectorPrint ( HYPRE_IJVector vector , const char *filename );
+HYPRE_Int HYPRE_IJVectorGetValues ( HYPRE_IJVector vector, HYPRE_Int nvalues,
+                                    const HYPRE_BigInt *indices, HYPRE_Complex *values );
+HYPRE_Int HYPRE_IJVectorSetMaxOffProcElmts ( HYPRE_IJVector vector, HYPRE_Int max_off_proc_elmts );
+HYPRE_Int HYPRE_IJVectorSetObjectType ( HYPRE_IJVector vector, HYPRE_Int type );
+HYPRE_Int HYPRE_IJVectorGetObjectType ( HYPRE_IJVector vector, HYPRE_Int *type );
+HYPRE_Int HYPRE_IJVectorGetLocalRange ( HYPRE_IJVector vector, HYPRE_BigInt *jlower,
+                                        HYPRE_BigInt *jupper );
+HYPRE_Int HYPRE_IJVectorGetObject ( HYPRE_IJVector vector, void **object );
+HYPRE_Int HYPRE_IJVectorRead ( const char *filename, MPI_Comm comm, HYPRE_Int type,
+                               HYPRE_IJVector *vector_ptr );
+HYPRE_Int HYPRE_IJVectorReadBinary ( const char *filename, MPI_Comm comm, HYPRE_Int type,
+                                     HYPRE_IJVector *vector_ptr );
+HYPRE_Int HYPRE_IJVectorPrint ( HYPRE_IJVector vector, const char *filename );
+HYPRE_Int HYPRE_IJVectorPrintBinary ( HYPRE_IJVector vector, const char *filename );
+HYPRE_Int HYPRE_IJVectorInnerProd ( HYPRE_IJVector x, HYPRE_IJVector y, HYPRE_Real *prod );
diff --git a/external/hypre/src/blas/CMakeLists.txt b/external/hypre/src/blas/CMakeLists.txt
index fd6ce340..04dc5da1 100644
--- a/external/hypre/src/blas/CMakeLists.txt
+++ b/external/hypre/src/blas/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/blas/README b/external/hypre/src/blas/README
index ee9e0c15..6c03da73 100644
--- a/external/hypre/src/blas/README
+++ b/external/hypre/src/blas/README
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -33,3 +33,7 @@ the following:
   the C files (search for 'auxiliary').
 
 - Add the filename in Makefile
+
+- Remove any instance of the 'static' identifier in local variables. 'static' variables
+  are initialized only once and shared between all threads executing the code; thus,
+  they lead to code that may not be thread-safe.
diff --git a/external/hypre/src/blas/_hypre_blas.h b/external/hypre/src/blas/_hypre_blas.h
index 6be0877d..04aa431a 100644
--- a/external/hypre/src/blas/_hypre_blas.h
+++ b/external/hypre/src/blas/_hypre_blas.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -17,6 +17,8 @@
 #include "_hypre_utilities.h"
 #include "fortran.h"
 
+#include <HYPRE_config.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -27,6 +29,29 @@ extern "C" {
 
 #ifndef HYPRE_USING_HYPRE_BLAS
 
+#if defined(HYPRE_SINGLE)
+#define hypre_dasum   hypre_F90_NAME_BLAS(sasum ,SASUM )
+#define hypre_daxpy   hypre_F90_NAME_BLAS(saxpy ,SAXPY )
+#define hypre_dcopy   hypre_F90_NAME_BLAS(scopy ,SCOPY )
+#define hypre_ddot    hypre_F90_NAME_BLAS(sdot  ,SDOT  )
+#define hypre_dgemm   hypre_F90_NAME_BLAS(sgemm ,SGEMM )
+#define hypre_dgemv   hypre_F90_NAME_BLAS(sgemv ,SGEMV )
+#define hypre_dger    hypre_F90_NAME_BLAS(sger  ,SGER  )
+#define hypre_dnrm2   hypre_F90_NAME_BLAS(snrm2 ,SNRM2 )
+#define hypre_drot    hypre_F90_NAME_BLAS(srot  ,SROT  )
+#define hypre_dscal   hypre_F90_NAME_BLAS(sscal ,SSCAL )
+#define hypre_dswap   hypre_F90_NAME_BLAS(sswap ,SSWAP )
+#define hypre_dsymm   hypre_F90_NAME_BLAS(ssymm ,SSYMM )
+#define hypre_dsymv   hypre_F90_NAME_BLAS(ssymv ,SSYMV )
+#define hypre_dsyr2   hypre_F90_NAME_BLAS(ssyr2 ,SSYR2 )
+#define hypre_dsyr2k  hypre_F90_NAME_BLAS(ssyr2k,SSYR2K)
+#define hypre_dsyrk   hypre_F90_NAME_BLAS(ssyrk ,SSYRK )
+#define hypre_dtrmm   hypre_F90_NAME_BLAS(strmm ,STRMM )
+#define hypre_dtrmv   hypre_F90_NAME_BLAS(strmv ,STRMV )
+#define hypre_dtrsm   hypre_F90_NAME_BLAS(strsm ,STRSM )
+#define hypre_dtrsv   hypre_F90_NAME_BLAS(strsv ,STRSV )
+#define hypre_idamax  hypre_F90_NAME_BLAS(isamax,ISAMAX)
+#else
 #define hypre_dasum   hypre_F90_NAME_BLAS(dasum ,DASUM )
 #define hypre_daxpy   hypre_F90_NAME_BLAS(daxpy ,DAXPY )
 #define hypre_dcopy   hypre_F90_NAME_BLAS(dcopy ,DCOPY )
@@ -48,6 +73,7 @@ extern "C" {
 #define hypre_dtrsm   hypre_F90_NAME_BLAS(dtrsm ,DTRSM )
 #define hypre_dtrsv   hypre_F90_NAME_BLAS(dtrsv ,DTRSV )
 #define hypre_idamax  hypre_F90_NAME_BLAS(idamax,IDAMAX)
+#endif
 
 #endif
 
diff --git a/external/hypre/src/blas/dasum.c b/external/hypre/src/blas/dasum.c
index 1608907a..66b6c970 100644
--- a/external/hypre/src/blas/dasum.c
+++ b/external/hypre/src/blas/dasum.c
@@ -20,19 +20,19 @@ doublereal dasum_(integer *n, doublereal *dx, integer *incx)
     doublereal ret_val, d__1, d__2, d__3, d__4, d__5, d__6;
 
     /* Local variables */
-    static integer i, m;
-    static doublereal dtemp;
-    static integer nincx, mp1;
+    integer i, m;
+    doublereal dtemp;
+    integer nincx, mp1;
 
 
-/*     takes the sum of the absolute values.   
-       jack dongarra, linpack, 3/11/78.   
-       modified 3/93 to return if incx .le. 0.   
-       modified 12/3/93, array(1) declarations changed to array(*)   
+/*     takes the sum of the absolute values.
+       jack dongarra, linpack, 3/11/78.
+       modified 3/93 to return if incx .le. 0.
+       modified 12/3/93, array(1) declarations changed to array(*)
 
 
-    
-   Parameter adjustments   
+
+   Parameter adjustments
        Function Body */
 #define DX(I) dx[(I)-1]
 
@@ -56,7 +56,7 @@ doublereal dasum_(integer *n, doublereal *dx, integer *incx)
     ret_val = dtemp;
     return ret_val;
 
-/*        code for increment equal to 1   
+/*        code for increment equal to 1
 
 
           clean-up loop */
@@ -77,7 +77,7 @@ doublereal dasum_(integer *n, doublereal *dx, integer *incx)
     mp1 = m + 1;
     for (i = mp1; i <= *n; i += 6) {
 	dtemp = dtemp + (d__1 = DX(i), abs(d__1)) + (d__2 = DX(i + 1), abs(
-		d__2)) + (d__3 = DX(i + 2), abs(d__3)) + (d__4 = DX(i + 3), 
+		d__2)) + (d__3 = DX(i + 2), abs(d__3)) + (d__4 = DX(i + 3),
 		abs(d__4)) + (d__5 = DX(i + 4), abs(d__5)) + (d__6 = DX(i + 5)
 		, abs(d__6));
 /* L50: */
diff --git a/external/hypre/src/blas/daxpy.c b/external/hypre/src/blas/daxpy.c
index e1ffda08..97109062 100644
--- a/external/hypre/src/blas/daxpy.c
+++ b/external/hypre/src/blas/daxpy.c
@@ -13,7 +13,7 @@ extern "C" {
 #include "f2c.h"
 #include "hypre_blas.h"
 
-/* Subroutine */ integer daxpy_(integer *n, doublereal *da, doublereal *dx, 
+/* Subroutine */ integer daxpy_(integer *n, doublereal *da, doublereal *dx,
 	integer *incx, doublereal *dy, integer *incy)
 {
 
@@ -21,17 +21,17 @@ extern "C" {
     /* System generated locals */
 
     /* Local variables */
-    static integer i, m, ix, iy, mp1;
+    integer i, m, ix, iy, mp1;
 
 
-/*     constant times a vector plus a vector.   
-       uses unrolled loops for increments equal to one.   
-       jack dongarra, linpack, 3/11/78.   
-       modified 12/3/93, array(1) declarations changed to array(*)   
+/*     constant times a vector plus a vector.
+       uses unrolled loops for increments equal to one.
+       jack dongarra, linpack, 3/11/78.
+       modified 12/3/93, array(1) declarations changed to array(*)
 
 
-    
-   Parameter adjustments   
+
+   Parameter adjustments
        Function Body */
 #define DY(I) dy[(I)-1]
 #define DX(I) dx[(I)-1]
@@ -47,7 +47,7 @@ extern "C" {
 	goto L20;
     }
 
-/*        code for unequal increments or equal increments   
+/*        code for unequal increments or equal increments
             not equal to 1 */
 
     ix = 1;
@@ -66,7 +66,7 @@ extern "C" {
     }
     return 0;
 
-/*        code for both increments equal to 1   
+/*        code for both increments equal to 1
 
 
           clean-up loop */
diff --git a/external/hypre/src/blas/dcopy.c b/external/hypre/src/blas/dcopy.c
index c058542e..a09806af 100644
--- a/external/hypre/src/blas/dcopy.c
+++ b/external/hypre/src/blas/dcopy.c
@@ -19,7 +19,7 @@ extern "C" {
     integer i__1;
 
     /* Local variables */
-    static integer i__, m, ix, iy, mp1;
+    integer i__, m, ix, iy, mp1;
 
 
 /*     copies a vector, x, to a vector, y. */
diff --git a/external/hypre/src/blas/ddot.c b/external/hypre/src/blas/ddot.c
index 2f209504..61a88964 100644
--- a/external/hypre/src/blas/ddot.c
+++ b/external/hypre/src/blas/ddot.c
@@ -20,9 +20,9 @@ doublereal ddot_(integer*n,doublereal* dx,integer* incx,doublereal* dy,integer*
     doublereal ret_val;
 
     /* Local variables */
-    static integer i__, m;
-    static doublereal dtemp;
-    static integer ix, iy, mp1;
+    integer i__, m;
+    doublereal dtemp;
+    integer ix, iy, mp1;
 
 
 /*     forms the dot product of two vectors. */
@@ -88,7 +88,7 @@ doublereal ddot_(integer*n,doublereal* dx,integer* incx,doublereal* dy,integer*
     i__1 = *n;
     for (i__ = mp1; i__ <= i__1; i__ += 5) {
 	dtemp = dtemp + dx[i__] * dy[i__] + dx[i__ + 1] * dy[i__ + 1] + dx[
-		i__ + 2] * dy[i__ + 2] + dx[i__ + 3] * dy[i__ + 3] + dx[i__ + 
+		i__ + 2] * dy[i__ + 2] + dx[i__ + 3] * dy[i__ + 3] + dx[i__ +
 		4] * dy[i__ + 4];
 /* L50: */
     }
diff --git a/external/hypre/src/blas/dgemm.c b/external/hypre/src/blas/dgemm.c
index 4b279102..903b62d1 100644
--- a/external/hypre/src/blas/dgemm.c
+++ b/external/hypre/src/blas/dgemm.c
@@ -14,8 +14,8 @@ extern "C" {
 #include "hypre_blas.h"
 
 /* Subroutine */ integer dgemm_(const char *transa,const char *transb, integer *m, integer *
-	n, integer *k, doublereal *alpha, doublereal *a, integer *lda, 
-	doublereal *b, integer *ldb, doublereal *beta, doublereal *c, integer 
+	n, integer *k, doublereal *alpha, doublereal *a, integer *lda,
+	doublereal *b, integer *ldb, doublereal *beta, doublereal *c, integer
 	*ldc)
 {
 
@@ -23,175 +23,175 @@ extern "C" {
     /* System generated locals */
 
     /* Local variables */
-    static integer info;
-    static logical nota, notb;
-    static doublereal temp;
-    static integer i, j, l;
+    integer info;
+    logical nota, notb;
+    doublereal temp;
+    integer i, j, l;
     extern logical lsame_(const char *,const char *);
-    static integer nrowa, nrowb;
+    integer nrowa, nrowb;
     extern /* Subroutine */ integer xerbla_(const char *, integer *);
 
 
-/*  Purpose   
-    =======   
-
-    DGEMM  performs one of the matrix-matrix operations   
-
-       C := alpha*op( A )*op( B ) + beta*C,   
-
-    where  op( X ) is one of   
-
-       op( X ) = X   or   op( X ) = X',   
-
-    alpha and beta are scalars, and A, B and C are matrices, with op( A ) 
-  
-    an m by k matrix,  op( B )  a  k by n matrix and  C an m by n matrix. 
-  
-
-    Parameters   
-    ==========   
-
-    TRANSA - CHARACTER*1.   
-             On entry, TRANSA specifies the form of op( A ) to be used in 
-  
-             the matrix multiplication as follows:   
-
-                TRANSA = 'N' or 'n',  op( A ) = A.   
-
-                TRANSA = 'T' or 't',  op( A ) = A'.   
-
-                TRANSA = 'C' or 'c',  op( A ) = A'.   
-
-             Unchanged on exit.   
-
-    TRANSB - CHARACTER*1.   
-             On entry, TRANSB specifies the form of op( B ) to be used in 
-  
-             the matrix multiplication as follows:   
-
-                TRANSB = 'N' or 'n',  op( B ) = B.   
-
-                TRANSB = 'T' or 't',  op( B ) = B'.   
-
-                TRANSB = 'C' or 'c',  op( B ) = B'.   
-
-             Unchanged on exit.   
-
-    M      - INTEGER.   
-             On entry,  M  specifies  the number  of rows  of the  matrix 
-  
-             op( A )  and of the  matrix  C.  M  must  be at least  zero. 
-  
-             Unchanged on exit.   
-
-    N      - INTEGER.   
-             On entry,  N  specifies the number  of columns of the matrix 
-  
-             op( B ) and the number of columns of the matrix C. N must be 
-  
-             at least zero.   
-             Unchanged on exit.   
-
-    K      - INTEGER.   
-             On entry,  K  specifies  the number of columns of the matrix 
-  
-             op( A ) and the number of rows of the matrix op( B ). K must 
-  
-             be at least  zero.   
-             Unchanged on exit.   
-
-    ALPHA  - DOUBLE PRECISION.   
-             On entry, ALPHA specifies the scalar alpha.   
-             Unchanged on exit.   
-
-    A      - DOUBLE PRECISION array of DIMENSION ( LDA, ka ), where ka is 
-  
-             k  when  TRANSA = 'N' or 'n',  and is  m  otherwise.   
-             Before entry with  TRANSA = 'N' or 'n',  the leading  m by k 
-  
-             part of the array  A  must contain the matrix  A,  otherwise 
-  
-             the leading  k by m  part of the array  A  must contain  the 
-  
-             matrix A.   
-             Unchanged on exit.   
-
-    LDA    - INTEGER.   
-             On entry, LDA specifies the first dimension of A as declared 
-  
-             in the calling (sub) program. When  TRANSA = 'N' or 'n' then 
-  
-             LDA must be at least  max( 1, m ), otherwise  LDA must be at 
-  
-             least  max( 1, k ).   
-             Unchanged on exit.   
-
-    B      - DOUBLE PRECISION array of DIMENSION ( LDB, kb ), where kb is 
-  
-             n  when  TRANSB = 'N' or 'n',  and is  k  otherwise.   
-             Before entry with  TRANSB = 'N' or 'n',  the leading  k by n 
-  
-             part of the array  B  must contain the matrix  B,  otherwise 
-  
-             the leading  n by k  part of the array  B  must contain  the 
-  
-             matrix B.   
-             Unchanged on exit.   
-
-    LDB    - INTEGER.   
-             On entry, LDB specifies the first dimension of B as declared 
-  
-             in the calling (sub) program. When  TRANSB = 'N' or 'n' then 
-  
-             LDB must be at least  max( 1, k ), otherwise  LDB must be at 
-  
-             least  max( 1, n ).   
-             Unchanged on exit.   
-
-    BETA   - DOUBLE PRECISION.   
-             On entry,  BETA  specifies the scalar  beta.  When  BETA  is 
-  
-             supplied as zero then C need not be set on input.   
-             Unchanged on exit.   
-
-    C      - DOUBLE PRECISION array of DIMENSION ( LDC, n ).   
-             Before entry, the leading  m by n  part of the array  C must 
-  
-             contain the matrix  C,  except when  beta  is zero, in which 
-  
-             case C need not be set on entry.   
-             On exit, the array  C  is overwritten by the  m by n  matrix 
-  
-             ( alpha*op( A )*op( B ) + beta*C ).   
-
-    LDC    - INTEGER.   
-             On entry, LDC specifies the first dimension of C as declared 
-  
-             in  the  calling  (sub)  program.   LDC  must  be  at  least 
-  
-             max( 1, m ).   
-             Unchanged on exit.   
-
-
-    Level 3 Blas routine.   
-
-    -- Written on 8-February-1989.   
-       Jack Dongarra, Argonne National Laboratory.   
-       Iain Duff, AERE Harwell.   
-       Jeremy Du Croz, Numerical Algorithms Group Ltd.   
-       Sven Hammarling, Numerical Algorithms Group Ltd.   
-
-
-
-       Set  NOTA  and  NOTB  as  true if  A  and  B  respectively are not 
-  
-       transposed and set  NROWA, NCOLA and  NROWB  as the number of rows 
-  
-       and  columns of  A  and the  number of  rows  of  B  respectively. 
-  
-
-    
-   Parameter adjustments   
+/*  Purpose
+    =======
+
+    DGEMM  performs one of the matrix-matrix operations
+
+       C := alpha*op( A )*op( B ) + beta*C,
+
+    where  op( X ) is one of
+
+       op( X ) = X   or   op( X ) = X',
+
+    alpha and beta are scalars, and A, B and C are matrices, with op( A )
+
+    an m by k matrix,  op( B )  a  k by n matrix and  C an m by n matrix.
+
+
+    Parameters
+    ==========
+
+    TRANSA - CHARACTER*1.
+             On entry, TRANSA specifies the form of op( A ) to be used in
+
+             the matrix multiplication as follows:
+
+                TRANSA = 'N' or 'n',  op( A ) = A.
+
+                TRANSA = 'T' or 't',  op( A ) = A'.
+
+                TRANSA = 'C' or 'c',  op( A ) = A'.
+
+             Unchanged on exit.
+
+    TRANSB - CHARACTER*1.
+             On entry, TRANSB specifies the form of op( B ) to be used in
+
+             the matrix multiplication as follows:
+
+                TRANSB = 'N' or 'n',  op( B ) = B.
+
+                TRANSB = 'T' or 't',  op( B ) = B'.
+
+                TRANSB = 'C' or 'c',  op( B ) = B'.
+
+             Unchanged on exit.
+
+    M      - INTEGER.
+             On entry,  M  specifies  the number  of rows  of the  matrix
+
+             op( A )  and of the  matrix  C.  M  must  be at least  zero.
+
+             Unchanged on exit.
+
+    N      - INTEGER.
+             On entry,  N  specifies the number  of columns of the matrix
+
+             op( B ) and the number of columns of the matrix C. N must be
+
+             at least zero.
+             Unchanged on exit.
+
+    K      - INTEGER.
+             On entry,  K  specifies  the number of columns of the matrix
+
+             op( A ) and the number of rows of the matrix op( B ). K must
+
+             be at least  zero.
+             Unchanged on exit.
+
+    ALPHA  - DOUBLE PRECISION.
+             On entry, ALPHA specifies the scalar alpha.
+             Unchanged on exit.
+
+    A      - DOUBLE PRECISION array of DIMENSION ( LDA, ka ), where ka is
+
+             k  when  TRANSA = 'N' or 'n',  and is  m  otherwise.
+             Before entry with  TRANSA = 'N' or 'n',  the leading  m by k
+
+             part of the array  A  must contain the matrix  A,  otherwise
+
+             the leading  k by m  part of the array  A  must contain  the
+
+             matrix A.
+             Unchanged on exit.
+
+    LDA    - INTEGER.
+             On entry, LDA specifies the first dimension of A as declared
+
+             in the calling (sub) program. When  TRANSA = 'N' or 'n' then
+
+             LDA must be at least  max( 1, m ), otherwise  LDA must be at
+
+             least  max( 1, k ).
+             Unchanged on exit.
+
+    B      - DOUBLE PRECISION array of DIMENSION ( LDB, kb ), where kb is
+
+             n  when  TRANSB = 'N' or 'n',  and is  k  otherwise.
+             Before entry with  TRANSB = 'N' or 'n',  the leading  k by n
+
+             part of the array  B  must contain the matrix  B,  otherwise
+
+             the leading  n by k  part of the array  B  must contain  the
+
+             matrix B.
+             Unchanged on exit.
+
+    LDB    - INTEGER.
+             On entry, LDB specifies the first dimension of B as declared
+
+             in the calling (sub) program. When  TRANSB = 'N' or 'n' then
+
+             LDB must be at least  max( 1, k ), otherwise  LDB must be at
+
+             least  max( 1, n ).
+             Unchanged on exit.
+
+    BETA   - DOUBLE PRECISION.
+             On entry,  BETA  specifies the scalar  beta.  When  BETA  is
+
+             supplied as zero then C need not be set on input.
+             Unchanged on exit.
+
+    C      - DOUBLE PRECISION array of DIMENSION ( LDC, n ).
+             Before entry, the leading  m by n  part of the array  C must
+
+             contain the matrix  C,  except when  beta  is zero, in which
+
+             case C need not be set on entry.
+             On exit, the array  C  is overwritten by the  m by n  matrix
+
+             ( alpha*op( A )*op( B ) + beta*C ).
+
+    LDC    - INTEGER.
+             On entry, LDC specifies the first dimension of C as declared
+
+             in  the  calling  (sub)  program.   LDC  must  be  at  least
+
+             max( 1, m ).
+             Unchanged on exit.
+
+
+    Level 3 Blas routine.
+
+    -- Written on 8-February-1989.
+       Jack Dongarra, Argonne National Laboratory.
+       Iain Duff, AERE Harwell.
+       Jeremy Du Croz, Numerical Algorithms Group Ltd.
+       Sven Hammarling, Numerical Algorithms Group Ltd.
+
+
+
+       Set  NOTA  and  NOTB  as  true if  A  and  B  respectively are not
+
+       transposed and set  NROWA, NCOLA and  NROWB  as the number of rows
+
+       and  columns of  A  and the  number of  rows  of  B  respectively.
+
+
+
+   Parameter adjustments
        Function Body */
 
 #define A(I,J) a[(I)-1 + ((J)-1)* ( *lda)]
@@ -216,7 +216,7 @@ extern "C" {
     info = 0;
     if (! nota && ! lsame_(transa, "C") && ! lsame_(transa, "T")) {
 	info = 1;
-    } else if (! notb && ! lsame_(transb, "C") && ! lsame_(transb, 
+    } else if (! notb && ! lsame_(transb, "C") && ! lsame_(transb,
 	    "T")) {
 	info = 2;
     } else if (*m < 0) {
diff --git a/external/hypre/src/blas/dgemv.c b/external/hypre/src/blas/dgemv.c
index aee32e3f..12c4f907 100644
--- a/external/hypre/src/blas/dgemv.c
+++ b/external/hypre/src/blas/dgemv.c
@@ -14,7 +14,7 @@ extern "C" {
 #include "hypre_blas.h"
 
 /* Subroutine */ integer dgemv_(const char *trans, integer *m, integer *n, doublereal *
-	alpha, doublereal *a, integer *lda, doublereal *x, integer *incx, 
+	alpha, doublereal *a, integer *lda, doublereal *x, integer *incx,
 	doublereal *beta, doublereal *y, integer *incy)
 {
 
@@ -22,113 +22,113 @@ extern "C" {
     /* System generated locals */
 
     /* Local variables */
-    static integer info;
-    static doublereal temp;
-    static integer lenx, leny, i, j;
+    integer info;
+    doublereal temp;
+    integer lenx, leny, i, j;
     extern logical lsame_(const char *,const char *);
-    static integer ix, iy, jx, jy, kx, ky;
+    integer ix, iy, jx, jy, kx, ky;
     extern /* Subroutine */ integer xerbla_(const char *, integer *);
 
 
-/*  Purpose   
-    =======   
+/*  Purpose
+    =======
 
-    DGEMV  performs one of the matrix-vector operations   
+    DGEMV  performs one of the matrix-vector operations
 
-       y := alpha*A*x + beta*y,   or   y := alpha*A'*x + beta*y,   
+       y := alpha*A*x + beta*y,   or   y := alpha*A'*x + beta*y,
 
-    where alpha and beta are scalars, x and y are vectors and A is an   
-    m by n matrix.   
+    where alpha and beta are scalars, x and y are vectors and A is an
+    m by n matrix.
 
-    Parameters   
-    ==========   
+    Parameters
+    ==========
 
-    TRANS  - CHARACTER*1.   
-             On entry, TRANS specifies the operation to be performed as   
-             follows:   
+    TRANS  - CHARACTER*1.
+             On entry, TRANS specifies the operation to be performed as
+             follows:
 
-                TRANS = 'N' or 'n'   y := alpha*A*x + beta*y.   
+                TRANS = 'N' or 'n'   y := alpha*A*x + beta*y.
 
-                TRANS = 'T' or 't'   y := alpha*A'*x + beta*y.   
+                TRANS = 'T' or 't'   y := alpha*A'*x + beta*y.
 
-                TRANS = 'C' or 'c'   y := alpha*A'*x + beta*y.   
+                TRANS = 'C' or 'c'   y := alpha*A'*x + beta*y.
 
-             Unchanged on exit.   
+             Unchanged on exit.
 
-    M      - INTEGER.   
-             On entry, M specifies the number of rows of the matrix A.   
-             M must be at least zero.   
-             Unchanged on exit.   
+    M      - INTEGER.
+             On entry, M specifies the number of rows of the matrix A.
+             M must be at least zero.
+             Unchanged on exit.
 
-    N      - INTEGER.   
-             On entry, N specifies the number of columns of the matrix A. 
-  
-             N must be at least zero.   
-             Unchanged on exit.   
+    N      - INTEGER.
+             On entry, N specifies the number of columns of the matrix A.
 
-    ALPHA  - DOUBLE PRECISION.   
-             On entry, ALPHA specifies the scalar alpha.   
-             Unchanged on exit.   
+             N must be at least zero.
+             Unchanged on exit.
 
-    A      - DOUBLE PRECISION array of DIMENSION ( LDA, n ).   
-             Before entry, the leading m by n part of the array A must   
-             contain the matrix of coefficients.   
-             Unchanged on exit.   
+    ALPHA  - DOUBLE PRECISION.
+             On entry, ALPHA specifies the scalar alpha.
+             Unchanged on exit.
 
-    LDA    - INTEGER.   
-             On entry, LDA specifies the first dimension of A as declared 
-  
-             in the calling (sub) program. LDA must be at least   
-             max( 1, m ).   
-             Unchanged on exit.   
+    A      - DOUBLE PRECISION array of DIMENSION ( LDA, n ).
+             Before entry, the leading m by n part of the array A must
+             contain the matrix of coefficients.
+             Unchanged on exit.
 
-    X      - DOUBLE PRECISION array of DIMENSION at least   
-             ( 1 + ( n - 1 )*abs( INCX ) ) when TRANS = 'N' or 'n'   
-             and at least   
-             ( 1 + ( m - 1 )*abs( INCX ) ) otherwise.   
-             Before entry, the incremented array X must contain the   
-             vector x.   
-             Unchanged on exit.   
+    LDA    - INTEGER.
+             On entry, LDA specifies the first dimension of A as declared
 
-    INCX   - INTEGER.   
-             On entry, INCX specifies the increment for the elements of   
-             X. INCX must not be zero.   
-             Unchanged on exit.   
+             in the calling (sub) program. LDA must be at least
+             max( 1, m ).
+             Unchanged on exit.
 
-    BETA   - DOUBLE PRECISION.   
-             On entry, BETA specifies the scalar beta. When BETA is   
-             supplied as zero then Y need not be set on input.   
-             Unchanged on exit.   
+    X      - DOUBLE PRECISION array of DIMENSION at least
+             ( 1 + ( n - 1 )*abs( INCX ) ) when TRANS = 'N' or 'n'
+             and at least
+             ( 1 + ( m - 1 )*abs( INCX ) ) otherwise.
+             Before entry, the incremented array X must contain the
+             vector x.
+             Unchanged on exit.
 
-    Y      - DOUBLE PRECISION array of DIMENSION at least   
-             ( 1 + ( m - 1 )*abs( INCY ) ) when TRANS = 'N' or 'n'   
-             and at least   
-             ( 1 + ( n - 1 )*abs( INCY ) ) otherwise.   
-             Before entry with BETA non-zero, the incremented array Y   
-             must contain the vector y. On exit, Y is overwritten by the 
-  
-             updated vector y.   
+    INCX   - INTEGER.
+             On entry, INCX specifies the increment for the elements of
+             X. INCX must not be zero.
+             Unchanged on exit.
 
-    INCY   - INTEGER.   
-             On entry, INCY specifies the increment for the elements of   
-             Y. INCY must not be zero.   
-             Unchanged on exit.   
+    BETA   - DOUBLE PRECISION.
+             On entry, BETA specifies the scalar beta. When BETA is
+             supplied as zero then Y need not be set on input.
+             Unchanged on exit.
 
+    Y      - DOUBLE PRECISION array of DIMENSION at least
+             ( 1 + ( m - 1 )*abs( INCY ) ) when TRANS = 'N' or 'n'
+             and at least
+             ( 1 + ( n - 1 )*abs( INCY ) ) otherwise.
+             Before entry with BETA non-zero, the incremented array Y
+             must contain the vector y. On exit, Y is overwritten by the
 
-    Level 2 Blas routine.   
+             updated vector y.
 
-    -- Written on 22-October-1986.   
-       Jack Dongarra, Argonne National Lab.   
-       Jeremy Du Croz, Nag Central Office.   
-       Sven Hammarling, Nag Central Office.   
-       Richard Hanson, Sandia National Labs.   
+    INCY   - INTEGER.
+             On entry, INCY specifies the increment for the elements of
+             Y. INCY must not be zero.
+             Unchanged on exit.
 
 
+    Level 2 Blas routine.
 
-       Test the input parameters.   
+    -- Written on 22-October-1986.
+       Jack Dongarra, Argonne National Lab.
+       Jeremy Du Croz, Nag Central Office.
+       Sven Hammarling, Nag Central Office.
+       Richard Hanson, Sandia National Labs.
 
-    
-   Parameter adjustments   
+
+
+       Test the input parameters.
+
+
+   Parameter adjustments
        Function Body */
 #define X(I) x[(I)-1]
 #define Y(I) y[(I)-1]
@@ -136,7 +136,7 @@ extern "C" {
 #define A(I,J) a[(I)-1 + ((J)-1)* ( *lda)]
 
     info = 0;
-    if (! lsame_(trans, "N") && ! lsame_(trans, "T") && ! 
+    if (! lsame_(trans, "N") && ! lsame_(trans, "T") && !
 	    lsame_(trans, "C")) {
 	info = 1;
     } else if (*m < 0) {
@@ -161,8 +161,8 @@ extern "C" {
 	return 0;
     }
 
-/*     Set  LENX  and  LENY, the lengths of the vectors x and y, and set 
-  
+/*     Set  LENX  and  LENY, the lengths of the vectors x and y, and set
+
        up the start points in  X  and  Y. */
 
     if (lsame_(trans, "N")) {
@@ -183,8 +183,8 @@ extern "C" {
 	ky = 1 - (leny - 1) * *incy;
     }
 
-/*     Start the operations. In this version the elements of A are   
-       accessed sequentially with one pass through A.   
+/*     Start the operations. In this version the elements of A are
+       accessed sequentially with one pass through A.
 
        First form  y := beta*y. */
 
diff --git a/external/hypre/src/blas/dger.c b/external/hypre/src/blas/dger.c
index dec2ea05..9337728d 100644
--- a/external/hypre/src/blas/dger.c
+++ b/external/hypre/src/blas/dger.c
@@ -8,71 +8,71 @@ extern "C" {
 #include "f2c.h"
 #include "hypre_blas.h"
 
-/* Subroutine */ integer dger_(integer *m, integer *n, doublereal *alpha, 
-	doublereal *x, integer *incx, doublereal *y, integer *incy, 
+/* Subroutine */ integer dger_(integer *m, integer *n, doublereal *alpha,
+	doublereal *x, integer *incx, doublereal *y, integer *incy,
 	doublereal *a, integer *lda)
 {
     /* System generated locals */
     integer a_dim1, a_offset, i__1, i__2;
     /* Local variables */
-    static integer info;
-    static doublereal temp;
-    static integer i__, j, ix, jy, kx;
+    integer info;
+    doublereal temp;
+    integer i__, j, ix, jy, kx;
     extern /* Subroutine */ integer xerbla_(const char *, integer *);
 #define a_ref(a_1,a_2) a[(a_2)*a_dim1 + a_1]
-/*  Purpose   
-    =======   
-    DGER   performs the rank 1 operation   
-       A := alpha*x*y' + A,   
-    where alpha is a scalar, x is an m element vector, y is an n element   
-    vector and A is an m by n matrix.   
-    Parameters   
-    ==========   
-    M      - INTEGER.   
-             On entry, M specifies the number of rows of the matrix A.   
-             M must be at least zero.   
-             Unchanged on exit.   
-    N      - INTEGER.   
-             On entry, N specifies the number of columns of the matrix A.   
-             N must be at least zero.   
-             Unchanged on exit.   
-    ALPHA  - DOUBLE PRECISION.   
-             On entry, ALPHA specifies the scalar alpha.   
-             Unchanged on exit.   
-    X      - DOUBLE PRECISION array of dimension at least   
-             ( 1 + ( m - 1 )*abs( INCX ) ).   
-             Before entry, the incremented array X must contain the m   
-             element vector x.   
-             Unchanged on exit.   
-    INCX   - INTEGER.   
-             On entry, INCX specifies the increment for the elements of   
-             X. INCX must not be zero.   
-             Unchanged on exit.   
-    Y      - DOUBLE PRECISION array of dimension at least   
-             ( 1 + ( n - 1 )*abs( INCY ) ).   
-             Before entry, the incremented array Y must contain the n   
-             element vector y.   
-             Unchanged on exit.   
-    INCY   - INTEGER.   
-             On entry, INCY specifies the increment for the elements of   
-             Y. INCY must not be zero.   
-             Unchanged on exit.   
-    A      - DOUBLE PRECISION array of DIMENSION ( LDA, n ).   
-             Before entry, the leading m by n part of the array A must   
-             contain the matrix of coefficients. On exit, A is   
-             overwritten by the updated matrix.   
-    LDA    - INTEGER.   
-             On entry, LDA specifies the first dimension of A as declared   
-             in the calling (sub) program. LDA must be at least   
-             max( 1, m ).   
-             Unchanged on exit.   
-    Level 2 Blas routine.   
-    -- Written on 22-October-1986.   
-       Jack Dongarra, Argonne National Lab.   
-       Jeremy Du Croz, Nag Central Office.   
-       Sven Hammarling, Nag Central Office.   
-       Richard Hanson, Sandia National Labs.   
-       Test the input parameters.   
+/*  Purpose
+    =======
+    DGER   performs the rank 1 operation
+       A := alpha*x*y' + A,
+    where alpha is a scalar, x is an m element vector, y is an n element
+    vector and A is an m by n matrix.
+    Parameters
+    ==========
+    M      - INTEGER.
+             On entry, M specifies the number of rows of the matrix A.
+             M must be at least zero.
+             Unchanged on exit.
+    N      - INTEGER.
+             On entry, N specifies the number of columns of the matrix A.
+             N must be at least zero.
+             Unchanged on exit.
+    ALPHA  - DOUBLE PRECISION.
+             On entry, ALPHA specifies the scalar alpha.
+             Unchanged on exit.
+    X      - DOUBLE PRECISION array of dimension at least
+             ( 1 + ( m - 1 )*abs( INCX ) ).
+             Before entry, the incremented array X must contain the m
+             element vector x.
+             Unchanged on exit.
+    INCX   - INTEGER.
+             On entry, INCX specifies the increment for the elements of
+             X. INCX must not be zero.
+             Unchanged on exit.
+    Y      - DOUBLE PRECISION array of dimension at least
+             ( 1 + ( n - 1 )*abs( INCY ) ).
+             Before entry, the incremented array Y must contain the n
+             element vector y.
+             Unchanged on exit.
+    INCY   - INTEGER.
+             On entry, INCY specifies the increment for the elements of
+             Y. INCY must not be zero.
+             Unchanged on exit.
+    A      - DOUBLE PRECISION array of DIMENSION ( LDA, n ).
+             Before entry, the leading m by n part of the array A must
+             contain the matrix of coefficients. On exit, A is
+             overwritten by the updated matrix.
+    LDA    - INTEGER.
+             On entry, LDA specifies the first dimension of A as declared
+             in the calling (sub) program. LDA must be at least
+             max( 1, m ).
+             Unchanged on exit.
+    Level 2 Blas routine.
+    -- Written on 22-October-1986.
+       Jack Dongarra, Argonne National Lab.
+       Jeremy Du Croz, Nag Central Office.
+       Sven Hammarling, Nag Central Office.
+       Richard Hanson, Sandia National Labs.
+       Test the input parameters.
        Parameter adjustments */
     --x;
     --y;
@@ -100,7 +100,7 @@ extern "C" {
     if (*m == 0 || *n == 0 || *alpha == 0.) {
 	return 0;
     }
-/*     Start the operations. In this version the elements of A are   
+/*     Start the operations. In this version the elements of A are
        accessed sequentially with one pass through A. */
     if (*incy > 0) {
 	jy = 1;
diff --git a/external/hypre/src/blas/dnrm2.c b/external/hypre/src/blas/dnrm2.c
index 418bab5b..b57894c0 100644
--- a/external/hypre/src/blas/dnrm2.c
+++ b/external/hypre/src/blas/dnrm2.c
@@ -17,10 +17,10 @@ doublereal dnrm2_(integer*n,doublereal* dx,integer* incx)
 {
     /* Initialized data */
 
-    static doublereal zero = 0.;
-    static doublereal one = 1.;
-    static doublereal cutlo = 8.232e-11;
-    static doublereal cuthi = 1.304e19;
+     doublereal zero = 0.;
+     doublereal one = 1.;
+     doublereal cutlo = 8.232e-11;
+     doublereal cuthi = 1.304e19;
 
     /* Format strings */
 
@@ -32,9 +32,9 @@ doublereal dnrm2_(integer*n,doublereal* dx,integer* incx)
     /*doublereal sqrt(doublereal);*/
 
     /* Local variables */
-    static doublereal xmax;
-    static integer next, i__, j, ix;
-    static doublereal hitest, sum;
+     doublereal xmax = zero;
+     integer next, i__, j, ix;
+     doublereal hitest, sum;
 
     /* Parameter adjustments */
     --dx;
@@ -70,7 +70,7 @@ doublereal dnrm2_(integer*n,doublereal* dx,integer* incx)
 /*     values for cutlo and cuthi.. */
 /*     from the environmental parameters listed in the imsl converter */
 /*     document the limiting values are as follows.. */
-/*     cutlo, s.p.   u/eps = 2**(-102) for  honeywell.  close seconds are 
+/*     cutlo, s.p.   u/eps = 2**(-102) for  honeywell.  close seconds are
 */
 /*                   univac and dec at 2**(-103) */
 /*                   thus cutlo = 2**(-51) = 4.44089e-16 */
@@ -141,7 +141,7 @@ doublereal dnrm2_(integer*n,doublereal* dx,integer* incx)
     }
 
 /*                     common code for phases 2 and 4. */
-/*                     in phase 4 sum is large.  scale to avoid overflow. 
+/*                     in phase 4 sum is large.  scale to avoid overflow.
 */
 
 L110:
@@ -171,7 +171,7 @@ doublereal dnrm2_(integer*n,doublereal* dx,integer* incx)
 /*     for complex      set hitest = cuthi/(2*n) */
 
 L85:
-    hitest = cuthi / (real) (*n);
+    hitest = cuthi / (doublereal) (*n);
 
 /*                   phase 3.  sum is mid-range.  no scaling. */
 
diff --git a/external/hypre/src/blas/drot.c b/external/hypre/src/blas/drot.c
index 01ab236f..b84506d2 100644
--- a/external/hypre/src/blas/drot.c
+++ b/external/hypre/src/blas/drot.c
@@ -21,9 +21,9 @@ extern "C" {
     /* System generated locals */
 
     /* Local variables */
-    static integer i;
-    static doublereal dtemp;
-    static integer ix, iy;
+     integer i;
+     doublereal dtemp;
+     integer ix, iy;
 
 
 /*     applies a plane rotation.   
diff --git a/external/hypre/src/blas/dscal.c b/external/hypre/src/blas/dscal.c
index 89e0e7a1..c3db9911 100644
--- a/external/hypre/src/blas/dscal.c
+++ b/external/hypre/src/blas/dscal.c
@@ -13,7 +13,7 @@ extern "C" {
 #include "f2c.h"
 #include "hypre_blas.h"
 
-/* Subroutine */ integer dscal_(integer *n, doublereal *da, doublereal *dx, 
+/* Subroutine */ integer dscal_(integer *n, doublereal *da, doublereal *dx,
 	integer *incx)
 {
 
@@ -21,18 +21,18 @@ extern "C" {
     /* System generated locals */
 
     /* Local variables */
-    static integer i, m, nincx, mp1;
+    integer i, m, nincx, mp1;
 
 
-/*     scales a vector by a constant.   
-       uses unrolled loops for increment equal to one.   
-       jack dongarra, linpack, 3/11/78.   
-       modified 3/93 to return if incx .le. 0.   
-       modified 12/3/93, array(1) declarations changed to array(*)   
+/*     scales a vector by a constant.
+       uses unrolled loops for increment equal to one.
+       jack dongarra, linpack, 3/11/78.
+       modified 3/93 to return if incx .le. 0.
+       modified 12/3/93, array(1) declarations changed to array(*)
 
 
-    
-   Parameter adjustments   
+
+   Parameter adjustments
        Function Body */
 #define DX(I) dx[(I)-1]
 
@@ -53,7 +53,7 @@ extern "C" {
     }
     return 0;
 
-/*        code for increment equal to 1   
+/*        code for increment equal to 1
 
 
           clean-up loop */
diff --git a/external/hypre/src/blas/dswap.c b/external/hypre/src/blas/dswap.c
index bba5c65a..4f8a8a21 100644
--- a/external/hypre/src/blas/dswap.c
+++ b/external/hypre/src/blas/dswap.c
@@ -8,19 +8,19 @@ extern "C" {
 #include "f2c.h"
 #include "hypre_blas.h"
 
-/* Subroutine */ integer dswap_(integer *n, doublereal *dx, integer *incx, 
+/* Subroutine */ integer dswap_(integer *n, doublereal *dx, integer *incx,
 	doublereal *dy, integer *incy)
 {
     /* System generated locals */
     integer i__1;
     /* Local variables */
-    static integer i__, m;
-    static doublereal dtemp;
-    static integer ix, iy, mp1;
-/*     interchanges two vectors.   
-       uses unrolled loops for increments equal one.   
-       jack dongarra, linpack, 3/11/78.   
-       modified 12/3/93, array(1) declarations changed to array(*)   
+    integer i__, m;
+    doublereal dtemp;
+    integer ix, iy, mp1;
+/*     interchanges two vectors.
+       uses unrolled loops for increments equal one.
+       jack dongarra, linpack, 3/11/78.
+       modified 12/3/93, array(1) declarations changed to array(*)
        Parameter adjustments */
     --dy;
     --dx;
@@ -31,7 +31,7 @@ extern "C" {
     if (*incx == 1 && *incy == 1) {
 	goto L20;
     }
-/*       code for unequal increments or equal increments not equal   
+/*       code for unequal increments or equal increments not equal
            to 1 */
     ix = 1;
     iy = 1;
@@ -51,7 +51,7 @@ extern "C" {
 /* L10: */
     }
     return 0;
-/*       code for both increments equal to 1   
+/*       code for both increments equal to 1
          clean-up loop */
 L20:
     m = *n % 3;
diff --git a/external/hypre/src/blas/dsymm.c b/external/hypre/src/blas/dsymm.c
index aa1c5a46..656da7ab 100644
--- a/external/hypre/src/blas/dsymm.c
+++ b/external/hypre/src/blas/dsymm.c
@@ -8,120 +8,120 @@ extern "C" {
 #include "f2c.h"
 #include "hypre_blas.h"
 
-/* Subroutine */ integer dsymm_(const char *side,const char *uplo, integer *m, integer *n, 
-	doublereal *alpha, doublereal *a, integer *lda, doublereal *b, 
+/* Subroutine */ integer dsymm_(const char *side,const char *uplo, integer *m, integer *n,
+	doublereal *alpha, doublereal *a, integer *lda, doublereal *b,
 	integer *ldb, doublereal *beta, doublereal *c__, integer *ldc)
 {
     /* System generated locals */
-    integer a_dim1, a_offset, b_dim1, b_offset, c_dim1, c_offset, i__1, i__2, 
+    integer a_dim1, a_offset, b_dim1, b_offset, c_dim1, c_offset, i__1, i__2,
 	    i__3;
     /* Local variables */
-    static integer info;
-    static doublereal temp1, temp2;
-    static integer i__, j, k;
+    integer info;
+    doublereal temp1, temp2;
+    integer i__, j, k;
     extern logical lsame_(const char *,const char *);
-    static integer nrowa;
-    static logical upper;
+    integer nrowa;
+    logical upper;
     extern /* Subroutine */ integer xerbla_(const char *, integer *);
 #define a_ref(a_1,a_2) a[(a_2)*a_dim1 + a_1]
 #define b_ref(a_1,a_2) b[(a_2)*b_dim1 + a_1]
 #define c___ref(a_1,a_2) c__[(a_2)*c_dim1 + a_1]
-/*  Purpose   
-    =======   
-    DSYMM  performs one of the matrix-matrix operations   
-       C := alpha*A*B + beta*C,   
-    or   
-       C := alpha*B*A + beta*C,   
-    where alpha and beta are scalars,  A is a symmetric matrix and  B and   
-    C are  m by n matrices.   
-    Parameters   
-    ==========   
-    SIDE   - CHARACTER*1.   
-             On entry,  SIDE  specifies whether  the  symmetric matrix  A   
-             appears on the  left or right  in the  operation as follows:   
-                SIDE = 'L' or 'l'   C := alpha*A*B + beta*C,   
-                SIDE = 'R' or 'r'   C := alpha*B*A + beta*C,   
-             Unchanged on exit.   
-    UPLO   - CHARACTER*1.   
-             On  entry,   UPLO  specifies  whether  the  upper  or  lower   
-             triangular  part  of  the  symmetric  matrix   A  is  to  be   
-             referenced as follows:   
-                UPLO = 'U' or 'u'   Only the upper triangular part of the   
-                                    symmetric matrix is to be referenced.   
-                UPLO = 'L' or 'l'   Only the lower triangular part of the   
-                                    symmetric matrix is to be referenced.   
-             Unchanged on exit.   
-    M      - INTEGER.   
-             On entry,  M  specifies the number of rows of the matrix  C.   
-             M  must be at least zero.   
-             Unchanged on exit.   
-    N      - INTEGER.   
-             On entry, N specifies the number of columns of the matrix C.   
-             N  must be at least zero.   
-             Unchanged on exit.   
-    ALPHA  - DOUBLE PRECISION.   
-             On entry, ALPHA specifies the scalar alpha.   
-             Unchanged on exit.   
-    A      - DOUBLE PRECISION array of DIMENSION ( LDA, ka ), where ka is   
-             m  when  SIDE = 'L' or 'l'  and is  n otherwise.   
-             Before entry  with  SIDE = 'L' or 'l',  the  m by m  part of   
-             the array  A  must contain the  symmetric matrix,  such that   
-             when  UPLO = 'U' or 'u', the leading m by m upper triangular   
-             part of the array  A  must contain the upper triangular part   
-             of the  symmetric matrix and the  strictly  lower triangular   
-             part of  A  is not referenced,  and when  UPLO = 'L' or 'l',   
-             the leading  m by m  lower triangular part  of the  array  A   
-             must  contain  the  lower triangular part  of the  symmetric   
-             matrix and the  strictly upper triangular part of  A  is not   
-             referenced.   
-             Before entry  with  SIDE = 'R' or 'r',  the  n by n  part of   
-             the array  A  must contain the  symmetric matrix,  such that   
-             when  UPLO = 'U' or 'u', the leading n by n upper triangular   
-             part of the array  A  must contain the upper triangular part   
-             of the  symmetric matrix and the  strictly  lower triangular   
-             part of  A  is not referenced,  and when  UPLO = 'L' or 'l',   
-             the leading  n by n  lower triangular part  of the  array  A   
-             must  contain  the  lower triangular part  of the  symmetric   
-             matrix and the  strictly upper triangular part of  A  is not   
-             referenced.   
-             Unchanged on exit.   
-    LDA    - INTEGER.   
-             On entry, LDA specifies the first dimension of A as declared   
-             in the calling (sub) program.  When  SIDE = 'L' or 'l'  then   
-             LDA must be at least  max( 1, m ), otherwise  LDA must be at   
-             least  max( 1, n ).   
-             Unchanged on exit.   
-    B      - DOUBLE PRECISION array of DIMENSION ( LDB, n ).   
-             Before entry, the leading  m by n part of the array  B  must   
-             contain the matrix B.   
-             Unchanged on exit.   
-    LDB    - INTEGER.   
-             On entry, LDB specifies the first dimension of B as declared   
-             in  the  calling  (sub)  program.   LDB  must  be  at  least   
-             max( 1, m ).   
-             Unchanged on exit.   
-    BETA   - DOUBLE PRECISION.   
-             On entry,  BETA  specifies the scalar  beta.  When  BETA  is   
-             supplied as zero then C need not be set on input.   
-             Unchanged on exit.   
-    C      - DOUBLE PRECISION array of DIMENSION ( LDC, n ).   
-             Before entry, the leading  m by n  part of the array  C must   
-             contain the matrix  C,  except when  beta  is zero, in which   
-             case C need not be set on entry.   
-             On exit, the array  C  is overwritten by the  m by n updated   
-             matrix.   
-    LDC    - INTEGER.   
-             On entry, LDC specifies the first dimension of C as declared   
-             in  the  calling  (sub)  program.   LDC  must  be  at  least   
-             max( 1, m ).   
-             Unchanged on exit.   
-    Level 3 Blas routine.   
-    -- Written on 8-February-1989.   
-       Jack Dongarra, Argonne National Laboratory.   
-       Iain Duff, AERE Harwell.   
-       Jeremy Du Croz, Numerical Algorithms Group Ltd.   
-       Sven Hammarling, Numerical Algorithms Group Ltd.   
-       Set NROWA as the number of rows of A.   
+/*  Purpose
+    =======
+    DSYMM  performs one of the matrix-matrix operations
+       C := alpha*A*B + beta*C,
+    or
+       C := alpha*B*A + beta*C,
+    where alpha and beta are scalars,  A is a symmetric matrix and  B and
+    C are  m by n matrices.
+    Parameters
+    ==========
+    SIDE   - CHARACTER*1.
+             On entry,  SIDE  specifies whether  the  symmetric matrix  A
+             appears on the  left or right  in the  operation as follows:
+                SIDE = 'L' or 'l'   C := alpha*A*B + beta*C,
+                SIDE = 'R' or 'r'   C := alpha*B*A + beta*C,
+             Unchanged on exit.
+    UPLO   - CHARACTER*1.
+             On  entry,   UPLO  specifies  whether  the  upper  or  lower
+             triangular  part  of  the  symmetric  matrix   A  is  to  be
+             referenced as follows:
+                UPLO = 'U' or 'u'   Only the upper triangular part of the
+                                    symmetric matrix is to be referenced.
+                UPLO = 'L' or 'l'   Only the lower triangular part of the
+                                    symmetric matrix is to be referenced.
+             Unchanged on exit.
+    M      - INTEGER.
+             On entry,  M  specifies the number of rows of the matrix  C.
+             M  must be at least zero.
+             Unchanged on exit.
+    N      - INTEGER.
+             On entry, N specifies the number of columns of the matrix C.
+             N  must be at least zero.
+             Unchanged on exit.
+    ALPHA  - DOUBLE PRECISION.
+             On entry, ALPHA specifies the scalar alpha.
+             Unchanged on exit.
+    A      - DOUBLE PRECISION array of DIMENSION ( LDA, ka ), where ka is
+             m  when  SIDE = 'L' or 'l'  and is  n otherwise.
+             Before entry  with  SIDE = 'L' or 'l',  the  m by m  part of
+             the array  A  must contain the  symmetric matrix,  such that
+             when  UPLO = 'U' or 'u', the leading m by m upper triangular
+             part of the array  A  must contain the upper triangular part
+             of the  symmetric matrix and the  strictly  lower triangular
+             part of  A  is not referenced,  and when  UPLO = 'L' or 'l',
+             the leading  m by m  lower triangular part  of the  array  A
+             must  contain  the  lower triangular part  of the  symmetric
+             matrix and the  strictly upper triangular part of  A  is not
+             referenced.
+             Before entry  with  SIDE = 'R' or 'r',  the  n by n  part of
+             the array  A  must contain the  symmetric matrix,  such that
+             when  UPLO = 'U' or 'u', the leading n by n upper triangular
+             part of the array  A  must contain the upper triangular part
+             of the  symmetric matrix and the  strictly  lower triangular
+             part of  A  is not referenced,  and when  UPLO = 'L' or 'l',
+             the leading  n by n  lower triangular part  of the  array  A
+             must  contain  the  lower triangular part  of the  symmetric
+             matrix and the  strictly upper triangular part of  A  is not
+             referenced.
+             Unchanged on exit.
+    LDA    - INTEGER.
+             On entry, LDA specifies the first dimension of A as declared
+             in the calling (sub) program.  When  SIDE = 'L' or 'l'  then
+             LDA must be at least  max( 1, m ), otherwise  LDA must be at
+             least  max( 1, n ).
+             Unchanged on exit.
+    B      - DOUBLE PRECISION array of DIMENSION ( LDB, n ).
+             Before entry, the leading  m by n part of the array  B  must
+             contain the matrix B.
+             Unchanged on exit.
+    LDB    - INTEGER.
+             On entry, LDB specifies the first dimension of B as declared
+             in  the  calling  (sub)  program.   LDB  must  be  at  least
+             max( 1, m ).
+             Unchanged on exit.
+    BETA   - DOUBLE PRECISION.
+             On entry,  BETA  specifies the scalar  beta.  When  BETA  is
+             supplied as zero then C need not be set on input.
+             Unchanged on exit.
+    C      - DOUBLE PRECISION array of DIMENSION ( LDC, n ).
+             Before entry, the leading  m by n  part of the array  C must
+             contain the matrix  C,  except when  beta  is zero, in which
+             case C need not be set on entry.
+             On exit, the array  C  is overwritten by the  m by n updated
+             matrix.
+    LDC    - INTEGER.
+             On entry, LDC specifies the first dimension of C as declared
+             in  the  calling  (sub)  program.   LDC  must  be  at  least
+             max( 1, m ).
+             Unchanged on exit.
+    Level 3 Blas routine.
+    -- Written on 8-February-1989.
+       Jack Dongarra, Argonne National Laboratory.
+       Iain Duff, AERE Harwell.
+       Jeremy Du Croz, Numerical Algorithms Group Ltd.
+       Sven Hammarling, Numerical Algorithms Group Ltd.
+       Set NROWA as the number of rows of A.
        Parameter adjustments */
     a_dim1 = *lda;
     a_offset = 1 + a_dim1 * 1;
@@ -206,10 +206,10 @@ extern "C" {
 /* L50: */
 		    }
 		    if (*beta == 0.) {
-			c___ref(i__, j) = temp1 * a_ref(i__, i__) + *alpha * 
+			c___ref(i__, j) = temp1 * a_ref(i__, i__) + *alpha *
 				temp2;
 		    } else {
-			c___ref(i__, j) = *beta * c___ref(i__, j) + temp1 * 
+			c___ref(i__, j) = *beta * c___ref(i__, j) + temp1 *
 				a_ref(i__, i__) + *alpha * temp2;
 		    }
 /* L60: */
@@ -229,10 +229,10 @@ extern "C" {
 /* L80: */
 		    }
 		    if (*beta == 0.) {
-			c___ref(i__, j) = temp1 * a_ref(i__, i__) + *alpha * 
+			c___ref(i__, j) = temp1 * a_ref(i__, i__) + *alpha *
 				temp2;
 		    } else {
-			c___ref(i__, j) = *beta * c___ref(i__, j) + temp1 * 
+			c___ref(i__, j) = *beta * c___ref(i__, j) + temp1 *
 				a_ref(i__, i__) + *alpha * temp2;
 		    }
 /* L90: */
diff --git a/external/hypre/src/blas/dsymv.c b/external/hypre/src/blas/dsymv.c
index f2ca9bc5..63fdecde 100644
--- a/external/hypre/src/blas/dsymv.c
+++ b/external/hypre/src/blas/dsymv.c
@@ -13,8 +13,8 @@ extern "C" {
 #include "f2c.h"
 #include "hypre_blas.h"
 
-/* Subroutine */ integer dsymv_(const char *uplo, integer *n, doublereal *alpha, 
-	doublereal *a, integer *lda, doublereal *x, integer *incx, doublereal 
+/* Subroutine */ integer dsymv_(const char *uplo, integer *n, doublereal *alpha,
+	doublereal *a, integer *lda, doublereal *x, integer *incx, doublereal
 	*beta, doublereal *y, integer *incy)
 {
 
@@ -22,111 +22,111 @@ extern "C" {
     /* System generated locals */
 
     /* Local variables */
-    static integer info;
-    static doublereal temp1, temp2;
-    static integer i, j;
+    integer info;
+    doublereal temp1, temp2;
+    integer i, j;
     extern logical lsame_(const char *,const char *);
-    static integer ix, iy, jx, jy, kx, ky;
+    integer ix, iy, jx, jy, kx, ky;
     extern /* Subroutine */ integer xerbla_(const char *, integer *);
 
 
-/*  Purpose   
-    =======   
+/*  Purpose
+    =======
 
-    DSYMV  performs the matrix-vector  operation   
+    DSYMV  performs the matrix-vector  operation
 
-       y := alpha*A*x + beta*y,   
+       y := alpha*A*x + beta*y,
 
-    where alpha and beta are scalars, x and y are n element vectors and   
-    A is an n by n symmetric matrix.   
+    where alpha and beta are scalars, x and y are n element vectors and
+    A is an n by n symmetric matrix.
 
-    Parameters   
-    ==========   
+    Parameters
+    ==========
 
-    UPLO   - CHARACTER*1.   
-             On entry, UPLO specifies whether the upper or lower   
-             triangular part of the array A is to be referenced as   
-             follows:   
+    UPLO   - CHARACTER*1.
+             On entry, UPLO specifies whether the upper or lower
+             triangular part of the array A is to be referenced as
+             follows:
 
-                UPLO = 'U' or 'u'   Only the upper triangular part of A   
-                                    is to be referenced.   
+                UPLO = 'U' or 'u'   Only the upper triangular part of A
+                                    is to be referenced.
 
-                UPLO = 'L' or 'l'   Only the lower triangular part of A   
-                                    is to be referenced.   
+                UPLO = 'L' or 'l'   Only the lower triangular part of A
+                                    is to be referenced.
 
-             Unchanged on exit.   
+             Unchanged on exit.
 
-    N      - INTEGER.   
-             On entry, N specifies the order of the matrix A.   
-             N must be at least zero.   
-             Unchanged on exit.   
+    N      - INTEGER.
+             On entry, N specifies the order of the matrix A.
+             N must be at least zero.
+             Unchanged on exit.
 
-    ALPHA  - DOUBLE PRECISION.   
-             On entry, ALPHA specifies the scalar alpha.   
-             Unchanged on exit.   
+    ALPHA  - DOUBLE PRECISION.
+             On entry, ALPHA specifies the scalar alpha.
+             Unchanged on exit.
 
-    A      - DOUBLE PRECISION array of DIMENSION ( LDA, n ).   
-             Before entry with  UPLO = 'U' or 'u', the leading n by n   
-             upper triangular part of the array A must contain the upper 
-  
-             triangular part of the symmetric matrix and the strictly   
-             lower triangular part of A is not referenced.   
-             Before entry with UPLO = 'L' or 'l', the leading n by n   
-             lower triangular part of the array A must contain the lower 
-  
-             triangular part of the symmetric matrix and the strictly   
-             upper triangular part of A is not referenced.   
-             Unchanged on exit.   
+    A      - DOUBLE PRECISION array of DIMENSION ( LDA, n ).
+             Before entry with  UPLO = 'U' or 'u', the leading n by n
+             upper triangular part of the array A must contain the upper
 
-    LDA    - INTEGER.   
-             On entry, LDA specifies the first dimension of A as declared 
-  
-             in the calling (sub) program. LDA must be at least   
-             max( 1, n ).   
-             Unchanged on exit.   
+             triangular part of the symmetric matrix and the strictly
+             lower triangular part of A is not referenced.
+             Before entry with UPLO = 'L' or 'l', the leading n by n
+             lower triangular part of the array A must contain the lower
 
-    X      - DOUBLE PRECISION array of dimension at least   
-             ( 1 + ( n - 1 )*abs( INCX ) ).   
-             Before entry, the incremented array X must contain the n   
-             element vector x.   
-             Unchanged on exit.   
+             triangular part of the symmetric matrix and the strictly
+             upper triangular part of A is not referenced.
+             Unchanged on exit.
 
-    INCX   - INTEGER.   
-             On entry, INCX specifies the increment for the elements of   
-             X. INCX must not be zero.   
-             Unchanged on exit.   
+    LDA    - INTEGER.
+             On entry, LDA specifies the first dimension of A as declared
 
-    BETA   - DOUBLE PRECISION.   
-             On entry, BETA specifies the scalar beta. When BETA is   
-             supplied as zero then Y need not be set on input.   
-             Unchanged on exit.   
+             in the calling (sub) program. LDA must be at least
+             max( 1, n ).
+             Unchanged on exit.
 
-    Y      - DOUBLE PRECISION array of dimension at least   
-             ( 1 + ( n - 1 )*abs( INCY ) ).   
-             Before entry, the incremented array Y must contain the n   
-             element vector y. On exit, Y is overwritten by the updated   
-             vector y.   
+    X      - DOUBLE PRECISION array of dimension at least
+             ( 1 + ( n - 1 )*abs( INCX ) ).
+             Before entry, the incremented array X must contain the n
+             element vector x.
+             Unchanged on exit.
 
-    INCY   - INTEGER.   
-             On entry, INCY specifies the increment for the elements of   
-             Y. INCY must not be zero.   
-             Unchanged on exit.   
+    INCX   - INTEGER.
+             On entry, INCX specifies the increment for the elements of
+             X. INCX must not be zero.
+             Unchanged on exit.
 
+    BETA   - DOUBLE PRECISION.
+             On entry, BETA specifies the scalar beta. When BETA is
+             supplied as zero then Y need not be set on input.
+             Unchanged on exit.
 
-    Level 2 Blas routine.   
+    Y      - DOUBLE PRECISION array of dimension at least
+             ( 1 + ( n - 1 )*abs( INCY ) ).
+             Before entry, the incremented array Y must contain the n
+             element vector y. On exit, Y is overwritten by the updated
+             vector y.
 
-    -- Written on 22-October-1986.   
-       Jack Dongarra, Argonne National Lab.   
-       Jeremy Du Croz, Nag Central Office.   
-       Sven Hammarling, Nag Central Office.   
-       Richard Hanson, Sandia National Labs.   
+    INCY   - INTEGER.
+             On entry, INCY specifies the increment for the elements of
+             Y. INCY must not be zero.
+             Unchanged on exit.
 
 
+    Level 2 Blas routine.
 
-       Test the input parameters.   
+    -- Written on 22-October-1986.
+       Jack Dongarra, Argonne National Lab.
+       Jeremy Du Croz, Nag Central Office.
+       Sven Hammarling, Nag Central Office.
+       Richard Hanson, Sandia National Labs.
 
-    
-   Parameter adjustments   
+
+
+       Test the input parameters.
+
+
+   Parameter adjustments
        Function Body */
 #define X(I) x[(I)-1]
 #define Y(I) y[(I)-1]
@@ -169,9 +169,9 @@ extern "C" {
 	ky = 1 - (*n - 1) * *incy;
     }
 
-/*     Start the operations. In this version the elements of A are   
-       accessed sequentially with one pass through the triangular part   
-       of A.   
+/*     Start the operations. In this version the elements of A are
+       accessed sequentially with one pass through the triangular part
+       of A.
 
        First form  y := beta*y. */
 
diff --git a/external/hypre/src/blas/dsyr2.c b/external/hypre/src/blas/dsyr2.c
index 499e7d72..655046de 100644
--- a/external/hypre/src/blas/dsyr2.c
+++ b/external/hypre/src/blas/dsyr2.c
@@ -13,8 +13,8 @@ extern "C" {
 #include "f2c.h"
 #include "hypre_blas.h"
 
-/* Subroutine */ integer dsyr2_(const char *uplo, integer *n, doublereal *alpha, 
-	doublereal *x, integer *incx, doublereal *y, integer *incy, 
+/* Subroutine */ integer dsyr2_(const char *uplo, integer *n, doublereal *alpha,
+	doublereal *x, integer *incx, doublereal *y, integer *incy,
 	doublereal *a, integer *lda)
 {
 
@@ -22,110 +22,110 @@ extern "C" {
     /* System generated locals */
 
     /* Local variables */
-    static integer info;
-    static doublereal temp1, temp2;
-    static integer i, j;
+    integer info;
+    doublereal temp1, temp2;
+    integer i, j;
     extern logical lsame_(const char *,const char *);
-    static integer ix, iy, jx, jy, kx, ky;
+    integer ix, iy, jx = 0, jy = 0, kx = 0, ky = 0;
     extern /* Subroutine */ integer xerbla_(const char *, integer *);
 
 
-/*  Purpose   
-    =======   
+/*  Purpose
+    =======
 
-    DSYR2  performs the symmetric rank 2 operation   
+    DSYR2  performs the symmetric rank 2 operation
 
-       A := alpha*x*y' + alpha*y*x' + A,   
+       A := alpha*x*y' + alpha*y*x' + A,
 
-    where alpha is a scalar, x and y are n element vectors and A is an n 
-  
-    by n symmetric matrix.   
+    where alpha is a scalar, x and y are n element vectors and A is an n
 
-    Parameters   
-    ==========   
+    by n symmetric matrix.
 
-    UPLO   - CHARACTER*1.   
-             On entry, UPLO specifies whether the upper or lower   
-             triangular part of the array A is to be referenced as   
-             follows:   
+    Parameters
+    ==========
 
-                UPLO = 'U' or 'u'   Only the upper triangular part of A   
-                                    is to be referenced.   
+    UPLO   - CHARACTER*1.
+             On entry, UPLO specifies whether the upper or lower
+             triangular part of the array A is to be referenced as
+             follows:
 
-                UPLO = 'L' or 'l'   Only the lower triangular part of A   
-                                    is to be referenced.   
+                UPLO = 'U' or 'u'   Only the upper triangular part of A
+                                    is to be referenced.
 
-             Unchanged on exit.   
+                UPLO = 'L' or 'l'   Only the lower triangular part of A
+                                    is to be referenced.
 
-    N      - INTEGER.   
-             On entry, N specifies the order of the matrix A.   
-             N must be at least zero.   
-             Unchanged on exit.   
+             Unchanged on exit.
 
-    ALPHA  - DOUBLE PRECISION.   
-             On entry, ALPHA specifies the scalar alpha.   
-             Unchanged on exit.   
+    N      - INTEGER.
+             On entry, N specifies the order of the matrix A.
+             N must be at least zero.
+             Unchanged on exit.
 
-    X      - DOUBLE PRECISION array of dimension at least   
-             ( 1 + ( n - 1 )*abs( INCX ) ).   
-             Before entry, the incremented array X must contain the n   
-             element vector x.   
-             Unchanged on exit.   
+    ALPHA  - DOUBLE PRECISION.
+             On entry, ALPHA specifies the scalar alpha.
+             Unchanged on exit.
 
-    INCX   - INTEGER.   
-             On entry, INCX specifies the increment for the elements of   
-             X. INCX must not be zero.   
-             Unchanged on exit.   
+    X      - DOUBLE PRECISION array of dimension at least
+             ( 1 + ( n - 1 )*abs( INCX ) ).
+             Before entry, the incremented array X must contain the n
+             element vector x.
+             Unchanged on exit.
 
-    Y      - DOUBLE PRECISION array of dimension at least   
-             ( 1 + ( n - 1 )*abs( INCY ) ).   
-             Before entry, the incremented array Y must contain the n   
-             element vector y.   
-             Unchanged on exit.   
+    INCX   - INTEGER.
+             On entry, INCX specifies the increment for the elements of
+             X. INCX must not be zero.
+             Unchanged on exit.
 
-    INCY   - INTEGER.   
-             On entry, INCY specifies the increment for the elements of   
-             Y. INCY must not be zero.   
-             Unchanged on exit.   
+    Y      - DOUBLE PRECISION array of dimension at least
+             ( 1 + ( n - 1 )*abs( INCY ) ).
+             Before entry, the incremented array Y must contain the n
+             element vector y.
+             Unchanged on exit.
 
-    A      - DOUBLE PRECISION array of DIMENSION ( LDA, n ).   
-             Before entry with  UPLO = 'U' or 'u', the leading n by n   
-             upper triangular part of the array A must contain the upper 
-  
-             triangular part of the symmetric matrix and the strictly   
-             lower triangular part of A is not referenced. On exit, the   
-             upper triangular part of the array A is overwritten by the   
-             upper triangular part of the updated matrix.   
-             Before entry with UPLO = 'L' or 'l', the leading n by n   
-             lower triangular part of the array A must contain the lower 
-  
-             triangular part of the symmetric matrix and the strictly   
-             upper triangular part of A is not referenced. On exit, the   
-             lower triangular part of the array A is overwritten by the   
-             lower triangular part of the updated matrix.   
+    INCY   - INTEGER.
+             On entry, INCY specifies the increment for the elements of
+             Y. INCY must not be zero.
+             Unchanged on exit.
 
-    LDA    - INTEGER.   
-             On entry, LDA specifies the first dimension of A as declared 
-  
-             in the calling (sub) program. LDA must be at least   
-             max( 1, n ).   
-             Unchanged on exit.   
+    A      - DOUBLE PRECISION array of DIMENSION ( LDA, n ).
+             Before entry with  UPLO = 'U' or 'u', the leading n by n
+             upper triangular part of the array A must contain the upper
 
+             triangular part of the symmetric matrix and the strictly
+             lower triangular part of A is not referenced. On exit, the
+             upper triangular part of the array A is overwritten by the
+             upper triangular part of the updated matrix.
+             Before entry with UPLO = 'L' or 'l', the leading n by n
+             lower triangular part of the array A must contain the lower
 
-    Level 2 Blas routine.   
+             triangular part of the symmetric matrix and the strictly
+             upper triangular part of A is not referenced. On exit, the
+             lower triangular part of the array A is overwritten by the
+             lower triangular part of the updated matrix.
 
-    -- Written on 22-October-1986.   
-       Jack Dongarra, Argonne National Lab.   
-       Jeremy Du Croz, Nag Central Office.   
-       Sven Hammarling, Nag Central Office.   
-       Richard Hanson, Sandia National Labs.   
+    LDA    - INTEGER.
+             On entry, LDA specifies the first dimension of A as declared
 
+             in the calling (sub) program. LDA must be at least
+             max( 1, n ).
+             Unchanged on exit.
 
 
-       Test the input parameters.   
+    Level 2 Blas routine.
 
-    
-   Parameter adjustments   
+    -- Written on 22-October-1986.
+       Jack Dongarra, Argonne National Lab.
+       Jeremy Du Croz, Nag Central Office.
+       Sven Hammarling, Nag Central Office.
+       Richard Hanson, Sandia National Labs.
+
+
+
+       Test the input parameters.
+
+
+   Parameter adjustments
        Function Body */
 #define X(I) x[(I)-1]
 #define Y(I) y[(I)-1]
@@ -155,8 +155,8 @@ extern "C" {
 	return 0;
     }
 
-/*     Set up the start points in X and Y if the increments are not both 
-  
+/*     Set up the start points in X and Y if the increments are not both
+
        unity. */
 
     if (*incx != 1 || *incy != 1) {
@@ -174,8 +174,8 @@ extern "C" {
 	jy = ky;
     }
 
-/*     Start the operations. In this version the elements of A are   
-       accessed sequentially with one pass through the triangular part   
+/*     Start the operations. In this version the elements of A are
+       accessed sequentially with one pass through the triangular part
        of A. */
 
     if (lsame_(uplo, "U")) {
@@ -188,7 +188,7 @@ extern "C" {
 		    temp1 = *alpha * Y(j);
 		    temp2 = *alpha * X(j);
 		    for (i = 1; i <= j; ++i) {
-			A(i,j) = A(i,j) + X(i) * temp1 
+			A(i,j) = A(i,j) + X(i) * temp1
 				+ Y(i) * temp2;
 /* L10: */
 		    }
@@ -203,7 +203,7 @@ extern "C" {
 		    ix = kx;
 		    iy = ky;
 		    for (i = 1; i <= j; ++i) {
-			A(i,j) = A(i,j) + X(ix) * temp1 
+			A(i,j) = A(i,j) + X(ix) * temp1
 				+ Y(iy) * temp2;
 			ix += *incx;
 			iy += *incy;
@@ -225,7 +225,7 @@ extern "C" {
 		    temp1 = *alpha * Y(j);
 		    temp2 = *alpha * X(j);
 		    for (i = j; i <= *n; ++i) {
-			A(i,j) = A(i,j) + X(i) * temp1 
+			A(i,j) = A(i,j) + X(i) * temp1
 				+ Y(i) * temp2;
 /* L50: */
 		    }
@@ -240,7 +240,7 @@ extern "C" {
 		    ix = jx;
 		    iy = jy;
 		    for (i = j; i <= *n; ++i) {
-			A(i,j) = A(i,j) + X(ix) * temp1 
+			A(i,j) = A(i,j) + X(ix) * temp1
 				+ Y(iy) * temp2;
 			ix += *incx;
 			iy += *incy;
diff --git a/external/hypre/src/blas/dsyr2k.c b/external/hypre/src/blas/dsyr2k.c
index 8fbc397b..ae609c9c 100644
--- a/external/hypre/src/blas/dsyr2k.c
+++ b/external/hypre/src/blas/dsyr2k.c
@@ -8,121 +8,121 @@ extern "C" {
 #include "f2c.h"
 #include "hypre_blas.h"
 
-/* Subroutine */ integer dsyr2k_(const char *uplo,const char *trans, integer *n, integer *k, 
-	doublereal *alpha, doublereal *a, integer *lda, doublereal *b, 
+/* Subroutine */ integer dsyr2k_(const char *uplo,const char *trans, integer *n, integer *k,
+	doublereal *alpha, doublereal *a, integer *lda, doublereal *b,
 	integer *ldb, doublereal *beta, doublereal *c__, integer *ldc)
 {
     /* System generated locals */
-    integer a_dim1, a_offset, b_dim1, b_offset, c_dim1, c_offset, i__1, i__2, 
+    integer a_dim1, a_offset, b_dim1, b_offset, c_dim1, c_offset, i__1, i__2,
 	    i__3;
     /* Local variables */
-    static integer info;
-    static doublereal temp1, temp2;
-    static integer i__, j, l;
+    integer info;
+    doublereal temp1, temp2;
+    integer i__, j, l;
     extern logical lsame_(const char *,const char *);
-    static integer nrowa;
-    static logical upper;
+    integer nrowa;
+    logical upper;
     extern /* Subroutine */ integer xerbla_(const char *, integer *);
 #define a_ref(a_1,a_2) a[(a_2)*a_dim1 + a_1]
 #define b_ref(a_1,a_2) b[(a_2)*b_dim1 + a_1]
 #define c___ref(a_1,a_2) c__[(a_2)*c_dim1 + a_1]
-/*  Purpose   
-    =======   
-    DSYR2K  performs one of the symmetric rank 2k operations   
-       C := alpha*A*B' + alpha*B*A' + beta*C,   
-    or   
-       C := alpha*A'*B + alpha*B'*A + beta*C,   
-    where  alpha and beta  are scalars, C is an  n by n  symmetric matrix   
-    and  A and B  are  n by k  matrices  in the  first  case  and  k by n   
-    matrices in the second case.   
-    Parameters   
-    ==========   
-    UPLO   - CHARACTER*1.   
-             On  entry,   UPLO  specifies  whether  the  upper  or  lower   
-             triangular  part  of the  array  C  is to be  referenced  as   
-             follows:   
-                UPLO = 'U' or 'u'   Only the  upper triangular part of  C   
-                                    is to be referenced.   
-                UPLO = 'L' or 'l'   Only the  lower triangular part of  C   
-                                    is to be referenced.   
-             Unchanged on exit.   
-    TRANS  - CHARACTER*1.   
-             On entry,  TRANS  specifies the operation to be performed as   
-             follows:   
-                TRANS = 'N' or 'n'   C := alpha*A*B' + alpha*B*A' +   
-                                          beta*C.   
-                TRANS = 'T' or 't'   C := alpha*A'*B + alpha*B'*A +   
-                                          beta*C.   
-                TRANS = 'C' or 'c'   C := alpha*A'*B + alpha*B'*A +   
-                                          beta*C.   
-             Unchanged on exit.   
-    N      - INTEGER.   
-             On entry,  N specifies the order of the matrix C.  N must be   
-             at least zero.   
-             Unchanged on exit.   
-    K      - INTEGER.   
-             On entry with  TRANS = 'N' or 'n',  K  specifies  the number   
-             of  columns  of the  matrices  A and B,  and on  entry  with   
-             TRANS = 'T' or 't' or 'C' or 'c',  K  specifies  the  number   
-             of rows of the matrices  A and B.  K must be at least  zero.   
-             Unchanged on exit.   
-    ALPHA  - DOUBLE PRECISION.   
-             On entry, ALPHA specifies the scalar alpha.   
-             Unchanged on exit.   
-    A      - DOUBLE PRECISION array of DIMENSION ( LDA, ka ), where ka is   
-             k  when  TRANS = 'N' or 'n',  and is  n  otherwise.   
-             Before entry with  TRANS = 'N' or 'n',  the  leading  n by k   
-             part of the array  A  must contain the matrix  A,  otherwise   
-             the leading  k by n  part of the array  A  must contain  the   
-             matrix A.   
-             Unchanged on exit.   
-    LDA    - INTEGER.   
-             On entry, LDA specifies the first dimension of A as declared   
-             in  the  calling  (sub)  program.   When  TRANS = 'N' or 'n'   
-             then  LDA must be at least  max( 1, n ), otherwise  LDA must   
-             be at least  max( 1, k ).   
-             Unchanged on exit.   
-    B      - DOUBLE PRECISION array of DIMENSION ( LDB, kb ), where kb is   
-             k  when  TRANS = 'N' or 'n',  and is  n  otherwise.   
-             Before entry with  TRANS = 'N' or 'n',  the  leading  n by k   
-             part of the array  B  must contain the matrix  B,  otherwise   
-             the leading  k by n  part of the array  B  must contain  the   
-             matrix B.   
-             Unchanged on exit.   
-    LDB    - INTEGER.   
-             On entry, LDB specifies the first dimension of B as declared   
-             in  the  calling  (sub)  program.   When  TRANS = 'N' or 'n'   
-             then  LDB must be at least  max( 1, n ), otherwise  LDB must   
-             be at least  max( 1, k ).   
-             Unchanged on exit.   
-    BETA   - DOUBLE PRECISION.   
-             On entry, BETA specifies the scalar beta.   
-             Unchanged on exit.   
-    C      - DOUBLE PRECISION array of DIMENSION ( LDC, n ).   
-             Before entry  with  UPLO = 'U' or 'u',  the leading  n by n   
-             upper triangular part of the array C must contain the upper   
-             triangular part  of the  symmetric matrix  and the strictly   
-             lower triangular part of C is not referenced.  On exit, the   
-             upper triangular part of the array  C is overwritten by the   
-             upper triangular part of the updated matrix.   
-             Before entry  with  UPLO = 'L' or 'l',  the leading  n by n   
-             lower triangular part of the array C must contain the lower   
-             triangular part  of the  symmetric matrix  and the strictly   
-             upper triangular part of C is not referenced.  On exit, the   
-             lower triangular part of the array  C is overwritten by the   
-             lower triangular part of the updated matrix.   
-    LDC    - INTEGER.   
-             On entry, LDC specifies the first dimension of C as declared   
-             in  the  calling  (sub)  program.   LDC  must  be  at  least   
-             max( 1, n ).   
-             Unchanged on exit.   
-    Level 3 Blas routine.   
-    -- Written on 8-February-1989.   
-       Jack Dongarra, Argonne National Laboratory.   
-       Iain Duff, AERE Harwell.   
-       Jeremy Du Croz, Numerical Algorithms Group Ltd.   
-       Sven Hammarling, Numerical Algorithms Group Ltd.   
-       Test the input parameters.   
+/*  Purpose
+    =======
+    DSYR2K  performs one of the symmetric rank 2k operations
+       C := alpha*A*B' + alpha*B*A' + beta*C,
+    or
+       C := alpha*A'*B + alpha*B'*A + beta*C,
+    where  alpha and beta  are scalars, C is an  n by n  symmetric matrix
+    and  A and B  are  n by k  matrices  in the  first  case  and  k by n
+    matrices in the second case.
+    Parameters
+    ==========
+    UPLO   - CHARACTER*1.
+             On  entry,   UPLO  specifies  whether  the  upper  or  lower
+             triangular  part  of the  array  C  is to be  referenced  as
+             follows:
+                UPLO = 'U' or 'u'   Only the  upper triangular part of  C
+                                    is to be referenced.
+                UPLO = 'L' or 'l'   Only the  lower triangular part of  C
+                                    is to be referenced.
+             Unchanged on exit.
+    TRANS  - CHARACTER*1.
+             On entry,  TRANS  specifies the operation to be performed as
+             follows:
+                TRANS = 'N' or 'n'   C := alpha*A*B' + alpha*B*A' +
+                                          beta*C.
+                TRANS = 'T' or 't'   C := alpha*A'*B + alpha*B'*A +
+                                          beta*C.
+                TRANS = 'C' or 'c'   C := alpha*A'*B + alpha*B'*A +
+                                          beta*C.
+             Unchanged on exit.
+    N      - INTEGER.
+             On entry,  N specifies the order of the matrix C.  N must be
+             at least zero.
+             Unchanged on exit.
+    K      - INTEGER.
+             On entry with  TRANS = 'N' or 'n',  K  specifies  the number
+             of  columns  of the  matrices  A and B,  and on  entry  with
+             TRANS = 'T' or 't' or 'C' or 'c',  K  specifies  the  number
+             of rows of the matrices  A and B.  K must be at least  zero.
+             Unchanged on exit.
+    ALPHA  - DOUBLE PRECISION.
+             On entry, ALPHA specifies the scalar alpha.
+             Unchanged on exit.
+    A      - DOUBLE PRECISION array of DIMENSION ( LDA, ka ), where ka is
+             k  when  TRANS = 'N' or 'n',  and is  n  otherwise.
+             Before entry with  TRANS = 'N' or 'n',  the  leading  n by k
+             part of the array  A  must contain the matrix  A,  otherwise
+             the leading  k by n  part of the array  A  must contain  the
+             matrix A.
+             Unchanged on exit.
+    LDA    - INTEGER.
+             On entry, LDA specifies the first dimension of A as declared
+             in  the  calling  (sub)  program.   When  TRANS = 'N' or 'n'
+             then  LDA must be at least  max( 1, n ), otherwise  LDA must
+             be at least  max( 1, k ).
+             Unchanged on exit.
+    B      - DOUBLE PRECISION array of DIMENSION ( LDB, kb ), where kb is
+             k  when  TRANS = 'N' or 'n',  and is  n  otherwise.
+             Before entry with  TRANS = 'N' or 'n',  the  leading  n by k
+             part of the array  B  must contain the matrix  B,  otherwise
+             the leading  k by n  part of the array  B  must contain  the
+             matrix B.
+             Unchanged on exit.
+    LDB    - INTEGER.
+             On entry, LDB specifies the first dimension of B as declared
+             in  the  calling  (sub)  program.   When  TRANS = 'N' or 'n'
+             then  LDB must be at least  max( 1, n ), otherwise  LDB must
+             be at least  max( 1, k ).
+             Unchanged on exit.
+    BETA   - DOUBLE PRECISION.
+             On entry, BETA specifies the scalar beta.
+             Unchanged on exit.
+    C      - DOUBLE PRECISION array of DIMENSION ( LDC, n ).
+             Before entry  with  UPLO = 'U' or 'u',  the leading  n by n
+             upper triangular part of the array C must contain the upper
+             triangular part  of the  symmetric matrix  and the strictly
+             lower triangular part of C is not referenced.  On exit, the
+             upper triangular part of the array  C is overwritten by the
+             upper triangular part of the updated matrix.
+             Before entry  with  UPLO = 'L' or 'l',  the leading  n by n
+             lower triangular part of the array C must contain the lower
+             triangular part  of the  symmetric matrix  and the strictly
+             upper triangular part of C is not referenced.  On exit, the
+             lower triangular part of the array  C is overwritten by the
+             lower triangular part of the updated matrix.
+    LDC    - INTEGER.
+             On entry, LDC specifies the first dimension of C as declared
+             in  the  calling  (sub)  program.   LDC  must  be  at  least
+             max( 1, n ).
+             Unchanged on exit.
+    Level 3 Blas routine.
+    -- Written on 8-February-1989.
+       Jack Dongarra, Argonne National Laboratory.
+       Iain Duff, AERE Harwell.
+       Jeremy Du Croz, Numerical Algorithms Group Ltd.
+       Sven Hammarling, Numerical Algorithms Group Ltd.
+       Test the input parameters.
        Parameter adjustments */
     a_dim1 = *lda;
     a_offset = 1 + a_dim1 * 1;
@@ -143,7 +143,7 @@ extern "C" {
     info = 0;
     if (! upper && ! lsame_(uplo, "L")) {
 	info = 1;
-    } else if (! lsame_(trans, "N") && ! lsame_(trans, 
+    } else if (! lsame_(trans, "N") && ! lsame_(trans,
 	    "T") && ! lsame_(trans, "C")) {
 	info = 2;
     } else if (*n < 0) {
@@ -240,7 +240,7 @@ extern "C" {
 			temp2 = *alpha * a_ref(j, l);
 			i__3 = j;
 			for (i__ = 1; i__ <= i__3; ++i__) {
-			    c___ref(i__, j) = c___ref(i__, j) + a_ref(i__, l) 
+			    c___ref(i__, j) = c___ref(i__, j) + a_ref(i__, l)
 				    * temp1 + b_ref(i__, l) * temp2;
 /* L110: */
 			}
@@ -272,7 +272,7 @@ extern "C" {
 			temp2 = *alpha * a_ref(j, l);
 			i__3 = *n;
 			for (i__ = j; i__ <= i__3; ++i__) {
-			    c___ref(i__, j) = c___ref(i__, j) + a_ref(i__, l) 
+			    c___ref(i__, j) = c___ref(i__, j) + a_ref(i__, l)
 				    * temp1 + b_ref(i__, l) * temp2;
 /* L160: */
 			}
@@ -300,7 +300,7 @@ extern "C" {
 		    if (*beta == 0.) {
 			c___ref(i__, j) = *alpha * temp1 + *alpha * temp2;
 		    } else {
-			c___ref(i__, j) = *beta * c___ref(i__, j) + *alpha * 
+			c___ref(i__, j) = *beta * c___ref(i__, j) + *alpha *
 				temp1 + *alpha * temp2;
 		    }
 /* L200: */
@@ -323,7 +323,7 @@ extern "C" {
 		    if (*beta == 0.) {
 			c___ref(i__, j) = *alpha * temp1 + *alpha * temp2;
 		    } else {
-			c___ref(i__, j) = *beta * c___ref(i__, j) + *alpha * 
+			c___ref(i__, j) = *beta * c___ref(i__, j) + *alpha *
 				temp1 + *alpha * temp2;
 		    }
 /* L230: */
diff --git a/external/hypre/src/blas/dsyrk.c b/external/hypre/src/blas/dsyrk.c
index d51ca460..e0042c5e 100644
--- a/external/hypre/src/blas/dsyrk.c
+++ b/external/hypre/src/blas/dsyrk.c
@@ -13,8 +13,8 @@ extern "C" {
 #include "f2c.h"
 #include "hypre_blas.h"
 
-/* Subroutine */ integer dsyrk_(const char *uplo,const char *trans, integer *n, integer *k, 
-	doublereal *alpha, doublereal *a, integer *lda, doublereal *beta, 
+/* Subroutine */ integer dsyrk_(const char *uplo,const char *trans, integer *n, integer *k,
+	doublereal *alpha, doublereal *a, integer *lda, doublereal *beta,
 	doublereal *c, integer *ldc)
 {
 
@@ -22,158 +22,158 @@ extern "C" {
     /* System generated locals */
 
     /* Local variables */
-    static integer info;
-    static doublereal temp;
-    static integer i, j, l;
+    integer info;
+    doublereal temp;
+    integer i, j, l;
     extern logical lsame_(const char *,const char *);
-    static integer nrowa;
-    static logical upper;
+    integer nrowa;
+    logical upper;
     extern /* Subroutine */ integer xerbla_(const char *, integer *);
 
 
-/*  Purpose   
-    =======   
-
-    DSYRK  performs one of the symmetric rank k operations   
-
-       C := alpha*A*A' + beta*C,   
-
-    or   
-
-       C := alpha*A'*A + beta*C,   
-
-    where  alpha and beta  are scalars, C is an  n by n  symmetric matrix 
-  
-    and  A  is an  n by k  matrix in the first case and a  k by n  matrix 
-  
-    in the second case.   
-
-    Parameters   
-    ==========   
-
-    UPLO   - CHARACTER*1.   
-             On  entry,   UPLO  specifies  whether  the  upper  or  lower 
-  
-             triangular  part  of the  array  C  is to be  referenced  as 
-  
-             follows:   
-
-                UPLO = 'U' or 'u'   Only the  upper triangular part of  C 
-  
-                                    is to be referenced.   
-
-                UPLO = 'L' or 'l'   Only the  lower triangular part of  C 
-  
-                                    is to be referenced.   
-
-             Unchanged on exit.   
-
-    TRANS  - CHARACTER*1.   
-             On entry,  TRANS  specifies the operation to be performed as 
-  
-             follows:   
-
-                TRANS = 'N' or 'n'   C := alpha*A*A' + beta*C.   
-
-                TRANS = 'T' or 't'   C := alpha*A'*A + beta*C.   
-
-                TRANS = 'C' or 'c'   C := alpha*A'*A + beta*C.   
-
-             Unchanged on exit.   
-
-    N      - INTEGER.   
-             On entry,  N specifies the order of the matrix C.  N must be 
-  
-             at least zero.   
-             Unchanged on exit.   
-
-    K      - INTEGER.   
-             On entry with  TRANS = 'N' or 'n',  K  specifies  the number 
-  
-             of  columns   of  the   matrix   A,   and  on   entry   with 
-  
-             TRANS = 'T' or 't' or 'C' or 'c',  K  specifies  the  number 
-  
-             of rows of the matrix  A.  K must be at least zero.   
-             Unchanged on exit.   
-
-    ALPHA  - DOUBLE PRECISION.   
-             On entry, ALPHA specifies the scalar alpha.   
-             Unchanged on exit.   
-
-    A      - DOUBLE PRECISION array of DIMENSION ( LDA, ka ), where ka is 
-  
-             k  when  TRANS = 'N' or 'n',  and is  n  otherwise.   
-             Before entry with  TRANS = 'N' or 'n',  the  leading  n by k 
-  
-             part of the array  A  must contain the matrix  A,  otherwise 
-  
-             the leading  k by n  part of the array  A  must contain  the 
-  
-             matrix A.   
-             Unchanged on exit.   
-
-    LDA    - INTEGER.   
-             On entry, LDA specifies the first dimension of A as declared 
-  
-             in  the  calling  (sub)  program.   When  TRANS = 'N' or 'n' 
-  
-             then  LDA must be at least  max( 1, n ), otherwise  LDA must 
-  
-             be at least  max( 1, k ).   
-             Unchanged on exit.   
-
-    BETA   - DOUBLE PRECISION.   
-             On entry, BETA specifies the scalar beta.   
-             Unchanged on exit.   
-
-    C      - DOUBLE PRECISION array of DIMENSION ( LDC, n ).   
-             Before entry  with  UPLO = 'U' or 'u',  the leading  n by n 
-  
-             upper triangular part of the array C must contain the upper 
-  
-             triangular part  of the  symmetric matrix  and the strictly 
-  
-             lower triangular part of C is not referenced.  On exit, the 
-  
-             upper triangular part of the array  C is overwritten by the 
-  
-             upper triangular part of the updated matrix.   
-             Before entry  with  UPLO = 'L' or 'l',  the leading  n by n 
-  
-             lower triangular part of the array C must contain the lower 
-  
-             triangular part  of the  symmetric matrix  and the strictly 
-  
-             upper triangular part of C is not referenced.  On exit, the 
-  
-             lower triangular part of the array  C is overwritten by the 
-  
-             lower triangular part of the updated matrix.   
-
-    LDC    - INTEGER.   
-             On entry, LDC specifies the first dimension of C as declared 
-  
-             in  the  calling  (sub)  program.   LDC  must  be  at  least 
-  
-             max( 1, n ).   
-             Unchanged on exit.   
-
-
-    Level 3 Blas routine.   
-
-    -- Written on 8-February-1989.   
-       Jack Dongarra, Argonne National Laboratory.   
-       Iain Duff, AERE Harwell.   
-       Jeremy Du Croz, Numerical Algorithms Group Ltd.   
-       Sven Hammarling, Numerical Algorithms Group Ltd.   
-
-
-
-       Test the input parameters.   
-
-    
-   Parameter adjustments   
+/*  Purpose
+    =======
+
+    DSYRK  performs one of the symmetric rank k operations
+
+       C := alpha*A*A' + beta*C,
+
+    or
+
+       C := alpha*A'*A + beta*C,
+
+    where  alpha and beta  are scalars, C is an  n by n  symmetric matrix
+
+    and  A  is an  n by k  matrix in the first case and a  k by n  matrix
+
+    in the second case.
+
+    Parameters
+    ==========
+
+    UPLO   - CHARACTER*1.
+             On  entry,   UPLO  specifies  whether  the  upper  or  lower
+
+             triangular  part  of the  array  C  is to be  referenced  as
+
+             follows:
+
+                UPLO = 'U' or 'u'   Only the  upper triangular part of  C
+
+                                    is to be referenced.
+
+                UPLO = 'L' or 'l'   Only the  lower triangular part of  C
+
+                                    is to be referenced.
+
+             Unchanged on exit.
+
+    TRANS  - CHARACTER*1.
+             On entry,  TRANS  specifies the operation to be performed as
+
+             follows:
+
+                TRANS = 'N' or 'n'   C := alpha*A*A' + beta*C.
+
+                TRANS = 'T' or 't'   C := alpha*A'*A + beta*C.
+
+                TRANS = 'C' or 'c'   C := alpha*A'*A + beta*C.
+
+             Unchanged on exit.
+
+    N      - INTEGER.
+             On entry,  N specifies the order of the matrix C.  N must be
+
+             at least zero.
+             Unchanged on exit.
+
+    K      - INTEGER.
+             On entry with  TRANS = 'N' or 'n',  K  specifies  the number
+
+             of  columns   of  the   matrix   A,   and  on   entry   with
+
+             TRANS = 'T' or 't' or 'C' or 'c',  K  specifies  the  number
+
+             of rows of the matrix  A.  K must be at least zero.
+             Unchanged on exit.
+
+    ALPHA  - DOUBLE PRECISION.
+             On entry, ALPHA specifies the scalar alpha.
+             Unchanged on exit.
+
+    A      - DOUBLE PRECISION array of DIMENSION ( LDA, ka ), where ka is
+
+             k  when  TRANS = 'N' or 'n',  and is  n  otherwise.
+             Before entry with  TRANS = 'N' or 'n',  the  leading  n by k
+
+             part of the array  A  must contain the matrix  A,  otherwise
+
+             the leading  k by n  part of the array  A  must contain  the
+
+             matrix A.
+             Unchanged on exit.
+
+    LDA    - INTEGER.
+             On entry, LDA specifies the first dimension of A as declared
+
+             in  the  calling  (sub)  program.   When  TRANS = 'N' or 'n'
+
+             then  LDA must be at least  max( 1, n ), otherwise  LDA must
+
+             be at least  max( 1, k ).
+             Unchanged on exit.
+
+    BETA   - DOUBLE PRECISION.
+             On entry, BETA specifies the scalar beta.
+             Unchanged on exit.
+
+    C      - DOUBLE PRECISION array of DIMENSION ( LDC, n ).
+             Before entry  with  UPLO = 'U' or 'u',  the leading  n by n
+
+             upper triangular part of the array C must contain the upper
+
+             triangular part  of the  symmetric matrix  and the strictly
+
+             lower triangular part of C is not referenced.  On exit, the
+
+             upper triangular part of the array  C is overwritten by the
+
+             upper triangular part of the updated matrix.
+             Before entry  with  UPLO = 'L' or 'l',  the leading  n by n
+
+             lower triangular part of the array C must contain the lower
+
+             triangular part  of the  symmetric matrix  and the strictly
+
+             upper triangular part of C is not referenced.  On exit, the
+
+             lower triangular part of the array  C is overwritten by the
+
+             lower triangular part of the updated matrix.
+
+    LDC    - INTEGER.
+             On entry, LDC specifies the first dimension of C as declared
+
+             in  the  calling  (sub)  program.   LDC  must  be  at  least
+
+             max( 1, n ).
+             Unchanged on exit.
+
+
+    Level 3 Blas routine.
+
+    -- Written on 8-February-1989.
+       Jack Dongarra, Argonne National Laboratory.
+       Iain Duff, AERE Harwell.
+       Jeremy Du Croz, Numerical Algorithms Group Ltd.
+       Sven Hammarling, Numerical Algorithms Group Ltd.
+
+
+
+       Test the input parameters.
+
+
+   Parameter adjustments
        Function Body */
 
 #define A(I,J) a[(I)-1 + ((J)-1)* ( *lda)]
diff --git a/external/hypre/src/blas/dtrmm.c b/external/hypre/src/blas/dtrmm.c
index 6c784766..3f31026c 100644
--- a/external/hypre/src/blas/dtrmm.c
+++ b/external/hypre/src/blas/dtrmm.c
@@ -8,107 +8,107 @@ extern "C" {
 #include "f2c.h"
 #include "hypre_blas.h"
 
-/* Subroutine */ integer dtrmm_(const char *side,const char *uplo,const char *transa,const char *diag, 
+/* Subroutine */ integer dtrmm_(const char *side,const char *uplo,const char *transa,const char *diag,
 	integer *m, integer *n, doublereal *alpha, doublereal *a, integer *
 	lda, doublereal *b, integer *ldb)
 {
     /* System generated locals */
     integer a_dim1, a_offset, b_dim1, b_offset, i__1, i__2, i__3;
     /* Local variables */
-    static integer info;
-    static doublereal temp;
-    static integer i__, j, k;
-    static logical lside;
+    integer info;
+    doublereal temp;
+    integer i__, j, k;
+    logical lside;
     extern logical lsame_(const char *,const char *);
-    static integer nrowa;
-    static logical upper;
+    integer nrowa;
+    logical upper;
     extern /* Subroutine */ integer xerbla_(const char *, integer *);
-    static logical nounit;
+    logical nounit;
 #define a_ref(a_1,a_2) a[(a_2)*a_dim1 + a_1]
 #define b_ref(a_1,a_2) b[(a_2)*b_dim1 + a_1]
-/*  Purpose   
-    =======   
-    DTRMM  performs one of the matrix-matrix operations   
-       B := alpha*op( A )*B,   or   B := alpha*B*op( A ),   
-    where  alpha  is a scalar,  B  is an m by n matrix,  A  is a unit, or   
-    non-unit,  upper or lower triangular matrix  and  op( A )  is one  of   
-       op( A ) = A   or   op( A ) = A'.   
-    Parameters   
-    ==========   
-    SIDE   - CHARACTER*1.   
-             On entry,  SIDE specifies whether  op( A ) multiplies B from   
-             the left or right as follows:   
-                SIDE = 'L' or 'l'   B := alpha*op( A )*B.   
-                SIDE = 'R' or 'r'   B := alpha*B*op( A ).   
-             Unchanged on exit.   
-    UPLO   - CHARACTER*1.   
-             On entry, UPLO specifies whether the matrix A is an upper or   
-             lower triangular matrix as follows:   
-                UPLO = 'U' or 'u'   A is an upper triangular matrix.   
-                UPLO = 'L' or 'l'   A is a lower triangular matrix.   
-             Unchanged on exit.   
-    TRANSA - CHARACTER*1.   
-             On entry, TRANSA specifies the form of op( A ) to be used in   
-             the matrix multiplication as follows:   
-                TRANSA = 'N' or 'n'   op( A ) = A.   
-                TRANSA = 'T' or 't'   op( A ) = A'.   
-                TRANSA = 'C' or 'c'   op( A ) = A'.   
-             Unchanged on exit.   
-    DIAG   - CHARACTER*1.   
-             On entry, DIAG specifies whether or not A is unit triangular   
-             as follows:   
-                DIAG = 'U' or 'u'   A is assumed to be unit triangular.   
-                DIAG = 'N' or 'n'   A is not assumed to be unit   
-                                    triangular.   
-             Unchanged on exit.   
-    M      - INTEGER.   
-             On entry, M specifies the number of rows of B. M must be at   
-             least zero.   
-             Unchanged on exit.   
-    N      - INTEGER.   
-             On entry, N specifies the number of columns of B.  N must be   
-             at least zero.   
-             Unchanged on exit.   
-    ALPHA  - DOUBLE PRECISION.   
-             On entry,  ALPHA specifies the scalar  alpha. When  alpha is   
-             zero then  A is not referenced and  B need not be set before   
-             entry.   
-             Unchanged on exit.   
-    A      - DOUBLE PRECISION array of DIMENSION ( LDA, k ), where k is m   
-             when  SIDE = 'L' or 'l'  and is  n  when  SIDE = 'R' or 'r'.   
-             Before entry  with  UPLO = 'U' or 'u',  the  leading  k by k   
-             upper triangular part of the array  A must contain the upper   
-             triangular matrix  and the strictly lower triangular part of   
-             A is not referenced.   
-             Before entry  with  UPLO = 'L' or 'l',  the  leading  k by k   
-             lower triangular part of the array  A must contain the lower   
-             triangular matrix  and the strictly upper triangular part of   
-             A is not referenced.   
-             Note that when  DIAG = 'U' or 'u',  the diagonal elements of   
-             A  are not referenced either,  but are assumed to be  unity.   
-             Unchanged on exit.   
-    LDA    - INTEGER.   
-             On entry, LDA specifies the first dimension of A as declared   
-             in the calling (sub) program.  When  SIDE = 'L' or 'l'  then   
-             LDA  must be at least  max( 1, m ),  when  SIDE = 'R' or 'r'   
-             then LDA must be at least max( 1, n ).   
-             Unchanged on exit.   
-    B      - DOUBLE PRECISION array of DIMENSION ( LDB, n ).   
-             Before entry,  the leading  m by n part of the array  B must   
-             contain the matrix  B,  and  on exit  is overwritten  by the   
-             transformed matrix.   
-    LDB    - INTEGER.   
-             On entry, LDB specifies the first dimension of B as declared   
-             in  the  calling  (sub)  program.   LDB  must  be  at  least   
-             max( 1, m ).   
-             Unchanged on exit.   
-    Level 3 Blas routine.   
-    -- Written on 8-February-1989.   
-       Jack Dongarra, Argonne National Laboratory.   
-       Iain Duff, AERE Harwell.   
-       Jeremy Du Croz, Numerical Algorithms Group Ltd.   
-       Sven Hammarling, Numerical Algorithms Group Ltd.   
-       Test the input parameters.   
+/*  Purpose
+    =======
+    DTRMM  performs one of the matrix-matrix operations
+       B := alpha*op( A )*B,   or   B := alpha*B*op( A ),
+    where  alpha  is a scalar,  B  is an m by n matrix,  A  is a unit, or
+    non-unit,  upper or lower triangular matrix  and  op( A )  is one  of
+       op( A ) = A   or   op( A ) = A'.
+    Parameters
+    ==========
+    SIDE   - CHARACTER*1.
+             On entry,  SIDE specifies whether  op( A ) multiplies B from
+             the left or right as follows:
+                SIDE = 'L' or 'l'   B := alpha*op( A )*B.
+                SIDE = 'R' or 'r'   B := alpha*B*op( A ).
+             Unchanged on exit.
+    UPLO   - CHARACTER*1.
+             On entry, UPLO specifies whether the matrix A is an upper or
+             lower triangular matrix as follows:
+                UPLO = 'U' or 'u'   A is an upper triangular matrix.
+                UPLO = 'L' or 'l'   A is a lower triangular matrix.
+             Unchanged on exit.
+    TRANSA - CHARACTER*1.
+             On entry, TRANSA specifies the form of op( A ) to be used in
+             the matrix multiplication as follows:
+                TRANSA = 'N' or 'n'   op( A ) = A.
+                TRANSA = 'T' or 't'   op( A ) = A'.
+                TRANSA = 'C' or 'c'   op( A ) = A'.
+             Unchanged on exit.
+    DIAG   - CHARACTER*1.
+             On entry, DIAG specifies whether or not A is unit triangular
+             as follows:
+                DIAG = 'U' or 'u'   A is assumed to be unit triangular.
+                DIAG = 'N' or 'n'   A is not assumed to be unit
+                                    triangular.
+             Unchanged on exit.
+    M      - INTEGER.
+             On entry, M specifies the number of rows of B. M must be at
+             least zero.
+             Unchanged on exit.
+    N      - INTEGER.
+             On entry, N specifies the number of columns of B.  N must be
+             at least zero.
+             Unchanged on exit.
+    ALPHA  - DOUBLE PRECISION.
+             On entry,  ALPHA specifies the scalar  alpha. When  alpha is
+             zero then  A is not referenced and  B need not be set before
+             entry.
+             Unchanged on exit.
+    A      - DOUBLE PRECISION array of DIMENSION ( LDA, k ), where k is m
+             when  SIDE = 'L' or 'l'  and is  n  when  SIDE = 'R' or 'r'.
+             Before entry  with  UPLO = 'U' or 'u',  the  leading  k by k
+             upper triangular part of the array  A must contain the upper
+             triangular matrix  and the strictly lower triangular part of
+             A is not referenced.
+             Before entry  with  UPLO = 'L' or 'l',  the  leading  k by k
+             lower triangular part of the array  A must contain the lower
+             triangular matrix  and the strictly upper triangular part of
+             A is not referenced.
+             Note that when  DIAG = 'U' or 'u',  the diagonal elements of
+             A  are not referenced either,  but are assumed to be  unity.
+             Unchanged on exit.
+    LDA    - INTEGER.
+             On entry, LDA specifies the first dimension of A as declared
+             in the calling (sub) program.  When  SIDE = 'L' or 'l'  then
+             LDA  must be at least  max( 1, m ),  when  SIDE = 'R' or 'r'
+             then LDA must be at least max( 1, n ).
+             Unchanged on exit.
+    B      - DOUBLE PRECISION array of DIMENSION ( LDB, n ).
+             Before entry,  the leading  m by n part of the array  B must
+             contain the matrix  B,  and  on exit  is overwritten  by the
+             transformed matrix.
+    LDB    - INTEGER.
+             On entry, LDB specifies the first dimension of B as declared
+             in  the  calling  (sub)  program.   LDB  must  be  at  least
+             max( 1, m ).
+             Unchanged on exit.
+    Level 3 Blas routine.
+    -- Written on 8-February-1989.
+       Jack Dongarra, Argonne National Laboratory.
+       Iain Duff, AERE Harwell.
+       Jeremy Du Croz, Numerical Algorithms Group Ltd.
+       Sven Hammarling, Numerical Algorithms Group Ltd.
+       Test the input parameters.
        Parameter adjustments */
     a_dim1 = *lda;
     a_offset = 1 + a_dim1 * 1;
@@ -133,7 +133,7 @@ extern "C" {
     } else if (! lsame_(transa, "N") && ! lsame_(transa,
 	     "T") && ! lsame_(transa, "C")) {
 	info = 3;
-    } else if (! lsame_(diag, "U") && ! lsame_(diag, 
+    } else if (! lsame_(diag, "U") && ! lsame_(diag,
 	    "N")) {
 	info = 4;
     } else if (*m < 0) {
diff --git a/external/hypre/src/blas/dtrmv.c b/external/hypre/src/blas/dtrmv.c
index 359dc394..bf9c47f3 100644
--- a/external/hypre/src/blas/dtrmv.c
+++ b/external/hypre/src/blas/dtrmv.c
@@ -8,85 +8,85 @@ extern "C" {
 #include "f2c.h"
 #include "hypre_blas.h"
 
-/* Subroutine */ integer dtrmv_(const char *uplo,const char *trans,const char *diag, integer *n, 
+/* Subroutine */ integer dtrmv_(const char *uplo,const char *trans,const char *diag, integer *n,
 	doublereal *a, integer *lda, doublereal *x, integer *incx)
 {
     /* System generated locals */
     integer a_dim1, a_offset, i__1, i__2;
     /* Local variables */
-    static integer info;
-    static doublereal temp;
-    static integer i__, j;
+    integer info;
+    doublereal temp;
+    integer i__, j;
     extern logical lsame_(const char *,const char *);
-    static integer ix, jx, kx;
+    integer ix, jx, kx = 0;
     extern /* Subroutine */ integer xerbla_(const char *, integer *);
-    static logical nounit;
+    logical nounit;
 #define a_ref(a_1,a_2) a[(a_2)*a_dim1 + a_1]
-/*  Purpose   
-    =======   
-    DTRMV  performs one of the matrix-vector operations   
-       x := A*x,   or   x := A'*x,   
-    where x is an n element vector and  A is an n by n unit, or non-unit,   
-    upper or lower triangular matrix.   
-    Parameters   
-    ==========   
-    UPLO   - CHARACTER*1.   
-             On entry, UPLO specifies whether the matrix is an upper or   
-             lower triangular matrix as follows:   
-                UPLO = 'U' or 'u'   A is an upper triangular matrix.   
-                UPLO = 'L' or 'l'   A is a lower triangular matrix.   
-             Unchanged on exit.   
-    TRANS  - CHARACTER*1.   
-             On entry, TRANS specifies the operation to be performed as   
-             follows:   
-                TRANS = 'N' or 'n'   x := A*x.   
-                TRANS = 'T' or 't'   x := A'*x.   
-                TRANS = 'C' or 'c'   x := A'*x.   
-             Unchanged on exit.   
-    DIAG   - CHARACTER*1.   
-             On entry, DIAG specifies whether or not A is unit   
-             triangular as follows:   
-                DIAG = 'U' or 'u'   A is assumed to be unit triangular.   
-                DIAG = 'N' or 'n'   A is not assumed to be unit   
-                                    triangular.   
-             Unchanged on exit.   
-    N      - INTEGER.   
-             On entry, N specifies the order of the matrix A.   
-             N must be at least zero.   
-             Unchanged on exit.   
-    A      - DOUBLE PRECISION array of DIMENSION ( LDA, n ).   
-             Before entry with  UPLO = 'U' or 'u', the leading n by n   
-             upper triangular part of the array A must contain the upper   
-             triangular matrix and the strictly lower triangular part of   
-             A is not referenced.   
-             Before entry with UPLO = 'L' or 'l', the leading n by n   
-             lower triangular part of the array A must contain the lower   
-             triangular matrix and the strictly upper triangular part of   
-             A is not referenced.   
-             Note that when  DIAG = 'U' or 'u', the diagonal elements of   
-             A are not referenced either, but are assumed to be unity.   
-             Unchanged on exit.   
-    LDA    - INTEGER.   
-             On entry, LDA specifies the first dimension of A as declared   
-             in the calling (sub) program. LDA must be at least   
-             max( 1, n ).   
-             Unchanged on exit.   
-    X      - DOUBLE PRECISION array of dimension at least   
-             ( 1 + ( n - 1 )*abs( INCX ) ).   
-             Before entry, the incremented array X must contain the n   
-             element vector x. On exit, X is overwritten with the   
-             tranformed vector x.   
-    INCX   - INTEGER.   
-             On entry, INCX specifies the increment for the elements of   
-             X. INCX must not be zero.   
-             Unchanged on exit.   
-    Level 2 Blas routine.   
-    -- Written on 22-October-1986.   
-       Jack Dongarra, Argonne National Lab.   
-       Jeremy Du Croz, Nag Central Office.   
-       Sven Hammarling, Nag Central Office.   
-       Richard Hanson, Sandia National Labs.   
-       Test the input parameters.   
+/*  Purpose
+    =======
+    DTRMV  performs one of the matrix-vector operations
+       x := A*x,   or   x := A'*x,
+    where x is an n element vector and  A is an n by n unit, or non-unit,
+    upper or lower triangular matrix.
+    Parameters
+    ==========
+    UPLO   - CHARACTER*1.
+             On entry, UPLO specifies whether the matrix is an upper or
+             lower triangular matrix as follows:
+                UPLO = 'U' or 'u'   A is an upper triangular matrix.
+                UPLO = 'L' or 'l'   A is a lower triangular matrix.
+             Unchanged on exit.
+    TRANS  - CHARACTER*1.
+             On entry, TRANS specifies the operation to be performed as
+             follows:
+                TRANS = 'N' or 'n'   x := A*x.
+                TRANS = 'T' or 't'   x := A'*x.
+                TRANS = 'C' or 'c'   x := A'*x.
+             Unchanged on exit.
+    DIAG   - CHARACTER*1.
+             On entry, DIAG specifies whether or not A is unit
+             triangular as follows:
+                DIAG = 'U' or 'u'   A is assumed to be unit triangular.
+                DIAG = 'N' or 'n'   A is not assumed to be unit
+                                    triangular.
+             Unchanged on exit.
+    N      - INTEGER.
+             On entry, N specifies the order of the matrix A.
+             N must be at least zero.
+             Unchanged on exit.
+    A      - DOUBLE PRECISION array of DIMENSION ( LDA, n ).
+             Before entry with  UPLO = 'U' or 'u', the leading n by n
+             upper triangular part of the array A must contain the upper
+             triangular matrix and the strictly lower triangular part of
+             A is not referenced.
+             Before entry with UPLO = 'L' or 'l', the leading n by n
+             lower triangular part of the array A must contain the lower
+             triangular matrix and the strictly upper triangular part of
+             A is not referenced.
+             Note that when  DIAG = 'U' or 'u', the diagonal elements of
+             A are not referenced either, but are assumed to be unity.
+             Unchanged on exit.
+    LDA    - INTEGER.
+             On entry, LDA specifies the first dimension of A as declared
+             in the calling (sub) program. LDA must be at least
+             max( 1, n ).
+             Unchanged on exit.
+    X      - DOUBLE PRECISION array of dimension at least
+             ( 1 + ( n - 1 )*abs( INCX ) ).
+             Before entry, the incremented array X must contain the n
+             element vector x. On exit, X is overwritten with the
+             tranformed vector x.
+    INCX   - INTEGER.
+             On entry, INCX specifies the increment for the elements of
+             X. INCX must not be zero.
+             Unchanged on exit.
+    Level 2 Blas routine.
+    -- Written on 22-October-1986.
+       Jack Dongarra, Argonne National Lab.
+       Jeremy Du Croz, Nag Central Office.
+       Sven Hammarling, Nag Central Office.
+       Richard Hanson, Sandia National Labs.
+       Test the input parameters.
        Parameter adjustments */
     a_dim1 = *lda;
     a_offset = 1 + a_dim1 * 1;
@@ -96,10 +96,10 @@ extern "C" {
     info = 0;
     if (! lsame_(uplo, "U") && ! lsame_(uplo, "L")) {
 	info = 1;
-    } else if (! lsame_(trans, "N") && ! lsame_(trans, 
+    } else if (! lsame_(trans, "N") && ! lsame_(trans,
 	    "T") && ! lsame_(trans, "C")) {
 	info = 2;
-    } else if (! lsame_(diag, "U") && ! lsame_(diag, 
+    } else if (! lsame_(diag, "U") && ! lsame_(diag,
 	    "N")) {
 	info = 3;
     } else if (*n < 0) {
@@ -118,14 +118,14 @@ extern "C" {
 	return 0;
     }
     nounit = lsame_(diag, "N");
-/*     Set up the start point in X if the increment is not unity. This   
+/*     Set up the start point in X if the increment is not unity. This
        will be  ( N - 1 )*INCX  too small for descending loops. */
     if (*incx <= 0) {
 	kx = 1 - (*n - 1) * *incx;
     } else if (*incx != 1) {
 	kx = 1;
     }
-/*     Start the operations. In this version the elements of A are   
+/*     Start the operations. In this version the elements of A are
        accessed sequentially with one pass through A. */
     if (lsame_(trans, "N")) {
 /*        Form  x := A*x. */
diff --git a/external/hypre/src/blas/dtrsm.c b/external/hypre/src/blas/dtrsm.c
index 64de7641..86e330eb 100644
--- a/external/hypre/src/blas/dtrsm.c
+++ b/external/hypre/src/blas/dtrsm.c
@@ -13,7 +13,7 @@ extern "C" {
 #include "f2c.h"
 #include "hypre_blas.h"
 
-/* Subroutine */ integer dtrsm_(const char *side,const char *uplo,const char *transa,const char *diag, 
+/* Subroutine */ integer dtrsm_(const char *side,const char *uplo,const char *transa,const char *diag,
 	integer *m, integer *n, doublereal *alpha, doublereal *a, integer *
 	lda, doublereal *b, integer *ldb)
 {
@@ -22,168 +22,168 @@ extern "C" {
     /* System generated locals */
 
     /* Local variables */
-    static integer info;
-    static doublereal temp;
-    static integer i, j, k;
-    static logical lside;
+    integer info;
+    doublereal temp;
+    integer i, j, k;
+    logical lside;
     extern logical lsame_(const char *,const char *);
-    static integer nrowa;
-    static logical upper;
+    integer nrowa;
+    logical upper;
     extern /* Subroutine */ integer xerbla_(const char *, integer *);
-    static logical nounit;
+    logical nounit;
 
 
-/*  Purpose   
-    =======   
+/*  Purpose
+    =======
 
-    DTRSM  solves one of the matrix equations   
+    DTRSM  solves one of the matrix equations
 
-       op( A )*X = alpha*B,   or   X*op( A ) = alpha*B,   
+       op( A )*X = alpha*B,   or   X*op( A ) = alpha*B,
 
-    where alpha is a scalar, X and B are m by n matrices, A is a unit, or 
-  
-    non-unit,  upper or lower triangular matrix  and  op( A )  is one  of 
-  
+    where alpha is a scalar, X and B are m by n matrices, A is a unit, or
 
-       op( A ) = A   or   op( A ) = A'.   
+    non-unit,  upper or lower triangular matrix  and  op( A )  is one  of
 
-    The matrix X is overwritten on B.   
 
-    Parameters   
-    ==========   
+       op( A ) = A   or   op( A ) = A'.
 
-    SIDE   - CHARACTER*1.   
-             On entry, SIDE specifies whether op( A ) appears on the left 
-  
-             or right of X as follows:   
+    The matrix X is overwritten on B.
 
-                SIDE = 'L' or 'l'   op( A )*X = alpha*B.   
-
-                SIDE = 'R' or 'r'   X*op( A ) = alpha*B.   
+    Parameters
+    ==========
 
-             Unchanged on exit.   
-
-    UPLO   - CHARACTER*1.   
-             On entry, UPLO specifies whether the matrix A is an upper or 
-  
-             lower triangular matrix as follows:   
-
-                UPLO = 'U' or 'u'   A is an upper triangular matrix.   
-
-                UPLO = 'L' or 'l'   A is a lower triangular matrix.   
+    SIDE   - CHARACTER*1.
+             On entry, SIDE specifies whether op( A ) appears on the left
 
-             Unchanged on exit.   
+             or right of X as follows:
 
-    TRANSA - CHARACTER*1.   
-             On entry, TRANSA specifies the form of op( A ) to be used in 
-  
-             the matrix multiplication as follows:   
+                SIDE = 'L' or 'l'   op( A )*X = alpha*B.
 
-                TRANSA = 'N' or 'n'   op( A ) = A.   
+                SIDE = 'R' or 'r'   X*op( A ) = alpha*B.
 
-                TRANSA = 'T' or 't'   op( A ) = A'.   
+             Unchanged on exit.
 
-                TRANSA = 'C' or 'c'   op( A ) = A'.   
+    UPLO   - CHARACTER*1.
+             On entry, UPLO specifies whether the matrix A is an upper or
 
-             Unchanged on exit.   
+             lower triangular matrix as follows:
 
-    DIAG   - CHARACTER*1.   
-             On entry, DIAG specifies whether or not A is unit triangular 
-  
-             as follows:   
+                UPLO = 'U' or 'u'   A is an upper triangular matrix.
 
-                DIAG = 'U' or 'u'   A is assumed to be unit triangular.   
+                UPLO = 'L' or 'l'   A is a lower triangular matrix.
 
-                DIAG = 'N' or 'n'   A is not assumed to be unit   
-                                    triangular.   
+             Unchanged on exit.
 
-             Unchanged on exit.   
+    TRANSA - CHARACTER*1.
+             On entry, TRANSA specifies the form of op( A ) to be used in
 
-    M      - INTEGER.   
-             On entry, M specifies the number of rows of B. M must be at 
-  
-             least zero.   
-             Unchanged on exit.   
+             the matrix multiplication as follows:
 
-    N      - INTEGER.   
-             On entry, N specifies the number of columns of B.  N must be 
-  
-             at least zero.   
-             Unchanged on exit.   
+                TRANSA = 'N' or 'n'   op( A ) = A.
 
-    ALPHA  - DOUBLE PRECISION.   
-             On entry,  ALPHA specifies the scalar  alpha. When  alpha is 
-  
-             zero then  A is not referenced and  B need not be set before 
-  
-             entry.   
-             Unchanged on exit.   
+                TRANSA = 'T' or 't'   op( A ) = A'.
 
-    A      - DOUBLE PRECISION array of DIMENSION ( LDA, k ), where k is m 
-  
-             when  SIDE = 'L' or 'l'  and is  n  when  SIDE = 'R' or 'r'. 
-  
-             Before entry  with  UPLO = 'U' or 'u',  the  leading  k by k 
-  
-             upper triangular part of the array  A must contain the upper 
-  
-             triangular matrix  and the strictly lower triangular part of 
-  
-             A is not referenced.   
-             Before entry  with  UPLO = 'L' or 'l',  the  leading  k by k 
-  
-             lower triangular part of the array  A must contain the lower 
-  
-             triangular matrix  and the strictly upper triangular part of 
-  
-             A is not referenced.   
-             Note that when  DIAG = 'U' or 'u',  the diagonal elements of 
-  
-             A  are not referenced either,  but are assumed to be  unity. 
-  
-             Unchanged on exit.   
+                TRANSA = 'C' or 'c'   op( A ) = A'.
 
-    LDA    - INTEGER.   
-             On entry, LDA specifies the first dimension of A as declared 
-  
-             in the calling (sub) program.  When  SIDE = 'L' or 'l'  then 
-  
-             LDA  must be at least  max( 1, m ),  when  SIDE = 'R' or 'r' 
-  
-             then LDA must be at least max( 1, n ).   
-             Unchanged on exit.   
-
-    B      - DOUBLE PRECISION array of DIMENSION ( LDB, n ).   
-             Before entry,  the leading  m by n part of the array  B must 
-  
-             contain  the  right-hand  side  matrix  B,  and  on exit  is 
-  
-             overwritten by the solution matrix  X.   
-
-    LDB    - INTEGER.   
-             On entry, LDB specifies the first dimension of B as declared 
-  
-             in  the  calling  (sub)  program.   LDB  must  be  at  least 
-  
-             max( 1, m ).   
-             Unchanged on exit.   
-
-
-    Level 3 Blas routine.   
-
-
-    -- Written on 8-February-1989.   
-       Jack Dongarra, Argonne National Laboratory.   
-       Iain Duff, AERE Harwell.   
-       Jeremy Du Croz, Numerical Algorithms Group Ltd.   
-       Sven Hammarling, Numerical Algorithms Group Ltd.   
-
-
-
-       Test the input parameters.   
-
-    
-   Parameter adjustments   
+             Unchanged on exit.
+
+    DIAG   - CHARACTER*1.
+             On entry, DIAG specifies whether or not A is unit triangular
+
+             as follows:
+
+                DIAG = 'U' or 'u'   A is assumed to be unit triangular.
+
+                DIAG = 'N' or 'n'   A is not assumed to be unit
+                                    triangular.
+
+             Unchanged on exit.
+
+    M      - INTEGER.
+             On entry, M specifies the number of rows of B. M must be at
+
+             least zero.
+             Unchanged on exit.
+
+    N      - INTEGER.
+             On entry, N specifies the number of columns of B.  N must be
+
+             at least zero.
+             Unchanged on exit.
+
+    ALPHA  - DOUBLE PRECISION.
+             On entry,  ALPHA specifies the scalar  alpha. When  alpha is
+
+             zero then  A is not referenced and  B need not be set before
+
+             entry.
+             Unchanged on exit.
+
+    A      - DOUBLE PRECISION array of DIMENSION ( LDA, k ), where k is m
+
+             when  SIDE = 'L' or 'l'  and is  n  when  SIDE = 'R' or 'r'.
+
+             Before entry  with  UPLO = 'U' or 'u',  the  leading  k by k
+
+             upper triangular part of the array  A must contain the upper
+
+             triangular matrix  and the strictly lower triangular part of
+
+             A is not referenced.
+             Before entry  with  UPLO = 'L' or 'l',  the  leading  k by k
+
+             lower triangular part of the array  A must contain the lower
+
+             triangular matrix  and the strictly upper triangular part of
+
+             A is not referenced.
+             Note that when  DIAG = 'U' or 'u',  the diagonal elements of
+
+             A  are not referenced either,  but are assumed to be  unity.
+
+             Unchanged on exit.
+
+    LDA    - INTEGER.
+             On entry, LDA specifies the first dimension of A as declared
+
+             in the calling (sub) program.  When  SIDE = 'L' or 'l'  then
+
+             LDA  must be at least  max( 1, m ),  when  SIDE = 'R' or 'r'
+
+             then LDA must be at least max( 1, n ).
+             Unchanged on exit.
+
+    B      - DOUBLE PRECISION array of DIMENSION ( LDB, n ).
+             Before entry,  the leading  m by n part of the array  B must
+
+             contain  the  right-hand  side  matrix  B,  and  on exit  is
+
+             overwritten by the solution matrix  X.
+
+    LDB    - INTEGER.
+             On entry, LDB specifies the first dimension of B as declared
+
+             in  the  calling  (sub)  program.   LDB  must  be  at  least
+
+             max( 1, m ).
+             Unchanged on exit.
+
+
+    Level 3 Blas routine.
+
+
+    -- Written on 8-February-1989.
+       Jack Dongarra, Argonne National Laboratory.
+       Iain Duff, AERE Harwell.
+       Jeremy Du Croz, Numerical Algorithms Group Ltd.
+       Sven Hammarling, Numerical Algorithms Group Ltd.
+
+
+
+       Test the input parameters.
+
+
+   Parameter adjustments
        Function Body */
 
 #define A(I,J) a[(I)-1 + ((J)-1)* ( *lda)]
@@ -203,7 +203,7 @@ extern "C" {
 	info = 1;
     } else if (! upper && ! lsame_(uplo, "L")) {
 	info = 2;
-    } else if (! lsame_(transa, "N") && ! lsame_(transa, "T") 
+    } else if (! lsame_(transa, "N") && ! lsame_(transa, "T")
 	    && ! lsame_(transa, "C")) {
 	info = 3;
     } else if (! lsame_(diag, "U") && ! lsame_(diag, "N")) {
diff --git a/external/hypre/src/blas/dtrsv.c b/external/hypre/src/blas/dtrsv.c
index 279a5d43..3607b7e0 100644
--- a/external/hypre/src/blas/dtrsv.c
+++ b/external/hypre/src/blas/dtrsv.c
@@ -13,7 +13,7 @@ extern "C" {
 #include "f2c.h"
 #include "hypre_blas.h"
 
-/* Subroutine */ integer dtrsv_(const char *uplo,const char *trans,const char *diag, integer *n, 
+/* Subroutine */ integer dtrsv_(const char *uplo,const char *trans,const char *diag, integer *n,
 	doublereal *a, integer *lda, doublereal *x, integer *incx)
 {
 
@@ -21,121 +21,121 @@ extern "C" {
     /* System generated locals */
 
     /* Local variables */
-    static integer info;
-    static doublereal temp;
-    static integer i, j;
+    integer info;
+    doublereal temp;
+    integer i, j;
     extern logical lsame_(const char *,const char *);
-    static integer ix, jx, kx;
+    integer ix, jx, kx = 0;
     extern /* Subroutine */ integer xerbla_(const char *, integer *);
-    static logical nounit;
+    logical nounit;
 
 
-/*  Purpose   
-    =======   
+/*  Purpose
+    =======
 
-    DTRSV  solves one of the systems of equations   
+    DTRSV  solves one of the systems of equations
 
-       A*x = b,   or   A'*x = b,   
+       A*x = b,   or   A'*x = b,
 
-    where b and x are n element vectors and A is an n by n unit, or   
-    non-unit, upper or lower triangular matrix.   
+    where b and x are n element vectors and A is an n by n unit, or
+    non-unit, upper or lower triangular matrix.
 
-    No test for singularity or near-singularity is included in this   
-    routine. Such tests must be performed before calling this routine.   
+    No test for singularity or near-singularity is included in this
+    routine. Such tests must be performed before calling this routine.
 
-    Parameters   
-    ==========   
+    Parameters
+    ==========
 
-    UPLO   - CHARACTER*1.   
-             On entry, UPLO specifies whether the matrix is an upper or   
-             lower triangular matrix as follows:   
+    UPLO   - CHARACTER*1.
+             On entry, UPLO specifies whether the matrix is an upper or
+             lower triangular matrix as follows:
 
-                UPLO = 'U' or 'u'   A is an upper triangular matrix.   
+                UPLO = 'U' or 'u'   A is an upper triangular matrix.
 
-                UPLO = 'L' or 'l'   A is a lower triangular matrix.   
+                UPLO = 'L' or 'l'   A is a lower triangular matrix.
 
-             Unchanged on exit.   
+             Unchanged on exit.
 
-    TRANS  - CHARACTER*1.   
-             On entry, TRANS specifies the equations to be solved as   
-             follows:   
+    TRANS  - CHARACTER*1.
+             On entry, TRANS specifies the equations to be solved as
+             follows:
 
-                TRANS = 'N' or 'n'   A*x = b.   
+                TRANS = 'N' or 'n'   A*x = b.
 
-                TRANS = 'T' or 't'   A'*x = b.   
+                TRANS = 'T' or 't'   A'*x = b.
 
-                TRANS = 'C' or 'c'   A'*x = b.   
+                TRANS = 'C' or 'c'   A'*x = b.
 
-             Unchanged on exit.   
+             Unchanged on exit.
 
-    DIAG   - CHARACTER*1.   
-             On entry, DIAG specifies whether or not A is unit   
-             triangular as follows:   
+    DIAG   - CHARACTER*1.
+             On entry, DIAG specifies whether or not A is unit
+             triangular as follows:
 
-                DIAG = 'U' or 'u'   A is assumed to be unit triangular.   
+                DIAG = 'U' or 'u'   A is assumed to be unit triangular.
 
-                DIAG = 'N' or 'n'   A is not assumed to be unit   
-                                    triangular.   
+                DIAG = 'N' or 'n'   A is not assumed to be unit
+                                    triangular.
 
-             Unchanged on exit.   
+             Unchanged on exit.
 
-    N      - INTEGER.   
-             On entry, N specifies the order of the matrix A.   
-             N must be at least zero.   
-             Unchanged on exit.   
+    N      - INTEGER.
+             On entry, N specifies the order of the matrix A.
+             N must be at least zero.
+             Unchanged on exit.
 
-    A      - DOUBLE PRECISION array of DIMENSION ( LDA, n ).   
-             Before entry with  UPLO = 'U' or 'u', the leading n by n   
-             upper triangular part of the array A must contain the upper 
-  
-             triangular matrix and the strictly lower triangular part of 
-  
-             A is not referenced.   
-             Before entry with UPLO = 'L' or 'l', the leading n by n   
-             lower triangular part of the array A must contain the lower 
-  
-             triangular matrix and the strictly upper triangular part of 
-  
-             A is not referenced.   
-             Note that when  DIAG = 'U' or 'u', the diagonal elements of 
-  
-             A are not referenced either, but are assumed to be unity.   
-             Unchanged on exit.   
+    A      - DOUBLE PRECISION array of DIMENSION ( LDA, n ).
+             Before entry with  UPLO = 'U' or 'u', the leading n by n
+             upper triangular part of the array A must contain the upper
 
-    LDA    - INTEGER.   
-             On entry, LDA specifies the first dimension of A as declared 
-  
-             in the calling (sub) program. LDA must be at least   
-             max( 1, n ).   
-             Unchanged on exit.   
+             triangular matrix and the strictly lower triangular part of
 
-    X      - DOUBLE PRECISION array of dimension at least   
-             ( 1 + ( n - 1 )*abs( INCX ) ).   
-             Before entry, the incremented array X must contain the n   
-             element right-hand side vector b. On exit, X is overwritten 
-  
-             with the solution vector x.   
+             A is not referenced.
+             Before entry with UPLO = 'L' or 'l', the leading n by n
+             lower triangular part of the array A must contain the lower
 
-    INCX   - INTEGER.   
-             On entry, INCX specifies the increment for the elements of   
-             X. INCX must not be zero.   
-             Unchanged on exit.   
+             triangular matrix and the strictly upper triangular part of
 
+             A is not referenced.
+             Note that when  DIAG = 'U' or 'u', the diagonal elements of
 
-    Level 2 Blas routine.   
+             A are not referenced either, but are assumed to be unity.
+             Unchanged on exit.
 
-    -- Written on 22-October-1986.   
-       Jack Dongarra, Argonne National Lab.   
-       Jeremy Du Croz, Nag Central Office.   
-       Sven Hammarling, Nag Central Office.   
-       Richard Hanson, Sandia National Labs.   
+    LDA    - INTEGER.
+             On entry, LDA specifies the first dimension of A as declared
 
+             in the calling (sub) program. LDA must be at least
+             max( 1, n ).
+             Unchanged on exit.
 
+    X      - DOUBLE PRECISION array of dimension at least
+             ( 1 + ( n - 1 )*abs( INCX ) ).
+             Before entry, the incremented array X must contain the n
+             element right-hand side vector b. On exit, X is overwritten
 
-       Test the input parameters.   
+             with the solution vector x.
 
-    
-   Parameter adjustments   
+    INCX   - INTEGER.
+             On entry, INCX specifies the increment for the elements of
+             X. INCX must not be zero.
+             Unchanged on exit.
+
+
+    Level 2 Blas routine.
+
+    -- Written on 22-October-1986.
+       Jack Dongarra, Argonne National Lab.
+       Jeremy Du Croz, Nag Central Office.
+       Sven Hammarling, Nag Central Office.
+       Richard Hanson, Sandia National Labs.
+
+
+
+       Test the input parameters.
+
+
+   Parameter adjustments
        Function Body */
 #define X(I) x[(I)-1]
 
@@ -169,7 +169,7 @@ extern "C" {
 
     nounit = lsame_(diag, "N");
 
-/*     Set up the start point in X if the increment is not unity. This   
+/*     Set up the start point in X if the increment is not unity. This
        will be  ( N - 1 )*INCX  too small for descending loops. */
 
     if (*incx <= 0) {
@@ -178,7 +178,7 @@ extern "C" {
 	kx = 1;
     }
 
-/*     Start the operations. In this version the elements of A are   
+/*     Start the operations. In this version the elements of A are
        accessed sequentially with one pass through A. */
 
     if (lsame_(trans, "N")) {
diff --git a/external/hypre/src/blas/f2c.h b/external/hypre/src/blas/f2c.h
index 5182c58b..6e7230b6 100644
--- a/external/hypre/src/blas/f2c.h
+++ b/external/hypre/src/blas/f2c.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -22,11 +22,9 @@
 #include "_hypre_utilities.h"
 #include "math.h"
 
-#if defined(HYPRE_SINGLE)
-#define sqrt sqrtf
-#elif defined(HYPRE_LONG_DOUBLE)
-#define sqrt sqrtl
-#endif
+#define sqrt hypre_sqrt
+#define log hypre_log
+#define pow hypre_pow
 
 #ifdef HYPRE_BIGINT
 typedef long long int HYPRE_LongInt;
@@ -221,17 +219,17 @@ typedef shortlogical (*K_fp)(...);
 typedef /* Character */ VOID (*H_fp)(...);
 typedef /* Subroutine */ HYPRE_Int (*S_fp)(...);
 #else
-typedef HYPRE_Int /* Unknown procedure type */ (*U_fp)();
-typedef shortint (*J_fp)();
-typedef integer (*I_fp)();
-typedef real (*R_fp)();
-typedef doublereal (*D_fp)(), (*E_fp)();
-typedef /* Complex */ VOID (*C_fp)();
-typedef /* Double Complex */ VOID (*Z_fp)();
-typedef logical (*L_fp)();
-typedef shortlogical (*K_fp)();
-typedef /* Character */ VOID (*H_fp)();
-typedef /* Subroutine */ HYPRE_Int (*S_fp)();
+typedef HYPRE_Int /* Unknown procedure type */ (*U_fp)(void);
+typedef shortint (*J_fp)(void);
+typedef integer (*I_fp)(void);
+typedef real (*R_fp)(void);
+typedef doublereal (*D_fp)(void), (*E_fp)(void);
+typedef /* Complex */ VOID (*C_fp)(void);
+typedef /* Double Complex */ VOID (*Z_fp)(void);
+typedef logical (*L_fp)(void);
+typedef shortlogical (*K_fp)(void);
+typedef /* Character */ VOID (*H_fp)(void);
+typedef /* Subroutine */ HYPRE_Int (*S_fp)(void);
 #endif
 /* E_fp is for real functions when -R is not specified */
 typedef VOID C_f;	/* complex function */
diff --git a/external/hypre/src/blas/hypre_blas.h b/external/hypre/src/blas/hypre_blas.h
index a4fcc2c9..61604c9d 100644
--- a/external/hypre/src/blas/hypre_blas.h
+++ b/external/hypre/src/blas/hypre_blas.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/blas/idamax.c b/external/hypre/src/blas/idamax.c
index 5156c8de..e203cb87 100644
--- a/external/hypre/src/blas/idamax.c
+++ b/external/hypre/src/blas/idamax.c
@@ -22,18 +22,18 @@ integer idamax_(integer *n, doublereal *dx, integer *incx)
     doublereal d__1;
 
     /* Local variables */
-    static doublereal dmax__;
-    static integer i, ix;
+    doublereal dmax__;
+    integer i, ix;
 
 
-/*     finds the index of element having max. absolute value.   
-       jack dongarra, linpack, 3/11/78.   
-       modified 3/93 to return if incx .le. 0.   
-       modified 12/3/93, array(1) declarations changed to array(*)   
+/*     finds the index of element having max. absolute value.
+       jack dongarra, linpack, 3/11/78.
+       modified 3/93 to return if incx .le. 0.
+       modified 12/3/93, array(1) declarations changed to array(*)
 
 
-    
-   Parameter adjustments   
+
+   Parameter adjustments
        Function Body */
 #define DX(I) dx[(I)-1]
 
diff --git a/external/hypre/src/blas/xerbla.c b/external/hypre/src/blas/xerbla.c
index f69954dc..907be2bb 100644
--- a/external/hypre/src/blas/xerbla.c
+++ b/external/hypre/src/blas/xerbla.c
@@ -22,13 +22,13 @@ extern "C" {
 
 /* Table of constant values */
 
-/*static integer c__1 = 1;*/
+/* integer c__1 = 1;*/
 
 /* Subroutine */ integer xerbla_(const char *srname, integer *info)
 {
     /* Format strings */
     /*
-    static char fmt_9999[] = "(\002 ** On entry to \002,a,\002 parameter num"
+     char fmt_9999[] = "(\002 ** On entry to \002,a,\002 parameter num"
             "ber \002,i2,\002 had \002,\002an illegal value\002)";
     */
 
@@ -37,7 +37,7 @@ extern "C" {
     /* Subroutine */ integer s_stop(char *, ftnlen);
 
     /* Fortran I/O blocks */
-    /*static cilist io___1 = { 0, 6, 0, fmt_9999, 0 };*/
+    /* cilist io___1 = { 0, 6, 0, fmt_9999, 0 };*/
 
 
 
diff --git a/external/hypre/src/cmbuild/README.txt b/external/hypre/src/cmbuild/README.txt
deleted file mode 100644
index cd487267..00000000
--- a/external/hypre/src/cmbuild/README.txt
+++ /dev/null
@@ -1 +0,0 @@
-This directory is provided for convenience to do CMake builds...
diff --git a/external/hypre/src/config/HYPREConfig.cmake.in b/external/hypre/src/config/HYPREConfig.cmake.in
index d9d19cc2..6d9abd90 100644
--- a/external/hypre/src/config/HYPREConfig.cmake.in
+++ b/external/hypre/src/config/HYPREConfig.cmake.in
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -7,7 +7,19 @@
 
 include(CMakeFindDependencyMacro)
 
-set(HYPRE_ENABLE_SHARED @HYPRE_ENABLE_SHARED@)
+function(find_hypre_dependency name)
+  string(TOUPPER ${name} UPPER_NAME)
+  if(HYPRE_ENABLE_${UPPER_NAME})
+    find_dependency(${name} REQUIRED HINTS ${HYPRE_DEPENDENCY_DIRS})
+    if(${name}_FOUND)
+      message(STATUS "Found ${UPPER_NAME}: ${${name}_DIR}")
+    else()
+      message(FATAL_ERROR "${UPPER_NAME} not found.")
+    endif()
+  endif()
+endfunction()
+
+set(HYPRE_DEPENDENCY_DIRS "@HYPRE_DEPENDENCY_DIRS@")
 set(HYPRE_ENABLE_BIGINT @HYPRE_ENABLE_BIGINT@)
 set(HYPRE_ENABLE_MIXEDINT @HYPRE_ENABLE_MIXEDINT@)
 set(HYPRE_ENABLE_SINGLE @HYPRE_ENABLE_SINGLE@)
@@ -17,27 +29,52 @@ set(HYPRE_ENABLE_HYPRE_BLAS @HYPRE_ENABLE_HYPRE_BLAS@)
 set(HYPRE_ENABLE_HYPRE_LAPACK @HYPRE_ENABLE_HYPRE_LAPACK@)
 set(HYPRE_ENABLE_PERSISTENT_COMM @HYPRE_ENABLE_PERSISTENT_COMM@)
 set(HYPRE_ENABLE_FEI @HYPRE_ENABLE_FEI@)
-set(HYPRE_WITH_MPI @HYPRE_WITH_MPI@)
-set(HYPRE_WITH_OPENMP @HYPRE_WITH_OPENMP@)
-set(HYPRE_WITH_HOPSCOTCH @HYPRE_WITH_HOPSCOTCH@)
-set(HYPRE_USING_DSUPERLU @HYPRE_USING_DSUPERLU@)
-set(HYPRE_WITH_CALIPER @HYPRE_WITH_CALIPER@)
-set(HYPRE_PRINT_ERRORS @HYPRE_PRINT_ERRORS@)
-set(HYPRE_TIMING @HYPRE_TIMING@)
-set(HYPRE_BUILD_EXAMPLES @HYPRE_BUILD_EXAMPLES@)
-set(HYPRE_BUILD_TESTS @HYPRE_BUILD_TESTS@)
-set(HYPRE_USING_HOST_MEMORY @HYPRE_USING_HOST_MEMORY@)
-set(HYPRE_WITH_CUDA @HYPRE_WITH_CUDA@)
+set(HYPRE_ENABLE_MPI @HYPRE_ENABLE_MPI@)
+set(HYPRE_ENABLE_OPENMP @HYPRE_ENABLE_OPENMP@)
+set(HYPRE_ENABLE_HOPSCOTCH @HYPRE_ENABLE_HOPSCOTCH@)
+set(HYPRE_ENABLE_PRINT_ERRORS @HYPRE_ENABLE_PRINT_ERRORS@)
+set(HYPRE_ENABLE_TIMING @HYPRE_ENABLE_TIMING@)
+set(HYPRE_ENABLE_HOST_MEMORY @HYPRE_ENABLE_HOST_MEMORY@)
+set(HYPRE_ENABLE_TEST_USING_HOST @HYPRE_ENABLE_TEST_USING_HOST@)
+set(HYPRE_ENABLE_CUDA @HYPRE_ENABLE_CUDA@)
+set(HYPRE_ENABLE_HIP @HYPRE_ENABLE_HIP@)
+set(HYPRE_ENABLE_SYCL @HYPRE_ENABLE_SYCL@)
 set(HYPRE_ENABLE_UNIFIED_MEMORY @HYPRE_ENABLE_UNIFIED_MEMORY@)
 set(HYPRE_ENABLE_CUDA_STREAMS @HYPRE_ENABLE_CUDA_STREAMS@)
-set(HYPRE_ENABLE_CUSPARSE @HYPRE_ENABLE_CUSPARSE@)
 set(HYPRE_ENABLE_DEVICE_POOL @HYPRE_ENABLE_DEVICE_POOL@)
+set(HYPRE_ENABLE_DEVICE_MALLOC_ASYNC @HYPRE_ENABLE_DEVICE_MALLOC_ASYNC@)
+set(HYPRE_ENABLE_THRUST_ASYNC @HYPRE_ENABLE_THRUST_ASYNC@)
+set(HYPRE_ENABLE_CUSPARSE @HYPRE_ENABLE_CUSPARSE@)
 set(HYPRE_ENABLE_CUBLAS @HYPRE_ENABLE_CUBLAS@)
 set(HYPRE_ENABLE_CURAND @HYPRE_ENABLE_CURAND@)
+set(HYPRE_ENABLE_CUSOLVER @HYPRE_ENABLE_CUSOLVER@)
+set(HYPRE_ENABLE_GPU_AWARE_MPI @HYPRE_ENABLE_GPU_AWARE_MPI@)
 set(HYPRE_ENABLE_GPU_PROFILING @HYPRE_ENABLE_GPU_PROFILING@)
+set(HYPRE_ENABLE_ROCSPARSE @HYPRE_ENABLE_ROCSPARSE@)
+set(HYPRE_ENABLE_ROCBLAS @HYPRE_ENABLE_ROCBLAS@)
+set(HYPRE_ENABLE_ROCRAND @HYPRE_ENABLE_ROCRAND@)
+set(HYPRE_ENABLE_ROCSOLVER @HYPRE_ENABLE_ROCSOLVER@)
+set(HYPRE_ENABLE_ONEMKLSPARSE @HYPRE_ENABLE_ONEMKLSPARSE@)
+set(HYPRE_ENABLE_ONEMKLBLAS @HYPRE_ENABLE_ONEMKLBLAS@)
+set(HYPRE_ENABLE_ONEMKLRAND @HYPRE_ENABLE_ONEMKLRAND@)
+set(HYPRE_BUILD_EXAMPLES @HYPRE_BUILD_EXAMPLES@)
+set(HYPRE_BUILD_TESTS @HYPRE_BUILD_TESTS@)
+set(HYPRE_ENABLE_DSUPERLU @HYPRE_ENABLE_DSUPERLU@)
+set(HYPRE_ENABLE_MAGMA @HYPRE_ENABLE_MAGMA@)
+set(HYPRE_ENABLE_CALIPER @HYPRE_ENABLE_CALIPER@)
+set(HYPRE_ENABLE_UMPIRE @HYPRE_ENABLE_UMPIRE@)
+set(HYPRE_ENABLE_UMPIRE_HOST @HYPRE_ENABLE_UMPIRE_HOST@)
+set(HYPRE_ENABLE_UMPIRE_DEVICE @HYPRE_ENABLE_UMPIRE_DEVICE@)
+set(HYPRE_ENABLE_UMPIRE_UM @HYPRE_ENABLE_UMPIRE_UM@)
+set(HYPRE_ENABLE_UMPIRE_PINNED @HYPRE_ENABLE_UMPIRE_PINNED@)
+set(HYPRE_HAVE_MPI_COMM_F2C @HYPRE_HAVE_MPI_COMM_F2C@)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
 
+if (UNIX)
+  list(APPEND TPL_LIBRARIES m)
+endif()
+
 if(NOT HYPRE_ENABLE_HYPRE_BLAS)
   find_dependency(BLAS)
 endif()
@@ -46,17 +83,142 @@ if(NOT HYPRE_ENABLE_HYPRE_LAPACK)
   find_dependency(LAPACK)
 endif()
 
-if(HYPRE_USING_DSUPERLU)
-  list(APPEND TPL_LIBRARIES @TPL_DSUPERLU_LIBRARIES@ stdc++)
-endif()
-
-if(HYPRE_WITH_MPI)
+if(HYPRE_ENABLE_MPI)
   enable_language(C)
-  find_dependency(MPI @MPI_C_VERSION@ EXACT COMPONENTS C)
+  find_dependency(MPI @MPI_C_VERSION@ COMPONENTS C)
 endif()
 
-if(HYPRE_WITH_OPENMP)
+if(HYPRE_ENABLE_OPENMP)
   find_dependency(OpenMP)
 endif()
 
+find_hypre_dependency(caliper)
+find_hypre_dependency(dsuperlu)
+find_hypre_dependency(magma)
+find_hypre_dependency(umpire)
+
+if(HYPRE_ENABLE_CUDA OR HYPRE_ENABLE_HIP OR HYPRE_ENABLE_SYCL)
+  # List of required GPU libraries
+  set(REQUIRED_GPU_COMPONENTS)
+
+  if(HYPRE_ENABLE_CUDA)
+    list(APPEND REQUIRED_GPU_COMPONENTS cudart)
+    if(HYPRE_ENABLE_CUSPARSE)
+      list(APPEND REQUIRED_GPU_COMPONENTS cusparse)
+    endif()
+
+    if(HYPRE_ENABLE_CUBLAS)
+      list(APPEND REQUIRED_GPU_COMPONENTS cublas)
+    endif()
+
+    if(HYPRE_ENABLE_CURAND)
+      list(APPEND REQUIRED_GPU_COMPONENTS curand)
+    endif()
+
+    if(HYPRE_ENABLE_CUSOLVER)
+      list(APPEND REQUIRED_GPU_COMPONENTS cusolver)
+    endif()
+  elseif(HYPRE_ENABLE_HIP)
+    if(HYPRE_ENABLE_ROCSPARSE)
+      list(APPEND REQUIRED_GPU_COMPONENTS rocsparse)
+    endif()
+
+    if(HYPRE_ENABLE_ROCBLAS)
+      list(APPEND REQUIRED_GPU_COMPONENTS rocblas)
+    endif()
+
+    if(HYPRE_ENABLE_ROCRAND)
+      list(APPEND REQUIRED_GPU_COMPONENTS rocrand)
+    endif()
+
+    if(HYPRE_ENABLE_ROCSOLVER)
+      list(APPEND REQUIRED_GPU_COMPONENTS rocsolver)
+    endif()
+  elseif(HYPRE_ENABLE_SYCL)
+    if(HYPRE_ENABLE_ONEMKLSPARSE)
+      list(APPEND REQUIRED_GPU_COMPONENTS onemklsparse)
+    endif()
+
+    if(HYPRE_ENABLE_ONEMKLBLAS)
+      list(APPEND REQUIRED_GPU_COMPONENTS onemklblas)
+    endif()
+
+    if(HYPRE_ENABLE_ONEMKLRAND)
+      list(APPEND REQUIRED_GPU_COMPONENTS onemklrand)
+    endif()
+  endif()
+
+  if(REQUIRED_GPU_COMPONENTS)
+    if(HYPRE_ENABLE_CUDA)
+      set(GPU_TOOLKIT_NAME "CUDA")
+      message(STATUS "Finding CUDA Toolkit components: ${REQUIRED_GPU_COMPONENTS}")
+      find_dependency(CUDAToolkit REQUIRED COMPONENTS ${REQUIRED_GPU_COMPONENTS})
+      set(GPU_TOOLKIT_FOUND ${CUDAToolkit_FOUND})
+      set(GPU_TOOLKIT_VERSION ${CUDAToolkit_VERSION})
+
+    elseif(HYPRE_ENABLE_HIP)
+      # Add HIP root to prefix path to find ROCm components
+      if(DEFINED ROCM_PATH)
+        set(HIP_PATH ${ROCM_PATH})
+      elseif(DEFINED ENV{ROCM_PATH})
+        set(HIP_PATH $ENV{ROCM_PATH})
+      elseif(DEFINED rocm_ROOT)
+        set(HIP_PATH ${rocm_ROOT})
+      elseif(DEFINED ENV{ROCM_ROOT})
+        set(HIP_PATH $ENV{ROCM_ROOT})
+      elseif(DEFINED hip_ROOT)
+        set(HIP_PATH ${hip_ROOT})
+      elseif(DEFINED ENV{hip_ROOT})
+        set(HIP_PATH $ENV{hip_ROOT})
+      elseif(EXISTS "/opt/rocm")
+        set(HIP_PATH "/opt/rocm")
+      else()
+        message(WARNING "ROCM_PATH or HIP_PATH not set. Linking to ROCm libraries may not work.")
+      endif()
+
+      # Add HIP path to prefix path to find ROCm components
+      list(APPEND CMAKE_PREFIX_PATH "${HIP_PATH}")
+
+      set(GPU_TOOLKIT_NAME "HIP")
+      message(STATUS "Finding HIP Toolkit components: ${REQUIRED_GPU_COMPONENTS}")
+      find_dependency(hip REQUIRED)
+      set(GPU_TOOLKIT_FOUND ${hip_FOUND})
+      set(GPU_TOOLKIT_VERSION ${hip_VERSION})
+
+      # Find ROCm components
+      foreach(component ${REQUIRED_GPU_COMPONENTS})
+        find_dependency(${component} REQUIRED)
+      endforeach()
+
+    elseif(HYPRE_ENABLE_SYCL)
+      set(GPU_TOOLKIT_NAME "Intel DPC++")
+      message(STATUS "Finding Intel DPC++ Toolkit components: ${REQUIRED_GPU_COMPONENTS}")
+      find_dependency(IntelDPCPP REQUIRED)
+      set(GPU_TOOLKIT_FOUND ${IntelDPCPP_FOUND})
+      set(GPU_TOOLKIT_VERSION ${IntelDPCPP_VERSION})
+    endif()
+
+    if(GPU_TOOLKIT_FOUND)
+      message(STATUS "GPU Toolkit found: ${GPU_TOOLKIT_NAME} ${GPU_TOOLKIT_VERSION}")
+      set(MISSING_COMPONENTS)
+      foreach(component ${REQUIRED_GPU_COMPONENTS})
+        if(HYPRE_ENABLE_CUDA AND NOT TARGET CUDA::${component})
+          list(APPEND MISSING_COMPONENTS ${component})
+        elseif(HYPRE_ENABLE_HIP AND NOT TARGET roc::${component})
+          list(APPEND MISSING_COMPONENTS ${component})
+        elseif(HYPRE_ENABLE_SYCL AND NOT TARGET sycl::${component})
+          list(APPEND MISSING_COMPONENTS ${component})
+        endif()
+      endforeach()
+      if(MISSING_COMPONENTS)
+        message(FATAL_ERROR "Required GPU components not found: ${MISSING_COMPONENTS}")
+      else()
+        message(STATUS "Required GPU components found: ${REQUIRED_GPU_COMPONENTS}")
+      endif()
+    else()
+      message(FATAL_ERROR "GPU Toolkit not found.")
+    endif()
+  endif()
+endif()
+
 include("${CMAKE_CURRENT_LIST_DIR}/HYPRETargets.cmake")
diff --git a/external/hypre/src/config/HYPRE_config.h.cmake.in b/external/hypre/src/config/HYPRE_config.h.cmake.in
index a2ae68e2..6aa15301 100644
--- a/external/hypre/src/config/HYPRE_config.h.cmake.in
+++ b/external/hypre/src/config/HYPRE_config.h.cmake.in
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -12,6 +12,11 @@
 #define HYPRE_RELEASE_TIME    "@HYPRE_TIME@"
 #define HYPRE_RELEASE_BUGS    "@HYPRE_BUGS@"
 
+#cmakedefine HYPRE_DEVELOP_STRING  "@HYPRE_DEVELOP_STRING@"
+#cmakedefine HYPRE_DEVELOP_NUMBER   @HYPRE_DEVELOP_NUMBER@
+#cmakedefine HYPRE_DEVELOP_BRANCH  "@HYPRE_DEVELOP_BRANCH@"
+#cmakedefine HYPRE_BRANCH_NAME     "@HYPRE_BRANCH_NAME@"
+
 /* Use long long int for HYPRE_BigInt */
 #cmakedefine HYPRE_MIXEDINT 1
 
@@ -27,6 +32,15 @@
 /* Use complex values */
 #cmakedefine HYPRE_COMPLEX 1
 
+/* Use cudaMallocAsync */
+#cmakedefine HYPRE_USING_DEVICE_MALLOC_ASYNC 1
+
+/* Use Thrust par_nosync policy */
+#cmakedefine HYPRE_ENABLE_THRUST_ASYNC 1
+
+/* Use GPU-aware MPI */
+#cmakedefine HYPRE_USING_GPU_AWARE_MPI 1
+
 /* Debug mode */
 #cmakedefine HYPRE_DEBUG 1
 
@@ -37,7 +51,7 @@
 #cmakedefine HYPRE_USING_PERSISTENT_COMM 1
 
 /* Use hopscotch hashing */
-#cmakedefine HYPRE_HOPSCOTCH 1
+#cmakedefine HYPRE_USING_HOPSCOTCH 1
 
 /* Compile without MPI */
 #cmakedefine HYPRE_SEQUENTIAL 1
@@ -60,9 +74,42 @@
 /* Use Caliper instrumentation */
 #cmakedefine HYPRE_USING_CALIPER 1
 
+/* Use UMPIRE */
+#cmakedefine HYPRE_USING_UMPIRE 1
+
+/* Use UMPIRE for device memory */
+#cmakedefine HYPRE_USING_UMPIRE_DEVICE 1
+
+/* Use UMPIRE for host memory */
+#cmakedefine HYPRE_USING_UMPIRE_HOST 1
+
+/* Use UMPIRE for pinned memory */
+#cmakedefine HYPRE_USING_UMPIRE_PINNED 1
+
+/* Use UMPIRE for unified memory */
+#cmakedefine HYPRE_USING_UMPIRE_UM 1
+
 /* Use if executing on device with CUDA */
 #cmakedefine HYPRE_USING_CUDA 1
 
+/* Use if executing on device with SYCL */
+#cmakedefine HYPRE_USING_SYCL 1
+
+/* Use rocBLAS */
+#cmakedefine HYPRE_USING_ROCBLAS 1
+
+/* Use rocRAND */
+#cmakedefine HYPRE_USING_ROCRAND 1
+
+/* Use rocSPARSE */
+#cmakedefine HYPRE_USING_ROCSPARSE 1
+
+/* Use rocSOLVER */
+#cmakedefine HYPRE_USING_ROCSOLVER 1
+
+/* Use rocTX profiling */
+#cmakedefine HYPRE_USING_ROCTX 1
+
 /* Use cuBLAS */
 #cmakedefine HYPRE_USING_CUBLAS 1
 
@@ -75,6 +122,12 @@
 /* Use cuSPARSE */
 #cmakedefine HYPRE_USING_CUSPARSE 1
 
+/* Use cuSOLVER */
+#cmakedefine HYPRE_USING_CUSOLVER 1
+
+/* Use if using host memory only */
+#cmakedefine HYPRE_USING_HOST_MEMORY 1
+
 /* Use device memory pool */
 #cmakedefine HYPRE_USING_DEVICE_POOL 1
 
@@ -90,22 +143,38 @@
 /* Use if executing on GPU device */
 #cmakedefine HYPRE_USING_GPU 1
 
+/* Use if executing hypre tests on host (CPU) */
+#cmakedefine HYPRE_TEST_USING_HOST 1
+
 /* Use HIP */
 #cmakedefine HYPRE_USING_HIP 1
 
 /* Use NVTX */
 #cmakedefine HYPRE_USING_NVTX 1
 
+/* Use oneMLK spasre */
+#cmakedefine HYPRE_USING_ONEMKLSPARSE 1
+
+/* Use oneMLK blas */
+#cmakedefine HYPRE_USING_ONEMKLBLAS 1
+
+/* Use oneMLK rand */
+#cmakedefine HYPRE_USING_ONEMKLRAND 1
+
 /* Use SuperLU_Dist */
 #cmakedefine HYPRE_USING_DSUPERLU 1
 
+/* Use MAGMA */
+#cmakedefine HYPRE_USING_MAGMA 1
+
 /* Use SuperLU */
 #cmakedefine HAVE_SUPERLU 1
 
 /* Use MPI */
 #cmakedefine HYPRE_HAVE_MPI 1
 
-/* #undef HYPRE_HAVE_MPI_COMM_F2C */
+/* Use MPI_Comm_f2c */
+#cmakedefine HYPRE_HAVE_MPI_COMM_F2C 1
 
 /* Define as follows to set the Fortran name mangling scheme:
  * 0 = unspecified
@@ -114,13 +183,13 @@
  * 3 = two underscores
  * 4 = caps, no underscores
  * 5 = one underscore before and after */
-#define HYPRE_FMANGLE 0
+#define HYPRE_FMANGLE @HYPRE_FMANGLE@
 
 /* Define as in HYPRE_FMANGLE to set the BLAS name mangling scheme */
-#define HYPRE_FMANGLE_BLAS 0
+#define HYPRE_FMANGLE_BLAS @HYPRE_FMANGLE_BLAS@
 
 /* Define as in HYPRE_FMANGLE to set the LAPACK name mangling scheme */
-#define HYPRE_FMANGLE_LAPACK 0
+#define HYPRE_FMANGLE_LAPACK @HYPRE_FMANGLE_LAPACK@
 
 /* Define to a macro mangling the given C identifier (in lower and upper
  * case), which must not contain underscores, for linking with Fortran. */
@@ -128,6 +197,3 @@
 
 /* As F77_FUNC, but for C identifiers containing underscores. */
 #define HYPRE_F77_FUNC_(name,NAME) name ## __
-
-/* Define to 1 if using host memory only */
-#cmakedefine HYPRE_USING_HOST_MEMORY 1
diff --git a/external/hypre/src/config/HYPRE_config.h.in b/external/hypre/src/config/HYPRE_config.h.in
index 98425a65..9d5d9fb8 100644
--- a/external/hypre/src/config/HYPRE_config.h.in
+++ b/external/hypre/src/config/HYPRE_config.h.in
@@ -17,9 +17,6 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
 /* Define to 1 if using MLI */
 #undef HAVE_MLI
 
@@ -29,6 +26,9 @@
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
+/* Define to 1 if you have the <stdio.h> header file. */
+#undef HAVE_STDIO_H
+
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
 
@@ -56,12 +56,24 @@
 /* Define to 1 if using long long int for HYPRE_Int and HYPRE_BigInt */
 #undef HYPRE_BIGINT
 
+/* Feature branch string */
+#undef HYPRE_BRANCH_NAME
+
 /* Define to 1 if using complex values */
 #undef HYPRE_COMPLEX
 
 /* Define to 1 if in debug mode */
 #undef HYPRE_DEBUG
 
+/* Main development branch? */
+#undef HYPRE_DEVELOP_BRANCH
+
+/* Develop branch commit number */
+#undef HYPRE_DEVELOP_NUMBER
+
+/* Develop branch string */
+#undef HYPRE_DEVELOP_STRING
+
 /* Define to 1 if using OpenMP on device [target alloc version] */
 #undef HYPRE_DEVICE_OPENMP_ALLOC
 
@@ -85,9 +97,6 @@
 /* Define to 1 if the routine MPI_Comm_f2c is found */
 #undef HYPRE_HAVE_MPI_COMM_F2C
 
-/* Define to 1 if hopscotch hashing */
-#undef HYPRE_HOPSCOTCH
-
 /* Define to 1 for HP platforms */
 #undef HYPRE_HPPA
 
@@ -142,6 +151,9 @@
 /* Define to 1 for Solaris. */
 #undef HYPRE_SOLARIS
 
+/* Define to 1 if want to use host in hypre tests */
+#undef HYPRE_TEST_USING_HOST
+
 /* Using HYPRE timing routines */
 #undef HYPRE_TIMING
 
@@ -154,15 +166,21 @@
 /* Define to 1 if executing on device with CUDA */
 #undef HYPRE_USING_CUDA
 
-/* Define to 1 if using CUDA streams */
+/* Define to 1 if using streams */
 #undef HYPRE_USING_CUDA_STREAMS
 
 /* Define to 1 if using cuRAND */
 #undef HYPRE_USING_CURAND
 
+/* Define to 1 if using cuSOLVER */
+#undef HYPRE_USING_CUSOLVER
+
 /* Define to 1 if using cuSPARSE */
 #undef HYPRE_USING_CUSPARSE
 
+/* Define to 1 if using device async malloc */
+#undef HYPRE_USING_DEVICE_MALLOC_ASYNC
+
 /* Define to 1 if using device memory without UM */
 #undef HYPRE_USING_DEVICE_MEMORY
 
@@ -184,9 +202,15 @@
 /* Define to 1 if executing on GPU device */
 #undef HYPRE_USING_GPU
 
+/* Define to 1 if using GPU aware MPI */
+#undef HYPRE_USING_GPU_AWARE_MPI
+
 /* HIP being used */
 #undef HYPRE_USING_HIP
 
+/* Define to 1 if using hopscotch hashing */
+#undef HYPRE_USING_HOPSCOTCH
+
 /* Define to 1 if using host memory only */
 #undef HYPRE_USING_HOST_MEMORY
 
@@ -199,15 +223,27 @@
 /* Define to 1 if executing on host/device with KOKKOS */
 #undef HYPRE_USING_KOKKOS
 
+/* Define to 1 if MAGMA is enabled */
+#undef HYPRE_USING_MAGMA
+
 /* Define to 1 if want to track memory operations in hypre */
 #undef HYPRE_USING_MEMORY_TRACKER
 
 /* Define to 1 if Node Aware MPI library is used */
 #undef HYPRE_USING_NODE_AWARE_MPI
 
-/* NVTX being used */
+/* Define to 1 if using NVIDIA Tools Extension (NVTX) */
 #undef HYPRE_USING_NVTX
 
+/* onemkl::BLAS being used */
+#undef HYPRE_USING_ONEMKLBLAS
+
+/* onemkl::rng being used */
+#undef HYPRE_USING_ONEMKLRAND
+
+/* onemkl::SPARSE being used */
+#undef HYPRE_USING_ONEMKLSPARSE
+
 /* Enable OpenMP support */
 #undef HYPRE_USING_OPENMP
 
@@ -223,12 +259,21 @@
 /* rocRAND being used */
 #undef HYPRE_USING_ROCRAND
 
+/* rocSOLVER being used */
+#undef HYPRE_USING_ROCSOLVER
+
 /* rocSPARSE being used */
 #undef HYPRE_USING_ROCSPARSE
 
 /* Define to 1 if using AMD rocTX profiling */
 #undef HYPRE_USING_ROCTX
 
+/* SYCL being used */
+#undef HYPRE_USING_SYCL
+
+/* Define to 1 if using thrust par_nosync policy */
+#undef HYPRE_USING_THRUST_NOSYNC
+
 /* Define to 1 if using UMPIRE */
 #undef HYPRE_USING_UMPIRE
 
@@ -247,9 +292,6 @@
 /* Define to 1 if using unified memory */
 #undef HYPRE_USING_UNIFIED_MEMORY
 
-/* Define to 1 if using GPU aware MPI */
-#undef HYPRE_WITH_GPU_AWARE_MPI
-
 /* Define to the address where bug reports for this package should be sent. */
 #undef PACKAGE_BUGREPORT
 
@@ -268,5 +310,7 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
-/* Define to 1 if you have the ANSI C header files. */
+/* Define to 1 if all of the C90 standard headers exist (not just the ones
+   required in a freestanding environment). This macro is provided for
+   backward compatibility; new code need not use it. */
 #undef STDC_HEADERS
diff --git a/external/hypre/src/config/Makefile.config.in b/external/hypre/src/config/Makefile.config.in
index a99223c3..1bb6b7e9 100644
--- a/external/hypre/src/config/Makefile.config.in
+++ b/external/hypre/src/config/Makefile.config.in
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -87,10 +87,10 @@ AR     = @AR@
 RANLIB = @RANLIB@
 
 LDFLAGS = @LDFLAGS@
-LIBS    = @LIBS@ ${CALIPER_LIBS} ${HYPRE_CUDA_LIBS} ${HYPRE_HIP_LIBS} ${HYPRE_RAJA_LIB_DIR} ${HYPRE_RAJA_LIB} ${HYPRE_KOKKOS_LIB_DIR} ${HYPRE_KOKKOS_LIB} ${HYPRE_UMPIRE_LIB_DIR} ${HYPRE_UMPIRE_LIB}
+LIBS    = @LIBS@ ${CALIPER_LIBS} ${HYPRE_CUDA_LIBS} ${HYPRE_HIP_LIBS} ${HYPRE_SYCL_LIBS} ${HYPRE_RAJA_LIB_DIR} ${HYPRE_RAJA_LIB} ${HYPRE_KOKKOS_LIB_DIR} ${HYPRE_KOKKOS_LIB} ${HYPRE_UMPIRE_LIB_DIR} ${HYPRE_UMPIRE_LIB} ${HYPRE_MAGMA_LIB_DIR} ${HYPRE_MAGMA_LIB}
 FLIBS   = @FLIBS@
 
-INCLUDES = ${CALIPER_INCLUDE} ${HYPRE_CUDA_INCLUDE} ${HYPRE_HIP_INCLUDE} ${HYPRE_RAJA_INCLUDE} ${HYPRE_KOKKOS_INCLUDE} ${HYPRE_UMPIRE_INCLUDE} ${HYPRE_NAP_INCLUDE}
+INCLUDES = ${CALIPER_INCLUDE} ${HYPRE_CUDA_INCLUDE} ${HYPRE_HIP_INCLUDE} ${HYPRE_SYCL_INCLUDE} ${HYPRE_RAJA_INCLUDE} ${HYPRE_KOKKOS_INCLUDE} ${HYPRE_UMPIRE_INCLUDE} ${HYPRE_MAGMA_INCLUDE} ${HYPRE_NAP_INCLUDE}
 
 ##################################################################
 ##  LAPACK Library Flags
@@ -131,6 +131,12 @@ CUDA_ARCH          = @HYPRE_CUDA_GENCODE@
 HYPRE_HIP_INCLUDE = @HYPRE_HIP_INCL@
 HYPRE_HIP_LIBS    = @HYPRE_HIP_LIBS@
 
+##################################################################
+##  SYCL options
+##################################################################
+HYPRE_SYCL_INCLUDE=@HYPRE_SYCL_INCL@
+HYPRE_SYCL_LIBS=@HYPRE_SYCL_LIBS@
+
 ##################################################################
 ##  Caliper options
 ##################################################################
@@ -145,6 +151,13 @@ HYPRE_EUCLID_FILES       = @HYPRE_EUCLID_FILES@
 HYPRE_PARASAILS_FILES    = @HYPRE_PARASAILS_FILES@
 HYPRE_PILUT_FILES        = @HYPRE_PILUT_FILES@
 
+##################################################################
+##  MAGMA options
+##################################################################
+HYPRE_MAGMA_LIB_DIR      = @HYPRE_MAGMA_LIB_DIR@
+HYPRE_MAGMA_INCLUDE      = @HYPRE_MAGMA_INCLUDE@
+HYPRE_MAGMA_LIB          = @HYPRE_MAGMA_LIB@
+
 ##################################################################
 ##  SuperLU options
 ##################################################################
diff --git a/external/hypre/src/config/astyle-apply.sh b/external/hypre/src/config/astyle-apply.sh
new file mode 100755
index 00000000..ef2a559e
--- /dev/null
+++ b/external/hypre/src/config/astyle-apply.sh
@@ -0,0 +1,79 @@
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+scriptname=`basename $0 .sh`
+
+# Check number of arguments
+if [ $# -lt 1 ]; then
+    echo "Need at least one argument"
+    exit
+fi
+
+# Echo usage information
+case $1 in
+   -h|-help)
+      cat <<EOF
+
+   $0 [-h|-help] {src_dir}
+
+   where: {src_dir}  is the hypre source directory
+          -h|-help   prints this usage information and exits
+
+   This script applies indentation style to hypre source files.
+   It also generates the internal '_hypre*.h' header files.
+
+   Example usage: $0 ../src
+
+EOF
+      exit
+      ;;
+esac
+
+# Setup
+src_dir=`cd $1; pwd`
+shift
+
+cd $src_dir
+
+# Check for correct version of astyle
+astyle_version="Artistic Style Version 3.1"
+if [ ! -x "$(command -v astyle)" ]; then
+  echo "$astyle_version not found"
+  exit
+elif [ "$(astyle --version)" != "$astyle_version" ]; then
+  echo "Please use $astyle_version"
+fi
+
+# Generate list of source files to indent
+find . -type f -print | egrep '[.]*[.](c|cc|cpp|cxx|C|h|hpp|hxx|H)$' |
+  egrep -v '/docs' |
+  egrep -v '/FEI_mv' |
+  egrep -v '/blas' |
+  egrep -v '/lapack' |
+  egrep -v '/distributed' |
+  egrep -v '/hypre/include' |
+  egrep -v '/HYPREf[.]h' |
+  egrep -v '/utilities/HYPRE_error_f[.]h' |
+  egrep -v '/utilities/cub_allocator[.]h' |
+  egrep -v '/_hypre_.*[.]h' > $scriptname.files
+
+# Apply indentation style to source files
+astyle_result=$(astyle --options=config/astylerc $(cat $scriptname.files))
+
+if [ -n "$astyle_result" ]; then
+  echo "Please make sure changes are committed"
+else
+  echo "No source files were changed"
+fi
+
+# Run headers scripts
+for i in $(find . -name 'headers')
+do
+  dir=$(dirname $i)
+  (cd $dir; ./headers)
+done
+
+rm -f $scriptname.files
diff --git a/external/hypre/src/config/astylerc b/external/hypre/src/config/astylerc
new file mode 100644
index 00000000..d7a9a987
--- /dev/null
+++ b/external/hypre/src/config/astylerc
@@ -0,0 +1,26 @@
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+# Formatting options for Artistic Style
+
+--style=allman
+--indent=spaces=3
+--keep-one-line-statements
+--keep-one-line-blocks
+--pad-header
+--max-code-length=100
+--max-continuation-indent=100
+--min-conditional-indent=0
+--indent-col1-comments
+--indent-labels
+--break-after-logical
+--add-braces
+--indent-switches
+--convert-tabs
+--lineend=linux
+--suffix=none
+--preserve-date
+--formatted
+--pad-oper
diff --git a/external/hypre/src/config/cmake/HYPRE_CMakeUtilities.cmake b/external/hypre/src/config/cmake/HYPRE_CMakeUtilities.cmake
index 0a1e8c8b..a57564e4 100644
--- a/external/hypre/src/config/cmake/HYPRE_CMakeUtilities.cmake
+++ b/external/hypre/src/config/cmake/HYPRE_CMakeUtilities.cmake
@@ -1,8 +1,389 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+# Function to set hypre build options
+function(set_hypre_option category name description default_value)
+  option(${name} "${description}" ${default_value})
+  if (${category} STREQUAL "CUDA" OR ${category} STREQUAL "HIP" OR ${category} STREQUAL "SYCL")
+    if (HYPRE_ENABLE_${category} STREQUAL "ON")
+      set(GPU_OPTIONS ${GPU_OPTIONS} ${name} PARENT_SCOPE)
+    endif()
+  else()
+    set(${category}_OPTIONS ${${category}_OPTIONS} ${name} PARENT_SCOPE)
+  endif()
+endfunction()
+
+# Function to set internal hypre build options
+function(set_internal_hypre_option var_prefix var_name)
+  if(HYPRE_ENABLE_${var_name})
+    if(var_prefix STREQUAL "")
+      set(HYPRE_${var_name} ON CACHE INTERNAL "")
+    else()
+      set(HYPRE_${var_prefix}_${var_name} ON CACHE INTERNAL "")
+    endif()
+  endif()
+endfunction()
+
+# Function to setup git version info
+function(setup_git_version_info HYPRE_GIT_DIR)
+  set(GIT_VERSION_FOUND FALSE PARENT_SCOPE)
+  if (EXISTS "${HYPRE_GIT_DIR}")
+    execute_process(COMMAND git -C ${HYPRE_GIT_DIR} describe --match v* --long --abbrev=9
+                    OUTPUT_VARIABLE develop_string
+                    OUTPUT_STRIP_TRAILING_WHITESPACE
+                    RESULT_VARIABLE git_result)
+    if (git_result EQUAL 0)
+      set(GIT_VERSION_FOUND TRUE PARENT_SCOPE)
+      execute_process(COMMAND git -C ${HYPRE_GIT_DIR} describe --match v* --abbrev=0
+                      OUTPUT_VARIABLE develop_lastag
+                      OUTPUT_STRIP_TRAILING_WHITESPACE)
+      execute_process(COMMAND git -C ${HYPRE_GIT_DIR} rev-list --count ${develop_lastag}..HEAD
+                      OUTPUT_VARIABLE develop_number
+                      OUTPUT_STRIP_TRAILING_WHITESPACE)
+      execute_process(COMMAND git -C ${HYPRE_GIT_DIR} rev-parse --abbrev-ref HEAD
+                      OUTPUT_VARIABLE develop_branch
+                      OUTPUT_STRIP_TRAILING_WHITESPACE)
+      set(HYPRE_DEVELOP_STRING  ${develop_string} PARENT_SCOPE)
+      set(HYPRE_DEVELOP_NUMBER  ${develop_number} PARENT_SCOPE)
+      set(HYPRE_BRANCH_NAME     ${develop_branch} PARENT_SCOPE)
+      if (develop_branch MATCHES "master")
+        set(HYPRE_DEVELOP_BRANCH  ${develop_branch} PARENT_SCOPE)
+      endif ()
+    endif()
+  endif()
+endfunction()
+
+# Function to check if two options have the same value
+function(ensure_options_match option1 option2)
+  if(DEFINED CACHE{${option1}} AND DEFINED CACHE{${option2}})
+    #if ((${option1} AND NOT ${option2}) OR (NOT ${option1} AND ${option2}))
+    if(NOT (${option1} STREQUAL ${option2}) AND NOT (${option1} STREQUAL "OFF" AND ${option2} STREQUAL "OFF"))
+      # Save the value of the conflicting options
+      set(saved_value1 "${${option1}}")
+      set(saved_value2 "${${option2}}")
+
+      # Unset conflicting options
+      unset(${option1} CACHE)
+      unset(${option2} CACHE)
+      message(FATAL_ERROR "Incompatible options: ${option1} (${saved_value1}) and ${option2} (${saved_value2}) must have the same value. Unsetting both options.")
+    endif()
+  endif()
+endfunction()
+
+# Function to check if two options have different values
+function(ensure_options_differ option1 option2)
+  if(DEFINED ${option1} AND DEFINED ${option2})
+    if(${option1} AND ${${option2}})
+      # Save the value of the conflicting options
+      set(saved_value1 "${${option1}}")
+      set(saved_value2 "${${option2}}")
+
+      # Unset conflicting options
+      unset(${option1} CACHE)
+      unset(${option2} CACHE)
+
+      message(FATAL_ERROR "Error: ${option1} (${saved_value1}) and ${option2} (${saved_value2}) are mutually exclusive. Only one can be set to ON. Unsetting both options.")
+    endif()
+  endif()
+endfunction()
+
+# Helper function to process Fortran mangling scheme
+function(process_fmangling_scheme varname description)
+  set(mangling_map
+    UNSPECIFIED 0
+    NONE 1
+    ONE_UNDERSCORE 2
+    TWO_UNDERSCORES 3
+    CAPS 4
+    PRE_POST_UNDERSCORE 5
+  )
+  list(LENGTH mangling_map map_length)
+  math(EXPR last_index "${map_length} - 1")
+
+  # Check if varname is a numeric value
+  if (HYPRE_ENABLE_${varname} MATCHES "^[0-9]+$")
+    foreach(i RANGE 0 ${last_index} 2)
+      math(EXPR next_index "${i} + 1")
+      list(GET mangling_map ${next_index} value)
+      if (HYPRE_ENABLE_${varname} STREQUAL ${value})
+        list(GET mangling_map ${i} key)
+        message(STATUS "HYPRE_ENABLE_${varname} corresponds to Fortran ${description} mangling scheme: ${key}")
+        set(HYPRE_${varname} ${value} CACHE INTERNAL "Set the Fortran ${description} mangling scheme")
+        return()
+      endif()
+    endforeach()
+  endif()
+
+  # Check if varname matches any string key
+  foreach(i RANGE 0 ${last_index} 2)
+    list(GET mangling_map ${i} key)
+    math(EXPR next_index "${i} + 1")
+    list(GET mangling_map ${next_index} value)
+    if (HYPRE_ENABLE_${varname} MATCHES ${key})
+      if (NOT HYPRE_ENABLE_${varname} MATCHES "UNSPECIFIED")
+        message(STATUS "Using Fortran ${description} mangling scheme: ${key}")
+      endif()
+      set(HYPRE_${varname} ${value} CACHE INTERNAL "Set the Fortran ${description} mangling scheme")
+      return()
+    endif()
+  endforeach()
+
+  # Default case
+  message(STATUS "Unknown value for HYPRE_ENABLE_${varname}. Defaulting to UNSPECIFIED (0)")
+  set(HYPRE_${varname} 0 CACHE INTERNAL "Set the Fortran ${description} mangling scheme")
+endfunction()
+
+# Function to configure MPI target
+function(configure_mpi_target)
+  find_package(MPI REQUIRED)
+  target_link_libraries(${PROJECT_NAME} PUBLIC MPI::MPI_C)
+
+  # Determine the correct MPI include directory
+  if(MPI_CXX_INCLUDE_DIR)
+    set(MPI_INCLUDE_DIR ${MPI_CXX_INCLUDE_DIR})
+  elseif(MPI_CXX_INCLUDE_PATH)
+    set(MPI_INCLUDE_DIR ${MPI_CXX_INCLUDE_PATH})
+  elseif(MPI_CXX_COMPILER_INCLUDE_DIR)
+    set(MPI_INCLUDE_DIR ${MPI_CXX_COMPILER_INCLUDE_DIR})
+  elseif(MPI_C_COMPILER_INCLUDE_DIR)
+    set(MPI_INCLUDE_DIR ${MPI_C_COMPILER_INCLUDE_DIR})
+  elseif(MPI_C_INCLUDE_DIR)
+    set(MPI_INCLUDE_DIR ${MPI_C_INCLUDE_DIR})
+  elseif(MPI_C_INCLUDE_PATH)
+    set(MPI_INCLUDE_DIR ${MPI_C_INCLUDE_PATH})
+  elseif(MPI_INCLUDE_PATH)
+    set(MPI_INCLUDE_DIR ${MPI_INCLUDE_PATH})
+  elseif(MPICH_DIR)
+    set(MPI_INCLUDE_DIR ${MPICH_DIR}/include)
+  elseif(DEFINED ENV{MPICH_DIR})
+    set(MPI_INCLUDE_DIR $ENV{MPICH_DIR}/include)
+  else()
+    message(WARNING "MPI include directory not found. Please specify -DMPI_INCLUDE_DIR or the compilation may fail.")
+  endif()
+
+  if (HYPRE_ENABLE_CUDA OR HYPRE_ENABLE_HIP OR HYPRE_ENABLE_SYCL)
+    message(STATUS "Adding MPI include directory: ${MPI_INCLUDE_DIR}")
+    target_include_directories(${PROJECT_NAME} PUBLIC ${MPI_INCLUDE_DIR})
+  endif ()
+  message(STATUS "MPI execution command: ${MPIEXEC_EXECUTABLE}")
+
+  set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} MPI::MPI_C)
+
+  # Check if MPI supports the MPI_Comm_f2c function
+  include(CheckCSourceCompiles)
+  check_c_source_compiles("
+    #include <mpi.h>
+    int main() {
+      MPI_Comm c = MPI_Comm_f2c(0);
+      return 0;
+    }
+  " HYPRE_HAVE_MPI_COMM_F2C)
+
+  # Define a pattern for LTO-related flags (compiler-specific)
+  set(LTO_FLAG_PATTERNS ".*lto.*" ".*ipo.*" ".*-fthinlto.*" ".*fat-lto-objects.*")
+
+  # Remove LTO-related flags from MPI target properties if applicable
+  foreach (mpi_target MPI::MPI_C MPI::MPI_CXX)
+    if (TARGET ${mpi_target})
+      get_target_property(target_options ${mpi_target} INTERFACE_COMPILE_OPTIONS)
+      if (target_options)
+        #message(STATUS "target_options: ${target_options}")
+        set(original_options "${target_options}") # Save for comparison
+        list(APPEND target_options) # Ensure it's treated as a list
+
+        # Remove matching flags
+        set(removed_flags "")
+        list(APPEND removed_flags)
+        foreach (pattern IN LISTS LTO_FLAG_PATTERNS)
+          foreach (flag IN LISTS target_options)
+            if("${flag}" MATCHES "${pattern}")
+              list(REMOVE_ITEM target_options "${flag}")
+              list(APPEND removed_flags "${flag}")
+            endif()
+          endforeach()
+        endforeach()
+        #message(STATUS "removed_flags: ${removed_flags}")
+        list(LENGTH removed_flags removed_flags_length)
+        if (removed_flags_length GREATER 0)
+          set(target_options "${target_options}" CACHE STRING "Updated ${target_options} without LTO-related flags" FORCE)
+          set_target_properties(${mpi_target} PROPERTIES INTERFACE_COMPILE_OPTIONS "${target_options}")
+          message(STATUS "Removed LTO-related flags from ${mpi_target}: ${removed_flags}")
+        endif()
+      endif()
+    endif()
+  endforeach()
+endfunction()
+
+# Function to get dependency library version
+function(get_library_version LIBNAME)
+  if(TARGET ${LIBNAME}::${LIBNAME})
+    get_target_property(LIB_VERSION ${LIBNAME}::${LIBNAME} VERSION)
+  endif()
+  if(NOT LIB_VERSION)
+    if(DEFINED ${LIBNAME}_VERSION)
+      set(LIB_VERSION "${${LIBNAME}_VERSION}")
+    elseif(DEFINED ${LIBNAME}_VERSION_STRING)
+      set(LIB_VERSION "${${LIBNAME}_VERSION_STRING}")
+    elseif(DEFINED ${LIBNAME}_VERSION_MAJOR AND DEFINED ${LIBNAME}_VERSION_MINOR)
+      set(LIB_VERSION "${${LIBNAME}_VERSION_MAJOR}.${${LIBNAME}_VERSION_MINOR}")
+      if(DEFINED ${LIBNAME}_VERSION_PATCH)
+        set(LIB_VERSION "${LIB_VERSION}.${${LIBNAME}_VERSION_PATCH}")
+      endif()
+    endif()
+  endif()
+  if(LIB_VERSION)
+    message(STATUS "  ${LIBNAME} version: ${LIB_VERSION}")
+  else()
+    message(STATUS "  ${LIBNAME} version: unknown")
+  endif()
+endfunction()
+
+# Macro to extract language flags
+macro(get_language_flags in_var out_var lang_type)
+  string(REGEX MATCHALL "\\$<\\$<COMPILE_LANGUAGE:${lang_type}>:([^>]*)>" matches "${in_var}")
+  if(matches)
+    string(REGEX REPLACE "\\$<\\$<COMPILE_LANGUAGE:${lang_type}>:" "" temp "${matches}")
+    string(REGEX REPLACE ">" "" temp "${temp}")
+    set(${out_var} ${temp})
+  else()
+    set(${out_var} "")
+  endif()
+endmacro()
+
+# Function to handle TPL (Third-Party Library) setup
+function(setup_tpl LIBNAME)
+  string(TOUPPER ${LIBNAME} LIBNAME_UPPER)
+
+  # Note we need to check for "USING" instead of "WITH" because
+  # we want to allow for post-processing of build options via cmake
+  if(HYPRE_USING_${LIBNAME_UPPER})
+    if(TPL_${LIBNAME_UPPER}_LIBRARIES AND TPL_${LIBNAME_UPPER}_INCLUDE_DIRS)
+      # Use specified TPL libraries and include dirs
+      foreach(dir ${TPL_${LIBNAME_UPPER}_INCLUDE_DIRS})
+        if(NOT EXISTS ${dir})
+          message(FATAL_ERROR "${LIBNAME_UPPER} include directory not found: ${dir}")
+        endif()
+      endforeach()
+
+      foreach(lib ${TPL_${LIBNAME_UPPER}_LIBRARIES})
+        if(EXISTS ${lib})
+          message(STATUS "${LIBNAME_UPPER} library found: ${lib}")
+          get_filename_component(LIB_DIR "${lib}" DIRECTORY)
+          set_property(TARGET ${PROJECT_NAME} APPEND PROPERTY INSTALL_RPATH "${LIB_DIR}")
+        else()
+          message(WARNING "${LIBNAME_UPPER} library not found at specified path: ${lib}")
+        endif()
+      endforeach()
+
+      target_link_libraries(${PROJECT_NAME} PUBLIC ${TPL_${LIBNAME_UPPER}_LIBRARIES})
+      target_include_directories(${PROJECT_NAME} PUBLIC ${TPL_${LIBNAME_UPPER}_INCLUDE_DIRS})
+    else()
+      # Use find_package
+      find_package(${LIBNAME} REQUIRED CONFIG)
+      if(${LIBNAME}_FOUND)
+        list(APPEND HYPRE_DEPENDENCY_DIRS "${${LIBNAME}_ROOT}")
+        set(HYPRE_DEPENDENCY_DIRS "${HYPRE_DEPENDENCY_DIRS}" CACHE INTERNAL "" FORCE)
+
+        if(${LIBNAME} STREQUAL "caliper")
+          set(HYPRE_NEEDS_CXX TRUE PARENT_SCOPE)
+        endif()
+
+        if(TARGET ${LIBNAME}::${LIBNAME})
+          target_link_libraries(${PROJECT_NAME} PUBLIC ${LIBNAME}::${LIBNAME})
+          message(STATUS "Found ${LIBNAME} target: ${LIBNAME}::${LIBNAME}")
+        elseif(TARGET ${LIBNAME})
+          target_link_libraries(${PROJECT_NAME} PUBLIC ${LIBNAME})
+          message(STATUS "Found ${LIBNAME} target: ${LIBNAME}")
+        else()
+          message(FATAL_ERROR "${LIBNAME} target not found. Please check your ${LIBNAME} installation")
+        endif()
+      else()
+        message(FATAL_ERROR "${LIBNAME_UPPER} target not found. Please check your ${LIBNAME_UPPER} installation")
+      endif()
+
+      # Display library info
+      get_library_version(${LIBNAME})
+      if(DEFINED ${LIBNAME}_DIR)
+        message(STATUS "  Config directory: ${${LIBNAME}_DIR}")
+      endif()
+    endif()
+
+    message(STATUS "Enabled support for using ${LIBNAME_UPPER}")
+
+    if(${LIBNAME_UPPER} STREQUAL "SUPERLU" OR ${LIBNAME_UPPER} STREQUAL "DSUPERLU" OR ${LIBNAME_UPPER} STREQUAL "UMPIRE")
+      target_link_libraries(${PROJECT_NAME} PUBLIC stdc++)
+    endif()
+
+    set(${LIBNAME_UPPER}_FOUND TRUE PARENT_SCOPE)
+  endif()
+endfunction()
+
+# Function to setup TPL or internal library implementation
+function(setup_tpl_or_internal LIB_NAME)
+  string(TOUPPER ${LIB_NAME} LIB_NAME_UPPER)
+
+  if(HYPRE_USING_HYPRE_${LIB_NAME_UPPER})
+    # Use internal library
+    add_subdirectory(${LIB_NAME})
+    message(STATUS "Using internal ${LIB_NAME_UPPER}")
+    target_include_directories(${PROJECT_NAME} PUBLIC
+      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/${LIB_NAME}>
+      $<INSTALL_INTERFACE:include>
+    )
+  else()
+    # Use external library
+    if(TPL_${LIB_NAME_UPPER}_LIBRARIES)
+      # Use specified TPL libraries
+      message(STATUS "Enabled support for using external ${LIB_NAME_UPPER}.")
+      foreach(lib ${TPL_${LIB_NAME_UPPER}_LIBRARIES})
+        if(EXISTS ${lib})
+          message(STATUS "${LIB_NAME_UPPER} library found: ${lib}")
+        else()
+          message(WARNING "${LIB_NAME_UPPER} library not found at specified path: ${lib}")
+        endif()
+      endforeach()
+      target_link_libraries(${PROJECT_NAME} PUBLIC ${TPL_${LIB_NAME_UPPER}_LIBRARIES})
+    else()
+      # Find system library
+      find_package(${LIB_NAME_UPPER} REQUIRED)
+      if(${LIB_NAME_UPPER}_FOUND)
+        message(STATUS "Using system ${LIB_NAME_UPPER}")
+        if(TARGET ${LIB_NAME_UPPER}::${LIB_NAME_UPPER})
+          target_link_libraries(${PROJECT_NAME} PUBLIC ${LIB_NAME_UPPER}::${LIB_NAME_UPPER})
+        else()
+          target_link_libraries(${PROJECT_NAME} PUBLIC ${${LIB_NAME_UPPER}_LIBRARIES})
+        endif()
+      else()
+        message(FATAL_ERROR "${LIB_NAME_UPPER} not found")
+      endif()
+    endif()
+  endif()
+endfunction()
+
+# Function to setup FEI (to be phased out)
+function(setup_fei)
+  if (HYPRE_USING_FEI)
+    set(HYPRE_NEEDS_CXX TRUE PARENT_SCOPE)
+
+    if (NOT TPL_FEI_INCLUDE_DIRS)
+      message(FATAL_ERROR "TPL_FEI_INCLUDE_DIRS option should be set for FEI support.")
+    endif ()
+
+    foreach (dir ${TPL_FEI_INCLUDE_DIRS})
+      if (NOT EXISTS ${dir})
+        message(FATAL_ERROR "FEI include directory not found: ${dir}")
+      endif ()
+      target_compile_options(${PROJECT_NAME} PUBLIC -I${dir})
+    endforeach ()
+
+    message(STATUS "Enabled support for using FEI.")
+    set(FEI_FOUND TRUE PARENT_SCOPE)
+    target_include_directories(${PROJECT_NAME} PUBLIC ${TPL_FEI_INCLUDE_DIRS})
+  endif()
+endfunction()
+
 # A handy function to add the current source directory to a local
 # filename. To be used for creating a list of sources.
 function(convert_filenames_to_full_paths NAMES)
@@ -13,6 +394,14 @@ function(convert_filenames_to_full_paths NAMES)
   set(${NAMES} ${tmp_names} PARENT_SCOPE)
 endfunction()
 
+# A function to add hypre subdirectories to the build
+function(add_hypre_subdirectories DIRS)
+  foreach(DIR IN LISTS DIRS)
+    add_subdirectory(${DIR})
+    target_include_directories(${PROJECT_NAME} PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/${DIR}>)
+  endforeach()
+endfunction()
+
 # A function to add each executable in the list to the build with the
 # correct flags, includes, and linkage.
 function(add_hypre_executables EXE_SRCS)
@@ -20,24 +409,182 @@ function(add_hypre_executables EXE_SRCS)
   foreach(SRC_FILE IN LISTS ${EXE_SRCS})
     get_filename_component(SRC_FILENAME ${SRC_FILE} NAME)
 
+    # If CUDA is enabled, tag source files to be compiled with nvcc.
     if (HYPRE_USING_CUDA)
-      # If CUDA is enabled, tag source files to be compiled with nvcc.
       set_source_files_properties(${SRC_FILENAME} PROPERTIES LANGUAGE CUDA)
-    endif (HYPRE_USING_CUDA)
+    endif ()
+
+    # If HIP is enabled, tag source files to be compiled with hipcc/clang
+    if (HYPRE_USING_HIP)
+      set_source_files_properties(${SRC_FILENAME} PROPERTIES LANGUAGE HIP)
+    endif ()
 
+    # If SYCL is enabled, tag source files to be compiled with dpcpp.
+    if (HYPRE_USING_SYCL)
+      set_source_files_properties(${SRC_FILENAME} PROPERTIES LANGUAGE CXX)
+    endif ()
+
+    # Get executable name
     string(REPLACE ".c" "" EXE_NAME ${SRC_FILENAME})
-    # Actually add the exe
+
+    # Add the executable
     add_executable(${EXE_NAME} ${SRC_FILE})
 
-    # Link libraries
-    set(HYPRE_LIBS "HYPRE")
+    # Link with HYPRE and inherit its compile properties
+    target_link_libraries(${EXE_NAME} PUBLIC HYPRE)
 
-    # Link libraries for Unix systems
+    # For Unix systems, also link with math library
     if (UNIX)
-      list(APPEND HYPRE_LIBS m)
-    endif (UNIX)
+      target_link_libraries(${EXE_NAME} PUBLIC m)
+    endif ()
+
+    # Explicitly specify the linker
+    if ((HYPRE_USING_CUDA AND NOT HYPRE_ENABLE_LTO) OR HYPRE_USING_HIP OR HYPRE_USING_SYCL)
+      set_target_properties(${EXE_NAME} PROPERTIES LINKER_LANGUAGE CXX)
+    endif ()
+
+    # Turn on LTO if requested
+    if (HYPRE_ENABLE_LTO)
+      set_target_properties(${EXE_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION TRUE)
+    endif ()
+
+    # Inherit compile definitions and options from HYPRE target
+    get_target_property(HYPRE_COMPILE_OPTS HYPRE COMPILE_OPTIONS)
+    #message(STATUS "${EXE_NAME}: ${HYPRE_COMPILE_OPTS}")
+    if (HYPRE_COMPILE_OPTS)
+      if (HYPRE_USING_CUDA OR HYPRE_USING_HIP OR HYPRE_USING_SYCL)
+        get_language_flags("${HYPRE_COMPILE_OPTS}" CXX_OPTS "CXX")
+        target_compile_options(${EXE_NAME} PRIVATE $<$<COMPILE_LANGUAGE:CXX>:${CXX_OPTS}>)
+        #message(STATUS "Added CXX compile options: ${CXX_OPTS} to ${EXE_NAME}")
+      else ()
+        get_language_flags("${HYPRE_COMPILE_OPTS}" C_OPTS "C")
+        target_compile_options(${EXE_NAME} PRIVATE $<$<COMPILE_LANGUAGE:C>:${C_OPTS}>)
+        #message(STATUS "Added C compile options: ${C_OPTS} to ${EXE_NAME}")
+      endif ()
+    endif ()
+
+    # Copy executable to original source directory
+    add_custom_command(TARGET ${EXE_NAME} POST_BUILD
+      COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${EXE_NAME}> ${CMAKE_CURRENT_SOURCE_DIR}
+      COMMENT "Copied ${EXE_NAME} to ${CMAKE_CURRENT_SOURCE_DIR}"
+    )
+  endforeach (SRC_FILE)
+endfunction ()
+
+# Function to add a tags target if etags is found
+function(add_hypre_target_tags)
+  find_program(ETAGS_EXECUTABLE etags)
+  if(ETAGS_EXECUTABLE)
+    add_custom_target(tags
+      COMMAND find ${CMAKE_CURRENT_SOURCE_DIR}
+              -type f
+              "(" -name "*.h" -o -name "*.c" -o -name "*.cpp"
+              -o -name "*.hpp" -o -name "*.cxx"
+              -o -name "*.f" -o -name "*.f90" ")"
+              -not -path "*/build/*"
+              -print | ${ETAGS_EXECUTABLE}
+              --declarations
+              --ignore-indentation
+              --no-members
+              -
+      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+      COMMENT "Generating TAGS file with etags"
+      VERBATIM
+    )
+  endif()
+endfunction()
+
+# Function to add a distclean target
+function(add_hypre_target_distclean)
+  add_custom_target(distclean
+    COMMAND find ${CMAKE_BINARY_DIR} -mindepth 1 -delete
+    COMMAND find ${CMAKE_SOURCE_DIR} -name "*.o" -type f -delete
+    COMMAND find ${CMAKE_SOURCE_DIR} -name "*.mod" -type f -delete
+    COMMAND find ${CMAKE_SOURCE_DIR} -name "*~" -type f -delete
+    COMMAND find ${CMAKE_SOURCE_DIR}/test -name "*.out*" -type f -delete
+    COMMAND find ${CMAKE_SOURCE_DIR}/test -name "*.err*" -type f -delete
+    COMMAND find ${CMAKE_SOURCE_DIR}/examples -type f -name "ex[0-9]" -name "ex[10-19]" -delete
+    COMMAND find ${CMAKE_SOURCE_DIR}/test -type f -name "ij|struct|sstruct|ams_driver|maxwell_unscalled|struct_migrate|sstruct_fac|ij_assembly" -delete
+    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+    COMMENT "Removing all build artifacts and generated files"
+    VERBATIM
+  )
+endfunction()
+
+# Function to add an uninstall target
+function(add_hypre_target_uninstall)
+  add_custom_target(uninstall
+    COMMAND ${CMAKE_COMMAND} -E remove_directory "${CMAKE_INSTALL_PREFIX}"
+    COMMAND ${CMAKE_COMMAND} -E echo "Removed installation directory: ${CMAKE_INSTALL_PREFIX}"
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    COMMENT "Uninstalling HYPRE"
+    VERBATIM
+  )
+endfunction()
+
+# Function to print the status of build options
+function(print_option_status)
+  # Define column widths
+  set(COLUMN1_WIDTH 40)
+  set(COLUMN2_WIDTH 10)
+  math(EXPR HEADER1_PAD "${COLUMN1_WIDTH} - 3")
+  math(EXPR HEADER2_PAD "${COLUMN2_WIDTH} - 1")
+
+  # Create separator line
+  string(REPEAT "-" ${HEADER1_PAD} SEPARATOR1)
+  string(REPEAT "-" ${HEADER2_PAD} SEPARATOR2)
+  set(separator "+${SEPARATOR1}+${SEPARATOR2}+")
+
+  # Function to print a block of options
+  function(print_option_block title options)
+    message(STATUS "")
+    message(STATUS " ${title}:")
+    message(STATUS " ${separator}")
+    message(STATUS " | Option                              | Status  |")
+    message(STATUS " ${separator}")
+
+    foreach(opt ${options})
+      if(${${opt}})
+        set(status "ON")
+      else()
+        set(status "OFF")
+      endif()
+
+      string(LENGTH "${opt}" opt_length)
+      math(EXPR padding "${COLUMN1_WIDTH} - ${opt_length} - 5")
+      if(${padding} GREATER 0)
+        string(REPEAT " " ${padding} pad_spaces)
+      else()
+        set(pad_spaces "")
+      endif()
+
+      string(LENGTH "${status}" status_length)
+      math(EXPR status_padding "${COLUMN2_WIDTH} - ${status_length} - 3")
+      if(${status_padding} GREATER 0)
+        string(REPEAT " " ${status_padding} status_pad_spaces)
+      else()
+        set(status_pad_spaces "")
+      endif()
+
+      message(STATUS " | ${opt}${pad_spaces} | ${status}${status_pad_spaces} |")
+    endforeach()
+
+    message(STATUS " ${separator}")
+  endfunction()
+
+  message(STATUS "")
+  message(STATUS "HYPRE Configuration Summary:")
+
+  # Print BASE_OPTIONS
+  print_option_block("Base Options" "${BASE_OPTIONS}")
+
+  # Print GPU_OPTIONS
+  if(HYPRE_ENABLE_CUDA OR HYPRE_ENABLE_HIP OR HYPRE_ENABLE_SYCL)
+    print_option_block("GPU Options" "${GPU_OPTIONS}")
+  endif()
+
+  # Print TPL_OPTIONS
+  print_option_block("Third-Party Library Options" "${TPL_OPTIONS}")
 
-    # Append the additional libraries and options
-    target_link_libraries(${EXE_NAME} PRIVATE "${HYPRE_LIBS}")
-  endforeach(SRC_FILE)
+  message(STATUS "")
 endfunction()
diff --git a/external/hypre/src/config/cmake/HYPRE_SetupCUDAToolkit.cmake b/external/hypre/src/config/cmake/HYPRE_SetupCUDAToolkit.cmake
index 1ff259c3..c278a775 100644
--- a/external/hypre/src/config/cmake/HYPRE_SetupCUDAToolkit.cmake
+++ b/external/hypre/src/config/cmake/HYPRE_SetupCUDAToolkit.cmake
@@ -1,67 +1,263 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-# This handles the non-compiler aspect of the CUDA toolkit.
-# Uses cmake find_package to locate the NVIDIA CUDA C tools 
-# for shared libraries. Otherwise for static libraries, assumes
-# the libraries are located in ${CUDA_TOOLKIT_ROOT_DIR}/lib64.
-# Please set cmake variable CUDA_TOOLKIT_ROOT_DIR. 
+message(STATUS "Enabling CUDA toolkit")
 
-# TODO Eventually should require cmake>=3.17
-# and use cmake's FindCUDAToolkit (also helps handle
-# shared vs. static libraries).
+# Check for CUDA_PATH, CUDA_HOME or CUDA_DIR
+if(DEFINED CUDAToolkit_ROOT)
+  set(CUDA_DIR ${CUDAToolkit_ROOT})
+elseif(DEFINED ENV{CUDAToolkit_ROOT})
+  set(CUDA_DIR $ENV{CUDAToolkit_ROOT})
+elseif(DEFINED CUDA_DIR)
+  set(CUDA_DIR ${CUDA_DIR})
+elseif(DEFINED ENV{CUDA_DIR})
+  set(CUDA_DIR $ENV{CUDA_DIR})
+elseif(DEFINED CUDA_PATH)
+  set(CUDA_DIR ${CUDA_PATH})
+elseif(DEFINED ENV{CUDA_PATH})
+  set(CUDA_DIR $ENV{CUDA_PATH})
+elseif(DEFINED CUDA_HOME)
+  set(CUDA_DIR ${CUDA_HOME})
+elseif(DEFINED ENV{CUDA_HOME})
+  set(CUDA_DIR $ENV{CUDA_HOME})
+elseif(EXISTS "/opt/cuda")
+  set(CUDA_DIR "/opt/cuda")
+elseif(EXISTS "/usr/bin/nvcc")
+  set(CUDA_DIR "/usr")
+else()
+  message(FATAL_ERROR "CUDA_PATH or CUDA_HOME not set. Please set one of them to point to your CUDA installation.")
+endif()
+message(STATUS "Using CUDA installation: ${CUDA_DIR}")
+
+# Specify the path to the custom nvcc compiler
+if(WIN32)
+  set(CMAKE_CUDA_COMPILER "${CUDA_DIR}/bin/nvcc.exe" CACHE FILEPATH "CUDA compiler")
+else()
+  set(CMAKE_CUDA_COMPILER "${CUDA_DIR}/bin/nvcc" CACHE FILEPATH "CUDA compiler")
+endif()
+
+# Specify the CUDA Toolkit root directory
+set(CUDAToolkit_ROOT "${CUDA_DIR}" CACHE PATH "Path to the CUDA toolkit")
+
+# Optionally, prioritize the custom CUDA path in CMAKE_PREFIX_PATH
+list(APPEND CMAKE_PREFIX_PATH "${CUDA_DIR}")
+
+# Set CUDA standard to match C++ standard if not already set
+if(NOT DEFINED CMAKE_CUDA_STANDARD)
+  set(CMAKE_CUDA_STANDARD ${CMAKE_CXX_STANDARD})
+endif()
+set(CMAKE_CUDA_STANDARD_REQUIRED ON)
+set(CMAKE_CUDA_EXTENSIONS OFF)
+
+# Visual Studio does not support CMAKE_CUDA_HOST_COMPILER
+if (NOT MSVC)
+  set(CMAKE_CUDA_HOST_COMPILER ${CMAKE_CXX_COMPILER} CACHE STRING "CXX compiler used by CUDA" FORCE)
+endif()
+
+# Check if CUDA is available and enable it if found
+include(CheckLanguage)
+check_language(CUDA)
+if(DEFINED CMAKE_CUDA_COMPILER)
+   enable_language(CUDA)
+else()
+  message(FATAL_ERROR "CUDA language not found. Please check your CUDA installation.")
+endif()
+
+# Find the CUDA Toolkit
+find_package(CUDAToolkit REQUIRED)
+
+# Add a dummy cuda target if it doesn't exist (avoid error when building with BLT dependencies)
+if(NOT TARGET cuda)
+  add_library(cuda INTERFACE)
+endif()
+
+# Detection CUDA architecture if not given by the user
+if(NOT DEFINED CMAKE_CUDA_ARCHITECTURES OR CMAKE_CUDA_ARCHITECTURES STREQUAL "52")
+  message(STATUS "Detecting CUDA GPU architectures using nvidia-smi...")
+
+  # Platform-specific NVIDIA smi command
+  if (WIN32)
+    # Try multiple possible locations on Windows
+    find_program(NVIDIA_SMI_CMD
+      NAMES nvidia-smi.exe
+      PATHS
+      "${CUDA_DIR}/bin"
+      "$ENV{ProgramFiles}/NVIDIA Corporation/NVSMI"
+      "$ENV{ProgramFiles}/NVIDIA GPU Computing Toolkit/CUDA/v*/bin"
+      "$ENV{ProgramW6432}/NVIDIA Corporation/NVSMI"
+      NO_DEFAULT_PATH
+    )
+
+    if(NOT NVIDIA_SMI_CMD)
+      find_program(NVIDIA_SMI_CMD nvidia-smi.exe)
+    endif()
+    message(STATUS "Found nvidia-smi: ${NVIDIA_SMI_CMD}")
+  else()
+    set(NVIDIA_SMI_CMD "nvidia-smi")
+  endif()
+
+  if(NOT NVIDIA_SMI_CMD)
+    message(WARNING "nvidia-smi not found. Using default CUDA architecture 70.")
+    set(CMAKE_CUDA_ARCHITECTURES "70" CACHE STRING "Default CUDA architectures" FORCE)
+  else()
+    # Execute nvidia-smi to get GPU compute capabilities
+    execute_process(
+      COMMAND ${NVIDIA_SMI_CMD} --query-gpu=compute_cap --format=csv,noheader
+      OUTPUT_VARIABLE NVIDIA_SMI_OUTPUT
+      RESULT_VARIABLE NVIDIA_SMI_RESULT
+      ERROR_VARIABLE NVIDIA_SMI_ERROR
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+
+    if(NOT NVIDIA_SMI_RESULT EQUAL 0)
+      message(WARNING "${NVIDIA_SMI_CMD} failed to execute: ${NVIDIA_SMI_ERROR}")
+      set(CMAKE_CUDA_ARCHITECTURES "70" CACHE STRING "Default CUDA architectures" FORCE)
+      message(STATUS "Setting CMAKE_CUDA_ARCHITECTURES to default '70'")
+    else()
+      # Clean the output (remove extra newlines and spaces)
+      string(STRIP "${NVIDIA_SMI_OUTPUT}" CUDA_ARCHS)     # Remove trailing/leading whitespaces
+      string(REPLACE "." "" CUDA_ARCHS "${CUDA_ARCHS}")   # Replace '.' with nothing to format '7.0' as '70'
+      string(REPLACE "\n" ";" CUDA_ARCHS "${CUDA_ARCHS}") # Replace newline with semicolon for list format
+
+      # Remove any duplicates CUDA archictectures
+      list(REMOVE_DUPLICATES CUDA_ARCHS)
+
+      if(CUDA_ARCHS)
+        string(REPLACE ";" "," CUDA_ARCHS_STR "${CUDA_ARCHS}")
+        set(CMAKE_CUDA_ARCHITECTURES "${CUDA_ARCHS_STR}" CACHE STRING "Detected CUDA architectures" FORCE)
+        message(STATUS "Detected CUDA GPU architectures: ${CMAKE_CUDA_ARCHITECTURES}")
+      else()
+        message(WARNING "No GPUs detected. Setting CMAKE_CUDA_ARCHITECTURES to default '70'")
+        set(CMAKE_CUDA_ARCHITECTURES "70" CACHE STRING "Default CUDA architectures" FORCE)
+      endif()
+    endif()
+  endif()
+else()
+  # Remove duplicates from the pre-set CMAKE_CUDA_ARCHITECTURES
+  string(REPLACE "," ";" CUDA_ARCH_LIST "${CMAKE_CUDA_ARCHITECTURES}")
+  list(REMOVE_DUPLICATES CUDA_ARCH_LIST)
+  string(REPLACE ";" "," CUDA_ARCH_STR "${CUDA_ARCH_LIST}")
+  set(CMAKE_CUDA_ARCHITECTURES "${CUDA_ARCH_STR}" CACHE STRING "Detected CUDA architectures" FORCE)
+  message(STATUS "CMAKE_CUDA_ARCHITECTURES is already set to: ${CMAKE_CUDA_ARCHITECTURES}")
+endif()
+
+# Set the CUDA architectures to the HYPRE target
+set_property(TARGET HYPRE PROPERTY CUDA_ARCHITECTURES "${CMAKE_CUDA_ARCHITECTURES}")
+
+# Show CUDA Toolkit location
+if(CUDAToolkit_FOUND)
+  if (CUDAToolkit_ROOT)
+    message(STATUS "CUDA Toolkit found at: ${CUDAToolkit_ROOT}")
+  endif()
+  message(STATUS "CUDA Toolkit version: ${CUDAToolkit_VERSION}")
+  message(STATUS "CUDA Toolkit include directory: ${CUDAToolkit_INCLUDE_DIRS}")
+  message(STATUS "CUDA Toolkit library directory: ${CUDAToolkit_LIBRARY_DIR}")
+else()
+  message(FATAL_ERROR "CUDA Toolkit not found")
+endif()
+
+# Check for Thrust headers
+find_path(THRUST_INCLUDE_DIR thrust/version.h
+  HINTS ${CUDAToolkit_INCLUDE_DIRS} ${CUDAToolkit_INCLUDE_DIRS}/cuda-thrust
+  PATH_SUFFIXES thrust
+  NO_DEFAULT_PATH
+)
+
+if(THRUST_INCLUDE_DIR)
+  message(STATUS "CUDA Thrust headers found in: ${THRUST_INCLUDE_DIR}")
+else()
+  message(FATAL_ERROR "CUDA Thrust headers not found! Please specify -DTHRUST_INCLUDE_DIR.")
+endif()
 
 # Collection of CUDA optional libraries
-set(EXPORT_INTERFACE_CUDA_LIBS "")
-
-if (NOT CUDA_FOUND)
-  find_package(CUDA REQUIRED)
-endif ()
-
-if (HYPRE_ENABLE_CUSPARSE)
-  set(HYPRE_USING_CUSPARSE ON CACHE BOOL "" FORCE)
-  if (HYPRE_SHARED)
-    list(APPEND EXPORT_INTERFACE_CUDA_LIBS ${CUDA_cusparse_LIBRARY})
-  else ()
-    list(APPEND EXPORT_INTERFACE_CUDA_LIBS
-      ${CUDA_TOOLKIT_ROOT_DIR}/lib64/libcusparse_static.a)
-  endif ()
-endif ()
-
-if (HYPRE_ENABLE_CURAND)
-  set(HYPRE_USING_CURAND ON CACHE BOOL "" FORCE)
-  if (HYPRE_SHARED)
-    list(APPEND EXPORT_INTERFACE_CUDA_LIBS ${CUDA_curand_LIBRARY})
-  else ()
-    list(APPEND EXPORT_INTERFACE_CUDA_LIBS
-      ${CUDA_TOOLKIT_ROOT_DIR}/lib64/libcurand_static.a)
-  endif ()
-endif ()
-
-if (HYPRE_ENABLE_CUBLAS)
-  set(HYPRE_USING_CUBLAS ON CACHE BOOL "" FORCE)
-  if (HYPRE_SHARED)
-    list(APPEND EXPORT_INTERFACE_CUDA_LIBS ${CUDA_CUBLAS_LIBRARIES})
-  else ()
-    list(APPEND EXPORT_INTERFACE_CUDA_LIBS
-      ${CUDA_TOOLKIT_ROOT_DIR}/lib64/libcublas_static.a)
-    list(APPEND EXPORT_INTERFACE_CUDA_LIBS
-      ${CUDA_TOOLKIT_ROOT_DIR}/lib64/libcublasLt_static.a)
-  endif (HYPRE_SHARED)
-endif (HYPRE_ENABLE_CUBLAS)
-
-if (NOT HYPRE_SHARED)
-  list(APPEND EXPORT_INTERFACE_CUDA_LIBS
-    ${CUDA_TOOLKIT_ROOT_DIR}/lib64/libculibos.a)
-endif ()
-
-if (HYPRE_ENABLE_GPU_PROFILING)
-  set(HYPRE_USING_NVTX ON CACHE BOOL "" FORCE)
-  find_library(NVTX_LIBRARY
-     NAME libnvToolsExt.so
-     PATHS ${CUDA_TOOLKIT_ROOT_DIR}/lib64 ${CUDA_TOOLKIT_ROOT_DIR}/lib)
-  message(STATUS "NVidia tools extension library found in " ${NVTX_LIBRARY})
-  list(APPEND EXPORT_INTERFACE_CUDA_LIBS ${NVTX_LIBRARY})
-endif (HYPRE_ENABLE_GPU_PROFILING)
+set(CUDA_LIBS "")
+
+# Function to handle CUDA libraries
+function(find_and_add_cuda_library LIB_NAME HYPRE_ENABLE_VAR)
+  string(TOUPPER ${LIB_NAME} LIB_NAME_UPPER)
+  if(${HYPRE_ENABLE_VAR})
+    set(HYPRE_USING_${LIB_NAME_UPPER} ON CACHE INTERNAL "")
+
+    # Use CUDAToolkit to find the component
+    find_package(CUDAToolkit REQUIRED COMPONENTS ${LIB_NAME})
+
+    if(TARGET CUDA::${LIB_NAME})
+      message(STATUS "Found ${LIB_NAME_UPPER} library")
+      list(APPEND CUDA_LIBS CUDA::${LIB_NAME})
+    else()
+      message(STATUS "CUDA::${LIB_NAME} target not found. Attempting manual linking.")
+      find_library(${LIB_NAME}_LIBRARY ${LIB_NAME} HINTS ${CUDAToolkit_LIBRARY_DIR})
+      if(${LIB_NAME}_LIBRARY)
+        message(STATUS "Found ${LIB_NAME_UPPER} library: ${${LIB_NAME}_LIBRARY}")
+        add_library(CUDA::${LIB_NAME} UNKNOWN IMPORTED)
+        set_target_properties(CUDA::${LIB_NAME} PROPERTIES
+          IMPORTED_LOCATION "${${LIB_NAME}_LIBRARY}"
+          INTERFACE_INCLUDE_DIRECTORIES "${CUDAToolkit_INCLUDE_DIRS}")
+        list(APPEND CUDA_LIBS CUDA::${LIB_NAME})
+      else()
+        message(FATAL_ERROR "Could not find ${LIB_NAME_UPPER} library. Please check your CUDA installation.")
+      endif()
+    endif()
+
+    set(CUDA_LIBS ${CUDA_LIBS} PARENT_SCOPE)
+  endif()
+endfunction()
+
+# Handle CUDA libraries
+list(APPEND CUDA_LIBS CUDA::cudart) # Add cudart first since other CUDA libraries may depend on it
+find_and_add_cuda_library(cusparse HYPRE_ENABLE_CUSPARSE)
+find_and_add_cuda_library(curand HYPRE_ENABLE_CURAND)
+find_and_add_cuda_library(cublas HYPRE_ENABLE_CUBLAS)
+find_and_add_cuda_library(cublasLt HYPRE_ENABLE_CUBLAS)
+find_and_add_cuda_library(cusolver HYPRE_ENABLE_CUSOLVER)
+
+# Handle GPU Profiling with nvToolsExt
+if(HYPRE_ENABLE_GPU_PROFILING)
+  find_library(NVTX_LIBRARY nvToolsExt HINTS ${CUDA_TOOLKIT_ROOT_DIR} PATH_SUFFIXES lib64 lib)
+  if(NVTX_LIBRARY)
+    message(STATUS "Found NVTX library")
+    set(HYPRE_USING_NVTX ON CACHE BOOL "" FORCE)
+    list(APPEND CUDA_LIBS ${NVTX_LIBRARY})
+  else()
+    message(FATAL_ERROR "NVTX library not found! Make sure CUDA is installed correctly.")
+  endif()
+endif()
+
+# Add CUDA Toolkit include directories to the target
+target_include_directories(HYPRE PUBLIC ${CUDAToolkit_INCLUDE_DIRS})
+
+# Add Thrust include directory
+target_include_directories(HYPRE PUBLIC ${THRUST_INCLUDE_DIR})
+
+# Link CUDA libraries to the target
+target_link_libraries(HYPRE PUBLIC ${CUDA_LIBS})
+message(STATUS "Linking to CUDA libraries: ${CUDA_LIBS}")
+
+# Set additional CUDA compiler flags
+set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} --extended-lambda")
+
+# Ensure LTO-specific flags are included
+if (HYPRE_ENABLE_LTO AND CUDAToolkit_VERSION VERSION_LESS 11.2)
+  # See https://developer.nvidia.com/blog/improving-gpu-app-performance-with-cuda-11-2-device-lto
+  message(WARNING "Device LTO not available on CUDAToolkit_VERSION (${CUDAToolkit_VERSION}) < 11.2. Turning it off...")
+
+elseif (HYPRE_ENABLE_LTO AND CMAKE_VERSION VERSION_LESS 3.25)
+  # See https://gitlab.kitware.com/cmake/cmake/-/commit/96bc59b1ca01be231347404d178445263687dd22
+  message(WARNING "Device LTO not available with CUDA on CMAKE_VERSION (${CMAKE_VERSION}) < 3.25. Turning it off...")
+
+elseif (HYPRE_ENABLE_LTO)
+  message(STATUS "Enabling Device LTO")
+
+  # Enable LTO for the target
+  set_target_properties(${PROJECT_NAME} PROPERTIES
+      CUDA_SEPARABLE_COMPILATION ON
+      CUDA_RESOLVE_DEVICE_SYMBOLS ON
+  )
+endif()
+
+# Print CUDA info
+message(STATUS "CUDA C++ standard: ${CMAKE_CUDA_STANDARD}")
+message(STATUS "CUDA architectures: ${CMAKE_CUDA_ARCHITECTURES}")
+message(STATUS "CUDA flags: ${CMAKE_CUDA_FLAGS}")
diff --git a/external/hypre/src/config/cmake/HYPRE_SetupGPUToolkit.cmake b/external/hypre/src/config/cmake/HYPRE_SetupGPUToolkit.cmake
new file mode 100644
index 00000000..2016214b
--- /dev/null
+++ b/external/hypre/src/config/cmake/HYPRE_SetupGPUToolkit.cmake
@@ -0,0 +1,91 @@
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+# Enable CXX language
+enable_language(CXX)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+if(HYPRE_ENABLE_SYCL)
+  # We enforce the use of Intel's oneAPI DPC++/C++ Compiler
+  if(NOT CMAKE_CXX_COMPILER MATCHES "dpcpp|icpx")
+    message(FATAL_ERROR "SYCL requires DPC++ or Intel C++ compiler")
+  endif()
+
+  # Enforce C++17 at least for SYCL
+  if(NOT DEFINED CMAKE_CXX_STANDARD OR CMAKE_CXX_STANDARD LESS 17)
+    set(CMAKE_CXX_STANDARD 17)
+  endif()
+else()
+  # Enforce C++14 at least for CUDA and HIP
+  if(NOT DEFINED CMAKE_CXX_STANDARD OR CMAKE_CXX_STANDARD LESS 14)
+    set(CMAKE_CXX_STANDARD 14)
+  endif()
+endif()
+
+# Set C++ standard for HYPRE
+set_property(TARGET HYPRE PROPERTY CXX_STANDARD ${CMAKE_CXX_STANDARD})
+
+# Add C++ standard library to interface
+if(MSVC OR (CMAKE_CXX_COMPILER_ID MATCHES "Intel" AND WIN32))
+  # MSVC and Intel on Windows link the C++ standard library automatically
+  message(STATUS "${CMAKE_CXX_COMPILER_ID} on Windows: C++ standard library linked automatically")
+elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang|AppleClang" AND APPLE)
+  # Apple Clang specifically uses c++
+  target_link_libraries(HYPRE INTERFACE "-lc++")
+elseif(CMAKE_CXX_COMPILER_ID MATCHES "XL|XLClang")
+  # IBM XL C++ needs `-libmc++`
+  target_link_libraries(HYPRE INTERFACE "-libmc++ -lstdc++")
+else()
+  # Most other compilers use stdc++
+  if(NOT (MSVC OR (CMAKE_CXX_COMPILER_ID MATCHES "Intel" AND WIN32)))
+    target_link_libraries(HYPRE INTERFACE "-lstdc++")
+    if(NOT CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang|AppleClang|Intel|PGI|NVHPC|XL|XLClang")
+      message(WARNING "Unknown compiler: ${CMAKE_CXX_COMPILER_ID}. Attempting to link -lstdc++")
+    endif()
+  endif()
+endif()
+message(STATUS "C++ standard library configuration completed for ${CMAKE_CXX_COMPILER_ID}")
+
+# Print C++ info
+message(STATUS "Enabling support for CXX.")
+message(STATUS "Using CXX standard: C++${CMAKE_CXX_STANDARD}")
+
+# Set GPU-related variables
+set(HYPRE_USING_GPU ON CACHE INTERNAL "")
+set(HYPRE_USING_HOST_MEMORY OFF CACHE INTERNAL "")
+set(HYPRE_ENABLE_HOST_MEMORY OFF CACHE BOOL "Use host memory" FORCE)
+
+if(HYPRE_ENABLE_UNIFIED_MEMORY)
+  set(HYPRE_USING_UNIFIED_MEMORY ON CACHE INTERNAL "")
+else()
+  set(HYPRE_USING_DEVICE_MEMORY ON CACHE INTERNAL "")
+endif()
+
+# Check if examples are enabled, but not unified memory
+if(HYPRE_BUILD_EXAMPLES AND NOT HYPRE_ENABLE_UNIFIED_MEMORY)
+  message(WARNING "Running the examples on GPUs requires Unified Memory!\nExamples will not be built!\n")
+  set(HYPRE_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
+endif()
+
+# Add any extra CXX compiler flags
+if(NOT HYPRE_WITH_EXTRA_CXXFLAGS STREQUAL "")
+  string(REPLACE " " ";" HYPRE_WITH_EXTRA_CXXFLAGS_LIST ${HYPRE_WITH_EXTRA_CXXFLAGS})
+  target_compile_options(HYPRE PRIVATE
+    $<$<COMPILE_LANGUAGE:CXX>:${HYPRE_WITH_EXTRA_CXXFLAGS_LIST}>)
+endif()
+
+# Include the toolkit setup file for the selected GPU architecture
+if(HYPRE_ENABLE_CUDA)
+  include(HYPRE_SetupCUDAToolkit)
+
+elseif(HYPRE_ENABLE_HIP)
+  include(HYPRE_SetupHIPToolkit)
+
+elseif(HYPRE_ENABLE_SYCL)
+  include(HYPRE_SetupSYCLToolkit)
+  set(EXPORT_DEVICE_LIBS ${EXPORT_INTERFACE_SYCL_LIBS})
+
+else()
+  message(FATAL_ERROR "Neither CUDA nor HIP nor SYCL is enabled. Please enable one of them.")
+endif()
diff --git a/external/hypre/src/config/cmake/HYPRE_SetupHIPToolkit.cmake b/external/hypre/src/config/cmake/HYPRE_SetupHIPToolkit.cmake
new file mode 100644
index 00000000..89632b1d
--- /dev/null
+++ b/external/hypre/src/config/cmake/HYPRE_SetupHIPToolkit.cmake
@@ -0,0 +1,211 @@
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+# Check for ROCM_PATH or HIP_PATH
+message(STATUS "Enabling HIP toolkit")
+if(DEFINED ROCM_PATH)
+  set(HIP_PATH ${ROCM_PATH})
+elseif(DEFINED ENV{ROCM_PATH})
+  set(HIP_PATH $ENV{ROCM_PATH})
+elseif(DEFINED ENV{HIP_PATH})
+  set(HIP_PATH $ENV{HIP_PATH})
+elseif(EXISTS "/opt/rocm")
+  set(HIP_PATH "/opt/rocm")
+else()
+  message(FATAL_ERROR "ROCM_PATH or HIP_PATH not set. Please set one of them to point to your ROCm installation.")
+endif()
+message(STATUS "Using ROCm installation: ${HIP_PATH}")
+
+# Add HIP_PATH to CMAKE_PREFIX_PATH
+list(APPEND CMAKE_PREFIX_PATH ${HIP_PATH})
+
+# Set HIP standard to match C++ standard if not already set
+if(NOT DEFINED CMAKE_HIP_STANDARD)
+  set(CMAKE_HIP_STANDARD ${CMAKE_CXX_STANDARD} CACHE STRING "C++ standard for HIP" FORCE)
+endif()
+set(CMAKE_HIP_STANDARD_REQUIRED ON CACHE BOOL "Require C++ standard for HIP" FORCE)
+
+# Check if HIP is available and enable it if found
+include(CheckLanguage)
+check_language(HIP)
+if(CMAKE_HIP_COMPILER)
+  enable_language(HIP)
+else()
+  message(FATAL_ERROR "HIP language not found. Please check your HIP/ROCm installation.")
+endif()
+
+# Find HIP package
+find_package(hip REQUIRED CONFIG)
+
+# Minimum supported HIP version for HYPRE
+set(REQUIRED_HIP_VERSION "5.2.0")
+
+if(NOT DEFINED hip_VERSION)
+  message(WARNING
+    "Cannot detect HIP version from the 'hip' package. Skipping the minimum version check. "
+    "Proceed at your own risk!!!")
+else()
+  if(hip_VERSION VERSION_LESS REQUIRED_HIP_VERSION)
+    message(FATAL_ERROR
+      "HYPRE requires HIP >= ${REQUIRED_HIP_VERSION}, but found ${hip_VERSION}.")
+  endif()
+endif()
+
+# Function to detect GPU architectures using rocm-smi
+if(NOT DEFINED CMAKE_HIP_ARCHITECTURES)
+  message(STATUS "Detecting GPU architectures using rocm-smi...")
+
+  # Execute rocm-smi to get GPU architecture info
+  execute_process(
+    COMMAND rocm-smi --showUniqueId --format=json
+    OUTPUT_VARIABLE ROCM_SMI_OUTPUT
+    RESULT_VARIABLE ROCM_SMI_RESULT
+    ERROR_VARIABLE ROCM_SMI_ERROR
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+  )
+
+  if(NOT ROCM_SMI_RESULT EQUAL 0)
+    message(WARNING "rocm-smi failed to execute: ${ROCM_SMI_ERROR}")
+    set(CMAKE_HIP_ARCHITECTURES "gfx90a" CACHE STRING "Default HIP architectures" FORCE)
+    message(STATUS "Setting CMAKE_HIP_ARCHITECTURES to default 'gfx90a'")
+    return()
+  endif()
+
+  # Parse JSON output to extract GPU architectures
+  include(Jsoncpp)
+  jsoncpp_parse(json_output "${ROCM_SMI_OUTPUT}")
+
+  # Extract GPU architecture codes
+  set(GPU_ARCHS "")
+  foreach(gpu ${json_output@/gpu/@})
+    get_property(gpu_arch PROPERTY GPU ARCHITECTURE "${gpu}")
+    if(NOT gpu_arch STREQUAL "")
+      list(APPEND GPU_ARCHS ${gpu_arch})
+    endif()
+  endforeach()
+
+  list(REMOVE_DUPLICATES GPU_ARCHS)
+
+  if(GPU_ARCHS)
+    string(REPLACE ";" "," GPU_ARCHS_STR "${GPU_ARCHS}")
+    set(CMAKE_HIP_ARCHITECTURES "${GPU_ARCHS_STR}" CACHE STRING "Detected HIP architectures" FORCE)
+    message(STATUS "Detected GPU architectures: ${CMAKE_HIP_ARCHITECTURES}")
+  else()
+    message(WARNING "No GPUs detected. Setting CMAKE_HIP_ARCHITECTURES to default 'gfx90a'")
+    set(CMAKE_HIP_ARCHITECTURES "gfx90a" CACHE STRING "Default HIP architectures" FORCE)
+  endif()
+else()
+  # Remove duplicates from the pre-set CMAKE_HIP_ARCHITECTURES
+  string(REPLACE "," ";" HIP_ARCH_LIST "${CMAKE_HIP_ARCHITECTURES}")
+  list(REMOVE_DUPLICATES HIP_ARCH_LIST)
+  string(REPLACE ";" "," HIP_ARCH_STR "${HIP_ARCH_LIST}")
+  set(CMAKE_HIP_ARCHITECTURES "${HIP_ARCH_STR}" CACHE STRING "Detected HIP architectures" FORCE)
+  message(STATUS "CMAKE_HIP_ARCHITECTURES is already set to: ${CMAKE_HIP_ARCHITECTURES}")
+endif()
+set_property(TARGET ${PROJECT_NAME} PROPERTY HIP_ARCHITECTURES "${CMAKE_HIP_ARCHITECTURES}")
+
+# Collection of ROCm optional libraries
+set(ROCM_LIBS "")
+
+# Function to find and add libraries
+function(find_and_add_rocm_library LIB_NAME)
+  string(TOUPPER ${LIB_NAME} LIB_NAME_UPPER)
+  set(HYPRE_ENABLE_VAR "HYPRE_ENABLE_${LIB_NAME_UPPER}")
+  if(${HYPRE_ENABLE_VAR})
+    set(HYPRE_USING_${LIB_NAME_UPPER} ON CACHE INTERNAL "")
+    find_package(${LIB_NAME} REQUIRED)
+    if(TARGET roc::${LIB_NAME})
+      message(STATUS "Found target: ${${LIB_NAME}_LIBRARY}")
+      list(APPEND ROCM_LIBS ${${LIB_NAME}_LIBRARY})
+    else()
+      #message(WARNING "roc::${LIB_NAME} target not found. Attempting manual linking.")
+      find_library(${LIB_NAME}_LIBRARY ${LIB_NAME} HINTS ${HIP_PATH}/lib ${HIP_PATH}/lib64)
+      if(${LIB_NAME}_LIBRARY)
+        message(STATUS "Found ${LIB_NAME} library: ${${LIB_NAME}_LIBRARY}")
+        add_library(roc::${LIB_NAME} UNKNOWN IMPORTED)
+        set_target_properties(roc::${LIB_NAME} PROPERTIES
+          IMPORTED_LOCATION "${${LIB_NAME}_LIBRARY}"
+          INTERFACE_INCLUDE_DIRECTORIES "${HIP_PATH}/include")
+        list(APPEND ROCM_LIBS roc::${LIB_NAME})
+      else()
+        message(FATAL_ERROR "Could not find ${LIB_NAME} library. Please check your ROCm installation.")
+      endif()
+    endif()
+    set(ROCM_LIBS ${ROCM_LIBS} PARENT_SCOPE)
+  endif()
+endfunction()
+
+# Find and add libraries
+find_and_add_rocm_library(rocblas)
+find_and_add_rocm_library(rocsparse)
+find_and_add_rocm_library(rocrand)
+find_and_add_rocm_library(rocsolver)
+
+if(HYPRE_ENABLE_GPU_PROFILING)
+  set(HYPRE_USING_ROCTRACER ON CACHE BOOL "" FORCE)
+  find_library(ROCTRACER_LIBRARY
+     NAMES libroctracer64.so
+     PATHS ${HIP_PATH}/lib ${HIP_PATH}/lib64
+     NO_DEFAULT_PATH)
+  if(ROCTRACER_LIBRARY)
+    message(STATUS "ROCm tracer library found in ${ROCTRACER_LIBRARY}")
+    list(APPEND ROCM_LIBS ${ROCTRACER_LIBRARY})
+  else()
+    message(WARNING "ROCm tracer library not found. GPU profiling may not work correctly.")
+  endif()
+endif()
+
+# Add HIP include directory
+target_include_directories(${PROJECT_NAME} PUBLIC ${HIP_PATH}/include)
+
+# Link HIP libraries to the target
+target_link_libraries(${PROJECT_NAME} PUBLIC ${ROCM_LIBS})
+message(STATUS "Linking to ROCm libraries: ${ROCM_LIBS}")
+
+# Turn on Position Independent Code (PIC) by default
+set_target_properties(${PROJECT_NAME} PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
+
+# Signal to downstream targets that they need PIC
+set_target_properties(${PROJECT_NAME} PROPERTIES INTERFACE_POSITION_INDEPENDENT_CODE TRUE)
+
+# Ensure LTO-specific flags are included
+if (HYPRE_ENABLE_LTO AND NOT MSVC)
+  if (CMAKE_C_COMPILER_ID MATCHES "Clang")
+    message(STATUS "Enabling Device LTO")
+  else ()
+    message(FATAL_ERROR "HIP Device LTO available only with Clang")
+  endif ()
+
+  # HIP compilation options
+  target_compile_options(${PROJECT_NAME}
+    PRIVATE
+      $<$<COMPILE_LANGUAGE:HIP>:-fgpu-rdc -foffload-lto>
+      $<$<COMPILE_LANGUAGE:CXX>:-foffload-lto>
+    INTERFACE
+      $<$<COMPILE_LANGUAGE:HIP>:-foffload-lto>
+      $<$<COMPILE_LANGUAGE:CXX>:-foffload-lto>
+  )
+
+  # Link options need to be more specific
+  target_link_options(${PROJECT_NAME}
+    PRIVATE
+      -fgpu-rdc
+      -foffload-lto
+      --hip-link
+      -Wl,--no-as-needed  # Ensure all symbols are kept
+    INTERFACE
+      -foffload-lto
+  )
+endif ()
+
+# Print HIP info
+if (DEFINED hip_VERSION)
+  message(STATUS "HIP version: ${hip_VERSION}")
+endif()
+message(STATUS "HIP C++ standard: ${CMAKE_HIP_STANDARD}")
+message(STATUS "HIP architectures: ${CMAKE_HIP_ARCHITECTURES}")
+if (DEFINED CMAKE_HIP_FLAGS)
+  message(STATUS "HIP common flags: ${CMAKE_HIP_FLAGS}")
+endif()
diff --git a/external/hypre/src/config/cmake/HYPRE_SetupSYCLToolkit.cmake b/external/hypre/src/config/cmake/HYPRE_SetupSYCLToolkit.cmake
new file mode 100644
index 00000000..dbaa06b6
--- /dev/null
+++ b/external/hypre/src/config/cmake/HYPRE_SetupSYCLToolkit.cmake
@@ -0,0 +1,104 @@
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+# This handles the non-compiler aspect of the SYCL toolkit.
+message(STATUS "Enabling SYCL toolkit")
+
+# limit C++ errors to one
+if(CMAKE_CXX_COMPILER_ID MATCHES "Intel|Clang")
+  target_compile_options(${PROJECT_NAME} PRIVATE $<$<COMPILE_LANGUAGE:CXX>:-ferror-limit=1>)
+endif()
+
+# Find Intel SYCL
+find_package(IntelSYCL REQUIRED)
+
+# Set up SYCL flags
+if(IntelSYCL_FOUND)
+  # Standard SYCL flags
+  target_compile_options(${PROJECT_NAME} PUBLIC $<$<COMPILE_LANGUAGE:CXX>:-fsycl>)
+  target_compile_options(${PROJECT_NAME} PUBLIC $<$<COMPILE_LANGUAGE:CXX>:-fsycl-unnamed-lambda>)
+  target_link_options(${PROJECT_NAME} PUBLIC -fsycl)
+  target_link_options(${PROJECT_NAME} PUBLIC -fsycl-device-code-split=per_kernel)
+  target_link_options(${PROJECT_NAME} PUBLIC -Wl,--no-relax)
+
+  # Use either user-specified target or IntelSYCL's default
+  if(HYPRE_SYCL_TARGET)
+    target_compile_options(${PROJECT_NAME} PUBLIC $<$<COMPILE_LANGUAGE:CXX>:-fsycl-targets=${HYPRE_SYCL_TARGET}>)
+    target_link_options(${PROJECT_NAME} PUBLIC -fsycl-targets=${HYPRE_SYCL_TARGET})
+  elseif(INTEL_SYCL_TARGETS)
+    target_compile_options(${PROJECT_NAME} PUBLIC $<$<COMPILE_LANGUAGE:CXX>:-fsycl-targets=${INTEL_SYCL_TARGETS}>)
+    target_link_options(${PROJECT_NAME} PUBLIC -fsycl-targets=${INTEL_SYCL_TARGETS})
+  endif()
+
+  # Use either user-specified backend or IntelSYCL's default
+  if(HYPRE_SYCL_TARGET_BACKEND)
+    target_compile_options(${PROJECT_NAME} PUBLIC $<$<COMPILE_LANGUAGE:CXX>:-Xsycl-target-backend=${HYPRE_SYCL_TARGET_BACKEND}>)
+    target_link_options(${PROJECT_NAME} PUBLIC -Xsycl-target-backend=${HYPRE_SYCL_TARGET_BACKEND})
+  elseif(INTEL_SYCL_BACKEND)
+    target_compile_options(${PROJECT_NAME} PUBLIC $<$<COMPILE_LANGUAGE:CXX>:-Xsycl-target-backend=${INTEL_SYCL_BACKEND}>)
+    target_link_options(${PROJECT_NAME} PUBLIC -Xsycl-target-backend=${INTEL_SYCL_BACKEND})
+  endif()
+endif()
+
+# Find Intel DPCT
+if(NOT DEFINED DPCTROOT)
+  if(DEFINED ENV{DPCTROOT})
+    set(DPCTROOT $ENV{DPCTROOT})
+  elseif(DEFINED ENV{DPCT_BUNDLE_ROOT})
+    set(DPCTROOT $ENV{DPCT_BUNDLE_ROOT})
+  elseif(DEFINED ENV{ONEAPI_ROOT} AND EXISTS "$ENV{ONEAPI_ROOT}/dpcpp-ct/latest")
+    set(DPCTROOT "$ENV{ONEAPI_ROOT}/dpcpp-ct/latest")
+  endif()
+endif()
+
+# Check if DPCT is found
+if(NOT EXISTS "${DPCTROOT}/include/dpct/dpct.hpp")
+  message(FATAL_ERROR "Could not find DPCT installation. Please set DPCTROOT")
+endif()
+
+# Add DPCT include directory
+target_include_directories(${PROJECT_NAME} PUBLIC "${DPCTROOT}/include")
+message(STATUS "DPCT include directory: ${DPCTROOT}/include")
+
+if (HYPRE_ENABLE_ONEMKLSPARSE)
+  set(HYPRE_USING_ONEMKLSPARSE ON CACHE BOOL "" FORCE)
+endif()
+
+if (HYPRE_ENABLE_ONEMKLBLAS)
+  set(HYPRE_USING_ONEMKLBLAS ON CACHE BOOL "" FORCE)
+endif()
+
+if (HYPRE_ENABLE_ONEMKLRAND)
+  set(HYPRE_USING_ONEMKLRAND ON CACHE BOOL "" FORCE)
+endif()
+
+# Setup MKL
+if (HYPRE_USING_ONEMKLSPARSE OR HYPRE_USING_ONEMKLBLAS OR HYPRE_USING_ONEMKLRAND)
+  # Find MKL
+  set(MKL_LINK dynamic)
+  set(MKL_THREADING sequential)
+  #set(ENABLE_TRY_SYCL_COMPILE ON) # This option slows down the build
+  find_package(MKL CONFIG REQUIRED HINTS "$ENV{MKLROOT}/lib/cmake/mkl")
+
+  # Add all required MKL components explicitly
+  target_link_libraries(${PROJECT_NAME}
+    PUBLIC
+    $<LINK_ONLY:MKL::MKL_SYCL::BLAS>
+    $<LINK_ONLY:MKL::MKL_SYCL::LAPACK>
+    $<LINK_ONLY:MKL::MKL_SYCL::SPARSE>
+    $<LINK_ONLY:MKL::MKL_SYCL::VM>
+    $<LINK_ONLY:MKL::MKL_SYCL::RNG>
+    $<LINK_ONLY:MKL::MKL_SYCL::STATS>
+    $<LINK_ONLY:MKL::MKL_SYCL::DATA_FITTING>
+  )
+
+  # Ensure compile options and include directories are properly propagated
+  target_compile_options(${PROJECT_NAME} PUBLIC
+    $<TARGET_PROPERTY:MKL::MKL,INTERFACE_COMPILE_OPTIONS>
+  )
+  target_include_directories(${PROJECT_NAME} PUBLIC
+    $<TARGET_PROPERTY:MKL::MKL,INTERFACE_INCLUDE_DIRECTORIES>
+  )
+endif()
diff --git a/external/hypre/src/config/config.guess b/external/hypre/src/config/config.guess
old mode 100644
new mode 100755
index 69ebd090..69188da7
--- a/external/hypre/src/config/config.guess
+++ b/external/hypre/src/config/config.guess
@@ -1,12 +1,14 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2016 Free Software Foundation, Inc.
+#   Copyright 1992-2023 Free Software Foundation, Inc.
 
-timestamp='2017-03-02'
+# shellcheck disable=SC2006,SC2268 # see below for rationale
+
+timestamp='2023-01-01'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
@@ -15,7 +17,7 @@ timestamp='2017-03-02'
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -27,11 +29,19 @@ timestamp='2017-03-02'
 # Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
 #
 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
+# https://git.savannah.gnu.org/cgit/config.git/plain/config.guess
 #
 # Please send patches to <config-patches@gnu.org>.
 
 
+# The "shellcheck disable" line above the timestamp inhibits complaints
+# about features and limitations of the classic Bourne shell that were
+# superseded or lifted in POSIX.  However, this script identifies a wide
+# variety of pre-POSIX systems that do not have POSIX shells at all, and
+# even some reasonably current systems (Solaris 10 as case-in-point) still
+# have a pre-POSIX /bin/sh.
+
+
 me=`echo "$0" | sed -e 's,.*/,,'`
 
 usage="\
@@ -39,7 +49,7 @@ Usage: $0 [OPTION]
 
 Output the configuration name of the system \`$me' is run on.
 
-Operation modes:
+Options:
   -h, --help         print this help, then exit
   -t, --time-stamp   print date of last modification, then exit
   -v, --version      print version number, then exit
@@ -50,7 +60,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2016 Free Software Foundation, Inc.
+Copyright 1992-2023 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -84,7 +94,8 @@ if test $# != 0; then
   exit 1
 fi
 
-trap 'exit 1' 1 2 15
+# Just in case it came from the environment.
+GUESS=
 
 # CC_FOR_BUILD -- compiler used by this script. Note that the use of a
 # compiler to aid in system detection is discouraged as it requires
@@ -96,66 +107,90 @@ trap 'exit 1' 1 2 15
 
 # Portable tmp directory creation inspired by the Autoconf team.
 
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > $dummy.c ;
-	for c in cc gcc c89 c99 ; do
-	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-	     CC_FOR_BUILD="$c"; break ;
-	  fi ;
-	done ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
+tmp=
+# shellcheck disable=SC2172
+trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15
+
+set_cc_for_build() {
+    # prevent multiple calls if $tmp is already set
+    test "$tmp" && return 0
+    : "${TMPDIR=/tmp}"
+    # shellcheck disable=SC2039,SC3028
+    { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+	{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } ||
+	{ tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+	{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; }
+    dummy=$tmp/dummy
+    case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in
+	,,)    echo "int x;" > "$dummy.c"
+	       for driver in cc gcc c89 c99 ; do
+		   if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
+		       CC_FOR_BUILD=$driver
+		       break
+		   fi
+	       done
+	       if test x"$CC_FOR_BUILD" = x ; then
+		   CC_FOR_BUILD=no_compiler_found
+	       fi
+	       ;;
+	,,*)   CC_FOR_BUILD=$CC ;;
+	,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+    esac
+}
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+if test -f /.attbin/uname ; then
 	PATH=$PATH:/.attbin ; export PATH
 fi
 
 UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
 UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
-case "${UNAME_SYSTEM}" in
+case $UNAME_SYSTEM in
 Linux|GNU|GNU/*)
-	# If the system lacks a compiler, then just pick glibc.
-	# We could probably try harder.
-	LIBC=gnu
+	LIBC=unknown
 
-	eval $set_cc_for_build
-	cat <<-EOF > $dummy.c
+	set_cc_for_build
+	cat <<-EOF > "$dummy.c"
 	#include <features.h>
 	#if defined(__UCLIBC__)
 	LIBC=uclibc
 	#elif defined(__dietlibc__)
 	LIBC=dietlibc
-	#else
+	#elif defined(__GLIBC__)
 	LIBC=gnu
+	#else
+	#include <stdarg.h>
+	/* First heuristic to detect musl libc.  */
+	#ifdef __DEFINED_va_list
+	LIBC=musl
+	#endif
 	#endif
 	EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
+	cc_set_libc=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
+	eval "$cc_set_libc"
+
+	# Second heuristic to detect musl libc.
+	if [ "$LIBC" = unknown ] &&
+	   command -v ldd >/dev/null &&
+	   ldd --version 2>&1 | grep -q ^musl; then
+		LIBC=musl
+	fi
+
+	# If the system lacks a compiler, then just pick glibc.
+	# We could probably try harder.
+	if [ "$LIBC" = unknown ]; then
+		LIBC=gnu
+	fi
 	;;
 esac
 
 # Note: order is significant - the case branches are not exclusive.
 
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in
     *:NetBSD:*:*)
 	# NetBSD (nbsd) targets should (where applicable) match one or
 	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
@@ -167,32 +202,32 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	#
 	# Note: NetBSD doesn't particularly care about the vendor
 	# portion of the name.  We always set it to "unknown".
-	sysctl="sysctl -n hw.machine_arch"
 	UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
-	    /sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || \
+	    /sbin/sysctl -n hw.machine_arch 2>/dev/null || \
+	    /usr/sbin/sysctl -n hw.machine_arch 2>/dev/null || \
 	    echo unknown)`
-	case "${UNAME_MACHINE_ARCH}" in
+	case $UNAME_MACHINE_ARCH in
+	    aarch64eb) machine=aarch64_be-unknown ;;
 	    armeb) machine=armeb-unknown ;;
 	    arm*) machine=arm-unknown ;;
 	    sh3el) machine=shl-unknown ;;
 	    sh3eb) machine=sh-unknown ;;
 	    sh5el) machine=sh5le-unknown ;;
 	    earmv*)
-		arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
-		endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'`
+		arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
+		endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'`
 		machine=${arch}${endian}-unknown
 		;;
-	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+	    *) machine=$UNAME_MACHINE_ARCH-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
 	# to ELF recently (or will in the future) and ABI.
-	case "${UNAME_MACHINE_ARCH}" in
+	case $UNAME_MACHINE_ARCH in
 	    earm*)
 		os=netbsdelf
 		;;
 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		eval $set_cc_for_build
+		set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
 			| grep -q __ELF__
 		then
@@ -208,10 +243,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		;;
 	esac
 	# Determine ABI tags.
-	case "${UNAME_MACHINE_ARCH}" in
+	case $UNAME_MACHINE_ARCH in
 	    earm*)
 		expr='s/^earmv[0-9]/-eabi/;s/eb$//'
-		abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
+		abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"`
 		;;
 	esac
 	# The OS release
@@ -219,47 +254,68 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# thus, need a distinct triplet. However, they do not need
 	# kernel version information, so it can be replaced with a
 	# suitable tag, in the style of linux-gnu.
-	case "${UNAME_VERSION}" in
+	case $UNAME_VERSION in
 	    Debian*)
 		release='-gnu'
 		;;
 	    *)
-		release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2`
+		release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2`
 		;;
 	esac
 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}${abi}"
-	exit ;;
+	GUESS=$machine-${os}${release}${abi-}
+	;;
     *:Bitrig:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
-	exit ;;
+	GUESS=$UNAME_MACHINE_ARCH-unknown-bitrig$UNAME_RELEASE
+	;;
     *:OpenBSD:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-	exit ;;
+	GUESS=$UNAME_MACHINE_ARCH-unknown-openbsd$UNAME_RELEASE
+	;;
+    *:SecBSD:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/SecBSD.//'`
+	GUESS=$UNAME_MACHINE_ARCH-unknown-secbsd$UNAME_RELEASE
+	;;
     *:LibertyBSD:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
-	exit ;;
+	GUESS=$UNAME_MACHINE_ARCH-unknown-libertybsd$UNAME_RELEASE
+	;;
+    *:MidnightBSD:*:*)
+	GUESS=$UNAME_MACHINE-unknown-midnightbsd$UNAME_RELEASE
+	;;
     *:ekkoBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-ekkobsd$UNAME_RELEASE
+	;;
     *:SolidBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-solidbsd$UNAME_RELEASE
+	;;
+    *:OS108:*:*)
+	GUESS=$UNAME_MACHINE-unknown-os108_$UNAME_RELEASE
+	;;
     macppc:MirBSD:*:*)
-	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
+	GUESS=powerpc-unknown-mirbsd$UNAME_RELEASE
+	;;
     *:MirBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-mirbsd$UNAME_RELEASE
+	;;
     *:Sortix:*:*)
-	echo ${UNAME_MACHINE}-unknown-sortix
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-sortix
+	;;
+    *:Twizzler:*:*)
+	GUESS=$UNAME_MACHINE-unknown-twizzler
+	;;
+    *:Redox:*:*)
+	GUESS=$UNAME_MACHINE-unknown-redox
+	;;
+    mips:OSF1:*.*)
+	GUESS=mips-dec-osf1
+	;;
     alpha:OSF1:*:*)
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+	trap '' 0
 	case $UNAME_RELEASE in
 	*4.0)
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
@@ -273,7 +329,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# covers most systems running today.  This code pipes the CPU
 	# types through head -n 1, so we only detect the type of CPU 0.
 	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-	case "$ALPHA_CPU_TYPE" in
+	case $ALPHA_CPU_TYPE in
 	    "EV4 (21064)")
 		UNAME_MACHINE=alpha ;;
 	    "EV4.5 (21064)")
@@ -310,126 +366,121 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# A Tn.n version is a released field test version.
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
-	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
-	exitcode=$?
-	trap '' 0
-	exit $exitcode ;;
-    Alpha\ *:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# Should we change UNAME_MACHINE based on the output of uname instead
-	# of the specific Alpha model?
-	echo alpha-pc-interix
-	exit ;;
-    21064:Windows_NT:50:3)
-	echo alpha-dec-winnt3.5
-	exit ;;
+	OSF_REL=`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
+	GUESS=$UNAME_MACHINE-dec-osf$OSF_REL
+	;;
     Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
-	exit ;;
+	GUESS=m68k-unknown-sysv4
+	;;
     *:[Aa]miga[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-amigaos
+	;;
     *:[Mm]orph[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-morphos
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-morphos
+	;;
     *:OS/390:*:*)
-	echo i370-ibm-openedition
-	exit ;;
+	GUESS=i370-ibm-openedition
+	;;
     *:z/VM:*:*)
-	echo s390-ibm-zvmoe
-	exit ;;
+	GUESS=s390-ibm-zvmoe
+	;;
     *:OS400:*:*)
-	echo powerpc-ibm-os400
-	exit ;;
+	GUESS=powerpc-ibm-os400
+	;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit ;;
+	GUESS=arm-acorn-riscix$UNAME_RELEASE
+	;;
     arm*:riscos:*:*|arm*:RISCOS:*:*)
-	echo arm-unknown-riscos
-	exit ;;
+	GUESS=arm-unknown-riscos
+	;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-	echo hppa1.1-hitachi-hiuxmpp
-	exit ;;
+	GUESS=hppa1.1-hitachi-hiuxmpp
+	;;
     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
 	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-		echo pyramid-pyramid-sysv3
-	else
-		echo pyramid-pyramid-bsd
-	fi
-	exit ;;
+	case `(/bin/universe) 2>/dev/null` in
+	    att) GUESS=pyramid-pyramid-sysv3 ;;
+	    *)   GUESS=pyramid-pyramid-bsd   ;;
+	esac
+	;;
     NILE*:*:*:dcosx)
-	echo pyramid-pyramid-svr4
-	exit ;;
+	GUESS=pyramid-pyramid-svr4
+	;;
     DRS?6000:unix:4.0:6*)
-	echo sparc-icl-nx6
-	exit ;;
+	GUESS=sparc-icl-nx6
+	;;
     DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
 	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7; exit ;;
-	esac ;;
+	    sparc) GUESS=sparc-icl-nx7 ;;
+	esac
+	;;
     s390x:SunOS:*:*)
-	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
+	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`
+	GUESS=$UNAME_MACHINE-ibm-solaris2$SUN_REL
+	;;
     sun4H:SunOS:5.*:*)
-	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
+	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`
+	GUESS=sparc-hal-solaris2$SUN_REL
+	;;
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
+	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`
+	GUESS=sparc-sun-solaris2$SUN_REL
+	;;
     i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
-	echo i386-pc-auroraux${UNAME_RELEASE}
-	exit ;;
+	GUESS=i386-pc-auroraux$UNAME_RELEASE
+	;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-	eval $set_cc_for_build
+	set_cc_for_build
 	SUN_ARCH=i386
 	# If there is a compiler, see if it is configured for 64-bit objects.
 	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
 	# This test works for both compilers.
-	if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
+	if test "$CC_FOR_BUILD" != no_compiler_found; then
 	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+		(CCOPTS="" $CC_FOR_BUILD -m64 -E - 2>/dev/null) | \
 		grep IS_64BIT_ARCH >/dev/null
 	    then
 		SUN_ARCH=x86_64
 	    fi
 	fi
-	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
+	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`
+	GUESS=$SUN_ARCH-pc-solaris2$SUN_REL
+	;;
     sun4*:SunOS:6*:*)
 	# According to config.sub, this is the proper way to canonicalize
 	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
 	# it's likely to be more like Solaris than SunOS4.
-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
+	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`
+	GUESS=sparc-sun-solaris3$SUN_REL
+	;;
     sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
+	case `/usr/bin/arch -k` in
 	    Series*|S4*)
 		UNAME_RELEASE=`uname -v`
 		;;
 	esac
 	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit ;;
+	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/'`
+	GUESS=sparc-sun-sunos$SUN_REL
+	;;
     sun3*:SunOS:*:*)
-	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit ;;
+	GUESS=m68k-sun-sunos$UNAME_RELEASE
+	;;
     sun*:*:4.2BSD:*)
 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3
-	case "`/bin/arch`" in
+	test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3
+	case `/bin/arch` in
 	    sun3)
-		echo m68k-sun-sunos${UNAME_RELEASE}
+		GUESS=m68k-sun-sunos$UNAME_RELEASE
 		;;
 	    sun4)
-		echo sparc-sun-sunos${UNAME_RELEASE}
+		GUESS=sparc-sun-sunos$UNAME_RELEASE
 		;;
 	esac
-	exit ;;
+	;;
     aushp:SunOS:*:*)
-	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit ;;
+	GUESS=sparc-auspex-sunos$UNAME_RELEASE
+	;;
     # The situation for MiNT is a little confusing.  The machine name
     # can be virtually everything (everything which is not
     # "atarist" or "atariste" at least should have a processor
@@ -439,44 +490,44 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     # MiNT.  But MiNT is downward compatible to TOS, so this should
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
+	GUESS=m68k-atari-mint$UNAME_RELEASE
+	;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
+	GUESS=m68k-atari-mint$UNAME_RELEASE
+	;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
+	GUESS=m68k-atari-mint$UNAME_RELEASE
+	;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-	echo m68k-milan-mint${UNAME_RELEASE}
-	exit ;;
+	GUESS=m68k-milan-mint$UNAME_RELEASE
+	;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-	echo m68k-hades-mint${UNAME_RELEASE}
-	exit ;;
+	GUESS=m68k-hades-mint$UNAME_RELEASE
+	;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-	echo m68k-unknown-mint${UNAME_RELEASE}
-	exit ;;
+	GUESS=m68k-unknown-mint$UNAME_RELEASE
+	;;
     m68k:machten:*:*)
-	echo m68k-apple-machten${UNAME_RELEASE}
-	exit ;;
+	GUESS=m68k-apple-machten$UNAME_RELEASE
+	;;
     powerpc:machten:*:*)
-	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit ;;
+	GUESS=powerpc-apple-machten$UNAME_RELEASE
+	;;
     RISC*:Mach:*:*)
-	echo mips-dec-mach_bsd4.3
-	exit ;;
+	GUESS=mips-dec-mach_bsd4.3
+	;;
     RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit ;;
+	GUESS=mips-dec-ultrix$UNAME_RELEASE
+	;;
     VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit ;;
+	GUESS=vax-dec-ultrix$UNAME_RELEASE
+	;;
     2020:CLIX:*:* | 2430:CLIX:*:*)
-	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit ;;
+	GUESS=clipper-intergraph-clix$UNAME_RELEASE
+	;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
+	set_cc_for_build
+	sed 's/^	//' << EOF > "$dummy.c"
 #ifdef __cplusplus
 #include <stdio.h>  /* for printf() prototype */
 	int main (int argc, char *argv[]) {
@@ -485,95 +536,96 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 #endif
 	#if defined (host_mips) && defined (MIPSEB)
 	#if defined (SYSTYPE_SYSV)
-	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+	  printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0);
 	#endif
 	#if defined (SYSTYPE_SVR4)
-	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+	  printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0);
 	#endif
 	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+	  printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0);
 	#endif
 	#endif
 	  exit (-1);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c &&
-	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-	  SYSTEM_NAME=`$dummy $dummyarg` &&
+	$CC_FOR_BUILD -o "$dummy" "$dummy.c" &&
+	  dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+	  SYSTEM_NAME=`"$dummy" "$dummyarg"` &&
 	    { echo "$SYSTEM_NAME"; exit; }
-	echo mips-mips-riscos${UNAME_RELEASE}
-	exit ;;
+	GUESS=mips-mips-riscos$UNAME_RELEASE
+	;;
     Motorola:PowerMAX_OS:*:*)
-	echo powerpc-motorola-powermax
-	exit ;;
+	GUESS=powerpc-motorola-powermax
+	;;
     Motorola:*:4.3:PL8-*)
-	echo powerpc-harris-powermax
-	exit ;;
+	GUESS=powerpc-harris-powermax
+	;;
     Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-	echo powerpc-harris-powermax
-	exit ;;
+	GUESS=powerpc-harris-powermax
+	;;
     Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit ;;
+	GUESS=powerpc-harris-powerunix
+	;;
     m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit ;;
+	GUESS=m88k-harris-cxux7
+	;;
     m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit ;;
+	GUESS=m88k-motorola-sysv4
+	;;
     m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit ;;
+	GUESS=m88k-motorola-sysv3
+	;;
     AViiON:dgux:*:*)
 	# DG/UX returns AViiON for all architectures
 	UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+	if test "$UNAME_PROCESSOR" = mc88100 || test "$UNAME_PROCESSOR" = mc88110
 	then
-	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-	       [ ${TARGET_BINARY_INTERFACE}x = x ]
+	    if test "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx || \
+	       test "$TARGET_BINARY_INTERFACE"x = x
 	    then
-		echo m88k-dg-dgux${UNAME_RELEASE}
+		GUESS=m88k-dg-dgux$UNAME_RELEASE
 	    else
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
+		GUESS=m88k-dg-dguxbcs$UNAME_RELEASE
 	    fi
 	else
-	    echo i586-dg-dgux${UNAME_RELEASE}
+	    GUESS=i586-dg-dgux$UNAME_RELEASE
 	fi
-	exit ;;
+	;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit ;;
+	GUESS=m88k-dolphin-sysv3
+	;;
     M88*:*:R3*:*)
 	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit ;;
+	GUESS=m88k-motorola-sysv3
+	;;
     XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit ;;
+	GUESS=m88k-tektronix-sysv3
+	;;
     Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit ;;
+	GUESS=m68k-tektronix-bsd
+	;;
     *:IRIX*:*:*)
-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit ;;
+	IRIX_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/g'`
+	GUESS=mips-sgi-irix$IRIX_REL
+	;;
     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
-	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
+	GUESS=romp-ibm-aix    # uname -m gives an 8 hex-code CPU id
+	;;                    # Note that: echo "'`uname -s`'" gives 'AIX '
     i*86:AIX:*:*)
-	echo i386-ibm-aix
-	exit ;;
+	GUESS=i386-ibm-aix
+	;;
     ia64:AIX:*:*)
-	if [ -x /usr/bin/oslevel ] ; then
+	if test -x /usr/bin/oslevel ; then
 		IBM_REV=`/usr/bin/oslevel`
 	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+		IBM_REV=$UNAME_VERSION.$UNAME_RELEASE
 	fi
-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit ;;
+	GUESS=$UNAME_MACHINE-ibm-aix$IBM_REV
+	;;
     *:AIX:2:3)
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		eval $set_cc_for_build
-		sed 's/^		//' << EOF >$dummy.c
+		set_cc_for_build
+		sed 's/^		//' << EOF > "$dummy.c"
 		#include <sys/systemcfg.h>
 
 		main()
@@ -584,77 +636,77 @@ EOF
 			exit(0);
 			}
 EOF
-		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+		if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"`
 		then
-			echo "$SYSTEM_NAME"
+			GUESS=$SYSTEM_NAME
 		else
-			echo rs6000-ibm-aix3.2.5
+			GUESS=rs6000-ibm-aix3.2.5
 		fi
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
+		GUESS=rs6000-ibm-aix3.2.4
 	else
-		echo rs6000-ibm-aix3.2
+		GUESS=rs6000-ibm-aix3.2
 	fi
-	exit ;;
+	;;
     *:AIX:*:[4567])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+	if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
 	else
 		IBM_ARCH=powerpc
 	fi
-	if [ -x /usr/bin/lslpp ] ; then
-		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
+	if test -x /usr/bin/lslpp ; then
+		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | \
 			   awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
 	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+		IBM_REV=$UNAME_VERSION.$UNAME_RELEASE
 	fi
-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit ;;
+	GUESS=$IBM_ARCH-ibm-aix$IBM_REV
+	;;
     *:AIX:*:*)
-	echo rs6000-ibm-aix
-	exit ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-	echo romp-ibm-bsd4.4
-	exit ;;
+	GUESS=rs6000-ibm-aix
+	;;
+    ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*)
+	GUESS=romp-ibm-bsd4.4
+	;;
     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit ;;                             # report: romp-ibm BSD 4.3
+	GUESS=romp-ibm-bsd$UNAME_RELEASE    # 4.3 with uname added to
+	;;                                  # report: romp-ibm BSD 4.3
     *:BOSX:*:*)
-	echo rs6000-bull-bosx
-	exit ;;
+	GUESS=rs6000-bull-bosx
+	;;
     DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit ;;
+	GUESS=m68k-bull-sysv3
+	;;
     9000/[34]??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit ;;
+	GUESS=m68k-hp-bsd
+	;;
     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-	echo m68k-hp-bsd4.4
-	exit ;;
+	GUESS=m68k-hp-bsd4.4
+	;;
     9000/[34678]??:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	case "${UNAME_MACHINE}" in
-	    9000/31? )            HP_ARCH=m68000 ;;
-	    9000/[34]?? )         HP_ARCH=m68k ;;
+	HPUX_REV=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*.[0B]*//'`
+	case $UNAME_MACHINE in
+	    9000/31?)            HP_ARCH=m68000 ;;
+	    9000/[34]??)         HP_ARCH=m68k ;;
 	    9000/[678][0-9][0-9])
-		if [ -x /usr/bin/getconf ]; then
+		if test -x /usr/bin/getconf; then
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
 		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-		    case "${sc_cpu_version}" in
+		    case $sc_cpu_version in
 		      523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
 		      528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
 		      532)                      # CPU_PA_RISC2_0
-			case "${sc_kernel_bits}" in
+			case $sc_kernel_bits in
 			  32) HP_ARCH=hppa2.0n ;;
 			  64) HP_ARCH=hppa2.0w ;;
 			  '') HP_ARCH=hppa2.0 ;;   # HP-UX 10.20
 			esac ;;
 		    esac
 		fi
-		if [ "${HP_ARCH}" = "" ]; then
-		    eval $set_cc_for_build
-		    sed 's/^		//' << EOF >$dummy.c
+		if test "$HP_ARCH" = ""; then
+		    set_cc_for_build
+		    sed 's/^		//' << EOF > "$dummy.c"
 
 		#define _HPUX_SOURCE
 		#include <stdlib.h>
@@ -687,13 +739,13 @@ EOF
 		    exit (0);
 		}
 EOF
-		    (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+		    (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"`
 		    test -z "$HP_ARCH" && HP_ARCH=hppa
 		fi ;;
 	esac
-	if [ ${HP_ARCH} = hppa2.0w ]
+	if test "$HP_ARCH" = hppa2.0w
 	then
-	    eval $set_cc_for_build
+	    set_cc_for_build
 
 	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
 	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
@@ -712,15 +764,15 @@ EOF
 		HP_ARCH=hppa64
 	    fi
 	fi
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit ;;
+	GUESS=$HP_ARCH-hp-hpux$HPUX_REV
+	;;
     ia64:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	echo ia64-hp-hpux${HPUX_REV}
-	exit ;;
+	HPUX_REV=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*.[0B]*//'`
+	GUESS=ia64-hp-hpux$HPUX_REV
+	;;
     3050*:HI-UX:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
+	set_cc_for_build
+	sed 's/^	//' << EOF > "$dummy.c"
 	#include <unistd.h>
 	int
 	main ()
@@ -745,38 +797,38 @@ EOF
 	  exit (0);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+	$CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` &&
 		{ echo "$SYSTEM_NAME"; exit; }
-	echo unknown-hitachi-hiuxwe2
-	exit ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-	echo hppa1.1-hp-bsd
-	exit ;;
+	GUESS=unknown-hitachi-hiuxwe2
+	;;
+    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*)
+	GUESS=hppa1.1-hp-bsd
+	;;
     9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit ;;
+	GUESS=hppa1.0-hp-bsd
+	;;
     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-	echo hppa1.0-hp-mpeix
-	exit ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-	echo hppa1.1-hp-osf
-	exit ;;
+	GUESS=hppa1.0-hp-mpeix
+	;;
+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*)
+	GUESS=hppa1.1-hp-osf
+	;;
     hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit ;;
+	GUESS=hppa1.0-hp-osf
+	;;
     i*86:OSF1:*:*)
-	if [ -x /usr/sbin/sysversion ] ; then
-	    echo ${UNAME_MACHINE}-unknown-osf1mk
+	if test -x /usr/sbin/sysversion ; then
+	    GUESS=$UNAME_MACHINE-unknown-osf1mk
 	else
-	    echo ${UNAME_MACHINE}-unknown-osf1
+	    GUESS=$UNAME_MACHINE-unknown-osf1
 	fi
-	exit ;;
+	;;
     parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit ;;
+	GUESS=hppa1.1-hp-lites
+	;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
-	exit ;;
+	GUESS=c1-convex-bsd
+	;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
@@ -784,139 +836,154 @@ EOF
 	fi
 	exit ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
-	exit ;;
+	GUESS=c34-convex-bsd
+	;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
-	exit ;;
+	GUESS=c38-convex-bsd
+	;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
-	exit ;;
+	GUESS=c4-convex-bsd
+	;;
     CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
+	CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'`
+	GUESS=ymp-cray-unicos$CRAY_REL
+	;;
     CRAY*[A-Z]90:*:*:*)
-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+	echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \
 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
 	      -e 's/\.[^.]*$/.X/'
 	exit ;;
     CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
+	CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'`
+	GUESS=t90-cray-unicos$CRAY_REL
+	;;
     CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
+	CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'`
+	GUESS=alphaev5-cray-unicosmk$CRAY_REL
+	;;
     CRAY*SV1:*:*:*)
-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
+	CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'`
+	GUESS=sv1-cray-unicos$CRAY_REL
+	;;
     *:UNICOS/mp:*:*)
-	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
+	CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'`
+	GUESS=craynv-cray-unicosmp$CRAY_REL
+	;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
 	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
-	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
+	FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'`
+	GUESS=${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}
+	;;
     5000:UNIX_System_V:4.*:*)
 	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
-	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
-	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
+	FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
+	GUESS=sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}
+	;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-bsdi$UNAME_RELEASE
+	;;
     sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
+	GUESS=sparc-unknown-bsdi$UNAME_RELEASE
+	;;
     *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-bsdi$UNAME_RELEASE
+	;;
+    arm:FreeBSD:*:*)
+	UNAME_PROCESSOR=`uname -p`
+	set_cc_for_build
+	if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_PCS_VFP
+	then
+	    FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
+	    GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabi
+	else
+	    FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
+	    GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabihf
+	fi
+	;;
     *:FreeBSD:*:*)
 	UNAME_PROCESSOR=`/usr/bin/uname -p`
-	case ${UNAME_PROCESSOR} in
+	case $UNAME_PROCESSOR in
 	    amd64)
-		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	    *)
-		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+		UNAME_PROCESSOR=x86_64 ;;
+	    i386)
+		UNAME_PROCESSOR=i586 ;;
 	esac
-	exit ;;
+	FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
+	GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL
+	;;
     i*:CYGWIN*:*)
-	echo ${UNAME_MACHINE}-pc-cygwin
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-cygwin
+	;;
     *:MINGW64*:*)
-	echo ${UNAME_MACHINE}-pc-mingw64
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-mingw64
+	;;
     *:MINGW*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-mingw32
+	;;
     *:MSYS*:*)
-	echo ${UNAME_MACHINE}-pc-msys
-	exit ;;
-    i*:windows32*:*)
-	# uname -m includes "-pc" on this system.
-	echo ${UNAME_MACHINE}-mingw32
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-msys
+	;;
     i*:PW*:*)
-	echo ${UNAME_MACHINE}-pc-pw32
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-pw32
+	;;
+    *:SerenityOS:*:*)
+        GUESS=$UNAME_MACHINE-pc-serenity
+        ;;
     *:Interix*:*)
-	case ${UNAME_MACHINE} in
+	case $UNAME_MACHINE in
 	    x86)
-		echo i586-pc-interix${UNAME_RELEASE}
-		exit ;;
+		GUESS=i586-pc-interix$UNAME_RELEASE
+		;;
 	    authenticamd | genuineintel | EM64T)
-		echo x86_64-unknown-interix${UNAME_RELEASE}
-		exit ;;
+		GUESS=x86_64-unknown-interix$UNAME_RELEASE
+		;;
 	    IA64)
-		echo ia64-unknown-interix${UNAME_RELEASE}
-		exit ;;
+		GUESS=ia64-unknown-interix$UNAME_RELEASE
+		;;
 	esac ;;
-    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-	echo i${UNAME_MACHINE}-pc-mks
-	exit ;;
-    8664:Windows_NT:*)
-	echo x86_64-pc-mks
-	exit ;;
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i586-pc-interix
-	exit ;;
     i*:UWIN*:*)
-	echo ${UNAME_MACHINE}-pc-uwin
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-uwin
+	;;
     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-	echo x86_64-unknown-cygwin
-	exit ;;
-    p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin
-	exit ;;
+	GUESS=x86_64-pc-cygwin
+	;;
     prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
+	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`
+	GUESS=powerpcle-unknown-solaris2$SUN_REL
+	;;
     *:GNU:*:*)
 	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit ;;
+	GNU_ARCH=`echo "$UNAME_MACHINE" | sed -e 's,[-/].*$,,'`
+	GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's,/.*$,,'`
+	GUESS=$GNU_ARCH-unknown-$LIBC$GNU_REL
+	;;
     *:GNU/*:*:*)
 	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
-	exit ;;
-    i*86:Minix:*:*)
-	echo ${UNAME_MACHINE}-pc-minix
-	exit ;;
-    aarch64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
+	GNU_SYS=`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"`
+	GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
+	GUESS=$UNAME_MACHINE-unknown-$GNU_SYS$GNU_REL-$LIBC
+	;;
+    x86_64:[Mm]anagarm:*:*|i?86:[Mm]anagarm:*:*)
+	GUESS="$UNAME_MACHINE-pc-managarm-mlibc"
+	;;
+    *:[Mm]anagarm:*:*)
+	GUESS="$UNAME_MACHINE-unknown-managarm-mlibc"
+	;;
+    *:Minix:*:*)
+	GUESS=$UNAME_MACHINE-unknown-minix
+	;;
+    aarch64:Linux:*:*)
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
     aarch64_be:Linux:*:*)
 	UNAME_MACHINE=aarch64_be
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
     alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null` in
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
 	  EV56)  UNAME_MACHINE=alphaev56 ;;
 	  PCA56) UNAME_MACHINE=alphapca56 ;;
@@ -927,199 +994,236 @@ EOF
 	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
 	if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    arc:Linux:*:* | arceb:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
+    arc:Linux:*:* | arceb:Linux:*:* | arc32:Linux:*:* | arc64:Linux:*:*)
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
     arm*:Linux:*:*)
-	eval $set_cc_for_build
+	set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 	    | grep -q __ARM_EABI__
 	then
-	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	    GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
 	else
 	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
 		| grep -q __ARM_PCS_VFP
 	    then
-		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
+		GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabi
 	    else
-		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
+		GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabihf
 	    fi
 	fi
-	exit ;;
+	;;
     avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
     cris:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-axis-linux-$LIBC
+	;;
     crisv32:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-axis-linux-$LIBC
+	;;
     e2k:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
     frv:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
     hexagon:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
     i*86:Linux:*:*)
-	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-linux-$LIBC
+	;;
     ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
     k1om:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
+    loongarch32:Linux:*:* | loongarch64:Linux:*:*)
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
     m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
     m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
     mips:Linux:*:* | mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
+	set_cc_for_build
+	IS_GLIBC=0
+	test x"${LIBC}" = xgnu && IS_GLIBC=1
+	sed 's/^	//' << EOF > "$dummy.c"
 	#undef CPU
-	#undef ${UNAME_MACHINE}
-	#undef ${UNAME_MACHINE}el
+	#undef mips
+	#undef mipsel
+	#undef mips64
+	#undef mips64el
+	#if ${IS_GLIBC} && defined(_ABI64)
+	LIBCABI=gnuabi64
+	#else
+	#if ${IS_GLIBC} && defined(_ABIN32)
+	LIBCABI=gnuabin32
+	#else
+	LIBCABI=${LIBC}
+	#endif
+	#endif
+
+	#if ${IS_GLIBC} && defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6
+	CPU=mipsisa64r6
+	#else
+	#if ${IS_GLIBC} && !defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6
+	CPU=mipsisa32r6
+	#else
+	#if defined(__mips64)
+	CPU=mips64
+	#else
+	CPU=mips
+	#endif
+	#endif
+	#endif
+
 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=${UNAME_MACHINE}el
+	MIPS_ENDIAN=el
 	#else
 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=${UNAME_MACHINE}
+	MIPS_ENDIAN=
 	#else
-	CPU=
+	MIPS_ENDIAN=
 	#endif
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
+	cc_set_vars=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI'`
+	eval "$cc_set_vars"
+	test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; }
 	;;
     mips64el:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
     openrisc*:Linux:*:*)
-	echo or1k-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=or1k-unknown-linux-$LIBC
+	;;
     or32:Linux:*:* | or1k*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    ppc64le:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-    padre:Linux:*:*
-	echo sparc-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
+    padre:Linux:*:*)
+	GUESS=sparc-unknown-linux-$LIBC
+	;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=hppa64-unknown-linux-$LIBC
+	;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
-	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
-	  *)    echo hppa-unknown-linux-${LIBC} ;;
+	  PA7*) GUESS=hppa1.1-unknown-linux-$LIBC ;;
+	  PA8*) GUESS=hppa2.0-unknown-linux-$LIBC ;;
+	  *)    GUESS=hppa-unknown-linux-$LIBC ;;
 	esac
-	exit ;;
+	;;
     ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=powerpc64-unknown-linux-$LIBC
+	;;
     ppc:Linux:*:*)
-	echo powerpc-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=powerpc-unknown-linux-$LIBC
+	;;
     ppc64le:Linux:*:*)
-	echo powerpc64le-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=powerpc64le-unknown-linux-$LIBC
+	;;
     ppcle:Linux:*:*)
-	echo powerpcle-unknown-linux-${LIBC}
-	exit ;;
-    riscv32:Linux:*:* | riscv64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=powerpcle-unknown-linux-$LIBC
+	;;
+    riscv32:Linux:*:* | riscv32be:Linux:*:* | riscv64:Linux:*:* | riscv64be:Linux:*:*)
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
     s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-ibm-linux-$LIBC
+	;;
     sh64*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
     sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
     tile*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
     vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-dec-linux-$LIBC
+	;;
     x86_64:Linux:*:*)
-	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
-	exit ;;
+	set_cc_for_build
+	CPU=$UNAME_MACHINE
+	LIBCABI=$LIBC
+	if test "$CC_FOR_BUILD" != no_compiler_found; then
+	    ABI=64
+	    sed 's/^	    //' << EOF > "$dummy.c"
+	    #ifdef __i386__
+	    ABI=x86
+	    #else
+	    #ifdef __ILP32__
+	    ABI=x32
+	    #endif
+	    #endif
+EOF
+	    cc_set_abi=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^ABI' | sed 's, ,,g'`
+	    eval "$cc_set_abi"
+	    case $ABI in
+		x86) CPU=i686 ;;
+		x32) LIBCABI=${LIBC}x32 ;;
+	    esac
+	fi
+	GUESS=$CPU-pc-linux-$LIBCABI
+	;;
     xtensa*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 	# earlier versions are messed up and put the nodename in both
 	# sysname and nodename.
-	echo i386-sequent-sysv4
-	exit ;;
+	GUESS=i386-sequent-sysv4
+	;;
     i*86:UNIX_SV:4.2MP:2.*)
 	# Unixware is an offshoot of SVR4, but it has its own version
 	# number series starting with 2...
 	# I am not positive that other SVR4 systems won't match this,
 	# I just have to hope.  -- rms.
 	# Use sysv4.2uw... so that sysv4* matches it.
-	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-sysv4.2uw$UNAME_VERSION
+	;;
     i*86:OS/2:*:*)
 	# If we were able to find `uname', then EMX Unix compatibility
 	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-os2-emx
+	;;
     i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-stop
+	;;
     i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-unknown-atheos
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-atheos
+	;;
     i*86:syllable:*:*)
-	echo ${UNAME_MACHINE}-pc-syllable
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-syllable
+	;;
     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
+	GUESS=i386-unknown-lynxos$UNAME_RELEASE
+	;;
     i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit ;;
-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+	GUESS=$UNAME_MACHINE-pc-msdosdjgpp
+	;;
+    i*86:*:4.*:*)
+	UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'`
 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+		GUESS=$UNAME_MACHINE-univel-sysv$UNAME_REL
 	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+		GUESS=$UNAME_MACHINE-pc-sysv$UNAME_REL
 	fi
-	exit ;;
+	;;
     i*86:*:5:[678]*)
 	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 	case `/bin/uname -X | grep "^Machine"` in
@@ -1127,12 +1231,12 @@ EOF
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
 	esac
-	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+	;;
     i*86:*:3.2:*)
 	if test -f /usr/options/cb.name; then
 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+		GUESS=$UNAME_MACHINE-pc-isc$UNAME_REL
 	elif /bin/uname -X 2>/dev/null >/dev/null ; then
 		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
 		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
@@ -1142,11 +1246,11 @@ EOF
 			&& UNAME_MACHINE=i686
 		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
 			&& UNAME_MACHINE=i686
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+		GUESS=$UNAME_MACHINE-pc-sco$UNAME_REL
 	else
-		echo ${UNAME_MACHINE}-pc-sysv32
+		GUESS=$UNAME_MACHINE-pc-sysv32
 	fi
-	exit ;;
+	;;
     pc:*:*:*)
 	# Left here for compatibility:
 	# uname -m prints for DJGPP always 'pc', but it prints nothing about
@@ -1154,31 +1258,31 @@ EOF
 	# Note: whatever this is, it MUST be the same as what config.sub
 	# prints for the "djgpp" host, or else GDB configure will decide that
 	# this is a cross-build.
-	echo i586-pc-msdosdjgpp
-	exit ;;
+	GUESS=i586-pc-msdosdjgpp
+	;;
     Intel:Mach:3*:*)
-	echo i386-pc-mach3
-	exit ;;
+	GUESS=i386-pc-mach3
+	;;
     paragon:*:*:*)
-	echo i860-intel-osf1
-	exit ;;
+	GUESS=i860-intel-osf1
+	;;
     i860:*:4.*:*) # i860-SVR4
 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+	  GUESS=i860-stardent-sysv$UNAME_RELEASE    # Stardent Vistra i860-SVR4
 	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
+	  GUESS=i860-unknown-sysv$UNAME_RELEASE     # Unknown i860-SVR4
 	fi
-	exit ;;
+	;;
     mini*:CTIX:SYS*5:*)
 	# "miniframe"
-	echo m68010-convergent-sysv
-	exit ;;
+	GUESS=m68010-convergent-sysv
+	;;
     mc68k:UNIX:SYSTEM5:3.51m)
-	echo m68k-convergent-sysv
-	exit ;;
+	GUESS=m68k-convergent-sysv
+	;;
     M680?0:D-NIX:5.3:*)
-	echo m68k-diab-dnix
-	exit ;;
+	GUESS=m68k-diab-dnix
+	;;
     M68*:*:R3V[5678]*:*)
 	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
     3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
@@ -1186,9 +1290,9 @@ EOF
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	  && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+	  && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
 	  && { echo i486-ncr-sysv4; exit; } ;;
@@ -1197,249 +1301,440 @@ EOF
 	test -r /etc/.relid \
 	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	    && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+	    && { echo i586-ncr-sysv4.3"$OS_REL"; exit; }
 	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
-	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+	    && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
+	GUESS=m68k-unknown-lynxos$UNAME_RELEASE
+	;;
     mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit ;;
+	GUESS=m68k-atari-sysv4
+	;;
     TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
+	GUESS=sparc-unknown-lynxos$UNAME_RELEASE
+	;;
     rs6000:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
+	GUESS=rs6000-unknown-lynxos$UNAME_RELEASE
+	;;
     PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
+	GUESS=powerpc-unknown-lynxos$UNAME_RELEASE
+	;;
     SM[BE]S:UNIX_SV:*:*)
-	echo mips-dde-sysv${UNAME_RELEASE}
-	exit ;;
+	GUESS=mips-dde-sysv$UNAME_RELEASE
+	;;
     RM*:ReliantUNIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
+	GUESS=mips-sni-sysv4
+	;;
     RM*:SINIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
+	GUESS=mips-sni-sysv4
+	;;
     *:SINIX-*:*:*)
 	if uname -p 2>/dev/null >/dev/null ; then
 		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo ${UNAME_MACHINE}-sni-sysv4
+		GUESS=$UNAME_MACHINE-sni-sysv4
 	else
-		echo ns32k-sni-sysv
+		GUESS=ns32k-sni-sysv
 	fi
-	exit ;;
+	;;
     PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
 			# says <Richard.M.Bartel@ccMail.Census.GOV>
-	echo i586-unisys-sysv4
-	exit ;;
+	GUESS=i586-unisys-sysv4
+	;;
     *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes@openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
-	echo hppa1.1-stratus-sysv4
-	exit ;;
+	GUESS=hppa1.1-stratus-sysv4
+	;;
     *:*:*:FTX*)
 	# From seanf@swdc.stratus.com.
-	echo i860-stratus-sysv4
-	exit ;;
+	GUESS=i860-stratus-sysv4
+	;;
     i*86:VOS:*:*)
 	# From Paul.Green@stratus.com.
-	echo ${UNAME_MACHINE}-stratus-vos
-	exit ;;
+	GUESS=$UNAME_MACHINE-stratus-vos
+	;;
     *:VOS:*:*)
 	# From Paul.Green@stratus.com.
-	echo hppa1.1-stratus-vos
-	exit ;;
+	GUESS=hppa1.1-stratus-vos
+	;;
     mc68*:A/UX:*:*)
-	echo m68k-apple-aux${UNAME_RELEASE}
-	exit ;;
+	GUESS=m68k-apple-aux$UNAME_RELEASE
+	;;
     news*:NEWS-OS:6*:*)
-	echo mips-sony-newsos6
-	exit ;;
+	GUESS=mips-sony-newsos6
+	;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-	if [ -d /usr/nec ]; then
-		echo mips-nec-sysv${UNAME_RELEASE}
+	if test -d /usr/nec; then
+		GUESS=mips-nec-sysv$UNAME_RELEASE
 	else
-		echo mips-unknown-sysv${UNAME_RELEASE}
+		GUESS=mips-unknown-sysv$UNAME_RELEASE
 	fi
-	exit ;;
+	;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-	echo powerpc-be-beos
-	exit ;;
+	GUESS=powerpc-be-beos
+	;;
     BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-	echo powerpc-apple-beos
-	exit ;;
+	GUESS=powerpc-apple-beos
+	;;
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-	echo i586-pc-beos
-	exit ;;
+	GUESS=i586-pc-beos
+	;;
     BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
-	echo i586-pc-haiku
-	exit ;;
-    x86_64:Haiku:*:*)
-	echo x86_64-unknown-haiku
-	exit ;;
+	GUESS=i586-pc-haiku
+	;;
+    ppc:Haiku:*:*)	# Haiku running on Apple PowerPC
+	GUESS=powerpc-apple-haiku
+	;;
+    *:Haiku:*:*)	# Haiku modern gcc (not bound by BeOS compat)
+	GUESS=$UNAME_MACHINE-unknown-haiku
+	;;
     SX-4:SUPER-UX:*:*)
-	echo sx4-nec-superux${UNAME_RELEASE}
-	exit ;;
+	GUESS=sx4-nec-superux$UNAME_RELEASE
+	;;
     SX-5:SUPER-UX:*:*)
-	echo sx5-nec-superux${UNAME_RELEASE}
-	exit ;;
+	GUESS=sx5-nec-superux$UNAME_RELEASE
+	;;
     SX-6:SUPER-UX:*:*)
-	echo sx6-nec-superux${UNAME_RELEASE}
-	exit ;;
+	GUESS=sx6-nec-superux$UNAME_RELEASE
+	;;
     SX-7:SUPER-UX:*:*)
-	echo sx7-nec-superux${UNAME_RELEASE}
-	exit ;;
+	GUESS=sx7-nec-superux$UNAME_RELEASE
+	;;
     SX-8:SUPER-UX:*:*)
-	echo sx8-nec-superux${UNAME_RELEASE}
-	exit ;;
+	GUESS=sx8-nec-superux$UNAME_RELEASE
+	;;
     SX-8R:SUPER-UX:*:*)
-	echo sx8r-nec-superux${UNAME_RELEASE}
-	exit ;;
+	GUESS=sx8r-nec-superux$UNAME_RELEASE
+	;;
     SX-ACE:SUPER-UX:*:*)
-	echo sxace-nec-superux${UNAME_RELEASE}
-	exit ;;
+	GUESS=sxace-nec-superux$UNAME_RELEASE
+	;;
     Power*:Rhapsody:*:*)
-	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
+	GUESS=powerpc-apple-rhapsody$UNAME_RELEASE
+	;;
     *:Rhapsody:*:*)
-	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
+	GUESS=$UNAME_MACHINE-apple-rhapsody$UNAME_RELEASE
+	;;
+    arm64:Darwin:*:*)
+	GUESS=aarch64-apple-darwin$UNAME_RELEASE
+	;;
     *:Darwin:*:*)
-	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	eval $set_cc_for_build
-	if test "$UNAME_PROCESSOR" = unknown ; then
-	    UNAME_PROCESSOR=powerpc
+	UNAME_PROCESSOR=`uname -p`
+	case $UNAME_PROCESSOR in
+	    unknown) UNAME_PROCESSOR=powerpc ;;
+	esac
+	if command -v xcode-select > /dev/null 2> /dev/null && \
+		! xcode-select --print-path > /dev/null 2> /dev/null ; then
+	    # Avoid executing cc if there is no toolchain installed as
+	    # cc will be a stub that puts up a graphical alert
+	    # prompting the user to install developer tools.
+	    CC_FOR_BUILD=no_compiler_found
+	else
+	    set_cc_for_build
 	fi
-	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
-	    if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
-		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		    (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
-		    grep IS_64BIT_ARCH >/dev/null
-		then
-		    case $UNAME_PROCESSOR in
-			i386) UNAME_PROCESSOR=x86_64 ;;
-			powerpc) UNAME_PROCESSOR=powerpc64 ;;
-		    esac
-		fi
+	if test "$CC_FOR_BUILD" != no_compiler_found; then
+	    if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		   (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+		   grep IS_64BIT_ARCH >/dev/null
+	    then
+		case $UNAME_PROCESSOR in
+		    i386) UNAME_PROCESSOR=x86_64 ;;
+		    powerpc) UNAME_PROCESSOR=powerpc64 ;;
+		esac
+	    fi
+	    # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
+	    if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
+		   (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+		   grep IS_PPC >/dev/null
+	    then
+		UNAME_PROCESSOR=powerpc
 	    fi
 	elif test "$UNAME_PROCESSOR" = i386 ; then
-	    # Avoid executing cc on OS X 10.9, as it ships with a stub
-	    # that puts up a graphical alert prompting to install
-	    # developer tools.  Any system running Mac OS X 10.7 or
-	    # later (Darwin 11 and later) is required to have a 64-bit
-	    # processor. This is not true of the ARM version of Darwin
-	    # that Apple uses in portable devices.
-	    UNAME_PROCESSOR=x86_64
+	    # uname -m returns i386 or x86_64
+	    UNAME_PROCESSOR=$UNAME_MACHINE
 	fi
-	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit ;;
+	GUESS=$UNAME_PROCESSOR-apple-darwin$UNAME_RELEASE
+	;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
 	UNAME_PROCESSOR=`uname -p`
 	if test "$UNAME_PROCESSOR" = x86; then
 		UNAME_PROCESSOR=i386
 		UNAME_MACHINE=pc
 	fi
-	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit ;;
+	GUESS=$UNAME_PROCESSOR-$UNAME_MACHINE-nto-qnx$UNAME_RELEASE
+	;;
     *:QNX:*:4*)
-	echo i386-pc-qnx
-	exit ;;
-    NEO-?:NONSTOP_KERNEL:*:*)
-	echo neo-tandem-nsk${UNAME_RELEASE}
-	exit ;;
+	GUESS=i386-pc-qnx
+	;;
+    NEO-*:NONSTOP_KERNEL:*:*)
+	GUESS=neo-tandem-nsk$UNAME_RELEASE
+	;;
     NSE-*:NONSTOP_KERNEL:*:*)
-	echo nse-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    NSR-?:NONSTOP_KERNEL:*:*)
-	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit ;;
+	GUESS=nse-tandem-nsk$UNAME_RELEASE
+	;;
+    NSR-*:NONSTOP_KERNEL:*:*)
+	GUESS=nsr-tandem-nsk$UNAME_RELEASE
+	;;
+    NSV-*:NONSTOP_KERNEL:*:*)
+	GUESS=nsv-tandem-nsk$UNAME_RELEASE
+	;;
+    NSX-*:NONSTOP_KERNEL:*:*)
+	GUESS=nsx-tandem-nsk$UNAME_RELEASE
+	;;
     *:NonStop-UX:*:*)
-	echo mips-compaq-nonstopux
-	exit ;;
+	GUESS=mips-compaq-nonstopux
+	;;
     BS2000:POSIX*:*:*)
-	echo bs2000-siemens-sysv
-	exit ;;
+	GUESS=bs2000-siemens-sysv
+	;;
     DS/*:UNIX_System_V:*:*)
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit ;;
+	GUESS=$UNAME_MACHINE-$UNAME_SYSTEM-$UNAME_RELEASE
+	;;
     *:Plan9:*:*)
 	# "uname -m" is not consistent, so use $cputype instead. 386
 	# is converted to i386 for consistency with other x86
 	# operating systems.
-	if test "$cputype" = 386; then
+	if test "${cputype-}" = 386; then
 	    UNAME_MACHINE=i386
-	else
-	    UNAME_MACHINE="$cputype"
+	elif test "x${cputype-}" != x; then
+	    UNAME_MACHINE=$cputype
 	fi
-	echo ${UNAME_MACHINE}-unknown-plan9
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-plan9
+	;;
     *:TOPS-10:*:*)
-	echo pdp10-unknown-tops10
-	exit ;;
+	GUESS=pdp10-unknown-tops10
+	;;
     *:TENEX:*:*)
-	echo pdp10-unknown-tenex
-	exit ;;
+	GUESS=pdp10-unknown-tenex
+	;;
     KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	echo pdp10-dec-tops20
-	exit ;;
+	GUESS=pdp10-dec-tops20
+	;;
     XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	echo pdp10-xkl-tops20
-	exit ;;
+	GUESS=pdp10-xkl-tops20
+	;;
     *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
-	exit ;;
+	GUESS=pdp10-unknown-tops20
+	;;
     *:ITS:*:*)
-	echo pdp10-unknown-its
-	exit ;;
+	GUESS=pdp10-unknown-its
+	;;
     SEI:*:*:SEIUX)
-	echo mips-sei-seiux${UNAME_RELEASE}
-	exit ;;
+	GUESS=mips-sei-seiux$UNAME_RELEASE
+	;;
     *:DragonFly:*:*)
-	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit ;;
+	DRAGONFLY_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
+	GUESS=$UNAME_MACHINE-unknown-dragonfly$DRAGONFLY_REL
+	;;
     *:*VMS:*:*)
 	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-	case "${UNAME_MACHINE}" in
-	    A*) echo alpha-dec-vms ; exit ;;
-	    I*) echo ia64-dec-vms ; exit ;;
-	    V*) echo vax-dec-vms ; exit ;;
+	case $UNAME_MACHINE in
+	    A*) GUESS=alpha-dec-vms ;;
+	    I*) GUESS=ia64-dec-vms ;;
+	    V*) GUESS=vax-dec-vms ;;
 	esac ;;
     *:XENIX:*:SysV)
-	echo i386-pc-xenix
-	exit ;;
+	GUESS=i386-pc-xenix
+	;;
     i*86:skyos:*:*)
-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'`
-	exit ;;
+	SKYOS_REL=`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`
+	GUESS=$UNAME_MACHINE-pc-skyos$SKYOS_REL
+	;;
     i*86:rdos:*:*)
-	echo ${UNAME_MACHINE}-pc-rdos
-	exit ;;
-    i*86:AROS:*:*)
-	echo ${UNAME_MACHINE}-pc-aros
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-rdos
+	;;
+    i*86:Fiwix:*:*)
+	GUESS=$UNAME_MACHINE-pc-fiwix
+	;;
+    *:AROS:*:*)
+	GUESS=$UNAME_MACHINE-unknown-aros
+	;;
     x86_64:VMkernel:*:*)
-	echo ${UNAME_MACHINE}-unknown-esx
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-esx
+	;;
     amd64:Isilon\ OneFS:*:*)
-	echo x86_64-unknown-onefs
-	exit ;;
+	GUESS=x86_64-unknown-onefs
+	;;
+    *:Unleashed:*:*)
+	GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE
+	;;
+esac
+
+# Do we have a guess based on uname results?
+if test "x$GUESS" != x; then
+    echo "$GUESS"
+    exit
+fi
+
+# No uname command or uname output not recognized.
+set_cc_for_build
+cat > "$dummy.c" <<EOF
+#ifdef _SEQUENT_
+#include <sys/types.h>
+#include <sys/utsname.h>
+#endif
+#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__)
+#if defined (vax) || defined (__vax) || defined (__vax__) || defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__)
+#include <signal.h>
+#if defined(_SIZE_T_) || defined(SIGLOST)
+#include <sys/utsname.h>
+#endif
+#endif
+#endif
+main ()
+{
+#if defined (sony)
+#if defined (MIPSEB)
+  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
+     I don't know....  */
+  printf ("mips-sony-bsd\n"); exit (0);
+#else
+#include <sys/param.h>
+  printf ("m68k-sony-newsos%s\n",
+#ifdef NEWSOS4
+  "4"
+#else
+  ""
+#endif
+  ); exit (0);
+#endif
+#endif
+
+#if defined (NeXT)
+#if !defined (__ARCHITECTURE__)
+#define __ARCHITECTURE__ "m68k"
+#endif
+  int version;
+  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+  if (version < 4)
+    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+  else
+    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
+  exit (0);
+#endif
+
+#if defined (MULTIMAX) || defined (n16)
+#if defined (UMAXV)
+  printf ("ns32k-encore-sysv\n"); exit (0);
+#else
+#if defined (CMU)
+  printf ("ns32k-encore-mach\n"); exit (0);
+#else
+  printf ("ns32k-encore-bsd\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (__386BSD__)
+  printf ("i386-pc-bsd\n"); exit (0);
+#endif
+
+#if defined (sequent)
+#if defined (i386)
+  printf ("i386-sequent-dynix\n"); exit (0);
+#endif
+#if defined (ns32000)
+  printf ("ns32k-sequent-dynix\n"); exit (0);
+#endif
+#endif
+
+#if defined (_SEQUENT_)
+  struct utsname un;
+
+  uname(&un);
+  if (strncmp(un.version, "V2", 2) == 0) {
+    printf ("i386-sequent-ptx2\n"); exit (0);
+  }
+  if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+    printf ("i386-sequent-ptx1\n"); exit (0);
+  }
+  printf ("i386-sequent-ptx\n"); exit (0);
+#endif
+
+#if defined (vax)
+#if !defined (ultrix)
+#include <sys/param.h>
+#if defined (BSD)
+#if BSD == 43
+  printf ("vax-dec-bsd4.3\n"); exit (0);
+#else
+#if BSD == 199006
+  printf ("vax-dec-bsd4.3reno\n"); exit (0);
+#else
+  printf ("vax-dec-bsd\n"); exit (0);
+#endif
+#endif
+#else
+  printf ("vax-dec-bsd\n"); exit (0);
+#endif
+#else
+#if defined(_SIZE_T_) || defined(SIGLOST)
+  struct utsname un;
+  uname (&un);
+  printf ("vax-dec-ultrix%s\n", un.release); exit (0);
+#else
+  printf ("vax-dec-ultrix\n"); exit (0);
+#endif
+#endif
+#endif
+#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__)
+#if defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__)
+#if defined(_SIZE_T_) || defined(SIGLOST)
+  struct utsname *un;
+  uname (&un);
+  printf ("mips-dec-ultrix%s\n", un.release); exit (0);
+#else
+  printf ("mips-dec-ultrix\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (alliant) && defined (i860)
+  printf ("i860-alliant-bsd\n"); exit (0);
+#endif
+
+  exit (1);
+}
+EOF
+
+$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=`"$dummy"` &&
+	{ echo "$SYSTEM_NAME"; exit; }
+
+# Apollos put the system type in the environment.
+test -d /usr/apollo && { echo "$ISP-apollo-$SYSTYPE"; exit; }
+
+echo "$0: unable to guess system type" >&2
+
+case $UNAME_MACHINE:$UNAME_SYSTEM in
+    mips:Linux | mips64:Linux)
+	# If we got here on MIPS GNU/Linux, output extra information.
+	cat >&2 <<EOF
+
+NOTE: MIPS GNU/Linux systems require a C compiler to fully recognize
+the system type. Please install a C compiler and try again.
+EOF
+	;;
 esac
 
 cat >&2 <<EOF
-$0: unable to guess system type
 
 This script (version $timestamp), has failed to recognize the
-operating system you are using. If your script is old, overwrite
-config.guess and config.sub with the latest versions from:
+operating system you are using. If your script is old, overwrite *all*
+copies of config.guess and config.sub with the latest versions from:
 
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
+  https://git.savannah.gnu.org/cgit/config.git/plain/config.guess
 and
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
+  https://git.savannah.gnu.org/cgit/config.git/plain/config.sub
+EOF
+
+our_year=`echo $timestamp | sed 's,-.*,,'`
+thisyear=`date +%Y`
+# shellcheck disable=SC2003
+script_age=`expr "$thisyear" - "$our_year"`
+if test "$script_age" -lt 3 ; then
+   cat >&2 <<EOF
 
 If $0 has already been updated, send the following data and any
 information you think might be pertinent to config-patches@gnu.org to
@@ -1462,16 +1757,17 @@ hostinfo               = `(hostinfo) 2>/dev/null`
 /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
 /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
 
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM  = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
+UNAME_MACHINE = "$UNAME_MACHINE"
+UNAME_RELEASE = "$UNAME_RELEASE"
+UNAME_SYSTEM  = "$UNAME_SYSTEM"
+UNAME_VERSION = "$UNAME_VERSION"
 EOF
+fi
 
 exit 1
 
 # Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "timestamp='"
 # time-stamp-format: "%:y-%02m-%02d"
 # time-stamp-end: "'"
diff --git a/external/hypre/src/config/config.sub b/external/hypre/src/config/config.sub
old mode 100644
new mode 100755
index 3478c1fd..de4259e4
--- a/external/hypre/src/config/config.sub
+++ b/external/hypre/src/config/config.sub
@@ -1,12 +1,14 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2016 Free Software Foundation, Inc.
+#   Copyright 1992-2023 Free Software Foundation, Inc.
 
-timestamp='2016-11-19'
+# shellcheck disable=SC2006,SC2268 # see below for rationale
+
+timestamp='2023-01-21'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
@@ -15,7 +17,7 @@ timestamp='2016-11-19'
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -33,7 +35,7 @@ timestamp='2016-11-19'
 # Otherwise, we print the canonical config type on stdout and succeed.
 
 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
+# https://git.savannah.gnu.org/cgit/config.git/plain/config.sub
 
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
@@ -50,6 +52,13 @@ timestamp='2016-11-19'
 #	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
 # It is wrong to echo any other type of specification.
 
+# The "shellcheck disable" line above the timestamp inhibits complaints
+# about features and limitations of the classic Bourne shell that were
+# superseded or lifted in POSIX.  However, this script identifies a wide
+# variety of pre-POSIX systems that do not have POSIX shells at all, and
+# even some reasonably current systems (Solaris 10 as case-in-point) still
+# have a pre-POSIX /bin/sh.
+
 me=`echo "$0" | sed -e 's,.*/,,'`
 
 usage="\
@@ -57,7 +66,7 @@ Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
 
 Canonicalize a configuration name.
 
-Operation modes:
+Options:
   -h, --help         print this help, then exit
   -t, --time-stamp   print date of last modification, then exit
   -v, --version      print version number, then exit
@@ -67,7 +76,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2016 Free Software Foundation, Inc.
+Copyright 1992-2023 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -89,12 +98,12 @@ while test $# -gt 0 ; do
     - )	# Use stdin as input.
        break ;;
     -* )
-       echo "$me: invalid option $1$help"
+       echo "$me: invalid option $1$help" >&2
        exit 1 ;;
 
     *local*)
        # First pass through any local machine types.
-       echo $1
+       echo "$1"
        exit ;;
 
     * )
@@ -110,1244 +119,1186 @@ case $# in
     exit 1;;
 esac
 
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
-  kopensolaris*-gnu* | cloudabi*-eabi* | \
-  storm-chaos* | os2-emx* | rtmk-nova*)
-    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-    ;;
-  android-linux)
-    os=-linux-android
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
+# Split fields of configuration type
+# shellcheck disable=SC2162
+saved_IFS=$IFS
+IFS="-" read field1 field2 field3 field4 <<EOF
+$1
+EOF
+IFS=$saved_IFS
 
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray | -microblaze*)
-		os=
-		basic_machine=$1
-		;;
-	-bluegene*)
-		os=-cnk
-		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
-		;;
-	-scout)
-		;;
-	-wrs)
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
-	-chorusrdb)
-		os=-chorusrdb
-		basic_machine=$1
-		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco6)
-		os=-sco5v6
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5)
-		os=-sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v[4-9]*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5v6*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*178)
-		os=-lynxos178
-		;;
-	-lynx*5)
-		os=-lynxos5
-		;;
-	-lynx*)
-		os=-lynxos
+# Separate into logical components for further validation
+case $1 in
+	*-*-*-*-*)
+		echo Invalid configuration \`"$1"\': more than four components >&2
+		exit 1
 		;;
-	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+	*-*-*-*)
+		basic_machine=$field1-$field2
+		basic_os=$field3-$field4
 		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
+	*-*-*)
+		# Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two
+		# parts
+		maybe_os=$field2-$field3
+		case $maybe_os in
+			nto-qnx* | linux-* | uclinux-uclibc* \
+			| uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \
+			| netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \
+			| storm-chaos* | os2-emx* | rtmk-nova* | managarm-*)
+				basic_machine=$field1
+				basic_os=$maybe_os
+				;;
+			android-linux)
+				basic_machine=$field1-unknown
+				basic_os=linux-android
+				;;
+			*)
+				basic_machine=$field1-$field2
+				basic_os=$field3
+				;;
+		esac
 		;;
-	-psos*)
-		os=-psos
+	*-*)
+		# A lone config we happen to match not fitting any pattern
+		case $field1-$field2 in
+			decstation-3100)
+				basic_machine=mips-dec
+				basic_os=
+				;;
+			*-*)
+				# Second component is usually, but not always the OS
+				case $field2 in
+					# Prevent following clause from handling this valid os
+					sun*os*)
+						basic_machine=$field1
+						basic_os=$field2
+						;;
+					zephyr*)
+						basic_machine=$field1-unknown
+						basic_os=$field2
+						;;
+					# Manufacturers
+					dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \
+					| att* | 7300* | 3300* | delta* | motorola* | sun[234]* \
+					| unicom* | ibm* | next | hp | isi* | apollo | altos* \
+					| convergent* | ncr* | news | 32* | 3600* | 3100* \
+					| hitachi* | c[123]* | convex* | sun | crds | omron* | dg \
+					| ultra | tti* | harris | dolphin | highlevel | gould \
+					| cbm | ns | masscomp | apple | axis | knuth | cray \
+					| microblaze* | sim | cisco \
+					| oki | wec | wrs | winbond)
+						basic_machine=$field1-$field2
+						basic_os=
+						;;
+					*)
+						basic_machine=$field1
+						basic_os=$field2
+						;;
+				esac
+			;;
+		esac
 		;;
-	-mint | -mint[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
+	*)
+		# Convert single-component short-hands not valid as part of
+		# multi-component configurations.
+		case $field1 in
+			386bsd)
+				basic_machine=i386-pc
+				basic_os=bsd
+				;;
+			a29khif)
+				basic_machine=a29k-amd
+				basic_os=udi
+				;;
+			adobe68k)
+				basic_machine=m68010-adobe
+				basic_os=scout
+				;;
+			alliant)
+				basic_machine=fx80-alliant
+				basic_os=
+				;;
+			altos | altos3068)
+				basic_machine=m68k-altos
+				basic_os=
+				;;
+			am29k)
+				basic_machine=a29k-none
+				basic_os=bsd
+				;;
+			amdahl)
+				basic_machine=580-amdahl
+				basic_os=sysv
+				;;
+			amiga)
+				basic_machine=m68k-unknown
+				basic_os=
+				;;
+			amigaos | amigados)
+				basic_machine=m68k-unknown
+				basic_os=amigaos
+				;;
+			amigaunix | amix)
+				basic_machine=m68k-unknown
+				basic_os=sysv4
+				;;
+			apollo68)
+				basic_machine=m68k-apollo
+				basic_os=sysv
+				;;
+			apollo68bsd)
+				basic_machine=m68k-apollo
+				basic_os=bsd
+				;;
+			aros)
+				basic_machine=i386-pc
+				basic_os=aros
+				;;
+			aux)
+				basic_machine=m68k-apple
+				basic_os=aux
+				;;
+			balance)
+				basic_machine=ns32k-sequent
+				basic_os=dynix
+				;;
+			blackfin)
+				basic_machine=bfin-unknown
+				basic_os=linux
+				;;
+			cegcc)
+				basic_machine=arm-unknown
+				basic_os=cegcc
+				;;
+			convex-c1)
+				basic_machine=c1-convex
+				basic_os=bsd
+				;;
+			convex-c2)
+				basic_machine=c2-convex
+				basic_os=bsd
+				;;
+			convex-c32)
+				basic_machine=c32-convex
+				basic_os=bsd
+				;;
+			convex-c34)
+				basic_machine=c34-convex
+				basic_os=bsd
+				;;
+			convex-c38)
+				basic_machine=c38-convex
+				basic_os=bsd
+				;;
+			cray)
+				basic_machine=j90-cray
+				basic_os=unicos
+				;;
+			crds | unos)
+				basic_machine=m68k-crds
+				basic_os=
+				;;
+			da30)
+				basic_machine=m68k-da30
+				basic_os=
+				;;
+			decstation | pmax | pmin | dec3100 | decstatn)
+				basic_machine=mips-dec
+				basic_os=
+				;;
+			delta88)
+				basic_machine=m88k-motorola
+				basic_os=sysv3
+				;;
+			dicos)
+				basic_machine=i686-pc
+				basic_os=dicos
+				;;
+			djgpp)
+				basic_machine=i586-pc
+				basic_os=msdosdjgpp
+				;;
+			ebmon29k)
+				basic_machine=a29k-amd
+				basic_os=ebmon
+				;;
+			es1800 | OSE68k | ose68k | ose | OSE)
+				basic_machine=m68k-ericsson
+				basic_os=ose
+				;;
+			gmicro)
+				basic_machine=tron-gmicro
+				basic_os=sysv
+				;;
+			go32)
+				basic_machine=i386-pc
+				basic_os=go32
+				;;
+			h8300hms)
+				basic_machine=h8300-hitachi
+				basic_os=hms
+				;;
+			h8300xray)
+				basic_machine=h8300-hitachi
+				basic_os=xray
+				;;
+			h8500hms)
+				basic_machine=h8500-hitachi
+				basic_os=hms
+				;;
+			harris)
+				basic_machine=m88k-harris
+				basic_os=sysv3
+				;;
+			hp300 | hp300hpux)
+				basic_machine=m68k-hp
+				basic_os=hpux
+				;;
+			hp300bsd)
+				basic_machine=m68k-hp
+				basic_os=bsd
+				;;
+			hppaosf)
+				basic_machine=hppa1.1-hp
+				basic_os=osf
+				;;
+			hppro)
+				basic_machine=hppa1.1-hp
+				basic_os=proelf
+				;;
+			i386mach)
+				basic_machine=i386-mach
+				basic_os=mach
+				;;
+			isi68 | isi)
+				basic_machine=m68k-isi
+				basic_os=sysv
+				;;
+			m68knommu)
+				basic_machine=m68k-unknown
+				basic_os=linux
+				;;
+			magnum | m3230)
+				basic_machine=mips-mips
+				basic_os=sysv
+				;;
+			merlin)
+				basic_machine=ns32k-utek
+				basic_os=sysv
+				;;
+			mingw64)
+				basic_machine=x86_64-pc
+				basic_os=mingw64
+				;;
+			mingw32)
+				basic_machine=i686-pc
+				basic_os=mingw32
+				;;
+			mingw32ce)
+				basic_machine=arm-unknown
+				basic_os=mingw32ce
+				;;
+			monitor)
+				basic_machine=m68k-rom68k
+				basic_os=coff
+				;;
+			morphos)
+				basic_machine=powerpc-unknown
+				basic_os=morphos
+				;;
+			moxiebox)
+				basic_machine=moxie-unknown
+				basic_os=moxiebox
+				;;
+			msdos)
+				basic_machine=i386-pc
+				basic_os=msdos
+				;;
+			msys)
+				basic_machine=i686-pc
+				basic_os=msys
+				;;
+			mvs)
+				basic_machine=i370-ibm
+				basic_os=mvs
+				;;
+			nacl)
+				basic_machine=le32-unknown
+				basic_os=nacl
+				;;
+			ncr3000)
+				basic_machine=i486-ncr
+				basic_os=sysv4
+				;;
+			netbsd386)
+				basic_machine=i386-pc
+				basic_os=netbsd
+				;;
+			netwinder)
+				basic_machine=armv4l-rebel
+				basic_os=linux
+				;;
+			news | news700 | news800 | news900)
+				basic_machine=m68k-sony
+				basic_os=newsos
+				;;
+			news1000)
+				basic_machine=m68030-sony
+				basic_os=newsos
+				;;
+			necv70)
+				basic_machine=v70-nec
+				basic_os=sysv
+				;;
+			nh3000)
+				basic_machine=m68k-harris
+				basic_os=cxux
+				;;
+			nh[45]000)
+				basic_machine=m88k-harris
+				basic_os=cxux
+				;;
+			nindy960)
+				basic_machine=i960-intel
+				basic_os=nindy
+				;;
+			mon960)
+				basic_machine=i960-intel
+				basic_os=mon960
+				;;
+			nonstopux)
+				basic_machine=mips-compaq
+				basic_os=nonstopux
+				;;
+			os400)
+				basic_machine=powerpc-ibm
+				basic_os=os400
+				;;
+			OSE68000 | ose68000)
+				basic_machine=m68000-ericsson
+				basic_os=ose
+				;;
+			os68k)
+				basic_machine=m68k-none
+				basic_os=os68k
+				;;
+			paragon)
+				basic_machine=i860-intel
+				basic_os=osf
+				;;
+			parisc)
+				basic_machine=hppa-unknown
+				basic_os=linux
+				;;
+			psp)
+				basic_machine=mipsallegrexel-sony
+				basic_os=psp
+				;;
+			pw32)
+				basic_machine=i586-unknown
+				basic_os=pw32
+				;;
+			rdos | rdos64)
+				basic_machine=x86_64-pc
+				basic_os=rdos
+				;;
+			rdos32)
+				basic_machine=i386-pc
+				basic_os=rdos
+				;;
+			rom68k)
+				basic_machine=m68k-rom68k
+				basic_os=coff
+				;;
+			sa29200)
+				basic_machine=a29k-amd
+				basic_os=udi
+				;;
+			sei)
+				basic_machine=mips-sei
+				basic_os=seiux
+				;;
+			sequent)
+				basic_machine=i386-sequent
+				basic_os=
+				;;
+			sps7)
+				basic_machine=m68k-bull
+				basic_os=sysv2
+				;;
+			st2000)
+				basic_machine=m68k-tandem
+				basic_os=
+				;;
+			stratus)
+				basic_machine=i860-stratus
+				basic_os=sysv4
+				;;
+			sun2)
+				basic_machine=m68000-sun
+				basic_os=
+				;;
+			sun2os3)
+				basic_machine=m68000-sun
+				basic_os=sunos3
+				;;
+			sun2os4)
+				basic_machine=m68000-sun
+				basic_os=sunos4
+				;;
+			sun3)
+				basic_machine=m68k-sun
+				basic_os=
+				;;
+			sun3os3)
+				basic_machine=m68k-sun
+				basic_os=sunos3
+				;;
+			sun3os4)
+				basic_machine=m68k-sun
+				basic_os=sunos4
+				;;
+			sun4)
+				basic_machine=sparc-sun
+				basic_os=
+				;;
+			sun4os3)
+				basic_machine=sparc-sun
+				basic_os=sunos3
+				;;
+			sun4os4)
+				basic_machine=sparc-sun
+				basic_os=sunos4
+				;;
+			sun4sol2)
+				basic_machine=sparc-sun
+				basic_os=solaris2
+				;;
+			sun386 | sun386i | roadrunner)
+				basic_machine=i386-sun
+				basic_os=
+				;;
+			sv1)
+				basic_machine=sv1-cray
+				basic_os=unicos
+				;;
+			symmetry)
+				basic_machine=i386-sequent
+				basic_os=dynix
+				;;
+			t3e)
+				basic_machine=alphaev5-cray
+				basic_os=unicos
+				;;
+			t90)
+				basic_machine=t90-cray
+				basic_os=unicos
+				;;
+			toad1)
+				basic_machine=pdp10-xkl
+				basic_os=tops20
+				;;
+			tpf)
+				basic_machine=s390x-ibm
+				basic_os=tpf
+				;;
+			udi29k)
+				basic_machine=a29k-amd
+				basic_os=udi
+				;;
+			ultra3)
+				basic_machine=a29k-nyu
+				basic_os=sym1
+				;;
+			v810 | necv810)
+				basic_machine=v810-nec
+				basic_os=none
+				;;
+			vaxv)
+				basic_machine=vax-dec
+				basic_os=sysv
+				;;
+			vms)
+				basic_machine=vax-dec
+				basic_os=vms
+				;;
+			vsta)
+				basic_machine=i386-pc
+				basic_os=vsta
+				;;
+			vxworks960)
+				basic_machine=i960-wrs
+				basic_os=vxworks
+				;;
+			vxworks68)
+				basic_machine=m68k-wrs
+				basic_os=vxworks
+				;;
+			vxworks29k)
+				basic_machine=a29k-wrs
+				basic_os=vxworks
+				;;
+			xbox)
+				basic_machine=i686-pc
+				basic_os=mingw32
+				;;
+			ymp)
+				basic_machine=ymp-cray
+				basic_os=unicos
+				;;
+			*)
+				basic_machine=$1
+				basic_os=
+				;;
+		esac
 		;;
 esac
 
-# Decode aliases for certain CPU-COMPANY combinations.
+# Decode 1-component or ad-hoc basic machines
 case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	1750a | 580 \
-	| a29k \
-	| aarch64 | aarch64_be \
-	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| am33_2.0 \
-	| arc | arceb \
-	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
-	| avr | avr32 \
-	| ba \
-	| be32 | be64 \
-	| bfin \
-	| c4x | c8051 | clipper \
-	| d10v | d30v | dlx | dsp16xx \
-	| e2k | epiphany \
-	| fido | fr30 | frv | ft32 \
-	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| hexagon \
-	| i370 | i860 | i960 | ia64 \
-	| ip2k | iq2000 \
-	| k1om \
-	| le32 | le64 \
-	| lm32 \
-	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64octeon | mips64octeonel \
-	| mips64orion | mips64orionel \
-	| mips64r5900 | mips64r5900el \
-	| mips64vr | mips64vrel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mips64vr5900 | mips64vr5900el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa32r6 | mipsisa32r6el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64r2 | mipsisa64r2el \
-	| mipsisa64r6 | mipsisa64r6el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipsr5900 | mipsr5900el \
-	| mipstx39 | mipstx39el \
-	| mn10200 | mn10300 \
-	| moxie \
-	| mt \
-	| msp430 \
-	| nds32 | nds32le | nds32be \
-	| nios | nios2 | nios2eb | nios2el \
-	| ns16k | ns32k \
-	| open8 | or1k | or1knd | or32 \
-	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle \
-	| pru \
-	| pyramid \
-	| riscv32 | riscv64 \
-	| rl78 | rx \
-	| score \
-	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
-	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu \
-	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
-	| ubicom32 \
-	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
-	| visium \
-	| we32k \
-	| x86 | xc16x | xstormy16 | xtensa \
-	| z8k | z80)
-		basic_machine=$basic_machine-unknown
-		;;
-	c54x)
-		basic_machine=tic54x-unknown
-		;;
-	c55x)
-		basic_machine=tic55x-unknown
-		;;
-	c6x)
-		basic_machine=tic6x-unknown
-		;;
-	leon|leon[3-9])
-		basic_machine=sparc-$basic_machine
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
-		basic_machine=$basic_machine-unknown
-		os=-none
+	# Here we handle the default manufacturer of certain CPU types.  It is in
+	# some cases the only manufacturer, in others, it is the most popular.
+	w89k)
+		cpu=hppa1.1
+		vendor=winbond
 		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+	op50n)
+		cpu=hppa1.1
+		vendor=oki
 		;;
-	ms1)
-		basic_machine=mt-unknown
+	op60c)
+		cpu=hppa1.1
+		vendor=oki
 		;;
-
-	strongarm | thumb | xscale)
-		basic_machine=arm-unknown
+	ibm*)
+		cpu=i370
+		vendor=ibm
 		;;
-	xgate)
-		basic_machine=$basic_machine-unknown
-		os=-none
+	orion105)
+		cpu=clipper
+		vendor=highlevel
 		;;
-	xscaleeb)
-		basic_machine=armeb-unknown
+	mac | mpw | mac-mpw)
+		cpu=m68k
+		vendor=apple
 		;;
-
-	xscaleel)
-		basic_machine=armel-unknown
+	pmac | pmac-mpw)
+		cpu=powerpc
+		vendor=apple
 		;;
 
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
-	  basic_machine=$basic_machine-pc
-	  ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	580-* \
-	| a29k-* \
-	| aarch64-* | aarch64_be-* \
-	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
-	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* | avr32-* \
-	| ba-* \
-	| be32-* | be64-* \
-	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* \
-	| c8051-* | clipper-* | craynv-* | cydra-* \
-	| d10v-* | d30v-* | dlx-* \
-	| e2k-* | elxsi-* \
-	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| hexagon-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* | iq2000-* \
-	| k1om-* \
-	| le32-* | le64-* \
-	| lm32-* \
-	| m32c-* | m32r-* | m32rle-* \
-	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
-	| microblaze-* | microblazeel-* \
-	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips16-* \
-	| mips64-* | mips64el-* \
-	| mips64octeon-* | mips64octeonel-* \
-	| mips64orion-* | mips64orionel-* \
-	| mips64r5900-* | mips64r5900el-* \
-	| mips64vr-* | mips64vrel-* \
-	| mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* \
-	| mips64vr5000-* | mips64vr5000el-* \
-	| mips64vr5900-* | mips64vr5900el-* \
-	| mipsisa32-* | mipsisa32el-* \
-	| mipsisa32r2-* | mipsisa32r2el-* \
-	| mipsisa32r6-* | mipsisa32r6el-* \
-	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64r2-* | mipsisa64r2el-* \
-	| mipsisa64r6-* | mipsisa64r6el-* \
-	| mipsisa64sb1-* | mipsisa64sb1el-* \
-	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipsr5900-* | mipsr5900el-* \
-	| mipstx39-* | mipstx39el-* \
-	| mmix-* \
-	| mt-* \
-	| msp430-* \
-	| nds32-* | nds32le-* | nds32be-* \
-	| nios-* | nios2-* | nios2eb-* | nios2el-* \
-	| none-* | np1-* | ns16k-* | ns32k-* \
-	| open8-* \
-	| or1k*-* \
-	| orion-* \
-	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
-	| pru-* \
-	| pyramid-* \
-	| riscv32-* | riscv64-* \
-	| rl78-* | romp-* | rs6000-* | rx-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
-	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
-	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
-	| tahoe-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tile*-* \
-	| tron-* \
-	| ubicom32-* \
-	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
-	| vax-* \
-	| visium-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* \
-	| xstormy16-* | xtensa*-* \
-	| ymp-* \
-	| z8k-* | z80-*)
-		;;
-	# Recognize the basic CPU types without company name, with glob match.
-	xtensa*)
-		basic_machine=$basic_machine-unknown
-		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
-	386bsd)
-		basic_machine=i386-unknown
-		os=-bsd
-		;;
 	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
+		cpu=m68000
+		vendor=att
 		;;
 	3b*)
-		basic_machine=we32k-att
-		;;
-	a29khif)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	abacus)
-		basic_machine=abacus-unknown
-		;;
-	adobe68k)
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amd64)
-		basic_machine=x86_64-pc
-		;;
-	amd64-*)
-		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-unknown
-		;;
-	amigaos | amigados)
-		basic_machine=m68k-unknown
-		os=-amigaos
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-unknown
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	apollo68bsd)
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
-	aros)
-		basic_machine=i386-pc
-		os=-aros
-		;;
-	asmjs)
-		basic_machine=asmjs-unknown
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	blackfin)
-		basic_machine=bfin-unknown
-		os=-linux
-		;;
-	blackfin-*)
-		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
+		cpu=we32k
+		vendor=att
 		;;
 	bluegene*)
-		basic_machine=powerpc-ibm
-		os=-cnk
-		;;
-	c54x-*)
-		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	c55x-*)
-		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	c6x-*)
-		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-	cegcc)
-		basic_machine=arm-unknown
-		os=-cegcc
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | j90)
-		basic_machine=j90-cray
-		os=-unicos
-		;;
-	craynv)
-		basic_machine=craynv-cray
-		os=-unicosmp
-		;;
-	cr16 | cr16-*)
-		basic_machine=cr16-unknown
-		os=-elf
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	crisv32 | crisv32-* | etraxfs*)
-		basic_machine=crisv32-axis
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	crx)
-		basic_machine=crx-unknown
-		os=-elf
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
+		cpu=powerpc
+		vendor=ibm
+		basic_os=cnk
 		;;
 	decsystem10* | dec10*)
-		basic_machine=pdp10-dec
-		os=-tops10
+		cpu=pdp10
+		vendor=dec
+		basic_os=tops10
 		;;
 	decsystem20* | dec20*)
-		basic_machine=pdp10-dec
-		os=-tops20
+		cpu=pdp10
+		vendor=dec
+		basic_os=tops20
 		;;
 	delta | 3300 | motorola-3300 | motorola-delta \
 	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	dicos)
-		basic_machine=i686-pc
-		os=-dicos
-		;;
-	djgpp)
-		basic_machine=i586-pc
-		os=-msdosdjgpp
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
-		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	e500v[12])
-		basic_machine=powerpc-unknown
-		os=$os"spe"
+		cpu=m68k
+		vendor=motorola
 		;;
-	e500v[12]-*)
-		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=$os"spe"
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
+	dpx2*)
+		cpu=m68k
+		vendor=bull
+		basic_os=sysv3
 		;;
 	encore | umax | mmax)
-		basic_machine=ns32k-encore
+		cpu=ns32k
+		vendor=encore
 		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=-ose
+	elxsi)
+		cpu=elxsi
+		vendor=elxsi
+		basic_os=${basic_os:-bsd}
 		;;
 	fx2800)
-		basic_machine=i860-alliant
+		cpu=i860
+		vendor=alliant
 		;;
 	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
+		cpu=ns32k
+		vendor=ns
 		;;
 	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	h8300xray)
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
+		cpu=hppa1.1
+		vendor=hitachi
+		basic_os=hiuxwe2
 		;;
 	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
+		cpu=hppa1.0
+		vendor=hp
 		;;
 	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
+		cpu=m68000
+		vendor=hp
 		;;
 	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
+		cpu=m68k
+		vendor=hp
 		;;
 	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-		basic_machine=hppa1.0-hp
+		cpu=hppa1.0
+		vendor=hp
 		;;
 	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-		basic_machine=hppa1.1-hp
+		cpu=hppa1.1
+		vendor=hp
 		;;
 	hp9k78[0-9] | hp78[0-9])
 		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
+		cpu=hppa1.1
+		vendor=hp
 		;;
 	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
 		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
+		cpu=hppa1.1
+		vendor=hp
 		;;
 	hp9k8[0-9][13679] | hp8[0-9][13679])
-		basic_machine=hppa1.1-hp
+		cpu=hppa1.1
+		vendor=hp
 		;;
 	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hppa-next)
-		os=-nextstep3
-		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=-osf
-		;;
-	hppro)
-		basic_machine=hppa1.1-hp
-		os=-proelf
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
+		cpu=hppa1.0
+		vendor=hp
 		;;
 	i*86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
+		cpu=`echo "$1" | sed -e 's/86.*/86/'`
+		vendor=pc
+		basic_os=sysv32
 		;;
 	i*86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
+		cpu=`echo "$1" | sed -e 's/86.*/86/'`
+		vendor=pc
+		basic_os=sysv4
 		;;
 	i*86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
+		cpu=`echo "$1" | sed -e 's/86.*/86/'`
+		vendor=pc
+		basic_os=sysv
 		;;
 	i*86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
-		;;
-	i386mach)
-		basic_machine=i386-mach
-		os=-mach
+		cpu=`echo "$1" | sed -e 's/86.*/86/'`
+		vendor=pc
+		basic_os=solaris2
 		;;
-	i386-vsta | vsta)
-		basic_machine=i386-unknown
-		os=-vsta
+	j90 | j90-cray)
+		cpu=j90
+		vendor=cray
+		basic_os=${basic_os:-unicos}
 		;;
 	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		    -irix*)
+		cpu=mips
+		vendor=sgi
+		case $basic_os in
+		    irix*)
 			;;
 		    *)
-			os=-irix4
+			basic_os=irix4
 			;;
 		esac
 		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	leon-*|leon[3-9]-*)
-		basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
-		;;
-	m68knommu)
-		basic_machine=m68k-unknown
-		os=-linux
-		;;
-	m68knommu-*)
-		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-	microblaze*)
-		basic_machine=microblaze-xilinx
-		;;
-	mingw64)
-		basic_machine=x86_64-pc
-		os=-mingw64
-		;;
-	mingw32)
-		basic_machine=i686-pc
-		os=-mingw32
-		;;
-	mingw32ce)
-		basic_machine=arm-unknown
-		os=-mingw32ce
-		;;
 	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+		cpu=m68000
+		vendor=convergent
 		;;
-	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
-	moxiebox)
-		basic_machine=moxie-unknown
-		os=-moxiebox
-		;;
-	msdos)
-		basic_machine=i386-pc
-		os=-msdos
-		;;
-	ms1-*)
-		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
-		;;
-	msys)
-		basic_machine=i686-pc
-		os=-msys
-		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-	nacl)
-		basic_machine=le32-unknown
-		os=-nacl
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	netbsd386)
-		basic_machine=i386-unknown
-		os=-netbsd
-		;;
-	netwinder)
-		basic_machine=armv4l-rebel
-		os=-linux
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
+	*mint | mint[0-9]* | *MiNT | *MiNT[0-9]*)
+		cpu=m68k
+		vendor=atari
+		basic_os=mint
 		;;
 	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	necv70)
-		basic_machine=v70-nec
-		os=-sysv
-		;;
-	next | m*-next )
-		basic_machine=m68k-next
-		case $os in
-		    -nextstep* )
+		cpu=mips
+		vendor=sony
+		basic_os=newsos
+		;;
+	next | m*-next)
+		cpu=m68k
+		vendor=next
+		case $basic_os in
+		    openstep*)
+		        ;;
+		    nextstep*)
 			;;
-		    -ns2*)
-		      os=-nextstep2
+		    ns2*)
+		      basic_os=nextstep2
 			;;
 		    *)
-		      os=-nextstep3
+		      basic_os=nextstep3
 			;;
 		esac
 		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh[45]000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	mon960)
-		basic_machine=i960-intel
-		os=-mon960
-		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
 	np1)
-		basic_machine=np1-gould
-		;;
-	neo-tandem)
-		basic_machine=neo-tandem
-		;;
-	nse-tandem)
-		basic_machine=nse-tandem
-		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
+		cpu=np1
+		vendor=gould
 		;;
 	op50n-* | op60c-*)
-		basic_machine=hppa1.1-oki
-		os=-proelf
-		;;
-	openrisc | openrisc-*)
-		basic_machine=or32-unknown
-		;;
-	os400)
-		basic_machine=powerpc-ibm
-		os=-os400
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=-os68k
+		cpu=hppa1.1
+		vendor=oki
+		basic_os=proelf
 		;;
 	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	parisc)
-		basic_machine=hppa-unknown
-		os=-linux
-		;;
-	parisc-*)
-		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
+		cpu=hppa1.1
+		vendor=hitachi
+		basic_os=hiuxwe2
 		;;
 	pbd)
-		basic_machine=sparc-tti
+		cpu=sparc
+		vendor=tti
 		;;
 	pbb)
-		basic_machine=m68k-tti
+		cpu=m68k
+		vendor=tti
 		;;
-	pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	pc98)
-		basic_machine=i386-pc
-		;;
-	pc98-*)
-		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium | p5 | k5 | k6 | nexgen | viac3)
-		basic_machine=i586-pc
-		;;
-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
-		basic_machine=i686-pc
-		;;
-	pentiumii | pentium2 | pentiumiii | pentium3)
-		basic_machine=i686-pc
-		;;
-	pentium4)
-		basic_machine=i786-pc
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium4-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+	pc532)
+		cpu=ns32k
+		vendor=pc532
 		;;
 	pn)
-		basic_machine=pn-gould
-		;;
-	power)	basic_machine=power-ibm
-		;;
-	ppc | ppcbe)	basic_machine=powerpc-unknown
-		;;
-	ppc-* | ppcbe-*)
-		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppcle | powerpclittle)
-		basic_machine=powerpcle-unknown
-		;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64)	basic_machine=powerpc64-unknown
+		cpu=pn
+		vendor=gould
 		;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64le | powerpc64little)
-		basic_machine=powerpc64le-unknown
-		;;
-	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+	power)
+		cpu=power
+		vendor=ibm
 		;;
 	ps2)
-		basic_machine=i386-ibm
-		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
-	rdos | rdos64)
-		basic_machine=x86_64-pc
-		os=-rdos
-		;;
-	rdos32)
-		basic_machine=i386-pc
-		os=-rdos
-		;;
-	rom68k)
-		basic_machine=m68k-rom68k
-		os=-coff
+		cpu=i386
+		vendor=ibm
 		;;
 	rm[46]00)
-		basic_machine=mips-siemens
+		cpu=mips
+		vendor=siemens
 		;;
 	rtpc | rtpc-*)
-		basic_machine=romp-ibm
+		cpu=romp
+		vendor=ibm
 		;;
-	s390 | s390-*)
-		basic_machine=s390-ibm
-		;;
-	s390x | s390x-*)
-		basic_machine=s390x-ibm
-		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=-udi
+	sde)
+		cpu=mipsisa32
+		vendor=sde
+		basic_os=${basic_os:-elf}
 		;;
-	sb1)
-		basic_machine=mipsisa64sb1-unknown
+	simso-wrs)
+		cpu=sparclite
+		vendor=wrs
+		basic_os=vxworks
 		;;
-	sb1el)
-		basic_machine=mipsisa64sb1el-unknown
+	tower | tower-32)
+		cpu=m68k
+		vendor=ncr
 		;;
-	sde)
-		basic_machine=mipsisa32-sde
-		os=-elf
+	vpp*|vx|vx-*)
+		cpu=f301
+		vendor=fujitsu
 		;;
-	sei)
-		basic_machine=mips-sei
-		os=-seiux
+	w65)
+		cpu=w65
+		vendor=wdc
 		;;
-	sequent)
-		basic_machine=i386-sequent
+	w89k-*)
+		cpu=hppa1.1
+		vendor=winbond
+		basic_os=proelf
 		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
+	none)
+		cpu=none
+		vendor=none
 		;;
-	sh5el)
-		basic_machine=sh5le-unknown
+	leon|leon[3-9])
+		cpu=sparc
+		vendor=$basic_machine
 		;;
-	sh64)
-		basic_machine=sh64-unknown
+	leon-*|leon[3-9]-*)
+		cpu=sparc
+		vendor=`echo "$basic_machine" | sed 's/-.*//'`
 		;;
-	sparclite-wrs | simso-wrs)
-		basic_machine=sparclite-wrs
-		os=-vxworks
+
+	*-*)
+		# shellcheck disable=SC2162
+		saved_IFS=$IFS
+		IFS="-" read cpu vendor <<EOF
+$basic_machine
+EOF
+		IFS=$saved_IFS
 		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
+	# We use `pc' rather than `unknown'
+	# because (1) that's what they normally are, and
+	# (2) the word "unknown" tends to confuse beginning users.
+	i*86 | x86_64)
+		cpu=$basic_machine
+		vendor=pc
 		;;
-	spur)
-		basic_machine=spur-unknown
+	# These rules are duplicated from below for sake of the special case above;
+	# i.e. things that normalized to x86 arches should also default to "pc"
+	pc98)
+		cpu=i386
+		vendor=pc
 		;;
-	st2000)
-		basic_machine=m68k-tandem
+	x64 | amd64)
+		cpu=x86_64
+		vendor=pc
 		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=-sysv4
+	# Recognize the basic CPU types without company name.
+	*)
+		cpu=$basic_machine
+		vendor=unknown
 		;;
-	strongarm-* | thumb-*)
-		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+esac
+
+unset -v basic_machine
+
+# Decode basic machines in the full and proper CPU-Company form.
+case $cpu-$vendor in
+	# Here we handle the default manufacturer of certain CPU types in canonical form. It is in
+	# some cases the only manufacturer, in others, it is the most popular.
+	craynv-unknown)
+		vendor=cray
+		basic_os=${basic_os:-unicosmp}
 		;;
-	sun2)
-		basic_machine=m68000-sun
+	c90-unknown | c90-cray)
+		vendor=cray
+		basic_os=${Basic_os:-unicos}
 		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
+	fx80-unknown)
+		vendor=alliant
 		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
+	romp-unknown)
+		vendor=ibm
 		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
+	mmix-unknown)
+		vendor=knuth
 		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
+	microblaze-unknown | microblazeel-unknown)
+		vendor=xilinx
 		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
+	rs6000-unknown)
+		vendor=ibm
 		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
+	vax-unknown)
+		vendor=dec
 		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
+	pdp11-unknown)
+		vendor=dec
 		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
+	we32k-unknown)
+		vendor=att
 		;;
-	sun4)
-		basic_machine=sparc-sun
+	cydra-unknown)
+		vendor=cydrome
 		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
+	i370-ibm*)
+		vendor=ibm
 		;;
-	sv1)
-		basic_machine=sv1-cray
-		os=-unicos
+	orion-unknown)
+		vendor=highlevel
 		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
+	xps-unknown | xps100-unknown)
+		cpu=xps100
+		vendor=honeywell
 		;;
-	t3e)
-		basic_machine=alphaev5-cray
-		os=-unicos
+
+	# Here we normalize CPU types with a missing or matching vendor
+	armh-unknown | armh-alt)
+		cpu=armv7l
+		vendor=alt
+		basic_os=${basic_os:-linux-gnueabihf}
 		;;
-	t90)
-		basic_machine=t90-cray
-		os=-unicos
+	dpx20-unknown | dpx20-bull)
+		cpu=rs6000
+		vendor=bull
+		basic_os=${basic_os:-bosx}
 		;;
-	tile*)
-		basic_machine=$basic_machine-unknown
-		os=-linux-gnu
+
+	# Here we normalize CPU types irrespective of the vendor
+	amd64-*)
+		cpu=x86_64
 		;;
-	tx39)
-		basic_machine=mipstx39-unknown
+	blackfin-*)
+		cpu=bfin
+		basic_os=linux
 		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
+	c54x-*)
+		cpu=tic54x
 		;;
-	toad1)
-		basic_machine=pdp10-xkl
-		os=-tops20
+	c55x-*)
+		cpu=tic55x
 		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
+	c6x-*)
+		cpu=tic6x
 		;;
-	tpf)
-		basic_machine=s390x-ibm
-		os=-tpf
+	e500v[12]-*)
+		cpu=powerpc
+		basic_os=${basic_os}"spe"
 		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
+	mips3*-*)
+		cpu=mips64
 		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
+	ms1-*)
+		cpu=mt
 		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
+	m68knommu-*)
+		cpu=m68k
+		basic_os=linux
 		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
+	m9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*)
+		cpu=s12z
 		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
+	openrisc-*)
+		cpu=or32
 		;;
-	vpp*|vx|vx-*)
-		basic_machine=f301-fujitsu
+	parisc-*)
+		cpu=hppa
+		basic_os=linux
 		;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+		cpu=i586
 		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
+	pentiumpro-* | p6-* | 6x86-* | athlon-* | athlon_*-*)
+		cpu=i686
 		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+		cpu=i686
 		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=-none
+	pentium4-*)
+		cpu=i786
 		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=-proelf
+	pc98-*)
+		cpu=i386
 		;;
-	xbox)
-		basic_machine=i686-pc
-		os=-mingw32
+	ppc-* | ppcbe-*)
+		cpu=powerpc
 		;;
-	xps | xps100)
-		basic_machine=xps100-honeywell
+	ppcle-* | powerpclittle-*)
+		cpu=powerpcle
 		;;
-	xscale-* | xscalee[bl]-*)
-		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+	ppc64-*)
+		cpu=powerpc64
 		;;
-	ymp)
-		basic_machine=ymp-cray
-		os=-unicos
+	ppc64le-* | powerpc64little-*)
+		cpu=powerpc64le
 		;;
-	z8k-*-coff)
-		basic_machine=z8k-unknown
-		os=-sim
+	sb1-*)
+		cpu=mipsisa64sb1
 		;;
-	z80-*-coff)
-		basic_machine=z80-unknown
-		os=-sim
+	sb1el-*)
+		cpu=mipsisa64sb1el
 		;;
-	none)
-		basic_machine=none-none
-		os=-none
+	sh5e[lb]-*)
+		cpu=`echo "$cpu" | sed 's/^\(sh.\)e\(.\)$/\1\2e/'`
 		;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		basic_machine=hppa1.1-winbond
+	spur-*)
+		cpu=spur
 		;;
-	op50n)
-		basic_machine=hppa1.1-oki
+	strongarm-* | thumb-*)
+		cpu=arm
 		;;
-	op60c)
-		basic_machine=hppa1.1-oki
+	tx39-*)
+		cpu=mipstx39
 		;;
-	romp)
-		basic_machine=romp-ibm
+	tx39el-*)
+		cpu=mipstx39el
 		;;
-	mmix)
-		basic_machine=mmix-knuth
+	x64-*)
+		cpu=x86_64
 		;;
-	rs6000)
-		basic_machine=rs6000-ibm
+	xscale-* | xscalee[bl]-*)
+		cpu=`echo "$cpu" | sed 's/^xscale/arm/'`
 		;;
-	vax)
-		basic_machine=vax-dec
+	arm64-* | aarch64le-*)
+		cpu=aarch64
 		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
+
+	# Recognize the canonical CPU Types that limit and/or modify the
+	# company names they are paired with.
+	cr16-*)
+		basic_os=${basic_os:-elf}
 		;;
-	pdp11)
-		basic_machine=pdp11-dec
+	crisv32-* | etraxfs*-*)
+		cpu=crisv32
+		vendor=axis
 		;;
-	we32k)
-		basic_machine=we32k-att
+	cris-* | etrax*-*)
+		cpu=cris
+		vendor=axis
 		;;
-	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
-		basic_machine=sh-unknown
+	crx-*)
+		basic_os=${basic_os:-elf}
 		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
-		basic_machine=sparc-sun
+	neo-tandem)
+		cpu=neo
+		vendor=tandem
 		;;
-	cydra)
-		basic_machine=cydra-cydrome
+	nse-tandem)
+		cpu=nse
+		vendor=tandem
 		;;
-	orion)
-		basic_machine=orion-highlevel
+	nsr-tandem)
+		cpu=nsr
+		vendor=tandem
 		;;
-	orion105)
-		basic_machine=clipper-highlevel
+	nsv-tandem)
+		cpu=nsv
+		vendor=tandem
 		;;
-	mac | mpw | mac-mpw)
-		basic_machine=m68k-apple
+	nsx-tandem)
+		cpu=nsx
+		vendor=tandem
 		;;
-	pmac | pmac-mpw)
-		basic_machine=powerpc-apple
+	mipsallegrexel-sony)
+		cpu=mipsallegrexel
+		vendor=sony
 		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
+	tile*-*)
+		basic_os=${basic_os:-linux-gnu}
 		;;
+
 	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
+		# Recognize the canonical CPU types that are allowed with any
+		# company name.
+		case $cpu in
+			1750a | 580 \
+			| a29k \
+			| aarch64 | aarch64_be \
+			| abacus \
+			| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \
+			| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \
+			| alphapca5[67] | alpha64pca5[67] \
+			| am33_2.0 \
+			| amdgcn \
+			| arc | arceb | arc32 | arc64 \
+			| arm | arm[lb]e | arme[lb] | armv* \
+			| avr | avr32 \
+			| asmjs \
+			| ba \
+			| be32 | be64 \
+			| bfin | bpf | bs2000 \
+			| c[123]* | c30 | [cjt]90 | c4x \
+			| c8051 | clipper | craynv | csky | cydra \
+			| d10v | d30v | dlx | dsp16xx \
+			| e2k | elxsi | epiphany \
+			| f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \
+			| h8300 | h8500 \
+			| hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+			| hexagon \
+			| i370 | i*86 | i860 | i960 | ia16 | ia64 \
+			| ip2k | iq2000 \
+			| k1om \
+			| le32 | le64 \
+			| lm32 \
+			| loongarch32 | loongarch64 \
+			| m32c | m32r | m32rle \
+			| m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \
+			| m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \
+			| m88110 | m88k | maxq | mb | mcore | mep | metag \
+			| microblaze | microblazeel \
+			| mips | mipsbe | mipseb | mipsel | mipsle \
+			| mips16 \
+			| mips64 | mips64eb | mips64el \
+			| mips64octeon | mips64octeonel \
+			| mips64orion | mips64orionel \
+			| mips64r5900 | mips64r5900el \
+			| mips64vr | mips64vrel \
+			| mips64vr4100 | mips64vr4100el \
+			| mips64vr4300 | mips64vr4300el \
+			| mips64vr5000 | mips64vr5000el \
+			| mips64vr5900 | mips64vr5900el \
+			| mipsisa32 | mipsisa32el \
+			| mipsisa32r2 | mipsisa32r2el \
+			| mipsisa32r3 | mipsisa32r3el \
+			| mipsisa32r5 | mipsisa32r5el \
+			| mipsisa32r6 | mipsisa32r6el \
+			| mipsisa64 | mipsisa64el \
+			| mipsisa64r2 | mipsisa64r2el \
+			| mipsisa64r3 | mipsisa64r3el \
+			| mipsisa64r5 | mipsisa64r5el \
+			| mipsisa64r6 | mipsisa64r6el \
+			| mipsisa64sb1 | mipsisa64sb1el \
+			| mipsisa64sr71k | mipsisa64sr71kel \
+			| mipsr5900 | mipsr5900el \
+			| mipstx39 | mipstx39el \
+			| mmix \
+			| mn10200 | mn10300 \
+			| moxie \
+			| mt \
+			| msp430 \
+			| nds32 | nds32le | nds32be \
+			| nfp \
+			| nios | nios2 | nios2eb | nios2el \
+			| none | np1 | ns16k | ns32k | nvptx \
+			| open8 \
+			| or1k* \
+			| or32 \
+			| orion \
+			| picochip \
+			| pdp10 | pdp11 | pj | pjl | pn | power \
+			| powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \
+			| pru \
+			| pyramid \
+			| riscv | riscv32 | riscv32be | riscv64 | riscv64be \
+			| rl78 | romp | rs6000 | rx \
+			| s390 | s390x \
+			| score \
+			| sh | shl \
+			| sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \
+			| sh[1234]e[lb] |  sh[12345][lb]e | sh[23]ele | sh64 | sh64le \
+			| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet \
+			| sparclite \
+			| sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \
+			| spu \
+			| tahoe \
+			| thumbv7* \
+			| tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \
+			| tron \
+			| ubicom32 \
+			| v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \
+			| vax \
+			| visium \
+			| w65 \
+			| wasm32 | wasm64 \
+			| we32k \
+			| x86 | x86_64 | xc16x | xgate | xps100 \
+			| xstormy16 | xtensa* \
+			| ymp \
+			| z8k | z80)
+				;;
+
+			*)
+				echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2
+				exit 1
+				;;
+		esac
 		;;
 esac
 
 # Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+case $vendor in
+	digital*)
+		vendor=dec
 		;;
-	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+	commodore*)
+		vendor=cbm
 		;;
 	*)
 		;;
@@ -1355,203 +1306,219 @@ esac
 
 # Decode manufacturer-specific aliases for certain operating systems.
 
-if [ x"$os" != x"" ]
+if test x$basic_os != x
 then
-case $os in
-	# First match some system type aliases
-	# that might get confused with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-	-auroraux)
-		os=-auroraux
+
+# First recognize some ad-hoc cases, or perhaps split kernel-os, or else just
+# set os.
+case $basic_os in
+	gnu/linux*)
+		kernel=linux
+		os=`echo "$basic_os" | sed -e 's|gnu/linux|gnu|'`
+		;;
+	os2-emx)
+		kernel=os2
+		os=`echo "$basic_os" | sed -e 's|os2-emx|emx|'`
+		;;
+	nto-qnx*)
+		kernel=nto
+		os=`echo "$basic_os" | sed -e 's|nto-qnx|qnx|'`
+		;;
+	*-*)
+		# shellcheck disable=SC2162
+		saved_IFS=$IFS
+		IFS="-" read kernel os <<EOF
+$basic_os
+EOF
+		IFS=$saved_IFS
+		;;
+	# Default OS when just kernel was specified
+	nto*)
+		kernel=nto
+		os=`echo "$basic_os" | sed -e 's|nto|qnx|'`
+		;;
+	linux*)
+		kernel=linux
+		os=`echo "$basic_os" | sed -e 's|linux|gnu|'`
+		;;
+	managarm*)
+		kernel=managarm
+		os=`echo "$basic_os" | sed -e 's|managarm|mlibc|'`
 		;;
-	-solaris1 | -solaris1.*)
-		os=`echo $os | sed -e 's|solaris1|sunos4|'`
+	*)
+		kernel=
+		os=$basic_os
 		;;
-	-solaris)
-		os=-solaris2
+esac
+
+# Now, normalize the OS (knowing we just have one component, it's not a kernel,
+# etc.)
+case $os in
+	# First match some system type aliases that might get confused
+	# with valid system types.
+	# solaris* is a basic system type, with this one exception.
+	auroraux)
+		os=auroraux
 		;;
-	-svr4*)
-		os=-sysv4
+	bluegene*)
+		os=cnk
 		;;
-	-unixware*)
-		os=-sysv4.2uw
+	solaris1 | solaris1.*)
+		os=`echo "$os" | sed -e 's|solaris1|sunos4|'`
 		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+	solaris)
+		os=solaris2
 		;;
-	# First accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-	      | -sym* | -kopensolaris* | -plan9* \
-	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* | -aros* | -cloudabi* | -sortix* \
-	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
-	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
-	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
-	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
-	      | -onefs* | -tirtos* | -phoenix* | -fuchsia*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-qnx*)
-		case $basic_machine in
-		    x86-* | i*86-*)
-			;;
-		    *)
-			os=-nto$os
-			;;
-		esac
+	unixware*)
+		os=sysv4.2uw
 		;;
-	-nto-qnx*)
+	# es1800 is here to avoid being matched by es* (a different OS)
+	es1800*)
+		os=ose
 		;;
-	-nto*)
-		os=`echo $os | sed -e 's|nto|nto-qnx|'`
+	# Some version numbers need modification
+	chorusos*)
+		os=chorusos
 		;;
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
-	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+	isc)
+		os=isc2.2
 		;;
-	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
+	sco6)
+		os=sco5v6
 		;;
-	-linux-dietlibc)
-		os=-linux-dietlibc
+	sco5)
+		os=sco3.2v5
 		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+	sco4)
+		os=sco3.2v4
 		;;
-	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
+	sco3.2.[4-9]*)
+		os=`echo "$os" | sed -e 's/sco3.2./sco3.2v/'`
 		;;
-	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
+	sco*v* | scout)
+		# Don't match below
 		;;
-	-opened*)
-		os=-openedition
+	sco*)
+		os=sco3.2v2
 		;;
-	-os400*)
-		os=-os400
+	psos*)
+		os=psos
 		;;
-	-wince*)
-		os=-wince
+	qnx*)
+		os=qnx
 		;;
-	-osfrose*)
-		os=-osfrose
+	hiux*)
+		os=hiuxwe2
 		;;
-	-osf*)
-		os=-osf
+	lynx*178)
+		os=lynxos178
 		;;
-	-utek*)
-		os=-bsd
+	lynx*5)
+		os=lynxos5
 		;;
-	-dynix*)
-		os=-bsd
+	lynxos*)
+		# don't get caught up in next wildcard
 		;;
-	-acis*)
-		os=-aos
+	lynx*)
+		os=lynxos
 		;;
-	-atheos*)
-		os=-atheos
+	mac[0-9]*)
+		os=`echo "$os" | sed -e 's|mac|macos|'`
 		;;
-	-syllable*)
-		os=-syllable
+	opened*)
+		os=openedition
 		;;
-	-386bsd)
-		os=-bsd
+	os400*)
+		os=os400
 		;;
-	-ctix* | -uts*)
-		os=-sysv
+	sunos5*)
+		os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
 		;;
-	-nova*)
-		os=-rtmk-nova
+	sunos6*)
+		os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
 		;;
-	-ns2 )
-		os=-nextstep2
+	wince*)
+		os=wince
 		;;
-	-nsk*)
-		os=-nsk
+	utek*)
+		os=bsd
 		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
+	dynix*)
+		os=bsd
+		;;
+	acis*)
+		os=aos
 		;;
-	-sinix*)
-		os=-sysv4
+	atheos*)
+		os=atheos
 		;;
-	-tpf*)
-		os=-tpf
+	syllable*)
+		os=syllable
 		;;
-	-triton*)
-		os=-sysv3
+	386bsd)
+		os=bsd
 		;;
-	-oss*)
-		os=-sysv3
+	ctix* | uts*)
+		os=sysv
 		;;
-	-svr4)
-		os=-sysv4
+	nova*)
+		os=rtmk-nova
 		;;
-	-svr3)
-		os=-sysv3
+	ns2)
+		os=nextstep2
 		;;
-	-sysvr4)
-		os=-sysv4
+	# Preserve the version number of sinix5.
+	sinix5.*)
+		os=`echo "$os" | sed -e 's|sinix|sysv|'`
 		;;
-	# This must come after -sysvr4.
-	-sysv*)
+	sinix*)
+		os=sysv4
 		;;
-	-ose*)
-		os=-ose
+	tpf*)
+		os=tpf
 		;;
-	-es1800*)
-		os=-ose
+	triton*)
+		os=sysv3
 		;;
-	-xenix)
-		os=-xenix
+	oss*)
+		os=sysv3
 		;;
-	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-		os=-mint
+	svr4*)
+		os=sysv4
 		;;
-	-aros*)
-		os=-aros
+	svr3)
+		os=sysv3
 		;;
-	-zvmoe)
-		os=-zvmoe
+	sysvr4)
+		os=sysv4
 		;;
-	-dicos*)
-		os=-dicos
+	ose*)
+		os=ose
 		;;
-	-nacl*)
+	*mint | mint[0-9]* | *MiNT | MiNT[0-9]*)
+		os=mint
 		;;
-	-ios)
+	dicos*)
+		os=dicos
 		;;
-	-none)
+	pikeos*)
+		# Until real need of OS specific support for
+		# particular features comes up, bare metal
+		# configurations are quite functional.
+		case $cpu in
+		    arm*)
+			os=eabi
+			;;
+		    *)
+			os=elf
+			;;
+		esac
 		;;
 	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-		exit 1
+		# No normalization, but not necessarily accepted, that comes below.
 		;;
 esac
+
 else
 
 # Here we handle the default operating systems that come with various machines.
@@ -1564,261 +1531,376 @@ else
 # will signal an error saying that MANUFACTURER isn't an operating
 # system, and we'll never get to this point.
 
-case $basic_machine in
+kernel=
+case $cpu-$vendor in
 	score-*)
-		os=-elf
+		os=elf
 		;;
 	spu-*)
-		os=-elf
+		os=elf
 		;;
 	*-acorn)
-		os=-riscix1.2
+		os=riscix1.2
 		;;
 	arm*-rebel)
-		os=-linux
+		kernel=linux
+		os=gnu
 		;;
 	arm*-semi)
-		os=-aout
+		os=aout
 		;;
 	c4x-* | tic4x-*)
-		os=-coff
+		os=coff
 		;;
 	c8051-*)
-		os=-elf
+		os=elf
+		;;
+	clipper-intergraph)
+		os=clix
 		;;
 	hexagon-*)
-		os=-elf
+		os=elf
 		;;
 	tic54x-*)
-		os=-coff
+		os=coff
 		;;
 	tic55x-*)
-		os=-coff
+		os=coff
 		;;
 	tic6x-*)
-		os=-coff
+		os=coff
 		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
-		os=-tops20
+		os=tops20
 		;;
 	pdp11-*)
-		os=-none
+		os=none
 		;;
 	*-dec | vax-*)
-		os=-ultrix4.2
+		os=ultrix4.2
 		;;
 	m68*-apollo)
-		os=-domain
+		os=domain
 		;;
 	i386-sun)
-		os=-sunos4.0.2
+		os=sunos4.0.2
 		;;
 	m68000-sun)
-		os=-sunos3
+		os=sunos3
 		;;
 	m68*-cisco)
-		os=-aout
+		os=aout
 		;;
 	mep-*)
-		os=-elf
+		os=elf
 		;;
 	mips*-cisco)
-		os=-elf
+		os=elf
 		;;
 	mips*-*)
-		os=-elf
+		os=elf
 		;;
 	or32-*)
-		os=-coff
+		os=coff
 		;;
 	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
+		os=sysv3
 		;;
 	sparc-* | *-sun)
-		os=-sunos4.1.1
+		os=sunos4.1.1
 		;;
-	*-be)
-		os=-beos
+	pru-*)
+		os=elf
 		;;
-	*-haiku)
-		os=-haiku
+	*-be)
+		os=beos
 		;;
 	*-ibm)
-		os=-aix
+		os=aix
 		;;
 	*-knuth)
-		os=-mmixware
+		os=mmixware
 		;;
 	*-wec)
-		os=-proelf
+		os=proelf
 		;;
 	*-winbond)
-		os=-proelf
+		os=proelf
 		;;
 	*-oki)
-		os=-proelf
+		os=proelf
 		;;
 	*-hp)
-		os=-hpux
+		os=hpux
 		;;
 	*-hitachi)
-		os=-hiux
+		os=hiux
 		;;
 	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
+		os=sysv
 		;;
 	*-cbm)
-		os=-amigaos
+		os=amigaos
 		;;
 	*-dg)
-		os=-dgux
+		os=dgux
 		;;
 	*-dolphin)
-		os=-sysv3
+		os=sysv3
 		;;
 	m68k-ccur)
-		os=-rtu
+		os=rtu
 		;;
 	m88k-omron*)
-		os=-luna
+		os=luna
 		;;
-	*-next )
-		os=-nextstep
+	*-next)
+		os=nextstep
 		;;
 	*-sequent)
-		os=-ptx
+		os=ptx
 		;;
 	*-crds)
-		os=-unos
+		os=unos
 		;;
 	*-ns)
-		os=-genix
+		os=genix
 		;;
 	i370-*)
-		os=-mvs
-		;;
-	*-next)
-		os=-nextstep3
+		os=mvs
 		;;
 	*-gould)
-		os=-sysv
+		os=sysv
 		;;
 	*-highlevel)
-		os=-bsd
+		os=bsd
 		;;
 	*-encore)
-		os=-bsd
+		os=bsd
 		;;
 	*-sgi)
-		os=-irix
+		os=irix
 		;;
 	*-siemens)
-		os=-sysv4
+		os=sysv4
 		;;
 	*-masscomp)
-		os=-rtu
+		os=rtu
 		;;
 	f30[01]-fujitsu | f700-fujitsu)
-		os=-uxpv
+		os=uxpv
 		;;
 	*-rom68k)
-		os=-coff
+		os=coff
 		;;
 	*-*bug)
-		os=-coff
+		os=coff
 		;;
 	*-apple)
-		os=-macos
+		os=macos
 		;;
 	*-atari*)
-		os=-mint
+		os=mint
+		;;
+	*-wrs)
+		os=vxworks
 		;;
 	*)
-		os=-none
+		os=none
 		;;
 esac
+
 fi
 
+# Now, validate our (potentially fixed-up) OS.
+case $os in
+	# Sometimes we do "kernel-libc", so those need to count as OSes.
+	musl* | newlib* | relibc* | uclibc*)
+		;;
+	# Likewise for "kernel-abi"
+	eabi* | gnueabi*)
+		;;
+	# VxWorks passes extra cpu info in the 4th filed.
+	simlinux | simwindows | spe)
+		;;
+	# Now accept the basic system types.
+	# The portable systems comes first.
+	# Each alternative MUST end in a * to match a version number.
+	gnu* | android* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
+	     | *vms* | esix* | aix* | cnk* | sunos | sunos[34]* \
+	     | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
+	     | sym* |  plan9* | psp* | sim* | xray* | os68k* | v88r* \
+	     | hiux* | abug | nacl* | netware* | windows* \
+	     | os9* | macos* | osx* | ios* \
+	     | mpw* | magic* | mmixware* | mon960* | lnews* \
+	     | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
+	     | aos* | aros* | cloudabi* | sortix* | twizzler* \
+	     | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \
+	     | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \
+	     | mirbsd* | netbsd* | dicos* | openedition* | ose* \
+	     | bitrig* | openbsd* | secbsd* | solidbsd* | libertybsd* | os108* \
+	     | ekkobsd* | freebsd* | riscix* | lynxos* | os400* \
+	     | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \
+	     | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \
+	     | udi* | lites* | ieee* | go32* | aux* | hcos* \
+	     | chorusrdb* | cegcc* | glidix* | serenity* \
+	     | cygwin* | msys* | pe* | moss* | proelf* | rtems* \
+	     | midipix* | mingw32* | mingw64* | mint* \
+	     | uxpv* | beos* | mpeix* | udk* | moxiebox* \
+	     | interix* | uwin* | mks* | rhapsody* | darwin* \
+	     | openstep* | oskit* | conix* | pw32* | nonstopux* \
+	     | storm-chaos* | tops10* | tenex* | tops20* | its* \
+	     | os2* | vos* | palmos* | uclinux* | nucleus* | morphos* \
+	     | scout* | superux* | sysv* | rtmk* | tpf* | windiss* \
+	     | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
+	     | skyos* | haiku* | rdos* | toppers* | drops* | es* \
+	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
+	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
+	     | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \
+	     | fiwix* | mlibc* )
+		;;
+	# This one is extra strict with allowed versions
+	sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		;;
+	none)
+		;;
+	kernel* )
+		# Restricted further below
+		;;
+	*)
+		echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2
+		exit 1
+		;;
+esac
+
+# As a final step for OS-related things, validate the OS-kernel combination
+# (given a valid OS), if there is a kernel.
+case $kernel-$os in
+	linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* \
+		   | linux-musl* | linux-relibc* | linux-uclibc* | linux-mlibc* )
+		;;
+	uclinux-uclibc* )
+		;;
+	managarm-mlibc* | managarm-kernel* )
+		;;
+	-dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* | -mlibc* )
+		# These are just libc implementations, not actual OSes, and thus
+		# require a kernel.
+		echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2
+		exit 1
+		;;
+	-kernel* )
+		echo "Invalid configuration \`$1': \`$os' needs explicit kernel." 1>&2
+		exit 1
+		;;
+	*-kernel* )
+		echo "Invalid configuration \`$1': \`$kernel' does not support \`$os'." 1>&2
+		exit 1
+		;;
+	kfreebsd*-gnu* | kopensolaris*-gnu*)
+		;;
+	vxworks-simlinux | vxworks-simwindows | vxworks-spe)
+		;;
+	nto-qnx*)
+		;;
+	os2-emx)
+		;;
+	*-eabi* | *-gnueabi*)
+		;;
+	-*)
+		# Blank kernel with real OS is always fine.
+		;;
+	*-*)
+		echo "Invalid configuration \`$1': Kernel \`$kernel' not known to work with OS \`$os'." 1>&2
+		exit 1
+		;;
+esac
+
 # Here we handle the case where we know the os, and the CPU type, but not the
 # manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
+case $vendor in
+	unknown)
+		case $cpu-$os in
+			*-riscix*)
 				vendor=acorn
 				;;
-			-sunos*)
+			*-sunos*)
 				vendor=sun
 				;;
-			-cnk*|-aix*)
+			*-cnk* | *-aix*)
 				vendor=ibm
 				;;
-			-beos*)
+			*-beos*)
 				vendor=be
 				;;
-			-hpux*)
+			*-hpux*)
 				vendor=hp
 				;;
-			-mpeix*)
+			*-mpeix*)
 				vendor=hp
 				;;
-			-hiux*)
+			*-hiux*)
 				vendor=hitachi
 				;;
-			-unos*)
+			*-unos*)
 				vendor=crds
 				;;
-			-dgux*)
+			*-dgux*)
 				vendor=dg
 				;;
-			-luna*)
+			*-luna*)
 				vendor=omron
 				;;
-			-genix*)
+			*-genix*)
 				vendor=ns
 				;;
-			-mvs* | -opened*)
+			*-clix*)
+				vendor=intergraph
+				;;
+			*-mvs* | *-opened*)
+				vendor=ibm
+				;;
+			*-os400*)
 				vendor=ibm
 				;;
-			-os400*)
+			s390-* | s390x-*)
 				vendor=ibm
 				;;
-			-ptx*)
+			*-ptx*)
 				vendor=sequent
 				;;
-			-tpf*)
+			*-tpf*)
 				vendor=ibm
 				;;
-			-vxsim* | -vxworks* | -windiss*)
+			*-vxsim* | *-vxworks* | *-windiss*)
 				vendor=wrs
 				;;
-			-aux*)
+			*-aux*)
 				vendor=apple
 				;;
-			-hms*)
+			*-hms*)
 				vendor=hitachi
 				;;
-			-mpw* | -macos*)
+			*-mpw* | *-macos*)
 				vendor=apple
 				;;
-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+			*-*mint | *-mint[0-9]* | *-*MiNT | *-MiNT[0-9]*)
 				vendor=atari
 				;;
-			-vos*)
+			*-vos*)
 				vendor=stratus
 				;;
 		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
 		;;
 esac
 
-echo $basic_machine$os
+echo "$cpu-$vendor-${kernel:+$kernel-}$os"
 exit
 
 # Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "timestamp='"
 # time-stamp-format: "%:y-%02m-%02d"
 # time-stamp-end: "'"
diff --git a/external/hypre/src/config/configure.in b/external/hypre/src/config/configure.in
index 75908c85..90b0c2f4 100644
--- a/external/hypre/src/config/configure.in
+++ b/external/hypre/src/config/configure.in
@@ -1,4 +1,4 @@
-dnl Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+dnl Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 dnl HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 dnl
 dnl SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -48,9 +48,9 @@ dnl * Set package information so it only has to be modified in one place
 dnl *********************************************************************
 
 m4_define([M4_HYPRE_NAME],    [hypre])
-m4_define([M4_HYPRE_VERSION], [2.22.1])
-m4_define([M4_HYPRE_NUMBER],  [22201])
-m4_define([M4_HYPRE_DATE],    [2021/08/20])
+m4_define([M4_HYPRE_VERSION], [2.33.0])
+m4_define([M4_HYPRE_NUMBER],  [23300])
+m4_define([M4_HYPRE_DATE],    [2025/04/03])
 m4_define([M4_HYPRE_TIME],    [00:00:00])
 m4_define([M4_HYPRE_BUGS],    [https://github.com/hypre-space/hypre/issues])
 m4_define([M4_HYPRE_SRCDIR],  [`pwd`])
@@ -59,11 +59,11 @@ m4_include([config/hypre_blas_macros.m4])
 m4_include([config/hypre_lapack_macros.m4])
 m4_include([config/hypre_macros_misc.m4])
 
-AC_PREREQ(2.59)
+AC_PREREQ([2.69])
 AC_REVISION($Id$)
 AC_INIT(M4_HYPRE_NAME, M4_HYPRE_VERSION)
 AC_CONFIG_HEADERS([HYPRE_config.h:config/HYPRE_config.h.in])
-AC_COPYRIGHT([Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+AC_COPYRIGHT([Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 HYPRE Project Developers. See the top-level COPYRIGHT file for details.])
 
 AC_CONFIG_AUX_DIR(config)
@@ -105,6 +105,28 @@ AC_SUBST(HYPRE_BUGS)
 
 AC_SUBST(HYPRE_SRCDIR)
 
+AS_IF([test -d "$HYPRE_SRCDIR/../.git"],
+  [
+  develop_string=$(git -C $HYPRE_SRCDIR describe --match 'v*' --long --abbrev=9)
+  develop_lastag=$(git -C $HYPRE_SRCDIR describe --match 'v*' --abbrev=0)
+  develop_number=$(git -C $HYPRE_SRCDIR rev-list --count $develop_lastag..HEAD)
+  develop_branch=$(git -C $HYPRE_SRCDIR rev-parse --abbrev-ref HEAD)
+  AS_IF([test -n "$develop_string"],
+    [
+    AC_DEFINE_UNQUOTED(HYPRE_DEVELOP_STRING, ["$develop_string"], [Develop branch string])
+    AC_DEFINE_UNQUOTED(HYPRE_DEVELOP_NUMBER, [$develop_number],   [Develop branch commit number])
+    AC_DEFINE_UNQUOTED(HYPRE_BRANCH_NAME,    ["$develop_branch"], [Feature branch string])
+    AS_IF([test "x$develop_branch" = "xmaster"],
+      [AC_DEFINE_UNQUOTED(HYPRE_DEVELOP_BRANCH, ["$develop_branch"], [Main development branch?])],
+      [AC_MSG_NOTICE([NOTE: On branch $develop_branch, not the main development branch])]
+    )
+    ],
+    [AC_MSG_NOTICE([NOTE: Could not describe development branch])]
+  )
+  ],
+  [AC_MSG_NOTICE([NOTE: Could not find .git directory])]
+)
+
 dnl *********************************************************************
 dnl * Clear variables defined by AC_INIT to avoid name conflicts with
 dnl * other packages.
@@ -144,17 +166,19 @@ hypre_using_mli=no
 
 hypre_using_openmp=no
 hypre_using_device_openmp=no
-hypre_using_insure=no
 hypre_using_cuda=no
 hypre_using_gpu=no
 hypre_using_um=no
 hypre_gpu_mpi=no
 hypre_using_gpu_profiling=no
 hypre_using_cuda_streams=no
-hypre_using_cusparse=yes
+hypre_using_cusparse=no
 hypre_using_cublas=no
-hypre_using_curand=yes
+hypre_using_curand=no
+hypre_using_cusolver=no
 hypre_using_device_pool=no
+hypre_using_device_malloc_async=no
+hypre_using_thrust_nosync=no
 hypre_using_umpire=no
 hypre_using_umpire_host=no
 hypre_using_umpire_device=no
@@ -170,6 +194,18 @@ hypre_found_cuda=no
 hypre_using_node_aware_mpi=no
 hypre_using_memory_tracker=no
 
+hypre_test_using_host=no
+
+hypre_cxxstd=11
+
+dnl *********************************************************************
+dnl * Initialize hypre-MAGMA variables
+dnl *********************************************************************
+hypre_using_magma=no
+hypre_user_gave_magma_inc=no
+hypre_user_gave_magma_lib=no
+hypre_user_gave_magma_libs=no
+hypre_user_gave_magma_lib_dirs=no
 
 dnl *********************************************************************
 dnl * Initialize hypre-HIP variables
@@ -177,11 +213,21 @@ dnl *********************************************************************
 hypre_using_hip=no
 hypre_using_rocsparse=no
 hypre_using_rocblas=no
+hypre_using_rocsolver=no
 hypre_using_rocrand=no
 
 hypre_found_hip=no
 
 
+dnl *********************************************************************
+dnl * Initialize hypre-SYCL variables
+dnl *********************************************************************
+hypre_using_sycl=no
+hypre_using_onemklsparse=no
+hypre_using_onemklblas=no
+hypre_using_onemklrand=no
+
+hypre_found_mkl=no
 
 dnl *********************************************************************
 dnl * Initialize flag-check variables
@@ -353,7 +399,7 @@ AS_HELP_STRING([--enable-hopscotch],
 )
 if test "$hypre_using_hopscotch" = "yes"
 then
-   AC_DEFINE(HYPRE_HOPSCOTCH, 1, [Define to 1 if hopscotch hashing])
+   AC_DEFINE(HYPRE_USING_HOPSCOTCH, 1, [Define to 1 if using hopscotch hashing])
 fi
 
 AC_ARG_ENABLE(fortran,
@@ -378,28 +424,6 @@ AS_HELP_STRING([--enable-unified-memory],
 [hypre_using_um=no]
 )
 
-AC_ARG_ENABLE(cuda-streams,
-AS_HELP_STRING([--enable-cuda-streams],
-               [Use CUDA streams (default is YES).]),
-[case "${enableval}" in
-    yes) hypre_using_cuda_streams=yes ;;
-    no)  hypre_using_cuda_streams=no ;;
-    *)   hypre_using_cuda_streams=yes ;;
- esac],
-[hypre_using_cuda_streams=yes]
-)
-
-AC_ARG_ENABLE(cusparse,
-AS_HELP_STRING([--enable-cusparse],
-               [Use cuSPARSE (default is YES).]),
-[case "${enableval}" in
-    yes) hypre_using_cusparse=yes ;;
-    no)  hypre_using_cusparse=no ;;
-    *)   hypre_using_cusparse=yes ;;
- esac],
-[hypre_using_cusparse=yes]
-)
-
 AC_ARG_ENABLE(device-memory-pool,
 AS_HELP_STRING([--enable-device-memory-pool],
                [Use device pooling allocator (default is NO).]),
@@ -411,61 +435,26 @@ AS_HELP_STRING([--enable-device-memory-pool],
 [hypre_using_device_pool=no]
 )
 
-AC_ARG_ENABLE(cublas,
-AS_HELP_STRING([--enable-cublas],
-               [Use cuBLAS (default is NO).]),
+AC_ARG_ENABLE(device-malloc-async,
+AS_HELP_STRING([--enable-device-malloc-async],
+               [Use device async malloc (default is NO).]),
 [case "${enableval}" in
-    yes) hypre_using_cublas=yes ;;
-    no)  hypre_using_cublas=no ;;
-    *)   hypre_using_cublas=no ;;
- esac],
-[hypre_using_cublas=no]
-)
-
-AC_ARG_ENABLE(curand,
-AS_HELP_STRING([--enable-curand],
-               [Use cuRAND (default is YES).]),
-[case "${enableval}" in
-    yes) hypre_using_curand=yes ;;
-    no)  hypre_using_curand=no ;;
-    *)   hypre_using_curand=yes ;;
- esac],
-[hypre_using_curand=yes]
-)
-
-
-
-AC_ARG_ENABLE(rocsparse,
-AS_HELP_STRING([--enable-rocsparse],
-               [Use rocSPARSE (default is YES).]),
-[case "${enableval}" in
-    yes) hypre_using_rocsparse=yes ;;
-    no)  hypre_using_rocsparse=no ;;
-    *)   hypre_using_rocsparse=yes ;;
+    yes) hypre_using_device_malloc_async=yes ;;
+    no)  hypre_using_device_malloc_async=no ;;
+    *)   hypre_using_device_malloc_async=no ;;
  esac],
-[hypre_using_rocsparse=yes]
+[hypre_using_device_malloc_async=no]
 )
 
-AC_ARG_ENABLE(rocblas,
-AS_HELP_STRING([--enable-rocblas],
-               [Use rocBLAS (default is NO).]),
+AC_ARG_ENABLE(thrust-nosync,
+AS_HELP_STRING([--enable-thrust-nosync],
+               [Use thrust par_nosync policy (default is NO).]),
 [case "${enableval}" in
-    yes) hypre_using_rocblas=yes ;;
-    no)  hypre_using_rocblas=no ;;
-    *)   hypre_using_rocblas=no ;;
+    yes) hypre_using_thrust_nosync=yes ;;
+    no)  hypre_using_thrust_nosync=no ;;
+    *)   hypre_using_thrust_nosync=no ;;
  esac],
-[hypre_using_rocblas=no]
-)
-
-AC_ARG_ENABLE(rocrand,
-AS_HELP_STRING([--enable-rocrand],
-               [Use rocRAND (default is YES).]),
-[case "${enableval}" in
-    yes) hypre_using_rocrand=yes ;;
-    no)  hypre_using_rocrand=no ;;
-    *)   hypre_using_rocrand=yes ;;
- esac],
-[hypre_using_rocrand=yes]
+[hypre_using_thrust_nosync=no]
 )
 
 AC_ARG_ENABLE(gpu-profiling,
@@ -493,6 +482,16 @@ AS_HELP_STRING([--enable-gpu-aware-mpi],
 dnl * The AC_DEFINE is below, after hypre_using_mpi is completely set
 dnl * Need to change to a new approach that always defines variable to some value
 
+dnl *********************************************************************
+dnl * Determine if user provided LD flags
+dnl *********************************************************************
+if test "x$LDFLAGS" = "x"
+then
+   hypre_user_chose_ldflags=no
+else
+   hypre_user_chose_ldflags=yes
+fi
+
 dnl *********************************************************************
 dnl * Determine if user provided C compiler or flags
 dnl *********************************************************************
@@ -584,6 +583,12 @@ then
    AR="ar -rcu"
 fi
 
+AC_ARG_WITH(cxxstandard,
+AS_HELP_STRING([--with-cxxstandard=val],
+               [User specifies c++ starndard in val.]),
+[hypre_cxxstd=$withval]
+)
+
 dnl *********************************************************************
 dnl * If the user has specified a c, c++, or fortran compiler on the
 dnl * command line, that compiler will be used.  No checks are done
@@ -621,6 +626,13 @@ AS_HELP_STRING([--with-extra-CXXFLAGS=ARG],
 [EXTRA_CXXFLAGS=$withval]
 )
 
+AC_ARG_WITH(extra-CUFLAGS,
+AS_HELP_STRING([--with-extra-CUFLAGS=ARG],
+               [Define extra CUDA compile flag, where ARG is a space-separated
+                list (enclosed in quotes) of directories.]),
+[EXTRA_CUFLAGS=$withval]
+)
+
 AC_ARG_WITH(extra-BUILDFLAGS,
 AS_HELP_STRING([--with-extra-BUILDFLAGS=ARG],
                [Define extra library build flag, where ARG is a space-separated
@@ -642,21 +654,6 @@ AS_HELP_STRING([--with-extra-ldpath=PATH],
 [LDFLAGS="-L`echo ${withval}|sed 's/ /\ -L/g'` ${LDFLAGS}"]
 )
 
-AC_ARG_WITH(insure,
-AS_HELP_STRING([--with-insure=FLAGS],
-               [FLAGS are options to pass to insure. Nothing is done
-                to verify that insure is available]),
-[case "${withval}" in
-    yes) hypre_using_insure=yes
-         hypre_using_debug=yes
-         hypre_insure_flags="" ;;
-    no)  ;;
-     *)  hypre_using_insure=yes
-         hypre_using_debug=yes
-         hypre_insure_flags="$withval" ;;
- esac]
-)
-
 AC_ARG_WITH(strict-checking,
 AS_HELP_STRING([--with-strict-checking],
                [Compiles without MPI ('--without-MPI') and tries to
@@ -680,7 +677,7 @@ AS_HELP_STRING([--with-strict-checking],
     CFLAGS=""
  elif test "x$GCC" = "xyes" || test "x$CC" = "xgcc"; then
     FFLAGS="-g -Wall"
-    CFLAGS="-g -Wall -std=gnu99 -pedantic"
+    CFLAGS="-g -Wall -std=gnu99 -pedantic -Wfloat-conversion -fsingle-precision-constant"
     CXXFLAGS="-g -Wall -Wshadow -fno-implicit-templates"
     CXXFLAGS="$CXXFLAGS -Woverloaded-virtual -ansi -pedantic"
  elif test "x$CC" = "xicc"; then
@@ -813,6 +810,18 @@ AS_HELP_STRING([--with-memory-tracker],
 [hypre_using_memory_tracker=no]
 )
 
+dnl ***** hypre tests using host memory
+AC_ARG_WITH(test_using_host,
+AS_HELP_STRING([--with-test-using-host],
+               [Use host memory in hypre test drivers (default is NO).]),
+[case "$withval" in
+    yes) hypre_test_using_host=yes;;
+    no)  hypre_test_using_host=no ;;
+    *)   hypre_test_using_host=no ;;
+ esac],
+[hypre_test_using_host=no]
+)
+
 dnl ***** BLAS
 
 AC_ARG_WITH(blas-lib,
@@ -1124,7 +1133,6 @@ AS_HELP_STRING([--with-cuda],
 [hypre_using_cuda=no]
 )
 
-
 dnl ***** HIP
 AC_ARG_WITH(hip,
 AS_HELP_STRING([--with-hip],
@@ -1137,6 +1145,72 @@ AS_HELP_STRING([--with-hip],
 [hypre_using_hip=no]
 )
 
+AC_ARG_ENABLE(rocsparse,
+AS_HELP_STRING([--enable-rocsparse],
+               [Use rocSPARSE (default is YES with HIP, otherwise NO).]),
+[case "${enableval}" in
+    yes) hypre_using_rocsparse=yes ;;
+    no)  hypre_using_rocsparse=no ;;
+    *)   hypre_using_rocsparse=yes ;;
+ esac],
+[case "$hypre_using_hip" in
+    yes) hypre_using_rocsparse=yes ;;
+    no)  hypre_using_rocsparse=no ;;
+    *)   hypre_using_rocsparse=no ;;
+ esac]
+)
+
+AC_ARG_ENABLE(rocblas,
+AS_HELP_STRING([--enable-rocblas],
+               [Use rocBLAS (default is NO).]),
+[case "${enableval}" in
+    yes) hypre_using_rocblas=yes ;;
+    no)  hypre_using_rocblas=no ;;
+    *)   hypre_using_rocblas=no ;;
+ esac],
+[hypre_using_rocblas=no]
+)
+
+AC_ARG_ENABLE(rocsolver,
+AS_HELP_STRING([--enable-rocsolver],
+               [Use rocSOLVER (default is NO).]),
+[case "${enableval}" in
+    yes) hypre_using_rocsolver=yes; hypre_using_rocblas=yes ;;
+    no)  hypre_using_rocsolver=no  ;;
+    *)   hypre_using_rocsolver=no  ;;
+ esac],
+[hypre_using_rocsolver=no]
+)
+
+AC_ARG_ENABLE(rocrand,
+AS_HELP_STRING([--enable-rocrand],
+               [Use rocRAND (default is YES with HIP, otherwise NO).]),
+[case "${enableval}" in
+    yes) hypre_using_rocrand=yes ;;
+    no)  hypre_using_rocrand=no ;;
+    *)   hypre_using_rocrand=yes ;;
+ esac],
+[case "$hypre_using_hip" in
+    yes) hypre_using_rocrand=yes ;;
+    no)  hypre_using_rocrand=no ;;
+    *)   hypre_using_rocrand=no ;;
+ esac]
+)
+
+dnl ***** SYCL
+AC_ARG_WITH(sycl,
+AS_HELP_STRING([--with-sycl],
+               [Use SYCL for Intel GPUs. (default is NO).]),
+[case "$withval" in
+    yes) hypre_using_sycl=yes ;;
+    no)  hypre_using_sycl=no ;;
+    *)   hypre_using_sycl=no ;;
+esac],
+[hypre_using_sycl=no]
+)
+
+dnl ***** CUDA options
+
 AC_ARG_WITH(cuda-home,
 AS_HELP_STRING([--with-cuda-home=DIR],
                [User specifies CUDA_HOME in DIR.]),
@@ -1161,6 +1235,143 @@ AS_HELP_STRING([--with-gpu-arch=ARG],
 ]
 )
 
+AC_ARG_ENABLE(cublas,
+AS_HELP_STRING([--enable-cublas],
+               [Use cuBLAS (default is YES with CUDA, otherwise NO).]),
+[case "${enableval}" in
+    yes) hypre_using_cublas=yes ;;
+    no)  hypre_using_cublas=no ;;
+    *)   hypre_using_cublas=no ;;
+ esac],
+[case "$hypre_using_cuda" in
+    yes) hypre_using_cublas=yes ;;
+    no)  hypre_using_cublas=no ;;
+    *)   hypre_using_cublas=no ;;
+ esac]
+)
+
+AC_ARG_ENABLE(curand,
+AS_HELP_STRING([--enable-curand],
+               [Use cuRAND (default is YES with CUDA, otherwise NO).]),
+[case "${enableval}" in
+    yes) hypre_using_curand=yes ;;
+    no)  hypre_using_curand=no ;;
+    *)   hypre_using_curand=no ;;
+ esac],
+[case "$hypre_using_cuda" in
+    yes) hypre_using_curand=yes ;;
+    no)  hypre_using_curand=no ;;
+    *)   hypre_using_curand=no ;;
+ esac]
+)
+
+AC_ARG_ENABLE(cuda-streams,
+AS_HELP_STRING([--enable-cuda-streams],
+               [Use CUDA streams (default is YES with CUDA, otherwise NO).]),
+[case "${enableval}" in
+    yes) hypre_using_cuda_streams=yes ;;
+    no)  hypre_using_cuda_streams=no  ;;
+    *)   hypre_using_cuda_streams=yes ;;
+ esac],
+[case "$hypre_using_cuda" in
+    yes) hypre_using_cuda_streams=yes ;;
+    no)  hypre_using_cuda_streams=no  ;;
+    *)   hypre_using_cuda_streams=yes ;;
+ esac],
+)
+
+AC_ARG_ENABLE(cusparse,
+AS_HELP_STRING([--enable-cusparse],
+               [Use cuSPARSE (default is YES with CUDA, otherwise NO).]),
+[case "${enableval}" in
+    yes) hypre_using_cusparse=yes ;;
+    no)  hypre_using_cusparse=no ;;
+    *)   hypre_using_cusparse=no ;;
+ esac],
+[case "$hypre_using_cuda" in
+    yes) hypre_using_cusparse=yes ;;
+    no)  hypre_using_cusparse=no ;;
+    *)   hypre_using_cusparse=no ;;
+ esac],
+)
+
+AC_ARG_ENABLE(cusolver,
+AS_HELP_STRING([--enable-cusolver],
+               [Use cuSOLVER (default is NO).]),
+[case "${enableval}" in
+    yes) hypre_using_cusolver=yes ;;
+    no)  hypre_using_cusolver=no  ;;
+    *)   hypre_using_cusolver=no  ;;
+ esac],
+[hypre_using_cusolver=no]
+)
+
+dnl ***** SYCL options
+
+AC_ARG_WITH(sycl-target,
+AS_HELP_STRING([--with-sycl-target=ARG],
+               [User specifies sycl targets for AOT compilation in ARG, where ARG is a comma-separated
+                list (enclosed in quotes), e.g. "spir64_gen".]),
+[
+ if test "x${withval}" != "x"
+ then
+    if test "x${HYPRE_SYCL_TARGET}" = "x"
+    then
+       HYPRE_SYCL_TARGET="${withval}"
+    fi
+ fi
+]
+)
+
+AC_ARG_WITH(sycl-target-backend,
+AS_HELP_STRING([--with-sycl-target-backend=ARG],
+               [User specifies additional options for the sycl target backend for AOT compilation in ARG,
+                where ARG contains the desired options (enclosed in double+single quotes),
+                e.g. --with-sycl-target-backend="'-device 12.1.0,12.4.0'".]),
+[
+ if test "x${withval}" != "x"
+ then
+    if test "x${HYPRE_SYCL_TARGET_BACKEND}" = "x"
+    then
+       HYPRE_SYCL_TARGET_BACKEND="${withval}"
+    fi
+ fi
+]
+)
+
+AC_ARG_ENABLE(onemklsparse,
+AS_HELP_STRING([--enable-onemklsparse],
+               [Use oneMKL sparse (default is YES).]),
+[case "${enableval}" in
+    yes) hypre_using_onemklsparse=yes ;;
+    no)  hypre_using_onemklsparse=no ;;
+    *)   hypre_using_onemklsparse=yes ;;
+ esac],
+[hypre_using_onemklsparse=yes]
+)
+
+AC_ARG_ENABLE(onemklblas,
+AS_HELP_STRING([--enable-onemklblas],
+               [Use oneMKL blas (default is YES).]),
+[case "${enableval}" in
+    yes) hypre_using_onemklblas=yes ;;
+    no)  hypre_using_onemklblas=no ;;
+    *)   hypre_using_onemklblas=yes ;;
+ esac],
+[hypre_using_onemklblas=yes]
+)
+
+AC_ARG_ENABLE(onemklrand,
+AS_HELP_STRING([--enable-onemklrand],
+               [Use oneMKL rand (default is YES).]),
+[case "${enableval}" in
+    yes) hypre_using_onemklrand=yes ;;
+    no)  hypre_using_onemklrand=no ;;
+    *)   hypre_using_onemklrand=yes ;;
+ esac],
+[hypre_using_onemklrand=yes]
+)
+
 dnl ***** RAJA
 
 AC_ARG_WITH(raja,
@@ -1381,6 +1592,68 @@ AS_HELP_STRING([--with-umpire-lib-dirs=DIRS],
 ]
 )
 
+dnl ***** MAGMA
+
+AC_ARG_WITH(magma,
+AS_HELP_STRING([--with-magma],
+               [Use MAGMA (Matrix Algebra for GPUs and Multicore Architectures).]),
+[case "${withval}" in
+    yes) hypre_using_magma=yes;;
+    no)  hypre_using_magma=no ;;
+    *)   hypre_using_magma=no ;;
+ esac],
+[hypre_using_magma=no]
+)
+
+AS_IF([test "x$with_magma" = "xyes"],
+      [AC_DEFINE(HYPRE_USING_MAGMA, 1, [Define to 1 if MAGMA is enabled])],
+      [])
+
+AC_ARG_WITH(magma-include,
+AS_HELP_STRING([--with-magma-include=DIR],
+               [User specifies that MAGMA headers are in DIR.  The options
+                --with-magma-include --with-magma-libs and
+                --with-magma-dirs must be used together.]),
+[for magma_dir in $withval; do
+    HYPRE_MAGMA_INCLUDE="-I$magma_dir $HYPRE_MAGMA_INCLUDE"
+done;
+hypre_user_gave_magma_inc=yes]
+)
+
+AC_ARG_WITH(magma-lib,
+AS_HELP_STRING([--with-magma-lib=LIBS],
+               [LIBS is space-separated linkable list (enclosed in quotes) of libraries
+                needed for MAGMA. OK to use -L and -l flags in the list]),
+[for magma_lib in $withval; do
+    HYPRE_MAGMA_LIB="$magma_lib $HYPRE_MAGMA_LIB"
+ done;
+hypre_user_gave_magma_lib=yes]
+)
+
+AC_ARG_WITH(magma-libs,
+AS_HELP_STRING([--with-magma-libs=LIBS],
+               [LIBS is space-separated list (enclosed in quotes) of libraries
+                needed for MAGMA (base name only). The options --with-magma-libs and
+                --with-magma-lib-dirs must be used together.]),
+[for magma_lib in $withval; do
+    HYPRE_MAGMA_LIB="-l$magma_lib $HYPRE_MAGMA_LIB"
+ done;
+hypre_user_gave_magma_libs=yes]
+)
+
+AC_ARG_WITH(magma-lib-dirs,
+AS_HELP_STRING([--with-magma-lib-dirs=DIRS],
+               [DIRS is space-separated list (enclosed in quotes) of
+                directories containing the libraries specified by
+                --with-magma-libs, e.g "usr/lib /usr/local/lib".
+                The  options --with-magma-libs and --with-magma-lib-dirs
+                must be used together.]),
+[for magma_lib_dir in $withval; do
+    HYPRE_MAGMA_LIB_DIR="-L$magma_lib_dir $HYPRE_MAGMA_LIB_DIR"
+ done;
+hypre_user_gave_magma_lib_dirs=yes]
+)
+
 dnl ***** Caliper
 
 AC_ARG_WITH(caliper,
@@ -1424,16 +1697,16 @@ then
    then
       if test "$hypre_using_openmp" = "yes"
       then
-         AC_CHECK_PROGS(CC, [xlc_r xlC_r xlc xlC icc icpc gcc g++ pgcc pgCC cc CC kcc KCC])
+         AC_CHECK_PROGS(CC, [xlc_r xlC_r xlc xlC icx icc icpc icpx gcc g++ pgcc pgCC cc CC kcc KCC])
       else
-         AC_CHECK_PROGS(CC, [xlc xlC icc icpc gcc g++ pgcc pgCC cc CC kcc KCC])
+         AC_CHECK_PROGS(CC, [xlc xlC icx icc icpc icpx gcc g++ pgcc pgCC cc CC kcc KCC])
       fi
    else
       if test "$hypre_using_openmp" = "yes"
       then
-         AC_CHECK_PROGS(CC, [mpxlc mpixlc_r mpixlc mpiicc mpigcc mpicc mpipgcc mpipgicc])
+         AC_CHECK_PROGS(CC, [mpxlc mpixlc_r mpixlc mpiicx mpiicc mpigcc mpipgcc mpipgicc mpicc])
       else
-         AC_CHECK_PROGS(CC, [mpxlc mpixlc mpiicc mpigcc mpicc mpipgcc mpipgicc])
+         AC_CHECK_PROGS(CC, [mpxlc mpixlc mpiicx mpiicc mpigcc mpipgcc mpipgicc mpicc])
       fi
    fi
 
@@ -1449,16 +1722,16 @@ then
    then
       if test "$hypre_using_openmp" = "yes"
       then
-         AC_CHECK_PROGS(CXX, [xlC_r xlc_r xlC xlc icpc icc g++ gcc pgCC pgcc pgc++ CC cc KCC kcc])
+         AC_CHECK_PROGS(CXX, [xlC_r xlc_r xlC xlc icpx icx icpc icc g++ gcc pgCC pgcc pgc++ CC cc KCC kcc])
       else
-         AC_CHECK_PROGS(CXX, [xlC xlc icpc icc g++ gcc pgCC pgcc pgc++ CC cc KCC kcc])
+         AC_CHECK_PROGS(CXX, [xlC xlc icpx icx icpc icc g++ gcc pgCC pgcc pgc++ CC cc KCC kcc])
       fi
    else
       if test "$hypre_using_openmp" = "yes"
       then
-         AC_CHECK_PROGS(CXX, [mpxlC mpixlcxx_r mpixlcxx mpixlC mpiicpc mpig++ mpic++ mpicxx mpiCC mpipgCC mpipgic++])
+         AC_CHECK_PROGS(CXX, [CC mpxlC mpixlcxx_r mpixlcxx mpixlC mpiicpx mpiicpc mpig++ mpic++ mpicxx mpiCC mpipgCC mpipgic++])
       else
-         AC_CHECK_PROGS(CXX, [mpxlC mpixlcxx mpixlC mpiicpc mpig++ mpic++ mpicxx mpiCC mpipgCC mpipgic++])
+         AC_CHECK_PROGS(CXX, [CC mpxlC mpixlcxx mpixlC mpiicpx mpiicpc mpig++ mpic++ mpicxx mpiCC mpipgCC mpipgic++])
       fi
    fi
 
@@ -1474,16 +1747,16 @@ then
    then
       if test "$hypre_using_openmp" = "yes"
       then
-         AC_CHECK_PROGS(FC, [xlf_r ifort gfortran g77 g95 pgf77 pgfortran f77])
+         AC_CHECK_PROGS(FC, [xlf_r ifx ifort gfortran g77 g95 pgf77 pgfortran f77])
       else
-         AC_CHECK_PROGS(FC, [xlf ifort gfortran g77 g95 pgf77 pgfortran  f77])
+         AC_CHECK_PROGS(FC, [xlf ifx ifort gfortran g77 g95 pgf77 pgfortran f77])
       fi
    else
       if test "$hypre_using_openmp" = "yes"
       then
-         AC_CHECK_PROGS(FC, [mpxlf mpixlf77_r mpiifort mpif77 mpipgf77 mpipgifort])
+         AC_CHECK_PROGS(FC, [mpxlf mpixlf77_r mpiifx mpiifort mpif77 mpipgf77 mpipgifort])
       else
-         AC_CHECK_PROGS(FC, [mpxlf mpixlf77 mpiifort mpif77 mpipgf77 mpipgifort])
+         AC_CHECK_PROGS(FC, [mpxlf mpixlf77 mpiifx mpiifort mpif77 mpipgf77 mpipgifort])
       fi
    fi
 
@@ -1503,21 +1776,46 @@ then
    AC_MSG_ERROR([--with-cuda and --with-hip are mutually exclusive])
 fi
 
+if [test "x$hypre_using_cuda" = "xyes" && test "x$hypre_using_sycl" = "xyes"]
+then
+   AC_MSG_ERROR([--with-cuda and --with-sycl are mutually exclusive])
+fi
+
 if [test "x$hypre_using_hip" = "xyes" && test "x$hypre_using_device_openmp" = "xyes"]
 then
    AC_MSG_ERROR([--with-hip and --with-device-openmp are mutually exclusive])
 fi
 
+if [test "x$hypre_using_hip" = "xyes" && test "x$hypre_using_sycl" = "xyes"]
+then
+   AC_MSG_ERROR([--with-hip and --with-sycl are mutually exclusive])
+fi
+
+if [test "x$hypre_using_sycl" = "xyes" && test "x$hypre_using_device_openmp" = "xyes"]
+then
+   AC_MSG_ERROR([--with-sycl and --with-device-openmp are mutually exclusive])
+fi
+
 
 if test "$hypre_user_chose_cudacompilers" = "no"
 then
    if test "$hypre_using_device_openmp" = "yes"
    then
-      if test "$hypre_using_mpi" = "no"
+      if test "x$hypre_using_kokkos" = "xyes"
       then
-         AC_CHECK_PROGS(CUCC, [xlc-gpu clang-gpu])
+         if test "$hypre_using_mpi" = "no"
+         then
+            AC_CHECK_PROGS(CUCC, [clang++-gpu icpx])
+         else
+            AC_CHECK_PROGS(CUCC, [mpiclang++-gpu mpiicpx])
+         fi
       else
-         AC_CHECK_PROGS(CUCC, [mpixlc-gpu mpiclang-gpu])
+         if test "$hypre_using_mpi" = "no"
+         then
+            AC_CHECK_PROGS(CUCC, [xlc-gpu clang-gpu icx])
+         else
+            AC_CHECK_PROGS(CUCC, [mpixlc-gpu mpiclang-gpu mpiicx])
+         fi
       fi
    fi
 
@@ -1531,6 +1829,11 @@ then
    then
       AC_CHECK_PROGS(CUCC, hipcc)
    fi
+
+   if test "$hypre_using_sycl" = "yes"
+   then
+      AC_CHECK_PROGS(CUCC, icpx)
+   fi
 fi
 
 dnl *********************************************************************
@@ -1596,6 +1899,11 @@ then
    AC_DEFINE(HYPRE_USING_MEMORY_TRACKER, 1, [Define to 1 if want to track memory operations in hypre])
 fi
 
+if test "$hypre_test_using_host" = "yes"
+then
+   AC_DEFINE(HYPRE_TEST_USING_HOST, 1, [Define to 1 if want to use host in hypre tests])
+fi
+
 dnl *********************************************************************
 dnl * Define appropriate variables if user set blas to either essl or dxml
 dnl *********************************************************************
@@ -1779,26 +2087,6 @@ then
    BUILD_JAVA=1
 fi
 
-dnl *********************************************************************
-dnl * Set INSURE options
-dnl *********************************************************************
-if test "$hypre_using_insure" = "yes"
-then
-dnl   LINK_F77="insure"
-   LINK_FC="insure"
-   LINK_CC="insure"
-   LINK_CXX="insure"
-   LDFLAGS=`mpicc -link-info | awk '{$1=""; print}'`
-   LDFLAGS="$LDFLAGS ${hypre_insure_flags}"
-dnl   F77="insure"
-   FC="insure"
-   CC="insure"
-   CXX="insure"
-   FFLAGS="`mpicc -link-info | awk '{$1=""; print}'` $FFLAGS"
-   CFLAGS="`mpicc -link-info | awk '{$1=""; print}'` $CFLAGS"
-   CXXFLAGS="`mpicc -link-info | awk '{$1=""; print}'` $CXXFLAGS"
-fi
-
 dnl *********************************************************************
 dnl * FIND libraries needed to link with hypre
 dnl *********************************************************************
@@ -1903,7 +2191,7 @@ dnl   BUILD_F77_SHARED="${F77} ${SHARED_BUILD_FLAG}"
       BUILD_CC_SHARED="\${CC} ${SHARED_BUILD_FLAG}"
    fi
    BUILD_CXX_SHARED="\${CXX} ${SHARED_BUILD_FLAG}"
-   if test "$hypre_using_cuda" == "yes" || test "$hypre_using_hip" == "yes"
+   if test "$hypre_using_cuda" == "yes" || test "$hypre_using_hip" == "yes" || test "$hypre_using_kokkos" == "yes"
    then
       dnl BUILD_CC_SHARED="\${CUCC} ${SHARED_BUILD_FLAG}"
       BUILD_CC_SHARED="\${CXX} ${SHARED_BUILD_FLAG}"
@@ -1937,22 +2225,54 @@ then
    fi
 fi
 
+dnl *********************************************************************
+dnl * Warn if MAGMA options are incomplete
+dnl *********************************************************************
+if test "x$hypre_using_magma" = "xyes"
+then
+   if test "x$hypre_user_gave_magma_inc" != "xyes"
+   then
+       AC_MSG_WARN([*******************************************************])
+       AC_MSG_WARN([Configuring with --with-magma=yes without providing])
+       AC_MSG_WARN([--with-magma-include=<path-to-magma-include>.])
+       AC_MSG_WARN([Using default user include path.])
+       AC_MSG_WARN([NOTE: MAGMA may not work.])
+       AC_MSG_WARN([*******************************************************])
+   fi
+   if [test "x$hypre_user_gave_magma_lib" != "xyes"]
+   then
+       AC_MSG_WARN([*******************************************************])
+       AC_MSG_WARN([Configuring with --with-magma=yes without providing])
+       AC_MSG_WARN([--with-magma-lib=<path-to-magma-lib>.])
+       AC_MSG_WARN([Using default user library path.])
+       AC_MSG_WARN([NOTE: MAGMA may not work.])
+       AC_MSG_WARN([*******************************************************])
+   fi
+fi
+
+dnl *********************************************************************
+dnl * Check for unified memory
+dnl *********************************************************************
+
 if [test "x$hypre_using_um" = "xyes"]
 then
-   if [test "x$hypre_using_cuda" != "xyes" && test "x$hypre_using_device_openmp" != "xyes" && test "x$hypre_using_hip" != "xyes"]
+   if [test "x$hypre_using_cuda" != "xyes" && test "x$hypre_using_device_openmp" != "xyes" && test "x$hypre_using_hip" != "xyes" && test "x$hypre_using_sycl" != "xyes"]
    then
-      AC_MSG_ERROR([Asked for unified memory, but not using CUDA, HIP, or device OpenMP!])
+      AC_MSG_ERROR([Asked for unified memory, but not using CUDA, HIP, SYCL, or device OpenMP!])
    fi
-fi dnl hypre_using_um
+fi
+
+dnl *********************************************************************
+dnl * Check for CUDA header
+dnl *********************************************************************
 
-dnl CUDA
-if [test "$hypre_using_cuda" = "yes" || test "$hypre_using_device_openmp" = "yes"]
+if [test "$hypre_using_cuda" = "yes"]
 then
-   AC_CHECK_HEADERS(["${CUDA_HOME}/include/cuda.h"], [hypre_found_cuda=yes; HYPRE_CUDA_PATH=${CUDA_HOME}])
+   AC_CHECK_HEADER(["${CUDA_HOME}/include/cuda.h"], [hypre_found_cuda=yes; HYPRE_CUDA_PATH=${CUDA_HOME}])
 
    if test "x$hypre_found_cuda" != "xyes"
    then
-      AC_CHECK_HEADERS(["${CUDA_PATH}/include/cuda.h"], [hypre_found_cuda=yes; HYPRE_CUDA_PATH=${CUDA_PATH}])
+      AC_CHECK_HEADER(["${CUDA_PATH}/include/cuda.h"], [hypre_found_cuda=yes; HYPRE_CUDA_PATH=${CUDA_PATH}])
    fi
 
    if test "x$hypre_found_cuda" != "xyes"
@@ -1961,6 +2281,94 @@ then
    fi
 fi
 
+dnl *********************************************************************
+dnl * Check for cuSPARSE header
+dnl *********************************************************************
+
+if [test "$hypre_using_cusparse" = "yes"]
+then
+   AC_CHECK_FILE([${HYPRE_CUDA_PATH}/include/cusparse.h], [hypre_found_cusparse=yes; HYPRE_VENDOR_MATH_PATH=${HYPRE_CUDA_PATH}])
+
+   if test "x$hypre_found_cusparse" != "xyes"
+   then
+      AC_CHECK_FILE([${HYPRE_CUDA_PATH}/../math_libs/include/cusparse.h],
+                    [hypre_found_cusparse=yes; HYPRE_VENDOR_MATH_PATH=$(readlink -f ${HYPRE_CUDA_PATH}/../math_libs); AC_MSG_NOTICE([setting vendor math path to ${HYPRE_VENDOR_MATH_PATH}])])
+   fi
+
+   if test "x$hypre_found_cusparse" != "xyes"
+   then
+      AC_CHECK_FILE([${HYPRE_CUDA_PATH}/../../math_libs/include/cusparse.h],
+                    [hypre_found_cusparse=yes; HYPRE_VENDOR_MATH_PATH=$(readlink -f ${HYPRE_CUDA_PATH}/../../math_libs); AC_MSG_NOTICE([setting vendor math path to ${HYPRE_VENDOR_MATH_PATH}])])
+   fi
+
+   if test "x$hypre_found_cusparse" != "xyes"
+   then
+      AC_MSG_ERROR([unable to find cusparse.h ...])
+   fi
+fi
+
+dnl *********************************************************************
+dnl * Check for cuBLAS header
+dnl *********************************************************************
+
+if [test "$hypre_using_cublas" = "yes"]
+then
+   AC_CHECK_FILE([${HYPRE_CUDA_PATH}/include/cublas.h], [hypre_found_cublas=yes; HYPRE_VENDOR_MATH_PATH=${HYPRE_CUDA_PATH}])
+
+   if test "x$hypre_found_cublas" != "xyes" && test "x${HYPRE_VENDOR_MATH_PATH}" != "x"
+   then
+      AC_CHECK_FILE([${HYPRE_VENDOR_MATH_PATH}/include/cublas.h], [hypre_found_cublas=yes;])
+   fi
+
+   if test "x$hypre_found_cublas" != "xyes"
+   then
+      AC_CHECK_FILE([${HYPRE_CUDA_PATH}/../math_libs/include/cublas.h],
+                    [hypre_found_cublas=yes; HYPRE_VENDOR_MATH_PATH=$(readlink -f ${HYPRE_CUDA_PATH}/../math_libs); AC_MSG_NOTICE([setting vendor math path to ${HYPRE_VENDOR_MATH_PATH}])])
+   fi
+
+   if test "x$hypre_found_cublas" != "xyes"
+   then
+      AC_CHECK_FILE([${HYPRE_CUDA_PATH}/../../math_libs/include/cublas.h],
+                    [hypre_found_cublas=yes; HYPRE_VENDOR_MATH_PATH=$(readlink -f ${HYPRE_CUDA_PATH}/../../math_libs); AC_MSG_NOTICE([setting vendor math path to ${HYPRE_VENDOR_MATH_PATH}])])
+   fi
+
+   if test "x$hypre_found_cublas" != "xyes"
+   then
+      AC_MSG_ERROR([unable to find cublas.h ...])
+   fi
+fi
+
+dnl *********************************************************************
+dnl * Check for cuSOLVER header
+dnl *********************************************************************
+
+if [test "$hypre_using_cusolver" = "yes"]
+then
+   AC_CHECK_FILE([${HYPRE_CUDA_PATH}/include/cusolverDn.h], [hypre_found_cusolver=yes; HYPRE_VENDOR_MATH_PATH=${HYPRE_CUDA_PATH}])
+
+   if test "x$hypre_found_cusolver" != "xyes" && test "x${HYPRE_VENDOR_MATH_PATH}" != "x"
+   then
+      AC_CHECK_FILE([${HYPRE_VENDOR_MATH_PATH}/include/cusolverDn.h], [hypre_found_cusolver=yes;])
+   fi
+
+   if test "x$hypre_found_cusolver" != "xyes"
+   then
+      AC_CHECK_FILE([${HYPRE_CUDA_PATH}/../math_libs/include/cusolverDn.h],
+                    [hypre_found_cusolver=yes; HYPRE_VENDOR_MATH_PATH=$(readlink -f ${HYPRE_CUDA_PATH}/../math_libs); AC_MSG_NOTICE([setting vendor math path to ${HYPRE_VENDOR_MATH_PATH}])])
+   fi
+
+   if test "x$hypre_found_cusolver" != "xyes"
+   then
+      AC_CHECK_FILE([${HYPRE_CUDA_PATH}/../../math_libs/include/cusolverDn.h],
+                    [hypre_found_cusolver=yes; HYPRE_VENDOR_MATH_PATH=$(readlink -f ${HYPRE_CUDA_PATH}/../../math_libs); AC_MSG_NOTICE([setting vendor math path to ${HYPRE_VENDOR_MATH_PATH}])])
+   fi
+
+   if test "x$hypre_found_cusolver" != "xyes"
+   then
+      AC_MSG_ERROR([unable to find cusolverDn.h ...])
+   fi
+fi
+
 dnl *********************************************************************
 dnl * Check for HIP header
 dnl *********************************************************************
@@ -1977,12 +2385,10 @@ AS_IF([ test x"$hypre_using_hip" == x"yes" ],
               [ HYPRE_ROCM_PREFIX=/opt/rocm ])
 
         AC_SUBST(HYPRE_ROCM_PREFIX)
-        AC_CHECK_HEADERS( ["${HYPRE_ROCM_PREFIX}/include/hip/hip_common.h"],
-                          [hypre_found_hip=yes],
-                          [AC_MSG_ERROR([unable to find ${HYPRE_ROCM_PREFIX}/include/hip/hip_common.h ... Ensure ROCm is installed and set ROCM_PATH environment variable to ROCm installation path.])] )],
-      [])
-
-
+        AC_CHECK_HEADER( ["${HYPRE_ROCM_PREFIX}/include/hip/hip_common.h"],
+                         [hypre_found_hip=yes],
+                         [AC_MSG_ERROR([unable to find ${HYPRE_ROCM_PREFIX}/include/hip/hip_common.h ... Ensure ROCm is installed and set ROCM_PATH environment variable to ROCm installation path.])] )],
+                         [])
 
 dnl *********************************************************************
 dnl * Set raja options
@@ -1991,11 +2397,14 @@ if test "x$hypre_using_raja" = "xyes"
 then
    AC_DEFINE(HYPRE_USING_RAJA, 1, [Define to 1 if executing on host/device with RAJA])
 
-   if test "$hypre_using_cuda" != "yes"
+   if test "$hypre_user_chose_cxxflags" = "no"
    then
-      if [test "$CXX" = "mpixlC" || test "$CXX" = "xlC_r"]
+      if test "$hypre_using_cuda" != "yes"
       then
-         CXXFLAGS="${CXXFLAGS} -+ -std=c++11"
+         if [test "$CXX" = "mpixlC" || test "$CXX" = "xlC_r"]
+         then
+            CXXFLAGS="${CXXFLAGS} -+ -std=c++${hypre_cxxstd}"
+         fi
       fi
    fi
 
@@ -2012,18 +2421,25 @@ if test "x$hypre_using_kokkos" = "xyes"
 then
    AC_DEFINE(HYPRE_USING_KOKKOS, 1, [Define to 1 if executing on host/device with KOKKOS])
 
-   if test "$hypre_using_cuda" != "yes"
+   if test "$hypre_user_chose_cxxflags" = "no"
    then
-      if [test "$CXX" = "mpixlC" || test "$CXX" = "xlC_r"]
+      CXXFLAGS="${CXXFLAGS} -std=c++${hypre_cxxstd}"
+
+      if [test "$CXX" = "mpiclang++" || test "$CXX" = "mpiclang++-gpu" || test "$CXX" = "clang++" || test "$CXX" = "clang++-gpu" || test "$CXX" = "icpx" || test "$CXX" = "mpiicpx"]
+      then
+         CXXFLAGS="${CXXFLAGS} -x c++"
+      fi
+
+      if [test "$CXX" = "mpixlC" || test "$CXX" = "mpixlC-gpu" || test "$CXX" = "xlC" || test "$CXX" = "xlC-gpu"]
       then
-         CXXFLAGS="${CXXFLAGS} -+ -std=c++11"
+         CXXFLAGS="${CXXFLAGS} -+"
       fi
    fi
 
    dnl let CC be CXX
-   CC=${CXX}
+   dnl CC=${CXX}
    LINK_CC=${LINK_CXX}
-   CFLAGS=${CXXFLAGS}
+   dnl CFLAGS=${CXXFLAGS}
 fi
 
 dnl *********************************************************************
@@ -2059,7 +2475,7 @@ then
 fi
 
 dnl *********************************************************************
-dnl * Set cuda options
+dnl * Set CUDA options
 dnl *********************************************************************
 if test "$hypre_using_cuda" = "yes"
 then
@@ -2067,32 +2483,6 @@ then
 
    AC_DEFINE(HYPRE_USING_CUDA, 1, [Define to 1 if executing on device with CUDA])
 
-   AC_DEFINE(HYPRE_USING_CUSPARSE, 1, [Define to 1 if using cuSPARSE])
-
-   if test "$hypre_using_gpu_profiling" = "yes"
-   then
-      AC_DEFINE(HYPRE_USING_NVTX, 1, [Define to 1 if using NVIDIA Tools Extension (NVTX)])
-   fi
-
-   if test "$hypre_using_cusparse" = "yes"
-   then
-      AC_DEFINE(HYPRE_USING_CUSPARSE, 1, [Define to 1 if using cuSPARSE])
-   fi
-
-   if test "$hypre_using_device_pool" = "yes"
-   then
-      AC_DEFINE(HYPRE_USING_DEVICE_POOL, 1, [Define to 1 if using device pooling allocator])
-   fi
-
-   if test "$hypre_using_cublas" = "yes"
-   then
-      AC_DEFINE(HYPRE_USING_CUBLAS, 1, [Define to 1 if using cuBLAS])
-   fi
-
-   if test "$hypre_using_curand" = "yes"
-   then
-      AC_DEFINE(HYPRE_USING_CURAND, 1, [Define to 1 if using cuRAND])
-   fi
 
    LINK_CC=${LINK_CXX}
    dnl LINK_CC='${CUCC}'
@@ -2111,7 +2501,7 @@ then
 
    if test "$hypre_user_chose_cuflags" = "no"
    then
-      CUFLAGS="-lineinfo -expt-extended-lambda -std=c++11 --x cu"
+      CUFLAGS="-lineinfo -expt-extended-lambda -std=c++${hypre_cxxstd} --x cu"
       if test "$hypre_using_debug" = "yes"
       then
          CUFLAGS="-g -O0 ${CUFLAGS}"
@@ -2136,25 +2526,61 @@ then
    dnl LDFLAGS="-Xcompiler \"${LDFLAGS}\""
    HYPRE_CUDA_INCLUDE='-I${HYPRE_CUDA_PATH}/include'
    HYPRE_CUDA_LIBS='-L${HYPRE_CUDA_PATH}/lib64 -lcudart'
+
+   AS_IF([test x"$hypre_using_cusparse" == x"yes" || test x"$hypre_using_cublas" == x"yes" || test x"$hypre_using_cusolver" == x"yes"],
+         [AS_IF([test "x$HYPRE_CUDA_PATH" != "x$HYPRE_VENDOR_MATH_PATH"],
+          [HYPRE_CUDA_INCLUDE+=" -I${HYPRE_VENDOR_MATH_PATH}/include"
+           HYPRE_CUDA_LIBS+=" -L${HYPRE_VENDOR_MATH_PATH}/lib64"])])
+
    if test "$hypre_using_gpu_profiling" = "yes"
    then
+      AC_DEFINE(HYPRE_USING_NVTX, 1, [Define to 1 if using NVIDIA Tools Extension (NVTX)])
       HYPRE_CUDA_LIBS+=" -lnvToolsExt"
    fi
 
    if test "$hypre_using_cusparse" = "yes"
    then
+      AC_DEFINE(HYPRE_USING_CUSPARSE, 1, [Define to 1 if using cuSPARSE])
       HYPRE_CUDA_LIBS+=" -lcusparse"
    fi
 
    if test "$hypre_using_cublas" = "yes"
    then
+      AC_DEFINE(HYPRE_USING_CUBLAS, 1, [Define to 1 if using cuBLAS])
       HYPRE_CUDA_LIBS+=" -lcublas"
    fi
 
    if test "$hypre_using_curand" = "yes"
    then
+      AC_DEFINE(HYPRE_USING_CURAND, 1, [Define to 1 if using cuRAND])
       HYPRE_CUDA_LIBS+=" -lcurand"
    fi
+
+   if test "$hypre_using_cusolver" = "yes"
+   then
+      AC_DEFINE(HYPRE_USING_CUSOLVER, 1, [Define to 1 if using cuSOLVER])
+      HYPRE_CUDA_LIBS+=" -lcusolver"
+   fi
+
+   if test "$hypre_using_device_pool" = "yes"
+   then
+      AC_DEFINE(HYPRE_USING_DEVICE_POOL, 1, [Define to 1 if using device pooling allocator])
+   fi
+
+   if test "$hypre_using_device_malloc_async" = "yes"
+   then
+      AC_DEFINE(HYPRE_USING_DEVICE_MALLOC_ASYNC, 1, [Define to 1 if using device async malloc])
+   fi
+
+   if test "$hypre_using_thrust_nosync" = "yes"
+   then
+      AC_DEFINE(HYPRE_USING_THRUST_NOSYNC, 1, [Define to 1 if using thrust par_nosync policy])
+   fi
+
+   if test "x$hypre_using_cuda_streams" = "xyes"
+   then
+      AC_DEFINE([HYPRE_USING_CUDA_STREAMS], 1, [Define to 1 if using streams])
+   fi
 fi
 
 dnl *********************************************************************
@@ -2182,7 +2608,7 @@ AS_IF([test x"$hypre_using_hip" == x"yes"],
 
         if test "x${HYPRE_CUDA_SM}" != "x"
         then
-           HYPRE_CUDA_GENCODE="--amdgpu-target="
+           HYPRE_CUDA_GENCODE="--offload-arch="
            for sm in ${HYPRE_CUDA_SM}; do
               HYPRE_CUDA_GENCODE="${HYPRE_CUDA_GENCODE}${sm},"
            done
@@ -2199,7 +2625,7 @@ AS_IF([test x"$hypre_using_hip" == x"yes"],
         dnl with HIPCXXFLAGS on the configure line. If in debug mode, -O0 -Wall
         dnl plus flags for debugging symbols
         AS_IF([test x"$hypre_using_debug" == x"yes"],
-              [HIPCXXFLAGS="-O0 -Wall -g -ggdb ${HIPCXXFLAGS}"],
+              [HIPCXXFLAGS="-O1 -Wall -g -ggdb ${HIPCXXFLAGS}"],
               [HIPCXXFLAGS="-O2 ${HIPCXXFLAGS}"],)
 
 
@@ -2218,10 +2644,10 @@ AS_IF([test x"$hypre_using_hip" == x"yes"],
            CUFLAGS="${HIPCPPFLAGS} ${HIPCXXFLAGS}"
         fi
 
-        dnl rocThrust depends on rocPrim so we need both for Thrust on AMD GPUs.
+        dnl PB: ROCm 5.2 parked all the headers in /opt/rocm-X.Y/include so we just point there.
+        dnl     This is backwards compatible to previous ROCm versions.
         dnl These are header-only so no linking needed.
-        HYPRE_HIP_INCL="-I${HYPRE_ROCM_PREFIX}/rocthrust/include"
-        HYPRE_HIP_INCL="${HYPRE_HIP_INCL} -I${HYPRE_ROCM_PREFIX}/rocprim/include"
+        HYPRE_HIP_INCL="-I${HYPRE_ROCM_PREFIX}/include"
 
         dnl HIP library
         HYPRE_HIP_LIBS="-L${HYPRE_ROCM_PREFIX}/lib -lamdhip64"
@@ -2229,35 +2655,103 @@ AS_IF([test x"$hypre_using_hip" == x"yes"],
         dnl rocSPARSE, for things like dcsrmv on AMD GPUs
         AS_IF([test x"$hypre_using_rocsparse" == x"yes"],
               [AC_DEFINE(HYPRE_USING_ROCSPARSE, 1, [rocSPARSE being used])
-               HYPRE_HIP_LIBS="${HYPRE_HIP_LIBS} -lrocsparse"
-               HYPRE_HIP_INCL="${HYPRE_HIP_INCL} -I${HYPRE_ROCM_PREFIX}/rocsparse/include"
+               HYPRE_HIP_LIBS+=" -lrocsparse"
                ])
 
-        dnl Note rocSPARSE requires rocBLAS, so this is only controlling
-        dnl whether HYPRE explicitly uses rocBLAS in other places or not.
-        dnl So we don't need to add any extra libs or anything.
+        dnl rocBLAS: basic linear algebra operations on AMD GPUs
         AS_IF([test x"$hypre_using_rocblas" == x"yes"],
               [AC_DEFINE(HYPRE_USING_ROCBLAS, 1, [rocBLAS being used])
-              HYPRE_HIP_INCL="${HYPRE_HIP_INCL} -I${HYPRE_ROCM_PREFIX}/rocblas/include"
+               HYPRE_HIP_LIBS+=" -lrocblas"
               ])
 
+        dnl rocSOLVER: dense linear solvers on AMD GPUs (requires rocBLAS)
+        AS_IF([test x"$hypre_using_rocsolver" == x"yes"],
+              [AC_DEFINE(HYPRE_USING_ROCSOLVER, 1, [rocSOLVER being used])
+               HYPRE_HIP_LIBS+=" -lrocsolver"
+               ])
+
         dnl rocRAND: random number generation on AMD GPUs
         AS_IF([test x"$hypre_using_rocrand" == x"yes"],
               [AC_DEFINE(HYPRE_USING_ROCRAND, 1, [rocRAND being used])
-               HYPRE_HIP_LIBS="${HYPRE_HIP_LIBS} -lrocrand"
-               HYPRE_HIP_INCL="${HYPRE_HIP_INCL} -I${HYPRE_ROCM_PREFIX}/rocrand/include"
+               HYPRE_HIP_LIBS+=" -lrocrand"
                ])
 
         dnl rocTX tracing API
         AS_IF([test x"$hypre_using_gpu_profiling" == x"yes"],
               [AC_DEFINE(HYPRE_USING_ROCTX, 1, [Define to 1 if using AMD rocTX profiling])
-               HYPRE_HIP_INCL="${HYPRE_HIP_INCL} -I${HYPRE_ROCM_PREFIX}/roctracer/include"
-               HYPRE_HIP_LIBS="${HYPRE_HIP_LIBS} -lroctx64"
+               HYPRE_HIP_LIBS+=" -lroctx64"
+               ])
+
+        AS_IF([test x"$hypre_using_cuda_streams" == x"yes"],
+              [AC_DEFINE(HYPRE_USING_CUDA_STREAMS, 1, [Define to 1 if using streams])
                ])
 
       ]) dnl AS_IF([test x"$hypre_using_hip" == x"yes"]
 
 
+dnl *********************************************************************
+dnl * Set SYCL options
+dnl *********************************************************************
+AS_IF([test x"$hypre_using_sycl" == x"yes"],
+      [
+        AC_DEFINE(HYPRE_USING_GPU,  1, [Define to 1 if executing on GPU device])
+        AC_DEFINE(HYPRE_USING_SYCL, 1, [SYCL being used])
+
+        dnl (Ab)Using CUCC when compiling SYCL
+        LINK_CC=${CUCC}
+        LINK_CXX=${CUCC}
+
+        SYCLFLAGS="-fsycl -fsycl-unnamed-lambda"
+        if test "$hypre_using_debug" = "yes"
+        then
+           dnl WM: remove the -g flag for debug mode because it currently causes errors on JLSE
+           SYCLFLAGS="-Wall ${SYCLFLAGS}"
+        else
+           SYCLFLAGS="-O3 ${SYCLFLAGS}"
+        fi
+        LDFLAGS+=" -fsycl -fsycl-device-code-split=per_kernel -Wl,--no-relax"
+
+        dnl AOT compilation for specific devices
+        if test "x${HYPRE_SYCL_TARGET}" != "x"
+        then
+           LDFLAGS+=" -fsycl-targets=${HYPRE_SYCL_TARGET}"
+        fi
+        if test "x${HYPRE_SYCL_TARGET_BACKEND}" != "x"
+        then
+           LDFLAGS+=" -Xsycl-target-backend ${HYPRE_SYCL_TARGET_BACKEND}"
+        fi
+
+        dnl Shared build needs the sycl compiler
+        if test "$hypre_using_shared" = "yes"
+        then
+           SYCLFLAGS="${SHARED_COMPILE_FLAG} ${SYCLFLAGS}"
+           BUILD_CC_SHARED="\${CUCC} ${SHARED_BUILD_FLAG}"
+        fi
+
+        dnl (Ab)Use CUFLAGS to capture SYCL compilation flags
+        if test "$hypre_user_chose_cuflags" = "no"
+        then
+           CUFLAGS="${SYCLFLAGS}"
+        fi
+
+        AS_IF([test x"$hypre_using_onemklsparse" == x"yes" || test x"$hypre_using_onemklblas" == x"yes" || test x"$hypre_using_onemklrand" == x"yes"],
+              [AC_CHECK_HEADER(["${MKLROOT}/include/mkl.h"],
+                               [hypre_found_mkl=yes],
+                               AC_MSG_ERROR([unable to find oneMKL ... Ensure that MKLROOT is set]))
+               HYPRE_SYCL_LIBS="${HYPRE_SYCL_LIBS} -qmkl -Wl,-export-dynamic -Wl,--start-group -Wl,--end-group -lsycl -lOpenCL -lpthread -lm -ldl"
+               HYPRE_SYCL_INCL="${HYPRE_SYCL_INCL} -qmkl -I${DPLROOT}/include -DMKL_ILP64 -I${MKLROOT}/include"
+               ])
+
+        AS_IF([test x"$hypre_using_onemklsparse" == x"yes"], [AC_DEFINE(HYPRE_USING_ONEMKLSPARSE, 1, [onemkl::SPARSE being used])])
+
+        AS_IF([test x"$hypre_using_onemklblas" == x"yes"], [AC_DEFINE(HYPRE_USING_ONEMKLBLAS, 1, [onemkl::BLAS being used])])
+
+        AS_IF([test x"$hypre_using_onemklrand" == x"yes"], [AC_DEFINE(HYPRE_USING_ONEMKLRAND, 1, [onemkl::rng being used])])
+
+        dnl SYCL should always use streams
+        AC_DEFINE(HYPRE_USING_CUDA_STREAMS, 1, [Define to 1 if using streams])
+
+      ]) dnl AS_IF([test x"$hypre_using_sycl" == x"yes"]
 
 
 dnl *********************************************************************
@@ -2282,6 +2776,14 @@ then
       AC_MSG_NOTICE([Use --enable-unified-memory to compile with unified memory.])
       AC_MSG_NOTICE([***********************************************************************])
    fi
+   if test "$hypre_using_sycl" = "yes"
+   then
+      AC_MSG_NOTICE([***********************************************************])
+      AC_MSG_NOTICE([Configuring with --with-sycl=yes without unified memory.])
+      AC_MSG_NOTICE([It only works for struct interface.])
+      AC_MSG_NOTICE([Use --enable-unified-memory to compile with unified memory.])
+      AC_MSG_NOTICE([***********************************************************])
+   fi
    if test "$hypre_using_device_openmp" = "yes"
    then
       AC_MSG_NOTICE([***********************************************************************])
@@ -2305,32 +2807,31 @@ dnl * Set Device OpenMP options
 dnl *********************************************************************
 if test "$hypre_using_device_openmp" = "yes"
 then
-   AC_DEFINE(HYPRE_USING_CUSPARSE, 1, [Define to 1 if using cuSPARSE])
-
-   if test "$hypre_using_gpu_profiling" = "yes"
-   then
-      AC_DEFINE(HYPRE_USING_NVTX, 1, [NVTX being used])
-   fi
-
    AC_DEFINE(HYPRE_USING_DEVICE_OPENMP, 1, [Define to 1 if executing on device with OpenMP])
 
-   AC_DEFINE(HYPRE_USING_GPU, 1, [Define to 1 if executing on GPU device])
-
    AC_DEFINE(HYPRE_DEVICE_OPENMP_ALLOC, 1, [Define to 1 if using OpenMP on device [target alloc version]])
 
    dnl AC_DEFINE(HYPRE_DEVICE_OPENMP_MAPPED, 1, [Define to 1 if using OpenMP on device [target mapped version]])
 
    if test "$hypre_user_chose_cuflags" = "no"
    then
-      CUFLAGS=${CFLAGS}
-
-      if [test "$CUCC" = "clang-gpu" || test "$CUCC" = "mpiclang-gpu"]
+      CUFLAGS="${CXXFLAGS} ${CUFLAGS}"
+      dnl if [test "$CUCC" = "clang-gpu" || test "$CUCC" = "mpiclang-gpu" || test "$CUCC" = "clang++-gpu" || test "$CUCC" = "mpiclang++-gpu"]
+      dnl then
+         # dnl this is too old
+         #CUFLAGS+=" -fopenmp-nonaliased-maps"
+      dnl fi
+      if [test "$CUCC" = "icx" || test "$CUCC" = "icpx" || test "$CUCC" = "mpiicx" || test "$CUCC" = "mpiicpx"]
       then
-         CUFLAGS+=" -fopenmp-nonaliased-maps"
+         CUFLAGS+="-qopenmp -fopenmp-targets=spir64"
       fi
-      if [test "$CUCC" = "clang++-gpu" || test "$CUCC" = "mpiclang++-gpu"]
+   fi
+
+   if test "$hypre_user_chose_ldflags" = "no"
+   then
+      if [test "$CUCC" = "icx" || test "$CUCC" = "icpx" || test "$CUCC" = "mpiicx" || test "$CUCC" = "mpiicpx"]
       then
-         CUFLAGS+=" -fopenmp-nonaliased-maps"
+         LDFLAGS+="-qopenmp -fopenmp-targets=spir64"
       fi
    fi
 
@@ -2339,13 +2840,6 @@ then
       AC_DEFINE(HYPRE_DEVICE_OPENMP_CHECK, 1, [Define to 1 if strictly checking OpenMP offload directives])
    fi
 
-   HYPRE_CUDA_INCLUDE='-I${HYPRE_CUDA_PATH}/include'
-   HYPRE_CUDA_LIBS='-L${HYPRE_CUDA_PATH}/lib64 -lcudart -lcusparse -lcurand'
-   if test "$hypre_using_gpu_profiling" = "yes"
-   then
-      HYPRE_CUDA_LIBS+=" -lnvToolsExt"
-   fi
-
    dnl let CC be CXX
    dnl CC=${CXX}
    LINK_CC='${CUCC}'
@@ -2354,14 +2848,6 @@ then
    dnl CFLAGS=${CXXFLAGS}
 fi
 
-if [test "x$hypre_using_cuda" = "xyes" || test "x$hypre_using_device_openmp" = "xyes"]
-then
-   if test "x$hypre_using_cuda_streams" = "xyes"]
-   then
-      AC_DEFINE([HYPRE_USING_CUDA_STREAMS],1,[Define to 1 if using CUDA streams])
-   fi
-fi
-
 dnl *********************************************************************
 dnl * Set memory env
 dnl *********************************************************************
@@ -2369,7 +2855,7 @@ if test "x$hypre_using_um" = "xyes"
 then
    AC_DEFINE([HYPRE_USING_UNIFIED_MEMORY],1,[Define to 1 if using unified memory])
 else
-   if [test "x$hypre_using_cuda" = "xyes" || test "x$hypre_using_device_openmp" = "xyes" || test "x$hypre_using_hip" = "xyes"]
+   if [test "x$hypre_using_cuda" = "xyes" || test "x$hypre_using_device_openmp" = "xyes" || test "x$hypre_using_hip" = "xyes" || test "x$hypre_using_sycl" = "xyes"]
    then
       AC_DEFINE([HYPRE_USING_DEVICE_MEMORY],1,[Define to 1 if using device memory without UM])
    else
@@ -2379,9 +2865,11 @@ fi
 
 if test "$hypre_gpu_mpi" = "yes"
 then
-   AC_DEFINE([HYPRE_WITH_GPU_AWARE_MPI],1,[Define to 1 if using GPU aware MPI])
+   AC_DEFINE([HYPRE_USING_GPU_AWARE_MPI],1,[Define to 1 if using GPU aware MPI])
 fi
 
+CUFLAGS="${CUFLAGS} ${EXTRA_CUFLAGS}"
+
 dnl *********************************************************************
 dnl * Set installation directories
 dnl *********************************************************************
@@ -2529,6 +3017,12 @@ dnl *********************************************************************
 AC_SUBST(HYPRE_HIP_INCL)
 AC_SUBST(HYPRE_HIP_LIBS)
 
+dnl *********************************************************************
+dnl * SYCL stuff
+dnl *********************************************************************
+AC_SUBST(HYPRE_SYCL_INCL)
+AC_SUBST(HYPRE_SYCL_LIBS)
+
 dnl *********************************************************************
 dnl * Caliper instrumentation
 dnl *********************************************************************
@@ -2536,13 +3030,20 @@ AC_SUBST(CALIPER_INCLUDE)
 AC_SUBST(CALIPER_LIBS)
 
 dnl *********************************************************************
-dnl * SuperLU instrumentation
+dnl * MAGMA
+dnl *********************************************************************
+AC_SUBST(HYPRE_MAGMA_LIB_DIR)
+AC_SUBST(HYPRE_MAGMA_INCLUDE)
+AC_SUBST(HYPRE_MAGMA_LIB)
+
+dnl *********************************************************************
+dnl * SuperLU
 dnl *********************************************************************
 AC_SUBST(SUPERLU_INCLUDE)
 AC_SUBST(SUPERLU_LIBS)
 
 dnl *********************************************************************
-dnl * DSuperLU instrumentation
+dnl * DSuperLU
 dnl *********************************************************************
 AC_SUBST(DSUPERLU_INCLUDE)
 AC_SUBST(DSUPERLU_LIBS)
@@ -2558,4 +3059,4 @@ dnl * Define the files to be configured and made
 dnl *********************************************************************
 AC_CONFIG_FILES([config/Makefile.config])
 
-AC_OUTPUT()
+AC_OUTPUT
diff --git a/external/hypre/src/config/githooks/README.md b/external/hypre/src/config/githooks/README.md
new file mode 100644
index 00000000..b201a932
--- /dev/null
+++ b/external/hypre/src/config/githooks/README.md
@@ -0,0 +1,19 @@
+<!--
+Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+
+SPDX-License-Identifier: (Apache-2.0 OR MIT)
+-->
+
+This directory contains recommended git hooks for hypre:
+
+### The hooks (currently only one)
+
+* `pre-commit` is a hook that is applied before each commit that runs `astyle`
+to format code according to hypre coding style guidelines.
+
+### Setup
+
+To setup the git hooks, copy the hooks to the `.git/hooks` directory (or create
+a symbolic link to them, e.g., `ln -s ../../src/config/githooks/pre-commit .`).
+
diff --git a/external/hypre/src/config/githooks/pre-commit b/external/hypre/src/config/githooks/pre-commit
new file mode 100755
index 00000000..d010d4b3
--- /dev/null
+++ b/external/hypre/src/config/githooks/pre-commit
@@ -0,0 +1,9 @@
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+# Apply code formatting
+( cd $(git rev-parse --show-toplevel)/src; ./config/astyle-apply.sh . )
+
diff --git a/external/hypre/src/config/hypre_blas_macros.m4 b/external/hypre/src/config/hypre_blas_macros.m4
index 8335f21e..65b286a7 100644
--- a/external/hypre/src/config/hypre_blas_macros.m4
+++ b/external/hypre/src/config/hypre_blas_macros.m4
@@ -1,4 +1,4 @@
-dnl Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+dnl Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 dnl HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 dnl
 dnl SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/config/hypre_lapack_macros.m4 b/external/hypre/src/config/hypre_lapack_macros.m4
index 501cb0c2..2a75db7c 100644
--- a/external/hypre/src/config/hypre_lapack_macros.m4
+++ b/external/hypre/src/config/hypre_lapack_macros.m4
@@ -1,4 +1,4 @@
-dnl Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+dnl Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 dnl HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 dnl
 dnl SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/config/hypre_macros_misc.m4 b/external/hypre/src/config/hypre_macros_misc.m4
index 14319b50..5c186a04 100644
--- a/external/hypre/src/config/hypre_macros_misc.m4
+++ b/external/hypre/src/config/hypre_macros_misc.m4
@@ -1,4 +1,4 @@
-dnl Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+dnl Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 dnl HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 dnl
 dnl SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -15,15 +15,15 @@ dnl   if it is not found. If ACTION-IF-FOUND is not specified,
 dnl   the default action will define HAVE_MPI.
 dnl **********************************************************************
 AC_DEFUN([AC_HYPRE_CHECK_MPI],
-[AC_PREREQ(2.57)dnl
-AC_PREREQ(2.50) dnl for AC_LANG_CASE
+[AC_PREREQ([2.69])dnl
+AC_PREREQ([2.69]) dnl for AC_LANG_CASE
 
 if test x = x"$MPILIBS"; then
   AC_LANG_CASE([C], [AC_CHECK_FUNC(MPI_Init, [MPILIBS=" "])],
     [C++], [AC_CHECK_FUNC(MPI_Init, [MPILIBS=" "])],
     [Fortran 77], [AC_MSG_CHECKING([for MPI_Init])
-      AC_TRY_LINK([],[      call MPI_Init], [MPILIBS=" "
-        AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no)])])
+      AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[      call MPI_Init]])],[MPILIBS=" "
+        AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])])
 fi
 
 if test x = x"$MPILIBS"; then
@@ -34,16 +34,16 @@ if test x = x"$MPILIBS"; then
   AC_CHECK_LIB(mpich, MPI_Init, [MPILIBS="-lmpich"])
 fi
 
-dnl We have to use AC_TRY_COMPILE and not AC_CHECK_HEADER because the
-dnl latter uses $CPP, not $CC (which may be mpicc).
+dnl We have to use AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[],[]) and not
+dnl AC_CHECK_HEADER because the latter uses $CPP, not $CC (which may be mpicc).
 AC_LANG_CASE([C], [if test x != x"$MPILIBS"; then
   AC_MSG_CHECKING([for mpi.h])
-  AC_TRY_COMPILE([#include <mpi.h>],[],[AC_MSG_RESULT(yes)], [MPILIBS=""
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <mpi.h>]], [[]])],[AC_MSG_RESULT(yes)],[MPILIBS=""
                      AC_MSG_RESULT(no)])
 fi],
 [C++], [if test x != x"$MPILIBS"; then
   AC_MSG_CHECKING([for mpi.h])
-  AC_TRY_COMPILE([#include <mpi.h>],[],[AC_MSG_RESULT(yes)], [MPILIBS=""
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <mpi.h>]], [[]])],[AC_MSG_RESULT(yes)],[MPILIBS=""
                      AC_MSG_RESULT(no)])
 fi])
 
@@ -94,37 +94,37 @@ dnl *
 dnl * Set compile FLAGS for optimization
 dnl **********************************************************************
 AC_DEFUN([AC_HYPRE_OPTIMIZATION_FLAGS],
-[AC_PREREQ(2.57)dnl
+[AC_PREREQ([2.69])dnl
 
 if test "x${hypre_user_chose_cflags}" = "xno"
 then
-   case `basename "${CC}"` in
+   case `basename ${CC}` in
       gcc|mpigcc|mpicc)
         CFLAGS="-O2"
         if test "$hypre_using_openmp" = "yes" ; then
-          CFLAGS="$CFLAGS -fopenmp"
-          LDFLAGS="$LDFLAGS -fopenmp"
+          CFLAGS+=" -fopenmp"
+          LDFLAGS+=" -fopenmp"
         fi
         ;;
-      icc|mpiicc)
+      icc|mpiicc|icx|mpiicx)
         CFLAGS="-O2"
         if test "$hypre_using_openmp" = "yes" ; then
-          CFLAGS="$CFLAGS -qopenmp"
-          LDFLAGS="$LDFLAGS -qopenmp"
+          CFLAGS+=" -qopenmp"
+          LDFLAGS+=" -qopenmp"
         fi
         ;;
       pgcc|mpipgcc|mpipgicc)
         CFLAGS="-fast"
         if test "$hypre_using_openmp" = "yes" ; then
-          CFLAGS="$CFLAGS -mp"
-          LDFLAGS="$LDFLAGS -mp"
+          CFLAGS+=" -mp"
+          LDFLAGS+=" -mp"
         fi
         ;;
       cc|xlc|xlc_r|mpxlc|mpixlc|mpixlc_r|mpixlc-gpu|mpcc)
         CFLAGS="-O2"
         if test "$hypre_using_openmp" = "yes" ; then
-          CFLAGS="$CFLAGS -qsmp=omp"
-          LDFLAGS="$LDFLAGS -qsmp=omp"
+          CFLAGS+=" -qsmp=omp"
+          LDFLAGS+=" -qsmp=omp"
         fi
         ;;
       KCC|mpiKCC)
@@ -138,29 +138,29 @@ fi
 
 if test "x${hypre_user_chose_cxxflags}" = "xno"
 then
-   case `basename "${CXX}"` in
+   case `basename ${CXX}` in
       g++|gCC|mpig++|mpicxx|mpic++|mpiCC)
         CXXFLAGS="-O2"
         if test "$hypre_using_openmp" = "yes" ; then
-          CXXFLAGS="$CXXFLAGS -fopenmp"
+          CXXFLAGS+=" -fopenmp"
         fi
         ;;
-      icpc|icc|mpiicpc|mpiicc)
+      icpc|icc|mpiicpc|mpiicc|icpx|mpiicpx)
         CXXFLAGS="-O2"
         if test "$hypre_using_openmp" = "yes" ; then
-          CXXFLAGS="$CXXFLAGS -qopenmp"
+          CXXFLAGS+=" -qopenmp"
         fi
         ;;
       pgCC|mpipgCC|pgc++|mpipgic++)
         CXXFLAGS="-fast"
         if test "$hypre_using_openmp" = "yes" ; then
-          CXXFLAGS="$CXXFLAGS -mp"
+          CXXFLAGS+=" -mp"
         fi
         ;;
       CC|cxx|xlC|xlC_r|mpxlC|mpixlC|mpixlC-gpu|mpixlcxx|mpixlcxx_r|mpCC)
         CXXFLAGS="-O2"
         if test "$hypre_using_openmp" = "yes" ; then
-          CXXFLAGS="$CXXFLAGS -qsmp=omp"
+          CXXFLAGS+=" -qsmp=omp"
         fi
         ;;
       KCC|mpiKCC)
@@ -172,31 +172,31 @@ then
    esac
 fi
 
-if test "x${hypre_user_chose_fflags}" = "xno"
+if test "$hypre_using_fortran" = "yes" -a "x${hypre_user_chose_fflags}" = "xno"
 then
-   case `basename "${FC}"` in
+   case `basename ${FC}` in
       g77|gfortran|mpigfortran|mpif77)
         FFLAGS="-O2"
         if test "$hypre_using_openmp" = "yes" ; then
-          FFLAGS="$FFLAGS -fopenmp"
+          FFLAGS+=" -fopenmp"
         fi
         ;;
       ifort|mpiifort)
         FFLAGS="-O2"
         if test "$hypre_using_openmp" = "yes" ; then
-          FFLAGS="$FFLAGS -qopenmp"
+          FFLAGS+=" -qopenmp"
         fi
         ;;
       pgf77|mpipgf77|pgfortran|mpipgifort)
         FFLAGS="-fast"
         if test "$hypre_using_openmp" = "yes" ; then
-          FFLAGS="$FFLAGS -mp"
+          FFLAGS+=" -mp"
         fi
         ;;
       f77|f90|xlf|xlf_r|mpxlf|mpixlf77|mpixlf77_r)
         FFLAGS="-O2"
         if test "$hypre_using_openmp" = "yes" ; then
-          FFLAGS="$FFLAGS -qsmp=omp"
+          FFLAGS+=" -qsmp=omp"
         fi
         ;;
       kf77|mpikf77)
@@ -214,37 +214,37 @@ dnl *
 dnl * Set compile FLAGS for debug
 dnl **********************************************************************
 AC_DEFUN([AC_HYPRE_DEBUG_FLAGS],
-[AC_PREREQ(2.57)dnl
+[AC_PREREQ([2.69])dnl
 
 if test "x${hypre_user_chose_cflags}" = "xno"
 then
-   case `basename "${CC}"` in
+   case `basename ${CC}` in
       gcc|mpigcc|mpicc)
-        CFLAGS="-g -Wall"
+        CFLAGS="-O0 -g -Wall"
         if test "$hypre_using_openmp" = "yes" ; then
-          CFLAGS="$CFLAGS -fopenmp"
-          LDFLAGS="$LDFLAGS -fopenmp"
+          CFLAGS+=" -fopenmp"
+          LDFLAGS+=" -fopenmp"
         fi
         ;;
-      icc|mpiicc)
-        CFLAGS="-g"
+      icc|mpiicc|icx|mpiicx)
+        CFLAGS="-O0 -g -Wall"
         if test "$hypre_using_openmp" = "yes" ; then
-          CFLAGS="$CFLAGS -qopenmp"
-          LDFLAGS="$LDFLAGS -qopenmp"
+          CFLAGS+=" -qopenmp"
+          LDFLAGS+=" -qopenmp"
         fi
         ;;
       pgcc|mpipgcc|mpipgicc)
-        CFLAGS="-g"
+        CFLAGS="-O0 -g -Wall"
         if test "$hypre_using_openmp" = "yes" ; then
-          CFLAGS="$CFLAGS -mp"
-          LDFLAGS="$LDFLAGS -mp"
+          CFLAGS+=" -mp"
+          LDFLAGS+=" -mp"
         fi
         ;;
       cc|xlc|mpxlc|mpixlc|mpcc)
-        CFLAGS="-g"
+        CFLAGS="-O0 -g -Wall"
         if test "$hypre_using_openmp" = "yes" ; then
-          CFLAGS="$CFLAGS -qsmp=omp"
-          LDFLAGS="$LDFLAGS -qsmp=omp"
+          CFLAGS+=" -qsmp=omp"
+          LDFLAGS+=" -qsmp=omp"
         fi
         ;;
       KCC|mpiKCC)
@@ -258,29 +258,29 @@ fi
 
 if test "x${hypre_user_chose_cxxflags}" = "xno"
 then
-   case `basename "${CXX}"` in
+   case `basename ${CXX}` in
       g++|gCC|mpig++|mpicxx|mpic++|mpiCC)
-        CXXFLAGS="-g -Wall"
+        CXXFLAGS="-O0 -g -Wall"
         if test "$hypre_using_openmp" = "yes" ; then
-          CXXFLAGS="$CXXFLAGS -fopenmp"
+          CXXFLAGS+=" -fopenmp"
         fi
         ;;
-      icpc|icc|mpiicpc|mpiicc)
-        CXXFLAGS="-g"
+      icpc|icc|mpiicpc|mpiicc|icpx|mpiicpx)
+        CXXFLAGS="-O0 -g -Wall"
         if test "$hypre_using_openmp" = "yes" ; then
-          CXXFLAGS="$CXXFLAGS -qopenmp"
+          CXXFLAGS+=" -qopenmp"
         fi
         ;;
       pgCC|mpipgCC|pgc++|mpipgic++)
-        CXXFLAGS="-g"
+        CXXFLAGS="-O0 -g -Wall"
         if test "$hypre_using_openmp" = "yes" ; then
-          CXXFLAGS="$CXXFLAGS -mp"
+          CXXFLAGS+=" -mp"
         fi
         ;;
       CC|cxx|xlC|mpxlC|mpixlcxx|mpCC)
-        CXXFLAGS="-g"
+        CXXFLAGS="-O0 -g"
         if test "$hypre_using_openmp" = "yes" ; then
-          CXXFLAGS="$CXXFLAGS -qsmp=omp"
+          CXXFLAGS+=" -qsmp=omp"
         fi
         ;;
       KCC|mpiKCC)
@@ -292,16 +292,16 @@ then
    esac
 fi
 
-if test "x${hypre_user_chose_fflags}" = "xno"
+if test "$hypre_using_fortran" = "yes" -a "x${hypre_user_chose_fflags}" = "xno"
 then
-   case `basename "${FC}"` in
+   case `basename ${FC}` in
       g77|gfortran|mpigfortran|mpif77)
         FFLAGS="-g -Wall"
         if test "$hypre_using_openmp" = "yes" ; then
           FFLAGS="$FFLAGS -fopenmp"
         fi
         ;;
-      ifort|mpiifort)
+      ifort|mpiifort|ifx|mpiifx)
         FFLAGS="-g"
         if test "$hypre_using_openmp" = "yes" ; then
           FFLAGS="$FFLAGS -qopenmp"
diff --git a/external/hypre/src/config/install-sh b/external/hypre/src/config/install-sh
old mode 100644
new mode 100755
index e4160c99..20cad0be
--- a/external/hypre/src/config/install-sh
+++ b/external/hypre/src/config/install-sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # install - install a program, script, or datafile
 
 scriptversion=2004-04-01.17
diff --git a/external/hypre/src/config/mkinstalldirs b/external/hypre/src/config/mkinstalldirs
old mode 100644
new mode 100755
index 6fbe5e11..b55d9014
--- a/external/hypre/src/config/mkinstalldirs
+++ b/external/hypre/src/config/mkinstalldirs
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /bin/bash
 # mkinstalldirs --- make directory hierarchy
 
 scriptversion=2004-02-15.20
diff --git a/external/hypre/src/config/update-cmake.py b/external/hypre/src/config/update-cmake.py
new file mode 100755
index 00000000..11b6fd38
--- /dev/null
+++ b/external/hypre/src/config/update-cmake.py
@@ -0,0 +1,115 @@
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+import argparse
+import os
+
+def extract_files_from_section(input_text, section_start):
+    files = []
+    collect_files = False
+    for line in input_text.splitlines():
+        if line.strip().startswith(section_start):
+            collect_files = True
+            continue
+
+        if collect_files:
+            if line.strip() == "":
+                break  # Assuming an empty line marks the end of the section
+
+            # Extract the file name, assuming no spaces in file names
+            file_name = line.strip().split("\\")[0]
+
+            # Filter only source files
+            if file_name.endswith('.c') or file_name.endswith('.cpp'):
+                files.append(file_name)
+
+    return files
+
+def are_files_in_list(file_list_a, file_list_b):
+    return [fn for fn in file_list_a if fn not in file_list_b]
+
+def add_missing_files(file_content, section_start, missing_files):
+    lines = file_content.split('\n')
+    updated_lines = []
+    in_section_start = -1
+    in_section_end = -1
+
+    # Identify the start and end of the SRCS block
+    for i, line in enumerate(lines):
+        trimmed_line = line.strip()
+        if trimmed_line.startswith(section_start):
+            in_section_start = i
+
+        if in_section_start != -1 and trimmed_line.endswith(")") and in_section_end == -1:
+            in_section_end = i
+            break
+
+    if in_section_start == -1 or in_section_end == -1:
+        print("Error: Could not find a complete SRCS block in file B.")
+        return file_content
+
+    # Add all lines up to the end of the section, excluding the closing parenthesis
+    updated_lines.extend(lines[:in_section_end])
+
+    # Add missing files
+    for missing_file in missing_files:
+        updated_lines.append(f"  {missing_file}")
+
+    # Add closing parenthesis
+    updated_lines.append(lines[in_section_end])
+
+    # Add remaining lines
+    updated_lines.extend(lines[in_section_end + 1:])
+
+    updated_content = '\n'.join(updated_lines)
+    return updated_content
+
+def process(args, section_A, section_B):
+    # Read file contents
+    file_A_path = os.path.join(args.folder, "Makefile")
+    file_B_path = os.path.join(args.folder, "CMakeLists.txt")
+    with open(file_A_path, 'r') as file_A, open(file_B_path, 'r') as file_B:
+        file_A_content = file_A.read()
+        file_B_content = file_B.read()
+
+    # Extract files
+    files_A = extract_files_from_section(file_A_content, section_A)
+    files_B = extract_files_from_section(file_B_content, section_B)
+    if args.verbose:
+        print(f"{files_A = }\n")
+        print(f"{files_B = }")
+
+    # Check if all files in A are in B
+    missing = are_files_in_list(files_A, files_B)
+
+    if missing:
+        print("\nAdded to FILE B:", missing)
+        new_file_B_content = add_missing_files(file_B_content, section_B, missing)
+        with open(file_B_path, 'w') as file_B:
+            file_B.write(new_file_B_content)
+
+def main():
+    parser = argparse.ArgumentParser(description="Check and update CMakeLists based on the contents of Makefile")
+    parser.add_argument("-f", "--folder", required=True, help="Folder path")
+    parser.add_argument("-v", "--verbose", action="store_true", help="Turn on verbose mode")
+    args = parser.parse_args()
+
+    # Validate folder path
+    args.folder = os.path.normpath(args.folder)
+    if not os.path.isdir(args.folder):
+        print("The specified folder does not exist or is not a directory.")
+        return
+
+    # Process source files
+    process(args, "FILES =", "set(SRCS")
+
+    # Process GPU source files
+    process(args, "CUFILES =", "set(GPU_SRCS")
+
+    # Done!
+    print(f"Done with {args.folder = }...")
+
+if __name__ == "__main__":
+    main()
diff --git a/external/hypre/src/config/update-cmake.sh b/external/hypre/src/config/update-cmake.sh
new file mode 100755
index 00000000..18b34484
--- /dev/null
+++ b/external/hypre/src/config/update-cmake.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+# Usage:
+#   ./update-cmake.sh
+#
+# The script checks for missing source files listed in various CMakeLists.txt
+# by looking at the respective Makefile. If any files are missing, they are added
+# to CMakeLists.txt
+
+DIRNAME=$(dirname $0)
+FOLDERS=(blas examples IJ_mv krylov lapack parcsr_block_mv parcsr_ls parcsr_mv seq_block_mv seq_mv sstruct_ls sstruct_mv test utilities)
+
+for FOLDER in ${FOLDERS[@]}; do
+    python3 ${DIRNAME}/update-cmake.py -f ${DIRNAME}/../${FOLDER}
+done
diff --git a/external/hypre/src/config/update.sh b/external/hypre/src/config/update.sh
old mode 100644
new mode 100755
index 08d93d04..31a19701
--- a/external/hypre/src/config/update.sh
+++ b/external/hypre/src/config/update.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -34,7 +34,7 @@ sed -e 's#m4_define.*HYPRE_DATE[^)]*#m4_define([M4_HYPRE_DATE],    ['$hypre_reld
 > config/configure.in.tmp
 mv config/configure.in.tmp config/configure.in
 
-ln -s config/configure.in .
+ln -s -f config/configure.in .
 rm -rf aclocal.m4 configure autom4te.cache
 autoconf --include=config
 autoheader configure.in
@@ -61,4 +61,3 @@ mv CMakeLists.txt.tmp CMakeLists.txt
 ##### Update release information in documentation
 
 (cd docs; ./update-release.sh)
-
diff --git a/external/hypre/src/config/version.sh b/external/hypre/src/config/version.sh
old mode 100644
new mode 100755
index 832d4931..e708393e
--- a/external/hypre/src/config/version.sh
+++ b/external/hypre/src/config/version.sh
@@ -1,11 +1,11 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-hypre_version="2.22.1"
-hypre_reldate="2021/08/20"
+hypre_version="2.33.0"
+hypre_reldate="2025/04/03"
 
 hypre_major=`echo $hypre_version | cut -d. -f 1`
 hypre_minor=`echo $hypre_version | cut -d. -f 2`
diff --git a/external/hypre/src/configure b/external/hypre/src/configure
old mode 100644
new mode 100755
index d1fa2ada..99f92a8f
--- a/external/hypre/src/configure
+++ b/external/hypre/src/configure
@@ -1,16 +1,17 @@
 #! /bin/sh
 # From configure.in Id.
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for hypre 2.22.1.
+# Generated by GNU Autoconf 2.71 for hypre 2.33.0.
 #
 #
-# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
+# Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 #
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 ## -------------------- ##
 ## M4sh Initialization. ##
@@ -18,14 +19,16 @@
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+as_nop=:
+if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
+then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
-else
+else $as_nop
   case `(set -o) 2>/dev/null` in #(
   *posix*) :
     set -o posix ;; #(
@@ -35,46 +38,46 @@ esac
 fi
 
 
+
+# Reset variables that may have inherited troublesome values from
+# the environment.
+
+# IFS needs to be set, to space, tab, and newline, in precisely that order.
+# (If _AS_PATH_WALK were called with IFS unset, it would have the
+# side effect of setting IFS to empty, thus disabling word splitting.)
+# Quoting is to prevent editors from complaining about space-tab.
 as_nl='
 '
 export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
+IFS=" ""	$as_nl"
+
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# Ensure predictable behavior from utilities with locale-dependent output.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# We cannot yet rely on "unset" to work, but we need these variables
+# to be unset--not just set to an empty or harmless value--now, to
+# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh).  This construct
+# also avoids known problems related to "unset" and subshell syntax
+# in other old shells (e.g. bash 2.01 and pdksh 5.2.14).
+for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH
+do eval test \${$as_var+y} \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+
+# Ensure that fds 0, 1, and 2 are open.
+if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi
+if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi
+if (exec 3>&2)            ; then :; else exec 2>/dev/null; fi
 
 # The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
+if ${PATH_SEPARATOR+false} :; then
   PATH_SEPARATOR=:
   (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
     (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
@@ -83,13 +86,6 @@ if test "${PATH_SEPARATOR+set}" != set; then
 fi
 
 
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
 # Find who we are.  Look in the path if we contain no directory separator.
 as_myself=
 case $0 in #((
@@ -98,8 +94,12 @@ case $0 in #((
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    test -r "$as_dir$0" && as_myself=$as_dir$0 && break
   done
 IFS=$as_save_IFS
 
@@ -111,30 +111,10 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   exit 1
 fi
 
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 # Use a proper internal environment variable to ensure we don't fall
   # into an infinite loop, continuously re-executing ourselves.
@@ -156,20 +136,22 @@ esac
 exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
 # Admittedly, this is quite paranoid, since all the known shells bail
 # out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-as_fn_exit 255
+printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
   fi
   # We don't want this to propagate to other subprocesses.
           { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
-  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+  as_bourne_compatible="as_nop=:
+if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
+then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '\${1+\"\$@\"}'='\"\$@\"'
   setopt NO_GLOB_SUBST
-else
+else \$as_nop
   case \`(set -o) 2>/dev/null\` in #(
   *posix*) :
     set -o posix ;; #(
@@ -189,42 +171,53 @@ as_fn_success || { exitcode=1; echo as_fn_success failed.; }
 as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
 as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
 as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+if ( set x; as_fn_ret_success y && test x = \"\$1\" )
+then :
 
-else
+else \$as_nop
   exitcode=1; echo positional parameters were not saved.
 fi
 test x\$exitcode = x0 || exit 1
+blah=\$(echo \$(echo blah))
+test x\"\$blah\" = xblah || exit 1
 test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
   test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
 test \$(( 1 + 1 )) = 2 || exit 1"
-  if (eval "$as_required") 2>/dev/null; then :
+  if (eval "$as_required") 2>/dev/null
+then :
   as_have_required=yes
-else
+else $as_nop
   as_have_required=no
 fi
-  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null
+then :
 
-else
+else $as_nop
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 as_found=false
 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
   as_found=:
   case $as_dir in #(
 	 /*)
 	   for as_base in sh bash ksh sh5; do
 	     # Try only shells that exist, to save several forks.
-	     as_shell=$as_dir/$as_base
+	     as_shell=$as_dir$as_base
 	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+		    as_run=a "$as_shell" -c "$as_bourne_compatible""$as_required" 2>/dev/null
+then :
   CONFIG_SHELL=$as_shell as_have_required=yes
-		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+		   if as_run=a "$as_shell" -c "$as_bourne_compatible""$as_suggested" 2>/dev/null
+then :
   break 2
 fi
 fi
@@ -232,14 +225,21 @@ fi
        esac
   as_found=false
 done
-$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
-  CONFIG_SHELL=$SHELL as_have_required=yes
-fi; }
 IFS=$as_save_IFS
+if $as_found
+then :
+
+else $as_nop
+  if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+	      as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null
+then :
+  CONFIG_SHELL=$SHELL as_have_required=yes
+fi
+fi
 
 
-      if test "x$CONFIG_SHELL" != x; then :
+      if test "x$CONFIG_SHELL" != x
+then :
   export CONFIG_SHELL
              # We cannot yet assume a decent shell, so we have to provide a
 # neutralization value for shells without unset; and this also
@@ -257,18 +257,19 @@ esac
 exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
 # Admittedly, this is quite paranoid, since all the known shells bail
 # out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
 exit 255
 fi
 
-    if test x$as_have_required = xno; then :
-  $as_echo "$0: This script requires a shell more modern than all"
-  $as_echo "$0: the shells that I found on your system."
-  if test x${ZSH_VERSION+set} = xset ; then
-    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+    if test x$as_have_required = xno
+then :
+  printf "%s\n" "$0: This script requires a shell more modern than all"
+  printf "%s\n" "$0: the shells that I found on your system."
+  if test ${ZSH_VERSION+y} ; then
+    printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later."
   else
-    $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
+    printf "%s\n" "$0: Please tell bug-autoconf@gnu.org about your system,
 $0: including any error possibly output before this
 $0: message. Then install a modern shell, or manually run
 $0: the script under such a shell if you do have one."
@@ -295,6 +296,7 @@ as_fn_unset ()
 }
 as_unset=as_fn_unset
 
+
 # as_fn_set_status STATUS
 # -----------------------
 # Set $? to STATUS, without forking.
@@ -312,6 +314,14 @@ as_fn_exit ()
   as_fn_set_status $1
   exit $1
 } # as_fn_exit
+# as_fn_nop
+# ---------
+# Do nothing but, unlike ":", preserve the value of $?.
+as_fn_nop ()
+{
+  return $?
+}
+as_nop=as_fn_nop
 
 # as_fn_mkdir_p
 # -------------
@@ -326,7 +336,7 @@ as_fn_mkdir_p ()
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -335,7 +345,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
+printf "%s\n" X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -374,12 +384,13 @@ as_fn_executable_p ()
 # advantage of any shell optimizations that allow amortized linear growth over
 # repeated appends, instead of the typical quadratic growth present in naive
 # implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null
+then :
   eval 'as_fn_append ()
   {
     eval $1+=\$2
   }'
-else
+else $as_nop
   as_fn_append ()
   {
     eval $1=\$$1\$2
@@ -391,18 +402,27 @@ fi # as_fn_append
 # Perform arithmetic evaluation on the ARGs, and store the result in the
 # global $as_val. Take advantage of shells that can avoid forks. The arguments
 # must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null
+then :
   eval 'as_fn_arith ()
   {
     as_val=$(( $* ))
   }'
-else
+else $as_nop
   as_fn_arith ()
   {
     as_val=`expr "$@" || test $? -eq 1`
   }
 fi # as_fn_arith
 
+# as_fn_nop
+# ---------
+# Do nothing but, unlike ":", preserve the value of $?.
+as_fn_nop ()
+{
+  return $?
+}
+as_nop=as_fn_nop
 
 # as_fn_error STATUS ERROR [LINENO LOG_FD]
 # ----------------------------------------
@@ -414,9 +434,9 @@ as_fn_error ()
   as_status=$1; test $as_status -eq 0 && as_status=1
   if test "$4"; then
     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  $as_echo "$as_me: error: $2" >&2
+  printf "%s\n" "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -443,7 +463,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
+printf "%s\n" X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -487,7 +507,7 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+    { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
   # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
   # already done that, so ensure we don't try to do so again and fall
@@ -501,6 +521,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
   exit
 }
 
+
+# Determine whether it's possible to make 'echo' print without a newline.
+# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
+# for compatibility with existing Makefiles.
 ECHO_C= ECHO_N= ECHO_T=
 case `echo -n x` in #(((((
 -n*)
@@ -514,6 +538,13 @@ case `echo -n x` in #(((((
   ECHO_N='-n';;
 esac
 
+# For backward compatibility with old third-party macros, we provide
+# the shell variables $as_echo and $as_echo_n.  New code should use
+# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively.
+as_echo='printf %s\n'
+as_echo_n='printf %s'
+
+
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
@@ -581,8 +612,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='hypre'
 PACKAGE_TARNAME='hypre'
-PACKAGE_VERSION='2.22.1'
-PACKAGE_STRING='hypre 2.22.1'
+PACKAGE_VERSION='2.33.0'
+PACKAGE_STRING='hypre 2.33.0'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -590,40 +621,36 @@ ac_unique_file="HYPRE.h"
 ac_default_prefix=`pwd`/hypre
 # Factoring default headers for most tests.
 ac_includes_default="\
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
+#include <stddef.h>
+#ifdef HAVE_STDIO_H
+# include <stdio.h>
 #endif
-#ifdef STDC_HEADERS
+#ifdef HAVE_STDLIB_H
 # include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
 #endif
 #ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-#  include <memory.h>
-# endif
 # include <string.h>
 #endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
 #ifdef HAVE_INTTYPES_H
 # include <inttypes.h>
 #endif
 #ifdef HAVE_STDINT_H
 # include <stdint.h>
 #endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif"
 
+ac_header_c_list=
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
 AR
@@ -631,8 +658,13 @@ DSUPERLU_LIBS
 DSUPERLU_INCLUDE
 SUPERLU_LIBS
 SUPERLU_INCLUDE
+HYPRE_MAGMA_LIB
+HYPRE_MAGMA_INCLUDE
+HYPRE_MAGMA_LIB_DIR
 CALIPER_LIBS
 CALIPER_INCLUDE
+HYPRE_SYCL_LIBS
+HYPRE_SYCL_INCL
 HYPRE_HIP_LIBS
 HYPRE_HIP_INCL
 HYPRE_CUDA_LIBS
@@ -746,6 +778,7 @@ infodir
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -780,24 +813,20 @@ enable_persistent
 enable_hopscotch
 enable_fortran
 enable_unified_memory
-enable_cuda_streams
-enable_cusparse
 enable_device_memory_pool
-enable_cublas
-enable_curand
-enable_rocsparse
-enable_rocblas
-enable_rocrand
+enable_device_malloc_async
+enable_thrust_nosync
 enable_gpu_profiling
 enable_gpu_aware_mpi
+with_cxxstandard
 with_LD
 with_LDFLAGS
 with_extra_CFLAGS
 with_extra_CXXFLAGS
+with_extra_CUFLAGS
 with_extra_BUILDFLAGS
 with_extra_incpath
 with_extra_ldpath
-with_insure
 with_strict_checking
 with_MPI_include
 with_MPI_libs
@@ -806,6 +835,7 @@ with_MPI_flags
 with_node_aware_mpi
 with_node_aware_mpi_include
 with_memory_tracker
+with_test_using_host
 with_blas_lib
 with_blas_libs
 with_blas_lib_dirs
@@ -830,8 +860,23 @@ with_mli
 with_MPI
 with_cuda
 with_hip
+enable_rocsparse
+enable_rocblas
+enable_rocsolver
+enable_rocrand
+with_sycl
 with_cuda_home
 with_gpu_arch
+enable_cublas
+enable_curand
+enable_cuda_streams
+enable_cusparse
+enable_cusolver
+with_sycl_target
+with_sycl_target_backend
+enable_onemklsparse
+enable_onemklblas
+enable_onemklrand
 with_raja
 with_raja_include
 with_raja_lib
@@ -851,6 +896,11 @@ with_umpire_include
 with_umpire_lib
 with_umpire_libs
 with_umpire_lib_dirs
+with_magma
+with_magma_include
+with_magma_lib
+with_magma_libs
+with_magma_lib_dirs
 with_caliper
 with_caliper_include
 with_caliper_lib
@@ -913,6 +963,7 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -942,8 +993,6 @@ do
   *)    ac_optarg=yes ;;
   esac
 
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
   case $ac_dashdash$ac_option in
   --)
     ac_dashdash=yes ;;
@@ -984,9 +1033,9 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: \`$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -1010,9 +1059,9 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: \`$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -1165,6 +1214,15 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1214,9 +1272,9 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: \`$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -1230,9 +1288,9 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: \`$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -1276,9 +1334,9 @@ Try \`$0 --help' for more information"
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+      printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2
     : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
@@ -1294,7 +1352,7 @@ if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
     fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
-    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+    *)     printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
 
@@ -1302,7 +1360,7 @@ fi
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
+		libdir localedir mandir runstatedir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1358,7 +1416,7 @@ $as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_myself" : 'X\(//\)[^/]' \| \
 	 X"$as_myself" : 'X\(//\)$' \| \
 	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_myself" |
+printf "%s\n" X"$as_myself" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -1415,7 +1473,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures hypre 2.22.1 to adapt to many kinds of systems.
+\`configure' configures hypre 2.33.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1455,6 +1513,7 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -1480,7 +1539,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of hypre 2.22.1:";;
+     short | recursive ) echo "Configuration of hypre 2.33.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1506,21 +1565,33 @@ Optional Features:
   --enable-fortran        Require a working Fortran compiler (default is YES).
   --enable-unified-memory Use unified memory for allocating the memory
                           (default is NO).
-  --enable-cuda-streams   Use CUDA streams (default is YES).
-  --enable-cusparse       Use cuSPARSE (default is YES).
   --enable-device-memory-pool
                           Use device pooling allocator (default is NO).
-  --enable-cublas         Use cuBLAS (default is NO).
-  --enable-curand         Use cuRAND (default is YES).
-  --enable-rocsparse      Use rocSPARSE (default is YES).
-  --enable-rocblas        Use rocBLAS (default is NO).
-  --enable-rocrand        Use rocRAND (default is YES).
+  --enable-device-malloc-async
+                          Use device async malloc (default is NO).
+  --enable-thrust-nosync  Use thrust par_nosync policy (default is NO).
   --enable-gpu-profiling  Use NVTX on CUDA, rocTX on HIP (default is NO).
   --enable-gpu-aware-mpi  Use GPU memory aware MPI
+  --enable-rocsparse      Use rocSPARSE (default is YES with HIP, otherwise
+                          NO).
+  --enable-rocblas        Use rocBLAS (default is NO).
+  --enable-rocsolver      Use rocSOLVER (default is NO).
+  --enable-rocrand        Use rocRAND (default is YES with HIP, otherwise NO).
+  --enable-cublas         Use cuBLAS (default is YES with CUDA, otherwise NO).
+  --enable-curand         Use cuRAND (default is YES with CUDA, otherwise NO).
+  --enable-cuda-streams   Use CUDA streams (default is YES with CUDA,
+                          otherwise NO).
+  --enable-cusparse       Use cuSPARSE (default is YES with CUDA, otherwise
+                          NO).
+  --enable-cusolver       Use cuSOLVER (default is NO).
+  --enable-onemklsparse   Use oneMKL sparse (default is YES).
+  --enable-onemklblas     Use oneMKL blas (default is YES).
+  --enable-onemklrand     Use oneMKL rand (default is YES).
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-cxxstandard=val  User specifies c++ starndard in val.
   --with-LD=ARG           Set linker to ARG. The environment variable 'LD'
                           will be overridden.
   --with-LDFLAGS=ARG      User can manually set linker flags. The 'LDFLAGS'
@@ -1532,6 +1603,10 @@ Optional Packages:
                           Define extra C++ compile flag, where ARG is a
                           space-separated list (enclosed in quotes) of
                           directories.
+  --with-extra-CUFLAGS=ARG
+                          Define extra CUDA compile flag, where ARG is a
+                          space-separated list (enclosed in quotes) of
+                          directories.
   --with-extra-BUILDFLAGS=ARG
                           Define extra library build flag, where ARG is a
                           space-separated list (enclosed in quotes) of
@@ -1544,8 +1619,6 @@ Optional Packages:
                           Define extra ld path, where PATH is a
                           space-separated list (enclosed in quotes) of
                           directories.
-  --with-insure=FLAGS     FLAGS are options to pass to insure. Nothing is done
-                          to verify that insure is available
   --with-strict-checking  Compiles without MPI ('--without-MPI') and tries to
                           find a compiler option that warns of as many non-ISO
                           features as possible.
@@ -1572,6 +1645,8 @@ Optional Packages:
   --with-node-aware-mpi-include=DIR
                           User specifies that nap_comm.hpp is in DIR.
   --with-memory-tracker   Use memory tracker in hypre (default is NO).
+  --with-test-using-host  Use host memory in hypre test drivers (default is
+                          NO).
   --with-blas-lib=LIBS    LIBS is space-separated linkable list (enclosed in
                           quotes) of libraries needed for BLAS. OK to use -L
                           and -l flags in the list
@@ -1635,11 +1710,22 @@ Optional Packages:
   --with-cuda             Use CUDA. Require cuda-8.0 or higher (default is
                           NO).
   --with-hip              Use HIP for AMD GPUs. (default is NO).
+  --with-sycl             Use SYCL for Intel GPUs. (default is NO).
   --with-cuda-home=DIR    User specifies CUDA_HOME in DIR.
   --with-gpu-arch=ARG     User specifies NVIDIA GPU architecture that the CUDA
                           files will be compiled for in ARG, where ARG is a
                           space-separated list (enclosed in quotes) of
                           numbers.
+  --with-sycl-target=ARG  User specifies sycl targets for AOT compilation in
+                          ARG, where ARG is a comma-separated list (enclosed
+                          in quotes), e.g. "spir64_gen".
+  --with-sycl-target-backend=ARG
+                          User specifies additional options for the sycl
+                          target backend for AOT compilation in ARG, where ARG
+                          contains the desired options (enclosed in
+                          double+single quotes), e.g.
+                          --with-sycl-target-backend="'-device
+                          12.1.0,12.4.0'".
   --with-raja             Use RAJA. Require RAJA package to be compiled
                           properly (default is NO).
   --with-raja-include=DIR User specifies that RAJA/*.h is in DIR. The options
@@ -1704,6 +1790,25 @@ Optional Packages:
                           --with-umpire-libs, e.g "usr/lib /usr/local/lib".
                           The options --with-umpire-libs and
                           --with-umpire-dirs must be used together.
+  --with-magma            Use MAGMA (Matrix Algebra for GPUs and Multicore
+                          Architectures).
+  --with-magma-include=DIR
+                          User specifies that MAGMA headers are in DIR. The
+                          options --with-magma-include --with-magma-libs and
+                          --with-magma-dirs must be used together.
+  --with-magma-lib=LIBS   LIBS is space-separated linkable list (enclosed in
+                          quotes) of libraries needed for MAGMA. OK to use -L
+                          and -l flags in the list
+  --with-magma-libs=LIBS  LIBS is space-separated list (enclosed in quotes) of
+                          libraries needed for MAGMA (base name only). The
+                          options --with-magma-libs and --with-magma-lib-dirs
+                          must be used together.
+  --with-magma-lib-dirs=DIRS
+                          DIRS is space-separated list (enclosed in quotes) of
+                          directories containing the libraries specified by
+                          --with-magma-libs, e.g "usr/lib /usr/local/lib". The
+                          options --with-magma-libs and --with-magma-lib-dirs
+                          must be used together.
   --with-caliper          Use Caliper instrumentation (default is NO).
   --with-caliper-include=DIR
                           Directory where Caliper is installed.
@@ -1751,9 +1856,9 @@ if test "$ac_init_help" = "recursive"; then
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -1781,7 +1886,8 @@ esac
 ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
 
     cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for guested configure.
+    # Check for configure.gnu first; this name is used for a wrapper for
+    # Metaconfig's "Configure" on case-insensitive file systems.
     if test -f "$ac_srcdir/configure.gnu"; then
       echo &&
       $SHELL "$ac_srcdir/configure.gnu" --help=recursive
@@ -1789,7 +1895,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+      printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
@@ -1798,14 +1904,14 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-hypre configure 2.22.1
-generated by GNU Autoconf 2.69
+hypre configure 2.33.0
+generated by GNU Autoconf 2.71
 
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2021 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 
-Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 _ACEOF
   exit
@@ -1821,14 +1927,14 @@ fi
 ac_fn_c_try_compile ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
+  rm -f conftest.$ac_objext conftest.beam
   if { { ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -1836,14 +1942,15 @@ $as_echo "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
+       } && test -s conftest.$ac_objext
+then :
   ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
@@ -1859,14 +1966,14 @@ fi
 ac_fn_cxx_try_compile ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
+  rm -f conftest.$ac_objext conftest.beam
   if { { ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -1874,14 +1981,15 @@ $as_echo "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
+       } && test -s conftest.$ac_objext
+then :
   ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
@@ -1897,14 +2005,14 @@ fi
 ac_fn_fc_try_compile ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
+  rm -f conftest.$ac_objext conftest.beam
   if { { ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -1912,14 +2020,15 @@ $as_echo "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_fc_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
+       } && test -s conftest.$ac_objext
+then :
   ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
@@ -1935,14 +2044,14 @@ fi
 ac_fn_c_try_link ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
+  rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext
   if { { ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -1950,17 +2059,18 @@ $as_echo "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
 	 test -x conftest$ac_exeext
-       }; then :
+       }
+then :
   ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
@@ -1981,11 +2091,12 @@ fi
 ac_fn_c_check_func ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+printf %s "checking for $2... " >&6; }
+if eval test \${$3+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* Define $2 to an innocuous variant, in case <limits.h> declares $2.
@@ -1993,16 +2104,9 @@ else
 #define $2 innocuous_$2
 
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $2 (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+   which can conflict with char $2 (); below.  */
 
+#include <limits.h>
 #undef $2
 
 /* Override any GCC internal prototype to avoid an error.
@@ -2028,24 +2132,25 @@ choke me
 #endif
 #endif
 int
-main ()
+main (void)
 {
 return $2 ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   eval "$3=yes"
-else
+else $as_nop
   eval "$3=no"
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 fi
 eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_func
@@ -2062,7 +2167,7 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -2070,14 +2175,15 @@ $as_echo "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } > conftest.i && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       }; then :
+       }
+then :
   ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
     ac_retval=1
@@ -2087,135 +2193,6 @@ fi
 
 } # ac_fn_c_try_cpp
 
-# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists, giving a warning if it cannot be compiled using
-# the include files in INCLUDES and setting the cache variable VAR
-# accordingly.
-ac_fn_c_check_header_mongrel ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if eval \${$3+:} false; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
-$as_echo_n "checking $2 usability... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_header_compiler=yes
-else
-  ac_header_compiler=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
-$as_echo_n "checking $2 presence... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <$2>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  ac_header_preproc=yes
-else
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
-  yes:no: )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
-esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval "$3=\$ac_header_compiler"
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_header_mongrel
-
-# ac_fn_c_try_run LINENO
-# ----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-# that executables *can* be run.
-ac_fn_c_try_run ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-       $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_retval=$ac_status
-fi
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_run
-
 # ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
 # -------------------------------------------------------
 # Tests whether HEADER exists and can be compiled using the include files in
@@ -2223,37 +2200,59 @@ fi
 ac_fn_c_check_header_compile ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+printf %s "checking for $2... " >&6; }
+if eval test \${$3+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 #include <$2>
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   eval "$3=yes"
-else
+else $as_nop
   eval "$3=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_compile
+ac_configure_args_raw=
+for ac_arg
+do
+  case $ac_arg in
+  *\'*)
+    ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+  esac
+  as_fn_append ac_configure_args_raw " '$ac_arg'"
+done
+
+case $ac_configure_args_raw in
+  *$as_nl*)
+    ac_safe_unquote= ;;
+  *)
+    ac_unsafe_z='|&;<>()$`\\"*?[ ''	' # This string ends in space, tab.
+    ac_unsafe_a="$ac_unsafe_z#~"
+    ac_safe_unquote="s/ '\\([^$ac_unsafe_a][^$ac_unsafe_z]*\\)'/ \\1/g"
+    ac_configure_args_raw=`      printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;;
+esac
+
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by hypre $as_me 2.22.1, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
+It was created by hypre $as_me 2.33.0, which was
+generated by GNU Autoconf 2.71.  Invocation command line was
 
-  $ $0 $@
+  $ $0$ac_configure_args_raw
 
 _ACEOF
 exec 5>>config.log
@@ -2286,8 +2285,12 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    $as_echo "PATH: $as_dir"
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    printf "%s\n" "PATH: $as_dir"
   done
 IFS=$as_save_IFS
 
@@ -2322,7 +2325,7 @@ do
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
-      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
     1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
@@ -2357,11 +2360,13 @@ done
 # WARNING: Use '\'' to represent an apostrophe within the trap.
 # WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
 trap 'exit_status=$?
+  # Sanitize IFS.
+  IFS=" ""	$as_nl"
   # Save into config.log some information that might help in debugging.
   {
     echo
 
-    $as_echo "## ---------------- ##
+    printf "%s\n" "## ---------------- ##
 ## Cache variables. ##
 ## ---------------- ##"
     echo
@@ -2372,8 +2377,8 @@ trap 'exit_status=$?
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
@@ -2397,7 +2402,7 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
 )
     echo
 
-    $as_echo "## ----------------- ##
+    printf "%s\n" "## ----------------- ##
 ## Output variables. ##
 ## ----------------- ##"
     echo
@@ -2405,14 +2410,14 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
     do
       eval ac_val=\$$ac_var
       case $ac_val in
-      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
       esac
-      $as_echo "$ac_var='\''$ac_val'\''"
+      printf "%s\n" "$ac_var='\''$ac_val'\''"
     done | sort
     echo
 
     if test -n "$ac_subst_files"; then
-      $as_echo "## ------------------- ##
+      printf "%s\n" "## ------------------- ##
 ## File substitutions. ##
 ## ------------------- ##"
       echo
@@ -2420,15 +2425,15 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       do
 	eval ac_val=\$$ac_var
 	case $ac_val in
-	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	*\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 	esac
-	$as_echo "$ac_var='\''$ac_val'\''"
+	printf "%s\n" "$ac_var='\''$ac_val'\''"
       done | sort
       echo
     fi
 
     if test -s confdefs.h; then
-      $as_echo "## ----------- ##
+      printf "%s\n" "## ----------- ##
 ## confdefs.h. ##
 ## ----------- ##"
       echo
@@ -2436,8 +2441,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       echo
     fi
     test "$ac_signal" != 0 &&
-      $as_echo "$as_me: caught signal $ac_signal"
-    $as_echo "$as_me: exit $exit_status"
+      printf "%s\n" "$as_me: caught signal $ac_signal"
+    printf "%s\n" "$as_me: exit $exit_status"
   } >&5
   rm -f core *.core core.conftest.* &&
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
@@ -2451,63 +2456,48 @@ ac_signal=0
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -f -r conftest* confdefs.h
 
-$as_echo "/* confdefs.h */" > confdefs.h
+printf "%s\n" "/* confdefs.h */" > confdefs.h
 
 # Predefined preprocessor variables.
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
+printf "%s\n" "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
+printf "%s\n" "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
+printf "%s\n" "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
+printf "%s\n" "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
+printf "%s\n" "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_URL "$PACKAGE_URL"
-_ACEOF
+printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h
 
 
 # Let the site file select an alternate cache file if it wants to.
 # Prefer an explicitly selected file to automatically selected ones.
-ac_site_file1=NONE
-ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  # We do not want a PATH search for config.site.
-  case $CONFIG_SITE in #((
-    -*)  ac_site_file1=./$CONFIG_SITE;;
-    */*) ac_site_file1=$CONFIG_SITE;;
-    *)   ac_site_file1=./$CONFIG_SITE;;
-  esac
+  ac_site_files="$CONFIG_SITE"
 elif test "x$prefix" != xNONE; then
-  ac_site_file1=$prefix/share/config.site
-  ac_site_file2=$prefix/etc/config.site
+  ac_site_files="$prefix/share/config.site $prefix/etc/config.site"
 else
-  ac_site_file1=$ac_default_prefix/share/config.site
-  ac_site_file2=$ac_default_prefix/etc/config.site
+  ac_site_files="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
 fi
-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+
+for ac_site_file in $ac_site_files
 do
-  test "x$ac_site_file" = xNONE && continue
-  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
+  case $ac_site_file in #(
+  */*) :
+     ;; #(
+  *) :
+    ac_site_file=./$ac_site_file ;;
+esac
+  if test -f "$ac_site_file" && test -r "$ac_site_file"; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file" \
-      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+      || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "failed to load site script $ac_site_file
 See \`config.log' for more details" "$LINENO" 5; }
   fi
@@ -2517,118 +2507,722 @@ if test -r "$cache_file"; then
   # Some versions of bash will fail to source /dev/null (special files
   # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
   if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-$as_echo "$as_me: loading cache $cache_file" >&6;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+printf "%s\n" "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-$as_echo "$as_me: creating cache $cache_file" >&6;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+printf "%s\n" "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-  eval ac_new_val=\$ac_env_${ac_var}_value
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	# differences in whitespace do not lead to failure.
-	ac_old_val_w=`echo x $ac_old_val`
-	ac_new_val_w=`echo x $ac_new_val`
-	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	  ac_cache_corrupted=:
-	else
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
-	  eval $ac_var=\$ac_old_val
-	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
-$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
-$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
-fi
-## -------------------- ##
-## Main body of script. ##
-## -------------------- ##
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-ac_config_headers="$ac_config_headers HYPRE_config.h:config/HYPRE_config.h.in"
-
-
-
-ac_aux_dir=
-for ac_dir in config "$srcdir"/config; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in config \"$srcdir\"/config" "$LINENO" 5
-fi
+# Test code for whether the C compiler supports C89 (global declarations)
+ac_c_conftest_c89_globals='
+/* Does the compiler advertise C89 conformance?
+   Do not test the value of __STDC__, because some compilers set it to 0
+   while being otherwise adequately conformant. */
+#if !defined __STDC__
+# error "Compiler does not advertise C89 conformance"
+#endif
 
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
+#include <stddef.h>
+#include <stdarg.h>
+struct stat;
+/* Most of the following tests are stolen from RCS 5.7 src/conf.sh.  */
+struct buf { int x; };
+struct buf * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not \xHH hex character constants.
+   These do not provoke an error unfortunately, instead are silently treated
+   as an "x".  The following induces an error, until -std is added to get
+   proper ANSI mode.  Curiously \x00 != x always comes out true, for an
+   array size at least.  It is necessary to write \x00 == 0 to get something
+   that is true only with -std.  */
+int osf4_cc_array ['\''\x00'\'' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) '\''x'\''
+int xlc6_cc_array[FOO(a) == '\''x'\'' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, int *(*)(struct buf *, struct stat *, int),
+               int, int);'
+
+# Test code for whether the C compiler supports C89 (body of main).
+ac_c_conftest_c89_main='
+ok |= (argc == 0 || f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]);
+'
+
+# Test code for whether the C compiler supports C99 (global declarations)
+ac_c_conftest_c99_globals='
+// Does the compiler advertise C99 conformance?
+#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L
+# error "Compiler does not advertise C99 conformance"
+#endif
+
+#include <stdbool.h>
+extern int puts (const char *);
+extern int printf (const char *, ...);
+extern int dprintf (int, const char *, ...);
+extern void *malloc (size_t);
+
+// Check varargs macros.  These examples are taken from C99 6.10.3.5.
+// dprintf is used instead of fprintf to avoid needing to declare
+// FILE and stderr.
+#define debug(...) dprintf (2, __VA_ARGS__)
+#define showlist(...) puts (#__VA_ARGS__)
+#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
+static void
+test_varargs_macros (void)
+{
+  int x = 1234;
+  int y = 5678;
+  debug ("Flag");
+  debug ("X = %d\n", x);
+  showlist (The first, second, and third items.);
+  report (x>y, "x is %d but y is %d", x, y);
+}
+
+// Check long long types.
+#define BIG64 18446744073709551615ull
+#define BIG32 4294967295ul
+#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0)
+#if !BIG_OK
+  #error "your preprocessor is broken"
+#endif
+#if BIG_OK
+#else
+  #error "your preprocessor is broken"
+#endif
+static long long int bignum = -9223372036854775807LL;
+static unsigned long long int ubignum = BIG64;
+
+struct incomplete_array
+{
+  int datasize;
+  double data[];
+};
+
+struct named_init {
+  int number;
+  const wchar_t *name;
+  double average;
+};
+
+typedef const char *ccp;
+
+static inline int
+test_restrict (ccp restrict text)
+{
+  // See if C++-style comments work.
+  // Iterate through items via the restricted pointer.
+  // Also check for declarations in for loops.
+  for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i)
+    continue;
+  return 0;
+}
+
+// Check varargs and va_copy.
+static bool
+test_varargs (const char *format, ...)
+{
+  va_list args;
+  va_start (args, format);
+  va_list args_copy;
+  va_copy (args_copy, args);
+
+  const char *str = "";
+  int number = 0;
+  float fnumber = 0;
+
+  while (*format)
+    {
+      switch (*format++)
+	{
+	case '\''s'\'': // string
+	  str = va_arg (args_copy, const char *);
+	  break;
+	case '\''d'\'': // int
+	  number = va_arg (args_copy, int);
+	  break;
+	case '\''f'\'': // float
+	  fnumber = va_arg (args_copy, double);
+	  break;
+	default:
+	  break;
+	}
+    }
+  va_end (args_copy);
+  va_end (args);
+
+  return *str && number && fnumber;
+}
+'
+
+# Test code for whether the C compiler supports C99 (body of main).
+ac_c_conftest_c99_main='
+  // Check bool.
+  _Bool success = false;
+  success |= (argc != 0);
+
+  // Check restrict.
+  if (test_restrict ("String literal") == 0)
+    success = true;
+  char *restrict newvar = "Another string";
+
+  // Check varargs.
+  success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234);
+  test_varargs_macros ();
+
+  // Check flexible array members.
+  struct incomplete_array *ia =
+    malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));
+  ia->datasize = 10;
+  for (int i = 0; i < ia->datasize; ++i)
+    ia->data[i] = i * 1.234;
+
+  // Check named initializers.
+  struct named_init ni = {
+    .number = 34,
+    .name = L"Test wide string",
+    .average = 543.34343,
+  };
+
+  ni.number = 58;
+
+  int dynamic_array[ni.number];
+  dynamic_array[0] = argv[0][0];
+  dynamic_array[ni.number - 1] = 543;
+
+  // work around unused variable warnings
+  ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == '\''x'\''
+	 || dynamic_array[ni.number - 1] != 543);
+'
+
+# Test code for whether the C compiler supports C11 (global declarations)
+ac_c_conftest_c11_globals='
+// Does the compiler advertise C11 conformance?
+#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L
+# error "Compiler does not advertise C11 conformance"
+#endif
+
+// Check _Alignas.
+char _Alignas (double) aligned_as_double;
+char _Alignas (0) no_special_alignment;
+extern char aligned_as_int;
+char _Alignas (0) _Alignas (int) aligned_as_int;
+
+// Check _Alignof.
+enum
+{
+  int_alignment = _Alignof (int),
+  int_array_alignment = _Alignof (int[100]),
+  char_alignment = _Alignof (char)
+};
+_Static_assert (0 < -_Alignof (int), "_Alignof is signed");
+
+// Check _Noreturn.
+int _Noreturn does_not_return (void) { for (;;) continue; }
+
+// Check _Static_assert.
+struct test_static_assert
+{
+  int x;
+  _Static_assert (sizeof (int) <= sizeof (long int),
+                  "_Static_assert does not work in struct");
+  long int y;
+};
+
+// Check UTF-8 literals.
+#define u8 syntax error!
+char const utf8_literal[] = u8"happens to be ASCII" "another string";
+
+// Check duplicate typedefs.
+typedef long *long_ptr;
+typedef long int *long_ptr;
+typedef long_ptr long_ptr;
+
+// Anonymous structures and unions -- taken from C11 6.7.2.1 Example 1.
+struct anonymous
+{
+  union {
+    struct { int i; int j; };
+    struct { int k; long int l; } w;
+  };
+  int m;
+} v1;
+'
+
+# Test code for whether the C compiler supports C11 (body of main).
+ac_c_conftest_c11_main='
+  _Static_assert ((offsetof (struct anonymous, i)
+		   == offsetof (struct anonymous, w.k)),
+		  "Anonymous union alignment botch");
+  v1.i = 2;
+  v1.w.k = 5;
+  ok |= v1.i != 5;
+'
+
+# Test code for whether the C compiler supports C11 (complete).
+ac_c_conftest_c11_program="${ac_c_conftest_c89_globals}
+${ac_c_conftest_c99_globals}
+${ac_c_conftest_c11_globals}
+
+int
+main (int argc, char **argv)
+{
+  int ok = 0;
+  ${ac_c_conftest_c89_main}
+  ${ac_c_conftest_c99_main}
+  ${ac_c_conftest_c11_main}
+  return ok;
+}
+"
+
+# Test code for whether the C compiler supports C99 (complete).
+ac_c_conftest_c99_program="${ac_c_conftest_c89_globals}
+${ac_c_conftest_c99_globals}
+
+int
+main (int argc, char **argv)
+{
+  int ok = 0;
+  ${ac_c_conftest_c89_main}
+  ${ac_c_conftest_c99_main}
+  return ok;
+}
+"
+
+# Test code for whether the C compiler supports C89 (complete).
+ac_c_conftest_c89_program="${ac_c_conftest_c89_globals}
+
+int
+main (int argc, char **argv)
+{
+  int ok = 0;
+  ${ac_c_conftest_c89_main}
+  return ok;
+}
+"
+
+# Test code for whether the C++ compiler supports C++98 (global declarations)
+ac_cxx_conftest_cxx98_globals='
+// Does the compiler advertise C++98 conformance?
+#if !defined __cplusplus || __cplusplus < 199711L
+# error "Compiler does not advertise C++98 conformance"
+#endif
+
+// These inclusions are to reject old compilers that
+// lack the unsuffixed header files.
+#include <cstdlib>
+#include <exception>
+
+// <cassert> and <cstring> are *not* freestanding headers in C++98.
+extern void assert (int);
+namespace std {
+  extern int strcmp (const char *, const char *);
+}
+
+// Namespaces, exceptions, and templates were all added after "C++ 2.0".
+using std::exception;
+using std::strcmp;
+
+namespace {
+
+void test_exception_syntax()
+{
+  try {
+    throw "test";
+  } catch (const char *s) {
+    // Extra parentheses suppress a warning when building autoconf itself,
+    // due to lint rules shared with more typical C programs.
+    assert (!(strcmp) (s, "test"));
+  }
+}
+
+template <typename T> struct test_template
+{
+  T const val;
+  explicit test_template(T t) : val(t) {}
+  template <typename U> T add(U u) { return static_cast<T>(u) + val; }
+};
+
+} // anonymous namespace
+'
+
+# Test code for whether the C++ compiler supports C++98 (body of main)
+ac_cxx_conftest_cxx98_main='
+  assert (argc);
+  assert (! argv[0]);
+{
+  test_exception_syntax ();
+  test_template<double> tt (2.0);
+  assert (tt.add (4) == 6.0);
+  assert (true && !false);
+}
+'
+
+# Test code for whether the C++ compiler supports C++11 (global declarations)
+ac_cxx_conftest_cxx11_globals='
+// Does the compiler advertise C++ 2011 conformance?
+#if !defined __cplusplus || __cplusplus < 201103L
+# error "Compiler does not advertise C++11 conformance"
+#endif
+
+namespace cxx11test
+{
+  constexpr int get_val() { return 20; }
+
+  struct testinit
+  {
+    int i;
+    double d;
+  };
+
+  class delegate
+  {
+  public:
+    delegate(int n) : n(n) {}
+    delegate(): delegate(2354) {}
+
+    virtual int getval() { return this->n; };
+  protected:
+    int n;
+  };
+
+  class overridden : public delegate
+  {
+  public:
+    overridden(int n): delegate(n) {}
+    virtual int getval() override final { return this->n * 2; }
+  };
+
+  class nocopy
+  {
+  public:
+    nocopy(int i): i(i) {}
+    nocopy() = default;
+    nocopy(const nocopy&) = delete;
+    nocopy & operator=(const nocopy&) = delete;
+  private:
+    int i;
+  };
+
+  // for testing lambda expressions
+  template <typename Ret, typename Fn> Ret eval(Fn f, Ret v)
+  {
+    return f(v);
+  }
+
+  // for testing variadic templates and trailing return types
+  template <typename V> auto sum(V first) -> V
+  {
+    return first;
+  }
+  template <typename V, typename... Args> auto sum(V first, Args... rest) -> V
+  {
+    return first + sum(rest...);
+  }
+}
+'
+
+# Test code for whether the C++ compiler supports C++11 (body of main)
+ac_cxx_conftest_cxx11_main='
+{
+  // Test auto and decltype
+  auto a1 = 6538;
+  auto a2 = 48573953.4;
+  auto a3 = "String literal";
+
+  int total = 0;
+  for (auto i = a3; *i; ++i) { total += *i; }
+
+  decltype(a2) a4 = 34895.034;
+}
+{
+  // Test constexpr
+  short sa[cxx11test::get_val()] = { 0 };
+}
+{
+  // Test initializer lists
+  cxx11test::testinit il = { 4323, 435234.23544 };
+}
+{
+  // Test range-based for
+  int array[] = {9, 7, 13, 15, 4, 18, 12, 10, 5, 3,
+                 14, 19, 17, 8, 6, 20, 16, 2, 11, 1};
+  for (auto &x : array) { x += 23; }
+}
+{
+  // Test lambda expressions
+  using cxx11test::eval;
+  assert (eval ([](int x) { return x*2; }, 21) == 42);
+  double d = 2.0;
+  assert (eval ([&](double x) { return d += x; }, 3.0) == 5.0);
+  assert (d == 5.0);
+  assert (eval ([=](double x) mutable { return d += x; }, 4.0) == 9.0);
+  assert (d == 5.0);
+}
+{
+  // Test use of variadic templates
+  using cxx11test::sum;
+  auto a = sum(1);
+  auto b = sum(1, 2);
+  auto c = sum(1.0, 2.0, 3.0);
+}
+{
+  // Test constructor delegation
+  cxx11test::delegate d1;
+  cxx11test::delegate d2();
+  cxx11test::delegate d3(45);
+}
+{
+  // Test override and final
+  cxx11test::overridden o1(55464);
+}
+{
+  // Test nullptr
+  char *c = nullptr;
+}
+{
+  // Test template brackets
+  test_template<::test_template<int>> v(test_template<int>(12));
+}
+{
+  // Unicode literals
+  char const *utf8 = u8"UTF-8 string \u2500";
+  char16_t const *utf16 = u"UTF-8 string \u2500";
+  char32_t const *utf32 = U"UTF-32 string \u2500";
+}
+'
+
+# Test code for whether the C compiler supports C++11 (complete).
+ac_cxx_conftest_cxx11_program="${ac_cxx_conftest_cxx98_globals}
+${ac_cxx_conftest_cxx11_globals}
+
+int
+main (int argc, char **argv)
+{
+  int ok = 0;
+  ${ac_cxx_conftest_cxx98_main}
+  ${ac_cxx_conftest_cxx11_main}
+  return ok;
+}
+"
+
+# Test code for whether the C compiler supports C++98 (complete).
+ac_cxx_conftest_cxx98_program="${ac_cxx_conftest_cxx98_globals}
+int
+main (int argc, char **argv)
+{
+  int ok = 0;
+  ${ac_cxx_conftest_cxx98_main}
+  return ok;
+}
+"
+
+as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H"
+as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H"
+as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H"
+as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H"
+as_fn_append ac_header_c_list " stdint.h stdint_h HAVE_STDINT_H"
+as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H"
+as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H"
+as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H"
+as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H"
+
+# Auxiliary files required by this configure script.
+ac_aux_files="config.guess config.sub"
+
+# Locations in which to look for auxiliary files.
+ac_aux_dir_candidates="${srcdir}/config"
+
+# Search for a directory containing all of the required auxiliary files,
+# $ac_aux_files, from the $PATH-style list $ac_aux_dir_candidates.
+# If we don't find one directory that contains all the files we need,
+# we report the set of missing files from the *first* directory in
+# $ac_aux_dir_candidates and give up.
+ac_missing_aux_files=""
+ac_first_candidate=:
+printf "%s\n" "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
+for as_dir in $ac_aux_dir_candidates
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+  as_found=:
+
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}:  trying $as_dir" >&5
+  ac_aux_dir_found=yes
+  ac_install_sh=
+  for ac_aux in $ac_aux_files
+  do
+    # As a special case, if "install-sh" is required, that requirement
+    # can be satisfied by any of "install-sh", "install.sh", or "shtool",
+    # and $ac_install_sh is set appropriately for whichever one is found.
+    if test x"$ac_aux" = x"install-sh"
+    then
+      if test -f "${as_dir}install-sh"; then
+        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}install-sh found" >&5
+        ac_install_sh="${as_dir}install-sh -c"
+      elif test -f "${as_dir}install.sh"; then
+        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}install.sh found" >&5
+        ac_install_sh="${as_dir}install.sh -c"
+      elif test -f "${as_dir}shtool"; then
+        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}shtool found" >&5
+        ac_install_sh="${as_dir}shtool install -c"
+      else
+        ac_aux_dir_found=no
+        if $ac_first_candidate; then
+          ac_missing_aux_files="${ac_missing_aux_files} install-sh"
+        else
+          break
+        fi
+      fi
+    else
+      if test -f "${as_dir}${ac_aux}"; then
+        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}${ac_aux} found" >&5
+      else
+        ac_aux_dir_found=no
+        if $ac_first_candidate; then
+          ac_missing_aux_files="${ac_missing_aux_files} ${ac_aux}"
+        else
+          break
+        fi
+      fi
+    fi
+  done
+  if test "$ac_aux_dir_found" = yes; then
+    ac_aux_dir="$as_dir"
+    break
+  fi
+  ac_first_candidate=false
+
+  as_found=false
+done
+IFS=$as_save_IFS
+if $as_found
+then :
+
+else $as_nop
+  as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5
+fi
+
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
 # They can cause serious problems if a builder's source tree is in a directory
 # whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
+if test -f "${ac_aux_dir}config.guess"; then
+  ac_config_guess="$SHELL ${ac_aux_dir}config.guess"
+fi
+if test -f "${ac_aux_dir}config.sub"; then
+  ac_config_sub="$SHELL ${ac_aux_dir}config.sub"
+fi
+if test -f "$ac_aux_dir/configure"; then
+  ac_configure="$SHELL ${ac_aux_dir}configure"
+fi
+
+# Check that the precious variables saved in the cache have kept the same
+# value.
+ac_cache_corrupted=false
+for ac_var in $ac_precious_vars; do
+  eval ac_old_set=\$ac_cv_env_${ac_var}_set
+  eval ac_new_set=\$ac_env_${ac_var}_set
+  eval ac_old_val=\$ac_cv_env_${ac_var}_value
+  eval ac_new_val=\$ac_env_${ac_var}_value
+  case $ac_old_set,$ac_new_set in
+    set,)
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,set)
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,);;
+    *)
+      if test "x$ac_old_val" != "x$ac_new_val"; then
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
+printf "%s\n" "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
+printf "%s\n" "$as_me:   current value: \`$ac_new_val'" >&2;}
+      fi;;
+  esac
+  # Pass precious variables to config.status.
+  if test "$ac_new_set" = set; then
+    case $ac_new_val in
+    *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *) ac_arg=$ac_var=$ac_new_val ;;
+    esac
+    case " $ac_configure_args " in
+      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
+      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
+    esac
+  fi
+done
+if $ac_cache_corrupted; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;}
+  as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file'
+	    and start over" "$LINENO" 5
+fi
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+ac_config_headers="$ac_config_headers HYPRE_config.h:config/HYPRE_config.h.in"
+
+
 
 
 
@@ -2636,42 +3230,31 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 HYPRE_NAME="hypre"
-HYPRE_VERSION="2.22.1"
-HYPRE_NUMBER=22201
-HYPRE_DATE="2021/08/20"
+HYPRE_VERSION="2.33.0"
+HYPRE_NUMBER=23300
+HYPRE_DATE="2025/04/03"
 HYPRE_TIME="00:00:00"
 HYPRE_BUGS="https://github.com/hypre-space/hypre/issues"
 HYPRE_SRCDIR="`pwd`"
 
 
-cat >>confdefs.h <<_ACEOF
-#define HYPRE_RELEASE_NAME "$HYPRE_NAME"
-_ACEOF
+printf "%s\n" "#define HYPRE_RELEASE_NAME \"$HYPRE_NAME\"" >>confdefs.h
 
 
-cat >>confdefs.h <<_ACEOF
-#define HYPRE_RELEASE_VERSION "$HYPRE_VERSION"
-_ACEOF
+printf "%s\n" "#define HYPRE_RELEASE_VERSION \"$HYPRE_VERSION\"" >>confdefs.h
 
 
-cat >>confdefs.h <<_ACEOF
-#define HYPRE_RELEASE_NUMBER $HYPRE_NUMBER
-_ACEOF
+printf "%s\n" "#define HYPRE_RELEASE_NUMBER $HYPRE_NUMBER" >>confdefs.h
 
 
-cat >>confdefs.h <<_ACEOF
-#define HYPRE_RELEASE_DATE "$HYPRE_DATE"
-_ACEOF
+printf "%s\n" "#define HYPRE_RELEASE_DATE \"$HYPRE_DATE\"" >>confdefs.h
 
 
-cat >>confdefs.h <<_ACEOF
-#define HYPRE_RELEASE_TIME "$HYPRE_TIME"
-_ACEOF
+printf "%s\n" "#define HYPRE_RELEASE_TIME \"$HYPRE_TIME\"" >>confdefs.h
 
 
-cat >>confdefs.h <<_ACEOF
-#define HYPRE_RELEASE_BUGS "$HYPRE_BUGS"
-_ACEOF
+printf "%s\n" "#define HYPRE_RELEASE_BUGS \"$HYPRE_BUGS\"" >>confdefs.h
+
 
 
 
@@ -2682,6 +3265,47 @@ _ACEOF
 
 
 
+if test -d "$HYPRE_SRCDIR/../.git"
+then :
+
+  develop_string=$(git -C $HYPRE_SRCDIR describe --match 'v*' --long --abbrev=9)
+  develop_lastag=$(git -C $HYPRE_SRCDIR describe --match 'v*' --abbrev=0)
+  develop_number=$(git -C $HYPRE_SRCDIR rev-list --count $develop_lastag..HEAD)
+  develop_branch=$(git -C $HYPRE_SRCDIR rev-parse --abbrev-ref HEAD)
+  if test -n "$develop_string"
+then :
+
+
+printf "%s\n" "#define HYPRE_DEVELOP_STRING \"$develop_string\"" >>confdefs.h
+
+
+printf "%s\n" "#define HYPRE_DEVELOP_NUMBER $develop_number" >>confdefs.h
+
+
+printf "%s\n" "#define HYPRE_BRANCH_NAME \"$develop_branch\"" >>confdefs.h
+
+    if test "x$develop_branch" = "xmaster"
+then :
+
+printf "%s\n" "#define HYPRE_DEVELOP_BRANCH \"$develop_branch\"" >>confdefs.h
+
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: NOTE: On branch $develop_branch, not the main development branch" >&5
+printf "%s\n" "$as_me: NOTE: On branch $develop_branch, not the main development branch" >&6;}
+
+fi
+
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: NOTE: Could not describe development branch" >&5
+printf "%s\n" "$as_me: NOTE: Could not describe development branch" >&6;}
+
+fi
+
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: NOTE: Could not find .git directory" >&5
+printf "%s\n" "$as_me: NOTE: Could not find .git directory" >&6;}
+
+fi
 
 PACKAGE_DATE=
 PACKAGE_TIME=
@@ -2715,17 +3339,19 @@ hypre_using_mli=no
 
 hypre_using_openmp=no
 hypre_using_device_openmp=no
-hypre_using_insure=no
 hypre_using_cuda=no
 hypre_using_gpu=no
 hypre_using_um=no
 hypre_gpu_mpi=no
 hypre_using_gpu_profiling=no
 hypre_using_cuda_streams=no
-hypre_using_cusparse=yes
+hypre_using_cusparse=no
 hypre_using_cublas=no
-hypre_using_curand=yes
+hypre_using_curand=no
+hypre_using_cusolver=no
 hypre_using_device_pool=no
+hypre_using_device_malloc_async=no
+hypre_using_thrust_nosync=no
 hypre_using_umpire=no
 hypre_using_umpire_host=no
 hypre_using_umpire_device=no
@@ -2741,15 +3367,31 @@ hypre_found_cuda=no
 hypre_using_node_aware_mpi=no
 hypre_using_memory_tracker=no
 
+hypre_test_using_host=no
+
+hypre_cxxstd=11
+
+hypre_using_magma=no
+hypre_user_gave_magma_inc=no
+hypre_user_gave_magma_lib=no
+hypre_user_gave_magma_libs=no
+hypre_user_gave_magma_lib_dirs=no
 
 hypre_using_hip=no
 hypre_using_rocsparse=no
 hypre_using_rocblas=no
+hypre_using_rocsolver=no
 hypre_using_rocrand=no
 
 hypre_found_hip=no
 
 
+hypre_using_sycl=no
+hypre_using_onemklsparse=no
+hypre_using_onemklblas=no
+hypre_using_onemklrand=no
+
+hypre_found_mkl=no
 
 hypre_blas_lib_old_style=no
 hypre_blas_lib_dir_old_style=no
@@ -2758,26 +3400,30 @@ hypre_lapack_lib_dir_old_style=no
 
 if test "x$build_alias" = "x"
 then
-   # Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
-$as_echo_n "checking build system type... " >&6; }
-if ${ac_cv_build+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+
+
+  # Make sure we can run config.sub.
+$SHELL "${ac_aux_dir}config.sub" sun4 >/dev/null 2>&1 ||
+  as_fn_error $? "cannot run $SHELL ${ac_aux_dir}config.sub" "$LINENO" 5
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+printf %s "checking build system type... " >&6; }
+if test ${ac_cv_build+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_build_alias=$build_alias
 test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+  ac_build_alias=`$SHELL "${ac_aux_dir}config.guess"`
 test "x$ac_build_alias" = x &&
   as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` ||
+  as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $ac_build_alias failed" "$LINENO" 5
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-$as_echo "$ac_cv_build" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+printf "%s\n" "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
@@ -2800,21 +3446,22 @@ fi
 
 if test "x$host_alias" = "x"
 then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
-$as_echo_n "checking host system type... " >&6; }
-if ${ac_cv_host+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+printf %s "checking host system type... " >&6; }
+if test ${ac_cv_host+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test "x$host_alias" = x; then
   ac_cv_host=$ac_cv_build
 else
-  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+  ac_cv_host=`$SHELL "${ac_aux_dir}config.sub" $host_alias` ||
+    as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $host_alias failed" "$LINENO" 5
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-$as_echo "$ac_cv_host" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+printf "%s\n" "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
@@ -2841,33 +3488,36 @@ then
 fi
 
 # Check whether --enable-debug was given.
-if test "${enable_debug+set}" = set; then :
+if test ${enable_debug+y}
+then :
   enableval=$enable_debug; case "${enableval}" in
     yes) hypre_using_debug=yes ;;
     no)  hypre_using_debug=no ;;
     *)   as_fn_error $? "Bad value ${enableval} for --enable-debug" "$LINENO" 5 ;;
  esac
-else
+else $as_nop
   hypre_using_debug=no
 
 fi
 
 
 # Check whether --enable-shared was given.
-if test "${enable_shared+set}" = set; then :
+if test ${enable_shared+y}
+then :
   enableval=$enable_shared; case "${enableval}" in
     yes) hypre_using_shared=yes ;;
     no)  hypre_using_shared=no ;;
     *)   as_fn_error $? "Bad value ${enableval} for --enable-shared" "$LINENO" 5 ;;
  esac
-else
+else $as_nop
   hypre_using_shared=no
 
 fi
 
 
 # Check whether --enable-mixedint was given.
-if test "${enable_mixedint+set}" = set; then :
+if test ${enable_mixedint+y}
+then :
   enableval=$enable_mixedint; case "${enableval}" in
     yes) hypre_using_fei=no
          hypre_using_mixedint=yes
@@ -2876,7 +3526,7 @@ if test "${enable_mixedint+set}" = set; then :
          hypre_using_distributed_ls=yes ;;
     *)   as_fn_error $? "Bad value ${enableval} for --enable-mixedint" "$LINENO" 5 ;;
  esac
-else
+else $as_nop
   hypre_using_mixedint=no
 
 fi
@@ -2884,19 +3534,20 @@ fi
 if test "$hypre_using_mixedint" = "yes"
 then
 
-$as_echo "#define HYPRE_MIXEDINT 1" >>confdefs.h
+printf "%s\n" "#define HYPRE_MIXEDINT 1" >>confdefs.h
 
 fi
 
 # Check whether --enable-bigint was given.
-if test "${enable_bigint+set}" = set; then :
+if test ${enable_bigint+y}
+then :
   enableval=$enable_bigint; case "${enableval}" in
     yes) hypre_using_fei=no
          hypre_using_bigint=yes ;;
     no)  hypre_using_bigint=no ;;
     *)   as_fn_error $? "Bad value ${enableval} for --enable-bigint" "$LINENO" 5 ;;
  esac
-else
+else $as_nop
   hypre_using_bigint=no
 
 fi
@@ -2904,19 +3555,20 @@ fi
 if test "$hypre_using_bigint" = "yes"
 then
 
-$as_echo "#define HYPRE_BIGINT 1" >>confdefs.h
+printf "%s\n" "#define HYPRE_BIGINT 1" >>confdefs.h
 
 fi
 
 # Check whether --enable-single was given.
-if test "${enable_single+set}" = set; then :
+if test ${enable_single+y}
+then :
   enableval=$enable_single; case "${enableval}" in
     yes) hypre_using_fei=no
          hypre_using_single=yes ;;
     no)  hypre_using_single=no ;;
     *)   as_fn_error $? "Bad value ${enableval} for --enable-single" "$LINENO" 5 ;;
  esac
-else
+else $as_nop
   hypre_using_single=no
 
 fi
@@ -2924,19 +3576,20 @@ fi
 if test "$hypre_using_single" = "yes"
 then
 
-$as_echo "#define HYPRE_SINGLE 1" >>confdefs.h
+printf "%s\n" "#define HYPRE_SINGLE 1" >>confdefs.h
 
 fi
 
 # Check whether --enable-longdouble was given.
-if test "${enable_longdouble+set}" = set; then :
+if test ${enable_longdouble+y}
+then :
   enableval=$enable_longdouble; case "${enableval}" in
     yes) hypre_using_fei=no
          hypre_using_longdouble=yes ;;
     no)  hypre_using_longdouble=no ;;
     *)   as_fn_error $? "Bad value ${enableval} for --enable-longdouble" "$LINENO" 5 ;;
  esac
-else
+else $as_nop
   hypre_using_longdouble=no
 
 fi
@@ -2944,19 +3597,20 @@ fi
 if test "$hypre_using_longdouble" = "yes"
 then
 
-$as_echo "#define HYPRE_LONG_DOUBLE 1" >>confdefs.h
+printf "%s\n" "#define HYPRE_LONG_DOUBLE 1" >>confdefs.h
 
 fi
 
 # Check whether --enable-complex was given.
-if test "${enable_complex+set}" = set; then :
+if test ${enable_complex+y}
+then :
   enableval=$enable_complex; case "${enableval}" in
     yes) hypre_using_fei=no
          hypre_using_complex=yes ;;
     no)  hypre_using_complex=no ;;
     *)   as_fn_error $? "Bad value ${enableval} for --enable-complex" "$LINENO" 5 ;;
  esac
-else
+else $as_nop
   hypre_using_complex=no
 
 fi
@@ -2964,32 +3618,32 @@ fi
 if test "$hypre_using_complex" = "yes"
 then
 
-$as_echo "#define HYPRE_COMPLEX 1" >>confdefs.h
+printf "%s\n" "#define HYPRE_COMPLEX 1" >>confdefs.h
 
 fi
 
 # Check whether --enable-maxdim was given.
-if test "${enable_maxdim+set}" = set; then :
+if test ${enable_maxdim+y}
+then :
   enableval=$enable_maxdim; hypre_maxdim=${enableval}
-else
+else $as_nop
   hypre_maxdim=3
 
 fi
 
 
-cat >>confdefs.h <<_ACEOF
-#define HYPRE_MAXDIM $hypre_maxdim
-_ACEOF
+printf "%s\n" "#define HYPRE_MAXDIM $hypre_maxdim" >>confdefs.h
 
 
 # Check whether --enable-persistent was given.
-if test "${enable_persistent+set}" = set; then :
+if test ${enable_persistent+y}
+then :
   enableval=$enable_persistent; case "${enableval}" in
     yes) hypre_using_persistent=yes ;;
     no)  hypre_using_persistent=no ;;
     *)   as_fn_error $? "Bad value ${enableval} for --enable-persistent" "$LINENO" 5 ;;
  esac
-else
+else $as_nop
   hypre_using_persistent=no
 
 fi
@@ -2997,188 +3651,136 @@ fi
 if test "$hypre_using_persistent" = "yes"
 then
 
-$as_echo "#define HYPRE_USING_PERSISTENT_COMM 1" >>confdefs.h
+printf "%s\n" "#define HYPRE_USING_PERSISTENT_COMM 1" >>confdefs.h
 
 fi
 
 # Check whether --enable-hopscotch was given.
-if test "${enable_hopscotch+set}" = set; then :
+if test ${enable_hopscotch+y}
+then :
   enableval=$enable_hopscotch; case "${enableval}" in
     yes) hypre_using_hopscotch=yes ;;
     no)  hypre_using_hopscotch=no ;;
     *)   as_fn_error $? "Bad value ${enableval} for --enable-hopscotch" "$LINENO" 5 ;;
  esac
-else
-  hypre_using_hopscotch=no
-
-fi
-
-if test "$hypre_using_hopscotch" = "yes"
-then
-
-$as_echo "#define HYPRE_HOPSCOTCH 1" >>confdefs.h
-
-fi
-
-# Check whether --enable-fortran was given.
-if test "${enable_fortran+set}" = set; then :
-  enableval=$enable_fortran; case "${enableval}" in
-    yes) hypre_using_fortran=yes ;;
-    no)  hypre_using_fortran=no ;;
-    *)   hypre_using_fortran=yes ;;
- esac
-else
-  hypre_using_fortran=yes
-
-fi
-
-
-# Check whether --enable-unified-memory was given.
-if test "${enable_unified_memory+set}" = set; then :
-  enableval=$enable_unified_memory; case "${enableval}" in
-    yes) hypre_using_um=yes ;;
-    no)  hypre_using_um=no ;;
-    *)   hypre_using_um=no ;;
- esac
-else
-  hypre_using_um=no
-
-fi
-
-
-# Check whether --enable-cuda-streams was given.
-if test "${enable_cuda_streams+set}" = set; then :
-  enableval=$enable_cuda_streams; case "${enableval}" in
-    yes) hypre_using_cuda_streams=yes ;;
-    no)  hypre_using_cuda_streams=no ;;
-    *)   hypre_using_cuda_streams=yes ;;
- esac
-else
-  hypre_using_cuda_streams=yes
-
-fi
-
-
-# Check whether --enable-cusparse was given.
-if test "${enable_cusparse+set}" = set; then :
-  enableval=$enable_cusparse; case "${enableval}" in
-    yes) hypre_using_cusparse=yes ;;
-    no)  hypre_using_cusparse=no ;;
-    *)   hypre_using_cusparse=yes ;;
- esac
-else
-  hypre_using_cusparse=yes
+else $as_nop
+  hypre_using_hopscotch=no
 
 fi
 
+if test "$hypre_using_hopscotch" = "yes"
+then
 
-# Check whether --enable-device-memory-pool was given.
-if test "${enable_device_memory_pool+set}" = set; then :
-  enableval=$enable_device_memory_pool; case "${enableval}" in
-    yes) hypre_using_device_pool=yes ;;
-    no)  hypre_using_device_pool=no ;;
-    *)   hypre_using_device_pool=no ;;
- esac
-else
-  hypre_using_device_pool=no
+printf "%s\n" "#define HYPRE_USING_HOPSCOTCH 1" >>confdefs.h
 
 fi
 
-
-# Check whether --enable-cublas was given.
-if test "${enable_cublas+set}" = set; then :
-  enableval=$enable_cublas; case "${enableval}" in
-    yes) hypre_using_cublas=yes ;;
-    no)  hypre_using_cublas=no ;;
-    *)   hypre_using_cublas=no ;;
+# Check whether --enable-fortran was given.
+if test ${enable_fortran+y}
+then :
+  enableval=$enable_fortran; case "${enableval}" in
+    yes) hypre_using_fortran=yes ;;
+    no)  hypre_using_fortran=no ;;
+    *)   hypre_using_fortran=yes ;;
  esac
-else
-  hypre_using_cublas=no
+else $as_nop
+  hypre_using_fortran=yes
 
 fi
 
 
-# Check whether --enable-curand was given.
-if test "${enable_curand+set}" = set; then :
-  enableval=$enable_curand; case "${enableval}" in
-    yes) hypre_using_curand=yes ;;
-    no)  hypre_using_curand=no ;;
-    *)   hypre_using_curand=yes ;;
+# Check whether --enable-unified-memory was given.
+if test ${enable_unified_memory+y}
+then :
+  enableval=$enable_unified_memory; case "${enableval}" in
+    yes) hypre_using_um=yes ;;
+    no)  hypre_using_um=no ;;
+    *)   hypre_using_um=no ;;
  esac
-else
-  hypre_using_curand=yes
+else $as_nop
+  hypre_using_um=no
 
 fi
 
 
-
-
-# Check whether --enable-rocsparse was given.
-if test "${enable_rocsparse+set}" = set; then :
-  enableval=$enable_rocsparse; case "${enableval}" in
-    yes) hypre_using_rocsparse=yes ;;
-    no)  hypre_using_rocsparse=no ;;
-    *)   hypre_using_rocsparse=yes ;;
+# Check whether --enable-device-memory-pool was given.
+if test ${enable_device_memory_pool+y}
+then :
+  enableval=$enable_device_memory_pool; case "${enableval}" in
+    yes) hypre_using_device_pool=yes ;;
+    no)  hypre_using_device_pool=no ;;
+    *)   hypre_using_device_pool=no ;;
  esac
-else
-  hypre_using_rocsparse=yes
+else $as_nop
+  hypre_using_device_pool=no
 
 fi
 
 
-# Check whether --enable-rocblas was given.
-if test "${enable_rocblas+set}" = set; then :
-  enableval=$enable_rocblas; case "${enableval}" in
-    yes) hypre_using_rocblas=yes ;;
-    no)  hypre_using_rocblas=no ;;
-    *)   hypre_using_rocblas=no ;;
+# Check whether --enable-device-malloc-async was given.
+if test ${enable_device_malloc_async+y}
+then :
+  enableval=$enable_device_malloc_async; case "${enableval}" in
+    yes) hypre_using_device_malloc_async=yes ;;
+    no)  hypre_using_device_malloc_async=no ;;
+    *)   hypre_using_device_malloc_async=no ;;
  esac
-else
-  hypre_using_rocblas=no
+else $as_nop
+  hypre_using_device_malloc_async=no
 
 fi
 
 
-# Check whether --enable-rocrand was given.
-if test "${enable_rocrand+set}" = set; then :
-  enableval=$enable_rocrand; case "${enableval}" in
-    yes) hypre_using_rocrand=yes ;;
-    no)  hypre_using_rocrand=no ;;
-    *)   hypre_using_rocrand=yes ;;
+# Check whether --enable-thrust-nosync was given.
+if test ${enable_thrust_nosync+y}
+then :
+  enableval=$enable_thrust_nosync; case "${enableval}" in
+    yes) hypre_using_thrust_nosync=yes ;;
+    no)  hypre_using_thrust_nosync=no ;;
+    *)   hypre_using_thrust_nosync=no ;;
  esac
-else
-  hypre_using_rocrand=yes
+else $as_nop
+  hypre_using_thrust_nosync=no
 
 fi
 
 
 # Check whether --enable-gpu-profiling was given.
-if test "${enable_gpu_profiling+set}" = set; then :
+if test ${enable_gpu_profiling+y}
+then :
   enableval=$enable_gpu_profiling; case "${enableval}" in
     yes) hypre_using_gpu_profiling=yes ;;
     no)  hypre_using_gpu_profiling=no ;;
     *)   hypre_using_gpu_profiling=no ;;
  esac
-else
+else $as_nop
   hypre_using_gpu_profiling=no
 
 fi
 
 
 # Check whether --enable-gpu-aware-mpi was given.
-if test "${enable_gpu_aware_mpi+set}" = set; then :
+if test ${enable_gpu_aware_mpi+y}
+then :
   enableval=$enable_gpu_aware_mpi; case "${enableval}" in
     yes) hypre_gpu_mpi=yes ;;
     no)  hypre_gpu_mpi=no ;;
     *)   as_fn_error $? "Bad value ${enableval} for --enable-gpu-aware-mpi" "$LINENO" 5 ;;
  esac
-else
+else $as_nop
   hypre_gpu_mpi=no
 
 fi
 
 
 
+if test "x$LDFLAGS" = "x"
+then
+   hypre_user_chose_ldflags=no
+else
+   hypre_user_chose_ldflags=yes
+fi
+
 if test "x$CC" = "x"
 then
    hypre_user_chose_ccompilers=no
@@ -3256,9 +3858,19 @@ then
 fi
 
 
+# Check whether --with-cxxstandard was given.
+if test ${with_cxxstandard+y}
+then :
+  withval=$with_cxxstandard; hypre_cxxstd=$withval
+
+fi
+
+
+
 
 # Check whether --with-LD was given.
-if test "${with_LD+set}" = set; then :
+if test ${with_LD+y}
+then :
   withval=$with_LD; LD=$withval
 
 fi
@@ -3266,7 +3878,8 @@ fi
 
 
 # Check whether --with-LDFLAGS was given.
-if test "${with_LDFLAGS+set}" = set; then :
+if test ${with_LDFLAGS+y}
+then :
   withval=$with_LDFLAGS; LDFLAGS=$withval
 
 fi
@@ -3274,7 +3887,8 @@ fi
 
 
 # Check whether --with-extra-CFLAGS was given.
-if test "${with_extra_CFLAGS+set}" = set; then :
+if test ${with_extra_CFLAGS+y}
+then :
   withval=$with_extra_CFLAGS; EXTRA_CFLAGS=$withval
 
 fi
@@ -3282,15 +3896,26 @@ fi
 
 
 # Check whether --with-extra-CXXFLAGS was given.
-if test "${with_extra_CXXFLAGS+set}" = set; then :
+if test ${with_extra_CXXFLAGS+y}
+then :
   withval=$with_extra_CXXFLAGS; EXTRA_CXXFLAGS=$withval
 
 fi
 
 
 
+# Check whether --with-extra-CUFLAGS was given.
+if test ${with_extra_CUFLAGS+y}
+then :
+  withval=$with_extra_CUFLAGS; EXTRA_CUFLAGS=$withval
+
+fi
+
+
+
 # Check whether --with-extra-BUILDFLAGS was given.
-if test "${with_extra_BUILDFLAGS+set}" = set; then :
+if test ${with_extra_BUILDFLAGS+y}
+then :
   withval=$with_extra_BUILDFLAGS; EXTRA_BUILDFLAGS=$withval
 
 fi
@@ -3298,7 +3923,8 @@ fi
 
 
 # Check whether --with-extra-incpath was given.
-if test "${with_extra_incpath+set}" = set; then :
+if test ${with_extra_incpath+y}
+then :
   withval=$with_extra_incpath; CCFLAGS="${CCFLAGS} -I`echo ${withval}|sed 's/ /\ -I/g'`"
 
 fi
@@ -3306,31 +3932,17 @@ fi
 
 
 # Check whether --with-extra-ldpath was given.
-if test "${with_extra_ldpath+set}" = set; then :
+if test ${with_extra_ldpath+y}
+then :
   withval=$with_extra_ldpath; LDFLAGS="-L`echo ${withval}|sed 's/ /\ -L/g'` ${LDFLAGS}"
 
 fi
 
 
 
-# Check whether --with-insure was given.
-if test "${with_insure+set}" = set; then :
-  withval=$with_insure; case "${withval}" in
-    yes) hypre_using_insure=yes
-         hypre_using_debug=yes
-         hypre_insure_flags="" ;;
-    no)  ;;
-     *)  hypre_using_insure=yes
-         hypre_using_debug=yes
-         hypre_insure_flags="$withval" ;;
- esac
-
-fi
-
-
-
 # Check whether --with-strict-checking was given.
-if test "${with_strict_checking+set}" = set; then :
+if test ${with_strict_checking+y}
+then :
   withval=$with_strict_checking; case "${withval}" in
  yes)
  hypre_user_chose_ccompilers=yes
@@ -3346,11 +3958,12 @@ if test "${with_strict_checking+set}" = set; then :
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -3358,11 +3971,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3373,11 +3990,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -3391,7 +4008,7 @@ test -n "$CC" || CC=""""
     CFLAGS=""
  elif test "x$GCC" = "xyes" || test "x$CC" = "xgcc"; then
     FFLAGS="-g -Wall"
-    CFLAGS="-g -Wall -std=gnu99 -pedantic"
+    CFLAGS="-g -Wall -std=gnu99 -pedantic -Wfloat-conversion -fsingle-precision-constant"
     CXXFLAGS="-g -Wall -Wshadow -fno-implicit-templates"
     CXXFLAGS="$CXXFLAGS -Woverloaded-virtual -ansi -pedantic"
  elif test "x$CC" = "xicc"; then
@@ -3419,11 +4036,12 @@ test -n "$CC" || CC=""""
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CXX+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CXX"; then
   ac_cv_prog_CXX="$CXX" # Let the user override the test.
 else
@@ -3431,11 +4049,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CXX="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3446,11 +4068,11 @@ fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
-$as_echo "$CXX" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+printf "%s\n" "$CXX" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -3469,11 +4091,12 @@ test -n "$CXX" || CXX=""""
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_FC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_FC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$FC"; then
   ac_cv_prog_FC="$FC" # Let the user override the test.
 else
@@ -3481,11 +4104,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_FC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3496,11 +4123,11 @@ fi
 fi
 FC=$ac_cv_prog_FC
 if test -n "$FC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FC" >&5
-$as_echo "$FC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FC" >&5
+printf "%s\n" "$FC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -3516,7 +4143,7 @@ test -n "$FC" || FC=""""
  fi
 
 
-$as_echo "#define HYPRE_SEQUENTIAL 1" >>confdefs.h
+printf "%s\n" "#define HYPRE_SEQUENTIAL 1" >>confdefs.h
 
  ;;
  esac
@@ -3527,12 +4154,13 @@ fi
 
 
 # Check whether --with-MPI-include was given.
-if test "${with_MPI_include+set}" = set; then :
+if test ${with_MPI_include+y}
+then :
   withval=$with_MPI_include; for mpi_dir in $withval; do
     MPIINCLUDE="$MPIINCLUDE -I$mpi_dir"
  done;
  hypre_user_chose_mpi=yes
-else
+else $as_nop
   hypre_user_chose_mpi=no
 
 fi
@@ -3540,7 +4168,8 @@ fi
 
 
 # Check whether --with-MPI-libs was given.
-if test "${with_MPI_libs+set}" = set; then :
+if test ${with_MPI_libs+y}
+then :
   withval=$with_MPI_libs; for mpi_lib in $withval; do
     MPILIBS="$MPILIBS -l$mpi_lib"
  done;
@@ -3551,7 +4180,8 @@ fi
 
 
 # Check whether --with-MPI-lib-dirs was given.
-if test "${with_MPI_lib_dirs+set}" = set; then :
+if test ${with_MPI_lib_dirs+y}
+then :
   withval=$with_MPI_lib_dirs; for mpi_lib_dir in $withval; do
     MPILIBDIRS="-L$mpi_lib_dir $MPILIBDIRS"
  done;
@@ -3562,13 +4192,14 @@ fi
 
 
 # Check whether --with-MPI-flags was given.
-if test "${with_MPI_flags+set}" = set; then :
+if test ${with_MPI_flags+y}
+then :
   withval=$with_MPI_flags; case "${withval}" in
     yes) MPIFLAGS="" ;;
     no)  MPIFLAGS="" ;;
     *)   MPIFLAGS=$withval ;;
  esac
-else
+else $as_nop
   MPIFLAGS=""
 
 fi
@@ -3576,13 +4207,14 @@ fi
 
 
 # Check whether --with-node-aware-mpi was given.
-if test "${with_node_aware_mpi+set}" = set; then :
+if test ${with_node_aware_mpi+y}
+then :
   withval=$with_node_aware_mpi; case "$withval" in
     yes) hypre_using_node_aware_mpi=yes;;
     no)  hypre_using_node_aware_mpi=no ;;
     *)   hypre_using_node_aware_mpi=no ;;
  esac
-else
+else $as_nop
   hypre_using_node_aware_mpi=no
 
 fi
@@ -3590,7 +4222,8 @@ fi
 
 
 # Check whether --with-node-aware-mpi-include was given.
-if test "${with_node_aware_mpi_include+set}" = set; then :
+if test ${with_node_aware_mpi_include+y}
+then :
   withval=$with_node_aware_mpi_include; for nap_dir in $withval; do
     HYPRE_NAP_INCLUDE="$HYPRE_NAP_INCLUDE -I$nap_dir"
  done;
@@ -3601,22 +4234,39 @@ fi
 
 
 # Check whether --with-memory_tracker was given.
-if test "${with_memory_tracker+set}" = set; then :
+if test ${with_memory_tracker+y}
+then :
   withval=$with_memory_tracker; case "$withval" in
     yes) hypre_using_memory_tracker=yes;;
     no)  hypre_using_memory_tracker=no ;;
     *)   hypre_using_memory_tracker=no ;;
  esac
-else
+else $as_nop
   hypre_using_memory_tracker=no
 
 fi
 
 
 
+# Check whether --with-test_using_host was given.
+if test ${with_test_using_host+y}
+then :
+  withval=$with_test_using_host; case "$withval" in
+    yes) hypre_test_using_host=yes;;
+    no)  hypre_test_using_host=no ;;
+    *)   hypre_test_using_host=no ;;
+ esac
+else $as_nop
+  hypre_test_using_host=no
+
+fi
+
+
+
 
 # Check whether --with-blas-lib was given.
-if test "${with_blas_lib+set}" = set; then :
+if test ${with_blas_lib+y}
+then :
   withval=$with_blas_lib; for blas_lib in $withval; do
        BLASLIBS="$BLASLIBS $blas_lib"
  done;
@@ -3627,7 +4277,8 @@ fi
 
 
 # Check whether --with-blas-libs was given.
-if test "${with_blas_libs+set}" = set; then :
+if test ${with_blas_libs+y}
+then :
   withval=$with_blas_libs; for blas_lib in $withval; do
     BLASLIBS="$BLASLIBS -l$blas_lib"
  done;
@@ -3639,7 +4290,8 @@ fi
 
 
 # Check whether --with-blas-lib-dirs was given.
-if test "${with_blas_lib_dirs+set}" = set; then :
+if test ${with_blas_lib_dirs+y}
+then :
   withval=$with_blas_lib_dirs; for blas_lib_dir in $withval; do
     BLASLIBDIRS="-L$blas_lib_dir $BLASLIBDIRS"
  done;
@@ -3652,7 +4304,8 @@ fi
 
 
 # Check whether --with-lapack-lib was given.
-if test "${with_lapack_lib+set}" = set; then :
+if test ${with_lapack_lib+y}
+then :
   withval=$with_lapack_lib; for lapack_lib in $withval; do
        LAPACKLIBS="$LAPACKLIBS $lapack_lib"
  done;
@@ -3663,7 +4316,8 @@ fi
 
 
 # Check whether --with-lapack-libs was given.
-if test "${with_lapack_libs+set}" = set; then :
+if test ${with_lapack_libs+y}
+then :
   withval=$with_lapack_libs; for lapack_lib in $withval; do
     LAPACKLIBS="$LAPACKLIBS -l$lapack_lib"
  done;
@@ -3675,7 +4329,8 @@ fi
 
 
 # Check whether --with-lapack-lib-dirs was given.
-if test "${with_lapack_lib_dirs+set}" = set; then :
+if test ${with_lapack_lib_dirs+y}
+then :
   withval=$with_lapack_lib_dirs; for lapack_lib_dir in $withval; do
     LAPACKLIBDIRS="-L$lapack_lib_dir $LAPACKLIBDIRS"
  done;
@@ -3689,7 +4344,8 @@ fi
 
 
 # Check whether --with-fmangle was given.
-if test "${with_fmangle+set}" = set; then :
+if test ${with_fmangle+y}
+then :
   withval=$with_fmangle; hypre_fmangle=0;
  case "$withval" in
     no-underscores)      hypre_fmangle=1 ;;
@@ -3699,22 +4355,21 @@ if test "${with_fmangle+set}" = set; then :
     one-before-after)    hypre_fmangle=5 ;;
  esac
 
-else
+else $as_nop
   hypre_fmangle=0
 
 fi
 
 
-cat >>confdefs.h <<_ACEOF
-#define HYPRE_FMANGLE $hypre_fmangle
-_ACEOF
+printf "%s\n" "#define HYPRE_FMANGLE $hypre_fmangle" >>confdefs.h
 
 
 
 
 
 # Check whether --with-fmangle-blas was given.
-if test "${with_fmangle_blas+set}" = set; then :
+if test ${with_fmangle_blas+y}
+then :
   withval=$with_fmangle_blas; hypre_fmangle_blas=0;
  case "$withval" in
     no-underscores)      hypre_fmangle_blas=1 ;;
@@ -3724,22 +4379,21 @@ if test "${with_fmangle_blas+set}" = set; then :
     one-before-after)    hypre_fmangle_blas=5 ;;
  esac
 
-else
+else $as_nop
   hypre_fmangle_blas=0
 
 fi
 
 
-cat >>confdefs.h <<_ACEOF
-#define HYPRE_FMANGLE_BLAS $hypre_fmangle_blas
-_ACEOF
+printf "%s\n" "#define HYPRE_FMANGLE_BLAS $hypre_fmangle_blas" >>confdefs.h
 
 
 
 
 
 # Check whether --with-fmangle-lapack was given.
-if test "${with_fmangle_lapack+set}" = set; then :
+if test ${with_fmangle_lapack+y}
+then :
   withval=$with_fmangle_lapack; hypre_fmangle_lapack=0;
  case "$withval" in
     no-underscores)      hypre_fmangle_lapack=1 ;;
@@ -3749,24 +4403,23 @@ if test "${with_fmangle_lapack+set}" = set; then :
     one-before-after)    hypre_fmangle_lapack=5 ;;
  esac
 
-else
+else $as_nop
   hypre_fmangle_lapack=0
 
 fi
 
 
-cat >>confdefs.h <<_ACEOF
-#define HYPRE_FMANGLE_LAPACK $hypre_fmangle_lapack
-_ACEOF
+printf "%s\n" "#define HYPRE_FMANGLE_LAPACK $hypre_fmangle_lapack" >>confdefs.h
 
 
 
 # Check whether --with-print-errors was given.
-if test "${with_print_errors+set}" = set; then :
+if test ${with_print_errors+y}
+then :
   withval=$with_print_errors; if test "$withval" = "yes"
  then
 
-$as_echo "#define HYPRE_PRINT_ERRORS 1" >>confdefs.h
+printf "%s\n" "#define HYPRE_PRINT_ERRORS 1" >>confdefs.h
 
  fi
 
@@ -3775,11 +4428,12 @@ fi
 
 
 # Check whether --with-timing was given.
-if test "${with_timing+set}" = set; then :
+if test ${with_timing+y}
+then :
   withval=$with_timing; if test "$withval" = "yes"
  then
 
-$as_echo "#define HYPRE_TIMING 1" >>confdefs.h
+printf "%s\n" "#define HYPRE_TIMING 1" >>confdefs.h
 
  fi
 
@@ -3788,12 +4442,13 @@ fi
 
 
 # Check whether --with-openmp was given.
-if test "${with_openmp+set}" = set; then :
+if test ${with_openmp+y}
+then :
   withval=$with_openmp; case "${withval}" in
     yes) hypre_using_openmp=yes;;
     no)  hypre_using_openmp=no ;;
  esac
-else
+else $as_nop
   hypre_using_openmp=no
 
 fi
@@ -3801,12 +4456,13 @@ fi
 
 
 # Check whether --with-device-openmp was given.
-if test "${with_device_openmp+set}" = set; then :
+if test ${with_device_openmp+y}
+then :
   withval=$with_device_openmp; case "${withval}" in
     yes) hypre_using_device_openmp=yes ;;
     no)  hypre_using_device_openmp=no ;;
  esac
-else
+else $as_nop
   hypre_using_device_openmp=no
 
 fi
@@ -3815,7 +4471,8 @@ fi
 
 
 # Check whether --with-superlu was given.
-if test "${with_superlu+set}" = set; then :
+if test ${with_superlu+y}
+then :
   withval=$with_superlu; case "${withval}" in
     no) hypre_using_superlu=no ;;
     *)  hypre_using_superlu=yes ;;
@@ -3824,15 +4481,17 @@ if test "${with_superlu+set}" = set; then :
 fi
 
 
-if test "x$with_superlu" = "xyes"; then :
+if test "x$with_superlu" = "xyes"
+then :
 
-$as_echo "#define HAVE_SUPERLU 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SUPERLU 1" >>confdefs.h
 
 fi
 
 
 # Check whether --with-superlu-include was given.
-if test "${with_superlu_include+set}" = set; then :
+if test ${with_superlu_include+y}
+then :
   withval=$with_superlu_include; for superlu_inc_dir in $withval; do
     SUPERLU_INCLUDE="-I$superlu_inc_dir $SUPERLU_INCLUDE"
  done
@@ -3842,7 +4501,8 @@ fi
 
 
 # Check whether --with-superlu-lib was given.
-if test "${with_superlu_lib+set}" = set; then :
+if test ${with_superlu_lib+y}
+then :
   withval=$with_superlu_lib; for superlu_lib in $withval; do
     SUPERLU_LIBS="$SUPERLU_LIBS $superlu_lib"
  done
@@ -3853,7 +4513,8 @@ fi
 
 
 # Check whether --with-dsuperlu was given.
-if test "${with_dsuperlu+set}" = set; then :
+if test ${with_dsuperlu+y}
+then :
   withval=$with_dsuperlu; case "${withval}" in
     no) hypre_using_dsuperlu=no ;;
     *)  hypre_using_dsuperlu=yes ;;
@@ -3862,15 +4523,17 @@ if test "${with_dsuperlu+set}" = set; then :
 fi
 
 
-if test "x$with_dsuperlu" = "xyes"; then :
+if test "x$with_dsuperlu" = "xyes"
+then :
 
-$as_echo "#define HYPRE_USING_DSUPERLU 1" >>confdefs.h
+printf "%s\n" "#define HYPRE_USING_DSUPERLU 1" >>confdefs.h
 
 fi
 
 
 # Check whether --with-dsuperlu-include was given.
-if test "${with_dsuperlu_include+set}" = set; then :
+if test ${with_dsuperlu_include+y}
+then :
   withval=$with_dsuperlu_include; for dsuperlu_inc_dir in $withval; do
     DSUPERLU_INCLUDE="-I$dsuperlu_inc_dir $DSUPERLU_INCLUDE"
  done
@@ -3880,7 +4543,8 @@ fi
 
 
 # Check whether --with-dsuperlu-lib was given.
-if test "${with_dsuperlu_lib+set}" = set; then :
+if test ${with_dsuperlu_lib+y}
+then :
   withval=$with_dsuperlu_lib; for dsuperlu_lib in $withval; do
     DSUPERLU_LIBS="$DSUPERLU_LIBS $dsuperlu_lib"
  done
@@ -3891,7 +4555,8 @@ fi
 
 
 # Check whether --with-fei-inc-dir was given.
-if test "${with_fei_inc_dir+set}" = set; then :
+if test ${with_fei_inc_dir+y}
+then :
   withval=$with_fei_inc_dir; HYPRE_FEI_BASE_DIR="$withval";
  hypre_using_fei=yes
 
@@ -3901,94 +4566,341 @@ fi
 
 
 # Check whether --with-mli was given.
-if test "${with_mli+set}" = set; then :
+if test ${with_mli+y}
+then :
   withval=$with_mli; case "${withval}" in
     no) hypre_using_mli=no ;;
     *)  hypre_using_mli=yes ;;
  esac
-
+
+fi
+
+
+
+
+# Check whether --with-MPI was given.
+if test ${with_MPI+y}
+then :
+  withval=$with_MPI; case "$withval" in
+    no) hypre_using_mpi=no ;;
+    *)  hypre_using_mpi=yes ;;
+ esac
+
+fi
+
+
+
+
+# Check whether --with-cuda was given.
+if test ${with_cuda+y}
+then :
+  withval=$with_cuda; case "$withval" in
+    yes) hypre_using_cuda=yes ;;
+    no)  hypre_using_cuda=no ;;
+    *)   hypre_using_cuda=no ;;
+ esac
+else $as_nop
+  hypre_using_cuda=no
+
+fi
+
+
+
+# Check whether --with-hip was given.
+if test ${with_hip+y}
+then :
+  withval=$with_hip; case "$withval" in
+    yes) hypre_using_hip=yes ;;
+    no)  hypre_using_hip=no ;;
+    *)   hypre_using_hip=no ;;
+ esac
+else $as_nop
+  hypre_using_hip=no
+
+fi
+
+
+# Check whether --enable-rocsparse was given.
+if test ${enable_rocsparse+y}
+then :
+  enableval=$enable_rocsparse; case "${enableval}" in
+    yes) hypre_using_rocsparse=yes ;;
+    no)  hypre_using_rocsparse=no ;;
+    *)   hypre_using_rocsparse=yes ;;
+ esac
+else $as_nop
+  case "$hypre_using_hip" in
+    yes) hypre_using_rocsparse=yes ;;
+    no)  hypre_using_rocsparse=no ;;
+    *)   hypre_using_rocsparse=no ;;
+ esac
+
+fi
+
+
+# Check whether --enable-rocblas was given.
+if test ${enable_rocblas+y}
+then :
+  enableval=$enable_rocblas; case "${enableval}" in
+    yes) hypre_using_rocblas=yes ;;
+    no)  hypre_using_rocblas=no ;;
+    *)   hypre_using_rocblas=no ;;
+ esac
+else $as_nop
+  hypre_using_rocblas=no
+
+fi
+
+
+# Check whether --enable-rocsolver was given.
+if test ${enable_rocsolver+y}
+then :
+  enableval=$enable_rocsolver; case "${enableval}" in
+    yes) hypre_using_rocsolver=yes; hypre_using_rocblas=yes ;;
+    no)  hypre_using_rocsolver=no  ;;
+    *)   hypre_using_rocsolver=no  ;;
+ esac
+else $as_nop
+  hypre_using_rocsolver=no
+
+fi
+
+
+# Check whether --enable-rocrand was given.
+if test ${enable_rocrand+y}
+then :
+  enableval=$enable_rocrand; case "${enableval}" in
+    yes) hypre_using_rocrand=yes ;;
+    no)  hypre_using_rocrand=no ;;
+    *)   hypre_using_rocrand=yes ;;
+ esac
+else $as_nop
+  case "$hypre_using_hip" in
+    yes) hypre_using_rocrand=yes ;;
+    no)  hypre_using_rocrand=no ;;
+    *)   hypre_using_rocrand=no ;;
+ esac
+
+fi
+
+
+
+# Check whether --with-sycl was given.
+if test ${with_sycl+y}
+then :
+  withval=$with_sycl; case "$withval" in
+    yes) hypre_using_sycl=yes ;;
+    no)  hypre_using_sycl=no ;;
+    *)   hypre_using_sycl=no ;;
+esac
+else $as_nop
+  hypre_using_sycl=no
+
+fi
+
+
+
+
+# Check whether --with-cuda-home was given.
+if test ${with_cuda_home+y}
+then :
+  withval=$with_cuda_home; for cuda_dir in $withval; do
+    CUDA_HOME="$cuda_dir"
+ done;
+ hypre_using_cuda=yes
+
+fi
+
+
+
+# Check whether --with-gpu-arch was given.
+if test ${with_gpu_arch+y}
+then :
+  withval=$with_gpu_arch;
+ if test "x${withval}" != "x"
+ then
+    if test "x${HYPRE_CUDA_SM}" = "x"
+    then
+       HYPRE_CUDA_SM="${withval}"
+    fi
+ fi
+
+
+fi
+
+
+# Check whether --enable-cublas was given.
+if test ${enable_cublas+y}
+then :
+  enableval=$enable_cublas; case "${enableval}" in
+    yes) hypre_using_cublas=yes ;;
+    no)  hypre_using_cublas=no ;;
+    *)   hypre_using_cublas=no ;;
+ esac
+else $as_nop
+  case "$hypre_using_cuda" in
+    yes) hypre_using_cublas=yes ;;
+    no)  hypre_using_cublas=no ;;
+    *)   hypre_using_cublas=no ;;
+ esac
+
+fi
+
+
+# Check whether --enable-curand was given.
+if test ${enable_curand+y}
+then :
+  enableval=$enable_curand; case "${enableval}" in
+    yes) hypre_using_curand=yes ;;
+    no)  hypre_using_curand=no ;;
+    *)   hypre_using_curand=no ;;
+ esac
+else $as_nop
+  case "$hypre_using_cuda" in
+    yes) hypre_using_curand=yes ;;
+    no)  hypre_using_curand=no ;;
+    *)   hypre_using_curand=no ;;
+ esac
+
+fi
+
+
+# Check whether --enable-cuda-streams was given.
+if test ${enable_cuda_streams+y}
+then :
+  enableval=$enable_cuda_streams; case "${enableval}" in
+    yes) hypre_using_cuda_streams=yes ;;
+    no)  hypre_using_cuda_streams=no  ;;
+    *)   hypre_using_cuda_streams=yes ;;
+ esac
+else $as_nop
+  case "$hypre_using_cuda" in
+    yes) hypre_using_cuda_streams=yes ;;
+    no)  hypre_using_cuda_streams=no  ;;
+    *)   hypre_using_cuda_streams=yes ;;
+ esac
 fi
 
 
+# Check whether --enable-cusparse was given.
+if test ${enable_cusparse+y}
+then :
+  enableval=$enable_cusparse; case "${enableval}" in
+    yes) hypre_using_cusparse=yes ;;
+    no)  hypre_using_cusparse=no ;;
+    *)   hypre_using_cusparse=no ;;
+ esac
+else $as_nop
+  case "$hypre_using_cuda" in
+    yes) hypre_using_cusparse=yes ;;
+    no)  hypre_using_cusparse=no ;;
+    *)   hypre_using_cusparse=no ;;
+ esac
+fi
 
 
-# Check whether --with-MPI was given.
-if test "${with_MPI+set}" = set; then :
-  withval=$with_MPI; case "$withval" in
-    no) hypre_using_mpi=no ;;
-    *)  hypre_using_mpi=yes ;;
+# Check whether --enable-cusolver was given.
+if test ${enable_cusolver+y}
+then :
+  enableval=$enable_cusolver; case "${enableval}" in
+    yes) hypre_using_cusolver=yes ;;
+    no)  hypre_using_cusolver=no  ;;
+    *)   hypre_using_cusolver=no  ;;
  esac
+else $as_nop
+  hypre_using_cusolver=no
 
 fi
 
 
 
 
-# Check whether --with-cuda was given.
-if test "${with_cuda+set}" = set; then :
-  withval=$with_cuda; case "$withval" in
-    yes) hypre_using_cuda=yes ;;
-    no)  hypre_using_cuda=no ;;
-    *)   hypre_using_cuda=no ;;
- esac
-else
-  hypre_using_cuda=no
+# Check whether --with-sycl-target was given.
+if test ${with_sycl_target+y}
+then :
+  withval=$with_sycl_target;
+ if test "x${withval}" != "x"
+ then
+    if test "x${HYPRE_SYCL_TARGET}" = "x"
+    then
+       HYPRE_SYCL_TARGET="${withval}"
+    fi
+ fi
+
 
 fi
 
 
 
+# Check whether --with-sycl-target-backend was given.
+if test ${with_sycl_target_backend+y}
+then :
+  withval=$with_sycl_target_backend;
+ if test "x${withval}" != "x"
+ then
+    if test "x${HYPRE_SYCL_TARGET_BACKEND}" = "x"
+    then
+       HYPRE_SYCL_TARGET_BACKEND="${withval}"
+    fi
+ fi
 
-# Check whether --with-hip was given.
-if test "${with_hip+set}" = set; then :
-  withval=$with_hip; case "$withval" in
-    yes) hypre_using_hip=yes ;;
-    no)  hypre_using_hip=no ;;
-    *)   hypre_using_hip=no ;;
- esac
-else
-  hypre_using_hip=no
 
 fi
 
 
-
-# Check whether --with-cuda-home was given.
-if test "${with_cuda_home+set}" = set; then :
-  withval=$with_cuda_home; for cuda_dir in $withval; do
-    CUDA_HOME="$cuda_dir"
- done;
- hypre_using_cuda=yes
+# Check whether --enable-onemklsparse was given.
+if test ${enable_onemklsparse+y}
+then :
+  enableval=$enable_onemklsparse; case "${enableval}" in
+    yes) hypre_using_onemklsparse=yes ;;
+    no)  hypre_using_onemklsparse=no ;;
+    *)   hypre_using_onemklsparse=yes ;;
+ esac
+else $as_nop
+  hypre_using_onemklsparse=yes
 
 fi
 
 
+# Check whether --enable-onemklblas was given.
+if test ${enable_onemklblas+y}
+then :
+  enableval=$enable_onemklblas; case "${enableval}" in
+    yes) hypre_using_onemklblas=yes ;;
+    no)  hypre_using_onemklblas=no ;;
+    *)   hypre_using_onemklblas=yes ;;
+ esac
+else $as_nop
+  hypre_using_onemklblas=yes
 
-# Check whether --with-gpu-arch was given.
-if test "${with_gpu_arch+set}" = set; then :
-  withval=$with_gpu_arch;
- if test "x${withval}" != "x"
- then
-    if test "x${HYPRE_CUDA_SM}" = "x"
-    then
-       HYPRE_CUDA_SM="${withval}"
-    fi
- fi
+fi
 
 
+# Check whether --enable-onemklrand was given.
+if test ${enable_onemklrand+y}
+then :
+  enableval=$enable_onemklrand; case "${enableval}" in
+    yes) hypre_using_onemklrand=yes ;;
+    no)  hypre_using_onemklrand=no ;;
+    *)   hypre_using_onemklrand=yes ;;
+ esac
+else $as_nop
+  hypre_using_onemklrand=yes
+
 fi
 
 
 
 
 # Check whether --with-raja was given.
-if test "${with_raja+set}" = set; then :
+if test ${with_raja+y}
+then :
   withval=$with_raja; case "$withval" in
     yes) hypre_using_raja=yes;;
     no)  hypre_using_raja=no ;;
     *)   hypre_using_raja=no ;;
  esac
-else
+else $as_nop
   hypre_using_raja=no
 
 fi
@@ -3996,7 +4908,8 @@ fi
 
 
 # Check whether --with-raja-include was given.
-if test "${with_raja_include+set}" = set; then :
+if test ${with_raja_include+y}
+then :
   withval=$with_raja_include; for raja_dir in $withval; do
     HYPRE_RAJA_INCLUDE="-I$raja_dir $HYPRE_RAJA_INCLUDE"
  done;
@@ -4007,7 +4920,8 @@ fi
 
 
 # Check whether --with-raja-lib was given.
-if test "${with_raja_lib+set}" = set; then :
+if test ${with_raja_lib+y}
+then :
   withval=$with_raja_lib; for raja_lib in $withval; do
        HYPRE_RAJA_LIB="$raja_lib $HYPRE_RAJA_LIB"
  done;
@@ -4018,7 +4932,8 @@ fi
 
 
 # Check whether --with-raja-libs was given.
-if test "${with_raja_libs+set}" = set; then :
+if test ${with_raja_libs+y}
+then :
   withval=$with_raja_libs; for raja_lib in $withval; do
     HYPRE_RAJA_LIB="-l$raja_lib $HYPRE_RAJA_LIB"
  done;
@@ -4029,7 +4944,8 @@ fi
 
 
 # Check whether --with-raja-lib-dirs was given.
-if test "${with_raja_lib_dirs+set}" = set; then :
+if test ${with_raja_lib_dirs+y}
+then :
   withval=$with_raja_lib_dirs; for raja_lib_dir in $withval; do
     HYPRE_RAJA_LIB_DIR="-L$raja_lib_dir $HYPRE_RAJA_LIB_DIR"
  done;
@@ -4041,13 +4957,14 @@ fi
 
 
 # Check whether --with-kokkos was given.
-if test "${with_kokkos+set}" = set; then :
+if test ${with_kokkos+y}
+then :
   withval=$with_kokkos; case "$withval" in
     yes) hypre_using_kokkos=yes ;;
     no)  hypre_using_kokkos=no ;;
     *)   hypre_using_kokkos=no ;;
  esac
-else
+else $as_nop
   hypre_using_kokkos=no
 
 fi
@@ -4055,7 +4972,8 @@ fi
 
 
 # Check whether --with-kokkos-include was given.
-if test "${with_kokkos_include+set}" = set; then :
+if test ${with_kokkos_include+y}
+then :
   withval=$with_kokkos_include; for kokkos_dir in $withval; do
 HYPRE_KOKKOS_INCLUDE="-I$kokkos_dir $HYPRE_KOKKOS_INCLUDE"
 done;
@@ -4066,7 +4984,8 @@ fi
 
 
 # Check whether --with-kokkos-lib was given.
-if test "${with_kokkos_lib+set}" = set; then :
+if test ${with_kokkos_lib+y}
+then :
   withval=$with_kokkos_lib; for kokkos_lib in $withval; do
        HYPRE_KOKKOS_LIB="$kokkos_lib $HYPRE_KOKKOS_LIB"
  done;
@@ -4077,7 +4996,8 @@ fi
 
 
 # Check whether --with-kokkos-libs was given.
-if test "${with_kokkos_libs+set}" = set; then :
+if test ${with_kokkos_libs+y}
+then :
   withval=$with_kokkos_libs; for kokkos_lib in $withval; do
     HYPRE_KOKKOS_LIB="-l$kokkos_lib $HYPRE_KOKKOS_LIB"
  done;
@@ -4088,7 +5008,8 @@ fi
 
 
 # Check whether --with-kokkos-lib-dirs was given.
-if test "${with_kokkos_lib_dirs+set}" = set; then :
+if test ${with_kokkos_lib_dirs+y}
+then :
   withval=$with_kokkos_lib_dirs; for kokkos_lib_dir in $withval; do
     HYPRE_KOKKOS_LIB_DIR="-L$kokkos_lib_dir $HYPRE_KOKKOS_LIB_DIR"
  done;
@@ -4100,13 +5021,14 @@ fi
 
 
 # Check whether --with-umpire-host was given.
-if test "${with_umpire_host+set}" = set; then :
+if test ${with_umpire_host+y}
+then :
   withval=$with_umpire_host; case "${withval}" in
     yes) hypre_using_umpire_host=yes ;;
     no)  hypre_using_umpire_host=no ;;
     *)   hypre_using_umpire_host=no ;;
  esac
-else
+else $as_nop
   hypre_using_umpire_host=no
 
 fi
@@ -4114,13 +5036,14 @@ fi
 
 
 # Check whether --with-umpire-device was given.
-if test "${with_umpire_device+set}" = set; then :
+if test ${with_umpire_device+y}
+then :
   withval=$with_umpire_device; case "${withval}" in
     yes) hypre_using_umpire_device=yes ;;
     no)  hypre_using_umpire_device=no ;;
     *)   hypre_using_umpire_device=no ;;
  esac
-else
+else $as_nop
   hypre_using_umpire_device=no
 
 fi
@@ -4128,13 +5051,14 @@ fi
 
 
 # Check whether --with-umpire-um was given.
-if test "${with_umpire_um+set}" = set; then :
+if test ${with_umpire_um+y}
+then :
   withval=$with_umpire_um; case "${withval}" in
     yes) hypre_using_umpire_um=yes ;;
     no)  hypre_using_umpire_um=no ;;
     *)   hypre_using_umpire_um=no ;;
  esac
-else
+else $as_nop
   hypre_using_umpire_um=no
 
 fi
@@ -4142,13 +5066,14 @@ fi
 
 
 # Check whether --with-umpire-pinned was given.
-if test "${with_umpire_pinned+set}" = set; then :
+if test ${with_umpire_pinned+y}
+then :
   withval=$with_umpire_pinned; case "${withval}" in
     yes) hypre_using_umpire_pinned=yes ;;
     no)  hypre_using_umpire_pinned=no ;;
     *)   hypre_using_umpire_pinned=no ;;
  esac
-else
+else $as_nop
   hypre_using_umpire_pinned=no
 
 fi
@@ -4156,7 +5081,8 @@ fi
 
 
 # Check whether --with-umpire was given.
-if test "${with_umpire+set}" = set; then :
+if test ${with_umpire+y}
+then :
   withval=$with_umpire; case "${withval}" in
     yes) hypre_using_umpire_device=yes
          hypre_using_umpire_um=yes ;;
@@ -4168,7 +5094,8 @@ fi
 
 
 # Check whether --with-umpire-include was given.
-if test "${with_umpire_include+set}" = set; then :
+if test ${with_umpire_include+y}
+then :
   withval=$with_umpire_include; for umpire_dir in $withval; do
 HYPRE_UMPIRE_INCLUDE="-I$umpire_dir $HYPRE_UMPIRE_INCLUDE"
 done;
@@ -4179,7 +5106,8 @@ fi
 
 
 # Check whether --with-umpire-lib was given.
-if test "${with_umpire_lib+set}" = set; then :
+if test ${with_umpire_lib+y}
+then :
   withval=$with_umpire_lib; for umpire_lib in $withval; do
        HYPRE_UMPIRE_LIB="$umpire_lib $HYPRE_UMPIRE_LIB"
  done;
@@ -4190,7 +5118,8 @@ fi
 
 
 # Check whether --with-umpire-libs was given.
-if test "${with_umpire_libs+set}" = set; then :
+if test ${with_umpire_libs+y}
+then :
   withval=$with_umpire_libs; for umpire_lib in $withval; do
     HYPRE_UMPIRE_LIB="-l$umpire_lib $HYPRE_UMPIRE_LIB"
  done;
@@ -4201,7 +5130,8 @@ fi
 
 
 # Check whether --with-umpire-lib-dirs was given.
-if test "${with_umpire_lib_dirs+set}" = set; then :
+if test ${with_umpire_lib_dirs+y}
+then :
   withval=$with_umpire_lib_dirs; for umpire_lib_dir in $withval; do
     HYPRE_UMPIRE_LIB_DIR="-L$umpire_lib_dir $HYPRE_UMPIRE_LIB_DIR"
  done;
@@ -4212,26 +5142,100 @@ fi
 
 
 
+# Check whether --with-magma was given.
+if test ${with_magma+y}
+then :
+  withval=$with_magma; case "${withval}" in
+    yes) hypre_using_magma=yes;;
+    no)  hypre_using_magma=no ;;
+    *)   hypre_using_magma=no ;;
+ esac
+else $as_nop
+  hypre_using_magma=no
+
+fi
+
+
+if test "x$with_magma" = "xyes"
+then :
+
+printf "%s\n" "#define HYPRE_USING_MAGMA 1" >>confdefs.h
+
+fi
+
+
+# Check whether --with-magma-include was given.
+if test ${with_magma_include+y}
+then :
+  withval=$with_magma_include; for magma_dir in $withval; do
+    HYPRE_MAGMA_INCLUDE="-I$magma_dir $HYPRE_MAGMA_INCLUDE"
+done;
+hypre_user_gave_magma_inc=yes
+
+fi
+
+
+
+# Check whether --with-magma-lib was given.
+if test ${with_magma_lib+y}
+then :
+  withval=$with_magma_lib; for magma_lib in $withval; do
+    HYPRE_MAGMA_LIB="$magma_lib $HYPRE_MAGMA_LIB"
+ done;
+hypre_user_gave_magma_lib=yes
+
+fi
+
+
+
+# Check whether --with-magma-libs was given.
+if test ${with_magma_libs+y}
+then :
+  withval=$with_magma_libs; for magma_lib in $withval; do
+    HYPRE_MAGMA_LIB="-l$magma_lib $HYPRE_MAGMA_LIB"
+ done;
+hypre_user_gave_magma_libs=yes
+
+fi
+
+
+
+# Check whether --with-magma-lib-dirs was given.
+if test ${with_magma_lib_dirs+y}
+then :
+  withval=$with_magma_lib_dirs; for magma_lib_dir in $withval; do
+    HYPRE_MAGMA_LIB_DIR="-L$magma_lib_dir $HYPRE_MAGMA_LIB_DIR"
+ done;
+hypre_user_gave_magma_lib_dirs=yes
+
+fi
+
+
+
+
 # Check whether --with-caliper was given.
-if test "${with_caliper+set}" = set; then :
+if test ${with_caliper+y}
+then :
   withval=$with_caliper; case "$withval" in
     yes) hypre_using_caliper=yes;;
     *)   hypre_using_caliper=no ;;
 esac
-else
+else $as_nop
   hypre_using_caliper=no
 fi
 
 
-if test "x$with_caliper" = "xyes"; then :
+if test "x$with_caliper" = "xyes"
+then :
 
-$as_echo "#define HYPRE_USING_CALIPER 1" >>confdefs.h
+printf "%s\n" "#define HYPRE_USING_CALIPER 1" >>confdefs.h
 
 fi
 
 
 # Check whether --with-caliper-include was given.
-if test "${with_caliper_include+set}" = set; then :
+if test ${with_caliper_include+y}
+then :
   withval=$with_caliper_include; for caliper_inc_dir in $withval; do
     CALIPER_INCLUDE="-I$caliper_inc_dir $CALIPER_INCLUDE"
  done;
@@ -4242,7 +5246,8 @@ fi
 
 
 # Check whether --with-caliper-lib was given.
-if test "${with_caliper_lib+set}" = set; then :
+if test ${with_caliper_lib+y}
+then :
   withval=$with_caliper_lib; for caliper_lib in $withval; do
     CALIPER_LIBS="$CALIPER_LIBS $caliper_lib"
  done;
@@ -4257,15 +5262,16 @@ then
    then
       if test "$hypre_using_openmp" = "yes"
       then
-         for ac_prog in xlc_r xlC_r xlc xlC icc icpc gcc g++ pgcc pgCC cc CC kcc KCC
+         for ac_prog in xlc_r xlC_r xlc xlC icx icc icpc icpx gcc g++ pgcc pgCC cc CC kcc KCC
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -4273,11 +5279,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4288,11 +5298,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -4300,15 +5310,16 @@ fi
 done
 
       else
-         for ac_prog in xlc xlC icc icpc gcc g++ pgcc pgCC cc CC kcc KCC
+         for ac_prog in xlc xlC icx icc icpc icpx gcc g++ pgcc pgCC cc CC kcc KCC
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -4316,11 +5327,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4331,11 +5346,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -4346,15 +5361,16 @@ done
    else
       if test "$hypre_using_openmp" = "yes"
       then
-         for ac_prog in mpxlc mpixlc_r mpixlc mpiicc mpigcc mpicc mpipgcc mpipgicc
+         for ac_prog in mpxlc mpixlc_r mpixlc mpiicx mpiicc mpigcc mpipgcc mpipgicc mpicc
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -4362,11 +5378,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4377,11 +5397,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -4389,15 +5409,16 @@ fi
 done
 
       else
-         for ac_prog in mpxlc mpixlc mpiicc mpigcc mpicc mpipgcc mpipgicc
+         for ac_prog in mpxlc mpixlc mpiicx mpiicc mpigcc mpipgcc mpipgicc mpicc
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -4405,11 +5426,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4420,11 +5445,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -4446,15 +5471,16 @@ then
    then
       if test "$hypre_using_openmp" = "yes"
       then
-         for ac_prog in xlC_r xlc_r xlC xlc icpc icc g++ gcc pgCC pgcc pgc++ CC cc KCC kcc
+         for ac_prog in xlC_r xlc_r xlC xlc icpx icx icpc icc g++ gcc pgCC pgcc pgc++ CC cc KCC kcc
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CXX+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CXX"; then
   ac_cv_prog_CXX="$CXX" # Let the user override the test.
 else
@@ -4462,11 +5488,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CXX="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4477,11 +5507,11 @@ fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
-$as_echo "$CXX" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+printf "%s\n" "$CXX" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -4489,15 +5519,16 @@ fi
 done
 
       else
-         for ac_prog in xlC xlc icpc icc g++ gcc pgCC pgcc pgc++ CC cc KCC kcc
+         for ac_prog in xlC xlc icpx icx icpc icc g++ gcc pgCC pgcc pgc++ CC cc KCC kcc
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CXX+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CXX"; then
   ac_cv_prog_CXX="$CXX" # Let the user override the test.
 else
@@ -4505,11 +5536,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CXX="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4520,11 +5555,11 @@ fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
-$as_echo "$CXX" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+printf "%s\n" "$CXX" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -4535,15 +5570,16 @@ done
    else
       if test "$hypre_using_openmp" = "yes"
       then
-         for ac_prog in mpxlC mpixlcxx_r mpixlcxx mpixlC mpiicpc mpig++ mpic++ mpicxx mpiCC mpipgCC mpipgic++
+         for ac_prog in CC mpxlC mpixlcxx_r mpixlcxx mpixlC mpiicpx mpiicpc mpig++ mpic++ mpicxx mpiCC mpipgCC mpipgic++
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CXX+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CXX"; then
   ac_cv_prog_CXX="$CXX" # Let the user override the test.
 else
@@ -4551,11 +5587,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CXX="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4566,11 +5606,11 @@ fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
-$as_echo "$CXX" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+printf "%s\n" "$CXX" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -4578,15 +5618,16 @@ fi
 done
 
       else
-         for ac_prog in mpxlC mpixlcxx mpixlC mpiicpc mpig++ mpic++ mpicxx mpiCC mpipgCC mpipgic++
+         for ac_prog in CC mpxlC mpixlcxx mpixlC mpiicpx mpiicpc mpig++ mpic++ mpicxx mpiCC mpipgCC mpipgic++
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CXX+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CXX"; then
   ac_cv_prog_CXX="$CXX" # Let the user override the test.
 else
@@ -4594,11 +5635,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CXX="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4609,11 +5654,11 @@ fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
-$as_echo "$CXX" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+printf "%s\n" "$CXX" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -4635,15 +5680,16 @@ then
    then
       if test "$hypre_using_openmp" = "yes"
       then
-         for ac_prog in xlf_r ifort gfortran g77 g95 pgf77 pgfortran f77
+         for ac_prog in xlf_r ifx ifort gfortran g77 g95 pgf77 pgfortran f77
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_FC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_FC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$FC"; then
   ac_cv_prog_FC="$FC" # Let the user override the test.
 else
@@ -4651,11 +5697,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_FC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4666,11 +5716,11 @@ fi
 fi
 FC=$ac_cv_prog_FC
 if test -n "$FC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FC" >&5
-$as_echo "$FC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FC" >&5
+printf "%s\n" "$FC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -4678,15 +5728,115 @@ fi
 done
 
       else
-         for ac_prog in xlf ifort gfortran g77 g95 pgf77 pgfortran  f77
+         for ac_prog in xlf ifx ifort gfortran g77 g95 pgf77 pgfortran f77
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_FC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$FC"; then
+  ac_cv_prog_FC="$FC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_FC="$ac_prog"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+FC=$ac_cv_prog_FC
+if test -n "$FC"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FC" >&5
+printf "%s\n" "$FC" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+  test -n "$FC" && break
+done
+
+      fi
+   else
+      if test "$hypre_using_openmp" = "yes"
+      then
+         for ac_prog in mpxlf mpixlf77_r mpiifx mpiifort mpif77 mpipgf77 mpipgifort
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_FC+:} false; then :
-  $as_echo_n "(cached) " >&6
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_FC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$FC"; then
+  ac_cv_prog_FC="$FC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_FC="$ac_prog"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+FC=$ac_cv_prog_FC
+if test -n "$FC"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FC" >&5
+printf "%s\n" "$FC" >&6; }
 else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+  test -n "$FC" && break
+done
+
+      else
+         for ac_prog in mpxlf mpixlf77 mpiifx mpiifort mpif77 mpipgf77 mpipgifort
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_FC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$FC"; then
   ac_cv_prog_FC="$FC" # Let the user override the test.
 else
@@ -4694,11 +5844,110 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_FC="$ac_prog"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+FC=$ac_cv_prog_FC
+if test -n "$FC"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FC" >&5
+printf "%s\n" "$FC" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+  test -n "$FC" && break
+done
+
+      fi
+   fi
+
+   if test "x$FC" = "x"
+   then
+      hypre_using_fortran=no
+   fi
+fi
+
+if test "x$hypre_using_cuda" = "xyes" && test "x$hypre_using_device_openmp" = "xyes"
+then
+   as_fn_error $? "--with-cuda and --with-device-openmp are mutually exclusive" "$LINENO" 5
+fi
+
+if test "x$hypre_using_cuda" = "xyes" && test "x$hypre_using_hip" = "xyes"
+then
+   as_fn_error $? "--with-cuda and --with-hip are mutually exclusive" "$LINENO" 5
+fi
+
+if test "x$hypre_using_cuda" = "xyes" && test "x$hypre_using_sycl" = "xyes"
+then
+   as_fn_error $? "--with-cuda and --with-sycl are mutually exclusive" "$LINENO" 5
+fi
+
+if test "x$hypre_using_hip" = "xyes" && test "x$hypre_using_device_openmp" = "xyes"
+then
+   as_fn_error $? "--with-hip and --with-device-openmp are mutually exclusive" "$LINENO" 5
+fi
+
+if test "x$hypre_using_hip" = "xyes" && test "x$hypre_using_sycl" = "xyes"
+then
+   as_fn_error $? "--with-hip and --with-sycl are mutually exclusive" "$LINENO" 5
+fi
+
+if test "x$hypre_using_sycl" = "xyes" && test "x$hypre_using_device_openmp" = "xyes"
+then
+   as_fn_error $? "--with-sycl and --with-device-openmp are mutually exclusive" "$LINENO" 5
+fi
+
+
+if test "$hypre_user_chose_cudacompilers" = "no"
+then
+   if test "$hypre_using_device_openmp" = "yes"
+   then
+      if test "x$hypre_using_kokkos" = "xyes"
+      then
+         if test "$hypre_using_mpi" = "no"
+         then
+            for ac_prog in clang++-gpu icpx
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CUCC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$CUCC"; then
+  ac_cv_prog_CUCC="$CUCC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_FC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CUCC="$ac_prog"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4707,44 +5956,46 @@ IFS=$as_save_IFS
 
 fi
 fi
-FC=$ac_cv_prog_FC
-if test -n "$FC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FC" >&5
-$as_echo "$FC" >&6; }
+CUCC=$ac_cv_prog_CUCC
+if test -n "$CUCC"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CUCC" >&5
+printf "%s\n" "$CUCC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
-  test -n "$FC" && break
+  test -n "$CUCC" && break
 done
 
-      fi
-   else
-      if test "$hypre_using_openmp" = "yes"
-      then
-         for ac_prog in mpxlf mpixlf77_r mpiifort mpif77 mpipgf77 mpipgifort
+         else
+            for ac_prog in mpiclang++-gpu mpiicpx
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_FC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$FC"; then
-  ac_cv_prog_FC="$FC" # Let the user override the test.
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CUCC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$CUCC"; then
+  ac_cv_prog_CUCC="$CUCC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_FC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CUCC="$ac_prog"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4753,41 +6004,49 @@ IFS=$as_save_IFS
 
 fi
 fi
-FC=$ac_cv_prog_FC
-if test -n "$FC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FC" >&5
-$as_echo "$FC" >&6; }
+CUCC=$ac_cv_prog_CUCC
+if test -n "$CUCC"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CUCC" >&5
+printf "%s\n" "$CUCC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
-  test -n "$FC" && break
+  test -n "$CUCC" && break
 done
 
+         fi
       else
-         for ac_prog in mpxlf mpixlf77 mpiifort mpif77 mpipgf77 mpipgifort
+         if test "$hypre_using_mpi" = "no"
+         then
+            for ac_prog in xlc-gpu clang-gpu icx
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_FC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$FC"; then
-  ac_cv_prog_FC="$FC" # Let the user override the test.
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CUCC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$CUCC"; then
+  ac_cv_prog_CUCC="$CUCC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_FC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CUCC="$ac_prog"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4796,59 +6055,30 @@ IFS=$as_save_IFS
 
 fi
 fi
-FC=$ac_cv_prog_FC
-if test -n "$FC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FC" >&5
-$as_echo "$FC" >&6; }
+CUCC=$ac_cv_prog_CUCC
+if test -n "$CUCC"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CUCC" >&5
+printf "%s\n" "$CUCC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
-  test -n "$FC" && break
+  test -n "$CUCC" && break
 done
 
-      fi
-   fi
-
-   if test "x$FC" = "x"
-   then
-      hypre_using_fortran=no
-   fi
-fi
-
-if test "x$hypre_using_cuda" = "xyes" && test "x$hypre_using_device_openmp" = "xyes"
-then
-   as_fn_error $? "--with-cuda and --with-device-openmp are mutually exclusive" "$LINENO" 5
-fi
-
-if test "x$hypre_using_cuda" = "xyes" && test "x$hypre_using_hip" = "xyes"
-then
-   as_fn_error $? "--with-cuda and --with-hip are mutually exclusive" "$LINENO" 5
-fi
-
-if test "x$hypre_using_hip" = "xyes" && test "x$hypre_using_device_openmp" = "xyes"
-then
-   as_fn_error $? "--with-hip and --with-device-openmp are mutually exclusive" "$LINENO" 5
-fi
-
-
-if test "$hypre_user_chose_cudacompilers" = "no"
-then
-   if test "$hypre_using_device_openmp" = "yes"
-   then
-      if test "$hypre_using_mpi" = "no"
-      then
-         for ac_prog in xlc-gpu clang-gpu
+         else
+            for ac_prog in mpixlc-gpu mpiclang-gpu mpiicx
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CUCC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CUCC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CUCC"; then
   ac_cv_prog_CUCC="$CUCC" # Let the user override the test.
 else
@@ -4856,11 +6086,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CUCC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4871,39 +6105,49 @@ fi
 fi
 CUCC=$ac_cv_prog_CUCC
 if test -n "$CUCC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CUCC" >&5
-$as_echo "$CUCC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CUCC" >&5
+printf "%s\n" "$CUCC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
   test -n "$CUCC" && break
 done
 
-      else
-         for ac_prog in mpixlc-gpu mpiclang-gpu
+         fi
+      fi
+   fi
+
+   if test "$hypre_using_cuda" = "yes"
+   then
+      for ac_prog in nvcc
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CUCC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CUCC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CUCC"; then
   ac_cv_prog_CUCC="$CUCC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
+for as_dir in "${CUDA_HOME}/bin"
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CUCC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4914,43 +6158,49 @@ fi
 fi
 CUCC=$ac_cv_prog_CUCC
 if test -n "$CUCC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CUCC" >&5
-$as_echo "$CUCC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CUCC" >&5
+printf "%s\n" "$CUCC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
   test -n "$CUCC" && break
 done
+test -n "$CUCC" || CUCC=""""
 
-      fi
+      CUCC="\${HYPRE_CUDA_PATH}/bin/${CUCC} -ccbin=\${CXX}"
    fi
 
-   if test "$hypre_using_cuda" = "yes"
+   if test "$hypre_using_hip" = "yes"
    then
-      for ac_prog in nvcc
+      for ac_prog in hipcc
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CUCC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CUCC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CUCC"; then
   ac_cv_prog_CUCC="$CUCC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in "${CUDA_HOME}/bin"
+for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CUCC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4961,32 +6211,31 @@ fi
 fi
 CUCC=$ac_cv_prog_CUCC
 if test -n "$CUCC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CUCC" >&5
-$as_echo "$CUCC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CUCC" >&5
+printf "%s\n" "$CUCC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
   test -n "$CUCC" && break
 done
-test -n "$CUCC" || CUCC=""""
 
-      CUCC="\${HYPRE_CUDA_PATH}/bin/${CUCC} -ccbin=\${CXX}"
    fi
 
-   if test "$hypre_using_hip" = "yes"
+   if test "$hypre_using_sycl" = "yes"
    then
-      for ac_prog in hipcc
+      for ac_prog in icpx
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CUCC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CUCC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CUCC"; then
   ac_cv_prog_CUCC="$CUCC" # Let the user override the test.
 else
@@ -4994,11 +6243,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CUCC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5009,11 +6262,11 @@ fi
 fi
 CUCC=$ac_cv_prog_CUCC
 if test -n "$CUCC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CUCC" >&5
-$as_echo "$CUCC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CUCC" >&5
+printf "%s\n" "$CUCC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -5023,13 +6276,14 @@ done
    fi
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+printf %s "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+ac_make=`printf "%s\n" "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if eval test \${ac_cv_prog_make_${ac_make}_set+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat >conftest.make <<\_ACEOF
 SHELL = /bin/sh
 all:
@@ -5045,23 +6299,24 @@ esac
 rm -f conftest.make
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
   SET_MAKE=
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_RANLIB+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_RANLIB+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
 else
@@ -5069,11 +6324,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5084,11 +6343,11 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-$as_echo "$RANLIB" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+printf "%s\n" "$RANLIB" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -5097,11 +6356,12 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_RANLIB+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_RANLIB"; then
   ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
 else
@@ -5109,11 +6369,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5124,11 +6388,11 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-$as_echo "$ac_ct_RANLIB" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+printf "%s\n" "$ac_ct_RANLIB" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_ct_RANLIB" = x; then
@@ -5136,8 +6400,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     RANLIB=$ac_ct_RANLIB
@@ -5149,7 +6413,16 @@ fi
 
 if test "$hypre_using_c" = "yes"
 then
-   ac_ext=c
+
+
+
+
+
+
+
+
+
+ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -5157,11 +6430,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -5169,11 +6443,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5184,11 +6462,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -5197,11 +6475,12 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
@@ -5209,11 +6488,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5224,11 +6507,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf "%s\n" "$ac_ct_CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -5236,8 +6519,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -5250,11 +6533,12 @@ if test -z "$CC"; then
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -5262,11 +6546,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5277,11 +6565,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -5290,11 +6578,12 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -5303,15 +6592,19 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    if test "$as_dir$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
      fi
     ac_cv_prog_CC="cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5327,18 +6620,18 @@ if test $ac_prog_rejected = yes; then
     # However, it has the same basename, so the bogon will be chosen
     # first if we set CC to just the basename; use the full file name.
     shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+    ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@"
   fi
 fi
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -5349,11 +6642,12 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -5361,11 +6655,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5376,11 +6674,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -5393,11 +6691,12 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
@@ -5405,11 +6704,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5420,11 +6723,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf "%s\n" "$ac_ct_CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -5436,34 +6739,138 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+fi
+
+fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args.
+set dummy ${ac_tool_prefix}clang; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="${ac_tool_prefix}clang"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "clang", so it can be a program name with args.
+set dummy clang; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="clang"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf "%s\n" "$ac_ct_CC" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
   fi
+else
+  CC="$ac_cv_prog_CC"
 fi
 
 fi
 
 
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "no acceptable C compiler found in \$PATH
 See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
+for ac_option in --version -v -V -qversion -version; do
   { { ac_try="$ac_compiler $ac_option >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -5473,7 +6880,7 @@ $as_echo "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
   fi
   rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
 
@@ -5481,7 +6888,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
@@ -5493,9 +6900,9 @@ ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+printf %s "checking whether the C compiler works... " >&6; }
+ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 
 # The possible output files:
 ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
@@ -5516,11 +6923,12 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+then :
   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
 # in a Makefile.  We should not override ac_cv_exeext if it was cached,
@@ -5537,7 +6945,7 @@ do
 	# certainly right.
 	break;;
     *.* )
-	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+	if test ${ac_cv_exeext+y} && test "$ac_cv_exeext" != no;
 	then :; else
 	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 	fi
@@ -5553,44 +6961,46 @@ do
 done
 test "$ac_cv_exeext" = no && ac_cv_exeext=
 
-else
+else $as_nop
   ac_file=''
 fi
-if test -z "$ac_file"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-$as_echo "$as_me: failed program was:" >&5
+if test -z "$ac_file"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "C compiler cannot create executables
 See \`config.log' for more details" "$LINENO" 5; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+printf %s "checking for C compiler default output file name... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+printf "%s\n" "$ac_file" >&6; }
 ac_exeext=$ac_cv_exeext
 
 rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
-$as_echo_n "checking for suffix of executables... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+printf %s "checking for suffix of executables... " >&6; }
 if { { ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+then :
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
 # work properly (i.e., refer to `conftest.exe'), while it won't with
@@ -5604,15 +7014,15 @@ for ac_file in conftest.exe conftest conftest.*; do
     * ) break;;
   esac
 done
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+else $as_nop
+  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest conftest$ac_cv_exeext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-$as_echo "$ac_cv_exeext" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+printf "%s\n" "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
@@ -5621,7 +7031,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 FILE *f = fopen ("conftest.out", "w");
  return ferror (f) || fclose (f) != 0;
@@ -5633,8 +7043,8 @@ _ACEOF
 ac_clean_files="$ac_clean_files conftest.out"
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+printf %s "checking whether we are cross compiling... " >&6; }
 if test "$cross_compiling" != yes; then
   { { ac_try="$ac_link"
 case "(($ac_try" in
@@ -5642,10 +7052,10 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
   if { ac_try='./conftest$ac_cv_exeext'
   { { case "(($ac_try" in
@@ -5653,39 +7063,40 @@ $as_echo "$ac_try_echo"; } >&5
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run C compiled programs.
+	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details" "$LINENO" 5; }
     fi
   fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+printf "%s\n" "$cross_compiling" >&6; }
 
 rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
 ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
-$as_echo_n "checking for suffix of object files... " >&6; }
-if ${ac_cv_objext+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+printf %s "checking for suffix of object files... " >&6; }
+if test ${ac_cv_objext+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
@@ -5699,11 +7110,12 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+then :
   for ac_file in conftest.o conftest.obj conftest.*; do
   test -f "$ac_file" || continue;
   case $ac_file in
@@ -5712,31 +7124,32 @@ $as_echo "$ac_try_echo"; } >&5
        break;;
   esac
 done
-else
-  $as_echo "$as_me: failed program was:" >&5
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of object files: cannot compile
 See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-$as_echo "$ac_cv_objext" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+printf "%s\n" "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5
+printf %s "checking whether the compiler supports GNU C... " >&6; }
+if test ${ac_cv_c_compiler_gnu+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 #ifndef __GNUC__
        choke me
@@ -5746,29 +7159,33 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_compiler_gnu=yes
-else
+else $as_nop
   ac_compiler_gnu=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; }
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
 if test $ac_compiler_gnu = yes; then
   GCC=yes
 else
   GCC=
 fi
-ac_test_CFLAGS=${CFLAGS+set}
+ac_test_CFLAGS=${CFLAGS+y}
 ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+printf %s "checking whether $CC accepts -g... " >&6; }
+if test ${ac_cv_prog_cc_g+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
    ac_cv_prog_cc_g=no
@@ -5777,57 +7194,60 @@ else
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_prog_cc_g=yes
-else
+else $as_nop
   CFLAGS=""
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-else
+else $as_nop
   ac_c_werror_flag=$ac_save_c_werror_flag
 	 CFLAGS="-g"
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_prog_cc_g=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+printf "%s\n" "$ac_cv_prog_cc_g" >&6; }
+if test $ac_test_CFLAGS; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
   if test "$GCC" = yes; then
@@ -5842,94 +7262,144 @@ else
     CFLAGS=
   fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_prog_cc_c89=no
+ac_prog_cc_stdc=no
+if test x$ac_prog_cc_stdc = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5
+printf %s "checking for $CC option to enable C11 features... " >&6; }
+if test ${ac_cv_prog_cc_c11+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_cv_prog_cc_c11=no
 ac_save_CC=$CC
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-struct stat;
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+$ac_c_conftest_c11_program
+_ACEOF
+for ac_arg in '' -std=gnu11
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_prog_cc_c11=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+  test "x$ac_cv_prog_cc_c11" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+fi
 
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+if test "x$ac_cv_prog_cc_c11" = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+  if test "x$ac_cv_prog_cc_c11" = x
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
+printf "%s\n" "$ac_cv_prog_cc_c11" >&6; }
+     CC="$CC $ac_cv_prog_cc_c11"
+fi
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11
+  ac_prog_cc_stdc=c11
+fi
+fi
+if test x$ac_prog_cc_stdc = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5
+printf %s "checking for $CC option to enable C99 features... " >&6; }
+if test ${ac_cv_prog_cc_c99+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_cv_prog_cc_c99=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_c_conftest_c99_program
+_ACEOF
+for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99=
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_prog_cc_c99=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+  test "x$ac_cv_prog_cc_c99" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+fi
 
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
+if test "x$ac_cv_prog_cc_c99" = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+  if test "x$ac_cv_prog_cc_c99" = x
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
+printf "%s\n" "$ac_cv_prog_cc_c99" >&6; }
+     CC="$CC $ac_cv_prog_cc_c99"
+fi
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99
+  ac_prog_cc_stdc=c99
+fi
+fi
+if test x$ac_prog_cc_stdc = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5
+printf %s "checking for $CC option to enable C89 features... " >&6; }
+if test ${ac_cv_prog_cc_c89+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_c_conftest_c89_program
 _ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"; then :
+  if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_prog_cc_c89=$ac_arg
 fi
-rm -f core conftest.err conftest.$ac_objext
+rm -f core conftest.err conftest.$ac_objext conftest.beam
   test "x$ac_cv_prog_cc_c89" != "xno" && break
 done
 rm -f conftest.$ac_ext
 CC=$ac_save_CC
-
 fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
-  xno)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
 
+if test "x$ac_cv_prog_cc_c89" = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+  if test "x$ac_cv_prog_cc_c89" = x
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+printf "%s\n" "$ac_cv_prog_cc_c89" >&6; }
+     CC="$CC $ac_cv_prog_cc_c89"
+fi
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89
+  ac_prog_cc_stdc=c89
+fi
 fi
 
 ac_ext=c
@@ -5942,7 +7412,13 @@ fi
 
 if test "$hypre_using_cxx" = "yes"
 then
-   ac_ext=cpp
+
+
+
+
+
+
+ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -5952,15 +7428,16 @@ if test -z "$CXX"; then
     CXX=$CCC
   else
     if test -n "$ac_tool_prefix"; then
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CXX+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CXX"; then
   ac_cv_prog_CXX="$CXX" # Let the user override the test.
 else
@@ -5968,11 +7445,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5983,11 +7464,11 @@ fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
-$as_echo "$CXX" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+printf "%s\n" "$CXX" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -5996,15 +7477,16 @@ fi
 fi
 if test -z "$CXX"; then
   ac_ct_CXX=$CXX
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_CXX+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_CXX"; then
   ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
 else
@@ -6012,11 +7494,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CXX="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6027,11 +7513,11 @@ fi
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
-$as_echo "$ac_ct_CXX" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
+printf "%s\n" "$ac_ct_CXX" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -6043,8 +7529,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CXX=$ac_ct_CXX
@@ -6054,7 +7540,7 @@ fi
   fi
 fi
 # Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
+printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
 for ac_option in --version -v -V -qversion; do
@@ -6064,7 +7550,7 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -6074,20 +7560,21 @@ $as_echo "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
   fi
   rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
-$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if ${ac_cv_cxx_compiler_gnu+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C++" >&5
+printf %s "checking whether the compiler supports GNU C++... " >&6; }
+if test ${ac_cv_cxx_compiler_gnu+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 #ifndef __GNUC__
        choke me
@@ -6097,29 +7584,33 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_compile "$LINENO"
+then :
   ac_compiler_gnu=yes
-else
+else $as_nop
   ac_compiler_gnu=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
-$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
+printf "%s\n" "$ac_cv_cxx_compiler_gnu" >&6; }
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
 if test $ac_compiler_gnu = yes; then
   GXX=yes
 else
   GXX=
 fi
-ac_test_CXXFLAGS=${CXXFLAGS+set}
+ac_test_CXXFLAGS=${CXXFLAGS+y}
 ac_save_CXXFLAGS=$CXXFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
-$as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if ${ac_cv_prog_cxx_g+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
+printf %s "checking whether $CXX accepts -g... " >&6; }
+if test ${ac_cv_prog_cxx_g+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_save_cxx_werror_flag=$ac_cxx_werror_flag
    ac_cxx_werror_flag=yes
    ac_cv_prog_cxx_g=no
@@ -6128,57 +7619,60 @@ else
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_compile "$LINENO"
+then :
   ac_cv_prog_cxx_g=yes
-else
+else $as_nop
   CXXFLAGS=""
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_compile "$LINENO"
+then :
 
-else
+else $as_nop
   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 	 CXXFLAGS="-g"
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_compile "$LINENO"
+then :
   ac_cv_prog_cxx_g=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
    ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
-$as_echo "$ac_cv_prog_cxx_g" >&6; }
-if test "$ac_test_CXXFLAGS" = set; then
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
+printf "%s\n" "$ac_cv_prog_cxx_g" >&6; }
+if test $ac_test_CXXFLAGS; then
   CXXFLAGS=$ac_save_CXXFLAGS
 elif test $ac_cv_prog_cxx_g = yes; then
   if test "$GXX" = yes; then
@@ -6193,6 +7687,100 @@ else
     CXXFLAGS=
   fi
 fi
+ac_prog_cxx_stdcxx=no
+if test x$ac_prog_cxx_stdcxx = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
+printf %s "checking for $CXX option to enable C++11 features... " >&6; }
+if test ${ac_cv_prog_cxx_11+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_cv_prog_cxx_11=no
+ac_save_CXX=$CXX
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_cxx_conftest_cxx11_program
+_ACEOF
+for ac_arg in '' -std=gnu++11 -std=gnu++0x -std=c++11 -std=c++0x -qlanglvl=extended0x -AA
+do
+  CXX="$ac_save_CXX $ac_arg"
+  if ac_fn_cxx_try_compile "$LINENO"
+then :
+  ac_cv_prog_cxx_cxx11=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+  test "x$ac_cv_prog_cxx_cxx11" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CXX=$ac_save_CXX
+fi
+
+if test "x$ac_cv_prog_cxx_cxx11" = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+  if test "x$ac_cv_prog_cxx_cxx11" = x
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx11" >&5
+printf "%s\n" "$ac_cv_prog_cxx_cxx11" >&6; }
+     CXX="$CXX $ac_cv_prog_cxx_cxx11"
+fi
+  ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx11
+  ac_prog_cxx_stdcxx=cxx11
+fi
+fi
+if test x$ac_prog_cxx_stdcxx = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
+printf %s "checking for $CXX option to enable C++98 features... " >&6; }
+if test ${ac_cv_prog_cxx_98+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_cv_prog_cxx_98=no
+ac_save_CXX=$CXX
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_cxx_conftest_cxx98_program
+_ACEOF
+for ac_arg in '' -std=gnu++98 -std=c++98 -qlanglvl=extended -AA
+do
+  CXX="$ac_save_CXX $ac_arg"
+  if ac_fn_cxx_try_compile "$LINENO"
+then :
+  ac_cv_prog_cxx_cxx98=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+  test "x$ac_cv_prog_cxx_cxx98" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CXX=$ac_save_CXX
+fi
+
+if test "x$ac_cv_prog_cxx_cxx98" = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+  if test "x$ac_cv_prog_cxx_cxx98" = x
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx98" >&5
+printf "%s\n" "$ac_cv_prog_cxx_cxx98" >&6; }
+     CXX="$CXX $ac_cv_prog_cxx_cxx98"
+fi
+  ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx98
+  ac_prog_cxx_stdcxx=cxx98
+fi
+fi
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -6212,11 +7800,12 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_FC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_FC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$FC"; then
   ac_cv_prog_FC="$FC" # Let the user override the test.
 else
@@ -6224,11 +7813,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_FC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6239,11 +7832,11 @@ fi
 fi
 FC=$ac_cv_prog_FC
 if test -n "$FC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FC" >&5
-$as_echo "$FC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FC" >&5
+printf "%s\n" "$FC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -6256,11 +7849,12 @@ if test -z "$FC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_FC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_FC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_FC"; then
   ac_cv_prog_ac_ct_FC="$ac_ct_FC" # Let the user override the test.
 else
@@ -6268,11 +7862,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_FC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6283,11 +7881,11 @@ fi
 fi
 ac_ct_FC=$ac_cv_prog_ac_ct_FC
 if test -n "$ac_ct_FC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_FC" >&5
-$as_echo "$ac_ct_FC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_FC" >&5
+printf "%s\n" "$ac_ct_FC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -6299,8 +7897,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     FC=$ac_ct_FC
@@ -6309,7 +7907,7 @@ fi
 
 
 # Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for Fortran compiler version" >&5
+printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Fortran compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
 for ac_option in --version -v -V -qversion; do
@@ -6319,7 +7917,7 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -6329,7 +7927,7 @@ $as_echo "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
   fi
   rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
 rm -f a.out
@@ -6338,11 +7936,12 @@ rm -f a.out
 # input file.  (Note that this only needs to work for GNU compilers.)
 ac_save_ext=$ac_ext
 ac_ext=F
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Fortran compiler" >&5
-$as_echo_n "checking whether we are using the GNU Fortran compiler... " >&6; }
-if ${ac_cv_fc_compiler_gnu+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU Fortran" >&5
+printf %s "checking whether the compiler supports GNU Fortran... " >&6; }
+if test ${ac_cv_fc_compiler_gnu+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat > conftest.$ac_ext <<_ACEOF
       program main
 #ifndef __GNUC__
@@ -6351,43 +7950,48 @@ else
 
       end
 _ACEOF
-if ac_fn_fc_try_compile "$LINENO"; then :
+if ac_fn_fc_try_compile "$LINENO"
+then :
   ac_compiler_gnu=yes
-else
+else $as_nop
   ac_compiler_gnu=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 ac_cv_fc_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_fc_compiler_gnu" >&5
-$as_echo "$ac_cv_fc_compiler_gnu" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_fc_compiler_gnu" >&5
+printf "%s\n" "$ac_cv_fc_compiler_gnu" >&6; }
+ac_compiler_gnu=$ac_cv_fc_compiler_gnu
+
 ac_ext=$ac_save_ext
-ac_test_FCFLAGS=${FCFLAGS+set}
+ac_test_FCFLAGS=${FCFLAGS+y}
 ac_save_FCFLAGS=$FCFLAGS
 FCFLAGS=
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $FC accepts -g" >&5
-$as_echo_n "checking whether $FC accepts -g... " >&6; }
-if ${ac_cv_prog_fc_g+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $FC accepts -g" >&5
+printf %s "checking whether $FC accepts -g... " >&6; }
+if test ${ac_cv_prog_fc_g+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   FCFLAGS=-g
 cat > conftest.$ac_ext <<_ACEOF
       program main
 
       end
 _ACEOF
-if ac_fn_fc_try_compile "$LINENO"; then :
+if ac_fn_fc_try_compile "$LINENO"
+then :
   ac_cv_prog_fc_g=yes
-else
+else $as_nop
   ac_cv_prog_fc_g=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_fc_g" >&5
-$as_echo "$ac_cv_prog_fc_g" >&6; }
-if test "$ac_test_FCFLAGS" = set; then
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_fc_g" >&5
+printf "%s\n" "$ac_cv_prog_fc_g" >&6; }
+if test $ac_test_FCFLAGS; then
   FCFLAGS=$ac_save_FCFLAGS
 elif test $ac_cv_prog_fc_g = yes; then
   if test "x$ac_cv_fc_compiler_gnu" = xyes; then
@@ -6419,17 +8023,19 @@ ac_ext=${ac_fc_srcext-f}
 ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
 ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_fc_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to get verbose linking output from $FC" >&5
-$as_echo_n "checking how to get verbose linking output from $FC... " >&6; }
-if ${ac_cv_prog_fc_v+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to get verbose linking output from $FC" >&5
+printf %s "checking how to get verbose linking output from $FC... " >&6; }
+if test ${ac_cv_prog_fc_v+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat > conftest.$ac_ext <<_ACEOF
       program main
 
       end
 _ACEOF
-if ac_fn_fc_try_compile "$LINENO"; then :
+if ac_fn_fc_try_compile "$LINENO"
+then :
   ac_cv_prog_fc_v=
 # Try some options frequently used verbose output
 for ac_verb in -v -verbose --verbose -V -\#\#\#; do
@@ -6447,13 +8053,13 @@ ac_save_FCFLAGS=$FCFLAGS
 FCFLAGS="$FCFLAGS $ac_verb"
 eval "set x $ac_link"
 shift
-$as_echo "$as_me:${as_lineno-$LINENO}: $*" >&5
+printf "%s\n" "$as_me:${as_lineno-$LINENO}: $*" >&5
 # gfortran 4.3 outputs lines setting COLLECT_GCC_OPTIONS, COMPILER_PATH,
 # LIBRARY_PATH; skip all such settings.
 ac_fc_v_output=`eval $ac_link 5>&1 2>&1 |
   sed '/^Driving:/d; /^Configured with:/d;
       '"/^[_$as_cr_Letters][_$as_cr_alnum]*=/d"`
-$as_echo "$ac_fc_v_output" >&5
+printf "%s\n" "$ac_fc_v_output" >&5
 FCFLAGS=$ac_save_FCFLAGS
 
 rm -rf conftest*
@@ -6520,23 +8126,24 @@ esac
   done
 done
 if test -z "$ac_cv_prog_fc_v"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot determine how to obtain linking information from $FC" >&5
-$as_echo "$as_me: WARNING: cannot determine how to obtain linking information from $FC" >&2;}
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cannot determine how to obtain linking information from $FC" >&5
+printf "%s\n" "$as_me: WARNING: cannot determine how to obtain linking information from $FC" >&2;}
 fi
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: compilation failed" >&5
-$as_echo "$as_me: WARNING: compilation failed" >&2;}
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: compilation failed" >&5
+printf "%s\n" "$as_me: WARNING: compilation failed" >&2;}
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_fc_v" >&5
-$as_echo "$ac_cv_prog_fc_v" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Fortran libraries of $FC" >&5
-$as_echo_n "checking for Fortran libraries of $FC... " >&6; }
-if ${ac_cv_fc_libs+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_fc_v" >&5
+printf "%s\n" "$ac_cv_prog_fc_v" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Fortran libraries of $FC" >&5
+printf %s "checking for Fortran libraries of $FC... " >&6; }
+if test ${ac_cv_fc_libs+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test "x$FCLIBS" != "x"; then
   ac_cv_fc_libs="$FCLIBS" # Let the user override the test.
 else
@@ -6555,13 +8162,13 @@ ac_save_FCFLAGS=$FCFLAGS
 FCFLAGS="$FCFLAGS $ac_cv_prog_fc_v"
 eval "set x $ac_link"
 shift
-$as_echo "$as_me:${as_lineno-$LINENO}: $*" >&5
+printf "%s\n" "$as_me:${as_lineno-$LINENO}: $*" >&5
 # gfortran 4.3 outputs lines setting COLLECT_GCC_OPTIONS, COMPILER_PATH,
 # LIBRARY_PATH; skip all such settings.
 ac_fc_v_output=`eval $ac_link 5>&1 2>&1 |
   sed '/^Driving:/d; /^Configured with:/d;
       '"/^[_$as_cr_Letters][_$as_cr_alnum]*=/d"`
-$as_echo "$ac_fc_v_output" >&5
+printf "%s\n" "$ac_fc_v_output" >&5
 FCFLAGS=$ac_save_FCFLAGS
 
 rm -rf conftest*
@@ -6638,9 +8245,10 @@ while test $# != 1; do
     fi
   done
 
-  if test x"$ac_exists" = xtrue; then :
+  if test x"$ac_exists" = xtrue
+then :
 
-else
+else $as_nop
   ac_cv_fc_libs="$ac_cv_fc_libs $ac_arg"
 fi
 	  ;;
@@ -6653,9 +8261,10 @@ fi
     fi
   done
 
-  if test x"$ac_exists" = xtrue; then :
+  if test x"$ac_exists" = xtrue
+then :
 
-else
+else $as_nop
   if test "$ac_compiler_gnu" = yes; then
   for ac_link_opt in $ac_arg; do
     ac_cv_fc_libs="$ac_cv_fc_libs -Xlinker $ac_link_opt"
@@ -6670,9 +8279,24 @@ fi
 	  |-LANG:=* | -LIST:* | -LNO:* | -link)
 	  ;;
 	-lkernel32)
+	  # Ignore this library only on Windows-like systems.
 	  case $host_os in
-	  *cygwin*) ;;
-	  *) ac_cv_fc_libs="$ac_cv_fc_libs $ac_arg"
+	  cygwin* | msys* ) ;;
+	  *)
+	    ac_exists=false
+  for ac_i in $ac_cv_fc_libs; do
+    if test x"$ac_arg" = x"$ac_i"; then
+      ac_exists=true
+      break
+    fi
+  done
+
+  if test x"$ac_exists" = xtrue
+then :
+
+else $as_nop
+  ac_cv_fc_libs="$ac_cv_fc_libs $ac_arg"
+fi
 	    ;;
 	  esac
 	  ;;
@@ -6690,7 +8314,7 @@ fi
 	  esac
 	  ;;
 	-YP,*)
-	  for ac_j in `$as_echo "$ac_arg" | sed -e 's/-YP,/-L/;s/:/ -L/g'`; do
+	  for ac_j in `printf "%s\n" "$ac_arg" | sed -e 's/-YP,/-L/;s/:/ -L/g'`; do
 	      ac_exists=false
   for ac_i in $ac_cv_fc_libs; do
     if test x"$ac_j" = x"$ac_i"; then
@@ -6699,9 +8323,10 @@ fi
     fi
   done
 
-  if test x"$ac_exists" = xtrue; then :
+  if test x"$ac_exists" = xtrue
+then :
 
-else
+else $as_nop
   ac_arg="$ac_arg $ac_j"
 			       ac_cv_fc_libs="$ac_cv_fc_libs $ac_j"
 fi
@@ -6716,15 +8341,17 @@ fi
     fi
   done
 
-  if test x"$ac_exists" = xtrue; then :
+  if test x"$ac_exists" = xtrue
+then :
 
-else
+else $as_nop
   ac_cv_fc_libs="$ac_cv_fc_libs $ac_arg"
 fi
 	  ;;
 	-zallextract*| -zdefaultextract)
 	  ac_cv_fc_libs="$ac_cv_fc_libs $ac_arg"
 	  ;;
+	-mllvm) ${2+shift};; # Defend against 'clang -mllvm -loopopt=0'.
 	  # Ignore everything else.
   esac
 done
@@ -6736,7 +8363,7 @@ set X $ac_save_positional; shift
 # must begin with a "/").
 case `(uname -sr) 2>/dev/null` in
    "SunOS 5"*)
-      ac_ld_run_path=`$as_echo "$ac_fc_v_output" |
+      ac_ld_run_path=`printf "%s\n" "$ac_fc_v_output" |
 			sed -n 's,^.*LD_RUN_PATH *= *\(/[^ ]*\).*$,-R\1,p'`
       test "x$ac_ld_run_path" != x &&
 	if test "$ac_compiler_gnu" = yes; then
@@ -6751,8 +8378,8 @@ esac
 fi # test "x$[]_AC_LANG_PREFIX[]LIBS" = "x"
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_fc_libs" >&5
-$as_echo "$ac_cv_fc_libs" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_fc_libs" >&5
+printf "%s\n" "$ac_cv_fc_libs" >&6; }
 FCLIBS="$ac_cv_fc_libs"
 
 
@@ -6768,11 +8395,12 @@ ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
 ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_fc_compiler_gnu
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dummy main to link with Fortran libraries" >&5
-$as_echo_n "checking for dummy main to link with Fortran libraries... " >&6; }
-if ${ac_cv_fc_dummy_main+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dummy main to link with Fortran libraries" >&5
+printf %s "checking for dummy main to link with Fortran libraries... " >&6; }
+if test ${ac_cv_fc_dummy_main+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_fc_dm_save_LIBS=$LIBS
  LIBS="$LIBS $FCLIBS"
  ac_fortran_dm_var=FC_DUMMY_MAIN
@@ -6795,19 +8423,20 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 #endif
 #endif
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_fortran_dummy_main=none
-else
+else $as_nop
   ac_cv_fortran_dummy_main=unknown
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
  if test $ac_cv_fortran_dummy_main = unknown; then
@@ -6824,17 +8453,18 @@ rm -f core conftest.err conftest.$ac_objext \
 #endif
 #endif
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_fortran_dummy_main=$ac_func; break
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
    done
  fi
@@ -6847,25 +8477,24 @@ ac_compiler_gnu=$ac_cv_fc_compiler_gnu
  LIBS=$ac_fc_dm_save_LIBS
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_fc_dummy_main" >&5
-$as_echo "$ac_cv_fc_dummy_main" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_fc_dummy_main" >&5
+printf "%s\n" "$ac_cv_fc_dummy_main" >&6; }
 FC_DUMMY_MAIN=$ac_cv_fc_dummy_main
-if test "$FC_DUMMY_MAIN" != unknown; then :
+if test "$FC_DUMMY_MAIN" != unknown
+then :
   if test $FC_DUMMY_MAIN != none; then
 
-cat >>confdefs.h <<_ACEOF
-#define FC_DUMMY_MAIN $FC_DUMMY_MAIN
-_ACEOF
+printf "%s\n" "#define FC_DUMMY_MAIN $FC_DUMMY_MAIN" >>confdefs.h
 
   if test "x$ac_cv_fc_dummy_main" = "x$ac_cv_f77_dummy_main"; then
 
-$as_echo "#define FC_DUMMY_MAIN_EQ_F77 1" >>confdefs.h
+printf "%s\n" "#define FC_DUMMY_MAIN_EQ_F77 1" >>confdefs.h
 
   fi
 fi
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+else $as_nop
+  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "linking to Fortran libraries from C fails
 See \`config.log' for more details" "$LINENO" 5; }
 fi
@@ -6880,11 +8509,12 @@ ac_ext=${ac_fc_srcext-f}
 ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
 ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_fc_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Fortran name-mangling scheme" >&5
-$as_echo_n "checking for Fortran name-mangling scheme... " >&6; }
-if ${ac_cv_fc_mangling+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Fortran name-mangling scheme" >&5
+printf %s "checking for Fortran name-mangling scheme... " >&6; }
+if test ${ac_cv_fc_mangling+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat > conftest.$ac_ext <<_ACEOF
       subroutine foobar()
       return
@@ -6893,7 +8523,8 @@ else
       return
       end
 _ACEOF
-if ac_fn_fc_try_compile "$LINENO"; then :
+if ac_fn_fc_try_compile "$LINENO"
+then :
   mv conftest.$ac_objext cfortran_test.$ac_objext
 
   ac_save_LIBS=$LIBS
@@ -6914,9 +8545,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char $ac_func ();
 #ifdef FC_DUMMY_MAIN
 #ifndef FC_DUMMY_MAIN_EQ_F77
@@ -6927,17 +8555,18 @@ char $ac_func ();
 #endif
 #endif
 int
-main ()
+main (void)
 {
 return $ac_func ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_success=yes; break 2
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
     done
   done
@@ -6972,9 +8601,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char $ac_func ();
 #ifdef FC_DUMMY_MAIN
 #ifndef FC_DUMMY_MAIN_EQ_F77
@@ -6985,17 +8611,18 @@ char $ac_func ();
 #endif
 #endif
 int
-main ()
+main (void)
 {
 return $ac_func ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_success_extra=yes; break
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
      done
      ac_ext=${ac_fc_srcext-f}
@@ -7025,17 +8652,17 @@ ac_compiler_gnu=$ac_cv_fc_compiler_gnu
   LIBS=$ac_save_LIBS
   rm -rf conftest*
   rm -f cfortran_test*
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+else $as_nop
+  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compile a simple Fortran program
 See \`config.log' for more details" "$LINENO" 5; }
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_fc_mangling" >&5
-$as_echo "$ac_cv_fc_mangling" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_fc_mangling" >&5
+printf "%s\n" "$ac_cv_fc_mangling" >&6; }
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -7049,48 +8676,48 @@ ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest
 ac_compiler_gnu=$ac_cv_fc_compiler_gnu
 case $ac_cv_fc_mangling in
   "lower case, no underscore, no extra underscore")
-	  $as_echo "#define FC_FUNC(name,NAME) name" >>confdefs.h
+	  printf "%s\n" "#define FC_FUNC(name,NAME) name" >>confdefs.h
 
-	  $as_echo "#define FC_FUNC_(name,NAME) name" >>confdefs.h
+	  printf "%s\n" "#define FC_FUNC_(name,NAME) name" >>confdefs.h
  ;;
   "lower case, no underscore, extra underscore")
-	  $as_echo "#define FC_FUNC(name,NAME) name" >>confdefs.h
+	  printf "%s\n" "#define FC_FUNC(name,NAME) name" >>confdefs.h
 
-	  $as_echo "#define FC_FUNC_(name,NAME) name ## _" >>confdefs.h
+	  printf "%s\n" "#define FC_FUNC_(name,NAME) name ## _" >>confdefs.h
  ;;
   "lower case, underscore, no extra underscore")
-	  $as_echo "#define FC_FUNC(name,NAME) name ## _" >>confdefs.h
+	  printf "%s\n" "#define FC_FUNC(name,NAME) name ## _" >>confdefs.h
 
-	  $as_echo "#define FC_FUNC_(name,NAME) name ## _" >>confdefs.h
+	  printf "%s\n" "#define FC_FUNC_(name,NAME) name ## _" >>confdefs.h
  ;;
   "lower case, underscore, extra underscore")
-	  $as_echo "#define FC_FUNC(name,NAME) name ## _" >>confdefs.h
+	  printf "%s\n" "#define FC_FUNC(name,NAME) name ## _" >>confdefs.h
 
-	  $as_echo "#define FC_FUNC_(name,NAME) name ## __" >>confdefs.h
+	  printf "%s\n" "#define FC_FUNC_(name,NAME) name ## __" >>confdefs.h
  ;;
   "upper case, no underscore, no extra underscore")
-	  $as_echo "#define FC_FUNC(name,NAME) NAME" >>confdefs.h
+	  printf "%s\n" "#define FC_FUNC(name,NAME) NAME" >>confdefs.h
 
-	  $as_echo "#define FC_FUNC_(name,NAME) NAME" >>confdefs.h
+	  printf "%s\n" "#define FC_FUNC_(name,NAME) NAME" >>confdefs.h
  ;;
   "upper case, no underscore, extra underscore")
-	  $as_echo "#define FC_FUNC(name,NAME) NAME" >>confdefs.h
+	  printf "%s\n" "#define FC_FUNC(name,NAME) NAME" >>confdefs.h
 
-	  $as_echo "#define FC_FUNC_(name,NAME) NAME ## _" >>confdefs.h
+	  printf "%s\n" "#define FC_FUNC_(name,NAME) NAME ## _" >>confdefs.h
  ;;
   "upper case, underscore, no extra underscore")
-	  $as_echo "#define FC_FUNC(name,NAME) NAME ## _" >>confdefs.h
+	  printf "%s\n" "#define FC_FUNC(name,NAME) NAME ## _" >>confdefs.h
 
-	  $as_echo "#define FC_FUNC_(name,NAME) NAME ## _" >>confdefs.h
+	  printf "%s\n" "#define FC_FUNC_(name,NAME) NAME ## _" >>confdefs.h
  ;;
   "upper case, underscore, extra underscore")
-	  $as_echo "#define FC_FUNC(name,NAME) NAME ## _" >>confdefs.h
+	  printf "%s\n" "#define FC_FUNC(name,NAME) NAME ## _" >>confdefs.h
 
-	  $as_echo "#define FC_FUNC_(name,NAME) NAME ## __" >>confdefs.h
+	  printf "%s\n" "#define FC_FUNC_(name,NAME) NAME ## __" >>confdefs.h
  ;;
   *)
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unknown Fortran name-mangling scheme" >&5
-$as_echo "$as_me: WARNING: unknown Fortran name-mangling scheme" >&2;}
+	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unknown Fortran name-mangling scheme" >&5
+printf "%s\n" "$as_me: WARNING: unknown Fortran name-mangling scheme" >&2;}
 	  ;;
 esac
 
@@ -7105,24 +8732,26 @@ fi
 if test "$hypre_using_mpi" = "no"
 then
 
-$as_echo "#define HYPRE_SEQUENTIAL 1" >>confdefs.h
+printf "%s\n" "#define HYPRE_SEQUENTIAL 1" >>confdefs.h
 
 else
 
 if test x = x"$MPILIBS"; then
   ac_fn_c_check_func "$LINENO" "MPI_Init" "ac_cv_func_MPI_Init"
-if test "x$ac_cv_func_MPI_Init" = xyes; then :
+if test "x$ac_cv_func_MPI_Init" = xyes
+then :
   MPILIBS=" "
 fi
 
 fi
 
 if test x = x"$MPILIBS"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MPI_Init in -lmpi" >&5
-$as_echo_n "checking for MPI_Init in -lmpi... " >&6; }
-if ${ac_cv_lib_mpi_MPI_Init+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MPI_Init in -lmpi" >&5
+printf %s "checking for MPI_Init in -lmpi... " >&6; }
+if test ${ac_cv_lib_mpi_MPI_Init+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmpi  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7131,9 +8760,6 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char MPI_Init ();
 #ifdef FC_DUMMY_MAIN
 #ifndef FC_DUMMY_MAIN_EQ_F77
@@ -7144,36 +8770,39 @@ char MPI_Init ();
 #endif
 #endif
 int
-main ()
+main (void)
 {
 return MPI_Init ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_mpi_MPI_Init=yes
-else
+else $as_nop
   ac_cv_lib_mpi_MPI_Init=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mpi_MPI_Init" >&5
-$as_echo "$ac_cv_lib_mpi_MPI_Init" >&6; }
-if test "x$ac_cv_lib_mpi_MPI_Init" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mpi_MPI_Init" >&5
+printf "%s\n" "$ac_cv_lib_mpi_MPI_Init" >&6; }
+if test "x$ac_cv_lib_mpi_MPI_Init" = xyes
+then :
   MPILIBS="-lmpi"
 fi
 
 fi
 
 if test x = x"$MPILIBS"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MPI_Init in -lmpich" >&5
-$as_echo_n "checking for MPI_Init in -lmpich... " >&6; }
-if ${ac_cv_lib_mpich_MPI_Init+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MPI_Init in -lmpich" >&5
+printf %s "checking for MPI_Init in -lmpich... " >&6; }
+if test ${ac_cv_lib_mpich_MPI_Init+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmpich  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7182,9 +8811,6 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char MPI_Init ();
 #ifdef FC_DUMMY_MAIN
 #ifndef FC_DUMMY_MAIN_EQ_F77
@@ -7195,33 +8821,35 @@ char MPI_Init ();
 #endif
 #endif
 int
-main ()
+main (void)
 {
 return MPI_Init ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_mpich_MPI_Init=yes
-else
+else $as_nop
   ac_cv_lib_mpich_MPI_Init=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mpich_MPI_Init" >&5
-$as_echo "$ac_cv_lib_mpich_MPI_Init" >&6; }
-if test "x$ac_cv_lib_mpich_MPI_Init" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mpich_MPI_Init" >&5
+printf "%s\n" "$ac_cv_lib_mpich_MPI_Init" >&6; }
+if test "x$ac_cv_lib_mpich_MPI_Init" = xyes
+then :
   MPILIBS="-lmpich"
 fi
 
 fi
 
 if test x != x"$MPILIBS"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mpi.h" >&5
-$as_echo_n "checking for mpi.h... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mpi.h" >&5
+printf %s "checking for mpi.h... " >&6; }
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <mpi.h>
@@ -7234,22 +8862,23 @@ $as_echo_n "checking for mpi.h... " >&6; }
 #endif
 #endif
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
+if ac_fn_c_try_compile "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else $as_nop
   MPILIBS=""
-                     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+                     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 
@@ -7260,62 +8889,54 @@ if test x = x"$MPILIBS"; then
   :
 else
 
-$as_echo "#define HYPRE_HAVE_MPI 1" >>confdefs.h
+printf "%s\n" "#define HYPRE_HAVE_MPI 1" >>confdefs.h
 
   LIBS="$LIBS $MPILIBS"
   :
 fi
 
-   for ac_func in MPI_Comm_f2c
-do :
-  ac_fn_c_check_func "$LINENO" "MPI_Comm_f2c" "ac_cv_func_MPI_Comm_f2c"
-if test "x$ac_cv_func_MPI_Comm_f2c" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_MPI_COMM_F2C 1
-_ACEOF
+   ac_fn_c_check_func "$LINENO" "MPI_Comm_f2c" "ac_cv_func_MPI_Comm_f2c"
+if test "x$ac_cv_func_MPI_Comm_f2c" = xyes
+then :
+  printf "%s\n" "#define HAVE_MPI_COMM_F2C 1" >>confdefs.h
 
 fi
-done
 
    ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+printf %s "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
-  if ${ac_cv_prog_CPP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+  if test ${ac_cv_prog_CPP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+      # Double quotes because $CC needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" cpp /lib/cpp
     do
       ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
   # Use a header file that comes with gcc, so configuring glibc
   # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+#include <limits.h>
 		     Syntax error
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if ac_fn_c_try_cpp "$LINENO"
+then :
 
-else
+else $as_nop
   # Broken: fails on valid input.
 continue
 fi
@@ -7327,10 +8948,11 @@ rm -f conftest.err conftest.i conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if ac_fn_c_try_cpp "$LINENO"
+then :
   # Broken: success on invalid input.
 continue
-else
+else $as_nop
   # Passes both tests.
 ac_preproc_ok=:
 break
@@ -7340,7 +8962,8 @@ rm -f conftest.err conftest.i conftest.$ac_ext
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
+if $ac_preproc_ok
+then :
   break
 fi
 
@@ -7352,29 +8975,24 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+printf "%s\n" "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
   # Use a header file that comes with gcc, so configuring glibc
   # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+#include <limits.h>
 		     Syntax error
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if ac_fn_c_try_cpp "$LINENO"
+then :
 
-else
+else $as_nop
   # Broken: fails on valid input.
 continue
 fi
@@ -7386,10 +9004,11 @@ rm -f conftest.err conftest.i conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if ac_fn_c_try_cpp "$LINENO"
+then :
   # Broken: success on invalid input.
 continue
-else
+else $as_nop
   # Passes both tests.
 ac_preproc_ok=:
 break
@@ -7399,11 +9018,12 @@ rm -f conftest.err conftest.i conftest.$ac_ext
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
+if $ac_preproc_ok
+then :
 
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+else $as_nop
+  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details" "$LINENO" 5; }
 fi
@@ -7415,11 +9035,12 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if ${ac_cv_path_GREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+printf %s "checking for grep that handles long lines and -e... " >&6; }
+if test ${ac_cv_path_GREP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -z "$GREP"; then
   ac_path_GREP_found=false
   # Loop through the user's path and test for each of PROGNAME-LIST
@@ -7427,10 +9048,15 @@ else
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in grep ggrep; do
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_prog in grep ggrep
+   do
     for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+      ac_path_GREP="$as_dir$ac_prog$ac_exec_ext"
       as_fn_executable_p "$ac_path_GREP" || continue
 # Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
@@ -7439,13 +9065,13 @@ case `"$ac_path_GREP" --version 2>&1` in
   ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
 *)
   ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
+  printf %s 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    $as_echo 'GREP' >> "conftest.nl"
+    printf "%s\n" 'GREP' >> "conftest.nl"
     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -7473,16 +9099,17 @@ else
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-$as_echo "$ac_cv_path_GREP" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+printf "%s\n" "$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-$as_echo_n "checking for egrep... " >&6; }
-if ${ac_cv_path_EGREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+printf %s "checking for egrep... " >&6; }
+if test ${ac_cv_path_EGREP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
    then ac_cv_path_EGREP="$GREP -E"
    else
@@ -7493,10 +9120,15 @@ else
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in egrep; do
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_prog in egrep
+   do
     for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      ac_path_EGREP="$as_dir$ac_prog$ac_exec_ext"
       as_fn_executable_p "$ac_path_EGREP" || continue
 # Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
@@ -7505,13 +9137,13 @@ case `"$ac_path_EGREP" --version 2>&1` in
   ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
 *)
   ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
+  printf %s 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    $as_echo 'EGREP' >> "conftest.nl"
+    printf "%s\n" 'EGREP' >> "conftest.nl"
     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -7540,16 +9172,17 @@ fi
 
    fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-$as_echo "$ac_cv_path_EGREP" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+printf "%s\n" "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether MPI_Comm_f2c is a macro" >&5
-$as_echo_n "checking whether MPI_Comm_f2c is a macro... " >&6; }
-if ${hypre_cv_func_MPI_Comm_f2c_macro+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether MPI_Comm_f2c is a macro" >&5
+printf %s "checking whether MPI_Comm_f2c is a macro... " >&6; }
+if test ${hypre_cv_func_MPI_Comm_f2c_macro+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -7559,20 +9192,21 @@ else
 #endif
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "mpi_header_defines_MPI_Comm_f2c" >/dev/null 2>&1; then :
+  $EGREP "mpi_header_defines_MPI_Comm_f2c" >/dev/null 2>&1
+then :
   hypre_cv_func_MPI_Comm_f2c_macro=yes
-else
+else $as_nop
   hypre_cv_func_MPI_Comm_f2c_macro=no
 fi
-rm -f conftest*
+rm -rf conftest*
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hypre_cv_func_MPI_Comm_f2c_macro" >&5
-$as_echo "$hypre_cv_func_MPI_Comm_f2c_macro" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hypre_cv_func_MPI_Comm_f2c_macro" >&5
+printf "%s\n" "$hypre_cv_func_MPI_Comm_f2c_macro" >&6; }
    if test $ac_cv_func_MPI_Comm_f2c = yes \
       || test $hypre_cv_func_MPI_Comm_f2c_macro = yes; then
 
-$as_echo "#define HYPRE_HAVE_MPI_COMM_F2C 1" >>confdefs.h
+printf "%s\n" "#define HYPRE_HAVE_MPI_COMM_F2C 1" >>confdefs.h
 
    fi
 fi
@@ -7580,14 +9214,21 @@ fi
 if test "$hypre_using_node_aware_mpi" = "yes"
 then
 
-$as_echo "#define HYPRE_USING_NODE_AWARE_MPI 1" >>confdefs.h
+printf "%s\n" "#define HYPRE_USING_NODE_AWARE_MPI 1" >>confdefs.h
 
 fi
 
 if test "$hypre_using_memory_tracker" = "yes"
 then
 
-$as_echo "#define HYPRE_USING_MEMORY_TRACKER 1" >>confdefs.h
+printf "%s\n" "#define HYPRE_USING_MEMORY_TRACKER 1" >>confdefs.h
+
+fi
+
+if test "$hypre_test_using_host" = "yes"
+then
+
+printf "%s\n" "#define HYPRE_TEST_USING_HOST 1" >>confdefs.h
 
 fi
 
@@ -7597,14 +9238,14 @@ then
       if test $blas_lib = "-ldxml"
       then
 
-$as_echo "#define HYPRE_USING_DXML 1" >>confdefs.h
+printf "%s\n" "#define HYPRE_USING_DXML 1" >>confdefs.h
 
       fi
 
       if test $blas_lib = "-lessl"
       then
 
-$as_echo "#define HYPRE_USING_ESSL 1" >>confdefs.h
+printf "%s\n" "#define HYPRE_USING_ESSL 1" >>confdefs.h
 
       fi
    done
@@ -7626,7 +9267,8 @@ then
 
 
 # Check whether --with-blas was given.
-if test "${with_blas+set}" = set; then :
+if test ${with_blas+y}
+then :
   withval=$with_blas;
 fi
 
@@ -7678,12 +9320,13 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
      for lib in $BLAS_LIB_NAMES; do
-        as_ac_Lib=`$as_echo "ac_cv_lib_$lib''_$dgemm" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $dgemm in -l$lib" >&5
-$as_echo_n "checking for $dgemm in -l$lib... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+        as_ac_Lib=`printf "%s\n" "ac_cv_lib_$lib""_$dgemm" | $as_tr_sh`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $dgemm in -l$lib" >&5
+printf %s "checking for $dgemm in -l$lib... " >&6; }
+if eval test \${$as_ac_Lib+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$lib  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7692,9 +9335,6 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char $dgemm ();
 #ifdef FC_DUMMY_MAIN
 #ifndef FC_DUMMY_MAIN_EQ_F77
@@ -7705,26 +9345,28 @@ char $dgemm ();
 #endif
 #endif
 int
-main ()
+main (void)
 {
 return $dgemm ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   eval "$as_ac_Lib=yes"
-else
+else $as_nop
   eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"
+then :
   BLASLIBS=$lib
 fi
 
@@ -7753,13 +9395,13 @@ fi
 #***************************************************************
   if test "$BLASLIBS" = "dxml"; then
 
-$as_echo "#define HYPRE_USING_DXML 1" >>confdefs.h
+printf "%s\n" "#define HYPRE_USING_DXML 1" >>confdefs.h
 
   fi
 
   if test "$BLASLIBS" = "essl"; then
 
-$as_echo "#define HYPRE_USING_ESSL 1" >>confdefs.h
+printf "%s\n" "#define HYPRE_USING_ESSL 1" >>confdefs.h
 
   fi
 
@@ -7783,14 +9425,14 @@ $as_echo "#define HYPRE_USING_ESSL 1" >>confdefs.h
 
       if test "$BLASLIBS" = "null"
       then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ***************************************" >&5
-$as_echo "$as_me: WARNING: ***************************************" >&2;}
-         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find BLAS library" >&5
-$as_echo "$as_me: WARNING: Cannot find BLAS library" >&2;}
-         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:   configuring --without-blas" >&5
-$as_echo "$as_me: WARNING:   configuring --without-blas" >&2;}
-         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ***************************************" >&5
-$as_echo "$as_me: WARNING: ***************************************" >&2;}
+         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ***************************************" >&5
+printf "%s\n" "$as_me: WARNING: ***************************************" >&2;}
+         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find BLAS library" >&5
+printf "%s\n" "$as_me: WARNING: Cannot find BLAS library" >&2;}
+         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING:   configuring --without-blas" >&5
+printf "%s\n" "$as_me: WARNING:   configuring --without-blas" >&2;}
+         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ***************************************" >&5
+printf "%s\n" "$as_me: WARNING: ***************************************" >&2;}
       elif test "$BLASLIBS" != "internal"
       then
          hypre_using_hypre_blas=no
@@ -7801,7 +9443,7 @@ $as_echo "$as_me: WARNING: ***************************************" >&2;}
       BLASLIBDIRS=""
       BLASLIBS=""
 
-$as_echo "#define HYPRE_USING_HYPRE_BLAS 1" >>confdefs.h
+printf "%s\n" "#define HYPRE_USING_HYPRE_BLAS 1" >>confdefs.h
 
    fi
 fi
@@ -7812,7 +9454,7 @@ then
       if test $lapack_lib = "-lessl"
       then
 
-$as_echo "#define HYPRE_USING_ESSL 1" >>confdefs.h
+printf "%s\n" "#define HYPRE_USING_ESSL 1" >>confdefs.h
 
       fi
    done
@@ -7834,7 +9476,8 @@ then
 
 
 # Check whether --with-lapack was given.
-if test "${with_lapack+set}" = set; then :
+if test ${with_lapack+y}
+then :
   withval=$with_lapack;
 fi
 
@@ -7886,12 +9529,13 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
      for lib in $LAPACK_LIB_NAMES; do
-        as_ac_Lib=`$as_echo "ac_cv_lib_$lib''_$dsygv" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $dsygv in -l$lib" >&5
-$as_echo_n "checking for $dsygv in -l$lib... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+        as_ac_Lib=`printf "%s\n" "ac_cv_lib_$lib""_$dsygv" | $as_tr_sh`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $dsygv in -l$lib" >&5
+printf %s "checking for $dsygv in -l$lib... " >&6; }
+if eval test \${$as_ac_Lib+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$lib -lblas $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7900,9 +9544,6 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char $dsygv ();
 #ifdef FC_DUMMY_MAIN
 #ifndef FC_DUMMY_MAIN_EQ_F77
@@ -7913,26 +9554,28 @@ char $dsygv ();
 #endif
 #endif
 int
-main ()
+main (void)
 {
 return $dsygv ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   eval "$as_ac_Lib=yes"
-else
+else $as_nop
   eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"
+then :
   LAPACKLIBS=$lib
 fi
 
@@ -7976,14 +9619,14 @@ fi
 
       if test "$LAPACKLIBS" = "null"
       then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ***************************************" >&5
-$as_echo "$as_me: WARNING: ***************************************" >&2;}
-         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find LAPACK library" >&5
-$as_echo "$as_me: WARNING: Cannot find LAPACK library" >&2;}
-         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:   configuring --without-lapack" >&5
-$as_echo "$as_me: WARNING:   configuring --without-lapack" >&2;}
-         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ***************************************" >&5
-$as_echo "$as_me: WARNING: ***************************************" >&2;}
+         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ***************************************" >&5
+printf "%s\n" "$as_me: WARNING: ***************************************" >&2;}
+         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find LAPACK library" >&5
+printf "%s\n" "$as_me: WARNING: Cannot find LAPACK library" >&2;}
+         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING:   configuring --without-lapack" >&5
+printf "%s\n" "$as_me: WARNING:   configuring --without-lapack" >&2;}
+         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ***************************************" >&5
+printf "%s\n" "$as_me: WARNING: ***************************************" >&2;}
       elif test "$LAPACKLIBS" != "internal"
       then
          hypre_using_hypre_lapack=no
@@ -7994,7 +9637,7 @@ $as_echo "$as_me: WARNING: ***************************************" >&2;}
       LAPACKLIBDIRS=""
       LAPACKLIBS=""
 
-$as_echo "#define HYPRE_USING_HYPRE_LAPACK 1" >>confdefs.h
+printf "%s\n" "#define HYPRE_USING_HYPRE_LAPACK 1" >>confdefs.h
 
    fi
 fi
@@ -8012,15 +9655,16 @@ then
          HYPRE_FEI_SUBDIRS="femli $HYPRE_FEI_SUBDIRS"
          HYPRE_FEI_FEMLI_FILES="$HYPRE_SRCDIR/FEI_mv/femli/*.o"
 
-$as_echo "#define HAVE_MLI 1" >>confdefs.h
+printf "%s\n" "#define HAVE_MLI 1" >>confdefs.h
 
       fi
    fi
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __gxx_personality_v0 in -lstdc++" >&5
-$as_echo_n "checking for __gxx_personality_v0 in -lstdc++... " >&6; }
-if ${ac_cv_lib_stdcpp___gxx_personality_v0+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __gxx_personality_v0 in -lstdc++" >&5
+printf %s "checking for __gxx_personality_v0 in -lstdc++... " >&6; }
+if test ${ac_cv_lib_stdcpp___gxx_personality_v0+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lstdc++  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8029,9 +9673,6 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char __gxx_personality_v0 ();
 #ifdef FC_DUMMY_MAIN
 #ifndef FC_DUMMY_MAIN_EQ_F77
@@ -8042,25 +9683,27 @@ char __gxx_personality_v0 ();
 #endif
 #endif
 int
-main ()
+main (void)
 {
 return __gxx_personality_v0 ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_stdcpp___gxx_personality_v0=yes
-else
+else $as_nop
   ac_cv_lib_stdcpp___gxx_personality_v0=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_stdcpp___gxx_personality_v0" >&5
-$as_echo "$ac_cv_lib_stdcpp___gxx_personality_v0" >&6; }
-if test "x$ac_cv_lib_stdcpp___gxx_personality_v0" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_stdcpp___gxx_personality_v0" >&5
+printf "%s\n" "$ac_cv_lib_stdcpp___gxx_personality_v0" >&6; }
+if test "x$ac_cv_lib_stdcpp___gxx_personality_v0" = xyes
+then :
   LIBS="$LIBS -lstdc++"
 fi
 
@@ -8089,33 +9732,33 @@ then
 
 if test "x${hypre_user_chose_cflags}" = "xno"
 then
-   case `basename "${CC}"` in
+   case `basename ${CC}` in
       gcc|mpigcc|mpicc)
-        CFLAGS="-g -Wall"
+        CFLAGS="-O0 -g -Wall"
         if test "$hypre_using_openmp" = "yes" ; then
-          CFLAGS="$CFLAGS -fopenmp"
-          LDFLAGS="$LDFLAGS -fopenmp"
+          CFLAGS+=" -fopenmp"
+          LDFLAGS+=" -fopenmp"
         fi
         ;;
-      icc|mpiicc)
-        CFLAGS="-g"
+      icc|mpiicc|icx|mpiicx)
+        CFLAGS="-O0 -g -Wall"
         if test "$hypre_using_openmp" = "yes" ; then
-          CFLAGS="$CFLAGS -qopenmp"
-          LDFLAGS="$LDFLAGS -qopenmp"
+          CFLAGS+=" -qopenmp"
+          LDFLAGS+=" -qopenmp"
         fi
         ;;
       pgcc|mpipgcc|mpipgicc)
-        CFLAGS="-g"
+        CFLAGS="-O0 -g -Wall"
         if test "$hypre_using_openmp" = "yes" ; then
-          CFLAGS="$CFLAGS -mp"
-          LDFLAGS="$LDFLAGS -mp"
+          CFLAGS+=" -mp"
+          LDFLAGS+=" -mp"
         fi
         ;;
       cc|xlc|mpxlc|mpixlc|mpcc)
-        CFLAGS="-g"
+        CFLAGS="-O0 -g -Wall"
         if test "$hypre_using_openmp" = "yes" ; then
-          CFLAGS="$CFLAGS -qsmp=omp"
-          LDFLAGS="$LDFLAGS -qsmp=omp"
+          CFLAGS+=" -qsmp=omp"
+          LDFLAGS+=" -qsmp=omp"
         fi
         ;;
       KCC|mpiKCC)
@@ -8129,29 +9772,29 @@ fi
 
 if test "x${hypre_user_chose_cxxflags}" = "xno"
 then
-   case `basename "${CXX}"` in
+   case `basename ${CXX}` in
       g++|gCC|mpig++|mpicxx|mpic++|mpiCC)
-        CXXFLAGS="-g -Wall"
+        CXXFLAGS="-O0 -g -Wall"
         if test "$hypre_using_openmp" = "yes" ; then
-          CXXFLAGS="$CXXFLAGS -fopenmp"
+          CXXFLAGS+=" -fopenmp"
         fi
         ;;
-      icpc|icc|mpiicpc|mpiicc)
-        CXXFLAGS="-g"
+      icpc|icc|mpiicpc|mpiicc|icpx|mpiicpx)
+        CXXFLAGS="-O0 -g -Wall"
         if test "$hypre_using_openmp" = "yes" ; then
-          CXXFLAGS="$CXXFLAGS -qopenmp"
+          CXXFLAGS+=" -qopenmp"
         fi
         ;;
       pgCC|mpipgCC|pgc++|mpipgic++)
-        CXXFLAGS="-g"
+        CXXFLAGS="-O0 -g -Wall"
         if test "$hypre_using_openmp" = "yes" ; then
-          CXXFLAGS="$CXXFLAGS -mp"
+          CXXFLAGS+=" -mp"
         fi
         ;;
       CC|cxx|xlC|mpxlC|mpixlcxx|mpCC)
-        CXXFLAGS="-g"
+        CXXFLAGS="-O0 -g"
         if test "$hypre_using_openmp" = "yes" ; then
-          CXXFLAGS="$CXXFLAGS -qsmp=omp"
+          CXXFLAGS+=" -qsmp=omp"
         fi
         ;;
       KCC|mpiKCC)
@@ -8163,16 +9806,16 @@ then
    esac
 fi
 
-if test "x${hypre_user_chose_fflags}" = "xno"
+if test "$hypre_using_fortran" = "yes" -a "x${hypre_user_chose_fflags}" = "xno"
 then
-   case `basename "${FC}"` in
+   case `basename ${FC}` in
       g77|gfortran|mpigfortran|mpif77)
         FFLAGS="-g -Wall"
         if test "$hypre_using_openmp" = "yes" ; then
           FFLAGS="$FFLAGS -fopenmp"
         fi
         ;;
-      ifort|mpiifort)
+      ifort|mpiifort|ifx|mpiifx)
         FFLAGS="-g"
         if test "$hypre_using_openmp" = "yes" ; then
           FFLAGS="$FFLAGS -qopenmp"
@@ -8199,39 +9842,39 @@ then
    esac
 fi
 
-$as_echo "#define HYPRE_DEBUG 1" >>confdefs.h
+printf "%s\n" "#define HYPRE_DEBUG 1" >>confdefs.h
 
 else
 
 if test "x${hypre_user_chose_cflags}" = "xno"
 then
-   case `basename "${CC}"` in
+   case `basename ${CC}` in
       gcc|mpigcc|mpicc)
         CFLAGS="-O2"
         if test "$hypre_using_openmp" = "yes" ; then
-          CFLAGS="$CFLAGS -fopenmp"
-          LDFLAGS="$LDFLAGS -fopenmp"
+          CFLAGS+=" -fopenmp"
+          LDFLAGS+=" -fopenmp"
         fi
         ;;
-      icc|mpiicc)
+      icc|mpiicc|icx|mpiicx)
         CFLAGS="-O2"
         if test "$hypre_using_openmp" = "yes" ; then
-          CFLAGS="$CFLAGS -qopenmp"
-          LDFLAGS="$LDFLAGS -qopenmp"
+          CFLAGS+=" -qopenmp"
+          LDFLAGS+=" -qopenmp"
         fi
         ;;
       pgcc|mpipgcc|mpipgicc)
         CFLAGS="-fast"
         if test "$hypre_using_openmp" = "yes" ; then
-          CFLAGS="$CFLAGS -mp"
-          LDFLAGS="$LDFLAGS -mp"
+          CFLAGS+=" -mp"
+          LDFLAGS+=" -mp"
         fi
         ;;
       cc|xlc|xlc_r|mpxlc|mpixlc|mpixlc_r|mpixlc-gpu|mpcc)
         CFLAGS="-O2"
         if test "$hypre_using_openmp" = "yes" ; then
-          CFLAGS="$CFLAGS -qsmp=omp"
-          LDFLAGS="$LDFLAGS -qsmp=omp"
+          CFLAGS+=" -qsmp=omp"
+          LDFLAGS+=" -qsmp=omp"
         fi
         ;;
       KCC|mpiKCC)
@@ -8245,29 +9888,29 @@ fi
 
 if test "x${hypre_user_chose_cxxflags}" = "xno"
 then
-   case `basename "${CXX}"` in
+   case `basename ${CXX}` in
       g++|gCC|mpig++|mpicxx|mpic++|mpiCC)
         CXXFLAGS="-O2"
         if test "$hypre_using_openmp" = "yes" ; then
-          CXXFLAGS="$CXXFLAGS -fopenmp"
+          CXXFLAGS+=" -fopenmp"
         fi
         ;;
-      icpc|icc|mpiicpc|mpiicc)
+      icpc|icc|mpiicpc|mpiicc|icpx|mpiicpx)
         CXXFLAGS="-O2"
         if test "$hypre_using_openmp" = "yes" ; then
-          CXXFLAGS="$CXXFLAGS -qopenmp"
+          CXXFLAGS+=" -qopenmp"
         fi
         ;;
       pgCC|mpipgCC|pgc++|mpipgic++)
         CXXFLAGS="-fast"
         if test "$hypre_using_openmp" = "yes" ; then
-          CXXFLAGS="$CXXFLAGS -mp"
+          CXXFLAGS+=" -mp"
         fi
         ;;
       CC|cxx|xlC|xlC_r|mpxlC|mpixlC|mpixlC-gpu|mpixlcxx|mpixlcxx_r|mpCC)
         CXXFLAGS="-O2"
         if test "$hypre_using_openmp" = "yes" ; then
-          CXXFLAGS="$CXXFLAGS -qsmp=omp"
+          CXXFLAGS+=" -qsmp=omp"
         fi
         ;;
       KCC|mpiKCC)
@@ -8279,31 +9922,31 @@ then
    esac
 fi
 
-if test "x${hypre_user_chose_fflags}" = "xno"
+if test "$hypre_using_fortran" = "yes" -a "x${hypre_user_chose_fflags}" = "xno"
 then
-   case `basename "${FC}"` in
+   case `basename ${FC}` in
       g77|gfortran|mpigfortran|mpif77)
         FFLAGS="-O2"
         if test "$hypre_using_openmp" = "yes" ; then
-          FFLAGS="$FFLAGS -fopenmp"
+          FFLAGS+=" -fopenmp"
         fi
         ;;
       ifort|mpiifort)
         FFLAGS="-O2"
         if test "$hypre_using_openmp" = "yes" ; then
-          FFLAGS="$FFLAGS -qopenmp"
+          FFLAGS+=" -qopenmp"
         fi
         ;;
       pgf77|mpipgf77|pgfortran|mpipgifort)
         FFLAGS="-fast"
         if test "$hypre_using_openmp" = "yes" ; then
-          FFLAGS="$FFLAGS -mp"
+          FFLAGS+=" -mp"
         fi
         ;;
       f77|f90|xlf|xlf_r|mpxlf|mpixlf77|mpixlf77_r)
         FFLAGS="-O2"
         if test "$hypre_using_openmp" = "yes" ; then
-          FFLAGS="$FFLAGS -qsmp=omp"
+          FFLAGS+=" -qsmp=omp"
         fi
         ;;
       kf77|mpikf77)
@@ -8347,26 +9990,12 @@ then
    BUILD_JAVA=1
 fi
 
-if test "$hypre_using_insure" = "yes"
-then
-   LINK_FC="insure"
-   LINK_CC="insure"
-   LINK_CXX="insure"
-   LDFLAGS=`mpicc -link-info | awk '{$1=""; print}'`
-   LDFLAGS="$LDFLAGS ${hypre_insure_flags}"
-   FC="insure"
-   CC="insure"
-   CXX="insure"
-   FFLAGS="`mpicc -link-info | awk '{$1=""; print}'` $FFLAGS"
-   CFLAGS="`mpicc -link-info | awk '{$1=""; print}'` $CFLAGS"
-   CXXFLAGS="`mpicc -link-info | awk '{$1=""; print}'` $CXXFLAGS"
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cabs in -lm" >&5
-$as_echo_n "checking for cabs in -lm... " >&6; }
-if ${ac_cv_lib_m_cabs+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for cabs in -lm" >&5
+printf %s "checking for cabs in -lm... " >&6; }
+if test ${ac_cv_lib_m_cabs+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8375,9 +10004,6 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char cabs ();
 #ifdef FC_DUMMY_MAIN
 #ifndef FC_DUMMY_MAIN_EQ_F77
@@ -8388,25 +10014,27 @@ char cabs ();
 #endif
 #endif
 int
-main ()
+main (void)
 {
 return cabs ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_m_cabs=yes
-else
+else $as_nop
   ac_cv_lib_m_cabs=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cabs" >&5
-$as_echo "$ac_cv_lib_m_cabs" >&6; }
-if test "x$ac_cv_lib_m_cabs" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cabs" >&5
+printf "%s\n" "$ac_cv_lib_m_cabs" >&6; }
+if test "x$ac_cv_lib_m_cabs" = xyes
+then :
   LIBS="$LIBS -lm"
 fi
 
@@ -8489,7 +10117,7 @@ then
       BUILD_CC_SHARED="\${CC} ${SHARED_BUILD_FLAG}"
    fi
    BUILD_CXX_SHARED="\${CXX} ${SHARED_BUILD_FLAG}"
-   if test "$hypre_using_cuda" == "yes" || test "$hypre_using_hip" == "yes"
+   if test "$hypre_using_cuda" == "yes" || test "$hypre_using_hip" == "yes" || test "$hypre_using_kokkos" == "yes"
    then
             BUILD_CC_SHARED="\${CXX} ${SHARED_BUILD_FLAG}"
    fi
@@ -8500,258 +10128,493 @@ if test "$hypre_using_caliper" = "yes"
 then
    if test "$hypre_user_gave_caliper_inc" != "yes"
    then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *******************************************************" >&5
-$as_echo "$as_me: WARNING: *******************************************************" >&2;}
-       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Configuring with --with-caliper=yes without providing" >&5
-$as_echo "$as_me: WARNING: Configuring with --with-caliper=yes without providing" >&2;}
-       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-caliper-include=<path-to-caliper-install>." >&5
-$as_echo "$as_me: WARNING: --with-caliper-include=<path-to-caliper-install>." >&2;}
-       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Using default user include path." >&5
-$as_echo "$as_me: WARNING: Using default user include path." >&2;}
-       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: NOTE: Caliper annotations may not work." >&5
-$as_echo "$as_me: WARNING: NOTE: Caliper annotations may not work." >&2;}
-       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *******************************************************" >&5
-$as_echo "$as_me: WARNING: *******************************************************" >&2;}
+       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: *******************************************************" >&5
+printf "%s\n" "$as_me: WARNING: *******************************************************" >&2;}
+       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Configuring with --with-caliper=yes without providing" >&5
+printf "%s\n" "$as_me: WARNING: Configuring with --with-caliper=yes without providing" >&2;}
+       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: --with-caliper-include=<path-to-caliper-install>." >&5
+printf "%s\n" "$as_me: WARNING: --with-caliper-include=<path-to-caliper-install>." >&2;}
+       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Using default user include path." >&5
+printf "%s\n" "$as_me: WARNING: Using default user include path." >&2;}
+       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: NOTE: Caliper annotations may not work." >&5
+printf "%s\n" "$as_me: WARNING: NOTE: Caliper annotations may not work." >&2;}
+       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: *******************************************************" >&5
+printf "%s\n" "$as_me: WARNING: *******************************************************" >&2;}
    fi
    if test "$hypre_user_gave_caliper_lib" != "yes"
    then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *******************************************************" >&5
-$as_echo "$as_me: WARNING: *******************************************************" >&2;}
-       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Configuring with --with-caliper=yes without providing" >&5
-$as_echo "$as_me: WARNING: Configuring with --with-caliper=yes without providing" >&2;}
-       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-caliper-lib=<path-to-caliper-lib>." >&5
-$as_echo "$as_me: WARNING: --with-caliper-lib=<path-to-caliper-lib>." >&2;}
-       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Using default user library path." >&5
-$as_echo "$as_me: WARNING: Using default user library path." >&2;}
-       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: NOTE: Caliper annotations may not work." >&5
-$as_echo "$as_me: WARNING: NOTE: Caliper annotations may not work." >&2;}
-       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *******************************************************" >&5
-$as_echo "$as_me: WARNING: *******************************************************" >&2;}
+       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: *******************************************************" >&5
+printf "%s\n" "$as_me: WARNING: *******************************************************" >&2;}
+       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Configuring with --with-caliper=yes without providing" >&5
+printf "%s\n" "$as_me: WARNING: Configuring with --with-caliper=yes without providing" >&2;}
+       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: --with-caliper-lib=<path-to-caliper-lib>." >&5
+printf "%s\n" "$as_me: WARNING: --with-caliper-lib=<path-to-caliper-lib>." >&2;}
+       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Using default user library path." >&5
+printf "%s\n" "$as_me: WARNING: Using default user library path." >&2;}
+       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: NOTE: Caliper annotations may not work." >&5
+printf "%s\n" "$as_me: WARNING: NOTE: Caliper annotations may not work." >&2;}
+       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: *******************************************************" >&5
+printf "%s\n" "$as_me: WARNING: *******************************************************" >&2;}
+   fi
+fi
+
+if test "x$hypre_using_magma" = "xyes"
+then
+   if test "x$hypre_user_gave_magma_inc" != "xyes"
+   then
+       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: *******************************************************" >&5
+printf "%s\n" "$as_me: WARNING: *******************************************************" >&2;}
+       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Configuring with --with-magma=yes without providing" >&5
+printf "%s\n" "$as_me: WARNING: Configuring with --with-magma=yes without providing" >&2;}
+       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: --with-magma-include=<path-to-magma-include>." >&5
+printf "%s\n" "$as_me: WARNING: --with-magma-include=<path-to-magma-include>." >&2;}
+       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Using default user include path." >&5
+printf "%s\n" "$as_me: WARNING: Using default user include path." >&2;}
+       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: NOTE: MAGMA may not work." >&5
+printf "%s\n" "$as_me: WARNING: NOTE: MAGMA may not work." >&2;}
+       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: *******************************************************" >&5
+printf "%s\n" "$as_me: WARNING: *******************************************************" >&2;}
+   fi
+   if test "x$hypre_user_gave_magma_lib" != "xyes"
+   then
+       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: *******************************************************" >&5
+printf "%s\n" "$as_me: WARNING: *******************************************************" >&2;}
+       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Configuring with --with-magma=yes without providing" >&5
+printf "%s\n" "$as_me: WARNING: Configuring with --with-magma=yes without providing" >&2;}
+       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: --with-magma-lib=<path-to-magma-lib>." >&5
+printf "%s\n" "$as_me: WARNING: --with-magma-lib=<path-to-magma-lib>." >&2;}
+       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Using default user library path." >&5
+printf "%s\n" "$as_me: WARNING: Using default user library path." >&2;}
+       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: NOTE: MAGMA may not work." >&5
+printf "%s\n" "$as_me: WARNING: NOTE: MAGMA may not work." >&2;}
+       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: *******************************************************" >&5
+printf "%s\n" "$as_me: WARNING: *******************************************************" >&2;}
    fi
 fi
 
+
 if test "x$hypre_using_um" = "xyes"
 then
-   if test "x$hypre_using_cuda" != "xyes" && test "x$hypre_using_device_openmp" != "xyes" && test "x$hypre_using_hip" != "xyes"
+   if test "x$hypre_using_cuda" != "xyes" && test "x$hypre_using_device_openmp" != "xyes" && test "x$hypre_using_hip" != "xyes" && test "x$hypre_using_sycl" != "xyes"
    then
-      as_fn_error $? "Asked for unified memory, but not using CUDA, HIP, or device OpenMP!" "$LINENO" 5
+      as_fn_error $? "Asked for unified memory, but not using CUDA, HIP, SYCL, or device OpenMP!" "$LINENO" 5
    fi
 fi
-if test "$hypre_using_cuda" = "yes" || test "$hypre_using_device_openmp" = "yes"
+
+
+if test "$hypre_using_cuda" = "yes"
 then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
+   ac_header= ac_cache=
+for ac_item in $ac_header_c_list
+do
+  if test $ac_cache; then
+    ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default"
+    if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then
+      printf "%s\n" "#define $ac_item 1" >> confdefs.h
+    fi
+    ac_header= ac_cache=
+  elif test $ac_header; then
+    ac_cache=$ac_item
+  else
+    ac_header=$ac_item
+  fi
+done
 
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_stdc=yes
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <string.h>
 
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then :
 
-else
-  ac_cv_header_stdc=no
+
+
+
+if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes
+then :
+
+printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h
+
 fi
-rm -f conftest*
+as_ac_Header=`printf "%s\n" "ac_cv_header_"${CUDA_HOME}/include/cuda.h"" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" ""${CUDA_HOME}/include/cuda.h"" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"
+then :
+  hypre_found_cuda=yes; HYPRE_CUDA_PATH=${CUDA_HOME}
+fi
+
 
+   if test "x$hypre_found_cuda" != "xyes"
+   then
+      as_ac_Header=`printf "%s\n" "ac_cv_header_"${CUDA_PATH}/include/cuda.h"" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" ""${CUDA_PATH}/include/cuda.h"" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"
+then :
+  hypre_found_cuda=yes; HYPRE_CUDA_PATH=${CUDA_PATH}
 fi
 
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
+   fi
 
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then :
+   if test "x$hypre_found_cuda" != "xyes"
+   then
+      as_fn_error $? "unable to find cuda.h ... Ensure that CUDA_HOME or CUDA_PATH is set" "$LINENO" 5
+   fi
+fi
 
+
+if test "$hypre_using_cusparse" = "yes"
+then
+   as_ac_File=`printf "%s\n" "ac_cv_file_${HYPRE_CUDA_PATH}/include/cusparse.h" | $as_tr_sh`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ${HYPRE_CUDA_PATH}/include/cusparse.h" >&5
+printf %s "checking for ${HYPRE_CUDA_PATH}/include/cusparse.h... " >&6; }
+if eval test \${$as_ac_File+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  test "$cross_compiling" = yes &&
+  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+if test -r "${HYPRE_CUDA_PATH}/include/cusparse.h"; then
+  eval "$as_ac_File=yes"
 else
-  ac_cv_header_stdc=no
+  eval "$as_ac_File=no"
+fi
+fi
+eval ac_res=\$$as_ac_File
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_File"\" = x"yes"
+then :
+  hypre_found_cusparse=yes; HYPRE_VENDOR_MATH_PATH=${HYPRE_CUDA_PATH}
 fi
-rm -f conftest*
 
+
+   if test "x$hypre_found_cusparse" != "xyes"
+   then
+      as_ac_File=`printf "%s\n" "ac_cv_file_${HYPRE_CUDA_PATH}/../math_libs/include/cusparse.h" | $as_tr_sh`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ${HYPRE_CUDA_PATH}/../math_libs/include/cusparse.h" >&5
+printf %s "checking for ${HYPRE_CUDA_PATH}/../math_libs/include/cusparse.h... " >&6; }
+if eval test \${$as_ac_File+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  test "$cross_compiling" = yes &&
+  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+if test -r "${HYPRE_CUDA_PATH}/../math_libs/include/cusparse.h"; then
+  eval "$as_ac_File=yes"
+else
+  eval "$as_ac_File=no"
+fi
+fi
+eval ac_res=\$$as_ac_File
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_File"\" = x"yes"
+then :
+  hypre_found_cusparse=yes; HYPRE_VENDOR_MATH_PATH=$(readlink -f ${HYPRE_CUDA_PATH}/../math_libs); { printf "%s\n" "$as_me:${as_lineno-$LINENO}: setting vendor math path to ${HYPRE_VENDOR_MATH_PATH}" >&5
+printf "%s\n" "$as_me: setting vendor math path to ${HYPRE_VENDOR_MATH_PATH}" >&6;}
 fi
 
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then :
-  :
+   fi
+
+   if test "x$hypre_found_cusparse" != "xyes"
+   then
+      as_ac_File=`printf "%s\n" "ac_cv_file_${HYPRE_CUDA_PATH}/../../math_libs/include/cusparse.h" | $as_tr_sh`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ${HYPRE_CUDA_PATH}/../../math_libs/include/cusparse.h" >&5
+printf %s "checking for ${HYPRE_CUDA_PATH}/../../math_libs/include/cusparse.h... " >&6; }
+if eval test \${$as_ac_File+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  test "$cross_compiling" = yes &&
+  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+if test -r "${HYPRE_CUDA_PATH}/../../math_libs/include/cusparse.h"; then
+  eval "$as_ac_File=yes"
+else
+  eval "$as_ac_File=no"
+fi
+fi
+eval ac_res=\$$as_ac_File
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_File"\" = x"yes"
+then :
+  hypre_found_cusparse=yes; HYPRE_VENDOR_MATH_PATH=$(readlink -f ${HYPRE_CUDA_PATH}/../../math_libs); { printf "%s\n" "$as_me:${as_lineno-$LINENO}: setting vendor math path to ${HYPRE_VENDOR_MATH_PATH}" >&5
+printf "%s\n" "$as_me: setting vendor math path to ${HYPRE_VENDOR_MATH_PATH}" >&6;}
+fi
+
+   fi
+
+   if test "x$hypre_found_cusparse" != "xyes"
+   then
+      as_fn_error $? "unable to find cusparse.h ..." "$LINENO" 5
+   fi
+fi
+
+
+if test "$hypre_using_cublas" = "yes"
+then
+   as_ac_File=`printf "%s\n" "ac_cv_file_${HYPRE_CUDA_PATH}/include/cublas.h" | $as_tr_sh`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ${HYPRE_CUDA_PATH}/include/cublas.h" >&5
+printf %s "checking for ${HYPRE_CUDA_PATH}/include/cublas.h... " >&6; }
+if eval test \${$as_ac_File+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  test "$cross_compiling" = yes &&
+  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+if test -r "${HYPRE_CUDA_PATH}/include/cublas.h"; then
+  eval "$as_ac_File=yes"
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
+  eval "$as_ac_File=no"
+fi
+fi
+eval ac_res=\$$as_ac_File
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_File"\" = x"yes"
+then :
+  hypre_found_cublas=yes; HYPRE_VENDOR_MATH_PATH=${HYPRE_CUDA_PATH}
+fi
 
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
 
+   if test "x$hypre_found_cublas" != "xyes" && test "x${HYPRE_VENDOR_MATH_PATH}" != "x"
+   then
+      as_ac_File=`printf "%s\n" "ac_cv_file_${HYPRE_VENDOR_MATH_PATH}/include/cublas.h" | $as_tr_sh`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ${HYPRE_VENDOR_MATH_PATH}/include/cublas.h" >&5
+printf %s "checking for ${HYPRE_VENDOR_MATH_PATH}/include/cublas.h... " >&6; }
+if eval test \${$as_ac_File+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  test "$cross_compiling" = yes &&
+  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+if test -r "${HYPRE_VENDOR_MATH_PATH}/include/cublas.h"; then
+  eval "$as_ac_File=yes"
 else
-  ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  eval "$as_ac_File=no"
 fi
-
 fi
+eval ac_res=\$$as_ac_File
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_File"\" = x"yes"
+then :
+  hypre_found_cublas=yes;
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
 
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+   fi
 
+   if test "x$hypre_found_cublas" != "xyes"
+   then
+      as_ac_File=`printf "%s\n" "ac_cv_file_${HYPRE_CUDA_PATH}/../math_libs/include/cublas.h" | $as_tr_sh`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ${HYPRE_CUDA_PATH}/../math_libs/include/cublas.h" >&5
+printf %s "checking for ${HYPRE_CUDA_PATH}/../math_libs/include/cublas.h... " >&6; }
+if eval test \${$as_ac_File+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  test "$cross_compiling" = yes &&
+  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+if test -r "${HYPRE_CUDA_PATH}/../math_libs/include/cublas.h"; then
+  eval "$as_ac_File=yes"
+else
+  eval "$as_ac_File=no"
+fi
+fi
+eval ac_res=\$$as_ac_File
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_File"\" = x"yes"
+then :
+  hypre_found_cublas=yes; HYPRE_VENDOR_MATH_PATH=$(readlink -f ${HYPRE_CUDA_PATH}/../math_libs); { printf "%s\n" "$as_me:${as_lineno-$LINENO}: setting vendor math path to ${HYPRE_VENDOR_MATH_PATH}" >&5
+printf "%s\n" "$as_me: setting vendor math path to ${HYPRE_VENDOR_MATH_PATH}" >&6;}
 fi
 
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
+   fi
 
+   if test "x$hypre_found_cublas" != "xyes"
+   then
+      as_ac_File=`printf "%s\n" "ac_cv_file_${HYPRE_CUDA_PATH}/../../math_libs/include/cublas.h" | $as_tr_sh`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ${HYPRE_CUDA_PATH}/../../math_libs/include/cublas.h" >&5
+printf %s "checking for ${HYPRE_CUDA_PATH}/../../math_libs/include/cublas.h... " >&6; }
+if eval test \${$as_ac_File+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  test "$cross_compiling" = yes &&
+  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+if test -r "${HYPRE_CUDA_PATH}/../../math_libs/include/cublas.h"; then
+  eval "$as_ac_File=yes"
+else
+  eval "$as_ac_File=no"
+fi
+fi
+eval ac_res=\$$as_ac_File
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_File"\" = x"yes"
+then :
+  hypre_found_cublas=yes; HYPRE_VENDOR_MATH_PATH=$(readlink -f ${HYPRE_CUDA_PATH}/../../math_libs); { printf "%s\n" "$as_me:${as_lineno-$LINENO}: setting vendor math path to ${HYPRE_VENDOR_MATH_PATH}" >&5
+printf "%s\n" "$as_me: setting vendor math path to ${HYPRE_VENDOR_MATH_PATH}" >&6;}
 fi
 
-done
+   fi
+
+   if test "x$hypre_found_cublas" != "xyes"
+   then
+      as_fn_error $? "unable to find cublas.h ..." "$LINENO" 5
+   fi
+fi
 
 
-for ac_header in "${CUDA_HOME}/include/cuda.h"
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
- hypre_found_cuda=yes; HYPRE_CUDA_PATH=${CUDA_HOME}
+if test "$hypre_using_cusolver" = "yes"
+then
+   as_ac_File=`printf "%s\n" "ac_cv_file_${HYPRE_CUDA_PATH}/include/cusolverDn.h" | $as_tr_sh`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ${HYPRE_CUDA_PATH}/include/cusolverDn.h" >&5
+printf %s "checking for ${HYPRE_CUDA_PATH}/include/cusolverDn.h... " >&6; }
+if eval test \${$as_ac_File+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  test "$cross_compiling" = yes &&
+  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+if test -r "${HYPRE_CUDA_PATH}/include/cusolverDn.h"; then
+  eval "$as_ac_File=yes"
+else
+  eval "$as_ac_File=no"
+fi
+fi
+eval ac_res=\$$as_ac_File
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_File"\" = x"yes"
+then :
+  hypre_found_cusolver=yes; HYPRE_VENDOR_MATH_PATH=${HYPRE_CUDA_PATH}
 fi
 
-done
 
+   if test "x$hypre_found_cusolver" != "xyes" && test "x${HYPRE_VENDOR_MATH_PATH}" != "x"
+   then
+      as_ac_File=`printf "%s\n" "ac_cv_file_${HYPRE_VENDOR_MATH_PATH}/include/cusolverDn.h" | $as_tr_sh`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ${HYPRE_VENDOR_MATH_PATH}/include/cusolverDn.h" >&5
+printf %s "checking for ${HYPRE_VENDOR_MATH_PATH}/include/cusolverDn.h... " >&6; }
+if eval test \${$as_ac_File+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  test "$cross_compiling" = yes &&
+  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+if test -r "${HYPRE_VENDOR_MATH_PATH}/include/cusolverDn.h"; then
+  eval "$as_ac_File=yes"
+else
+  eval "$as_ac_File=no"
+fi
+fi
+eval ac_res=\$$as_ac_File
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_File"\" = x"yes"
+then :
+  hypre_found_cusolver=yes;
+fi
+
+   fi
 
-   if test "x$hypre_found_cuda" != "xyes"
+   if test "x$hypre_found_cusolver" != "xyes"
    then
-      for ac_header in "${CUDA_PATH}/include/cuda.h"
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
- hypre_found_cuda=yes; HYPRE_CUDA_PATH=${CUDA_PATH}
+      as_ac_File=`printf "%s\n" "ac_cv_file_${HYPRE_CUDA_PATH}/../math_libs/include/cusolverDn.h" | $as_tr_sh`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ${HYPRE_CUDA_PATH}/../math_libs/include/cusolverDn.h" >&5
+printf %s "checking for ${HYPRE_CUDA_PATH}/../math_libs/include/cusolverDn.h... " >&6; }
+if eval test \${$as_ac_File+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  test "$cross_compiling" = yes &&
+  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+if test -r "${HYPRE_CUDA_PATH}/../math_libs/include/cusolverDn.h"; then
+  eval "$as_ac_File=yes"
+else
+  eval "$as_ac_File=no"
+fi
+fi
+eval ac_res=\$$as_ac_File
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_File"\" = x"yes"
+then :
+  hypre_found_cusolver=yes; HYPRE_VENDOR_MATH_PATH=$(readlink -f ${HYPRE_CUDA_PATH}/../math_libs); { printf "%s\n" "$as_me:${as_lineno-$LINENO}: setting vendor math path to ${HYPRE_VENDOR_MATH_PATH}" >&5
+printf "%s\n" "$as_me: setting vendor math path to ${HYPRE_VENDOR_MATH_PATH}" >&6;}
 fi
 
-done
+   fi
+
+   if test "x$hypre_found_cusolver" != "xyes"
+   then
+      as_ac_File=`printf "%s\n" "ac_cv_file_${HYPRE_CUDA_PATH}/../../math_libs/include/cusolverDn.h" | $as_tr_sh`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ${HYPRE_CUDA_PATH}/../../math_libs/include/cusolverDn.h" >&5
+printf %s "checking for ${HYPRE_CUDA_PATH}/../../math_libs/include/cusolverDn.h... " >&6; }
+if eval test \${$as_ac_File+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  test "$cross_compiling" = yes &&
+  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+if test -r "${HYPRE_CUDA_PATH}/../../math_libs/include/cusolverDn.h"; then
+  eval "$as_ac_File=yes"
+else
+  eval "$as_ac_File=no"
+fi
+fi
+eval ac_res=\$$as_ac_File
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_File"\" = x"yes"
+then :
+  hypre_found_cusolver=yes; HYPRE_VENDOR_MATH_PATH=$(readlink -f ${HYPRE_CUDA_PATH}/../../math_libs); { printf "%s\n" "$as_me:${as_lineno-$LINENO}: setting vendor math path to ${HYPRE_VENDOR_MATH_PATH}" >&5
+printf "%s\n" "$as_me: setting vendor math path to ${HYPRE_VENDOR_MATH_PATH}" >&6;}
+fi
 
    fi
 
-   if test "x$hypre_found_cuda" != "xyes"
+   if test "x$hypre_found_cusolver" != "xyes"
    then
-      as_fn_error $? "unable to find cuda.h ... Ensure that CUDA_HOME or CUDA_PATH is set" "$LINENO" 5
+      as_fn_error $? "unable to find cusolverDn.h ..." "$LINENO" 5
    fi
 fi
 
 
-if  test x"$hypre_using_hip" == x"yes" ; then :
-   if  test -n "$ROCM_PATH"; then :
+if  test x"$hypre_using_hip" == x"yes"
+then :
+   if  test -n "$ROCM_PATH"
+then :
    HYPRE_ROCM_PREFIX=$ROCM_PATH
-else
+else $as_nop
    HYPRE_ROCM_PREFIX=/opt/rocm
 fi
 
 
-        for ac_header in "${HYPRE_ROCM_PREFIX}/include/hip/hip_common.h"
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
- hypre_found_hip=yes
-else
+        as_ac_Header=`printf "%s\n" "ac_cv_header_"${HYPRE_ROCM_PREFIX}/include/hip/hip_common.h"" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" ""${HYPRE_ROCM_PREFIX}/include/hip/hip_common.h"" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"
+then :
+  hypre_found_hip=yes
+else $as_nop
   as_fn_error $? "unable to find ${HYPRE_ROCM_PREFIX}/include/hip/hip_common.h ... Ensure ROCm is installed and set ROCM_PATH environment variable to ROCm installation path." "$LINENO" 5
 fi
 
-done
-
 fi
 
-
-
 if test "x$hypre_using_raja" = "xyes"
 then
 
-$as_echo "#define HYPRE_USING_RAJA 1" >>confdefs.h
+printf "%s\n" "#define HYPRE_USING_RAJA 1" >>confdefs.h
 
 
-   if test "$hypre_using_cuda" != "yes"
+   if test "$hypre_user_chose_cxxflags" = "no"
    then
-      if test "$CXX" = "mpixlC" || test "$CXX" = "xlC_r"
+      if test "$hypre_using_cuda" != "yes"
       then
-         CXXFLAGS="${CXXFLAGS} -+ -std=c++11"
+         if test "$CXX" = "mpixlC" || test "$CXX" = "xlC_r"
+         then
+            CXXFLAGS="${CXXFLAGS} -+ -std=c++${hypre_cxxstd}"
+         fi
       fi
    fi
 
@@ -8763,27 +10626,32 @@ fi
 if test "x$hypre_using_kokkos" = "xyes"
 then
 
-$as_echo "#define HYPRE_USING_KOKKOS 1" >>confdefs.h
+printf "%s\n" "#define HYPRE_USING_KOKKOS 1" >>confdefs.h
 
 
-   if test "$hypre_using_cuda" != "yes"
+   if test "$hypre_user_chose_cxxflags" = "no"
    then
-      if test "$CXX" = "mpixlC" || test "$CXX" = "xlC_r"
+      CXXFLAGS="${CXXFLAGS} -std=c++${hypre_cxxstd}"
+
+      if test "$CXX" = "mpiclang++" || test "$CXX" = "mpiclang++-gpu" || test "$CXX" = "clang++" || test "$CXX" = "clang++-gpu" || test "$CXX" = "icpx" || test "$CXX" = "mpiicpx"
+      then
+         CXXFLAGS="${CXXFLAGS} -x c++"
+      fi
+
+      if test "$CXX" = "mpixlC" || test "$CXX" = "mpixlC-gpu" || test "$CXX" = "xlC" || test "$CXX" = "xlC-gpu"
       then
-         CXXFLAGS="${CXXFLAGS} -+ -std=c++11"
+         CXXFLAGS="${CXXFLAGS} -+"
       fi
    fi
 
-      CC=${CXX}
-   LINK_CC=${LINK_CXX}
-   CFLAGS=${CXXFLAGS}
-fi
+         LINK_CC=${LINK_CXX}
+   fi
 
 if test "x$hypre_using_umpire_host" = "xyes"
 then
    hypre_using_umpire=yes
 
-$as_echo "#define HYPRE_USING_UMPIRE_HOST 1" >>confdefs.h
+printf "%s\n" "#define HYPRE_USING_UMPIRE_HOST 1" >>confdefs.h
 
 fi
 
@@ -8791,7 +10659,7 @@ if test "x$hypre_using_umpire_device" = "xyes"
 then
    hypre_using_umpire=yes
 
-$as_echo "#define HYPRE_USING_UMPIRE_DEVICE 1" >>confdefs.h
+printf "%s\n" "#define HYPRE_USING_UMPIRE_DEVICE 1" >>confdefs.h
 
 fi
 
@@ -8799,7 +10667,7 @@ if test "x$hypre_using_umpire_um" = "xyes"
 then
    hypre_using_umpire=yes
 
-$as_echo "#define HYPRE_USING_UMPIRE_UM 1" >>confdefs.h
+printf "%s\n" "#define HYPRE_USING_UMPIRE_UM 1" >>confdefs.h
 
 fi
 
@@ -8807,65 +10675,27 @@ if test "x$hypre_using_umpire_pinned" = "xyes"
 then
    hypre_using_umpire=yes
 
-$as_echo "#define HYPRE_USING_UMPIRE_PINNED 1" >>confdefs.h
+printf "%s\n" "#define HYPRE_USING_UMPIRE_PINNED 1" >>confdefs.h
 
 fi
 
 if test "x$hypre_using_umpire" = "xyes"
 then
 
-$as_echo "#define HYPRE_USING_UMPIRE 1" >>confdefs.h
+printf "%s\n" "#define HYPRE_USING_UMPIRE 1" >>confdefs.h
 
 fi
 
 if test "$hypre_using_cuda" = "yes"
 then
 
-$as_echo "#define HYPRE_USING_GPU 1" >>confdefs.h
-
-
-
-$as_echo "#define HYPRE_USING_CUDA 1" >>confdefs.h
-
-
-
-$as_echo "#define HYPRE_USING_CUSPARSE 1" >>confdefs.h
-
-
-   if test "$hypre_using_gpu_profiling" = "yes"
-   then
-
-$as_echo "#define HYPRE_USING_NVTX 1" >>confdefs.h
-
-   fi
-
-   if test "$hypre_using_cusparse" = "yes"
-   then
-
-$as_echo "#define HYPRE_USING_CUSPARSE 1" >>confdefs.h
-
-   fi
-
-   if test "$hypre_using_device_pool" = "yes"
-   then
-
-$as_echo "#define HYPRE_USING_DEVICE_POOL 1" >>confdefs.h
-
-   fi
-
-   if test "$hypre_using_cublas" = "yes"
-   then
+printf "%s\n" "#define HYPRE_USING_GPU 1" >>confdefs.h
 
-$as_echo "#define HYPRE_USING_CUBLAS 1" >>confdefs.h
 
-   fi
 
-   if test "$hypre_using_curand" = "yes"
-   then
+printf "%s\n" "#define HYPRE_USING_CUDA 1" >>confdefs.h
 
-$as_echo "#define HYPRE_USING_CURAND 1" >>confdefs.h
 
-   fi
 
    LINK_CC=${LINK_CXX}
 
@@ -8881,7 +10711,7 @@ $as_echo "#define HYPRE_USING_CURAND 1" >>confdefs.h
 
    if test "$hypre_user_chose_cuflags" = "no"
    then
-      CUFLAGS="-lineinfo -expt-extended-lambda -std=c++11 --x cu"
+      CUFLAGS="-lineinfo -expt-extended-lambda -std=c++${hypre_cxxstd} --x cu"
       if test "$hypre_using_debug" = "yes"
       then
          CUFLAGS="-g -O0 ${CUFLAGS}"
@@ -8896,34 +10726,93 @@ $as_echo "#define HYPRE_USING_CURAND 1" >>confdefs.h
 
          HYPRE_CUDA_INCLUDE='-I${HYPRE_CUDA_PATH}/include'
    HYPRE_CUDA_LIBS='-L${HYPRE_CUDA_PATH}/lib64 -lcudart'
+
+   if test x"$hypre_using_cusparse" == x"yes" || test x"$hypre_using_cublas" == x"yes" || test x"$hypre_using_cusolver" == x"yes"
+then :
+  if test "x$HYPRE_CUDA_PATH" != "x$HYPRE_VENDOR_MATH_PATH"
+then :
+  HYPRE_CUDA_INCLUDE+=" -I${HYPRE_VENDOR_MATH_PATH}/include"
+           HYPRE_CUDA_LIBS+=" -L${HYPRE_VENDOR_MATH_PATH}/lib64"
+fi
+fi
+
    if test "$hypre_using_gpu_profiling" = "yes"
    then
+
+printf "%s\n" "#define HYPRE_USING_NVTX 1" >>confdefs.h
+
       HYPRE_CUDA_LIBS+=" -lnvToolsExt"
    fi
 
    if test "$hypre_using_cusparse" = "yes"
    then
+
+printf "%s\n" "#define HYPRE_USING_CUSPARSE 1" >>confdefs.h
+
       HYPRE_CUDA_LIBS+=" -lcusparse"
    fi
 
    if test "$hypre_using_cublas" = "yes"
    then
+
+printf "%s\n" "#define HYPRE_USING_CUBLAS 1" >>confdefs.h
+
       HYPRE_CUDA_LIBS+=" -lcublas"
    fi
 
    if test "$hypre_using_curand" = "yes"
    then
+
+printf "%s\n" "#define HYPRE_USING_CURAND 1" >>confdefs.h
+
       HYPRE_CUDA_LIBS+=" -lcurand"
    fi
+
+   if test "$hypre_using_cusolver" = "yes"
+   then
+
+printf "%s\n" "#define HYPRE_USING_CUSOLVER 1" >>confdefs.h
+
+      HYPRE_CUDA_LIBS+=" -lcusolver"
+   fi
+
+   if test "$hypre_using_device_pool" = "yes"
+   then
+
+printf "%s\n" "#define HYPRE_USING_DEVICE_POOL 1" >>confdefs.h
+
+   fi
+
+   if test "$hypre_using_device_malloc_async" = "yes"
+   then
+
+printf "%s\n" "#define HYPRE_USING_DEVICE_MALLOC_ASYNC 1" >>confdefs.h
+
+   fi
+
+   if test "$hypre_using_thrust_nosync" = "yes"
+   then
+
+printf "%s\n" "#define HYPRE_USING_THRUST_NOSYNC 1" >>confdefs.h
+
+   fi
+
+   if test "x$hypre_using_cuda_streams" = "xyes"
+   then
+
+printf "%s\n" "#define HYPRE_USING_CUDA_STREAMS 1" >>confdefs.h
+
+   fi
 fi
 
-if test x"$hypre_using_hip" == x"yes"; then :
+if test x"$hypre_using_hip" == x"yes"
+then :
 
 
-$as_echo "#define HYPRE_USING_GPU 1" >>confdefs.h
+printf "%s\n" "#define HYPRE_USING_GPU 1" >>confdefs.h
 
 
-$as_echo "#define HYPRE_USING_HIP 1" >>confdefs.h
+printf "%s\n" "#define HYPRE_USING_HIP 1" >>confdefs.h
 
 
 
@@ -8932,7 +10821,7 @@ $as_echo "#define HYPRE_USING_HIP 1" >>confdefs.h
 
         if test "x${HYPRE_CUDA_SM}" != "x"
         then
-           HYPRE_CUDA_GENCODE="--amdgpu-target="
+           HYPRE_CUDA_GENCODE="--offload-arch="
            for sm in ${HYPRE_CUDA_SM}; do
               HYPRE_CUDA_GENCODE="${HYPRE_CUDA_GENCODE}${sm},"
            done
@@ -8941,9 +10830,11 @@ $as_echo "#define HYPRE_USING_HIP 1" >>confdefs.h
 
                                         HIPCXXFLAGS="-x hip -std=c++14 ${HIPCXXFLAGS}"
 
-                                if test x"$hypre_using_debug" == x"yes"; then :
-  HIPCXXFLAGS="-O0 -Wall -g -ggdb ${HIPCXXFLAGS}"
-elif HIPCXXFLAGS="-O2 ${HIPCXXFLAGS}"; then :
+                                if test x"$hypre_using_debug" == x"yes"
+then :
+  HIPCXXFLAGS="-O1 -Wall -g -ggdb ${HIPCXXFLAGS}"
+elif HIPCXXFLAGS="-O2 ${HIPCXXFLAGS}"
+then :
 
 fi
 
@@ -8958,183 +10849,270 @@ fi
            CUFLAGS="${HIPCPPFLAGS} ${HIPCXXFLAGS}"
         fi
 
-                        HYPRE_HIP_INCL="-I${HYPRE_ROCM_PREFIX}/rocthrust/include"
-        HYPRE_HIP_INCL="${HYPRE_HIP_INCL} -I${HYPRE_ROCM_PREFIX}/rocprim/include"
+                                HYPRE_HIP_INCL="-I${HYPRE_ROCM_PREFIX}/include"
 
                 HYPRE_HIP_LIBS="-L${HYPRE_ROCM_PREFIX}/lib -lamdhip64"
 
-                if test x"$hypre_using_rocsparse" == x"yes"; then :
+                if test x"$hypre_using_rocsparse" == x"yes"
+then :
+
+printf "%s\n" "#define HYPRE_USING_ROCSPARSE 1" >>confdefs.h
+
+               HYPRE_HIP_LIBS+=" -lrocsparse"
+
+fi
+
+                if test x"$hypre_using_rocblas" == x"yes"
+then :
+
+printf "%s\n" "#define HYPRE_USING_ROCBLAS 1" >>confdefs.h
+
+               HYPRE_HIP_LIBS+=" -lrocblas"
+
+fi
+
+                if test x"$hypre_using_rocsolver" == x"yes"
+then :
+
+printf "%s\n" "#define HYPRE_USING_ROCSOLVER 1" >>confdefs.h
+
+               HYPRE_HIP_LIBS+=" -lrocsolver"
+
+fi
+
+                if test x"$hypre_using_rocrand" == x"yes"
+then :
+
+printf "%s\n" "#define HYPRE_USING_ROCRAND 1" >>confdefs.h
+
+               HYPRE_HIP_LIBS+=" -lrocrand"
+
+fi
 
-$as_echo "#define HYPRE_USING_ROCSPARSE 1" >>confdefs.h
+                if test x"$hypre_using_gpu_profiling" == x"yes"
+then :
 
-               HYPRE_HIP_LIBS="${HYPRE_HIP_LIBS} -lrocsparse"
-               HYPRE_HIP_INCL="${HYPRE_HIP_INCL} -I${HYPRE_ROCM_PREFIX}/rocsparse/include"
+printf "%s\n" "#define HYPRE_USING_ROCTX 1" >>confdefs.h
+
+               HYPRE_HIP_LIBS+=" -lroctx64"
 
 fi
 
-                                if test x"$hypre_using_rocblas" == x"yes"; then :
+        if test x"$hypre_using_cuda_streams" == x"yes"
+then :
+
+printf "%s\n" "#define HYPRE_USING_CUDA_STREAMS 1" >>confdefs.h
 
-$as_echo "#define HYPRE_USING_ROCBLAS 1" >>confdefs.h
 
-              HYPRE_HIP_INCL="${HYPRE_HIP_INCL} -I${HYPRE_ROCM_PREFIX}/rocblas/include"
+fi
+
 
 fi
 
-                if test x"$hypre_using_rocrand" == x"yes"; then :
+if test x"$hypre_using_sycl" == x"yes"
+then :
+
+
+printf "%s\n" "#define HYPRE_USING_GPU 1" >>confdefs.h
+
+
+printf "%s\n" "#define HYPRE_USING_SYCL 1" >>confdefs.h
+
+
+                LINK_CC=${CUCC}
+        LINK_CXX=${CUCC}
+
+        SYCLFLAGS="-fsycl -fsycl-unnamed-lambda"
+        if test "$hypre_using_debug" = "yes"
+        then
+                      SYCLFLAGS="-Wall ${SYCLFLAGS}"
+        else
+           SYCLFLAGS="-O3 ${SYCLFLAGS}"
+        fi
+        LDFLAGS+=" -fsycl -fsycl-device-code-split=per_kernel -Wl,--no-relax"
+
+                if test "x${HYPRE_SYCL_TARGET}" != "x"
+        then
+           LDFLAGS+=" -fsycl-targets=${HYPRE_SYCL_TARGET}"
+        fi
+        if test "x${HYPRE_SYCL_TARGET_BACKEND}" != "x"
+        then
+           LDFLAGS+=" -Xsycl-target-backend ${HYPRE_SYCL_TARGET_BACKEND}"
+        fi
+
+                if test "$hypre_using_shared" = "yes"
+        then
+           SYCLFLAGS="${SHARED_COMPILE_FLAG} ${SYCLFLAGS}"
+           BUILD_CC_SHARED="\${CUCC} ${SHARED_BUILD_FLAG}"
+        fi
+
+                if test "$hypre_user_chose_cuflags" = "no"
+        then
+           CUFLAGS="${SYCLFLAGS}"
+        fi
 
-$as_echo "#define HYPRE_USING_ROCRAND 1" >>confdefs.h
+        if test x"$hypre_using_onemklsparse" == x"yes" || test x"$hypre_using_onemklblas" == x"yes" || test x"$hypre_using_onemklrand" == x"yes"
+then :
+  as_ac_Header=`printf "%s\n" "ac_cv_header_"${MKLROOT}/include/mkl.h"" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" ""${MKLROOT}/include/mkl.h"" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"
+then :
+  hypre_found_mkl=yes
+else $as_nop
+  as_fn_error $? "unable to find oneMKL ... Ensure that MKLROOT is set" "$LINENO" 5
+fi
 
-               HYPRE_HIP_LIBS="${HYPRE_HIP_LIBS} -lrocrand"
-               HYPRE_HIP_INCL="${HYPRE_HIP_INCL} -I${HYPRE_ROCM_PREFIX}/rocrand/include"
+               HYPRE_SYCL_LIBS="${HYPRE_SYCL_LIBS} -qmkl -Wl,-export-dynamic -Wl,--start-group -Wl,--end-group -lsycl -lOpenCL -lpthread -lm -ldl"
+               HYPRE_SYCL_INCL="${HYPRE_SYCL_INCL} -qmkl -I${DPLROOT}/include -DMKL_ILP64 -I${MKLROOT}/include"
 
 fi
 
-                if test x"$hypre_using_gpu_profiling" == x"yes"; then :
+        if test x"$hypre_using_onemklsparse" == x"yes"
+then :
+
+printf "%s\n" "#define HYPRE_USING_ONEMKLSPARSE 1" >>confdefs.h
+
+fi
 
-$as_echo "#define HYPRE_USING_ROCTX 1" >>confdefs.h
+        if test x"$hypre_using_onemklblas" == x"yes"
+then :
 
-               HYPRE_HIP_INCL="${HYPRE_HIP_INCL} -I${HYPRE_ROCM_PREFIX}/roctracer/include"
-               HYPRE_HIP_LIBS="${HYPRE_HIP_LIBS} -lroctx64"
+printf "%s\n" "#define HYPRE_USING_ONEMKLBLAS 1" >>confdefs.h
 
 fi
 
+        if test x"$hypre_using_onemklrand" == x"yes"
+then :
+
+printf "%s\n" "#define HYPRE_USING_ONEMKLRAND 1" >>confdefs.h
 
 fi
 
 
+printf "%s\n" "#define HYPRE_USING_CUDA_STREAMS 1" >>confdefs.h
+
+
+
+fi
 
 if test "$hypre_using_um" != "yes"
 then
       if test "$hypre_using_cuda" = "yes"
    then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: ***********************************************************************" >&5
-$as_echo "$as_me: ***********************************************************************" >&6;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Configuring with --with-cuda=yes without unified memory." >&5
-$as_echo "$as_me: Configuring with --with-cuda=yes without unified memory." >&6;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: It only works for structured solvers and selected unstructured solvers" >&5
-$as_echo "$as_me: It only works for structured solvers and selected unstructured solvers" >&6;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Use --enable-unified-memory to compile with unified memory." >&5
-$as_echo "$as_me: Use --enable-unified-memory to compile with unified memory." >&6;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: ***********************************************************************" >&5
-$as_echo "$as_me: ***********************************************************************" >&6;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: ***********************************************************************" >&5
+printf "%s\n" "$as_me: ***********************************************************************" >&6;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Configuring with --with-cuda=yes without unified memory." >&5
+printf "%s\n" "$as_me: Configuring with --with-cuda=yes without unified memory." >&6;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: It only works for structured solvers and selected unstructured solvers" >&5
+printf "%s\n" "$as_me: It only works for structured solvers and selected unstructured solvers" >&6;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Use --enable-unified-memory to compile with unified memory." >&5
+printf "%s\n" "$as_me: Use --enable-unified-memory to compile with unified memory." >&6;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: ***********************************************************************" >&5
+printf "%s\n" "$as_me: ***********************************************************************" >&6;}
    fi
    if test "$hypre_using_hip" = "yes"
    then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: ***********************************************************************" >&5
-$as_echo "$as_me: ***********************************************************************" >&6;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Configuring with --with-hip=yes without unified memory." >&5
-$as_echo "$as_me: Configuring with --with-hip=yes without unified memory." >&6;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: It only works for structured solvers and selected unstructured solvers" >&5
-$as_echo "$as_me: It only works for structured solvers and selected unstructured solvers" >&6;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Use --enable-unified-memory to compile with unified memory." >&5
-$as_echo "$as_me: Use --enable-unified-memory to compile with unified memory." >&6;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: ***********************************************************************" >&5
-$as_echo "$as_me: ***********************************************************************" >&6;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: ***********************************************************************" >&5
+printf "%s\n" "$as_me: ***********************************************************************" >&6;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Configuring with --with-hip=yes without unified memory." >&5
+printf "%s\n" "$as_me: Configuring with --with-hip=yes without unified memory." >&6;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: It only works for structured solvers and selected unstructured solvers" >&5
+printf "%s\n" "$as_me: It only works for structured solvers and selected unstructured solvers" >&6;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Use --enable-unified-memory to compile with unified memory." >&5
+printf "%s\n" "$as_me: Use --enable-unified-memory to compile with unified memory." >&6;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: ***********************************************************************" >&5
+printf "%s\n" "$as_me: ***********************************************************************" >&6;}
+   fi
+   if test "$hypre_using_sycl" = "yes"
+   then
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: ***********************************************************" >&5
+printf "%s\n" "$as_me: ***********************************************************" >&6;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Configuring with --with-sycl=yes without unified memory." >&5
+printf "%s\n" "$as_me: Configuring with --with-sycl=yes without unified memory." >&6;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: It only works for struct interface." >&5
+printf "%s\n" "$as_me: It only works for struct interface." >&6;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Use --enable-unified-memory to compile with unified memory." >&5
+printf "%s\n" "$as_me: Use --enable-unified-memory to compile with unified memory." >&6;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: ***********************************************************" >&5
+printf "%s\n" "$as_me: ***********************************************************" >&6;}
    fi
    if test "$hypre_using_device_openmp" = "yes"
    then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: ***********************************************************************" >&5
-$as_echo "$as_me: ***********************************************************************" >&6;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Configuring with --with-device-openmp=yes without unified memory." >&5
-$as_echo "$as_me: Configuring with --with-device-openmp=yes without unified memory." >&6;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: It only works for structured solvers and selected unstructured solvers" >&5
-$as_echo "$as_me: It only works for structured solvers and selected unstructured solvers" >&6;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Use --enable-unified-memory to compile with unified memory." >&5
-$as_echo "$as_me: Use --enable-unified-memory to compile with unified memory." >&6;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: ***********************************************************************" >&5
-$as_echo "$as_me: ***********************************************************************" >&6;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: ***********************************************************************" >&5
+printf "%s\n" "$as_me: ***********************************************************************" >&6;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Configuring with --with-device-openmp=yes without unified memory." >&5
+printf "%s\n" "$as_me: Configuring with --with-device-openmp=yes without unified memory." >&6;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: It only works for structured solvers and selected unstructured solvers" >&5
+printf "%s\n" "$as_me: It only works for structured solvers and selected unstructured solvers" >&6;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Use --enable-unified-memory to compile with unified memory." >&5
+printf "%s\n" "$as_me: Use --enable-unified-memory to compile with unified memory." >&6;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: ***********************************************************************" >&5
+printf "%s\n" "$as_me: ***********************************************************************" >&6;}
    fi
 fi
 
 if test "$hypre_using_openmp" = "yes"
 then
 
-$as_echo "#define HYPRE_USING_OPENMP 1" >>confdefs.h
+printf "%s\n" "#define HYPRE_USING_OPENMP 1" >>confdefs.h
 
 fi
 
 if test "$hypre_using_device_openmp" = "yes"
 then
 
-$as_echo "#define HYPRE_USING_CUSPARSE 1" >>confdefs.h
-
-
-   if test "$hypre_using_gpu_profiling" = "yes"
-   then
-
-$as_echo "#define HYPRE_USING_NVTX 1" >>confdefs.h
-
-   fi
-
-
-$as_echo "#define HYPRE_USING_DEVICE_OPENMP 1" >>confdefs.h
+printf "%s\n" "#define HYPRE_USING_DEVICE_OPENMP 1" >>confdefs.h
 
 
 
-$as_echo "#define HYPRE_USING_GPU 1" >>confdefs.h
-
-
-
-$as_echo "#define HYPRE_DEVICE_OPENMP_ALLOC 1" >>confdefs.h
+printf "%s\n" "#define HYPRE_DEVICE_OPENMP_ALLOC 1" >>confdefs.h
 
 
 
    if test "$hypre_user_chose_cuflags" = "no"
    then
-      CUFLAGS=${CFLAGS}
-
-      if test "$CUCC" = "clang-gpu" || test "$CUCC" = "mpiclang-gpu"
+      CUFLAGS="${CXXFLAGS} ${CUFLAGS}"
+                     # dnl this is too old
+         #CUFLAGS+=" -fopenmp-nonaliased-maps"
+            if test "$CUCC" = "icx" || test "$CUCC" = "icpx" || test "$CUCC" = "mpiicx" || test "$CUCC" = "mpiicpx"
       then
-         CUFLAGS+=" -fopenmp-nonaliased-maps"
+         CUFLAGS+="-qopenmp -fopenmp-targets=spir64"
       fi
-      if test "$CUCC" = "clang++-gpu" || test "$CUCC" = "mpiclang++-gpu"
+   fi
+
+   if test "$hypre_user_chose_ldflags" = "no"
+   then
+      if test "$CUCC" = "icx" || test "$CUCC" = "icpx" || test "$CUCC" = "mpiicx" || test "$CUCC" = "mpiicpx"
       then
-         CUFLAGS+=" -fopenmp-nonaliased-maps"
+         LDFLAGS+="-qopenmp -fopenmp-targets=spir64"
       fi
    fi
 
    if test "$hypre_using_debug" = "yes"
    then
 
-$as_echo "#define HYPRE_DEVICE_OPENMP_CHECK 1" >>confdefs.h
-
-   fi
+printf "%s\n" "#define HYPRE_DEVICE_OPENMP_CHECK 1" >>confdefs.h
 
-   HYPRE_CUDA_INCLUDE='-I${HYPRE_CUDA_PATH}/include'
-   HYPRE_CUDA_LIBS='-L${HYPRE_CUDA_PATH}/lib64 -lcudart -lcusparse -lcurand'
-   if test "$hypre_using_gpu_profiling" = "yes"
-   then
-      HYPRE_CUDA_LIBS+=" -lnvToolsExt"
    fi
 
          LINK_CC='${CUCC}'
    LINK_CXX='${CUCC}'
       fi
 
-if test "x$hypre_using_cuda" = "xyes" || test "x$hypre_using_device_openmp" = "xyes"
-then
-   if test "x$hypre_using_cuda_streams" = "xyes"]
-   then
-
-$as_echo "#define HYPRE_USING_CUDA_STREAMS 1" >>confdefs.h
-
-   fi
-fi
-
 if test "x$hypre_using_um" = "xyes"
 then
 
-$as_echo "#define HYPRE_USING_UNIFIED_MEMORY 1" >>confdefs.h
+printf "%s\n" "#define HYPRE_USING_UNIFIED_MEMORY 1" >>confdefs.h
 
 else
-   if test "x$hypre_using_cuda" = "xyes" || test "x$hypre_using_device_openmp" = "xyes" || test "x$hypre_using_hip" = "xyes"
+   if test "x$hypre_using_cuda" = "xyes" || test "x$hypre_using_device_openmp" = "xyes" || test "x$hypre_using_hip" = "xyes" || test "x$hypre_using_sycl" = "xyes"
    then
 
-$as_echo "#define HYPRE_USING_DEVICE_MEMORY 1" >>confdefs.h
+printf "%s\n" "#define HYPRE_USING_DEVICE_MEMORY 1" >>confdefs.h
 
    else
 
-$as_echo "#define HYPRE_USING_HOST_MEMORY 1" >>confdefs.h
+printf "%s\n" "#define HYPRE_USING_HOST_MEMORY 1" >>confdefs.h
 
    fi
 fi
@@ -9142,10 +11120,12 @@ fi
 if test "$hypre_gpu_mpi" = "yes"
 then
 
-$as_echo "#define HYPRE_WITH_GPU_AWARE_MPI 1" >>confdefs.h
+printf "%s\n" "#define HYPRE_USING_GPU_AWARE_MPI 1" >>confdefs.h
 
 fi
 
+CUFLAGS="${CUFLAGS} ${EXTRA_CUFLAGS}"
+
 HYPRE_INSTALLDIR="${prefix}"
 HYPRE_LIBINSTALL="${libdir}"
 HYPRE_INCINSTALL="${includedir}"
@@ -9154,23 +11134,23 @@ HYPRE_INCINSTALL="${includedir}"
    if test $host_alias = $build_alias
    then
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking the hostname" >&5
-$as_echo_n "checking the hostname... " >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the hostname" >&5
+printf %s "checking the hostname... " >&6; }
       hypre_hostname=hostname
       HOSTNAME="`$hypre_hostname`"
 
             if test -z "$HOSTNAME"
       then
          HOSTNAME=unknown
-         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: hostname is unknown" >&5
-$as_echo "$as_me: WARNING: hostname is unknown" >&2;}
+         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: hostname is unknown" >&5
+printf "%s\n" "$as_me: WARNING: hostname is unknown" >&2;}
       else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HOSTNAME" >&5
-$as_echo "$HOSTNAME" >&6; }
+         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $HOSTNAME" >&5
+printf "%s\n" "$HOSTNAME" >&6; }
       fi
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking the architecture" >&5
-$as_echo_n "checking the architecture... " >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the architecture" >&5
+printf %s "checking the architecture... " >&6; }
 
                   if test -z "$ARCH"; then
 
@@ -9184,8 +11164,8 @@ $as_echo_n "checking the architecture... " >&6; }
          done
 
                            if test -z "$hypre_tarch_dir"; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot find tarch" >&5
-$as_echo "$as_me: WARNING: cannot find tarch" >&2;}
+            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cannot find tarch" >&5
+printf "%s\n" "$as_me: WARNING: cannot find tarch" >&2;}
             HYPRE_ARCH=$HOSTTYPE
          else
             HYPRE_ARCH="`$hypre_tarch`"
@@ -9197,16 +11177,16 @@ $as_echo "$as_me: WARNING: cannot find tarch" >&2;}
 
                   if test -z "$HYPRE_ARCH"; then
             HYPRE_ARCH=unknown
-            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: architecture is unknown" >&5
-$as_echo "$as_me: WARNING: architecture is unknown" >&2;}
+            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: architecture is unknown" >&5
+printf "%s\n" "$as_me: WARNING: architecture is unknown" >&2;}
          else
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HYPRE_ARCH" >&5
-$as_echo "$HYPRE_ARCH" >&6; }
+            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $HYPRE_ARCH" >&5
+printf "%s\n" "$HYPRE_ARCH" >&6; }
          fi
       else
          HYPRE_ARCH=$ARCH
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HYPRE_ARCH" >&5
-$as_echo "$HYPRE_ARCH" >&6; }
+         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $HYPRE_ARCH" >&5
+printf "%s\n" "$HYPRE_ARCH" >&6; }
       fi
 
    else
@@ -9216,27 +11196,27 @@ $as_echo "$HYPRE_ARCH" >&6; }
    case $HYPRE_ARCH in
       alpha)
 
-$as_echo "#define HYPRE_ALPHA 1" >>confdefs.h
+printf "%s\n" "#define HYPRE_ALPHA 1" >>confdefs.h
 
          ;;
       sun* | solaris*)
 
-$as_echo "#define HYPRE_SOLARIS 1" >>confdefs.h
+printf "%s\n" "#define HYPRE_SOLARIS 1" >>confdefs.h
 
          ;;
       hp* | HP*)
 
-$as_echo "#define HYPRE_HPPA 1" >>confdefs.h
+printf "%s\n" "#define HYPRE_HPPA 1" >>confdefs.h
 
          ;;
       rs6000 | RS6000 | *bgl* | *BGL* | ppc64*)
 
-$as_echo "#define HYPRE_RS6000 1" >>confdefs.h
+printf "%s\n" "#define HYPRE_RS6000 1" >>confdefs.h
 
          ;;
       IRIX64)
 
-$as_echo "#define HYPRE_IRIX64 1" >>confdefs.h
+printf "%s\n" "#define HYPRE_IRIX64 1" >>confdefs.h
 
          ;;
       Linux | linux | LINUX)
@@ -9246,18 +11226,18 @@ $as_echo "#define HYPRE_IRIX64 1" >>confdefs.h
             case $systemtype in
                chaos*)
 
-$as_echo "#define HYPRE_LINUX_CHAOS 1" >>confdefs.h
+printf "%s\n" "#define HYPRE_LINUX_CHAOS 1" >>confdefs.h
 
                   ;;
                *)
 
-$as_echo "#define HYPRE_LINUX 1" >>confdefs.h
+printf "%s\n" "#define HYPRE_LINUX 1" >>confdefs.h
 
                   ;;
             esac
          else
 
-$as_echo "#define HYPRE_LINUX 1" >>confdefs.h
+printf "%s\n" "#define HYPRE_LINUX 1" >>confdefs.h
 
          fi
          ;;
@@ -9355,6 +11335,13 @@ $as_echo "#define HYPRE_LINUX 1" >>confdefs.h
 
 
 
+
+
+
+
+
+
+
 
 
 
@@ -9393,8 +11380,8 @@ _ACEOF
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
@@ -9424,15 +11411,15 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
      /^ac_cv_env_/b end
      t clear
      :clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     s/^\([^=]*\)=\(.*[{}].*\)$/test ${\1+y} || &/
      t end
      s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
      :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     if test "x$cache_file" != "x/dev/null"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+printf "%s\n" "$as_me: updating cache $cache_file" >&6;}
       if test ! -f "$cache_file" || test -h "$cache_file"; then
 	cat confcache >"$cache_file"
       else
@@ -9446,8 +11433,8 @@ $as_echo "$as_me: updating cache $cache_file" >&6;}
       fi
     fi
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -9464,7 +11451,7 @@ U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+  ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
   as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -9480,8 +11467,8 @@ LTLIBOBJS=$ac_ltlibobjs
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;}
 as_write_fail=0
 cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
 #! $SHELL
@@ -9504,14 +11491,16 @@ cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+as_nop=:
+if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
+then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
-else
+else $as_nop
   case `(set -o) 2>/dev/null` in #(
   *posix*) :
     set -o posix ;; #(
@@ -9521,46 +11510,46 @@ esac
 fi
 
 
+
+# Reset variables that may have inherited troublesome values from
+# the environment.
+
+# IFS needs to be set, to space, tab, and newline, in precisely that order.
+# (If _AS_PATH_WALK were called with IFS unset, it would have the
+# side effect of setting IFS to empty, thus disabling word splitting.)
+# Quoting is to prevent editors from complaining about space-tab.
 as_nl='
 '
 export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
+IFS=" ""	$as_nl"
+
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# Ensure predictable behavior from utilities with locale-dependent output.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# We cannot yet rely on "unset" to work, but we need these variables
+# to be unset--not just set to an empty or harmless value--now, to
+# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh).  This construct
+# also avoids known problems related to "unset" and subshell syntax
+# in other old shells (e.g. bash 2.01 and pdksh 5.2.14).
+for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH
+do eval test \${$as_var+y} \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+
+# Ensure that fds 0, 1, and 2 are open.
+if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi
+if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi
+if (exec 3>&2)            ; then :; else exec 2>/dev/null; fi
 
 # The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
+if ${PATH_SEPARATOR+false} :; then
   PATH_SEPARATOR=:
   (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
     (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
@@ -9569,13 +11558,6 @@ if test "${PATH_SEPARATOR+set}" != set; then
 fi
 
 
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
 # Find who we are.  Look in the path if we contain no directory separator.
 as_myself=
 case $0 in #((
@@ -9584,8 +11566,12 @@ case $0 in #((
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    test -r "$as_dir$0" && as_myself=$as_dir$0 && break
   done
 IFS=$as_save_IFS
 
@@ -9597,30 +11583,10 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   exit 1
 fi
 
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 
 # as_fn_error STATUS ERROR [LINENO LOG_FD]
@@ -9633,13 +11599,14 @@ as_fn_error ()
   as_status=$1; test $as_status -eq 0 && as_status=1
   if test "$4"; then
     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  $as_echo "$as_me: error: $2" >&2
+  printf "%s\n" "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
 
+
 # as_fn_set_status STATUS
 # -----------------------
 # Set $? to STATUS, without forking.
@@ -9666,18 +11633,20 @@ as_fn_unset ()
   { eval $1=; unset $1;}
 }
 as_unset=as_fn_unset
+
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
 # advantage of any shell optimizations that allow amortized linear growth over
 # repeated appends, instead of the typical quadratic growth present in naive
 # implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null
+then :
   eval 'as_fn_append ()
   {
     eval $1+=\$2
   }'
-else
+else $as_nop
   as_fn_append ()
   {
     eval $1=\$$1\$2
@@ -9689,12 +11658,13 @@ fi # as_fn_append
 # Perform arithmetic evaluation on the ARGs, and store the result in the
 # global $as_val. Take advantage of shells that can avoid forks. The arguments
 # must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null
+then :
   eval 'as_fn_arith ()
   {
     as_val=$(( $* ))
   }'
-else
+else $as_nop
   as_fn_arith ()
   {
     as_val=`expr "$@" || test $? -eq 1`
@@ -9725,7 +11695,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
+printf "%s\n" X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -9747,6 +11717,10 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
+
+# Determine whether it's possible to make 'echo' print without a newline.
+# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
+# for compatibility with existing Makefiles.
 ECHO_C= ECHO_N= ECHO_T=
 case `echo -n x` in #(((((
 -n*)
@@ -9760,6 +11734,12 @@ case `echo -n x` in #(((((
   ECHO_N='-n';;
 esac
 
+# For backward compatibility with old third-party macros, we provide
+# the shell variables $as_echo and $as_echo_n.  New code should use
+# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively.
+as_echo='printf %s\n'
+as_echo_n='printf %s'
+
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
@@ -9801,7 +11781,7 @@ as_fn_mkdir_p ()
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -9810,7 +11790,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
+printf "%s\n" X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -9872,8 +11852,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by hypre $as_me 2.22.1, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
+This file was extended by hypre $as_me 2.33.0, which was
+generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -9931,14 +11911,16 @@ $config_headers
 Report bugs to the package provider."
 
 _ACEOF
+ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"`
+ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"`
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-hypre config.status 2.22.1
-configured by $0, generated by GNU Autoconf 2.69,
+hypre config.status 2.33.0
+configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2021 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -9975,15 +11957,15 @@ do
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    $as_echo "$ac_cs_version"; exit ;;
+    printf "%s\n" "$ac_cs_version"; exit ;;
   --config | --confi | --conf | --con | --co | --c )
-    $as_echo "$ac_cs_config"; exit ;;
+    printf "%s\n" "$ac_cs_config"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
     case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
@@ -9991,7 +11973,7 @@ do
   --header | --heade | --head | --hea )
     $ac_shift
     case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     as_fn_append CONFIG_HEADERS " '$ac_optarg'"
     ac_need_defaults=false;;
@@ -10000,7 +11982,7 @@ do
     as_fn_error $? "ambiguous option: \`$1'
 Try \`$0 --help' for more information.";;
   --help | --hel | -h )
-    $as_echo "$ac_cs_usage"; exit ;;
+    printf "%s\n" "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
@@ -10028,7 +12010,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
   set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
-  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
   export CONFIG_SHELL
   exec "\$@"
@@ -10042,7 +12024,7 @@ exec 5>>config.log
   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 ## Running $as_me. ##
 _ASBOX
-  $as_echo "$ac_log"
+  printf "%s\n" "$ac_log"
 } >&5
 
 _ACEOF
@@ -10068,8 +12050,8 @@ done
 # We use the long form for the default assignment because of an extremely
 # bizarre bug on SunOS 4.1.3.
 if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
+  test ${CONFIG_FILES+y} || CONFIG_FILES=$config_files
+  test ${CONFIG_HEADERS+y} || CONFIG_HEADERS=$config_headers
 fi
 
 # Have a temporary directory for convenience.  Make it in the build tree
@@ -10405,7 +12387,7 @@ do
 	   esac ||
 	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
-      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
     done
 
@@ -10413,17 +12395,17 @@ do
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
     configure_input='Generated from '`
-	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	  printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
 	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+printf "%s\n" "$as_me: creating $ac_file" >&6;}
     fi
     # Neutralize special characters interpreted by sed in replacement strings.
     case $configure_input in #(
     *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`$as_echo "$configure_input" |
+       ac_sed_conf_input=`printf "%s\n" "$configure_input" |
        sed 's/[\\\\&|]/\\\\&/g'`;; #(
     *) ac_sed_conf_input=$configure_input;;
     esac
@@ -10440,7 +12422,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
+printf "%s\n" X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -10464,9 +12446,9 @@ $as_echo X"$ac_file" |
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -10519,8 +12501,8 @@ ac_sed_dataroot='
 case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   ac_datarootdir_hack='
@@ -10562,9 +12544,9 @@ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
       "$ac_tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&2;}
 
   rm -f "$ac_tmp/stdin"
@@ -10580,20 +12562,20 @@ which seems to be undefined.  Please make sure it is defined" >&2;}
   #
   if test x"$ac_file" != x-; then
     {
-      $as_echo "/* $configure_input  */" \
+      printf "%s\n" "/* $configure_input  */" >&1 \
       && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
     } >"$ac_tmp/config.h" \
       || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
-$as_echo "$as_me: $ac_file is unchanged" >&6;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+printf "%s\n" "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
       mv "$ac_tmp/config.h" "$ac_file" \
 	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
-    $as_echo "/* $configure_input  */" \
+    printf "%s\n" "/* $configure_input  */" >&1 \
       && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
       || as_fn_error $? "could not create -" "$LINENO" 5
   fi
@@ -10634,11 +12616,12 @@ if test "$no_create" != yes; then
   $ac_cs_success || as_fn_exit 1
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
 
+
 mv HYPRE_config.h HYPRE_config.h.tmp
 sed 's/FC_FUNC/HYPRE_FC_FUNC/g' < HYPRE_config.h.tmp > HYPRE_config.h
 rm -f HYPRE_config.h.tmp
diff --git a/external/hypre/src/distributed_ls/CMakeLists.txt b/external/hypre/src/distributed_ls/CMakeLists.txt
index 511f366c..afa06b62 100644
--- a/external/hypre/src/distributed_ls/CMakeLists.txt
+++ b/external/hypre/src/distributed_ls/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/Euclid/CMakeLists.txt b/external/hypre/src/distributed_ls/Euclid/CMakeLists.txt
index 2ae900c4..134d9ac4 100644
--- a/external/hypre/src/distributed_ls/Euclid/CMakeLists.txt
+++ b/external/hypre/src/distributed_ls/Euclid/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/Euclid/Euclid_apply.c b/external/hypre/src/distributed_ls/Euclid/Euclid_apply.c
index a3bd9b68..9a1ccaec 100644
--- a/external/hypre/src/distributed_ls/Euclid/Euclid_apply.c
+++ b/external/hypre/src/distributed_ls/Euclid/Euclid_apply.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/Euclid/Euclid_dh.c b/external/hypre/src/distributed_ls/Euclid/Euclid_dh.c
index 05d04cd1..1c16c8d0 100644
--- a/external/hypre/src/distributed_ls/Euclid/Euclid_dh.c
+++ b/external/hypre/src/distributed_ls/Euclid/Euclid_dh.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/Euclid/Euclid_dh.h b/external/hypre/src/distributed_ls/Euclid/Euclid_dh.h
index 846c8e30..8756c682 100644
--- a/external/hypre/src/distributed_ls/Euclid/Euclid_dh.h
+++ b/external/hypre/src/distributed_ls/Euclid/Euclid_dh.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/Euclid/ExternalRows_dh.c b/external/hypre/src/distributed_ls/Euclid/ExternalRows_dh.c
index 0120ddd8..8e6d5581 100644
--- a/external/hypre/src/distributed_ls/Euclid/ExternalRows_dh.c
+++ b/external/hypre/src/distributed_ls/Euclid/ExternalRows_dh.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -106,7 +106,7 @@ void ExternalRows_dhGetRow(ExternalRows_dh er, HYPRE_Int globalRow,
   START_FUNC_DH
   if (er->rowLookup == NULL) {
     *len = 0;
-  } 
+  }
 
   else {
     HashData *r = NULL;
@@ -126,8 +126,8 @@ void ExternalRows_dhGetRow(ExternalRows_dh er, HYPRE_Int globalRow,
 /*=====================================================================
  * methods for receiving  external rows from lower-ordered subdomains
  *=====================================================================*/
-static void rcv_ext_storage_private(ExternalRows_dh extRows); 
-static void build_hash_table_private(ExternalRows_dh er); 
+static void rcv_ext_storage_private(ExternalRows_dh extRows);
+static void build_hash_table_private(ExternalRows_dh er);
 static void rcv_external_rows_private(ExternalRows_dh er);
 static void allocate_ext_row_storage_private(ExternalRows_dh er);
 static void print_received_rows_private(ExternalRows_dh er);
@@ -148,28 +148,28 @@ void ExternalRows_dhRecvRows(ExternalRows_dh er)
     rcv_ext_storage_private(er); CHECK_V_ERROR;
 
 
-    /* allocate data structures for receiving the rows (no comms) 
+    /* allocate data structures for receiving the rows (no comms)
        (allocates: cvalExt, fillExt, avalExt)
        (no communications)
      */
     allocate_ext_row_storage_private(er); CHECK_V_ERROR;
 
 
-    /* construct hash table for  external row lookup (no comms) 
+    /* construct hash table for  external row lookup (no comms)
        (Creates/allocates: rowLookup)
        (no communications)
      */
     build_hash_table_private(er); CHECK_V_ERROR;
 
-    /* receive the actual row structures and values 
-       from lower ordered neighbors 
+    /* receive the actual row structures and values
+       from lower ordered neighbors
      */
     rcv_external_rows_private(er); CHECK_V_ERROR;
 
     if (debug) {
       print_received_rows_private(er); CHECK_V_ERROR;
     }
-  } 
+  }
   END_FUNC_DH
 }
 
@@ -178,7 +178,7 @@ void ExternalRows_dhRecvRows(ExternalRows_dh er)
 void rcv_ext_storage_private(ExternalRows_dh er)
 {
   START_FUNC_DH
-  HYPRE_Int i; 
+  HYPRE_Int i;
   HYPRE_Int loCount = er->sg->loCount, *loNabors = er->sg->loNabors;
   HYPRE_Int *rcv_row_counts = er->rcv_row_counts;
   HYPRE_Int *rcv_nz_counts = er->rcv_nz_counts;
@@ -192,7 +192,7 @@ void rcv_ext_storage_private(ExternalRows_dh er)
     HYPRE_Int nabor = loNabors[i];
     hypre_MPI_Irecv(rcv_row_counts+i, 1, HYPRE_MPI_INT, nabor, ROW_CT_TAG, comm_dh, er->req1+i);
     hypre_MPI_Irecv(rcv_nz_counts+i,  1, HYPRE_MPI_INT, nabor, NZ_CT_TAG,  comm_dh, er->req2+i);
-  }    
+  }
   hypre_MPI_Waitall(loCount, er->req1, er->status);
   hypre_MPI_Waitall(loCount, er->req2, er->status);
 
@@ -217,7 +217,7 @@ void rcv_ext_storage_private(ExternalRows_dh er)
 
   if (debug) {
     HYPRE_Int j, nz;
-    for (i=0; i<loCount; ++i) { 
+    for (i=0; i<loCount; ++i) {
       hypre_fprintf(logFile, "\nEXR rows <number,length> to be received from P_%i\nEXR ", loNabors[i]);
       nz = rcv_row_counts[i];
       for (j=0; j<nz; ++j) hypre_fprintf(logFile, "<%i,%i> ", numbers[i][j], lengths[i][j]);
@@ -272,13 +272,13 @@ void build_hash_table_private(ExternalRows_dh er)
   offset = 0;
 
   /* loop over lower ordered nabors in subdomain graph */
-  for (i=0; i<loCount; ++i) { 
+  for (i=0; i<loCount; ++i) {
 
     /* number of rows to be received from nabor(i) */
-    HYPRE_Int rowCount = rcv_row_counts[i]; 
+    HYPRE_Int rowCount = rcv_row_counts[i];
 
     /* loop over rows to be received from nabor(i) */
-    for (j=0; j<rowCount; ++j) { 
+    for (j=0; j<rowCount; ++j) {
 
       /* insert a record to locate row(j) in the hash table */
       HYPRE_Int row = rcv_row_numbers[i][j];
@@ -343,8 +343,8 @@ void print_received_rows_private(ExternalRows_dh er)
     hypre_fprintf(logFile, "\nEXR Rows received from P_%i:\n", nabor);
 
     /* loop over each row to be received from this nabor */
-    for (j=0; j<rwCt; ++j) {  
-      HYPRE_Int rowNum = er->rcv_row_numbers[i][j];  
+    for (j=0; j<rwCt; ++j) {
+      HYPRE_Int rowNum = er->rcv_row_numbers[i][j];
       HYPRE_Int rowLen  = er->rcv_row_lengths[i][j];
       hypre_fprintf(logFile, "EXR %i :: ", 1+rowNum);
       for (k=0; k<rowLen; ++k) {
@@ -361,8 +361,8 @@ void print_received_rows_private(ExternalRows_dh er)
 
   hypre_fprintf(logFile, "\nEXR =============== received rows, printed from hash table =============\n");
   for (i=0; i<n; ++i) {
-    HYPRE_Int len, *cval, *fill;
-    REAL_DH *aval;
+    HYPRE_Int len = 0, *cval = NULL, *fill = NULL;
+    REAL_DH *aval = NULL;
     ExternalRows_dhGetRow(er, i, &len, &cval, &fill, &aval); CHECK_V_ERROR;
     if (len > 0) {
       hypre_fprintf(logFile, "EXR %i :: ", i+1);
@@ -420,7 +420,7 @@ void send_ext_storage_private(ExternalRows_dh er)
   HYPRE_Int m = er->F->m;
   HYPRE_Int beg_row = er->F->beg_row;
   HYPRE_Int rowCount = er->F->bdry_count;  /* number of boundary rows */
-  HYPRE_Int first_bdry = er->F->first_bdry; 
+  HYPRE_Int first_bdry = er->F->first_bdry;
   bool debug = false;
 
   if (logFile != NULL && er->debug) debug = true;
@@ -448,7 +448,7 @@ void send_ext_storage_private(ExternalRows_dh er)
     HYPRE_Int nabor = hiNabors[i];
     hypre_MPI_Isend(&rowCount, 1, HYPRE_MPI_INT, nabor, ROW_CT_TAG, comm_dh, er->req1+i);
     hypre_MPI_Isend(&nz,       1, HYPRE_MPI_INT, nabor, NZ_CT_TAG,  comm_dh, er->req2+i);
-  }    
+  }
 
   /* set up array for global row numbers */
   for (i=0, j=first_bdry; j<m; ++i, ++j) {
@@ -477,8 +477,8 @@ void send_external_rows_private(ExternalRows_dh er)
   START_FUNC_DH
   HYPRE_Int i, j, hiCount = er->sg->hiCount, *hiNabors = er->sg->hiNabors;
   HYPRE_Int offset, nz = er->nzSend;
-  HYPRE_Int *cvalSend, *fillSend; 
-  REAL_DH *avalSend; 
+  HYPRE_Int *cvalSend, *fillSend;
+  REAL_DH *avalSend;
   HYPRE_Int *cval = er->F->cval, *fill = er->F->fill;
   HYPRE_Int m = er->F->m;
   HYPRE_Int *rp = er->F->rp, *diag = er->F->diag;
@@ -531,7 +531,7 @@ void send_external_rows_private(ExternalRows_dh er)
   for (i=0; i<hiCount; ++i) {
     HYPRE_Int nabor = hiNabors[i];
     hypre_MPI_Isend(cvalSend, nz, HYPRE_MPI_INT,    nabor, CVAL_TAG, comm_dh, er->cval_req+i);
-    hypre_MPI_Isend(fillSend, nz, HYPRE_MPI_INT,    nabor, FILL_TAG, comm_dh, er->fill_req+i); 
+    hypre_MPI_Isend(fillSend, nz, HYPRE_MPI_INT,    nabor, FILL_TAG, comm_dh, er->fill_req+i);
     hypre_MPI_Isend(avalSend, nz, hypre_MPI_REAL, nabor, AVAL_TAG, comm_dh, er->aval_req+i);
   }
   END_FUNC_DH
diff --git a/external/hypre/src/distributed_ls/Euclid/ExternalRows_dh.h b/external/hypre/src/distributed_ls/Euclid/ExternalRows_dh.h
index 9df4cb65..495ccfc9 100644
--- a/external/hypre/src/distributed_ls/Euclid/ExternalRows_dh.h
+++ b/external/hypre/src/distributed_ls/Euclid/ExternalRows_dh.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/Euclid/Factor_dh.c b/external/hypre/src/distributed_ls/Euclid/Factor_dh.c
index be625a70..c150e78a 100644
--- a/external/hypre/src/distributed_ls/Euclid/Factor_dh.c
+++ b/external/hypre/src/distributed_ls/Euclid/Factor_dh.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -21,7 +21,7 @@
 /* #include "io_dh.h" */
 
 /* suppress compiler complaints */
-void Factor_dh_junk()
+void Factor_dh_junk(void)
 {
 }
 
@@ -35,7 +35,7 @@ void Factor_dhCreate(Factor_dh *mat)
 {
   START_FUNC_DH
   HYPRE_Int i;
-  struct _factor_dh* tmp; 
+  struct _factor_dh* tmp;
 
   if (np_dh > MAX_MPI_TASKS) {
     SET_V_ERROR("you must change MAX_MPI_TASKS and recompile!");
@@ -47,7 +47,7 @@ void Factor_dhCreate(Factor_dh *mat)
   tmp->m = 0;
   tmp->n = 0;
   tmp->id = myid_dh;
-  tmp->beg_row = 0; 
+  tmp->beg_row = 0;
   tmp->first_bdry = 0;
   tmp->bdry_count = 0;
   tmp->blockJacobi = false;
@@ -70,7 +70,7 @@ void Factor_dhCreate(Factor_dh *mat)
   tmp->numbSolve = NULL;
 
   tmp->debug = Parser_dhHasSwitch(parser_dh, "-debug_Factor");
-  
+
   /* initialize MPI request to null */
   for(i=0; i<MAX_MPI_TASKS; i++)
   {
@@ -105,17 +105,17 @@ void Factor_dhDestroy(Factor_dh mat)
   if (mat->sendindHi != NULL) { FREE_DH(mat->sendindHi); CHECK_V_ERROR; }
 
   if (mat->numbSolve != NULL) { Numbering_dhDestroy(mat->numbSolve); CHECK_V_ERROR; }
-  
+
   /* cleanup MPI requests */
   for(i=0; i<MAX_MPI_TASKS; i++)
   {
      if(mat->recv_reqLo[i] != hypre_MPI_REQUEST_NULL) hypre_MPI_Request_free(&(mat->recv_reqLo[i]));
-     if(mat->recv_reqHi[i] != hypre_MPI_REQUEST_NULL) hypre_MPI_Request_free(&(mat->recv_reqHi[i]));     
+     if(mat->recv_reqHi[i] != hypre_MPI_REQUEST_NULL) hypre_MPI_Request_free(&(mat->recv_reqHi[i]));
      if(mat->send_reqLo[i] != hypre_MPI_REQUEST_NULL) hypre_MPI_Request_free(&(mat->send_reqLo[i]));
      if(mat->send_reqHi[i] != hypre_MPI_REQUEST_NULL) hypre_MPI_Request_free(&(mat->send_reqHi[i]));
-     if(mat->requests[i] != hypre_MPI_REQUEST_NULL) hypre_MPI_Request_free(&(mat->requests[i]));     
+     if(mat->requests[i] != hypre_MPI_REQUEST_NULL) hypre_MPI_Request_free(&(mat->requests[i]));
   }
-  FREE_DH(mat); CHECK_V_ERROR; 
+  FREE_DH(mat); CHECK_V_ERROR;
   END_FUNC_DH
 }
 
@@ -207,14 +207,14 @@ void Factor_dhPrintDiags(Factor_dh mat, FILE *fp)
   START_FUNC_DH
   HYPRE_Int beg_row = mat->beg_row;
   HYPRE_Int m = mat->m, i, pe, *diag = mat->diag;
-  REAL_DH *aval = mat->aval; 
+  REAL_DH *aval = mat->aval;
+
 
-  
   fprintf_dh(fp, "\n----------------------- Factor_dhPrintDiags ------------------\n");
   fprintf_dh(fp, "(grep for 'ZERO')\n");
 
   for (pe=0; pe<np_dh; ++pe) {
-    hypre_MPI_Barrier(comm_dh); 
+    hypre_MPI_Barrier(comm_dh);
     if (mat->id == pe) {
       hypre_fprintf(fp, "----- subdomain: %i  processor: %i\n", pe, myid_dh);
       for (i=0; i<m; ++i) {
@@ -284,12 +284,12 @@ void Factor_dhPrintTriples(Factor_dh mat, char *filename)
   if (noValues) aval = NULL;
 
   for (pe=0; pe<np_dh; ++pe) {
-    hypre_MPI_Barrier(comm_dh); 
+    hypre_MPI_Barrier(comm_dh);
     if (mat->id == pe) {
-      if (pe == 0) { 
+      if (pe == 0) {
         fp=openFile_dh(filename, "w"); CHECK_V_ERROR;
-      } 
-      else { 
+      }
+      else {
         fp=openFile_dh(filename, "a"); CHECK_V_ERROR;
       }
 
@@ -298,7 +298,7 @@ void Factor_dhPrintTriples(Factor_dh mat, char *filename)
           if (noValues) {
             hypre_fprintf(fp, "%i %i\n", 1+i+beg_row, 1+mat->cval[j]);
           } else {
-            hypre_fprintf(fp, TRIPLES_FORMAT, 
+            hypre_fprintf(fp, TRIPLES_FORMAT,
                         1+i+beg_row, 1+mat->cval[j], aval[j]);
           }
         }
@@ -328,11 +328,12 @@ void Factor_dhPrintTriples(Factor_dh mat, char *filename)
 */
 #undef __FUNC__
 #define __FUNC__ "setup_receives_private"
-static HYPRE_Int setup_receives_private(Factor_dh mat, HYPRE_Int *beg_rows, HYPRE_Int *end_rows, 
+static HYPRE_Int setup_receives_private(Factor_dh mat, HYPRE_Int *beg_rows, HYPRE_Int *end_rows,
                                   HYPRE_Real *recvBuf, hypre_MPI_Request *req,
-                                  HYPRE_Int *reqind, HYPRE_Int reqlen, 
+                                  HYPRE_Int *reqind, HYPRE_Int reqlen,
                                   HYPRE_Int *outlist, bool debug)
 {
+  HYPRE_UNUSED_VAR(mat);
   START_FUNC_DH
   HYPRE_Int i, j, this_pe, num_recv = 0;
   hypre_MPI_Request request;
@@ -342,7 +343,7 @@ static HYPRE_Int setup_receives_private(Factor_dh mat, HYPRE_Int *beg_rows, HYPR
     hypre_fprintf(logFile, "FACT STARTING: setup_receives_private\n");
   }
 
-  for (i=0; i<reqlen; i=j) { /* j is set below */ 
+  for (i=0; i<reqlen; i=j) { /* j is set below */
     /* determine the processor that owns the row with index reqind[i] */
     this_pe = mat_find_owner(beg_rows, end_rows, reqind[i]); CHECK_ERROR(-1);
 
@@ -370,12 +371,12 @@ static HYPRE_Int setup_receives_private(Factor_dh mat, HYPRE_Int *beg_rows, HYPR
        receive; this matching receive will be started later,
        in setup_sends_private.
     */
-    hypre_MPI_Isend(reqind+i, j-i, HYPRE_MPI_INT, this_pe, 444, comm_dh, &request); 
-    hypre_MPI_Request_free(&request); 
+    hypre_MPI_Isend(reqind+i, j-i, HYPRE_MPI_INT, this_pe, 444, comm_dh, &request);
+    hypre_MPI_Request_free(&request);
 
     /* set up persistent comms for receiving the values from this_pe */
     hypre_MPI_Recv_init(recvBuf+i, j-i, hypre_MPI_REAL, this_pe, 555,
-                        comm_dh, req+num_recv); 
+                        comm_dh, req+num_recv);
     ++num_recv;
   }
 
@@ -389,7 +390,7 @@ static HYPRE_Int setup_receives_private(Factor_dh mat, HYPRE_Int *beg_rows, HYPR
 */
 #undef __FUNC__
 #define __FUNC__ "setup_sends_private"
-static void setup_sends_private(Factor_dh mat, HYPRE_Int *inlist, 
+static void setup_sends_private(Factor_dh mat, HYPRE_Int *inlist,
                                   HYPRE_Int *o2n_subdomain, bool debug)
 {
   START_FUNC_DH
@@ -448,16 +449,16 @@ static void setup_sends_private(Factor_dh mat, HYPRE_Int *inlist,
       /* matching receive, for list of unknowns that will be sent,
          during the triangular solves, from ourselves to P_i
        */
-      hypre_MPI_Irecv(rcvBuf, inlist[i], HYPRE_MPI_INT, i, 444, comm_dh, requests+count); 
+      hypre_MPI_Irecv(rcvBuf, inlist[i], HYPRE_MPI_INT, i, 444, comm_dh, requests+count);
       ++count;
 
       /* Set up the send */
-      hypre_MPI_Send_init(sendBuf, inlist[i], hypre_MPI_REAL, i, 555, comm_dh, sendReq); 
+      hypre_MPI_Send_init(sendBuf, inlist[i], hypre_MPI_REAL, i, 555, comm_dh, sendReq);
     }
   }
 
   /* note: count = mat->num_sendLo = mat->num_sendHi */
-  hypre_MPI_Waitall(count, requests, statuses); 
+  hypre_MPI_Waitall(count, requests, statuses);
 
   if (debug) {
     HYPRE_Int j;
@@ -491,7 +492,7 @@ static void setup_sends_private(Factor_dh mat, HYPRE_Int *inlist,
 
 
 
-#undef __FUNC__ 
+#undef __FUNC__
 #define __FUNC__ "Factor_dhSolveSetup"
 void Factor_dhSolveSetup(Factor_dh mat, SubdomainGraph_dh sg)
 {
@@ -540,7 +541,7 @@ void Factor_dhSolveSetup(Factor_dh mat, SubdomainGraph_dh sg)
   mat->num_recvHi = 0;
   if (numb->num_extLo) {
     recvBuf = mat->work_y_lo + m;
-    mat->num_recvLo = setup_receives_private(mat, beg_rows, end_rows, 
+    mat->num_recvLo = setup_receives_private(mat, beg_rows, end_rows,
                              recvBuf, mat->recv_reqLo,
                              numb->idx_extLo, numb->num_extLo,
                              outlist, debug); CHECK_V_ERROR;
@@ -551,12 +552,12 @@ void Factor_dhSolveSetup(Factor_dh mat, SubdomainGraph_dh sg)
     recvBuf = mat->work_x_hi + m + numb->num_extLo;
     mat->num_recvHi = setup_receives_private(mat, beg_rows, end_rows,
                             recvBuf, mat->recv_reqHi,
-                            numb->idx_extHi, numb->num_extHi, 
+                            numb->idx_extHi, numb->num_extHi,
                             outlist, debug); CHECK_V_ERROR;
   }
 
-  hypre_MPI_Alltoall(outlist, 1, HYPRE_MPI_INT, inlist, 1, HYPRE_MPI_INT, comm_dh); 
-  /* At this point, inlist[j] contains the number of indices 
+  hypre_MPI_Alltoall(outlist, 1, HYPRE_MPI_INT, inlist, 1, HYPRE_MPI_INT, comm_dh);
+  /* At this point, inlist[j] contains the number of indices
      that this processor must send to P_j.  Processors next need
      to exchange the actual lists of required indices; this is done
      in setup_sends_private()
@@ -596,12 +597,12 @@ void Factor_dhSolveSetup(Factor_dh mat, SubdomainGraph_dh sg)
    so similar to MatVec, that I put it here, instead of with
    the other solves located in Euclid_apply.c.
 */
-static void forward_solve_private(HYPRE_Int m, HYPRE_Int from, HYPRE_Int to, 
-                            HYPRE_Int *rp, HYPRE_Int *cval, HYPRE_Int *diag, HYPRE_Real *aval, 
+static void forward_solve_private(HYPRE_Int m, HYPRE_Int from, HYPRE_Int to,
+                            HYPRE_Int *rp, HYPRE_Int *cval, HYPRE_Int *diag, HYPRE_Real *aval,
                             HYPRE_Real *rhs, HYPRE_Real *work_y, bool debug);
 
-static void backward_solve_private(HYPRE_Int m, HYPRE_Int from, HYPRE_Int to, 
-                       HYPRE_Int *rp, HYPRE_Int *cval, HYPRE_Int *diag, HYPRE_Real *aval, 
+static void backward_solve_private(HYPRE_Int m, HYPRE_Int from, HYPRE_Int to,
+                       HYPRE_Int *rp, HYPRE_Int *cval, HYPRE_Int *diag, HYPRE_Real *aval,
                        HYPRE_Real *work_y, HYPRE_Real *work_x, bool debug);
 
 static HYPRE_Int beg_rowG;
@@ -621,7 +622,7 @@ void Factor_dhSolve(HYPRE_Real *rhs, HYPRE_Real *lhs, Euclid_dh ctx)
   HYPRE_Real *aval = mat->aval;
   HYPRE_Int    *sendindLo = mat->sendindLo, *sendindHi = mat->sendindHi;
   HYPRE_Int    sendlenLo = mat->sendlenLo, sendlenHi = mat->sendlenHi;
-  HYPRE_Real *sendbufLo = mat->sendbufLo, *sendbufHi = mat->sendbufHi; 
+  HYPRE_Real *sendbufLo = mat->sendbufLo, *sendbufHi = mat->sendbufHi;
   HYPRE_Real *work_y = mat->work_y_lo;
   HYPRE_Real *work_x = mat->work_x_hi;
   bool debug = false;
@@ -644,10 +645,10 @@ for (i=0; i<m+offsetLo+offsetHi; ++i) {
 
   /* start receives from higher and lower ordered subdomains */
   if (mat->num_recvLo) {
-    hypre_MPI_Startall(mat->num_recvLo, mat->recv_reqLo); 
+    hypre_MPI_Startall(mat->num_recvLo, mat->recv_reqLo);
   }
   if (mat->num_recvHi) {
-    hypre_MPI_Startall(mat->num_recvHi, mat->recv_reqHi); 
+    hypre_MPI_Startall(mat->num_recvHi, mat->recv_reqHi);
   }
 
   /*-------------------------------------------------------------
@@ -657,7 +658,7 @@ for (i=0; i<m+offsetLo+offsetHi; ++i) {
   from = 0;
   to = first_bdry;
   if (from != to) {
-    forward_solve_private(m, from, to, rp, cval, diag, aval, 
+    forward_solve_private(m, from, to, rp, cval, diag, aval,
                           rhs, work_y, debug); CHECK_V_ERROR;
   }
 
@@ -680,7 +681,7 @@ for (i=0; i<m+offsetLo+offsetHi; ++i) {
   from = first_bdry;
   to = m;
   if (from != to) {
-    forward_solve_private(m, from, to, rp, cval, diag, aval, 
+    forward_solve_private(m, from, to, rp, cval, diag, aval,
                           rhs, work_y, debug); CHECK_V_ERROR;
   }
 
@@ -689,11 +690,11 @@ for (i=0; i<m+offsetLo+offsetHi; ++i) {
 
     /* copy elements to send buffer */
     for (i=0; i<sendlenHi; i++) {
-      sendbufHi[i] = work_y[sendindHi[i]]; 
+      sendbufHi[i] = work_y[sendindHi[i]];
     }
 
     /* start the sends */
-    hypre_MPI_Startall(mat->num_sendHi, mat->send_reqHi); 
+    hypre_MPI_Startall(mat->num_sendHi, mat->send_reqHi);
 
     /* debug block */
     if (debug) {
@@ -726,7 +727,7 @@ for (i=0; i<m+offsetLo+offsetHi; ++i) {
   from = m;
   to = first_bdry;
   if (from != to) {
-    backward_solve_private(m, from, to, rp, cval, diag, aval, 
+    backward_solve_private(m, from, to, rp, cval, diag, aval,
                            work_y, work_x, debug); CHECK_V_ERROR;
   }
 
@@ -735,7 +736,7 @@ for (i=0; i<m+offsetLo+offsetHi; ++i) {
 
     /* copy elements to send buffer */
     for (i=0; i<sendlenLo; i++) {
-      sendbufLo[i] = work_x[sendindLo[i]]; 
+      sendbufLo[i] = work_x[sendindLo[i]];
     }
 
     /* start the sends */
@@ -755,7 +756,7 @@ for (i=0; i<m+offsetLo+offsetHi; ++i) {
   from = first_bdry;
   to = 0;
   if (from != to) {
-    backward_solve_private(m, from, to, rp, cval, diag, aval, 
+    backward_solve_private(m, from, to, rp, cval, diag, aval,
                            work_y, work_x, debug); CHECK_V_ERROR;
   }
 
@@ -785,26 +786,26 @@ for (i=0; i<m+offsetLo+offsetHi; ++i) {
 
 #undef __FUNC__
 #define __FUNC__ "forward_solve_private"
-void forward_solve_private(HYPRE_Int m, HYPRE_Int from, HYPRE_Int to, HYPRE_Int *rp, 
-                           HYPRE_Int *cval, HYPRE_Int *diag, HYPRE_Real *aval, 
+void forward_solve_private(HYPRE_Int m, HYPRE_Int from, HYPRE_Int to, HYPRE_Int *rp,
+                           HYPRE_Int *cval, HYPRE_Int *diag, HYPRE_Real *aval,
                            HYPRE_Real *rhs, HYPRE_Real *work_y, bool debug)
 {
   START_FUNC_DH
   HYPRE_Int i, j, idx;
 
-  if (debug) {  
+  if (debug) {
     hypre_fprintf(logFile, "\nFACT starting forward_solve_private; from= %i; to= %i, m= %i\n",
                                        1+from, 1+to, m);
   }
 
 /*
   if (from == 0) {
-    work_y[0] = rhs[0];  
+    work_y[0] = rhs[0];
     if (debug) {
       hypre_fprintf(logFile, "FACT   work_y[%i] = %g\n------------\n", 1+beg_rowG, work_y[0]);
     }
   } else {
-    --from; 
+    --from;
   }
 */
 
@@ -850,14 +851,14 @@ void forward_solve_private(HYPRE_Int m, HYPRE_Int from, HYPRE_Int to, HYPRE_Int
 
 #undef __FUNC__
 #define __FUNC__ "backward_solve_private"
-void backward_solve_private(HYPRE_Int m, HYPRE_Int from, HYPRE_Int to, HYPRE_Int *rp, 
-                            HYPRE_Int *cval, HYPRE_Int *diag, HYPRE_Real *aval, 
+void backward_solve_private(HYPRE_Int m, HYPRE_Int from, HYPRE_Int to, HYPRE_Int *rp,
+                            HYPRE_Int *cval, HYPRE_Int *diag, HYPRE_Real *aval,
                             HYPRE_Real *work_y, HYPRE_Real *work_x, bool debug)
 {
   START_FUNC_DH
   HYPRE_Int i, j, idx;
 
- if (debug) {  
+ if (debug) {
   hypre_fprintf(logFile, "\nFACT starting backward_solve_private; from= %i; to= %i, m= %i\n",
                                        1+from, 1+to, m);
   for (i=from-1; i>=to; --i) {
@@ -905,8 +906,8 @@ void Factor_dhInit(void *A, bool fillFlag, bool avalFlag,
   Factor_dh F;
 
   EuclidGetDimensions(A, &beg_row, &m, &n); CHECK_V_ERROR;
-  alloc = rho*m;
-  Factor_dhCreate(&F); CHECK_V_ERROR;  
+  alloc = (HYPRE_Int)(rho*m);
+  Factor_dhCreate(&F); CHECK_V_ERROR;
 
   *Fout = F;
   F->m = m;
@@ -937,7 +938,7 @@ void Factor_dhReallocate(Factor_dh F, HYPRE_Int used, HYPRE_Int additional)
 
   if (used+additional > F->alloc) {
     HYPRE_Int *tmpI;
-    while (alloc < used+additional) alloc *= 2.0;
+    while (alloc < used+additional) alloc *= 2;
     F->alloc = alloc;
     tmpI = F->cval;
     F->cval = (HYPRE_Int*)MALLOC_DH(alloc*sizeof(HYPRE_Int)); CHECK_V_ERROR;
@@ -966,7 +967,7 @@ void Factor_dhTranspose(Factor_dh A, Factor_dh *Bout)
   START_FUNC_DH
   Factor_dh B;
 
-  if (np_dh > 1) { SET_V_ERROR("only for sequential"); } 
+  if (np_dh > 1) { SET_V_ERROR("only for sequential"); }
 
   Factor_dhCreate(&B); CHECK_V_ERROR;
   *Bout = B;
@@ -1119,7 +1120,7 @@ HYPRE_Real Factor_dhMaxPivotInverse(Factor_dh mat)
   HYPRE_Real minGlobal = 0.0, min = aval[diags[0]];
   HYPRE_Real retval;
 
-  for (i=0; i<m; ++i) min = MIN(min, fabs(aval[diags[i]]));
+  for (i=0; i<m; ++i) min = MIN(min, hypre_abs(aval[diags[i]]));
   if (np_dh == 1) {
     minGlobal = min;
   } else {
@@ -1144,9 +1145,9 @@ HYPRE_Real Factor_dhMaxValue(Factor_dh mat)
   REAL_DH *aval = mat->aval;
 
   for (i=0; i<nz; ++i) {
-    max = MAX(max, fabs(aval[i]));
+    max = MAX(max, hypre_abs(aval[i]));
   }
-  
+
   if (np_dh == 1) {
     maxGlobal = max;
   } else {
@@ -1174,7 +1175,7 @@ HYPRE_Real Factor_dhCondEst(Factor_dh mat, Euclid_dh ctx)
 
   x = lhs->vals;
   for (i=0; i<m; ++i) {
-    max = MAX(max, fabs(x[i]));
+    max = MAX(max, hypre_abs(x[i]));
   }
 
   if (np_dh == 1) {
diff --git a/external/hypre/src/distributed_ls/Euclid/Factor_dh.h b/external/hypre/src/distributed_ls/Euclid/Factor_dh.h
index 0913af7a..44b1435b 100644
--- a/external/hypre/src/distributed_ls/Euclid/Factor_dh.h
+++ b/external/hypre/src/distributed_ls/Euclid/Factor_dh.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/Euclid/Hash_dh.c b/external/hypre/src/distributed_ls/Euclid/Hash_dh.c
index d8c6c8ba..9609c58f 100644
--- a/external/hypre/src/distributed_ls/Euclid/Hash_dh.c
+++ b/external/hypre/src/distributed_ls/Euclid/Hash_dh.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -71,7 +71,7 @@ void Hash_dhInit_private(Hash_dh h, HYPRE_Int s)
   /* want table size to be a power of 2: */
   while (size < s) size *= 2;
   /* rule-of-thumb: ensure there's some padding */
-  if ( (size-s) < (.1 * size) ) { size *= 2.0; }
+  if ( (size-s) < (.1 * size) ) { size *= 2; }
   h->size = size;
 
 /*
diff --git a/external/hypre/src/distributed_ls/Euclid/Hash_dh.h b/external/hypre/src/distributed_ls/Euclid/Hash_dh.h
index cde3e127..666f38d1 100644
--- a/external/hypre/src/distributed_ls/Euclid/Hash_dh.h
+++ b/external/hypre/src/distributed_ls/Euclid/Hash_dh.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/Euclid/Hash_i_dh.c b/external/hypre/src/distributed_ls/Euclid/Hash_i_dh.c
index e362a846..f54b39fb 100644
--- a/external/hypre/src/distributed_ls/Euclid/Hash_i_dh.c
+++ b/external/hypre/src/distributed_ls/Euclid/Hash_i_dh.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -80,7 +80,7 @@ void Hash_i_dhCreate(Hash_i_dh *h, HYPRE_Int sizeIN)
    */
   while (size < sizeIN) size *= 2;  /* want table size to be a power of 2: */
   /* rule-of-thumb: ensure there's at least 10% padding */
-  if ( (size-sizeIN) < (.1 * size) ) { size *= 2.0; }
+  if ( (size-sizeIN) < (.1 * size) ) { size *= 2; }
   tmp->size = size;
 
 
diff --git a/external/hypre/src/distributed_ls/Euclid/Hash_i_dh.h b/external/hypre/src/distributed_ls/Euclid/Hash_i_dh.h
index fdb8a295..7177f5c2 100644
--- a/external/hypre/src/distributed_ls/Euclid/Hash_i_dh.h
+++ b/external/hypre/src/distributed_ls/Euclid/Hash_i_dh.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/Euclid/MatGenFD.c b/external/hypre/src/distributed_ls/Euclid/MatGenFD.c
index 6ca993c0..9354c2a0 100644
--- a/external/hypre/src/distributed_ls/Euclid/MatGenFD.c
+++ b/external/hypre/src/distributed_ls/Euclid/MatGenFD.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -14,7 +14,7 @@
 /* #include "graphColor_dh.h" */
 
 static bool isThreeD;
- 
+
   /* handles for values in the 5-point (2D) or 7-point (for 3D) stencil */
 #define FRONT(a)  a[5]
 #define SOUTH(a)  a[3]
@@ -27,14 +27,14 @@ static bool isThreeD;
 
 static void setBoundary_private(HYPRE_Int node, HYPRE_Int *cval, HYPRE_Real *aval, HYPRE_Int len,
                  HYPRE_Real *rhs, HYPRE_Real bc, HYPRE_Real coeff, HYPRE_Real ctr, HYPRE_Int nabor);
-static void generateStriped(MatGenFD mg, HYPRE_Int *rp, HYPRE_Int *cval, 
+static void generateStriped(MatGenFD mg, HYPRE_Int *rp, HYPRE_Int *cval,
                                     HYPRE_Real *aval, Mat_dh A, Vec_dh b);
-static void generateBlocked(MatGenFD mg, HYPRE_Int *rp, HYPRE_Int *cval, HYPRE_Real *aval, 
+static void generateBlocked(MatGenFD mg, HYPRE_Int *rp, HYPRE_Int *cval, HYPRE_Real *aval,
                                                          Mat_dh A, Vec_dh b);
 static void getstencil(MatGenFD g, HYPRE_Int ix, HYPRE_Int iy, HYPRE_Int iz);
 
 #if 0
-static void fdaddbc(HYPRE_Int nx, HYPRE_Int ny, HYPRE_Int nz, HYPRE_Int *rp, HYPRE_Int *cval, 
+static void fdaddbc(HYPRE_Int nx, HYPRE_Int ny, HYPRE_Int nz, HYPRE_Int *rp, HYPRE_Int *cval,
              HYPRE_Int *diag, HYPRE_Real *aval, HYPRE_Real *rhs, HYPRE_Real h, MatGenFD mg);
 #endif
 
@@ -69,7 +69,7 @@ void MatGenFD_Create(MatGenFD *mg)
 
   tmp->a = tmp->b = tmp->c = 1.0;
   tmp->d = tmp->e = tmp->f = 0.0;
-  tmp->g = tmp->h = 0.0; 
+  tmp->g = tmp->h = 0.0;
 
   Parser_dhReadDouble(parser_dh,"-dx",&tmp->a);
   Parser_dhReadDouble(parser_dh,"-dy",&tmp->b);
@@ -78,13 +78,13 @@ void MatGenFD_Create(MatGenFD *mg)
   Parser_dhReadDouble(parser_dh,"-cy",&tmp->e);
   Parser_dhReadDouble(parser_dh,"-cz",&tmp->f);
 
-  tmp->a = -1*fabs(tmp->a);
-  tmp->b = -1*fabs(tmp->b);
-  tmp->c = -1*fabs(tmp->c);
+  tmp->a = -1*hypre_abs(tmp->a);
+  tmp->b = -1*hypre_abs(tmp->b);
+  tmp->c = -1*hypre_abs(tmp->c);
 
   tmp->allocateMem = true;
 
-  tmp->A = tmp->B = tmp->C = tmp->D = tmp->E 
+  tmp->A = tmp->B = tmp->C = tmp->D = tmp->E
          =  tmp->F = tmp->G = tmp->H = konstant;
 
   tmp->bcX1 = tmp->bcX2 = tmp->bcY1 = tmp->bcY2
@@ -155,15 +155,15 @@ void MatGenFD_Run(MatGenFD mg, HYPRE_Int id, HYPRE_Int np, Mat_dh *AOut, Vec_dh
   /* 1. compute "nice to have" values */
   /* each proc's subgrid dimension */
   mg->cc = m;
-  if (threeD) { 
+  if (threeD) {
     m = mg->m = m*m*m;
   } else {
     m = mg->m = m*m;
-  }    
+  }
 
   mg->first = id*m;
   mg->hh = 1.0/(mg->px*mg->cc - 1);
-  
+
   if (debug) {
     hypre_sprintf(msgBuf_dh, "cc (local grid dimension) = %i", mg->cc);
     SET_INFO(msgBuf_dh);
@@ -181,7 +181,7 @@ void MatGenFD_Run(MatGenFD mg, HYPRE_Int id, HYPRE_Int np, Mat_dh *AOut, Vec_dh
   /* 2. allocate storage */
   if (mg->allocateMem) {
     A->rp = (HYPRE_Int*)MALLOC_DH((m+1)*sizeof(HYPRE_Int)); CHECK_V_ERROR;
-    A->rp[0] = 0;  
+    A->rp[0] = 0;
     A->cval = (HYPRE_Int*)MALLOC_DH(nnz*sizeof(HYPRE_Int)); CHECK_V_ERROR
     A->aval = (HYPRE_Real*)MALLOC_DH(nnz*sizeof(HYPRE_Real)); CHECK_V_ERROR;
     /* rhs->vals = (HYPRE_Real*)MALLOC_DH(m*sizeof(HYPRE_Real)); CHECK_V_ERROR; */
@@ -199,7 +199,7 @@ void MatGenFD_Run(MatGenFD mg, HYPRE_Int id, HYPRE_Int np, Mat_dh *AOut, Vec_dh
     generateStriped(mg, A->rp, A->cval, A->aval, A, rhs); CHECK_V_ERROR;
   } else {
     generateBlocked(mg, A->rp, A->cval, A->aval, A, rhs); CHECK_V_ERROR;
-  } 
+  }
 
   /* add in bdry conditions */
   /* only implemented for 2D mats! */
@@ -225,7 +225,7 @@ void generateStriped(MatGenFD mg, HYPRE_Int *rp, HYPRE_Int *cval, HYPRE_Real *av
   HYPRE_Real *stencil = mg->stencil;
   bool debug = false;
   HYPRE_Int plane, nodeRemainder;
-  HYPRE_Int naborx1, naborx2, nabory1, nabory2;
+  HYPRE_Int naborx1 = 0, naborx2 = 0, nabory1 = 0, nabory2 = 0;
   HYPRE_Real *rhs;
 
   bool applyBdry = true;
@@ -273,7 +273,7 @@ void generateStriped(MatGenFD mg, HYPRE_Int *rp, HYPRE_Int *cval, HYPRE_Real *av
         HYPRE_Int localRow = row-beg_row;
 
         /* compute current node's position in grid */
-        k = (row / plane);      
+        k = (row / plane);
         nodeRemainder = row - (k*plane); /* map row to 1st plane */
         j = nodeRemainder / m;
         i = nodeRemainder % m;
@@ -332,7 +332,7 @@ void generateStriped(MatGenFD mg, HYPRE_Int *rp, HYPRE_Int *cval, HYPRE_Real *av
         }
        rhs[localRow] = 0.0;
        ++localRow;
-       rp[localRow] = idx; 
+       rp[localRow] = idx;
 
        /* apply boundary conditions; only for 2D! */
        if (!threeD && applyBdry) {
@@ -369,15 +369,15 @@ void generateStriped(MatGenFD mg, HYPRE_Int *rp, HYPRE_Int *cval, HYPRE_Real *av
 }
 
 
-/* zero-based 
+/* zero-based
    (from Edmond Chow)
 */
-/* 
+/*
    x,y,z       -  coordinates of row, wrt naturally ordered grid
    nz, ny, nz  -  local grid dimensions, wrt 0
    P, Q        -  subdomain grid dimensions in x and y directions
 */
-HYPRE_Int rownum(const bool threeD, const HYPRE_Int x, const HYPRE_Int y, const HYPRE_Int z, 
+HYPRE_Int rownum(const bool threeD, const HYPRE_Int x, const HYPRE_Int y, const HYPRE_Int z,
    const HYPRE_Int nx, const HYPRE_Int ny, const HYPRE_Int nz, HYPRE_Int P, HYPRE_Int Q)
 {
    HYPRE_Int p, q, r;
@@ -417,8 +417,8 @@ if (myid_dh == 0) hypre_printf("x= %i y= %i z= %i  threeD= %i  p= %i q= %i r= %i
    lowerx = nx*p;
    lowery = ny*q;
    lowerz = nz*r;
-   
-   if (threeD) { 
+
+   if (threeD) {
      return startrow + nx*ny*(z-lowerz) + nx*(y-lowery) + (x-lowerx);
    } else {
      return startrow + nx*(y-lowery) + (x-lowerx);
@@ -429,7 +429,7 @@ if (myid_dh == 0) hypre_printf("x= %i y= %i z= %i  threeD= %i  p= %i q= %i r= %i
 
 void getstencil(MatGenFD g, HYPRE_Int ix, HYPRE_Int iy, HYPRE_Int iz)
 {
-  HYPRE_Int k; 
+  HYPRE_Int k;
   HYPRE_Real h = g->hh;
   HYPRE_Real hhalf = h*0.5;
   HYPRE_Real x = h*ix;
@@ -492,10 +492,21 @@ void getstencil(MatGenFD g, HYPRE_Int ix, HYPRE_Int iy, HYPRE_Int iz)
 
 
 HYPRE_Real konstant(HYPRE_Real coeff, HYPRE_Real x, HYPRE_Real y, HYPRE_Real z)
-{  return coeff; }
+{
+  HYPRE_UNUSED_VAR(coeff);
+  HYPRE_UNUSED_VAR(x);
+  HYPRE_UNUSED_VAR(y);
+  HYPRE_UNUSED_VAR(z);
+
+  return coeff;
+}
 
 HYPRE_Real e2_xy(HYPRE_Real coeff, HYPRE_Real x, HYPRE_Real y, HYPRE_Real z)
-{ return exp(coeff*x*y); }
+{
+  HYPRE_UNUSED_VAR(z);
+
+  return hypre_exp(coeff*x*y);
+}
 
 HYPRE_Real boxThreeD(HYPRE_Real coeff, HYPRE_Real x, HYPRE_Real y, HYPRE_Real z);
 
@@ -508,11 +519,11 @@ HYPRE_Real box_1(HYPRE_Real coeff, HYPRE_Real x, HYPRE_Real y, HYPRE_Real z)
 {
   static bool setup = false;
   HYPRE_Real retval = coeff;
- 
+
   /* dffusivity constants */
   static HYPRE_Real dd1 = BOX1_DD;
   static HYPRE_Real dd2 = BOX2_DD;
-  static HYPRE_Real dd3 = BOX3_DD;  
+  static HYPRE_Real dd3 = BOX3_DD;
 
   /* boxes */
   static HYPRE_Real ax1 = BOX1_X1, ay1 = BOX1_Y1;
@@ -556,7 +567,7 @@ HYPRE_Real box_1(HYPRE_Real coeff, HYPRE_Real x, HYPRE_Real y, HYPRE_Real z)
   }
 
   return retval;
-} 
+}
 
 HYPRE_Real boxThreeD(HYPRE_Real coeff, HYPRE_Real x, HYPRE_Real y, HYPRE_Real z)
 {
@@ -583,7 +594,7 @@ HYPRE_Real boxThreeD(HYPRE_Real coeff, HYPRE_Real x, HYPRE_Real y, HYPRE_Real z)
   }
 
   return retval;
-} 
+}
 
 #if 0
 HYPRE_Real box_1(HYPRE_Real coeff, HYPRE_Real x, HYPRE_Real y, HYPRE_Real z)
@@ -616,7 +627,7 @@ HYPRE_Real box_1(HYPRE_Real coeff, HYPRE_Real x, HYPRE_Real y, HYPRE_Real z)
   }
 
   return -1*retval;
-} 
+}
 #endif
 
 /* divide square into 4 quadrants; return one of
@@ -624,6 +635,9 @@ HYPRE_Real box_1(HYPRE_Real coeff, HYPRE_Real x, HYPRE_Real y, HYPRE_Real z)
 */
 HYPRE_Real box_2(HYPRE_Real coeff, HYPRE_Real x, HYPRE_Real y, HYPRE_Real z)
 {
+  HYPRE_UNUSED_VAR(coeff);
+  HYPRE_UNUSED_VAR(z);
+
   bool setup = false;
   static HYPRE_Real d1, d2;
   HYPRE_Real retval;
@@ -661,7 +675,7 @@ void generateBlocked(MatGenFD mg, HYPRE_Int *rp, HYPRE_Int *cval, HYPRE_Real *av
   HYPRE_Int x, y, z;
   bool debug = false;
   HYPRE_Int idx = 0, localRow = 0; /* nabor; */
-  HYPRE_Int naborx1, naborx2, nabory1, nabory2, naborz1, naborz2;
+  HYPRE_Int naborx1 = 0, naborx2 = 0, nabory1 = 0, nabory2 = 0, naborz1, naborz2;
   HYPRE_Real *rhs;
 
   HYPRE_Real hhalf = 0.5 * mg->hh;
@@ -788,7 +802,7 @@ hypre_fprintf(logFile, "--- row: %i;  x >= nx*px-1; nobors2 has old value: %i\n"
        rhs[localRow] = 0.0;
 
        ++localRow;
-       rp[localRow] = idx; 
+       rp[localRow] = idx;
 
        /* apply boundary conditions; only for 2D! */
        if (!threeD && applyBdry) {
@@ -850,7 +864,7 @@ void setBoundary_private(HYPRE_Int node, HYPRE_Int *cval, HYPRE_Real *aval, HYPR
 
   /* case 1: Dirichlet Boundary condition  */
   if (bc >= 0) {
-    /* set all values to zero, set the diagonal to 1.0, set rhs to "bc" */ 
+    /* set all values to zero, set the diagonal to 1.0, set rhs to "bc" */
     *rhs = bc;
     for (i=0; i<len; ++i) {
       if (cval[i] == node) {
@@ -870,7 +884,7 @@ void setBoundary_private(HYPRE_Int node, HYPRE_Int *cval, HYPRE_Real *aval, HYPR
       if (cval[i] == node) {
         aval[i] += (ctr - coeff);
       /* adust node's right neighbor */
-      } else if (cval[i] == nabor) { 
+      } else if (cval[i] == nabor) {
         aval[i] = 2.0*coeff;
       }
     }
diff --git a/external/hypre/src/distributed_ls/Euclid/MatGenFD.h b/external/hypre/src/distributed_ls/Euclid/MatGenFD.h
index 460b2394..a140bb22 100644
--- a/external/hypre/src/distributed_ls/Euclid/MatGenFD.h
+++ b/external/hypre/src/distributed_ls/Euclid/MatGenFD.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/Euclid/Mat_dh.c b/external/hypre/src/distributed_ls/Euclid/Mat_dh.c
index 1c253fc4..741497a1 100644
--- a/external/hypre/src/distributed_ls/Euclid/Mat_dh.c
+++ b/external/hypre/src/distributed_ls/Euclid/Mat_dh.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -47,7 +47,7 @@ void Mat_dhCreate(Mat_dh *mat)
 
   tmp->m = 0;
   tmp->n = 0;
-  tmp->beg_row = 0; 
+  tmp->beg_row = 0;
   tmp->bs = 1;
 
   tmp->rp = NULL;
@@ -117,7 +117,7 @@ void Mat_dhDestroy(Mat_dh mat)
     Mat_dhMatVecSetdown(mat); CHECK_V_ERROR;
   }
   if (mat->numb != NULL) { Numbering_dhDestroy(mat->numb); CHECK_V_ERROR; }
-  FREE_DH(mat); CHECK_V_ERROR; 
+  FREE_DH(mat); CHECK_V_ERROR;
   END_FUNC_DH
 }
 
@@ -127,6 +127,8 @@ void Mat_dhDestroy(Mat_dh mat)
 #define __FUNC__ "Mat_dhMatVecSetDown"
 void Mat_dhMatVecSetdown(Mat_dh mat)
 {
+  HYPRE_UNUSED_VAR(mat);
+
   START_FUNC_DH
   if (ignoreMe) SET_V_ERROR("not implemented");
   END_FUNC_DH
@@ -151,54 +153,54 @@ void Mat_dhMatVecSetup(Mat_dh mat)
     HYPRE_Int firstLocal = mat->beg_row;
     HYPRE_Int lastLocal = firstLocal+m;
     HYPRE_Int *beg_rows, *end_rows;
-  
+
     mat->recv_req = (hypre_MPI_Request *)MALLOC_DH(np_dh * sizeof(hypre_MPI_Request)); CHECK_V_ERROR;
     mat->send_req = (hypre_MPI_Request *)MALLOC_DH(np_dh * sizeof(hypre_MPI_Request)); CHECK_V_ERROR;
     mat->status = (hypre_MPI_Status *)MALLOC_DH(np_dh * sizeof(hypre_MPI_Status)); CHECK_V_ERROR;
     beg_rows = (HYPRE_Int*)MALLOC_DH(np_dh*sizeof(HYPRE_Int)); CHECK_V_ERROR;
     end_rows = (HYPRE_Int*)MALLOC_DH(np_dh*sizeof(HYPRE_Int)); CHECK_V_ERROR;
-  
+
     if (np_dh == 1) { /* this is for debugging purposes in some of the drivers */
       beg_rows[0] = 0;
       end_rows[0] = m;
     } else {
-      ierr = hypre_MPI_Allgather(&firstLocal, 1, HYPRE_MPI_INT, beg_rows, 1, HYPRE_MPI_INT, comm_dh); 
-  
+      ierr = hypre_MPI_Allgather(&firstLocal, 1, HYPRE_MPI_INT, beg_rows, 1, HYPRE_MPI_INT, comm_dh);
+
   CHECK_MPI_V_ERROR(ierr);
-  
+
       ierr = hypre_MPI_Allgather(&lastLocal, 1, HYPRE_MPI_INT, end_rows, 1, HYPRE_MPI_INT, comm_dh); CHECK_MPI_V_ERROR(ierr);
     }
-  
+
     outlist = (HYPRE_Int *)MALLOC_DH(np_dh*sizeof(HYPRE_Int)); CHECK_V_ERROR;
     inlist  = (HYPRE_Int *)MALLOC_DH(np_dh*sizeof(HYPRE_Int)); CHECK_V_ERROR;
     for (i=0; i<np_dh; ++i) {
       outlist[i] = 0;
       inlist[i] = 0;
     }
-  
+
     /* Create Numbering object */
     Numbering_dhCreate(&(mat->numb)); CHECK_V_ERROR;
     numb = mat->numb;
     Numbering_dhSetup(numb, mat); CHECK_V_ERROR;
-  
-    setup_matvec_receives_private(mat, beg_rows, end_rows, numb->num_ext, 
+
+    setup_matvec_receives_private(mat, beg_rows, end_rows, numb->num_ext,
            numb->idx_ext, outlist); CHECK_V_ERROR;
-  
+
     if (np_dh == 1) { /* this is for debugging purposes in some of the drivers */
       inlist[0] = outlist[0];
     } else {
       ierr = hypre_MPI_Alltoall(outlist, 1, HYPRE_MPI_INT, inlist, 1, HYPRE_MPI_INT, comm_dh); CHECK_MPI_V_ERROR(ierr);
     }
-  
+
     setup_matvec_sends_private(mat, inlist); CHECK_V_ERROR;
-  
+
     /* Convert to local indices */
     for (row=0; row<m; row++) {
       HYPRE_Int len = rp[row+1]-rp[row];
       HYPRE_Int *ind = cval+rp[row];
       Numbering_dhGlobalToLocal(numb, len, ind, ind); CHECK_V_ERROR;
     }
-  
+
     FREE_DH(outlist); CHECK_V_ERROR;
     FREE_DH(inlist); CHECK_V_ERROR;
     FREE_DH(beg_rows); CHECK_V_ERROR;
@@ -227,7 +229,7 @@ void setup_matvec_receives_private(Mat_dh mat, HYPRE_Int *beg_rows, HYPRE_Int *e
   /* recvbuf has numlocal entries saved for local part of x, used in matvec */
   mat->recvbuf = (HYPRE_Real*)MALLOC_DH((reqlen+m) * sizeof(HYPRE_Real));
 
-  for (i=0; i<reqlen; i=j) { /* j is set below */ 
+  for (i=0; i<reqlen; i=j) { /* j is set below */
     /* The processor that owns the row with index reqind[i] */
     this_pe = mat_find_owner(beg_rows, end_rows, reqind[i]); CHECK_V_ERROR;
 
@@ -323,40 +325,40 @@ void Mat_dhMatVec(Mat_dh mat, HYPRE_Real *x, HYPRE_Real *b)
     HYPRE_Real *aval = mat->aval;
     HYPRE_Int    *sendind = mat->sendind;
     HYPRE_Int    sendlen = mat->sendlen;
-    HYPRE_Real *sendbuf = mat->sendbuf; 
+    HYPRE_Real *sendbuf = mat->sendbuf;
     HYPRE_Real *recvbuf = mat->recvbuf;
     HYPRE_Real t1 = 0, t2 = 0, t3 = 0, t4 = 0;
     bool   timeFlag = mat->matvec_timing;
-  
-  
+
+
     if (timeFlag) t1 = hypre_MPI_Wtime();
-  
+
     /* Put components of x into the right outgoing buffers */
     if (! commsOnly) {
-      for (i=0; i<sendlen; i++) sendbuf[i] = x[sendind[i]]; 
+      for (i=0; i<sendlen; i++) sendbuf[i] = x[sendind[i]];
     }
-  
+
     if (timeFlag) {
       t2 = hypre_MPI_Wtime();
       mat->time[MATVEC_TIME] += (t2 - t1);
-  
+
     }
-  
+
     ierr = hypre_MPI_Startall(mat->num_recv, mat->recv_req); CHECK_MPI_V_ERROR(ierr);
     ierr = hypre_MPI_Startall(mat->num_send, mat->send_req); CHECK_MPI_V_ERROR(ierr);
     ierr = hypre_MPI_Waitall(mat->num_recv, mat->recv_req, mat->status); CHECK_MPI_V_ERROR(ierr);
     ierr = hypre_MPI_Waitall(mat->num_send, mat->send_req, mat->status); CHECK_MPI_V_ERROR(ierr);
-  
-  
+
+
     if (timeFlag) {
       t3 = hypre_MPI_Wtime();
       mat->time[MATVEC_MPI_TIME] += (t3 - t2);
     }
-  
+
    /* Copy local part of x into top part of recvbuf */
    if (! commsOnly) {
       for (i=0; i<m; i++) recvbuf[i] = x[i];
-  
+
     /* do the multiply */
     for (row=0; row<m; row++) {
       HYPRE_Int len = rp[row+1] - rp[row];
@@ -369,7 +371,7 @@ void Mat_dhMatVec(Mat_dh mat, HYPRE_Real *x, HYPRE_Real *b)
       b[row] = temp;
     }
   } /* if (! commsOnly) */
-  
+
     if (timeFlag) {
       t4 = hypre_MPI_Wtime();
       mat->time[MATVEC_TOTAL_TIME] += (t4 - t1);
@@ -390,7 +392,7 @@ void Mat_dhMatVec_omp(Mat_dh mat, HYPRE_Real *x, HYPRE_Real *b)
   HYPRE_Real *aval = mat->aval;
   HYPRE_Int    *sendind = mat->sendind;
   HYPRE_Int    sendlen = mat->sendlen;
-  HYPRE_Real *sendbuf = mat->sendbuf; 
+  HYPRE_Real *sendbuf = mat->sendbuf;
   HYPRE_Real *recvbuf = mat->recvbuf;
   HYPRE_Real t1 = 0, t2 = 0, t3 = 0, t4 = 0, tx = 0;
   HYPRE_Real *val, temp;
@@ -403,7 +405,7 @@ void Mat_dhMatVec_omp(Mat_dh mat, HYPRE_Real *x, HYPRE_Real *b)
 #ifdef USING_OPENMP_DH
 #pragma omp parallel  for schedule(runtime) private(i)
 #endif
-  for (i=0; i<sendlen; i++) sendbuf[i] = x[sendind[i]]; 
+  for (i=0; i<sendlen; i++) sendbuf[i] = x[sendind[i]];
 
   if (timeFlag) {
     t2 = hypre_MPI_Wtime();
@@ -668,11 +670,11 @@ void Mat_dhPrintGraph(Mat_dh A, SubdomainGraph_dh sg, FILE *fp)
     ierr = hypre_MPI_Barrier(comm_dh); CHECK_MPI_V_ERROR(ierr);
     if (id == pe) {
       if (sg == NULL) {
-        mat_dh_print_graph_private(A->m, A->beg_row, A->rp, A->cval, 
+        mat_dh_print_graph_private(A->m, A->beg_row, A->rp, A->cval,
                   A->aval, NULL, NULL, NULL, fp); CHECK_V_ERROR;
       } else {
         HYPRE_Int beg_row = sg->beg_rowP[myid_dh];
-        mat_dh_print_graph_private(A->m, beg_row, A->rp, A->cval, 
+        mat_dh_print_graph_private(A->m, beg_row, A->rp, A->cval,
                   A->aval, sg->n2o_row, sg->o2n_col, sg->o2n_ext, fp); CHECK_V_ERROR;
       }
     }
@@ -686,14 +688,14 @@ void Mat_dhPrintGraph(Mat_dh A, SubdomainGraph_dh sg, FILE *fp)
 void Mat_dhPrintRows(Mat_dh A, SubdomainGraph_dh sg, FILE *fp)
 {
   START_FUNC_DH
-  bool noValues; 
+  bool noValues;
   HYPRE_Int m = A->m, *rp = A->rp, *cval = A->cval;
   HYPRE_Real *aval = A->aval;
 
   noValues = (Parser_dhHasSwitch(parser_dh, "-noValues"));
   if (noValues) aval = NULL;
 
-  /*---------------------------------------------------------------- 
+  /*----------------------------------------------------------------
    * case 1: print local portion of unpermuted matrix
    *----------------------------------------------------------------*/
   if (sg == NULL) {
@@ -714,7 +716,7 @@ void Mat_dhPrintRows(Mat_dh A, SubdomainGraph_dh sg, FILE *fp)
     }
   }
 
-  /*---------------------------------------------------------------- 
+  /*----------------------------------------------------------------
    * case 2: single mpi task, with multiple subdomains
    *----------------------------------------------------------------*/
   else if (np_dh == 1) {
@@ -733,7 +735,7 @@ void Mat_dhPrintRows(Mat_dh A, SubdomainGraph_dh sg, FILE *fp)
       hypre_fprintf(fp, "\n");
       hypre_fprintf(fp, "\n----- A, permuted, single mpi task  ------------------\n");
       hypre_fprintf(fp, "---- new subdomain: %i;  old subdomain: %i\n", i, oldBlock);
-      hypre_fprintf(fp, "     old beg_row:   %i;  new beg_row:   %i\n", 
+      hypre_fprintf(fp, "     old beg_row:   %i;  new beg_row:   %i\n",
                                 sg->beg_row[oldBlock], sg->beg_rowP[oldBlock]);
       hypre_fprintf(fp, "     local rows in this block: %i\n", sg->row_count[oldBlock]);
       hypre_fprintf(fp, "     bdry rows in this block:  %i\n", sg->bdry_count[oldBlock]);
@@ -749,7 +751,7 @@ void Mat_dhPrintRows(Mat_dh A, SubdomainGraph_dh sg, FILE *fp)
 
         for (k=0; k<len; ++k) {
           if (noValues) {
-            hypre_fprintf(fp, "%i ", 1+sg->o2n_col[cval[k]]); 
+            hypre_fprintf(fp, "%i ", 1+sg->o2n_col[cval[k]]);
           } else {
             hypre_fprintf(fp, "%i,%g ; ", 1+sg->o2n_col[cval[k]], aval[k]);
           }
@@ -761,7 +763,7 @@ void Mat_dhPrintRows(Mat_dh A, SubdomainGraph_dh sg, FILE *fp)
     }
   }
 
-  /*---------------------------------------------------------------- 
+  /*----------------------------------------------------------------
    * case 3: multiple mpi tasks, one subdomain per task
    *----------------------------------------------------------------*/
   else {
@@ -781,14 +783,14 @@ void Mat_dhPrintRows(Mat_dh A, SubdomainGraph_dh sg, FILE *fp)
         /* case i: column is locally owned */
         if (col >= beg_row && col < beg_row+m) {
           col = o2n_col[col-beg_row] + beg_rowP;
-        } 
+        }
 
         /* case ii: column is external */
         else {
           HYPRE_Int tmp = col;
           tmp = Hash_i_dhLookup(hash, col); CHECK_V_ERROR;
-          if (tmp == -1) { 
-            hypre_sprintf(msgBuf_dh, "nonlocal column= %i not in hash table", 1+col); 
+          if (tmp == -1) {
+            hypre_sprintf(msgBuf_dh, "nonlocal column= %i not in hash table", 1+col);
             SET_V_ERROR(msgBuf_dh);
           } else {
             col = tmp;
@@ -816,7 +818,7 @@ void Mat_dhPrintTriples(Mat_dh A, SubdomainGraph_dh sg, char *filename)
   START_FUNC_DH
   HYPRE_Int m = A->m, *rp = A->rp, *cval = A->cval;
   HYPRE_Real *aval = A->aval;
-  bool noValues; 
+  bool noValues;
   bool matlab;
   FILE *fp;
 
@@ -824,7 +826,7 @@ void Mat_dhPrintTriples(Mat_dh A, SubdomainGraph_dh sg, char *filename)
   if (noValues) aval = NULL;
   matlab = (Parser_dhHasSwitch(parser_dh, "-matlab"));
 
-  /*---------------------------------------------------------------- 
+  /*----------------------------------------------------------------
    * case 1: unpermuted matrix, single or multiple mpi tasks
    *----------------------------------------------------------------*/
   if (sg == NULL) {
@@ -833,11 +835,11 @@ void Mat_dhPrintTriples(Mat_dh A, SubdomainGraph_dh sg, char *filename)
     HYPRE_Real val;
 
     for (pe=0; pe<np_dh; ++pe) {
-      hypre_MPI_Barrier(comm_dh); 
+      hypre_MPI_Barrier(comm_dh);
       if (pe == myid_dh) {
-        if (pe == 0) { 
+        if (pe == 0) {
           fp=openFile_dh(filename, "w"); CHECK_V_ERROR;
-        } else { 
+        } else {
           fp=openFile_dh(filename, "a"); CHECK_V_ERROR;
         }
 
@@ -857,7 +859,7 @@ void Mat_dhPrintTriples(Mat_dh A, SubdomainGraph_dh sg, char *filename)
     }
   }
 
-  /*---------------------------------------------------------------- 
+  /*----------------------------------------------------------------
    * case 2: single mpi task, with multiple subdomains
    *----------------------------------------------------------------*/
   else if (np_dh == 1) {
@@ -876,7 +878,7 @@ void Mat_dhPrintTriples(Mat_dh A, SubdomainGraph_dh sg, char *filename)
         HYPRE_Int oldRow = sg->n2o_row[j];
 
         Mat_dhGetRow(A, oldRow, &len, &cval, &aval); CHECK_V_ERROR;
-   
+
         if (noValues) {
           for (k=0; k<len; ++k) {
             hypre_fprintf(fp, "%i %i\n", idx, 1+sg->o2n_col[cval[k]]);
@@ -897,7 +899,7 @@ void Mat_dhPrintTriples(Mat_dh A, SubdomainGraph_dh sg, char *filename)
     }
   }
 
-  /*---------------------------------------------------------------- 
+  /*----------------------------------------------------------------
    * case 3: multiple mpi tasks, one subdomain per task
    *----------------------------------------------------------------*/
   else {
@@ -911,10 +913,10 @@ void Mat_dhPrintTriples(Mat_dh A, SubdomainGraph_dh sg, char *filename)
     for (pe=0; pe<np_dh; ++pe) {
       hypre_MPI_Barrier(comm_dh);
       if (id == pe) {
-        if (pe == 0) { 
+        if (pe == 0) {
           fp=openFile_dh(filename, "w"); CHECK_V_ERROR;
-        } 
-        else { 
+        }
+        else {
           fp=openFile_dh(filename, "a"); CHECK_V_ERROR;
         }
 
@@ -924,21 +926,21 @@ void Mat_dhPrintTriples(Mat_dh A, SubdomainGraph_dh sg, char *filename)
             HYPRE_Int col = cval[j];
             HYPRE_Real val = 0.0;
 
-            if (aval != NULL) val = aval[j]; 
+            if (aval != NULL) val = aval[j];
             if (val == 0.0 && matlab) val = _MATLAB_ZERO_;
 
             /* find permuted (old-to-new) value for the column */
             /* case i: column is locally owned */
             if (col >= beg_row && col < beg_row+m) {
               col = o2n_col[col-beg_row] + beg_rowP;
-            } 
+            }
 
             /* case ii: column is external */
             else {
               HYPRE_Int tmp = col;
               tmp = Hash_i_dhLookup(hash, col); CHECK_V_ERROR;
-              if (tmp == -1) { 
-                hypre_sprintf(msgBuf_dh, "nonlocal column= %i not in hash table", 1+col); 
+              if (tmp == -1) {
+                hypre_sprintf(msgBuf_dh, "nonlocal column= %i not in hash table", 1+col);
                 SET_V_ERROR(msgBuf_dh);
               } else {
                 col = tmp;
@@ -1026,7 +1028,7 @@ void Mat_dhReadCSR(Mat_dh *mat, char *filename)
   }
 
   fp=openFile_dh(filename, "r"); CHECK_V_ERROR;
-  
+
   Mat_dhCreate(&A); CHECK_V_ERROR;
   mat_dh_read_csr_private(&A->m, &A->rp, &A->cval, &A->aval, fp); CHECK_V_ERROR;
   A->n = A->m;
@@ -1089,7 +1091,7 @@ void Mat_dhTranspose(Mat_dh A, Mat_dh *Bout)
   START_FUNC_DH
   Mat_dh B;
 
-  if (np_dh > 1) { SET_V_ERROR("only for sequential"); } 
+  if (np_dh > 1) { SET_V_ERROR("only for sequential"); }
 
   Mat_dhCreate(&B); CHECK_V_ERROR;
   *Bout = B;
@@ -1104,7 +1106,7 @@ void Mat_dhTranspose(Mat_dh A, Mat_dh *Bout)
 void Mat_dhMakeStructurallySymmetric(Mat_dh A)
 {
   START_FUNC_DH
-  if (np_dh > 1) { SET_V_ERROR("only for sequential"); } 
+  if (np_dh > 1) { SET_V_ERROR("only for sequential"); }
   make_symmetric_private(A->m, &A->rp, &A->cval, &A->aval); CHECK_V_ERROR;
   END_FUNC_DH
 }
@@ -1151,7 +1153,7 @@ void Mat_dhFixDiags(Mat_dh A)
   for (i=0; i<m; ++i) {
     HYPRE_Real sum = 0.0;
     for (j=rp[i]; j<rp[i+1]; ++j) {
-      sum += fabs(aval[j]);
+      sum += hypre_abs(aval[j]);
     }
     for (j=rp[i]; j<rp[i+1]; ++j) {
       if (cval[j] == i) {
@@ -1232,7 +1234,7 @@ void Mat_dhPrintDiags(Mat_dh A, FILE *fp)
 
 #undef __FUNC__
 #define __FUNC__ "Mat_dhGetRow"
-void Mat_dhGetRow(Mat_dh B, HYPRE_Int globalRow, HYPRE_Int *len, HYPRE_Int **ind, HYPRE_Real **val) 
+void Mat_dhGetRow(Mat_dh B, HYPRE_Int globalRow, HYPRE_Int *len, HYPRE_Int **ind, HYPRE_Real **val)
 {
   START_FUNC_DH
   HYPRE_Int row = globalRow - B->beg_row;
@@ -1242,15 +1244,21 @@ void Mat_dhGetRow(Mat_dh B, HYPRE_Int globalRow, HYPRE_Int *len, HYPRE_Int **ind
     SET_V_ERROR(msgBuf_dh);
   }
   *len = B->rp[row+1] - B->rp[row];
-  if (ind != NULL) *ind = B->cval + B->rp[row]; 
-  if (val != NULL) *val = B->aval + B->rp[row]; 
+  if (ind != NULL) *ind = B->cval + B->rp[row];
+  if (val != NULL) *val = B->aval + B->rp[row];
   END_FUNC_DH
 }
 
 #undef __FUNC__
 #define __FUNC__ "Mat_dhRestoreRow"
-void Mat_dhRestoreRow(Mat_dh B, HYPRE_Int row, HYPRE_Int *len, HYPRE_Int **ind, HYPRE_Real **val) 
+void Mat_dhRestoreRow(Mat_dh B, HYPRE_Int row, HYPRE_Int *len, HYPRE_Int **ind, HYPRE_Real **val)
 {
+  HYPRE_UNUSED_VAR(B);
+  HYPRE_UNUSED_VAR(row);
+  HYPRE_UNUSED_VAR(len);
+  HYPRE_UNUSED_VAR(ind);
+  HYPRE_UNUSED_VAR(val);
+
   START_FUNC_DH
   END_FUNC_DH
 }
@@ -1259,6 +1267,8 @@ void Mat_dhRestoreRow(Mat_dh B, HYPRE_Int row, HYPRE_Int *len, HYPRE_Int **ind,
 #define __FUNC__ "Mat_dhRowPermute"
 void Mat_dhRowPermute(Mat_dh mat)
 {
+  HYPRE_UNUSED_VAR(mat);
+
   START_FUNC_DH
   if (ignoreMe) SET_V_ERROR("turned off; compilation problem on blue");
 
@@ -1276,7 +1286,7 @@ void Mat_dhRowPermute(Mat_dh mat)
  *              permuted matrix has as many entries on its diagonal as
  *              possible. The values on the diagonal are of arbitrary size.
  *              HSL subroutine MC21A/AD is used for this.
- *        = 2 : Compute a row permutation of the matrix so that the smallest 
+ *        = 2 : Compute a row permutation of the matrix so that the smallest
  *              value on the diagonal of the permuted matrix is maximized.
  *        = 3 : Compute a row permutation of the matrix so that the smallest
  *              value on the diagonal of the permuted matrix is maximized.
@@ -1286,9 +1296,9 @@ void Mat_dhRowPermute(Mat_dh mat)
  *              of the diagonal entries of the permuted matrix is maximized.
  *        = 5 : Compute a row permutation of the matrix so that the product
  *              of the diagonal entries of the permuted matrix is maximized
- *              and vectors to scale the matrix so that the nonzero diagonal 
- *              entries of the permuted matrix are one in absolute value and 
- *              all the off-diagonal entries are less than or equal to one in 
+ *              and vectors to scale the matrix so that the nonzero diagonal
+ *              entries of the permuted matrix are one in absolute value and
+ *              all the off-diagonal entries are less than or equal to one in
  *              absolute value.
 #endif
 
@@ -1401,9 +1411,16 @@ void build_adj_lists_private(Mat_dh mat, HYPRE_Int **rpOUT, HYPRE_Int **cvalOUT)
 
 #undef __FUNC__
 #define __FUNC__ "Mat_dhPartition"
-void Mat_dhPartition(Mat_dh mat, HYPRE_Int blocks, 
+void Mat_dhPartition(Mat_dh mat, HYPRE_Int blocks,
                      HYPRE_Int **beg_rowOUT, HYPRE_Int **row_countOUT,  HYPRE_Int **n2oOUT, HYPRE_Int **o2nOUT)
 {
+  HYPRE_UNUSED_VAR(mat);
+  HYPRE_UNUSED_VAR(blocks);
+  HYPRE_UNUSED_VAR(beg_rowOUT);
+  HYPRE_UNUSED_VAR(row_countOUT);
+  HYPRE_UNUSED_VAR(n2oOUT);
+  HYPRE_UNUSED_VAR(o2nOUT);
+
   START_FUNC_DH
 #ifndef HAVE_METIS_DH
 
@@ -1434,11 +1451,11 @@ NULL, NULL,
 0   /*no edge or vertex weights*/
 0  /*use zero-based numbering*/
 blocksIN,
-options[5] = 
+options[5] =
   0 :: 0/1 use defauls; use uptions 1..4
-  1 :: 
+  1 ::
 edgecutOUT,
-part[]  
+part[]
 =============================================================
 #endif
 
diff --git a/external/hypre/src/distributed_ls/Euclid/Mat_dh.h b/external/hypre/src/distributed_ls/Euclid/Mat_dh.h
index df1f59e7..32e14e2c 100644
--- a/external/hypre/src/distributed_ls/Euclid/Mat_dh.h
+++ b/external/hypre/src/distributed_ls/Euclid/Mat_dh.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/Euclid/Mem_dh.c b/external/hypre/src/distributed_ls/Euclid/Mem_dh.c
index bd2ebb10..4c781798 100644
--- a/external/hypre/src/distributed_ls/Euclid/Mem_dh.c
+++ b/external/hypre/src/distributed_ls/Euclid/Mem_dh.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -14,8 +14,8 @@
 */
 
 
-  /* a memRecord_dh is pre and post-pended to every 
-   * piece of memory obtained by calling MALLOC_DH 
+  /* a memRecord_dh is pre and post-pended to every
+   * piece of memory obtained by calling MALLOC_DH
    */
 typedef struct {
     HYPRE_Real size;
@@ -80,7 +80,7 @@ void* Mem_dhMalloc(Mem_dh m, size_t size)
 
   retval = (char*)address + sizeof(memRecord_dh);
 
-  /* we prepend and postpend a private record to the 
+  /* we prepend and postpend a private record to the
    * requested chunk of memory; this permits tracking the
    * sizes of freed memory, along with other rudimentary
    * error checking.  This is modeled after the PETSc code.
@@ -101,13 +101,15 @@ void* Mem_dhMalloc(Mem_dh m, size_t size)
 #define __FUNC__ "Mem_dhFree"
 void Mem_dhFree(Mem_dh m, void *ptr)
 {
+  HYPRE_UNUSED_VAR(m);
+
   START_FUNC_DH_2
   HYPRE_Real size;
   char *tmp = (char*)ptr;
   memRecord_dh *rec;
   tmp -= sizeof(memRecord_dh);
   rec = (memRecord_dh*)tmp;
-  size = rec->size;   
+  size = rec->size;
 
   mem_dh->curMem -= size;
   mem_dh->freeCount += 1;
@@ -128,13 +130,13 @@ void  Mem_dhPrint(Mem_dh m, FILE* fp, bool allPrint)
     hypre_fprintf(fp, "---------------------- Euclid memory report (start)\n");
     hypre_fprintf(fp, "malloc calls = %g\n", m->mallocCount);
     hypre_fprintf(fp, "free   calls = %g\n", m->freeCount);
-    hypre_fprintf(fp, "curMem          = %g Mbytes (should be zero)\n", 
+    hypre_fprintf(fp, "curMem          = %g Mbytes (should be zero)\n",
                                                    m->curMem/1000000);
     tmp = m->totalMem / 1000000;
     hypre_fprintf(fp, "total allocated = %g Mbytes\n", tmp);
     hypre_fprintf(fp, "max malloc      = %g Mbytes (max allocated at any point in time)\n", m->maxMem/1000000);
     hypre_fprintf(fp, "\n");
     hypre_fprintf(fp, "---------------------- Euclid memory report (end)\n");
-  } 
+  }
   END_FUNC_DH_2
 }
diff --git a/external/hypre/src/distributed_ls/Euclid/Mem_dh.h b/external/hypre/src/distributed_ls/Euclid/Mem_dh.h
index 82e3cb12..e3cb3e3a 100644
--- a/external/hypre/src/distributed_ls/Euclid/Mem_dh.h
+++ b/external/hypre/src/distributed_ls/Euclid/Mem_dh.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/Euclid/Numbering_dh.c b/external/hypre/src/distributed_ls/Euclid/Numbering_dh.c
index 9581e84e..6ada09d4 100644
--- a/external/hypre/src/distributed_ls/Euclid/Numbering_dh.c
+++ b/external/hypre/src/distributed_ls/Euclid/Numbering_dh.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -108,7 +108,7 @@ void Numbering_dhSetup(Numbering_dh numb, Mat_dh mat)
          */
         /* RL : why ``m+num_ext'' instead of ``num_ext+1'' ??? */
         if (m+num_ext >= size) {
-          HYPRE_Int newSize = hypre_max(m+num_ext+1, size*1.5);  /* heuristic */
+          HYPRE_Int newSize = (HYPRE_Int)hypre_max(m+num_ext+1, size*1.5);  /* heuristic */
           HYPRE_Int *tmp = (HYPRE_Int*)MALLOC_DH(newSize*sizeof(HYPRE_Int)); CHECK_V_ERROR;
           hypre_TMemcpy(tmp,  idx_ext, size, size, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
           FREE_DH(idx_ext); CHECK_V_ERROR;
diff --git a/external/hypre/src/distributed_ls/Euclid/Numbering_dh.h b/external/hypre/src/distributed_ls/Euclid/Numbering_dh.h
index ab915eac..e0ca7008 100644
--- a/external/hypre/src/distributed_ls/Euclid/Numbering_dh.h
+++ b/external/hypre/src/distributed_ls/Euclid/Numbering_dh.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/Euclid/Parser_dh.c b/external/hypre/src/distributed_ls/Euclid/Parser_dh.c
index 51d45283..d95d6c75 100644
--- a/external/hypre/src/distributed_ls/Euclid/Parser_dh.c
+++ b/external/hypre/src/distributed_ls/Euclid/Parser_dh.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -200,7 +200,7 @@ bool Parser_dhReadDouble(Parser_dh p,const char* in, HYPRE_Real *out)
   OptionsNode *node;
 
   if (p != NULL && find(p,in,&node)) {
-    *out = atof(node->value);
+    *out = (HYPRE_Real)atof(node->value);
     optionExists = true;
   }
   END_FUNC_VAL_2(optionExists)
diff --git a/external/hypre/src/distributed_ls/Euclid/Parser_dh.h b/external/hypre/src/distributed_ls/Euclid/Parser_dh.h
index 2a91f948..35603900 100644
--- a/external/hypre/src/distributed_ls/Euclid/Parser_dh.h
+++ b/external/hypre/src/distributed_ls/Euclid/Parser_dh.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/Euclid/README.hypre b/external/hypre/src/distributed_ls/Euclid/README.hypre
index 17f4a825..4cfd585b 100644
--- a/external/hypre/src/distributed_ls/Euclid/README.hypre
+++ b/external/hypre/src/distributed_ls/Euclid/README.hypre
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/Euclid/SortedList_dh.c b/external/hypre/src/distributed_ls/Euclid/SortedList_dh.c
index 0e840b7f..6a27c90d 100644
--- a/external/hypre/src/distributed_ls/Euclid/SortedList_dh.c
+++ b/external/hypre/src/distributed_ls/Euclid/SortedList_dh.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -173,7 +173,7 @@ bool SortedList_dhPermuteAndInsert(SortedList_dh sList, SRecord *sr, HYPRE_Real
   START_FUNC_DH
   bool wasInserted = false;
   HYPRE_Int col = sr->col;
-  HYPRE_Real testVal = fabs(sr->val);
+  HYPRE_Real testVal = hypre_abs(sr->val);
   HYPRE_Int beg_row = sList->beg_row, end_row = beg_row + sList->m;
   HYPRE_Int beg_rowP = sList->beg_rowP;
 
diff --git a/external/hypre/src/distributed_ls/Euclid/SortedList_dh.h b/external/hypre/src/distributed_ls/Euclid/SortedList_dh.h
index 95a897e9..e357e18d 100644
--- a/external/hypre/src/distributed_ls/Euclid/SortedList_dh.h
+++ b/external/hypre/src/distributed_ls/Euclid/SortedList_dh.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/Euclid/SortedSet_dh.c b/external/hypre/src/distributed_ls/Euclid/SortedSet_dh.c
index 6afc27f9..d2a92af8 100644
--- a/external/hypre/src/distributed_ls/Euclid/SortedSet_dh.c
+++ b/external/hypre/src/distributed_ls/Euclid/SortedSet_dh.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/Euclid/SortedSet_dh.h b/external/hypre/src/distributed_ls/Euclid/SortedSet_dh.h
index 930667c4..476548b6 100644
--- a/external/hypre/src/distributed_ls/Euclid/SortedSet_dh.h
+++ b/external/hypre/src/distributed_ls/Euclid/SortedSet_dh.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/Euclid/SubdomainGraph_dh.c b/external/hypre/src/distributed_ls/Euclid/SubdomainGraph_dh.c
index ae083a29..190f9bc5 100644
--- a/external/hypre/src/distributed_ls/Euclid/SubdomainGraph_dh.c
+++ b/external/hypre/src/distributed_ls/Euclid/SubdomainGraph_dh.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -164,8 +164,8 @@ hypre_fprintf(stderr, "blocks= %i\n", blocks);
 void SubdomainGraph_dhPrintStatsLong(SubdomainGraph_dh s, FILE *fp)
 {
   START_FUNC_DH
-    HYPRE_Int i, j, k; 
-    HYPRE_Real max = 0, min = INT_MAX;
+    HYPRE_Int i, j, k;
+    HYPRE_Real max = 0, min = (HYPRE_Real) INT_MAX;
 
     hypre_fprintf(fp, "\n------------- SubdomainGraph_dhPrintStatsLong -----------\n");
     hypre_fprintf(fp, "colors used     = %i\n", s->colors);
@@ -243,7 +243,7 @@ void SubdomainGraph_dhPrintStatsLong(SubdomainGraph_dh s, FILE *fp)
 
   } else {
     /*-----------------------------------------
-     * local n2o_row permutation 
+     * local n2o_row permutation
      *-----------------------------------------*/
     hypre_fprintf(fp, "\nlocal n2o_row permutation:\n");
     hypre_fprintf(fp, "--------------------------\n");
@@ -529,7 +529,7 @@ void init_mpi_private(SubdomainGraph_dh s, HYPRE_Int blocks, bool bj, void *A)
   t1 = hypre_MPI_Wtime();
   if (!bj) {
       HYPRE_Int *interiorNodes, *bdryNodes;
-      HYPRE_Int interiorCount, bdryCount;
+      HYPRE_Int interiorCount = 0, bdryCount;
       HYPRE_Int *o2n = s->o2n_col, idx;
       HYPRE_Int i;
 
@@ -828,6 +828,8 @@ void form_subdomaingraph_mpi_private(SubdomainGraph_dh s)
 #define __FUNC__ "form_subdomaingraph_seq_private"
 void form_subdomaingraph_seq_private(SubdomainGraph_dh s, HYPRE_Int m, void *A)
 {
+  HYPRE_UNUSED_VAR(m);
+
   START_FUNC_DH
   HYPRE_Int *dense, i, j, row, blocks = s->blocks;
   HYPRE_Int *cval, len, *adj;
@@ -924,6 +926,8 @@ void find_all_neighbors_sym_private(SubdomainGraph_dh s, HYPRE_Int m, void *A)
 #define __FUNC__ "find_all_neighbors_unsym_private"
 void find_all_neighbors_unsym_private(SubdomainGraph_dh s, HYPRE_Int m, void *A)
 {
+  HYPRE_UNUSED_VAR(m);
+
   START_FUNC_DH
   HYPRE_Int i, j, row, beg_row, end_row;
   HYPRE_Int *marker;
@@ -1022,6 +1026,8 @@ void find_bdry_nodes_sym_private(SubdomainGraph_dh s, HYPRE_Int m, void* A,
                      HYPRE_Int *interiorNodes, HYPRE_Int *bdryNodes,
                      HYPRE_Int *interiorCount, HYPRE_Int *bdryCount)
 {
+  HYPRE_UNUSED_VAR(m);
+
   START_FUNC_DH
   HYPRE_Int beg_row = s->beg_row[myid_dh];
   HYPRE_Int end_row = beg_row + s->row_count[myid_dh];
@@ -1427,7 +1433,7 @@ void SubdomainGraph_dhDump(SubdomainGraph_dh s, char *filename)
       hypre_fprintf(fp, "%i ", s->bdry_count[i]);
     }
     hypre_fprintf(fp, "\n");
-     
+
   }
 
   /* write subdomain graph */
@@ -1567,7 +1573,7 @@ void find_bdry_nodes_seq_private(SubdomainGraph_dh s, HYPRE_Int m, void* A)
     tmp = (HYPRE_Int*)MALLOC_DH(m*sizeof(HYPRE_Int)); CHECK_V_ERROR;
     for (i=0; i<m; ++i) tmp[i] = 0;
 
-    /*------------------------------------------ 
+    /*------------------------------------------
      * mark all boundary nodes
      *------------------------------------------ */
     for (i=0; i<blocks; ++i) {
diff --git a/external/hypre/src/distributed_ls/Euclid/SubdomainGraph_dh.h b/external/hypre/src/distributed_ls/Euclid/SubdomainGraph_dh.h
index 43b7b06e..0e6c8cf3 100644
--- a/external/hypre/src/distributed_ls/Euclid/SubdomainGraph_dh.h
+++ b/external/hypre/src/distributed_ls/Euclid/SubdomainGraph_dh.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/Euclid/TimeLog_dh.c b/external/hypre/src/distributed_ls/Euclid/TimeLog_dh.c
index 3c68a6a9..a0015d55 100644
--- a/external/hypre/src/distributed_ls/Euclid/TimeLog_dh.c
+++ b/external/hypre/src/distributed_ls/Euclid/TimeLog_dh.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/Euclid/TimeLog_dh.h b/external/hypre/src/distributed_ls/Euclid/TimeLog_dh.h
index aa20bf65..978e38be 100644
--- a/external/hypre/src/distributed_ls/Euclid/TimeLog_dh.h
+++ b/external/hypre/src/distributed_ls/Euclid/TimeLog_dh.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/Euclid/Timer_dh.c b/external/hypre/src/distributed_ls/Euclid/Timer_dh.c
index c314c643..66e4172b 100644
--- a/external/hypre/src/distributed_ls/Euclid/Timer_dh.c
+++ b/external/hypre/src/distributed_ls/Euclid/Timer_dh.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -29,7 +29,7 @@ void Timer_dhCreate(Timer_dh *t)
 #if defined(EUCLID_TIMING)
   hypre_sprintf(msgBuf_dh, "using EUCLID_TIMING; _SC_CLK_TCK = %i", (HYPRE_Int)tmp->sc_clk_tck);
   SET_INFO(msgBuf_dh);
-#elif defined(hypre_MPI_TIMING) 
+#elif defined(hypre_MPI_TIMING)
   SET_INFO("using MPI timing")
 #else
   SET_INFO("using JUNK timing")
@@ -47,7 +47,7 @@ void Timer_dhDestroy(Timer_dh t)
 }
 
 /*-------------------------------------------------------------------------------
- * EUCLID_TIMING timing methods; these use times() to record 
+ * EUCLID_TIMING timing methods; these use times() to record
  * both wall and cpu time.
  *-------------------------------------------------------------------------------*/
 
@@ -108,12 +108,12 @@ HYPRE_Real Timer_dhReadUsage(Timer_dh t)
   START_FUNC_DH
   HYPRE_Real cpu = Timer_dhReadCPU(t);
   HYPRE_Real wall = Timer_dhReadWall(t);
-  HYPRE_Real retval = 100.0*cpu/wall; 
+  HYPRE_Real retval = 100.0*cpu/wall;
   END_FUNC_VAL(retval);
 }
 
 /*-------------------------------------------------------------------------------
- * Parallel timing functions; these use hypre_MPI_Wtime() to record 
+ * Parallel timing functions; these use hypre_MPI_Wtime() to record
  * wall-clock time only.
  *-------------------------------------------------------------------------------*/
 
@@ -177,6 +177,8 @@ HYPRE_Real Timer_dhReadUsage(Timer_dh t)
 #define __FUNC__ "Timer_dhStart"
 void Timer_dhStart(Timer_dh t)
 {
+  HYPRE_UNUSED_VAR(t);
+
   START_FUNC_DH
   END_FUNC_DH
 }
@@ -185,6 +187,8 @@ void Timer_dhStart(Timer_dh t)
 #define __FUNC__ "Timer_dhStop"
 void Timer_dhStop(Timer_dh t)
 {
+  HYPRE_UNUSED_VAR(t);
+
   START_FUNC_DH
   END_FUNC_DH
 }
@@ -193,6 +197,8 @@ void Timer_dhStop(Timer_dh t)
 #define __FUNC__ "Timer_dhReadWall"
 HYPRE_Real Timer_dhReadWall(Timer_dh t)
 {
+  HYPRE_UNUSED_VAR(t);
+
   START_FUNC_DH
   END_FUNC_VAL(-1.0)
 }
@@ -201,6 +207,8 @@ HYPRE_Real Timer_dhReadWall(Timer_dh t)
 #define __FUNC__ "Timer_dhReadCPU"
 HYPRE_Real Timer_dhReadCPU(Timer_dh t)
 {
+  HYPRE_UNUSED_VAR(t);
+
   START_FUNC_DH
   END_FUNC_VAL(-1.0)
 }
@@ -209,6 +217,8 @@ HYPRE_Real Timer_dhReadCPU(Timer_dh t)
 #define __FUNC__ "Timer_dhReadUsage"
 HYPRE_Real Timer_dhReadUsage(Timer_dh t)
 {
+  HYPRE_UNUSED_VAR(t);
+
   START_FUNC_DH
   END_FUNC_VAL(-1.0);
 }
diff --git a/external/hypre/src/distributed_ls/Euclid/Timer_dh.h b/external/hypre/src/distributed_ls/Euclid/Timer_dh.h
index 1fe4f921..255af5b6 100644
--- a/external/hypre/src/distributed_ls/Euclid/Timer_dh.h
+++ b/external/hypre/src/distributed_ls/Euclid/Timer_dh.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/Euclid/Vec_dh.c b/external/hypre/src/distributed_ls/Euclid/Vec_dh.c
index 515e5696..ddf5b4cb 100644
--- a/external/hypre/src/distributed_ls/Euclid/Vec_dh.c
+++ b/external/hypre/src/distributed_ls/Euclid/Vec_dh.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -29,7 +29,9 @@ void Vec_dhCreate(Vec_dh *v)
 void Vec_dhDestroy(Vec_dh v)
 {
   START_FUNC_DH
-  if (v->vals != NULL) FREE_DH(v->vals); CHECK_V_ERROR;
+  if (v->vals != NULL) {
+    FREE_DH(v->vals); CHECK_V_ERROR;
+  }
   FREE_DH(v); CHECK_V_ERROR;
   END_FUNC_DH
 }
@@ -213,7 +215,7 @@ void Vec_dhPrintBIN(Vec_dh v, SubdomainGraph_dh sg, char *filename)
 void Vec_dhRead(Vec_dh *vout, HYPRE_Int ignore, char *filename)
 {
   START_FUNC_DH
-  Vec_dh tmp;
+  Vec_dh tmp = 0;
   FILE *fp;
   HYPRE_Int items, n, i;
   HYPRE_Real *v, w;
@@ -283,7 +285,7 @@ extern void Vec_dhReadBIN(Vec_dh *vout, char *filename)
 
 {
   START_FUNC_DH
-  Vec_dh tmp;
+  Vec_dh tmp = 0;
 
   Vec_dhCreate(&tmp); CHECK_V_ERROR;
   *vout = tmp;
diff --git a/external/hypre/src/distributed_ls/Euclid/Vec_dh.h b/external/hypre/src/distributed_ls/Euclid/Vec_dh.h
index a88336ce..fca8056c 100644
--- a/external/hypre/src/distributed_ls/Euclid/Vec_dh.h
+++ b/external/hypre/src/distributed_ls/Euclid/Vec_dh.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/Euclid/_hypre_Euclid.h b/external/hypre/src/distributed_ls/Euclid/_hypre_Euclid.h
index 3477d98f..6566d503 100644
--- a/external/hypre/src/distributed_ls/Euclid/_hypre_Euclid.h
+++ b/external/hypre/src/distributed_ls/Euclid/_hypre_Euclid.h
@@ -24,7 +24,7 @@ extern "C" {
 #endif
 
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -150,7 +150,7 @@ you need to write EUCLID_GET_ROW() functions: see src/getRow.c
 
 #endif
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -180,11 +180,8 @@ you need to write EUCLID_GET_ROW() functions: see src/getRow.c
 #endif
 
 /* used in Mat_SEQ_PrintTriples, so matlab won't discard zeros (yuck!) */
-#ifdef HYPRE_SINGLE
-#define _MATLAB_ZERO_  1e-30
-#else // default
-#define _MATLAB_ZERO_  1e-100
-#endif
+#define _MATLAB_ZERO_  HYPRE_REAL_MIN
+
 
 
 /*---------------------------------------------------------------------- 
@@ -339,7 +336,7 @@ you need to write EUCLID_GET_ROW() functions: see src/getRow.c
 
 #endif  /* #ifndef MACROS_DH */
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -458,7 +455,7 @@ extern char  msgBuf_dh[MSG_BUF_SIZE_DH];
  * enabled when compiled with the debugging (-g) option.
  */
 extern void openLogfile_dh(HYPRE_Int argc, char *argv[]);
-extern void closeLogfile_dh();
+extern void closeLogfile_dh(void);
 extern bool logInfoToStderr;
 extern bool logInfoToFile;
 extern bool logFuncsToStderr;
@@ -470,8 +467,8 @@ extern void dh_EndFunc(const char *function, HYPRE_Int priority);
 extern void printFunctionStack(FILE *fp);
 
 extern void EuclidInitialize(HYPRE_Int argc, char *argv[], char *help); /* instantiates global objects */
-extern void EuclidFinalize();    /* deletes global objects */
-extern bool EuclidIsInitialized();
+extern void EuclidFinalize(void);    /* deletes global objects */
+extern bool EuclidIsInitialized(void);
 extern void printf_dh(const char *fmt, ...);
 extern void fprintf_dh(FILE *fp, const char *fmt, ...);
 
@@ -483,7 +480,7 @@ extern void echoInvocation_dh(MPI_Comm comm, char *prefix, HYPRE_Int argc, char
 
 #endif
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -553,7 +550,7 @@ struct _extrows_dh {
 
 #endif
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -647,7 +644,7 @@ extern void Factor_dhPrintRows(Factor_dh mat, FILE *fp);
 
 #endif
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -689,7 +686,7 @@ extern void Vec_dhPrint(Vec_dh v, SubdomainGraph_dh sg, char *filename);
 extern void Vec_dhPrintBIN(Vec_dh v, SubdomainGraph_dh sg, char *filename); 
 #endif
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -827,7 +824,7 @@ extern HYPRE_Real box_2(HYPRE_Real coeff, HYPRE_Real x, HYPRE_Real y, HYPRE_Real
 
 #endif
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -979,7 +976,7 @@ extern void dldperm(HYPRE_Int job, HYPRE_Int n, HYPRE_Int nnz, HYPRE_Int colptr[
 
 #endif
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -1097,7 +1094,7 @@ extern void SubdomainGraph_dhPrintStats(SubdomainGraph_dh sg, FILE *fp);
 
 #endif
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -1126,7 +1123,7 @@ extern void TimeLog_dhPrint(TimeLog_dh t, FILE *fp, bool allPrint);
 
 #endif
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -1151,7 +1148,7 @@ extern void SortedSet_dhGetList(SortedSet_dh ss, HYPRE_Int **list, HYPRE_Int *co
 
 #endif
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -1178,7 +1175,7 @@ extern void  Mem_dhPrint(Mem_dh m, FILE* fp, bool allPrint);
 
 #endif
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -1200,7 +1197,7 @@ extern void shellSort_int_int_float(HYPRE_Int n, HYPRE_Int *x, HYPRE_Int *y, HYP
 
 #endif
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -1250,7 +1247,7 @@ extern void Numbering_dhGlobalToLocal(Numbering_dh numb, HYPRE_Int len,
 
 #endif
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -1293,7 +1290,7 @@ extern HYPRE_Int  Hash_i_dhLookup(Hash_i_dh h, HYPRE_Int key);
 
 #endif
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -1380,7 +1377,7 @@ extern HYPRE_Real Timer_dhReadUsage(Timer_dh t);
 
 #endif
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -1449,7 +1446,7 @@ extern void Parser_dhInit(Parser_dh p, HYPRE_Int argc, char *argv[]);
 
 #endif
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -1534,7 +1531,7 @@ extern void SortedList_dhUpdateVal(SortedList_dh sList, SRecord *sr);
 
 #endif
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -1596,7 +1593,7 @@ extern void Hash_dhPrint(Hash_dh h, FILE *fp);
 
 #endif
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -1720,7 +1717,7 @@ extern void make_symmetric_private(HYPRE_Int m, HYPRE_Int **rp, HYPRE_Int **cval
 
 #endif
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -1746,7 +1743,7 @@ extern void PrintMatUsingGetRow(void* A, HYPRE_Int beg_row, HYPRE_Int m,
 #endif
 
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -1787,7 +1784,7 @@ extern void ilut_seq(Euclid_dh ctx);
 #endif
 
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -1946,7 +1943,7 @@ struct _mpi_interface_dh {
 
 #endif /*  #ifndef EUCLID_MPI_INTERFACE_DH */
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -1965,14 +1962,14 @@ extern void cg_euclid(Mat_dh A, Euclid_dh ctx, HYPRE_Real *x, HYPRE_Real *b,
 
 #endif
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
  ******************************************************************************/
 
 /*
-   Note: this module contains functionality for reading/writing 
+   Note: this module contains functionality for reading/writing
          Euclid's binary io format, and opening and closing files.
          Additional io can be found in in mat_dh_private, which contains
          private functions for reading/writing various matrix and
@@ -1995,11 +1992,11 @@ extern void closeFile_dh(FILE *fpIN);
  * binary io; these are called by functions in mat_dh_private
  *---------------------------------------------------------------------------*/
 
-bool isSmallEndian();
+bool isSmallEndian(void);
 
 /* seq only ?? */
 extern void io_dh_print_ebin_mat_private(HYPRE_Int m, HYPRE_Int beg_row,
-                                HYPRE_Int *rp, HYPRE_Int *cval, HYPRE_Real *aval, 
+                                HYPRE_Int *rp, HYPRE_Int *cval, HYPRE_Real *aval,
                            HYPRE_Int *n2o, HYPRE_Int *o2n, Hash_i_dh hash, char *filename);
 
 /* seq only ?? */
@@ -2016,7 +2013,7 @@ extern void io_dh_read_ebin_vec_private(HYPRE_Int *n, HYPRE_Real **vals, char *f
 #endif
 
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/Euclid/blas_dh.c b/external/hypre/src/distributed_ls/Euclid/blas_dh.c
index 8a0d2dd8..a75cbc5d 100644
--- a/external/hypre/src/distributed_ls/Euclid/blas_dh.c
+++ b/external/hypre/src/distributed_ls/Euclid/blas_dh.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -144,6 +144,6 @@ HYPRE_Real Norm2(HYPRE_Int n, HYPRE_Real *x)
   } else {
     result = local_result;
   }
-  result = sqrt(result);
+  result = hypre_sqrt(result);
   END_FUNC_VAL(result)
 }
diff --git a/external/hypre/src/distributed_ls/Euclid/blas_dh.h b/external/hypre/src/distributed_ls/Euclid/blas_dh.h
index ab93ef9a..4f3cf709 100644
--- a/external/hypre/src/distributed_ls/Euclid/blas_dh.h
+++ b/external/hypre/src/distributed_ls/Euclid/blas_dh.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/Euclid/euclid_common.h b/external/hypre/src/distributed_ls/Euclid/euclid_common.h
index 24dbaa4d..1ac1ba1b 100644
--- a/external/hypre/src/distributed_ls/Euclid/euclid_common.h
+++ b/external/hypre/src/distributed_ls/Euclid/euclid_common.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -118,7 +118,7 @@ extern char  msgBuf_dh[MSG_BUF_SIZE_DH];
  * enabled when compiled with the debugging (-g) option.
  */
 extern void openLogfile_dh(HYPRE_Int argc, char *argv[]);
-extern void closeLogfile_dh();
+extern void closeLogfile_dh(void);
 extern bool logInfoToStderr;
 extern bool logInfoToFile;
 extern bool logFuncsToStderr;
@@ -130,8 +130,8 @@ extern void dh_EndFunc(const char *function, HYPRE_Int priority);
 extern void printFunctionStack(FILE *fp);
 
 extern void EuclidInitialize(HYPRE_Int argc, char *argv[], char *help); /* instantiates global objects */
-extern void EuclidFinalize();    /* deletes global objects */
-extern bool EuclidIsInitialized();
+extern void EuclidFinalize(void);    /* deletes global objects */
+extern bool EuclidIsInitialized(void);
 extern void printf_dh(const char *fmt, ...);
 extern void fprintf_dh(FILE *fp, const char *fmt, ...);
 
diff --git a/external/hypre/src/distributed_ls/Euclid/euclid_config.h b/external/hypre/src/distributed_ls/Euclid/euclid_config.h
index b184414b..7b31bd0b 100644
--- a/external/hypre/src/distributed_ls/Euclid/euclid_config.h
+++ b/external/hypre/src/distributed_ls/Euclid/euclid_config.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/Euclid/getRow_dh.c b/external/hypre/src/distributed_ls/Euclid/getRow_dh.c
index 20f2bc4b..bd5fcff9 100644
--- a/external/hypre/src/distributed_ls/Euclid/getRow_dh.c
+++ b/external/hypre/src/distributed_ls/Euclid/getRow_dh.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -18,12 +18,12 @@
 
 #undef __FUNC__
 #define __FUNC__ "EuclidGetRow (HYPRE_GET_ROW)"
-void EuclidGetRow(void *A, HYPRE_Int row, HYPRE_Int *len, HYPRE_Int **ind, HYPRE_Real **val) 
+void EuclidGetRow(void *A, HYPRE_Int row, HYPRE_Int *len, HYPRE_Int **ind, HYPRE_Real **val)
 {
   START_FUNC_DH
   HYPRE_Int ierr;
   HYPRE_ParCSRMatrix mat = (HYPRE_ParCSRMatrix) A;
-  ierr = HYPRE_ParCSRMatrixGetRow(mat, row, len, ind, val); 
+  ierr = HYPRE_ParCSRMatrixGetRow(mat, row, len, (HYPRE_BigInt **) ind, val);
   if (ierr) {
     hypre_sprintf(msgBuf_dh, "HYPRE_ParCSRMatrixRestoreRow(row= %i) returned %i", row+1, ierr);
     SET_V_ERROR(msgBuf_dh);
@@ -33,12 +33,12 @@ void EuclidGetRow(void *A, HYPRE_Int row, HYPRE_Int *len, HYPRE_Int **ind, HYPRE
 
 #undef __FUNC__
 #define __FUNC__ "EuclidRestoreRow (HYPRE_GET_ROW)"
-void EuclidRestoreRow(void *A, HYPRE_Int row, HYPRE_Int *len, HYPRE_Int **ind, HYPRE_Real **val) 
+void EuclidRestoreRow(void *A, HYPRE_Int row, HYPRE_Int *len, HYPRE_Int **ind, HYPRE_Real **val)
 {
   START_FUNC_DH
   HYPRE_Int ierr;
   HYPRE_ParCSRMatrix mat = (HYPRE_ParCSRMatrix) A;
-  ierr = HYPRE_ParCSRMatrixRestoreRow(mat, row, len, ind, val); 
+  ierr = HYPRE_ParCSRMatrixRestoreRow(mat, row, len, (HYPRE_BigInt **) ind, val);
   if (ierr) {
     hypre_sprintf(msgBuf_dh, "HYPRE_ParCSRMatrixRestoreRow(row= %i) returned %i", row+1, ierr);
     SET_V_ERROR(msgBuf_dh);
@@ -51,8 +51,8 @@ void EuclidRestoreRow(void *A, HYPRE_Int row, HYPRE_Int *len, HYPRE_Int **ind, H
 void EuclidGetDimensions(void *A, HYPRE_Int *beg_row, HYPRE_Int *rowsLocal, HYPRE_Int *rowsGlobal)
 {
   START_FUNC_DH
-  HYPRE_Int ierr, m, n;
-  HYPRE_Int row_start, row_end, col_start, col_end;
+  HYPRE_Int ierr;
+  HYPRE_BigInt m, n, row_start, row_end, col_start, col_end;
   HYPRE_ParCSRMatrix mat = (HYPRE_ParCSRMatrix) A;
 
   ierr = HYPRE_ParCSRMatrixGetDims(mat, &m, &n);
@@ -61,8 +61,8 @@ void EuclidGetDimensions(void *A, HYPRE_Int *beg_row, HYPRE_Int *rowsLocal, HYPR
     SET_V_ERROR(msgBuf_dh);
   }
 
-  ierr = HYPRE_ParCSRMatrixGetLocalRange(mat, &row_start, &row_end, 
-                                       &col_start, &col_end);
+  ierr = HYPRE_ParCSRMatrixGetLocalRange(mat, &row_start, &row_end,
+                                         &col_start, &col_end);
   if (ierr) {
     hypre_sprintf(msgBuf_dh, "HYPRE_ParCSRMatrixGetLocalRange() returned %i", ierr);
     SET_V_ERROR(msgBuf_dh);
@@ -98,14 +98,14 @@ HYPRE_Int EuclidReadLocalNz(void *A)
 
 #undef __FUNC__
 #define __FUNC__ "EuclidGetRow (PETSC_GET_ROW)"
-void EuclidGetRow(void *Ain, HYPRE_Int row, HYPRE_Int *len, HYPRE_Int **ind, HYPRE_Real **val) 
+void EuclidGetRow(void *Ain, HYPRE_Int row, HYPRE_Int *len, HYPRE_Int **ind, HYPRE_Real **val)
 {
   START_FUNC_DH
   Mat A = Ain;
   HYPRE_Int ierr;
 
   ierr = MatGetRow(A, row, len, ind, val);
-  if (ierr) { 
+  if (ierr) {
     hypre_sprintf(msgBuf_dh, "PETSc's MatGetRow bombed for row= %i", row);
     SET_V_ERROR(msgBuf_dh);
   }
@@ -115,7 +115,7 @@ void EuclidGetRow(void *Ain, HYPRE_Int row, HYPRE_Int *len, HYPRE_Int **ind, HYP
 
 #undef __FUNC__
 #define __FUNC__ "EuclidRestoreRow (PETSC_GET_ROW)"
-void EuclidRestoreRow(void *Ain, HYPRE_Int row, HYPRE_Int *len, HYPRE_Int **ind, HYPRE_Real **val) 
+void EuclidRestoreRow(void *Ain, HYPRE_Int row, HYPRE_Int *len, HYPRE_Int **ind, HYPRE_Real **val)
 {
   START_FUNC_DH
   Mat A = (Mat)Ain;
@@ -143,7 +143,7 @@ void EuclidGetDimensions(void *Ain, HYPRE_Int *beg_row, HYPRE_Int *rowsLocal, HY
     hypre_sprintf(msgBuf_dh, "PETSc's MatGetOwnershipRange failed");
     SET_V_ERROR(msgBuf_dh);
   }
-  ierr = MatGetSize(A, &rows, &cols); 
+  ierr = MatGetSize(A, &rows, &cols);
   if (ierr) {
     hypre_sprintf(msgBuf_dh, "PETSc'MatGetSize failed");
     SET_V_ERROR(msgBuf_dh);
@@ -167,7 +167,7 @@ HYPRE_Int EuclidReadLocalNz(void *Ain)
   Mat A = (Mat)Ain;
   HYPRE_Int m, n, ierr;
 
-  ierr = MatGetLocalSize(Ain, &m, &n); 
+  ierr = MatGetLocalSize(Ain, &m, &n);
   if (ierr) SET_ERROR(-1, "PETSc::MatGetLocalSize failed!\n");
   END_FUNC_VAL(m)
 }
@@ -175,17 +175,17 @@ HYPRE_Int EuclidReadLocalNz(void *Ain)
 
 
 /*-------------------------------------------------------------------
- *  Euclid  
+ *  Euclid
  *-------------------------------------------------------------------*/
 #elif defined(EUCLID_GET_ROW)
 
 
 #undef __FUNC__
 #define __FUNC__ "EuclidGetRow (EUCLID_GET_ROW)"
-void EuclidGetRow(void *A, HYPRE_Int globalRow, HYPRE_Int *len, HYPRE_Int **ind, HYPRE_Real **val) 
+void EuclidGetRow(void *A, HYPRE_Int globalRow, HYPRE_Int *len, HYPRE_Int **ind, HYPRE_Real **val)
 {
   START_FUNC_DH
-  Mat_dh B = (Mat_dh)A;  
+  Mat_dh B = (Mat_dh)A;
   HYPRE_Int row = globalRow - B->beg_row;
   if (row > B->m) {
     hypre_sprintf(msgBuf_dh, "requested globalRow= %i, which is local row= %i, but only have %i rows!",
@@ -193,14 +193,14 @@ void EuclidGetRow(void *A, HYPRE_Int globalRow, HYPRE_Int *len, HYPRE_Int **ind,
     SET_V_ERROR(msgBuf_dh);
   }
   *len = B->rp[row+1] - B->rp[row];
-  if (ind != NULL) *ind = B->cval + B->rp[row]; 
-  if (val != NULL) *val = B->aval + B->rp[row]; 
+  if (ind != NULL) *ind = B->cval + B->rp[row];
+  if (val != NULL) *val = B->aval + B->rp[row];
   END_FUNC_DH
 }
 
 #undef __FUNC__
 #define __FUNC__ "EuclidRestoreRow (EUCLID_GET_ROW)"
-void EuclidRestoreRow(void *A, HYPRE_Int row, HYPRE_Int *len, HYPRE_Int **ind, HYPRE_Real **val) 
+void EuclidRestoreRow(void *A, HYPRE_Int row, HYPRE_Int *len, HYPRE_Int **ind, HYPRE_Real **val)
 {
   START_FUNC_DH
   END_FUNC_DH
@@ -211,7 +211,7 @@ void EuclidRestoreRow(void *A, HYPRE_Int row, HYPRE_Int *len, HYPRE_Int **ind, H
 void EuclidGetDimensions(void *A, HYPRE_Int *beg_row, HYPRE_Int *rowsLocal, HYPRE_Int *rowsGlobal)
 {
   START_FUNC_DH
-  Mat_dh B = (Mat_dh)A;  
+  Mat_dh B = (Mat_dh)A;
   *beg_row = B->beg_row;
   *rowsLocal = B->m;
   *rowsGlobal = B->n;
@@ -223,7 +223,7 @@ void EuclidGetDimensions(void *A, HYPRE_Int *beg_row, HYPRE_Int *rowsLocal, HYPR
 HYPRE_Int EuclidReadLocalNz(void *A)
 {
   START_FUNC_DH
-  Mat_dh B = (Mat_dh)A;  
+  Mat_dh B = (Mat_dh)A;
   HYPRE_Int nz = B->rp[B->m];
   END_FUNC_VAL(nz)
 }
@@ -235,7 +235,7 @@ HYPRE_Int EuclidReadLocalNz(void *A)
 
 #undef __FUNC__
 #define __FUNC__ "EuclidGetRow (ERROR)"
-void EuclidGetRow(void *A, HYPRE_Int row, HYPRE_Int *len, HYPRE_Int **ind, HYPRE_Real **val) 
+void EuclidGetRow(void *A, HYPRE_Int row, HYPRE_Int *len, HYPRE_Int **ind, HYPRE_Real **val)
 {
   START_FUNC_DH
   SET_ERROR(EUCLID_ERROR, "Oops; missing XXX_GET_ROW definition!");
@@ -244,7 +244,7 @@ void EuclidGetRow(void *A, HYPRE_Int row, HYPRE_Int *len, HYPRE_Int **ind, HYPRE
 
 #undef __FUNC__
 #define __FUNC__ "EuclidRestoreRow (ERROR)"
-void EuclidRestoreRow(void *A, HYPRE_Int row, HYPRE_Int *len, HYPRE_Int **ind, HYPRE_Real **val) 
+void EuclidRestoreRow(void *A, HYPRE_Int row, HYPRE_Int *len, HYPRE_Int **ind, HYPRE_Real **val)
 {
   START_FUNC_DH
   SET_ERROR(EUCLID_ERROR, "Oops; missing XXX_GET_ROW definition!");
@@ -321,7 +321,7 @@ void PrintMatUsingGetRow(void* A, HYPRE_Int beg_row, HYPRE_Int m,
           newRow = n2o_row[i] + beg_row;
           EuclidGetRow(A, newRow, &len, &cval, &aval); CHECK_V_ERROR;
           for (j=0; j<len; ++j) {
-            newCol = o2n_col[cval[j]-beg_row] + beg_row; 
+            newCol = o2n_col[cval[j]-beg_row] + beg_row;
             hypre_fprintf(fp, "%i %i %g\n", i+1, newCol, aval[j]);
           }
           EuclidRestoreRow(A, i, &len, &cval, &aval); CHECK_V_ERROR;
@@ -347,8 +347,7 @@ void PrintMatUsingGetRow(void* A, HYPRE_Int beg_row, HYPRE_Int m,
 void Euclid_dhInputHypreMat(Euclid_dh ctx, HYPRE_ParCSRMatrix A)
 {
   START_FUNC_DH
-  HYPRE_Int M, N;
-  HYPRE_Int beg_row, end_row, junk;
+  HYPRE_BigInt M, N, beg_row, end_row, junk;
 
   /* get dimension and ownership information */
   HYPRE_ParCSRMatrixGetDims(A, &M , &N);
diff --git a/external/hypre/src/distributed_ls/Euclid/getRow_dh.h b/external/hypre/src/distributed_ls/Euclid/getRow_dh.h
index e3fe1728..81fde03c 100644
--- a/external/hypre/src/distributed_ls/Euclid/getRow_dh.h
+++ b/external/hypre/src/distributed_ls/Euclid/getRow_dh.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/Euclid/globalObjects.c b/external/hypre/src/distributed_ls/Euclid/globalObjects.c
index 3740bf03..c92a5c5c 100644
--- a/external/hypre/src/distributed_ls/Euclid/globalObjects.c
+++ b/external/hypre/src/distributed_ls/Euclid/globalObjects.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -15,7 +15,7 @@
 /* #include "Parser_dh.h" */
 /* #include "Mem_dh.h" */
 /* #include "TimeLog_dh.h" */
-extern void sigRegister_dh(); /* use sig_dh.h if not for euclid_signals_len */
+extern void sigRegister_dh(void); /* use sig_dh.h if not for euclid_signals_len */
 
 /*-------------------------------------------------------------------------
  * Globally scoped variables, flags, and objects
@@ -38,7 +38,7 @@ MPI_Comm    comm_dh = 0;
    */
 
 void openLogfile_dh(HYPRE_Int argc, char *argv[]);
-void closeLogfile_dh();
+void closeLogfile_dh(void);
 bool logInfoToStderr  = false;
 bool logInfoToFile    = true;
 bool logFuncsToStderr = false;
@@ -102,7 +102,7 @@ void  openLogfile_dh(HYPRE_Int argc, char *argv[])
   }
 }
 
-void  closeLogfile_dh()
+void  closeLogfile_dh(void)
 {
   if (logFile != NULL) {
     if (fclose(logFile)) {
@@ -149,6 +149,8 @@ void dh_StartFunc(const char *function,const char *file, HYPRE_Int line, HYPRE_I
 
 void dh_EndFunc(const char *function, HYPRE_Int priority)
 {
+  HYPRE_UNUSED_VAR(function);
+
   if (priority == 1) {
     --calling_stack_count;
 
@@ -251,6 +253,8 @@ void Error_dhStartFunc(char *function, char *file, HYPRE_Int line)
 
 void Error_dhEndFunc(char *function)
 {
+  HYPRE_UNUSED_VAR(function);
+
   nesting -= 1;
   if (nesting < 0) nesting = 0;
   spaces[INDENT_DH*nesting] = '\0';
@@ -264,7 +268,7 @@ static bool EuclidIsActive = false;
 
 #undef __FUNC__
 #define __FUNC__ "EuclidIsInitialized"
-bool EuclidIsInitialized()
+bool EuclidIsInitialized(void)
 {
   return EuclidIsActive;
 }
@@ -304,7 +308,7 @@ void EuclidInitialize(HYPRE_Int argc, char *argv[], char *help)
 /* to do: should restore the signal handler that we preempted above! */
 #undef __FUNC__
 #define __FUNC__ "EuclidFinalize"
-void EuclidFinalize()
+void EuclidFinalize(void)
 {
   if (ref_counter) return;
 
diff --git a/external/hypre/src/distributed_ls/Euclid/guards_dh.h b/external/hypre/src/distributed_ls/Euclid/guards_dh.h
index 3e9466c0..ba085d30 100644
--- a/external/hypre/src/distributed_ls/Euclid/guards_dh.h
+++ b/external/hypre/src/distributed_ls/Euclid/guards_dh.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/Euclid/headers b/external/hypre/src/distributed_ls/Euclid/headers
old mode 100644
new mode 100755
index 22af0691..38b39596
--- a/external/hypre/src/distributed_ls/Euclid/headers
+++ b/external/hypre/src/distributed_ls/Euclid/headers
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/Euclid/ilu_dh.h b/external/hypre/src/distributed_ls/Euclid/ilu_dh.h
index 0e8690ea..d3d170b4 100644
--- a/external/hypre/src/distributed_ls/Euclid/ilu_dh.h
+++ b/external/hypre/src/distributed_ls/Euclid/ilu_dh.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/Euclid/ilu_mpi_bj.c b/external/hypre/src/distributed_ls/Euclid/ilu_mpi_bj.c
index 2d308252..5632dab9 100644
--- a/external/hypre/src/distributed_ls/Euclid/ilu_mpi_bj.c
+++ b/external/hypre/src/distributed_ls/Euclid/ilu_mpi_bj.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -72,13 +72,13 @@ if (ctx->F->rp == NULL) {
   tmpFill = (HYPRE_Int*)MALLOC_DH(m*sizeof(HYPRE_Int)); CHECK_V_ERROR;
   for (i=0; i<m; ++i) {
     marker[i] = -1;
-    work[i] = 0.0; 
+    work[i] = 0.0;
   }
 
   /*---------- main loop ----------*/
 
   /* global numbers of first and last locally owned rows,
-     with respect to A 
+     with respect to A
    */
   first_row = sg->beg_row[myid_dh];
   last_row  = first_row + sg->row_count[myid_dh];
@@ -90,15 +90,15 @@ if (ctx->F->rp == NULL) {
     EuclidGetRow(ctx->A, globalRow, &len, &CVAL, &AVAL); CHECK_V_ERROR;
 
     /* compute scaling value for row(i) */
-    if (ctx->isScaled) { 
-      compute_scaling_private(i, len, AVAL, ctx); CHECK_V_ERROR; 
+    if (ctx->isScaled) {
+      compute_scaling_private(i, len, AVAL, ctx); CHECK_V_ERROR;
     }
 
     /* Compute symbolic factor for row(i);
        this also performs sparsification
      */
     count = symbolic_row_private(i, first_row, last_row,
-                                 list, marker, tmpFill, 
+                                 list, marker, tmpFill,
                                  len, CVAL, AVAL,
                                  o2n_col, ctx); CHECK_V_ERROR;
 
@@ -114,7 +114,7 @@ if (ctx->F->rp == NULL) {
     /* Copy factored symbolic row to permanent storage */
     col = list[m];
     while (count--) {
-      cval[idx] = col;  
+      cval[idx] = col;
       fill[idx] = tmpFill[col];
       ++idx;
       col = list[col];
@@ -124,13 +124,13 @@ if (ctx->F->rp == NULL) {
     rp[i+1] = idx;
 
     /* Insert pointer to diagonal */
-    temp = rp[i]; 
-    while (cval[temp] != i) ++temp; 
+    temp = rp[i];
+    while (cval[temp] != i) ++temp;
     diag[i] = temp;
 
     /* compute numeric factor for current row */
      numeric_row_private(i, first_row, last_row,
-                          len, CVAL, AVAL, 
+                          len, CVAL, AVAL,
                           work, o2n_col, ctx); CHECK_V_ERROR
     EuclidRestoreRow(ctx->A, globalRow, &len, &CVAL, &AVAL); CHECK_V_ERROR;
 
@@ -138,10 +138,10 @@ if (ctx->F->rp == NULL) {
        and re-zero work vector
      */
     for (j=rp[i]; j<rp[i+1]; ++j) {
-      col = cval[j];  
-      aval[j] = work[col];  
+      col = cval[j];
+      aval[j] = work[col];
       work[col] = 0.0;
-    } 
+    }
 
     /* check for zero diagonal */
     if (! aval[diag[i]]) {
@@ -159,9 +159,9 @@ if (ctx->F->rp == NULL) {
 
 
 
-/* Computes ILU(K) factor of a single row; returns fill 
-   count for the row.  Explicitly inserts diag if not already 
-   present.  On return, all column indices are local 
+/* Computes ILU(K) factor of a single row; returns fill
+   count for the row.  Explicitly inserts diag if not already
+   present.  On return, all column indices are local
    (i.e, referenced to 0).
 */
 #undef __FUNC__
@@ -173,16 +173,16 @@ HYPRE_Int symbolic_row_private(HYPRE_Int localRow, HYPRE_Int beg_row, HYPRE_Int
 {
   START_FUNC_DH
   HYPRE_Int level = ctx->level, m = ctx->F->m;
-  HYPRE_Int *cval = ctx->F->cval, *diag = ctx->F->diag, *rp = ctx->F->rp; 
+  HYPRE_Int *cval = ctx->F->cval, *diag = ctx->F->diag, *rp = ctx->F->rp;
   HYPRE_Int *fill = ctx->F->fill;
   HYPRE_Int count = 0;
   HYPRE_Int j, node, tmp, col, head;
   HYPRE_Int fill1, fill2;
-  float val;
+  HYPRE_Real val;
   HYPRE_Real thresh = ctx->sparseTolA;
   REAL_DH scale;
 
-  scale = ctx->scale[localRow]; 
+  scale = ctx->scale[localRow];
   ctx->stats[NZA_STATS] += (HYPRE_Real)len;
 
   /* Insert col indices in linked list, and values in work vector.
@@ -192,14 +192,14 @@ HYPRE_Int symbolic_row_private(HYPRE_Int localRow, HYPRE_Int beg_row, HYPRE_Int
   list[m] = m;
   for (j=0; j<len; ++j) {
     tmp = m;
-    col = *CVAL++; 
+    col = *CVAL++;
     val = *AVAL++;
 
     /* throw out nonlocal columns */
     if (col >= beg_row && col < end_row) {
         col -= beg_row;        /* adjust column to local zero-based */
         col = o2n_col[col];    /* permute column */
-      if (fabs(scale*val) > thresh || col == localRow) {  /* sparsification */
+      if (hypre_abs(scale*val) > thresh || col == localRow) {  /* sparsification */
         ++count;
         while (col > list[tmp]) tmp = list[tmp];
         list[col]   = list[tmp];
@@ -277,15 +277,15 @@ HYPRE_Int numeric_row_private(HYPRE_Int localRow, HYPRE_Int beg_row, HYPRE_Int e
   HYPRE_Real  val;
   REAL_DH *aval = ctx->F->aval, scale;
 
-  scale = ctx->scale[localRow]; 
+  scale = ctx->scale[localRow];
 
   /* zero work vector */
-  /* note: indices in col[] are already permuted, and are 
+  /* note: indices in col[] are already permuted, and are
            local (zero-based)
    */
-  for (j=rp[localRow]; j<rp[localRow+1]; ++j) { 
-    col = cval[j];  
-    work[col] = 0.0; 
+  for (j=rp[localRow]; j<rp[localRow+1]; ++j) {
+    col = cval[j];
+    work[col] = 0.0;
   }
 
   /* init work vector with values from A */
@@ -319,7 +319,7 @@ HYPRE_Int numeric_row_private(HYPRE_Int localRow, HYPRE_Int beg_row, HYPRE_Int e
 
   /* check for zero or too small of a pivot */
 #if 0
-  if (fabs(work[i]) <= pivotTol) {
+  if (hypre_abs(work[i]) <= pivotTol) {
     /* yuck! assume row scaling, and just stick in a value */
     aval[diag[i]] = pivotFix;
   }
diff --git a/external/hypre/src/distributed_ls/Euclid/ilu_mpi_pilu.c b/external/hypre/src/distributed_ls/Euclid/ilu_mpi_pilu.c
index 1ea32208..5e29e73b 100644
--- a/external/hypre/src/distributed_ls/Euclid/ilu_mpi_pilu.c
+++ b/external/hypre/src/distributed_ls/Euclid/ilu_mpi_pilu.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -251,7 +251,7 @@ void iluk_symbolic_row_private(HYPRE_Int localRow, HYPRE_Int len, HYPRE_Int *CVA
   for (j=0; j<len; ++j) {
     sr.col = CVAL[j];
     sr.val = scale * AVAL[j];
-/*    if (fabs(sr.val) > thresh) { */
+/*    if (hypre_abs(sr.val) > thresh) { */
       wasInserted = SortedList_dhPermuteAndInsert(slist, &sr, thresh); CHECK_V_ERROR;
       if (wasInserted) ++count;
 /*    } */
diff --git a/external/hypre/src/distributed_ls/Euclid/ilu_seq.c b/external/hypre/src/distributed_ls/Euclid/ilu_seq.c
index 753cfb31..26f33d0a 100644
--- a/external/hypre/src/distributed_ls/Euclid/ilu_seq.c
+++ b/external/hypre/src/distributed_ls/Euclid/ilu_seq.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -19,12 +19,12 @@
 
 static bool check_constraint_private(Euclid_dh ctx, HYPRE_Int b, HYPRE_Int j);
 
-static HYPRE_Int symbolic_row_private(HYPRE_Int localRow, 
+static HYPRE_Int symbolic_row_private(HYPRE_Int localRow,
                  HYPRE_Int *list, HYPRE_Int *marker, HYPRE_Int *tmpFill,
                  HYPRE_Int len, HYPRE_Int *CVAL, HYPRE_Real *AVAL,
                  HYPRE_Int *o2n_col, Euclid_dh ctx, bool debug);
 
-static HYPRE_Int numeric_row_private(HYPRE_Int localRow, 
+static HYPRE_Int numeric_row_private(HYPRE_Int localRow,
                         HYPRE_Int len, HYPRE_Int *CVAL, HYPRE_Real *AVAL,
                         REAL_DH *work, HYPRE_Int *o2n_col, Euclid_dh ctx, bool debug);
 
@@ -37,7 +37,7 @@ void compute_scaling_private(HYPRE_Int row, HYPRE_Int len, HYPRE_Real *AVAL, Euc
   HYPRE_Real tmp = 0.0;
   HYPRE_Int j;
 
-  for (j=0; j<len; ++j) tmp = MAX( tmp, fabs(AVAL[j]) );
+  for (j=0; j<len; ++j) tmp = MAX( tmp, hypre_abs(AVAL[j]) );
   if (tmp) {
     ctx->scale[row] = 1.0/tmp;
   }
@@ -57,7 +57,7 @@ HYPRE_Real fixPivot_private(HYPRE_Int row, HYPRE_Int len, float *vals)
   bool debug = false;
 
   for (i=0; i<len; ++i) {
-    float tmp = fabs(vals[i]);
+    float tmp = hypre_abs(vals[i]);
     max = MAX(max, tmp);
   }
   END_FUNC_VAL(max* ctxPrivate->pivotFix)
@@ -112,9 +112,9 @@ void iluk_seq(Euclid_dh ctx)
   for (i=0; i<m; ++i) marker[i] = -1;
 
   /* working space for values */
-  for (i=0; i<m; ++i) work[i] = 0.0; 
+  for (i=0; i<m; ++i) work[i] = 0.0;
 
-/*    printf_dh("====================== starting iluk_seq; level= %i\n\n", ctx->level); 
+/*    printf_dh("====================== starting iluk_seq; level= %i\n\n", ctx->level);
 */
 
 
@@ -134,14 +134,14 @@ void iluk_seq(Euclid_dh ctx)
     EuclidGetRow(ctx->A, globalRow, &len, &CVAL, &AVAL); CHECK_V_ERROR;
 
     /* compute scaling value for row(i) */
-    if (ctx->isScaled) { 
-      compute_scaling_private(i, len, AVAL, ctx); CHECK_V_ERROR; 
+    if (ctx->isScaled) {
+      compute_scaling_private(i, len, AVAL, ctx); CHECK_V_ERROR;
     }
 
     /* Compute symbolic factor for row(i);
        this also performs sparsification
      */
-    count = symbolic_row_private(i, list, marker, tmpFill, 
+    count = symbolic_row_private(i, list, marker, tmpFill,
                                  len, CVAL, AVAL,
                                  o2n_col, ctx, debug); CHECK_V_ERROR;
 
@@ -157,7 +157,7 @@ void iluk_seq(Euclid_dh ctx)
     /* Copy factored symbolic row to permanent storage */
     col = list[m];
     while (count--) {
-      cval[idx] = col;  
+      cval[idx] = col;
       fill[idx] = tmpFill[col];
       ++idx;
 /*hypre_fprintf(logFile, "  col= %i\n", 1+col);
@@ -169,15 +169,15 @@ void iluk_seq(Euclid_dh ctx)
     rp[i+1] = idx;
 
     /* Insert pointer to diagonal */
-    temp = rp[i]; 
-    while (cval[temp] != i) ++temp; 
+    temp = rp[i];
+    while (cval[temp] != i) ++temp;
     diag[i] = temp;
 
 /*hypre_fprintf(logFile, "  diag[i]= %i\n", diag);
 */
 
     /* compute numeric factor for current row */
-     numeric_row_private(i, len, CVAL, AVAL, 
+     numeric_row_private(i, len, CVAL, AVAL,
                           work, o2n_col, ctx, debug); CHECK_V_ERROR
     EuclidRestoreRow(ctx->A, globalRow, &len, &CVAL, &AVAL); CHECK_V_ERROR;
 
@@ -187,8 +187,8 @@ void iluk_seq(Euclid_dh ctx)
     if (debug) {
       hypre_fprintf(logFile, "ILU_seq:  ");
       for (j=rp[i]; j<rp[i+1]; ++j) {
-        col = cval[j];  
-        aval[j] = work[col];  
+        col = cval[j];
+        aval[j] = work[col];
         work[col] = 0.0;
         hypre_fprintf(logFile, "%i,%i,%g ; ", 1+cval[j], fill[j], aval[j]);
         fflush(logFile);
@@ -196,8 +196,8 @@ void iluk_seq(Euclid_dh ctx)
       hypre_fprintf(logFile, "\n");
     } else {
       for (j=rp[i]; j<rp[i+1]; ++j) {
-        col = cval[j];  
-        aval[j] = work[col];  
+        col = cval[j];
+        aval[j] = work[col];
         work[col] = 0.0;
       }
     }
@@ -246,13 +246,13 @@ void iluk_seq_block(Euclid_dh ctx)
   Factor_dh F = ctx->F;
   SubdomainGraph_dh sg = ctx->sg;
   bool bj = false, constrained = false;
-  HYPRE_Int discard = 0;
+  //HYPRE_Int discard = 0;
   HYPRE_Int gr = -1;  /* globalRow */
   bool debug = false;
 
   if (logFile != NULL  &&  Parser_dhHasSwitch(parser_dh, "-debug_ilu")) debug = true;
 
-/*hypre_fprintf(stderr, "====================== starting iluk_seq_block; level= %i\n\n", ctx->level); 
+/*hypre_fprintf(stderr, "====================== starting iluk_seq_block; level= %i\n\n", ctx->level);
 */
 
   if (!strcmp(ctx->algo_par, "bj")) bj = true;
@@ -295,7 +295,7 @@ void iluk_seq_block(Euclid_dh ctx)
   for (i=0; i<m; ++i) marker[i] = -1;
 
   /* working space for values */
-  for (i=0; i<m; ++i) work[i] = 0.0; 
+  for (i=0; i<m; ++i) work[i] = 0.0;
 
   /*---------- main loop ----------*/
 
@@ -310,7 +310,7 @@ void iluk_seq_block(Euclid_dh ctx)
     }
 
   for (i=first_row; i<end_row; ++i) {
-    HYPRE_Int row = n2o_row[i];  
+    HYPRE_Int row = n2o_row[i];
     ++gr;
 
     if (debug) {
@@ -323,14 +323,14 @@ void iluk_seq_block(Euclid_dh ctx)
     EuclidGetRow(ctx->A, row, &len, &CVAL, &AVAL); CHECK_V_ERROR;
 
     /* compute scaling value for row(i) */
-    if (ctx->isScaled) { 
-      compute_scaling_private(i, len, AVAL, ctx); CHECK_V_ERROR; 
+    if (ctx->isScaled) {
+      compute_scaling_private(i, len, AVAL, ctx); CHECK_V_ERROR;
     }
 
     /* Compute symbolic factor for row(i);
        this also performs sparsification
      */
-    count = symbolic_row_private(i, list, marker, tmpFill, 
+    count = symbolic_row_private(i, list, marker, tmpFill,
                                  len, CVAL, AVAL,
                                  o2n_col, ctx, debug); CHECK_V_ERROR;
 
@@ -350,16 +350,16 @@ void iluk_seq_block(Euclid_dh ctx)
       /* constrained pilu */
       if (constrained && !bj) {
         if (col >= first_row && col < end_row) {
-          cval[idx] = col;  
+          cval[idx] = col;
           fill[idx] = tmpFill[col];
           ++idx;
-        } else { 
+        } else {
           if (check_constraint_private(ctx, curBlock, col)) {
-            cval[idx] = col;  
+            cval[idx] = col;
             fill[idx] = tmpFill[col];
             ++idx;
           } else {
-            ++discard; 
+             //++discard;
           }
         }
         col = list[col];
@@ -368,18 +368,18 @@ void iluk_seq_block(Euclid_dh ctx)
       /* block jacobi case */
       else if (bj) {
         if (col >= first_row && col < end_row) {
-          cval[idx] = col;  
+          cval[idx] = col;
           fill[idx] = tmpFill[col];
           ++idx;
-        } else { 
-          ++discard; 
+        } else {
+           //++discard;
         }
         col = list[col];
       }
 
       /* general case */
       else {
-        cval[idx] = col;  
+        cval[idx] = col;
         fill[idx] = tmpFill[col];
         ++idx;
         col = list[col];
@@ -390,12 +390,12 @@ void iluk_seq_block(Euclid_dh ctx)
     rp[i+1] = idx;
 
     /* Insert pointer to diagonal */
-    temp = rp[i]; 
-    while (cval[temp] != i) ++temp; 
+    temp = rp[i];
+    while (cval[temp] != i) ++temp;
     diag[i] = temp;
 
     /* compute numeric factor for current row */
-    numeric_row_private(i, len, CVAL, AVAL, 
+    numeric_row_private(i, len, CVAL, AVAL,
                           work, o2n_col, ctx, debug); CHECK_V_ERROR
     EuclidRestoreRow(ctx->A, row, &len, &CVAL, &AVAL); CHECK_V_ERROR;
 
@@ -405,21 +405,21 @@ void iluk_seq_block(Euclid_dh ctx)
     if (debug) {
       hypre_fprintf(logFile, "ILU_seq: ");
       for (j=rp[i]; j<rp[i+1]; ++j) {
-        col = cval[j];  
-        aval[j] = work[col];  
+        col = cval[j];
+        aval[j] = work[col];
         work[col] = 0.0;
         hypre_fprintf(logFile, "%i,%i,%g ; ", 1+cval[j], fill[j], aval[j]);
       }
       hypre_fprintf(logFile, "\n");
-     } 
+     }
 
      /* normal operation */
      else {
       for (j=rp[i]; j<rp[i+1]; ++j) {
-        col = cval[j];  
-        aval[j] = work[col];  
+        col = cval[j];
+        aval[j] = work[col];
         work[col] = 0.0;
-      } 
+      }
     }
 
     /* check for zero diagonal */
@@ -442,21 +442,21 @@ void iluk_seq_block(Euclid_dh ctx)
 
 
 
-/* Computes ILU(K) factor of a single row; returns fill 
-   count for the row.  Explicitly inserts diag if not already 
-   present.  On return, all column indices are local 
+/* Computes ILU(K) factor of a single row; returns fill
+   count for the row.  Explicitly inserts diag if not already
+   present.  On return, all column indices are local
    (i.e, referenced to 0).
 */
 #undef __FUNC__
 #define __FUNC__ "symbolic_row_private"
-HYPRE_Int symbolic_row_private(HYPRE_Int localRow, 
+HYPRE_Int symbolic_row_private(HYPRE_Int localRow,
                  HYPRE_Int *list, HYPRE_Int *marker, HYPRE_Int *tmpFill,
                  HYPRE_Int len, HYPRE_Int *CVAL, HYPRE_Real *AVAL,
                  HYPRE_Int *o2n_col, Euclid_dh ctx, bool debug)
 {
   START_FUNC_DH
   HYPRE_Int level = ctx->level, m = ctx->F->m;
-  HYPRE_Int *cval = ctx->F->cval, *diag = ctx->F->diag, *rp = ctx->F->rp; 
+  HYPRE_Int *cval = ctx->F->cval, *diag = ctx->F->diag, *rp = ctx->F->rp;
   HYPRE_Int *fill = ctx->F->fill;
   HYPRE_Int count = 0;
   HYPRE_Int j, node, tmp, col, head;
@@ -465,7 +465,7 @@ HYPRE_Int symbolic_row_private(HYPRE_Int localRow,
   HYPRE_Real thresh = ctx->sparseTolA;
   REAL_DH scale;
 
-  scale = ctx->scale[localRow]; 
+  scale = ctx->scale[localRow];
   ctx->stats[NZA_STATS] += (HYPRE_Real)len;
   beg_row  = ctx->sg->beg_row[myid_dh];
 
@@ -482,7 +482,7 @@ HYPRE_Int symbolic_row_private(HYPRE_Int localRow,
     val = *AVAL++;
     val *= scale;       /* scale the value */
 
-    if (fabs(val) > thresh || col == localRow) {  /* sparsification */
+    if (hypre_abs(val) > thresh || col == localRow) {  /* sparsification */
       ++count;
       while (col > list[tmp]) tmp = list[tmp];
       list[col]   = list[tmp];
@@ -550,7 +550,7 @@ HYPRE_Int symbolic_row_private(HYPRE_Int localRow,
 
 #undef __FUNC__
 #define __FUNC__ "numeric_row_private"
-HYPRE_Int numeric_row_private(HYPRE_Int localRow, 
+HYPRE_Int numeric_row_private(HYPRE_Int localRow,
                         HYPRE_Int len, HYPRE_Int *CVAL, HYPRE_Real *AVAL,
                         REAL_DH *work, HYPRE_Int *o2n_col, Euclid_dh ctx, bool debug)
 {
@@ -563,14 +563,14 @@ HYPRE_Int numeric_row_private(HYPRE_Int localRow,
   HYPRE_Real  val;
   REAL_DH *aval = ctx->F->aval, scale;
 
-  scale = ctx->scale[localRow]; 
+  scale = ctx->scale[localRow];
   beg_row  = ctx->sg->beg_row[myid_dh];
 
   /* zero work vector */
   /* note: indices in col[] are already permuted. */
-  for (j=rp[localRow]; j<rp[localRow+1]; ++j) { 
-    col = cval[j];  
-    work[col] = 0.0; 
+  for (j=rp[localRow]; j<rp[localRow+1]; ++j) {
+    col = cval[j];
+    work[col] = 0.0;
   }
 
   /* init work vector with values from A */
@@ -623,7 +623,7 @@ hypre_fprintf(stderr, "pv= %g; pc= %g\n", pv, pc);
 
   /* check for zero or too small of a pivot */
 #if 0
-  if (fabs(work[i]) <= pivotTol) {
+  if (hypre_abs(work[i]) <= pivotTol) {
     /* yuck! assume row scaling, and just stick in a value */
     aval[diag[i]] = pivotFix;
   }
@@ -650,7 +650,7 @@ void ilut_seq(Euclid_dh ctx)
   HYPRE_Int      *list, *marker;
   HYPRE_Int      temp, m, from, to;
   HYPRE_Int      *n2o_row, *o2n_col, beg_row, beg_rowP;
-  HYPRE_Real   *AVAL, droptol; 
+  HYPRE_Real   *AVAL, droptol;
   REAL_DH *work, *aval, val;
   Factor_dh F = ctx->F;
   SubdomainGraph_dh sg = ctx->sg;
@@ -686,7 +686,7 @@ void ilut_seq(Euclid_dh ctx)
   rp[0] = 0;
 
   /* working space for values */
-  for (i=0; i<m; ++i) work[i] = 0.0; 
+  for (i=0; i<m; ++i) work[i] = 0.0;
 
   /* ----- main loop start ----- */
   for (i=from; i<to; ++i) {
@@ -695,7 +695,7 @@ void ilut_seq(Euclid_dh ctx)
     EuclidGetRow(ctx->A, globalRow, &len, &CVAL, &AVAL); CHECK_V_ERROR;
 
     /* compute scaling value for row(i) */
-    compute_scaling_private(i, len, AVAL, ctx); CHECK_V_ERROR; 
+    compute_scaling_private(i, len, AVAL, ctx); CHECK_V_ERROR;
 
     /* compute factor for row i */
     count = ilut_row_private(i, list, o2n_col, marker,
@@ -718,8 +718,8 @@ void ilut_seq(Euclid_dh ctx)
     col = list[m];
     while (count--) {
       val = work[col];
-      if (col == i || fabs(val) > droptol) {
-        cval[idx] = col;   
+      if (col == i || hypre_abs(val) > droptol) {
+        cval[idx] = col;
         aval[idx++] = val;
         work[col] = 0.0;
       }
@@ -730,7 +730,7 @@ void ilut_seq(Euclid_dh ctx)
     rp[i+1] = idx;
 
     /* Insert pointer to diagonal */
-    temp = rp[i]; 
+    temp = rp[i];
     while (cval[temp] != i) ++temp;
     diag[i] = temp;
 
@@ -760,6 +760,8 @@ HYPRE_Int ilut_row_private(HYPRE_Int localRow, HYPRE_Int *list, HYPRE_Int *o2n_c
                      HYPRE_Int len, HYPRE_Int *CVAL, HYPRE_Real *AVAL,
                      REAL_DH *work, Euclid_dh ctx, bool debug)
 {
+  HYPRE_UNUSED_VAR(debug);
+
   START_FUNC_DH
   Factor_dh F = ctx->F;
   HYPRE_Int     j, col, m = ctx->m, *rp = F->rp, *cval = F->cval;
@@ -790,7 +792,7 @@ HYPRE_Int ilut_row_private(HYPRE_Int localRow, HYPRE_Int *list, HYPRE_Int *o2n_c
     val = *AVAL++;
     val *= scale;       /* scale the value */
 
-    if (fabs(val) > thresh || col == localRow) {  /* sparsification */
+    if (hypre_abs(val) > thresh || col == localRow) {  /* sparsification */
       ++count;
       while (col > list[tmp]) tmp = list[tmp];
       list[col]   = list[tmp];
@@ -822,7 +824,7 @@ HYPRE_Int ilut_row_private(HYPRE_Int localRow, HYPRE_Int *list, HYPRE_Int *o2n_c
       mult = pc / pv;
 
       /* update localRow from previously factored "row" */
-      if (fabs(mult) > droptol) {
+      if (hypre_abs(mult) > droptol) {
         work[row] = mult;
 
         for (j=diag[row]+1; j<rp[row+1]; ++j) {
@@ -838,7 +840,7 @@ HYPRE_Int ilut_row_private(HYPRE_Int localRow, HYPRE_Int *list, HYPRE_Int *o2n_c
             list[tmp] = col;
             ++count;                /* increment fill count */
           }
-        } 
+        }
       }
     }
     head = list[head];  /* advance to next item in linked list */
@@ -850,7 +852,7 @@ HYPRE_Int ilut_row_private(HYPRE_Int localRow, HYPRE_Int *list, HYPRE_Int *o2n_c
 
 #undef __FUNC__
 #define __FUNC__ "check_constraint_private"
-bool check_constraint_private(Euclid_dh ctx, HYPRE_Int p1, HYPRE_Int j) 
+bool check_constraint_private(Euclid_dh ctx, HYPRE_Int p1, HYPRE_Int j)
 {
   START_FUNC_DH
   bool retval = false;
@@ -861,7 +863,7 @@ bool check_constraint_private(Euclid_dh ctx, HYPRE_Int p1, HYPRE_Int j)
   if (sg == NULL) {
     SET_ERROR(-1, "ctx->sg == NULL");
   }
-  
+
   p2 = SubdomainGraph_dhFindOwner(ctx->sg, j, true);
 
 
diff --git a/external/hypre/src/distributed_ls/Euclid/io_dh.c b/external/hypre/src/distributed_ls/Euclid/io_dh.c
index e21cef56..35a66333 100644
--- a/external/hypre/src/distributed_ls/Euclid/io_dh.c
+++ b/external/hypre/src/distributed_ls/Euclid/io_dh.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -40,17 +40,45 @@ void closeFile_dh(FILE *fpIN)
 
 /*----------------------------------------------------------------*/
 void io_dh_print_ebin_mat_private(HYPRE_Int m, HYPRE_Int beg_row,
-                                HYPRE_Int *rp, HYPRE_Int *cval, HYPRE_Real *aval, 
+                                HYPRE_Int *rp, HYPRE_Int *cval, HYPRE_Real *aval,
                            HYPRE_Int *n2o, HYPRE_Int *o2n, Hash_i_dh hash, char *filename)
-{}
+{
+  HYPRE_UNUSED_VAR(m);
+  HYPRE_UNUSED_VAR(beg_row);
+  HYPRE_UNUSED_VAR(rp);
+  HYPRE_UNUSED_VAR(cval);
+  HYPRE_UNUSED_VAR(aval);
+  HYPRE_UNUSED_VAR(n2o);
+  HYPRE_UNUSED_VAR(o2n);
+  HYPRE_UNUSED_VAR(hash);
+  HYPRE_UNUSED_VAR(filename);
+}
 
 extern void io_dh_read_ebin_mat_private(HYPRE_Int *m, HYPRE_Int **rp, HYPRE_Int **cval,
                                      HYPRE_Real **aval, char *filename)
-{}
+{
+  HYPRE_UNUSED_VAR(m);
+  HYPRE_UNUSED_VAR(rp);
+  HYPRE_UNUSED_VAR(cval);
+  HYPRE_UNUSED_VAR(aval);
+  HYPRE_UNUSED_VAR(filename);
+}
 
 void io_dh_print_ebin_vec_private(HYPRE_Int n, HYPRE_Int beg_row, HYPRE_Real *vals,
                            HYPRE_Int *n2o, HYPRE_Int *o2n, Hash_i_dh hash, char *filename)
-{}
+{
+  HYPRE_UNUSED_VAR(n);
+  HYPRE_UNUSED_VAR(beg_row);
+  HYPRE_UNUSED_VAR(vals);
+  HYPRE_UNUSED_VAR(n2o);
+  HYPRE_UNUSED_VAR(o2n);
+  HYPRE_UNUSED_VAR(hash);
+  HYPRE_UNUSED_VAR(filename);
+}
 
 void io_dh_read_ebin_vec_private(HYPRE_Int *n, HYPRE_Real **vals, char *filename)
-{}
+{
+  HYPRE_UNUSED_VAR(n);
+  HYPRE_UNUSED_VAR(vals);
+  HYPRE_UNUSED_VAR(filename);
+}
diff --git a/external/hypre/src/distributed_ls/Euclid/io_dh.h b/external/hypre/src/distributed_ls/Euclid/io_dh.h
index 55c8e4a4..4e9b1881 100644
--- a/external/hypre/src/distributed_ls/Euclid/io_dh.h
+++ b/external/hypre/src/distributed_ls/Euclid/io_dh.h
@@ -1,12 +1,12 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
  ******************************************************************************/
 
 /*
-   Note: this module contains functionality for reading/writing 
+   Note: this module contains functionality for reading/writing
          Euclid's binary io format, and opening and closing files.
          Additional io can be found in in mat_dh_private, which contains
          private functions for reading/writing various matrix and
@@ -29,11 +29,11 @@ extern void closeFile_dh(FILE *fpIN);
  * binary io; these are called by functions in mat_dh_private
  *---------------------------------------------------------------------------*/
 
-bool isSmallEndian();
+bool isSmallEndian(void);
 
 /* seq only ?? */
 extern void io_dh_print_ebin_mat_private(HYPRE_Int m, HYPRE_Int beg_row,
-                                HYPRE_Int *rp, HYPRE_Int *cval, HYPRE_Real *aval, 
+                                HYPRE_Int *rp, HYPRE_Int *cval, HYPRE_Real *aval,
                            HYPRE_Int *n2o, HYPRE_Int *o2n, Hash_i_dh hash, char *filename);
 
 /* seq only ?? */
diff --git a/external/hypre/src/distributed_ls/Euclid/krylov_dh.c b/external/hypre/src/distributed_ls/Euclid/krylov_dh.c
index e0a7f8b6..d6678ab9 100644
--- a/external/hypre/src/distributed_ls/Euclid/krylov_dh.c
+++ b/external/hypre/src/distributed_ls/Euclid/krylov_dh.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -23,10 +23,10 @@ void bicgstab_euclid(Mat_dh A, Euclid_dh ctx, HYPRE_Real *x, HYPRE_Real *b, HYPR
   HYPRE_Real atol = ctx->atol, rtol = ctx->rtol;
 
   /* scalars */
-  HYPRE_Real alpha, alpha_1,
+  HYPRE_Real alpha, alpha_1 = 1.0,
          beta_1,
-         widget, widget_1,
-         rho_1, rho_2,
+         widget, widget_1 = 1.0,
+         rho_1, rho_2 = 1.0,
          s_norm, eps,
          exit_a, b_iprod, r_iprod;
 
@@ -58,7 +58,7 @@ void bicgstab_euclid(Mat_dh A, Euclid_dh ctx, HYPRE_Real *x, HYPRE_Real *b, HYPR
 
   its = 0;
   while(1) {
-    ++its;  
+    ++its;
     rho_1 = InnerProd(m, r_hat, r);
     if (rho_1 == 0) {
       SET_V_ERROR("(r_hat . r) = 0; method fails");
@@ -68,7 +68,7 @@ void bicgstab_euclid(Mat_dh A, Euclid_dh ctx, HYPRE_Real *x, HYPRE_Real *b, HYPR
       CopyVec(m, r, p);   /* p = r_0 */ CHECK_V_ERROR;
     } else {
       beta_1 = (rho_1/rho_2)*(alpha_1/widget_1);
-      
+
       /* p_i = r_(i-1) + beta_(i-1)*( p_(i-1) - w_(i-1)*v_(i-1) ) */
       Axpy(m, -widget_1, v, p); CHECK_V_ERROR;
       ScaleVec(m, beta_1, p); CHECK_V_ERROR;
@@ -132,7 +132,7 @@ void bicgstab_euclid(Mat_dh A, Euclid_dh ctx, HYPRE_Real *x, HYPRE_Real *b, HYPR
 
     /* monitor convergence */
     if (monitor && myid_dh == 0) {
-      hypre_fprintf(stderr, "[it = %i] %e\n", its, sqrt(r_iprod/b_iprod));
+      hypre_fprintf(stderr, "[it = %i] %e\n", its, hypre_sqrt(r_iprod/b_iprod));
     }
 
     /* prepare for next iteration */
@@ -212,7 +212,7 @@ void cg_euclid(Mat_dh A, Euclid_dh ctx, HYPRE_Real *x, HYPRE_Real *b, HYPRE_Int
 
     /* r = r - alpha*s */
     Axpy(m, -alpha, s, r); CHECK_V_ERROR;
-         
+
     /* solve Ms = r */
     Euclid_dhApply(ctx, r, s); CHECK_V_ERROR;
 
@@ -223,7 +223,7 @@ void cg_euclid(Mat_dh A, Euclid_dh ctx, HYPRE_Real *x, HYPRE_Real *b, HYPRE_Int
     i_prod = InnerProd(m, r, r); CHECK_V_ERROR;
 
     if (monitor && myid_dh == 0) {
-      hypre_fprintf(stderr, "iter = %i  rel. resid. norm: %e\n", its, sqrt(i_prod/bi_prod));
+      hypre_fprintf(stderr, "iter = %i  rel. resid. norm: %e\n", its, hypre_sqrt(i_prod/bi_prod));
     }
 
     /* check for convergence */
diff --git a/external/hypre/src/distributed_ls/Euclid/krylov_dh.h b/external/hypre/src/distributed_ls/Euclid/krylov_dh.h
index b1587149..84af54b2 100644
--- a/external/hypre/src/distributed_ls/Euclid/krylov_dh.h
+++ b/external/hypre/src/distributed_ls/Euclid/krylov_dh.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/Euclid/macros_dh.h b/external/hypre/src/distributed_ls/Euclid/macros_dh.h
index 9e273294..c35459f0 100644
--- a/external/hypre/src/distributed_ls/Euclid/macros_dh.h
+++ b/external/hypre/src/distributed_ls/Euclid/macros_dh.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -29,11 +29,8 @@
 #endif
 
 /* used in Mat_SEQ_PrintTriples, so matlab won't discard zeros (yuck!) */
-#ifdef HYPRE_SINGLE
-#define _MATLAB_ZERO_  1e-30
-#else // default
-#define _MATLAB_ZERO_  1e-100
-#endif
+#define _MATLAB_ZERO_  HYPRE_REAL_MIN
+
 
 
 /*---------------------------------------------------------------------- 
diff --git a/external/hypre/src/distributed_ls/Euclid/mat_dh_private.c b/external/hypre/src/distributed_ls/Euclid/mat_dh_private.c
index 3f13e515..853cb3e7 100644
--- a/external/hypre/src/distributed_ls/Euclid/mat_dh_private.c
+++ b/external/hypre/src/distributed_ls/Euclid/mat_dh_private.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -110,6 +110,8 @@ void mat_dh_print_graph_private(HYPRE_Int m, HYPRE_Int beg_row, HYPRE_Int *rp, H
 void mat_dh_print_graph_private(HYPRE_Int m, HYPRE_Int beg_row, HYPRE_Int *rp, HYPRE_Int *cval,
                     HYPRE_Real *aval, HYPRE_Int *n2o, HYPRE_Int *o2n, Hash_i_dh hash, FILE* fp)
 {
+  HYPRE_UNUSED_VAR(aval);
+
   START_FUNC_DH
   HYPRE_Int i, j, row, col;
   bool private_n2o = false;
@@ -587,7 +589,7 @@ void fix_diags_private(Mat_dh A)
   for (i=0; i<m; ++i) {
     HYPRE_Real sum = 0;
     for (j=rp[i]; j<rp[i+1]; ++j) {
-      sum = MAX(sum, fabs(aval[j]));
+      sum = MAX(sum, hypre_abs(aval[j]));
     }
     for (j=rp[i]; j<rp[i+1]; ++j) {
       if (cval[j] == i) {
@@ -882,7 +884,7 @@ void mat_dh_transpose_reuse_private_private(bool allocateMem, HYPRE_Int m,
   START_FUNC_DH
   HYPRE_Int *rp, *cval, *tmp;
   HYPRE_Int i, j, nz = RP[m];
-  HYPRE_Real *aval;
+  HYPRE_Real *aval = NULL;
 
   if (allocateMem) {
     rp = *rpOUT = (HYPRE_Int *)MALLOC_DH((1+m)*sizeof(HYPRE_Int)); CHECK_V_ERROR;
@@ -1504,7 +1506,7 @@ void profileMat(Mat_dh A)
   HYPRE_Int m;
   HYPRE_Int i, j;
   HYPRE_Int *work1=NULL;
-  HYPRE_Real *work2;
+  HYPRE_Real *work2=NULL;
   bool isStructurallySymmetric = true;
   bool isNumericallySymmetric = true;
   bool is_Triangular = false;
diff --git a/external/hypre/src/distributed_ls/Euclid/mat_dh_private.h b/external/hypre/src/distributed_ls/Euclid/mat_dh_private.h
index 5e0ff454..b099faa2 100644
--- a/external/hypre/src/distributed_ls/Euclid/mat_dh_private.h
+++ b/external/hypre/src/distributed_ls/Euclid/mat_dh_private.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/Euclid/shellSort_dh.c b/external/hypre/src/distributed_ls/Euclid/shellSort_dh.c
index 066ebdac..4edd498f 100644
--- a/external/hypre/src/distributed_ls/Euclid/shellSort_dh.c
+++ b/external/hypre/src/distributed_ls/Euclid/shellSort_dh.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/Euclid/shellSort_dh.h b/external/hypre/src/distributed_ls/Euclid/shellSort_dh.h
index 29c18e35..bb860b46 100644
--- a/external/hypre/src/distributed_ls/Euclid/shellSort_dh.h
+++ b/external/hypre/src/distributed_ls/Euclid/shellSort_dh.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/Euclid/sig_dh.c b/external/hypre/src/distributed_ls/Euclid/sig_dh.c
index 92bc0126..1841061e 100644
--- a/external/hypre/src/distributed_ls/Euclid/sig_dh.c
+++ b/external/hypre/src/distributed_ls/Euclid/sig_dh.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -17,7 +17,7 @@
 
 #include <signal.h>
 
-extern void sigRegister_dh();
+extern void sigRegister_dh(void);
 extern void sigHandler_dh(hypre_int sig);
 
 /* 
@@ -85,7 +85,7 @@ void sigHandler_dh(hypre_int sig)
 
 #undef __FUNC__
 #define __FUNC__ "sigRegister_dh"
-void sigRegister_dh()
+void sigRegister_dh(void)
 {
   if (Parser_dhHasSwitch(parser_dh, "-sig_dh")) {
     hypre_int i;
diff --git a/external/hypre/src/distributed_ls/Euclid/sig_dh.h b/external/hypre/src/distributed_ls/Euclid/sig_dh.h
index 66370686..ba10f69c 100644
--- a/external/hypre/src/distributed_ls/Euclid/sig_dh.h
+++ b/external/hypre/src/distributed_ls/Euclid/sig_dh.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/ParaSails/CMakeLists.txt b/external/hypre/src/distributed_ls/ParaSails/CMakeLists.txt
index ac677ef1..585adefb 100644
--- a/external/hypre/src/distributed_ls/ParaSails/CMakeLists.txt
+++ b/external/hypre/src/distributed_ls/ParaSails/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/ParaSails/Common.h b/external/hypre/src/distributed_ls/ParaSails/Common.h
index b8ff4fe5..6958ddc6 100644
--- a/external/hypre/src/distributed_ls/ParaSails/Common.h
+++ b/external/hypre/src/distributed_ls/ParaSails/Common.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/ParaSails/ConjGrad.c b/external/hypre/src/distributed_ls/ParaSails/ConjGrad.c
index fbe968ba..0ef71b36 100644
--- a/external/hypre/src/distributed_ls/ParaSails/ConjGrad.c
+++ b/external/hypre/src/distributed_ls/ParaSails/ConjGrad.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -135,7 +135,7 @@ void PCG_ParaSails(Matrix *mat, ParaSails *ps, HYPRE_Real *b, HYPRE_Real *x,
 
 #ifdef PARASAILS_CG_PRINT
       if (mype == 0 && i % 100 == 0)
-         hypre_printf("Iter (%d): rel. resid. norm: %e\n", i, sqrt(i_prod/bi_prod));
+         hypre_printf("Iter (%d): rel. resid. norm: %e\n", i, hypre_sqrt(i_prod/bi_prod));
 #endif
 
       /* check for convergence */
@@ -170,5 +170,5 @@ void PCG_ParaSails(Matrix *mat, ParaSails *ps, HYPRE_Real *b, HYPRE_Real *x,
    hypre_TFree(r, HYPRE_MEMORY_HOST);
 
    if (mype == 0)
-      hypre_printf("Iter (%4d): computed rrn    : %e\n", i, sqrt(i_prod/bi_prod));
+      hypre_printf("Iter (%4d): computed rrn    : %e\n", i, hypre_sqrt(i_prod/bi_prod));
 }
diff --git a/external/hypre/src/distributed_ls/ParaSails/ConjGrad.h b/external/hypre/src/distributed_ls/ParaSails/ConjGrad.h
index 781a9f8a..990f84c9 100644
--- a/external/hypre/src/distributed_ls/ParaSails/ConjGrad.h
+++ b/external/hypre/src/distributed_ls/ParaSails/ConjGrad.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/ParaSails/DiagScale.c b/external/hypre/src/distributed_ls/ParaSails/DiagScale.c
index 82cd2212..a347cf6b 100644
--- a/external/hypre/src/distributed_ls/ParaSails/DiagScale.c
+++ b/external/hypre/src/distributed_ls/ParaSails/DiagScale.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -162,7 +162,7 @@ DiagScale *DiagScaleCreate(Matrix *A, Numbering *numb)
             if (ind[j] == row)
             {
                 if (val[j] != 0.0)
-                    p->local_diags[row] = 1.0 / sqrt(ABS(val[j]));
+                    p->local_diags[row] = 1.0 / hypre_sqrt(ABS(val[j]));
                 break;
             }
         }
diff --git a/external/hypre/src/distributed_ls/ParaSails/DiagScale.h b/external/hypre/src/distributed_ls/ParaSails/DiagScale.h
index e6b6d80d..da7d7a1b 100644
--- a/external/hypre/src/distributed_ls/ParaSails/DiagScale.h
+++ b/external/hypre/src/distributed_ls/ParaSails/DiagScale.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/ParaSails/FGmres.c b/external/hypre/src/distributed_ls/ParaSails/FGmres.c
index 573c6000..fd9a5ac4 100644
--- a/external/hypre/src/distributed_ls/ParaSails/FGmres.c
+++ b/external/hypre/src/distributed_ls/ParaSails/FGmres.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -61,11 +61,11 @@ GeneratePlaneRotation(HYPRE_Real dx, HYPRE_Real dy, HYPRE_Real *cs, HYPRE_Real *
     *sn = 0.0;
   } else if (ABS(dy) > ABS(dx)) {
     HYPRE_Real temp = dx / dy;
-    *sn = 1.0 / sqrt( 1.0 + temp*temp );
+    *sn = 1.0 / hypre_sqrt( 1.0 + temp*temp );
     *cs = temp * *sn;
   } else {
     HYPRE_Real temp = dy / dx;
-    *cs = 1.0 / sqrt( 1.0 + temp*temp );
+    *cs = 1.0 / hypre_sqrt( 1.0 + temp*temp );
     *sn = temp * *cs;
   }
 }
@@ -109,7 +109,7 @@ void FGMRES_ParaSails(Matrix *mat, ParaSails *ps, HYPRE_Real *b, HYPRE_Real *x,
         /* compute initial residual and its norm */
         MatrixMatvec(mat, x, V(0));                      /* V(0) = A*x        */
         Axpy(n, -1.0, b, V(0));                          /* V(0) = V(0) - b   */
-        beta = sqrt(InnerProd(n, V(0), V(0), comm));     /* beta = norm(V(0)) */
+        beta = hypre_sqrt(InnerProd(n, V(0), V(0), comm));     /* beta = norm(V(0)) */
         ScaleVector(n, -1.0/beta, V(0));                 /* V(0) = -V(0)/beta */
 
         /* save very first residual norm */
@@ -140,7 +140,7 @@ void FGMRES_ParaSails(Matrix *mat, ParaSails *ps, HYPRE_Real *b, HYPRE_Real *x,
                 Axpy(n, -H(k,i), V(k), V(i+1));
             }
 
-            H(i+1, i) = sqrt(InnerProd(n, V(i+1), V(i+1), comm));
+            H(i+1, i) = hypre_sqrt(InnerProd(n, V(i+1), V(i+1), comm));
             /* V(i+1) = V(i+1) / H(i+1, i) */
             ScaleVector(n, 1.0 / H(i+1, i), V(i+1));
 
@@ -181,7 +181,7 @@ void FGMRES_ParaSails(Matrix *mat, ParaSails *ps, HYPRE_Real *b, HYPRE_Real *x,
     /* compute exact residual norm reduction */
     MatrixMatvec(mat, x, V(0));                         /* V(0) = A*x        */
     Axpy(n, -1.0, b, V(0));                             /* V(0) = V(0) - b   */
-    beta = sqrt(InnerProd(n, V(0), V(0), comm));        /* beta = norm(V(0)) */
+    beta = hypre_sqrt(InnerProd(n, V(0), V(0), comm));        /* beta = norm(V(0)) */
     rel_resid = beta / resid0;
 
     if (mype == 0)
diff --git a/external/hypre/src/distributed_ls/ParaSails/Hash.c b/external/hypre/src/distributed_ls/ParaSails/Hash.c
index c872e390..55a20a4c 100644
--- a/external/hypre/src/distributed_ls/ParaSails/Hash.c
+++ b/external/hypre/src/distributed_ls/ParaSails/Hash.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/ParaSails/Hash.h b/external/hypre/src/distributed_ls/ParaSails/Hash.h
index cf7a7af9..116f494d 100644
--- a/external/hypre/src/distributed_ls/ParaSails/Hash.h
+++ b/external/hypre/src/distributed_ls/ParaSails/Hash.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/ParaSails/LoadBal.c b/external/hypre/src/distributed_ls/ParaSails/LoadBal.c
index 2f6d60c7..60deb4b5 100644
--- a/external/hypre/src/distributed_ls/ParaSails/LoadBal.c
+++ b/external/hypre/src/distributed_ls/ParaSails/LoadBal.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/ParaSails/LoadBal.h b/external/hypre/src/distributed_ls/ParaSails/LoadBal.h
index c375354f..066ba0be 100644
--- a/external/hypre/src/distributed_ls/ParaSails/LoadBal.h
+++ b/external/hypre/src/distributed_ls/ParaSails/LoadBal.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/ParaSails/Matrix.c b/external/hypre/src/distributed_ls/ParaSails/Matrix.c
index ef45ca0a..cc9f3622 100644
--- a/external/hypre/src/distributed_ls/ParaSails/Matrix.c
+++ b/external/hypre/src/distributed_ls/ParaSails/Matrix.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -181,10 +181,16 @@ void MatrixSetRow(Matrix *mat, HYPRE_Int row, HYPRE_Int len, HYPRE_Int *ind, HYP
    mat->vals[row] = (HYPRE_Real *) MemAlloc(mat->mem, len*sizeof(HYPRE_Real));
 
    if (ind != NULL)
-      hypre_TMemcpy(mat->inds[row],  ind, HYPRE_Int, len, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
+   {
+      //hypre_TMemcpy(mat->inds[row], ind, HYPRE_Int, len, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
+      memcpy(mat->inds[row], ind, sizeof(HYPRE_Int) * len);
+   }
 
    if (val != NULL)
-      hypre_TMemcpy(mat->vals[row],  val, HYPRE_Real, len, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
+   {
+      //hypre_TMemcpy(mat->vals[row], val, HYPRE_Real, len, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
+      memcpy(mat->vals[row], val, sizeof(HYPRE_Real) * len);
+   }
 }
 
 /*--------------------------------------------------------------------------
diff --git a/external/hypre/src/distributed_ls/ParaSails/Matrix.h b/external/hypre/src/distributed_ls/ParaSails/Matrix.h
index 7cb24f11..c754be09 100644
--- a/external/hypre/src/distributed_ls/ParaSails/Matrix.h
+++ b/external/hypre/src/distributed_ls/ParaSails/Matrix.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/ParaSails/Mem.c b/external/hypre/src/distributed_ls/ParaSails/Mem.c
index 2edb8056..ec336808 100644
--- a/external/hypre/src/distributed_ls/ParaSails/Mem.c
+++ b/external/hypre/src/distributed_ls/ParaSails/Mem.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -38,7 +38,7 @@
  * MemCreate - Return (a pointer to) a memory pool object.
  *--------------------------------------------------------------------------*/
 
-Mem *MemCreate()
+Mem *MemCreate(void)
 {
     Mem *m = hypre_TAlloc(Mem, 1, HYPRE_MEMORY_HOST);
 
diff --git a/external/hypre/src/distributed_ls/ParaSails/Mem.h b/external/hypre/src/distributed_ls/ParaSails/Mem.h
index 26e58654..2092ae15 100644
--- a/external/hypre/src/distributed_ls/ParaSails/Mem.h
+++ b/external/hypre/src/distributed_ls/ParaSails/Mem.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -33,7 +33,7 @@ typedef struct
 }
 Mem;
 
-Mem  *MemCreate();
+Mem  *MemCreate(void);
 void  MemDestroy(Mem *m);
 char *MemAlloc(Mem *m, HYPRE_Int size);
 void  MemStat(Mem *m, FILE *stream, char *msg);
diff --git a/external/hypre/src/distributed_ls/ParaSails/Numbering.c b/external/hypre/src/distributed_ls/ParaSails/Numbering.c
index 878ee42e..80a9b576 100644
--- a/external/hypre/src/distributed_ls/ParaSails/Numbering.c
+++ b/external/hypre/src/distributed_ls/ParaSails/Numbering.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/ParaSails/Numbering.h b/external/hypre/src/distributed_ls/ParaSails/Numbering.h
index 969c6e68..1ed2317e 100644
--- a/external/hypre/src/distributed_ls/ParaSails/Numbering.h
+++ b/external/hypre/src/distributed_ls/ParaSails/Numbering.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/ParaSails/OrderStat.c b/external/hypre/src/distributed_ls/ParaSails/OrderStat.c
index be9e9871..431a6168 100644
--- a/external/hypre/src/distributed_ls/ParaSails/OrderStat.c
+++ b/external/hypre/src/distributed_ls/ParaSails/OrderStat.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/ParaSails/OrderStat.h b/external/hypre/src/distributed_ls/ParaSails/OrderStat.h
index 38e314b4..b1703b5c 100644
--- a/external/hypre/src/distributed_ls/ParaSails/OrderStat.h
+++ b/external/hypre/src/distributed_ls/ParaSails/OrderStat.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/ParaSails/ParaSails.c b/external/hypre/src/distributed_ls/ParaSails/ParaSails.c
index 2c63d8ae..e09236d4 100644
--- a/external/hypre/src/distributed_ls/ParaSails/ParaSails.c
+++ b/external/hypre/src/distributed_ls/ParaSails/ParaSails.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -41,7 +41,6 @@ static void bzero(char *a, HYPRE_Int n) {HYPRE_Int i; for (i=0; i<n; i++) {a[i]=
 #endif
 #endif
 
-
 /******************************************************************************
  *
  * ParaSails private functions
@@ -796,8 +795,10 @@ static void ConstructPatternForEachRow(HYPRE_Int symmetric, PrunedRows *pruned_r
     HYPRE_Int row, len, *ind, level, lenprev, *indprev;
     HYPRE_Int i, j;
     RowPatt *row_patt;
-    HYPRE_Int nnz = 0;
     HYPRE_Int npes;
+#ifdef PARASAILS_DEBUG
+    HYPRE_Int nnz = 0;
+#endif
 
     hypre_MPI_Comm_size(M->comm, &npes);
     *costp = 0.0;
@@ -844,16 +845,19 @@ static void ConstructPatternForEachRow(HYPRE_Int symmetric, PrunedRows *pruned_r
         /* Following statement allocates space but does not store values */
         MatrixSetRow(M, row+M->beg_row, len, ind, NULL);
 
-        nnz += len;
         (*costp) += (HYPRE_Real) len*len*len;
+#ifdef PARASAILS_DEBUG
+        nnz += len;
+#endif
     }
 
-#if 0
+#ifdef PARASAILS_DEBUG
     {
-    HYPRE_Int mype;
-    hypre_MPI_Comm_rank(hypre_MPI_COMM_WORLD, &mype);
-    hypre_printf("%d: nnz: %10d  ********* cost %7.1e\n", mype, nnz, *costp);
-    fflush(stdout);
+       HYPRE_Int mype;
+
+       hypre_MPI_Comm_rank(hypre_MPI_COMM_WORLD, &mype);
+       hypre_printf("%d: nnz: %10d  ********* cost %7.1e\n", mype, nnz, *costp);
+       fflush(stdout);
     }
 #endif
 
@@ -869,16 +873,18 @@ static void ConstructPatternForEachRow(HYPRE_Int symmetric, PrunedRows *pruned_r
  *               This is the approximate inverse with lower triangular pattern
  *--------------------------------------------------------------------------*/
 
-static void ConstructPatternForEachRowExt(HYPRE_Int symmetric, 
-  PrunedRows *pruned_rows_global, PrunedRows *pruned_rows_local, 
+static void ConstructPatternForEachRowExt(HYPRE_Int symmetric,
+  PrunedRows *pruned_rows_global, PrunedRows *pruned_rows_local,
   HYPRE_Int num_levels, Numbering *numb, Matrix *M, HYPRE_Real *costp)
 {
     HYPRE_Int row, len, *ind, level, lenprev, *indprev;
     HYPRE_Int i, j;
     RowPatt *row_patt;
     RowPatt *row_patt2;
-    HYPRE_Int nnz = 0;
     HYPRE_Int npes;
+#ifdef PARASAILS_DEBUG
+    HYPRE_Int nnz = 0;
+#endif
 
     hypre_MPI_Comm_size(M->comm, &npes);
     *costp = 0.0;
@@ -906,7 +912,7 @@ static void ConstructPatternForEachRowExt(HYPRE_Int symmetric,
         }
 
         /***********************
-	 * Now do the transpose 
+	 * Now do the transpose
 	 ***********************/
 
         /* Get initial pattern for row */
@@ -969,16 +975,19 @@ static void ConstructPatternForEachRowExt(HYPRE_Int symmetric,
         /* Following statement allocates space but does not store values */
         MatrixSetRow(M, row+M->beg_row, len, ind, NULL);
 
-        nnz += len;
         (*costp) += (HYPRE_Real) len*len*len;
+#ifdef PARASAILS_DEBUG
+        nnz += len;
+#endif
     }
 
-#if 0
+#ifdef PARASAILS_DEBUG
     {
-    HYPRE_Int mype;
-    hypre_MPI_Comm_rank(hypre_MPI_COMM_WORLD, &mype);
-    hypre_printf("%d: nnz: %10d  ********* cost %7.1e\n", mype, nnz, *costp);
-    fflush(stdout);
+       HYPRE_Int mype;
+
+       hypre_MPI_Comm_rank(hypre_MPI_COMM_WORLD, &mype);
+       hypre_printf("%d: nnz: %10d  ********* cost %7.1e\n", mype, nnz, *costp);
+       fflush(stdout);
     }
 #endif
 
@@ -1000,11 +1009,13 @@ static HYPRE_Int ComputeValuesSym(StoredRows *stored_rows, Matrix *mat,
     HYPRE_Real *ahat, *ahatp;
     HYPRE_Int i, j, len2, *ind2, loc;
     HYPRE_Real *val2, temp;
-    HYPRE_Real time0, time1, timet = 0.0, timea = 0.0;
+    HYPRE_Int error = 0;
 
+#ifdef PARASAILS_DEBUG
+    HYPRE_Real time0, time1;
+    HYPRE_Real timet = 0.0, timea = 0.0;
     HYPRE_Real ahatcost = 0.0;
-
-    HYPRE_Real error = 0;
+#endif
 
 #ifndef ESSL
     char uplo = 'L';
@@ -1051,7 +1062,9 @@ static HYPRE_Int ComputeValuesSym(StoredRows *stored_rows, Matrix *mat,
         memset(ahat, 0, len*len * sizeof(HYPRE_Real));
 #endif
 
+#ifdef PARASAILS_DEBUG
         time0 = hypre_MPI_Wtime();
+#endif
 
         /* Form ahat matrix, entries correspond to indices in "ind" only */
         ahatp = ahat;
@@ -1105,9 +1118,11 @@ static HYPRE_Int ComputeValuesSym(StoredRows *stored_rows, Matrix *mat,
 #endif
         }
 
+#ifdef PARASAILS_DEBUG
         time1 = hypre_MPI_Wtime();
-        timea += (time1-time0);
+        timea += (time1 - time0);
         ahatcost += (HYPRE_Real) (len*len2);
+#endif
 
         /* Set the right-hand side */
 /*        bzero((char *) val, len*sizeof(HYPRE_Real));*/
@@ -1121,7 +1136,9 @@ static HYPRE_Int ComputeValuesSym(StoredRows *stored_rows, Matrix *mat,
         for (i=0; i<len; i++)
             marker[ind[i]] = -1;
 
+#ifdef PARASAILS_DEBUG
         time0 = hypre_MPI_Wtime();
+#endif
 
 #ifdef ESSL
         dppf(ahat, len, 1);
@@ -1154,11 +1171,14 @@ static HYPRE_Int ComputeValuesSym(StoredRows *stored_rows, Matrix *mat,
             error = 1;
         }
 #endif
+
+#ifdef PARASAILS_DEBUG
         time1 = hypre_MPI_Wtime();
-        timet += (time1-time0);
+        timet += (time1 - time0);
+#endif
 
         /* Scale the result */
-        temp = 1.0 / sqrt(ABS(val[loc]));
+        temp = 1.0 / hypre_sqrt(ABS(val[loc]));
         for (i=0; i<len; i++)
             val[i] = val[i] * temp;
     }
@@ -1166,14 +1186,15 @@ static HYPRE_Int ComputeValuesSym(StoredRows *stored_rows, Matrix *mat,
     hypre_TFree(marker,HYPRE_MEMORY_HOST);
     hypre_TFree(ahat,HYPRE_MEMORY_HOST);
 
-#if 0
+#ifdef PARASAILS_DEBUG
     {
-    HYPRE_Int mype;
-    hypre_MPI_Comm_rank(hypre_MPI_COMM_WORLD, &mype);
-    hypre_printf("%d: Time for ahat: %f, for local solves: %f\n", mype, timea, timet);
-    hypre_printf("%d: ahatcost: %7.1e, numrows: %d, maxlen: %d\n",
-        mype, ahatcost, mat->end_row-local_beg_row+1, maxlen);
-    fflush(stdout);
+       HYPRE_Int mype;
+
+       hypre_MPI_Comm_rank(hypre_MPI_COMM_WORLD, &mype);
+       hypre_printf("%d: Time for ahat: %f, for local solves: %f\n", mype, timea, timet);
+       hypre_printf("%d: ahatcost: %7.1e, numrows: %d, maxlen: %d\n",
+                    mype, ahatcost, mat->end_row-local_beg_row+1, maxlen);
+       fflush(stdout);
     }
 #endif
 
@@ -1197,7 +1218,11 @@ static HYPRE_Int ComputeValuesNonsym(StoredRows *stored_rows, Matrix *mat,
 
     HYPRE_Int i, j, len2, *ind2, loc;
     HYPRE_Real *val2;
-    HYPRE_Real time0, time1, timet = 0.0, timea = 0.0;
+
+#ifdef PARASAILS_DEBUG
+    HYPRE_Real time0, time1;
+    HYPRE_Real timet = 0.0, timea = 0.0;
+#endif
 
     HYPRE_Int npat;
     HYPRE_Int pattsize = 1000;
@@ -1226,7 +1251,9 @@ static HYPRE_Int ComputeValuesNonsym(StoredRows *stored_rows, Matrix *mat,
     /* Compute values for row "row" of approximate inverse */
     for (row=local_beg_row; row<=mat->end_row; row++)
     {
+#ifdef PARASAILS_DEBUG
         time0 = hypre_MPI_Wtime();
+#endif
 
         /* Retrieve local indices */
         MatrixGetRow(mat, row - mat->beg_row, &len, &ind, &val);
@@ -1286,8 +1313,10 @@ static HYPRE_Int ComputeValuesNonsym(StoredRows *stored_rows, Matrix *mat,
             ahatp += npat;
         }
 
+#ifdef PARASAILS_DEBUG
         time1 = hypre_MPI_Wtime();
-        timea += (time1-time0);
+        timea += (time1 - time0);
+#endif
 
         /* Reallocate bhat if necessary */
         if (npat > bhat_size)
@@ -1309,7 +1338,9 @@ static HYPRE_Int ComputeValuesNonsym(StoredRows *stored_rows, Matrix *mat,
         for (i=0; i<npat; i++)
             marker[patt[i]] = -1;
 
+#ifdef PARASAILS_DEBUG
         time0 = hypre_MPI_Wtime();
+#endif
 
 #ifdef ESSL
         /* rhs in bhat, and put solution in val */
@@ -1335,8 +1366,10 @@ static HYPRE_Int ComputeValuesNonsym(StoredRows *stored_rows, Matrix *mat,
         for (j=0; j<len; j++)
             val[j] = bhat[j];
 #endif
+#ifdef PARASAILS_DEBUG
         time1 = hypre_MPI_Wtime();
-        timet += (time1-time0);
+        timet += (time1 - time0);
+#endif
     }
 
     hypre_TFree(patt,HYPRE_MEMORY_HOST);
@@ -1345,12 +1378,13 @@ static HYPRE_Int ComputeValuesNonsym(StoredRows *stored_rows, Matrix *mat,
     hypre_TFree(ahat,HYPRE_MEMORY_HOST);
     hypre_TFree(work,HYPRE_MEMORY_HOST);
 
-#if 0
+#ifdef PARASAILS_DEBUG
     {
-    HYPRE_Int mype;
-    hypre_MPI_Comm_rank(hypre_MPI_COMM_WORLD, &mype);
-    hypre_printf("%d: Time for ahat: %f, for local solves: %f\n", mype, timea, timet);
-    fflush(stdout);
+       HYPRE_Int mype;
+
+       hypre_MPI_Comm_rank(hypre_MPI_COMM_WORLD, &mype);
+       hypre_printf("%d: Time for ahat: %f, for local solves: %f\n", mype, timea, timet);
+       fflush(stdout);
     }
 #endif
 
@@ -1564,7 +1598,7 @@ static void Rescale(Matrix *M, StoredRows *stored_rows, HYPRE_Int num_ind)
         }
 
         /* Scale the row */
-        accum = 1./sqrt(accum);
+        accum = 1./hypre_sqrt(accum);
         for (j=0; j<len; j++)
             val[j] *= accum;
     }
@@ -1710,15 +1744,15 @@ void ParaSailsSetupPatternExt(ParaSails *ps, Matrix *A,
     if (ps->thresh < 0.0)
         ps->thresh = SelectThresh(ps->comm, A, diag_scale, -ps->thresh);
 
-    pruned_rows_global = PrunedRowsCreate(A, PARASAILS_NROWS, diag_scale, 
+    pruned_rows_global = PrunedRowsCreate(A, PARASAILS_NROWS, diag_scale,
          thresh_global);
-    pruned_rows_local = PrunedRowsCreate(A, PARASAILS_NROWS, diag_scale, 
+    pruned_rows_local = PrunedRowsCreate(A, PARASAILS_NROWS, diag_scale,
          thresh_local);
 
-    ExchangePrunedRowsExt(ps->comm, A, ps->numb, 
+    ExchangePrunedRowsExt(ps->comm, A, ps->numb,
         pruned_rows_global, pruned_rows_local, ps->num_levels);
 
-    ExchangePrunedRowsExt2(ps->comm, A, ps->numb, 
+    ExchangePrunedRowsExt2(ps->comm, A, ps->numb,
         pruned_rows_global, pruned_rows_local, ps->num_levels);
 
     ConstructPatternForEachRowExt(ps->symmetric, pruned_rows_global,
@@ -1781,7 +1815,7 @@ HYPRE_Int ParaSailsSetupValues(ParaSails *ps, Matrix *A, HYPRE_Real filter)
 
     if (ps->symmetric)
     {
-        error += 
+        error +=
           ComputeValuesSym(stored_rows, ps->M, load_bal->beg_row, ps->numb,
             ps->symmetric);
 
@@ -1795,7 +1829,7 @@ HYPRE_Int ParaSailsSetupValues(ParaSails *ps, Matrix *A, HYPRE_Real filter)
     }
     else
     {
-        error += 
+        error +=
           ComputeValuesNonsym(stored_rows, ps->M, load_bal->beg_row, ps->numb);
 
         for (i=0; i<load_bal->num_taken; i++)
@@ -1957,7 +1991,7 @@ HYPRE_Real ParaSailsStatsPattern(ParaSails *ps, Matrix *A)
 	nnza = (nnza - n) / 2 + n;
     }
 
-    hypre_MPI_Allreduce(&ps->setup_pattern_time, &max_pattern_time, 
+    hypre_MPI_Allreduce(&ps->setup_pattern_time, &max_pattern_time,
 	1, hypre_MPI_REAL, hypre_MPI_MAX, comm);
     hypre_MPI_Allreduce(&ps->cost, &max_cost, 1, hypre_MPI_REAL, hypre_MPI_MAX, comm);
     hypre_MPI_Allreduce(&ps->cost, &ave_cost, 1, hypre_MPI_REAL, hypre_MPI_SUM, comm);
@@ -2006,7 +2040,7 @@ void ParaSailsStatsValues(ParaSails *ps, Matrix *A)
         nnza = (nnza - n) / 2 + n;
     }
 
-    hypre_MPI_Allreduce(&ps->setup_values_time, &max_values_time, 
+    hypre_MPI_Allreduce(&ps->setup_values_time, &max_values_time,
 	1, hypre_MPI_REAL, hypre_MPI_MAX, comm);
 
     if (!mype)
diff --git a/external/hypre/src/distributed_ls/ParaSails/ParaSails.h b/external/hypre/src/distributed_ls/ParaSails/ParaSails.h
index b0345792..79911eca 100644
--- a/external/hypre/src/distributed_ls/ParaSails/ParaSails.h
+++ b/external/hypre/src/distributed_ls/ParaSails/ParaSails.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -21,6 +21,8 @@
 #ifndef _PARASAILS_H
 #define _PARASAILS_H
 
+//#define PARASAILS_DEBUG
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -50,9 +52,9 @@ ParaSails;
 
 ParaSails *ParaSailsCreate(MPI_Comm comm, HYPRE_Int beg_row, HYPRE_Int end_row, HYPRE_Int sym);
 void ParaSailsDestroy(ParaSails *ps);
-void ParaSailsSetupPattern(ParaSails *ps, Matrix *A, 
+void ParaSailsSetupPattern(ParaSails *ps, Matrix *A,
   HYPRE_Real thresh, HYPRE_Int num_levels);
-void ParaSailsSetupPatternExt(ParaSails *ps, Matrix *A, 
+void ParaSailsSetupPatternExt(ParaSails *ps, Matrix *A,
   HYPRE_Real thresh_global, HYPRE_Real thresh_local, HYPRE_Int num_levels);
 HYPRE_Int ParaSailsSetupValues(ParaSails *ps, Matrix *A, HYPRE_Real filter);
 void ParaSailsApply(ParaSails *ps, HYPRE_Real *u, HYPRE_Real *v);
@@ -63,5 +65,5 @@ void ParaSailsStatsValues(ParaSails *ps, Matrix *A);
 #ifdef __cplusplus
 }
 #endif
-	
+
 #endif /* _PARASAILS_H */
diff --git a/external/hypre/src/distributed_ls/ParaSails/PrunedRows.c b/external/hypre/src/distributed_ls/ParaSails/PrunedRows.c
index d12cfa19..83d8116f 100644
--- a/external/hypre/src/distributed_ls/ParaSails/PrunedRows.c
+++ b/external/hypre/src/distributed_ls/ParaSails/PrunedRows.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/ParaSails/PrunedRows.h b/external/hypre/src/distributed_ls/ParaSails/PrunedRows.h
index 959e6e55..b6b8447e 100644
--- a/external/hypre/src/distributed_ls/ParaSails/PrunedRows.h
+++ b/external/hypre/src/distributed_ls/ParaSails/PrunedRows.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/ParaSails/RowPatt.c b/external/hypre/src/distributed_ls/ParaSails/RowPatt.c
index 2dfb6eee..3724d797 100644
--- a/external/hypre/src/distributed_ls/ParaSails/RowPatt.c
+++ b/external/hypre/src/distributed_ls/ParaSails/RowPatt.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/ParaSails/RowPatt.h b/external/hypre/src/distributed_ls/ParaSails/RowPatt.h
index 11b9a24b..6793c90d 100644
--- a/external/hypre/src/distributed_ls/ParaSails/RowPatt.h
+++ b/external/hypre/src/distributed_ls/ParaSails/RowPatt.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/ParaSails/StoredRows.c b/external/hypre/src/distributed_ls/ParaSails/StoredRows.c
index 86f8d0a9..5b850d4e 100644
--- a/external/hypre/src/distributed_ls/ParaSails/StoredRows.c
+++ b/external/hypre/src/distributed_ls/ParaSails/StoredRows.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/ParaSails/StoredRows.h b/external/hypre/src/distributed_ls/ParaSails/StoredRows.h
index 83a69b0e..2de6dcf9 100644
--- a/external/hypre/src/distributed_ls/ParaSails/StoredRows.h
+++ b/external/hypre/src/distributed_ls/ParaSails/StoredRows.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/ParaSails/convert.c b/external/hypre/src/distributed_ls/ParaSails/convert.c
index 9a20944b..8b30c0ca 100644
--- a/external/hypre/src/distributed_ls/ParaSails/convert.c
+++ b/external/hypre/src/distributed_ls/ParaSails/convert.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/ParaSails/hypre_ParaSails.c b/external/hypre/src/distributed_ls/ParaSails/hypre_ParaSails.c
index 593eb551..6c72c678 100644
--- a/external/hypre/src/distributed_ls/ParaSails/hypre_ParaSails.c
+++ b/external/hypre/src/distributed_ls/ParaSails/hypre_ParaSails.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -31,7 +31,7 @@ typedef struct
    hypre_ParaSails_struct;
 
 /*--------------------------------------------------------------------------
- * balance_info - Dump out information about the partitioning of the 
+ * balance_info - Dump out information about the partitioning of the
  * matrix, which affects load balance
  *--------------------------------------------------------------------------*/
 
@@ -120,7 +120,7 @@ static void matvec_timing(MPI_Comm comm, Matrix *mat)
 
    hypre_MPI_Comm_rank(comm, &mype);
    if (mype == 0)
-      hypre_printf("Timings: %f %f %f Serial: %f %f %f\n", 
+      hypre_printf("Timings: %f %f %f Serial: %f %f %f\n",
                    trial1, trial2, trial3, trial4, trial5, trial6);
 
    fflush(stdout);
@@ -131,14 +131,16 @@ static void matvec_timing(MPI_Comm comm, Matrix *mat)
 #endif
 
 /*--------------------------------------------------------------------------
- * convert_matrix - Create and convert distributed matrix to native 
+ * convert_matrix - Create and convert distributed matrix to native
  * data structure of ParaSails
  *--------------------------------------------------------------------------*/
 
 static Matrix *convert_matrix(MPI_Comm comm, HYPRE_DistributedMatrix distmat)
 {
-   HYPRE_Int beg_row, end_row, row, dummy;
-   HYPRE_Int len, *ind;
+   HYPRE_Int row;
+   HYPRE_BigInt beg_row, end_row, dummy;
+   HYPRE_Int len;
+   HYPRE_BigInt *ind;
    HYPRE_Real *val;
    Matrix *mat;
 
@@ -150,7 +152,7 @@ static Matrix *convert_matrix(MPI_Comm comm, HYPRE_DistributedMatrix distmat)
    for (row=beg_row; row<=end_row; row++)
    {
       HYPRE_DistributedMatrixGetRow(distmat, row, &len, &ind, &val);
-      MatrixSetRow(mat, row, len, ind, val);
+      MatrixSetRow(mat, row, len, (HYPRE_Int*) ind, val);
       HYPRE_DistributedMatrixRestoreRow(distmat, row, &len, &ind, &val);
    }
 
@@ -216,7 +218,7 @@ HYPRE_Int hypre_ParaSailsSetup(hypre_ParaSails obj,
 
    ParaSailsDestroy(internal->ps);
 
-   internal->ps = ParaSailsCreate(internal->comm, 
+   internal->ps = ParaSailsCreate(internal->comm,
                                   mat->beg_row, mat->end_row, sym);
 
    ParaSailsSetupPattern(internal->ps, mat, thresh, nlevels);
@@ -256,7 +258,7 @@ HYPRE_Int hypre_ParaSailsSetupPattern(hypre_ParaSails obj,
 
    ParaSailsDestroy(internal->ps);
 
-   internal->ps = ParaSailsCreate(internal->comm, 
+   internal->ps = ParaSailsCreate(internal->comm,
                                   mat->beg_row, mat->end_row, sym);
 
    ParaSailsSetupPattern(internal->ps, mat, thresh, nlevels);
@@ -301,7 +303,7 @@ HYPRE_Int hypre_ParaSailsSetupValues(hypre_ParaSails obj,
 }
 
 /*--------------------------------------------------------------------------
- * hypre_ParaSailsApply - Apply the ParaSails preconditioner to an array 
+ * hypre_ParaSailsApply - Apply the ParaSails preconditioner to an array
  * "u", and return the result in the array "v".
  *--------------------------------------------------------------------------*/
 
@@ -341,9 +343,9 @@ hypre_ParaSailsBuildIJMatrix(hypre_ParaSails obj, HYPRE_IJMatrix *pij_A)
    ParaSails *ps = internal->ps;
    Matrix *mat = internal->ps->M;
 
-   HYPRE_Int *diag_sizes, *offdiag_sizes, local_row, i, j;
+   HYPRE_Int *col_inds, *diag_sizes, *offdiag_sizes, local_row, j;
+   HYPRE_BigInt i;
    HYPRE_Int size;
-   HYPRE_Int *col_inds;
    HYPRE_Real *values;
 
    HYPRE_IJMatrixCreate( ps->comm, ps->beg_row, ps->end_row,
@@ -382,7 +384,8 @@ hypre_ParaSailsBuildIJMatrix(hypre_ParaSails obj, HYPRE_IJMatrix *pij_A)
    {
       MatrixGetRow(mat, local_row, &size, &col_inds, &values);
 
-      HYPRE_IJMatrixSetValues( *pij_A, 1, &size, &i, (const HYPRE_Int *) col_inds,
+      HYPRE_IJMatrixSetValues( *pij_A, 1, &size, &i,
+                               (const HYPRE_BigInt *) col_inds,
                                (const HYPRE_Real *) values );
 
       NumberingGlobalToLocal(ps->numb, size, col_inds, col_inds);
diff --git a/external/hypre/src/distributed_ls/ParaSails/hypre_ParaSails.h b/external/hypre/src/distributed_ls/ParaSails/hypre_ParaSails.h
index 5133d028..892acfed 100644
--- a/external/hypre/src/distributed_ls/ParaSails/hypre_ParaSails.h
+++ b/external/hypre/src/distributed_ls/ParaSails/hypre_ParaSails.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/ParaSails/permute.c b/external/hypre/src/distributed_ls/ParaSails/permute.c
index a58d7cb4..2c34b51d 100644
--- a/external/hypre/src/distributed_ls/ParaSails/permute.c
+++ b/external/hypre/src/distributed_ls/ParaSails/permute.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/pilut/CMakeLists.txt b/external/hypre/src/distributed_ls/pilut/CMakeLists.txt
index f47c43fd..af9bb420 100644
--- a/external/hypre/src/distributed_ls/pilut/CMakeLists.txt
+++ b/external/hypre/src/distributed_ls/pilut/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/pilut/DistributedMatrixPilutSolver.h b/external/hypre/src/distributed_ls/pilut/DistributedMatrixPilutSolver.h
index 70463a49..dcaa5243 100644
--- a/external/hypre/src/distributed_ls/pilut/DistributedMatrixPilutSolver.h
+++ b/external/hypre/src/distributed_ls/pilut/DistributedMatrixPilutSolver.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -86,7 +86,7 @@ HYPRE_Int Ul_timer;
 #define jr (globals->_jr)
 #define jw (globals->_jw)
 #define lastjr (globals->_lastjr)
-#define lr (globals->_lr)
+#define hypre_lr (globals->_lr)
 #define lastlr (globals->_lastlr)
 #define w (globals->_w)
 #define firstrow (globals->_firstrow)
diff --git a/external/hypre/src/distributed_ls/pilut/HYPRE_DistributedMatrixPilutSolver.c b/external/hypre/src/distributed_ls/pilut/HYPRE_DistributedMatrixPilutSolver.c
index 5844a356..ce73d1ad 100644
--- a/external/hypre/src/distributed_ls/pilut/HYPRE_DistributedMatrixPilutSolver.c
+++ b/external/hypre/src/distributed_ls/pilut/HYPRE_DistributedMatrixPilutSolver.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -13,7 +13,7 @@
  * HYPRE_NewDistributedMatrixPilutSolver
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int  HYPRE_NewDistributedMatrixPilutSolver( 
+HYPRE_Int  HYPRE_NewDistributedMatrixPilutSolver(
                                   MPI_Comm comm,
                                   HYPRE_DistributedMatrix matrix,
                                   HYPRE_DistributedMatrixPilutSolver *new_solver )
@@ -26,20 +26,20 @@ HYPRE_Int  HYPRE_NewDistributedMatrixPilutSolver(
    FactorMatType *ldu;
 
    /* Allocate structure for holding solver data */
-   solver = (hypre_DistributedMatrixPilutSolver *) 
+   solver = (hypre_DistributedMatrixPilutSolver *)
             hypre_CTAlloc( hypre_DistributedMatrixPilutSolver,  1, HYPRE_MEMORY_HOST);
 
    /* Initialize components of solver */
    hypre_DistributedMatrixPilutSolverComm(solver) = comm;
-   hypre_DistributedMatrixPilutSolverDataDist(solver) = 
+   hypre_DistributedMatrixPilutSolverDataDist(solver) =
          (DataDistType *) hypre_CTAlloc( DataDistType,  1 , HYPRE_MEMORY_HOST);
 
    /* Structure for holding "global variables"; makes code thread safe(r) */
-   globals = hypre_DistributedMatrixPilutSolverGlobals(solver) = 
+   globals = hypre_DistributedMatrixPilutSolverGlobals(solver) =
        (hypre_PilutSolverGlobals *) hypre_CTAlloc( hypre_PilutSolverGlobals,  1 , HYPRE_MEMORY_HOST);
 
    jr = NULL;
-   lr = NULL;
+   hypre_lr = NULL;
    jw = NULL;
    w  = NULL;
 
@@ -75,7 +75,7 @@ HYPRE_Int  HYPRE_NewDistributedMatrixPilutSolver(
    DataDistTypeRowdist(hypre_DistributedMatrixPilutSolverDataDist(solver))
        = (HYPRE_Int *) hypre_CTAlloc( HYPRE_Int,  nprocs+1 , HYPRE_MEMORY_HOST);
 
-   hypre_DistributedMatrixPilutSolverFactorMat(solver) = 
+   hypre_DistributedMatrixPilutSolverFactorMat(solver) =
           (FactorMatType *) hypre_CTAlloc( FactorMatType,  1 , HYPRE_MEMORY_HOST);
 
    ldu = hypre_DistributedMatrixPilutSolverFactorMat(solver);
@@ -112,12 +112,12 @@ HYPRE_Int  HYPRE_NewDistributedMatrixPilutSolver(
  * HYPRE_FreeDistributedMatrixPilutSolver
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int HYPRE_FreeDistributedMatrixPilutSolver ( 
+HYPRE_Int HYPRE_FreeDistributedMatrixPilutSolver (
                   HYPRE_DistributedMatrixPilutSolver in_ptr )
 {
   FactorMatType *ldu;
 
-   hypre_DistributedMatrixPilutSolver *solver = 
+   hypre_DistributedMatrixPilutSolver *solver =
       (hypre_DistributedMatrixPilutSolver *) in_ptr;
 
 #ifdef HYPRE_TIMING
@@ -127,7 +127,7 @@ HYPRE_Int HYPRE_FreeDistributedMatrixPilutSolver (
 
   hypre_TFree( DataDistTypeRowdist(hypre_DistributedMatrixPilutSolverDataDist(solver)), HYPRE_MEMORY_HOST);
   hypre_TFree( hypre_DistributedMatrixPilutSolverDataDist(solver) , HYPRE_MEMORY_HOST);
-  
+
   /* Free malloced members of the FactorMat member */
   ldu = hypre_DistributedMatrixPilutSolverFactorMat(solver);
 
@@ -208,9 +208,10 @@ HYPRE_Int HYPRE_FreeDistributedMatrixPilutSolver (
  * HYPRE_DistributedMatrixPilutSolverInitialize
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int HYPRE_DistributedMatrixPilutSolverInitialize ( 
-                  HYPRE_DistributedMatrixPilutSolver solver )
+HYPRE_Int
+HYPRE_DistributedMatrixPilutSolverInitialize( HYPRE_DistributedMatrixPilutSolver solver )
 {
+   HYPRE_UNUSED_VAR(solver);
 
    return(0);
 }
@@ -219,11 +220,11 @@ HYPRE_Int HYPRE_DistributedMatrixPilutSolverInitialize (
  * HYPRE_DistributedMatrixPilutSolverSetMatrix
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int HYPRE_DistributedMatrixPilutSolverSetMatrix( 
+HYPRE_Int HYPRE_DistributedMatrixPilutSolverSetMatrix(
                   HYPRE_DistributedMatrixPilutSolver in_ptr,
                   HYPRE_DistributedMatrix matrix )
 {
-  hypre_DistributedMatrixPilutSolver *solver = 
+  hypre_DistributedMatrixPilutSolver *solver =
       (hypre_DistributedMatrixPilutSolver *) in_ptr;
 
   hypre_DistributedMatrixPilutSolverMatrix( solver ) = matrix;
@@ -235,10 +236,10 @@ HYPRE_Int HYPRE_DistributedMatrixPilutSolverSetMatrix(
  *--------------------------------------------------------------------------*/
 
 HYPRE_DistributedMatrix
-   HYPRE_DistributedMatrixPilutSolverGetMatrix( 
+   HYPRE_DistributedMatrixPilutSolverGetMatrix(
                   HYPRE_DistributedMatrixPilutSolver in_ptr )
 {
-  hypre_DistributedMatrixPilutSolver *solver = 
+  hypre_DistributedMatrixPilutSolver *solver =
       (hypre_DistributedMatrixPilutSolver *) in_ptr;
 
   return( hypre_DistributedMatrixPilutSolverMatrix( solver ) );
@@ -249,15 +250,15 @@ HYPRE_DistributedMatrix
  * HYPRE_DistributedMatrixPilutSolverSetFirstLocalRow
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int HYPRE_DistributedMatrixPilutSolverSetNumLocalRow( 
+HYPRE_Int HYPRE_DistributedMatrixPilutSolverSetNumLocalRow(
                   HYPRE_DistributedMatrixPilutSolver in_ptr,
                   HYPRE_Int FirstLocalRow )
 {
-  hypre_DistributedMatrixPilutSolver *solver = 
+  hypre_DistributedMatrixPilutSolver *solver =
       (hypre_DistributedMatrixPilutSolver *) in_ptr;
    hypre_PilutSolverGlobals *globals = hypre_DistributedMatrixPilutSolverGlobals(solver);
 
-  DataDistTypeRowdist(hypre_DistributedMatrixPilutSolverDataDist( solver ))[mype] = 
+  DataDistTypeRowdist(hypre_DistributedMatrixPilutSolverDataDist( solver ))[mype] =
      FirstLocalRow;
 
   return hypre_error_flag;
@@ -270,11 +271,11 @@ HYPRE_Int HYPRE_DistributedMatrixPilutSolverSetNumLocalRow(
  *   row of U.
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int HYPRE_DistributedMatrixPilutSolverSetFactorRowSize( 
+HYPRE_Int HYPRE_DistributedMatrixPilutSolverSetFactorRowSize(
                   HYPRE_DistributedMatrixPilutSolver in_ptr,
                   HYPRE_Int size )
 {
-  hypre_DistributedMatrixPilutSolver *solver = 
+  hypre_DistributedMatrixPilutSolver *solver =
       (hypre_DistributedMatrixPilutSolver *) in_ptr;
 
   hypre_DistributedMatrixPilutSolverGmaxnz( solver ) = size;
@@ -286,11 +287,11 @@ HYPRE_Int HYPRE_DistributedMatrixPilutSolverSetFactorRowSize(
  * HYPRE_DistributedMatrixPilutSolverSetDropTolerance
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int HYPRE_DistributedMatrixPilutSolverSetDropTolerance( 
+HYPRE_Int HYPRE_DistributedMatrixPilutSolverSetDropTolerance(
                   HYPRE_DistributedMatrixPilutSolver in_ptr,
                   HYPRE_Real tolerance )
 {
-  hypre_DistributedMatrixPilutSolver *solver = 
+  hypre_DistributedMatrixPilutSolver *solver =
       (hypre_DistributedMatrixPilutSolver *) in_ptr;
 
   hypre_DistributedMatrixPilutSolverTol( solver ) = tolerance;
@@ -302,11 +303,11 @@ HYPRE_Int HYPRE_DistributedMatrixPilutSolverSetDropTolerance(
  * HYPRE_DistributedMatrixPilutSolverSetMaxIts
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int HYPRE_DistributedMatrixPilutSolverSetMaxIts( 
+HYPRE_Int HYPRE_DistributedMatrixPilutSolverSetMaxIts(
                   HYPRE_DistributedMatrixPilutSolver in_ptr,
                   HYPRE_Int its )
 {
-  hypre_DistributedMatrixPilutSolver *solver = 
+  hypre_DistributedMatrixPilutSolver *solver =
       (hypre_DistributedMatrixPilutSolver *) in_ptr;
 
   hypre_DistributedMatrixPilutSolverMaxIts( solver ) = its;
@@ -314,11 +315,11 @@ HYPRE_Int HYPRE_DistributedMatrixPilutSolverSetMaxIts(
   return hypre_error_flag;
 }
 
-HYPRE_Int HYPRE_DistributedMatrixPilutSolverSetLogging( 
+HYPRE_Int HYPRE_DistributedMatrixPilutSolverSetLogging(
                   HYPRE_DistributedMatrixPilutSolver in_ptr,
                   HYPRE_Int logging )
 {
-  hypre_DistributedMatrixPilutSolver *solver = 
+  hypre_DistributedMatrixPilutSolver *solver =
       (hypre_DistributedMatrixPilutSolver *) in_ptr;
    hypre_PilutSolverGlobals *globals = hypre_DistributedMatrixPilutSolverGlobals(solver);
 
@@ -336,13 +337,12 @@ HYPRE_Int HYPRE_DistributedMatrixPilutSolverSetLogging(
 
 HYPRE_Int HYPRE_DistributedMatrixPilutSolverSetup( HYPRE_DistributedMatrixPilutSolver in_ptr )
 {
-   HYPRE_Int m, n, nprocs, start, end, *rowdist, col0, coln, ierr;
-   hypre_DistributedMatrixPilutSolver *solver = 
+   HYPRE_Int nprocs, *rowdist, ierr;
+   HYPRE_BigInt m, n, start, end, col0, coln;
+   hypre_DistributedMatrixPilutSolver *solver =
       (hypre_DistributedMatrixPilutSolver *) in_ptr;
    hypre_PilutSolverGlobals *globals = hypre_DistributedMatrixPilutSolverGlobals(solver);
 
-   HYPRE_Int logging = globals ? globals->logging : 0;
-
 
    if(hypre_DistributedMatrixPilutSolverMatrix(solver) == NULL )
    {
@@ -361,7 +361,7 @@ HYPRE_Int HYPRE_DistributedMatrixPilutSolverSetup( HYPRE_DistributedMatrixPilutS
    HYPRE_DistributedMatrixGetLocalRange(
       hypre_DistributedMatrixPilutSolverMatrix(solver), &start, &end, &col0, &coln);
 
-   DataDistTypeLnrows(hypre_DistributedMatrixPilutSolverDataDist( solver )) = 
+   DataDistTypeLnrows(hypre_DistributedMatrixPilutSolverDataDist( solver )) =
       end - start + 1;
 
    /* Set up DataDist entry in distributed_solver */
@@ -370,7 +370,7 @@ HYPRE_Int HYPRE_DistributedMatrixPilutSolverSetup( HYPRE_DistributedMatrixPilutS
 
    rowdist = DataDistTypeRowdist( hypre_DistributedMatrixPilutSolverDataDist( solver ) );
 
-   hypre_MPI_Allgather( &start, 1, HYPRE_MPI_INT, rowdist, 1, HYPRE_MPI_INT, 
+   hypre_MPI_Allgather( &start, 1, HYPRE_MPI_INT, rowdist, 1, HYPRE_MPI_INT,
       hypre_DistributedMatrixPilutSolverComm(solver) );
 
    rowdist[ nprocs ] = n;
@@ -399,7 +399,7 @@ HYPRE_Int HYPRE_DistributedMatrixPilutSolverSetup( HYPRE_DistributedMatrixPilutS
    }
 #endif
 
-   if (ierr) 
+   if (ierr)
    {
        hypre_error(HYPRE_ERROR_GENERIC);
        /* return hypre_error_flag; */
@@ -414,7 +414,7 @@ HYPRE_Int HYPRE_DistributedMatrixPilutSolverSetup( HYPRE_DistributedMatrixPilutS
    hypre_BeginTiming( Setup_timer );
 #endif
 
-   ierr = hypre_SetUpLUFactor( hypre_DistributedMatrixPilutSolverDataDist (solver), 
+   ierr = hypre_SetUpLUFactor( hypre_DistributedMatrixPilutSolverDataDist (solver),
                hypre_DistributedMatrixPilutSolverFactorMat (solver),
                hypre_DistributedMatrixPilutSolverGmaxnz (solver),
                hypre_DistributedMatrixPilutSolverGlobals (solver) );
@@ -425,13 +425,15 @@ HYPRE_Int HYPRE_DistributedMatrixPilutSolverSetup( HYPRE_DistributedMatrixPilutS
    }
 #endif
 
-   if (ierr) 
+   if (ierr)
    {
        hypre_error(HYPRE_ERROR_GENERIC);
        /* return hypre_error_flag; */
    }
 
 #ifdef HYPRE_DEBUG
+   HYPRE_Int logging = globals ? globals->logging : 0;
+
    if (logging)
    {
       fflush(stdout);
@@ -452,16 +454,16 @@ HYPRE_Int HYPRE_DistributedMatrixPilutSolverSolve( HYPRE_DistributedMatrixPilutS
                                            HYPRE_Real *x, HYPRE_Real *b )
 {
 
-   hypre_DistributedMatrixPilutSolver *solver = 
+   hypre_DistributedMatrixPilutSolver *solver =
       (hypre_DistributedMatrixPilutSolver *) in_ptr;
 
    /******** NOTE: Since I am using this currently as a preconditioner, I am only
      doing a single front and back solve. To be a general-purpose solver, this
      call should really be in a loop checking convergence and counting iterations.
-     AC - 2/12/98 
+     AC - 2/12/98
    */
    /* It should be obvious, but the current treatment of vectors is pretty
-      insufficient. -AC 2/12/98 
+      insufficient. -AC 2/12/98
    */
 #ifdef HYPRE_TIMING
 {
@@ -487,4 +489,3 @@ HYPRE_Int HYPRE_DistributedMatrixPilutSolverSolve( HYPRE_DistributedMatrixPilutS
 
   return hypre_error_flag;
 }
-
diff --git a/external/hypre/src/distributed_ls/pilut/HYPRE_DistributedMatrixPilutSolver_protos.h b/external/hypre/src/distributed_ls/pilut/HYPRE_DistributedMatrixPilutSolver_protos.h
index eb3bce13..29810a0a 100644
--- a/external/hypre/src/distributed_ls/pilut/HYPRE_DistributedMatrixPilutSolver_protos.h
+++ b/external/hypre/src/distributed_ls/pilut/HYPRE_DistributedMatrixPilutSolver_protos.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/pilut/HYPRE_DistributedMatrixPilutSolver_types.h b/external/hypre/src/distributed_ls/pilut/HYPRE_DistributedMatrixPilutSolver_types.h
index ed583072..2b62b870 100644
--- a/external/hypre/src/distributed_ls/pilut/HYPRE_DistributedMatrixPilutSolver_types.h
+++ b/external/hypre/src/distributed_ls/pilut/HYPRE_DistributedMatrixPilutSolver_types.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/pilut/comm.c b/external/hypre/src/distributed_ls/pilut/comm.c
index ce5182d6..cca3302c 100644
--- a/external/hypre/src/distributed_ls/pilut/comm.c
+++ b/external/hypre/src/distributed_ls/pilut/comm.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/pilut/const.h b/external/hypre/src/distributed_ls/pilut/const.h
index 8712246b..25a6d26a 100644
--- a/external/hypre/src/distributed_ls/pilut/const.h
+++ b/external/hypre/src/distributed_ls/pilut/const.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/pilut/debug.c b/external/hypre/src/distributed_ls/pilut/debug.c
index 54958b4c..1df1b49c 100644
--- a/external/hypre/src/distributed_ls/pilut/debug.c
+++ b/external/hypre/src/distributed_ls/pilut/debug.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/pilut/distributed_qsort.c b/external/hypre/src/distributed_ls/pilut/distributed_qsort.c
index bfb5d880..26da4c84 100644
--- a/external/hypre/src/distributed_ls/pilut/distributed_qsort.c
+++ b/external/hypre/src/distributed_ls/pilut/distributed_qsort.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/pilut/distributed_qsort_si.c b/external/hypre/src/distributed_ls/pilut/distributed_qsort_si.c
index 733befa7..d3d5d992 100644
--- a/external/hypre/src/distributed_ls/pilut/distributed_qsort_si.c
+++ b/external/hypre/src/distributed_ls/pilut/distributed_qsort_si.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/pilut/ilu.h b/external/hypre/src/distributed_ls/pilut/ilu.h
index c41ea706..d925afcb 100644
--- a/external/hypre/src/distributed_ls/pilut/ilu.h
+++ b/external/hypre/src/distributed_ls/pilut/ilu.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -28,9 +28,11 @@
 
 #include <signal.h>
 
+#include "_hypre_utilities.h"
 #include "macros.h"
 #include "struct.h"
 #include "const.h"
 
 
+
 #endif
diff --git a/external/hypre/src/distributed_ls/pilut/ilut.c b/external/hypre/src/distributed_ls/pilut/ilut.c
index 5b7d3409..a3ea1af7 100644
--- a/external/hypre/src/distributed_ls/pilut/ilut.c
+++ b/external/hypre/src/distributed_ls/pilut/ilut.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -22,16 +22,16 @@
 /*************************************************************************
 * This function is the entry point of the hypre_ILUT factorization
 **************************************************************************/
-HYPRE_Int hypre_ILUT(DataDistType *ddist, HYPRE_DistributedMatrix matrix, FactorMatType *ldu, 
+HYPRE_Int hypre_ILUT(DataDistType *ddist, HYPRE_DistributedMatrix matrix, FactorMatType *ldu,
           HYPRE_Int maxnz, HYPRE_Real tol, hypre_PilutSolverGlobals *globals )
 {
-  HYPRE_Int logging = globals ? globals->logging : 0;
-  HYPRE_Int i, ierr;
+  HYPRE_Int i, ierr = 0;
   ReduceMatType rmat;
   HYPRE_Int dummy_row_ptr[2], size;
   HYPRE_Real *values;
 
 #ifdef HYPRE_DEBUG
+  HYPRE_Int logging = globals ? globals->logging : 0;
   if (logging)
   {
      hypre_printf("hypre_ILUT, maxnz = %d\n ", maxnz);
@@ -137,7 +137,7 @@ HYPRE_Int hypre_ILUT(DataDistType *ddist, HYPRE_DistributedMatrix matrix, Factor
   }
 #endif
 
-  /*hypre_free_multi(rmat.rmat_rnz, rmat.rmat_rrowlen, 
+  /*hypre_free_multi(rmat.rmat_rnz, rmat.rmat_rrowlen,
              rmat.rmat_rcolind, rmat.rmat_rvalues, -1);*/
   hypre_TFree(rmat.rmat_rnz, HYPRE_MEMORY_HOST);
   hypre_TFree(rmat.rmat_rrowlen, HYPRE_MEMORY_HOST);
@@ -149,7 +149,7 @@ HYPRE_Int hypre_ILUT(DataDistType *ddist, HYPRE_DistributedMatrix matrix, Factor
 
 
 /*************************************************************************
-* This function computes the 2 norms of the rows and adds them into the 
+* This function computes the 2 norms of the rows and adds them into the
 * nrm2s array ... Changed to "Add" by AJC, Dec 22 1997.
 **************************************************************************/
 void hypre_ComputeAdd2Nrms(HYPRE_Int num_rows, HYPRE_Int *rowptr, HYPRE_Real *values, HYPRE_Real *nrm2s)
@@ -159,10 +159,10 @@ void hypre_ComputeAdd2Nrms(HYPRE_Int num_rows, HYPRE_Int *rowptr, HYPRE_Real *va
 
   for (i=0; i<num_rows; i++) {
     n = rowptr[i+1]-rowptr[i];
-    /* sum = SNRM2(&n, values+rowptr[i], &incx);*/
+    /* sum = hypre_dnrm2(&n, values+rowptr[i], &incx);*/
     sum = 0.0;
     for (j=0; j<n; j++) sum += (values[rowptr[i]+j] * values[rowptr[i]+j]);
-    sum = sqrt( sum );
+    sum = hypre_sqrt( sum );
     nrm2s[i] += sum;
   }
 }
diff --git a/external/hypre/src/distributed_ls/pilut/internal_protos.h b/external/hypre/src/distributed_ls/pilut/internal_protos.h
index fa847756..83f11305 100644
--- a/external/hypre/src/distributed_ls/pilut/internal_protos.h
+++ b/external/hypre/src/distributed_ls/pilut/internal_protos.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/pilut/macros.h b/external/hypre/src/distributed_ls/pilut/macros.h
index d69c7855..e5e36abd 100644
--- a/external/hypre/src/distributed_ls/pilut/macros.h
+++ b/external/hypre/src/distributed_ls/pilut/macros.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -8,9 +8,6 @@
 #ifndef MACROS_H
 #define MACROS_H
 
-#include "../../utilities/general.h"
-#include "../../utilities/fortran.h"
-
 /*
  * macros.h
  *
@@ -62,6 +59,8 @@
 
 /* Macros for names of Fortran BLAS routines */
 /* AJC: added HYPRE_Real precision prototypes using MACHINE_IS_ */
+/* DOK: We can include _hypre_blas.h and use hypre_<dnrm2, ddot, dcopy> directly instead */
+/*
 #ifdef MACHINE_IS_CRAY
 #ifdef USE_SHORT
 #define SNRM2 SNRM2
@@ -96,12 +95,12 @@
 #endif
 #endif
 #endif
-
+*/
 /*********************************************************************
 * Utility Macros
 **********************************************************************/
 /* MPI and Cray native timers. Note MPI uses doubles while Cray uses longs */
-#if MACHINE_IS_CRAY
+#if defined(MACHINE_IS_CRAY) && MACHINE_IS_CRAY
 # define cleartimer(tmr) (tmr = 0)
 # define starttimer(tmr) (tmr -= rtclock())
 # define stoptimer(tmr)  (tmr += rtclock())
diff --git a/external/hypre/src/distributed_ls/pilut/parilut.c b/external/hypre/src/distributed_ls/pilut/parilut.c
index d1139d04..81ae3959 100644
--- a/external/hypre/src/distributed_ls/pilut/parilut.c
+++ b/external/hypre/src/distributed_ls/pilut/parilut.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -145,7 +145,7 @@ void hypre_ParILUT(DataDistType *ddist, FactorMatType *ldu,
              newperm, newiperm, vrowdist, -1);*/
   hypre_TFree(jr, HYPRE_MEMORY_HOST);
   hypre_TFree(jw, HYPRE_MEMORY_HOST);
-  hypre_TFree(lr, HYPRE_MEMORY_HOST);
+  hypre_TFree(hypre_lr, HYPRE_MEMORY_HOST);
   hypre_TFree(w, HYPRE_MEMORY_HOST);
   hypre_TFree(pilut_map, HYPRE_MEMORY_HOST);
   hypre_TFree(nrmat.rmat_rnz, HYPRE_MEMORY_HOST);
@@ -167,7 +167,7 @@ void hypre_ParILUT(DataDistType *ddist, FactorMatType *ldu,
 
   jr = NULL;
   jw = NULL;
-  lr = NULL;
+  hypre_lr = NULL;
   w  = NULL;
 
 #ifdef HYPRE_DEBUG
@@ -357,6 +357,8 @@ HYPRE_Int hypre_SelectSet(ReduceMatType *rmat, CommInfoType *cinfo,
               HYPRE_Int *newperm, HYPRE_Int *newiperm,
               hypre_PilutSolverGlobals *globals)
 {
+  HYPRE_UNUSED_VAR(iperm);
+
   HYPRE_Int ir, i, j, k, l, num;
   HYPRE_Int nnz, snnbr;
   HYPRE_Int *rcolind, *snbrind, *snbrptr, *srowind;
@@ -592,6 +594,8 @@ void hypre_ComputeRmat(FactorMatType *ldu, ReduceMatType *rmat,
                  HYPRE_Int *newperm, HYPRE_Int *newiperm, HYPRE_Int nmis, HYPRE_Real tol,
                  hypre_PilutSolverGlobals *globals)
 {
+  HYPRE_UNUSED_VAR(perm);
+
   HYPRE_Int i, ir, inr, start, k, kk, l, m, end, nnz;
   HYPRE_Int *usrowptr, *uerowptr, *ucolind, *incolind, *rcolind, rrowlen;
   HYPRE_Real *uvalues, *nrm2s, *invalues, *rvalues, *dvalues;
@@ -651,9 +655,9 @@ void hypre_ComputeRmat(FactorMatType *ldu, ReduceMatType *rmat,
       /* record L elements */
       if (IsInMIS(pilut_map[rcolind[lastjr]])) {
          if (rcolind[lastjr] >= firstrow  &&  rcolind[lastjr] < lastrow)
-            lr[lastlr] = (newiperm[rcolind[lastjr]-firstrow] << 1);
+            hypre_lr[lastlr] = (newiperm[rcolind[lastjr]-firstrow] << 1);
          else {
-            lr[lastlr] = pilut_map[rcolind[lastjr]];  /* map[] == (l<<1) | 1 */
+            hypre_lr[lastlr] = pilut_map[rcolind[lastjr]];  /* map[] == (l<<1) | 1 */
             hypre_assert(incolind[StripMIS(pilut_map[rcolind[lastjr]])+1] ==
                  rcolind[lastjr]);
          }
@@ -683,20 +687,20 @@ void hypre_ComputeRmat(FactorMatType *ldu, ReduceMatType *rmat,
         mult = w[jr[k]]*dvalues[kk];
         w[jr[k]] = mult;
 
-        if (fabs(mult) < rtol)
+        if (hypre_abs(mult) < rtol)
            continue; /* First drop test */
 
         for (l=usrowptr[kk]; l<uerowptr[kk]; l++) {
           hypre_CheckBounds(0, ucolind[l], nrows, globals);
           m = jr[ucolind[l]];
           if (m == -1) {
-            if (fabs(mult*uvalues[l]) < rtol)
+            if (hypre_abs(mult*uvalues[l]) < rtol)
               continue;  /* Don't worry. The fill has too small of a value */
 
             /* record L elements -- these must be local */
             if (IsInMIS(pilut_map[ucolind[l]])) {
                hypre_assert(ucolind[l] >= firstrow  &&  ucolind[l] < lastrow);
-               lr[lastlr] = (newiperm[ucolind[l]-firstrow] << 1);
+               hypre_lr[lastlr] = (newiperm[ucolind[l]-firstrow] << 1);
                lastlr++;
             }
 
@@ -723,20 +727,20 @@ void hypre_ComputeRmat(FactorMatType *ldu, ReduceMatType *rmat,
         mult = w[jr[k]]*invalues[start];
         w[jr[k]] = mult;
 
-        if (fabs(mult) < rtol)
+        if (hypre_abs(mult) < rtol)
            continue; /* First drop test */
 
         for (l=++start; l<=end; l++) {
           hypre_CheckBounds(0, incolind[l], nrows, globals);
           m = jr[incolind[l]];
           if (m == -1) {
-            if (fabs(mult*invalues[l]) < rtol)
+            if (hypre_abs(mult*invalues[l]) < rtol)
               continue;  /* Don't worry. The fill has too small of a value */
 
             /* record L elements -- these must be remote */
             if (IsInMIS(pilut_map[incolind[l]])) {
                hypre_assert(incolind[l] < firstrow  ||  incolind[l] >= lastrow);
-               lr[lastlr] = pilut_map[incolind[l]];  /* map[] == (l<<1) | 1 */
+               hypre_lr[lastlr] = pilut_map[incolind[l]];  /* map[] == (l<<1) | 1 */
                lastlr++;
             }
 
@@ -778,6 +782,8 @@ void hypre_FactorLocal(FactorMatType *ldu, ReduceMatType *rmat,
                  HYPRE_Int *newperm, HYPRE_Int *newiperm, HYPRE_Int nmis, HYPRE_Real tol,
                  hypre_PilutSolverGlobals *globals)
 {
+  HYPRE_UNUSED_VAR(cinfo);
+
   HYPRE_Int i, ir, k, kk, l, m, nnz, diag;
   HYPRE_Int *usrowptr, *uerowptr, *ucolind, *rcolind;
   HYPRE_Real *uvalues, *nrm2s, *rvalues, *dvalues;
@@ -834,7 +840,7 @@ void hypre_FactorLocal(FactorMatType *ldu, ReduceMatType *rmat,
       if (rcolind[lastjr] >= firstrow  &&
             rcolind[lastjr] <  lastrow   &&
             newiperm[rcolind[lastjr]-firstrow] < diag) {
-         lr[lastlr] = newiperm[rcolind[lastjr]-firstrow];
+         hypre_lr[lastlr] = newiperm[rcolind[lastjr]-firstrow];
         lastlr++;
       }
 
@@ -858,14 +864,14 @@ void hypre_FactorLocal(FactorMatType *ldu, ReduceMatType *rmat,
       mult = w[jr[k]]*dvalues[kk];
       w[jr[k]] = mult;
 
-      if (fabs(mult) < rtol)
+      if (hypre_abs(mult) < rtol)
          continue; /* First drop test */
 
       for (l=usrowptr[kk]; l<uerowptr[kk]; l++) {
          hypre_CheckBounds(0, ucolind[l], nrows, globals);
          m = jr[ucolind[l]];
          if (m == -1) {
-            if (fabs(mult*uvalues[l]) < rtol)
+            if (hypre_abs(mult*uvalues[l]) < rtol)
              continue;  /* Don't worry. The fill has too small of a value */
 
             /* record L elements */
@@ -873,7 +879,7 @@ void hypre_FactorLocal(FactorMatType *ldu, ReduceMatType *rmat,
                   ucolind[l] <  lastrow   &&
                   newiperm[ucolind[l]-firstrow] < diag) {
                hypre_assert(IsInMIS(pilut_map[ucolind[l]]));
-               lr[lastlr] = newiperm[ucolind[l]-firstrow];
+               hypre_lr[lastlr] = newiperm[ucolind[l]-firstrow];
                lastlr++;
             }
 
@@ -917,7 +923,7 @@ void hypre_SecondDropSmall( HYPRE_Real rtol,
 
   /* Remove any (off-diagonal) elements of the row below the tolerance */
   for (i=1; i<lastjr;) {
-    if (fabs(w[i]) < rtol) {
+    if (hypre_abs(w[i]) < rtol) {
       jw[i] = jw[--lastjr];
        w[i] =  w[lastjr];
     }
@@ -1116,11 +1122,11 @@ void hypre_UpdateL(HYPRE_Int lrow, HYPRE_Int last, FactorMatType *ldu,
     else {
       min = start;  /* find min and replace if i is larger */
       for (j=start+1; j<end; j++) {
-         if (fabs(lvalues[j]) < fabs(lvalues[min]))
+         if (hypre_abs(lvalues[j]) < hypre_abs(lvalues[min]))
             min = j;
       }
 
-      if (fabs(lvalues[min]) < fabs(w[i])) {
+      if (hypre_abs(lvalues[min]) < hypre_abs(w[i])) {
          lcolind[min] = jw[i];
          lvalues[min] =  w[i];
       }
@@ -1189,7 +1195,7 @@ void hypre_FormNRmat(HYPRE_Int rrow, HYPRE_Int first, ReduceMatType *nrmat,
     for (nz=1; nz<out_rowlen; nz++) {
       max = first;
       for (j=first+1; j<lastjr; j++) {
-         if (fabs(w[j]) > fabs(w[max]))
+         if (hypre_abs(w[j]) > hypre_abs(w[max]))
             max = j;
       }
 
@@ -1255,7 +1261,7 @@ void hypre_FormDU(HYPRE_Int lrow, HYPRE_Int first, FactorMatType *ldu,
     /* The entries [first, lastjr) are part of U */
     max = first;
     for (j=first+1; j<lastjr; j++) {
-      if (fabs(w[j]) > fabs(w[max]))
+      if (hypre_abs(w[j]) > hypre_abs(w[max]))
          max = j;
     }
 
@@ -1353,8 +1359,8 @@ void hypre_ParINIT( ReduceMatType *nrmat, CommInfoType *cinfo, HYPRE_Int *rowdis
   /* Allocate work space */
   hypre_TFree(jr, HYPRE_MEMORY_HOST);
   jr = hypre_idx_malloc_init(nrows, -1, "hypre_ParILUT: jr");
-  hypre_TFree(lr, HYPRE_MEMORY_HOST);
-  lr = hypre_idx_malloc_init(nleft, -1, "hypre_ParILUT: lr");
+  hypre_TFree(hypre_lr, HYPRE_MEMORY_HOST);
+  hypre_lr = hypre_idx_malloc_init(nleft, -1, "hypre_ParILUT: lr");
   hypre_TFree(jw, HYPRE_MEMORY_HOST);
   jw = hypre_idx_malloc(nleft, "hypre_ParILUT: jw");
   hypre_TFree(w, HYPRE_MEMORY_HOST);
diff --git a/external/hypre/src/distributed_ls/pilut/parutil.c b/external/hypre/src/distributed_ls/pilut/parutil.c
index 16985fb0..56255351 100644
--- a/external/hypre/src/distributed_ls/pilut/parutil.c
+++ b/external/hypre/src/distributed_ls/pilut/parutil.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -198,14 +198,14 @@ void hypre_memcpy_idx( HYPRE_Int *dest, const HYPRE_Int *src, size_t n )
 
 /*************************************************************************
 * The following function copies a floating point (HYPRE_Real) array.
-* Note this assumes BLAS 1 routine SCOPY. An alternative would be memcpy.
+* Note this assumes BLAS 1 routine hypre_dcopy. An alternative would be memcpy.
 * There is a noticeable difference between this and just a for loop.
 **************************************************************************/
 void hypre_memcpy_fp( HYPRE_Real *dest, const HYPRE_Real *src, size_t n )
 {
   HYPRE_Int i, ni = (HYPRE_Int) n;
 
-  /*SCOPY(&n, src, &inc, dest, &inc);*/
+  /*hypre_dcopy(&n, src, &inc, dest, &inc);*/
   for (i=0; i<ni; i++) dest[i] = src[i];
 }
 
diff --git a/external/hypre/src/distributed_ls/pilut/pblas1.c b/external/hypre/src/distributed_ls/pilut/pblas1.c
index a0cbd12e..2dc412c5 100644
--- a/external/hypre/src/distributed_ls/pilut/pblas1.c
+++ b/external/hypre/src/distributed_ls/pilut/pblas1.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -18,7 +18,7 @@
  *
  */
 
-#include "ilu.h"
+#include "_hypre_blas.h"
 #include "DistributedMatrixPilutSolver.h"
 
 
@@ -31,8 +31,8 @@ HYPRE_Real hypre_p_dnrm2(DataDistType *ddist, HYPRE_Real *x, hypre_PilutSolverGl
   HYPRE_Int incx=1;
   HYPRE_Real sum;
 
-  sum = SNRM2(&(ddist->ddist_lnrows), x, &incx);
-  return sqrt(hypre_GlobalSESumDouble(sum*sum, pilut_comm));
+  sum = hypre_dnrm2(&(ddist->ddist_lnrows), x, &incx);
+  return hypre_sqrt(hypre_GlobalSESumDouble(sum*sum, pilut_comm));
 }
 
 
@@ -45,7 +45,7 @@ HYPRE_Real hypre_p_ddot(DataDistType *ddist, HYPRE_Real *x, HYPRE_Real *y,
 {
   HYPRE_Int incx=1;
 
-  return hypre_GlobalSESumDouble(SDOT(&(ddist->ddist_lnrows), x, &incx, y, &incx), 
+  return hypre_GlobalSESumDouble(hypre_ddot(&(ddist->ddist_lnrows), x, &incx, y, &incx), 
          pilut_comm );
 }
 
diff --git a/external/hypre/src/distributed_ls/pilut/serilut.c b/external/hypre/src/distributed_ls/pilut/serilut.c
index 3c7278b7..c68db3e0 100644
--- a/external/hypre/src/distributed_ls/pilut/serilut.c
+++ b/external/hypre/src/distributed_ls/pilut/serilut.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -39,14 +39,14 @@
 **************************************************************************/
 HYPRE_Int hypre_SerILUT(DataDistType *ddist, HYPRE_DistributedMatrix matrix,
              FactorMatType *ldu,
-             ReduceMatType *rmat, HYPRE_Int maxnz, HYPRE_Real tol, 
+             ReduceMatType *rmat, HYPRE_Int maxnz, HYPRE_Real tol,
              hypre_PilutSolverGlobals *globals)
 {
-  HYPRE_Int logging = globals ? globals->logging : 0;
   HYPRE_Int i, ii, j, k, kk, l, m, ierr, diag_present;
-  HYPRE_Int *perm, *iperm, 
+  HYPRE_Int *perm, *iperm,
           *usrowptr, *uerowptr, *ucolind;
-  HYPRE_Int row_size, *col_ind;
+  HYPRE_Int row_size;
+  HYPRE_BigInt *col_ind;
   HYPRE_Real *values, *uvalues, *dvalues, *nrm2s;
   HYPRE_Int nlocal, nbnd;
   HYPRE_Real mult, rtol;
@@ -70,8 +70,8 @@ HYPRE_Int hypre_SerILUT(DataDistType *ddist, HYPRE_DistributedMatrix matrix,
   /* Allocate work space */
   hypre_TFree(jr, HYPRE_MEMORY_HOST);
   jr = hypre_idx_malloc_init(nrows, -1, "hypre_SerILUT: jr");
-  hypre_TFree(lr, HYPRE_MEMORY_HOST);
-  lr = hypre_idx_malloc_init(nrows, -1, "hypre_SerILUT: lr");
+  hypre_TFree(hypre_lr, HYPRE_MEMORY_HOST);
+  hypre_lr = hypre_idx_malloc_init(nrows, -1, "hypre_SerILUT: lr");
   hypre_TFree(jw, HYPRE_MEMORY_HOST);
   jw = hypre_idx_malloc(nrows, "hypre_SerILUT: jw");
   hypre_TFree(w, HYPRE_MEMORY_HOST);
@@ -120,6 +120,8 @@ HYPRE_Int hypre_SerILUT(DataDistType *ddist, HYPRE_DistributedMatrix matrix,
 
   nbnd = lnrows - nlocal ;
 #ifdef HYPRE_DEBUG
+  HYPRE_Int logging = globals ? globals->logging : 0;
+
   if (logging)
   {
      hypre_printf("nbnd = %d, lnrows=%d, nlocal=%d\n", nbnd, lnrows, nlocal );
@@ -157,8 +159,8 @@ HYPRE_Int hypre_SerILUT(DataDistType *ddist, HYPRE_DistributedMatrix matrix,
     /* if (ierr) return(ierr); */
 
     for (lastjr=1, lastlr=0, j=0, diag_present=0; j<row_size; j++) {
-      if (iperm[ col_ind[j] - firstrow ] < iperm[i]) 
-        lr[lastlr++] = iperm[ col_ind[j]-firstrow]; /* Copy the L elements separately */
+      if (iperm[ col_ind[j] - firstrow ] < iperm[i])
+        hypre_lr[lastlr++] = iperm[ col_ind[j]-firstrow]; /* Copy the L elements separately */
 
       if (col_ind[j] != i+firstrow) { /* Off-diagonal element */
         jr[col_ind[j]] = lastjr;
@@ -196,18 +198,18 @@ HYPRE_Int hypre_SerILUT(DataDistType *ddist, HYPRE_DistributedMatrix matrix,
       mult = w[jr[k]]*dvalues[kk];
       w[jr[k]] = mult;
 
-      if (fabs(mult) < rtol)
+      if (hypre_abs(mult) < rtol)
          continue;/* First drop test */
 
       for (l=usrowptr[kk]; l<uerowptr[kk]; l++) {
         m = jr[ucolind[l]];
 
-        if (m == -1 && fabs(mult*uvalues[l]) < rtol*0.5)
+        if (m == -1 && hypre_abs(mult*uvalues[l]) < rtol*0.5)
           continue;  /* Don't add fill if the element is too small */
 
         if (m == -1) {  /* Create fill */
-          if (iperm[ucolind[l]-firstrow] < iperm[i]) 
-            lr[lastlr++] = iperm[ucolind[l]-firstrow]; /* Copy the L elements separately */
+          if (iperm[ucolind[l]-firstrow] < iperm[i])
+            hypre_lr[lastlr++] = iperm[ucolind[l]-firstrow]; /* Copy the L elements separately */
 
           jr[ucolind[l]] = lastjr;
           jw[lastjr] = ucolind[l];
@@ -257,8 +259,8 @@ HYPRE_Int hypre_SerILUT(DataDistType *ddist, HYPRE_DistributedMatrix matrix,
     for (lastjr=1, lastlr=0, j=0, diag_present=0; j<row_size; j++) {
       if (col_ind[j] >= firstrow  &&
             col_ind[j] < lastrow    &&
-            iperm[col_ind[j]-firstrow] < nlocal) 
-        lr[lastlr++] = iperm[col_ind[j]-firstrow]; /* Copy the L elements separately */
+            iperm[col_ind[j]-firstrow] < nlocal)
+        hypre_lr[lastlr++] = iperm[col_ind[j]-firstrow]; /* Copy the L elements separately */
 
       if (col_ind[j] != i+firstrow) { /* Off-diagonal element */
         jr[col_ind[j]] = lastjr;
@@ -292,19 +294,19 @@ HYPRE_Int hypre_SerILUT(DataDistType *ddist, HYPRE_DistributedMatrix matrix,
       mult = w[jr[k]]*dvalues[kk];
       w[jr[k]] = mult;
 
-      if (fabs(mult) < rtol)
+      if (hypre_abs(mult) < rtol)
          continue;/* First drop test */
 
       for (l=usrowptr[kk]; l<uerowptr[kk]; l++) {
         m = jr[ucolind[l]];
 
-        if (m == -1 && fabs(mult*uvalues[l]) < rtol*0.5)
+        if (m == -1 && hypre_abs(mult*uvalues[l]) < rtol*0.5)
           continue;  /* Don't add fill if the element is too small */
 
         if (m == -1) {  /* Create fill */
            hypre_CheckBounds(firstrow, ucolind[l], lastrow, globals);
-          if (iperm[ucolind[l]-firstrow] < nlocal) 
-            lr[lastlr++] = iperm[ucolind[l]-firstrow]; /* Copy the L elements separately */
+          if (iperm[ucolind[l]-firstrow] < nlocal)
+            hypre_lr[lastlr++] = iperm[ucolind[l]-firstrow]; /* Copy the L elements separately */
 
           jr[ucolind[l]] = lastjr;
           jw[lastjr] = ucolind[l];
@@ -330,11 +332,11 @@ HYPRE_Int hypre_SerILUT(DataDistType *ddist, HYPRE_DistributedMatrix matrix,
   /*hypre_free_multi(jr, jw, lr, w, -1);*/
   hypre_TFree(jr, HYPRE_MEMORY_HOST);
   hypre_TFree(jw, HYPRE_MEMORY_HOST);
-  hypre_TFree(lr, HYPRE_MEMORY_HOST);
+  hypre_TFree(hypre_lr, HYPRE_MEMORY_HOST);
   hypre_TFree(w, HYPRE_MEMORY_HOST);
   jr = NULL;
   jw = NULL;
-  lr = NULL;
+  hypre_lr = NULL;
   w = NULL;
 
   return(ierr);
@@ -347,22 +349,23 @@ HYPRE_Int hypre_SerILUT(DataDistType *ddist, HYPRE_DistributedMatrix matrix,
 * It takes a vector that marks rows as being forced to not be in the interior.
 * For full generality this would also mark them in the map, but it doesn't.
 **************************************************************************/
-HYPRE_Int hypre_SelectInterior( HYPRE_Int local_num_rows, 
-                    HYPRE_DistributedMatrix matrix, 
+HYPRE_Int hypre_SelectInterior( HYPRE_Int local_num_rows,
+                    HYPRE_DistributedMatrix matrix,
                     HYPRE_Int *external_rows,
-                    HYPRE_Int *newperm, HYPRE_Int *newiperm, 
+                    HYPRE_Int *newperm, HYPRE_Int *newiperm,
                     hypre_PilutSolverGlobals *globals )
 {
   HYPRE_Int nbnd, nlocal, i, j;
   HYPRE_Int break_loop; /* marks finding an element making this row exterior. -AC */
-  HYPRE_Int row_size, *col_ind;
+  HYPRE_Int row_size;
+  HYPRE_BigInt *col_ind;
   HYPRE_Real *values;
 
   /* Determine which vertices are in the boundary,
    * permuting interior rows first then boundary nodes. */
   nbnd = 0;
   nlocal = 0;
-  for (i=0; i<local_num_rows; i++) 
+  for (i=0; i<local_num_rows; i++)
   {
     if (external_rows[i])
     {
@@ -375,9 +378,9 @@ HYPRE_Int hypre_SelectInterior( HYPRE_Int local_num_rows,
                &col_ind, &values);
       /* if (ierr) return(ierr); */
 
-      for (j=0, break_loop=0; ( j<row_size )&& (break_loop == 0); j++) 
+      for (j=0, break_loop=0; ( j<row_size )&& (break_loop == 0); j++)
       {
-        if (col_ind[j] < firstrow || col_ind[j] >= lastrow) 
+        if (col_ind[j] < firstrow || col_ind[j] >= lastrow)
         {
           newperm[local_num_rows-nbnd-1] = i;
           newiperm[i] = local_num_rows-nbnd-1;
@@ -389,7 +392,7 @@ HYPRE_Int hypre_SelectInterior( HYPRE_Int local_num_rows,
       HYPRE_DistributedMatrixRestoreRow( matrix, firstrow+i, &row_size,
                &col_ind, &values);
 
-      if ( break_loop == 0 ) 
+      if ( break_loop == 0 )
       {
         newperm[nlocal] = i;
         newiperm[i] = nlocal;
@@ -407,11 +410,12 @@ HYPRE_Int hypre_SelectInterior( HYPRE_Int local_num_rows,
 *   Produces a vector of length n that marks the union of the nonzero
 *   structure of all locally stored rows, not including locally stored columns.
 **************************************************************************/
-HYPRE_Int hypre_FindStructuralUnion( HYPRE_DistributedMatrix matrix, 
+HYPRE_Int hypre_FindStructuralUnion( HYPRE_DistributedMatrix matrix,
                     HYPRE_Int **structural_union,
                     hypre_PilutSolverGlobals *globals )
-{ 
-  HYPRE_Int ierr=0, i, j, row_size, *col_ind;
+{
+  HYPRE_Int ierr=0, i, j, row_size;
+  HYPRE_BigInt *col_ind;
 
   /* Allocate and clear structural_union vector */
   *structural_union = hypre_CTAlloc( HYPRE_Int,  nrows , HYPRE_MEMORY_HOST);
@@ -427,7 +431,7 @@ HYPRE_Int hypre_FindStructuralUnion( HYPRE_DistributedMatrix matrix,
     /* Loop through nonzeros in this row */
     for ( j=0; j<row_size; j++)
     {
-      if (col_ind[j] < firstrow || col_ind[j] >= lastrow) 
+      if (col_ind[j] < firstrow || col_ind[j] >= lastrow)
       {
         (*structural_union)[ col_ind[j] ] = 1;
       }
@@ -455,13 +459,15 @@ HYPRE_Int hypre_FindStructuralUnion( HYPRE_DistributedMatrix matrix,
 HYPRE_Int hypre_ExchangeStructuralUnions( DataDistType *ddist,
                     HYPRE_Int **structural_union,
                     hypre_PilutSolverGlobals *globals )
-{ 
+{
+  HYPRE_UNUSED_VAR(ddist);
+
   HYPRE_Int ierr=0, *recv_unions;
 
   /* allocate space for receiving unions */
   recv_unions = hypre_CTAlloc( HYPRE_Int,  nrows , HYPRE_MEMORY_HOST);
 
-  hypre_MPI_Allreduce( *structural_union, recv_unions, nrows, 
+  hypre_MPI_Allreduce( *structural_union, recv_unions, nrows,
                  HYPRE_MPI_INT, hypre_MPI_LOR, pilut_comm );
 
   /* free and reallocate structural union so that is of local size */
@@ -478,20 +484,23 @@ HYPRE_Int hypre_ExchangeStructuralUnions( DataDistType *ddist,
 
 
 /*************************************************************************
-* This function applies the second droping rule where maxnz elements 
+* This function applies the second droping rule where maxnz elements
 * greater than tol are kept. The elements are stored into LDU.
 **************************************************************************/
 void hypre_SecondDrop(HYPRE_Int maxnz, HYPRE_Real tol, HYPRE_Int row,
                 HYPRE_Int *perm, HYPRE_Int *iperm,
                 FactorMatType *ldu, hypre_PilutSolverGlobals *globals)
 {
+  HYPRE_UNUSED_VAR(iperm);
+  HYPRE_UNUSED_VAR(perm);
+
   HYPRE_Int i, j;
   HYPRE_Int diag, lrow;
   HYPRE_Int first, last, itmp;
   HYPRE_Real dtmp;
 
   /* Reset the jr array, it is not needed any more */
-  for (i=0; i<lastjr; i++) 
+  for (i=0; i<lastjr; i++)
     jr[jw[i]] = -1;
 
   lrow = row-firstrow;
@@ -499,7 +508,7 @@ void hypre_SecondDrop(HYPRE_Int maxnz, HYPRE_Real tol, HYPRE_Int row,
 
   /* Deal with the diagonal element first */
   hypre_assert(jw[0] == row);
-  if (w[0] != 0.0) 
+  if (w[0] != 0.0)
     ldu->dvalues[lrow] = 1.0/w[0];
   else { /* zero pivot */
     hypre_printf("Zero pivot in row %d, adding e to proceed!\n", row);
@@ -511,7 +520,7 @@ void hypre_SecondDrop(HYPRE_Int maxnz, HYPRE_Real tol, HYPRE_Int row,
 
   /* First go and remove any off diagonal elements bellow the tolerance */
   for (i=0; i<lastjr;) {
-    if (fabs(w[i]) < tol) {
+    if (hypre_abs(w[i]) < tol) {
       jw[i] = jw[--lastjr];
       w[i] = w[lastjr];
     }
@@ -567,9 +576,9 @@ void hypre_SecondDrop(HYPRE_Int maxnz, HYPRE_Real tol, HYPRE_Int row,
 
   /* Now, I want to keep maxnz elements of L. Go and extract them */
 
-  hypre_DoubleQuickSplit( w, jw, last, maxnz ); 
+  hypre_DoubleQuickSplit( w, jw, last, maxnz );
   /* if (ierr) return; */
-  for ( j= hypre_max(0,last-maxnz); j< last; j++ ) 
+  for ( j= hypre_max(0,last-maxnz); j< last; j++ )
   {
      ldu->lcolind[ldu->lerowptr[lrow]] = jw[ j ];
      ldu->lvalues[ldu->lerowptr[lrow]++] = w[ j ];
@@ -577,10 +586,10 @@ void hypre_SecondDrop(HYPRE_Int maxnz, HYPRE_Real tol, HYPRE_Int row,
 
 
   /* This was the previous insertion sort that was replaced with
-     the QuickSplit routine above. AJC, 5/00 
+     the QuickSplit routine above. AJC, 5/00
   for (nz=0; nz<maxnz && last>0; nz++) {
     for (max=0, j=1; j<last; j++) {
-      if (fabs(w[j]) > fabs(w[max]))
+      if (hypre_abs(w[j]) > hypre_abs(w[max]))
         max = j;
     }
 
@@ -595,9 +604,9 @@ void hypre_SecondDrop(HYPRE_Int maxnz, HYPRE_Real tol, HYPRE_Int row,
 
 
   /* Now, I want to keep maxnz elements of U. Go and extract them */
-  hypre_DoubleQuickSplit( w+first, jw+first, lastjr-first, maxnz ); 
+  hypre_DoubleQuickSplit( w+first, jw+first, lastjr-first, maxnz );
   /* if (ierr) return; */
-  for ( j=hypre_max(first, lastjr-maxnz); j< lastjr; j++ ) 
+  for ( j=hypre_max(first, lastjr-maxnz); j< lastjr; j++ )
   {
      ldu->ucolind[ldu->uerowptr[lrow]] = jw[ j ];
      ldu->uvalues[ldu->uerowptr[lrow]++] = w[ j ];
@@ -605,10 +614,10 @@ void hypre_SecondDrop(HYPRE_Int maxnz, HYPRE_Real tol, HYPRE_Int row,
 
   /*
      This was the previous insertion sort that was replaced with
-     the QuickSplit routine above. AJC, 5/00 
+     the QuickSplit routine above. AJC, 5/00
   for (nz=0; nz<maxnz && lastjr>first; nz++) {
     for (max=first, j=first+1; j<lastjr; j++) {
-      if (fabs(w[j]) > fabs(w[max]))
+      if (hypre_abs(w[j]) > hypre_abs(w[max]))
         max = j;
     }
 
@@ -631,15 +640,17 @@ void hypre_SecondDrop(HYPRE_Int maxnz, HYPRE_Real tol, HYPRE_Int row,
 
 
 /*************************************************************************
-* This function applyies the second droping rule whre maxnz elements 
+* This function applyies the second droping rule whre maxnz elements
 * greater than tol are kept. The elements are stored into L and the Rmat.
-* This version keeps only maxnzkeep 
+* This version keeps only maxnzkeep
 **************************************************************************/
 void hypre_SecondDropUpdate(HYPRE_Int maxnz, HYPRE_Int maxnzkeep, HYPRE_Real tol, HYPRE_Int row,
-      HYPRE_Int nlocal, HYPRE_Int *perm, HYPRE_Int *iperm, 
+      HYPRE_Int nlocal, HYPRE_Int *perm, HYPRE_Int *iperm,
       FactorMatType *ldu, ReduceMatType *rmat,
                       hypre_PilutSolverGlobals *globals )
 {
+  HYPRE_UNUSED_VAR(perm);
+
   HYPRE_Int i, j, nl;
   HYPRE_Int max, nz, lrow, rrow;
   HYPRE_Int last, first, itmp;
@@ -647,7 +658,7 @@ void hypre_SecondDropUpdate(HYPRE_Int maxnz, HYPRE_Int maxnzkeep, HYPRE_Real tol
 
 
   /* Reset the jr array, it is not needed any more */
-  for (i=0; i<lastjr; i++) 
+  for (i=0; i<lastjr; i++)
     jr[jw[i]] = -1;
 
   lrow = row-firstrow;
@@ -655,7 +666,7 @@ void hypre_SecondDropUpdate(HYPRE_Int maxnz, HYPRE_Int maxnzkeep, HYPRE_Real tol
 
   /* First go and remove any elements of the row bellow the tolerance */
   for (i=1; i<lastjr;) {
-    if (fabs(w[i]) < tol) {
+    if (hypre_abs(w[i]) < tol) {
       jw[i] = jw[--lastjr];
       w[i] = w[lastjr];
     }
@@ -720,9 +731,9 @@ void hypre_SecondDropUpdate(HYPRE_Int maxnz, HYPRE_Int maxnzkeep, HYPRE_Real tol
 
 
   /* Keep large maxnz elements of L */
-  hypre_DoubleQuickSplit( w+1, jw+1, last-1, maxnz ); 
+  hypre_DoubleQuickSplit( w+1, jw+1, last-1, maxnz );
   /* if (ierr) return; */
-  for ( j= hypre_max(1,last-maxnz); j< last; j++ ) 
+  for ( j= hypre_max(1,last-maxnz); j< last; j++ )
   {
      ldu->lcolind[ldu->lerowptr[lrow]] = jw[ j ];
      ldu->lvalues[ldu->lerowptr[lrow]++] = w[ j ];
@@ -730,10 +741,10 @@ void hypre_SecondDropUpdate(HYPRE_Int maxnz, HYPRE_Int maxnzkeep, HYPRE_Real tol
 
 
   /* This was the previous insertion sort that was replaced with
-     the QuickSplit routine above. AJC, 5/00 
+     the QuickSplit routine above. AJC, 5/00
   for (nz=0; nz<maxnz && last>1; nz++) {
     for (max=1, j=2; j<last; j++) {
-      if (fabs(w[j]) > fabs(w[max]))
+      if (hypre_abs(w[j]) > hypre_abs(w[max]))
         max = j;
     }
 
@@ -765,7 +776,7 @@ void hypre_SecondDropUpdate(HYPRE_Int maxnz, HYPRE_Int maxnzkeep, HYPRE_Real tol
   else { /* Keep large nl elements in the reduced row */
     for (nz=1; nz<nl; nz++) {
       for (max=first, j=first+1; j<lastjr; j++) {
-        if (fabs(w[j]) > fabs(w[max]))
+        if (hypre_abs(w[j]) > hypre_abs(w[max]))
           max = j;
       }
 
@@ -781,4 +792,3 @@ void hypre_SecondDropUpdate(HYPRE_Int maxnz, HYPRE_Int maxnzkeep, HYPRE_Real tol
 #endif
 
 }
-
diff --git a/external/hypre/src/distributed_ls/pilut/struct.h b/external/hypre/src/distributed_ls/pilut/struct.h
index 22a3a704..270e9742 100644
--- a/external/hypre/src/distributed_ls/pilut/struct.h
+++ b/external/hypre/src/distributed_ls/pilut/struct.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -30,21 +30,28 @@
  * $Id$
  */
 
-#ifndef __cplusplus
-#ifndef true
-# define true  1
-# define false 0
-#endif
-
+#ifndef __cplusplus  /* In C++, bool is built-in, no need to define it */
+#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L && __STDC_VERSION__ < 202311L
+/* C99 - C11: Use stdbool.h */
+#include <stdbool.h>
+#elif defined(__STDC_VERSION__) && __STDC_VERSION__ < 199901L
+/* Pre-C99: Define bool manually */
 #ifndef bool
-# ifdef Boolean
+#ifdef Boolean
    typedef Boolean bool;
-# else
+#else
    typedef unsigned char bool;
-# endif
 #endif
 #endif
- 
+#ifndef true
+#define true 1
+#endif
+#ifndef false
+#define false 0
+#endif
+#endif
+#endif /* ifndef __cplusplus */
+
 /*************************************************************************
 * This data structure holds the data distribution
 **************************************************************************/
@@ -142,7 +149,7 @@ typedef struct reducematdef ReduceMatType;
 
 
 /*************************************************************************
-* This data structure stores information about the send in each phase 
+* This data structure stores information about the send in each phase
 * of parallel hypre_ILUT
 **************************************************************************/
 struct comminfodef {
diff --git a/external/hypre/src/distributed_ls/pilut/trifactor.c b/external/hypre/src/distributed_ls/pilut/trifactor.c
index aed5d7a4..13f1774f 100644
--- a/external/hypre/src/distributed_ls/pilut/trifactor.c
+++ b/external/hypre/src/distributed_ls/pilut/trifactor.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_ls/pilut/util.c b/external/hypre/src/distributed_ls/pilut/util.c
index 13c15cd1..3fb15aad 100644
--- a/external/hypre/src/distributed_ls/pilut/util.c
+++ b/external/hypre/src/distributed_ls/pilut/util.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -28,15 +28,15 @@ HYPRE_Int hypre_ExtractMinLR( hypre_PilutSolverGlobals *globals )
   HYPRE_Int i, j=0 ;
 
   for (i=1; i<lastlr; i++) {
-    if (lr[i] < lr[j])
+    if (hypre_lr[i] < hypre_lr[j])
       j = i;
   }
-  i = lr[j];
+  i = hypre_lr[j];
 
   /* Remove it */
   lastlr-- ;
   if (j < lastlr) 
-    lr[j] = lr[lastlr];
+    hypre_lr[j] = hypre_lr[lastlr];
 
   return i;
 }
@@ -79,7 +79,7 @@ void hypre_ValDecSort(HYPRE_Int n, HYPRE_Int *idx, HYPRE_Real *val)
   for (i=0; i<n; i++) {
     max = i;
     for (j=i+1; j<n; j++) {
-      if (fabs(val[j]) > fabs(val[max]))
+      if (hypre_abs(val[j]) > hypre_abs(val[max]))
         max = j;
     }
 
diff --git a/external/hypre/src/distributed_matrix/CMakeLists.txt b/external/hypre/src/distributed_matrix/CMakeLists.txt
index 35464c08..e6bc7d11 100644
--- a/external/hypre/src/distributed_matrix/CMakeLists.txt
+++ b/external/hypre/src/distributed_matrix/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_matrix/HYPRE_distributed_matrix.c b/external/hypre/src/distributed_matrix/HYPRE_distributed_matrix.c
index 41b7bcf6..a8527182 100644
--- a/external/hypre/src/distributed_matrix/HYPRE_distributed_matrix.c
+++ b/external/hypre/src/distributed_matrix/HYPRE_distributed_matrix.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_matrix/HYPRE_distributed_matrix_mv.h b/external/hypre/src/distributed_matrix/HYPRE_distributed_matrix_mv.h
index bce13fc2..bca2f968 100644
--- a/external/hypre/src/distributed_matrix/HYPRE_distributed_matrix_mv.h
+++ b/external/hypre/src/distributed_matrix/HYPRE_distributed_matrix_mv.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_matrix/HYPRE_distributed_matrix_protos.h b/external/hypre/src/distributed_matrix/HYPRE_distributed_matrix_protos.h
index 1f9159d4..359e927c 100644
--- a/external/hypre/src/distributed_matrix/HYPRE_distributed_matrix_protos.h
+++ b/external/hypre/src/distributed_matrix/HYPRE_distributed_matrix_protos.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_matrix/HYPRE_distributed_matrix_types.h b/external/hypre/src/distributed_matrix/HYPRE_distributed_matrix_types.h
index 1f9159d4..359e927c 100644
--- a/external/hypre/src/distributed_matrix/HYPRE_distributed_matrix_types.h
+++ b/external/hypre/src/distributed_matrix/HYPRE_distributed_matrix_types.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_matrix/distributed_matrix.c b/external/hypre/src/distributed_matrix/distributed_matrix.c
index 6b52a10f..85fc09e6 100644
--- a/external/hypre/src/distributed_matrix/distributed_matrix.c
+++ b/external/hypre/src/distributed_matrix/distributed_matrix.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_matrix/distributed_matrix.h b/external/hypre/src/distributed_matrix/distributed_matrix.h
index 9a21ea21..1a3182b8 100644
--- a/external/hypre/src/distributed_matrix/distributed_matrix.h
+++ b/external/hypre/src/distributed_matrix/distributed_matrix.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_matrix/distributed_matrix_ISIS.c b/external/hypre/src/distributed_matrix/distributed_matrix_ISIS.c
index 0789d81c..70ae1bff 100644
--- a/external/hypre/src/distributed_matrix/distributed_matrix_ISIS.c
+++ b/external/hypre/src/distributed_matrix/distributed_matrix_ISIS.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -21,7 +21,7 @@ typedef struct
 {
     HYPRE_BigInt *ind;
     HYPRE_Real *val;
-} 
+}
 RowBuf;
 #endif
 
@@ -31,7 +31,7 @@ RowBuf;
 
   /* matrix must be set before calling this function*/
 
-HYPRE_Int 
+HYPRE_Int
 hypre_InitializeDistributedMatrixISIS(hypre_DistributedMatrix *dm)
 {
 #ifdef ISIS_AVAILABLE
@@ -41,7 +41,7 @@ hypre_InitializeDistributedMatrixISIS(hypre_DistributedMatrix *dm)
 
    HYPRE_BigInt num_rows = mat->getMap().n();
    HYPRE_BigInt num_cols = mat->getMap().n();
-   
+
    hypre_DistributedMatrixM(dm) = num_rows;
    hypre_DistributedMatrixN(dm) = num_cols;
 
@@ -52,6 +52,8 @@ hypre_InitializeDistributedMatrixISIS(hypre_DistributedMatrix *dm)
    rowbuf->val = new HYPRE_Real[num_cols];
 
    dm->auxiliary_data = (void *) rowbuf;
+#else
+   HYPRE_UNUSED_VAR(dm);
 #endif
 
    return 0;
@@ -61,7 +63,7 @@ hypre_InitializeDistributedMatrixISIS(hypre_DistributedMatrix *dm)
  * hypre_FreeDistributedMatrixISIS
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 hypre_FreeDistributedMatrixISIS( hypre_DistributedMatrix *dm)
 {
 #ifdef ISIS_AVAILABLE
@@ -70,6 +72,8 @@ hypre_FreeDistributedMatrixISIS( hypre_DistributedMatrix *dm)
    delete rowbuf->ind;
    delete rowbuf->val;
    delete rowbuf;
+#else
+   HYPRE_UNUSED_VAR(dm);
 #endif
 
    return 0;
@@ -79,9 +83,10 @@ hypre_FreeDistributedMatrixISIS( hypre_DistributedMatrix *dm)
  * hypre_PrintDistributedMatrixISIS
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
-hypre_PrintDistributedMatrixISIS( hypre_DistributedMatrix *matrix )
+HYPRE_Int
+hypre_PrintDistributedMatrixISIS( hypre_DistributedMatrix *dm )
 {
+   HYPRE_UNUSED_VAR(dm);
 #ifdef ISIS_AVAILABLE
    cout << "hypre_PrintDistributedMatrixISIS not implemented" << endl;
 #endif
@@ -93,19 +98,24 @@ hypre_PrintDistributedMatrixISIS( hypre_DistributedMatrix *matrix )
  * hypre_GetDistributedMatrixLocalRangeISIS
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
-hypre_GetDistributedMatrixLocalRangeISIS( hypre_DistributedMatrix *dm,
-                             HYPRE_BigInt *start,
-                             HYPRE_BigInt *end )
+HYPRE_Int
+hypre_GetDistributedMatrixLocalRangeISIS( hypre_DistributedMatrix  *dm,
+                                          HYPRE_BigInt             *start,
+                                          HYPRE_BigInt             *end )
 {
 #ifdef ISIS_AVAILABLE
    RowMatrix *mat = (RowMatrix *) hypre_DistributedMatrixLocalStorage(dm);
 
    *start = mat->getMap().startRow() - 1;  /* convert to 0-based */
    *end = mat->getMap().endRow(); /* endRow actually returns 1 less */
-   
+
    cout << "LocalRangeISIS " << *start << "  " << *end << endl;
+#else
+   HYPRE_UNUSED_VAR(dm);
+   HYPRE_UNUSED_VAR(start);
+   HYPRE_UNUSED_VAR(end);
 #endif
+
    return 0;
 }
 
@@ -113,15 +123,15 @@ hypre_GetDistributedMatrixLocalRangeISIS( hypre_DistributedMatrix *dm,
  * hypre_GetDistributedMatrixRowISIS
  *--------------------------------------------------------------------------*/
 
-/* semantics: buffers returned will be overwritten on next call to 
+/* semantics: buffers returned will be overwritten on next call to
  this get function */
 
-HYPRE_Int 
+HYPRE_Int
 hypre_GetDistributedMatrixRowISIS( hypre_DistributedMatrix *dm,
-                             HYPRE_BigInt row,
-                             HYPRE_Int *size,
-                             HYPRE_BigInt **col_ind,
-                             HYPRE_Real **values )
+                                   HYPRE_BigInt row,
+                                   HYPRE_Int *size,
+                                   HYPRE_BigInt **col_ind,
+                                   HYPRE_Real **values )
 {
 #ifdef ISIS_AVAILABLE
    RowMatrix *mat = (RowMatrix *) hypre_DistributedMatrixLocalStorage(dm);
@@ -140,7 +150,7 @@ hypre_GetDistributedMatrixRowISIS( hypre_DistributedMatrix *dm,
 
        for (i=0, p=rowbuf->ind; i<temp; i++, p++)
        {
-	   if (*p == row+1) 
+	   if (*p == row+1)
 	       found = 1;
        }
 
@@ -171,7 +181,12 @@ hypre_GetDistributedMatrixRowISIS( hypre_DistributedMatrix *dm,
        *values = rowbuf->val;
        *size = temp;
    }
-
+#else
+   HYPRE_UNUSED_VAR(dm);
+   HYPRE_UNUSED_VAR(row);
+   HYPRE_UNUSED_VAR(size);
+   HYPRE_UNUSED_VAR(col_ind);
+   HYPRE_UNUSED_VAR(values);
 #endif
 
    return 0;
@@ -181,14 +196,19 @@ hypre_GetDistributedMatrixRowISIS( hypre_DistributedMatrix *dm,
  * hypre_RestoreDistributedMatrixRowISIS
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
-hypre_RestoreDistributedMatrixRowISIS( hypre_DistributedMatrix *dm,
-                             HYPRE_BigInt row,
-                             HYPRE_Int *size,
-                             HYPRE_BigInt **col_ind,
-                             HYPRE_Real **values )
+HYPRE_Int
+hypre_RestoreDistributedMatrixRowISIS( hypre_DistributedMatrix  *dm,
+                                       HYPRE_BigInt              row,
+                                       HYPRE_Int                *size,
+                                       HYPRE_BigInt            **col_ind,
+                                       HYPRE_Real              **values )
 {
-  /* does nothing, since we use local buffers */
+   /* does nothing, since we use local buffers */
+   HYPRE_UNUSED_VAR(dm);
+   HYPRE_UNUSED_VAR(row);
+   HYPRE_UNUSED_VAR(size);
+   HYPRE_UNUSED_VAR(col_ind);
+   HYPRE_UNUSED_VAR(values);
 
    return 0;
 }
diff --git a/external/hypre/src/distributed_matrix/distributed_matrix_ISIS.cc b/external/hypre/src/distributed_matrix/distributed_matrix_ISIS.cc
index 05772805..aaeffdfc 100644
--- a/external/hypre/src/distributed_matrix/distributed_matrix_ISIS.cc
+++ b/external/hypre/src/distributed_matrix/distributed_matrix_ISIS.cc
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/distributed_matrix/distributed_matrix_PETSc.c b/external/hypre/src/distributed_matrix/distributed_matrix_PETSc.c
index eba39aef..6d69d92e 100644
--- a/external/hypre/src/distributed_matrix/distributed_matrix_PETSc.c
+++ b/external/hypre/src/distributed_matrix/distributed_matrix_PETSc.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -23,13 +23,15 @@
  *   Internal routine for freeing a matrix stored in PETSc form.
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
-hypre_DistributedMatrixDestroyPETSc( hypre_DistributedMatrix *distributed_matrix )
+HYPRE_Int
+hypre_DistributedMatrixDestroyPETSc( hypre_DistributedMatrix *dm )
 {
 #ifdef PETSC_AVAILABLE
-   Mat PETSc_matrix = (Mat) hypre_DistributedMatrixLocalStorage(distributed_matrix);
+   Mat PETSc_matrix = (Mat) hypre_DistributedMatrixLocalStorage(dm);
 
    MatDestroy( PETSc_matrix );
+#else
+   HYPRE_UNUSED_VAR(dm);
 #endif
 
    return(0);
@@ -44,15 +46,18 @@ hypre_DistributedMatrixDestroyPETSc( hypre_DistributedMatrix *distributed_matrix
  *   Internal routine for printing a matrix stored in PETSc form.
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
-hypre_DistributedMatrixPrintPETSc( hypre_DistributedMatrix *matrix )
+HYPRE_Int
+hypre_DistributedMatrixPrintPETSc( hypre_DistributedMatrix *dm )
 {
    HYPRE_Int  ierr=0;
 #ifdef PETSC_AVAILABLE
-   Mat PETSc_matrix = (Mat) hypre_DistributedMatrixLocalStorage(matrix);
+   Mat PETSc_matrix = (Mat) hypre_DistributedMatrixLocalStorage(dm);
 
    ierr = MatView( PETSc_matrix, VIEWER_STDOUT_WORLD );
+#else
+   HYPRE_UNUSED_VAR(dm);
 #endif
+
    return(ierr);
 }
 
@@ -60,14 +65,14 @@ hypre_DistributedMatrixPrintPETSc( hypre_DistributedMatrix *matrix )
  * hypre_DistributedMatrixGetLocalRangePETSc
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
-hypre_DistributedMatrixGetLocalRangePETSc( hypre_DistributedMatrix *matrix,
+HYPRE_Int
+hypre_DistributedMatrixGetLocalRangePETSc( hypre_DistributedMatrix *dm,
                              HYPRE_BigInt *start,
                              HYPRE_BigInt *end )
 {
    HYPRE_Int ierr=0;
 #ifdef PETSC_AVAILABLE
-   Mat PETSc_matrix = (Mat) hypre_DistributedMatrixLocalStorage(matrix);
+   Mat PETSc_matrix = (Mat) hypre_DistributedMatrixLocalStorage(dm);
 
    if (!PETSc_matrix) return(-1);
 
@@ -75,13 +80,17 @@ hypre_DistributedMatrixGetLocalRangePETSc( hypre_DistributedMatrix *matrix,
    ierr = MatGetOwnershipRange( PETSc_matrix, start, end ); CHKERRA(ierr);
 /*
 
-  Since PETSc's MatGetOwnershipRange actually returns 
+  Since PETSc's MatGetOwnershipRange actually returns
   end = "one more than the global index of the last local row",
   we need to subtract one; hypre assumes we return the index
   of the last row itself.
 
 */
    *end = *end - 1;
+#else
+   HYPRE_UNUSED_VAR(dm);
+   HYPRE_UNUSED_VAR(start);
+   HYPRE_UNUSED_VAR(end);
 #endif
 
    return(ierr);
@@ -91,8 +100,8 @@ hypre_DistributedMatrixGetLocalRangePETSc( hypre_DistributedMatrix *matrix,
  * hypre_DistributedMatrixGetRowPETSc
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
-hypre_DistributedMatrixGetRowPETSc( hypre_DistributedMatrix *matrix,
+HYPRE_Int
+hypre_DistributedMatrixGetRowPETSc( hypre_DistributedMatrix *dm,
                              HYPRE_BigInt row,
                              HYPRE_Int *size,
                              HYPRE_BigInt **col_ind,
@@ -100,11 +109,17 @@ hypre_DistributedMatrixGetRowPETSc( hypre_DistributedMatrix *matrix,
 {
    HYPRE_Int ierr=0;
 #ifdef PETSC_AVAILABLE
-   Mat PETSc_matrix = (Mat) hypre_DistributedMatrixLocalStorage(matrix);
+   Mat PETSc_matrix = (Mat) hypre_DistributedMatrixLocalStorage(dm);
 
    if (!PETSc_matrix) return(-1);
 
    ierr = MatGetRow( PETSc_matrix, row, size, col_ind, values); CHKERRA(ierr);
+#else
+   HYPRE_UNUSED_VAR(dm);
+   HYPRE_UNUSED_VAR(row);
+   HYPRE_UNUSED_VAR(size);
+   HYPRE_UNUSED_VAR(col_ind);
+   HYPRE_UNUSED_VAR(values);
 #endif
 
    return(ierr);
@@ -114,8 +129,8 @@ hypre_DistributedMatrixGetRowPETSc( hypre_DistributedMatrix *matrix,
  * hypre_DistributedMatrixRestoreRowPETSc
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
-hypre_DistributedMatrixRestoreRowPETSc( hypre_DistributedMatrix *matrix,
+HYPRE_Int
+hypre_DistributedMatrixRestoreRowPETSc( hypre_DistributedMatrix *dm,
                              HYPRE_BigInt row,
                              HYPRE_Int *size,
                              HYPRE_BigInt **col_ind,
@@ -123,11 +138,17 @@ hypre_DistributedMatrixRestoreRowPETSc( hypre_DistributedMatrix *matrix,
 {
    HYPRE_Int ierr=0;
 #ifdef PETSC_AVAILABLE
-   Mat PETSc_matrix = (Mat) hypre_DistributedMatrixLocalStorage(matrix);
+   Mat PETSc_matrix = (Mat) hypre_DistributedMatrixLocalStorage(dm);
 
    if (PETSc_matrix == NULL) return(-1);
 
    ierr = MatRestoreRow( PETSc_matrix, row, size, col_ind, values); CHKERRA(ierr);
+#else
+   HYPRE_UNUSED_VAR(dm);
+   HYPRE_UNUSED_VAR(row);
+   HYPRE_UNUSED_VAR(size);
+   HYPRE_UNUSED_VAR(col_ind);
+   HYPRE_UNUSED_VAR(values);
 #endif
 
    return(ierr);
diff --git a/external/hypre/src/distributed_matrix/distributed_matrix_parcsr.c b/external/hypre/src/distributed_matrix/distributed_matrix_parcsr.c
index 0df9ae59..3802e15d 100644
--- a/external/hypre/src/distributed_matrix/distributed_matrix_parcsr.c
+++ b/external/hypre/src/distributed_matrix/distributed_matrix_parcsr.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -21,8 +21,9 @@
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_DistributedMatrixDestroyParCSR( hypre_DistributedMatrix *distributed_matrix )
+hypre_DistributedMatrixDestroyParCSR( hypre_DistributedMatrix *dm )
 {
+   HYPRE_UNUSED_VAR(dm);
 
    return(0);
 }
@@ -34,8 +35,9 @@ hypre_DistributedMatrixDestroyParCSR( hypre_DistributedMatrix *distributed_matri
   /* matrix must be set before calling this function*/
 
 HYPRE_Int
-hypre_DistributedMatrixInitializeParCSR(hypre_DistributedMatrix *matrix)
+hypre_DistributedMatrixInitializeParCSR(hypre_DistributedMatrix *dm)
 {
+   HYPRE_UNUSED_VAR(dm);
 
    return 0;
 }
@@ -50,10 +52,10 @@ hypre_DistributedMatrixInitializeParCSR(hypre_DistributedMatrix *matrix)
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_DistributedMatrixPrintParCSR( hypre_DistributedMatrix *matrix )
+hypre_DistributedMatrixPrintParCSR( hypre_DistributedMatrix *dm )
 {
    HYPRE_Int  ierr=0;
-   HYPRE_ParCSRMatrix Parcsr_matrix = (HYPRE_ParCSRMatrix) hypre_DistributedMatrixLocalStorage(matrix);
+   HYPRE_ParCSRMatrix Parcsr_matrix = (HYPRE_ParCSRMatrix) hypre_DistributedMatrixLocalStorage(dm);
 
    HYPRE_ParCSRMatrixPrint( Parcsr_matrix, "STDOUT" );
    return(ierr);
@@ -64,20 +66,19 @@ hypre_DistributedMatrixPrintParCSR( hypre_DistributedMatrix *matrix )
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_DistributedMatrixGetLocalRangeParCSR( hypre_DistributedMatrix *matrix,
-                             HYPRE_BigInt *row_start,
-                             HYPRE_BigInt *row_end,
-                             HYPRE_BigInt *col_start,
-                             HYPRE_BigInt *col_end )
+hypre_DistributedMatrixGetLocalRangeParCSR( hypre_DistributedMatrix *dm,
+                                            HYPRE_BigInt            *row_start,
+                                            HYPRE_BigInt            *row_end,
+                                            HYPRE_BigInt            *col_start,
+                                            HYPRE_BigInt            *col_end )
 {
    HYPRE_Int ierr=0;
-   HYPRE_ParCSRMatrix Parcsr_matrix = (HYPRE_ParCSRMatrix) hypre_DistributedMatrixLocalStorage(matrix);
+   HYPRE_ParCSRMatrix Parcsr_matrix = (HYPRE_ParCSRMatrix) hypre_DistributedMatrixLocalStorage(dm);
 
    if (!Parcsr_matrix) return(-1);
 
-
    ierr = HYPRE_ParCSRMatrixGetLocalRange( Parcsr_matrix, row_start, row_end,
-					col_start, col_end );
+                                           col_start, col_end );
 
    return(ierr);
 }
@@ -87,14 +88,14 @@ hypre_DistributedMatrixGetLocalRangeParCSR( hypre_DistributedMatrix *matrix,
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_DistributedMatrixGetRowParCSR( hypre_DistributedMatrix *matrix,
-                             HYPRE_BigInt row,
-                             HYPRE_Int *size,
-                             HYPRE_BigInt **col_ind,
-                             HYPRE_Real **values )
+hypre_DistributedMatrixGetRowParCSR( hypre_DistributedMatrix *dm,
+                                     HYPRE_BigInt             row,
+                                     HYPRE_Int               *size,
+                                     HYPRE_BigInt           **col_ind,
+                                     HYPRE_Real             **values )
 {
    HYPRE_Int ierr = 0;
-   HYPRE_ParCSRMatrix Parcsr_matrix = (HYPRE_ParCSRMatrix) hypre_DistributedMatrixLocalStorage(matrix);
+   HYPRE_ParCSRMatrix Parcsr_matrix = (HYPRE_ParCSRMatrix) hypre_DistributedMatrixLocalStorage(dm);
 
    if (!Parcsr_matrix) return(-1);
 
@@ -102,7 +103,7 @@ hypre_DistributedMatrixGetRowParCSR( hypre_DistributedMatrix *matrix,
 
    // RL: if HYPRE_ParCSRMatrixGetRow was on device, need the next line to guarantee it's done
 #if defined(HYPRE_USING_GPU)
-   hypre_SyncCudaComputeStream(hypre_handle());
+   hypre_SyncComputeStream();
 #endif
 
    return(ierr);
@@ -113,14 +114,14 @@ hypre_DistributedMatrixGetRowParCSR( hypre_DistributedMatrix *matrix,
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_DistributedMatrixRestoreRowParCSR( hypre_DistributedMatrix *matrix,
-                             HYPRE_BigInt row,
-                             HYPRE_Int *size,
-                             HYPRE_BigInt **col_ind,
-                             HYPRE_Real **values )
+hypre_DistributedMatrixRestoreRowParCSR( hypre_DistributedMatrix *dm,
+                                         HYPRE_BigInt             row,
+                                         HYPRE_Int               *size,
+                                         HYPRE_BigInt           **col_ind,
+                                         HYPRE_Real             **values )
 {
    HYPRE_Int ierr;
-   HYPRE_ParCSRMatrix Parcsr_matrix = (HYPRE_ParCSRMatrix) hypre_DistributedMatrixLocalStorage(matrix);
+   HYPRE_ParCSRMatrix Parcsr_matrix = (HYPRE_ParCSRMatrix) hypre_DistributedMatrixLocalStorage(dm);
 
    if (Parcsr_matrix == NULL) return(-1);
 
diff --git a/external/hypre/src/distributed_matrix/internal_protos.h b/external/hypre/src/distributed_matrix/internal_protos.h
index e8af488e..2ec5e20d 100644
--- a/external/hypre/src/distributed_matrix/internal_protos.h
+++ b/external/hypre/src/distributed_matrix/internal_protos.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/docs/README.md b/external/hypre/src/docs/README.md
index d5e608ab..836e92ee 100644
--- a/external/hypre/src/docs/README.md
+++ b/external/hypre/src/docs/README.md
@@ -1,5 +1,5 @@
 <!--
-Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 
 SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -76,6 +76,12 @@ the user and reference manuals (adjust the path as needed):
     file:///home/falgout2/hypre/src/docs/usr-manual-html/index.html
     file:///home/falgout2/hypre/src/docs/ref-manual-html/index.html
 
+Alternatively, run a (local) webserver:
+
+    python3 -m http.server --directory usr-manual-html
+
+and open http://localhost:8000 in a browser.
+
 ## Some useful links
 
 Sphinx:
@@ -96,3 +102,9 @@ Breathe:
 
 - https://breathe.readthedocs.io/en/latest/index.html
 
+## Some notes on customization
+
+After compilation, the CSS style files that control the HTML formatting will be
+in the folder `usr-manual-html/_static`.  To override any of these settings, add
+the appropriate lines to the file `usr-manual/_static/custom.css`.  Use the web
+to get information on CSS.
diff --git a/external/hypre/src/docs/copyright.txt b/external/hypre/src/docs/copyright.txt
index e6c6d6b8..520b65a5 100644
--- a/external/hypre/src/docs/copyright.txt
+++ b/external/hypre/src/docs/copyright.txt
@@ -1,4 +1,4 @@
-Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 
 SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/docs/hypre.bib b/external/hypre/src/docs/hypre.bib
index 1118a9f1..f75deb21 100644
--- a/external/hypre/src/docs/hypre.bib
+++ b/external/hypre/src/docs/hypre.bib
@@ -1,4 +1,4 @@
-% Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+% Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 % HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 %
 % SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/docs/ref-manual/conf.doxygen b/external/hypre/src/docs/ref-manual/conf.doxygen
index 530ff510..bb9e8116 100644
--- a/external/hypre/src/docs/ref-manual/conf.doxygen
+++ b/external/hypre/src/docs/ref-manual/conf.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.5
+# Doxyfile 1.9.5
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -12,16 +12,26 @@
 # For lists, items can also be appended using:
 # TAG += value [value, ...]
 # Values that contain spaces should be placed between quotes (\" \").
+#
+# Note:
+#
+# Use doxygen to compare the used configuration file with the template
+# configuration file:
+# doxygen -x [configFile]
+# Use doxygen to compare the used configuration file with the template
+# configuration file without replacing the environment variables or CMake type
+# replacement variables:
+# doxygen -x_noenv [configFile]
 
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
 
-# This tag specifies the encoding used for all characters in the config file
-# that follow. The default is UTF-8 which is also the encoding used for all text
-# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
-# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
-# for the list of possible encodings.
+# This tag specifies the encoding used for all characters in the configuration
+# file that follow. The default is UTF-8 which is also the encoding used for all
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the
+# iconv built into libc) for the transcoding. See
+# https://www.gnu.org/software/libiconv/ for the list of possible encodings.
 # The default value is: UTF-8.
 
 DOXYFILE_ENCODING      = UTF-8
@@ -38,7 +48,7 @@ PROJECT_NAME           = hypre
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER = 2.22.1
+PROJECT_NUMBER = 2.33.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
@@ -46,10 +56,10 @@ PROJECT_NUMBER = 2.22.1
 
 PROJECT_BRIEF          =
 
-# With the PROJECT_LOGO tag one can specify an logo or icon that is included in
-# the documentation. The maximum height of the logo should not exceed 55 pixels
-# and the maximum width should not exceed 200 pixels. Doxygen will copy the logo
-# to the output directory.
+# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
+# in the documentation. The maximum height of the logo should not exceed 55
+# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
+# the logo to the output directory.
 
 PROJECT_LOGO           =
 
@@ -60,37 +70,59 @@ PROJECT_LOGO           =
 
 OUTPUT_DIRECTORY       = .
 
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub-
-# directories (in 2 levels) under the output directory of each output format and
-# will distribute the generated files over these directories. Enabling this
+# If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096
+# sub-directories (in 2 levels) under the output directory of each output format
+# and will distribute the generated files over these directories. Enabling this
 # option can be useful when feeding doxygen a huge amount of source files, where
 # putting all generated files in the same directory would otherwise causes
-# performance problems for the file system.
+# performance problems for the file system. Adapt CREATE_SUBDIRS_LEVEL to
+# control the number of sub-directories.
 # The default value is: NO.
 
 CREATE_SUBDIRS         = NO
 
+# Controls the number of sub-directories that will be created when
+# CREATE_SUBDIRS tag is set to YES. Level 0 represents 16 directories, and every
+# level increment doubles the number of directories, resulting in 4096
+# directories at level 8 which is the default and also the maximum value. The
+# sub-directories are organized in 2 levels, the first level always has a fixed
+# numer of 16 directories.
+# Minimum value: 0, maximum value: 8, default value: 8.
+# This tag requires that the tag CREATE_SUBDIRS is set to YES.
+
+CREATE_SUBDIRS_LEVEL   = 8
+
+# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
+# characters to appear in the names of generated files. If set to NO, non-ASCII
+# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
+# U+3044.
+# The default value is: NO.
+
+ALLOW_UNICODE_NAMES    = NO
+
 # The OUTPUT_LANGUAGE tag is used to specify the language in which all
 # documentation generated by doxygen is written. Doxygen will use this
 # information to generate all constant output in the proper language.
-# Possible values are: Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-
-# Traditional, Croatian, Czech, Danish, Dutch, English, Esperanto, Farsi,
-# Finnish, French, German, Greek, Hungarian, Italian, Japanese, Japanese-en,
-# Korean, Korean-en, Latvian, Norwegian, Macedonian, Persian, Polish,
-# Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish,
-# Turkish, Ukrainian and Vietnamese.
+# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Bulgarian,
+# Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, English
+# (United States), Esperanto, Farsi (Persian), Finnish, French, German, Greek,
+# Hindi, Hungarian, Indonesian, Italian, Japanese, Japanese-en (Japanese with
+# English messages), Korean, Korean-en (Korean with English messages), Latvian,
+# Lithuanian, Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese,
+# Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish,
+# Swedish, Turkish, Ukrainian and Vietnamese.
 # The default value is: English.
 
 OUTPUT_LANGUAGE        = English
 
-# If the BRIEF_MEMBER_DESC tag is set to YES doxygen will include brief member
+# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
 # descriptions after the members that are listed in the file and class
 # documentation (similar to Javadoc). Set to NO to disable this.
 # The default value is: YES.
 
-BRIEF_MEMBER_DESC      = NO
+BRIEF_MEMBER_DESC      = YES
 
-# If the REPEAT_BRIEF tag is set to YES doxygen will prepend the brief
+# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief
 # description of a member or function before the detailed description
 #
 # Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
@@ -125,7 +157,7 @@ ALWAYS_DETAILED_SEC    = NO
 
 INLINE_INHERITED_MEMB  = NO
 
-# If the FULL_PATH_NAMES tag is set to YES doxygen will prepend the full path
+# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path
 # before files name in the file list and in the header files. If set to NO the
 # shortest path that makes the file name unique will be used
 # The default value is: YES.
@@ -167,7 +199,17 @@ SHORT_NAMES            = NO
 # description.)
 # The default value is: NO.
 
-JAVADOC_AUTOBRIEF      = NO
+JAVADOC_AUTOBRIEF      = YES
+
+# If the JAVADOC_BANNER tag is set to YES then doxygen will interpret a line
+# such as
+# /***************
+# as being the beginning of a Javadoc-style comment "banner". If set to NO, the
+# Javadoc-style will behave just like regular comments and it will not be
+# interpreted by doxygen.
+# The default value is: NO.
+
+JAVADOC_BANNER         = NO
 
 # If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
 # line (until the first dot) of a Qt-style comment as the brief description. If
@@ -175,7 +217,7 @@ JAVADOC_AUTOBRIEF      = NO
 # requiring an explicit \brief command for a brief description.)
 # The default value is: NO.
 
-QT_AUTOBRIEF           = NO
+QT_AUTOBRIEF           = YES
 
 # The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
 # multi-line C++ special comment block (i.e. a block of //! or /// comments) as
@@ -189,15 +231,23 @@ QT_AUTOBRIEF           = NO
 
 MULTILINE_CPP_IS_BRIEF = NO
 
+# By default Python docstrings are displayed as preformatted text and doxygen's
+# special commands cannot be used. By setting PYTHON_DOCSTRING to NO the
+# doxygen's special commands can be used and the contents of the docstring
+# documentation blocks is shown as doxygen documentation.
+# The default value is: YES.
+
+PYTHON_DOCSTRING       = YES
+
 # If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
 # documentation from any documented member that it re-implements.
 # The default value is: YES.
 
 INHERIT_DOCS           = YES
 
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce a
-# new page for each member. If set to NO, the documentation of a member will be
-# part of the file/class/namespace that contains it.
+# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new
+# page for each member. If set to NO, the documentation of a member will be part
+# of the file/class/namespace that contains it.
 # The default value is: NO.
 
 SEPARATE_MEMBER_PAGES  = NO
@@ -212,20 +262,19 @@ TAB_SIZE               = 4
 # the documentation. An alias has the form:
 # name=value
 # For example adding
-# "sideeffect=@par Side Effects:\n"
+# "sideeffect=@par Side Effects:^^"
 # will allow you to put the command \sideeffect (or @sideeffect) in the
 # documentation, which will result in a user-defined paragraph with heading
-# "Side Effects:". You can put \n's in the value part of an alias to insert
-# newlines.
+# "Side Effects:". Note that you cannot put \n's in the value part of an alias
+# to insert newlines (in the resulting output). You can put ^^ in the value part
+# of an alias to insert a newline as if a physical newline was in the original
+# file. When you need a literal { or } or , in the value part of an alias you
+# have to escape them by means of a backslash (\), this can lead to conflicts
+# with the commands \{ and \} for these it is advised to use the version @{ and
+# @} or use a double escape (\\{ and \\})
 
 ALIASES                =
 
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
-
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
 # only. Doxygen will then generate output that is more tailored for C. For
 # instance, some of the names that are used will be different. The list of all
@@ -254,25 +303,40 @@ OPTIMIZE_FOR_FORTRAN   = NO
 
 OPTIMIZE_OUTPUT_VHDL   = NO
 
+# Set the OPTIMIZE_OUTPUT_SLICE tag to YES if your project consists of Slice
+# sources only. Doxygen will then generate output that is more tailored for that
+# language. For instance, namespaces will be presented as modules, types will be
+# separated into more groups, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_SLICE  = NO
+
 # Doxygen selects the parser to use depending on the extension of the files it
 # parses. With this tag you can assign which parser to use for a given
 # extension. Doxygen has a built-in mapping, but you can override or extend it
 # using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
-# C#, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL. For instance to make
-# doxygen treat .inc files as Fortran files (default is PHP), and .f files as C
-# (default is Fortran), use: inc=Fortran f=C.
+# language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
+# Csharp (C#), C, C++, Lex, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# VHDL, Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
+# FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
+# tries to guess whether the code is fixed or free formatted code, this is the
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
 #
-# Note For files without extension you can use no_extension as a placeholder.
+# Note: For files without extension you can use no_extension as a placeholder.
 #
 # Note that for custom extensions you also need to set FILE_PATTERNS otherwise
-# the files are not read by doxygen.
+# the files are not read by doxygen. When specifying no_extension you should add
+# * to the FILE_PATTERNS.
+#
+# Note see also the list of default file extension mappings.
 
 EXTENSION_MAPPING      =
 
 # If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
 # according to the Markdown format, which allows for more readable
-# documentation. See http://daringfireball.net/projects/markdown/ for details.
+# documentation. See https://daringfireball.net/projects/markdown/ for details.
 # The output of markdown processing is further processed by doxygen, so you can
 # mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
 # case of backward compatibilities issues.
@@ -280,10 +344,19 @@ EXTENSION_MAPPING      =
 
 MARKDOWN_SUPPORT       = YES
 
+# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up
+# to that level are automatically included in the table of contents, even if
+# they do not have an id attribute.
+# Note: This feature currently applies only to Markdown headings.
+# Minimum value: 0, maximum value: 99, default value: 5.
+# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
+
+TOC_INCLUDE_HEADINGS   = 5
+
 # When enabled doxygen tries to link words that correspond to documented
 # classes, or namespaces to their corresponding documentation. Such a link can
-# be prevented in individual cases by by putting a % sign in front of the word
-# or globally by setting AUTOLINK_SUPPORT to NO.
+# be prevented in individual cases by putting a % sign in front of the word or
+# globally by setting AUTOLINK_SUPPORT to NO.
 # The default value is: YES.
 
 AUTOLINK_SUPPORT       = YES
@@ -305,7 +378,7 @@ BUILTIN_STL_SUPPORT    = NO
 CPP_CLI_SUPPORT        = NO
 
 # Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
-# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
+# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen
 # will parse them like normal C++ but will assume all classes use public instead
 # of private inheritance when no explicit protection keyword is present.
 # The default value is: NO.
@@ -323,13 +396,20 @@ SIP_SUPPORT            = NO
 IDL_PROPERTY_SUPPORT   = YES
 
 # If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES, then doxygen will reuse the documentation of the first
+# tag is set to YES then doxygen will reuse the documentation of the first
 # member in the group (if any) for the other members of the group. By default
 # all members of a group must be documented explicitly.
 # The default value is: NO.
 
 DISTRIBUTE_GROUP_DOC   = NO
 
+# If one adds a struct or class to a group and this option is enabled, then also
+# any nested class or struct is added to the same group. By default this option
+# is disabled and one has to add nested compounds explicitly via \ingroup.
+# The default value is: NO.
+
+GROUP_NESTED_COMPOUNDS = NO
+
 # Set the SUBGROUPING tag to YES to allow class member groups of the same type
 # (for instance a group of public functions) to be put as a subgroup of that
 # type (e.g. under the Public Functions section). Set it to NO to prevent
@@ -384,11 +464,24 @@ TYPEDEF_HIDES_STRUCT   = NO
 
 LOOKUP_CACHE_SIZE      = 0
 
+# The NUM_PROC_THREADS specifies the number of threads doxygen is allowed to use
+# during processing. When set to 0 doxygen will based this on the number of
+# cores available in the system. You can set it explicitly to a value larger
+# than 0 to get more control over the balance between CPU load and processing
+# speed. At this moment only the input processing can be done using multiple
+# threads. Since this is still an experimental feature the default is set to 1,
+# which effectively disables parallel processing. Please report any issues you
+# encounter. Generating dot graphs in parallel is controlled by the
+# DOT_NUM_THREADS setting.
+# Minimum value: 0, maximum value: 32, default value: 1.
+
+NUM_PROC_THREADS       = 1
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
 
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
+# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in
 # documentation are documented, even if no documentation was available. Private
 # class members and static file members will be hidden unless the
 # EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
@@ -398,35 +491,41 @@ LOOKUP_CACHE_SIZE      = 0
 
 EXTRACT_ALL            = YES
 
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class will
+# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
 # be included in the documentation.
 # The default value is: NO.
 
 EXTRACT_PRIVATE        = NO
 
-# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal
+# If the EXTRACT_PRIV_VIRTUAL tag is set to YES, documented private virtual
+# methods of a class will be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PRIV_VIRTUAL   = NO
+
+# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
 # scope will be included in the documentation.
 # The default value is: NO.
 
 EXTRACT_PACKAGE        = NO
 
-# If the EXTRACT_STATIC tag is set to YES all static members of a file will be
+# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be
 # included in the documentation.
 # The default value is: NO.
 
 EXTRACT_STATIC         = NO
 
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) defined
-# locally in source files will be included in the documentation. If set to NO
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined
+# locally in source files will be included in the documentation. If set to NO,
 # only classes defined in header files are included. Does not have any effect
 # for Java sources.
 # The default value is: YES.
 
 EXTRACT_LOCAL_CLASSES  = NO
 
-# This flag is only useful for Objective-C code. When set to YES local methods,
+# This flag is only useful for Objective-C code. If set to YES, local methods,
 # which are defined in the implementation section but not in the interface are
-# included in the documentation. If set to NO only methods in the interface are
+# included in the documentation. If set to NO, only methods in the interface are
 # included.
 # The default value is: NO.
 
@@ -441,6 +540,13 @@ EXTRACT_LOCAL_METHODS  = NO
 
 EXTRACT_ANON_NSPACES   = NO
 
+# If this flag is set to YES, the name of an unnamed parameter in a declaration
+# will be determined by the corresponding definition. By default unnamed
+# parameters remain unnamed in the output.
+# The default value is: YES.
+
+RESOLVE_UNNAMED_PARAMS = YES
+
 # If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
 # undocumented members inside documented classes or files. If set to NO these
 # members will be included in the various overviews, but no documentation
@@ -451,21 +557,21 @@ HIDE_UNDOC_MEMBERS     = YES
 
 # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
 # undocumented classes that are normally visible in the class hierarchy. If set
-# to NO these classes will be included in the various overviews. This option has
-# no effect if EXTRACT_ALL is enabled.
+# to NO, these classes will be included in the various overviews. This option
+# has no effect if EXTRACT_ALL is enabled.
 # The default value is: NO.
 
 HIDE_UNDOC_CLASSES     = YES
 
 # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
 # The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = NO
 
 # If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
-# documentation blocks found inside the body of a function. If set to NO these
+# documentation blocks found inside the body of a function. If set to NO, these
 # blocks will be appended to the function's detailed documentation block.
 # The default value is: NO.
 
@@ -478,28 +584,56 @@ HIDE_IN_BODY_DOCS      = NO
 
 INTERNAL_DOCS          = NO
 
-# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
-# names in lower-case letters. If set to YES upper-case letters are also
-# allowed. This is useful if you have classes or files whose names only differ
-# in case and if your file system supports case sensitive file names. Windows
-# and Mac users are advised to set this option to NO.
-# The default value is: system dependent.
+# With the correct setting of option CASE_SENSE_NAMES doxygen will better be
+# able to match the capabilities of the underlying filesystem. In case the
+# filesystem is case sensitive (i.e. it supports files in the same directory
+# whose names only differ in casing), the option must be set to YES to properly
+# deal with such files in case they appear in the input. For filesystems that
+# are not case sensitive the option should be set to NO to properly deal with
+# output files written for symbols that only differ in casing, such as for two
+# classes, one named CLASS and the other named Class, and to also support
+# references to files without having to specify the exact matching casing. On
+# Windows (including Cygwin) and MacOS, users should typically set this option
+# to NO, whereas on Linux or other Unix flavors it should typically be set to
+# YES.
+# Possible values are: SYSTEM, NO and YES.
+# The default value is: SYSTEM.
 
 CASE_SENSE_NAMES       = YES
 
 # If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
-# their full class and namespace scopes in the documentation. If set to YES the
+# their full class and namespace scopes in the documentation. If set to YES, the
 # scope will be hidden.
 # The default value is: NO.
 
 HIDE_SCOPE_NAMES       = YES
 
+# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will
+# append additional text to a page's title, such as Class Reference. If set to
+# YES the compound reference will be hidden.
+# The default value is: NO.
+
+HIDE_COMPOUND_REFERENCE= NO
+
+# If the SHOW_HEADERFILE tag is set to YES then the documentation for a class
+# will show which file needs to be included to use the class.
+# The default value is: YES.
+
+SHOW_HEADERFILE        = YES
+
 # If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
 # the files that are included by a file in the documentation of that file.
 # The default value is: YES.
 
 SHOW_INCLUDE_FILES     = NO
 
+# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
+# grouped member an include statement to the documentation, telling the reader
+# which file to include in order to use the member.
+# The default value is: NO.
+
+SHOW_GROUPED_MEMB_INC  = NO
+
 # If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
 # files with double quotes in the documentation rather than with sharp brackets.
 # The default value is: NO.
@@ -514,14 +648,15 @@ INLINE_INFO            = YES
 
 # If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
 # (detailed) documentation of file and class members alphabetically by member
-# name. If set to NO the members will appear in declaration order.
+# name. If set to NO, the members will appear in declaration order.
 # The default value is: YES.
 
 SORT_MEMBER_DOCS       = YES
 
 # If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
 # descriptions of file, namespace and class members alphabetically by member
-# name. If set to NO the members will appear in declaration order.
+# name. If set to NO, the members will appear in declaration order. Note that
+# this will also influence the order of the classes in the class list.
 # The default value is: NO.
 
 SORT_BRIEF_DOCS        = NO
@@ -565,27 +700,25 @@ SORT_BY_SCOPE_NAME     = NO
 
 STRICT_PROTO_MATCHING  = NO
 
-# The GENERATE_TODOLIST tag can be used to enable ( YES) or disable ( NO) the
-# todo list. This list is created by putting \todo commands in the
-# documentation.
+# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo
+# list. This list is created by putting \todo commands in the documentation.
 # The default value is: YES.
 
 GENERATE_TODOLIST      = YES
 
-# The GENERATE_TESTLIST tag can be used to enable ( YES) or disable ( NO) the
-# test list. This list is created by putting \test commands in the
-# documentation.
+# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test
+# list. This list is created by putting \test commands in the documentation.
 # The default value is: YES.
 
 GENERATE_TESTLIST      = YES
 
-# The GENERATE_BUGLIST tag can be used to enable ( YES) or disable ( NO) the bug
+# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug
 # list. This list is created by putting \bug commands in the documentation.
 # The default value is: YES.
 
 GENERATE_BUGLIST       = YES
 
-# The GENERATE_DEPRECATEDLIST tag can be used to enable ( YES) or disable ( NO)
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO)
 # the deprecated list. This list is created by putting \deprecated commands in
 # the documentation.
 # The default value is: YES.
@@ -610,8 +743,8 @@ ENABLED_SECTIONS       =
 MAX_INITIALIZER_LINES  = 30
 
 # Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
-# the bottom of the documentation of classes and structs. If set to YES the list
-# will mention the files that were used to generate the documentation.
+# the bottom of the documentation of classes and structs. If set to YES, the
+# list will mention the files that were used to generate the documentation.
 # The default value is: YES.
 
 SHOW_USED_FILES        = YES
@@ -645,7 +778,8 @@ FILE_VERSION_FILTER    =
 # output files in an output format independent way. To create the layout file
 # that represents doxygen's defaults, run doxygen with the -l option. You can
 # optionally specify a file name after the option, if omitted DoxygenLayout.xml
-# will be used as the name of the layout file.
+# will be used as the name of the layout file. See also section "Changing the
+# layout of pages" for information.
 #
 # Note that if you run doxygen from a directory containing a file called
 # DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
@@ -656,11 +790,10 @@ LAYOUT_FILE            =
 # The CITE_BIB_FILES tag can be used to specify one or more bib files containing
 # the reference definitions. This must be a list of .bib files. The .bib
 # extension is automatically appended if omitted. This requires the bibtex tool
-# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
+# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info.
 # For LaTeX the style of the bibliography can be controlled using
 # LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
-# search path. Do not use file names with spaces, bibtex cannot handle them. See
-# also \cite for info how to create references.
+# search path. See also \cite for info how to create references.
 
 CITE_BIB_FILES         =
 
@@ -676,7 +809,7 @@ CITE_BIB_FILES         =
 QUIET                  = NO
 
 # The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated to standard error ( stderr) by doxygen. If WARNINGS is set to YES
+# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
 # this implies that the warnings are on.
 #
 # Tip: Turn warnings on while writing the documentation.
@@ -684,7 +817,7 @@ QUIET                  = NO
 
 WARNINGS               = YES
 
-# If the WARN_IF_UNDOCUMENTED tag is set to YES, then doxygen will generate
+# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate
 # warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
 # will automatically be disabled.
 # The default value is: YES.
@@ -692,34 +825,66 @@ WARNINGS               = YES
 WARN_IF_UNDOCUMENTED   = YES
 
 # If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some parameters
-# in a documented function, or documenting parameters that don't exist or using
-# markup commands wrongly.
+# potential errors in the documentation, such as documenting some parameters in
+# a documented function twice, or documenting parameters that don't exist or
+# using markup commands wrongly.
 # The default value is: YES.
 
 WARN_IF_DOC_ERROR      = YES
 
+# If WARN_IF_INCOMPLETE_DOC is set to YES, doxygen will warn about incomplete
+# function parameter documentation. If set to NO, doxygen will accept that some
+# parameters have no documentation without warning.
+# The default value is: YES.
+
+WARN_IF_INCOMPLETE_DOC = YES
+
 # This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
 # are documented, but have no documentation for their parameters or return
-# value. If set to NO doxygen will only warn about wrong or incomplete parameter
-# documentation, but not about the absence of documentation.
+# value. If set to NO, doxygen will only warn about wrong parameter
+# documentation, but not about the absence of documentation. If EXTRACT_ALL is
+# set to YES then this flag will automatically be disabled. See also
+# WARN_IF_INCOMPLETE_DOC
 # The default value is: NO.
 
 WARN_NO_PARAMDOC       = NO
 
+# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
+# a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS
+# then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but
+# at the end of the doxygen process doxygen will return with a non-zero status.
+# Possible values are: NO, YES and FAIL_ON_WARNINGS.
+# The default value is: NO.
+
+WARN_AS_ERROR          = NO
+
 # The WARN_FORMAT tag determines the format of the warning messages that doxygen
 # can produce. The string should contain the $file, $line, and $text tags, which
 # will be replaced by the file and line number from which the warning originated
 # and the warning text. Optionally the format may contain $version, which will
 # be replaced by the version of the file (if it could be obtained via
 # FILE_VERSION_FILTER)
+# See also: WARN_LINE_FORMAT
 # The default value is: $file:$line: $text.
 
 WARN_FORMAT            = "$file:$line: $text"
 
+# In the $text part of the WARN_FORMAT command it is possible that a reference
+# to a more specific place is given. To make it easier to jump to this place
+# (outside of doxygen) the user can define a custom "cut" / "paste" string.
+# Example:
+# WARN_LINE_FORMAT = "'vi $file +$line'"
+# See also: WARN_FORMAT
+# The default value is: at line $line of file $file.
+
+WARN_LINE_FORMAT       = "at line $line of file $file"
+
 # The WARN_LOGFILE tag can be used to specify a file to which warning and error
 # messages should be written. If left blank the output is written to standard
-# error (stderr).
+# error (stderr). In case the file specified cannot be opened for writing the
+# warning and error messages are written to standard error. When as file - is
+# specified the warning and error messages are written to standard output
+# (stdout).
 
 WARN_LOGFILE           =
 
@@ -730,7 +895,7 @@ WARN_LOGFILE           =
 # The INPUT tag is used to specify the files and/or directories that contain
 # documented source files. You may enter file names like myfile.cpp or
 # directories like /usr/src/myproject. Separate the files or directories with
-# spaces.
+# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.
 
 INPUT                  = \
@@ -746,20 +911,40 @@ INPUT                  = \
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
 # libiconv (or the iconv built into libc) for the transcoding. See the libiconv
-# documentation (see: http://www.gnu.org/software/libiconv) for the list of
-# possible encodings.
+# documentation (see:
+# https://www.gnu.org/software/libiconv/) for the list of possible encodings.
+# See also: INPUT_FILE_ENCODING
 # The default value is: UTF-8.
 
 INPUT_ENCODING         = UTF-8
 
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses The INPUT_FILE_ENCODING tag can be used to specify
+# character encoding on a per file pattern basis. Doxygen will compare the file
+# name with each pattern and apply the encoding instead of the default
+# INPUT_ENCODING) if there is a match. The character encodings are a list of the
+# form: pattern=encoding (like *.php=ISO-8859-1). See cfg_input_encoding
+# "INPUT_ENCODING" for further information on supported encodings.
+
+INPUT_FILE_ENCODING    =
+
 # If the value of the INPUT tag contains directories, you can use the
 # FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
-# *.h) to filter out the source-files in the directories. If left blank the
-# following patterns are tested:*.c, *.cc, *.cxx, *.cpp, *.c++, *.java, *.ii,
-# *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp,
-# *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown,
-# *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf,
-# *.qsf, *.as and *.js.
+# *.h) to filter out the source-files in the directories.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# read by doxygen.
+#
+# Note the list of default checked file patterns might differ from the list of
+# default file extension mappings.
+#
+# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
+# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
+# *.hh, *.hxx, *.hpp, *.h++, *.l, *.cs, *.d, *.php, *.php4, *.php5, *.phtml,
+# *.inc, *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C
+# comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
 
 FILE_PATTERNS          = HYPRE*.h
 
@@ -798,7 +983,7 @@ EXCLUDE_PATTERNS       =
 # (namespaces, classes, functions, etc.) that should be excluded from the
 # output. The symbol name can be a fully qualified name, a word, or if the
 # wildcard * is used, a substring. Examples: ANamespace, AClass,
-# AClass::ANamespace, ANamespace::*Test
+# ANamespace::AClass, ANamespace::*Test
 #
 # Note that the wildcards are matched against the file with absolute path, so to
 # exclude all test directories use the pattern */test/*
@@ -845,6 +1030,15 @@ IMAGE_PATH             =
 # Note that the filter must not add or remove lines; it is applied before the
 # code is scanned, but not when the output code is generated. If lines are added
 # or removed, the anchors will not be placed correctly.
+#
+# Note that doxygen will use the data processed and written to standard output
+# for further processing, therefore nothing else, like debug statements or used
+# commands (so in case of a Windows batch file always use @echo OFF), should be
+# written to standard output.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
 
 INPUT_FILTER           =
 
@@ -854,11 +1048,15 @@ INPUT_FILTER           =
 # (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
 # filters are used. If the FILTER_PATTERNS tag is empty or if none of the
 # patterns match the file name, INPUT_FILTER is applied.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
 
 FILTER_PATTERNS        =
 
 # If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER ) will also be used to filter the input files that are used for
+# INPUT_FILTER) will also be used to filter the input files that are used for
 # producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
 # The default value is: NO.
 
@@ -879,6 +1077,15 @@ FILTER_SOURCE_PATTERNS =
 
 USE_MDFILE_AS_MAINPAGE =
 
+# The Fortran standard specifies that for fixed formatted Fortran code all
+# characters from position 72 are to be considered as comment. A common
+# extension is to allow longer lines before the automatic comment starts. The
+# setting FORTRAN_COMMENT_AFTER will also make it possible that longer lines can
+# be processed before the automatic comment starts.
+# Minimum value: 7, maximum value: 10000, default value: 72.
+
+FORTRAN_COMMENT_AFTER  = 72
+
 #---------------------------------------------------------------------------
 # Configuration options related to source browsing
 #---------------------------------------------------------------------------
@@ -906,7 +1113,7 @@ INLINE_SOURCES         = NO
 STRIP_CODE_COMMENTS    = YES
 
 # If the REFERENCED_BY_RELATION tag is set to YES then for each documented
-# function all documented functions referencing it will be listed.
+# entity all documented functions referencing it will be listed.
 # The default value is: NO.
 
 REFERENCED_BY_RELATION = NO
@@ -918,7 +1125,7 @@ REFERENCED_BY_RELATION = NO
 REFERENCES_RELATION    = NO
 
 # If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
-# to YES, then the hyperlinks from functions in REFERENCES_RELATION and
+# to YES then the hyperlinks from functions in REFERENCES_RELATION and
 # REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
 # link to the documentation.
 # The default value is: YES.
@@ -938,12 +1145,12 @@ SOURCE_TOOLTIPS        = YES
 # If the USE_HTAGS tag is set to YES then the references to source code will
 # point to the HTML generated by the htags(1) tool instead of doxygen built-in
 # source browser. The htags tool is part of GNU's global source tagging system
-# (see http://www.gnu.org/software/global/global.html). You will need version
+# (see https://www.gnu.org/software/global/global.html). You will need version
 # 4.8.6 or higher.
 #
 # To use it do the following:
 # - Install the latest version of global
-# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
+# - Enable SOURCE_BROWSER and USE_HTAGS in the configuration file
 # - Make sure the INPUT points to the root of the source tree
 # - Run doxygen as normal
 #
@@ -976,13 +1183,6 @@ VERBATIM_HEADERS       = NO
 
 ALPHABETICAL_INDEX     = YES
 
-# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
-# which the alphabetical index list will be split.
-# Minimum value: 1, maximum value: 20, default value: 5.
-# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
-
-COLS_IN_ALPHA_INDEX    = 5
-
 # In case all classes in a project start with a common prefix, all classes will
 # be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
 # can be used to specify a prefix (or a list of prefixes) that should be ignored
@@ -995,7 +1195,7 @@ IGNORE_PREFIX          =
 # Configuration options related to the HTML output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_HTML tag is set to YES doxygen will generate HTML output
+# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
 # The default value is: YES.
 
 GENERATE_HTML          = YES
@@ -1057,13 +1257,15 @@ HTML_FOOTER            =
 
 HTML_STYLESHEET        =
 
-# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional user-
-# defined cascading style sheet that is included after the standard style sheets
+# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# cascading style sheets that are included after the standard style sheets
 # created by doxygen. Using this option one can overrule certain style aspects.
 # This is preferred over using HTML_STYLESHEET since it does not replace the
-# standard style sheet and is therefor more robust against future updates.
-# Doxygen will copy the style sheet file to the output directory. For an example
-# see the documentation.
+# standard style sheet and is therefore more robust against future updates.
+# Doxygen will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list). For an example see the documentation.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_EXTRA_STYLESHEET  =
@@ -1078,10 +1280,27 @@ HTML_EXTRA_STYLESHEET  =
 
 HTML_EXTRA_FILES       =
 
+# The HTML_COLORSTYLE tag can be used to specify if the generated HTML output
+# should be rendered with a dark or light theme. Default setting AUTO_LIGHT
+# enables light output unless the user preference is dark output. Other options
+# are DARK to always use dark mode, LIGHT to always use light mode, AUTO_DARK to
+# default to dark mode unless the user prefers light mode, and TOGGLE to let the
+# user toggle between dark and light mode via a button.
+# Possible values are: LIGHT Always generate light output., DARK Always generate
+# dark output., AUTO_LIGHT Automatically set the mode according to the user
+# preference, use light mode if no preference is set (the default)., AUTO_DARK
+# Automatically set the mode according to the user preference, use dark mode if
+# no preference is set. and TOGGLE Allow to user to switch between light and
+# dark mode via a button..
+# The default value is: AUTO_LIGHT.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE        = AUTO_LIGHT
+
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
-# will adjust the colors in the stylesheet and background images according to
-# this color. Hue is specified as an angle on a colorwheel, see
-# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
+# will adjust the colors in the style sheet and background images according to
+# this color. Hue is specified as an angle on a color-wheel, see
+# https://en.wikipedia.org/wiki/Hue for more information. For instance the value
 # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
 # purple, and 360 is red again.
 # Minimum value: 0, maximum value: 359, default value: 220.
@@ -1090,7 +1309,7 @@ HTML_EXTRA_FILES       =
 HTML_COLORSTYLE_HUE    = 220
 
 # The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
-# in the HTML output. For a value of 0 the output will use grayscales only. A
+# in the HTML output. For a value of 0 the output will use gray-scales only. A
 # value of 255 will produce the most vivid colors.
 # Minimum value: 0, maximum value: 255, default value: 100.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1110,12 +1329,24 @@ HTML_COLORSTYLE_GAMMA  = 80
 
 # If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
 # page will contain the date and time when the page was generated. Setting this
-# to NO can help when comparing the output of multiple runs.
-# The default value is: YES.
+# to YES can help to show when doxygen was last run and thus if the
+# documentation is up to date.
+# The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_TIMESTAMP         = NO
 
+# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
+# documentation will contain a main index with vertical navigation menus that
+# are dynamically created via JavaScript. If disabled, the navigation index will
+# consists of multiple levels of tabs that are statically embedded in every HTML
+# page. Disable this option to support browsers that do not have JavaScript,
+# like the Qt help browser.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_DYNAMIC_MENUS     = YES
+
 # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
 # documentation will contain sections that can be hidden and shown after the
 # page has loaded.
@@ -1139,13 +1370,14 @@ HTML_INDEX_NUM_ENTRIES = 100
 
 # If the GENERATE_DOCSET tag is set to YES, additional index files will be
 # generated that can be used as input for Apple's Xcode 3 integrated development
-# environment (see: http://developer.apple.com/tools/xcode/), introduced with
-# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
-# Makefile in the HTML output directory. Running make will produce the docset in
-# that directory and running make install will install the docset in
+# environment (see:
+# https://developer.apple.com/xcode/), introduced with OSX 10.5 (Leopard). To
+# create a documentation set, doxygen will generate a Makefile in the HTML
+# output directory. Running make will produce the docset in that directory and
+# running make install will install the docset in
 # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
-# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
-# for more information.
+# startup. See https://developer.apple.com/library/archive/featuredarticles/Doxy
+# genXcode/_index.html for more information.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
@@ -1159,6 +1391,13 @@ GENERATE_DOCSET        = NO
 
 DOCSET_FEEDNAME        = "Doxygen generated docs"
 
+# This tag determines the URL of the docset feed. A documentation feed provides
+# an umbrella under which multiple documentation sets from a single provider
+# (such as a company or product suite) can be grouped.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_FEEDURL         =
+
 # This tag specifies a string that should uniquely identify the documentation
 # set bundle. This should be a reverse domain-name style string, e.g.
 # com.mycompany.MyDocSet. Doxygen will append .docset to the name.
@@ -1184,8 +1423,12 @@ DOCSET_PUBLISHER_NAME  = Publisher
 # If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
 # additional HTML index files: index.hhp, index.hhc, and index.hhk. The
 # index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
-# Windows.
+# on Windows. In the beginning of 2021 Microsoft took the original page, with
+# a.o. the download links, offline the HTML help workshop was already many years
+# in maintenance mode). You can download the HTML help workshop from the web
+# archives at Installation executable (see:
+# http://web.archive.org/web/20160201063255/http://download.microsoft.com/downlo
+# ad/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe).
 #
 # The HTML Help Workshop contains a compiler that can convert all HTML output
 # generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
@@ -1207,28 +1450,29 @@ GENERATE_HTMLHELP      = NO
 CHM_FILE               =
 
 # The HHC_LOCATION tag can be used to specify the location (absolute path
-# including file name) of the HTML help compiler ( hhc.exe). If non-empty
+# including file name) of the HTML help compiler (hhc.exe). If non-empty,
 # doxygen will try to run the HTML help compiler on the generated index.hhp.
 # The file has to be specified with full path.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 HHC_LOCATION           =
 
-# The GENERATE_CHI flag controls if a separate .chi index file is generated (
-# YES) or that it should be included in the master .chm file ( NO).
+# The GENERATE_CHI flag controls if a separate .chi index file is generated
+# (YES) or that it should be included in the main .chm file (NO).
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 GENERATE_CHI           = NO
 
-# The CHM_INDEX_ENCODING is used to encode HtmlHelp index ( hhk), content ( hhc)
+# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc)
 # and project file content.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 CHM_INDEX_ENCODING     =
 
-# The BINARY_TOC flag controls whether a binary table of contents is generated (
-# YES) or a normal table of contents ( NO) in the .chm file.
+# The BINARY_TOC flag controls whether a binary table of contents is generated
+# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it
+# enables the Previous and Next buttons.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
@@ -1259,7 +1503,8 @@ QCH_FILE               =
 
 # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
 # Project output. For more information please see Qt Help Project / Namespace
-# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
+# (see:
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#namespace).
 # The default value is: org.doxygen.Project.
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
@@ -1267,8 +1512,8 @@ QHP_NAMESPACE          = org.doxygen.Project
 
 # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
 # Help Project output. For more information please see Qt Help Project / Virtual
-# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
-# folders).
+# Folders (see:
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#virtual-folders).
 # The default value is: doc.
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
@@ -1276,30 +1521,30 @@ QHP_VIRTUAL_FOLDER     = doc
 
 # If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
 # filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
-# filters).
+# Filters (see:
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-filters).
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_CUST_FILTER_NAME   =
 
 # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
 # custom filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
-# filters).
+# Filters (see:
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-filters).
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_CUST_FILTER_ATTRS  =
 
 # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
 # project's filter section matches. Qt Help Project / Filter Attributes (see:
-# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#filter-attributes).
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_SECT_FILTER_ATTRS  =
 
-# The QHG_LOCATION tag can be used to specify the location of Qt's
-# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
-# generated .qhp file.
+# The QHG_LOCATION tag can be used to specify the location (absolute path
+# including file name) of Qt's qhelpgenerator. If non-empty doxygen will try to
+# run qhelpgenerator on the generated .qhp file.
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHG_LOCATION           =
@@ -1341,17 +1586,29 @@ DISABLE_INDEX          = NO
 # index structure (just like the one that is generated for HTML Help). For this
 # to work a browser that supports JavaScript, DHTML, CSS and frames is required
 # (i.e. any modern browser). Windows users are probably better off using the
-# HTML help feature. Via custom stylesheets (see HTML_EXTRA_STYLESHEET) one can
-# further fine-tune the look of the index. As an example, the default style
-# sheet generated by doxygen has an example that shows how to put an image at
-# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
-# the same information as the tab index, you could consider setting
-# DISABLE_INDEX to YES when enabling this option.
+# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
+# further fine tune the look of the index (see "Fine-tuning the output"). As an
+# example, the default style sheet generated by doxygen has an example that
+# shows how to put an image at the root of the tree instead of the PROJECT_NAME.
+# Since the tree basically has the same information as the tab index, you could
+# consider setting DISABLE_INDEX to YES when enabling this option.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_TREEVIEW      = NO
 
+# When both GENERATE_TREEVIEW and DISABLE_INDEX are set to YES, then the
+# FULL_SIDEBAR option determines if the side bar is limited to only the treeview
+# area (value NO) or if it should extend to the full height of the window (value
+# YES). Setting this to YES gives a layout similar to
+# https://docs.readthedocs.io with more room for contents, but less room for the
+# project logo, title, and description. If either GENERATE_TREEVIEW or
+# DISABLE_INDEX is set to NO, this option has no effect.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FULL_SIDEBAR           = NO
+
 # The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
 # doxygen will group on one line in the generated HTML documentation.
 #
@@ -1369,13 +1626,31 @@ ENUM_VALUES_PER_LINE   = 4
 
 TREEVIEW_WIDTH         = 250
 
-# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open links to
+# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to
 # external symbols imported via tag files in a separate window.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
 EXT_LINKS_IN_WINDOW    = NO
 
+# If the OBFUSCATE_EMAILS tag is set to YES, doxygen will obfuscate email
+# addresses.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+OBFUSCATE_EMAILS       = YES
+
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png (the default) and svg (looks nicer but requires the
+# pdf2svg or inkscape tool).
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT    = png
+
 # Use this tag to change the font size of LaTeX formulas included as images in
 # the HTML documentation. When you change the font size after a successful
 # doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1385,20 +1660,15 @@ EXT_LINKS_IN_WINDOW    = NO
 
 FORMULA_FONTSIZE       = 10
 
-# Use the FORMULA_TRANPARENT tag to determine whether or not the images
-# generated for formulas are transparent PNGs. Transparent PNGs are not
-# supported properly for IE 6.0, but are supported on all modern browsers.
-#
-# Note that when changing this option you need to delete any form_*.png files in
-# the HTML output directory before the changes have effect.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
 
-FORMULA_TRANSPARENT    = YES
+FORMULA_MACROFILE      =
 
 # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# http://www.mathjax.org) which uses client side Javascript for the rendering
-# instead of using prerendered bitmaps. Use this if you do not have LaTeX
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
+# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
 # installed or if you want to formulas look prettier in the HTML output. When
 # enabled you may also need to install MathJax separately and configure the path
 # to it using the MATHJAX_RELPATH option.
@@ -1407,11 +1677,29 @@ FORMULA_TRANSPARENT    = YES
 
 USE_MATHJAX            = NO
 
+# With MATHJAX_VERSION it is possible to specify the MathJax version to be used.
+# Note that the different versions of MathJax have different requirements with
+# regards to the different settings, so it is possible that also other MathJax
+# settings have to be changed when switching between the different MathJax
+# versions.
+# Possible values are: MathJax_2 and MathJax_3.
+# The default value is: MathJax_2.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_VERSION        = MathJax_2
+
 # When MathJax is enabled you can set the default output format to be used for
-# the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/latest/output.html) for more details.
+# the MathJax output. For more details about the output format see MathJax
+# version 2 (see:
+# http://docs.mathjax.org/en/v2.7-latest/output.html) and MathJax version 3
+# (see:
+# http://docs.mathjax.org/en/latest/web/components/output.html).
 # Possible values are: HTML-CSS (which is slower, but has the best
-# compatibility), NativeMML (i.e. MathML) and SVG.
+# compatibility. This is the name for Mathjax version 2, for MathJax version 3
+# this will be translated into chtml), NativeMML (i.e. MathML. Only supported
+# for NathJax 2. For MathJax version 3 chtml will be used instead.), chtml (This
+# is the name for Mathjax version 3, for MathJax version 2 this will be
+# translated into HTML-CSS) and SVG.
 # The default value is: HTML-CSS.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
@@ -1424,22 +1712,29 @@ MATHJAX_FORMAT         = HTML-CSS
 # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
 # Content Delivery Network so you can quickly see the result without installing
 # MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from http://www.mathjax.org before deployment.
-# The default value is: http://cdn.mathjax.org/mathjax/latest.
+# MathJax from https://www.mathjax.org before deployment. The default value is:
+# - in case of MathJax version 2: https://cdn.jsdelivr.net/npm/mathjax@2
+# - in case of MathJax version 3: https://cdn.jsdelivr.net/npm/mathjax@3
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
 
 # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
 # extension names that should be enabled during MathJax rendering. For example
+# for MathJax version 2 (see
+# https://docs.mathjax.org/en/v2.7-latest/tex.html#tex-and-latex-extensions):
 # MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# For example for MathJax version 3 (see
+# http://docs.mathjax.org/en/latest/input/tex/extensions/index.html):
+# MATHJAX_EXTENSIONS = ams
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_EXTENSIONS     =
 
 # The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
 # of code that will be used on startup of the MathJax code. See the MathJax site
-# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
+# (see:
+# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details. For an
 # example see the documentation.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
@@ -1467,12 +1762,12 @@ MATHJAX_CODEFILE       =
 SEARCHENGINE           = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
-# are two flavours of web server based searching depending on the
-# EXTERNAL_SEARCH setting. When disabled, doxygen will generate a PHP script for
-# searching and an index file used by the script. When EXTERNAL_SEARCH is
-# enabled the indexing and searching needs to be provided by external tools. See
-# the section "External Indexing and Searching" for details.
+# implemented using a web server instead of a web client using JavaScript. There
+# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
+# setting. When disabled, doxygen will generate a PHP script for searching and
+# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
+# and searching needs to be provided by external tools. See the section
+# "External Indexing and Searching" for details.
 # The default value is: NO.
 # This tag requires that the tag SEARCHENGINE is set to YES.
 
@@ -1484,9 +1779,10 @@ SERVER_BASED_SEARCH    = NO
 # external search engine pointed to by the SEARCHENGINE_URL option to obtain the
 # search results.
 #
-# Doxygen ships with an example indexer ( doxyindexer) and search engine
+# Doxygen ships with an example indexer (doxyindexer) and search engine
 # (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: http://xapian.org/).
+# Xapian (see:
+# https://xapian.org/).
 #
 # See the section "External Indexing and Searching" for details.
 # The default value is: NO.
@@ -1497,10 +1793,11 @@ EXTERNAL_SEARCH        = NO
 # The SEARCHENGINE_URL should point to a search engine hosted by a web server
 # which will return the search results when EXTERNAL_SEARCH is enabled.
 #
-# Doxygen ships with an example indexer ( doxyindexer) and search engine
+# Doxygen ships with an example indexer (doxyindexer) and search engine
 # (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: http://xapian.org/). See the section "External Indexing and
-# Searching" for details.
+# Xapian (see:
+# https://xapian.org/). See the section "External Indexing and Searching" for
+# details.
 # This tag requires that the tag SEARCHENGINE is set to YES.
 
 SEARCHENGINE_URL       =
@@ -1535,7 +1832,7 @@ EXTRA_SEARCH_MAPPINGS  =
 # Configuration options related to the LaTeX output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_LATEX tag is set to YES doxygen will generate LaTeX output.
+# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
 # The default value is: YES.
 
 GENERATE_LATEX         = YES
@@ -1551,22 +1848,36 @@ LATEX_OUTPUT           = latex
 # The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
 # invoked.
 #
-# Note that when enabling USE_PDFLATEX this option is only used for generating
-# bitmaps for formulas in the HTML output, but not in the Makefile that is
-# written to the output directory.
-# The default file is: latex.
+# Note that when not enabling USE_PDFLATEX the default is latex when enabling
+# USE_PDFLATEX the default is pdflatex and when in the later case latex is
+# chosen this is overwritten by pdflatex. For specific output languages the
+# default can have been set differently, this depends on the implementation of
+# the output language.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_CMD_NAME         = latex
 
 # The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
 # index for LaTeX.
+# Note: This tag is used in the Makefile / make.bat.
+# See also: LATEX_MAKEINDEX_CMD for the part in the generated output file
+# (.tex).
 # The default file is: makeindex.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 MAKEINDEX_CMD_NAME     = makeindex
 
-# If the COMPACT_LATEX tag is set to YES doxygen generates more compact LaTeX
+# The LATEX_MAKEINDEX_CMD tag can be used to specify the command name to
+# generate index for LaTeX. In case there is no backslash (\) as first character
+# it will be automatically added in the LaTeX code.
+# Note: This tag is used in the generated output file (.tex).
+# See also: MAKEINDEX_CMD_NAME for the part in the Makefile / make.bat.
+# The default value is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_MAKEINDEX_CMD    = makeindex
+
+# If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
 # documents. This may be useful for small projects and may help to save some
 # trees in general.
 # The default value is: NO.
@@ -1584,39 +1895,57 @@ COMPACT_LATEX          = NO
 PAPER_TYPE             = a4
 
 # The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
-# that should be included in the LaTeX output. To get the times font for
-# instance you can specify
-# EXTRA_PACKAGES=times
+# that should be included in the LaTeX output. The package can be specified just
+# by its name or with the correct syntax as to be used with the LaTeX
+# \usepackage command. To get the times font for instance you can specify :
+# EXTRA_PACKAGES=times or EXTRA_PACKAGES={times}
+# To use the option intlimits with the amsmath package you can specify:
+# EXTRA_PACKAGES=[intlimits]{amsmath}
 # If left blank no extra packages will be included.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 EXTRA_PACKAGES         =
 
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
-# generated LaTeX document. The header should contain everything until the first
-# chapter. If it is left blank doxygen will generate a standard header. See
-# section "Doxygen usage" for information on how to let doxygen write the
-# default header to a separate file.
+# The LATEX_HEADER tag can be used to specify a user-defined LaTeX header for
+# the generated LaTeX document. The header should contain everything until the
+# first chapter. If it is left blank doxygen will generate a standard header. It
+# is highly recommended to start with a default header using
+# doxygen -w latex new_header.tex new_footer.tex new_stylesheet.sty
+# and then modify the file new_header.tex. See also section "Doxygen usage" for
+# information on how to generate the default header that doxygen normally uses.
 #
-# Note: Only use a user-defined header if you know what you are doing! The
-# following commands have a special meaning inside the header: $title,
-# $datetime, $date, $doxygenversion, $projectname, $projectnumber. Doxygen will
-# replace them by respectively the title of the page, the current date and time,
-# only the current date, the version number of doxygen, the project name (see
-# PROJECT_NAME), or the project number (see PROJECT_NUMBER).
+# Note: Only use a user-defined header if you know what you are doing!
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. The following
+# commands have a special meaning inside the header (and footer): For a
+# description of the possible markers and block names see the documentation.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_HEADER           =
 
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
-# generated LaTeX document. The footer should contain everything after the last
-# chapter. If it is left blank doxygen will generate a standard footer.
-#
-# Note: Only use a user-defined footer if you know what you are doing!
+# The LATEX_FOOTER tag can be used to specify a user-defined LaTeX footer for
+# the generated LaTeX document. The footer should contain everything after the
+# last chapter. If it is left blank doxygen will generate a standard footer. See
+# LATEX_HEADER for more information on how to generate a default footer and what
+# special commands can be used inside the footer. See also section "Doxygen
+# usage" for information on how to generate the default footer that doxygen
+# normally uses. Note: Only use a user-defined footer if you know what you are
+# doing!
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_FOOTER           =
 
+# The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# LaTeX style sheets that are included after the standard style sheets created
+# by doxygen. Using this option one can overrule certain style aspects. Doxygen
+# will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list).
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_STYLESHEET =
+
 # The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
 # other source files which should be copied to the LATEX_OUTPUT output
 # directory. Note that the files will be copied as-is; there are no commands or
@@ -1634,9 +1963,11 @@ LATEX_EXTRA_FILES      =
 
 PDF_HYPERLINKS         = YES
 
-# If the LATEX_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES to get a
-# higher quality PDF documentation.
+# If the USE_PDFLATEX tag is set to YES, doxygen will use the engine as
+# specified with LATEX_CMD_NAME to generate the PDF file directly from the LaTeX
+# files. Set this option to YES, to get a higher quality PDF documentation.
+#
+# See also section LATEX_CMD_NAME for selecting the engine.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
@@ -1644,8 +1975,7 @@ USE_PDFLATEX           = YES
 
 # If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
 # command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help. This option is also used
-# when generating formulas in HTML.
+# if errors occur, instead of asking the user for help.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
@@ -1658,29 +1988,35 @@ LATEX_BATCHMODE        = NO
 
 LATEX_HIDE_INDICES     = NO
 
-# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
-# code with syntax highlighting in the LaTeX output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_SOURCE_CODE      = NO
-
 # The LATEX_BIB_STYLE tag can be used to specify the style to use for the
 # bibliography, e.g. plainnat, or ieeetr. See
-# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
+# https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
 # The default value is: plain.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_BIB_STYLE        = plain
 
+# If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated
+# page will contain the date and time when the page was generated. Setting this
+# to NO can help when comparing the output of multiple runs.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_TIMESTAMP        = NO
+
+# The LATEX_EMOJI_DIRECTORY tag is used to specify the (relative or absolute)
+# path from which the emoji images will be read. If a relative path is entered,
+# it will be relative to the LATEX_OUTPUT directory. If left blank the
+# LATEX_OUTPUT directory will be used.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EMOJI_DIRECTORY  =
+
 #---------------------------------------------------------------------------
 # Configuration options related to the RTF output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_RTF tag is set to YES doxygen will generate RTF output. The
+# If the GENERATE_RTF tag is set to YES, doxygen will generate RTF output. The
 # RTF output is optimized for Word 97 and may not look too pretty with other RTF
 # readers/editors.
 # The default value is: NO.
@@ -1695,7 +2031,7 @@ GENERATE_RTF           = NO
 
 RTF_OUTPUT             = rtf
 
-# If the COMPACT_RTF tag is set to YES doxygen generates more compact RTF
+# If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF
 # documents. This may be useful for small projects and may help to save some
 # trees in general.
 # The default value is: NO.
@@ -1715,9 +2051,9 @@ COMPACT_RTF            = NO
 
 RTF_HYPERLINKS         = NO
 
-# Load stylesheet definitions from file. Syntax is similar to doxygen's config
-# file, i.e. a series of assignments. You only have to provide replacements,
-# missing definitions are set to their default value.
+# Load stylesheet definitions from file. Syntax is similar to doxygen's
+# configuration file, i.e. a series of assignments. You only have to provide
+# replacements, missing definitions are set to their default value.
 #
 # See also section "Doxygen usage" for information on how to generate the
 # default style sheet that doxygen normally uses.
@@ -1726,8 +2062,8 @@ RTF_HYPERLINKS         = NO
 RTF_STYLESHEET_FILE    =
 
 # Set optional variables used in the generation of an RTF document. Syntax is
-# similar to doxygen's config file. A template extensions file can be generated
-# using doxygen -e rtf extensionFile.
+# similar to doxygen's configuration file. A template extensions file can be
+# generated using doxygen -e rtf extensionFile.
 # This tag requires that the tag GENERATE_RTF is set to YES.
 
 RTF_EXTENSIONS_FILE    =
@@ -1736,7 +2072,7 @@ RTF_EXTENSIONS_FILE    =
 # Configuration options related to the man page output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_MAN tag is set to YES doxygen will generate man pages for
+# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for
 # classes and files.
 # The default value is: NO.
 
@@ -1760,6 +2096,13 @@ MAN_OUTPUT             = man
 
 MAN_EXTENSION          = .3
 
+# The MAN_SUBDIR tag determines the name of the directory created within
+# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
+# MAN_EXTENSION with the initial . removed.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_SUBDIR             =
+
 # If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
 # will generate one additional man file for each entity documented in the real
 # man page(s). These additional files only source the real man page, but without
@@ -1773,7 +2116,7 @@ MAN_LINKS              = NO
 # Configuration options related to the XML output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_XML tag is set to YES doxygen will generate an XML file that
+# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that
 # captures the structure of the code including all documentation.
 # The default value is: NO.
 
@@ -1787,19 +2130,7 @@ GENERATE_XML           = YES
 
 XML_OUTPUT             = xml
 
-# The XML_SCHEMA tag can be used to specify a XML schema, which can be used by a
-# validating XML parser to check the syntax of the XML files.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_SCHEMA             =
-
-# The XML_DTD tag can be used to specify a XML DTD, which can be used by a
-# validating XML parser to check the syntax of the XML files.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_DTD                =
-
-# If the XML_PROGRAMLISTING tag is set to YES doxygen will dump the program
+# If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program
 # listings (including syntax highlighting and cross-referencing information) to
 # the XML output. Note that enabling this will significantly increase the size
 # of the XML output.
@@ -1808,11 +2139,18 @@ XML_DTD                =
 
 XML_PROGRAMLISTING     = YES
 
+# If the XML_NS_MEMB_FILE_SCOPE tag is set to YES, doxygen will include
+# namespace members in file scope as well, matching the HTML output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_NS_MEMB_FILE_SCOPE = NO
+
 #---------------------------------------------------------------------------
 # Configuration options related to the DOCBOOK output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_DOCBOOK tag is set to YES doxygen will generate Docbook files
+# If the GENERATE_DOCBOOK tag is set to YES, doxygen will generate Docbook files
 # that can be used to generate PDF.
 # The default value is: NO.
 
@@ -1830,10 +2168,10 @@ DOCBOOK_OUTPUT         = docbook
 # Configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_AUTOGEN_DEF tag is set to YES doxygen will generate an AutoGen
-# Definitions (see http://autogen.sf.net) file that captures the structure of
-# the code including all documentation. Note that this feature is still
-# experimental and incomplete at the moment.
+# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
+# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures
+# the structure of the code including all documentation. Note that this feature
+# is still experimental and incomplete at the moment.
 # The default value is: NO.
 
 GENERATE_AUTOGEN_DEF   = NO
@@ -1842,7 +2180,7 @@ GENERATE_AUTOGEN_DEF   = NO
 # Configuration options related to the Perl module output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_PERLMOD tag is set to YES doxygen will generate a Perl module
+# If the GENERATE_PERLMOD tag is set to YES, doxygen will generate a Perl module
 # file that captures the structure of the code including all documentation.
 #
 # Note that this feature is still experimental and incomplete at the moment.
@@ -1850,7 +2188,7 @@ GENERATE_AUTOGEN_DEF   = NO
 
 GENERATE_PERLMOD       = NO
 
-# If the PERLMOD_LATEX tag is set to YES doxygen will generate the necessary
+# If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary
 # Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
 # output from the Perl module output.
 # The default value is: NO.
@@ -1858,9 +2196,9 @@ GENERATE_PERLMOD       = NO
 
 PERLMOD_LATEX          = NO
 
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be nicely
+# If the PERLMOD_PRETTY tag is set to YES, the Perl module output will be nicely
 # formatted so it can be parsed by a human reader. This is useful if you want to
-# understand what is going on. On the other hand, if this tag is set to NO the
+# understand what is going on. On the other hand, if this tag is set to NO, the
 # size of the Perl module output will be much smaller and Perl will parse it
 # just the same.
 # The default value is: YES.
@@ -1880,14 +2218,14 @@ PERLMOD_MAKEVAR_PREFIX =
 # Configuration options related to the preprocessor
 #---------------------------------------------------------------------------
 
-# If the ENABLE_PREPROCESSING tag is set to YES doxygen will evaluate all
+# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all
 # C-preprocessor directives found in the sources and include files.
 # The default value is: YES.
 
 ENABLE_PREPROCESSING   = YES
 
-# If the MACRO_EXPANSION tag is set to YES doxygen will expand all macro names
-# in the source code. If set to NO only conditional compilation will be
+# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
+# in the source code. If set to NO, only conditional compilation will be
 # performed. Macro expansion can be done in a controlled way by setting
 # EXPAND_ONLY_PREDEF to YES.
 # The default value is: NO.
@@ -1903,7 +2241,7 @@ MACRO_EXPANSION        = NO
 
 EXPAND_ONLY_PREDEF     = NO
 
-# If the SEARCH_INCLUDES tag is set to YES the includes files in the
+# If the SEARCH_INCLUDES tag is set to YES, the include files in the
 # INCLUDE_PATH will be searched if a #include is found.
 # The default value is: YES.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
@@ -1912,7 +2250,8 @@ SEARCH_INCLUDES        = YES
 
 # The INCLUDE_PATH tag can be used to specify one or more directories that
 # contain include files that are not input files but should be processed by the
-# preprocessor.
+# preprocessor. Note that the INCLUDE_PATH is not recursive, so the setting of
+# RECURSIVE has no effect here.
 # This tag requires that the tag SEARCH_INCLUDES is set to YES.
 
 INCLUDE_PATH           =
@@ -1945,9 +2284,9 @@ PREDEFINED             =
 EXPAND_AS_DEFINED      =
 
 # If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
-# remove all refrences to function-like macros that are alone on a line, have an
-# all uppercase name, and do not end with a semicolon. Such function macros are
-# typically used for boiler-plate code, and will confuse the parser if not
+# remove all references to function-like macros that are alone on a line, have
+# an all uppercase name, and do not end with a semicolon. Such function macros
+# are typically used for boiler-plate code, and will confuse the parser if not
 # removed.
 # The default value is: YES.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
@@ -1967,7 +2306,7 @@ SKIP_FUNCTION_MACROS   = YES
 # where loc1 and loc2 can be relative or absolute paths or URLs. See the
 # section "Linking to external documentation" for more information about the use
 # of tag files.
-# Note: Each tag file must have an unique name (where the name does NOT include
+# Note: Each tag file must have a unique name (where the name does NOT include
 # the path). If a tag file is not located in the directory in which doxygen is
 # run, you must also specify the path to the tagfile here.
 
@@ -1979,55 +2318,39 @@ TAGFILES               =
 
 GENERATE_TAGFILE       =
 
-# If the ALLEXTERNALS tag is set to YES all external class will be listed in the
-# class index. If set to NO only the inherited external classes will be listed.
+# If the ALLEXTERNALS tag is set to YES, all external class will be listed in
+# the class index. If set to NO, only the inherited external classes will be
+# listed.
 # The default value is: NO.
 
 ALLEXTERNALS           = NO
 
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed in
-# the modules index. If set to NO, only the current project's groups will be
+# If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will be
 # listed.
 # The default value is: YES.
 
 EXTERNAL_GROUPS        = YES
 
-# If the EXTERNAL_PAGES tag is set to YES all external pages will be listed in
+# If the EXTERNAL_PAGES tag is set to YES, all external pages will be listed in
 # the related pages index. If set to NO, only the current project's pages will
 # be listed.
 # The default value is: YES.
 
 EXTERNAL_PAGES         = YES
 
-# The PERL_PATH should be the absolute path and name of the perl script
-# interpreter (i.e. the result of 'which perl').
-# The default file (with absolute path) is: /usr/bin/perl.
-
-PERL_PATH              = /usr/bin/perl
-
 #---------------------------------------------------------------------------
 # Configuration options related to the dot tool
 #---------------------------------------------------------------------------
 
-# If the CLASS_DIAGRAMS tag is set to YES doxygen will generate a class diagram
-# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
-# NO turns the diagrams off. Note that this option also works with HAVE_DOT
-# disabled, but it is recommended to install and use dot, since it yields more
-# powerful graphs.
-# The default value is: YES.
-
-CLASS_DIAGRAMS         = NO
-
-# You can define message sequence charts within doxygen comments using the \msc
-# command. Doxygen will then run the mscgen tool (see:
-# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
-# documentation. The MSCGEN_PATH tag allows you to specify the directory where
-# the mscgen tool resides. If left empty the tool is assumed to be found in the
-# default search path.
+# You can include diagrams made with dia in doxygen documentation. Doxygen will
+# then run dia to produce the diagram and insert it in the documentation. The
+# DIA_PATH tag allows you to specify the directory where the dia binary resides.
+# If left empty dia is assumed to be found in the default search path.
 
-MSCGEN_PATH            =
+DIA_PATH               =
 
-# If set to YES, the inheritance and collaboration graphs will hide inheritance
+# If set to YES the inheritance and collaboration graphs will hide inheritance
 # and usage relations if the target is undocumented or is not a class.
 # The default value is: YES.
 
@@ -2052,37 +2375,52 @@ HAVE_DOT               = NO
 
 DOT_NUM_THREADS        = 0
 
-# When you want a differently looking font n the dot files that doxygen
-# generates you can specify the font name using DOT_FONTNAME. You need to make
-# sure dot is able to find the font, which can be done by putting it in a
-# standard location or by setting the DOTFONTPATH environment variable or by
-# setting DOT_FONTPATH to the directory containing the font.
-# The default value is: Helvetica.
+# DOT_COMMON_ATTR is common attributes for nodes, edges and labels of
+# subgraphs. When you want a differently looking font in the dot files that
+# doxygen generates you can specify fontname, fontcolor and fontsize attributes.
+# For details please see <a href=https://graphviz.org/doc/info/attrs.html>Node,
+# Edge and Graph Attributes specification</a> You need to make sure dot is able
+# to find the font, which can be done by putting it in a standard location or by
+# setting the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the
+# directory containing the font. Default graphviz fontsize is 14.
+# The default value is: fontname=Helvetica,fontsize=10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_COMMON_ATTR        = "fontname=Helvetica,fontsize=10"
+
+# DOT_EDGE_ATTR is concatenated with DOT_COMMON_ATTR. For elegant style you can
+# add 'arrowhead=open, arrowtail=open, arrowsize=0.5'. <a
+# href=https://graphviz.org/doc/info/arrows.html>Complete documentation about
+# arrows shapes.</a>
+# The default value is: labelfontname=Helvetica,labelfontsize=10.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_FONTNAME           = Helvetica
+DOT_EDGE_ATTR          = "labelfontname=Helvetica,labelfontsize=10"
 
-# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
-# dot graphs.
-# Minimum value: 4, maximum value: 24, default value: 10.
+# DOT_NODE_ATTR is concatenated with DOT_COMMON_ATTR. For view without boxes
+# around nodes set 'shape=plain' or 'shape=plaintext' <a
+# href=https://www.graphviz.org/doc/info/shapes.html>Shapes specification</a>
+# The default value is: shape=box,height=0.2,width=0.4.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_FONTSIZE           = 10
+DOT_NODE_ATTR          = "shape=box,height=0.2,width=0.4"
 
-# By default doxygen will tell dot to use the default font as specified with
-# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
-# the path where dot can find it using this tag.
+# You can set the path where dot can find font specified with fontname in
+# DOT_COMMON_ATTR and others dot attributes.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_FONTPATH           =
 
-# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
-# each documented class showing the direct and indirect inheritance relations.
-# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
+# If the CLASS_GRAPH tag is set to YES (or GRAPH) then doxygen will generate a
+# graph for each documented class showing the direct and indirect inheritance
+# relations. In case HAVE_DOT is set as well dot will be used to draw the graph,
+# otherwise the built-in generator will be used. If the CLASS_GRAPH tag is set
+# to TEXT the direct and indirect inheritance relations will be shown as texts /
+# links.
+# Possible values are: NO, YES, TEXT and GRAPH.
 # The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
 
-CLASS_GRAPH            = YES
+CLASS_GRAPH            = TEXT
 
 # If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
 # graph for each documented class showing the direct and indirect implementation
@@ -2094,13 +2432,14 @@ CLASS_GRAPH            = YES
 COLLABORATION_GRAPH    = YES
 
 # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
-# groups, showing the direct groups dependencies.
+# groups, showing the direct groups dependencies. See also the chapter Grouping
+# in the manual.
 # The default value is: YES.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
 GROUP_GRAPHS           = YES
 
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
+# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and
 # collaboration diagrams in a style similar to the OMG's Unified Modeling
 # Language.
 # The default value is: NO.
@@ -2117,10 +2456,32 @@ UML_LOOK               = NO
 # but if the number exceeds 15, the total amount of fields shown is limited to
 # 10.
 # Minimum value: 0, maximum value: 100, default value: 10.
-# This tag requires that the tag HAVE_DOT is set to YES.
+# This tag requires that the tag UML_LOOK is set to YES.
 
 UML_LIMIT_NUM_FIELDS   = 10
 
+# If the DOT_UML_DETAILS tag is set to NO, doxygen will show attributes and
+# methods without types and arguments in the UML graphs. If the DOT_UML_DETAILS
+# tag is set to YES, doxygen will add type and arguments for attributes and
+# methods in the UML graphs. If the DOT_UML_DETAILS tag is set to NONE, doxygen
+# will not generate fields with class member information in the UML graphs. The
+# class diagrams will look similar to the default class diagrams but using UML
+# notation for the relationships.
+# Possible values are: NO, YES and NONE.
+# The default value is: NO.
+# This tag requires that the tag UML_LOOK is set to YES.
+
+DOT_UML_DETAILS        = NO
+
+# The DOT_WRAP_THRESHOLD tag can be used to set the maximum number of characters
+# to display on a single line. If the actual line length exceeds this threshold
+# significantly it will wrapped across multiple lines. Some heuristics are apply
+# to avoid ugly line breaks.
+# Minimum value: 0, maximum value: 1000, default value: 17.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_WRAP_THRESHOLD     = 17
+
 # If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
 # collaboration graphs will show the relations between templates and their
 # instances.
@@ -2152,7 +2513,8 @@ INCLUDED_BY_GRAPH      = YES
 #
 # Note that enabling this option will significantly increase the time of a run.
 # So in most cases it will be better to enable call graphs for selected
-# functions only using the \callgraph command.
+# functions only using the \callgraph command. Disabling a call graph can be
+# accomplished by means of the command \hidecallgraph.
 # The default value is: NO.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
@@ -2163,7 +2525,8 @@ CALL_GRAPH             = NO
 #
 # Note that enabling this option will significantly increase the time of a run.
 # So in most cases it will be better to enable caller graphs for selected
-# functions only using the \callergraph command.
+# functions only using the \callergraph command. Disabling a caller graph can be
+# accomplished by means of the command \hidecallergraph.
 # The default value is: NO.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
@@ -2185,12 +2548,23 @@ GRAPHICAL_HIERARCHY    = YES
 
 DIRECTORY_GRAPH        = YES
 
+# The DIR_GRAPH_MAX_DEPTH tag can be used to limit the maximum number of levels
+# of child directories generated in directory dependency graphs by dot.
+# Minimum value: 1, maximum value: 25, default value: 1.
+# This tag requires that the tag DIRECTORY_GRAPH is set to YES.
+
+DIR_GRAPH_MAX_DEPTH    = 1
+
 # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot.
+# generated by dot. For an explanation of the image formats see the section
+# output formats in the documentation of the dot tool (Graphviz (see:
+# http://www.graphviz.org/)).
 # Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
 # to make the SVG files visible in IE 9+ (other browsers do not have this
 # requirement).
-# Possible values are: png, jpg, gif and svg.
+# Possible values are: png, jpg, gif, svg, png:gd, png:gd:gd, png:cairo,
+# png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and
+# png:gdiplus:gdiplus.
 # The default value is: png.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
@@ -2227,6 +2601,30 @@ DOTFILE_DIRS           =
 
 MSCFILE_DIRS           =
 
+# The DIAFILE_DIRS tag can be used to specify one or more directories that
+# contain dia files that are included in the documentation (see the \diafile
+# command).
+
+DIAFILE_DIRS           =
+
+# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
+# path where java can find the plantuml.jar file or to the filename of jar file
+# to be used. If left blank, it is assumed PlantUML is not used or called during
+# a preprocessing step. Doxygen will generate a warning when it encounters a
+# \startuml command in this case and will not generate output for the diagram.
+
+PLANTUML_JAR_PATH      =
+
+# When using plantuml, the PLANTUML_CFG_FILE tag can be used to specify a
+# configuration file for plantuml.
+
+PLANTUML_CFG_FILE      =
+
+# When using plantuml, the specified paths are searched for files specified by
+# the !include statement in a plantuml block.
+
+PLANTUML_INCLUDE_PATH  =
+
 # The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
 # that will be shown in the graph. If the number of nodes in a graph becomes
 # larger than this value, doxygen will truncate the graph, which is visualized
@@ -2251,19 +2649,7 @@ DOT_GRAPH_MAX_NODES    = 50
 
 MAX_DOT_GRAPH_DEPTH    = 0
 
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-# background. This is disabled by default, because dot on Windows does not seem
-# to support this out of the box.
-#
-# Warning: Depending on the platform used, enabling this option may lead to
-# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
-# read).
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_TRANSPARENT        = NO
-
-# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
+# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
 # files in one run (i.e. multiple -o and -T options on the command line). This
 # makes dot run faster, but since only newer versions of dot (>1.8.10) support
 # this, this feature is disabled by default.
@@ -2275,14 +2661,18 @@ DOT_MULTI_TARGETS      = NO
 # If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
 # explaining the meaning of the various boxes and arrows in the dot generated
 # graphs.
+# Note: This tag requires that UML_LOOK isn't set, i.e. the doxygen internal
+# graphical representation for inheritance and collaboration diagrams is used.
 # The default value is: YES.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
 GENERATE_LEGEND        = YES
 
-# If the DOT_CLEANUP tag is set to YES doxygen will remove the intermediate dot
+# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate
 # files that are used to generate the various graphs.
+#
+# Note: This setting is not only used for dot files but also for msc temporary
+# files.
 # The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_CLEANUP            = YES
diff --git a/external/hypre/src/docs/update-release.sh b/external/hypre/src/docs/update-release.sh
old mode 100644
new mode 100755
index 9e37b810..8d516c45
--- a/external/hypre/src/docs/update-release.sh
+++ b/external/hypre/src/docs/update-release.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -8,8 +8,8 @@
 usrconf="usr-manual/conf.py"
 refconf="ref-manual/conf.doxygen"
 
-version=`../utilities/version -version`
-reldate=`../utilities/version -date`
+version=`../utilities/version.sh -version`
+reldate=`../utilities/version.sh -date`
 if type -p gdate > /dev/null; then
     usrdate=`gdate --date=$reldate +'%B %d, %Y'`;
 else
diff --git a/external/hypre/src/docs/usr-manual/_static/custom.css b/external/hypre/src/docs/usr-manual/_static/custom.css
index 35d3f6a6..7c43697a 100644
--- a/external/hypre/src/docs/usr-manual/_static/custom.css
+++ b/external/hypre/src/docs/usr-manual/_static/custom.css
@@ -1,6 +1,14 @@
-/* This file intentionally left blank. */
 
-/* Move Georgia first to get better rendering on Windows platforms */
+/* Classic theme customizations: left justify text alignment */
+/*
+div.body p, div.body dd, div.body li, div.body blockquote {
+    text-align: left;
+}
+*/
+
+/* Alabaster theme customizations: move Georgia first to get better rendering on
+   Windows platforms */
+/*
 body {
     font-family: Georgia, 'goudy old style', 'minion pro', 'bell mt', 'Hiragino Mincho Pro', serif;
     font-size: 17px;
@@ -9,3 +17,4 @@ body {
     margin: 0;
     padding: 0;
 }
+*/
diff --git a/external/hypre/src/docs/usr-manual/api-int-ij.rst b/external/hypre/src/docs/usr-manual/api-int-ij.rst
index b1e08e64..b2e32730 100644
--- a/external/hypre/src/docs/usr-manual/api-int-ij.rst
+++ b/external/hypre/src/docs/usr-manual/api-int-ij.rst
@@ -1,4 +1,4 @@
-.. Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+.. Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
    HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 
    SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/docs/usr-manual/api-int-sstruct.rst b/external/hypre/src/docs/usr-manual/api-int-sstruct.rst
index cef079db..35d1bd4d 100644
--- a/external/hypre/src/docs/usr-manual/api-int-sstruct.rst
+++ b/external/hypre/src/docs/usr-manual/api-int-sstruct.rst
@@ -1,4 +1,4 @@
-.. Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+.. Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
    HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 
    SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/docs/usr-manual/api-int-struct.rst b/external/hypre/src/docs/usr-manual/api-int-struct.rst
index 14771b5d..a877ec5a 100644
--- a/external/hypre/src/docs/usr-manual/api-int-struct.rst
+++ b/external/hypre/src/docs/usr-manual/api-int-struct.rst
@@ -1,4 +1,4 @@
-.. Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+.. Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
    HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 
    SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/docs/usr-manual/api-sol-eigen.rst b/external/hypre/src/docs/usr-manual/api-sol-eigen.rst
index 6cc09ca8..ed29d65c 100644
--- a/external/hypre/src/docs/usr-manual/api-sol-eigen.rst
+++ b/external/hypre/src/docs/usr-manual/api-sol-eigen.rst
@@ -1,4 +1,4 @@
-.. Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+.. Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
    HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 
    SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/docs/usr-manual/api-sol-krylov.rst b/external/hypre/src/docs/usr-manual/api-sol-krylov.rst
index 3cb9d6ce..0f6a1b8a 100644
--- a/external/hypre/src/docs/usr-manual/api-sol-krylov.rst
+++ b/external/hypre/src/docs/usr-manual/api-sol-krylov.rst
@@ -1,4 +1,4 @@
-.. Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+.. Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
    HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 
    SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/docs/usr-manual/api-sol-parcsr.rst b/external/hypre/src/docs/usr-manual/api-sol-parcsr.rst
index e1fa69ca..663e1d78 100644
--- a/external/hypre/src/docs/usr-manual/api-sol-parcsr.rst
+++ b/external/hypre/src/docs/usr-manual/api-sol-parcsr.rst
@@ -1,4 +1,4 @@
-.. Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+.. Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
    HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 
    SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/docs/usr-manual/api-sol-sstruct.rst b/external/hypre/src/docs/usr-manual/api-sol-sstruct.rst
index 41e748fd..9229759d 100644
--- a/external/hypre/src/docs/usr-manual/api-sol-sstruct.rst
+++ b/external/hypre/src/docs/usr-manual/api-sol-sstruct.rst
@@ -1,4 +1,4 @@
-.. Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+.. Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
    HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 
    SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/docs/usr-manual/api-sol-struct.rst b/external/hypre/src/docs/usr-manual/api-sol-struct.rst
index 9970c985..ab7679e6 100644
--- a/external/hypre/src/docs/usr-manual/api-sol-struct.rst
+++ b/external/hypre/src/docs/usr-manual/api-sol-struct.rst
@@ -1,4 +1,4 @@
-.. Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+.. Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
    HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 
    SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/docs/usr-manual/bw-hypre-nwords.512.png b/external/hypre/src/docs/usr-manual/bw-hypre-nwords.512.png
new file mode 100644
index 0000000000000000000000000000000000000000..6be6745f6d025eca302778ed4d42def1b389e333
GIT binary patch
literal 20618
zcmXtA1z1#Fv>m!jkuIehLApgi8Y$@>QW|L(LP5H_6a=KZBn4?Cq#LBWJLVn!_uhQp
zh|HZkb7G$zYpqSFs<JE&CK)CK0>P1c`$i1{K?MJWq@kmNf0xLPF2E0Dm)CL{=-}al
zZvF-Qj^X%L#{~kxHGX^|Ec~Iv1uv4iN^85SJ6O27n>a%u?(Xg!*7mk8W+skM4hLt;
z^aBwx2!sYA_eN5~BV#Yq-GgvqwjGvE^_o*ss9_+dLh7BWq;w@D5U1n^jdqz~i`V}8
ztm@vgu0U;7@yZczw7ejHM4lHV!i17S$gdF#o0h0~$ocyign5M1kp<c|XBY*WToyg!
zKU_3#iaIzUBO)LNYSYSPQMHS<&q#RdXhprRl1B`XaFmZ%oxwy`Hl*u&iZ+iZf>kq`
zy~sfX3y`4s;qwWBrh-!LM8JR7pE#h7-teK}AMX=%WJF21$1Bg|PV_Obk%WRhJ*ki0
zb=lD2qaz18q9aKdW5um)V~L<;=nX*~daL3LBv~+!5d*$bJl+*?uycqfg5(<Jculn&
zpTbHH?n0D$yo*fk<Tn!kH}*UF;j4jvyaacQ;F2bq2?QM*44iJ6Z`ryXYPz%3{v(Cy
zzq=H`UHAlYCpAb1h^UC?Y+pPylM*SsYyTVKtH+B(awi&S_A+``16X_Ezj2pc^b#H~
z2H1g%s@QTTuF`sE4#-7wG$&9Ut&<Niw2y-!CqVUwK)~d1nh`xd5H{hE*yW0V^}wJ0
z#05cq8&~l3h&INwddsA$WNnU3od(>)hyNZdViEGC3H)C<;?ng0z4{#6U!9~}#cu7q
zPzA5?w5-^S#xI4973F0N>wjN_FAFK4G0gU2K7x!8zulU<l-DZL9-=1apLN4p)@%Co
zxN7ZwpU{>GJ9pKokv5Q~zLNXnh6LThPyI9NJ>`-TUkjsPKEBED6M`e=%6TDsz*J|;
z<d1h|%Hj*wJ$4U})_SQJFm!a&5H5%^dlAAhv?V1g%f3g{Fag@-5JK}fuiv;Pkc`(2
z21AhvPgALhjq>e`2~kMMOY#4^NChr>iTG<})f0x`QblN8sOo4Tj$#r#+QA+HYCCiA
z-1;DLE6a8B(xK(<B>U(WLo~$*8UM#`WqJJMv=XN4-$pPyMt**NvQ*PcPB3>y{0@i!
zFY`o(<$fCPXz#63QX=yx`s1QVcD(?r7Ow_{!E_tA$ULQTQ`x}lfnl;FkOGEGDYSHc
zJJZVp11;!1%RvA5mgaxEE&bn3W#59bi8#K<Opg3`_22mNXuxM-m#Zi-{D$=Q_nY>`
zb!l~#CPJZU>|y_z<ZCd2!X8bDKg-5Ldpc`tYubst<G7!}l1iu^qa!Vko2ee9H#dvq
zt5i1!7_krZyLxN<?-$a7PeuoO3pvA$B4$fbvDhFe{uey^E&jiG1FOx@okyh$)Vg-q
zN$AsBzk4yzuQ*rp-@Tt7??ncqLZ-rvN@h3cZ*B1|4I{S+Q3hX2^Fsve<qj9biikon
z?bWZM49%*N!76Fm$IZ|n1IvbTbfbZGWbSykTW&kkYL~9*BxR>6_h^QR5nz*X$`EH!
z(c&3&7w^jxpwK#Yvj1kP_Bd0?(F54&hSG<-d-r1J;MttW{{~A52D|3ryYpG1e%a&X
zcc_+hX$%w^#V-Hfjeo(7eJbF_&7sT^!~1YeLC)#isK*<N5HS)<{b}4he2b9JaH1Gh
z(%#bGSG=%kWMe)3psq-R9z^F^gcLN&t)w-_G==aASr@{7E^B8@T!A!=@gWwv9%FDx
zh^~wb=Ig9pb1Uw+3<)Q`|DYK)eUD`tOy_9>!9#$f>>%*?v*spDVKty`1=bxEyh+hw
zlFLeMXEIJ=WBsgk$cdl91a^w9Ygb(lksqaJEMNIs#mHaFS#BMzjk&yJ3H&fR&oUGl
zh>}#6AyiWNY0ZaZTYoBvDmjAVo4aEFHu}EPPi(A9sS{H8lyPgJXk<vFRVC({bz+Rd
zV6{Cx3GWZn6BE0dJzYxsL$?o%;za(8xLIcgXh{gAHStltMZ`rSy;;Sp=`wk?oCxju
z>lutA)RVif$_a_;t9l_q$1qB~hZkVm+5CY?O>=2`31c2J14rP4S~&)nOq_@%f(oXC
z|NYyzo}dfZQXDMGLia0aAjS=E6NIxu2hM_oWv+AlzPX!`5jWhjBakIx@yt><29wKv
zFZ%ANCGXGR6CJIebA{=2o@t0v2+6tZH#qEJY60#6qg5po^>QuFv2-eAvw^2vvuIkQ
z3RNXc&%SkrM$vix^S||fA3$cpaok_^mmx4>qdlm7;Zsdr6v1hLt+|dM(duo+_?8oi
zf&arzZmsmYU+`O%&n85o9Y~JOCy<+e+3D#6gQQ7K7r3=jq`sqVR1FAQVWPskj7J1V
zIdq;6;H-F%n+Hq7kA5O~Anix|q*DrDv4*^jV??lv#TK*q#@;MD61e2nR~2U@`BQ({
zQ9ulw{>=WylEJoII?o{lDoGw1)}88I?pJ2(-!OktL*mxtUY~MjqBJ|c;Bfm{u=lzK
zrH#5P+Oy=zU0d6`I1&E7D$~Yqp%NYtWua!VTA?FiRW##`h;5(aYfG&+>`Bn|7sXz`
ztwuS+Ax9Z(tmV_}+F<z+vvYi761$!yYCZ>_p}b5{v!E$lvvr|+S3UhcoaO~&4`mYJ
zu=~ZFl=z0{(+0tgywCm$Nr`s!8%9VXxET&-S->Ix{{80U<V4YiJPG1h$;KMKkFP})
zw^kVG=HpJSO5B?O%}bIa{Wuax<KiFbuN#Z{iOzH98;a{9)~hcorFDpw166SZo!%Ma
z=y>gYJ#8bz@W4RCe8ntt%^}t5r)Mq;<UdlR#R<`ls^~nqp*o}{Arf*Y-yy>gm9Jed
zG)U?CXc2~U_LX;Kn1>KDP|r}k6yhw|9oyJg^O26_U&v)?EIWmC9&6CxzvbnE+HC#f
zl*_tkzisbYS1M93z@?IV9XGpbv!Ab3syqJUUC`B)M^$yTU<FK^od02{B$em-_Apb+
z4}5(dou>#0dfEi|7;-1$Z-jNdNd7oty&%sp!r6bjrdu<eFfx20B6m`PzyNt_t}{c$
zJ#6xxEt1ZY>>DZPC8G68nUes;=ZWI?;@VAane(XI+ZqZ=(7C$OWADp@()jFbhc(eB
z@~q3OHSH<^C?M|9y>_^6LRpyLgDr}PU0+GD<`DH&IaiK`)Ax<xdSKdxyib*ZqR!%S
z7x~zOfQ{;d*nq9vsF;+9GCDto9=B%wc_XSdbeilvi?L_rShS+O#N2s3*UNKL9W5fc
zxB?C?>;^P;A#t{SVb`xP_-@RsJC{$8kyfesZ?r>~y_7uK`(mh0ss+?kXG{12ZG`AS
z$b_R&HYxEPfw_Jtk*f8Xdkca#gaQQ>QKhend$Qth-r*7=`}!4bhq;kPxuK}z<V+@I
zrm*`rvjXMsd5Lv6hyjq>i+$)_LnWKO@r}{8h%ok~I>8EpKw|@r@A2jBy<(cxwf4NK
zMiZUqPehg6OiitE`!<oCufF)Aq}v^iAp1bj^&hokD0r}2_p=y*O^u;b2O0A#*JNfC
z(k8~d7Q-_Y>$Rn<(1;U(qZ;O84+nRyEH{@KY)`?xGL#GY^x6eCvwDilc{dW1Ln>i#
zvFfqgoO_%c8Cbb!;KmLoYs@i|s>NBE-{1wp?DbF5*<HMme-b_nn`noJGPm%yNG@Bs
z@Fe!ei&?)6*ssq~S6AHo0ur}Pd>=f>F5#P!HWNj5btW?sY~Q0WfnWdowf@fcg@EBt
z^OxQidzCMCEWyerx(CpCdgbn4vG<_=#vjwc`bE>$(9qz1=hs$vs+HNsHuy5a5A{LR
z%h(cyz@DEBWN|fb=DHT;oGxogClT6ChC4JOK7B&wI2aAGy*)2@m)lL`@NKlj(<RI2
z1}1VmO?!2p&)t9X=A&5{(SFa!{CVs@p6-N1EMWKE0rmbn?|xKMY&r17C|`~=f4105
zWMNzyTKxtLV0*f-S$nvu(QcWhdGXJky+~#EY$P&>0-;-I83<{@b{$tvTI-({?so}V
zrgGWuC`&QRA+xECz>(NdMm4+(@Q3@vhfBr;RVotfP84tQ;D)T`NzkZ{`U*cpxPn>#
z%$4pjk~;I1Mom6{y~$zFu(^2qL$AJ<x#Fod_6I2}<N1)faQn}b7dMzRmCfn3HWOj2
zH)qgpS9S6m3t-QT17X{4X>n_fBzC~%uD+zF?d+A45zZnr)e3nMfqDSqk4D0GI!}9<
z@PW6S*SeWP9~)MOnzq~?P*(CcOmhUrNG&t0yCF<dF@M!n()+8Ps7u|yc|!tW#2ZF#
z(`htC5q8(bbh{}u|6bjCgeU1zOfLGgT+s&DT__vt`p@-qnl?*H+@AOVfAKVUP>RnF
z4_}+r%SB(yoic-_p{UP3NS|=T;^|b#mx*dT@Z8y+y;W2+J&JjL)|!K7Wt~Lpe{G-a
zqTqSjEO!2?rt5;aUxxw}yWw-Ai$#340}ECavvDsZhE7E&&BTRxBl?Y2e^piMr{-?p
zGmK&q6F&ya>3kzZj0T5oevnQye)Z{VuW)4GRL*vMQR)}@Vu1MtScoV~7k@h<t{B*N
zrn<Npzp-jMSC&v&{#$jhX|Hb2{3Y(wJ<`tcGk3@(QgLX;XXk#9r^iFeRay|)jY#}4
zR@r+_3Fqz=;tG(C1a*I9am%Tw^ek*(?@X2|?9bK~Y8La=+D<WWiboI9rkYz&J*TA&
z`nc<7HnsFpoCA%i{?iXSPmb{LaPsxbTfG^4<R)5O1bQ9LfqGxQow4#H4jui6U)Fmm
ztONZgaVqk01>#&u&WNXbInv=oB6q!JuWT26NRNcLI`^H)Zp<1DhD6)B%2hHyyIFvQ
zcvr1hvvc3R^RO+QWyRRM-cv9Q!I_spgkb&1dds-oAK`tzX1N$2E9=0?OI4d%o6n7c
zg1(dGOU4asKORo!4;=*zv5*n-axQoHt=eg$#bna?EcejFQ2iX6GSWNxoSQPx{5{)6
z%2j-^JjmH`a|m^0qscT0YI1YGw#r#;=kVurp?*h5wW`Dnd;*fLwdI**e%q-slikTu
zEps-IHDVCvIkZT;6<kpTBVFCA7N(WkkDXO`^?~H#l$Q+#Z;8)_-Gnm7GwSRs;fK<K
z90lVtu$9)ExM3ovNt~k23!+tOcsdwDy9o1KaA=!hp2SA6BG~R48NO~SKqP{T`QAG3
z+67tUegEFP<0hD_o4D#GI0ced&vu6dg0YdI)t9!APf8B)bi*@NSVNH#wDCnrYg|XP
z{!<0rzCtJQ4*YgEW)hN;0nh*(vRAz}F<FcEJ=A`$?z-dXq8Y`+{9H{;Og0^Zt7PLm
zu3}~DC&~;qm6loS2do=j6xa`n?wl8Xw&JA<t8`kG$<2XqgY1zj?fp05yvQ1FbDhew
zZyr@3y?;tkuCkBdiWSupUE6$1jVaCSNIUxCSGbdIuFToCH+{0cGjn0#B;O0Av{&ns
zbEwXfI+mvgO%5(w%aX-6NnIClDqE6%?mLoxZpl%#U67-j@dkq?w@9DE%=*K{D(PCO
z@0wys(7f>ihma`BVZAnc1I69v<0U%b0YRwjO>2J#4n8(z)M;qBHf7AUh@Hc%4tD>R
zr@Qb<k>L3+j#!CYkjfejR5|;cj2Gfq{K;svxUS0klS?r9RWeAlJyrbSXw`&vYPZLa
zQ-C50{)~ty_&)XKtmWkD>l~VROiGHt?7p*%nG#He1Zg=sGQWdO{tw=Yf{vCSSMhjZ
zAgDro!rb5|!RH<=>7~8e=y%WMvdRM_>5W{Q<{a-M`5&jd>Np+0?`|<ycXyb&>2Wt2
zQrSo(UASEP{rmUL)030n*@j&_dK;wnUG;e1R&mC*(+j<p%l!$&D)nN`T&a*K*S+!3
zoAX_D(NZDniQ@Q#l(*e0o#qrmz1@-II$W@<iHr-!JJdVQH|2yi{yzhTMa9o{qQ%Kf
z=w;{dOZDnGnpex3s9UR4sP!-f6O9RVgI^csmVAFR#-~&X1J(aHqF=k=aBo4j??V?#
zwZ)&5+kz=_%?(+3`TmFd+e>#)K5zXqViXkgl()A(_`LGK`Si&X632nk@Us0WxDc?H
zkaG^C9`u(bb@mJWz&U=v|HDv|pdm>L&JA++u6h$<GIGyqx6b0dLuhpLC0OH0T;D2-
zKWW$$uEL@mjWuf>FpB9QqJWn7)Kjvow=<AGC}g8*Rue_fk}voA<^^3!b||Bmzaas~
zRde~wmrBD|OvrWbEr`xKm%HU``VIc`^ZLRE#EA&Y=Y_RX<wlod-iOT#$6KSh<K;%#
z0rhzKwo~>AiNXeLl1N{9H#5Ac`0*M(Z)V?97m?LY88bTOv9ZqlG?W@0vb6Ol+WNS3
zj~A1i-t#w4A*bd2%M6aGQ9U%=pUeGXzI@Xx+CBTuH^9=oU;M5j`JVE5;WkW+(qcHx
zy6)W3la0!`$KZX$^+kF;9+e15Vl5>xadK*Wyi4rptG1|2p*kf6g<C;kVc`$gi@$&W
zmbeV(@Hz?Yp@y-NwY+v}%0K}i$rpSi<C~g7w=Y8|_PDLtC@Y{Y4OM!#2G3W5rO2f-
z_ZfWKJO;UVmZ-PWfE`kyVT({ZN6nYT>vqKY0i80>gY&}3(Z5g1rFQ=qGPHOZnG_(z
z1ldEjC<&HO?3;WYk0T0)GMi%J(+5<r>}LMx@<BimvHh1`A<6e_1?>+O7FOfI4S552
zzE$RH%>ri1<<Xlda=8b8VWiKeV-*hPFeqn4kH_6{6xf2@<J6Hsl+t<U7Qu<aojTto
z=CkjV@vD=I+5?+0Du1x(df9fcJ<}lfR0ek3$evZw9hv@${B)oHaC)SZX87>Zh<>1-
zT85+5ZrSdV?l+@PLS`oA<c^}eJj)ODf+60{C2}zy-LBWiH{<!AKYvzgN$0QjyBFg7
zpdIaAP0wi|N5z>c{hTQhoJCbIk*Cj@1>a@d6X(iAl7T3b>$)|~jCDnJH4dUoku234
zeta=Rv6Gu|+W<~xTJ&PM`262pU8(H7YDCoxifPW{yXuE;Sf%tVGVe}*y47|<m>_O?
zsaxlTS)^kH><>0)$scXTfBedg7ME;tqf(HkEBLORR-lePuko+*#0YATk!8qoKga!X
zXVRe7r6(#JxEyFWD+A*0NZ@XmXQT6};)2)kCpmR08P*0(!iA;!!^E}qjgx)2@6+12
zCb#>AqUNdixVVT{0w+lIB-VxiQ46KUhB@2>pYM7nLEGsV7&g|{*A2K~4}s5O*GMI!
z`;H;Wc?AV{LUE~b_EDwmMESE5PuI)=ip0nv-2~Iryxy-j8fcotFUUSv8|}%ScAB*=
zz(H#Tf$-g7|2)U0dAZ6xj<!MycU@>`==XvGy;5E6h}l|O6$GMpew$(tA=j<9Ha09h
z(d4-LxIIf%B`J0KAglRze|w=sdAo|o3m~|@rz)aKEneq!2)m=RXH=3321Nl$9UI8~
zC1@2N6&kINW3S5DSn1tA#*cDK$j8PQ56jA^IiEyCNQK;JYOtE#lNfW-WBc#V)sZHF
z@kK`ApTLOwpZVUL+`F5Z#?8c~rOCHFOgSBR8d%TPFr(p8ESK-k&9wTG&(+zP-Co%3
z-P|57w?reslc4mb><i3e`PpL7zrT&N${+FuPyRX`ANQP`o;D3sRq>@|OP13*ram+f
zTA^1sWN$kU#$J)LUm6)h06gRm(mcHysyPV_Pq?&e+t$B3;lrP|+dC7*c<vz1_=Ro9
zP7kZe(7Bm>V{d}D42!`#Y-$dSb*wm+EF`9tUp_7&{|74@1oR;5%eJY4MP#1^8d1^f
zQuoCLqZY5o%VLmK&FniTkzbT}`z*e>g|K&@tPczp5tuiyu~L8bd~l*cDfO3sS?921
zac(FLq7wCqvkO{(m8od?9|nyH57Ilg{n-ho-P(i%!npYOee7Q3<w2gglVuq7ix!j4
zoXwpnu%S2Sg1dXL4;{_T%@ffgXG>`Ahl{mSZ~NzxjeIBE0rnLSytSHPX5ed>i3yA~
zyv^`a0UDg`<|R8>UN!L+NWb?Br5Ra4Mey>P+AC%Oz?z%Mnxp5x1j=pemEgWxD^y+x
ziP|qQOVf-8;y5Y9J}^lLK5?kG`FO)o^R*XhpUi^?BHAIO6`lXNAoI>NyE-b!OvJF8
zgEn$}#YJ0IPQhEodiCoEuG6OqaNi6#GZn#Gw>Go2+lJKs_%kO|4uAzm00|oMpI)}4
zG5gNzy)6kE$K+?ja%|H%WS3d5Z00?%*9$Uc`f>Ode=G6ham9I7(=#(~_cyw1lFcf^
zxKG9`+u-(t3Z$eVFEAdW*;s=SUC*9$ZJrJX!uUp$L-;z$YPy!xFviuNfvq<N@LqgO
zT+-9-=xCO!AHXxji;?pd!PZ!FrQCl#$YUTaUmdTmZOT#}x#C~_-gmY@5>NE7qe$EQ
zrqTL7!E)1h1TsR-i&C6rhgJs0ZacU*xbJ)b{Fdexy+$;JU`Mi%kG&SQRjIK9hXa9I
zQ--Hu_D>4-nCdU$gU_s(``p_z-OjV?B`Q%kSy{tdym985n_BPN9I|#moK587y}8_<
zvz$8+=irF)K4^&^;AorgUB3-j1Pl4^-{E<o6FFZA{B90@>-E;c;!V>jrH+>TeTL+j
z%boIF^|Fyf7hf?VjiBK5TM)-(+qsJOi&dbYbp3Zs=rweFu+XI4I_UiERZ(7^FE6NJ
zt<u9%OlY6W68lg5M4|UAFL9-=AMgbJk@)L+H8HKA;LcAz8Bs`Xz})B#`~3IhH?{Kb
zHmiqaedV>Z8a1OkD@jVrTVnABOc9>+L{pmmNt>`ZBwiyqvVyWd7-pxT*P#2_XErvZ
zQo9CitCy=#B4&`^<Q%Fvj0*)4t+`LN9q4@A&P$GzQHYE`lhu<aelCQmzv3oH%V!U~
zx9(h>edfupqe~9%iYt{D->a?g<xVn&#IYXeH56@k)IiW0`DP|7^ijxmv{yx}wS<L&
zKJ&+8LejCTp8k!U4x*UBwdj1-+_^#mV-s%534-D#`j~cc4{T0J;v!MYG+4Ye!S+vB
z`ymRExrIbX?CSHgrCni`tDJwe<SWr{?C76?V}30UJ@~Bj8ciXYo%czAArUnwGY4q%
z-`3>4;r}Te?#IUiZ;Cm5uhs#XzG~V=4aj?|r1ZyOZpdY<?Xb~Ot#7JXj2D-kMB{b%
zR|m{ys=}9XV)f@BtXs5P%(4zeL_~Z^MnVc&d=3yF<oU3=t>pA?_^eN!K6R?M4x+0q
z@V&)t(5+_>6MMj0-nl(&Qek^|2Y7&|;W=lyAakn(hpDvx8c;phg`XC*EAtUR_$<+_
z<<?E5?Jv5gemy-Euedgs9Pk{^e{NkrJPCz>y;Jh^&gbsiHe11j#9`IVK=K<S$FOHZ
zp)c&XpL%ren5PS{y2hk>emdWsB+YDUd_$xE(m`EPQgXbOph&YgDK<IT{o#GCY{;Lv
zse%26LU9JN#NG2kQ9MeaSN78iQnpmnZQ_5|QQGYQ@C@os6y2KxdV-B<Wqo}L<$|Y$
zzG!rXqLvw+403W^%^zJxMXZDWSt3Ip>kL36*nOGQBJ}TzXX76e#608wi9fAa>CY`4
z`*JyoEt>62`X!=CG@2R<6KXr|nQ^y5G_`Q|Zh7l#x4J?^%Uyp%5V)?P*#U+q_{LLZ
z1|Jp)>-y3O7Gt4#36}+d%t<nhu6<8<;NnY(B=y*oB|7(5vVT67v&z`m>`a>VL>Z72
zey-I4aW8FfaPXKD*H_GB*j{R#B^VU$x^W`D0S-(BQNfu46u4=;wo&7)qH*I{Zd582
zrH*o#0eJpB`$HN+nva=WXRcMDj=8ych4F(3;3j&jOt0fb<n_NHk<Y`a$@R56$b{+L
zo>}z0TK23!X=%Hk3y|<%>0E+tDys(!VLAfNfxx$ozJbA&%jM=({8+dEq}lRgRirBx
zWy(<&^qr9JdGm<mt9t@9b@eG~algA4O-l-f*|V&|!rprdQrRlgjh!QM6Wq(}awpBf
zNu_2gW6|7J(?_pn>m8zHjm~T*iZmD3S#&A>ythxTeti>~&GL9`fG^)ggyTjPC}zF!
zYt6f1ei}iD9tzUc*)K6J>R{+SqiQ=5_-;)U(DPrIbN9Jj_~X|PO)pDy>{!qpo;s$o
zv1$e4h6hUV@bKtV7`LJjK$<xQ!p`?AaX?K=`UzRZeyI*8o6~e&Kjspu!+esto7FHD
zv?>*XtHaTen2=EO0G#iFl9$Dcf9Hk7n-t<=*1(|RvFlL9F-2lCGMWYW`7h_cyx04x
zoGIjW>$pGqRkHCJy^H_4)eH-kztP#nFU0i6_5UTc)wq<JnmU+iTj=J;XL8g0p5`8-
z53BCiy|{eRvs~!!4lf91?pC=n3Ms@eTZp8=uj^!8kwkoGP=ngBa8!ni{=gGqL`Wcu
z*Clvjxy_)xM~h*0(C%AMr5Ws%&>@%ZjRjLzmA1uDihW;9M0E6ffS7yzHa<Q~%gz?x
zpLlPmd_QK(#`Bz>9;)u+bJwxA_hBxLOtaiD6WGhBpx;=&(m+!)gk1*ud^WJHW8XO}
zp%qht1fmH_?NSU8d<vCpz6qO!y=17)OR`!jtTH^xH`@=x(#2tx2^CcS9V`b3po(@0
zh@GpqGyDDJ@{i&Is{WG?2W9~|3ov_oj%tgc3Z`H{>b}vm71TW=!>&i|nX7lOoRIIN
z-(SKQlc{II+60R|m?}C@ql_D3W(j}-Jggq>b+Gc5NY$;^H^n<3t~S5aR#sL{wmQtr
zi0eqT%#ypkpgelJFL-}8Ho$63D8cI8q6%XJVJ>lp{?YU$CWI^KdH!Duu<3VpvpzF3
zGgxzBa>uA^*)0ESSA8tt;Fpt|8=pe%4<m?=wX>7(iU`C@wo6Vnno7y<zV`hfiLbCf
zl~$xESPG<h5(-Xzt|c4)Ij#O5?b^RGRNjs(PE*6UbOm-H^oWY*xu0GTU(X9xmlDDs
z8NNAos)2;itQSI?$wpceX@X`yGjlrQVqzq0>(ei8aF-VHl~VVMKk|X}03JWLPPpz>
z4C#RU=m04p@9X&sux`r@wKitM165BxHnuP^Z9HU)+U8GWBh@Uxiy1aQE$k5A<YLlA
zr9Rf7%<bPhIyz(=+RlShgPEH~+#cp~8tz-RdX)UyvJ2G<v=e!1a>(xA7^@zU$2Y;J
zI?ekD_aCq@F;nc>xlVimdaRqOO$5#tY6@(*J-~}P@~T~V6y$@r%I-q7E<V6d*4dF4
z+MOGL*v?7#%UkoQ2}Hy00D%kw*j+B)Sq)Zh^Y)`}mJv+O@Xd`4-Fv~nh#J*H;SZhh
zfq_NV5J)!SrVrnaI^m2X<Ho&}<wJMVT*4y=5r7u7x;~Ix=}^9nk2u02=4Y#k*EE8p
zf`;0|;0Dh#B|ckH8XfJ8>k1ce9XVrgLp!ROky{6xe5pT*Ut8PCk^54m8flec8lP=G
z@shR5oEufq`*Op@^;_oFWj#M?%tx|Z<J}ovMo-|XV6~;r$1bt=p|w*WQMzgG`gPpg
z=#qo+Fo0@U&BeKQJ5Oz}JDEZP@p_siX$HFs@azr}#mm{h%T+pTj*Kx?if1G(<5!Q{
zEPh*^%{Z!VsdVsQgz>b=QP>M>PJ*U=tuHU^oODH6cz43v*M^J>%j#qmZ|Ss$`rWxT
z$jd3C4eeBHINt%5=7d8$P|L&xVK%4y%iH^>cwmeM2M{u(wav|!AH(S1@7d^RvE4e_
z{bM*=L;(-QRBk~s9omvNwdzS|?LQGzzf8K%Yk>-s@n{2J7FWk1hmp#{5lK6iB0H>i
zEtH=~GRP;(Eq94lGf!S?hlk34tbDz6zx0$M`hLYbw+X&4QHiVIrTIH&>CY^$Emw-3
zks`Kkv5oLGz7_2N`JlxYh-#CYod}g&__zb-XvK>4x`7`>sg?wn8myG5+vOh!k}O}Q
z3K+ib8$wdV9jHR^^e{>MhWPT>zQQS_*)0L6+8#Fd>Mg@jQdgs!H^gmb!T<NJx<NZ$
zTZt|yeC7vtdPU+I(};S~vrb;SffbgT9T-G0&Ad_ncXi^n6XrK7P{-FVX<PeT!X;8X
zQf)Eh!fUojJq?qd%@HXAY~~qB2FMI9m%OJmWJdtj;dHzF{FTFEPV>M?fYFuZFQaWY
zL6_W79o2Ju;0xCH&W4~MA<+_dOd{J~r<6kd%8!41dq3Kc@cgH971RU5R=!gA6W$_L
zOT={^9ZA01d^;p8bJ|}$YICb+Km0y0N9@w@(1NeT$U(YWO-IXO?t3)!wL2UD!9GHN
z9hn1%p*k4EGw;Vq9e@%*OMidYztVy+@v}Xf9}p*y96#KWSRJW<>Rd4%`TA>x2-a3+
zc|-vVom(%7a9*k7xhZz|Hxd}rm3w7Y))}!b0Dh;il94h^k<}R{_iZV$eR5U627M(Q
zZskt@jCX1D$GcqN)qkrykP_X-z)JB4;~R?>FN0%W;b_7$b*=8<1FP|dQG;Wr<8#Pl
znL%fYLtCZmDS&`h-RG~%qyPT>TVl?Q41T0d73x_U_YsRxURUPbTtt%b-uSk&BSlgm
z%HFkffd~JG>7z-I-qn*F|MI2~rxLUi0}ptd0w-KKZq_0C;sIi9ZLPFBS?q1;D6%sa
zdsjK?<KDE`avNbiH}q75%;{(tZui;Gs93AiC0;#l?ukEuHY&~ga=!e0ub?nMCUP|-
z$jr=)^6expF7B`Gc!?7M1mUX9q1ALOzvAAj|2x3orfTfw4*ZqGjr4WTYjDA=CX(6p
zOc|7sA@xl-{5TCLh(M*`jERL+{rCisQZ-_L{}Kb`{@r44?K->jOLl9Yz$yff553Eh
zr;47CU~DQv2^SnqE3e_L^46EOZ%KTo=?5Y*oa3PgZo84ffKGJTOj%N`wHl3cqq6qj
z4&|%%o)X7-YcX7<uNVxV8U=u?d9$4)uJjEJ;m(O{YS-0j{LcTAR*y8RGr>sMwiNAt
zYS9XR(31*>y?%{2W$0~SdP>A@AMH^o`5GpEdvQ=(b5;LgCai8>q+X_#`+`Ey89Azb
zvBg{ar>oQNT}oWE_eLM>&Jz+6cI8`>l9PLWA<b4!07Z)u=YvujU!L8ZTPCfMb;e%F
zhbRk+s*%^88`Z+uQf^wK@Yi7vKOAzs0*eMXYRp#3!DQD$p01%AgULU$cm0jI5dLIR
zz)^rgj#9`i<)D4#0_~2?s4k&1M1kl<xZ<2!*1L8?mhN`u{zFcza(5my_N@DYyu8uE
zRh?MQ8vhAH2(RsUjZ#QP1_gs6i6xUStC(0;aan8927A9~Q)F0Tagtt|`vVH`Y>Axf
z)xF=wP^R71hvosn&A$zD@n5D&wXGlAT~<(tQ?txI0neXyfI9o#TAhs7hVc6JuRa+*
z-MjHQDO5a`x~K9ZwEB^L(;+-0$|&{Cb}qwh%XcRmM%WFKbN9m)s-wjKbqhcEd3zAI
zFwkK#Fnqvy*0a98Ne`STBOxIn9U&1R16=`~yMnx;R~Pls>g6pd|D@v^Z|2$BQ?{aa
z)f<Nhh#1Ikfj|O7;x!Ha7qlm5n@`U-pNuT#cC|)_M;FJZq)f9d<Kd$d!nD81D0yT1
z0|fzt64~%Kso2Qeh6aJM<{dKKS|QPYwOWEeXVWT<!{5i8^U>D*JNgMG5MfR1@vBM{
zN_q(`{4~Hn{s};=Z)6TM$nD$8$<I4G*wFB(%yUsVBk4X?7!XS)c1KT2A2&V^Li@ar
zmbvUEcyBc^@j}L9r||XY0ShZ2s5~!qb-;=5a4m`jo@7g*lLOH&JW?w!G(4J?UhFfl
zmWuLn{l-Ab4fTA;52H4*XpxI6X@C;FoRNtnHDhP^rjX3>%5E~kU)*1OnG>o31dM^*
zGL=(O*fD_}h^=@3c-#)d^hX6i(NAvQ5Xv)GcPnd1V%B}gSsG5Nr8B)EM1lJ=)2P-B
z9)f3CVcJ#oWvZ*EXRKg2@pqT>1BrGecU7}01uhz~{)p(wXCm!7*UIfSJ2kZ@2a^XW
zTeLso2Bn2JIqTz63TYuNBb{=qQFzCG8YsEnF`kPK^yu~O0w$20U9XN?lv4|gt(*L?
zSu2d(zBv_0LCASohAO$75M-<-n+1W>dAD$zizi!geA(M15YqW82=1GL)ugAV*w6hW
z%=a8^y7txqu+91F?mMnTmKjbmv23t*c(e)Ofo<sRoRW#jbDn&a+;)lV5G;;8<rc5l
z=(fwlC5Kra=Z#dmLZhXJ-1CJd_f%`B{u{vN#o%|s=_L~-CH1awq(idsUqUK7A}(ns
zK{*k(d<nR^O0`dUjtf6OQbH1^J@g~`cRm}wv^(E1;+l?bCM@8!c@wR`QTb|$sRtW*
zA(2iH02*EJrk6`(n9I%r6!Y+GG&ar$Nz!#!D68qg`|hCuDZpNAmci~>SuSDPL3F>l
zFsNt~&vpCC#r@!vK-UrKu{5UQ?!5AO;rO<bT;^LFR&`b^(3t$pq`ubvg{hGI2G<5V
zq-Si=LJ3(jLevVuFE<36%3MHTErAbGgb9#;0@bt7mnIq43*uZBpbY!P4$V9J3y57T
z4C~e>e-2>72Mb86tE;efs@yfx*F_xxbv#3r#*pt?#cmX(5@9--PauF+vHoF`4zv(i
z-f$%_L*CL{or{Bo&bY1(;-mqNCXt<L_}5#}*NlQvY$@W=n#Ec&&1Ha*Z5G&rf)ZY9
zgIAK)__ogO?z&(qfr{AeP`M{6Q_)kZ|0L#<-@;EQmatn2r{ueOdr>l8`ww1O%b%7>
zj`)r&`XJ)8=ty5}juel`br#z<{^YxiodyuwP4totqqXTYx#1KQ=_XbaTmdZt;n&3H
zwGoC^1tfw!(R$93)I+^73mltW42Mf3+N~a=!|bhB9}>O^0wiGLXu$g-E$k%{qa2KG
zH`;M2MC?7~Rv;A;k5h-o7{PjIsGL5mGcuO5ghoSiz4~1&tp0pwVs&QIkjecx1SZ1x
zlu?=MTue?*&SYd?>W60WxE==!h$gE&dOSZk4@Qyd=M2gu)w15x$C&`^hEg*1Dxf^T
z@^NGGdA(kKLQw4k1|`_O{_FV4DG4(;G6~wHw&K<VDlGeU=&xe|tgi6a6-}v%g(_yO
z2QbRc7SC_JS1B#d>tRH+VjfFdA!}x4FpAqK`u&LQGX^iCTcq2|)3Mj53)Vn4!Jlv6
z;zj**X8KFlZWnHKbybze?VqW>Va_&X4P9L_fG#6`+@0V#<2jhG40<;32L*2M@tn7g
z^8qrD%w9d49uUs)GX-@U=ffnE2mwwgzFF>w(GO2?%=@m^%iHtH2j6KY6O+-)g0Cwt
zsrNIM)Eb9W!Hlj&$nPvp^OY=S+fe&Zf@g|ic@5G1PUjrjP6|G|a%UP<wmr^gZMCQ5
z8A8V=gs<+d87Dx4nRmJ9IcK#HU}>%sy8h1y@5<d##QN`>u_oB^R+eZJ^&_eNL34=4
zi%-qh*pmj|5eIfjc_IDw8fXLt+Uktp^=bSLm5Ei6kwR7m@P7z^zqGY+DtuSXFr_~?
z+@Yc&2J%6l%gow?{*SwpdDhhye6|{VPEJnvXveX;nKLpp_)K$On1<V#I+vLSu6`f}
zcOSN|g20ppO_l)Z`U_AkA(UcZ8GBxet0g67)-gi?ek_W&MM@EUJ9;xCUTJNl&*CJ0
zn^KDn!6t)v1^1;aJzLMIU-Vc|)et(016ny<%|RNxTuOwP*w|lz*QX`DBpd_sd2A0~
zp|qa9J8#?17g8J^2^Cr;jH~;H02R?|^F{}d{rckh9>alrj7{(7_vQfwr&m0uvE$?8
zcojW!PQuFw+GnRKdoz@Lk-{&iq7$MwIF$d<v4`(E3Vc!d65TjTAhLsgE=EXBe8bGd
z#B|Rz-bzG7NF-|cH)T59t@-A2>i-@tXJ(<>r7G$5DWj>hOc=JuAFarecdi$0fDU7Q
zi7lzsTg5#_l^90Qjf8(n>mLn#?NrN6KiA0#b}g5OR8k`G3nL3kP&wn=F$!dHd%n27
z&gb#MLwI?rN&<>+YP1`bOzzasr`_bKCqTU&O9T)8gd7${ZEJrSJxQ};)*^lI^4<gk
z5dPTBq!h#T7T*ynJdSgO#c#H9;bZFzPv&w{HNNWhPL0TJ*)o2A{trwqI=Y_TxVECA
zB1JMLKE4`uxY(k=&BH@!1?|qXT3m1s;D1d0;=2_=p-l(SHSDiHE*iQP;OIJ97qj^Z
zD4?Fga+G$YSU-TL_9kn;P{fwlivon@d1<L$-Tdu|0%u&j8Pjt!K%S`RX!auGeT8#y
z^F(vGN99?>I`mgL|JEv1{AxMa%;#`G(fVLh6U*EQ)$yEa{}`RiuDmx}8=lAD4sQoi
z?>%`&KOEoK`D)APykO1egzM=)4Tg+ylI8bLHqQ$S6CCIgc=>Mh9rdADEhspl-`Bo(
zwzKluPEa`gx;6-36whtDVIX}=$?Xwyt$V}(N}ToMS2yIYJw~wOfg(+dP0J@$3P0We
zwLn$#FZtqe8Z4;Jbstrtyon{YL?deQR6%P6APjp9y^cRu;C$&g0x~2#J<V<=!)#qj
z4<>;uAt+{JWBydJXgj*_Id@Q&((x)N!B@p8t-sIm<_5@O_u5Ik)&KqJ*zC_m=rp=E
zE31xf@&GzUzQLJ`2K)&Oh(`DKXo7+Iebp*eRBO(g{B`uN(8-1$0Yv0ae8y38SdnvL
z@q7@Q*W3gZCJ?E)JybuB7Xa9X9-tYe{(6C{7*D%(Ft|Kbk`hxMkfZ^SK8#w19hEzO
zFHU~_WFR37L4YWTMgp9L4<JxUg|r?~0GLh2+!tZqL6abU9&a3l-Nx^NO@WcU{1Npe
zCdT=B>$S((R$?RYFK9*P!N@Qfx^5lxk6P-s!V-K0n;~JNuOmiQEVQevdd5`NE8On^
zl-w}cJUJ8^Aoi?jNZ<z;7$K7xVf_H9{u`dXgyJ^hpl*pwt|c^T<yY>0eS{Hm?eX@>
zW6s}e3_x^p_Q1S%Z?n9#PhvN)aeH`PQ~j+!AJnzSmrK|8?p;M0KoDJ0A)8l`Acj~m
z^C(7vQBSwQONk9Vq9U-Rviad?cdV!g(RtvC&8NLj1uE$_Kh7O7>X5p_NTwsGRIkqg
zPdf~|+^>HDWk>c80j9R}b?@dAiOFhDG*8p*BiC)t^R$07k6d+J$YU&D99xr@Erg~1
z7Ed}(#9-tBuY0=Xs^`f)6O_6eDR4KJ6wwZ$Yu`Cd%qZ*`I3mX2JYaAM2xM`YG$+>8
z00TF*3MXX+uhKexbQGENT7*GLKS9};eUXjXQE4CvVSbl4<8yeH=00Z~Si?@na6ejS
zKjh$P{oSu34=CS*EUpG?MxakT-X%Sg8jW~q{GH8#<mhI%Jc+z!%TWLmbX-X2Xbm=#
zQcJsU1Bxi53$Pl+>6w+}L9fvU{y1REn>I=)vH|HeqHgnWwZwC-Drep>cCVj%FYe#v
zfkV)BDxf>ghIVmS@7!IVEH4s*^N1r@k5TuYpcXqb0K#PV;B(#>q?(-+5+Z+~0Zw*s
zu57g5OV_Pa+@M0;c>lQ%uB6G~ez-Rtjv}@j*twM$-#&Eb^VnB|xGapdG2C=J7Mq>W
zbgJ_9Z7(|$Qv>k)y-Gw6u?EpGC0{UBmEOO}pdIKRwqQueRp3@Fsrd(F6mMAT`aL0Z
zeXBBa=h?a9=Kxd>F0lx>2PT3DU?|s`1rp;%^a0z%kGSLjBbh^*LhUhwRW#pTJ~e&&
z8&ULMg9iDla4LUO4sif{oJ?2lz2wC4eeTy|6l_zYf@WW2?7o>PVdf7ivV5gXQ|WH3
zXV8jICp{L2;bwr*lLeAzjf0OMDUk&NAdW}MTGIas;l!KidIxH8xOveFQwV#^6i3+`
zVSZE^e*R>;xjJdqYOfl^z1MLfQ9HagB6~pK1~AQEiz~1vrWu$lpm{}uE&6K#nYFYw
zwu4sS-gldZfh;K%^%JlE<Pycst?|$<=UIQrj!CGfMJcXC>?2B<ys@?x;q5uC5UN*4
zvg64`++diLh-sTwipDAmTzsl%IM|G|XSt9hXN_EwKeI;JH*4|H*>L*TF4>^AX#rXD
z=0KHc(ebCLf=Nk*aAdY~DH7Z2O&jB__RZU|{*AA6Lslr$kAl#Az$>PHJli6DuCj^1
zKTxGs$Q)WA1Z<iHAc41mt3WCzU1C5LoNPD9TL(VQ3%$??UwRFOz%`DV_<~>&(pz`d
zSp7&U4-XFvq@UarmwzW29DTrOsC)9@R*&=t0pRQ@LS1Slx^B|QEWzBq-Ghu`<mcPA
zvDn2x&cG?^bL9vN=U59FjSj}$TXOgz>Vl3kol*->?T-OsU0HL@Gq|H1!k@IkNmN?>
z_iqu=p2KM`0S~)kxsqTSbeyn6p^ZAr_YDr3ALx%sYu7=HW=j)LvZR;pZ+&38g@z<+
zw$)91;R!-;Gy#uZHPm%6kbN|L{c60S=g^vE!F6E5?3l>L`tIYaSK&aU_w>nEK8Hnp
zT<SUv^*3>JD*DnWY<}F%YnI|Z@Oy(0+(h|Eju&8oN4{H+5d+@Ev=AxZkl^^&@^r@m
z+(k#rN9(`<m00axN`LSv43bRe`GiHN!%$`4dw#`HWdHJ3UA{R3ZJuc$EU%g=pykoD
zf!88yhXt)}kLAbNmb}(y;?(+nD?kA%4+cl6#~3R<$$J=-Z~_4!0WP`11gp$yx6;w=
zz00EaWoBAi8L#<O3E~a#-Hpc*g!6$1h(p7}mM3%r_lZT{_UT&qwx1;lA2j4<b*^aF
zd7X3G^$#37jOMH#Pujbe1L-V(nnn>kr;QVrN~9Ojr3r4<uJCSNm|`>8#}xKyLk6`F
zV;<E98p1{UHg3~m8Rx5KN}CynV<sCb4~smt<TaRqX#<{U`{s0|*<hOW&3zjNiCMiG
zkq2&z*GdvQi|u4d9n0n%<_9DFeu#kUR!ri!g4g+h=vF5I^|*GUX=CgF46Q5%+I9BL
zyJpMtR2rH{%%R`@EeLw}1IH0h_ou$%map_7f{u<(ZZw5hhW;ck$UTAJwkt}3vt@73
zP?WQtg14;RlB4L0fOUsQZe&`Z4}Q>&S01*13ENy$cXlG(aDC+kA{f4NP1M&sKO#s-
zXQenk`n=Wq$xrQ6pAhiP&X~?}Ua;|4D%Pug%2xy3kHFpVwJZH{B5Z=cX0gA-1FUlp
zS}AW;I*+AWqydbarL2x}i+Lcd^jWW>Bhm<JO+IZrgW?yhMHmodwy?3<=1j67%bmRX
z0l<^3+|*Rxfu=H(&M^{^wWvm*bUWY$(XVE=1Q{<!({6R-SC9qyzWLXEdpju=_^$rR
zHQQ-n8g%6i&$3vRf-&IGzki$H@PG(Zm+Y#ksZ9bVLEqrnz?1A9bR?P!!e=IZfBH;-
zHqBzQ9Iboi|BT;Zt}bz+7*@%$3A!y=s*o+b`WSI_=W)pO?=BIN!9i!1)@~M?knBBx
zjSh=f!eHYEYaYukpeeC(l|(*Hgg4+h1_lNv<)1-p@>~Sn%UUW?j=r{)?(~DE<vaUq
zS#P6zrm`Q09pB~ho1V8m9|&9cqa&0%g@U1`s%pIcr9wmo^x7yTJ=60F0W0rXbA#co
zDigzQ1#3gaA@iwpSZeiF`7RGDc+vs+@*F4+-n`A){a|aYJ*??U=q3k3CodO`0M+Gc
zw3Zh!GIQNJIEsv4>)BW<ZEWXj)}Er_{VqwofA^{$2A#ZWMU9aN|CnN2Vo*jP1SzKP
za{+Hm8uFt9Z5pL}2Q)OLB2%}IjRzm64B*AZA9r_wz>1Ic5~~wwOV){$lyop%cxrIo
zpdF2Gn?OD!PDPt(oDc);2sDA|B7xQl(>}x`x?!jlRYL2Vt(y1j?0*hjg${v+#a;8c
zosKFhm;!rH00ZRu+EX#pROslOSVt@Wzm1TbLphl;n$vmqoL?Bx-WSb@*OAAOqax#p
zlIn-=H3-JX=ro9p?Yx>awS_-QPJpzLOFMIfiPHaB+}btd4_9P^np_+sMgyi@kB8Iu
z-8uKIcJ}&tt?Ai)D$M2$H$gkWo4-xZi7302vR;jTAUjZa*}wKf{Ur4FZ?%ubd;d6$
zW9U5db2Z&EGz~p1fjJ^^;CQ~`c8*VC*W1YQHk?`<7CRjr9xZ13LJ#IZ0JcHmE!pJV
z^{JrG^jWMUoA4SbNGLPgOMe|VRGQ_^+y_}GA{&e&7?bg37bnp~pwSfhH#idJtn>C1
zWmY~1yN2gT1bXv~I~r2P4?|^La^ZS$BIzT6ltIzhUwIu-b+J20+qX%sGOWiou<aYq
z`9$K*7#)k})@vwCbW!05I|vkFJ}E$spPqWlsJq#%t=j+DuvC}VX0k-uVk1_2o)crM
zT>LI>P0)XG!xPUDf8Twa&~8;N-@A?Nr<*Wr4w`J>cM!?1@1Q^yL{kUOhub`24I(?f
z?a7<50PS#)m_GYPNSh@I%if!BjDI$eJoEgN<cOC`AEeLu$pqaH0b@8pyJ%HOf>C*$
zDbwtIxprj+XrbvoF=UpIy*Eh(OZRd)NpE{T537B%T?(9IE$W7;f_#FwE-uf%pbtxN
z|6z&6Gnid2ORK8nL#<@X>`K-L(AZRh?XUW8#MJz6z{Mzf(fc+rAj00}9~Qry-><V`
z_<;}n5YpMJk{qEGad^#0e~$VyH+U&J^E)A@j;kMTaNzWAfp|dt&(IJRpy>1DMJz_l
zxH^y#W^EuM^aJuGZXv<IYYq6HO3d9y*H_%awpL`XKkkzeaq3`?dV2Qffj$*iVYm-i
zrfkq^g;0Y0u<0gfwl3L-_XE#yt(Ty>3FdDkIiM>sP)r?B=ONFxMdX(33l!rY7C-#x
zH_wYpNO-fvS}x?(mzR9r)^Phd-!>hKh1dl0J9u|wJ{v?QhP0*oVIbXLIg5CpzVS9+
zT5Mr6sG5$80X4UHd1Kwu(*2Fm6#Mh%E3%+8IPEejc<D9KK?A5)Y%FR2{$(JIGWGN^
z34Rge^k-+{1OLq1e9*b1Kiwkyh<Gg(m;HmcUjJNnmkz~4MvUsMrhRHLiZ%@q*#+|;
z+5{QHgg+oJLCO-FZu|4a>HD~~cccC1sCZlZCs&_JeMd@kc+!9OMA<J4ZEhgcv)TQv
z+5Tvstln^^A^}#PJnV19V+BHwzuVZG{F?|!TLQEcs7B`VE&B5So;xIPIv6x%01IkU
zFR0ed&BTGDYK;HGGnt1250VrH`Mknf^p=qaq@MT<OafH=Lq3tgdiIT_Ti(gVyqv9P
z&K)bAA=lO`ua{KB*^fX4)23`_Xt)oK%gfiL03m$!R)tYiG&5f*-N|sOtmeZE%h?lZ
zUE*Hqc@E1G9{mI9OGK!J1-JJF8!NZSO)fqOUNdOoz)U}zqdMq&gq#lB$jxM>Xy&X(
ztLWY5J>R#l#s(vBf_fQ~`6+t^wFzW8VyeLKbJpxrbmSDSU#^&Nt72;{zSCDX_Kcv3
z<TDmA$=_q000;!{@bT{gq=8iOcbBM_<Amna2%sdq?w)R4md&l-32OBxNtSR!@)6zN
zyLnllOQWtjwB3j8@Vw7|m_Hrr+-6ze&j)hIv)!eoiE<cB!dskL)a#W4{Ndi4JDS28
z7~9HtL<BZ4XE_yzw_aXCpcR5fFwgw@@`YPY;wa@l*v~BDGU64l7mpQo)x_ORu9c+!
zA<&8bq1q2aPv_RHHx%XATg=Rc6^%FiHGS+GM5v$dUl;Y>j{>bPdv1bC>+dj&s5&4O
z*)QJjaTaTtRH%qp5sbqVq3dwdoJ5TON;W!yEWVHOzXO>;N6ku@nD5raEhZ2WBRmiA
z1M<De06!=}IJSRRyOL&JMd(yP7M4C0MKn1;UO*>HgJ(N?aCxatwT0TBG~V>|25AIc
z{@>IAFZnc1csfNTq(+=~{~SC3+3>~r-o)*p%aG{hgWr_C*;G^;9aPu$z0p{?JPD+a
znfYvQCVbbS;bpnk`A%m*@&bqD=i~;W>1Zy<2T<m4q77k0DIuFGp*}XXW@&Fh17t^v
z<0*yRA_Uic9P6xR;)=_DreQT1y#WkbyZy41u{lcCdGhB4Qpj!qXdo=?m1cVaG{-uN
z{=Y7MOS|sR?t7eWu&dckGB<2RBQby;pA=0)7A(*a{@nah98_~r<ZQndzDnMdrK8Qq
z`IuZDY#$#VZ@*#kdP)x^inJNcK_S+6e6EnJr7WNdaNX^(OL@?p5eKL#MI<Vqmv?iM
zB-G#rYoDC6055MVqgN9@9aFYVsCGZh(&PUS!(MMwP2R$P-4?j2l>R_d@M-Q9;Kn#M
zGZe}VTdbG9{fL?IS~jS0F;ExOdii^Z7V>Nhc(_5A>IiVgGe?T55c08yXiz{aqcHKl
z&#mq<=2_AN(T_9fHe~l);<CqdsQc_>6&tXFmhK0Gwf8qJfU6+iRe=XzWYy_k&O-D?
zgxG&}wp?YS!4)<}6#-pME%hu+9avRa>kXOL#h$dYd_P0YxZ>FT0E*`0(fLI6WkM8G
z_+@+5a6qTItp4F2E1kRMuNTc#(%cQdr~c~Yh+mSPoe}pMbR!AwmQ*)3^w5tNX=2r!
z-ltk^-eR#z&7e<fqI&S_x@5P!vo+_GM%@He@7La{nd@9er8GJu?xU70z8Q>Cbj8(}
z@?Wx;x+Al7Tt@C%zZ+W#&QOI_P<vc9hv<P;Yp)h;2+%>BmbKJTE7kUTi|Y>ddxO@t
zcO@S|;|;)9DRF%$4$c7^l;w3p8r<?KL7dM%qL3q!oPT51@4j*C9~B)P9R)%#BDGdx
zTQT@64+zH8($w8;teEM1_wRNB!4${fKX)4&WTPWMbEGWrL5aF|=Yh<4!D8++(B!di
zzGyoW<tjctK1bWDR(Wqinhb`DGXAH8D{+Ln``%-lQOGE=R%jvHFm^L(B!uis7;D+H
zObF?<jCdy*BwL$(DO)tit`UuWD+!UoD`Q_K$vWTb_xl6x+<Wf%+_~pI=Xsto5ekd5
z29zpqR}uZh+sOx56l_5bqVH6BFgy$639*{F5B-3?-+nF-7Itj)NM>xDX}=gfJZveq
zHWn{k(eM(S0VY?LeEha_Yu|zLI?_~iBEGAu3r+70BnoX^?n#$>udFEA?4sQev<f7Q
z^P)BWNo~`TtSzir;LA(@A;)3N34&n(s52XYm`z^nn>?v(o6gbhNc_F>kT0`egM-kf
zz*9H15@4N1KQvv{MPvxIPvf5ctaQQE!OF{Nol?{pS^f%>1eme(PE*(Us9ACvxXCLG
z5yB6k%@q8=w!~7zUf=S5GO292(xKEq7t!hf@LrdLuoJNY;YP1i<~FmMY4^Gc3knOF
zmLa;3?0N^|M$~~IV2z!n?+zz>-dFwf%&uGr5Vl>Q69Li|Z*ICzNAFlK3IZLvC#Z}x
zLKd#g_d9?Fo@ACHziiExEYOe~julc1v;-i3Ov}8d5;IY1RleAM%|^xf`zr=OSE03+
z^8nDF$49bcp`0?aJ6mKNwNWal<y@RDjf)r!`n)*W)9Jc)W-8Ry+NU_&N5V0C5$ea8
zD7$=E73V-N?EYn)<AyUeeQE-9pK6VP9^e=l{Rm!(MwGMtgi>zt@NdgkQ*1KQL(ITm
zcF5!b!mnw;9ax66f;Pigtv>>E>)im7?CR#03`&K`u&uYZYR`gBNul3l*l;;EW0y;4
z@PjYPdqidgzauGsa;39vq~9#MB<XxNMeYq6WbCYs-i^=o7}2OUGo=Yw(~}Q(Rs2b}
z;JZ8irx}(SsKoS!t>PbZ#F7IiHvp5&GwBp#k9e4CEq9diG$0d>eCEhDKzVY?uNgkl
zb)$FJwcT}^F7+6^XzV-1*UY-TMzd0Tl=?T)9@4ZLtX^tAX4mXJ?L)m*iUc|YpcO?1
zEJRfQp`5c$pVv0sVduvD=B>Z|h;~jzkc=h6f>l-H*ucdwa0JVn4~^5`0Uq6Z&qzBn
zUKE2dLm%iZu()C#%g^{aBxJ;tF3w2GX-1gnJ~6-%0P4O^zE0(;?Wr&NRD*mR!8^#`
z$4+zC(T({$mE_JFnPg4uvT-b+7U&2-%s_CyQA>vCW;R*wLqm{zH**RRG`goMe9rh3
zbV3AF|L6e?i%ZbYyQDJCqy&Qx>%6V2L{xBPK<vV<l0N`{u!=EKl=BxUw&V~pD$R!2
z&Fhyzf171C%q^ReYnUotg|GMgChhT<tf?glYX8JTPn~O|LHl^8oP(6O@zFFBizxL#
zcY53Qlwc<Pj99oxi4aH-@#!Haz)Y2YWNtw0WIFT-tD4+$>35^d$lG9FN;j)X{~qor
zFg*tWT!|tKeNhy)h%n1TS7Rm}Jnx|_@UeXM;bu5ypm?P{C#I{^{AN9#h*|)3YZ%!|
zIvp`zWuhmP`GK`A|M<6U?v4~1pAb+;d?pnd_Vq^sla^C{T1wHYnjcv^fv|8%3VW_`
z5PN~a3TBJLDCV%)<>a&YzUS6FVT}pA*s34H&dmGTl2*fcx>I;0dvCKcLsC+nm%75%
z&`mNQD~#^}x2tgO8AKuEAGH~l2;^vvz6U?G?6w<`jalpB$sVEa%v!N|Yfmq|EeTr{
zuK4I4v~d;kySO|4WB(mmJfkIi&!&myQAH=jeRdLs$B1)6TJ`bY-)KZtga9qb(p-k)
ze}C_3ALCRfE0fAB7e0XlHx4PUxB^MJl&Fg3@{_jv=Lx9(c*VfLu1|Zw-bQ5o%OHPe
zuTttiJiS{^XYVvGQ+aZPJPV2Za`JP#Fn|ZAZSJXautr+|vL3r}D8OaM%F4=Mj$vMs
zd)sS@8Y^D5);A@FZYhEO1g!3=S{B+XZzw-OoQGT+yaZf}jE_u})N;XwKMV*ABpmgj
zg7>#FhP<-7NSnGcTcl*dAollJ&DX7f?+5lA0ML649l-x41$s0gKn%8a0f91UDq@LC
z#UDA5ij%`RaegClf&P{LjSxz)MbT3rr2Y|fe*Mv8*fB7U<!IauFzy*fRQ?wLecBHi
zg3E`zkamx<O9uBpvon~ySzQ0Wt_54!O%i`%4#rgiizM79aF#t-Qa%bDxIK#tsyo0q
z*;*s-6g^L%ZE*tc8i4Z~_$3z0wD@AIR?(M%-;bc#F;m>N+}cl>%HY)`^!1IAvPK{G
z1aRs}9QATXF`$bqt{xtWUqca(L<0d44d}|x;<yHl)6?{PN6bXwugU*6E%=@i@b&ch
zzPs|juoiv0j?diO9Ermu(4{ldk=|z^6BoX!Mf3*EevrP{RRyP=XlE%}f`YW92p>hu
z{yV5nz0~@h&&EP$Qs2!?7$@MKD9p;`h><sDJ6<S+zvL54*n)X--8L>VP6A*)^g3r$
zPIrDt*sH_Fyifq^`R+%w-SdsiuRk<-j!^@%GH0<TdJMeOw@#lsyz+qjDhiv<$HNUw
zaGr>vA<<F^fME!k{optDWu@l3quA9coK_<<^^&c%arNQ6_8?XeP)(8dyLn3kidd35
zNt<sRfd5c*3I|wiiA-2H1F^mQb8>#p1@ZC<i~*o}HwAOqOEgNqMe7D2>L#Qs%jE&#
z4WJF~Uj;YKZl~V?0J*zjfghFCix4Cd32pg1!vS9IqstRlTK$i_yk0|<U`<wa^eIfW
z=GqZi({1xY+bJNkq9mwtQ9-GFLgK=Oo5bV@W<0Rj5CAcN`dah;^5}a40aPpD54Y`j
zHkyEQ4s<bxt?eQ+4DYT|;w9{uEyRsJBQlVEHTy`2K?f9?42NL#+KI4NAKlCCvY7_J
zbB9I2(hB7A0?4K596(o52N8_B{vUUsfO;LTYuRyf){Impuz1S;*aT}eR8mI9wFE!O
zc)^(ZIT>@E=U*lfMn%1BBcZwTrE~i`MWbIA6GjZaw`+<n%)o+V3N<*ihQ7<bJ#i*a
z`!ZfX!{G9T;~J@^|LLUII}}p{?`6o1D=3J0p?duc?&eOfE;kHtpZ=4H$ofI=-Rs|L
zK}oCK-{r)UNU9h@k<_$Ohh)qsrT_xB)lu!elv6q%p*p=z3quE-U3ygK=-gMj;CgKa
zOX%tPL#3kJJs2&eE@oyt6652?Vi)ts>PA+(NO%$a_M>EGj4Riq{1RS|rNYT~cc6Yv
zf9n0SaK!rUf6$~~Rzb)zzPC42cC$5YH^korDjN0mDb-f@H`>1wCL0-9k!tj`*^}pv
zmZ7EEYe0SBa<id9W9{9}VRUr#IXuR>VHI=mU7L`^8;Z_q6$w*pdA5HlUMEgB|1$q_
zMe(#N7NzO5p-pWnl5#={=D=^yg7u6VtM>YmdqUBx&ELO$o|#!xSqjw1w6t0&DpG0B
zavod=ZmhkNkdI*Q_$sj3FvLX{sFWVddVD=1JMbY|NlD~C&pYP}3$c2Yl$}6t?|iuU
zLwzPupER58mUE*g<3Gz2BP*~LHa0ih-1us8;jPZfeo6BKhMLSFN>*KI36XMg{=@$+
z+Su4&%q)XbGiC$o-J=XKNkvlXRe8B^@jdWk%OhNtOuc>KhUyDAwRJvzi_?<lZ5)iY
zeujsdryP2eZ5%opS&3if?lNz18DXmFNqW%i_!4W^YDd{t!C6_Py&nB!!=8*4*$ACj
z6}X=Dg^SLN3*UL)`B$y2O&dI(soO9B(@QtcvD_r3{_a4+R~x=^(G{e*t<bQ3?-KEz
zzsJSC=pKi-#JB53uD$<I;!u7${n;U*nl)W4t~gRL3UQAnG1420eObaediptB+`khZ
zRoSC#ow5JM)?oL%SAt}fJz2t;Gn4~8Xz4aS@;C<mKqm|mBOBEA+IehZ`)YfXW?8}2
z)cUtEaPi0++)<T=5`*|}9B|`(U3_JcltnP~QVe{D%D=cNb0YP^yDs1x2+`LuzW(l-
HbM*fJ;0#9?

literal 0
HcmV?d00001

diff --git a/external/hypre/src/docs/usr-manual/ch-api.rst b/external/hypre/src/docs/usr-manual/ch-api.rst
index f0aa6a9f..eb98a0f9 100644
--- a/external/hypre/src/docs/usr-manual/ch-api.rst
+++ b/external/hypre/src/docs/usr-manual/ch-api.rst
@@ -1,4 +1,4 @@
-.. Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+.. Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
    HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 
    SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -21,3 +21,19 @@ API
    api-sol-parcsr
    api-sol-krylov
    api-sol-eigen
+
+.. Add blank lines to help with navigation pane formatting
+|
+|
+|
+|
+|
+|
+|
+|
+|
+|
+|
+|
+|
+|
diff --git a/external/hypre/src/docs/usr-manual/ch-fei.rst b/external/hypre/src/docs/usr-manual/ch-fei.rst
index 4fbae2e6..1f683a4a 100644
--- a/external/hypre/src/docs/usr-manual/ch-fei.rst
+++ b/external/hypre/src/docs/usr-manual/ch-fei.rst
@@ -1,4 +1,4 @@
-.. Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+.. Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
    HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 
    SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -10,6 +10,11 @@
 Finite Element Interface
 ******************************************************************************
 
+.. warning::
+   FEI is not actively supported by the hypre development team. For similar
+   functionality, we recommend using :ref:`sec-Block-Structured-Grids-FEM`, which
+   allows the representation of block-structured grid problems via hypre's
+   SStruct interface.
 
 Introduction
 ==============================================================================
@@ -48,7 +53,7 @@ illustrate this in the rest of the section and refer to example 10 (in the
 In hypre, one creates an instance of the FEI as follows:
 
 .. code-block:: c++
-   
+
    LLNL_FEI_Impl *feiPtr = new LLNL_FEI_Impl(mpiComm);
 
 Here ``mpiComm`` is an MPI communicator (e.g. ``MPI\_COMM\_WORLD``).  If
@@ -56,7 +61,7 @@ Sandia's FEI package is to be used, one needs to define a hypre solver object
 first:
 
 .. code-block:: c++
-   
+
    LinearSystemCore   *solver = HYPRE_base_create(mpiComm);
    FEI_Implementation *feiPtr = FEI_Implementation(solver,mpiComm,rank);
 
@@ -76,19 +81,19 @@ variables, and if we assign ``fieldID`` :math:`7` and :math:`8` to them,
 respectively, then the finite element field information can be set up by
 
 .. code-block:: c++
-   
+
    nFields   = 2;                 /* number of unknown fields */
    fieldID   = new int[nFields];  /* field identifiers */
    fieldSize = new int[nFields];  /* vector dimension of each field */
-   
+
    /* velocity (a 3D vector) */
    fieldID[0]   = 7;
    fieldSize[0] = 3;
-   
+
    /* pressure (a scalar function) */
    fieldID[1]   = 8;
    fieldSize[1] = 1;
-   
+
    feiPtr -> initFields(nFields, fieldSize, fieldID);
 
 Once the field information has been established, we are ready to initialize an
@@ -99,21 +104,21 @@ element fields (fields that have been defined previously). Suppose we use
 consists of
 
 .. code-block:: c++
-   
+
    elemBlkID  = 0;     /* identifier for a block of elements */
    nElems     = 1000;  /* number of elements in the block */
    elemNNodes = 8;     /* number of nodes per element */
-   
+
    /* nodal-based field for the velocity */
    nodeNFields     = 1;
    nodeFieldIDs    = new[nodeNFields];
    nodeFieldIDs[0] = fieldID[0];
-   
+
    /* element-based field for the pressure */
    elemNFields     = 1;
    elemFieldIDs    = new[elemNFields];
    elemFieldIDs[0] = fieldID[1];
-   
+
    feiPtr -> initElemBlock(elemBlkID, nElems, elemNNodes, nodeNFields,
                            nodeFieldIDs, elemNFields, elemFieldIDs, 0);
 
@@ -132,14 +137,14 @@ are shared with the other processors.  The syntax for setting up the shared
 nodes is
 
 .. code-block:: c++
-   
+
    feiPtr -> initSharedNodes(nShared, sharedIDs, sharedLengs, sharedProcs);
 
 This completes the initialization phase, and a completion signal is sent to the
 FEI via
 
 .. code-block:: c++
-   
+
    feiPtr -> initComplete();
 
 Next, we begin the *load* phase. The first entity for loading is the nodal
@@ -149,7 +154,7 @@ on whether the boundary conditions are Dirichlet, Neumann, or mixed, the three
 values should be passed into the FEI accordingly.
 
 .. code-block:: c++
-   
+
    feiPtr -> loadNodeBCs(nBCs, BCEqn, fieldID, alpha, beta, gamma);
 
 The element stiffness matrices are to be loaded in the next step. We need to
@@ -162,7 +167,7 @@ equations are arranged (similar to the interleaving scheme mentioned above).
 The calling sequence for loading element stiffness matrices is
 
 .. code-block:: c++
-   
+
    for (i = 0; i < nElems; i++)
       feiPtr -> sumInElem(elemBlkID, elemID, elemConn[i], elemStiff[i],
                           elemLoads[i], elemFormat);
@@ -171,6 +176,5 @@ To complete the assembling of the global stiffness matrix and the corresponding
 right hand side, a signal is sent to the FEI via
 
 .. code-block:: c++
-   
-   feiPtr -> loadComplete();
 
+   feiPtr -> loadComplete();
diff --git a/external/hypre/src/docs/usr-manual/ch-ij.rst b/external/hypre/src/docs/usr-manual/ch-ij.rst
index 94428653..8a1ecd4c 100644
--- a/external/hypre/src/docs/usr-manual/ch-ij.rst
+++ b/external/hypre/src/docs/usr-manual/ch-ij.rst
@@ -1,4 +1,4 @@
-.. Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+.. Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
    HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 
    SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -77,7 +77,7 @@ contiguous, i.e., ``iupper`` for process ``i`` must equal ``ilower``:math:`-1`
 for process ``i``:math:`+1`.  Note that this allows matrices to have 0- or
 1-based indexing.  The parameters ``jlower`` and ``jupper`` define a column
 partitioning, and should match ``ilower`` and ``iupper`` when solving square
-linear systems.  See the Reference Manual for more information.
+linear systems.  See Chapter :ref:`ch-API` for more information.
 
 The ``SetObjectType()`` routine sets the underlying matrix object type to
 ``HYPRE_PARCSR`` (this is the only object type currently supported).  The
@@ -85,7 +85,7 @@ The ``SetObjectType()`` routine sets the underlying matrix object type to
 ready to be set.  This routine may or may not involve the allocation of memory
 for the coefficient data, depending on the implementation.  The optional
 ``SetRowSizes()`` and ``SetDiagOffdSizes()`` routines mentioned later in this
-chapter and in the Reference Manual, should be called before this step.
+chapter and in Chapter :ref:`ch-API`, should be called before this step.
 
 The ``SetValues()`` routine sets matrix values for some number of rows
 (``nrows``) and some number of columns in each row (``ncols``).  The actual row
diff --git a/external/hypre/src/docs/usr-manual/ch-intro.rst b/external/hypre/src/docs/usr-manual/ch-intro.rst
index f343ee65..d14568fc 100644
--- a/external/hypre/src/docs/usr-manual/ch-intro.rst
+++ b/external/hypre/src/docs/usr-manual/ch-intro.rst
@@ -1,4 +1,4 @@
-.. Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+.. Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
    HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 
    SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -83,15 +83,16 @@ Getting More Information
 ==============================================================================
 
 This user's manual consists of chapters describing each conceptual interface, a
-chapter detailing the various linear solver options available, and detailed
-installation information.  In addition to this manual, a number of other
-information sources for hypre are available.
+chapter detailing the various linear solver options available, detailed
+installation information, and the API reference.  In addition to this manual, a
+number of other information sources for hypre are available.
 
-* **Reference Manual:** The reference manual comprehensively lists all of the
-  interface and solver functions available in hypre.  The reference manual is
-  ideal for determining the various options available for a particular solver or
-  for viewing the functions provided to describe a problem for a particular
-  interface.
+* **Reference Manual:** This is equivalent to Chapter :ref:`ch-API` in this user
+  manual, but it can also be built as a separate document.  The reference manual
+  comprehensively lists all of the interface and solver functions available in
+  hypre.  It is ideal for determining the various options available for a
+  particular solver or for viewing the functions provided to describe a problem
+  for a particular interface.
 
 * **Example Problems:** A suite of example problems is provided with the hypre
   installation.  These examples reside in the ``examples`` subdirectory and
@@ -121,19 +122,24 @@ How to get started
 Installing hypre
 ------------------------------------------------------------------------------
 
-As previously noted, on most systems hypre can be built by simply typing
-``configure`` followed by ``make`` in the top-level source directory.
-Alternatively, the CMake system [CMakeWeb]_ can be used, and is the best
-approach for building hypre on Windows systems in particular.  For more detailed
-instructions, read the ``INSTALL`` file provided with the hypre distribution or
-refer to the last chapter in this manual.  Note the following requirements:
+As previously noted, on most systems hypre can be built by typing
+``./configure`` followed by ``make`` in the top-level source directory.
+Alternatively, `CMake <https://cmake.org/>`_ can be used and is the recommended
+method for building hypre on Windows. For more detailed instructions, refer to
+the `INSTALL <https://github.com/hypre-space/hypre/blob/master/INSTALL.md>`_ file
+provided in the hypre distribution or see the :ref:`ch-General` section of this manual.
 
-* To run in parallel, hypre requires an installation of MPI.
+.. note::
 
-* Configuration of hypre with threads requires an implementation of OpenMP.
-  Currently, only a subset of hypre is threaded.
+   * To run in parallel, hypre requires an installation of MPI.
 
-* The hypre library currently does not directly support complex-valued systems.
+   * Configuration of hypre with threads requires an implementation of OpenMP.
+     Currently, only a subset of hypre is threaded.
+
+   * To run on GPUs, hypre must be configured with support for the appropriate GPU toolkit.
+     Available options are CUDA for NVIDIA GPUs, HIP for AMD GPUs, and SYCL for Intel GPUs.
+
+   * The hypre library currently does not directly support complex-valued systems.
 
 
 .. _choosing-interface:
@@ -147,12 +153,12 @@ represent the way that applications developers naturally think of their linear
 problem and to provide natural interfaces for them to pass the data that defines
 their linear system into hypre.  Essentially, these conceptual interfaces can be
 considered convenient utilities for helping a user build a matrix data structure
-for hypre solvers and preconditioners.  The top row of :ref:`fig-ls-interface`
+for hypre solvers and preconditioners.  The top row of :numref:`fig-ls-interface`
 illustrates a number of conceptual interfaces.  Generally, the conceptual
 interfaces are denoted by different types of computational grids, but other
 application features might also be used, such as geometrical information.  For
 example, applications that use structured grids (such as in the left-most
-interface in :ref:`fig-ls-interface`) typically view their linear problems in
+interface in :numref:`fig-ls-interface`) typically view their linear problems in
 terms of stencils and grids.  On the other hand, applications that use
 unstructured grids and finite elements typically view their linear problems in
 terms of elements and element stiffness matrices. Finally, the right-most
@@ -194,36 +200,31 @@ application.
   for building matrices in particular formats, find the IJ interface relatively
   easy to use. See Chapter :ref:`ch-IJ` for details.
 
-.. _fig-ls-interface:
-
-.. figure:: figConcepIface.*
+.. figure:: figConcepIface.svg
    :align: center
+   :name: fig-ls-interface
 
-   Figure 1
-
-   Graphic illustrating the notion of conceptual linear system interfaces.
+   : Graphic illustrating the notion of conceptual linear system interfaces.
 
 Generally, a user should choose the most specific interface that matches their
-application, because this will allow them to use specialized and more efficient
-solvers and preconditioners without losing access to more general solvers.  For
-example, the second row of Figure :ref:`fig-ls-interface` is a set of linear
-solver algorithms.  Each linear solver group requires different information from
-the user through the conceptual interfaces.  So, the geometric multigrid
-algorithm (GMG) listed in the left-most box, for example, can only be used with
-the left-most conceptual interface.  On the other hand, the ILU algorithm in the
-right-most box may be used with any conceptual interface.  Matrix requirements
-for each solver and preconditioner are provided in Chapter :ref:`ch-Solvers` and
-in the hypre Reference Manual.  Your desired solver strategy may influence your
-choice of conceptual interface.  A typical user will select a single Krylov
-method and a single preconditioner to solve their system.
-
-The third row of Figure :ref:`fig-ls-interface` is a list of data layouts or
-matrix/vector storage schemes.  The relationship between linear solver and
-storage scheme is similar to that of the conceptual interface and linear solver.
-Note that some of the interfaces in hypre currently only support one
-matrix/vector storage scheme choice.  The conceptual interface, the desired
-solvers and preconditioners, and the matrix storage class must all be
-compatible.
+application, because this will allow them to use specialized and more efficient solvers
+and preconditioners without losing access to more general solvers.  For example, the
+second row of :numref:`fig-ls-interface` is a set of linear solver algorithms.  Each linear
+solver group requires different information from the user through the conceptual
+interfaces.  So, the geometric multigrid algorithm (GMG) listed in the left-most box, for
+example, can only be used with the left-most conceptual interface. On the other hand, the
+ILU algorithm in the right-most box may be used with any conceptual interface.  Matrix
+requirements for each solver and preconditioner are provided in Chapter :ref:`ch-Solvers`
+and in Chapter :ref:`ch-API`. Your desired solver strategy may influence your choice of
+conceptual interface.  A typical user will select a single Krylov method and a single
+preconditioner to solve their system.
+
+The third row of :numref:`fig-ls-interface` is a list of data layouts or matrix/vector
+storage schemes. The relationship between linear solver and storage scheme is similar to
+that of the conceptual interface and linear solver.  Note that some of the interfaces in
+hypre currently only support one matrix/vector storage scheme choice. The conceptual
+interface, the desired solvers and preconditioners, and the matrix storage class must all
+be compatible.
 
 
 .. _writing-your-code:
@@ -234,7 +235,7 @@ Writing your code
 As discussed in the previous section, the following decisions should be made
 before writing any code:
 
-* Choose a conceptual interface. 
+* Choose a conceptual interface.
 * Choose your desired solver strategy.
 * Look up matrix requirements for each solver and preconditioner.
 * Choose a matrix storage class that is compatible with your solvers and
@@ -266,7 +267,6 @@ demonstrate the following general structure of the application calls to hypre:
 
 The subsequent chapters of this User's Manual provide the details needed to more
 fully understand the function of each conceptual interface and each solver.
-Remember that a comprehensive list of all available functions is provided in the
-hypre Reference Manual, and the provided example codes may prove helpful as
+Remember that a comprehensive list of all available functions is provided in
+Chapter :ref:`ch-API`, and the provided example codes may prove helpful as
 templates for your specific application.
-
diff --git a/external/hypre/src/docs/usr-manual/ch-misc.rst b/external/hypre/src/docs/usr-manual/ch-misc.rst
index 27741cc7..2cfec760 100644
--- a/external/hypre/src/docs/usr-manual/ch-misc.rst
+++ b/external/hypre/src/docs/usr-manual/ch-misc.rst
@@ -1,4 +1,4 @@
-.. Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+.. Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
    HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 
    SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -10,44 +10,60 @@
 General Information
 ******************************************************************************
 
+In this and the following sections, we discuss how to obtain and build hypre,
+interpret error flags, report bugs, and call hypre from different programming languages.
+We provide instructions for two build systems: autotools (configure & make) and CMake.
+While autotools is traditionally used on Unix-like systems (Linux, macOS, etc.),
+CMake provides cross-platform support and is required for Windows builds.
+Both systems are actively maintained and supported.
+
+.. _getting-source:
 
 Getting the Source Code
 ==============================================================================
 
-The hypre distribution tar file is available from the Software link of the hypre
-web page, http://www.llnl.gov/CASC/hypre/.  The hypre Software distribution page
-allows access to the tar files of the latest and previous general and beta
-distributions as well as documentation.
+There are two ways to obtain hypre:
+
+1. **Clone from GitHub (recommended)**::
+
+      git clone https://github.com/hypre-space/hypre.git
+      cd hypre/src
+
+2. **Download a Release**
+
+   Download the latest release from our `GitHub releases page <https://github.com/hypre-space/hypre/releases>`_.
+   After extracting the archive, you'll find the source code in the ``src`` directory::
 
+      tar -xvf hypre-x.y.z.tar.gz
+      cd hypre-x.y.z/src
+
+   where ``x.y.z`` represents the version number (e.g., 2.29.0).
 
 Building the Library
 ==============================================================================
 
-In this and the following several sections, we discuss the steps to install and
-use hypre on a Unix-like operating system, such as Linux, AIX, and Mac OS X.
-Alternatively, the CMake build system [CMakeWeb]_ can be used, and is the best
-approach for building hypre on Windows systems in particular (see the
-``INSTALL`` file for details).
+After obtaining the source code (see :ref:`getting-source`), there are three main ways to build hypre:
 
-After unpacking the hypre tar file, the source code will be in the ``src``
-sub-directory of a directory named hypre-VERSION, where VERSION is the current
-version number (e.g., hypre-1.8.4, with a "b" appended for a beta release).
+1. Using autotools (Configure & Make)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Move to the ``src`` sub-directory to build hypre for the host platform.  The
-simplest method is to configure, compile and install the libraries in
-``./hypre/lib`` and ``./hypre/include`` directories, which is accomplished by:
+The simplest method is to use the traditional configure and make:
 
 .. code-block:: bash
 
-   ./configure
-   make
+   cd ${HYPRE_HOME}/src   # Move to the source directory
+   ./configure            # Configure the build system
+   make -j 4              # Use threads for a faster parallel build
+   make install           # (Optional) Install hypre on a user-specified path via --prefix=<path>
+
+This will build and install hypre in the default locations:
 
-NOTE: when executing on an IBM platform ``configure`` must be executed under the
-nopoe script (``./nopoe ./configure <option> ...<option>``) to force a single
-task to be run on the log-in node.
+   - Libraries: ``${HYPRE_HOME}/src/hypre/lib``
+   - Headers: ``${HYPRE_HOME}/src/hypre/include``
 
 There are many options to ``configure`` and ``make`` to customize such things as
-installation directories, compilers used, compile and load flags, etc.
+installation directories, compilers used, compile and load flags, etc. For more
+information on the configure options, see :ref:`build_options`.
 
 Executing ``configure`` results in the creation of platform specific files that
 are used when building the library. The information may include such things as
@@ -56,7 +72,6 @@ libraries being searched, option flags being set, etc.  When all of the
 searching is done two files are left in the ``src`` directory; ``config.status``
 contains information to recreate the current configuration and ``config.log``
 contains compiler messages which may help in debugging ``configure`` errors.
-
 Upon successful completion of ``configure`` the file ``config/Makefile.config``
 is created from its template ``config/Makefile.config.in`` and hypre is ready to
 be built.
@@ -65,70 +80,415 @@ Executing ``make``, with or without targets being specified, in the ``src``
 directory initiates compiling of all of the source code and building of the
 hypre library.  If any errors occur while compiling, the user can edit the file
 ``config/Makefile.config`` directly then run ``make`` again; without having to
-re-run configure.
+re-run configure. When building hypre without the install target, the libraries
+and include files will be copied into the default directories, ``src/hypre/lib`` and
+``src/hypre/include``, respectively. When building hypre using the install target,
+the libraries and include files will be copied into the directories that the user
+specified in the options to ``configure``, e.g. ``--prefix=/usr/apps``. If none were
+specified the default directories, ``src/hypre/lib`` and ``src/hypre/include``, are used.
 
-When building hypre without the install target, the libraries and include files
-will be copied into the default directories, ``src/hypre/lib`` and
-``src/hypre/include``, respectively.
+2. Using CMake (Windows, macOS, Linux, etc.)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-When building hypre using the install target, the libraries and include files
-will be copied into the directories that the user specified in the options to
-``configure``, e.g. ``--prefix=/usr/apps``.  If none were specified the default
-directories, ``src/hypre/lib`` and ``src/hypre/include``, are used.
+CMake provides a modern, platform-independent build system. When using CMake to build hypre,
+several files and directories are created during the build process:
 
-.. _config_options:
+* ``CMakeCache.txt`` - Stores configuration options and settings
+* ``CMakeFiles/`` - Contains intermediate build files and dependency information
+* ``cmake_install.cmake`` - Instructions for installing the built library
+* ``Makefile`` - Generated build instructions (on Unix-like systems)
 
-Configure Options
-------------------------------------------------------------------------------
+The build process has three main steps:
 
-There are many options to ``configure`` to allow the user to override and refine
-the defaults for any system. The best way to find out what options are available
-is to display the help package, by executing ``./configure --help``, which also
-includes the usage information.  The user can mix and match the configure
-options and variable settings to meet their needs.
+1. **Configure**: CMake reads the CMakeLists.txt files and generates the build system
+2. **Build**: The native build tool (make, Visual Studio, etc.) compiles the code
+3. **Install**: Built libraries and headers are copied to their final location
 
-Some of the commonly used options include:
+The simplest way to build hypre using CMake is:
 
-.. code-block:: none
+.. code-block:: bash
+
+   cd ${HYPRE_HOME}/build      # Use a separate build directory to keep source clean
+   cmake ../src                # Generate build system
+   make -j                     # Build the library in parallel
+   make install                # (Optional) Install to specified location via -DCMAKE_INSTALL_PREFIX=<path>
+
+During the configure step, CMake will detect your compiler and build tools,
+it will find required dependencies, set up platform-specific build flags, and
+generate native build files. If any errors occur during configuration, check
+``CMakeCache.txt`` for current settings and ``CMakeFiles/CMakeError.log`` for
+detailed error messages. The build step will create:
+
+   - Static library: ``libHYPRE.a`` (Unix/macOS) or ``HYPRE.lib`` (Windows)
+   - Shared library: ``libHYPRE.so`` (Linux), ``libHYPRE.dylib`` (macOS),
+     or ``HYPRE.dll`` (Windows) if enabled
+   - Object files in ``CMakeFiles/`` subdirectories
+
+By default, ``make`` will place the library file in ``${HYPRE_HOME}/src/hypre/lib`` and
+the header files in ``${HYPRE_HOME}/src/hypre/include``. As with the autotools method,
+hypre's CMake build provides several options. For more information, see :ref:`build_options`.
+
+.. note::
+
+   CMake GUI (``ccmake`` or ``cmake-gui``) provides an interactive way to change build options:
+
+   - **Unix**: From the ``${HYPRE_HOME}/build`` directory:
+
+     1. Run ``ccmake ../src``
+     2. Change options:
+        - Press Enter to modify a variable
+        - Boolean options (ON/OFF) toggle with Enter
+        - String/file options allow text editing
+     3. Press 'c' to configure
+     4. Repeat until satisfied
+     5. Press 'g' to generate
 
-   --enable-debug                 Sets compiler flags to generate information
-                                  needed for debugging.
-   --enable-shared                Build shared libraries.
-                                  NOTE: in order to use the resulting shared
-                                        libraries the user MUST have the path to
-                                        the libraries defined in the environment
-                                        variable LD_LIBRARY_PATH.
-   --with-print-errors            Print HYPRE errors
-   --with-openmp                  Use OpenMP. This may affect which compiler is
-                                  chosen.
-   --enable-bigint                Use long long int for HYPRE_Int (default is NO).
-   --enable-mixedint              Use long long int for HYPRE_BigInt and int for
-                                  HYPRE_Int.
-                                  NOTE: This option disables Euclid, ParaSails,
-                                        pilut and CGC coarsening.
-
-The user can mix and match the configure options and variable settings to meet
-their needs.  It should be noted that hypre can be configured with external BLAS
-and LAPACK libraries, which can be combined with any other option.  This is done
-as follows (currently, both libraries must be configured as external together):
+   - **Windows**: Using Visual Studio:
+
+     1. Change desired options
+     2. Click "Configure"
+     3. Click "Generate"
+
+3. Using Spack (Recommended for HPC environments)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+`Spack <https://spack.io/>`_  is a package manager designed for supercomputers, Linux, and macOS.
+It makes installing scientific software easy and handles dependencies automatically. To build hypre using Spack:
 
 .. code-block:: bash
 
-   ./configure  --with-blas-lib="blas-lib-name" \
-                --with-blas-lib-dirs="path-to-blas-lib" \
-                --with-lapack-lib="lapack-lib-name" \
-                --with-lapack-lib-dirs="path-to-lapack-lib"
+   # Install Spack if you haven't already
+   git clone -c feature.manyFiles=true --depth=2 https://github.com/spack/spack.git
+   . spack/share/spack/setup-env.sh
+
+   # Install hypre with default options
+   spack install hypre
+
+   # Or install with specific options (e.g., with CUDA support)
+   spack install hypre+cuda
 
-The output from ``configure`` is several pages long.  It reports the system type
-being used for building and executing, compilers being used, libraries being
-searched, option flags being set, etc.
+Common Spack variants for hypre include:
+
+* ``+mpi`` / ``~mpi`` - Enable/disable MPI support (default: +mpi)
+* ``+cuda`` / ``~cuda`` - Enable/disable CUDA support (default: ~cuda)
+* ``+openmp`` / ``~openmp`` - Enable/disable OpenMP support (default: ~openmp)
+* ``+shared`` / ``~shared`` - Build shared libraries (default: ~shared)
+* ``+debug`` / ``~debug`` - Build with debug flags (default: ~debug)
+
+To see all available build options:
+
+.. code-block:: bash
 
+   spack info hypre
+
+.. note::
+
+   Spack will automatically handle dependencies and choose appropriate versions based on
+   your system and requirements. It's particularly useful in HPC environments where you
+   need to manage multiple versions or build configurations of hypre and its dependencies.
+
+.. _build_options:
+
+Build System Options
+==============================================================
+
+The table below lists the most commonly used build options for both autotools and CMake build systems.
+Each option is shown with its default value (if applicable) and any relevant platform restrictions.
+For GPU-specific options, see the :ref:`gpu_build` section below.
+
+.. list-table:: Build Configuration Options
+   :header-rows: 1
+   :widths: 20 40 40
+
+   * - Feature
+     - Autotools (configure)
+     - CMake
+   * - Install Path
+     - ``--prefix=<path>``
+     - ``-DCMAKE_INSTALL_PREFIX=<path>``
+   * - | Debug Build
+       | (default is off)
+     - ``--enable-debug``
+     - ``-DCMAKE_BUILD_TYPE=Debug``
+   * - | Print Errors
+       | (default is off)
+     - ``--with-print-errors``
+     - ``-DHYPRE_ENABLE_PRINT_ERRORS=ON``
+   * - | Shared Library
+       | (default is off)
+     - ``--enable-shared``
+     - ``-DBUILD_SHARED_LIBS=ON``
+   * - | 64-bit integers
+       | (default is off,
+       | no GPU support)
+     - ``--enable-bigint``
+     - ``-DHYPRE_ENABLE_BIGINT=ON``
+   * - | Mixed 32/64-bit integers
+       | (default is off)
+     - ``--enable-mixedint``
+     - ``-DHYPRE_ENABLE_MIXEDINT=ON``
+   * - | Single FP precision
+       | (default is off)
+     - ``--enable-single``
+     - ``-DHYPRE_ENABLE_SINGLE=ON``
+   * - | Long double precision
+       | (default is off,
+       | no GPU support)
+     - ``--enable-long-double``
+     - ``-DHYPRE_ENABLE_LONG_DOUBLE=ON``
+   * - | Link-time optimization
+       | (default is off)
+     - N/A
+     - ``-DHYPRE_ENABLE_LTO=ON``
+   * - | MPI Support
+       | (default is on)
+     - ``--enable-mpi``
+     - ``-DHYPRE_ENABLE_MPI=ON``
+   * - | MPI Persistent
+       | (default is off)
+     - ``--enable-persistent``
+     - ``-DHYPRE_ENABLE_PERSISTENT_COMM=ON``
+   * - | OpenMP Support
+       | (default is off)
+     - ``--with-openmp``
+     - ``-DHYPRE_ENABLE_OPENMP=ON``
+   * - | Hopscotch hashing
+       | (requires OpenMP)
+       | (default is off)
+     - ``--enable-hopscotch``
+     - ``-DHYPRE_ENABLE_HOPSCOTCH=ON``
+   * - | Fortran Support
+       | (default is on)
+     - ``--enable-fortran``
+     - ``-DHYPRE_ENABLE_FORTRAN=ON``
+   * - | Fortran mangling
+       | (default is 0)
+       | (values are 0...5)
+     - ``--with-fmangle``
+     - ``-DHYPRE_ENABLE_FMANGLE=0``
+   * - | Fortran BLAS mangling
+       | (default is 0)
+       | (values are 0...5)
+     - ``--with-fmangle-blas``
+     - ``-DHYPRE_ENABLE_FMANGLE_BLAS=0``
+   * - | Fortran LAPACK mangling
+       | (default is 0)
+       | (values are 0...5)
+     - ``--with-fmangle-lapack``
+     - ``-DHYPRE_ENABLE_FMANGLE_LAPACK=0``
+   * - | External BLAS
+       | (default is off)
+     - | ``--with-blas-lib=<lib>``
+       | ``--with-blas-lib-dirs=<path>``
+     - ``-DHYPRE_ENABLE_HYPRE_BLAS=OFF``
+   * - | External LAPACK
+       | (default is off)
+     - | ``--with-lapack-lib=<lib>``
+       | ``--with-lapack-lib-dirs=<path>``
+     - ``-DHYPRE_ENABLE_HYPRE_LAPACK=OFF``
+   * - | SuperLU_DIST Support
+       | (default is off)
+     - ``--with-dsuperlu``
+     - ``-DHYPRE_ENABLE_DSUPERLU=ON``
+   * - | MAGMA Support
+       | (default is off)
+     - ``--with-magma``
+     - ``-DHYPRE_ENABLE_MAGMA=ON``
+   * - | Caliper Support
+       | (default is off)
+     - ``--with-caliper``
+     - ``-DHYPRE_ENABLE_CALIPER=ON``
+   * - Build Examples
+     - N/A
+     - ``-DHYPRE_BUILD_EXAMPLES=ON``
+   * - Build Tests
+     - N/A
+     - ``-DHYPRE_BUILD_TESTS=ON``
+
+.. note::
+
+   * CMake options are case-sensitive
+   * Boolean CMake options accept ``ON``/``OFF`` values
+   * Executables located under ``src/test`` and ``src/examples``
+     are built separately when using the autotools build system
+   * For a complete list of options:
+
+     * **Autotools**: Run ``./configure --help``
+     * **CMake**: See ``CMakeLists.txt`` or run ``cmake -LAH``
+   * For third-party libraries (TPLs), hypre supports two methods:
+
+     1. **CMake Package Config (recommended)**:
+        Use ``-DPackage_ROOT=/path/to/package`` to help CMake find package
+        configuration files
+
+     2. **Manual specification**:
+
+        a. **Autotools**:
+
+           .. code-block:: bash
+
+              --with-pkg-include=/path/to/pkg-include
+              --with-pkg-lib=/path/to/pkg-lib
+
+        b. **CMake**:
+
+           .. code-block:: bash
+
+              -DTPL_PACKAGE_INCLUDE_DIRS=/path/to/pkg-include
+              -DTPL_PACKAGE_LIBRARIES=/path/to/pkg-lib/libpackage.so
+
+.. _gpu_build:
+
+GPU Build Options
+==============================================================
+
+The hypre library provides support for multiple GPU architectures through different
+programming models: CUDA (for NVIDIA GPUs), HIP (for AMD GPUs), and SYCL (for Intel
+GPUs). Each model has its own set of build options and requirements. Some solvers and
+features may have different levels of support across these platforms. Key considerations
+when building for GPUs are:
+
+1. Only one GPU backend can be enabled at a time (CUDA, HIP, or SYCL)
+2. Some features like full support for 64-bit integers (`BigInt`) are not available
+3. Memory management options (device vs unified memory) affect solver availability
+
+The table below lists the available GPU-specific build options for both autotools and CMake
+build systems.
+
+.. list-table:: GPU Configuration Options
+   :header-rows: 1
+   :widths: 20 40 40
+
+   * - Feature
+     - Autotools (configure)
+     - CMake
+   * - | CUDA Support
+       | (default is off)
+     - ``--with-cuda``
+     - ``-DHYPRE_ENABLE_CUDA=ON``
+   * - | HIP Support
+       | (default is off)
+     - ``--with-hip``
+     - ``-DHYPRE_ENABLE_HIP=ON``
+   * - | SYCL Support
+       | (default is off)
+     - ``--with-sycl``
+     - ``-DHYPRE_ENABLE_SYCL=ON``
+   * - | SYCL Target
+       | (default is empty,
+       | **SYCL** only)
+     - ``--with-sycl-target=ARG``
+     - ``-DHYPRE_SYCL_TARGET=ARG``
+   * - | SYCL Target Backend
+       | (default is empty,
+       | **SYCL** only)
+     - ``--with-sycl-target-backend=ARG``
+     - ``-DHYPRE_SYCL_TARGET_BACKEND=ARG``
+   * - | GPU architecture
+       | (determined automatically)
+     - ``--with-gpu-arch=ARG``
+     - | ``-DCMAKE_CUDA_ARCHITECTURES=ARG``
+       | ``-DCMAKE_HIP_ARCHITECTURES=ARG``
+   * - | GPU Profiling
+       | (default is off)
+     - ``--enable-gpu-profiling``
+     - ``-DHYPRE_ENABLE_GPU_PROFILING=ON``
+   * - | GPU-aware MPI
+       | (default is off)
+     - ``--enable-gpu-aware-mpi``
+     - ``-DHYPRE_ENABLE_GPU_AWARE_MPI=ON``
+   * - | Unified Memory
+       | (default is off)
+     - ``--enable-unified-memory``
+     - ``-DHYPRE_ENABLE_UNIFIED_MEMORY=ON``
+   * - | Device async malloc
+       | (default is off)
+     - ``--enable-device-malloc-async``
+     - ``-DHYPRE_ENABLE_DEVICE_MALLOC_ASYNC=ON``
+   * - | Thrust async execution
+       | (default is off)
+     - ``--enable-thrust-async``
+     - ``-DHYPRE_ENABLE_THRUST_ASYNC=ON``
+   * - | cuSPARSE Support
+       | (default is on, **CUDA** only)
+     - ``--enable-cusparse``
+     - ``-DHYPRE_ENABLE_CUSPARSE=ON``
+   * - | cuSOLVER Support
+       | (default is on, **CUDA** only)
+     - ``--enable-cusolver``
+     - ``-DHYPRE_ENABLE_CUSOLVER=ON``
+   * - | cuBLAS Support
+       | (default is on, **CUDA** only)
+     - ``--enable-cublas``
+     - ``-DHYPRE_ENABLE_CUBLAS=ON``
+   * - | cuRAND Support
+       | (default is on, **CUDA** only)
+     - ``--enable-curand``
+     - ``-DHYPRE_ENABLE_CURAND=ON``
+   * - | rocSPARSE Support
+       | (default is on, **HIP** only)
+     - ``--enable-rocsparse``
+     - ``-DHYPRE_ENABLE_ROCSOLVER=ON``
+   * - | rocSOLVER Support
+       | (default is on, **HIP** only)
+     - ``--enable-rocsolver``
+     - ``-DHYPRE_ENABLE_ROCSOLVER=ON``
+   * - | rocBLAS Support
+       | (default is on, **HIP** only)
+     - ``--enable-rocblas``
+     - ``-DHYPRE_ENABLE_ROCBLAS=ON``
+   * - | rocRAND Support
+       | (default is on, **HIP** only)
+     - ``--enable-rocrand``
+     - ``-DHYPRE_ENABLE_ROCRAND=ON``
+   * - | oneMKLSparse Support
+       | (default is on, **SYCL** only)
+     - ``--enable-onemklsparse``
+     - ``-DHYPRE_ENABLE_ONEMKLSPARSE=ON``
+   * - | oneMKLBLAS Support
+       | (default is on, **SYCL** only)
+     - ``--enable-onemklblas``
+     - ``-DHYPRE_ENABLE_ONEMKLBLAS=ON``
+   * - | oneMKLRAND Support
+       | (default is on, **SYCL** only)
+     - ``--enable-onemklrand``
+     - ``-DHYPRE_ENABLE_ONEMKLRAND=ON``
+   * - | Umpire Support
+       | (default is off)
+     - ``--with-umpire``
+     - ``-DHYPRE_ENABLE_UMPIRE=ON``
+   * - | Umpire Unified Memory
+       | (default is off)
+     - ``--with-umpire-um``
+     - ``-DHYPRE_ENABLE_UMPIRE_UM=ON``
+   * - | Umpire Device Memory
+       | (default is off)
+     - ``--with-umpire-device``
+     - ``-DHYPRE_ENABLE_UMPIRE_DEVICE=ON``
+
+.. warning::
+
+   Allocations and deallocations of GPU memory can be slow. Memory pooling is a
+   common approach to reduce such overhead and improve performance. We recommend using
+   [Umpire]_ for memory management, which provides robust pooling capabilities for both
+   device and unified memory. For Umpire support, the Umpire library must be installed
+   and properly configured. See the note in the previous section for more details on
+   how to specify the installation path for dependency libraries.
+
+.. note::
+
+   When hypre is configured with device support, but without unified memory, the
+   memory allocated on the GPUs, by default, is the GPU device memory, which is
+   not accessible from the CPUs. Hypre's structured solvers can run with device
+   memory, whereas only selected unstructured solvers can run with device memory.
+   See :ref:`ch-boomeramg-gpu` for details. Some solver options for BoomerAMG
+   require unified (managed) memory.
 
 Make Targets
-------------------------------------------------------------------------------
+=====================
 
 The make step in building hypre is where the compiling, loading and creation of
-libraries occurs.  Make has several options that are called targets.  These
+libraries occurs. Make has several options that are called targets. These
 include:
 
 .. code-block:: none
@@ -140,13 +500,13 @@ include:
                 does NOT rebuild documentation
 
    clean        deletes all files from the current directory that are
-                   created by building the library
+                created by building the library
 
    distclean    deletes all files from the current directory that are created
-                   by configuring or building the library
+                by configuring or building the library
 
    install      compile the source code, build the library and copy executables,
-                    libraries, etc to the appropriate directories for user access
+                libraries, etc to the appropriate directories for user access
 
    uninstall    deletes all files that the install target created
 
@@ -158,136 +518,185 @@ include:
                 creates temporary installation directories
                 copies all libHYPRE* and *.h files to the temporary locations
                 builds the test drivers; linking to the temporary locations to
-                   simulate how application codes will link to HYPRE
+                simulate how application codes will link to HYPRE
 
-GPU build
-------------------------------------------------------------------------------
+Using the Library
+=================
 
-Hypre can support NVIDIA GPUs with CUDA and OpenMP (:math:`{\ge}` 4.5). The related ``configure`` options are
+The ``examples`` subdirectory contains several codes that demonstrate hypre's features
+and can be used to test the library. These examples can be built in two ways:
 
-.. code-block:: none
+1. **Using CMake**:
+   Enable the ``HYPRE_BUILD_EXAMPLES`` option during configuration:
 
-  --with-cuda             Use CUDA. Require cuda-8.0 or higher (default is
-                          NO).
+   .. code-block:: bash
 
-  --with-device-openmp    Use OpenMP 4.5 Device Directives. This may affect
-                          which compiler is chosen.
+      cmake -DHYPRE_BUILD_EXAMPLES=ON ..
+      make
 
-The related environment variables
+2. **Using Makefiles**:
+   Navigate to the ``examples`` subdirectory and build directly:
 
-.. code-block:: none
+   .. code-block:: bash
 
-   HYPRE_CUDA_SM          (default 70)
+      cd examples
+      make
 
-   CUDA_HOME              the CUDA home directory
+Each example contains detailed comments at the beginning of its source file explaining
+its purpose and how to run it. The examples demonstrate various interfaces, solvers,
+and problem types. For a categorized list of examples and their features, see the
+HTML documentation in the ``examples/docs`` directory.
 
-need to be set properly, which can be also set by
+.. note::
 
-.. code-block:: none
+   The examples are designed to mimic real application codes and can serve as
+   templates for your own implementations.
+
+Testing the Library
+===================
 
-   --with-gpu-arch=ARG    (e.g., --with-gpu-arch='60 70')
+hypre provides several approaches to test the library, in increasing order of comprehensiveness:
 
-   --with-cuda-home=DIR
+1. **Basic Tests** (Recommended first step):
+   Quick tests to check library functionality (CMake requires ``-DBUILD_TESTING=ON``):
 
-When configured with ``--with-cuda`` or ``--with-device-openmp``, the memory allocated on the GPUs, by default, is the GPU device memory, which is not accessible from the CPUs.
-Hypre's structured solvers can work fine with device memory,
-whereas only selected unstructured solvers can run with device memory. See 
-Chapter :ref:`ch-boomeramg-gpu` for details.
-In general, BoomerAMG and the SStruct
-require  unified (CUDA managed) memory, for which
-the following option should be added
+   .. code-block:: bash
 
-.. code-block:: none
+      # Single test for each linear system interface
+      make check
 
-  --enable-unified-memory Use unified memory for allocating the memory
-                          (default is NO).
+      # Test IJ, Struct and SStruct linear solvers in parallel
+      make checkpar
 
-Hypre's Struct solvers can also choose RAJA and Kokkos as the backend.
-The ``configure`` options are
+2. **Comprehensive Tests** (CMake only):
+   Test linear solvers for all linear system interfaces (linear-algebraic, Struct and SStruct):
 
-.. code-block:: none
+   .. code-block:: bash
 
-  --with-raja             Use RAJA. Require RAJA package to be compiled
-                          properly (default is NO).
+      cmake -DBUILD_TESTING=ON ..
+      make -j
+      make test # or ctest
 
-  --with-kokkos           Use Kokkos. Require kokkos package to be compiled
-                          properly(default is NO).
+3. **Automated Testing** (Developers only):
+   For thorough testing across different configurations and machines including regression
+   tests, and performance benchmarks, with support for both CPU and GPU executions. Test
+   results are automatically compared against saved baseline outputs, with the ability to
+   update these baselines when legitimate changes occur. The automated testing
+   infrastructure is particularly focused on ensuring consistency across different build
+   configurations and execution environments. For more information, see the `README
+   <https://github.com/hypre-space/hypre/blob/master/AUTOTEST/README.txt>`_ file.
 
-To run on the GPUs with RAJA and Kokkos, the options ``--with-cuda`` and ``--with-device-openmp`` are also needed,
-and the RAJA and Kokkos libraries should be built with CUDA or OpenMP 4.5 correspondingly.
+.. note::
 
-The other NVIDIA GPU related options include:
+   * Test tolerance can be adjusted using ``-DHYPRE_CHECK_TOL=<value>`` during CMake configuration. Default tolerance is 1.0e-6
+   * Test output files with ``.err`` extension contain error messages and diagnostics
+   * AUTOTEST configurations can be customized by modifying machine-specific files in the AUTOTEST directory
 
-* ``--enable-gpu-profiling``  Use NVTX on CUDA, rocTX on HIP (default is NO)
-* ``--enable-cusparse``       Use cuSPARSE for GPU sparse kernels (default is YES)
-* ``--enable-cublas``         Use cuBLAS for GPU dense kernels (default is NO)
-* ``--enable-curand``         Use random numbers generators on GPUs (default is YES)
+For detailed test results and logs:
 
-Allocations and deallocations of GPU memory are expensive. Memory pooling is a common approach to reduce such overhead and improve performance.
-hypre provides caching allocators for GPU device memory and unified memory, 
-enabled by
+* Make check results: ``build/test/*.err`` (CMake) or ``src/test/TEST_(ij|struct|ssstruct)/*.err`` (Autotools)
+* CTest results: ``build/Testing/Temporary/LastTest.log``
+* AUTOTEST results: ``src/AUTOTEST/machine_name.dir/machine_name.err``
 
-.. code-block:: none
+Linking to the Library
+==============================================================================
 
-  --enable-device-memory-pool  Enable the caching GPU memory allocator in hypre
-                               (default is NO)
+There are two main approaches to link your application with hypre:
 
+Using CMake
+^^^^^^^^^^^
 
-hypre also supports Umpire [Umpire]_. To enable Umpire pool, include the following options:
+The hypre library provides CMake configuration files that enable easy integration. Create a
+``CMakeLists.txt`` with:
 
-.. code-block:: none
+.. code-block:: cmake
 
-  --with-umpire                Use Umpire Allocator for device and unified memory
-                               (default is NO)
-  --with-umpire-include=/path-of-umpire-install/include
-  --with-umpire-lib-dirs=/path-of-umpire-install/lib
-  --with-umpire-libs=umpire
+   cmake_minimum_required(VERSION 3.21)
+   project(MyApp LANGUAGES C)
 
-For running on AMD GPUs, configure with
+   find_package(HYPRE REQUIRED)
 
-.. code-block:: none
+   add_executable(myapp main.c)
+   target_link_libraries(myapp PUBLIC HYPRE::HYPRE lm)
 
-  --with-hip              Use HIP for AMD GPUs. (default is NO)
-  --with-gpu-arch=ARG     Use appropriate AMD GPU architecture
+If hypre is not in a standard location, specify its path:
 
-Currently, only BoomerAMG is supported with HIP. The other AMD GPU related options include:
+.. code-block:: bash
 
-* ``--enable-gpu-profiling``  Use NVTX on CUDA, rocTX on HIP (default is NO)
-* ``--enable-rocsparse``      Use rocSPARSE (default is YES)
-* ``--enable-rocblas``        Use rocBLAS (default is NO)
-* ``--enable-rocrand``        Use rocRAND (default is YES)
+   cmake -DHYPRE_ROOT=/path/to/hypre-install-directory ..
 
-Testing the Library
-==============================================================================
+Using Autotools
+^^^^^^^^^^^^^^^
 
-The ``examples`` subdirectory contains several codes that can be used to test
-the newly created hypre library.  To create the executable versions, move into
-the ``examples`` subdirectory, enter ``make`` then execute the codes as
-described in the initial comments section of each source code.
+For non-CMake builds, manually specify compilation and linking flags:
 
+.. code-block:: bash
 
-Linking to the Library
-==============================================================================
+   # Compilation
+   -I${HYPRE_INSTALL_DIR}/include
+
+   # Linking
+   -L${HYPRE_INSTALL_DIR}/lib -lHYPRE -lm
+
+Where ``${HYPRE_INSTALL_DIR}`` is your hypre installation directory (default is ``${HYPRE_HOME}/src/hypre``,
+or as specified by ``--prefix=PREFIX`` during configuration).
+
+Shared Library Considerations
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+If hypre was built as a shared library, you have several options:
+
+1. **Environment Variables**:
+   Add hypre's library location to your system's library path:
+
+   .. code-block:: bash
+
+      # Linux/Unix
+      export LD_LIBRARY_PATH=${HYPRE_INSTALL_DIR}/lib:${LD_LIBRARY_PATH}
+
+      # macOS
+      export DYLD_LIBRARY_PATH=${HYPRE_INSTALL_DIR}/lib:${DYLD_LIBRARY_PATH}
 
-An application code linking with hypre must be compiled with
-``-I$PREFIX/include`` and linked with ``-L$PREFIX/lib -lHYPRE``, where
-``$PREFIX`` is the directory where hypre is installed, default is ``hypre``, or
-as defined by the configure option ``--prefix=PREFIX``. As noted above, if hypre
-was built as a shared library the user MUST have its location defined in the
-environment variable ``LD_LIBRARY_PATH``.
+      # Windows
+      set PATH=%HYPRE_INSTALL_DIR%\lib;%PATH%
 
-As an example of linking with hypre, a user may refer to the ``Makefile`` in the
-``examples`` sub-directory.  It is designed to build codes similar to user
-applications that link with and call hypre.  All include and linking flags are
-defined in the ``Makefile.config`` file by ``configure``.
+2. **RPATH/RUNPATH**:
+   Set the runtime search path during linking. With CMake:
 
+   .. code-block:: cmake
+
+      # Use RPATH (searched before LD_LIBRARY_PATH)
+      set(CMAKE_INSTALL_RPATH "${HYPRE_INSTALL_DIR}/lib")
+      set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+
+      # Or use RUNPATH (searched after LD_LIBRARY_PATH)
+      set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--enable-new-dtags")
+      set(CMAKE_INSTALL_RPATH "${HYPRE_INSTALL_DIR}/lib")
+      set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+
+   Or with manual linking:
+
+   .. code-block:: bash
+
+      # RPATH
+      -Wl,-rpath,${HYPRE_INSTALL_DIR}/lib
+
+      # RUNPATH
+      -Wl,--enable-new-dtags,-rpath,${HYPRE_INSTALL_DIR}/lib
+
+   ``RPATH`` is searched before ``LD_LIBRARY_PATH`` while ``RUNPATH`` is searched
+   after, giving you flexibility in controlling library resolution precedence.
+
+.. note::
+
+   For examples of linking applications with hypre, refer to the ``examples`` subdirectory.
 
 Error Flags
 ==============================================================================
 
 Every hypre function returns an integer, which is used to indicate errors
 during execution.  Note that the error flag returned by a given function
-reflects the errors from {\em all} previous calls to hypre functions.  In
+reflects the errors from *all* previous calls to hypre functions.  In
 particular, a value of zero means that all hypre functions up to (and
 including) the current one have completed successfully.  This new error flag
 system is being implemented throughout the library, but currently there are
@@ -344,27 +753,63 @@ The global error flag can be cleared manually by calling
 ``HYPRE_ClearAllErrors()``, which will essentially ignore all previous hypre
 errors. To only clear a specific error code, the user can call
 ``HYPRE_ClearError(HYPRE_ERROR_CODE)``.  Finally, if hypre was configured with
-``--with-print-errors``, additional error information will be printed to the
-standard error during execution.
+``--with-print-errors`` or ``-DHYPRE_ENABLE_PRINT_ERRORS=ON``, additional error
+information will be printed to the standard error during execution.
 
 
 Bug Reporting and General Support
 ==============================================================================
 
-Simply create an issue at ``https://github.com/hypre-space/hypre/issues`` to
-report bugs, request features, or ask general usage questions.
+For bug reports, feature requests, and general usage questions, please create an issue on
+`GitHub issues <https://github.com/hypre-space/hypre/issues>`_. You can also browse existing
+issues to see if your question has already been addressed. To help us address your issue
+effectively, please include:
 
-Users should include as much relevant information as possible in their issue
-report, including at a minimum, the hypre version number being used.  For
-compile and runtime problems, please also include the machine type, operating
-system, MPI implementation, compiler, and any error messages produced.
+**Required Information:**
 
+- hypre version number
+- Description of the problem or feature request
+- Minimal example demonstrating the issue (if applicable)
+
+**For Build Issues:**
+
+- Build system used (CMake or autotools)
+- Build configuration options
+- Complete build output showing the error
+- Operating system and version
+- Compiler and version
+- MPI implementation and version
+
+**For Runtime Issues:**
+
+- Command line arguments used
+- Problem size and configuration
+- Number of processes/threads
+- Complete error messages or stack traces
+- Information about the computing environment:
+
+  * GPU type and driver version (for GPU builds)
+  * Relevant environment variables
+  * System architecture (CPU type, memory)
+
+**For Performance Issues:**
+
+- Performance measurements or profiling data
+- Comparison with previous versions (if applicable)
+- Problem size and scaling information
+- Hardware configuration details
 
 .. _LSI_install:
 
 Using HYPRE in External FEI Implementations
 ==============================================================================
 
+.. warning::
+   FEI is not actively supported by the hypre development team. For similar
+   functionality, we recommend using :ref:`sec-Block-Structured-Grids-FEM`, which
+   allows the representation of block-structured grid problems via hypre's
+   SStruct interface.
+
 To set up hypre for use in external, e.g. Sandia's, FEI implementations one
 needs to follow the following steps:
 
diff --git a/external/hypre/src/docs/usr-manual/ch-references.rst b/external/hypre/src/docs/usr-manual/ch-references.rst
index 4446d877..bf18b8d0 100644
--- a/external/hypre/src/docs/usr-manual/ch-references.rst
+++ b/external/hypre/src/docs/usr-manual/ch-references.rst
@@ -1,4 +1,4 @@
-.. Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+.. Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
    HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 
    SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -137,6 +137,19 @@
    issue on Adaptive and Multilevel Methods in Electromagnetics.
    UCRL-JRNL-237306.
 
+.. [KoYe1993] L. Yu. Kolotilina and A. Yu. Yeremin. Factorized Sparse
+   Approximate Inverse Preconditionings I. Theory. *SIAM J. Matrix Anal. A.*, 14(1):45--58, 1993.
+   `https://doi.org/10.1137/0614004 <https://doi.org/10.1137/0614004>`_.
+
+.. [LiSY2021] R. Li, B. Sjogreen and U. M. Yang. A new class of AMG interpolation
+   methods based on matrix-matrix multiplications. *SIAM J. Sci. Comput.*, 43(5), 
+   S540--S564.
+
+.. [JaFe2015] C. Janna, M. Ferronato, F. Sartoretto and G. Gambolati.
+   FSAIPACK: A Software Package for High-Performance Factored Sparse Approximate Inverse
+   Preconditioning. *ACM T. Math. Software*, 41(2):1–-26, 2015.
+   `https://doi.org/10.1145/2629475 <https://doi.org/10.1145/2629475>`_.
+
 .. [JoLe2006] J. Jones and B. Lee.  A multigrid method for variable coefficient
    maxwell's equations.  *SIAM J. Sci. Comput.*, 27:1689--1708, 2006.
 
@@ -148,6 +161,11 @@
    support-operators diffusion discretization scheme for quadrilateral r-z
    meshes.  *J. Comp. Physics*, 144:17--51, 1998.
 
+.. [PaFa2019] V. A. Paludetto Magri, A. Franceschini and C. Janna. A novel algebraic
+   multigrid approach based on adaptive smoothing and prolongation for ill-conditioned
+   systems. *SIAM J. Sci. Comput.*, 41(1):A190--A219, 2019.
+   `https://doi.org/10.1137/17M1161178 <https://doi.org/10.1137/17M1161178>`_.
+
 .. [RuSt1987] J. W. Ruge and K. Stüben.  Algebraic multigrid (AMG).
    In S. F. McCormick, editor, *Multigrid Methods*, volume 3 of *Frontiers in
    Applied Mathematics*, pages 73--130. SIAM, Philadelphia, PA, 1987.
@@ -188,4 +206,3 @@
 .. [Yang2010] U. M. Yang.  On long range interpolation operators for aggressive
    coarsening.  *Numer. Linear Algebra Appl.*, 17:453--472, 2010.  Also
    available as LLNL technical report LLLNL-JRNL-417371.
-
diff --git a/external/hypre/src/docs/usr-manual/ch-solvers.rst b/external/hypre/src/docs/usr-manual/ch-solvers.rst
index f1ce8c23..c8c1abfd 100644
--- a/external/hypre/src/docs/usr-manual/ch-solvers.rst
+++ b/external/hypre/src/docs/usr-manual/ch-solvers.rst
@@ -1,4 +1,4 @@
-.. Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+.. Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
    HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 
    SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -18,20 +18,21 @@ interfaces:
    -----------  ----------------------------------
    Solvers      Struct   SStruct    FEI      IJ
    ===========  =======  =======  =======  =======
-   Jacobi          X        X                  
-   SMG             X        X                  
-   PFMG            X        X                  
-   Split                    X                  
-   SysPFMG                  X                  
-   FAC                      X                  
-   Maxwell                  X                  
+   Jacobi          X        X
+   SMG             X        X
+   PFMG            X        X
+   Split                    X
+   SysPFMG                  X
+   FAC                      X
+   Maxwell                  X
    BoomerAMG                X        X        X
    AMS                      X        X        X
    ADS                      X        X        X
    MLI                      X        X        X
    MGR                                        X
+   FSAI                                       X
    ParaSails                X        X        X
-   hypre-ILU                                  X
+   ILU                                        X
    Euclid                   X        X        X
    PILUT                    X        X        X
    PCG             X        X        X        X
@@ -75,8 +76,8 @@ side. We comment later on considerations for other usage patterns.
    parameters depend on the problem to be solved. We give recommendations in the
    individual sections on how to choose these parameters.  Note that in hypre,
    convergence criteria can be chosen after the preconditioner/solver has been
-   setup.  For a complete set of all available parameters see the Reference
-   Manual.
+   setup.  For a complete set of all available parameters see Chapter
+   :ref:`ch-API`.
 
 #. **Pass the preconditioner to the solver.** For solvers that are not
    preconditioned, this step is omitted.  The preconditioner is passed through
@@ -115,10 +116,10 @@ following routines, where ``A`` is the matrix, ``b`` the right hand side and
 ``x`` the solution vector of the linear system to be solved:
 
 .. code-block:: c
-   
+
    /* Create Solver */
-   int HYPRE_SOLVERCreate(MPI_COMM_WORLD, &solver); 
-   
+   int HYPRE_SOLVERCreate(MPI_COMM_WORLD, &solver);
+
    /* Set certain parameters if desired */
    HYPRE_SOLVERSetTol(solver, 1.e-8);
    ...
@@ -136,7 +137,7 @@ In the following sections, we will give brief descriptions of the available
 hypre solvers with some suggestions on how to choose the parameters as well as
 references for users who are interested in a more detailed description and
 analysis of the solvers.  A complete list of all routines that are available can
-be found in the reference manual.
+be found in Chapter :ref:`ch-API`.
 
 
 .. toctree::
@@ -152,10 +153,10 @@ be found in the reference manual.
    solvers-ads
    solvers-mli
    solvers-mgr
+   solvers-fsai
    solvers-parasails
-   solvers-hypre-ilu   
+   solvers-ilu
    solvers-euclid
    solvers-pilut
    solvers-lobpcg
    solvers-fei
-
diff --git a/external/hypre/src/docs/usr-manual/ch-sstruct.rst b/external/hypre/src/docs/usr-manual/ch-sstruct.rst
index 93f4572d..de222be7 100644
--- a/external/hypre/src/docs/usr-manual/ch-sstruct.rst
+++ b/external/hypre/src/docs/usr-manual/ch-sstruct.rst
@@ -1,4 +1,4 @@
-.. Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+.. Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
    HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 
    SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -10,39 +10,33 @@
 Semi-Structured-Grid System Interface (SStruct)
 ******************************************************************************
 
-The ``SStruct`` interface is appropriate for applications with grids that are
-mostly---but not entirely---structured, e.g. block-structured grids (see Figure
-:ref:`fig-sstruct-example`), composite grids in structured adaptive mesh
-refinement (AMR) applications (see Figure :ref:`fig-sstruct-samr-grid`), and
-overset grids.  In addition, it supports more general PDEs than the ``Struct``
-interface by allowing multiple variables (system PDEs) and multiple variable
-types (e.g. cell-centered, face-centered, etc.).  The interface provides access
-to data structures and linear solvers in hypre that are designed for
-semi-structured grid problems, but also to the most general data structures and
+The ``SStruct`` interface is appropriate for applications with grids that are mostly---but
+not entirely---structured, e.g. block-structured grids (see
+:numref:`fig-sstruct-example`), composite grids in structured adaptive mesh refinement
+(AMR) applications (see :numref:`fig-sstruct-samr-grid`), and overset grids.  In addition,
+it supports more general PDEs than the ``Struct`` interface by allowing multiple variables
+(system PDEs) and multiple variable types (e.g. cell-centered, face-centered, etc.).  The
+interface provides access to data structures and linear solvers in hypre that are designed
+for semi-structured grid problems, but also to the most general data structures and
 solvers.
 
-The ``SStruct`` grid is composed out of a number of structured grid *parts*,
-where the physical inter-relationship between the parts is arbitrary.  Each part
-is constructed out of two basic components: boxes (see Figure
-:ref:`fig-struct-boxes`) and *variables*.  Variables represent the actual
-unknown quantities in the grid, and are associated with the box indices in a
-variety of ways, depending on their types.  In hypre, variables may be
-cell-centered, node-centered, face-centered, or edge-centered.  Face-centered
-variables are split into x-face, y-face, and z-face, and edge-centered variables
-are split into x-edge, y-edge, and z-edge.  See Figure :ref:`fig-gridvars` for
-an illustration in 2D.
+The ``SStruct`` grid is composed out of a number of structured grid *parts*, where the
+physical inter-relationship between the parts is arbitrary.  Each part is constructed out
+of two basic components: boxes (see :numref:`fig-struct-boxes`) and *variables*.
+Variables represent the actual unknown quantities in the grid, and are associated with the
+box indices in a variety of ways, depending on their types.  In hypre, variables may be
+cell-centered, node-centered, face-centered, or edge-centered.  Face-centered variables
+are split into x-face, y-face, and z-face, and edge-centered variables are split into
+x-edge, y-edge, and z-edge. See :numref:`fig-gridvars` for an illustration in 2D.
 
-.. _fig-gridvars:
-
-.. figure:: figSStructGridVars.*
+.. figure:: figSStructGridVars.svg
    :align: center
+   :name: fig-gridvars
 
-   Figure 5
-
-   Grid variables in hypre are referenced by the abstract cell-centered index
-   to the left and down in 2D (analogously in 3D).  In the figure, index :math:`(i,j)`
-   is used to reference the variables in black.  The variables in grey---although
-   contained in the pictured cell---are not referenced by the :math:`(i,j)` index.
+   : Grid variables in hypre are referenced by the abstract cell-centered index to
+   the left and down in 2D (analogously in 3D). In the figure, index :math:`(i,j)` is used
+   to reference the variables in black.  The variables in grey---although contained in the
+   pictured cell---are not referenced by the :math:`(i,j)` index.
 
 The ``SStruct`` interface uses a *graph* to allow nearly arbitrary relationships
 between part data.  The graph is constructed from stencils or finite element
@@ -79,78 +73,74 @@ Consider the solution of the diffusion equation
 
    - \nabla \cdot (D \nabla u) + \sigma u = f
 
-on the block-structured grid in Figure :ref:`fig-sstruct-example`, where
-:math:`D` is a scalar diffusion coefficient, and :math:`\sigma \geq 0`.  The
-discretization [MoRS1998]_ introduces three different types of variables:
-cell-centered, :math:`x`-face, and :math:`y`-face.  The three discretization
-stencils that couple these variables are also given in the figure.  The
-information in this figure is essentially all that is needed to describe the
-nonzero structure of the linear system we wish to solve.
+on the block-structured grid in :numref:`fig-sstruct-example`, where :math:`D` is a scalar
+diffusion coefficient, and :math:`\sigma \geq 0`.  The discretization [MoRS1998]_
+introduces three different types of variables: cell-centered, :math:`x`-face, and
+:math:`y`-face. The three discretization stencils that couple these variables are given
+:numref:`fig-sstruct-example-stencils`. The information in this figure is essentially all
+that is needed to describe the nonzero structure of the linear system we wish to solve.
 
-.. _fig-sstruct-example:
-
-.. figure:: figSStructExample1a.*
+.. figure:: figSStructExample1a.svg
    :align: center
+   :name: fig-sstruct-example
 
-   Figure 6a
-
-   Example of a block-structured grid with five logically-rectangular blocks and
-   three variables types: cell-centered, :math:`x`-face, and :math:`y`-face.
-   Discretization stencils for the cell-centered (left), :math:`x`-face
-   (middle), and :math:`y`-face (right) variables are also pictured.
+   : Example of a block-structured grid with five logically-rectangular blocks and three
+   variables types: cell-centered, :math:`x`-face, and :math:`y`-face.  Discretization
+   stencils for the cell-centered (left), :math:`x`-face (middle), and :math:`y`-face
+   (right) variables are also pictured.
 
-.. figure:: figSStructExample1b.*
+.. figure:: figSStructExample1b.svg
    :align: center
+   :name: fig-sstruct-example-stencils
 
-   Figure 6b
+   : Example of stencil connections involving different variable types.
 
-   Need to combine this with 6a.
-
-.. _fig-sstruct-example-parts:
-
-.. figure:: figSStructExample1c.*
+.. figure:: figSStructExample1c.svg
    :align: center
-
-   Figure 7
-
-   One possible labeling of the grid in Figure :ref:`fig-sstruct-example`.
-
-The grid in Figure :ref:`fig-sstruct-example` is defined in terms of five
-separate logically-rectangular parts as shown in Figure
-:ref:`fig-sstruct-example-parts`, and each part is given a unique label between
-0 and 4.  Each part consists of a single box with lower index :math:`(1,1)` and
-upper index :math:`(4,4)` (see Section :ref:`sec-Struct-Grid`), and the grid
-data is distributed on five processes such that data associated with part
-:math:`p` lives on process :math:`p`.  Note that in general, parts may be
-composed out of arbitrary unions of boxes, and indices may consist of
-non-positive integers (see Figure :ref:`fig-struct-boxes`).  Also note that the
-``SStruct`` interface expects a domain-based data distribution by boxes, but the
-actual distribution is determined by the user and simply described (in parallel)
-through the interface.
-
-.. |figSStructGrid1| image:: figSStructGrid1.*
+   :name: fig-sstruct-example-parts
+
+   : One possible labeling of the grid in :numref:`fig-sstruct-example`.
+
+The grid in :numref:`fig-sstruct-example` is defined in terms of five separate
+logically-rectangular parts as shown in :numref:`fig-sstruct-example-parts`, and each part
+is given a unique label between 0 and 4.  Each part consists of a single box with lower
+index :math:`(1,1)` and upper index :math:`(4,4)` (see Section :ref:`sec-Struct-Grid`),
+and the grid data is distributed on five processes such that data associated with part
+:math:`p` lives on process :math:`p`.  Note that in general, parts may be composed out of
+arbitrary unions of boxes, and indices may consist of non-positive integers (see
+:numref:`fig-struct-boxes`).  Also note that the ``SStruct`` interface expects a
+domain-based data distribution by boxes, but the actual distribution is determined by the
+user and simply described (in parallel) through the interface.
+
+.. |figSStructGrid1| image:: figSStructGrid1.svg
    :width: 100%
-.. |figSStructGrid2| image:: figSStructGrid2.*
+.. |figSStructGrid2| image:: figSStructGrid2.svg
    :width: 100%
-.. |figSStructGrid3| image:: figSStructGrid3.*
+.. |figSStructGrid3| image:: figSStructGrid3.svg
    :width: 100%
-.. |figSStructGrid4| image:: figSStructGrid4.*
+.. |figSStructGrid4| image:: figSStructGrid4.svg
    :width: 100%
-.. |figSStructGrid5| image:: figSStructGrid5.*
+.. |figSStructGrid5| image:: figSStructGrid5.svg
    :width: 100%
-.. |figSStructGrid6| image:: figSStructGrid6.*
+.. |figSStructGrid6| image:: figSStructGrid6.svg
    :width: 100%
 
-.. _fig-sstruct-grid:
-    
 +----------------------+----------------------+----------------------+
 | 1: |figSStructGrid1| | 2: |figSStructGrid2| | 3: |figSStructGrid3| |
-+----------------------+----------------------+----------------------+ 
++----------------------+----------------------+----------------------+
 | 4: |figSStructGrid4| | 5: |figSStructGrid5| | 6: |figSStructGrid6| |
 +----------------------+----------------------+----------------------+
 
+.. figure:: dummy.png
+   :align: center
+   :name: fig-sstruct-grid
+   :figclass: align-center
+   :figwidth: 100%
+
+   : Grid Setup Process. The "icons" illustrate the result of the numbered lines of code.
+
 .. code-block:: c
-   
+
        HYPRE_SStructGrid grid;
        int ndim = 2, nparts = 5, nvars = 3, part = 3;
        int extents[][2] = {{1,1}, {4,4}};
@@ -162,128 +152,124 @@ through the interface.
        int nb2_n_exts[][2] = {{1,1}, {1,4}}, nb4_n_exts[][2] = {{4,1}, {4,4}};
        int nb2_map[2]      = {1,0},          nb4_map[2]      = {0,1};
        int nb2_dir[2]      = {1,-1},         nb4_dir[2]      = {1,1};
-   
+
    1:  HYPRE_SStructGridCreate(MPI_COMM_WORLD, ndim, nparts, &grid);
-       
+
        /* Set grid extents and grid variables for part 3 */
    2:  HYPRE_SStructGridSetExtents(grid, part, extents[0], extents[1]);
    3:  HYPRE_SStructGridSetVariables(grid, part, nvars, vartypes);
-       
+
        /* Set spatial relationship between parts 3 and 2, then parts 3 and 4 */
    4:  HYPRE_SStructGridSetNeighborPart(grid, part, nb2_exts[0], nb2_exts[1],
           nb2_n_part, nb2_n_exts[0], nb2_n_exts[1], nb2_map, nb2_dir);
    5:  HYPRE_SStructGridSetNeighborPart(grid, part, nb4_exts[0], nb4_exts[1],
           nb4_n_part, nb4_n_exts[0], nb4_n_exts[1], nb4_map, nb4_dir);
-       
+
    6:  HYPRE_SStructGridAssemble(grid);
-    
-Code on process 3 for setting up the grid in Figure :ref:`fig-sstruct-example}.`
-
-As with the ``Struct`` interface, each process describes that portion of the
-grid that it "owns", one box at a time.  Figure :ref:`fig-sstruct-grid` shows
-the code for setting up the grid on process 3 (the code for the other processes
-is similar).  The "icons" at the top of the figure illustrate the result of the
-numbered lines of code.  Process 3 needs to describe the data pictured in the
-bottom-right of the figure.  That is, it needs to describe part 3 plus some
-additional neighbor information that ties part 3 together with the rest of the
-grid.  The ``Create()`` routine creates an empty 2D grid object with five parts
-that lives on the ``MPI_COMM_WORLD`` communicator.  The ``SetExtents()`` routine
-adds a new box to the grid.  The ``SetVariables()`` routine associates three
-variables of type cell-centered, :math:`x`-face, and :math:`y`-face with part 3.
-
-At this stage, the description of the data on part 3 is complete.  However, the
-spatial relationship between this data and the data on neighboring parts is not
-yet defined.  To do this, we need to relate the index space for part 3 with the
-index spaces of parts 2 and 4.  More specifically, we need to tell the interface
-that the two grey boxes neighboring part 3 in the bottom-right of
-Figure :ref:`fig-sstruct-grid` also correspond to boxes on parts 2 and 4.  This
-is done through the two calls to the ``SetNeighborPart()`` routine.  We
-discuss only the first call, which describes the grey box on the right of the
-figure.  Note that this grey box lives outside of the box extents for the grid
-on part 3, but it can still be described using the index-space for part 3
-(recall Figure :ref:`fig-struct-boxes`).  That is, the grey box has extents
-:math:`(1,0)` and :math:`(4,0)` on part 3's index-space, which is outside of part 3's grid.
-The arguments for the ``SetNeighborPart()`` call are simply the lower and
-upper indices on part 3 and the corresponding indices on part 2.  The final two
-arguments to the routine indicate that the positive :math:`x`-direction on part 3
-(i.e., the :math:`i` component of the tuple :math:`(i,j)`) corresponds to the positive
-:math:`y`-direction on part 2 and that the positive :math:`y`-direction on part 3
-corresponds to the positive :math:`x`-direction on part 2.
-
-The ``Assemble()`` routine is a collective call (i.e., must be called on all
-processes from a common synchronization point), and finalizes the grid assembly,
-making the grid "ready to use".
-
-With the neighbor information, it is now possible to determine where off-part
-stencil entries couple.  Take, for example, any shared part boundary such as the
-boundary between parts 2 and 3.  Along these boundaries, some stencil entries
-reach outside of the part.  If no neighbor information is given, these entries
-are effectively zeroed out, i.e., they don't participate in the discretization.
-However, with the additional neighbor information, when a stencil entry reaches
-into a neighbor box it is then coupled to the part described by that neighbor
-box information.
-
-Another important consequence of the use of the ``SetNeighborPart()`` routine is
-that it can declare variables on different parts as being the same.  For
-example, the face variables on the boundary of parts 2 and 3 are recognized as
-being shared by both parts (prior to the ``SetNeighborPart()`` call, there were
-two distinct sets of variables).  Note also that these variables are of
-different types on the two parts; on part 2 they are :math:`x`-face variables,
-but on part 3 they are :math:`y`-face variables.
+
+Code on process 3 for setting up the grid in :numref:`fig-sstruct-example`.
+
+As with the ``Struct`` interface, each process describes that portion of the grid that it
+"owns", one box at a time. :numref:`fig-sstruct-grid` shows the code for setting up the
+grid on process 3 (the code for the other processes is similar).  The "icons" at the top
+of the figure illustrate the result of the numbered lines of code.  Process 3 needs to
+describe the data pictured in the bottom-right of the figure.  That is, it needs to
+describe part 3 plus some additional neighbor information that ties part 3 together with
+the rest of the grid.  The ``Create()`` routine creates an empty 2D grid object with five
+parts that lives on the ``MPI_COMM_WORLD`` communicator.  The ``SetExtents()`` routine
+adds a new box to the grid.  The ``SetVariables()`` routine associates three variables of
+type cell-centered, :math:`x`-face, and :math:`y`-face with part 3.
+
+At this stage, the description of the data on part 3 is complete. However, the spatial
+relationship between this data and the data on neighboring parts is not yet defined.  To
+do this, we need to relate the index space for part 3 with the index spaces of parts 2
+and 4.  More specifically, we need to tell the interface that the two grey boxes
+neighboring part 3 in the bottom-right of :numref:`fig-sstruct-grid` also correspond to
+boxes on parts 2 and 4.  This is done through the two calls to the ``SetNeighborPart()``
+routine.  We discuss only the first call, which describes the grey box on the right of the
+figure.  Note that this grey box lives outside of the box extents for the grid on part 3,
+but it can still be described using the index-space for part 3 (recall
+:numref:`fig-struct-boxes`).  That is, the grey box has extents :math:`(1,0)` and
+:math:`(4,0)` on part 3's index-space, which is outside of part 3's grid.  The arguments
+for the ``SetNeighborPart()`` call are simply the lower and upper indices on part 3 and
+the corresponding indices on part 2.  The final two arguments to the routine indicate that
+the positive :math:`x`-direction on part 3 (i.e., the :math:`i` component of the tuple
+:math:`(i,j)`) corresponds to the positive :math:`y`-direction on part 2 and that the
+positive :math:`y`-direction on part 3 corresponds to the positive :math:`x`-direction on
+part 2.
+
+The ``Assemble()`` routine is a collective call (i.e., must be called on all processes
+from a common synchronization point), and finalizes the grid assembly, making the grid
+"ready to use".
+
+With the neighbor information, it is now possible to determine where off-part stencil
+entries couple.  Take, for example, any shared part boundary such as the boundary between
+parts 2 and 3.  Along these boundaries, some stencil entries reach outside of the part.
+If no neighbor information is given, these entries are effectively zeroed out, i.e., they
+don't participate in the discretization.  However, with the additional neighbor
+information, when a stencil entry reaches into a neighbor box it is then coupled to the
+part described by that neighbor box information.
+
+Another important consequence of the use of the ``SetNeighborPart()`` routine is that it
+can declare variables on different parts as being the same.  For example, the face
+variables on the boundary of parts 2 and 3 are recognized as being shared by both parts
+(prior to the ``SetNeighborPart()`` call, there were two distinct sets of variables).
+Note also that these variables are of different types on the two parts; on part 2 they are
+:math:`x`-face variables, but on part 3 they are :math:`y`-face variables.
 
 For brevity, we consider only the description of the :math:`y`-face stencil in
-Figure :ref:`fig-sstruct-example`, i.e. the third stencil in the figure.  To do
-this, the stencil entries are assigned unique labels between 0 and 8 and their
-"offsets" are described relative to the "center" of the stencil.  This process
-is illustrated in Figure :ref:`fig-sstruct-stencil`.  Nine calls are made to the
-routine ``HYPRE_SStructStencilSetEntry()``.  As an example, the call that
-describes stencil entry 5 in the figure is given the entry number 5, the offset
-:math:`(-1,0)`, and the identifier for the :math:`x`-face variable (the variable
-to which this entry couples).  Recall from Figure :ref:`fig-gridvars` the
-convention used for referencing variables of different types.  The geometry
-description uses the same convention, but with indices numbered relative to the
-referencing index :math:`(0,0)` for the stencil's center.  Figure
-:ref:`fig-sstruct-graph` shows the code for setting up the graph .
-
-.. _fig-sstruct-stencil:
-
-.. figure:: figSStructStenc0.*
+:numref:`fig-sstruct-example`, i.e. the third stencil in the figure.  To do this, the
+stencil entries are assigned unique labels between 0 and 8 and their "offsets" are
+described relative to the "center" of the stencil.  This process is illustrated in
+:numref:`fig-sstruct-stencil`.  Nine calls are made to the routine
+``HYPRE_SStructStencilSetEntry()``.  As an example, the call that describes stencil entry
+5 in the figure is given the entry number 5, the offset :math:`(-1,0)`, and the identifier
+for the :math:`x`-face variable (the variable to which this entry couples).  Recall from
+:numref:`fig-gridvars` the convention used for referencing variables of different types.
+The geometry description uses the same convention, but with indices numbered relative to
+the referencing index :math:`(0,0)` for the stencil's center. :numref:`fig-sstruct-graph`
+shows the code for setting up the graph.
+
+.. figure:: figSStructStenc0.svg
    :align: center
+   :name: fig-sstruct-stencil
 
-   Figure 7a
-
-   Assignment of labels and geometries to the :math:`y`-face stencil in Figure
-   :ref:`fig-sstruct-example}.`
+   : Assignment of labels and geometries to the :math:`y`-face stencil in :numref:`fig-sstruct-example`.
 
-.. figure:: figSStructStenc1.*
+.. figure:: figSStructStenc1.svg
    :align: center
+   :name: fig-sstruct-stencil-b
 
-   Figure 7b
+   : Alternate representation of the stencil configuration shown in :numref:`fig-sstruct-stencil-b`.
 
-   Need to combine this with 7a.
-
-.. |figSStructGraph1| image:: figSStructGraph1.*
+.. |figSStructGraph1| image:: figSStructGraph1.svg
    :width: 100%
-.. |figSStructGraph2| image:: figSStructGraph2.*
+.. |figSStructGraph2| image:: figSStructGraph2.svg
    :width: 100%
-.. |figSStructGraph5| image:: figSStructGraph5.*
+.. |figSStructGraph5| image:: figSStructGraph5.svg
    :width: 100%
 
-.. _fig-sstruct-graph:
-
 +-----------------------+-----------------------+-----------------------+
 | 1: |figSStructGraph1| | 2: |figSStructGraph2| | 3: |figSStructGraph5| |
 +-----------------------+-----------------------+-----------------------+
 
+.. figure:: dummy.png
+   :align: center
+   :name: fig-sstruct-graph
+   :figclass: align-center
+   :figwidth: 100%
+
+   : Graph Setup Process. The icons illustrate the result of the numbered lines of code.
+
 .. code-block:: c
-   
+
        HYPRE_SStructGraph graph;
        HYPRE_SStructStencil c_stencil, x_stencil, y_stencil;
        int c_var = 0, x_var = 1, y_var = 2;
        int part;
-       
+
    1:  HYPRE_SStructGraphCreate(MPI_COMM_WORLD, grid, &graph);
-       
+
        /* Set the cell-centered, x-face, and y-face stencils for each part */
        for (part = 0; part < 5; part++)
        {
@@ -291,10 +277,10 @@ referencing index :math:`(0,0)` for the stencil's center.  Figure
           HYPRE_SStructGraphSetStencil(graph, part, x_var, x_stencil);
           HYPRE_SStructGraphSetStencil(graph, part, y_var, y_stencil);
        }
-       
+
    3:  HYPRE_SStructGraphAssemble(graph);
 
-Code on process 3 for setting up the graph for Figure :ref:`fig-sstruct-example}`.
+Code on process 3 for setting up the graph for :numref:`fig-sstruct-example`.
 
 With the above, we now have a complete description of the nonzero structure for
 the matrix.  The matrix coefficients are then easily set in a manner similar to
@@ -304,20 +290,18 @@ As before, there are also ``AddTo`` variants of these routines.  Likewise,
 setting up the right-hand-side is similar to what is described in Section
 :ref:`sec-Struct-RHS`.  See the hypre reference manual for details.
 
-An alternative approach for describing the above problem through the interface
-is to use the ``GraphAddEntries()`` routine instead of the
-``GridSetNeighborPart()`` routine.  In this approach, the five parts would be
-explicitly "sewn" together by adding non-stencil couplings to the matrix graph.
-The main downside to this approach for block-structured grid problems is that
-variables along block boundaries are no longer considered to be the same
-variables on the corresponding parts that share these boundaries.  For example,
-any face variable along the boundary between parts 2 and 3 in Figure
-:ref:`fig-sstruct-example` would represent two different variables that live on
-different parts.  To "sew" the parts together correctly, we would need to
-explicitly select one of these variables as the representative that participates
-in the discretization, and make the other variable a dummy variable that is
-decoupled from the discretization by zeroing out appropriate entries in the
-matrix.  All of these complications are avoided by using the
+An alternative approach for describing the above problem through the interface is to use
+the ``GraphAddEntries()`` routine instead of the ``GridSetNeighborPart()`` routine.  In
+this approach, the five parts would be explicitly "sewn" together by adding non-stencil
+couplings to the matrix graph.  The main downside to this approach for block-structured
+grid problems is that variables along block boundaries are no longer considered to be the
+same variables on the corresponding parts that share these boundaries.  For example, any
+face variable along the boundary between parts 2 and 3 in :numref:`fig-sstruct-example`
+would represent two different variables that live on different parts.  To "sew" the parts
+together correctly, we would need to explicitly select one of these variables as the
+representative that participates in the discretization, and make the other variable a
+dummy variable that is decoupled from the discretization by zeroing out appropriate
+entries in the matrix.  All of these complications are avoided by using the
 ``GridSetNeighborPart()`` for this example.
 
 
@@ -332,100 +316,97 @@ example, paying particular attention to the use of the ``FEM`` interface
 routines and the ``GridSetSharedPart()`` routine.  See example code ``ex14.c``
 for a complete implementation.
 
-Consider a nodal finite element (FEM) discretization of the Laplace equation on
-the star-shaped grid in Figure :ref:`fig-sstruct-fem-example`.  The local FEM
-stiffness matrix in the figure describes the coupling between the grid
-variables.  Although we could still describe this problem using stencils as in
-Section :ref:`sec-Block-Structured-Grids`, an FEM-based approach (available in
-hypre version ``2.6.0b`` and later) is a more natural alternative.
+Consider a nodal finite element (FEM) discretization of the Laplace equation on the
+star-shaped grid in :numref:`fig-sstruct-fem-example`.  The local FEM stiffness matrix in
+the figure describes the coupling between the grid variables.  Although we could still
+describe this problem using stencils as in Section :ref:`sec-Block-Structured-Grids`, an
+FEM-based approach (available in hypre version ``2.6.0b`` and later) is a more natural
+alternative.
 
 .. _fig-sstruct-fem-example:
 
-.. figure:: figSStructExample3a.*
+.. figure:: figSStructExample3a.svg
    :align: center
 
-   Figure 8a
+   : Example of a star-shaped grid with six logically-rectangular blocks and one nodal
+   variable. Each block has an angle at the origin given by :math:`\gamma=\pi/3`.  The
+   finite element stiffness matrix (right) is given in terms of the pictured variable
+   ordering (left).
 
-   Example of a star-shaped grid with six logically-rectangular blocks and one
-   nodal variable.  Each block has an angle at the origin given by
-   :math:`\gamma=\pi/3`.  The finite element stiffness matrix (right) is given
-   in terms of the pictured variable ordering (left).
-
-.. figure:: figSStructExample3b.*
+.. figure:: figSStructExample3b.svg
    :align: center
 
-   Figure 8b
-
-   Need to combine this with 8a.
+The grid in :numref:`fig-sstruct-fem-example` is defined in terms of six separate
+logically-rectangular parts, and each part is given a unique label between 0 and 5.  Each
+part consists of a single box with lower index :math:`(1,1)` and upper index
+:math:`(9,9)`, and the grid data is distributed on six processes such that data associated
+with part :math:`p` lives on process :math:`p`.
 
-The grid in Figure :ref:`fig-sstruct-fem-example` is defined in terms of six
-separate logically-rectangular parts, and each part is given a unique label
-between 0 and 5.  Each part consists of a single box with lower index
-:math:`(1,1)` and upper index :math:`(9,9)`, and the grid data is distributed on
-six processes such that data associated with part :math:`p` lives on process
-:math:`p`.
-
-.. |figSStructGridFEM1| image:: figSStructGridFEM1.*
+.. |figSStructGridFEM1| image:: figSStructGridFEM1.svg
    :width: 100%
-.. |figSStructGridFEM2| image:: figSStructGridFEM2.*
+.. |figSStructGridFEM2| image:: figSStructGridFEM2.svg
    :width: 100%
-.. |figSStructGridFEM3| image:: figSStructGridFEM3.*
+.. |figSStructGridFEM3| image:: figSStructGridFEM3.svg
    :width: 100%
-.. |figSStructGridFEM4| image:: figSStructGridFEM4.*
+.. |figSStructGridFEM4| image:: figSStructGridFEM4.svg
    :width: 100%
-.. |figSStructGridFEM5| image:: figSStructGridFEM5.*
+.. |figSStructGridFEM5| image:: figSStructGridFEM5.svg
    :width: 100%
-.. |figSStructGridFEM6| image:: figSStructGridFEM6.*
+.. |figSStructGridFEM6| image:: figSStructGridFEM6.svg
    :width: 100%
 
-.. _fig-sstruct-fem-grid:
-
 +-------------------------+-------------------------+-------------------------+
 | 1: |figSStructGridFEM1| | 2: |figSStructGridFEM2| | 3: |figSStructGridFEM3| |
 +-------------------------+-------------------------+-------------------------+
 | 4: |figSStructGridFEM4| | 5: |figSStructGridFEM5| | 6: |figSStructGridFEM6| |
 +-------------------------+-------------------------+-------------------------+
 
+.. figure:: dummy.png
+   :align: center
+   :name: fig-sstruct-fem-grid
+   :figclass: align-center
+   :figwidth: 100%
+
+   : FEM Grid Setup Process. The "icons" illustrate the result of the numbered lines of code.
+
 .. code-block:: c
-   
+
        HYPRE_SStructGrid grid;
        int ndim = 2, nparts = 6, nvars = 1, part = 0;
        int ilower[2]    = {1,1}, iupper[2] = {9,9};
        int vartypes[]   = {HYPRE_SSTRUCT_VARIABLE_NODE};
        int ordering[12] = {0,-1,-1,  0,+1,-1,  0,+1,+1,  0,-1,+1};
-   
+
        int s_part   = 2;
        int ilo[2]   = {1,1}, iup[2]   = {1,9}, offset[2]   = {-1,0};
        int s_ilo[2] = {1,1}, s_iup[2] = {9,1}, s_offset[2] = {0,-1};
        int map[2]   = {1,0};
        int dir[2]   = {-1,1};
-   
+
    1:  HYPRE_SStructGridCreate(MPI_COMM_WORLD, ndim, nparts, &grid);
-       
+
        /* Set grid extents, grid variables, and FEM ordering for part 0 */
    2:  HYPRE_SStructGridSetExtents(grid, part, ilower, iupper);
    3:  HYPRE_SStructGridSetVariables(grid, part, nvars, vartypes);
    4:  HYPRE_SStructGridSetFEMOrdering(grid, part, ordering);
-   
+
        /* Set shared variables for parts 0 and 1 (0 and 2/3/4/5 not shown) */
    5:  HYPRE_SStructGridSetSharedPart(grid, part, ilo, iup, offset,
           s_part, s_ilo, s_iup, s_offset, map, dir);
-   
+
    6:  HYPRE_SStructGridAssemble(grid);
-    
-Code on process 0 for setting up the grid in Figure :ref:`fig-sstruct-fem-example`.
-
-As in Section :ref:`sec-Block-Structured-Grids`, each process describes that
-portion of the grid that it "owns", one box at a time.  Figure
-:ref:`fig-sstruct-fem-grid` shows the code for setting up the grid on process 0
-(the code for the other processes is similar).  The "icons" at the top of the
-figure illustrate the result of the numbered lines of code.  Process 0 needs to
-describe the data pictured in the bottom-right of the figure.  That is, it needs
-to describe part 0 plus some additional information about shared data with other
-parts on the grid.  The ``SetFEMOrdering()`` routine sets the ordering of the
-unknowns in an element (an element is always a grid cell in hypre).  This
-determines the ordering of the data passed into the routines
-``MatrixAddFEMValues()`` and ``VectorAddFEMValues()`` discussed later.
+
+Code on process 0 for setting up the grid in :numref:`fig-sstruct-fem-example`.
+
+As in Section :ref:`sec-Block-Structured-Grids`, each process describes that portion of
+the grid that it "owns", one box at a time. :numref:`fig-sstruct-fem-grid` shows the code
+for setting up the grid on process 0 (the code for the other processes is similar).
+Process 0 needs to describe the data pictured in the bottom-right of the figure. That is,
+it needs to describe part 0 plus some additional information about shared data with other
+parts on the grid.  The ``SetFEMOrdering()`` routine sets the ordering of the unknowns in
+an element (an element is always a grid cell in hypre).  This determines the ordering of
+the data passed into the routines ``MatrixAddFEMValues()`` and ``VectorAddFEMValues()``
+discussed later.
 
 At this point, the layout of the data on part 0 is complete, but there is no
 relationship to the rest of the grid.  To couple the parts, we need to tell
@@ -440,21 +421,20 @@ in the cell (no nonzeros in offset); all variables on a face (only 1 nonzero);
 all variables on an edge (2 nonzeros); all variables at a point (3 nonzeros).
 The two offsets must be consistent with each other.
 
-The graph is set up similarly to Figure :ref:`fig-sstruct-graph`, except that
-the stencil calls are replaced by calls to ``GraphSetFEM()``.  The nonzero
-pattern of the stiffness matrix can also be set by calling the optional routine
-``GraphSetFEMSparsity()``.
+The graph is set up similarly to :numref:`fig-sstruct-graph`, except that the stencil
+calls are replaced by calls to ``GraphSetFEM()``. The nonzero pattern of the stiffness
+matrix can also be set by calling the optional routine ``GraphSetFEMSparsity()``.
 
 Matrix and vector values are set one element at a time.  For the example in this
 section, calls on part 0 would have the following form:
 
 .. code-block:: c
-   
+
    int part = 0;
    int index[2] = {i,j};
    double m_values[16] = {...};
    double v_values[4]  = {...};
-   
+
    HYPRE_SStructMatrixAddFEMValues(A, part, index, m_values);
    HYPRE_SStructVectorAddFEMValues(v, part, index, v_values);
 
@@ -470,54 +450,47 @@ Structured Adaptive Mesh Refinement
 
 We now briefly discuss how to use the ``SStruct`` interface in a structured AMR
 application.  Consider Poisson's equation on the simple cell-centered example
-grid illustrated in Figure :ref:`fig-sstruct-samr-grid`.  For structured AMR
+grid illustrated in :numref:`fig-sstruct-samr-grid`.  For structured AMR
 applications, each refinement level should be defined as a unique part.  There
 are two parts in this example: part 0 is the global coarse grid and part 1 is
 the single refinement patch.  Note that the coarse unknowns underneath the
-refinement patch (gray dots in Figure :ref:`fig-sstruct-samr-grid`) are not real
+refinement patch (gray dots in :numref:`fig-sstruct-samr-grid`) are not real
 physical unknowns; the solution in this region is given by the values on the
 refinement patch.  In setting up the composite grid matrix [McCo1989]_ for hypre
 the equations for these "dummy" unknowns should be uncoupled from the other
 unknowns (this can easily be done by setting all off-diagonal couplings to zero
 in this region).
 
-.. _fig-sstruct-samr-grid:
-
-.. figure:: figSStructExample2a.*
+.. figure:: figSStructExample2a.svg
    :align: center
-
-   Figure 9
-
-   Structured AMR grid example. Shaded regions correspond to process 0, unshaded
-   to process 1.  The grey dots are dummy variables.
-
-
-In the example, parts are distributed across the same two processes with process
-0 having the "left" half of both parts.  The composite grid is then set up
-part-by-part by making calls to ``GridSetExtents()`` just as was done in Section
-:ref:`sec-Block-Structured-Grids` and Figure :ref:`fig-sstruct-grid` (no
-``SetNeighborPart`` calls are made in this example).  Note that in the interface
-there is no required rule relating the indexing on the refinement patch to that
-on the global coarse grid; they are separate parts and thus each has its own
-index space.  In this example, we have chosen the indexing such that refinement
-cell :math:`(2i,2j)` lies in the lower left quadrant of coarse cell
-:math:`(i,j)`.  Then the stencil is set up.  In this example we are using a
+   :name: fig-sstruct-samr-grid
+
+   : Structured AMR grid example. Shaded regions correspond to process 0, unshaded to
+   process 1. The grey dots are dummy variables.
+
+In the example, parts are distributed across the same two processes with process 0 having
+the "left" half of both parts.  The composite grid is then set up part-by-part by making
+calls to ``GridSetExtents()`` just as was done in Section
+:ref:`sec-Block-Structured-Grids` and :numref:`fig-sstruct-grid` (no ``SetNeighborPart``
+calls are made in this example).  Note that in the interface there is no required rule
+relating the indexing on the refinement patch to that on the global coarse grid; they are
+separate parts and thus each has its own index space.  In this example, we have chosen the
+indexing such that refinement cell :math:`(2i,2j)` lies in the lower left quadrant of
+coarse cell :math:`(i,j)`.  Then the stencil is set up.  In this example we are using a
 finite volume approach resulting in the standard 5-point stencil in Section
 :ref:`sec-Struct-Grid` in both parts.
 
-The grid and stencil are used to define all intra-part coupling in the graph,
-the non-zero pattern of the composite grid matrix.  The inter-part coupling at
-the coarse-fine interface is described by ``GraphAddEntries()`` calls.  This
-coupling in the composite grid matrix is typically the composition of an
-interpolation rule and a discretization formula.  In this example, we use a
-simple piecewise constant interpolation, i.e. the solution value in a coarse
-cell is equal to the solution value at the cell center.  Then the flux across a
-portion of the coarse-fine interface is approximated by a difference of the
-solution values on each side.  As an example, consider approximating the flux
-across the left interface of cell :math:`(6,6)` in Figure
-:ref:`fig-sstruct-samr-stencil`.  Let :math:`h` be the coarse grid mesh size,
-and consider a local coordinate system with the origin at the center of cell
-:math:`(6,6)`.  We approximate the flux as follows
+The grid and stencil are used to define all intra-part coupling in the graph, the non-zero
+pattern of the composite grid matrix.  The inter-part coupling at the coarse-fine
+interface is described by ``GraphAddEntries()`` calls.  This coupling in the composite
+grid matrix is typically the composition of an interpolation rule and a discretization
+formula.  In this example, we use a simple piecewise constant interpolation, i.e. the
+solution value in a coarse cell is equal to the solution value at the cell center.  Then
+the flux across a portion of the coarse-fine interface is approximated by a difference of
+the solution values on each side.  As an example, consider approximating the flux across
+the left interface of cell :math:`(6,6)` in :numref:`fig-sstruct-samr-stencil`.  Let
+:math:`h` be the coarse grid mesh size, and consider a local coordinate system with the
+origin at the center of cell :math:`(6,6)`.  We approximate the flux as follows
 
 .. math::
 
@@ -541,15 +514,12 @@ out (currently, this is only supported for the ``HYPRE_PARCSR`` object type, and
 these values must be manually zeroed out for other object types; see
 ``MatrixSetObjectType()`` in the reference manual).
 
-.. _fig-sstruct-samr-stencil:
-
-.. figure:: figSStructExample2b.*
+.. figure:: figSStructExample2b.svg
    :align: center
+   :name: fig-sstruct-samr-stencil
 
-   Figure 2
-
-   Coupling for equation at corner of refinement patch. Black lines (solid and
-   broken) are stencil couplings. Gray line are non-stencil couplings.
+   : Coupling for equation at corner of refinement patch. Black lines (solid and broken)
+   are stencil couplings. Gray line are non-stencil couplings.
 
 The remaining step is to define the actual numerical values for the composite
 grid matrix.  This can be done by either ``MatrixSetValues()`` calls to set
@@ -559,4 +529,3 @@ entries for a box of equations in a single call.  The syntax for the
 is being set and an array of entry numbers identifying which entries in that
 equation are being set.  The entry numbers may correspond to stencil entries or
 non-stencil entries.
-
diff --git a/external/hypre/src/docs/usr-manual/ch-struct.rst b/external/hypre/src/docs/usr-manual/ch-struct.rst
index f7133150..ef598fd3 100644
--- a/external/hypre/src/docs/usr-manual/ch-struct.rst
+++ b/external/hypre/src/docs/usr-manual/ch-struct.rst
@@ -1,4 +1,4 @@
-.. Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+.. Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
    HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 
    SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -19,19 +19,16 @@ usually provided via the unstructured-grid interface (``FEI``) or the
 linear-algebraic interface (``IJ``) described in Chapters :ref:`ch-FEI` and
 :ref:`ch-IJ`.
 
-Figure :ref:`fig-struct-example` gives an example of the type of grid currently
+:numref:`fig-struct-example` gives an example of the type of grid currently
 supported by the ``Struct`` interface.  The interface uses a finite-difference
 or finite-volume style, and currently supports only scalar PDEs (i.e., one
 unknown per gridpoint).
 
-.. _fig-struct-example:
-
-.. figure:: figStructExample1.*
+.. figure:: figStructExample1.svg
    :align: center
+   :name: fig-struct-example
 
-   Structured Grid Example
-
-   An example 2D structured grid, distributed accross two processors.
+   : 2D structured grid example that is distributed accross two processors.
 
 There are four basic steps involved in setting up the linear system to be
 solved:
@@ -55,7 +52,7 @@ To describe each of these steps in more detail, consider solving the
    \right .
 
 Assume :eq:`eqn-laplacian` is discretized using standard 5-pt finite-volumes on
-the uniform grid pictured in :ref:`fig-struct-example`, and assume that the
+the uniform grid pictured in :numref:`fig-struct-example`, and assume that the
 problem data is distributed across two processes as depicted.
 
 
@@ -65,19 +62,16 @@ Setting Up the Struct Grid
 ==============================================================================
 
 The grid is described via a global *index space*, i.e., via integer singles in
-1D, tuples in 2D, or triples in 3D (see Figure :ref:`fig-struct-boxes`).
-
-.. _fig-struct-boxes:
+1D, tuples in 2D, or triples in 3D (see :numref:`fig-struct-boxes`).
 
-.. figure:: figStructGridBoxes.*
+.. figure:: figStructGridBoxes.svg
    :align: center
+   :name: fig-struct-boxes
 
-   Boxes in Index Space
+   : Boxes in index space. A box is a collection of abstract cell-centered
+   indices, described by its minimum and maximum indices. Here, two boxes are illustrated.
 
-   A box is a collection of abstract cell-centered indices, described by its
-   minimum and maximum indices.  Here, two boxes are illustrated.
-
-The integers may have any value, negative or positive.  The global indexes allow
+The integers may have any value, negative or positive. The global indexes allow
 hypre to discern how data is related spatially, and how it is distributed across
 the parallel machine.  The basic component of the grid is a *box*: a collection
 of abstract cell-centered indices in index space, described by its "lower" and
@@ -85,19 +79,19 @@ of abstract cell-centered indices in index space, described by its "lower" and
 centers, unlike the more general ``SStruct`` interface which allows data to be
 associated with box indices in several different ways.
 
-Each process describes that portion of the grid that it "owns", one box at a
-time.  For example, the global grid in Figure :ref:`fig-struct-example` can be
-described in terms of three boxes, two owned by process 0, and one owned by
-process 1. The following is the code (with visual annotations) for setting up
-the grid on process 0 (the code for process 1 is similar).
+Each process describes that portion of the grid that it "owns", one box at a time.  For
+example, the global grid in :numref:`fig-struct-example` can be described in terms of
+three boxes, two owned by process 0, and one owned by process 1. The following is the code
+(with visual annotations) for setting up the grid on process 0 (the code for process 1 is
+similar).
 
-.. |figStructGrid1| image:: figStructGrid1.*
+.. |figStructGrid1| image:: figStructGrid1.svg
    :width: 100%
-.. |figStructGrid2| image:: figStructGrid2.*
+.. |figStructGrid2| image:: figStructGrid2.svg
    :width: 100%
-.. |figStructGrid3| image:: figStructGrid3.*
+.. |figStructGrid3| image:: figStructGrid3.svg
    :width: 100%
-.. |figStructGrid4| image:: figStructGrid4.*
+.. |figStructGrid4| image:: figStructGrid4.svg
    :width: 100%
 
 +---------------------+---------------------+---------------------+---------------------+
@@ -105,21 +99,21 @@ the grid on process 0 (the code for process 1 is similar).
 +---------------------+---------------------+---------------------+---------------------+
 
 .. code-block:: c
-   
+
        HYPRE_StructGrid grid;
        int ndim        = 2;
        int ilower[][2] = {{-3,1}, {0,1}};
        int iupper[][2] = {{-1,2}, {2,4}};
-      
+
        /* Create the grid object */
    1:  HYPRE_StructGridCreate(MPI_COMM_WORLD, ndim, &grid);
-       
+
        /* Set grid extents for the first box */
    2:  HYPRE_StructGridSetExtents(grid, ilower[0], iupper[0]);
-       
+
        /* Set grid extents for the second box */
    3:  HYPRE_StructGridSetExtents(grid, ilower[1], iupper[1]);
-       
+
        /* Assemble the grid */
    4:  HYPRE_StructGridAssemble(grid);
 
@@ -136,74 +130,69 @@ assembly, making the grid "ready to use".
 Setting Up the Struct Stencil
 ==============================================================================
 
-The geometry of the discretization stencil is described by an array of indexes,
-each representing a relative offset from any given gridpoint on the grid.  For
-example, the geometry of the 5-pt stencil for the example problem being
-considered can be represented by the list of index offsets shown in Figure
-:ref:`fig-struct-stencil-a`.
+The geometry of the discretization stencil is described by an array of indexes, each
+representing a relative offset from any given gridpoint on the grid. For example, the
+geometry of the 5-pt stencil for the example problem being considered can be represented
+by the list of index offsets shown in :numref:`fig-struct-stencil-a`.
 
-.. _fig-struct-stencil-a:
-
-.. figure:: figStructStenc0.*
+.. figure:: figStructStenc0.svg
    :align: center
+   :name: fig-struct-stencil-a
 
-   Figure 4a
-
-   Representation of the 5-point discretization stencil for the example problem.
+   : Representation of the 5-point discretization stencil for the example
+   problem.
 
-.. figure:: figStructStenc7.*
+.. figure:: figStructStenc7.svg
    :align: center
+   :name: fig-struct-stencil-b
 
-   Figure 4b
-
-   Need to combine this with 4a.
+   : Alternate representation of the stencil configuration shown in :numref:`fig-struct-stencil-a`.
 
 Here, the :math:`(0,0)` entry represents the "center" coefficient, and is the
 0th stencil entry.  The :math:`(0,-1)` entry represents the "south" coefficient,
 and is the 3rd stencil entry.  And so on.
 
-On process 0 or 1, the following code (with visual annotations) will set up the
-stencil in Figure :ref:`fig-struct-stencil-a`.  The stencil must be the same on
-all processes.
+On process 0 or 1, the following code (with visual annotations) will set up the stencil in
+:numref:`fig-struct-stencil-a`.  The stencil must be the same on all processes.
 
-.. |figStructStenc1| image:: figStructStenc1.*
+.. |figStructStenc1| image:: figStructStenc1.svg
    :width: 100%
-.. |figStructStenc2| image:: figStructStenc2.*
+.. |figStructStenc2| image:: figStructStenc2.svg
    :width: 100%
-.. |figStructStenc3| image:: figStructStenc3.*
+.. |figStructStenc3| image:: figStructStenc3.svg
    :width: 100%
-.. |figStructStenc4| image:: figStructStenc4.*
+.. |figStructStenc4| image:: figStructStenc4.svg
    :width: 100%
-.. |figStructStenc5| image:: figStructStenc5.*
+.. |figStructStenc5| image:: figStructStenc5.svg
    :width: 100%
-.. |figStructStenc6| image:: figStructStenc6.*
+.. |figStructStenc6| image:: figStructStenc6.svg
    :width: 100%
 
 +----------------------+----------------------+----------------------+
 | 1: |figStructStenc1| | 2: |figStructStenc2| | 3: |figStructStenc3| |
-+----------------------+----------------------+----------------------+ 
++----------------------+----------------------+----------------------+
 | 4: |figStructStenc4| | 5: |figStructStenc5| | 6: |figStructStenc6| |
 +----------------------+----------------------+----------------------+
 
 .. code-block:: c
-   
+
          HYPRE_StructStencil stencil;
          int ndim         = 2;
          int size         = 5;
          int entry;
          int offsets[][2] = {{0,0}, {-1,0}, {1,0}, {0,-1}, {0,1}};
-         
+
          /* Create the stencil object */
      1:  HYPRE_StructStencilCreate(ndim, size, &stencil);
-         
+
          /* Set stencil entries */
          for (entry = 0; entry < size; entry++)
          {
    2-6:     HYPRE_StructStencilSetElement(stencil, entry, offsets[entry]);
          }
-         
+
          /* Thats it!  There is no assemble routine */
-      
+
 The ``Create()`` routine creates an empty 2D, 5-pt stencil object.  The
 ``SetElement()`` routine defines the geometry of the stencil and assigns the
 stencil numbers for each of the stencil entries.  None of the calls are
@@ -228,48 +217,47 @@ the entire grid (except at boundaries; see below):
    \begin{array}{ccc}
        & -1 &    \\
     -1 &  4 & -1 \\
-       & -1 &    
+       & -1 &
    \end{array}
    \right ] .
 
-On process 0, the following code sets up matrix values associated with the
-center (entry 0) and south (entry 3) stencil entries as given by
-:eq:`eqn-stencil-laplacian` and Figure :ref:`fig-struct-stencil-a` (boundaries
-are ignored here temporarily).
+On process 0, the following code sets up matrix values associated with the center
+(entry 0) and south (entry 3) stencil entries as given by :eq:`eqn-stencil-laplacian` and
+:numref:`fig-struct-stencil-a` (boundaries are ignored here temporarily).
 
 .. _fig-struct-matrix:
 
 .. code-block:: c
-   
+
    HYPRE_StructMatrix  A;
    double              values[36];
    int                 stencil_indices[2] = {0,3};
    int                 i;
-   
+
    HYPRE_StructMatrixCreate(MPI_COMM_WORLD, grid, stencil, &A);
    HYPRE_StructMatrixInitialize(A);
-   
+
    for (i = 0; i < 36; i += 2)
    {
       values[i]   =  4.0;
       values[i+1] = -1.0;
    }
-   
+
    HYPRE_StructMatrixSetBoxValues(A, ilower[0], iupper[0], 2,
                                   stencil_indices, values);
    HYPRE_StructMatrixSetBoxValues(A, ilower[1], iupper[1], 2,
                                   stencil_indices, values);
-   
+
    /* set boundary conditions */
    ...
-   
+
    HYPRE_StructMatrixAssemble(A);
 
 The ``Create()`` routine creates an empty matrix object.  The ``Initialize()``
 routine indicates that the matrix coefficients (or values) are ready to be set.
 This routine may or may not involve the allocation of memory for the coefficient
 data, depending on the implementation.  The optional ``Set`` routines mentioned
-later in this chapter and in the Reference Manual, should be called before this
+later in this chapter and in Chapter :ref:`ch-API`, should be called before this
 step.  The ``SetBoxValues()`` routine sets the matrix coefficients for some set
 of stencil entries over the gridpoints in some box.  Note that the box need not
 correspond to any of the boxes used to create the grid, but values should be set
@@ -277,36 +265,35 @@ for all gridpoints that this process "owns".  The ``Assemble()`` routine is a
 collective call, and finalizes the matrix assembly, making the matrix "ready to
 use".
 
-Matrix coefficients that reach outside of the boundary should be set to zero.
-For efficiency reasons, hypre does not do this automatically.  The most natural
-time to insure this is when the boundary conditions are being set, and this is
-most naturally done after the coefficients on the grid's interior have been set.
-For example, during the implementation of the Dirichlet boundary condition on
-the lower boundary of the grid in Figure :ref:`fig-struct-example`, the south
-coefficient must be set to zero.  To do this on process 0, the following code
-could be used:
+Matrix coefficients that reach outside of the boundary should be set to zero.  For
+efficiency reasons, hypre does not do this automatically.  The most natural time to insure
+this is when the boundary conditions are being set, and this is most naturally done after
+the coefficients on the grid's interior have been set.  For example, during the
+implementation of the Dirichlet boundary condition on the lower boundary of the grid in
+:numref:`fig-struct-example`, the south coefficient must be set to zero. To do this on
+process 0, the following code could be used:
 
 .. _fig-struct-matrix-boundary:
 
 .. code-block:: c
-   
+
    int  ilower[2] = {-3, 1};
    int  iupper[2] = { 2, 1};
-   
+
    /* create matrix and set interior coefficients */
    ...
-   
+
    /* implement boundary conditions */
    ...
-   
+
    for (i = 0; i < 12; i++)
    {
       values[i] =  0.0;
    }
-   
+
    i = 3;
    HYPRE_StructMatrixSetBoxValues(A, ilower, iupper, 1, &i, values);
-   
+
    /* complete implementation of boundary conditions */
    ...
 
@@ -330,18 +317,18 @@ On process 0, the following code sets up the right-hand-side vector values.
    HYPRE_StructVector  b;
    double              values[18];
    int                 i;
-   
+
    HYPRE_StructVectorCreate(MPI_COMM_WORLD, grid, &b);
    HYPRE_StructVectorInitialize(b);
-   
+
    for (i = 0; i < 18; i++)
    {
       values[i]   =  0.0;
    }
-   
+
    HYPRE_StructVectorSetBoxValues(b, ilower[0], iupper[0], values);
    HYPRE_StructVectorSetBoxValues(b, ilower[1], iupper[1], values);
-   
+
    HYPRE_StructVectorAssemble(b);
 
 The ``Create()`` routine creates an empty vector object.  The ``Initialize()``
@@ -365,15 +352,14 @@ one copy needs to be stored.  The ``Struct`` interface provides support for
 matrix and solver implementations that use symmetric storage via the
 ``SetSymmetric()`` routine.
 
-To describe this in more detail, consider again the 5-pt finite-volume
-discretization of :eq:`eqn-laplacian` on the grid pictured in Figure
-:ref:`fig-struct-example`.  Because the discretization is symmetric, only half
-of the off-diagonal coefficients need to be stored.  To turn symmetric storage
-on, the following line of code needs to be inserted somewhere between the
-``Create()`` and ``Initialize()`` calls.
+To describe this in more detail, consider again the 5-pt finite-volume discretization of
+:eq:`eqn-laplacian` on the grid pictured in :numref:`fig-struct-example`.  Because the
+discretization is symmetric, only half of the off-diagonal coefficients need to be stored.
+To turn symmetric storage on, the following line of code needs to be inserted somewhere
+between the ``Create()`` and ``Initialize()`` calls.
 
 .. code-block:: c
-   
+
    HYPRE_StructMatrixSetSymmetric(A, 1);
 
 The coefficients for the entire stencil can be passed in as before.  Note that
@@ -395,7 +381,7 @@ three stencil elements *only*.  For example, we could use the following stencil
    \begin{array}{ccc}
    ~~~~~~ & ( 0, 1) &         \\
    ~~~~~~ & ( 0, 0) & ( 1, 0) \\
-   ~~~~~~ &         &        
+   ~~~~~~ &         &
    \end{array}
    \right ] .
 
diff --git a/external/hypre/src/docs/usr-manual/conf.py b/external/hypre/src/docs/usr-manual/conf.py
index cf92e96c..7a16e362 100644
--- a/external/hypre/src/docs/usr-manual/conf.py
+++ b/external/hypre/src/docs/usr-manual/conf.py
@@ -11,20 +11,18 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys, os
+import os
+import sys
+import subprocess
 
 # Alabaster
-import alabaster
+#import alabaster
 
 # Read the docs
-#import sphinx_rtd_theme
-
-import subprocess
-
-read_the_docs_build = os.environ.get('READTHEDOCS', None) == 'True'
-
-if read_the_docs_build:
+import sphinx_rtd_theme
 
+# Run doxygen if building on Read the Docs
+if os.environ.get('READTHEDOCS'):
     subprocess.call('cd ../ref-manual; doxygen conf.doxygen', shell=True)
 
 # If extensions (or modules to document with autodoc) are in another directory,
@@ -40,7 +38,15 @@
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 #extensions = ['sphinx.ext.autodoc', 'sphinx.ext.pngmath']
-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.mathjax', 'breathe']
+extensions = [
+    'sphinx.ext.intersphinx',
+    'sphinx.ext.autodoc',
+    'sphinx.ext.autosummary',
+    'sphinx.ext.mathjax',
+    'sphinx.ext.viewcode',
+    'breathe',
+    'sphinx_rtd_theme',
+]
 breathe_projects = { 'hypre': '../ref-manual/xml' }
 
 # Add any paths that contain templates here, relative to this directory.
@@ -57,16 +63,16 @@
 
 # General information about the project.
 project = u'hypre'
-copyright = u'1998-2019 Lawrence Livermore National Security, LLC and other HYPRE Project Developers. See the top-level COPYRIGHT file for details.'
+copyright = u'1998 Lawrence Livermore National Security, LLC and other HYPRE Project Developers. See the top-level COPYRIGHT file for details.'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '2.22.1'
+version = '2.33.0'
 # The full version, including alpha/beta/rc tags.
-release = '2.22.1'
+release = '2.33.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -74,13 +80,13 @@
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
-today = 'August 20, 2021'
+today = 'April 03, 2025'
 # Else, today_fmt is used as the format for a strftime call.
 #today_fmt = '%B %d, %Y'
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
-exclude_patterns = ['_build']
+exclude_patterns = []
 
 # The reST default role (used for this markup: `text`) to use for all documents.
 #default_role = None
@@ -107,39 +113,42 @@
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-#html_theme = 'default'
+
+# Classic
+#html_theme = 'classic'
 
 # Alabaster
-html_theme = 'alabaster'
+#html_theme = 'alabaster'
 
 # Read the docs
-#html_theme = 'sphinx_rtd_theme'
+html_theme = 'sphinx_rtd_theme'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
-#html_theme_options = {}
 
-# Alabaster
-html_theme_options = {
-    'page_width': '1200px',
-    'sidebar_width': '300px',
-    'fixed_sidebar': 'true',
-}
+# Classic
+#html_theme_options = {
+#    'body_min_width': '900px',
+#    'sidebarwidth': '300px',
+#    'stickysidebar': 'true',
+#}
 
-# Read the docs
+# Alabaster
 #html_theme_options = {
-#    'typekit_id': 'hiw1hhg',
+#    'page_width': '1200px',
+#    'sidebar_width': '300px',
+#    'fixed_sidebar': 'true',
 #}
 
+# Read the docs
+html_theme_options = {
+}
+
 # Add any paths that contain custom themes here, relative to this directory.
-#html_theme_path = []
 
 # Alabaster
-html_theme_path = [alabaster.get_path()]
-
-# Read the docs
-#html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
+#html_theme_path = [alabaster.get_path()]
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
@@ -150,7 +159,8 @@
 
 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.
-#html_logo = None
+#html_logo = 'hypre-nwords.512.png'
+html_logo = 'bw-hypre-nwords.512.png'  # Black/white looks better with rtd theme
 
 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
@@ -161,6 +171,7 @@
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
 html_static_path = ['_static']
+html_css_files = ["custom.css"]
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
@@ -171,18 +182,25 @@
 #html_use_smartypants = True
 
 # Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
+
+# Classic
+#html_sidebars = {
+#    '**': [
+#        'globaltoc.html',
+#        'relations.html',
+#        'searchbox.html',
+#    ]
+#}
 
 # Alabaster
-html_sidebars = {
-    '**': [
-        'about.html',
-        'navigation.html',
-        'relations.html',
-        'searchbox.html',
-        'donate.html',
-    ]
-}
+#html_sidebars = {
+#    '**': [
+#        'about.html',
+#        'navigation.html',
+#        'relations.html',
+#        'searchbox.html',
+#    ]
+#}
 
 # Additional templates that should be rendered to pages, maps page names to
 # template names.
@@ -217,6 +235,17 @@
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'hypredoc'
 
+# Enable figure numbers
+numfig = True
+
+# Customize numbering format
+numfig_format = {
+    'figure': 'Figure %s',
+    'table': 'Table %s',
+    'code-block': 'Listing %s',
+    'section': 'Section %s',
+}
+
 
 # -- Options for LaTeX output --------------------------------------------------
 
diff --git a/external/hypre/src/docs/usr-manual/dummy.png b/external/hypre/src/docs/usr-manual/dummy.png
new file mode 100644
index 0000000000000000000000000000000000000000..94381b429d7f7fe87e1bade52d893ab348ae29cc
GIT binary patch
literal 69
zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1SBVv2j2ryJf1F&Ar*6yfBgS%&%pYR=^yWV
Rw;e!n22WQ%mvv4FO#tpo5$gZ|

literal 0
HcmV?d00001

diff --git a/external/hypre/src/docs/usr-manual/hypre-nwords.512.png b/external/hypre/src/docs/usr-manual/hypre-nwords.512.png
new file mode 100644
index 0000000000000000000000000000000000000000..aeb57af11380c8ef3faaec6ce3013936df1667b4
GIT binary patch
literal 18577
zcmXtA1z3~c_um+!yCs#7E|HK_LQ=Xrq@=sq00n6f1d;A8=^jcbNOzA=x;yuO{r;Xm
z&$F@Z?tSmM=bk>FyGV6ad3+pd91sYEuc#oa2?C)3FF{|iFo5S3>Z1$bAG(LMqBa)r
z7l`%tBk&&ERl&dm1R{9*?*V4y%cliCeB>#o@2TZt<LP7JZVmGB@!_#|cJQ#WaJA-f
zakouB5T^!#9)lERUupYh>}T43p_!V3uW;JW&^aQCX8Wj^qQp~|@n=0r=0~4AC;dc7
zB8`TQhMka*fR6R#2{ZFclE)vuhDxKoH<dYLB5aJX)QZ8ySU;Fjy1aFhci6A;78Ibi
z_vyF{qL(OtG_?4l{MqKBhZ?aGJ6^bd(i__gjA4*BsIgJPM~*Q1Egu!${a0-@TyuSo
zUqu4gNM!^Ig5u#|?)5bd9)`?_6&^@t@9o4RFfH_s=%=UebyIBWPjlcRI(`iJ6Wwpy
zzn>ufAR5U{vj~k>^ds>w!n)P5tw2<kPtu2J@r-fy#)mBQ=Cax<UNJrb26Jg*z~&!g
z4tJzTnyF^1239>nR;EnY!n)1*(7#iG!bjguq%phF8Xo%?uOCKnsvKnlBWLu$MOZ3A
znf4f}Xq~u@6l;_5@bn$VWMGVn(E^}Q2cSb1$%*)dXeAE6D&244T>m`qkIDvfU{nqm
zRY&^PuO0H#R8up6U?1iFo3SUHAB4C6vq+#V_wz$7Vw5WUu6DnLn?J@1xH6mySRfeg
zDC$9VM2d)Vn>9di^T*l#8~MVA0S|E$t)p|L<m3CB%iAO&%y9YzSh@Mf5LtkeTjYV6
zSD#U0h-@qRiGNh^TZn`1sn{#=LrU8OBY$*$iSOXt_|v%A*e6l)Zw+hRRG@nz_R64;
zx{$Dt$y3Gdo={6;{zm2B=nvEjcK_X(t`2>4Bw<{X!53YGb_Jx3ka$xYOdk9;!1>8A
z7$5iw5pN%8OJ2d=3C-AGyWs=c-=0$^U)*M<l*IowMK}gL+C_!O+~)6=NaSX`9?`hj
z*YxEdb>Xe%c<|u&>l?<ck-y_#Ic&n)92olkjhy!Zbj8<={qYm4O(}apihQ=<VWq|j
zj9|#zQ9*LDS4CQS5tVe8tZ;k>4{$rdU0o6Jzu89lfZ3${s@CH)aK65ynfUzxP?$?-
zfd_w3EdDEQMD}icsd_H!w%QQmznfX{W4uHaXw9wczY_rQl>d4APavMtTY=8hyt!6p
zo3VCZ&!DR3vjSX(Nd6O}Twr$CH>2zDwEKTziuwT%ipO3FPJRRmBXgu%0{Qk{EW-L3
zzx-n_bre77h9LsY;j@r858K!LcrSzfHDC>4xvYG^yz9y1Nl(q2w(3x+jwAPKT>qP4
z6_|nHNueN#NJ)K1&?|oCn-i2Z|Hps&5>5|@>V0(5(e6DnT(L5-0Ttc2xy+EN{%@n~
z#DQ&KRj?NXZ>BU>hFZS=ABA1Lz$Fo+@Y=#yiTsfVvl@xZ5Pjxn|2P>Buq7CtoC4zE
za&j@%b~Lv^{bOPEKb|1fA8XB*SX`jm_ghf0a*Y4@a>fSCz)(N*&`)8JwB-cjjh3PM
z?{i>g{U3?r^Q5yK^(H^|P%jod7-Ie>>SrRr*r|Q`eY|#!HUBs8QJ8NJ|G&vy9#2i6
zQSC$|r=Sz?I33QF5siiWPhTuXSdk2xmnaBjKEhFvv;Epmw%&}U&p?IgxF!`2@qiP;
z2}69GM(&?iIZ)#TfvrFla{xgzRh8TEz<PIH1J_|>Kmu{~DVqsJ3i^%-&<QZTr8yr$
zbW}M36~7HhhhsX9aLaadc8}`uVIZiZlBb^{+zR)XaHHPV=RVj5955X#So77hrVq~|
zszdm#+sr=l4cmD(4z41W5%2^V=KE7ZsN_JAz)G#e<wcD<)jOv2Vdjun_=w|($^67g
z#WoeheCW@@RrcXysMu@5hw|M$sr2C(xsh>i^gc-b=)t_kOMx1!tKYEp54r@rAOWY5
zSks{#p|qr}M?3Tg_XUsG2xjKa?+^IqdcN1$;C?EM41x@-J&=Z8vnW4xGk5y1BcZWf
zJNOu|sa$7=!KAvpLoqTmq3ozHFAyr`;iwrfeS?IsKYdazopdREO9b`K$CWc%AwDeg
zL)~7<F+6y&)5sF1>KtI6sE};tu=;T`sWtUOP#4I#7BJ2#YhKC#A47FTHuGHcSqk=B
zT3-Jgo%zp7?;_MfEXWDc>;n!cboyqguAUz03>X^CM9RZ|IE|Q?Zthl$UAa+-f#q-F
zJ$rJMx^8J=Ep)~DAT>7bLY*frXx_1%7cc|b?^jAFJ0z94@LF2w8&DNy@Rv8Xoi+gn
zD^^r>j1NP*g9x21!JW7muzw*q;f<}P9gBf~MXYXnc7E8(-`T8mmjtc=wq{j?_Y&>&
zpH1LmZ;W9XnuOR^pZy3S-C_IDa}Z!(hwOMKE)aw_dEZVYtON4MABgMC{zfWo`@kH9
zGG7c|Ec)@s%(?K>!vz5y&PCiJuto<^$iRY;EA|BsR{78Qs!Cm)WUhc+mx>HP0+yHD
zmFed7G`ZPUDNf{^rwv+-fWNmOG2K$9Q2FP3B!>)}IsK97QMCWtfU7}qDM(zkyB&D;
z_r;<C-LMpGGw2K1*;gF9UY8&PF`O@!0S8*gcr${)eMJ1P4|Wlv2+IYJ8G;vmSe`^1
zN(kt(eE~S}jqS7?re_v*OvQTPGQ=BD-#SrKtJpqY(6smiq1iQSh(uoXy&1&?I?Uvf
ziaP&nkQfnPxBVNq6^yPQ4&3~)EB_IlCzo_J;29N=Bxie`nbZ-a2n@t4#H%^azvM`+
z1rHg_H81A$VLUV*b=Slr2~C~mCgW?{iL}ZPGq6^xn0+Mtk|flJ^vFWG22Y<S2MbSo
zo{?HldvCmq>e2q@V|aSqc8qnv!GHpjHZV)Y2U9~)N~h+}u4q|OR2|Hg`Bqv3hx^>X
zY}QBygp}h*ripjfN6wU|fGB?yG95+_*A{*K%Ho6hs-}K}0+ufJY);9iUAEWEVL|c(
zj|dl|2=1QCB7h}7zDwykTx*;6W@Fp4t3$CmjbxIX0UIMg+>9mhV^=Z%MBohXTT$Qv
zuvZL6V&--5;ypm6^Bar>umDzw&(j6bo(onjgBdx+V81q~&MIKWAGL~Svu@uCWg1{M
z(~3Y^RZaa^pZIb>51)p1ksFbd$^X@v%0Tdl0NV(Y7i)O-5QB28Ut`c%O%QM#=_nnb
zipYU*gmuoipv9vp!;?ayfltM1Ml-9W2r}L8tU2DARS=b=VL!29Mkr(H>RvUY^BH$1
z>-Ju(rgHhj{xIK<ry@jr?Nz)QkOJ@NZ2m+6w9_1!oEci@+uSbkqXjXw*35@|2E>_Z
z4E&n)gZOzq+YD|P$`qA8z>no70G3F?Z79&x{kfU`p76w<&KKZnApRA<iLVeD@+nk}
z1?s^#$sfeYeibC`>aLu)x(cJm%$ExLdfer(nQL-y0)55<ZdH*xOP#BdsjiN&a6o}Y
z2{!f<HdCv*Uff*5NXR{Z8G}a(&{Z`*zO%T+xl#dQfY3t5vyR=jj0JJjG2og$WYgWf
z>Vo&HTGi+GsQ3FVYTiCC0TsiNSdXV=QkR#u<xUR0i*kLF*KsSzb|^2x%J)EhMfct(
zaay`?&hB5J^mNN$Z(BA1^^yiu{mqcSAs^J9MJAp}!c{RgnZb*^C_=YwB>OQfjk0vo
zbJm*Q%wIa6S`%>I<)D;IAI`uw#>cCCm0=sg^aEr3n*M9~Sf6Qe(~-oAz^OOZh{_AX
zVsxu$K1tuXlY>wt{3Rgp5R71gbH7sSW$hQgy=3x_f6e*eluxh>dK&&hBz^cT*&?&K
zW=|g#?rs|6MgNchWi>>KB=&G&RY&Y``taU|xHzed`9JCNQ@9hPp#kaW%DTHrgdxRn
zgDp_s^_Ibzujj%puR6=a;W~PI0@)tL@RGPt`mjp9gpc8uBoMG(vifnUuSk9tVQnf~
zkiXwfea$mZBn47s!Ncf#M)DimIQf3-n4PP667Xd)ddpk6-mWO3-n3;k#1(SxVToEZ
zcxRhx!DIJb$)y~y0e@ZHwiSzrUd(PE$0ZJTu1VqV>k_s;T~5LqEE33f8rh%bKE%8>
z$wNwOEF9+W2$Qo{#>V|B4`|ZeQ;$D}sPkWO0lEkd#HKr}^^<_wLFw&C+Dpil2u%2o
zi2HwaEG+qH8q(x^-k0;tr=@oy+0$0Hkh<f4`4|FlBSxA=$n448r=O>do1J48?XkL8
z^mGOFxeSSDuATcWGvP0Ojci=eS$D`Ou^|f!kgHEa7@n_zFY_GO+6jNVWh^qXSDug7
zo$tdT@SwKVWz5yzzoP6bf&+U~L+aqEC0QTF5C8dUc=9ym==FDyN?hq*m{8^%#ucR1
zTrHK0<S1BrWHbd$`9tt?a2PqB2A@i|ja;vPY~+jm#`ku>H><IPS<D0RLU0)-C1nG=
zlcyEs|4daHQEK<>3<;hl?6-_~FQx%JM?WY^N3=J8VMQMNML&h2AXVrG9vQ|tF7fLd
zf6-Ev?Iqx*bt^gJZsl-7(i+9)R`*vn>9_g#2|qq&MfzG@_whD;@%@Pr+J;%WHTbeT
zXB5v&{JRGOj(;2ql~IVq(RlI=<pK5)WVw3WjfQMOWX2_>o7!{r{|Z7A#}nr&^b$Ps
z@T8Sx#fWHAYd3uAA|PsVrtj&9ATs9{)$Jbr7w<eW*7W}-r%`KBFP#=YpLP4ZzR=|!
z{>}aSp9(Y^X0Q3FHtcTOkcJZTf>0;iC<#NIj==fsg{)h@Ldv^GbG&d;t9I`SdiWCe
z?%Mk4PJg<b%Yrdy<<`eD@2lNApHa{sRD0GN$x$>ZuZ%?jjecNv1~m=a(5lDeRDJ|t
zcRyWS-i_LJ0*onU{r49XvwQ_5bOz{)(8q<JMYyUTT7xt))dy+16ly#Z&8t0ZnyaA_
zKq#dTZDzq1)4hr8N+nucVz%KXzr$;ua&r&ibie6aY$~kB*`g-gr=mQdZv>PtBl?14
zPtKNUA8)~91y|5g3P@9eXxS?}LY9;l1S{^%Fr3(3g>#s?7miEen_8iINufH#yx(4K
zJ<d+U?ykLNbm*<#wDDP7#k|g}LQ)gMwrBP6K<t%0{!uil1C(8@8Y8-*sLK5o=l)C=
z)}E?#avhW1CtRdQ>PmNqQw1UuZtk_(x}F(}j_j3(xl1#dSljQyap*x^xnnDlBO*6R
zK%PgCX%{PAm1Ek7^KRV`!-)9{uA|p5o{vVt`n`1*1KXA9w`kP%b%Fk|d6GyQxwBh_
zG55->Scx6zeJj7GXje?S(@2Lvh59`d$TfoIZBXeH<W~9jWDJmHAhd*`scv7bVPgA^
z>&?4u@6KUgIcSAeH;}ClGwhMIPvfkpbz6H4XjROC62__dS`{vu1CMivA86Wfe8t#(
z#d4P_I7hE1{Lb75_zJ0t%_F9NzS#fli+^RBW(*kvd$C5_xP8fFRf_X|EUBX2EcIFB
z^1;4EALoS^@~LOIba7$D^pRD=Ew%MTT0@9f<cxs(`meOe09t)@!dUj{l<P4x+;Gmu
zh7QC4OqTv(3Ozvgrh^PFueJ88SZj@~{}*?KoDc)1zG|99gGFL<3QlppmL|RlU~?s7
zlBb;!l7;*1#0NH#hZL*(?|HsX_ql@!i_oiC#MmFm5yqbA7viu03D3EaL_115ouFGc
zG*i``mlagkde`B})18=wJ;L&o<Swk}9;698c5)P2X|rGd?e1zi`P6#<##Ce2XWa|n
zhR&L!I{VWjP&kqsS(}VJOJU^q#g{}U07Bd}-Wlty^ErzgNXNG~p-(-d>@xzB&42x1
zukF8|aChkwtpW5sO4HCsoh60kvA}?^sX~;KH+xA<WklP0>1}!s<%Nrml$r9B4GpD*
zn}7<z*T0wXo==k~#rf5Bcvcp0c47;fkD6TGw6#*S3;=syo;+O)q=-)h1X?Z0T?4mo
z9ZO<>+)&6V5k(U*n7;p0Z$Kg!r}7JfDz@&H(I~B_>>(2(A21FROXh&x&7B~Lm%g+)
z{6wi$OAX>Y#s_sVt?|N>9@0sY7nlS{L<t?*e5+{w69*>T9hm&aRG(sf>Yrc9CA8y<
zP;LaI6ur1<@-3K4juZ8w(|9FUTD0WEI%Wd&h4)K`!bhhEK_|oB=2$8}#v(UB(N?!U
zwe^oN6X<_|^KLjyPD^HE^&MpE&GeXOG%_RA0j<PwKN<l{U0<K;{Y#y>q%oXIW%LL$
z$)NfBhUi9W_DX(5DuE&_(x@oxv5qfvEjd;cA94kN^f4c(6UZAV4JU6op!W57kS=dR
zn@BC$k64kf`+q^p<W0W|6IEeWrH+3KN#AC~+9mC>2~c_EM`$d{SG%EUpBcv^vtXTh
zXRkP0b#cK~iRjl*O&<T|%~?`RFi=j+iM}|OY_8iQ{6w44#})_SM(3P@nwjd3wltPE
zVDz;}wmd<-$)*r2V8*M?58IvhYmw%dZ%HLk$%y7@p7P%DP<*A-4d%bYn9+(kJUAB*
zdCP-lhBMx-pj5tH(ta}{B<J-~kHLwvLZw@>c*rxmJa~KOivI;g&5B>BR(Q#5y3-<!
zo?3z+9iY@EfKt<tKcSPEyvjgdoJzhzYIQdt80c8_PAh)9xf`%o&cO9b)cYFAE43MQ
zxgGm8ySw15+npW^IlDirrJ>a-nrZQlBlr?#iQ`|N8M_@WSH7F=$2R%wTx(8ogwguu
zaC2+2&|-_M5qs220;q%RZXR<lc!&+}eA~iHQ0<x0<RQGo*P<OO(d~J7h7cE}0@1v`
zI+G+1RGmAl%AnK?z28Zm`-bB?Z$@GG*xU)a%h`(|r*GDc5$s<H+b2iN07VJ;1~<Yq
zJ12k3a(}nMyq$0Dp2R7|=DZ6YW~F~%N4r>in^G6hX-q0&n8Gjltwop&2&lhcCXNr}
z1UNzj|J*knzt-G1RE|8XA~N0;Y0)=|xJjH%9hGDDRuLZZgE=d;zds;oB-=ls!*$f!
zM(TR*ALG9Z*p+TW71qZ=9_khNkUm3^&_QUIA=IG%mzR-o-{sXEUJ%47g8Y7>6{r{N
za_)73s6O)KjK`f@xsGr&*I}zR0?F^Bl8PhQ+G+M@q93jPmA$YYss!vU^EudamifZ@
zU>>B$lP_}@KZu`qE8A9b1bdkDwm)WfF&j`3ze0w#+WxR?BKROJor*(Hd3Vn!9#Chv
zJ=0*9JR*+7TJTuMQr)8jsx&Sq5_fX@=bsN;b#W&?S>CLq_bdm4Kl{6pwthuEr8A?V
z9^pc6GO&ILBZ#`oUf(bT71Vd)-PMj``+)_E1m8ac-VZ~oUbWf5&eM>$aY;tB8^%Da
z^|a9Indo3{<-=_wRIcYM7?l@o(7C>moILGk$5dycdOJJc7O~8T<kS#nJvYxMI$V<O
zcJj=2r{Ih)MvpH>vtDjbkC0K#-X11=b};$7N4ayfEckha|Lk{R$B`hupI?F_*Ay#s
zuf#@YPo{YDKcgb>+ikM@0Urxw!Pv>4>le!#8j<;G=$FRgLGy{^_h0$f+RV)g!@zuS
z{m%EeAuBIbogW?fM$9~fUx<4e+Wgk4gA)A&9nlDWF3TFii1P+w1`FQ5A}uYNhP=pB
zb-Fxc^w@MJgPgpAPw9I)))~gab1u<@y4VD$p{To<tH1I6Ce!Fa@iT=F?ypAXx^zs=
zw3XUrK2YEP&<U(VF}k`WAwLfYo{N10iTreP*ZJI)tZON)albmN>tzU63YeMATG&Q$
ztyZtQ^uPPig&FIl3w=p1=`w!&I#u4uY$+S4XsxU>-es(Nk?RZoe$e|~X_mG<J+IA-
z$78Kb39?!%^}QUd8V{mnZIV^m)$o)I5POH06^5jT8^N{4&MD$fmGfQ~R-Vp1sf>EH
zy3$!Z8nhp_$hDy3O#^ZyzQ1jxz4BILhp|^aH8;NQOmGwMna?t+UwzG9IRQ5rFpJp^
zP~ki}e0u!7T+t0zR8aLM9xpSRh#TCA6lp1oO)sdQURFP@&OdqQ4*CNlw9b@M25MDr
z3@VQ<bNMSv#l}Lb5?5J#PmbE>tA)8(&UFAKivT=-v@SC|>t6o6mi_7$(T6!0IPWHp
zzdOT10q!bw|E;CX2RdnxugBbn965MywhlT(Rws;qI})II1|{#k3Lp>>k-hvrwqIpt
zwEuo(Hp^&)rRd$;t<hNLbl2>jee03z;xI7Lx9pd4y03zDrD-o&edZ<T%#y~Ha>8D*
zh=vB^xmq{$DLk}ndyx@l%xY%vRov*=JQbD9#{w!gPa&*%pM#qo;hg7@Up=mEJ-dp)
zX8Uf0uxM(Yh&ibSBH1(U`SJL0&e^9oj(gnT;&X&!g^5-QdO~T?-?QDScc@g2<8!L-
zBM?6jE$bzYC~lr^6?Fgl1!MaziUpZdbu;MGqbIVDvpK0QY{BoUGnr&%d3zH3B-o=2
z{(FlEYi4*M8U1bS%DT>x0nSqs5i7&q_MooCs!gefN1n#)m5^!8yZy<OHA4qI%35-f
zUl)tkKu}978swABvDu?aoSAr5ReiRi=2;edOf;WF!4}*%DhPNmCI$P-cxO%=L{_DV
z_Fl;_iRW9F$8tmh`)C7wlsdCjW^@Ko)nw)BZhko-${@jYOo0P2kVtLePlW5?!Y(4D
zaWlNd!a33mO5|xj9h*PmUR^8Elyq6#U9X&<+^fD^w;<-|qS;w%o!fYL%;D<-+B2y9
z;H6(sPry)dbz92atBrWRFbF6z`@crVU7GWbT~8$1UtF_QRtw#{%1T#x9E2AF>SoJv
zt_R48&y`Sc#u%TD)|-n7$C1j}syeWvZYOcrEvgAjt}JI&+{Xg%1&b5bA}^azEuc7O
zjTpSku}%0rP-NxWuqNbPnHBU;Ojm=Oy_R_K+8cN)baiOUo;jiC!@W{cm@~=YYX#?-
zq1p9OR038P)mHpBx>Te4VG0G-0}4o-qjREO?=o|*RkjRiS(+Zc9aLWsh{pZZ?f=#L
zj``f@pSwsHH^jU$v=7jHC3lZ}ATD^RAdxUWpYY9Vf@%@PIm+(!s$>gX!Y^NHQ3vzH
z>;4#IL~axwFj54$oy($O*{b0d@pN^<*!<kM$rI`CP76dBiUvm;7&xynFKzAyE*7EI
zR+WT~hV%4Ad6cUI4u87z6h>5Z3hIlV|BwKv9ReGL@q#;(B8tC?_6YU#lGM%@qMW6*
z%h_5;d?_+3PuPy~RwQSM{)I0z8DZJC68hb$V>VWUC8L`iA+(BV!?E4>u%vzHU_cQr
z;mf>kIe6aVLP2s7f6G@NoX+orYFtKN^U+ncU?u>CZfc1u7lNY&yW+k9#XmGp25fkx
zi(OJCc%rSFr0ZWUqHTONKNMv{EomMdCK*MA^`Sp^H#GOxIGRO##kH!k`2fEhAbSWs
zAP?pgef@{O{yS{g&HZU%H5l+msZ50p6t3R(0hggshQhb~jhh&;hSiwzsV<XS4`v^#
zq9~K2=;742P18$2-Y^eswtzt8|H`nV41kdQuOzWu`n@o?O*Z@9%sJp7YA0ffunXfy
zWFg?;hI6of3X;!nHCnIYJ^spHh5S*V`(Tl3-72T#fQbx&oW8UBQt{qqwscx@g?r1q
z!zb_q$}MjJhX%*w;)Wk}oV>o_KdC%v2H4@lO|H9}KM<Xb27SV%N7eFx8H4WW%+r^=
zb7l|lQ23)e2T_kk_Ywl##YJ7>>EZ#JL)Eu+3#v3`d=#K*$ON}iURaPPbPb5-;ouYc
zqL>Wb-=}MLoo4mK;yX_znK#}LYbayug(btan0N*~BeNNAkh*dW7ghXC4pp+?D?Saw
z{+Uug9mktTfD4QlQyos;-G>6)qhu-+{PL{nzUsqI$=1V#EE<{7fVcB4D4)m&7+_^l
z&o^F>Z_0E`{Y$y97L(xk@gtn!5hc12S=S?Ft0%T=yuvJS#j!9HkArr8Hb;i0KZ*MV
z%=&{$TH_q-)6bw?7*HU!(oo&QVXx$d%TMc81jvf0X_%AkYn|Hos1EJ^y!}T|8nR<K
zk{{$RYzty~HB%ew`@;?1W|_>6<8**}diLx!{vuKCvQIC|o@qO}D^tyBu3zsJ5^RGz
z>hRzq-%*l04ML_D?ngq&8;sI%?*z+e-BvNPvW({m_-_x%+K^qsPRdM1lw=McU@nrN
zPMVtvXJ9>q;$PwC@xLhZwZr#5T|bCEh+$`bZOXe9b^-5`2X7qa=DPipueBA|VP2=h
zMd~^70DHn|Q+Xu^33Da;fZ{C_=2pWUCu4@*alkT-1Sps^OY6c}XOC)8-SA`9^~~30
zKN9QSuNN`SB|%-O&u?3Zq`ZVS_E4<kmXxZ!E*6|{i9Em8!Bn;#{_K@c5D>&xhmlTY
z5Vih>{7&lhajJLqk(9jNY#>?Xna5Mju0x=4wLF*_68jRSkd(I+WA;tr(##EqJY@Zd
zbwQC4#lR9w$5NKbBMuUz0zo}jj`b7AML}0{s?c7^RmQ2yItgLD^#-Ul#^(DxMspkk
zdDADdg{}UpBM&2NPKTs{7g97=G7+^T$sNK*WaMCv-NCd-XB|4$E^y;)J(Z{oI=s+Y
z;Le9M&tz~Fr{d)d4x8Lgmu1xPSrA~(a1+Osa&37*d+O>MMt@DIQ&lvMQ1Oi^bqjJH
z=_&en#&pMv1N88%Z@(kkz>&$*Hi%3ka_y4@<ZiPv90J&N2@GNaIXx7_d}Ir?#3Hfn
z#*y!I(Pg0VA?-ff<cVot5f}HfwLR1=&_^xeE38*VFCx%z^^`Q0A8jHHMG0a5^@3^A
z`zB7|p#1uORYq~u<my=h{Q9MMl{xrn>suGG?^8S8!)5SH_y1!7MBUMXA&KaTsCbfw
z<fK?JjK{i{UCGn)h>rEB7!e@`k?O!lt&J#U{>ZWE&0t5301)F*%)h>%V%E>(k%#n<
zA7M1wFrYQDLVnTY)kk9#Gf8sog*+Iw^$Ky}dQi=okbykEvX=o9>gqno)n^oX-4z2-
zAnBj)R`QFYVj-Q-H2K?p8R=5w3ccH|V~7y-R}S&kd4{v|syM~kRxWF9>VjzlMXO;w
zrHa$OpkmgO^4Flf>oGjlv<uIz==+<5(*s|}^n2w}^H|i%XOi8{hwN(R6V4eqcJH)X
zg5u4rD9>Y^HxS(nziI9nUg~FzN>9V6n~@!{5goT{zv#?FHX9;-a^YojNO_zAwm9Qv
zP?c_h!=!B<oR^>$=SnZ`wyq{g<<rfHvUYViht&!u4y>GgsB?z-E`-_4_y@s5aBX4@
zcK2=7c%8EE`>gbFe^k2~`)oD21O)EhE3x9}qMT`N0)Jw<9E`X72ETqHB6*39*?I4-
zGe?R4sP=46z&X%$JIA8(&$=M@{oBc$cv}@7lfR3$2bK#j1j^&|hN}t0P=8oAI<tFD
zQ0$+n>XA!MvcXfMVZ{>NsitLbt38LxX_TuZkMLgRd@B9i`}dV{^qa60@^nmYoyfQR
z6pz+}=r?8$l8sH2sV_B_(TDZ4`Xy)wAUQ>GT6Qz)G7|wkm32R;NnSCy#gf}(9I$3d
zA8j{AfD+W@2z<9Wm*`C+h5KAatQPiQ(p#kKvRD+(J|)3XYjB#881YGyfGiQau>|5x
zJ*jWcIOXGP|NI=zRKZ<#AnFGFbmC$~Bh4Ssic=CwT=cZ<Jf6%9Nrp*I{Z@<XsMwA@
zUdS{&N5U&;Td+ChozW0Q9xHwRd%U^*zD^T#z5w@BD}vwN8whzjq=3_d_G(dL)w&X<
z*xfqvX3snUmdSesa!YwioNS+i?w8-|JRImp18fr0m3sDAy2f%6{WVY42!D0BPvc_4
z$aV#-U~c`3QCJ0KdSLkSZ`!kON0sl&F09TYSwMnb#y?`?{8s}sIH)o6M(4#>8$BMv
zG}Fu9e%epvwF(=NBnXP_Z(6>5YEB=^?^@<x;S;d?s4tjg$f4723+rIzxJF@9mq{n4
zarFMze7<Fp#a0wcASzB--$(Jhm96p@nI3%*yGzVU)lRL(i@#}NjF~<Q$+LTj`U(`d
zf%lybiX}S_H?RY5u8ID)W%NFa6Ljflx|_VW8M^m5ShT1OGkcErZ7i);+%|E`c|0dn
z{(^&}$68XrPBxTBeLZ0^4qM*ie1zxFX(ZX_QF$<ujpj%&@6xbRb`%{u2vy?=Jo>s~
zK&ZQ)L^_Bvb)^1cNB2xzhpOJYjL+4sjL%%5Z2R=OtvDs<g7lN3LV<{V@MKi|(c;y9
z*4tm9_Ct}fIEf1EPc%Qu;yn2j1w3hDjTO8{(I!e`1!bVb$G%z0zU$qz(qa6d#H<lX
z#*xN6Ma^Ag-)+dmgp&I6ys6Rkmx+}5Z`P^k3vv?nD#;T|(@dh3x8Im(c)#@W2xQ>~
zEuR{xu4Up+Oc6Rhj_5j4>l+DZ+HpIq>|*y(ku2SDTi@&$92WS|A<SFogZ)<jz4adJ
zVO`Uy!qzGM+(FK)HUHVWs4bqT)Uwibj$vl4xFpWJ@^YOHnwwJThGC9?@B8$A7xP+g
zaaOfr$y}8^ET0`2O1v$TW$gO&SI)y?Y%!|Z7AFdyNtgB37!kcpnlu4C91?3er{m1c
z!Fc{RHc#7qZN;plSu_(As+Lm~@;=@0TK6ZLl14I{!A{*8_0^XIG|8~5R!-5~Wu`4h
z7t_l7x!PVY%>Mc|L$dmvHs0?qfviHCI(GMdl3Ho7Ib`mr?gj0o_PMC+^;^;z`Ug6k
z$ep-RtL#qhWIQFTht|tU^-c6YJ*>`h?>{b~>5qwjv~60<|F`ojgt;@<nFj<o4d_Tp
ze|@XPW9#MkW%J~iq6*vV4Xo>viBF*|9c&wNAgy;lZ(-sr9|dQsAjCV(keam#!bjTc
zw}G;zwO;Vc*I<+aJ4L%IO?oGhDmJ(rKSYSB0Q<9whRRMC$J~1*A^vab=Hq)uUhlJL
z>R6O1+JDSvcOJ$YNFMAQ>zUO#!a%(=DMiv*E-M}^L*O-bfN1Syh8I;kZt1^ay!Eyl
ziVh6Rm+KsBZ%^Zk<WI)MlhS^d70rIVf8@{mqJE7q89dEu3EGjPI+X879Dj#<zQSlo
zobufU+JOINjc#Y%4O?_N<cfTvF~(FSTn*ZuQc*1^@Ho`z6Q=Go+jMYc)INj*74Q|^
zW%@|+qa|2_E9bVsYv|Pzk6*9!Wc-64@cI^|n94l&V?GRHybtz#uFF9~;lIK@k!|(8
z-*k#oEWc?ZcgQ=(Z!E)m<{gb$g*O5H>F@nqaV9`reN+yTJxOp`rGk|UPU)8};9pqy
z&z}9wgWNf5X!S#@gvYA!;me`P({FQzq$mr^C|wthv&8m&@7v}5?Un8K6%9^569vtP
z)yA!DFfJ;Jzy3uwQ1(6KLRHqjyj`gV&Ezplg$ny<Y(i*YCr)#d;^Yz*8dWaVM(ozl
z@?T|B>t#7aAH=^C+LYG{L&V6)0?_rHzp^5iKM2h2O;`JHrzzxUzKPMq_BJxCP4`R{
zuUn@2RK55EgAOm+k}@lC;I*pl$S<M8u1LY#A@y&dz~*Iro0w&eGrw@jZg=D+Vnh_<
z3JNq<I>Mrr)r7b?`ogmXH$xcu*wtk_&Hn2!X`Ib(@VK@e=Gx1pK8cMnvn!?>l2s<6
zFLR}36=vBu7e>okD$41jqvfMtyGNht%pkiY`Hir@V1V4o7jFK!4M!7O?MJ9M;~NK-
z#Ofj=wGRzk=1Z_%aj@}F9BuxU)xk9=VPx!z3X<`EZ3y3_>=<dS?p@%J2AMfUUWEBK
zu=jqsh0!Cn6m<A>zm{d_c^m)yLMroyEJO;NT2i{sC~rUm$%z1PM~`N^>Lpm_^Dem?
zH+2d9s+fR=73B7FqeI#~DNG<u72_q@W!K0ZALeaeKTH5Bc<>WBuyN-y<XU~Li@u6B
za3*lqdEvl0EA)L2R*P)x4PDV(nl0(yee>rVo~EmGr~bK3<G9{KG$a@+Kl$JzRXC~;
zeQ?K|(%{3^pnaWG=Frhd*;GsvBt+>NLmDuE*RZ5FP9xE!&*Bx{fy(Sby^}Aa-ayn#
zZK6uSWa${m9YP3Lr6VlDY9Q6&20K1y=6a>X>oHIf5l>Cdax`XExt$>?hYwnPW}}v3
zlTf52x5_I&)Qjv&Q(=WXeg}H|1P|1ezuqOp%ke0$=dc%8^w4Sy0Ay-K%qT4c0O?QF
zCCe_`FwnYV<&UDElA^JfKpKG4>5}yDs!!@P5@4e2RavaQ@l~<0#9LJ`#nG%pzSh8&
zQH+<1%%g5h8v2Z$Mk{?eM3vmk5OniC|0&tB(8SR_DTe0x1O>q+0S*r8N96bf61ozh
zx-!r3n_s@6yL@R3xwwK&W&_)SvGgALvHb!Tw%@|g_f#9bpxzrgpBHmc<#b^df6?pU
zwW#4j2+y`~U%1Nq8W^Z-&T`8HpjD_1zL{r4o1&S2VN~a{gjO|3G|4ARZ8<WtSJJ?T
zE*x|U%4vp_5Wi-+1ox{B2tJM9uymd<l)elPbiv>pHiFI&$2YBO-+g<sKtZ-Ed)L{S
zPUKhLCbCneS1nIwq*(RtgHCQLLME5w*RvlvkNyPk%*VX{`-%*Mppeg;?E_fm>~y>l
z)g<DI1-$-FO?o;ySPsJ@MN*;z8^h(~02K2rPLJwPe-PxgN@TH(4Jhm}ODZLC0A6xm
zt1y{0tPC34eGEMZ8A~<()L?BWxp>&AY5~d*4BAp$qMC+3LR^v?FWE}igyCu-t$u8w
zj|;uPt{Vlqy{6qUL#Iw7l|^?m#a!yo_x2c;9`7^-M=$<)U?R~p6ho8ZbUIX*;n){~
zdfgBfsoh3PIg_57e0_wD$8&4+zy_;Sqh`$0e_7API!1Dx@036L{Ns1T6Q{mcgGcz3
zT;DEW{&QQAXeKs+X!C8ixJV8l)G?tJcmya9PzE5eE0>^WIb^tM*l#(tB;`N@W(1qD
zIn9XNb~WETN!)5jSC=OQTJKXd6faJb1NrTWx*HldP00-MkQuQkQ#_3tt@@E2+s4gc
z`f}|jM*=ogv$Z)QY+vqXfbMiOsNV#xt6D*6aY1No6X0yT-J^%({N<HwN?j4s_$dVN
z(o?S6V>~cT!?3Mog{^mDTb<+H)%XMo8+r*pt8?ssu|~tQ@viwUcL@)#tQRhUgdqUL
zr|^cZsU*uCNJ=-acpfM{lS3=NueefZ2`O*A`mdR)ldN0HLSH9wd92U8qXH#-`L<QC
zxu8CnPs#0JGLXL{@mOrZV<eVGm9L;a9BnhXk(C@R;ORgb?wzP)>GxGzt;GhfS1g3M
zDR10xT}|O`@|qNs#7{WCLmy}ll6kD>;=h^Cvw^=_x4Q&5U)eBv^|`roj;2XyECgVF
zkMAy>YNiU0!)KQWhsanG@e<w<TqUk=hzg<sjzh3OG8V}1frjNVB2{UDcrg|PSg)ok
zshoET_WK}O&G{;~3z*`$4C4elMh-na@Ws;^4P&8(!k<X<bri7(=Qrk65nO#t&&j*t
zG0F05pmN)W5<u&`y*a3idUu~6YOQ4q!1H_{1Te`Pn-S5mcZ|l40OuX*_EXN@JqJma
zy-B_Spo18>>zcv9mQ;L@0-92qdD*=$s!%3ek04AO;=B@1bC#~@(jyij##<sSJLKg%
zK)=#IJo;$m)+<@{82eZ8Rzq%95s;WFYDh7<XYaSH?xtg~suI4GgS=GQb#UOUdH}FS
z7TuD=T_BWR1iW8W!5+WJ@o9U&E4gcwEkwANRmb%XJ|OjmtxU1MQ9Cn}6KM=s0dm*9
zb2fqRMenokyUYWeg%;UO2EK`nPVd{V=kbhdLpq!<%v1qH2ll;KGq>{}Gqt<I<ZE<7
zEK@=!thext^^L45ccmWyyf!RxoEl$++ex1NduU?{Wk0KqZ$W({bpGaSn(tO`izMZo
znFsO`oSC-*<j{0w%@2dza?=DCLW|H03XjULgDWX>vaPdzll&nLm|cLg)oGiq$B!a8
zukWdbt%Qc!qa4V$3m%7f{1;8fCap|lj-(GAkpkZNCVGWfq+xNgE<X(9ziq4F&>ebU
zx8|MUOK@rg9Zy(ipD}dcSb?5r;U1NbR?+Q;3&hhKM{xhk@ZB`3QSuwvjhoYL0T#x}
zplt7qQU!ZD0sZ6t3BxEx^Rj6Pgd%@yOk1xRW=BqahjMw;N!Q5ZBEf?i1$&b^nO8yQ
zqk)&D$x!{z?`43-;Ueoyb>wIYIdL}?Z1iH0^?T-cAr}O0HFz0|J9k`-)-enL>hwbL
zBR4)5KKI=~om7HNvkO38<I5^JkogN?$nt!5ms6|!kpfr=>Kf&RTc9*Z$u7XW6T;xO
z$iB>-hnbT(sHU`=5aPN}dTsg4eD^O3)Gs)@<R@A~Y*+4aX;(ME@O;3W-Im7w{s^J#
zwM?(mY38Rtj;;liIRrOY=HD^m5t<Qe<U;(`*NDzq`E$BzXeJLBs0~lC_yOc&4^DRr
zWR=y@i;gG$+4|(DFHm05AO4{x7^VOIkBomr+n(m#^TJxW%v*-U1*Z`&tE94LnTsf*
z79#a@@Z-V;7lFI|jTB2QL>49?SbiaEp+<K;xMuuA;eMu(&M30S-5s&SA4UGrgnKt{
z-Dv8v+`7LW(QfnQZNPz;MPKSTb%<&-`q`dT0e`U1@2qm~eTY1z)h~;5^;@C_K!LoC
zu!RXV9Ss`Wpd!l`i}Y_4_YMJz^y*4Dqw&HjDUaOZ+AXG~FA-?Eu$7ys%M77(k>99f
z%U;Vt%+2eiU!H;s>Yo-O%~%^tLckvN448ZLS9_{ZAq<K93^G6<Du_d({sg+^oo8wp
zM(b${RHWc!Jt`A<mWO+7d{>y;K<-F+&|%NgR{?;zyx_bkhYKRD8YaUwZg?c00Z3#K
zmL4neilDIR6oE}FE)@O+0OylTzwC@0X18{&XXH9W6Yl5MM(63yzK@U7?WpO={ysd<
zIBtK>U|#w0pV^`N<ch-Pey4zFj<AKx01m1&-va1Ed`gCv?CY!J#a>7aI*Lxz-1Y!H
z#ubKaUel?}laa8mNyu+WHmw1#H6DWHdR$T(nSMW@%mWS<EUFjq1I8`V%EI4${p0u-
zb5SrEppp#$E1HF*!q>&x7tv^~0-P7`CGm*)=;0VZ4IR(U;h+&P7~68FAFo^EIiD0Z
zkh`kbw}t;i>E<j89x8jDfS4bDdUhxK5{+K`Y4tRY-Bmj%aO`67hJwBNcj}P|f<0$m
z)L$6y^$4?VACs<i)uQEEE6#(DuZGi@NgPVNJBpBW4KY}(R?hNy$LMM$y5T!-FE?he
z_KyZm{?he0;s#7ms8FyPnscmG&10Y|w;oaskL3)ED~IO;IL~U06ROsJUl8?=nPW&G
zMjlhG%rm-XZkx0`SM~=Vn|ww`;-CxE3`QgG!CMfX)>!8i@6%p(0G`nbHtJD@bOL<&
zgq2!`E#=Z#S#jbG1rRJ6YcV?!vYVIbwyIS5lk!Gh`FGKXQ^n(MsjnpK?*OI-{B4Z-
zNQ~xIT`uF*p^AaXx$5gIAT|X~jMM?3I6sVL2yCttf(s9eIXN_;B7B*7oIkn{RkJr=
zmRFy*pUAf74%k6Z9H-Mv&4pQxTOF*#93-m~E=D<7a~_&0Mk9i_Sk&iC_yC}@aYrln
z(S&|)$GHGdATdB`Tc$$>030||Dz5XRQjzAibxG2rmrCMix|*~HA}yZ<O)t{7%A6_+
zrG@9O@g&+}@uluv`r~dLO0?$^vF#uSH?yzLfa_&O8*qm)8h3V@DSTTV5$wiVN8XC{
zfl8#D<n+IWEPcnc>;T{W$3^Ui9zO`w=ymq}iba4kld^f-PP5hi$Ac;O08Fx`YrjQ8
z^SzvsvbxaiN>L7#Y1=bJG#G%C73;0V`wT#*(NsAR@fhU;{M0$8d#1`!cckpc=f&<V
zQj`8BF!rj-!|z#@xe&MNZxX@>f4Rh@Z^^sg_R}?-?gEn81F*qA;$I_n?3}byh4NJ+
zizMlt+xxZOo!Z;gQa}w_l(BG1#URU}=Xr%P4c&(&V)n}CuG01ahjtyfO5(<yfC+1q
zX~Wo^n)X%crvsOt%UNL0@2?~Yb`oMT+c`M7@7JM77C^iJbAdA^x0=ad02eCjIk%(*
zf3noFyrP7Yr4pqlrQ{0qPi*8`OrgVlW>GXnp5||{{(@$DndM(BcrFsJ?{&QgRRO3m
zdn6-({}9Z^mInMI;r^=^UpUI`ICDi<pA3t-^wlpXG&*jfS%D@~OA&UXE}rk7S5N{?
zKA+#u<W?=udfuPsd+~7DdcZK;s6?fGDUk-E&tF9*0?AXV*6_SOly(_cGkt!5V=$D_
z-0OReBSbv)jct_-O_5F*P2IMNfGeASpGe{S@gXyMe1Yuh5A;;9o`@<>N+E9-jpc&o
zBK_)wD@?msC61WRhwNQVRrwJ)5-<R#44&5gn5~?L8E<U+&~8&Cgz(%GTS9f5HEBJU
zj3%;5Oy0^!0DYs(gmEQ}l<)?bdH~7b{S)_n@-#ZKXZ#`=2={VgBR@qOf>BTZdQA~{
z3W3(LEyzdxhR)yF(qge!@}ez-Wu5ej-14$UdgsG{;}a_Km|`jP*<gEfWly~CDTpHU
z=8?bzc!XByCCPV)s%M5VGp~$rAVi<i6GP$Wb7R7#mRfpG_uOjq6l^L@1~nZ4*8&uq
z%|x2os8iM^8t&NP7}Z%%q0wb9OA$+NMQYNX`$)Zg2=yN-e+q!#@x0*mS1bINcrbxr
zARmY*XVCTG=|g43XcO_Fby5!k`797B8_k?O<KO}J1lvmdxL6EWqkoR(RELU$_Wr!#
zp~XjUJZDHu<3x@<?LK=Cx`MdIt#4SqNlzZ94t2hPY|X)n=SP=3y!r+A0LcZM(WNDk
zi*I3O_VfsdjWr}L@e$O~WbkD+t}i$HL*TyAgleqZGZ`5mOrkrQsF~k+?_#8`F`XIk
zV-F^7&7yQ!=5}HB{+c_K29pEG!!9T0S@!6qF!H5|%qvn`eqJp44-r6sZX-htClC{$
zDiv$|_%*}I)VatKlyQn!&>40=Z)}DfzEG_)rBAMg?1t!;iABI%Ore<#@Zs|8DBY}Q
z7;_xM-zagqXYHmqXq4!EC0SD1Kat5xCJsWKd){u*0ghCX_JcR<(_>BQ>9EGli}0+m
zl^>|M81))2+1?tQc3aK0{9-N3OSHv5A}y_)u<Y2Jjv<l;EOkm_z>7$v@_rw+;d9o|
zb|gB11&TfK6=3%jz#d_NVm6jdAIp7yZ>SgeoIF_)k&a-AODZ?Yh)$k1N8XKlzn_yr
zR01az=sa7N$G6@50y!=U4b{6u;Iltjpz(!00=Ve%FI0z{?`|Ih7K_lyUSGHVWrcD%
zgQi(QeP6D_FNi-jlgcqIv_0E=HHls0jD#`PlqMM8F8L$^=Kz&U91YSz>iR3P3b0p7
zg#0SpXA`8RSFD^CVPHZ2wMnEdLth}DTv#C2c5AkjP4d>$o5~*iFuY{O4B(NQ6}uNN
zaQ2-%DSwIqG5ewYLE4pRPWPA%3Y3Ck1HmwZEdmZa_<sqvjStTxg$Ct$;Z}-yKo?h-
zCj+qEUL45)U3abK*-_URFp+?!VZ>VTg{)`qGKt_2hfQZRtd4;q&p?Sj=+s|`<w~}O
zryO!044kxM-C=gno8*KZnIg+2GP4X`r+0th;dmX<PS>W`El*yNSBRFS8ab485eot1
z>DE_Nei1_#bT6?SRfm?NbDfYsFy=;g_;g2XJ!@?eQLQ@gTMZ_zIs{TKInHi;(T>x2
zL^W_CggnC0T3h9j2^T^!s)jpicfcJSUxd!f+S@PpWk;kX!r$<zj1v{)aqzrxEpRFW
zeA^Qim-CRa-vTR*P`3b@nD`mG^UD%12PQSayv$JEr_jNMPCMK)0KVM;xo^#r#&|g-
zJXs81_gA(cWv?`W-zzUz*rITJxyXO7RKTr6|5}H}%2eRh=e0dqhAvXbuypZdfGY?^
zn<O2v55#}N*jXg~IiC#QT-F;K3p~Vm&S`I@X&>@|4B@Gop{z-H)*q0D$o{w_2j57C
zf2R~5zb>f1!1U&EQX_a+A3`&$lkjnt*oZ>-UG@IN81Go{tb*HW`QOi~%|1|F;k(K}
zW^URToe2>%Tc3(zwJoQBcD#$BHoBwQVqblMKEGOzfj_-|<rxZNab2WE&62*0L(>q#
zo_>F5sQ#I9fwM+|Z*we}>c~bjhGXYXnE!>!_BXpp@fF<10Y9<ypCGRbkbX{+C>oIw
zH+MJhSI^J*`amC38|P4e<>VTI|7PRp#;Irc%JRO8-M)N^>Kec3>m7EUK;x5O_hm1|
zZMtd)-=TF>EyPkb=k^$&Z_y!NE_g^)zsdr7tMdf9Gh^8#%dBIf(xoOZ_2Kw|;4W(~
zbbsS*A7uH}2ZzvPq%I=nJu)rX+&eV(ZmBxAYl3%LW7uablR~)qY)vX1J&auCqp82x
z^Ju7eI$3)%N&VLAx0@oW2i@V==5|y7sn}9P4%Oq{J`N~csCX91#;3Kbnass5>L+Gc
zonSm}r{t)=^&kcobOF*ML(LkM-5}^<yy*(8V)c_QD-R)}f9tR0={s^Zn|Zw9Sl}c`
z`={nV6_2VsC`1r+!Sfs5Ta0`(pYORPF!I8tZFH_~Etsay!;r$WEj9HWR>CaJxQKMc
z%B#)YLr-G5x)bI8UlIl`26U{&1@%?XV59AGU1Xz8cPV$2n-@XDt?ZU{#7u+mp$GCA
zQn=%fhhR@UKWHs~-$uL>S8q=mthUWCYb&>}x~ns=!u#c9=p?9`845VgY}_E*GlLKw
z7XQlijUr*~pRPR`=yt@ddav^5DKVv$2GQbx1~r}JtS7mv-!;LC$Eozt_j7TxKHl!k
z0(a~K9mF7ecb#IlW#v^WxCzv?0~Wr_hBH8Rwf*@C?+RaZ=lXr%dOz4#+GmSa#ELHP
z>Bw0+r~ZwnfNSmg21SoAy9{p+6^I{5ok(3@0)U*fj*3y|lTA$|K(ACt9WCpO(e&-$
zHAisEBneJX(otHpGpD}{uj{dQbh0kVY|i>af;C(Z6ak#4vQe?@{ndMw=$jv1V{kQx
z!UyU@L~Ys<F=nA{PWv!vjfUIblvutm*nI`r^-H^E7(iVZ!G|I(&0_b^?{4mch4s!a
zXO>ESav%@igvx7%N*Iza$d}u~rBh9&mAZy@HClTr5mRwV0j%Fg!zDig?9DZq>eNu;
z7t5U?TPiSL-Ju!si%Yr<P{X21NNSr!VYqU;2JjlLRQH9CO2&#ts@mfzaJv3$V@K;%
z%mYG9E7Dj`_v8@v=-i=mav}rEQFC5_!^8+?qj{vM$>(r>c1;eH%~t{<qi@|kttx`r
z#OxB`sOQ-9%GggSykZlHabC0aVnM@_FQ~YP{kdVaqx5ks4=r^hP6nbZDInpTRB_3w
z36#xNA>i8p+tB#hN6cY86+-eyPJ9z0B{%X_Pf)v==xVp?PvINA9IYm2-~_^{1e4C2
zdJhyXvLw*_vJ|b;G2kHRIGP-na$Ua2CC7Xas7UVmTZqdHU9mLta;#kHY937#u%RR*
zag4V`I?5dZLDE&Sr^C3ToUNNb9)z|hbIokr_~AIUV3>njJC0ra2TonuWg#FC=Ec9?
z1+duiivg>PIaSS)JPiF6K)yq^Hm9dgLi&F-096JMo^;b@&@VUlb352P+x#OC=Iw4V
z_(iqwq*VzJkri#d)_PemhuYja{PR`82>ZZ2nE*JV==ynm!_>K18+@FKM(~;j+$R4h
zKk9@RZ3OI-6V1;Z?~ecDYZyQ1-Ag40T;vu(+lt&~_sX6~i)qp`3iSS8_hrS_9}|Tj
z=1S$3smK8o&VomEWxPVIEAhjjcXFu8747lA11<)8n&$+=yEPqT&2-I0n9&*^069{=
zi^*deO~VtL64`i$eByaNaI0dTol6UZWqpZudV8An4#)9Z3~8mYOQ$j5+0vX@;VZ6d
z?|~bUGa<m8Yfb}Y>Z^m8>>R5X(;|08QY_Zj&s<4eBi1)kE;6*ojt&`6pa&o=6?Wwj
zmGEF{<yD#tC78?%i(6=+^sVTgqQnov0_J*6ktuYp!hjQJw4OL_NGalJ`O3{svgQOv
z-EpvT+Mw6=SNaYoc9&zxj)PebK(lU=SrP?aUP~e@0X*>X#7WPG6~=2fASZun&c#PS
zx5YL((0Qgm3;(MWE{K);t~%D4?~MA+5F_5%P`fQ-oTNE@Ud3E^!6Ts6(=8PM#C<e1
zrN(l7YYKH9-4MY1GCDXwMFSisFUS(C!VeE$8%cPm)krkyBs0E-p#|0o1JTs!@n@7P
zbO9*CnK>tSb(^yR_~39sG<I(AoxMbFNbyGWE1Iqfbb=;{COt|?pw<?7;6R8lt;{X&
z?udv}1I~Dd3jx2Lps#f`Wf(=O>cswxd3Hk|TnywnjzPUqA5P)jIh>E28G<iRG7BE3
zwaV6fR5#E2KzwI@1@%0S3Pf%vQy71Q?e-l4r|*5}dZVE1mBa{x!hH!N2=D&|VFjN0
zZIqY^{54*w3<krRfH43JeHtmPGn(M?lk!DI1y}yRw>|f&I*Ju1=is;K9jai*XtV!9
z>{1yFhCYum01SN=DXpUu@Y~~CDtBM(f`@>w*H5bWkkVR<vhIwN3My>gt_$25uT%zu
zVNJmp0ERw^l-521ZaXrs5}OCFh3}vn{Pc$AFG2VQFdSg8f}O*c{k_cgTvL?FU@%m~
z7yyPohm_V1K=z<k)f^%nZUJzx?YWEVCs};>^$gA}ZSP)Cx&lyeW&ypq^Q6IG=wVDH
zKtrFxZ-x87Uae}_?!jloMc_o+b3dq`WU=!#U_F3=3U&=Y`+vyxT$N2{)&&j+Cfc6+
z?U-dW7z}+FV*nWX3{qMf0T1m^P$Tybrx1T+d+x(^5-WD3v<9II{{XOCK?SXAP|hLQ
zbmlQ&FCYm#6PJ7jgJI3U7yyPofu9cdV5XqP9TvR4KfuGl<@J%OZhQq;A7B950Eoaw
z{sVM_m^G=>qrqT^0TTmY==J!W-u^SbsH|i1p{n40gm(S+nLs!xt!CgmrR`l>6@#L;
z>u3Rf25fG7u89XQ7!2(&9sonHMoKFM{B6S`yPwz+Dh;j`IL`LmzSjTzH2hY^P3Yji
zi2MgQ&-Pp|Cb<j-!y1M$01UkrzrO#?>nOe$qP~BLn{ChiUtI*N6TY!?QE7YURu#0Y
zaT^N+%uk4KTs(c+^)ZWQFc{V_i~(Ti&0I4~aq`rbB16MZgy)u?WYd`humP|!FtZnT
z{yQ1n=baR~@J~=y0*|KzFQmkx0{rvhx`<~m7}g|&QqdO}4TgFlrFGFjxZ?CxMK*~3
z6@48Tfewai0u};eZO>g1kCgEtrIiHU0@47x6cmR92zFG!D@nm4DN$S|_&som<K#Z6
ztFQ)xVU56e01UkjDXr5JaK-U0sutxBux*F!n|h=2_c;z<`6qxq0;D<4PQZPs1Rp1O
z68M(m<ld;Shz5gUO~M!ehF*n~mJQr^P+l=1c!}TcSdI>eyBoMKjsfGwk9BDC+RK9K
zwyWV{0sl=2oTQiyT;Mplztvw#gTb(-VGIC6uR%&{GH~bi1(l4L`(9!NTG`(X+-H04
z@;KzHBS!(5(#D=$%>G+}XHtTvQet@?t^|JWIJw^H(J&Ycy&Piz7<vU#TH6BmjxI7F
zWT77bijbe1VAh)nvEb#DNUVbY^`V*ZC8a0pEB)xmw4~s_DZwJa9l&=SC--3k<ue!z
zYaqq|F!VT5S{noZ6|mN!twoXn&uay|gdmrM8A;K!O0S`({g;ldm%MQzrFAf{O=)|R
zvSp7|z-vjtiz&eZ!7J!>{yvr3XfPOhFU9~c^eBGa`z)~jC<UXd)a)w&Zzlv!5~e2w
zt2!U@7Vulg$@P`SKi@6ia1w$6DflP>?<WL#m<N0hxYcoTeWs$J!C>h97z4o2)7%Vf
z2UIM1tAIrUK28XxC*ZB5U}fjSW}w&m?{=JAuAaiiiImo!z@+kh%LP1@5}?cYUI$$6
zIJrL2!q{Li^ev15VCXTVv@QaUFKy3Cz|GBqEsOA}fVo02H$kOYK7hw+rT=C_1dg9?
zbg}<Gz<G|7Gi7`Y21DI2g@6n_f*<tvG6Y`o2Y8p&O8>RG2-YC{)W3PaNPkxmow;zW
z<K!OeF~JN5L%+dz01Q3FPYI^{XR%u8zfxC;8p{A+I`Ag&6!2%q$<69fi3|oqzruI`
z3_XIB)-=j;-#hR=@He#5f3a~=84LzP|G{_w3_ZmSz_-v|fH(Zd>%be1lY6%(1v3~7
chW^0+0|@7+Z)n)1vj6}907*qoM6N<$g06h_egFUf

literal 0
HcmV?d00001

diff --git a/external/hypre/src/docs/usr-manual/hypre_wiw.svg b/external/hypre/src/docs/usr-manual/hypre_wiw.svg
deleted file mode 100644
index 7bbdce4a..00000000
--- a/external/hypre/src/docs/usr-manual/hypre_wiw.svg
+++ /dev/null
@@ -1,217 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg7826"
-   xml:space="preserve"
-   width="525.80347"
-   height="184.66798"
-   viewBox="0 0 525.80347 184.66799"
-   sodipodi:docname="hypre_wiw.svg"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"><metadata
-     id="metadata7832"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-     id="defs7830" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1306"
-     inkscape:window-height="953"
-     id="namedview7828"
-     showgrid="false"
-     inkscape:zoom="2.2460864"
-     inkscape:cx="262.90173"
-     inkscape:cy="92.333992"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="g7834" /><g
-     id="g7834"
-     inkscape:groupmode="layer"
-     inkscape:label="hypre_wiw"
-     transform="matrix(1.3333333,0,0,-1.3333333,-0.44986932,184.94666)"><g
-       id="g7836"
-       transform="scale(0.1)"><g
-         id="g7838"><path
-           d="m 888.066,1001.55 c 30.137,62.76 54.229,113.82 67.149,143.61 41.992,96.8 -7.778,85.1 2.373,108.5 4.614,10.64 11.367,12.77 18.115,14.89 84.267,26.6 174.207,84.76 188.727,84.76 6.78,0 7.84,-4.26 3.68,-13.83 -4.61,-10.64 -38.98,-78.72 -79.44,-156.38 L 961.924,931.226 954.028,915.107 c 68.672,53.164 212.252,114.693 293.232,114.693 80.91,0 136.95,-37.188 92.67,-139.258 -7.38,-17.012 -22.64,-49.976 -43.55,-89.316 L 1182.84,582.192 c -9.32,-17.011 -14.86,-29.77 -17.62,-36.147 -5.07,-11.699 -1.09,-15.952 6.68,-15.952 6.81,0 12.07,3.193 21.69,7.446 l 12.48,6.377 0.35,-14.883 -143.38,-63.686 c -14.51,-6.382 -33.38,-13.824 -43.16,-13.824 -9.78,0 -10.46,7.442 -5.38,19.141 2.71,8.506 11.58,24.453 22.24,46.782 l 112.52,227.539 c 13.94,27.647 24.15,48.911 29.68,61.67 40.59,93.565 30.53,144.615 -57.27,144.615 -91.7,0 -181.48,-68.062 -223.306,-148.868 L 735.249,486.611 c -3.735,-6.377 -56.558,-34.751 -67.114,-39.004 l -27.364,-11.699 c -9.619,-4.253 -16.372,-6.377 -22.202,-6.377 -3.881,0 -4.956,4.253 -1.728,11.695 7.383,17.011 20.854,43.593 37.554,77.617 l 233.671,482.707"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path7840"
-           inkscape:connector-curvature="0" /><path
-           d="m 1525.88,1013.81 c 23.54,11.7 30.3,13.84 38.07,13.84 9.72,0 9.64,-18.09 8.19,-39.349 -3.17,-65.913 -31.09,-213.682 -45.98,-432.036 202.64,206.992 281.37,305.063 293.8,333.725 12.89,29.722 -8.26,39.282 -39.39,39.282 -44.75,0 -58.17,-8.501 -96.3,-40.341 l -9.43,7.431 100.43,89.331 c 19,19.117 91.09,23.787 139.73,23.787 54.25,0 78.92,-21.248 65.09,-53.123 -13.35,-30.791 -27.91,-50.961 -359.84,-386.401 -64.08,-64.751 -243.98,-266.435 -253.65,-288.726 -4.14,-9.555 -1.58,-14.863 6.2,-14.863 7.79,0 25.71,3.184 37.84,4.248 l -7.85,-18.095 -128.09,-43.018 c -10.7,-2.129 -28.65,-7.441 -40.38,-7.441 -13.7,0 -17.31,7.441 -12.25,19.13 5.08,11.7 12.57,24.463 185.92,210.225 14.88,106.152 22.79,212.305 25.05,294.038 5.3,184.707 0.19,195.317 -21.19,195.317 -7.77,0 -18.36,-4.243 -23.16,-6.367 l 0.15,13.804 137.04,85.602"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path7842"
-           inkscape:connector-curvature="0" /><path
-           d="m 2144.22,872.08 c 75.6,82.022 152.09,127.847 214.56,127.847 57.59,0 101.37,-54.346 50.08,-172.588 C 2342.78,675.01 2192.25,523.74 2080,523.74 c -58.57,0 -80.93,36.221 -81.25,69.243 z M 1892.41,320.801 c -10.63,-4.248 -24.65,-9.561 -29.53,-9.561 -4.88,0 -6.43,3.184 -0.9,15.938 2.77,6.372 10.2,21.25 19.98,39.311 l 76.76,147.691 c 28.85,-21.25 66.56,-26.563 102.68,-26.563 150.31,0 351.71,157.564 435.81,351.441 56.37,129.961 7.21,210.852 -85.52,210.852 -58.47,0 -145.41,-34.03 -216.46,-80.891 l 17.56,40.481 c 12.91,29.77 13.63,40.41 1.94,40.41 -13.64,0 -91.46,-63.626 -167.75,-89.148 -19.29,-6.402 -26.1,-6.402 -31.17,-18.12 -12.48,-28.76 43.72,0 -1.1,-103.326 -5.55,-12.788 -17.1,-39.419 -33.83,-73.505 L 1736.4,264.634 c -6.5,-12.754 -10.64,-22.315 -12.49,-26.568 -5.99,-13.813 -4.89,-20.185 1.88,-20.185 8.7,0 20.68,5.312 37.43,12.749 l 128.13,74.233 1.06,15.938"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path7844"
-           inkscape:connector-curvature="0" /><path
-           d="m 2517.64,557.329 c -9.34,-17.046 -17.29,-30.893 -20.52,-38.35 -3.7,-8.52 -3.05,-15.976 4.73,-15.976 6.8,0 24.61,7.456 37.09,13.848 l 0.34,-14.913 -79.47,-35.151 c -27.57,-11.719 -75.46,-37.256 -85.24,-37.256 -8.79,0 -9.42,5.327 -5.26,14.912 3.7,8.521 11.61,24.497 20.44,42.608 l 131.57,265.234 c 13.49,26.631 24.12,51.133 33.37,72.437 44.81,103.325 -11.38,74.565 1.09,103.325 5.08,11.714 11.89,11.714 31.17,18.105 76.31,25.567 135.5,66.028 149.14,66.028 10.72,0 7.58,-11.73 -31.56,-101.96 h 1.94 c 48.57,42.534 111.07,92.54 140.22,92.54 12.63,0 17.99,-1.08 26.32,-4.274 l 23.01,-7.446 c 5.88,-2.124 10.78,-4.253 15.64,-4.253 3.89,0 7.73,2.129 13.96,5.317 l 5.06,-8.505 -58.65,-47.857 c -10.96,-9.575 -36.34,-46.411 -45.08,-46.411 -8.75,0 -49.8,10.635 -60.48,10.635 -7.78,0 -22.21,-6.382 -36.49,-19.141 l -52.52,-47.178 c -14.75,-13.847 -29.48,-29.824 -36.46,-43.671 -6.52,-12.784 -13.96,-27.696 -22.84,-43.672 L 2517.64,557.329"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path7846"
-           inkscape:connector-curvature="0" /><path
-           d="m 3203.8,914.17 -217.67,-57.588 c -3.39,-1.064 -8.2,-3.198 -12.51,-6.396 l -43.53,-33.062 -1.03,2.134 c 73.32,115.176 172.68,175.971 237.88,175.971 47.68,0 58.14,-32.001 43.8,-65.063 z m -22.94,-276.211 c -63.47,-47.988 -168.35,-110.913 -235.49,-110.913 -98.29,0 -120.26,68.257 -59.66,207.959 10.64,24.531 2.92,8.223 14.59,30.62 l 374.47,97.046 c 21.75,5.332 32.76,12.798 46.54,26.66 l 49.35,67.495 -2.08,6.402 c -23.55,-11.734 -44.27,-19.195 -70.87,-24.527 18.24,55.454 -21.78,92.659 -88.83,92.659 -128.45,0 -365.85,-141.648 -463.45,-366.672 -52.28,-120.508 -39.07,-235.157 84.41,-235.157 74.93,0 139.35,29.59 238.28,90.122 38.28,23.462 92.38,71.382 100.71,90.581 l 12.03,27.725"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path7848"
-           inkscape:connector-curvature="0" /><path
-           d="M 3859.58,765.571 C 3805.9,757.9 72.3879,754.067 3.37402,757.9 64.7219,757.9 3669.79,694.468 3669.79,659.961 l 189.79,105.61"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path7850"
-           inkscape:connector-curvature="0" /><path
-           d="m 3946.9,791.294 c -53.68,-7.666 -3787.198,-11.499 -3856.212,-7.666 61.348,0 3666.422,-63.433 3666.422,-97.944 l 189.79,105.61"
-           style="fill:#00ffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path7852"
-           inkscape:connector-curvature="0" /><path
-           d="m 931.201,1035.34 c 30.137,62.76 54.229,113.82 67.149,143.6 41.99,96.81 -7.779,85.1 2.37,108.51 4.62,10.64 11.36,12.77 18.12,14.89 84.26,26.6 174.21,84.76 188.73,84.76 6.78,0 7.83,-4.26 3.68,-13.83 -4.61,-10.64 -38.99,-78.72 -79.45,-156.37 l -126.74,-251.885 -7.897,-16.119 c 68.677,53.164 212.257,114.694 293.227,114.694 80.91,0 136.95,-37.19 92.68,-139.259 -7.38,-17.017 -22.65,-49.976 -43.56,-89.316 L 1225.98,615.981 c -9.33,-17.011 -14.86,-29.77 -17.63,-36.147 -5.07,-11.699 -1.08,-15.952 6.69,-15.952 6.8,0 12.07,3.188 21.69,7.446 l 12.48,6.377 0.35,-14.883 -143.39,-63.686 c -14.5,-6.382 -33.38,-13.823 -43.15,-13.823 -9.78,0 -10.47,7.441 -5.39,19.14 2.71,8.506 11.58,24.453 22.25,46.782 l 112.51,227.539 c 13.95,27.647 24.15,48.912 29.68,61.67 40.59,93.565 30.54,144.615 -57.27,144.615 -91.7,0 -181.475,-68.062 -223.301,-148.868 L 778.384,520.4 c -3.736,-6.377 -56.558,-34.755 -67.114,-39.004 l -27.364,-11.699 c -9.619,-4.253 -16.372,-6.377 -22.202,-6.377 -3.887,0 -4.956,4.253 -1.728,11.695 7.382,17.011 20.854,43.593 37.553,77.617 l 233.672,482.708"
-           style="fill:#b30000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path7854"
-           inkscape:connector-curvature="0" /><path
-           d="m 1569.02,1047.6 c 23.53,11.7 30.29,13.84 38.06,13.84 9.72,0 9.65,-18.09 8.2,-39.35 -3.18,-65.913 -31.09,-213.682 -45.98,-432.041 202.63,206.997 281.36,305.068 293.8,333.73 12.89,29.722 -8.27,39.283 -39.4,39.283 -44.75,0 -58.16,-8.501 -96.3,-40.342 l -9.42,7.426 100.43,89.334 c 19,19.12 91.08,23.79 139.72,23.79 54.25,0 78.92,-21.25 65.1,-53.124 -13.36,-30.791 -27.92,-50.961 -359.84,-386.396 -64.08,-64.756 -243.99,-266.44 -253.65,-288.735 -4.15,-9.551 -1.59,-14.859 6.2,-14.859 7.78,0 25.7,3.184 37.83,4.243 l -7.84,-18.09 -128.1,-43.018 c -10.7,-2.129 -28.65,-7.441 -40.38,-7.441 -13.69,0 -17.31,7.441 -12.24,19.126 5.08,11.709 12.57,24.467 185.91,210.229 14.88,106.152 22.79,212.305 25.05,294.038 5.3,184.707 0.19,195.318 -21.19,195.318 -7.77,0 -18.35,-4.244 -23.16,-6.368 l 0.15,13.799 137.05,85.608"
-           style="fill:#b30000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path7856"
-           inkscape:connector-curvature="0" /><path
-           d="m 2187.35,905.869 c 75.6,82.022 152.09,127.851 214.56,127.851 57.59,0 101.38,-54.35 50.09,-172.592 -66.08,-152.329 -216.62,-303.599 -328.87,-303.599 -58.57,0 -80.92,36.221 -81.24,69.243 z M 1935.54,354.59 c -10.63,-4.253 -24.65,-9.566 -29.53,-9.566 -4.88,0 -6.43,3.189 -0.89,15.943 2.77,6.372 10.19,21.25 19.98,39.311 l 76.75,147.691 c 28.85,-21.25 66.57,-26.563 102.68,-26.563 150.32,0 351.72,157.564 435.82,351.441 56.37,129.963 7.2,210.853 -85.53,210.853 -58.46,0 -145.41,-34.03 -216.46,-80.89 l 17.56,40.48 c 12.92,29.77 13.63,40.41 1.94,40.41 -13.64,0 -91.45,-63.63 -167.74,-89.149 -19.3,-6.402 -26.1,-6.402 -31.18,-18.12 -12.48,-28.76 43.72,0 -1.1,-103.326 -5.55,-12.788 -17.1,-39.418 -33.83,-73.505 L 1779.54,298.418 c -6.5,-12.749 -10.65,-22.31 -12.49,-26.563 -6,-13.808 -4.9,-20.185 1.87,-20.185 8.71,0 20.67,5.312 37.44,12.749 l 128.12,74.233 1.06,15.938"
-           style="fill:#b30000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path7858"
-           inkscape:connector-curvature="0" /><path
-           d="m 2560.77,591.118 c -9.33,-17.046 -17.28,-30.893 -20.52,-38.349 -3.69,-8.521 -3.04,-15.977 4.73,-15.977 6.8,0 24.61,7.456 37.1,13.848 l 0.33,-14.912 -79.47,-35.157 c -27.57,-11.714 -75.45,-37.251 -85.23,-37.251 -8.8,0 -9.42,5.323 -5.26,14.912 3.69,8.521 11.6,24.497 20.43,42.608 l 131.58,265.234 c 13.49,26.631 24.12,51.133 33.36,72.437 44.82,103.325 -11.38,74.565 1.1,103.325 5.08,11.714 11.88,11.714 31.17,18.105 76.31,25.569 135.5,66.029 149.13,66.029 10.72,0 7.58,-11.73 -31.56,-101.961 h 1.94 c 48.58,42.534 111.07,92.531 140.22,92.531 12.63,0 17.99,-1.08 26.33,-4.27 l 23,-7.44 c 5.88,-2.12 10.79,-4.25 15.64,-4.25 3.89,0 7.73,2.13 13.97,5.31 l 5.05,-8.51 -58.65,-47.849 c -10.95,-9.57 -36.33,-46.411 -45.08,-46.411 -8.74,0 -49.8,10.635 -60.49,10.635 -7.76,0 -22.19,-6.382 -36.47,-19.141 l -52.53,-47.177 c -14.75,-13.848 -29.48,-29.825 -36.45,-43.672 -6.52,-12.784 -13.97,-27.696 -22.85,-43.672 L 2560.77,591.118"
-           style="fill:#b30000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path7860"
-           inkscape:connector-curvature="0" /><path
-           d="m 3246.93,947.959 -217.67,-57.588 c -3.38,-1.069 -8.2,-3.198 -12.51,-6.401 l -43.53,-33.057 -1.02,2.129 c 73.31,115.181 172.67,175.978 237.87,175.978 47.69,0 58.14,-32.003 43.8,-65.065 z M 3223.99,671.748 C 3160.53,623.76 3055.65,560.835 2988.5,560.835 c -98.28,0 -120.26,68.252 -59.66,207.959 10.64,24.531 2.93,8.223 14.59,30.62 l 374.47,97.046 c 21.75,5.332 32.76,12.798 46.55,26.66 l 49.35,67.5 -2.08,6.397 c -23.55,-11.734 -44.28,-19.195 -70.88,-24.527 18.24,55.45 -21.78,92.66 -88.82,92.66 -128.46,0 -365.85,-141.649 -463.46,-366.673 -52.27,-120.508 -39.07,-235.157 84.42,-235.157 74.93,0 139.34,29.59 238.27,90.122 38.29,23.462 92.39,71.382 100.71,90.577 l 12.03,27.729"
-           style="fill:#b30000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path7862"
-           inkscape:connector-curvature="0" /><path
-           d="m 1987.15,233.926 73.2,156.094 h 34.39 l -21.7,-46.265 h 0.44 c 8.65,10.952 19.86,17.085 32.5,17.085 17.41,0 18.5,-11.611 9.97,-29.79 l -45.55,-97.124 h -34.38 l 39.79,84.844 c 3.18,6.796 6.15,13.593 -0.87,13.593 -7.02,0 -10.43,-6.797 -13.62,-13.593 l -39.78,-84.844 h -34.39"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path7864"
-           inkscape:connector-curvature="0" /><path
-           d="m 2080.12,233.926 58.85,125.508 h 34.39 L 2114.5,233.926 Z m 62.81,133.945 10.38,22.149 h 34.4 l -10.39,-22.149 h -34.39"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path7866"
-           inkscape:connector-curvature="0" /><path
-           d="m 2200.25,322.944 c 2.16,4.615 5.97,9.453 11.67,9.453 5.7,0 4.98,-4.838 2.81,-9.453 l -16.88,-35.986 c -2.16,-4.609 -5.96,-9.438 -11.66,-9.438 -5.71,0 -4.98,4.829 -2.82,9.438 z m 65.96,36.46 h -34.61 l -7.64,-16.308 h -0.44 c 0.51,11.391 -3.52,17.744 -17.47,17.744 -11.75,0 -26.63,-8.98 -35.98,-28.916 L 2146,280.591 c -8.53,-18.184 -7.83,-31.548 12.41,-31.548 11.13,0 23.5,7.666 29.63,18.403 h 0.66 l -14.6,-31.133 c -2.06,-4.389 -5.36,-7.685 -10.84,-7.685 -5.49,0 -5.7,3.296 -3.64,7.685 l 3.83,8.16 h -34.39 l -5.74,-12.232 c -6.25,-13.33 1.97,-26.44 28.36,-26.44 15.29,0 44.96,5.244 61.25,39.99 l 53.28,113.613"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path7868"
-           inkscape:connector-curvature="0" /><path
-           d="m 2216.73,233.926 73.2,156.094 h 34.39 l -21.7,-46.265 h 0.44 c 8.64,10.952 19.86,17.085 32.5,17.085 17.41,0 18.5,-11.611 9.97,-29.79 l -45.55,-97.124 h -34.38 l 39.79,84.844 c 3.18,6.796 6.15,13.593 -0.87,13.593 -7.02,0 -10.43,-6.797 -13.62,-13.593 l -39.79,-84.844 h -34.38"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path7870"
-           inkscape:connector-curvature="0" /><path
-           d="m 2436.34,323.857 c 2.57,5.474 7.08,8.54 11.25,8.54 4.16,0 5.8,-3.066 3.23,-8.54 l -25.47,-54.316 c -2.57,-5.478 -7.08,-8.545 -11.25,-8.545 -4.17,0 -5.8,3.067 -3.23,8.545 z m 16.67,35.547 h -34.39 l -72.03,-153.603 h 34.39 l 20.95,44.682 h 0.44 c -2.27,-11.391 3.42,-17.963 16.06,-17.963 17.41,0 29.49,11.831 36.68,27.163 l 32.46,69.209 c 7.38,15.737 9.33,31.948 -9.61,31.948 -12.65,0 -24.34,-4.819 -32.26,-17.959 h -0.44 l 7.75,16.523"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path7872"
-           inkscape:connector-curvature="0" /><path
-           d="m 2524.04,313.379 8.04,17.158 c 2.27,4.834 5.93,7.476 10.75,7.476 4.83,0 6,-2.642 3.74,-7.476 l -8.05,-17.158 z m 39.14,-20.742 15.4,32.842 c 12.67,27.006 -3.01,35.336 -25.05,35.336 -26.83,0 -47.59,-12.714 -58.2,-35.336 l -27.98,-59.664 c -10.88,-23.183 3.98,-33.271 26.02,-33.271 24.22,0 45.84,8.989 56.93,32.617 l 8.6,18.335 h -34.39 l -7.58,-16.152 c -3.48,-7.417 -7.38,-11.992 -12.86,-11.992 -4.61,0 -5.1,4.575 -1.62,11.992 l 11.87,25.293 h 48.86"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path7874"
-           inkscape:connector-curvature="0" /><path
-           d="m 2630.49,342.881 h 0.66 c 9.74,10.952 20.7,17.959 33.34,17.959 17.41,0 17.84,-11.611 11.8,-24.492 l -20.98,-44.742 h -34.39 l 14.3,30.484 c 2.36,5.044 3.3,10.307 -2.41,10.307 -5.7,0 -9.71,-5.263 -12.07,-10.307 l -41.34,-88.164 h -34.39 l 58.84,125.478 h 34.39 l -7.75,-16.523"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path7876"
-           inkscape:connector-curvature="0" /><path
-           d="m 2682.73,336.606 10.7,22.803 h 7.61 l 3.75,8.003 c 4.53,9.649 16.9,22.583 32.79,22.583 h 21.98 l -10.7,-22.803 c -8.48,0 -11.1,-2.807 -13.43,-7.783 h 9.78 l -10.69,-22.803 h -9.79 l -48.15,-102.68 h -34.39 l 48.16,102.68 h -7.62"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path7878"
-           inkscape:connector-curvature="0" /><path
-           d="m 2773.03,329.268 c 2.15,4.589 5.85,8.745 11.33,8.745 5.49,0 5.3,-4.156 3.14,-8.745 l -30.56,-65.171 c -2.15,-4.595 -5.86,-8.745 -11.34,-8.745 -5.48,0 -5.29,4.15 -3.14,8.745 z m 47.12,-3.721 c 10.57,22.554 1.74,35.268 -25.09,35.268 -26.83,0 -47.59,-12.714 -58.16,-35.268 l -28,-59.702 c -10.89,-23.213 3.97,-33.301 26.01,-33.301 22.04,0 46.35,10.088 57.24,33.301 l 28,59.702"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path7880"
-           inkscape:connector-curvature="0" /><path
-           d="m 2872.02,342.881 h 0.66 c 9.75,10.952 20.71,17.959 33.34,17.959 17.42,0 17.85,-11.611 11.81,-24.492 l -20.98,-44.742 h -34.39 l 14.29,30.484 c 2.37,5.044 3.3,10.307 -2.4,10.307 -5.71,0 -9.71,-5.263 -12.08,-10.307 l -41.34,-88.164 h -34.39 l 58.85,125.478 h 34.38 l -7.75,-16.523"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path7882"
-           inkscape:connector-curvature="0" /><path
-           d="m 2963.87,342.661 h 0.43 c 8.93,11.607 19.85,18.179 32.45,18.179 12.4,0 17.13,-6.133 13.87,-18.179 h 0.44 c 7.2,11.172 20.06,18.179 32.24,18.179 17.17,0 17.37,-11.172 10.18,-26.504 l -47.09,-100.41 h -33.05 l 40.82,87.036 c 2.57,5.483 4.91,11.401 -1.62,11.401 -6.53,0 -9.52,-5.918 -12.09,-11.401 l -40.82,-87.036 h -33.05 l 40.84,87.065 c 2.56,5.484 4.91,11.406 -1.62,11.406 -6.53,0 -9.53,-5.922 -12.1,-11.406 l -40.83,-87.065 h -33.04 l 58.84,125.478 h 33.04 l -7.84,-16.743"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path7884"
-           inkscape:connector-curvature="0" /><path
-           d="m 3072.06,279.897 c 4.66,9.937 13.69,12.808 22.77,17.662 l -10.25,-21.856 c -5.28,-11.26 -8.44,-16.118 -15.68,-16.118 -3.29,0 -5.33,2.212 -3.25,6.626 z m -7.07,-45.966 h 34.39 l 43.52,92.798 c 11.79,25.146 -4.9,34.111 -25.63,34.111 -20.74,0 -45.83,-8.965 -57.63,-34.111 l -5.44,-11.592 h 34.39 l 6.41,13.676 c 2.37,5.04 5.85,9.2 11.56,9.2 5.71,0 5.29,-4.16 2.92,-9.2 -10.89,-23.222 -57.9,-19.277 -73.31,-52.133 l -8.73,-18.618 c -7.68,-16.373 -2.84,-25.542 12.18,-25.542 13.74,0 23.48,7.207 31.85,16.157 h 0.43 l -6.91,-14.746"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path7886"
-           inkscape:connector-curvature="0" /><path
-           d="m 3194.63,343.755 h 0.44 c 8.42,10.952 19.64,17.085 33.15,17.085 15.45,0 18.25,-10.733 9.85,-28.662 l -46.08,-98.252 h -34.39 l 40.83,87.065 c 2.58,5.484 4.91,11.406 -1.67,11.406 -6.58,0 -10.24,-5.922 -12.81,-11.406 l -40.83,-87.065 h -34.39 l 58.85,125.478 h 34.38 l -7.33,-15.649"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path7888"
-           inkscape:connector-curvature="0" /><path
-           d="m 3294.93,329.268 c 2.15,4.589 2.34,8.745 -3.14,8.745 -5.49,0 -9.19,-4.156 -11.35,-8.745 l -30.56,-65.171 c -2.15,-4.595 -2.34,-8.745 3.14,-8.745 5.49,0 9.19,4.15 11.34,8.745 l 9.1,19.399 h 34.39 l -8.58,-18.291 c -11.1,-23.672 -32.73,-32.661 -57.16,-32.661 -25.74,0 -36.37,10.747 -25.06,34.849 l 27.41,58.461 c 9.64,20.552 31.64,34.986 57.81,34.986 22.26,0 37.95,-8.311 25.34,-35.205 l -4.92,-10.498 h -34.39 l 6.63,14.131"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path7890"
-           inkscape:connector-curvature="0" /><path
-           d="m 3365.61,313.379 8.05,17.158 c 2.26,4.834 5.91,7.476 10.74,7.476 4.83,0 6,-2.642 3.74,-7.476 l -8.05,-17.158 z m 39.14,-20.742 15.4,32.842 c 12.67,27.006 -3.01,35.336 -25.05,35.336 -26.83,0 -47.6,-12.714 -58.2,-35.336 l -27.98,-59.664 c -10.87,-23.183 3.98,-33.271 26.02,-33.271 24.22,0 45.85,8.989 56.92,32.617 l 8.6,18.335 h -34.38 l -7.58,-16.152 c -3.48,-7.417 -7.38,-11.992 -12.86,-11.992 -4.61,0 -5.1,4.575 -1.62,11.992 l 11.86,25.293 h 48.87"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path7892"
-           inkscape:connector-curvature="0" /><path
-           d="m 1968.18,120.142 c 2.57,5.473 7.07,8.54 11.24,8.54 4.17,0 5.8,-3.067 3.24,-8.54 l -25.48,-54.3173 c -2.56,-5.4729 -7.07,-8.54 -11.24,-8.54 -4.17,0 -5.8,3.0671 -3.23,8.54 z m 16.67,35.546 h -34.39 L 1878.43,2.09009 h 34.38 l 20.96,44.67771 h 0.44 c -2.28,-11.3869 3.42,-17.959 16.06,-17.959 17.41,0 29.49,11.8262 36.68,27.1582 l 32.45,69.214 c 7.39,15.737 9.33,31.948 -9.61,31.948 -12.64,0 -24.34,-4.824 -32.25,-17.964 h -0.44 l 7.75,16.523"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path7894"
-           inkscape:connector-curvature="0" /><path
-           d="m 2069.71,139.165 h 0.66 c 9.74,10.952 20.71,17.964 33.35,17.964 17.41,0 17.84,-11.611 11.8,-24.492 l -20.98,-44.7461 h -34.39 l 14.29,30.4831 c 2.37,5.044 3.3,10.308 -2.4,10.308 -5.71,0 -9.71,-5.264 -12.08,-10.308 l -41.34,-88.1589 h -34.39 l 58.85,125.4729 h 34.38 l -7.75,-16.523"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path7896"
-           inkscape:connector-curvature="0" /><path
-           d="m 2148.49,109.668 8.05,17.153 c 2.27,4.839 5.92,7.476 10.74,7.476 4.83,0 6.01,-2.637 3.74,-7.476 l -8.05,-17.153 z m 39.14,-20.742 15.4,32.837 c 12.67,27.007 -3.01,35.341 -25.05,35.341 -26.83,0 -47.59,-12.719 -58.2,-35.341 L 2091.8,62.0999 c -10.87,-23.1839 3.99,-33.2669 26.02,-33.2669 24.22,0 45.85,8.9888 56.93,32.6167 l 8.59,18.335 h -34.38 l -7.58,-16.1568 C 2137.9,56.2161 2134,51.636 2128.52,51.636 c -4.61,0 -5.09,4.5801 -1.62,11.9919 l 11.86,25.2981 h 48.87"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path7898"
-           inkscape:connector-curvature="0" /><path
-           d="m 2263.04,125.552 c 2.15,4.59 2.35,8.745 -3.14,8.745 -5.49,0 -9.19,-4.155 -11.35,-8.745 l -30.56,-65.1711 c -2.15,-4.5899 -2.34,-8.7449 3.14,-8.7449 5.49,0 9.19,4.155 11.35,8.7449 l 9.09,19.4038 h 34.39 l -8.58,-18.2959 c -11.1,-23.667 -32.73,-32.6558 -57.16,-32.6558 -25.74,0 -36.37,10.7417 -25.06,34.8489 l 27.41,58.4571 c 9.64,20.556 31.64,34.99 57.82,34.99 22.26,0 37.94,-8.311 25.33,-35.21 l -4.92,-10.493 h -34.39 l 6.63,14.126"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path7900"
-           inkscape:connector-curvature="0" /><path
-           d="m 2341.17,125.552 c 2.15,4.59 5.86,8.745 11.34,8.745 5.49,0 5.29,-4.155 3.14,-8.745 l -30.56,-65.1711 c -2.16,-4.5899 -5.86,-8.7449 -11.34,-8.7449 -5.49,0 -5.29,4.155 -3.14,8.7449 z m 47.13,-3.721 c 10.57,22.554 1.73,35.273 -25.09,35.273 -26.83,0 -47.6,-12.719 -58.17,-35.273 l -28,-59.697 c -10.88,-23.218 3.97,-33.301 26.01,-33.301 22.04,0 46.36,10.083 57.25,33.301 l 28,59.697"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path7902"
-           inkscape:connector-curvature="0" /><path
-           d="m 2440.58,140.039 h 0.44 c 8.43,10.952 19.64,17.09 33.15,17.09 15.45,0 18.26,-10.737 9.85,-28.667 l -46.08,-98.2469 h -34.39 l 40.84,87.0649 c 2.57,5.479 4.91,11.402 -1.67,11.402 -6.59,0 -10.24,-5.923 -12.81,-11.402 l -40.83,-87.0649 h -34.39 l 58.84,125.4729 h 34.39 l -7.34,-15.649"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path7904"
-           inkscape:connector-curvature="0" /><path
-           d="m 2523.85,120.107 c 2.57,5.479 7.07,8.545 11.24,8.545 4.17,0 5.8,-3.066 3.23,-8.545 l -25.47,-54.316 c -2.56,-5.4741 -7.07,-8.54 -11.24,-8.54 -4.17,0 -5.8,3.0659 -3.24,8.54 z m -27.67,-89.858 h 34.39 l 73.19,156.06 h -34.39 l -22.42,-47.803 h -0.43 c 2.27,11.391 -3.12,18.623 -15.76,18.623 -17.41,0 -29.49,-11.831 -36.99,-27.822 l -32.45,-69.2091 c -7.08,-15.0779 -9.02,-31.2891 9.91,-31.2891 12.65,0 24.35,4.8191 31.95,17.304 h 0.44 l -7.44,-15.8638"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path7906"
-           inkscape:connector-curvature="0" /><path
-           d="m 2540.27,30.2151 58.86,125.5079 h 34.38 L 2574.65,30.2151 Z m 62.82,133.9449 10.38,22.144 h 34.39 l -10.39,-22.144 h -34.38"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path7908"
-           inkscape:connector-curvature="0" /><path
-           d="m 2629.69,132.891 10.69,22.807 h 11.52 l 10.6,22.583 h 34.38 l -10.59,-22.583 h 15 l -10.69,-22.807 h -15 l -32.1,-68.4432 c -3.5,-7.4561 -5.14,-11.4058 2.91,-11.4058 h 6.74 l -10.69,-22.8032 h -28.06 c -17.2,0 -16.81,9.6443 -9.1,26.0942 l 35.91,76.558 h -11.52"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path7910"
-           inkscape:connector-curvature="0" /><path
-           d="m 2648.97,30.2151 58.86,125.5079 h 34.38 L 2683.35,30.2151 Z m 62.81,133.9449 10.39,22.144 h 34.39 l -10.39,-22.144 h -34.39"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path7912"
-           inkscape:connector-curvature="0" /><path
-           d="m 2772.06,125.552 c 2.16,4.59 5.86,8.745 11.35,8.745 5.48,0 5.29,-4.155 3.13,-8.745 l -30.56,-65.1711 c -2.15,-4.5899 -5.86,-8.7449 -11.34,-8.7449 -5.49,0 -5.29,4.155 -3.14,8.7449 z m 47.13,-3.721 c 10.57,22.554 1.74,35.273 -25.09,35.273 -26.83,0 -47.59,-12.719 -58.17,-35.273 l -28,-59.697 c -10.88,-23.218 3.97,-33.301 26.01,-33.301 22.05,0 46.36,10.083 57.25,33.301 l 28,59.697"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path7914"
-           inkscape:connector-curvature="0" /><path
-           d="m 2871.47,140.039 h 0.44 c 8.43,10.952 19.64,17.09 33.15,17.09 15.46,0 18.26,-10.737 9.85,-28.667 l -46.08,-98.2469 h -34.38 l 40.83,87.0649 c 2.57,5.479 4.91,11.402 -1.68,11.402 -6.58,0 -10.23,-5.923 -12.8,-11.402 l -40.83,-87.0649 h -34.39 l 58.84,125.4729 h 34.39 l -7.34,-15.649"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path7916"
-           inkscape:connector-curvature="0" /><path
-           d="m 2949.84,109.668 8.05,17.153 c 2.27,4.839 5.92,7.476 10.74,7.476 4.83,0 6,-2.637 3.74,-7.476 l -8.05,-17.153 z m 39.14,-20.742 15.4,32.837 c 12.67,27.007 -3.01,35.341 -25.05,35.341 -26.83,0 -47.59,-12.719 -58.2,-35.341 l -27.98,-59.6631 c -10.88,-23.1839 3.98,-33.2669 26.03,-33.2669 24.21,0 45.84,8.9888 56.92,32.6167 l 8.6,18.335 h -34.39 l -7.58,-16.1568 c -3.48,-7.4118 -7.38,-11.9919 -12.86,-11.9919 -4.61,0 -5.1,4.5801 -1.62,11.9919 l 11.87,25.2981 h 48.86"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path7918"
-           inkscape:connector-curvature="0" /><path
-           d="m 3056.29,139.165 h 0.66 c 9.74,10.952 20.71,17.964 33.34,17.964 17.42,0 17.85,-11.611 11.8,-24.492 l -20.98,-44.7461 h -34.39 l 14.3,30.4831 c 2.36,5.044 3.3,10.308 -2.41,10.308 -5.7,0 -9.7,-5.264 -12.07,-10.308 l -41.35,-88.1589 h -34.38 l 58.84,125.4729 h 34.39 l -7.75,-16.523"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path7920"
-           inkscape:connector-curvature="0" /><path
-           d="m 3150.38,111.426 6.31,13.467 c 2.46,5.249 2.66,9.404 -2.83,9.404 -5.48,0 -9.19,-4.155 -11.65,-9.404 -10.05,-21.431 40.01,-17.491 20.94,-58.1691 -11.6,-24.7371 -32.57,-37.8909 -61.38,-37.8909 -22.02,0 -34.98,8.5501 -24.44,31.04 l 9.34,19.9117 h 34.38 l -8.78,-18.7298 c -2.46,-5.259 -2.66,-9.4189 2.83,-9.4189 5.48,0 9.19,4.1599 11.65,9.4189 13.97,29.7801 -39.21,20.586 -20.11,61.3031 11.68,24.927 33.93,34.771 56.61,34.771 26.19,0 38.13,-10.278 28.28,-31.275 l -6.77,-14.428 h -34.38"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path7922"
-           inkscape:connector-curvature="0" /></g></g></g></svg>
\ No newline at end of file
diff --git a/external/hypre/src/docs/usr-manual/index.rst b/external/hypre/src/docs/usr-manual/index.rst
index f384220d..914c1958 100644
--- a/external/hypre/src/docs/usr-manual/index.rst
+++ b/external/hypre/src/docs/usr-manual/index.rst
@@ -1,4 +1,4 @@
-.. Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+.. Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
    HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 
    SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -8,8 +8,8 @@
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
-Welcome to hypre's documentation!
-=================================
+Documentation for hypre
+=======================
 
 .. include:: ../copyright.txt
 
diff --git a/external/hypre/src/docs/usr-manual/requirements.txt b/external/hypre/src/docs/usr-manual/requirements.txt
index f4b17dcd..c4ea9613 100644
--- a/external/hypre/src/docs/usr-manual/requirements.txt
+++ b/external/hypre/src/docs/usr-manual/requirements.txt
@@ -1,6 +1,11 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-breathe
+sphinx>=5.3
+breathe>=4.34
+sphinx-rtd-theme>=1.1.1
+docutils>=0.17.1
+
+
diff --git a/external/hypre/src/docs/usr-manual/solvers-ads.rst b/external/hypre/src/docs/usr-manual/solvers-ads.rst
index 89230cdf..f427ce0f 100644
--- a/external/hypre/src/docs/usr-manual/solvers-ads.rst
+++ b/external/hypre/src/docs/usr-manual/solvers-ads.rst
@@ -1,4 +1,4 @@
-.. Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+.. Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
    HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 
    SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/docs/usr-manual/solvers-ams.rst b/external/hypre/src/docs/usr-manual/solvers-ams.rst
index 668e5a47..46b7cc28 100644
--- a/external/hypre/src/docs/usr-manual/solvers-ams.rst
+++ b/external/hypre/src/docs/usr-manual/solvers-ams.rst
@@ -1,4 +1,4 @@
-.. Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+.. Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
    HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 
    SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -68,9 +68,9 @@ In addition to the above quantities, AMS can utilize the following (optional)
 information:
 
 * The Poisson matrices :math:`A_\alpha` and :math:`A_\beta`, corresponding to
-  assembling of the forms :math:`(\alpha\, \nabla u, \nabla v)+(\beta\, \nabla
-  u, \nabla v)` and :math:`(\beta\, \nabla u, \nabla v)` using standard linear
-  finite elements on the same mesh.
+  assembling of the forms :math:`(\alpha\, \nabla u, \nabla v)+(\beta\, u, v)`
+  and :math:`(\beta\, \nabla u, \nabla v)` using standard linear finite elements
+  on the same mesh.
 
 Internally, AMS proceeds with the construction of the following additional objects:
 
@@ -105,7 +105,7 @@ code ``ex15.c`` for a complete implementation.  We start with the allocation of
 the ``HYPRE_Solver`` object:
 
 .. code-block:: c
-   
+
    HYPRE_Solver solver;
    HYPRE_AMSCreate(&solver);
 
@@ -118,7 +118,7 @@ with the function given below.  We note that a 3D solver will still work for a
 2D problem, but it will be slower and will require more memory than necessary.
 
 .. code-block:: c
-   
+
    HYPRE_AMSSetDimension(solver, dim);
 
 The user is required to provide the discrete gradient matrix :math:`G`.  AMS
@@ -129,7 +129,7 @@ excluded. It is essential to **not** impose any boundary conditions on
 the following function.
 
 .. code-block:: c
-   
+
    HYPRE_AMSSetDiscreteGradient(solver, G);
 
 In addition to :math:`G`, we need one additional piece of information in order
@@ -140,13 +140,13 @@ vectors should be provided.  For 2D problems, the user can set the third vector
 to NULL.  The corresponding function calls read:
 
 .. code-block:: c
-   
+
    HYPRE_AMSSetCoordinateVectors(solver,x,y,z);
 
 or
 
 .. code-block:: c
-   
+
    HYPRE_AMSSetEdgeConstantVectors(solver, one_zero_zero, zero_one_zero, zero_zero_one);
 
 The vectors ``one_zero_zero``, ``zero_one_zero`` and ``zero_zero_one`` above
@@ -157,7 +157,7 @@ The remaining solver parameters are optional.  For example, the user can choose
 a different cycle type by calling
 
 .. code-block:: c
-   
+
    HYPRE_AMSSetCycleType(solver, cycle_type); /* default value: 1 */
 
 The available cycle types in AMS are:
@@ -195,7 +195,7 @@ Additional solver parameters, such as the maximum number of iterations, the
 convergence tolerance and the output level, can be set with
 
 .. code-block:: c
-   
+
    HYPRE_AMSSetMaxIter(solver, maxit);     /* default value: 20 */
    HYPRE_AMSSetTol(solver, tol);           /* default value: 1e-6 */
    HYPRE_AMSSetPrintLevel(solver, print);  /* default value: 1 */
@@ -204,7 +204,7 @@ More advanced parameters, affecting the smoothing and the internal AMG solvers,
 can be set with the following three functions:
 
 .. code-block:: c
-   
+
    HYPRE_AMSSetSmoothingOptions(solver, 2, 1, 1.0, 1.0);
    HYPRE_AMSSetAlphaAMGOptions(solver, 10, 1, 3, 0.25, 0, 0);
    HYPRE_AMSSetBetaAMGOptions(solver, 10, 1, 3, 0.25, 0, 0);
@@ -214,7 +214,7 @@ For (singular) problems where :math:`\beta = 0` in the whole domain, different
 simplification, use the following hypre call
 
 .. code-block:: c
-   
+
    HYPRE_AMSSetBetaPoissonMatrix(solver, NULL);
 
 If :math:`\beta` is zero only in parts of the domain, the problem is still
@@ -226,7 +226,7 @@ the list of nodes which are interior to a zero-conductivity region provided by
 the function
 
 .. code-block:: c
-   
+
    HYPRE_AMSSetInteriorNodes(solver, HYPRE_ParVector interior_nodes);
 
 A node is interior, if its entry in the ``interior_nodes`` array is :math:`1.0`.
@@ -238,7 +238,7 @@ is advantageous to project on the compatible subspace :math:`Ker(G_0^T)`. This
 can be done periodically, or manually through the functions
 
 .. code-block:: c
-   
+
    HYPRE_AMSSetProjectionFrequency(solver, int projection_frequency);
    HYPRE_AMSProjectOutGradients(solver, HYPRE_ParVector x);
 
@@ -250,7 +250,7 @@ Poisson matrix with coefficient :math:`\beta` (denoted by ``Abeta``) is
 available then one can avoid one matrix construction by calling
 
 .. code-block:: c
-   
+
    HYPRE_AMSSetBetaPoissonMatrix(solver, Abeta);
 
 Similarly, if the Poisson matrix with coefficient :math:`\alpha` is available
@@ -258,7 +258,7 @@ Similarly, if the Poisson matrix with coefficient :math:`\alpha` is available
 calling
 
 .. code-block:: c
-   
+
    HYPRE_AMSSetAlphaPoissonMatrix(solver, Aalpha);
 
 Note the following regarding these functions:
@@ -282,7 +282,7 @@ hypre parallel vectors :math:`{\mathbf b}` and :math:`{\mathbf x}`. (The vectors
 are actually not used in the current AMS setup.) The setup call reads,
 
 .. code-block:: c
-   
+
    HYPRE_AMSSetup(solver, A, b, x);
 
 It is important to note the order of the calling sequence. For example, do
@@ -293,13 +293,13 @@ and one of the functions ``HYPRE_AMSSetCoordinateVectors`` or
 Once the setup has completed, we can solve the linear system by calling
 
 .. code-block:: c
-   
+
    HYPRE_AMSSolve(solver, A, b, x);
 
 Finally, the solver can be destroyed with
 
 .. code-block:: c
-   
+
    HYPRE_AMSDestroy(&solver);
 
 More details can be found in the files ``ams.h`` and ``ams.c`` located in the
@@ -342,7 +342,7 @@ basis functions and degrees of freedom.
 With these matrices, the high-order setup procedure is simply
 
 .. code-block:: c
-   
+
    HYPRE_AMSSetDimension(solver, dim);
    HYPRE_AMSSetDiscreteGradient(solver, G);
    HYPRE_AMSSetInterpolations(solver, Pi, NULL, NULL, NULL);
@@ -358,7 +358,7 @@ options to those less than 10. Alternatively one can separately specify the
 :math:`x`, :math:`y` and :math:`z` components of :math:`\mathbf \Pi`:
 
 .. code-block:: c
-   
+
    HYPRE_AMSSetInterpolations(solver, NULL, Pix, Piy, Piz);
 
 which enables the use of AMS cycle types with index greater than 10. By
@@ -370,7 +370,7 @@ the coordinates of the mesh vertices.
 Finally, both :math:`{\mathbf \Pi}` and its components can be passed to the solver:
 
 .. code-block:: c
-   
+
    HYPRE_AMSSetInterpolations(solver, Pi, Pix, Piy, Piz);
 
 which will duplicate some memory, but allows for experimentation with all
@@ -436,4 +436,3 @@ with :math:`{\mathbf \Pi}_{nc}` computed element-wise as in the previous
 subsection. Note that in the low-order case, :math:`{\mathbf \Pi}_{c}` can be
 computed internally in AMS based only :math:`G_c` and the conforming coordinates
 of the vertices :math:`x_c`/:math:`y_c`/:math:`z_c`, see [GrKo2015]_.
-
diff --git a/external/hypre/src/docs/usr-manual/solvers-boomeramg.rst b/external/hypre/src/docs/usr-manual/solvers-boomeramg.rst
index d5b7c816..efce7667 100644
--- a/external/hypre/src/docs/usr-manual/solvers-boomeramg.rst
+++ b/external/hypre/src/docs/usr-manual/solvers-boomeramg.rst
@@ -1,4 +1,4 @@
-.. Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+.. Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
    HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 
    SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -10,13 +10,11 @@ BoomerAMG
 BoomerAMG is a parallel implementation of the algebraic multigrid method
 [RuSt1987]_.  It can be used both as a solver or as a preconditioner.  The user
 can choose between various different parallel coarsening techniques,
-interpolation and relaxation schemes.  While the default settings work fairly
-well for two-dimensional diffusion problems, for three-dimensional diffusion
-problems, it is recommended to choose a lower complexity coarsening like HMIS or
-PMIS (coarsening 10 or 8) and combine it with a distance-two interpolation
-(interpolation 6 or 7), that is also truncated to 4 or 5 elements per
-row. Additional reduction in complexity and increased scalability can often be
-achieved using one or two levels of aggressive coarsening.
+interpolation and relaxation schemes. The default settings for CPUs, HMIS 
+(coarsening 8) combined with a distance-two interpolation (6) truncated to 4
+or 5 elements per row, should work fairly well for two- and three-dimensional 
+diffusion problems. Additional reduction in complexity and increased scalability 
+can often be achieved using one or two levels of aggressive coarsening.
 
 
 Parameter Options
@@ -42,6 +40,7 @@ techniques can be found in [HeYa2002]_, [Yang2005]_.
 Various coarsening techniques are available:
 
 * the Cleary-Luby-Jones-Plassman (CLJP) coarsening,
+* parallel versions of the classical RS coarsening described in [HeYa2002]_.
 * the Falgout coarsening which is a combination of CLJP and the classical RS
   coarsening algorithm,
 * CGC and CGC-E coarsenings [GrMS2006a]_, [GrMS2006b]_,
@@ -51,14 +50,15 @@ Various coarsening techniques are available:
   techniques mentioned above a nd thus achieving much lower complexities and
   lower memory use [Stue1999]_.
 
-To use aggressive coarsening the user has to set the number of levels to which
-he wants to apply aggressive coarsening (starting with the finest level) via
+To use aggressive coarsening users have to set the number of levels to which
+they want to apply aggressive coarsening (starting with the finest level) via
 ``HYPRE_BoomerAMGSetAggNumLevels``. Since aggressive coarsening requires long
 range interpolation, multipass interpolation is always used on levels with
 aggressive coarsening, unless the user specifies another long-range
-interpolation suitable for aggressive coarsening.
+interpolation suitable for aggressive coarsening via 
+``HYPRE_BoomerAMGSetAggInterpType``..
 
-Note that the default coarsening is HMIS [DeYH2004]_.
+Note that the default coarsening for CPUs is HMIS, for GPUs PMIS [DeYH2004]_.
 
 
 Interpolation Options
@@ -66,18 +66,19 @@ Interpolation Options
 
 Various interpolation techniques can be set using ``HYPRE_BoomerAMGSetInterpType``:
 
-* the "classical" interpolation as defined in [RuSt1987]_,
-* direct interpolation [Stue1999]_,
-* standard interpolation [Stue1999]_,
+* the "classical" interpolation (0) as defined in [RuSt1987]_,
+* direct interpolation (3) [Stue1999]_,
+* standard interpolation (8) [Stue1999]_,
 * an extended "classical" interpolation, which is a long range interpolation and
   is recommended to be used with PMIS and HMIS coarsening for harder problems
-  [DFNY2008]_,
-* multipass interpolation [Stue1999]_,
+  (6) [DFNY2008]_,
+* distance-two interpolation based on matrix operations (17) [LiSY2021]_,
+* multipass interpolation (4) [Stue1999]_,
 * two-stage interpolation [Yang2010]_,
 * Jacobi interpolation [Stue1999]_,
-* the "classical" interpolation modified for hyperbolic PDEs.
+* the "classical" interpolation modified for hyperbolic PDEs (2).
 
-Jacobi interpolation is only use to improve certain interpolation operators and
+Jacobi interpolation is only used to improve certain interpolation operators and
 can be used with ``HYPRE_BoomerAMGSetPostInterpType``.  Since some of the
 interpolation operators might generate large stencils, it is often possible and
 recommended to control complexity and truncate the interpolation operators using
@@ -85,7 +86,8 @@ recommended to control complexity and truncate the interpolation operators using
 ``HYPRE_BoomerAMGSetJacobiTruncTheshold`` (for Jacobi interpolation only).
 
 Note that the default interpolation is extended+i interpolation [DFNY2008]_
-truncated to 4 elements per row.
+truncated to 4 elements per row, for CPUs, and a version of this interpolation
+based on matrix operations for GPUs [LiSY2021]_.
 
 
 Non-Galerkin Options
@@ -112,13 +114,15 @@ Smoother Options
 A good overview of parallel smoothers and their properties can be found in
 [BFKY2011]_. Various of the described relaxation techniques are available:
 
-* weighted Jacobi relaxation,
-* a hybrid Gauss-Seidel / Jacobi relaxation scheme,
-* a symmetric hybrid Gauss-Seidel / Jacobi relaxation scheme,
-* l1-Gauss-Seidel or Jacobi,
-* Chebyshev smoothers,
+* weighted Jacobi relaxation (0),
+* a hybrid Gauss-Seidel / Jacobi relaxation scheme (3 4),
+* a symmetric hybrid Gauss-Seidel / Jacobi relaxation scheme (6),
+* l1-Gauss-Seidel or Jacobi (13 14 18 8),
+* Chebyshev smoothers (16),
+* two-stage Gauss-Seidel smoothers (11 12) [BKRHSMTY2021]_,
 * hybrid block and Schwarz smoothers [Yang2004]_,
-* ILU and approximate inverse smoothers.
+* Incomplete LU factorization, see :ref:`ilu-amg-smoother`.
+* Factorized Sparse Approximate Inverse (FSAI), see :ref:`fsai-amg-smoother`.
 
 Point relaxation schemes can be set using ``HYPRE_BoomerAMGSetRelaxType`` or, if
 one wants to specifically set the up cycle, down cycle or the coarsest grid,
@@ -143,6 +147,19 @@ used. Functions that enable the user to access the systems AMG version are
 ``HYPRE_BoomerAMGSetNumFunctions``, ``HYPRE_BoomerAMGSetDofFunc`` and
 ``HYPRE_BoomerAMGSetNodal``.
 
+There are basically two approaches to deal with matrices derived from systems
+of PDEs. The unknown-based approach (which is the default) treats variables 
+corresponding to the same unknown or function separately, i.e., when coarsening 
+or generating interpolation, connections between variables associated with 
+different unknowns are ignored. This can work well for weakly coupled PDEs, 
+but will be problematic for strongly coupled PDEs. For such problems, we recommend 
+to use hypre's multigrid reduction (MGR) solver. The second approach, called 
+the nodal approach, considers all unknowns at a physical grid point together 
+such that coarsening, interpolation and relaxation occur in a point-wise fashion. 
+It is possible and sometimes prefered to combine nodal coarsening with unknown-based 
+interpolation. For this case, ``HYPRE_BoomerAMGSetNodal`` should be set > 1. 
+For details see the reference manual.
+
 If the user can provide the near null-space vectors, such as the rigid body
 modes for linear elasticity problems, an interpolation is available that will
 incorporate these vectors with ``HYPRE_BoomerAMGSetInterpVectors`` and
@@ -170,15 +187,32 @@ GPU-supported Options
 
 In general, CUDA unified memory is required for running BoomerAMG solvers on GPUs.
 However, hypre can also be built without ``--enable-unified-memory`` if
-all the selected parameters have GPU-support. 
+all the selected parameters have GPU-support.
 The currently available  GPU-supported BoomerAMG options include:
 
 * Coarsening: PMIS (8)
 * Interpolation:  direct (3), BAMG-direct (15), extended (14), extended+i (6) and extended+e (18)
 * Aggressive coarsening
 * Second-stage interpolation with aggressive coarsening: extended (5) and extended+e (7)
-* Smoother: Jacobi (7), l1-Jacobi (18), hybrid Gauss Seidel/SRROR (3 4 6), two-stage Gauss-Seidel (11,12) [BKRHSMTY2021]_
-* Relaxation order: must be 0, i.e., lexicographic order
+* Smoother: Jacobi (7), l1-Jacobi (18), hybrid Gauss Seidel/SSOR (3 4 6), two-stage Gauss-Seidel (11,12) [BKRHSMTY2021]_,  and Chebyshev (16)
+* Relaxation order can be 0, lexicographic order, or C/F for (7) and (18)
+
+Memory locations and execution policies
+------------------------------------------------------------------------------
+Hypre provides two user-level memory locations, ``HYPRE_MEMORY_HOST`` and ``HYPRE_MEMORY_DEVICE``, where
+``HYPRE_MEMORY_HOST`` is always the CPU memory while ``HYPRE_MEMORY_DEVICE`` can be mapped to different memory spaces 
+based on the configure options of hypre.
+When built with ``--with-cuda``, ``--with-hip``, ``--with-sycl``, or ``--with-device-openmp``,
+``HYPRE_MEMORY_DEVICE`` is the GPU device memory,
+and when built additionally with ``--enable-unified-memory``, it is the GPU unified memory (UM).
+For a non-GPU build, ``HYPRE_MEMORY_DEVICE`` is also mapped to the CPU memory.
+The default memory location of hypre's matrix and vector objects is ``HYPRE_MEMORY_DEVICE``,
+which can be changed at runtime by ``HYPRE_SetMemoryLocation(...)``.
+
+The execution policies define the platform of running computations based on the memory locations of participating objects.
+The default policy is ``HYPRE_EXEC_HOST``, i.e., executing on the host **if the objects are accessible from the host**.
+It can be adjusted by ``HYPRE_SetExecutionPolicy(...)``.
+Clearly, this policy only affects objects in UM, since UM is accessible from **both CPUs and GPUs**.
 
 A sample code of setting up IJ matrix :math:`A` and solve :math:`Ax=b` using AMG-preconditioned CG
 on GPUs is shown below.
@@ -187,14 +221,14 @@ on GPUs is shown below.
 
  cudaSetDevice(device_id); /* GPU binding */
  ...
- HYPRE_Init(); /* must be the first HYPRE function call */
+ HYPRE_Initialize(); /* must be the first HYPRE function call */
  ...
  /* AMG in GPU memory (default) */
  HYPRE_SetMemoryLocation(HYPRE_MEMORY_DEVICE);
  /* setup AMG on GPUs */
  HYPRE_SetExecutionPolicy(HYPRE_EXEC_DEVICE);
- /* use hypre's SpGEMM instead of cuSPARSE */
- HYPRE_SetSpGemmUseCusparse(FALSE);
+ /* use hypre's SpGEMM instead of vendor implementation */
+ HYPRE_SetSpGemmUseVendor(FALSE);
  /* use GPU RNG */
  HYPRE_SetUseGpuRand(TRUE);
  if (useHypreGpuMemPool)
@@ -238,7 +272,7 @@ on GPUs is shown below.
  ...
  HYPRE_Finalize(); /* must be the last HYPRE function call */
 
-``HYPRE_Init()`` must be called and precede all the other ``HYPRE_`` functions, and
+``HYPRE_Initialize()`` must be called and precede all the other ``HYPRE_`` functions, and
 ``HYPRE_Finalize()`` must be called before exiting.
 
 Miscellaneous
@@ -248,9 +282,6 @@ For best performance, it might be necessary to set certain parameters, which
 will affect both coarsening and interpolation.  One important parameter is the
 strong threshold, which can be set using the function
 ``HYPRE_BoomerAMGSetStrongThreshold``.  The default value is 0.25, which appears
-to be a good choice for 2-dimensional problems and the low complexity coarsening
-algorithms.  For 3-dimensional problems a better choice appears to be 0.5, when
-using the default coarsening algorithm. However, the choice of the strength
-threshold is problem dependent and therefore there could be better choices than
-the two suggested ones.
-
+to be a good choice for diffusion problems.  The choice of the strength
+threshold is problem dependent. For example, elasticity problems often require a larger
+strength threshold.
diff --git a/external/hypre/src/docs/usr-manual/solvers-euclid.rst b/external/hypre/src/docs/usr-manual/solvers-euclid.rst
index ab1ff5aa..e6d35406 100644
--- a/external/hypre/src/docs/usr-manual/solvers-euclid.rst
+++ b/external/hypre/src/docs/usr-manual/solvers-euclid.rst
@@ -1,4 +1,4 @@
-.. Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+.. Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
    HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 
    SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -7,6 +7,13 @@
 Euclid
 ==============================================================================
 
+.. warning::
+   Euclid is not actively supported by the hypre development team. We recommend using
+   :ref:`ilu` for parallel ILU algorithms. This new ILU implementation includes
+   64-bit integers support (for linear systems with more than 2,147,483,647 global
+   unknowns) through both *mixedint* and *bigint* builds of hypre and NVIDIA/AMD GPUs
+   support through the CUDA/HIP backends.
+
 The Euclid library is a scalable implementation of the Parallel ILU algorithm
 that was presented at SC99 [HyPo1999]_, and published in expanded form in the
 SIAM Journal on Scientific Computing [HyPo2001]_.  By *scalable* we mean that
@@ -45,28 +52,28 @@ subsection lists the options, and provides guidance as to the settings that (in
 our experience) will likely prove effective for minimizing execution time.
 
 .. code-block:: c
-   
+
    #include "HYPRE_parcsr_ls.h"
-   
+
    HYPRE_Solver eu;
    HYPRE_Solver pcg_solver;
    HYPRE_ParVector b, x;
    HYPRE_ParCSRMatrix A;
-   
+
    //Instantiate the preconditioner.
    HYPRE_EuclidCreate(comm, &eu);
-   
+
    //Optionally use the following three methods to set runtime options.
    // 1. pass options from command line or string array.
    HYPRE_EuclidSetParams(eu, argc, argv);
-   
+
    // 2. pass options from a configuration file.
    HYPRE_EuclidSetParamsFromFile(eu, "filename");
-   
+
    // 3. pass options using interface functions.
    HYPRE_EuclidSetLevel(eu, 3);
    ...
-   
+
    //Set Euclid as the preconditioning method for some
    //other solver, using the function calls HYPRE_EuclidSetup
    //and HYPRE_EuclidSolve.  We assume that the pcg_solver
@@ -75,13 +82,13 @@ our experience) will likely prove effective for minimizing execution time.
                        (HYPRE_PtrToSolverFcn) HYPRE_EuclidSolve,
                        (HYPRE_PtrToSolverFcn) HYPRE_EuclidSetup,
                        eu);
-   
-   //Solve the system by calling the Setup and Solve methods for, 
+
+   //Solve the system by calling the Setup and Solve methods for,
    //in this case, the HYPRE_PCG solver.  We assume that A, b, and x
    //have been properly initialized.
    HYPRE_PCGSetup(pcg_solver, (HYPRE_Matrix)A, (HYPRE_Vector)b, (HYPRE_Vector)x);
    HYPRE_PCGSolve(pcg_solver, (HYPRE_Matrix)parcsr_A, (HYPRE_Vector)b, (HYPRE_Vector)x);
-   
+
    //Destroy the Euclid preconditioning object.
    HYPRE_EuclidDestroy(eu);
 
@@ -118,7 +125,7 @@ recognized by Euclid, no harm should ensue.
 **Method 2.** To pass options on the command line, call
 
 .. code-block:: c
-   
+
    HYPRE_EuclidSetParams(HYPRE_Solver solver, int argc, char *argv[]);
 
 where ``argc`` and ``argv`` carry the usual connotation: ``main(int argc, char
@@ -126,7 +133,7 @@ where ``argc`` and ``argv`` carry the usual connotation: ``main(int argc, char
 options on the command line per the following example.
 
 .. code-block:: bash
-   
+
    mpirun -np 2 phoo -level 3
 
 Since Euclid looks for the ``database`` file when ``HYPRE_EuclidCreate`` is
@@ -149,13 +156,13 @@ you can then specify the configuration filename on the command line using the
 ``-db_filename filename`` option, e.g.,
 
 .. code-block:: bash
-   
+
    mpirun -np 2 phoo -db_filename ../myConfigFile
 
 **Method 4.** One can also set parameters via interface functions, e.g
 
 .. code-block:: c
-   
+
    int HYPRE_EuclidSetLevel(HYPRE_Solver solver, int level);
 
 For a full set of functions, see the reference manual.
@@ -192,13 +199,13 @@ Options Summary
   largest absolute value of any entry in the row. Guidance: try this in
   conjunction with -rowScale.  CAUTION: If the coefficient matrix :math:`A` is
   symmetric, this setting is likely to cause the filled matrix, :math:`F =
-  L+U-I`, to be unsymmetric.  This setting has no effect when ILUT factorization
+  L+U-I`, to be non-symmetric.  This setting has no effect when ILUT factorization
   is selected.
 
 * **-rowScale** Scale values prior to factorization such that the largest value
   in any row is +1 or -1.  Default: 0 (false).  CAUTION: If the coefficient
   matrix :math:`A` is symmetric, this setting is likely to cause the filled
-  matrix, :math:`F = L+U-I`, to be unsymmetric.  Guidance: if the matrix is
+  matrix, :math:`F = L+U-I`, to be non-symmetric.  Guidance: if the matrix is
   poorly scaled, turning on row scaling may help convergence.
 
 * **-ilut** :math:`\langle float \rangle` Use ILUT factorization instead of the
@@ -206,5 +213,4 @@ Options Summary
   tolerance, which is relative to the largest absolute value of any entry in the
   row being factored.  CAUTION: If the coefficient matrix :math:`A` is
   symmetric, this setting is likely to cause the filled matrix, :math:`F =
-  L+U-I`, to be unsymmetric.  NOTE: this option can only be used sequentially!
-
+  L+U-I`, to be non-symmetric.  NOTE: this option can only be used sequentially!
diff --git a/external/hypre/src/docs/usr-manual/solvers-fac.rst b/external/hypre/src/docs/usr-manual/solvers-fac.rst
index 580d220e..d3f26338 100644
--- a/external/hypre/src/docs/usr-manual/solvers-fac.rst
+++ b/external/hypre/src/docs/usr-manual/solvers-fac.rst
@@ -1,4 +1,4 @@
-.. Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+.. Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
    HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 
    SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/docs/usr-manual/solvers-fei.rst b/external/hypre/src/docs/usr-manual/solvers-fei.rst
index 611bbe2d..51e0035f 100644
--- a/external/hypre/src/docs/usr-manual/solvers-fei.rst
+++ b/external/hypre/src/docs/usr-manual/solvers-fei.rst
@@ -1,4 +1,4 @@
-.. Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+.. Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
    HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 
    SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -9,6 +9,12 @@
 FEI Solvers
 ==============================================================================
 
+.. warning::
+   FEI is not actively supported by the hypre development team. For similar
+   functionality, we recommend using :ref:`sec-Block-Structured-Grids-FEM`, which
+   allows the representation of block-structured grid problems via hypre's
+   SStruct interface.
+
 After the FEI has been used to assemble the global linear system (as described
 in Chapter :ref:`ch-FEI`), a number of hypre solvers can be called to perform
 the solution.  This is straightforward, if hypre's FEI has been used.  If an
@@ -20,24 +26,24 @@ the available options can be found in the FEI section of the reference manual.
 They are passed to the FEI as in the following example:
 
 .. code-block:: c++
-   
+
    nParams = 5;
    paramStrings = new char*[nParams];
    for (i = 0; i < nParams; i++) }
       paramStrings[i] = new char[100];
-   
+
    strcpy(paramStrings[0], "solver cg");
    strcpy(paramStrings[1], "preconditioner diag");
    strcpy(paramStrings[2], "maxiterations 100");
    strcpy(paramStrings[3], "tolerance 1.0e-6");
    strcpy(paramStrings[4], "outputLevel 1");
-   
+
    feiPtr -> parameters(nParams, paramStrings);
 
 To solve the linear system of equations, we call
 
 .. code-block:: c++
-   
+
    feiPtr -> solve(&status);
 
 where the returned value ``status`` indicates whether the solve was successful.
@@ -45,7 +51,7 @@ where the returned value ``status`` indicates whether the solve was successful.
 Finally, the solution can be retrieved by the following function call:
 
 .. code-block:: c++
-   
+
    feiPtr -> getBlockNodeSolution(elemBlkID, nNodes, nodeIDList,
                                   solnOffsets, solnValues);
 
@@ -53,7 +59,7 @@ where ``nodeIDList`` is a list of nodes in element block ``elemBlkID``, and
 ``solnOffsets[i]`` is the index pointing to the first location where the
 variables at node :math:`i` is returned in ``solnValues``.
 
-Solvers Available Only through the FEI 
+Solvers Available Only through the FEI
 ------------------------------------------------------------------------------
 
 While most of the solvers from the previous sections are available through the
@@ -71,9 +77,9 @@ following we list some of these internal solvers.
 
 #. Additional Krylov solvers (FGMRES, TFQMR, symmetric QMR),
 #. SuperLU direct solver (sequential),
-#. SuperLU direct solver with iterative refinement (sequential), 
+#. SuperLU direct solver with iterative refinement (sequential),
 
-Parallel Preconditioners 
+Parallel Preconditioners
 ^^^^^^^^^^^^^^^^^^^^^^^^
 
 The performance of the Krylov solvers can be improved by clever selection of
@@ -82,7 +88,7 @@ following preconditioners are available via the ``LinearSystemCore`` interface:
 
 #. the modified version of MLI, which requires the finite element substructure
    matrices to construct the prolongation operators,
-#. parallel domain decomposition with inexact local solves (``DDIlut``), 
+#. parallel domain decomposition with inexact local solves (``DDIlut``),
 #. least-squares polynomial preconditioner,
 #. :math:`2 \times 2` block preconditioner, and
 #. :math:`2 \times 2` Uzawa preconditioner.
@@ -107,25 +113,25 @@ The incoming linear system of equations is assumed to be in the form:
 
 .. math::
 
-   \left[ 
-   \begin{array}{cc} 
+   \left[
+   \begin{array}{cc}
       D   & B \\
       B^T & 0
    \end{array}
-     \right] 
+     \right]
      \left[
-   \begin{array}{c} 
+   \begin{array}{c}
       x_1 \\
       x_2
    \end{array}
-     \right] 
+     \right]
      =
      \left[
-   \begin{array}{c} 
+   \begin{array}{c}
       b_1 \\
       b_2
    \end{array}
-     \right] 
+     \right]
 
 where :math:`D` is a diagonal matrix.  After Schur complement reduction is
 applied, the resulting linear system becomes
@@ -145,20 +151,20 @@ re-order the system into a :math:`3 \times 3` block matrix.
 
 .. math::
 
-   \left[ 
-   \begin{array}{ccc} 
+   \left[
+   \begin{array}{ccc}
       A_{11}  & A_{12} & N \\
       A_{21}  & A_{22} & D \\
       N_{T}   & D      & 0 \\
    \end{array}
-   \right] 
+   \right]
    =
-   \left[ 
-   \begin{array}{ccc} 
+   \left[
+   \begin{array}{ccc}
       A_{11}       & \hat{A}_{12} \\
       \hat{A}_{21} & \hat{A}_{22}.
    \end{array}
-   \right] 
+   \right]
 
 The reduced system has the form :
 
diff --git a/external/hypre/src/docs/usr-manual/solvers-fsai.rst b/external/hypre/src/docs/usr-manual/solvers-fsai.rst
new file mode 100644
index 00000000..8a961428
--- /dev/null
+++ b/external/hypre/src/docs/usr-manual/solvers-fsai.rst
@@ -0,0 +1,101 @@
+.. Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+   HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+
+   SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+.. _fsai:
+
+FSAI
+==============================================================================
+
+FSAI is a parallel implementation of the Factorized Sparse Approximate Inverse preconditioner,
+initially proposed by [KoYe1993]_. Given a symmetric positive definite matrix :math:`A`, FSAI
+computes a triangular matrix :math:`G` that approximates the inverse of the lower Cholesky
+factor (:math:`L`) of :math:`A`. This computation is done by minimizing the Frobenius norm
+:math:`|| I - G L ||_F` without explicit knowledge of :math:`L`. The resulting preconditioner
+preserves the positive definiteness of :math:`A` and is given by :math:`M^{-1} = G^{T} G`.
+
+One of the critical factors determining the quality of sparse approximate inverse
+preconditioners lies in choosing the sparsity pattern of :math:`G`. While ParaSails
+employs *a priori* sparsity patterns, FSAI uses an iterative strategy that generates
+sparsity patterns on the fly, i.e., while computing their nonzero coefficient values
+concurrently. At every step of the iterative process, the sparsity pattern of a row of
+:math:`G` is augmented with a fixed number of entries, leading to the most significant
+reduction of the conditioning number of :math:`G A G^T`. Such a strategy is also called
+"adaptive FSAI" or "dynamic FSAI" and it can lead to more robust sparse approximate
+inverses than ParaSails. For more details on how it works, see [JaFe2015]_.
+
+Parameter Settings
+------------------------------------------------------------------------------
+
+The accuracy and cost of FSAI are determined by three configurations parameters as shown
+in the table below
+
+   =================  =======  =============  =================  =======
+   param              type     range          sug. values        default
+   =================  =======  =============  =================  =======
+   ``max_steps``      int      :math:`\ge 0`  5, 10, 30          5
+   ``max_step_size``  int      :math:`\ge 0`  1, 3, 6            3
+   ``kap_tolerance``  real     :math:`\ge 0`  0.0, 1.E-2, 1.E-3  1.E-3
+   =================  =======  =============  =================  =======
+
+The first parameter, ``max_steps``, controls the number of maximum steps used in the iterative
+algorithm. The second parameter, ``max_step_size``, gives the maximum number of indices added
+to the sparsity pattern of :math:`G` at each step. Lastly, the third parameter,
+``kap_tolerance``, is a floating-point value used to stop the inclusion of new indices to the
+sparsity pattern of :math:`G` when the conditioning number of :math:`G A G^T`
+stagnates. This can be disabled by setting ``kap_tolerance = 0``. Naturally, the
+preconditioner quality increases for denser sparsity patterns of :math:`G`, but so do
+its setup and solve costs. For a reasonable balance between accuracy and cost,
+we recommend that :math:`max\_steps * max\_step\_size \leq 30`. The configuration
+parameters of FSAI can be set via the following calls:
+
+.. code-block:: c
+
+   HYPRE_FSAISetMaxSteps(HYPRE_Solver solver, HYPRE_Int max_steps);
+   HYPRE_FSAISetMaxStepSize(HYPRE_Solver solver, HYPRE_Int max_step_size);
+   HYPRE_FSAISetKapTolerance(HYPRE_Solver solver, HYPRE_Real kap_tolerance);
+
+.. _fsai-amg-smoother:
+
+FSAI as Smoother to BoomerAMG
+------------------------------------------------------------------------------
+
+As discussed in [PaFa2019]_, the factorized sparse approximate inverse method can be an
+effective smoother to AMG for several reasons. Particularly, it leads to a symmetric operator,
+and thus allows AMG to be used as a preconditioner for the conjugate gradient solver. In
+hypre, FSAI can be used as a complex smoother to BoomerAMG by calling the functions:
+
+.. code-block:: c
+
+   HYPRE_BoomerAMGSetSmoothType(HYPRE_Solver solver, 4);
+   HYPRE_BoomerAMGSetSmoothNumLevels(HYPRE_Solver solver, HYPRE_Int num_levels);
+
+where ``num_levels`` is the last multigrid level where FSAI is used. The configuration
+parameters of the FSAI smoother, as described above, can be set via the following calls:
+
+.. code-block:: c
+
+   HYPRE_BoomerAMGSetFSAIMaxSteps(HYPRE_Solver solver, HYPRE_Int max_steps);
+   HYPRE_BoomerAMGSetFSAIMaxStepSize(HYPRE_Solver solver, HYPRE_Int max_step_size);
+   HYPRE_BoomerAMGSetFSAIKapTolerance(HYPRE_Solver solver, HYPRE_Real kap_tolerance);
+
+Implementation Notes
+------------------------------------------------------------------------------
+
+* When the matrix :math:`A` is distributed across MPI tasks, FSAI considers only the
+  block diagonal portions of :math:`A` for computing :math:`G`. The resulting
+  preconditioner is effectively a block-Jacobi sparse approximate inverse in the MPI
+  sense. Although this strategy reduces communication costs, it can degrade convergence
+  performance when several tasks are used, especially when FSAI is employed as a
+  preconditioner to a Krylov solver.
+
+* The CPU version of FSAI supports threading via OpenMP. To enable it, users need to
+  compile hypre with OpenMP support via the configure option ``--with-openmp``. In this
+  case, FSAI relies on an implementation of BLAS/LAPACK that is thread-safe. The one
+  distributed internally with hypre fulfills this criterion, but care must be taken when
+  linking hypre to external BLAS/LAPACK libraries. In HPC platforms, we recommend using
+  vendor implementations of BLAS/LAPACK for better setup performance of FSAI, regardless
+  of whether using OpenMP or not.
+
+* The GPU version of FSAI is under development.
diff --git a/external/hypre/src/docs/usr-manual/solvers-hybrid.rst b/external/hypre/src/docs/usr-manual/solvers-hybrid.rst
index 56fbc76e..7977b30e 100644
--- a/external/hypre/src/docs/usr-manual/solvers-hybrid.rst
+++ b/external/hypre/src/docs/usr-manual/solvers-hybrid.rst
@@ -1,4 +1,4 @@
-.. Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+.. Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
    HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 
    SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -23,7 +23,7 @@ ParCSRHybrid, if used through the ``IJ`` interface and is used here with
 BoomerAMG.  The user can determine the average convergence speed by setting a
 convergence tolerance :math:`0 \leq \theta < 1` via the routine
 ``HYPRE_StructHybridSetConvergenceTol`` or
-``HYPRE_StructParCSRHybridSetConvergenceTol``.  The default setting is 0.9.
+``HYPRE_ParCSRHybridSetConvergenceTol``.  The default setting is 0.9.
 
 The average convergence factor :math:`\rho_i = \left({{\| r_i \|} \over {\| r_0
 \|}}\right)^{1/i}` is monitored within the chosen Krylov solver, where
@@ -37,3 +37,16 @@ considered too slow when
 When this condition is fulfilled the hybrid solver switches from a diagonally
 scaled Krylov solver to a preconditioned solver.
 
+.. Add blank lines to help with navigation pane formatting
+|
+|
+|
+|
+|
+|
+|
+|
+|
+|
+|
+|
diff --git a/external/hypre/src/docs/usr-manual/solvers-hypre-ilu.rst b/external/hypre/src/docs/usr-manual/solvers-hypre-ilu.rst
deleted file mode 100644
index b595e456..00000000
--- a/external/hypre/src/docs/usr-manual/solvers-hypre-ilu.rst
+++ /dev/null
@@ -1,53 +0,0 @@
-.. Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
-   HYPRE Project Developers. See the top-level COPYRIGHT file for details.
-
-   SPDX-License-Identifier: (Apache-2.0 OR MIT)
-
-
-hypre-ILU
-==============================================================================
-
-The hypre-ILU solver is a parallel ILU solver based on a domain decomposition 
-framework. It may be use iteratively as a standalone solver or smoother, as well as a
-preconditioner for accelerators like Krylov subspace methods. This solver 
-implements various parallel variants of the dual threshold (truncation) incomplete 
-LU factorization - ILUT, and the level-based incomplete LU factorization - ILUk.
-
-
-Overview
-------------------------------------------------------------------------------
-The parallel hypre-ILU solver follows a domain decomposition approach for solving 
-distributed sparse linear systems of equations. The strategy is to decompose the 
-domain into interior and interface nodes, where an interface node separates two 
-interior nodes from adjacent domains. In the purely algebraic setting, this is 
-equivalent to partitioning the matrix row data into local (processor-owned) data 
-and external (off-processor-owned) data. The resulting global view of the 
-partitioned matrix has (diagonal) blocks corresponding to local data, and 
-off-diagonal blocks corresponding to non-local data. The resulting parallel ILU 
-strategy is composed of a (local) block factorization and a (global) Schur 
-complement solve. Several strategies provided to efficiently solve the Schur 
-complement system. 
-
-The following represents a minimal set of functions, and some optional
-functions, to call to use the hypre_ILU solver. For simplicity, we ignore the function
-parameters here, and refer the reader to the reference manual for more details
-on the parameters and their defaults.
-
-
-* ``HYPRE_ILUCreate:`` Create the hypre_ILU solver object.
-* ``HYPRE_ILUSetType:`` Set the type of ILU factorization to do. Here, the user specifies 
-  one of several flavors of parallel ILU based on the different combinations of local 
-  factorizations and global Schur complement solves. Please refer to the reference manual 
-  for more details about the different options available to the user.
-* (Optional) ``HYPRE_ILUSetLevelOfFill:`` Set the level of fill used by the level-based ILUk strategy.
-* (Optional) ``HYPRE_ILUSetSchurMaxIter:`` Set the maximum number of iterations for solving 
-  the Schur complement system.
-* (Optional) ``HYPRE_ILUSetMaxIter:`` Set the maximum number of iterations when used as a 
-  solver or smoother.
-* ``HYPRE_ILUSetup:`` Setup and hypre_ILU solver object.
-* ``HYPRE_ILUSolve:`` Solve the linear system.
-* ``HYPRE_ILUDestroy:`` Destroy the hypre_ILU solver object
-
-For more details about additional solver options and parameters, please refer to
-the reference manual.  NOTE: The hypre_ILU solver is currently only supported by the
-IJ interface.
diff --git a/external/hypre/src/docs/usr-manual/solvers-ilu.rst b/external/hypre/src/docs/usr-manual/solvers-ilu.rst
new file mode 100644
index 00000000..e11f6a4e
--- /dev/null
+++ b/external/hypre/src/docs/usr-manual/solvers-ilu.rst
@@ -0,0 +1,245 @@
+.. Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+   HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+
+   SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+.. _ilu:
+
+ILU
+==============================================================================
+
+ILU is a suite of parallel incomplete LU factorization algorithms featuring dual threshold
+(ILUT) and level-based (ILUK) variants. The implementation is based on a domain
+decomposition framework for achieving distributed parallelism. ILU can be used as a
+standalone iterative solver (this is not recommended), preconditioner for Krylov subspace
+methods, or smoother for multigrid methods such as BoomerAMG and MGR.
+
+.. note::
+   ILU is currently only supported by the IJ interface.
+
+Overview
+------------------------------------------------------------------------------
+
+ILU utilizes a domain decomposition framework. A basic block-Jacobi approach involves
+performing inexact solutions within the local domains owned by the processes, using
+parallel local ILU factorizations. In a more advanced approach, the unknowns are
+partitioned into interior and interface points, where the interface points separate the
+interior points in adjacent domains. In an algebraic context, this is equivalent to
+dividing the matrix rows into local (processor-owned) and external (off-processor-owned)
+blocks. The overall parallel ILU strategy is a two-level method that consists of ILU
+solves within the local blocks and a global solve involving the Schur complement system,
+which various iterative approaches in this framework can solve.
+
+User-level functions
+------------------------------------------------------------------------------
+
+A list of user-level functions for configuring ILU is given below, where each block
+of functions is marked as *Required*, *Recommended*, *Optional*, or *Exclusively
+required*. Note that the last two blocks of function calls are exclusively required, i.e.,
+the first block should be called only when ILU is used as a standalone solver, while
+the second block should be called only when it is used as a preconditioner to GMRES. In
+the last case, other Krylov methods can be chosen. We refer the reader to
+:ref:`ch-Solvers` for more information.
+
+.. code-block:: c
+
+ /* (Required) Create ILU solver */
+ HYPRE_ILUCreate(&ilu_solver);
+
+ /* (Recommended) General solver options */
+ HYPRE_ILUSetType(ilu_solver, ilu_type); /* 0, 1, 10, 11, 20, 21, 30, 31, 40, 41, 50 */
+ HYPRE_ILUSetMaxIter(ilu_solver, max_iter);
+ HYPRE_ILUSetTol(ilu_solver, tol);
+ HYPRE_ILUSetLocalReordering(ilu_solver, reordering); /* 0: none, 1: RCM */
+ HYPRE_ILUSetPrintLevel(ilu_solver, print_level);
+
+ /* (Optional) Function calls for ILUK variants */
+ HYPRE_ILUSetLevelOfFill(ilu_solver, fill);
+
+ /* (Optional) Function calls for ILUT variants */
+ HYPRE_ILUSetMaxNnzPerRow(ilu_solver, max_nnz_row);
+ HYPRE_ILUSetDropThreshold(ilu_solver, threshold);
+
+ /* (Optional) Function calls for GMRES-ILU or NSH-ILU */
+ HYPRE_ILUSetNSHDropThreshold(ilu_solver, threshold);
+ HYPRE_ILUSetSchurMaxIter(ilu_solver, schur_max_iter);
+
+ /* (Optional) Function calls for iterative ILU variants */
+ HYPRE_ILUSetTriSolve(ilu_solver, 0);
+ HYPRE_ILUSetLowerJacobiIters(ilu_solver, ljac_iters);
+ HYPRE_ILUSetUpperJacobiIters(ilu_solver, ujac_iters);
+
+ /* (Exclusively required) Function calls for using ILU as standalone solver */
+ HYPRE_ILUSetup(ilu_solver, parcsr_M, b, x);
+ HYPRE_ILUSolve(ilu_solver, parcsr_A, b, x);
+
+ /* (Exclusively required) Function calls for using ILU as preconditioner to GMRES */
+ HYPRE_GMRESSetup(gmres_solver, (HYPRE_Matrix)A, (HYPRE_Vector)b, (HYPRE_Vector)x);
+ HYPRE_GMRESSolve(gmres_solver, (HYPRE_Matrix)A, (HYPRE_Vector)b, (HYPRE_Vector)x);
+
+ /* (Required) Free memory */
+ HYPRE_ILUDestroy(ilu_solver);
+
+A short explanation for each of those functions and its parameters is given next.
+
+* ``HYPRE_ILUCreate`` Create the hypre_ILU solver object.
+* ``HYPRE_ILUDestroy`` Destroy the hypre_ILU solver object.
+* ``HYPRE_ILUSetType`` Set the type of ILU factorization. Options are:
+
+  * 0:  Block-Jacobi ILUK (BJ-ILUK).
+  * 1:  Block-Jacobi ILUT (BJ-ILUT).
+  * 10: GMRES with ILUK (GMRES-ILUK).
+  * 11: GMRES with ILUT (GMRES-ILUT).
+  * 20: NSH with ILUK (NSH-ILUK).
+  * 21: NSH with ILUT (NSH-ILUT).
+  * 30: RAS with ILUK (RAS-ILUK).
+  * 31: RAS with ILUT (RAS-ILUT).
+  * 40: ddPQ-GMRES with ILUK (ddPQ-GMRES-ILUK).
+  * 41: ddPQ-GMRES with ILUT (ddPQ-GMRES-ILUT).
+  * 50: GMRES with RAP-ILU0 with modified ILU0 (GMRES-RAP-ILU0).
+* ``HYPRE_ILUSetMaxIter`` Set the maximum number of ILU iterations. We recommend setting
+  this value to one when ILU is used as a preconditioner or smoother.
+* ``HYPRE_ILUSetTol`` Set the convergence tolerance for ILU. We recommend setting
+  this value to zero when ILU is used as a preconditioner or smoother.
+* ``HYPRE_ILUSetLocalReordering`` Set the local matrix reordering algorithm.
+
+  * 0: No reordering.
+  * 1: Reverse Cuthill–McKee (RCM).
+* ``HYPRE_ILUSetPrintLevel`` Set the verbosity level for algorithm statistics.
+
+  * 0: No output.
+  * 1: Print setup info.
+  * 2: Print solve info.
+  * 3: Print setup and solve info.
+* ``HYPRE_ILUSetLevelOfFill`` Set the level of fill used by the level-based ILUK
+  strategy.
+* ``HYPRE_ILUSetMaxNnzPerRow`` Set the maximum number of nonzero entries per row in the
+  triangular factors for ILUT.
+* ``HYPRE_ILUSetDropThreshold`` Set the threshold for dropping nonzero entries during the
+  construction of the triangular factors for ILUT.
+* ``HYPRE_ILUSetNSHDropThreshold`` Set the threshold for dropping nonzero entries during the
+  computation of the approximate inverse matrix via NSH-ILU.
+* ``HYPRE_ILUSetSchurMaxIter`` Set the maximum number of iterations for solving
+  the Schur complement system (GMRES-ILU or NSH-ILU).
+* ``HYPRE_ILUSetTriSolve`` Set triangular solve method used in ILU's solve phase. Option zero
+  refers to the iterative approach, which leads to good performance in GPUs, and option
+  one refers to the direct (exact) approach.
+* ``HYPRE_ILUSetLowerJacobiIters`` Set the number of iterations for solving the lower
+  triangular linear system. This option makes sense when enabling the iterative triangular
+  solve approach.
+* ``HYPRE_ILUSetUpperJacobiIters`` Same as previous function, but for the upper
+  triangular factor.
+* ``HYPRE_ILUSetup`` Setup a hypre_ILU solver object.
+* ``HYPRE_ILUSolve`` Solve the linear system with hypre_ILU.
+* ``HYPRE_ILUDestroy`` Destroy the hypre_ILU solver object.
+
+.. note::
+   For more details about ILU options and parameters, including their default
+   values, we refer the reader to hypre's reference manual or section :ref:`sec-ParCSR-Solvers`.
+
+.. _ilu-amg-smoother:
+
+ILU as Smoother for BoomerAMG
+------------------------------------------------------------------------------
+
+The following functions can be used to configure ILU as a smoother to BoomerAMG:
+
+.. code-block:: c
+
+ /* (Required) Set ILU as smoother to BoomerAMG */
+ HYPRE_BoomerAMGSetSmoothType(amg_solver, 5);
+ HYPRE_BoomerAMGSetSmoothNumLevels(amg_solver, num_levels);
+
+ /* (Optional) General ILU configuration parameters */
+ HYPRE_BoomerAMGSetILUType(amg_solver, ilu_type);
+ HYPRE_BoomerAMGSetILUMaxIter(amg_solver, ilu_max_iter);
+ HYPRE_BoomerAMGSetILULocalReordering(amg_solver, ilu_reordering);
+
+ /* (Optional) Function calls for ILUK smoother variants */
+ HYPRE_BoomerAMGSetILULevel(amg_solver, ilu_fill);
+
+ /* (Optional) Function calls for ILUT smoother variants */
+ HYPRE_BoomerAMGSetILUDroptol(amg_solver, ilu_threshold);
+ HYPRE_BoomerAMGSetILUMaxRowNnz(amg_solver, ilu_max_nnz_row);
+
+ /* (Optional) Function calls for iterative ILU smoother variants */
+ HYPRE_BoomerAMGSetILUTriSolve(amg_solver, 0);
+ HYPRE_BoomerAMGSetILULowerJacobiIters(amg_solver, ilu_ljac_iters);
+ HYPRE_BoomerAMGSetILUUpperJacobiIters(amg_solver, ilu_ujac_iters);
+
+where:
+
+* ``HYPRE_BoomerAMGSetSmoothNumLevels`` Enable smoothing in the first ``num_levels``
+  levels of AMG.
+* ``HYPRE_BoomerAMGSetILUType`` Set the type of ILU factorization. See ``HYPRE_ILUSetType``.
+* ``HYPRE_BoomerAMGSetILUMaxIter`` Set the number of ILU smoother sweeps.
+* ``HYPRE_BoomerAMGSetILULocalReordering`` Set the local matrix reordering algorithm.
+* ``HYPRE_BoomerAMGSetILULevel`` Set ILUK's fill level.
+* ``HYPRE_BoomerAMGSetILUDroptol`` Set ILUT's threshold.
+* ``HYPRE_BoomerAMGSetILUMaxRowNnz`` Set ILUT's maximum number of nonzero entries per row.
+* ``HYPRE_BoomerAMGSetILUTriSolve`` Set triangular solve method. See ``HYPRE_ILUSetTriSolve``.
+* ``HYPRE_BoomerAMGSetILULowerJacobiIters`` Set the number of iterations for the L factor.
+* ``HYPRE_BoomerAMGSetILUUpperJacobiIters`` Same as previous function, but for the U factor.
+
+GPU support
+------------------------------------------------------------------------------
+
+The addition of GPU support to ILU is ongoing work. A few algorithm types have already
+been fully ported to the CUDA and HIP backends, i.e., both their setup (factorization) and
+solve phases are executed on the device. Below is a detailed list of which phases (setup
+and solve) of the various ILU algorithms have been ported to GPUs. In the table,
+*UVM-Setup* indicates that the setup phase is executed on the CPU (host); at the same
+time, the triangular factors are stored in a memory space that is accessible from the GPU
+(device) via unified memory. This feature must be enabled during hypre's configuration.
+
+.. list-table::
+   :widths: 20 20 20 20
+   :header-rows: 1
+
+   * -
+     - CUDA (NVIDIA GPUs)
+     - HIP (AMD GPUs)
+     - SYCL (Intel GPUs)
+   * - **BJ-ILU0**
+     - Setup and Solve
+     - Setup and Solve
+     - UVM-Setup and Solve
+   * - **BJ-ILU(K/T)**
+     - UVM-Setup and Solve
+     - UVM-Setup and Solve
+     - UVM-Setup and Solve
+   * - **GMRES-ILU0**
+     - Setup and Solve
+     - Setup and Solve
+     - UVM-Setup and Solve
+   * - **GMRES-RAP-ILU0**
+     - UVM-Setup and Solve
+     - UVM-Setup and Solve
+     - UVM-Setup and Solve
+   * - **GMRES-ILU(K/T)**
+     - UVM-Setup and Solve
+     - UVM-Setup and Solve
+     - UVM-Setup and Solve
+   * - **ddPQ-GMRES-ILU(K/T)**
+     - UVM-Setup and Solve
+     - UVM-Setup and Solve
+     - UVM-Setup and Solve
+   * - **NSH-ILU(K/T)**
+     - UVM-Setup and Solve
+     - UVM-Setup and Solve
+     - UVM-Setup and Solve
+   * - **RAS-ILU(K/T)**
+     - UVM-Setup and Solve
+     - UVM-Setup and Solve
+     - UVM-Setup and Solve
+
+.. hint::
+   For better setup performance on GPUs, disable local reordering by passing option
+   zero to ``HYPRE_ILUSetLocalReordering`` or
+   ``HYPRE_BoomerAMGSetILULocalReordering``. This may degrade convergence of the iterative
+   solver.
+
+.. note::
+   hypre must be built with ``cuSPARSE`` support when running ILU on NVIDIA
+   GPUs, ``rocSPARSE`` when running on AMD GPUs, or ``oneMKL sparse`` when
+   running on Intel GPUs.
diff --git a/external/hypre/src/docs/usr-manual/solvers-lobpcg.rst b/external/hypre/src/docs/usr-manual/solvers-lobpcg.rst
index c592ef5f..66d20e2e 100644
--- a/external/hypre/src/docs/usr-manual/solvers-lobpcg.rst
+++ b/external/hypre/src/docs/usr-manual/solvers-lobpcg.rst
@@ -1,4 +1,4 @@
-.. Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+.. Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
    HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 
    SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -31,3 +31,21 @@ The LOBPCG code is available for system interfaces: Struct, SStruct, and IJ.  It
 is also used in the Auxiliary-space Maxwell Eigensolver (AME).  The LOBPCG setup
 is similar to the setup for PCG.
 
+.. Add blank lines to help with navigation pane formatting
+|
+|
+|
+|
+|
+|
+|
+|
+|
+|
+|
+|
+|
+|
+|
+|
+|
diff --git a/external/hypre/src/docs/usr-manual/solvers-maxwell.rst b/external/hypre/src/docs/usr-manual/solvers-maxwell.rst
index 9a67739a..9713ae9c 100644
--- a/external/hypre/src/docs/usr-manual/solvers-maxwell.rst
+++ b/external/hypre/src/docs/usr-manual/solvers-maxwell.rst
@@ -1,4 +1,4 @@
-.. Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+.. Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
    HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 
    SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/docs/usr-manual/solvers-mgr.rst b/external/hypre/src/docs/usr-manual/solvers-mgr.rst
index 62284a5a..05ec8890 100644
--- a/external/hypre/src/docs/usr-manual/solvers-mgr.rst
+++ b/external/hypre/src/docs/usr-manual/solvers-mgr.rst
@@ -1,4 +1,4 @@
-.. Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+.. Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
    HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 
    SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/docs/usr-manual/solvers-mli.rst b/external/hypre/src/docs/usr-manual/solvers-mli.rst
index 9e13f9b3..60872c4a 100644
--- a/external/hypre/src/docs/usr-manual/solvers-mli.rst
+++ b/external/hypre/src/docs/usr-manual/solvers-mli.rst
@@ -1,4 +1,4 @@
-.. Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+.. Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
    HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 
    SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -36,3 +36,19 @@ Note that parameters are set via ``HYPRE_LSI_MLISetParams``. A list of valid
 parameters that can be set using this routine can be found in the FEI section of
 the reference manual.
 
+.. Add blank lines to help with navigation pane formatting
+|
+|
+|
+|
+|
+|
+|
+|
+|
+|
+|
+|
+|
+|
+|
diff --git a/external/hypre/src/docs/usr-manual/solvers-parasails.rst b/external/hypre/src/docs/usr-manual/solvers-parasails.rst
index fe7ad179..27469f0c 100644
--- a/external/hypre/src/docs/usr-manual/solvers-parasails.rst
+++ b/external/hypre/src/docs/usr-manual/solvers-parasails.rst
@@ -1,4 +1,4 @@
-.. Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+.. Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
    HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 
    SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -7,6 +7,11 @@
 ParaSails
 ==============================================================================
 
+.. warning::
+   ParaSails is not actively supported by the hypre development team. We recommend using
+   :ref:`fsai` for parallel sparse approximate inverse algorithms. This new implementation
+   includes NVIDIA/AMD GPU support through the CUDA/HIP backends.
+
 ParaSails is a parallel implementation of a sparse approximate inverse
 preconditioner, using *a priori* sparsity patterns and least-squares (Frobenius
 norm) minimization.  Symmetric positive definite (SPD) problems are handled
@@ -53,7 +58,7 @@ in order to construct the preconditioner.
 ParaSail's Create function differs from the synopsis in the following way:
 
 .. code-block:: c
-   
+
    int HYPRE_ParaSailsCreate(MPI_Comm comm, HYPRE_Solver *solver, int symmetry);
 
 where ``comm`` is the MPI communicator.
@@ -75,7 +80,7 @@ For more information about the final case, see section :ref:`nearly`.
 Parameters for setting up the preconditioner are specified using
 
 .. code-block:: c
-   
+
    int HYPRE_ParaSailsSetParams(HYPRE_Solver solver, double thresh,
                                 int nlevel, double filter);
 
@@ -119,4 +124,3 @@ latter may be guaranteed by 1) constructing the sparsity pattern with a
 symmetric matrix, or 2) if the matrix is structurally symmetric (has symmetric
 pattern), then thresholding to construct the pattern is not used (i.e., zero
 value of the ``thresh`` parameter is used).
-
diff --git a/external/hypre/src/docs/usr-manual/solvers-pilut.rst b/external/hypre/src/docs/usr-manual/solvers-pilut.rst
index 772e1e61..f8848613 100644
--- a/external/hypre/src/docs/usr-manual/solvers-pilut.rst
+++ b/external/hypre/src/docs/usr-manual/solvers-pilut.rst
@@ -1,4 +1,4 @@
-.. Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+.. Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
    HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 
    SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -9,9 +9,12 @@
 PILUT: Parallel Incomplete Factorization
 ==============================================================================
 
-**Note:** this code is no longer supported by the hypre team. We recommend to
-use Euclid instead, which is more versatile and in general more efficient,
-especially when used with many processors.
+.. warning::
+   PILUT is not actively supported by the hypre development team. We recommend using
+   :ref:`ilu` for parallel ILU algorithms. This new ILU implementation includes
+   64-bit integers support (for linear systems with more than 2,147,483,647 global
+   unknowns) through both *mixedint* and *bigint* builds of hypre and NVIDIA/AMD GPUs
+   support through the CUDA/HIP backends.
 
 PILUT is a parallel preconditioner based on Saad's dual-threshold incomplete
 factorization algorithm. The original version of PILUT was done by Karypis and
@@ -22,10 +25,10 @@ matrix implementations, including hypre's ParCSR format, PETSc's matrices, and
 ISIS++ RowMatrix. The algorithm produces an approximate factorization :math:`L U`,
 with the preconditioner :math:`M` defined by :math:`M = L U`.
 
-**Note:** PILUT produces a nonsymmetric preconditioner even when the original
-matrix is symmetric. Thus, it is generally inappropriate for preconditioning
-symmetric methods such as Conjugate Gradient.
-
+.. note::
+   PILUT produces a nonsymmetric preconditioner even when the original matrix is
+   symmetric. Thus, it is generally inappropriate for preconditioning symmetric methods
+   such as Conjugate Gradient.
 
 Parameters:
 ------------------------------------------------------------------------------
@@ -45,3 +48,14 @@ Parameters:
   values of ``tol`` lead to more accurate preconditioners, but can also lead to
   increases in the time to calculate the preconditioner.
 
+.. Add blank lines to help with navigation pane formatting
+|
+|
+|
+|
+|
+|
+|
+|
+|
+|
diff --git a/external/hypre/src/docs/usr-manual/solvers-smg-pfmg.rst b/external/hypre/src/docs/usr-manual/solvers-smg-pfmg.rst
index db119e81..859a9712 100644
--- a/external/hypre/src/docs/usr-manual/solvers-smg-pfmg.rst
+++ b/external/hypre/src/docs/usr-manual/solvers-smg-pfmg.rst
@@ -1,4 +1,4 @@
-.. Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+.. Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
    HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 
    SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/docs/usr-manual/solvers-split.rst b/external/hypre/src/docs/usr-manual/solvers-split.rst
index 714ab230..7a079a84 100644
--- a/external/hypre/src/docs/usr-manual/solvers-split.rst
+++ b/external/hypre/src/docs/usr-manual/solvers-split.rst
@@ -1,4 +1,4 @@
-.. Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+.. Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
    HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 
    SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -25,3 +25,26 @@ where :math:`\tilde{M}^{-1}` is a decoupled block-diagonal V(1,1) cycle, a
 separate cycle for each part and variable type. There are two V-cycle options,
 SMG and PFMG.
 
+.. Add blank lines to help with navigation pane formatting
+|
+|
+|
+|
+|
+|
+|
+|
+|
+|
+|
+|
+|
+|
+|
+|
+|
+|
+|
+|
+|
+|
diff --git a/external/hypre/src/examples/CMakeLists.txt b/external/hypre/src/examples/CMakeLists.txt
index 505d55d0..359aee73 100644
--- a/external/hypre/src/examples/CMakeLists.txt
+++ b/external/hypre/src/examples/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/examples/Makefile_gpu b/external/hypre/src/examples/Makefile_gpu
deleted file mode 100644
index 82e8cf43..00000000
--- a/external/hypre/src/examples/Makefile_gpu
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
-# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
-#
-# SPDX-License-Identifier: (Apache-2.0 OR MIT)
-
-########################################################################
-# Compiler and external dependences
-########################################################################
-CC        = mpixlc
-F77       = mpif77
-CXX       = mpixlC
-F90       = mpif77
-LINK_CC   = nvcc
-LINK_CXX  = nvcc
-
-HYPRE_DIR = ../hypre
-
-########################################################################
-# CUDA
-########################################################################
-CUDA_INCL = -I${CUDA_HOME}/include
-CUDA_LIBS = -L${CUDA_HOME}lib64 -lcudart -lcusparse -lcurand
-CUDA_ARCH = -gencode arch=compute_60,code=sm_60 -gencode arch=compute_70,code=sm_70
-NVCC_LDFLAGS = -ccbin=${CXX} ${CUDA_ARCH}
-
-########################################################################
-# Compiling and linking options
-########################################################################
-COPTS     = -g -Wall
-CINCLUDES = -I$(HYPRE_DIR)/include $(CUDA_INCL)
-#CDEFS     = -DHYPRE_EXVIS
-CDEFS     = 
-CFLAGS    = $(COPTS) $(CINCLUDES) $(CDEFS)
-FOPTS     = -g
-FINCLUDES = $(CINCLUDES)
-FFLAGS    = $(FOPTS) $(FINCLUDES)
-CXXOPTS   = $(COPTS) -Wno-deprecated
-CXXINCLUDES = $(CINCLUDES) -I..
-CXXDEFS   = $(CDEFS)
-IFLAGS_BXX =
-CXXFLAGS  = $(CXXOPTS) $(CXXINCLUDES) $(CXXDEFS) $(IFLAGS_BXX)
-IF90FLAGS =
-F90FLAGS = $(FFLAGS) $(IF90FLAGS)
-
-LINKOPTS  =
-LIBS      = -L$(HYPRE_DIR)/lib -lHYPRE -lm ${CUDA_LIBS}
-LFLAGS    = $(LINKOPTS) $(LIBS) $(NVCC_LDFLAGS) -lstdc++
-LFLAGS_B =\
- -L${HYPRE_DIR}/lib\
- -lbHYPREClient-C\
- -lbHYPREClient-CX\
- -lbHYPREClient-F\
- -lbHYPRE\
- -lsidl -ldl -lxml2
-LFLAGS77 = $(LFLAGS)
-LFLAGS90 =
-
-########################################################################
-# Rules for compiling the source files
-########################################################################
-.SUFFIXES: .c .f .cxx .f90
-
-.c.o:
-	$(CC) $(CFLAGS) -c $<
-.f.o:
-	$(FC) $(FFLAGS) -c $<
-.cxx.o:
-	$(CXX) $(CXXFLAGS) -c $<
-
-########################################################################
-# List of all programs to be compiled
-########################################################################
-ALLPROGS = ex1 ex2 ex3 ex4 ex5 ex6 ex7 ex8 ex9 ex11 ex12 ex13 ex14 ex15 ex16
-
-BIGINTPROGS = ex5big ex15big
-FORTRANPROGS = ex5f ex12f
-MAXDIMPROGS = ex17 ex18
-COMPLEXPROGS = ex18comp
-
-all: $(ALLPROGS)
-
-default: all
-
-gpu: all
-
-bigint: $(BIGINTPROGS)
-
-fortran: $(FORTRANPROGS)
-
-maxdim: $(MAXDIMPROGS)
-
-complex: $(COMPLEXPROGS)
-
-########################################################################
-# Example 1
-########################################################################
-ex1: ex1.o
-	$(LINK_CC) -o $@ $^ $(LFLAGS)
-
-########################################################################
-# Example 2
-########################################################################
-ex2: ex2.o
-	$(LINK_CC) -o $@ $^ $(LFLAGS)
-
-########################################################################
-# Example 3
-########################################################################
-ex3: ex3.o
-	$(LINK_CC) -o $@ $^ $(LFLAGS)
-
-########################################################################
-# Example 4
-########################################################################
-ex4: ex4.o
-	$(LINK_CC) -o $@ $^ $(LFLAGS)
-
-########################################################################
-# Example 5
-########################################################################
-ex5: ex5.o
-	$(LINK_CC) -o $@ $^ $(LFLAGS)
-
-########################################################################
-# Example 5 with 64-bit integers
-########################################################################
-ex5big: ex5big.o
-	$(LINK_CC) -o $@ $^ $(LFLAGS)
-
-########################################################################
-# Example 5 Fortran 77
-########################################################################
-ex5f: ex5f.o
-	$(F77) -o $@ $^ $(LFLAGS77)
-
-########################################################################
-# Example 6
-########################################################################
-ex6: ex6.o
-	$(LINK_CC) -o $@ $^ $(LFLAGS)
-
-########################################################################
-# Example 7
-########################################################################
-ex7: ex7.o
-	$(LINK_CC) -o $@ $^ $(LFLAGS)
-
-########################################################################
-# Example 8
-########################################################################
-ex8: ex8.o
-	$(LINK_CC) -o $@ $^ $(LFLAGS)
-
-########################################################################
-# Example 9
-########################################################################
-ex9: ex9.o
-	$(LINK_CC) -o $@ $^ $(LFLAGS)
-
-########################################################################
-# Example 10
-########################################################################
-ex10: ex10.o
-	$(LINK_CXX) -o $@ $^ $(LFLAGS)
-
-########################################################################
-# Example 11
-########################################################################
-ex11: ex11.o
-	$(LINK_CC) -o $@ $^ $(LFLAGS)
-
-########################################################################
-# Example 12
-########################################################################
-ex12: ex12.o
-	$(LINK_CC) -o $@ $^ $(LFLAGS)
-
-########################################################################
-# Example 12 Fortran 77
-########################################################################
-ex12f: ex12f.o
-	$(F77) -o $@ $^ $(LFLAGS77)
-
-########################################################################
-# Example 13
-########################################################################
-ex13: ex13.o
-	$(LINK_CC) -o $@ $^ $(LFLAGS)
-
-########################################################################
-# Example 14
-########################################################################
-ex14: ex14.o
-	$(LINK_CC) -o $@ $^ $(LFLAGS)
-
-########################################################################
-# Example 15
-########################################################################
-ex15: ex15.o
-	$(LINK_CC) -o $@ $^ $(LFLAGS)
-
-########################################################################
-# Example 15 with 64-bit integers
-########################################################################
-ex15big: ex15big.o
-	$(LINK_CC) -o $@ $^ $(LFLAGS)
-
-########################################################################
-# Example 16
-########################################################################
-ex16: ex16.o
-	$(LINK_CC) -o $@ $^ $(LFLAGS)
-
-########################################################################
-# Example 17
-########################################################################
-ex17: ex17.o
-	$(LINK_CC) -o $@ $^ $(LFLAGS)
-
-########################################################################
-# Example 18
-########################################################################
-ex18: ex18.o
-	$(LINK_CC) -o $@ $^ $(LFLAGS)
-
-########################################################################
-# Example 18 (complex)
-########################################################################
-ex18comp: ex18comp.o
-	$(LINK_CC) -o $@ $^ $(LFLAGS)
-
-########################################################################
-# Clean up
-########################################################################
-clean:
-	rm -f $(ALLPROGS:=.o)
-	rm -f $(BIGINTPROGS:=.o)
-	rm -f $(FORTRANPROGS:=.o)
-	rm -f $(MAXDIMPROGS:=.o)
-	rm -f $(COMPLEXPROGS:=.o)
-	cd vis; make clean
-distclean: clean
-	rm -f $(ALLPROGS) $(ALLPROGS:=*~)
-	rm -f $(BIGINTPROGS) $(BIGINTPROGS:=*~)
-	rm -f $(FORTRANLPROGS) $(FORTRANPROGS:=*~)
-	rm -f $(MAXDIMPROGS) $(MAXDIMPROGS:=*~)
-	rm -f $(COMPLEXPROGS) $(COMPLEXPROGS:=*~)
-	rm -fr README*
diff --git a/external/hypre/src/examples/cudaf.f b/external/hypre/src/examples/cudaf.f
new file mode 100644
index 00000000..09ce19f8
--- /dev/null
+++ b/external/hypre/src/examples/cudaf.f
@@ -0,0 +1,64 @@
+!     Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+!     HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+!
+!     SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+! This file contains the module defining Fortran interfaces for the CUDA Runtime API
+! Copied and modified from:
+!    https://raw.githubusercontent.com/starkiller-astro/XNet/master/source/cudaf.f90
+
+      module cudaf
+         ! Interface to CUDA Runtime API
+
+         use, intrinsic :: iso_c_binding, only: c_int
+
+         implicit none
+
+         integer(c_int), parameter :: cudaMemAttachGlobal = 1
+         integer(c_int), parameter :: cudaMemAttachHost = 2
+         integer(c_int), parameter :: cudaMemAttachSingle = 4
+
+         !include "cudaDeviceProp.fh"
+
+         interface
+
+            integer(c_int) function
+     1              cudaMallocManaged(dPtr, size, flags)
+     1              bind(c, name="cudaMallocManaged")
+               use, intrinsic :: iso_c_binding
+               type(c_ptr), intent(out) :: dPtr
+               integer(c_size_t), value :: size
+               integer(c_int), value :: flags
+            end function cudaMallocManaged
+
+            integer(c_int) function
+     1              cudaFree(dPtr)
+     1              bind(c, name="cudaFree")
+               use, intrinsic :: iso_c_binding
+               type(c_ptr), value :: dPtr
+            end function cudaFree
+
+         end interface
+
+         contains
+
+         ! wrapper functions
+
+         integer function
+     1           device_malloc_managed(nbytes, dPtr) result(stat)
+            use, intrinsic :: iso_c_binding, only: c_size_t, c_ptr
+            use, intrinsic :: iso_fortran_env, only: int64
+            integer(int64), intent(in) :: nbytes
+            type(c_ptr), intent(inout) :: dPtr
+            stat = cudaMallocManaged(dPtr, int(nbytes,c_size_t),
+     1                               cudaMemAttachGlobal)
+         end function device_malloc_managed
+         !
+         integer function
+     1           device_free(dPtr) result(stat)
+            use, intrinsic :: iso_c_binding, only: c_ptr
+            type(c_ptr), intent(inout) :: dPtr
+            stat = cudaFree(dPtr)
+         end function device_free
+
+      end module cudaf
diff --git a/external/hypre/src/examples/docs/build_doc.sh b/external/hypre/src/examples/docs/build_doc.sh
old mode 100644
new mode 100755
index 43f8ed79..39ec2ce4
--- a/external/hypre/src/examples/docs/build_doc.sh
+++ b/external/hypre/src/examples/docs/build_doc.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 examplesdir="$1"
 currentdir=`pwd`
diff --git a/external/hypre/src/examples/docs/code2html.perl b/external/hypre/src/examples/docs/code2html.perl
old mode 100644
new mode 100755
diff --git a/external/hypre/src/examples/docs/replace-ssi.perl b/external/hypre/src/examples/docs/replace-ssi.perl
old mode 100644
new mode 100755
diff --git a/external/hypre/src/examples/ex.h b/external/hypre/src/examples/ex.h
index ff49f9ec..8b2324c1 100644
--- a/external/hypre/src/examples/ex.h
+++ b/external/hypre/src/examples/ex.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -14,7 +14,7 @@
 
 #include <HYPRE_config.h>
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_DEVICE_OPENMP)
+#if defined(HYPRE_EXAMPLE_USING_CUDA)
 
 #include <cuda_runtime.h>
 
@@ -34,15 +34,14 @@ static inline void*
 gpu_calloc(size_t num, size_t size)
 {
    void *ptr = NULL;
-   cudaMallocManaged(&ptr, num*size, cudaMemAttachGlobal);
-   cudaMemset(ptr, 0, num*size);
+   cudaMallocManaged(&ptr, num * size, cudaMemAttachGlobal);
+   cudaMemset(ptr, 0, num * size);
    return ptr;
 }
 
 #define malloc(size) gpu_malloc(size)
 #define calloc(num, size) gpu_calloc(num, size)
 #define free(ptr) ( cudaFree(ptr), ptr = NULL )
-#endif
-
-#endif
+#endif /* #if defined(HYPRE_EXAMPLE_USING_CUDA) */
+#endif /* #ifndef HYPRE_EXAMPLES_INCLUDES */
 
diff --git a/external/hypre/src/examples/ex1.c b/external/hypre/src/examples/ex1.c
index bc3f7c18..4014768d 100644
--- a/external/hypre/src/examples/ex1.c
+++ b/external/hypre/src/examples/ex1.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -58,14 +58,14 @@ int main (int argc, char *argv[])
 
    if (num_procs != 2)
    {
-      if (myid == 0) printf("Must run with 2 processors!\n");
+      if (myid == 0) { printf("Must run with 2 processors!\n"); }
       MPI_Finalize();
 
-      return(0);
+      return (0);
    }
 
    /* Initialize HYPRE */
-   HYPRE_Init();
+   HYPRE_Initialize();
 
    /* Print GPU info */
    /* HYPRE_PrintDeviceInfo(); */
@@ -118,12 +118,12 @@ int main (int argc, char *argv[])
       /* Add boxes to the grid */
       if (myid == 0)
       {
-         int ilower[2]={-3,1}, iupper[2]={-1,2};
+         int ilower[2] = {-3, 1}, iupper[2] = {-1, 2};
          HYPRE_StructGridSetExtents(grid, ilower, iupper);
       }
       else if (myid == 1)
       {
-         int ilower[2]={0,1}, iupper[2]={2,4};
+         int ilower[2] = {0, 1}, iupper[2] = {2, 4};
          HYPRE_StructGridSetExtents(grid, ilower, iupper);
       }
 
@@ -141,11 +141,13 @@ int main (int argc, char *argv[])
          relative offset (in the index space). */
       {
          int entry;
-         int offsets[5][2] = {{0,0}, {-1,0}, {1,0}, {0,-1}, {0,1}};
+         int offsets[5][2] = {{0, 0}, {-1, 0}, {1, 0}, {0, -1}, {0, 1}};
 
          /* Assign each of the 5 stencil entries */
          for (entry = 0; entry < 5; entry++)
+         {
             HYPRE_StructStencilSetElement(stencil, entry, offsets[entry]);
+         }
       }
    }
 
@@ -165,21 +167,23 @@ int main (int argc, char *argv[])
          the boundary. */
       if (myid == 0)
       {
-         int ilower[2]={-3,1}, iupper[2]={-1,2};
-         int stencil_indices[5] = {0,1,2,3,4}; /* labels for the stencil entries -
+         int ilower[2] = {-3, 1}, iupper[2] = {-1, 2};
+         int stencil_indices[5] = {0, 1, 2, 3, 4}; /* labels for the stencil entries -
                                                   these correspond to the offsets
                                                   defined above */
          int nentries = 5;
          int nvalues  = 30; /* 6 grid points, each with 5 stencil entries */
          /* double values[30]; OK to use constant-length arrays for CPUs */
-         double *values = (double *) malloc(30*sizeof(double));
+         double *values = (double *) malloc(30 * sizeof(double));
 
          /* We have 6 grid points, each with 5 stencil entries */
          for (i = 0; i < nvalues; i += nentries)
          {
             values[i] = 4.0;
             for (j = 1; j < nentries; j++)
-               values[i+j] = -1.0;
+            {
+               values[i + j] = -1.0;
+            }
          }
 
          HYPRE_StructMatrixSetBoxValues(A, ilower, iupper, nentries,
@@ -189,18 +193,20 @@ int main (int argc, char *argv[])
       }
       else if (myid == 1)
       {
-         int ilower[2]={0,1}, iupper[2]={2,4};
-         int stencil_indices[5] = {0,1,2,3,4};
+         int ilower[2] = {0, 1}, iupper[2] = {2, 4};
+         int stencil_indices[5] = {0, 1, 2, 3, 4};
          int nentries = 5;
          int nvalues  = 60; /* 12 grid points, each with 5 stencil entries */
          /* double values[60]; OK to use constant-length arrays for CPUs */
-         double *values = (double *) malloc(60*sizeof(double));
+         double *values = (double *) malloc(60 * sizeof(double));
 
          for (i = 0; i < nvalues; i += nentries)
          {
             values[i] = 4.0;
             for (j = 1; j < nentries; j++)
-               values[i+j] = -1.0;
+            {
+               values[i + j] = -1.0;
+            }
          }
 
          HYPRE_StructMatrixSetBoxValues(A, ilower, iupper, nentries,
@@ -213,26 +219,28 @@ int main (int argc, char *argv[])
       if (myid == 0)
       {
          /* double values[3]; OK to use constant-length arrays for CPUs */
-         double *values = (double *) malloc(3*sizeof(double));
+         double *values = (double *) malloc(3 * sizeof(double));
          for (i = 0; i < 3; i++)
+         {
             values[i] = 0.0;
+         }
          {
             /* values below our box */
-            int ilower[2]={-3,1}, iupper[2]={-1,1};
+            int ilower[2] = {-3, 1}, iupper[2] = {-1, 1};
             int stencil_indices[1] = {3};
             HYPRE_StructMatrixSetBoxValues(A, ilower, iupper, 1,
                                            stencil_indices, values);
          }
          {
             /* values to the left of our box */
-            int ilower[2]={-3,1}, iupper[2]={-3,2};
+            int ilower[2] = {-3, 1}, iupper[2] = {-3, 2};
             int stencil_indices[1] = {1};
             HYPRE_StructMatrixSetBoxValues(A, ilower, iupper, 1,
                                            stencil_indices, values);
          }
          {
             /* values above our box */
-            int ilower[2]={-3,2}, iupper[2]={-1,2};
+            int ilower[2] = {-3, 2}, iupper[2] = {-1, 2};
             int stencil_indices[1] = {4};
             HYPRE_StructMatrixSetBoxValues(A, ilower, iupper, 1,
                                            stencil_indices, values);
@@ -242,26 +250,28 @@ int main (int argc, char *argv[])
       else if (myid == 1)
       {
          /* double values[4]; OK to use constant-length arrays for CPUs */
-         double *values = (double *) malloc(4*sizeof(double));
+         double *values = (double *) malloc(4 * sizeof(double));
          for (i = 0; i < 4; i++)
+         {
             values[i] = 0.0;
+         }
          {
             /* values below our box */
-            int ilower[2]={0,1}, iupper[2]={2,1};
+            int ilower[2] = {0, 1}, iupper[2] = {2, 1};
             int stencil_indices[1] = {3};
             HYPRE_StructMatrixSetBoxValues(A, ilower, iupper, 1,
                                            stencil_indices, values);
          }
          {
             /* values to the right of our box */
-            int ilower[2]={2,1}, iupper[2]={2,4};
+            int ilower[2] = {2, 1}, iupper[2] = {2, 4};
             int stencil_indices[1] = {2};
             HYPRE_StructMatrixSetBoxValues(A, ilower, iupper, 1,
                                            stencil_indices, values);
          }
          {
             /* values above our box */
-            int ilower[2]={0,4}, iupper[2]={2,4};
+            int ilower[2] = {0, 4}, iupper[2] = {2, 4};
             int stencil_indices[1] = {4};
             HYPRE_StructMatrixSetBoxValues(A, ilower, iupper, 1,
                                            stencil_indices, values);
@@ -269,7 +279,7 @@ int main (int argc, char *argv[])
          {
             /* values to the left of our box
                (that do not border the other box on proc. 0) */
-            int ilower[2]={0,3}, iupper[2]={0,4};
+            int ilower[2] = {0, 3}, iupper[2] = {0, 4};
             int stencil_indices[1] = {1};
             HYPRE_StructMatrixSetBoxValues(A, ilower, iupper, 1,
                                            stencil_indices, values);
@@ -296,31 +306,39 @@ int main (int argc, char *argv[])
       /* Set the vector coefficients */
       if (myid == 0)
       {
-         int ilower[2]={-3,1}, iupper[2]={-1,2};
+         int ilower[2] = {-3, 1}, iupper[2] = {-1, 2};
          /* double values[6]; OK to use constant-length arrays for CPUs */
-         double *values = (double *) malloc(6*sizeof(double)); /* 6 grid points */
+         double *values = (double *) malloc(6 * sizeof(double)); /* 6 grid points */
 
          for (i = 0; i < 6; i ++)
+         {
             values[i] = 1.0;
+         }
          HYPRE_StructVectorSetBoxValues(b, ilower, iupper, values);
 
          for (i = 0; i < 6; i ++)
+         {
             values[i] = 0.0;
+         }
          HYPRE_StructVectorSetBoxValues(x, ilower, iupper, values);
          free(values);
       }
       else if (myid == 1)
       {
-         int ilower[2]={0,1}, iupper[2]={2,4};
+         int ilower[2] = {0, 1}, iupper[2] = {2, 4};
          /* double values[12]; OK to use constant-length arrays for CPUs */
-         double *values = (double *) malloc(12*sizeof(double)); /* 12 grid points */
+         double *values = (double *) malloc(12 * sizeof(double)); /* 12 grid points */
 
          for (i = 0; i < 12; i ++)
+         {
             values[i] = 1.0;
+         }
          HYPRE_StructVectorSetBoxValues(b, ilower, iupper, values);
 
          for (i = 0; i < 12; i ++)
+         {
             values[i] = 0.0;
+         }
          HYPRE_StructVectorSetBoxValues(x, ilower, iupper, values);
          free(values);
       }
diff --git a/external/hypre/src/examples/ex10.cxx b/external/hypre/src/examples/ex10.cxx
index 85a09b19..35ebff83 100644
--- a/external/hypre/src/examples/ex10.cxx
+++ b/external/hypre/src/examples/ex10.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -57,13 +57,13 @@ int main(int argc, char *argv[])
    MPI_Comm_rank(MPI_COMM_WORLD, &mypid);
 
    /* Initialize HYPRE */
-   HYPRE_Init();
+   HYPRE_Initialize();
 
    /* Print GPU info */
    /* HYPRE_PrintDeviceInfo(); */
 
    // Set default parameters
-   n = 4*nprocs;
+   n = 4 * nprocs;
    solverID = 2;
    vis = 0;
 
@@ -105,7 +105,7 @@ int main(int argc, char *argv[])
          printf("\n");
          printf("Usage: %s [<options>]\n", argv[0]);
          printf("\n");
-         printf("  -n <n>              : problem size per processor (default: %d)\n", 4*nprocs);
+         printf("  -n <n>              : problem size per processor (default: %d)\n", 4 * nprocs);
          printf("  -solver <ID>        : solver ID\n");
          printf("                        0 - DS-PCG\n");
          printf("                        1 - ParaSails-PCG\n");
@@ -132,7 +132,7 @@ int main(int argc, char *argv[])
    // are numbered globally starting from the lower left corner and moving
    // row-wise to the upper right corner.
    m = n / nprocs;
-   offset = mypid*(m*(n+1));
+   offset = mypid * (m * (n + 1));
 
    h = 1.0 / n; // mesh size
 
@@ -164,7 +164,7 @@ int main(int argc, char *argv[])
    // have to describe the number of elements in the block (nElems) as
    // well as the fields (unknowns) per element.
    int elemBlkID = 0;
-   int nElems = m*n;
+   int nElems = m * n;
    int elemNNodes = 4; // number of (shared) nodes per element
    int *nodeNFields = new int[elemNNodes]; // fields per node
    int **nodeFieldIDs = new int*[elemNNodes]; // node-fields IDs
@@ -188,84 +188,98 @@ int main(int argc, char *argv[])
    for (i = 0; i < m; i++)
       for (j = 0; j < n; j++)
       {
-         elemConn[i*n+j] = new int[elemNNodes]; // element with coordinates (i,j)
-         elemConn[i*n+j][0] = offset + i*(n+1)+j;     // node in the lower left
-         elemConn[i*n+j][1] = elemConn[i*n+j][0]+1;   // node in the lower right
-         elemConn[i*n+j][2] = elemConn[i*n+j][1]+n+1; // node in the upper right
-         elemConn[i*n+j][3] = elemConn[i*n+j][2]-1;   // node in the upper left
+         elemConn[i * n + j] = new int[elemNNodes]; // element with coordinates (i,j)
+         elemConn[i * n + j][0] = offset + i * (n + 1) + j; // node in the lower left
+         elemConn[i * n + j][1] = elemConn[i * n + j][0] + 1; // node in the lower right
+         elemConn[i * n + j][2] = elemConn[i * n + j][1] + n + 1; // node in the upper right
+         elemConn[i * n + j][3] = elemConn[i * n + j][2] - 1; // node in the upper left
       }
 
    // Pass the element topology information to the FEI
    for (i = 0; i < nElems; i++)
+   {
       feiPtr->initElem(elemBlkID, i, elemConn[i]);
+   }
 
    // List the global indexes of nodes that are shared between processors
    int nShared, *SharedIDs, *SharedLengs, **SharedProcs;
    if (mypid == 0)
    {
       // Nodes in the top row are shared
-      nShared = n+1;
+      nShared = n + 1;
       SharedIDs = new int[nShared];
       for (i = 0; i < nShared; i++)
-         SharedIDs[i] = offset + m*(n+1) + i;
+      {
+         SharedIDs[i] = offset + m * (n + 1) + i;
+      }
       SharedLengs = new int[nShared];
       for (i = 0; i < nShared; i++)
+      {
          SharedLengs[i] = 2;
+      }
       SharedProcs = new int*[nShared];
       for (i = 0; i < nShared; i++)
       {
          SharedProcs[i] = new int[SharedLengs[i]];
          SharedProcs[i][0] = mypid;
-         SharedProcs[i][1] = mypid+1;
+         SharedProcs[i][1] = mypid + 1;
       }
    }
-   else if (mypid == nprocs-1)
+   else if (mypid == nprocs - 1)
    {
       // Nodes in the bottom row are shared
-      nShared = n+1;
+      nShared = n + 1;
       SharedIDs = new int[nShared];
       for (i = 0; i < nShared; i++)
+      {
          SharedIDs[i] = offset + i;
+      }
       SharedLengs = new int[nShared];
       for (i = 0; i < nShared; i++)
+      {
          SharedLengs[i] = 2;
+      }
       SharedProcs = new int*[nShared];
       for (i = 0; i < nShared; i++)
       {
          SharedProcs[i] = new int[SharedLengs[i]];
-         SharedProcs[i][0] = mypid-1;
+         SharedProcs[i][0] = mypid - 1;
          SharedProcs[i][1] = mypid;
       }
    }
    else
    {
       // Nodes in the top and bottom rows are shared
-      nShared = 2*(n+1);
+      nShared = 2 * (n + 1);
       SharedIDs = new int[nShared];
-      for (i = 0; i < n+1; i++)
+      for (i = 0; i < n + 1; i++)
       {
          SharedIDs[i] = offset + i;
-         SharedIDs[n+1+i] = offset + m*(n+1) + i;
+         SharedIDs[n + 1 + i] = offset + m * (n + 1) + i;
       }
       SharedLengs = new int[nShared];
       for (i = 0; i < nShared; i++)
+      {
          SharedLengs[i] = 2;
+      }
       SharedProcs = new int*[nShared];
-      for (i = 0; i < n+1; i++)
+      for (i = 0; i < n + 1; i++)
       {
          SharedProcs[i] = new int[SharedLengs[i]];
-         SharedProcs[i][0] = mypid-1;
+         SharedProcs[i][0] = mypid - 1;
          SharedProcs[i][1] = mypid;
 
-         SharedProcs[n+1+i] = new int[SharedLengs[n+1+i]];
-         SharedProcs[n+1+i][0] = mypid;
-         SharedProcs[n+1+i][1] = mypid+1;
+         SharedProcs[n + 1 + i] = new int[SharedLengs[n + 1 + i]];
+         SharedProcs[n + 1 + i][0] = mypid;
+         SharedProcs[n + 1 + i][1] = mypid + 1;
       }
    }
 
    // Pass the shared nodes information to the FEI
    if (nprocs != 1 && nShared > 0)
+   {
       feiPtr->initSharedNodes(nShared, SharedIDs, SharedLengs, SharedProcs);
+   }
 
    // Finish the FEI initialization phase
    feiPtr->initComplete();
@@ -278,38 +292,42 @@ int main(int argc, char *argv[])
    if (mypid == 0)
    {
       // Nodes in the bottom row and left and right columns
-      nBCs = n+1 + 2*m;
+      nBCs = n + 1 + 2 * m;
       BCEqn = new int[nBCs];
-      for (i = 0; i < n+1; i++)
+      for (i = 0; i < n + 1; i++)
+      {
          BCEqn[i] = offset + i;
+      }
       for (i = 0; i < m; i++)
       {
-         BCEqn[n+1+2*i] = offset + (i+1)*(n+1);
-         BCEqn[n+2+2*i] = offset + (i+1)*(n+1)+n;
+         BCEqn[n + 1 + 2 * i] = offset + (i + 1) * (n + 1);
+         BCEqn[n + 2 + 2 * i] = offset + (i + 1) * (n + 1) + n;
       }
    }
-   else if (mypid == nprocs-1)
+   else if (mypid == nprocs - 1)
    {
       // Nodes in the top row and left and right columns
-      nBCs = n+1 + 2*m;
+      nBCs = n + 1 + 2 * m;
       BCEqn = new int[nBCs];
-      for (i = 0; i < n+1; i++)
-         BCEqn[i] = offset + m*(n+1) + i;
+      for (i = 0; i < n + 1; i++)
+      {
+         BCEqn[i] = offset + m * (n + 1) + i;
+      }
       for (i = 0; i < m; i++)
       {
-         BCEqn[n+1+2*i] = offset + i*(n+1);
-         BCEqn[n+2+2*i] = offset + i*(n+1)+n;
+         BCEqn[n + 1 + 2 * i] = offset + i * (n + 1);
+         BCEqn[n + 2 + 2 * i] = offset + i * (n + 1) + n;
       }
    }
    else
    {
       // Nodes in the left and right columns
-      nBCs = 2*(m+1);
+      nBCs = 2 * (m + 1);
       BCEqn = new int[nBCs];
-      for (i = 0; i < m+1; i++)
+      for (i = 0; i < m + 1; i++)
       {
-         BCEqn[2*i]   = offset + i*(n+1);
-         BCEqn[2*i+1] = offset + i*(n+1)+n;
+         BCEqn[2 * i]   = offset + i * (n + 1);
+         BCEqn[2 * i + 1] = offset + i * (n + 1) + n;
       }
    }
 
@@ -336,32 +354,38 @@ int main(int argc, char *argv[])
       for (j = 0; j < n; j++)
       {
          // Element with coordinates (i,j)
-         elemStiff[i*n+j] = new double*[elemNNodes];
+         elemStiff[i * n + j] = new double*[elemNNodes];
          for (k = 0; k < elemNNodes; k++)
-            elemStiff[i*n+j][k] = new double[elemNNodes];
+         {
+            elemStiff[i * n + j][k] = new double[elemNNodes];
+         }
 
          // Stiffness matrix for the reference square
          //                3 +---+ 2
          //                  |   |
          //                0 +---+ 1
 
-         double **A = elemStiff[i*n+j];
+         double **A = elemStiff[i * n + j];
 
          for (k = 0; k < 4; k++)
-            A[k][k] = 2/3.;
-
-         A[0][1] = A[1][0] = -1/6.;
-         A[0][2] = A[2][0] = -1/3.;
-         A[0][3] = A[3][0] = -1/6.;
-         A[1][2] = A[2][1] = -1/6.;
-         A[1][3] = A[3][1] = -1/3.;
-         A[2][3] = A[3][2] = -1/6.;
+         {
+            A[k][k] = 2 / 3.;
+         }
+
+         A[0][1] = A[1][0] = -1 / 6.;
+         A[0][2] = A[2][0] = -1 / 3.;
+         A[0][3] = A[3][0] = -1 / 6.;
+         A[1][2] = A[2][1] = -1 / 6.;
+         A[1][3] = A[3][1] = -1 / 3.;
+         A[2][3] = A[3][2] = -1 / 6.;
       }
 
    // Specify element load vectors
-   double *elemLoad = new double[nElems*elemNNodes];
-   for (i = 0; i < nElems*elemNNodes; i++)
-      elemLoad[i] = h*h/4;
+   double *elemLoad = new double[nElems * elemNNodes];
+   for (i = 0; i < nElems * elemNNodes; i++)
+   {
+      elemLoad[i] = h * h / 4;
+   }
 
    // Assemble the matrix. The elemFormat parameter describes
    // the storage (symmetric/non-symmetric, row/column-wise)
@@ -369,17 +393,17 @@ int main(int argc, char *argv[])
    int elemFormat = 0;
    for (i = 0; i < nElems; i++)
       feiPtr->sumInElem(elemBlkID, i, elemConn[i], elemStiff[i],
-                        &(elemLoad[i*elemNNodes]), elemFormat);
+                        &(elemLoad[i * elemNNodes]), elemFormat);
 
    // Finish the FEI load phase
    feiPtr->loadComplete();
 
    // Clean up
-   for (i = 0; i < nElems; i++) delete [] elemConn[i];
+   for (i = 0; i < nElems; i++) { delete [] elemConn[i]; }
    delete [] elemConn;
    for (i = 0; i < nElems; i++)
    {
-      for (j = 0; j < elemNNodes; j++) delete [] elemStiff[i][j];
+      for (j = 0; j < elemNNodes; j++) { delete [] elemStiff[i][j]; }
       delete [] elemStiff[i];
    }
    delete [] elemStiff;
@@ -400,12 +424,12 @@ int main(int argc, char *argv[])
    {
       delete [] SharedIDs;
       delete [] SharedLengs;
-      for (i = 0; i < nShared; i++) delete [] SharedProcs[i];
+      for (i = 0; i < nShared; i++) { delete [] SharedProcs[i]; }
       delete [] SharedProcs;
    }
 
    delete [] nodeNFields;
-   for (i = 0; i < elemNNodes; i++) delete [] nodeFieldIDs[i];
+   for (i = 0; i < elemNNodes; i++) { delete [] nodeFieldIDs[i]; }
    delete [] nodeFieldIDs;
 
    delete [] fieldSizes;
@@ -416,10 +440,12 @@ int main(int argc, char *argv[])
       int nParams = 19;
       char **paramStrings = new char*[nParams];
       for (i = 0; i < nParams; i++)
+      {
          paramStrings[i] = new char[100];
+      }
 
       strcpy(paramStrings[0], "outputLevel 2");
-      switch(solverID)
+      switch (solverID)
       {
          case 0:
             strcpy(paramStrings[1], "solver cg");
@@ -479,7 +505,9 @@ int main(int argc, char *argv[])
       feiPtr->parameters(nParams, paramStrings);
 
       for (i = 0; i < nParams; i++)
+      {
          delete [] paramStrings[i];
+      }
       delete [] paramStrings;
    }
 
@@ -508,7 +536,9 @@ int main(int argc, char *argv[])
 
       // Find the location of the ith local node
       for (i = 0; i < numNodes; i++)
-         solnOffsets[nodeIDList[i]-offset] = i;
+      {
+         solnOffsets[nodeIDList[i] - offset] = i;
+      }
 
       // Save the ordered nodal values to a file
       char sol_out[20];
@@ -519,10 +549,12 @@ int main(int argc, char *argv[])
           << "VDim: 1\n"
           << "Ordering: 0\n\n";
       for (i = 0; i < numNodes; i++)
+      {
          sol << solnValues[solnOffsets[i]] << endl;
+      }
 
       // Save local finite element mesh
-      GLVis_PrintLocalSquareMesh("vis/ex10.mesh", n, m, h, 0, mypid*h*m, mypid);
+      GLVis_PrintLocalSquareMesh("vis/ex10.mesh", n, m, h, 0, mypid * h * m, mypid);
 
       // additional visualization data
       if (mypid == 0)
diff --git a/external/hypre/src/examples/ex11.c b/external/hypre/src/examples/ex11.c
index b848f266..dc432a5c 100644
--- a/external/hypre/src/examples/ex11.c
+++ b/external/hypre/src/examples/ex11.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -74,7 +74,7 @@ int main (int argc, char *argv[])
    MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
 
    /* Initialize HYPRE */
-   HYPRE_Init();
+   HYPRE_Initialize();
 
    /* Print GPU info */
    /* HYPRE_PrintDeviceInfo(); */
@@ -136,20 +136,20 @@ int main (int argc, char *argv[])
    }
 
    /* Preliminaries: want at least one processor per row */
-   if (n*n < num_procs) n = sqrt(num_procs) + 1;
-   N = n*n; /* global number of rows */
+   if (n * n < num_procs) { n = sqrt(num_procs) + 1; }
+   N = n * n; /* global number of rows */
 
    /* Each processor knows only of its own rows - the range is denoted by ilower
       and iupper.  Here we partition the rows. We account for the fact that
       N may not divide evenly by the number of processors. */
-   local_size = N/num_procs;
-   extra = N - local_size*num_procs;
+   local_size = N / num_procs;
+   extra = N - local_size * num_procs;
 
-   ilower = local_size*myid;
+   ilower = local_size * myid;
    ilower += my_min(myid, extra);
 
-   iupper = local_size*(myid+1);
-   iupper += my_min(myid+1, extra);
+   iupper = local_size * (myid + 1);
+   iupper += my_min(myid + 1, extra);
    iupper = iupper - 1;
 
    /* How many rows do I have? */
@@ -179,25 +179,25 @@ int main (int argc, char *argv[])
       int nnz;
       /* double values[5];
        * int cols[5]; OK to use constant-length arrays for CPUs */
-      double *values = (double *) malloc(5*sizeof(double));
-      int *cols = (int *) malloc(5*sizeof(int));
+      double *values = (double *) malloc(5 * sizeof(double));
+      int *cols = (int *) malloc(5 * sizeof(int));
 
       for (i = ilower; i <= iupper; i++)
       {
          nnz = 0;
 
          /* The left identity block:position i-n */
-         if ((i-n)>=0)
+         if ((i - n) >= 0)
          {
-            cols[nnz] = i-n;
+            cols[nnz] = i - n;
             values[nnz] = -1.0;
             nnz++;
          }
 
          /* The left -1: position i-1 */
-         if (i%n)
+         if (i % n)
          {
-            cols[nnz] = i-1;
+            cols[nnz] = i - 1;
             values[nnz] = -1.0;
             nnz++;
          }
@@ -208,17 +208,17 @@ int main (int argc, char *argv[])
          nnz++;
 
          /* The right -1: position i+1 */
-         if ((i+1)%n)
+         if ((i + 1) % n)
          {
-            cols[nnz] = i+1;
+            cols[nnz] = i + 1;
             values[nnz] = -1.0;
             nnz++;
          }
 
          /* The right identity block:position i+n */
-         if ((i+n)< N)
+         if ((i + n) < N)
          {
-            cols[nnz] = i+n;
+            cols[nnz] = i + n;
             values[nnz] = -1.0;
             nnz++;
          }
@@ -237,13 +237,13 @@ int main (int argc, char *argv[])
    HYPRE_IJMatrixGetObject(A, (void**) &parcsr_A);
 
    /* Create sample rhs and solution vectors */
-   HYPRE_IJVectorCreate(MPI_COMM_WORLD, ilower, iupper,&b);
+   HYPRE_IJVectorCreate(MPI_COMM_WORLD, ilower, iupper, &b);
    HYPRE_IJVectorSetObjectType(b, HYPRE_PARCSR);
    HYPRE_IJVectorInitialize(b);
    HYPRE_IJVectorAssemble(b);
    HYPRE_IJVectorGetObject(b, (void **) &par_b);
 
-   HYPRE_IJVectorCreate(MPI_COMM_WORLD, ilower, iupper,&x);
+   HYPRE_IJVectorCreate(MPI_COMM_WORLD, ilower, iupper, &x);
    HYPRE_IJVectorSetObjectType(x, HYPRE_PARCSR);
    HYPRE_IJVectorInitialize(x);
    HYPRE_IJVectorAssemble(x);
@@ -274,7 +274,9 @@ int main (int argc, char *argv[])
       double *eigenvalues = NULL;
 
       if (myid != 0)
+      {
          verbosity = 0;
+      }
 
       /* define an interpreter for the ParCSR interface */
       interpreter = (mv_InterfaceInterpreter *) calloc(1, sizeof(mv_InterfaceInterpreter));
@@ -338,7 +340,7 @@ int main (int argc, char *argv[])
 
       /* get the local solution */
       values = hypre_VectorData(hypre_ParVectorLocalVector(
-                                   (hypre_ParVector*)pvx[blockSize-1]));
+                                   (hypre_ParVector*)pvx[blockSize - 1]));
 
       sprintf(filename, "%s.%06d", "vis/ex11.sol", myid);
       if ((file = fopen(filename, "w")) == NULL)
@@ -350,14 +352,18 @@ int main (int argc, char *argv[])
 
       /* save solution */
       for (i = 0; i < nvalues; i++)
+      {
          fprintf(file, "%.14e\n", values[i]);
+      }
 
       fflush(file);
       fclose(file);
 
       /* save global finite element mesh */
       if (myid == 0)
-         GLVis_PrintGlobalSquareMesh("vis/ex11.mesh", n-1);
+      {
+         GLVis_PrintGlobalSquareMesh("vis/ex11.mesh", n - 1);
+      }
 #endif
    }
 
@@ -372,5 +378,5 @@ int main (int argc, char *argv[])
    /* Finalize MPI*/
    MPI_Finalize();
 
-   return(0);
+   return (0);
 }
diff --git a/external/hypre/src/examples/ex12.c b/external/hypre/src/examples/ex12.c
index 87fae442..b1d08940 100644
--- a/external/hypre/src/examples/ex12.c
+++ b/external/hypre/src/examples/ex12.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -68,14 +68,14 @@ int main (int argc, char *argv[])
    MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
 
    /* Initialize HYPRE */
-   HYPRE_Init();
+   HYPRE_Initialize();
 
    /* Print GPU info */
    /* HYPRE_PrintDeviceInfo(); */
 
    if (num_procs != 2)
    {
-      if (myid == 0) printf("Must run with 2 processors!\n");
+      if (myid == 0) { printf("Must run with 2 processors!\n"); }
       exit(1);
    }
 
@@ -141,12 +141,12 @@ int main (int argc, char *argv[])
       /* Add boxes to the grid */
       if (myid == 0)
       {
-         int ilower[2]={-3,1}, iupper[2]={-1,2};
+         int ilower[2] = {-3, 1}, iupper[2] = {-1, 2};
          HYPRE_SStructGridSetExtents(grid, part, ilower, iupper);
       }
       else if (myid == 1)
       {
-         int ilower[2]={0,1}, iupper[2]={2,4};
+         int ilower[2] = {0, 1}, iupper[2] = {2, 4};
          HYPRE_SStructGridSetExtents(grid, part, ilower, iupper);
       }
 
@@ -171,13 +171,15 @@ int main (int argc, char *argv[])
          (in the index space). */
       {
          int entry;
-         int offsets[5][2] = {{0,0}, {-1,0}, {1,0}, {0,-1}, {0,1}};
+         int offsets[5][2] = {{0, 0}, {-1, 0}, {1, 0}, {0, -1}, {0, 1}};
 
          /* Assign numerical values to the offsets so that we can easily refer
             to them - the last argument indicates the variable for which we are
             assigning this stencil */
          for (entry = 0; entry < 5; entry++)
+         {
             HYPRE_SStructStencilSetEntry(stencil, entry, offsets[entry], var);
+         }
       }
    }
 
@@ -226,20 +228,22 @@ int main (int argc, char *argv[])
          See the User and Reference manuals for more details. */
       if (myid == 0)
       {
-         int ilower[2]={-4,0}, iupper[2]={-1,2};
-         int stencil_indices[5] = {0,1,2,3,4}; /* labels for the stencil entries -
+         int ilower[2] = {-4, 0}, iupper[2] = {-1, 2};
+         int stencil_indices[5] = {0, 1, 2, 3, 4}; /* labels for the stencil entries -
                                                   these correspond to the offsets
                                                   defined above */
          int nentries = 5;
          int nvalues  = 60; /* 12 grid points, each with 5 stencil entries */
          /* double values[60]; OK to use constant-length arrays for CPUs */
-         double *values = (double *) malloc(60*sizeof(double));
+         double *values = (double *) malloc(60 * sizeof(double));
 
          for (i = 0; i < nvalues; i += nentries)
          {
             values[i] = 4.0;
             for (j = 1; j < nentries; j++)
-               values[i+j] = -1.0;
+            {
+               values[i + j] = -1.0;
+            }
          }
 
          HYPRE_SStructMatrixSetBoxValues(A, part, ilower, iupper, var, nentries,
@@ -249,18 +253,20 @@ int main (int argc, char *argv[])
       }
       else if (myid == 1)
       {
-         int ilower[2]={-1,0}, iupper[2]={2,4};
-         int stencil_indices[5] = {0,1,2,3,4};
+         int ilower[2] = {-1, 0}, iupper[2] = {2, 4};
+         int stencil_indices[5] = {0, 1, 2, 3, 4};
          int nentries = 5;
          int nvalues  = 100; /* 20 grid points, each with 5 stencil entries */
          /* double values[100]; OK to use constant-length array for CPUs */
-         double *values = (double *) malloc(100*sizeof(double));
+         double *values = (double *) malloc(100 * sizeof(double));
 
          for (i = 0; i < nvalues; i += nentries)
          {
             values[i] = 4.0;
             for (j = 1; j < nentries; j++)
-               values[i+j] = -1.0;
+            {
+               values[i + j] = -1.0;
+            }
          }
 
          HYPRE_SStructMatrixSetBoxValues(A, part, ilower, iupper, var, nentries,
@@ -274,26 +280,28 @@ int main (int argc, char *argv[])
       if (myid == 0)
       {
          /* double values[4]; OK to use constant-length array for CPUs */
-         double *values = (double *) malloc(4*sizeof(double));
+         double *values = (double *) malloc(4 * sizeof(double));
          for (i = 0; i < 4; i++)
+         {
             values[i] = 0.0;
+         }
          {
             /* values below our box */
-            int ilower[2]={-4,0}, iupper[2]={-1,0};
+            int ilower[2] = {-4, 0}, iupper[2] = {-1, 0};
             int stencil_indices[1] = {3};
             HYPRE_SStructMatrixSetBoxValues(A, part, ilower, iupper, var, 1,
                                             stencil_indices, values);
          }
          {
             /* values to the left of our box */
-            int ilower[2]={-4,0}, iupper[2]={-4,2};
+            int ilower[2] = {-4, 0}, iupper[2] = {-4, 2};
             int stencil_indices[1] = {1};
             HYPRE_SStructMatrixSetBoxValues(A, part, ilower, iupper, var, 1,
                                             stencil_indices, values);
          }
          {
             /* values above our box */
-            int ilower[2]={-4,2}, iupper[2]={-2,2};
+            int ilower[2] = {-4, 2}, iupper[2] = {-2, 2};
             int stencil_indices[1] = {4};
             HYPRE_SStructMatrixSetBoxValues(A, part, ilower, iupper, var, 1,
                                             stencil_indices, values);
@@ -304,26 +312,28 @@ int main (int argc, char *argv[])
       else if (myid == 1)
       {
          /* double values[5]; OK to use constant-length array for CPUs */
-         double *values = (double *) malloc(5*sizeof(double));
+         double *values = (double *) malloc(5 * sizeof(double));
          for (i = 0; i < 5; i++)
+         {
             values[i] = 0.0;
+         }
          {
             /* values below our box */
-            int ilower[2]={-1,0}, iupper[2]={2,0};
+            int ilower[2] = {-1, 0}, iupper[2] = {2, 0};
             int stencil_indices[1] = {3};
             HYPRE_SStructMatrixSetBoxValues(A, part, ilower, iupper, var, 1,
                                             stencil_indices, values);
          }
          {
             /* values to the right of our box */
-            int ilower[2]={2,0}, iupper[2]={2,4};
+            int ilower[2] = {2, 0}, iupper[2] = {2, 4};
             int stencil_indices[1] = {2};
             HYPRE_SStructMatrixSetBoxValues(A, part, ilower, iupper, var, 1,
                                             stencil_indices, values);
          }
          {
             /* values above our box */
-            int ilower[2]={-1,4}, iupper[2]={2,4};
+            int ilower[2] = {-1, 4}, iupper[2] = {2, 4};
             int stencil_indices[1] = {4};
             HYPRE_SStructMatrixSetBoxValues(A, part, ilower, iupper, var, 1,
                                             stencil_indices, values);
@@ -331,7 +341,7 @@ int main (int argc, char *argv[])
          {
             /* values to the left of our box
                (that do not border the other box on proc. 0) */
-            int ilower[2]={-1,3}, iupper[2]={-1,4};
+            int ilower[2] = {-1, 3}, iupper[2] = {-1, 4};
             int stencil_indices[1] = {1};
             HYPRE_SStructMatrixSetBoxValues(A, part, ilower, iupper, var, 1,
                                             stencil_indices, values);
@@ -364,32 +374,40 @@ int main (int argc, char *argv[])
          both processors. */
       if (myid == 0)
       {
-         int ilower[2]={-4,0}, iupper[2]={-1,2};
+         int ilower[2] = {-4, 0}, iupper[2] = {-1, 2};
          /* double values[12]; OK to use constant-length array for CPUs */
-         double *values = (double *) malloc(12*sizeof(double)); /* 12 grid points */
+         double *values = (double *) malloc(12 * sizeof(double)); /* 12 grid points */
 
          for (i = 0; i < 12; i ++)
+         {
             values[i] = 1.0;
+         }
          HYPRE_SStructVectorSetBoxValues(b, part, ilower, iupper, var, values);
 
          for (i = 0; i < 12; i ++)
+         {
             values[i] = 0.0;
+         }
          HYPRE_SStructVectorSetBoxValues(x, part, ilower, iupper, var, values);
 
          free(values);
       }
       else if (myid == 1)
       {
-         int ilower[2]={0,1}, iupper[2]={2,4};
+         int ilower[2] = {0, 1}, iupper[2] = {2, 4};
          /* double values[20]; OK to use constant-length array for CPUs */
-         double *values = (double *) malloc(20*sizeof(double)); /* 20 grid points */
+         double *values = (double *) malloc(20 * sizeof(double)); /* 20 grid points */
 
          for (i = 0; i < 20; i ++)
+         {
             values[i] = 1.0;
+         }
          HYPRE_SStructVectorSetBoxValues(b, part, ilower, iupper, var, values);
 
          for (i = 0; i < 20; i ++)
+         {
             values[i] = 0.0;
+         }
          HYPRE_SStructVectorSetBoxValues(x, part, ilower, iupper, var, values);
 
          free(values);
@@ -445,7 +463,7 @@ int main (int argc, char *argv[])
 
       /* Set preconditioner and solve */
       HYPRE_StructPCGSetPrecond(solver, HYPRE_StructPFMGSolve,
-                          HYPRE_StructPFMGSetup, precond);
+                                HYPRE_StructPFMGSetup, precond);
       HYPRE_StructPCGSetup(solver, sA, sb, sx);
       HYPRE_StructPCGSolve(solver, sA, sb, sx);
 
diff --git a/external/hypre/src/examples/ex12cuf.cuf b/external/hypre/src/examples/ex12cuf.cuf
new file mode 100644
index 00000000..95bf616a
--- /dev/null
+++ b/external/hypre/src/examples/ex12cuf.cuf
@@ -0,0 +1,492 @@
+!     Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+!     HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+!
+!     SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+!
+!     Example 12
+!
+!     Interface:    Semi-Structured interface (SStruct)
+!
+!     Compile with: make ex12f (may need to edit HYPRE_DIR in Makefile)
+!
+!     Sample runs:  mpirun -np 2 ex12f
+!
+!     Description: The grid layout is the same as ex1, but with nodal
+!     unknowns. The solver is PCG preconditioned with either PFMG or
+!     BoomerAMG, set with 'precond_id' below.
+!
+!     We recommend viewing the Struct examples before viewing this and
+!     the other SStruct examples.  This is one of the simplest SStruct
+!     examples, used primarily to demonstrate how to set up
+!     non-cell-centered problems, and to demonstrate how easy it is to
+!     switch between structured solvers (PFMG) and solvers designed for
+!     more general settings (AMG).
+!
+
+      program ex12f
+
+      implicit none
+
+      include 'mpif.h'
+      include 'HYPREf.h'
+
+      integer    ierr
+      integer    i, j, myid, num_procs
+
+      integer*8  grid
+      integer*8  graph
+      integer*8  stencil
+      integer*8  A
+      integer*8  b
+      integer*8  x
+
+      integer    nparts
+      integer    nvars
+      integer    part
+      integer    var
+
+      integer    precond_id, object_type
+
+      integer    ilower(2), iupper(2)
+      integer    vartypes(1)
+      integer    offsets(2,5)
+      integer    ent
+      integer    nentries, nvalues, stencil_indices(5)
+
+      double precision tol
+
+      double precision, managed, allocatable :: values(:)
+
+!     This comes from 'sstruct_mv/HYPRE_sstruct_mv.h'
+      integer    HYPRE_SSTRUCT_VARIABLE_NODE
+      parameter( HYPRE_SSTRUCT_VARIABLE_NODE = 1 )
+
+      integer*8  sA
+      integer*8  sb
+      integer*8  sx
+      integer*8  parA
+      integer*8  parb
+      integer*8  parx
+      integer*8  solver
+      integer*8  precond
+
+      character*32  matfile
+
+      allocate(values(100))
+
+!     We only have one part and one variable
+      nparts = 1
+      nvars  = 1
+      part   = 0
+      var    = 0
+
+!     Initialize MPI
+      call MPI_Init(ierr)
+      call MPI_Comm_rank(MPI_COMM_WORLD, myid, ierr)
+      call MPI_Comm_size(MPI_COMM_WORLD, num_procs, ierr)
+
+      call HYPRE_Initialize(ierr)
+
+      if (num_procs .ne. 2) then
+         if (myid .eq. 0) then
+            print *, "Must run with 2 processors!"
+            stop
+         endif
+      endif
+
+!     Set preconditioner id (PFMG = 1, BoomerAMG = 2)
+      precond_id = 1
+
+      if (precond_id .eq. 1) then
+         object_type = HYPRE_STRUCT
+      else if (precond_id .eq. 2) then
+         object_type = HYPRE_PARCSR
+      else
+         if (myid .eq. 0) then
+            print *, "Invalid solver!"
+            stop
+         endif
+      endif
+
+!-----------------------------------------------------------------------
+!     1. Set up the grid.  Here we use only one part.  Each processor
+!     describes the piece of the grid that it owns.
+!-----------------------------------------------------------------------
+
+!     Create an empty 2D grid object
+      call HYPRE_SStructGridCreate(MPI_COMM_WORLD, 2, nparts, grid, &
+         ierr)
+
+!     Add boxes to the grid
+      if (myid .eq. 0) then
+         ilower(1) = -3
+         ilower(2) =  1
+         iupper(1) = -1
+         iupper(2) =  2
+         call HYPRE_SStructGridSetExtents(grid, part, ilower, iupper, &
+            ierr)
+      else if (myid .eq. 1) then
+         ilower(1) =  0
+         ilower(2) =  1
+         iupper(1) =  2
+         iupper(2) =  4
+         call HYPRE_SStructGridSetExtents(grid, part, ilower, iupper, &
+            ierr)
+      endif
+
+!     Set the variable type and number of variables on each part
+      vartypes(1) = HYPRE_SSTRUCT_VARIABLE_NODE
+      call HYPRE_SStructGridSetVariables(grid, part, nvars, vartypes, &
+         ierr)
+
+!     This is a collective call finalizing the grid assembly
+      call HYPRE_SStructGridAssemble(grid, ierr)
+
+!-----------------------------------------------------------------------
+!     2. Define the discretization stencil
+!-----------------------------------------------------------------------
+
+!     Create an empty 2D, 5-pt stencil object
+      call HYPRE_SStructStencilCreate(2, 5, stencil, ierr)
+
+!     Define the geometry of the stencil.  Each represents a relative
+!     offset (in the index space).
+      offsets(1,1) =  0
+      offsets(2,1) =  0
+      offsets(1,2) = -1
+      offsets(2,2) =  0
+      offsets(1,3) =  1
+      offsets(2,3) =  0
+      offsets(1,4) =  0
+      offsets(2,4) = -1
+      offsets(1,5) =  0
+      offsets(2,5) =  1
+
+!     Assign numerical values to the offsets so that we can easily refer
+!     to them - the last argument indicates the variable for which we
+!     are assigning this stencil
+      do ent = 1, 5
+         call HYPRE_SStructStencilSetEntry(stencil, &
+            ent-1, offsets(1,ent), var, ierr)
+      enddo
+
+!-----------------------------------------------------------------------
+!     3. Set up the Graph - this determines the non-zero structure of
+!     the matrix and allows non-stencil relationships between the parts
+!-----------------------------------------------------------------------
+
+!     Create the graph object
+      call HYPRE_SStructGraphCreate(MPI_COMM_WORLD, grid, graph, ierr)
+
+!     See MatrixSetObjectType below
+      call HYPRE_SStructGraphSetObjectType(graph, object_type, ierr)
+
+!     Now we need to tell the graph which stencil to use for each
+!     variable on each part (we only have one variable and one part)
+      call HYPRE_SStructGraphSetStencil(graph, part, var, stencil, ierr)
+
+!     Here we could establish connections between parts if we had more
+!     than one part using the graph. For example, we could use
+!     HYPRE_GraphAddEntries() routine or HYPRE_GridSetNeighborPart()
+
+!     Assemble the graph
+      call HYPRE_SStructGraphAssemble(graph, ierr)
+
+!-----------------------------------------------------------------------
+!     4. Set up a SStruct Matrix
+!-----------------------------------------------------------------------
+
+!     Create an empty matrix object
+      call HYPRE_SStructMatrixCreate(MPI_COMM_WORLD, graph, A, ierr)
+
+!     Set the object type (by default HYPRE_SSTRUCT). This determines
+!     the data structure used to store the matrix.  For PFMG we use
+!     HYPRE_STRUCT, and for BoomerAMG we use HYPRE_PARCSR (set above).
+      call HYPRE_SStructMatrixSetObjectTyp(A, object_type, ierr)
+
+!     Get ready to set values
+      call HYPRE_SStructMatrixInitialize(A, ierr)
+
+!     Set the matrix coefficients.  Each processor assigns coefficients
+!     for the boxes in the grid that it owns.  Note that the
+!     coefficients associated with each stencil entry may vary from grid
+!     point to grid point if desired.  Here, we first set the same
+!     stencil entries for each grid point.  Then we make modifications
+!     to grid points near the boundary.  Note that the ilower values are
+!     different from those used in ex1 because of the way nodal
+!     variables are referenced.  Also note that some of the stencil
+!     values are set on both processor 0 and processor 1.  See the User
+!     and Reference manuals for more details.
+
+!     Stencil entry labels correspond to the offsets defined above
+      do i = 1, 5
+         stencil_indices(i) = i-1
+      enddo
+      nentries = 5
+
+      if (myid .eq. 0) then
+         ilower(1) = -4
+         ilower(2) =  0
+         iupper(1) = -1
+         iupper(2) =  2
+!        12 grid points, each with 5 stencil entries
+         nvalues = 60
+      else if (myid .eq. 1) then
+         ilower(1) = -1
+         ilower(2) =  0
+         iupper(1) =  2
+         iupper(2) =  4
+!        12 grid points, each with 5 stencil entries
+         nvalues = 100
+      endif
+
+      do i = 1, nvalues, nentries
+         values(i) = 4.0
+         do j = 1, nentries-1
+            values(i+j) = -1.0
+         enddo
+      enddo
+
+      call HYPRE_SStructMatrixSetBoxValues(A, part, ilower, iupper, &
+         var, nentries, stencil_indices, values, ierr)
+
+!     Set the coefficients reaching outside of the boundary to 0.  Note
+!     that both ilower *and* iupper may be different from those in ex1.
+
+      do i = 1, 5
+         values(i) = 0.0
+      enddo
+
+      if (myid .eq. 0) then
+
+!        values below our box
+         ilower(1) = -4
+         ilower(2) =  0
+         iupper(1) = -1
+         iupper(2) =  0
+         stencil_indices(1) = 3
+         call HYPRE_SStructMatrixSetBoxValues(A, part, ilower, iupper, &
+            var, 1, stencil_indices, values, ierr)
+!        values to the left of our box
+         ilower(1) = -4
+         ilower(2) =  0
+         iupper(1) = -4
+         iupper(2) =  2
+         stencil_indices(1) = 1
+         call HYPRE_SStructMatrixSetBoxValues(A, part, ilower, iupper, &
+            var, 1, stencil_indices, values, ierr)
+!        values above our box
+         ilower(1) = -4
+         ilower(2) =  2
+         iupper(1) = -2
+         iupper(2) =  2
+         stencil_indices(1) = 4
+         call HYPRE_SStructMatrixSetBoxValues(A, part, ilower, iupper, &
+            var, 1, stencil_indices, values, ierr)
+
+      else if (myid .eq. 1) then
+
+!        values below our box
+         ilower(1) = -1
+         ilower(2) =  0
+         iupper(1) =  2
+         iupper(2) =  0
+         stencil_indices(1) = 3
+         call HYPRE_SStructMatrixSetBoxValues(A, part, ilower, iupper, &
+            var, 1, stencil_indices, values, ierr)
+!        values to the right of our box
+         ilower(1) =  2
+         ilower(2) =  0
+         iupper(1) =  2
+         iupper(2) =  4
+         stencil_indices(1) = 2
+         call HYPRE_SStructMatrixSetBoxValues(A, part, ilower, iupper, &
+            var, 1, stencil_indices, values, ierr)
+!        values above our box
+         ilower(1) = -1
+         ilower(2) =  4
+         iupper(1) =  2
+         iupper(2) =  4
+         stencil_indices(1) = 4
+         call HYPRE_SStructMatrixSetBoxValues(A, part, ilower, iupper, &
+            var, 1, stencil_indices, values, ierr)
+!        values to the left of our box
+!        (that do not border the other box on proc. 0)
+         ilower(1) = -1
+         ilower(2) =  3
+         iupper(1) = -1
+         iupper(2) =  4
+         stencil_indices(1) = 1
+         call HYPRE_SStructMatrixSetBoxValues(A, part, ilower, iupper, &
+            var, 1, stencil_indices, values, ierr)
+
+      endif
+
+!     This is a collective call finalizing the matrix assembly
+      call HYPRE_SStructMatrixAssemble(A, ierr)
+
+!      matfile = 'ex12f.out'
+!      matfile(10:10) = char(0)
+!      call HYPRE_SStructMatrixPrint(matfile, A, 0, ierr)
+
+!     Create an empty vector object
+      call HYPRE_SStructVectorCreate(MPI_COMM_WORLD, grid, b, ierr)
+      call HYPRE_SStructVectorCreate(MPI_COMM_WORLD, grid, x, ierr)
+
+!     As with the matrix, set the appropriate object type for the vectors
+      call HYPRE_SStructVectorSetObjectTyp(b, object_type, ierr)
+      call HYPRE_SStructVectorSetObjectTyp(x, object_type, ierr)
+
+!     Indicate that the vector coefficients are ready to be set
+      call HYPRE_SStructVectorInitialize(b, ierr)
+      call HYPRE_SStructVectorInitialize(x, ierr)
+
+!     Set the vector coefficients.  Again, note that the ilower values
+!     are different from those used in ex1, and some of the values are
+!     set on both processors.
+
+      if (myid .eq. 0) then
+
+         ilower(1) = -4
+         ilower(2) =  0
+         iupper(1) = -1
+         iupper(2) =  2
+
+         do i = 1, 12
+            values(i) = 1.0
+         enddo
+         call HYPRE_SStructVectorSetBoxValues(b, part, ilower, iupper, &
+            var, values, ierr)
+         do i = 1, 12
+            values(i) = 0.0
+         enddo
+         call HYPRE_SStructVectorSetBoxValues(x, part, ilower, iupper, &
+            var, values, ierr)
+
+      else if (myid .eq. 1) then
+
+         ilower(1) =  0
+         ilower(2) =  1
+         iupper(1) =  2
+         iupper(2) =  4
+
+         do i = 1, 20
+            values(i) = 1.0
+         enddo
+         call HYPRE_SStructVectorSetBoxValues(b, part, ilower, iupper, &
+            var, values, ierr)
+         do i = 1, 20
+            values(i) = 0.0
+         enddo
+         call HYPRE_SStructVectorSetBoxValues(x, part, ilower, iupper, &
+            var, values, ierr)
+
+      endif
+
+!     This is a collective call finalizing the vector assembly
+      call HYPRE_SStructVectorAssemble(b, ierr)
+      call HYPRE_SStructVectorAssemble(x, ierr)
+
+!-----------------------------------------------------------------------
+!     6. Set up and use a solver (See the Reference Manual for
+!     descriptions of all of the options.)
+!-----------------------------------------------------------------------
+
+      tol = 1.0E-6
+
+      if (precond_id .eq. 1) then
+
+!        PFMG
+
+!        Because we are using a struct solver, we need to get the object
+!        of the matrix and vectors to pass in to the struct solvers
+         call HYPRE_SStructMatrixGetObject(A, sA, ierr)
+         call HYPRE_SStructVectorGetObject(b, sb, ierr)
+         call HYPRE_SStructVectorGetObject(x, sx, ierr)
+
+!        Create an empty PCG Struct solver
+         call HYPRE_StructPCGCreate(MPI_COMM_WORLD, solver, ierr)
+!        Set PCG parameters
+         call HYPRE_StructPCGSetTol(solver, tol, ierr)
+         call HYPRE_StructPCGSetPrintLevel(solver, 2, ierr)
+         call HYPRE_StructPCGSetMaxIter(solver, 50, ierr)
+
+!        Create the Struct PFMG solver for use as a preconditioner
+         call HYPRE_StructPFMGCreate(MPI_COMM_WORLD, precond, ierr)
+!        Set PFMG parameters
+         call HYPRE_StructPFMGSetMaxIter(precond, 1, ierr)
+         call HYPRE_StructPFMGSetTol(precond, 0.0d0, ierr)
+         call HYPRE_StructPFMGSetZeroGuess(precond, ierr)
+         call HYPRE_StructPFMGSetNumPreRelax(precond, 2, ierr)
+         call HYPRE_StructPFMGSetNumPostRelax(precond, 2, ierr)
+!        Non-Galerkin coarse grid (more efficient for this problem)
+         call HYPRE_StructPFMGSetRAPType(precond, 1, ierr)
+!        R/B Gauss-Seidel
+         call HYPRE_StructPFMGSetRelaxType(precond, 2, ierr)
+!        Skip relaxation on some levels (more efficient for this problem)
+         call HYPRE_StructPFMGSetSkipRelax(precond, 1, ierr)
+!        Set preconditioner (PFMG = 1) and solve
+         call HYPRE_StructPCGSetPrecond(solver, 1, precond, ierr)
+         call HYPRE_StructPCGSetup(solver, sA, sb, sx, ierr)
+         call HYPRE_StructPCGSolve(solver, sA, sb, sx, ierr)
+
+!        Free memory
+         call HYPRE_StructPCGDestroy(solver, ierr)
+         call HYPRE_StructPFMGDestroy(precond, ierr)
+
+      else if (precond_id .eq. 2) then
+
+!        BoomerAMG
+
+!        Because we are using a struct solver, we need to get the object
+!        of the matrix and vectors to pass in to the struct solvers
+         call HYPRE_SStructMatrixGetObject(A, parA, ierr)
+         call HYPRE_SStructVectorGetObject(b, parb, ierr)
+         call HYPRE_SStructVectorGetObject(x, parx, ierr)
+
+!        Create an empty PCG Struct solver
+         call HYPRE_ParCSRPCGCreate(MPI_COMM_WORLD, solver, ierr)
+!        Set PCG parameters
+         call HYPRE_ParCSRPCGSetTol(solver, tol, ierr)
+         call HYPRE_ParCSRPCGSetPrintLevel(solver, 2, ierr)
+         call HYPRE_ParCSRPCGSetMaxIter(solver, 50, ierr)
+
+!        Create the BoomerAMG solver for use as a preconditioner
+         call HYPRE_BoomerAMGCreate(precond, ierr)
+!        Set BoomerAMG parameters
+         call HYPRE_BoomerAMGSetMaxIter(precond, 1, ierr)
+         call HYPRE_BoomerAMGSetTol(precond, 0.0, ierr)
+!        Print amg solution info
+         call HYPRE_BoomerAMGSetPrintLevel(precond, 1, ierr)
+         call HYPRE_BoomerAMGSetCoarsenType(precond, 6, ierr)
+         call HYPRE_BoomerAMGSetOldDefault(precond, ierr)
+!        Sym G.S./Jacobi hybrid
+         call HYPRE_BoomerAMGSetRelaxType(precond, 6, ierr)
+         call HYPRE_BoomerAMGSetNumSweeps(precond, 1, ierr)
+!        Set preconditioner (BoomerAMG = 2) and solve
+         call HYPRE_ParCSRPCGSetPrecond(solver, 2, precond, ierr)
+         call HYPRE_ParCSRPCGSetup(solver, parA, parb, parx, ierr)
+         call HYPRE_ParCSRPCGSolve(solver, parA, parb, parx, ierr)
+
+!        Free memory
+         call HYPRE_ParCSRPCGDestroy(solver, ierr)
+         call HYPRE_BoomerAMGDestroy(precond, ierr)
+
+      endif
+
+!     Free memory
+      call HYPRE_SStructGridDestroy(grid, ierr)
+      call HYPRE_SStructStencilDestroy(stencil, ierr)
+      call HYPRE_SStructGraphDestroy(graph, ierr)
+      call HYPRE_SStructMatrixDestroy(A, ierr)
+      call HYPRE_SStructVectorDestroy(b, ierr)
+      call HYPRE_SStructVectorDestroy(x, ierr)
+
+      call HYPRE_Finalize(ierr)
+
+!     Finalize MPI
+      call MPI_Finalize(ierr)
+
+      deallocate(values)
+      end
diff --git a/external/hypre/src/examples/ex12f.f b/external/hypre/src/examples/ex12f.f
index 2281282b..7c72e8d4 100644
--- a/external/hypre/src/examples/ex12f.f
+++ b/external/hypre/src/examples/ex12f.f
@@ -1,4 +1,4 @@
-!     Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+!     Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 !     HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 !
 !     SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -54,7 +54,9 @@ program ex12f
       integer    ent
       integer    nentries, nvalues, stencil_indices(5)
 
-      double precision  values(100), tol
+      double precision tol
+
+      double precision values(100)
 
 !     This comes from 'sstruct_mv/HYPRE_sstruct_mv.h'
       integer    HYPRE_SSTRUCT_VARIABLE_NODE
@@ -69,7 +71,7 @@ program ex12f
       integer*8  solver
       integer*8  precond
 
-      character*32  matfile
+!     character*32  matfile
 
 !     We only have one part and one variable
       nparts = 1
@@ -82,7 +84,7 @@ program ex12f
       call MPI_Comm_rank(MPI_COMM_WORLD, myid, ierr)
       call MPI_Comm_size(MPI_COMM_WORLD, num_procs, ierr)
 
-      call HYPRE_Init(ierr)
+      call HYPRE_Initialize(ierr)
 
       if (num_procs .ne. 2) then
          if (myid .eq. 0) then
@@ -105,6 +107,8 @@ program ex12f
          endif
       endif
 
+      !$omp target enter data map(alloc:values)
+
 !-----------------------------------------------------------------------
 !     1. Set up the grid.  Here we use only one part.  Each processor
 !     describes the piece of the grid that it owns.
@@ -235,6 +239,8 @@ program ex12f
          iupper(2) =  4
 !        12 grid points, each with 5 stencil entries
          nvalues = 100
+      else
+         nvalues = 0
       endif
 
       do i = 1, nvalues, nentries
@@ -244,8 +250,11 @@ program ex12f
          enddo
       enddo
 
+      !$omp target update to(values)
+      !$omp target data use_device_ptr(values)
       call HYPRE_SStructMatrixSetBoxValues(A, part, ilower, iupper,
      +     var, nentries, stencil_indices, values, ierr)
+      !$omp end target data
 
 !     Set the coefficients reaching outside of the boundary to 0.  Note
 !     that both ilower *and* iupper may be different from those in ex1.
@@ -254,6 +263,9 @@ program ex12f
          values(i) = 0.0
       enddo
 
+      !$omp target update to(values)
+      !$omp target data use_device_ptr(values)
+
       if (myid .eq. 0) then
 
 !        values below our box
@@ -319,6 +331,8 @@ program ex12f
 
       endif
 
+      !$omp end target data
+
 !     This is a collective call finalizing the matrix assembly
       call HYPRE_SStructMatrixAssemble(A, ierr)
 
@@ -352,13 +366,19 @@ program ex12f
          do i = 1, 12
             values(i) = 1.0
          enddo
+         !$omp target update to(values)
+         !$omp target data use_device_ptr(values)
          call HYPRE_SStructVectorSetBoxValues(b, part, ilower, iupper,
      +        var, values, ierr)
+         !$omp end target data
          do i = 1, 12
             values(i) = 0.0
          enddo
+         !$omp target update to(values)
+         !$omp target data use_device_ptr(values)
          call HYPRE_SStructVectorSetBoxValues(x, part, ilower, iupper,
      +        var, values, ierr)
+         !$omp end target data
 
       else if (myid .eq. 1) then
 
@@ -370,13 +390,19 @@ program ex12f
          do i = 1, 20
             values(i) = 1.0
          enddo
+         !$omp target update to(values)
+         !$omp target data use_device_ptr(values)
          call HYPRE_SStructVectorSetBoxValues(b, part, ilower, iupper,
      +        var, values, ierr)
+         !$omp end target data
          do i = 1, 20
             values(i) = 0.0
          enddo
+         !$omp target update to(values)
+         !$omp target data use_device_ptr(values)
          call HYPRE_SStructVectorSetBoxValues(x, part, ilower, iupper,
      +        var, values, ierr)
+         !$omp end target data
 
       endif
 
@@ -484,6 +510,4 @@ program ex12f
 !     Finalize MPI
       call MPI_Finalize(ierr)
 
-      stop
       end
-
diff --git a/external/hypre/src/examples/ex12f_cptr.f b/external/hypre/src/examples/ex12f_cptr.f
new file mode 100644
index 00000000..f43ad505
--- /dev/null
+++ b/external/hypre/src/examples/ex12f_cptr.f
@@ -0,0 +1,502 @@
+!     Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+!     HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+!
+!     SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+!
+!     Example 12
+!
+!     Interface:    Semi-Structured interface (SStruct)
+!
+!     Compile with: make ex12f (may need to edit HYPRE_DIR in Makefile)
+!
+!     Sample runs:  mpirun -np 2 ex12f
+!
+!     Description: The grid layout is the same as ex1, but with nodal
+!     unknowns. The solver is PCG preconditioned with either PFMG or
+!     BoomerAMG, set with 'precond_id' below.
+!
+!     We recommend viewing the Struct examples before viewing this and
+!     the other SStruct examples.  This is one of the simplest SStruct
+!     examples, used primarily to demonstrate how to set up
+!     non-cell-centered problems, and to demonstrate how easy it is to
+!     switch between structured solvers (PFMG) and solvers designed for
+!     more general settings (AMG).
+!
+
+      program ex12f
+
+      use, intrinsic :: iso_c_binding
+      use, intrinsic :: iso_fortran_env, only: int64
+      use cudaf
+
+      implicit none
+
+      include 'mpif.h'
+      include 'HYPREf.h'
+
+      integer    ierr
+      integer    i, j, myid, num_procs
+
+      integer*8  grid
+      integer*8  graph
+      integer*8  stencil
+      integer*8  A
+      integer*8  b
+      integer*8  x
+
+      integer    nparts
+      integer    nvars
+      integer    part
+      integer    var
+
+      integer    precond_id, object_type
+
+      integer    ilower(2), iupper(2)
+      integer    vartypes(1)
+      integer    offsets(2,5)
+      integer    ent
+      integer    nentries, nvalues, stencil_indices(5)
+
+      double precision tol
+
+      double precision, pointer :: values(:)
+      type(c_ptr) :: p_values
+
+      integer :: stat
+
+!     This comes from 'sstruct_mv/HYPRE_sstruct_mv.h'
+      integer    HYPRE_SSTRUCT_VARIABLE_NODE
+      parameter( HYPRE_SSTRUCT_VARIABLE_NODE = 1 )
+
+      integer*8  sA
+      integer*8  sb
+      integer*8  sx
+      integer*8  parA
+      integer*8  parb
+      integer*8  parx
+      integer*8  solver
+      integer*8  precond
+
+      character*32  matfile
+
+      stat = device_malloc_managed(int(100 * 8, int64), p_values)
+
+      call c_f_pointer(p_values, values, [100])
+
+!     We only have one part and one variable
+      nparts = 1
+      nvars  = 1
+      part   = 0
+      var    = 0
+
+!     Initialize MPI
+      call MPI_Init(ierr)
+      call MPI_Comm_rank(MPI_COMM_WORLD, myid, ierr)
+      call MPI_Comm_size(MPI_COMM_WORLD, num_procs, ierr)
+
+      call HYPRE_Initialize(ierr)
+
+      if (num_procs .ne. 2) then
+         if (myid .eq. 0) then
+            print *, "Must run with 2 processors!"
+            stop
+         endif
+      endif
+
+!     Set preconditioner id (PFMG = 1, BoomerAMG = 2)
+      precond_id = 1
+
+      if (precond_id .eq. 1) then
+         object_type = HYPRE_STRUCT
+      else if (precond_id .eq. 2) then
+         object_type = HYPRE_PARCSR
+      else
+         if (myid .eq. 0) then
+            print *, "Invalid solver!"
+            stop
+         endif
+      endif
+
+!-----------------------------------------------------------------------
+!     1. Set up the grid.  Here we use only one part.  Each processor
+!     describes the piece of the grid that it owns.
+!-----------------------------------------------------------------------
+
+!     Create an empty 2D grid object
+      call HYPRE_SStructGridCreate(MPI_COMM_WORLD, 2, nparts, grid,
+     +     ierr)
+
+!     Add boxes to the grid
+      if (myid .eq. 0) then
+         ilower(1) = -3
+         ilower(2) =  1
+         iupper(1) = -1
+         iupper(2) =  2
+         call HYPRE_SStructGridSetExtents(grid, part, ilower, iupper,
+     +        ierr)
+      else if (myid .eq. 1) then
+         ilower(1) =  0
+         ilower(2) =  1
+         iupper(1) =  2
+         iupper(2) =  4
+         call HYPRE_SStructGridSetExtents(grid, part, ilower, iupper,
+     +        ierr)
+      endif
+
+!     Set the variable type and number of variables on each part
+      vartypes(1) = HYPRE_SSTRUCT_VARIABLE_NODE
+      call HYPRE_SStructGridSetVariables(grid, part, nvars, vartypes,
+     +     ierr)
+
+!     This is a collective call finalizing the grid assembly
+      call HYPRE_SStructGridAssemble(grid, ierr)
+
+!-----------------------------------------------------------------------
+!     2. Define the discretization stencil
+!-----------------------------------------------------------------------
+
+!     Create an empty 2D, 5-pt stencil object
+      call HYPRE_SStructStencilCreate(2, 5, stencil, ierr)
+
+!     Define the geometry of the stencil.  Each represents a relative
+!     offset (in the index space).
+      offsets(1,1) =  0
+      offsets(2,1) =  0
+      offsets(1,2) = -1
+      offsets(2,2) =  0
+      offsets(1,3) =  1
+      offsets(2,3) =  0
+      offsets(1,4) =  0
+      offsets(2,4) = -1
+      offsets(1,5) =  0
+      offsets(2,5) =  1
+
+!     Assign numerical values to the offsets so that we can easily refer
+!     to them - the last argument indicates the variable for which we
+!     are assigning this stencil
+      do ent = 1, 5
+         call HYPRE_SStructStencilSetEntry(stencil,
+     +        ent-1, offsets(1,ent), var, ierr)
+      enddo
+
+!-----------------------------------------------------------------------
+!     3. Set up the Graph - this determines the non-zero structure of
+!     the matrix and allows non-stencil relationships between the parts
+!-----------------------------------------------------------------------
+
+!     Create the graph object
+      call HYPRE_SStructGraphCreate(MPI_COMM_WORLD, grid, graph, ierr)
+
+!     See MatrixSetObjectType below
+      call HYPRE_SStructGraphSetObjectType(graph, object_type, ierr)
+
+!     Now we need to tell the graph which stencil to use for each
+!     variable on each part (we only have one variable and one part)
+      call HYPRE_SStructGraphSetStencil(graph, part, var, stencil, ierr)
+
+!     Here we could establish connections between parts if we had more
+!     than one part using the graph. For example, we could use
+!     HYPRE_GraphAddEntries() routine or HYPRE_GridSetNeighborPart()
+
+!     Assemble the graph
+      call HYPRE_SStructGraphAssemble(graph, ierr)
+
+!-----------------------------------------------------------------------
+!     4. Set up a SStruct Matrix
+!-----------------------------------------------------------------------
+
+!     Create an empty matrix object
+      call HYPRE_SStructMatrixCreate(MPI_COMM_WORLD, graph, A, ierr)
+
+!     Set the object type (by default HYPRE_SSTRUCT). This determines
+!     the data structure used to store the matrix.  For PFMG we use
+!     HYPRE_STRUCT, and for BoomerAMG we use HYPRE_PARCSR (set above).
+      call HYPRE_SStructMatrixSetObjectTyp(A, object_type, ierr)
+
+!     Get ready to set values
+      call HYPRE_SStructMatrixInitialize(A, ierr)
+
+!     Set the matrix coefficients.  Each processor assigns coefficients
+!     for the boxes in the grid that it owns.  Note that the
+!     coefficients associated with each stencil entry may vary from grid
+!     point to grid point if desired.  Here, we first set the same
+!     stencil entries for each grid point.  Then we make modifications
+!     to grid points near the boundary.  Note that the ilower values are
+!     different from those used in ex1 because of the way nodal
+!     variables are referenced.  Also note that some of the stencil
+!     values are set on both processor 0 and processor 1.  See the User
+!     and Reference manuals for more details.
+
+!     Stencil entry labels correspond to the offsets defined above
+      do i = 1, 5
+         stencil_indices(i) = i-1
+      enddo
+      nentries = 5
+
+      if (myid .eq. 0) then
+         ilower(1) = -4
+         ilower(2) =  0
+         iupper(1) = -1
+         iupper(2) =  2
+!        12 grid points, each with 5 stencil entries
+         nvalues = 60
+      else if (myid .eq. 1) then
+         ilower(1) = -1
+         ilower(2) =  0
+         iupper(1) =  2
+         iupper(2) =  4
+!        12 grid points, each with 5 stencil entries
+         nvalues = 100
+      endif
+
+      do i = 1, nvalues, nentries
+         values(i) = 4.0
+         do j = 1, nentries-1
+            values(i+j) = -1.0
+         enddo
+      enddo
+
+      call HYPRE_SStructMatrixSetBoxValues(A, part, ilower, iupper,
+     +     var, nentries, stencil_indices, values, ierr)
+
+!     Set the coefficients reaching outside of the boundary to 0.  Note
+!     that both ilower *and* iupper may be different from those in ex1.
+
+      do i = 1, 5
+         values(i) = 0.0
+      enddo
+
+      if (myid .eq. 0) then
+
+!        values below our box
+         ilower(1) = -4
+         ilower(2) =  0
+         iupper(1) = -1
+         iupper(2) =  0
+         stencil_indices(1) = 3
+         call HYPRE_SStructMatrixSetBoxValues(A, part, ilower, iupper,
+     +        var, 1, stencil_indices, values, ierr)
+!        values to the left of our box
+         ilower(1) = -4
+         ilower(2) =  0
+         iupper(1) = -4
+         iupper(2) =  2
+         stencil_indices(1) = 1
+         call HYPRE_SStructMatrixSetBoxValues(A, part, ilower, iupper,
+     +        var, 1, stencil_indices, values, ierr)
+!        values above our box
+         ilower(1) = -4
+         ilower(2) =  2
+         iupper(1) = -2
+         iupper(2) =  2
+         stencil_indices(1) = 4
+         call HYPRE_SStructMatrixSetBoxValues(A, part, ilower, iupper,
+     +        var, 1, stencil_indices, values, ierr)
+
+      else if (myid .eq. 1) then
+
+!        values below our box
+         ilower(1) = -1
+         ilower(2) =  0
+         iupper(1) =  2
+         iupper(2) =  0
+         stencil_indices(1) = 3
+         call HYPRE_SStructMatrixSetBoxValues(A, part, ilower, iupper,
+     +        var, 1, stencil_indices, values, ierr)
+!        values to the right of our box
+         ilower(1) =  2
+         ilower(2) =  0
+         iupper(1) =  2
+         iupper(2) =  4
+         stencil_indices(1) = 2
+         call HYPRE_SStructMatrixSetBoxValues(A, part, ilower, iupper,
+     +        var, 1, stencil_indices, values, ierr)
+!        values above our box
+         ilower(1) = -1
+         ilower(2) =  4
+         iupper(1) =  2
+         iupper(2) =  4
+         stencil_indices(1) = 4
+         call HYPRE_SStructMatrixSetBoxValues(A, part, ilower, iupper,
+     +        var, 1, stencil_indices, values, ierr)
+!        values to the left of our box
+!        (that do not border the other box on proc. 0)
+         ilower(1) = -1
+         ilower(2) =  3
+         iupper(1) = -1
+         iupper(2) =  4
+         stencil_indices(1) = 1
+         call HYPRE_SStructMatrixSetBoxValues(A, part, ilower, iupper,
+     +        var, 1, stencil_indices, values, ierr)
+
+      endif
+
+!     This is a collective call finalizing the matrix assembly
+      call HYPRE_SStructMatrixAssemble(A, ierr)
+
+!      matfile = 'ex12f.out'
+!      matfile(10:10) = char(0)
+!      call HYPRE_SStructMatrixPrint(matfile, A, 0, ierr)
+
+!     Create an empty vector object
+      call HYPRE_SStructVectorCreate(MPI_COMM_WORLD, grid, b, ierr)
+      call HYPRE_SStructVectorCreate(MPI_COMM_WORLD, grid, x, ierr)
+
+!     As with the matrix, set the appropriate object type for the vectors
+      call HYPRE_SStructVectorSetObjectTyp(b, object_type, ierr)
+      call HYPRE_SStructVectorSetObjectTyp(x, object_type, ierr)
+
+!     Indicate that the vector coefficients are ready to be set
+      call HYPRE_SStructVectorInitialize(b, ierr)
+      call HYPRE_SStructVectorInitialize(x, ierr)
+
+!     Set the vector coefficients.  Again, note that the ilower values
+!     are different from those used in ex1, and some of the values are
+!     set on both processors.
+
+      if (myid .eq. 0) then
+
+         ilower(1) = -4
+         ilower(2) =  0
+         iupper(1) = -1
+         iupper(2) =  2
+
+         do i = 1, 12
+            values(i) = 1.0
+         enddo
+         call HYPRE_SStructVectorSetBoxValues(b, part, ilower, iupper,
+     +        var, values, ierr)
+         do i = 1, 12
+            values(i) = 0.0
+         enddo
+         call HYPRE_SStructVectorSetBoxValues(x, part, ilower, iupper,
+     +        var, values, ierr)
+
+      else if (myid .eq. 1) then
+
+         ilower(1) =  0
+         ilower(2) =  1
+         iupper(1) =  2
+         iupper(2) =  4
+
+         do i = 1, 20
+            values(i) = 1.0
+         enddo
+         call HYPRE_SStructVectorSetBoxValues(b, part, ilower, iupper,
+     +        var, values, ierr)
+         do i = 1, 20
+            values(i) = 0.0
+         enddo
+         call HYPRE_SStructVectorSetBoxValues(x, part, ilower, iupper,
+     +        var, values, ierr)
+
+      endif
+
+!     This is a collective call finalizing the vector assembly
+      call HYPRE_SStructVectorAssemble(b, ierr)
+      call HYPRE_SStructVectorAssemble(x, ierr)
+
+!-----------------------------------------------------------------------
+!     6. Set up and use a solver (See the Reference Manual for
+!     descriptions of all of the options.)
+!-----------------------------------------------------------------------
+
+      tol = 1.0E-6
+
+      if (precond_id .eq. 1) then
+
+!        PFMG
+
+!        Because we are using a struct solver, we need to get the object
+!        of the matrix and vectors to pass in to the struct solvers
+         call HYPRE_SStructMatrixGetObject(A, sA, ierr)
+         call HYPRE_SStructVectorGetObject(b, sb, ierr)
+         call HYPRE_SStructVectorGetObject(x, sx, ierr)
+
+!        Create an empty PCG Struct solver
+         call HYPRE_StructPCGCreate(MPI_COMM_WORLD, solver, ierr)
+!        Set PCG parameters
+         call HYPRE_StructPCGSetTol(solver, tol, ierr)
+         call HYPRE_StructPCGSetPrintLevel(solver, 2, ierr)
+         call HYPRE_StructPCGSetMaxIter(solver, 50, ierr)
+
+!        Create the Struct PFMG solver for use as a preconditioner
+         call HYPRE_StructPFMGCreate(MPI_COMM_WORLD, precond, ierr)
+!        Set PFMG parameters
+         call HYPRE_StructPFMGSetMaxIter(precond, 1, ierr)
+         call HYPRE_StructPFMGSetTol(precond, 0.0d0, ierr)
+         call HYPRE_StructPFMGSetZeroGuess(precond, ierr)
+         call HYPRE_StructPFMGSetNumPreRelax(precond, 2, ierr)
+         call HYPRE_StructPFMGSetNumPostRelax(precond, 2, ierr)
+!        Non-Galerkin coarse grid (more efficient for this problem)
+         call HYPRE_StructPFMGSetRAPType(precond, 1, ierr)
+!        R/B Gauss-Seidel
+         call HYPRE_StructPFMGSetRelaxType(precond, 2, ierr)
+!        Skip relaxation on some levels (more efficient for this problem)
+         call HYPRE_StructPFMGSetSkipRelax(precond, 1, ierr)
+!        Set preconditioner (PFMG = 1) and solve
+         call HYPRE_StructPCGSetPrecond(solver, 1, precond, ierr)
+         call HYPRE_StructPCGSetup(solver, sA, sb, sx, ierr)
+         call HYPRE_StructPCGSolve(solver, sA, sb, sx, ierr)
+
+!        Free memory
+         call HYPRE_StructPCGDestroy(solver, ierr)
+         call HYPRE_StructPFMGDestroy(precond, ierr)
+
+      else if (precond_id .eq. 2) then
+
+!        BoomerAMG
+
+!        Because we are using a struct solver, we need to get the object
+!        of the matrix and vectors to pass in to the struct solvers
+         call HYPRE_SStructMatrixGetObject(A, parA, ierr)
+         call HYPRE_SStructVectorGetObject(b, parb, ierr)
+         call HYPRE_SStructVectorGetObject(x, parx, ierr)
+
+!        Create an empty PCG Struct solver
+         call HYPRE_ParCSRPCGCreate(MPI_COMM_WORLD, solver, ierr)
+!        Set PCG parameters
+         call HYPRE_ParCSRPCGSetTol(solver, tol, ierr)
+         call HYPRE_ParCSRPCGSetPrintLevel(solver, 2, ierr)
+         call HYPRE_ParCSRPCGSetMaxIter(solver, 50, ierr)
+
+!        Create the BoomerAMG solver for use as a preconditioner
+         call HYPRE_BoomerAMGCreate(precond, ierr)
+!        Set BoomerAMG parameters
+         call HYPRE_BoomerAMGSetMaxIter(precond, 1, ierr)
+         call HYPRE_BoomerAMGSetTol(precond, 0.0, ierr)
+!        Print amg solution info
+         call HYPRE_BoomerAMGSetPrintLevel(precond, 1, ierr)
+         call HYPRE_BoomerAMGSetCoarsenType(precond, 6, ierr)
+         call HYPRE_BoomerAMGSetOldDefault(precond, ierr)
+!        Sym G.S./Jacobi hybrid
+         call HYPRE_BoomerAMGSetRelaxType(precond, 6, ierr)
+         call HYPRE_BoomerAMGSetNumSweeps(precond, 1, ierr)
+!        Set preconditioner (BoomerAMG = 2) and solve
+         call HYPRE_ParCSRPCGSetPrecond(solver, 2, precond, ierr)
+         call HYPRE_ParCSRPCGSetup(solver, parA, parb, parx, ierr)
+         call HYPRE_ParCSRPCGSolve(solver, parA, parb, parx, ierr)
+
+!        Free memory
+         call HYPRE_ParCSRPCGDestroy(solver, ierr)
+         call HYPRE_BoomerAMGDestroy(precond, ierr)
+
+      endif
+
+!     Free memory
+      call HYPRE_SStructGridDestroy(grid, ierr)
+      call HYPRE_SStructStencilDestroy(stencil, ierr)
+      call HYPRE_SStructGraphDestroy(graph, ierr)
+      call HYPRE_SStructMatrixDestroy(A, ierr)
+      call HYPRE_SStructVectorDestroy(b, ierr)
+      call HYPRE_SStructVectorDestroy(x, ierr)
+
+      call HYPRE_Finalize(ierr)
+
+!     Finalize MPI
+      call MPI_Finalize(ierr)
+
+      stat = device_free(p_values)
+
+      end
diff --git a/external/hypre/src/examples/ex13.c b/external/hypre/src/examples/ex13.c
index 25cebe81..164591b7 100644
--- a/external/hypre/src/examples/ex13.c
+++ b/external/hypre/src/examples/ex13.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -123,29 +123,33 @@ void ComputeFEMRhombus (double **S, double F[4], double gamma, double h)
 {
    int i, j;
 
-   double h2_4 = h*h/4;
+   double h2_4 = h * h / 4;
    double sing = sin(gamma);
-   double alpha = 1/(6*sing);
-   double k = 3*cos(gamma);
+   double alpha = 1 / (6 * sing);
+   double k = 3 * cos(gamma);
 
-   S[0][0] = alpha * (4-k);
+   S[0][0] = alpha * (4 - k);
    S[0][1] = alpha * (-1);
-   S[0][2] = alpha * (-2+k);
+   S[0][2] = alpha * (-2 + k);
    S[0][3] = alpha * (-1);
-   S[1][1] = alpha * (4+k);
+   S[1][1] = alpha * (4 + k);
    S[1][2] = alpha * (-1);
-   S[1][3] = alpha * (-2-k);
-   S[2][2] = alpha * (4-k);
+   S[1][3] = alpha * (-2 - k);
+   S[2][2] = alpha * (4 - k);
    S[2][3] = alpha * (-1);
-   S[3][3] = alpha * (4+k);
+   S[3][3] = alpha * (4 + k);
 
    /* The stiffness matrix is symmetric */
    for (i = 1; i < 4; i++)
       for (j = 0; j < i; j++)
+      {
          S[i][j] = S[j][i];
+      }
 
    for (i = 0; i < 4; i++)
-      F[i] = h2_4*sing;
+   {
+      F[i] = h2_4 * sing;
+   }
 }
 
 
@@ -171,7 +175,7 @@ int main (int argc, char *argv[])
    MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
 
    /* Initialize HYPRE */
-   HYPRE_Init();
+   HYPRE_Initialize();
 
    /* Print GPU info */
    /* HYPRE_PrintDeviceInfo(); */
@@ -229,12 +233,12 @@ int main (int argc, char *argv[])
       number of processors np and the given n */
    if (num_procs < 3)
    {
-      if (myid ==0) printf("Must run with at least 3 processors!\n");
+      if (myid == 0) { printf("Must run with at least 3 processors!\n"); }
       MPI_Finalize();
       exit(1);
    }
-   gamma = 2*M_PI/num_procs;
-   h = 1.0/n;
+   gamma = 2 * M_PI / num_procs;
+   h = 1.0 / n;
 
    /* 1. Set up the grid.  We will set up the grid so that processor X owns
          part X.  Note that each part has its own index space numbering. Later
@@ -250,8 +254,8 @@ int main (int argc, char *argv[])
          part has its own relative index space numbering */
       {
          int part = myid;
-         int ilower[2] = {1,1}; /* lower-left cell touching the origin */
-         int iupper[2] = {n,n}; /* upper-right cell */
+         int ilower[2] = {1, 1}; /* lower-left cell touching the origin */
+         int iupper[2] = {n, n}; /* upper-right cell */
 
          HYPRE_SStructGridSetExtents(grid, part, ilower, iupper);
       }
@@ -265,7 +269,9 @@ int main (int argc, char *argv[])
 
          HYPRE_SStructVariable vartypes[1] = {HYPRE_SSTRUCT_VARIABLE_NODE};
          for (i = 0; i < nparts; i++)
+         {
             HYPRE_SStructGridSetVariables(grid, i, nvars, vartypes);
+         }
       }
 
       /* Now we need to set the spatial relation between each of the parts.
@@ -278,19 +284,19 @@ int main (int argc, char *argv[])
          {
             int part = myid;
             /* the box of cells intersecting the boundary in the current part */
-            int ilower[2] = {1,1}, iupper[2] = {1,n};
+            int ilower[2] = {1, 1}, iupper[2] = {1, n};
             /* share all data on the left side of the box */
-            int offset[2] = {-1,0};
+            int offset[2] = {-1, 0};
 
-            int shared_part = (myid+1) % num_procs;
+            int shared_part = (myid + 1) % num_procs;
             /* the box of cells intersecting the boundary in the neighbor */
-            int shared_ilower[2] = {1,1}, shared_iupper[2] = {n,1};
+            int shared_ilower[2] = {1, 1}, shared_iupper[2] = {n, 1};
             /* share all data on the bottom of the box */
-            int shared_offset[2] = {0,-1};
+            int shared_offset[2] = {0, -1};
 
             /* x/y-direction on the current part is -y/x on the neighbor */
-            int index_map[2] = {1,0};
-            int index_dir[2] = {-1,1};
+            int index_map[2] = {1, 0};
+            int index_dir[2] = {-1, 1};
 
             HYPRE_SStructGridSetSharedPart(grid, part, ilower, iupper, offset,
                                            shared_part, shared_ilower,
@@ -304,19 +310,19 @@ int main (int argc, char *argv[])
          {
             int part = myid;
             /* the box of cells intersecting the boundary in the current part */
-            int ilower[2] = {1,1}, iupper[2] = {n,1};
+            int ilower[2] = {1, 1}, iupper[2] = {n, 1};
             /* share all data on the bottom of the box */
-            int offset[2] = {0,-1};
+            int offset[2] = {0, -1};
 
-            int shared_part = (myid+num_procs-1) % num_procs;
+            int shared_part = (myid + num_procs - 1) % num_procs;
             /* the box of cells intersecting the boundary in the neighbor */
-            int shared_ilower[2] = {1,1}, shared_iupper[2] = {1,n};
+            int shared_ilower[2] = {1, 1}, shared_iupper[2] = {1, n};
             /* share all data on the left side of the box */
-            int shared_offset[2] = {-1,0};
+            int shared_offset[2] = {-1, 0};
 
             /* x/y-direction on the current part is y/-x on the neighbor */
-            int index_map[2] = {1,0};
-            int index_dir[2] = {1,-1};
+            int index_map[2] = {1, 0};
+            int index_dir[2] = {1, -1};
 
             HYPRE_SStructGridSetSharedPart(grid, part, ilower, iupper, offset,
                                            shared_part, shared_ilower,
@@ -329,29 +335,29 @@ int main (int argc, char *argv[])
          {
             int part = myid;
             /* the (one cell) box that touches the origin */
-            int ilower[2] = {1,1}, iupper[2] = {1,1};
+            int ilower[2] = {1, 1}, iupper[2] = {1, 1};
             /* share all data in the bottom left corner (i.e. the origin) */
-            int offset[2] = {-1,-1};
+            int offset[2] = {-1, -1};
 
             int shared_part;
             /* the box of one cell that touches the origin */
-            int shared_ilower[2] = {1,1}, shared_iupper[2] = {1,1};
+            int shared_ilower[2] = {1, 1}, shared_iupper[2] = {1, 1};
             /* share all data in the bottom left corner (i.e. the origin) */
-            int shared_offset[2] = {-1,-1};
+            int shared_offset[2] = {-1, -1};
 
             /* x/y-direction on the current part is -x/-y on the neighbor, but
                in this case the arguments are not really important since we are
                only sharing a point */
-            int index_map[2] = {0,1};
-            int index_dir[2] = {-1,-1};
+            int index_map[2] = {0, 1};
+            int index_dir[2] = {-1, -1};
 
-            for (shared_part = 0; shared_part < myid-1; shared_part++)
+            for (shared_part = 0; shared_part < myid - 1; shared_part++)
                HYPRE_SStructGridSetSharedPart(grid, part, ilower, iupper, offset,
                                               shared_part, shared_ilower,
                                               shared_iupper, shared_offset,
                                               index_map, index_dir);
 
-            for (shared_part = myid+2; shared_part < num_procs; shared_part++)
+            for (shared_part = myid + 2; shared_part < num_procs; shared_part++)
                HYPRE_SStructGridSetSharedPart(grid, part, ilower, iupper, offset,
                                               shared_part, shared_ilower,
                                               shared_iupper, shared_offset,
@@ -373,16 +379,21 @@ int main (int argc, char *argv[])
 
       /* Define the geometry of the 9-point stencil */
       int stencil_size = 9;
-      int offsets[9][2] = {{0,0},           /*  [8] [4] [7]  */
-                           {-1,0}, {1,0},   /*     \ | /     */
-                           {0,-1}, {0,1},   /*  [1]-[0]-[2]  */
-                           {-1,-1}, {1,-1}, /*     / | \     */
-                           {1,1}, {-1,1}};  /*  [5] [3] [6]  */
+      int offsets[9][2] =
+      {
+         { 0,  0},           /*  [8] [4] [7]  */
+         {-1,  0}, { 1,  0}, /*     \ | /     */
+         { 0, -1}, { 0,  1}, /*  [1]-[0]-[2]  */
+         {-1, -1}, { 1, -1}, /*     / | \     */
+         { 1,  1}, {-1,  1}  /*  [5] [3] [6]  */
+      };
 
       HYPRE_SStructStencilCreate(ndim, stencil_size, &stencil);
 
       for (entry = 0; entry < stencil_size; entry++)
+      {
          HYPRE_SStructStencilSetEntry(stencil, entry, offsets[entry], var);
+      }
    }
 
    /* 3. Set up the Graph - this determines the non-zero structure of the
@@ -400,7 +411,9 @@ int main (int argc, char *argv[])
       /* Now we need to tell the graph which stencil to use for each
          variable on each part (we only have one variable) */
       for (part = 0; part < num_procs; part++)
+      {
          HYPRE_SStructGraphSetStencil(graph, part, var, stencil);
+      }
 
       /* Assemble the graph */
       HYPRE_SStructGraphAssemble(graph);
@@ -429,16 +442,16 @@ int main (int argc, char *argv[])
       {
          /* local stifness matrix and load vector */
          /* double F[4]; OK to use constant-length arrays for CPUs */
-         double *F = (double *) malloc(4*sizeof(double));
+         double *F = (double *) malloc(4 * sizeof(double));
          /*double S[4][4]; OK to use constant-length arrays for CPUs */
-         double *S_flat = (double *) malloc(16*sizeof(double));
+         double *S_flat = (double *) malloc(16 * sizeof(double));
          double *S[4];
          S[0] = S_flat; S[1] = S[0] + 4; S[2] = S[1] + 4; S[3] = S[2] + 4;
 
          /* The index of the local nodes 0-3 relative to the cell index,
             i.e. node k in cell (i,j) is in the upper-right corner of the
             cell (i,j) + node_index_offset[k]. */
-         int node_index_offset[4][2] = {{-1,-1},{0,-1},{0,0},{-1,0}};
+         int node_index_offset[4][2] = {{-1, -1}, {0, -1}, {0, 0}, {-1, 0}};
 
          /* The cell sub-stencils of nodes 0-3 indexed from the full stencil,
             i.e. we take the full stencil in each node of a fixed cell, and
@@ -452,7 +465,7 @@ int main (int argc, char *argv[])
             therefore the above sub-stencil at node k corresponds to the kth row
             of the local stiffness matrix and the kth entry of the local load
             vector. */
-         int node_stencil[4][4] = {{0,2,7,4},{1,0,4,8},{5,3,0,1},{3,6,2,0}};
+         int node_stencil[4][4] = {{0, 2, 7, 4}, {1, 0, 4, 8}, {5, 3, 0, 1}, {3, 6, 2, 0}};
 
          int i, j, k;
          int index[2];
@@ -574,14 +587,14 @@ int main (int argc, char *argv[])
    {
       int part = myid;
       int var = 0;
-      int nvalues = (n+1)*(n+1);
+      int nvalues = (n + 1) * (n + 1);
       double *values;
 
       /* Since the SetBoxValues() calls below set the values of the nodes in
          the upper-right corners of the cells, the nodal box should start
          from (0,0) instead of (1,1). */
-      int ilower[2] = {0,0};
-      int iupper[2] = {n,n};
+      int ilower[2] = {0, 0};
+      int iupper[2] = {n, n};
 
       values = (double*) calloc(nvalues, sizeof(double));
 
@@ -648,10 +661,10 @@ int main (int argc, char *argv[])
          char filename[255];
 
          int i, part = myid, var = 0;
-         int nvalues = (n+1)*(n+1);
+         int nvalues = (n + 1) * (n + 1);
          double *values = (double*) calloc(nvalues, sizeof(double));
-         int ilower[2] = {0,0};
-         int iupper[2] = {n,n};
+         int ilower[2] = {0, 0};
+         int iupper[2] = {n, n};
 
          /* get all local data (including a local copy of the shared values) */
          HYPRE_SStructVectorGetBoxValues(x, part, ilower, iupper,
@@ -673,7 +686,9 @@ int main (int argc, char *argv[])
 
          /* save solution */
          for (i = 0; i < nvalues; i++)
+         {
             fprintf(file, "%.14e\n", values[i]);
+         }
 
          fflush(file);
          fclose(file);
diff --git a/external/hypre/src/examples/ex14.c b/external/hypre/src/examples/ex14.c
index 81d00510..bfe35fda 100644
--- a/external/hypre/src/examples/ex14.c
+++ b/external/hypre/src/examples/ex14.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -121,29 +121,33 @@ void ComputeFEMRhombus (double **S, double F[4], double gamma, double h)
 {
    int i, j;
 
-   double h2_4 = h*h/4;
+   double h2_4 = h * h / 4;
    double sing = sin(gamma);
-   double alpha = 1/(6*sing);
-   double k = 3*cos(gamma);
+   double alpha = 1 / (6 * sing);
+   double k = 3 * cos(gamma);
 
-   S[0][0] = alpha * (4-k);
+   S[0][0] = alpha * (4 - k);
    S[0][1] = alpha * (-1);
-   S[0][2] = alpha * (-2+k);
+   S[0][2] = alpha * (-2 + k);
    S[0][3] = alpha * (-1);
-   S[1][1] = alpha * (4+k);
+   S[1][1] = alpha * (4 + k);
    S[1][2] = alpha * (-1);
-   S[1][3] = alpha * (-2-k);
-   S[2][2] = alpha * (4-k);
+   S[1][3] = alpha * (-2 - k);
+   S[2][2] = alpha * (4 - k);
    S[2][3] = alpha * (-1);
-   S[3][3] = alpha * (4+k);
+   S[3][3] = alpha * (4 + k);
 
    /* The stiffness matrix is symmetric */
    for (i = 1; i < 4; i++)
       for (j = 0; j < i; j++)
+      {
          S[i][j] = S[j][i];
+      }
 
    for (i = 0; i < 4; i++)
-      F[i] = h2_4*sing;
+   {
+      F[i] = h2_4 * sing;
+   }
 }
 
 
@@ -168,7 +172,7 @@ int main (int argc, char *argv[])
    MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
 
    /* Initialize HYPRE */
-   HYPRE_Init();
+   HYPRE_Initialize();
 
    /* Print GPU info */
    /* HYPRE_PrintDeviceInfo(); */
@@ -226,12 +230,12 @@ int main (int argc, char *argv[])
       number of processors np and the given n */
    if (num_procs < 3)
    {
-      if (myid ==0) printf("Must run with at least 3 processors!\n");
+      if (myid == 0) { printf("Must run with at least 3 processors!\n"); }
       MPI_Finalize();
       exit(1);
    }
-   gamma = 2*M_PI/num_procs;
-   h = 1.0/n;
+   gamma = 2 * M_PI / num_procs;
+   h = 1.0 / n;
 
    /* 1. Set up the grid.  We will set up the grid so that processor X owns
          part X.  Note that each part has its own index space numbering. Later
@@ -247,8 +251,8 @@ int main (int argc, char *argv[])
          part has its own relative index space numbering */
       {
          int part = myid;
-         int ilower[2] = {1,1}; /* lower-left cell touching the origin */
-         int iupper[2] = {n,n}; /* upper-right cell */
+         int ilower[2] = {1, 1}; /* lower-left cell touching the origin */
+         int iupper[2] = {n, n}; /* upper-right cell */
 
          HYPRE_SStructGridSetExtents(grid, part, ilower, iupper);
       }
@@ -262,7 +266,9 @@ int main (int argc, char *argv[])
 
          HYPRE_SStructVariable vartypes[1] = {HYPRE_SSTRUCT_VARIABLE_NODE};
          for (i = 0; i < nparts; i++)
+         {
             HYPRE_SStructGridSetVariables(grid, i, nvars, vartypes);
+         }
       }
 
       /* Set the ordering of the variables in the finite element problem.  This
@@ -270,10 +276,13 @@ int main (int argc, char *argv[])
          element's center.  See the Reference Manual for more details. */
       {
          int part = myid;
-         int ordering[12] = { 0, -1, -1,    /*    [3]------[2] */
-                              0, +1, -1,    /*    /        /   */
-                              0, +1, +1,    /*   /        /    */
-                              0, -1, +1 };  /* [0]------[1]    */
+         int ordering[12] =
+         {
+            0, -1, -1,    /*    [3]------[2] */
+            0, +1, -1,    /*    /        /   */
+            0, +1, +1,    /*   /        /    */
+            0, -1, +1     /* [0]------[1]    */
+         };
 
          HYPRE_SStructGridSetFEMOrdering(grid, part, ordering);
       }
@@ -288,19 +297,19 @@ int main (int argc, char *argv[])
          {
             int part = myid;
             /* the box of cells intersecting the boundary in the current part */
-            int ilower[2] = {1,1}, iupper[2] = {1,n};
+            int ilower[2] = {1, 1}, iupper[2] = {1, n};
             /* share all data on the left side of the box */
-            int offset[2] = {-1,0};
+            int offset[2] = {-1, 0};
 
-            int shared_part = (myid+1) % num_procs;
+            int shared_part = (myid + 1) % num_procs;
             /* the box of cells intersecting the boundary in the neighbor */
-            int shared_ilower[2] = {1,1}, shared_iupper[2] = {n,1};
+            int shared_ilower[2] = {1, 1}, shared_iupper[2] = {n, 1};
             /* share all data on the bottom of the box */
-            int shared_offset[2] = {0,-1};
+            int shared_offset[2] = {0, -1};
 
             /* x/y-direction on the current part is -y/x on the neighbor */
-            int index_map[2] = {1,0};
-            int index_dir[2] = {-1,1};
+            int index_map[2] = {1, 0};
+            int index_dir[2] = {-1, 1};
 
             HYPRE_SStructGridSetSharedPart(grid, part, ilower, iupper, offset,
                                            shared_part, shared_ilower,
@@ -314,19 +323,19 @@ int main (int argc, char *argv[])
          {
             int part = myid;
             /* the box of cells intersecting the boundary in the current part */
-            int ilower[2] = {1,1}, iupper[2] = {n,1};
+            int ilower[2] = {1, 1}, iupper[2] = {n, 1};
             /* share all data on the bottom of the box */
-            int offset[2] = {0,-1};
+            int offset[2] = {0, -1};
 
-            int shared_part = (myid+num_procs-1) % num_procs;
+            int shared_part = (myid + num_procs - 1) % num_procs;
             /* the box of cells intersecting the boundary in the neighbor */
-            int shared_ilower[2] = {1,1}, shared_iupper[2] = {1,n};
+            int shared_ilower[2] = {1, 1}, shared_iupper[2] = {1, n};
             /* share all data on the left side of the box */
-            int shared_offset[2] = {-1,0};
+            int shared_offset[2] = {-1, 0};
 
             /* x/y-direction on the current part is y/-x on the neighbor */
-            int index_map[2] = {1,0};
-            int index_dir[2] = {1,-1};
+            int index_map[2] = {1, 0};
+            int index_dir[2] = {1, -1};
 
             HYPRE_SStructGridSetSharedPart(grid, part, ilower, iupper, offset,
                                            shared_part, shared_ilower,
@@ -339,29 +348,29 @@ int main (int argc, char *argv[])
          {
             int part = myid;
             /* the (one cell) box that touches the origin */
-            int ilower[2] = {1,1}, iupper[2] = {1,1};
+            int ilower[2] = {1, 1}, iupper[2] = {1, 1};
             /* share all data in the bottom left corner (i.e. the origin) */
-            int offset[2] = {-1,-1};
+            int offset[2] = {-1, -1};
 
             int shared_part;
             /* the box of one cell that touches the origin */
-            int shared_ilower[2] = {1,1}, shared_iupper[2] = {1,1};
+            int shared_ilower[2] = {1, 1}, shared_iupper[2] = {1, 1};
             /* share all data in the bottom left corner (i.e. the origin) */
-            int shared_offset[2] = {-1,-1};
+            int shared_offset[2] = {-1, -1};
 
             /* x/y-direction on the current part is -x/-y on the neighbor, but
                in this case the arguments are not really important since we are
                only sharing a point */
-            int index_map[2] = {0,1};
-            int index_dir[2] = {-1,-1};
+            int index_map[2] = {0, 1};
+            int index_dir[2] = {-1, -1};
 
-            for (shared_part = 0; shared_part < myid-1; shared_part++)
+            for (shared_part = 0; shared_part < myid - 1; shared_part++)
                HYPRE_SStructGridSetSharedPart(grid, part, ilower, iupper, offset,
                                               shared_part, shared_ilower,
                                               shared_iupper, shared_offset,
                                               index_map, index_dir);
 
-            for (shared_part = myid+2; shared_part < num_procs; shared_part++)
+            for (shared_part = myid + 2; shared_part < num_procs; shared_part++)
                HYPRE_SStructGridSetSharedPart(grid, part, ilower, iupper, offset,
                                               shared_part, shared_ilower,
                                               shared_iupper, shared_offset,
@@ -387,7 +396,9 @@ int main (int argc, char *argv[])
       /* Indicate that this problem uses finite element stiffness matrices and
          load vectors, instead of stencils. */
       for (part = 0; part < num_procs; part++)
+      {
          HYPRE_SStructGraphSetFEM(graph, part);
+      }
 
       /* The local stiffness matrix is full, so there is no need to call
          HYPRE_SStructGraphSetFEMSparsity to set its sparsity pattern. */
@@ -419,8 +430,8 @@ int main (int argc, char *argv[])
          /* local stifness matrix and load vector */
          /* OK to use constant-length arrays for CPUs */
          /* double S[4][4], F[4]; */
-         double *F = (double *) malloc(4*sizeof(double));
-         double *S_flat = (double *) malloc(16*sizeof(double));
+         double *F = (double *) malloc(4 * sizeof(double));
+         double *S_flat = (double *) malloc(16 * sizeof(double));
          double *S[4];
          S[0] = S_flat; S[1] = S[0] + 4; S[2] = S[1] + 4; S[3] = S[2] + 4;
 
@@ -532,14 +543,14 @@ int main (int argc, char *argv[])
    {
       int part = myid;
       int var = 0;
-      int nvalues = (n+1)*(n+1);
+      int nvalues = (n + 1) * (n + 1);
       double *values;
 
       /* Since the SetBoxValues() calls below set the values of the nodes in
          the upper-right corners of the cells, the nodal box should start
          from (0,0) instead of (1,1). */
-      int ilower[2] = {0,0};
-      int iupper[2] = {n,n};
+      int ilower[2] = {0, 0};
+      int iupper[2] = {n, n};
 
       values = (double*) calloc(nvalues, sizeof(double));
 
@@ -606,10 +617,10 @@ int main (int argc, char *argv[])
          char filename[255];
 
          int i, part = myid, var = 0;
-         int nvalues = (n+1)*(n+1);
+         int nvalues = (n + 1) * (n + 1);
          double *values = (double*) calloc(nvalues, sizeof(double));
-         int ilower[2] = {0,0};
-         int iupper[2] = {n,n};
+         int ilower[2] = {0, 0};
+         int iupper[2] = {n, n};
 
          /* get all local data (including a local copy of the shared values) */
          HYPRE_SStructVectorGetBoxValues(x, part, ilower, iupper,
@@ -631,7 +642,9 @@ int main (int argc, char *argv[])
 
          /* save solution */
          for (i = 0; i < nvalues; i++)
+         {
             fprintf(file, "%.14e\n", values[i]);
+         }
 
          fflush(file);
          fclose(file);
diff --git a/external/hypre/src/examples/ex15.c b/external/hypre/src/examples/ex15.c
index ead8babc..efdc9cc6 100644
--- a/external/hypre/src/examples/ex15.c
+++ b/external/hypre/src/examples/ex15.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -62,19 +62,27 @@ double alpha(double x, double y, double z)
       case 0: /* uniform coefficient */
          return 1.0;
       case 1: /* smooth coefficient */
-         return x*x+exp(y)+sin(z);
+         return x * x + exp(y) + sin(z);
       case 2: /* small outside of an interior cube */
-         if ((fabs(x-0.5) < 0.25) && (fabs(y-0.5) < 0.25) && (fabs(z-0.5) < 0.25))
+         if ((fabs(x - 0.5) < 0.25) && (fabs(y - 0.5) < 0.25) && (fabs(z - 0.5) < 0.25))
+         {
             return 1.0;
+         }
          else
+         {
             return 1.0e-6;
+         }
       case 3: /* small outside of an interior ball */
-         if (((x-0.5)*(x-0.5)+(y-0.5)*(y-0.5)+(z-0.5)*(z-0.5)) < 0.0625)
+         if (((x - 0.5) * (x - 0.5) + (y - 0.5) * (y - 0.5) + (z - 0.5) * (z - 0.5)) < 0.0625)
+         {
             return 1.0;
+         }
          else
+         {
             return 1.0e-6;
+         }
       case 4: /* random coefficient */
-         return ((double)rand()/RAND_MAX);
+         return ((double)rand() / RAND_MAX);
       default:
          return 1.0;
    }
@@ -88,19 +96,27 @@ double beta(double x, double y, double z)
       case 0: /* uniform coefficient */
          return 1.0;
       case 1: /* smooth coefficient */
-         return x*x+exp(y)+sin(z);
+         return x * x + exp(y) + sin(z);
       case 2:/* small outside of interior cube */
-         if ((fabs(x-0.5) < 0.25) && (fabs(y-0.5) < 0.25) && (fabs(z-0.5) < 0.25))
+         if ((fabs(x - 0.5) < 0.25) && (fabs(y - 0.5) < 0.25) && (fabs(z - 0.5) < 0.25))
+         {
             return 1.0;
+         }
          else
+         {
             return 1.0e-6;
+         }
       case 3: /* small outside of an interior ball */
-         if (((x-0.5)*(x-0.5)+(y-0.5)*(y-0.5)+(z-0.5)*(z-0.5)) < 0.0625)
+         if (((x - 0.5) * (x - 0.5) + (y - 0.5) * (y - 0.5) + (z - 0.5) * (z - 0.5)) < 0.0625)
+         {
             return 1.0;
+         }
          else
+         {
             return 1.0e-6;
+         }
       case 4: /* random coefficient */
-         return ((double)rand()/RAND_MAX);
+         return ((double)rand() / RAND_MAX);
       default:
          return 1.0;
    }
@@ -134,10 +150,10 @@ void ComputeFEMND1(double **S, double F[12],
 {
    int i, j;
 
-   double h2_4 = h*h/4;
+   double h2_4 = h * h / 4;
 
-   double cS1 = alpha(x,y,z)/(6.0*h), cS2 = 2*cS1, cS4 = 2*cS2;
-   double cM1 = beta(x,y,z)*h/36.0,   cM2 = 2*cM1, cM4 = 2*cM2;
+   double cS1 = alpha(x, y, z) / (6.0 * h), cS2 = 2 * cS1, cS4 = 2 * cS2;
+   double cM1 = beta(x, y, z) * h / 36.0,   cM2 = 2 * cM1, cM4 = 2 * cM2;
 
    S[ 0][ 0] =  cS4 + cM4;   S[ 0][ 1] =  cS2;         S[ 0][ 2] = -cS1 + cM2;
    S[ 0][ 3] = -cS2;         S[ 0][ 4] = -cS1 + cM2;   S[ 0][ 5] =  cS1;
@@ -184,10 +200,14 @@ void ComputeFEMND1(double **S, double F[12],
    /* The stiffness matrix is symmetric */
    for (i = 1; i < 12; i++)
       for (j = 0; j < i; j++)
+      {
          S[i][j] = S[j][i];
+      }
 
    for (i = 0; i < 12; i++)
+   {
       F[i] = h2_4;
+   }
 }
 
 
@@ -227,7 +247,7 @@ int main (int argc, char *argv[])
    MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
 
    /* Initialize HYPRE */
-   HYPRE_Init();
+   HYPRE_Initialize();
 
    /* Print GPU info */
    /* HYPRE_PrintDeviceInfo(); */
@@ -399,18 +419,18 @@ int main (int argc, char *argv[])
 
    /* Figure out the processor grid (N x N x N).  The local problem size is n^3,
       while pi, pj and pk indicate the position in the processor grid. */
-   N  = pow(num_procs,1.0/3.0) + 0.5;
-   if (num_procs != N*N*N)
+   N  = pow(num_procs, 1.0 / 3.0) + 0.5;
+   if (num_procs != N * N * N)
    {
       if (myid == 0) printf("Can't run on %d processors, try %d.\n",
-                            num_procs, N*N*N);
+                               num_procs, N * N * N);
       MPI_Finalize();
       exit(1);
    }
-   h  = 1.0 / (N*n);
-   pk = myid / (N*N);
-   pj = myid/N - pk*N;
-   pi = myid - pj*N - pk*N*N;
+   h  = 1.0 / (N * n);
+   pk = myid / (N * N);
+   pj = myid / N - pk * N;
+   pi = myid - pj * N - pk * N * N;
 
    /* Start timing */
    mytime -= MPI_Wtime();
@@ -429,8 +449,8 @@ int main (int argc, char *argv[])
       /* Set the extents of the grid - each processor sets its grid boxes. */
       {
          int part = 0;
-         int ilower[3] = {1 + pi*n, 1 + pj*n, 1 + pk*n};
-         int iupper[3] = {n + pi*n, n + pj*n, n + pk*n};
+         int ilower[3] = {1 + pi * n, 1 + pj * n, 1 + pk * n};
+         int iupper[3] = {n + pi * n, n + pj * n, n + pk * n};
 
          HYPRE_SStructGridSetExtents(node_grid, part, ilower, iupper);
          HYPRE_SStructGridSetExtents(edge_grid, part, ilower, iupper);
@@ -445,7 +465,8 @@ int main (int argc, char *argv[])
          HYPRE_SStructVariable nodevars[1] = {HYPRE_SSTRUCT_VARIABLE_NODE};
          HYPRE_SStructVariable edgevars[3] = {HYPRE_SSTRUCT_VARIABLE_XEDGE,
                                               HYPRE_SSTRUCT_VARIABLE_YEDGE,
-                                              HYPRE_SSTRUCT_VARIABLE_ZEDGE};
+                                              HYPRE_SSTRUCT_VARIABLE_ZEDGE
+                                             };
          for (i = 0; i < nparts; i++)
          {
             HYPRE_SStructGridSetVariables(node_grid, i, nnodevars, nodevars);
@@ -471,18 +492,21 @@ int main (int argc, char *argv[])
          is done by listing the variable offset directions relative to the
          element's center.  See the Reference Manual for more details. */
       {
-         int ordering[48] =       { 0,  0, -1, -1,    /* x-edge [0]-[1] */
-                                    1, +1,  0, -1,    /* y-edge [1]-[2] */
-         /*     [7]------[6]  */    0,  0, +1, -1,    /* x-edge [3]-[2] */
-         /*     /|       /|   */    1, -1,  0, -1,    /* y-edge [0]-[3] */
-         /*    / |      / |   */    0,  0, -1, +1,    /* x-edge [4]-[5] */
-         /*  [4]------[5] |   */    1, +1,  0, +1,    /* y-edge [5]-[6] */
-         /*   | [3]----|-[2]  */    0,  0, +1, +1,    /* x-edge [7]-[6] */
-         /*   | /      | /    */    1, -1,  0, +1,    /* y-edge [4]-[7] */
-         /*   |/       |/     */    2, -1, -1,  0,    /* z-edge [0]-[4] */
-         /*  [0]------[1]     */    2, +1, -1,  0,    /* z-edge [1]-[5] */
-                                    2, +1, +1,  0,    /* z-edge [2]-[6] */
-                                    2, -1, +1,  0 };  /* z-edge [3]-[7] */
+         int ordering[48] =
+         {
+            0,  0, -1, -1,    /* x-edge [0]-[1]                  */
+            1, +1,  0, -1,    /* y-edge [1]-[2]                  */
+            0,  0, +1, -1,    /* x-edge [3]-[2]     [7]------[6] */
+            1, -1,  0, -1,    /* y-edge [0]-[3]     /|       /|  */
+            0,  0, -1, +1,    /* x-edge [4]-[5]    / |      / |  */
+            1, +1,  0, +1,    /* y-edge [5]-[6]  [4]------[5] |  */
+            0,  0, +1, +1,    /* x-edge [7]-[6]   | [3]----|-[2] */
+            1, -1,  0, +1,    /* y-edge [4]-[7]   | /      | /   */
+            2, -1, -1,  0,    /* z-edge [0]-[4]   |/       |/    */
+            2, +1, -1,  0,    /* z-edge [1]-[5]  [0]------[1]    */
+            2, +1, +1,  0,    /* z-edge [2]-[6]                  */
+            2, -1, +1,  0     /* z-edge [3]-[7]                  */
+         };
 
          HYPRE_SStructGridSetFEMOrdering(edge_grid, part, ordering);
       }
@@ -531,8 +555,8 @@ int main (int argc, char *argv[])
          /* local stiffness matrix and load vector */
          /* OK to use constant-length arrays for CPUs */
          /* double S[12][12], F[12]; */
-         double *F = (double *) malloc(12*sizeof(double));
-         double *S_flat = (double *) malloc(12*12*sizeof(double));
+         double *F = (double *) malloc(12 * sizeof(double));
+         double *S_flat = (double *) malloc(12 * 12 * sizeof(double));
          double *S[12];
 
          int i, j, k;
@@ -540,7 +564,7 @@ int main (int argc, char *argv[])
 
          for (i = 0; i < 12; i++)
          {
-            S[i] = &S_flat[i*12];
+            S[i] = &S_flat[i * 12];
          }
 
          for (i = 1; i <= n; i++)
@@ -551,8 +575,11 @@ int main (int argc, char *argv[])
                {
                   /* Compute the FEM matrix and r.h.s. for cell (i,j,k) with
                      coefficients evaluated at the cell center. */
-                  index[0] = i + pi*n; index[1] = j + pj*n; index[2] = k + pk*n;
-                  ComputeFEMND1(S,F,(pi*n+i)*h-h/2,(pj*n+j)*h-h/2,(pk*n+k)*h-h/2,h);
+                  index[0] = i + pi * n; index[1] = j + pj * n; index[2] = k + pk * n;
+                  ComputeFEMND1(S, F,
+                                (pi * n + i)*h - h / 2,
+                                (pj * n + j)*h - h / 2,
+                                (pk * n + k)*h - h / 2, h);
 
                   /* Eliminate boundary conditions on x = 0 */
                   if (index[0] == 1)
@@ -561,7 +588,9 @@ int main (int argc, char *argv[])
                      for (ii = 0; ii < 4; ii++)
                      {
                         for (jj = 0; jj < 12; jj++)
+                        {
                            S[bc_edges[ii]][jj] = S[jj][bc_edges[ii]] = 0.0;
+                        }
                         S[bc_edges[ii]][bc_edges[ii]] = 1.0;
                         F[bc_edges[ii]] = 0.0;
                      }
@@ -573,7 +602,9 @@ int main (int argc, char *argv[])
                      for (ii = 0; ii < 4; ii++)
                      {
                         for (jj = 0; jj < 12; jj++)
+                        {
                            S[bc_edges[ii]][jj] = S[jj][bc_edges[ii]] = 0.0;
+                        }
                         S[bc_edges[ii]][bc_edges[ii]] = 1.0;
                         F[bc_edges[ii]] = 0.0;
                      }
@@ -585,43 +616,51 @@ int main (int argc, char *argv[])
                      for (ii = 0; ii < 4; ii++)
                      {
                         for (jj = 0; jj < 12; jj++)
+                        {
                            S[bc_edges[ii]][jj] = S[jj][bc_edges[ii]] = 0.0;
+                        }
                         S[bc_edges[ii]][bc_edges[ii]] = 1.0;
                         F[bc_edges[ii]] = 0.0;
                      }
                   }
                   /* Eliminate boundary conditions on x = 1 */
-                  if (index[0] == N*n)
+                  if (index[0] == N * n)
                   {
                      int ii, jj, bc_edges[4] = { 1, 10, 5, 9 };
                      for (ii = 0; ii < 4; ii++)
                      {
                         for (jj = 0; jj < 12; jj++)
+                        {
                            S[bc_edges[ii]][jj] = S[jj][bc_edges[ii]] = 0.0;
+                        }
                         S[bc_edges[ii]][bc_edges[ii]] = 1.0;
                         F[bc_edges[ii]] = 0.0;
                      }
                   }
                   /* Eliminate boundary conditions on y = 1 */
-                  if (index[1] == N*n)
+                  if (index[1] == N * n)
                   {
                      int ii, jj, bc_edges[4] = { 2, 10, 6, 11 };
                      for (ii = 0; ii < 4; ii++)
                      {
                         for (jj = 0; jj < 12; jj++)
+                        {
                            S[bc_edges[ii]][jj] = S[jj][bc_edges[ii]] = 0.0;
+                        }
                         S[bc_edges[ii]][bc_edges[ii]] = 1.0;
                         F[bc_edges[ii]] = 0.0;
                      }
                   }
                   /* Eliminate boundary conditions on z = 1 */
-                  if (index[2] == N*n)
+                  if (index[2] == N * n)
                   {
                      int ii, jj, bc_edges[4] = { 4, 5, 6, 7 };
                      for (ii = 0; ii < 4; ii++)
                      {
                         for (jj = 0; jj < 12; jj++)
+                        {
                            S[bc_edges[ii]][jj] = S[jj][bc_edges[ii]] = 0.0;
+                        }
                         S[bc_edges[ii]][bc_edges[ii]] = 1.0;
                         F[bc_edges[ii]] = 0.0;
                      }
@@ -657,9 +696,9 @@ int main (int argc, char *argv[])
          int var = 0; /* the node variable */
 
          /* The discrete gradient stencils connect edge to node variables. */
-         int Gx_offsets[2][3] = {{-1,0,0},{0,0,0}};  /* x-edge [7]-[6] */
-         int Gy_offsets[2][3] = {{0,-1,0},{0,0,0}};  /* y-edge [5]-[6] */
-         int Gz_offsets[2][3] = {{0,0,-1},{0,0,0}};  /* z-edge [2]-[6] */
+         int Gx_offsets[2][3] = {{-1, 0, 0}, {0, 0, 0}}; /* x-edge [7]-[6] */
+         int Gy_offsets[2][3] = {{0, -1, 0}, {0, 0, 0}}; /* y-edge [5]-[6] */
+         int Gz_offsets[2][3] = {{0, 0, -1}, {0, 0, 0}}; /* z-edge [2]-[6] */
 
          HYPRE_SStructStencilCreate(ndim, stencil_size, &G_stencil[0]);
          HYPRE_SStructStencilCreate(ndim, stencil_size, &G_stencil[1]);
@@ -692,7 +731,9 @@ int main (int argc, char *argv[])
          /* Tell the graph which stencil to use for each edge variable on each
             part (we only have one part). */
          for (var = 0; var < nvars; var++)
+         {
             HYPRE_SStructGraphSetStencil(G_graph, part, var, G_stencil[var]);
+         }
 
          /* Assemble the graph */
          HYPRE_SStructGraphAssemble(G_graph);
@@ -712,24 +753,24 @@ int main (int argc, char *argv[])
          the edges (i.e. one in agreement with the coordinate directions). */
       {
          int i;
-         int nedges = n*(n+1)*(n+1);
+         int nedges = n * (n + 1) * (n + 1);
          double *values;
-         int stencil_indices[2] = {0,1}; /* the nodes of each edge */
+         int stencil_indices[2] = {0, 1}; /* the nodes of each edge */
 
-         values = (double*) calloc(2*nedges, sizeof(double));
+         values = (double*) calloc(2 * nedges, sizeof(double));
 
          /* The edge orientation is fixed: from first to second node */
          for (i = 0; i < nedges; i++)
          {
-            values[2*i]   = -1.0;
-            values[2*i+1] =  1.0;
+            values[2 * i]   = -1.0;
+            values[2 * i + 1] =  1.0;
          }
 
          /* Set the values in the discrete gradient x-edges */
          {
             int var = 0;
-            int ilower[3] = {1 + pi*n, 0 + pj*n, 0 + pk*n};
-            int iupper[3] = {n + pi*n, n + pj*n, n + pk*n};
+            int ilower[3] = {1 + pi * n, 0 + pj * n, 0 + pk * n};
+            int iupper[3] = {n + pi * n, n + pj * n, n + pk * n};
             HYPRE_SStructMatrixSetBoxValues(G, part, ilower, iupper, var,
                                             stencil_size, stencil_indices,
                                             values);
@@ -737,8 +778,8 @@ int main (int argc, char *argv[])
          /* Set the values in the discrete gradient y-edges */
          {
             int var = 1;
-            int ilower[3] = {0 + pi*n, 1 + pj*n, 0 + pk*n};
-            int iupper[3] = {n + pi*n, n + pj*n, n + pk*n};
+            int ilower[3] = {0 + pi * n, 1 + pj * n, 0 + pk * n};
+            int iupper[3] = {n + pi * n, n + pj * n, n + pk * n};
             HYPRE_SStructMatrixSetBoxValues(G, part, ilower, iupper, var,
                                             stencil_size, stencil_indices,
                                             values);
@@ -746,8 +787,8 @@ int main (int argc, char *argv[])
          /* Set the values in the discrete gradient z-edges */
          {
             int var = 2;
-            int ilower[3] = {0 + pi*n, 0 + pj*n, 1 + pk*n};
-            int iupper[3] = {n + pi*n, n + pj*n, n + pk*n};
+            int ilower[3] = {0 + pi * n, 0 + pj * n, 1 + pk * n};
+            int iupper[3] = {n + pi * n, n + pj * n, n + pk * n};
             HYPRE_SStructMatrixSetBoxValues(G, part, ilower, iupper, var,
                                             stencil_size, stencil_indices,
                                             values);
@@ -767,7 +808,7 @@ int main (int argc, char *argv[])
       int part = 0;
       int var = 0; /* the node variable */
       int index[3];
-      double *xyzval = (double *) malloc(3*sizeof(double));
+      double *xyzval = (double *) malloc(3 * sizeof(double));
 
       /* Create empty vector objects */
       HYPRE_SStructVectorCreate(MPI_COMM_WORLD, node_grid, &xcoord);
@@ -787,11 +828,11 @@ int main (int argc, char *argv[])
          for (j = 0; j <= n; j++)
             for (k = 0; k <= n; k++)
             {
-               index[0] = i + pi*n; index[1] = j + pj*n; index[2] = k + pk*n;
+               index[0] = i + pi * n; index[1] = j + pj * n; index[2] = k + pk * n;
 
-               xyzval[0] = index[0]*h;
-               xyzval[1] = index[1]*h;
-               xyzval[2] = index[2]*h;
+               xyzval[0] = index[0] * h;
+               xyzval[1] = index[1] * h;
+               xyzval[2] = index[2] * h;
 
                HYPRE_SStructVectorSetValues(xcoord, part, index, var, &xyzval[0]);
                HYPRE_SStructVectorSetValues(ycoord, part, index, var, &xyzval[1]);
@@ -808,7 +849,7 @@ int main (int argc, char *argv[])
    /* 5. Set up a SStruct Vector for the solution vector x */
    {
       int part = 0;
-      int nvalues = n*(n+1)*(n+1);
+      int nvalues = n * (n + 1) * (n + 1);
       double *values;
 
       values = (double*) calloc(nvalues, sizeof(double));
@@ -823,22 +864,22 @@ int main (int argc, char *argv[])
       /* Set the values for the initial guess x-edge */
       {
          int var = 0;
-         int ilower[3] = {1 + pi*n, 0 + pj*n, 0 + pk*n};
-         int iupper[3] = {n + pi*n, n + pj*n, n + pk*n};
+         int ilower[3] = {1 + pi * n, 0 + pj * n, 0 + pk * n};
+         int iupper[3] = {n + pi * n, n + pj * n, n + pk * n};
          HYPRE_SStructVectorSetBoxValues(x, part, ilower, iupper, var, values);
       }
       /* Set the values for the initial guess y-edge */
       {
          int var = 1;
-         int ilower[3] = {0 + pi*n, 1 + pj*n, 0 + pk*n};
-         int iupper[3] = {n + pi*n, n + pj*n, n + pk*n};
+         int ilower[3] = {0 + pi * n, 1 + pj * n, 0 + pk * n};
+         int iupper[3] = {n + pi * n, n + pj * n, n + pk * n};
          HYPRE_SStructVectorSetBoxValues(x, part, ilower, iupper, var, values);
       }
       /* Set the values for the initial guess z-edge */
       {
          int var = 2;
-         int ilower[3] = {0 + pi*n, 0 + pj*n, 1 + pk*n};
-         int iupper[3] = {n + pi*n, n + pj*n, n + pk*n};
+         int ilower[3] = {0 + pi * n, 0 + pj * n, 1 + pk * n};
+         int iupper[3] = {n + pi * n, n + pj * n, n + pk * n};
          HYPRE_SStructVectorSetBoxValues(x, part, ilower, iupper, var, values);
       }
 
@@ -917,7 +958,9 @@ int main (int argc, char *argv[])
                                     par_xcoord, par_ycoord, par_zcoord);
 
       if (singular_problem)
+      {
          HYPRE_AMSSetBetaPoissonMatrix(precond, NULL);
+      }
 
       /* Smoothing and AMG options */
       HYPRE_AMSSetSmoothingOptions(precond,
@@ -982,7 +1025,7 @@ int main (int argc, char *argv[])
          char  filename[255];
 
          int part = 0;
-         int nvalues = n*(n+1)*(n+1);
+         int nvalues = n * (n + 1) * (n + 1);
          double *xvalues, *yvalues, *zvalues;
 
          xvalues = (double*) calloc(nvalues, sizeof(double));
@@ -992,24 +1035,24 @@ int main (int argc, char *argv[])
          /* Get local solution in the x-edges */
          {
             int var = 0;
-            int ilower[3] = {1 + pi*n, 0 + pj*n, 0 + pk*n};
-            int iupper[3] = {n + pi*n, n + pj*n, n + pk*n};
+            int ilower[3] = {1 + pi * n, 0 + pj * n, 0 + pk * n};
+            int iupper[3] = {n + pi * n, n + pj * n, n + pk * n};
             HYPRE_SStructVectorGetBoxValues(x, part, ilower, iupper,
                                             var, xvalues);
          }
          /* Get local solution in the y-edges */
          {
             int var = 1;
-            int ilower[3] = {0 + pi*n, 1 + pj*n, 0 + pk*n};
-            int iupper[3] = {n + pi*n, n + pj*n, n + pk*n};
+            int ilower[3] = {0 + pi * n, 1 + pj * n, 0 + pk * n};
+            int iupper[3] = {n + pi * n, n + pj * n, n + pk * n};
             HYPRE_SStructVectorGetBoxValues(x, part, ilower, iupper,
                                             var, yvalues);
          }
          /* Get local solution in the z-edges */
          {
             int var = 2;
-            int ilower[3] = {0 + pi*n, 0 + pj*n, 1 + pk*n};
-            int iupper[3] = {n + pi*n, n + pj*n, n + pk*n};
+            int ilower[3] = {0 + pi * n, 0 + pj * n, 1 + pk * n};
+            int iupper[3] = {n + pi * n, n + pj * n, n + pk * n};
             HYPRE_SStructVectorGetBoxValues(x, part, ilower, iupper,
                                             var, zvalues);
          }
@@ -1034,9 +1077,9 @@ int main (int argc, char *argv[])
             int i, j, k, s;
 
             /* Initial x-, y- and z-edge indices in the values arrays */
-            int oi[4] = { 0, n, n*(n+1), n*(n+1)+n }; /* e_0, e_2,  e_4,  e_6 */
-            int oj[4] = { 0, 1, n*(n+1), n*(n+1)+1 }; /* e_3, e_1,  e_7,  e_5 */
-            int ok[4] = { 0, 1,     n+1,       n+2 }; /* e_8, e_9, e_11, e_10 */
+            int oi[4] = { 0, n, n*(n + 1), n*(n + 1) + n }; /* e_0, e_2,  e_4,  e_6 */
+            int oj[4] = { 0, 1, n*(n + 1), n*(n + 1) + 1 }; /* e_3, e_1,  e_7,  e_5 */
+            int ok[4] = { 0, 1,     n + 1,       n + 2 }; /* e_8, e_9, e_11, e_10 */
             /* Loop over the cells while updating the above offsets */
             for (k = 0; k < n; k++)
             {
@@ -1052,11 +1095,11 @@ int main (int argc, char *argv[])
                              xvalues[oi[2]], yvalues[oj[3]], xvalues[oi[3]], yvalues[oj[2]],
                              zvalues[ok[0]], zvalues[ok[1]], zvalues[ok[3]], zvalues[ok[2]]);
 
-                     for (s=0; s<4; s++) oi[s]++, oj[s]++, ok[s]++;
+                     for (s = 0; s < 4; s++) { oi[s]++, oj[s]++, ok[s]++; }
                   }
-                  for (s=0; s<4; s++) oj[s]++, ok[s]++;
+                  for (s = 0; s < 4; s++) { oj[s]++, ok[s]++; }
                }
-               for (s=0; s<4; s++) oi[s]+=n, ok[s]+=n+1;
+               for (s = 0; s < 4; s++) { oi[s] += n, ok[s] += n + 1; }
             }
          }
 
@@ -1068,7 +1111,7 @@ int main (int argc, char *argv[])
 
          /* Save local finite element mesh */
          GLVis_PrintLocalCubicMesh("vis/ex15.mesh", n, n, n, h,
-                                   pi*h*n, pj*h*n, pk*h*n, myid);
+                                   pi * h * n, pj * h * n, pk * h * n, myid);
 
          /* Additional visualization data */
          GLVis_PrintData("vis/ex15.data", myid, num_procs);
diff --git a/external/hypre/src/examples/ex15big.c b/external/hypre/src/examples/ex15big.c
index 7d24d082..6c1301c0 100644
--- a/external/hypre/src/examples/ex15big.c
+++ b/external/hypre/src/examples/ex15big.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -53,19 +53,27 @@ double alpha(double x, double y, double z)
       case 0: /* uniform coefficient */
          return 1.0;
       case 1: /* smooth coefficient */
-         return x*x+exp(y)+sin(z);
+         return x * x + exp(y) + sin(z);
       case 2: /* small outside of an interior cube */
-         if ((fabs(x-0.5) < 0.25) && (fabs(y-0.5) < 0.25) && (fabs(z-0.5) < 0.25))
+         if ((fabs(x - 0.5) < 0.25) && (fabs(y - 0.5) < 0.25) && (fabs(z - 0.5) < 0.25))
+         {
             return 1.0;
+         }
          else
+         {
             return 1.0e-6;
+         }
       case 3: /* small outside of an interior ball */
-         if (((x-0.5)*(x-0.5)+(y-0.5)*(y-0.5)+(z-0.5)*(z-0.5)) < 0.0625)
+         if (((x - 0.5) * (x - 0.5) + (y - 0.5) * (y - 0.5) + (z - 0.5) * (z - 0.5)) < 0.0625)
+         {
             return 1.0;
+         }
          else
+         {
             return 1.0e-6;
+         }
       case 4: /* random coefficient */
-         return ((double)rand()/RAND_MAX);
+         return ((double)rand() / RAND_MAX);
       default:
          return 1.0;
    }
@@ -79,19 +87,27 @@ double beta(double x, double y, double z)
       case 0: /* uniform coefficient */
          return 1.0;
       case 1: /* smooth coefficient */
-         return x*x+exp(y)+sin(z);
+         return x * x + exp(y) + sin(z);
       case 2:/* small outside of interior cube */
-         if ((fabs(x-0.5) < 0.25) && (fabs(y-0.5) < 0.25) && (fabs(z-0.5) < 0.25))
+         if ((fabs(x - 0.5) < 0.25) && (fabs(y - 0.5) < 0.25) && (fabs(z - 0.5) < 0.25))
+         {
             return 1.0;
+         }
          else
+         {
             return 1.0e-6;
+         }
       case 3: /* small outside of an interior ball */
-         if (((x-0.5)*(x-0.5)+(y-0.5)*(y-0.5)+(z-0.5)*(z-0.5)) < 0.0625)
+         if (((x - 0.5) * (x - 0.5) + (y - 0.5) * (y - 0.5) + (z - 0.5) * (z - 0.5)) < 0.0625)
+         {
             return 1.0;
+         }
          else
+         {
             return 1.0e-6;
+         }
       case 4: /* random coefficient */
-         return ((double)rand()/RAND_MAX);
+         return ((double)rand() / RAND_MAX);
       default:
          return 1.0;
    }
@@ -125,10 +141,10 @@ void ComputeFEMND1(double S[12][12], double F[12],
 {
    int i, j;
 
-   double h2_4 = h*h/4;
+   double h2_4 = h * h / 4;
 
-   double cS1 = alpha(x,y,z)/(6.0*h), cS2 = 2*cS1, cS4 = 2*cS2;
-   double cM1 = beta(x,y,z)*h/36.0,   cM2 = 2*cM1, cM4 = 2*cM2;
+   double cS1 = alpha(x, y, z) / (6.0 * h), cS2 = 2 * cS1, cS4 = 2 * cS2;
+   double cM1 = beta(x, y, z) * h / 36.0,   cM2 = 2 * cM1, cM4 = 2 * cM2;
 
    S[ 0][ 0] =  cS4 + cM4;   S[ 0][ 1] =  cS2;         S[ 0][ 2] = -cS1 + cM2;
    S[ 0][ 3] = -cS2;         S[ 0][ 4] = -cS1 + cM2;   S[ 0][ 5] =  cS1;
@@ -175,10 +191,14 @@ void ComputeFEMND1(double S[12][12], double F[12],
    /* The stiffness matrix is symmetric */
    for (i = 1; i < 12; i++)
       for (j = 0; j < i; j++)
+      {
          S[i][j] = S[j][i];
+      }
 
    for (i = 0; i < 12; i++)
+   {
       F[i] = h2_4;
+   }
 }
 
 
@@ -217,7 +237,7 @@ int main (int argc, char *argv[])
    MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
 
    /* Initialize HYPRE */
-   HYPRE_Init();
+   HYPRE_Initialize();
 
    /* Print GPU info */
    /* HYPRE_PrintDeviceInfo(); */
@@ -382,18 +402,18 @@ int main (int argc, char *argv[])
 
    /* Figure out the processor grid (N x N x N).  The local problem size is n^3,
       while pi, pj and pk indicate the position in the processor grid. */
-   N  = pow(num_procs,1.0/3.0) + 0.5;
-   if (num_procs != N*N*N)
+   N  = pow(num_procs, 1.0 / 3.0) + 0.5;
+   if (num_procs != N * N * N)
    {
       if (myid == 0) printf("Can't run on %d processors, try %d.\n",
-                            num_procs, N*N*N);
+                               num_procs, N * N * N);
       MPI_Finalize();
       exit(1);
    }
-   h  = 1.0 / (N*n);
-   pk = myid / (N*N);
-   pj = myid/N - pk*N;
-   pi = myid - pj*N - pk*N*N;
+   h  = 1.0 / (N * n);
+   pk = myid / (N * N);
+   pj = myid / N - pk * N;
+   pi = myid - pj * N - pk * N * N;
 
    /* Start timing */
    mytime -= MPI_Wtime();
@@ -412,8 +432,8 @@ int main (int argc, char *argv[])
       /* Set the extents of the grid - each processor sets its grid boxes. */
       {
          HYPRE_Int part = 0;
-         HYPRE_Int ilower[3] = {1 + pi*n, 1 + pj*n, 1 + pk*n};
-         HYPRE_Int iupper[3] = {n + pi*n, n + pj*n, n + pk*n};
+         HYPRE_Int ilower[3] = {1 + pi * n, 1 + pj * n, 1 + pk * n};
+         HYPRE_Int iupper[3] = {n + pi * n, n + pj * n, n + pk * n};
 
          HYPRE_SStructGridSetExtents(node_grid, part, ilower, iupper);
          HYPRE_SStructGridSetExtents(edge_grid, part, ilower, iupper);
@@ -428,7 +448,8 @@ int main (int argc, char *argv[])
          HYPRE_SStructVariable nodevars[1] = {HYPRE_SSTRUCT_VARIABLE_NODE};
          HYPRE_SStructVariable edgevars[3] = {HYPRE_SSTRUCT_VARIABLE_XEDGE,
                                               HYPRE_SSTRUCT_VARIABLE_YEDGE,
-                                              HYPRE_SSTRUCT_VARIABLE_ZEDGE};
+                                              HYPRE_SSTRUCT_VARIABLE_ZEDGE
+                                             };
          for (i = 0; i < nparts; i++)
          {
             HYPRE_SStructGridSetVariables(node_grid, i, nnodevars, nodevars);
@@ -454,18 +475,21 @@ int main (int argc, char *argv[])
          is done by listing the variable offset directions relative to the
          element's center.  See the Reference Manual for more details. */
       {
-         HYPRE_Int ordering[48] = { 0,  0, -1, -1,    /* x-edge [0]-[1] */
-                                    1, +1,  0, -1,    /* y-edge [1]-[2] */
-         /*     [7]------[6]  */    0,  0, +1, -1,    /* x-edge [3]-[2] */
-         /*     /|       /|   */    1, -1,  0, -1,    /* y-edge [0]-[3] */
-         /*    / |      / |   */    0,  0, -1, +1,    /* x-edge [4]-[5] */
-         /*  [4]------[5] |   */    1, +1,  0, +1,    /* y-edge [5]-[6] */
-         /*   | [3]----|-[2]  */    0,  0, +1, +1,    /* x-edge [7]-[6] */
-         /*   | /      | /    */    1, -1,  0, +1,    /* y-edge [4]-[7] */
-         /*   |/       |/     */    2, -1, -1,  0,    /* z-edge [0]-[4] */
-         /*  [0]------[1]     */    2, +1, -1,  0,    /* z-edge [1]-[5] */
-                                    2, +1, +1,  0,    /* z-edge [2]-[6] */
-                                    2, -1, +1,  0 };  /* z-edge [3]-[7] */
+         HYPRE_Int ordering[48] =
+         {
+            0,  0, -1, -1,    /* x-edge [0]-[1]                  */
+            1, +1,  0, -1,    /* y-edge [1]-[2]                  */
+            0,  0, +1, -1,    /* x-edge [3]-[2]     [7]------[6] */
+            1, -1,  0, -1,    /* y-edge [0]-[3]     /|       /|  */
+            0,  0, -1, +1,    /* x-edge [4]-[5]    / |      / |  */
+            1, +1,  0, +1,    /* y-edge [5]-[6]  [4]------[5] |  */
+            0,  0, +1, +1,    /* x-edge [7]-[6]   | [3]----|-[2] */
+            1, -1,  0, +1,    /* y-edge [4]-[7]   | /      | /   */
+            2, -1, -1,  0,    /* z-edge [0]-[4]   |/       |/    */
+            2, +1, -1,  0,    /* z-edge [1]-[5]  [0]------[1]    */
+            2, +1, +1,  0,    /* z-edge [2]-[6]                  */
+            2, -1, +1,  0     /* z-edge [3]-[7]                  */
+         };
 
          HYPRE_SStructGridSetFEMOrdering(edge_grid, part, ordering);
       }
@@ -523,8 +547,11 @@ int main (int argc, char *argv[])
                {
                   /* Compute the FEM matrix and r.h.s. for cell (i,j,k) with
                      coefficients evaluated at the cell center. */
-                  index[0] = i + pi*n; index[1] = j + pj*n; index[2] = k + pk*n;
-                  ComputeFEMND1(S,F,(pi*n+i)*h-h/2,(pj*n+j)*h-h/2,(pk*n+k)*h-h/2,h);
+                  index[0] = i + pi * n; index[1] = j + pj * n; index[2] = k + pk * n;
+                  ComputeFEMND1(S, F,
+                                (pi * n + i)*h - h / 2,
+                                (pj * n + j)*h - h / 2,
+                                (pk * n + k)*h - h / 2, h);
 
                   /* Eliminate boundary conditions on x = 0 */
                   if (index[0] == 1)
@@ -533,7 +560,9 @@ int main (int argc, char *argv[])
                      for (ii = 0; ii < 4; ii++)
                      {
                         for (jj = 0; jj < 12; jj++)
+                        {
                            S[bc_edges[ii]][jj] = S[jj][bc_edges[ii]] = 0.0;
+                        }
                         S[bc_edges[ii]][bc_edges[ii]] = 1.0;
                         F[bc_edges[ii]] = 0.0;
                      }
@@ -545,7 +574,9 @@ int main (int argc, char *argv[])
                      for (ii = 0; ii < 4; ii++)
                      {
                         for (jj = 0; jj < 12; jj++)
+                        {
                            S[bc_edges[ii]][jj] = S[jj][bc_edges[ii]] = 0.0;
+                        }
                         S[bc_edges[ii]][bc_edges[ii]] = 1.0;
                         F[bc_edges[ii]] = 0.0;
                      }
@@ -557,43 +588,51 @@ int main (int argc, char *argv[])
                      for (ii = 0; ii < 4; ii++)
                      {
                         for (jj = 0; jj < 12; jj++)
+                        {
                            S[bc_edges[ii]][jj] = S[jj][bc_edges[ii]] = 0.0;
+                        }
                         S[bc_edges[ii]][bc_edges[ii]] = 1.0;
                         F[bc_edges[ii]] = 0.0;
                      }
                   }
                   /* Eliminate boundary conditions on x = 1 */
-                  if (index[0] == N*n)
+                  if (index[0] == N * n)
                   {
                      int ii, jj, bc_edges[4] = { 1, 10, 5, 9 };
                      for (ii = 0; ii < 4; ii++)
                      {
                         for (jj = 0; jj < 12; jj++)
+                        {
                            S[bc_edges[ii]][jj] = S[jj][bc_edges[ii]] = 0.0;
+                        }
                         S[bc_edges[ii]][bc_edges[ii]] = 1.0;
                         F[bc_edges[ii]] = 0.0;
                      }
                   }
                   /* Eliminate boundary conditions on y = 1 */
-                  if (index[1] == N*n)
+                  if (index[1] == N * n)
                   {
                      int ii, jj, bc_edges[4] = { 2, 10, 6, 11 };
                      for (ii = 0; ii < 4; ii++)
                      {
                         for (jj = 0; jj < 12; jj++)
+                        {
                            S[bc_edges[ii]][jj] = S[jj][bc_edges[ii]] = 0.0;
+                        }
                         S[bc_edges[ii]][bc_edges[ii]] = 1.0;
                         F[bc_edges[ii]] = 0.0;
                      }
                   }
                   /* Eliminate boundary conditions on z = 1 */
-                  if (index[2] == N*n)
+                  if (index[2] == N * n)
                   {
                      int ii, jj, bc_edges[4] = { 4, 5, 6, 7 };
                      for (ii = 0; ii < 4; ii++)
                      {
                         for (jj = 0; jj < 12; jj++)
+                        {
                            S[bc_edges[ii]][jj] = S[jj][bc_edges[ii]] = 0.0;
+                        }
                         S[bc_edges[ii]][bc_edges[ii]] = 1.0;
                         F[bc_edges[ii]] = 0.0;
                      }
@@ -625,9 +664,9 @@ int main (int argc, char *argv[])
          HYPRE_Int var = 0; /* the node variable */
 
          /* The discrete gradient stencils connect edge to node variables. */
-         HYPRE_Int Gx_offsets[2][3] = {{-1,0,0},{0,0,0}};  /* x-edge [7]-[6] */
-         HYPRE_Int Gy_offsets[2][3] = {{0,-1,0},{0,0,0}};  /* y-edge [5]-[6] */
-         HYPRE_Int Gz_offsets[2][3] = {{0,0,-1},{0,0,0}};  /* z-edge [2]-[6] */
+         HYPRE_Int Gx_offsets[2][3] = {{-1, 0, 0}, {0, 0, 0}}; /* x-edge [7]-[6] */
+         HYPRE_Int Gy_offsets[2][3] = {{0, -1, 0}, {0, 0, 0}}; /* y-edge [5]-[6] */
+         HYPRE_Int Gz_offsets[2][3] = {{0, 0, -1}, {0, 0, 0}}; /* z-edge [2]-[6] */
 
          HYPRE_SStructStencilCreate(ndim, stencil_size, &G_stencil[0]);
          HYPRE_SStructStencilCreate(ndim, stencil_size, &G_stencil[1]);
@@ -660,7 +699,9 @@ int main (int argc, char *argv[])
          /* Tell the graph which stencil to use for each edge variable on each
             part (we only have one part). */
          for (var = 0; var < nvars; var++)
+         {
             HYPRE_SStructGraphSetStencil(G_graph, part, var, G_stencil[var]);
+         }
 
          /* Assemble the graph */
          HYPRE_SStructGraphAssemble(G_graph);
@@ -680,24 +721,24 @@ int main (int argc, char *argv[])
          the edges (i.e. one in agreement with the coordinate directions). */
       {
          int i;
-         int nedges = n*(n+1)*(n+1);
+         int nedges = n * (n + 1) * (n + 1);
          double *values;
-         HYPRE_Int stencil_indices[2] = {0,1}; /* the nodes of each edge */
+         HYPRE_Int stencil_indices[2] = {0, 1}; /* the nodes of each edge */
 
-         values = (double*) calloc(2*nedges, sizeof(double));
+         values = (double*) calloc(2 * nedges, sizeof(double));
 
          /* The edge orientation is fixed: from first to second node */
          for (i = 0; i < nedges; i++)
          {
-            values[2*i]   = -1.0;
-            values[2*i+1] =  1.0;
+            values[2 * i]   = -1.0;
+            values[2 * i + 1] =  1.0;
          }
 
          /* Set the values in the discrete gradient x-edges */
          {
             HYPRE_Int var = 0;
-            HYPRE_Int ilower[3] = {1 + pi*n, 0 + pj*n, 0 + pk*n};
-            HYPRE_Int iupper[3] = {n + pi*n, n + pj*n, n + pk*n};
+            HYPRE_Int ilower[3] = {1 + pi * n, 0 + pj * n, 0 + pk * n};
+            HYPRE_Int iupper[3] = {n + pi * n, n + pj * n, n + pk * n};
             HYPRE_SStructMatrixSetBoxValues(G, part, ilower, iupper, var,
                                             stencil_size, stencil_indices,
                                             values);
@@ -705,8 +746,8 @@ int main (int argc, char *argv[])
          /* Set the values in the discrete gradient y-edges */
          {
             HYPRE_Int var = 1;
-            HYPRE_Int ilower[3] = {0 + pi*n, 1 + pj*n, 0 + pk*n};
-            HYPRE_Int iupper[3] = {n + pi*n, n + pj*n, n + pk*n};
+            HYPRE_Int ilower[3] = {0 + pi * n, 1 + pj * n, 0 + pk * n};
+            HYPRE_Int iupper[3] = {n + pi * n, n + pj * n, n + pk * n};
             HYPRE_SStructMatrixSetBoxValues(G, part, ilower, iupper, var,
                                             stencil_size, stencil_indices,
                                             values);
@@ -714,8 +755,8 @@ int main (int argc, char *argv[])
          /* Set the values in the discrete gradient z-edges */
          {
             HYPRE_Int var = 2;
-            HYPRE_Int ilower[3] = {0 + pi*n, 0 + pj*n, 1 + pk*n};
-            HYPRE_Int iupper[3] = {n + pi*n, n + pj*n, n + pk*n};
+            HYPRE_Int ilower[3] = {0 + pi * n, 0 + pj * n, 1 + pk * n};
+            HYPRE_Int iupper[3] = {n + pi * n, n + pj * n, n + pk * n};
             HYPRE_SStructMatrixSetBoxValues(G, part, ilower, iupper, var,
                                             stencil_size, stencil_indices,
                                             values);
@@ -755,11 +796,11 @@ int main (int argc, char *argv[])
          for (j = 0; j <= n; j++)
             for (k = 0; k <= n; k++)
             {
-               index[0] = i + pi*n; index[1] = j + pj*n; index[2] = k + pk*n;
+               index[0] = i + pi * n; index[1] = j + pj * n; index[2] = k + pk * n;
 
-               xval = index[0]*h;
-               yval = index[1]*h;
-               zval = index[2]*h;
+               xval = index[0] * h;
+               yval = index[1] * h;
+               zval = index[2] * h;
 
                HYPRE_SStructVectorSetValues(xcoord, part, index, var, &xval);
                HYPRE_SStructVectorSetValues(ycoord, part, index, var, &yval);
@@ -775,7 +816,7 @@ int main (int argc, char *argv[])
    /* 5. Set up a SStruct Vector for the solution vector x */
    {
       HYPRE_Int part = 0;
-      int nvalues = n*(n+1)*(n+1);
+      int nvalues = n * (n + 1) * (n + 1);
       double *values;
 
       values = (double*) calloc(nvalues, sizeof(double));
@@ -790,22 +831,22 @@ int main (int argc, char *argv[])
       /* Set the values for the initial guess x-edge */
       {
          HYPRE_Int var = 0;
-         HYPRE_Int ilower[3] = {1 + pi*n, 0 + pj*n, 0 + pk*n};
-         HYPRE_Int iupper[3] = {n + pi*n, n + pj*n, n + pk*n};
+         HYPRE_Int ilower[3] = {1 + pi * n, 0 + pj * n, 0 + pk * n};
+         HYPRE_Int iupper[3] = {n + pi * n, n + pj * n, n + pk * n};
          HYPRE_SStructVectorSetBoxValues(x, part, ilower, iupper, var, values);
       }
       /* Set the values for the initial guess y-edge */
       {
          HYPRE_Int var = 1;
-         HYPRE_Int ilower[3] = {0 + pi*n, 1 + pj*n, 0 + pk*n};
-         HYPRE_Int iupper[3] = {n + pi*n, n + pj*n, n + pk*n};
+         HYPRE_Int ilower[3] = {0 + pi * n, 1 + pj * n, 0 + pk * n};
+         HYPRE_Int iupper[3] = {n + pi * n, n + pj * n, n + pk * n};
          HYPRE_SStructVectorSetBoxValues(x, part, ilower, iupper, var, values);
       }
       /* Set the values for the initial guess z-edge */
       {
          HYPRE_Int var = 2;
-         HYPRE_Int ilower[3] = {0 + pi*n, 0 + pj*n, 1 + pk*n};
-         HYPRE_Int iupper[3] = {n + pi*n, n + pj*n, n + pk*n};
+         HYPRE_Int ilower[3] = {0 + pi * n, 0 + pj * n, 1 + pk * n};
+         HYPRE_Int iupper[3] = {n + pi * n, n + pj * n, n + pk * n};
          HYPRE_SStructVectorSetBoxValues(x, part, ilower, iupper, var, values);
       }
 
@@ -884,7 +925,9 @@ int main (int argc, char *argv[])
                                     par_xcoord, par_ycoord, par_zcoord);
 
       if (singular_problem)
+      {
          HYPRE_AMSSetBetaPoissonMatrix(precond, NULL);
+      }
 
       /* Smoothing and AMG options */
       HYPRE_AMSSetSmoothingOptions(precond,
diff --git a/external/hypre/src/examples/ex16.c b/external/hypre/src/examples/ex16.c
index 5ddd3635..02a7cbb7 100644
--- a/external/hypre/src/examples/ex16.c
+++ b/external/hypre/src/examples/ex16.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -53,181 +53,183 @@
 void ComputeFEMQ3 (double S[16][16], double F[16], double h)
 {
    int i, j;
-   double s = 1.0/33600;
-   double h2_64 = h*h/64;
-
-   S[ 0][ 0] = 18944*s;
-   S[ 0][ 1] = -4770*s;
-   S[ 0][ 2] = 792*s;
-   S[ 0][ 3] = 574*s;
-   S[ 0][ 4] = -4770*s;
-   S[ 0][ 5] = -18711*s;
-   S[ 0][ 6] = 6075*s;
-   S[ 0][ 7] = -2439*s;
-   S[ 0][ 8] = 792*s;
-   S[ 0][ 9] = 6075*s;
-   S[ 0][10] = -1944*s;
-   S[ 0][11] = 747*s;
-   S[ 0][12] = 574*s;
-   S[ 0][13] = -2439*s;
-   S[ 0][14] = 747*s;
-   S[ 0][15] = -247*s;
-
-   S[ 1][ 1] = 75600*s;
-   S[ 1][ 2] = -25002*s;
-   S[ 1][ 3] = 792*s;
-   S[ 1][ 4] = -18711*s;
-   S[ 1][ 5] = -39852*s;
-   S[ 1][ 6] = -7047*s;
-   S[ 1][ 7] = 6075*s;
-   S[ 1][ 8] = 6075*s;
-   S[ 1][ 9] = 9720*s;
-   S[ 1][10] = 3159*s;
-   S[ 1][11] = -1944*s;
-   S[ 1][12] = -2439*s;
-   S[ 1][13] = -108*s;
-   S[ 1][14] = -2295*s;
-   S[ 1][15] = 747*s;
-
-   S[ 2][ 2] = 75600*s;
-   S[ 2][ 3] = -4770*s;
-   S[ 2][ 4] = 6075*s;
-   S[ 2][ 5] = -7047*s;
-   S[ 2][ 6] = -39852*s;
-   S[ 2][ 7] = -18711*s;
-   S[ 2][ 8] = -1944*s;
-   S[ 2][ 9] = 3159*s;
-   S[ 2][10] = 9720*s;
-   S[ 2][11] = 6075*s;
-   S[ 2][12] = 747*s;
-   S[ 2][13] = -2295*s;
-   S[ 2][14] = -108*s;
-   S[ 2][15] = -2439*s;
-
-   S[ 3][ 3] = 18944*s;
-   S[ 3][ 4] = -2439*s;
-   S[ 3][ 5] = 6075*s;
-   S[ 3][ 6] = -18711*s;
-   S[ 3][ 7] = -4770*s;
-   S[ 3][ 8] = 747*s;
-   S[ 3][ 9] = -1944*s;
-   S[ 3][10] = 6075*s;
-   S[ 3][11] = 792*s;
-   S[ 3][12] = -247*s;
-   S[ 3][13] = 747*s;
-   S[ 3][14] = -2439*s;
-   S[ 3][15] = 574*s;
-
-   S[ 4][ 4] = 75600*s;
-   S[ 4][ 5] = -39852*s;
-   S[ 4][ 6] = 9720*s;
-   S[ 4][ 7] = -108*s;
-   S[ 4][ 8] = -25002*s;
-   S[ 4][ 9] = -7047*s;
-   S[ 4][10] = 3159*s;
-   S[ 4][11] = -2295*s;
-   S[ 4][12] = 792*s;
-   S[ 4][13] = 6075*s;
-   S[ 4][14] = -1944*s;
-   S[ 4][15] = 747*s;
-
-   S[ 5][ 5] = 279936*s;
-   S[ 5][ 6] = -113724*s;
-   S[ 5][ 7] = 9720*s;
-   S[ 5][ 8] = -7047*s;
-   S[ 5][ 9] = -113724*s;
-   S[ 5][10] = 24057*s;
-   S[ 5][11] = 3159*s;
-   S[ 5][12] = 6075*s;
-   S[ 5][13] = 9720*s;
-   S[ 5][14] = 3159*s;
-   S[ 5][15] = -1944*s;
-
-   S[ 6][ 6] = 279936*s;
-   S[ 6][ 7] = -39852*s;
-   S[ 6][ 8] = 3159*s;
-   S[ 6][ 9] = 24057*s;
-   S[ 6][10] = -113724*s;
-   S[ 6][11] = -7047*s;
-   S[ 6][12] = -1944*s;
-   S[ 6][13] = 3159*s;
-   S[ 6][14] = 9720*s;
-   S[ 6][15] = 6075*s;
-
-   S[ 7][ 7] = 75600*s;
-   S[ 7][ 8] = -2295*s;
-   S[ 7][ 9] = 3159*s;
-   S[ 7][10] = -7047*s;
-   S[ 7][11] = -25002*s;
-   S[ 7][12] = 747*s;
-   S[ 7][13] = -1944*s;
-   S[ 7][14] = 6075*s;
-   S[ 7][15] = 792*s;
-
-   S[ 8][ 8] = 75600*s;
-   S[ 8][ 9] = -39852*s;
-   S[ 8][10] = 9720*s;
-   S[ 8][11] = -108*s;
-   S[ 8][12] = -4770*s;
-   S[ 8][13] = -18711*s;
-   S[ 8][14] = 6075*s;
-   S[ 8][15] = -2439*s;
-
-   S[ 9][ 9] = 279936*s;
-   S[ 9][10] = -113724*s;
-   S[ 9][11] = 9720*s;
-   S[ 9][12] = -18711*s;
-   S[ 9][13] = -39852*s;
-   S[ 9][14] = -7047*s;
-   S[ 9][15] = 6075*s;
-
-   S[10][10] = 279936*s;
-   S[10][11] = -39852*s;
-   S[10][12] = 6075*s;
-   S[10][13] = -7047*s;
-   S[10][14] = -39852*s;
-   S[10][15] = -18711*s;
-
-   S[11][11] = 75600*s;
-   S[11][12] = -2439*s;
-   S[11][13] = 6075*s;
-   S[11][14] = -18711*s;
-   S[11][15] = -4770*s;
-
-   S[12][12] = 18944*s;
-   S[12][13] = -4770*s;
-   S[12][14] = 792*s;
-   S[12][15] = 574*s;
-
-   S[13][13] = 75600*s;
-   S[13][14] = -25002*s;
-   S[13][15] = 792*s;
-
-   S[14][14] = 75600*s;
-   S[14][15] = -4770*s;
-
-   S[15][15] = 18944*s;
+   double s = 1.0 / 33600;
+   double h2_64 = h * h / 64;
+
+   S[ 0][ 0] = 18944 * s;
+   S[ 0][ 1] = -4770 * s;
+   S[ 0][ 2] = 792 * s;
+   S[ 0][ 3] = 574 * s;
+   S[ 0][ 4] = -4770 * s;
+   S[ 0][ 5] = -18711 * s;
+   S[ 0][ 6] = 6075 * s;
+   S[ 0][ 7] = -2439 * s;
+   S[ 0][ 8] = 792 * s;
+   S[ 0][ 9] = 6075 * s;
+   S[ 0][10] = -1944 * s;
+   S[ 0][11] = 747 * s;
+   S[ 0][12] = 574 * s;
+   S[ 0][13] = -2439 * s;
+   S[ 0][14] = 747 * s;
+   S[ 0][15] = -247 * s;
+
+   S[ 1][ 1] = 75600 * s;
+   S[ 1][ 2] = -25002 * s;
+   S[ 1][ 3] = 792 * s;
+   S[ 1][ 4] = -18711 * s;
+   S[ 1][ 5] = -39852 * s;
+   S[ 1][ 6] = -7047 * s;
+   S[ 1][ 7] = 6075 * s;
+   S[ 1][ 8] = 6075 * s;
+   S[ 1][ 9] = 9720 * s;
+   S[ 1][10] = 3159 * s;
+   S[ 1][11] = -1944 * s;
+   S[ 1][12] = -2439 * s;
+   S[ 1][13] = -108 * s;
+   S[ 1][14] = -2295 * s;
+   S[ 1][15] = 747 * s;
+
+   S[ 2][ 2] = 75600 * s;
+   S[ 2][ 3] = -4770 * s;
+   S[ 2][ 4] = 6075 * s;
+   S[ 2][ 5] = -7047 * s;
+   S[ 2][ 6] = -39852 * s;
+   S[ 2][ 7] = -18711 * s;
+   S[ 2][ 8] = -1944 * s;
+   S[ 2][ 9] = 3159 * s;
+   S[ 2][10] = 9720 * s;
+   S[ 2][11] = 6075 * s;
+   S[ 2][12] = 747 * s;
+   S[ 2][13] = -2295 * s;
+   S[ 2][14] = -108 * s;
+   S[ 2][15] = -2439 * s;
+
+   S[ 3][ 3] = 18944 * s;
+   S[ 3][ 4] = -2439 * s;
+   S[ 3][ 5] = 6075 * s;
+   S[ 3][ 6] = -18711 * s;
+   S[ 3][ 7] = -4770 * s;
+   S[ 3][ 8] = 747 * s;
+   S[ 3][ 9] = -1944 * s;
+   S[ 3][10] = 6075 * s;
+   S[ 3][11] = 792 * s;
+   S[ 3][12] = -247 * s;
+   S[ 3][13] = 747 * s;
+   S[ 3][14] = -2439 * s;
+   S[ 3][15] = 574 * s;
+
+   S[ 4][ 4] = 75600 * s;
+   S[ 4][ 5] = -39852 * s;
+   S[ 4][ 6] = 9720 * s;
+   S[ 4][ 7] = -108 * s;
+   S[ 4][ 8] = -25002 * s;
+   S[ 4][ 9] = -7047 * s;
+   S[ 4][10] = 3159 * s;
+   S[ 4][11] = -2295 * s;
+   S[ 4][12] = 792 * s;
+   S[ 4][13] = 6075 * s;
+   S[ 4][14] = -1944 * s;
+   S[ 4][15] = 747 * s;
+
+   S[ 5][ 5] = 279936 * s;
+   S[ 5][ 6] = -113724 * s;
+   S[ 5][ 7] = 9720 * s;
+   S[ 5][ 8] = -7047 * s;
+   S[ 5][ 9] = -113724 * s;
+   S[ 5][10] = 24057 * s;
+   S[ 5][11] = 3159 * s;
+   S[ 5][12] = 6075 * s;
+   S[ 5][13] = 9720 * s;
+   S[ 5][14] = 3159 * s;
+   S[ 5][15] = -1944 * s;
+
+   S[ 6][ 6] = 279936 * s;
+   S[ 6][ 7] = -39852 * s;
+   S[ 6][ 8] = 3159 * s;
+   S[ 6][ 9] = 24057 * s;
+   S[ 6][10] = -113724 * s;
+   S[ 6][11] = -7047 * s;
+   S[ 6][12] = -1944 * s;
+   S[ 6][13] = 3159 * s;
+   S[ 6][14] = 9720 * s;
+   S[ 6][15] = 6075 * s;
+
+   S[ 7][ 7] = 75600 * s;
+   S[ 7][ 8] = -2295 * s;
+   S[ 7][ 9] = 3159 * s;
+   S[ 7][10] = -7047 * s;
+   S[ 7][11] = -25002 * s;
+   S[ 7][12] = 747 * s;
+   S[ 7][13] = -1944 * s;
+   S[ 7][14] = 6075 * s;
+   S[ 7][15] = 792 * s;
+
+   S[ 8][ 8] = 75600 * s;
+   S[ 8][ 9] = -39852 * s;
+   S[ 8][10] = 9720 * s;
+   S[ 8][11] = -108 * s;
+   S[ 8][12] = -4770 * s;
+   S[ 8][13] = -18711 * s;
+   S[ 8][14] = 6075 * s;
+   S[ 8][15] = -2439 * s;
+
+   S[ 9][ 9] = 279936 * s;
+   S[ 9][10] = -113724 * s;
+   S[ 9][11] = 9720 * s;
+   S[ 9][12] = -18711 * s;
+   S[ 9][13] = -39852 * s;
+   S[ 9][14] = -7047 * s;
+   S[ 9][15] = 6075 * s;
+
+   S[10][10] = 279936 * s;
+   S[10][11] = -39852 * s;
+   S[10][12] = 6075 * s;
+   S[10][13] = -7047 * s;
+   S[10][14] = -39852 * s;
+   S[10][15] = -18711 * s;
+
+   S[11][11] = 75600 * s;
+   S[11][12] = -2439 * s;
+   S[11][13] = 6075 * s;
+   S[11][14] = -18711 * s;
+   S[11][15] = -4770 * s;
+
+   S[12][12] = 18944 * s;
+   S[12][13] = -4770 * s;
+   S[12][14] = 792 * s;
+   S[12][15] = 574 * s;
+
+   S[13][13] = 75600 * s;
+   S[13][14] = -25002 * s;
+   S[13][15] = 792 * s;
+
+   S[14][14] = 75600 * s;
+   S[14][15] = -4770 * s;
+
+   S[15][15] = 18944 * s;
 
    /* The stiffness matrix is symmetric */
    for (i = 1; i < 16; i++)
       for (j = 0; j < i; j++)
+      {
          S[i][j] = S[j][i];
+      }
 
    F[ 0] = h2_64;
-   F[ 1] = 3*h2_64;
-   F[ 2] = 3*h2_64;
+   F[ 1] = 3 * h2_64;
+   F[ 2] = 3 * h2_64;
    F[ 3] = h2_64;
-   F[ 4] = 3*h2_64;
-   F[ 5] = 9*h2_64;
-   F[ 6] = 9*h2_64;
-   F[ 7] = 3*h2_64;
-   F[ 8] = 3*h2_64;
-   F[ 9] = 9*h2_64;
-   F[10] = 9*h2_64;
-   F[11] = 3*h2_64;
+   F[ 4] = 3 * h2_64;
+   F[ 5] = 9 * h2_64;
+   F[ 6] = 9 * h2_64;
+   F[ 7] = 3 * h2_64;
+   F[ 8] = 3 * h2_64;
+   F[ 9] = 9 * h2_64;
+   F[10] = 9 * h2_64;
+   F[11] = 3 * h2_64;
    F[12] = h2_64;
-   F[13] = 3*h2_64;
-   F[14] = 3*h2_64;
+   F[13] = 3 * h2_64;
+   F[14] = 3 * h2_64;
    F[15] = h2_64;
 }
 
@@ -253,7 +255,7 @@ int main (int argc, char *argv[])
    MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
 
    /* Initialize HYPRE */
-   HYPRE_Init();
+   HYPRE_Initialize();
 
    /* Print GPU info */
    /* HYPRE_PrintDeviceInfo(); */
@@ -309,19 +311,19 @@ int main (int argc, char *argv[])
 
    /* Figure out the processor grid (N x N).  The local problem size is n^2,
       while pi and pj indicate the position in the processor grid. */
-   N  = pow(num_procs,1.0/2.0) + 0.5;
-   if (num_procs != N*N)
+   N  = pow(num_procs, 1.0 / 2.0) + 0.5;
+   if (num_procs != N * N)
    {
       if (myid == 0)
       {
-         printf("Can't run on %d processors, try %d.\n", num_procs, N*N);
+         printf("Can't run on %d processors, try %d.\n", num_procs, N * N);
       }
       MPI_Finalize();
       exit(1);
    }
-   h  = 1.0 / (N*n);
+   h  = 1.0 / (N * n);
    pj = myid / N;
-   pi = myid - pj*N;
+   pi = myid - pj * N;
 
    /* 1. Set up the grid.  For simplicity we use only one part to represent the
          unit square. */
@@ -335,8 +337,8 @@ int main (int argc, char *argv[])
       /* Set the extents of the grid - each processor sets its grid boxes. */
       {
          int part = 0;
-         int ilower[2] = {1 + pi*n, 1 + pj*n};
-         int iupper[2] = {n + pi*n, n + pj*n};
+         int ilower[2] = {1 + pi * n, 1 + pj * n};
+         int iupper[2] = {n + pi * n, n + pj * n};
 
          HYPRE_SStructGridSetExtents(grid, part, ilower, iupper);
       }
@@ -356,7 +358,8 @@ int main (int argc, char *argv[])
                                           HYPRE_SSTRUCT_VARIABLE_CELL,
                                           HYPRE_SSTRUCT_VARIABLE_CELL,
                                           HYPRE_SSTRUCT_VARIABLE_CELL,
-                                          HYPRE_SSTRUCT_VARIABLE_CELL};
+                                          HYPRE_SSTRUCT_VARIABLE_CELL
+                                         };
          for (i = 0; i < nparts; i++)
          {
             HYPRE_SStructGridSetVariables(grid, i, nvars, vars);
@@ -382,10 +385,11 @@ int main (int argc, char *argv[])
       */
       {
          int part = 0;
-         int ordering[48] = { 0,-1,-1,   3, 0,-1,   4, 0,-1,   0,+1,-1,
-                              1,-1, 0,   5, 0, 0,   6, 0, 0,   1,+1, 0,
-                              2,-1, 0,   7, 0, 0,   8, 0, 0,   2,+1, 0,
-                              0,-1,+1,   3, 0,+1,   4, 0,+1,   0,+1,+1  };
+         int ordering[48] = { 0, -1, -1,    3,  0, -1,    4,  0, -1,    0, +1, -1,
+                              1, -1,  0,    5,  0,  0,    6,  0,  0,    1, +1,  0,
+                              2, -1,  0,    7,  0,  0,    8,  0,  0,    2, +1,  0,
+                              0, -1, +1,    3,  0, +1,    4,  0, +1,    0, +1, +1
+                            };
 
          HYPRE_SStructGridSetFEMOrdering(grid, part, ordering);
       }
@@ -446,8 +450,8 @@ int main (int argc, char *argv[])
          {
             for (i = 1; i <= n; i++)
             {
-               index[0] = i + pi*n;
-               index[1] = j + pj*n;
+               index[0] = i + pi * n;
+               index[1] = j + pj * n;
 
                /* Compute the FEM matrix and rhs */
                ComputeFEMQ3(S, F, h);
@@ -456,16 +460,19 @@ int main (int argc, char *argv[])
                {
                   int ii, jj, bdy, dd;
                   int set_bc[4] = {0, 0, 0, 0};
-                  int bc_dofs[4][4] = {{ 0,  4,  8, 12},  /* x = 0 boundary */
-                                       { 0,  1,  2,  3},  /* y = 0 boundary */
-                                       { 3,  7, 11, 15},  /* x = 1 boundary */
-                                       {12, 13, 14, 15}}; /* y = 1 boundary */
+                  int bc_dofs[4][4] =
+                  {
+                     { 0,  4,  8, 12},  /* x = 0 boundary */
+                     { 0,  1,  2,  3},  /* y = 0 boundary */
+                     { 3,  7, 11, 15},  /* x = 1 boundary */
+                     {12, 13, 14, 15}   /* y = 1 boundary */
+                  };
 
                   /* Determine the boundary conditions to be set */
-                  if (index[0] == 1)   set_bc[0] = 1;  /* x = 0 boundary */
-                  if (index[1] == 1)   set_bc[1] = 1;  /* y = 0 boundary */
-                  if (index[0] == N*n) set_bc[2] = 1;  /* x = 1 boundary */
-                  if (index[1] == N*n) set_bc[3] = 1;  /* y = 1 boundary */
+                  if (index[0] == 1)   { set_bc[0] = 1; } /* x = 0 boundary */
+                  if (index[1] == 1)   { set_bc[1] = 1; } /* y = 0 boundary */
+                  if (index[0] == N * n) { set_bc[2] = 1; } /* x = 1 boundary */
+                  if (index[1] == N * n) { set_bc[3] = 1; } /* y = 1 boundary */
 
                   /* Modify the FEM matrix and rhs on each boundary by setting
                      rows and columns of S to the identity and F to zero */
@@ -507,7 +514,7 @@ int main (int argc, char *argv[])
    {
       int part = 0;
       int var, nvars = 9;
-      int nvalues = (n+1)*(n+1);
+      int nvalues = (n + 1) * (n + 1);
       double *values;
 
       values = (double*) calloc(nvalues, sizeof(double));
@@ -524,10 +531,10 @@ int main (int argc, char *argv[])
          cell center, ilower needs to be adjusted. */
       for (var = 0; var < nvars; var++)
       {
-         int ilower[2] = {1 + pi*n, 1 + pj*n};
-         int iupper[2] = {n + pi*n, n + pj*n};
+         int ilower[2] = {1 + pi * n, 1 + pj * n};
+         int iupper[2] = {n + pi * n, n + pj * n};
 
-         switch(var)
+         switch (var)
          {
             case 0: /* NODE */
                ilower[0]--;
@@ -599,7 +606,7 @@ int main (int argc, char *argv[])
 
          int part = 0;
          int i, j, k, index[2];
-         int nvalues = n*n*16;
+         int nvalues = n * n * 16;
          double X[16], *values;
 
          /* GLVis-to-hypre local renumbering */
@@ -612,8 +619,8 @@ int main (int argc, char *argv[])
          {
             for (i = 1; i <= n; i++)
             {
-               index[0] = i + pi*n;
-               index[1] = j + pj*n;
+               index[0] = i + pi * n;
+               index[1] = j + pj * n;
 
                /* Get local element solution values X */
                HYPRE_SStructVectorGetFEMValues(x, part, index, X);
@@ -643,7 +650,9 @@ int main (int argc, char *argv[])
 
          /* Save solution with replicated shared data */
          for (i = 0; i < nvalues; i++)
+         {
             fprintf(file, "%.14e\n", values[i]);
+         }
 
          fflush(file);
          fclose(file);
@@ -651,7 +660,7 @@ int main (int argc, char *argv[])
 
          /* Save local finite element mesh */
          GLVis_PrintLocalSquareMesh("vis/ex16.mesh", n, n, h,
-                                    pi*h*n, pj*h*n, myid);
+                                    pi * h * n, pj * h * n, myid);
 
          /* Additional visualization data */
          GLVis_PrintData("vis/ex16.data", myid, num_procs);
diff --git a/external/hypre/src/examples/ex17.c b/external/hypre/src/examples/ex17.c
index 6e1850ab..1ed86bbd 100644
--- a/external/hypre/src/examples/ex17.c
+++ b/external/hypre/src/examples/ex17.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -54,7 +54,7 @@ int main (int argc, char *argv[])
    MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
 
    /* Initialize HYPRE */
-   HYPRE_Init();
+   HYPRE_Initialize();
 
    /* Print GPU info */
    /* HYPRE_PrintDeviceInfo(); */
@@ -115,7 +115,7 @@ int main (int argc, char *argv[])
    /* Figure out the processor grid (N x N x N x N).  The local problem size for
       the interior nodes is indicated by n (n x n x n x n).  p indicates the
       position in the processor grid. */
-   N  = pow(num_procs, 1.0/NDIM) + 1.0e-6;
+   N  = pow(num_procs, 1.0 / NDIM) + 1.0e-6;
    div = pow(N, NDIM);
    rem = myid;
    if (num_procs != div)
@@ -124,7 +124,7 @@ int main (int argc, char *argv[])
       MPI_Finalize();
       exit(1);
    }
-   for (d = NDIM-1; d >= 0; d--)
+   for (d = NDIM - 1; d >= 0; d--)
    {
       div /= N;
       p[d] = rem / div;
@@ -134,8 +134,8 @@ int main (int argc, char *argv[])
    /* Figure out the extents of each processor's piece of the grid. */
    for (d = 0; d < NDIM; d++)
    {
-      ilower[d] = p[d]*n;
-      iupper[d] = ilower[d] + n-1;
+      ilower[d] = p[d] * n;
+      iupper[d] = ilower[d] + n - 1;
    }
 
    /* 1. Set up a grid */
@@ -181,7 +181,7 @@ int main (int argc, char *argv[])
    /* 3. Set up a Struct Matrix */
    {
       int nentries = NSTENC;
-      int nvalues  = nentries*nvol;
+      int nvalues  = nentries * nvol;
       double *values;
       int stencil_indices[NSTENC];
 
@@ -204,7 +204,7 @@ int main (int argc, char *argv[])
          values[i] = NSTENC; /* Use absolute row sum */
          for (j = 1; j < nentries; j++)
          {
-            values[i+j] = -1.0;
+            values[i + j] = -1.0;
          }
       }
 
@@ -220,7 +220,7 @@ int main (int argc, char *argv[])
       int bc_ilower[NDIM];
       int bc_iupper[NDIM];
       int nentries = 1;
-      int nvalues  = nentries*nvol/n; /* number of stencil entries times the
+      int nvalues  = nentries * nvol / n; /* number of stencil entries times the
                                          length of one side of my grid box */
       double *values;
       int stencil_indices[1];
@@ -250,7 +250,7 @@ int main (int argc, char *argv[])
          stencil_indices[0]++;
 
          /* upper boundary in dimension d */
-         if (p[d] == N-1)
+         if (p[d] == N - 1)
          {
             bc_ilower[d] = iupper[d];
             HYPRE_StructMatrixSetBoxValues(A, bc_ilower, bc_iupper, nentries,
@@ -282,7 +282,7 @@ int main (int argc, char *argv[])
       HYPRE_StructVectorInitialize(b);
       HYPRE_StructVectorInitialize(x);
 
-     /* Set the values */
+      /* Set the values */
       for (i = 0; i < nvalues; i ++)
       {
          values[i] = 1.0;
diff --git a/external/hypre/src/examples/ex18.c b/external/hypre/src/examples/ex18.c
index 71dc5735..6ae68cf6 100644
--- a/external/hypre/src/examples/ex18.c
+++ b/external/hypre/src/examples/ex18.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -58,7 +58,7 @@ int main (int argc, char *argv[])
    MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
 
    /* Initialize HYPRE */
-   HYPRE_Init();
+   HYPRE_Initialize();
 
    /* Print GPU info */
    /* HYPRE_PrintDeviceInfo(); */
@@ -119,7 +119,7 @@ int main (int argc, char *argv[])
    /* Figure out the processor grid (N x N x N x N).  The local problem size for
       the interior nodes is indicated by n (n x n x n x n).  p indicates the
       position in the processor grid. */
-   N  = pow(num_procs, 1.0/NDIM) + 1.0e-6;
+   N  = pow(num_procs, 1.0 / NDIM) + 1.0e-6;
    div = pow(N, NDIM);
    rem = myid;
    if (num_procs != div)
@@ -128,7 +128,7 @@ int main (int argc, char *argv[])
       MPI_Finalize();
       exit(1);
    }
-   for (d = NDIM-1; d >= 0; d--)
+   for (d = NDIM - 1; d >= 0; d--)
    {
       div /= N;
       p[d] = rem / div;
@@ -138,15 +138,16 @@ int main (int argc, char *argv[])
    /* Figure out the extents of each processor's piece of the grid. */
    for (d = 0; d < NDIM; d++)
    {
-      ilower[d] = p[d]*n;
-      iupper[d] = ilower[d] + n-1;
+      ilower[d] = p[d] * n;
+      iupper[d] = ilower[d] + n - 1;
    }
 
    /* 1. Set up a grid */
    {
       int part = 0;
       HYPRE_SStructVariable vartypes[NVARS] = {HYPRE_SSTRUCT_VARIABLE_CELL,
-                                               HYPRE_SSTRUCT_VARIABLE_CELL};
+                                               HYPRE_SSTRUCT_VARIABLE_CELL
+                                              };
 
       /* Create an empty 2D grid object */
       HYPRE_SStructGridCreate(MPI_COMM_WORLD, NDIM, NPARTS, &grid);
@@ -227,8 +228,8 @@ int main (int argc, char *argv[])
    {
       int part = 0;
       int var0 = 0, var1 = 1;
-      int nentries  = NSTENC/NVARS;
-      int nvalues   = nentries*nvol;
+      int nentries  = NSTENC / NVARS;
+      int nvalues   = nentries * nvol;
       double *values;
       int stencil_indices[NSTENC];
 
@@ -246,14 +247,14 @@ int main (int argc, char *argv[])
       /* Set intra-variable values; fix boundaries later */
       for (j = 0; j < nentries; j++)
       {
-         stencil_indices[j] = 2*j;
+         stencil_indices[j] = 2 * j;
       }
       for (i = 0; i < nvalues; i += nentries)
       {
-         values[i]   = 1.1*(NSTENC/NVARS); /* Diagonal: Use absolute row sum */
+         values[i]   = 1.1 * (NSTENC / NVARS); /* Diagonal: Use absolute row sum */
          for (j = 1; j < nentries; j++)
          {
-            values[i+j] = -1.0;
+            values[i + j] = -1.0;
          }
       }
       HYPRE_SStructMatrixSetBoxValues(A, part, ilower, iupper, var0,
@@ -264,14 +265,14 @@ int main (int argc, char *argv[])
       /* Set inter-variable values; fix boundaries later */
       for (j = 0; j < nentries; j++)
       {
-         stencil_indices[j] = 2*j+1;
+         stencil_indices[j] = 2 * j + 1;
       }
       for (i = 0; i < nvalues; i += nentries)
       {
          values[i] = -0.1;
          for (j = 1; j < nentries; j++)
          {
-            values[i+j] = -0.1;
+            values[i + j] = -0.1;
          }
       }
       HYPRE_SStructMatrixSetBoxValues(A, part, ilower, iupper, var0,
@@ -290,7 +291,7 @@ int main (int argc, char *argv[])
       int bc_ilower[NDIM];
       int bc_iupper[NDIM];
       int nentries = 1;
-      int nvalues  = nentries*nvol/n; /* number of stencil entries times the
+      int nvalues  = nentries * nvol / n; /* number of stencil entries times the
                                          length of one side of my grid box */
       double *values;
       int stencil_indices[1];
@@ -329,7 +330,7 @@ int main (int argc, char *argv[])
          }
 
          /* upper boundary in dimension d */
-         if (p[d] == N-1)
+         if (p[d] == N - 1)
          {
             bc_ilower[d] = iupper[d];
             for (i = 0; i < NVARS; i++)
@@ -358,7 +359,7 @@ int main (int argc, char *argv[])
    {
       int part = 0;
       int var0 = 0, var1 = 1;
-      int nvalues = NVARS*nvol;
+      int nvalues = NVARS * nvol;
       double *values;
 
       values = (double*) calloc(nvalues, sizeof(double));
@@ -375,7 +376,7 @@ int main (int argc, char *argv[])
       HYPRE_SStructVectorInitialize(b);
       HYPRE_SStructVectorInitialize(x);
 
-     /* Set the values */
+      /* Set the values */
       for (i = 0; i < nvalues; i ++)
       {
          values[i] = 1.0;
diff --git a/external/hypre/src/examples/ex18comp.c b/external/hypre/src/examples/ex18comp.c
index 8226690c..a9c7aaeb 100644
--- a/external/hypre/src/examples/ex18comp.c
+++ b/external/hypre/src/examples/ex18comp.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -58,7 +58,7 @@ int main (int argc, char *argv[])
    MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
 
    /* Initialize HYPRE */
-   HYPRE_Init();
+   HYPRE_Initialize();
 
    /* Print GPU info */
    /* HYPRE_PrintDeviceInfo(); */
@@ -119,7 +119,7 @@ int main (int argc, char *argv[])
    /* Figure out the processor grid (N x N x N x N).  The local problem size for
       the interior nodes is indicated by n (n x n x n x n).  p indicates the
       position in the processor grid. */
-   N  = pow(num_procs, 1.0/NDIM) + 1.0e-6;
+   N  = pow(num_procs, 1.0 / NDIM) + 1.0e-6;
    div = pow(N, NDIM);
    rem = myid;
    if (num_procs != div)
@@ -128,7 +128,7 @@ int main (int argc, char *argv[])
       MPI_Finalize();
       exit(1);
    }
-   for (d = NDIM-1; d >= 0; d--)
+   for (d = NDIM - 1; d >= 0; d--)
    {
       div /= N;
       p[d] = rem / div;
@@ -138,15 +138,16 @@ int main (int argc, char *argv[])
    /* Figure out the extents of each processor's piece of the grid. */
    for (d = 0; d < NDIM; d++)
    {
-      ilower[d] = p[d]*n;
-      iupper[d] = ilower[d] + n-1;
+      ilower[d] = p[d] * n;
+      iupper[d] = ilower[d] + n - 1;
    }
 
    /* 1. Set up a grid */
    {
       int part = 0;
       HYPRE_SStructVariable vartypes[NVARS] = {HYPRE_SSTRUCT_VARIABLE_CELL,
-                                               HYPRE_SSTRUCT_VARIABLE_CELL};
+                                               HYPRE_SSTRUCT_VARIABLE_CELL
+                                              };
 
       /* Create an empty 2D grid object */
       HYPRE_SStructGridCreate(MPI_COMM_WORLD, NDIM, NPARTS, &grid);
@@ -227,8 +228,8 @@ int main (int argc, char *argv[])
    {
       int part = 0;
       int var0 = 0, var1 = 1;
-      int nentries  = NSTENC/NVARS;
-      int nvalues   = nentries*nvol;
+      int nentries  = NSTENC / NVARS;
+      int nvalues   = nentries * nvol;
       HYPRE_Complex *values;
       int stencil_indices[NSTENC];
 
@@ -246,14 +247,14 @@ int main (int argc, char *argv[])
       /* Set intra-variable values; fix boundaries later */
       for (j = 0; j < nentries; j++)
       {
-         stencil_indices[j] = 2*j;
+         stencil_indices[j] = 2 * j;
       }
       for (i = 0; i < nvalues; i += nentries)
       {
-         values[i]   = 1.1*(NSTENC/NVARS); /* Diagonal: Use absolute row sum */
+         values[i]   = 1.1 * (NSTENC / NVARS); /* Diagonal: Use absolute row sum */
          for (j = 1; j < nentries; j++)
          {
-            values[i+j] = -1.0;
+            values[i + j] = -1.0;
          }
       }
       HYPRE_SStructMatrixSetBoxValues(A, part, ilower, iupper, var0,
@@ -264,14 +265,14 @@ int main (int argc, char *argv[])
       /* Set inter-variable values; fix boundaries later */
       for (j = 0; j < nentries; j++)
       {
-         stencil_indices[j] = 2*j+1;
+         stencil_indices[j] = 2 * j + 1;
       }
       /* Add an imaginary component and ensure conjugate to below */
       for (i = 0; i < nvalues; i += nentries)
       {
          for (j = 0; j < nentries; j++)
          {
-            values[i+j] =(-0.1 +  (HYPRE_Complex)I*0.1);
+            values[i + j] = (-0.1 +  (HYPRE_Complex)I * 0.1);
          }
       }
       HYPRE_SStructMatrixSetBoxValues(A, part, ilower, iupper, var0,
@@ -281,7 +282,7 @@ int main (int argc, char *argv[])
       {
          for (j = 0; j < nentries; j++)
          {
-            values[i+j] =(HYPRE_Complex)(-0.1 - I*0.1);
+            values[i + j] = (HYPRE_Complex)(-0.1 - I * 0.1);
          }
       }
       HYPRE_SStructMatrixSetBoxValues(A, part, ilower, iupper, var1,
@@ -298,7 +299,7 @@ int main (int argc, char *argv[])
       int bc_ilower[NDIM];
       int bc_iupper[NDIM];
       int nentries = 1;
-      int nvalues  = nentries*nvol/n; /* number of stencil entries times the
+      int nvalues  = nentries * nvol / n; /* number of stencil entries times the
                                          length of one side of my grid box */
       HYPRE_Complex *values;
       int stencil_indices[1];
@@ -337,7 +338,7 @@ int main (int argc, char *argv[])
          }
 
          /* upper boundary in dimension d */
-         if (p[d] == N-1)
+         if (p[d] == N - 1)
          {
             bc_ilower[d] = iupper[d];
             for (i = 0; i < NVARS; i++)
@@ -366,7 +367,7 @@ int main (int argc, char *argv[])
    {
       int part = 0;
       int var0 = 0, var1 = 1;
-      int nvalues = NVARS*nvol;
+      int nvalues = NVARS * nvol;
       HYPRE_Complex *values;
 
       values = (HYPRE_Complex*) calloc(nvalues, sizeof(HYPRE_Complex));
@@ -383,7 +384,7 @@ int main (int argc, char *argv[])
       HYPRE_SStructVectorInitialize(b);
       HYPRE_SStructVectorInitialize(x);
 
-     /* Set the values */
+      /* Set the values */
       for (i = 0; i < nvalues; i ++)
       {
          values[i] = 1.0;
diff --git a/external/hypre/src/examples/ex2.c b/external/hypre/src/examples/ex2.c
index 9089a75c..3e80377c 100644
--- a/external/hypre/src/examples/ex2.c
+++ b/external/hypre/src/examples/ex2.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -60,14 +60,14 @@ int main (int argc, char *argv[])
 
    if (num_procs != 2)
    {
-      if (myid == 0) printf("Must run with 2 processors!\n");
+      if (myid == 0) { printf("Must run with 2 processors!\n"); }
       MPI_Finalize();
 
-      return(0);
+      return (0);
    }
 
    /* Initialize HYPRE */
-   HYPRE_Init();
+   HYPRE_Initialize();
 
    /* Print GPU info */
    /* HYPRE_PrintDeviceInfo(); */
@@ -162,11 +162,13 @@ int main (int argc, char *argv[])
          relative offset (in the index space). */
       {
          int entry;
-         int offsets[5][2] = {{0,0}, {-1,0}, {1,0}, {0,-1}, {0,1}};
+         int offsets[5][2] = {{0, 0}, {-1, 0}, {1, 0}, {0, -1}, {0, 1}};
 
          /* Assign each of the 5 stencil entries */
          for (entry = 0; entry < 5; entry++)
+         {
             HYPRE_StructStencilSetElement(stencil, entry, offsets[entry]);
+         }
       }
    }
 
@@ -190,19 +192,23 @@ int main (int argc, char *argv[])
             int nentries = 5;
             int nvalues  = 30; /* 6 grid points, each with 5 stencil entries */
             /* double values[30]; OK to use constant-length array for CPUs */
-            double *values = (double *) malloc(30*sizeof(double));
+            double *values = (double *) malloc(30 * sizeof(double));
 
             int stencil_indices[5];
             for (j = 0; j < nentries; j++) /* label the stencil indices -
                                               these correspond to the offsets
                                               defined above */
+            {
                stencil_indices[j] = j;
+            }
 
             for (i = 0; i < nvalues; i += nentries)
             {
                values[i] = 4.0;
                for (j = 1; j < nentries; j++)
-                  values[i+j] = -1.0;
+               {
+                  values[i + j] = -1.0;
+               }
             }
 
             HYPRE_StructMatrixSetBoxValues(A, ilower, iupper, nentries,
@@ -220,17 +226,21 @@ int main (int argc, char *argv[])
             int nentries = 5;
             int nvalues  = 60; /* 12 grid points, each with 5 stencil entries */
             /* double values[60]; OK to use constant-length array for CPUs */
-            double *values = (double *) malloc(60*sizeof(double));
+            double *values = (double *) malloc(60 * sizeof(double));
 
             int stencil_indices[5];
             for (j = 0; j < nentries; j++)
+            {
                stencil_indices[j] = j;
+            }
 
             for (i = 0; i < nvalues; i += nentries)
             {
                values[i] = 4.0;
                for (j = 1; j < nentries; j++)
-                  values[i+j] = -1.0;
+               {
+                  values[i + j] = -1.0;
+               }
             }
 
             HYPRE_StructMatrixSetBoxValues(A, ilower, iupper, nentries,
@@ -250,17 +260,21 @@ int main (int argc, char *argv[])
             int nentries = 5;
             int nvalues  = 80; /* 16 grid points, each with 5 stencil entries */
             /* double values[80]; OK to use constant-length array for CPUs */
-            double *values = (double *) malloc(80*sizeof(double));
+            double *values = (double *) malloc(80 * sizeof(double));
 
             int stencil_indices[5];
             for (j = 0; j < nentries; j++)
+            {
                stencil_indices[j] = j;
+            }
 
             for (i = 0; i < nvalues; i += nentries)
             {
                values[i] = 4.0;
                for (j = 1; j < nentries; j++)
-                  values[i+j] = -1.0;
+               {
+                  values[i + j] = -1.0;
+               }
             }
 
             HYPRE_StructMatrixSetBoxValues(A, ilower, iupper, nentries,
@@ -276,10 +290,12 @@ int main (int argc, char *argv[])
       {
          int maxnvalues = 6;
          /* double values[6]; OK to use constant-length array for CPUs */
-         double *values = (double *) malloc(6*sizeof(double));
+         double *values = (double *) malloc(6 * sizeof(double));
 
          for (i = 0; i < maxnvalues; i++)
+         {
             values[i] = 0.0;
+         }
 
          {
             /* Values below our first AND second box */
@@ -343,10 +359,12 @@ int main (int argc, char *argv[])
       {
          int maxnvalues = 4;
          /* double values[4]; OK to use constant-length array for CPUs */
-         double *values = (double *) malloc(4*sizeof(double));
+         double *values = (double *) malloc(4 * sizeof(double));
 
          for (i = 0; i < maxnvalues; i++)
+         {
             values[i] = 0.0;
+         }
 
          {
             /* Values below our box */
@@ -408,14 +426,18 @@ int main (int argc, char *argv[])
 
             int nvalues = 6;  /* 6 grid points */
             /* double values[6]; OK to use constant-length array for CPUs */
-            double *values = (double *) malloc(6*sizeof(double));
+            double *values = (double *) malloc(6 * sizeof(double));
 
             for (i = 0; i < nvalues; i ++)
+            {
                values[i] = 1.0;
+            }
             HYPRE_StructVectorSetBoxValues(b, ilower, iupper, values);
 
             for (i = 0; i < nvalues; i ++)
+            {
                values[i] = 0.0;
+            }
             HYPRE_StructVectorSetBoxValues(x, ilower, iupper, values);
 
             free(values);
@@ -428,14 +450,18 @@ int main (int argc, char *argv[])
 
             int nvalues = 12; /* 12 grid points */
             /* double values[12]; OK to use constant-length array for CPUs */
-            double *values = (double *) malloc(12*sizeof(double));
+            double *values = (double *) malloc(12 * sizeof(double));
 
             for (i = 0; i < nvalues; i ++)
+            {
                values[i] = 1.0;
+            }
             HYPRE_StructVectorSetBoxValues(b, ilower, iupper, values);
 
             for (i = 0; i < nvalues; i ++)
+            {
                values[i] = 0.0;
+            }
             HYPRE_StructVectorSetBoxValues(x, ilower, iupper, values);
 
             free(values);
@@ -450,14 +476,18 @@ int main (int argc, char *argv[])
 
             int nvalues = 16; /* 16 grid points */
             /* double values[16]; OK to use constant-length array for CPUs */
-            double *values = (double *) malloc(16*sizeof(double));
+            double *values = (double *) malloc(16 * sizeof(double));
 
             for (i = 0; i < nvalues; i ++)
+            {
                values[i] = 1.0;
+            }
             HYPRE_StructVectorSetBoxValues(b, ilower, iupper, values);
 
             for (i = 0; i < nvalues; i ++)
+            {
                values[i] = 0.0;
+            }
             HYPRE_StructVectorSetBoxValues(x, ilower, iupper, values);
 
             free(values);
diff --git a/external/hypre/src/examples/ex3.c b/external/hypre/src/examples/ex3.c
index b047bf68..9b4596bc 100644
--- a/external/hypre/src/examples/ex3.c
+++ b/external/hypre/src/examples/ex3.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -153,7 +153,7 @@ int main (int argc, char *argv[])
    }
 
    /* Initialize HYPRE */
-   HYPRE_Init();
+   HYPRE_Initialize();
 
    /* Print GPU info */
    /* HYPRE_PrintDeviceInfo(); */
@@ -162,18 +162,18 @@ int main (int argc, char *argv[])
       size for the interior nodes is indicated by n (n x n).
       pi and pj indicate position in the processor grid. */
    N  = sqrt(num_procs);
-   h  = 1.0 / (N*n+1); /* note that when calculating h we must
+   h  = 1.0 / (N * n + 1); /* note that when calculating h we must
                           remember to count the boundary nodes */
-   h2 = h*h;
+   h2 = h * h;
    pj = myid / N;
-   pi = myid - pj*N;
+   pi = myid - pj * N;
 
    /* Figure out the extents of each processor's piece of the grid. */
-   ilower[0] = pi*n;
-   ilower[1] = pj*n;
+   ilower[0] = pi * n;
+   ilower[1] = pj * n;
 
-   iupper[0] = ilower[0] + n-1;
-   iupper[1] = ilower[1] + n-1;
+   iupper[0] = ilower[0] + n - 1;
+   iupper[1] = ilower[1] + n - 1;
 
    /* 1. Set up a grid */
    {
@@ -196,17 +196,19 @@ int main (int argc, char *argv[])
       /* Define the geometry of the stencil */
       {
          int entry;
-         int offsets[5][2] = {{0,0}, {-1,0}, {1,0}, {0,-1}, {0,1}};
+         int offsets[5][2] = {{0, 0}, {-1, 0}, {1, 0}, {0, -1}, {0, 1}};
 
          for (entry = 0; entry < 5; entry++)
+         {
             HYPRE_StructStencilSetElement(stencil, entry, offsets[entry]);
+         }
       }
    }
 
    /* 3. Set up a Struct Matrix */
    {
       int nentries = 5;
-      int nvalues = nentries*n*n;
+      int nvalues = nentries * n * n;
       double *values;
       int stencil_indices[5];
 
@@ -219,7 +221,9 @@ int main (int argc, char *argv[])
       values = (double*) calloc(nvalues, sizeof(double));
 
       for (j = 0; j < nentries; j++)
+      {
          stencil_indices[j] = j;
+      }
 
       /* Set the standard stencil at each grid point,
          we will fix the boundaries later */
@@ -227,7 +231,9 @@ int main (int argc, char *argv[])
       {
          values[i] = 4.0;
          for (j = 1; j < nentries; j++)
-            values[i+j] = -1.0;
+         {
+            values[i + j] = -1.0;
+         }
       }
 
       HYPRE_StructMatrixSetBoxValues(A, ilower, iupper, nentries,
@@ -243,23 +249,25 @@ int main (int argc, char *argv[])
       int bc_ilower[2];
       int bc_iupper[2];
       int nentries = 1;
-      int nvalues  = nentries*n; /*  number of stencil entries times the length
+      int nvalues  = nentries * n; /*  number of stencil entries times the length
                                      of one side of my grid box */
       double *values;
       int stencil_indices[1];
 
       values = (double*) calloc(nvalues, sizeof(double));
       for (j = 0; j < nvalues; j++)
+      {
          values[j] = 0.0;
+      }
 
       /* Recall: pi and pj describe position in the processor grid */
       if (pj == 0)
       {
          /* Bottom row of grid points */
-         bc_ilower[0] = pi*n;
-         bc_ilower[1] = pj*n;
+         bc_ilower[0] = pi * n;
+         bc_ilower[1] = pj * n;
 
-         bc_iupper[0] = bc_ilower[0] + n-1;
+         bc_iupper[0] = bc_ilower[0] + n - 1;
          bc_iupper[1] = bc_ilower[1];
 
          stencil_indices[0] = 3;
@@ -268,13 +276,13 @@ int main (int argc, char *argv[])
                                         stencil_indices, values);
       }
 
-      if (pj == N-1)
+      if (pj == N - 1)
       {
          /* upper row of grid points */
-         bc_ilower[0] = pi*n;
-         bc_ilower[1] = pj*n + n-1;
+         bc_ilower[0] = pi * n;
+         bc_ilower[1] = pj * n + n - 1;
 
-         bc_iupper[0] = bc_ilower[0] + n-1;
+         bc_iupper[0] = bc_ilower[0] + n - 1;
          bc_iupper[1] = bc_ilower[1];
 
          stencil_indices[0] = 4;
@@ -286,11 +294,11 @@ int main (int argc, char *argv[])
       if (pi == 0)
       {
          /* Left row of grid points */
-         bc_ilower[0] = pi*n;
-         bc_ilower[1] = pj*n;
+         bc_ilower[0] = pi * n;
+         bc_ilower[1] = pj * n;
 
          bc_iupper[0] = bc_ilower[0];
-         bc_iupper[1] = bc_ilower[1] + n-1;
+         bc_iupper[1] = bc_ilower[1] + n - 1;
 
          stencil_indices[0] = 1;
 
@@ -298,14 +306,14 @@ int main (int argc, char *argv[])
                                         stencil_indices, values);
       }
 
-      if (pi == N-1)
+      if (pi == N - 1)
       {
          /* Right row of grid points */
-         bc_ilower[0] = pi*n + n-1;
-         bc_ilower[1] = pj*n;
+         bc_ilower[0] = pi * n + n - 1;
+         bc_ilower[1] = pj * n;
 
          bc_iupper[0] = bc_ilower[0];
-         bc_iupper[1] = bc_ilower[1] + n-1;
+         bc_iupper[1] = bc_ilower[1] + n - 1;
 
          stencil_indices[0] = 2;
 
@@ -322,7 +330,7 @@ int main (int argc, char *argv[])
 
    /* 5. Set up Struct Vectors for b and x */
    {
-      int    nvalues = n*n;
+      int    nvalues = n * n;
       double *values;
 
       values = (double*) calloc(nvalues, sizeof(double));
@@ -335,13 +343,17 @@ int main (int argc, char *argv[])
       HYPRE_StructVectorInitialize(b);
       HYPRE_StructVectorInitialize(x);
 
-     /* Set the values */
+      /* Set the values */
       for (i = 0; i < nvalues; i ++)
+      {
          values[i] = h2;
+      }
       HYPRE_StructVectorSetBoxValues(b, ilower, iupper, values);
 
       for (i = 0; i < nvalues; i ++)
+      {
          values[i] = 0.0;
+      }
       HYPRE_StructVectorSetBoxValues(x, ilower, iupper, values);
 
       free(values);
@@ -375,7 +387,7 @@ int main (int argc, char *argv[])
 
       /* Set the preconditioner and solve */
       HYPRE_StructPCGSetPrecond(solver, HYPRE_StructSMGSolve,
-                                  HYPRE_StructSMGSetup, precond);
+                                HYPRE_StructSMGSetup, precond);
       HYPRE_StructPCGSetup(solver, A, b, x);
       HYPRE_StructPCGSolve(solver, A, b, x);
 
@@ -419,7 +431,7 @@ int main (int argc, char *argv[])
       FILE *file;
       char filename[255];
 
-      int k, nvalues = n*n;
+      int k, nvalues = n * n;
       double *values = (double*) calloc(nvalues, sizeof(double));
 
       /* get the local solution */
@@ -437,7 +449,9 @@ int main (int argc, char *argv[])
       k = 0;
       for (j = 0; j < n; j++)
          for (i = 0; i < n; i++)
-            fprintf(file, "%06d %.14e\n", pj*N*n*n+pi*n+j*N*n+i, values[k++]);
+         {
+            fprintf(file, "%06d %.14e\n", pj * N * n * n + pi * n + j * N * n + i, values[k++]);
+         }
 
       fflush(file);
       fclose(file);
@@ -445,7 +459,9 @@ int main (int argc, char *argv[])
 
       /* save global finite element mesh */
       if (myid == 0)
-         GLVis_PrintGlobalSquareMesh("vis/ex3.mesh", N*n-1);
+      {
+         GLVis_PrintGlobalSquareMesh("vis/ex3.mesh", N * n - 1);
+      }
 #endif
    }
 
diff --git a/external/hypre/src/examples/ex4.c b/external/hypre/src/examples/ex4.c
index ac2b78a9..202f0278 100644
--- a/external/hypre/src/examples/ex4.c
+++ b/external/hypre/src/examples/ex4.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -61,9 +61,9 @@
 #include "ex.h"
 
 #ifdef M_PI
-  #define PI M_PI
+#define PI M_PI
 #else
-  #define PI 3.14159265358979
+#define PI 3.14159265358979
 #endif
 
 #ifdef HYPRE_EXVIS
@@ -84,17 +84,25 @@ double K(double x, double y)
       case 0:
          return 1.0;
       case 1:
-         return x*x+exp(y);
+         return x * x + exp(y);
       case 2:
-         if ((fabs(x-0.5) < 0.25) && (fabs(y-0.5) < 0.25))
+         if ((fabs(x - 0.5) < 0.25) && (fabs(y - 0.5) < 0.25))
+         {
             return 100.0;
+         }
          else
+         {
             return 1.0;
+         }
       case 3:
-         if (((x-0.5)*(x-0.5)+(y-0.5)*(y-0.5)) < 0.0625)
+         if (((x - 0.5) * (x - 0.5) + (y - 0.5) * (y - 0.5)) < 0.0625)
+         {
             return 10.0;
+         }
          else
+         {
             return 1.0;
+         }
       default:
          return 1.0;
    }
@@ -160,9 +168,9 @@ double U0(double x, double y)
       case 0:
          return 0.0;
       case 1:
-         return (x+y)/100;
+         return (x + y) / 100;
       case 2:
-         return (sin(5*PI*x)+sin(5*PI*y))/1000;
+         return (sin(5 * PI * x) + sin(5 * PI * y)) / 1000;
       default:
          return 0.0;
    }
@@ -178,17 +186,25 @@ double F(double x, double y)
       case 1:
          return 0.0;
       case 2:
-         return 2*PI*PI*sin(PI*x)*sin(PI*y);
+         return 2 * PI * PI * sin(PI * x) * sin(PI * y);
       case 3:
-         if ((fabs(x-0.5) < 0.25) && (fabs(y-0.5) < 0.25))
+         if ((fabs(x - 0.5) < 0.25) && (fabs(y - 0.5) < 0.25))
+         {
             return -1.0;
+         }
          else
+         {
             return 1.0;
+         }
       case 4:
-         if (((x-0.5)*(x-0.5)+(y-0.5)*(y-0.5)) < 0.0625)
+         if (((x - 0.5) * (x - 0.5) + (y - 0.5) * (y - 0.5)) < 0.0625)
+         {
             return -1.0;
+         }
          else
+         {
             return 1.0;
+         }
       default:
          return 1.0;
    }
@@ -229,7 +245,7 @@ int main (int argc, char *argv[])
    MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
 
    /* Initialize HYPRE */
-   HYPRE_Init();
+   HYPRE_Initialize();
 
    /* Print GPU info */
    /* HYPRE_PrintDeviceInfo(); */
@@ -384,23 +400,25 @@ int main (int argc, char *argv[])
 
    /* Convection produces non-symmetric matrices */
    if (optionB && sym)
+   {
       optionB = 0;
+   }
 
    /* Figure out the processor grid (N x N).  The local
       problem size is indicated by n (n x n). pi and pj
       indicate position in the processor grid. */
    N  = sqrt(num_procs);
-   h  = 1.0 / (N*n-1);
-   h2 = h*h;
+   h  = 1.0 / (N * n - 1);
+   h2 = h * h;
    pj = myid / N;
-   pi = myid - pj*N;
+   pi = myid - pj * N;
 
    /* Define the nodes owned by the current processor (each processor's
       piece of the global grid) */
-   ilower[0] = pi*n;
-   ilower[1] = pj*n;
-   iupper[0] = ilower[0] + n-1;
-   iupper[1] = ilower[1] + n-1;
+   ilower[0] = pi * n;
+   ilower[1] = pj * n;
+   iupper[0] = ilower[0] + n - 1;
+   iupper[1] = ilower[1] + n - 1;
 
    /* 1. Set up a grid */
    {
@@ -419,26 +437,30 @@ int main (int argc, char *argv[])
    if (sym == 0)
    {
       /* Define the geometry of the stencil */
-      int offsets[5][2] = {{0,0}, {-1,0}, {1,0}, {0,-1}, {0,1}};
+      int offsets[5][2] = {{0, 0}, {-1, 0}, {1, 0}, {0, -1}, {0, 1}};
 
       /* Create an empty 2D, 5-pt stencil object */
       HYPRE_StructStencilCreate(2, 5, &stencil);
 
       /* Assign stencil entries */
       for (i = 0; i < 5; i++)
+      {
          HYPRE_StructStencilSetElement(stencil, i, offsets[i]);
+      }
    }
    else /* Symmetric storage */
    {
       /* Define the geometry of the stencil */
-      int offsets[3][2] = {{0,0}, {1,0}, {0,1}};
+      int offsets[3][2] = {{0, 0}, {1, 0}, {0, 1}};
 
       /* Create an empty 2D, 3-pt stencil object */
       HYPRE_StructStencilCreate(2, 3, &stencil);
 
       /* Assign stencil entries */
       for (i = 0; i < 3; i++)
+      {
          HYPRE_StructStencilSetElement(stencil, i, offsets[i]);
+      }
    }
 
    /* 3. Set up Struct Vectors for b and x */
@@ -453,17 +475,21 @@ int main (int argc, char *argv[])
       HYPRE_StructVectorInitialize(b);
       HYPRE_StructVectorInitialize(x);
 
-      values = (double*) calloc((n*n), sizeof(double));
+      values = (double*) calloc((n * n), sizeof(double));
 
       /* Set the values of b in left-to-right, bottom-to-top order */
       for (k = 0, j = 0; j < n; j++)
          for (i = 0; i < n; i++, k++)
-            values[k] = h2 * Eval(F,i,j);
+         {
+            values[k] = h2 * Eval(F, i, j);
+         }
       HYPRE_StructVectorSetBoxValues(b, ilower, iupper, values);
 
       /* Set x = 0 */
-      for (i = 0; i < (n*n); i ++)
+      for (i = 0; i < (n * n); i ++)
+      {
          values[i] = 0.0;
+      }
       HYPRE_StructVectorSetBoxValues(x, ilower, iupper, values);
 
       free(values);
@@ -490,25 +516,25 @@ int main (int argc, char *argv[])
                                                       to the offsets */
          double *values;
 
-         values = (double*) calloc(5*(n*n), sizeof(double));
+         values = (double*) calloc(5 * (n * n), sizeof(double));
 
          /* The order is left-to-right, bottom-to-top */
          for (k = 0, j = 0; j < n; j++)
-            for (i = 0; i < n; i++, k+=5)
+            for (i = 0; i < n; i++, k += 5)
             {
-               values[k+1] = - Eval(K,i-0.5,j) - Eval(B1,i-0.5,j);
+               values[k + 1] = - Eval(K, i - 0.5, j) - Eval(B1, i - 0.5, j);
 
-               values[k+2] = - Eval(K,i+0.5,j) + Eval(B1,i+0.5,j);
+               values[k + 2] = - Eval(K, i + 0.5, j) + Eval(B1, i + 0.5, j);
 
-               values[k+3] = - Eval(K,i,j-0.5) - Eval(B2,i,j-0.5);
+               values[k + 3] = - Eval(K, i, j - 0.5) - Eval(B2, i, j - 0.5);
 
-               values[k+4] = - Eval(K,i,j+0.5) + Eval(B2,i,j+0.5);
+               values[k + 4] = - Eval(K, i, j + 0.5) + Eval(B2, i, j + 0.5);
 
-               values[k] = h2 * Eval(C,i,j)
-                  + Eval(K ,i-0.5,j) + Eval(K ,i+0.5,j)
-                  + Eval(K ,i,j-0.5) + Eval(K ,i,j+0.5)
-                  - Eval(B1,i-0.5,j) + Eval(B1,i+0.5,j)
-                  - Eval(B2,i,j-0.5) + Eval(B2,i,j+0.5);
+               values[k] = h2 * Eval(C, i, j)
+                           + Eval(K, i - 0.5, j) + Eval(K, i + 0.5, j)
+                           + Eval(K, i, j - 0.5) + Eval(K, i, j + 0.5)
+                           - Eval(B1, i - 0.5, j) + Eval(B1, i + 0.5, j)
+                           - Eval(B2, i, j - 0.5) + Eval(B2, i, j + 0.5);
             }
 
          HYPRE_StructMatrixSetBoxValues(A, ilower, iupper, 5,
@@ -521,17 +547,17 @@ int main (int argc, char *argv[])
          int stencil_indices[3] = {0, 1, 2};
          double *values;
 
-         values = (double*) calloc(3*(n*n), sizeof(double));
+         values = (double*) calloc(3 * (n * n), sizeof(double));
 
          /* The order is left-to-right, bottom-to-top */
          for (k = 0, j = 0; j < n; j++)
-            for (i = 0; i < n; i++, k+=3)
+            for (i = 0; i < n; i++, k += 3)
             {
-               values[k+1] = - Eval(K,i+0.5,j);
-               values[k+2] = - Eval(K,i,j+0.5);
-               values[k] = h2 * Eval(C,i,j)
-                  + Eval(K,i+0.5,j) + Eval(K,i,j+0.5)
-                  + Eval(K,i-0.5,j) + Eval(K,i,j-0.5);
+               values[k + 1] = - Eval(K, i + 0.5, j);
+               values[k + 2] = - Eval(K, i, j + 0.5);
+               values[k] = h2 * Eval(C, i, j)
+                           + Eval(K, i + 0.5, j) + Eval(K, i, j + 0.5)
+                           + Eval(K, i - 0.5, j) + Eval(K, i, j - 0.5);
             }
 
          HYPRE_StructMatrixSetBoxValues(A, ilower, iupper, 3,
@@ -553,29 +579,35 @@ int main (int argc, char *argv[])
 
       int nentries;
       if (sym == 0)
+      {
          nentries = 5;
+      }
       else
+      {
          nentries = 3;
+      }
 
-      values  = (double*) calloc(nentries*n, sizeof(double));
+      values  = (double*) calloc(nentries * n, sizeof(double));
       bvalues = (double*) calloc(n, sizeof(double));
 
       /* The stencil at the boundary nodes is 1-0-0-0-0. Because
          we have I x_b = u_0; */
-      for (i = 0; i < nentries*n; i += nentries)
+      for (i = 0; i < nentries * n; i += nentries)
       {
          values[i] = 1.0;
          for (j = 1; j < nentries; j++)
-            values[i+j] = 0.0;
+         {
+            values[i + j] = 0.0;
+         }
       }
 
       /* Processors at y = 0 */
       if (pj == 0)
       {
-         bc_ilower[0] = pi*n;
-         bc_ilower[1] = pj*n;
+         bc_ilower[0] = pi * n;
+         bc_ilower[1] = pj * n;
 
-         bc_iupper[0] = bc_ilower[0] + n-1;
+         bc_iupper[0] = bc_ilower[0] + n - 1;
          bc_iupper[1] = bc_ilower[1];
 
          /* Modify the matrix */
@@ -584,18 +616,20 @@ int main (int argc, char *argv[])
 
          /* Put the boundary conditions in b */
          for (i = 0; i < n; i++)
-            bvalues[i] = bcEval(U0,i,0);
+         {
+            bvalues[i] = bcEval(U0, i, 0);
+         }
 
          HYPRE_StructVectorSetBoxValues(b, bc_ilower, bc_iupper, bvalues);
       }
 
       /* Processors at y = 1 */
-      if (pj == N-1)
+      if (pj == N - 1)
       {
-         bc_ilower[0] = pi*n;
-         bc_ilower[1] = pj*n + n-1;
+         bc_ilower[0] = pi * n;
+         bc_ilower[1] = pj * n + n - 1;
 
-         bc_iupper[0] = bc_ilower[0] + n-1;
+         bc_iupper[0] = bc_ilower[0] + n - 1;
          bc_iupper[1] = bc_ilower[1];
 
          /* Modify the matrix */
@@ -604,7 +638,9 @@ int main (int argc, char *argv[])
 
          /* Put the boundary conditions in b */
          for (i = 0; i < n; i++)
-            bvalues[i] = bcEval(U0,i,0);
+         {
+            bvalues[i] = bcEval(U0, i, 0);
+         }
 
          HYPRE_StructVectorSetBoxValues(b, bc_ilower, bc_iupper, bvalues);
       }
@@ -612,11 +648,11 @@ int main (int argc, char *argv[])
       /* Processors at x = 0 */
       if (pi == 0)
       {
-         bc_ilower[0] = pi*n;
-         bc_ilower[1] = pj*n;
+         bc_ilower[0] = pi * n;
+         bc_ilower[1] = pj * n;
 
          bc_iupper[0] = bc_ilower[0];
-         bc_iupper[1] = bc_ilower[1] + n-1;
+         bc_iupper[1] = bc_ilower[1] + n - 1;
 
          /* Modify the matrix */
          HYPRE_StructMatrixSetBoxValues(A, bc_ilower, bc_iupper, nentries,
@@ -624,19 +660,21 @@ int main (int argc, char *argv[])
 
          /* Put the boundary conditions in b */
          for (j = 0; j < n; j++)
-            bvalues[j] = bcEval(U0,0,j);
+         {
+            bvalues[j] = bcEval(U0, 0, j);
+         }
 
          HYPRE_StructVectorSetBoxValues(b, bc_ilower, bc_iupper, bvalues);
       }
 
       /* Processors at x = 1 */
-      if (pi == N-1)
+      if (pi == N - 1)
       {
-         bc_ilower[0] = pi*n + n-1;
-         bc_ilower[1] = pj*n;
+         bc_ilower[0] = pi * n + n - 1;
+         bc_ilower[1] = pj * n;
 
          bc_iupper[0] = bc_ilower[0];
-         bc_iupper[1] = bc_ilower[1] + n-1;
+         bc_iupper[1] = bc_ilower[1] + n - 1;
 
          /* Modify the matrix */
          HYPRE_StructMatrixSetBoxValues(A, bc_ilower, bc_iupper, nentries,
@@ -644,7 +682,9 @@ int main (int argc, char *argv[])
 
          /* Put the boundary conditions in b */
          for (j = 0; j < n; j++)
-            bvalues[j] = bcEval(U0,0,j);
+         {
+            bvalues[j] = bcEval(U0, 0, j);
+         }
 
          HYPRE_StructVectorSetBoxValues(b, bc_ilower, bc_iupper, bvalues);
       }
@@ -661,17 +701,19 @@ int main (int argc, char *argv[])
       /* Processors at y = 0, neighbors of boundary nodes */
       if (pj == 0)
       {
-         bc_ilower[0] = pi*n;
-         bc_ilower[1] = pj*n + 1;
+         bc_ilower[0] = pi * n;
+         bc_ilower[1] = pj * n + 1;
 
-         bc_iupper[0] = bc_ilower[0] + n-1;
+         bc_iupper[0] = bc_ilower[0] + n - 1;
          bc_iupper[1] = bc_ilower[1];
 
          stencil_indices[0] = 3;
 
          /* Modify the matrix */
          for (i = 0; i < n; i++)
+         {
             bvalues[i] = 0.0;
+         }
 
          if (sym == 0)
             HYPRE_StructMatrixSetBoxValues(A, bc_ilower, bc_iupper, 1,
@@ -679,13 +721,19 @@ int main (int argc, char *argv[])
 
          /* Eliminate the boundary conditions in b */
          for (i = 0; i < n; i++)
-            bvalues[i] = bcEval(U0,i,-1) * (bcEval(K,i,-0.5)+bcEval(B2,i,-0.5));
+         {
+            bvalues[i] = bcEval(U0, i, -1) * (bcEval(K, i, -0.5) + bcEval(B2, i, -0.5));
+         }
 
          if (pi == 0)
+         {
             bvalues[0] = 0.0;
+         }
 
-         if (pi == N-1)
-            bvalues[n-1] = 0.0;
+         if (pi == N - 1)
+         {
+            bvalues[n - 1] = 0.0;
+         }
 
          /* Note the use of AddToBoxValues (because we have already set values
             at these nodes) */
@@ -695,17 +743,19 @@ int main (int argc, char *argv[])
       /* Processors at x = 0, neighbors of boundary nodes */
       if (pi == 0)
       {
-         bc_ilower[0] = pi*n + 1;
-         bc_ilower[1] = pj*n;
+         bc_ilower[0] = pi * n + 1;
+         bc_ilower[1] = pj * n;
 
          bc_iupper[0] = bc_ilower[0];
-         bc_iupper[1] = bc_ilower[1] + n-1;
+         bc_iupper[1] = bc_ilower[1] + n - 1;
 
          stencil_indices[0] = 1;
 
          /* Modify the matrix */
          for (j = 0; j < n; j++)
+         {
             bvalues[j] = 0.0;
+         }
 
          if (sym == 0)
             HYPRE_StructMatrixSetBoxValues(A, bc_ilower, bc_iupper, 1,
@@ -713,81 +763,111 @@ int main (int argc, char *argv[])
 
          /* Eliminate the boundary conditions in b */
          for (j = 0; j < n; j++)
-            bvalues[j] = bcEval(U0,-1,j) * (bcEval(K,-0.5,j)+bcEval(B1,-0.5,j));
+         {
+            bvalues[j] = bcEval(U0, -1, j) * (bcEval(K, -0.5, j) + bcEval(B1, -0.5, j));
+         }
 
          if (pj == 0)
+         {
             bvalues[0] = 0.0;
+         }
 
-         if (pj == N-1)
-            bvalues[n-1] = 0.0;
+         if (pj == N - 1)
+         {
+            bvalues[n - 1] = 0.0;
+         }
 
          HYPRE_StructVectorAddToBoxValues(b, bc_ilower, bc_iupper, bvalues);
       }
 
       /* Processors at y = 1, neighbors of boundary nodes */
-      if (pj == N-1)
+      if (pj == N - 1)
       {
-         bc_ilower[0] = pi*n;
-         bc_ilower[1] = pj*n + (n-1) -1;
+         bc_ilower[0] = pi * n;
+         bc_ilower[1] = pj * n + (n - 1) - 1;
 
-         bc_iupper[0] = bc_ilower[0] + n-1;
+         bc_iupper[0] = bc_ilower[0] + n - 1;
          bc_iupper[1] = bc_ilower[1];
 
          if (sym == 0)
+         {
             stencil_indices[0] = 4;
+         }
          else
+         {
             stencil_indices[0] = 2;
+         }
 
          /* Modify the matrix */
          for (i = 0; i < n; i++)
+         {
             bvalues[i] = 0.0;
+         }
 
          HYPRE_StructMatrixSetBoxValues(A, bc_ilower, bc_iupper, 1,
                                         stencil_indices, bvalues);
 
          /* Eliminate the boundary conditions in b */
          for (i = 0; i < n; i++)
-            bvalues[i] = bcEval(U0,i,1) * (bcEval(K,i,0.5)+bcEval(B2,i,0.5));
+         {
+            bvalues[i] = bcEval(U0, i, 1) * (bcEval(K, i, 0.5) + bcEval(B2, i, 0.5));
+         }
 
          if (pi == 0)
+         {
             bvalues[0] = 0.0;
+         }
 
-         if (pi == N-1)
-            bvalues[n-1] = 0.0;
+         if (pi == N - 1)
+         {
+            bvalues[n - 1] = 0.0;
+         }
 
          HYPRE_StructVectorAddToBoxValues(b, bc_ilower, bc_iupper, bvalues);
       }
 
       /* Processors at x = 1, neighbors of boundary nodes */
-      if (pi == N-1)
+      if (pi == N - 1)
       {
-         bc_ilower[0] = pi*n + (n-1) - 1;
-         bc_ilower[1] = pj*n;
+         bc_ilower[0] = pi * n + (n - 1) - 1;
+         bc_ilower[1] = pj * n;
 
          bc_iupper[0] = bc_ilower[0];
-         bc_iupper[1] = bc_ilower[1] + n-1;
+         bc_iupper[1] = bc_ilower[1] + n - 1;
 
          if (sym == 0)
+         {
             stencil_indices[0] = 2;
+         }
          else
+         {
             stencil_indices[0] = 1;
+         }
 
          /* Modify the matrix */
          for (j = 0; j < n; j++)
+         {
             bvalues[j] = 0.0;
+         }
 
          HYPRE_StructMatrixSetBoxValues(A, bc_ilower, bc_iupper, 1,
                                         stencil_indices, bvalues);
 
          /* Eliminate the boundary conditions in b */
          for (j = 0; j < n; j++)
-            bvalues[j] = bcEval(U0,1,j) * (bcEval(K,0.5,j)+bcEval(B1,0.5,j));
+         {
+            bvalues[j] = bcEval(U0, 1, j) * (bcEval(K, 0.5, j) + bcEval(B1, 0.5, j));
+         }
 
          if (pj == 0)
+         {
             bvalues[0] = 0.0;
+         }
 
-         if (pj == N-1)
-            bvalues[n-1] = 0.0;
+         if (pj == N - 1)
+         {
+            bvalues[n - 1] = 0.0;
+         }
 
          HYPRE_StructVectorAddToBoxValues(b, bc_ilower, bc_iupper, bvalues);
       }
@@ -1024,7 +1104,7 @@ int main (int argc, char *argv[])
          type HYPRE_Solver, and then the casting would not be necessary.*/
 
       HYPRE_GMRESSetMaxIter((HYPRE_Solver) solver, 500 );
-      HYPRE_GMRESSetKDim((HYPRE_Solver) solver,30);
+      HYPRE_GMRESSetKDim((HYPRE_Solver) solver, 30);
       HYPRE_GMRESSetTol((HYPRE_Solver) solver, 1.0e-06 );
       HYPRE_GMRESSetPrintLevel((HYPRE_Solver) solver, 2 );
       HYPRE_GMRESSetLogging((HYPRE_Solver) solver, 1 );
@@ -1085,9 +1165,9 @@ int main (int argc, char *argv[])
          /* use diagonal scaling as preconditioner */
          precond = NULL;
          HYPRE_StructGMRESSetPrecond( solver,
-                                     HYPRE_StructDiagScale,
-                                     HYPRE_StructDiagScaleSetup,
-                                     precond);
+                                      HYPRE_StructDiagScale,
+                                      HYPRE_StructDiagScaleSetup,
+                                      precond);
       }
 
       /* GMRES Setup */
@@ -1138,7 +1218,7 @@ int main (int argc, char *argv[])
       FILE *file;
       char filename[255];
 
-      int nvalues = n*n;
+      int nvalues = n * n;
       double *values =  (double*) calloc(nvalues, sizeof(double));
 
       /* get the local solution */
@@ -1156,7 +1236,9 @@ int main (int argc, char *argv[])
       k = 0;
       for (j = 0; j < n; j++)
          for (i = 0; i < n; i++)
-            fprintf(file, "%06d %.14e\n", pj*N*n*n+pi*n+j*N*n+i, values[k++]);
+         {
+            fprintf(file, "%06d %.14e\n", pj * N * n * n + pi * n + j * N * n + i, values[k++]);
+         }
 
       fflush(file);
       fclose(file);
@@ -1164,7 +1246,9 @@ int main (int argc, char *argv[])
 
       /* save global finite element mesh */
       if (myid == 0)
-         GLVis_PrintGlobalSquareMesh("vis/ex4.mesh", N*n-1);
+      {
+         GLVis_PrintGlobalSquareMesh("vis/ex4.mesh", N * n - 1);
+      }
 #endif
    }
 
diff --git a/external/hypre/src/examples/ex5.c b/external/hypre/src/examples/ex5.c
index 8e8ea739..7afa32ce 100644
--- a/external/hypre/src/examples/ex5.c
+++ b/external/hypre/src/examples/ex5.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -70,10 +70,14 @@ int main (int argc, char *argv[])
    MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
 
    /* Initialize HYPRE */
-   HYPRE_Init();
+   HYPRE_Initialize();
 
    /* Print GPU info */
    /* HYPRE_PrintDeviceInfo(); */
+#if defined(HYPRE_USING_GPU)
+   /* use vendor implementation for SpGEMM */
+   HYPRE_SetSpGemmUseVendor(0);
+#endif
 
    /* Default problem parameters */
    n = 33;
@@ -145,22 +149,22 @@ int main (int argc, char *argv[])
    }
 
    /* Preliminaries: want at least one processor per row */
-   if (n*n < num_procs) n = sqrt(num_procs) + 1;
-   N = n*n; /* global number of rows */
-   h = 1.0/(n+1); /* mesh size*/
-   h2 = h*h;
+   if (n * n < num_procs) { n = sqrt(num_procs) + 1; }
+   N = n * n; /* global number of rows */
+   h = 1.0 / (n + 1); /* mesh size*/
+   h2 = h * h;
 
    /* Each processor knows only of its own rows - the range is denoted by ilower
       and upper.  Here we partition the rows. We account for the fact that
       N may not divide evenly by the number of processors. */
-   local_size = N/num_procs;
-   extra = N - local_size*num_procs;
+   local_size = N / num_procs;
+   extra = N - local_size * num_procs;
 
-   ilower = local_size*myid;
+   ilower = local_size * myid;
    ilower += my_min(myid, extra);
 
-   iupper = local_size*(myid+1);
-   iupper += my_min(myid+1, extra);
+   iupper = local_size * (myid + 1);
+   iupper += my_min(myid + 1, extra);
    iupper = iupper - 1;
 
    /* How many rows do I have? */
@@ -192,26 +196,26 @@ int main (int argc, char *argv[])
       double values[5];
       int cols[5];
       */
-      double *values = (double *) malloc(5*sizeof(double));
-      int *cols = (int *) malloc(5*sizeof(int));
-      int *tmp = (int *) malloc(2*sizeof(int));
+      double *values = (double *) malloc(5 * sizeof(double));
+      int *cols = (int *) malloc(5 * sizeof(int));
+      int *tmp = (int *) malloc(2 * sizeof(int));
 
       for (i = ilower; i <= iupper; i++)
       {
          nnz = 0;
 
          /* The left identity block:position i-n */
-         if ((i-n)>=0)
+         if ((i - n) >= 0)
          {
-            cols[nnz] = i-n;
+            cols[nnz] = i - n;
             values[nnz] = -1.0;
             nnz++;
          }
 
          /* The left -1: position i-1 */
-         if (i%n)
+         if (i % n)
          {
-            cols[nnz] = i-1;
+            cols[nnz] = i - 1;
             values[nnz] = -1.0;
             nnz++;
          }
@@ -222,17 +226,17 @@ int main (int argc, char *argv[])
          nnz++;
 
          /* The right -1: position i+1 */
-         if ((i+1)%n)
+         if ((i + 1) % n)
          {
-            cols[nnz] = i+1;
+            cols[nnz] = i + 1;
             values[nnz] = -1.0;
             nnz++;
          }
 
          /* The right identity block:position i+n */
-         if ((i+n)< N)
+         if ((i + n) < N)
          {
-            cols[nnz] = i+n;
+            cols[nnz] = i + n;
             values[nnz] = -1.0;
             nnz++;
          }
@@ -270,11 +274,11 @@ int main (int argc, char *argv[])
 
 
    /* Create the rhs and solution */
-   HYPRE_IJVectorCreate(MPI_COMM_WORLD, ilower, iupper,&b);
+   HYPRE_IJVectorCreate(MPI_COMM_WORLD, ilower, iupper, &b);
    HYPRE_IJVectorSetObjectType(b, HYPRE_PARCSR);
    HYPRE_IJVectorInitialize(b);
 
-   HYPRE_IJVectorCreate(MPI_COMM_WORLD, ilower, iupper,&x);
+   HYPRE_IJVectorCreate(MPI_COMM_WORLD, ilower, iupper, &x);
    HYPRE_IJVectorSetObjectType(x, HYPRE_PARCSR);
    HYPRE_IJVectorInitialize(x);
 
@@ -287,7 +291,7 @@ int main (int argc, char *argv[])
       x_values =  (double*) calloc(local_size, sizeof(double));
       rows = (int*) calloc(local_size, sizeof(int));
 
-      for (i=0; i<local_size; i++)
+      for (i = 0; i < local_size; i++)
       {
          rhs_values[i] = h2;
          x_values[i] = 0.0;
@@ -317,8 +321,8 @@ int main (int argc, char *argv[])
    HYPRE_IJVectorGetObject(x, (void **) &par_x);
 
 
-  /*  Print out the system  - files names will be IJ.out.A.XXXXX
-       and IJ.out.b.XXXXX, where XXXXX = processor id */
+   /*  Print out the system  - files names will be IJ.out.A.XXXXX
+        and IJ.out.b.XXXXX, where XXXXX = processor id */
    if (print_system)
    {
       HYPRE_IJMatrixPrint(A, "IJ.out.A");
@@ -533,15 +537,17 @@ int main (int argc, char *argv[])
 
       /* Set the FlexGMRES preconditioner */
       HYPRE_FlexGMRESSetPrecond(solver, (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSolve,
-                          (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSetup, precond);
+                                (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSetup, precond);
 
 
       if (modify)
-      /* this is an optional call  - if you don't call it, hypre_FlexGMRESModifyPCDefault
-         is used - which does nothing.  Otherwise, you can define your own, similar to
-         the one used here */
-         HYPRE_FlexGMRESSetModifyPC( solver,
-                                     (HYPRE_PtrToModifyPCFcn) hypre_FlexGMRESModifyPCAMGExample);
+      {
+         /* this is an optional call  - if you don't call it, hypre_FlexGMRESModifyPCDefault
+            is used - which does nothing.  Otherwise, you can define your own, similar to
+            the one used here */
+         HYPRE_FlexGMRESSetModifyPC(
+            solver, (HYPRE_PtrToModifyPCFcn) hypre_FlexGMRESModifyPCAMGExample);
+      }
 
 
       /* Now setup and solve! */
@@ -566,7 +572,7 @@ int main (int argc, char *argv[])
    }
    else
    {
-      if (myid ==0) printf("Invalid solver id specified.\n");
+      if (myid == 0) { printf("Invalid solver id specified.\n"); }
    }
 
    /* Save the solution for GLVis visualization, see vis/glvis-ex5.sh */
@@ -581,7 +587,9 @@ int main (int argc, char *argv[])
       double *values =  (double*) calloc(nvalues, sizeof(double));
 
       for (i = 0; i < nvalues; i++)
+      {
          rows[i] = ilower + i;
+      }
 
       /* get the local solution */
       HYPRE_IJVectorGetValues(x, nvalues, rows, values);
@@ -596,7 +604,9 @@ int main (int argc, char *argv[])
 
       /* save solution */
       for (i = 0; i < nvalues; i++)
+      {
          fprintf(file, "%.14e\n", values[i]);
+      }
 
       fflush(file);
       fclose(file);
@@ -606,7 +616,9 @@ int main (int argc, char *argv[])
 
       /* save global finite element mesh */
       if (myid == 0)
-         GLVis_PrintGlobalSquareMesh("vis/ex5.mesh", n-1);
+      {
+         GLVis_PrintGlobalSquareMesh("vis/ex5.mesh", n - 1);
+      }
 #endif
    }
 
@@ -621,7 +633,7 @@ int main (int argc, char *argv[])
    /* Finalize MPI*/
    MPI_Finalize();
 
-   return(0);
+   return (0);
 }
 
 /*--------------------------------------------------------------------------
@@ -635,7 +647,7 @@ int main (int argc, char *argv[])
  *--------------------------------------------------------------------------*/
 
 int hypre_FlexGMRESModifyPCAMGExample(void *precond_data, int iterations,
-                                   double rel_residual_norm)
+                                      double rel_residual_norm)
 {
 
 
diff --git a/external/hypre/src/examples/ex5big.c b/external/hypre/src/examples/ex5big.c
index 2c0347d0..29bc872d 100644
--- a/external/hypre/src/examples/ex5big.c
+++ b/external/hypre/src/examples/ex5big.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -73,7 +73,7 @@ int main (int argc, char *argv[])
    MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
 
    /* Initialize HYPRE */
-   HYPRE_Init();
+   HYPRE_Initialize();
 
    /* Default problem parameters */
    n = 33;
@@ -138,22 +138,22 @@ int main (int argc, char *argv[])
    }
 
    /* Preliminaries: want at least one processor per row */
-   if (n*n < num_procs) n = sqrt(num_procs) + 1;
-   N = n*n; /* global number of rows */
-   h = 1.0/(n+1); /* mesh size*/
-   h2 = h*h;
+   if (n * n < num_procs) { n = sqrt(num_procs) + 1; }
+   N = n * n; /* global number of rows */
+   h = 1.0 / (n + 1); /* mesh size*/
+   h2 = h * h;
 
    /* Each processor knows only of its own rows - the range is denoted by ilower
       and upper.  Here we partition the rows. We account for the fact that
       N may not divide evenly by the number of processors. */
-   local_size = N/num_procs;
-   extra = N - local_size*num_procs;
+   local_size = N / num_procs;
+   extra = N - local_size * num_procs;
 
-   ilower = local_size*myid;
+   ilower = local_size * myid;
    ilower += my_min(myid, extra);
 
-   iupper = local_size*(myid+1);
-   iupper += my_min(myid+1, extra);
+   iupper = local_size * (myid + 1);
+   iupper += my_min(myid + 1, extra);
    iupper = iupper - 1;
 
    /* How many rows do I have? */
@@ -189,17 +189,17 @@ int main (int argc, char *argv[])
          nnz = 0;
 
          /* The left identity block:position i-n */
-         if ((i-n)>=0)
+         if ((i - n) >= 0)
          {
-            cols[nnz] = i-n;
+            cols[nnz] = i - n;
             values[nnz] = -1.0;
             nnz++;
          }
 
          /* The left -1: position i-1 */
-         if (i%n)
+         if (i % n)
          {
-            cols[nnz] = i-1;
+            cols[nnz] = i - 1;
             values[nnz] = -1.0;
             nnz++;
          }
@@ -210,17 +210,17 @@ int main (int argc, char *argv[])
          nnz++;
 
          /* The right -1: position i+1 */
-         if ((i+1)%n)
+         if ((i + 1) % n)
          {
-            cols[nnz] = i+1;
+            cols[nnz] = i + 1;
             values[nnz] = -1.0;
             nnz++;
          }
 
          /* The right identity block:position i+n */
-         if ((i+n)< N)
+         if ((i + n) < N)
          {
-            cols[nnz] = i+n;
+            cols[nnz] = i + n;
             values[nnz] = -1.0;
             nnz++;
          }
@@ -252,11 +252,11 @@ int main (int argc, char *argv[])
 
 
    /* Create the rhs and solution */
-   HYPRE_IJVectorCreate(MPI_COMM_WORLD, ilower, iupper,&b);
+   HYPRE_IJVectorCreate(MPI_COMM_WORLD, ilower, iupper, &b);
    HYPRE_IJVectorSetObjectType(b, HYPRE_PARCSR);
    HYPRE_IJVectorInitialize(b);
 
-   HYPRE_IJVectorCreate(MPI_COMM_WORLD, ilower, iupper,&x);
+   HYPRE_IJVectorCreate(MPI_COMM_WORLD, ilower, iupper, &x);
    HYPRE_IJVectorSetObjectType(x, HYPRE_PARCSR);
    HYPRE_IJVectorInitialize(x);
 
@@ -269,7 +269,7 @@ int main (int argc, char *argv[])
       x_values = (double*) calloc(local_size, sizeof(double));
       rows = (HYPRE_Int*) calloc(local_size, sizeof(HYPRE_Int));
 
-      for (i=0; i<local_size; i++)
+      for (i = 0; i < local_size; i++)
       {
          rhs_values[i] = h2;
          x_values[i] = 0.0;
@@ -299,8 +299,8 @@ int main (int argc, char *argv[])
    HYPRE_IJVectorGetObject(x, (void **) &par_x);
 
 
-  /*  Print out the system  - files names will be IJ.out.A.XXXXX
-       and IJ.out.b.XXXXX, where XXXXX = processor id */
+   /*  Print out the system  - files names will be IJ.out.A.XXXXX
+        and IJ.out.b.XXXXX, where XXXXX = processor id */
    if (print_system)
    {
       HYPRE_IJMatrixPrint(A, "IJ.out.A");
@@ -515,15 +515,17 @@ int main (int argc, char *argv[])
 
       /* Set the FlexGMRES preconditioner */
       HYPRE_FlexGMRESSetPrecond(solver, (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSolve,
-                          (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSetup, precond);
+                                (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSetup, precond);
 
 
       if (modify)
-      /* this is an optional call  - if you don't call it, hypre_FlexGMRESModifyPCDefault
-         is used - which does nothing.  Otherwise, you can define your own, similar to
-         the one used here */
-         HYPRE_FlexGMRESSetModifyPC( solver,
-                                     (HYPRE_PtrToModifyPCFcn) hypre_FlexGMRESModifyPCAMGExample);
+      {
+         /* this is an optional call  - if you don't call it, hypre_FlexGMRESModifyPCDefault
+            is used - which does nothing.  Otherwise, you can define your own, similar to
+            the one used here */
+         HYPRE_FlexGMRESSetModifyPC(
+            solver, (HYPRE_PtrToModifyPCFcn) hypre_FlexGMRESModifyPCAMGExample);
+      }
 
 
       /* Now setup and solve! */
@@ -548,7 +550,7 @@ int main (int argc, char *argv[])
    }
    else
    {
-      if (myid ==0) printf("Invalid solver id specified.\n");
+      if (myid == 0) { printf("Invalid solver id specified.\n"); }
    }
 
    /* Clean up */
@@ -562,7 +564,7 @@ int main (int argc, char *argv[])
    /* Finalize MPI*/
    MPI_Finalize();
 
-   return(0);
+   return (0);
 }
 
 /*--------------------------------------------------------------------------
@@ -576,7 +578,7 @@ int main (int argc, char *argv[])
  *--------------------------------------------------------------------------*/
 
 int hypre_FlexGMRESModifyPCAMGExample(void *precond_data, int iterations,
-                                   double rel_residual_norm)
+                                      double rel_residual_norm)
 {
 
 
diff --git a/external/hypre/src/examples/ex5cuf.cuf b/external/hypre/src/examples/ex5cuf.cuf
new file mode 100644
index 00000000..f9481322
--- /dev/null
+++ b/external/hypre/src/examples/ex5cuf.cuf
@@ -0,0 +1,487 @@
+!     Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+!     HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+!
+!     SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+!
+!   Example 5
+!
+!   Interface:    Linear-Algebraic (IJ), Fortran (77) version
+!
+!   Compile with: make ex5f
+!
+!   Sample run:   mpirun -np 4 ex5f
+!
+!   Description:  This example solves the 2-D
+!                 Laplacian problem with zero boundary conditions
+!                 on an nxn grid.  The number of unknowns is N=n^2.
+!                 The standard 5-point stencil is used, and we solve
+!                 for the interior nodes only.
+!
+!                 This example solves the same problem as Example 3.
+!                 Available solvers are AMG, PCG, and PCG with AMG,
+!                 and PCG with ParaSails
+!
+!
+!                 Notes: for PCG, GMRES and BiCGStab, precond_id means:
+!                        0 - do not set up a preconditioner
+!                        1 - set up a ds preconditioner
+!                        2 - set up an amg preconditioner
+!                        3 - set up a pilut preconditioner
+!                        4 - set up a ParaSails preconditioner
+!
+
+      program ex5f
+
+      implicit none
+
+      include 'mpif.h'
+      include 'HYPREf.h'
+
+      integer    MAX_LOCAL_SIZE
+      parameter  (MAX_LOCAL_SIZE=123000)
+
+      integer    ierr
+      integer    num_procs, myid
+      integer    local_size, extra
+      integer    n, solver_id, print_solution, ng
+      integer    nnz, ilower, iupper, i
+      integer    precond_id;
+      double precision h, h2
+
+      double precision, managed, allocatable :: rhs_values(:)
+      double precision, managed, allocatable :: x_values(:)
+      double precision, managed, allocatable :: values(:)
+      integer, managed, allocatable :: rows(:)
+      integer, managed, allocatable :: cols(:)
+      integer, managed, allocatable :: tmpi(:)
+
+      integer num_iterations
+      double precision final_res_norm, tol
+
+      integer    mpi_comm
+
+      integer*8  parcsr_A
+      integer*8  A
+      integer*8  b
+      integer*8  x
+      integer*8  par_b
+      integer*8  par_x
+      integer*8  solver
+      integer*8  precond
+
+      allocate(rhs_values(MAX_LOCAL_SIZE))
+      allocate(x_values(MAX_LOCAL_SIZE))
+      allocate(values(5))
+      allocate(rows(MAX_LOCAL_SIZE))
+      allocate(cols(5))
+      allocate(tmpi(2))
+
+!-----------------------------------------------------------------------
+!     Initialize MPI
+!-----------------------------------------------------------------------
+
+      call MPI_INIT(ierr)
+      call MPI_COMM_RANK(MPI_COMM_WORLD, myid, ierr)
+      call MPI_COMM_SIZE(MPI_COMM_WORLD, num_procs, ierr)
+      mpi_comm = MPI_COMM_WORLD
+
+      call HYPRE_Initialize(ierr)
+
+      call HYPRE_SetMemoryLocation(HYPRE_MEMORY_DEVICE, ierr)
+      call HYPRE_SetExecutionPolicy(HYPRE_EXEC_DEVICE, ierr)
+
+      call HYPRE_SetSpGemmUseVendor(0, ierr)
+
+!   Default problem parameters
+      n = 33
+      solver_id = 0
+      print_solution  = 0
+      tol = 1.0d-7
+
+!   The input section not implemented yet.
+
+!   Preliminaries: want at least one processor per row
+      if ( n*n .lt. num_procs ) then
+         n = int(sqrt(real(num_procs))) + 1
+      endif
+!     ng = global no. rows, h = mesh size
+      ng = n*n
+      h = 1.0d0/(n+1)
+      h2 = h*h
+
+!     Each processor knows only of its own rows - the range is denoted by ilower
+!     and upper.  Here we partition the rows. We account for the fact that
+!     N may not divide evenly by the number of processors.
+      local_size = ng/num_procs
+      extra = ng - local_size*num_procs
+
+      ilower = local_size*myid
+      ilower = ilower + min(myid, extra)
+
+      iupper = local_size*(myid+1)
+      iupper = iupper + min(myid+1, extra)
+      iupper = iupper - 1
+
+!     How many rows do I have?
+      local_size = iupper - ilower + 1
+
+!     Create the matrix.
+!     Note that this is a square matrix, so we indicate the row partition
+!     size twice (since number of rows = number of cols)
+      call HYPRE_IJMatrixCreate(mpi_comm, ilower, &
+         iupper, ilower, iupper, A, ierr)
+
+
+!     Choose a parallel csr format storage (see the User's Manual)
+      call HYPRE_IJMatrixSetObjectType(A, HYPRE_PARCSR, ierr)
+
+!     Initialize before setting coefficients
+      call HYPRE_IJMatrixInitialize(A, ierr)
+
+
+!     Now go through my local rows and set the matrix entries.
+!     Each row has at most 5 entries. For example, if n=3:
+!
+!      A = [M -I 0; -I M -I; 0 -I M]
+!      M = [4 -1 0; -1 4 -1; 0 -1 4]
+!
+!     Note that here we are setting one row at a time, though
+!     one could set all the rows together (see the User's Manual).
+
+
+      do i = ilower, iupper
+         nnz = 1
+
+
+!        The left identity block:position i-n
+         if ( (i-n) .ge. 0 ) then
+            cols(nnz) = i-n
+            values(nnz) = -1.0d0
+            nnz = nnz + 1
+         endif
+
+!         The left -1: position i-1
+         if ( mod(i,n).ne.0 ) then
+            cols(nnz) = i-1
+            values(nnz) = -1.0d0
+            nnz = nnz + 1
+         endif
+
+!        Set the diagonal: position i
+         cols(nnz) = i
+         values(nnz) = 4.0d0
+         nnz = nnz + 1
+
+!        The right -1: position i+1
+         if ( mod((i+1),n) .ne. 0 ) then
+            cols(nnz) = i+1
+            values(nnz) = -1.0d0
+            nnz = nnz + 1
+         endif
+
+!        The right identity block:position i+n
+         if ( (i+n) .lt. ng ) then
+            cols(nnz) = i+n
+            values(nnz) = -1.0d0
+            nnz = nnz + 1
+         endif
+
+!        Set the values for row i
+         tmpi(1) = nnz-1
+         tmpi(2) = i
+         call HYPRE_IJMatrixSetValues( &
+            A, 1, tmpi(1), tmpi(2), cols, values, ierr)
+      enddo
+
+
+!     Assemble after setting the coefficients
+      call HYPRE_IJMatrixAssemble(A, ierr)
+
+!     Get parcsr matrix object
+      call HYPRE_IJMatrixGetObject(A, parcsr_A, ierr)
+
+
+!     Create the rhs and solution
+      call HYPRE_IJVectorCreate(mpi_comm, &
+         ilower, iupper, b, ierr)
+      call HYPRE_IJVectorSetObjectType(b, HYPRE_PARCSR, ierr)
+      call HYPRE_IJVectorInitialize(b, ierr)
+
+      call HYPRE_IJVectorCreate(mpi_comm, &
+         ilower, iupper, x, ierr)
+      call HYPRE_IJVectorSetObjectType(x, HYPRE_PARCSR, ierr)
+      call HYPRE_IJVectorInitialize(x, ierr)
+
+
+!     Set the rhs values to h^2 and the solution to zero
+      do i = 1, local_size
+         rhs_values(i) = h2
+         x_values(i) = 0.0
+         rows(i) = ilower + i -1
+      enddo
+      call HYPRE_IJVectorSetValues( &
+         b, local_size, rows, rhs_values, ierr)
+      call HYPRE_IJVectorSetValues( &
+         x, local_size, rows, x_values, ierr)
+
+
+      call HYPRE_IJVectorAssemble(b, ierr)
+      call HYPRE_IJVectorAssemble(x, ierr)
+
+! get the x and b objects
+
+      call HYPRE_IJVectorGetObject(b, par_b, ierr)
+      call HYPRE_IJVectorGetObject(x, par_x, ierr)
+
+
+!     Choose a solver and solve the system
+
+!     AMG
+      if ( solver_id .eq. 0 ) then
+
+!        Create solver
+         call HYPRE_BoomerAMGCreate(solver, ierr)
+
+
+!        Set some parameters (See Reference Manual for more parameters)
+
+!        print solve info + parameters
+         call HYPRE_BoomerAMGSetPrintLevel(solver, 3, ierr)
+!        old defaults, Falgout coarsening, mod. class. interpolation
+         call HYPRE_BoomerAMGSetOldDefault(solver, ierr)
+!        G-S/Jacobi hybrid relaxation
+         call HYPRE_BoomerAMGSetRelaxType(solver, 3, ierr)
+!        C/F relaxation
+         call HYPRE_BoomerAMGSetRelaxOrder(solver, 1, ierr)
+!        Sweeeps on each level
+         call HYPRE_BoomerAMGSetNumSweeps(solver, 1, ierr)
+!         maximum number of levels
+         call HYPRE_BoomerAMGSetMaxLevels(solver, 20, ierr)
+!        conv. tolerance
+         call HYPRE_BoomerAMGSetTol(solver, 1.0d-7, ierr)
+!        Keep local transposes
+         call HYPRE_BoomerAMGSetKeepTransp(solver, 1, ierr)
+
+!        Now setup and solve!
+         call HYPRE_BoomerAMGSetup( &
+            solver, parcsr_A, par_b, par_x, ierr)
+         call HYPRE_BoomerAMGSolve( &
+            solver, parcsr_A, par_b, par_x, ierr)
+
+
+!        Run info - needed logging turned on
+         call HYPRE_BoomerAMGGetNumIterations(solver, num_iterations, &
+            ierr)
+         call HYPRE_BoomerAMGGetFinalReltvRes(solver, final_res_norm, &
+            ierr)
+
+
+         if ( myid .eq. 0 ) then
+            print *
+            print '(A,I2)', " Iterations = ", num_iterations
+            print '(A,ES16.8)', &
+                  " Final Relative Residual Norm = ", final_res_norm
+            print *
+         endif
+
+!        Destroy solver
+         call HYPRE_BoomerAMGDestroy(solver, ierr)
+
+!     PCG (with DS)
+      elseif ( solver_id .eq. 50 ) then
+
+
+!        Create solver
+         call HYPRE_ParCSRPCGCreate(MPI_COMM_WORLD, solver, ierr)
+
+!        Set some parameters (See Reference Manual for more parameters)
+         call HYPRE_ParCSRPCGSetMaxIter(solver, 1000, ierr)
+         call HYPRE_ParCSRPCGSetTol(solver, 1.0d-7, ierr)
+         call HYPRE_ParCSRPCGSetTwoNorm(solver, 1, ierr)
+         call HYPRE_ParCSRPCGSetPrintLevel(solver, 2, ierr)
+         call HYPRE_ParCSRPCGSetLogging(solver, 1, ierr)
+
+!        set ds (diagonal scaling) as the pcg preconditioner
+         precond_id = 1
+         call HYPRE_ParCSRPCGSetPrecond(solver, precond_id, &
+            precond, ierr)
+
+
+
+!        Now setup and solve!
+         call HYPRE_ParCSRPCGSetup(solver, parcsr_A, par_b, &
+            par_x, ierr)
+         call HYPRE_ParCSRPCGSolve(solver, parcsr_A, par_b, &
+            par_x, ierr)
+
+
+!        Run info - needed logging turned on
+
+        call HYPRE_ParCSRPCGGetNumIterations(solver, num_iterations, &
+           ierr)
+        call HYPRE_ParCSRPCGGetFinalRelative(solver, final_res_norm, &
+           ierr)
+
+       if ( myid .eq. 0 ) then
+            print *
+            print *, "Iterations = ", num_iterations
+            print *, "Final Relative Residual Norm = ", final_res_norm
+            print *
+         endif
+
+!       Destroy solver
+        call HYPRE_ParCSRPCGDestroy(solver, ierr)
+
+
+!     PCG with AMG preconditioner
+      elseif ( solver_id == 1 ) then
+
+!        Create solver
+         call HYPRE_ParCSRPCGCreate(MPI_COMM_WORLD, solver, ierr)
+
+!        Set some parameters (See Reference Manual for more parameters)
+         call HYPRE_ParCSRPCGSetMaxIter(solver, 1000, ierr)
+         call HYPRE_ParCSRPCGSetTol(solver, 1.0d-7, ierr)
+         call HYPRE_ParCSRPCGSetTwoNorm(solver, 1, ierr)
+         call HYPRE_ParCSRPCGSetPrintLevel(solver, 2, ierr)
+         call HYPRE_ParCSRPCGSetLogging(solver, 1, ierr)
+
+!        Now set up the AMG preconditioner and specify any parameters
+
+         call HYPRE_BoomerAMGCreate(precond, ierr)
+
+
+!        Set some parameters (See Reference Manual for more parameters)
+
+!        print less solver info since a preconditioner
+         call HYPRE_BoomerAMGSetPrintLevel(precond, 1, ierr);
+!        Falgout coarsening
+         call HYPRE_BoomerAMGSetCoarsenType(precond, 6, ierr)
+!        old defaults
+         call HYPRE_BoomerAMGSetOldDefault(precond, ierr)
+!        SYMMETRIC G-S/Jacobi hybrid relaxation
+         call HYPRE_BoomerAMGSetRelaxType(precond, 6, ierr)
+!        Sweeeps on each level
+         call HYPRE_BoomerAMGSetNumSweeps(precond, 1, ierr)
+!        conv. tolerance
+         call HYPRE_BoomerAMGSetTol(precond, 0.0d0, ierr)
+!        do only one iteration!
+         call HYPRE_BoomerAMGSetMaxIter(precond, 1, ierr)
+
+!        set amg as the pcg preconditioner
+         precond_id = 2
+         call HYPRE_ParCSRPCGSetPrecond(solver, precond_id, &
+            precond, ierr)
+
+
+!        Now setup and solve!
+         call HYPRE_ParCSRPCGSetup(solver, parcsr_A, par_b, &
+            par_x, ierr)
+         call HYPRE_ParCSRPCGSolve(solver, parcsr_A, par_b, &
+            par_x, ierr)
+
+
+!        Run info - needed logging turned on
+
+        call HYPRE_ParCSRPCGGetNumIterations(solver, num_iterations, &
+           ierr)
+        call HYPRE_ParCSRPCGGetFinalRelative(solver, final_res_norm, &
+           ierr)
+
+       if ( myid .eq. 0 ) then
+            print *
+            print *, "Iterations = ", num_iterations
+            print *, "Final Relative Residual Norm = ", final_res_norm
+            print *
+         endif
+
+!       Destroy precond and solver
+
+        call HYPRE_BoomerAMGDestroy(precond, ierr)
+        call HYPRE_ParCSRPCGDestroy(solver, ierr)
+
+!     PCG with ParaSails
+      elseif ( solver_id .eq. 8 ) then
+
+!        Create solver
+         call HYPRE_ParCSRPCGCreate(MPI_COMM_WORLD, solver, ierr)
+
+!        Set some parameters (See Reference Manual for more parameters)
+         call HYPRE_ParCSRPCGSetMaxIter(solver, 1000, ierr)
+         call HYPRE_ParCSRPCGSetTol(solver, 1.0d-7, ierr)
+         call HYPRE_ParCSRPCGSetTwoNorm(solver, 1, ierr)
+         call HYPRE_ParCSRPCGSetPrintLevel(solver, 2, ierr)
+         call HYPRE_ParCSRPCGSetLogging(solver, 1, ierr)
+
+!        Now set up the Parasails preconditioner and specify any parameters
+         call HYPRE_ParaSailsCreate(MPI_COMM_WORLD, precond,ierr)
+         call HYPRE_ParaSailsSetParams(precond, 0.1d0, 1, ierr)
+         call HYPRE_ParaSailsSetFilter(precond, 0.05d0, ierr)
+         call HYPRE_ParaSailsSetSym(precond, 1, ierr)
+         call HYPRE_ParaSailsSetLogging(precond, 3, ierr)
+
+!        set parsails as the pcg preconditioner
+         precond_id = 4
+         call HYPRE_ParCSRPCGSetPrecond(solver, precond_id, &
+            precond, ierr)
+
+
+!        Now setup and solve!
+         call HYPRE_ParCSRPCGSetup(solver, parcsr_A, par_b, &
+            par_x, ierr)
+         call HYPRE_ParCSRPCGSolve(solver, parcsr_A, par_b, &
+            par_x, ierr)
+
+
+!        Run info - needed logging turned on
+
+        call HYPRE_ParCSRPCGGetNumIterations(solver, num_iterations, &
+           ierr)
+        call HYPRE_ParCSRPCGGetFinalRelative(solver, final_res_norm, &
+           ierr)
+
+       if ( myid .eq. 0 ) then
+            print *
+            print *, "Iterations = ", num_iterations
+            print *, "Final Relative Residual Norm = ", final_res_norm
+            print *
+         endif
+
+!       Destroy precond and solver
+
+        call HYPRE_ParaSailsDestroy(precond, ierr)
+        call HYPRE_ParCSRPCGDestroy(solver, ierr)
+
+      else
+         if ( myid .eq. 0 ) then
+           print *,'Invalid solver id specified'
+           stop
+         endif
+      endif
+
+
+
+!     Print the solution
+      if ( print_solution .ne. 0 ) then
+         call HYPRE_IJVectorPrint(x, "ij.out.x", ierr)
+      endif
+
+!     Clean up
+
+      call HYPRE_IJMatrixDestroy(A, ierr)
+      call HYPRE_IJVectorDestroy(b, ierr)
+      call HYPRE_IJVectorDestroy(x, ierr)
+
+      call HYPRE_Finalize(ierr)
+
+!     Finalize MPI
+      call MPI_Finalize(ierr)
+
+      deallocate(rhs_values)
+      deallocate(x_values)
+      deallocate(values)
+      deallocate(rows)
+      deallocate(cols)
+      deallocate(tmpi)
+      end
diff --git a/external/hypre/src/examples/ex5f.f b/external/hypre/src/examples/ex5f.f
index 6cae46f0..a7dd56fb 100644
--- a/external/hypre/src/examples/ex5f.f
+++ b/external/hypre/src/examples/ex5f.f
@@ -1,4 +1,4 @@
-!     Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+!     Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 !     HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 !
 !     SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -37,15 +37,11 @@ program ex5f
       implicit none
 
       include 'mpif.h'
+      include 'HYPREf.h'
 
       integer    MAX_LOCAL_SIZE
-      integer    HYPRE_PARCSR
-
       parameter  (MAX_LOCAL_SIZE=123000)
 
-!     the following is from HYPRE.c
-      parameter  (HYPRE_PARCSR=5555)
-
       integer    ierr
       integer    num_procs, myid
       integer    local_size, extra
@@ -57,7 +53,9 @@ program ex5f
       double precision x_values(MAX_LOCAL_SIZE)
       integer    rows(MAX_LOCAL_SIZE)
       integer    cols(5)
+      integer    tmp(2)
       double precision values(5)
+
       integer    num_iterations
       double precision final_res_norm, tol
 
@@ -81,7 +79,21 @@ program ex5f
       call MPI_COMM_SIZE(MPI_COMM_WORLD, num_procs, ierr)
       mpi_comm = MPI_COMM_WORLD
 
-      call HYPRE_Init(ierr)
+      call HYPRE_Initialize(ierr)
+
+      call HYPRE_SetMemoryLocation(HYPRE_MEMORY_DEVICE, ierr)
+      call HYPRE_SetExecutionPolicy(HYPRE_EXEC_DEVICE, ierr)
+
+      call HYPRE_SetSpGemmUseVendor(0, ierr)
+
+!   Call omp target after HYPRE_Initialize()
+
+      !$omp target enter data map(alloc:rhs_values)
+      !$omp target enter data map(alloc:x_values)
+      !$omp target enter data map(alloc:rows)
+      !$omp target enter data map(alloc:cols)
+      !$omp target enter data map(alloc:values)
+      !$omp target enter data map(alloc:tmp)
 
 !   Default problem parameters
       n = 33
@@ -178,9 +190,13 @@ program ex5f
          endif
 
 !        Set the values for row i
+         tmp(1) = nnz - 1
+         tmp(2) = i
+         !$omp target update to(cols, values, tmp)
+         !$omp target data use_device_ptr(cols, values, tmp)
          call HYPRE_IJMatrixSetValues(
-     1        A, 1, nnz-1, i, cols, values, ierr)
-
+     1        A, 1, tmp(1), tmp(2), cols, values, ierr)
+         !$omp end target data
       enddo
 
 
@@ -209,10 +225,14 @@ program ex5f
          x_values(i) = 0.0
          rows(i) = ilower + i -1
       enddo
+
+      !$omp target update to(rhs_values, x_values, rows)
+      !$omp target data use_device_ptr(rows, rhs_values, x_values)
       call HYPRE_IJVectorSetValues(
      1     b, local_size, rows, rhs_values, ierr)
       call HYPRE_IJVectorSetValues(
      1     x, local_size, rows, x_values, ierr)
+      !$omp end target data
 
 
       call HYPRE_IJVectorAssemble(b, ierr)
@@ -249,6 +269,8 @@ program ex5f
          call HYPRE_BoomerAMGSetMaxLevels(solver, 20, ierr)
 !        conv. tolerance
          call HYPRE_BoomerAMGSetTol(solver, 1.0d-7, ierr)
+!        Keep local transposes
+         call HYPRE_BoomerAMGSetKeepTransp(solver, 1, ierr)
 
 !        Now setup and solve!
          call HYPRE_BoomerAMGSetup(
@@ -465,5 +487,12 @@ program ex5f
 !     Finalize MPI
       call MPI_Finalize(ierr)
 
+      !$omp target exit data map(release:rhs_values)
+      !$omp target exit data map(release:x_values)
+      !$omp target exit data map(release:rows)
+      !$omp target exit data map(release:cols)
+      !$omp target exit data map(release:values)
+      !$omp target exit data map(release:tmp)
+
       stop
       end
diff --git a/external/hypre/src/examples/ex5f_cptr.f b/external/hypre/src/examples/ex5f_cptr.f
new file mode 100644
index 00000000..dd0ad9c0
--- /dev/null
+++ b/external/hypre/src/examples/ex5f_cptr.f
@@ -0,0 +1,510 @@
+!     Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+!     HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+!
+!     SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+!
+!   Example 5
+!
+!   Interface:    Linear-Algebraic (IJ), Fortran (77) version
+!
+!   Compile with: make ex5f
+!
+!   Sample run:   mpirun -np 4 ex5f
+!
+!   Description:  This example solves the 2-D
+!                 Laplacian problem with zero boundary conditions
+!                 on an nxn grid.  The number of unknowns is N=n^2.
+!                 The standard 5-point stencil is used, and we solve
+!                 for the interior nodes only.
+!
+!                 This example solves the same problem as Example 3.
+!                 Available solvers are AMG, PCG, and PCG with AMG,
+!                 and PCG with ParaSails
+!
+!
+!                 Notes: for PCG, GMRES and BiCGStab, precond_id means:
+!                        0 - do not set up a preconditioner
+!                        1 - set up a ds preconditioner
+!                        2 - set up an amg preconditioner
+!                        3 - set up a pilut preconditioner
+!                        4 - set up a ParaSails preconditioner
+!
+
+      program ex5f
+
+      use, intrinsic :: iso_c_binding
+      use, intrinsic :: iso_fortran_env, only: int64
+      use cudaf
+
+      implicit none
+
+      include 'mpif.h'
+      include 'HYPREf.h'
+
+      integer, parameter :: MAX_LOCAL_SIZE = 123000
+
+      integer    ierr
+      integer    num_procs, myid
+      integer    local_size, extra
+      integer    n, solver_id, print_solution, ng
+      integer    nnz, ilower, iupper, i
+      integer    precond_id;
+      double precision h, h2
+
+      double precision, pointer :: rhs_values(:)
+      double precision, pointer :: x_values(:)
+      double precision, pointer :: values(:)
+      integer, pointer :: rows(:)
+      integer, pointer :: cols(:)
+      integer, pointer :: tmpi(:)
+
+      integer :: stat
+
+      integer num_iterations
+      double precision final_res_norm, tol
+
+      integer    mpi_comm
+
+      integer*8  parcsr_A
+      integer*8  A
+      integer*8  b
+      integer*8  x
+      integer*8  par_b
+      integer*8  par_x
+      integer*8  solver
+      integer*8  precond
+
+      type(c_ptr) :: p_rhs_values
+      type(c_ptr) :: p_x_values
+      type(c_ptr) :: p_values
+      type(c_ptr) :: p_rows
+      type(c_ptr) :: p_cols
+      type(c_ptr) :: p_tmpi
+
+      stat = device_malloc_managed(int(MAX_LOCAL_SIZE * 8, int64),
+     1                             p_rhs_values)
+      stat = device_malloc_managed(int(MAX_LOCAL_SIZE * 8, int64),
+     1                             p_x_values)
+      stat = device_malloc_managed(int(5 * 8, int64), p_values)
+      stat = device_malloc_managed(int(MAX_LOCAL_SIZE * 4, int64),
+     1                             p_rows)
+      stat = device_malloc_managed(int(5 * 4, int64), p_cols)
+      stat = device_malloc_managed(int(2 * 4, int64), p_tmpi)
+
+      call c_f_pointer(p_rhs_values, rhs_values, [MAX_LOCAL_SIZE])
+      call c_f_pointer(p_x_values, x_values, [MAX_LOCAL_SIZE])
+      call c_f_pointer(p_values, values, [5])
+      call c_f_pointer(p_rows, rows, [MAX_LOCAL_SIZE])
+      call c_f_pointer(p_cols, cols, [5])
+      call c_f_pointer(p_tmpi, tmpi, [2])
+
+!-----------------------------------------------------------------------
+!     Initialize MPI
+!-----------------------------------------------------------------------
+
+      call MPI_INIT(ierr)
+      call MPI_COMM_RANK(MPI_COMM_WORLD, myid, ierr)
+      call MPI_COMM_SIZE(MPI_COMM_WORLD, num_procs, ierr)
+      mpi_comm = MPI_COMM_WORLD
+
+      call HYPRE_Initialize(ierr)
+
+      call HYPRE_SetMemoryLocation(HYPRE_MEMORY_DEVICE, ierr)
+      call HYPRE_SetExecutionPolicy(HYPRE_EXEC_DEVICE, ierr)
+
+      call HYPRE_SetSpGemmUseVendor(0, ierr)
+
+!   Default problem parameters
+      n = 33
+      solver_id = 0
+      print_solution  = 0
+      tol = 1.0d-7
+
+!   The input section not implemented yet.
+
+!   Preliminaries: want at least one processor per row
+      if ( n*n .lt. num_procs ) then
+         n = int(sqrt(real(num_procs))) + 1
+      endif
+!     ng = global no. rows, h = mesh size
+      ng = n*n
+      h = 1.0d0/(n+1)
+      h2 = h*h
+
+!     Each processor knows only of its own rows - the range is denoted by ilower
+!     and upper.  Here we partition the rows. We account for the fact that
+!     N may not divide evenly by the number of processors.
+      local_size = ng/num_procs
+      extra = ng - local_size*num_procs
+
+      ilower = local_size*myid
+      ilower = ilower + min(myid, extra)
+
+      iupper = local_size*(myid+1)
+      iupper = iupper + min(myid+1, extra)
+      iupper = iupper - 1
+
+!     How many rows do I have?
+      local_size = iupper - ilower + 1
+
+!     Create the matrix.
+!     Note that this is a square matrix, so we indicate the row partition
+!     size twice (since number of rows = number of cols)
+      call HYPRE_IJMatrixCreate(mpi_comm, ilower,
+     1     iupper, ilower, iupper, A, ierr)
+
+
+!     Choose a parallel csr format storage (see the User's Manual)
+      call HYPRE_IJMatrixSetObjectType(A, HYPRE_PARCSR, ierr)
+
+!     Initialize before setting coefficients
+      call HYPRE_IJMatrixInitialize(A, ierr)
+
+
+!     Now go through my local rows and set the matrix entries.
+!     Each row has at most 5 entries. For example, if n=3:
+!
+!      A = [M -I 0; -I M -I; 0 -I M]
+!      M = [4 -1 0; -1 4 -1; 0 -1 4]
+!
+!     Note that here we are setting one row at a time, though
+!     one could set all the rows together (see the User's Manual).
+
+
+      do i = ilower, iupper
+         nnz = 1
+
+
+!        The left identity block:position i-n
+         if ( (i-n) .ge. 0 ) then
+            cols(nnz) = i-n
+            values(nnz) = -1.0d0
+            nnz = nnz + 1
+         endif
+
+!         The left -1: position i-1
+         if ( mod(i,n).ne.0 ) then
+            cols(nnz) = i-1
+            values(nnz) = -1.0d0
+            nnz = nnz + 1
+         endif
+
+!        Set the diagonal: position i
+         cols(nnz) = i
+         values(nnz) = 4.0d0
+         nnz = nnz + 1
+
+!        The right -1: position i+1
+         if ( mod((i+1),n) .ne. 0 ) then
+            cols(nnz) = i+1
+            values(nnz) = -1.0d0
+            nnz = nnz + 1
+         endif
+
+!        The right identity block:position i+n
+         if ( (i+n) .lt. ng ) then
+            cols(nnz) = i+n
+            values(nnz) = -1.0d0
+            nnz = nnz + 1
+         endif
+
+!        Set the values for row i
+         tmpi(1) = nnz-1
+         tmpi(2) = i
+         call HYPRE_IJMatrixSetValues(
+     1        A, 1, tmpi(1), tmpi(2), cols, values, ierr)
+      enddo
+
+
+!     Assemble after setting the coefficients
+      call HYPRE_IJMatrixAssemble(A, ierr)
+
+!     Get parcsr matrix object
+      call HYPRE_IJMatrixGetObject(A, parcsr_A, ierr)
+
+
+!     Create the rhs and solution
+      call HYPRE_IJVectorCreate(mpi_comm,
+     1     ilower, iupper, b, ierr)
+      call HYPRE_IJVectorSetObjectType(b, HYPRE_PARCSR, ierr)
+      call HYPRE_IJVectorInitialize(b, ierr)
+
+      call HYPRE_IJVectorCreate(mpi_comm,
+     1     ilower, iupper, x, ierr)
+      call HYPRE_IJVectorSetObjectType(x, HYPRE_PARCSR, ierr)
+      call HYPRE_IJVectorInitialize(x, ierr)
+
+
+!     Set the rhs values to h^2 and the solution to zero
+      do i = 1, local_size
+         rhs_values(i) = h2
+         x_values(i) = 0.0
+         rows(i) = ilower + i -1
+      enddo
+      call HYPRE_IJVectorSetValues(
+     1     b, local_size, rows, rhs_values, ierr)
+      call HYPRE_IJVectorSetValues(
+     1     x, local_size, rows, x_values, ierr)
+
+
+      call HYPRE_IJVectorAssemble(b, ierr)
+      call HYPRE_IJVectorAssemble(x, ierr)
+
+! get the x and b objects
+
+      call HYPRE_IJVectorGetObject(b, par_b, ierr)
+      call HYPRE_IJVectorGetObject(x, par_x, ierr)
+
+
+!     Choose a solver and solve the system
+
+!     AMG
+      if ( solver_id .eq. 0 ) then
+
+!        Create solver
+         call HYPRE_BoomerAMGCreate(solver, ierr)
+
+
+!        Set some parameters (See Reference Manual for more parameters)
+
+!        print solve info + parameters
+         call HYPRE_BoomerAMGSetPrintLevel(solver, 3, ierr)
+!        old defaults, Falgout coarsening, mod. class. interpolation
+         call HYPRE_BoomerAMGSetOldDefault(solver, ierr)
+!        G-S/Jacobi hybrid relaxation
+         call HYPRE_BoomerAMGSetRelaxType(solver, 3, ierr)
+!        C/F relaxation
+         call HYPRE_BoomerAMGSetRelaxOrder(solver, 1, ierr)
+!        Sweeeps on each level
+         call HYPRE_BoomerAMGSetNumSweeps(solver, 1, ierr)
+!         maximum number of levels
+         call HYPRE_BoomerAMGSetMaxLevels(solver, 20, ierr)
+!        conv. tolerance
+         call HYPRE_BoomerAMGSetTol(solver, 1.0d-7, ierr)
+!        Keep local transposes
+         call HYPRE_BoomerAMGSetKeepTransp(solver, 1, ierr)
+
+!        Now setup and solve!
+         call HYPRE_BoomerAMGSetup(
+     1        solver, parcsr_A, par_b, par_x, ierr)
+         call HYPRE_BoomerAMGSolve(
+     1        solver, parcsr_A, par_b, par_x, ierr)
+
+
+!        Run info - needed logging turned on
+         call HYPRE_BoomerAMGGetNumIterations(solver, num_iterations,
+     1        ierr)
+         call HYPRE_BoomerAMGGetFinalReltvRes(solver, final_res_norm,
+     1        ierr)
+
+
+         if ( myid .eq. 0 ) then
+            print *
+            print '(A,I2)', " Iterations = ", num_iterations
+            print '(A,ES16.8)',
+     1            " Final Relative Residual Norm = ", final_res_norm
+            print *
+         endif
+
+!        Destroy solver
+         call HYPRE_BoomerAMGDestroy(solver, ierr)
+
+!     PCG (with DS)
+      elseif ( solver_id .eq. 50 ) then
+
+
+!        Create solver
+         call HYPRE_ParCSRPCGCreate(MPI_COMM_WORLD, solver, ierr)
+
+!        Set some parameters (See Reference Manual for more parameters)
+         call HYPRE_ParCSRPCGSetMaxIter(solver, 1000, ierr)
+         call HYPRE_ParCSRPCGSetTol(solver, 1.0d-7, ierr)
+         call HYPRE_ParCSRPCGSetTwoNorm(solver, 1, ierr)
+         call HYPRE_ParCSRPCGSetPrintLevel(solver, 2, ierr)
+         call HYPRE_ParCSRPCGSetLogging(solver, 1, ierr)
+
+!        set ds (diagonal scaling) as the pcg preconditioner
+         precond_id = 1
+         call HYPRE_ParCSRPCGSetPrecond(solver, precond_id,
+     1        precond, ierr)
+
+
+
+!        Now setup and solve!
+         call HYPRE_ParCSRPCGSetup(solver, parcsr_A, par_b,
+     &                            par_x, ierr)
+         call HYPRE_ParCSRPCGSolve(solver, parcsr_A, par_b,
+     &                            par_x, ierr)
+
+
+!        Run info - needed logging turned on
+
+        call HYPRE_ParCSRPCGGetNumIterations(solver, num_iterations,
+     &                                       ierr)
+        call HYPRE_ParCSRPCGGetFinalRelative(solver, final_res_norm,
+     &                                       ierr)
+
+       if ( myid .eq. 0 ) then
+            print *
+            print *, "Iterations = ", num_iterations
+            print *, "Final Relative Residual Norm = ", final_res_norm
+            print *
+         endif
+
+!       Destroy solver
+        call HYPRE_ParCSRPCGDestroy(solver, ierr)
+
+
+!     PCG with AMG preconditioner
+      elseif ( solver_id == 1 ) then
+
+!        Create solver
+         call HYPRE_ParCSRPCGCreate(MPI_COMM_WORLD, solver, ierr)
+
+!        Set some parameters (See Reference Manual for more parameters)
+         call HYPRE_ParCSRPCGSetMaxIter(solver, 1000, ierr)
+         call HYPRE_ParCSRPCGSetTol(solver, 1.0d-7, ierr)
+         call HYPRE_ParCSRPCGSetTwoNorm(solver, 1, ierr)
+         call HYPRE_ParCSRPCGSetPrintLevel(solver, 2, ierr)
+         call HYPRE_ParCSRPCGSetLogging(solver, 1, ierr)
+
+!        Now set up the AMG preconditioner and specify any parameters
+
+         call HYPRE_BoomerAMGCreate(precond, ierr)
+
+
+!        Set some parameters (See Reference Manual for more parameters)
+
+!        print less solver info since a preconditioner
+         call HYPRE_BoomerAMGSetPrintLevel(precond, 1, ierr);
+!        Falgout coarsening
+         call HYPRE_BoomerAMGSetCoarsenType(precond, 6, ierr)
+!        old defaults
+         call HYPRE_BoomerAMGSetOldDefault(precond, ierr)
+!        SYMMETRIC G-S/Jacobi hybrid relaxation
+         call HYPRE_BoomerAMGSetRelaxType(precond, 6, ierr)
+!        Sweeeps on each level
+         call HYPRE_BoomerAMGSetNumSweeps(precond, 1, ierr)
+!        conv. tolerance
+         call HYPRE_BoomerAMGSetTol(precond, 0.0d0, ierr)
+!        do only one iteration!
+         call HYPRE_BoomerAMGSetMaxIter(precond, 1, ierr)
+
+!        set amg as the pcg preconditioner
+         precond_id = 2
+         call HYPRE_ParCSRPCGSetPrecond(solver, precond_id,
+     1        precond, ierr)
+
+
+!        Now setup and solve!
+         call HYPRE_ParCSRPCGSetup(solver, parcsr_A, par_b,
+     1                            par_x, ierr)
+         call HYPRE_ParCSRPCGSolve(solver, parcsr_A, par_b,
+     1                            par_x, ierr)
+
+
+!        Run info - needed logging turned on
+
+        call HYPRE_ParCSRPCGGetNumIterations(solver, num_iterations,
+     1                                       ierr)
+        call HYPRE_ParCSRPCGGetFinalRelative(solver, final_res_norm,
+     1                                       ierr)
+
+       if ( myid .eq. 0 ) then
+            print *
+            print *, "Iterations = ", num_iterations
+            print *, "Final Relative Residual Norm = ", final_res_norm
+            print *
+         endif
+
+!       Destroy precond and solver
+
+        call HYPRE_BoomerAMGDestroy(precond, ierr)
+        call HYPRE_ParCSRPCGDestroy(solver, ierr)
+
+!     PCG with ParaSails
+      elseif ( solver_id .eq. 8 ) then
+
+!        Create solver
+         call HYPRE_ParCSRPCGCreate(MPI_COMM_WORLD, solver, ierr)
+
+!        Set some parameters (See Reference Manual for more parameters)
+         call HYPRE_ParCSRPCGSetMaxIter(solver, 1000, ierr)
+         call HYPRE_ParCSRPCGSetTol(solver, 1.0d-7, ierr)
+         call HYPRE_ParCSRPCGSetTwoNorm(solver, 1, ierr)
+         call HYPRE_ParCSRPCGSetPrintLevel(solver, 2, ierr)
+         call HYPRE_ParCSRPCGSetLogging(solver, 1, ierr)
+
+!        Now set up the Parasails preconditioner and specify any parameters
+         call HYPRE_ParaSailsCreate(MPI_COMM_WORLD, precond,ierr)
+         call HYPRE_ParaSailsSetParams(precond, 0.1d0, 1, ierr)
+         call HYPRE_ParaSailsSetFilter(precond, 0.05d0, ierr)
+         call HYPRE_ParaSailsSetSym(precond, 1, ierr)
+         call HYPRE_ParaSailsSetLogging(precond, 3, ierr)
+
+!        set parsails as the pcg preconditioner
+         precond_id = 4
+         call HYPRE_ParCSRPCGSetPrecond(solver, precond_id,
+     1        precond, ierr)
+
+
+!        Now setup and solve!
+         call HYPRE_ParCSRPCGSetup(solver, parcsr_A, par_b,
+     1                            par_x, ierr)
+         call HYPRE_ParCSRPCGSolve(solver, parcsr_A, par_b,
+     1                            par_x, ierr)
+
+
+!        Run info - needed logging turned on
+
+        call HYPRE_ParCSRPCGGetNumIterations(solver, num_iterations,
+     1                                       ierr)
+        call HYPRE_ParCSRPCGGetFinalRelative(solver, final_res_norm,
+     1                                       ierr)
+
+       if ( myid .eq. 0 ) then
+            print *
+            print *, "Iterations = ", num_iterations
+            print *, "Final Relative Residual Norm = ", final_res_norm
+            print *
+         endif
+
+!       Destroy precond and solver
+
+        call HYPRE_ParaSailsDestroy(precond, ierr)
+        call HYPRE_ParCSRPCGDestroy(solver, ierr)
+
+      else
+         if ( myid .eq. 0 ) then
+           print *,'Invalid solver id specified'
+           stop
+         endif
+      endif
+
+
+
+!     Print the solution
+      if ( print_solution .ne. 0 ) then
+         call HYPRE_IJVectorPrint(x, "ij.out.x", ierr)
+      endif
+
+!     Clean up
+
+      call HYPRE_IJMatrixDestroy(A, ierr)
+      call HYPRE_IJVectorDestroy(b, ierr)
+      call HYPRE_IJVectorDestroy(x, ierr)
+
+      call HYPRE_Finalize(ierr)
+
+!     Finalize MPI
+      call MPI_Finalize(ierr)
+
+      stat = device_free(p_rhs_values)
+      stat = device_free(p_x_values)
+      stat = device_free(p_rows)
+      stat = device_free(p_cols)
+      stat = device_free(p_tmpi)
+      stat = device_free(p_values)
+
+      end
diff --git a/external/hypre/src/examples/ex6.c b/external/hypre/src/examples/ex6.c
index 66617528..14c52977 100644
--- a/external/hypre/src/examples/ex6.c
+++ b/external/hypre/src/examples/ex6.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -63,17 +63,17 @@ int main (int argc, char *argv[])
    MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
 
    /* Initialize HYPRE */
-   HYPRE_Init();
+   HYPRE_Initialize();
 
    /* Print GPU info */
    /* HYPRE_PrintDeviceInfo(); */
 
    if (num_procs != 2)
    {
-      if (myid ==0) printf("Must run with 2 processors!\n");
+      if (myid == 0) { printf("Must run with 2 processors!\n"); }
       MPI_Finalize();
 
-      return(0);
+      return (0);
    }
 
    /* Parse command line */
@@ -168,8 +168,10 @@ int main (int argc, char *argv[])
          int nvars = 1;
          HYPRE_SStructVariable vartypes[1] = {HYPRE_SSTRUCT_VARIABLE_CELL};
 
-         for (i = 0; i< nparts; i++)
+         for (i = 0; i < nparts; i++)
+         {
             HYPRE_SStructGridSetVariables(grid, i, nvars, vartypes);
+         }
       }
 
       /* Now the grid is ready to use */
@@ -185,7 +187,7 @@ int main (int argc, char *argv[])
          relative offset (in the index space). */
       {
          int entry;
-         int offsets[5][2] = {{0,0}, {-1,0}, {1,0}, {0,-1}, {0,1}};
+         int offsets[5][2] = {{0, 0}, {-1, 0}, {1, 0}, {0, -1}, {0, 1}};
          int var = 0;
 
          /* Assign numerical values to the offsets so that we can
@@ -193,7 +195,9 @@ int main (int argc, char *argv[])
             variable for which we are assigning this stencil - we are
             just using one variable in this example so it is the first one (0) */
          for (entry = 0; entry < 5; entry++)
+         {
             HYPRE_SStructStencilSetEntry(stencil, entry, offsets[entry], var);
+         }
       }
    }
 
@@ -224,7 +228,7 @@ int main (int argc, char *argv[])
 
    /* 4. Set up a SStruct Matrix */
    {
-      int i,j;
+      int i, j;
       int part = 0;
       int var = 0;
 
@@ -260,19 +264,23 @@ int main (int argc, char *argv[])
             int nentries = 5;
             int nvalues  = 30; /* 6 grid points, each with 5 stencil entries */
             /* double values[30]; OK to use constant-length array for CPUs */
-            double *values = (double *) malloc(30*sizeof(double));
+            double *values = (double *) malloc(30 * sizeof(double));
 
             int stencil_indices[5];
             for (j = 0; j < nentries; j++) /* label the stencil indices -
                                               these correspond to the offsets
                                               defined above */
+            {
                stencil_indices[j] = j;
+            }
 
             for (i = 0; i < nvalues; i += nentries)
             {
                values[i] = 4.0;
                for (j = 1; j < nentries; j++)
-                  values[i+j] = -1.0;
+               {
+                  values[i + j] = -1.0;
+               }
             }
 
             HYPRE_SStructMatrixSetBoxValues(A, part, ilower, iupper,
@@ -291,17 +299,21 @@ int main (int argc, char *argv[])
             int nentries = 5;
             int nvalues  = 60; /* 12 grid points, each with 5 stencil entries */
             /* double values[60]; OK to use constant-length array for CPUs */
-            double *values = (double *) malloc(60*sizeof(double));
+            double *values = (double *) malloc(60 * sizeof(double));
 
             int stencil_indices[5];
             for (j = 0; j < nentries; j++)
+            {
                stencil_indices[j] = j;
+            }
 
             for (i = 0; i < nvalues; i += nentries)
             {
                values[i] = 4.0;
                for (j = 1; j < nentries; j++)
-                  values[i+j] = -1.0;
+               {
+                  values[i + j] = -1.0;
+               }
             }
 
             HYPRE_SStructMatrixSetBoxValues(A, part, ilower, iupper,
@@ -322,17 +334,21 @@ int main (int argc, char *argv[])
             int nentries = 5;
             int nvalues  = 80; /* 16 grid points, each with 5 stencil entries */
             /* double values[80]; OK to use constant-length array for CPUs */
-            double *values = (double *) malloc(80*sizeof(double));
+            double *values = (double *) malloc(80 * sizeof(double));
 
             int stencil_indices[5];
             for (j = 0; j < nentries; j++)
+            {
                stencil_indices[j] = j;
+            }
 
             for (i = 0; i < nvalues; i += nentries)
             {
                values[i] = 4.0;
                for (j = 1; j < nentries; j++)
-                  values[i+j] = -1.0;
+               {
+                  values[i + j] = -1.0;
+               }
             }
 
             HYPRE_SStructMatrixSetBoxValues(A, part, ilower, iupper,
@@ -349,10 +365,12 @@ int main (int argc, char *argv[])
       {
          int maxnvalues = 6;
          /* double values[6]; OK to use constant-length array for CPUs */
-         double *values = (double *) malloc(6*sizeof(double));
+         double *values = (double *) malloc(6 * sizeof(double));
 
          for (i = 0; i < maxnvalues; i++)
+         {
             values[i] = 0.0;
+         }
 
          {
             /* Values below our first AND second box */
@@ -421,10 +439,12 @@ int main (int argc, char *argv[])
       {
          int maxnvalues = 4;
          /* double values[4]; OK to use constant-length array for CPUs */
-         double *values = (double *) malloc(4*sizeof(double));
+         double *values = (double *) malloc(4 * sizeof(double));
 
          for (i = 0; i < maxnvalues; i++)
+         {
             values[i] = 0.0;
+         }
 
          {
             /* Values below our box */
@@ -502,14 +522,18 @@ int main (int argc, char *argv[])
 
             int nvalues = 6;  /* 6 grid points */
             /* double values[6]; OK to use constant-length array for CPUs */
-            double *values = (double *) malloc(6*sizeof(double));
+            double *values = (double *) malloc(6 * sizeof(double));
 
             for (i = 0; i < nvalues; i ++)
+            {
                values[i] = 1.0;
+            }
             HYPRE_SStructVectorSetBoxValues(b, part, ilower, iupper, var, values);
 
             for (i = 0; i < nvalues; i ++)
+            {
                values[i] = 0.0;
+            }
             HYPRE_SStructVectorSetBoxValues(x, part, ilower, iupper, var, values);
 
             free(values);
@@ -522,14 +546,18 @@ int main (int argc, char *argv[])
 
             int nvalues = 12; /* 12 grid points */
             /* double values[12]; OK to use constant-length array for CPUs */
-            double *values = (double *) malloc(12*sizeof(double));
+            double *values = (double *) malloc(12 * sizeof(double));
 
             for (i = 0; i < nvalues; i ++)
+            {
                values[i] = 1.0;
+            }
             HYPRE_SStructVectorSetBoxValues(b, part, ilower, iupper, var, values);
 
             for (i = 0; i < nvalues; i ++)
+            {
                values[i] = 0.0;
+            }
             HYPRE_SStructVectorSetBoxValues(x, part, ilower, iupper, var, values);
 
             free(values);
@@ -544,14 +572,18 @@ int main (int argc, char *argv[])
 
             int nvalues = 16; /* 16 grid points */
             /* double values[16]; OK to use constant-length array for CPUs */
-            double *values = (double *) malloc(16*sizeof(double));
+            double *values = (double *) malloc(16 * sizeof(double));
 
             for (i = 0; i < nvalues; i ++)
+            {
                values[i] = 1.0;
+            }
             HYPRE_SStructVectorSetBoxValues(b, part, ilower, iupper, var, values);
 
             for (i = 0; i < nvalues; i ++)
+            {
                values[i] = 0.0;
+            }
             HYPRE_SStructVectorSetBoxValues(x, part, ilower, iupper, var, values);
 
             free(values);
@@ -597,7 +629,7 @@ int main (int argc, char *argv[])
 
       /* Set preconditioner and solve */
       HYPRE_StructPCGSetPrecond(solver, HYPRE_StructSMGSolve,
-                           HYPRE_StructSMGSetup, precond);
+                                HYPRE_StructSMGSetup, precond);
       HYPRE_StructPCGSetup(solver, sA, sb, sx);
       HYPRE_StructPCGSolve(solver, sA, sb, sx);
    }
diff --git a/external/hypre/src/examples/ex7.c b/external/hypre/src/examples/ex7.c
index 71f040e6..a00344d5 100644
--- a/external/hypre/src/examples/ex7.c
+++ b/external/hypre/src/examples/ex7.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -55,9 +55,9 @@
 #include "ex.h"
 
 #ifdef M_PI
-  #define PI M_PI
+#define PI M_PI
 #else
-  #define PI 3.14159265358979
+#define PI 3.14159265358979
 #endif
 
 #ifdef HYPRE_EXVIS
@@ -78,17 +78,25 @@ double K(double x, double y)
       case 0:
          return 1.0;
       case 1:
-         return x*x+exp(y);
+         return x * x + exp(y);
       case 2:
-         if ((fabs(x-0.5) < 0.25) && (fabs(y-0.5) < 0.25))
+         if ((fabs(x - 0.5) < 0.25) && (fabs(y - 0.5) < 0.25))
+         {
             return 100.0;
+         }
          else
+         {
             return 1.0;
+         }
       case 3:
-         if (((x-0.5)*(x-0.5)+(y-0.5)*(y-0.5)) < 0.0625)
+         if (((x - 0.5) * (x - 0.5) + (y - 0.5) * (y - 0.5)) < 0.0625)
+         {
             return 10.0;
+         }
          else
+         {
             return 1.0;
+         }
       default:
          return 1.0;
    }
@@ -154,9 +162,9 @@ double U0(double x, double y)
       case 0:
          return 0.0;
       case 1:
-         return (x+y)/100;
+         return (x + y) / 100;
       case 2:
-         return (sin(5*PI*x)+sin(5*PI*y))/1000;
+         return (sin(5 * PI * x) + sin(5 * PI * y)) / 1000;
       default:
          return 0.0;
    }
@@ -172,17 +180,25 @@ double F(double x, double y)
       case 1:
          return 0.0;
       case 2:
-         return 2*PI*PI*sin(PI*x)*sin(PI*y);
+         return 2 * PI * PI * sin(PI * x) * sin(PI * y);
       case 3:
-         if ((fabs(x-0.5) < 0.25) && (fabs(y-0.5) < 0.25))
+         if ((fabs(x - 0.5) < 0.25) && (fabs(y - 0.5) < 0.25))
+         {
             return -1.0;
+         }
          else
+         {
             return 1.0;
+         }
       case 4:
-         if (((x-0.5)*(x-0.5)+(y-0.5)*(y-0.5)) < 0.0625)
+         if (((x - 0.5) * (x - 0.5) + (y - 0.5) * (y - 0.5)) < 0.0625)
+         {
             return -1.0;
+         }
          else
+         {
             return 1.0;
+         }
       default:
          return 1.0;
    }
@@ -228,7 +244,7 @@ int main (int argc, char *argv[])
    MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
 
    /* Initialize HYPRE */
-   HYPRE_Init();
+   HYPRE_Initialize();
 
    /* Print GPU info */
    /* HYPRE_PrintDeviceInfo(); */
@@ -383,23 +399,25 @@ int main (int argc, char *argv[])
 
    /* Convection produces non-symmetric matrices */
    if (optionB && sym)
+   {
       optionB = 0;
+   }
 
    /* Figure out the processor grid (N x N).  The local
       problem size is indicated by n (n x n). pi and pj
       indicate position in the processor grid. */
    N  = sqrt(num_procs);
-   h  = 1.0 / (N*n-1);
-   h2 = h*h;
+   h  = 1.0 / (N * n - 1);
+   h2 = h * h;
    pj = myid / N;
-   pi = myid - pj*N;
+   pi = myid - pj * N;
 
    /* Define the nodes owned by the current processor (each processor's
       piece of the global grid) */
-   ilower[0] = pi*n;
-   ilower[1] = pj*n;
-   iupper[0] = ilower[0] + n-1;
-   iupper[1] = ilower[1] + n-1;
+   ilower[0] = pi * n;
+   ilower[1] = pj * n;
+   iupper[0] = ilower[0] + n - 1;
+   iupper[1] = ilower[1] + n - 1;
 
    /* 1. Set up a 2D grid */
    {
@@ -419,8 +437,10 @@ int main (int argc, char *argv[])
       {
          HYPRE_SStructVariable vartypes[1] = {HYPRE_SSTRUCT_VARIABLE_CELL};
 
-         for (i = 0; i< nparts; i++)
+         for (i = 0; i < nparts; i++)
+         {
             HYPRE_SStructGridSetVariables(grid, i, nvars, vartypes);
+         }
       }
 
       /* This is a collective call finalizing the grid assembly.
@@ -436,26 +456,30 @@ int main (int argc, char *argv[])
       if (sym == 0)
       {
          /* Define the geometry of the stencil */
-         int offsets[5][2] = {{0,0}, {-1,0}, {1,0}, {0,-1}, {0,1}};
+         int offsets[5][2] = {{0, 0}, {-1, 0}, {1, 0}, {0, -1}, {0, 1}};
 
          /* Create an empty 2D, 5-pt stencil object */
          HYPRE_SStructStencilCreate(ndim, 5, &stencil);
 
          /* Assign stencil entries */
          for (i = 0; i < 5; i++)
+         {
             HYPRE_SStructStencilSetEntry(stencil, i, offsets[i], var);
+         }
       }
       else /* Symmetric storage */
       {
          /* Define the geometry of the stencil */
-         int offsets[3][2] = {{0,0}, {1,0}, {0,1}};
+         int offsets[3][2] = {{0, 0}, {1, 0}, {0, 1}};
 
          /* Create an empty 2D, 3-pt stencil object */
          HYPRE_SStructStencilCreate(ndim, 3, &stencil);
 
          /* Assign stencil entries */
          for (i = 0; i < 3; i++)
+         {
             HYPRE_SStructStencilSetEntry(stencil, i, offsets[i], var);
+         }
       }
    }
 
@@ -509,17 +533,21 @@ int main (int argc, char *argv[])
       HYPRE_SStructVectorInitialize(b);
       HYPRE_SStructVectorInitialize(x);
 
-      values = (double*) calloc((n*n), sizeof(double));
+      values = (double*) calloc((n * n), sizeof(double));
 
       /* Set the values of b in left-to-right, bottom-to-top order */
       for (k = 0, j = 0; j < n; j++)
          for (i = 0; i < n; i++, k++)
-            values[k] = h2 * Eval(F,i,j);
+         {
+            values[k] = h2 * Eval(F, i, j);
+         }
       HYPRE_SStructVectorSetBoxValues(b, part, ilower, iupper, var, values);
 
       /* Set x = 0 */
-      for (i = 0; i < (n*n); i ++)
+      for (i = 0; i < (n * n); i ++)
+      {
          values[i] = 0.0;
+      }
       HYPRE_SStructVectorSetBoxValues(x, part, ilower, iupper, var, values);
 
       free(values);
@@ -556,25 +584,25 @@ int main (int argc, char *argv[])
                                                       to the offsets */
          double *values;
 
-         values = (double*) calloc(5*(n*n), sizeof(double));
+         values = (double*) calloc(5 * (n * n), sizeof(double));
 
          /* The order is left-to-right, bottom-to-top */
          for (k = 0, j = 0; j < n; j++)
-            for (i = 0; i < n; i++, k+=5)
+            for (i = 0; i < n; i++, k += 5)
             {
-               values[k+1] = - Eval(K,i-0.5,j) - Eval(B1,i-0.5,j);
+               values[k + 1] = - Eval(K, i - 0.5, j) - Eval(B1, i - 0.5, j);
 
-               values[k+2] = - Eval(K,i+0.5,j) + Eval(B1,i+0.5,j);
+               values[k + 2] = - Eval(K, i + 0.5, j) + Eval(B1, i + 0.5, j);
 
-               values[k+3] = - Eval(K,i,j-0.5) - Eval(B2,i,j-0.5);
+               values[k + 3] = - Eval(K, i, j - 0.5) - Eval(B2, i, j - 0.5);
 
-               values[k+4] = - Eval(K,i,j+0.5) + Eval(B2,i,j+0.5);
+               values[k + 4] = - Eval(K, i, j + 0.5) + Eval(B2, i, j + 0.5);
 
-               values[k] = h2 * Eval(C,i,j)
-                  + Eval(K ,i-0.5,j) + Eval(K ,i+0.5,j)
-                  + Eval(K ,i,j-0.5) + Eval(K ,i,j+0.5)
-                  - Eval(B1,i-0.5,j) + Eval(B1,i+0.5,j)
-                  - Eval(B2,i,j-0.5) + Eval(B2,i,j+0.5);
+               values[k] = h2 * Eval(C, i, j)
+                           + Eval(K, i - 0.5, j) + Eval(K, i + 0.5, j)
+                           + Eval(K, i, j - 0.5) + Eval(K, i, j + 0.5)
+                           - Eval(B1, i - 0.5, j) + Eval(B1, i + 0.5, j)
+                           - Eval(B2, i, j - 0.5) + Eval(B2, i, j + 0.5);
             }
 
          HYPRE_SStructMatrixSetBoxValues(A, part, ilower, iupper,
@@ -588,17 +616,17 @@ int main (int argc, char *argv[])
          int stencil_indices[3] = {0, 1, 2};
          double *values;
 
-         values = (double*) calloc(3*(n*n), sizeof(double));
+         values = (double*) calloc(3 * (n * n), sizeof(double));
 
          /* The order is left-to-right, bottom-to-top */
          for (k = 0, j = 0; j < n; j++)
-            for (i = 0; i < n; i++, k+=3)
+            for (i = 0; i < n; i++, k += 3)
             {
-               values[k+1] = - Eval(K,i+0.5,j);
-               values[k+2] = - Eval(K,i,j+0.5);
-               values[k] = h2 * Eval(C,i,j)
-                  + Eval(K,i+0.5,j) + Eval(K,i,j+0.5)
-                  + Eval(K,i-0.5,j) + Eval(K,i,j-0.5);
+               values[k + 1] = - Eval(K, i + 0.5, j);
+               values[k + 2] = - Eval(K, i, j + 0.5);
+               values[k] = h2 * Eval(C, i, j)
+                           + Eval(K, i + 0.5, j) + Eval(K, i, j + 0.5)
+                           + Eval(K, i - 0.5, j) + Eval(K, i, j - 0.5);
             }
 
          HYPRE_SStructMatrixSetBoxValues(A, part, ilower, iupper,
@@ -626,29 +654,35 @@ int main (int argc, char *argv[])
       int var = 0;
 
       if (sym == 0)
+      {
          nentries = 5;
+      }
       else
+      {
          nentries = 3;
+      }
 
-      values  = (double*) calloc(nentries*n, sizeof(double));
+      values  = (double*) calloc(nentries * n, sizeof(double));
       bvalues = (double*) calloc(n, sizeof(double));
 
       /* The stencil at the boundary nodes is 1-0-0-0-0. Because
          we have I x_b = u_0; */
-      for (i = 0; i < nentries*n; i += nentries)
+      for (i = 0; i < nentries * n; i += nentries)
       {
          values[i] = 1.0;
          for (j = 1; j < nentries; j++)
-            values[i+j] = 0.0;
+         {
+            values[i + j] = 0.0;
+         }
       }
 
       /* Processors at y = 0 */
       if (pj == 0)
       {
-         bc_ilower[0] = pi*n;
-         bc_ilower[1] = pj*n;
+         bc_ilower[0] = pi * n;
+         bc_ilower[1] = pj * n;
 
-         bc_iupper[0] = bc_ilower[0] + n-1;
+         bc_iupper[0] = bc_ilower[0] + n - 1;
          bc_iupper[1] = bc_ilower[1];
 
          /* Modify the matrix */
@@ -658,19 +692,21 @@ int main (int argc, char *argv[])
 
          /* Put the boundary conditions in b */
          for (i = 0; i < n; i++)
-            bvalues[i] = bcEval(U0,i,0);
+         {
+            bvalues[i] = bcEval(U0, i, 0);
+         }
 
          HYPRE_SStructVectorSetBoxValues(b, part, bc_ilower,
                                          bc_iupper, var, bvalues);
       }
 
       /* Processors at y = 1 */
-      if (pj == N-1)
+      if (pj == N - 1)
       {
-         bc_ilower[0] = pi*n;
-         bc_ilower[1] = pj*n + n-1;
+         bc_ilower[0] = pi * n;
+         bc_ilower[1] = pj * n + n - 1;
 
-         bc_iupper[0] = bc_ilower[0] + n-1;
+         bc_iupper[0] = bc_ilower[0] + n - 1;
          bc_iupper[1] = bc_ilower[1];
 
          /* Modify the matrix */
@@ -680,7 +716,9 @@ int main (int argc, char *argv[])
 
          /* Put the boundary conditions in b */
          for (i = 0; i < n; i++)
-            bvalues[i] = bcEval(U0,i,0);
+         {
+            bvalues[i] = bcEval(U0, i, 0);
+         }
 
          HYPRE_SStructVectorSetBoxValues(b, part, bc_ilower, bc_iupper, var, bvalues);
       }
@@ -688,11 +726,11 @@ int main (int argc, char *argv[])
       /* Processors at x = 0 */
       if (pi == 0)
       {
-         bc_ilower[0] = pi*n;
-         bc_ilower[1] = pj*n;
+         bc_ilower[0] = pi * n;
+         bc_ilower[1] = pj * n;
 
          bc_iupper[0] = bc_ilower[0];
-         bc_iupper[1] = bc_ilower[1] + n-1;
+         bc_iupper[1] = bc_ilower[1] + n - 1;
 
          /* Modify the matrix */
          HYPRE_SStructMatrixSetBoxValues(A, part, bc_ilower, bc_iupper,
@@ -701,20 +739,22 @@ int main (int argc, char *argv[])
 
          /* Put the boundary conditions in b */
          for (j = 0; j < n; j++)
-            bvalues[j] = bcEval(U0,0,j);
+         {
+            bvalues[j] = bcEval(U0, 0, j);
+         }
 
          HYPRE_SStructVectorSetBoxValues(b, part, bc_ilower, bc_iupper,
                                          var, bvalues);
       }
 
       /* Processors at x = 1 */
-      if (pi == N-1)
+      if (pi == N - 1)
       {
-         bc_ilower[0] = pi*n + n-1;
-         bc_ilower[1] = pj*n;
+         bc_ilower[0] = pi * n + n - 1;
+         bc_ilower[1] = pj * n;
 
          bc_iupper[0] = bc_ilower[0];
-         bc_iupper[1] = bc_ilower[1] + n-1;
+         bc_iupper[1] = bc_ilower[1] + n - 1;
 
          /* Modify the matrix */
          HYPRE_SStructMatrixSetBoxValues(A, part, bc_ilower, bc_iupper,
@@ -723,7 +763,9 @@ int main (int argc, char *argv[])
 
          /* Put the boundary conditions in b */
          for (j = 0; j < n; j++)
-            bvalues[j] = bcEval(U0,0,j);
+         {
+            bvalues[j] = bcEval(U0, 0, j);
+         }
 
          HYPRE_SStructVectorSetBoxValues(b, part, bc_ilower, bc_iupper,
                                          var, bvalues);
@@ -741,17 +783,19 @@ int main (int argc, char *argv[])
       /* Processors at y = 0, neighbors of boundary nodes */
       if (pj == 0)
       {
-         bc_ilower[0] = pi*n;
-         bc_ilower[1] = pj*n + 1;
+         bc_ilower[0] = pi * n;
+         bc_ilower[1] = pj * n + 1;
 
-         bc_iupper[0] = bc_ilower[0] + n-1;
+         bc_iupper[0] = bc_ilower[0] + n - 1;
          bc_iupper[1] = bc_ilower[1];
 
          stencil_indices[0] = 3;
 
          /* Modify the matrix */
          for (i = 0; i < n; i++)
+         {
             bvalues[i] = 0.0;
+         }
 
          if (sym == 0)
             HYPRE_SStructMatrixSetBoxValues(A, part, bc_ilower, bc_iupper,
@@ -760,13 +804,19 @@ int main (int argc, char *argv[])
 
          /* Eliminate the boundary conditions in b */
          for (i = 0; i < n; i++)
-            bvalues[i] = bcEval(U0,i,-1) * (bcEval(K,i,-0.5)+bcEval(B2,i,-0.5));
+         {
+            bvalues[i] = bcEval(U0, i, -1) * (bcEval(K, i, -0.5) + bcEval(B2, i, -0.5));
+         }
 
          if (pi == 0)
+         {
             bvalues[0] = 0.0;
+         }
 
-         if (pi == N-1)
-            bvalues[n-1] = 0.0;
+         if (pi == N - 1)
+         {
+            bvalues[n - 1] = 0.0;
+         }
 
          /* Note the use of AddToBoxValues (because we have already set values
             at these nodes) */
@@ -777,17 +827,19 @@ int main (int argc, char *argv[])
       /* Processors at x = 0, neighbors of boundary nodes */
       if (pi == 0)
       {
-         bc_ilower[0] = pi*n + 1;
-         bc_ilower[1] = pj*n;
+         bc_ilower[0] = pi * n + 1;
+         bc_ilower[1] = pj * n;
 
          bc_iupper[0] = bc_ilower[0];
-         bc_iupper[1] = bc_ilower[1] + n-1;
+         bc_iupper[1] = bc_ilower[1] + n - 1;
 
          stencil_indices[0] = 1;
 
          /* Modify the matrix */
          for (j = 0; j < n; j++)
+         {
             bvalues[j] = 0.0;
+         }
 
          if (sym == 0)
             HYPRE_SStructMatrixSetBoxValues(A, part, bc_ilower, bc_iupper,
@@ -796,69 +848,93 @@ int main (int argc, char *argv[])
 
          /* Eliminate the boundary conditions in b */
          for (j = 0; j < n; j++)
-            bvalues[j] = bcEval(U0,-1,j) * (bcEval(K,-0.5,j)+bcEval(B1,-0.5,j));
+         {
+            bvalues[j] = bcEval(U0, -1, j) * (bcEval(K, -0.5, j) + bcEval(B1, -0.5, j));
+         }
 
          if (pj == 0)
+         {
             bvalues[0] = 0.0;
+         }
 
-         if (pj == N-1)
-            bvalues[n-1] = 0.0;
+         if (pj == N - 1)
+         {
+            bvalues[n - 1] = 0.0;
+         }
 
          HYPRE_SStructVectorAddToBoxValues(b, part, bc_ilower, bc_iupper, var, bvalues);
       }
 
       /* Processors at y = 1, neighbors of boundary nodes */
-      if (pj == N-1)
+      if (pj == N - 1)
       {
-         bc_ilower[0] = pi*n;
-         bc_ilower[1] = pj*n + (n-1) -1;
+         bc_ilower[0] = pi * n;
+         bc_ilower[1] = pj * n + (n - 1) - 1;
 
-         bc_iupper[0] = bc_ilower[0] + n-1;
+         bc_iupper[0] = bc_ilower[0] + n - 1;
          bc_iupper[1] = bc_ilower[1];
 
          if (sym == 0)
+         {
             stencil_indices[0] = 4;
+         }
          else
+         {
             stencil_indices[0] = 2;
+         }
 
          /* Modify the matrix */
          for (i = 0; i < n; i++)
+         {
             bvalues[i] = 0.0;
+         }
 
          HYPRE_SStructMatrixSetBoxValues(A, part, bc_ilower, bc_iupper, var, 1,
                                          stencil_indices, bvalues);
 
          /* Eliminate the boundary conditions in b */
          for (i = 0; i < n; i++)
-            bvalues[i] = bcEval(U0,i,1) * (bcEval(K,i,0.5)+bcEval(B2,i,0.5));
+         {
+            bvalues[i] = bcEval(U0, i, 1) * (bcEval(K, i, 0.5) + bcEval(B2, i, 0.5));
+         }
 
          if (pi == 0)
+         {
             bvalues[0] = 0.0;
+         }
 
-         if (pi == N-1)
-            bvalues[n-1] = 0.0;
+         if (pi == N - 1)
+         {
+            bvalues[n - 1] = 0.0;
+         }
 
          HYPRE_SStructVectorAddToBoxValues(b, part, bc_ilower, bc_iupper,
                                            var, bvalues);
       }
 
       /* Processors at x = 1, neighbors of boundary nodes */
-      if (pi == N-1)
+      if (pi == N - 1)
       {
-         bc_ilower[0] = pi*n + (n-1) - 1;
-         bc_ilower[1] = pj*n;
+         bc_ilower[0] = pi * n + (n - 1) - 1;
+         bc_ilower[1] = pj * n;
 
          bc_iupper[0] = bc_ilower[0];
-         bc_iupper[1] = bc_ilower[1] + n-1;
+         bc_iupper[1] = bc_ilower[1] + n - 1;
 
          if (sym == 0)
+         {
             stencil_indices[0] = 2;
+         }
          else
+         {
             stencil_indices[0] = 1;
+         }
 
          /* Modify the matrix */
          for (j = 0; j < n; j++)
+         {
             bvalues[j] = 0.0;
+         }
 
          HYPRE_SStructMatrixSetBoxValues(A, part, bc_ilower, bc_iupper,
                                          var, 1,
@@ -866,13 +942,19 @@ int main (int argc, char *argv[])
 
          /* Eliminate the boundary conditions in b */
          for (j = 0; j < n; j++)
-            bvalues[j] = bcEval(U0,1,j) * (bcEval(K,0.5,j)+bcEval(B1,0.5,j));
+         {
+            bvalues[j] = bcEval(U0, 1, j) * (bcEval(K, 0.5, j) + bcEval(B1, 0.5, j));
+         }
 
          if (pj == 0)
+         {
             bvalues[0] = 0.0;
+         }
 
-         if (pj == N-1)
-            bvalues[n-1] = 0.0;
+         if (pj == N - 1)
+         {
+            bvalues[n - 1] = 0.0;
+         }
 
          HYPRE_SStructVectorAddToBoxValues(b, part, bc_ilower, bc_iupper, var, bvalues);
       }
@@ -1121,7 +1203,7 @@ int main (int argc, char *argv[])
             type HYPRE_Solver, and then the casting would not be necessary.*/
 
          HYPRE_GMRESSetMaxIter((HYPRE_Solver) solver, 500 );
-         HYPRE_GMRESSetKDim((HYPRE_Solver) solver,30);
+         HYPRE_GMRESSetKDim((HYPRE_Solver) solver, 30);
          HYPRE_GMRESSetTol((HYPRE_Solver) solver, 1.0e-06 );
          HYPRE_GMRESSetPrintLevel((HYPRE_Solver) solver, 2 );
          HYPRE_GMRESSetLogging((HYPRE_Solver) solver, 1 );
@@ -1238,7 +1320,7 @@ int main (int argc, char *argv[])
       char filename[255];
 
       int part = 0, var = 0;
-      int nvalues = n*n;
+      int nvalues = n * n;
       double *values = (double*) calloc(nvalues, sizeof(double));
 
       /* get all local data (including a local copy of the shared values) */
@@ -1257,7 +1339,9 @@ int main (int argc, char *argv[])
       k = 0;
       for (j = 0; j < n; j++)
          for (i = 0; i < n; i++)
-            fprintf(file, "%06d %.14e\n", pj*N*n*n+pi*n+j*N*n+i, values[k++]);
+         {
+            fprintf(file, "%06d %.14e\n", pj * N * n * n + pi * n + j * N * n + i, values[k++]);
+         }
 
       fflush(file);
       fclose(file);
@@ -1265,7 +1349,9 @@ int main (int argc, char *argv[])
 
       /* save global finite element mesh */
       if (myid == 0)
-         GLVis_PrintGlobalSquareMesh("vis/ex7.mesh", N*n-1);
+      {
+         GLVis_PrintGlobalSquareMesh("vis/ex7.mesh", N * n - 1);
+      }
 #endif
    }
 
diff --git a/external/hypre/src/examples/ex8.c b/external/hypre/src/examples/ex8.c
index d33b69d0..c4ebd475 100644
--- a/external/hypre/src/examples/ex8.c
+++ b/external/hypre/src/examples/ex8.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -61,17 +61,17 @@ int main (int argc, char *argv[])
    MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
 
    /* Initialize HYPRE */
-   HYPRE_Init();
+   HYPRE_Initialize();
 
    /* Print GPU info */
    /* HYPRE_PrintDeviceInfo(); */
 
    if (num_procs != 2)
    {
-      if (myid ==0) printf("Must run with 2 processors!\n");
+      if (myid == 0) { printf("Must run with 2 processors!\n"); }
       MPI_Finalize();
 
-      return(0);
+      return (0);
    }
 
    /* Parse command line */
@@ -170,8 +170,10 @@ int main (int argc, char *argv[])
          int nvars = 1;
          HYPRE_SStructVariable vartypes[1] = {HYPRE_SSTRUCT_VARIABLE_CELL};
 
-         for (i = 0; i< nparts; i++)
+         for (i = 0; i < nparts; i++)
+         {
             HYPRE_SStructGridSetVariables(grid, i, nvars, vartypes);
+         }
       }
 
       /* Now we need to set the spatial relation between each of the parts.
@@ -187,16 +189,16 @@ int main (int argc, char *argv[])
             int nbor_part = 1;
             /* Cells just outside of the boundary of part 0 in
                its coordinates */
-            int b_ilower[2] = {0,1}, b_iupper[2] = {0,2};
+            int b_ilower[2] = {0, 1}, b_iupper[2] = {0, 2};
             /* The same cells in part 1's coordinates.  Since we use the same
                index space across all parts, the coordinates coincide. */
-            int nbor_ilower[2] = {0,1}, nbor_iupper[2] = {0,2};
+            int nbor_ilower[2] = {0, 1}, nbor_iupper[2] = {0, 2};
             /* These parts have the same orientation, so no
                rotation is necessary */
-            int index_map[2] = {0,1};
-            /* These parts map increasing values to increasing values 
+            int index_map[2] = {0, 1};
+            /* These parts map increasing values to increasing values
                for both variables (note: if decreasing maps to increasing, use -1)*/
-            int index_dir[2] = {1,1};
+            int index_dir[2] = {1, 1};
 
             HYPRE_SStructGridSetNeighborPart(grid, part, b_ilower, b_iupper,
                                              nbor_part, nbor_ilower, nbor_iupper,
@@ -209,16 +211,16 @@ int main (int argc, char *argv[])
             int nbor_part = 0;
             /* Cells just outside of the boundary of part 1 in
                its coordinates */
-            int b_ilower[2] = {-1,1}, b_iupper[2] = {-1,2};
+            int b_ilower[2] = {-1, 1}, b_iupper[2] = {-1, 2};
             /* The same cells in part 0's coordinates.  Since we use the same
                index space across all parts, the coordinates coincide. */
-            int nbor_ilower[2] = {-1,1}, nbor_iupper[2] = {-1,2};
+            int nbor_ilower[2] = {-1, 1}, nbor_iupper[2] = {-1, 2};
             /* These parts have the same orientation, so no
                rotation is necessary */
-            int index_map[2] = {0,1};
-            /* These parts map increasing values to increasing values 
+            int index_map[2] = {0, 1};
+            /* These parts map increasing values to increasing values
                for both variables (note: if decreasing maps to increasing, use -1)*/
-            int index_dir[2] = {1,1};
+            int index_dir[2] = {1, 1};
 
             HYPRE_SStructGridSetNeighborPart(grid, part, b_ilower, b_iupper,
                                              nbor_part, nbor_ilower, nbor_iupper,
@@ -231,19 +233,19 @@ int main (int argc, char *argv[])
             int nbor_part = 2;
             /* Cells just outside of the boundary of part 1 in
                its coordinates */
-            int b_ilower[2] = {3,1}, b_iupper[2] = {3,4};
+            int b_ilower[2] = {3, 1}, b_iupper[2] = {3, 4};
             /* The same cells in part 2's coordinates.  Since we use the same
                index space across all parts, the coordinates coincide. */
-            int nbor_ilower[2] = {3,1}, nbor_iupper[2] = {3,4};
+            int nbor_ilower[2] = {3, 1}, nbor_iupper[2] = {3, 4};
             /* These parts have the same orientation, so no
                rotation is necessary */
-            int index_map[2] = {0,1};
-            /* These parts map increasing values to increasing values 
+            int index_map[2] = {0, 1};
+            /* These parts map increasing values to increasing values
                for both variables (note: if decreasing maps to increasing, use -1)*/
-            int index_dir[2] = {1,1};
+            int index_dir[2] = {1, 1};
 
             HYPRE_SStructGridSetNeighborPart(grid, part, b_ilower, b_iupper,
-                                            nbor_part, nbor_ilower, nbor_iupper,
+                                             nbor_part, nbor_ilower, nbor_iupper,
                                              index_map, index_dir);
          }
       }
@@ -255,20 +257,20 @@ int main (int argc, char *argv[])
             int nbor_part = 1;
             /* Cells just outside of the boundary of part 2 in
                its coordinates */
-            int b_ilower[2] = {2,1}, b_iupper[2] = {2,4};
+            int b_ilower[2] = {2, 1}, b_iupper[2] = {2, 4};
             /* The same cells in part 1's coordinates.  Since we use the same
                index space across all parts, the coordinates coincide. */
-            int nbor_ilower[2] = {2,1}, nbor_iupper[2] = {2,4};
+            int nbor_ilower[2] = {2, 1}, nbor_iupper[2] = {2, 4};
             /* These parts have the same orientation, so no
                rotation is necessary */
-            int index_map[2] = {0,1};
-            /* These parts map increasing values to increasing values 
+            int index_map[2] = {0, 1};
+            /* These parts map increasing values to increasing values
               for both variables (note: if decreasing maps to increasing, use -1)*/
-            int index_dir[2] = {1,1};
+            int index_dir[2] = {1, 1};
 
             HYPRE_SStructGridSetNeighborPart(grid, part, b_ilower, b_iupper,
                                              nbor_part, nbor_ilower, nbor_iupper,
-                                             index_map, index_dir); 
+                                             index_map, index_dir);
          }
       }
 
@@ -284,24 +286,29 @@ int main (int argc, char *argv[])
 
       /* the 5-pt stencil in 2D */
       {
-         int offsets[5][2] = {{0,0}, {-1,0}, {1,0}, {0,-1}, {0,1}};
+         int offsets[5][2] = {{0, 0}, {-1, 0}, {1, 0}, {0, -1}, {0, 1}};
          int stencil_size = 5;
 
          HYPRE_SStructStencilCreate(ndim, stencil_size, &stencil_5pt);
 
          for (entry = 0; entry < 5; entry++)
+         {
             HYPRE_SStructStencilSetEntry(stencil_5pt, entry, offsets[entry], var);
+         }
       }
 
       /* the 9-pt stencil in 2D */
       {
-         int offsets[9][2] = {{0,0}, {-1,0}, {1,0}, {0,-1}, {0,1},
-                              {-1,-1}, {1,-1}, {1,1}, {-1,1}};
+         int offsets[9][2] = {{0, 0}, {-1, 0}, {1, 0}, {0, -1}, {0, 1},
+            {-1, -1}, {1, -1}, {1, 1}, {-1, 1}
+         };
          int stencil_size = 9;
          HYPRE_SStructStencilCreate(ndim, stencil_size, &stencil_9pt);
 
          for (entry = 0; entry < stencil_size; entry++)
+         {
             HYPRE_SStructStencilSetEntry(stencil_9pt, entry, offsets[entry], var);
+         }
       }
    }
 
@@ -339,7 +346,7 @@ int main (int argc, char *argv[])
 
    /* 4. Set up a SStruct Matrix */
    {
-      int i,j;
+      int i, j;
       int part;
       int var = 0;
 
@@ -375,19 +382,23 @@ int main (int argc, char *argv[])
             int nentries = 5;
             int nvalues  = 30; /* 6 grid points, each with 5 stencil entries */
             /* double values[30]; OK to use constant-length array for CPUs */
-            double *values = (double *) malloc(30*sizeof(double));
+            double *values = (double *) malloc(30 * sizeof(double));
 
             int stencil_indices[5];
             for (j = 0; j < nentries; j++) /* label the stencil indices -
                                               these correspond to the offsets
                                               defined above */
+            {
                stencil_indices[j] = j;
+            }
 
             for (i = 0; i < nvalues; i += nentries)
             {
                values[i] = 4.0;
                for (j = 1; j < nentries; j++)
-                  values[i+j] = -1.0;
+               {
+                  values[i + j] = -1.0;
+               }
             }
 
             part = 0;
@@ -407,17 +418,21 @@ int main (int argc, char *argv[])
             int nentries = 9;
             int nvalues  = 108; /* 12 grid points, each with 5 stencil entries */
             /* double values[108]; OK to use constant-length array for CPUs */
-            double *values = (double *) malloc(108*sizeof(double));
+            double *values = (double *) malloc(108 * sizeof(double));
 
             int stencil_indices[9];
             for (j = 0; j < nentries; j++)
+            {
                stencil_indices[j] = j;
+            }
 
             for (i = 0; i < nvalues; i += nentries)
             {
-               values[i] = 8./3.;
+               values[i] = 8. / 3.;
                for (j = 1; j < nentries; j++)
-                  values[i+j] = -1./3.;
+               {
+                  values[i + j] = -1. / 3.;
+               }
             }
 
             part = 1;
@@ -439,17 +454,21 @@ int main (int argc, char *argv[])
             int nentries = 5;
             int nvalues  = 80; /* 16 grid points, each with 5 stencil entries */
             /* double values[80]; OK to use constant-length array for CPUs */
-            double *values = (double *) malloc(80*sizeof(double));
+            double *values = (double *) malloc(80 * sizeof(double));
 
             int stencil_indices[5];
             for (j = 0; j < nentries; j++)
+            {
                stencil_indices[j] = j;
+            }
 
             for (i = 0; i < nvalues; i += nentries)
             {
                values[i] = 4.0;
                for (j = 1; j < nentries; j++)
-                  values[i+j] = -1.0;
+               {
+                  values[i + j] = -1.0;
+               }
             }
 
             part = 2;
@@ -468,18 +487,18 @@ int main (int argc, char *argv[])
          int nentries = 6;
          int nvalues  = 24; /* 4 grid points, each with 6 stencil entries */
          /* double values[24]; OK to use constant-length array for CPUs */
-         double *values = (double *) malloc(24*sizeof(double));
+         double *values = (double *) malloc(24 * sizeof(double));
 
          part = 1;
 
          for (i = 0; i < nvalues; i += nentries)
          {
-            values[i]   = 10./3.;
-            values[i+1] = -1.;
-            values[i+2] = -2./3.;
-            values[i+3] = -2./3.;
-            values[i+4] = 0.0;
-            values[i+5] = 0.0;
+            values[i]   = 10. / 3.;
+            values[i + 1] = -1.;
+            values[i + 2] = -2. / 3.;
+            values[i + 3] = -2. / 3.;
+            values[i + 4] = 0.0;
+            values[i + 5] = 0.0;
          }
 
          {
@@ -487,7 +506,7 @@ int main (int argc, char *argv[])
             int ilower[2] = { 2, 1};
             int iupper[2] = { 2, 4};
 
-            int stencil_indices[6] = {0,2,3,4,6,7};
+            int stencil_indices[6] = {0, 2, 3, 4, 6, 7};
 
             HYPRE_SStructMatrixSetBoxValues(A, part, ilower, iupper,
                                             var, nentries,
@@ -499,7 +518,7 @@ int main (int argc, char *argv[])
             int ilower[2] = { 0, 1};
             int iupper[2] = { 0, 4};
 
-            int stencil_indices[6] = {0,1,3,4,5,8};
+            int stencil_indices[6] = {0, 1, 3, 4, 5, 8};
 
             HYPRE_SStructMatrixSetBoxValues(A, part, ilower, iupper,
                                             var, nentries,
@@ -515,10 +534,12 @@ int main (int argc, char *argv[])
       {
          int maxnvalues = 9;
          /* double values[9]; OK to use constant-length array for CPUs */
-         double *values = (double *) malloc(9*sizeof(double));
+         double *values = (double *) malloc(9 * sizeof(double));
 
          for (i = 0; i < maxnvalues; i++)
+         {
             values[i] = 0.0;
+         }
 
          part = 0;
 
@@ -565,7 +586,7 @@ int main (int argc, char *argv[])
             int ilower[2] = { 0, 1};
             int iupper[2] = { 2, 1};
 
-            int stencil_indices[3] = {3,5,6};
+            int stencil_indices[3] = {3, 5, 6};
 
             HYPRE_SStructMatrixSetBoxValues(A, part, ilower, iupper,
                                             var, 3,
@@ -578,7 +599,7 @@ int main (int argc, char *argv[])
             int ilower[2] = { 0, 3};
             int iupper[2] = { 0, 4};
 
-            int stencil_indices[3] = {1,5,8};
+            int stencil_indices[3] = {1, 5, 8};
 
             HYPRE_SStructMatrixSetBoxValues(A, part, ilower, iupper,
                                             var, 3,
@@ -590,7 +611,7 @@ int main (int argc, char *argv[])
             int ilower[2] = { 0, 4};
             int iupper[2] = { 2, 4};
 
-            int stencil_indices[3] = {4,7,8};
+            int stencil_indices[3] = {4, 7, 8};
 
             HYPRE_SStructMatrixSetBoxValues(A, part, ilower, iupper,
                                             var, 3,
@@ -603,10 +624,12 @@ int main (int argc, char *argv[])
       {
          int maxnvalues = 4;
          /* double values[4]; OK to use constant-length array for CPUs */
-         double *values = (double *) malloc(4*sizeof(double));
+         double *values = (double *) malloc(4 * sizeof(double));
 
          for (i = 0; i < maxnvalues; i++)
+         {
             values[i] = 0.0;
+         }
 
          part = 2;
 
@@ -683,16 +706,20 @@ int main (int argc, char *argv[])
 
             int nvalues = 6;  /* 6 grid points */
             /* double values[6]; OK to use constant-length array for CPUs */
-            double *values = (double *) malloc(6*sizeof(double));
+            double *values = (double *) malloc(6 * sizeof(double));
 
             part = 0;
 
             for (i = 0; i < nvalues; i ++)
+            {
                values[i] = 1.0;
+            }
             HYPRE_SStructVectorSetBoxValues(b, part, ilower, iupper, var, values);
 
             for (i = 0; i < nvalues; i ++)
+            {
                values[i] = 0.0;
+            }
             HYPRE_SStructVectorSetBoxValues(x, part, ilower, iupper, var, values);
 
             free(values);
@@ -705,16 +732,20 @@ int main (int argc, char *argv[])
 
             int nvalues = 12; /* 12 grid points */
             /* double values[12]; OK to use constant-length array for CPUs */
-            double *values = (double *) malloc(12*sizeof(double));
+            double *values = (double *) malloc(12 * sizeof(double));
 
             part = 1;
 
             for (i = 0; i < nvalues; i ++)
+            {
                values[i] = 1.0;
+            }
             HYPRE_SStructVectorSetBoxValues(b, part, ilower, iupper, var, values);
 
             for (i = 0; i < nvalues; i ++)
+            {
                values[i] = 0.0;
+            }
             HYPRE_SStructVectorSetBoxValues(x, part, ilower, iupper, var, values);
 
             free(values);
@@ -729,16 +760,20 @@ int main (int argc, char *argv[])
 
             int nvalues = 16; /* 16 grid points */
             /* double values[16]; OK to use constant-length array for CPUs */
-            double *values = (double *) malloc(16*sizeof(double));
+            double *values = (double *) malloc(16 * sizeof(double));
 
             part = 2;
 
             for (i = 0; i < nvalues; i ++)
+            {
                values[i] = 1.0;
+            }
             HYPRE_SStructVectorSetBoxValues(b, part, ilower, iupper, var, values);
 
             for (i = 0; i < nvalues; i ++)
+            {
                values[i] = 0.0;
+            }
             HYPRE_SStructVectorSetBoxValues(x, part, ilower, iupper, var, values);
 
             free(values);
diff --git a/external/hypre/src/examples/ex9.c b/external/hypre/src/examples/ex9.c
index 7b3c846d..a21441e1 100644
--- a/external/hypre/src/examples/ex9.c
+++ b/external/hypre/src/examples/ex9.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -88,7 +88,7 @@ int main (int argc, char *argv[])
    MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
 
    /* Initialize HYPRE */
-   HYPRE_Init();
+   HYPRE_Initialize();
 
    /* Print GPU info */
    /* HYPRE_PrintDeviceInfo(); */
@@ -166,18 +166,18 @@ int main (int argc, char *argv[])
       size for the interior nodes is indicated by n (n x n).
       pi and pj indicate position in the processor grid. */
    N  = sqrt(num_procs);
-   h  = 1.0 / (N*n+1); /* note that when calculating h we must
+   h  = 1.0 / (N * n + 1); /* note that when calculating h we must
                           remember to count the boundary nodes */
-   h2 = h*h;
+   h2 = h * h;
    pj = myid / N;
-   pi = myid - pj*N;
+   pi = myid - pj * N;
 
    /* Figure out the extents of each processor's piece of the grid. */
-   ilower[0] = pi*n;
-   ilower[1] = pj*n;
+   ilower[0] = pi * n;
+   ilower[1] = pj * n;
 
-   iupper[0] = ilower[0] + n-1;
-   iupper[1] = ilower[1] + n-1;
+   iupper[0] = ilower[0] + n - 1;
+   iupper[1] = ilower[1] + n - 1;
 
    /* 1. Set up a grid - we have one part and two variables */
    {
@@ -195,11 +195,16 @@ int main (int argc, char *argv[])
       {
          int i;
          int nvars = 2;
-         HYPRE_SStructVariable vartypes[2] = {HYPRE_SSTRUCT_VARIABLE_CELL,
-                                              HYPRE_SSTRUCT_VARIABLE_CELL };
+         HYPRE_SStructVariable vartypes[2] =
+         {
+            HYPRE_SSTRUCT_VARIABLE_CELL,
+            HYPRE_SSTRUCT_VARIABLE_CELL
+         };
 
-         for (i = 0; i< nparts; i++)
+         for (i = 0; i < nparts; i++)
+         {
             HYPRE_SStructGridSetVariables(grid, i, nvars, vartypes);
+         }
       }
 
       /* This is a collective call finalizing the grid assembly.
@@ -216,15 +221,17 @@ int main (int argc, char *argv[])
 
       /* Stencil object for variable u (labeled as variable 0) */
       {
-         int offsets[6][2] = {{0,0}, {-1,0}, {1,0}, {0,-1}, {0,1}, {0,0}};
+         int offsets[6][2] = {{0, 0}, {-1, 0}, {1, 0}, {0, -1}, {0, 1}, {0, 0}};
          stencil_size = 6;
 
          HYPRE_SStructStencilCreate(ndim, stencil_size, &stencil_u);
 
          /* The first 5 entries are for the u-u connections */
          var = 0; /* connect to variable 0 */
-         for (entry = 0; entry < stencil_size-1 ; entry++)
+         for (entry = 0; entry < stencil_size - 1 ; entry++)
+         {
             HYPRE_SStructStencilSetEntry(stencil_u, entry, offsets[entry], var);
+         }
 
          /* The last entry is for the u-v connection */
          var = 1;  /* connect to variable 1 */
@@ -234,7 +241,7 @@ int main (int argc, char *argv[])
 
       /* Stencil object for variable v  (variable 1) */
       {
-         int offsets[5][2] = {{0,0}, {-1,0}, {1,0}, {0,-1}, {0,1}};
+         int offsets[5][2] = {{0, 0}, {-1, 0}, {1, 0}, {0, -1}, {0, 1}};
          stencil_size = 5;
 
          HYPRE_SStructStencilCreate(ndim, stencil_size, &stencil_v);
@@ -242,7 +249,9 @@ int main (int argc, char *argv[])
          /* These are all v-v connections */
          var = 1; /* Connect to variable 1 */
          for (entry = 0; entry < stencil_size; entry++)
+         {
             HYPRE_SStructStencilSetEntry(stencil_v, entry, offsets[entry], var);
+         }
       }
    }
 
@@ -319,14 +328,16 @@ int main (int argc, char *argv[])
 
          /*  First the u-u connections */
          nentries = 5;
-         nvalues = nentries*n*n;
+         nvalues = nentries * n * n;
          u_values = (double*) calloc(nvalues, sizeof(double));
 
          for (i = 0; i < nvalues; i += nentries)
          {
             u_values[i] = 4.0;
             for (j = 1; j < nentries; j++)
-               u_values[i+j] = -1.0;
+            {
+               u_values[i + j] = -1.0;
+            }
          }
 
          HYPRE_SStructMatrixSetBoxValues(A, part, ilower, iupper,
@@ -336,7 +347,7 @@ int main (int argc, char *argv[])
 
          /* Next the u-v connections */
          nentries = 1;
-         nvalues = nentries*n*n;
+         nvalues = nentries * n * n;
          u_values = (double*) calloc(nvalues, sizeof(double));
 
          for (i = 0; i < nvalues; i++)
@@ -361,14 +372,16 @@ int main (int argc, char *argv[])
 
          /* the v-v connections */
          nentries = 5;
-         nvalues = nentries*n*n;
+         nvalues = nentries * n * n;
          v_values = (double*) calloc(nvalues, sizeof(double));
 
          for (i = 0; i < nvalues; i += nentries)
          {
             v_values[i] = 4.0;
             for (j = 1; j < nentries; j++)
-               v_values[i+j] = -1.0;
+            {
+               v_values[i + j] = -1.0;
+            }
          }
 
          HYPRE_SStructMatrixSetBoxValues(A, part, ilower, iupper,
@@ -388,7 +401,7 @@ int main (int argc, char *argv[])
       int bc_ilower[2];
       int bc_iupper[2];
       int nentries = 1;
-      int nvalues  = nentries*n; /*  number of stencil entries times the length
+      int nvalues  = nentries * n; /*  number of stencil entries times the length
                                      of one side of my grid box */
       int var;
       double *values;
@@ -398,16 +411,18 @@ int main (int argc, char *argv[])
 
       values = (double*) calloc(nvalues, sizeof(double));
       for (j = 0; j < nvalues; j++)
-            values[j] = 0.0;
+      {
+         values[j] = 0.0;
+      }
 
       /* Recall: pi and pj describe position in the processor grid */
       if (pj == 0)
       {
          /* Bottom row of grid points */
-         bc_ilower[0] = pi*n;
-         bc_ilower[1] = pj*n;
+         bc_ilower[0] = pi * n;
+         bc_ilower[1] = pj * n;
 
-         bc_iupper[0] = bc_ilower[0] + n-1;
+         bc_iupper[0] = bc_ilower[0] + n - 1;
          bc_iupper[1] = bc_ilower[1];
 
          stencil_indices[0] = 3;
@@ -424,13 +439,13 @@ int main (int argc, char *argv[])
                                          stencil_indices, values);
       }
 
-      if (pj == N-1)
+      if (pj == N - 1)
       {
          /* upper row of grid points */
-         bc_ilower[0] = pi*n;
-         bc_ilower[1] = pj*n + n-1;
+         bc_ilower[0] = pi * n;
+         bc_ilower[1] = pj * n + n - 1;
 
-         bc_iupper[0] = bc_ilower[0] + n-1;
+         bc_iupper[0] = bc_ilower[0] + n - 1;
          bc_iupper[1] = bc_ilower[1];
 
          stencil_indices[0] = 4;
@@ -451,11 +466,11 @@ int main (int argc, char *argv[])
       if (pi == 0)
       {
          /* Left row of grid points */
-         bc_ilower[0] = pi*n;
-         bc_ilower[1] = pj*n;
+         bc_ilower[0] = pi * n;
+         bc_ilower[1] = pj * n;
 
          bc_iupper[0] = bc_ilower[0];
-         bc_iupper[1] = bc_ilower[1] + n-1;
+         bc_iupper[1] = bc_ilower[1] + n - 1;
 
          stencil_indices[0] = 1;
 
@@ -471,14 +486,14 @@ int main (int argc, char *argv[])
                                          stencil_indices, values);
       }
 
-      if (pi == N-1)
+      if (pi == N - 1)
       {
          /* Right row of grid points */
-         bc_ilower[0] = pi*n + n-1;
-         bc_ilower[1] = pj*n;
+         bc_ilower[0] = pi * n + n - 1;
+         bc_ilower[1] = pj * n;
 
          bc_iupper[0] = bc_ilower[0];
-         bc_iupper[1] = bc_ilower[1] + n-1;
+         bc_iupper[1] = bc_ilower[1] + n - 1;
 
          stencil_indices[0] = 2;
 
@@ -503,7 +518,7 @@ int main (int argc, char *argv[])
 
    /* 5. Set up SStruct Vectors for b and x */
    {
-      int    nvalues = n*n;
+      int    nvalues = n * n;
       double *values;
       int part = 0;
       int var;
@@ -525,12 +540,16 @@ int main (int argc, char *argv[])
 
       /* Set the values for b */
       for (i = 0; i < nvalues; i ++)
+      {
          values[i] = h2;
+      }
       var = 1;
       HYPRE_SStructVectorSetBoxValues(b, part, ilower, iupper, var, values);
 
       for (i = 0; i < nvalues; i ++)
+      {
          values[i] = 0.0;
+      }
       var = 0;
       HYPRE_SStructVectorSetBoxValues(b, part, ilower, iupper, var, values);
 
@@ -568,7 +587,7 @@ int main (int argc, char *argv[])
          HYPRE_SStructVectorGetObject(x, (void **) &par_x);
       }
 
-      if (solver_id ==0 ) /* GMRES with SysPFMG - the default*/
+      if (solver_id == 0 ) /* GMRES with SysPFMG - the default*/
       {
          HYPRE_SStructGMRESCreate(MPI_COMM_WORLD, &solver);
 
@@ -605,6 +624,7 @@ int main (int argc, char *argv[])
          HYPRE_SStructGMRESGetNumIterations(solver, &its);
 
          /* clean up */
+         HYPRE_SStructSysPFMGDestroy(precond);
          HYPRE_SStructGMRESDestroy(solver);
       }
       else if (solver_id == 1) /* SysPFMG */
@@ -700,7 +720,7 @@ int main (int argc, char *argv[])
       }
       else
       {
-         if (myid ==0) printf("\n ERROR: Invalid solver id specified.\n");
+         if (myid == 0) { printf("\n ERROR: Invalid solver id specified.\n"); }
       }
 
       /* Gather the solution vector.  This needs to be done if:
@@ -719,7 +739,7 @@ int main (int argc, char *argv[])
          char filename[255];
 
          int k, part = 0, var;
-         int nvalues = n*n;
+         int nvalues = n * n;
          double *values = (double*) calloc(nvalues, sizeof(double));
 
          /* save local solution for variable u */
@@ -739,7 +759,9 @@ int main (int argc, char *argv[])
          k = 0;
          for (j = 0; j < n; j++)
             for (i = 0; i < n; i++)
-               fprintf(file, "%06d %.14e\n", pj*N*n*n+pi*n+j*N*n+i, values[k++]);
+            {
+               fprintf(file, "%06d %.14e\n", pj * N * n * n + pi * n + j * N * n + i, values[k++]);
+            }
 
          fflush(file);
          fclose(file);
@@ -761,7 +783,9 @@ int main (int argc, char *argv[])
          k = 0;
          for (j = 0; j < n; j++)
             for (i = 0; i < n; i++)
-               fprintf(file, "%06d %.14e\n", pj*N*n*n+pi*n+j*N*n+i, values[k++]);
+            {
+               fprintf(file, "%06d %.14e\n", pj * N * n * n + pi * n + j * N * n + i, values[k++]);
+            }
 
          fflush(file);
          fclose(file);
@@ -770,7 +794,9 @@ int main (int argc, char *argv[])
 
          /* save global finite element mesh */
          if (myid == 0)
-            GLVis_PrintGlobalSquareMesh("vis/ex9.mesh", N*n-1);
+         {
+            GLVis_PrintGlobalSquareMesh("vis/ex9.mesh", N * n - 1);
+         }
 #endif
       }
 
diff --git a/external/hypre/src/examples/vis.c b/external/hypre/src/examples/vis.c
index 0655cb72..235b8b0b 100644
--- a/external/hypre/src/examples/vis.c
+++ b/external/hypre/src/examples/vis.c
@@ -1,3 +1,10 @@
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
 /* Save a structured n x n mesh of square elements on the unit square into a
    GLVis mesh file with the given name. */
 #include <math.h>
@@ -6,12 +13,12 @@ void GLVis_PrintGlobalSquareMesh(const char *meshfile, int n)
    FILE *file;
 
    int Dim = 2;
-   int NumOfVertices = (n+1)*(n+1);
-   int NumOfElements = n*n;
+   int NumOfVertices = (n + 1) * (n + 1);
+   int NumOfElements = n * n;
 
    int i, j;
    double x, y;
-   double h = 1.0/n;
+   double h = 1.0 / n;
 
    if ((file = fopen(meshfile, "w")) == NULL)
    {
@@ -29,8 +36,8 @@ void GLVis_PrintGlobalSquareMesh(const char *meshfile, int n)
    fprintf(file, "%d\n", NumOfElements);
    for (j = 0; j < n; j++)
       for (i = 0; i < n; i++)
-         fprintf(file, "1 3 %d %d %d %d\n", i + j*(n+1), i + 1 +j*(n+1),
-                 i + 1 + (j+1)*(n+1), i + (j+1)*(n+1));
+         fprintf(file, "1 3 %d %d %d %d\n", i + j * (n + 1), i + 1 + j * (n + 1),
+                 i + 1 + (j + 1) * (n + 1), i + (j + 1) * (n + 1));
 
    /* boundary will be generated by GLVis */
    fprintf(file, "\nboundary\n");
@@ -40,11 +47,11 @@ void GLVis_PrintGlobalSquareMesh(const char *meshfile, int n)
    fprintf(file, "\nvertices\n");
    fprintf(file, "%d\n", NumOfVertices);
    fprintf(file, "%d\n", Dim);
-   for (j = 0; j < n+1; j++)
-      for (i = 0; i < n+1; i++)
+   for (j = 0; j < n + 1; j++)
+      for (i = 0; i < n + 1; i++)
       {
-         x = i*h;
-         y = j*h;
+         x = i * h;
+         y = j * h;
          fprintf(file, "%.14e %.14e\n", x, y);
       }
 
@@ -61,8 +68,8 @@ void GLVis_PrintLocalSquareMesh(const char *meshfile_prefix, int nx, int ny,
    char meshfile[255];
 
    int Dim = 2;
-   int NumOfVertices = (nx+1)*(ny+1);
-   int NumOfElements = nx*ny;
+   int NumOfVertices = (nx + 1) * (ny + 1);
+   int NumOfElements = nx * ny;
 
    int i, j;
    double x, y;
@@ -84,8 +91,8 @@ void GLVis_PrintLocalSquareMesh(const char *meshfile_prefix, int nx, int ny,
    fprintf(file, "%d\n", NumOfElements);
    for (j = 0; j < ny; j++)
       for (i = 0; i < nx; i++)
-         fprintf(file, "1 3 %d %d %d %d\n", i + j*(nx+1), i + 1 +j*(nx+1),
-                 i + 1 + (j+1)*(nx+1), i + (j+1)*(nx+1));
+         fprintf(file, "1 3 %d %d %d %d\n", i + j * (nx + 1), i + 1 + j * (nx + 1),
+                 i + 1 + (j + 1) * (nx + 1), i + (j + 1) * (nx + 1));
 
    /* boundary will be generated by GLVis */
    fprintf(file, "\nboundary\n");
@@ -95,11 +102,11 @@ void GLVis_PrintLocalSquareMesh(const char *meshfile_prefix, int nx, int ny,
    fprintf(file, "\nvertices\n");
    fprintf(file, "%d\n", NumOfVertices);
    fprintf(file, "%d\n", Dim);
-   for (j = 0; j < ny+1; j++)
-      for (i = 0; i < nx+1; i++)
+   for (j = 0; j < ny + 1; j++)
+      for (i = 0; i < nx + 1; i++)
       {
-         x = x0+i*h;
-         y = y0+j*h;
+         x = x0 + i * h;
+         y = y0 + j * h;
          fprintf(file, "%.14e %.14e\n", x, y);
       }
 
@@ -116,14 +123,14 @@ void GLVis_PrintLocalRhombusMesh(const char *meshfile_prefix,
    char meshfile[255];
 
    int Dim = 2;
-   int NumOfVertices = (n+1)*(n+1);
-   int NumOfElements = n*n;
+   int NumOfVertices = (n + 1) * (n + 1);
+   int NumOfElements = n * n;
 
    int i, j;
    double x, y;
-   double h = 1.0/n;
+   double h = 1.0 / n;
 
-   double rho = gamma*myid;
+   double rho = gamma * myid;
    double sg  = sin(gamma);
    double cg  = cos(gamma);
    double sr  = sin(rho);
@@ -146,8 +153,8 @@ void GLVis_PrintLocalRhombusMesh(const char *meshfile_prefix,
    fprintf(file, "%d\n", NumOfElements);
    for (j = 0; j < n; j++)
       for (i = 0; i < n; i++)
-         fprintf(file, "1 3 %d %d %d %d\n", i + j*(n+1), i + 1 +j*(n+1),
-                 i + 1 + (j+1)*(n+1), i + (j+1)*(n+1));
+         fprintf(file, "1 3 %d %d %d %d\n", i + j * (n + 1), i + 1 + j * (n + 1),
+                 i + 1 + (j + 1) * (n + 1), i + (j + 1) * (n + 1));
 
    /* boundary will be generated by GLVis */
    fprintf(file, "\nboundary\n");
@@ -157,12 +164,12 @@ void GLVis_PrintLocalRhombusMesh(const char *meshfile_prefix,
    fprintf(file, "\nvertices\n");
    fprintf(file, "%d\n", NumOfVertices);
    fprintf(file, "%d\n", Dim);
-   for (j = 0; j < n+1; j++)
-      for (i = 0; i < n+1; i++)
+   for (j = 0; j < n + 1; j++)
+      for (i = 0; i < n + 1; i++)
       {
-         x = i*h + cg*j*h;
-         y = sg*j*h;
-         fprintf(file, "%.14e %.14e\n", cr*x - sr*y, sr*x + cr*y);
+         x = i * h + cg * j * h;
+         y = sg * j * h;
+         fprintf(file, "%.14e %.14e\n", cr * x - sr * y, sr * x + cr * y);
       }
 
    fflush(file);
@@ -179,8 +186,8 @@ void GLVis_PrintLocalCubicMesh(const char *meshfile_prefix,
    char meshfile[255];
 
    int Dim = 3;
-   int NumOfVertices = (nx+1)*(ny+1)*(nz+1);
-   int NumOfElements = nx*ny*nz;
+   int NumOfVertices = (nx + 1) * (ny + 1) * (nz + 1);
+   int NumOfElements = nx * ny * nz;
 
    int i, j, k;
    double x, y, z;
@@ -204,14 +211,14 @@ void GLVis_PrintLocalCubicMesh(const char *meshfile_prefix,
       for (j = 0; j < ny; j++)
          for (i = 0; i < nx; i++)
             fprintf(file, "1 5 %d %d %d %d %d %d %d %d\n",
-                    i + j*(nx+1) + k*(nx+1)*(ny+1),
-                    i + 1 +j*(nx+1) + k*(nx+1)*(ny+1),
-                    i + 1 + (j+1)*(nx+1) + k*(nx+1)*(ny+1),
-                    i + (j+1)*(nx+1) + k*(nx+1)*(ny+1),
-                    i + j*(nx+1) + (k+1)*(nx+1)*(ny+1),
-                    i + 1 +j*(nx+1) + (k+1)*(nx+1)*(ny+1),
-                    i + 1 + (j+1)*(nx+1) + (k+1)*(nx+1)*(ny+1),
-                    i + (j+1)*(nx+1) + (k+1)*(nx+1)*(ny+1));
+                    i + j * (nx + 1) + k * (nx + 1) * (ny + 1),
+                    i + 1 + j * (nx + 1) + k * (nx + 1) * (ny + 1),
+                    i + 1 + (j + 1) * (nx + 1) + k * (nx + 1) * (ny + 1),
+                    i + (j + 1) * (nx + 1) + k * (nx + 1) * (ny + 1),
+                    i + j * (nx + 1) + (k + 1) * (nx + 1) * (ny + 1),
+                    i + 1 + j * (nx + 1) + (k + 1) * (nx + 1) * (ny + 1),
+                    i + 1 + (j + 1) * (nx + 1) + (k + 1) * (nx + 1) * (ny + 1),
+                    i + (j + 1) * (nx + 1) + (k + 1) * (nx + 1) * (ny + 1));
 
    /* boundary will be generated by GLVis */
    fprintf(file, "\nboundary\n");
@@ -221,13 +228,13 @@ void GLVis_PrintLocalCubicMesh(const char *meshfile_prefix,
    fprintf(file, "\nvertices\n");
    fprintf(file, "%d\n", NumOfVertices);
    fprintf(file, "%d\n", Dim);
-   for (k = 0; k < nz+1; k++)
-      for (j = 0; j < ny+1; j++)
-         for (i = 0; i < nx+1; i++)
+   for (k = 0; k < nz + 1; k++)
+      for (j = 0; j < ny + 1; j++)
+         for (i = 0; i < nx + 1; i++)
          {
-            x = x0+i*h;
-            y = y0+j*h;
-            z = z0+k*h;
+            x = x0 + i * h;
+            y = y0 + j * h;
+            z = z0 + k * h;
             fprintf(file, "%.14e %.14e %.14e\n", x, y, z);
          }
 
@@ -251,7 +258,7 @@ void GLVis_PrintSStructGrid(HYPRE_SStructGrid grid,
 
    int dim = ((hypre_SStructGrid *)grid)->ndim;
    int cellNV = (dim == 2) ? 4 : 8;
-   int elemid = 2*dim-1;
+   int elemid = 2 * dim - 1;
    int nvert, nelem;
 
    hypre_StructGrid *part;
@@ -272,7 +279,7 @@ void GLVis_PrintSStructGrid(HYPRE_SStructGrid grid,
       {
          box = hypre_BoxArrayBox(boxes, b);
          ncells = hypre_BoxVolume(box);
-         nvert += ncells*cellNV;
+         nvert += ncells * cellNV;
          nelem += ncells;
       }
    }
@@ -305,13 +312,15 @@ void GLVis_PrintSStructGrid(HYPRE_SStructGrid grid,
          for (b = 0; b < hypre_BoxArraySize(boxes); b++)
          {
             box = hypre_BoxArrayBox(boxes, b);
-            for (k = hypre_BoxIMinD(box,2); k <= hypre_BoxIMaxD(box,2); k++)
-               for (j = hypre_BoxIMinD(box,1); j <= hypre_BoxIMaxD(box,1); j++)
-                  for (i = hypre_BoxIMinD(box,0); i <= hypre_BoxIMaxD(box,0); i++)
+            for (k = hypre_BoxIMinD(box, 2); k <= hypre_BoxIMaxD(box, 2); k++)
+               for (j = hypre_BoxIMinD(box, 1); j <= hypre_BoxIMaxD(box, 1); j++)
+                  for (i = hypre_BoxIMinD(box, 0); i <= hypre_BoxIMaxD(box, 0); i++)
                   {
                      fprintf(file, "1 %d ", elemid);
                      for (v = 0; v < cellNV; v++, vert++)
+                     {
                         fprintf(file, "%d ", vert);
+                     }
                      fprintf(file, "\n");
                   }
          }
@@ -335,88 +344,88 @@ void GLVis_PrintSStructGrid(HYPRE_SStructGrid grid,
          for (b = 0; b < hypre_BoxArraySize(boxes); b++)
          {
             box = hypre_BoxArrayBox(boxes, b);
-            for (k = hypre_BoxIMinD(box,2); k <= hypre_BoxIMaxD(box,2); k++)
-               for (j = hypre_BoxIMinD(box,1); j <= hypre_BoxIMaxD(box,1); j++)
-                  for (i = hypre_BoxIMinD(box,0); i <= hypre_BoxIMaxD(box,0); i++)
+            for (k = hypre_BoxIMinD(box, 2); k <= hypre_BoxIMaxD(box, 2); k++)
+               for (j = hypre_BoxIMinD(box, 1); j <= hypre_BoxIMaxD(box, 1); j++)
+                  for (i = hypre_BoxIMinD(box, 0); i <= hypre_BoxIMaxD(box, 0); i++)
                      if (dim == 2)
                      {
                         if (!given_trans)
                         {
-                           fprintf(file, "%.14e %.14e \n", x0+i*h, y0+j*h);
-                           fprintf(file, "%.14e %.14e \n", x0+(i+1)*h, y0+j*h);
-                           fprintf(file, "%.14e %.14e \n", x0+(i+1)*h, y0+(j+1)*h);
-                           fprintf(file, "%.14e %.14e \n", x0+i*h, y0+(j+1)*h);
+                           fprintf(file, "%.14e %.14e \n", x0 + i * h, y0 + j * h);
+                           fprintf(file, "%.14e %.14e \n", x0 + (i + 1)*h, y0 + j * h);
+                           fprintf(file, "%.14e %.14e \n", x0 + (i + 1)*h, y0 + (j + 1)*h);
+                           fprintf(file, "%.14e %.14e \n", x0 + i * h, y0 + (j + 1)*h);
                         }
                         else
                         {
                            fprintf(file, "%.14e %.14e \n",
-                                   T[0]*i+T[1]*j+O[0],
-                                   T[2]*i+T[3]*j+O[1]);
+                                   T[0]*i + T[1]*j + O[0],
+                                   T[2]*i + T[3]*j + O[1]);
                            fprintf(file, "%.14e %.14e \n",
-                                   T[0]*(i+1)+T[1]*j+O[0],
-                                   T[2]*(i+1)+T[3]*j+O[1]);
+                                   T[0] * (i + 1) + T[1]*j + O[0],
+                                   T[2] * (i + 1) + T[3]*j + O[1]);
                            fprintf(file, "%.14e %.14e \n",
-                                   T[0]*(i+1)+T[1]*(j+1)+O[0],
-                                   T[2]*(i+1)+T[3]*(j+1)+O[1]);
+                                   T[0] * (i + 1) + T[1] * (j + 1) + O[0],
+                                   T[2] * (i + 1) + T[3] * (j + 1) + O[1]);
                            fprintf(file, "%.14e %.14e \n",
-                                   T[0]*i+T[1]*(j+1)+O[0],
-                                   T[2]*i+T[3]*(j+1)+O[1]);
+                                   T[0]*i + T[1] * (j + 1) + O[0],
+                                   T[2]*i + T[3] * (j + 1) + O[1]);
                         }
                      }
                      else
                      {
                         if (!given_trans)
                         {
-                           fprintf(file, "%.14e %.14e %.14e \n", x0+i*h, y0+j*h, z0+k*h);
-                           fprintf(file, "%.14e %.14e %.14e \n", x0+(i+1)*h, y0+j*h, z0+k*h);
-                           fprintf(file, "%.14e %.14e %.14e \n", x0+(i+1)*h, y0+(j+1)*h, z0+k*h);
-                           fprintf(file, "%.14e %.14e %.14e \n", x0+i*h, y0+(j+1)*h, z0+k*h);
-                           fprintf(file, "%.14e %.14e %.14e \n", x0+i*h, y0+j*h, z0+(k+1)*h);
-                           fprintf(file, "%.14e %.14e %.14e \n", x0+(i+1)*h, y0+j*h, z0+(k+1)*h);
-                           fprintf(file, "%.14e %.14e %.14e \n", x0+(i+1)*h, y0+(j+1)*h, z0+(k+1)*h);
-                           fprintf(file, "%.14e %.14e %.14e \n", x0+i*h, y0+(j+1)*h, z0+(k+1)*h);
+                           fprintf(file, "%.14e %.14e %.14e \n", x0 + i * h, y0 + j * h, z0 + k * h);
+                           fprintf(file, "%.14e %.14e %.14e \n", x0 + (i + 1)*h, y0 + j * h, z0 + k * h);
+                           fprintf(file, "%.14e %.14e %.14e \n", x0 + (i + 1)*h, y0 + (j + 1)*h, z0 + k * h);
+                           fprintf(file, "%.14e %.14e %.14e \n", x0 + i * h, y0 + (j + 1)*h, z0 + k * h);
+                           fprintf(file, "%.14e %.14e %.14e \n", x0 + i * h, y0 + j * h, z0 + (k + 1)*h);
+                           fprintf(file, "%.14e %.14e %.14e \n", x0 + (i + 1)*h, y0 + j * h, z0 + (k + 1)*h);
+                           fprintf(file, "%.14e %.14e %.14e \n", x0 + (i + 1)*h, y0 + (j + 1)*h, z0 + (k + 1)*h);
+                           fprintf(file, "%.14e %.14e %.14e \n", x0 + i * h, y0 + (j + 1)*h, z0 + (k + 1)*h);
                         }
                         else
                         {
                            fprintf(file, "%.14e %.14e %.14e \n",
-                                   T[0]*i+T[1]*j+T[2]*k+O[0],
-                                   T[3]*i+T[4]*j+T[5]*k+O[1],
-                                   T[6]*i+T[7]*j+T[8]*k+O[2]);
+                                   T[0]*i + T[1]*j + T[2]*k + O[0],
+                                   T[3]*i + T[4]*j + T[5]*k + O[1],
+                                   T[6]*i + T[7]*j + T[8]*k + O[2]);
                            fprintf(file, "%.14e %.14e %.14e \n",
-                                   T[0]*(i+1)+T[1]*j+T[2]*k+O[0],
-                                   T[3]*(i+1)+T[4]*j+T[5]*k+O[1],
-                                   T[6]*(i+1)+T[7]*j+T[8]*k+O[2]);
+                                   T[0] * (i + 1) + T[1]*j + T[2]*k + O[0],
+                                   T[3] * (i + 1) + T[4]*j + T[5]*k + O[1],
+                                   T[6] * (i + 1) + T[7]*j + T[8]*k + O[2]);
                            fprintf(file, "%.14e %.14e %.14e \n",
-                                   T[0]*(i+1)+T[1]*(j+1)+T[2]*k+O[0],
-                                   T[3]*(i+1)+T[4]*(j+1)+T[5]*k+O[1],
-                                   T[6]*(i+1)+T[7]*(j+1)+T[8]*k+O[2]);
+                                   T[0] * (i + 1) + T[1] * (j + 1) + T[2]*k + O[0],
+                                   T[3] * (i + 1) + T[4] * (j + 1) + T[5]*k + O[1],
+                                   T[6] * (i + 1) + T[7] * (j + 1) + T[8]*k + O[2]);
                            fprintf(file, "%.14e %.14e %.14e \n",
-                                   T[0]*i+T[1]*(j+1)+T[2]*k+O[0],
-                                   T[3]*i+T[4]*(j+1)+T[5]*k+O[1],
-                                   T[6]*i+T[7]*(j+1)+T[8]*k+O[2]);
+                                   T[0]*i + T[1] * (j + 1) + T[2]*k + O[0],
+                                   T[3]*i + T[4] * (j + 1) + T[5]*k + O[1],
+                                   T[6]*i + T[7] * (j + 1) + T[8]*k + O[2]);
                            fprintf(file, "%.14e %.14e %.14e \n",
-                                   T[0]*i+T[1]*j+T[2]*(k+1)+O[0],
-                                   T[3]*i+T[4]*j+T[5]*(k+1)+O[1],
-                                   T[6]*i+T[7]*j+T[8]*(k+1)+O[2]);
+                                   T[0]*i + T[1]*j + T[2] * (k + 1) + O[0],
+                                   T[3]*i + T[4]*j + T[5] * (k + 1) + O[1],
+                                   T[6]*i + T[7]*j + T[8] * (k + 1) + O[2]);
                            fprintf(file, "%.14e %.14e %.14e \n",
-                                   T[0]*(i+1)+T[1]*j+T[2]*(k+1)+O[0],
-                                   T[3]*(i+1)+T[4]*j+T[5]*(k+1)+O[1],
-                                   T[6]*(i+1)+T[7]*j+T[8]*(k+1)+O[2]);
+                                   T[0] * (i + 1) + T[1]*j + T[2] * (k + 1) + O[0],
+                                   T[3] * (i + 1) + T[4]*j + T[5] * (k + 1) + O[1],
+                                   T[6] * (i + 1) + T[7]*j + T[8] * (k + 1) + O[2]);
                            fprintf(file, "%.14e %.14e %.14e \n",
-                                   T[0]*(i+1)+T[1]*(j+1)+T[2]*(k+1)+O[0],
-                                   T[3]*(i+1)+T[4]*(j+1)+T[5]*(k+1)+O[1],
-                                   T[6]*(i+1)+T[7]*(j+1)+T[8]*(k+1)+O[2]);
+                                   T[0] * (i + 1) + T[1] * (j + 1) + T[2] * (k + 1) + O[0],
+                                   T[3] * (i + 1) + T[4] * (j + 1) + T[5] * (k + 1) + O[1],
+                                   T[6] * (i + 1) + T[7] * (j + 1) + T[8] * (k + 1) + O[2]);
                            fprintf(file, "%.14e %.14e %.14e \n",
-                                   T[0]*i+T[1]*(j+1)+T[2]*(k+1)+O[0],
-                                   T[3]*i+T[4]*(j+1)+T[5]*(k+1)+O[1],
-                                   T[6]*i+T[7]*(j+1)+T[8]*(k+1)+O[2]);
+                                   T[0]*i + T[1] * (j + 1) + T[2] * (k + 1) + O[0],
+                                   T[3]*i + T[4] * (j + 1) + T[5] * (k + 1) + O[1],
+                                   T[6]*i + T[7] * (j + 1) + T[8] * (k + 1) + O[2]);
                         }
                      }
          }
 
          if (given_trans)
          {
-            T += dim*dim;
+            T += dim * dim;
             O += dim;
          }
       }
@@ -492,22 +501,24 @@ void GLVis_PrintSStructVector(HYPRE_SStructVector sol,
       for (b = 0; b < hypre_BoxArraySize(boxes); b++)
       {
          box = hypre_BoxArrayBox(boxes, b);
-         ni = hypre_BoxSizeD(box,0);
-         nj = hypre_BoxSizeD(box,1);
-         nk = hypre_BoxSizeD(box,2);
+         ni = hypre_BoxSizeD(box, 0);
+         nj = hypre_BoxSizeD(box, 1);
+         nk = hypre_BoxSizeD(box, 2);
 
-         ilower[0] = hypre_BoxIMinD(box,0) - var_off;
-         ilower[1] = hypre_BoxIMinD(box,1) - var_off;
-         iupper[0] = hypre_BoxIMaxD(box,0);
-         iupper[1] = hypre_BoxIMaxD(box,1);
+         ilower[0] = hypre_BoxIMinD(box, 0) - var_off;
+         ilower[1] = hypre_BoxIMinD(box, 1) - var_off;
+         iupper[0] = hypre_BoxIMaxD(box, 0);
+         iupper[1] = hypre_BoxIMaxD(box, 1);
 
          if (dim == 2)
-            values = (double*) malloc((ni+var_off)*(nj+var_off)*sizeof(double));
+         {
+            values = (double*) malloc((ni + var_off) * (nj + var_off) * sizeof(double));
+         }
          else
          {
-            values = (double*) malloc((ni+var_off)*(nj+var_off)*(nk+var_off)*sizeof(double));
-            ilower[2] = hypre_BoxIMinD(box,2) - var_off;
-            iupper[2] = hypre_BoxIMaxD(box,2);
+            values = (double*) malloc((ni + var_off) * (nj + var_off) * (nk + var_off) * sizeof(double));
+            ilower[2] = hypre_BoxIMinD(box, 2) - var_off;
+            iupper[2] = hypre_BoxIMaxD(box, 2);
          }
 
          HYPRE_SStructVectorGetBoxValues(sol, p, ilower, iupper, var, values);
@@ -517,7 +528,9 @@ void GLVis_PrintSStructVector(HYPRE_SStructVector sol,
             for (k = 0; k < nk; k++)
                for (j = 0; j < nj; j++)
                   for (i = 0; i < ni; i++)
-                     fprintf(file, "%.14e\n", values[i + j*ni]);
+                  {
+                     fprintf(file, "%.14e\n", values[i + j * ni]);
+                  }
          }
          else if (vartype == HYPRE_SSTRUCT_VARIABLE_NODE)
          {
@@ -526,10 +539,10 @@ void GLVis_PrintSStructVector(HYPRE_SStructVector sol,
                for (j = 0; j < nj; j++)
                   for (i = 0; i < ni; i++)
                   {
-                     fprintf(file, "%.14e\n", values[i + j*(ni+1)]);
-                     fprintf(file, "%.14e\n", values[i+1 + j*(ni+1)]);
-                     fprintf(file, "%.14e\n", values[i+1 + (j+1)*(ni+1)]);
-                     fprintf(file, "%.14e\n", values[i + (j+1)*(ni+1)]);
+                     fprintf(file, "%.14e\n", values[i + j * (ni + 1)]);
+                     fprintf(file, "%.14e\n", values[i + 1 + j * (ni + 1)]);
+                     fprintf(file, "%.14e\n", values[i + 1 + (j + 1) * (ni + 1)]);
+                     fprintf(file, "%.14e\n", values[i + (j + 1) * (ni + 1)]);
                   }
             }
             else
@@ -538,14 +551,14 @@ void GLVis_PrintSStructVector(HYPRE_SStructVector sol,
                   for (j = 0; j < nj; j++)
                      for (i = 0; i < ni; i++)
                      {
-                        fprintf(file, "%.14e\n", values[i + j*(ni+1) + k*(ni+1)*(nj+1)]);
-                        fprintf(file, "%.14e\n", values[i+1 + j*(ni+1) + k*(ni+1)*(nj+1)]);
-                        fprintf(file, "%.14e\n", values[i+1 + (j+1)*(ni+1) + k*(ni+1)*(nj+1)]);
-                        fprintf(file, "%.14e\n", values[i + (j+1)*(ni+1) + k*(ni+1)*(nj+1)]);
-                        fprintf(file, "%.14e\n", values[i + j*(ni+1) + (k+1)*(ni+1)*(nj+1)]);
-                        fprintf(file, "%.14e\n", values[i+1 + j*(ni+1) + (k+1)*(ni+1)*(nj+1)]);
-                        fprintf(file, "%.14e\n", values[i+1 + (j+1)*(ni+1) + (k+1)*(ni+1)*(nj+1)]);
-                        fprintf(file, "%.14e\n", values[i + (j+1)*(ni+1) + (k+1)*(ni+1)*(nj+1)]);
+                        fprintf(file, "%.14e\n", values[i + j * (ni + 1) + k * (ni + 1) * (nj + 1)]);
+                        fprintf(file, "%.14e\n", values[i + 1 + j * (ni + 1) + k * (ni + 1) * (nj + 1)]);
+                        fprintf(file, "%.14e\n", values[i + 1 + (j + 1) * (ni + 1) + k * (ni + 1) * (nj + 1)]);
+                        fprintf(file, "%.14e\n", values[i + (j + 1) * (ni + 1) + k * (ni + 1) * (nj + 1)]);
+                        fprintf(file, "%.14e\n", values[i + j * (ni + 1) + (k + 1) * (ni + 1) * (nj + 1)]);
+                        fprintf(file, "%.14e\n", values[i + 1 + j * (ni + 1) + (k + 1) * (ni + 1) * (nj + 1)]);
+                        fprintf(file, "%.14e\n", values[i + 1 + (j + 1) * (ni + 1) + (k + 1) * (ni + 1) * (nj + 1)]);
+                        fprintf(file, "%.14e\n", values[i + (j + 1) * (ni + 1) + (k + 1) * (ni + 1) * (nj + 1)]);
                      }
             }
          }
@@ -572,7 +585,7 @@ void GLVis_PrintStructGrid(HYPRE_StructGrid Grid,
    hypre_StructGrid *grid = (hypre_StructGrid *)Grid;
    int dim = grid->ndim;
    int cellNV = (dim == 2) ? 4 : 8;
-   int elemid = 2*dim-1;
+   int elemid = 2 * dim - 1;
    int nvert, nelem;
 
    int given_trans = (trans != NULL && origin != NULL);
@@ -588,7 +601,7 @@ void GLVis_PrintStructGrid(HYPRE_StructGrid Grid,
    {
       box = hypre_BoxArrayBox(boxes, b);
       ncells = hypre_BoxVolume(box);
-      nvert += ncells*cellNV;
+      nvert += ncells * cellNV;
       nelem += ncells;
    }
 
@@ -618,13 +631,15 @@ void GLVis_PrintStructGrid(HYPRE_StructGrid Grid,
       for (b = 0; b < hypre_BoxArraySize(boxes); b++)
       {
          box = hypre_BoxArrayBox(boxes, b);
-         for (k = hypre_BoxIMinD(box,2); k <= hypre_BoxIMaxD(box,2); k++)
-            for (j = hypre_BoxIMinD(box,1); j <= hypre_BoxIMaxD(box,1); j++)
-               for (i = hypre_BoxIMinD(box,0); i <= hypre_BoxIMaxD(box,0); i++)
+         for (k = hypre_BoxIMinD(box, 2); k <= hypre_BoxIMaxD(box, 2); k++)
+            for (j = hypre_BoxIMinD(box, 1); j <= hypre_BoxIMaxD(box, 1); j++)
+               for (i = hypre_BoxIMinD(box, 0); i <= hypre_BoxIMaxD(box, 0); i++)
                {
                   fprintf(file, "1 %d ", elemid);
                   for (v = 0; v < cellNV; v++, vert++)
+                  {
                      fprintf(file, "%d ", vert);
+                  }
                   fprintf(file, "\n");
                }
       }
@@ -644,87 +659,87 @@ void GLVis_PrintStructGrid(HYPRE_StructGrid Grid,
       for (b = 0; b < hypre_BoxArraySize(boxes); b++)
       {
          box = hypre_BoxArrayBox(boxes, b);
-         for (k = hypre_BoxIMinD(box,2); k <= hypre_BoxIMaxD(box,2); k++)
-            for (j = hypre_BoxIMinD(box,1); j <= hypre_BoxIMaxD(box,1); j++)
-               for (i = hypre_BoxIMinD(box,0); i <= hypre_BoxIMaxD(box,0); i++)
+         for (k = hypre_BoxIMinD(box, 2); k <= hypre_BoxIMaxD(box, 2); k++)
+            for (j = hypre_BoxIMinD(box, 1); j <= hypre_BoxIMaxD(box, 1); j++)
+               for (i = hypre_BoxIMinD(box, 0); i <= hypre_BoxIMaxD(box, 0); i++)
                   if (dim == 2)
                   {
                      if (!given_trans)
                      {
-                        fprintf(file, "%.14e %.14e \n", x0+i*h, y0+j*h);
-                        fprintf(file, "%.14e %.14e \n", x0+(i+1)*h, y0+j*h);
-                        fprintf(file, "%.14e %.14e \n", x0+(i+1)*h, y0+(j+1)*h);
-                        fprintf(file, "%.14e %.14e \n", x0+i*h, y0+(j+1)*h);
+                        fprintf(file, "%.14e %.14e \n", x0 + i * h, y0 + j * h);
+                        fprintf(file, "%.14e %.14e \n", x0 + (i + 1)*h, y0 + j * h);
+                        fprintf(file, "%.14e %.14e \n", x0 + (i + 1)*h, y0 + (j + 1)*h);
+                        fprintf(file, "%.14e %.14e \n", x0 + i * h, y0 + (j + 1)*h);
                      }
                      else
                      {
                         fprintf(file, "%.14e %.14e \n",
-                                T[0]*i+T[1]*j+O[0],
-                                T[2]*i+T[3]*j+O[1]);
+                                T[0]*i + T[1]*j + O[0],
+                                T[2]*i + T[3]*j + O[1]);
                         fprintf(file, "%.14e %.14e \n",
-                                T[0]*(i+1)+T[1]*j+O[0],
-                                T[2]*(i+1)+T[3]*j+O[1]);
+                                T[0] * (i + 1) + T[1]*j + O[0],
+                                T[2] * (i + 1) + T[3]*j + O[1]);
                         fprintf(file, "%.14e %.14e \n",
-                                T[0]*(i+1)+T[1]*(j+1)+O[0],
-                                T[2]*(i+1)+T[3]*(j+1)+O[1]);
+                                T[0] * (i + 1) + T[1] * (j + 1) + O[0],
+                                T[2] * (i + 1) + T[3] * (j + 1) + O[1]);
                         fprintf(file, "%.14e %.14e \n",
-                                T[0]*i+T[1]*(j+1)+O[0],
-                                T[2]*i+T[3]*(j+1)+O[1]);
+                                T[0]*i + T[1] * (j + 1) + O[0],
+                                T[2]*i + T[3] * (j + 1) + O[1]);
                      }
                   }
                   else
                   {
                      if (!given_trans)
                      {
-                        fprintf(file, "%.14e %.14e %.14e \n", x0+i*h, y0+j*h, z0+k*h);
-                        fprintf(file, "%.14e %.14e %.14e \n", x0+(i+1)*h, y0+j*h, z0+k*h);
-                        fprintf(file, "%.14e %.14e %.14e \n", x0+(i+1)*h, y0+(j+1)*h, z0+k*h);
-                        fprintf(file, "%.14e %.14e %.14e \n", x0+i*h, y0+(j+1)*h, z0+k*h);
-                        fprintf(file, "%.14e %.14e %.14e \n", x0+i*h, y0+j*h, z0+(k+1)*h);
-                        fprintf(file, "%.14e %.14e %.14e \n", x0+(i+1)*h, y0+j*h, z0+(k+1)*h);
-                        fprintf(file, "%.14e %.14e %.14e \n", x0+(i+1)*h, y0+(j+1)*h, z0+(k+1)*h);
-                        fprintf(file, "%.14e %.14e %.14e \n", x0+i*h, y0+(j+1)*h, z0+(k+1)*h);
+                        fprintf(file, "%.14e %.14e %.14e \n", x0 + i * h, y0 + j * h, z0 + k * h);
+                        fprintf(file, "%.14e %.14e %.14e \n", x0 + (i + 1)*h, y0 + j * h, z0 + k * h);
+                        fprintf(file, "%.14e %.14e %.14e \n", x0 + (i + 1)*h, y0 + (j + 1)*h, z0 + k * h);
+                        fprintf(file, "%.14e %.14e %.14e \n", x0 + i * h, y0 + (j + 1)*h, z0 + k * h);
+                        fprintf(file, "%.14e %.14e %.14e \n", x0 + i * h, y0 + j * h, z0 + (k + 1)*h);
+                        fprintf(file, "%.14e %.14e %.14e \n", x0 + (i + 1)*h, y0 + j * h, z0 + (k + 1)*h);
+                        fprintf(file, "%.14e %.14e %.14e \n", x0 + (i + 1)*h, y0 + (j + 1)*h, z0 + (k + 1)*h);
+                        fprintf(file, "%.14e %.14e %.14e \n", x0 + i * h, y0 + (j + 1)*h, z0 + (k + 1)*h);
                      }
                      else
                      {
                         fprintf(file, "%.14e %.14e %.14e \n",
-                                T[0]*i+T[1]*j+T[2]*k+O[0],
-                                T[3]*i+T[4]*j+T[5]*k+O[1],
-                                T[6]*i+T[7]*j+T[8]*k+O[2]);
+                                T[0]*i + T[1]*j + T[2]*k + O[0],
+                                T[3]*i + T[4]*j + T[5]*k + O[1],
+                                T[6]*i + T[7]*j + T[8]*k + O[2]);
                         fprintf(file, "%.14e %.14e %.14e \n",
-                                T[0]*(i+1)+T[1]*j+T[2]*k+O[0],
-                                T[3]*(i+1)+T[4]*j+T[5]*k+O[1],
-                                T[6]*(i+1)+T[7]*j+T[8]*k+O[2]);
+                                T[0] * (i + 1) + T[1]*j + T[2]*k + O[0],
+                                T[3] * (i + 1) + T[4]*j + T[5]*k + O[1],
+                                T[6] * (i + 1) + T[7]*j + T[8]*k + O[2]);
                         fprintf(file, "%.14e %.14e %.14e \n",
-                                T[0]*(i+1)+T[1]*(j+1)+T[2]*k+O[0],
-                                T[3]*(i+1)+T[4]*(j+1)+T[5]*k+O[1],
-                                T[6]*(i+1)+T[7]*(j+1)+T[8]*k+O[2]);
+                                T[0] * (i + 1) + T[1] * (j + 1) + T[2]*k + O[0],
+                                T[3] * (i + 1) + T[4] * (j + 1) + T[5]*k + O[1],
+                                T[6] * (i + 1) + T[7] * (j + 1) + T[8]*k + O[2]);
                         fprintf(file, "%.14e %.14e %.14e \n",
-                                T[0]*i+T[1]*(j+1)+T[2]*k+O[0],
-                                T[3]*i+T[4]*(j+1)+T[5]*k+O[1],
-                                T[6]*i+T[7]*(j+1)+T[8]*k+O[2]);
+                                T[0]*i + T[1] * (j + 1) + T[2]*k + O[0],
+                                T[3]*i + T[4] * (j + 1) + T[5]*k + O[1],
+                                T[6]*i + T[7] * (j + 1) + T[8]*k + O[2]);
                         fprintf(file, "%.14e %.14e %.14e \n",
-                                T[0]*i+T[1]*j+T[2]*(k+1)+O[0],
-                                T[3]*i+T[4]*j+T[5]*(k+1)+O[1],
-                                T[6]*i+T[7]*j+T[8]*(k+1)+O[2]);
+                                T[0]*i + T[1]*j + T[2] * (k + 1) + O[0],
+                                T[3]*i + T[4]*j + T[5] * (k + 1) + O[1],
+                                T[6]*i + T[7]*j + T[8] * (k + 1) + O[2]);
                         fprintf(file, "%.14e %.14e %.14e \n",
-                                T[0]*(i+1)+T[1]*j+T[2]*(k+1)+O[0],
-                                T[3]*(i+1)+T[4]*j+T[5]*(k+1)+O[1],
-                                T[6]*(i+1)+T[7]*j+T[8]*(k+1)+O[2]);
+                                T[0] * (i + 1) + T[1]*j + T[2] * (k + 1) + O[0],
+                                T[3] * (i + 1) + T[4]*j + T[5] * (k + 1) + O[1],
+                                T[6] * (i + 1) + T[7]*j + T[8] * (k + 1) + O[2]);
                         fprintf(file, "%.14e %.14e %.14e \n",
-                                T[0]*(i+1)+T[1]*(j+1)+T[2]*(k+1)+O[0],
-                                T[3]*(i+1)+T[4]*(j+1)+T[5]*(k+1)+O[1],
-                                T[6]*(i+1)+T[7]*(j+1)+T[8]*(k+1)+O[2]);
+                                T[0] * (i + 1) + T[1] * (j + 1) + T[2] * (k + 1) + O[0],
+                                T[3] * (i + 1) + T[4] * (j + 1) + T[5] * (k + 1) + O[1],
+                                T[6] * (i + 1) + T[7] * (j + 1) + T[8] * (k + 1) + O[2]);
                         fprintf(file, "%.14e %.14e %.14e \n",
-                                T[0]*i+T[1]*(j+1)+T[2]*(k+1)+O[0],
-                                T[3]*i+T[4]*(j+1)+T[5]*(k+1)+O[1],
-                                T[6]*i+T[7]*(j+1)+T[8]*(k+1)+O[2]);
+                                T[0]*i + T[1] * (j + 1) + T[2] * (k + 1) + O[0],
+                                T[3]*i + T[4] * (j + 1) + T[5] * (k + 1) + O[1],
+                                T[6]*i + T[7] * (j + 1) + T[8] * (k + 1) + O[2]);
                      }
                   }
 
          if (given_trans)
          {
-            T += dim*dim;
+            T += dim * dim;
             O += dim;
          }
       }
@@ -772,22 +787,24 @@ void GLVis_PrintStructVector(HYPRE_StructVector sol,
    for (b = 0; b < hypre_BoxArraySize(boxes); b++)
    {
       box = hypre_BoxArrayBox(boxes, b);
-      ni = hypre_BoxSizeD(box,0);
-      nj = hypre_BoxSizeD(box,1);
-      nk = hypre_BoxSizeD(box,2);
+      ni = hypre_BoxSizeD(box, 0);
+      nj = hypre_BoxSizeD(box, 1);
+      nk = hypre_BoxSizeD(box, 2);
 
-      ilower[0] = hypre_BoxIMinD(box,0);
-      ilower[1] = hypre_BoxIMinD(box,1);
-      iupper[0] = hypre_BoxIMaxD(box,0);
-      iupper[1] = hypre_BoxIMaxD(box,1);
+      ilower[0] = hypre_BoxIMinD(box, 0);
+      ilower[1] = hypre_BoxIMinD(box, 1);
+      iupper[0] = hypre_BoxIMaxD(box, 0);
+      iupper[1] = hypre_BoxIMaxD(box, 1);
 
       if (dim == 2)
-         values = (double*) malloc(ni*nj*sizeof(double));
+      {
+         values = (double*) malloc(ni * nj * sizeof(double));
+      }
       else
       {
-         values = (double*) malloc(ni*nj*nk*sizeof(double));
-         ilower[2] = hypre_BoxIMinD(box,2);
-         iupper[2] = hypre_BoxIMaxD(box,2);
+         values = (double*) malloc(ni * nj * nk * sizeof(double));
+         ilower[2] = hypre_BoxIMinD(box, 2);
+         iupper[2] = hypre_BoxIMaxD(box, 2);
       }
 
       HYPRE_StructVectorGetBoxValues(sol, ilower, iupper, values);
@@ -795,7 +812,9 @@ void GLVis_PrintStructVector(HYPRE_StructVector sol,
       for (k = 0; k < nk; k++)
          for (j = 0; j < nj; j++)
             for (i = 0; i < ni; i++)
-               fprintf(file, "%.14e\n", values[i + j*ni]);
+            {
+               fprintf(file, "%.14e\n", values[i + j * ni]);
+            }
 
       free(values);
    }
diff --git a/external/hypre/src/examples/vis/README b/external/hypre/src/examples/vis/README
index d33b497e..5c301778 100644
--- a/external/hypre/src/examples/vis/README
+++ b/external/hypre/src/examples/vis/README
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/examples/vis/glvis-ex1.sh b/external/hypre/src/examples/vis/glvis-ex1.sh
old mode 100644
new mode 100755
index 745c0e26..166a3c47
--- a/external/hypre/src/examples/vis/glvis-ex1.sh
+++ b/external/hypre/src/examples/vis/glvis-ex1.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/examples/vis/glvis-ex10.sh b/external/hypre/src/examples/vis/glvis-ex10.sh
old mode 100644
new mode 100755
index 99a56ea3..0029802e
--- a/external/hypre/src/examples/vis/glvis-ex10.sh
+++ b/external/hypre/src/examples/vis/glvis-ex10.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/examples/vis/glvis-ex11.sh b/external/hypre/src/examples/vis/glvis-ex11.sh
old mode 100644
new mode 100755
index a046b97a..d0123ef0
--- a/external/hypre/src/examples/vis/glvis-ex11.sh
+++ b/external/hypre/src/examples/vis/glvis-ex11.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/examples/vis/glvis-ex12.sh b/external/hypre/src/examples/vis/glvis-ex12.sh
old mode 100644
new mode 100755
index d69875d7..90dc07bc
--- a/external/hypre/src/examples/vis/glvis-ex12.sh
+++ b/external/hypre/src/examples/vis/glvis-ex12.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/examples/vis/glvis-ex13.sh b/external/hypre/src/examples/vis/glvis-ex13.sh
old mode 100644
new mode 100755
index 1d3dd0f6..5fab1f57
--- a/external/hypre/src/examples/vis/glvis-ex13.sh
+++ b/external/hypre/src/examples/vis/glvis-ex13.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/examples/vis/glvis-ex14.sh b/external/hypre/src/examples/vis/glvis-ex14.sh
old mode 100644
new mode 100755
index 276be08a..849da057
--- a/external/hypre/src/examples/vis/glvis-ex14.sh
+++ b/external/hypre/src/examples/vis/glvis-ex14.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/examples/vis/glvis-ex15.sh b/external/hypre/src/examples/vis/glvis-ex15.sh
old mode 100644
new mode 100755
index 6187e000..328cdc17
--- a/external/hypre/src/examples/vis/glvis-ex15.sh
+++ b/external/hypre/src/examples/vis/glvis-ex15.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/examples/vis/glvis-ex16.sh b/external/hypre/src/examples/vis/glvis-ex16.sh
old mode 100644
new mode 100755
index c71a820f..056acf6b
--- a/external/hypre/src/examples/vis/glvis-ex16.sh
+++ b/external/hypre/src/examples/vis/glvis-ex16.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/examples/vis/glvis-ex2.sh b/external/hypre/src/examples/vis/glvis-ex2.sh
old mode 100644
new mode 100755
index 6a2375c6..5e99fa13
--- a/external/hypre/src/examples/vis/glvis-ex2.sh
+++ b/external/hypre/src/examples/vis/glvis-ex2.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/examples/vis/glvis-ex3.sh b/external/hypre/src/examples/vis/glvis-ex3.sh
old mode 100644
new mode 100755
index ca6f51b3..a452f8e3
--- a/external/hypre/src/examples/vis/glvis-ex3.sh
+++ b/external/hypre/src/examples/vis/glvis-ex3.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/examples/vis/glvis-ex4.sh b/external/hypre/src/examples/vis/glvis-ex4.sh
old mode 100644
new mode 100755
index 25e524cf..592e116e
--- a/external/hypre/src/examples/vis/glvis-ex4.sh
+++ b/external/hypre/src/examples/vis/glvis-ex4.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/examples/vis/glvis-ex5.sh b/external/hypre/src/examples/vis/glvis-ex5.sh
old mode 100644
new mode 100755
index 42c65ed5..deedf0ab
--- a/external/hypre/src/examples/vis/glvis-ex5.sh
+++ b/external/hypre/src/examples/vis/glvis-ex5.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/examples/vis/glvis-ex6.sh b/external/hypre/src/examples/vis/glvis-ex6.sh
old mode 100644
new mode 100755
index e806c7d0..0eb025af
--- a/external/hypre/src/examples/vis/glvis-ex6.sh
+++ b/external/hypre/src/examples/vis/glvis-ex6.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/examples/vis/glvis-ex7.sh b/external/hypre/src/examples/vis/glvis-ex7.sh
old mode 100644
new mode 100755
index 37f566d4..564a6eb7
--- a/external/hypre/src/examples/vis/glvis-ex7.sh
+++ b/external/hypre/src/examples/vis/glvis-ex7.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/examples/vis/glvis-ex8.sh b/external/hypre/src/examples/vis/glvis-ex8.sh
old mode 100644
new mode 100755
index 4ecef357..e15b4eee
--- a/external/hypre/src/examples/vis/glvis-ex8.sh
+++ b/external/hypre/src/examples/vis/glvis-ex8.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/examples/vis/glvis-ex9.sh b/external/hypre/src/examples/vis/glvis-ex9.sh
old mode 100644
new mode 100755
index 4f49f612..f6d3bda6
--- a/external/hypre/src/examples/vis/glvis-ex9.sh
+++ b/external/hypre/src/examples/vis/glvis-ex9.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/krylov/CMakeLists.txt b/external/hypre/src/krylov/CMakeLists.txt
index 63daa088..f1506709 100644
--- a/external/hypre/src/krylov/CMakeLists.txt
+++ b/external/hypre/src/krylov/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/krylov/HYPRE_MatvecFunctions.h b/external/hypre/src/krylov/HYPRE_MatvecFunctions.h
index 6011672b..47ca7f38 100644
--- a/external/hypre/src/krylov/HYPRE_MatvecFunctions.h
+++ b/external/hypre/src/krylov/HYPRE_MatvecFunctions.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -14,7 +14,7 @@ typedef struct
    HYPRE_Int (*Matvec)        ( void *matvec_data, HYPRE_Complex alpha, void *A,
                                 void *x, HYPRE_Complex beta, void *y );
    HYPRE_Int (*MatvecDestroy) ( void *matvec_data );
-   
+
    void*  (*MatMultiVecCreate)     ( void *A, void *x );
    HYPRE_Int (*MatMultiVec)        ( void *data, HYPRE_Complex alpha, void *A,
                                      void *x, HYPRE_Complex beta, void *y );
diff --git a/external/hypre/src/krylov/HYPRE_bicgstab.c b/external/hypre/src/krylov/HYPRE_bicgstab.c
index 43eefcf0..923271fc 100644
--- a/external/hypre/src/krylov/HYPRE_bicgstab.c
+++ b/external/hypre/src/krylov/HYPRE_bicgstab.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -21,42 +21,36 @@
  * HYPRE_BiCGSTABDestroy
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_BiCGSTABDestroy( HYPRE_Solver solver )
 {
-   return( hypre_BiCGSTABDestroy( (void *) solver ) );
+   return ( hypre_BiCGSTABDestroy( (void *) solver ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_BiCGSTABSetup
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_BiCGSTABSetup( HYPRE_Solver solver,
-                        HYPRE_Matrix A,
-                        HYPRE_Vector b,
-                        HYPRE_Vector x      )
+                     HYPRE_Matrix A,
+                     HYPRE_Vector b,
+                     HYPRE_Vector x      )
 {
-   return( hypre_BiCGSTABSetup( (void *) solver,
-                             (void *) A,
-                             (void *) b,
-                             (void *) x ) );
+   return ( hypre_BiCGSTABSetup( solver, A, b, x ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_BiCGSTABSolve
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_BiCGSTABSolve( HYPRE_Solver solver,
-                        HYPRE_Matrix A,
-                        HYPRE_Vector b,
-                        HYPRE_Vector x      )
+                     HYPRE_Matrix A,
+                     HYPRE_Vector b,
+                     HYPRE_Vector x      )
 {
-   return( hypre_BiCGSTABSolve( (void *) solver,
-                             (void *) A,
-                             (void *) b,
-                             (void *) x ) );
+   return ( hypre_BiCGSTABSolve( solver, A, b, x ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -65,9 +59,9 @@ HYPRE_BiCGSTABSolve( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_BiCGSTABSetTol( HYPRE_Solver solver,
-                         HYPRE_Real         tol    )
+                      HYPRE_Real         tol    )
 {
-   return( hypre_BiCGSTABSetTol( (void *) solver, tol ) );
+   return ( hypre_BiCGSTABSetTol( (void *) solver, tol ) );
 }
 /*--------------------------------------------------------------------------
  * HYPRE_BiCGSTABSetAbsoluteTol
@@ -75,9 +69,9 @@ HYPRE_BiCGSTABSetTol( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_BiCGSTABSetAbsoluteTol( HYPRE_Solver solver,
-                         HYPRE_Real         a_tol    )
+                              HYPRE_Real         a_tol    )
 {
-   return( hypre_BiCGSTABSetAbsoluteTol( (void *) solver, a_tol ) );
+   return ( hypre_BiCGSTABSetAbsoluteTol( (void *) solver, a_tol ) );
 }
 /*--------------------------------------------------------------------------
  * HYPRE_BiCGSTABSetConvergenceFactorTol
@@ -85,9 +79,9 @@ HYPRE_BiCGSTABSetAbsoluteTol( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_BiCGSTABSetConvergenceFactorTol( HYPRE_Solver solver,
-                         HYPRE_Real         cf_tol    )
+                                       HYPRE_Real         cf_tol    )
 {
-   return( hypre_BiCGSTABSetConvergenceFactorTol( (void *) solver, cf_tol ) );
+   return ( hypre_BiCGSTABSetConvergenceFactorTol( (void *) solver, cf_tol ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -96,9 +90,9 @@ HYPRE_BiCGSTABSetConvergenceFactorTol( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_BiCGSTABSetMinIter( HYPRE_Solver solver,
-                             HYPRE_Int          min_iter )
+                          HYPRE_Int          min_iter )
 {
-   return( hypre_BiCGSTABSetMinIter( (void *) solver, min_iter ) );
+   return ( hypre_BiCGSTABSetMinIter( (void *) solver, min_iter ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -107,9 +101,9 @@ HYPRE_BiCGSTABSetMinIter( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_BiCGSTABSetMaxIter( HYPRE_Solver solver,
-                             HYPRE_Int          max_iter )
+                          HYPRE_Int          max_iter )
 {
-   return( hypre_BiCGSTABSetMaxIter( (void *) solver, max_iter ) );
+   return ( hypre_BiCGSTABSetMaxIter( (void *) solver, max_iter ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -118,9 +112,9 @@ HYPRE_BiCGSTABSetMaxIter( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_BiCGSTABSetStopCrit( HYPRE_Solver solver,
-                              HYPRE_Int          stop_crit )
+                           HYPRE_Int          stop_crit )
 {
-   return( hypre_BiCGSTABSetStopCrit( (void *) solver, stop_crit ) );
+   return ( hypre_BiCGSTABSetStopCrit( (void *) solver, stop_crit ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -129,14 +123,14 @@ HYPRE_BiCGSTABSetStopCrit( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_BiCGSTABSetPrecond( HYPRE_Solver         solver,
-                                HYPRE_PtrToSolverFcn precond,
-                                HYPRE_PtrToSolverFcn precond_setup,
-                                HYPRE_Solver         precond_solver )
+                          HYPRE_PtrToSolverFcn precond,
+                          HYPRE_PtrToSolverFcn precond_setup,
+                          HYPRE_Solver         precond_solver )
 {
-   return( hypre_BiCGSTABSetPrecond( (void *) solver,
-                                     (HYPRE_Int (*)(void*, void*, void*, void*))precond,
-									 (HYPRE_Int (*)(void*, void*, void*, void*))precond_setup,
-                                     (void *) precond_solver ) );
+   return ( hypre_BiCGSTABSetPrecond( (void *) solver,
+                                      (HYPRE_Int (*)(void*, void*, void*, void*))precond,
+                                      (HYPRE_Int (*)(void*, void*, void*, void*))precond_setup,
+                                      (void *) precond_solver ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -145,10 +139,10 @@ HYPRE_BiCGSTABSetPrecond( HYPRE_Solver         solver,
 
 HYPRE_Int
 HYPRE_BiCGSTABGetPrecond( HYPRE_Solver  solver,
-                             HYPRE_Solver *precond_data_ptr )
+                          HYPRE_Solver *precond_data_ptr )
 {
-   return( hypre_BiCGSTABGetPrecond( (void *)     solver,
-                                  (HYPRE_Solver *) precond_data_ptr ) );
+   return ( hypre_BiCGSTABGetPrecond( (void *)     solver,
+                                      (HYPRE_Solver *) precond_data_ptr ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -157,9 +151,9 @@ HYPRE_BiCGSTABGetPrecond( HYPRE_Solver  solver,
 
 HYPRE_Int
 HYPRE_BiCGSTABSetLogging( HYPRE_Solver solver,
-                             HYPRE_Int logging)
+                          HYPRE_Int logging)
 {
-   return( hypre_BiCGSTABSetLogging( (void *) solver, logging ) );
+   return ( hypre_BiCGSTABSetLogging( (void *) solver, logging ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -170,7 +164,7 @@ HYPRE_Int
 HYPRE_BiCGSTABSetPrintLevel( HYPRE_Solver solver,
                              HYPRE_Int print_level)
 {
-   return( hypre_BiCGSTABSetPrintLevel( (void *) solver, print_level ) );
+   return ( hypre_BiCGSTABSetPrintLevel( (void *) solver, print_level ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -179,9 +173,9 @@ HYPRE_BiCGSTABSetPrintLevel( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_BiCGSTABGetNumIterations( HYPRE_Solver  solver,
-                                   HYPRE_Int                *num_iterations )
+                                HYPRE_Int                *num_iterations )
 {
-   return( hypre_BiCGSTABGetNumIterations( (void *) solver, num_iterations ) );
+   return ( hypre_BiCGSTABGetNumIterations( (void *) solver, num_iterations ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -190,9 +184,9 @@ HYPRE_BiCGSTABGetNumIterations( HYPRE_Solver  solver,
 
 HYPRE_Int
 HYPRE_BiCGSTABGetFinalRelativeResidualNorm( HYPRE_Solver  solver,
-                                               HYPRE_Real         *norm   )
+                                            HYPRE_Real         *norm   )
 {
-   return( hypre_BiCGSTABGetFinalRelativeResidualNorm( (void *) solver, norm ) );
+   return ( hypre_BiCGSTABGetFinalRelativeResidualNorm( (void *) solver, norm ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -201,7 +195,7 @@ HYPRE_BiCGSTABGetFinalRelativeResidualNorm( HYPRE_Solver  solver,
 
 HYPRE_Int
 HYPRE_BiCGSTABGetResidual( HYPRE_Solver  solver,
-                            void             *residual  )
+                           void             *residual  )
 {
-   return( hypre_BiCGSTABGetResidual( (void *) solver, (void **) residual ) );
+   return ( hypre_BiCGSTABGetResidual( (void *) solver, (void **) residual ) );
 }
diff --git a/external/hypre/src/krylov/HYPRE_cgnr.c b/external/hypre/src/krylov/HYPRE_cgnr.c
index dde357ad..01b51daa 100644
--- a/external/hypre/src/krylov/HYPRE_cgnr.c
+++ b/external/hypre/src/krylov/HYPRE_cgnr.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -21,36 +21,36 @@
  * HYPRE_CGNRDestroy
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_CGNRDestroy( HYPRE_Solver solver )
 {
-   return( hypre_CGNRDestroy( (void *) solver ) );
+   return ( hypre_CGNRDestroy( (void *) solver ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_CGNRSetup
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_CGNRSetup( HYPRE_Solver solver,
-                        HYPRE_Matrix A,
-                        HYPRE_Vector b,
-                        HYPRE_Vector x      )
+                 HYPRE_Matrix A,
+                 HYPRE_Vector b,
+                 HYPRE_Vector x      )
 {
-   return( hypre_CGNRSetup( solver, A, b, x ) );
+   return ( hypre_CGNRSetup( solver, A, b, x ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_CGNRSolve
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_CGNRSolve( HYPRE_Solver solver,
-                        HYPRE_Matrix A,
-                        HYPRE_Vector b,
-                        HYPRE_Vector x      )
+                 HYPRE_Matrix A,
+                 HYPRE_Vector b,
+                 HYPRE_Vector x      )
 {
-   return( hypre_CGNRSolve( solver, A, b, x ) );
+   return ( hypre_CGNRSolve( solver, A, b, x ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -59,9 +59,9 @@ HYPRE_CGNRSolve( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_CGNRSetTol( HYPRE_Solver solver,
-                         HYPRE_Real         tol    )
+                  HYPRE_Real         tol    )
 {
-   return( hypre_CGNRSetTol( (void *) solver, tol ) );
+   return ( hypre_CGNRSetTol( (void *) solver, tol ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -70,9 +70,9 @@ HYPRE_CGNRSetTol( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_CGNRSetMinIter( HYPRE_Solver solver,
-                             HYPRE_Int                min_iter )
+                      HYPRE_Int                min_iter )
 {
-   return( hypre_CGNRSetMinIter( (void *) solver, min_iter ) );
+   return ( hypre_CGNRSetMinIter( (void *) solver, min_iter ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -81,9 +81,9 @@ HYPRE_CGNRSetMinIter( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_CGNRSetMaxIter( HYPRE_Solver solver,
-                             HYPRE_Int                max_iter )
+                      HYPRE_Int                max_iter )
 {
-   return( hypre_CGNRSetMaxIter( (void *) solver, max_iter ) );
+   return ( hypre_CGNRSetMaxIter( (void *) solver, max_iter ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -92,9 +92,9 @@ HYPRE_CGNRSetMaxIter( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_CGNRSetStopCrit( HYPRE_Solver solver,
-                             HYPRE_Int                stop_crit )
+                       HYPRE_Int                stop_crit )
 {
-   return( hypre_CGNRSetStopCrit( (void *) solver, stop_crit ) );
+   return ( hypre_CGNRSetStopCrit( (void *) solver, stop_crit ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -103,16 +103,16 @@ HYPRE_CGNRSetStopCrit( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_CGNRSetPrecond( HYPRE_Solver         solver,
-                            HYPRE_PtrToSolverFcn precond,
-                            HYPRE_PtrToSolverFcn precondT,
-                            HYPRE_PtrToSolverFcn precond_setup,
-                            HYPRE_Solver         precond_solver )
+                      HYPRE_PtrToSolverFcn precond,
+                      HYPRE_PtrToSolverFcn precondT,
+                      HYPRE_PtrToSolverFcn precond_setup,
+                      HYPRE_Solver         precond_solver )
 {
-   return( hypre_CGNRSetPrecond( (void *) solver,
-                                 (HYPRE_Int (*)(void*, void*, void*, void*))precond,
-								 (HYPRE_Int (*)(void*, void*, void*, void*))precondT,
-								 (HYPRE_Int (*)(void*, void*, void*, void*))precond_setup,
-                                 (void *) precond_solver ) );
+   return ( hypre_CGNRSetPrecond( (void *) solver,
+                                  (HYPRE_Int (*)(void*, void*, void*, void*))precond,
+                                  (HYPRE_Int (*)(void*, void*, void*, void*))precondT,
+                                  (HYPRE_Int (*)(void*, void*, void*, void*))precond_setup,
+                                  (void *) precond_solver ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -121,10 +121,10 @@ HYPRE_CGNRSetPrecond( HYPRE_Solver         solver,
 
 HYPRE_Int
 HYPRE_CGNRGetPrecond( HYPRE_Solver   solver,
-                            HYPRE_Solver  *precond_data_ptr )
+                      HYPRE_Solver  *precond_data_ptr )
 {
-   return( hypre_CGNRGetPrecond( (void *)         solver,
-                                 (HYPRE_Solver *) precond_data_ptr ) );
+   return ( hypre_CGNRGetPrecond( (void *)         solver,
+                                  (HYPRE_Solver *) precond_data_ptr ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -133,9 +133,9 @@ HYPRE_CGNRGetPrecond( HYPRE_Solver   solver,
 
 HYPRE_Int
 HYPRE_CGNRSetLogging( HYPRE_Solver solver,
-                             HYPRE_Int logging)
+                      HYPRE_Int logging)
 {
-   return( hypre_CGNRSetLogging( (void *) solver, logging ) );
+   return ( hypre_CGNRSetLogging( (void *) solver, logging ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -144,9 +144,9 @@ HYPRE_CGNRSetLogging( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_CGNRGetNumIterations( HYPRE_Solver  solver,
-                                   HYPRE_Int                *num_iterations )
+                            HYPRE_Int                *num_iterations )
 {
-   return( hypre_CGNRGetNumIterations( (void *) solver, num_iterations ) );
+   return ( hypre_CGNRGetNumIterations( (void *) solver, num_iterations ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -155,7 +155,7 @@ HYPRE_CGNRGetNumIterations( HYPRE_Solver  solver,
 
 HYPRE_Int
 HYPRE_CGNRGetFinalRelativeResidualNorm( HYPRE_Solver  solver,
-                                               HYPRE_Real         *norm   )
+                                        HYPRE_Real         *norm   )
 {
-   return( hypre_CGNRGetFinalRelativeResidualNorm( (void *) solver, norm ) );
+   return ( hypre_CGNRGetFinalRelativeResidualNorm( (void *) solver, norm ) );
 }
diff --git a/external/hypre/src/krylov/HYPRE_cogmres.c b/external/hypre/src/krylov/HYPRE_cogmres.c
index aed6aaa3..149a4f9f 100644
--- a/external/hypre/src/krylov/HYPRE_cogmres.c
+++ b/external/hypre/src/krylov/HYPRE_cogmres.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -17,7 +17,7 @@
  *--------------------------------------------------------------------------*/
 /* to do, not trivial */
 /*
-HYPRE_Int 
+HYPRE_Int
 HYPRE_ParCSRCOGMRESDestroy( HYPRE_Solver solver )
 {
    return( hypre_COGMRESDestroy( (void *) solver ) );
@@ -28,32 +28,26 @@ HYPRE_ParCSRCOGMRESDestroy( HYPRE_Solver solver )
  * HYPRE_COGMRESSetup
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_COGMRESSetup( HYPRE_Solver solver,
-                        HYPRE_Matrix A,
-                        HYPRE_Vector b,
-                        HYPRE_Vector x      )
+                    HYPRE_Matrix A,
+                    HYPRE_Vector b,
+                    HYPRE_Vector x      )
 {
-   return( hypre_COGMRESSetup( solver,
-                             A,
-                             b,
-                             x ) );
+   return ( hypre_COGMRESSetup( solver, A, b, x ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_COGMRESSolve
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_COGMRESSolve( HYPRE_Solver solver,
-                        HYPRE_Matrix A,
-                        HYPRE_Vector b,
-                        HYPRE_Vector x      )
+                    HYPRE_Matrix A,
+                    HYPRE_Vector b,
+                    HYPRE_Vector x      )
 {
-   return( hypre_COGMRESSolve( solver,
-                             A,
-                             b,
-                             x ) );
+   return ( hypre_COGMRESSolve( solver, A, b, x ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -62,16 +56,16 @@ HYPRE_COGMRESSolve( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_COGMRESSetKDim( HYPRE_Solver solver,
-                          HYPRE_Int             k_dim    )
+                      HYPRE_Int             k_dim    )
 {
-   return( hypre_COGMRESSetKDim( (void *) solver, k_dim ) );
+   return ( hypre_COGMRESSetKDim( (void *) solver, k_dim ) );
 }
 
 HYPRE_Int
 HYPRE_COGMRESGetKDim( HYPRE_Solver solver,
-                          HYPRE_Int           * k_dim    )
+                      HYPRE_Int           * k_dim    )
 {
-   return( hypre_COGMRESGetKDim( (void *) solver, k_dim ) );
+   return ( hypre_COGMRESGetKDim( (void *) solver, k_dim ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -80,16 +74,16 @@ HYPRE_COGMRESGetKDim( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_COGMRESSetUnroll( HYPRE_Solver solver,
-                          HYPRE_Int             unroll    )
+                        HYPRE_Int             unroll    )
 {
-   return( hypre_COGMRESSetUnroll( (void *) solver, unroll ) );
+   return ( hypre_COGMRESSetUnroll( (void *) solver, unroll ) );
 }
 
 HYPRE_Int
 HYPRE_COGMRESGetUnroll( HYPRE_Solver solver,
-                          HYPRE_Int           * unroll    )
+                        HYPRE_Int           * unroll    )
 {
-   return( hypre_COGMRESGetUnroll( (void *) solver, unroll ) );
+   return ( hypre_COGMRESGetUnroll( (void *) solver, unroll ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -98,16 +92,16 @@ HYPRE_COGMRESGetUnroll( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_COGMRESSetCGS( HYPRE_Solver solver,
-                          HYPRE_Int             cgs    )
+                     HYPRE_Int             cgs    )
 {
-   return( hypre_COGMRESSetCGS( (void *) solver, cgs ) );
+   return ( hypre_COGMRESSetCGS( (void *) solver, cgs ) );
 }
 
 HYPRE_Int
 HYPRE_COGMRESGetCGS( HYPRE_Solver solver,
-                          HYPRE_Int           * cgs    )
+                     HYPRE_Int           * cgs    )
 {
-   return( hypre_COGMRESGetCGS( (void *) solver, cgs ) );
+   return ( hypre_COGMRESGetCGS( (void *) solver, cgs ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -116,16 +110,16 @@ HYPRE_COGMRESGetCGS( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_COGMRESSetTol( HYPRE_Solver solver,
-                         HYPRE_Real         tol    )
+                     HYPRE_Real         tol    )
 {
-   return( hypre_COGMRESSetTol( (void *) solver, tol ) );
+   return ( hypre_COGMRESSetTol( (void *) solver, tol ) );
 }
 
 HYPRE_Int
 HYPRE_COGMRESGetTol( HYPRE_Solver solver,
-                         HYPRE_Real       * tol    )
+                     HYPRE_Real       * tol    )
 {
-   return( hypre_COGMRESGetTol( (void *) solver, tol ) );
+   return ( hypre_COGMRESGetTol( (void *) solver, tol ) );
 }
 /*--------------------------------------------------------------------------
  * HYPRE_COGMRESSetAbsoluteTol, HYPRE_COGMRESGetAbsoluteTol
@@ -133,16 +127,16 @@ HYPRE_COGMRESGetTol( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_COGMRESSetAbsoluteTol( HYPRE_Solver solver,
-                         HYPRE_Real         a_tol    )
+                             HYPRE_Real         a_tol    )
 {
-   return( hypre_COGMRESSetAbsoluteTol( (void *) solver, a_tol ) );
+   return ( hypre_COGMRESSetAbsoluteTol( (void *) solver, a_tol ) );
 }
 
 HYPRE_Int
 HYPRE_COGMRESGetAbsoluteTol( HYPRE_Solver solver,
-                         HYPRE_Real       * a_tol    )
+                             HYPRE_Real       * a_tol    )
 {
-   return( hypre_COGMRESGetAbsoluteTol( (void *) solver, a_tol ) );
+   return ( hypre_COGMRESGetAbsoluteTol( (void *) solver, a_tol ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -151,16 +145,16 @@ HYPRE_COGMRESGetAbsoluteTol( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_COGMRESSetConvergenceFactorTol( HYPRE_Solver solver,
-                         HYPRE_Real         cf_tol    )
+                                      HYPRE_Real         cf_tol    )
 {
-   return( hypre_COGMRESSetConvergenceFactorTol( (void *) solver, cf_tol ) );
+   return ( hypre_COGMRESSetConvergenceFactorTol( (void *) solver, cf_tol ) );
 }
 
 HYPRE_Int
 HYPRE_COGMRESGetConvergenceFactorTol( HYPRE_Solver solver,
-                         HYPRE_Real       * cf_tol    )
+                                      HYPRE_Real       * cf_tol    )
 {
-   return( hypre_COGMRESGetConvergenceFactorTol( (void *) solver, cf_tol ) );
+   return ( hypre_COGMRESGetConvergenceFactorTol( (void *) solver, cf_tol ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -169,16 +163,16 @@ HYPRE_COGMRESGetConvergenceFactorTol( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_COGMRESSetMinIter( HYPRE_Solver solver,
-                             HYPRE_Int          min_iter )
+                         HYPRE_Int          min_iter )
 {
-   return( hypre_COGMRESSetMinIter( (void *) solver, min_iter ) );
+   return ( hypre_COGMRESSetMinIter( (void *) solver, min_iter ) );
 }
 
 HYPRE_Int
 HYPRE_COGMRESGetMinIter( HYPRE_Solver solver,
-                             HYPRE_Int        * min_iter )
+                         HYPRE_Int        * min_iter )
 {
-   return( hypre_COGMRESGetMinIter( (void *) solver, min_iter ) );
+   return ( hypre_COGMRESGetMinIter( (void *) solver, min_iter ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -187,16 +181,16 @@ HYPRE_COGMRESGetMinIter( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_COGMRESSetMaxIter( HYPRE_Solver solver,
-                             HYPRE_Int          max_iter )
+                         HYPRE_Int          max_iter )
 {
-   return( hypre_COGMRESSetMaxIter( (void *) solver, max_iter ) );
+   return ( hypre_COGMRESSetMaxIter( (void *) solver, max_iter ) );
 }
 
 HYPRE_Int
 HYPRE_COGMRESGetMaxIter( HYPRE_Solver solver,
-                             HYPRE_Int        * max_iter )
+                         HYPRE_Int        * max_iter )
 {
-   return( hypre_COGMRESGetMaxIter( (void *) solver, max_iter ) );
+   return ( hypre_COGMRESGetMaxIter( (void *) solver, max_iter ) );
 }
 
 
@@ -207,14 +201,14 @@ HYPRE_COGMRESGetMaxIter( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_COGMRESSetPrecond( HYPRE_Solver          solver,
-                             HYPRE_PtrToSolverFcn  precond,
-                             HYPRE_PtrToSolverFcn  precond_setup,
-                             HYPRE_Solver          precond_solver )
+                         HYPRE_PtrToSolverFcn  precond,
+                         HYPRE_PtrToSolverFcn  precond_setup,
+                         HYPRE_Solver          precond_solver )
 {
-   return( hypre_COGMRESSetPrecond( (void *) solver,
-									  (HYPRE_Int (*)(void*, void*, void*, void*))precond,
-									  (HYPRE_Int (*)(void*, void*, void*, void*))precond_setup,
-									  (void *) precond_solver ) );
+   return ( hypre_COGMRESSetPrecond( (void *) solver,
+                                     (HYPRE_Int (*)(void*, void*, void*, void*))precond,
+                                     (HYPRE_Int (*)(void*, void*, void*, void*))precond_setup,
+                                     (void *) precond_solver ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -223,10 +217,10 @@ HYPRE_COGMRESSetPrecond( HYPRE_Solver          solver,
 
 HYPRE_Int
 HYPRE_COGMRESGetPrecond( HYPRE_Solver  solver,
-                             HYPRE_Solver *precond_data_ptr )
+                         HYPRE_Solver *precond_data_ptr )
 {
-   return( hypre_COGMRESGetPrecond( (void *)     solver,
-                                  (HYPRE_Solver *) precond_data_ptr ) );
+   return ( hypre_COGMRESGetPrecond( (void *)     solver,
+                                     (HYPRE_Solver *) precond_data_ptr ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -235,16 +229,16 @@ HYPRE_COGMRESGetPrecond( HYPRE_Solver  solver,
 
 HYPRE_Int
 HYPRE_COGMRESSetPrintLevel( HYPRE_Solver solver,
-                        HYPRE_Int          level )
+                            HYPRE_Int          level )
 {
-   return( hypre_COGMRESSetPrintLevel( (void *) solver, level ) );
+   return ( hypre_COGMRESSetPrintLevel( (void *) solver, level ) );
 }
 
 HYPRE_Int
 HYPRE_COGMRESGetPrintLevel( HYPRE_Solver solver,
-                        HYPRE_Int        * level )
+                            HYPRE_Int        * level )
 {
-   return( hypre_COGMRESGetPrintLevel( (void *) solver, level ) );
+   return ( hypre_COGMRESGetPrintLevel( (void *) solver, level ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -253,16 +247,16 @@ HYPRE_COGMRESGetPrintLevel( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_COGMRESSetLogging( HYPRE_Solver solver,
-                     HYPRE_Int          level )
+                         HYPRE_Int          level )
 {
-   return( hypre_COGMRESSetLogging( (void *) solver, level ) );
+   return ( hypre_COGMRESSetLogging( (void *) solver, level ) );
 }
 
 HYPRE_Int
 HYPRE_COGMRESGetLogging( HYPRE_Solver solver,
-                     HYPRE_Int        * level )
+                         HYPRE_Int        * level )
 {
-   return( hypre_COGMRESGetLogging( (void *) solver, level ) );
+   return ( hypre_COGMRESGetLogging( (void *) solver, level ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -271,9 +265,9 @@ HYPRE_COGMRESGetLogging( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_COGMRESGetNumIterations( HYPRE_Solver  solver,
-                                   HYPRE_Int                *num_iterations )
+                               HYPRE_Int                *num_iterations )
 {
-   return( hypre_COGMRESGetNumIterations( (void *) solver, num_iterations ) );
+   return ( hypre_COGMRESGetNumIterations( (void *) solver, num_iterations ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -282,9 +276,9 @@ HYPRE_COGMRESGetNumIterations( HYPRE_Solver  solver,
 
 HYPRE_Int
 HYPRE_COGMRESGetConverged( HYPRE_Solver  solver,
-                         HYPRE_Int                *converged )
+                           HYPRE_Int                *converged )
 {
-   return( hypre_COGMRESGetConverged( (void *) solver, converged ) );
+   return ( hypre_COGMRESGetConverged( (void *) solver, converged ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -293,9 +287,9 @@ HYPRE_COGMRESGetConverged( HYPRE_Solver  solver,
 
 HYPRE_Int
 HYPRE_COGMRESGetFinalRelativeResidualNorm( HYPRE_Solver  solver,
-                                               HYPRE_Real         *norm   )
+                                           HYPRE_Real         *norm   )
 {
-   return( hypre_COGMRESGetFinalRelativeResidualNorm( (void *) solver, norm ) );
+   return ( hypre_COGMRESGetFinalRelativeResidualNorm( (void *) solver, norm ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -312,13 +306,14 @@ HYPRE_Int HYPRE_COGMRESGetResidual( HYPRE_Solver solver, void *residual )
 /*--------------------------------------------------------------------------
  * HYPRE_COGMRESSetModifyPC
  *--------------------------------------------------------------------------*/
- 
+
 
 HYPRE_Int HYPRE_COGMRESSetModifyPC( HYPRE_Solver  solver,
-             HYPRE_Int (*modify_pc)(HYPRE_Solver, HYPRE_Int, HYPRE_Real) )
+                                    HYPRE_Int (*modify_pc)(HYPRE_Solver, HYPRE_Int, HYPRE_Real) )
 {
-   return hypre_COGMRESSetModifyPC( (void *) solver, (HYPRE_Int(*)(void*, HYPRE_Int, HYPRE_Real))modify_pc);
-   
+   return hypre_COGMRESSetModifyPC( (void *) solver, (HYPRE_Int(*)(void*, HYPRE_Int,
+                                                                   HYPRE_Real))modify_pc);
+
 }
 
 
diff --git a/external/hypre/src/krylov/HYPRE_flexgmres.c b/external/hypre/src/krylov/HYPRE_flexgmres.c
index 42f42661..f0299f1f 100644
--- a/external/hypre/src/krylov/HYPRE_flexgmres.c
+++ b/external/hypre/src/krylov/HYPRE_flexgmres.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -17,7 +17,7 @@
  *--------------------------------------------------------------------------*/
 /* to do, not trivial */
 /*
-HYPRE_Int 
+HYPRE_Int
 HYPRE_ParCSRFlexGMRESDestroy( HYPRE_Solver solver )
 {
    return( hypre_FlexGMRESDestroy( (void *) solver ) );
@@ -28,32 +28,26 @@ HYPRE_ParCSRFlexGMRESDestroy( HYPRE_Solver solver )
  * HYPRE_FlexGMRESSetup
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_FlexGMRESSetup( HYPRE_Solver solver,
-                        HYPRE_Matrix A,
-                        HYPRE_Vector b,
-                        HYPRE_Vector x      )
+                      HYPRE_Matrix A,
+                      HYPRE_Vector b,
+                      HYPRE_Vector x      )
 {
-   return( hypre_FlexGMRESSetup( solver,
-                             A,
-                             b,
-                             x ) );
+   return ( hypre_FlexGMRESSetup( solver, A, b, x ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_FlexGMRESSolve
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_FlexGMRESSolve( HYPRE_Solver solver,
-                        HYPRE_Matrix A,
-                        HYPRE_Vector b,
-                        HYPRE_Vector x      )
+                      HYPRE_Matrix A,
+                      HYPRE_Vector b,
+                      HYPRE_Vector x      )
 {
-   return( hypre_FlexGMRESSolve( solver,
-                             A,
-                             b,
-                             x ) );
+   return ( hypre_FlexGMRESSolve( solver, A, b, x ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -62,16 +56,16 @@ HYPRE_FlexGMRESSolve( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_FlexGMRESSetKDim( HYPRE_Solver solver,
-                          HYPRE_Int             k_dim    )
+                        HYPRE_Int             k_dim    )
 {
-   return( hypre_FlexGMRESSetKDim( (void *) solver, k_dim ) );
+   return ( hypre_FlexGMRESSetKDim( (void *) solver, k_dim ) );
 }
 
 HYPRE_Int
 HYPRE_FlexGMRESGetKDim( HYPRE_Solver solver,
-                          HYPRE_Int           * k_dim    )
+                        HYPRE_Int           * k_dim    )
 {
-   return( hypre_FlexGMRESGetKDim( (void *) solver, k_dim ) );
+   return ( hypre_FlexGMRESGetKDim( (void *) solver, k_dim ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -80,16 +74,16 @@ HYPRE_FlexGMRESGetKDim( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_FlexGMRESSetTol( HYPRE_Solver solver,
-                         HYPRE_Real         tol    )
+                       HYPRE_Real         tol    )
 {
-   return( hypre_FlexGMRESSetTol( (void *) solver, tol ) );
+   return ( hypre_FlexGMRESSetTol( (void *) solver, tol ) );
 }
 
 HYPRE_Int
 HYPRE_FlexGMRESGetTol( HYPRE_Solver solver,
-                         HYPRE_Real       * tol    )
+                       HYPRE_Real       * tol    )
 {
-   return( hypre_FlexGMRESGetTol( (void *) solver, tol ) );
+   return ( hypre_FlexGMRESGetTol( (void *) solver, tol ) );
 }
 /*--------------------------------------------------------------------------
  * HYPRE_FlexGMRESSetAbsoluteTol, HYPRE_FlexGMRESGetAbsoluteTol
@@ -97,16 +91,16 @@ HYPRE_FlexGMRESGetTol( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_FlexGMRESSetAbsoluteTol( HYPRE_Solver solver,
-                         HYPRE_Real         a_tol    )
+                               HYPRE_Real         a_tol    )
 {
-   return( hypre_FlexGMRESSetAbsoluteTol( (void *) solver, a_tol ) );
+   return ( hypre_FlexGMRESSetAbsoluteTol( (void *) solver, a_tol ) );
 }
 
 HYPRE_Int
 HYPRE_FlexGMRESGetAbsoluteTol( HYPRE_Solver solver,
-                         HYPRE_Real       * a_tol    )
+                               HYPRE_Real       * a_tol    )
 {
-   return( hypre_FlexGMRESGetAbsoluteTol( (void *) solver, a_tol ) );
+   return ( hypre_FlexGMRESGetAbsoluteTol( (void *) solver, a_tol ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -115,16 +109,16 @@ HYPRE_FlexGMRESGetAbsoluteTol( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_FlexGMRESSetConvergenceFactorTol( HYPRE_Solver solver,
-                         HYPRE_Real         cf_tol    )
+                                        HYPRE_Real         cf_tol    )
 {
-   return( hypre_FlexGMRESSetConvergenceFactorTol( (void *) solver, cf_tol ) );
+   return ( hypre_FlexGMRESSetConvergenceFactorTol( (void *) solver, cf_tol ) );
 }
 
 HYPRE_Int
 HYPRE_FlexGMRESGetConvergenceFactorTol( HYPRE_Solver solver,
-                         HYPRE_Real       * cf_tol    )
+                                        HYPRE_Real       * cf_tol    )
 {
-   return( hypre_FlexGMRESGetConvergenceFactorTol( (void *) solver, cf_tol ) );
+   return ( hypre_FlexGMRESGetConvergenceFactorTol( (void *) solver, cf_tol ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -133,16 +127,16 @@ HYPRE_FlexGMRESGetConvergenceFactorTol( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_FlexGMRESSetMinIter( HYPRE_Solver solver,
-                             HYPRE_Int          min_iter )
+                           HYPRE_Int          min_iter )
 {
-   return( hypre_FlexGMRESSetMinIter( (void *) solver, min_iter ) );
+   return ( hypre_FlexGMRESSetMinIter( (void *) solver, min_iter ) );
 }
 
 HYPRE_Int
 HYPRE_FlexGMRESGetMinIter( HYPRE_Solver solver,
-                             HYPRE_Int        * min_iter )
+                           HYPRE_Int        * min_iter )
 {
-   return( hypre_FlexGMRESGetMinIter( (void *) solver, min_iter ) );
+   return ( hypre_FlexGMRESGetMinIter( (void *) solver, min_iter ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -151,16 +145,16 @@ HYPRE_FlexGMRESGetMinIter( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_FlexGMRESSetMaxIter( HYPRE_Solver solver,
-                             HYPRE_Int          max_iter )
+                           HYPRE_Int          max_iter )
 {
-   return( hypre_FlexGMRESSetMaxIter( (void *) solver, max_iter ) );
+   return ( hypre_FlexGMRESSetMaxIter( (void *) solver, max_iter ) );
 }
 
 HYPRE_Int
 HYPRE_FlexGMRESGetMaxIter( HYPRE_Solver solver,
-                             HYPRE_Int        * max_iter )
+                           HYPRE_Int        * max_iter )
 {
-   return( hypre_FlexGMRESGetMaxIter( (void *) solver, max_iter ) );
+   return ( hypre_FlexGMRESGetMaxIter( (void *) solver, max_iter ) );
 }
 
 
@@ -171,14 +165,14 @@ HYPRE_FlexGMRESGetMaxIter( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_FlexGMRESSetPrecond( HYPRE_Solver          solver,
-                             HYPRE_PtrToSolverFcn  precond,
-                             HYPRE_PtrToSolverFcn  precond_setup,
-                             HYPRE_Solver          precond_solver )
+                           HYPRE_PtrToSolverFcn  precond,
+                           HYPRE_PtrToSolverFcn  precond_setup,
+                           HYPRE_Solver          precond_solver )
 {
-   return( hypre_FlexGMRESSetPrecond( (void *) solver,
-									  (HYPRE_Int (*)(void*, void*, void*, void*))precond,
-									  (HYPRE_Int (*)(void*, void*, void*, void*))precond_setup,
-									  (void *) precond_solver ) );
+   return ( hypre_FlexGMRESSetPrecond( (void *) solver,
+                                       (HYPRE_Int (*)(void*, void*, void*, void*))precond,
+                                       (HYPRE_Int (*)(void*, void*, void*, void*))precond_setup,
+                                       (void *) precond_solver ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -187,10 +181,10 @@ HYPRE_FlexGMRESSetPrecond( HYPRE_Solver          solver,
 
 HYPRE_Int
 HYPRE_FlexGMRESGetPrecond( HYPRE_Solver  solver,
-                             HYPRE_Solver *precond_data_ptr )
+                           HYPRE_Solver *precond_data_ptr )
 {
-   return( hypre_FlexGMRESGetPrecond( (void *)     solver,
-                                  (HYPRE_Solver *) precond_data_ptr ) );
+   return ( hypre_FlexGMRESGetPrecond( (void *)     solver,
+                                       (HYPRE_Solver *) precond_data_ptr ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -199,16 +193,16 @@ HYPRE_FlexGMRESGetPrecond( HYPRE_Solver  solver,
 
 HYPRE_Int
 HYPRE_FlexGMRESSetPrintLevel( HYPRE_Solver solver,
-                        HYPRE_Int          level )
+                              HYPRE_Int          level )
 {
-   return( hypre_FlexGMRESSetPrintLevel( (void *) solver, level ) );
+   return ( hypre_FlexGMRESSetPrintLevel( (void *) solver, level ) );
 }
 
 HYPRE_Int
 HYPRE_FlexGMRESGetPrintLevel( HYPRE_Solver solver,
-                        HYPRE_Int        * level )
+                              HYPRE_Int        * level )
 {
-   return( hypre_FlexGMRESGetPrintLevel( (void *) solver, level ) );
+   return ( hypre_FlexGMRESGetPrintLevel( (void *) solver, level ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -217,16 +211,16 @@ HYPRE_FlexGMRESGetPrintLevel( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_FlexGMRESSetLogging( HYPRE_Solver solver,
-                     HYPRE_Int          level )
+                           HYPRE_Int          level )
 {
-   return( hypre_FlexGMRESSetLogging( (void *) solver, level ) );
+   return ( hypre_FlexGMRESSetLogging( (void *) solver, level ) );
 }
 
 HYPRE_Int
 HYPRE_FlexGMRESGetLogging( HYPRE_Solver solver,
-                     HYPRE_Int        * level )
+                           HYPRE_Int        * level )
 {
-   return( hypre_FlexGMRESGetLogging( (void *) solver, level ) );
+   return ( hypre_FlexGMRESGetLogging( (void *) solver, level ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -235,9 +229,9 @@ HYPRE_FlexGMRESGetLogging( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_FlexGMRESGetNumIterations( HYPRE_Solver  solver,
-                                   HYPRE_Int                *num_iterations )
+                                 HYPRE_Int                *num_iterations )
 {
-   return( hypre_FlexGMRESGetNumIterations( (void *) solver, num_iterations ) );
+   return ( hypre_FlexGMRESGetNumIterations( (void *) solver, num_iterations ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -246,9 +240,9 @@ HYPRE_FlexGMRESGetNumIterations( HYPRE_Solver  solver,
 
 HYPRE_Int
 HYPRE_FlexGMRESGetConverged( HYPRE_Solver  solver,
-                         HYPRE_Int                *converged )
+                             HYPRE_Int                *converged )
 {
-   return( hypre_FlexGMRESGetConverged( (void *) solver, converged ) );
+   return ( hypre_FlexGMRESGetConverged( (void *) solver, converged ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -257,9 +251,9 @@ HYPRE_FlexGMRESGetConverged( HYPRE_Solver  solver,
 
 HYPRE_Int
 HYPRE_FlexGMRESGetFinalRelativeResidualNorm( HYPRE_Solver  solver,
-                                               HYPRE_Real         *norm   )
+                                             HYPRE_Real         *norm   )
 {
-   return( hypre_FlexGMRESGetFinalRelativeResidualNorm( (void *) solver, norm ) );
+   return ( hypre_FlexGMRESGetFinalRelativeResidualNorm( (void *) solver, norm ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -275,14 +269,15 @@ HYPRE_Int HYPRE_FlexGMRESGetResidual( HYPRE_Solver solver, void *residual )
 /*--------------------------------------------------------------------------
  * HYPRE_FlexGMRESSetModifyPC
  *--------------------------------------------------------------------------*/
- 
+
 
 HYPRE_Int HYPRE_FlexGMRESSetModifyPC( HYPRE_Solver  solver,
-                                HYPRE_Int (*modify_pc)(HYPRE_Solver, HYPRE_Int, HYPRE_Real) )
+                                      HYPRE_Int (*modify_pc)(HYPRE_Solver, HYPRE_Int, HYPRE_Real) )
 
 {
-	return hypre_FlexGMRESSetModifyPC( (void *) solver, (HYPRE_Int(*)(void*, HYPRE_Int, HYPRE_Real))modify_pc);
-   
+   return hypre_FlexGMRESSetModifyPC( (void *) solver, (HYPRE_Int(*)(void*, HYPRE_Int,
+                                                                     HYPRE_Real))modify_pc);
+
 }
 
 
diff --git a/external/hypre/src/krylov/HYPRE_gmres.c b/external/hypre/src/krylov/HYPRE_gmres.c
index 0931984a..9612e466 100644
--- a/external/hypre/src/krylov/HYPRE_gmres.c
+++ b/external/hypre/src/krylov/HYPRE_gmres.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -17,7 +17,7 @@
  *--------------------------------------------------------------------------*/
 /* to do, not trivial */
 /*
-HYPRE_Int 
+HYPRE_Int
 HYPRE_ParCSRGMRESDestroy( HYPRE_Solver solver )
 {
    return( hypre_GMRESDestroy( (void *) solver ) );
@@ -28,32 +28,26 @@ HYPRE_ParCSRGMRESDestroy( HYPRE_Solver solver )
  * HYPRE_GMRESSetup
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_GMRESSetup( HYPRE_Solver solver,
                   HYPRE_Matrix A,
                   HYPRE_Vector b,
                   HYPRE_Vector x      )
 {
-   return( hypre_GMRESSetup( solver,
-                             A,
-                             b,
-                             x ) );
+   return ( hypre_GMRESSetup( solver, A, b, x ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_GMRESSolve
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_GMRESSolve( HYPRE_Solver solver,
                   HYPRE_Matrix A,
                   HYPRE_Vector b,
                   HYPRE_Vector x      )
 {
-   return( hypre_GMRESSolve( solver,
-                             A,
-                             b,
-                             x ) );
+   return ( hypre_GMRESSolve( solver, A, b, x ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -62,16 +56,16 @@ HYPRE_GMRESSolve( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_GMRESSetKDim( HYPRE_Solver solver,
-                          HYPRE_Int             k_dim    )
+                    HYPRE_Int             k_dim    )
 {
-   return( hypre_GMRESSetKDim( (void *) solver, k_dim ) );
+   return ( hypre_GMRESSetKDim( (void *) solver, k_dim ) );
 }
 
 HYPRE_Int
 HYPRE_GMRESGetKDim( HYPRE_Solver solver,
-                          HYPRE_Int           * k_dim    )
+                    HYPRE_Int           * k_dim    )
 {
-   return( hypre_GMRESGetKDim( (void *) solver, k_dim ) );
+   return ( hypre_GMRESGetKDim( (void *) solver, k_dim ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -80,16 +74,16 @@ HYPRE_GMRESGetKDim( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_GMRESSetTol( HYPRE_Solver solver,
-                         HYPRE_Real         tol    )
+                   HYPRE_Real         tol    )
 {
-   return( hypre_GMRESSetTol( (void *) solver, tol ) );
+   return ( hypre_GMRESSetTol( (void *) solver, tol ) );
 }
 
 HYPRE_Int
 HYPRE_GMRESGetTol( HYPRE_Solver solver,
-                         HYPRE_Real       * tol    )
+                   HYPRE_Real       * tol    )
 {
-   return( hypre_GMRESGetTol( (void *) solver, tol ) );
+   return ( hypre_GMRESGetTol( (void *) solver, tol ) );
 }
 /*--------------------------------------------------------------------------
  * HYPRE_GMRESSetAbsoluteTol, HYPRE_GMRESGetAbsoluteTol
@@ -97,16 +91,16 @@ HYPRE_GMRESGetTol( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_GMRESSetAbsoluteTol( HYPRE_Solver solver,
-                         HYPRE_Real         a_tol    )
+                           HYPRE_Real         a_tol    )
 {
-   return( hypre_GMRESSetAbsoluteTol( (void *) solver, a_tol ) );
+   return ( hypre_GMRESSetAbsoluteTol( (void *) solver, a_tol ) );
 }
 
 HYPRE_Int
 HYPRE_GMRESGetAbsoluteTol( HYPRE_Solver solver,
-                         HYPRE_Real       * a_tol    )
+                           HYPRE_Real       * a_tol    )
 {
-   return( hypre_GMRESGetAbsoluteTol( (void *) solver, a_tol ) );
+   return ( hypre_GMRESGetAbsoluteTol( (void *) solver, a_tol ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -115,16 +109,16 @@ HYPRE_GMRESGetAbsoluteTol( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_GMRESSetConvergenceFactorTol( HYPRE_Solver solver,
-                         HYPRE_Real         cf_tol    )
+                                    HYPRE_Real         cf_tol    )
 {
-   return( hypre_GMRESSetConvergenceFactorTol( (void *) solver, cf_tol ) );
+   return ( hypre_GMRESSetConvergenceFactorTol( (void *) solver, cf_tol ) );
 }
 
 HYPRE_Int
 HYPRE_GMRESGetConvergenceFactorTol( HYPRE_Solver solver,
-                         HYPRE_Real       * cf_tol    )
+                                    HYPRE_Real       * cf_tol    )
 {
-   return( hypre_GMRESGetConvergenceFactorTol( (void *) solver, cf_tol ) );
+   return ( hypre_GMRESGetConvergenceFactorTol( (void *) solver, cf_tol ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -133,16 +127,16 @@ HYPRE_GMRESGetConvergenceFactorTol( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_GMRESSetMinIter( HYPRE_Solver solver,
-                             HYPRE_Int          min_iter )
+                       HYPRE_Int          min_iter )
 {
-   return( hypre_GMRESSetMinIter( (void *) solver, min_iter ) );
+   return ( hypre_GMRESSetMinIter( (void *) solver, min_iter ) );
 }
 
 HYPRE_Int
 HYPRE_GMRESGetMinIter( HYPRE_Solver solver,
-                             HYPRE_Int        * min_iter )
+                       HYPRE_Int        * min_iter )
 {
-   return( hypre_GMRESGetMinIter( (void *) solver, min_iter ) );
+   return ( hypre_GMRESGetMinIter( (void *) solver, min_iter ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -151,16 +145,16 @@ HYPRE_GMRESGetMinIter( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_GMRESSetMaxIter( HYPRE_Solver solver,
-                             HYPRE_Int          max_iter )
+                       HYPRE_Int          max_iter )
 {
-   return( hypre_GMRESSetMaxIter( (void *) solver, max_iter ) );
+   return ( hypre_GMRESSetMaxIter( (void *) solver, max_iter ) );
 }
 
 HYPRE_Int
 HYPRE_GMRESGetMaxIter( HYPRE_Solver solver,
-                             HYPRE_Int        * max_iter )
+                       HYPRE_Int        * max_iter )
 {
-   return( hypre_GMRESGetMaxIter( (void *) solver, max_iter ) );
+   return ( hypre_GMRESGetMaxIter( (void *) solver, max_iter ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -169,16 +163,16 @@ HYPRE_GMRESGetMaxIter( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_GMRESSetStopCrit( HYPRE_Solver solver,
-                              HYPRE_Int          stop_crit )
+                        HYPRE_Int          stop_crit )
 {
-   return( hypre_GMRESSetStopCrit( (void *) solver, stop_crit ) );
+   return ( hypre_GMRESSetStopCrit( (void *) solver, stop_crit ) );
 }
 
 HYPRE_Int
 HYPRE_GMRESGetStopCrit( HYPRE_Solver solver,
-                              HYPRE_Int        * stop_crit )
+                        HYPRE_Int        * stop_crit )
 {
-   return( hypre_GMRESGetStopCrit( (void *) solver, stop_crit ) );
+   return ( hypre_GMRESGetStopCrit( (void *) solver, stop_crit ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -189,14 +183,14 @@ HYPRE_Int
 HYPRE_GMRESSetRelChange( HYPRE_Solver solver,
                          HYPRE_Int                rel_change )
 {
-   return( hypre_GMRESSetRelChange( (void *) solver, rel_change ) );
+   return ( hypre_GMRESSetRelChange( (void *) solver, rel_change ) );
 }
 
 HYPRE_Int
 HYPRE_GMRESGetRelChange( HYPRE_Solver solver,
                          HYPRE_Int              * rel_change )
 {
-   return( hypre_GMRESGetRelChange( (void *) solver, rel_change ) );
+   return ( hypre_GMRESGetRelChange( (void *) solver, rel_change ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -207,14 +201,14 @@ HYPRE_Int
 HYPRE_GMRESSetSkipRealResidualCheck( HYPRE_Solver solver,
                                      HYPRE_Int skip_real_r_check )
 {
-   return( hypre_GMRESSetSkipRealResidualCheck( (void *) solver, skip_real_r_check ) );
+   return ( hypre_GMRESSetSkipRealResidualCheck( (void *) solver, skip_real_r_check ) );
 }
 
 HYPRE_Int
 HYPRE_GMRESGetSkipRealResidualCheck( HYPRE_Solver solver,
                                      HYPRE_Int *skip_real_r_check )
 {
-   return( hypre_GMRESGetSkipRealResidualCheck( (void *) solver, skip_real_r_check ) );
+   return ( hypre_GMRESGetSkipRealResidualCheck( (void *) solver, skip_real_r_check ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -227,10 +221,10 @@ HYPRE_GMRESSetPrecond( HYPRE_Solver          solver,
                        HYPRE_PtrToSolverFcn  precond_setup,
                        HYPRE_Solver          precond_solver )
 {
-   return( hypre_GMRESSetPrecond( (void *) solver,
-                                  (HYPRE_Int (*)(void*, void*, void*, void*))precond,
-								  (HYPRE_Int (*)(void*, void*, void*, void*))precond_setup,
-                                  (void *) precond_solver ) );
+   return ( hypre_GMRESSetPrecond( (void *) solver,
+                                   (HYPRE_Int (*)(void*, void*, void*, void*))precond,
+                                   (HYPRE_Int (*)(void*, void*, void*, void*))precond_setup,
+                                   (void *) precond_solver ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -239,10 +233,10 @@ HYPRE_GMRESSetPrecond( HYPRE_Solver          solver,
 
 HYPRE_Int
 HYPRE_GMRESGetPrecond( HYPRE_Solver  solver,
-                             HYPRE_Solver *precond_data_ptr )
+                       HYPRE_Solver *precond_data_ptr )
 {
-   return( hypre_GMRESGetPrecond( (void *)     solver,
-                                  (HYPRE_Solver *) precond_data_ptr ) );
+   return ( hypre_GMRESGetPrecond( (void *)     solver,
+                                   (HYPRE_Solver *) precond_data_ptr ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -251,16 +245,16 @@ HYPRE_GMRESGetPrecond( HYPRE_Solver  solver,
 
 HYPRE_Int
 HYPRE_GMRESSetPrintLevel( HYPRE_Solver solver,
-                        HYPRE_Int          level )
+                          HYPRE_Int          level )
 {
-   return( hypre_GMRESSetPrintLevel( (void *) solver, level ) );
+   return ( hypre_GMRESSetPrintLevel( (void *) solver, level ) );
 }
 
 HYPRE_Int
 HYPRE_GMRESGetPrintLevel( HYPRE_Solver solver,
-                        HYPRE_Int        * level )
+                          HYPRE_Int        * level )
 {
-   return( hypre_GMRESGetPrintLevel( (void *) solver, level ) );
+   return ( hypre_GMRESGetPrintLevel( (void *) solver, level ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -269,16 +263,16 @@ HYPRE_GMRESGetPrintLevel( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_GMRESSetLogging( HYPRE_Solver solver,
-                     HYPRE_Int          level )
+                       HYPRE_Int          level )
 {
-   return( hypre_GMRESSetLogging( (void *) solver, level ) );
+   return ( hypre_GMRESSetLogging( (void *) solver, level ) );
 }
 
 HYPRE_Int
 HYPRE_GMRESGetLogging( HYPRE_Solver solver,
-                     HYPRE_Int        * level )
+                       HYPRE_Int        * level )
 {
-   return( hypre_GMRESGetLogging( (void *) solver, level ) );
+   return ( hypre_GMRESGetLogging( (void *) solver, level ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -287,9 +281,9 @@ HYPRE_GMRESGetLogging( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_GMRESGetNumIterations( HYPRE_Solver  solver,
-                                   HYPRE_Int                *num_iterations )
+                             HYPRE_Int                *num_iterations )
 {
-   return( hypre_GMRESGetNumIterations( (void *) solver, num_iterations ) );
+   return ( hypre_GMRESGetNumIterations( (void *) solver, num_iterations ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -300,7 +294,7 @@ HYPRE_Int
 HYPRE_GMRESGetConverged( HYPRE_Solver  solver,
                          HYPRE_Int                *converged )
 {
-   return( hypre_GMRESGetConverged( (void *) solver, converged ) );
+   return ( hypre_GMRESGetConverged( (void *) solver, converged ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -309,9 +303,9 @@ HYPRE_GMRESGetConverged( HYPRE_Solver  solver,
 
 HYPRE_Int
 HYPRE_GMRESGetFinalRelativeResidualNorm( HYPRE_Solver  solver,
-                                               HYPRE_Real         *norm   )
+                                         HYPRE_Real         *norm   )
 {
-   return( hypre_GMRESGetFinalRelativeResidualNorm( (void *) solver, norm ) );
+   return ( hypre_GMRESGetFinalRelativeResidualNorm( (void *) solver, norm ) );
 }
 
 /*--------------------------------------------------------------------------
diff --git a/external/hypre/src/krylov/HYPRE_krylov.h b/external/hypre/src/krylov/HYPRE_krylov.h
index 71fab7ce..9b7cc3a2 100644
--- a/external/hypre/src/krylov/HYPRE_krylov.h
+++ b/external/hypre/src/krylov/HYPRE_krylov.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -20,11 +20,10 @@ extern "C" {
 /**
  * @defgroup KrylovSolvers Krylov Solvers
  *
- * These solvers support many of the matrix/vector storage schemes in hypre.
- * They should be used in conjunction with the storage-specific interfaces,
- * particularly the specific Create() and Destroy() functions.
- *
- * @memo A basic interface for Krylov solvers
+ * A basic interface for Krylov solvers. These solvers support many of the
+ * matrix/vector storage schemes in hypre.  They should be used in conjunction
+ * with the storage-specific interfaces, particularly the specific Create() and
+ * Destroy() functions.
  *
  * @{
  **/
@@ -38,43 +37,11 @@ extern "C" {
  * @{
  **/
 
-#ifndef HYPRE_SOLVER_STRUCT
-#define HYPRE_SOLVER_STRUCT
-struct hypre_Solver_struct;
-/**
- * The solver object.
- **/
-typedef struct hypre_Solver_struct *HYPRE_Solver;
-#endif
-
-#ifndef HYPRE_MATRIX_STRUCT
-#define HYPRE_MATRIX_STRUCT
-struct hypre_Matrix_struct;
-/**
- * The matrix object.
- **/
-typedef struct hypre_Matrix_struct *HYPRE_Matrix;
-#endif
-
-#ifndef HYPRE_VECTOR_STRUCT
-#define HYPRE_VECTOR_STRUCT
-struct hypre_Vector_struct;
-/**
- * The vector object.
- **/
-typedef struct hypre_Vector_struct *HYPRE_Vector;
-#endif
-
-typedef HYPRE_Int (*HYPRE_PtrToSolverFcn)(HYPRE_Solver,
-                                    HYPRE_Matrix,
-                                    HYPRE_Vector,
-                                    HYPRE_Vector);
-
 #ifndef HYPRE_MODIFYPC
 #define HYPRE_MODIFYPC
 typedef HYPRE_Int (*HYPRE_PtrToModifyPCFcn)(HYPRE_Solver,
-                                      HYPRE_Int,
-                                      HYPRE_Real);
+                                            HYPRE_Int,
+                                            HYPRE_Real);
 
 #endif
 /**@}*/
@@ -178,6 +145,24 @@ HYPRE_Int HYPRE_PCGSetRecomputeResidual(HYPRE_Solver solver,
 HYPRE_Int HYPRE_PCGSetRecomputeResidualP(HYPRE_Solver solver,
                                          HYPRE_Int    recompute_residual_p);
 
+/**
+ * (Optional) Setting this to 1 allows use of Polak-Ribiere Method (flexible)
+ * this incrceases robustness, but adds an additional dot product per iteration
+ **/
+HYPRE_Int HYPRE_PCGSetFlex(HYPRE_Solver solver,
+                           HYPRE_Int    flex);
+
+/**
+ * (Optional) Skips subnormal alpha, gamma and iprod values in CG.
+ *  If set to 0 (default): will break if values are below HYPRE_REAL_MIN
+ *  If set to 1: will break if values are below HYPRE_REAL_TRUE_MIN
+ *  (requires C11 minimal or will check to HYPRE_REAL_MIN)
+ *  If set to 2: will break if values are <= 0.
+ *  If set to 3 or larger: will not break at all
+ **/
+HYPRE_Int HYPRE_PCGSetSkipBreak(HYPRE_Solver solver,
+                                HYPRE_Int    skip_break);
+
 /**
  * (Optional) Set the preconditioner to use.
  **/
@@ -186,6 +171,15 @@ HYPRE_Int HYPRE_PCGSetPrecond(HYPRE_Solver         solver,
                               HYPRE_PtrToSolverFcn precond_setup,
                               HYPRE_Solver         precond_solver);
 
+/**
+ * (Optional) Set the preconditioner to use in a generic fashion.
+ * This function does not require explicit input of the setup and solve pointers
+ * of the preconditioner object. Instead, it automatically extracts this information
+ * from the aforementioned object.
+ **/
+HYPRE_Int HYPRE_PCGSetPreconditioner(HYPRE_Solver  solver,
+                                     HYPRE_Solver  precond);
+
 /**
  * (Optional) Set the amount of logging to do.
  **/
@@ -261,8 +255,13 @@ HYPRE_Int HYPRE_PCGGetRelChange(HYPRE_Solver  solver,
 
 /**
  **/
-HYPRE_Int HYPRE_GMRESGetSkipRealResidualCheck(HYPRE_Solver solver,
-                                              HYPRE_Int   *skip_real_r_check);
+HYPRE_Int HYPRE_PCGGetSkipBreak(HYPRE_Solver solver,
+                                HYPRE_Int   *skip_break);
+
+/**
+ **/
+HYPRE_Int HYPRE_PCGGetFlex(HYPRE_Solver solver,
+                           HYPRE_Int   *flex);
 
 /**
  **/
@@ -282,7 +281,7 @@ HYPRE_Int HYPRE_PCGGetPrintLevel(HYPRE_Solver  solver,
 /**
  **/
 HYPRE_Int HYPRE_PCGGetConverged(HYPRE_Solver  solver,
-                          HYPRE_Int          *converged);
+                                HYPRE_Int          *converged);
 
 /**@}*/
 
@@ -319,10 +318,10 @@ HYPRE_Int HYPRE_GMRESSetTol(HYPRE_Solver solver,
                             HYPRE_Real   tol);
 
 /**
- * (Optional) Set the absolute convergence tolerance (default is 0). 
+ * (Optional) Set the absolute convergence tolerance (default is 0).
  * If one desires
  * the convergence test to check the absolute convergence tolerance \e only, then
- * set the relative convergence tolerance to 0.0.  (The convergence test is 
+ * set the relative convergence tolerance to 0.0.  (The convergence test is
  * \f$\|r\| \leq\f$ max(relative\f$\_\f$tolerance\f$\ast \|b\|\f$, absolute\f$\_\f$tolerance).)
  *
  **/
@@ -414,6 +413,11 @@ HYPRE_Int HYPRE_GMRESGetFinalRelativeResidualNorm(HYPRE_Solver  solver,
 HYPRE_Int HYPRE_GMRESGetResidual(HYPRE_Solver   solver,
                                  void          *residual);
 
+/**
+ **/
+HYPRE_Int HYPRE_GMRESGetSkipRealResidualCheck(HYPRE_Solver solver,
+                                              HYPRE_Int   *skip_real_r_check);
+
 /**
  **/
 HYPRE_Int HYPRE_GMRESGetTol(HYPRE_Solver  solver,
@@ -431,7 +435,7 @@ HYPRE_Int HYPRE_GMRESGetConvergenceFactorTol(HYPRE_Solver solver,
                                              HYPRE_Real  *cf_tol);
 
 /*
- * OBSOLETE 
+ * OBSOLETE
  **/
 HYPRE_Int HYPRE_GMRESGetStopCrit(HYPRE_Solver solver,
                                  HYPRE_Int   *stop_crit);
@@ -512,10 +516,10 @@ HYPRE_Int HYPRE_FlexGMRESSetTol(HYPRE_Solver solver,
                                 HYPRE_Real   tol);
 
 /**
- * (Optional) Set the absolute convergence tolerance (default is 0). 
+ * (Optional) Set the absolute convergence tolerance (default is 0).
  * If one desires
  * the convergence test to check the absolute convergence tolerance \e only, then
- * set the relative convergence tolerance to 0.0.  (The convergence test is 
+ * set the relative convergence tolerance to 0.0.  (The convergence test is
  * \f$\|r\| \leq\f$ max(relative\f$\_\f$tolerance\f$\ast \|b\|\f$, absolute\f$\_\f$tolerance).)
  *
  **/
@@ -680,10 +684,10 @@ HYPRE_Int HYPRE_LGMRESSolve(HYPRE_Solver solver,
 HYPRE_Int HYPRE_LGMRESSetTol(HYPRE_Solver solver,
                              HYPRE_Real   tol);
 /**
- * (Optional) Set the absolute convergence tolerance (default is 0). 
+ * (Optional) Set the absolute convergence tolerance (default is 0).
  * If one desires
  * the convergence test to check the absolute convergence tolerance \e only, then
- * set the relative convergence tolerance to 0.0.  (The convergence test is 
+ * set the relative convergence tolerance to 0.0.  (The convergence test is
  * \f$\|r\| \leq\f$ max(relative\f$\_\f$tolerance\f$\ast \|b\|\f$, absolute\f$\_\f$tolerance).)
  *
  **/
@@ -849,10 +853,10 @@ HYPRE_Int HYPRE_COGMRESSetTol(HYPRE_Solver solver,
                               HYPRE_Real   tol);
 
 /**
- * (Optional) Set the absolute convergence tolerance (default is 0). 
+ * (Optional) Set the absolute convergence tolerance (default is 0).
  * If one desires
  * the convergence test to check the absolute convergence tolerance \e only, then
- * set the relative convergence tolerance to 0.0.  (The convergence test is 
+ * set the relative convergence tolerance to 0.0.  (The convergence test is
  * \f$\|r\| \leq\f$ max(relative\f$\_\f$tolerance\f$\ast \|b\|\f$, absolute\f$\_\f$tolerance).)
  *
  **/
@@ -884,7 +888,7 @@ HYPRE_Int HYPRE_COGMRESSetKDim(HYPRE_Solver solver,
                                HYPRE_Int    k_dim);
 
 /**
- * (Optional) Set number of unrolling in mass funcyions in COGMRES 
+ * (Optional) Set number of unrolling in mass funcyions in COGMRES
  * Can be 4 or 8. Default: no unrolling.
  **/
 HYPRE_Int HYPRE_COGMRESSetUnroll(HYPRE_Solver solver,
@@ -1046,10 +1050,10 @@ HYPRE_Int HYPRE_BiCGSTABSetTol(HYPRE_Solver solver,
                                HYPRE_Real   tol);
 
 /**
- * (Optional) Set the absolute convergence tolerance (default is 0). 
+ * (Optional) Set the absolute convergence tolerance (default is 0).
  * If one desires
  * the convergence test to check the absolute convergence tolerance \e only, then
- * set the relative convergence tolerance to 0.0.  (The convergence test is 
+ * set the relative convergence tolerance to 0.0.  (The convergence test is
  * \f$\|r\| \leq\f$ max(relative\f$\_\f$tolerance \f$\ast \|b\|\f$, absolute\f$\_\f$tolerance).)
  *
  **/
diff --git a/external/hypre/src/krylov/HYPRE_lgmres.c b/external/hypre/src/krylov/HYPRE_lgmres.c
index 62bbbdbc..89baf31e 100644
--- a/external/hypre/src/krylov/HYPRE_lgmres.c
+++ b/external/hypre/src/krylov/HYPRE_lgmres.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -17,7 +17,7 @@
  *--------------------------------------------------------------------------*/
 /* to do, not trivial */
 /*
-HYPRE_Int 
+HYPRE_Int
 HYPRE_ParCSRLGMRESDestroy( HYPRE_Solver solver )
 {
    return( hypre_LGMRESDestroy( (void *) solver ) );
@@ -28,32 +28,26 @@ HYPRE_ParCSRLGMRESDestroy( HYPRE_Solver solver )
  * HYPRE_LGMRESSetup
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_LGMRESSetup( HYPRE_Solver solver,
-                        HYPRE_Matrix A,
-                        HYPRE_Vector b,
-                        HYPRE_Vector x      )
+                   HYPRE_Matrix A,
+                   HYPRE_Vector b,
+                   HYPRE_Vector x      )
 {
-   return( hypre_LGMRESSetup( solver,
-                             A,
-                             b,
-                             x ) );
+   return ( hypre_LGMRESSetup( solver, A, b, x ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_LGMRESSolve
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_LGMRESSolve( HYPRE_Solver solver,
-                        HYPRE_Matrix A,
-                        HYPRE_Vector b,
-                        HYPRE_Vector x      )
+                   HYPRE_Matrix A,
+                   HYPRE_Vector b,
+                   HYPRE_Vector x      )
 {
-   return( hypre_LGMRESSolve( solver,
-                             A,
-                             b,
-                             x ) );
+   return ( hypre_LGMRESSolve( solver, A, b, x ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -62,16 +56,16 @@ HYPRE_LGMRESSolve( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_LGMRESSetKDim( HYPRE_Solver solver,
-                          HYPRE_Int             k_dim    )
+                     HYPRE_Int             k_dim    )
 {
-   return( hypre_LGMRESSetKDim( (void *) solver, k_dim ) );
+   return ( hypre_LGMRESSetKDim( (void *) solver, k_dim ) );
 }
 
 HYPRE_Int
 HYPRE_LGMRESGetKDim( HYPRE_Solver solver,
-                          HYPRE_Int           * k_dim    )
+                     HYPRE_Int           * k_dim    )
 {
-   return( hypre_LGMRESGetKDim( (void *) solver, k_dim ) );
+   return ( hypre_LGMRESGetKDim( (void *) solver, k_dim ) );
 }
 /*--------------------------------------------------------------------------
  * HYPRE_LGMRESSetAugDim, HYPRE_LGMRESGetAugDim
@@ -79,16 +73,16 @@ HYPRE_LGMRESGetKDim( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_LGMRESSetAugDim( HYPRE_Solver solver,
-                          HYPRE_Int             aug_dim    )
+                       HYPRE_Int             aug_dim    )
 {
-   return( hypre_LGMRESSetAugDim( (void *) solver, aug_dim ) );
+   return ( hypre_LGMRESSetAugDim( (void *) solver, aug_dim ) );
 }
 
 HYPRE_Int
 HYPRE_LGMRESGetAugDim( HYPRE_Solver solver,
-                          HYPRE_Int           * aug_dim    )
+                       HYPRE_Int           * aug_dim    )
 {
-   return( hypre_LGMRESGetAugDim( (void *) solver, aug_dim ) );
+   return ( hypre_LGMRESGetAugDim( (void *) solver, aug_dim ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -97,16 +91,16 @@ HYPRE_LGMRESGetAugDim( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_LGMRESSetTol( HYPRE_Solver solver,
-                         HYPRE_Real         tol    )
+                    HYPRE_Real         tol    )
 {
-   return( hypre_LGMRESSetTol( (void *) solver, tol ) );
+   return ( hypre_LGMRESSetTol( (void *) solver, tol ) );
 }
 
 HYPRE_Int
 HYPRE_LGMRESGetTol( HYPRE_Solver solver,
-                         HYPRE_Real       * tol    )
+                    HYPRE_Real       * tol    )
 {
-   return( hypre_LGMRESGetTol( (void *) solver, tol ) );
+   return ( hypre_LGMRESGetTol( (void *) solver, tol ) );
 }
 /*--------------------------------------------------------------------------
  * HYPRE_LGMRESSetAbsoluteTol, HYPRE_LGMRESGetAbsoluteTol
@@ -114,16 +108,16 @@ HYPRE_LGMRESGetTol( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_LGMRESSetAbsoluteTol( HYPRE_Solver solver,
-                         HYPRE_Real         a_tol    )
+                            HYPRE_Real         a_tol    )
 {
-   return( hypre_LGMRESSetAbsoluteTol( (void *) solver, a_tol ) );
+   return ( hypre_LGMRESSetAbsoluteTol( (void *) solver, a_tol ) );
 }
 
 HYPRE_Int
 HYPRE_LGMRESGetAbsoluteTol( HYPRE_Solver solver,
-                         HYPRE_Real       * a_tol    )
+                            HYPRE_Real       * a_tol    )
 {
-   return( hypre_LGMRESGetAbsoluteTol( (void *) solver, a_tol ) );
+   return ( hypre_LGMRESGetAbsoluteTol( (void *) solver, a_tol ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -132,16 +126,16 @@ HYPRE_LGMRESGetAbsoluteTol( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_LGMRESSetConvergenceFactorTol( HYPRE_Solver solver,
-                         HYPRE_Real         cf_tol    )
+                                     HYPRE_Real         cf_tol    )
 {
-   return( hypre_LGMRESSetConvergenceFactorTol( (void *) solver, cf_tol ) );
+   return ( hypre_LGMRESSetConvergenceFactorTol( (void *) solver, cf_tol ) );
 }
 
 HYPRE_Int
 HYPRE_LGMRESGetConvergenceFactorTol( HYPRE_Solver solver,
-                         HYPRE_Real       * cf_tol    )
+                                     HYPRE_Real       * cf_tol    )
 {
-   return( hypre_LGMRESGetConvergenceFactorTol( (void *) solver, cf_tol ) );
+   return ( hypre_LGMRESGetConvergenceFactorTol( (void *) solver, cf_tol ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -150,16 +144,16 @@ HYPRE_LGMRESGetConvergenceFactorTol( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_LGMRESSetMinIter( HYPRE_Solver solver,
-                             HYPRE_Int          min_iter )
+                        HYPRE_Int          min_iter )
 {
-   return( hypre_LGMRESSetMinIter( (void *) solver, min_iter ) );
+   return ( hypre_LGMRESSetMinIter( (void *) solver, min_iter ) );
 }
 
 HYPRE_Int
 HYPRE_LGMRESGetMinIter( HYPRE_Solver solver,
-                             HYPRE_Int        * min_iter )
+                        HYPRE_Int        * min_iter )
 {
-   return( hypre_LGMRESGetMinIter( (void *) solver, min_iter ) );
+   return ( hypre_LGMRESGetMinIter( (void *) solver, min_iter ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -168,16 +162,16 @@ HYPRE_LGMRESGetMinIter( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_LGMRESSetMaxIter( HYPRE_Solver solver,
-                             HYPRE_Int          max_iter )
+                        HYPRE_Int          max_iter )
 {
-   return( hypre_LGMRESSetMaxIter( (void *) solver, max_iter ) );
+   return ( hypre_LGMRESSetMaxIter( (void *) solver, max_iter ) );
 }
 
 HYPRE_Int
 HYPRE_LGMRESGetMaxIter( HYPRE_Solver solver,
-                             HYPRE_Int        * max_iter )
+                        HYPRE_Int        * max_iter )
 {
-   return( hypre_LGMRESGetMaxIter( (void *) solver, max_iter ) );
+   return ( hypre_LGMRESGetMaxIter( (void *) solver, max_iter ) );
 }
 
 
@@ -188,14 +182,14 @@ HYPRE_LGMRESGetMaxIter( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_LGMRESSetPrecond( HYPRE_Solver          solver,
-                             HYPRE_PtrToSolverFcn  precond,
-                             HYPRE_PtrToSolverFcn  precond_setup,
-                             HYPRE_Solver          precond_solver )
+                        HYPRE_PtrToSolverFcn  precond,
+                        HYPRE_PtrToSolverFcn  precond_setup,
+                        HYPRE_Solver          precond_solver )
 {
-   return( hypre_LGMRESSetPrecond( (void *) solver,
-								   (HYPRE_Int (*)(void*, void*, void*, void*))precond,
-								   (HYPRE_Int (*)(void*, void*, void*, void*))precond_setup,
-								   (void *) precond_solver ) );
+   return ( hypre_LGMRESSetPrecond( (void *) solver,
+                                    (HYPRE_Int (*)(void*, void*, void*, void*))precond,
+                                    (HYPRE_Int (*)(void*, void*, void*, void*))precond_setup,
+                                    (void *) precond_solver ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -204,10 +198,10 @@ HYPRE_LGMRESSetPrecond( HYPRE_Solver          solver,
 
 HYPRE_Int
 HYPRE_LGMRESGetPrecond( HYPRE_Solver  solver,
-                             HYPRE_Solver *precond_data_ptr )
+                        HYPRE_Solver *precond_data_ptr )
 {
-   return( hypre_LGMRESGetPrecond( (void *)     solver,
-                                  (HYPRE_Solver *) precond_data_ptr ) );
+   return ( hypre_LGMRESGetPrecond( (void *)     solver,
+                                    (HYPRE_Solver *) precond_data_ptr ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -216,16 +210,16 @@ HYPRE_LGMRESGetPrecond( HYPRE_Solver  solver,
 
 HYPRE_Int
 HYPRE_LGMRESSetPrintLevel( HYPRE_Solver solver,
-                        HYPRE_Int          level )
+                           HYPRE_Int          level )
 {
-   return( hypre_LGMRESSetPrintLevel( (void *) solver, level ) );
+   return ( hypre_LGMRESSetPrintLevel( (void *) solver, level ) );
 }
 
 HYPRE_Int
 HYPRE_LGMRESGetPrintLevel( HYPRE_Solver solver,
-                        HYPRE_Int        * level )
+                           HYPRE_Int        * level )
 {
-   return( hypre_LGMRESGetPrintLevel( (void *) solver, level ) );
+   return ( hypre_LGMRESGetPrintLevel( (void *) solver, level ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -234,16 +228,16 @@ HYPRE_LGMRESGetPrintLevel( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_LGMRESSetLogging( HYPRE_Solver solver,
-                     HYPRE_Int          level )
+                        HYPRE_Int          level )
 {
-   return( hypre_LGMRESSetLogging( (void *) solver, level ) );
+   return ( hypre_LGMRESSetLogging( (void *) solver, level ) );
 }
 
 HYPRE_Int
 HYPRE_LGMRESGetLogging( HYPRE_Solver solver,
-                     HYPRE_Int        * level )
+                        HYPRE_Int        * level )
 {
-   return( hypre_LGMRESGetLogging( (void *) solver, level ) );
+   return ( hypre_LGMRESGetLogging( (void *) solver, level ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -252,9 +246,9 @@ HYPRE_LGMRESGetLogging( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_LGMRESGetNumIterations( HYPRE_Solver  solver,
-                                   HYPRE_Int                *num_iterations )
+                              HYPRE_Int                *num_iterations )
 {
-   return( hypre_LGMRESGetNumIterations( (void *) solver, num_iterations ) );
+   return ( hypre_LGMRESGetNumIterations( (void *) solver, num_iterations ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -263,9 +257,9 @@ HYPRE_LGMRESGetNumIterations( HYPRE_Solver  solver,
 
 HYPRE_Int
 HYPRE_LGMRESGetConverged( HYPRE_Solver  solver,
-                         HYPRE_Int                *converged )
+                          HYPRE_Int                *converged )
 {
-   return( hypre_LGMRESGetConverged( (void *) solver, converged ) );
+   return ( hypre_LGMRESGetConverged( (void *) solver, converged ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -274,9 +268,9 @@ HYPRE_LGMRESGetConverged( HYPRE_Solver  solver,
 
 HYPRE_Int
 HYPRE_LGMRESGetFinalRelativeResidualNorm( HYPRE_Solver  solver,
-                                               HYPRE_Real         *norm   )
+                                          HYPRE_Real         *norm   )
 {
-   return( hypre_LGMRESGetFinalRelativeResidualNorm( (void *) solver, norm ) );
+   return ( hypre_LGMRESGetFinalRelativeResidualNorm( (void *) solver, norm ) );
 }
 
 /*--------------------------------------------------------------------------
diff --git a/external/hypre/src/krylov/HYPRE_lobpcg.c b/external/hypre/src/krylov/HYPRE_lobpcg.c
index c5d41908..870cdde3 100644
--- a/external/hypre/src/krylov/HYPRE_lobpcg.c
+++ b/external/hypre/src/krylov/HYPRE_lobpcg.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -25,8 +25,8 @@
 
 typedef struct
 {
-	HYPRE_Int    (*Precond)(void*,void*,void*,void*);
-   HYPRE_Int    (*PrecondSetup)(void*,void*,void*,void*);
+   HYPRE_Int    (*Precond)(void*, void*, void*, void*);
+   HYPRE_Int    (*PrecondSetup)(void*, void*, void*, void*);
 
 } hypre_LOBPCGPrecond;
 
@@ -77,15 +77,15 @@ typedef struct
 } hypre_LOBPCGData;
 
 static HYPRE_Int dsygv_interface (HYPRE_Int *itype, char *jobz, char *uplo, HYPRE_Int *
-                            n, HYPRE_Real *a, HYPRE_Int *lda, HYPRE_Real *b, HYPRE_Int *ldb,
-                            HYPRE_Real *w, HYPRE_Real *work, HYPRE_Int *lwork, HYPRE_Int *info)
+                                  n, HYPRE_Real *a, HYPRE_Int *lda, HYPRE_Real *b, HYPRE_Int *ldb,
+                                  HYPRE_Real *w, HYPRE_Real *work, HYPRE_Int *lwork, HYPRE_Int *info)
 {
    hypre_dsygv(itype, jobz, uplo, n, a, lda, b, ldb, w, work, lwork, info);
    return 0;
 }
 
 static HYPRE_Int dpotrf_interface (const char *uplo, HYPRE_Int *n, HYPRE_Real *a, HYPRE_Int *
-                             lda, HYPRE_Int *info)
+                                   lda, HYPRE_Int *info)
 {
    hypre_dpotrf(uplo, n, a, lda, info);
    return 0;
@@ -120,26 +120,30 @@ lobpcg_clean( lobpcg_Data* data )
 HYPRE_Int
 hypre_LOBPCGDestroy( void *pcg_vdata )
 {
-	hypre_LOBPCGData      *pcg_data      = (hypre_LOBPCGData*)pcg_vdata;
+   hypre_LOBPCGData      *pcg_data      = (hypre_LOBPCGData*)pcg_vdata;
 
-   if (pcg_data) {
+   if (pcg_data)
+   {
       HYPRE_MatvecFunctions * mv = pcg_data->matvecFunctions;
-      if ( pcg_data->matvecData != NULL ) {
+      if ( pcg_data->matvecData != NULL )
+      {
          (*(mv->MatvecDestroy))(pcg_data->matvecData);
          pcg_data->matvecData = NULL;
       }
-      if ( pcg_data->matvecDataB != NULL ) {
+      if ( pcg_data->matvecDataB != NULL )
+      {
          (*(mv->MatvecDestroy))(pcg_data->matvecDataB);
          pcg_data->matvecDataB = NULL;
       }
-      if ( pcg_data->matvecDataT != NULL ) {
+      if ( pcg_data->matvecDataT != NULL )
+      {
          (*(mv->MatvecDestroy))(pcg_data->matvecDataT);
          pcg_data->matvecDataT = NULL;
       }
-    
+
       lobpcg_clean( &(pcg_data->lobpcgData) );
 
-      hypre_TFree( pcg_vdata , HYPRE_MEMORY_HOST);
+      hypre_TFree( pcg_vdata, HYPRE_MEMORY_HOST);
    }
 
    return hypre_error_flag;
@@ -150,20 +154,27 @@ hypre_LOBPCGSetup( void *pcg_vdata, void *A, void *b, void *x )
 {
    hypre_LOBPCGData *pcg_data = (hypre_LOBPCGData*)pcg_vdata;
    HYPRE_MatvecFunctions * mv = pcg_data->matvecFunctions;
-   HYPRE_Int  (*precond_setup)(void*,void*,void*,void*) = (pcg_data->precondFunctions).PrecondSetup;
+   HYPRE_Int  (*precond_setup)(void*, void*, void*, void*) = (pcg_data->precondFunctions).PrecondSetup;
    void *precond_data = (pcg_data->precondData);
 
    (pcg_data->A) = A;
 
    if ( pcg_data->matvecData != NULL )
+   {
       (*(mv->MatvecDestroy))(pcg_data->matvecData);
+   }
    (pcg_data->matvecData) = (*(mv->MatvecCreate))(A, x);
 
-   if ( precond_setup != NULL ) {
+   if ( precond_setup != NULL )
+   {
       if ( pcg_data->T == NULL )
+      {
          precond_setup(precond_data, A, b, x);
+      }
       else
+      {
          precond_setup(precond_data, pcg_data->T, b, x);
+      }
    }
 
    return hypre_error_flag;
@@ -178,12 +189,18 @@ hypre_LOBPCGSetupB( void *pcg_vdata, void *B, void *x )
    (pcg_data->B) = B;
 
    if ( pcg_data->matvecDataB != NULL )
+   {
       (*(mv->MatvecDestroy))(pcg_data -> matvecDataB);
+   }
    (pcg_data->matvecDataB) = (*(mv->MatvecCreate))(B, x);
    if ( B != NULL )
+   {
       (pcg_data->matvecDataB) = (*(mv->MatvecCreate))(B, x);
+   }
    else
+   {
       (pcg_data->matvecDataB) = NULL;
+   }
 
    return hypre_error_flag;
 }
@@ -197,11 +214,17 @@ hypre_LOBPCGSetupT( void *pcg_vdata, void *T, void *x )
    (pcg_data -> T) = T;
 
    if ( pcg_data->matvecDataT != NULL )
+   {
       (*(mv->MatvecDestroy))(pcg_data->matvecDataT);
+   }
    if ( T != NULL )
+   {
       (pcg_data->matvecDataT) = (*(mv->MatvecCreate))(T, x);
+   }
    else
+   {
       (pcg_data->matvecDataT) = NULL;
+   }
 
    return hypre_error_flag;
 }
@@ -209,48 +232,48 @@ hypre_LOBPCGSetupT( void *pcg_vdata, void *T, void *x )
 HYPRE_Int
 hypre_LOBPCGSetTol( void* pcg_vdata, HYPRE_Real tol )
 {
-   hypre_LOBPCGData *pcg_data	= (hypre_LOBPCGData*)pcg_vdata;
+   hypre_LOBPCGData *pcg_data = (hypre_LOBPCGData*)pcg_vdata;
 
    lobpcg_absoluteTolerance(pcg_data->lobpcgData) = tol;
- 
+
    return hypre_error_flag;
 }
 
 HYPRE_Int
 hypre_LOBPCGSetRTol( void* pcg_vdata, HYPRE_Real tol )
 {
-   hypre_LOBPCGData *pcg_data	= (hypre_LOBPCGData*) pcg_vdata;
+   hypre_LOBPCGData *pcg_data = (hypre_LOBPCGData*) pcg_vdata;
 
    lobpcg_relativeTolerance(pcg_data->lobpcgData) = tol;
- 
+
    return hypre_error_flag;
 }
 
 HYPRE_Int
 hypre_LOBPCGSetMaxIter( void* pcg_vdata, HYPRE_Int max_iter  )
 {
-   hypre_LOBPCGData *pcg_data	= (hypre_LOBPCGData*)pcg_vdata;
- 
+   hypre_LOBPCGData *pcg_data = (hypre_LOBPCGData*)pcg_vdata;
+
    lobpcg_maxIterations(pcg_data->lobpcgData) = max_iter;
- 
+
    return hypre_error_flag;
 }
 
 HYPRE_Int
 hypre_LOBPCGSetPrecondUsageMode( void* pcg_vdata, HYPRE_Int mode  )
 {
-   hypre_LOBPCGData *pcg_data	= (hypre_LOBPCGData*)pcg_vdata;
- 
+   hypre_LOBPCGData *pcg_data = (hypre_LOBPCGData*)pcg_vdata;
+
    lobpcg_precondUsageMode(pcg_data->lobpcgData) = mode;
- 
+
    return hypre_error_flag;
 }
 
 HYPRE_Int
 hypre_LOBPCGGetPrecond( void         *pcg_vdata,
-			HYPRE_Solver *precond_data_ptr )
+                        HYPRE_Solver *precond_data_ptr )
 {
-   hypre_LOBPCGData*	pcg_data	= (hypre_LOBPCGData*)pcg_vdata;
+   hypre_LOBPCGData* pcg_data = (hypre_LOBPCGData*)pcg_vdata;
 
    *precond_data_ptr = (HYPRE_Solver)(pcg_data -> precondData);
 
@@ -259,16 +282,16 @@ hypre_LOBPCGGetPrecond( void         *pcg_vdata,
 
 HYPRE_Int
 hypre_LOBPCGSetPrecond( void  *pcg_vdata,
-						HYPRE_Int  (*precond)(void*,void*,void*,void*),
-						HYPRE_Int  (*precond_setup)(void*,void*,void*,void*),
-			void  *precond_data )
+                        HYPRE_Int  (*precond)(void*, void*, void*, void*),
+                        HYPRE_Int  (*precond_setup)(void*, void*, void*, void*),
+                        void  *precond_data )
 {
    hypre_LOBPCGData* pcg_data = (hypre_LOBPCGData*)pcg_vdata;
- 
+
    (pcg_data->precondFunctions).Precond      = precond;
    (pcg_data->precondFunctions).PrecondSetup = precond_setup;
    (pcg_data->precondData)                   = precond_data;
- 
+
    return hypre_error_flag;
 }
 
@@ -276,9 +299,9 @@ HYPRE_Int
 hypre_LOBPCGSetPrintLevel( void *pcg_vdata, HYPRE_Int level )
 {
    hypre_LOBPCGData *pcg_data = (hypre_LOBPCGData*)pcg_vdata;
- 
+
    lobpcg_verbosityLevel(pcg_data->lobpcgData) = level;
- 
+
    return hypre_error_flag;
 }
 
@@ -287,22 +310,31 @@ hypre_LOBPCGPreconditioner( void *vdata, void* x, void* y )
 {
    hypre_LOBPCGData *data = (hypre_LOBPCGData*)vdata;
    mv_InterfaceInterpreter* ii = data->interpreter;
-   HYPRE_Int (*precond)(void*,void*,void*,void*) = (data->precondFunctions).Precond;
+   HYPRE_Int (*precond)(void*, void*, void*, void*) = (data->precondFunctions).Precond;
 
-   if ( precond == NULL ) {
-      (*(ii->CopyVector))(x,y);
+   if ( precond == NULL )
+   {
+      (*(ii->CopyVector))(x, y);
       return;
    }
 
    if ( lobpcg_precondUsageMode(data->lobpcgData) == 0 )
+   {
       (*(ii->ClearVector))(y);
+   }
    else
-      (*(ii->CopyVector))(x,y);
-  
+   {
+      (*(ii->CopyVector))(x, y);
+   }
+
    if ( data->T == NULL )
+   {
       precond(data->precondData, data->A, x, y);
+   }
    else
+   {
       precond(data->precondData, data->T, x, y);
+   }
 }
 
 void
@@ -310,7 +342,7 @@ hypre_LOBPCGOperatorA( void *pcg_vdata, void* x, void* y )
 {
    hypre_LOBPCGData*           pcg_data    = (hypre_LOBPCGData*)pcg_vdata;
    HYPRE_MatvecFunctions * mv = pcg_data->matvecFunctions;
-   void*	              	      matvec_data = (pcg_data -> matvecData);
+   void*                      matvec_data = (pcg_data -> matvecData);
 
    (*(mv->Matvec))(matvec_data, 1.0, pcg_data->A, x, 0.0, y);
 }
@@ -323,14 +355,15 @@ hypre_LOBPCGOperatorB( void *pcg_vdata, void* x, void* y )
    HYPRE_MatvecFunctions * mv = pcg_data->matvecFunctions;
    void*                       matvec_data = (pcg_data -> matvecDataB);
 
-   if ( pcg_data->B == NULL ) {
+   if ( pcg_data->B == NULL )
+   {
       (*(ii->CopyVector))(x, y);
 
       /* a test */
       /*
         (*(ii->ScaleVector))(2.0, y);
       */
- 
+
       return;
    }
 
@@ -341,8 +374,8 @@ void
 hypre_LOBPCGMultiPreconditioner( void *data, void * x, void*  y )
 {
    hypre_LOBPCGData *pcg_data = (hypre_LOBPCGData*)data;
-   mv_InterfaceInterpreter* ii = pcg_data->interpreter; 
-  
+   mv_InterfaceInterpreter* ii = pcg_data->interpreter;
+
    ii->Eval( hypre_LOBPCGPreconditioner, data, x, y );
 }
 
@@ -351,7 +384,7 @@ hypre_LOBPCGMultiOperatorA( void *data, void * x, void*  y )
 {
    hypre_LOBPCGData *pcg_data = (hypre_LOBPCGData*)data;
    mv_InterfaceInterpreter* ii = pcg_data->interpreter;
-  
+
    ii->Eval( hypre_LOBPCGOperatorA, data, x, y );
 }
 
@@ -360,20 +393,20 @@ hypre_LOBPCGMultiOperatorB( void *data, void * x, void*  y )
 {
    hypre_LOBPCGData *pcg_data = (hypre_LOBPCGData*)data;
    mv_InterfaceInterpreter* ii = pcg_data->interpreter;
-  
+
    ii->Eval( hypre_LOBPCGOperatorB, data, x, y );
 }
 
 HYPRE_Int
-hypre_LOBPCGSolve( void *vdata, 
-		   mv_MultiVectorPtr con, 
-		   mv_MultiVectorPtr vec, 
-		   HYPRE_Real* val )
+hypre_LOBPCGSolve( void *vdata,
+                   mv_MultiVectorPtr con,
+                   mv_MultiVectorPtr vec,
+                   HYPRE_Real* val )
 {
    hypre_LOBPCGData* data = (hypre_LOBPCGData*)vdata;
-   HYPRE_Int (*precond)(void*,void*,void*,void*) = (data->precondFunctions).Precond;
+   HYPRE_Int (*precond)(void*, void*, void*, void*) = (data->precondFunctions).Precond;
    void* opB = data->B;
-  
+
    void (*prec)( void*, void*, void* );
    void (*operatorA)( void*, void*, void* );
    void (*operatorB)( void*, void*, void* );
@@ -381,51 +414,59 @@ hypre_LOBPCGSolve( void *vdata,
    HYPRE_Int maxit = lobpcg_maxIterations(data->lobpcgData);
    HYPRE_Int verb  = lobpcg_verbosityLevel(data->lobpcgData);
 
-   HYPRE_Int n	= mv_MultiVectorWidth( vec );
+   HYPRE_Int n = mv_MultiVectorWidth( vec );
    lobpcg_BLASLAPACKFunctions blap_fn;
-   
+
    utilities_FortranMatrix* lambdaHistory;
    utilities_FortranMatrix* residuals;
    utilities_FortranMatrix* residualsHistory;
-  
-   lambdaHistory	= lobpcg_eigenvaluesHistory(data->lobpcgData);
+
+   lambdaHistory  = lobpcg_eigenvaluesHistory(data->lobpcgData);
    residuals = lobpcg_residualNorms(data->lobpcgData);
    residualsHistory = lobpcg_residualNormsHistory(data->lobpcgData);
 
-   utilities_FortranMatrixAllocateData( n, maxit + 1,	lambdaHistory );
-   utilities_FortranMatrixAllocateData( n, 1,		residuals );
-   utilities_FortranMatrixAllocateData( n, maxit + 1,	residualsHistory );
+   utilities_FortranMatrixAllocateData( n, maxit + 1, lambdaHistory );
+   utilities_FortranMatrixAllocateData( n, 1,      residuals );
+   utilities_FortranMatrixAllocateData( n, maxit + 1, residualsHistory );
 
    if ( precond != NULL )
+   {
       prec = hypre_LOBPCGMultiPreconditioner;
+   }
    else
+   {
       prec = NULL;
+   }
 
    operatorA = hypre_LOBPCGMultiOperatorA;
 
    if ( opB != NULL )
+   {
       operatorB = hypre_LOBPCGMultiOperatorB;
+   }
    else
+   {
       operatorB = NULL;
+   }
 
    blap_fn.dsygv = dsygv_interface;
    blap_fn.dpotrf = dpotrf_interface;
-  
-   lobpcg_solve( vec, 
-                 vdata, operatorA, 
+
+   lobpcg_solve( vec,
+                 vdata, operatorA,
                  vdata, operatorB,
                  vdata, prec,
                  con,
                  blap_fn,
                  lobpcg_tolerance(data->lobpcgData), maxit, verb,
                  &(lobpcg_iterationNumber(data->lobpcgData)),
-                 val, 
+                 val,
                  utilities_FortranMatrixValues(lambdaHistory),
                  utilities_FortranMatrixGlobalHeight(lambdaHistory),
                  utilities_FortranMatrixValues(residuals),
                  utilities_FortranMatrixValues(residualsHistory),
                  utilities_FortranMatrixGlobalHeight(residualsHistory)
-      );
+               );
 
    return hypre_error_flag;
 }
@@ -433,21 +474,21 @@ hypre_LOBPCGSolve( void *vdata,
 utilities_FortranMatrix*
 hypre_LOBPCGResidualNorms( void *vdata )
 {
-   hypre_LOBPCGData *data = (hypre_LOBPCGData*)vdata; 
+   hypre_LOBPCGData *data = (hypre_LOBPCGData*)vdata;
    return (lobpcg_residualNorms(data->lobpcgData));
 }
 
 utilities_FortranMatrix*
 hypre_LOBPCGResidualNormsHistory( void *vdata )
 {
-   hypre_LOBPCGData *data = (hypre_LOBPCGData*)vdata; 
+   hypre_LOBPCGData *data = (hypre_LOBPCGData*)vdata;
    return (lobpcg_residualNormsHistory(data->lobpcgData));
 }
 
 utilities_FortranMatrix*
 hypre_LOBPCGEigenvaluesHistory( void *vdata )
 {
-   hypre_LOBPCGData *data = (hypre_LOBPCGData*)vdata; 
+   hypre_LOBPCGData *data = (hypre_LOBPCGData*)vdata;
    return (lobpcg_eigenvaluesHistory(data->lobpcgData));
 }
 
@@ -460,7 +501,7 @@ hypre_LOBPCGIterations( void* vdata )
 
 
 HYPRE_Int
-HYPRE_LOBPCGCreate( mv_InterfaceInterpreter* ii, HYPRE_MatvecFunctions* mv, 
+HYPRE_LOBPCGCreate( mv_InterfaceInterpreter* ii, HYPRE_MatvecFunctions* mv,
                     HYPRE_Solver* solver )
 {
    hypre_LOBPCGData *pcg_data;
@@ -475,12 +516,12 @@ HYPRE_LOBPCGCreate( mv_InterfaceInterpreter* ii, HYPRE_MatvecFunctions* mv,
    (pcg_data->interpreter)               = ii;
    pcg_data->matvecFunctions             = mv;
 
-   (pcg_data->matvecData)	       	= NULL;
-   (pcg_data->B)	       			= NULL;
-   (pcg_data->matvecDataB)	       	= NULL;
-   (pcg_data->T)	       			= NULL;
-   (pcg_data->matvecDataT)	       	= NULL;
-   (pcg_data->precondData)	       	= NULL;
+   (pcg_data->matvecData)           = NULL;
+   (pcg_data->B)                 = NULL;
+   (pcg_data->matvecDataB)          = NULL;
+   (pcg_data->T)                 = NULL;
+   (pcg_data->matvecDataT)          = NULL;
+   (pcg_data->precondData)          = NULL;
 
    lobpcg_initialize( &(pcg_data->lobpcgData) );
 
@@ -489,66 +530,66 @@ HYPRE_LOBPCGCreate( mv_InterfaceInterpreter* ii, HYPRE_MatvecFunctions* mv,
    return hypre_error_flag;
 }
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_LOBPCGDestroy( HYPRE_Solver solver )
 {
-   return( hypre_LOBPCGDestroy( (void *) solver ) );
+   return ( hypre_LOBPCGDestroy( (void *) solver ) );
 }
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_LOBPCGSetup( HYPRE_Solver solver,
                    HYPRE_Matrix A,
                    HYPRE_Vector b,
                    HYPRE_Vector x      )
 {
-   return( hypre_LOBPCGSetup( solver, A, b, x ) );
+   return ( hypre_LOBPCGSetup( solver, A, b, x ) );
 }
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_LOBPCGSetupB( HYPRE_Solver solver,
                     HYPRE_Matrix B,
                     HYPRE_Vector x      )
 {
-   return( hypre_LOBPCGSetupB( solver, B, x ) );
+   return ( hypre_LOBPCGSetupB( solver, B, x ) );
 }
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_LOBPCGSetupT( HYPRE_Solver solver,
                     HYPRE_Matrix T,
                     HYPRE_Vector x      )
 {
-   return( hypre_LOBPCGSetupT( solver, T, x ) );
+   return ( hypre_LOBPCGSetupT( solver, T, x ) );
 }
 
-HYPRE_Int 
-HYPRE_LOBPCGSolve( HYPRE_Solver solver, mv_MultiVectorPtr con, 
-		   mv_MultiVectorPtr vec, HYPRE_Real* val )
+HYPRE_Int
+HYPRE_LOBPCGSolve( HYPRE_Solver solver, mv_MultiVectorPtr con,
+                   mv_MultiVectorPtr vec, HYPRE_Real* val )
 {
-   return( hypre_LOBPCGSolve( (void *) solver, con, vec, val ) );
+   return ( hypre_LOBPCGSolve( (void *) solver, con, vec, val ) );
 }
 
 HYPRE_Int
 HYPRE_LOBPCGSetTol( HYPRE_Solver solver, HYPRE_Real tol )
 {
-   return( hypre_LOBPCGSetTol( (void *) solver, tol ) );
+   return ( hypre_LOBPCGSetTol( (void *) solver, tol ) );
 }
 
 HYPRE_Int
 HYPRE_LOBPCGSetRTol( HYPRE_Solver solver, HYPRE_Real tol )
 {
-   return( hypre_LOBPCGSetRTol( (void *) solver, tol ) );
+   return ( hypre_LOBPCGSetRTol( (void *) solver, tol ) );
 }
 
 HYPRE_Int
 HYPRE_LOBPCGSetMaxIter( HYPRE_Solver solver, HYPRE_Int max_iter )
 {
-   return( hypre_LOBPCGSetMaxIter( (void *) solver, max_iter ) );
+   return ( hypre_LOBPCGSetMaxIter( (void *) solver, max_iter ) );
 }
 
 HYPRE_Int
 HYPRE_LOBPCGSetPrecondUsageMode( HYPRE_Solver solver, HYPRE_Int mode )
 {
-   return( hypre_LOBPCGSetPrecondUsageMode( (void *) solver, mode ) );
+   return ( hypre_LOBPCGSetPrecondUsageMode( (void *) solver, mode ) );
 }
 
 HYPRE_Int
@@ -557,24 +598,24 @@ HYPRE_LOBPCGSetPrecond( HYPRE_Solver         solver,
                         HYPRE_PtrToSolverFcn precond_setup,
                         HYPRE_Solver         precond_solver )
 {
-   return( hypre_LOBPCGSetPrecond( (void *) solver,
-                                   (HYPRE_Int (*)(void*, void*, void*, void*))precond,
-								   (HYPRE_Int (*)(void*, void*, void*, void*))precond_setup,
-                                   (void *) precond_solver ) );
+   return ( hypre_LOBPCGSetPrecond( (void *) solver,
+                                    (HYPRE_Int (*)(void*, void*, void*, void*))precond,
+                                    (HYPRE_Int (*)(void*, void*, void*, void*))precond_setup,
+                                    (void *) precond_solver ) );
 }
 
 HYPRE_Int
 HYPRE_LOBPCGGetPrecond( HYPRE_Solver  solver,
                         HYPRE_Solver *precond_data_ptr )
 {
-   return( hypre_LOBPCGGetPrecond( (void *)     solver,
-                                   (HYPRE_Solver *) precond_data_ptr ) );
+   return ( hypre_LOBPCGGetPrecond( (void *)     solver,
+                                    (HYPRE_Solver *) precond_data_ptr ) );
 }
 
 HYPRE_Int
 HYPRE_LOBPCGSetPrintLevel( HYPRE_Solver solver, HYPRE_Int level )
 {
-   return( hypre_LOBPCGSetPrintLevel( (void*)solver, level ) );
+   return ( hypre_LOBPCGSetPrintLevel( (void*)solver, level ) );
 }
 
 utilities_FortranMatrix*
diff --git a/external/hypre/src/krylov/HYPRE_lobpcg.h b/external/hypre/src/krylov/HYPRE_lobpcg.h
index 1b6e678d..fd70c3bd 100644
--- a/external/hypre/src/krylov/HYPRE_lobpcg.h
+++ b/external/hypre/src/krylov/HYPRE_lobpcg.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -26,11 +26,9 @@ extern "C" {
 /**
  * @defgroup Eigensolvers Eigensolvers
  *
- * These eigensolvers support many of the matrix/vector storage schemes in
- * hypre.  They should be used in conjunction with the storage-specific
- * interfaces.
- *
- * @memo A basic interface for eigensolvers
+ * A basic interface for eigensolvers. These eigensolvers support many of the
+ * matrix/vector storage schemes in hypre.  They should be used in conjunction
+ * with the storage-specific interfaces.
  *
  * @{
  **/
@@ -44,33 +42,6 @@ extern "C" {
  * @{
  **/
 
-#ifndef HYPRE_SOLVER_STRUCT
-#define HYPRE_SOLVER_STRUCT
-   struct hypre_Solver_struct;
-/**
- * The solver object.
- **/
-   typedef struct hypre_Solver_struct *HYPRE_Solver;
-#endif
-
-#ifndef HYPRE_MATRIX_STRUCT
-#define HYPRE_MATRIX_STRUCT
-   struct hypre_Matrix_struct;
-/**
- * The matrix object.
- **/
-   typedef struct hypre_Matrix_struct *HYPRE_Matrix;
-#endif
-
-#ifndef HYPRE_VECTOR_STRUCT
-#define HYPRE_VECTOR_STRUCT
-   struct hypre_Vector_struct;
-/**
- * The vector object.
- **/
-   typedef struct hypre_Vector_struct *HYPRE_Vector;
-#endif
-
 /**@}*/
 
 /*--------------------------------------------------------------------------
diff --git a/external/hypre/src/krylov/HYPRE_pcg.c b/external/hypre/src/krylov/HYPRE_pcg.c
index dd6348ae..02b7e4b1 100644
--- a/external/hypre/src/krylov/HYPRE_pcg.c
+++ b/external/hypre/src/krylov/HYPRE_pcg.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -25,32 +25,26 @@
  * HYPRE_PCGSetup
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_PCGSetup( HYPRE_Solver solver,
                 HYPRE_Matrix A,
                 HYPRE_Vector b,
                 HYPRE_Vector x )
 {
-   return( hypre_PCGSetup( solver,
-                           A,
-                           b,
-                           x ) );
+   return ( hypre_PCGSetup( solver, A, b, x ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_PCGSolve
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_PCGSolve( HYPRE_Solver solver,
                 HYPRE_Matrix A,
                 HYPRE_Vector b,
                 HYPRE_Vector x )
 {
-   return( hypre_PCGSolve( (void *) solver,
-                           (void *) A,
-                           (void *) b,
-                           (void *) x ) );
+   return ( hypre_PCGSolve( solver, A, b, x ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -61,14 +55,14 @@ HYPRE_Int
 HYPRE_PCGSetTol( HYPRE_Solver solver,
                  HYPRE_Real   tol )
 {
-   return( hypre_PCGSetTol( (void *) solver, tol ) );
+   return ( hypre_PCGSetTol( (void *) solver, tol ) );
 }
 
 HYPRE_Int
 HYPRE_PCGGetTol( HYPRE_Solver  solver,
                  HYPRE_Real   *tol )
 {
-   return( hypre_PCGGetTol( (void *) solver, tol ) );
+   return ( hypre_PCGGetTol( (void *) solver, tol ) );
 }
 /*--------------------------------------------------------------------------
  * HYPRE_PCGSetAbsoluteTol, HYPRE_PCGGetAbsoluteTol
@@ -78,14 +72,14 @@ HYPRE_Int
 HYPRE_PCGSetAbsoluteTol( HYPRE_Solver solver,
                          HYPRE_Real   a_tol )
 {
-   return( hypre_PCGSetAbsoluteTol( (void *) solver, a_tol ) );
+   return ( hypre_PCGSetAbsoluteTol( (void *) solver, a_tol ) );
 }
 
 HYPRE_Int
 HYPRE_PCGGetAbsoluteTol( HYPRE_Solver  solver,
                          HYPRE_Real   *a_tol )
 {
-   return( hypre_PCGGetAbsoluteTol( (void *) solver, a_tol ) );
+   return ( hypre_PCGGetAbsoluteTol( (void *) solver, a_tol ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -96,14 +90,14 @@ HYPRE_Int
 HYPRE_PCGSetResidualTol( HYPRE_Solver solver,
                          HYPRE_Real   rtol )
 {
-   return( hypre_PCGSetResidualTol( (void *) solver, rtol ) );
+   return ( hypre_PCGSetResidualTol( (void *) solver, rtol ) );
 }
 
 HYPRE_Int
 HYPRE_PCGGetResidualTol( HYPRE_Solver  solver,
                          HYPRE_Real   *rtol )
 {
-   return( hypre_PCGGetResidualTol( (void *) solver, rtol ) );
+   return ( hypre_PCGGetResidualTol( (void *) solver, rtol ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -114,14 +108,14 @@ HYPRE_Int
 HYPRE_PCGSetAbsoluteTolFactor( HYPRE_Solver solver,
                                HYPRE_Real   abstolf )
 {
-   return( hypre_PCGSetAbsoluteTolFactor( (void *) solver, abstolf ) );
+   return ( hypre_PCGSetAbsoluteTolFactor( (void *) solver, abstolf ) );
 }
 
 HYPRE_Int
 HYPRE_PCGGetAbsoluteTolFactor( HYPRE_Solver  solver,
                                HYPRE_Real   *abstolf )
 {
-   return( hypre_PCGGetAbsoluteTolFactor( (void *) solver, abstolf ) );
+   return ( hypre_PCGGetAbsoluteTolFactor( (void *) solver, abstolf ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -152,14 +146,14 @@ HYPRE_Int
 HYPRE_PCGSetMaxIter( HYPRE_Solver solver,
                      HYPRE_Int    max_iter )
 {
-   return( hypre_PCGSetMaxIter( (void *) solver, max_iter ) );
+   return ( hypre_PCGSetMaxIter( (void *) solver, max_iter ) );
 }
 
 HYPRE_Int
 HYPRE_PCGGetMaxIter( HYPRE_Solver  solver,
                      HYPRE_Int    *max_iter )
 {
-   return( hypre_PCGGetMaxIter( (void *) solver, max_iter ) );
+   return ( hypre_PCGGetMaxIter( (void *) solver, max_iter ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -170,14 +164,14 @@ HYPRE_Int
 HYPRE_PCGSetStopCrit( HYPRE_Solver solver,
                       HYPRE_Int    stop_crit )
 {
-   return( hypre_PCGSetStopCrit( (void *) solver, stop_crit ) );
+   return ( hypre_PCGSetStopCrit( (void *) solver, stop_crit ) );
 }
 
 HYPRE_Int
 HYPRE_PCGGetStopCrit( HYPRE_Solver  solver,
                       HYPRE_Int    *stop_crit )
 {
-   return( hypre_PCGGetStopCrit( (void *) solver, stop_crit ) );
+   return ( hypre_PCGGetStopCrit( (void *) solver, stop_crit ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -188,14 +182,14 @@ HYPRE_Int
 HYPRE_PCGSetTwoNorm( HYPRE_Solver solver,
                      HYPRE_Int    two_norm )
 {
-   return( hypre_PCGSetTwoNorm( (void *) solver, two_norm ) );
+   return ( hypre_PCGSetTwoNorm( (void *) solver, two_norm ) );
 }
 
 HYPRE_Int
 HYPRE_PCGGetTwoNorm( HYPRE_Solver  solver,
                      HYPRE_Int    *two_norm )
 {
-   return( hypre_PCGGetTwoNorm( (void *) solver, two_norm ) );
+   return ( hypre_PCGGetTwoNorm( (void *) solver, two_norm ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -206,14 +200,14 @@ HYPRE_Int
 HYPRE_PCGSetRelChange( HYPRE_Solver solver,
                        HYPRE_Int    rel_change )
 {
-   return( hypre_PCGSetRelChange( (void *) solver, rel_change ) );
+   return ( hypre_PCGSetRelChange( (void *) solver, rel_change ) );
 }
 
 HYPRE_Int
 HYPRE_PCGGetRelChange( HYPRE_Solver  solver,
                        HYPRE_Int    *rel_change )
 {
-   return( hypre_PCGGetRelChange( (void *) solver, rel_change ) );
+   return ( hypre_PCGGetRelChange( (void *) solver, rel_change ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -224,14 +218,14 @@ HYPRE_Int
 HYPRE_PCGSetRecomputeResidual( HYPRE_Solver solver,
                                HYPRE_Int    recompute_residual )
 {
-   return( hypre_PCGSetRecomputeResidual( (void *) solver, recompute_residual ) );
+   return ( hypre_PCGSetRecomputeResidual( (void *) solver, recompute_residual ) );
 }
 
 HYPRE_Int
 HYPRE_PCGGetRecomputeResidual( HYPRE_Solver  solver,
                                HYPRE_Int    *recompute_residual )
 {
-   return( hypre_PCGGetRecomputeResidual( (void *) solver, recompute_residual ) );
+   return ( hypre_PCGGetRecomputeResidual( (void *) solver, recompute_residual ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -242,14 +236,50 @@ HYPRE_Int
 HYPRE_PCGSetRecomputeResidualP( HYPRE_Solver solver,
                                 HYPRE_Int    recompute_residual_p )
 {
-   return( hypre_PCGSetRecomputeResidualP( (void *) solver, recompute_residual_p ) );
+   return ( hypre_PCGSetRecomputeResidualP( (void *) solver, recompute_residual_p ) );
 }
 
 HYPRE_Int
 HYPRE_PCGGetRecomputeResidualP( HYPRE_Solver  solver,
                                 HYPRE_Int    *recompute_residual_p )
 {
-   return( hypre_PCGGetRecomputeResidualP( (void *) solver, recompute_residual_p ) );
+   return ( hypre_PCGGetRecomputeResidualP( (void *) solver, recompute_residual_p ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_PCGSetSkipBreak, HYPRE_PCGGetSkipBreak
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_PCGSetSkipBreak( HYPRE_Solver solver,
+                       HYPRE_Int    skip_break )
+{
+   return ( hypre_PCGSetSkipBreak( (void *) solver, skip_break ) );
+}
+
+HYPRE_Int
+HYPRE_PCGGetSkipBreak( HYPRE_Solver  solver,
+                       HYPRE_Int    *skip_break )
+{
+   return ( hypre_PCGGetSkipBreak( (void *) solver, skip_break ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_PCGSetFlex, HYPRE_PCGGetFlex
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_PCGSetFlex( HYPRE_Solver solver,
+                  HYPRE_Int    flex )
+{
+   return ( hypre_PCGSetFlex( (void *) solver, flex ) );
+}
+
+HYPRE_Int
+HYPRE_PCGGetFlex( HYPRE_Solver  solver,
+                  HYPRE_Int    *flex )
+{
+   return ( hypre_PCGGetFlex( (void *) solver, flex ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -262,10 +292,22 @@ HYPRE_PCGSetPrecond( HYPRE_Solver         solver,
                      HYPRE_PtrToSolverFcn precond_setup,
                      HYPRE_Solver         precond_solver )
 {
-   return( hypre_PCGSetPrecond( (void *) solver,
-                                (HYPRE_Int (*)(void*, void*, void*, void*))precond,
-								(HYPRE_Int (*)(void*, void*, void*, void*))precond_setup,
-                                (void *) precond_solver ) );
+   return ( hypre_PCGSetPrecond( (void *) solver,
+                                 (HYPRE_Int (*)(void*, void*, void*, void*))precond,
+                                 (HYPRE_Int (*)(void*, void*, void*, void*))precond_setup,
+                                 (void *) precond_solver ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_PCGSetPreconditioner
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_PCGSetPreconditioner( HYPRE_Solver  solver,
+                            HYPRE_Solver  precond_solver )
+{
+   return ( hypre_PCGSetPreconditioner( (void *) solver,
+                                        (void *) precond_solver ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -276,8 +318,8 @@ HYPRE_Int
 HYPRE_PCGGetPrecond( HYPRE_Solver  solver,
                      HYPRE_Solver *precond_data_ptr )
 {
-   return( hypre_PCGGetPrecond( (void *)     solver,
-                                (HYPRE_Solver *) precond_data_ptr ) );
+   return ( hypre_PCGGetPrecond( (void *)     solver,
+                                 (HYPRE_Solver *) precond_data_ptr ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -308,14 +350,14 @@ HYPRE_Int
 HYPRE_PCGSetPrintLevel( HYPRE_Solver solver,
                         HYPRE_Int    level )
 {
-   return( hypre_PCGSetPrintLevel( (void *) solver, level ) );
+   return ( hypre_PCGSetPrintLevel( (void *) solver, level ) );
 }
 
 HYPRE_Int
 HYPRE_PCGGetPrintLevel( HYPRE_Solver  solver,
                         HYPRE_Int    *level )
 {
-   return( hypre_PCGGetPrintLevel( (void *) solver, level ) );
+   return ( hypre_PCGGetPrintLevel( (void *) solver, level ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -326,7 +368,7 @@ HYPRE_Int
 HYPRE_PCGGetNumIterations( HYPRE_Solver  solver,
                            HYPRE_Int    *num_iterations )
 {
-   return( hypre_PCGGetNumIterations( (void *) solver, num_iterations ) );
+   return ( hypre_PCGGetNumIterations( (void *) solver, num_iterations ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -337,7 +379,7 @@ HYPRE_Int
 HYPRE_PCGGetConverged( HYPRE_Solver  solver,
                        HYPRE_Int    *converged )
 {
-   return( hypre_PCGGetConverged( (void *) solver, converged ) );
+   return ( hypre_PCGGetConverged( (void *) solver, converged ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -348,7 +390,7 @@ HYPRE_Int
 HYPRE_PCGGetFinalRelativeResidualNorm( HYPRE_Solver  solver,
                                        HYPRE_Real   *norm )
 {
-   return( hypre_PCGGetFinalRelativeResidualNorm( (void *) solver, norm ) );
+   return ( hypre_PCGGetFinalRelativeResidualNorm( (void *) solver, norm ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -361,4 +403,3 @@ HYPRE_Int HYPRE_PCGGetResidual( HYPRE_Solver   solver,
    /* returns a pointer to the residual vector */
    return hypre_PCGGetResidual( (void *) solver, (void **) residual );
 }
-
diff --git a/external/hypre/src/krylov/bicgstab.c b/external/hypre/src/krylov/bicgstab.c
index ed9cc013..42c5efc7 100644
--- a/external/hypre/src/krylov/bicgstab.c
+++ b/external/hypre/src/krylov/bicgstab.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -22,24 +22,24 @@ hypre_BiCGSTABFunctions *
 hypre_BiCGSTABFunctionsCreate(
    void *     (*CreateVector)  ( void *vvector ),
    HYPRE_Int  (*DestroyVector) ( void *vvector ),
-   void *     (*MatvecCreate)  ( void *A , void *x ),
-   HYPRE_Int  (*Matvec)        ( void *matvec_data , HYPRE_Complex alpha , void *A ,
-                                 void *x , HYPRE_Complex beta , void *y ),
+   void *     (*MatvecCreate)  ( void *A, void *x ),
+   HYPRE_Int  (*Matvec)        ( void *matvec_data, HYPRE_Complex alpha, void *A,
+                                 void *x, HYPRE_Complex beta, void *y ),
    HYPRE_Int  (*MatvecDestroy) ( void *matvec_data ),
-   HYPRE_Real (*InnerProd)     ( void *x , void *y ),
-   HYPRE_Int  (*CopyVector)    ( void *x , void *y ),
+   HYPRE_Real (*InnerProd)     ( void *x, void *y ),
+   HYPRE_Int  (*CopyVector)    ( void *x, void *y ),
    HYPRE_Int  (*ClearVector)   ( void *x ),
-   HYPRE_Int  (*ScaleVector)   ( HYPRE_Complex alpha , void *x ),
-   HYPRE_Int  (*Axpy)          ( HYPRE_Complex alpha , void *x , void *y ),
-   HYPRE_Int  (*CommInfo)      ( void *A , HYPRE_Int *my_id ,
+   HYPRE_Int  (*ScaleVector)   ( HYPRE_Complex alpha, void *x ),
+   HYPRE_Int  (*Axpy)          ( HYPRE_Complex alpha, void *x, void *y ),
+   HYPRE_Int  (*CommInfo)      ( void *A, HYPRE_Int *my_id,
                                  HYPRE_Int *num_procs ),
    HYPRE_Int  (*PrecondSetup)  ( void *vdata, void *A, void *b, void *x ),
    HYPRE_Int  (*Precond)       ( void *vdata, void *A, void *b, void *x )
-   )
+)
 {
    hypre_BiCGSTABFunctions * bicgstab_functions;
    bicgstab_functions = (hypre_BiCGSTABFunctions *)
-      hypre_CTAlloc( hypre_BiCGSTABFunctions,  1 , HYPRE_MEMORY_HOST);
+                        hypre_CTAlloc( hypre_BiCGSTABFunctions,  1, HYPRE_MEMORY_HOST);
 
    bicgstab_functions->CreateVector = CreateVector;
    bicgstab_functions->DestroyVector = DestroyVector;
@@ -112,7 +112,9 @@ hypre_BiCGSTABDestroy( void *bicgstab_vdata )
    {
       hypre_BiCGSTABFunctions *bicgstab_functions = bicgstab_data->functions;
       if ( (bicgstab_data -> norms) != NULL )
-            hypre_TFree(bicgstab_data -> norms, HYPRE_MEMORY_HOST);
+      {
+         hypre_TFree(bicgstab_data -> norms, HYPRE_MEMORY_HOST);
+      }
 
       (*(bicgstab_functions->MatvecDestroy))(bicgstab_data -> matvec_data);
 
@@ -129,7 +131,7 @@ hypre_BiCGSTABDestroy( void *bicgstab_vdata )
 
    HYPRE_ANNOTATE_FUNC_END;
 
-   return(hypre_error_flag);
+   return (hypre_error_flag);
 }
 
 /*--------------------------------------------------------------------------
@@ -138,15 +140,16 @@ hypre_BiCGSTABDestroy( void *bicgstab_vdata )
 
 HYPRE_Int
 hypre_BiCGSTABSetup( void *bicgstab_vdata,
-                  void *A,
-                  void *b,
-                  void *x         )
+                     void *A,
+                     void *b,
+                     void *x         )
 {
    hypre_BiCGSTABData      *bicgstab_data      = (hypre_BiCGSTABData *)bicgstab_vdata;
    hypre_BiCGSTABFunctions *bicgstab_functions = bicgstab_data->functions;
 
    HYPRE_Int            max_iter         = (bicgstab_data -> max_iter);
-   HYPRE_Int          (*precond_setup)(void*,void*,void*,void*) = (bicgstab_functions -> precond_setup);
+   HYPRE_Int          (*precond_setup)(void*, void*, void*,
+                                       void*) = (bicgstab_functions -> precond_setup);
    void          *precond_data     = (bicgstab_data -> precond_data);
 
    HYPRE_ANNOTATE_FUNC_BEGIN;
@@ -160,17 +163,29 @@ hypre_BiCGSTABSetup( void *bicgstab_vdata,
     *--------------------------------------------------*/
 
    if ((bicgstab_data -> p) == NULL)
+   {
       (bicgstab_data -> p) = (*(bicgstab_functions->CreateVector))(b);
+   }
    if ((bicgstab_data -> q) == NULL)
+   {
       (bicgstab_data -> q) = (*(bicgstab_functions->CreateVector))(b);
+   }
    if ((bicgstab_data -> r) == NULL)
+   {
       (bicgstab_data -> r) = (*(bicgstab_functions->CreateVector))(b);
+   }
    if ((bicgstab_data -> r0) == NULL)
+   {
       (bicgstab_data -> r0) = (*(bicgstab_functions->CreateVector))(b);
+   }
    if ((bicgstab_data -> s) == NULL)
+   {
       (bicgstab_data -> s) = (*(bicgstab_functions->CreateVector))(b);
+   }
    if ((bicgstab_data -> v) == NULL)
+   {
       (bicgstab_data -> v) = (*(bicgstab_functions->CreateVector))(b);
+   }
 
    if ((bicgstab_data -> matvec_data) == NULL)
       (bicgstab_data -> matvec_data) =
@@ -182,16 +197,20 @@ hypre_BiCGSTABSetup( void *bicgstab_vdata,
     * Allocate space for log info
     *-----------------------------------------------------*/
 
-   if ((bicgstab_data->logging)>0 || (bicgstab_data->print_level) > 0)
+   if ((bicgstab_data->logging) > 0 || (bicgstab_data->print_level) > 0)
    {
       if ((bicgstab_data -> norms) != NULL)
+      {
          hypre_TFree (bicgstab_data -> norms, HYPRE_MEMORY_HOST);
+      }
       (bicgstab_data -> norms) = hypre_CTAlloc(HYPRE_Real,  max_iter + 1, HYPRE_MEMORY_HOST);
    }
    if ((bicgstab_data -> print_level) > 0)
    {
       if ((bicgstab_data -> log_file_name) == NULL)
-		  (bicgstab_data -> log_file_name) = (char*)"bicgstab.out.log";
+      {
+         (bicgstab_data -> log_file_name) = (char*)"bicgstab.out.log";
+      }
    }
 
    HYPRE_ANNOTATE_FUNC_END;
@@ -205,19 +224,19 @@ hypre_BiCGSTABSetup( void *bicgstab_vdata,
 
 HYPRE_Int
 hypre_BiCGSTABSolve(void  *bicgstab_vdata,
-                 void  *A,
-                 void  *b,
-		 void  *x)
+                    void  *A,
+                    void  *b,
+                    void  *x)
 {
    hypre_BiCGSTABData      *bicgstab_data      = (hypre_BiCGSTABData*)bicgstab_vdata;
    hypre_BiCGSTABFunctions *bicgstab_functions = bicgstab_data->functions;
 
    HYPRE_Int               min_iter     = (bicgstab_data -> min_iter);
-   HYPRE_Int 		     max_iter     = (bicgstab_data -> max_iter);
-   HYPRE_Int 		     stop_crit    = (bicgstab_data -> stop_crit);
-   HYPRE_Int 		     hybrid    = (bicgstab_data -> hybrid);
-   HYPRE_Real 	     r_tol     = (bicgstab_data -> tol);
-   HYPRE_Real 	     cf_tol       = (bicgstab_data -> cf_tol);
+   HYPRE_Int           max_iter     = (bicgstab_data -> max_iter);
+   HYPRE_Int           stop_crit    = (bicgstab_data -> stop_crit);
+   HYPRE_Int           hybrid    = (bicgstab_data -> hybrid);
+   HYPRE_Real       r_tol     = (bicgstab_data -> tol);
+   HYPRE_Real       cf_tol       = (bicgstab_data -> cf_tol);
    void             *matvec_data  = (bicgstab_data -> matvec_data);
    HYPRE_Real        a_tol        = (bicgstab_data -> a_tol);
 
@@ -230,8 +249,8 @@ hypre_BiCGSTABSolve(void  *bicgstab_vdata,
    void             *p            = (bicgstab_data -> p);
    void             *q            = (bicgstab_data -> q);
 
-   HYPRE_Int 	           (*precond)(void*,void*,void*,void*)   = (bicgstab_functions -> precond);
-   HYPRE_Int 	            *precond_data = (HYPRE_Int*)(bicgstab_data -> precond_data);
+   HYPRE_Int              (*precond)(void*, void*, void*, void*)   = (bicgstab_functions -> precond);
+   HYPRE_Int               *precond_data = (HYPRE_Int*)(bicgstab_data -> precond_data);
 
    /* logging variables */
    HYPRE_Int             logging        = (bicgstab_data -> logging);
@@ -257,7 +276,7 @@ hypre_BiCGSTABSolve(void  *bicgstab_vdata,
 
    (bicgstab_data -> converged) = 0;
 
-   (*(bicgstab_functions->CommInfo))(A,&my_id,&num_procs);
+   (*(bicgstab_functions->CommInfo))(A, &my_id, &num_procs);
    if (logging > 0 || print_level > 0)
    {
       norms          = (bicgstab_data -> norms);
@@ -266,19 +285,19 @@ hypre_BiCGSTABSolve(void  *bicgstab_vdata,
    }
 
    /* initialize work arrays */
-   (*(bicgstab_functions->CopyVector))(b,r0);
+   (*(bicgstab_functions->CopyVector))(b, r0);
 
    /* compute initial residual */
 
-   (*(bicgstab_functions->Matvec))(matvec_data,-1.0, A, x, 1.0, r0);
-   (*(bicgstab_functions->CopyVector))(r0,r);
-   (*(bicgstab_functions->CopyVector))(r0,p);
+   (*(bicgstab_functions->Matvec))(matvec_data, -1.0, A, x, 1.0, r0);
+   (*(bicgstab_functions->CopyVector))(r0, r);
+   (*(bicgstab_functions->CopyVector))(r0, p);
 
-   b_norm = sqrt((*(bicgstab_functions->InnerProd))(b,b));
+   b_norm = hypre_sqrt((*(bicgstab_functions->InnerProd))(b, b));
 
-   /* Since it is does not diminish performance, attempt to return an error flag
+   /* Since it does not diminish performance, attempt to return an error flag
       and notify users when they supply bad input. */
-   if (b_norm != 0.) ieee_check = b_norm/b_norm; /* INF -> NaN conversion */
+   if (b_norm != 0.) { ieee_check = b_norm / b_norm; } /* INF -> NaN conversion */
    if (ieee_check != ieee_check)
    {
       /* ...INFs or NaNs in input can make ieee_check a NaN.  This test
@@ -288,11 +307,11 @@ hypre_BiCGSTABSolve(void  *bicgstab_vdata,
          found at http://HTTP.CS.Berkeley.EDU/~wkahan/ieee754status/IEEE754.PDF */
       if (logging > 0 || print_level > 0)
       {
-        hypre_printf("\n\nERROR detected by Hypre ...  BEGIN\n");
-        hypre_printf("ERROR -- hypre_BiCGSTABSolve: INFs and/or NaNs detected in input.\n");
-        hypre_printf("User probably placed non-numerics in supplied b.\n");
-        hypre_printf("Returning error flag += 101.  Program not terminated.\n");
-        hypre_printf("ERROR detected by Hypre ...  END\n\n\n");
+         hypre_printf("\n\nERROR detected by Hypre ...  BEGIN\n");
+         hypre_printf("ERROR -- hypre_BiCGSTABSolve: INFs and/or NaNs detected in input.\n");
+         hypre_printf("User probably placed non-numerics in supplied b.\n");
+         hypre_printf("Returning error flag += 101.  Program not terminated.\n");
+         hypre_printf("ERROR detected by Hypre ...  END\n\n\n");
       }
       hypre_error(HYPRE_ERROR_GENERIC);
       HYPRE_ANNOTATE_FUNC_END;
@@ -300,13 +319,13 @@ hypre_BiCGSTABSolve(void  *bicgstab_vdata,
       return hypre_error_flag;
    }
 
-   res = (*(bicgstab_functions->InnerProd))(r0,r0);
-   r_norm = sqrt(res);
+   res = (*(bicgstab_functions->InnerProd))(r0, r0);
+   r_norm = hypre_sqrt(res);
    r_norm_0 = r_norm;
 
-   /* Since it is does not diminish performance, attempt to return an error flag
+   /* Since it does not diminish performance, attempt to return an error flag
       and notify users when they supply bad input. */
-   if (r_norm != 0.) ieee_check = r_norm/r_norm; /* INF -> NaN conversion */
+   if (r_norm != 0.) { ieee_check = r_norm / r_norm; } /* INF -> NaN conversion */
    if (ieee_check != ieee_check)
    {
       /* ...INFs or NaNs in input can make ieee_check a NaN.  This test
@@ -316,11 +335,11 @@ hypre_BiCGSTABSolve(void  *bicgstab_vdata,
          found at http://HTTP.CS.Berkeley.EDU/~wkahan/ieee754status/IEEE754.PDF */
       if (logging > 0 || print_level > 0)
       {
-        hypre_printf("\n\nERROR detected by Hypre ...  BEGIN\n");
-        hypre_printf("ERROR -- hypre_BiCGSTABSolve: INFs and/or NaNs detected in input.\n");
-        hypre_printf("User probably placed non-numerics in supplied A or x_0.\n");
-        hypre_printf("Returning error flag += 101.  Program not terminated.\n");
-        hypre_printf("ERROR detected by Hypre ...  END\n\n\n");
+         hypre_printf("\n\nERROR detected by Hypre ...  BEGIN\n");
+         hypre_printf("ERROR -- hypre_BiCGSTABSolve: INFs and/or NaNs detected in input.\n");
+         hypre_printf("User probably placed non-numerics in supplied A or x_0.\n");
+         hypre_printf("Returning error flag += 101.  Program not terminated.\n");
+         hypre_printf("ERROR detected by Hypre ...  END\n\n\n");
       }
 
       hypre_error(HYPRE_ERROR_GENERIC);
@@ -334,9 +353,11 @@ hypre_BiCGSTABSolve(void  *bicgstab_vdata,
       norms[0] = r_norm;
       if (print_level > 0 && my_id == 0)
       {
-   	     hypre_printf("L2 norm of b: %e\n", b_norm);
+         hypre_printf("L2 norm of b: %e\n", b_norm);
          if (b_norm == 0.0)
+         {
             hypre_printf("Rel_resid_norm actually contains the residual norm\n");
+         }
          hypre_printf("Initial L2 norm of residual: %e\n", r_norm);
       }
    }
@@ -359,9 +380,13 @@ hypre_BiCGSTABSolve(void  *bicgstab_vdata,
       if (a_tol == 0.0) /* this is for backwards compatibility
                            (accomodating setting stop_crit to 1, but not setting a_tol) -
                            eventually we will get rid of the stop_crit flag as with GMRES */
+      {
          epsilon = r_tol;
+      }
       else
-         epsilon = a_tol; /* this means new interface fcn called */
+      {
+         epsilon = a_tol;   /* this means new interface fcn called */
+      }
 
    }
    else /* default convergence test (stop_crit = 0)*/
@@ -373,7 +398,7 @@ hypre_BiCGSTABSolve(void  *bicgstab_vdata,
             user also specifies a_tol or sets r_tol = 0.0, which means absolute
             tol only is checked  */
 
-      epsilon = hypre_max(a_tol, r_tol*den_norm);
+      epsilon = hypre_max(a_tol, r_tol * den_norm);
 
    }
 
@@ -381,153 +406,171 @@ hypre_BiCGSTABSolve(void  *bicgstab_vdata,
    if (print_level > 0 && my_id == 0)
    {
       if (b_norm > 0.0)
-         {hypre_printf("=============================================\n\n");
-          hypre_printf("Iters     resid.norm     conv.rate  rel.res.norm\n");
-          hypre_printf("-----    ------------    ---------- ------------\n");
+      {
+         hypre_printf("=============================================\n\n");
+         hypre_printf("Iters     resid.norm     conv.rate  rel.res.norm\n");
+         hypre_printf("-----    ------------    ---------- ------------\n");
       }
       else
-         {hypre_printf("=============================================\n\n");
-          hypre_printf("Iters     resid.norm     conv.rate\n");
-          hypre_printf("-----    ------------    ----------\n");
+      {
+         hypre_printf("=============================================\n\n");
+         hypre_printf("Iters     resid.norm     conv.rate\n");
+         hypre_printf("-----    ------------    ----------\n");
 
       }
    }
 
    (bicgstab_data -> num_iterations) = iter;
    if (b_norm > 0.0)
-      (bicgstab_data -> rel_residual_norm) = r_norm/b_norm;
+   {
+      (bicgstab_data -> rel_residual_norm) = r_norm / b_norm;
+   }
    /* check for convergence before starting */
    if (r_norm == 0.0)
    {
-       HYPRE_ANNOTATE_FUNC_END;
-       return hypre_error_flag;
+      HYPRE_ANNOTATE_FUNC_END;
+      return hypre_error_flag;
    }
    else if (r_norm <= epsilon && iter >= min_iter)
    {
-       if (print_level > 0 && my_id == 0)
-       {
-          hypre_printf("\n\n");
-          hypre_printf("Tolerance and min_iter requirements satisfied by initial data.\n");
-          hypre_printf("Final L2 norm of residual: %e\n\n", r_norm);
-       }
-       (bicgstab_data -> converged) = 1;
-       HYPRE_ANNOTATE_FUNC_END;
-
-       return hypre_error_flag;
+      if (print_level > 0 && my_id == 0)
+      {
+         hypre_printf("\n\n");
+         hypre_printf("Tolerance and min_iter requirements satisfied by initial data.\n");
+         hypre_printf("Final L2 norm of residual: %e\n\n", r_norm);
+      }
+      (bicgstab_data -> converged) = 1;
+      HYPRE_ANNOTATE_FUNC_END;
+
+      return hypre_error_flag;
    }
    /* Start BiCGStab iterations */
    while (iter < max_iter)
    {
-        iter++;
-
-	(*(bicgstab_functions->ClearVector))(v);
-        precond(precond_data, A, p, v);
-        (*(bicgstab_functions->Matvec))(matvec_data,1.0,A,v,0.0,q);
-      	temp = (*(bicgstab_functions->InnerProd))(r0,q);
-      	if (fabs(temp) >= epsmac)
-	   alpha = res/temp;
-	else
-	{
-	   hypre_error_w_msg(HYPRE_ERROR_GENERIC,"BiCGSTAB broke down!! divide by near zero\n");
-           HYPRE_ANNOTATE_FUNC_END;
-
-	   return hypre_error_flag;
-	}
-	(*(bicgstab_functions->Axpy))(alpha,v,x);
-	(*(bicgstab_functions->Axpy))(-alpha,q,r);
-	(*(bicgstab_functions->ClearVector))(v);
-        precond(precond_data, A, r, v);
-        (*(bicgstab_functions->Matvec))(matvec_data,1.0,A,v,0.0,s);
-      	/* Handle case when gamma = 0.0/0.0 as 0.0 and not NAN */
-        gamma_numer = (*(bicgstab_functions->InnerProd))(r,s);
-        gamma_denom = (*(bicgstab_functions->InnerProd))(s,s);
-        if ((gamma_numer == 0.0) && (gamma_denom == 0.0))
-            gamma = 0.0;
-        else
-            gamma= gamma_numer/gamma_denom;
-	(*(bicgstab_functions->Axpy))(gamma,v,x);
-	(*(bicgstab_functions->Axpy))(-gamma,s,r);
-    /* residual is now updated, must immediately check for convergence */
-	r_norm = sqrt((*(bicgstab_functions->InnerProd))(r,r));
-	if (logging > 0 || print_level > 0)
-	{
-	   norms[iter] = r_norm;
-	}
-        if (print_level > 0 && my_id == 0)
-        {
-           if (b_norm > 0.0)
-              hypre_printf("% 5d    %e    %f   %e\n", iter, norms[iter],
-                      norms[iter]/norms[iter-1], norms[iter]/b_norm);
-           else
-              hypre_printf("% 5d    %e    %f\n", iter, norms[iter],
-		                             norms[iter]/norms[iter-1]);
-	}
-    /* check for convergence, evaluate actual residual */
-	if (r_norm <= epsilon && iter >= min_iter)
-        {
-	   (*(bicgstab_functions->CopyVector))(b,r);
-           (*(bicgstab_functions->Matvec))(matvec_data,-1.0,A,x,1.0,r);
-	   r_norm = sqrt((*(bicgstab_functions->InnerProd))(r,r));
-	   if (r_norm <= epsilon)
-           {
-              if (print_level > 0 && my_id == 0)
-              {
-                 hypre_printf("\n\n");
-                 hypre_printf("Final L2 norm of residual: %e\n\n", r_norm);
-              }
-              (bicgstab_data -> converged) = 1;
-              break;
-          }
-       }
-    /*--------------------------------------------------------------------
-     * Optional test to see if adequate progress is being made.
-     * The average convergence factor is recorded and compared
-     * against the tolerance 'cf_tol'. The weighting factor is
-     * intended to pay more attention to the test when an accurate
-     * estimate for average convergence factor is available.
-     *--------------------------------------------------------------------*/
-       if (cf_tol > 0.0)
-       {
-          cf_ave_0 = cf_ave_1;
-          cf_ave_1 = pow( r_norm / r_norm_0, 1.0/(2.0*iter));
-
-          weight   = fabs(cf_ave_1 - cf_ave_0);
-          weight   = weight / hypre_max(cf_ave_1, cf_ave_0);
-          weight   = 1.0 - weight;
-          if (weight * cf_ave_1 > cf_tol) break;
-       }
-
-       if (fabs(res) >= epsmac)
-          beta = 1.0/res;
-       else
-       {
-	  hypre_error_w_msg(HYPRE_ERROR_GENERIC,"BiCGSTAB broke down!! res=0 \n");
-          HYPRE_ANNOTATE_FUNC_END;
-
-	  return hypre_error_flag;
-       }
-       res = (*(bicgstab_functions->InnerProd))(r0,r);
-       beta *= res;
-       (*(bicgstab_functions->Axpy))(-gamma,q,p);
-       if (fabs(gamma) >= epsmac)
-           (*(bicgstab_functions->ScaleVector))((beta*alpha/gamma),p);
-       else
-       {
-	  hypre_error_w_msg(HYPRE_ERROR_GENERIC,"BiCGSTAB broke down!! gamma=0 \n");
-          HYPRE_ANNOTATE_FUNC_END;
-
-	  return hypre_error_flag;
-       }
-       (*(bicgstab_functions->Axpy))(1.0,r,p);
+      iter++;
+
+      (*(bicgstab_functions->ClearVector))(v);
+      precond(precond_data, A, p, v);
+      (*(bicgstab_functions->Matvec))(matvec_data, 1.0, A, v, 0.0, q);
+      temp = (*(bicgstab_functions->InnerProd))(r0, q);
+      if (hypre_abs(temp) >= epsmac)
+      {
+         alpha = res / temp;
+      }
+      else
+      {
+         hypre_error_w_msg(HYPRE_ERROR_GENERIC, "BiCGSTAB broke down!! divide by near zero\n");
+         HYPRE_ANNOTATE_FUNC_END;
+
+         return hypre_error_flag;
+      }
+      (*(bicgstab_functions->Axpy))(alpha, v, x);
+      (*(bicgstab_functions->Axpy))(-alpha, q, r);
+      (*(bicgstab_functions->ClearVector))(v);
+      precond(precond_data, A, r, v);
+      (*(bicgstab_functions->Matvec))(matvec_data, 1.0, A, v, 0.0, s);
+      /* Handle case when gamma = 0.0/0.0 as 0.0 and not NAN */
+      gamma_numer = (*(bicgstab_functions->InnerProd))(r, s);
+      gamma_denom = (*(bicgstab_functions->InnerProd))(s, s);
+      if ((gamma_numer == 0.0) && (gamma_denom == 0.0))
+      {
+         gamma = 0.0;
+      }
+      else
+      {
+         gamma = gamma_numer / gamma_denom;
+      }
+      (*(bicgstab_functions->Axpy))(gamma, v, x);
+      (*(bicgstab_functions->Axpy))(-gamma, s, r);
+      /* residual is now updated, must immediately check for convergence */
+      r_norm = hypre_sqrt((*(bicgstab_functions->InnerProd))(r, r));
+      if (logging > 0 || print_level > 0)
+      {
+         norms[iter] = r_norm;
+      }
+      if (print_level > 0 && my_id == 0)
+      {
+         if (b_norm > 0.0)
+            hypre_printf("% 5d    %e    %f   %e\n", iter, norms[iter],
+                         norms[iter] / norms[iter - 1], norms[iter] / b_norm);
+         else
+            hypre_printf("% 5d    %e    %f\n", iter, norms[iter],
+                         norms[iter] / norms[iter - 1]);
+      }
+      /* check for convergence, evaluate actual residual */
+      if (r_norm <= epsilon && iter >= min_iter)
+      {
+         (*(bicgstab_functions->CopyVector))(b, r);
+         (*(bicgstab_functions->Matvec))(matvec_data, -1.0, A, x, 1.0, r);
+         r_norm = hypre_sqrt((*(bicgstab_functions->InnerProd))(r, r));
+         if (r_norm <= epsilon)
+         {
+            if (print_level > 0 && my_id == 0)
+            {
+               hypre_printf("\n\n");
+               hypre_printf("Final L2 norm of residual: %e\n\n", r_norm);
+            }
+            (bicgstab_data -> converged) = 1;
+            break;
+         }
+      }
+      /*--------------------------------------------------------------------
+       * Optional test to see if adequate progress is being made.
+       * The average convergence factor is recorded and compared
+       * against the tolerance 'cf_tol'. The weighting factor is
+       * intended to pay more attention to the test when an accurate
+       * estimate for average convergence factor is available.
+       *--------------------------------------------------------------------*/
+      if (cf_tol > 0.0)
+      {
+         cf_ave_0 = cf_ave_1;
+         cf_ave_1 = hypre_pow( r_norm / r_norm_0, 1.0 / (2.0 * iter));
+
+         weight   = hypre_abs(cf_ave_1 - cf_ave_0);
+         weight   = weight / hypre_max(cf_ave_1, cf_ave_0);
+         weight   = 1.0 - weight;
+         if (weight * cf_ave_1 > cf_tol) { break; }
+      }
+
+      if (hypre_abs(res) >= epsmac)
+      {
+         beta = 1.0 / res;
+      }
+      else
+      {
+         hypre_error_w_msg(HYPRE_ERROR_GENERIC, "BiCGSTAB broke down!! res=0 \n");
+         HYPRE_ANNOTATE_FUNC_END;
+
+         return hypre_error_flag;
+      }
+      res = (*(bicgstab_functions->InnerProd))(r0, r);
+      beta *= res;
+      (*(bicgstab_functions->Axpy))(-gamma, q, p);
+      if (hypre_abs(gamma) >= epsmac)
+      {
+         (*(bicgstab_functions->ScaleVector))((beta * alpha / gamma), p);
+      }
+      else
+      {
+         hypre_error_w_msg(HYPRE_ERROR_GENERIC, "BiCGSTAB broke down!! gamma=0 \n");
+         HYPRE_ANNOTATE_FUNC_END;
+
+         return hypre_error_flag;
+      }
+      (*(bicgstab_functions->Axpy))(1.0, r, p);
    } /* end while loop */
 
    (bicgstab_data -> num_iterations) = iter;
    if (b_norm > 0.0)
-      (bicgstab_data -> rel_residual_norm) = r_norm/b_norm;
+   {
+      (bicgstab_data -> rel_residual_norm) = r_norm / b_norm;
+   }
    if (b_norm == 0.0)
+   {
       (bicgstab_data -> rel_residual_norm) = r_norm;
+   }
 
-   if (iter >= max_iter && r_norm > epsilon && epsilon > 0 && hybrid != -1) hypre_error(HYPRE_ERROR_CONV);
+   if (iter >= max_iter && r_norm > epsilon && epsilon > 0 && hybrid != -1) { hypre_error(HYPRE_ERROR_CONV); }
 
    HYPRE_ANNOTATE_FUNC_END;
 
@@ -540,9 +583,9 @@ hypre_BiCGSTABSolve(void  *bicgstab_vdata,
 
 HYPRE_Int
 hypre_BiCGSTABSetTol( void   *bicgstab_vdata,
-                   HYPRE_Real  tol       )
+                      HYPRE_Real  tol       )
 {
-	hypre_BiCGSTABData *bicgstab_data = (hypre_BiCGSTABData  *)bicgstab_vdata;
+   hypre_BiCGSTABData *bicgstab_data = (hypre_BiCGSTABData  *)bicgstab_vdata;
 
    (bicgstab_data -> tol) = tol;
 
@@ -554,9 +597,9 @@ hypre_BiCGSTABSetTol( void   *bicgstab_vdata,
 
 HYPRE_Int
 hypre_BiCGSTABSetAbsoluteTol( void   *bicgstab_vdata,
-                   HYPRE_Real  a_tol       )
+                              HYPRE_Real  a_tol       )
 {
-	hypre_BiCGSTABData *bicgstab_data = (hypre_BiCGSTABData  *)bicgstab_vdata;
+   hypre_BiCGSTABData *bicgstab_data = (hypre_BiCGSTABData  *)bicgstab_vdata;
 
    (bicgstab_data -> a_tol) = a_tol;
 
@@ -569,9 +612,9 @@ hypre_BiCGSTABSetAbsoluteTol( void   *bicgstab_vdata,
 
 HYPRE_Int
 hypre_BiCGSTABSetConvergenceFactorTol( void   *bicgstab_vdata,
-                   HYPRE_Real  cf_tol       )
+                                       HYPRE_Real  cf_tol       )
 {
-	hypre_BiCGSTABData *bicgstab_data = (hypre_BiCGSTABData  *)bicgstab_vdata;
+   hypre_BiCGSTABData *bicgstab_data = (hypre_BiCGSTABData  *)bicgstab_vdata;
 
    (bicgstab_data -> cf_tol) = cf_tol;
 
@@ -584,9 +627,9 @@ hypre_BiCGSTABSetConvergenceFactorTol( void   *bicgstab_vdata,
 
 HYPRE_Int
 hypre_BiCGSTABSetMinIter( void *bicgstab_vdata,
-                       HYPRE_Int   min_iter  )
+                          HYPRE_Int   min_iter  )
 {
-	hypre_BiCGSTABData *bicgstab_data = (hypre_BiCGSTABData  *)bicgstab_vdata;
+   hypre_BiCGSTABData *bicgstab_data = (hypre_BiCGSTABData  *)bicgstab_vdata;
 
    (bicgstab_data -> min_iter) = min_iter;
 
@@ -599,9 +642,9 @@ hypre_BiCGSTABSetMinIter( void *bicgstab_vdata,
 
 HYPRE_Int
 hypre_BiCGSTABSetMaxIter( void *bicgstab_vdata,
-                       HYPRE_Int   max_iter  )
+                          HYPRE_Int   max_iter  )
 {
-	hypre_BiCGSTABData *bicgstab_data = (hypre_BiCGSTABData  *)bicgstab_vdata;
+   hypre_BiCGSTABData *bicgstab_data = (hypre_BiCGSTABData  *)bicgstab_vdata;
 
    (bicgstab_data -> max_iter) = max_iter;
 
@@ -614,9 +657,9 @@ hypre_BiCGSTABSetMaxIter( void *bicgstab_vdata,
 
 HYPRE_Int
 hypre_BiCGSTABSetStopCrit( void   *bicgstab_vdata,
-                        HYPRE_Int  stop_crit       )
+                           HYPRE_Int  stop_crit       )
 {
-	hypre_BiCGSTABData *bicgstab_data = (hypre_BiCGSTABData  *)bicgstab_vdata;
+   hypre_BiCGSTABData *bicgstab_data = (hypre_BiCGSTABData  *)bicgstab_vdata;
 
    (bicgstab_data -> stop_crit) = stop_crit;
 
@@ -629,11 +672,11 @@ hypre_BiCGSTABSetStopCrit( void   *bicgstab_vdata,
 
 HYPRE_Int
 hypre_BiCGSTABSetPrecond( void  *bicgstab_vdata,
-						  HYPRE_Int  (*precond)(void*,void*,void*,void*),
-						  HYPRE_Int  (*precond_setup)(void*,void*,void*,void*),
-                       void  *precond_data )
+                          HYPRE_Int  (*precond)(void*, void*, void*, void*),
+                          HYPRE_Int  (*precond_setup)(void*, void*, void*, void*),
+                          void  *precond_data )
 {
-	hypre_BiCGSTABData *bicgstab_data = (hypre_BiCGSTABData  *)bicgstab_vdata;
+   hypre_BiCGSTABData *bicgstab_data = (hypre_BiCGSTABData  *)bicgstab_vdata;
    hypre_BiCGSTABFunctions *bicgstab_functions = bicgstab_data->functions;
 
 
@@ -650,9 +693,9 @@ hypre_BiCGSTABSetPrecond( void  *bicgstab_vdata,
 
 HYPRE_Int
 hypre_BiCGSTABGetPrecond( void         *bicgstab_vdata,
-                       HYPRE_Solver *precond_data_ptr )
+                          HYPRE_Solver *precond_data_ptr )
 {
-	hypre_BiCGSTABData *bicgstab_data = (hypre_BiCGSTABData  *)bicgstab_vdata;
+   hypre_BiCGSTABData *bicgstab_data = (hypre_BiCGSTABData  *)bicgstab_vdata;
 
    *precond_data_ptr = (HYPRE_Solver)(bicgstab_data -> precond_data);
 
@@ -665,9 +708,9 @@ hypre_BiCGSTABGetPrecond( void         *bicgstab_vdata,
 
 HYPRE_Int
 hypre_BiCGSTABSetLogging( void *bicgstab_vdata,
-                       HYPRE_Int   logging)
+                          HYPRE_Int   logging)
 {
-	hypre_BiCGSTABData *bicgstab_data = (hypre_BiCGSTABData  *)bicgstab_vdata;
+   hypre_BiCGSTABData *bicgstab_data = (hypre_BiCGSTABData  *)bicgstab_vdata;
 
    (bicgstab_data -> logging) = logging;
 
@@ -676,9 +719,9 @@ hypre_BiCGSTABSetLogging( void *bicgstab_vdata,
 
 HYPRE_Int
 hypre_BiCGSTABSetHybrid( void *bicgstab_vdata,
-                       HYPRE_Int   logging)
+                         HYPRE_Int   logging)
 {
-	hypre_BiCGSTABData *bicgstab_data = (hypre_BiCGSTABData  *)bicgstab_vdata;
+   hypre_BiCGSTABData *bicgstab_data = (hypre_BiCGSTABData  *)bicgstab_vdata;
 
    (bicgstab_data -> hybrid) = logging;
 
@@ -691,9 +734,9 @@ hypre_BiCGSTABSetHybrid( void *bicgstab_vdata,
 
 HYPRE_Int
 hypre_BiCGSTABSetPrintLevel( void *bicgstab_vdata,
-                       HYPRE_Int   print_level)
+                             HYPRE_Int   print_level)
 {
-	hypre_BiCGSTABData *bicgstab_data = (hypre_BiCGSTABData  *)bicgstab_vdata;
+   hypre_BiCGSTABData *bicgstab_data = (hypre_BiCGSTABData  *)bicgstab_vdata;
 
    (bicgstab_data -> print_level) = print_level;
 
@@ -706,9 +749,9 @@ hypre_BiCGSTABSetPrintLevel( void *bicgstab_vdata,
 
 HYPRE_Int
 hypre_BiCGSTABGetConverged( void *bicgstab_vdata,
-                             HYPRE_Int  *converged )
+                            HYPRE_Int  *converged )
 {
-	hypre_BiCGSTABData *bicgstab_data = (hypre_BiCGSTABData  *)bicgstab_vdata;
+   hypre_BiCGSTABData *bicgstab_data = (hypre_BiCGSTABData  *)bicgstab_vdata;
 
    *converged = (bicgstab_data -> converged);
 
@@ -721,9 +764,9 @@ hypre_BiCGSTABGetConverged( void *bicgstab_vdata,
 
 HYPRE_Int
 hypre_BiCGSTABGetNumIterations( void *bicgstab_vdata,
-                             HYPRE_Int  *num_iterations )
+                                HYPRE_Int  *num_iterations )
 {
-	hypre_BiCGSTABData *bicgstab_data = (hypre_BiCGSTABData  *)bicgstab_vdata;
+   hypre_BiCGSTABData *bicgstab_data = (hypre_BiCGSTABData  *)bicgstab_vdata;
 
    *num_iterations = (bicgstab_data -> num_iterations);
 
@@ -736,9 +779,9 @@ hypre_BiCGSTABGetNumIterations( void *bicgstab_vdata,
 
 HYPRE_Int
 hypre_BiCGSTABGetFinalRelativeResidualNorm( void   *bicgstab_vdata,
-                                         HYPRE_Real *relative_residual_norm )
+                                            HYPRE_Real *relative_residual_norm )
 {
-	hypre_BiCGSTABData *bicgstab_data = (hypre_BiCGSTABData  *)bicgstab_vdata;
+   hypre_BiCGSTABData *bicgstab_data = (hypre_BiCGSTABData  *)bicgstab_vdata;
 
    *relative_residual_norm = (bicgstab_data -> rel_residual_norm);
 
@@ -753,7 +796,7 @@ HYPRE_Int
 hypre_BiCGSTABGetResidual( void   *bicgstab_vdata,
                            void **residual )
 {
-	hypre_BiCGSTABData *bicgstab_data = (hypre_BiCGSTABData  *)bicgstab_vdata;
+   hypre_BiCGSTABData *bicgstab_data = (hypre_BiCGSTABData  *)bicgstab_vdata;
 
    *residual = (bicgstab_data -> r);
 
diff --git a/external/hypre/src/krylov/bicgstab.h b/external/hypre/src/krylov/bicgstab.h
index 3b90f2bd..4b0c07ce 100644
--- a/external/hypre/src/krylov/bicgstab.h
+++ b/external/hypre/src/krylov/bicgstab.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -70,20 +70,20 @@ HYPRE_Int hypre_ParKrylovMatvecT( void *matvec_data , HYPRE_Real alpha , void *A
 
 typedef struct
 {
-  void *     (*CreateVector)  ( void *vvector );
-  HYPRE_Int  (*DestroyVector) ( void *vvector );
-  void *     (*MatvecCreate)  ( void *A , void *x );
-  HYPRE_Int  (*Matvec)        ( void *matvec_data , HYPRE_Complex alpha , void *A ,
-                                void *x , HYPRE_Complex beta , void *y );
-  HYPRE_Int  (*MatvecDestroy) ( void *matvec_data );
-  HYPRE_Real (*InnerProd)     ( void *x , void *y );
-  HYPRE_Int  (*CopyVector)    ( void *x , void *y );
-  HYPRE_Int  (*ClearVector)   ( void *x );
-  HYPRE_Int  (*ScaleVector)   ( HYPRE_Complex alpha , void *x );
-  HYPRE_Int  (*Axpy)          ( HYPRE_Complex alpha , void *x , void *y );
-  HYPRE_Int  (*CommInfo)      ( void *A , HYPRE_Int *my_id , HYPRE_Int *num_procs );
-	HYPRE_Int  (*precond_setup) (void *vdata , void *A , void *b , void *x);
-	HYPRE_Int  (*precond)       (void *vdata , void *A , void *b , void *x);
+   void *     (*CreateVector)  ( void *vvector );
+   HYPRE_Int  (*DestroyVector) ( void *vvector );
+   void *     (*MatvecCreate)  ( void *A, void *x );
+   HYPRE_Int  (*Matvec)        ( void *matvec_data, HYPRE_Complex alpha, void *A,
+                                 void *x, HYPRE_Complex beta, void *y );
+   HYPRE_Int  (*MatvecDestroy) ( void *matvec_data );
+   HYPRE_Real (*InnerProd)     ( void *x, void *y );
+   HYPRE_Int  (*CopyVector)    ( void *x, void *y );
+   HYPRE_Int  (*ClearVector)   ( void *x );
+   HYPRE_Int  (*ScaleVector)   ( HYPRE_Complex alpha, void *x );
+   HYPRE_Int  (*Axpy)          ( HYPRE_Complex alpha, void *x, void *y );
+   HYPRE_Int  (*CommInfo)      ( void *A, HYPRE_Int *my_id, HYPRE_Int *num_procs );
+   HYPRE_Int  (*precond_setup) (void *vdata, void *A, void *b, void *x);
+   HYPRE_Int  (*precond)       (void *vdata, void *A, void *b, void *x);
 
 } hypre_BiCGSTABFunctions;
 
@@ -102,7 +102,7 @@ typedef struct
    HYPRE_Real   cf_tol;
    HYPRE_Real   rel_residual_norm;
    HYPRE_Real   a_tol;
-   
+
 
    void  *A;
    void  *r;
@@ -119,7 +119,7 @@ typedef struct
 
    /* log info (always logged) */
    HYPRE_Int      num_iterations;
- 
+
    /* additional log info (logged when `logging' > 0) */
    HYPRE_Int      logging;
    HYPRE_Int      print_level;
@@ -149,20 +149,20 @@ hypre_BiCGSTABFunctions *
 hypre_BiCGSTABFunctionsCreate(
    void *     (*CreateVector)  ( void *vvector ),
    HYPRE_Int  (*DestroyVector) ( void *vvector ),
-   void *     (*MatvecCreate)  ( void *A , void *x ),
-   HYPRE_Int  (*Matvec)        ( void *matvec_data , HYPRE_Complex alpha , void *A ,
-                                 void *x , HYPRE_Complex beta , void *y ),
+   void *     (*MatvecCreate)  ( void *A, void *x ),
+   HYPRE_Int  (*Matvec)        ( void *matvec_data, HYPRE_Complex alpha, void *A,
+                                 void *x, HYPRE_Complex beta, void *y ),
    HYPRE_Int  (*MatvecDestroy) ( void *matvec_data ),
-   HYPRE_Real (*InnerProd)     ( void *x , void *y ),
-   HYPRE_Int  (*CopyVector)    ( void *x , void *y ),
+   HYPRE_Real (*InnerProd)     ( void *x, void *y ),
+   HYPRE_Int  (*CopyVector)    ( void *x, void *y ),
    HYPRE_Int  (*ClearVector)   ( void *x ),
-   HYPRE_Int  (*ScaleVector)   ( HYPRE_Complex alpha , void *x ),
-   HYPRE_Int  (*Axpy)          ( HYPRE_Complex alpha , void *x , void *y ),
-   HYPRE_Int  (*CommInfo)      ( void *A , HYPRE_Int *my_id ,
+   HYPRE_Int  (*ScaleVector)   ( HYPRE_Complex alpha, void *x ),
+   HYPRE_Int  (*Axpy)          ( HYPRE_Complex alpha, void *x, void *y ),
+   HYPRE_Int  (*CommInfo)      ( void *A, HYPRE_Int *my_id,
                                  HYPRE_Int *num_procs ),
    HYPRE_Int  (*PrecondSetup)  (void *vdata, void *A, void *b, void *x ),
    HYPRE_Int  (*Precond)       ( void *vdata, void *A, void *b, void *x )
-   );
+);
 
 /**
  * Description...
diff --git a/external/hypre/src/krylov/cgnr.c b/external/hypre/src/krylov/cgnr.c
index d88920c5..5fa53ffb 100644
--- a/external/hypre/src/krylov/cgnr.c
+++ b/external/hypre/src/krylov/cgnr.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -38,11 +38,11 @@ hypre_CGNRFunctionsCreate(
    HYPRE_Int    (*PrecondSetup)  ( void *vdata, void *A, void *b, void *x ),
    HYPRE_Int    (*Precond)       ( void *vdata, void *A, void *b, void *x ),
    HYPRE_Int    (*PrecondT)      ( void *vdata, void *A, void *b, void *x )
-   )
+)
 {
    hypre_CGNRFunctions * cgnr_functions;
    cgnr_functions = (hypre_CGNRFunctions *)
-      hypre_CTAlloc( hypre_CGNRFunctions,  1 , HYPRE_MEMORY_HOST);
+                    hypre_CTAlloc( hypre_CGNRFunctions,  1, HYPRE_MEMORY_HOST);
 
    cgnr_functions->CommInfo = CommInfo;
    cgnr_functions->CreateVector = CreateVector;
@@ -56,10 +56,10 @@ hypre_CGNRFunctionsCreate(
    cgnr_functions->ClearVector = ClearVector;
    cgnr_functions->ScaleVector = ScaleVector;
    cgnr_functions->Axpy = Axpy;
-/* default preconditioner must be set here but can be changed later... */
+   /* default preconditioner must be set here but can be changed later... */
    cgnr_functions->precond_setup = PrecondSetup;
    cgnr_functions->precond       = Precond;
-   cgnr_functions->precondT       = Precond;
+   cgnr_functions->precondT      = PrecondT;
 
    return cgnr_functions;
 }
@@ -127,7 +127,7 @@ hypre_CGNRDestroy( void *cgnr_vdata )
 
    HYPRE_ANNOTATE_FUNC_END;
 
-   return(ierr);
+   return (ierr);
 }
 
 /*--------------------------------------------------------------------------
@@ -218,17 +218,17 @@ hypre_CGNRSolve(void *cgnr_vdata,
    HYPRE_Int             ierr = 0;
    HYPRE_Int             my_id, num_procs;
    HYPRE_Int             x_not_set = 1;
-   /* char		  *log_file_name; */
+   /* char       *log_file_name; */
 
    HYPRE_ANNOTATE_FUNC_BEGIN;
 
    /*-----------------------------------------------------------------------
     * Start cgnr solve
     *-----------------------------------------------------------------------*/
-   (*(cgnr_functions->CommInfo))(A,&my_id,&num_procs);
+   (*(cgnr_functions->CommInfo))(A, &my_id, &num_procs);
    if (logging > 1 && my_id == 0)
    {
-/* not used yet      log_file_name = (cgnr_data -> log_file_name); */
+      /* not used yet      log_file_name = (cgnr_data -> log_file_name); */
       hypre_printf("Iters       ||r||_2      conv.rate  ||r||_2/||b||_2\n");
       hypre_printf("-----    ------------    ---------  ------------ \n");
    }
@@ -237,9 +237,9 @@ hypre_CGNRSolve(void *cgnr_vdata,
    /* compute eps */
    bi_prod = (*(cgnr_functions->InnerProd))(b, b);
 
-   /* Since it is does not diminish performance, attempt to return an error flag
+   /* Since it does not diminish performance, attempt to return an error flag
       and notify users when they supply bad input. */
-   if (bi_prod != 0.) ieee_check = bi_prod/bi_prod; /* INF -> NaN conversion */
+   if (bi_prod != 0.) { ieee_check = bi_prod / bi_prod; } /* INF -> NaN conversion */
    if (ieee_check != ieee_check)
    {
       /* ...INFs or NaNs in input can make ieee_check a NaN.  This test
@@ -249,11 +249,11 @@ hypre_CGNRSolve(void *cgnr_vdata,
          found at http://HTTP.CS.Berkeley.EDU/~wkahan/ieee754status/IEEE754.PDF */
       if (logging > 0)
       {
-        hypre_printf("\n\nERROR detected by Hypre ...  BEGIN\n");
-        hypre_printf("ERROR -- hypre_CGNRSolve: INFs and/or NaNs detected in input.\n");
-        hypre_printf("User probably placed non-numerics in supplied b.\n");
-        hypre_printf("Returning error flag += 101.  Program not terminated.\n");
-        hypre_printf("ERROR detected by Hypre ...  END\n\n\n");
+         hypre_printf("\n\nERROR detected by Hypre ...  BEGIN\n");
+         hypre_printf("ERROR -- hypre_CGNRSolve: INFs and/or NaNs detected in input.\n");
+         hypre_printf("User probably placed non-numerics in supplied b.\n");
+         hypre_printf("Returning error flag += 101.  Program not terminated.\n");
+         hypre_printf("ERROR detected by Hypre ...  END\n\n\n");
       }
       ierr += 101;
       HYPRE_ANNOTATE_FUNC_END;
@@ -262,9 +262,13 @@ hypre_CGNRSolve(void *cgnr_vdata,
    }
 
    if (stop_crit)
-      eps = tol*tol; /* absolute residual norm */
+   {
+      eps = tol * tol; /* absolute residual norm */
+   }
    else
-      eps = (tol*tol)*bi_prod; /* relative residual norm */
+   {
+      eps = (tol * tol) * bi_prod; /* relative residual norm */
+   }
 
    /* Check to see if the rhs vector b is zero */
    if (bi_prod == 0.0)
@@ -288,11 +292,11 @@ hypre_CGNRSolve(void *cgnr_vdata,
    /* Set initial residual norm */
    if (logging > 0)
    {
-      norms[0] = sqrt((*(cgnr_functions->InnerProd))(r,r));
+      norms[0] = hypre_sqrt((*(cgnr_functions->InnerProd))(r, r));
 
-      /* Since it is does not diminish performance, attempt to return an error flag
+      /* Since it does not diminish performance, attempt to return an error flag
          and notify users when they supply bad input. */
-      if (norms[0] != 0.) ieee_check = norms[0]/norms[0]; /* INF -> NaN conversion */
+      if (norms[0] != 0.) { ieee_check = norms[0] / norms[0]; } /* INF -> NaN conversion */
       if (ieee_check != ieee_check)
       {
          /* ...INFs or NaNs in input can make ieee_check a NaN.  This test
@@ -302,11 +306,11 @@ hypre_CGNRSolve(void *cgnr_vdata,
             found at http://HTTP.CS.Berkeley.EDU/~wkahan/ieee754status/IEEE754.PDF */
          if (logging > 0)
          {
-           hypre_printf("\n\nERROR detected by Hypre ...  BEGIN\n");
-           hypre_printf("ERROR -- hypre_CGNRSolve: INFs and/or NaNs detected in input.\n");
-           hypre_printf("User probably placed non-numerics in supplied A or x_0.\n");
-           hypre_printf("Returning error flag += 101.  Program not terminated.\n");
-           hypre_printf("ERROR detected by Hypre ...  END\n\n\n");
+            hypre_printf("\n\nERROR detected by Hypre ...  BEGIN\n");
+            hypre_printf("ERROR -- hypre_CGNRSolve: INFs and/or NaNs detected in input.\n");
+            hypre_printf("User probably placed non-numerics in supplied A or x_0.\n");
+            hypre_printf("Returning error flag += 101.  Program not terminated.\n");
+            hypre_printf("ERROR detected by Hypre ...  END\n\n\n");
          }
          ierr += 101;
          HYPRE_ANNOTATE_FUNC_END;
@@ -324,11 +328,11 @@ hypre_CGNRSolve(void *cgnr_vdata,
    (*(cgnr_functions->CopyVector))(r, p);
 
    /* gamma = <t,t> */
-   gamma = (*(cgnr_functions->InnerProd))(t,t);
+   gamma = (*(cgnr_functions->InnerProd))(t, t);
 
-   /* Since it is does not diminish performance, attempt to return an error flag
+   /* Since it does not diminish performance, attempt to return an error flag
       and notify users when they supply bad input. */
-   if (gamma != 0.) ieee_check = gamma/gamma; /* INF -> NaN conversion */
+   if (gamma != 0.) { ieee_check = gamma / gamma; } /* INF -> NaN conversion */
    if (ieee_check != ieee_check)
    {
       /* ...INFs or NaNs in input can make ieee_check a NaN.  This test
@@ -338,11 +342,11 @@ hypre_CGNRSolve(void *cgnr_vdata,
          found at http://HTTP.CS.Berkeley.EDU/~wkahan/ieee754status/IEEE754.PDF */
       if (logging > 0)
       {
-        hypre_printf("\n\nERROR detected by Hypre ...  BEGIN\n");
-        hypre_printf("ERROR -- hypre_CGNRSolve: INFs and/or NaNs detected in input.\n");
-        hypre_printf("User probably placed non-numerics in supplied A or x_0.\n");
-        hypre_printf("Returning error flag += 101.  Program not terminated.\n");
-        hypre_printf("ERROR detected by Hypre ...  END\n\n\n");
+         hypre_printf("\n\nERROR detected by Hypre ...  BEGIN\n");
+         hypre_printf("ERROR -- hypre_CGNRSolve: INFs and/or NaNs detected in input.\n");
+         hypre_printf("User probably placed non-numerics in supplied A or x_0.\n");
+         hypre_printf("Returning error flag += 101.  Program not terminated.\n");
+         hypre_printf("ERROR detected by Hypre ...  END\n\n\n");
       }
       ierr += 101;
       HYPRE_ANNOTATE_FUNC_END;
@@ -350,7 +354,7 @@ hypre_CGNRSolve(void *cgnr_vdata,
       return ierr;
    }
 
-   while ((i+1) <= max_iter)
+   while ((i + 1) <= max_iter)
    {
       i++;
 
@@ -379,16 +383,16 @@ hypre_CGNRSolve(void *cgnr_vdata,
       gamma = (*(cgnr_functions->InnerProd))(t, t);
 
       /* set i_prod for convergence test */
-      i_prod = (*(cgnr_functions->InnerProd))(r,r);
+      i_prod = (*(cgnr_functions->InnerProd))(r, r);
 
       /* log norm info */
       if (logging > 0)
       {
-         norms[i]     = sqrt(i_prod);
+         norms[i]     = hypre_sqrt(i_prod);
          if (logging > 1 && my_id == 0)
          {
-            hypre_printf("% 5d    %e    %f   %e\n", i, norms[i], norms[i]/
-		norms[i-1], norms[i]/bi_prod);
+            hypre_printf("% 5d    %e    %f   %e\n", i, norms[i], norms[i] /
+                         norms[i - 1], norms[i] / bi_prod);
          }
       }
 
@@ -403,12 +407,12 @@ hypre_CGNRSolve(void *cgnr_vdata,
          /* r = b - Aq */
          (*(cgnr_functions->CopyVector))(b, r);
          (*(cgnr_functions->Matvec))(matvec_data, -1.0, A, q, 1.0, r);
-         i_prod = (*(cgnr_functions->InnerProd))(r,r);
+         i_prod = (*(cgnr_functions->InnerProd))(r, r);
          if (i_prod < eps)
          {
-            (*(cgnr_functions->CopyVector))(q,x);
-	    x_not_set = 0;
-	    break;
+            (*(cgnr_functions->CopyVector))(q, x);
+            x_not_set = 0;
+            break;
          }
       }
 
@@ -420,12 +424,12 @@ hypre_CGNRSolve(void *cgnr_vdata,
       (*(cgnr_functions->Axpy))(1.0, t, p);
    }
 
-  /*-----------------------------------------------------------------
-   * Generate solution x = Cx
-   *-----------------------------------------------------------------*/
+   /*-----------------------------------------------------------------
+    * Generate solution x = Cx
+    *-----------------------------------------------------------------*/
    if (x_not_set)
    {
-      (*(cgnr_functions->CopyVector))(x,q);
+      (*(cgnr_functions->CopyVector))(x, q);
       (*(cgnr_functions->ClearVector))(x);
       precond(precond_data, A, q, x);
    }
@@ -434,7 +438,7 @@ hypre_CGNRSolve(void *cgnr_vdata,
     * Print log
     *-----------------------------------------------------------------------*/
 
-   bi_prod = sqrt(bi_prod);
+   bi_prod = hypre_sqrt(bi_prod);
 
    if (logging > 1 && my_id == 0)
    {
@@ -442,7 +446,7 @@ hypre_CGNRSolve(void *cgnr_vdata,
    }
 
    (cgnr_data -> num_iterations) = i;
-   (cgnr_data -> rel_residual_norm) = norms[i]/bi_prod;
+   (cgnr_data -> rel_residual_norm) = norms[i] / bi_prod;
 
    HYPRE_ANNOTATE_FUNC_END;
 
@@ -471,7 +475,7 @@ hypre_CGNRSetTol(void   *cgnr_vdata,
 
 HYPRE_Int
 hypre_CGNRSetMinIter( void *cgnr_vdata,
-                     HYPRE_Int   min_iter  )
+                      HYPRE_Int   min_iter  )
 {
    hypre_CGNRData *cgnr_data = (hypre_CGNRData *)cgnr_vdata;
    HYPRE_Int            ierr = 0;
@@ -487,7 +491,7 @@ hypre_CGNRSetMinIter( void *cgnr_vdata,
 
 HYPRE_Int
 hypre_CGNRSetMaxIter( void *cgnr_vdata,
-                     HYPRE_Int   max_iter  )
+                      HYPRE_Int   max_iter  )
 {
    hypre_CGNRData *cgnr_data = (hypre_CGNRData *)cgnr_vdata;
    HYPRE_Int            ierr = 0;
@@ -503,7 +507,7 @@ hypre_CGNRSetMaxIter( void *cgnr_vdata,
 
 HYPRE_Int
 hypre_CGNRSetStopCrit( void *cgnr_vdata,
-                     HYPRE_Int   stop_crit  )
+                       HYPRE_Int   stop_crit  )
 {
    hypre_CGNRData *cgnr_data = (hypre_CGNRData *)cgnr_vdata;
    HYPRE_Int            ierr = 0;
@@ -558,7 +562,7 @@ hypre_CGNRGetPrecond( void         *cgnr_vdata,
 
 HYPRE_Int
 hypre_CGNRSetLogging( void *cgnr_vdata,
-                     HYPRE_Int   logging)
+                      HYPRE_Int   logging)
 {
    hypre_CGNRData *cgnr_data = (hypre_CGNRData *)cgnr_vdata;
    HYPRE_Int            ierr = 0;
@@ -574,7 +578,7 @@ hypre_CGNRSetLogging( void *cgnr_vdata,
 
 HYPRE_Int
 hypre_CGNRGetNumIterations( void *cgnr_vdata,
-                           HYPRE_Int  *num_iterations )
+                            HYPRE_Int  *num_iterations )
 {
    hypre_CGNRData *cgnr_data = (hypre_CGNRData *)cgnr_vdata;
    HYPRE_Int            ierr = 0;
@@ -591,7 +595,7 @@ hypre_CGNRGetNumIterations( void *cgnr_vdata,
 
 HYPRE_Int
 hypre_CGNRGetFinalRelativeResidualNorm( void   *cgnr_vdata,
-                                       HYPRE_Real *relative_residual_norm )
+                                        HYPRE_Real *relative_residual_norm )
 {
    hypre_CGNRData *cgnr_data = (hypre_CGNRData *)cgnr_vdata;
    HYPRE_Int ierr = 0;
diff --git a/external/hypre/src/krylov/cgnr.h b/external/hypre/src/krylov/cgnr.h
index 9f28dbc3..a7c124e3 100644
--- a/external/hypre/src/krylov/cgnr.h
+++ b/external/hypre/src/krylov/cgnr.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -138,7 +138,7 @@ hypre_CGNRFunctionsCreate(
    HYPRE_Int    (*PrecondSetup)  ( void *vdata, void *A, void *b, void *x ),
    HYPRE_Int    (*Precond)       ( void *vdata, void *A, void *b, void *x ),
    HYPRE_Int    (*PrecondT)      ( void *vdata, void *A, void *b, void *x )
-   );
+);
 
 /**
  * Description...
diff --git a/external/hypre/src/krylov/cogmres.c b/external/hypre/src/krylov/cogmres.c
index 72fc6366..f4b12316 100644
--- a/external/hypre/src/krylov/cogmres.c
+++ b/external/hypre/src/krylov/cogmres.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -33,19 +33,21 @@ hypre_COGMRESFunctionsCreate(
    HYPRE_Int    (*MatvecDestroy) ( void *matvec_data ),
    HYPRE_Real   (*InnerProd)     ( void *x, void *y ),
    HYPRE_Int    (*MassInnerProd) (void *x, void **y, HYPRE_Int k, HYPRE_Int unroll, void *result),
-   HYPRE_Int    (*MassDotpTwo)   (void *x, void *y, void **z, HYPRE_Int k, HYPRE_Int unroll, void *result_x, void *result_y),
+   HYPRE_Int    (*MassDotpTwo)   (void *x, void *y, void **z, HYPRE_Int k, HYPRE_Int unroll,
+                                  void *result_x, void *result_y),
    HYPRE_Int    (*CopyVector)    ( void *x, void *y ),
    HYPRE_Int    (*ClearVector)   ( void *x ),
    HYPRE_Int    (*ScaleVector)   ( HYPRE_Complex alpha, void *x ),
    HYPRE_Int    (*Axpy)          ( HYPRE_Complex alpha, void *x, void *y ),
-   HYPRE_Int    (*MassAxpy)      ( HYPRE_Complex *alpha, void **x, void *y, HYPRE_Int k, HYPRE_Int unroll),
+   HYPRE_Int    (*MassAxpy)      ( HYPRE_Complex *alpha, void **x, void *y, HYPRE_Int k,
+                                   HYPRE_Int unroll),
    HYPRE_Int    (*PrecondSetup)  ( void *vdata, void *A, void *b, void *x ),
    HYPRE_Int    (*Precond)       ( void *vdata, void *A, void *b, void *x )
-   )
+)
 {
    hypre_COGMRESFunctions * cogmres_functions;
    cogmres_functions = (hypre_COGMRESFunctions *)
-    CAlloc( 1, sizeof(hypre_COGMRESFunctions), HYPRE_MEMORY_HOST );
+                       CAlloc( 1, sizeof(hypre_COGMRESFunctions), HYPRE_MEMORY_HOST );
 
    cogmres_functions->CAlloc            = CAlloc;
    cogmres_functions->Free              = Free;
@@ -127,29 +129,41 @@ hypre_COGMRESDestroy( void *cogmres_vdata )
    if (cogmres_data)
    {
       hypre_COGMRESFunctions *cogmres_functions = cogmres_data->functions;
-      if ( (cogmres_data->logging>0) || (cogmres_data->print_level) > 0 )
+      if ( (cogmres_data->logging > 0) || (cogmres_data->print_level) > 0 )
       {
          if ( (cogmres_data -> norms) != NULL )
-         hypre_TFreeF( cogmres_data -> norms, cogmres_functions );
+         {
+            hypre_TFreeF( cogmres_data -> norms, cogmres_functions );
+         }
       }
 
       if ( (cogmres_data -> matvec_data) != NULL )
+      {
          (*(cogmres_functions->MatvecDestroy))(cogmres_data -> matvec_data);
+      }
 
       if ( (cogmres_data -> r) != NULL )
+      {
          (*(cogmres_functions->DestroyVector))(cogmres_data -> r);
+      }
       if ( (cogmres_data -> w) != NULL )
+      {
          (*(cogmres_functions->DestroyVector))(cogmres_data -> w);
+      }
       if ( (cogmres_data -> w_2) != NULL )
+      {
          (*(cogmres_functions->DestroyVector))(cogmres_data -> w_2);
+      }
 
 
       if ( (cogmres_data -> p) != NULL )
       {
-         for (i = 0; i < (cogmres_data -> k_dim+1); i++)
+         for (i = 0; i < (cogmres_data -> k_dim + 1); i++)
          {
             if ( (cogmres_data -> p)[i] != NULL )
-            (*(cogmres_functions->DestroyVector))( (cogmres_data -> p) [i]);
+            {
+               (*(cogmres_functions->DestroyVector))( (cogmres_data -> p) [i]);
+            }
          }
          hypre_TFreeF( cogmres_data->p, cogmres_functions );
       }
@@ -189,7 +203,7 @@ hypre_COGMRESSetup( void *cogmres_vdata,
 
    HYPRE_Int k_dim            = (cogmres_data -> k_dim);
    HYPRE_Int max_iter         = (cogmres_data -> max_iter);
-   HYPRE_Int (*precond_setup)(void*,void*,void*,void*) = (cogmres_functions->precond_setup);
+   HYPRE_Int (*precond_setup)(void*, void*, void*, void*) = (cogmres_functions->precond_setup);
    void       *precond_data   = (cogmres_data -> precond_data);
    HYPRE_Int rel_change       = (cogmres_data -> rel_change);
 
@@ -204,21 +218,31 @@ hypre_COGMRESSetup( void *cogmres_vdata,
     *--------------------------------------------------*/
 
    if ((cogmres_data -> p) == NULL)
-      (cogmres_data -> p) = (void**)(*(cogmres_functions->CreateVectorArray))(k_dim+1,x);
+   {
+      (cogmres_data -> p) = (void**)(*(cogmres_functions->CreateVectorArray))(k_dim + 1, x);
+   }
    if ((cogmres_data -> r) == NULL)
+   {
       (cogmres_data -> r) = (*(cogmres_functions->CreateVector))(b);
+   }
    if ((cogmres_data -> w) == NULL)
+   {
       (cogmres_data -> w) = (*(cogmres_functions->CreateVector))(b);
+   }
 
    if (rel_change)
    {
       if ((cogmres_data -> w_2) == NULL)
+      {
          (cogmres_data -> w_2) = (*(cogmres_functions->CreateVector))(b);
+      }
    }
 
 
    if ((cogmres_data -> matvec_data) == NULL)
+   {
       (cogmres_data -> matvec_data) = (*(cogmres_functions->MatvecCreate))(A, x);
+   }
 
    precond_setup(precond_data, A, b, x);
 
@@ -226,15 +250,20 @@ hypre_COGMRESSetup( void *cogmres_vdata,
     * Allocate space for log info
     *-----------------------------------------------------*/
 
-   if ( (cogmres_data->logging)>0 || (cogmres_data->print_level) > 0 )
+   if ( (cogmres_data->logging) > 0 || (cogmres_data->print_level) > 0 )
    {
       if ((cogmres_data -> norms) == NULL)
-         (cogmres_data -> norms) = hypre_CTAllocF(HYPRE_Real, max_iter + 1,cogmres_functions, HYPRE_MEMORY_HOST);
+      {
+         (cogmres_data -> norms) = hypre_CTAllocF(HYPRE_Real, max_iter + 1, cogmres_functions,
+                                                  HYPRE_MEMORY_HOST);
+      }
    }
    if ( (cogmres_data->print_level) > 0 )
    {
       if ((cogmres_data -> log_file_name) == NULL)
+      {
          (cogmres_data -> log_file_name) = (char*)"cogmres.out.log";
+      }
    }
 
    HYPRE_ANNOTATE_FUNC_END;
@@ -273,21 +302,21 @@ hypre_COGMRESSolve(void  *cogmres_vdata,
 
    void        **p                 = (cogmres_data -> p);
 
-   HYPRE_Int (*precond)(void*,void*,void*,void*) = (cogmres_functions -> precond);
+   HYPRE_Int (*precond)(void*, void*, void*, void*) = (cogmres_functions -> precond);
    HYPRE_Int  *precond_data       = (HYPRE_Int*)(cogmres_data -> precond_data);
 
    HYPRE_Int print_level = (cogmres_data -> print_level);
    HYPRE_Int logging     = (cogmres_data -> logging);
 
    HYPRE_Real     *norms          = (cogmres_data -> norms);
-  /* not used yet   char           *log_file_name  = (cogmres_data -> log_file_name);*/
-  /*   FILE           *fp; */
+   /* not used yet   char           *log_file_name  = (cogmres_data -> log_file_name);*/
+   /*   FILE           *fp; */
 
    HYPRE_Int  break_value = 0;
    HYPRE_Int  i, j, k;
-  /*KS: rv is the norm history */
-   HYPRE_Real *rs, *hh, *uu, *c, *s, *rs_2, *rv;
-  //, *tmp;
+   /*KS: rv is the norm history */
+   HYPRE_Real *rs, *hh, *uu, *c, *s, *rs_2 = NULL, *rv;
+   //, *tmp;
    HYPRE_Int  iter;
    HYPRE_Int  my_id, num_procs;
    HYPRE_Real epsilon, gamma, t, r_norm, b_norm, den_norm, x_norm;
@@ -319,34 +348,34 @@ hypre_COGMRESSolve(void  *cogmres_vdata,
     *-----------------------------------------------------------------------*/
    guard_zero_residual = 0.0;
 
-   (*(cogmres_functions->CommInfo))(A,&my_id,&num_procs);
-   if ( logging>0 || print_level>0 )
+   (*(cogmres_functions->CommInfo))(A, &my_id, &num_procs);
+   if ( logging > 0 || print_level > 0 )
    {
       norms = (cogmres_data -> norms);
    }
 
    /* initialize work arrays */
-   rs = hypre_CTAllocF(HYPRE_Real,k_dim+1,cogmres_functions, HYPRE_MEMORY_HOST);
-   c  = hypre_CTAllocF(HYPRE_Real,k_dim,cogmres_functions, HYPRE_MEMORY_HOST);
-   s  = hypre_CTAllocF(HYPRE_Real,k_dim,cogmres_functions, HYPRE_MEMORY_HOST);
-   if (rel_change) rs_2 = hypre_CTAllocF(HYPRE_Real,k_dim+1,cogmres_functions, HYPRE_MEMORY_HOST);
+   rs = hypre_CTAllocF(HYPRE_Real, k_dim + 1, cogmres_functions, HYPRE_MEMORY_HOST);
+   c  = hypre_CTAllocF(HYPRE_Real, k_dim, cogmres_functions, HYPRE_MEMORY_HOST);
+   s  = hypre_CTAllocF(HYPRE_Real, k_dim, cogmres_functions, HYPRE_MEMORY_HOST);
+   if (rel_change) { rs_2 = hypre_CTAllocF(HYPRE_Real, k_dim + 1, cogmres_functions, HYPRE_MEMORY_HOST); }
 
-   rv = hypre_CTAllocF(HYPRE_Real, k_dim+1, cogmres_functions, HYPRE_MEMORY_HOST);
+   rv = hypre_CTAllocF(HYPRE_Real, k_dim + 1, cogmres_functions, HYPRE_MEMORY_HOST);
 
-   hh = hypre_CTAllocF(HYPRE_Real, (k_dim+1)*k_dim, cogmres_functions, HYPRE_MEMORY_HOST);
-   uu = hypre_CTAllocF(HYPRE_Real, (k_dim+1)*k_dim, cogmres_functions, HYPRE_MEMORY_HOST);
+   hh = hypre_CTAllocF(HYPRE_Real, (k_dim + 1) * k_dim, cogmres_functions, HYPRE_MEMORY_HOST);
+   uu = hypre_CTAllocF(HYPRE_Real, (k_dim + 1) * k_dim, cogmres_functions, HYPRE_MEMORY_HOST);
 
-   (*(cogmres_functions->CopyVector))(b,p[0]);
+   (*(cogmres_functions->CopyVector))(b, p[0]);
 
    /* compute initial residual */
-   (*(cogmres_functions->Matvec))(matvec_data,-1.0, A, x, 1.0, p[0]);
+   (*(cogmres_functions->Matvec))(matvec_data, -1.0, A, x, 1.0, p[0]);
 
-   b_norm = sqrt((*(cogmres_functions->InnerProd))(b,b));
+   b_norm = hypre_sqrt((*(cogmres_functions->InnerProd))(b, b));
    real_r_norm_old = b_norm;
 
-   /* Since it is does not diminish performance, attempt to return an error flag
+   /* Since it does not diminish performance, attempt to return an error flag
       and notify users when they supply bad input. */
-   if (b_norm != 0.) ieee_check = b_norm/b_norm; /* INF -> NaN conversion */
+   if (b_norm != 0.) { ieee_check = b_norm / b_norm; } /* INF -> NaN conversion */
    if (ieee_check != ieee_check)
    {
       /* ...INFs or NaNs in input can make ieee_check a NaN.  This test
@@ -368,12 +397,12 @@ hypre_COGMRESSolve(void  *cogmres_vdata,
       return hypre_error_flag;
    }
 
-   r_norm   = sqrt((*(cogmres_functions->InnerProd))(p[0],p[0]));
+   r_norm   = hypre_sqrt((*(cogmres_functions->InnerProd))(p[0], p[0]));
    r_norm_0 = r_norm;
 
-   /* Since it is does not diminish performance, attempt to return an error flag
+   /* Since it does not diminish performance, attempt to return an error flag
       and notify users when they supply bad input. */
-   if (r_norm != 0.) ieee_check = r_norm/r_norm; /* INF -> NaN conversion */
+   if (r_norm != 0.) { ieee_check = r_norm / r_norm; } /* INF -> NaN conversion */
    if (ieee_check != ieee_check)
    {
       /* ...INFs or NaNs in input can make ieee_check a NaN.  This test
@@ -395,14 +424,16 @@ hypre_COGMRESSolve(void  *cogmres_vdata,
       return hypre_error_flag;
    }
 
-   if ( logging>0 || print_level > 0)
+   if ( logging > 0 || print_level > 0)
    {
       norms[0] = r_norm;
-      if ( print_level>1 && my_id == 0 )
+      if ( print_level > 1 && my_id == 0 )
       {
          hypre_printf("L2 norm of b: %e\n", b_norm);
          if (b_norm == 0.0)
+         {
             hypre_printf("Rel_resid_norm actually contains the residual norm\n");
+         }
          hypre_printf("Initial L2 norm of residual: %e\n", r_norm);
       }
    }
@@ -425,11 +456,11 @@ hypre_COGMRESSolve(void  *cogmres_vdata,
       user specifies a_tol, or sets r_tol = 0.0, which means absolute
       tol only is checked  */
 
-   epsilon = hypre_max(a_tol,r_tol*den_norm);
+   epsilon = hypre_max(a_tol, r_tol * den_norm);
 
    /* so now our stop criteria is |r_i| <= epsilon */
 
-   if ( print_level>1 && my_id == 0 )
+   if ( print_level > 1 && my_id == 0 )
    {
       if (b_norm > 0.0)
       {
@@ -456,13 +487,13 @@ hypre_COGMRESSolve(void  *cogmres_vdata,
       rs[0] = r_norm;
       if (r_norm == 0.0)
       {
-         hypre_TFreeF(c,cogmres_functions);
-         hypre_TFreeF(s,cogmres_functions);
-         hypre_TFreeF(rs,cogmres_functions);
-         hypre_TFreeF(rv,cogmres_functions);
-         if (rel_change)  hypre_TFreeF(rs_2,cogmres_functions);
-         hypre_TFreeF(hh,cogmres_functions);
-         hypre_TFreeF(uu,cogmres_functions);
+         hypre_TFreeF(c, cogmres_functions);
+         hypre_TFreeF(s, cogmres_functions);
+         hypre_TFreeF(rs, cogmres_functions);
+         hypre_TFreeF(rv, cogmres_functions);
+         if (rel_change) { hypre_TFreeF(rs_2, cogmres_functions); }
+         hypre_TFreeF(hh, cogmres_functions);
+         hypre_TFreeF(uu, cogmres_functions);
          HYPRE_ANNOTATE_FUNC_END;
 
          return hypre_error_flag;
@@ -476,120 +507,130 @@ hypre_COGMRESSolve(void  *cogmres_vdata,
          if (!rel_change) /* shouldn't exit after no iterations if
                            * relative change is on*/
          {
-            (*(cogmres_functions->CopyVector))(b,r);
-            (*(cogmres_functions->Matvec))(matvec_data,-1.0,A,x,1.0,r);
-            r_norm = sqrt((*(cogmres_functions->InnerProd))(r,r));
+            (*(cogmres_functions->CopyVector))(b, r);
+            (*(cogmres_functions->Matvec))(matvec_data, -1.0, A, x, 1.0, r);
+            r_norm = hypre_sqrt((*(cogmres_functions->InnerProd))(r, r));
             if (r_norm  <= epsilon)
             {
-               if ( print_level>1 && my_id == 0)
+               if ( print_level > 1 && my_id == 0)
                {
                   hypre_printf("\n\n");
                   hypre_printf("Final L2 norm of residual: %e\n\n", r_norm);
                }
                break;
             }
-            else if ( print_level>0 && my_id == 0)
+            else if ( print_level > 0 && my_id == 0)
+            {
                hypre_printf("false convergence 1\n");
+            }
          }
       }
 
 
 
       t = 1.0 / r_norm;
-      (*(cogmres_functions->ScaleVector))(t,p[0]);
+      (*(cogmres_functions->ScaleVector))(t, p[0]);
       i = 0;
       /***RESTART CYCLE (right-preconditioning) ***/
       while (i < k_dim && iter < max_iter)
       {
          i++;
          iter++;
-         itmp = (i-1)*(k_dim+1);
+         itmp = (i - 1) * (k_dim + 1);
 
          (*(cogmres_functions->ClearVector))(r);
 
-         precond(precond_data, A, p[i-1], r);
+         precond(precond_data, A, p[i - 1], r);
          (*(cogmres_functions->Matvec))(matvec_data, 1.0, A, r, 0.0, p[i]);
-         for (j=0; j<i; j++)
+         for (j = 0; j < i; j++)
+         {
             rv[j]  = 0;
+         }
 
          if (cgs > 1)
          {
-            (*(cogmres_functions->MassDotpTwo))((void *) p[i], p[i-1], p, i, unroll, &hh[itmp], &uu[itmp]);
-            for (j=0; j<i-1; j++) uu[j*(k_dim+1)+i-1] = uu[itmp+j];
-            for (j=0; j<i; j++) rv[j] = hh[itmp+j];
-            for (k=0; k < i; k++)
+            (*(cogmres_functions->MassDotpTwo))((void *) p[i], p[i - 1], p, i, unroll, &hh[itmp], &uu[itmp]);
+            for (j = 0; j < i - 1; j++) { uu[j * (k_dim + 1) + i - 1] = uu[itmp + j]; }
+            for (j = 0; j < i; j++) { rv[j] = hh[itmp + j]; }
+            for (k = 0; k < i; k++)
             {
-               for (j=0; j < i; j++)
+               for (j = 0; j < i; j++)
                {
-                  hh[itmp+j] -= (uu[k*(k_dim+1)+j]*rv[j]);
+                  hh[itmp + j] -= (uu[k * (k_dim + 1) + j] * rv[j]);
                }
             }
-            for (j=0; j<i; j++)
-               hh[itmp+j]  = -rv[j]-hh[itmp+j];
+            for (j = 0; j < i; j++)
+            {
+               hh[itmp + j]  = -rv[j] - hh[itmp + j];
+            }
          }
          else
          {
             (*(cogmres_functions->MassInnerProd))((void *) p[i], p, i, unroll, &hh[itmp]);
-            for (j=0; j<i; j++)
-               hh[itmp+j]  = -hh[itmp+j];
+            for (j = 0; j < i; j++)
+            {
+               hh[itmp + j]  = -hh[itmp + j];
+            }
          }
 
-         (*(cogmres_functions->MassAxpy))(&hh[itmp],p,p[i], i, unroll);
-         for (j=0; j<i; j++)
-            hh[itmp+j]  = -hh[itmp+j];
-         t = sqrt( (*(cogmres_functions->InnerProd))(p[i],p[i]) );
-         hh[itmp+i] = t;
+         (*(cogmres_functions->MassAxpy))(&hh[itmp], p, p[i], i, unroll);
+         for (j = 0; j < i; j++)
+         {
+            hh[itmp + j]  = -hh[itmp + j];
+         }
+         t = hypre_sqrt( (*(cogmres_functions->InnerProd))(p[i], p[i]) );
+         hh[itmp + i] = t;
 
-         if (hh[itmp+i] != 0.0)
+         if (hh[itmp + i] != 0.0)
          {
-            t = 1.0/t;
-            (*(cogmres_functions->ScaleVector))(t,p[i]);
+            t = 1.0 / t;
+            (*(cogmres_functions->ScaleVector))(t, p[i]);
          }
          for (j = 1; j < i; j++)
          {
-            t = hh[itmp+j-1];
-            hh[itmp+j-1] = s[j-1]*hh[itmp+j] + c[j-1]*t;
-            hh[itmp+j] = -s[j-1]*t + c[j-1]*hh[itmp+j];
+            t = hh[itmp + j - 1];
+            hh[itmp + j - 1] = s[j - 1] * hh[itmp + j] + c[j - 1] * t;
+            hh[itmp + j] = -s[j - 1] * t + c[j - 1] * hh[itmp + j];
          }
-         t= hh[itmp+i]*hh[itmp+i];
-         t+= hh[itmp+i-1]*hh[itmp+i-1];
-         gamma = sqrt(t);
-         if (gamma == 0.0) gamma = epsmac;
-         c[i-1] = hh[itmp+i-1]/gamma;
-         s[i-1] = hh[itmp+i]/gamma;
-         rs[i] = -hh[itmp+i]*rs[i-1];
+         t = hh[itmp + i] * hh[itmp + i];
+         t += hh[itmp + i - 1] * hh[itmp + i - 1];
+         gamma = hypre_sqrt(t);
+         if (gamma == 0.0) { gamma = epsmac; }
+         c[i - 1] = hh[itmp + i - 1] / gamma;
+         s[i - 1] = hh[itmp + i] / gamma;
+         rs[i] = -hh[itmp + i] * rs[i - 1];
          rs[i] /=  gamma;
-         rs[i-1] = c[i-1]*rs[i-1];
+         rs[i - 1] = c[i - 1] * rs[i - 1];
          // determine residual norm
-         hh[itmp+i-1] = s[i-1]*hh[itmp+i] + c[i-1]*hh[itmp+i-1];
-         r_norm = fabs(rs[i]);
-         if ( print_level>0 )
+         hh[itmp + i - 1] = s[i - 1] * hh[itmp + i] + c[i - 1] * hh[itmp + i - 1];
+         r_norm = hypre_abs(rs[i]);
+         if ( print_level > 0 )
          {
             norms[iter] = r_norm;
-            if ( print_level>1 && my_id == 0 )
+            if ( print_level > 1 && my_id == 0 )
             {
                if (b_norm > 0.0)
                   hypre_printf("% 5d    %e    %f   %e\n", iter,
-                     norms[iter],norms[iter]/norms[iter-1],
-                     norms[iter]/b_norm);
+                               norms[iter], norms[iter] / norms[iter - 1],
+                               norms[iter] / b_norm);
                else
                   hypre_printf("% 5d    %e    %f\n", iter, norms[iter],
-                     norms[iter]/norms[iter-1]);
+                               norms[iter] / norms[iter - 1]);
             }
          }
          /*convergence factor tolerance */
          if (cf_tol > 0.0)
          {
             cf_ave_0 = cf_ave_1;
-            cf_ave_1 = pow( r_norm / r_norm_0, 1.0/(2.0*iter));
+            cf_ave_1 = hypre_pow( r_norm / r_norm_0, 1.0 / (2.0 * iter));
 
-            weight = fabs(cf_ave_1 - cf_ave_0);
+            weight = hypre_abs(cf_ave_1 - cf_ave_0);
             weight = weight / hypre_max(cf_ave_1, cf_ave_0);
 
             weight = 1.0 - weight;
 #if 0
-           hypre_printf("I = %d: cf_new = %e, cf_old = %e, weight = %e\n",
-              i, cf_ave_1, cf_ave_0, weight );
+            hypre_printf("I = %d: cf_new = %e, cf_old = %e, weight = %e\n",
+                         i, cf_ave_1, cf_ave_0, weight );
 #endif
             if (weight * cf_ave_1 > cf_tol)
             {
@@ -613,42 +654,47 @@ hypre_COGMRESSolve(void  *cogmres_vdata,
                   and check the relative change outside the cycle.
                   Here we will check the relative here as we don't
                   want to exit the restart cycle prematurely */
-               for (k=0; k<i; k++) /* extra copy of rs so we don't need
+               for (k = 0; k < i; k++) /* extra copy of rs so we don't need
                                    to change the later solve */
+               {
                   rs_2[k] = rs[k];
+               }
 
                /* solve tri. system*/
-               rs_2[i-1] = rs_2[i-1]/hh[itmp+i-1];
-               for (k = i-2; k >= 0; k--)
+               rs_2[i - 1] = rs_2[i - 1] / hh[itmp + i - 1];
+               for (k = i - 2; k >= 0; k--)
                {
                   t = 0.0;
-                  for (j = k+1; j < i; j++)
+                  for (j = k + 1; j < i; j++)
                   {
-                     t -= hh[j*(k_dim+1)+k]*rs_2[j];
+                     t -= hh[j * (k_dim + 1) + k] * rs_2[j];
                   }
-                  t+= rs_2[k];
-                  rs_2[k] = t/hh[k*(k_dim+1)+k];
+                  t += rs_2[k];
+                  rs_2[k] = t / hh[k * (k_dim + 1) + k];
                }
-               (*(cogmres_functions->CopyVector))(p[i-1],w);
-               (*(cogmres_functions->ScaleVector))(rs_2[i-1],w);
-               for (j = i-2; j >=0; j--)
+               (*(cogmres_functions->CopyVector))(p[i - 1], w);
+               (*(cogmres_functions->ScaleVector))(rs_2[i - 1], w);
+               for (j = i - 2; j >= 0; j--)
+               {
                   (*(cogmres_functions->Axpy))(rs_2[j], p[j], w);
+               }
 
                (*(cogmres_functions->ClearVector))(r);
                /* find correction (in r) */
                precond(precond_data, A, w, r);
                /* copy current solution (x) to w (don't want to over-write x)*/
-               (*(cogmres_functions->CopyVector))(x,w);
+               (*(cogmres_functions->CopyVector))(x, w);
 
                /* add the correction */
-               (*(cogmres_functions->Axpy))(1.0,r,w);
+               (*(cogmres_functions->Axpy))(1.0, r, w);
 
                /* now w is the approx solution  - get the norm*/
-               x_norm = sqrt( (*(cogmres_functions->InnerProd))(w,w) );
+               x_norm = hypre_sqrt( (*(cogmres_functions->InnerProd))(w, w) );
 
                if ( !(x_norm <= guard_zero_residual ))
                   /* don't divide by zero */
-               {  /* now get  x_i - x_i-1 */
+               {
+                  /* now get  x_i - x_i-1 */
                   if (num_rel_change_check)
                   {
                      /* have already checked once so we can avoid another precond.
@@ -667,15 +713,15 @@ hypre_COGMRESSolve(void  *cogmres_vdata,
                      (*(cogmres_functions->CopyVector))(w, w_2);
 
                      (*(cogmres_functions->ClearVector))(w);
-                     (*(cogmres_functions->Axpy))(rs_2[i-1], p[i-1], w);
+                     (*(cogmres_functions->Axpy))(rs_2[i - 1], p[i - 1], w);
                      (*(cogmres_functions->ClearVector))(r);
                      /* apply the preconditioner */
                      precond(precond_data, A, w, r);
                      /* now r contains x_i - x_i-1 */
                   }
                   /* find the norm of x_i - x_i-1 */
-                  w_norm = sqrt( (*(cogmres_functions->InnerProd))(r,r) );
-                  relative_error = w_norm/x_norm;
+                  w_norm = hypre_sqrt( (*(cogmres_functions->InnerProd))(r, r) );
+                  relative_error = w_norm / x_norm;
                   if (relative_error <= r_tol)
                   {
                      rel_change_passed = 1;
@@ -697,31 +743,33 @@ hypre_COGMRESSolve(void  *cogmres_vdata,
       } /*** end of restart cycle ***/
 
       /* now compute solution, first solve upper triangular system */
-      if (break_value) break;
+      if (break_value) { break; }
 
-      rs[i-1] = rs[i-1]/hh[itmp+i-1];
-      for (k = i-2; k >= 0; k--)
+      rs[i - 1] = rs[i - 1] / hh[itmp + i - 1];
+      for (k = i - 2; k >= 0; k--)
       {
          t = 0.0;
-         for (j = k+1; j < i; j++)
+         for (j = k + 1; j < i; j++)
          {
-            t -= hh[j*(k_dim+1)+k]*rs[j];
+            t -= hh[j * (k_dim + 1) + k] * rs[j];
          }
-         t+= rs[k];
-         rs[k] = t/hh[k*(k_dim+1)+k];
+         t += rs[k];
+         rs[k] = t / hh[k * (k_dim + 1) + k];
       }
 
-      (*(cogmres_functions->CopyVector))(p[i-1],w);
-      (*(cogmres_functions->ScaleVector))(rs[i-1],w);
-      for (j = i-2; j >=0; j--)
+      (*(cogmres_functions->CopyVector))(p[i - 1], w);
+      (*(cogmres_functions->ScaleVector))(rs[i - 1], w);
+      for (j = i - 2; j >= 0; j--)
+      {
          (*(cogmres_functions->Axpy))(rs[j], p[j], w);
+      }
 
       (*(cogmres_functions->ClearVector))(r);
       /* find correction (in r) */
       precond(precond_data, A, w, r);
 
       /* update current solution x (in x) */
-      (*(cogmres_functions->Axpy))(1.0,r,x);
+      (*(cogmres_functions->Axpy))(1.0, r, x);
 
 
       /* check for convergence by evaluating the actual residual */
@@ -734,32 +782,32 @@ hypre_COGMRESSolve(void  *cogmres_vdata,
          }
 
          /* calculate actual residual norm*/
-         (*(cogmres_functions->CopyVector))(b,r);
-         (*(cogmres_functions->Matvec))(matvec_data,-1.0,A,x,1.0,r);
-         real_r_norm_new = r_norm = sqrt( (*(cogmres_functions->InnerProd))(r,r) );
+         (*(cogmres_functions->CopyVector))(b, r);
+         (*(cogmres_functions->Matvec))(matvec_data, -1.0, A, x, 1.0, r);
+         real_r_norm_new = r_norm = hypre_sqrt( (*(cogmres_functions->InnerProd))(r, r) );
 
          if (r_norm <= epsilon)
          {
             if (rel_change && !rel_change_passed) /* calculate the relative change */
             {
                /* calculate the norm of the solution */
-               x_norm = sqrt( (*(cogmres_functions->InnerProd))(x,x) );
+               x_norm = hypre_sqrt( (*(cogmres_functions->InnerProd))(x, x) );
 
                if ( !(x_norm <= guard_zero_residual ))
-               /* don't divide by zero */
+                  /* don't divide by zero */
                {
                   (*(cogmres_functions->ClearVector))(w);
-                  (*(cogmres_functions->Axpy))(rs[i-1], p[i-1], w);
+                  (*(cogmres_functions->Axpy))(rs[i - 1], p[i - 1], w);
                   (*(cogmres_functions->ClearVector))(r);
                   /* apply the preconditioner */
                   precond(precond_data, A, w, r);
                   /* find the norm of x_i - x_i-1 */
-                  w_norm = sqrt( (*(cogmres_functions->InnerProd))(r,r) );
-                  relative_error= w_norm/x_norm;
+                  w_norm = hypre_sqrt( (*(cogmres_functions->InnerProd))(r, r) );
+                  relative_error = w_norm / x_norm;
                   if ( relative_error < r_tol )
                   {
                      (cogmres_data -> converged) = 1;
-                     if ( print_level>1 && my_id == 0 )
+                     if ( print_level > 1 && my_id == 0 )
                      {
                         hypre_printf("\n\n");
                         hypre_printf("Final L2 norm of residual: %e\n\n", r_norm);
@@ -770,7 +818,7 @@ hypre_COGMRESSolve(void  *cogmres_vdata,
                else
                {
                   (cogmres_data -> converged) = 1;
-                  if ( print_level>1 && my_id == 0 )
+                  if ( print_level > 1 && my_id == 0 )
                   {
                      hypre_printf("\n\n");
                      hypre_printf("Final L2 norm of residual: %e\n\n", r_norm);
@@ -780,7 +828,7 @@ hypre_COGMRESSolve(void  *cogmres_vdata,
             }
             else /* don't need to check rel. change */
             {
-               if ( print_level>1 && my_id == 0 )
+               if ( print_level > 1 && my_id == 0 )
                {
                   hypre_printf("\n\n");
                   hypre_printf("Final L2 norm of residual: %e\n\n", r_norm);
@@ -803,29 +851,33 @@ hypre_COGMRESSolve(void  *cogmres_vdata,
                break;
             }
             /* report discrepancy between real/COGMRES residuals and restart */
-            if ( print_level>0 && my_id == 0)
+            if ( print_level > 0 && my_id == 0)
+            {
                hypre_printf("false convergence 2, L2 norm of residual: %e\n", r_norm);
-            (*(cogmres_functions->CopyVector))(r,p[0]);
+            }
+            (*(cogmres_functions->CopyVector))(r, p[0]);
             i = 0;
             real_r_norm_old = real_r_norm_new;
          }
       } /* end of convergence check */
 
       /* compute residual vector and continue loop */
-      for (j=i ; j > 0; j--)
+      for (j = i ; j > 0; j--)
       {
-         rs[j-1] = -s[j-1]*rs[j];
-         rs[j] = c[j-1]*rs[j];
+         rs[j - 1] = -s[j - 1] * rs[j];
+         rs[j] = c[j - 1] * rs[j];
       }
 
-      if (i) (*(cogmres_functions->Axpy))(rs[i]-1.0,p[i],p[i]);
-      for (j=i-1 ; j > 0; j--)
-         (*(cogmres_functions->Axpy))(rs[j],p[j],p[i]);
+      if (i) { (*(cogmres_functions->Axpy))(rs[i] - 1.0, p[i], p[i]); }
+      for (j = i - 1 ; j > 0; j--)
+      {
+         (*(cogmres_functions->Axpy))(rs[j], p[j], p[i]);
+      }
 
       if (i)
       {
-         (*(cogmres_functions->Axpy))(rs[0]-1.0,p[0],p[0]);
-         (*(cogmres_functions->Axpy))(1.0,p[i],p[0]);
+         (*(cogmres_functions->Axpy))(rs[0] - 1.0, p[0], p[0]);
+         (*(cogmres_functions->Axpy))(1.0, p[i], p[0]);
       }
 
    } /* END of iteration while loop */
@@ -833,25 +885,29 @@ hypre_COGMRESSolve(void  *cogmres_vdata,
 
    (cogmres_data -> num_iterations) = iter;
    if (b_norm > 0.0)
-      (cogmres_data -> rel_residual_norm) = r_norm/b_norm;
+   {
+      (cogmres_data -> rel_residual_norm) = r_norm / b_norm;
+   }
    if (b_norm == 0.0)
+   {
       (cogmres_data -> rel_residual_norm) = r_norm;
+   }
 
-   if (iter >= max_iter && r_norm > epsilon && epsilon > 0) hypre_error(HYPRE_ERROR_CONV);
+   if (iter >= max_iter && r_norm > epsilon && epsilon > 0) { hypre_error(HYPRE_ERROR_CONV); }
 
-   hypre_TFreeF(c,cogmres_functions);
-   hypre_TFreeF(s,cogmres_functions);
-   hypre_TFreeF(rs,cogmres_functions);
-   hypre_TFreeF(rv,cogmres_functions);
-   if (rel_change)  hypre_TFreeF(rs_2,cogmres_functions);
+   hypre_TFreeF(c, cogmres_functions);
+   hypre_TFreeF(s, cogmres_functions);
+   hypre_TFreeF(rs, cogmres_functions);
+   hypre_TFreeF(rv, cogmres_functions);
+   if (rel_change) { hypre_TFreeF(rs_2, cogmres_functions); }
 
    /*for (i=0; i < k_dim+1; i++)
    {
       hypre_TFreeF(hh[i],cogmres_functions);
       hypre_TFreeF(uu[i],cogmres_functions);
    }*/
-   hypre_TFreeF(hh,cogmres_functions);
-   hypre_TFreeF(uu,cogmres_functions);
+   hypre_TFreeF(hh, cogmres_functions);
+   hypre_TFreeF(uu, cogmres_functions);
 
    HYPRE_ANNOTATE_FUNC_END;
 
@@ -864,16 +920,16 @@ hypre_COGMRESSolve(void  *cogmres_vdata,
 
 HYPRE_Int
 hypre_COGMRESSetKDim( void   *cogmres_vdata,
-        HYPRE_Int   k_dim )
+                      HYPRE_Int   k_dim )
 {
-   hypre_COGMRESData *cogmres_data =(hypre_COGMRESData *) cogmres_vdata;
+   hypre_COGMRESData *cogmres_data = (hypre_COGMRESData *) cogmres_vdata;
    (cogmres_data -> k_dim) = k_dim;
    return hypre_error_flag;
 }
 
 HYPRE_Int
 hypre_COGMRESGetKDim( void   *cogmres_vdata,
-        HYPRE_Int * k_dim )
+                      HYPRE_Int * k_dim )
 {
    hypre_COGMRESData *cogmres_data = (hypre_COGMRESData *)cogmres_vdata;
    *k_dim = (cogmres_data -> k_dim);
@@ -886,16 +942,16 @@ hypre_COGMRESGetKDim( void   *cogmres_vdata,
 
 HYPRE_Int
 hypre_COGMRESSetUnroll( void   *cogmres_vdata,
-        HYPRE_Int   unroll )
+                        HYPRE_Int   unroll )
 {
-   hypre_COGMRESData *cogmres_data =(hypre_COGMRESData *) cogmres_vdata;
+   hypre_COGMRESData *cogmres_data = (hypre_COGMRESData *) cogmres_vdata;
    (cogmres_data -> unroll) = unroll;
    return hypre_error_flag;
 }
 
 HYPRE_Int
 hypre_COGMRESGetUnroll( void   *cogmres_vdata,
-        HYPRE_Int * unroll )
+                        HYPRE_Int * unroll )
 {
    hypre_COGMRESData *cogmres_data = (hypre_COGMRESData *)cogmres_vdata;
    *unroll = (cogmres_data -> unroll);
@@ -908,16 +964,16 @@ hypre_COGMRESGetUnroll( void   *cogmres_vdata,
 
 HYPRE_Int
 hypre_COGMRESSetCGS( void   *cogmres_vdata,
-        HYPRE_Int   cgs )
+                     HYPRE_Int   cgs )
 {
-   hypre_COGMRESData *cogmres_data =(hypre_COGMRESData *) cogmres_vdata;
+   hypre_COGMRESData *cogmres_data = (hypre_COGMRESData *) cogmres_vdata;
    (cogmres_data -> cgs) = cgs;
    return hypre_error_flag;
 }
 
 HYPRE_Int
 hypre_COGMRESGetCGS( void   *cogmres_vdata,
-        HYPRE_Int * cgs )
+                     HYPRE_Int * cgs )
 {
    hypre_COGMRESData *cogmres_data = (hypre_COGMRESData *)cogmres_vdata;
    *cgs = (cogmres_data -> cgs);
@@ -930,7 +986,7 @@ hypre_COGMRESGetCGS( void   *cogmres_vdata,
 
 HYPRE_Int
 hypre_COGMRESSetTol( void   *cogmres_vdata,
-        HYPRE_Real  tol       )
+                     HYPRE_Real  tol       )
 {
    hypre_COGMRESData *cogmres_data = (hypre_COGMRESData *)cogmres_vdata;
    (cogmres_data -> tol) = tol;
@@ -939,7 +995,7 @@ hypre_COGMRESSetTol( void   *cogmres_vdata,
 
 HYPRE_Int
 hypre_COGMRESGetTol( void   *cogmres_vdata,
-        HYPRE_Real  * tol      )
+                     HYPRE_Real  * tol      )
 {
    hypre_COGMRESData *cogmres_data = (hypre_COGMRESData *)cogmres_vdata;
    *tol = (cogmres_data -> tol);
@@ -951,7 +1007,7 @@ hypre_COGMRESGetTol( void   *cogmres_vdata,
 
 HYPRE_Int
 hypre_COGMRESSetAbsoluteTol( void   *cogmres_vdata,
-        HYPRE_Real  a_tol       )
+                             HYPRE_Real  a_tol       )
 {
    hypre_COGMRESData *cogmres_data = (hypre_COGMRESData *)cogmres_vdata;
    (cogmres_data -> a_tol) = a_tol;
@@ -960,7 +1016,7 @@ hypre_COGMRESSetAbsoluteTol( void   *cogmres_vdata,
 
 HYPRE_Int
 hypre_COGMRESGetAbsoluteTol( void   *cogmres_vdata,
-        HYPRE_Real  * a_tol      )
+                             HYPRE_Real  * a_tol      )
 {
    hypre_COGMRESData *cogmres_data = (hypre_COGMRESData *)cogmres_vdata;
    *a_tol = (cogmres_data -> a_tol);
@@ -972,7 +1028,7 @@ hypre_COGMRESGetAbsoluteTol( void   *cogmres_vdata,
 
 HYPRE_Int
 hypre_COGMRESSetConvergenceFactorTol( void   *cogmres_vdata,
-        HYPRE_Real  cf_tol       )
+                                      HYPRE_Real  cf_tol       )
 {
    hypre_COGMRESData *cogmres_data = (hypre_COGMRESData *)cogmres_vdata;
    (cogmres_data -> cf_tol) = cf_tol;
@@ -981,7 +1037,7 @@ hypre_COGMRESSetConvergenceFactorTol( void   *cogmres_vdata,
 
 HYPRE_Int
 hypre_COGMRESGetConvergenceFactorTol( void   *cogmres_vdata,
-        HYPRE_Real * cf_tol       )
+                                      HYPRE_Real * cf_tol       )
 {
    hypre_COGMRESData *cogmres_data = (hypre_COGMRESData *)cogmres_vdata;
    *cf_tol = (cogmres_data -> cf_tol);
@@ -994,7 +1050,7 @@ hypre_COGMRESGetConvergenceFactorTol( void   *cogmres_vdata,
 
 HYPRE_Int
 hypre_COGMRESSetMinIter( void *cogmres_vdata,
-        HYPRE_Int   min_iter  )
+                         HYPRE_Int   min_iter  )
 {
    hypre_COGMRESData *cogmres_data = (hypre_COGMRESData *)cogmres_vdata;
    (cogmres_data -> min_iter) = min_iter;
@@ -1003,7 +1059,7 @@ hypre_COGMRESSetMinIter( void *cogmres_vdata,
 
 HYPRE_Int
 hypre_COGMRESGetMinIter( void *cogmres_vdata,
-        HYPRE_Int * min_iter  )
+                         HYPRE_Int * min_iter  )
 {
    hypre_COGMRESData *cogmres_data = (hypre_COGMRESData *)cogmres_vdata;
    *min_iter = (cogmres_data -> min_iter);
@@ -1016,7 +1072,7 @@ hypre_COGMRESGetMinIter( void *cogmres_vdata,
 
 HYPRE_Int
 hypre_COGMRESSetMaxIter( void *cogmres_vdata,
-        HYPRE_Int   max_iter  )
+                         HYPRE_Int   max_iter  )
 {
    hypre_COGMRESData *cogmres_data = (hypre_COGMRESData *)cogmres_vdata;
    (cogmres_data -> max_iter) = max_iter;
@@ -1025,7 +1081,7 @@ hypre_COGMRESSetMaxIter( void *cogmres_vdata,
 
 HYPRE_Int
 hypre_COGMRESGetMaxIter( void *cogmres_vdata,
-        HYPRE_Int * max_iter  )
+                         HYPRE_Int * max_iter  )
 {
    hypre_COGMRESData *cogmres_data = (hypre_COGMRESData *)cogmres_vdata;
    *max_iter = (cogmres_data -> max_iter);
@@ -1038,7 +1094,7 @@ hypre_COGMRESGetMaxIter( void *cogmres_vdata,
 
 HYPRE_Int
 hypre_COGMRESSetRelChange( void *cogmres_vdata,
-        HYPRE_Int   rel_change  )
+                           HYPRE_Int   rel_change  )
 {
    hypre_COGMRESData *cogmres_data = (hypre_COGMRESData *)cogmres_vdata;
    (cogmres_data -> rel_change) = rel_change;
@@ -1047,7 +1103,7 @@ hypre_COGMRESSetRelChange( void *cogmres_vdata,
 
 HYPRE_Int
 hypre_COGMRESGetRelChange( void *cogmres_vdata,
-        HYPRE_Int * rel_change  )
+                           HYPRE_Int * rel_change  )
 {
    hypre_COGMRESData *cogmres_data = (hypre_COGMRESData *)cogmres_vdata;
    *rel_change = (cogmres_data -> rel_change);
@@ -1060,7 +1116,7 @@ hypre_COGMRESGetRelChange( void *cogmres_vdata,
 
 HYPRE_Int
 hypre_COGMRESSetSkipRealResidualCheck( void *cogmres_vdata,
-        HYPRE_Int skip_real_r_check )
+                                       HYPRE_Int skip_real_r_check )
 {
    hypre_COGMRESData *cogmres_data = (hypre_COGMRESData *)cogmres_vdata;
    (cogmres_data -> skip_real_r_check) = skip_real_r_check;
@@ -1069,7 +1125,7 @@ hypre_COGMRESSetSkipRealResidualCheck( void *cogmres_vdata,
 
 HYPRE_Int
 hypre_COGMRESGetSkipRealResidualCheck( void *cogmres_vdata,
-        HYPRE_Int *skip_real_r_check)
+                                       HYPRE_Int *skip_real_r_check)
 {
    hypre_COGMRESData *cogmres_data = (hypre_COGMRESData *)cogmres_vdata;
    *skip_real_r_check = (cogmres_data -> skip_real_r_check);
@@ -1082,9 +1138,9 @@ hypre_COGMRESGetSkipRealResidualCheck( void *cogmres_vdata,
 
 HYPRE_Int
 hypre_COGMRESSetPrecond( void  *cogmres_vdata,
-        HYPRE_Int  (*precond)(void*,void*,void*,void*),
-        HYPRE_Int  (*precond_setup)(void*,void*,void*,void*),
-        void  *precond_data )
+                         HYPRE_Int  (*precond)(void*, void*, void*, void*),
+                         HYPRE_Int  (*precond_setup)(void*, void*, void*, void*),
+                         void  *precond_data )
 {
    hypre_COGMRESData *cogmres_data = (hypre_COGMRESData *)cogmres_vdata;
    hypre_COGMRESFunctions *cogmres_functions = cogmres_data->functions;
@@ -1100,7 +1156,7 @@ hypre_COGMRESSetPrecond( void  *cogmres_vdata,
 
 HYPRE_Int
 hypre_COGMRESGetPrecond( void         *cogmres_vdata,
-        HYPRE_Solver *precond_data_ptr )
+                         HYPRE_Solver *precond_data_ptr )
 {
    hypre_COGMRESData *cogmres_data = (hypre_COGMRESData *)cogmres_vdata;
    *precond_data_ptr = (HYPRE_Solver)(cogmres_data -> precond_data);
@@ -1113,7 +1169,7 @@ hypre_COGMRESGetPrecond( void         *cogmres_vdata,
 
 HYPRE_Int
 hypre_COGMRESSetPrintLevel( void *cogmres_vdata,
-        HYPRE_Int   level)
+                            HYPRE_Int   level)
 {
    hypre_COGMRESData *cogmres_data = (hypre_COGMRESData *)cogmres_vdata;
    (cogmres_data -> print_level) = level;
@@ -1122,7 +1178,7 @@ hypre_COGMRESSetPrintLevel( void *cogmres_vdata,
 
 HYPRE_Int
 hypre_COGMRESGetPrintLevel( void *cogmres_vdata,
-        HYPRE_Int * level)
+                            HYPRE_Int * level)
 {
    hypre_COGMRESData *cogmres_data = (hypre_COGMRESData *)cogmres_vdata;
    *level = (cogmres_data -> print_level);
@@ -1135,7 +1191,7 @@ hypre_COGMRESGetPrintLevel( void *cogmres_vdata,
 
 HYPRE_Int
 hypre_COGMRESSetLogging( void *cogmres_vdata,
-        HYPRE_Int   level)
+                         HYPRE_Int   level)
 {
    hypre_COGMRESData *cogmres_data = (hypre_COGMRESData *)cogmres_vdata;
    (cogmres_data -> logging) = level;
@@ -1144,7 +1200,7 @@ hypre_COGMRESSetLogging( void *cogmres_vdata,
 
 HYPRE_Int
 hypre_COGMRESGetLogging( void *cogmres_vdata,
-        HYPRE_Int * level)
+                         HYPRE_Int * level)
 {
    hypre_COGMRESData *cogmres_data = (hypre_COGMRESData *)cogmres_vdata;
    *level = (cogmres_data -> logging);
@@ -1157,7 +1213,7 @@ hypre_COGMRESGetLogging( void *cogmres_vdata,
 
 HYPRE_Int
 hypre_COGMRESGetNumIterations( void *cogmres_vdata,
-        HYPRE_Int  *num_iterations )
+                               HYPRE_Int  *num_iterations )
 {
    hypre_COGMRESData *cogmres_data = (hypre_COGMRESData *)cogmres_vdata;
    *num_iterations = (cogmres_data -> num_iterations);
@@ -1170,7 +1226,7 @@ hypre_COGMRESGetNumIterations( void *cogmres_vdata,
 
 HYPRE_Int
 hypre_COGMRESGetConverged( void *cogmres_vdata,
-        HYPRE_Int  *converged )
+                           HYPRE_Int  *converged )
 {
    hypre_COGMRESData *cogmres_data = (hypre_COGMRESData *)cogmres_vdata;
    *converged = (cogmres_data -> converged);
@@ -1183,7 +1239,7 @@ hypre_COGMRESGetConverged( void *cogmres_vdata,
 
 HYPRE_Int
 hypre_COGMRESGetFinalRelativeResidualNorm( void   *cogmres_vdata,
-        HYPRE_Real *relative_residual_norm )
+                                           HYPRE_Real *relative_residual_norm )
 {
    hypre_COGMRESData *cogmres_data = (hypre_COGMRESData *)cogmres_vdata;
    *relative_residual_norm = (cogmres_data -> rel_residual_norm);
@@ -1193,7 +1249,7 @@ hypre_COGMRESGetFinalRelativeResidualNorm( void   *cogmres_vdata,
 
 HYPRE_Int
 hypre_COGMRESSetModifyPC(void *cogmres_vdata,
-      HYPRE_Int (*modify_pc)(void *precond_data, HYPRE_Int iteration, HYPRE_Real rel_residual_norm))
+                         HYPRE_Int (*modify_pc)(void *precond_data, HYPRE_Int iteration, HYPRE_Real rel_residual_norm))
 {
    hypre_COGMRESData *cogmres_data = (hypre_COGMRESData *)cogmres_vdata;
    hypre_COGMRESFunctions *cogmres_functions = cogmres_data->functions;
diff --git a/external/hypre/src/krylov/cogmres.h b/external/hypre/src/krylov/cogmres.h
index 4f561814..d939379b 100644
--- a/external/hypre/src/krylov/cogmres.h
+++ b/external/hypre/src/krylov/cogmres.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -59,16 +59,18 @@ typedef struct
    HYPRE_Int    (*MatvecDestroy) ( void *matvec_data );
    HYPRE_Real   (*InnerProd)     ( void *x, void *y );
    HYPRE_Int    (*MassInnerProd) ( void *x, void **p, HYPRE_Int k, HYPRE_int unroll, void *result);
-   HYPRE_Int    (*MassDotpTwo)( void *x, void *y, void **p, HYPRE_Int k, void *result_x, HYPRE_int unroll, void *result_y);
+   HYPRE_Int    (*MassDotpTwo)( void *x, void *y, void **p, HYPRE_Int k, void *result_x,
+                                HYPRE_int unroll, void *result_y);
    HYPRE_Int    (*CopyVector)    ( void *x, void *y );
    HYPRE_Int    (*ClearVector)   ( void *x );
    HYPRE_Int    (*ScaleVector)   ( HYPRE_Complex alpha, void *x );
    HYPRE_Int    (*Axpy)          ( HYPRE_Complex alpha, void *x, void *y );
-   HYPRE_Int    (*MassAxpy)      ( HYPRE_Complex *alpha, void **x, void *y, HYPRE_Int k, HYPRE_Int unroll);
+   HYPRE_Int    (*MassAxpy)      ( HYPRE_Complex *alpha, void **x, void *y, HYPRE_Int k,
+                                   HYPRE_Int unroll);
    HYPRE_Int    (*precond)       ();
    HYPRE_Int    (*precond_setup) ();
 
-    HYPRE_Int    (*modify_pc)(void *precond_data, HYPRE_Int iteration, HYPRE_Real rel_residual_norm );
+   HYPRE_Int    (*modify_pc)(void *precond_data, HYPRE_Int iteration, HYPRE_Real rel_residual_norm );
 
 } hypre_COGMRESFunctions;
 
@@ -104,7 +106,7 @@ typedef struct
 
    /* log info (always logged) */
    HYPRE_Int      num_iterations;
- 
+
    HYPRE_Int     print_level; /* printing when print_level>0 */
    HYPRE_Int     logging;  /* extra computations for logging when logging>0 */
    HYPRE_Real  *norms;
@@ -144,15 +146,17 @@ hypre_COGMRESFunctionsCreate(
    HYPRE_Int    (*MatvecDestroy) ( void *matvec_data ),
    HYPRE_Real   (*InnerProd)     ( void *x, void *y ),
    HYPRE_Int    (*MassInnerProd) ( void *x, void **p, HYPRE_Int k, HYPRE_Int unroll, void *result),
-   HYPRE_Int    (*MassDotpTwo)   ( void *x, void *y, void **p, HYPRE_Int k, HYPRE_Int unroll, void *result_x, void *result_y),
+   HYPRE_Int    (*MassDotpTwo)   ( void *x, void *y, void **p, HYPRE_Int k, HYPRE_Int unroll,
+                                   void *result_x, void *result_y),
    HYPRE_Int    (*CopyVector)    ( void *x, void *y ),
    HYPRE_Int    (*ClearVector)   ( void *x ),
    HYPRE_Int    (*ScaleVector)   ( HYPRE_Complex alpha, void *x ),
    HYPRE_Int    (*Axpy)          ( HYPRE_Complex alpha, void *x, void *y ),
-   HYPRE_Int    (*MassAxpy)      ( HYPRE_Complex *alpha, void **x, void *y, HYPRE_Int k, HYPRE_Int unroll),   
+   HYPRE_Int    (*MassAxpy)      ( HYPRE_Complex *alpha, void **x, void *y, HYPRE_Int k,
+                                   HYPRE_Int unroll),
    HYPRE_Int    (*PrecondSetup)  ( void *vdata, void *A, void *b, void *x ),
    HYPRE_Int    (*Precond)       ( void *vdata, void *A, void *b, void *x )
-   );
+);
 
 /**
  * Description...
diff --git a/external/hypre/src/krylov/flexgmres.c b/external/hypre/src/krylov/flexgmres.c
index 505e527d..b8bad83c 100644
--- a/external/hypre/src/krylov/flexgmres.c
+++ b/external/hypre/src/krylov/flexgmres.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -38,11 +38,11 @@ hypre_FlexGMRESFunctionsCreate(
    HYPRE_Int    (*Axpy)          ( HYPRE_Complex alpha, void *x, void *y ),
    HYPRE_Int    (*PrecondSetup)  ( void *vdata, void *A, void *b, void *x ),
    HYPRE_Int    (*Precond)       ( void *vdata, void *A, void *b, void *x )
-   )
+)
 {
    hypre_FlexGMRESFunctions * fgmres_functions;
    fgmres_functions = (hypre_FlexGMRESFunctions *)
-      CAlloc( 1, sizeof(hypre_FlexGMRESFunctions), HYPRE_MEMORY_HOST );
+                      CAlloc( 1, sizeof(hypre_FlexGMRESFunctions), HYPRE_MEMORY_HOST );
 
    fgmres_functions->CAlloc = CAlloc;
    fgmres_functions->Free = Free;
@@ -58,7 +58,7 @@ hypre_FlexGMRESFunctionsCreate(
    fgmres_functions->ClearVector = ClearVector;
    fgmres_functions->ScaleVector = ScaleVector;
    fgmres_functions->Axpy = Axpy;
-/* default preconditioner must be set here but can be changed later... */
+   /* default preconditioner must be set here but can be changed later... */
    fgmres_functions->precond_setup = PrecondSetup;
    fgmres_functions->precond       = Precond;
 
@@ -122,28 +122,40 @@ hypre_FlexGMRESDestroy( void *fgmres_vdata )
    if (fgmres_data)
    {
       hypre_FlexGMRESFunctions *fgmres_functions = fgmres_data->functions;
-      if ( (fgmres_data->logging>0) || (fgmres_data->print_level) > 0 )
+      if ( (fgmres_data->logging > 0) || (fgmres_data->print_level) > 0 )
       {
          if ( (fgmres_data -> norms) != NULL )
+         {
             hypre_TFreeF( fgmres_data -> norms, fgmres_functions );
+         }
       }
 
       if ( (fgmres_data -> matvec_data) != NULL )
+      {
          (*(fgmres_functions->MatvecDestroy))(fgmres_data -> matvec_data);
+      }
 
       if ( (fgmres_data -> r) != NULL )
+      {
          (*(fgmres_functions->DestroyVector))(fgmres_data -> r);
+      }
       if ( (fgmres_data -> w) != NULL )
+      {
          (*(fgmres_functions->DestroyVector))(fgmres_data -> w);
+      }
       if ( (fgmres_data -> w_2) != NULL )
+      {
          (*(fgmres_functions->DestroyVector))(fgmres_data -> w_2);
+      }
 
       if ( (fgmres_data -> p) != NULL )
       {
-         for (i = 0; i < (fgmres_data -> k_dim+1); i++)
+         for (i = 0; i < (fgmres_data -> k_dim + 1); i++)
          {
             if ( (fgmres_data -> p)[i] != NULL )
-	       (*(fgmres_functions->DestroyVector))( (fgmres_data -> p) [i]);
+            {
+               (*(fgmres_functions->DestroyVector))( (fgmres_data -> p) [i]);
+            }
          }
          hypre_TFreeF( fgmres_data->p, fgmres_functions );
       }
@@ -154,7 +166,9 @@ hypre_FlexGMRESDestroy( void *fgmres_vdata )
          for (i = 0; i < (fgmres_data -> k_dim + 1); i++)
          {
             if ( (fgmres_data -> pre_vecs)[i] != NULL )
-	       (*(fgmres_functions->DestroyVector))( (fgmres_data -> pre_vecs) [i]);
+            {
+               (*(fgmres_functions->DestroyVector))( (fgmres_data -> pre_vecs) [i]);
+            }
          }
          hypre_TFreeF( fgmres_data->pre_vecs, fgmres_functions );
       }
@@ -187,16 +201,16 @@ HYPRE_Int hypre_FlexGMRESGetResidual( void *fgmres_vdata, void **residual )
 
 HYPRE_Int
 hypre_FlexGMRESSetup( void *fgmres_vdata,
-                  void *A,
-                  void *b,
-                  void *x         )
+                      void *A,
+                      void *b,
+                      void *x         )
 {
    hypre_FlexGMRESData *fgmres_data     = (hypre_FlexGMRESData *)fgmres_vdata;
    hypre_FlexGMRESFunctions *fgmres_functions = fgmres_data->functions;
 
    HYPRE_Int            k_dim            = (fgmres_data -> k_dim);
    HYPRE_Int            max_iter         = (fgmres_data -> max_iter);
-   HYPRE_Int          (*precond_setup)(void*,void*,void*,void*) = (fgmres_functions->precond_setup);
+   HYPRE_Int          (*precond_setup)(void*, void*, void*, void*) = (fgmres_functions->precond_setup);
    void          *precond_data     = (fgmres_data -> precond_data);
 
    HYPRE_Int            rel_change       = (fgmres_data -> rel_change);
@@ -212,24 +226,34 @@ hypre_FlexGMRESSetup( void *fgmres_vdata,
     *--------------------------------------------------*/
 
    if ((fgmres_data -> p) == NULL)
-	   (fgmres_data -> p) = (void**)(*(fgmres_functions->CreateVectorArray))(k_dim+1,x);
+   {
+      (fgmres_data -> p) = (void**)(*(fgmres_functions->CreateVectorArray))(k_dim + 1, x);
+   }
    if ((fgmres_data -> r) == NULL)
+   {
       (fgmres_data -> r) = (*(fgmres_functions->CreateVector))(b);
+   }
    if ((fgmres_data -> w) == NULL)
+   {
       (fgmres_data -> w) = (*(fgmres_functions->CreateVector))(b);
+   }
 
    if (rel_change)
    {
       if ((fgmres_data -> w_2) == NULL)
+      {
          (fgmres_data -> w_2) = (*(fgmres_functions->CreateVector))(b);
+      }
    }
 
    /* fgmres mod */
-   (fgmres_data -> pre_vecs) = (void**)(*(fgmres_functions->CreateVectorArray))(k_dim+1,x);
+   (fgmres_data -> pre_vecs) = (void**)(*(fgmres_functions->CreateVectorArray))(k_dim + 1, x);
    /*---*/
 
    if ((fgmres_data -> matvec_data) == NULL)
+   {
       (fgmres_data -> matvec_data) = (*(fgmres_functions->MatvecCreate))(A, x);
+   }
 
    precond_setup(precond_data, A, b, x);
 
@@ -237,14 +261,20 @@ hypre_FlexGMRESSetup( void *fgmres_vdata,
     * Allocate space for log info
     *-----------------------------------------------------*/
 
-   if ( (fgmres_data->logging)>0 || (fgmres_data->print_level) > 0 )
+   if ( (fgmres_data->logging) > 0 || (fgmres_data->print_level) > 0 )
    {
       if ((fgmres_data -> norms) == NULL)
-         (fgmres_data -> norms) = hypre_CTAllocF(HYPRE_Real, max_iter + 1,fgmres_functions, HYPRE_MEMORY_HOST);
+      {
+         (fgmres_data -> norms) = hypre_CTAllocF(HYPRE_Real, max_iter + 1, fgmres_functions,
+                                                 HYPRE_MEMORY_HOST);
+      }
    }
-   if ( (fgmres_data->print_level) > 0 ) {
+   if ( (fgmres_data->print_level) > 0 )
+   {
       if ((fgmres_data -> log_file_name) == NULL)
-		  (fgmres_data -> log_file_name) = (char*)"fgmres.out.log";
+      {
+         (fgmres_data -> log_file_name) = (char*)"fgmres.out.log";
+      }
    }
 
    HYPRE_ANNOTATE_FUNC_END;
@@ -264,11 +294,11 @@ hypre_FlexGMRESSolve(void  *fgmres_vdata,
 {
    hypre_FlexGMRESData  *fgmres_data   = (hypre_FlexGMRESData *)fgmres_vdata;
    hypre_FlexGMRESFunctions *fgmres_functions = fgmres_data->functions;
-   HYPRE_Int 		     k_dim        = (fgmres_data -> k_dim);
+   HYPRE_Int           k_dim        = (fgmres_data -> k_dim);
    HYPRE_Int               min_iter     = (fgmres_data -> min_iter);
-   HYPRE_Int 		     max_iter     = (fgmres_data -> max_iter);
-   HYPRE_Real 	     r_tol        = (fgmres_data -> tol);
-   HYPRE_Real 	     cf_tol       = (fgmres_data -> cf_tol);
+   HYPRE_Int           max_iter     = (fgmres_data -> max_iter);
+   HYPRE_Real       r_tol        = (fgmres_data -> tol);
+   HYPRE_Real       cf_tol       = (fgmres_data -> cf_tol);
    HYPRE_Real        a_tol        = (fgmres_data -> a_tol);
    void             *matvec_data  = (fgmres_data -> matvec_data);
 
@@ -281,8 +311,8 @@ hypre_FlexGMRESSolve(void  *fgmres_vdata,
    void          **pre_vecs       = (fgmres_data ->pre_vecs);
    /*---*/
 
-   HYPRE_Int 	           (*precond)(void*,void*,void*,void*)   = (fgmres_functions -> precond);
-   HYPRE_Int 	            *precond_data = (HYPRE_Int*)(fgmres_data -> precond_data);
+   HYPRE_Int              (*precond)(void*, void*, void*, void*)   = (fgmres_functions -> precond);
+   HYPRE_Int               *precond_data = (HYPRE_Int*)(fgmres_data -> precond_data);
 
    HYPRE_Int             print_level    = (fgmres_data -> print_level);
    HYPRE_Int             logging        = (fgmres_data -> logging);
@@ -290,7 +320,7 @@ hypre_FlexGMRESSolve(void  *fgmres_vdata,
    HYPRE_Real     *norms          = (fgmres_data -> norms);
 
    HYPRE_Int        break_value = 0;
-   HYPRE_Int	      i, j, k;
+   HYPRE_Int         i, j, k;
    HYPRE_Real *rs, **hh, *c, *s;
    HYPRE_Int        iter;
    HYPRE_Int        my_id, num_procs;
@@ -304,7 +334,7 @@ hypre_FlexGMRESSolve(void  *fgmres_vdata,
    HYPRE_Real weight;
    HYPRE_Real r_norm_0;
 
-   HYPRE_Int 	      (*modify_pc)(void*,HYPRE_Int,HYPRE_Real)   = (fgmres_functions -> modify_pc);
+   HYPRE_Int         (*modify_pc)(void*, HYPRE_Int, HYPRE_Real)   = (fgmres_functions -> modify_pc);
 
    /* We are not checking rel. change for now... */
 
@@ -318,8 +348,8 @@ hypre_FlexGMRESSolve(void  *fgmres_vdata,
     * this. Perhaps it should be set to something non-zero (but small).
     *-----------------------------------------------------------------------*/
 
-   (*(fgmres_functions->CommInfo))(A,&my_id,&num_procs);
-   if ( logging>0 || print_level>0 )
+   (*(fgmres_functions->CommInfo))(A, &my_id, &num_procs);
+   if ( logging > 0 || print_level > 0 )
    {
       norms          = (fgmres_data -> norms);
       /* not used yet      log_file_name  = (fgmres_data -> log_file_name);*/
@@ -327,28 +357,28 @@ hypre_FlexGMRESSolve(void  *fgmres_vdata,
    }
 
    /* initialize work arrays  */
-   rs = hypre_CTAllocF(HYPRE_Real,k_dim+1,fgmres_functions, HYPRE_MEMORY_HOST);
-   c = hypre_CTAllocF(HYPRE_Real,k_dim,fgmres_functions, HYPRE_MEMORY_HOST);
-   s = hypre_CTAllocF(HYPRE_Real,k_dim,fgmres_functions, HYPRE_MEMORY_HOST);
+   rs = hypre_CTAllocF(HYPRE_Real, k_dim + 1, fgmres_functions, HYPRE_MEMORY_HOST);
+   c = hypre_CTAllocF(HYPRE_Real, k_dim, fgmres_functions, HYPRE_MEMORY_HOST);
+   s = hypre_CTAllocF(HYPRE_Real, k_dim, fgmres_functions, HYPRE_MEMORY_HOST);
 
 
    /* fgmres mod. - need non-modified hessenberg ???? */
-   hh = hypre_CTAllocF(HYPRE_Real*,k_dim+1,fgmres_functions, HYPRE_MEMORY_HOST);
-   for (i=0; i < k_dim+1; i++)
+   hh = hypre_CTAllocF(HYPRE_Real*, k_dim + 1, fgmres_functions, HYPRE_MEMORY_HOST);
+   for (i = 0; i < k_dim + 1; i++)
    {
-      hh[i] = hypre_CTAllocF(HYPRE_Real,k_dim,fgmres_functions, HYPRE_MEMORY_HOST);
+      hh[i] = hypre_CTAllocF(HYPRE_Real, k_dim, fgmres_functions, HYPRE_MEMORY_HOST);
    }
 
-   (*(fgmres_functions->CopyVector))(b,p[0]);
+   (*(fgmres_functions->CopyVector))(b, p[0]);
 
    /* compute initial residual */
-   (*(fgmres_functions->Matvec))(matvec_data,-1.0, A, x, 1.0, p[0]);
+   (*(fgmres_functions->Matvec))(matvec_data, -1.0, A, x, 1.0, p[0]);
 
-   b_norm = sqrt((*(fgmres_functions->InnerProd))(b,b));
+   b_norm = hypre_sqrt((*(fgmres_functions->InnerProd))(b, b));
 
-   /* Since it is does not diminish performance, attempt to return an error flag
+   /* Since it does not diminish performance, attempt to return an error flag
       and notify users when they supply bad input. */
-   if (b_norm != 0.) ieee_check = b_norm/b_norm; /* INF -> NaN conversion */
+   if (b_norm != 0.) { ieee_check = b_norm / b_norm; } /* INF -> NaN conversion */
    if (ieee_check != ieee_check)
    {
       /* ...INFs or NaNs in input can make ieee_check a NaN.  This test
@@ -358,11 +388,11 @@ hypre_FlexGMRESSolve(void  *fgmres_vdata,
          found at http://HTTP.CS.Berkeley.EDU/~wkahan/ieee754status/IEEE754.PDF */
       if (logging > 0 || print_level > 0)
       {
-        hypre_printf("\n\nERROR detected by Hypre ... BEGIN\n");
-        hypre_printf("ERROR -- hypre_FlexGMRESSolve: INFs and/or NaNs detected in input.\n");
-        hypre_printf("User probably placed non-numerics in supplied b.\n");
-        hypre_printf("Returning error flag += 101.  Program not terminated.\n");
-        hypre_printf("ERROR detected by Hypre ... END\n\n\n");
+         hypre_printf("\n\nERROR detected by Hypre ... BEGIN\n");
+         hypre_printf("ERROR -- hypre_FlexGMRESSolve: INFs and/or NaNs detected in input.\n");
+         hypre_printf("User probably placed non-numerics in supplied b.\n");
+         hypre_printf("Returning error flag += 101.  Program not terminated.\n");
+         hypre_printf("ERROR detected by Hypre ... END\n\n\n");
       }
       hypre_error(HYPRE_ERROR_GENERIC);
       HYPRE_ANNOTATE_FUNC_END;
@@ -370,12 +400,12 @@ hypre_FlexGMRESSolve(void  *fgmres_vdata,
       return hypre_error_flag;
    }
 
-   r_norm = sqrt((*(fgmres_functions->InnerProd))(p[0],p[0]));
+   r_norm = hypre_sqrt((*(fgmres_functions->InnerProd))(p[0], p[0]));
    r_norm_0 = r_norm;
 
-   /* Since it is does not diminish performance, attempt to return an error flag
+   /* Since it does not diminish performance, attempt to return an error flag
       and notify users when they supply bad input. */
-   if (r_norm != 0.) ieee_check = r_norm/r_norm; /* INF -> NaN conversion */
+   if (r_norm != 0.) { ieee_check = r_norm / r_norm; } /* INF -> NaN conversion */
    if (ieee_check != ieee_check)
    {
       /* ...INFs or NaNs in input can make ieee_check a NaN.  This test
@@ -385,11 +415,11 @@ hypre_FlexGMRESSolve(void  *fgmres_vdata,
          found at http://HTTP.CS.Berkeley.EDU/~wkahan/ieee754status/IEEE754.PDF */
       if (logging > 0 || print_level > 0)
       {
-        hypre_printf("\n\nERROR detected by Hypre ... BEGIN\n");
-        hypre_printf("ERROR -- hypre_FlexGMRESSolve: INFs and/or NaNs detected in input.\n");
-        hypre_printf("User probably placed non-numerics in supplied A or x_0.\n");
-        hypre_printf("Returning error flag += 101.  Program not terminated.\n");
-        hypre_printf("ERROR detected by Hypre ... END\n\n\n");
+         hypre_printf("\n\nERROR detected by Hypre ... BEGIN\n");
+         hypre_printf("ERROR -- hypre_FlexGMRESSolve: INFs and/or NaNs detected in input.\n");
+         hypre_printf("User probably placed non-numerics in supplied A or x_0.\n");
+         hypre_printf("Returning error flag += 101.  Program not terminated.\n");
+         hypre_printf("ERROR detected by Hypre ... END\n\n\n");
       }
       hypre_error(HYPRE_ERROR_GENERIC);
       HYPRE_ANNOTATE_FUNC_END;
@@ -397,14 +427,16 @@ hypre_FlexGMRESSolve(void  *fgmres_vdata,
       return hypre_error_flag;
    }
 
-   if ( logging>0 || print_level > 0)
+   if ( logging > 0 || print_level > 0)
    {
       norms[0] = r_norm;
-      if ( print_level>1 && my_id == 0 )
+      if ( print_level > 1 && my_id == 0 )
       {
-  	 hypre_printf("L2 norm of b: %e\n", b_norm);
+         hypre_printf("L2 norm of b: %e\n", b_norm);
          if (b_norm == 0.0)
+         {
             hypre_printf("Rel_resid_norm actually contains the residual norm\n");
+         }
          hypre_printf("Initial L2 norm of residual: %e\n", r_norm);
 
       }
@@ -413,41 +445,43 @@ hypre_FlexGMRESSolve(void  *fgmres_vdata,
 
    if (b_norm > 0.0)
    {
-/* convergence criterion |r_i|/|b| <= accuracy if |b| > 0 */
-     den_norm= b_norm;
+      /* convergence criterion |r_i|/|b| <= accuracy if |b| > 0 */
+      den_norm = b_norm;
    }
    else
    {
-/* convergence criterion |r_i|/|r0| <= accuracy if |b| = 0 */
-     den_norm= r_norm;
+      /* convergence criterion |r_i|/|r0| <= accuracy if |b| = 0 */
+      den_norm = r_norm;
    };
 
-/* convergence criteria: |r_i| <= max( a_tol, r_tol * den_norm)
-      den_norm = |r_0| or |b|
-      note: default for a_tol is 0.0, so relative residual criteria is used unless
-            user specifies a_tol, or sets r_tol = 0.0, which means absolute
-            tol only is checked  */
+   /* convergence criteria: |r_i| <= max( a_tol, r_tol * den_norm)
+         den_norm = |r_0| or |b|
+         note: default for a_tol is 0.0, so relative residual criteria is used unless
+               user specifies a_tol, or sets r_tol = 0.0, which means absolute
+               tol only is checked  */
 
-   epsilon = hypre_max(a_tol,r_tol*den_norm);
+   epsilon = hypre_max(a_tol, r_tol * den_norm);
 
    /* so now our stop criteria is |r_i| <= epsilon */
 
 
-   if ( print_level>1 && my_id == 0 )
+   if ( print_level > 1 && my_id == 0 )
    {
       if (b_norm > 0.0)
-         {hypre_printf("=============================================\n\n");
-          hypre_printf("Iters     resid.norm     conv.rate  rel.res.norm\n");
-          hypre_printf("-----    ------------    ---------- ------------\n");
+      {
+         hypre_printf("=============================================\n\n");
+         hypre_printf("Iters     resid.norm     conv.rate  rel.res.norm\n");
+         hypre_printf("-----    ------------    ---------- ------------\n");
 
-          }
+      }
 
       else
-         {hypre_printf("=============================================\n\n");
-          hypre_printf("Iters     resid.norm     conv.rate\n");
-          hypre_printf("-----    ------------    ----------\n");
+      {
+         hypre_printf("=============================================\n\n");
+         hypre_printf("Iters     resid.norm     conv.rate\n");
+         hypre_printf("-----    ------------    ----------\n");
 
-          };
+      };
    }
 
 
@@ -455,255 +489,269 @@ hypre_FlexGMRESSolve(void  *fgmres_vdata,
    /* outer iteration cycle */
    while (iter < max_iter)
    {
-   /* initialize first term of hessenberg system */
-
-	rs[0] = r_norm;
-        if (r_norm == 0.0)
-        {
-           hypre_TFreeF(c,fgmres_functions);
-           hypre_TFreeF(s,fgmres_functions);
-           hypre_TFreeF(rs,fgmres_functions);
-
-           for (i=0; i < k_dim+1; i++) {
-              hypre_TFreeF(hh[i],fgmres_functions);
-           }
-
-           hypre_TFreeF(hh,fgmres_functions);
-           HYPRE_ANNOTATE_FUNC_END;
-
-	   return hypre_error_flag;
-	}
-
-        /* see if we are already converged and
-           should print the final norm and exit */
-	if (r_norm  <= epsilon && iter >= min_iter)
-        {
-
-           (*(fgmres_functions->CopyVector))(b,r);
-           (*(fgmres_functions->Matvec))(matvec_data,-1.0,A,x,1.0,r);
-           r_norm = sqrt((*(fgmres_functions->InnerProd))(r,r));
-           if (r_norm <= epsilon)
-           {
-              if ( print_level>1 && my_id == 0)
-              {
-                 hypre_printf("\n\n");
-                 hypre_printf("Final L2 norm of residual: %e\n\n", r_norm);
-              }
-              break;
-           }
-           else
-              if ( print_level>0 && my_id == 0)
-                 hypre_printf("false convergence 1\n");
-
-	}
-
-      	t = 1.0 / r_norm;
-
-
-        (*(fgmres_functions->ScaleVector))(t,p[0]);
-	i = 0;
-
-
-        /***RESTART CYCLE (right-preconditioning) ***/
-        while (i < k_dim  && iter < max_iter)
-	{
-           i++;
-           iter++;
-
-           (*(fgmres_functions->ClearVector))(pre_vecs[i-1]);
-
-           /* allow some user function here (to change
-            * prec. attributes, i.e.tolerances, etc. ? */
-           modify_pc(precond_data, iter, r_norm/den_norm );
-
-           /*apply preconditioner and store in pre_vecs */
-           precond(precond_data, A, p[i-1], pre_vecs[i-1]);
-           /*apply operator and store in p */
-           (*(fgmres_functions->Matvec))(matvec_data, 1.0, A, pre_vecs[i-1], 0.0, p[i]);
-
-
-           /* modified Gram_Schmidt */
-           for (j=0; j < i; j++)
-           {
-              hh[j][i-1] = (*(fgmres_functions->InnerProd))(p[j],p[i]);
-              (*(fgmres_functions->Axpy))(-hh[j][i-1],p[j],p[i]);
-           }
-           t = sqrt((*(fgmres_functions->InnerProd))(p[i],p[i]));
-           hh[i][i-1] = t;
-           if (t != 0.0)
-           {
-              t = 1.0/t;
-              (*(fgmres_functions->ScaleVector))(t,p[i]);
-           }
-
-
-           /* done with modified Gram_schmidt and Arnoldi step.
-              update factorization of hh */
-           for (j = 1; j < i; j++)
-           {
-              t = hh[j-1][i-1];
-              hh[j-1][i-1] = s[j-1]*hh[j][i-1] + c[j-1]*t;
-              hh[j][i-1] = -s[j-1]*t + c[j-1]*hh[j][i-1];
-           }
-           t= hh[i][i-1]*hh[i][i-1];
-           t+= hh[i-1][i-1]*hh[i-1][i-1];
-           gamma = sqrt(t);
-           if (gamma == 0.0) gamma = epsmac;
-           c[i-1] = hh[i-1][i-1]/gamma;
-           s[i-1] = hh[i][i-1]/gamma;
-           rs[i] = -hh[i][i-1]*rs[i-1];
-           rs[i]/=  gamma;
-           rs[i-1] = c[i-1]*rs[i-1];
-           /* determine residual norm */
-           hh[i-1][i-1] = s[i-1]*hh[i][i-1] + c[i-1]*hh[i-1][i-1];
-           r_norm = fabs(rs[i]);
-
-           /* print ? */
-           if ( print_level>0 )
-           {
-              norms[iter] = r_norm;
-              if ( print_level>1 && my_id == 0 )
-              {
-                 if (b_norm > 0.0)
-                    hypre_printf("% 5d    %e    %f   %e\n", iter,
-                           norms[iter],norms[iter]/norms[iter-1],
-                           norms[iter]/b_norm);
-                 else
-                    hypre_printf("% 5d    %e    %f\n", iter, norms[iter],
-                           norms[iter]/norms[iter-1]);
-              }
-           }
-           /*convergence factor tolerance */
-           if (cf_tol > 0.0)
-           {
-              cf_ave_0 = cf_ave_1;
-              cf_ave_1 = pow( r_norm / r_norm_0, 1.0/(2.0*iter));
-
-              weight   = fabs(cf_ave_1 - cf_ave_0);
-              weight   = weight / hypre_max(cf_ave_1, cf_ave_0);
-              weight   = 1.0 - weight;
+      /* initialize first term of hessenberg system */
+
+      rs[0] = r_norm;
+      if (r_norm == 0.0)
+      {
+         hypre_TFreeF(c, fgmres_functions);
+         hypre_TFreeF(s, fgmres_functions);
+         hypre_TFreeF(rs, fgmres_functions);
+
+         for (i = 0; i < k_dim + 1; i++)
+         {
+            hypre_TFreeF(hh[i], fgmres_functions);
+         }
+
+         hypre_TFreeF(hh, fgmres_functions);
+         HYPRE_ANNOTATE_FUNC_END;
+
+         return hypre_error_flag;
+      }
+
+      /* see if we are already converged and
+         should print the final norm and exit */
+      if (r_norm  <= epsilon && iter >= min_iter)
+      {
+
+         (*(fgmres_functions->CopyVector))(b, r);
+         (*(fgmres_functions->Matvec))(matvec_data, -1.0, A, x, 1.0, r);
+         r_norm = hypre_sqrt((*(fgmres_functions->InnerProd))(r, r));
+         if (r_norm <= epsilon)
+         {
+            if ( print_level > 1 && my_id == 0)
+            {
+               hypre_printf("\n\n");
+               hypre_printf("Final L2 norm of residual: %e\n\n", r_norm);
+            }
+            break;
+         }
+         else if ( print_level > 0 && my_id == 0)
+         {
+            hypre_printf("false convergence 1\n");
+         }
+
+      }
+
+      t = 1.0 / r_norm;
+
+
+      (*(fgmres_functions->ScaleVector))(t, p[0]);
+      i = 0;
+
+
+      /***RESTART CYCLE (right-preconditioning) ***/
+      while (i < k_dim  && iter < max_iter)
+      {
+         i++;
+         iter++;
+
+         (*(fgmres_functions->ClearVector))(pre_vecs[i - 1]);
+
+         /* allow some user function here (to change
+          * prec. attributes, i.e.tolerances, etc. ? */
+         modify_pc(precond_data, iter, r_norm / den_norm );
+
+         /*apply preconditioner and store in pre_vecs */
+         precond(precond_data, A, p[i - 1], pre_vecs[i - 1]);
+         /*apply operator and store in p */
+         (*(fgmres_functions->Matvec))(matvec_data, 1.0, A, pre_vecs[i - 1], 0.0, p[i]);
+
+
+         /* modified Gram_Schmidt */
+         for (j = 0; j < i; j++)
+         {
+            hh[j][i - 1] = (*(fgmres_functions->InnerProd))(p[j], p[i]);
+            (*(fgmres_functions->Axpy))(-hh[j][i - 1], p[j], p[i]);
+         }
+         t = hypre_sqrt((*(fgmres_functions->InnerProd))(p[i], p[i]));
+         hh[i][i - 1] = t;
+         if (t != 0.0)
+         {
+            t = 1.0 / t;
+            (*(fgmres_functions->ScaleVector))(t, p[i]);
+         }
+
+
+         /* done with modified Gram_schmidt and Arnoldi step.
+            update factorization of hh */
+         for (j = 1; j < i; j++)
+         {
+            t = hh[j - 1][i - 1];
+            hh[j - 1][i - 1] = s[j - 1] * hh[j][i - 1] + c[j - 1] * t;
+            hh[j][i - 1] = -s[j - 1] * t + c[j - 1] * hh[j][i - 1];
+         }
+         t = hh[i][i - 1] * hh[i][i - 1];
+         t += hh[i - 1][i - 1] * hh[i - 1][i - 1];
+         gamma = hypre_sqrt(t);
+         if (gamma == 0.0) { gamma = epsmac; }
+         c[i - 1] = hh[i - 1][i - 1] / gamma;
+         s[i - 1] = hh[i][i - 1] / gamma;
+         rs[i] = -hh[i][i - 1] * rs[i - 1];
+         rs[i] /=  gamma;
+         rs[i - 1] = c[i - 1] * rs[i - 1];
+         /* determine residual norm */
+         hh[i - 1][i - 1] = s[i - 1] * hh[i][i - 1] + c[i - 1] * hh[i - 1][i - 1];
+         r_norm = hypre_abs(rs[i]);
+
+         /* print ? */
+         if ( print_level > 0 )
+         {
+            norms[iter] = r_norm;
+            if ( print_level > 1 && my_id == 0 )
+            {
+               if (b_norm > 0.0)
+                  hypre_printf("% 5d    %e    %f   %e\n", iter,
+                               norms[iter], norms[iter] / norms[iter - 1],
+                               norms[iter] / b_norm);
+               else
+                  hypre_printf("% 5d    %e    %f\n", iter, norms[iter],
+                               norms[iter] / norms[iter - 1]);
+            }
+         }
+         /*convergence factor tolerance */
+         if (cf_tol > 0.0)
+         {
+            cf_ave_0 = cf_ave_1;
+            cf_ave_1 = hypre_pow( r_norm / r_norm_0, 1.0 / (2.0 * iter));
+
+            weight   = hypre_abs(cf_ave_1 - cf_ave_0);
+            weight   = weight / hypre_max(cf_ave_1, cf_ave_0);
+            weight   = 1.0 - weight;
 #if 0
-              hypre_printf("I = %d: cf_new = %e, cf_old = %e, weight = %e\n",
-                     i, cf_ave_1, cf_ave_0, weight );
+            hypre_printf("I = %d: cf_new = %e, cf_old = %e, weight = %e\n",
+                         i, cf_ave_1, cf_ave_0, weight );
 #endif
-              if (weight * cf_ave_1 > cf_tol)
-              {
-                 break_value = 1;
-                 break;
-              }
-           }
-           /* should we exit the restart cycle? (conv. check) */
-           if (r_norm  <= epsilon && iter >= min_iter)
-           {
-              /* no relative change */
-
-              break;
-
-           }
-
-
-	} /*** end of restart cycle ***/
-
-	/* now compute solution, first solve upper triangular system */
-
-	if (break_value) break;
-
-	rs[i-1] = rs[i-1]/hh[i-1][i-1];
-	for (k = i-2; k >= 0; k--)
-	{
-           t = 0.0;
-           for (j = k+1; j < i; j++)
-           {
-              t -= hh[k][j]*rs[j];
-           }
-           t+= rs[k];
-           rs[k] = t/hh[k][k];
-	}
-        /* form linear combination of pre_vecs's to get solution */
-
-        (*(fgmres_functions->CopyVector))(pre_vecs[i-1],w);
-        (*(fgmres_functions->ScaleVector))(rs[i-1],w);
-        for (j = i-2; j >=0; j--)
-           (*(fgmres_functions->Axpy))(rs[j], pre_vecs[j], w);
-
-
-        /* don't need to un-wind precond... - so now the correction is
-         * in w */
-
-
-        /* update current solution x (in x) */
-	(*(fgmres_functions->Axpy))(1.0,w,x);
-
-
-        /* check for convergence by evaluating the actual residual */
-	if (r_norm <= epsilon && iter >= min_iter)
-        {
-           /* calculate actual residual norm*/
-           (*(fgmres_functions->CopyVector))(b,r);
-           (*(fgmres_functions->Matvec))(matvec_data,-1.0,A,x,1.0,r);
-           r_norm = sqrt( (*(fgmres_functions->InnerProd))(r,r) );
-
-           if (r_norm <= epsilon)
-           {
-              if ( print_level>1 && my_id == 0 )
-              {
-                 hypre_printf("\n\n");
-                 hypre_printf("Final L2 norm of residual: %e\n\n", r_norm);
-              }
-              (fgmres_data -> converged) = 1;
-              break;
-
-           }
-           else /* conv. has not occurred, according to true residual */
-           {
-              if ( print_level>0 && my_id == 0)
-                 hypre_printf("false convergence 2\n");
-              (*(fgmres_functions->CopyVector))(r,p[0]);
-              i = 0;
-           }
-	} /* end of convergence check */
-
-        /* compute residual vector and continue loop */
-	for (j=i ; j > 0; j--)
-	{
-           rs[j-1] = -s[j-1]*rs[j];
-           rs[j] = c[j-1]*rs[j];
-	}
-
-        if (i) (*(fgmres_functions->Axpy))(rs[i]-1.0,p[i],p[i]);
-        for (j=i-1 ; j > 0; j--)
-           (*(fgmres_functions->Axpy))(rs[j],p[j],p[i]);
-
-        if (i)
-        {
-           (*(fgmres_functions->Axpy))(rs[0]-1.0,p[0],p[0]);
-           (*(fgmres_functions->Axpy))(1.0,p[i],p[0]);
-        }
+            if (weight * cf_ave_1 > cf_tol)
+            {
+               break_value = 1;
+               break;
+            }
+         }
+         /* should we exit the restart cycle? (conv. check) */
+         if (r_norm  <= epsilon && iter >= min_iter)
+         {
+            /* no relative change */
+
+            break;
+
+         }
+
+
+      } /*** end of restart cycle ***/
+
+      /* now compute solution, first solve upper triangular system */
+
+      if (break_value) { break; }
+
+      rs[i - 1] = rs[i - 1] / hh[i - 1][i - 1];
+      for (k = i - 2; k >= 0; k--)
+      {
+         t = 0.0;
+         for (j = k + 1; j < i; j++)
+         {
+            t -= hh[k][j] * rs[j];
+         }
+         t += rs[k];
+         rs[k] = t / hh[k][k];
+      }
+      /* form linear combination of pre_vecs's to get solution */
+
+      (*(fgmres_functions->CopyVector))(pre_vecs[i - 1], w);
+      (*(fgmres_functions->ScaleVector))(rs[i - 1], w);
+      for (j = i - 2; j >= 0; j--)
+      {
+         (*(fgmres_functions->Axpy))(rs[j], pre_vecs[j], w);
+      }
+
+
+      /* don't need to un-wind precond... - so now the correction is
+       * in w */
+
+
+      /* update current solution x (in x) */
+      (*(fgmres_functions->Axpy))(1.0, w, x);
+
+
+      /* check for convergence by evaluating the actual residual */
+      if (r_norm <= epsilon && iter >= min_iter)
+      {
+         /* calculate actual residual norm*/
+         (*(fgmres_functions->CopyVector))(b, r);
+         (*(fgmres_functions->Matvec))(matvec_data, -1.0, A, x, 1.0, r);
+         r_norm = hypre_sqrt( (*(fgmres_functions->InnerProd))(r, r) );
+
+         if (r_norm <= epsilon)
+         {
+            if ( print_level > 1 && my_id == 0 )
+            {
+               hypre_printf("\n\n");
+               hypre_printf("Final L2 norm of residual: %e\n\n", r_norm);
+            }
+            (fgmres_data -> converged) = 1;
+            break;
+
+         }
+         else /* conv. has not occurred, according to true residual */
+         {
+            if ( print_level > 0 && my_id == 0)
+            {
+               hypre_printf("false convergence 2\n");
+            }
+            (*(fgmres_functions->CopyVector))(r, p[0]);
+            i = 0;
+         }
+      } /* end of convergence check */
+
+      /* compute residual vector and continue loop */
+      for (j = i ; j > 0; j--)
+      {
+         rs[j - 1] = -s[j - 1] * rs[j];
+         rs[j] = c[j - 1] * rs[j];
+      }
+
+      if (i) { (*(fgmres_functions->Axpy))(rs[i] - 1.0, p[i], p[i]); }
+      for (j = i - 1 ; j > 0; j--)
+      {
+         (*(fgmres_functions->Axpy))(rs[j], p[j], p[i]);
+      }
+
+      if (i)
+      {
+         (*(fgmres_functions->Axpy))(rs[0] - 1.0, p[0], p[0]);
+         (*(fgmres_functions->Axpy))(1.0, p[i], p[0]);
+      }
 
    } /* END of iteration while loop */
 
 
-   if ( print_level>1 && my_id == 0 )
-          hypre_printf("\n\n");
+   if ( print_level > 1 && my_id == 0 )
+   {
+      hypre_printf("\n\n");
+   }
 
    (fgmres_data -> num_iterations) = iter;
    if (b_norm > 0.0)
-      (fgmres_data -> rel_residual_norm) = r_norm/b_norm;
+   {
+      (fgmres_data -> rel_residual_norm) = r_norm / b_norm;
+   }
    if (b_norm == 0.0)
+   {
       (fgmres_data -> rel_residual_norm) = r_norm;
+   }
 
-   if (iter >= max_iter && r_norm > epsilon && epsilon > 0) hypre_error(HYPRE_ERROR_CONV);
+   if (iter >= max_iter && r_norm > epsilon && epsilon > 0) { hypre_error(HYPRE_ERROR_CONV); }
 
 
-   hypre_TFreeF(c,fgmres_functions);
-   hypre_TFreeF(s,fgmres_functions);
-   hypre_TFreeF(rs,fgmres_functions);
+   hypre_TFreeF(c, fgmres_functions);
+   hypre_TFreeF(s, fgmres_functions);
+   hypre_TFreeF(rs, fgmres_functions);
 
-   for (i=0; i < k_dim+1; i++)
+   for (i = 0; i < k_dim + 1; i++)
    {
-   	hypre_TFreeF(hh[i],fgmres_functions);
+      hypre_TFreeF(hh[i], fgmres_functions);
    }
-   hypre_TFreeF(hh,fgmres_functions);
+   hypre_TFreeF(hh, fgmres_functions);
 
    HYPRE_ANNOTATE_FUNC_END;
 
@@ -716,7 +764,7 @@ hypre_FlexGMRESSolve(void  *fgmres_vdata,
 
 HYPRE_Int
 hypre_FlexGMRESSetKDim( void   *fgmres_vdata,
-                    HYPRE_Int   k_dim )
+                        HYPRE_Int   k_dim )
 {
    hypre_FlexGMRESData *fgmres_data = (hypre_FlexGMRESData *)fgmres_vdata;
 
@@ -729,7 +777,7 @@ hypre_FlexGMRESSetKDim( void   *fgmres_vdata,
 
 HYPRE_Int
 hypre_FlexGMRESGetKDim( void   *fgmres_vdata,
-                    HYPRE_Int * k_dim )
+                        HYPRE_Int * k_dim )
 {
    hypre_FlexGMRESData *fgmres_data = (hypre_FlexGMRESData *)fgmres_vdata;
 
@@ -746,7 +794,7 @@ hypre_FlexGMRESGetKDim( void   *fgmres_vdata,
 
 HYPRE_Int
 hypre_FlexGMRESSetTol( void   *fgmres_vdata,
-                   HYPRE_Real  tol       )
+                       HYPRE_Real  tol       )
 {
    hypre_FlexGMRESData *fgmres_data = (hypre_FlexGMRESData *)fgmres_vdata;
 
@@ -758,7 +806,7 @@ hypre_FlexGMRESSetTol( void   *fgmres_vdata,
 
 HYPRE_Int
 hypre_FlexGMRESGetTol( void   *fgmres_vdata,
-                   HYPRE_Real  * tol      )
+                       HYPRE_Real  * tol      )
 {
    hypre_FlexGMRESData *fgmres_data = (hypre_FlexGMRESData *)fgmres_vdata;
 
@@ -773,7 +821,7 @@ hypre_FlexGMRESGetTol( void   *fgmres_vdata,
 
 HYPRE_Int
 hypre_FlexGMRESSetAbsoluteTol( void   *fgmres_vdata,
-                   HYPRE_Real  a_tol       )
+                               HYPRE_Real  a_tol       )
 {
    hypre_FlexGMRESData *fgmres_data = (hypre_FlexGMRESData *)fgmres_vdata;
 
@@ -785,7 +833,7 @@ hypre_FlexGMRESSetAbsoluteTol( void   *fgmres_vdata,
 
 HYPRE_Int
 hypre_FlexGMRESGetAbsoluteTol( void   *fgmres_vdata,
-                   HYPRE_Real  * a_tol      )
+                               HYPRE_Real  * a_tol      )
 {
    hypre_FlexGMRESData *fgmres_data = (hypre_FlexGMRESData *)fgmres_vdata;
 
@@ -800,7 +848,7 @@ hypre_FlexGMRESGetAbsoluteTol( void   *fgmres_vdata,
 
 HYPRE_Int
 hypre_FlexGMRESSetConvergenceFactorTol( void   *fgmres_vdata,
-                   HYPRE_Real  cf_tol       )
+                                        HYPRE_Real  cf_tol       )
 {
    hypre_FlexGMRESData *fgmres_data = (hypre_FlexGMRESData *)fgmres_vdata;
 
@@ -812,7 +860,7 @@ hypre_FlexGMRESSetConvergenceFactorTol( void   *fgmres_vdata,
 
 HYPRE_Int
 hypre_FlexGMRESGetConvergenceFactorTol( void   *fgmres_vdata,
-                   HYPRE_Real * cf_tol       )
+                                        HYPRE_Real * cf_tol       )
 {
    hypre_FlexGMRESData *fgmres_data = (hypre_FlexGMRESData *)fgmres_vdata;
 
@@ -828,7 +876,7 @@ hypre_FlexGMRESGetConvergenceFactorTol( void   *fgmres_vdata,
 
 HYPRE_Int
 hypre_FlexGMRESSetMinIter( void *fgmres_vdata,
-                       HYPRE_Int   min_iter  )
+                           HYPRE_Int   min_iter  )
 {
    hypre_FlexGMRESData *fgmres_data = (hypre_FlexGMRESData *)fgmres_vdata;
 
@@ -840,7 +888,7 @@ hypre_FlexGMRESSetMinIter( void *fgmres_vdata,
 
 HYPRE_Int
 hypre_FlexGMRESGetMinIter( void *fgmres_vdata,
-                       HYPRE_Int * min_iter  )
+                           HYPRE_Int * min_iter  )
 {
    hypre_FlexGMRESData *fgmres_data = (hypre_FlexGMRESData *)fgmres_vdata;
 
@@ -856,7 +904,7 @@ hypre_FlexGMRESGetMinIter( void *fgmres_vdata,
 
 HYPRE_Int
 hypre_FlexGMRESSetMaxIter( void *fgmres_vdata,
-                       HYPRE_Int   max_iter  )
+                           HYPRE_Int   max_iter  )
 {
    hypre_FlexGMRESData *fgmres_data = (hypre_FlexGMRESData *)fgmres_vdata;
 
@@ -868,7 +916,7 @@ hypre_FlexGMRESSetMaxIter( void *fgmres_vdata,
 
 HYPRE_Int
 hypre_FlexGMRESGetMaxIter( void *fgmres_vdata,
-                       HYPRE_Int * max_iter  )
+                           HYPRE_Int * max_iter  )
 {
    hypre_FlexGMRESData *fgmres_data = (hypre_FlexGMRESData *)fgmres_vdata;
 
@@ -885,7 +933,7 @@ hypre_FlexGMRESGetMaxIter( void *fgmres_vdata,
 
 HYPRE_Int
 hypre_FlexGMRESSetStopCrit( void   *fgmres_vdata,
-                        HYPRE_Int  stop_crit       )
+                            HYPRE_Int  stop_crit       )
 {
    hypre_FlexGMRESData *fgmres_data = (hypre_FlexGMRESData *)fgmres_vdata;
 
@@ -897,7 +945,7 @@ hypre_FlexGMRESSetStopCrit( void   *fgmres_vdata,
 
 HYPRE_Int
 hypre_FlexGMRESGetStopCrit( void   *fgmres_vdata,
-                        HYPRE_Int * stop_crit       )
+                            HYPRE_Int * stop_crit       )
 {
    hypre_FlexGMRESData *fgmres_data = (hypre_FlexGMRESData *)fgmres_vdata;
 
@@ -913,9 +961,9 @@ hypre_FlexGMRESGetStopCrit( void   *fgmres_vdata,
 
 HYPRE_Int
 hypre_FlexGMRESSetPrecond( void  *fgmres_vdata,
-						   HYPRE_Int  (*precond)(void*,void*,void*,void*),
-						   HYPRE_Int  (*precond_setup)(void*,void*,void*,void*),
-                       void  *precond_data )
+                           HYPRE_Int  (*precond)(void*, void*, void*, void*),
+                           HYPRE_Int  (*precond_setup)(void*, void*, void*, void*),
+                           void  *precond_data )
 {
    hypre_FlexGMRESData *fgmres_data = (hypre_FlexGMRESData *)fgmres_vdata;
    hypre_FlexGMRESFunctions *fgmres_functions = fgmres_data->functions;
@@ -934,7 +982,7 @@ hypre_FlexGMRESSetPrecond( void  *fgmres_vdata,
 
 HYPRE_Int
 hypre_FlexGMRESGetPrecond( void         *fgmres_vdata,
-                       HYPRE_Solver *precond_data_ptr )
+                           HYPRE_Solver *precond_data_ptr )
 {
    hypre_FlexGMRESData *fgmres_data = (hypre_FlexGMRESData *)fgmres_vdata;
 
@@ -950,7 +998,7 @@ hypre_FlexGMRESGetPrecond( void         *fgmres_vdata,
 
 HYPRE_Int
 hypre_FlexGMRESSetPrintLevel( void *fgmres_vdata,
-                        HYPRE_Int   level)
+                              HYPRE_Int   level)
 {
    hypre_FlexGMRESData *fgmres_data = (hypre_FlexGMRESData *)fgmres_vdata;
 
@@ -962,7 +1010,7 @@ hypre_FlexGMRESSetPrintLevel( void *fgmres_vdata,
 
 HYPRE_Int
 hypre_FlexGMRESGetPrintLevel( void *fgmres_vdata,
-                        HYPRE_Int * level)
+                              HYPRE_Int * level)
 {
    hypre_FlexGMRESData *fgmres_data = (hypre_FlexGMRESData *)fgmres_vdata;
 
@@ -978,7 +1026,7 @@ hypre_FlexGMRESGetPrintLevel( void *fgmres_vdata,
 
 HYPRE_Int
 hypre_FlexGMRESSetLogging( void *fgmres_vdata,
-                      HYPRE_Int   level)
+                           HYPRE_Int   level)
 {
    hypre_FlexGMRESData *fgmres_data = (hypre_FlexGMRESData *)fgmres_vdata;
 
@@ -990,7 +1038,7 @@ hypre_FlexGMRESSetLogging( void *fgmres_vdata,
 
 HYPRE_Int
 hypre_FlexGMRESGetLogging( void *fgmres_vdata,
-                      HYPRE_Int * level)
+                           HYPRE_Int * level)
 {
    hypre_FlexGMRESData *fgmres_data = (hypre_FlexGMRESData *)fgmres_vdata;
 
@@ -1006,7 +1054,7 @@ hypre_FlexGMRESGetLogging( void *fgmres_vdata,
 
 HYPRE_Int
 hypre_FlexGMRESGetNumIterations( void *fgmres_vdata,
-                             HYPRE_Int  *num_iterations )
+                                 HYPRE_Int  *num_iterations )
 {
    hypre_FlexGMRESData *fgmres_data = (hypre_FlexGMRESData *)fgmres_vdata;
 
@@ -1038,7 +1086,7 @@ hypre_FlexGMRESGetConverged( void *fgmres_vdata,
 
 HYPRE_Int
 hypre_FlexGMRESGetFinalRelativeResidualNorm( void   *fgmres_vdata,
-                                         HYPRE_Real *relative_residual_norm )
+                                             HYPRE_Real *relative_residual_norm )
 {
    hypre_FlexGMRESData *fgmres_data = (hypre_FlexGMRESData *)fgmres_vdata;
 
@@ -1051,32 +1099,34 @@ hypre_FlexGMRESGetFinalRelativeResidualNorm( void   *fgmres_vdata,
  * hypre_FlexGMRESSetModifyPC
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int hypre_FlexGMRESSetModifyPC(void *fgmres_vdata,
-                               HYPRE_Int (*modify_pc)(void *precond_data, HYPRE_Int iteration, HYPRE_Real rel_residual_norm))
+HYPRE_Int
+hypre_FlexGMRESSetModifyPC(void *fgmres_vdata,
+                           HYPRE_Int (*modify_pc)(void*, HYPRE_Int, HYPRE_Real))
 {
-
    hypre_FlexGMRESData *fgmres_data = (hypre_FlexGMRESData *)fgmres_vdata;
    hypre_FlexGMRESFunctions *fgmres_functions = fgmres_data->functions;
 
-   (fgmres_functions -> modify_pc)        = modify_pc;
+   (fgmres_functions -> modify_pc) = modify_pc;
 
    return hypre_error_flag;
 }
 
-
 /*--------------------------------------------------------------------------
  * hypre_FlexGMRESModifyPCDefault - if the user does not specify a function
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int hypre_FlexGMRESModifyPCDefault(void *precond_data, HYPRE_Int iteration,
-                                HYPRE_Real rel_residual_norm)
+HYPRE_Int
+hypre_FlexGMRESModifyPCDefault(void       *precond_data,
+                               HYPRE_Int   iteration,
+                               HYPRE_Real  rel_residual_norm)
 {
+   /* TODO - Here could check the number of its and the current
+      residual and make some changes to the preconditioner.
+      There is an example in ex5.c.*/
 
-
-   /* Here would could check the number of its and the current
-      residual and make some changes to the preconditioner.  There is
-      an example in ex5.c.*/
-
+   HYPRE_UNUSED_VAR(precond_data);
+   HYPRE_UNUSED_VAR(iteration);
+   HYPRE_UNUSED_VAR(rel_residual_norm);
 
    return 0;
 }
diff --git a/external/hypre/src/krylov/flexgmres.h b/external/hypre/src/krylov/flexgmres.h
index 56fb061c..f4d10759 100644
--- a/external/hypre/src/krylov/flexgmres.h
+++ b/external/hypre/src/krylov/flexgmres.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -66,7 +66,7 @@ typedef struct
    HYPRE_Int    (*precond_setup)(void *vdata, void *A, void *b, void *x );
 
    HYPRE_Int    (*modify_pc)(void *precond_data, HYPRE_Int iteration, HYPRE_Real rel_residual_norm );
-   
+
 } hypre_FlexGMRESFunctions;
 
 /**
@@ -101,7 +101,7 @@ typedef struct
 
    /* log info (always logged) */
    HYPRE_Int      num_iterations;
- 
+
    HYPRE_Int     print_level; /* printing when print_level>0 */
    HYPRE_Int     logging;  /* extra computations for logging when logging>0 */
    HYPRE_Real  *norms;
@@ -146,7 +146,7 @@ hypre_FlexGMRESFunctionsCreate(
    HYPRE_Int    (*Axpy)          ( HYPRE_Complex alpha, void *x, void *y ),
    HYPRE_Int    (*PrecondSetup)  ( void *vdata, void *A, void *b, void *x ),
    HYPRE_Int    (*Precond)       ( void *vdata, void *A, void *b, void *x )
-   );
+);
 
 /**
  * Description...
diff --git a/external/hypre/src/krylov/gmres.c b/external/hypre/src/krylov/gmres.c
index 343e4211..dec83794 100644
--- a/external/hypre/src/krylov/gmres.c
+++ b/external/hypre/src/krylov/gmres.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -38,11 +38,11 @@ hypre_GMRESFunctionsCreate(
    HYPRE_Int    (*Axpy)          ( HYPRE_Complex alpha, void *x, void *y ),
    HYPRE_Int    (*PrecondSetup)  ( void *vdata, void *A, void *b, void *x ),
    HYPRE_Int    (*Precond)       ( void *vdata, void *A, void *b, void *x )
-   )
+)
 {
    hypre_GMRESFunctions * gmres_functions;
    gmres_functions = (hypre_GMRESFunctions *)
-      CAlloc( 1, sizeof(hypre_GMRESFunctions), HYPRE_MEMORY_HOST );
+                     CAlloc( 1, sizeof(hypre_GMRESFunctions), HYPRE_MEMORY_HOST );
 
    gmres_functions->CAlloc = CAlloc;
    gmres_functions->Free = Free;
@@ -58,7 +58,7 @@ hypre_GMRESFunctionsCreate(
    gmres_functions->ClearVector = ClearVector;
    gmres_functions->ScaleVector = ScaleVector;
    gmres_functions->Axpy = Axpy;
-/* default preconditioner must be set here but can be changed later... */
+   /* default preconditioner must be set here but can be changed later... */
    gmres_functions->precond_setup = PrecondSetup;
    gmres_functions->precond       = Precond;
 
@@ -121,26 +121,36 @@ hypre_GMRESDestroy( void *gmres_vdata )
    if (gmres_data)
    {
       hypre_GMRESFunctions *gmres_functions = gmres_data->functions;
-      if ( (gmres_data->logging>0) || (gmres_data->print_level) > 0 )
+      if ( (gmres_data->logging > 0) || (gmres_data->print_level) > 0 )
       {
          if ( (gmres_data -> norms) != NULL )
+         {
             hypre_TFreeF( gmres_data -> norms, gmres_functions );
+         }
       }
 
       if ( (gmres_data -> matvec_data) != NULL )
+      {
          (*(gmres_functions->MatvecDestroy))(gmres_data -> matvec_data);
+      }
 
       if ( (gmres_data -> r) != NULL )
+      {
          (*(gmres_functions->DestroyVector))(gmres_data -> r);
+      }
       if ( (gmres_data -> w) != NULL )
+      {
          (*(gmres_functions->DestroyVector))(gmres_data -> w);
+      }
       if ( (gmres_data -> w_2) != NULL )
+      {
          (*(gmres_functions->DestroyVector))(gmres_data -> w_2);
+      }
 
 
       if ( (gmres_data -> p) != NULL )
       {
-         for (i = 0; i < (gmres_data -> k_dim+1); i++)
+         for (i = 0; i < (gmres_data -> k_dim + 1); i++)
          {
             if ( (gmres_data -> p)[i] != NULL )
             {
@@ -178,17 +188,17 @@ HYPRE_Int
 hypre_GMRESSetup( void *gmres_vdata,
                   void *A,
                   void *b,
-                  void *x         )
+                  void *x )
 {
-   hypre_GMRESData *gmres_data     = (hypre_GMRESData *)gmres_vdata;
-   hypre_GMRESFunctions *gmres_functions = gmres_data->functions;
+   hypre_GMRESData      *gmres_data      = (hypre_GMRESData *)gmres_vdata;
+   hypre_GMRESFunctions *gmres_functions = (gmres_data -> functions);
 
-   HYPRE_Int            k_dim            = (gmres_data -> k_dim);
-   HYPRE_Int            max_iter         = (gmres_data -> max_iter);
-   HYPRE_Int          (*precond_setup)(void*,void*,void*,void*) = (gmres_functions->precond_setup);
-   void          *precond_data     = (gmres_data -> precond_data);
+   HYPRE_Int             k_dim           = (gmres_data -> k_dim);
+   HYPRE_Int             max_iter        = (gmres_data -> max_iter);
+   void                 *precond_data    = (gmres_data -> precond_data);
+   HYPRE_Int             rel_change      = (gmres_data -> rel_change);
 
-   HYPRE_Int            rel_change       = (gmres_data -> rel_change);
+   HYPRE_Int (*precond_setup)(void*, void*, void*, void*) = (gmres_functions->precond_setup);
 
    HYPRE_ANNOTATE_FUNC_BEGIN;
 
@@ -201,21 +211,32 @@ hypre_GMRESSetup( void *gmres_vdata,
     *--------------------------------------------------*/
 
    if ((gmres_data -> p) == NULL)
-      (gmres_data -> p) = (void**)(*(gmres_functions->CreateVectorArray))(k_dim+1,x);
+   {
+      (gmres_data -> p) = (void**)(*(gmres_functions->CreateVectorArray))(k_dim + 1, x);
+   }
+
    if ((gmres_data -> r) == NULL)
+   {
       (gmres_data -> r) = (*(gmres_functions->CreateVector))(b);
+   }
+
    if ((gmres_data -> w) == NULL)
+   {
       (gmres_data -> w) = (*(gmres_functions->CreateVector))(b);
+   }
 
    if (rel_change)
    {
       if ((gmres_data -> w_2) == NULL)
+      {
          (gmres_data -> w_2) = (*(gmres_functions->CreateVector))(b);
+      }
    }
 
-
    if ((gmres_data -> matvec_data) == NULL)
+   {
       (gmres_data -> matvec_data) = (*(gmres_functions->MatvecCreate))(A, x);
+   }
 
    precond_setup(precond_data, A, b, x);
 
@@ -223,11 +244,14 @@ hypre_GMRESSetup( void *gmres_vdata,
     * Allocate space for log info
     *-----------------------------------------------------*/
 
-   if ( (gmres_data->logging)>0 || (gmres_data->print_level) > 0 )
+   if ( (gmres_data->logging) > 0 || (gmres_data->print_level) > 0 )
    {
       if ((gmres_data -> norms) != NULL)
-         hypre_TFreeF(gmres_data -> norms,gmres_functions);
-         (gmres_data -> norms) = hypre_CTAllocF(HYPRE_Real, max_iter + 1,gmres_functions, HYPRE_MEMORY_HOST);
+      {
+         hypre_TFreeF(gmres_data -> norms, gmres_functions);
+      }
+      (gmres_data -> norms) = hypre_CTAllocF(HYPRE_Real, max_iter + 1, gmres_functions,
+                                             HYPRE_MEMORY_HOST);
    }
    if ( (gmres_data->print_level) > 0 )
    {
@@ -253,56 +277,53 @@ hypre_GMRESSolve(void  *gmres_vdata,
                  void  *x)
 {
    hypre_GMRESData      *gmres_data         = (hypre_GMRESData *)gmres_vdata;
-   hypre_GMRESFunctions *gmres_functions    = gmres_data->functions;
+   hypre_GMRESFunctions *gmres_functions    = (gmres_data -> functions);
+
    HYPRE_Int             k_dim              = (gmres_data -> k_dim);
    HYPRE_Int             min_iter           = (gmres_data -> min_iter);
    HYPRE_Int             max_iter           = (gmres_data -> max_iter);
    HYPRE_Int             rel_change         = (gmres_data -> rel_change);
    HYPRE_Int             skip_real_r_check  = (gmres_data -> skip_real_r_check);
-   HYPRE_Int 		 hybrid             = (gmres_data -> hybrid);
+   HYPRE_Int             hybrid             = (gmres_data -> hybrid);
    HYPRE_Real            r_tol              = (gmres_data -> tol);
    HYPRE_Real            cf_tol             = (gmres_data -> cf_tol);
    HYPRE_Real            a_tol              = (gmres_data -> a_tol);
    void                 *matvec_data        = (gmres_data -> matvec_data);
    void                 *r                  = (gmres_data -> r);
    void                 *w                  = (gmres_data -> w);
+
    /* note: w_2 is only allocated if rel_change = 1 */
    void                 *w_2                = (gmres_data -> w_2);
-
    void                **p                  = (gmres_data -> p);
 
-
-   HYPRE_Int           (*precond)(void*,void*,void*,void*) = (gmres_functions -> precond);
+   HYPRE_Int           (*precond)(void*, void*, void*, void*) = (gmres_functions -> precond);
    HYPRE_Int            *precond_data = (HYPRE_Int*) (gmres_data -> precond_data);
 
    HYPRE_Int             print_level        = (gmres_data -> print_level);
    HYPRE_Int             logging            = (gmres_data -> logging);
-
    HYPRE_Real           *norms              = (gmres_data -> norms);
-/* not used yet   char           *log_file_name  = (gmres_data -> log_file_name);*/
-/*   FILE           *fp; */
-
-   HYPRE_Int        break_value = 0;
-   HYPRE_Int        i, j, k;
-   HYPRE_Real *rs, **hh, *c, *s, *rs_2;
-   HYPRE_Int        iter;
-   HYPRE_Int        my_id, num_procs;
-   HYPRE_Real epsilon, gamma, t, r_norm, b_norm, den_norm, x_norm;
-   HYPRE_Real w_norm;
-
-   HYPRE_Real epsmac = 1.e-16;
-   HYPRE_Real ieee_check = 0.;
-
-   HYPRE_Real guard_zero_residual;
-   HYPRE_Real cf_ave_0 = 0.0;
-   HYPRE_Real cf_ave_1 = 0.0;
-   HYPRE_Real weight;
-   HYPRE_Real r_norm_0;
-   HYPRE_Real relative_error = 1.0;
-
-   HYPRE_Int        rel_change_passed = 0, num_rel_change_check = 0;
-
-   HYPRE_Real real_r_norm_old, real_r_norm_new;
+   /* not used yet   char           *log_file_name  = (gmres_data -> log_file_name);*/
+   /*   FILE           *fp; */
+
+   HYPRE_Int             break_value = 0;
+   HYPRE_Int             i, j, k;
+   HYPRE_Real           *rs, **hh, *c, *s, *rs_2 = NULL;
+   HYPRE_Int             iter;
+   HYPRE_Int             my_id, num_procs;
+   HYPRE_Real            epsilon, gamma, t, r_norm, b_norm, den_norm, x_norm;
+   HYPRE_Real            w_norm;
+
+   HYPRE_Real            epsmac = 1.e-16;
+   HYPRE_Real            ieee_check = 0.;
+
+   HYPRE_Real            guard_zero_residual;
+   HYPRE_Real            cf_ave_0 = 0.0;
+   HYPRE_Real            cf_ave_1 = 0.0;
+   HYPRE_Real            weight;
+   HYPRE_Real            r_norm_0;
+   HYPRE_Real            relative_error = 1.0;
+   HYPRE_Int             rel_change_passed = 0, num_rel_change_check = 0;
+   HYPRE_Real            real_r_norm_old, real_r_norm_new;
 
    HYPRE_ANNOTATE_FUNC_BEGIN;
 
@@ -315,39 +336,39 @@ hypre_GMRESSolve(void  *gmres_vdata,
     *-----------------------------------------------------------------------*/
    guard_zero_residual = 0.0;
 
-   (*(gmres_functions->CommInfo))(A,&my_id,&num_procs);
-   if ( logging>0 || print_level>0 )
+   (*(gmres_functions->CommInfo))(A, &my_id, &num_procs);
+   if ( logging > 0 || print_level > 0 )
    {
       norms = (gmres_data -> norms);
    }
 
    /* initialize work arrays */
-   rs = hypre_CTAllocF(HYPRE_Real,k_dim+1,gmres_functions, HYPRE_MEMORY_HOST);
-   c = hypre_CTAllocF(HYPRE_Real,k_dim,gmres_functions, HYPRE_MEMORY_HOST);
-   s = hypre_CTAllocF(HYPRE_Real,k_dim,gmres_functions, HYPRE_MEMORY_HOST);
+   rs = hypre_CTAllocF(HYPRE_Real, k_dim + 1, gmres_functions, HYPRE_MEMORY_HOST);
+   c = hypre_CTAllocF(HYPRE_Real, k_dim, gmres_functions, HYPRE_MEMORY_HOST);
+   s = hypre_CTAllocF(HYPRE_Real, k_dim, gmres_functions, HYPRE_MEMORY_HOST);
    if (rel_change)
    {
-      rs_2 = hypre_CTAllocF(HYPRE_Real,k_dim+1,gmres_functions, HYPRE_MEMORY_HOST);
+      rs_2 = hypre_CTAllocF(HYPRE_Real, k_dim + 1, gmres_functions, HYPRE_MEMORY_HOST);
    }
-   hh = hypre_CTAllocF(HYPRE_Real*,k_dim+1,gmres_functions, HYPRE_MEMORY_HOST);
-   for (i=0; i < k_dim+1; i++)
+   hh = hypre_CTAllocF(HYPRE_Real*, k_dim + 1, gmres_functions, HYPRE_MEMORY_HOST);
+   for (i = 0; i < k_dim + 1; i++)
    {
-      hh[i] = hypre_CTAllocF(HYPRE_Real,k_dim,gmres_functions, HYPRE_MEMORY_HOST);
+      hh[i] = hypre_CTAllocF(HYPRE_Real, k_dim, gmres_functions, HYPRE_MEMORY_HOST);
    }
 
-   (*(gmres_functions->CopyVector))(b,p[0]);
+   (*(gmres_functions->CopyVector))(b, p[0]);
 
    /* compute initial residual */
-   (*(gmres_functions->Matvec))(matvec_data,-1.0, A, x, 1.0, p[0]);
+   (*(gmres_functions->Matvec))(matvec_data, -1.0, A, x, 1.0, p[0]);
 
-   b_norm = sqrt((*(gmres_functions->InnerProd))(b,b));
+   b_norm = hypre_sqrt((*(gmres_functions->InnerProd))(b, b));
    real_r_norm_old = b_norm;
 
-   /* Since it is does not diminish performance, attempt to return an error flag
+   /* Since it does not diminish performance, attempt to return an error flag
       and notify users when they supply bad input. */
    if (b_norm != 0.)
    {
-      ieee_check = b_norm/b_norm; /* INF -> NaN conversion */
+      ieee_check = b_norm / b_norm; /* INF -> NaN conversion */
    }
    if (ieee_check != ieee_check)
    {
@@ -370,14 +391,14 @@ hypre_GMRESSolve(void  *gmres_vdata,
       return hypre_error_flag;
    }
 
-   r_norm = sqrt((*(gmres_functions->InnerProd))(p[0],p[0]));
+   r_norm = hypre_sqrt((*(gmres_functions->InnerProd))(p[0], p[0]));
    r_norm_0 = r_norm;
 
-   /* Since it is does not diminish performance, attempt to return an error flag
+   /* Since it does not diminish performance, attempt to return an error flag
       and notify users when they supply bad input. */
    if (r_norm != 0.)
    {
-      ieee_check = r_norm/r_norm; /* INF -> NaN conversion */
+      ieee_check = r_norm / r_norm; /* INF -> NaN conversion */
    }
    if (ieee_check != ieee_check)
    {
@@ -400,10 +421,10 @@ hypre_GMRESSolve(void  *gmres_vdata,
       return hypre_error_flag;
    }
 
-   if ( logging>0 || print_level > 0)
+   if ( logging > 0 || print_level > 0)
    {
       norms[0] = r_norm;
-      if ( print_level>1 && my_id == 0 )
+      if ( print_level > 1 && my_id == 0 )
       {
          hypre_printf("L2 norm of b: %e\n", b_norm);
          if (b_norm == 0.0)
@@ -418,12 +439,12 @@ hypre_GMRESSolve(void  *gmres_vdata,
    if (b_norm > 0.0)
    {
       /* convergence criterion |r_i|/|b| <= accuracy if |b| > 0 */
-      den_norm= b_norm;
+      den_norm = b_norm;
    }
    else
    {
       /* convergence criterion |r_i|/|r0| <= accuracy if |b| = 0 */
-      den_norm= r_norm;
+      den_norm = r_norm;
    }
 
 
@@ -433,11 +454,11 @@ hypre_GMRESSolve(void  *gmres_vdata,
             user specifies a_tol, or sets r_tol = 0.0, which means absolute
             tol only is checked  */
 
-   epsilon = hypre_max(a_tol,r_tol*den_norm);
+   epsilon = hypre_max(a_tol, r_tol * den_norm);
 
    /* so now our stop criteria is |r_i| <= epsilon */
 
-   if ( print_level>1 && my_id == 0 )
+   if ( print_level > 1 && my_id == 0 )
    {
       if (b_norm > 0.0)
       {
@@ -464,12 +485,13 @@ hypre_GMRESSolve(void  *gmres_vdata,
       rs[0] = r_norm;
       if (r_norm == 0.0)
       {
-         hypre_TFreeF(c,gmres_functions);
-         hypre_TFreeF(s,gmres_functions);
-         hypre_TFreeF(rs,gmres_functions);
-         if (rel_change)  hypre_TFreeF(rs_2,gmres_functions);
-         for (i=0; i < k_dim+1; i++) hypre_TFreeF(hh[i],gmres_functions);
-         hypre_TFreeF(hh,gmres_functions);
+         hypre_TFreeF(c, gmres_functions);
+         hypre_TFreeF(s, gmres_functions);
+         hypre_TFreeF(rs, gmres_functions);
+         if (rel_change) { hypre_TFreeF(rs_2, gmres_functions); }
+         for (i = 0; i < k_dim + 1; i++) { hypre_TFreeF(hh[i], gmres_functions); }
+         hypre_TFreeF(hh, gmres_functions);
+         (gmres_data -> num_iterations) = iter;
          HYPRE_ANNOTATE_FUNC_END;
 
          return hypre_error_flag;
@@ -482,12 +504,12 @@ hypre_GMRESSolve(void  *gmres_vdata,
          if (!rel_change) /* shouldn't exit after no iterations if
                            * relative change is on*/
          {
-            (*(gmres_functions->CopyVector))(b,r);
-            (*(gmres_functions->Matvec))(matvec_data,-1.0,A,x,1.0,r);
-            r_norm = sqrt((*(gmres_functions->InnerProd))(r,r));
+            (*(gmres_functions->CopyVector))(b, r);
+            (*(gmres_functions->Matvec))(matvec_data, -1.0, A, x, 1.0, r);
+            r_norm = hypre_sqrt((*(gmres_functions->InnerProd))(r, r));
             if (r_norm  <= epsilon)
             {
-               if ( print_level>1 && my_id == 0)
+               if ( print_level > 1 && my_id == 0)
                {
                   hypre_printf("\n\n");
                   hypre_printf("Final L2 norm of residual: %e\n\n", r_norm);
@@ -496,7 +518,7 @@ hypre_GMRESSolve(void  *gmres_vdata,
             }
             else
             {
-               if ( print_level>0 && my_id == 0)
+               if ( print_level > 0 && my_id == 0)
                {
                   hypre_printf("false convergence 1\n");
                }
@@ -505,7 +527,7 @@ hypre_GMRESSolve(void  *gmres_vdata,
       }
 
       t = 1.0 / r_norm;
-      (*(gmres_functions->ScaleVector))(t,p[0]);
+      (*(gmres_functions->ScaleVector))(t, p[0]);
       i = 0;
 
       /***RESTART CYCLE (right-preconditioning) ***/
@@ -514,61 +536,61 @@ hypre_GMRESSolve(void  *gmres_vdata,
          i++;
          iter++;
          (*(gmres_functions->ClearVector))(r);
-         precond(precond_data, A, p[i-1], r);
+         precond(precond_data, A, p[i - 1], r);
          (*(gmres_functions->Matvec))(matvec_data, 1.0, A, r, 0.0, p[i]);
          /* modified Gram_Schmidt */
-         for (j=0; j < i; j++)
+         for (j = 0; j < i; j++)
          {
-            hh[j][i-1] = (*(gmres_functions->InnerProd))(p[j],p[i]);
-            (*(gmres_functions->Axpy))(-hh[j][i-1],p[j],p[i]);
+            hh[j][i - 1] = (*(gmres_functions->InnerProd))(p[j], p[i]);
+            (*(gmres_functions->Axpy))(-hh[j][i - 1], p[j], p[i]);
          }
-         t = sqrt((*(gmres_functions->InnerProd))(p[i],p[i]));
-         hh[i][i-1] = t;
+         t = hypre_sqrt((*(gmres_functions->InnerProd))(p[i], p[i]));
+         hh[i][i - 1] = t;
          if (t != 0.0)
          {
-            t = 1.0/t;
-            (*(gmres_functions->ScaleVector))(t,p[i]);
+            t = 1.0 / t;
+            (*(gmres_functions->ScaleVector))(t, p[i]);
          }
          /* done with modified Gram_schmidt and Arnoldi step.
             update factorization of hh */
          for (j = 1; j < i; j++)
          {
-            t = hh[j-1][i-1];
-            hh[j-1][i-1] = s[j-1]*hh[j][i-1] + c[j-1]*t;
-            hh[j][i-1] = -s[j-1]*t + c[j-1]*hh[j][i-1];
+            t = hh[j - 1][i - 1];
+            hh[j - 1][i - 1] = s[j - 1] * hh[j][i - 1] + c[j - 1] * t;
+            hh[j][i - 1] = -s[j - 1] * t + c[j - 1] * hh[j][i - 1];
          }
-         t= hh[i][i-1]*hh[i][i-1];
-         t+= hh[i-1][i-1]*hh[i-1][i-1];
-         gamma = sqrt(t);
+         t = hh[i][i - 1] * hh[i][i - 1];
+         t += hh[i - 1][i - 1] * hh[i - 1][i - 1];
+         gamma = hypre_sqrt(t);
          if (gamma == 0.0)
          {
             gamma = epsmac;
          }
-         c[i-1] = hh[i-1][i-1]/gamma;
-         s[i-1] = hh[i][i-1]/gamma;
-         rs[i] = -hh[i][i-1]*rs[i-1];
-         rs[i]/=  gamma;
-         rs[i-1] = c[i-1]*rs[i-1];
+         c[i - 1] = hh[i - 1][i - 1] / gamma;
+         s[i - 1] = hh[i][i - 1] / gamma;
+         rs[i] = -hh[i][i - 1] * rs[i - 1];
+         rs[i] /=  gamma;
+         rs[i - 1] = c[i - 1] * rs[i - 1];
          /* determine residual norm */
-         hh[i-1][i-1] = s[i-1]*hh[i][i-1] + c[i-1]*hh[i-1][i-1];
-         r_norm = fabs(rs[i]);
+         hh[i - 1][i - 1] = s[i - 1] * hh[i][i - 1] + c[i - 1] * hh[i - 1][i - 1];
+         r_norm = hypre_abs(rs[i]);
 
          /* print ? */
-         if ( print_level>0 )
+         if ( print_level > 0 )
          {
             norms[iter] = r_norm;
-            if ( print_level>1 && my_id == 0 )
+            if ( print_level > 1 && my_id == 0 )
             {
                if (b_norm > 0.0)
                {
                   hypre_printf("% 5d    %e    %f   %e\n", iter,
-                               norms[iter],norms[iter]/norms[iter-1],
-                               norms[iter]/b_norm);
+                               norms[iter], norms[iter] / norms[iter - 1],
+                               norms[iter] / b_norm);
                }
                else
                {
                   hypre_printf("% 5d    %e    %f\n", iter, norms[iter],
-                               norms[iter]/norms[iter-1]);
+                               norms[iter] / norms[iter - 1]);
                }
             }
          }
@@ -576,14 +598,14 @@ hypre_GMRESSolve(void  *gmres_vdata,
          if (cf_tol > 0.0)
          {
             cf_ave_0 = cf_ave_1;
-            cf_ave_1 = pow( r_norm / r_norm_0, 1.0/(2.0*iter));
+            cf_ave_1 = hypre_pow( r_norm / r_norm_0, 1.0 / (2.0 * iter));
 
-            weight   = fabs(cf_ave_1 - cf_ave_0);
+            weight   = hypre_abs(cf_ave_1 - cf_ave_0);
             weight   = weight / hypre_max(cf_ave_1, cf_ave_0);
             weight   = 1.0 - weight;
 #if 0
             hypre_printf("I = %d: cf_new = %e, cf_old = %e, weight = %e\n",
-                  i, cf_ave_1, cf_ave_0, weight );
+                         i, cf_ave_1, cf_ave_0, weight );
 #endif
             if (weight * cf_ave_1 > cf_tol)
             {
@@ -610,28 +632,28 @@ hypre_GMRESSolve(void  *gmres_vdata,
                   Here we will check the relative here as we don't
                   want to exit the restart cycle prematurely */
 
-               for (k=0; k<i; k++)
+               for (k = 0; k < i; k++)
                {
                   /* extra copy of rs so we don't need to change the later solve */
                   rs_2[k] = rs[k];
                }
 
                /* solve tri. system*/
-               rs_2[i-1] = rs_2[i-1]/hh[i-1][i-1];
-               for (k = i-2; k >= 0; k--)
+               rs_2[i - 1] = rs_2[i - 1] / hh[i - 1][i - 1];
+               for (k = i - 2; k >= 0; k--)
                {
                   t = 0.0;
-                  for (j = k+1; j < i; j++)
+                  for (j = k + 1; j < i; j++)
                   {
-                     t -= hh[k][j]*rs_2[j];
+                     t -= hh[k][j] * rs_2[j];
                   }
-                  t+= rs_2[k];
-                  rs_2[k] = t/hh[k][k];
+                  t += rs_2[k];
+                  rs_2[k] = t / hh[k][k];
                }
 
-               (*(gmres_functions->CopyVector))(p[i-1],w);
-               (*(gmres_functions->ScaleVector))(rs_2[i-1],w);
-               for (j = i-2; j >=0; j--)
+               (*(gmres_functions->CopyVector))(p[i - 1], w);
+               (*(gmres_functions->ScaleVector))(rs_2[i - 1], w);
+               for (j = i - 2; j >= 0; j--)
                {
                   (*(gmres_functions->Axpy))(rs_2[j], p[j], w);
                }
@@ -639,17 +661,18 @@ hypre_GMRESSolve(void  *gmres_vdata,
                /* find correction (in r) */
                precond(precond_data, A, w, r);
                /* copy current solution (x) to w (don't want to over-write x)*/
-               (*(gmres_functions->CopyVector))(x,w);
+               (*(gmres_functions->CopyVector))(x, w);
 
                /* add the correction */
-               (*(gmres_functions->Axpy))(1.0,r,w);
+               (*(gmres_functions->Axpy))(1.0, r, w);
 
                /* now w is the approx solution  - get the norm*/
-               x_norm = sqrt( (*(gmres_functions->InnerProd))(w,w) );
+               x_norm = hypre_sqrt( (*(gmres_functions->InnerProd))(w, w) );
 
                if ( !(x_norm <= guard_zero_residual ))
                   /* don't divide by zero */
-               {  /* now get  x_i - x_i-1 */
+               {
+                  /* now get  x_i - x_i-1 */
 
                   if (num_rel_change_check)
                   {
@@ -677,15 +700,15 @@ hypre_GMRESSolve(void  *gmres_vdata,
                         = M^{-1} rs_{i-1}{p_{i-1}} */
 
                      (*(gmres_functions->ClearVector))(w);
-                     (*(gmres_functions->Axpy))(rs_2[i-1], p[i-1], w);
+                     (*(gmres_functions->Axpy))(rs_2[i - 1], p[i - 1], w);
                      (*(gmres_functions->ClearVector))(r);
                      /* apply the preconditioner */
                      precond(precond_data, A, w, r);
                      /* now r contains x_i - x_i-1 */
                   }
                   /* find the norm of x_i - x_i-1 */
-                  w_norm = sqrt( (*(gmres_functions->InnerProd))(r,r) );
-                  relative_error = w_norm/x_norm;
+                  w_norm = hypre_sqrt( (*(gmres_functions->InnerProd))(r, r) );
+                  relative_error = w_norm / x_norm;
                   if (relative_error <= r_tol)
                   {
                      rel_change_passed = 1;
@@ -714,29 +737,31 @@ hypre_GMRESSolve(void  *gmres_vdata,
          break;
       }
 
-      rs[i-1] = rs[i-1]/hh[i-1][i-1];
-      for (k = i-2; k >= 0; k--)
+      rs[i - 1] = rs[i - 1] / hh[i - 1][i - 1];
+      for (k = i - 2; k >= 0; k--)
       {
          t = 0.0;
-         for (j = k+1; j < i; j++)
+         for (j = k + 1; j < i; j++)
          {
-            t -= hh[k][j]*rs[j];
+            t -= hh[k][j] * rs[j];
          }
          t += rs[k];
-         rs[k] = t/hh[k][k];
+         rs[k] = t / hh[k][k];
       }
 
-      (*(gmres_functions->CopyVector))(p[i-1],w);
-      (*(gmres_functions->ScaleVector))(rs[i-1],w);
-      for (j = i-2; j >=0; j--)
+      (*(gmres_functions->CopyVector))(p[i - 1], w);
+      (*(gmres_functions->ScaleVector))(rs[i - 1], w);
+      for (j = i - 2; j >= 0; j--)
+      {
          (*(gmres_functions->Axpy))(rs[j], p[j], w);
+      }
 
       (*(gmres_functions->ClearVector))(r);
       /* find correction (in r) */
       precond(precond_data, A, w, r);
 
       /* update current solution x (in x) */
-      (*(gmres_functions->Axpy))(1.0,r,x);
+      (*(gmres_functions->Axpy))(1.0, r, x);
 
       /* check for convergence by evaluating the actual residual */
       if (r_norm  <= epsilon && iter >= min_iter)
@@ -748,16 +773,16 @@ hypre_GMRESSolve(void  *gmres_vdata,
          }
 
          /* calculate actual residual norm*/
-         (*(gmres_functions->CopyVector))(b,r);
-         (*(gmres_functions->Matvec))(matvec_data,-1.0,A,x,1.0,r);
-         real_r_norm_new = r_norm = sqrt( (*(gmres_functions->InnerProd))(r,r) );
+         (*(gmres_functions->CopyVector))(b, r);
+         (*(gmres_functions->Matvec))(matvec_data, -1.0, A, x, 1.0, r);
+         real_r_norm_new = r_norm = hypre_sqrt( (*(gmres_functions->InnerProd))(r, r) );
 
          if (r_norm <= epsilon)
          {
             if (rel_change && !rel_change_passed) /* calculate the relative change */
             {
                /* calculate the norm of the solution */
-               x_norm = sqrt( (*(gmres_functions->InnerProd))(x,x) );
+               x_norm = hypre_sqrt( (*(gmres_functions->InnerProd))(x, x) );
 
                if ( !(x_norm <= guard_zero_residual ))
                   /* don't divide by zero */
@@ -769,17 +794,17 @@ hypre_GMRESSolve(void  *gmres_vdata,
                      - {x + M^{-1}[sum{j=0..i-2} rs_j p_j ]}
                      = M^{-1} rs_{i-1}{p_{i-1}} */
                   (*(gmres_functions->ClearVector))(w);
-                  (*(gmres_functions->Axpy))(rs[i-1], p[i-1], w);
+                  (*(gmres_functions->Axpy))(rs[i - 1], p[i - 1], w);
                   (*(gmres_functions->ClearVector))(r);
                   /* apply the preconditioner */
                   precond(precond_data, A, w, r);
                   /* find the norm of x_i - x_i-1 */
-                  w_norm = sqrt( (*(gmres_functions->InnerProd))(r,r) );
-                  relative_error= w_norm/x_norm;
+                  w_norm = hypre_sqrt( (*(gmres_functions->InnerProd))(r, r) );
+                  relative_error = w_norm / x_norm;
                   if ( relative_error < r_tol )
                   {
                      (gmres_data -> converged) = 1;
-                     if ( print_level>1 && my_id == 0 )
+                     if ( print_level > 1 && my_id == 0 )
                      {
                         hypre_printf("\n\n");
                         hypre_printf("Final L2 norm of residual: %e\n\n", r_norm);
@@ -790,7 +815,7 @@ hypre_GMRESSolve(void  *gmres_vdata,
                else
                {
                   (gmres_data -> converged) = 1;
-                  if ( print_level>1 && my_id == 0 )
+                  if ( print_level > 1 && my_id == 0 )
                   {
                      hypre_printf("\n\n");
                      hypre_printf("Final L2 norm of residual: %e\n\n", r_norm);
@@ -801,7 +826,7 @@ hypre_GMRESSolve(void  *gmres_vdata,
             }
             else /* don't need to check rel. change */
             {
-               if ( print_level>1 && my_id == 0 )
+               if ( print_level > 1 && my_id == 0 )
                {
                   hypre_printf("\n\n");
                   hypre_printf("Final L2 norm of residual: %e\n\n", r_norm);
@@ -825,36 +850,38 @@ hypre_GMRESSolve(void  *gmres_vdata,
             }
 
             /* report discrepancy between real/GMRES residuals and restart */
-            if ( print_level>0 && my_id == 0)
+            if ( print_level > 0 && my_id == 0)
             {
                hypre_printf("false convergence 2, L2 norm of residual: %e\n", r_norm);
             }
-            (*(gmres_functions->CopyVector))(r,p[0]);
+            (*(gmres_functions->CopyVector))(r, p[0]);
             i = 0;
             real_r_norm_old = real_r_norm_new;
          }
       } /* end of convergence check */
 
       /* compute residual vector and continue loop */
-      for (j=i ; j > 0; j--)
+      for (j = i ; j > 0; j--)
       {
-         rs[j-1] = -s[j-1]*rs[j];
-         rs[j] = c[j-1]*rs[j];
+         rs[j - 1] = -s[j - 1] * rs[j];
+         rs[j] = c[j - 1] * rs[j];
       }
 
-      if (i) (*(gmres_functions->Axpy))(rs[i]-1.0,p[i],p[i]);
-      for (j=i-1 ; j > 0; j--)
-         (*(gmres_functions->Axpy))(rs[j],p[j],p[i]);
+      if (i) { (*(gmres_functions->Axpy))(rs[i] - 1.0, p[i], p[i]); }
+      for (j = i - 1 ; j > 0; j--)
+      {
+         (*(gmres_functions->Axpy))(rs[j], p[j], p[i]);
+      }
 
       if (i)
       {
-         (*(gmres_functions->Axpy))(rs[0]-1.0,p[0],p[0]);
-         (*(gmres_functions->Axpy))(1.0,p[i],p[0]);
+         (*(gmres_functions->Axpy))(rs[0] - 1.0, p[0], p[0]);
+         (*(gmres_functions->Axpy))(1.0, p[i], p[0]);
       }
    } /* END of iteration while loop */
 
 
-   if ( print_level>1 && my_id == 0 )
+   if ( print_level > 1 && my_id == 0 )
    {
       hypre_printf("\n\n");
    }
@@ -863,7 +890,7 @@ hypre_GMRESSolve(void  *gmres_vdata,
 
    if (b_norm > 0.0)
    {
-      (gmres_data -> rel_residual_norm) = r_norm/b_norm;
+      (gmres_data -> rel_residual_norm) = r_norm / b_norm;
    }
 
    if (b_norm == 0.0)
@@ -882,12 +909,12 @@ hypre_GMRESSolve(void  *gmres_vdata,
 
    if (rel_change)
    {
-      hypre_TFreeF(rs_2,gmres_functions);
+      hypre_TFreeF(rs_2, gmres_functions);
    }
 
-   for (i=0; i < k_dim+1; i++)
+   for (i = 0; i < k_dim + 1; i++)
    {
-      hypre_TFreeF(hh[i],gmres_functions);
+      hypre_TFreeF(hh[i], gmres_functions);
    }
 
    hypre_TFreeF(hh, gmres_functions);
@@ -905,7 +932,7 @@ HYPRE_Int
 hypre_GMRESSetKDim( void     *gmres_vdata,
                     HYPRE_Int k_dim )
 {
-   hypre_GMRESData *gmres_data =(hypre_GMRESData *) gmres_vdata;
+   hypre_GMRESData *gmres_data = (hypre_GMRESData *) gmres_vdata;
 
 
    (gmres_data -> k_dim) = k_dim;
@@ -1154,8 +1181,8 @@ hypre_GMRESGetStopCrit( void      *gmres_vdata,
 
 HYPRE_Int
 hypre_GMRESSetPrecond( void  *gmres_vdata,
-                       HYPRE_Int  (*precond)(void*,void*,void*,void*),
-                       HYPRE_Int  (*precond_setup)(void*,void*,void*,void*),
+                       HYPRE_Int  (*precond)(void*, void*, void*, void*),
+                       HYPRE_Int  (*precond_setup)(void*, void*, void*, void*),
                        void  *precond_data )
 {
    hypre_GMRESData *gmres_data = (hypre_GMRESData *)gmres_vdata;
diff --git a/external/hypre/src/krylov/gmres.h b/external/hypre/src/krylov/gmres.h
index 89bb7e1d..3a77eb44 100644
--- a/external/hypre/src/krylov/gmres.h
+++ b/external/hypre/src/krylov/gmres.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -102,7 +102,7 @@ typedef struct
 
    /* log info (always logged) */
    HYPRE_Int      num_iterations;
- 
+
    HYPRE_Int     print_level; /* printing when print_level>0 */
    HYPRE_Int     logging;  /* extra computations for logging when logging>0 */
    HYPRE_Real  *norms;
@@ -147,7 +147,7 @@ hypre_GMRESFunctionsCreate(
    HYPRE_Int    (*Axpy)          ( HYPRE_Complex alpha, void *x, void *y ),
    HYPRE_Int    (*PrecondSetup)  ( void *vdata, void *A, void *b, void *x ),
    HYPRE_Int    (*Precond)       ( void *vdata, void *A, void *b, void *x )
-   );
+);
 
 /**
  * Description...
diff --git a/external/hypre/src/krylov/headers b/external/hypre/src/krylov/headers
deleted file mode 100644
index 3656b34f..00000000
--- a/external/hypre/src/krylov/headers
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
-# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
-#
-# SPDX-License-Identifier: (Apache-2.0 OR MIT)
-
-INTERNAL_HEADER=krylov.h
-
-#===========================================================================
-# Include guards and other includes
-#===========================================================================
-
-cat > $INTERNAL_HEADER <<@
-
-#include "HYPRE_krylov.h"
-
-#ifndef hypre_KRYLOV_HEADER
-#define hypre_KRYLOV_HEADER
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <math.h>
-
-#include "_hypre_utilities.h"
-
-#define hypre_CTAllocF(type, count, funcs) \
-( (type *)(*(funcs->CAlloc))\
-((size_t)(count), (size_t)sizeof(type)) )
-
-#define hypre_TFreeF( ptr, funcs ) \
-( (*(funcs->Free))((char *)ptr), ptr = NULL )
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-@
-
-#===========================================================================
-# Structures and prototypes
-#===========================================================================
-
-cat bicgstab.h   >> $INTERNAL_HEADER
-cat cgnr.h       >> $INTERNAL_HEADER
-cat gmres.h      >> $INTERNAL_HEADER
-cat lgmres.h      >> $INTERNAL_HEADER
-cat flexgmres.h      >> $INTERNAL_HEADER
-cat pcg.h        >> $INTERNAL_HEADER
-
-../utilities/protos bicgstab.c            >> $INTERNAL_HEADER
-../utilities/protos cgnr.c                >> $INTERNAL_HEADER
-../utilities/protos gmres.c               >> $INTERNAL_HEADER
-../utilities/protos flexgmres.c           >> $INTERNAL_HEADER
-../utilities/protos lgmres.c               >> $INTERNAL_HEADER
-../utilities/protos HYPRE_bicgstab.c      >> $INTERNAL_HEADER
-../utilities/protos HYPRE_cgnr.c          >> $INTERNAL_HEADER
-../utilities/protos HYPRE_gmres.c         >> $INTERNAL_HEADER
-../utilities/protos HYPRE_flexgmres.c         >> $INTERNAL_HEADER
-../utilities/protos HYPRE_lgmres.c         >> $INTERNAL_HEADER
-../utilities/protos HYPRE_pcg.c           >> $INTERNAL_HEADER
-../utilities/protos pcg.c                 >> $INTERNAL_HEADER
-
-#===========================================================================
-# Include guards
-#===========================================================================
-
-cat >> $INTERNAL_HEADER <<@
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
-@
-
diff --git a/external/hypre/src/krylov/krylov.h b/external/hypre/src/krylov/krylov.h
index 2e017f15..03eeb124 100644
--- a/external/hypre/src/krylov/krylov.h
+++ b/external/hypre/src/krylov/krylov.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -25,1584 +25,1641 @@
 extern "C" {
 #endif
 
-  /******************************************************************************
-   *
-   * BiCGSTAB bicgstab
-   *
-   *****************************************************************************/
+/******************************************************************************
+ *
+ * BiCGSTAB bicgstab
+ *
+ *****************************************************************************/
 
 #ifndef hypre_KRYLOV_BiCGSTAB_HEADER
 #define hypre_KRYLOV_BiCGSTAB_HEADER
 
-  /*--------------------------------------------------------------------------
-   *--------------------------------------------------------------------------*/
-
-  /**
-   * @name Generic BiCGSTAB Interface
-   *
-   * A general description of the interface goes here...
-   *
-   * @memo A generic BiCGSTAB linear solver interface
-   * @version 0.1
-   * @author Jeffrey F. Painter
-   **/
-  /*@{*/
-
-  /*--------------------------------------------------------------------------
-   *--------------------------------------------------------------------------*/
-
-  /*--------------------------------------------------------------------------
-   * hypre_BiCGSTABData and hypre_BiCGSTABFunctions
-   *--------------------------------------------------------------------------*/
-
-  /**
-   * @name BiCGSTAB structs
-   *
-   * Description...
-   **/
-  /*@{*/
-
-  /**
-   * The {\tt hypre\_BiCGSTABSFunctions} object ...
-   **/
-
-  /* functions in pcg_struct.c which aren't used here:
-     void *hypre_ParKrylovCAlloc( HYPRE_Int count , HYPRE_Int elt_size );
-     HYPRE_Int hypre_ParKrylovFree( void *ptr );
-     void *hypre_ParKrylovCreateVectorArray( HYPRE_Int n , void *vvector );
-     HYPRE_Int hypre_ParKrylovMatvecT( void *matvec_data , HYPRE_Real alpha , void *A , void *x , HYPRE_Real beta , void *y );
-     */
-  /* functions in pcg_struct.c which are used here:
-     void *hypre_ParKrylovCreateVector( void *vvector );
-     HYPRE_Int hypre_ParKrylovDestroyVector( void *vvector );
-     void *hypre_ParKrylovMatvecCreate( void *A , void *x );
-     HYPRE_Int hypre_ParKrylovMatvec( void *matvec_data , HYPRE_Real alpha , void *A , void *x , HYPRE_Real beta , void *y );
-     HYPRE_Int hypre_ParKrylovMatvecDestroy( void *matvec_data );
-     HYPRE_Real hypre_ParKrylovInnerProd( void *x , void *y );
-     HYPRE_Int hypre_ParKrylovCopyVector( void *x , void *y );
-     HYPRE_Int hypre_ParKrylovClearVector( void *x );
-     HYPRE_Int hypre_ParKrylovScaleVector( HYPRE_Real alpha , void *x );
-     HYPRE_Int hypre_ParKrylovAxpy( HYPRE_Real alpha , void *x , void *y );
-     HYPRE_Int hypre_ParKrylovCommInfo( void *A , HYPRE_Int *my_id , HYPRE_Int *num_procs );
-     HYPRE_Int hypre_ParKrylovIdentitySetup( void *vdata , void *A , void *b , void *x );
-     HYPRE_Int hypre_ParKrylovIdentity( void *vdata , void *A , void *b , void *x );
-     */
-
-  typedef struct
-  {
-    void *     (*CreateVector)  ( void *vvector );
-    HYPRE_Int  (*DestroyVector) ( void *vvector );
-    void *     (*MatvecCreate)  ( void *A , void *x );
-    HYPRE_Int  (*Matvec)        ( void *matvec_data , HYPRE_Complex alpha , void *A ,
-        void *x , HYPRE_Complex beta , void *y );
-    HYPRE_Int  (*MatvecDestroy) ( void *matvec_data );
-    HYPRE_Real (*InnerProd)     ( void *x , void *y );
-    HYPRE_Int  (*CopyVector)    ( void *x , void *y );
-    HYPRE_Int  (*ClearVector)   ( void *x );
-    HYPRE_Int  (*ScaleVector)   ( HYPRE_Complex alpha , void *x );
-    HYPRE_Int  (*Axpy)          ( HYPRE_Complex alpha , void *x , void *y );
-    HYPRE_Int  (*CommInfo)      ( void *A , HYPRE_Int *my_id , HYPRE_Int *num_procs );
-    HYPRE_Int  (*precond_setup) (void *vdata , void *A , void *b , void *x);
-    HYPRE_Int  (*precond)       (void *vdata , void *A , void *b , void *x);
-
-  } hypre_BiCGSTABFunctions;
-
-  /**
-   * The {\tt hypre\_BiCGSTABData} object ...
-   **/
-
-  typedef struct
-  {
-    HYPRE_Int      min_iter;
-    HYPRE_Int      max_iter;
-    HYPRE_Int      stop_crit;
-    HYPRE_Int      converged;
-    HYPRE_Int      hybrid;
-    HYPRE_Real   tol;
-    HYPRE_Real   cf_tol;
-    HYPRE_Real   rel_residual_norm;
-    HYPRE_Real   a_tol;
-
-
-    void  *A;
-    void  *r;
-    void  *r0;
-    void  *s;
-    void  *v;
-    void  *p;
-    void  *q;
-
-    void  *matvec_data;
-    void    *precond_data;
-
-    hypre_BiCGSTABFunctions * functions;
-
-    /* log info (always logged) */
-    HYPRE_Int      num_iterations;
-
-    /* additional log info (logged when `logging' > 0) */
-    HYPRE_Int      logging;
-    HYPRE_Int      print_level;
-    HYPRE_Real  *norms;
-    char    *log_file_name;
-
-  } hypre_BiCGSTABData;
+/*--------------------------------------------------------------------------
+ *--------------------------------------------------------------------------*/
+
+/**
+ * @name Generic BiCGSTAB Interface
+ *
+ * A general description of the interface goes here...
+ *
+ * @memo A generic BiCGSTAB linear solver interface
+ * @version 0.1
+ * @author Jeffrey F. Painter
+ **/
+/*@{*/
+
+/*--------------------------------------------------------------------------
+ *--------------------------------------------------------------------------*/
+
+/*--------------------------------------------------------------------------
+ * hypre_BiCGSTABData and hypre_BiCGSTABFunctions
+ *--------------------------------------------------------------------------*/
+
+/**
+ * @name BiCGSTAB structs
+ *
+ * Description...
+ **/
+/*@{*/
+
+/**
+ * The {\tt hypre\_BiCGSTABSFunctions} object ...
+ **/
+
+/* functions in pcg_struct.c which aren't used here:
+   void *hypre_ParKrylovCAlloc( HYPRE_Int count , HYPRE_Int elt_size );
+   HYPRE_Int hypre_ParKrylovFree( void *ptr );
+   void *hypre_ParKrylovCreateVectorArray( HYPRE_Int n , void *vvector );
+   HYPRE_Int hypre_ParKrylovMatvecT( void *matvec_data , HYPRE_Real alpha , void *A , void *x , HYPRE_Real beta , void *y );
+   */
+/* functions in pcg_struct.c which are used here:
+   void *hypre_ParKrylovCreateVector( void *vvector );
+   HYPRE_Int hypre_ParKrylovDestroyVector( void *vvector );
+   void *hypre_ParKrylovMatvecCreate( void *A , void *x );
+   HYPRE_Int hypre_ParKrylovMatvec( void *matvec_data , HYPRE_Real alpha , void *A , void *x , HYPRE_Real beta , void *y );
+   HYPRE_Int hypre_ParKrylovMatvecDestroy( void *matvec_data );
+   HYPRE_Real hypre_ParKrylovInnerProd( void *x , void *y );
+   HYPRE_Int hypre_ParKrylovCopyVector( void *x , void *y );
+   HYPRE_Int hypre_ParKrylovClearVector( void *x );
+   HYPRE_Int hypre_ParKrylovScaleVector( HYPRE_Real alpha , void *x );
+   HYPRE_Int hypre_ParKrylovAxpy( HYPRE_Real alpha , void *x , void *y );
+   HYPRE_Int hypre_ParKrylovCommInfo( void *A , HYPRE_Int *my_id , HYPRE_Int *num_procs );
+   HYPRE_Int hypre_ParKrylovIdentitySetup( void *vdata , void *A , void *b , void *x );
+   HYPRE_Int hypre_ParKrylovIdentity( void *vdata , void *A , void *b , void *x );
+   */
+
+typedef struct
+{
+   void *     (*CreateVector)  ( void *vvector );
+   HYPRE_Int  (*DestroyVector) ( void *vvector );
+   void *     (*MatvecCreate)  ( void *A, void *x );
+   HYPRE_Int  (*Matvec)        ( void *matvec_data, HYPRE_Complex alpha, void *A,
+                                 void *x, HYPRE_Complex beta, void *y );
+   HYPRE_Int  (*MatvecDestroy) ( void *matvec_data );
+   HYPRE_Real (*InnerProd)     ( void *x, void *y );
+   HYPRE_Int  (*CopyVector)    ( void *x, void *y );
+   HYPRE_Int  (*ClearVector)   ( void *x );
+   HYPRE_Int  (*ScaleVector)   ( HYPRE_Complex alpha, void *x );
+   HYPRE_Int  (*Axpy)          ( HYPRE_Complex alpha, void *x, void *y );
+   HYPRE_Int  (*CommInfo)      ( void *A, HYPRE_Int *my_id, HYPRE_Int *num_procs );
+   HYPRE_Int  (*precond_setup) (void *vdata, void *A, void *b, void *x);
+   HYPRE_Int  (*precond)       (void *vdata, void *A, void *b, void *x);
+
+} hypre_BiCGSTABFunctions;
+
+/**
+ * The {\tt hypre\_BiCGSTABData} object ...
+ **/
+
+typedef struct
+{
+   HYPRE_Int      min_iter;
+   HYPRE_Int      max_iter;
+   HYPRE_Int      stop_crit;
+   HYPRE_Int      converged;
+   HYPRE_Int      hybrid;
+   HYPRE_Real   tol;
+   HYPRE_Real   cf_tol;
+   HYPRE_Real   rel_residual_norm;
+   HYPRE_Real   a_tol;
+
+
+   void  *A;
+   void  *r;
+   void  *r0;
+   void  *s;
+   void  *v;
+   void  *p;
+   void  *q;
+
+   void  *matvec_data;
+   void    *precond_data;
+
+   hypre_BiCGSTABFunctions * functions;
+
+   /* log info (always logged) */
+   HYPRE_Int      num_iterations;
+
+   /* additional log info (logged when `logging' > 0) */
+   HYPRE_Int      logging;
+   HYPRE_Int      print_level;
+   HYPRE_Real  *norms;
+   char    *log_file_name;
+
+} hypre_BiCGSTABData;
 
 #define hypre_BiCGSTABDataHybrid(pcgdata)  ((pcgdata) -> hybrid)
 
 #ifdef __cplusplus
-  extern "C" {
+extern "C" {
 #endif
 
-    /**
-     * @name generic BiCGSTAB Solver
-     *
-     * Description...
-     **/
-    /*@{*/
-
-    /**
-     * Description...
-     *
-     * @param param [IN] ...
-     **/
-
-    hypre_BiCGSTABFunctions *
-      hypre_BiCGSTABFunctionsCreate(
-          void *     (*CreateVector)  ( void *vvector ),
-          HYPRE_Int  (*DestroyVector) ( void *vvector ),
-          void *     (*MatvecCreate)  ( void *A , void *x ),
-          HYPRE_Int  (*Matvec)        ( void *matvec_data , HYPRE_Complex alpha , void *A ,
-            void *x , HYPRE_Complex beta , void *y ),
-          HYPRE_Int  (*MatvecDestroy) ( void *matvec_data ),
-          HYPRE_Real (*InnerProd)     ( void *x , void *y ),
-          HYPRE_Int  (*CopyVector)    ( void *x , void *y ),
-          HYPRE_Int  (*ClearVector)   ( void *x ),
-          HYPRE_Int  (*ScaleVector)   ( HYPRE_Complex alpha , void *x ),
-          HYPRE_Int  (*Axpy)          ( HYPRE_Complex alpha , void *x , void *y ),
-          HYPRE_Int  (*CommInfo)      ( void *A , HYPRE_Int *my_id ,
-            HYPRE_Int *num_procs ),
-          HYPRE_Int  (*PrecondSetup)  ( void *vdata, void *A, void *b, void *x ),
-          HYPRE_Int  (*Precond)       ( void *vdata, void *A, void *b, void *x )
-          );
-
-    /**
-     * Description...
-     *
-     * @param param [IN] ...
-     **/
-
-    void *
-      hypre_BiCGSTABCreate( hypre_BiCGSTABFunctions * bicgstab_functions );
+   /**
+    * @name generic BiCGSTAB Solver
+    *
+    * Description...
+    **/
+   /*@{*/
+
+   /**
+    * Description...
+    *
+    * @param param [IN] ...
+    **/
+
+   hypre_BiCGSTABFunctions *
+   hypre_BiCGSTABFunctionsCreate(
+      void *     (*CreateVector)  ( void *vvector ),
+      HYPRE_Int  (*DestroyVector) ( void *vvector ),
+      void *     (*MatvecCreate)  ( void *A, void *x ),
+      HYPRE_Int  (*Matvec)        ( void *matvec_data, HYPRE_Complex alpha, void *A,
+                                    void *x, HYPRE_Complex beta, void *y ),
+      HYPRE_Int  (*MatvecDestroy) ( void *matvec_data ),
+      HYPRE_Real (*InnerProd)     ( void *x, void *y ),
+      HYPRE_Int  (*CopyVector)    ( void *x, void *y ),
+      HYPRE_Int  (*ClearVector)   ( void *x ),
+      HYPRE_Int  (*ScaleVector)   ( HYPRE_Complex alpha, void *x ),
+      HYPRE_Int  (*Axpy)          ( HYPRE_Complex alpha, void *x, void *y ),
+      HYPRE_Int  (*CommInfo)      ( void *A, HYPRE_Int *my_id,
+                                    HYPRE_Int *num_procs ),
+      HYPRE_Int  (*PrecondSetup)  ( void *vdata, void *A, void *b, void *x ),
+      HYPRE_Int  (*Precond)       ( void *vdata, void *A, void *b, void *x )
+   );
+
+   /**
+    * Description...
+    *
+    * @param param [IN] ...
+    **/
+
+   void *
+   hypre_BiCGSTABCreate( hypre_BiCGSTABFunctions * bicgstab_functions );
 
 #ifdef __cplusplus
-  }
+}
 #endif
 
 #endif
 
-  /******************************************************************************
-   *
-   * cgnr (conjugate gradient on the normal equations A^TAx = A^Tb) functions
-   *
-   *****************************************************************************/
+/******************************************************************************
+ *
+ * cgnr (conjugate gradient on the normal equations A^TAx = A^Tb) functions
+ *
+ *****************************************************************************/
 
 #ifndef hypre_KRYLOV_CGNR_HEADER
 #define hypre_KRYLOV_CGNR_HEADER
 
-  /*--------------------------------------------------------------------------
-   *--------------------------------------------------------------------------*/
-
-  /**
-   * @name Generic CGNR Interface
-   *
-   * A general description of the interface goes here...
-   *
-   * @memo A generic CGNR linear solver interface
-   * @version 0.1
-   * @author Jeffrey F. Painter
-   **/
-  /*@{*/
-
-  /*--------------------------------------------------------------------------
-   *--------------------------------------------------------------------------*/
-
-  /*--------------------------------------------------------------------------
-   * hypre_CGNRData and hypre_CGNRFunctions
-   *--------------------------------------------------------------------------*/
-
-  /**
-   * @name CGNR structs
-   *
-   * Description...
-   **/
-  /*@{*/
-
-  /**
-   * The {\tt hypre\_CGNRSFunctions} object ...
-   **/
-
-  typedef struct
-  {
-    HYPRE_Int    (*CommInfo)      ( void  *A, HYPRE_Int   *my_id,
-        HYPRE_Int   *num_procs );
-    void *       (*CreateVector)  ( void *vector );
-    HYPRE_Int    (*DestroyVector) ( void *vector );
-    void *       (*MatvecCreate)  ( void *A, void *x );
-    HYPRE_Int    (*Matvec)        ( void *matvec_data, HYPRE_Complex alpha, void *A,
-        void *x, HYPRE_Complex beta, void *y );
-    HYPRE_Int    (*MatvecT)       ( void *matvec_data, HYPRE_Complex alpha, void *A,
-        void *x, HYPRE_Complex beta, void *y );
-    HYPRE_Int    (*MatvecDestroy) ( void *matvec_data );
-    HYPRE_Real   (*InnerProd)     ( void *x, void *y );
-    HYPRE_Int    (*CopyVector)    ( void *x, void *y );
-    HYPRE_Int    (*ClearVector)   ( void *x );
-    HYPRE_Int    (*ScaleVector)   ( HYPRE_Complex alpha, void *x );
-    HYPRE_Int    (*Axpy)          ( HYPRE_Complex alpha, void *x, void *y );
-    HYPRE_Int    (*precond_setup) ( void *vdata, void *A, void *b, void *x );
-    HYPRE_Int    (*precond)       ( void *vdata, void *A, void *b, void *x );
-    HYPRE_Int    (*precondT)      ( void *vdata, void *A, void *b, void *x );
-
-  } hypre_CGNRFunctions;
-
-  /**
-   * The {\tt hypre\_CGNRData} object ...
-   **/
-
-  typedef struct
-  {
-    HYPRE_Real   tol;
-    HYPRE_Real   rel_residual_norm;
-    HYPRE_Int      min_iter;
-    HYPRE_Int      max_iter;
-    HYPRE_Int      stop_crit;
-
-    void    *A;
-    void    *p;
-    void    *q;
-    void    *r;
-    void    *t;
-
-    void    *matvec_data;
-    void    *precond_data;
-
-    hypre_CGNRFunctions * functions;
-
-    /* log info (always logged) */
-    HYPRE_Int      num_iterations;
-
-    /* additional log info (logged when `logging' > 0) */
-    HYPRE_Int      logging;
-    HYPRE_Real  *norms;
-    char    *log_file_name;
-
-  } hypre_CGNRData;
+/*--------------------------------------------------------------------------
+ *--------------------------------------------------------------------------*/
+
+/**
+ * @name Generic CGNR Interface
+ *
+ * A general description of the interface goes here...
+ *
+ * @memo A generic CGNR linear solver interface
+ * @version 0.1
+ * @author Jeffrey F. Painter
+ **/
+/*@{*/
+
+/*--------------------------------------------------------------------------
+ *--------------------------------------------------------------------------*/
+
+/*--------------------------------------------------------------------------
+ * hypre_CGNRData and hypre_CGNRFunctions
+ *--------------------------------------------------------------------------*/
+
+/**
+ * @name CGNR structs
+ *
+ * Description...
+ **/
+/*@{*/
+
+/**
+ * The {\tt hypre\_CGNRSFunctions} object ...
+ **/
+
+typedef struct
+{
+   HYPRE_Int    (*CommInfo)      ( void  *A, HYPRE_Int   *my_id,
+                                   HYPRE_Int   *num_procs );
+   void *       (*CreateVector)  ( void *vector );
+   HYPRE_Int    (*DestroyVector) ( void *vector );
+   void *       (*MatvecCreate)  ( void *A, void *x );
+   HYPRE_Int    (*Matvec)        ( void *matvec_data, HYPRE_Complex alpha, void *A,
+                                   void *x, HYPRE_Complex beta, void *y );
+   HYPRE_Int    (*MatvecT)       ( void *matvec_data, HYPRE_Complex alpha, void *A,
+                                   void *x, HYPRE_Complex beta, void *y );
+   HYPRE_Int    (*MatvecDestroy) ( void *matvec_data );
+   HYPRE_Real   (*InnerProd)     ( void *x, void *y );
+   HYPRE_Int    (*CopyVector)    ( void *x, void *y );
+   HYPRE_Int    (*ClearVector)   ( void *x );
+   HYPRE_Int    (*ScaleVector)   ( HYPRE_Complex alpha, void *x );
+   HYPRE_Int    (*Axpy)          ( HYPRE_Complex alpha, void *x, void *y );
+   HYPRE_Int    (*precond_setup) ( void *vdata, void *A, void *b, void *x );
+   HYPRE_Int    (*precond)       ( void *vdata, void *A, void *b, void *x );
+   HYPRE_Int    (*precondT)      ( void *vdata, void *A, void *b, void *x );
+
+} hypre_CGNRFunctions;
+
+/**
+ * The {\tt hypre\_CGNRData} object ...
+ **/
+
+typedef struct
+{
+   HYPRE_Real   tol;
+   HYPRE_Real   rel_residual_norm;
+   HYPRE_Int      min_iter;
+   HYPRE_Int      max_iter;
+   HYPRE_Int      stop_crit;
+
+   void    *A;
+   void    *p;
+   void    *q;
+   void    *r;
+   void    *t;
+
+   void    *matvec_data;
+   void    *precond_data;
+
+   hypre_CGNRFunctions * functions;
+
+   /* log info (always logged) */
+   HYPRE_Int      num_iterations;
+
+   /* additional log info (logged when `logging' > 0) */
+   HYPRE_Int      logging;
+   HYPRE_Real  *norms;
+   char    *log_file_name;
+
+} hypre_CGNRData;
 
 
 #ifdef __cplusplus
-  extern "C" {
+extern "C" {
 #endif
 
-    /**
-     * @name generic CGNR Solver
-     *
-     * Description...
-     **/
-    /*@{*/
-
-    /**
-     * Description...
-     *
-     * @param param [IN] ...
-     **/
-    hypre_CGNRFunctions *
-      hypre_CGNRFunctionsCreate(
-          HYPRE_Int    (*CommInfo)      ( void  *A, HYPRE_Int   *my_id,
-            HYPRE_Int   *num_procs ),
-          void *       (*CreateVector)  ( void *vector ),
-          HYPRE_Int    (*DestroyVector) ( void *vector ),
-          void *       (*MatvecCreate)  ( void *A, void *x ),
-          HYPRE_Int    (*Matvec)        ( void *matvec_data, HYPRE_Complex alpha, void *A,
-            void *x, HYPRE_Complex beta, void *y ),
-          HYPRE_Int    (*MatvecT)       ( void *matvec_data, HYPRE_Complex alpha, void *A,
-            void *x, HYPRE_Complex beta, void *y ),
-          HYPRE_Int    (*MatvecDestroy) ( void *matvec_data ),
-          HYPRE_Real   (*InnerProd)     ( void *x, void *y ),
-          HYPRE_Int    (*CopyVector)    ( void *x, void *y ),
-          HYPRE_Int    (*ClearVector)   ( void *x ),
-          HYPRE_Int    (*ScaleVector)   ( HYPRE_Complex alpha, void *x ),
-          HYPRE_Int    (*Axpy)          ( HYPRE_Complex alpha, void *x, void *y ),
-          HYPRE_Int    (*PrecondSetup)  ( void *vdata, void *A, void *b, void *x ),
-          HYPRE_Int    (*Precond)       ( void *vdata, void *A, void *b, void *x ),
-          HYPRE_Int    (*PrecondT)      ( void *vdata, void *A, void *b, void *x )
-          );
-
-    /**
-     * Description...
-     *
-     * @param param [IN] ...
-     **/
-
-    void *
-      hypre_CGNRCreate( hypre_CGNRFunctions *cgnr_functions );
+   /**
+    * @name generic CGNR Solver
+    *
+    * Description...
+    **/
+   /*@{*/
+
+   /**
+    * Description...
+    *
+    * @param param [IN] ...
+    **/
+   hypre_CGNRFunctions *
+   hypre_CGNRFunctionsCreate(
+      HYPRE_Int    (*CommInfo)      ( void  *A, HYPRE_Int   *my_id,
+                                      HYPRE_Int   *num_procs ),
+      void *       (*CreateVector)  ( void *vector ),
+      HYPRE_Int    (*DestroyVector) ( void *vector ),
+      void *       (*MatvecCreate)  ( void *A, void *x ),
+      HYPRE_Int    (*Matvec)        ( void *matvec_data, HYPRE_Complex alpha, void *A,
+                                      void *x, HYPRE_Complex beta, void *y ),
+      HYPRE_Int    (*MatvecT)       ( void *matvec_data, HYPRE_Complex alpha, void *A,
+                                      void *x, HYPRE_Complex beta, void *y ),
+      HYPRE_Int    (*MatvecDestroy) ( void *matvec_data ),
+      HYPRE_Real   (*InnerProd)     ( void *x, void *y ),
+      HYPRE_Int    (*CopyVector)    ( void *x, void *y ),
+      HYPRE_Int    (*ClearVector)   ( void *x ),
+      HYPRE_Int    (*ScaleVector)   ( HYPRE_Complex alpha, void *x ),
+      HYPRE_Int    (*Axpy)          ( HYPRE_Complex alpha, void *x, void *y ),
+      HYPRE_Int    (*PrecondSetup)  ( void *vdata, void *A, void *b, void *x ),
+      HYPRE_Int    (*Precond)       ( void *vdata, void *A, void *b, void *x ),
+      HYPRE_Int    (*PrecondT)      ( void *vdata, void *A, void *b, void *x )
+   );
+
+   /**
+    * Description...
+    *
+    * @param param [IN] ...
+    **/
+
+   void *
+   hypre_CGNRCreate( hypre_CGNRFunctions *cgnr_functions );
 
 #ifdef __cplusplus
-  }
+}
 #endif
 
 #endif
 
-  /******************************************************************************
-   *
-   * GMRES gmres
-   *
-   *****************************************************************************/
+/******************************************************************************
+ *
+ * GMRES gmres
+ *
+ *****************************************************************************/
 
 #ifndef hypre_KRYLOV_GMRES_HEADER
 #define hypre_KRYLOV_GMRES_HEADER
 
-  /*--------------------------------------------------------------------------
-   *--------------------------------------------------------------------------*/
-
-  /**
-   * @name Generic GMRES Interface
-   *
-   * A general description of the interface goes here...
-   *
-   * @memo A generic GMRES linear solver interface
-   * @version 0.1
-   * @author Jeffrey F. Painter
-   **/
-  /*@{*/
-
-  /*--------------------------------------------------------------------------
-   *--------------------------------------------------------------------------*/
-
-  /*--------------------------------------------------------------------------
-   * hypre_GMRESData and hypre_GMRESFunctions
-   *--------------------------------------------------------------------------*/
-
-  /**
-   * @name GMRES structs
-   *
-   * Description...
-   **/
-  /*@{*/
-
-  /**
-   * The {\tt hypre\_GMRESFunctions} object ...
-   **/
-
-  typedef struct
-  {
-    void *       (*CAlloc)        ( size_t count, size_t elt_size, HYPRE_MemoryLocation location );
-    HYPRE_Int    (*Free)          ( void *ptr );
-    HYPRE_Int    (*CommInfo)      ( void  *A, HYPRE_Int   *my_id,
-        HYPRE_Int   *num_procs );
-    void *       (*CreateVector)  ( void *vector );
-    void *       (*CreateVectorArray)  ( HYPRE_Int size, void *vectors );
-    HYPRE_Int    (*DestroyVector) ( void *vector );
-    void *       (*MatvecCreate)  ( void *A, void *x );
-    HYPRE_Int    (*Matvec)        ( void *matvec_data, HYPRE_Complex alpha, void *A,
-        void *x, HYPRE_Complex beta, void *y );
-    HYPRE_Int    (*MatvecDestroy) ( void *matvec_data );
-    HYPRE_Real   (*InnerProd)     ( void *x, void *y );
-    HYPRE_Int    (*CopyVector)    ( void *x, void *y );
-    HYPRE_Int    (*ClearVector)   ( void *x );
-    HYPRE_Int    (*ScaleVector)   ( HYPRE_Complex alpha, void *x );
-    HYPRE_Int    (*Axpy)          ( HYPRE_Complex alpha, void *x, void *y );
-
-    HYPRE_Int    (*precond)       (void *vdata , void *A , void *b , void *x);
-    HYPRE_Int    (*precond_setup) (void *vdata , void *A , void *b , void *x);
-
-  } hypre_GMRESFunctions;
-
-  /**
-   * The {\tt hypre\_GMRESData} object ...
-   **/
-
-  typedef struct
-  {
-    HYPRE_Int      k_dim;
-    HYPRE_Int      min_iter;
-    HYPRE_Int      max_iter;
-    HYPRE_Int      rel_change;
-    HYPRE_Int      skip_real_r_check;
-    HYPRE_Int      stop_crit;
-    HYPRE_Int      converged;
-    HYPRE_Int      hybrid;
-    HYPRE_Real   tol;
-    HYPRE_Real   cf_tol;
-    HYPRE_Real   a_tol;
-    HYPRE_Real   rel_residual_norm;
-
-    void  *A;
-    void  *r;
-    void  *w;
-    void  *w_2;
-    void  **p;
-
-    void    *matvec_data;
-    void    *precond_data;
-
-    hypre_GMRESFunctions * functions;
-
-    /* log info (always logged) */
-    HYPRE_Int      num_iterations;
-
-    HYPRE_Int     print_level; /* printing when print_level>0 */
-    HYPRE_Int     logging;  /* extra computations for logging when logging>0 */
-    HYPRE_Real  *norms;
-    char    *log_file_name;
-
-  } hypre_GMRESData;
+/*--------------------------------------------------------------------------
+ *--------------------------------------------------------------------------*/
+
+/**
+ * @name Generic GMRES Interface
+ *
+ * A general description of the interface goes here...
+ *
+ * @memo A generic GMRES linear solver interface
+ * @version 0.1
+ * @author Jeffrey F. Painter
+ **/
+/*@{*/
+
+/*--------------------------------------------------------------------------
+ *--------------------------------------------------------------------------*/
+
+/*--------------------------------------------------------------------------
+ * hypre_GMRESData and hypre_GMRESFunctions
+ *--------------------------------------------------------------------------*/
+
+/**
+ * @name GMRES structs
+ *
+ * Description...
+ **/
+/*@{*/
+
+/**
+ * The {\tt hypre\_GMRESFunctions} object ...
+ **/
+
+typedef struct
+{
+   void *       (*CAlloc)        ( size_t count, size_t elt_size, HYPRE_MemoryLocation location );
+   HYPRE_Int    (*Free)          ( void *ptr );
+   HYPRE_Int    (*CommInfo)      ( void  *A, HYPRE_Int   *my_id,
+                                   HYPRE_Int   *num_procs );
+   void *       (*CreateVector)  ( void *vector );
+   void *       (*CreateVectorArray)  ( HYPRE_Int size, void *vectors );
+   HYPRE_Int    (*DestroyVector) ( void *vector );
+   void *       (*MatvecCreate)  ( void *A, void *x );
+   HYPRE_Int    (*Matvec)        ( void *matvec_data, HYPRE_Complex alpha, void *A,
+                                   void *x, HYPRE_Complex beta, void *y );
+   HYPRE_Int    (*MatvecDestroy) ( void *matvec_data );
+   HYPRE_Real   (*InnerProd)     ( void *x, void *y );
+   HYPRE_Int    (*CopyVector)    ( void *x, void *y );
+   HYPRE_Int    (*ClearVector)   ( void *x );
+   HYPRE_Int    (*ScaleVector)   ( HYPRE_Complex alpha, void *x );
+   HYPRE_Int    (*Axpy)          ( HYPRE_Complex alpha, void *x, void *y );
+
+   HYPRE_Int    (*precond)       (void *vdata, void *A, void *b, void *x);
+   HYPRE_Int    (*precond_setup) (void *vdata, void *A, void *b, void *x);
+
+} hypre_GMRESFunctions;
+
+/**
+ * The {\tt hypre\_GMRESData} object ...
+ **/
+
+typedef struct
+{
+   HYPRE_Int      k_dim;
+   HYPRE_Int      min_iter;
+   HYPRE_Int      max_iter;
+   HYPRE_Int      rel_change;
+   HYPRE_Int      skip_real_r_check;
+   HYPRE_Int      stop_crit;
+   HYPRE_Int      converged;
+   HYPRE_Int      hybrid;
+   HYPRE_Real   tol;
+   HYPRE_Real   cf_tol;
+   HYPRE_Real   a_tol;
+   HYPRE_Real   rel_residual_norm;
+
+   void  *A;
+   void  *r;
+   void  *w;
+   void  *w_2;
+   void  **p;
+
+   void    *matvec_data;
+   void    *precond_data;
+
+   hypre_GMRESFunctions * functions;
+
+   /* log info (always logged) */
+   HYPRE_Int      num_iterations;
+
+   HYPRE_Int     print_level; /* printing when print_level>0 */
+   HYPRE_Int     logging;  /* extra computations for logging when logging>0 */
+   HYPRE_Real  *norms;
+   char    *log_file_name;
+
+} hypre_GMRESData;
 
 #define hypre_GMRESDataHybrid(pcgdata)  ((pcgdata) -> hybrid)
 
 #ifdef __cplusplus
-  extern "C" {
+extern "C" {
 #endif
 
-    /**
-     * @name generic GMRES Solver
-     *
-     * Description...
-     **/
-    /*@{*/
-
-    /**
-     * Description...
-     *
-     * @param param [IN] ...
-     **/
-
-    hypre_GMRESFunctions *
-      hypre_GMRESFunctionsCreate(
-          void *       (*CAlloc)        ( size_t count, size_t elt_size, HYPRE_MemoryLocation location ),
-          HYPRE_Int    (*Free)          ( void *ptr ),
-          HYPRE_Int    (*CommInfo)      ( void  *A, HYPRE_Int   *my_id,
-            HYPRE_Int   *num_procs ),
-          void *       (*CreateVector)  ( void *vector ),
-          void *       (*CreateVectorArray)  ( HYPRE_Int size, void *vectors ),
-          HYPRE_Int    (*DestroyVector) ( void *vector ),
-          void *       (*MatvecCreate)  ( void *A, void *x ),
-          HYPRE_Int    (*Matvec)        ( void *matvec_data, HYPRE_Complex alpha, void *A,
-            void *x, HYPRE_Complex beta, void *y ),
-          HYPRE_Int    (*MatvecDestroy) ( void *matvec_data ),
-          HYPRE_Real   (*InnerProd)     ( void *x, void *y ),
-          HYPRE_Int    (*CopyVector)    ( void *x, void *y ),
-          HYPRE_Int    (*ClearVector)   ( void *x ),
-          HYPRE_Int    (*ScaleVector)   ( HYPRE_Complex alpha, void *x ),
-          HYPRE_Int    (*Axpy)          ( HYPRE_Complex alpha, void *x, void *y ),
-          HYPRE_Int    (*PrecondSetup)  ( void *vdata, void *A, void *b, void *x ),
-          HYPRE_Int    (*Precond)       ( void *vdata, void *A, void *b, void *x )
-          );
-
-    /**
-     * Description...
-     *
-     * @param param [IN] ...
-     **/
-
-    void *
-      hypre_GMRESCreate( hypre_GMRESFunctions *gmres_functions );
+   /**
+    * @name generic GMRES Solver
+    *
+    * Description...
+    **/
+   /*@{*/
+
+   /**
+    * Description...
+    *
+    * @param param [IN] ...
+    **/
+
+   hypre_GMRESFunctions *
+   hypre_GMRESFunctionsCreate(
+      void *       (*CAlloc)        ( size_t count, size_t elt_size, HYPRE_MemoryLocation location ),
+      HYPRE_Int    (*Free)          ( void *ptr ),
+      HYPRE_Int    (*CommInfo)      ( void  *A, HYPRE_Int   *my_id,
+                                      HYPRE_Int   *num_procs ),
+      void *       (*CreateVector)  ( void *vector ),
+      void *       (*CreateVectorArray)  ( HYPRE_Int size, void *vectors ),
+      HYPRE_Int    (*DestroyVector) ( void *vector ),
+      void *       (*MatvecCreate)  ( void *A, void *x ),
+      HYPRE_Int    (*Matvec)        ( void *matvec_data, HYPRE_Complex alpha, void *A,
+                                      void *x, HYPRE_Complex beta, void *y ),
+      HYPRE_Int    (*MatvecDestroy) ( void *matvec_data ),
+      HYPRE_Real   (*InnerProd)     ( void *x, void *y ),
+      HYPRE_Int    (*CopyVector)    ( void *x, void *y ),
+      HYPRE_Int    (*ClearVector)   ( void *x ),
+      HYPRE_Int    (*ScaleVector)   ( HYPRE_Complex alpha, void *x ),
+      HYPRE_Int    (*Axpy)          ( HYPRE_Complex alpha, void *x, void *y ),
+      HYPRE_Int    (*PrecondSetup)  ( void *vdata, void *A, void *b, void *x ),
+      HYPRE_Int    (*Precond)       ( void *vdata, void *A, void *b, void *x )
+   );
+
+   /**
+    * Description...
+    *
+    * @param param [IN] ...
+    **/
+
+   void *
+   hypre_GMRESCreate( hypre_GMRESFunctions *gmres_functions );
 
 #ifdef __cplusplus
-  }
+}
 #endif
 #endif
 
-  /***********KS code ****************/
-  /******************************************************************************
-   *
-   * COGMRES cogmres
-   *
-   *****************************************************************************/
+/***********KS code ****************/
+/******************************************************************************
+ *
+ * COGMRES cogmres
+ *
+ *****************************************************************************/
 
 #ifndef hypre_KRYLOV_COGMRES_HEADER
 #define hypre_KRYLOV_COGMRES_HEADER
 
-  /*--------------------------------------------------------------------------
-   *--------------------------------------------------------------------------*/
-
-  /**
-   * @name Generic GMRES Interface
-   *
-   * A general description of the interface goes here...
-   *
-   * @memo A generic GMRES linear solver interface
-   * @version 0.1
-   * @author Jeffrey F. Painter
-   **/
-  /*@{*/
-
-  /*--------------------------------------------------------------------------
-   *--------------------------------------------------------------------------*/
-
-  /*--------------------------------------------------------------------------
-   * hypre_COGMRESData and hypre_COGMRESFunctions
-   *--------------------------------------------------------------------------*/
-
-  /**
-   * @name GMRES structs
-   *
-   * Description...
-   **/
-  /*@{*/
-
-  /**
-   * The {\tt hypre\_GMRESFunctions} object ...
-   **/
-
-  typedef struct
-  {
-    void *       (*CAlloc)        ( size_t count, size_t elt_size, HYPRE_MemoryLocation location );
-    HYPRE_Int    (*Free)          ( void *ptr );
-    HYPRE_Int    (*CommInfo)      ( void  *A, HYPRE_Int   *my_id,
-        HYPRE_Int   *num_procs );
-    void *       (*CreateVector)  ( void *vector );
-    void *       (*CreateVectorArray)  ( HYPRE_Int size, void *vectors );
-    HYPRE_Int    (*DestroyVector) ( void *vector );
-    void *       (*MatvecCreate)  ( void *A, void *x );
-    HYPRE_Int    (*Matvec)        ( void *matvec_data, HYPRE_Complex alpha, void *A,
-        void *x, HYPRE_Complex beta, void *y );
-    HYPRE_Int    (*MatvecDestroy) ( void *matvec_data );
-    HYPRE_Real   (*InnerProd)     ( void *x, void *y );
-    HYPRE_Int    (*MassInnerProd) ( void *x, void **p, HYPRE_Int k, HYPRE_Int unroll, void *result);
-    HYPRE_Int    (*MassDotpTwo)   ( void *x, void *y, void **p, HYPRE_Int k, HYPRE_Int unroll, void *result_x, void *result_y);
-    HYPRE_Int    (*CopyVector)    ( void *x, void *y );
-    HYPRE_Int    (*ClearVector)   ( void *x );
-    HYPRE_Int    (*ScaleVector)   ( HYPRE_Complex alpha, void *x );
-    HYPRE_Int    (*Axpy)          ( HYPRE_Complex alpha, void *x, void *y );
-    HYPRE_Int    (*MassAxpy)      ( HYPRE_Complex * alpha, void **x, void *y, HYPRE_Int k, HYPRE_Int unroll);
-    HYPRE_Int    (*precond)       (void *vdata , void *A , void *b , void *x);
-    HYPRE_Int    (*precond_setup) (void *vdata , void *A , void *b , void *x);
-
-    HYPRE_Int    (*modify_pc)( void *precond_data, HYPRE_Int iteration, HYPRE_Real rel_residual_norm);
-
-
-  } hypre_COGMRESFunctions;
-
-  /**
-   * The {\tt hypre\_GMRESData} object ...
-   **/
-
-  typedef struct
-  {
-    HYPRE_Int      k_dim;
-    HYPRE_Int      unroll;
-    HYPRE_Int      cgs;
-    HYPRE_Int      min_iter;
-    HYPRE_Int      max_iter;
-    HYPRE_Int      rel_change;
-    HYPRE_Int      skip_real_r_check;
-    HYPRE_Int      stop_crit;
-    HYPRE_Int      converged;
-    HYPRE_Real   tol;
-    HYPRE_Real   cf_tol;
-    HYPRE_Real   a_tol;
-    HYPRE_Real   rel_residual_norm;
-
-    void  *A;
-    void  *r;
-    void  *w;
-    void  *w_2;
-    void  **p;
-
-    void    *matvec_data;
-    void    *precond_data;
-
-    hypre_COGMRESFunctions * functions;
-
-    /* log info (always logged) */
-    HYPRE_Int      num_iterations;
-
-    HYPRE_Int     print_level; /* printing when print_level>0 */
-    HYPRE_Int     logging;  /* extra computations for logging when logging>0 */
-    HYPRE_Real  *norms;
-    char    *log_file_name;
-
-  } hypre_COGMRESData;
+/*--------------------------------------------------------------------------
+ *--------------------------------------------------------------------------*/
+
+/**
+ * @name Generic GMRES Interface
+ *
+ * A general description of the interface goes here...
+ *
+ * @memo A generic GMRES linear solver interface
+ * @version 0.1
+ * @author Jeffrey F. Painter
+ **/
+/*@{*/
+
+/*--------------------------------------------------------------------------
+ *--------------------------------------------------------------------------*/
+
+/*--------------------------------------------------------------------------
+ * hypre_COGMRESData and hypre_COGMRESFunctions
+ *--------------------------------------------------------------------------*/
+
+/**
+ * @name GMRES structs
+ *
+ * Description...
+ **/
+/*@{*/
+
+/**
+ * The {\tt hypre\_GMRESFunctions} object ...
+ **/
+
+typedef struct
+{
+   void *       (*CAlloc)        ( size_t count, size_t elt_size, HYPRE_MemoryLocation location );
+   HYPRE_Int    (*Free)          ( void *ptr );
+   HYPRE_Int    (*CommInfo)      ( void  *A, HYPRE_Int   *my_id,
+                                   HYPRE_Int   *num_procs );
+   void *       (*CreateVector)  ( void *vector );
+   void *       (*CreateVectorArray)  ( HYPRE_Int size, void *vectors );
+   HYPRE_Int    (*DestroyVector) ( void *vector );
+   void *       (*MatvecCreate)  ( void *A, void *x );
+   HYPRE_Int    (*Matvec)        ( void *matvec_data, HYPRE_Complex alpha, void *A,
+                                   void *x, HYPRE_Complex beta, void *y );
+   HYPRE_Int    (*MatvecDestroy) ( void *matvec_data );
+   HYPRE_Real   (*InnerProd)     ( void *x, void *y );
+   HYPRE_Int    (*MassInnerProd) ( void *x, void **p, HYPRE_Int k, HYPRE_Int unroll, void *result);
+   HYPRE_Int    (*MassDotpTwo)   ( void *x, void *y, void **p, HYPRE_Int k, HYPRE_Int unroll,
+                                   void *result_x, void *result_y);
+   HYPRE_Int    (*CopyVector)    ( void *x, void *y );
+   HYPRE_Int    (*ClearVector)   ( void *x );
+   HYPRE_Int    (*ScaleVector)   ( HYPRE_Complex alpha, void *x );
+   HYPRE_Int    (*Axpy)          ( HYPRE_Complex alpha, void *x, void *y );
+   HYPRE_Int    (*MassAxpy)      ( HYPRE_Complex * alpha, void **x, void *y, HYPRE_Int k,
+                                   HYPRE_Int unroll);
+   HYPRE_Int    (*precond)       (void *vdata, void *A, void *b, void *x);
+   HYPRE_Int    (*precond_setup) (void *vdata, void *A, void *b, void *x);
+
+   HYPRE_Int    (*modify_pc)( void *precond_data, HYPRE_Int iteration, HYPRE_Real rel_residual_norm);
+
+
+} hypre_COGMRESFunctions;
+
+/**
+ * The {\tt hypre\_GMRESData} object ...
+ **/
+
+typedef struct
+{
+   HYPRE_Int      k_dim;
+   HYPRE_Int      unroll;
+   HYPRE_Int      cgs;
+   HYPRE_Int      min_iter;
+   HYPRE_Int      max_iter;
+   HYPRE_Int      rel_change;
+   HYPRE_Int      skip_real_r_check;
+   HYPRE_Int      stop_crit;
+   HYPRE_Int      converged;
+   HYPRE_Real   tol;
+   HYPRE_Real   cf_tol;
+   HYPRE_Real   a_tol;
+   HYPRE_Real   rel_residual_norm;
+
+   void  *A;
+   void  *r;
+   void  *w;
+   void  *w_2;
+   void  **p;
+
+   void    *matvec_data;
+   void    *precond_data;
+
+   hypre_COGMRESFunctions * functions;
+
+   /* log info (always logged) */
+   HYPRE_Int      num_iterations;
+
+   HYPRE_Int     print_level; /* printing when print_level>0 */
+   HYPRE_Int     logging;  /* extra computations for logging when logging>0 */
+   HYPRE_Real  *norms;
+   char    *log_file_name;
+
+} hypre_COGMRESData;
 
 #ifdef __cplusplus
-  extern "C" {
+extern "C" {
 #endif
 
-    /**
-     * @name generic GMRES Solver
-     *
-     * Description...
-     **/
-    /*@{*/
-
-    /**
-     * Description...
-     *
-     * @param param [IN] ...
-     **/
-
-    hypre_COGMRESFunctions *
-      hypre_COGMRESFunctionsCreate(
-          void *       (*CAlloc)        ( size_t count, size_t elt_size, HYPRE_MemoryLocation location ),
-          HYPRE_Int    (*Free)          ( void *ptr ),
-          HYPRE_Int    (*CommInfo)      ( void  *A, HYPRE_Int   *my_id,
-            HYPRE_Int   *num_procs ),
-          void *       (*CreateVector)  ( void *vector ),
-          void *       (*CreateVectorArray)  ( HYPRE_Int size, void *vectors ),
-          HYPRE_Int    (*DestroyVector) ( void *vector ),
-          void *       (*MatvecCreate)  ( void *A, void *x ),
-          HYPRE_Int    (*Matvec)        ( void *matvec_data, HYPRE_Complex alpha, void *A, void *x, HYPRE_Complex beta, void *y ),
-          HYPRE_Int    (*MatvecDestroy) ( void *matvec_data ),
-          HYPRE_Real   (*InnerProd)     ( void *x, void *y ),
-          HYPRE_Int    (*MassInnerProd) ( void *x, void **p, HYPRE_Int k, HYPRE_Int unroll, void *result),
-          HYPRE_Int    (*MassDotpTwo)   ( void *x, void *y, void **p, HYPRE_Int k, HYPRE_Int unroll, void *result_x, void *result_y),
-          HYPRE_Int    (*CopyVector)    ( void *x, void *y ),
-          HYPRE_Int    (*ClearVector)   ( void *x ),
-          HYPRE_Int    (*ScaleVector)   ( HYPRE_Complex alpha, void *x ),
-          HYPRE_Int    (*Axpy)          ( HYPRE_Complex alpha, void *x, void *y ),
-          HYPRE_Int    (*MassAxpy)      ( HYPRE_Complex *alpha, void **x, void *y, HYPRE_Int k, HYPRE_Int unroll),
-          HYPRE_Int    (*PrecondSetup)  ( void *vdata, void *A, void *b, void *x ),
-          HYPRE_Int    (*Precond)       ( void *vdata, void *A, void *b, void *x )
-          );
-
-    /**
-     * Description...
-     *
-     * @param param [IN] ...
-     **/
-
-    void *
-      hypre_COGMRESCreate( hypre_COGMRESFunctions *gmres_functions );
+   /**
+    * @name generic GMRES Solver
+    *
+    * Description...
+    **/
+   /*@{*/
+
+   /**
+    * Description...
+    *
+    * @param param [IN] ...
+    **/
+
+   hypre_COGMRESFunctions *
+   hypre_COGMRESFunctionsCreate(
+      void *       (*CAlloc)        ( size_t count, size_t elt_size, HYPRE_MemoryLocation location ),
+      HYPRE_Int    (*Free)          ( void *ptr ),
+      HYPRE_Int    (*CommInfo)      ( void  *A, HYPRE_Int   *my_id,
+                                      HYPRE_Int   *num_procs ),
+      void *       (*CreateVector)  ( void *vector ),
+      void *       (*CreateVectorArray)  ( HYPRE_Int size, void *vectors ),
+      HYPRE_Int    (*DestroyVector) ( void *vector ),
+      void *       (*MatvecCreate)  ( void *A, void *x ),
+      HYPRE_Int    (*Matvec)        ( void *matvec_data, HYPRE_Complex alpha, void *A, void *x,
+                                      HYPRE_Complex beta, void *y ),
+      HYPRE_Int    (*MatvecDestroy) ( void *matvec_data ),
+      HYPRE_Real   (*InnerProd)     ( void *x, void *y ),
+      HYPRE_Int    (*MassInnerProd) ( void *x, void **p, HYPRE_Int k, HYPRE_Int unroll, void *result),
+      HYPRE_Int    (*MassDotpTwo)   ( void *x, void *y, void **p, HYPRE_Int k, HYPRE_Int unroll,
+                                      void *result_x, void *result_y),
+      HYPRE_Int    (*CopyVector)    ( void *x, void *y ),
+      HYPRE_Int    (*ClearVector)   ( void *x ),
+      HYPRE_Int    (*ScaleVector)   ( HYPRE_Complex alpha, void *x ),
+      HYPRE_Int    (*Axpy)          ( HYPRE_Complex alpha, void *x, void *y ),
+      HYPRE_Int    (*MassAxpy)      ( HYPRE_Complex *alpha, void **x, void *y, HYPRE_Int k,
+                                      HYPRE_Int unroll),
+      HYPRE_Int    (*PrecondSetup)  ( void *vdata, void *A, void *b, void *x ),
+      HYPRE_Int    (*Precond)       ( void *vdata, void *A, void *b, void *x )
+   );
+
+   /**
+    * Description...
+    *
+    * @param param [IN] ...
+    **/
+
+   void *
+   hypre_COGMRESCreate( hypre_COGMRESFunctions *gmres_functions );
 
 #ifdef __cplusplus
-  }
+}
 #endif
 #endif
 
 
 
-  /***********end of KS code *********/
+/***********end of KS code *********/
 
 
 
-  /******************************************************************************
-   *
-   * LGMRES lgmres
-   *
-   *****************************************************************************/
+/******************************************************************************
+ *
+ * LGMRES lgmres
+ *
+ *****************************************************************************/
 
 #ifndef hypre_KRYLOV_LGMRES_HEADER
 #define hypre_KRYLOV_LGMRES_HEADER
 
-  /*--------------------------------------------------------------------------
-   *--------------------------------------------------------------------------*/
-
-  /**
-   * @name Generic LGMRES Interface
-   *
-   * A general description of the interface goes here...
-   *
-   **/
-  /*@{*/
-
-  /*--------------------------------------------------------------------------
-   *--------------------------------------------------------------------------*/
-
-  /*--------------------------------------------------------------------------
-   * hypre_LGMRESData and hypre_LGMRESFunctions
-   *--------------------------------------------------------------------------*/
-
-  /**
-   * @name LGMRES structs
-   *
-   * Description...
-   **/
-  /*@{*/
-
-  /**
-   * The {\tt hypre\_LGMRESFunctions} object ...
-   **/
-
-  typedef struct
-  {
-    void *       (*CAlloc)        ( size_t count, size_t elt_size, HYPRE_MemoryLocation location );
-    HYPRE_Int    (*Free)          ( void *ptr );
-    HYPRE_Int    (*CommInfo)      ( void  *A, HYPRE_Int   *my_id,
-        HYPRE_Int   *num_procs );
-    void *       (*CreateVector)  ( void *vector );
-    void *       (*CreateVectorArray)  ( HYPRE_Int size, void *vectors );
-    HYPRE_Int    (*DestroyVector) ( void *vector );
-    void *       (*MatvecCreate)  ( void *A, void *x );
-    HYPRE_Int    (*Matvec)        ( void *matvec_data, HYPRE_Complex alpha, void *A,
-        void *x, HYPRE_Complex beta, void *y );
-    HYPRE_Int    (*MatvecDestroy) ( void *matvec_data );
-    HYPRE_Real   (*InnerProd)     ( void *x, void *y );
-    HYPRE_Int    (*CopyVector)    ( void *x, void *y );
-    HYPRE_Int    (*ClearVector)   ( void *x );
-    HYPRE_Int    (*ScaleVector)   ( HYPRE_Complex alpha, void *x );
-    HYPRE_Int    (*Axpy)          ( HYPRE_Complex alpha, void *x, void *y );
-
-    HYPRE_Int    (*precond)       (void *vdata , void *A , void *b , void *x);
-    HYPRE_Int    (*precond_setup) (void *vdata , void *A , void *b , void *x);
-
-  } hypre_LGMRESFunctions;
-
-  /**
-   * The {\tt hypre\_LGMRESData} object ...
-   **/
-
-  typedef struct
-  {
-    HYPRE_Int      k_dim;
-    HYPRE_Int      min_iter;
-    HYPRE_Int      max_iter;
-    HYPRE_Int      rel_change;
-    HYPRE_Int      stop_crit;
-    HYPRE_Int      converged;
-    HYPRE_Real   tol;
-    HYPRE_Real   cf_tol;
-    HYPRE_Real   a_tol;
-    HYPRE_Real   rel_residual_norm;
-
-    /*lgmres specific stuff */
-    HYPRE_Int      aug_dim;
-    HYPRE_Int      approx_constant;
-    void   **aug_vecs;
-    HYPRE_Int     *aug_order;
-    void   **a_aug_vecs;
-    /*---*/
-
-    void  *A;
-    void  *r;
-    void  *w;
-    void  *w_2;
-    void  **p;
-
-    void    *matvec_data;
-    void    *precond_data;
-
-    hypre_LGMRESFunctions * functions;
-
-    /* log info (always logged) */
-    HYPRE_Int      num_iterations;
-
-    HYPRE_Int     print_level; /* printing when print_level>0 */
-    HYPRE_Int     logging;  /* extra computations for logging when logging>0 */
-    HYPRE_Real  *norms;
-    char    *log_file_name;
-
-  } hypre_LGMRESData;
+/*--------------------------------------------------------------------------
+ *--------------------------------------------------------------------------*/
+
+/**
+ * @name Generic LGMRES Interface
+ *
+ * A general description of the interface goes here...
+ *
+ **/
+/*@{*/
+
+/*--------------------------------------------------------------------------
+ *--------------------------------------------------------------------------*/
+
+/*--------------------------------------------------------------------------
+ * hypre_LGMRESData and hypre_LGMRESFunctions
+ *--------------------------------------------------------------------------*/
+
+/**
+ * @name LGMRES structs
+ *
+ * Description...
+ **/
+/*@{*/
+
+/**
+ * The {\tt hypre\_LGMRESFunctions} object ...
+ **/
+
+typedef struct
+{
+   void *       (*CAlloc)        ( size_t count, size_t elt_size, HYPRE_MemoryLocation location );
+   HYPRE_Int    (*Free)          ( void *ptr );
+   HYPRE_Int    (*CommInfo)      ( void  *A, HYPRE_Int   *my_id,
+                                   HYPRE_Int   *num_procs );
+   void *       (*CreateVector)  ( void *vector );
+   void *       (*CreateVectorArray)  ( HYPRE_Int size, void *vectors );
+   HYPRE_Int    (*DestroyVector) ( void *vector );
+   void *       (*MatvecCreate)  ( void *A, void *x );
+   HYPRE_Int    (*Matvec)        ( void *matvec_data, HYPRE_Complex alpha, void *A,
+                                   void *x, HYPRE_Complex beta, void *y );
+   HYPRE_Int    (*MatvecDestroy) ( void *matvec_data );
+   HYPRE_Real   (*InnerProd)     ( void *x, void *y );
+   HYPRE_Int    (*CopyVector)    ( void *x, void *y );
+   HYPRE_Int    (*ClearVector)   ( void *x );
+   HYPRE_Int    (*ScaleVector)   ( HYPRE_Complex alpha, void *x );
+   HYPRE_Int    (*Axpy)          ( HYPRE_Complex alpha, void *x, void *y );
+
+   HYPRE_Int    (*precond)       (void *vdata, void *A, void *b, void *x);
+   HYPRE_Int    (*precond_setup) (void *vdata, void *A, void *b, void *x);
+
+} hypre_LGMRESFunctions;
+
+/**
+ * The {\tt hypre\_LGMRESData} object ...
+ **/
+
+typedef struct
+{
+   HYPRE_Int      k_dim;
+   HYPRE_Int      min_iter;
+   HYPRE_Int      max_iter;
+   HYPRE_Int      rel_change;
+   HYPRE_Int      stop_crit;
+   HYPRE_Int      converged;
+   HYPRE_Real   tol;
+   HYPRE_Real   cf_tol;
+   HYPRE_Real   a_tol;
+   HYPRE_Real   rel_residual_norm;
+
+   /*lgmres specific stuff */
+   HYPRE_Int      aug_dim;
+   HYPRE_Int      approx_constant;
+   void   **aug_vecs;
+   HYPRE_Int     *aug_order;
+   void   **a_aug_vecs;
+   /*---*/
+
+   void  *A;
+   void  *r;
+   void  *w;
+   void  *w_2;
+   void  **p;
+
+   void    *matvec_data;
+   void    *precond_data;
+
+   hypre_LGMRESFunctions * functions;
+
+   /* log info (always logged) */
+   HYPRE_Int      num_iterations;
+
+   HYPRE_Int     print_level; /* printing when print_level>0 */
+   HYPRE_Int     logging;  /* extra computations for logging when logging>0 */
+   HYPRE_Real  *norms;
+   char    *log_file_name;
+
+} hypre_LGMRESData;
 
 #ifdef __cplusplus
-  extern "C" {
+extern "C" {
 #endif
 
-    /**
-     * @name generic LGMRES Solver
-     *
-     * Description...
-     **/
-    /*@{*/
-
-    /**
-     * Description...
-     *
-     * @param param [IN] ...
-     **/
-
-    hypre_LGMRESFunctions *
-      hypre_LGMRESFunctionsCreate(
-          void *       (*CAlloc)        ( size_t count, size_t elt_size, HYPRE_MemoryLocation location),
-          HYPRE_Int    (*Free)          ( void *ptr ),
-          HYPRE_Int    (*CommInfo)      ( void  *A, HYPRE_Int   *my_id,
-            HYPRE_Int   *num_procs ),
-          void *       (*CreateVector)  ( void *vector ),
-          void *       (*CreateVectorArray)  ( HYPRE_Int size, void *vectors ),
-          HYPRE_Int    (*DestroyVector) ( void *vector ),
-          void *       (*MatvecCreate)  ( void *A, void *x ),
-          HYPRE_Int    (*Matvec)        ( void *matvec_data, HYPRE_Complex alpha, void *A,
-            void *x, HYPRE_Complex beta, void *y ),
-          HYPRE_Int    (*MatvecDestroy) ( void *matvec_data ),
-          HYPRE_Real   (*InnerProd)     ( void *x, void *y ),
-          HYPRE_Int    (*CopyVector)    ( void *x, void *y ),
-          HYPRE_Int    (*ClearVector)   ( void *x ),
-          HYPRE_Int    (*ScaleVector)   ( HYPRE_Complex alpha, void *x ),
-          HYPRE_Int    (*Axpy)          ( HYPRE_Complex alpha, void *x, void *y ),
-          HYPRE_Int    (*PrecondSetup)  ( void *vdata, void *A, void *b, void *x ),
-          HYPRE_Int    (*Precond)       ( void *vdata, void *A, void *b, void *x )
-          );
-
-    /**
-     * Description...
-     *
-     * @param param [IN] ...
-     **/
-
-    void *
-      hypre_LGMRESCreate( hypre_LGMRESFunctions *lgmres_functions );
+   /**
+    * @name generic LGMRES Solver
+    *
+    * Description...
+    **/
+   /*@{*/
+
+   /**
+    * Description...
+    *
+    * @param param [IN] ...
+    **/
+
+   hypre_LGMRESFunctions *
+   hypre_LGMRESFunctionsCreate(
+      void *       (*CAlloc)        ( size_t count, size_t elt_size, HYPRE_MemoryLocation location),
+      HYPRE_Int    (*Free)          ( void *ptr ),
+      HYPRE_Int    (*CommInfo)      ( void  *A, HYPRE_Int   *my_id,
+                                      HYPRE_Int   *num_procs ),
+      void *       (*CreateVector)  ( void *vector ),
+      void *       (*CreateVectorArray)  ( HYPRE_Int size, void *vectors ),
+      HYPRE_Int    (*DestroyVector) ( void *vector ),
+      void *       (*MatvecCreate)  ( void *A, void *x ),
+      HYPRE_Int    (*Matvec)        ( void *matvec_data, HYPRE_Complex alpha, void *A,
+                                      void *x, HYPRE_Complex beta, void *y ),
+      HYPRE_Int    (*MatvecDestroy) ( void *matvec_data ),
+      HYPRE_Real   (*InnerProd)     ( void *x, void *y ),
+      HYPRE_Int    (*CopyVector)    ( void *x, void *y ),
+      HYPRE_Int    (*ClearVector)   ( void *x ),
+      HYPRE_Int    (*ScaleVector)   ( HYPRE_Complex alpha, void *x ),
+      HYPRE_Int    (*Axpy)          ( HYPRE_Complex alpha, void *x, void *y ),
+      HYPRE_Int    (*PrecondSetup)  ( void *vdata, void *A, void *b, void *x ),
+      HYPRE_Int    (*Precond)       ( void *vdata, void *A, void *b, void *x )
+   );
+
+   /**
+    * Description...
+    *
+    * @param param [IN] ...
+    **/
+
+   void *
+   hypre_LGMRESCreate( hypre_LGMRESFunctions *lgmres_functions );
 
 #ifdef __cplusplus
-  }
+}
 #endif
 #endif
 
-  /******************************************************************************
-   *
-   * FLEXGMRES flexible gmres
-   *
-   *****************************************************************************/
+/******************************************************************************
+ *
+ * FLEXGMRES flexible gmres
+ *
+ *****************************************************************************/
 
 #ifndef hypre_KRYLOV_FLEXGMRES_HEADER
 #define hypre_KRYLOV_FLEXGMRES_HEADER
 
-  /*--------------------------------------------------------------------------
-   *--------------------------------------------------------------------------*/
-
-  /**
-   * @name Generic FlexGMRES Interface
-   *
-   * A general description of the interface goes here...
-   *
-   **/
-  /*@{*/
-
-  /*--------------------------------------------------------------------------
-   *--------------------------------------------------------------------------*/
-
-  /*--------------------------------------------------------------------------
-   * hypre_FlexGMRESData and hypre_FlexGMRESFunctions
-   *--------------------------------------------------------------------------*/
-
-  /**
-   * @name FlexGMRES structs
-   *
-   * Description...
-   **/
-  /*@{*/
-
-  /**
-   * The {\tt hypre\_FlexGMRESFunctions} object ...
-   **/
-
-  typedef struct
-  {
-    void *       (*CAlloc)        ( size_t count, size_t elt_size, HYPRE_MemoryLocation location );
-    HYPRE_Int    (*Free)          ( void *ptr );
-    HYPRE_Int    (*CommInfo)      ( void  *A, HYPRE_Int   *my_id,
-        HYPRE_Int   *num_procs );
-    void *       (*CreateVector)  ( void *vector );
-    void *       (*CreateVectorArray)  ( HYPRE_Int size, void *vectors );
-    HYPRE_Int    (*DestroyVector) ( void *vector );
-    void *       (*MatvecCreate)  ( void *A, void *x );
-    HYPRE_Int    (*Matvec)        ( void *matvec_data, HYPRE_Complex alpha, void *A,
-        void *x, HYPRE_Complex beta, void *y );
-    HYPRE_Int    (*MatvecDestroy) ( void *matvec_data );
-    HYPRE_Real   (*InnerProd)     ( void *x, void *y );
-    HYPRE_Int    (*CopyVector)    ( void *x, void *y );
-    HYPRE_Int    (*ClearVector)   ( void *x );
-    HYPRE_Int    (*ScaleVector)   ( HYPRE_Complex alpha, void *x );
-    HYPRE_Int    (*Axpy)          ( HYPRE_Complex alpha, void *x, void *y );
-
-    HYPRE_Int    (*precond)(void *vdata, void *A, void *b, void *x );
-    HYPRE_Int    (*precond_setup)(void *vdata, void *A, void *b, void *x );
-
-    HYPRE_Int    (*modify_pc)( void *precond_data, HYPRE_Int iteration, HYPRE_Real rel_residual_norm);
-
-  } hypre_FlexGMRESFunctions;
-
-  /**
-   * The {\tt hypre\_FlexGMRESData} object ...
-   **/
-
-  typedef struct
-  {
-    HYPRE_Int      k_dim;
-    HYPRE_Int      min_iter;
-    HYPRE_Int      max_iter;
-    HYPRE_Int      rel_change;
-    HYPRE_Int      stop_crit;
-    HYPRE_Int      converged;
-    HYPRE_Real   tol;
-    HYPRE_Real   cf_tol;
-    HYPRE_Real   a_tol;
-    HYPRE_Real   rel_residual_norm;
-
-    void   **pre_vecs;
-
-    void  *A;
-    void  *r;
-    void  *w;
-    void  *w_2;
-    void  **p;
-
-    void    *matvec_data;
-    void    *precond_data;
-
-    hypre_FlexGMRESFunctions * functions;
-
-    /* log info (always logged) */
-    HYPRE_Int      num_iterations;
-
-    HYPRE_Int     print_level; /* printing when print_level>0 */
-    HYPRE_Int     logging;  /* extra computations for logging when logging>0 */
-    HYPRE_Real  *norms;
-    char    *log_file_name;
-
-  } hypre_FlexGMRESData;
+/*--------------------------------------------------------------------------
+ *--------------------------------------------------------------------------*/
+
+/**
+ * @name Generic FlexGMRES Interface
+ *
+ * A general description of the interface goes here...
+ *
+ **/
+/*@{*/
+
+/*--------------------------------------------------------------------------
+ *--------------------------------------------------------------------------*/
+
+/*--------------------------------------------------------------------------
+ * hypre_FlexGMRESData and hypre_FlexGMRESFunctions
+ *--------------------------------------------------------------------------*/
+
+/**
+ * @name FlexGMRES structs
+ *
+ * Description...
+ **/
+/*@{*/
+
+/**
+ * The {\tt hypre\_FlexGMRESFunctions} object ...
+ **/
+
+typedef struct
+{
+   void *       (*CAlloc)        ( size_t count, size_t elt_size, HYPRE_MemoryLocation location );
+   HYPRE_Int    (*Free)          ( void *ptr );
+   HYPRE_Int    (*CommInfo)      ( void  *A, HYPRE_Int   *my_id,
+                                   HYPRE_Int   *num_procs );
+   void *       (*CreateVector)  ( void *vector );
+   void *       (*CreateVectorArray)  ( HYPRE_Int size, void *vectors );
+   HYPRE_Int    (*DestroyVector) ( void *vector );
+   void *       (*MatvecCreate)  ( void *A, void *x );
+   HYPRE_Int    (*Matvec)        ( void *matvec_data, HYPRE_Complex alpha, void *A,
+                                   void *x, HYPRE_Complex beta, void *y );
+   HYPRE_Int    (*MatvecDestroy) ( void *matvec_data );
+   HYPRE_Real   (*InnerProd)     ( void *x, void *y );
+   HYPRE_Int    (*CopyVector)    ( void *x, void *y );
+   HYPRE_Int    (*ClearVector)   ( void *x );
+   HYPRE_Int    (*ScaleVector)   ( HYPRE_Complex alpha, void *x );
+   HYPRE_Int    (*Axpy)          ( HYPRE_Complex alpha, void *x, void *y );
+
+   HYPRE_Int    (*precond)(void *vdata, void *A, void *b, void *x );
+   HYPRE_Int    (*precond_setup)(void *vdata, void *A, void *b, void *x );
+
+   HYPRE_Int    (*modify_pc)( void *precond_data, HYPRE_Int iteration, HYPRE_Real rel_residual_norm);
+
+} hypre_FlexGMRESFunctions;
+
+/**
+ * The {\tt hypre\_FlexGMRESData} object ...
+ **/
+
+typedef struct
+{
+   HYPRE_Int      k_dim;
+   HYPRE_Int      min_iter;
+   HYPRE_Int      max_iter;
+   HYPRE_Int      rel_change;
+   HYPRE_Int      stop_crit;
+   HYPRE_Int      converged;
+   HYPRE_Real   tol;
+   HYPRE_Real   cf_tol;
+   HYPRE_Real   a_tol;
+   HYPRE_Real   rel_residual_norm;
+
+   void   **pre_vecs;
+
+   void  *A;
+   void  *r;
+   void  *w;
+   void  *w_2;
+   void  **p;
+
+   void    *matvec_data;
+   void    *precond_data;
+
+   hypre_FlexGMRESFunctions * functions;
+
+   /* log info (always logged) */
+   HYPRE_Int      num_iterations;
+
+   HYPRE_Int     print_level; /* printing when print_level>0 */
+   HYPRE_Int     logging;  /* extra computations for logging when logging>0 */
+   HYPRE_Real  *norms;
+   char    *log_file_name;
+
+} hypre_FlexGMRESData;
 
 #ifdef __cplusplus
-  extern "C" {
+extern "C" {
 #endif
 
-    /**
-     * @name generic FlexGMRES Solver
-     *
-     * Description...
-     **/
-    /*@{*/
-
-    /**
-     * Description...
-     *
-     * @param param [IN] ...
-     **/
-
-    hypre_FlexGMRESFunctions *
-      hypre_FlexGMRESFunctionsCreate(
-          void *       (*CAlloc)        ( size_t count, size_t elt_size, HYPRE_MemoryLocation location ),
-          HYPRE_Int    (*Free)          ( void *ptr ),
-          HYPRE_Int    (*CommInfo)      ( void  *A, HYPRE_Int   *my_id,
-            HYPRE_Int   *num_procs ),
-          void *       (*CreateVector)  ( void *vector ),
-          void *       (*CreateVectorArray)  ( HYPRE_Int size, void *vectors ),
-          HYPRE_Int    (*DestroyVector) ( void *vector ),
-          void *       (*MatvecCreate)  ( void *A, void *x ),
-          HYPRE_Int    (*Matvec)        ( void *matvec_data, HYPRE_Complex alpha, void *A,
-            void *x, HYPRE_Complex beta, void *y ),
-          HYPRE_Int    (*MatvecDestroy) ( void *matvec_data ),
-          HYPRE_Real   (*InnerProd)     ( void *x, void *y ),
-          HYPRE_Int    (*CopyVector)    ( void *x, void *y ),
-          HYPRE_Int    (*ClearVector)   ( void *x ),
-          HYPRE_Int    (*ScaleVector)   ( HYPRE_Complex alpha, void *x ),
-          HYPRE_Int    (*Axpy)          ( HYPRE_Complex alpha, void *x, void *y ),
-          HYPRE_Int    (*PrecondSetup)  ( void *vdata, void *A, void *b, void *x ),
-          HYPRE_Int    (*Precond)       ( void *vdata, void *A, void *b, void *x )
-          );
-
-    /**
-     * Description...
-     *
-     * @param param [IN] ...
-     **/
-
-    void *
-      hypre_FlexGMRESCreate( hypre_FlexGMRESFunctions *fgmres_functions );
+   /**
+    * @name generic FlexGMRES Solver
+    *
+    * Description...
+    **/
+   /*@{*/
+
+   /**
+    * Description...
+    *
+    * @param param [IN] ...
+    **/
+
+   hypre_FlexGMRESFunctions *
+   hypre_FlexGMRESFunctionsCreate(
+      void *       (*CAlloc)        ( size_t count, size_t elt_size, HYPRE_MemoryLocation location ),
+      HYPRE_Int    (*Free)          ( void *ptr ),
+      HYPRE_Int    (*CommInfo)      ( void  *A, HYPRE_Int   *my_id,
+                                      HYPRE_Int   *num_procs ),
+      void *       (*CreateVector)  ( void *vector ),
+      void *       (*CreateVectorArray)  ( HYPRE_Int size, void *vectors ),
+      HYPRE_Int    (*DestroyVector) ( void *vector ),
+      void *       (*MatvecCreate)  ( void *A, void *x ),
+      HYPRE_Int    (*Matvec)        ( void *matvec_data, HYPRE_Complex alpha, void *A,
+                                      void *x, HYPRE_Complex beta, void *y ),
+      HYPRE_Int    (*MatvecDestroy) ( void *matvec_data ),
+      HYPRE_Real   (*InnerProd)     ( void *x, void *y ),
+      HYPRE_Int    (*CopyVector)    ( void *x, void *y ),
+      HYPRE_Int    (*ClearVector)   ( void *x ),
+      HYPRE_Int    (*ScaleVector)   ( HYPRE_Complex alpha, void *x ),
+      HYPRE_Int    (*Axpy)          ( HYPRE_Complex alpha, void *x, void *y ),
+      HYPRE_Int    (*PrecondSetup)  ( void *vdata, void *A, void *b, void *x ),
+      HYPRE_Int    (*Precond)       ( void *vdata, void *A, void *b, void *x )
+   );
+
+   /**
+    * Description...
+    *
+    * @param param [IN] ...
+    **/
+
+   void *
+   hypre_FlexGMRESCreate( hypre_FlexGMRESFunctions *fgmres_functions );
 
 #ifdef __cplusplus
-  }
+}
 #endif
 #endif
 
-  /******************************************************************************
-   *
-   * Preconditioned conjugate gradient (Omin) headers
-   *
-   *****************************************************************************/
+/******************************************************************************
+ *
+ * Preconditioned conjugate gradient (Omin) headers
+ *
+ *****************************************************************************/
 
 #ifndef hypre_KRYLOV_PCG_HEADER
 #define hypre_KRYLOV_PCG_HEADER
 
-  /*--------------------------------------------------------------------------
-   *--------------------------------------------------------------------------*/
-
-  /**
-   * @name Generic PCG Interface
-   *
-   * A general description of the interface goes here...
-   *
-   * @memo A generic PCG linear solver interface
-   * @version 0.1
-   * @author Jeffrey F. Painter
-   **/
-  /*@{*/
-
-  /*--------------------------------------------------------------------------
-   *--------------------------------------------------------------------------*/
-
-  /*--------------------------------------------------------------------------
-   * hypre_PCGData and hypre_PCGFunctions
-   *--------------------------------------------------------------------------*/
-
-  /**
-   * @name PCG structs
-   *
-   * Description...
-   **/
-  /*@{*/
-
-  /**
-   * The {\tt hypre\_PCGSFunctions} object ...
-   **/
-
-  typedef struct
-  {
-    void *       (*CAlloc)        ( size_t count, size_t elt_size, HYPRE_MemoryLocation location );
-    HYPRE_Int    (*Free)          ( void *ptr );
-    HYPRE_Int    (*CommInfo)      ( void  *A, HYPRE_Int   *my_id,
-        HYPRE_Int   *num_procs );
-    void *       (*CreateVector)  ( void *vector );
-    HYPRE_Int    (*DestroyVector) ( void *vector );
-    void *       (*MatvecCreate)  ( void *A, void *x );
-    HYPRE_Int    (*Matvec)        ( void *matvec_data, HYPRE_Complex alpha, void *A,
-        void *x, HYPRE_Complex beta, void *y );
-    HYPRE_Int    (*MatvecDestroy) ( void *matvec_data );
-    HYPRE_Real   (*InnerProd)     ( void *x, void *y );
-    HYPRE_Int    (*CopyVector)    ( void *x, void *y );
-    HYPRE_Int    (*ClearVector)   ( void *x );
-    HYPRE_Int    (*ScaleVector)   ( HYPRE_Complex alpha, void *x );
-    HYPRE_Int    (*Axpy)          ( HYPRE_Complex alpha, void *x, void *y );
-
-    HYPRE_Int    (*precond)(void *vdata , void *A , void *b , void *x);
-    HYPRE_Int    (*precond_setup)(void *vdata , void *A , void *b , void *x);
-
-  } hypre_PCGFunctions;
-
-  /**
-   * The {\tt hypre\_PCGData} object ...
-   **/
-
-  /*
-     Summary of Parameters to Control Stopping Test:
-     - Standard (default) error tolerance: |delta-residual|/|right-hand-side|<tol
-     where the norm is an energy norm wrt preconditioner, |r|=sqrt(<Cr,r>).
-     - two_norm!=0 means: the norm is the L2 norm, |r|=sqrt(<r,r>)
-     - rel_change!=0 means: if pass the other stopping criteria, also check the
-     relative change in the solution x.  Pass iff this relative change is small.
-     - tol = relative error tolerance, as above
-     -a_tol = absolute convergence tolerance (default is 0.0)
-     If one desires the convergence test to check the absolute
-     convergence tolerance *only*, then set the relative convergence
-     tolerance to 0.0.  (The default convergence test is  <C*r,r> <=
-     max(relative_tolerance^2 * <C*b, b>, absolute_tolerance^2)
-     - cf_tol = convergence factor tolerance; if >0 used for special test
-     for slow convergence
-     - stop_crit!=0 means (TO BE PHASED OUT):
-     pure absolute error tolerance rather than a pure relative
-     error tolerance on the residual.  Never applies if rel_change!=0 or atolf!=0.
-     - atolf = absolute error tolerance factor to be used _together_ with the
-     relative error tolerance, |delta-residual| / ( atolf + |right-hand-side| ) < tol
-     (To BE PHASED OUT)
-     - recompute_residual means: when the iteration seems to be converged, recompute the
-     residual from scratch (r=b-Ax) and use this new residual to repeat the convergence test.
-     This can be expensive, use this only if you have seen a problem with the regular
-     residual computation.
-     - recompute_residual_p means: recompute the residual from scratch (r=b-Ax)
-     every "recompute_residual_p" iterations.  This can be expensive and degrade the
-     convergence. Use it only if you have seen a problem with the regular residual
-     computation.
-     */
-
-  typedef struct
-  {
-    HYPRE_Real   tol;
-    HYPRE_Real   atolf;
-    HYPRE_Real   cf_tol;
-    HYPRE_Real   a_tol;
-    HYPRE_Real   rtol;
-    HYPRE_Int      max_iter;
-    HYPRE_Int      two_norm;
-    HYPRE_Int      rel_change;
-    HYPRE_Int      recompute_residual;
-    HYPRE_Int      recompute_residual_p;
-    HYPRE_Int      stop_crit;
-    HYPRE_Int      converged;
-    HYPRE_Int      hybrid;
-
-    void    *A;
-    void    *p;
-    void    *s;
-    void    *r; /* ...contains the residual.  This is currently kept permanently.
+/*--------------------------------------------------------------------------
+ *--------------------------------------------------------------------------*/
+
+/**
+ * @name Generic PCG Interface
+ *
+ * A general description of the interface goes here...
+ *
+ * @memo A generic PCG linear solver interface
+ * @version 0.1
+ * @author Jeffrey F. Painter
+ **/
+/*@{*/
+
+/*--------------------------------------------------------------------------
+ *--------------------------------------------------------------------------*/
+
+/*--------------------------------------------------------------------------
+ * hypre_PCGData and hypre_PCGFunctions
+ *--------------------------------------------------------------------------*/
+
+/**
+ * @name PCG structs
+ *
+ * Description...
+ **/
+/*@{*/
+
+/**
+ * The {\tt hypre\_PCGSFunctions} object ...
+ **/
+
+typedef struct
+{
+   void *       (*CAlloc)        ( size_t count, size_t elt_size, HYPRE_MemoryLocation location );
+   HYPRE_Int    (*Free)          ( void *ptr );
+   HYPRE_Int    (*CommInfo)      ( void  *A, HYPRE_Int   *my_id,
+                                   HYPRE_Int   *num_procs );
+   void *       (*CreateVector)  ( void *vector );
+   HYPRE_Int    (*DestroyVector) ( void *vector );
+   void *       (*MatvecCreate)  ( void *A, void *x );
+   HYPRE_Int    (*Matvec)        ( void *matvec_data, HYPRE_Complex alpha, void *A,
+                                   void *x, HYPRE_Complex beta, void *y );
+   HYPRE_Int    (*MatvecDestroy) ( void *matvec_data );
+   HYPRE_Real   (*InnerProd)     ( void *x, void *y );
+   HYPRE_Int    (*CopyVector)    ( void *x, void *y );
+   HYPRE_Int    (*ClearVector)   ( void *x );
+   HYPRE_Int    (*ScaleVector)   ( HYPRE_Complex alpha, void *x );
+   HYPRE_Int    (*Axpy)          ( HYPRE_Complex alpha, void *x, void *y );
+
+   HYPRE_Int    (*precond)(void *vdata, void *A, void *b, void *x);
+   HYPRE_Int    (*precond_setup)(void *vdata, void *A, void *b, void *x);
+
+} hypre_PCGFunctions;
+
+/**
+ * The {\tt hypre\_PCGData} object ...
+ **/
+
+/*
+   Summary of Parameters to Control Stopping Test:
+   - Standard (default) error tolerance: |delta-residual|/|right-hand-side|<tol
+   where the norm is an energy norm wrt preconditioner, |r|=sqrt(<Cr,r>).
+   - two_norm!=0 means: the norm is the L2 norm, |r|=sqrt(<r,r>)
+   - rel_change!=0 means: if pass the other stopping criteria, also check the
+   relative change in the solution x.  Pass iff this relative change is small.
+   - tol = relative error tolerance, as above
+   -a_tol = absolute convergence tolerance (default is 0.0)
+   If one desires the convergence test to check the absolute
+   convergence tolerance *only*, then set the relative convergence
+   tolerance to 0.0.  (The default convergence test is  <C*r,r> <=
+   max(relative_tolerance^2 * <C*b, b>, absolute_tolerance^2)
+   - cf_tol = convergence factor tolerance; if >0 used for special test
+   for slow convergence
+   - stop_crit!=0 means (TO BE PHASED OUT):
+   pure absolute error tolerance rather than a pure relative
+   error tolerance on the residual.  Never applies if rel_change!=0 or atolf!=0.
+   - atolf = absolute error tolerance factor to be used _together_ with the
+   relative error tolerance, |delta-residual| / ( atolf + |right-hand-side| ) < tol
+   (To BE PHASED OUT)
+   - recompute_residual means: when the iteration seems to be converged, recompute the
+   residual from scratch (r=b-Ax) and use this new residual to repeat the convergence test.
+   This can be expensive, use this only if you have seen a problem with the regular
+   residual computation.
+   - recompute_residual_p means: recompute the residual from scratch (r=b-Ax)
+   every "recompute_residual_p" iterations.  This can be expensive and degrade the
+   convergence. Use it only if you have seen a problem with the regular residual
+   computation.
+   */
+
+typedef struct
+{
+   HYPRE_Real   tol;
+   HYPRE_Real   atolf;
+   HYPRE_Real   cf_tol;
+   HYPRE_Real   a_tol;
+   HYPRE_Real   rtol;
+   HYPRE_Int      max_iter;
+   HYPRE_Int      two_norm;
+   HYPRE_Int      rel_change;
+   HYPRE_Int      recompute_residual;
+   HYPRE_Int      recompute_residual_p;
+   HYPRE_Int      stop_crit;
+   HYPRE_Int      converged;
+   HYPRE_Int      hybrid;
+   HYPRE_Int      skip_break;
+   HYPRE_Int      flex;
+
+   void    *A;
+   void    *p;
+   void    *s;
+   void    *r; /* ...contains the residual.  This is currently kept permanently.
                    If that is ever changed, it still must be kept if logging>1 */
+   void    *r_old; /* only needed for flexible CG */
+   void    *v; /* work vector; only needed if recompute_residual_p is set */
 
-    HYPRE_Int      owns_matvec_data;  /* normally 1; if 0, don't delete it */
-    void    *matvec_data;
-    void    *precond_data;
+   HYPRE_Int      owns_matvec_data;  /* normally 1; if 0, don't delete it */
+   void    *matvec_data;
+   void    *precond_data;
 
-    hypre_PCGFunctions * functions;
+   hypre_PCGFunctions * functions;
 
-    /* log info (always logged) */
-    HYPRE_Int      num_iterations;
-    HYPRE_Real   rel_residual_norm;
+   /* log info (always logged) */
+   HYPRE_Int      num_iterations;
+   HYPRE_Real   rel_residual_norm;
 
-    HYPRE_Int     print_level; /* printing when print_level>0 */
-    HYPRE_Int     logging;  /* extra computations for logging when logging>0 */
-    HYPRE_Real  *norms;
-    HYPRE_Real  *rel_norms;
+   HYPRE_Int     print_level; /* printing when print_level>0 */
+   HYPRE_Int     logging;  /* extra computations for logging when logging>0 */
+   HYPRE_Real  *norms;
+   HYPRE_Real  *rel_norms;
 
-  } hypre_PCGData;
+} hypre_PCGData;
 
 #define hypre_PCGDataOwnsMatvecData(pcgdata)  ((pcgdata) -> owns_matvec_data)
 #define hypre_PCGDataHybrid(pcgdata)  ((pcgdata) -> hybrid)
 
 #ifdef __cplusplus
-  extern "C" {
+extern "C" {
 #endif
 
-    /**
-     * @name generic PCG Solver
-     *
-     * Description...
-     **/
-    /*@{*/
-
-    /**
-     * Description...
-     *
-     * @param param [IN] ...
-     **/
-
-    hypre_PCGFunctions *
-      hypre_PCGFunctionsCreate(
-          void *       (*CAlloc)        ( size_t count, size_t elt_size, HYPRE_MemoryLocation location ),
-          HYPRE_Int    (*Free)          ( void *ptr ),
-          HYPRE_Int    (*CommInfo)      ( void  *A, HYPRE_Int   *my_id,
-            HYPRE_Int   *num_procs ),
-          void *       (*CreateVector)  ( void *vector ),
-          HYPRE_Int    (*DestroyVector) ( void *vector ),
-          void *       (*MatvecCreate)  ( void *A, void *x ),
-          HYPRE_Int    (*Matvec)        ( void *matvec_data, HYPRE_Complex alpha, void *A,
-            void *x, HYPRE_Complex beta, void *y ),
-          HYPRE_Int    (*MatvecDestroy) ( void *matvec_data ),
-          HYPRE_Real   (*InnerProd)     ( void *x, void *y ),
-          HYPRE_Int    (*CopyVector)    ( void *x, void *y ),
-          HYPRE_Int    (*ClearVector)   ( void *x ),
-          HYPRE_Int    (*ScaleVector)   ( HYPRE_Complex alpha, void *x ),
-          HYPRE_Int    (*Axpy)          ( HYPRE_Complex alpha, void *x, void *y ),
-          HYPRE_Int    (*PrecondSetup)  ( void *vdata, void *A, void *b, void *x ),
-          HYPRE_Int    (*Precond)       ( void *vdata, void *A, void *b, void *x )
-          );
-
-    /**
-     * Description...
-     *
-     * @param param [IN] ...
-     **/
-
-    void *
-      hypre_PCGCreate( hypre_PCGFunctions *pcg_functions );
+   /**
+    * @name generic PCG Solver
+    *
+    * Description...
+    **/
+   /*@{*/
+
+   /**
+    * Description...
+    *
+    * @param param [IN] ...
+    **/
+
+   hypre_PCGFunctions *
+   hypre_PCGFunctionsCreate(
+      void *       (*CAlloc)        ( size_t count, size_t elt_size, HYPRE_MemoryLocation location ),
+      HYPRE_Int    (*Free)          ( void *ptr ),
+      HYPRE_Int    (*CommInfo)      ( void  *A, HYPRE_Int   *my_id,
+                                      HYPRE_Int   *num_procs ),
+      void *       (*CreateVector)  ( void *vector ),
+      HYPRE_Int    (*DestroyVector) ( void *vector ),
+      void *       (*MatvecCreate)  ( void *A, void *x ),
+      HYPRE_Int    (*Matvec)        ( void *matvec_data, HYPRE_Complex alpha, void *A,
+                                      void *x, HYPRE_Complex beta, void *y ),
+      HYPRE_Int    (*MatvecDestroy) ( void *matvec_data ),
+      HYPRE_Real   (*InnerProd)     ( void *x, void *y ),
+      HYPRE_Int    (*CopyVector)    ( void *x, void *y ),
+      HYPRE_Int    (*ClearVector)   ( void *x ),
+      HYPRE_Int    (*ScaleVector)   ( HYPRE_Complex alpha, void *x ),
+      HYPRE_Int    (*Axpy)          ( HYPRE_Complex alpha, void *x, void *y ),
+      HYPRE_Int    (*PrecondSetup)  ( void *vdata, void *A, void *b, void *x ),
+      HYPRE_Int    (*Precond)       ( void *vdata, void *A, void *b, void *x )
+   );
+
+   /**
+    * Description...
+    *
+    * @param param [IN] ...
+    **/
+
+   void *
+   hypre_PCGCreate( hypre_PCGFunctions *pcg_functions );
 
 #ifdef __cplusplus
-  }
+}
 #endif
 
 #endif
 
-  /* bicgstab.c */
-  void *hypre_BiCGSTABCreate ( hypre_BiCGSTABFunctions *bicgstab_functions );
-  HYPRE_Int hypre_BiCGSTABDestroy ( void *bicgstab_vdata );
-  HYPRE_Int hypre_BiCGSTABSetup ( void *bicgstab_vdata , void *A , void *b , void *x );
-  HYPRE_Int hypre_BiCGSTABSolve ( void *bicgstab_vdata , void *A , void *b , void *x );
-  HYPRE_Int hypre_BiCGSTABSetTol ( void *bicgstab_vdata , HYPRE_Real tol );
-  HYPRE_Int hypre_BiCGSTABSetAbsoluteTol ( void *bicgstab_vdata , HYPRE_Real a_tol );
-  HYPRE_Int hypre_BiCGSTABSetConvergenceFactorTol ( void *bicgstab_vdata , HYPRE_Real cf_tol );
-  HYPRE_Int hypre_BiCGSTABSetMinIter ( void *bicgstab_vdata , HYPRE_Int min_iter );
-  HYPRE_Int hypre_BiCGSTABSetMaxIter ( void *bicgstab_vdata , HYPRE_Int max_iter );
-  HYPRE_Int hypre_BiCGSTABSetStopCrit ( void *bicgstab_vdata , HYPRE_Int stop_crit );
-  HYPRE_Int hypre_BiCGSTABSetPrecond ( void *bicgstab_vdata , HYPRE_Int (*precond )(void*,void*,void*,void*), HYPRE_Int (*precond_setup )(void*,void*,void*,void*), void *precond_data );
-  HYPRE_Int hypre_BiCGSTABGetPrecond ( void *bicgstab_vdata , HYPRE_Solver *precond_data_ptr );
-  HYPRE_Int hypre_BiCGSTABSetLogging ( void *bicgstab_vdata , HYPRE_Int logging );
-  HYPRE_Int hypre_BiCGSTABSetHybrid ( void *bicgstab_vdata , HYPRE_Int logging );
-  HYPRE_Int hypre_BiCGSTABSetPrintLevel ( void *bicgstab_vdata , HYPRE_Int print_level );
-  HYPRE_Int hypre_BiCGSTABGetConverged ( void *bicgstab_vdata , HYPRE_Int *converged );
-  HYPRE_Int hypre_BiCGSTABGetNumIterations ( void *bicgstab_vdata , HYPRE_Int *num_iterations );
-  HYPRE_Int hypre_BiCGSTABGetFinalRelativeResidualNorm ( void *bicgstab_vdata , HYPRE_Real *relative_residual_norm );
-  HYPRE_Int hypre_BiCGSTABGetResidual ( void *bicgstab_vdata , void **residual );
-
-  /* cgnr.c */
-  void *hypre_CGNRCreate ( hypre_CGNRFunctions *cgnr_functions );
-  HYPRE_Int hypre_CGNRDestroy ( void *cgnr_vdata );
-  HYPRE_Int hypre_CGNRSetup ( void *cgnr_vdata , void *A , void *b , void *x );
-  HYPRE_Int hypre_CGNRSolve ( void *cgnr_vdata , void *A , void *b , void *x );
-  HYPRE_Int hypre_CGNRSetTol ( void *cgnr_vdata , HYPRE_Real tol );
-  HYPRE_Int hypre_CGNRSetMinIter ( void *cgnr_vdata , HYPRE_Int min_iter );
-  HYPRE_Int hypre_CGNRSetMaxIter ( void *cgnr_vdata , HYPRE_Int max_iter );
-  HYPRE_Int hypre_CGNRSetStopCrit ( void *cgnr_vdata , HYPRE_Int stop_crit );
-  HYPRE_Int hypre_CGNRSetPrecond ( void *cgnr_vdata , HYPRE_Int (*precond )(void*,void*,void*,void*), HYPRE_Int (*precondT )(void*,void*,void*,void*), HYPRE_Int (*precond_setup )(void*,void*,void*,void*), void *precond_data );
-  HYPRE_Int hypre_CGNRGetPrecond ( void *cgnr_vdata , HYPRE_Solver *precond_data_ptr );
-  HYPRE_Int hypre_CGNRSetLogging ( void *cgnr_vdata , HYPRE_Int logging );
-  HYPRE_Int hypre_CGNRGetNumIterations ( void *cgnr_vdata , HYPRE_Int *num_iterations );
-  HYPRE_Int hypre_CGNRGetFinalRelativeResidualNorm ( void *cgnr_vdata , HYPRE_Real *relative_residual_norm );
-
-  /* gmres.c */
-  void *hypre_GMRESCreate ( hypre_GMRESFunctions *gmres_functions );
-  HYPRE_Int hypre_GMRESDestroy ( void *gmres_vdata );
-  HYPRE_Int hypre_GMRESGetResidual ( void *gmres_vdata , void **residual );
-  HYPRE_Int hypre_GMRESSetup ( void *gmres_vdata , void *A , void *b , void *x );
-  HYPRE_Int hypre_GMRESSolve ( void *gmres_vdata , void *A , void *b , void *x );
-  HYPRE_Int hypre_GMRESSetKDim ( void *gmres_vdata , HYPRE_Int k_dim );
-  HYPRE_Int hypre_GMRESGetKDim ( void *gmres_vdata , HYPRE_Int *k_dim );
-  HYPRE_Int hypre_GMRESSetTol ( void *gmres_vdata , HYPRE_Real tol );
-  HYPRE_Int hypre_GMRESGetTol ( void *gmres_vdata , HYPRE_Real *tol );
-  HYPRE_Int hypre_GMRESSetAbsoluteTol ( void *gmres_vdata , HYPRE_Real a_tol );
-  HYPRE_Int hypre_GMRESGetAbsoluteTol ( void *gmres_vdata , HYPRE_Real *a_tol );
-  HYPRE_Int hypre_GMRESSetConvergenceFactorTol ( void *gmres_vdata , HYPRE_Real cf_tol );
-  HYPRE_Int hypre_GMRESGetConvergenceFactorTol ( void *gmres_vdata , HYPRE_Real *cf_tol );
-  HYPRE_Int hypre_GMRESSetMinIter ( void *gmres_vdata , HYPRE_Int min_iter );
-  HYPRE_Int hypre_GMRESGetMinIter ( void *gmres_vdata , HYPRE_Int *min_iter );
-  HYPRE_Int hypre_GMRESSetMaxIter ( void *gmres_vdata , HYPRE_Int max_iter );
-  HYPRE_Int hypre_GMRESGetMaxIter ( void *gmres_vdata , HYPRE_Int *max_iter );
-  HYPRE_Int hypre_GMRESSetRelChange ( void *gmres_vdata , HYPRE_Int rel_change );
-  HYPRE_Int hypre_GMRESGetRelChange ( void *gmres_vdata , HYPRE_Int *rel_change );
-  HYPRE_Int hypre_GMRESSetSkipRealResidualCheck ( void *gmres_vdata , HYPRE_Int skip_real_r_check );
-  HYPRE_Int hypre_GMRESGetSkipRealResidualCheck ( void *gmres_vdata , HYPRE_Int *skip_real_r_check );
-  HYPRE_Int hypre_GMRESSetStopCrit ( void *gmres_vdata , HYPRE_Int stop_crit );
-  HYPRE_Int hypre_GMRESGetStopCrit ( void *gmres_vdata , HYPRE_Int *stop_crit );
-  HYPRE_Int hypre_GMRESSetPrecond ( void *gmres_vdata , HYPRE_Int (*precond )(void*,void*,void*,void*), HYPRE_Int (*precond_setup )(void*,void*,void*,void*), void *precond_data );
-  HYPRE_Int hypre_GMRESGetPrecond ( void *gmres_vdata , HYPRE_Solver *precond_data_ptr );
-  HYPRE_Int hypre_GMRESSetPrintLevel ( void *gmres_vdata , HYPRE_Int level );
-  HYPRE_Int hypre_GMRESGetPrintLevel ( void *gmres_vdata , HYPRE_Int *level );
-  HYPRE_Int hypre_GMRESSetLogging ( void *gmres_vdata , HYPRE_Int level );
-  HYPRE_Int hypre_GMRESGetLogging ( void *gmres_vdata , HYPRE_Int *level );
-  HYPRE_Int hypre_GMRESSetHybrid ( void *gmres_vdata , HYPRE_Int level );
-  HYPRE_Int hypre_GMRESGetNumIterations ( void *gmres_vdata , HYPRE_Int *num_iterations );
-  HYPRE_Int hypre_GMRESGetConverged ( void *gmres_vdata , HYPRE_Int *converged );
-  HYPRE_Int hypre_GMRESGetFinalRelativeResidualNorm ( void *gmres_vdata , HYPRE_Real *relative_residual_norm );
-
-  /* cogmres.c */
-  void *hypre_COGMRESCreate ( hypre_COGMRESFunctions *gmres_functions );
-  HYPRE_Int hypre_COGMRESDestroy ( void *gmres_vdata );
-  HYPRE_Int hypre_COGMRESGetResidual ( void *gmres_vdata , void **residual );
-  HYPRE_Int hypre_COGMRESSetup ( void *gmres_vdata , void *A , void *b , void *x );
-  HYPRE_Int hypre_COGMRESSolve ( void *gmres_vdata , void *A , void *b , void *x );
-  HYPRE_Int hypre_COGMRESSetKDim ( void *gmres_vdata , HYPRE_Int k_dim );
-  HYPRE_Int hypre_COGMRESGetKDim ( void *gmres_vdata , HYPRE_Int *k_dim );
-  HYPRE_Int hypre_COGMRESSetUnroll ( void *gmres_vdata , HYPRE_Int unroll );
-  HYPRE_Int hypre_COGMRESGetUnroll ( void *gmres_vdata , HYPRE_Int *unroll );
-  HYPRE_Int hypre_COGMRESSetCGS ( void *gmres_vdata , HYPRE_Int cgs );
-  HYPRE_Int hypre_COGMRESGetCGS ( void *gmres_vdata , HYPRE_Int *cgs );
-  HYPRE_Int hypre_COGMRESSetTol ( void *gmres_vdata , HYPRE_Real tol );
-  HYPRE_Int hypre_COGMRESGetTol ( void *gmres_vdata , HYPRE_Real *tol );
-  HYPRE_Int hypre_COGMRESSetAbsoluteTol ( void *gmres_vdata , HYPRE_Real a_tol );
-  HYPRE_Int hypre_COGMRESGetAbsoluteTol ( void *gmres_vdata , HYPRE_Real *a_tol );
-  HYPRE_Int hypre_COGMRESSetConvergenceFactorTol ( void *gmres_vdata , HYPRE_Real cf_tol );
-  HYPRE_Int hypre_COGMRESGetConvergenceFactorTol ( void *gmres_vdata , HYPRE_Real *cf_tol );
-  HYPRE_Int hypre_COGMRESSetMinIter ( void *gmres_vdata , HYPRE_Int min_iter );
-  HYPRE_Int hypre_COGMRESGetMinIter ( void *gmres_vdata , HYPRE_Int *min_iter );
-  HYPRE_Int hypre_COGMRESSetMaxIter ( void *gmres_vdata , HYPRE_Int max_iter );
-  HYPRE_Int hypre_COGMRESGetMaxIter ( void *gmres_vdata , HYPRE_Int *max_iter );
-  HYPRE_Int hypre_COGMRESSetRelChange ( void *gmres_vdata , HYPRE_Int rel_change );
-  HYPRE_Int hypre_COGMRESGetRelChange ( void *gmres_vdata , HYPRE_Int *rel_change );
-  HYPRE_Int hypre_COGMRESSetSkipRealResidualCheck ( void *gmres_vdata , HYPRE_Int skip_real_r_check );
-  HYPRE_Int hypre_COGMRESGetSkipRealResidualCheck ( void *gmres_vdata , HYPRE_Int *skip_real_r_check );
-  HYPRE_Int hypre_COGMRESSetPrecond ( void *gmres_vdata , HYPRE_Int (*precond )(void*,void*,void*,void*), HYPRE_Int (*precond_setup )(void*,void*,void*,void*), void *precond_data );
-  HYPRE_Int hypre_COGMRESGetPrecond ( void *gmres_vdata , HYPRE_Solver *precond_data_ptr );
-  HYPRE_Int hypre_COGMRESSetPrintLevel ( void *gmres_vdata , HYPRE_Int level );
-  HYPRE_Int hypre_COGMRESGetPrintLevel ( void *gmres_vdata , HYPRE_Int *level );
-  HYPRE_Int hypre_COGMRESSetLogging ( void *gmres_vdata , HYPRE_Int level );
-  HYPRE_Int hypre_COGMRESGetLogging ( void *gmres_vdata , HYPRE_Int *level );
-  HYPRE_Int hypre_COGMRESGetNumIterations ( void *gmres_vdata , HYPRE_Int *num_iterations );
-  HYPRE_Int hypre_COGMRESGetConverged ( void *gmres_vdata , HYPRE_Int *converged );
-  HYPRE_Int hypre_COGMRESGetFinalRelativeResidualNorm ( void *gmres_vdata , HYPRE_Real *relative_residual_norm );
-  HYPRE_Int hypre_COGMRESSetModifyPC ( void *fgmres_vdata , HYPRE_Int (*modify_pc )(void *precond_data, HYPRE_Int iteration, HYPRE_Real rel_residual_norm));
-
-
-
-  /* flexgmres.c */
-  void *hypre_FlexGMRESCreate ( hypre_FlexGMRESFunctions *fgmres_functions );
-  HYPRE_Int hypre_FlexGMRESDestroy ( void *fgmres_vdata );
-  HYPRE_Int hypre_FlexGMRESGetResidual ( void *fgmres_vdata , void **residual );
-  HYPRE_Int hypre_FlexGMRESSetup ( void *fgmres_vdata , void *A , void *b , void *x );
-  HYPRE_Int hypre_FlexGMRESSolve ( void *fgmres_vdata , void *A , void *b , void *x );
-  HYPRE_Int hypre_FlexGMRESSetKDim ( void *fgmres_vdata , HYPRE_Int k_dim );
-  HYPRE_Int hypre_FlexGMRESGetKDim ( void *fgmres_vdata , HYPRE_Int *k_dim );
-  HYPRE_Int hypre_FlexGMRESSetTol ( void *fgmres_vdata , HYPRE_Real tol );
-  HYPRE_Int hypre_FlexGMRESGetTol ( void *fgmres_vdata , HYPRE_Real *tol );
-  HYPRE_Int hypre_FlexGMRESSetAbsoluteTol ( void *fgmres_vdata , HYPRE_Real a_tol );
-  HYPRE_Int hypre_FlexGMRESGetAbsoluteTol ( void *fgmres_vdata , HYPRE_Real *a_tol );
-  HYPRE_Int hypre_FlexGMRESSetConvergenceFactorTol ( void *fgmres_vdata , HYPRE_Real cf_tol );
-  HYPRE_Int hypre_FlexGMRESGetConvergenceFactorTol ( void *fgmres_vdata , HYPRE_Real *cf_tol );
-  HYPRE_Int hypre_FlexGMRESSetMinIter ( void *fgmres_vdata , HYPRE_Int min_iter );
-  HYPRE_Int hypre_FlexGMRESGetMinIter ( void *fgmres_vdata , HYPRE_Int *min_iter );
-  HYPRE_Int hypre_FlexGMRESSetMaxIter ( void *fgmres_vdata , HYPRE_Int max_iter );
-  HYPRE_Int hypre_FlexGMRESGetMaxIter ( void *fgmres_vdata , HYPRE_Int *max_iter );
-  HYPRE_Int hypre_FlexGMRESSetStopCrit ( void *fgmres_vdata , HYPRE_Int stop_crit );
-  HYPRE_Int hypre_FlexGMRESGetStopCrit ( void *fgmres_vdata , HYPRE_Int *stop_crit );
-  HYPRE_Int hypre_FlexGMRESSetPrecond ( void *fgmres_vdata , HYPRE_Int (*precond )(void*,void*,void*,void*), HYPRE_Int (*precond_setup )(void*,void*,void*,void*), void *precond_data );
-  HYPRE_Int hypre_FlexGMRESGetPrecond ( void *fgmres_vdata , HYPRE_Solver *precond_data_ptr );
-  HYPRE_Int hypre_FlexGMRESSetPrintLevel ( void *fgmres_vdata , HYPRE_Int level );
-  HYPRE_Int hypre_FlexGMRESGetPrintLevel ( void *fgmres_vdata , HYPRE_Int *level );
-  HYPRE_Int hypre_FlexGMRESSetLogging ( void *fgmres_vdata , HYPRE_Int level );
-  HYPRE_Int hypre_FlexGMRESGetLogging ( void *fgmres_vdata , HYPRE_Int *level );
-  HYPRE_Int hypre_FlexGMRESGetNumIterations ( void *fgmres_vdata , HYPRE_Int *num_iterations );
-  HYPRE_Int hypre_FlexGMRESGetConverged ( void *fgmres_vdata , HYPRE_Int *converged );
-  HYPRE_Int hypre_FlexGMRESGetFinalRelativeResidualNorm ( void *fgmres_vdata , HYPRE_Real *relative_residual_norm );
-  HYPRE_Int hypre_FlexGMRESSetModifyPC ( void *fgmres_vdata , HYPRE_Int (*modify_pc )(void *precond_data, HYPRE_Int iteration, HYPRE_Real rel_residual_norm));
-  HYPRE_Int hypre_FlexGMRESModifyPCDefault ( void *precond_data , HYPRE_Int iteration , HYPRE_Real rel_residual_norm );
-
-  /* lgmres.c */
-  void *hypre_LGMRESCreate ( hypre_LGMRESFunctions *lgmres_functions );
-  HYPRE_Int hypre_LGMRESDestroy ( void *lgmres_vdata );
-  HYPRE_Int hypre_LGMRESGetResidual ( void *lgmres_vdata , void **residual );
-  HYPRE_Int hypre_LGMRESSetup ( void *lgmres_vdata , void *A , void *b , void *x );
-  HYPRE_Int hypre_LGMRESSolve ( void *lgmres_vdata , void *A , void *b , void *x );
-  HYPRE_Int hypre_LGMRESSetKDim ( void *lgmres_vdata , HYPRE_Int k_dim );
-  HYPRE_Int hypre_LGMRESGetKDim ( void *lgmres_vdata , HYPRE_Int *k_dim );
-  HYPRE_Int hypre_LGMRESSetAugDim ( void *lgmres_vdata , HYPRE_Int aug_dim );
-  HYPRE_Int hypre_LGMRESGetAugDim ( void *lgmres_vdata , HYPRE_Int *aug_dim );
-  HYPRE_Int hypre_LGMRESSetTol ( void *lgmres_vdata , HYPRE_Real tol );
-  HYPRE_Int hypre_LGMRESGetTol ( void *lgmres_vdata , HYPRE_Real *tol );
-  HYPRE_Int hypre_LGMRESSetAbsoluteTol ( void *lgmres_vdata , HYPRE_Real a_tol );
-  HYPRE_Int hypre_LGMRESGetAbsoluteTol ( void *lgmres_vdata , HYPRE_Real *a_tol );
-  HYPRE_Int hypre_LGMRESSetConvergenceFactorTol ( void *lgmres_vdata , HYPRE_Real cf_tol );
-  HYPRE_Int hypre_LGMRESGetConvergenceFactorTol ( void *lgmres_vdata , HYPRE_Real *cf_tol );
-  HYPRE_Int hypre_LGMRESSetMinIter ( void *lgmres_vdata , HYPRE_Int min_iter );
-  HYPRE_Int hypre_LGMRESGetMinIter ( void *lgmres_vdata , HYPRE_Int *min_iter );
-  HYPRE_Int hypre_LGMRESSetMaxIter ( void *lgmres_vdata , HYPRE_Int max_iter );
-  HYPRE_Int hypre_LGMRESGetMaxIter ( void *lgmres_vdata , HYPRE_Int *max_iter );
-  HYPRE_Int hypre_LGMRESSetStopCrit ( void *lgmres_vdata , HYPRE_Int stop_crit );
-  HYPRE_Int hypre_LGMRESGetStopCrit ( void *lgmres_vdata , HYPRE_Int *stop_crit );
-  HYPRE_Int hypre_LGMRESSetPrecond ( void *lgmres_vdata , HYPRE_Int (*precond )(void*,void*,void*,void*), HYPRE_Int (*precond_setup )(void*,void*,void*,void*), void *precond_data );
-  HYPRE_Int hypre_LGMRESGetPrecond ( void *lgmres_vdata , HYPRE_Solver *precond_data_ptr );
-  HYPRE_Int hypre_LGMRESSetPrintLevel ( void *lgmres_vdata , HYPRE_Int level );
-  HYPRE_Int hypre_LGMRESGetPrintLevel ( void *lgmres_vdata , HYPRE_Int *level );
-  HYPRE_Int hypre_LGMRESSetLogging ( void *lgmres_vdata , HYPRE_Int level );
-  HYPRE_Int hypre_LGMRESGetLogging ( void *lgmres_vdata , HYPRE_Int *level );
-  HYPRE_Int hypre_LGMRESGetNumIterations ( void *lgmres_vdata , HYPRE_Int *num_iterations );
-  HYPRE_Int hypre_LGMRESGetConverged ( void *lgmres_vdata , HYPRE_Int *converged );
-  HYPRE_Int hypre_LGMRESGetFinalRelativeResidualNorm ( void *lgmres_vdata , HYPRE_Real *relative_residual_norm );
-
-  /* HYPRE_bicgstab.c */
-  HYPRE_Int HYPRE_BiCGSTABDestroy ( HYPRE_Solver solver );
-  HYPRE_Int HYPRE_BiCGSTABSetup ( HYPRE_Solver solver , HYPRE_Matrix A , HYPRE_Vector b , HYPRE_Vector x );
-  HYPRE_Int HYPRE_BiCGSTABSolve ( HYPRE_Solver solver , HYPRE_Matrix A , HYPRE_Vector b , HYPRE_Vector x );
-  HYPRE_Int HYPRE_BiCGSTABSetTol ( HYPRE_Solver solver , HYPRE_Real tol );
-  HYPRE_Int HYPRE_BiCGSTABSetAbsoluteTol ( HYPRE_Solver solver , HYPRE_Real a_tol );
-  HYPRE_Int HYPRE_BiCGSTABSetConvergenceFactorTol ( HYPRE_Solver solver , HYPRE_Real cf_tol );
-  HYPRE_Int HYPRE_BiCGSTABSetMinIter ( HYPRE_Solver solver , HYPRE_Int min_iter );
-  HYPRE_Int HYPRE_BiCGSTABSetMaxIter ( HYPRE_Solver solver , HYPRE_Int max_iter );
-  HYPRE_Int HYPRE_BiCGSTABSetStopCrit ( HYPRE_Solver solver , HYPRE_Int stop_crit );
-  HYPRE_Int HYPRE_BiCGSTABSetPrecond ( HYPRE_Solver solver , HYPRE_PtrToSolverFcn precond , HYPRE_PtrToSolverFcn precond_setup , HYPRE_Solver precond_solver );
-  HYPRE_Int HYPRE_BiCGSTABGetPrecond ( HYPRE_Solver solver , HYPRE_Solver *precond_data_ptr );
-  HYPRE_Int HYPRE_BiCGSTABSetLogging ( HYPRE_Solver solver , HYPRE_Int logging );
-  HYPRE_Int HYPRE_BiCGSTABSetPrintLevel ( HYPRE_Solver solver , HYPRE_Int print_level );
-  HYPRE_Int HYPRE_BiCGSTABGetNumIterations ( HYPRE_Solver solver , HYPRE_Int *num_iterations );
-  HYPRE_Int HYPRE_BiCGSTABGetFinalRelativeResidualNorm ( HYPRE_Solver solver , HYPRE_Real *norm );
-  HYPRE_Int HYPRE_BiCGSTABGetResidual ( HYPRE_Solver solver , void *residual );
-
-  /* HYPRE_cgnr.c */
-  HYPRE_Int HYPRE_CGNRDestroy ( HYPRE_Solver solver );
-  HYPRE_Int HYPRE_CGNRSetup ( HYPRE_Solver solver , HYPRE_Matrix A , HYPRE_Vector b , HYPRE_Vector x );
-  HYPRE_Int HYPRE_CGNRSolve ( HYPRE_Solver solver , HYPRE_Matrix A , HYPRE_Vector b , HYPRE_Vector x );
-  HYPRE_Int HYPRE_CGNRSetTol ( HYPRE_Solver solver , HYPRE_Real tol );
-  HYPRE_Int HYPRE_CGNRSetMinIter ( HYPRE_Solver solver , HYPRE_Int min_iter );
-  HYPRE_Int HYPRE_CGNRSetMaxIter ( HYPRE_Solver solver , HYPRE_Int max_iter );
-  HYPRE_Int HYPRE_CGNRSetStopCrit ( HYPRE_Solver solver , HYPRE_Int stop_crit );
-  HYPRE_Int HYPRE_CGNRSetPrecond ( HYPRE_Solver solver , HYPRE_PtrToSolverFcn precond , HYPRE_PtrToSolverFcn precondT , HYPRE_PtrToSolverFcn precond_setup , HYPRE_Solver precond_solver );
-  HYPRE_Int HYPRE_CGNRGetPrecond ( HYPRE_Solver solver , HYPRE_Solver *precond_data_ptr );
-  HYPRE_Int HYPRE_CGNRSetLogging ( HYPRE_Solver solver , HYPRE_Int logging );
-  HYPRE_Int HYPRE_CGNRGetNumIterations ( HYPRE_Solver solver , HYPRE_Int *num_iterations );
-  HYPRE_Int HYPRE_CGNRGetFinalRelativeResidualNorm ( HYPRE_Solver solver , HYPRE_Real *norm );
-
-  /* HYPRE_gmres.c */
-  HYPRE_Int HYPRE_GMRESSetup ( HYPRE_Solver solver , HYPRE_Matrix A , HYPRE_Vector b , HYPRE_Vector x );
-  HYPRE_Int HYPRE_GMRESSolve ( HYPRE_Solver solver , HYPRE_Matrix A , HYPRE_Vector b , HYPRE_Vector x );
-  HYPRE_Int HYPRE_GMRESSetKDim ( HYPRE_Solver solver , HYPRE_Int k_dim );
-  HYPRE_Int HYPRE_GMRESGetKDim ( HYPRE_Solver solver , HYPRE_Int *k_dim );
-  HYPRE_Int HYPRE_GMRESSetTol ( HYPRE_Solver solver , HYPRE_Real tol );
-  HYPRE_Int HYPRE_GMRESGetTol ( HYPRE_Solver solver , HYPRE_Real *tol );
-  HYPRE_Int HYPRE_GMRESSetAbsoluteTol ( HYPRE_Solver solver , HYPRE_Real a_tol );
-  HYPRE_Int HYPRE_GMRESGetAbsoluteTol ( HYPRE_Solver solver , HYPRE_Real *a_tol );
-  HYPRE_Int HYPRE_GMRESSetConvergenceFactorTol ( HYPRE_Solver solver , HYPRE_Real cf_tol );
-  HYPRE_Int HYPRE_GMRESGetConvergenceFactorTol ( HYPRE_Solver solver , HYPRE_Real *cf_tol );
-  HYPRE_Int HYPRE_GMRESSetMinIter ( HYPRE_Solver solver , HYPRE_Int min_iter );
-  HYPRE_Int HYPRE_GMRESGetMinIter ( HYPRE_Solver solver , HYPRE_Int *min_iter );
-  HYPRE_Int HYPRE_GMRESSetMaxIter ( HYPRE_Solver solver , HYPRE_Int max_iter );
-  HYPRE_Int HYPRE_GMRESGetMaxIter ( HYPRE_Solver solver , HYPRE_Int *max_iter );
-  HYPRE_Int HYPRE_GMRESSetStopCrit ( HYPRE_Solver solver , HYPRE_Int stop_crit );
-  HYPRE_Int HYPRE_GMRESGetStopCrit ( HYPRE_Solver solver , HYPRE_Int *stop_crit );
-  HYPRE_Int HYPRE_GMRESSetRelChange ( HYPRE_Solver solver , HYPRE_Int rel_change );
-  HYPRE_Int HYPRE_GMRESGetRelChange ( HYPRE_Solver solver , HYPRE_Int *rel_change );
-  HYPRE_Int HYPRE_GMRESSetSkipRealResidualCheck ( HYPRE_Solver solver , HYPRE_Int skip_real_r_check );
-  HYPRE_Int HYPRE_GMRESGetSkipRealResidualCheck ( HYPRE_Solver solver , HYPRE_Int *skip_real_r_check );
-  HYPRE_Int HYPRE_GMRESSetPrecond ( HYPRE_Solver solver , HYPRE_PtrToSolverFcn precond , HYPRE_PtrToSolverFcn precond_setup , HYPRE_Solver precond_solver );
-  HYPRE_Int HYPRE_GMRESGetPrecond ( HYPRE_Solver solver , HYPRE_Solver *precond_data_ptr );
-  HYPRE_Int HYPRE_GMRESSetPrintLevel ( HYPRE_Solver solver , HYPRE_Int level );
-  HYPRE_Int HYPRE_GMRESGetPrintLevel ( HYPRE_Solver solver , HYPRE_Int *level );
-  HYPRE_Int HYPRE_GMRESSetLogging ( HYPRE_Solver solver , HYPRE_Int level );
-  HYPRE_Int HYPRE_GMRESGetLogging ( HYPRE_Solver solver , HYPRE_Int *level );
-  HYPRE_Int HYPRE_GMRESGetNumIterations ( HYPRE_Solver solver , HYPRE_Int *num_iterations );
-  HYPRE_Int HYPRE_GMRESGetConverged ( HYPRE_Solver solver , HYPRE_Int *converged );
-  HYPRE_Int HYPRE_GMRESGetFinalRelativeResidualNorm ( HYPRE_Solver solver , HYPRE_Real *norm );
-  HYPRE_Int HYPRE_GMRESGetResidual ( HYPRE_Solver solver , void *residual );
-
-  /* HYPRE_cogmres.c */
-  HYPRE_Int HYPRE_COGMRESSetup ( HYPRE_Solver solver , HYPRE_Matrix A , HYPRE_Vector b , HYPRE_Vector x );
-  HYPRE_Int HYPRE_COGMRESSolve ( HYPRE_Solver solver , HYPRE_Matrix A , HYPRE_Vector b , HYPRE_Vector x );
-  HYPRE_Int HYPRE_COGMRESSetKDim ( HYPRE_Solver solver , HYPRE_Int k_dim );
-  HYPRE_Int HYPRE_COGMRESGetKDim ( HYPRE_Solver solver , HYPRE_Int *k_dim );
-  HYPRE_Int HYPRE_COGMRESSetUnroll ( HYPRE_Solver solver , HYPRE_Int unroll );
-  HYPRE_Int HYPRE_COGMRESGetUnroll ( HYPRE_Solver solver , HYPRE_Int *unroll );
-  HYPRE_Int HYPRE_COGMRESSetCGS ( HYPRE_Solver solver , HYPRE_Int cgs );
-  HYPRE_Int HYPRE_COGMRESGetCGS ( HYPRE_Solver solver , HYPRE_Int *cgs );
-  HYPRE_Int HYPRE_COGMRESSetTol ( HYPRE_Solver solver , HYPRE_Real tol );
-  HYPRE_Int HYPRE_COGMRESGetTol ( HYPRE_Solver solver , HYPRE_Real *tol );
-  HYPRE_Int HYPRE_COGMRESSetAbsoluteTol ( HYPRE_Solver solver , HYPRE_Real a_tol );
-  HYPRE_Int HYPRE_COGMRESGetAbsoluteTol ( HYPRE_Solver solver , HYPRE_Real *a_tol );
-  HYPRE_Int HYPRE_COGMRESSetConvergenceFactorTol ( HYPRE_Solver solver , HYPRE_Real cf_tol );
-  HYPRE_Int HYPRE_COGMRESGetConvergenceFactorTol ( HYPRE_Solver solver , HYPRE_Real *cf_tol );
-  HYPRE_Int HYPRE_COGMRESSetMinIter ( HYPRE_Solver solver , HYPRE_Int min_iter );
-  HYPRE_Int HYPRE_COGMRESGetMinIter ( HYPRE_Solver solver , HYPRE_Int *min_iter );
-  HYPRE_Int HYPRE_COGMRESSetMaxIter ( HYPRE_Solver solver , HYPRE_Int max_iter );
-  HYPRE_Int HYPRE_COGMRESGetMaxIter ( HYPRE_Solver solver , HYPRE_Int *max_iter );
-  HYPRE_Int HYPRE_COGMRESSetRelChange ( HYPRE_Solver solver , HYPRE_Int rel_change );
-  HYPRE_Int HYPRE_COGMRESGetRelChange ( HYPRE_Solver solver , HYPRE_Int *rel_change );
-  HYPRE_Int HYPRE_COGMRESSetSkipRealResidualCheck ( HYPRE_Solver solver , HYPRE_Int skip_real_r_check );
-  HYPRE_Int HYPRE_COGMRESGetSkipRealResidualCheck ( HYPRE_Solver solver , HYPRE_Int *skip_real_r_check );
-  HYPRE_Int HYPRE_COGMRESSetPrecond ( HYPRE_Solver solver , HYPRE_PtrToSolverFcn precond , HYPRE_PtrToSolverFcn precond_setup , HYPRE_Solver precond_solver );
-  HYPRE_Int HYPRE_COGMRESGetPrecond ( HYPRE_Solver solver , HYPRE_Solver *precond_data_ptr );
-  HYPRE_Int HYPRE_COGMRESSetPrintLevel ( HYPRE_Solver solver , HYPRE_Int level );
-  HYPRE_Int HYPRE_COGMRESGetPrintLevel ( HYPRE_Solver solver , HYPRE_Int *level );
-  HYPRE_Int HYPRE_COGMRESSetLogging ( HYPRE_Solver solver , HYPRE_Int level );
-  HYPRE_Int HYPRE_COGMRESGetLogging ( HYPRE_Solver solver , HYPRE_Int *level );
-  HYPRE_Int HYPRE_COGMRESGetNumIterations ( HYPRE_Solver solver , HYPRE_Int *num_iterations );
-  HYPRE_Int HYPRE_COGMRESGetConverged ( HYPRE_Solver solver , HYPRE_Int *converged );
-  HYPRE_Int HYPRE_COGMRESGetFinalRelativeResidualNorm ( HYPRE_Solver solver , HYPRE_Real *norm );
-  HYPRE_Int HYPRE_COGMRESGetResidual ( HYPRE_Solver solver , void *residual );
-
-  /* HYPRE_flexgmres.c */
-  HYPRE_Int HYPRE_FlexGMRESSetup ( HYPRE_Solver solver , HYPRE_Matrix A , HYPRE_Vector b , HYPRE_Vector x );
-  HYPRE_Int HYPRE_FlexGMRESSolve ( HYPRE_Solver solver , HYPRE_Matrix A , HYPRE_Vector b , HYPRE_Vector x );
-  HYPRE_Int HYPRE_FlexGMRESSetKDim ( HYPRE_Solver solver , HYPRE_Int k_dim );
-  HYPRE_Int HYPRE_FlexGMRESGetKDim ( HYPRE_Solver solver , HYPRE_Int *k_dim );
-  HYPRE_Int HYPRE_FlexGMRESSetTol ( HYPRE_Solver solver , HYPRE_Real tol );
-  HYPRE_Int HYPRE_FlexGMRESGetTol ( HYPRE_Solver solver , HYPRE_Real *tol );
-  HYPRE_Int HYPRE_FlexGMRESSetAbsoluteTol ( HYPRE_Solver solver , HYPRE_Real a_tol );
-  HYPRE_Int HYPRE_FlexGMRESGetAbsoluteTol ( HYPRE_Solver solver , HYPRE_Real *a_tol );
-  HYPRE_Int HYPRE_FlexGMRESSetConvergenceFactorTol ( HYPRE_Solver solver , HYPRE_Real cf_tol );
-  HYPRE_Int HYPRE_FlexGMRESGetConvergenceFactorTol ( HYPRE_Solver solver , HYPRE_Real *cf_tol );
-  HYPRE_Int HYPRE_FlexGMRESSetMinIter ( HYPRE_Solver solver , HYPRE_Int min_iter );
-  HYPRE_Int HYPRE_FlexGMRESGetMinIter ( HYPRE_Solver solver , HYPRE_Int *min_iter );
-  HYPRE_Int HYPRE_FlexGMRESSetMaxIter ( HYPRE_Solver solver , HYPRE_Int max_iter );
-  HYPRE_Int HYPRE_FlexGMRESGetMaxIter ( HYPRE_Solver solver , HYPRE_Int *max_iter );
-  HYPRE_Int HYPRE_FlexGMRESSetPrecond ( HYPRE_Solver solver , HYPRE_PtrToSolverFcn precond , HYPRE_PtrToSolverFcn precond_setup , HYPRE_Solver precond_solver );
-  HYPRE_Int HYPRE_FlexGMRESGetPrecond ( HYPRE_Solver solver , HYPRE_Solver *precond_data_ptr );
-  HYPRE_Int HYPRE_FlexGMRESSetPrintLevel ( HYPRE_Solver solver , HYPRE_Int level );
-  HYPRE_Int HYPRE_FlexGMRESGetPrintLevel ( HYPRE_Solver solver , HYPRE_Int *level );
-  HYPRE_Int HYPRE_FlexGMRESSetLogging ( HYPRE_Solver solver , HYPRE_Int level );
-  HYPRE_Int HYPRE_FlexGMRESGetLogging ( HYPRE_Solver solver , HYPRE_Int *level );
-  HYPRE_Int HYPRE_FlexGMRESGetNumIterations ( HYPRE_Solver solver , HYPRE_Int *num_iterations );
-  HYPRE_Int HYPRE_FlexGMRESGetConverged ( HYPRE_Solver solver , HYPRE_Int *converged );
-  HYPRE_Int HYPRE_FlexGMRESGetFinalRelativeResidualNorm ( HYPRE_Solver solver , HYPRE_Real *norm );
-  HYPRE_Int HYPRE_FlexGMRESGetResidual ( HYPRE_Solver solver , void *residual );
-  HYPRE_Int HYPRE_FlexGMRESSetModifyPC ( HYPRE_Solver solver , HYPRE_Int (*modify_pc )(HYPRE_Solver ,HYPRE_Int ,HYPRE_Real ));
-
-  /* HYPRE_lgmres.c */
-  HYPRE_Int HYPRE_LGMRESSetup ( HYPRE_Solver solver , HYPRE_Matrix A , HYPRE_Vector b , HYPRE_Vector x );
-  HYPRE_Int HYPRE_LGMRESSolve ( HYPRE_Solver solver , HYPRE_Matrix A , HYPRE_Vector b , HYPRE_Vector x );
-  HYPRE_Int HYPRE_LGMRESSetKDim ( HYPRE_Solver solver , HYPRE_Int k_dim );
-  HYPRE_Int HYPRE_LGMRESGetKDim ( HYPRE_Solver solver , HYPRE_Int *k_dim );
-  HYPRE_Int HYPRE_LGMRESSetAugDim ( HYPRE_Solver solver , HYPRE_Int aug_dim );
-  HYPRE_Int HYPRE_LGMRESGetAugDim ( HYPRE_Solver solver , HYPRE_Int *aug_dim );
-  HYPRE_Int HYPRE_LGMRESSetTol ( HYPRE_Solver solver , HYPRE_Real tol );
-  HYPRE_Int HYPRE_LGMRESGetTol ( HYPRE_Solver solver , HYPRE_Real *tol );
-  HYPRE_Int HYPRE_LGMRESSetAbsoluteTol ( HYPRE_Solver solver , HYPRE_Real a_tol );
-  HYPRE_Int HYPRE_LGMRESGetAbsoluteTol ( HYPRE_Solver solver , HYPRE_Real *a_tol );
-  HYPRE_Int HYPRE_LGMRESSetConvergenceFactorTol ( HYPRE_Solver solver , HYPRE_Real cf_tol );
-  HYPRE_Int HYPRE_LGMRESGetConvergenceFactorTol ( HYPRE_Solver solver , HYPRE_Real *cf_tol );
-  HYPRE_Int HYPRE_LGMRESSetMinIter ( HYPRE_Solver solver , HYPRE_Int min_iter );
-  HYPRE_Int HYPRE_LGMRESGetMinIter ( HYPRE_Solver solver , HYPRE_Int *min_iter );
-  HYPRE_Int HYPRE_LGMRESSetMaxIter ( HYPRE_Solver solver , HYPRE_Int max_iter );
-  HYPRE_Int HYPRE_LGMRESGetMaxIter ( HYPRE_Solver solver , HYPRE_Int *max_iter );
-  HYPRE_Int HYPRE_LGMRESSetPrecond ( HYPRE_Solver solver , HYPRE_PtrToSolverFcn precond , HYPRE_PtrToSolverFcn precond_setup , HYPRE_Solver precond_solver );
-  HYPRE_Int HYPRE_LGMRESGetPrecond ( HYPRE_Solver solver , HYPRE_Solver *precond_data_ptr );
-  HYPRE_Int HYPRE_LGMRESSetPrintLevel ( HYPRE_Solver solver , HYPRE_Int level );
-  HYPRE_Int HYPRE_LGMRESGetPrintLevel ( HYPRE_Solver solver , HYPRE_Int *level );
-  HYPRE_Int HYPRE_LGMRESSetLogging ( HYPRE_Solver solver , HYPRE_Int level );
-  HYPRE_Int HYPRE_LGMRESGetLogging ( HYPRE_Solver solver , HYPRE_Int *level );
-  HYPRE_Int HYPRE_LGMRESGetNumIterations ( HYPRE_Solver solver , HYPRE_Int *num_iterations );
-  HYPRE_Int HYPRE_LGMRESGetConverged ( HYPRE_Solver solver , HYPRE_Int *converged );
-  HYPRE_Int HYPRE_LGMRESGetFinalRelativeResidualNorm ( HYPRE_Solver solver , HYPRE_Real *norm );
-  HYPRE_Int HYPRE_LGMRESGetResidual ( HYPRE_Solver solver , void *residual );
-
-  /* HYPRE_pcg.c */
-  HYPRE_Int HYPRE_PCGSetup ( HYPRE_Solver solver , HYPRE_Matrix A , HYPRE_Vector b , HYPRE_Vector x );
-  HYPRE_Int HYPRE_PCGSolve ( HYPRE_Solver solver , HYPRE_Matrix A , HYPRE_Vector b , HYPRE_Vector x );
-  HYPRE_Int HYPRE_PCGSetTol ( HYPRE_Solver solver , HYPRE_Real tol );
-  HYPRE_Int HYPRE_PCGGetTol ( HYPRE_Solver solver , HYPRE_Real *tol );
-  HYPRE_Int HYPRE_PCGSetAbsoluteTol ( HYPRE_Solver solver , HYPRE_Real a_tol );
-  HYPRE_Int HYPRE_PCGGetAbsoluteTol ( HYPRE_Solver solver , HYPRE_Real *a_tol );
-  HYPRE_Int HYPRE_PCGSetAbsoluteTolFactor ( HYPRE_Solver solver , HYPRE_Real abstolf );
-  HYPRE_Int HYPRE_PCGGetAbsoluteTolFactor ( HYPRE_Solver solver , HYPRE_Real *abstolf );
-  HYPRE_Int HYPRE_PCGSetResidualTol ( HYPRE_Solver solver , HYPRE_Real rtol );
-  HYPRE_Int HYPRE_PCGGetResidualTol ( HYPRE_Solver solver , HYPRE_Real *rtol );
-  HYPRE_Int HYPRE_PCGSetConvergenceFactorTol ( HYPRE_Solver solver , HYPRE_Real cf_tol );
-  HYPRE_Int HYPRE_PCGGetConvergenceFactorTol ( HYPRE_Solver solver , HYPRE_Real *cf_tol );
-  HYPRE_Int HYPRE_PCGSetMaxIter ( HYPRE_Solver solver , HYPRE_Int max_iter );
-  HYPRE_Int HYPRE_PCGGetMaxIter ( HYPRE_Solver solver , HYPRE_Int *max_iter );
-  HYPRE_Int HYPRE_PCGSetStopCrit ( HYPRE_Solver solver , HYPRE_Int stop_crit );
-  HYPRE_Int HYPRE_PCGGetStopCrit ( HYPRE_Solver solver , HYPRE_Int *stop_crit );
-  HYPRE_Int HYPRE_PCGSetTwoNorm ( HYPRE_Solver solver , HYPRE_Int two_norm );
-  HYPRE_Int HYPRE_PCGGetTwoNorm ( HYPRE_Solver solver , HYPRE_Int *two_norm );
-  HYPRE_Int HYPRE_PCGSetRelChange ( HYPRE_Solver solver , HYPRE_Int rel_change );
-  HYPRE_Int HYPRE_PCGGetRelChange ( HYPRE_Solver solver , HYPRE_Int *rel_change );
-  HYPRE_Int HYPRE_PCGSetRecomputeResidual ( HYPRE_Solver solver , HYPRE_Int recompute_residual );
-  HYPRE_Int HYPRE_PCGGetRecomputeResidual ( HYPRE_Solver solver , HYPRE_Int *recompute_residual );
-  HYPRE_Int HYPRE_PCGSetRecomputeResidualP ( HYPRE_Solver solver , HYPRE_Int recompute_residual_p );
-  HYPRE_Int HYPRE_PCGGetRecomputeResidualP ( HYPRE_Solver solver , HYPRE_Int *recompute_residual_p );
-  HYPRE_Int HYPRE_PCGSetPrecond ( HYPRE_Solver solver , HYPRE_PtrToSolverFcn precond , HYPRE_PtrToSolverFcn precond_setup , HYPRE_Solver precond_solver );
-  HYPRE_Int HYPRE_PCGGetPrecond ( HYPRE_Solver solver , HYPRE_Solver *precond_data_ptr );
-  HYPRE_Int HYPRE_PCGSetLogging ( HYPRE_Solver solver , HYPRE_Int level );
-  HYPRE_Int HYPRE_PCGGetLogging ( HYPRE_Solver solver , HYPRE_Int *level );
-  HYPRE_Int HYPRE_PCGSetPrintLevel ( HYPRE_Solver solver , HYPRE_Int level );
-  HYPRE_Int HYPRE_PCGGetPrintLevel ( HYPRE_Solver solver , HYPRE_Int *level );
-  HYPRE_Int HYPRE_PCGGetNumIterations ( HYPRE_Solver solver , HYPRE_Int *num_iterations );
-  HYPRE_Int HYPRE_PCGGetConverged ( HYPRE_Solver solver , HYPRE_Int *converged );
-  HYPRE_Int HYPRE_PCGGetFinalRelativeResidualNorm ( HYPRE_Solver solver , HYPRE_Real *norm );
-  HYPRE_Int HYPRE_PCGGetResidual ( HYPRE_Solver solver , void *residual );
-
-  /* pcg.c */
-  void *hypre_PCGCreate ( hypre_PCGFunctions *pcg_functions );
-  HYPRE_Int hypre_PCGDestroy ( void *pcg_vdata );
-  HYPRE_Int hypre_PCGGetResidual ( void *pcg_vdata , void **residual );
-  HYPRE_Int hypre_PCGSetup ( void *pcg_vdata , void *A , void *b , void *x );
-  HYPRE_Int hypre_PCGSolve ( void *pcg_vdata , void *A , void *b , void *x );
-  HYPRE_Int hypre_PCGSetTol ( void *pcg_vdata , HYPRE_Real tol );
-  HYPRE_Int hypre_PCGGetTol ( void *pcg_vdata , HYPRE_Real *tol );
-  HYPRE_Int hypre_PCGSetAbsoluteTol ( void *pcg_vdata , HYPRE_Real a_tol );
-  HYPRE_Int hypre_PCGGetAbsoluteTol ( void *pcg_vdata , HYPRE_Real *a_tol );
-  HYPRE_Int hypre_PCGSetAbsoluteTolFactor ( void *pcg_vdata , HYPRE_Real atolf );
-  HYPRE_Int hypre_PCGGetAbsoluteTolFactor ( void *pcg_vdata , HYPRE_Real *atolf );
-  HYPRE_Int hypre_PCGSetResidualTol ( void *pcg_vdata , HYPRE_Real rtol );
-  HYPRE_Int hypre_PCGGetResidualTol ( void *pcg_vdata , HYPRE_Real *rtol );
-  HYPRE_Int hypre_PCGSetConvergenceFactorTol ( void *pcg_vdata , HYPRE_Real cf_tol );
-  HYPRE_Int hypre_PCGGetConvergenceFactorTol ( void *pcg_vdata , HYPRE_Real *cf_tol );
-  HYPRE_Int hypre_PCGSetMaxIter ( void *pcg_vdata , HYPRE_Int max_iter );
-  HYPRE_Int hypre_PCGGetMaxIter ( void *pcg_vdata , HYPRE_Int *max_iter );
-  HYPRE_Int hypre_PCGSetTwoNorm ( void *pcg_vdata , HYPRE_Int two_norm );
-  HYPRE_Int hypre_PCGGetTwoNorm ( void *pcg_vdata , HYPRE_Int *two_norm );
-  HYPRE_Int hypre_PCGSetRelChange ( void *pcg_vdata , HYPRE_Int rel_change );
-  HYPRE_Int hypre_PCGGetRelChange ( void *pcg_vdata , HYPRE_Int *rel_change );
-  HYPRE_Int hypre_PCGSetRecomputeResidual ( void *pcg_vdata , HYPRE_Int recompute_residual );
-  HYPRE_Int hypre_PCGGetRecomputeResidual ( void *pcg_vdata , HYPRE_Int *recompute_residual );
-  HYPRE_Int hypre_PCGSetRecomputeResidualP ( void *pcg_vdata , HYPRE_Int recompute_residual_p );
-  HYPRE_Int hypre_PCGGetRecomputeResidualP ( void *pcg_vdata , HYPRE_Int *recompute_residual_p );
-  HYPRE_Int hypre_PCGSetStopCrit ( void *pcg_vdata , HYPRE_Int stop_crit );
-  HYPRE_Int hypre_PCGGetStopCrit ( void *pcg_vdata , HYPRE_Int *stop_crit );
-  HYPRE_Int hypre_PCGGetPrecond ( void *pcg_vdata , HYPRE_Solver *precond_data_ptr );
-  HYPRE_Int hypre_PCGSetPrecond ( void *pcg_vdata , HYPRE_Int (*precond )(void*,void*,void*,void*), HYPRE_Int (*precond_setup )(void*,void*,void*,void*), void *precond_data );
-  HYPRE_Int hypre_PCGSetPrintLevel ( void *pcg_vdata , HYPRE_Int level );
-  HYPRE_Int hypre_PCGGetPrintLevel ( void *pcg_vdata , HYPRE_Int *level );
-  HYPRE_Int hypre_PCGSetLogging ( void *pcg_vdata , HYPRE_Int level );
-  HYPRE_Int hypre_PCGGetLogging ( void *pcg_vdata , HYPRE_Int *level );
-  HYPRE_Int hypre_PCGSetHybrid ( void *pcg_vdata , HYPRE_Int level );
-  HYPRE_Int hypre_PCGGetNumIterations ( void *pcg_vdata , HYPRE_Int *num_iterations );
-  HYPRE_Int hypre_PCGGetConverged ( void *pcg_vdata , HYPRE_Int *converged );
-  HYPRE_Int hypre_PCGPrintLogging ( void *pcg_vdata , HYPRE_Int myid );
-  HYPRE_Int hypre_PCGGetFinalRelativeResidualNorm ( void *pcg_vdata , HYPRE_Real *relative_residual_norm );
+/* bicgstab.c */
+void *hypre_BiCGSTABCreate ( hypre_BiCGSTABFunctions *bicgstab_functions );
+HYPRE_Int hypre_BiCGSTABDestroy ( void *bicgstab_vdata );
+HYPRE_Int hypre_BiCGSTABSetup ( void *bicgstab_vdata, void *A, void *b, void *x );
+HYPRE_Int hypre_BiCGSTABSolve ( void *bicgstab_vdata, void *A, void *b, void *x );
+HYPRE_Int hypre_BiCGSTABSetTol ( void *bicgstab_vdata, HYPRE_Real tol );
+HYPRE_Int hypre_BiCGSTABSetAbsoluteTol ( void *bicgstab_vdata, HYPRE_Real a_tol );
+HYPRE_Int hypre_BiCGSTABSetConvergenceFactorTol ( void *bicgstab_vdata, HYPRE_Real cf_tol );
+HYPRE_Int hypre_BiCGSTABSetMinIter ( void *bicgstab_vdata, HYPRE_Int min_iter );
+HYPRE_Int hypre_BiCGSTABSetMaxIter ( void *bicgstab_vdata, HYPRE_Int max_iter );
+HYPRE_Int hypre_BiCGSTABSetStopCrit ( void *bicgstab_vdata, HYPRE_Int stop_crit );
+HYPRE_Int hypre_BiCGSTABSetPrecond ( void *bicgstab_vdata, HYPRE_Int (*precond )(void*, void*,
+                                                                                 void*,
+                                                                                 void*), HYPRE_Int (*precond_setup )(void*, void*, void*, void*), void *precond_data );
+HYPRE_Int hypre_BiCGSTABGetPrecond ( void *bicgstab_vdata, HYPRE_Solver *precond_data_ptr );
+HYPRE_Int hypre_BiCGSTABSetLogging ( void *bicgstab_vdata, HYPRE_Int logging );
+HYPRE_Int hypre_BiCGSTABSetHybrid ( void *bicgstab_vdata, HYPRE_Int logging );
+HYPRE_Int hypre_BiCGSTABSetPrintLevel ( void *bicgstab_vdata, HYPRE_Int print_level );
+HYPRE_Int hypre_BiCGSTABGetConverged ( void *bicgstab_vdata, HYPRE_Int *converged );
+HYPRE_Int hypre_BiCGSTABGetNumIterations ( void *bicgstab_vdata, HYPRE_Int *num_iterations );
+HYPRE_Int hypre_BiCGSTABGetFinalRelativeResidualNorm ( void *bicgstab_vdata,
+                                                       HYPRE_Real *relative_residual_norm );
+HYPRE_Int hypre_BiCGSTABGetResidual ( void *bicgstab_vdata, void **residual );
+
+/* cgnr.c */
+void *hypre_CGNRCreate ( hypre_CGNRFunctions *cgnr_functions );
+HYPRE_Int hypre_CGNRDestroy ( void *cgnr_vdata );
+HYPRE_Int hypre_CGNRSetup ( void *cgnr_vdata, void *A, void *b, void *x );
+HYPRE_Int hypre_CGNRSolve ( void *cgnr_vdata, void *A, void *b, void *x );
+HYPRE_Int hypre_CGNRSetTol ( void *cgnr_vdata, HYPRE_Real tol );
+HYPRE_Int hypre_CGNRSetMinIter ( void *cgnr_vdata, HYPRE_Int min_iter );
+HYPRE_Int hypre_CGNRSetMaxIter ( void *cgnr_vdata, HYPRE_Int max_iter );
+HYPRE_Int hypre_CGNRSetStopCrit ( void *cgnr_vdata, HYPRE_Int stop_crit );
+HYPRE_Int hypre_CGNRSetPrecond ( void *cgnr_vdata, HYPRE_Int (*precond )(void*, void*, void*,
+                                                                         void*),
+                                 HYPRE_Int (*precondT )(void*, void*, void*, void*), HYPRE_Int (*precond_setup )(void*, void*, void*,
+                                       void*), void *precond_data );
+HYPRE_Int hypre_CGNRGetPrecond ( void *cgnr_vdata, HYPRE_Solver *precond_data_ptr );
+HYPRE_Int hypre_CGNRSetLogging ( void *cgnr_vdata, HYPRE_Int logging );
+HYPRE_Int hypre_CGNRGetNumIterations ( void *cgnr_vdata, HYPRE_Int *num_iterations );
+HYPRE_Int hypre_CGNRGetFinalRelativeResidualNorm ( void *cgnr_vdata,
+                                                   HYPRE_Real *relative_residual_norm );
+
+/* gmres.c */
+void *hypre_GMRESCreate ( hypre_GMRESFunctions *gmres_functions );
+HYPRE_Int hypre_GMRESDestroy ( void *gmres_vdata );
+HYPRE_Int hypre_GMRESGetResidual ( void *gmres_vdata, void **residual );
+HYPRE_Int hypre_GMRESSetup ( void *gmres_vdata, void *A, void *b, void *x );
+HYPRE_Int hypre_GMRESSolve ( void *gmres_vdata, void *A, void *b, void *x );
+HYPRE_Int hypre_GMRESSetKDim ( void *gmres_vdata, HYPRE_Int k_dim );
+HYPRE_Int hypre_GMRESGetKDim ( void *gmres_vdata, HYPRE_Int *k_dim );
+HYPRE_Int hypre_GMRESSetTol ( void *gmres_vdata, HYPRE_Real tol );
+HYPRE_Int hypre_GMRESGetTol ( void *gmres_vdata, HYPRE_Real *tol );
+HYPRE_Int hypre_GMRESSetAbsoluteTol ( void *gmres_vdata, HYPRE_Real a_tol );
+HYPRE_Int hypre_GMRESGetAbsoluteTol ( void *gmres_vdata, HYPRE_Real *a_tol );
+HYPRE_Int hypre_GMRESSetConvergenceFactorTol ( void *gmres_vdata, HYPRE_Real cf_tol );
+HYPRE_Int hypre_GMRESGetConvergenceFactorTol ( void *gmres_vdata, HYPRE_Real *cf_tol );
+HYPRE_Int hypre_GMRESSetMinIter ( void *gmres_vdata, HYPRE_Int min_iter );
+HYPRE_Int hypre_GMRESGetMinIter ( void *gmres_vdata, HYPRE_Int *min_iter );
+HYPRE_Int hypre_GMRESSetMaxIter ( void *gmres_vdata, HYPRE_Int max_iter );
+HYPRE_Int hypre_GMRESGetMaxIter ( void *gmres_vdata, HYPRE_Int *max_iter );
+HYPRE_Int hypre_GMRESSetRelChange ( void *gmres_vdata, HYPRE_Int rel_change );
+HYPRE_Int hypre_GMRESGetRelChange ( void *gmres_vdata, HYPRE_Int *rel_change );
+HYPRE_Int hypre_GMRESSetSkipRealResidualCheck ( void *gmres_vdata, HYPRE_Int skip_real_r_check );
+HYPRE_Int hypre_GMRESGetSkipRealResidualCheck ( void *gmres_vdata, HYPRE_Int *skip_real_r_check );
+HYPRE_Int hypre_GMRESSetStopCrit ( void *gmres_vdata, HYPRE_Int stop_crit );
+HYPRE_Int hypre_GMRESGetStopCrit ( void *gmres_vdata, HYPRE_Int *stop_crit );
+HYPRE_Int hypre_GMRESSetPrecond ( void *gmres_vdata, HYPRE_Int (*precond )(void*, void*, void*,
+                                                                           void*),
+                                  HYPRE_Int (*precond_setup )(void*, void*, void*, void*), void *precond_data );
+HYPRE_Int hypre_GMRESGetPrecond ( void *gmres_vdata, HYPRE_Solver *precond_data_ptr );
+HYPRE_Int hypre_GMRESSetPrintLevel ( void *gmres_vdata, HYPRE_Int level );
+HYPRE_Int hypre_GMRESGetPrintLevel ( void *gmres_vdata, HYPRE_Int *level );
+HYPRE_Int hypre_GMRESSetLogging ( void *gmres_vdata, HYPRE_Int level );
+HYPRE_Int hypre_GMRESGetLogging ( void *gmres_vdata, HYPRE_Int *level );
+HYPRE_Int hypre_GMRESSetHybrid ( void *gmres_vdata, HYPRE_Int level );
+HYPRE_Int hypre_GMRESGetNumIterations ( void *gmres_vdata, HYPRE_Int *num_iterations );
+HYPRE_Int hypre_GMRESGetConverged ( void *gmres_vdata, HYPRE_Int *converged );
+HYPRE_Int hypre_GMRESGetFinalRelativeResidualNorm ( void *gmres_vdata,
+                                                    HYPRE_Real *relative_residual_norm );
+
+/* cogmres.c */
+void *hypre_COGMRESCreate ( hypre_COGMRESFunctions *gmres_functions );
+HYPRE_Int hypre_COGMRESDestroy ( void *gmres_vdata );
+HYPRE_Int hypre_COGMRESGetResidual ( void *gmres_vdata, void **residual );
+HYPRE_Int hypre_COGMRESSetup ( void *gmres_vdata, void *A, void *b, void *x );
+HYPRE_Int hypre_COGMRESSolve ( void *gmres_vdata, void *A, void *b, void *x );
+HYPRE_Int hypre_COGMRESSetKDim ( void *gmres_vdata, HYPRE_Int k_dim );
+HYPRE_Int hypre_COGMRESGetKDim ( void *gmres_vdata, HYPRE_Int *k_dim );
+HYPRE_Int hypre_COGMRESSetUnroll ( void *gmres_vdata, HYPRE_Int unroll );
+HYPRE_Int hypre_COGMRESGetUnroll ( void *gmres_vdata, HYPRE_Int *unroll );
+HYPRE_Int hypre_COGMRESSetCGS ( void *gmres_vdata, HYPRE_Int cgs );
+HYPRE_Int hypre_COGMRESGetCGS ( void *gmres_vdata, HYPRE_Int *cgs );
+HYPRE_Int hypre_COGMRESSetTol ( void *gmres_vdata, HYPRE_Real tol );
+HYPRE_Int hypre_COGMRESGetTol ( void *gmres_vdata, HYPRE_Real *tol );
+HYPRE_Int hypre_COGMRESSetAbsoluteTol ( void *gmres_vdata, HYPRE_Real a_tol );
+HYPRE_Int hypre_COGMRESGetAbsoluteTol ( void *gmres_vdata, HYPRE_Real *a_tol );
+HYPRE_Int hypre_COGMRESSetConvergenceFactorTol ( void *gmres_vdata, HYPRE_Real cf_tol );
+HYPRE_Int hypre_COGMRESGetConvergenceFactorTol ( void *gmres_vdata, HYPRE_Real *cf_tol );
+HYPRE_Int hypre_COGMRESSetMinIter ( void *gmres_vdata, HYPRE_Int min_iter );
+HYPRE_Int hypre_COGMRESGetMinIter ( void *gmres_vdata, HYPRE_Int *min_iter );
+HYPRE_Int hypre_COGMRESSetMaxIter ( void *gmres_vdata, HYPRE_Int max_iter );
+HYPRE_Int hypre_COGMRESGetMaxIter ( void *gmres_vdata, HYPRE_Int *max_iter );
+HYPRE_Int hypre_COGMRESSetRelChange ( void *gmres_vdata, HYPRE_Int rel_change );
+HYPRE_Int hypre_COGMRESGetRelChange ( void *gmres_vdata, HYPRE_Int *rel_change );
+HYPRE_Int hypre_COGMRESSetSkipRealResidualCheck ( void *gmres_vdata, HYPRE_Int skip_real_r_check );
+HYPRE_Int hypre_COGMRESGetSkipRealResidualCheck ( void *gmres_vdata, HYPRE_Int *skip_real_r_check );
+HYPRE_Int hypre_COGMRESSetPrecond ( void *gmres_vdata, HYPRE_Int (*precond )(void*, void*, void*,
+                                                                             void*), HYPRE_Int (*precond_setup )(void*, void*, void*, void*), void *precond_data );
+HYPRE_Int hypre_COGMRESGetPrecond ( void *gmres_vdata, HYPRE_Solver *precond_data_ptr );
+HYPRE_Int hypre_COGMRESSetPrintLevel ( void *gmres_vdata, HYPRE_Int level );
+HYPRE_Int hypre_COGMRESGetPrintLevel ( void *gmres_vdata, HYPRE_Int *level );
+HYPRE_Int hypre_COGMRESSetLogging ( void *gmres_vdata, HYPRE_Int level );
+HYPRE_Int hypre_COGMRESGetLogging ( void *gmres_vdata, HYPRE_Int *level );
+HYPRE_Int hypre_COGMRESGetNumIterations ( void *gmres_vdata, HYPRE_Int *num_iterations );
+HYPRE_Int hypre_COGMRESGetConverged ( void *gmres_vdata, HYPRE_Int *converged );
+HYPRE_Int hypre_COGMRESGetFinalRelativeResidualNorm ( void *gmres_vdata,
+                                                      HYPRE_Real *relative_residual_norm );
+HYPRE_Int hypre_COGMRESSetModifyPC ( void *fgmres_vdata, HYPRE_Int (*modify_pc )(void *precond_data,
+                                                                                 HYPRE_Int iteration, HYPRE_Real rel_residual_norm));
+
+
+
+/* flexgmres.c */
+void *hypre_FlexGMRESCreate ( hypre_FlexGMRESFunctions *fgmres_functions );
+HYPRE_Int hypre_FlexGMRESDestroy ( void *fgmres_vdata );
+HYPRE_Int hypre_FlexGMRESGetResidual ( void *fgmres_vdata, void **residual );
+HYPRE_Int hypre_FlexGMRESSetup ( void *fgmres_vdata, void *A, void *b, void *x );
+HYPRE_Int hypre_FlexGMRESSolve ( void *fgmres_vdata, void *A, void *b, void *x );
+HYPRE_Int hypre_FlexGMRESSetKDim ( void *fgmres_vdata, HYPRE_Int k_dim );
+HYPRE_Int hypre_FlexGMRESGetKDim ( void *fgmres_vdata, HYPRE_Int *k_dim );
+HYPRE_Int hypre_FlexGMRESSetTol ( void *fgmres_vdata, HYPRE_Real tol );
+HYPRE_Int hypre_FlexGMRESGetTol ( void *fgmres_vdata, HYPRE_Real *tol );
+HYPRE_Int hypre_FlexGMRESSetAbsoluteTol ( void *fgmres_vdata, HYPRE_Real a_tol );
+HYPRE_Int hypre_FlexGMRESGetAbsoluteTol ( void *fgmres_vdata, HYPRE_Real *a_tol );
+HYPRE_Int hypre_FlexGMRESSetConvergenceFactorTol ( void *fgmres_vdata, HYPRE_Real cf_tol );
+HYPRE_Int hypre_FlexGMRESGetConvergenceFactorTol ( void *fgmres_vdata, HYPRE_Real *cf_tol );
+HYPRE_Int hypre_FlexGMRESSetMinIter ( void *fgmres_vdata, HYPRE_Int min_iter );
+HYPRE_Int hypre_FlexGMRESGetMinIter ( void *fgmres_vdata, HYPRE_Int *min_iter );
+HYPRE_Int hypre_FlexGMRESSetMaxIter ( void *fgmres_vdata, HYPRE_Int max_iter );
+HYPRE_Int hypre_FlexGMRESGetMaxIter ( void *fgmres_vdata, HYPRE_Int *max_iter );
+HYPRE_Int hypre_FlexGMRESSetStopCrit ( void *fgmres_vdata, HYPRE_Int stop_crit );
+HYPRE_Int hypre_FlexGMRESGetStopCrit ( void *fgmres_vdata, HYPRE_Int *stop_crit );
+HYPRE_Int hypre_FlexGMRESSetPrecond ( void *fgmres_vdata, HYPRE_Int (*precond )(void*, void*, void*,
+                                                                                void*), HYPRE_Int (*precond_setup )(void*, void*, void*, void*), void *precond_data );
+HYPRE_Int hypre_FlexGMRESGetPrecond ( void *fgmres_vdata, HYPRE_Solver *precond_data_ptr );
+HYPRE_Int hypre_FlexGMRESSetPrintLevel ( void *fgmres_vdata, HYPRE_Int level );
+HYPRE_Int hypre_FlexGMRESGetPrintLevel ( void *fgmres_vdata, HYPRE_Int *level );
+HYPRE_Int hypre_FlexGMRESSetLogging ( void *fgmres_vdata, HYPRE_Int level );
+HYPRE_Int hypre_FlexGMRESGetLogging ( void *fgmres_vdata, HYPRE_Int *level );
+HYPRE_Int hypre_FlexGMRESGetNumIterations ( void *fgmres_vdata, HYPRE_Int *num_iterations );
+HYPRE_Int hypre_FlexGMRESGetConverged ( void *fgmres_vdata, HYPRE_Int *converged );
+HYPRE_Int hypre_FlexGMRESGetFinalRelativeResidualNorm ( void *fgmres_vdata,
+                                                        HYPRE_Real *relative_residual_norm );
+HYPRE_Int hypre_FlexGMRESSetModifyPC ( void *fgmres_vdata,
+                                       HYPRE_Int (*modify_pc )(void *precond_data, HYPRE_Int iteration, HYPRE_Real rel_residual_norm));
+HYPRE_Int hypre_FlexGMRESModifyPCDefault ( void *precond_data, HYPRE_Int iteration,
+                                           HYPRE_Real rel_residual_norm );
+
+/* lgmres.c */
+void *hypre_LGMRESCreate ( hypre_LGMRESFunctions *lgmres_functions );
+HYPRE_Int hypre_LGMRESDestroy ( void *lgmres_vdata );
+HYPRE_Int hypre_LGMRESGetResidual ( void *lgmres_vdata, void **residual );
+HYPRE_Int hypre_LGMRESSetup ( void *lgmres_vdata, void *A, void *b, void *x );
+HYPRE_Int hypre_LGMRESSolve ( void *lgmres_vdata, void *A, void *b, void *x );
+HYPRE_Int hypre_LGMRESSetKDim ( void *lgmres_vdata, HYPRE_Int k_dim );
+HYPRE_Int hypre_LGMRESGetKDim ( void *lgmres_vdata, HYPRE_Int *k_dim );
+HYPRE_Int hypre_LGMRESSetAugDim ( void *lgmres_vdata, HYPRE_Int aug_dim );
+HYPRE_Int hypre_LGMRESGetAugDim ( void *lgmres_vdata, HYPRE_Int *aug_dim );
+HYPRE_Int hypre_LGMRESSetTol ( void *lgmres_vdata, HYPRE_Real tol );
+HYPRE_Int hypre_LGMRESGetTol ( void *lgmres_vdata, HYPRE_Real *tol );
+HYPRE_Int hypre_LGMRESSetAbsoluteTol ( void *lgmres_vdata, HYPRE_Real a_tol );
+HYPRE_Int hypre_LGMRESGetAbsoluteTol ( void *lgmres_vdata, HYPRE_Real *a_tol );
+HYPRE_Int hypre_LGMRESSetConvergenceFactorTol ( void *lgmres_vdata, HYPRE_Real cf_tol );
+HYPRE_Int hypre_LGMRESGetConvergenceFactorTol ( void *lgmres_vdata, HYPRE_Real *cf_tol );
+HYPRE_Int hypre_LGMRESSetMinIter ( void *lgmres_vdata, HYPRE_Int min_iter );
+HYPRE_Int hypre_LGMRESGetMinIter ( void *lgmres_vdata, HYPRE_Int *min_iter );
+HYPRE_Int hypre_LGMRESSetMaxIter ( void *lgmres_vdata, HYPRE_Int max_iter );
+HYPRE_Int hypre_LGMRESGetMaxIter ( void *lgmres_vdata, HYPRE_Int *max_iter );
+HYPRE_Int hypre_LGMRESSetStopCrit ( void *lgmres_vdata, HYPRE_Int stop_crit );
+HYPRE_Int hypre_LGMRESGetStopCrit ( void *lgmres_vdata, HYPRE_Int *stop_crit );
+HYPRE_Int hypre_LGMRESSetPrecond ( void *lgmres_vdata, HYPRE_Int (*precond )(void*, void*, void*,
+                                                                             void*), HYPRE_Int (*precond_setup )(void*, void*, void*, void*), void *precond_data );
+HYPRE_Int hypre_LGMRESGetPrecond ( void *lgmres_vdata, HYPRE_Solver *precond_data_ptr );
+HYPRE_Int hypre_LGMRESSetPrintLevel ( void *lgmres_vdata, HYPRE_Int level );
+HYPRE_Int hypre_LGMRESGetPrintLevel ( void *lgmres_vdata, HYPRE_Int *level );
+HYPRE_Int hypre_LGMRESSetLogging ( void *lgmres_vdata, HYPRE_Int level );
+HYPRE_Int hypre_LGMRESGetLogging ( void *lgmres_vdata, HYPRE_Int *level );
+HYPRE_Int hypre_LGMRESGetNumIterations ( void *lgmres_vdata, HYPRE_Int *num_iterations );
+HYPRE_Int hypre_LGMRESGetConverged ( void *lgmres_vdata, HYPRE_Int *converged );
+HYPRE_Int hypre_LGMRESGetFinalRelativeResidualNorm ( void *lgmres_vdata,
+                                                     HYPRE_Real *relative_residual_norm );
+
+/* HYPRE_bicgstab.c */
+HYPRE_Int HYPRE_BiCGSTABDestroy ( HYPRE_Solver solver );
+HYPRE_Int HYPRE_BiCGSTABSetup ( HYPRE_Solver solver, HYPRE_Matrix A, HYPRE_Vector b,
+                                HYPRE_Vector x );
+HYPRE_Int HYPRE_BiCGSTABSolve ( HYPRE_Solver solver, HYPRE_Matrix A, HYPRE_Vector b,
+                                HYPRE_Vector x );
+HYPRE_Int HYPRE_BiCGSTABSetTol ( HYPRE_Solver solver, HYPRE_Real tol );
+HYPRE_Int HYPRE_BiCGSTABSetAbsoluteTol ( HYPRE_Solver solver, HYPRE_Real a_tol );
+HYPRE_Int HYPRE_BiCGSTABSetConvergenceFactorTol ( HYPRE_Solver solver, HYPRE_Real cf_tol );
+HYPRE_Int HYPRE_BiCGSTABSetMinIter ( HYPRE_Solver solver, HYPRE_Int min_iter );
+HYPRE_Int HYPRE_BiCGSTABSetMaxIter ( HYPRE_Solver solver, HYPRE_Int max_iter );
+HYPRE_Int HYPRE_BiCGSTABSetStopCrit ( HYPRE_Solver solver, HYPRE_Int stop_crit );
+HYPRE_Int HYPRE_BiCGSTABSetPrecond ( HYPRE_Solver solver, HYPRE_PtrToSolverFcn precond,
+                                     HYPRE_PtrToSolverFcn precond_setup, HYPRE_Solver precond_solver );
+HYPRE_Int HYPRE_BiCGSTABGetPrecond ( HYPRE_Solver solver, HYPRE_Solver *precond_data_ptr );
+HYPRE_Int HYPRE_BiCGSTABSetLogging ( HYPRE_Solver solver, HYPRE_Int logging );
+HYPRE_Int HYPRE_BiCGSTABSetPrintLevel ( HYPRE_Solver solver, HYPRE_Int print_level );
+HYPRE_Int HYPRE_BiCGSTABGetNumIterations ( HYPRE_Solver solver, HYPRE_Int *num_iterations );
+HYPRE_Int HYPRE_BiCGSTABGetFinalRelativeResidualNorm ( HYPRE_Solver solver, HYPRE_Real *norm );
+HYPRE_Int HYPRE_BiCGSTABGetResidual ( HYPRE_Solver solver, void *residual );
+
+/* HYPRE_cgnr.c */
+HYPRE_Int HYPRE_CGNRDestroy ( HYPRE_Solver solver );
+HYPRE_Int HYPRE_CGNRSetup ( HYPRE_Solver solver, HYPRE_Matrix A, HYPRE_Vector b, HYPRE_Vector x );
+HYPRE_Int HYPRE_CGNRSolve ( HYPRE_Solver solver, HYPRE_Matrix A, HYPRE_Vector b, HYPRE_Vector x );
+HYPRE_Int HYPRE_CGNRSetTol ( HYPRE_Solver solver, HYPRE_Real tol );
+HYPRE_Int HYPRE_CGNRSetMinIter ( HYPRE_Solver solver, HYPRE_Int min_iter );
+HYPRE_Int HYPRE_CGNRSetMaxIter ( HYPRE_Solver solver, HYPRE_Int max_iter );
+HYPRE_Int HYPRE_CGNRSetStopCrit ( HYPRE_Solver solver, HYPRE_Int stop_crit );
+HYPRE_Int HYPRE_CGNRSetPrecond ( HYPRE_Solver solver, HYPRE_PtrToSolverFcn precond,
+                                 HYPRE_PtrToSolverFcn precondT, HYPRE_PtrToSolverFcn precond_setup, HYPRE_Solver precond_solver );
+HYPRE_Int HYPRE_CGNRGetPrecond ( HYPRE_Solver solver, HYPRE_Solver *precond_data_ptr );
+HYPRE_Int HYPRE_CGNRSetLogging ( HYPRE_Solver solver, HYPRE_Int logging );
+HYPRE_Int HYPRE_CGNRGetNumIterations ( HYPRE_Solver solver, HYPRE_Int *num_iterations );
+HYPRE_Int HYPRE_CGNRGetFinalRelativeResidualNorm ( HYPRE_Solver solver, HYPRE_Real *norm );
+
+/* HYPRE_gmres.c */
+HYPRE_Int HYPRE_GMRESSetup ( HYPRE_Solver solver, HYPRE_Matrix A, HYPRE_Vector b, HYPRE_Vector x );
+HYPRE_Int HYPRE_GMRESSolve ( HYPRE_Solver solver, HYPRE_Matrix A, HYPRE_Vector b, HYPRE_Vector x );
+HYPRE_Int HYPRE_GMRESSetKDim ( HYPRE_Solver solver, HYPRE_Int k_dim );
+HYPRE_Int HYPRE_GMRESGetKDim ( HYPRE_Solver solver, HYPRE_Int *k_dim );
+HYPRE_Int HYPRE_GMRESSetTol ( HYPRE_Solver solver, HYPRE_Real tol );
+HYPRE_Int HYPRE_GMRESGetTol ( HYPRE_Solver solver, HYPRE_Real *tol );
+HYPRE_Int HYPRE_GMRESSetAbsoluteTol ( HYPRE_Solver solver, HYPRE_Real a_tol );
+HYPRE_Int HYPRE_GMRESGetAbsoluteTol ( HYPRE_Solver solver, HYPRE_Real *a_tol );
+HYPRE_Int HYPRE_GMRESSetConvergenceFactorTol ( HYPRE_Solver solver, HYPRE_Real cf_tol );
+HYPRE_Int HYPRE_GMRESGetConvergenceFactorTol ( HYPRE_Solver solver, HYPRE_Real *cf_tol );
+HYPRE_Int HYPRE_GMRESSetMinIter ( HYPRE_Solver solver, HYPRE_Int min_iter );
+HYPRE_Int HYPRE_GMRESGetMinIter ( HYPRE_Solver solver, HYPRE_Int *min_iter );
+HYPRE_Int HYPRE_GMRESSetMaxIter ( HYPRE_Solver solver, HYPRE_Int max_iter );
+HYPRE_Int HYPRE_GMRESGetMaxIter ( HYPRE_Solver solver, HYPRE_Int *max_iter );
+HYPRE_Int HYPRE_GMRESSetStopCrit ( HYPRE_Solver solver, HYPRE_Int stop_crit );
+HYPRE_Int HYPRE_GMRESGetStopCrit ( HYPRE_Solver solver, HYPRE_Int *stop_crit );
+HYPRE_Int HYPRE_GMRESSetRelChange ( HYPRE_Solver solver, HYPRE_Int rel_change );
+HYPRE_Int HYPRE_GMRESGetRelChange ( HYPRE_Solver solver, HYPRE_Int *rel_change );
+HYPRE_Int HYPRE_GMRESSetSkipRealResidualCheck ( HYPRE_Solver solver, HYPRE_Int skip_real_r_check );
+HYPRE_Int HYPRE_GMRESGetSkipRealResidualCheck ( HYPRE_Solver solver, HYPRE_Int *skip_real_r_check );
+HYPRE_Int HYPRE_GMRESSetPrecond ( HYPRE_Solver solver, HYPRE_PtrToSolverFcn precond,
+                                  HYPRE_PtrToSolverFcn precond_setup, HYPRE_Solver precond_solver );
+HYPRE_Int HYPRE_GMRESGetPrecond ( HYPRE_Solver solver, HYPRE_Solver *precond_data_ptr );
+HYPRE_Int HYPRE_GMRESSetPrintLevel ( HYPRE_Solver solver, HYPRE_Int level );
+HYPRE_Int HYPRE_GMRESGetPrintLevel ( HYPRE_Solver solver, HYPRE_Int *level );
+HYPRE_Int HYPRE_GMRESSetLogging ( HYPRE_Solver solver, HYPRE_Int level );
+HYPRE_Int HYPRE_GMRESGetLogging ( HYPRE_Solver solver, HYPRE_Int *level );
+HYPRE_Int HYPRE_GMRESGetNumIterations ( HYPRE_Solver solver, HYPRE_Int *num_iterations );
+HYPRE_Int HYPRE_GMRESGetConverged ( HYPRE_Solver solver, HYPRE_Int *converged );
+HYPRE_Int HYPRE_GMRESGetFinalRelativeResidualNorm ( HYPRE_Solver solver, HYPRE_Real *norm );
+HYPRE_Int HYPRE_GMRESGetResidual ( HYPRE_Solver solver, void *residual );
+
+/* HYPRE_cogmres.c */
+HYPRE_Int HYPRE_COGMRESSetup ( HYPRE_Solver solver, HYPRE_Matrix A, HYPRE_Vector b,
+                               HYPRE_Vector x );
+HYPRE_Int HYPRE_COGMRESSolve ( HYPRE_Solver solver, HYPRE_Matrix A, HYPRE_Vector b,
+                               HYPRE_Vector x );
+HYPRE_Int HYPRE_COGMRESSetKDim ( HYPRE_Solver solver, HYPRE_Int k_dim );
+HYPRE_Int HYPRE_COGMRESGetKDim ( HYPRE_Solver solver, HYPRE_Int *k_dim );
+HYPRE_Int HYPRE_COGMRESSetUnroll ( HYPRE_Solver solver, HYPRE_Int unroll );
+HYPRE_Int HYPRE_COGMRESGetUnroll ( HYPRE_Solver solver, HYPRE_Int *unroll );
+HYPRE_Int HYPRE_COGMRESSetCGS ( HYPRE_Solver solver, HYPRE_Int cgs );
+HYPRE_Int HYPRE_COGMRESGetCGS ( HYPRE_Solver solver, HYPRE_Int *cgs );
+HYPRE_Int HYPRE_COGMRESSetTol ( HYPRE_Solver solver, HYPRE_Real tol );
+HYPRE_Int HYPRE_COGMRESGetTol ( HYPRE_Solver solver, HYPRE_Real *tol );
+HYPRE_Int HYPRE_COGMRESSetAbsoluteTol ( HYPRE_Solver solver, HYPRE_Real a_tol );
+HYPRE_Int HYPRE_COGMRESGetAbsoluteTol ( HYPRE_Solver solver, HYPRE_Real *a_tol );
+HYPRE_Int HYPRE_COGMRESSetConvergenceFactorTol ( HYPRE_Solver solver, HYPRE_Real cf_tol );
+HYPRE_Int HYPRE_COGMRESGetConvergenceFactorTol ( HYPRE_Solver solver, HYPRE_Real *cf_tol );
+HYPRE_Int HYPRE_COGMRESSetMinIter ( HYPRE_Solver solver, HYPRE_Int min_iter );
+HYPRE_Int HYPRE_COGMRESGetMinIter ( HYPRE_Solver solver, HYPRE_Int *min_iter );
+HYPRE_Int HYPRE_COGMRESSetMaxIter ( HYPRE_Solver solver, HYPRE_Int max_iter );
+HYPRE_Int HYPRE_COGMRESGetMaxIter ( HYPRE_Solver solver, HYPRE_Int *max_iter );
+HYPRE_Int HYPRE_COGMRESSetRelChange ( HYPRE_Solver solver, HYPRE_Int rel_change );
+HYPRE_Int HYPRE_COGMRESGetRelChange ( HYPRE_Solver solver, HYPRE_Int *rel_change );
+HYPRE_Int HYPRE_COGMRESSetSkipRealResidualCheck ( HYPRE_Solver solver,
+                                                  HYPRE_Int skip_real_r_check );
+HYPRE_Int HYPRE_COGMRESGetSkipRealResidualCheck ( HYPRE_Solver solver,
+                                                  HYPRE_Int *skip_real_r_check );
+HYPRE_Int HYPRE_COGMRESSetPrecond ( HYPRE_Solver solver, HYPRE_PtrToSolverFcn precond,
+                                    HYPRE_PtrToSolverFcn precond_setup, HYPRE_Solver precond_solver );
+HYPRE_Int HYPRE_COGMRESGetPrecond ( HYPRE_Solver solver, HYPRE_Solver *precond_data_ptr );
+HYPRE_Int HYPRE_COGMRESSetPrintLevel ( HYPRE_Solver solver, HYPRE_Int level );
+HYPRE_Int HYPRE_COGMRESGetPrintLevel ( HYPRE_Solver solver, HYPRE_Int *level );
+HYPRE_Int HYPRE_COGMRESSetLogging ( HYPRE_Solver solver, HYPRE_Int level );
+HYPRE_Int HYPRE_COGMRESGetLogging ( HYPRE_Solver solver, HYPRE_Int *level );
+HYPRE_Int HYPRE_COGMRESGetNumIterations ( HYPRE_Solver solver, HYPRE_Int *num_iterations );
+HYPRE_Int HYPRE_COGMRESGetConverged ( HYPRE_Solver solver, HYPRE_Int *converged );
+HYPRE_Int HYPRE_COGMRESGetFinalRelativeResidualNorm ( HYPRE_Solver solver, HYPRE_Real *norm );
+HYPRE_Int HYPRE_COGMRESGetResidual ( HYPRE_Solver solver, void *residual );
+
+/* HYPRE_flexgmres.c */
+HYPRE_Int HYPRE_FlexGMRESSetup ( HYPRE_Solver solver, HYPRE_Matrix A, HYPRE_Vector b,
+                                 HYPRE_Vector x );
+HYPRE_Int HYPRE_FlexGMRESSolve ( HYPRE_Solver solver, HYPRE_Matrix A, HYPRE_Vector b,
+                                 HYPRE_Vector x );
+HYPRE_Int HYPRE_FlexGMRESSetKDim ( HYPRE_Solver solver, HYPRE_Int k_dim );
+HYPRE_Int HYPRE_FlexGMRESGetKDim ( HYPRE_Solver solver, HYPRE_Int *k_dim );
+HYPRE_Int HYPRE_FlexGMRESSetTol ( HYPRE_Solver solver, HYPRE_Real tol );
+HYPRE_Int HYPRE_FlexGMRESGetTol ( HYPRE_Solver solver, HYPRE_Real *tol );
+HYPRE_Int HYPRE_FlexGMRESSetAbsoluteTol ( HYPRE_Solver solver, HYPRE_Real a_tol );
+HYPRE_Int HYPRE_FlexGMRESGetAbsoluteTol ( HYPRE_Solver solver, HYPRE_Real *a_tol );
+HYPRE_Int HYPRE_FlexGMRESSetConvergenceFactorTol ( HYPRE_Solver solver, HYPRE_Real cf_tol );
+HYPRE_Int HYPRE_FlexGMRESGetConvergenceFactorTol ( HYPRE_Solver solver, HYPRE_Real *cf_tol );
+HYPRE_Int HYPRE_FlexGMRESSetMinIter ( HYPRE_Solver solver, HYPRE_Int min_iter );
+HYPRE_Int HYPRE_FlexGMRESGetMinIter ( HYPRE_Solver solver, HYPRE_Int *min_iter );
+HYPRE_Int HYPRE_FlexGMRESSetMaxIter ( HYPRE_Solver solver, HYPRE_Int max_iter );
+HYPRE_Int HYPRE_FlexGMRESGetMaxIter ( HYPRE_Solver solver, HYPRE_Int *max_iter );
+HYPRE_Int HYPRE_FlexGMRESSetPrecond ( HYPRE_Solver solver, HYPRE_PtrToSolverFcn precond,
+                                      HYPRE_PtrToSolverFcn precond_setup, HYPRE_Solver precond_solver );
+HYPRE_Int HYPRE_FlexGMRESGetPrecond ( HYPRE_Solver solver, HYPRE_Solver *precond_data_ptr );
+HYPRE_Int HYPRE_FlexGMRESSetPrintLevel ( HYPRE_Solver solver, HYPRE_Int level );
+HYPRE_Int HYPRE_FlexGMRESGetPrintLevel ( HYPRE_Solver solver, HYPRE_Int *level );
+HYPRE_Int HYPRE_FlexGMRESSetLogging ( HYPRE_Solver solver, HYPRE_Int level );
+HYPRE_Int HYPRE_FlexGMRESGetLogging ( HYPRE_Solver solver, HYPRE_Int *level );
+HYPRE_Int HYPRE_FlexGMRESGetNumIterations ( HYPRE_Solver solver, HYPRE_Int *num_iterations );
+HYPRE_Int HYPRE_FlexGMRESGetConverged ( HYPRE_Solver solver, HYPRE_Int *converged );
+HYPRE_Int HYPRE_FlexGMRESGetFinalRelativeResidualNorm ( HYPRE_Solver solver, HYPRE_Real *norm );
+HYPRE_Int HYPRE_FlexGMRESGetResidual ( HYPRE_Solver solver, void *residual );
+HYPRE_Int HYPRE_FlexGMRESSetModifyPC ( HYPRE_Solver solver, HYPRE_Int (*modify_pc )(HYPRE_Solver,
+                                                                                    HYPRE_Int, HYPRE_Real ));
+
+/* HYPRE_lgmres.c */
+HYPRE_Int HYPRE_LGMRESSetup ( HYPRE_Solver solver, HYPRE_Matrix A, HYPRE_Vector b, HYPRE_Vector x );
+HYPRE_Int HYPRE_LGMRESSolve ( HYPRE_Solver solver, HYPRE_Matrix A, HYPRE_Vector b, HYPRE_Vector x );
+HYPRE_Int HYPRE_LGMRESSetKDim ( HYPRE_Solver solver, HYPRE_Int k_dim );
+HYPRE_Int HYPRE_LGMRESGetKDim ( HYPRE_Solver solver, HYPRE_Int *k_dim );
+HYPRE_Int HYPRE_LGMRESSetAugDim ( HYPRE_Solver solver, HYPRE_Int aug_dim );
+HYPRE_Int HYPRE_LGMRESGetAugDim ( HYPRE_Solver solver, HYPRE_Int *aug_dim );
+HYPRE_Int HYPRE_LGMRESSetTol ( HYPRE_Solver solver, HYPRE_Real tol );
+HYPRE_Int HYPRE_LGMRESGetTol ( HYPRE_Solver solver, HYPRE_Real *tol );
+HYPRE_Int HYPRE_LGMRESSetAbsoluteTol ( HYPRE_Solver solver, HYPRE_Real a_tol );
+HYPRE_Int HYPRE_LGMRESGetAbsoluteTol ( HYPRE_Solver solver, HYPRE_Real *a_tol );
+HYPRE_Int HYPRE_LGMRESSetConvergenceFactorTol ( HYPRE_Solver solver, HYPRE_Real cf_tol );
+HYPRE_Int HYPRE_LGMRESGetConvergenceFactorTol ( HYPRE_Solver solver, HYPRE_Real *cf_tol );
+HYPRE_Int HYPRE_LGMRESSetMinIter ( HYPRE_Solver solver, HYPRE_Int min_iter );
+HYPRE_Int HYPRE_LGMRESGetMinIter ( HYPRE_Solver solver, HYPRE_Int *min_iter );
+HYPRE_Int HYPRE_LGMRESSetMaxIter ( HYPRE_Solver solver, HYPRE_Int max_iter );
+HYPRE_Int HYPRE_LGMRESGetMaxIter ( HYPRE_Solver solver, HYPRE_Int *max_iter );
+HYPRE_Int HYPRE_LGMRESSetPrecond ( HYPRE_Solver solver, HYPRE_PtrToSolverFcn precond,
+                                   HYPRE_PtrToSolverFcn precond_setup, HYPRE_Solver precond_solver );
+HYPRE_Int HYPRE_LGMRESGetPrecond ( HYPRE_Solver solver, HYPRE_Solver *precond_data_ptr );
+HYPRE_Int HYPRE_LGMRESSetPrintLevel ( HYPRE_Solver solver, HYPRE_Int level );
+HYPRE_Int HYPRE_LGMRESGetPrintLevel ( HYPRE_Solver solver, HYPRE_Int *level );
+HYPRE_Int HYPRE_LGMRESSetLogging ( HYPRE_Solver solver, HYPRE_Int level );
+HYPRE_Int HYPRE_LGMRESGetLogging ( HYPRE_Solver solver, HYPRE_Int *level );
+HYPRE_Int HYPRE_LGMRESGetNumIterations ( HYPRE_Solver solver, HYPRE_Int *num_iterations );
+HYPRE_Int HYPRE_LGMRESGetConverged ( HYPRE_Solver solver, HYPRE_Int *converged );
+HYPRE_Int HYPRE_LGMRESGetFinalRelativeResidualNorm ( HYPRE_Solver solver, HYPRE_Real *norm );
+HYPRE_Int HYPRE_LGMRESGetResidual ( HYPRE_Solver solver, void *residual );
+
+/* HYPRE_pcg.c */
+HYPRE_Int HYPRE_PCGSetup ( HYPRE_Solver solver, HYPRE_Matrix A, HYPRE_Vector b, HYPRE_Vector x );
+HYPRE_Int HYPRE_PCGSolve ( HYPRE_Solver solver, HYPRE_Matrix A, HYPRE_Vector b, HYPRE_Vector x );
+HYPRE_Int HYPRE_PCGSetTol ( HYPRE_Solver solver, HYPRE_Real tol );
+HYPRE_Int HYPRE_PCGGetTol ( HYPRE_Solver solver, HYPRE_Real *tol );
+HYPRE_Int HYPRE_PCGSetAbsoluteTol ( HYPRE_Solver solver, HYPRE_Real a_tol );
+HYPRE_Int HYPRE_PCGGetAbsoluteTol ( HYPRE_Solver solver, HYPRE_Real *a_tol );
+HYPRE_Int HYPRE_PCGSetAbsoluteTolFactor ( HYPRE_Solver solver, HYPRE_Real abstolf );
+HYPRE_Int HYPRE_PCGGetAbsoluteTolFactor ( HYPRE_Solver solver, HYPRE_Real *abstolf );
+HYPRE_Int HYPRE_PCGSetResidualTol ( HYPRE_Solver solver, HYPRE_Real rtol );
+HYPRE_Int HYPRE_PCGGetResidualTol ( HYPRE_Solver solver, HYPRE_Real *rtol );
+HYPRE_Int HYPRE_PCGSetConvergenceFactorTol ( HYPRE_Solver solver, HYPRE_Real cf_tol );
+HYPRE_Int HYPRE_PCGGetConvergenceFactorTol ( HYPRE_Solver solver, HYPRE_Real *cf_tol );
+HYPRE_Int HYPRE_PCGSetMaxIter ( HYPRE_Solver solver, HYPRE_Int max_iter );
+HYPRE_Int HYPRE_PCGGetMaxIter ( HYPRE_Solver solver, HYPRE_Int *max_iter );
+HYPRE_Int HYPRE_PCGSetStopCrit ( HYPRE_Solver solver, HYPRE_Int stop_crit );
+HYPRE_Int HYPRE_PCGGetStopCrit ( HYPRE_Solver solver, HYPRE_Int *stop_crit );
+HYPRE_Int HYPRE_PCGSetTwoNorm ( HYPRE_Solver solver, HYPRE_Int two_norm );
+HYPRE_Int HYPRE_PCGGetTwoNorm ( HYPRE_Solver solver, HYPRE_Int *two_norm );
+HYPRE_Int HYPRE_PCGSetRelChange ( HYPRE_Solver solver, HYPRE_Int rel_change );
+HYPRE_Int HYPRE_PCGGetRelChange ( HYPRE_Solver solver, HYPRE_Int *rel_change );
+HYPRE_Int HYPRE_PCGSetRecomputeResidual ( HYPRE_Solver solver, HYPRE_Int recompute_residual );
+HYPRE_Int HYPRE_PCGGetRecomputeResidual ( HYPRE_Solver solver, HYPRE_Int *recompute_residual );
+HYPRE_Int HYPRE_PCGSetRecomputeResidualP ( HYPRE_Solver solver, HYPRE_Int recompute_residual_p );
+HYPRE_Int HYPRE_PCGGetRecomputeResidualP ( HYPRE_Solver solver, HYPRE_Int *recompute_residual_p );
+HYPRE_Int HYPRE_PCGSetSkipBreak ( HYPRE_Solver solver, HYPRE_Int skip_break );
+HYPRE_Int HYPRE_PCGGetSkipBreak ( HYPRE_Solver solver, HYPRE_Int *skip_break );
+HYPRE_Int HYPRE_PCGSetFlex ( HYPRE_Solver solver, HYPRE_Int flex );
+HYPRE_Int HYPRE_PCGGetFlex ( HYPRE_Solver solver, HYPRE_Int *flex );
+HYPRE_Int HYPRE_PCGSetPrecond ( HYPRE_Solver solver, HYPRE_PtrToSolverFcn precond,
+                                HYPRE_PtrToSolverFcn precond_setup, HYPRE_Solver precond_solver );
+HYPRE_Int HYPRE_PCGSetPreconditioner ( HYPRE_Solver solver, HYPRE_Solver precond_solver );
+HYPRE_Int HYPRE_PCGGetPrecond ( HYPRE_Solver solver, HYPRE_Solver *precond_data_ptr );
+HYPRE_Int HYPRE_PCGSetLogging ( HYPRE_Solver solver, HYPRE_Int level );
+HYPRE_Int HYPRE_PCGGetLogging ( HYPRE_Solver solver, HYPRE_Int *level );
+HYPRE_Int HYPRE_PCGSetPrintLevel ( HYPRE_Solver solver, HYPRE_Int level );
+HYPRE_Int HYPRE_PCGGetPrintLevel ( HYPRE_Solver solver, HYPRE_Int *level );
+HYPRE_Int HYPRE_PCGGetNumIterations ( HYPRE_Solver solver, HYPRE_Int *num_iterations );
+HYPRE_Int HYPRE_PCGGetConverged ( HYPRE_Solver solver, HYPRE_Int *converged );
+HYPRE_Int HYPRE_PCGGetFinalRelativeResidualNorm ( HYPRE_Solver solver, HYPRE_Real *norm );
+HYPRE_Int HYPRE_PCGGetResidual ( HYPRE_Solver solver, void *residual );
+
+/* pcg.c */
+void *hypre_PCGCreate ( hypre_PCGFunctions *pcg_functions );
+HYPRE_Int hypre_PCGDestroy ( void *pcg_vdata );
+HYPRE_Int hypre_PCGGetResidual ( void *pcg_vdata, void **residual );
+HYPRE_Int hypre_PCGSetup ( void *pcg_vdata, void *A, void *b, void *x );
+HYPRE_Int hypre_PCGSolve ( void *pcg_vdata, void *A, void *b, void *x );
+HYPRE_Int hypre_PCGSetTol ( void *pcg_vdata, HYPRE_Real tol );
+HYPRE_Int hypre_PCGGetTol ( void *pcg_vdata, HYPRE_Real *tol );
+HYPRE_Int hypre_PCGSetAbsoluteTol ( void *pcg_vdata, HYPRE_Real a_tol );
+HYPRE_Int hypre_PCGGetAbsoluteTol ( void *pcg_vdata, HYPRE_Real *a_tol );
+HYPRE_Int hypre_PCGSetAbsoluteTolFactor ( void *pcg_vdata, HYPRE_Real atolf );
+HYPRE_Int hypre_PCGGetAbsoluteTolFactor ( void *pcg_vdata, HYPRE_Real *atolf );
+HYPRE_Int hypre_PCGSetResidualTol ( void *pcg_vdata, HYPRE_Real rtol );
+HYPRE_Int hypre_PCGGetResidualTol ( void *pcg_vdata, HYPRE_Real *rtol );
+HYPRE_Int hypre_PCGSetConvergenceFactorTol ( void *pcg_vdata, HYPRE_Real cf_tol );
+HYPRE_Int hypre_PCGGetConvergenceFactorTol ( void *pcg_vdata, HYPRE_Real *cf_tol );
+HYPRE_Int hypre_PCGSetMaxIter ( void *pcg_vdata, HYPRE_Int max_iter );
+HYPRE_Int hypre_PCGGetMaxIter ( void *pcg_vdata, HYPRE_Int *max_iter );
+HYPRE_Int hypre_PCGSetTwoNorm ( void *pcg_vdata, HYPRE_Int two_norm );
+HYPRE_Int hypre_PCGGetTwoNorm ( void *pcg_vdata, HYPRE_Int *two_norm );
+HYPRE_Int hypre_PCGSetRelChange ( void *pcg_vdata, HYPRE_Int rel_change );
+HYPRE_Int hypre_PCGGetRelChange ( void *pcg_vdata, HYPRE_Int *rel_change );
+HYPRE_Int hypre_PCGSetRecomputeResidual ( void *pcg_vdata, HYPRE_Int recompute_residual );
+HYPRE_Int hypre_PCGGetRecomputeResidual ( void *pcg_vdata, HYPRE_Int *recompute_residual );
+HYPRE_Int hypre_PCGSetRecomputeResidualP ( void *pcg_vdata, HYPRE_Int recompute_residual_p );
+HYPRE_Int hypre_PCGGetRecomputeResidualP ( void *pcg_vdata, HYPRE_Int *recompute_residual_p );
+HYPRE_Int hypre_PCGSetStopCrit ( void *pcg_vdata, HYPRE_Int stop_crit );
+HYPRE_Int hypre_PCGGetStopCrit ( void *pcg_vdata, HYPRE_Int *stop_crit );
+HYPRE_Int hypre_PCGSetSkipBreak ( void *pcg_vdata, HYPRE_Int skip_break );
+HYPRE_Int hypre_PCGGetSkipBreak ( void *pcg_vdata, HYPRE_Int *skip_break );
+HYPRE_Int hypre_PCGSetFlex ( void *pcg_vdata, HYPRE_Int flex );
+HYPRE_Int hypre_PCGGetFlex ( void *pcg_vdata, HYPRE_Int *flex );
+HYPRE_Int hypre_PCGGetPrecond ( void *pcg_vdata, HYPRE_Solver *precond_data_ptr );
+HYPRE_Int hypre_PCGSetPrecond ( void *pcg_vdata,
+                                HYPRE_Int (*precond )(void*, void*, void*, void*),
+                                HYPRE_Int (*precond_setup )(void*, void*, void*, void*),
+                                void *precond_data );
+HYPRE_Int hypre_PCGSetPreconditioner ( void *pcg_vdata, void *precond_data );
+HYPRE_Int hypre_PCGSetPrintLevel ( void *pcg_vdata, HYPRE_Int level );
+HYPRE_Int hypre_PCGGetPrintLevel ( void *pcg_vdata, HYPRE_Int *level );
+HYPRE_Int hypre_PCGSetLogging ( void *pcg_vdata, HYPRE_Int level );
+HYPRE_Int hypre_PCGGetLogging ( void *pcg_vdata, HYPRE_Int *level );
+HYPRE_Int hypre_PCGSetHybrid ( void *pcg_vdata, HYPRE_Int level );
+HYPRE_Int hypre_PCGGetNumIterations ( void *pcg_vdata, HYPRE_Int *num_iterations );
+HYPRE_Int hypre_PCGGetConverged ( void *pcg_vdata, HYPRE_Int *converged );
+HYPRE_Int hypre_PCGPrintLogging ( void *pcg_vdata, HYPRE_Int myid );
+HYPRE_Int hypre_PCGGetFinalRelativeResidualNorm ( void *pcg_vdata,
+                                                  HYPRE_Real *relative_residual_norm );
 
 #ifdef __cplusplus
-  }
+}
 #endif
 
 #endif
-
diff --git a/external/hypre/src/krylov/lgmres.c b/external/hypre/src/krylov/lgmres.c
index 7ddbf8b2..3ae5fad4 100644
--- a/external/hypre/src/krylov/lgmres.c
+++ b/external/hypre/src/krylov/lgmres.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -38,11 +38,11 @@ hypre_LGMRESFunctionsCreate(
    HYPRE_Int    (*Axpy)          ( HYPRE_Complex alpha, void *x, void *y ),
    HYPRE_Int    (*PrecondSetup)  ( void *vdata, void *A, void *b, void *x ),
    HYPRE_Int    (*Precond)       ( void *vdata, void *A, void *b, void *x )
-   )
+)
 {
    hypre_LGMRESFunctions * lgmres_functions;
    lgmres_functions = (hypre_LGMRESFunctions *)
-      CAlloc( 1, sizeof(hypre_LGMRESFunctions), HYPRE_MEMORY_HOST );
+                      CAlloc( 1, sizeof(hypre_LGMRESFunctions), HYPRE_MEMORY_HOST );
 
    lgmres_functions->CAlloc = CAlloc;
    lgmres_functions->Free = Free;
@@ -58,7 +58,7 @@ hypre_LGMRESFunctionsCreate(
    lgmres_functions->ClearVector = ClearVector;
    lgmres_functions->ScaleVector = ScaleVector;
    lgmres_functions->Axpy = Axpy;
-/* default preconditioner must be set here but can be changed later... */
+   /* default preconditioner must be set here but can be changed later... */
    lgmres_functions->precond_setup = PrecondSetup;
    lgmres_functions->precond       = Precond;
 
@@ -123,29 +123,41 @@ hypre_LGMRESDestroy( void *lgmres_vdata )
    if (lgmres_data)
    {
       hypre_LGMRESFunctions *lgmres_functions = lgmres_data->functions;
-      if ( (lgmres_data->logging>0) || (lgmres_data->print_level) > 0 )
+      if ( (lgmres_data->logging > 0) || (lgmres_data->print_level) > 0 )
       {
          if ( (lgmres_data -> norms) != NULL )
+         {
             hypre_TFreeF( lgmres_data -> norms, lgmres_functions );
+         }
       }
 
       if ( (lgmres_data -> matvec_data) != NULL )
+      {
          (*(lgmres_functions->MatvecDestroy))(lgmres_data -> matvec_data);
+      }
 
       if ( (lgmres_data -> r) != NULL )
+      {
          (*(lgmres_functions->DestroyVector))(lgmres_data -> r);
+      }
       if ( (lgmres_data -> w) != NULL )
+      {
          (*(lgmres_functions->DestroyVector))(lgmres_data -> w);
+      }
       if ( (lgmres_data -> w_2) != NULL )
+      {
          (*(lgmres_functions->DestroyVector))(lgmres_data -> w_2);
+      }
 
 
       if ( (lgmres_data -> p) != NULL )
       {
-         for (i = 0; i < (lgmres_data -> k_dim+1); i++)
+         for (i = 0; i < (lgmres_data -> k_dim + 1); i++)
          {
             if ( (lgmres_data -> p)[i] != NULL )
-	       (*(lgmres_functions->DestroyVector))( (lgmres_data -> p) [i]);
+            {
+               (*(lgmres_functions->DestroyVector))( (lgmres_data -> p) [i]);
+            }
          }
          hypre_TFreeF( lgmres_data->p, lgmres_functions );
       }
@@ -156,7 +168,9 @@ hypre_LGMRESDestroy( void *lgmres_vdata )
          for (i = 0; i < (lgmres_data -> aug_dim + 1); i++)
          {
             if ( (lgmres_data -> aug_vecs)[i] != NULL )
-	       (*(lgmres_functions->DestroyVector))( (lgmres_data -> aug_vecs) [i]);
+            {
+               (*(lgmres_functions->DestroyVector))( (lgmres_data -> aug_vecs) [i]);
+            }
          }
          hypre_TFreeF( lgmres_data->aug_vecs, lgmres_functions );
       }
@@ -165,7 +179,9 @@ hypre_LGMRESDestroy( void *lgmres_vdata )
          for (i = 0; i < (lgmres_data -> aug_dim); i++)
          {
             if ( (lgmres_data -> a_aug_vecs)[i] != NULL )
-	       (*(lgmres_functions->DestroyVector))( (lgmres_data -> a_aug_vecs) [i]);
+            {
+               (*(lgmres_functions->DestroyVector))( (lgmres_data -> a_aug_vecs) [i]);
+            }
          }
          hypre_TFreeF( lgmres_data->a_aug_vecs, lgmres_functions );
       }
@@ -211,12 +227,12 @@ hypre_LGMRESSetup( void *lgmres_vdata,
 
    HYPRE_Int            k_dim            = (lgmres_data -> k_dim);
    HYPRE_Int            max_iter         = (lgmres_data -> max_iter);
-   HYPRE_Int          (*precond_setup)(void*,void*,void*,void*) = (lgmres_functions->precond_setup);
+   HYPRE_Int          (*precond_setup)(void*, void*, void*, void*) = (lgmres_functions->precond_setup);
    void          *precond_data     = (lgmres_data -> precond_data);
 
    HYPRE_Int            rel_change       = (lgmres_data -> rel_change);
 
-  /* lgmres mod */
+   /* lgmres mod */
    HYPRE_Int            aug_dim          = (lgmres_data -> aug_dim);
 
    HYPRE_ANNOTATE_FUNC_BEGIN;
@@ -230,30 +246,48 @@ hypre_LGMRESSetup( void *lgmres_vdata,
     *--------------------------------------------------*/
 
    if ((lgmres_data -> p) == NULL)
-	   (lgmres_data -> p) = (void**)(*(lgmres_functions->CreateVectorArray))(k_dim+1,x);
+   {
+      (lgmres_data -> p) = (void**)(*(lgmres_functions->CreateVectorArray))(k_dim + 1, x);
+   }
    if ((lgmres_data -> r) == NULL)
+   {
       (lgmres_data -> r) = (*(lgmres_functions->CreateVector))(b);
+   }
    if ((lgmres_data -> w) == NULL)
+   {
       (lgmres_data -> w) = (*(lgmres_functions->CreateVector))(b);
+   }
 
    if (rel_change)
    {
       if ((lgmres_data -> w_2) == NULL)
+      {
          (lgmres_data -> w_2) = (*(lgmres_functions->CreateVector))(b);
+      }
    }
 
    /* lgmres mod */
    if ((lgmres_data -> aug_vecs) == NULL)
-      (lgmres_data -> aug_vecs) = (void**)(*(lgmres_functions->CreateVectorArray))(aug_dim+1,x); /* one extra */
+   {
+      (lgmres_data -> aug_vecs) = (void**)(*(lgmres_functions->CreateVectorArray))(aug_dim + 1,
+                                                                                   x);   /* one extra */
+   }
    if ((lgmres_data -> a_aug_vecs) == NULL)
-      (lgmres_data -> a_aug_vecs) = (void**)(*(lgmres_functions->CreateVectorArray))(aug_dim,x);
+   {
+      (lgmres_data -> a_aug_vecs) = (void**)(*(lgmres_functions->CreateVectorArray))(aug_dim, x);
+   }
    if ((lgmres_data -> aug_order) == NULL)
-      (lgmres_data -> aug_order) = hypre_CTAllocF(HYPRE_Int,aug_dim,lgmres_functions, HYPRE_MEMORY_HOST);
+   {
+      (lgmres_data -> aug_order) = hypre_CTAllocF(HYPRE_Int, aug_dim, lgmres_functions,
+                                                  HYPRE_MEMORY_HOST);
+   }
    /*---*/
 
 
    if ((lgmres_data -> matvec_data) == NULL)
+   {
       (lgmres_data -> matvec_data) = (*(lgmres_functions->MatvecCreate))(A, x);
+   }
 
    precond_setup(precond_data, A, b, x);
 
@@ -261,14 +295,20 @@ hypre_LGMRESSetup( void *lgmres_vdata,
     * Allocate space for log info
     *-----------------------------------------------------*/
 
-   if ( (lgmres_data->logging)>0 || (lgmres_data->print_level) > 0 )
+   if ( (lgmres_data->logging) > 0 || (lgmres_data->print_level) > 0 )
    {
       if ((lgmres_data -> norms) == NULL)
-         (lgmres_data -> norms) = hypre_CTAllocF(HYPRE_Real, max_iter + 1,lgmres_functions, HYPRE_MEMORY_HOST);
+      {
+         (lgmres_data -> norms) = hypre_CTAllocF(HYPRE_Real, max_iter + 1, lgmres_functions,
+                                                 HYPRE_MEMORY_HOST);
+      }
    }
-   if ( (lgmres_data->print_level) > 0 ) {
+   if ( (lgmres_data->print_level) > 0 )
+   {
       if ((lgmres_data -> log_file_name) == NULL)
-		  (lgmres_data -> log_file_name) = (char*)"lgmres.out.log";
+      {
+         (lgmres_data -> log_file_name) = (char*)"lgmres.out.log";
+      }
    }
 
    HYPRE_ANNOTATE_FUNC_END;
@@ -285,17 +325,17 @@ hypre_LGMRESSetup( void *lgmres_vdata,
 
 HYPRE_Int
 hypre_LGMRESSolve(void  *lgmres_vdata,
-                 void  *A,
-                 void  *b,
-		 void  *x)
+                  void  *A,
+                  void  *b,
+                  void  *x)
 {
    hypre_LGMRESData  *lgmres_data   = (hypre_LGMRESData *)lgmres_vdata;
    hypre_LGMRESFunctions *lgmres_functions = lgmres_data->functions;
-   HYPRE_Int 		     k_dim        = (lgmres_data -> k_dim);
+   HYPRE_Int           k_dim        = (lgmres_data -> k_dim);
    HYPRE_Int               min_iter     = (lgmres_data -> min_iter);
-   HYPRE_Int 		     max_iter     = (lgmres_data -> max_iter);
-   HYPRE_Real 	     r_tol        = (lgmres_data -> tol);
-   HYPRE_Real 	     cf_tol       = (lgmres_data -> cf_tol);
+   HYPRE_Int           max_iter     = (lgmres_data -> max_iter);
+   HYPRE_Real       r_tol        = (lgmres_data -> tol);
+   HYPRE_Real       cf_tol       = (lgmres_data -> cf_tol);
    HYPRE_Real        a_tol        = (lgmres_data -> a_tol);
    void             *matvec_data  = (lgmres_data -> matvec_data);
 
@@ -310,14 +350,14 @@ hypre_LGMRESSolve(void  *lgmres_vdata,
    void          **a_aug_vecs     = (lgmres_data ->a_aug_vecs);
    HYPRE_Int            *aug_order      = (lgmres_data->aug_order);
    HYPRE_Int             aug_dim        = (lgmres_data -> aug_dim);
-   HYPRE_Int             approx_constant=  (lgmres_data ->approx_constant);
+   HYPRE_Int             approx_constant =  (lgmres_data ->approx_constant);
    HYPRE_Int             it_arnoldi, aug_ct, it_total, ii, order, it_aug;
    HYPRE_Int             spot = 0;
    HYPRE_Real      tmp_norm, r_norm_last;
    /*---*/
 
-   HYPRE_Int 	           (*precond)(void*,void*,void*,void*)   = (lgmres_functions -> precond);
-   HYPRE_Int 	            *precond_data = (HYPRE_Int*)(lgmres_data -> precond_data);
+   HYPRE_Int              (*precond)(void*, void*, void*, void*)   = (lgmres_functions -> precond);
+   HYPRE_Int               *precond_data = (HYPRE_Int*)(lgmres_data -> precond_data);
 
    HYPRE_Int             print_level    = (lgmres_data -> print_level);
    HYPRE_Int             logging        = (lgmres_data -> logging);
@@ -325,7 +365,7 @@ hypre_LGMRESSolve(void  *lgmres_vdata,
    HYPRE_Real     *norms          = (lgmres_data -> norms);
 
    HYPRE_Int        break_value = 0;
-   HYPRE_Int	      i, j, k;
+   HYPRE_Int         i, j, k;
    HYPRE_Real *rs, **hh, *c, *s;
    HYPRE_Int        iter;
    HYPRE_Int        my_id, num_procs;
@@ -350,8 +390,8 @@ hypre_LGMRESSolve(void  *lgmres_vdata,
     * this. Perhaps it should be set to something non-zero (but small).
     *-----------------------------------------------------------------------*/
 
-   (*(lgmres_functions->CommInfo))(A,&my_id,&num_procs);
-   if ( logging>0 || print_level>0 )
+   (*(lgmres_functions->CommInfo))(A, &my_id, &num_procs);
+   if ( logging > 0 || print_level > 0 )
    {
       norms          = (lgmres_data -> norms);
       /* not used yet      log_file_name  = (lgmres_data -> log_file_name);*/
@@ -359,27 +399,27 @@ hypre_LGMRESSolve(void  *lgmres_vdata,
    }
 
    /* initialize work arrays  - lgmres includes aug_dim*/
-   rs = hypre_CTAllocF(HYPRE_Real,k_dim+1+aug_dim,lgmres_functions, HYPRE_MEMORY_HOST);
-   c = hypre_CTAllocF(HYPRE_Real,k_dim+aug_dim,lgmres_functions, HYPRE_MEMORY_HOST);
-   s = hypre_CTAllocF(HYPRE_Real,k_dim+aug_dim,lgmres_functions, HYPRE_MEMORY_HOST);
+   rs = hypre_CTAllocF(HYPRE_Real, k_dim + 1 + aug_dim, lgmres_functions, HYPRE_MEMORY_HOST);
+   c = hypre_CTAllocF(HYPRE_Real, k_dim + aug_dim, lgmres_functions, HYPRE_MEMORY_HOST);
+   s = hypre_CTAllocF(HYPRE_Real, k_dim + aug_dim, lgmres_functions, HYPRE_MEMORY_HOST);
 
    /* lgmres mod. - need non-modified hessenberg to avoid aug_dim matvecs */
-   hh = hypre_CTAllocF(HYPRE_Real*,k_dim+aug_dim+1,lgmres_functions, HYPRE_MEMORY_HOST);
-   for (i=0; i < k_dim+aug_dim+1; i++)
+   hh = hypre_CTAllocF(HYPRE_Real*, k_dim + aug_dim + 1, lgmres_functions, HYPRE_MEMORY_HOST);
+   for (i = 0; i < k_dim + aug_dim + 1; i++)
    {
-   	hh[i] = hypre_CTAllocF(HYPRE_Real,k_dim+aug_dim,lgmres_functions, HYPRE_MEMORY_HOST);
+      hh[i] = hypre_CTAllocF(HYPRE_Real, k_dim + aug_dim, lgmres_functions, HYPRE_MEMORY_HOST);
    }
 
-   (*(lgmres_functions->CopyVector))(b,p[0]);
+   (*(lgmres_functions->CopyVector))(b, p[0]);
 
    /* compute initial residual */
-   (*(lgmres_functions->Matvec))(matvec_data,-1.0, A, x, 1.0, p[0]);
+   (*(lgmres_functions->Matvec))(matvec_data, -1.0, A, x, 1.0, p[0]);
 
-   b_norm = sqrt((*(lgmres_functions->InnerProd))(b,b));
+   b_norm = hypre_sqrt((*(lgmres_functions->InnerProd))(b, b));
 
-   /* Since it is does not diminish performance, attempt to return an error flag
+   /* Since it does not diminish performance, attempt to return an error flag
       and notify users when they supply bad input. */
-   if (b_norm != 0.) ieee_check = b_norm/b_norm; /* INF -> NaN conversion */
+   if (b_norm != 0.) { ieee_check = b_norm / b_norm; } /* INF -> NaN conversion */
    if (ieee_check != ieee_check)
    {
       /* ...INFs or NaNs in input can make ieee_check a NaN.  This test
@@ -389,11 +429,11 @@ hypre_LGMRESSolve(void  *lgmres_vdata,
          found at http://HTTP.CS.Berkeley.EDU/~wkahan/ieee754status/IEEE754.PDF */
       if (logging > 0 || print_level > 0)
       {
-        hypre_printf("\n\nERROR detected by Hypre ... BEGIN\n");
-        hypre_printf("ERROR -- hypre_LGMRESSolve: INFs and/or NaNs detected in input.\n");
-        hypre_printf("User probably placed non-numerics in supplied b.\n");
-        hypre_printf("Returning error flag += 101.  Program not terminated.\n");
-        hypre_printf("ERROR detected by Hypre ... END\n\n\n");
+         hypre_printf("\n\nERROR detected by Hypre ... BEGIN\n");
+         hypre_printf("ERROR -- hypre_LGMRESSolve: INFs and/or NaNs detected in input.\n");
+         hypre_printf("User probably placed non-numerics in supplied b.\n");
+         hypre_printf("Returning error flag += 101.  Program not terminated.\n");
+         hypre_printf("ERROR detected by Hypre ... END\n\n\n");
       }
       hypre_error(HYPRE_ERROR_GENERIC);
       HYPRE_ANNOTATE_FUNC_END;
@@ -401,12 +441,12 @@ hypre_LGMRESSolve(void  *lgmres_vdata,
       return hypre_error_flag;
    }
 
-   r_norm = sqrt((*(lgmres_functions->InnerProd))(p[0],p[0]));
+   r_norm = hypre_sqrt((*(lgmres_functions->InnerProd))(p[0], p[0]));
    r_norm_0 = r_norm;
 
-   /* Since it is does not diminish performance, attempt to return an error flag
+   /* Since it does not diminish performance, attempt to return an error flag
       and notify users when they supply bad input. */
-   if (r_norm != 0.) ieee_check = r_norm/r_norm; /* INF -> NaN conversion */
+   if (r_norm != 0.) { ieee_check = r_norm / r_norm; } /* INF -> NaN conversion */
    if (ieee_check != ieee_check)
    {
       /* ...INFs or NaNs in input can make ieee_check a NaN.  This test
@@ -416,11 +456,11 @@ hypre_LGMRESSolve(void  *lgmres_vdata,
          found at http://HTTP.CS.Berkeley.EDU/~wkahan/ieee754status/IEEE754.PDF */
       if (logging > 0 || print_level > 0)
       {
-        hypre_printf("\n\nERROR detected by Hypre ... BEGIN\n");
-        hypre_printf("ERROR -- hypre_LGMRESSolve: INFs and/or NaNs detected in input.\n");
-        hypre_printf("User probably placed non-numerics in supplied A or x_0.\n");
-        hypre_printf("Returning error flag += 101.  Program not terminated.\n");
-        hypre_printf("ERROR detected by Hypre ... END\n\n\n");
+         hypre_printf("\n\nERROR detected by Hypre ... BEGIN\n");
+         hypre_printf("ERROR -- hypre_LGMRESSolve: INFs and/or NaNs detected in input.\n");
+         hypre_printf("User probably placed non-numerics in supplied A or x_0.\n");
+         hypre_printf("Returning error flag += 101.  Program not terminated.\n");
+         hypre_printf("ERROR detected by Hypre ... END\n\n\n");
       }
       hypre_error(HYPRE_ERROR_GENERIC);
       HYPRE_ANNOTATE_FUNC_END;
@@ -428,14 +468,16 @@ hypre_LGMRESSolve(void  *lgmres_vdata,
       return hypre_error_flag;
    }
 
-   if ( logging>0 || print_level > 0)
+   if ( logging > 0 || print_level > 0)
    {
       norms[0] = r_norm;
-      if ( print_level>1 && my_id == 0 )
+      if ( print_level > 1 && my_id == 0 )
       {
-  	 hypre_printf("L2 norm of b: %e\n", b_norm);
+         hypre_printf("L2 norm of b: %e\n", b_norm);
          if (b_norm == 0.0)
+         {
             hypre_printf("Rel_resid_norm actually contains the residual norm\n");
+         }
          hypre_printf("Initial L2 norm of residual: %e\n", r_norm);
 
       }
@@ -444,47 +486,50 @@ hypre_LGMRESSolve(void  *lgmres_vdata,
 
    if (b_norm > 0.0)
    {
-/* convergence criterion |r_i|/|b| <= accuracy if |b| > 0 */
-     den_norm= b_norm;
+      /* convergence criterion |r_i|/|b| <= accuracy if |b| > 0 */
+      den_norm = b_norm;
    }
    else
    {
-/* convergence criterion |r_i|/|r0| <= accuracy if |b| = 0 */
-     den_norm= r_norm;
+      /* convergence criterion |r_i|/|r0| <= accuracy if |b| = 0 */
+      den_norm = r_norm;
    };
 
-  /* convergence criteria: |r_i| <= max( a_tol, r_tol * den_norm)
-      den_norm = |r_0| or |b|
-      note: default for a_tol is 0.0, so relative residual criteria is used unless
-            user specifies a_tol, or sets r_tol = 0.0, which means absolute
-            tol only is checked  */
+   /* convergence criteria: |r_i| <= max( a_tol, r_tol * den_norm)
+       den_norm = |r_0| or |b|
+       note: default for a_tol is 0.0, so relative residual criteria is used unless
+             user specifies a_tol, or sets r_tol = 0.0, which means absolute
+             tol only is checked  */
 
-   epsilon = hypre_max(a_tol,r_tol*den_norm);
+   epsilon = hypre_max(a_tol, r_tol * den_norm);
 
    /* so now our stop criteria is |r_i| <= epsilon */
 
 
-   if ( print_level>1 && my_id == 0 )
+   if ( print_level > 1 && my_id == 0 )
    {
       if (b_norm > 0.0)
-         {hypre_printf("=============================================\n\n");
-          hypre_printf("Iters     resid.norm     conv.rate  rel.res.norm\n");
-          hypre_printf("-----    ------------    ---------- ------------\n");
+      {
+         hypre_printf("=============================================\n\n");
+         hypre_printf("Iters     resid.norm     conv.rate  rel.res.norm\n");
+         hypre_printf("-----    ------------    ---------- ------------\n");
 
-          }
+      }
 
       else
-         {hypre_printf("=============================================\n\n");
-          hypre_printf("Iters     resid.norm     conv.rate\n");
-          hypre_printf("-----    ------------    ----------\n");
+      {
+         hypre_printf("=============================================\n\n");
+         hypre_printf("Iters     resid.norm     conv.rate\n");
+         hypre_printf("-----    ------------    ----------\n");
 
-          };
+      };
    }
 
 
 
-/*lgmres initialization */
-   for (ii=0; ii<aug_dim; ii++) {
+   /*lgmres initialization */
+   for (ii = 0; ii < aug_dim; ii++)
+   {
       aug_order[ii] = 0;
    }
    aug_ct = 0; /* number of aug. vectors available */
@@ -494,373 +539,394 @@ hypre_LGMRESSolve(void  *lgmres_vdata,
    /* outer iteration cycle */
    while (iter < max_iter)
    {
-   /* initialize first term of hessenberg system */
-
-	rs[0] = r_norm;
-        if (r_norm == 0.0)
-        {
-           hypre_TFreeF(c,lgmres_functions);
-           hypre_TFreeF(s,lgmres_functions);
-           hypre_TFreeF(rs,lgmres_functions);
-           for (i=0; i < k_dim+aug_dim+1; i++) {
-              hypre_TFreeF(hh[i],lgmres_functions);
-           }
-
-           hypre_TFreeF(hh,lgmres_functions);
-           HYPRE_ANNOTATE_FUNC_END;
-
-	   return hypre_error_flag;
-	}
-
-        /* see if we are already converged and
-           should print the final norm and exit */
-	if (r_norm <= epsilon && iter >= min_iter)
-        {
-           (*(lgmres_functions->CopyVector))(b,r);
-           (*(lgmres_functions->Matvec))(matvec_data,-1.0,A,x,1.0,r);
-           r_norm = sqrt((*(lgmres_functions->InnerProd))(r,r));
-           if (r_norm  <= epsilon)
-           {
-              if ( print_level>1 && my_id == 0)
-              {
-                 hypre_printf("\n\n");
-                 hypre_printf("Final L2 norm of residual: %e\n\n", r_norm);
-              }
-              break;
-              }
-           else
-              if ( print_level>0 && my_id == 0)
-                 hypre_printf("false convergence 1\n");
-
-	}
-
-      	t = 1.0 / r_norm;
-        r_norm_last = r_norm;
-
-        (*(lgmres_functions->ScaleVector))(t,p[0]);
-	i = 0;
-
-        /* lgmres mod: determine number of arnoldi steps to take */
-        /* if approx_constant then we keep the space the same size
-           even if we don't have the full number of aug vectors yet*/
-        if (approx_constant) {
-           it_arnoldi = k_dim - aug_ct;
-        } else {
-           it_arnoldi = k_dim - aug_dim;
-        }
-        it_total =  it_arnoldi + aug_ct;
-        it_aug = 0; /* keep track of augmented iterations */
-
-
-        /***RESTART CYCLE (right-preconditioning) ***/
-        while (i < it_total && iter < max_iter)
-	{
-           i++;
-           iter++;
-           (*(lgmres_functions->ClearVector))(r);
-
-
-           /*LGMRES_MOD: decide whether this is an arnoldi step or an aug step */
-           if ( i <= it_arnoldi)
-           { /* Arnoldi */
-              precond(precond_data, A, p[i-1], r);
-              (*(lgmres_functions->Matvec))(matvec_data, 1.0, A, r, 0.0, p[i]);
-           } else
-           { /*lgmres aug step */
-              it_aug ++;
-              order = i - it_arnoldi - 1; /* which aug step (note i starts at 1) - aug order number at 0*/
-              for (ii=0; ii<aug_dim; ii++)
-              {
-                 if (aug_order[ii] == order)
-                 {
-                    spot = ii;
-                    break; /* must have this because there will be duplicates before aug_ct = aug_dim */
-                 }
-              }
-              /* copy a_aug_vecs[spot] to p[i] */
-              (*(lgmres_functions->CopyVector))(a_aug_vecs[spot],p[i]);
-
-              /*note: an alternate implementation choice would be to only save the AUGVECS and
-                not A_AUGVEC and then apply the PC here to the augvec */
-           }
-           /*---*/
-
-           /* modified Gram_Schmidt */
-           for (j=0; j < i; j++)
-           {
-              hh[j][i-1] = (*(lgmres_functions->InnerProd))(p[j],p[i]);
-              (*(lgmres_functions->Axpy))(-hh[j][i-1],p[j],p[i]);
-           }
-           t = sqrt((*(lgmres_functions->InnerProd))(p[i],p[i]));
-           hh[i][i-1] = t;
-           if (t != 0.0)
-           {
-              t = 1.0/t;
-              (*(lgmres_functions->ScaleVector))(t,p[i]);
-           }
-
-
-           /* done with modified Gram_schmidt and Arnoldi step.
-              update factorization of hh */
-           for (j = 1; j < i; j++)
-           {
-              t = hh[j-1][i-1];
-              hh[j-1][i-1] = s[j-1]*hh[j][i-1] + c[j-1]*t;
-              hh[j][i-1] = -s[j-1]*t + c[j-1]*hh[j][i-1];
-           }
-           t= hh[i][i-1]*hh[i][i-1];
-           t+= hh[i-1][i-1]*hh[i-1][i-1];
-           gamma = sqrt(t);
-           if (gamma == 0.0) gamma = epsmac;
-           c[i-1] = hh[i-1][i-1]/gamma;
-           s[i-1] = hh[i][i-1]/gamma;
-           rs[i] = -hh[i][i-1]*rs[i-1];
-           rs[i]/=  gamma;
-           rs[i-1] = c[i-1]*rs[i-1];
-           /* determine residual norm */
-           hh[i-1][i-1] = s[i-1]*hh[i][i-1] + c[i-1]*hh[i-1][i-1];
-           r_norm = fabs(rs[i]);
-
-           /* print ? */
-           if ( print_level>0 )
-           {
-              norms[iter] = r_norm;
-              if ( print_level>1 && my_id == 0 )
-              {
-                 if (b_norm > 0.0)
-                    hypre_printf("% 5d    %e    %f   %e\n", iter,
-                           norms[iter],norms[iter]/norms[iter-1],
-                           norms[iter]/b_norm);
-                 else
-                    hypre_printf("% 5d    %e    %f\n", iter, norms[iter],
-                           norms[iter]/norms[iter-1]);
-              }
-           }
-           /*convergence factor tolerance */
-           if (cf_tol > 0.0)
-           {
-              cf_ave_0 = cf_ave_1;
-              cf_ave_1 = pow( r_norm / r_norm_0, 1.0/(2.0*iter));
-
-              weight   = fabs(cf_ave_1 - cf_ave_0);
-              weight   = weight / hypre_max(cf_ave_1, cf_ave_0);
-              weight   = 1.0 - weight;
+      /* initialize first term of hessenberg system */
+
+      rs[0] = r_norm;
+      if (r_norm == 0.0)
+      {
+         hypre_TFreeF(c, lgmres_functions);
+         hypre_TFreeF(s, lgmres_functions);
+         hypre_TFreeF(rs, lgmres_functions);
+         for (i = 0; i < k_dim + aug_dim + 1; i++)
+         {
+            hypre_TFreeF(hh[i], lgmres_functions);
+         }
+
+         hypre_TFreeF(hh, lgmres_functions);
+         HYPRE_ANNOTATE_FUNC_END;
+
+         return hypre_error_flag;
+      }
+
+      /* see if we are already converged and
+         should print the final norm and exit */
+      if (r_norm <= epsilon && iter >= min_iter)
+      {
+         (*(lgmres_functions->CopyVector))(b, r);
+         (*(lgmres_functions->Matvec))(matvec_data, -1.0, A, x, 1.0, r);
+         r_norm = hypre_sqrt((*(lgmres_functions->InnerProd))(r, r));
+         if (r_norm  <= epsilon)
+         {
+            if ( print_level > 1 && my_id == 0)
+            {
+               hypre_printf("\n\n");
+               hypre_printf("Final L2 norm of residual: %e\n\n", r_norm);
+            }
+            break;
+         }
+         else if ( print_level > 0 && my_id == 0)
+         {
+            hypre_printf("false convergence 1\n");
+         }
+
+      }
+
+      t = 1.0 / r_norm;
+      r_norm_last = r_norm;
+
+      (*(lgmres_functions->ScaleVector))(t, p[0]);
+      i = 0;
+
+      /* lgmres mod: determine number of arnoldi steps to take */
+      /* if approx_constant then we keep the space the same size
+         even if we don't have the full number of aug vectors yet*/
+      if (approx_constant)
+      {
+         it_arnoldi = k_dim - aug_ct;
+      }
+      else
+      {
+         it_arnoldi = k_dim - aug_dim;
+      }
+      it_total =  it_arnoldi + aug_ct;
+      it_aug = 0; /* keep track of augmented iterations */
+
+
+      /***RESTART CYCLE (right-preconditioning) ***/
+      while (i < it_total && iter < max_iter)
+      {
+         i++;
+         iter++;
+         (*(lgmres_functions->ClearVector))(r);
+
+
+         /*LGMRES_MOD: decide whether this is an arnoldi step or an aug step */
+         if ( i <= it_arnoldi)
+         {
+            /* Arnoldi */
+            precond(precond_data, A, p[i - 1], r);
+            (*(lgmres_functions->Matvec))(matvec_data, 1.0, A, r, 0.0, p[i]);
+         }
+         else
+         {
+            /*lgmres aug step */
+            it_aug ++;
+            order = i - it_arnoldi - 1; /* which aug step (note i starts at 1) - aug order number at 0*/
+            for (ii = 0; ii < aug_dim; ii++)
+            {
+               if (aug_order[ii] == order)
+               {
+                  spot = ii;
+                  break; /* must have this because there will be duplicates before aug_ct = aug_dim */
+               }
+            }
+            /* copy a_aug_vecs[spot] to p[i] */
+            (*(lgmres_functions->CopyVector))(a_aug_vecs[spot], p[i]);
+
+            /*note: an alternate implementation choice would be to only save the AUGVECS and
+              not A_AUGVEC and then apply the PC here to the augvec */
+         }
+         /*---*/
+
+         /* modified Gram_Schmidt */
+         for (j = 0; j < i; j++)
+         {
+            hh[j][i - 1] = (*(lgmres_functions->InnerProd))(p[j], p[i]);
+            (*(lgmres_functions->Axpy))(-hh[j][i - 1], p[j], p[i]);
+         }
+         t = hypre_sqrt((*(lgmres_functions->InnerProd))(p[i], p[i]));
+         hh[i][i - 1] = t;
+         if (t != 0.0)
+         {
+            t = 1.0 / t;
+            (*(lgmres_functions->ScaleVector))(t, p[i]);
+         }
+
+
+         /* done with modified Gram_schmidt and Arnoldi step.
+            update factorization of hh */
+         for (j = 1; j < i; j++)
+         {
+            t = hh[j - 1][i - 1];
+            hh[j - 1][i - 1] = s[j - 1] * hh[j][i - 1] + c[j - 1] * t;
+            hh[j][i - 1] = -s[j - 1] * t + c[j - 1] * hh[j][i - 1];
+         }
+         t = hh[i][i - 1] * hh[i][i - 1];
+         t += hh[i - 1][i - 1] * hh[i - 1][i - 1];
+         gamma = hypre_sqrt(t);
+         if (gamma == 0.0) { gamma = epsmac; }
+         c[i - 1] = hh[i - 1][i - 1] / gamma;
+         s[i - 1] = hh[i][i - 1] / gamma;
+         rs[i] = -hh[i][i - 1] * rs[i - 1];
+         rs[i] /=  gamma;
+         rs[i - 1] = c[i - 1] * rs[i - 1];
+         /* determine residual norm */
+         hh[i - 1][i - 1] = s[i - 1] * hh[i][i - 1] + c[i - 1] * hh[i - 1][i - 1];
+         r_norm = hypre_abs(rs[i]);
+
+         /* print ? */
+         if ( print_level > 0 )
+         {
+            norms[iter] = r_norm;
+            if ( print_level > 1 && my_id == 0 )
+            {
+               if (b_norm > 0.0)
+                  hypre_printf("% 5d    %e    %f   %e\n", iter,
+                               norms[iter], norms[iter] / norms[iter - 1],
+                               norms[iter] / b_norm);
+               else
+                  hypre_printf("% 5d    %e    %f\n", iter, norms[iter],
+                               norms[iter] / norms[iter - 1]);
+            }
+         }
+         /*convergence factor tolerance */
+         if (cf_tol > 0.0)
+         {
+            cf_ave_0 = cf_ave_1;
+            cf_ave_1 = hypre_pow( r_norm / r_norm_0, 1.0 / (2.0 * iter));
+
+            weight   = hypre_abs(cf_ave_1 - cf_ave_0);
+            weight   = weight / hypre_max(cf_ave_1, cf_ave_0);
+            weight   = 1.0 - weight;
 #if 0
-              hypre_printf("I = %d: cf_new = %e, cf_old = %e, weight = %e\n",
-                     i, cf_ave_1, cf_ave_0, weight );
+            hypre_printf("I = %d: cf_new = %e, cf_old = %e, weight = %e\n",
+                         i, cf_ave_1, cf_ave_0, weight );
 #endif
-              if (weight * cf_ave_1 > cf_tol)
-              {
-                 break_value = 1;
-                 break;
-              }
-           }
-           /* should we exit the restart cycle? (conv. check) */
-           if (r_norm <= epsilon && iter >= min_iter)
-           {
-                 break;
-           }
-
-
-	} /*** end of restart cycle ***/
-
-	/* now compute solution, first solve upper triangular system */
-
-	if (break_value) break;
-
-	rs[i-1] = rs[i-1]/hh[i-1][i-1];
-	for (k = i-2; k >= 0; k--)
-	{
-           t = 0.0;
-           for (j = k+1; j < i; j++)
-           {
-              t -= hh[k][j]*rs[j];
-           }
-           t+= rs[k];
-           rs[k] = t/hh[k][k];
-	}
-        /* form linear combination of p's to get solution */
-        /* put the new aug_vector in aug_vecs[aug_dim]  - a temp position*/
-        /* i = number of iterations */
-        /* it_aug = number of augmented iterations */
-        /* it_arnoldi = number of arnoldi iterations */
-
-
-        /*check if exited early before all arnoldi its */
-        if (it_arnoldi > i) it_arnoldi = i;
-
-
-        if (!it_aug)
-        {
-           (*(lgmres_functions->CopyVector))(p[i-1],w);
-           (*(lgmres_functions->ScaleVector))(rs[i-1],w);
-           for (j = i-2; j >=0; j--)
-              (*(lgmres_functions->Axpy))(rs[j], p[j], w);
-        }
-        else /* need some of the augvecs */
-        {
-           (*(lgmres_functions->CopyVector))(p[0],w);
-           (*(lgmres_functions->ScaleVector))(rs[0],w);
-
-           /* reg. arnoldi directions */
-           for (j = 1; j < it_arnoldi; j++) /*first one already done */
-           {
-              (*(lgmres_functions->Axpy))(rs[j], p[j], w);
-           }
-
-           /* augment directions */
-           for (ii=0; ii<it_aug; ii++)
-           {
-              for (j=0; j<aug_dim; j++)
-              {
-                 if (aug_order[j] == ii)
-                 {
-                    spot = j;
-                    break; /* must have this because there will be
+            if (weight * cf_ave_1 > cf_tol)
+            {
+               break_value = 1;
+               break;
+            }
+         }
+         /* should we exit the restart cycle? (conv. check) */
+         if (r_norm <= epsilon && iter >= min_iter)
+         {
+            break;
+         }
+
+
+      } /*** end of restart cycle ***/
+
+      /* now compute solution, first solve upper triangular system */
+
+      if (break_value) { break; }
+
+      rs[i - 1] = rs[i - 1] / hh[i - 1][i - 1];
+      for (k = i - 2; k >= 0; k--)
+      {
+         t = 0.0;
+         for (j = k + 1; j < i; j++)
+         {
+            t -= hh[k][j] * rs[j];
+         }
+         t += rs[k];
+         rs[k] = t / hh[k][k];
+      }
+      /* form linear combination of p's to get solution */
+      /* put the new aug_vector in aug_vecs[aug_dim]  - a temp position*/
+      /* i = number of iterations */
+      /* it_aug = number of augmented iterations */
+      /* it_arnoldi = number of arnoldi iterations */
+
+
+      /*check if exited early before all arnoldi its */
+      if (it_arnoldi > i) { it_arnoldi = i; }
+
+
+      if (!it_aug)
+      {
+         (*(lgmres_functions->CopyVector))(p[i - 1], w);
+         (*(lgmres_functions->ScaleVector))(rs[i - 1], w);
+         for (j = i - 2; j >= 0; j--)
+         {
+            (*(lgmres_functions->Axpy))(rs[j], p[j], w);
+         }
+      }
+      else /* need some of the augvecs */
+      {
+         (*(lgmres_functions->CopyVector))(p[0], w);
+         (*(lgmres_functions->ScaleVector))(rs[0], w);
+
+         /* reg. arnoldi directions */
+         for (j = 1; j < it_arnoldi; j++) /*first one already done */
+         {
+            (*(lgmres_functions->Axpy))(rs[j], p[j], w);
+         }
+
+         /* augment directions */
+         for (ii = 0; ii < it_aug; ii++)
+         {
+            for (j = 0; j < aug_dim; j++)
+            {
+               if (aug_order[j] == ii)
+               {
+                  spot = j;
+                  break; /* must have this because there will be
                             * duplicates before aug_ct = aug_dim */
-                 }
-              }
-              (*(lgmres_functions->Axpy))(rs[it_arnoldi+ii], aug_vecs[spot], w);
-           }
-        }
-
-
-        /* grab the new aug vector before the prec*/
-        (*(lgmres_functions->CopyVector))(w,aug_vecs[aug_dim]);
-
-	(*(lgmres_functions->ClearVector))(r);
-	/* find correction (in r) (un-wind precond.)*/
-        precond(precond_data, A, w, r);
-
-        /* update current solution x (in x) */
-	(*(lgmres_functions->Axpy))(1.0,r,x);
-
-
-        /* check for convergence by evaluating the actual residual */
-	if (r_norm <= epsilon && iter >= min_iter)
-        {
-           /* calculate actual residual norm*/
-           (*(lgmres_functions->CopyVector))(b,r);
-           (*(lgmres_functions->Matvec))(matvec_data,-1.0,A,x,1.0,r);
-           r_norm = sqrt( (*(lgmres_functions->InnerProd))(r,r) );
-
-           if (r_norm <= epsilon)
-           {
-              if ( print_level>1 && my_id == 0 )
-              {
-                 hypre_printf("\n\n");
-                 hypre_printf("Final L2 norm of residual: %e\n\n", r_norm);
-              }
-              (lgmres_data -> converged) = 1;
-              break;
-           }
-           else /* conv. has not occurred, according to true residual */
-           {
-              if ( print_level>0 && my_id == 0)
-                 hypre_printf("false convergence 2\n");
-              (*(lgmres_functions->CopyVector))(r,p[0]);
-              i = 0;
-           }
-	} /* end of convergence check */
-
-        /* compute residual vector and continue loop */
-
-        /* copy r0 (not scaled) to w*/
-	(*(lgmres_functions->CopyVector))(p[0],w);
-	(*(lgmres_functions->ScaleVector))(r_norm_last,w);
-
-
-	for (j=i ; j > 0; j--)
-	{
-           rs[j-1] = -s[j-1]*rs[j];
-           rs[j] = c[j-1]*rs[j];
-	}
-
-        if (i) (*(lgmres_functions->Axpy))(rs[i]-1.0,p[i],p[i]);
-        for (j=i-1 ; j > 0; j--)
-           (*(lgmres_functions->Axpy))(rs[j],p[j],p[i]);
-
-        if (i)
-        {
-           (*(lgmres_functions->Axpy))(rs[0]-1.0,p[0],p[0]);
-           (*(lgmres_functions->Axpy))(1.0,p[i],p[0]);
-        }
-
-        /* lgmres mod */
-        /* collect aug vector and A*augvector for future restarts -
-           only if we will be restarting (i.e. this cycle performed it_total
-           iterations). ordering starts at 0.*/
-        if (aug_dim > 0)
-        {
-           if (!aug_ct)
-           {
-              spot = 0;
-              aug_ct++;
-           }
-           else if (aug_ct < aug_dim)
-           {
-              spot = aug_ct;
-              aug_ct++;
-           }
-           else
-           { /* truncate - already have aug_dim number of vectors*/
-              for (ii=0; ii<aug_dim; ii++)
-              {
-                 if (aug_order[ii] == (aug_dim-1))
-                 {
-                    spot = ii;
-                 }
-              }
-           }
-           /* aug_vecs[aug_dim] contains new aug vector */
-           (*(lgmres_functions->CopyVector))(aug_vecs[aug_dim], aug_vecs[spot]);
-           /*need to normalize */
-           tmp_norm = sqrt((*(lgmres_functions->InnerProd))(aug_vecs[spot], aug_vecs[spot]));
-
-           tmp_norm = 1.0/tmp_norm;
-           (*(lgmres_functions->ScaleVector))(tmp_norm ,aug_vecs[spot]);
-
-           /*set new aug vector to order 0  - move all others back one */
-           for (ii=0; ii < aug_dim; ii++)
-           {
-              aug_order[ii]++;
-           }
-           aug_order[spot] = 0;
-
-           /*now add the A*aug vector to A_AUGVEC(spot) - this is
-            * independ. of preconditioning type*/
-           /* A*augvec = V*H*y  = r0-rm   (r0 is in w and rm is in p[0])*/
-           (*(lgmres_functions->CopyVector))( w, a_aug_vecs[spot]);
-           (*(lgmres_functions->ScaleVector))(- 1.0, a_aug_vecs[spot]); /* -r0*/
-           (*(lgmres_functions->Axpy))(1.0, p[0],a_aug_vecs[spot]); /* rm - r0 */
-           (*(lgmres_functions->ScaleVector))(-tmp_norm, a_aug_vecs[spot]); /* r0-rm /norm */
-
-        }
+               }
+            }
+            (*(lgmres_functions->Axpy))(rs[it_arnoldi + ii], aug_vecs[spot], w);
+         }
+      }
+
+
+      /* grab the new aug vector before the prec*/
+      (*(lgmres_functions->CopyVector))(w, aug_vecs[aug_dim]);
+
+      (*(lgmres_functions->ClearVector))(r);
+      /* find correction (in r) (un-wind precond.)*/
+      precond(precond_data, A, w, r);
+
+      /* update current solution x (in x) */
+      (*(lgmres_functions->Axpy))(1.0, r, x);
+
+
+      /* check for convergence by evaluating the actual residual */
+      if (r_norm <= epsilon && iter >= min_iter)
+      {
+         /* calculate actual residual norm*/
+         (*(lgmres_functions->CopyVector))(b, r);
+         (*(lgmres_functions->Matvec))(matvec_data, -1.0, A, x, 1.0, r);
+         r_norm = hypre_sqrt( (*(lgmres_functions->InnerProd))(r, r) );
+
+         if (r_norm <= epsilon)
+         {
+            if ( print_level > 1 && my_id == 0 )
+            {
+               hypre_printf("\n\n");
+               hypre_printf("Final L2 norm of residual: %e\n\n", r_norm);
+            }
+            (lgmres_data -> converged) = 1;
+            break;
+         }
+         else /* conv. has not occurred, according to true residual */
+         {
+            if ( print_level > 0 && my_id == 0)
+            {
+               hypre_printf("false convergence 2\n");
+            }
+            (*(lgmres_functions->CopyVector))(r, p[0]);
+            i = 0;
+         }
+      } /* end of convergence check */
+
+      /* compute residual vector and continue loop */
+
+      /* copy r0 (not scaled) to w*/
+      (*(lgmres_functions->CopyVector))(p[0], w);
+      (*(lgmres_functions->ScaleVector))(r_norm_last, w);
+
+
+      for (j = i ; j > 0; j--)
+      {
+         rs[j - 1] = -s[j - 1] * rs[j];
+         rs[j] = c[j - 1] * rs[j];
+      }
+
+      if (i) { (*(lgmres_functions->Axpy))(rs[i] - 1.0, p[i], p[i]); }
+      for (j = i - 1 ; j > 0; j--)
+      {
+         (*(lgmres_functions->Axpy))(rs[j], p[j], p[i]);
+      }
+
+      if (i)
+      {
+         (*(lgmres_functions->Axpy))(rs[0] - 1.0, p[0], p[0]);
+         (*(lgmres_functions->Axpy))(1.0, p[i], p[0]);
+      }
+
+      /* lgmres mod */
+      /* collect aug vector and A*augvector for future restarts -
+         only if we will be restarting (i.e. this cycle performed it_total
+         iterations). ordering starts at 0.*/
+      if (aug_dim > 0)
+      {
+         if (!aug_ct)
+         {
+            spot = 0;
+            aug_ct++;
+         }
+         else if (aug_ct < aug_dim)
+         {
+            spot = aug_ct;
+            aug_ct++;
+         }
+         else
+         {
+            /* truncate - already have aug_dim number of vectors*/
+            for (ii = 0; ii < aug_dim; ii++)
+            {
+               if (aug_order[ii] == (aug_dim - 1))
+               {
+                  spot = ii;
+               }
+            }
+         }
+         /* aug_vecs[aug_dim] contains new aug vector */
+         (*(lgmres_functions->CopyVector))(aug_vecs[aug_dim], aug_vecs[spot]);
+         /*need to normalize */
+         tmp_norm = hypre_sqrt((*(lgmres_functions->InnerProd))(aug_vecs[spot], aug_vecs[spot]));
+
+         tmp_norm = 1.0 / tmp_norm;
+         (*(lgmres_functions->ScaleVector))(tmp_norm, aug_vecs[spot]);
+
+         /*set new aug vector to order 0  - move all others back one */
+         for (ii = 0; ii < aug_dim; ii++)
+         {
+            aug_order[ii]++;
+         }
+         aug_order[spot] = 0;
+
+         /*now add the A*aug vector to A_AUGVEC(spot) - this is
+          * independ. of preconditioning type*/
+         /* A*augvec = V*H*y  = r0-rm   (r0 is in w and rm is in p[0])*/
+         (*(lgmres_functions->CopyVector))( w, a_aug_vecs[spot]);
+         (*(lgmres_functions->ScaleVector))(- 1.0, a_aug_vecs[spot]); /* -r0*/
+         (*(lgmres_functions->Axpy))(1.0, p[0], a_aug_vecs[spot]); /* rm - r0 */
+         (*(lgmres_functions->ScaleVector))(-tmp_norm, a_aug_vecs[spot]); /* r0-rm /norm */
+
+      }
 
    } /* END of iteration while loop */
 
 
-   if ( print_level>1 && my_id == 0 )
-          hypre_printf("\n\n");
+   if ( print_level > 1 && my_id == 0 )
+   {
+      hypre_printf("\n\n");
+   }
 
    (lgmres_data -> num_iterations) = iter;
    if (b_norm > 0.0)
-      (lgmres_data -> rel_residual_norm) = r_norm/b_norm;
+   {
+      (lgmres_data -> rel_residual_norm) = r_norm / b_norm;
+   }
    if (b_norm == 0.0)
+   {
       (lgmres_data -> rel_residual_norm) = r_norm;
+   }
 
-   if (iter >= max_iter && r_norm > epsilon && epsilon > 0) hypre_error(HYPRE_ERROR_CONV);
+   if (iter >= max_iter && r_norm > epsilon && epsilon > 0) { hypre_error(HYPRE_ERROR_CONV); }
 
 
-   hypre_TFreeF(c,lgmres_functions);
-   hypre_TFreeF(s,lgmres_functions);
-   hypre_TFreeF(rs,lgmres_functions);
+   hypre_TFreeF(c, lgmres_functions);
+   hypre_TFreeF(s, lgmres_functions);
+   hypre_TFreeF(rs, lgmres_functions);
 
-   for (i=0; i < k_dim+1+aug_dim; i++)
+   for (i = 0; i < k_dim + 1 + aug_dim; i++)
    {
-      hypre_TFreeF(hh[i],lgmres_functions);
+      hypre_TFreeF(hh[i], lgmres_functions);
    }
-   hypre_TFreeF(hh,lgmres_functions);
+   hypre_TFreeF(hh, lgmres_functions);
 
    HYPRE_ANNOTATE_FUNC_END;
 
@@ -873,7 +939,7 @@ hypre_LGMRESSolve(void  *lgmres_vdata,
 
 HYPRE_Int
 hypre_LGMRESSetKDim( void   *lgmres_vdata,
-                    HYPRE_Int   k_dim )
+                     HYPRE_Int   k_dim )
 {
    hypre_LGMRESData *lgmres_data = (hypre_LGMRESData *)lgmres_vdata;
 
@@ -886,7 +952,7 @@ hypre_LGMRESSetKDim( void   *lgmres_vdata,
 
 HYPRE_Int
 hypre_LGMRESGetKDim( void   *lgmres_vdata,
-                    HYPRE_Int * k_dim )
+                     HYPRE_Int * k_dim )
 {
    hypre_LGMRESData *lgmres_data = (hypre_LGMRESData *)lgmres_vdata;
 
@@ -901,20 +967,20 @@ hypre_LGMRESGetKDim( void   *lgmres_vdata,
 
 HYPRE_Int
 hypre_LGMRESSetAugDim( void   *lgmres_vdata,
-                    HYPRE_Int   aug_dim )
+                       HYPRE_Int   aug_dim )
 {
    hypre_LGMRESData *lgmres_data = (hypre_LGMRESData *)lgmres_vdata;
 
-   if (aug_dim < 0) aug_dim = 0; /* must be positive */
+   if (aug_dim < 0) { aug_dim = 0; } /* must be positive */
 
-   if (aug_dim > (lgmres_data -> k_dim) -1) /* must be be <= (restart size-1) */
+   if (aug_dim > (lgmres_data -> k_dim) - 1) /* must be be <= (restart size-1) */
    {
-      while (aug_dim > (lgmres_data -> k_dim) -1)
+      while (aug_dim > (lgmres_data -> k_dim) - 1)
       {
          aug_dim--;
       }
 
-      aug_dim = (((0)<(aug_dim)) ? (aug_dim) : (0));
+      aug_dim = (((0) < (aug_dim)) ? (aug_dim) : (0));
 
    }
    (lgmres_data -> aug_dim) = aug_dim;
@@ -941,7 +1007,7 @@ hypre_LGMRESGetAugDim( void   *lgmres_vdata,
 
 HYPRE_Int
 hypre_LGMRESSetTol( void   *lgmres_vdata,
-                   HYPRE_Real  tol       )
+                    HYPRE_Real  tol       )
 {
    hypre_LGMRESData *lgmres_data = (hypre_LGMRESData *)lgmres_vdata;
 
@@ -953,7 +1019,7 @@ hypre_LGMRESSetTol( void   *lgmres_vdata,
 
 HYPRE_Int
 hypre_LGMRESGetTol( void   *lgmres_vdata,
-                   HYPRE_Real  * tol      )
+                    HYPRE_Real  * tol      )
 {
    hypre_LGMRESData *lgmres_data = (hypre_LGMRESData *)lgmres_vdata;
 
@@ -968,7 +1034,7 @@ hypre_LGMRESGetTol( void   *lgmres_vdata,
 
 HYPRE_Int
 hypre_LGMRESSetAbsoluteTol( void   *lgmres_vdata,
-                   HYPRE_Real  a_tol       )
+                            HYPRE_Real  a_tol       )
 {
    hypre_LGMRESData *lgmres_data = (hypre_LGMRESData *)lgmres_vdata;
 
@@ -980,7 +1046,7 @@ hypre_LGMRESSetAbsoluteTol( void   *lgmres_vdata,
 
 HYPRE_Int
 hypre_LGMRESGetAbsoluteTol( void   *lgmres_vdata,
-                   HYPRE_Real  * a_tol      )
+                            HYPRE_Real  * a_tol      )
 {
    hypre_LGMRESData *lgmres_data = (hypre_LGMRESData *)lgmres_vdata;
 
@@ -995,7 +1061,7 @@ hypre_LGMRESGetAbsoluteTol( void   *lgmres_vdata,
 
 HYPRE_Int
 hypre_LGMRESSetConvergenceFactorTol( void   *lgmres_vdata,
-                   HYPRE_Real  cf_tol       )
+                                     HYPRE_Real  cf_tol       )
 {
    hypre_LGMRESData *lgmres_data = (hypre_LGMRESData *)lgmres_vdata;
 
@@ -1007,7 +1073,7 @@ hypre_LGMRESSetConvergenceFactorTol( void   *lgmres_vdata,
 
 HYPRE_Int
 hypre_LGMRESGetConvergenceFactorTol( void   *lgmres_vdata,
-                   HYPRE_Real * cf_tol       )
+                                     HYPRE_Real * cf_tol       )
 {
    hypre_LGMRESData *lgmres_data = (hypre_LGMRESData *)lgmres_vdata;
 
@@ -1023,7 +1089,7 @@ hypre_LGMRESGetConvergenceFactorTol( void   *lgmres_vdata,
 
 HYPRE_Int
 hypre_LGMRESSetMinIter( void *lgmres_vdata,
-                       HYPRE_Int   min_iter  )
+                        HYPRE_Int   min_iter  )
 {
    hypre_LGMRESData *lgmres_data = (hypre_LGMRESData *)lgmres_vdata;
 
@@ -1035,7 +1101,7 @@ hypre_LGMRESSetMinIter( void *lgmres_vdata,
 
 HYPRE_Int
 hypre_LGMRESGetMinIter( void *lgmres_vdata,
-                       HYPRE_Int * min_iter  )
+                        HYPRE_Int * min_iter  )
 {
    hypre_LGMRESData *lgmres_data = (hypre_LGMRESData *)lgmres_vdata;
 
@@ -1051,7 +1117,7 @@ hypre_LGMRESGetMinIter( void *lgmres_vdata,
 
 HYPRE_Int
 hypre_LGMRESSetMaxIter( void *lgmres_vdata,
-                       HYPRE_Int   max_iter  )
+                        HYPRE_Int   max_iter  )
 {
    hypre_LGMRESData *lgmres_data = (hypre_LGMRESData *)lgmres_vdata;
 
@@ -1063,7 +1129,7 @@ hypre_LGMRESSetMaxIter( void *lgmres_vdata,
 
 HYPRE_Int
 hypre_LGMRESGetMaxIter( void *lgmres_vdata,
-                       HYPRE_Int * max_iter  )
+                        HYPRE_Int * max_iter  )
 {
    hypre_LGMRESData *lgmres_data = (hypre_LGMRESData *)lgmres_vdata;
 
@@ -1080,7 +1146,7 @@ hypre_LGMRESGetMaxIter( void *lgmres_vdata,
 
 HYPRE_Int
 hypre_LGMRESSetStopCrit( void   *lgmres_vdata,
-                        HYPRE_Int  stop_crit       )
+                         HYPRE_Int  stop_crit       )
 {
    hypre_LGMRESData *lgmres_data = (hypre_LGMRESData *)lgmres_vdata;
 
@@ -1092,7 +1158,7 @@ hypre_LGMRESSetStopCrit( void   *lgmres_vdata,
 
 HYPRE_Int
 hypre_LGMRESGetStopCrit( void   *lgmres_vdata,
-                        HYPRE_Int * stop_crit       )
+                         HYPRE_Int * stop_crit       )
 {
    hypre_LGMRESData *lgmres_data = (hypre_LGMRESData *)lgmres_vdata;
 
@@ -1108,9 +1174,9 @@ hypre_LGMRESGetStopCrit( void   *lgmres_vdata,
 
 HYPRE_Int
 hypre_LGMRESSetPrecond( void  *lgmres_vdata,
-						HYPRE_Int  (*precond)(void*,void*,void*,void*),
-						HYPRE_Int  (*precond_setup)(void*,void*,void*,void*),
-                       void  *precond_data )
+                        HYPRE_Int  (*precond)(void*, void*, void*, void*),
+                        HYPRE_Int  (*precond_setup)(void*, void*, void*, void*),
+                        void  *precond_data )
 {
    hypre_LGMRESData *lgmres_data = (hypre_LGMRESData *)lgmres_vdata;
    hypre_LGMRESFunctions *lgmres_functions = lgmres_data->functions;
@@ -1129,7 +1195,7 @@ hypre_LGMRESSetPrecond( void  *lgmres_vdata,
 
 HYPRE_Int
 hypre_LGMRESGetPrecond( void         *lgmres_vdata,
-                       HYPRE_Solver *precond_data_ptr )
+                        HYPRE_Solver *precond_data_ptr )
 {
    hypre_LGMRESData *lgmres_data = (hypre_LGMRESData *)lgmres_vdata;
 
@@ -1145,7 +1211,7 @@ hypre_LGMRESGetPrecond( void         *lgmres_vdata,
 
 HYPRE_Int
 hypre_LGMRESSetPrintLevel( void *lgmres_vdata,
-                        HYPRE_Int   level)
+                           HYPRE_Int   level)
 {
    hypre_LGMRESData *lgmres_data = (hypre_LGMRESData *)lgmres_vdata;
 
@@ -1157,7 +1223,7 @@ hypre_LGMRESSetPrintLevel( void *lgmres_vdata,
 
 HYPRE_Int
 hypre_LGMRESGetPrintLevel( void *lgmres_vdata,
-                        HYPRE_Int * level)
+                           HYPRE_Int * level)
 {
    hypre_LGMRESData *lgmres_data = (hypre_LGMRESData *)lgmres_vdata;
 
@@ -1173,7 +1239,7 @@ hypre_LGMRESGetPrintLevel( void *lgmres_vdata,
 
 HYPRE_Int
 hypre_LGMRESSetLogging( void *lgmres_vdata,
-                      HYPRE_Int   level)
+                        HYPRE_Int   level)
 {
    hypre_LGMRESData *lgmres_data = (hypre_LGMRESData *)lgmres_vdata;
 
@@ -1185,7 +1251,7 @@ hypre_LGMRESSetLogging( void *lgmres_vdata,
 
 HYPRE_Int
 hypre_LGMRESGetLogging( void *lgmres_vdata,
-                      HYPRE_Int * level)
+                        HYPRE_Int * level)
 {
    hypre_LGMRESData *lgmres_data = (hypre_LGMRESData *)lgmres_vdata;
 
@@ -1201,7 +1267,7 @@ hypre_LGMRESGetLogging( void *lgmres_vdata,
 
 HYPRE_Int
 hypre_LGMRESGetNumIterations( void *lgmres_vdata,
-                             HYPRE_Int  *num_iterations )
+                              HYPRE_Int  *num_iterations )
 {
    hypre_LGMRESData *lgmres_data = (hypre_LGMRESData *)lgmres_vdata;
 
@@ -1217,7 +1283,7 @@ hypre_LGMRESGetNumIterations( void *lgmres_vdata,
 
 HYPRE_Int
 hypre_LGMRESGetConverged( void *lgmres_vdata,
-                             HYPRE_Int  *converged )
+                          HYPRE_Int  *converged )
 {
    hypre_LGMRESData *lgmres_data = (hypre_LGMRESData *)lgmres_vdata;
 
@@ -1233,7 +1299,7 @@ hypre_LGMRESGetConverged( void *lgmres_vdata,
 
 HYPRE_Int
 hypre_LGMRESGetFinalRelativeResidualNorm( void   *lgmres_vdata,
-                                         HYPRE_Real *relative_residual_norm )
+                                          HYPRE_Real *relative_residual_norm )
 {
    hypre_LGMRESData *lgmres_data = (hypre_LGMRESData *)lgmres_vdata;
 
diff --git a/external/hypre/src/krylov/lgmres.h b/external/hypre/src/krylov/lgmres.h
index c76478d9..610e7838 100644
--- a/external/hypre/src/krylov/lgmres.h
+++ b/external/hypre/src/krylov/lgmres.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -84,13 +84,13 @@ typedef struct
    HYPRE_Real   a_tol;
    HYPRE_Real   rel_residual_norm;
 
-/*lgmres specific stuff */
+   /*lgmres specific stuff */
    HYPRE_Int      aug_dim;
    HYPRE_Int      approx_constant;
    void   **aug_vecs;
    HYPRE_Int     *aug_order;
    void   **a_aug_vecs;
-/*---*/
+   /*---*/
 
    void  *A;
    void  *r;
@@ -105,7 +105,7 @@ typedef struct
 
    /* log info (always logged) */
    HYPRE_Int      num_iterations;
- 
+
    HYPRE_Int     print_level; /* printing when print_level>0 */
    HYPRE_Int     logging;  /* extra computations for logging when logging>0 */
    HYPRE_Real  *norms;
@@ -150,7 +150,7 @@ hypre_LGMRESFunctionsCreate(
    HYPRE_Int    (*Axpy)          ( HYPRE_Complex alpha, void *x, void *y ),
    HYPRE_Int    (*PrecondSetup)  ( void *vdata, void *A, void *b, void *x ),
    HYPRE_Int    (*Precond)       ( void *vdata, void *A, void *b, void *x )
-   );
+);
 
 /**
  * Description...
diff --git a/external/hypre/src/krylov/lobpcg.c b/external/hypre/src/krylov/lobpcg.c
index 5ea13469..5b5f807a 100644
--- a/external/hypre/src/krylov/lobpcg.c
+++ b/external/hypre/src/krylov/lobpcg.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -21,967 +21,1063 @@
 #include "multivector.h"
 
 static HYPRE_Int
-lobpcg_chol( utilities_FortranMatrix* a, 
-        HYPRE_Int (*dpotrf) (const char *uplo, HYPRE_Int *n, HYPRE_Real *a, HYPRE_Int *lda, HYPRE_Int *info) )
+lobpcg_chol( utilities_FortranMatrix* a,
+             HYPRE_Int (*dpotrf) (const char *uplo, HYPRE_Int *n, HYPRE_Real *a, HYPRE_Int *lda,
+                                  HYPRE_Int *info) )
 {
 
-  HYPRE_Int lda, n;
-  HYPRE_Real* aval;
-  char uplo;
-  HYPRE_Int ierr;
+   HYPRE_Int lda, n;
+   HYPRE_Real* aval;
+   char uplo;
+   HYPRE_Int ierr;
 
-  lda = utilities_FortranMatrixGlobalHeight( a );
-  n = utilities_FortranMatrixHeight( a );
-  aval = utilities_FortranMatrixValues( a );
-  uplo = 'U';
+   lda = utilities_FortranMatrixGlobalHeight( a );
+   n = utilities_FortranMatrixHeight( a );
+   aval = utilities_FortranMatrixValues( a );
+   uplo = 'U';
 
-  (*dpotrf)( &uplo, &n, aval, &lda, &ierr );
+   (*dpotrf)( &uplo, &n, aval, &lda, &ierr );
 
-  return ierr;
+   return ierr;
 }
 
 static HYPRE_Int
-lobpcg_solveGEVP( 
-utilities_FortranMatrix* mtxA, 
-utilities_FortranMatrix* mtxB,
-utilities_FortranMatrix* eigVal,
-HYPRE_Int   (*dsygv) (HYPRE_Int *itype, char *jobz, char *uplo, HYPRE_Int *
-        n, HYPRE_Real *a, HYPRE_Int *lda, HYPRE_Real *b, HYPRE_Int *ldb,
-        HYPRE_Real *w, HYPRE_Real *work, HYPRE_Int *lwork, HYPRE_Int *info)
-){
-
-  HYPRE_Int n, lda, ldb, itype, lwork, info;
-  char jobz, uplo;
-  HYPRE_Real* work;
-  HYPRE_Real* a;
-  HYPRE_Real* b;
-  HYPRE_Real* lmd;
-
-  itype = 1;
-  jobz = 'V';
-  uplo = 'L';
-    
-  a = utilities_FortranMatrixValues( mtxA );
-  b = utilities_FortranMatrixValues( mtxB );
-  lmd = utilities_FortranMatrixValues( eigVal );
-
-  n = utilities_FortranMatrixHeight( mtxA );
-  lda = utilities_FortranMatrixGlobalHeight( mtxA );
-  ldb = utilities_FortranMatrixGlobalHeight( mtxB );
-  lwork = 10*n;
-
-  work = hypre_CTAlloc(HYPRE_Real,  lwork, HYPRE_MEMORY_HOST);
-
-  (*dsygv)( &itype, &jobz, &uplo, &n, 
-				       a, &lda, b, &ldb,
-				       lmd, &work[0], &lwork, &info );
-
-  hypre_TFree( work ,HYPRE_MEMORY_HOST);
-  return info;
+lobpcg_solveGEVP(
+   utilities_FortranMatrix* mtxA,
+   utilities_FortranMatrix* mtxB,
+   utilities_FortranMatrix* eigVal,
+   HYPRE_Int   (*dsygv) (HYPRE_Int *itype, char *jobz, char *uplo, HYPRE_Int *
+                         n, HYPRE_Real *a, HYPRE_Int *lda, HYPRE_Real *b, HYPRE_Int *ldb,
+                         HYPRE_Real *w, HYPRE_Real *work, HYPRE_Int *lwork, HYPRE_Int *info)
+)
+{
+
+   HYPRE_Int n, lda, ldb, itype, lwork, info;
+   char jobz, uplo;
+   HYPRE_Real* work;
+   HYPRE_Real* a;
+   HYPRE_Real* b;
+   HYPRE_Real* lmd;
+
+   itype = 1;
+   jobz = 'V';
+   uplo = 'L';
+
+   a = utilities_FortranMatrixValues( mtxA );
+   b = utilities_FortranMatrixValues( mtxB );
+   lmd = utilities_FortranMatrixValues( eigVal );
+
+   n = utilities_FortranMatrixHeight( mtxA );
+   lda = utilities_FortranMatrixGlobalHeight( mtxA );
+   ldb = utilities_FortranMatrixGlobalHeight( mtxB );
+   lwork = 10 * n;
+
+   work = hypre_CTAlloc(HYPRE_Real,  lwork, HYPRE_MEMORY_HOST);
+
+   (*dsygv)( &itype, &jobz, &uplo, &n,
+             a, &lda, b, &ldb,
+             lmd, &work[0], &lwork, &info );
+
+   hypre_TFree( work, HYPRE_MEMORY_HOST);
+   return info;
 
 }
 
 
 static void
 lobpcg_MultiVectorByMultiVector(
-mv_MultiVectorPtr x,
-mv_MultiVectorPtr y,
-utilities_FortranMatrix* xy
-){
-  mv_MultiVectorByMultiVector( x, y,
-				  utilities_FortranMatrixGlobalHeight( xy ),
-				  utilities_FortranMatrixHeight( xy ),
-				  utilities_FortranMatrixWidth( xy ),
-				  utilities_FortranMatrixValues( xy ) );
+   mv_MultiVectorPtr x,
+   mv_MultiVectorPtr y,
+   utilities_FortranMatrix* xy
+)
+{
+   mv_MultiVectorByMultiVector( x, y,
+                                utilities_FortranMatrixGlobalHeight( xy ),
+                                utilities_FortranMatrixHeight( xy ),
+                                utilities_FortranMatrixWidth( xy ),
+                                utilities_FortranMatrixValues( xy ) );
 }
 
 static void
 lobpcg_MultiVectorByMatrix(
-mv_MultiVectorPtr x,
-utilities_FortranMatrix* r,
-mv_MultiVectorPtr y
-){
-  mv_MultiVectorByMatrix( x, 
-			     utilities_FortranMatrixGlobalHeight( r ),
-			     utilities_FortranMatrixHeight( r ),
-			     utilities_FortranMatrixWidth( r ),
-			     utilities_FortranMatrixValues( r ),
-			     y );
+   mv_MultiVectorPtr x,
+   utilities_FortranMatrix* r,
+   mv_MultiVectorPtr y
+)
+{
+   mv_MultiVectorByMatrix( x,
+                           utilities_FortranMatrixGlobalHeight( r ),
+                           utilities_FortranMatrixHeight( r ),
+                           utilities_FortranMatrixWidth( r ),
+                           utilities_FortranMatrixValues( r ),
+                           y );
 }
 
 static HYPRE_Int
-lobpcg_MultiVectorImplicitQR( 
-mv_MultiVectorPtr x, mv_MultiVectorPtr y,
-utilities_FortranMatrix* r,
-mv_MultiVectorPtr z,
-HYPRE_Int (*dpotrf) (const char *uplo, HYPRE_Int *n, HYPRE_Real *a, HYPRE_Int *lda, HYPRE_Int *info)
+lobpcg_MultiVectorImplicitQR(
+   mv_MultiVectorPtr x, mv_MultiVectorPtr y,
+   utilities_FortranMatrix* r,
+   mv_MultiVectorPtr z,
+   HYPRE_Int (*dpotrf) (const char *uplo, HYPRE_Int *n, HYPRE_Real *a, HYPRE_Int *lda, HYPRE_Int *info)
 
-){
+)
+{
 
-  /* B-orthonormalizes x using y = B x */
+   /* B-orthonormalizes x using y = B x */
 
-  HYPRE_Int ierr;
+   HYPRE_Int ierr;
 
-  lobpcg_MultiVectorByMultiVector( x, y, r );
+   lobpcg_MultiVectorByMultiVector( x, y, r );
 
-  ierr = lobpcg_chol( r,dpotrf );
+   ierr = lobpcg_chol( r, dpotrf );
 
-  if ( ierr != 0 )
-    return ierr;
+   if ( ierr != 0 )
+   {
+      return ierr;
+   }
 
-  utilities_FortranMatrixUpperInv( r );
-  utilities_FortranMatrixClearL( r );
+   utilities_FortranMatrixUpperInv( r );
+   utilities_FortranMatrixClearL( r );
 
-  mv_MultiVectorCopy( x, z );
-  lobpcg_MultiVectorByMatrix( z, r, x );
+   mv_MultiVectorCopy( x, z );
+   lobpcg_MultiVectorByMatrix( z, r, x );
 
-  return 0;
+   return 0;
 }
 
 static void
-lobpcg_sqrtVector( HYPRE_Int n, HYPRE_Int* mask, HYPRE_Real* v ) {
+lobpcg_sqrtVector( HYPRE_Int n, HYPRE_Int* mask, HYPRE_Real* v )
+{
 
-  HYPRE_Int i;
+   HYPRE_Int i;
 
-  for ( i = 0; i < n; i++ )
-    if ( mask == NULL || mask[i] )
-      v[i] = sqrt(v[i]);
+   for ( i = 0; i < n; i++ )
+      if ( mask == NULL || mask[i] )
+      {
+         v[i] = hypre_sqrt(v[i]);
+      }
 }
 
 static HYPRE_Int
-lobpcg_checkResiduals( 
-utilities_FortranMatrix* resNorms,
-utilities_FortranMatrix* lambda,
-lobpcg_Tolerance tol,
-HYPRE_Int* activeMask
-){
-  HYPRE_Int i, n;
-  HYPRE_Int notConverged;
-  HYPRE_Real atol;
-  HYPRE_Real rtol;
-
-  n = utilities_FortranMatrixHeight( resNorms );
-
-  atol = tol.absolute;
-  rtol = tol.relative;
-
-  notConverged = 0;
-  for ( i = 0; i < n; i++ ) {
-    if ( utilities_FortranMatrixValue( resNorms, i + 1, 1 ) >
-	 utilities_FortranMatrixValue( lambda, i + 1, 1 )*rtol + atol
-	 + HYPRE_REAL_EPSILON ) {
-      activeMask[i] = 1; 
-      notConverged++;
-    }
-    else
-      activeMask[i] = 0;
-  }
-  return notConverged;
+lobpcg_checkResiduals(
+   utilities_FortranMatrix* resNorms,
+   utilities_FortranMatrix* lambda,
+   lobpcg_Tolerance tol,
+   HYPRE_Int* activeMask
+)
+{
+   HYPRE_Int i, n;
+   HYPRE_Int notConverged;
+   HYPRE_Real atol;
+   HYPRE_Real rtol;
+
+   n = utilities_FortranMatrixHeight( resNorms );
+
+   atol = tol.absolute;
+   rtol = tol.relative;
+
+   notConverged = 0;
+   for ( i = 0; i < n; i++ )
+   {
+      if ( utilities_FortranMatrixValue( resNorms, i + 1, 1 ) >
+           utilities_FortranMatrixValue( lambda, i + 1, 1 )*rtol + atol
+           + HYPRE_REAL_EPSILON )
+      {
+         activeMask[i] = 1;
+         notConverged++;
+      }
+      else
+      {
+         activeMask[i] = 0;
+      }
+   }
+   return notConverged;
 }
 
 static void
 lobpcg_errorMessage( HYPRE_Int verbosityLevel, const char* message )
 {
-  if ( verbosityLevel ) {
-    hypre_fprintf( stderr, "Error in LOBPCG:\n" );
-    hypre_fprintf( stderr, "%s", message );
-  }
+   if ( verbosityLevel )
+   {
+      hypre_fprintf( stderr, "Error in LOBPCG:\n" );
+      hypre_fprintf( stderr, "%s", message );
+   }
 }
 
 HYPRE_Int
 lobpcg_solve( mv_MultiVectorPtr blockVectorX,
-	      void* operatorAData,
-	      void (*operatorA)( void*, void*, void* ),
-	      void* operatorBData,
-	      void (*operatorB)( void*, void*, void* ),
-	      void* operatorTData,
-	      void (*operatorT)( void*, void*, void* ),
-	      mv_MultiVectorPtr blockVectorY,
+              void* operatorAData,
+              void (*operatorA)( void*, void*, void* ),
+              void* operatorBData,
+              void (*operatorB)( void*, void*, void* ),
+              void* operatorTData,
+              void (*operatorT)( void*, void*, void* ),
+              mv_MultiVectorPtr blockVectorY,
               lobpcg_BLASLAPACKFunctions blap_fn,
-	      lobpcg_Tolerance tolerance,
-	      HYPRE_Int maxIterations,
-	      HYPRE_Int verbosityLevel,
-	      HYPRE_Int* iterationNumber,
+              lobpcg_Tolerance tolerance,
+              HYPRE_Int maxIterations,
+              HYPRE_Int verbosityLevel,
+              HYPRE_Int* iterationNumber,
 
-/* eigenvalues; "lambda_values" should point to array  containing <blocksize> doubles where <blocksi
-ze> is the width of multivector "blockVectorX" */
+              /* eigenvalues; "lambda_values" should point to array  containing <blocksize> doubles where <blocksi
+              ze> is the width of multivector "blockVectorX" */
               HYPRE_Real * lambda_values,
 
-/* eigenvalues history; a pointer to the entries of the  <blocksize>-by-(<maxIterations>+1) matrix s
-tored
-in  fortran-style. (i.e. column-wise) The matrix may be  a submatrix of a larger matrix, see next
-argument; If you don't need eigenvalues history, provide NULL in this entry */
+              /* eigenvalues history; a pointer to the entries of the  <blocksize>-by-(<maxIterations>+1) matrix s
+              tored
+              in  fortran-style. (i.e. column-wise) The matrix may be  a submatrix of a larger matrix, see next
+              argument; If you don't need eigenvalues history, provide NULL in this entry */
               HYPRE_Real * lambdaHistory_values,
 
-/* global height of the matrix (stored in fotran-style)  specified by previous argument */
-              HYPRE_Int lambdaHistory_gh,
+              /* global height of the matrix (stored in fotran-style)  specified by previous argument */
+              HYPRE_BigInt lambdaHistory_gh,
 
-/* residual norms; argument should point to array of <blocksize> doubles */
+              /* residual norms; argument should point to array of <blocksize> doubles */
               HYPRE_Real * residualNorms_values,
 
-/* residual norms history; a pointer to the entries of the  <blocksize>-by-(<maxIterations>+1) matri
-x
-stored in  fortran-style. (i.e. column-wise) The matrix may be  a submatrix of a larger matrix, see
-next
-argument If you don't need residual norms history, provide NULL in this entry */
-              HYPRE_Real * residualNormsHistory_values ,
+              /* residual norms history; a pointer to the entries of the  <blocksize>-by-(<maxIterations>+1) matri
+              x
+              stored in  fortran-style. (i.e. column-wise) The matrix may be  a submatrix of a larger matrix, see
+              next
+              argument If you don't need residual norms history, provide NULL in this entry */
+              HYPRE_Real * residualNormsHistory_values,
 
-/* global height of the matrix (stored in fotran-style)  specified by previous argument */
-              HYPRE_Int residualNormsHistory_gh
+              /* global height of the matrix (stored in fotran-style)  specified by previous argument */
+              HYPRE_BigInt residualNormsHistory_gh
 
-){
+            )
+{
 
-  HYPRE_Int				sizeX; /* number of eigenvectors */
-  HYPRE_Int				sizeY; /* number of constraints */
-  HYPRE_Int				sizeR; /* number of residuals used */
-  HYPRE_Int				sizeP; /* number of conj. directions used */
-  HYPRE_Int				sizeA; /* size of the Gram matrix for A */
-  HYPRE_Int				sizeX3; /* 3*sizeX */
+   HYPRE_Int          sizeX; /* number of eigenvectors */
+   HYPRE_Int          sizeY; /* number of constraints */
+   HYPRE_Int          sizeR; /* number of residuals used */
+   HYPRE_Int          sizeP; /* number of conj. directions used */
+   HYPRE_Int          sizeA; /* size of the Gram matrix for A */
+   HYPRE_Int          sizeX3; /* 3*sizeX */
 
-  HYPRE_Int				firstR; /* first line of the Gram block
-					   corresponding to residuals */
-  HYPRE_Int				lastR; /* last line of this block */
-  HYPRE_Int				firstP; /* same for conjugate directions */
-  HYPRE_Int				lastP;
+   HYPRE_Int          firstR; /* first line of the Gram block
+                  corresponding to residuals */
+   HYPRE_Int          lastR; /* last line of this block */
+   HYPRE_Int          firstP; /* same for conjugate directions */
+   HYPRE_Int          lastP;
 
-  HYPRE_Int				noTFlag; /* nonzero: no preconditioner */
-  HYPRE_Int				noBFlag; /* nonzero: no operator B */
-  HYPRE_Int				noYFlag; /* nonzero: no constaints */
+   HYPRE_Int          noTFlag; /* nonzero: no preconditioner */
+   HYPRE_Int          noBFlag; /* nonzero: no operator B */
+   HYPRE_Int          noYFlag; /* nonzero: no constaints */
 
-  HYPRE_Int				exitFlag; /* 1: problem size is too small,
-					     2: block size < 1,
-					     3: linearly dependent constraints,
-					     -1: requested accuracy not 
-					     achieved */
+   HYPRE_Int          exitFlag; /* 1: problem size is too small,
+                    2: block size < 1,
+                    3: linearly dependent constraints,
+                    -1: requested accuracy not
+                    achieved */
 
-  HYPRE_Int*				activeMask; /* soft locking mask */
+   HYPRE_Int*            activeMask; /* soft locking mask */
 
-  HYPRE_Int				i; /* short loop counter */
+   HYPRE_Int          i; /* short loop counter */
 
 #if 0
-  hypre_longint				n; /* dimension 1 of X */
-  /* had to remove because n is not available in some interfaces */ 
-#endif 
-
-  mv_MultiVectorPtr		blockVectorR; /* residuals */
-  mv_MultiVectorPtr		blockVectorP; /* conjugate directions */
-
-  mv_MultiVectorPtr		blockVectorW; /* auxiliary block vector */
-
-  mv_MultiVectorPtr		blockVectorAX; /* A*X */
-  mv_MultiVectorPtr		blockVectorAR; /* A*R */
-  mv_MultiVectorPtr		blockVectorAP; /* A*P */
-
-  mv_MultiVectorPtr		blockVectorBX; /* B*X */
-  mv_MultiVectorPtr		blockVectorBR; /* B*R */
-  mv_MultiVectorPtr		blockVectorBP; /* B*P */
-
-  mv_MultiVectorPtr		blockVectorBY; /* B*Y */
-
-  utilities_FortranMatrix*	gramA; /* Gram matrix for A */
-  utilities_FortranMatrix*	gramB; /* Gram matrix for B */
-  utilities_FortranMatrix*	lambdaAB; /* eigenvalues of 
-					     gramA u = lambda gram B u */
-  utilities_FortranMatrix*	lambdaX; /* first sizeX eigenvalues in
-					    lambdaAB (ref) */
-
-  utilities_FortranMatrix*	gramXAX; /* XX block of gramA (ref) */
-  utilities_FortranMatrix*	gramRAX; /* XR block of gramA (ref) */
-  utilities_FortranMatrix*	gramPAX; /* XP block of gramA (ref) */
-
-  utilities_FortranMatrix*	gramRAR; /* RR block of gramA (ref) */
-  utilities_FortranMatrix*	gramPAR; /* RP block of gramA (ref) */
-	
-  utilities_FortranMatrix*	gramPAP; /* PP block of gramA (ref) */
-
-  utilities_FortranMatrix*	gramXBX; /* XX block of gramB (ref) */
-  utilities_FortranMatrix*	gramRBX; /* XR block of gramB (ref) */
-  utilities_FortranMatrix*	gramPBX; /* XP block of gramB (ref) */
-
-  utilities_FortranMatrix*	gramRBR; /* RR block of gramB (ref) */
-  utilities_FortranMatrix*	gramPBR; /* RP block of gramB (ref) */
-	
-  utilities_FortranMatrix*	gramPBP; /* PP block of gramB (ref) */
-	
-  utilities_FortranMatrix*	gramYBY; /* Matrices for constraints */
-  utilities_FortranMatrix*	gramYBX; 
-  utilities_FortranMatrix*	tempYBX; 
-  utilities_FortranMatrix*	gramYBR; /* ref. */
-  utilities_FortranMatrix*	tempYBR; /* ref. */ 
-
-  utilities_FortranMatrix*	coordX; /* coordinates of the first sizeX
-					   Ritz vectors in the XRP basis */
-  utilities_FortranMatrix*	coordXX; /* coordinates of the above in X */
-  utilities_FortranMatrix*	coordRX; /* coordinates of the above in R */
-  utilities_FortranMatrix*	coordPX; /* coordinates of the above in P */
-
-  utilities_FortranMatrix*	upperR; /* R factor in QR-fact. (ref) */
-  utilities_FortranMatrix*	historyColumn; /* reference to a column
-						  in history matrices */
-  utilities_FortranMatrix* lambda;
-  utilities_FortranMatrix* lambdaHistory;
-  utilities_FortranMatrix* residualNorms;
-  utilities_FortranMatrix* residualNormsHistory;
-
-  /* initialization */
-
-  exitFlag = 0;
-  *iterationNumber = 0;
-  noTFlag = operatorT == NULL;
-  noBFlag = operatorB == NULL;
-
-  sizeY = mv_MultiVectorWidth( blockVectorY );
-  noYFlag = sizeY == 0;
-
-  sizeX = mv_MultiVectorWidth( blockVectorX );
-
-  lambda = utilities_FortranMatrixCreate();
-  utilities_FortranMatrixWrap(lambda_values, sizeX, sizeX, 1, lambda);
-
-/* prepare to process eigenvalues history, if user has provided non-NULL as "lambdaHistory_values" a
-rgument */
-  if (lambdaHistory_values!=NULL)
-  {
+   hypre_longint            n; /* dimension 1 of X */
+   /* had to remove because n is not available in some interfaces */
+#endif
+
+   mv_MultiVectorPtr     blockVectorR; /* residuals */
+   mv_MultiVectorPtr     blockVectorP; /* conjugate directions */
+
+   mv_MultiVectorPtr     blockVectorW; /* auxiliary block vector */
+
+   mv_MultiVectorPtr     blockVectorAX; /* A*X */
+   mv_MultiVectorPtr     blockVectorAR; /* A*R */
+   mv_MultiVectorPtr     blockVectorAP; /* A*P */
+
+   mv_MultiVectorPtr     blockVectorBX; /* B*X */
+   mv_MultiVectorPtr     blockVectorBR; /* B*R */
+   mv_MultiVectorPtr     blockVectorBP; /* B*P */
+
+   mv_MultiVectorPtr     blockVectorBY = NULL; /* B*Y */
+
+   utilities_FortranMatrix* gramA; /* Gram matrix for A */
+   utilities_FortranMatrix* gramB; /* Gram matrix for B */
+   utilities_FortranMatrix* lambdaAB; /* eigenvalues of
+                    gramA u = lambda gram B u */
+   utilities_FortranMatrix* lambdaX; /* first sizeX eigenvalues in
+                   lambdaAB (ref) */
+
+   utilities_FortranMatrix* gramXAX; /* XX block of gramA (ref) */
+   utilities_FortranMatrix* gramRAX; /* XR block of gramA (ref) */
+   utilities_FortranMatrix* gramPAX; /* XP block of gramA (ref) */
+
+   utilities_FortranMatrix* gramRAR; /* RR block of gramA (ref) */
+   utilities_FortranMatrix* gramPAR; /* RP block of gramA (ref) */
+
+   utilities_FortranMatrix* gramPAP; /* PP block of gramA (ref) */
+
+   utilities_FortranMatrix* gramXBX; /* XX block of gramB (ref) */
+   utilities_FortranMatrix* gramRBX; /* XR block of gramB (ref) */
+   utilities_FortranMatrix* gramPBX; /* XP block of gramB (ref) */
+
+   utilities_FortranMatrix* gramRBR; /* RR block of gramB (ref) */
+   utilities_FortranMatrix* gramPBR; /* RP block of gramB (ref) */
+
+   utilities_FortranMatrix* gramPBP; /* PP block of gramB (ref) */
+
+   utilities_FortranMatrix* gramYBY; /* Matrices for constraints */
+   utilities_FortranMatrix* gramYBX;
+   utilities_FortranMatrix* tempYBX;
+   utilities_FortranMatrix* gramYBR; /* ref. */
+   utilities_FortranMatrix* tempYBR; /* ref. */
+
+   utilities_FortranMatrix* coordX; /* coordinates of the first sizeX
+                  Ritz vectors in the XRP basis */
+   utilities_FortranMatrix* coordXX; /* coordinates of the above in X */
+   utilities_FortranMatrix* coordRX; /* coordinates of the above in R */
+   utilities_FortranMatrix* coordPX; /* coordinates of the above in P */
+
+   utilities_FortranMatrix* upperR; /* R factor in QR-fact. (ref) */
+   utilities_FortranMatrix* historyColumn; /* reference to a column
+                    in history matrices */
+   utilities_FortranMatrix* lambda;
+   utilities_FortranMatrix* lambdaHistory;
+   utilities_FortranMatrix* residualNorms;
+   utilities_FortranMatrix* residualNormsHistory;
+
+   /* initialization */
+
+   exitFlag = 0;
+   *iterationNumber = 0;
+   noTFlag = operatorT == NULL;
+   noBFlag = operatorB == NULL;
+
+   sizeY = mv_MultiVectorWidth( blockVectorY );
+   noYFlag = sizeY == 0;
+
+   sizeX = mv_MultiVectorWidth( blockVectorX );
+
+   lambda = utilities_FortranMatrixCreate();
+   utilities_FortranMatrixWrap(lambda_values, sizeX, sizeX, 1, lambda);
+
+   /* prepare to process eigenvalues history, if user has provided non-NULL as "lambdaHistory_values" a
+   rgument */
+   if (lambdaHistory_values != NULL)
+   {
       lambdaHistory = utilities_FortranMatrixCreate();
       utilities_FortranMatrixWrap(lambdaHistory_values, lambdaHistory_gh, sizeX,
-                                    maxIterations+1, lambdaHistory);
-  }
-  else
+                                  maxIterations + 1, lambdaHistory);
+   }
+   else
+   {
       lambdaHistory = NULL;
+   }
 
-  residualNorms = utilities_FortranMatrixCreate();
-  utilities_FortranMatrixWrap(residualNorms_values, sizeX, sizeX, 1, residualNorms);
+   residualNorms = utilities_FortranMatrixCreate();
+   utilities_FortranMatrixWrap(residualNorms_values, sizeX, sizeX, 1, residualNorms);
 
-/* prepare to process residuals history, if user has provided non-NULL as "residualNormsHistory_valu
-es" argument */
-  if (residualNormsHistory_values!=NULL)
-  {
+   /* prepare to process residuals history, if user has provided non-NULL as "residualNormsHistory_valu
+   es" argument */
+   if (residualNormsHistory_values != NULL)
+   {
       residualNormsHistory = utilities_FortranMatrixCreate();
       utilities_FortranMatrixWrap(residualNormsHistory_values, residualNormsHistory_gh,
-                                 sizeX, maxIterations+1,residualNormsHistory);
-  }
-  else
+                                  sizeX, maxIterations + 1, residualNormsHistory);
+   }
+   else
+   {
       residualNormsHistory = NULL;
+   }
 
 #if 0
-  /* had to remove because n is not available in some interfaces */ 
-  n = mv_MultiVectorHeight( blockVectorX );
-
-  if ( n < 5*sizeX ) {
-    exitFlag = PROBLEM_SIZE_TOO_SMALL;
-    lobpcg_errorMessage( verbosityLevel,
-			 "Problem size too small compared to block size\n" );
-    return exitFlag;
-  }
+   /* had to remove because n is not available in some interfaces */
+   n = mv_MultiVectorHeight( blockVectorX );
+
+   if ( n < 5 * sizeX )
+   {
+      exitFlag = PROBLEM_SIZE_TOO_SMALL;
+      lobpcg_errorMessage( verbosityLevel,
+                           "Problem size too small compared to block size\n" );
+      return exitFlag;
+   }
 #endif
-  
-  if ( sizeX < 1 ) {
-    exitFlag = WRONG_BLOCK_SIZE;
-    lobpcg_errorMessage( verbosityLevel,
-			 "The bloc size is wrong.\n" );
-    return exitFlag;
-  }
-
-  gramYBY = utilities_FortranMatrixCreate();
-  gramYBX = utilities_FortranMatrixCreate();
-  tempYBX = utilities_FortranMatrixCreate();
-  gramYBR = utilities_FortranMatrixCreate();
-  tempYBR = utilities_FortranMatrixCreate();
-
-  blockVectorW = mv_MultiVectorCreateCopy( blockVectorX, 0 );
-
-  if ( !noYFlag ) {
-    utilities_FortranMatrixAllocateData( sizeY, sizeY, gramYBY );
-    utilities_FortranMatrixAllocateData( sizeY, sizeX, gramYBX );
-    utilities_FortranMatrixAllocateData( sizeY, sizeX, tempYBX );
-    blockVectorBY = blockVectorY;
-    if ( !noBFlag ) {      
-      blockVectorBY = mv_MultiVectorCreateCopy( blockVectorY, 0 );
-      operatorB( operatorBData, mv_MultiVectorGetData(blockVectorY), 
-                 mv_MultiVectorGetData(blockVectorBY) );
-    };
-
-    lobpcg_MultiVectorByMultiVector( blockVectorBY, blockVectorY, gramYBY );
-    exitFlag = lobpcg_chol( gramYBY, blap_fn.dpotrf );
-    if ( exitFlag != 0 ) {
-      if ( verbosityLevel )
-	hypre_printf("Cannot handle linear dependent constraints\n");
-      utilities_FortranMatrixDestroy( gramYBY );
-      utilities_FortranMatrixDestroy( gramYBX );
-      utilities_FortranMatrixDestroy( tempYBX );
-      utilities_FortranMatrixDestroy( gramYBR );
-      utilities_FortranMatrixDestroy( tempYBR );
+
+   if ( sizeX < 1 )
+   {
+      exitFlag = WRONG_BLOCK_SIZE;
+      lobpcg_errorMessage( verbosityLevel,
+                           "The bloc size is wrong.\n" );
+      return exitFlag;
+   }
+
+   gramYBY = utilities_FortranMatrixCreate();
+   gramYBX = utilities_FortranMatrixCreate();
+   tempYBX = utilities_FortranMatrixCreate();
+   gramYBR = utilities_FortranMatrixCreate();
+   tempYBR = utilities_FortranMatrixCreate();
+
+   blockVectorW = mv_MultiVectorCreateCopy( blockVectorX, 0 );
+
+   if ( !noYFlag )
+   {
+      utilities_FortranMatrixAllocateData( sizeY, sizeY, gramYBY );
+      utilities_FortranMatrixAllocateData( sizeY, sizeX, gramYBX );
+      utilities_FortranMatrixAllocateData( sizeY, sizeX, tempYBX );
+      blockVectorBY = blockVectorY;
       if ( !noBFlag )
-	mv_MultiVectorDestroy( blockVectorBY );
-      mv_MultiVectorDestroy( blockVectorW );
-      return WRONG_CONSTRAINTS;
-    }      
-    utilities_FortranMatrixUpperInv( gramYBY );
-    utilities_FortranMatrixClearL( gramYBY );
-
-    /* apply the constraints to the initial X */
-    lobpcg_MultiVectorByMultiVector( blockVectorBY, blockVectorX, gramYBX );
-    utilities_FortranMatrixMultiply( gramYBY, 1, gramYBX, 0, tempYBX );
-    utilities_FortranMatrixMultiply( gramYBY, 0, tempYBX, 0, gramYBX );
-    lobpcg_MultiVectorByMatrix( blockVectorY, gramYBX, blockVectorW );
-    mv_MultiVectorAxpy( -1.0, blockVectorW, blockVectorX );
-  }
-
-  if ( verbosityLevel ) {
-    hypre_printf("\nSolving ");
-    if ( noBFlag )
-      hypre_printf("standard");
-    else
-      hypre_printf("generalized");
-    hypre_printf(" eigenvalue problem with");
-    if ( noTFlag )
-      hypre_printf("out");
-    hypre_printf(" preconditioning\n\n");
-    hypre_printf("block size %d\n\n", sizeX );
-    if ( noYFlag )
-      hypre_printf("No constraints\n\n");
-    else {
-      if ( sizeY > 1 )
-	hypre_printf("%d constraints\n\n", sizeY);
+      {
+         blockVectorBY = mv_MultiVectorCreateCopy( blockVectorY, 0 );
+         operatorB( operatorBData, mv_MultiVectorGetData(blockVectorY),
+                    mv_MultiVectorGetData(blockVectorBY) );
+      };
+
+      lobpcg_MultiVectorByMultiVector( blockVectorBY, blockVectorY, gramYBY );
+      exitFlag = lobpcg_chol( gramYBY, blap_fn.dpotrf );
+      if ( exitFlag != 0 )
+      {
+         if ( verbosityLevel )
+         {
+            hypre_printf("Cannot handle linear dependent constraints\n");
+         }
+         utilities_FortranMatrixDestroy( gramYBY );
+         utilities_FortranMatrixDestroy( gramYBX );
+         utilities_FortranMatrixDestroy( tempYBX );
+         utilities_FortranMatrixDestroy( gramYBR );
+         utilities_FortranMatrixDestroy( tempYBR );
+         if ( !noBFlag )
+         {
+            mv_MultiVectorDestroy( blockVectorBY );
+         }
+         mv_MultiVectorDestroy( blockVectorW );
+         return WRONG_CONSTRAINTS;
+      }
+      utilities_FortranMatrixUpperInv( gramYBY );
+      utilities_FortranMatrixClearL( gramYBY );
+
+      /* apply the constraints to the initial X */
+      lobpcg_MultiVectorByMultiVector( blockVectorBY, blockVectorX, gramYBX );
+      utilities_FortranMatrixMultiply( gramYBY, 1, gramYBX, 0, tempYBX );
+      utilities_FortranMatrixMultiply( gramYBY, 0, tempYBX, 0, gramYBX );
+      lobpcg_MultiVectorByMatrix( blockVectorY, gramYBX, blockVectorW );
+      mv_MultiVectorAxpy( -1.0, blockVectorW, blockVectorX );
+   }
+
+   if ( verbosityLevel )
+   {
+      hypre_printf("\nSolving ");
+      if ( noBFlag )
+      {
+         hypre_printf("standard");
+      }
+      else
+      {
+         hypre_printf("generalized");
+      }
+      hypre_printf(" eigenvalue problem with");
+      if ( noTFlag )
+      {
+         hypre_printf("out");
+      }
+      hypre_printf(" preconditioning\n\n");
+      hypre_printf("block size %d\n\n", sizeX );
+      if ( noYFlag )
+      {
+         hypre_printf("No constraints\n\n");
+      }
       else
-	hypre_printf("%d constraint\n\n", sizeY);
-    }
-  }
-
-  /* creating fortran matrix shells */
-
-  gramA = utilities_FortranMatrixCreate();
-  gramB = utilities_FortranMatrixCreate();
-  lambdaAB = utilities_FortranMatrixCreate();
-  lambdaX = utilities_FortranMatrixCreate();
-
-  gramXAX = utilities_FortranMatrixCreate();
-  gramRAX = utilities_FortranMatrixCreate();
-  gramPAX = utilities_FortranMatrixCreate();
-
-  gramRAR = utilities_FortranMatrixCreate();
-  gramPAR = utilities_FortranMatrixCreate();
-	
-  gramPAP = utilities_FortranMatrixCreate();
-
-  gramXBX = utilities_FortranMatrixCreate();
-  gramRBX = utilities_FortranMatrixCreate();
-  gramPBX = utilities_FortranMatrixCreate();
-
-  gramRBR = utilities_FortranMatrixCreate();
-  gramPBR = utilities_FortranMatrixCreate();
-	
-  gramPBP = utilities_FortranMatrixCreate();
-	
-  coordX = utilities_FortranMatrixCreate();
-  coordXX = utilities_FortranMatrixCreate();
-  coordRX = utilities_FortranMatrixCreate();
-  coordPX = utilities_FortranMatrixCreate();
-
-  upperR = utilities_FortranMatrixCreate();
-  historyColumn = utilities_FortranMatrixCreate();
-  
-  /* initializing soft locking mask */
-  activeMask = hypre_CTAlloc(HYPRE_Int,  sizeX, HYPRE_MEMORY_HOST);
-  hypre_assert( activeMask != NULL );
-  for ( i = 0; i < sizeX; i++ )
-    activeMask[i] = 1;
-
-  /* allocate memory for Gram matrices and the Ritz values */
-  sizeX3 = 3*sizeX;
-  utilities_FortranMatrixAllocateData( sizeX3, sizeX3, gramA );
-  utilities_FortranMatrixAllocateData( sizeX3, sizeX3, gramB );
-  utilities_FortranMatrixAllocateData( sizeX3, 1, lambdaAB );
-
-  /* creating block vectors R, P, AX, AR, AP, BX, BR, BP and W */
-  blockVectorR = mv_MultiVectorCreateCopy( blockVectorX, 0 );
-  blockVectorP = mv_MultiVectorCreateCopy( blockVectorX, 0 );
-  blockVectorAX = mv_MultiVectorCreateCopy( blockVectorX, 0 );
-  blockVectorAR = mv_MultiVectorCreateCopy( blockVectorX, 0 );
-  blockVectorAP = mv_MultiVectorCreateCopy( blockVectorX, 0 );
-
-  if ( !noBFlag ) {
-    blockVectorBX = mv_MultiVectorCreateCopy( blockVectorX, 0 );
-    blockVectorBR = mv_MultiVectorCreateCopy( blockVectorX, 0 );
-    blockVectorBP = mv_MultiVectorCreateCopy( blockVectorX, 0 );
-  }
-  else {
-    blockVectorBX = blockVectorX;
-    blockVectorBR = blockVectorR;
-    blockVectorBP = blockVectorP;
-  }
-
-  mv_MultiVectorSetMask( blockVectorR, activeMask );
-  mv_MultiVectorSetMask( blockVectorP, activeMask );
-  mv_MultiVectorSetMask( blockVectorAR, activeMask );
-  mv_MultiVectorSetMask( blockVectorAP, activeMask );
-  if ( !noBFlag ) {
-    mv_MultiVectorSetMask( blockVectorBR, activeMask );
-    mv_MultiVectorSetMask( blockVectorBP, activeMask );
-  }
-  mv_MultiVectorSetMask( blockVectorW, activeMask );
-
-  /* B-orthonormaliization of X */
-  /* selecting a block in gramB for R factor upperR */
-  utilities_FortranMatrixSelectBlock( gramB, 1, sizeX, 1, sizeX, upperR );
-  if ( !noBFlag ) {
-    operatorB( operatorBData, mv_MultiVectorGetData(blockVectorX), 
-                              mv_MultiVectorGetData(blockVectorBX) );
-  }
-  exitFlag = lobpcg_MultiVectorImplicitQR( blockVectorX, blockVectorBX, 
-					   upperR, blockVectorW,blap_fn.dpotrf );
-  if ( exitFlag ) {
-    lobpcg_errorMessage( verbosityLevel, "Bad initial vectors: orthonormalization failed\n" );
-    if ( verbosityLevel )
-      hypre_printf("DPOTRF INFO = %d\n", exitFlag);
-  }
-  else {
-
-    if ( !noBFlag ) { /* update BX */
-      lobpcg_MultiVectorByMatrix( blockVectorBX, upperR, blockVectorW );
-      mv_MultiVectorCopy( blockVectorW, blockVectorBX );
-    }
-
-    operatorA( operatorAData, mv_MultiVectorGetData(blockVectorX), 
-               mv_MultiVectorGetData(blockVectorAX) );
-
-    /* gramXAX = X'*AX */
-    utilities_FortranMatrixSelectBlock( gramA, 1, sizeX, 1, sizeX, gramXAX );
-    lobpcg_MultiVectorByMultiVector( blockVectorX, blockVectorAX, gramXAX );
-    utilities_FortranMatrixSymmetrize( gramXAX );
-
-    /* gramXBX = X'*X */ 
-    utilities_FortranMatrixSelectBlock( gramB, 1, sizeX, 1, sizeX, gramXBX );
-    lobpcg_MultiVectorByMultiVector( blockVectorX, blockVectorBX, gramXBX );
-    utilities_FortranMatrixSymmetrize( gramXBX );
-    /*  utilities_FortranMatrixSetToIdentity( gramXBX );*/ /* X may be bad! */
-    
-    if ( (exitFlag = lobpcg_solveGEVP( gramXAX, gramXBX, lambda,blap_fn.dsygv)) != 0 ) {
-      lobpcg_errorMessage( verbosityLevel, 
-			   "Bad problem: Rayleigh-Ritz in the initial subspace failed\n" );
+      {
+         if ( sizeY > 1 )
+         {
+            hypre_printf("%d constraints\n\n", sizeY);
+         }
+         else
+         {
+            hypre_printf("%d constraint\n\n", sizeY);
+         }
+      }
+   }
+
+   /* creating fortran matrix shells */
+
+   gramA = utilities_FortranMatrixCreate();
+   gramB = utilities_FortranMatrixCreate();
+   lambdaAB = utilities_FortranMatrixCreate();
+   lambdaX = utilities_FortranMatrixCreate();
+
+   gramXAX = utilities_FortranMatrixCreate();
+   gramRAX = utilities_FortranMatrixCreate();
+   gramPAX = utilities_FortranMatrixCreate();
+
+   gramRAR = utilities_FortranMatrixCreate();
+   gramPAR = utilities_FortranMatrixCreate();
+
+   gramPAP = utilities_FortranMatrixCreate();
+
+   gramXBX = utilities_FortranMatrixCreate();
+   gramRBX = utilities_FortranMatrixCreate();
+   gramPBX = utilities_FortranMatrixCreate();
+
+   gramRBR = utilities_FortranMatrixCreate();
+   gramPBR = utilities_FortranMatrixCreate();
+
+   gramPBP = utilities_FortranMatrixCreate();
+
+   coordX = utilities_FortranMatrixCreate();
+   coordXX = utilities_FortranMatrixCreate();
+   coordRX = utilities_FortranMatrixCreate();
+   coordPX = utilities_FortranMatrixCreate();
+
+   upperR = utilities_FortranMatrixCreate();
+   historyColumn = utilities_FortranMatrixCreate();
+
+   /* initializing soft locking mask */
+   activeMask = hypre_CTAlloc(HYPRE_Int,  sizeX, HYPRE_MEMORY_HOST);
+   hypre_assert( activeMask != NULL );
+   for ( i = 0; i < sizeX; i++ )
+   {
+      activeMask[i] = 1;
+   }
+
+   /* allocate memory for Gram matrices and the Ritz values */
+   sizeX3 = 3 * sizeX;
+   utilities_FortranMatrixAllocateData( sizeX3, sizeX3, gramA );
+   utilities_FortranMatrixAllocateData( sizeX3, sizeX3, gramB );
+   utilities_FortranMatrixAllocateData( sizeX3, 1, lambdaAB );
+
+   /* creating block vectors R, P, AX, AR, AP, BX, BR, BP and W */
+   blockVectorR = mv_MultiVectorCreateCopy( blockVectorX, 0 );
+   blockVectorP = mv_MultiVectorCreateCopy( blockVectorX, 0 );
+   blockVectorAX = mv_MultiVectorCreateCopy( blockVectorX, 0 );
+   blockVectorAR = mv_MultiVectorCreateCopy( blockVectorX, 0 );
+   blockVectorAP = mv_MultiVectorCreateCopy( blockVectorX, 0 );
+
+   if ( !noBFlag )
+   {
+      blockVectorBX = mv_MultiVectorCreateCopy( blockVectorX, 0 );
+      blockVectorBR = mv_MultiVectorCreateCopy( blockVectorX, 0 );
+      blockVectorBP = mv_MultiVectorCreateCopy( blockVectorX, 0 );
+   }
+   else
+   {
+      blockVectorBX = blockVectorX;
+      blockVectorBR = blockVectorR;
+      blockVectorBP = blockVectorP;
+   }
+
+   mv_MultiVectorSetMask( blockVectorR, activeMask );
+   mv_MultiVectorSetMask( blockVectorP, activeMask );
+   mv_MultiVectorSetMask( blockVectorAR, activeMask );
+   mv_MultiVectorSetMask( blockVectorAP, activeMask );
+   if ( !noBFlag )
+   {
+      mv_MultiVectorSetMask( blockVectorBR, activeMask );
+      mv_MultiVectorSetMask( blockVectorBP, activeMask );
+   }
+   mv_MultiVectorSetMask( blockVectorW, activeMask );
+
+   /* B-orthonormaliization of X */
+   /* selecting a block in gramB for R factor upperR */
+   utilities_FortranMatrixSelectBlock( gramB, 1, sizeX, 1, sizeX, upperR );
+   if ( !noBFlag )
+   {
+      operatorB( operatorBData, mv_MultiVectorGetData(blockVectorX),
+                 mv_MultiVectorGetData(blockVectorBX) );
+   }
+   exitFlag = lobpcg_MultiVectorImplicitQR( blockVectorX, blockVectorBX,
+                                            upperR, blockVectorW, blap_fn.dpotrf );
+   if ( exitFlag )
+   {
+      lobpcg_errorMessage( verbosityLevel, "Bad initial vectors: orthonormalization failed\n" );
       if ( verbosityLevel )
-	hypre_printf("DSYGV INFO = %d\n", exitFlag);
-    }
-    else {
-      utilities_FortranMatrixSelectBlock( gramXAX, 1, sizeX, 1, sizeX, coordX );
+      {
+         hypre_printf("DPOTRF INFO = %d\n", exitFlag);
+      }
+   }
+   else
+   {
+
+      if ( !noBFlag )   /* update BX */
+      {
+         lobpcg_MultiVectorByMatrix( blockVectorBX, upperR, blockVectorW );
+         mv_MultiVectorCopy( blockVectorW, blockVectorBX );
+      }
 
-      lobpcg_MultiVectorByMatrix( blockVectorX, coordX, blockVectorW );
-      mv_MultiVectorCopy( blockVectorW, blockVectorX );
+      operatorA( operatorAData, mv_MultiVectorGetData(blockVectorX),
+                 mv_MultiVectorGetData(blockVectorAX) );
+
+      /* gramXAX = X'*AX */
+      utilities_FortranMatrixSelectBlock( gramA, 1, sizeX, 1, sizeX, gramXAX );
+      lobpcg_MultiVectorByMultiVector( blockVectorX, blockVectorAX, gramXAX );
+      utilities_FortranMatrixSymmetrize( gramXAX );
+
+      /* gramXBX = X'*X */
+      utilities_FortranMatrixSelectBlock( gramB, 1, sizeX, 1, sizeX, gramXBX );
+      lobpcg_MultiVectorByMultiVector( blockVectorX, blockVectorBX, gramXBX );
+      utilities_FortranMatrixSymmetrize( gramXBX );
+      /*  utilities_FortranMatrixSetToIdentity( gramXBX );*/ /* X may be bad! */
+
+      if ( (exitFlag = lobpcg_solveGEVP( gramXAX, gramXBX, lambda, blap_fn.dsygv)) != 0 )
+      {
+         lobpcg_errorMessage( verbosityLevel,
+                              "Bad problem: Rayleigh-Ritz in the initial subspace failed\n" );
+         if ( verbosityLevel )
+         {
+            hypre_printf("DSYGV INFO = %d\n", exitFlag);
+         }
+      }
+      else
+      {
+         utilities_FortranMatrixSelectBlock( gramXAX, 1, sizeX, 1, sizeX, coordX );
+
+         lobpcg_MultiVectorByMatrix( blockVectorX, coordX, blockVectorW );
+         mv_MultiVectorCopy( blockVectorW, blockVectorX );
+
+         lobpcg_MultiVectorByMatrix( blockVectorAX, coordX, blockVectorW );
+         mv_MultiVectorCopy( blockVectorW, blockVectorAX );
+
+         if ( !noBFlag )
+         {
+            lobpcg_MultiVectorByMatrix( blockVectorBX, coordX, blockVectorW );
+            mv_MultiVectorCopy( blockVectorW, blockVectorBX );
+         }
+
+         /*
+         lobpcg_MultiVectorByMultiVector( blockVectorBX, blockVectorX, upperR );
+         utilities_FortranMatrixPrint( upperR, "xbx.dat" );
+         utilities_FortranMatrixPrint( lambda, "lmd.dat" );
+         */
+
+         mv_MultiVectorByDiagonal( blockVectorBX,
+                                   NULL, sizeX,
+                                   utilities_FortranMatrixValues( lambda ),
+                                   blockVectorR );
+
+         mv_MultiVectorAxpy( -1.0, blockVectorAX, blockVectorR );
+
+         mv_MultiVectorByMultiVectorDiag( blockVectorR, blockVectorR,
+                                          NULL, sizeX,
+                                          utilities_FortranMatrixValues( residualNorms ) );
+
+         lobpcg_sqrtVector( sizeX, NULL,
+                            utilities_FortranMatrixValues( residualNorms ) );
+
+         if ( lambdaHistory != NULL )
+         {
+            utilities_FortranMatrixSelectBlock( lambdaHistory, 1, sizeX, 1, 1,
+                                                historyColumn );
+            utilities_FortranMatrixCopy( lambda, 0, historyColumn );
+         }
+
+         if ( residualNormsHistory != NULL )
+         {
+            utilities_FortranMatrixSelectBlock( residualNormsHistory, 1, sizeX, 1, 1,
+                                                historyColumn );
+            utilities_FortranMatrixCopy( residualNorms, 0, historyColumn );
+         }
+
+         if ( verbosityLevel == 2 )
+         {
+            hypre_printf("\n");
+            for (i = 1; i <= sizeX; i++ )
+               hypre_printf("Initial eigenvalues lambda %22.14e\n",
+                            utilities_FortranMatrixValue( lambda, i, 1) );
+            for (i = 1; i <= sizeX; i++)
+               hypre_printf("Initial residuals %12.6e\n",
+                            utilities_FortranMatrixValue( residualNorms, i, 1) );
+         }
+         else if ( verbosityLevel == 1 )
+            hypre_printf("\nInitial Max. Residual %22.14e\n",
+                         utilities_FortranMatrixMaxValue( residualNorms ) );
+      }
+   }
 
-      lobpcg_MultiVectorByMatrix( blockVectorAX, coordX, blockVectorW );
-      mv_MultiVectorCopy( blockVectorW, blockVectorAX );
+   for ( *iterationNumber = 1; exitFlag == 0 && *iterationNumber <= maxIterations;
+         (*iterationNumber)++ )
+   {
 
-      if ( !noBFlag ) {
-	lobpcg_MultiVectorByMatrix( blockVectorBX, coordX, blockVectorW );
-	mv_MultiVectorCopy( blockVectorW, blockVectorBX );
+      sizeR = lobpcg_checkResiduals( residualNorms, lambda, tolerance,
+                                     activeMask );
+      if ( sizeR < 1 )
+      {
+         break;
       }
 
-      /*
-      lobpcg_MultiVectorByMultiVector( blockVectorBX, blockVectorX, upperR );
-      utilities_FortranMatrixPrint( upperR, "xbx.dat" );
-      utilities_FortranMatrixPrint( lambda, "lmd.dat" );
-      */
+      /* following code added by Ilya Lashuk on March 22, 2005; with current
+         multivector implementation mask needs to be reset after it has changed on each vector
+         mask applies to */
 
-      mv_MultiVectorByDiagonal( blockVectorBX, 
-				   NULL, sizeX, 
-				   utilities_FortranMatrixValues( lambda ),
-				   blockVectorR );
+      mv_MultiVectorSetMask( blockVectorR, activeMask );
+      mv_MultiVectorSetMask( blockVectorP, activeMask );
+      mv_MultiVectorSetMask( blockVectorAR, activeMask );
+      mv_MultiVectorSetMask( blockVectorAP, activeMask );
+      if ( !noBFlag )
+      {
+         mv_MultiVectorSetMask( blockVectorBR, activeMask );
+         mv_MultiVectorSetMask( blockVectorBP, activeMask );
+      }
+      mv_MultiVectorSetMask( blockVectorW, activeMask );
 
-      mv_MultiVectorAxpy( -1.0, blockVectorAX, blockVectorR );
+      /* ***** end of added code ***** */
 
-      mv_MultiVectorByMultiVectorDiag( blockVectorR, blockVectorR, 
-					  NULL, sizeX, 
-					  utilities_FortranMatrixValues( residualNorms ) ); 
+      if ( !noTFlag )
+      {
+         operatorT( operatorTData, mv_MultiVectorGetData(blockVectorR),
+                    mv_MultiVectorGetData(blockVectorW) );
+         mv_MultiVectorCopy( blockVectorW, blockVectorR );
+      }
 
-      lobpcg_sqrtVector( sizeX, NULL, 
-			 utilities_FortranMatrixValues( residualNorms ) );
+      if ( !noYFlag )   /* apply the constraints to R  */
+      {
+         utilities_FortranMatrixSelectBlock( gramYBX, 1, sizeY, 1, sizeR, gramYBR );
+         utilities_FortranMatrixSelectBlock( tempYBX, 1, sizeY, 1, sizeR, tempYBR );
 
-      if ( lambdaHistory != NULL ) {
-	utilities_FortranMatrixSelectBlock( lambdaHistory, 1, sizeX, 1, 1, 
-					    historyColumn );
-	utilities_FortranMatrixCopy( lambda, 0, historyColumn );
+         lobpcg_MultiVectorByMultiVector( blockVectorBY, blockVectorR, gramYBR );
+         utilities_FortranMatrixMultiply( gramYBY, 1, gramYBR, 0, tempYBR );
+         utilities_FortranMatrixMultiply( gramYBY, 0, tempYBR, 0, gramYBR );
+         lobpcg_MultiVectorByMatrix( blockVectorY, gramYBR, blockVectorW );
+         mv_MultiVectorAxpy( -1.0, blockVectorW, blockVectorR );
       }
-	
-      if ( residualNormsHistory != NULL ) {
-	utilities_FortranMatrixSelectBlock( residualNormsHistory, 1, sizeX, 1, 1, 
-					    historyColumn );
-	utilities_FortranMatrixCopy( residualNorms, 0, historyColumn );
+
+      firstR = sizeX + 1;
+      lastR = sizeX + sizeR;
+      firstP = lastR + 1;
+
+      utilities_FortranMatrixSelectBlock( gramB, firstR, lastR, firstR, lastR, upperR );
+
+      if ( !noBFlag )
+      {
+         operatorB( operatorBData, mv_MultiVectorGetData(blockVectorR),
+                    mv_MultiVectorGetData(blockVectorBR) );
       }
-	
-      if ( verbosityLevel == 2 ) {
-	hypre_printf("\n");
-	for (i = 1; i <= sizeX; i++ ) 
-	  hypre_printf("Initial eigenvalues lambda %22.14e\n",
-		 utilities_FortranMatrixValue( lambda, i, 1) );
-	for (i = 1; i <= sizeX; i++) 
-	  hypre_printf("Initial residuals %12.6e\n",
-		 utilities_FortranMatrixValue( residualNorms, i, 1) );
+      exitFlag = lobpcg_MultiVectorImplicitQR( blockVectorR, blockVectorBR,
+                                               upperR, blockVectorW, blap_fn.dpotrf );
+      if ( exitFlag )
+      {
+         lobpcg_errorMessage( verbosityLevel, "Orthonormalization of residuals failed\n" );
+         if ( verbosityLevel )
+         {
+            hypre_printf("DPOTRF INFO = %d\n", exitFlag);
+         }
+         break;
       }
-      else if ( verbosityLevel == 1 )
-	hypre_printf("\nInitial Max. Residual %22.14e\n",
-	       utilities_FortranMatrixMaxValue( residualNorms ) );
-    }
-  }
-
-  for ( *iterationNumber = 1; exitFlag == 0 && *iterationNumber <= maxIterations; 
-	(*iterationNumber)++ ) {
-    
-    sizeR = lobpcg_checkResiduals( residualNorms, lambda, tolerance, 
-				   activeMask );
-    if ( sizeR < 1 )
-      break;
-
-/* following code added by Ilya Lashuk on March 22, 2005; with current 
-   multivector implementation mask needs to be reset after it has changed on each vector
-   mask applies to */
-   
-    mv_MultiVectorSetMask( blockVectorR, activeMask );
-    mv_MultiVectorSetMask( blockVectorP, activeMask );
-    mv_MultiVectorSetMask( blockVectorAR, activeMask );
-    mv_MultiVectorSetMask( blockVectorAP, activeMask );
-    if ( !noBFlag ) {
-      mv_MultiVectorSetMask( blockVectorBR, activeMask );
-      mv_MultiVectorSetMask( blockVectorBP, activeMask );
-    }
-    mv_MultiVectorSetMask( blockVectorW, activeMask );
-
-/* ***** end of added code ***** */
-
-    if ( !noTFlag ) {
-      operatorT( operatorTData, mv_MultiVectorGetData(blockVectorR), 
-                 mv_MultiVectorGetData(blockVectorW) );
-      mv_MultiVectorCopy( blockVectorW, blockVectorR );
-    }
-
-    if ( !noYFlag ) { /* apply the constraints to R  */
-      utilities_FortranMatrixSelectBlock( gramYBX, 1, sizeY, 1, sizeR, gramYBR );
-      utilities_FortranMatrixSelectBlock( tempYBX, 1, sizeY, 1, sizeR, tempYBR );
-
-      lobpcg_MultiVectorByMultiVector( blockVectorBY, blockVectorR, gramYBR );
-      utilities_FortranMatrixMultiply( gramYBY, 1, gramYBR, 0, tempYBR );
-      utilities_FortranMatrixMultiply( gramYBY, 0, tempYBR, 0, gramYBR );
-      lobpcg_MultiVectorByMatrix( blockVectorY, gramYBR, blockVectorW );
-      mv_MultiVectorAxpy( -1.0, blockVectorW, blockVectorR );
-    }
-
-    firstR = sizeX + 1;
-    lastR = sizeX + sizeR;
-    firstP = lastR + 1;
-
-    utilities_FortranMatrixSelectBlock( gramB, firstR, lastR, firstR, lastR, upperR );
-
-    if ( !noBFlag ) {
-      operatorB( operatorBData, mv_MultiVectorGetData(blockVectorR), 
-                 mv_MultiVectorGetData(blockVectorBR) );
-    }
-    exitFlag = lobpcg_MultiVectorImplicitQR( blockVectorR, blockVectorBR, 
-					     upperR, blockVectorW,blap_fn.dpotrf );
-    if ( exitFlag ) {
-      lobpcg_errorMessage( verbosityLevel, "Orthonormalization of residuals failed\n" );
-      if ( verbosityLevel )
-	hypre_printf("DPOTRF INFO = %d\n", exitFlag);
-      break;
-    }
-
-    if ( !noBFlag ) { /* update BR */
-      lobpcg_MultiVectorByMatrix( blockVectorBR, upperR, blockVectorW );
-      mv_MultiVectorCopy( blockVectorW, blockVectorBR );
-    }
-
-    /* AR = A*R */
-    operatorA( operatorAData, mv_MultiVectorGetData(blockVectorR), 
-               mv_MultiVectorGetData(blockVectorAR) );
-
-    if ( *iterationNumber > 1 ) {
-
-      sizeP = sizeR;
-      lastP = lastR + sizeP;
-
-      utilities_FortranMatrixSelectBlock( gramB, firstP, lastP, firstP, lastP, upperR );
-
-      exitFlag = lobpcg_MultiVectorImplicitQR( blockVectorP, blockVectorBP, 
-					       upperR, blockVectorW,blap_fn.dpotrf );
-      if ( exitFlag ) {
-	/*
-	lobpcg_errorMessage( verbosityLevel, "Orthonormalization of P failed\n" );
-	if ( verbosityLevel )
-	  hypre_printf("DPOTRF INFO = %d\n", exitFlag);
-	*/
-	sizeP = 0;
+
+      if ( !noBFlag )   /* update BR */
+      {
+         lobpcg_MultiVectorByMatrix( blockVectorBR, upperR, blockVectorW );
+         mv_MultiVectorCopy( blockVectorW, blockVectorBR );
+      }
+
+      /* AR = A*R */
+      operatorA( operatorAData, mv_MultiVectorGetData(blockVectorR),
+                 mv_MultiVectorGetData(blockVectorAR) );
+
+      if ( *iterationNumber > 1 )
+      {
+
+         sizeP = sizeR;
+         lastP = lastR + sizeP;
+
+         utilities_FortranMatrixSelectBlock( gramB, firstP, lastP, firstP, lastP, upperR );
+
+         exitFlag = lobpcg_MultiVectorImplicitQR( blockVectorP, blockVectorBP,
+                                                  upperR, blockVectorW, blap_fn.dpotrf );
+         if ( exitFlag )
+         {
+            /*
+            lobpcg_errorMessage( verbosityLevel, "Orthonormalization of P failed\n" );
+            if ( verbosityLevel )
+              hypre_printf("DPOTRF INFO = %d\n", exitFlag);
+            */
+            sizeP = 0;
+         }
+         else
+         {
+
+            if ( !noBFlag )   /* update BP */
+            {
+               lobpcg_MultiVectorByMatrix( blockVectorBP, upperR, blockVectorW );
+               mv_MultiVectorCopy( blockVectorW, blockVectorBP );
+            }
+
+            /* update AP */
+            lobpcg_MultiVectorByMatrix( blockVectorAP, upperR, blockVectorW );
+            mv_MultiVectorCopy( blockVectorW, blockVectorAP );
+         }
+      }
+      else
+      {
+
+         sizeP = 0;
+         lastP = lastR;
+      }
+
+      sizeA = lastR + sizeP;
+
+      utilities_FortranMatrixSelectBlock( gramA, 1, sizeX, 1, sizeX, gramXAX );
+      utilities_FortranMatrixSelectBlock( gramA, firstR, lastR, 1, sizeX,
+                                          gramRAX );
+      utilities_FortranMatrixSelectBlock( gramA, firstR, lastR, firstR, lastR,
+                                          gramRAR );
+
+      utilities_FortranMatrixSelectBlock( gramB, 1, sizeX, 1, sizeX, gramXBX );
+      utilities_FortranMatrixSelectBlock( gramB, firstR, lastR, 1, sizeX,
+                                          gramRBX );
+      utilities_FortranMatrixSelectBlock( gramB, firstR, lastR, firstR, lastR,
+                                          gramRBR );
+
+      utilities_FortranMatrixClear( gramXAX );
+      utilities_FortranMatrixSetDiagonal( gramXAX, lambda );
+
+      lobpcg_MultiVectorByMultiVector( blockVectorR, blockVectorAX, gramRAX );
+
+      lobpcg_MultiVectorByMultiVector( blockVectorR, blockVectorAR, gramRAR );
+      utilities_FortranMatrixSymmetrize( gramRAR );
+
+      utilities_FortranMatrixSetToIdentity( gramXBX );
+
+      lobpcg_MultiVectorByMultiVector( blockVectorR, blockVectorBX, gramRBX );
+
+      utilities_FortranMatrixSetToIdentity( gramRBR );
+
+      if ( *iterationNumber > 1 )
+      {
+
+         utilities_FortranMatrixSelectBlock( gramA, firstP, lastP, 1, sizeX, gramPAX );
+         utilities_FortranMatrixSelectBlock( gramA, firstP, lastP, firstR, lastR, gramPAR );
+         utilities_FortranMatrixSelectBlock( gramA, firstP, lastP, firstP, lastP, gramPAP );
+
+         utilities_FortranMatrixSelectBlock( gramB, firstP, lastP, 1, sizeX, gramPBX );
+         utilities_FortranMatrixSelectBlock( gramB, firstP, lastP, firstR, lastR, gramPBR );
+         utilities_FortranMatrixSelectBlock( gramB, firstP, lastP, firstP, lastP, gramPBP );
+
+         lobpcg_MultiVectorByMultiVector( blockVectorP, blockVectorAX, gramPAX );
+
+         lobpcg_MultiVectorByMultiVector( blockVectorP, blockVectorAR, gramPAR );
+
+         lobpcg_MultiVectorByMultiVector( blockVectorP, blockVectorAP, gramPAP );
+         utilities_FortranMatrixSymmetrize( gramPAP );
+
+         lobpcg_MultiVectorByMultiVector( blockVectorP, blockVectorBX, gramPBX );
+
+         lobpcg_MultiVectorByMultiVector( blockVectorP, blockVectorBR, gramPBR );
+
+         utilities_FortranMatrixSetToIdentity( gramPBP );
       }
-      else {
-			
-	if ( !noBFlag ) { /* update BP */
-	  lobpcg_MultiVectorByMatrix( blockVectorBP, upperR, blockVectorW );
-	  mv_MultiVectorCopy( blockVectorW, blockVectorBP );
-	}
-
-	/* update AP */
-	lobpcg_MultiVectorByMatrix( blockVectorAP, upperR, blockVectorW );
-	mv_MultiVectorCopy( blockVectorW, blockVectorAP );
+
+      utilities_FortranMatrixSelectBlock( gramA, 1, sizeA, 1, sizeA, gramXAX );
+      utilities_FortranMatrixSelectBlock( gramB, 1, sizeA, 1, sizeA, gramXBX );
+
+      if ( (exitFlag = lobpcg_solveGEVP( gramXAX, gramXBX, lambdaAB, blap_fn.dsygv )) != 0 )
+      {
+         lobpcg_errorMessage( verbosityLevel, "GEVP solver failure\n" );
+         (*iterationNumber)--;
+         /* if ( verbosityLevel )
+         hypre_printf("INFO = %d\n", exitFlag);*/
+         break;
       }
-    }
-    else {
-      
-      sizeP = 0;
-      lastP = lastR;
-    }
-
-    sizeA = lastR + sizeP;
-
-    utilities_FortranMatrixSelectBlock( gramA, 1, sizeX, 1, sizeX, gramXAX );
-    utilities_FortranMatrixSelectBlock( gramA, firstR, lastR, 1, sizeX, 
-					gramRAX );
-    utilities_FortranMatrixSelectBlock( gramA, firstR, lastR, firstR, lastR, 
-					gramRAR );
-
-    utilities_FortranMatrixSelectBlock( gramB, 1, sizeX, 1, sizeX, gramXBX );
-    utilities_FortranMatrixSelectBlock( gramB, firstR, lastR, 1, sizeX, 
-					gramRBX );
-    utilities_FortranMatrixSelectBlock( gramB, firstR, lastR, firstR, lastR, 
-					gramRBR );
-
-    utilities_FortranMatrixClear( gramXAX );
-    utilities_FortranMatrixSetDiagonal( gramXAX, lambda );
-		
-    lobpcg_MultiVectorByMultiVector( blockVectorR, blockVectorAX, gramRAX );
-		
-    lobpcg_MultiVectorByMultiVector( blockVectorR, blockVectorAR, gramRAR );
-    utilities_FortranMatrixSymmetrize( gramRAR );
-
-    utilities_FortranMatrixSetToIdentity( gramXBX );
-
-    lobpcg_MultiVectorByMultiVector( blockVectorR, blockVectorBX, gramRBX );
-		
-    utilities_FortranMatrixSetToIdentity( gramRBR );
-
-    if ( *iterationNumber > 1 ) {
-      
-      utilities_FortranMatrixSelectBlock( gramA, firstP, lastP, 1, sizeX, gramPAX );
-      utilities_FortranMatrixSelectBlock( gramA, firstP, lastP, firstR, lastR, gramPAR );
-      utilities_FortranMatrixSelectBlock( gramA, firstP, lastP, firstP, lastP, gramPAP );
-			
-      utilities_FortranMatrixSelectBlock( gramB, firstP, lastP, 1, sizeX, gramPBX );
-      utilities_FortranMatrixSelectBlock( gramB, firstP, lastP, firstR, lastR, gramPBR );
-      utilities_FortranMatrixSelectBlock( gramB, firstP, lastP, firstP, lastP, gramPBP );
-
-      lobpcg_MultiVectorByMultiVector( blockVectorP, blockVectorAX, gramPAX );
-			
-      lobpcg_MultiVectorByMultiVector( blockVectorP, blockVectorAR, gramPAR );
-			
-      lobpcg_MultiVectorByMultiVector( blockVectorP, blockVectorAP, gramPAP );
-      utilities_FortranMatrixSymmetrize( gramPAP );
-
-      lobpcg_MultiVectorByMultiVector( blockVectorP, blockVectorBX, gramPBX );
-			
-      lobpcg_MultiVectorByMultiVector( blockVectorP, blockVectorBR, gramPBR );
-		
-      utilities_FortranMatrixSetToIdentity( gramPBP );
-    }
-	
-    utilities_FortranMatrixSelectBlock( gramA, 1, sizeA, 1, sizeA, gramXAX );
-    utilities_FortranMatrixSelectBlock( gramB, 1, sizeA, 1, sizeA, gramXBX );
-
-    if ( (exitFlag = lobpcg_solveGEVP( gramXAX, gramXBX, lambdaAB, blap_fn.dsygv )) != 0 ) {
-      lobpcg_errorMessage( verbosityLevel, "GEVP solver failure\n" );
-      (*iterationNumber)--;
-      /* if ( verbosityLevel )
-	 hypre_printf("INFO = %d\n", exitFlag);*/
-      break;
-    }
-
-    utilities_FortranMatrixSelectBlock( lambdaAB, 1, sizeX, 1, 1, lambdaX );
-    utilities_FortranMatrixCopy( lambdaX, 0, lambda );
-
-    utilities_FortranMatrixSelectBlock( gramA, 1, sizeA, 1, sizeX, coordX );
-
-    utilities_FortranMatrixSelectBlock( coordX, 1, sizeX, 1, sizeX, coordXX );
-    utilities_FortranMatrixSelectBlock( coordX, firstR, lastR, 1, sizeX, coordRX );
-
-    if ( *iterationNumber > 1 ) {
-	
-      utilities_FortranMatrixSelectBlock( coordX, firstP, lastP, 1, sizeX, coordPX );
 
+      utilities_FortranMatrixSelectBlock( lambdaAB, 1, sizeX, 1, 1, lambdaX );
+      utilities_FortranMatrixCopy( lambdaX, 0, lambda );
+
+      utilities_FortranMatrixSelectBlock( gramA, 1, sizeA, 1, sizeX, coordX );
+
+      utilities_FortranMatrixSelectBlock( coordX, 1, sizeX, 1, sizeX, coordXX );
+      utilities_FortranMatrixSelectBlock( coordX, firstR, lastR, 1, sizeX, coordRX );
+
+      if ( *iterationNumber > 1 )
+      {
+
+         utilities_FortranMatrixSelectBlock( coordX, firstP, lastP, 1, sizeX, coordPX );
+
+         mv_MultiVectorSetMask( blockVectorW, NULL );
+         lobpcg_MultiVectorByMatrix( blockVectorP, coordPX, blockVectorW );
+         mv_MultiVectorSetMask( blockVectorP, NULL );
+         mv_MultiVectorCopy( blockVectorW, blockVectorP );
+
+         lobpcg_MultiVectorByMatrix( blockVectorAP, coordPX, blockVectorW );
+         mv_MultiVectorSetMask( blockVectorAP, NULL );
+         mv_MultiVectorCopy( blockVectorW, blockVectorAP );
+
+         if ( !noBFlag )
+         {
+            lobpcg_MultiVectorByMatrix( blockVectorBP, coordPX, blockVectorW );
+            mv_MultiVectorSetMask( blockVectorBP, NULL );
+            mv_MultiVectorCopy( blockVectorW, blockVectorBP );
+         }
+
+         lobpcg_MultiVectorByMatrix( blockVectorR, coordRX, blockVectorW );
+         mv_MultiVectorAxpy( 1.0, blockVectorW, blockVectorP );
+
+         lobpcg_MultiVectorByMatrix( blockVectorAR, coordRX, blockVectorW );
+         mv_MultiVectorAxpy( 1.0, blockVectorW, blockVectorAP );
+
+         if ( !noBFlag )
+         {
+            lobpcg_MultiVectorByMatrix( blockVectorBR, coordRX, blockVectorW );
+            mv_MultiVectorAxpy( 1.0, blockVectorW, blockVectorBP );
+         }
+
+      }
+      else
+      {
+
+         mv_MultiVectorSetMask( blockVectorP, NULL );
+         lobpcg_MultiVectorByMatrix( blockVectorR, coordRX, blockVectorP );
+
+         mv_MultiVectorSetMask( blockVectorAP, NULL );
+         lobpcg_MultiVectorByMatrix( blockVectorAR, coordRX, blockVectorAP );
+
+         if ( !noBFlag )
+         {
+            mv_MultiVectorSetMask( blockVectorBP, NULL );
+            lobpcg_MultiVectorByMatrix( blockVectorBR, coordRX, blockVectorBP );
+         }
+
+      }
+
+      /* follwing line is bug fix in Google Rev 8 of code, by ilya.lashuk Aug 29,2008   */
       mv_MultiVectorSetMask( blockVectorW, NULL );
-      lobpcg_MultiVectorByMatrix( blockVectorP, coordPX, blockVectorW );
-      mv_MultiVectorSetMask( blockVectorP, NULL );
-      mv_MultiVectorCopy( blockVectorW, blockVectorP );
-
-      lobpcg_MultiVectorByMatrix( blockVectorAP, coordPX, blockVectorW );
-      mv_MultiVectorSetMask( blockVectorAP, NULL );
-      mv_MultiVectorCopy( blockVectorW, blockVectorAP );
-
-      if ( !noBFlag ) {
-	lobpcg_MultiVectorByMatrix( blockVectorBP, coordPX, blockVectorW );
-	mv_MultiVectorSetMask( blockVectorBP, NULL );
-	mv_MultiVectorCopy( blockVectorW, blockVectorBP );
+
+      mv_MultiVectorCopy( blockVectorX, blockVectorW );
+      lobpcg_MultiVectorByMatrix( blockVectorW, coordXX, blockVectorX );
+      mv_MultiVectorAxpy( 1.0, blockVectorP, blockVectorX );
+
+      mv_MultiVectorCopy( blockVectorAX, blockVectorW );
+      lobpcg_MultiVectorByMatrix( blockVectorW, coordXX, blockVectorAX );
+      mv_MultiVectorAxpy( 1.0, blockVectorAP, blockVectorAX );
+
+      if ( !noBFlag )
+      {
+         mv_MultiVectorCopy( blockVectorBX, blockVectorW );
+         lobpcg_MultiVectorByMatrix( blockVectorW, coordXX, blockVectorBX );
+         mv_MultiVectorAxpy( 1.0, blockVectorBP, blockVectorBX );
       }
 
-      lobpcg_MultiVectorByMatrix( blockVectorR, coordRX, blockVectorW );
-      mv_MultiVectorAxpy( 1.0, blockVectorW, blockVectorP );
-			
-      lobpcg_MultiVectorByMatrix( blockVectorAR, coordRX, blockVectorW );
-      mv_MultiVectorAxpy( 1.0, blockVectorW, blockVectorAP );
+      mv_MultiVectorSetMask( blockVectorAX, activeMask );
+      mv_MultiVectorSetMask( blockVectorBX, activeMask );
 
-      if ( !noBFlag ) {
-	lobpcg_MultiVectorByMatrix( blockVectorBR, coordRX, blockVectorW );
-	mv_MultiVectorAxpy( 1.0, blockVectorW, blockVectorBP );
+      mv_MultiVectorByDiagonal( blockVectorBX,
+                                activeMask, sizeX,
+                                utilities_FortranMatrixValues( lambda ),
+                                blockVectorR );
+
+      mv_MultiVectorAxpy( -1.0, blockVectorAX, blockVectorR );
+
+      mv_MultiVectorByMultiVectorDiag(   blockVectorR, blockVectorR,
+                                         activeMask, sizeX,
+                                         utilities_FortranMatrixValues( residualNorms ) );
+      lobpcg_sqrtVector(  sizeX, activeMask,
+                          utilities_FortranMatrixValues( residualNorms ) );
+
+      i = *iterationNumber + 1;
+      if ( lambdaHistory != NULL )
+      {
+         utilities_FortranMatrixSelectBlock( lambdaHistory, 1, sizeX, i, i,
+                                             historyColumn );
+         utilities_FortranMatrixCopy( lambda, 0, historyColumn );
+      }
+
+      if ( residualNormsHistory != NULL )
+      {
+         utilities_FortranMatrixSelectBlock( residualNormsHistory, 1, sizeX, i, i,
+                                             historyColumn );
+         utilities_FortranMatrixCopy( residualNorms, 0, historyColumn );
       }
 
-    }
-    else {
-      
-      mv_MultiVectorSetMask( blockVectorP, NULL );
-      lobpcg_MultiVectorByMatrix( blockVectorR, coordRX, blockVectorP );
-			
-      mv_MultiVectorSetMask( blockVectorAP, NULL );
-      lobpcg_MultiVectorByMatrix( blockVectorAR, coordRX, blockVectorAP );
-
-      if ( !noBFlag ) {
-	mv_MultiVectorSetMask( blockVectorBP, NULL );
-	lobpcg_MultiVectorByMatrix( blockVectorBR, coordRX, blockVectorBP );
+      if ( verbosityLevel == 2 )
+      {
+         hypre_printf( "Iteration %d \tbsize %d\n", *iterationNumber, sizeR );
+         for ( i = 1; i <= sizeX; i++ )
+            hypre_printf("Eigenvalue lambda %22.14e\n",
+                         utilities_FortranMatrixValue( lambda, i, 1) );
+         for ( i = 1; i <= sizeX; i++ )
+            hypre_printf("Residual %12.6e\n",
+                         utilities_FortranMatrixValue( residualNorms, i, 1) );
+      }
+      else if ( verbosityLevel == 1 )
+         hypre_printf("Iteration %d \tbsize %d \tmaxres %22.14e\n",
+                      *iterationNumber, sizeR,
+                      utilities_FortranMatrixMaxValue( residualNorms ) );
+
+      mv_MultiVectorSetMask( blockVectorAX, NULL );
+      mv_MultiVectorSetMask( blockVectorBX, NULL );
+      mv_MultiVectorSetMask( blockVectorAP, activeMask );
+      mv_MultiVectorSetMask( blockVectorBP, activeMask );
+      mv_MultiVectorSetMask( blockVectorP, activeMask );
+      mv_MultiVectorSetMask( blockVectorW, activeMask );
+
+   }
+
+   if ( exitFlag != 0 || *iterationNumber > maxIterations )
+   {
+      exitFlag = REQUESTED_ACCURACY_NOT_ACHIEVED;
+   }
+
+   (*iterationNumber)--;
+
+   if ( verbosityLevel == 1 )
+   {
+      hypre_printf("\n");
+      for ( i = 1; i <= sizeX; i++ )
+         hypre_printf("Eigenvalue lambda %22.14e\n",
+                      utilities_FortranMatrixValue( lambda, i, 1) );
+      for ( i = 1; i <= sizeX; i++ )
+         hypre_printf("Residual %22.14e\n",
+                      utilities_FortranMatrixValue( residualNorms, i, 1) );
+      hypre_printf("\n%d iterations\n", *iterationNumber );
+   }
+
+   mv_MultiVectorDestroy( blockVectorR );
+   mv_MultiVectorDestroy( blockVectorP );
+   mv_MultiVectorDestroy( blockVectorAX );
+   mv_MultiVectorDestroy( blockVectorAR );
+   mv_MultiVectorDestroy( blockVectorAP );
+   if ( !noBFlag )
+   {
+      mv_MultiVectorDestroy( blockVectorBX );
+      mv_MultiVectorDestroy( blockVectorBR );
+      mv_MultiVectorDestroy( blockVectorBP );
+      if ( !noYFlag )
+      {
+         mv_MultiVectorDestroy( blockVectorBY );
       }
-		
-    }
-
-/* follwing line is bug fix in Google Rev 8 of code, by ilya.lashuk Aug 29,2008   */
-    mv_MultiVectorSetMask( blockVectorW, NULL );
-    
-    mv_MultiVectorCopy( blockVectorX, blockVectorW );
-    lobpcg_MultiVectorByMatrix( blockVectorW, coordXX, blockVectorX );
-    mv_MultiVectorAxpy( 1.0, blockVectorP, blockVectorX );
-
-    mv_MultiVectorCopy( blockVectorAX, blockVectorW );
-    lobpcg_MultiVectorByMatrix( blockVectorW, coordXX, blockVectorAX );
-    mv_MultiVectorAxpy( 1.0, blockVectorAP, blockVectorAX );
-
-    if ( !noBFlag ) {
-      mv_MultiVectorCopy( blockVectorBX, blockVectorW );
-      lobpcg_MultiVectorByMatrix( blockVectorW, coordXX, blockVectorBX );
-      mv_MultiVectorAxpy( 1.0, blockVectorBP, blockVectorBX );
-    }
-
-    mv_MultiVectorSetMask( blockVectorAX, activeMask );
-    mv_MultiVectorSetMask( blockVectorBX, activeMask );
-
-    mv_MultiVectorByDiagonal( blockVectorBX, 
-				 activeMask, sizeX, 
-				 utilities_FortranMatrixValues( lambda ),
-				 blockVectorR );
-
-    mv_MultiVectorAxpy( -1.0, blockVectorAX, blockVectorR );
-
-    mv_MultiVectorByMultiVectorDiag(	blockVectorR, blockVectorR, 
-					activeMask, sizeX, 
-					utilities_FortranMatrixValues( residualNorms ) );
-    lobpcg_sqrtVector( 	sizeX, activeMask, 
-			utilities_FortranMatrixValues( residualNorms ) );
-
-    i = *iterationNumber + 1;
-    if ( lambdaHistory != NULL ) {
-      utilities_FortranMatrixSelectBlock( lambdaHistory, 1, sizeX, i, i, 
-					  historyColumn );
-      utilities_FortranMatrixCopy( lambda, 0, historyColumn );
-    }
-	
-    if ( residualNormsHistory != NULL ) {
-      utilities_FortranMatrixSelectBlock( residualNormsHistory, 1, sizeX, i, i, 
-					  historyColumn );
-      utilities_FortranMatrixCopy( residualNorms, 0, historyColumn );
-    }
-    
-    if ( verbosityLevel == 2 ) {
-      hypre_printf( "Iteration %d \tbsize %d\n", *iterationNumber, sizeR );
-      for ( i = 1; i <= sizeX; i++ ) 
-	hypre_printf("Eigenvalue lambda %22.14e\n",
-	       utilities_FortranMatrixValue( lambda, i, 1) );
-      for ( i = 1; i <= sizeX; i++ ) 
-	hypre_printf("Residual %12.6e\n",
-	       utilities_FortranMatrixValue( residualNorms, i, 1) );
-    }
-    else if ( verbosityLevel == 1 )
-      hypre_printf("Iteration %d \tbsize %d \tmaxres %22.14e\n",
-	     *iterationNumber, sizeR, 
-	     utilities_FortranMatrixMaxValue( residualNorms ) );
-
-    mv_MultiVectorSetMask( blockVectorAX, NULL );
-    mv_MultiVectorSetMask( blockVectorBX, NULL );
-    mv_MultiVectorSetMask( blockVectorAP, activeMask );
-    mv_MultiVectorSetMask( blockVectorBP, activeMask );
-    mv_MultiVectorSetMask( blockVectorP, activeMask );
-    mv_MultiVectorSetMask( blockVectorW, activeMask );
-
-  }
-
-  if ( exitFlag != 0 || *iterationNumber > maxIterations )
-    exitFlag = REQUESTED_ACCURACY_NOT_ACHIEVED;
-
-  (*iterationNumber)--;
-	
-  if ( verbosityLevel == 1 ) {
-    hypre_printf("\n");
-    for ( i = 1; i <= sizeX; i++ ) 
-      hypre_printf("Eigenvalue lambda %22.14e\n",
-	     utilities_FortranMatrixValue( lambda, i, 1) );
-    for ( i = 1; i <= sizeX; i++ ) 
-      hypre_printf("Residual %22.14e\n",
-	     utilities_FortranMatrixValue( residualNorms, i, 1) );
-    hypre_printf("\n%d iterations\n", *iterationNumber );
-  }
-
-  mv_MultiVectorDestroy( blockVectorR );
-  mv_MultiVectorDestroy( blockVectorP );
-  mv_MultiVectorDestroy( blockVectorAX );
-  mv_MultiVectorDestroy( blockVectorAR );
-  mv_MultiVectorDestroy( blockVectorAP );
-  if ( !noBFlag ) {
-    mv_MultiVectorDestroy( blockVectorBX );
-    mv_MultiVectorDestroy( blockVectorBR );
-    mv_MultiVectorDestroy( blockVectorBP );
-    if ( !noYFlag )
-      mv_MultiVectorDestroy( blockVectorBY );
-  }
-  mv_MultiVectorDestroy( blockVectorW );
-
-  utilities_FortranMatrixDestroy( gramA );
-  utilities_FortranMatrixDestroy( gramB );
-  utilities_FortranMatrixDestroy( lambdaAB );
-  utilities_FortranMatrixDestroy( lambdaX );
-  
-  utilities_FortranMatrixDestroy( gramXAX );
-  utilities_FortranMatrixDestroy( gramRAX );
-  utilities_FortranMatrixDestroy( gramPAX );
-  utilities_FortranMatrixDestroy( gramRAR );
-  utilities_FortranMatrixDestroy( gramPAR );
-  utilities_FortranMatrixDestroy( gramPAP );
-  
-  utilities_FortranMatrixDestroy( gramXBX );
-  utilities_FortranMatrixDestroy( gramRBX );
-  utilities_FortranMatrixDestroy( gramPBX );
-  utilities_FortranMatrixDestroy( gramRBR );
-  utilities_FortranMatrixDestroy( gramPBR );
-  utilities_FortranMatrixDestroy( gramPBP );
-
-  utilities_FortranMatrixDestroy( gramYBY );
-  utilities_FortranMatrixDestroy( gramYBX );
-  utilities_FortranMatrixDestroy( tempYBX );
-  utilities_FortranMatrixDestroy( gramYBR );
-  utilities_FortranMatrixDestroy( tempYBR );
-
-  utilities_FortranMatrixDestroy( coordX );
-  utilities_FortranMatrixDestroy( coordXX );
-  utilities_FortranMatrixDestroy( coordRX );
-  utilities_FortranMatrixDestroy( coordPX );
-
-  utilities_FortranMatrixDestroy( upperR );
-  utilities_FortranMatrixDestroy( historyColumn );
-
-  utilities_FortranMatrixDestroy( lambda );
-  utilities_FortranMatrixDestroy( lambdaHistory );
-  utilities_FortranMatrixDestroy( residualNorms );
-  utilities_FortranMatrixDestroy( residualNormsHistory );	
-
-  hypre_TFree( activeMask ,HYPRE_MEMORY_HOST);
-
-  return exitFlag;
+   }
+   mv_MultiVectorDestroy( blockVectorW );
+
+   utilities_FortranMatrixDestroy( gramA );
+   utilities_FortranMatrixDestroy( gramB );
+   utilities_FortranMatrixDestroy( lambdaAB );
+   utilities_FortranMatrixDestroy( lambdaX );
+
+   utilities_FortranMatrixDestroy( gramXAX );
+   utilities_FortranMatrixDestroy( gramRAX );
+   utilities_FortranMatrixDestroy( gramPAX );
+   utilities_FortranMatrixDestroy( gramRAR );
+   utilities_FortranMatrixDestroy( gramPAR );
+   utilities_FortranMatrixDestroy( gramPAP );
+
+   utilities_FortranMatrixDestroy( gramXBX );
+   utilities_FortranMatrixDestroy( gramRBX );
+   utilities_FortranMatrixDestroy( gramPBX );
+   utilities_FortranMatrixDestroy( gramRBR );
+   utilities_FortranMatrixDestroy( gramPBR );
+   utilities_FortranMatrixDestroy( gramPBP );
+
+   utilities_FortranMatrixDestroy( gramYBY );
+   utilities_FortranMatrixDestroy( gramYBX );
+   utilities_FortranMatrixDestroy( tempYBX );
+   utilities_FortranMatrixDestroy( gramYBR );
+   utilities_FortranMatrixDestroy( tempYBR );
+
+   utilities_FortranMatrixDestroy( coordX );
+   utilities_FortranMatrixDestroy( coordXX );
+   utilities_FortranMatrixDestroy( coordRX );
+   utilities_FortranMatrixDestroy( coordPX );
+
+   utilities_FortranMatrixDestroy( upperR );
+   utilities_FortranMatrixDestroy( historyColumn );
+
+   utilities_FortranMatrixDestroy( lambda );
+   utilities_FortranMatrixDestroy( lambdaHistory );
+   utilities_FortranMatrixDestroy( residualNorms );
+   utilities_FortranMatrixDestroy( residualNormsHistory );
+
+   hypre_TFree( activeMask, HYPRE_MEMORY_HOST);
+
+   return exitFlag;
 }
diff --git a/external/hypre/src/krylov/lobpcg.h b/external/hypre/src/krylov/lobpcg.h
index f917bc9c..74fba256 100644
--- a/external/hypre/src/krylov/lobpcg.h
+++ b/external/hypre/src/krylov/lobpcg.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -15,71 +15,73 @@
 extern "C" {
 #endif
 
-#define PROBLEM_SIZE_TOO_SMALL			       	1
-#define WRONG_BLOCK_SIZE			       	2
-#define WRONG_CONSTRAINTS                               3
-#define REQUESTED_ACCURACY_NOT_ACHIEVED			-1
+#define PROBLEM_SIZE_TOO_SMALL           1
+#define WRONG_BLOCK_SIZE                 2
+#define WRONG_CONSTRAINTS                3
+#define REQUESTED_ACCURACY_NOT_ACHIEVED -1
 
-typedef struct {
+typedef struct
+{
 
-  HYPRE_Real	absolute;
-  HYPRE_Real	relative;
+   HYPRE_Real   absolute;
+   HYPRE_Real   relative;
 
 } lobpcg_Tolerance;
 
-typedef struct {
+typedef struct
+{
 
-/* these pointers should point to 2 functions providing standard lapack  functionality */
+   /* these pointers should point to 2 functions providing standard lapack  functionality */
    HYPRE_Int   (*dpotrf) (const char *uplo, HYPRE_Int *n, HYPRE_Real *a, HYPRE_Int *
-        lda, HYPRE_Int *info);
+                          lda, HYPRE_Int *info);
    HYPRE_Int   (*dsygv) (HYPRE_Int *itype, char *jobz, char *uplo, HYPRE_Int *
-        n, HYPRE_Real *a, HYPRE_Int *lda, HYPRE_Real *b, HYPRE_Int *ldb,
-        HYPRE_Real *w, HYPRE_Real *work, HYPRE_Int *lwork, HYPRE_Int *info);
+                         n, HYPRE_Real *a, HYPRE_Int *lda, HYPRE_Real *b, HYPRE_Int *ldb,
+                         HYPRE_Real *w, HYPRE_Real *work, HYPRE_Int *lwork, HYPRE_Int *info);
 
 } lobpcg_BLASLAPACKFunctions;
 
 HYPRE_Int
 lobpcg_solve( mv_MultiVectorPtr blockVectorX,
-	      void* operatorAData,
-	      void (*operatorA)( void*, void*, void* ),
-	      void* operatorBData,
-	      void (*operatorB)( void*, void*, void* ),
-	      void* operatorTData,
-	      void (*operatorT)( void*, void*, void* ),
-	      mv_MultiVectorPtr blockVectorY,
+              void* operatorAData,
+              void (*operatorA)( void*, void*, void* ),
+              void* operatorBData,
+              void (*operatorB)( void*, void*, void* ),
+              void* operatorTData,
+              void (*operatorT)( void*, void*, void* ),
+              mv_MultiVectorPtr blockVectorY,
               lobpcg_BLASLAPACKFunctions blap_fn,
-	      lobpcg_Tolerance tolerance,
-	      HYPRE_Int maxIterations,
-	      HYPRE_Int verbosityLevel,
-	      HYPRE_Int* iterationNumber,
+              lobpcg_Tolerance tolerance,
+              HYPRE_Int maxIterations,
+              HYPRE_Int verbosityLevel,
+              HYPRE_Int* iterationNumber,
 
-/* eigenvalues; "lambda_values" should point to array  containing <blocksize> doubles where <blocksi
-ze> is the width of multivector "blockVectorX" */
+              /* eigenvalues; "lambda_values" should point to array  containing <blocksize> doubles where <blocksi
+              ze> is the width of multivector "blockVectorX" */
               HYPRE_Real * lambda_values,
 
-/* eigenvalues history; a pointer to the entries of the  <blocksize>-by-(<maxIterations>+1) matrix s
-tored
-in  fortran-style. (i.e. column-wise) The matrix may be  a submatrix of a larger matrix, see next
-argument; If you don't need eigenvalues history, provide NULL in this entry */
+              /* eigenvalues history; a pointer to the entries of the  <blocksize>-by-(<maxIterations>+1) matrix s
+              tored
+              in  fortran-style. (i.e. column-wise) The matrix may be  a submatrix of a larger matrix, see next
+              argument; If you don't need eigenvalues history, provide NULL in this entry */
               HYPRE_Real * lambdaHistory_values,
 
-/* global height of the matrix (stored in fotran-style)  specified by previous argument */
-              HYPRE_Int lambdaHistory_gh,
+              /* global height of the matrix (stored in fotran-style)  specified by previous argument */
+              HYPRE_BigInt lambdaHistory_gh,
 
-/* residual norms; argument should point to array of <blocksize> doubles */
+              /* residual norms; argument should point to array of <blocksize> doubles */
               HYPRE_Real * residualNorms_values,
 
-/* residual norms history; a pointer to the entries of the  <blocksize>-by-(<maxIterations>+1) matri
-x
-stored in  fortran-style. (i.e. column-wise) The matrix may be  a submatrix of a larger matrix, see
-next
-argument If you don't need residual norms history, provide NULL in this entry */
-              HYPRE_Real * residualNormsHistory_values ,
+              /* residual norms history; a pointer to the entries of the  <blocksize>-by-(<maxIterations>+1) matri
+              x
+              stored in  fortran-style. (i.e. column-wise) The matrix may be  a submatrix of a larger matrix, see
+              next
+              argument If you don't need residual norms history, provide NULL in this entry */
+              HYPRE_Real * residualNormsHistory_values,
 
-/* global height of the matrix (stored in fotran-style)  specified by previous argument */
-              HYPRE_Int residualNormsHistory_gh
+              /* global height of the matrix (stored in fotran-style)  specified by previous argument */
+              HYPRE_BigInt residualNormsHistory_gh
 
-);
+            );
 
 #ifdef __cplusplus
 }
diff --git a/external/hypre/src/krylov/pcg.c b/external/hypre/src/krylov/pcg.c
index 0d734ea4..37b59453 100644
--- a/external/hypre/src/krylov/pcg.c
+++ b/external/hypre/src/krylov/pcg.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -46,11 +46,11 @@ hypre_PCGFunctionsCreate(
    HYPRE_Int    (*Axpy)          ( HYPRE_Complex alpha, void *x, void *y ),
    HYPRE_Int    (*PrecondSetup)  ( void *vdata, void *A, void *b, void *x ),
    HYPRE_Int    (*Precond)       ( void *vdata, void *A, void *b, void *x )
-   )
+)
 {
    hypre_PCGFunctions * pcg_functions;
    pcg_functions = (hypre_PCGFunctions *)
-      CAlloc( 1, sizeof(hypre_PCGFunctions), HYPRE_MEMORY_HOST );
+                   CAlloc( 1, sizeof(hypre_PCGFunctions), HYPRE_MEMORY_HOST );
 
    pcg_functions->CAlloc = CAlloc;
    pcg_functions->Free = Free;
@@ -99,6 +99,7 @@ hypre_PCGCreate( hypre_PCGFunctions *pcg_functions )
    (pcg_data -> recompute_residual) = 0;
    (pcg_data -> recompute_residual_p) = 0;
    (pcg_data -> stop_crit)    = 0;
+   (pcg_data -> skip_break)   = 0;
    (pcg_data -> converged)    = 0;
    (pcg_data -> hybrid)       = 0;
    (pcg_data -> owns_matvec_data ) = 1;
@@ -111,6 +112,8 @@ hypre_PCGCreate( hypre_PCGFunctions *pcg_functions )
    (pcg_data -> p)            = NULL;
    (pcg_data -> s)            = NULL;
    (pcg_data -> r)            = NULL;
+   (pcg_data -> r_old)        = NULL;
+   (pcg_data -> v)            = NULL;
 
    HYPRE_ANNOTATE_FUNC_END;
 
@@ -161,13 +164,23 @@ hypre_PCGDestroy( void *pcg_vdata )
          (*(pcg_functions->DestroyVector))(pcg_data -> r);
          pcg_data -> r = NULL;
       }
+      if ( pcg_data -> r_old != NULL )
+      {
+         (*(pcg_functions->DestroyVector))(pcg_data -> r_old);
+         pcg_data -> r_old = NULL;
+      }
+      if ( pcg_data -> v != NULL )
+      {
+         (*(pcg_functions->DestroyVector))(pcg_data -> v);
+         pcg_data -> v = NULL;
+      }
       hypre_TFreeF( pcg_data, pcg_functions );
       hypre_TFreeF( pcg_functions, pcg_functions );
    }
 
    HYPRE_ANNOTATE_FUNC_END;
 
-   return(hypre_error_flag);
+   return (hypre_error_flag);
 }
 
 /*--------------------------------------------------------------------------
@@ -196,7 +209,11 @@ hypre_PCGSetup( void *pcg_vdata,
    hypre_PCGData *pcg_data =  (hypre_PCGData *)pcg_vdata;
    hypre_PCGFunctions *pcg_functions = pcg_data->functions;
    HYPRE_Int            max_iter         = (pcg_data -> max_iter);
-   HYPRE_Int          (*precond_setup)(void*,void*,void*,void*) = (pcg_functions -> precond_setup);
+   HYPRE_Int            recompute_residual_p = (pcg_data -> recompute_residual_p);
+   HYPRE_Real           rtol = (pcg_data -> rtol);
+   HYPRE_Int            two_norm = (pcg_data -> two_norm);
+   HYPRE_Int            flex = (pcg_data -> flex);
+   HYPRE_Int          (*precond_setup)(void*, void*, void*, void*) = (pcg_functions -> precond_setup);
    void          *precond_data     = (pcg_data -> precond_data);
 
    HYPRE_ANNOTATE_FUNC_BEGIN;
@@ -210,36 +227,66 @@ hypre_PCGSetup( void *pcg_vdata,
     *--------------------------------------------------*/
 
    if ( pcg_data -> p != NULL )
+   {
       (*(pcg_functions->DestroyVector))(pcg_data -> p);
+   }
    (pcg_data -> p) = (*(pcg_functions->CreateVector))(x);
 
    if ( pcg_data -> s != NULL )
+   {
       (*(pcg_functions->DestroyVector))(pcg_data -> s);
+   }
    (pcg_data -> s) = (*(pcg_functions->CreateVector))(x);
 
    if ( pcg_data -> r != NULL )
+   {
       (*(pcg_functions->DestroyVector))(pcg_data -> r);
+   }
    (pcg_data -> r) = (*(pcg_functions->CreateVector))(b);
 
    if ( pcg_data -> matvec_data != NULL && pcg_data->owns_matvec_data )
+   {
       (*(pcg_functions->MatvecDestroy))(pcg_data -> matvec_data);
+   }
    (pcg_data -> matvec_data) = (*(pcg_functions->MatvecCreate))(A, x);
 
+   if (flex)
+   {
+      if ( pcg_data -> v != NULL )
+      {
+         (*(pcg_functions->DestroyVector))(pcg_data -> r_old);
+      }
+      (pcg_data -> r_old) = (*(pcg_functions->CreateVector))(b);
+   }
+
+   if (rtol && recompute_residual_p && (!two_norm))
+   {
+      if ( pcg_data -> v != NULL )
+      {
+         (*(pcg_functions->DestroyVector))(pcg_data -> v);
+      }
+      (pcg_data -> v) = (*(pcg_functions->CreateVector))(b);
+   }
+
    precond_setup(precond_data, A, b, x);
 
    /*-----------------------------------------------------
     * Allocate space for log info
     *-----------------------------------------------------*/
 
-   if ( (pcg_data->logging)>0  || (pcg_data->print_level)>0 )
+   if ( (pcg_data->logging) > 0  || (pcg_data->print_level) > 0 )
    {
       if ( (pcg_data -> norms) != NULL )
+      {
          hypre_TFreeF( pcg_data -> norms, pcg_functions );
+      }
       (pcg_data -> norms)     = hypre_CTAllocF( HYPRE_Real, max_iter + 1,
                                                 pcg_functions, HYPRE_MEMORY_HOST);
 
       if ( (pcg_data -> rel_norms) != NULL )
+      {
          hypre_TFreeF( pcg_data -> rel_norms, pcg_functions );
+      }
       (pcg_data -> rel_norms) = hypre_CTAllocF( HYPRE_Real, max_iter + 1,
                                                 pcg_functions, HYPRE_MEMORY_HOST );
    }
@@ -288,14 +335,23 @@ hypre_PCGSolve( void *pcg_vdata,
    HYPRE_Int       recompute_residual_p = (pcg_data -> recompute_residual_p);
    HYPRE_Int       stop_crit    = (pcg_data -> stop_crit);
    HYPRE_Int       hybrid       = (pcg_data -> hybrid);
-/*
-   HYPRE_Int             converged    = (pcg_data -> converged);
-*/
+   HYPRE_Int       skip_break   = (pcg_data -> skip_break);
+   HYPRE_Int       flex    = (pcg_data -> flex);
+   /* flex replaces the generally used Fletcher-Reeves method for the
+    * parameter used to update the direction vector p, beta=<r,Cr>/<r_old,Cr_old>
+    * with the Polak-Ribiere method, which is more flexible, can be more stable,
+    * and llows varying preconditioners, but requires an extra dot product
+    * beta = <r-r_old, Cr>/<r_old, Cr_old> */
+   /*
+      HYPRE_Int             converged    = (pcg_data -> converged);
+   */
    void           *p            = (pcg_data -> p);
    void           *s            = (pcg_data -> s);
    void           *r            = (pcg_data -> r);
+   void           *r_old        = (pcg_data -> r_old);
+   void           *v            = (pcg_data -> v);
    void           *matvec_data  = (pcg_data -> matvec_data);
-   HYPRE_Int     (*precond)(void*,void*,void*,void*)   = (pcg_functions -> precond);
+   HYPRE_Int     (*precond)(void*, void*, void*, void*)   = (pcg_functions -> precond);
    void           *precond_data = (pcg_data -> precond_data);
    HYPRE_Int       print_level  = (pcg_data -> print_level);
    HYPRE_Int       logging      = (pcg_data -> logging);
@@ -303,6 +359,7 @@ hypre_PCGSolve( void *pcg_vdata,
    HYPRE_Real     *rel_norms    = (pcg_data -> rel_norms);
 
    HYPRE_Real      alpha, beta;
+   HYPRE_Real      delta = 0.0;
    HYPRE_Real      gamma, gamma_old;
    HYPRE_Real      bi_prod, eps;
    HYPRE_Real      pi_prod, xi_prod;
@@ -326,7 +383,7 @@ hypre_PCGSolve( void *pcg_vdata,
 
    (pcg_data -> converged) = 0;
 
-   (*(pcg_functions->CommInfo))(A,&my_id,&num_procs);
+   (*(pcg_functions->CommInfo))(A, &my_id, &num_procs);
 
    /*-----------------------------------------------------------------------
     * With relative change convergence test on, it is possible to attempt
@@ -347,7 +404,9 @@ hypre_PCGSolve( void *pcg_vdata,
       /* bi_prod = <b,b> */
       bi_prod = (*(pcg_functions->InnerProd))(b, b);
       if (print_level > 1 && my_id == 0)
-          hypre_printf("<b,b>: %e\n",bi_prod);
+      {
+         hypre_printf("<b,b>: %e\n", bi_prod);
+      }
    }
    else
    {
@@ -356,12 +415,14 @@ hypre_PCGSolve( void *pcg_vdata,
       precond(precond_data, A, b, p);
       bi_prod = (*(pcg_functions->InnerProd))(p, b);
       if (print_level > 1 && my_id == 0)
-          hypre_printf("<C*b,b>: %e\n",bi_prod);
+      {
+         hypre_printf("<C*b,b>: %e\n", bi_prod);
+      }
    };
 
-   /* Since it is does not diminish performance, attempt to return an error flag
+   /* Since it does not diminish performance, attempt to return an error flag
       and notify users when they supply bad input. */
-   if (bi_prod != 0.) ieee_check = bi_prod/bi_prod; /* INF -> NaN conversion */
+   if (bi_prod != 0.) { ieee_check = bi_prod / bi_prod; } /* INF -> NaN conversion */
    if (ieee_check != ieee_check)
    {
       /* ...INFs or NaNs in input can make ieee_check a NaN.  This test
@@ -371,11 +432,11 @@ hypre_PCGSolve( void *pcg_vdata,
          found at http://HTTP.CS.Berkeley.EDU/~wkahan/ieee754status/IEEE754.PDF */
       if (print_level > 0 || logging > 0)
       {
-        hypre_printf("\n\nERROR detected by Hypre ...  BEGIN\n");
-        hypre_printf("ERROR -- hypre_PCGSolve: INFs and/or NaNs detected in input.\n");
-        hypre_printf("User probably placed non-numerics in supplied b.\n");
-        hypre_printf("Returning error flag += 101.  Program not terminated.\n");
-        hypre_printf("ERROR detected by Hypre ...  END\n\n\n");
+         hypre_printf("\n\nERROR detected by Hypre ...  BEGIN\n");
+         hypre_printf("ERROR -- hypre_PCGSolve: INFs and/or NaNs detected in input.\n");
+         hypre_printf("User probably placed non-numerics in supplied b.\n");
+         hypre_printf("Returning error flag += 101.  Program not terminated.\n");
+         hypre_printf("ERROR detected by Hypre ...  END\n\n\n");
       }
       hypre_error(HYPRE_ERROR_GENERIC);
       HYPRE_ANNOTATE_FUNC_END;
@@ -383,28 +444,28 @@ hypre_PCGSolve( void *pcg_vdata,
       return hypre_error_flag;
    }
 
-   eps = r_tol*r_tol; /* note: this may be re-assigned below */
+   eps = r_tol * r_tol; /* note: this may be re-assigned below */
    if ( bi_prod > 0.0 )
    {
-      if ( stop_crit && !rel_change && atolf<=0 )  /* pure absolute tolerance */
+      if ( stop_crit && !rel_change && atolf <= 0 ) /* pure absolute tolerance */
       {
          eps = eps / bi_prod;
          /* Note: this section is obsolete.  Aside from backwards comatability
             concerns, we could delete the stop_crit parameter and related code,
             using tol & atolf instead. */
       }
-      else if ( atolf>0 )  /* mixed relative and absolute tolerance */
+      else if ( atolf > 0 ) /* mixed relative and absolute tolerance */
       {
          bi_prod += atolf;
       }
       else /* DEFAULT (stop_crit and atolf exist for backwards compatibilty
               and are not in the reference manual) */
       {
-        /* convergence criteria:  <C*r,r>  <= max( a_tol^2, r_tol^2 * <C*b,b> )
-            note: default for a_tol is 0.0, so relative residual criteria is used unless
-            user specifies a_tol, or sets r_tol = 0.0, which means absolute
-            tol only is checked  */
-         eps = hypre_max(r_tol*r_tol, a_tol*a_tol/bi_prod);
+         /* convergence criteria:  <C*r,r>  <= max( a_tol^2, r_tol^2 * <C*b,b> )
+             note: default for a_tol is 0.0, so relative residual criteria is used unless
+             user specifies a_tol, or sets r_tol = 0.0, which means absolute
+             tol only is checked  */
+         eps = hypre_max(r_tol * r_tol, a_tol * a_tol / bi_prod);
 
       }
    }
@@ -412,7 +473,7 @@ hypre_PCGSolve( void *pcg_vdata,
    {
       /* Set x equal to zero and return */
       (*(pcg_functions->CopyVector))(b, x);
-      if (logging>0 || print_level>0)
+      if (logging > 0 || print_level > 0)
       {
          norms[0]     = 0.0;
          rel_norms[i] = 0.0;
@@ -434,12 +495,12 @@ hypre_PCGSolve( void *pcg_vdata,
    (*(pcg_functions->ClearVector))(p);
    precond(precond_data, A, r, p);
 
-   /* gamma = <r,p> */
-   gamma = (*(pcg_functions->InnerProd))(r,p);
+   /* gamma = <r,p> = <r,Cr> */
+   gamma = (*(pcg_functions->InnerProd))(r, p);
 
-   /* Since it is does not diminish performance, attempt to return an error flag
+   /* Since it does not diminish performance, attempt to return an error flag
       and notify users when they supply bad input. */
-   if (gamma != 0.) ieee_check = gamma/gamma; /* INF -> NaN conversion */
+   if (gamma != 0.) { ieee_check = gamma / gamma; } /* INF -> NaN conversion */
    if (ieee_check != ieee_check)
    {
       /* ...INFs or NaNs in input can make ieee_check a NaN.  This test
@@ -449,11 +510,11 @@ hypre_PCGSolve( void *pcg_vdata,
          found at http://HTTP.CS.Berkeley.EDU/~wkahan/ieee754status/IEEE754.PDF */
       if (print_level > 0 || logging > 0)
       {
-        hypre_printf("\n\nERROR detected by Hypre ...  BEGIN\n");
-        hypre_printf("ERROR -- hypre_PCGSolve: INFs and/or NaNs detected in input.\n");
-        hypre_printf("User probably placed non-numerics in supplied A or x_0.\n");
-        hypre_printf("Returning error flag += 101.  Program not terminated.\n");
-        hypre_printf("ERROR detected by Hypre ...  END\n\n\n");
+         hypre_printf("\n\nERROR detected by Hypre ...  BEGIN\n");
+         hypre_printf("ERROR -- hypre_PCGSolve: INFs and/or NaNs detected in input.\n");
+         hypre_printf("User probably placed non-numerics in supplied A or x_0.\n");
+         hypre_printf("Returning error flag += 101.  Program not terminated.\n");
+         hypre_printf("ERROR detected by Hypre ...  END\n\n\n");
       }
       hypre_error(HYPRE_ERROR_GENERIC);
       HYPRE_ANNOTATE_FUNC_END;
@@ -462,21 +523,25 @@ hypre_PCGSolve( void *pcg_vdata,
    }
 
    /* Set initial residual norm */
-   if ( logging>0 || print_level > 0 || cf_tol > 0.0 )
+   if ( logging > 0 || print_level > 0 || cf_tol > 0.0 )
    {
       if (two_norm)
-         i_prod_0 = (*(pcg_functions->InnerProd))(r,r);
+      {
+         i_prod_0 = (*(pcg_functions->InnerProd))(r, r);
+      }
       else
+      {
          i_prod_0 = gamma;
+      }
 
-      if ( logging>0 || print_level>0 ) norms[0] = sqrt(i_prod_0);
+      if ( logging > 0 || print_level > 0 ) { norms[0] = hypre_sqrt(i_prod_0); }
    }
-   if ( print_level > 1 && my_id==0 )
+   if ( print_level > 1 && my_id == 0 )
    {
       hypre_printf("\n\n");
       if (two_norm)
       {
-         if ( stop_crit && !rel_change && atolf==0 )  /* pure absolute tolerance */
+         if ( stop_crit && !rel_change && atolf == 0 ) /* pure absolute tolerance */
          {
             hypre_printf("Iters       ||r||_2     conv.rate\n");
             hypre_printf("-----    ------------   ---------\n");
@@ -495,7 +560,7 @@ hypre_PCGSolve( void *pcg_vdata,
       /* hypre_printf("% 5d    %e\n", i, norms[i]); */
    }
 
-   while ((i+1) <= max_iter)
+   while ((i + 1) <= max_iter)
    {
       /*--------------------------------------------------------------------
        * the core CG calculations...
@@ -506,25 +571,61 @@ hypre_PCGSolve( void *pcg_vdata,
          r = b - A x (instead of using the recursive definition). Note that this
          is potentially expensive and can lead to degraded convergence (since it
          essentially a "restarted CG"). */
-      recompute_true_residual = recompute_residual_p && !(i%recompute_residual_p);
+      recompute_true_residual = recompute_residual_p && !(i % recompute_residual_p);
 
       /* s = A*p */
       (*(pcg_functions->Matvec))(matvec_data, 1.0, A, p, 0.0, s);
 
       /* alpha = gamma / <s,p> */
       sdotp = (*(pcg_functions->InnerProd))(s, p);
-      if ( sdotp==0.0 )
+      if ( sdotp == 0.0 )
       {
          hypre_error_w_msg(HYPRE_ERROR_CONV, "Zero sdotp value in PCG");
-         if (i==1) i_prod=i_prod_0;
+         if (i == 1) { i_prod = i_prod_0; }
          break;
       }
       alpha = gamma / sdotp;
-      if (! (alpha > HYPRE_REAL_MIN) )
+      /* alpha should always be greater zero for spd A, spd precond. and nonzero p, r*/
+      /* alpha = <r, Cr> / <p, Ap> */
+      /* for alpha close to 0 x and r will not change much unless x and/or r are close to 0 */
+      if (alpha <= 0.0)
+      {
+         if (print_level > 1 && my_id == 0)
+         {
+            hypre_printf("alpha %e", alpha);
+         }
+         hypre_error_w_msg(HYPRE_ERROR_CONV, "Negative or zero alpha value in PCG");
+         if (skip_break < 3)
+         {
+            if (i == 1) { i_prod = i_prod_0; }
+            break;
+         }
+      }
+      else if (! (alpha  >= HYPRE_REAL_TRUE_MIN))
+      {
+         hypre_error_w_msg(HYPRE_ERROR_CONV, "alpha value less than TRUE_MIN in PCG");
+         if (print_level > 1 && my_id == 0)
+         {
+            hypre_printf("alpha %e", alpha);
+         }
+         if (skip_break < 2)
+         {
+            if (i == 1) { i_prod = i_prod_0; }
+            break;
+         }
+      }
+      else if (! (alpha  >= HYPRE_REAL_MIN))
       {
          hypre_error_w_msg(HYPRE_ERROR_CONV, "Subnormal alpha value in PCG");
-         if (i==1) i_prod=i_prod_0;
-         break;
+         if (print_level > 1 && my_id == 0)
+         {
+            hypre_printf("alpha %e", alpha);
+         }
+         if (skip_break < 1)
+         {
+            if (i == 1) { i_prod = i_prod_0; }
+            break;
+         }
       }
 
       gamma_old = gamma;
@@ -532,6 +633,11 @@ hypre_PCGSolve( void *pcg_vdata,
       /* x = x + alpha*p */
       (*(pcg_functions->Axpy))(alpha, p, x);
 
+      if (flex)
+      {
+         (*(pcg_functions->CopyVector))(r, r_old); /*save old residual */
+      }
+
       /* r = r - alpha*s */
       if ( !recompute_true_residual )
       {
@@ -543,22 +649,65 @@ hypre_PCGSolve( void *pcg_vdata,
          {
             hypre_printf("Recomputing the residual...\n");
          }
+         (*(pcg_functions->CopyVector))(r, s); /*save old residual */
+         if (flex)
+         {
+            (*(pcg_functions->CopyVector))(r, r_old); /*save old residual */
+         }
          (*(pcg_functions->CopyVector))(b, r);
          (*(pcg_functions->Matvec))(matvec_data, -1.0, A, x, 1.0, r);
+         if (rtol)
+         {
+            /* compute s = r_old-r_new */
+            (*(pcg_functions->Axpy))(-1.0, s, r);
+            if (two_norm)
+               /* residual-based stopping criteria: ||r_new-r_old|| < rtol ||b|| */
+            {
+               HYPRE_Real drob2 = (*(pcg_functions->InnerProd))(s, s) / bi_prod;
+               if ( drob2 < rtol * rtol )
+               {
+                  if (print_level > 1 && my_id == 0)
+                  {
+                     hypre_printf("\n\n||r_old-r_new||/||b||: %e\n", hypre_sqrt(drob2));
+                  }
+                  break;
+               }
+            }
+            else
+               /* residual-based stopping criteria: ||r_new-r_old||_C < rtol ||b||_C */
+            {
+               HYPRE_Real r2ob2;
+               /* v = C*s = C*(r_old-r_new) */
+               (*(pcg_functions->ClearVector))(v);
+               precond(precond_data, A, s, v);
+               /* <s,v> */
+               r2ob2 = (*(pcg_functions->InnerProd))(s, v) / bi_prod;
+               if ( r2ob2 < rtol * rtol )
+               {
+                  if (print_level > 1 && my_id == 0)
+                  {
+                     hypre_printf("\n\n||r_old-r_new||_C/||b||_C: %e\n", hypre_sqrt(r2ob2));
+                  }
+                  break;
+               }
+            }
+         }
       }
 
-      /* residual-based stopping criteria: ||r_new-r_old|| < rtol ||b|| */
       if (rtol && two_norm)
       {
-         /* use that r_new-r_old = alpha * s */
-         HYPRE_Real drob2 = alpha*alpha*(*(pcg_functions->InnerProd))(s,s)/bi_prod;
-         if ( drob2 < rtol*rtol )
+         if (!recompute_true_residual)
          {
-            if (print_level > 1 && my_id == 0)
+            /* use that r_new-r_old = alpha * s */
+            HYPRE_Real drob2 = alpha * alpha * (*(pcg_functions->InnerProd))(s, s) / bi_prod;
+            if ( drob2 < rtol * rtol )
             {
-               hypre_printf("\n\n||r_old-r_new||/||b||: %e\n", sqrt(drob2));
+               if (print_level > 1 && my_id == 0)
+               {
+                  hypre_printf("\n\n||r_old-r_new||/||b||: %e\n", hypre_sqrt(drob2));
+               }
+               break;
             }
-            break;
          }
       }
 
@@ -568,27 +717,39 @@ hypre_PCGSolve( void *pcg_vdata,
 
       /* gamma = <r,s> */
       gamma = (*(pcg_functions->InnerProd))(r, s);
+      if (flex)
+      {
+         delta = gamma - (*(pcg_functions->InnerProd))(r_old, s);
+      }
 
       /* residual-based stopping criteria: ||r_new-r_old||_C < rtol ||b||_C */
       if (rtol && !two_norm)
       {
-         /* use that ||r_new-r_old||_C^2 = (r_new ,C r_new) + (r_old, C r_old) */
-         HYPRE_Real r2ob2 = (gamma + gamma_old)/bi_prod;
-         if ( r2ob2 < rtol*rtol)
+         if (!recompute_true_residual)
          {
-            if (print_level > 1 && my_id == 0)
+            /* The following assumes that residuals are C-orthogonal: */
+            /* use that ||r_new-r_old||_C^2 = (r_new ,C r_new) + (r_old, C r_old) */
+            HYPRE_Real r2ob2 = (gamma + gamma_old) / bi_prod;
+            if ( r2ob2 < rtol * rtol)
             {
-               hypre_printf("\n\n||r_old-r_new||_C/||b||_C: %e\n", sqrt(r2ob2));
+               if (print_level > 1 && my_id == 0)
+               {
+                  hypre_printf("\n\n||r_old-r_new||_C/||b||_C: %e\n", hypre_sqrt(r2ob2));
+               }
+               break;
             }
-            break;
          }
       }
 
       /* set i_prod for convergence test */
       if (two_norm)
-         i_prod = (*(pcg_functions->InnerProd))(r,r);
+      {
+         i_prod = (*(pcg_functions->InnerProd))(r, r);
+      }
       else
+      {
          i_prod = gamma;
+      }
 
       /*--------------------------------------------------------------------
        * optional output
@@ -596,36 +757,37 @@ hypre_PCGSolve( void *pcg_vdata,
 #if 0
       if (two_norm)
          hypre_printf("Iter (%d): ||r||_2 = %e, ||r||_2/||b||_2 = %e\n",
-                i, sqrt(i_prod), (bi_prod ? sqrt(i_prod/bi_prod) : 0));
+                      i, hypre_sqrt(i_prod), (bi_prod ? hypre_sqrt(i_prod / bi_prod) : 0));
       else
          hypre_printf("Iter (%d): ||r||_C = %e, ||r||_C/||b||_C = %e\n",
-                i, sqrt(i_prod), (bi_prod ? sqrt(i_prod/bi_prod) : 0));
+                      i, hypre_sqrt(i_prod), (bi_prod ? hypre_sqrt(i_prod / bi_prod) : 0));
 #endif
 
       /* print norm info */
-      if ( logging>0 || print_level>0 )
+      if ( logging > 0 || print_level > 0 )
       {
-         norms[i]     = sqrt(i_prod);
-         rel_norms[i] = bi_prod ? sqrt(i_prod/bi_prod) : 0;
+         norms[i]     = hypre_sqrt(i_prod);
+         rel_norms[i] = bi_prod ? hypre_sqrt(i_prod / bi_prod) : 0;
       }
-      if ( print_level > 1 && my_id==0 )
+      if ( print_level > 1 && my_id == 0 )
       {
          if (two_norm)
          {
-            if ( stop_crit && !rel_change && atolf==0 ) {  /* pure absolute tolerance */
+            if ( stop_crit && !rel_change && atolf == 0 )  /* pure absolute tolerance */
+            {
                hypre_printf("% 5d    %e    %f\n", i, norms[i],
-                      norms[i]/norms[i-1] );
+                            norms[i] / norms[i - 1] );
             }
             else
             {
                hypre_printf("% 5d    %e    %f    %e\n", i, norms[i],
-                      norms[i]/norms[i-1], rel_norms[i] );
+                            norms[i] / norms[i - 1], rel_norms[i] );
             }
          }
          else
          {
-               hypre_printf("% 5d    %e    %f    %e\n", i, norms[i],
-                      norms[i]/norms[i-1], rel_norms[i] );
+            hypre_printf("% 5d    %e    %f    %e\n", i, norms[i],
+                         norms[i] / norms[i - 1], rel_norms[i] );
          }
       }
 
@@ -634,10 +796,12 @@ hypre_PCGSolve( void *pcg_vdata,
        * check for convergence
        *--------------------------------------------------------------------*/
       if (i_prod / bi_prod < eps)  /* the basic convergence test */
-            tentatively_converged = 1;
+      {
+         tentatively_converged = 1;
+      }
       if ( tentatively_converged && recompute_residual )
          /* At user request, don't trust the convergence test until we've recomputed
-            the residual from scratch.  This is expensive in the usual case where an
+            the residual from scratch.  This is expensive in the usual case where
             the norm is the energy norm.
             This calculation is coded on the assumption that r's accuracy is only a
             concern for problems where CG takes many iterations. */
@@ -649,7 +813,7 @@ hypre_PCGSolve( void *pcg_vdata,
          /* set i_prod for convergence test */
          if (two_norm)
          {
-            i_prod = (*(pcg_functions->InnerProd))(r,r);
+            i_prod = (*(pcg_functions->InnerProd))(r, r);
          }
          else
          {
@@ -658,17 +822,18 @@ hypre_PCGSolve( void *pcg_vdata,
             precond(precond_data, A, r, s);
             /* iprod = gamma = <r,s> */
             i_prod = (*(pcg_functions->InnerProd))(r, s);
+            gamma = i_prod;
          }
-         if (i_prod / bi_prod >= eps) tentatively_converged = 0;
+         if (i_prod / bi_prod >= eps) { tentatively_converged = 0; }
       }
       if ( tentatively_converged && rel_change && (i_prod > guard_zero_residual ))
          /* At user request, don't treat this as converged unless x didn't change
             much in the last iteration. */
       {
-            pi_prod = (*(pcg_functions->InnerProd))(p,p);
-            xi_prod = (*(pcg_functions->InnerProd))(x,x);
-            ratio = alpha*alpha*pi_prod/xi_prod;
-            if (ratio >= eps) tentatively_converged = 0;
+         pi_prod = (*(pcg_functions->InnerProd))(p, p);
+         xi_prod = (*(pcg_functions->InnerProd))(x, x);
+         ratio = alpha * alpha * pi_prod / xi_prod;
+         if (ratio >= eps) { tentatively_converged = 0; }
       }
       if ( tentatively_converged )
          /* we've passed all the convergence tests, it's for real */
@@ -676,12 +841,45 @@ hypre_PCGSolve( void *pcg_vdata,
          (pcg_data -> converged) = 1;
          break;
       }
-
-      if (! (gamma > HYPRE_REAL_MIN) )
+      /* gamma should generally be greater than 0 for spd prec and nonzero r */
+      if (gamma <= 0.0)
+      {
+         if (print_level > 1 && my_id == 0)
+         {
+            hypre_printf("gamma %e", gamma);
+         }
+         hypre_error_w_msg(HYPRE_ERROR_CONV, "Negative or zero gamma value in PCG");
+         if (skip_break < 3)
+         {
+            if (i == 1) { i_prod = i_prod_0; }
+            break;
+         }
+      }
+      else if (! (gamma  >= HYPRE_REAL_TRUE_MIN))
+      {
+         hypre_error_w_msg(HYPRE_ERROR_CONV, "gamma value less than TRUE_MIN in PCG");
+         if (print_level > 1 && my_id == 0)
+         {
+            hypre_printf("gamma %e", gamma);
+         }
+         if (skip_break < 2)
+         {
+            if (i == 1) { i_prod = i_prod_0; }
+            break;
+         }
+      }
+      else if (! (gamma  >= HYPRE_REAL_MIN))
       {
          hypre_error_w_msg(HYPRE_ERROR_CONV, "Subnormal gamma value in PCG");
-
-         break;
+         if (print_level > 1 && my_id == 0)
+         {
+            hypre_printf("gamma %e", gamma);
+         }
+         if (skip_break < 1)
+         {
+            if (i == 1) { i_prod = i_prod_0; }
+            break;
+         }
       }
       /* ... gamma should be >=0.  IEEE subnormal numbers are < 2**(-1022)=2.2e-308
          (and >= 2**(-1074)=4.9e-324).  So a gamma this small means we're getting
@@ -700,26 +898,56 @@ hypre_PCGSolve( void *pcg_vdata,
       if (cf_tol > 0.0)
       {
          cf_ave_0 = cf_ave_1;
-         if (! (i_prod_0 > HYPRE_REAL_MIN) )
+         /* i_prod_0 is zero, or (almost) subnormal, yet i_prod wasn't small
+            enough to pass the convergence test.  Therefore initial guess was good,
+            and we're just calculating garbage - time to bail out before the
+            next step, which will be a divide by zero (or close to it). */
+         if (i_prod_0 <= 0.0)
          {
-            /* i_prod_0 is zero, or (almost) subnormal, yet i_prod wasn't small
-               enough to pass the convergence test.  Therefore initial guess was good,
-               and we're just calculating garbage - time to bail out before the
-               next step, which will be a divide by zero (or close to it). */
-            hypre_error_w_msg(HYPRE_ERROR_CONV, "Subnormal i_prod value in PCG");
-
-            break;
+            if (print_level > 1 && my_id == 0)
+            {
+               hypre_printf("i_prod_0 %e", i_prod_0);
+            }
+            hypre_error_w_msg(HYPRE_ERROR_CONV, "Negative or zero i_prod_0 value in PCG");
+            if (skip_break < 3)
+            {
+               break;
+            }
+         }
+         else if (! (i_prod_0  >= HYPRE_REAL_TRUE_MIN))
+         {
+            hypre_error_w_msg(HYPRE_ERROR_CONV, "i_prod_0 value less than TRUE_MIN in PCG");
+            if (print_level > 1 && my_id == 0)
+            {
+               hypre_printf("i_prod_0 %e", i_prod_0);
+            }
+            if (skip_break < 2)
+            {
+               break;
+            }
+         }
+         else if (! (i_prod_0  >= HYPRE_REAL_MIN))
+         {
+            hypre_error_w_msg(HYPRE_ERROR_CONV, "Subnormal i_prod_0 value in PCG");
+            if (print_level > 1 && my_id == 0)
+            {
+               hypre_printf("i_prod_0 %e", i_prod_0);
+            }
+            if (skip_break < 1)
+            {
+               break;
+            }
          }
-         cf_ave_1 = pow( i_prod / i_prod_0, 1.0/(2.0*i) );
+         cf_ave_1 = hypre_pow( i_prod / i_prod_0, 1.0 / (2.0 * i) );
 
-         weight   = fabs(cf_ave_1 - cf_ave_0);
+         weight   = hypre_abs(cf_ave_1 - cf_ave_0);
          weight   = weight / hypre_max(cf_ave_1, cf_ave_0);
          weight   = 1.0 - weight;
 #if 0
          hypre_printf("I = %d: cf_new = %e, cf_old = %e, weight = %e\n",
                       i, cf_ave_1, cf_ave_0, weight );
 #endif
-         if (weight * cf_ave_1 > cf_tol) break;
+         if (weight * cf_ave_1 > cf_tol) { break; }
       }
 
       /*--------------------------------------------------------------------
@@ -727,7 +955,14 @@ hypre_PCGSolve( void *pcg_vdata,
        *--------------------------------------------------------------------*/
 
       /* beta = gamma / gamma_old */
-      beta = gamma / gamma_old;
+      if (!flex)
+      {
+         beta = gamma / gamma_old;
+      }
+      else
+      {
+         beta = delta / gamma_old;
+      }
 
       /* p = s + beta p */
       if ( !recompute_true_residual )
@@ -736,26 +971,36 @@ hypre_PCGSolve( void *pcg_vdata,
          (*(pcg_functions->Axpy))(1.0, s, p);
       }
       else
+      {
          (*(pcg_functions->CopyVector))(s, p);
+      }
    }
 
    /*--------------------------------------------------------------------
     * Finish up with some outputs.
     *--------------------------------------------------------------------*/
 
-   if ( print_level > 1 && my_id==0 )
+   if ( print_level > 1 && my_id == 0 )
+   {
       hypre_printf("\n\n");
+   }
 
-  if (i >= max_iter && (i_prod/bi_prod) >= eps && eps > 0 && hybrid != -1)
-  {
-     hypre_error_w_msg(HYPRE_ERROR_CONV, "Reached max iterations in PCG before convergence");
-  }
+   if (i >= max_iter && (i_prod / bi_prod) >= eps && eps > 0 && hybrid != -1)
+   {
+      char msg[1024];
+      hypre_sprintf(msg, "Reached max iterations %d in PCG before convergence", max_iter);
+      hypre_error_w_msg(HYPRE_ERROR_CONV, msg);
+   }
 
    (pcg_data -> num_iterations) = i;
    if (bi_prod > 0.0)
-      (pcg_data -> rel_residual_norm) = sqrt(i_prod/bi_prod);
+   {
+      (pcg_data -> rel_residual_norm) = hypre_sqrt(i_prod / bi_prod);
+   }
    else /* actually, we'll never get here... */
+   {
       (pcg_data -> rel_residual_norm) = 0.0;
+   }
 
    HYPRE_ANNOTATE_FUNC_END;
 
@@ -793,7 +1038,7 @@ hypre_PCGGetTol( void   *pcg_vdata,
 
 HYPRE_Int
 hypre_PCGSetAbsoluteTol( void   *pcg_vdata,
-                 HYPRE_Real  a_tol       )
+                         HYPRE_Real  a_tol       )
 {
    hypre_PCGData *pcg_data = (hypre_PCGData *)pcg_vdata;
 
@@ -804,7 +1049,7 @@ hypre_PCGSetAbsoluteTol( void   *pcg_vdata,
 
 HYPRE_Int
 hypre_PCGGetAbsoluteTol( void   *pcg_vdata,
-                 HYPRE_Real * a_tol       )
+                         HYPRE_Real * a_tol       )
 {
    hypre_PCGData *pcg_data = (hypre_PCGData *)pcg_vdata;
 
@@ -980,7 +1225,7 @@ hypre_PCGGetRelChange( void *pcg_vdata,
 
 HYPRE_Int
 hypre_PCGSetRecomputeResidual( void *pcg_vdata,
-                       HYPRE_Int   recompute_residual  )
+                               HYPRE_Int   recompute_residual  )
 {
    hypre_PCGData *pcg_data = (hypre_PCGData *)pcg_vdata;
 
@@ -992,7 +1237,7 @@ hypre_PCGSetRecomputeResidual( void *pcg_vdata,
 
 HYPRE_Int
 hypre_PCGGetRecomputeResidual( void *pcg_vdata,
-                       HYPRE_Int * recompute_residual  )
+                               HYPRE_Int * recompute_residual  )
 {
    hypre_PCGData *pcg_data = (hypre_PCGData *)pcg_vdata;
 
@@ -1008,7 +1253,7 @@ hypre_PCGGetRecomputeResidual( void *pcg_vdata,
 
 HYPRE_Int
 hypre_PCGSetRecomputeResidualP( void *pcg_vdata,
-                       HYPRE_Int   recompute_residual_p  )
+                                HYPRE_Int   recompute_residual_p  )
 {
    hypre_PCGData *pcg_data = (hypre_PCGData *)pcg_vdata;
 
@@ -1019,7 +1264,7 @@ hypre_PCGSetRecomputeResidualP( void *pcg_vdata,
 
 HYPRE_Int
 hypre_PCGGetRecomputeResidualP( void *pcg_vdata,
-                       HYPRE_Int * recompute_residual_p  )
+                                HYPRE_Int * recompute_residual_p  )
 {
    hypre_PCGData *pcg_data = (hypre_PCGData *)pcg_vdata;
 
@@ -1034,7 +1279,7 @@ hypre_PCGGetRecomputeResidualP( void *pcg_vdata,
 
 HYPRE_Int
 hypre_PCGSetStopCrit( void *pcg_vdata,
-                       HYPRE_Int   stop_crit  )
+                      HYPRE_Int   stop_crit  )
 {
    hypre_PCGData *pcg_data = (hypre_PCGData *)pcg_vdata;
 
@@ -1046,7 +1291,7 @@ hypre_PCGSetStopCrit( void *pcg_vdata,
 
 HYPRE_Int
 hypre_PCGGetStopCrit( void *pcg_vdata,
-                       HYPRE_Int * stop_crit  )
+                      HYPRE_Int * stop_crit  )
 {
    hypre_PCGData *pcg_data = (hypre_PCGData *)pcg_vdata;
 
@@ -1056,6 +1301,62 @@ hypre_PCGGetStopCrit( void *pcg_vdata,
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_PCGSetSkipBreak, hypre_PCGGetSkipBreak
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_PCGSetSkipBreak( void *pcg_vdata,
+                       HYPRE_Int   skip_break  )
+{
+   hypre_PCGData *pcg_data = (hypre_PCGData *)pcg_vdata;
+
+
+   (pcg_data -> skip_break) = skip_break;
+
+   return hypre_error_flag;
+}
+
+HYPRE_Int
+hypre_PCGGetSkipBreak( void *pcg_vdata,
+                       HYPRE_Int * skip_break  )
+{
+   hypre_PCGData *pcg_data = (hypre_PCGData *)pcg_vdata;
+
+
+   *skip_break = (pcg_data -> skip_break);
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_PCGSetFlex, hypre_PCGGetFlex
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_PCGSetFlex( void *pcg_vdata,
+                  HYPRE_Int   flex  )
+{
+   hypre_PCGData *pcg_data = (hypre_PCGData *)pcg_vdata;
+
+
+   (pcg_data -> flex) = flex;
+
+   return hypre_error_flag;
+}
+
+HYPRE_Int
+hypre_PCGGetFlex( void *pcg_vdata,
+                  HYPRE_Int * flex  )
+{
+   hypre_PCGData *pcg_data = (hypre_PCGData *)pcg_vdata;
+
+
+   *flex = (pcg_data -> flex);
+
+   return hypre_error_flag;
+}
+
 /*--------------------------------------------------------------------------
  * hypre_PCGGetPrecond
  *--------------------------------------------------------------------------*/
@@ -1066,7 +1367,6 @@ hypre_PCGGetPrecond( void         *pcg_vdata,
 {
    hypre_PCGData *pcg_data = (hypre_PCGData *)pcg_vdata;
 
-
    *precond_data_ptr = (HYPRE_Solver)(pcg_data -> precond_data);
 
    return hypre_error_flag;
@@ -1078,14 +1378,13 @@ hypre_PCGGetPrecond( void         *pcg_vdata,
 
 HYPRE_Int
 hypre_PCGSetPrecond( void  *pcg_vdata,
-                     HYPRE_Int  (*precond)(void*,void*,void*,void*),
-                     HYPRE_Int  (*precond_setup)(void*,void*,void*,void*),
+                     HYPRE_Int  (*precond)(void*, void*, void*, void*),
+                     HYPRE_Int  (*precond_setup)(void*, void*, void*, void*),
                      void  *precond_data )
 {
    hypre_PCGData *pcg_data = (hypre_PCGData *)pcg_vdata;
    hypre_PCGFunctions *pcg_functions = pcg_data->functions;
 
-
    (pcg_functions -> precond)       = precond;
    (pcg_functions -> precond_setup) = precond_setup;
    (pcg_data -> precond_data)  = precond_data;
@@ -1093,6 +1392,28 @@ hypre_PCGSetPrecond( void  *pcg_vdata,
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_PCGSetPreconditioner
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_PCGSetPreconditioner(void *pcg_vdata,
+                           void *precond_data )
+{
+   hypre_PCGData      *pcg_data      = (hypre_PCGData*) pcg_vdata;
+   hypre_Solver       *base          = (hypre_Solver*)  precond_data;
+   hypre_PCGFunctions *pcg_functions = pcg_data->functions;
+
+   (pcg_data -> precond_data)       = precond_data;
+
+   (pcg_functions -> precond)       = (HYPRE_Int (*)(void*, void*, void*,
+                                                     void*)) hypre_SolverSolve(base);
+   (pcg_functions -> precond_setup) = (HYPRE_Int (*)(void*, void*, void*,
+                                                     void*)) hypre_SolverSetup(base);
+
+   return hypre_error_flag;
+}
+
 /*--------------------------------------------------------------------------
  * hypre_PCGSetPrintLevel, hypre_PCGGetPrintLevel
  *--------------------------------------------------------------------------*/
@@ -1127,7 +1448,7 @@ hypre_PCGGetPrintLevel( void *pcg_vdata,
 
 HYPRE_Int
 hypre_PCGSetLogging( void *pcg_vdata,
-                      HYPRE_Int   level)
+                     HYPRE_Int   level)
 {
    hypre_PCGData *pcg_data = (hypre_PCGData *)pcg_vdata;
 
@@ -1138,7 +1459,7 @@ hypre_PCGSetLogging( void *pcg_vdata,
 
 HYPRE_Int
 hypre_PCGGetLogging( void *pcg_vdata,
-                      HYPRE_Int * level)
+                     HYPRE_Int * level)
 {
    hypre_PCGData *pcg_data = (hypre_PCGData *)pcg_vdata;
 
@@ -1149,7 +1470,7 @@ hypre_PCGGetLogging( void *pcg_vdata,
 
 HYPRE_Int
 hypre_PCGSetHybrid( void *pcg_vdata,
-                      HYPRE_Int   level)
+                    HYPRE_Int   level)
 {
    hypre_PCGData *pcg_data = (hypre_PCGData *)pcg_vdata;
 
@@ -1232,7 +1553,7 @@ hypre_PCGGetFinalRelativeResidualNorm( void   *pcg_vdata,
 
    HYPRE_Real     rel_residual_norm = (pcg_data -> rel_residual_norm);
 
-  *relative_residual_norm = rel_residual_norm;
+   *relative_residual_norm = rel_residual_norm;
 
    return hypre_error_flag;
 }
diff --git a/external/hypre/src/krylov/pcg.h b/external/hypre/src/krylov/pcg.h
index bde899d7..e9493207 100644
--- a/external/hypre/src/krylov/pcg.h
+++ b/external/hypre/src/krylov/pcg.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -102,6 +102,7 @@ typedef struct
  every "recompute_residual_p" iterations.  This can be expensive and degrade the
  convergence. Use it only if you have seen a problem with the regular residual
  computation.
+ - skip_break means that cg will not stop for very small alpha and gamma. default: 0
 */
 
 typedef struct
@@ -119,12 +120,16 @@ typedef struct
    HYPRE_Int    stop_crit;
    HYPRE_Int    converged;
    HYPRE_Int    hybrid;
+   HYPRE_Int    skip_break;
+   HYPRE_Int    flex;
 
    void    *A;
    void    *p;
    void    *s;
    void    *r; /* ...contains the residual.  This is currently kept permanently.
                   If that is ever changed, it still must be kept if logging>1 */
+   void    *r_old; /* old residual needed for flexible CG, PR method */
+   void    *v; /* work vector only needed if recompute_residual_p uis used */
 
    HYPRE_Int  owns_matvec_data;  /* normally 1; if 0, don't delete it */
    void      *matvec_data;
@@ -181,7 +186,7 @@ hypre_PCGFunctionsCreate(
    HYPRE_Int    (*Axpy)          ( HYPRE_Complex alpha, void *x, void *y ),
    HYPRE_Int    (*PrecondSetup)  ( void *vdata, void *A, void *b, void *x ),
    HYPRE_Int    (*Precond)       ( void *vdata, void *A, void *b, void *x )
-   );
+);
 
 /**
  * Description...
diff --git a/external/hypre/src/lapack/CMakeLists.txt b/external/hypre/src/lapack/CMakeLists.txt
index 59b70647..f08f5633 100644
--- a/external/hypre/src/lapack/CMakeLists.txt
+++ b/external/hypre/src/lapack/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/lapack/README b/external/hypre/src/lapack/README
index b59c90bb..fc2e5d1e 100644
--- a/external/hypre/src/lapack/README
+++ b/external/hypre/src/lapack/README
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/lapack/_hypre_lapack.h b/external/hypre/src/lapack/_hypre_lapack.h
index f68ea60c..12932a68 100644
--- a/external/hypre/src/lapack/_hypre_lapack.h
+++ b/external/hypre/src/lapack/_hypre_lapack.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/lapack/dbdsqr.c b/external/hypre/src/lapack/dbdsqr.c
index d1437464..b97a8387 100644
--- a/external/hypre/src/lapack/dbdsqr.c
+++ b/external/hypre/src/lapack/dbdsqr.c
@@ -13,20 +13,13 @@ extern "C" {
 	-lf2c -lm   (in that order)
 */
 
-/* Table of constant values */
-
-static doublereal c_b15 = -.125;
-static integer c__1 = 1;
-static doublereal c_b49 = 1.;
-static doublereal c_b72 = -1.;
-
 /* Subroutine */ integer dbdsqr_(const char *uplo, integer *n, integer *ncvt, integer *
-	nru, integer *ncc, doublereal *d__, doublereal *e, doublereal *vt, 
+	nru, integer *ncc, doublereal *d__, doublereal *e, doublereal *vt,
 	integer *ldvt, doublereal *u, integer *ldu, doublereal *c__, integer *
 	ldc, doublereal *work, integer *info)
 {
     /* System generated locals */
-    integer c_dim1, c_offset, u_dim1, u_offset, vt_dim1, vt_offset, i__1, 
+    integer c_dim1, c_offset, u_dim1, u_offset, vt_dim1, vt_offset, i__1,
 	    i__2;
     doublereal d__1, d__2, d__3, d__4;
 
@@ -35,181 +28,187 @@ static doublereal c_b72 = -1.;
 	    doublereal *, doublereal *);
 
     /* Local variables */
-    static doublereal abse;
-    static integer idir;
-    static doublereal abss;
-    static integer oldm;
-    static doublereal cosl;
-    static integer isub, iter;
-    static doublereal unfl, sinl, cosr, smin, smax, sinr;
-    extern /* Subroutine */ integer drot_(integer *, doublereal *, integer *, 
+    doublereal abse;
+    integer idir;
+    doublereal abss;
+    integer oldm;
+    doublereal cosl;
+    integer isub, iter;
+    doublereal unfl, sinl, cosr, smin, smax, sinr;
+    extern /* Subroutine */ integer drot_(integer *, doublereal *, integer *,
 	    doublereal *, integer *, doublereal *, doublereal *), dlas2_(
-	    doublereal *, doublereal *, doublereal *, doublereal *, 
+	    doublereal *, doublereal *, doublereal *, doublereal *,
 	    doublereal *);
-    static doublereal f, g, h__;
-    static integer i__, j, m;
-    static doublereal r__;
-    extern /* Subroutine */ integer dscal_(integer *, doublereal *, doublereal *, 
+    doublereal f, g, h__;
+    integer i__, j, m;
+    doublereal r__;
+    extern /* Subroutine */ integer dscal_(integer *, doublereal *, doublereal *,
 	    integer *);
     extern logical lsame_(const char *,const char *);
-    static doublereal oldcs;
-    extern /* Subroutine */ integer dlasr_(const char *,const char *,const char *, integer *, 
+    doublereal oldcs;
+    extern /* Subroutine */ integer dlasr_(const char *,const char *,const char *, integer *,
 	    integer *, doublereal *, doublereal *, doublereal *, integer *);
-    static integer oldll;
-    static doublereal shift, sigmn, oldsn;
-    extern /* Subroutine */ integer dswap_(integer *, doublereal *, integer *, 
+    integer oldll;
+    doublereal shift, sigmn, oldsn;
+    extern /* Subroutine */ integer dswap_(integer *, doublereal *, integer *,
 	    doublereal *, integer *);
-    static integer maxit;
-    static doublereal sminl, sigmx;
-    static logical lower;
+    integer maxit;
+    doublereal sminl, sigmx;
+    logical lower;
     extern /* Subroutine */ integer dlasq1_(integer *, doublereal *, doublereal *,
-	     doublereal *, integer *), dlasv2_(doublereal *, doublereal *, 
-	    doublereal *, doublereal *, doublereal *, doublereal *, 
+	     doublereal *, integer *), dlasv2_(doublereal *, doublereal *,
+	    doublereal *, doublereal *, doublereal *, doublereal *,
 	    doublereal *, doublereal *, doublereal *);
-    static doublereal cs;
-    static integer ll;
+    doublereal cs;
+    integer ll;
     extern doublereal dlamch_(const char *);
-    static doublereal sn, mu;
-    extern /* Subroutine */ integer dlartg_(doublereal *, doublereal *, 
-	    doublereal *, doublereal *, doublereal *), xerbla_(const char *, 
+    doublereal sn, mu;
+    extern /* Subroutine */ integer dlartg_(doublereal *, doublereal *,
+	    doublereal *, doublereal *, doublereal *), xerbla_(const char *,
 	    integer *);
-    static doublereal sminoa, thresh;
-    static logical rotate;
-    static integer nm1;
-    static doublereal tolmul;
-    static integer nm12, nm13, lll;
-    static doublereal eps, sll, tol;
+    doublereal sminoa, thresh;
+    logical rotate;
+    integer nm1;
+    doublereal tolmul;
+    integer nm12, nm13, lll;
+    doublereal eps, sll, tol;
+
+    /* Table of constant values */
 
+    doublereal c_b15 = -.125;
+    integer c__1 = 1;
+    doublereal c_b49 = 1.;
+    doublereal c_b72 = -1.;
 
 #define c___ref(a_1,a_2) c__[(a_2)*c_dim1 + a_1]
 #define u_ref(a_1,a_2) u[(a_2)*u_dim1 + a_1]
 #define vt_ref(a_1,a_2) vt[(a_2)*vt_dim1 + a_1]
 
 
-/*  -- LAPACK routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       October 31, 1999   
-
-
-    Purpose   
-    =======   
-
-    DBDSQR computes the singular value decomposition (SVD) of a real   
-    N-by-N (upper or lower) bidiagonal matrix B:  B = Q * S * P' (P'   
-    denotes the transpose of P), where S is a diagonal matrix with   
-    non-negative diagonal elements (the singular values of B), and Q   
-    and P are orthogonal matrices.   
-
-    The routine computes S, and optionally computes U * Q, P' * VT,   
-    or Q' * C, for given real input matrices U, VT, and C.   
-
-    See "Computing  Small Singular Values of Bidiagonal Matrices With   
-    Guaranteed High Relative Accuracy," by J. Demmel and W. Kahan,   
-    LAPACK Working Note #3 (or SIAM J. Sci. Statist. Comput. vol. 11,   
-    no. 5, pp. 873-912, Sept 1990) and   
-    "Accurate singular values and differential qd algorithms," by   
-    B. Parlett and V. Fernando, Technical Report CPAM-554, Mathematics   
-    Department, University of California at Berkeley, July 1992   
-    for a detailed description of the algorithm.   
-
-    Arguments   
-    =========   
-
-    UPLO    (input) CHARACTER*1   
-            = 'U':  B is upper bidiagonal;   
-            = 'L':  B is lower bidiagonal.   
-
-    N       (input) INTEGER   
-            The order of the matrix B.  N >= 0.   
-
-    NCVT    (input) INTEGER   
-            The number of columns of the matrix VT. NCVT >= 0.   
-
-    NRU     (input) INTEGER   
-            The number of rows of the matrix U. NRU >= 0.   
-
-    NCC     (input) INTEGER   
-            The number of columns of the matrix C. NCC >= 0.   
-
-    D       (input/output) DOUBLE PRECISION array, dimension (N)   
-            On entry, the n diagonal elements of the bidiagonal matrix B.   
-            On exit, if INFO=0, the singular values of B in decreasing   
-            order.   
-
-    E       (input/output) DOUBLE PRECISION array, dimension (N)   
-            On entry, the elements of E contain the   
-            offdiagonal elements of the bidiagonal matrix whose SVD   
-            is desired. On normal exit (INFO = 0), E is destroyed.   
-            If the algorithm does not converge (INFO > 0), D and E   
-            will contain the diagonal and superdiagonal elements of a   
-            bidiagonal matrix orthogonally equivalent to the one given   
-            as input. E(N) is used for workspace.   
-
-    VT      (input/output) DOUBLE PRECISION array, dimension (LDVT, NCVT)   
-            On entry, an N-by-NCVT matrix VT.   
-            On exit, VT is overwritten by P' * VT.   
-            VT is not referenced if NCVT = 0.   
-
-    LDVT    (input) INTEGER   
-            The leading dimension of the array VT.   
-            LDVT >= max(1,N) if NCVT > 0; LDVT >= 1 if NCVT = 0.   
-
-    U       (input/output) DOUBLE PRECISION array, dimension (LDU, N)   
-            On entry, an NRU-by-N matrix U.   
-            On exit, U is overwritten by U * Q.   
-            U is not referenced if NRU = 0.   
-
-    LDU     (input) INTEGER   
-            The leading dimension of the array U.  LDU >= max(1,NRU).   
-
-    C       (input/output) DOUBLE PRECISION array, dimension (LDC, NCC)   
-            On entry, an N-by-NCC matrix C.   
-            On exit, C is overwritten by Q' * C.   
-            C is not referenced if NCC = 0.   
-
-    LDC     (input) INTEGER   
-            The leading dimension of the array C.   
-            LDC >= max(1,N) if NCC > 0; LDC >=1 if NCC = 0.   
-
-    WORK    (workspace) DOUBLE PRECISION array, dimension (4*N)   
-
-    INFO    (output) INTEGER   
-            = 0:  successful exit   
-            < 0:  If INFO = -i, the i-th argument had an illegal value   
-            > 0:  the algorithm did not converge; D and E contain the   
-                  elements of a bidiagonal matrix which is orthogonally   
-                  similar to the input matrix B;  if INFO = i, i   
-                  elements of E have not converged to zero.   
-
-    Internal Parameters   
-    ===================   
-
-    TOLMUL  DOUBLE PRECISION, default = max(10,min(100,EPS**(-1/8)))   
-            TOLMUL controls the convergence criterion of the QR loop.   
-            If it is positive, TOLMUL*EPS is the desired relative   
-               precision in the computed singular values.   
-            If it is negative, abs(TOLMUL*EPS*sigma_max) is the   
-               desired absolute accuracy in the computed singular   
-               values (corresponds to relative accuracy   
-               abs(TOLMUL*EPS) in the largest singular value.   
-            abs(TOLMUL) should be between 1 and 1/EPS, and preferably   
-               between 10 (for fast convergence) and .1/EPS   
-               (for there to be some accuracy in the results).   
-            Default is to lose at either one eighth or 2 of the   
-               available decimal digits in each computed singular value   
-               (whichever is smaller).   
-
-    MAXITR  INTEGER, default = 6   
-            MAXITR controls the maximum number of passes of the   
-            algorithm through its inner loop. The algorithms stops   
-            (and so fails to converge) if the number of passes   
-            through the inner loop exceeds MAXITR*N**2.   
-
-    =====================================================================   
-
-
-       Test the input parameters.   
+/*  -- LAPACK routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       October 31, 1999
+
+
+    Purpose
+    =======
+
+    DBDSQR computes the singular value decomposition (SVD) of a real
+    N-by-N (upper or lower) bidiagonal matrix B:  B = Q * S * P' (P'
+    denotes the transpose of P), where S is a diagonal matrix with
+    non-negative diagonal elements (the singular values of B), and Q
+    and P are orthogonal matrices.
+
+    The routine computes S, and optionally computes U * Q, P' * VT,
+    or Q' * C, for given real input matrices U, VT, and C.
+
+    See "Computing  Small Singular Values of Bidiagonal Matrices With
+    Guaranteed High Relative Accuracy," by J. Demmel and W. Kahan,
+    LAPACK Working Note #3 (or SIAM J. Sci. Statist. Comput. vol. 11,
+    no. 5, pp. 873-912, Sept 1990) and
+    "Accurate singular values and differential qd algorithms," by
+    B. Parlett and V. Fernando, Technical Report CPAM-554, Mathematics
+    Department, University of California at Berkeley, July 1992
+    for a detailed description of the algorithm.
+
+    Arguments
+    =========
+
+    UPLO    (input) CHARACTER*1
+            = 'U':  B is upper bidiagonal;
+            = 'L':  B is lower bidiagonal.
+
+    N       (input) INTEGER
+            The order of the matrix B.  N >= 0.
+
+    NCVT    (input) INTEGER
+            The number of columns of the matrix VT. NCVT >= 0.
+
+    NRU     (input) INTEGER
+            The number of rows of the matrix U. NRU >= 0.
+
+    NCC     (input) INTEGER
+            The number of columns of the matrix C. NCC >= 0.
+
+    D       (input/output) DOUBLE PRECISION array, dimension (N)
+            On entry, the n diagonal elements of the bidiagonal matrix B.
+            On exit, if INFO=0, the singular values of B in decreasing
+            order.
+
+    E       (input/output) DOUBLE PRECISION array, dimension (N)
+            On entry, the elements of E contain the
+            offdiagonal elements of the bidiagonal matrix whose SVD
+            is desired. On normal exit (INFO = 0), E is destroyed.
+            If the algorithm does not converge (INFO > 0), D and E
+            will contain the diagonal and superdiagonal elements of a
+            bidiagonal matrix orthogonally equivalent to the one given
+            as input. E(N) is used for workspace.
+
+    VT      (input/output) DOUBLE PRECISION array, dimension (LDVT, NCVT)
+            On entry, an N-by-NCVT matrix VT.
+            On exit, VT is overwritten by P' * VT.
+            VT is not referenced if NCVT = 0.
+
+    LDVT    (input) INTEGER
+            The leading dimension of the array VT.
+            LDVT >= max(1,N) if NCVT > 0; LDVT >= 1 if NCVT = 0.
+
+    U       (input/output) DOUBLE PRECISION array, dimension (LDU, N)
+            On entry, an NRU-by-N matrix U.
+            On exit, U is overwritten by U * Q.
+            U is not referenced if NRU = 0.
+
+    LDU     (input) INTEGER
+            The leading dimension of the array U.  LDU >= max(1,NRU).
+
+    C       (input/output) DOUBLE PRECISION array, dimension (LDC, NCC)
+            On entry, an N-by-NCC matrix C.
+            On exit, C is overwritten by Q' * C.
+            C is not referenced if NCC = 0.
+
+    LDC     (input) INTEGER
+            The leading dimension of the array C.
+            LDC >= max(1,N) if NCC > 0; LDC >=1 if NCC = 0.
+
+    WORK    (workspace) DOUBLE PRECISION array, dimension (4*N)
+
+    INFO    (output) INTEGER
+            = 0:  successful exit
+            < 0:  If INFO = -i, the i-th argument had an illegal value
+            > 0:  the algorithm did not converge; D and E contain the
+                  elements of a bidiagonal matrix which is orthogonally
+                  similar to the input matrix B;  if INFO = i, i
+                  elements of E have not converged to zero.
+
+    Internal Parameters
+    ===================
+
+    TOLMUL  DOUBLE PRECISION, default = max(10,min(100,EPS**(-1/8)))
+            TOLMUL controls the convergence criterion of the QR loop.
+            If it is positive, TOLMUL*EPS is the desired relative
+               precision in the computed singular values.
+            If it is negative, abs(TOLMUL*EPS*sigma_max) is the
+               desired absolute accuracy in the computed singular
+               values (corresponds to relative accuracy
+               abs(TOLMUL*EPS) in the largest singular value.
+            abs(TOLMUL) should be between 1 and 1/EPS, and preferably
+               between 10 (for fast convergence) and .1/EPS
+               (for there to be some accuracy in the results).
+            Default is to lose at either one eighth or 2 of the
+               available decimal digits in each computed singular value
+               (whichever is smaller).
+
+    MAXITR  INTEGER, default = 6
+            MAXITR controls the maximum number of passes of the
+            algorithm through its inner loop. The algorithms stops
+            (and so fails to converge) if the number of passes
+            through the inner loop exceeds MAXITR*N**2.
+
+    =====================================================================
+
+
+       Test the input parameters.
 
        Parameter adjustments */
     --d__;
@@ -238,12 +237,12 @@ static doublereal c_b72 = -1.;
 	*info = -4;
     } else if (*ncc < 0) {
 	*info = -5;
-    } else if (((*ncvt == 0) && (*ldvt < 1)) || 
+    } else if (((*ncvt == 0) && (*ldvt < 1)) ||
                ((*ncvt > 0) && (*ldvt < max(1,*n)))) {
 	*info = -9;
     } else if (*ldu < max(1,*nru)) {
 	*info = -11;
-    } else if (((*ncc == 0) && (*ldc < 1)) || 
+    } else if (((*ncc == 0) && (*ldc < 1)) ||
                ((*ncc > 0) && (*ldc < max(1,*n)))) {
 	*info = -13;
     }
@@ -280,7 +279,7 @@ static doublereal c_b72 = -1.;
     eps = dlamch_("Epsilon");
     unfl = dlamch_("Safe minimum");
 
-/*     If matrix lower bidiagonal, rotate to be upper bidiagonal   
+/*     If matrix lower bidiagonal, rotate to be upper bidiagonal
        by applying Givens rotations on the left */
 
     if (lower) {
@@ -298,7 +297,7 @@ static doublereal c_b72 = -1.;
 /*        Update singular vectors if desired */
 
 	if (*nru > 0) {
-	    dlasr_("R", "V", "F", nru, n, &work[1], &work[*n], &u[u_offset], 
+	    dlasr_("R", "V", "F", nru, n, &work[1], &work[*n], &u[u_offset],
 		    ldu);
 	}
 	if (*ncc > 0) {
@@ -307,11 +306,11 @@ static doublereal c_b72 = -1.;
 	}
     }
 
-/*     Compute singular values to relative accuracy TOL   
-       (By setting TOL to be negative, algorithm will compute   
-       singular values to absolute accuracy ABS(TOL)*norm(input matrix))   
+/*     Compute singular values to relative accuracy TOL
+       (By setting TOL to be negative, algorithm will compute
+       singular values to absolute accuracy ABS(TOL)*norm(input matrix))
 
-   Computing MAX   
+   Computing MAX
    Computing MIN */
     d__3 = 100., d__4 = pow_dd(&eps, &c_b15);
     d__1 = 10., d__2 = min(d__3,d__4);
@@ -362,15 +361,15 @@ static doublereal c_b72 = -1.;
 	thresh = max(d__1,d__2);
     } else {
 
-/*        Absolute accuracy desired   
+/*        Absolute accuracy desired
 
    Computing MAX */
 	d__1 = abs(tol) * smax, d__2 = *n * 6 * *n * unfl;
 	thresh = max(d__1,d__2);
     }
 
-/*     Prepare for main iteration loop for the singular values   
-       (MAXIT is the maximum number of passes through the inner   
+/*     Prepare for main iteration loop for the singular values
+       (MAXIT is the maximum number of passes through the inner
        loop permitted before nonconvergence signalled.) */
 
     maxit = *n * 6 * *n;
@@ -466,7 +465,7 @@ static doublereal c_b72 = -1.;
 	goto L60;
     }
 
-/*     If working on new submatrix, choose shift direction   
+/*     If working on new submatrix, choose shift direction
        (from larger end diagonal element towards smaller) */
 
     if (ll > oldm || m < oldll) {
@@ -487,7 +486,7 @@ static doublereal c_b72 = -1.;
 
     if (idir == 1) {
 
-/*        Run convergence test in forward direction   
+/*        Run convergence test in forward direction
           First apply standard test to bottom of matrix */
 
 	if ((d__2 = e[m - 1], abs(d__2)) <= abs(tol) * (d__1 = d__[m], abs(
@@ -499,7 +498,7 @@ static doublereal c_b72 = -1.;
 
 	if (tol >= 0.) {
 
-/*           If relative accuracy desired,   
+/*           If relative accuracy desired,
              apply convergence criterion forward */
 
 	    mu = (d__1 = d__[ll], abs(d__1));
@@ -519,7 +518,7 @@ static doublereal c_b72 = -1.;
 
     } else {
 
-/*        Run convergence test in backward direction   
+/*        Run convergence test in backward direction
           First apply standard test to top of matrix */
 
 	if ((d__2 = e[ll], abs(d__2)) <= abs(tol) * (d__1 = d__[ll], abs(d__1)
@@ -530,7 +529,7 @@ static doublereal c_b72 = -1.;
 
 	if (tol >= 0.) {
 
-/*           If relative accuracy desired,   
+/*           If relative accuracy desired,
              apply convergence criterion backward */
 
 	    mu = (d__1 = d__[m], abs(d__1));
@@ -551,8 +550,8 @@ static doublereal c_b72 = -1.;
     oldll = ll;
     oldm = m;
 
-/*     Compute shift.  First, test if shifting would ruin relative   
-       accuracy, and if so set the shift to zero.   
+/*     Compute shift.  First, test if shifting would ruin relative
+       accuracy, and if so set the shift to zero.
 
    Computing MAX */
     d__1 = eps, d__2 = tol * .01;
@@ -593,7 +592,7 @@ static doublereal c_b72 = -1.;
     if (shift == 0.) {
 	if (idir == 1) {
 
-/*           Chase bulge from top to bottom   
+/*           Chase bulge from top to bottom
              Save cosines and sines for later singular vector updates */
 
 	    cs = 1.;
@@ -627,12 +626,12 @@ static doublereal c_b72 = -1.;
 	    }
 	    if (*nru > 0) {
 		i__1 = m - ll + 1;
-		dlasr_("R", "V", "F", nru, &i__1, &work[nm12 + 1], &work[nm13 
+		dlasr_("R", "V", "F", nru, &i__1, &work[nm12 + 1], &work[nm13
 			+ 1], &u_ref(1, ll), ldu);
 	    }
 	    if (*ncc > 0) {
 		i__1 = m - ll + 1;
-		dlasr_("L", "V", "F", &i__1, ncc, &work[nm12 + 1], &work[nm13 
+		dlasr_("L", "V", "F", &i__1, ncc, &work[nm12 + 1], &work[nm13
 			+ 1], &c___ref(ll, 1), ldc);
 	    }
 
@@ -644,7 +643,7 @@ static doublereal c_b72 = -1.;
 
 	} else {
 
-/*           Chase bulge from bottom to top   
+/*           Chase bulge from bottom to top
              Save cosines and sines for later singular vector updates */
 
 	    cs = 1.;
@@ -699,7 +698,7 @@ static doublereal c_b72 = -1.;
 
 	if (idir == 1) {
 
-/*           Chase bulge from top to bottom   
+/*           Chase bulge from top to bottom
              Save cosines and sines for later singular vector updates */
 
 	    f = ((d__1 = d__[ll], abs(d__1)) - shift) * (d_sign(&c_b49, &d__[
@@ -740,12 +739,12 @@ static doublereal c_b72 = -1.;
 	    }
 	    if (*nru > 0) {
 		i__1 = m - ll + 1;
-		dlasr_("R", "V", "F", nru, &i__1, &work[nm12 + 1], &work[nm13 
+		dlasr_("R", "V", "F", nru, &i__1, &work[nm12 + 1], &work[nm13
 			+ 1], &u_ref(1, ll), ldu);
 	    }
 	    if (*ncc > 0) {
 		i__1 = m - ll + 1;
-		dlasr_("L", "V", "F", &i__1, ncc, &work[nm12 + 1], &work[nm13 
+		dlasr_("L", "V", "F", &i__1, ncc, &work[nm12 + 1], &work[nm13
 			+ 1], &c___ref(ll, 1), ldc);
 	    }
 
@@ -757,7 +756,7 @@ static doublereal c_b72 = -1.;
 
 	} else {
 
-/*           Chase bulge from bottom to top   
+/*           Chase bulge from bottom to top
              Save cosines and sines for later singular vector updates */
 
 	    f = ((d__1 = d__[m], abs(d__1)) - shift) * (d_sign(&c_b49, &d__[m]
@@ -836,7 +835,7 @@ static doublereal c_b72 = -1.;
 /* L170: */
     }
 
-/*     Sort the singular values into decreasing order (insertion sort on   
+/*     Sort the singular values into decreasing order (insertion sort on
        singular values, but only one transposition per singular vector) */
 
     i__1 = *n - 1;
diff --git a/external/hypre/src/lapack/dgebd2.c b/external/hypre/src/lapack/dgebd2.c
index 180ec0d6..c9b5104b 100644
--- a/external/hypre/src/lapack/dgebd2.c
+++ b/external/hypre/src/lapack/dgebd2.c
@@ -12,137 +12,137 @@ extern "C" {
 	lda, doublereal *d__, doublereal *e, doublereal *tauq, doublereal *
 	taup, doublereal *work, integer *info)
 {
-/*  -- LAPACK routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       February 29, 1992   
+/*  -- LAPACK routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       February 29, 1992
 
 
-    Purpose   
-    =======   
+    Purpose
+    =======
 
-    DGEBD2 reduces a real general m by n matrix A to upper or lower   
-    bidiagonal form B by an orthogonal transformation: Q' * A * P = B.   
+    DGEBD2 reduces a real general m by n matrix A to upper or lower
+    bidiagonal form B by an orthogonal transformation: Q' * A * P = B.
 
-    If m >= n, B is upper bidiagonal; if m < n, B is lower bidiagonal.   
+    If m >= n, B is upper bidiagonal; if m < n, B is lower bidiagonal.
 
-    Arguments   
-    =========   
+    Arguments
+    =========
 
-    M       (input) INTEGER   
-            The number of rows in the matrix A.  M >= 0.   
+    M       (input) INTEGER
+            The number of rows in the matrix A.  M >= 0.
 
-    N       (input) INTEGER   
-            The number of columns in the matrix A.  N >= 0.   
+    N       (input) INTEGER
+            The number of columns in the matrix A.  N >= 0.
 
-    A       (input/output) DOUBLE PRECISION array, dimension (LDA,N)   
-            On entry, the m by n general matrix to be reduced.   
-            On exit,   
-            if m >= n, the diagonal and the first superdiagonal are   
-              overwritten with the upper bidiagonal matrix B; the   
-              elements below the diagonal, with the array TAUQ, represent   
-              the orthogonal matrix Q as a product of elementary   
-              reflectors, and the elements above the first superdiagonal,   
-              with the array TAUP, represent the orthogonal matrix P as   
-              a product of elementary reflectors;   
-            if m < n, the diagonal and the first subdiagonal are   
-              overwritten with the lower bidiagonal matrix B; the   
-              elements below the first subdiagonal, with the array TAUQ,   
-              represent the orthogonal matrix Q as a product of   
-              elementary reflectors, and the elements above the diagonal,   
-              with the array TAUP, represent the orthogonal matrix P as   
-              a product of elementary reflectors.   
-            See Further Details.   
+    A       (input/output) DOUBLE PRECISION array, dimension (LDA,N)
+            On entry, the m by n general matrix to be reduced.
+            On exit,
+            if m >= n, the diagonal and the first superdiagonal are
+              overwritten with the upper bidiagonal matrix B; the
+              elements below the diagonal, with the array TAUQ, represent
+              the orthogonal matrix Q as a product of elementary
+              reflectors, and the elements above the first superdiagonal,
+              with the array TAUP, represent the orthogonal matrix P as
+              a product of elementary reflectors;
+            if m < n, the diagonal and the first subdiagonal are
+              overwritten with the lower bidiagonal matrix B; the
+              elements below the first subdiagonal, with the array TAUQ,
+              represent the orthogonal matrix Q as a product of
+              elementary reflectors, and the elements above the diagonal,
+              with the array TAUP, represent the orthogonal matrix P as
+              a product of elementary reflectors.
+            See Further Details.
 
-    LDA     (input) INTEGER   
-            The leading dimension of the array A.  LDA >= max(1,M).   
+    LDA     (input) INTEGER
+            The leading dimension of the array A.  LDA >= max(1,M).
 
-    D       (output) DOUBLE PRECISION array, dimension (min(M,N))   
-            The diagonal elements of the bidiagonal matrix B:   
-            D(i) = A(i,i).   
+    D       (output) DOUBLE PRECISION array, dimension (min(M,N))
+            The diagonal elements of the bidiagonal matrix B:
+            D(i) = A(i,i).
 
-    E       (output) DOUBLE PRECISION array, dimension (min(M,N)-1)   
-            The off-diagonal elements of the bidiagonal matrix B:   
-            if m >= n, E(i) = A(i,i+1) for i = 1,2,...,n-1;   
-            if m < n, E(i) = A(i+1,i) for i = 1,2,...,m-1.   
+    E       (output) DOUBLE PRECISION array, dimension (min(M,N)-1)
+            The off-diagonal elements of the bidiagonal matrix B:
+            if m >= n, E(i) = A(i,i+1) for i = 1,2,...,n-1;
+            if m < n, E(i) = A(i+1,i) for i = 1,2,...,m-1.
 
-    TAUQ    (output) DOUBLE PRECISION array dimension (min(M,N))   
-            The scalar factors of the elementary reflectors which   
-            represent the orthogonal matrix Q. See Further Details.   
+    TAUQ    (output) DOUBLE PRECISION array dimension (min(M,N))
+            The scalar factors of the elementary reflectors which
+            represent the orthogonal matrix Q. See Further Details.
 
-    TAUP    (output) DOUBLE PRECISION array, dimension (min(M,N))   
-            The scalar factors of the elementary reflectors which   
-            represent the orthogonal matrix P. See Further Details.   
+    TAUP    (output) DOUBLE PRECISION array, dimension (min(M,N))
+            The scalar factors of the elementary reflectors which
+            represent the orthogonal matrix P. See Further Details.
 
-    WORK    (workspace) DOUBLE PRECISION array, dimension (max(M,N))   
+    WORK    (workspace) DOUBLE PRECISION array, dimension (max(M,N))
 
-    INFO    (output) INTEGER   
-            = 0: successful exit.   
-            < 0: if INFO = -i, the i-th argument had an illegal value.   
+    INFO    (output) INTEGER
+            = 0: successful exit.
+            < 0: if INFO = -i, the i-th argument had an illegal value.
 
-    Further Details   
-    ===============   
+    Further Details
+    ===============
 
-    The matrices Q and P are represented as products of elementary   
-    reflectors:   
+    The matrices Q and P are represented as products of elementary
+    reflectors:
 
-    If m >= n,   
+    If m >= n,
 
-       Q = H(1) H(2) . . . H(n)  and  P = G(1) G(2) . . . G(n-1)   
+       Q = H(1) H(2) . . . H(n)  and  P = G(1) G(2) . . . G(n-1)
 
-    Each H(i) and G(i) has the form:   
+    Each H(i) and G(i) has the form:
 
-       H(i) = I - tauq * v * v'  and G(i) = I - taup * u * u'   
+       H(i) = I - tauq * v * v'  and G(i) = I - taup * u * u'
 
-    where tauq and taup are real scalars, and v and u are real vectors;   
-    v(1:i-1) = 0, v(i) = 1, and v(i+1:m) is stored on exit in A(i+1:m,i);   
-    u(1:i) = 0, u(i+1) = 1, and u(i+2:n) is stored on exit in A(i,i+2:n);   
-    tauq is stored in TAUQ(i) and taup in TAUP(i).   
+    where tauq and taup are real scalars, and v and u are real vectors;
+    v(1:i-1) = 0, v(i) = 1, and v(i+1:m) is stored on exit in A(i+1:m,i);
+    u(1:i) = 0, u(i+1) = 1, and u(i+2:n) is stored on exit in A(i,i+2:n);
+    tauq is stored in TAUQ(i) and taup in TAUP(i).
 
-    If m < n,   
+    If m < n,
 
-       Q = H(1) H(2) . . . H(m-1)  and  P = G(1) G(2) . . . G(m)   
+       Q = H(1) H(2) . . . H(m-1)  and  P = G(1) G(2) . . . G(m)
 
-    Each H(i) and G(i) has the form:   
+    Each H(i) and G(i) has the form:
 
-       H(i) = I - tauq * v * v'  and G(i) = I - taup * u * u'   
+       H(i) = I - tauq * v * v'  and G(i) = I - taup * u * u'
 
-    where tauq and taup are real scalars, and v and u are real vectors;   
-    v(1:i) = 0, v(i+1) = 1, and v(i+2:m) is stored on exit in A(i+2:m,i);   
-    u(1:i-1) = 0, u(i) = 1, and u(i+1:n) is stored on exit in A(i,i+1:n);   
-    tauq is stored in TAUQ(i) and taup in TAUP(i).   
+    where tauq and taup are real scalars, and v and u are real vectors;
+    v(1:i) = 0, v(i+1) = 1, and v(i+2:m) is stored on exit in A(i+2:m,i);
+    u(1:i-1) = 0, u(i) = 1, and u(i+1:n) is stored on exit in A(i,i+1:n);
+    tauq is stored in TAUQ(i) and taup in TAUP(i).
 
-    The contents of A on exit are illustrated by the following examples:   
+    The contents of A on exit are illustrated by the following examples:
 
-    m = 6 and n = 5 (m > n):          m = 5 and n = 6 (m < n):   
+    m = 6 and n = 5 (m > n):          m = 5 and n = 6 (m < n):
 
-      (  d   e   u1  u1  u1 )           (  d   u1  u1  u1  u1  u1 )   
-      (  v1  d   e   u2  u2 )           (  e   d   u2  u2  u2  u2 )   
-      (  v1  v2  d   e   u3 )           (  v1  e   d   u3  u3  u3 )   
-      (  v1  v2  v3  d   e  )           (  v1  v2  e   d   u4  u4 )   
-      (  v1  v2  v3  v4  d  )           (  v1  v2  v3  e   d   u5 )   
-      (  v1  v2  v3  v4  v5 )   
+      (  d   e   u1  u1  u1 )           (  d   u1  u1  u1  u1  u1 )
+      (  v1  d   e   u2  u2 )           (  e   d   u2  u2  u2  u2 )
+      (  v1  v2  d   e   u3 )           (  v1  e   d   u3  u3  u3 )
+      (  v1  v2  v3  d   e  )           (  v1  v2  e   d   u4  u4 )
+      (  v1  v2  v3  v4  d  )           (  v1  v2  v3  e   d   u5 )
+      (  v1  v2  v3  v4  v5 )
 
-    where d and e denote diagonal and off-diagonal elements of B, vi   
-    denotes an element of the vector defining H(i), and ui an element of   
-    the vector defining G(i).   
+    where d and e denote diagonal and off-diagonal elements of B, vi
+    denotes an element of the vector defining H(i), and ui an element of
+    the vector defining G(i).
 
-    =====================================================================   
+    =====================================================================
 
 
-       Test the input parameters   
+       Test the input parameters
 
        Parameter adjustments */
     /* Table of constant values */
-    static integer c__1 = 1;
-    
+    integer c__1 = 1;
+
     /* System generated locals */
     integer a_dim1, a_offset, i__1, i__2, i__3, i__4;
     /* Local variables */
-    static integer i__;
-    extern /* Subroutine */ integer dlarf_(const char *, integer *, integer *, 
-	    doublereal *, integer *, doublereal *, doublereal *, integer *, 
-	    doublereal *), dlarfg_(integer *, doublereal *, 
+    integer i__;
+    extern /* Subroutine */ integer dlarf_(const char *, integer *, integer *,
+	    doublereal *, integer *, doublereal *, doublereal *, integer *,
+	    doublereal *), dlarfg_(integer *, doublereal *,
 	    doublereal *, integer *, doublereal *), xerbla_(const char *, integer *);
 #define a_ref(a_1,a_2) a[(a_2)*a_dim1 + a_1]
 
@@ -178,7 +178,7 @@ extern "C" {
 	i__1 = *n;
 	for (i__ = 1; i__ <= i__1; ++i__) {
 
-/*           Generate elementary reflector H(i) to annihilate A(i+1:m,i)   
+/*           Generate elementary reflector H(i) to annihilate A(i+1:m,i)
 
    Computing MIN */
 	    i__2 = i__ + 1;
@@ -192,14 +192,14 @@ extern "C" {
 
 	    i__2 = *m - i__ + 1;
 	    i__3 = *n - i__;
-	    dlarf_("Left", &i__2, &i__3, &a_ref(i__, i__), &c__1, &tauq[i__], 
+	    dlarf_("Left", &i__2, &i__3, &a_ref(i__, i__), &c__1, &tauq[i__],
 		    &a_ref(i__, i__ + 1), lda, &work[1]);
 	    a_ref(i__, i__) = d__[i__];
 
 	    if (i__ < *n) {
 
-/*              Generate elementary reflector G(i) to annihilate   
-                A(i,i+2:n)   
+/*              Generate elementary reflector G(i) to annihilate
+                A(i,i+2:n)
 
    Computing MIN */
 		i__2 = i__ + 2;
@@ -228,7 +228,7 @@ extern "C" {
 	i__1 = *m;
 	for (i__ = 1; i__ <= i__1; ++i__) {
 
-/*           Generate elementary reflector G(i) to annihilate A(i,i+1:n)   
+/*           Generate elementary reflector G(i) to annihilate A(i,i+1:n)
 
    Computing MIN */
 	    i__2 = i__ + 1;
@@ -238,7 +238,7 @@ extern "C" {
 	    d__[i__] = a_ref(i__, i__);
 	    a_ref(i__, i__) = 1.;
 
-/*           Apply G(i) to A(i+1:m,i:n) from the right   
+/*           Apply G(i) to A(i+1:m,i:n) from the right
 
    Computing MIN */
 	    i__2 = i__ + 1;
@@ -250,8 +250,8 @@ extern "C" {
 
 	    if (i__ < *m) {
 
-/*              Generate elementary reflector H(i) to annihilate   
-                A(i+2:m,i)   
+/*              Generate elementary reflector H(i) to annihilate
+                A(i+2:m,i)
 
    Computing MIN */
 		i__2 = i__ + 2;
diff --git a/external/hypre/src/lapack/dgebrd.c b/external/hypre/src/lapack/dgebrd.c
index f1c79983..5f1f68c1 100644
--- a/external/hypre/src/lapack/dgebrd.c
+++ b/external/hypre/src/lapack/dgebrd.c
@@ -12,168 +12,168 @@ extern "C" {
 	lda, doublereal *d__, doublereal *e, doublereal *tauq, doublereal *
 	taup, doublereal *work, integer *lwork, integer *info)
 {
-/*  -- LAPACK routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       June 30, 1999   
+/*  -- LAPACK routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       June 30, 1999
 
 
-    Purpose   
-    =======   
+    Purpose
+    =======
 
-    DGEBRD reduces a general real M-by-N matrix A to upper or lower   
-    bidiagonal form B by an orthogonal transformation: Q**T * A * P = B.   
+    DGEBRD reduces a general real M-by-N matrix A to upper or lower
+    bidiagonal form B by an orthogonal transformation: Q**T * A * P = B.
 
-    If m >= n, B is upper bidiagonal; if m < n, B is lower bidiagonal.   
+    If m >= n, B is upper bidiagonal; if m < n, B is lower bidiagonal.
 
-    Arguments   
-    =========   
+    Arguments
+    =========
 
-    M       (input) INTEGER   
-            The number of rows in the matrix A.  M >= 0.   
+    M       (input) INTEGER
+            The number of rows in the matrix A.  M >= 0.
 
-    N       (input) INTEGER   
-            The number of columns in the matrix A.  N >= 0.   
+    N       (input) INTEGER
+            The number of columns in the matrix A.  N >= 0.
 
-    A       (input/output) DOUBLE PRECISION array, dimension (LDA,N)   
-            On entry, the M-by-N general matrix to be reduced.   
-            On exit,   
-            if m >= n, the diagonal and the first superdiagonal are   
-              overwritten with the upper bidiagonal matrix B; the   
-              elements below the diagonal, with the array TAUQ, represent   
-              the orthogonal matrix Q as a product of elementary   
-              reflectors, and the elements above the first superdiagonal,   
-              with the array TAUP, represent the orthogonal matrix P as   
-              a product of elementary reflectors;   
-            if m < n, the diagonal and the first subdiagonal are   
-              overwritten with the lower bidiagonal matrix B; the   
-              elements below the first subdiagonal, with the array TAUQ,   
-              represent the orthogonal matrix Q as a product of   
-              elementary reflectors, and the elements above the diagonal,   
-              with the array TAUP, represent the orthogonal matrix P as   
-              a product of elementary reflectors.   
-            See Further Details.   
+    A       (input/output) DOUBLE PRECISION array, dimension (LDA,N)
+            On entry, the M-by-N general matrix to be reduced.
+            On exit,
+            if m >= n, the diagonal and the first superdiagonal are
+              overwritten with the upper bidiagonal matrix B; the
+              elements below the diagonal, with the array TAUQ, represent
+              the orthogonal matrix Q as a product of elementary
+              reflectors, and the elements above the first superdiagonal,
+              with the array TAUP, represent the orthogonal matrix P as
+              a product of elementary reflectors;
+            if m < n, the diagonal and the first subdiagonal are
+              overwritten with the lower bidiagonal matrix B; the
+              elements below the first subdiagonal, with the array TAUQ,
+              represent the orthogonal matrix Q as a product of
+              elementary reflectors, and the elements above the diagonal,
+              with the array TAUP, represent the orthogonal matrix P as
+              a product of elementary reflectors.
+            See Further Details.
 
-    LDA     (input) INTEGER   
-            The leading dimension of the array A.  LDA >= max(1,M).   
+    LDA     (input) INTEGER
+            The leading dimension of the array A.  LDA >= max(1,M).
 
-    D       (output) DOUBLE PRECISION array, dimension (min(M,N))   
-            The diagonal elements of the bidiagonal matrix B:   
-            D(i) = A(i,i).   
+    D       (output) DOUBLE PRECISION array, dimension (min(M,N))
+            The diagonal elements of the bidiagonal matrix B:
+            D(i) = A(i,i).
 
-    E       (output) DOUBLE PRECISION array, dimension (min(M,N)-1)   
-            The off-diagonal elements of the bidiagonal matrix B:   
-            if m >= n, E(i) = A(i,i+1) for i = 1,2,...,n-1;   
-            if m < n, E(i) = A(i+1,i) for i = 1,2,...,m-1.   
+    E       (output) DOUBLE PRECISION array, dimension (min(M,N)-1)
+            The off-diagonal elements of the bidiagonal matrix B:
+            if m >= n, E(i) = A(i,i+1) for i = 1,2,...,n-1;
+            if m < n, E(i) = A(i+1,i) for i = 1,2,...,m-1.
 
-    TAUQ    (output) DOUBLE PRECISION array dimension (min(M,N))   
-            The scalar factors of the elementary reflectors which   
-            represent the orthogonal matrix Q. See Further Details.   
+    TAUQ    (output) DOUBLE PRECISION array dimension (min(M,N))
+            The scalar factors of the elementary reflectors which
+            represent the orthogonal matrix Q. See Further Details.
 
-    TAUP    (output) DOUBLE PRECISION array, dimension (min(M,N))   
-            The scalar factors of the elementary reflectors which   
-            represent the orthogonal matrix P. See Further Details.   
+    TAUP    (output) DOUBLE PRECISION array, dimension (min(M,N))
+            The scalar factors of the elementary reflectors which
+            represent the orthogonal matrix P. See Further Details.
 
-    WORK    (workspace/output) DOUBLE PRECISION array, dimension (LWORK)   
-            On exit, if INFO = 0, WORK(1) returns the optimal LWORK.   
+    WORK    (workspace/output) DOUBLE PRECISION array, dimension (LWORK)
+            On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
 
-    LWORK   (input) INTEGER   
-            The length of the array WORK.  LWORK >= max(1,M,N).   
-            For optimum performance LWORK >= (M+N)*NB, where NB   
-            is the optimal blocksize.   
+    LWORK   (input) INTEGER
+            The length of the array WORK.  LWORK >= max(1,M,N).
+            For optimum performance LWORK >= (M+N)*NB, where NB
+            is the optimal blocksize.
 
-            If LWORK = -1, then a workspace query is assumed; the routine   
-            only calculates the optimal size of the WORK array, returns   
-            this value as the first entry of the WORK array, and no error   
-            message related to LWORK is issued by XERBLA.   
+            If LWORK = -1, then a workspace query is assumed; the routine
+            only calculates the optimal size of the WORK array, returns
+            this value as the first entry of the WORK array, and no error
+            message related to LWORK is issued by XERBLA.
 
-    INFO    (output) INTEGER   
-            = 0:  successful exit   
-            < 0:  if INFO = -i, the i-th argument had an illegal value.   
+    INFO    (output) INTEGER
+            = 0:  successful exit
+            < 0:  if INFO = -i, the i-th argument had an illegal value.
 
-    Further Details   
-    ===============   
+    Further Details
+    ===============
 
-    The matrices Q and P are represented as products of elementary   
-    reflectors:   
+    The matrices Q and P are represented as products of elementary
+    reflectors:
 
-    If m >= n,   
+    If m >= n,
 
-       Q = H(1) H(2) . . . H(n)  and  P = G(1) G(2) . . . G(n-1)   
+       Q = H(1) H(2) . . . H(n)  and  P = G(1) G(2) . . . G(n-1)
 
-    Each H(i) and G(i) has the form:   
+    Each H(i) and G(i) has the form:
 
-       H(i) = I - tauq * v * v'  and G(i) = I - taup * u * u'   
+       H(i) = I - tauq * v * v'  and G(i) = I - taup * u * u'
 
-    where tauq and taup are real scalars, and v and u are real vectors;   
-    v(1:i-1) = 0, v(i) = 1, and v(i+1:m) is stored on exit in A(i+1:m,i);   
-    u(1:i) = 0, u(i+1) = 1, and u(i+2:n) is stored on exit in A(i,i+2:n);   
-    tauq is stored in TAUQ(i) and taup in TAUP(i).   
+    where tauq and taup are real scalars, and v and u are real vectors;
+    v(1:i-1) = 0, v(i) = 1, and v(i+1:m) is stored on exit in A(i+1:m,i);
+    u(1:i) = 0, u(i+1) = 1, and u(i+2:n) is stored on exit in A(i,i+2:n);
+    tauq is stored in TAUQ(i) and taup in TAUP(i).
 
-    If m < n,   
+    If m < n,
 
-       Q = H(1) H(2) . . . H(m-1)  and  P = G(1) G(2) . . . G(m)   
+       Q = H(1) H(2) . . . H(m-1)  and  P = G(1) G(2) . . . G(m)
 
-    Each H(i) and G(i) has the form:   
+    Each H(i) and G(i) has the form:
 
-       H(i) = I - tauq * v * v'  and G(i) = I - taup * u * u'   
+       H(i) = I - tauq * v * v'  and G(i) = I - taup * u * u'
 
-    where tauq and taup are real scalars, and v and u are real vectors;   
-    v(1:i) = 0, v(i+1) = 1, and v(i+2:m) is stored on exit in A(i+2:m,i);   
-    u(1:i-1) = 0, u(i) = 1, and u(i+1:n) is stored on exit in A(i,i+1:n);   
-    tauq is stored in TAUQ(i) and taup in TAUP(i).   
+    where tauq and taup are real scalars, and v and u are real vectors;
+    v(1:i) = 0, v(i+1) = 1, and v(i+2:m) is stored on exit in A(i+2:m,i);
+    u(1:i-1) = 0, u(i) = 1, and u(i+1:n) is stored on exit in A(i,i+1:n);
+    tauq is stored in TAUQ(i) and taup in TAUP(i).
 
-    The contents of A on exit are illustrated by the following examples:   
+    The contents of A on exit are illustrated by the following examples:
 
-    m = 6 and n = 5 (m > n):          m = 5 and n = 6 (m < n):   
+    m = 6 and n = 5 (m > n):          m = 5 and n = 6 (m < n):
 
-      (  d   e   u1  u1  u1 )           (  d   u1  u1  u1  u1  u1 )   
-      (  v1  d   e   u2  u2 )           (  e   d   u2  u2  u2  u2 )   
-      (  v1  v2  d   e   u3 )           (  v1  e   d   u3  u3  u3 )   
-      (  v1  v2  v3  d   e  )           (  v1  v2  e   d   u4  u4 )   
-      (  v1  v2  v3  v4  d  )           (  v1  v2  v3  e   d   u5 )   
-      (  v1  v2  v3  v4  v5 )   
+      (  d   e   u1  u1  u1 )           (  d   u1  u1  u1  u1  u1 )
+      (  v1  d   e   u2  u2 )           (  e   d   u2  u2  u2  u2 )
+      (  v1  v2  d   e   u3 )           (  v1  e   d   u3  u3  u3 )
+      (  v1  v2  v3  d   e  )           (  v1  v2  e   d   u4  u4 )
+      (  v1  v2  v3  v4  d  )           (  v1  v2  v3  e   d   u5 )
+      (  v1  v2  v3  v4  v5 )
 
-    where d and e denote diagonal and off-diagonal elements of B, vi   
-    denotes an element of the vector defining H(i), and ui an element of   
-    the vector defining G(i).   
+    where d and e denote diagonal and off-diagonal elements of B, vi
+    denotes an element of the vector defining H(i), and ui an element of
+    the vector defining G(i).
 
-    =====================================================================   
+    =====================================================================
 
 
-       Test the input parameters   
+       Test the input parameters
 
        Parameter adjustments */
     /* Table of constant values */
-    static integer c__1 = 1;
-    static integer c_n1 = -1;
-    static integer c__3 = 3;
-    static integer c__2 = 2;
-    static doublereal c_b21 = -1.;
-    static doublereal c_b22 = 1.;
-    
+    integer c__1 = 1;
+    integer c_n1 = -1;
+    integer c__3 = 3;
+    integer c__2 = 2;
+    doublereal c_b21 = -1.;
+    doublereal c_b22 = 1.;
+
     /* System generated locals */
     integer a_dim1, a_offset, i__1, i__2, i__3, i__4;
     /* Local variables */
-    static integer i__, j;
-    extern /* Subroutine */ integer dgemm_(const char *,const char *, integer *, integer *, 
-	    integer *, doublereal *, doublereal *, integer *, doublereal *, 
+    integer i__, j;
+    extern /* Subroutine */ integer dgemm_(const char *,const char *, integer *, integer *,
+	    integer *, doublereal *, doublereal *, integer *, doublereal *,
 	    integer *, doublereal *, doublereal *, integer *);
-    static integer nbmin, iinfo, minmn;
-    extern /* Subroutine */ integer dgebd2_(integer *, integer *, doublereal *, 
+    integer nbmin, iinfo, minmn;
+    extern /* Subroutine */ integer dgebd2_(integer *, integer *, doublereal *,
 	    integer *, doublereal *, doublereal *, doublereal *, doublereal *,
 	     doublereal *, integer *);
-    static integer nb;
-    extern /* Subroutine */ integer dlabrd_(integer *, integer *, integer *, 
+    integer nb;
+    extern /* Subroutine */ integer dlabrd_(integer *, integer *, integer *,
 	    doublereal *, integer *, doublereal *, doublereal *, doublereal *,
 	     doublereal *, doublereal *, integer *, doublereal *, integer *);
-    static integer nx;
-    static doublereal ws;
+    integer nx;
+    doublereal ws;
     extern /* Subroutine */ integer xerbla_(const char *, integer *);
-    extern integer ilaenv_(integer *, const char *,const char *, integer *, integer *, 
+    extern integer ilaenv_(integer *, const char *,const char *, integer *, integer *,
 	    integer *, integer *, ftnlen, ftnlen);
-    static integer ldwrkx, ldwrky, lwkopt;
-    static logical lquery;
+    integer ldwrkx, ldwrky, lwkopt;
+    logical lquery;
 #define a_ref(a_1,a_2) a[(a_2)*a_dim1 + a_1]
 
 
@@ -230,7 +230,7 @@ extern "C" {
 
     if (nb > 1 && nb < minmn) {
 
-/*        Set the crossover point NX.   
+/*        Set the crossover point NX.
 
    Computing MAX */
 	i__1 = nb, i__2 = ilaenv_(&c__3, "DGEBRD", " ", m, n, &c_n1, &c_n1, (
@@ -243,7 +243,7 @@ extern "C" {
 	    ws = (doublereal) ((*m + *n) * nb);
 	    if ((doublereal) (*lwork) < ws) {
 
-/*              Not enough work space for the optimal NB, consider using   
+/*              Not enough work space for the optimal NB, consider using
                 a smaller block size. */
 
 		nbmin = ilaenv_(&c__2, "DGEBRD", " ", m, n, &c_n1, &c_n1, (
@@ -264,17 +264,17 @@ extern "C" {
     i__2 = nb;
     for (i__ = 1; i__2 < 0 ? i__ >= i__1 : i__ <= i__1; i__ += i__2) {
 
-/*        Reduce rows and columns i:i+nb-1 to bidiagonal form and return   
-          the matrices X and Y which are needed to update the unreduced   
+/*        Reduce rows and columns i:i+nb-1 to bidiagonal form and return
+          the matrices X and Y which are needed to update the unreduced
           part of the matrix */
 
 	i__3 = *m - i__ + 1;
 	i__4 = *n - i__ + 1;
-	dlabrd_(&i__3, &i__4, &nb, &a_ref(i__, i__), lda, &d__[i__], &e[i__], 
-		&tauq[i__], &taup[i__], &work[1], &ldwrkx, &work[ldwrkx * nb 
+	dlabrd_(&i__3, &i__4, &nb, &a_ref(i__, i__), lda, &d__[i__], &e[i__],
+		&tauq[i__], &taup[i__], &work[1], &ldwrkx, &work[ldwrkx * nb
 		+ 1], &ldwrky);
 
-/*        Update the trailing submatrix A(i+nb:m,i+nb:n), using an update   
+/*        Update the trailing submatrix A(i+nb:m,i+nb:n), using an update
           of the form  A := A - V*Y' - X*U' */
 
 	i__3 = *m - i__ - nb + 1;
diff --git a/external/hypre/src/lapack/dgelq2.c b/external/hypre/src/lapack/dgelq2.c
index 711d67d4..3a5d034b 100644
--- a/external/hypre/src/lapack/dgelq2.c
+++ b/external/hypre/src/lapack/dgelq2.c
@@ -77,12 +77,12 @@ extern "C" {
     /* System generated locals */
     integer a_dim1, a_offset, i__1, i__2, i__3;
     /* Local variables */
-    static integer i__, k;
+     integer i__, k;
     extern /* Subroutine */ integer dlarf_(const char *, integer *, integer *, 
 	    doublereal *, integer *, doublereal *, doublereal *, integer *, 
 	    doublereal *), dlarfg_(integer *, doublereal *, 
 	    doublereal *, integer *, doublereal *), xerbla_(const char *, integer *);
-    static doublereal aii;
+     doublereal aii;
 #define a_ref(a_1,a_2) a[(a_2)*a_dim1 + a_1]
 
     a_dim1 = *lda;
diff --git a/external/hypre/src/lapack/dgelqf.c b/external/hypre/src/lapack/dgelqf.c
index f1a8eb68..9f6c9e7f 100644
--- a/external/hypre/src/lapack/dgelqf.c
+++ b/external/hypre/src/lapack/dgelqf.c
@@ -86,30 +86,30 @@ extern "C" {
 
        Parameter adjustments */
     /* Table of constant values */
-    static integer c__1 = 1;
-    static integer c_n1 = -1;
-    static integer c__3 = 3;
-    static integer c__2 = 2;
+     integer c__1 = 1;
+     integer c_n1 = -1;
+     integer c__3 = 3;
+     integer c__2 = 2;
     
     /* System generated locals */
     integer a_dim1, a_offset, i__1, i__2, i__3, i__4;
     /* Local variables */
-    static integer i__, k, nbmin, iinfo;
+     integer i__, k, nbmin, iinfo;
     extern /* Subroutine */ integer dgelq2_(integer *, integer *, doublereal *, 
 	    integer *, doublereal *, doublereal *, integer *);
-    static integer ib, nb;
+     integer ib, nb;
     extern /* Subroutine */ integer dlarfb_(const char *,const char *,const char *,const char *, 
 	    integer *, integer *, integer *, doublereal *, integer *, 
 	    doublereal *, integer *, doublereal *, integer *, doublereal *, 
 	    integer *);
-    static integer nx;
+     integer nx;
     extern /* Subroutine */ integer dlarft_(const char *,const char *, integer *, integer *, 
 	    doublereal *, integer *, doublereal *, doublereal *, integer *), xerbla_(const char *, integer *);
     extern integer ilaenv_(integer *,const char *,const char *, integer *, integer *, 
 	    integer *, integer *, ftnlen, ftnlen);
-    static integer ldwork, lwkopt;
-    static logical lquery;
-    static integer iws;
+     integer ldwork, lwkopt;
+     logical lquery;
+     integer iws;
 #define a_ref(a_1,a_2) a[(a_2)*a_dim1 + a_1]
 
 
diff --git a/external/hypre/src/lapack/dgels.c b/external/hypre/src/lapack/dgels.c
index 21c6448a..6a398190 100644
--- a/external/hypre/src/lapack/dgels.c
+++ b/external/hypre/src/lapack/dgels.c
@@ -9,163 +9,163 @@ extern "C" {
 #include "hypre_lapack.h"
 
 /* Subroutine */ integer dgels_(char *trans, integer *m, integer *n, integer *
-	nrhs, doublereal *a, integer *lda, doublereal *b, integer *ldb, 
+	nrhs, doublereal *a, integer *lda, doublereal *b, integer *ldb,
 	doublereal *work, integer *lwork, integer *info)
 {
-/*  -- LAPACK driver routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       June 30, 1999   
-
-
-    Purpose   
-    =======   
-
-    DGELS solves overdetermined or underdetermined real linear systems   
-    involving an M-by-N matrix A, or its transpose, using a QR or LQ   
-    factorization of A.  It is assumed that A has full rank.   
-
-    The following options are provided:   
-
-    1. If TRANS = 'N' and m >= n:  find the least squares solution of   
-       an overdetermined system, i.e., solve the least squares problem   
-                    minimize || B - A*X ||.   
-
-    2. If TRANS = 'N' and m < n:  find the minimum norm solution of   
-       an underdetermined system A * X = B.   
-
-    3. If TRANS = 'T' and m >= n:  find the minimum norm solution of   
-       an undetermined system A**T * X = B.   
-
-    4. If TRANS = 'T' and m < n:  find the least squares solution of   
-       an overdetermined system, i.e., solve the least squares problem   
-                    minimize || B - A**T * X ||.   
-
-    Several right hand side vectors b and solution vectors x can be   
-    handled in a single call; they are stored as the columns of the   
-    M-by-NRHS right hand side matrix B and the N-by-NRHS solution   
-    matrix X.   
-
-    Arguments   
-    =========   
-
-    TRANS   (input) CHARACTER   
-            = 'N': the linear system involves A;   
-            = 'T': the linear system involves A**T.   
-
-    M       (input) INTEGER   
-            The number of rows of the matrix A.  M >= 0.   
-
-    N       (input) INTEGER   
-            The number of columns of the matrix A.  N >= 0.   
-
-    NRHS    (input) INTEGER   
-            The number of right hand sides, i.e., the number of   
-            columns of the matrices B and X. NRHS >=0.   
-
-    A       (input/output) DOUBLE PRECISION array, dimension (LDA,N)   
-            On entry, the M-by-N matrix A.   
-            On exit,   
-              if M >= N, A is overwritten by details of its QR   
-                         factorization as returned by DGEQRF;   
-              if M <  N, A is overwritten by details of its LQ   
-                         factorization as returned by DGELQF.   
-
-    LDA     (input) INTEGER   
-            The leading dimension of the array A.  LDA >= max(1,M).   
-
-    B       (input/output) DOUBLE PRECISION array, dimension (LDB,NRHS)   
-            On entry, the matrix B of right hand side vectors, stored   
-            columnwise; B is M-by-NRHS if TRANS = 'N', or N-by-NRHS   
-            if TRANS = 'T'.   
-            On exit, B is overwritten by the solution vectors, stored   
-            columnwise:   
-            if TRANS = 'N' and m >= n, rows 1 to n of B contain the least   
-            squares solution vectors; the residual sum of squares for the   
-            solution in each column is given by the sum of squares of   
-            elements N+1 to M in that column;   
-            if TRANS = 'N' and m < n, rows 1 to N of B contain the   
-            minimum norm solution vectors;   
-            if TRANS = 'T' and m >= n, rows 1 to M of B contain the   
-            minimum norm solution vectors;   
-            if TRANS = 'T' and m < n, rows 1 to M of B contain the   
-            least squares solution vectors; the residual sum of squares   
-            for the solution in each column is given by the sum of   
-            squares of elements M+1 to N in that column.   
-
-    LDB     (input) INTEGER   
-            The leading dimension of the array B. LDB >= MAX(1,M,N).   
-
-    WORK    (workspace/output) DOUBLE PRECISION array, dimension (LWORK)   
-            On exit, if INFO = 0, WORK(1) returns the optimal LWORK.   
-
-    LWORK   (input) INTEGER   
-            The dimension of the array WORK.   
-            LWORK >= max( 1, MN + max( MN, NRHS ) ).   
-            For optimal performance,   
-            LWORK >= max( 1, MN + max( MN, NRHS )*NB ).   
-            where MN = min(M,N) and NB is the optimum block size.   
-
-            If LWORK = -1, then a workspace query is assumed; the routine   
-            only calculates the optimal size of the WORK array, returns   
-            this value as the first entry of the WORK array, and no error   
-            message related to LWORK is issued by XERBLA.   
-
-    INFO    (output) INTEGER   
-            = 0:  successful exit   
-            < 0:  if INFO = -i, the i-th argument had an illegal value   
+/*  -- LAPACK driver routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       June 30, 1999
+
+
+    Purpose
+    =======
+
+    DGELS solves overdetermined or underdetermined real linear systems
+    involving an M-by-N matrix A, or its transpose, using a QR or LQ
+    factorization of A.  It is assumed that A has full rank.
+
+    The following options are provided:
+
+    1. If TRANS = 'N' and m >= n:  find the least squares solution of
+       an overdetermined system, i.e., solve the least squares problem
+                    minimize || B - A*X ||.
+
+    2. If TRANS = 'N' and m < n:  find the minimum norm solution of
+       an underdetermined system A * X = B.
+
+    3. If TRANS = 'T' and m >= n:  find the minimum norm solution of
+       an undetermined system A**T * X = B.
+
+    4. If TRANS = 'T' and m < n:  find the least squares solution of
+       an overdetermined system, i.e., solve the least squares problem
+                    minimize || B - A**T * X ||.
+
+    Several right hand side vectors b and solution vectors x can be
+    handled in a single call; they are stored as the columns of the
+    M-by-NRHS right hand side matrix B and the N-by-NRHS solution
+    matrix X.
+
+    Arguments
+    =========
+
+    TRANS   (input) CHARACTER
+            = 'N': the linear system involves A;
+            = 'T': the linear system involves A**T.
+
+    M       (input) INTEGER
+            The number of rows of the matrix A.  M >= 0.
+
+    N       (input) INTEGER
+            The number of columns of the matrix A.  N >= 0.
+
+    NRHS    (input) INTEGER
+            The number of right hand sides, i.e., the number of
+            columns of the matrices B and X. NRHS >=0.
+
+    A       (input/output) DOUBLE PRECISION array, dimension (LDA,N)
+            On entry, the M-by-N matrix A.
+            On exit,
+              if M >= N, A is overwritten by details of its QR
+                         factorization as returned by DGEQRF;
+              if M <  N, A is overwritten by details of its LQ
+                         factorization as returned by DGELQF.
+
+    LDA     (input) INTEGER
+            The leading dimension of the array A.  LDA >= max(1,M).
+
+    B       (input/output) DOUBLE PRECISION array, dimension (LDB,NRHS)
+            On entry, the matrix B of right hand side vectors, stored
+            columnwise; B is M-by-NRHS if TRANS = 'N', or N-by-NRHS
+            if TRANS = 'T'.
+            On exit, B is overwritten by the solution vectors, stored
+            columnwise:
+            if TRANS = 'N' and m >= n, rows 1 to n of B contain the least
+            squares solution vectors; the residual sum of squares for the
+            solution in each column is given by the sum of squares of
+            elements N+1 to M in that column;
+            if TRANS = 'N' and m < n, rows 1 to N of B contain the
+            minimum norm solution vectors;
+            if TRANS = 'T' and m >= n, rows 1 to M of B contain the
+            minimum norm solution vectors;
+            if TRANS = 'T' and m < n, rows 1 to M of B contain the
+            least squares solution vectors; the residual sum of squares
+            for the solution in each column is given by the sum of
+            squares of elements M+1 to N in that column.
+
+    LDB     (input) INTEGER
+            The leading dimension of the array B. LDB >= MAX(1,M,N).
+
+    WORK    (workspace/output) DOUBLE PRECISION array, dimension (LWORK)
+            On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
+
+    LWORK   (input) INTEGER
+            The dimension of the array WORK.
+            LWORK >= max( 1, MN + max( MN, NRHS ) ).
+            For optimal performance,
+            LWORK >= max( 1, MN + max( MN, NRHS )*NB ).
+            where MN = min(M,N) and NB is the optimum block size.
+
+            If LWORK = -1, then a workspace query is assumed; the routine
+            only calculates the optimal size of the WORK array, returns
+            this value as the first entry of the WORK array, and no error
+            message related to LWORK is issued by XERBLA.
+
+    INFO    (output) INTEGER
+            = 0:  successful exit
+            < 0:  if INFO = -i, the i-th argument had an illegal value
 
-    =====================================================================   
+    =====================================================================
 
 
-       Test the input arguments.   
+       Test the input arguments.
 
        Parameter adjustments */
     /* Table of constant values */
-    static integer c__1 = 1;
-    static integer c_n1 = -1;
-    static doublereal c_b33 = 0.;
-    static integer c__0 = 0;
-    static doublereal c_b61 = 1.;
-    
+    integer c__1 = 1;
+    integer c_n1 = -1;
+    doublereal c_b33 = 0.;
+    integer c__0 = 0;
+    doublereal c_b61 = 1.;
+
     /* System generated locals */
     integer a_dim1, a_offset, b_dim1, b_offset, i__1, i__2;
     /* Local variables */
-    static doublereal anrm, bnrm;
-    static integer brow;
-    static logical tpsd;
-    static integer i__, j, iascl, ibscl;
+    doublereal anrm, bnrm;
+    integer brow;
+    logical tpsd;
+    integer i__, j, iascl, ibscl;
     extern logical lsame_(const char *,const char *);
-    extern /* Subroutine */ integer dtrsm_(const char *,const char *,const char *,const char *, 
-	    integer *, integer *, doublereal *, doublereal *, integer *, 
+    extern /* Subroutine */ integer dtrsm_(const char *,const char *,const char *,const char *,
+	    integer *, integer *, doublereal *, doublereal *, integer *,
 	    doublereal *, integer *);
-    static integer wsize;
-    static doublereal rwork[1];
+    integer wsize;
+    doublereal rwork[1];
     extern /* Subroutine */ integer dlabad_(doublereal *, doublereal *);
-    static integer nb;
-    extern doublereal dlamch_(const char *), dlange_(const char *, integer *, 
+    integer nb;
+    extern doublereal dlamch_(const char *), dlange_(const char *, integer *,
 	    integer *, doublereal *, integer *, doublereal *);
-    static integer mn;
-    extern /* Subroutine */ integer dgelqf_(integer *, integer *, doublereal *, 
-	    integer *, doublereal *, doublereal *, integer *, integer *), 
-	    dlascl_(const char *, integer *, integer *, doublereal *, doublereal *, 
+    integer mn;
+    extern /* Subroutine */ integer dgelqf_(integer *, integer *, doublereal *,
+	    integer *, doublereal *, doublereal *, integer *, integer *),
+	    dlascl_(const char *, integer *, integer *, doublereal *, doublereal *,
 	    integer *, integer *, doublereal *, integer *, integer *),
-	     dgeqrf_(integer *, integer *, doublereal *, integer *, 
+	     dgeqrf_(integer *, integer *, doublereal *, integer *,
 	    doublereal *, doublereal *, integer *, integer *), dlaset_(const char *,
-	     integer *, integer *, doublereal *, doublereal *, doublereal *, 
+	     integer *, integer *, doublereal *, doublereal *, doublereal *,
 	    integer *), xerbla_(const char *, integer *);
-    extern integer ilaenv_(integer *,const char *,const char *, integer *, integer *, 
+    extern integer ilaenv_(integer *,const char *,const char *, integer *, integer *,
 	    integer *, integer *, ftnlen, ftnlen);
-    static integer scllen;
-    static doublereal bignum;
-    extern /* Subroutine */ integer dormlq_(const char *,const char *, integer *, integer *, 
-	    integer *, doublereal *, integer *, doublereal *, doublereal *, 
-	    integer *, doublereal *, integer *, integer *), 
-	    dormqr_(const char *,const char *, integer *, integer *, integer *, 
-	    doublereal *, integer *, doublereal *, doublereal *, integer *, 
+    integer scllen;
+    doublereal bignum;
+    extern /* Subroutine */ integer dormlq_(const char *,const char *, integer *, integer *,
+	    integer *, doublereal *, integer *, doublereal *, doublereal *,
+	    integer *, doublereal *, integer *, integer *),
+	    dormqr_(const char *,const char *, integer *, integer *, integer *,
+	    doublereal *, integer *, doublereal *, doublereal *, integer *,
 	    doublereal *, integer *, integer *);
-    static doublereal smlnum;
-    static logical lquery;
+    doublereal smlnum;
+    logical lquery;
 #define b_ref(a_1,a_2) b[(a_2)*b_dim1 + a_1]
 
 
@@ -215,7 +215,7 @@ extern "C" {
 	}
 
 	if (*m >= *n) {
-	    nb = ilaenv_(&c__1, "DGEQRF", " ", m, n, &c_n1, &c_n1, (ftnlen)6, 
+	    nb = ilaenv_(&c__1, "DGEQRF", " ", m, n, &c_n1, &c_n1, (ftnlen)6,
 		    (ftnlen)1);
 	    if (tpsd) {
 /* Computing MAX */
@@ -229,7 +229,7 @@ extern "C" {
 		nb = max(i__1,i__2);
 	    }
 	} else {
-	    nb = ilaenv_(&c__1, "DGELQF", " ", m, n, &c_n1, &c_n1, (ftnlen)6, 
+	    nb = ilaenv_(&c__1, "DGELQF", " ", m, n, &c_n1, &c_n1, (ftnlen)6,
 		    (ftnlen)1);
 	    if (tpsd) {
 /* Computing MAX */
@@ -259,7 +259,7 @@ extern "C" {
 	return 0;
     }
 
-/*     Quick return if possible   
+/*     Quick return if possible
 
    Computing MIN */
     i__1 = min(*m,*n);
@@ -283,14 +283,14 @@ extern "C" {
 
 /*        Scale matrix norm up to SMLNUM */
 
-	dlascl_("G", &c__0, &c__0, &anrm, &smlnum, m, n, &a[a_offset], lda, 
+	dlascl_("G", &c__0, &c__0, &anrm, &smlnum, m, n, &a[a_offset], lda,
 		info);
 	iascl = 1;
     } else if (anrm > bignum) {
 
 /*        Scale matrix norm down to BIGNUM */
 
-	dlascl_("G", &c__0, &c__0, &anrm, &bignum, m, n, &a[a_offset], lda, 
+	dlascl_("G", &c__0, &c__0, &anrm, &bignum, m, n, &a[a_offset], lda,
 		info);
 	iascl = 2;
     } else if (anrm == 0.) {
@@ -312,14 +312,14 @@ extern "C" {
 
 /*        Scale matrix norm up to SMLNUM */
 
-	dlascl_("G", &c__0, &c__0, &bnrm, &smlnum, &brow, nrhs, &b[b_offset], 
+	dlascl_("G", &c__0, &c__0, &bnrm, &smlnum, &brow, nrhs, &b[b_offset],
 		ldb, info);
 	ibscl = 1;
     } else if (bnrm > bignum) {
 
 /*        Scale matrix norm down to BIGNUM */
 
-	dlascl_("G", &c__0, &c__0, &bnrm, &bignum, &brow, nrhs, &b[b_offset], 
+	dlascl_("G", &c__0, &c__0, &bnrm, &bignum, &brow, nrhs, &b[b_offset],
 		ldb, info);
 	ibscl = 2;
     }
@@ -336,7 +336,7 @@ extern "C" {
 
 	if (! tpsd) {
 
-/*           Least-Squares Problem min || A * X - B ||   
+/*           Least-Squares Problem min || A * X - B ||
 
              B(1:M,1:NRHS) := Q' * B(1:M,1:NRHS) */
 
@@ -344,7 +344,7 @@ extern "C" {
 	    dormqr_("Left", "Transpose", m, nrhs, n, &a[a_offset], lda, &work[
 		    1], &b[b_offset], ldb, &work[mn + 1], &i__1, info);
 
-/*           workspace at least NRHS, optimally NRHS*NB   
+/*           workspace at least NRHS, optimally NRHS*NB
 
              B(1:N,1:NRHS) := inv(R) * B(1:N,1:NRHS) */
 
@@ -355,11 +355,11 @@ extern "C" {
 
 	} else {
 
-/*           Overdetermined system of equations A' * X = B   
+/*           Overdetermined system of equations A' * X = B
 
              B(1:N,1:NRHS) := inv(R') * B(1:N,1:NRHS) */
 
-	    dtrsm_("Left", "Upper", "Transpose", "Non-unit", n, nrhs, &c_b61, 
+	    dtrsm_("Left", "Upper", "Transpose", "Non-unit", n, nrhs, &c_b61,
 		    &a[a_offset], lda, &b[b_offset], ldb);
 
 /*           B(N+1:M,1:NRHS) = ZERO */
@@ -398,7 +398,7 @@ extern "C" {
 
 	if (! tpsd) {
 
-/*           underdetermined system of equations A * X = B   
+/*           underdetermined system of equations A * X = B
 
              B(1:M,1:NRHS) := inv(L) * B(1:M,1:NRHS) */
 
@@ -429,7 +429,7 @@ extern "C" {
 
 	} else {
 
-/*           overdetermined system min || A' * X - B ||   
+/*           overdetermined system min || A' * X - B ||
 
              B(1:N,1:NRHS) := Q * B(1:N,1:NRHS) */
 
@@ -437,11 +437,11 @@ extern "C" {
 	    dormlq_("Left", "No transpose", n, nrhs, m, &a[a_offset], lda, &
 		    work[1], &b[b_offset], ldb, &work[mn + 1], &i__1, info);
 
-/*           workspace at least NRHS, optimally NRHS*NB   
+/*           workspace at least NRHS, optimally NRHS*NB
 
              B(1:M,1:NRHS) := inv(L') * B(1:M,1:NRHS) */
 
-	    dtrsm_("Left", "Lower", "Transpose", "Non-unit", m, nrhs, &c_b61, 
+	    dtrsm_("Left", "Lower", "Transpose", "Non-unit", m, nrhs, &c_b61,
 		    &a[a_offset], lda, &b[b_offset], ldb);
 
 	    scllen = *m;
diff --git a/external/hypre/src/lapack/dgeqr2.c b/external/hypre/src/lapack/dgeqr2.c
index af98168f..716aab50 100644
--- a/external/hypre/src/lapack/dgeqr2.c
+++ b/external/hypre/src/lapack/dgeqr2.c
@@ -11,81 +11,81 @@ extern "C" {
 /* Subroutine */ integer dgeqr2_(integer *m, integer *n, doublereal *a, integer *
 	lda, doublereal *tau, doublereal *work, integer *info)
 {
-/*  -- LAPACK routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       February 29, 1992   
+/*  -- LAPACK routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       February 29, 1992
 
 
-    Purpose   
-    =======   
+    Purpose
+    =======
 
-    DGEQR2 computes a QR factorization of a real m by n matrix A:   
-    A = Q * R.   
+    DGEQR2 computes a QR factorization of a real m by n matrix A:
+    A = Q * R.
 
-    Arguments   
-    =========   
+    Arguments
+    =========
 
-    M       (input) INTEGER   
-            The number of rows of the matrix A.  M >= 0.   
+    M       (input) INTEGER
+            The number of rows of the matrix A.  M >= 0.
 
-    N       (input) INTEGER   
-            The number of columns of the matrix A.  N >= 0.   
+    N       (input) INTEGER
+            The number of columns of the matrix A.  N >= 0.
 
-    A       (input/output) DOUBLE PRECISION array, dimension (LDA,N)   
-            On entry, the m by n matrix A.   
-            On exit, the elements on and above the diagonal of the array   
-            contain the min(m,n) by n upper trapezoidal matrix R (R is   
-            upper triangular if m >= n); the elements below the diagonal,   
-            with the array TAU, represent the orthogonal matrix Q as a   
-            product of elementary reflectors (see Further Details).   
+    A       (input/output) DOUBLE PRECISION array, dimension (LDA,N)
+            On entry, the m by n matrix A.
+            On exit, the elements on and above the diagonal of the array
+            contain the min(m,n) by n upper trapezoidal matrix R (R is
+            upper triangular if m >= n); the elements below the diagonal,
+            with the array TAU, represent the orthogonal matrix Q as a
+            product of elementary reflectors (see Further Details).
 
-    LDA     (input) INTEGER   
-            The leading dimension of the array A.  LDA >= max(1,M).   
+    LDA     (input) INTEGER
+            The leading dimension of the array A.  LDA >= max(1,M).
 
-    TAU     (output) DOUBLE PRECISION array, dimension (min(M,N))   
-            The scalar factors of the elementary reflectors (see Further   
-            Details).   
+    TAU     (output) DOUBLE PRECISION array, dimension (min(M,N))
+            The scalar factors of the elementary reflectors (see Further
+            Details).
 
-    WORK    (workspace) DOUBLE PRECISION array, dimension (N)   
+    WORK    (workspace) DOUBLE PRECISION array, dimension (N)
 
-    INFO    (output) INTEGER   
-            = 0: successful exit   
-            < 0: if INFO = -i, the i-th argument had an illegal value   
+    INFO    (output) INTEGER
+            = 0: successful exit
+            < 0: if INFO = -i, the i-th argument had an illegal value
 
-    Further Details   
-    ===============   
+    Further Details
+    ===============
 
-    The matrix Q is represented as a product of elementary reflectors   
+    The matrix Q is represented as a product of elementary reflectors
 
-       Q = H(1) H(2) . . . H(k), where k = min(m,n).   
+       Q = H(1) H(2) . . . H(k), where k = min(m,n).
 
-    Each H(i) has the form   
+    Each H(i) has the form
 
-       H(i) = I - tau * v * v'   
+       H(i) = I - tau * v * v'
 
-    where tau is a real scalar, and v is a real vector with   
-    v(1:i-1) = 0 and v(i) = 1; v(i+1:m) is stored on exit in A(i+1:m,i),   
-    and tau in TAU(i).   
+    where tau is a real scalar, and v is a real vector with
+    v(1:i-1) = 0 and v(i) = 1; v(i+1:m) is stored on exit in A(i+1:m,i),
+    and tau in TAU(i).
 
-    =====================================================================   
+    =====================================================================
 
 
-       Test the input arguments   
+       Test the input arguments
 
        Parameter adjustments */
     /* Table of constant values */
-    static integer c__1 = 1;
-    
+    integer c__1 = 1;
+
     /* System generated locals */
     integer a_dim1, a_offset, i__1, i__2, i__3;
     /* Local variables */
-    static integer i__, k;
-    extern /* Subroutine */ integer dlarf_(const char *, integer *, integer *, 
-	    doublereal *, integer *, doublereal *, doublereal *, integer *, 
-	    doublereal *), dlarfg_(integer *, doublereal *, 
+    integer i__, k;
+    extern /* Subroutine */ integer dlarf_(const char *, integer *, integer *,
+	    doublereal *, integer *, doublereal *, doublereal *, integer *,
+	    doublereal *), dlarfg_(integer *, doublereal *,
 	    doublereal *, integer *, doublereal *), xerbla_(const char *, integer *);
-    static doublereal aii;
+    doublereal aii;
 #define a_ref(a_1,a_2) a[(a_2)*a_dim1 + a_1]
 
 
@@ -115,7 +115,7 @@ extern "C" {
     i__1 = k;
     for (i__ = 1; i__ <= i__1; ++i__) {
 
-/*        Generate elementary reflector H(i) to annihilate A(i+1:m,i)   
+/*        Generate elementary reflector H(i) to annihilate A(i+1:m,i)
 
    Computing MIN */
 	i__2 = i__ + 1;
diff --git a/external/hypre/src/lapack/dgeqrf.c b/external/hypre/src/lapack/dgeqrf.c
index c460c1e8..c88bd9ab 100644
--- a/external/hypre/src/lapack/dgeqrf.c
+++ b/external/hypre/src/lapack/dgeqrf.c
@@ -11,106 +11,106 @@ extern "C" {
 /* Subroutine */ integer dgeqrf_(integer *m, integer *n, doublereal *a, integer *
 	lda, doublereal *tau, doublereal *work, integer *lwork, integer *info)
 {
-/*  -- LAPACK routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       June 30, 1999   
+/*  -- LAPACK routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       June 30, 1999
 
 
-    Purpose   
-    =======   
+    Purpose
+    =======
 
-    DGEQRF computes a QR factorization of a real M-by-N matrix A:   
-    A = Q * R.   
+    DGEQRF computes a QR factorization of a real M-by-N matrix A:
+    A = Q * R.
 
-    Arguments   
-    =========   
+    Arguments
+    =========
 
-    M       (input) INTEGER   
-            The number of rows of the matrix A.  M >= 0.   
+    M       (input) INTEGER
+            The number of rows of the matrix A.  M >= 0.
 
-    N       (input) INTEGER   
-            The number of columns of the matrix A.  N >= 0.   
+    N       (input) INTEGER
+            The number of columns of the matrix A.  N >= 0.
 
-    A       (input/output) DOUBLE PRECISION array, dimension (LDA,N)   
-            On entry, the M-by-N matrix A.   
-            On exit, the elements on and above the diagonal of the array   
-            contain the min(M,N)-by-N upper trapezoidal matrix R (R is   
-            upper triangular if m >= n); the elements below the diagonal,   
-            with the array TAU, represent the orthogonal matrix Q as a   
-            product of min(m,n) elementary reflectors (see Further   
-            Details).   
+    A       (input/output) DOUBLE PRECISION array, dimension (LDA,N)
+            On entry, the M-by-N matrix A.
+            On exit, the elements on and above the diagonal of the array
+            contain the min(M,N)-by-N upper trapezoidal matrix R (R is
+            upper triangular if m >= n); the elements below the diagonal,
+            with the array TAU, represent the orthogonal matrix Q as a
+            product of min(m,n) elementary reflectors (see Further
+            Details).
 
-    LDA     (input) INTEGER   
-            The leading dimension of the array A.  LDA >= max(1,M).   
+    LDA     (input) INTEGER
+            The leading dimension of the array A.  LDA >= max(1,M).
 
-    TAU     (output) DOUBLE PRECISION array, dimension (min(M,N))   
-            The scalar factors of the elementary reflectors (see Further   
-            Details).   
+    TAU     (output) DOUBLE PRECISION array, dimension (min(M,N))
+            The scalar factors of the elementary reflectors (see Further
+            Details).
 
-    WORK    (workspace/output) DOUBLE PRECISION array, dimension (LWORK)   
-            On exit, if INFO = 0, WORK(1) returns the optimal LWORK.   
+    WORK    (workspace/output) DOUBLE PRECISION array, dimension (LWORK)
+            On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
 
-    LWORK   (input) INTEGER   
-            The dimension of the array WORK.  LWORK >= max(1,N).   
-            For optimum performance LWORK >= N*NB, where NB is   
-            the optimal blocksize.   
+    LWORK   (input) INTEGER
+            The dimension of the array WORK.  LWORK >= max(1,N).
+            For optimum performance LWORK >= N*NB, where NB is
+            the optimal blocksize.
 
-            If LWORK = -1, then a workspace query is assumed; the routine   
-            only calculates the optimal size of the WORK array, returns   
-            this value as the first entry of the WORK array, and no error   
-            message related to LWORK is issued by XERBLA.   
+            If LWORK = -1, then a workspace query is assumed; the routine
+            only calculates the optimal size of the WORK array, returns
+            this value as the first entry of the WORK array, and no error
+            message related to LWORK is issued by XERBLA.
 
-    INFO    (output) INTEGER   
-            = 0:  successful exit   
-            < 0:  if INFO = -i, the i-th argument had an illegal value   
+    INFO    (output) INTEGER
+            = 0:  successful exit
+            < 0:  if INFO = -i, the i-th argument had an illegal value
 
-    Further Details   
-    ===============   
+    Further Details
+    ===============
 
-    The matrix Q is represented as a product of elementary reflectors   
+    The matrix Q is represented as a product of elementary reflectors
 
-       Q = H(1) H(2) . . . H(k), where k = min(m,n).   
+       Q = H(1) H(2) . . . H(k), where k = min(m,n).
 
-    Each H(i) has the form   
+    Each H(i) has the form
 
-       H(i) = I - tau * v * v'   
+       H(i) = I - tau * v * v'
 
-    where tau is a real scalar, and v is a real vector with   
-    v(1:i-1) = 0 and v(i) = 1; v(i+1:m) is stored on exit in A(i+1:m,i),   
-    and tau in TAU(i).   
+    where tau is a real scalar, and v is a real vector with
+    v(1:i-1) = 0 and v(i) = 1; v(i+1:m) is stored on exit in A(i+1:m,i),
+    and tau in TAU(i).
 
-    =====================================================================   
+    =====================================================================
 
 
-       Test the input arguments   
+       Test the input arguments
 
        Parameter adjustments */
     /* Table of constant values */
-    static integer c__1 = 1;
-    static integer c_n1 = -1;
-    static integer c__3 = 3;
-    static integer c__2 = 2;
-    
+    integer c__1 = 1;
+    integer c_n1 = -1;
+    integer c__3 = 3;
+    integer c__2 = 2;
+
     /* System generated locals */
     integer a_dim1, a_offset, i__1, i__2, i__3, i__4;
     /* Local variables */
-    static integer i__, k, nbmin, iinfo;
-    extern /* Subroutine */ integer dgeqr2_(integer *, integer *, doublereal *, 
+    integer i__, k, nbmin, iinfo;
+    extern /* Subroutine */ integer dgeqr2_(integer *, integer *, doublereal *,
 	    integer *, doublereal *, doublereal *, integer *);
-    static integer ib, nb;
-    extern /* Subroutine */ integer dlarfb_(const char *,const char *,const char *,const char *, 
-	    integer *, integer *, integer *, doublereal *, integer *, 
-	    doublereal *, integer *, doublereal *, integer *, doublereal *, 
+    integer ib, nb;
+    extern /* Subroutine */ integer dlarfb_(const char *,const char *,const char *,const char *,
+	    integer *, integer *, integer *, doublereal *, integer *,
+	    doublereal *, integer *, doublereal *, integer *, doublereal *,
 	    integer *);
-    static integer nx;
-    extern /* Subroutine */ integer dlarft_(const char *,const char *, integer *, integer *, 
+    integer nx;
+    extern /* Subroutine */ integer dlarft_(const char *,const char *, integer *, integer *,
 	    doublereal *, integer *, doublereal *, doublereal *, integer *), xerbla_(const char *, integer *);
-    extern integer ilaenv_(integer *,const char *,const char *, integer *, integer *, 
+    extern integer ilaenv_(integer *,const char *,const char *, integer *, integer *,
 	    integer *, integer *, ftnlen, ftnlen);
-    static integer ldwork, lwkopt;
-    static logical lquery;
-    static integer iws;
+    integer ldwork, lwkopt;
+    logical lquery;
+    integer iws;
 #define a_ref(a_1,a_2) a[(a_2)*a_dim1 + a_1]
 
 
@@ -157,7 +157,7 @@ extern "C" {
     iws = *n;
     if (nb > 1 && nb < k) {
 
-/*        Determine when to cross over from blocked to unblocked code.   
+/*        Determine when to cross over from blocked to unblocked code.
 
    Computing MAX */
 	i__1 = 0, i__2 = ilaenv_(&c__3, "DGEQRF", " ", m, n, &c_n1, &c_n1, (
@@ -171,7 +171,7 @@ extern "C" {
 	    iws = ldwork * nb;
 	    if (*lwork < iws) {
 
-/*              Not enough workspace to use optimal NB:  reduce NB and   
+/*              Not enough workspace to use optimal NB:  reduce NB and
                 determine the minimum value of NB. */
 
 		nb = *lwork / ldwork;
@@ -194,7 +194,7 @@ extern "C" {
 	    i__3 = k - i__ + 1;
 	    ib = min(i__3,nb);
 
-/*           Compute the QR factorization of the current block   
+/*           Compute the QR factorization of the current block
              A(i:m,i:i+ib-1) */
 
 	    i__3 = *m - i__ + 1;
@@ -202,7 +202,7 @@ extern "C" {
 		    iinfo);
 	    if (i__ + ib <= *n) {
 
-/*              Form the triangular factor of the block reflector   
+/*              Form the triangular factor of the block reflector
                 H = H(i) H(i+1) . . . H(i+ib-1) */
 
 		i__3 = *m - i__ + 1;
diff --git a/external/hypre/src/lapack/dgesvd.c b/external/hypre/src/lapack/dgesvd.c
index 278b560c..223dfd72 100644
--- a/external/hypre/src/lapack/dgesvd.c
+++ b/external/hypre/src/lapack/dgesvd.c
@@ -13,210 +13,208 @@ extern "C" {
 	-lf2c -lm   (in that order)
 */
 
-/* Table of constant values */
-
-static integer c__6 = 6;
-static integer c__0 = 0;
-static integer c__2 = 2;
-static integer c__1 = 1;
-static integer c_n1 = -1;
-static doublereal c_b416 = 0.;
-static doublereal c_b438 = 1.;
-
-/* Subroutine */ integer dgesvd_(char *jobu, char *jobvt, integer *m, integer *n, 
+/* Subroutine */ integer dgesvd_(char *jobu, char *jobvt, integer *m, integer *n,
 	doublereal *a, integer *lda, doublereal *s, doublereal *u, integer *
-	ldu, doublereal *vt, integer *ldvt, doublereal *work, integer *lwork, 
+	ldu, doublereal *vt, integer *ldvt, doublereal *work, integer *lwork,
 	integer *info)
 {
     /* System generated locals */
     address a__1[2];
-    integer a_dim1, a_offset, u_dim1, u_offset, vt_dim1, vt_offset, i__1[2], 
+    integer a_dim1, a_offset, u_dim1, u_offset, vt_dim1, vt_offset, i__1[2],
 	    i__2, i__3, i__4;
     char ch__1[2];
 
-    /* Builtin functions   
+    /* Builtin functions
        Subroutine */ integer s_cat(char *, char **, integer *, integer *, ftnlen);
 
     /* Local variables */
-    static integer iscl;
-    static doublereal anrm;
-    static integer ierr, itau, ncvt, nrvt, i__;
-    extern /* Subroutine */ integer dgemm_(const char *,const char *, integer *, integer *, 
-	    integer *, doublereal *, doublereal *, integer *, doublereal *, 
+    integer iscl;
+    doublereal anrm;
+    integer ierr, itau, ncvt, nrvt, i__;
+    extern /* Subroutine */ integer dgemm_(const char *,const char *, integer *, integer *,
+	    integer *, doublereal *, doublereal *, integer *, doublereal *,
 	    integer *, doublereal *, doublereal *, integer *);
     extern logical lsame_(const char *,const char *);
-    static integer chunk, minmn, wrkbl, itaup, itauq, mnthr, iwork;
-    static logical wntua, wntva, wntun, wntuo, wntvn, wntvo, wntus, wntvs;
-    static integer ie;
-    extern /* Subroutine */ integer dgebrd_(integer *, integer *, doublereal *, 
+    integer chunk, minmn, wrkbl = 0, itaup, itauq, mnthr, iwork;
+    logical wntua, wntva, wntun, wntuo, wntvn, wntvo, wntus, wntvs;
+    integer ie = 0;
+    extern /* Subroutine */ integer dgebrd_(integer *, integer *, doublereal *,
 	    integer *, doublereal *, doublereal *, doublereal *, doublereal *,
 	     doublereal *, integer *, integer *);
-    extern doublereal dlamch_(const char *), dlange_(const char *, integer *, 
+    extern doublereal dlamch_(const char *), dlange_(const char *, integer *,
 	    integer *, doublereal *, integer *, doublereal *);
-    static integer ir, bdspac, iu;
-    extern /* Subroutine */ integer dgelqf_(integer *, integer *, doublereal *, 
-	    integer *, doublereal *, doublereal *, integer *, integer *), 
-	    dlascl_(const char *, integer *, integer *, doublereal *, doublereal *, 
+    integer ir, bdspac = 0, iu;
+    extern /* Subroutine */ integer dgelqf_(integer *, integer *, doublereal *,
+	    integer *, doublereal *, doublereal *, integer *, integer *),
+	    dlascl_(const char *, integer *, integer *, doublereal *, doublereal *,
 	    integer *, integer *, doublereal *, integer *, integer *),
-	     dgeqrf_(integer *, integer *, doublereal *, integer *, 
+	     dgeqrf_(integer *, integer *, doublereal *, integer *,
 	    doublereal *, doublereal *, integer *, integer *), dlacpy_(const char *,
-	     integer *, integer *, doublereal *, integer *, doublereal *, 
-	    integer *), dlaset_(const char *, integer *, integer *, 
-	    doublereal *, doublereal *, doublereal *, integer *), 
-	    dbdsqr_(const char *, integer *, integer *, integer *, integer *, 
+	     integer *, integer *, doublereal *, integer *, doublereal *,
+	    integer *), dlaset_(const char *, integer *, integer *,
+	    doublereal *, doublereal *, doublereal *, integer *),
+	    dbdsqr_(const char *, integer *, integer *, integer *, integer *,
 	    doublereal *, doublereal *, doublereal *, integer *, doublereal *,
-	     integer *, doublereal *, integer *, doublereal *, integer *), dorgbr_(const char *, integer *, integer *, integer *, 
-	    doublereal *, integer *, doublereal *, doublereal *, integer *, 
+	     integer *, doublereal *, integer *, doublereal *, integer *), dorgbr_(const char *, integer *, integer *, integer *,
+	    doublereal *, integer *, doublereal *, doublereal *, integer *,
 	    integer *);
-    static doublereal bignum;
+    doublereal bignum;
     extern /* Subroutine */ integer xerbla_(const char *, integer *);
-    extern integer ilaenv_(integer *,const char *,const char *, integer *, integer *, 
-	    integer *, integer *, ftnlen, ftnlen);
-    extern /* Subroutine */ integer dormbr_(const char *,const char *,const char *, integer *, 
-	    integer *, integer *, doublereal *, integer *, doublereal *, 
-	    doublereal *, integer *, doublereal *, integer *, integer *), dorglq_(integer *, integer *, integer *, 
-	    doublereal *, integer *, doublereal *, doublereal *, integer *, 
+    extern integer ilaenv_(integer *,const char *,const char *, integer *, integer *,
+                           integer *, integer *, ftnlen, ftnlen);
+    extern /* Subroutine */ integer dormbr_(const char *,const char *,const char *, integer *,
+	    integer *, integer *, doublereal *, integer *, doublereal *,
+	    doublereal *, integer *, doublereal *, integer *, integer *), dorglq_(integer *, integer *, integer *,
+	    doublereal *, integer *, doublereal *, doublereal *, integer *,
 	    integer *), dorgqr_(integer *, integer *, integer *, doublereal *,
-	     integer *, doublereal *, doublereal *, integer *, integer *);
-    static integer ldwrkr, minwrk, ldwrku, maxwrk;
-    static doublereal smlnum;
-    static logical lquery, wntuas, wntvas;
-    static integer blk, ncu;
-    static doublereal dum[1], eps;
-    static integer nru;
-
+            integer *, doublereal *, doublereal *, integer *, integer *);
+    integer ldwrkr, minwrk, ldwrku, maxwrk;
+    doublereal smlnum;
+    logical lquery, wntuas, wntvas;
+    integer blk, ncu;
+    doublereal dum[1], eps;
+    integer nru;
+
+    /* Table of constant values */
+    integer c__6 = 6;
+    integer c__0 = 0;
+    integer c__2 = 2;
+    integer c__1 = 1;
+    integer c_n1 = -1;
+    doublereal c_b416 = 0.;
+    doublereal c_b438 = 1.;
 
 #define a_ref(a_1,a_2) a[(a_2)*a_dim1 + a_1]
 #define u_ref(a_1,a_2) u[(a_2)*u_dim1 + a_1]
 #define vt_ref(a_1,a_2) vt[(a_2)*vt_dim1 + a_1]
 
 
-/*  -- LAPACK driver routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       October 31, 1999   
-
-
-    Purpose   
-    =======   
-
-    DGESVD computes the singular value decomposition (SVD) of a real   
-    M-by-N matrix A, optionally computing the left and/or right singular   
-    vectors. The SVD is written   
-
-         A = U * SIGMA * transpose(V)   
-
-    where SIGMA is an M-by-N matrix which is zero except for its   
-    min(m,n) diagonal elements, U is an M-by-M orthogonal matrix, and   
-    V is an N-by-N orthogonal matrix.  The diagonal elements of SIGMA   
-    are the singular values of A; they are real and non-negative, and   
-    are returned in descending order.  The first min(m,n) columns of   
-    U and V are the left and right singular vectors of A.   
-
-    Note that the routine returns V**T, not V.   
-
-    Arguments   
-    =========   
-
-    JOBU    (input) CHARACTER*1   
-            Specifies options for computing all or part of the matrix U:   
-            = 'A':  all M columns of U are returned in array U:   
-            = 'S':  the first min(m,n) columns of U (the left singular   
-                    vectors) are returned in the array U;   
-            = 'O':  the first min(m,n) columns of U (the left singular   
-                    vectors) are overwritten on the array A;   
-            = 'N':  no columns of U (no left singular vectors) are   
-                    computed.   
-
-    JOBVT   (input) CHARACTER*1   
-            Specifies options for computing all or part of the matrix   
-            V**T:   
-            = 'A':  all N rows of V**T are returned in the array VT;   
-            = 'S':  the first min(m,n) rows of V**T (the right singular   
-                    vectors) are returned in the array VT;   
-            = 'O':  the first min(m,n) rows of V**T (the right singular   
-                    vectors) are overwritten on the array A;   
-            = 'N':  no rows of V**T (no right singular vectors) are   
-                    computed.   
-
-            JOBVT and JOBU cannot both be 'O'.   
-
-    M       (input) INTEGER   
-            The number of rows of the input matrix A.  M >= 0.   
-
-    N       (input) INTEGER   
-            The number of columns of the input matrix A.  N >= 0.   
-
-    A       (input/output) DOUBLE PRECISION array, dimension (LDA,N)   
-            On entry, the M-by-N matrix A.   
-            On exit,   
-            if JOBU = 'O',  A is overwritten with the first min(m,n)   
-                            columns of U (the left singular vectors,   
-                            stored columnwise);   
-            if JOBVT = 'O', A is overwritten with the first min(m,n)   
-                            rows of V**T (the right singular vectors,   
-                            stored rowwise);   
-            if JOBU .ne. 'O' and JOBVT .ne. 'O', the contents of A   
-                            are destroyed.   
-
-    LDA     (input) INTEGER   
-            The leading dimension of the array A.  LDA >= max(1,M).   
-
-    S       (output) DOUBLE PRECISION array, dimension (min(M,N))   
-            The singular values of A, sorted so that S(i) >= S(i+1).   
-
-    U       (output) DOUBLE PRECISION array, dimension (LDU,UCOL)   
-            (LDU,M) if JOBU = 'A' or (LDU,min(M,N)) if JOBU = 'S'.   
-            If JOBU = 'A', U contains the M-by-M orthogonal matrix U;   
-            if JOBU = 'S', U contains the first min(m,n) columns of U   
-            (the left singular vectors, stored columnwise);   
-            if JOBU = 'N' or 'O', U is not referenced.   
-
-    LDU     (input) INTEGER   
-            The leading dimension of the array U.  LDU >= 1; if   
-            JOBU = 'S' or 'A', LDU >= M.   
-
-    VT      (output) DOUBLE PRECISION array, dimension (LDVT,N)   
-            If JOBVT = 'A', VT contains the N-by-N orthogonal matrix   
-            V**T;   
-            if JOBVT = 'S', VT contains the first min(m,n) rows of   
-            V**T (the right singular vectors, stored rowwise);   
-            if JOBVT = 'N' or 'O', VT is not referenced.   
-
-    LDVT    (input) INTEGER   
-            The leading dimension of the array VT.  LDVT >= 1; if   
-            JOBVT = 'A', LDVT >= N; if JOBVT = 'S', LDVT >= min(M,N).   
-
-    WORK    (workspace/output) DOUBLE PRECISION array, dimension (LWORK)   
-            On exit, if INFO = 0, WORK(1) returns the optimal LWORK;   
-            if INFO > 0, WORK(2:MIN(M,N)) contains the unconverged   
-            superdiagonal elements of an upper bidiagonal matrix B   
-            whose diagonal is in S (not necessarily sorted). B   
-            satisfies A = U * B * VT, so it has the same singular values   
-            as A, and singular vectors related by U and VT.   
-
-    LWORK   (input) INTEGER   
-            The dimension of the array WORK. LWORK >= 1.   
-            LWORK >= MAX(3*MIN(M,N)+MAX(M,N),5*MIN(M,N)).   
-            For good performance, LWORK should generally be larger.   
-
-            If LWORK = -1, then a workspace query is assumed; the routine   
-            only calculates the optimal size of the WORK array, returns   
-            this value as the first entry of the WORK array, and no error   
-            message related to LWORK is issued by XERBLA.   
-
-    INFO    (output) INTEGER   
-            = 0:  successful exit.   
-            < 0:  if INFO = -i, the i-th argument had an illegal value.   
-            > 0:  if DBDSQR did not converge, INFO specifies how many   
-                  superdiagonals of an intermediate bidiagonal form B   
-                  did not converge to zero. See the description of WORK   
-                  above for details.   
-
-    =====================================================================   
-
-
-       Test the input arguments   
+/*  -- LAPACK driver routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       October 31, 1999
+
+
+    Purpose
+    =======
+
+    DGESVD computes the singular value decomposition (SVD) of a real
+    M-by-N matrix A, optionally computing the left and/or right singular
+    vectors. The SVD is written
+
+         A = U * SIGMA * transpose(V)
+
+    where SIGMA is an M-by-N matrix which is zero except for its
+    min(m,n) diagonal elements, U is an M-by-M orthogonal matrix, and
+    V is an N-by-N orthogonal matrix.  The diagonal elements of SIGMA
+    are the singular values of A; they are real and non-negative, and
+    are returned in descending order.  The first min(m,n) columns of
+    U and V are the left and right singular vectors of A.
+
+    Note that the routine returns V**T, not V.
+
+    Arguments
+    =========
+
+    JOBU    (input) CHARACTER*1
+            Specifies options for computing all or part of the matrix U:
+            = 'A':  all M columns of U are returned in array U:
+            = 'S':  the first min(m,n) columns of U (the left singular
+                    vectors) are returned in the array U;
+            = 'O':  the first min(m,n) columns of U (the left singular
+                    vectors) are overwritten on the array A;
+            = 'N':  no columns of U (no left singular vectors) are
+                    computed.
+
+    JOBVT   (input) CHARACTER*1
+            Specifies options for computing all or part of the matrix
+            V**T:
+            = 'A':  all N rows of V**T are returned in the array VT;
+            = 'S':  the first min(m,n) rows of V**T (the right singular
+                    vectors) are returned in the array VT;
+            = 'O':  the first min(m,n) rows of V**T (the right singular
+                    vectors) are overwritten on the array A;
+            = 'N':  no rows of V**T (no right singular vectors) are
+                    computed.
+
+            JOBVT and JOBU cannot both be 'O'.
+
+    M       (input) INTEGER
+            The number of rows of the input matrix A.  M >= 0.
+
+    N       (input) INTEGER
+            The number of columns of the input matrix A.  N >= 0.
+
+    A       (input/output) DOUBLE PRECISION array, dimension (LDA,N)
+            On entry, the M-by-N matrix A.
+            On exit,
+            if JOBU = 'O',  A is overwritten with the first min(m,n)
+                            columns of U (the left singular vectors,
+                            stored columnwise);
+            if JOBVT = 'O', A is overwritten with the first min(m,n)
+                            rows of V**T (the right singular vectors,
+                            stored rowwise);
+            if JOBU .ne. 'O' and JOBVT .ne. 'O', the contents of A
+                            are destroyed.
+
+    LDA     (input) INTEGER
+            The leading dimension of the array A.  LDA >= max(1,M).
+
+    S       (output) DOUBLE PRECISION array, dimension (min(M,N))
+            The singular values of A, sorted so that S(i) >= S(i+1).
+
+    U       (output) DOUBLE PRECISION array, dimension (LDU,UCOL)
+            (LDU,M) if JOBU = 'A' or (LDU,min(M,N)) if JOBU = 'S'.
+            If JOBU = 'A', U contains the M-by-M orthogonal matrix U;
+            if JOBU = 'S', U contains the first min(m,n) columns of U
+            (the left singular vectors, stored columnwise);
+            if JOBU = 'N' or 'O', U is not referenced.
+
+    LDU     (input) INTEGER
+            The leading dimension of the array U.  LDU >= 1; if
+            JOBU = 'S' or 'A', LDU >= M.
+
+    VT      (output) DOUBLE PRECISION array, dimension (LDVT,N)
+            If JOBVT = 'A', VT contains the N-by-N orthogonal matrix
+            V**T;
+            if JOBVT = 'S', VT contains the first min(m,n) rows of
+            V**T (the right singular vectors, stored rowwise);
+            if JOBVT = 'N' or 'O', VT is not referenced.
+
+    LDVT    (input) INTEGER
+            The leading dimension of the array VT.  LDVT >= 1; if
+            JOBVT = 'A', LDVT >= N; if JOBVT = 'S', LDVT >= min(M,N).
+
+    WORK    (workspace/output) DOUBLE PRECISION array, dimension (LWORK)
+            On exit, if INFO = 0, WORK(1) returns the optimal LWORK;
+            if INFO > 0, WORK(2:MIN(M,N)) contains the unconverged
+            superdiagonal elements of an upper bidiagonal matrix B
+            whose diagonal is in S (not necessarily sorted). B
+            satisfies A = U * B * VT, so it has the same singular values
+            as A, and singular vectors related by U and VT.
+
+    LWORK   (input) INTEGER
+            The dimension of the array WORK. LWORK >= 1.
+            LWORK >= MAX(3*MIN(M,N)+MAX(M,N),5*MIN(M,N)).
+            For good performance, LWORK should generally be larger.
+
+            If LWORK = -1, then a workspace query is assumed; the routine
+            only calculates the optimal size of the WORK array, returns
+            this value as the first entry of the WORK array, and no error
+            message related to LWORK is issued by XERBLA.
+
+    INFO    (output) INTEGER
+            = 0:  successful exit.
+            < 0:  if INFO = -i, the i-th argument had an illegal value.
+            > 0:  if DBDSQR did not converge, INFO specifies how many
+                  superdiagonals of an intermediate bidiagonal form B
+                  did not converge to zero. See the description of WORK
+                  above for details.
+
+    =====================================================================
+
+
+       Test the input arguments
 
        Parameter adjustments */
     a_dim1 = *lda;
@@ -251,6 +249,7 @@ static doublereal c_b438 = 1.;
     wntvo = lsame_(jobvt, "O");
     wntvn = lsame_(jobvt, "N");
     minwrk = 1;
+    maxwrk = minwrk;
     lquery = *lwork == -1;
 
     if (! (wntua || wntus || wntuo || wntun)) {
@@ -269,11 +268,11 @@ static doublereal c_b438 = 1.;
 	*info = -11;
     }
 
-/*     Compute workspace   
-        (Note: Comments in the code beginning "Workspace:" describe the   
-         minimal amount of workspace needed at that point in the code,   
-         as well as the preferred amount for good performance.   
-         NB refers to the optimal block size for the immediately   
+/*     Compute workspace
+        (Note: Comments in the code beginning "Workspace:" describe the
+         minimal amount of workspace needed at that point in the code,
+         as well as the preferred amount for good performance.
+         NB refers to the optimal block size for the immediately
          following subroutine, as returned by ILAENV.) */
 
     if (*info == 0 && (*lwork >= 1 || lquery) && *m > 0 && *n > 0) {
@@ -290,7 +289,7 @@ static doublereal c_b438 = 1.;
 		    maxwrk = *n + *n * ilaenv_(&c__1, "DGEQRF", " ", m, n, &
 			    c_n1, &c_n1, (ftnlen)6, (ftnlen)1);
 /* Computing MAX */
-		    i__2 = maxwrk, i__3 = *n * 3 + (*n << 1) * ilaenv_(&c__1, 
+		    i__2 = maxwrk, i__3 = *n * 3 + (*n << 1) * ilaenv_(&c__1,
 			    "DGEBRD", " ", n, n, &c_n1, &c_n1, (ftnlen)6, (
 			    ftnlen)1);
 		    maxwrk = max(i__2,i__3);
@@ -313,11 +312,11 @@ static doublereal c_b438 = 1.;
 		    wrkbl = *n + *n * ilaenv_(&c__1, "DGEQRF", " ", m, n, &
 			    c_n1, &c_n1, (ftnlen)6, (ftnlen)1);
 /* Computing MAX */
-		    i__2 = wrkbl, i__3 = *n + *n * ilaenv_(&c__1, "DORGQR", 
+		    i__2 = wrkbl, i__3 = *n + *n * ilaenv_(&c__1, "DORGQR",
 			    " ", m, n, n, &c_n1, (ftnlen)6, (ftnlen)1);
 		    wrkbl = max(i__2,i__3);
 /* Computing MAX */
-		    i__2 = wrkbl, i__3 = *n * 3 + (*n << 1) * ilaenv_(&c__1, 
+		    i__2 = wrkbl, i__3 = *n * 3 + (*n << 1) * ilaenv_(&c__1,
 			    "DGEBRD", " ", n, n, &c_n1, &c_n1, (ftnlen)6, (
 			    ftnlen)1);
 		    wrkbl = max(i__2,i__3);
@@ -335,17 +334,17 @@ static doublereal c_b438 = 1.;
 		    maxwrk = max(maxwrk,minwrk);
 		} else if (wntuo && wntvas) {
 
-/*                 Path 3 (M much larger than N, JOBU='O', JOBVT='S' or   
+/*                 Path 3 (M much larger than N, JOBU='O', JOBVT='S' or
                    'A') */
 
 		    wrkbl = *n + *n * ilaenv_(&c__1, "DGEQRF", " ", m, n, &
 			    c_n1, &c_n1, (ftnlen)6, (ftnlen)1);
 /* Computing MAX */
-		    i__2 = wrkbl, i__3 = *n + *n * ilaenv_(&c__1, "DORGQR", 
+		    i__2 = wrkbl, i__3 = *n + *n * ilaenv_(&c__1, "DORGQR",
 			    " ", m, n, n, &c_n1, (ftnlen)6, (ftnlen)1);
 		    wrkbl = max(i__2,i__3);
 /* Computing MAX */
-		    i__2 = wrkbl, i__3 = *n * 3 + (*n << 1) * ilaenv_(&c__1, 
+		    i__2 = wrkbl, i__3 = *n * 3 + (*n << 1) * ilaenv_(&c__1,
 			    "DGEBRD", " ", n, n, &c_n1, &c_n1, (ftnlen)6, (
 			    ftnlen)1);
 		    wrkbl = max(i__2,i__3);
@@ -354,7 +353,7 @@ static doublereal c_b438 = 1.;
 			    , "Q", n, n, n, &c_n1, (ftnlen)6, (ftnlen)1);
 		    wrkbl = max(i__2,i__3);
 /* Computing MAX */
-		    i__2 = wrkbl, i__3 = *n * 3 + (*n - 1) * ilaenv_(&c__1, 
+		    i__2 = wrkbl, i__3 = *n * 3 + (*n - 1) * ilaenv_(&c__1,
 			    "DORGBR", "P", n, n, n, &c_n1, (ftnlen)6, (ftnlen)
 			    1);
 		    wrkbl = max(i__2,i__3);
@@ -373,11 +372,11 @@ static doublereal c_b438 = 1.;
 		    wrkbl = *n + *n * ilaenv_(&c__1, "DGEQRF", " ", m, n, &
 			    c_n1, &c_n1, (ftnlen)6, (ftnlen)1);
 /* Computing MAX */
-		    i__2 = wrkbl, i__3 = *n + *n * ilaenv_(&c__1, "DORGQR", 
+		    i__2 = wrkbl, i__3 = *n + *n * ilaenv_(&c__1, "DORGQR",
 			    " ", m, n, n, &c_n1, (ftnlen)6, (ftnlen)1);
 		    wrkbl = max(i__2,i__3);
 /* Computing MAX */
-		    i__2 = wrkbl, i__3 = *n * 3 + (*n << 1) * ilaenv_(&c__1, 
+		    i__2 = wrkbl, i__3 = *n * 3 + (*n << 1) * ilaenv_(&c__1,
 			    "DGEBRD", " ", n, n, &c_n1, &c_n1, (ftnlen)6, (
 			    ftnlen)1);
 		    wrkbl = max(i__2,i__3);
@@ -398,11 +397,11 @@ static doublereal c_b438 = 1.;
 		    wrkbl = *n + *n * ilaenv_(&c__1, "DGEQRF", " ", m, n, &
 			    c_n1, &c_n1, (ftnlen)6, (ftnlen)1);
 /* Computing MAX */
-		    i__2 = wrkbl, i__3 = *n + *n * ilaenv_(&c__1, "DORGQR", 
+		    i__2 = wrkbl, i__3 = *n + *n * ilaenv_(&c__1, "DORGQR",
 			    " ", m, n, n, &c_n1, (ftnlen)6, (ftnlen)1);
 		    wrkbl = max(i__2,i__3);
 /* Computing MAX */
-		    i__2 = wrkbl, i__3 = *n * 3 + (*n << 1) * ilaenv_(&c__1, 
+		    i__2 = wrkbl, i__3 = *n * 3 + (*n << 1) * ilaenv_(&c__1,
 			    "DGEBRD", " ", n, n, &c_n1, &c_n1, (ftnlen)6, (
 			    ftnlen)1);
 		    wrkbl = max(i__2,i__3);
@@ -411,7 +410,7 @@ static doublereal c_b438 = 1.;
 			    , "Q", n, n, n, &c_n1, (ftnlen)6, (ftnlen)1);
 		    wrkbl = max(i__2,i__3);
 /* Computing MAX */
-		    i__2 = wrkbl, i__3 = *n * 3 + (*n - 1) * ilaenv_(&c__1, 
+		    i__2 = wrkbl, i__3 = *n * 3 + (*n - 1) * ilaenv_(&c__1,
 			    "DORGBR", "P", n, n, n, &c_n1, (ftnlen)6, (ftnlen)
 			    1);
 		    wrkbl = max(i__2,i__3);
@@ -423,17 +422,17 @@ static doublereal c_b438 = 1.;
 		    maxwrk = max(maxwrk,minwrk);
 		} else if (wntus && wntvas) {
 
-/*                 Path 6 (M much larger than N, JOBU='S', JOBVT='S' or   
+/*                 Path 6 (M much larger than N, JOBU='S', JOBVT='S' or
                    'A') */
 
 		    wrkbl = *n + *n * ilaenv_(&c__1, "DGEQRF", " ", m, n, &
 			    c_n1, &c_n1, (ftnlen)6, (ftnlen)1);
 /* Computing MAX */
-		    i__2 = wrkbl, i__3 = *n + *n * ilaenv_(&c__1, "DORGQR", 
+		    i__2 = wrkbl, i__3 = *n + *n * ilaenv_(&c__1, "DORGQR",
 			    " ", m, n, n, &c_n1, (ftnlen)6, (ftnlen)1);
 		    wrkbl = max(i__2,i__3);
 /* Computing MAX */
-		    i__2 = wrkbl, i__3 = *n * 3 + (*n << 1) * ilaenv_(&c__1, 
+		    i__2 = wrkbl, i__3 = *n * 3 + (*n << 1) * ilaenv_(&c__1,
 			    "DGEBRD", " ", n, n, &c_n1, &c_n1, (ftnlen)6, (
 			    ftnlen)1);
 		    wrkbl = max(i__2,i__3);
@@ -442,7 +441,7 @@ static doublereal c_b438 = 1.;
 			    , "Q", n, n, n, &c_n1, (ftnlen)6, (ftnlen)1);
 		    wrkbl = max(i__2,i__3);
 /* Computing MAX */
-		    i__2 = wrkbl, i__3 = *n * 3 + (*n - 1) * ilaenv_(&c__1, 
+		    i__2 = wrkbl, i__3 = *n * 3 + (*n - 1) * ilaenv_(&c__1,
 			    "DORGBR", "P", n, n, n, &c_n1, (ftnlen)6, (ftnlen)
 			    1);
 		    wrkbl = max(i__2,i__3);
@@ -459,11 +458,11 @@ static doublereal c_b438 = 1.;
 		    wrkbl = *n + *n * ilaenv_(&c__1, "DGEQRF", " ", m, n, &
 			    c_n1, &c_n1, (ftnlen)6, (ftnlen)1);
 /* Computing MAX */
-		    i__2 = wrkbl, i__3 = *n + *m * ilaenv_(&c__1, "DORGQR", 
+		    i__2 = wrkbl, i__3 = *n + *m * ilaenv_(&c__1, "DORGQR",
 			    " ", m, m, n, &c_n1, (ftnlen)6, (ftnlen)1);
 		    wrkbl = max(i__2,i__3);
 /* Computing MAX */
-		    i__2 = wrkbl, i__3 = *n * 3 + (*n << 1) * ilaenv_(&c__1, 
+		    i__2 = wrkbl, i__3 = *n * 3 + (*n << 1) * ilaenv_(&c__1,
 			    "DGEBRD", " ", n, n, &c_n1, &c_n1, (ftnlen)6, (
 			    ftnlen)1);
 		    wrkbl = max(i__2,i__3);
@@ -484,11 +483,11 @@ static doublereal c_b438 = 1.;
 		    wrkbl = *n + *n * ilaenv_(&c__1, "DGEQRF", " ", m, n, &
 			    c_n1, &c_n1, (ftnlen)6, (ftnlen)1);
 /* Computing MAX */
-		    i__2 = wrkbl, i__3 = *n + *m * ilaenv_(&c__1, "DORGQR", 
+		    i__2 = wrkbl, i__3 = *n + *m * ilaenv_(&c__1, "DORGQR",
 			    " ", m, m, n, &c_n1, (ftnlen)6, (ftnlen)1);
 		    wrkbl = max(i__2,i__3);
 /* Computing MAX */
-		    i__2 = wrkbl, i__3 = *n * 3 + (*n << 1) * ilaenv_(&c__1, 
+		    i__2 = wrkbl, i__3 = *n * 3 + (*n << 1) * ilaenv_(&c__1,
 			    "DGEBRD", " ", n, n, &c_n1, &c_n1, (ftnlen)6, (
 			    ftnlen)1);
 		    wrkbl = max(i__2,i__3);
@@ -497,7 +496,7 @@ static doublereal c_b438 = 1.;
 			    , "Q", n, n, n, &c_n1, (ftnlen)6, (ftnlen)1);
 		    wrkbl = max(i__2,i__3);
 /* Computing MAX */
-		    i__2 = wrkbl, i__3 = *n * 3 + (*n - 1) * ilaenv_(&c__1, 
+		    i__2 = wrkbl, i__3 = *n * 3 + (*n - 1) * ilaenv_(&c__1,
 			    "DORGBR", "P", n, n, n, &c_n1, (ftnlen)6, (ftnlen)
 			    1);
 		    wrkbl = max(i__2,i__3);
@@ -509,17 +508,17 @@ static doublereal c_b438 = 1.;
 		    maxwrk = max(maxwrk,minwrk);
 		} else if (wntua && wntvas) {
 
-/*                 Path 9 (M much larger than N, JOBU='A', JOBVT='S' or   
+/*                 Path 9 (M much larger than N, JOBU='A', JOBVT='S' or
                    'A') */
 
 		    wrkbl = *n + *n * ilaenv_(&c__1, "DGEQRF", " ", m, n, &
 			    c_n1, &c_n1, (ftnlen)6, (ftnlen)1);
 /* Computing MAX */
-		    i__2 = wrkbl, i__3 = *n + *m * ilaenv_(&c__1, "DORGQR", 
+		    i__2 = wrkbl, i__3 = *n + *m * ilaenv_(&c__1, "DORGQR",
 			    " ", m, m, n, &c_n1, (ftnlen)6, (ftnlen)1);
 		    wrkbl = max(i__2,i__3);
 /* Computing MAX */
-		    i__2 = wrkbl, i__3 = *n * 3 + (*n << 1) * ilaenv_(&c__1, 
+		    i__2 = wrkbl, i__3 = *n * 3 + (*n << 1) * ilaenv_(&c__1,
 			    "DGEBRD", " ", n, n, &c_n1, &c_n1, (ftnlen)6, (
 			    ftnlen)1);
 		    wrkbl = max(i__2,i__3);
@@ -528,7 +527,7 @@ static doublereal c_b438 = 1.;
 			    , "Q", n, n, n, &c_n1, (ftnlen)6, (ftnlen)1);
 		    wrkbl = max(i__2,i__3);
 /* Computing MAX */
-		    i__2 = wrkbl, i__3 = *n * 3 + (*n - 1) * ilaenv_(&c__1, 
+		    i__2 = wrkbl, i__3 = *n * 3 + (*n - 1) * ilaenv_(&c__1,
 			    "DORGBR", "P", n, n, n, &c_n1, (ftnlen)6, (ftnlen)
 			    1);
 		    wrkbl = max(i__2,i__3);
@@ -559,7 +558,7 @@ static doublereal c_b438 = 1.;
 		}
 		if (! wntvn) {
 /* Computing MAX */
-		    i__2 = maxwrk, i__3 = *n * 3 + (*n - 1) * ilaenv_(&c__1, 
+		    i__2 = maxwrk, i__3 = *n * 3 + (*n - 1) * ilaenv_(&c__1,
 			    "DORGBR", "P", n, n, n, &c_n1, (ftnlen)6, (ftnlen)
 			    1);
 		    maxwrk = max(i__2,i__3);
@@ -583,13 +582,13 @@ static doublereal c_b438 = 1.;
 		    maxwrk = *m + *m * ilaenv_(&c__1, "DGELQF", " ", m, n, &
 			    c_n1, &c_n1, (ftnlen)6, (ftnlen)1);
 /* Computing MAX */
-		    i__2 = maxwrk, i__3 = *m * 3 + (*m << 1) * ilaenv_(&c__1, 
+		    i__2 = maxwrk, i__3 = *m * 3 + (*m << 1) * ilaenv_(&c__1,
 			    "DGEBRD", " ", m, m, &c_n1, &c_n1, (ftnlen)6, (
 			    ftnlen)1);
 		    maxwrk = max(i__2,i__3);
 		    if (wntuo || wntuas) {
 /* Computing MAX */
-			i__2 = maxwrk, i__3 = *m * 3 + *m * ilaenv_(&c__1, 
+			i__2 = maxwrk, i__3 = *m * 3 + *m * ilaenv_(&c__1,
 				"DORGBR", "Q", m, m, m, &c_n1, (ftnlen)6, (
 				ftnlen)1);
 			maxwrk = max(i__2,i__3);
@@ -606,16 +605,16 @@ static doublereal c_b438 = 1.;
 		    wrkbl = *m + *m * ilaenv_(&c__1, "DGELQF", " ", m, n, &
 			    c_n1, &c_n1, (ftnlen)6, (ftnlen)1);
 /* Computing MAX */
-		    i__2 = wrkbl, i__3 = *m + *m * ilaenv_(&c__1, "DORGLQ", 
+		    i__2 = wrkbl, i__3 = *m + *m * ilaenv_(&c__1, "DORGLQ",
 			    " ", m, n, m, &c_n1, (ftnlen)6, (ftnlen)1);
 		    wrkbl = max(i__2,i__3);
 /* Computing MAX */
-		    i__2 = wrkbl, i__3 = *m * 3 + (*m << 1) * ilaenv_(&c__1, 
+		    i__2 = wrkbl, i__3 = *m * 3 + (*m << 1) * ilaenv_(&c__1,
 			    "DGEBRD", " ", m, m, &c_n1, &c_n1, (ftnlen)6, (
 			    ftnlen)1);
 		    wrkbl = max(i__2,i__3);
 /* Computing MAX */
-		    i__2 = wrkbl, i__3 = *m * 3 + (*m - 1) * ilaenv_(&c__1, 
+		    i__2 = wrkbl, i__3 = *m * 3 + (*m - 1) * ilaenv_(&c__1,
 			    "DORGBR", "P", m, m, m, &c_n1, (ftnlen)6, (ftnlen)
 			    1);
 		    wrkbl = max(i__2,i__3);
@@ -629,22 +628,22 @@ static doublereal c_b438 = 1.;
 		    maxwrk = max(maxwrk,minwrk);
 		} else if (wntvo && wntuas) {
 
-/*                 Path 3t(N much larger than M, JOBU='S' or 'A',   
+/*                 Path 3t(N much larger than M, JOBU='S' or 'A',
                    JOBVT='O') */
 
 		    wrkbl = *m + *m * ilaenv_(&c__1, "DGELQF", " ", m, n, &
 			    c_n1, &c_n1, (ftnlen)6, (ftnlen)1);
 /* Computing MAX */
-		    i__2 = wrkbl, i__3 = *m + *m * ilaenv_(&c__1, "DORGLQ", 
+		    i__2 = wrkbl, i__3 = *m + *m * ilaenv_(&c__1, "DORGLQ",
 			    " ", m, n, m, &c_n1, (ftnlen)6, (ftnlen)1);
 		    wrkbl = max(i__2,i__3);
 /* Computing MAX */
-		    i__2 = wrkbl, i__3 = *m * 3 + (*m << 1) * ilaenv_(&c__1, 
+		    i__2 = wrkbl, i__3 = *m * 3 + (*m << 1) * ilaenv_(&c__1,
 			    "DGEBRD", " ", m, m, &c_n1, &c_n1, (ftnlen)6, (
 			    ftnlen)1);
 		    wrkbl = max(i__2,i__3);
 /* Computing MAX */
-		    i__2 = wrkbl, i__3 = *m * 3 + (*m - 1) * ilaenv_(&c__1, 
+		    i__2 = wrkbl, i__3 = *m * 3 + (*m - 1) * ilaenv_(&c__1,
 			    "DORGBR", "P", m, m, m, &c_n1, (ftnlen)6, (ftnlen)
 			    1);
 		    wrkbl = max(i__2,i__3);
@@ -667,16 +666,16 @@ static doublereal c_b438 = 1.;
 		    wrkbl = *m + *m * ilaenv_(&c__1, "DGELQF", " ", m, n, &
 			    c_n1, &c_n1, (ftnlen)6, (ftnlen)1);
 /* Computing MAX */
-		    i__2 = wrkbl, i__3 = *m + *m * ilaenv_(&c__1, "DORGLQ", 
+		    i__2 = wrkbl, i__3 = *m + *m * ilaenv_(&c__1, "DORGLQ",
 			    " ", m, n, m, &c_n1, (ftnlen)6, (ftnlen)1);
 		    wrkbl = max(i__2,i__3);
 /* Computing MAX */
-		    i__2 = wrkbl, i__3 = *m * 3 + (*m << 1) * ilaenv_(&c__1, 
+		    i__2 = wrkbl, i__3 = *m * 3 + (*m << 1) * ilaenv_(&c__1,
 			    "DGEBRD", " ", m, m, &c_n1, &c_n1, (ftnlen)6, (
 			    ftnlen)1);
 		    wrkbl = max(i__2,i__3);
 /* Computing MAX */
-		    i__2 = wrkbl, i__3 = *m * 3 + (*m - 1) * ilaenv_(&c__1, 
+		    i__2 = wrkbl, i__3 = *m * 3 + (*m - 1) * ilaenv_(&c__1,
 			    "DORGBR", "P", m, m, m, &c_n1, (ftnlen)6, (ftnlen)
 			    1);
 		    wrkbl = max(i__2,i__3);
@@ -693,16 +692,16 @@ static doublereal c_b438 = 1.;
 		    wrkbl = *m + *m * ilaenv_(&c__1, "DGELQF", " ", m, n, &
 			    c_n1, &c_n1, (ftnlen)6, (ftnlen)1);
 /* Computing MAX */
-		    i__2 = wrkbl, i__3 = *m + *m * ilaenv_(&c__1, "DORGLQ", 
+		    i__2 = wrkbl, i__3 = *m + *m * ilaenv_(&c__1, "DORGLQ",
 			    " ", m, n, m, &c_n1, (ftnlen)6, (ftnlen)1);
 		    wrkbl = max(i__2,i__3);
 /* Computing MAX */
-		    i__2 = wrkbl, i__3 = *m * 3 + (*m << 1) * ilaenv_(&c__1, 
+		    i__2 = wrkbl, i__3 = *m * 3 + (*m << 1) * ilaenv_(&c__1,
 			    "DGEBRD", " ", m, m, &c_n1, &c_n1, (ftnlen)6, (
 			    ftnlen)1);
 		    wrkbl = max(i__2,i__3);
 /* Computing MAX */
-		    i__2 = wrkbl, i__3 = *m * 3 + (*m - 1) * ilaenv_(&c__1, 
+		    i__2 = wrkbl, i__3 = *m * 3 + (*m - 1) * ilaenv_(&c__1,
 			    "DORGBR", "P", m, m, m, &c_n1, (ftnlen)6, (ftnlen)
 			    1);
 		    wrkbl = max(i__2,i__3);
@@ -718,22 +717,22 @@ static doublereal c_b438 = 1.;
 		    maxwrk = max(maxwrk,minwrk);
 		} else if (wntvs && wntuas) {
 
-/*                 Path 6t(N much larger than M, JOBU='S' or 'A',   
+/*                 Path 6t(N much larger than M, JOBU='S' or 'A',
                    JOBVT='S') */
 
 		    wrkbl = *m + *m * ilaenv_(&c__1, "DGELQF", " ", m, n, &
 			    c_n1, &c_n1, (ftnlen)6, (ftnlen)1);
 /* Computing MAX */
-		    i__2 = wrkbl, i__3 = *m + *m * ilaenv_(&c__1, "DORGLQ", 
+		    i__2 = wrkbl, i__3 = *m + *m * ilaenv_(&c__1, "DORGLQ",
 			    " ", m, n, m, &c_n1, (ftnlen)6, (ftnlen)1);
 		    wrkbl = max(i__2,i__3);
 /* Computing MAX */
-		    i__2 = wrkbl, i__3 = *m * 3 + (*m << 1) * ilaenv_(&c__1, 
+		    i__2 = wrkbl, i__3 = *m * 3 + (*m << 1) * ilaenv_(&c__1,
 			    "DGEBRD", " ", m, m, &c_n1, &c_n1, (ftnlen)6, (
 			    ftnlen)1);
 		    wrkbl = max(i__2,i__3);
 /* Computing MAX */
-		    i__2 = wrkbl, i__3 = *m * 3 + (*m - 1) * ilaenv_(&c__1, 
+		    i__2 = wrkbl, i__3 = *m * 3 + (*m - 1) * ilaenv_(&c__1,
 			    "DORGBR", "P", m, m, m, &c_n1, (ftnlen)6, (ftnlen)
 			    1);
 		    wrkbl = max(i__2,i__3);
@@ -754,16 +753,16 @@ static doublereal c_b438 = 1.;
 		    wrkbl = *m + *m * ilaenv_(&c__1, "DGELQF", " ", m, n, &
 			    c_n1, &c_n1, (ftnlen)6, (ftnlen)1);
 /* Computing MAX */
-		    i__2 = wrkbl, i__3 = *m + *n * ilaenv_(&c__1, "DORGLQ", 
+		    i__2 = wrkbl, i__3 = *m + *n * ilaenv_(&c__1, "DORGLQ",
 			    " ", n, n, m, &c_n1, (ftnlen)6, (ftnlen)1);
 		    wrkbl = max(i__2,i__3);
 /* Computing MAX */
-		    i__2 = wrkbl, i__3 = *m * 3 + (*m << 1) * ilaenv_(&c__1, 
+		    i__2 = wrkbl, i__3 = *m * 3 + (*m << 1) * ilaenv_(&c__1,
 			    "DGEBRD", " ", m, m, &c_n1, &c_n1, (ftnlen)6, (
 			    ftnlen)1);
 		    wrkbl = max(i__2,i__3);
 /* Computing MAX */
-		    i__2 = wrkbl, i__3 = *m * 3 + (*m - 1) * ilaenv_(&c__1, 
+		    i__2 = wrkbl, i__3 = *m * 3 + (*m - 1) * ilaenv_(&c__1,
 			    "DORGBR", "P", m, m, m, &c_n1, (ftnlen)6, (ftnlen)
 			    1);
 		    wrkbl = max(i__2,i__3);
@@ -780,16 +779,16 @@ static doublereal c_b438 = 1.;
 		    wrkbl = *m + *m * ilaenv_(&c__1, "DGELQF", " ", m, n, &
 			    c_n1, &c_n1, (ftnlen)6, (ftnlen)1);
 /* Computing MAX */
-		    i__2 = wrkbl, i__3 = *m + *n * ilaenv_(&c__1, "DORGLQ", 
+		    i__2 = wrkbl, i__3 = *m + *n * ilaenv_(&c__1, "DORGLQ",
 			    " ", n, n, m, &c_n1, (ftnlen)6, (ftnlen)1);
 		    wrkbl = max(i__2,i__3);
 /* Computing MAX */
-		    i__2 = wrkbl, i__3 = *m * 3 + (*m << 1) * ilaenv_(&c__1, 
+		    i__2 = wrkbl, i__3 = *m * 3 + (*m << 1) * ilaenv_(&c__1,
 			    "DGEBRD", " ", m, m, &c_n1, &c_n1, (ftnlen)6, (
 			    ftnlen)1);
 		    wrkbl = max(i__2,i__3);
 /* Computing MAX */
-		    i__2 = wrkbl, i__3 = *m * 3 + (*m - 1) * ilaenv_(&c__1, 
+		    i__2 = wrkbl, i__3 = *m * 3 + (*m - 1) * ilaenv_(&c__1,
 			    "DORGBR", "P", m, m, m, &c_n1, (ftnlen)6, (ftnlen)
 			    1);
 		    wrkbl = max(i__2,i__3);
@@ -805,22 +804,22 @@ static doublereal c_b438 = 1.;
 		    maxwrk = max(maxwrk,minwrk);
 		} else if (wntva && wntuas) {
 
-/*                 Path 9t(N much larger than M, JOBU='S' or 'A',   
+/*                 Path 9t(N much larger than M, JOBU='S' or 'A',
                    JOBVT='A') */
 
 		    wrkbl = *m + *m * ilaenv_(&c__1, "DGELQF", " ", m, n, &
 			    c_n1, &c_n1, (ftnlen)6, (ftnlen)1);
 /* Computing MAX */
-		    i__2 = wrkbl, i__3 = *m + *n * ilaenv_(&c__1, "DORGLQ", 
+		    i__2 = wrkbl, i__3 = *m + *n * ilaenv_(&c__1, "DORGLQ",
 			    " ", n, n, m, &c_n1, (ftnlen)6, (ftnlen)1);
 		    wrkbl = max(i__2,i__3);
 /* Computing MAX */
-		    i__2 = wrkbl, i__3 = *m * 3 + (*m << 1) * ilaenv_(&c__1, 
+		    i__2 = wrkbl, i__3 = *m * 3 + (*m << 1) * ilaenv_(&c__1,
 			    "DGEBRD", " ", m, m, &c_n1, &c_n1, (ftnlen)6, (
 			    ftnlen)1);
 		    wrkbl = max(i__2,i__3);
 /* Computing MAX */
-		    i__2 = wrkbl, i__3 = *m * 3 + (*m - 1) * ilaenv_(&c__1, 
+		    i__2 = wrkbl, i__3 = *m * 3 + (*m - 1) * ilaenv_(&c__1,
 			    "DORGBR", "P", m, m, m, &c_n1, (ftnlen)6, (ftnlen)
 			    1);
 		    wrkbl = max(i__2,i__3);
@@ -855,7 +854,7 @@ static doublereal c_b438 = 1.;
 		}
 		if (! wntun) {
 /* Computing MAX */
-		    i__2 = maxwrk, i__3 = *m * 3 + (*m - 1) * ilaenv_(&c__1, 
+		    i__2 = maxwrk, i__3 = *m * 3 + (*m - 1) * ilaenv_(&c__1,
 			    "DORGBR", "Q", m, m, m, &c_n1, (ftnlen)6, (ftnlen)
 			    1);
 		    maxwrk = max(i__2,i__3);
@@ -912,21 +911,21 @@ static doublereal c_b438 = 1.;
 
     if (*m >= *n) {
 
-/*        A has at least as many rows as columns. If A has sufficiently   
-          more rows than columns, first reduce using the QR   
+/*        A has at least as many rows as columns. If A has sufficiently
+          more rows than columns, first reduce using the QR
           decomposition (if sufficient workspace available) */
 
 	if (*m >= mnthr) {
 
 	    if (wntun) {
 
-/*              Path 1 (M much larger than N, JOBU='N')   
+/*              Path 1 (M much larger than N, JOBU='N')
                 No left singular vectors to be computed */
 
 		itau = 1;
 		iwork = itau + *n;
 
-/*              Compute A=Q*R   
+/*              Compute A=Q*R
                 (Workspace: need 2*N, prefer N+N*NB) */
 
 		i__2 = *lwork - iwork + 1;
@@ -937,14 +936,14 @@ static doublereal c_b438 = 1.;
 
 		i__2 = *n - 1;
 		i__3 = *n - 1;
-		dlaset_("L", &i__2, &i__3, &c_b416, &c_b416, &a_ref(2, 1), 
+		dlaset_("L", &i__2, &i__3, &c_b416, &c_b416, &a_ref(2, 1),
 			lda);
 		ie = 1;
 		itauq = ie + *n;
 		itaup = itauq + *n;
 		iwork = itaup + *n;
 
-/*              Bidiagonalize R in A   
+/*              Bidiagonalize R in A
                 (Workspace: need 4*N, prefer 3*N+2*N*NB) */
 
 		i__2 = *lwork - iwork + 1;
@@ -953,7 +952,7 @@ static doublereal c_b438 = 1.;
 		ncvt = 0;
 		if (wntvo || wntvas) {
 
-/*                 If right singular vectors desired, generate P'.   
+/*                 If right singular vectors desired, generate P'.
                    (Workspace: need 4*N-1, prefer 3*N+(N-1)*NB) */
 
 		    i__2 = *lwork - iwork + 1;
@@ -963,26 +962,26 @@ static doublereal c_b438 = 1.;
 		}
 		iwork = ie + *n;
 
-/*              Perform bidiagonal QR iteration, computing right   
-                singular vectors of A in A if desired   
+/*              Perform bidiagonal QR iteration, computing right
+                singular vectors of A in A if desired
                 (Workspace: need BDSPAC) */
 
 		dbdsqr_("U", n, &ncvt, &c__0, &c__0, &s[1], &work[ie], &a[
-			a_offset], lda, dum, &c__1, dum, &c__1, &work[iwork], 
+			a_offset], lda, dum, &c__1, dum, &c__1, &work[iwork],
 			info);
 
 /*              If right singular vectors desired in VT, copy them there */
 
 		if (wntvas) {
-		    dlacpy_("F", n, n, &a[a_offset], lda, &vt[vt_offset], 
+		    dlacpy_("F", n, n, &a[a_offset], lda, &vt[vt_offset],
 			    ldvt);
 		}
 
 	    } else if (wntuo && wntvn) {
 
-/*              Path 2 (M much larger than N, JOBU='O', JOBVT='N')   
-                N left singular vectors to be overwritten on A and   
-                no right singular vectors to be computed   
+/*              Path 2 (M much larger than N, JOBU='O', JOBVT='N')
+                N left singular vectors to be overwritten on A and
+                no right singular vectors to be computed
 
    Computing MAX */
 		i__2 = *n << 2;
@@ -1019,7 +1018,7 @@ static doublereal c_b438 = 1.;
 		    itau = ir + ldwrkr * *n;
 		    iwork = itau + *n;
 
-/*                 Compute A=Q*R   
+/*                 Compute A=Q*R
                    (Workspace: need N*N+2*N, prefer N*N+N+N*NB) */
 
 		    i__2 = *lwork - iwork + 1;
@@ -1034,7 +1033,7 @@ static doublereal c_b438 = 1.;
 		    dlaset_("L", &i__2, &i__3, &c_b416, &c_b416, &work[ir + 1]
 			    , &ldwrkr);
 
-/*                 Generate Q in A   
+/*                 Generate Q in A
                    (Workspace: need N*N+2*N, prefer N*N+N+N*NB) */
 
 		    i__2 = *lwork - iwork + 1;
@@ -1045,14 +1044,14 @@ static doublereal c_b438 = 1.;
 		    itaup = itauq + *n;
 		    iwork = itaup + *n;
 
-/*                 Bidiagonalize R in WORK(IR)   
+/*                 Bidiagonalize R in WORK(IR)
                    (Workspace: need N*N+4*N, prefer N*N+3*N+2*N*NB) */
 
 		    i__2 = *lwork - iwork + 1;
 		    dgebrd_(n, n, &work[ir], &ldwrkr, &s[1], &work[ie], &work[
 			    itauq], &work[itaup], &work[iwork], &i__2, &ierr);
 
-/*                 Generate left vectors bidiagonalizing R   
+/*                 Generate left vectors bidiagonalizing R
                    (Workspace: need N*N+4*N, prefer N*N+3*N+N*NB) */
 
 		    i__2 = *lwork - iwork + 1;
@@ -1060,8 +1059,8 @@ static doublereal c_b438 = 1.;
 			    work[iwork], &i__2, &ierr);
 		    iwork = ie + *n;
 
-/*                 Perform bidiagonal QR iteration, computing left   
-                   singular vectors of R in WORK(IR)   
+/*                 Perform bidiagonal QR iteration, computing left
+                   singular vectors of R in WORK(IR)
                    (Workspace: need N*N+BDSPAC) */
 
 		    dbdsqr_("U", n, &c__0, n, &c__0, &s[1], &work[ie], dum, &
@@ -1069,8 +1068,8 @@ static doublereal c_b438 = 1.;
 			    , info);
 		    iu = ie + *n;
 
-/*                 Multiply Q in A by left singular vectors of R in   
-                   WORK(IR), storing result in WORK(IU) and copying to A   
+/*                 Multiply Q in A by left singular vectors of R in
+                   WORK(IR), storing result in WORK(IU) and copying to A
                    (Workspace: need N*N+2*N, prefer N*N+M*N+N) */
 
 		    i__2 = *m;
@@ -1097,14 +1096,14 @@ static doublereal c_b438 = 1.;
 		    itaup = itauq + *n;
 		    iwork = itaup + *n;
 
-/*                 Bidiagonalize A   
+/*                 Bidiagonalize A
                    (Workspace: need 3*N+M, prefer 3*N+(M+N)*NB) */
 
 		    i__3 = *lwork - iwork + 1;
 		    dgebrd_(m, n, &a[a_offset], lda, &s[1], &work[ie], &work[
 			    itauq], &work[itaup], &work[iwork], &i__3, &ierr);
 
-/*                 Generate left vectors bidiagonalizing A   
+/*                 Generate left vectors bidiagonalizing A
                    (Workspace: need 4*N, prefer 3*N+N*NB) */
 
 		    i__3 = *lwork - iwork + 1;
@@ -1112,8 +1111,8 @@ static doublereal c_b438 = 1.;
 			    work[iwork], &i__3, &ierr);
 		    iwork = ie + *n;
 
-/*                 Perform bidiagonal QR iteration, computing left   
-                   singular vectors of A in A   
+/*                 Perform bidiagonal QR iteration, computing left
+                   singular vectors of A in A
                    (Workspace: need BDSPAC) */
 
 		    dbdsqr_("U", n, &c__0, m, &c__0, &s[1], &work[ie], dum, &
@@ -1124,9 +1123,9 @@ static doublereal c_b438 = 1.;
 
 	    } else if (wntuo && wntvas) {
 
-/*              Path 3 (M much larger than N, JOBU='O', JOBVT='S' or 'A')   
-                N left singular vectors to be overwritten on A and   
-                N right singular vectors to be computed in VT   
+/*              Path 3 (M much larger than N, JOBU='O', JOBVT='S' or 'A')
+                N left singular vectors to be overwritten on A and
+                N right singular vectors to be computed in VT
 
    Computing MAX */
 		i__3 = *n << 2;
@@ -1163,7 +1162,7 @@ static doublereal c_b438 = 1.;
 		    itau = ir + ldwrkr * *n;
 		    iwork = itau + *n;
 
-/*                 Compute A=Q*R   
+/*                 Compute A=Q*R
                    (Workspace: need N*N+2*N, prefer N*N+N+N*NB) */
 
 		    i__3 = *lwork - iwork + 1;
@@ -1172,14 +1171,14 @@ static doublereal c_b438 = 1.;
 
 /*                 Copy R to VT, zeroing out below it */
 
-		    dlacpy_("U", n, n, &a[a_offset], lda, &vt[vt_offset], 
+		    dlacpy_("U", n, n, &a[a_offset], lda, &vt[vt_offset],
 			    ldvt);
 		    i__3 = *n - 1;
 		    i__2 = *n - 1;
 		    dlaset_("L", &i__3, &i__2, &c_b416, &c_b416, &vt_ref(2, 1)
 			    , ldvt);
 
-/*                 Generate Q in A   
+/*                 Generate Q in A
                    (Workspace: need N*N+2*N, prefer N*N+N+N*NB) */
 
 		    i__3 = *lwork - iwork + 1;
@@ -1190,7 +1189,7 @@ static doublereal c_b438 = 1.;
 		    itaup = itauq + *n;
 		    iwork = itaup + *n;
 
-/*                 Bidiagonalize R in VT, copying result to WORK(IR)   
+/*                 Bidiagonalize R in VT, copying result to WORK(IR)
                    (Workspace: need N*N+4*N, prefer N*N+3*N+2*N*NB) */
 
 		    i__3 = *lwork - iwork + 1;
@@ -1200,33 +1199,33 @@ static doublereal c_b438 = 1.;
 		    dlacpy_("L", n, n, &vt[vt_offset], ldvt, &work[ir], &
 			    ldwrkr);
 
-/*                 Generate left vectors bidiagonalizing R in WORK(IR)   
+/*                 Generate left vectors bidiagonalizing R in WORK(IR)
                    (Workspace: need N*N+4*N, prefer N*N+3*N+N*NB) */
 
 		    i__3 = *lwork - iwork + 1;
 		    dorgbr_("Q", n, n, n, &work[ir], &ldwrkr, &work[itauq], &
 			    work[iwork], &i__3, &ierr);
 
-/*                 Generate right vectors bidiagonalizing R in VT   
+/*                 Generate right vectors bidiagonalizing R in VT
                    (Workspace: need N*N+4*N-1, prefer N*N+3*N+(N-1)*NB) */
 
 		    i__3 = *lwork - iwork + 1;
-		    dorgbr_("P", n, n, n, &vt[vt_offset], ldvt, &work[itaup], 
+		    dorgbr_("P", n, n, n, &vt[vt_offset], ldvt, &work[itaup],
 			    &work[iwork], &i__3, &ierr);
 		    iwork = ie + *n;
 
-/*                 Perform bidiagonal QR iteration, computing left   
-                   singular vectors of R in WORK(IR) and computing right   
-                   singular vectors of R in VT   
+/*                 Perform bidiagonal QR iteration, computing left
+                   singular vectors of R in WORK(IR) and computing right
+                   singular vectors of R in VT
                    (Workspace: need N*N+BDSPAC) */
 
 		    dbdsqr_("U", n, n, n, &c__0, &s[1], &work[ie], &vt[
-			    vt_offset], ldvt, &work[ir], &ldwrkr, dum, &c__1, 
+			    vt_offset], ldvt, &work[ir], &ldwrkr, dum, &c__1,
 			    &work[iwork], info);
 		    iu = ie + *n;
 
-/*                 Multiply Q in A by left singular vectors of R in   
-                   WORK(IR), storing result in WORK(IU) and copying to A   
+/*                 Multiply Q in A by left singular vectors of R in
+                   WORK(IR), storing result in WORK(IU) and copying to A
                    (Workspace: need N*N+2*N, prefer N*N+M*N+N) */
 
 		    i__3 = *m;
@@ -1251,7 +1250,7 @@ static doublereal c_b438 = 1.;
 		    itau = 1;
 		    iwork = itau + *n;
 
-/*                 Compute A=Q*R   
+/*                 Compute A=Q*R
                    (Workspace: need 2*N, prefer N+N*NB) */
 
 		    i__2 = *lwork - iwork + 1;
@@ -1260,14 +1259,14 @@ static doublereal c_b438 = 1.;
 
 /*                 Copy R to VT, zeroing out below it */
 
-		    dlacpy_("U", n, n, &a[a_offset], lda, &vt[vt_offset], 
+		    dlacpy_("U", n, n, &a[a_offset], lda, &vt[vt_offset],
 			    ldvt);
 		    i__2 = *n - 1;
 		    i__3 = *n - 1;
 		    dlaset_("L", &i__2, &i__3, &c_b416, &c_b416, &vt_ref(2, 1)
 			    , ldvt);
 
-/*                 Generate Q in A   
+/*                 Generate Q in A
                    (Workspace: need 2*N, prefer N+N*NB) */
 
 		    i__2 = *lwork - iwork + 1;
@@ -1278,7 +1277,7 @@ static doublereal c_b438 = 1.;
 		    itaup = itauq + *n;
 		    iwork = itaup + *n;
 
-/*                 Bidiagonalize R in VT   
+/*                 Bidiagonalize R in VT
                    (Workspace: need 4*N, prefer 3*N+2*N*NB) */
 
 		    i__2 = *lwork - iwork + 1;
@@ -1286,7 +1285,7 @@ static doublereal c_b438 = 1.;
 			    work[itauq], &work[itaup], &work[iwork], &i__2, &
 			    ierr);
 
-/*                 Multiply Q in A by left vectors bidiagonalizing R   
+/*                 Multiply Q in A by left vectors bidiagonalizing R
                    (Workspace: need 3*N+M, prefer 3*N+M*NB) */
 
 		    i__2 = *lwork - iwork + 1;
@@ -1294,17 +1293,17 @@ static doublereal c_b438 = 1.;
 			    work[itauq], &a[a_offset], lda, &work[iwork], &
 			    i__2, &ierr);
 
-/*                 Generate right vectors bidiagonalizing R in VT   
+/*                 Generate right vectors bidiagonalizing R in VT
                    (Workspace: need 4*N-1, prefer 3*N+(N-1)*NB) */
 
 		    i__2 = *lwork - iwork + 1;
-		    dorgbr_("P", n, n, n, &vt[vt_offset], ldvt, &work[itaup], 
+		    dorgbr_("P", n, n, n, &vt[vt_offset], ldvt, &work[itaup],
 			    &work[iwork], &i__2, &ierr);
 		    iwork = ie + *n;
 
-/*                 Perform bidiagonal QR iteration, computing left   
-                   singular vectors of A in A and computing right   
-                   singular vectors of A in VT   
+/*                 Perform bidiagonal QR iteration, computing left
+                   singular vectors of A in A and computing right
+                   singular vectors of A in VT
                    (Workspace: need BDSPAC) */
 
 		    dbdsqr_("U", n, n, m, &c__0, &s[1], &work[ie], &vt[
@@ -1317,9 +1316,9 @@ static doublereal c_b438 = 1.;
 
 		if (wntvn) {
 
-/*                 Path 4 (M much larger than N, JOBU='S', JOBVT='N')   
-                   N left singular vectors to be computed in U and   
-                   no right singular vectors to be computed   
+/*                 Path 4 (M much larger than N, JOBU='S', JOBVT='N')
+                   N left singular vectors to be computed in U and
+                   no right singular vectors to be computed
 
    Computing MAX */
 		    i__2 = *n << 2;
@@ -1342,7 +1341,7 @@ static doublereal c_b438 = 1.;
 			itau = ir + ldwrkr * *n;
 			iwork = itau + *n;
 
-/*                    Compute A=Q*R   
+/*                    Compute A=Q*R
                       (Workspace: need N*N+2*N, prefer N*N+N+N*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -1355,10 +1354,10 @@ static doublereal c_b438 = 1.;
 				ldwrkr);
 			i__2 = *n - 1;
 			i__3 = *n - 1;
-			dlaset_("L", &i__2, &i__3, &c_b416, &c_b416, &work[ir 
+			dlaset_("L", &i__2, &i__3, &c_b416, &c_b416, &work[ir
 				+ 1], &ldwrkr);
 
-/*                    Generate Q in A   
+/*                    Generate Q in A
                       (Workspace: need N*N+2*N, prefer N*N+N+N*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -1369,7 +1368,7 @@ static doublereal c_b438 = 1.;
 			itaup = itauq + *n;
 			iwork = itaup + *n;
 
-/*                    Bidiagonalize R in WORK(IR)   
+/*                    Bidiagonalize R in WORK(IR)
                       (Workspace: need N*N+4*N, prefer N*N+3*N+2*N*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -1377,7 +1376,7 @@ static doublereal c_b438 = 1.;
 				work[itauq], &work[itaup], &work[iwork], &
 				i__2, &ierr);
 
-/*                    Generate left vectors bidiagonalizing R in WORK(IR)   
+/*                    Generate left vectors bidiagonalizing R in WORK(IR)
                       (Workspace: need N*N+4*N, prefer N*N+3*N+N*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -1385,20 +1384,20 @@ static doublereal c_b438 = 1.;
 				, &work[iwork], &i__2, &ierr);
 			iwork = ie + *n;
 
-/*                    Perform bidiagonal QR iteration, computing left   
-                      singular vectors of R in WORK(IR)   
+/*                    Perform bidiagonal QR iteration, computing left
+                      singular vectors of R in WORK(IR)
                       (Workspace: need N*N+BDSPAC) */
 
-			dbdsqr_("U", n, &c__0, n, &c__0, &s[1], &work[ie], 
+			dbdsqr_("U", n, &c__0, n, &c__0, &s[1], &work[ie],
 				dum, &c__1, &work[ir], &ldwrkr, dum, &c__1, &
 				work[iwork], info);
 
-/*                    Multiply Q in A by left singular vectors of R in   
-                      WORK(IR), storing result in U   
+/*                    Multiply Q in A by left singular vectors of R in
+                      WORK(IR), storing result in U
                       (Workspace: need N*N) */
 
-			dgemm_("N", "N", m, n, n, &c_b438, &a[a_offset], lda, 
-				&work[ir], &ldwrkr, &c_b416, &u[u_offset], 
+			dgemm_("N", "N", m, n, n, &c_b438, &a[a_offset], lda,
+				&work[ir], &ldwrkr, &c_b416, &u[u_offset],
 				ldu);
 
 		    } else {
@@ -1408,16 +1407,16 @@ static doublereal c_b438 = 1.;
 			itau = 1;
 			iwork = itau + *n;
 
-/*                    Compute A=Q*R, copying result to U   
+/*                    Compute A=Q*R, copying result to U
                       (Workspace: need 2*N, prefer N+N*NB) */
 
 			i__2 = *lwork - iwork + 1;
 			dgeqrf_(m, n, &a[a_offset], lda, &work[itau], &work[
 				iwork], &i__2, &ierr);
-			dlacpy_("L", m, n, &a[a_offset], lda, &u[u_offset], 
+			dlacpy_("L", m, n, &a[a_offset], lda, &u[u_offset],
 				ldu);
 
-/*                    Generate Q in U   
+/*                    Generate Q in U
                       (Workspace: need 2*N, prefer N+N*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -1435,7 +1434,7 @@ static doublereal c_b438 = 1.;
 			dlaset_("L", &i__2, &i__3, &c_b416, &c_b416, &a_ref(2,
 				 1), lda);
 
-/*                    Bidiagonalize R in A   
+/*                    Bidiagonalize R in A
                       (Workspace: need 4*N, prefer 3*N+2*N*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -1443,21 +1442,21 @@ static doublereal c_b438 = 1.;
 				work[itauq], &work[itaup], &work[iwork], &
 				i__2, &ierr);
 
-/*                    Multiply Q in U by left vectors bidiagonalizing R   
+/*                    Multiply Q in U by left vectors bidiagonalizing R
                       (Workspace: need 3*N+M, prefer 3*N+M*NB) */
 
 			i__2 = *lwork - iwork + 1;
 			dormbr_("Q", "R", "N", m, n, n, &a[a_offset], lda, &
-				work[itauq], &u[u_offset], ldu, &work[iwork], 
+				work[itauq], &u[u_offset], ldu, &work[iwork],
 				&i__2, &ierr)
 				;
 			iwork = ie + *n;
 
-/*                    Perform bidiagonal QR iteration, computing left   
-                      singular vectors of A in U   
+/*                    Perform bidiagonal QR iteration, computing left
+                      singular vectors of A in U
                       (Workspace: need BDSPAC) */
 
-			dbdsqr_("U", n, &c__0, m, &c__0, &s[1], &work[ie], 
+			dbdsqr_("U", n, &c__0, m, &c__0, &s[1], &work[ie],
 				dum, &c__1, &u[u_offset], ldu, dum, &c__1, &
 				work[iwork], info);
 
@@ -1465,9 +1464,9 @@ static doublereal c_b438 = 1.;
 
 		} else if (wntvo) {
 
-/*                 Path 5 (M much larger than N, JOBU='S', JOBVT='O')   
-                   N left singular vectors to be computed in U and   
-                   N right singular vectors to be overwritten on A   
+/*                 Path 5 (M much larger than N, JOBU='S', JOBVT='O')
+                   N left singular vectors to be computed in U and
+                   N right singular vectors to be overwritten on A
 
    Computing MAX */
 		    i__2 = *n << 2;
@@ -1501,7 +1500,7 @@ static doublereal c_b438 = 1.;
 			itau = ir + ldwrkr * *n;
 			iwork = itau + *n;
 
-/*                    Compute A=Q*R   
+/*                    Compute A=Q*R
                       (Workspace: need 2*N*N+2*N, prefer 2*N*N+N+N*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -1514,10 +1513,10 @@ static doublereal c_b438 = 1.;
 				ldwrku);
 			i__2 = *n - 1;
 			i__3 = *n - 1;
-			dlaset_("L", &i__2, &i__3, &c_b416, &c_b416, &work[iu 
+			dlaset_("L", &i__2, &i__3, &c_b416, &c_b416, &work[iu
 				+ 1], &ldwrku);
 
-/*                    Generate Q in A   
+/*                    Generate Q in A
                       (Workspace: need 2*N*N+2*N, prefer 2*N*N+N+N*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -1528,9 +1527,9 @@ static doublereal c_b438 = 1.;
 			itaup = itauq + *n;
 			iwork = itaup + *n;
 
-/*                    Bidiagonalize R in WORK(IU), copying result to   
-                      WORK(IR)   
-                      (Workspace: need 2*N*N+4*N,   
+/*                    Bidiagonalize R in WORK(IU), copying result to
+                      WORK(IR)
+                      (Workspace: need 2*N*N+4*N,
                                   prefer 2*N*N+3*N+2*N*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -1540,15 +1539,15 @@ static doublereal c_b438 = 1.;
 			dlacpy_("U", n, n, &work[iu], &ldwrku, &work[ir], &
 				ldwrkr);
 
-/*                    Generate left bidiagonalizing vectors in WORK(IU)   
+/*                    Generate left bidiagonalizing vectors in WORK(IU)
                       (Workspace: need 2*N*N+4*N, prefer 2*N*N+3*N+N*NB) */
 
 			i__2 = *lwork - iwork + 1;
 			dorgbr_("Q", n, n, n, &work[iu], &ldwrku, &work[itauq]
 				, &work[iwork], &i__2, &ierr);
 
-/*                    Generate right bidiagonalizing vectors in WORK(IR)   
-                      (Workspace: need 2*N*N+4*N-1,   
+/*                    Generate right bidiagonalizing vectors in WORK(IR)
+                      (Workspace: need 2*N*N+4*N-1,
                                   prefer 2*N*N+3*N+(N-1)*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -1556,27 +1555,27 @@ static doublereal c_b438 = 1.;
 				, &work[iwork], &i__2, &ierr);
 			iwork = ie + *n;
 
-/*                    Perform bidiagonal QR iteration, computing left   
-                      singular vectors of R in WORK(IU) and computing   
-                      right singular vectors of R in WORK(IR)   
+/*                    Perform bidiagonal QR iteration, computing left
+                      singular vectors of R in WORK(IU) and computing
+                      right singular vectors of R in WORK(IR)
                       (Workspace: need 2*N*N+BDSPAC) */
 
 			dbdsqr_("U", n, n, n, &c__0, &s[1], &work[ie], &work[
-				ir], &ldwrkr, &work[iu], &ldwrku, dum, &c__1, 
+				ir], &ldwrkr, &work[iu], &ldwrku, dum, &c__1,
 				&work[iwork], info);
 
-/*                    Multiply Q in A by left singular vectors of R in   
-                      WORK(IU), storing result in U   
+/*                    Multiply Q in A by left singular vectors of R in
+                      WORK(IU), storing result in U
                       (Workspace: need N*N) */
 
-			dgemm_("N", "N", m, n, n, &c_b438, &a[a_offset], lda, 
-				&work[iu], &ldwrku, &c_b416, &u[u_offset], 
+			dgemm_("N", "N", m, n, n, &c_b438, &a[a_offset], lda,
+				&work[iu], &ldwrku, &c_b416, &u[u_offset],
 				ldu);
 
-/*                    Copy right singular vectors of R to A   
+/*                    Copy right singular vectors of R to A
                       (Workspace: need N*N) */
 
-			dlacpy_("F", n, n, &work[ir], &ldwrkr, &a[a_offset], 
+			dlacpy_("F", n, n, &work[ir], &ldwrkr, &a[a_offset],
 				lda);
 
 		    } else {
@@ -1586,16 +1585,16 @@ static doublereal c_b438 = 1.;
 			itau = 1;
 			iwork = itau + *n;
 
-/*                    Compute A=Q*R, copying result to U   
+/*                    Compute A=Q*R, copying result to U
                       (Workspace: need 2*N, prefer N+N*NB) */
 
 			i__2 = *lwork - iwork + 1;
 			dgeqrf_(m, n, &a[a_offset], lda, &work[itau], &work[
 				iwork], &i__2, &ierr);
-			dlacpy_("L", m, n, &a[a_offset], lda, &u[u_offset], 
+			dlacpy_("L", m, n, &a[a_offset], lda, &u[u_offset],
 				ldu);
 
-/*                    Generate Q in U   
+/*                    Generate Q in U
                       (Workspace: need 2*N, prefer N+N*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -1613,7 +1612,7 @@ static doublereal c_b438 = 1.;
 			dlaset_("L", &i__2, &i__3, &c_b416, &c_b416, &a_ref(2,
 				 1), lda);
 
-/*                    Bidiagonalize R in A   
+/*                    Bidiagonalize R in A
                       (Workspace: need 4*N, prefer 3*N+2*N*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -1621,16 +1620,16 @@ static doublereal c_b438 = 1.;
 				work[itauq], &work[itaup], &work[iwork], &
 				i__2, &ierr);
 
-/*                    Multiply Q in U by left vectors bidiagonalizing R   
+/*                    Multiply Q in U by left vectors bidiagonalizing R
                       (Workspace: need 3*N+M, prefer 3*N+M*NB) */
 
 			i__2 = *lwork - iwork + 1;
 			dormbr_("Q", "R", "N", m, n, n, &a[a_offset], lda, &
-				work[itauq], &u[u_offset], ldu, &work[iwork], 
+				work[itauq], &u[u_offset], ldu, &work[iwork],
 				&i__2, &ierr)
 				;
 
-/*                    Generate right vectors bidiagonalizing R in A   
+/*                    Generate right vectors bidiagonalizing R in A
                       (Workspace: need 4*N-1, prefer 3*N+(N-1)*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -1638,9 +1637,9 @@ static doublereal c_b438 = 1.;
 				 &work[iwork], &i__2, &ierr);
 			iwork = ie + *n;
 
-/*                    Perform bidiagonal QR iteration, computing left   
-                      singular vectors of A in U and computing right   
-                      singular vectors of A in A   
+/*                    Perform bidiagonal QR iteration, computing left
+                      singular vectors of A in U and computing right
+                      singular vectors of A in A
                       (Workspace: need BDSPAC) */
 
 			dbdsqr_("U", n, n, m, &c__0, &s[1], &work[ie], &a[
@@ -1651,10 +1650,10 @@ static doublereal c_b438 = 1.;
 
 		} else if (wntvas) {
 
-/*                 Path 6 (M much larger than N, JOBU='S', JOBVT='S'   
-                           or 'A')   
-                   N left singular vectors to be computed in U and   
-                   N right singular vectors to be computed in VT   
+/*                 Path 6 (M much larger than N, JOBU='S', JOBVT='S'
+                           or 'A')
+                   N left singular vectors to be computed in U and
+                   N right singular vectors to be computed in VT
 
    Computing MAX */
 		    i__2 = *n << 2;
@@ -1677,7 +1676,7 @@ static doublereal c_b438 = 1.;
 			itau = iu + ldwrku * *n;
 			iwork = itau + *n;
 
-/*                    Compute A=Q*R   
+/*                    Compute A=Q*R
                       (Workspace: need N*N+2*N, prefer N*N+N+N*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -1690,10 +1689,10 @@ static doublereal c_b438 = 1.;
 				ldwrku);
 			i__2 = *n - 1;
 			i__3 = *n - 1;
-			dlaset_("L", &i__2, &i__3, &c_b416, &c_b416, &work[iu 
+			dlaset_("L", &i__2, &i__3, &c_b416, &c_b416, &work[iu
 				+ 1], &ldwrku);
 
-/*                    Generate Q in A   
+/*                    Generate Q in A
                       (Workspace: need N*N+2*N, prefer N*N+N+N*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -1704,7 +1703,7 @@ static doublereal c_b438 = 1.;
 			itaup = itauq + *n;
 			iwork = itaup + *n;
 
-/*                    Bidiagonalize R in WORK(IU), copying result to VT   
+/*                    Bidiagonalize R in WORK(IU), copying result to VT
                       (Workspace: need N*N+4*N, prefer N*N+3*N+2*N*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -1714,15 +1713,15 @@ static doublereal c_b438 = 1.;
 			dlacpy_("U", n, n, &work[iu], &ldwrku, &vt[vt_offset],
 				 ldvt);
 
-/*                    Generate left bidiagonalizing vectors in WORK(IU)   
+/*                    Generate left bidiagonalizing vectors in WORK(IU)
                       (Workspace: need N*N+4*N, prefer N*N+3*N+N*NB) */
 
 			i__2 = *lwork - iwork + 1;
 			dorgbr_("Q", n, n, n, &work[iu], &ldwrku, &work[itauq]
 				, &work[iwork], &i__2, &ierr);
 
-/*                    Generate right bidiagonalizing vectors in VT   
-                      (Workspace: need N*N+4*N-1,   
+/*                    Generate right bidiagonalizing vectors in VT
+                      (Workspace: need N*N+4*N-1,
                                   prefer N*N+3*N+(N-1)*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -1731,21 +1730,21 @@ static doublereal c_b438 = 1.;
 				;
 			iwork = ie + *n;
 
-/*                    Perform bidiagonal QR iteration, computing left   
-                      singular vectors of R in WORK(IU) and computing   
-                      right singular vectors of R in VT   
+/*                    Perform bidiagonal QR iteration, computing left
+                      singular vectors of R in WORK(IU) and computing
+                      right singular vectors of R in VT
                       (Workspace: need N*N+BDSPAC) */
 
 			dbdsqr_("U", n, n, n, &c__0, &s[1], &work[ie], &vt[
 				vt_offset], ldvt, &work[iu], &ldwrku, dum, &
 				c__1, &work[iwork], info);
 
-/*                    Multiply Q in A by left singular vectors of R in   
-                      WORK(IU), storing result in U   
+/*                    Multiply Q in A by left singular vectors of R in
+                      WORK(IU), storing result in U
                       (Workspace: need N*N) */
 
-			dgemm_("N", "N", m, n, n, &c_b438, &a[a_offset], lda, 
-				&work[iu], &ldwrku, &c_b416, &u[u_offset], 
+			dgemm_("N", "N", m, n, n, &c_b438, &a[a_offset], lda,
+				&work[iu], &ldwrku, &c_b416, &u[u_offset],
 				ldu);
 
 		    } else {
@@ -1755,16 +1754,16 @@ static doublereal c_b438 = 1.;
 			itau = 1;
 			iwork = itau + *n;
 
-/*                    Compute A=Q*R, copying result to U   
+/*                    Compute A=Q*R, copying result to U
                       (Workspace: need 2*N, prefer N+N*NB) */
 
 			i__2 = *lwork - iwork + 1;
 			dgeqrf_(m, n, &a[a_offset], lda, &work[itau], &work[
 				iwork], &i__2, &ierr);
-			dlacpy_("L", m, n, &a[a_offset], lda, &u[u_offset], 
+			dlacpy_("L", m, n, &a[a_offset], lda, &u[u_offset],
 				ldu);
 
-/*                    Generate Q in U   
+/*                    Generate Q in U
                       (Workspace: need 2*N, prefer N+N*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -1773,7 +1772,7 @@ static doublereal c_b438 = 1.;
 
 /*                    Copy R to VT, zeroing out below it */
 
-			dlacpy_("U", n, n, &a[a_offset], lda, &vt[vt_offset], 
+			dlacpy_("U", n, n, &a[a_offset], lda, &vt[vt_offset],
 				ldvt);
 			i__2 = *n - 1;
 			i__3 = *n - 1;
@@ -1784,24 +1783,24 @@ static doublereal c_b438 = 1.;
 			itaup = itauq + *n;
 			iwork = itaup + *n;
 
-/*                    Bidiagonalize R in VT   
+/*                    Bidiagonalize R in VT
                       (Workspace: need 4*N, prefer 3*N+2*N*NB) */
 
 			i__2 = *lwork - iwork + 1;
-			dgebrd_(n, n, &vt[vt_offset], ldvt, &s[1], &work[ie], 
+			dgebrd_(n, n, &vt[vt_offset], ldvt, &s[1], &work[ie],
 				&work[itauq], &work[itaup], &work[iwork], &
 				i__2, &ierr);
 
-/*                    Multiply Q in U by left bidiagonalizing vectors   
-                      in VT   
+/*                    Multiply Q in U by left bidiagonalizing vectors
+                      in VT
                       (Workspace: need 3*N+M, prefer 3*N+M*NB) */
 
 			i__2 = *lwork - iwork + 1;
-			dormbr_("Q", "R", "N", m, n, n, &vt[vt_offset], ldvt, 
+			dormbr_("Q", "R", "N", m, n, n, &vt[vt_offset], ldvt,
 				&work[itauq], &u[u_offset], ldu, &work[iwork],
 				 &i__2, &ierr);
 
-/*                    Generate right bidiagonalizing vectors in VT   
+/*                    Generate right bidiagonalizing vectors in VT
                       (Workspace: need 4*N-1, prefer 3*N+(N-1)*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -1810,9 +1809,9 @@ static doublereal c_b438 = 1.;
 				;
 			iwork = ie + *n;
 
-/*                    Perform bidiagonal QR iteration, computing left   
-                      singular vectors of A in U and computing right   
-                      singular vectors of A in VT   
+/*                    Perform bidiagonal QR iteration, computing left
+                      singular vectors of A in U and computing right
+                      singular vectors of A in VT
                       (Workspace: need BDSPAC) */
 
 			dbdsqr_("U", n, n, m, &c__0, &s[1], &work[ie], &vt[
@@ -1827,9 +1826,9 @@ static doublereal c_b438 = 1.;
 
 		if (wntvn) {
 
-/*                 Path 7 (M much larger than N, JOBU='A', JOBVT='N')   
-                   M left singular vectors to be computed in U and   
-                   no right singular vectors to be computed   
+/*                 Path 7 (M much larger than N, JOBU='A', JOBVT='N')
+                   M left singular vectors to be computed in U and
+                   no right singular vectors to be computed
 
    Computing MAX */
 		    i__2 = *n + *m, i__3 = *n << 2, i__2 = max(i__2,i__3);
@@ -1852,13 +1851,13 @@ static doublereal c_b438 = 1.;
 			itau = ir + ldwrkr * *n;
 			iwork = itau + *n;
 
-/*                    Compute A=Q*R, copying result to U   
+/*                    Compute A=Q*R, copying result to U
                       (Workspace: need N*N+2*N, prefer N*N+N+N*NB) */
 
 			i__2 = *lwork - iwork + 1;
 			dgeqrf_(m, n, &a[a_offset], lda, &work[itau], &work[
 				iwork], &i__2, &ierr);
-			dlacpy_("L", m, n, &a[a_offset], lda, &u[u_offset], 
+			dlacpy_("L", m, n, &a[a_offset], lda, &u[u_offset],
 				ldu);
 
 /*                    Copy R to WORK(IR), zeroing out below it */
@@ -1867,10 +1866,10 @@ static doublereal c_b438 = 1.;
 				ldwrkr);
 			i__2 = *n - 1;
 			i__3 = *n - 1;
-			dlaset_("L", &i__2, &i__3, &c_b416, &c_b416, &work[ir 
+			dlaset_("L", &i__2, &i__3, &c_b416, &c_b416, &work[ir
 				+ 1], &ldwrkr);
 
-/*                    Generate Q in U   
+/*                    Generate Q in U
                       (Workspace: need N*N+N+M, prefer N*N+N+M*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -1881,7 +1880,7 @@ static doublereal c_b438 = 1.;
 			itaup = itauq + *n;
 			iwork = itaup + *n;
 
-/*                    Bidiagonalize R in WORK(IR)   
+/*                    Bidiagonalize R in WORK(IR)
                       (Workspace: need N*N+4*N, prefer N*N+3*N+2*N*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -1889,7 +1888,7 @@ static doublereal c_b438 = 1.;
 				work[itauq], &work[itaup], &work[iwork], &
 				i__2, &ierr);
 
-/*                    Generate left bidiagonalizing vectors in WORK(IR)   
+/*                    Generate left bidiagonalizing vectors in WORK(IR)
                       (Workspace: need N*N+4*N, prefer N*N+3*N+N*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -1897,25 +1896,25 @@ static doublereal c_b438 = 1.;
 				, &work[iwork], &i__2, &ierr);
 			iwork = ie + *n;
 
-/*                    Perform bidiagonal QR iteration, computing left   
-                      singular vectors of R in WORK(IR)   
+/*                    Perform bidiagonal QR iteration, computing left
+                      singular vectors of R in WORK(IR)
                       (Workspace: need N*N+BDSPAC) */
 
-			dbdsqr_("U", n, &c__0, n, &c__0, &s[1], &work[ie], 
+			dbdsqr_("U", n, &c__0, n, &c__0, &s[1], &work[ie],
 				dum, &c__1, &work[ir], &ldwrkr, dum, &c__1, &
 				work[iwork], info);
 
-/*                    Multiply Q in U by left singular vectors of R in   
-                      WORK(IR), storing result in A   
+/*                    Multiply Q in U by left singular vectors of R in
+                      WORK(IR), storing result in A
                       (Workspace: need N*N) */
 
-			dgemm_("N", "N", m, n, n, &c_b438, &u[u_offset], ldu, 
-				&work[ir], &ldwrkr, &c_b416, &a[a_offset], 
+			dgemm_("N", "N", m, n, n, &c_b438, &u[u_offset], ldu,
+				&work[ir], &ldwrkr, &c_b416, &a[a_offset],
 				lda);
 
 /*                    Copy left singular vectors of A from A to U */
 
-			dlacpy_("F", m, n, &a[a_offset], lda, &u[u_offset], 
+			dlacpy_("F", m, n, &a[a_offset], lda, &u[u_offset],
 				ldu);
 
 		    } else {
@@ -1925,16 +1924,16 @@ static doublereal c_b438 = 1.;
 			itau = 1;
 			iwork = itau + *n;
 
-/*                    Compute A=Q*R, copying result to U   
+/*                    Compute A=Q*R, copying result to U
                       (Workspace: need 2*N, prefer N+N*NB) */
 
 			i__2 = *lwork - iwork + 1;
 			dgeqrf_(m, n, &a[a_offset], lda, &work[itau], &work[
 				iwork], &i__2, &ierr);
-			dlacpy_("L", m, n, &a[a_offset], lda, &u[u_offset], 
+			dlacpy_("L", m, n, &a[a_offset], lda, &u[u_offset],
 				ldu);
 
-/*                    Generate Q in U   
+/*                    Generate Q in U
                       (Workspace: need N+M, prefer N+M*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -1952,7 +1951,7 @@ static doublereal c_b438 = 1.;
 			dlaset_("L", &i__2, &i__3, &c_b416, &c_b416, &a_ref(2,
 				 1), lda);
 
-/*                    Bidiagonalize R in A   
+/*                    Bidiagonalize R in A
                       (Workspace: need 4*N, prefer 3*N+2*N*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -1960,22 +1959,22 @@ static doublereal c_b438 = 1.;
 				work[itauq], &work[itaup], &work[iwork], &
 				i__2, &ierr);
 
-/*                    Multiply Q in U by left bidiagonalizing vectors   
-                      in A   
+/*                    Multiply Q in U by left bidiagonalizing vectors
+                      in A
                       (Workspace: need 3*N+M, prefer 3*N+M*NB) */
 
 			i__2 = *lwork - iwork + 1;
 			dormbr_("Q", "R", "N", m, n, n, &a[a_offset], lda, &
-				work[itauq], &u[u_offset], ldu, &work[iwork], 
+				work[itauq], &u[u_offset], ldu, &work[iwork],
 				&i__2, &ierr)
 				;
 			iwork = ie + *n;
 
-/*                    Perform bidiagonal QR iteration, computing left   
-                      singular vectors of A in U   
+/*                    Perform bidiagonal QR iteration, computing left
+                      singular vectors of A in U
                       (Workspace: need BDSPAC) */
 
-			dbdsqr_("U", n, &c__0, m, &c__0, &s[1], &work[ie], 
+			dbdsqr_("U", n, &c__0, m, &c__0, &s[1], &work[ie],
 				dum, &c__1, &u[u_offset], ldu, dum, &c__1, &
 				work[iwork], info);
 
@@ -1983,9 +1982,9 @@ static doublereal c_b438 = 1.;
 
 		} else if (wntvo) {
 
-/*                 Path 8 (M much larger than N, JOBU='A', JOBVT='O')   
-                   M left singular vectors to be computed in U and   
-                   N right singular vectors to be overwritten on A   
+/*                 Path 8 (M much larger than N, JOBU='A', JOBVT='O')
+                   M left singular vectors to be computed in U and
+                   N right singular vectors to be overwritten on A
 
    Computing MAX */
 		    i__2 = *n + *m, i__3 = *n << 2, i__2 = max(i__2,i__3);
@@ -2019,16 +2018,16 @@ static doublereal c_b438 = 1.;
 			itau = ir + ldwrkr * *n;
 			iwork = itau + *n;
 
-/*                    Compute A=Q*R, copying result to U   
+/*                    Compute A=Q*R, copying result to U
                       (Workspace: need 2*N*N+2*N, prefer 2*N*N+N+N*NB) */
 
 			i__2 = *lwork - iwork + 1;
 			dgeqrf_(m, n, &a[a_offset], lda, &work[itau], &work[
 				iwork], &i__2, &ierr);
-			dlacpy_("L", m, n, &a[a_offset], lda, &u[u_offset], 
+			dlacpy_("L", m, n, &a[a_offset], lda, &u[u_offset],
 				ldu);
 
-/*                    Generate Q in U   
+/*                    Generate Q in U
                       (Workspace: need 2*N*N+N+M, prefer 2*N*N+N+M*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -2041,16 +2040,16 @@ static doublereal c_b438 = 1.;
 				ldwrku);
 			i__2 = *n - 1;
 			i__3 = *n - 1;
-			dlaset_("L", &i__2, &i__3, &c_b416, &c_b416, &work[iu 
+			dlaset_("L", &i__2, &i__3, &c_b416, &c_b416, &work[iu
 				+ 1], &ldwrku);
 			ie = itau;
 			itauq = ie + *n;
 			itaup = itauq + *n;
 			iwork = itaup + *n;
 
-/*                    Bidiagonalize R in WORK(IU), copying result to   
-                      WORK(IR)   
-                      (Workspace: need 2*N*N+4*N,   
+/*                    Bidiagonalize R in WORK(IU), copying result to
+                      WORK(IR)
+                      (Workspace: need 2*N*N+4*N,
                                   prefer 2*N*N+3*N+2*N*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -2060,15 +2059,15 @@ static doublereal c_b438 = 1.;
 			dlacpy_("U", n, n, &work[iu], &ldwrku, &work[ir], &
 				ldwrkr);
 
-/*                    Generate left bidiagonalizing vectors in WORK(IU)   
+/*                    Generate left bidiagonalizing vectors in WORK(IU)
                       (Workspace: need 2*N*N+4*N, prefer 2*N*N+3*N+N*NB) */
 
 			i__2 = *lwork - iwork + 1;
 			dorgbr_("Q", n, n, n, &work[iu], &ldwrku, &work[itauq]
 				, &work[iwork], &i__2, &ierr);
 
-/*                    Generate right bidiagonalizing vectors in WORK(IR)   
-                      (Workspace: need 2*N*N+4*N-1,   
+/*                    Generate right bidiagonalizing vectors in WORK(IR)
+                      (Workspace: need 2*N*N+4*N-1,
                                   prefer 2*N*N+3*N+(N-1)*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -2076,31 +2075,31 @@ static doublereal c_b438 = 1.;
 				, &work[iwork], &i__2, &ierr);
 			iwork = ie + *n;
 
-/*                    Perform bidiagonal QR iteration, computing left   
-                      singular vectors of R in WORK(IU) and computing   
-                      right singular vectors of R in WORK(IR)   
+/*                    Perform bidiagonal QR iteration, computing left
+                      singular vectors of R in WORK(IU) and computing
+                      right singular vectors of R in WORK(IR)
                       (Workspace: need 2*N*N+BDSPAC) */
 
 			dbdsqr_("U", n, n, n, &c__0, &s[1], &work[ie], &work[
-				ir], &ldwrkr, &work[iu], &ldwrku, dum, &c__1, 
+				ir], &ldwrkr, &work[iu], &ldwrku, dum, &c__1,
 				&work[iwork], info);
 
-/*                    Multiply Q in U by left singular vectors of R in   
-                      WORK(IU), storing result in A   
+/*                    Multiply Q in U by left singular vectors of R in
+                      WORK(IU), storing result in A
                       (Workspace: need N*N) */
 
-			dgemm_("N", "N", m, n, n, &c_b438, &u[u_offset], ldu, 
-				&work[iu], &ldwrku, &c_b416, &a[a_offset], 
+			dgemm_("N", "N", m, n, n, &c_b438, &u[u_offset], ldu,
+				&work[iu], &ldwrku, &c_b416, &a[a_offset],
 				lda);
 
 /*                    Copy left singular vectors of A from A to U */
 
-			dlacpy_("F", m, n, &a[a_offset], lda, &u[u_offset], 
+			dlacpy_("F", m, n, &a[a_offset], lda, &u[u_offset],
 				ldu);
 
 /*                    Copy right singular vectors of R from WORK(IR) to A */
 
-			dlacpy_("F", n, n, &work[ir], &ldwrkr, &a[a_offset], 
+			dlacpy_("F", n, n, &work[ir], &ldwrkr, &a[a_offset],
 				lda);
 
 		    } else {
@@ -2110,16 +2109,16 @@ static doublereal c_b438 = 1.;
 			itau = 1;
 			iwork = itau + *n;
 
-/*                    Compute A=Q*R, copying result to U   
+/*                    Compute A=Q*R, copying result to U
                       (Workspace: need 2*N, prefer N+N*NB) */
 
 			i__2 = *lwork - iwork + 1;
 			dgeqrf_(m, n, &a[a_offset], lda, &work[itau], &work[
 				iwork], &i__2, &ierr);
-			dlacpy_("L", m, n, &a[a_offset], lda, &u[u_offset], 
+			dlacpy_("L", m, n, &a[a_offset], lda, &u[u_offset],
 				ldu);
 
-/*                    Generate Q in U   
+/*                    Generate Q in U
                       (Workspace: need N+M, prefer N+M*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -2137,7 +2136,7 @@ static doublereal c_b438 = 1.;
 			dlaset_("L", &i__2, &i__3, &c_b416, &c_b416, &a_ref(2,
 				 1), lda);
 
-/*                    Bidiagonalize R in A   
+/*                    Bidiagonalize R in A
                       (Workspace: need 4*N, prefer 3*N+2*N*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -2145,17 +2144,17 @@ static doublereal c_b438 = 1.;
 				work[itauq], &work[itaup], &work[iwork], &
 				i__2, &ierr);
 
-/*                    Multiply Q in U by left bidiagonalizing vectors   
-                      in A   
+/*                    Multiply Q in U by left bidiagonalizing vectors
+                      in A
                       (Workspace: need 3*N+M, prefer 3*N+M*NB) */
 
 			i__2 = *lwork - iwork + 1;
 			dormbr_("Q", "R", "N", m, n, n, &a[a_offset], lda, &
-				work[itauq], &u[u_offset], ldu, &work[iwork], 
+				work[itauq], &u[u_offset], ldu, &work[iwork],
 				&i__2, &ierr)
 				;
 
-/*                    Generate right bidiagonalizing vectors in A   
+/*                    Generate right bidiagonalizing vectors in A
                       (Workspace: need 4*N-1, prefer 3*N+(N-1)*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -2163,9 +2162,9 @@ static doublereal c_b438 = 1.;
 				 &work[iwork], &i__2, &ierr);
 			iwork = ie + *n;
 
-/*                    Perform bidiagonal QR iteration, computing left   
-                      singular vectors of A in U and computing right   
-                      singular vectors of A in A   
+/*                    Perform bidiagonal QR iteration, computing left
+                      singular vectors of A in U and computing right
+                      singular vectors of A in A
                       (Workspace: need BDSPAC) */
 
 			dbdsqr_("U", n, n, m, &c__0, &s[1], &work[ie], &a[
@@ -2176,10 +2175,10 @@ static doublereal c_b438 = 1.;
 
 		} else if (wntvas) {
 
-/*                 Path 9 (M much larger than N, JOBU='A', JOBVT='S'   
-                           or 'A')   
-                   M left singular vectors to be computed in U and   
-                   N right singular vectors to be computed in VT   
+/*                 Path 9 (M much larger than N, JOBU='A', JOBVT='S'
+                           or 'A')
+                   M left singular vectors to be computed in U and
+                   N right singular vectors to be computed in VT
 
    Computing MAX */
 		    i__2 = *n + *m, i__3 = *n << 2, i__2 = max(i__2,i__3);
@@ -2202,16 +2201,16 @@ static doublereal c_b438 = 1.;
 			itau = iu + ldwrku * *n;
 			iwork = itau + *n;
 
-/*                    Compute A=Q*R, copying result to U   
+/*                    Compute A=Q*R, copying result to U
                       (Workspace: need N*N+2*N, prefer N*N+N+N*NB) */
 
 			i__2 = *lwork - iwork + 1;
 			dgeqrf_(m, n, &a[a_offset], lda, &work[itau], &work[
 				iwork], &i__2, &ierr);
-			dlacpy_("L", m, n, &a[a_offset], lda, &u[u_offset], 
+			dlacpy_("L", m, n, &a[a_offset], lda, &u[u_offset],
 				ldu);
 
-/*                    Generate Q in U   
+/*                    Generate Q in U
                       (Workspace: need N*N+N+M, prefer N*N+N+M*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -2224,14 +2223,14 @@ static doublereal c_b438 = 1.;
 				ldwrku);
 			i__2 = *n - 1;
 			i__3 = *n - 1;
-			dlaset_("L", &i__2, &i__3, &c_b416, &c_b416, &work[iu 
+			dlaset_("L", &i__2, &i__3, &c_b416, &c_b416, &work[iu
 				+ 1], &ldwrku);
 			ie = itau;
 			itauq = ie + *n;
 			itaup = itauq + *n;
 			iwork = itaup + *n;
 
-/*                    Bidiagonalize R in WORK(IU), copying result to VT   
+/*                    Bidiagonalize R in WORK(IU), copying result to VT
                       (Workspace: need N*N+4*N, prefer N*N+3*N+2*N*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -2241,15 +2240,15 @@ static doublereal c_b438 = 1.;
 			dlacpy_("U", n, n, &work[iu], &ldwrku, &vt[vt_offset],
 				 ldvt);
 
-/*                    Generate left bidiagonalizing vectors in WORK(IU)   
+/*                    Generate left bidiagonalizing vectors in WORK(IU)
                       (Workspace: need N*N+4*N, prefer N*N+3*N+N*NB) */
 
 			i__2 = *lwork - iwork + 1;
 			dorgbr_("Q", n, n, n, &work[iu], &ldwrku, &work[itauq]
 				, &work[iwork], &i__2, &ierr);
 
-/*                    Generate right bidiagonalizing vectors in VT   
-                      (Workspace: need N*N+4*N-1,   
+/*                    Generate right bidiagonalizing vectors in VT
+                      (Workspace: need N*N+4*N-1,
                                   prefer N*N+3*N+(N-1)*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -2258,26 +2257,26 @@ static doublereal c_b438 = 1.;
 				;
 			iwork = ie + *n;
 
-/*                    Perform bidiagonal QR iteration, computing left   
-                      singular vectors of R in WORK(IU) and computing   
-                      right singular vectors of R in VT   
+/*                    Perform bidiagonal QR iteration, computing left
+                      singular vectors of R in WORK(IU) and computing
+                      right singular vectors of R in VT
                       (Workspace: need N*N+BDSPAC) */
 
 			dbdsqr_("U", n, n, n, &c__0, &s[1], &work[ie], &vt[
 				vt_offset], ldvt, &work[iu], &ldwrku, dum, &
 				c__1, &work[iwork], info);
 
-/*                    Multiply Q in U by left singular vectors of R in   
-                      WORK(IU), storing result in A   
+/*                    Multiply Q in U by left singular vectors of R in
+                      WORK(IU), storing result in A
                       (Workspace: need N*N) */
 
-			dgemm_("N", "N", m, n, n, &c_b438, &u[u_offset], ldu, 
-				&work[iu], &ldwrku, &c_b416, &a[a_offset], 
+			dgemm_("N", "N", m, n, n, &c_b438, &u[u_offset], ldu,
+				&work[iu], &ldwrku, &c_b416, &a[a_offset],
 				lda);
 
 /*                    Copy left singular vectors of A from A to U */
 
-			dlacpy_("F", m, n, &a[a_offset], lda, &u[u_offset], 
+			dlacpy_("F", m, n, &a[a_offset], lda, &u[u_offset],
 				ldu);
 
 		    } else {
@@ -2287,16 +2286,16 @@ static doublereal c_b438 = 1.;
 			itau = 1;
 			iwork = itau + *n;
 
-/*                    Compute A=Q*R, copying result to U   
+/*                    Compute A=Q*R, copying result to U
                       (Workspace: need 2*N, prefer N+N*NB) */
 
 			i__2 = *lwork - iwork + 1;
 			dgeqrf_(m, n, &a[a_offset], lda, &work[itau], &work[
 				iwork], &i__2, &ierr);
-			dlacpy_("L", m, n, &a[a_offset], lda, &u[u_offset], 
+			dlacpy_("L", m, n, &a[a_offset], lda, &u[u_offset],
 				ldu);
 
-/*                    Generate Q in U   
+/*                    Generate Q in U
                       (Workspace: need N+M, prefer N+M*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -2305,7 +2304,7 @@ static doublereal c_b438 = 1.;
 
 /*                    Copy R from A to VT, zeroing out below it */
 
-			dlacpy_("U", n, n, &a[a_offset], lda, &vt[vt_offset], 
+			dlacpy_("U", n, n, &a[a_offset], lda, &vt[vt_offset],
 				ldvt);
 			i__2 = *n - 1;
 			i__3 = *n - 1;
@@ -2316,24 +2315,24 @@ static doublereal c_b438 = 1.;
 			itaup = itauq + *n;
 			iwork = itaup + *n;
 
-/*                    Bidiagonalize R in VT   
+/*                    Bidiagonalize R in VT
                       (Workspace: need 4*N, prefer 3*N+2*N*NB) */
 
 			i__2 = *lwork - iwork + 1;
-			dgebrd_(n, n, &vt[vt_offset], ldvt, &s[1], &work[ie], 
+			dgebrd_(n, n, &vt[vt_offset], ldvt, &s[1], &work[ie],
 				&work[itauq], &work[itaup], &work[iwork], &
 				i__2, &ierr);
 
-/*                    Multiply Q in U by left bidiagonalizing vectors   
-                      in VT   
+/*                    Multiply Q in U by left bidiagonalizing vectors
+                      in VT
                       (Workspace: need 3*N+M, prefer 3*N+M*NB) */
 
 			i__2 = *lwork - iwork + 1;
-			dormbr_("Q", "R", "N", m, n, n, &vt[vt_offset], ldvt, 
+			dormbr_("Q", "R", "N", m, n, n, &vt[vt_offset], ldvt,
 				&work[itauq], &u[u_offset], ldu, &work[iwork],
 				 &i__2, &ierr);
 
-/*                    Generate right bidiagonalizing vectors in VT   
+/*                    Generate right bidiagonalizing vectors in VT
                       (Workspace: need 4*N-1, prefer 3*N+(N-1)*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -2342,9 +2341,9 @@ static doublereal c_b438 = 1.;
 				;
 			iwork = ie + *n;
 
-/*                    Perform bidiagonal QR iteration, computing left   
-                      singular vectors of A in U and computing right   
-                      singular vectors of A in VT   
+/*                    Perform bidiagonal QR iteration, computing left
+                      singular vectors of A in U and computing right
+                      singular vectors of A in VT
                       (Workspace: need BDSPAC) */
 
 			dbdsqr_("U", n, n, m, &c__0, &s[1], &work[ie], &vt[
@@ -2359,9 +2358,9 @@ static doublereal c_b438 = 1.;
 
 	} else {
 
-/*           M .LT. MNTHR   
+/*           M .LT. MNTHR
 
-             Path 10 (M at least N, but not much larger)   
+             Path 10 (M at least N, but not much larger)
              Reduce to bidiagonal form without QR decomposition */
 
 	    ie = 1;
@@ -2369,7 +2368,7 @@ static doublereal c_b438 = 1.;
 	    itaup = itauq + *n;
 	    iwork = itaup + *n;
 
-/*           Bidiagonalize A   
+/*           Bidiagonalize A
              (Workspace: need 3*N+M, prefer 3*N+(M+N)*NB) */
 
 	    i__2 = *lwork - iwork + 1;
@@ -2377,8 +2376,8 @@ static doublereal c_b438 = 1.;
 		    work[itaup], &work[iwork], &i__2, &ierr);
 	    if (wntuas) {
 
-/*              If left singular vectors desired in U, copy result to U   
-                and generate left bidiagonalizing vectors in U   
+/*              If left singular vectors desired in U, copy result to U
+                and generate left bidiagonalizing vectors in U
                 (Workspace: need 3*N+NCU, prefer 3*N+NCU*NB) */
 
 		dlacpy_("L", m, n, &a[a_offset], lda, &u[u_offset], ldu);
@@ -2394,8 +2393,8 @@ static doublereal c_b438 = 1.;
 	    }
 	    if (wntvas) {
 
-/*              If right singular vectors desired in VT, copy result to   
-                VT and generate right bidiagonalizing vectors in VT   
+/*              If right singular vectors desired in VT, copy result to
+                VT and generate right bidiagonalizing vectors in VT
                 (Workspace: need 4*N-1, prefer 3*N+(N-1)*NB) */
 
 		dlacpy_("U", n, n, &a[a_offset], lda, &vt[vt_offset], ldvt);
@@ -2405,8 +2404,8 @@ static doublereal c_b438 = 1.;
 	    }
 	    if (wntuo) {
 
-/*              If left singular vectors desired in A, generate left   
-                bidiagonalizing vectors in A   
+/*              If left singular vectors desired in A, generate left
+                bidiagonalizing vectors in A
                 (Workspace: need 4*N, prefer 3*N+N*NB) */
 
 		i__2 = *lwork - iwork + 1;
@@ -2415,8 +2414,8 @@ static doublereal c_b438 = 1.;
 	    }
 	    if (wntvo) {
 
-/*              If right singular vectors desired in A, generate right   
-                bidiagonalizing vectors in A   
+/*              If right singular vectors desired in A, generate right
+                bidiagonalizing vectors in A
                 (Workspace: need 4*N-1, prefer 3*N+(N-1)*NB) */
 
 		i__2 = *lwork - iwork + 1;
@@ -2438,9 +2437,9 @@ static doublereal c_b438 = 1.;
 	    }
 	    if (! wntuo && ! wntvo) {
 
-/*              Perform bidiagonal QR iteration, if desired, computing   
-                left singular vectors in U and computing right singular   
-                vectors in VT   
+/*              Perform bidiagonal QR iteration, if desired, computing
+                left singular vectors in U and computing right singular
+                vectors in VT
                 (Workspace: need BDSPAC) */
 
 		dbdsqr_("U", n, &ncvt, &nru, &c__0, &s[1], &work[ie], &vt[
@@ -2448,9 +2447,9 @@ static doublereal c_b438 = 1.;
 			work[iwork], info);
 	    } else if (! wntuo && wntvo) {
 
-/*              Perform bidiagonal QR iteration, if desired, computing   
-                left singular vectors in U and computing right singular   
-                vectors in A   
+/*              Perform bidiagonal QR iteration, if desired, computing
+                left singular vectors in U and computing right singular
+                vectors in A
                 (Workspace: need BDSPAC) */
 
 		dbdsqr_("U", n, &ncvt, &nru, &c__0, &s[1], &work[ie], &a[
@@ -2458,9 +2457,9 @@ static doublereal c_b438 = 1.;
 			iwork], info);
 	    } else {
 
-/*              Perform bidiagonal QR iteration, if desired, computing   
-                left singular vectors in A and computing right singular   
-                vectors in VT   
+/*              Perform bidiagonal QR iteration, if desired, computing
+                left singular vectors in A and computing right singular
+                vectors in VT
                 (Workspace: need BDSPAC) */
 
 		dbdsqr_("U", n, &ncvt, &nru, &c__0, &s[1], &work[ie], &vt[
@@ -2472,21 +2471,21 @@ static doublereal c_b438 = 1.;
 
     } else {
 
-/*        A has more columns than rows. If A has sufficiently more   
-          columns than rows, first reduce using the LQ decomposition (if   
+/*        A has more columns than rows. If A has sufficiently more
+          columns than rows, first reduce using the LQ decomposition (if
           sufficient workspace available) */
 
 	if (*n >= mnthr) {
 
 	    if (wntvn) {
 
-/*              Path 1t(N much larger than M, JOBVT='N')   
+/*              Path 1t(N much larger than M, JOBVT='N')
                 No right singular vectors to be computed */
 
 		itau = 1;
 		iwork = itau + *m;
 
-/*              Compute A=L*Q   
+/*              Compute A=L*Q
                 (Workspace: need 2*M, prefer M+M*NB) */
 
 		i__2 = *lwork - iwork + 1;
@@ -2497,14 +2496,14 @@ static doublereal c_b438 = 1.;
 
 		i__2 = *m - 1;
 		i__3 = *m - 1;
-		dlaset_("U", &i__2, &i__3, &c_b416, &c_b416, &a_ref(1, 2), 
+		dlaset_("U", &i__2, &i__3, &c_b416, &c_b416, &a_ref(1, 2),
 			lda);
 		ie = 1;
 		itauq = ie + *m;
 		itaup = itauq + *m;
 		iwork = itaup + *m;
 
-/*              Bidiagonalize L in A   
+/*              Bidiagonalize L in A
                 (Workspace: need 4*M, prefer 3*M+2*M*NB) */
 
 		i__2 = *lwork - iwork + 1;
@@ -2512,7 +2511,7 @@ static doublereal c_b438 = 1.;
 			itauq], &work[itaup], &work[iwork], &i__2, &ierr);
 		if (wntuo || wntuas) {
 
-/*                 If left singular vectors desired, generate Q   
+/*                 If left singular vectors desired, generate Q
                    (Workspace: need 4*M, prefer 3*M+M*NB) */
 
 		    i__2 = *lwork - iwork + 1;
@@ -2525,12 +2524,12 @@ static doublereal c_b438 = 1.;
 		    nru = *m;
 		}
 
-/*              Perform bidiagonal QR iteration, computing left singular   
-                vectors of A in A if desired   
+/*              Perform bidiagonal QR iteration, computing left singular
+                vectors of A in A if desired
                 (Workspace: need BDSPAC) */
 
 		dbdsqr_("U", m, &c__0, &nru, &c__0, &s[1], &work[ie], dum, &
-			c__1, &a[a_offset], lda, dum, &c__1, &work[iwork], 
+			c__1, &a[a_offset], lda, dum, &c__1, &work[iwork],
 			info);
 
 /*              If left singular vectors desired in U, copy them there */
@@ -2541,9 +2540,9 @@ static doublereal c_b438 = 1.;
 
 	    } else if (wntvo && wntun) {
 
-/*              Path 2t(N much larger than M, JOBU='N', JOBVT='O')   
-                M right singular vectors to be overwritten on A and   
-                no left singular vectors to be computed   
+/*              Path 2t(N much larger than M, JOBU='N', JOBVT='O')
+                M right singular vectors to be overwritten on A and
+                no left singular vectors to be computed
 
    Computing MAX */
 		i__2 = *m << 2;
@@ -2583,7 +2582,7 @@ static doublereal c_b438 = 1.;
 		    itau = ir + ldwrkr * *m;
 		    iwork = itau + *m;
 
-/*                 Compute A=L*Q   
+/*                 Compute A=L*Q
                    (Workspace: need M*M+2*M, prefer M*M+M+M*NB) */
 
 		    i__2 = *lwork - iwork + 1;
@@ -2595,10 +2594,10 @@ static doublereal c_b438 = 1.;
 		    dlacpy_("L", m, m, &a[a_offset], lda, &work[ir], &ldwrkr);
 		    i__2 = *m - 1;
 		    i__3 = *m - 1;
-		    dlaset_("U", &i__2, &i__3, &c_b416, &c_b416, &work[ir + 
+		    dlaset_("U", &i__2, &i__3, &c_b416, &c_b416, &work[ir +
 			    ldwrkr], &ldwrkr);
 
-/*                 Generate Q in A   
+/*                 Generate Q in A
                    (Workspace: need M*M+2*M, prefer M*M+M+M*NB) */
 
 		    i__2 = *lwork - iwork + 1;
@@ -2609,14 +2608,14 @@ static doublereal c_b438 = 1.;
 		    itaup = itauq + *m;
 		    iwork = itaup + *m;
 
-/*                 Bidiagonalize L in WORK(IR)   
+/*                 Bidiagonalize L in WORK(IR)
                    (Workspace: need M*M+4*M, prefer M*M+3*M+2*M*NB) */
 
 		    i__2 = *lwork - iwork + 1;
 		    dgebrd_(m, m, &work[ir], &ldwrkr, &s[1], &work[ie], &work[
 			    itauq], &work[itaup], &work[iwork], &i__2, &ierr);
 
-/*                 Generate right vectors bidiagonalizing L   
+/*                 Generate right vectors bidiagonalizing L
                    (Workspace: need M*M+4*M-1, prefer M*M+3*M+(M-1)*NB) */
 
 		    i__2 = *lwork - iwork + 1;
@@ -2624,8 +2623,8 @@ static doublereal c_b438 = 1.;
 			    work[iwork], &i__2, &ierr);
 		    iwork = ie + *m;
 
-/*                 Perform bidiagonal QR iteration, computing right   
-                   singular vectors of L in WORK(IR)   
+/*                 Perform bidiagonal QR iteration, computing right
+                   singular vectors of L in WORK(IR)
                    (Workspace: need M*M+BDSPAC) */
 
 		    dbdsqr_("U", m, m, &c__0, &c__0, &s[1], &work[ie], &work[
@@ -2633,8 +2632,8 @@ static doublereal c_b438 = 1.;
 			    , info);
 		    iu = ie + *m;
 
-/*                 Multiply right singular vectors of L in WORK(IR) by Q   
-                   in A, storing result in WORK(IU) and copying to A   
+/*                 Multiply right singular vectors of L in WORK(IR) by Q
+                   in A, storing result in WORK(IU) and copying to A
                    (Workspace: need M*M+2*M, prefer M*M+M*N+M) */
 
 		    i__2 = *n;
@@ -2647,7 +2646,7 @@ static doublereal c_b438 = 1.;
 			dgemm_("N", "N", m, &blk, m, &c_b438, &work[ir], &
 				ldwrkr, &a_ref(1, i__), lda, &c_b416, &work[
 				iu], &ldwrku);
-			dlacpy_("F", m, &blk, &work[iu], &ldwrku, &a_ref(1, 
+			dlacpy_("F", m, &blk, &work[iu], &ldwrku, &a_ref(1,
 				i__), lda);
 /* L30: */
 		    }
@@ -2661,14 +2660,14 @@ static doublereal c_b438 = 1.;
 		    itaup = itauq + *m;
 		    iwork = itaup + *m;
 
-/*                 Bidiagonalize A   
+/*                 Bidiagonalize A
                    (Workspace: need 3*M+N, prefer 3*M+(M+N)*NB) */
 
 		    i__3 = *lwork - iwork + 1;
 		    dgebrd_(m, n, &a[a_offset], lda, &s[1], &work[ie], &work[
 			    itauq], &work[itaup], &work[iwork], &i__3, &ierr);
 
-/*                 Generate right vectors bidiagonalizing A   
+/*                 Generate right vectors bidiagonalizing A
                    (Workspace: need 4*M, prefer 3*M+M*NB) */
 
 		    i__3 = *lwork - iwork + 1;
@@ -2676,8 +2675,8 @@ static doublereal c_b438 = 1.;
 			    work[iwork], &i__3, &ierr);
 		    iwork = ie + *m;
 
-/*                 Perform bidiagonal QR iteration, computing right   
-                   singular vectors of A in A   
+/*                 Perform bidiagonal QR iteration, computing right
+                   singular vectors of A in A
                    (Workspace: need BDSPAC) */
 
 		    dbdsqr_("L", m, n, &c__0, &c__0, &s[1], &work[ie], &a[
@@ -2688,9 +2687,9 @@ static doublereal c_b438 = 1.;
 
 	    } else if (wntvo && wntuas) {
 
-/*              Path 3t(N much larger than M, JOBU='S' or 'A', JOBVT='O')   
-                M right singular vectors to be overwritten on A and   
-                M left singular vectors to be computed in U   
+/*              Path 3t(N much larger than M, JOBU='S' or 'A', JOBVT='O')
+                M right singular vectors to be overwritten on A and
+                M left singular vectors to be computed in U
 
    Computing MAX */
 		i__3 = *m << 2;
@@ -2730,7 +2729,7 @@ static doublereal c_b438 = 1.;
 		    itau = ir + ldwrkr * *m;
 		    iwork = itau + *m;
 
-/*                 Compute A=L*Q   
+/*                 Compute A=L*Q
                    (Workspace: need M*M+2*M, prefer M*M+M+M*NB) */
 
 		    i__3 = *lwork - iwork + 1;
@@ -2745,7 +2744,7 @@ static doublereal c_b438 = 1.;
 		    dlaset_("U", &i__3, &i__2, &c_b416, &c_b416, &u_ref(1, 2),
 			     ldu);
 
-/*                 Generate Q in A   
+/*                 Generate Q in A
                    (Workspace: need M*M+2*M, prefer M*M+M+M*NB) */
 
 		    i__3 = *lwork - iwork + 1;
@@ -2756,7 +2755,7 @@ static doublereal c_b438 = 1.;
 		    itaup = itauq + *m;
 		    iwork = itaup + *m;
 
-/*                 Bidiagonalize L in U, copying result to WORK(IR)   
+/*                 Bidiagonalize L in U, copying result to WORK(IR)
                    (Workspace: need M*M+4*M, prefer M*M+3*M+2*M*NB) */
 
 		    i__3 = *lwork - iwork + 1;
@@ -2764,14 +2763,14 @@ static doublereal c_b438 = 1.;
 			    itauq], &work[itaup], &work[iwork], &i__3, &ierr);
 		    dlacpy_("U", m, m, &u[u_offset], ldu, &work[ir], &ldwrkr);
 
-/*                 Generate right vectors bidiagonalizing L in WORK(IR)   
+/*                 Generate right vectors bidiagonalizing L in WORK(IR)
                    (Workspace: need M*M+4*M-1, prefer M*M+3*M+(M-1)*NB) */
 
 		    i__3 = *lwork - iwork + 1;
 		    dorgbr_("P", m, m, m, &work[ir], &ldwrkr, &work[itaup], &
 			    work[iwork], &i__3, &ierr);
 
-/*                 Generate left vectors bidiagonalizing L in U   
+/*                 Generate left vectors bidiagonalizing L in U
                    (Workspace: need M*M+4*M, prefer M*M+3*M+M*NB) */
 
 		    i__3 = *lwork - iwork + 1;
@@ -2779,18 +2778,18 @@ static doublereal c_b438 = 1.;
 			    work[iwork], &i__3, &ierr);
 		    iwork = ie + *m;
 
-/*                 Perform bidiagonal QR iteration, computing left   
-                   singular vectors of L in U, and computing right   
-                   singular vectors of L in WORK(IR)   
+/*                 Perform bidiagonal QR iteration, computing left
+                   singular vectors of L in U, and computing right
+                   singular vectors of L in WORK(IR)
                    (Workspace: need M*M+BDSPAC) */
 
-		    dbdsqr_("U", m, m, m, &c__0, &s[1], &work[ie], &work[ir], 
+		    dbdsqr_("U", m, m, m, &c__0, &s[1], &work[ie], &work[ir],
 			    &ldwrkr, &u[u_offset], ldu, dum, &c__1, &work[
 			    iwork], info);
 		    iu = ie + *m;
 
-/*                 Multiply right singular vectors of L in WORK(IR) by Q   
-                   in A, storing result in WORK(IU) and copying to A   
+/*                 Multiply right singular vectors of L in WORK(IR) by Q
+                   in A, storing result in WORK(IU) and copying to A
                    (Workspace: need M*M+2*M, prefer M*M+M*N+M)) */
 
 		    i__3 = *n;
@@ -2803,7 +2802,7 @@ static doublereal c_b438 = 1.;
 			dgemm_("N", "N", m, &blk, m, &c_b438, &work[ir], &
 				ldwrkr, &a_ref(1, i__), lda, &c_b416, &work[
 				iu], &ldwrku);
-			dlacpy_("F", m, &blk, &work[iu], &ldwrku, &a_ref(1, 
+			dlacpy_("F", m, &blk, &work[iu], &ldwrku, &a_ref(1,
 				i__), lda);
 /* L40: */
 		    }
@@ -2815,7 +2814,7 @@ static doublereal c_b438 = 1.;
 		    itau = 1;
 		    iwork = itau + *m;
 
-/*                 Compute A=L*Q   
+/*                 Compute A=L*Q
                    (Workspace: need 2*M, prefer M+M*NB) */
 
 		    i__2 = *lwork - iwork + 1;
@@ -2830,7 +2829,7 @@ static doublereal c_b438 = 1.;
 		    dlaset_("U", &i__2, &i__3, &c_b416, &c_b416, &u_ref(1, 2),
 			     ldu);
 
-/*                 Generate Q in A   
+/*                 Generate Q in A
                    (Workspace: need 2*M, prefer M+M*NB) */
 
 		    i__2 = *lwork - iwork + 1;
@@ -2841,14 +2840,14 @@ static doublereal c_b438 = 1.;
 		    itaup = itauq + *m;
 		    iwork = itaup + *m;
 
-/*                 Bidiagonalize L in U   
+/*                 Bidiagonalize L in U
                    (Workspace: need 4*M, prefer 3*M+2*M*NB) */
 
 		    i__2 = *lwork - iwork + 1;
 		    dgebrd_(m, m, &u[u_offset], ldu, &s[1], &work[ie], &work[
 			    itauq], &work[itaup], &work[iwork], &i__2, &ierr);
 
-/*                 Multiply right vectors bidiagonalizing L by Q in A   
+/*                 Multiply right vectors bidiagonalizing L by Q in A
                    (Workspace: need 3*M+N, prefer 3*M+N*NB) */
 
 		    i__2 = *lwork - iwork + 1;
@@ -2856,7 +2855,7 @@ static doublereal c_b438 = 1.;
 			    itaup], &a[a_offset], lda, &work[iwork], &i__2, &
 			    ierr);
 
-/*                 Generate left vectors bidiagonalizing L in U   
+/*                 Generate left vectors bidiagonalizing L in U
                    (Workspace: need 4*M, prefer 3*M+M*NB) */
 
 		    i__2 = *lwork - iwork + 1;
@@ -2864,9 +2863,9 @@ static doublereal c_b438 = 1.;
 			    work[iwork], &i__2, &ierr);
 		    iwork = ie + *m;
 
-/*                 Perform bidiagonal QR iteration, computing left   
-                   singular vectors of A in U and computing right   
-                   singular vectors of A in A   
+/*                 Perform bidiagonal QR iteration, computing left
+                   singular vectors of A in U and computing right
+                   singular vectors of A in A
                    (Workspace: need BDSPAC) */
 
 		    dbdsqr_("U", m, n, m, &c__0, &s[1], &work[ie], &a[
@@ -2879,9 +2878,9 @@ static doublereal c_b438 = 1.;
 
 		if (wntun) {
 
-/*                 Path 4t(N much larger than M, JOBU='N', JOBVT='S')   
-                   M right singular vectors to be computed in VT and   
-                   no left singular vectors to be computed   
+/*                 Path 4t(N much larger than M, JOBU='N', JOBVT='S')
+                   M right singular vectors to be computed in VT and
+                   no left singular vectors to be computed
 
    Computing MAX */
 		    i__2 = *m << 2;
@@ -2904,7 +2903,7 @@ static doublereal c_b438 = 1.;
 			itau = ir + ldwrkr * *m;
 			iwork = itau + *m;
 
-/*                    Compute A=L*Q   
+/*                    Compute A=L*Q
                       (Workspace: need M*M+2*M, prefer M*M+M+M*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -2917,10 +2916,10 @@ static doublereal c_b438 = 1.;
 				ldwrkr);
 			i__2 = *m - 1;
 			i__3 = *m - 1;
-			dlaset_("U", &i__2, &i__3, &c_b416, &c_b416, &work[ir 
+			dlaset_("U", &i__2, &i__3, &c_b416, &c_b416, &work[ir
 				+ ldwrkr], &ldwrkr);
 
-/*                    Generate Q in A   
+/*                    Generate Q in A
                       (Workspace: need M*M+2*M, prefer M*M+M+M*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -2931,7 +2930,7 @@ static doublereal c_b438 = 1.;
 			itaup = itauq + *m;
 			iwork = itaup + *m;
 
-/*                    Bidiagonalize L in WORK(IR)   
+/*                    Bidiagonalize L in WORK(IR)
                       (Workspace: need M*M+4*M, prefer M*M+3*M+2*M*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -2939,8 +2938,8 @@ static doublereal c_b438 = 1.;
 				work[itauq], &work[itaup], &work[iwork], &
 				i__2, &ierr);
 
-/*                    Generate right vectors bidiagonalizing L in   
-                      WORK(IR)   
+/*                    Generate right vectors bidiagonalizing L in
+                      WORK(IR)
                       (Workspace: need M*M+4*M, prefer M*M+3*M+(M-1)*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -2948,20 +2947,20 @@ static doublereal c_b438 = 1.;
 				, &work[iwork], &i__2, &ierr);
 			iwork = ie + *m;
 
-/*                    Perform bidiagonal QR iteration, computing right   
-                      singular vectors of L in WORK(IR)   
+/*                    Perform bidiagonal QR iteration, computing right
+                      singular vectors of L in WORK(IR)
                       (Workspace: need M*M+BDSPAC) */
 
 			dbdsqr_("U", m, m, &c__0, &c__0, &s[1], &work[ie], &
 				work[ir], &ldwrkr, dum, &c__1, dum, &c__1, &
 				work[iwork], info);
 
-/*                    Multiply right singular vectors of L in WORK(IR) by   
-                      Q in A, storing result in VT   
+/*                    Multiply right singular vectors of L in WORK(IR) by
+                      Q in A, storing result in VT
                       (Workspace: need M*M) */
 
 			dgemm_("N", "N", m, n, m, &c_b438, &work[ir], &ldwrkr,
-				 &a[a_offset], lda, &c_b416, &vt[vt_offset], 
+				 &a[a_offset], lda, &c_b416, &vt[vt_offset],
 				ldvt);
 
 		    } else {
@@ -2971,7 +2970,7 @@ static doublereal c_b438 = 1.;
 			itau = 1;
 			iwork = itau + *m;
 
-/*                    Compute A=L*Q   
+/*                    Compute A=L*Q
                       (Workspace: need 2*M, prefer M+M*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -2980,10 +2979,10 @@ static doublereal c_b438 = 1.;
 
 /*                    Copy result to VT */
 
-			dlacpy_("U", m, n, &a[a_offset], lda, &vt[vt_offset], 
+			dlacpy_("U", m, n, &a[a_offset], lda, &vt[vt_offset],
 				ldvt);
 
-/*                    Generate Q in VT   
+/*                    Generate Q in VT
                       (Workspace: need 2*M, prefer M+M*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -3001,7 +3000,7 @@ static doublereal c_b438 = 1.;
 			dlaset_("U", &i__2, &i__3, &c_b416, &c_b416, &a_ref(1,
 				 2), lda);
 
-/*                    Bidiagonalize L in A   
+/*                    Bidiagonalize L in A
                       (Workspace: need 4*M, prefer 3*M+2*M*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -3009,7 +3008,7 @@ static doublereal c_b438 = 1.;
 				work[itauq], &work[itaup], &work[iwork], &
 				i__2, &ierr);
 
-/*                    Multiply right vectors bidiagonalizing L by Q in VT   
+/*                    Multiply right vectors bidiagonalizing L by Q in VT
                       (Workspace: need 3*M+N, prefer 3*M+N*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -3018,8 +3017,8 @@ static doublereal c_b438 = 1.;
 				iwork], &i__2, &ierr);
 			iwork = ie + *m;
 
-/*                    Perform bidiagonal QR iteration, computing right   
-                      singular vectors of A in VT   
+/*                    Perform bidiagonal QR iteration, computing right
+                      singular vectors of A in VT
                       (Workspace: need BDSPAC) */
 
 			dbdsqr_("U", m, n, &c__0, &c__0, &s[1], &work[ie], &
@@ -3030,9 +3029,9 @@ static doublereal c_b438 = 1.;
 
 		} else if (wntuo) {
 
-/*                 Path 5t(N much larger than M, JOBU='O', JOBVT='S')   
-                   M right singular vectors to be computed in VT and   
-                   M left singular vectors to be overwritten on A   
+/*                 Path 5t(N much larger than M, JOBU='O', JOBVT='S')
+                   M right singular vectors to be computed in VT and
+                   M left singular vectors to be overwritten on A
 
    Computing MAX */
 		    i__2 = *m << 2;
@@ -3066,7 +3065,7 @@ static doublereal c_b438 = 1.;
 			itau = ir + ldwrkr * *m;
 			iwork = itau + *m;
 
-/*                    Compute A=L*Q   
+/*                    Compute A=L*Q
                       (Workspace: need 2*M*M+2*M, prefer 2*M*M+M+M*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -3079,10 +3078,10 @@ static doublereal c_b438 = 1.;
 				ldwrku);
 			i__2 = *m - 1;
 			i__3 = *m - 1;
-			dlaset_("U", &i__2, &i__3, &c_b416, &c_b416, &work[iu 
+			dlaset_("U", &i__2, &i__3, &c_b416, &c_b416, &work[iu
 				+ ldwrku], &ldwrku);
 
-/*                    Generate Q in A   
+/*                    Generate Q in A
                       (Workspace: need 2*M*M+2*M, prefer 2*M*M+M+M*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -3093,9 +3092,9 @@ static doublereal c_b438 = 1.;
 			itaup = itauq + *m;
 			iwork = itaup + *m;
 
-/*                    Bidiagonalize L in WORK(IU), copying result to   
-                      WORK(IR)   
-                      (Workspace: need 2*M*M+4*M,   
+/*                    Bidiagonalize L in WORK(IU), copying result to
+                      WORK(IR)
+                      (Workspace: need 2*M*M+4*M,
                                   prefer 2*M*M+3*M+2*M*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -3105,15 +3104,15 @@ static doublereal c_b438 = 1.;
 			dlacpy_("L", m, m, &work[iu], &ldwrku, &work[ir], &
 				ldwrkr);
 
-/*                    Generate right bidiagonalizing vectors in WORK(IU)   
-                      (Workspace: need 2*M*M+4*M-1,   
+/*                    Generate right bidiagonalizing vectors in WORK(IU)
+                      (Workspace: need 2*M*M+4*M-1,
                                   prefer 2*M*M+3*M+(M-1)*NB) */
 
 			i__2 = *lwork - iwork + 1;
 			dorgbr_("P", m, m, m, &work[iu], &ldwrku, &work[itaup]
 				, &work[iwork], &i__2, &ierr);
 
-/*                    Generate left bidiagonalizing vectors in WORK(IR)   
+/*                    Generate left bidiagonalizing vectors in WORK(IR)
                       (Workspace: need 2*M*M+4*M, prefer 2*M*M+3*M+M*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -3121,27 +3120,27 @@ static doublereal c_b438 = 1.;
 				, &work[iwork], &i__2, &ierr);
 			iwork = ie + *m;
 
-/*                    Perform bidiagonal QR iteration, computing left   
-                      singular vectors of L in WORK(IR) and computing   
-                      right singular vectors of L in WORK(IU)   
+/*                    Perform bidiagonal QR iteration, computing left
+                      singular vectors of L in WORK(IR) and computing
+                      right singular vectors of L in WORK(IU)
                       (Workspace: need 2*M*M+BDSPAC) */
 
 			dbdsqr_("U", m, m, m, &c__0, &s[1], &work[ie], &work[
-				iu], &ldwrku, &work[ir], &ldwrkr, dum, &c__1, 
+				iu], &ldwrku, &work[ir], &ldwrkr, dum, &c__1,
 				&work[iwork], info);
 
-/*                    Multiply right singular vectors of L in WORK(IU) by   
-                      Q in A, storing result in VT   
+/*                    Multiply right singular vectors of L in WORK(IU) by
+                      Q in A, storing result in VT
                       (Workspace: need M*M) */
 
 			dgemm_("N", "N", m, n, m, &c_b438, &work[iu], &ldwrku,
-				 &a[a_offset], lda, &c_b416, &vt[vt_offset], 
+				 &a[a_offset], lda, &c_b416, &vt[vt_offset],
 				ldvt);
 
-/*                    Copy left singular vectors of L to A   
+/*                    Copy left singular vectors of L to A
                       (Workspace: need M*M) */
 
-			dlacpy_("F", m, m, &work[ir], &ldwrkr, &a[a_offset], 
+			dlacpy_("F", m, m, &work[ir], &ldwrkr, &a[a_offset],
 				lda);
 
 		    } else {
@@ -3151,16 +3150,16 @@ static doublereal c_b438 = 1.;
 			itau = 1;
 			iwork = itau + *m;
 
-/*                    Compute A=L*Q, copying result to VT   
+/*                    Compute A=L*Q, copying result to VT
                       (Workspace: need 2*M, prefer M+M*NB) */
 
 			i__2 = *lwork - iwork + 1;
 			dgelqf_(m, n, &a[a_offset], lda, &work[itau], &work[
 				iwork], &i__2, &ierr);
-			dlacpy_("U", m, n, &a[a_offset], lda, &vt[vt_offset], 
+			dlacpy_("U", m, n, &a[a_offset], lda, &vt[vt_offset],
 				ldvt);
 
-/*                    Generate Q in VT   
+/*                    Generate Q in VT
                       (Workspace: need 2*M, prefer M+M*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -3178,7 +3177,7 @@ static doublereal c_b438 = 1.;
 			dlaset_("U", &i__2, &i__3, &c_b416, &c_b416, &a_ref(1,
 				 2), lda);
 
-/*                    Bidiagonalize L in A   
+/*                    Bidiagonalize L in A
                       (Workspace: need 4*M, prefer 3*M+2*M*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -3186,7 +3185,7 @@ static doublereal c_b438 = 1.;
 				work[itauq], &work[itaup], &work[iwork], &
 				i__2, &ierr);
 
-/*                    Multiply right vectors bidiagonalizing L by Q in VT   
+/*                    Multiply right vectors bidiagonalizing L by Q in VT
                       (Workspace: need 3*M+N, prefer 3*M+N*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -3194,7 +3193,7 @@ static doublereal c_b438 = 1.;
 				work[itaup], &vt[vt_offset], ldvt, &work[
 				iwork], &i__2, &ierr);
 
-/*                    Generate left bidiagonalizing vectors of L in A   
+/*                    Generate left bidiagonalizing vectors of L in A
                       (Workspace: need 4*M, prefer 3*M+M*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -3202,9 +3201,9 @@ static doublereal c_b438 = 1.;
 				 &work[iwork], &i__2, &ierr);
 			iwork = ie + *m;
 
-/*                    Perform bidiagonal QR iteration, compute left   
-                      singular vectors of A in A and compute right   
-                      singular vectors of A in VT   
+/*                    Perform bidiagonal QR iteration, compute left
+                      singular vectors of A in A and compute right
+                      singular vectors of A in VT
                       (Workspace: need BDSPAC) */
 
 			dbdsqr_("U", m, n, m, &c__0, &s[1], &work[ie], &vt[
@@ -3215,10 +3214,10 @@ static doublereal c_b438 = 1.;
 
 		} else if (wntuas) {
 
-/*                 Path 6t(N much larger than M, JOBU='S' or 'A',   
-                           JOBVT='S')   
-                   M right singular vectors to be computed in VT and   
-                   M left singular vectors to be computed in U   
+/*                 Path 6t(N much larger than M, JOBU='S' or 'A',
+                           JOBVT='S')
+                   M right singular vectors to be computed in VT and
+                   M left singular vectors to be computed in U
 
    Computing MAX */
 		    i__2 = *m << 2;
@@ -3241,7 +3240,7 @@ static doublereal c_b438 = 1.;
 			itau = iu + ldwrku * *m;
 			iwork = itau + *m;
 
-/*                    Compute A=L*Q   
+/*                    Compute A=L*Q
                       (Workspace: need M*M+2*M, prefer M*M+M+M*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -3254,10 +3253,10 @@ static doublereal c_b438 = 1.;
 				ldwrku);
 			i__2 = *m - 1;
 			i__3 = *m - 1;
-			dlaset_("U", &i__2, &i__3, &c_b416, &c_b416, &work[iu 
+			dlaset_("U", &i__2, &i__3, &c_b416, &c_b416, &work[iu
 				+ ldwrku], &ldwrku);
 
-/*                    Generate Q in A   
+/*                    Generate Q in A
                       (Workspace: need M*M+2*M, prefer M*M+M+M*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -3268,25 +3267,25 @@ static doublereal c_b438 = 1.;
 			itaup = itauq + *m;
 			iwork = itaup + *m;
 
-/*                    Bidiagonalize L in WORK(IU), copying result to U   
+/*                    Bidiagonalize L in WORK(IU), copying result to U
                       (Workspace: need M*M+4*M, prefer M*M+3*M+2*M*NB) */
 
 			i__2 = *lwork - iwork + 1;
 			dgebrd_(m, m, &work[iu], &ldwrku, &s[1], &work[ie], &
 				work[itauq], &work[itaup], &work[iwork], &
 				i__2, &ierr);
-			dlacpy_("L", m, m, &work[iu], &ldwrku, &u[u_offset], 
+			dlacpy_("L", m, m, &work[iu], &ldwrku, &u[u_offset],
 				ldu);
 
-/*                    Generate right bidiagonalizing vectors in WORK(IU)   
-                      (Workspace: need M*M+4*M-1,   
+/*                    Generate right bidiagonalizing vectors in WORK(IU)
+                      (Workspace: need M*M+4*M-1,
                                   prefer M*M+3*M+(M-1)*NB) */
 
 			i__2 = *lwork - iwork + 1;
 			dorgbr_("P", m, m, m, &work[iu], &ldwrku, &work[itaup]
 				, &work[iwork], &i__2, &ierr);
 
-/*                    Generate left bidiagonalizing vectors in U   
+/*                    Generate left bidiagonalizing vectors in U
                       (Workspace: need M*M+4*M, prefer M*M+3*M+M*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -3294,21 +3293,21 @@ static doublereal c_b438 = 1.;
 				 &work[iwork], &i__2, &ierr);
 			iwork = ie + *m;
 
-/*                    Perform bidiagonal QR iteration, computing left   
-                      singular vectors of L in U and computing right   
-                      singular vectors of L in WORK(IU)   
+/*                    Perform bidiagonal QR iteration, computing left
+                      singular vectors of L in U and computing right
+                      singular vectors of L in WORK(IU)
                       (Workspace: need M*M+BDSPAC) */
 
 			dbdsqr_("U", m, m, m, &c__0, &s[1], &work[ie], &work[
 				iu], &ldwrku, &u[u_offset], ldu, dum, &c__1, &
 				work[iwork], info);
 
-/*                    Multiply right singular vectors of L in WORK(IU) by   
-                      Q in A, storing result in VT   
+/*                    Multiply right singular vectors of L in WORK(IU) by
+                      Q in A, storing result in VT
                       (Workspace: need M*M) */
 
 			dgemm_("N", "N", m, n, m, &c_b438, &work[iu], &ldwrku,
-				 &a[a_offset], lda, &c_b416, &vt[vt_offset], 
+				 &a[a_offset], lda, &c_b416, &vt[vt_offset],
 				ldvt);
 
 		    } else {
@@ -3318,16 +3317,16 @@ static doublereal c_b438 = 1.;
 			itau = 1;
 			iwork = itau + *m;
 
-/*                    Compute A=L*Q, copying result to VT   
+/*                    Compute A=L*Q, copying result to VT
                       (Workspace: need 2*M, prefer M+M*NB) */
 
 			i__2 = *lwork - iwork + 1;
 			dgelqf_(m, n, &a[a_offset], lda, &work[itau], &work[
 				iwork], &i__2, &ierr);
-			dlacpy_("U", m, n, &a[a_offset], lda, &vt[vt_offset], 
+			dlacpy_("U", m, n, &a[a_offset], lda, &vt[vt_offset],
 				ldvt);
 
-/*                    Generate Q in VT   
+/*                    Generate Q in VT
                       (Workspace: need 2*M, prefer M+M*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -3336,7 +3335,7 @@ static doublereal c_b438 = 1.;
 
 /*                    Copy L to U, zeroing out above it */
 
-			dlacpy_("L", m, m, &a[a_offset], lda, &u[u_offset], 
+			dlacpy_("L", m, m, &a[a_offset], lda, &u[u_offset],
 				ldu);
 			i__2 = *m - 1;
 			i__3 = *m - 1;
@@ -3347,7 +3346,7 @@ static doublereal c_b438 = 1.;
 			itaup = itauq + *m;
 			iwork = itaup + *m;
 
-/*                    Bidiagonalize L in U   
+/*                    Bidiagonalize L in U
                       (Workspace: need 4*M, prefer 3*M+2*M*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -3355,8 +3354,8 @@ static doublereal c_b438 = 1.;
 				work[itauq], &work[itaup], &work[iwork], &
 				i__2, &ierr);
 
-/*                    Multiply right bidiagonalizing vectors in U by Q   
-                      in VT   
+/*                    Multiply right bidiagonalizing vectors in U by Q
+                      in VT
                       (Workspace: need 3*M+N, prefer 3*M+N*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -3364,7 +3363,7 @@ static doublereal c_b438 = 1.;
 				work[itaup], &vt[vt_offset], ldvt, &work[
 				iwork], &i__2, &ierr);
 
-/*                    Generate left bidiagonalizing vectors in U   
+/*                    Generate left bidiagonalizing vectors in U
                       (Workspace: need 4*M, prefer 3*M+M*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -3372,9 +3371,9 @@ static doublereal c_b438 = 1.;
 				 &work[iwork], &i__2, &ierr);
 			iwork = ie + *m;
 
-/*                    Perform bidiagonal QR iteration, computing left   
-                      singular vectors of A in U and computing right   
-                      singular vectors of A in VT   
+/*                    Perform bidiagonal QR iteration, computing left
+                      singular vectors of A in U and computing right
+                      singular vectors of A in VT
                       (Workspace: need BDSPAC) */
 
 			dbdsqr_("U", m, n, m, &c__0, &s[1], &work[ie], &vt[
@@ -3389,9 +3388,9 @@ static doublereal c_b438 = 1.;
 
 		if (wntun) {
 
-/*                 Path 7t(N much larger than M, JOBU='N', JOBVT='A')   
-                   N right singular vectors to be computed in VT and   
-                   no left singular vectors to be computed   
+/*                 Path 7t(N much larger than M, JOBU='N', JOBVT='A')
+                   N right singular vectors to be computed in VT and
+                   no left singular vectors to be computed
 
    Computing MAX */
 		    i__2 = *n + *m, i__3 = *m << 2, i__2 = max(i__2,i__3);
@@ -3414,13 +3413,13 @@ static doublereal c_b438 = 1.;
 			itau = ir + ldwrkr * *m;
 			iwork = itau + *m;
 
-/*                    Compute A=L*Q, copying result to VT   
+/*                    Compute A=L*Q, copying result to VT
                       (Workspace: need M*M+2*M, prefer M*M+M+M*NB) */
 
 			i__2 = *lwork - iwork + 1;
 			dgelqf_(m, n, &a[a_offset], lda, &work[itau], &work[
 				iwork], &i__2, &ierr);
-			dlacpy_("U", m, n, &a[a_offset], lda, &vt[vt_offset], 
+			dlacpy_("U", m, n, &a[a_offset], lda, &vt[vt_offset],
 				ldvt);
 
 /*                    Copy L to WORK(IR), zeroing out above it */
@@ -3429,10 +3428,10 @@ static doublereal c_b438 = 1.;
 				ldwrkr);
 			i__2 = *m - 1;
 			i__3 = *m - 1;
-			dlaset_("U", &i__2, &i__3, &c_b416, &c_b416, &work[ir 
+			dlaset_("U", &i__2, &i__3, &c_b416, &c_b416, &work[ir
 				+ ldwrkr], &ldwrkr);
 
-/*                    Generate Q in VT   
+/*                    Generate Q in VT
                       (Workspace: need M*M+M+N, prefer M*M+M+N*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -3443,7 +3442,7 @@ static doublereal c_b438 = 1.;
 			itaup = itauq + *m;
 			iwork = itaup + *m;
 
-/*                    Bidiagonalize L in WORK(IR)   
+/*                    Bidiagonalize L in WORK(IR)
                       (Workspace: need M*M+4*M, prefer M*M+3*M+2*M*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -3451,8 +3450,8 @@ static doublereal c_b438 = 1.;
 				work[itauq], &work[itaup], &work[iwork], &
 				i__2, &ierr);
 
-/*                    Generate right bidiagonalizing vectors in WORK(IR)   
-                      (Workspace: need M*M+4*M-1,   
+/*                    Generate right bidiagonalizing vectors in WORK(IR)
+                      (Workspace: need M*M+4*M-1,
                                   prefer M*M+3*M+(M-1)*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -3460,25 +3459,25 @@ static doublereal c_b438 = 1.;
 				, &work[iwork], &i__2, &ierr);
 			iwork = ie + *m;
 
-/*                    Perform bidiagonal QR iteration, computing right   
-                      singular vectors of L in WORK(IR)   
+/*                    Perform bidiagonal QR iteration, computing right
+                      singular vectors of L in WORK(IR)
                       (Workspace: need M*M+BDSPAC) */
 
 			dbdsqr_("U", m, m, &c__0, &c__0, &s[1], &work[ie], &
 				work[ir], &ldwrkr, dum, &c__1, dum, &c__1, &
 				work[iwork], info);
 
-/*                    Multiply right singular vectors of L in WORK(IR) by   
-                      Q in VT, storing result in A   
+/*                    Multiply right singular vectors of L in WORK(IR) by
+                      Q in VT, storing result in A
                       (Workspace: need M*M) */
 
 			dgemm_("N", "N", m, n, m, &c_b438, &work[ir], &ldwrkr,
-				 &vt[vt_offset], ldvt, &c_b416, &a[a_offset], 
+				 &vt[vt_offset], ldvt, &c_b416, &a[a_offset],
 				lda);
 
 /*                    Copy right singular vectors of A from A to VT */
 
-			dlacpy_("F", m, n, &a[a_offset], lda, &vt[vt_offset], 
+			dlacpy_("F", m, n, &a[a_offset], lda, &vt[vt_offset],
 				ldvt);
 
 		    } else {
@@ -3488,16 +3487,16 @@ static doublereal c_b438 = 1.;
 			itau = 1;
 			iwork = itau + *m;
 
-/*                    Compute A=L*Q, copying result to VT   
+/*                    Compute A=L*Q, copying result to VT
                       (Workspace: need 2*M, prefer M+M*NB) */
 
 			i__2 = *lwork - iwork + 1;
 			dgelqf_(m, n, &a[a_offset], lda, &work[itau], &work[
 				iwork], &i__2, &ierr);
-			dlacpy_("U", m, n, &a[a_offset], lda, &vt[vt_offset], 
+			dlacpy_("U", m, n, &a[a_offset], lda, &vt[vt_offset],
 				ldvt);
 
-/*                    Generate Q in VT   
+/*                    Generate Q in VT
                       (Workspace: need M+N, prefer M+N*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -3515,7 +3514,7 @@ static doublereal c_b438 = 1.;
 			dlaset_("U", &i__2, &i__3, &c_b416, &c_b416, &a_ref(1,
 				 2), lda);
 
-/*                    Bidiagonalize L in A   
+/*                    Bidiagonalize L in A
                       (Workspace: need 4*M, prefer 3*M+2*M*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -3523,8 +3522,8 @@ static doublereal c_b438 = 1.;
 				work[itauq], &work[itaup], &work[iwork], &
 				i__2, &ierr);
 
-/*                    Multiply right bidiagonalizing vectors in A by Q   
-                      in VT   
+/*                    Multiply right bidiagonalizing vectors in A by Q
+                      in VT
                       (Workspace: need 3*M+N, prefer 3*M+N*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -3533,8 +3532,8 @@ static doublereal c_b438 = 1.;
 				iwork], &i__2, &ierr);
 			iwork = ie + *m;
 
-/*                    Perform bidiagonal QR iteration, computing right   
-                      singular vectors of A in VT   
+/*                    Perform bidiagonal QR iteration, computing right
+                      singular vectors of A in VT
                       (Workspace: need BDSPAC) */
 
 			dbdsqr_("U", m, n, &c__0, &c__0, &s[1], &work[ie], &
@@ -3545,9 +3544,9 @@ static doublereal c_b438 = 1.;
 
 		} else if (wntuo) {
 
-/*                 Path 8t(N much larger than M, JOBU='O', JOBVT='A')   
-                   N right singular vectors to be computed in VT and   
-                   M left singular vectors to be overwritten on A   
+/*                 Path 8t(N much larger than M, JOBU='O', JOBVT='A')
+                   N right singular vectors to be computed in VT and
+                   M left singular vectors to be overwritten on A
 
    Computing MAX */
 		    i__2 = *n + *m, i__3 = *m << 2, i__2 = max(i__2,i__3);
@@ -3581,16 +3580,16 @@ static doublereal c_b438 = 1.;
 			itau = ir + ldwrkr * *m;
 			iwork = itau + *m;
 
-/*                    Compute A=L*Q, copying result to VT   
+/*                    Compute A=L*Q, copying result to VT
                       (Workspace: need 2*M*M+2*M, prefer 2*M*M+M+M*NB) */
 
 			i__2 = *lwork - iwork + 1;
 			dgelqf_(m, n, &a[a_offset], lda, &work[itau], &work[
 				iwork], &i__2, &ierr);
-			dlacpy_("U", m, n, &a[a_offset], lda, &vt[vt_offset], 
+			dlacpy_("U", m, n, &a[a_offset], lda, &vt[vt_offset],
 				ldvt);
 
-/*                    Generate Q in VT   
+/*                    Generate Q in VT
                       (Workspace: need 2*M*M+M+N, prefer 2*M*M+M+N*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -3603,16 +3602,16 @@ static doublereal c_b438 = 1.;
 				ldwrku);
 			i__2 = *m - 1;
 			i__3 = *m - 1;
-			dlaset_("U", &i__2, &i__3, &c_b416, &c_b416, &work[iu 
+			dlaset_("U", &i__2, &i__3, &c_b416, &c_b416, &work[iu
 				+ ldwrku], &ldwrku);
 			ie = itau;
 			itauq = ie + *m;
 			itaup = itauq + *m;
 			iwork = itaup + *m;
 
-/*                    Bidiagonalize L in WORK(IU), copying result to   
-                      WORK(IR)   
-                      (Workspace: need 2*M*M+4*M,   
+/*                    Bidiagonalize L in WORK(IU), copying result to
+                      WORK(IR)
+                      (Workspace: need 2*M*M+4*M,
                                   prefer 2*M*M+3*M+2*M*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -3622,15 +3621,15 @@ static doublereal c_b438 = 1.;
 			dlacpy_("L", m, m, &work[iu], &ldwrku, &work[ir], &
 				ldwrkr);
 
-/*                    Generate right bidiagonalizing vectors in WORK(IU)   
-                      (Workspace: need 2*M*M+4*M-1,   
+/*                    Generate right bidiagonalizing vectors in WORK(IU)
+                      (Workspace: need 2*M*M+4*M-1,
                                   prefer 2*M*M+3*M+(M-1)*NB) */
 
 			i__2 = *lwork - iwork + 1;
 			dorgbr_("P", m, m, m, &work[iu], &ldwrku, &work[itaup]
 				, &work[iwork], &i__2, &ierr);
 
-/*                    Generate left bidiagonalizing vectors in WORK(IR)   
+/*                    Generate left bidiagonalizing vectors in WORK(IR)
                       (Workspace: need 2*M*M+4*M, prefer 2*M*M+3*M+M*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -3638,31 +3637,31 @@ static doublereal c_b438 = 1.;
 				, &work[iwork], &i__2, &ierr);
 			iwork = ie + *m;
 
-/*                    Perform bidiagonal QR iteration, computing left   
-                      singular vectors of L in WORK(IR) and computing   
-                      right singular vectors of L in WORK(IU)   
+/*                    Perform bidiagonal QR iteration, computing left
+                      singular vectors of L in WORK(IR) and computing
+                      right singular vectors of L in WORK(IU)
                       (Workspace: need 2*M*M+BDSPAC) */
 
 			dbdsqr_("U", m, m, m, &c__0, &s[1], &work[ie], &work[
-				iu], &ldwrku, &work[ir], &ldwrkr, dum, &c__1, 
+				iu], &ldwrku, &work[ir], &ldwrkr, dum, &c__1,
 				&work[iwork], info);
 
-/*                    Multiply right singular vectors of L in WORK(IU) by   
-                      Q in VT, storing result in A   
+/*                    Multiply right singular vectors of L in WORK(IU) by
+                      Q in VT, storing result in A
                       (Workspace: need M*M) */
 
 			dgemm_("N", "N", m, n, m, &c_b438, &work[iu], &ldwrku,
-				 &vt[vt_offset], ldvt, &c_b416, &a[a_offset], 
+				 &vt[vt_offset], ldvt, &c_b416, &a[a_offset],
 				lda);
 
 /*                    Copy right singular vectors of A from A to VT */
 
-			dlacpy_("F", m, n, &a[a_offset], lda, &vt[vt_offset], 
+			dlacpy_("F", m, n, &a[a_offset], lda, &vt[vt_offset],
 				ldvt);
 
 /*                    Copy left singular vectors of A from WORK(IR) to A */
 
-			dlacpy_("F", m, m, &work[ir], &ldwrkr, &a[a_offset], 
+			dlacpy_("F", m, m, &work[ir], &ldwrkr, &a[a_offset],
 				lda);
 
 		    } else {
@@ -3672,16 +3671,16 @@ static doublereal c_b438 = 1.;
 			itau = 1;
 			iwork = itau + *m;
 
-/*                    Compute A=L*Q, copying result to VT   
+/*                    Compute A=L*Q, copying result to VT
                       (Workspace: need 2*M, prefer M+M*NB) */
 
 			i__2 = *lwork - iwork + 1;
 			dgelqf_(m, n, &a[a_offset], lda, &work[itau], &work[
 				iwork], &i__2, &ierr);
-			dlacpy_("U", m, n, &a[a_offset], lda, &vt[vt_offset], 
+			dlacpy_("U", m, n, &a[a_offset], lda, &vt[vt_offset],
 				ldvt);
 
-/*                    Generate Q in VT   
+/*                    Generate Q in VT
                       (Workspace: need M+N, prefer M+N*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -3699,7 +3698,7 @@ static doublereal c_b438 = 1.;
 			dlaset_("U", &i__2, &i__3, &c_b416, &c_b416, &a_ref(1,
 				 2), lda);
 
-/*                    Bidiagonalize L in A   
+/*                    Bidiagonalize L in A
                       (Workspace: need 4*M, prefer 3*M+2*M*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -3707,8 +3706,8 @@ static doublereal c_b438 = 1.;
 				work[itauq], &work[itaup], &work[iwork], &
 				i__2, &ierr);
 
-/*                    Multiply right bidiagonalizing vectors in A by Q   
-                      in VT   
+/*                    Multiply right bidiagonalizing vectors in A by Q
+                      in VT
                       (Workspace: need 3*M+N, prefer 3*M+N*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -3716,7 +3715,7 @@ static doublereal c_b438 = 1.;
 				work[itaup], &vt[vt_offset], ldvt, &work[
 				iwork], &i__2, &ierr);
 
-/*                    Generate left bidiagonalizing vectors in A   
+/*                    Generate left bidiagonalizing vectors in A
                       (Workspace: need 4*M, prefer 3*M+M*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -3724,9 +3723,9 @@ static doublereal c_b438 = 1.;
 				 &work[iwork], &i__2, &ierr);
 			iwork = ie + *m;
 
-/*                    Perform bidiagonal QR iteration, computing left   
-                      singular vectors of A in A and computing right   
-                      singular vectors of A in VT   
+/*                    Perform bidiagonal QR iteration, computing left
+                      singular vectors of A in A and computing right
+                      singular vectors of A in VT
                       (Workspace: need BDSPAC) */
 
 			dbdsqr_("U", m, n, m, &c__0, &s[1], &work[ie], &vt[
@@ -3737,10 +3736,10 @@ static doublereal c_b438 = 1.;
 
 		} else if (wntuas) {
 
-/*                 Path 9t(N much larger than M, JOBU='S' or 'A',   
-                           JOBVT='A')   
-                   N right singular vectors to be computed in VT and   
-                   M left singular vectors to be computed in U   
+/*                 Path 9t(N much larger than M, JOBU='S' or 'A',
+                           JOBVT='A')
+                   N right singular vectors to be computed in VT and
+                   M left singular vectors to be computed in U
 
    Computing MAX */
 		    i__2 = *n + *m, i__3 = *m << 2, i__2 = max(i__2,i__3);
@@ -3763,16 +3762,16 @@ static doublereal c_b438 = 1.;
 			itau = iu + ldwrku * *m;
 			iwork = itau + *m;
 
-/*                    Compute A=L*Q, copying result to VT   
+/*                    Compute A=L*Q, copying result to VT
                       (Workspace: need M*M+2*M, prefer M*M+M+M*NB) */
 
 			i__2 = *lwork - iwork + 1;
 			dgelqf_(m, n, &a[a_offset], lda, &work[itau], &work[
 				iwork], &i__2, &ierr);
-			dlacpy_("U", m, n, &a[a_offset], lda, &vt[vt_offset], 
+			dlacpy_("U", m, n, &a[a_offset], lda, &vt[vt_offset],
 				ldvt);
 
-/*                    Generate Q in VT   
+/*                    Generate Q in VT
                       (Workspace: need M*M+M+N, prefer M*M+M+N*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -3785,31 +3784,31 @@ static doublereal c_b438 = 1.;
 				ldwrku);
 			i__2 = *m - 1;
 			i__3 = *m - 1;
-			dlaset_("U", &i__2, &i__3, &c_b416, &c_b416, &work[iu 
+			dlaset_("U", &i__2, &i__3, &c_b416, &c_b416, &work[iu
 				+ ldwrku], &ldwrku);
 			ie = itau;
 			itauq = ie + *m;
 			itaup = itauq + *m;
 			iwork = itaup + *m;
 
-/*                    Bidiagonalize L in WORK(IU), copying result to U   
+/*                    Bidiagonalize L in WORK(IU), copying result to U
                       (Workspace: need M*M+4*M, prefer M*M+3*M+2*M*NB) */
 
 			i__2 = *lwork - iwork + 1;
 			dgebrd_(m, m, &work[iu], &ldwrku, &s[1], &work[ie], &
 				work[itauq], &work[itaup], &work[iwork], &
 				i__2, &ierr);
-			dlacpy_("L", m, m, &work[iu], &ldwrku, &u[u_offset], 
+			dlacpy_("L", m, m, &work[iu], &ldwrku, &u[u_offset],
 				ldu);
 
-/*                    Generate right bidiagonalizing vectors in WORK(IU)   
+/*                    Generate right bidiagonalizing vectors in WORK(IU)
                       (Workspace: need M*M+4*M, prefer M*M+3*M+(M-1)*NB) */
 
 			i__2 = *lwork - iwork + 1;
 			dorgbr_("P", m, m, m, &work[iu], &ldwrku, &work[itaup]
 				, &work[iwork], &i__2, &ierr);
 
-/*                    Generate left bidiagonalizing vectors in U   
+/*                    Generate left bidiagonalizing vectors in U
                       (Workspace: need M*M+4*M, prefer M*M+3*M+M*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -3817,26 +3816,26 @@ static doublereal c_b438 = 1.;
 				 &work[iwork], &i__2, &ierr);
 			iwork = ie + *m;
 
-/*                    Perform bidiagonal QR iteration, computing left   
-                      singular vectors of L in U and computing right   
-                      singular vectors of L in WORK(IU)   
+/*                    Perform bidiagonal QR iteration, computing left
+                      singular vectors of L in U and computing right
+                      singular vectors of L in WORK(IU)
                       (Workspace: need M*M+BDSPAC) */
 
 			dbdsqr_("U", m, m, m, &c__0, &s[1], &work[ie], &work[
 				iu], &ldwrku, &u[u_offset], ldu, dum, &c__1, &
 				work[iwork], info);
 
-/*                    Multiply right singular vectors of L in WORK(IU) by   
-                      Q in VT, storing result in A   
+/*                    Multiply right singular vectors of L in WORK(IU) by
+                      Q in VT, storing result in A
                       (Workspace: need M*M) */
 
 			dgemm_("N", "N", m, n, m, &c_b438, &work[iu], &ldwrku,
-				 &vt[vt_offset], ldvt, &c_b416, &a[a_offset], 
+				 &vt[vt_offset], ldvt, &c_b416, &a[a_offset],
 				lda);
 
 /*                    Copy right singular vectors of A from A to VT */
 
-			dlacpy_("F", m, n, &a[a_offset], lda, &vt[vt_offset], 
+			dlacpy_("F", m, n, &a[a_offset], lda, &vt[vt_offset],
 				ldvt);
 
 		    } else {
@@ -3846,16 +3845,16 @@ static doublereal c_b438 = 1.;
 			itau = 1;
 			iwork = itau + *m;
 
-/*                    Compute A=L*Q, copying result to VT   
+/*                    Compute A=L*Q, copying result to VT
                       (Workspace: need 2*M, prefer M+M*NB) */
 
 			i__2 = *lwork - iwork + 1;
 			dgelqf_(m, n, &a[a_offset], lda, &work[itau], &work[
 				iwork], &i__2, &ierr);
-			dlacpy_("U", m, n, &a[a_offset], lda, &vt[vt_offset], 
+			dlacpy_("U", m, n, &a[a_offset], lda, &vt[vt_offset],
 				ldvt);
 
-/*                    Generate Q in VT   
+/*                    Generate Q in VT
                       (Workspace: need M+N, prefer M+N*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -3864,7 +3863,7 @@ static doublereal c_b438 = 1.;
 
 /*                    Copy L to U, zeroing out above it */
 
-			dlacpy_("L", m, m, &a[a_offset], lda, &u[u_offset], 
+			dlacpy_("L", m, m, &a[a_offset], lda, &u[u_offset],
 				ldu);
 			i__2 = *m - 1;
 			i__3 = *m - 1;
@@ -3875,7 +3874,7 @@ static doublereal c_b438 = 1.;
 			itaup = itauq + *m;
 			iwork = itaup + *m;
 
-/*                    Bidiagonalize L in U   
+/*                    Bidiagonalize L in U
                       (Workspace: need 4*M, prefer 3*M+2*M*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -3883,8 +3882,8 @@ static doublereal c_b438 = 1.;
 				work[itauq], &work[itaup], &work[iwork], &
 				i__2, &ierr);
 
-/*                    Multiply right bidiagonalizing vectors in U by Q   
-                      in VT   
+/*                    Multiply right bidiagonalizing vectors in U by Q
+                      in VT
                       (Workspace: need 3*M+N, prefer 3*M+N*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -3892,7 +3891,7 @@ static doublereal c_b438 = 1.;
 				work[itaup], &vt[vt_offset], ldvt, &work[
 				iwork], &i__2, &ierr);
 
-/*                    Generate left bidiagonalizing vectors in U   
+/*                    Generate left bidiagonalizing vectors in U
                       (Workspace: need 4*M, prefer 3*M+M*NB) */
 
 			i__2 = *lwork - iwork + 1;
@@ -3900,9 +3899,9 @@ static doublereal c_b438 = 1.;
 				 &work[iwork], &i__2, &ierr);
 			iwork = ie + *m;
 
-/*                    Perform bidiagonal QR iteration, computing left   
-                      singular vectors of A in U and computing right   
-                      singular vectors of A in VT   
+/*                    Perform bidiagonal QR iteration, computing left
+                      singular vectors of A in U and computing right
+                      singular vectors of A in VT
                       (Workspace: need BDSPAC) */
 
 			dbdsqr_("U", m, n, m, &c__0, &s[1], &work[ie], &vt[
@@ -3917,9 +3916,9 @@ static doublereal c_b438 = 1.;
 
 	} else {
 
-/*           N .LT. MNTHR   
+/*           N .LT. MNTHR
 
-             Path 10t(N greater than M, but not much larger)   
+             Path 10t(N greater than M, but not much larger)
              Reduce to bidiagonal form without LQ decomposition */
 
 	    ie = 1;
@@ -3927,7 +3926,7 @@ static doublereal c_b438 = 1.;
 	    itaup = itauq + *m;
 	    iwork = itaup + *m;
 
-/*           Bidiagonalize A   
+/*           Bidiagonalize A
              (Workspace: need 3*M+N, prefer 3*M+(M+N)*NB) */
 
 	    i__2 = *lwork - iwork + 1;
@@ -3935,8 +3934,8 @@ static doublereal c_b438 = 1.;
 		    work[itaup], &work[iwork], &i__2, &ierr);
 	    if (wntuas) {
 
-/*              If left singular vectors desired in U, copy result to U   
-                and generate left bidiagonalizing vectors in U   
+/*              If left singular vectors desired in U, copy result to U
+                and generate left bidiagonalizing vectors in U
                 (Workspace: need 4*M-1, prefer 3*M+(M-1)*NB) */
 
 		dlacpy_("L", m, m, &a[a_offset], lda, &u[u_offset], ldu);
@@ -3946,8 +3945,8 @@ static doublereal c_b438 = 1.;
 	    }
 	    if (wntvas) {
 
-/*              If right singular vectors desired in VT, copy result to   
-                VT and generate right bidiagonalizing vectors in VT   
+/*              If right singular vectors desired in VT, copy result to
+                VT and generate right bidiagonalizing vectors in VT
                 (Workspace: need 3*M+NRVT, prefer 3*M+NRVT*NB) */
 
 		dlacpy_("U", m, n, &a[a_offset], lda, &vt[vt_offset], ldvt);
@@ -3958,13 +3957,13 @@ static doublereal c_b438 = 1.;
 		    nrvt = *m;
 		}
 		i__2 = *lwork - iwork + 1;
-		dorgbr_("P", &nrvt, n, m, &vt[vt_offset], ldvt, &work[itaup], 
+		dorgbr_("P", &nrvt, n, m, &vt[vt_offset], ldvt, &work[itaup],
 			&work[iwork], &i__2, &ierr);
 	    }
 	    if (wntuo) {
 
-/*              If left singular vectors desired in A, generate left   
-                bidiagonalizing vectors in A   
+/*              If left singular vectors desired in A, generate left
+                bidiagonalizing vectors in A
                 (Workspace: need 4*M-1, prefer 3*M+(M-1)*NB) */
 
 		i__2 = *lwork - iwork + 1;
@@ -3973,8 +3972,8 @@ static doublereal c_b438 = 1.;
 	    }
 	    if (wntvo) {
 
-/*              If right singular vectors desired in A, generate right   
-                bidiagonalizing vectors in A   
+/*              If right singular vectors desired in A, generate right
+                bidiagonalizing vectors in A
                 (Workspace: need 4*M, prefer 3*M+M*NB) */
 
 		i__2 = *lwork - iwork + 1;
@@ -3996,9 +3995,9 @@ static doublereal c_b438 = 1.;
 	    }
 	    if (! wntuo && ! wntvo) {
 
-/*              Perform bidiagonal QR iteration, if desired, computing   
-                left singular vectors in U and computing right singular   
-                vectors in VT   
+/*              Perform bidiagonal QR iteration, if desired, computing
+                left singular vectors in U and computing right singular
+                vectors in VT
                 (Workspace: need BDSPAC) */
 
 		dbdsqr_("L", m, &ncvt, &nru, &c__0, &s[1], &work[ie], &vt[
@@ -4006,9 +4005,9 @@ static doublereal c_b438 = 1.;
 			work[iwork], info);
 	    } else if (! wntuo && wntvo) {
 
-/*              Perform bidiagonal QR iteration, if desired, computing   
-                left singular vectors in U and computing right singular   
-                vectors in A   
+/*              Perform bidiagonal QR iteration, if desired, computing
+                left singular vectors in U and computing right singular
+                vectors in A
                 (Workspace: need BDSPAC) */
 
 		dbdsqr_("L", m, &ncvt, &nru, &c__0, &s[1], &work[ie], &a[
@@ -4016,9 +4015,9 @@ static doublereal c_b438 = 1.;
 			iwork], info);
 	    } else {
 
-/*              Perform bidiagonal QR iteration, if desired, computing   
-                left singular vectors in A and computing right singular   
-                vectors in VT   
+/*              Perform bidiagonal QR iteration, if desired, computing
+                left singular vectors in A and computing right singular
+                vectors in VT
                 (Workspace: need BDSPAC) */
 
 		dbdsqr_("L", m, &ncvt, &nru, &c__0, &s[1], &work[ie], &vt[
@@ -4030,7 +4029,7 @@ static doublereal c_b438 = 1.;
 
     }
 
-/*     If DBDSQR failed to converge, copy unconverged superdiagonals   
+/*     If DBDSQR failed to converge, copy unconverged superdiagonals
        to WORK( 2:MINMN ) */
 
     if (*info != 0) {
diff --git a/external/hypre/src/lapack/dgetf2.c b/external/hypre/src/lapack/dgetf2.c
index a36f6f2e..3e936a35 100644
--- a/external/hypre/src/lapack/dgetf2.c
+++ b/external/hypre/src/lapack/dgetf2.c
@@ -11,77 +11,77 @@ extern "C" {
 /* Subroutine */ integer dgetf2_(integer *m, integer *n, doublereal *a, integer *
 	lda, integer *ipiv, integer *info)
 {
-/*  -- LAPACK routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       June 30, 1992   
+/*  -- LAPACK routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       June 30, 1992
 
 
-    Purpose   
-    =======   
+    Purpose
+    =======
 
-    DGETF2 computes an LU factorization of a general m-by-n matrix A   
-    using partial pivoting with row interchanges.   
+    DGETF2 computes an LU factorization of a general m-by-n matrix A
+    using partial pivoting with row interchanges.
 
-    The factorization has the form   
-       A = P * L * U   
-    where P is a permutation matrix, L is lower triangular with unit   
-    diagonal elements (lower trapezoidal if m > n), and U is upper   
-    triangular (upper trapezoidal if m < n).   
+    The factorization has the form
+       A = P * L * U
+    where P is a permutation matrix, L is lower triangular with unit
+    diagonal elements (lower trapezoidal if m > n), and U is upper
+    triangular (upper trapezoidal if m < n).
 
-    This is the right-looking Level 2 BLAS version of the algorithm.   
+    This is the right-looking Level 2 BLAS version of the algorithm.
 
-    Arguments   
-    =========   
+    Arguments
+    =========
 
-    M       (input) INTEGER   
-            The number of rows of the matrix A.  M >= 0.   
+    M       (input) INTEGER
+            The number of rows of the matrix A.  M >= 0.
 
-    N       (input) INTEGER   
-            The number of columns of the matrix A.  N >= 0.   
+    N       (input) INTEGER
+            The number of columns of the matrix A.  N >= 0.
 
-    A       (input/output) DOUBLE PRECISION array, dimension (LDA,N)   
-            On entry, the m by n matrix to be factored.   
-            On exit, the factors L and U from the factorization   
-            A = P*L*U; the unit diagonal elements of L are not stored.   
+    A       (input/output) DOUBLE PRECISION array, dimension (LDA,N)
+            On entry, the m by n matrix to be factored.
+            On exit, the factors L and U from the factorization
+            A = P*L*U; the unit diagonal elements of L are not stored.
 
-    LDA     (input) INTEGER   
-            The leading dimension of the array A.  LDA >= max(1,M).   
+    LDA     (input) INTEGER
+            The leading dimension of the array A.  LDA >= max(1,M).
 
-    IPIV    (output) INTEGER array, dimension (min(M,N))   
-            The pivot indices; for 1 <= i <= min(M,N), row i of the   
-            matrix was interchanged with row IPIV(i).   
+    IPIV    (output) INTEGER array, dimension (min(M,N))
+            The pivot indices; for 1 <= i <= min(M,N), row i of the
+            matrix was interchanged with row IPIV(i).
 
-    INFO    (output) INTEGER   
-            = 0: successful exit   
-            < 0: if INFO = -k, the k-th argument had an illegal value   
-            > 0: if INFO = k, U(k,k) is exactly zero. The factorization   
-                 has been completed, but the factor U is exactly   
-                 singular, and division by zero will occur if it is used   
-                 to solve a system of equations.   
+    INFO    (output) INTEGER
+            = 0: successful exit
+            < 0: if INFO = -k, the k-th argument had an illegal value
+            > 0: if INFO = k, U(k,k) is exactly zero. The factorization
+                 has been completed, but the factor U is exactly
+                 singular, and division by zero will occur if it is used
+                 to solve a system of equations.
 
-    =====================================================================   
+    =====================================================================
 
 
-       Test the input parameters.   
+       Test the input parameters.
 
        Parameter adjustments */
     /* Table of constant values */
-    static integer c__1 = 1;
-    static doublereal c_b6 = -1.;
-    
+    integer c__1 = 1;
+    doublereal c_b6 = -1.;
+
     /* System generated locals */
     integer a_dim1, a_offset, i__1, i__2, i__3;
     doublereal d__1;
     /* Local variables */
-    extern /* Subroutine */ integer dger_(integer *, integer *, doublereal *, 
-	    doublereal *, integer *, doublereal *, integer *, doublereal *, 
+    extern /* Subroutine */ integer dger_(integer *, integer *, doublereal *,
+	    doublereal *, integer *, doublereal *, integer *, doublereal *,
 	    integer *);
-    static integer j;
-    extern /* Subroutine */ integer dscal_(integer *, doublereal *, doublereal *, 
-	    integer *), dswap_(integer *, doublereal *, integer *, doublereal 
+    integer j;
+    extern /* Subroutine */ integer dscal_(integer *, doublereal *, doublereal *,
+	    integer *), dswap_(integer *, doublereal *, integer *, doublereal
 	    *, integer *);
-    static integer jp;
+    integer jp;
     extern integer idamax_(integer *, doublereal *, integer *);
     extern /* Subroutine */ integer xerbla_(const char *, integer *);
 #define a_ref(a_1,a_2) a[(a_2)*a_dim1 + a_1]
@@ -148,7 +148,7 @@ extern "C" {
 
 	    i__2 = *m - j;
 	    i__3 = *n - j;
-	    dger_(&i__2, &i__3, &c_b6, &a_ref(j + 1, j), &c__1, &a_ref(j, j + 
+	    dger_(&i__2, &i__3, &c_b6, &a_ref(j + 1, j), &c__1, &a_ref(j, j +
 		    1), lda, &a_ref(j + 1, j + 1), lda);
 	}
 /* L10: */
diff --git a/external/hypre/src/lapack/dgetrf.c b/external/hypre/src/lapack/dgetrf.c
index ca796a65..77628c71 100644
--- a/external/hypre/src/lapack/dgetrf.c
+++ b/external/hypre/src/lapack/dgetrf.c
@@ -11,85 +11,85 @@ extern "C" {
 /* Subroutine */ integer dgetrf_(integer *m, integer *n, doublereal *a, integer *
 	lda, integer *ipiv, integer *info)
 {
-/*  -- LAPACK routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       March 31, 1993   
+/*  -- LAPACK routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       March 31, 1993
 
 
-    Purpose   
-    =======   
+    Purpose
+    =======
 
-    DGETRF computes an LU factorization of a general M-by-N matrix A   
-    using partial pivoting with row interchanges.   
+    DGETRF computes an LU factorization of a general M-by-N matrix A
+    using partial pivoting with row interchanges.
 
-    The factorization has the form   
-       A = P * L * U   
-    where P is a permutation matrix, L is lower triangular with unit   
-    diagonal elements (lower trapezoidal if m > n), and U is upper   
-    triangular (upper trapezoidal if m < n).   
+    The factorization has the form
+       A = P * L * U
+    where P is a permutation matrix, L is lower triangular with unit
+    diagonal elements (lower trapezoidal if m > n), and U is upper
+    triangular (upper trapezoidal if m < n).
 
-    This is the right-looking Level 3 BLAS version of the algorithm.   
+    This is the right-looking Level 3 BLAS version of the algorithm.
 
-    Arguments   
-    =========   
+    Arguments
+    =========
 
-    M       (input) INTEGER   
-            The number of rows of the matrix A.  M >= 0.   
+    M       (input) INTEGER
+            The number of rows of the matrix A.  M >= 0.
 
-    N       (input) INTEGER   
-            The number of columns of the matrix A.  N >= 0.   
+    N       (input) INTEGER
+            The number of columns of the matrix A.  N >= 0.
 
-    A       (input/output) DOUBLE PRECISION array, dimension (LDA,N)   
-            On entry, the M-by-N matrix to be factored.   
-            On exit, the factors L and U from the factorization   
-            A = P*L*U; the unit diagonal elements of L are not stored.   
+    A       (input/output) DOUBLE PRECISION array, dimension (LDA,N)
+            On entry, the M-by-N matrix to be factored.
+            On exit, the factors L and U from the factorization
+            A = P*L*U; the unit diagonal elements of L are not stored.
 
-    LDA     (input) INTEGER   
-            The leading dimension of the array A.  LDA >= max(1,M).   
+    LDA     (input) INTEGER
+            The leading dimension of the array A.  LDA >= max(1,M).
 
-    IPIV    (output) INTEGER array, dimension (min(M,N))   
-            The pivot indices; for 1 <= i <= min(M,N), row i of the   
-            matrix was interchanged with row IPIV(i).   
+    IPIV    (output) INTEGER array, dimension (min(M,N))
+            The pivot indices; for 1 <= i <= min(M,N), row i of the
+            matrix was interchanged with row IPIV(i).
 
-    INFO    (output) INTEGER   
-            = 0:  successful exit   
-            < 0:  if INFO = -i, the i-th argument had an illegal value   
-            > 0:  if INFO = i, U(i,i) is exactly zero. The factorization   
-                  has been completed, but the factor U is exactly   
-                  singular, and division by zero will occur if it is used   
-                  to solve a system of equations.   
+    INFO    (output) INTEGER
+            = 0:  successful exit
+            < 0:  if INFO = -i, the i-th argument had an illegal value
+            > 0:  if INFO = i, U(i,i) is exactly zero. The factorization
+                  has been completed, but the factor U is exactly
+                  singular, and division by zero will occur if it is used
+                  to solve a system of equations.
 
-    =====================================================================   
+    =====================================================================
 
 
-       Test the input parameters.   
+       Test the input parameters.
 
        Parameter adjustments */
     /* Table of constant values */
-    static integer c__1 = 1;
-    static integer c_n1 = -1;
-    static doublereal c_b16 = 1.;
-    static doublereal c_b19 = -1.;
-    
+    integer c__1 = 1;
+    integer c_n1 = -1;
+    doublereal c_b16 = 1.;
+    doublereal c_b19 = -1.;
+
     /* System generated locals */
     integer a_dim1, a_offset, i__1, i__2, i__3, i__4, i__5;
     /* Local variables */
-    static integer i__, j;
-    extern /* Subroutine */ integer dgemm_(const char *,const char *, integer *, integer *, 
-	    integer *, doublereal *, doublereal *, integer *, doublereal *, 
+    integer i__, j;
+    extern /* Subroutine */ integer dgemm_(const char *,const char *, integer *, integer *,
+	    integer *, doublereal *, doublereal *, integer *, doublereal *,
 	    integer *, doublereal *, doublereal *, integer *);
-    static integer iinfo;
-    extern /* Subroutine */ integer dtrsm_(const char *,const char *,const char *,const char *, 
-	    integer *, integer *, doublereal *, doublereal *, integer *, 
+    integer iinfo;
+    extern /* Subroutine */ integer dtrsm_(const char *,const char *,const char *,const char *,
+	    integer *, integer *, doublereal *, doublereal *, integer *,
 	    doublereal *, integer *), dgetf2_(
-	    integer *, integer *, doublereal *, integer *, integer *, integer 
+	    integer *, integer *, doublereal *, integer *, integer *, integer
 	    *);
-    static integer jb, nb;
+    integer jb, nb;
     extern /* Subroutine */ integer xerbla_(const char *, integer *);
-    extern integer ilaenv_(integer *,const char *,const char *, integer *, integer *, 
+    extern integer ilaenv_(integer *,const char *,const char *, integer *, integer *,
 	    integer *, integer *, ftnlen, ftnlen);
-    extern /* Subroutine */ integer dlaswp_(integer *, doublereal *, integer *, 
+    extern /* Subroutine */ integer dlaswp_(integer *, doublereal *, integer *,
 	    integer *, integer *, integer *, integer *);
 #define a_ref(a_1,a_2) a[(a_2)*a_dim1 + a_1]
 
@@ -140,7 +140,7 @@ extern "C" {
 	    i__3 = min(*m,*n) - j + 1;
 	    jb = min(i__3,nb);
 
-/*           Factor diagonal and subdiagonal blocks and test for exact   
+/*           Factor diagonal and subdiagonal blocks and test for exact
              singularity. */
 
 	    i__3 = *m - j + 1;
@@ -185,7 +185,7 @@ extern "C" {
 
 		    i__3 = *m - j - jb + 1;
 		    i__4 = *n - j - jb + 1;
-		    dgemm_("No transpose", "No transpose", &i__3, &i__4, &jb, 
+		    dgemm_("No transpose", "No transpose", &i__3, &i__4, &jb,
 			    &c_b19, &a_ref(j + jb, j), lda, &a_ref(j, j + jb),
 			     lda, &c_b16, &a_ref(j + jb, j + jb), lda);
 		}
diff --git a/external/hypre/src/lapack/dgetri.c b/external/hypre/src/lapack/dgetri.c
index 40ec79d1..2b1bbc5d 100644
--- a/external/hypre/src/lapack/dgetri.c
+++ b/external/hypre/src/lapack/dgetri.c
@@ -8,99 +8,99 @@ extern "C" {
 #include "f2c.h"
 #include "hypre_lapack.h"
 
-/* Subroutine */ integer dgetri_(integer *n, doublereal *a, integer *lda, integer 
+/* Subroutine */ integer dgetri_(integer *n, doublereal *a, integer *lda, integer
 	*ipiv, doublereal *work, integer *lwork, integer *info)
 {
-/*  -- LAPACK routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       June 30, 1999   
+/*  -- LAPACK routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       June 30, 1999
 
 
-    Purpose   
-    =======   
+    Purpose
+    =======
 
-    DGETRI computes the inverse of a matrix using the LU factorization   
-    computed by DGETRF.   
+    DGETRI computes the inverse of a matrix using the LU factorization
+    computed by DGETRF.
 
-    This method inverts U and then computes inv(A) by solving the system   
-    inv(A)*L = inv(U) for inv(A).   
+    This method inverts U and then computes inv(A) by solving the system
+    inv(A)*L = inv(U) for inv(A).
 
-    Arguments   
-    =========   
+    Arguments
+    =========
 
-    N       (input) INTEGER   
-            The order of the matrix A.  N >= 0.   
+    N       (input) INTEGER
+            The order of the matrix A.  N >= 0.
 
-    A       (input/output) DOUBLE PRECISION array, dimension (LDA,N)   
-            On entry, the factors L and U from the factorization   
-            A = P*L*U as computed by DGETRF.   
-            On exit, if INFO = 0, the inverse of the original matrix A.   
+    A       (input/output) DOUBLE PRECISION array, dimension (LDA,N)
+            On entry, the factors L and U from the factorization
+            A = P*L*U as computed by DGETRF.
+            On exit, if INFO = 0, the inverse of the original matrix A.
 
-    LDA     (input) INTEGER   
-            The leading dimension of the array A.  LDA >= max(1,N).   
+    LDA     (input) INTEGER
+            The leading dimension of the array A.  LDA >= max(1,N).
 
-    IPIV    (input) INTEGER array, dimension (N)   
-            The pivot indices from DGETRF; for 1<=i<=N, row i of the   
-            matrix was interchanged with row IPIV(i).   
+    IPIV    (input) INTEGER array, dimension (N)
+            The pivot indices from DGETRF; for 1<=i<=N, row i of the
+            matrix was interchanged with row IPIV(i).
 
-    WORK    (workspace/output) DOUBLE PRECISION array, dimension (LWORK)   
-            On exit, if INFO=0, then WORK(1) returns the optimal LWORK.   
+    WORK    (workspace/output) DOUBLE PRECISION array, dimension (LWORK)
+            On exit, if INFO=0, then WORK(1) returns the optimal LWORK.
 
-    LWORK   (input) INTEGER   
-            The dimension of the array WORK.  LWORK >= max(1,N).   
-            For optimal performance LWORK >= N*NB, where NB is   
-            the optimal blocksize returned by ILAENV.   
+    LWORK   (input) INTEGER
+            The dimension of the array WORK.  LWORK >= max(1,N).
+            For optimal performance LWORK >= N*NB, where NB is
+            the optimal blocksize returned by ILAENV.
 
-            If LWORK = -1, then a workspace query is assumed; the routine   
-            only calculates the optimal size of the WORK array, returns   
-            this value as the first entry of the WORK array, and no error   
-            message related to LWORK is issued by XERBLA.   
+            If LWORK = -1, then a workspace query is assumed; the routine
+            only calculates the optimal size of the WORK array, returns
+            this value as the first entry of the WORK array, and no error
+            message related to LWORK is issued by XERBLA.
 
-    INFO    (output) INTEGER   
-            = 0:  successful exit   
-            < 0:  if INFO = -i, the i-th argument had an illegal value   
-            > 0:  if INFO = i, U(i,i) is exactly zero; the matrix is   
-                  singular and its inverse could not be computed.   
+    INFO    (output) INTEGER
+            = 0:  successful exit
+            < 0:  if INFO = -i, the i-th argument had an illegal value
+            > 0:  if INFO = i, U(i,i) is exactly zero; the matrix is
+                  singular and its inverse could not be computed.
 
-    =====================================================================   
+    =====================================================================
 
 
-       Test the input parameters.   
+       Test the input parameters.
 
        Parameter adjustments */
     /* Table of constant values */
-    static integer c__1 = 1;
-    static integer c_n1 = -1;
-    static integer c__2 = 2;
-    static doublereal c_b20 = -1.;
-    static doublereal c_b22 = 1.;
-    
+    integer c__1 = 1;
+    integer c_n1 = -1;
+    integer c__2 = 2;
+    doublereal c_b20 = -1.;
+    doublereal c_b22 = 1.;
+
     /* System generated locals */
     integer a_dim1, a_offset, i__1, i__2, i__3;
     /* Local variables */
-    static integer i__, j;
-    extern /* Subroutine */ integer dgemm_(const char *, const char *, integer *, integer *, 
-	    integer *, doublereal *, doublereal *, integer *, doublereal *, 
+    integer i__, j;
+    extern /* Subroutine */ integer dgemm_(const char *, const char *, integer *, integer *,
+	    integer *, doublereal *, doublereal *, integer *, doublereal *,
 	    integer *, doublereal *, doublereal *, integer *),
-	     dgemv_(const char *, integer *, integer *, doublereal *, doublereal *, 
-	    integer *, doublereal *, integer *, doublereal *, doublereal *, 
+	     dgemv_(const char *, integer *, integer *, doublereal *, doublereal *,
+	    integer *, doublereal *, integer *, doublereal *, doublereal *,
 	    integer *);
-    static integer nbmin;
-    extern /* Subroutine */ integer dswap_(integer *, doublereal *, integer *, 
-	    doublereal *, integer *), dtrsm_(const char *, const char *, const char *, const char *, 
-	    integer *, integer *, doublereal *, doublereal *, integer *, 
+    integer nbmin;
+    extern /* Subroutine */ integer dswap_(integer *, doublereal *, integer *,
+	    doublereal *, integer *), dtrsm_(const char *, const char *, const char *, const char *,
+	    integer *, integer *, doublereal *, doublereal *, integer *,
 	    doublereal *, integer *);
-    static integer jb, nb, jj, jp, nn;
+    integer jb, nb, jj, jp, nn;
     extern /* Subroutine */ integer xerbla_(const char *, integer *);
-    extern integer ilaenv_(integer *, const char *, const char *, integer *, integer *, 
+    extern integer ilaenv_(integer *, const char *, const char *, integer *, integer *,
 	    integer *, integer *, ftnlen, ftnlen);
-    static integer ldwork;
-    extern /* Subroutine */ integer dtrtri_(const char *, const char *, integer *, doublereal 
+    integer ldwork;
+    extern /* Subroutine */ integer dtrtri_(const char *, const char *, integer *, doublereal
 	    *, integer *, integer *);
-    static integer lwkopt;
-    static logical lquery;
-    static integer iws;
+    integer lwkopt;
+    logical lquery;
+    integer iws;
 #define a_ref(a_1,a_2) a[(a_2)*a_dim1 + a_1]
 
 
@@ -138,7 +138,7 @@ extern "C" {
 	return 0;
     }
 
-/*     Form inv(U).  If INFO > 0 from DTRTRI, then U is singular,   
+/*     Form inv(U).  If INFO > 0 from DTRTRI, then U is singular,
        and the inverse is not computed. */
 
     dtrtri_("Upper", "Non-unit", n, &a[a_offset], lda, info);
@@ -184,7 +184,7 @@ extern "C" {
 
 	    if (j < *n) {
 		i__1 = *n - j;
-		dgemv_("No transpose", n, &i__1, &c_b20, &a_ref(1, j + 1), 
+		dgemv_("No transpose", n, &i__1, &c_b20, &a_ref(1, j + 1),
 			lda, &work[j + 1], &c__1, &c_b22, &a_ref(1, j), &c__1);
 	    }
 /* L20: */
@@ -200,7 +200,7 @@ extern "C" {
 	    i__2 = nb, i__3 = *n - j + 1;
 	    jb = min(i__2,i__3);
 
-/*           Copy current block column of L to WORK and replace with   
+/*           Copy current block column of L to WORK and replace with
              zeros. */
 
 	    i__2 = j + jb - 1;
@@ -218,7 +218,7 @@ extern "C" {
 
 	    if (j + jb <= *n) {
 		i__2 = *n - j - jb + 1;
-		dgemm_("No transpose", "No transpose", n, &jb, &i__2, &c_b20, 
+		dgemm_("No transpose", "No transpose", n, &jb, &i__2, &c_b20,
 			&a_ref(1, j + jb), lda, &work[j + jb], &ldwork, &
 			c_b22, &a_ref(1, j), lda);
 	    }
@@ -250,4 +250,3 @@ extern "C" {
 #ifdef __cplusplus
 }
 #endif
-
diff --git a/external/hypre/src/lapack/dgetrs.c b/external/hypre/src/lapack/dgetrs.c
index 80a31eff..9c11e947 100644
--- a/external/hypre/src/lapack/dgetrs.c
+++ b/external/hypre/src/lapack/dgetrs.c
@@ -8,83 +8,83 @@ extern "C" {
 #include "f2c.h"
 #include "hypre_lapack.h"
 
-/* Subroutine */ integer dgetrs_(const char *trans, integer *n, integer *nrhs, 
+/* Subroutine */ integer dgetrs_(const char *trans, integer *n, integer *nrhs,
 	doublereal *a, integer *lda, integer *ipiv, doublereal *b, integer *
 	ldb, integer *info)
 {
-/*  -- LAPACK routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       March 31, 1993   
+/*  -- LAPACK routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       March 31, 1993
 
 
-    Purpose   
-    =======   
+    Purpose
+    =======
 
-    DGETRS solves a system of linear equations   
-       A * X = B  or  A' * X = B   
-    with a general N-by-N matrix A using the LU factorization computed   
-    by DGETRF.   
+    DGETRS solves a system of linear equations
+       A * X = B  or  A' * X = B
+    with a general N-by-N matrix A using the LU factorization computed
+    by DGETRF.
 
-    Arguments   
-    =========   
+    Arguments
+    =========
 
-    TRANS   (input) CHARACTER*1   
-            Specifies the form of the system of equations:   
-            = 'N':  A * X = B  (No transpose)   
-            = 'T':  A'* X = B  (Transpose)   
-            = 'C':  A'* X = B  (Conjugate transpose = Transpose)   
+    TRANS   (input) CHARACTER*1
+            Specifies the form of the system of equations:
+            = 'N':  A * X = B  (No transpose)
+            = 'T':  A'* X = B  (Transpose)
+            = 'C':  A'* X = B  (Conjugate transpose = Transpose)
 
-    N       (input) INTEGER   
-            The order of the matrix A.  N >= 0.   
+    N       (input) INTEGER
+            The order of the matrix A.  N >= 0.
 
-    NRHS    (input) INTEGER   
-            The number of right hand sides, i.e., the number of columns   
-            of the matrix B.  NRHS >= 0.   
+    NRHS    (input) INTEGER
+            The number of right hand sides, i.e., the number of columns
+            of the matrix B.  NRHS >= 0.
 
-    A       (input) DOUBLE PRECISION array, dimension (LDA,N)   
-            The factors L and U from the factorization A = P*L*U   
-            as computed by DGETRF.   
+    A       (input) DOUBLE PRECISION array, dimension (LDA,N)
+            The factors L and U from the factorization A = P*L*U
+            as computed by DGETRF.
 
-    LDA     (input) INTEGER   
-            The leading dimension of the array A.  LDA >= max(1,N).   
+    LDA     (input) INTEGER
+            The leading dimension of the array A.  LDA >= max(1,N).
 
-    IPIV    (input) INTEGER array, dimension (N)   
-            The pivot indices from DGETRF; for 1<=i<=N, row i of the   
-            matrix was interchanged with row IPIV(i).   
+    IPIV    (input) INTEGER array, dimension (N)
+            The pivot indices from DGETRF; for 1<=i<=N, row i of the
+            matrix was interchanged with row IPIV(i).
 
-    B       (input/output) DOUBLE PRECISION array, dimension (LDB,NRHS)   
-            On entry, the right hand side matrix B.   
-            On exit, the solution matrix X.   
+    B       (input/output) DOUBLE PRECISION array, dimension (LDB,NRHS)
+            On entry, the right hand side matrix B.
+            On exit, the solution matrix X.
 
-    LDB     (input) INTEGER   
-            The leading dimension of the array B.  LDB >= max(1,N).   
+    LDB     (input) INTEGER
+            The leading dimension of the array B.  LDB >= max(1,N).
 
-    INFO    (output) INTEGER   
-            = 0:  successful exit   
-            < 0:  if INFO = -i, the i-th argument had an illegal value   
+    INFO    (output) INTEGER
+            = 0:  successful exit
+            < 0:  if INFO = -i, the i-th argument had an illegal value
 
-    =====================================================================   
+    =====================================================================
 
 
-       Test the input parameters.   
+       Test the input parameters.
 
        Parameter adjustments */
     /* Table of constant values */
-    static integer c__1 = 1;
-    static doublereal c_b12 = 1.;
-    static integer c_n1 = -1;
-    
+    integer c__1 = 1;
+    doublereal c_b12 = 1.;
+    integer c_n1 = -1;
+
     /* System generated locals */
     integer a_dim1, a_offset, b_dim1, b_offset, i__1;
     /* Local variables */
     extern logical lsame_(const char *,const char *);
-    extern /* Subroutine */ integer dtrsm_(const char *,const char *,const char *,const char *, 
-	    integer *, integer *, doublereal *, doublereal *, integer *, 
+    extern /* Subroutine */ integer dtrsm_(const char *,const char *,const char *,const char *,
+	    integer *, integer *, doublereal *, doublereal *, integer *,
 	    doublereal *, integer *), xerbla_(
-	    const char *, integer *), dlaswp_(integer *, doublereal *, 
+	    const char *, integer *), dlaswp_(integer *, doublereal *,
 	    integer *, integer *, integer *, integer *, integer *);
-    static logical notran;
+    logical notran;
 
 
     a_dim1 = *lda;
@@ -124,7 +124,7 @@ extern "C" {
 
     if (notran) {
 
-/*        Solve A * X = B.   
+/*        Solve A * X = B.
 
           Apply row interchanges to the right hand sides. */
 
@@ -141,7 +141,7 @@ extern "C" {
 		a[a_offset], lda, &b[b_offset], ldb);
     } else {
 
-/*        Solve A' * X = B.   
+/*        Solve A' * X = B.
 
           Solve U'*X = B, overwriting B with X. */
 
diff --git a/external/hypre/src/lapack/dlabrd.c b/external/hypre/src/lapack/dlabrd.c
index 92f65f4d..b247c007 100644
--- a/external/hypre/src/lapack/dlabrd.c
+++ b/external/hypre/src/lapack/dlabrd.c
@@ -9,155 +9,155 @@ extern "C" {
 #include "hypre_lapack.h"
 
 /* Subroutine */ integer dlabrd_(integer *m, integer *n, integer *nb, doublereal *
-	a, integer *lda, doublereal *d__, doublereal *e, doublereal *tauq, 
-	doublereal *taup, doublereal *x, integer *ldx, doublereal *y, integer 
+	a, integer *lda, doublereal *d__, doublereal *e, doublereal *tauq,
+	doublereal *taup, doublereal *x, integer *ldx, doublereal *y, integer
 	*ldy)
 {
-/*  -- LAPACK auxiliary routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       February 29, 1992   
+/*  -- LAPACK auxiliary routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       February 29, 1992
 
 
-    Purpose   
-    =======   
+    Purpose
+    =======
 
-    DLABRD reduces the first NB rows and columns of a real general   
-    m by n matrix A to upper or lower bidiagonal form by an orthogonal   
-    transformation Q' * A * P, and returns the matrices X and Y which   
-    are needed to apply the transformation to the unreduced part of A.   
+    DLABRD reduces the first NB rows and columns of a real general
+    m by n matrix A to upper or lower bidiagonal form by an orthogonal
+    transformation Q' * A * P, and returns the matrices X and Y which
+    are needed to apply the transformation to the unreduced part of A.
 
-    If m >= n, A is reduced to upper bidiagonal form; if m < n, to lower   
-    bidiagonal form.   
+    If m >= n, A is reduced to upper bidiagonal form; if m < n, to lower
+    bidiagonal form.
 
-    This is an auxiliary routine called by DGEBRD   
+    This is an auxiliary routine called by DGEBRD
 
-    Arguments   
-    =========   
+    Arguments
+    =========
 
-    M       (input) INTEGER   
-            The number of rows in the matrix A.   
+    M       (input) INTEGER
+            The number of rows in the matrix A.
 
-    N       (input) INTEGER   
-            The number of columns in the matrix A.   
+    N       (input) INTEGER
+            The number of columns in the matrix A.
 
-    NB      (input) INTEGER   
-            The number of leading rows and columns of A to be reduced.   
+    NB      (input) INTEGER
+            The number of leading rows and columns of A to be reduced.
 
-    A       (input/output) DOUBLE PRECISION array, dimension (LDA,N)   
-            On entry, the m by n general matrix to be reduced.   
-            On exit, the first NB rows and columns of the matrix are   
-            overwritten; the rest of the array is unchanged.   
-            If m >= n, elements on and below the diagonal in the first NB   
-              columns, with the array TAUQ, represent the orthogonal   
-              matrix Q as a product of elementary reflectors; and   
-              elements above the diagonal in the first NB rows, with the   
-              array TAUP, represent the orthogonal matrix P as a product   
-              of elementary reflectors.   
-            If m < n, elements below the diagonal in the first NB   
-              columns, with the array TAUQ, represent the orthogonal   
-              matrix Q as a product of elementary reflectors, and   
-              elements on and above the diagonal in the first NB rows,   
-              with the array TAUP, represent the orthogonal matrix P as   
-              a product of elementary reflectors.   
-            See Further Details.   
+    A       (input/output) DOUBLE PRECISION array, dimension (LDA,N)
+            On entry, the m by n general matrix to be reduced.
+            On exit, the first NB rows and columns of the matrix are
+            overwritten; the rest of the array is unchanged.
+            If m >= n, elements on and below the diagonal in the first NB
+              columns, with the array TAUQ, represent the orthogonal
+              matrix Q as a product of elementary reflectors; and
+              elements above the diagonal in the first NB rows, with the
+              array TAUP, represent the orthogonal matrix P as a product
+              of elementary reflectors.
+            If m < n, elements below the diagonal in the first NB
+              columns, with the array TAUQ, represent the orthogonal
+              matrix Q as a product of elementary reflectors, and
+              elements on and above the diagonal in the first NB rows,
+              with the array TAUP, represent the orthogonal matrix P as
+              a product of elementary reflectors.
+            See Further Details.
 
-    LDA     (input) INTEGER   
-            The leading dimension of the array A.  LDA >= max(1,M).   
+    LDA     (input) INTEGER
+            The leading dimension of the array A.  LDA >= max(1,M).
 
-    D       (output) DOUBLE PRECISION array, dimension (NB)   
-            The diagonal elements of the first NB rows and columns of   
-            the reduced matrix.  D(i) = A(i,i).   
+    D       (output) DOUBLE PRECISION array, dimension (NB)
+            The diagonal elements of the first NB rows and columns of
+            the reduced matrix.  D(i) = A(i,i).
 
-    E       (output) DOUBLE PRECISION array, dimension (NB)   
-            The off-diagonal elements of the first NB rows and columns of   
-            the reduced matrix.   
+    E       (output) DOUBLE PRECISION array, dimension (NB)
+            The off-diagonal elements of the first NB rows and columns of
+            the reduced matrix.
 
-    TAUQ    (output) DOUBLE PRECISION array dimension (NB)   
-            The scalar factors of the elementary reflectors which   
-            represent the orthogonal matrix Q. See Further Details.   
+    TAUQ    (output) DOUBLE PRECISION array dimension (NB)
+            The scalar factors of the elementary reflectors which
+            represent the orthogonal matrix Q. See Further Details.
 
-    TAUP    (output) DOUBLE PRECISION array, dimension (NB)   
-            The scalar factors of the elementary reflectors which   
-            represent the orthogonal matrix P. See Further Details.   
+    TAUP    (output) DOUBLE PRECISION array, dimension (NB)
+            The scalar factors of the elementary reflectors which
+            represent the orthogonal matrix P. See Further Details.
 
-    X       (output) DOUBLE PRECISION array, dimension (LDX,NB)   
-            The m-by-nb matrix X required to update the unreduced part   
-            of A.   
+    X       (output) DOUBLE PRECISION array, dimension (LDX,NB)
+            The m-by-nb matrix X required to update the unreduced part
+            of A.
 
-    LDX     (input) INTEGER   
-            The leading dimension of the array X. LDX >= M.   
+    LDX     (input) INTEGER
+            The leading dimension of the array X. LDX >= M.
 
-    Y       (output) DOUBLE PRECISION array, dimension (LDY,NB)   
-            The n-by-nb matrix Y required to update the unreduced part   
-            of A.   
+    Y       (output) DOUBLE PRECISION array, dimension (LDY,NB)
+            The n-by-nb matrix Y required to update the unreduced part
+            of A.
 
-    LDY     (output) INTEGER   
-            The leading dimension of the array Y. LDY >= N.   
+    LDY     (output) INTEGER
+            The leading dimension of the array Y. LDY >= N.
 
-    Further Details   
-    ===============   
+    Further Details
+    ===============
 
-    The matrices Q and P are represented as products of elementary   
-    reflectors:   
+    The matrices Q and P are represented as products of elementary
+    reflectors:
 
-       Q = H(1) H(2) . . . H(nb)  and  P = G(1) G(2) . . . G(nb)   
+       Q = H(1) H(2) . . . H(nb)  and  P = G(1) G(2) . . . G(nb)
 
-    Each H(i) and G(i) has the form:   
+    Each H(i) and G(i) has the form:
 
-       H(i) = I - tauq * v * v'  and G(i) = I - taup * u * u'   
+       H(i) = I - tauq * v * v'  and G(i) = I - taup * u * u'
 
-    where tauq and taup are real scalars, and v and u are real vectors.   
+    where tauq and taup are real scalars, and v and u are real vectors.
 
-    If m >= n, v(1:i-1) = 0, v(i) = 1, and v(i:m) is stored on exit in   
-    A(i:m,i); u(1:i) = 0, u(i+1) = 1, and u(i+1:n) is stored on exit in   
-    A(i,i+1:n); tauq is stored in TAUQ(i) and taup in TAUP(i).   
+    If m >= n, v(1:i-1) = 0, v(i) = 1, and v(i:m) is stored on exit in
+    A(i:m,i); u(1:i) = 0, u(i+1) = 1, and u(i+1:n) is stored on exit in
+    A(i,i+1:n); tauq is stored in TAUQ(i) and taup in TAUP(i).
 
-    If m < n, v(1:i) = 0, v(i+1) = 1, and v(i+1:m) is stored on exit in   
-    A(i+2:m,i); u(1:i-1) = 0, u(i) = 1, and u(i:n) is stored on exit in   
-    A(i,i+1:n); tauq is stored in TAUQ(i) and taup in TAUP(i).   
+    If m < n, v(1:i) = 0, v(i+1) = 1, and v(i+1:m) is stored on exit in
+    A(i+2:m,i); u(1:i-1) = 0, u(i) = 1, and u(i:n) is stored on exit in
+    A(i,i+1:n); tauq is stored in TAUQ(i) and taup in TAUP(i).
 
-    The elements of the vectors v and u together form the m-by-nb matrix   
-    V and the nb-by-n matrix U' which are needed, with X and Y, to apply   
-    the transformation to the unreduced part of the matrix, using a block   
-    update of the form:  A := A - V*Y' - X*U'.   
+    The elements of the vectors v and u together form the m-by-nb matrix
+    V and the nb-by-n matrix U' which are needed, with X and Y, to apply
+    the transformation to the unreduced part of the matrix, using a block
+    update of the form:  A := A - V*Y' - X*U'.
 
-    The contents of A on exit are illustrated by the following examples   
-    with nb = 2:   
+    The contents of A on exit are illustrated by the following examples
+    with nb = 2:
 
-    m = 6 and n = 5 (m > n):          m = 5 and n = 6 (m < n):   
+    m = 6 and n = 5 (m > n):          m = 5 and n = 6 (m < n):
 
-      (  1   1   u1  u1  u1 )           (  1   u1  u1  u1  u1  u1 )   
-      (  v1  1   1   u2  u2 )           (  1   1   u2  u2  u2  u2 )   
-      (  v1  v2  a   a   a  )           (  v1  1   a   a   a   a  )   
-      (  v1  v2  a   a   a  )           (  v1  v2  a   a   a   a  )   
-      (  v1  v2  a   a   a  )           (  v1  v2  a   a   a   a  )   
-      (  v1  v2  a   a   a  )   
+      (  1   1   u1  u1  u1 )           (  1   u1  u1  u1  u1  u1 )
+      (  v1  1   1   u2  u2 )           (  1   1   u2  u2  u2  u2 )
+      (  v1  v2  a   a   a  )           (  v1  1   a   a   a   a  )
+      (  v1  v2  a   a   a  )           (  v1  v2  a   a   a   a  )
+      (  v1  v2  a   a   a  )           (  v1  v2  a   a   a   a  )
+      (  v1  v2  a   a   a  )
 
-    where a denotes an element of the original matrix which is unchanged,   
-    vi denotes an element of the vector defining H(i), and ui an element   
-    of the vector defining G(i).   
+    where a denotes an element of the original matrix which is unchanged,
+    vi denotes an element of the vector defining H(i), and ui an element
+    of the vector defining G(i).
 
-    =====================================================================   
+    =====================================================================
 
 
-       Quick return if possible   
+       Quick return if possible
 
        Parameter adjustments */
     /* Table of constant values */
-    static doublereal c_b4 = -1.;
-    static doublereal c_b5 = 1.;
-    static integer c__1 = 1;
-    static doublereal c_b16 = 0.;
-    
+    doublereal c_b4 = -1.;
+    doublereal c_b5 = 1.;
+    integer c__1 = 1;
+    doublereal c_b16 = 0.;
+
     /* System generated locals */
-    integer a_dim1, a_offset, x_dim1, x_offset, y_dim1, y_offset, i__1, i__2, 
+    integer a_dim1, a_offset, x_dim1, x_offset, y_dim1, y_offset, i__1, i__2,
 	    i__3;
     /* Local variables */
-    static integer i__;
-    extern /* Subroutine */ integer dscal_(integer *, doublereal *, doublereal *, 
-	    integer *), dgemv_(const char *, integer *, integer *, doublereal *, 
-	    doublereal *, integer *, doublereal *, integer *, doublereal *, 
+     integer i__;
+    extern /* Subroutine */ integer dscal_(integer *, doublereal *, doublereal *,
+	    integer *), dgemv_(const char *, integer *, integer *, doublereal *,
+	    doublereal *, integer *, doublereal *, integer *, doublereal *,
 	    doublereal *, integer *), dlarfg_(integer *, doublereal *,
 	     doublereal *, integer *, doublereal *);
 #define a_ref(a_1,a_2) a[(a_2)*a_dim1 + a_1]
@@ -202,7 +202,7 @@ extern "C" {
 	    dgemv_("No transpose", &i__2, &i__3, &c_b4, &x_ref(i__, 1), ldx, &
 		    a_ref(1, i__), &c__1, &c_b5, &a_ref(i__, i__), &c__1);
 
-/*           Generate reflection Q(i) to annihilate A(i+1:m,i)   
+/*           Generate reflection Q(i) to annihilate A(i+1:m,i)
 
    Computing MIN */
 	    i__2 = i__ + 1;
@@ -222,23 +222,23 @@ extern "C" {
 			 i__), &c__1);
 		i__2 = *m - i__ + 1;
 		i__3 = i__ - 1;
-		dgemv_("Transpose", &i__2, &i__3, &c_b5, &a_ref(i__, 1), lda, 
+		dgemv_("Transpose", &i__2, &i__3, &c_b5, &a_ref(i__, 1), lda,
 			&a_ref(i__, i__), &c__1, &c_b16, &y_ref(1, i__), &
 			c__1);
 		i__2 = *n - i__;
 		i__3 = i__ - 1;
 		dgemv_("No transpose", &i__2, &i__3, &c_b4, &y_ref(i__ + 1, 1)
-			, ldy, &y_ref(1, i__), &c__1, &c_b5, &y_ref(i__ + 1, 
+			, ldy, &y_ref(1, i__), &c__1, &c_b5, &y_ref(i__ + 1,
 			i__), &c__1);
 		i__2 = *m - i__ + 1;
 		i__3 = i__ - 1;
-		dgemv_("Transpose", &i__2, &i__3, &c_b5, &x_ref(i__, 1), ldx, 
+		dgemv_("Transpose", &i__2, &i__3, &c_b5, &x_ref(i__, 1), ldx,
 			&a_ref(i__, i__), &c__1, &c_b16, &y_ref(1, i__), &
 			c__1);
 		i__2 = i__ - 1;
 		i__3 = *n - i__;
-		dgemv_("Transpose", &i__2, &i__3, &c_b4, &a_ref(1, i__ + 1), 
-			lda, &y_ref(1, i__), &c__1, &c_b5, &y_ref(i__ + 1, 
+		dgemv_("Transpose", &i__2, &i__3, &c_b4, &a_ref(1, i__ + 1),
+			lda, &y_ref(1, i__), &c__1, &c_b5, &y_ref(i__ + 1,
 			i__), &c__1);
 		i__2 = *n - i__;
 		dscal_(&i__2, &tauq[i__], &y_ref(i__ + 1, i__), &c__1);
@@ -251,11 +251,11 @@ extern "C" {
 			, lda);
 		i__2 = i__ - 1;
 		i__3 = *n - i__;
-		dgemv_("Transpose", &i__2, &i__3, &c_b4, &a_ref(1, i__ + 1), 
+		dgemv_("Transpose", &i__2, &i__3, &c_b4, &a_ref(1, i__ + 1),
 			lda, &x_ref(i__, 1), ldx, &c_b5, &a_ref(i__, i__ + 1),
 			 lda);
 
-/*              Generate reflection P(i) to annihilate A(i,i+2:n)   
+/*              Generate reflection P(i) to annihilate A(i,i+2:n)
 
    Computing MIN */
 		i__2 = i__ + 2;
@@ -269,26 +269,26 @@ extern "C" {
 
 		i__2 = *m - i__;
 		i__3 = *n - i__;
-		dgemv_("No transpose", &i__2, &i__3, &c_b5, &a_ref(i__ + 1, 
+		dgemv_("No transpose", &i__2, &i__3, &c_b5, &a_ref(i__ + 1,
 			i__ + 1), lda, &a_ref(i__, i__ + 1), lda, &c_b16, &
 			x_ref(i__ + 1, i__), &c__1);
 		i__2 = *n - i__;
-		dgemv_("Transpose", &i__2, &i__, &c_b5, &y_ref(i__ + 1, 1), 
+		dgemv_("Transpose", &i__2, &i__, &c_b5, &y_ref(i__ + 1, 1),
 			ldy, &a_ref(i__, i__ + 1), lda, &c_b16, &x_ref(1, i__)
 			, &c__1);
 		i__2 = *m - i__;
 		dgemv_("No transpose", &i__2, &i__, &c_b4, &a_ref(i__ + 1, 1),
-			 lda, &x_ref(1, i__), &c__1, &c_b5, &x_ref(i__ + 1, 
+			 lda, &x_ref(1, i__), &c__1, &c_b5, &x_ref(i__ + 1,
 			i__), &c__1);
 		i__2 = i__ - 1;
 		i__3 = *n - i__;
 		dgemv_("No transpose", &i__2, &i__3, &c_b5, &a_ref(1, i__ + 1)
-			, lda, &a_ref(i__, i__ + 1), lda, &c_b16, &x_ref(1, 
+			, lda, &a_ref(i__, i__ + 1), lda, &c_b16, &x_ref(1,
 			i__), &c__1);
 		i__2 = *m - i__;
 		i__3 = i__ - 1;
 		dgemv_("No transpose", &i__2, &i__3, &c_b4, &x_ref(i__ + 1, 1)
-			, ldx, &x_ref(1, i__), &c__1, &c_b5, &x_ref(i__ + 1, 
+			, ldx, &x_ref(1, i__), &c__1, &c_b5, &x_ref(i__ + 1,
 			i__), &c__1);
 		i__2 = *m - i__;
 		dscal_(&i__2, &taup[i__], &x_ref(i__ + 1, i__), &c__1);
@@ -313,7 +313,7 @@ extern "C" {
 	    dgemv_("Transpose", &i__2, &i__3, &c_b4, &a_ref(1, i__), lda, &
 		    x_ref(i__, 1), ldx, &c_b5, &a_ref(i__, i__), lda);
 
-/*           Generate reflection P(i) to annihilate A(i,i+1:n)   
+/*           Generate reflection P(i) to annihilate A(i,i+1:n)
 
    Computing MIN */
 	    i__2 = i__ + 1;
@@ -328,27 +328,27 @@ extern "C" {
 
 		i__2 = *m - i__;
 		i__3 = *n - i__ + 1;
-		dgemv_("No transpose", &i__2, &i__3, &c_b5, &a_ref(i__ + 1, 
-			i__), lda, &a_ref(i__, i__), lda, &c_b16, &x_ref(i__ 
+		dgemv_("No transpose", &i__2, &i__3, &c_b5, &a_ref(i__ + 1,
+			i__), lda, &a_ref(i__, i__), lda, &c_b16, &x_ref(i__
 			+ 1, i__), &c__1);
 		i__2 = *n - i__ + 1;
 		i__3 = i__ - 1;
-		dgemv_("Transpose", &i__2, &i__3, &c_b5, &y_ref(i__, 1), ldy, 
+		dgemv_("Transpose", &i__2, &i__3, &c_b5, &y_ref(i__, 1), ldy,
 			&a_ref(i__, i__), lda, &c_b16, &x_ref(1, i__), &c__1);
 		i__2 = *m - i__;
 		i__3 = i__ - 1;
 		dgemv_("No transpose", &i__2, &i__3, &c_b4, &a_ref(i__ + 1, 1)
-			, lda, &x_ref(1, i__), &c__1, &c_b5, &x_ref(i__ + 1, 
+			, lda, &x_ref(1, i__), &c__1, &c_b5, &x_ref(i__ + 1,
 			i__), &c__1);
 		i__2 = i__ - 1;
 		i__3 = *n - i__ + 1;
-		dgemv_("No transpose", &i__2, &i__3, &c_b5, &a_ref(1, i__), 
+		dgemv_("No transpose", &i__2, &i__3, &c_b5, &a_ref(1, i__),
 			lda, &a_ref(i__, i__), lda, &c_b16, &x_ref(1, i__), &
 			c__1);
 		i__2 = *m - i__;
 		i__3 = i__ - 1;
 		dgemv_("No transpose", &i__2, &i__3, &c_b4, &x_ref(i__ + 1, 1)
-			, ldx, &x_ref(1, i__), &c__1, &c_b5, &x_ref(i__ + 1, 
+			, ldx, &x_ref(1, i__), &c__1, &c_b5, &x_ref(i__ + 1,
 			i__), &c__1);
 		i__2 = *m - i__;
 		dscal_(&i__2, &taup[i__], &x_ref(i__ + 1, i__), &c__1);
@@ -358,14 +358,14 @@ extern "C" {
 		i__2 = *m - i__;
 		i__3 = i__ - 1;
 		dgemv_("No transpose", &i__2, &i__3, &c_b4, &a_ref(i__ + 1, 1)
-			, lda, &y_ref(i__, 1), ldy, &c_b5, &a_ref(i__ + 1, 
+			, lda, &y_ref(i__, 1), ldy, &c_b5, &a_ref(i__ + 1,
 			i__), &c__1);
 		i__2 = *m - i__;
 		dgemv_("No transpose", &i__2, &i__, &c_b4, &x_ref(i__ + 1, 1),
-			 ldx, &a_ref(1, i__), &c__1, &c_b5, &a_ref(i__ + 1, 
+			 ldx, &a_ref(1, i__), &c__1, &c_b5, &a_ref(i__ + 1,
 			i__), &c__1);
 
-/*              Generate reflection Q(i) to annihilate A(i+2:m,i)   
+/*              Generate reflection Q(i) to annihilate A(i+2:m,i)
 
    Computing MIN */
 		i__2 = i__ + 2;
@@ -379,26 +379,26 @@ extern "C" {
 
 		i__2 = *m - i__;
 		i__3 = *n - i__;
-		dgemv_("Transpose", &i__2, &i__3, &c_b5, &a_ref(i__ + 1, i__ 
+		dgemv_("Transpose", &i__2, &i__3, &c_b5, &a_ref(i__ + 1, i__
 			+ 1), lda, &a_ref(i__ + 1, i__), &c__1, &c_b16, &
 			y_ref(i__ + 1, i__), &c__1);
 		i__2 = *m - i__;
 		i__3 = i__ - 1;
-		dgemv_("Transpose", &i__2, &i__3, &c_b5, &a_ref(i__ + 1, 1), 
-			lda, &a_ref(i__ + 1, i__), &c__1, &c_b16, &y_ref(1, 
+		dgemv_("Transpose", &i__2, &i__3, &c_b5, &a_ref(i__ + 1, 1),
+			lda, &a_ref(i__ + 1, i__), &c__1, &c_b16, &y_ref(1,
 			i__), &c__1);
 		i__2 = *n - i__;
 		i__3 = i__ - 1;
 		dgemv_("No transpose", &i__2, &i__3, &c_b4, &y_ref(i__ + 1, 1)
-			, ldy, &y_ref(1, i__), &c__1, &c_b5, &y_ref(i__ + 1, 
+			, ldy, &y_ref(1, i__), &c__1, &c_b5, &y_ref(i__ + 1,
 			i__), &c__1);
 		i__2 = *m - i__;
-		dgemv_("Transpose", &i__2, &i__, &c_b5, &x_ref(i__ + 1, 1), 
-			ldx, &a_ref(i__ + 1, i__), &c__1, &c_b16, &y_ref(1, 
+		dgemv_("Transpose", &i__2, &i__, &c_b5, &x_ref(i__ + 1, 1),
+			ldx, &a_ref(i__ + 1, i__), &c__1, &c_b16, &y_ref(1,
 			i__), &c__1);
 		i__2 = *n - i__;
-		dgemv_("Transpose", &i__, &i__2, &c_b4, &a_ref(1, i__ + 1), 
-			lda, &y_ref(1, i__), &c__1, &c_b5, &y_ref(i__ + 1, 
+		dgemv_("Transpose", &i__, &i__2, &c_b4, &a_ref(1, i__ + 1),
+			lda, &y_ref(1, i__), &c__1, &c_b5, &y_ref(i__ + 1,
 			i__), &c__1);
 		i__2 = *n - i__;
 		dscal_(&i__2, &tauq[i__], &y_ref(i__ + 1, i__), &c__1);
diff --git a/external/hypre/src/lapack/dlacpy.c b/external/hypre/src/lapack/dlacpy.c
index 2bce9b0b..f1caf6fd 100644
--- a/external/hypre/src/lapack/dlacpy.c
+++ b/external/hypre/src/lapack/dlacpy.c
@@ -11,55 +11,55 @@ extern "C" {
 /* Subroutine */ integer dlacpy_(const char *uplo, integer *m, integer *n, doublereal *
 	a, integer *lda, doublereal *b, integer *ldb)
 {
-/*  -- LAPACK auxiliary routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       February 29, 1992   
+/*  -- LAPACK auxiliary routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       February 29, 1992
 
 
-    Purpose   
-    =======   
+    Purpose
+    =======
 
-    DLACPY copies all or part of a two-dimensional matrix A to another   
-    matrix B.   
+    DLACPY copies all or part of a two-dimensional matrix A to another
+    matrix B.
 
-    Arguments   
-    =========   
+    Arguments
+    =========
 
-    UPLO    (input) CHARACTER*1   
-            Specifies the part of the matrix A to be copied to B.   
-            = 'U':      Upper triangular part   
-            = 'L':      Lower triangular part   
-            Otherwise:  All of the matrix A   
+    UPLO    (input) CHARACTER*1
+            Specifies the part of the matrix A to be copied to B.
+            = 'U':      Upper triangular part
+            = 'L':      Lower triangular part
+            Otherwise:  All of the matrix A
 
-    M       (input) INTEGER   
-            The number of rows of the matrix A.  M >= 0.   
+    M       (input) INTEGER
+            The number of rows of the matrix A.  M >= 0.
 
-    N       (input) INTEGER   
-            The number of columns of the matrix A.  N >= 0.   
+    N       (input) INTEGER
+            The number of columns of the matrix A.  N >= 0.
 
-    A       (input) DOUBLE PRECISION array, dimension (LDA,N)   
-            The m by n matrix A.  If UPLO = 'U', only the upper triangle   
-            or trapezoid is accessed; if UPLO = 'L', only the lower   
-            triangle or trapezoid is accessed.   
+    A       (input) DOUBLE PRECISION array, dimension (LDA,N)
+            The m by n matrix A.  If UPLO = 'U', only the upper triangle
+            or trapezoid is accessed; if UPLO = 'L', only the lower
+            triangle or trapezoid is accessed.
 
-    LDA     (input) INTEGER   
-            The leading dimension of the array A.  LDA >= max(1,M).   
+    LDA     (input) INTEGER
+            The leading dimension of the array A.  LDA >= max(1,M).
 
-    B       (output) DOUBLE PRECISION array, dimension (LDB,N)   
-            On exit, B = A in the locations specified by UPLO.   
+    B       (output) DOUBLE PRECISION array, dimension (LDB,N)
+            On exit, B = A in the locations specified by UPLO.
 
-    LDB     (input) INTEGER   
-            The leading dimension of the array B.  LDB >= max(1,M).   
+    LDB     (input) INTEGER
+            The leading dimension of the array B.  LDB >= max(1,M).
 
-    =====================================================================   
+    =====================================================================
 
 
        Parameter adjustments */
     /* System generated locals */
     integer a_dim1, a_offset, b_dim1, b_offset, i__1, i__2;
     /* Local variables */
-    static integer i__, j;
+    integer i__, j;
     extern logical lsame_(const char *,const char *);
 #define a_ref(a_1,a_2) a[(a_2)*a_dim1 + a_1]
 #define b_ref(a_1,a_2) b[(a_2)*b_dim1 + a_1]
diff --git a/external/hypre/src/lapack/dlae2.c b/external/hypre/src/lapack/dlae2.c
index 86f170f8..13a00759 100644
--- a/external/hypre/src/lapack/dlae2.c
+++ b/external/hypre/src/lapack/dlae2.c
@@ -8,64 +8,64 @@ extern "C" {
 #include "f2c.h"
 #include "hypre_lapack.h"
 
-/* Subroutine */ integer dlae2_(doublereal *a, doublereal *b, doublereal *c__, 
+/* Subroutine */ integer dlae2_(doublereal *a, doublereal *b, doublereal *c__,
 	doublereal *rt1, doublereal *rt2)
 {
-/*  -- LAPACK auxiliary routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       October 31, 1992   
+/*  -- LAPACK auxiliary routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       October 31, 1992
 
 
-    Purpose   
-    =======   
+    Purpose
+    =======
 
-    DLAE2  computes the eigenvalues of a 2-by-2 symmetric matrix   
-       [  A   B  ]   
-       [  B   C  ].   
-    On return, RT1 is the eigenvalue of larger absolute value, and RT2   
-    is the eigenvalue of smaller absolute value.   
+    DLAE2  computes the eigenvalues of a 2-by-2 symmetric matrix
+       [  A   B  ]
+       [  B   C  ].
+    On return, RT1 is the eigenvalue of larger absolute value, and RT2
+    is the eigenvalue of smaller absolute value.
 
-    Arguments   
-    =========   
+    Arguments
+    =========
 
-    A       (input) DOUBLE PRECISION   
-            The (1,1) element of the 2-by-2 matrix.   
+    A       (input) DOUBLE PRECISION
+            The (1,1) element of the 2-by-2 matrix.
 
-    B       (input) DOUBLE PRECISION   
-            The (1,2) and (2,1) elements of the 2-by-2 matrix.   
+    B       (input) DOUBLE PRECISION
+            The (1,2) and (2,1) elements of the 2-by-2 matrix.
 
-    C       (input) DOUBLE PRECISION   
-            The (2,2) element of the 2-by-2 matrix.   
+    C       (input) DOUBLE PRECISION
+            The (2,2) element of the 2-by-2 matrix.
 
-    RT1     (output) DOUBLE PRECISION   
-            The eigenvalue of larger absolute value.   
+    RT1     (output) DOUBLE PRECISION
+            The eigenvalue of larger absolute value.
 
-    RT2     (output) DOUBLE PRECISION   
-            The eigenvalue of smaller absolute value.   
+    RT2     (output) DOUBLE PRECISION
+            The eigenvalue of smaller absolute value.
 
-    Further Details   
-    ===============   
+    Further Details
+    ===============
 
-    RT1 is accurate to a few ulps barring over/underflow.   
+    RT1 is accurate to a few ulps barring over/underflow.
 
-    RT2 may be inaccurate if there is massive cancellation in the   
-    determinant A*C-B*B; higher precision or correctly rounded or   
-    correctly truncated arithmetic would be needed to compute RT2   
-    accurately in all cases.   
+    RT2 may be inaccurate if there is massive cancellation in the
+    determinant A*C-B*B; higher precision or correctly rounded or
+    correctly truncated arithmetic would be needed to compute RT2
+    accurately in all cases.
 
-    Overflow is possible only if RT1 is within a factor of 5 of overflow.   
-    Underflow is harmless if the input data is 0 or exceeds   
-       underflow_threshold / macheps.   
+    Overflow is possible only if RT1 is within a factor of 5 of overflow.
+    Underflow is harmless if the input data is 0 or exceeds
+       underflow_threshold / macheps.
 
-   =====================================================================   
+   =====================================================================
 
 
        Compute the eigenvalues */
     /* System generated locals */
     doublereal d__1;
     /* Local variables */
-    static doublereal acmn, acmx, ab, df, tb, sm, rt, adf;
+    doublereal acmn, acmx, ab, df, tb, sm, rt, adf;
 
 
     sm = *a + *c__;
@@ -97,16 +97,16 @@ extern "C" {
     if (sm < 0.) {
 	*rt1 = (sm - rt) * .5;
 
-/*        Order of execution important.   
-          To get fully accurate smaller eigenvalue,   
+/*        Order of execution important.
+          To get fully accurate smaller eigenvalue,
           next line needs to be executed in higher precision. */
 
 	*rt2 = acmx / *rt1 * acmn - *b / *rt1 * *b;
     } else if (sm > 0.) {
 	*rt1 = (sm + rt) * .5;
 
-/*        Order of execution important.   
-          To get fully accurate smaller eigenvalue,   
+/*        Order of execution important.
+          To get fully accurate smaller eigenvalue,
           next line needs to be executed in higher precision. */
 
 	*rt2 = acmx / *rt1 * acmn - *b / *rt1 * *b;
diff --git a/external/hypre/src/lapack/dlaev2.c b/external/hypre/src/lapack/dlaev2.c
index 0102af81..5d4e133d 100644
--- a/external/hypre/src/lapack/dlaev2.c
+++ b/external/hypre/src/lapack/dlaev2.c
@@ -8,76 +8,76 @@ extern "C" {
 #include "f2c.h"
 #include "hypre_lapack.h"
 
-/* Subroutine */ integer dlaev2_(doublereal *a, doublereal *b, doublereal *c__, 
+/* Subroutine */ integer dlaev2_(doublereal *a, doublereal *b, doublereal *c__,
 	doublereal *rt1, doublereal *rt2, doublereal *cs1, doublereal *sn1)
 {
-/*  -- LAPACK auxiliary routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       October 31, 1992   
+/*  -- LAPACK auxiliary routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       October 31, 1992
 
 
-    Purpose   
-    =======   
+    Purpose
+    =======
 
-    DLAEV2 computes the eigendecomposition of a 2-by-2 symmetric matrix   
-       [  A   B  ]   
-       [  B   C  ].   
-    On return, RT1 is the eigenvalue of larger absolute value, RT2 is the   
-    eigenvalue of smaller absolute value, and (CS1,SN1) is the unit right   
-    eigenvector for RT1, giving the decomposition   
+    DLAEV2 computes the eigendecomposition of a 2-by-2 symmetric matrix
+       [  A   B  ]
+       [  B   C  ].
+    On return, RT1 is the eigenvalue of larger absolute value, RT2 is the
+    eigenvalue of smaller absolute value, and (CS1,SN1) is the unit right
+    eigenvector for RT1, giving the decomposition
 
-       [ CS1  SN1 ] [  A   B  ] [ CS1 -SN1 ]  =  [ RT1  0  ]   
-       [-SN1  CS1 ] [  B   C  ] [ SN1  CS1 ]     [  0  RT2 ].   
+       [ CS1  SN1 ] [  A   B  ] [ CS1 -SN1 ]  =  [ RT1  0  ]
+       [-SN1  CS1 ] [  B   C  ] [ SN1  CS1 ]     [  0  RT2 ].
 
-    Arguments   
-    =========   
+    Arguments
+    =========
 
-    A       (input) DOUBLE PRECISION   
-            The (1,1) element of the 2-by-2 matrix.   
+    A       (input) DOUBLE PRECISION
+            The (1,1) element of the 2-by-2 matrix.
 
-    B       (input) DOUBLE PRECISION   
-            The (1,2) element and the conjugate of the (2,1) element of   
-            the 2-by-2 matrix.   
+    B       (input) DOUBLE PRECISION
+            The (1,2) element and the conjugate of the (2,1) element of
+            the 2-by-2 matrix.
 
-    C       (input) DOUBLE PRECISION   
-            The (2,2) element of the 2-by-2 matrix.   
+    C       (input) DOUBLE PRECISION
+            The (2,2) element of the 2-by-2 matrix.
 
-    RT1     (output) DOUBLE PRECISION   
-            The eigenvalue of larger absolute value.   
+    RT1     (output) DOUBLE PRECISION
+            The eigenvalue of larger absolute value.
 
-    RT2     (output) DOUBLE PRECISION   
-            The eigenvalue of smaller absolute value.   
+    RT2     (output) DOUBLE PRECISION
+            The eigenvalue of smaller absolute value.
 
-    CS1     (output) DOUBLE PRECISION   
-    SN1     (output) DOUBLE PRECISION   
-            The vector (CS1, SN1) is a unit right eigenvector for RT1.   
+    CS1     (output) DOUBLE PRECISION
+    SN1     (output) DOUBLE PRECISION
+            The vector (CS1, SN1) is a unit right eigenvector for RT1.
 
-    Further Details   
-    ===============   
+    Further Details
+    ===============
 
-    RT1 is accurate to a few ulps barring over/underflow.   
+    RT1 is accurate to a few ulps barring over/underflow.
 
-    RT2 may be inaccurate if there is massive cancellation in the   
-    determinant A*C-B*B; higher precision or correctly rounded or   
-    correctly truncated arithmetic would be needed to compute RT2   
-    accurately in all cases.   
+    RT2 may be inaccurate if there is massive cancellation in the
+    determinant A*C-B*B; higher precision or correctly rounded or
+    correctly truncated arithmetic would be needed to compute RT2
+    accurately in all cases.
 
-    CS1 and SN1 are accurate to a few ulps barring over/underflow.   
+    CS1 and SN1 are accurate to a few ulps barring over/underflow.
 
-    Overflow is possible only if RT1 is within a factor of 5 of overflow.   
-    Underflow is harmless if the input data is 0 or exceeds   
-       underflow_threshold / macheps.   
+    Overflow is possible only if RT1 is within a factor of 5 of overflow.
+    Underflow is harmless if the input data is 0 or exceeds
+       underflow_threshold / macheps.
 
-   =====================================================================   
+   =====================================================================
 
 
        Compute the eigenvalues */
     /* System generated locals */
     doublereal d__1;
     /* Local variables */
-    static doublereal acmn, acmx, ab, df, cs, ct, tb, sm, tn, rt, adf, acs;
-    static integer sgn1, sgn2;
+    doublereal acmn, acmx, ab, df, cs, ct, tb, sm, tn, rt, adf, acs;
+    integer sgn1, sgn2;
 
 
     sm = *a + *c__;
@@ -110,8 +110,8 @@ extern "C" {
 	*rt1 = (sm - rt) * .5;
 	sgn1 = -1;
 
-/*        Order of execution important.   
-          To get fully accurate smaller eigenvalue,   
+/*        Order of execution important.
+          To get fully accurate smaller eigenvalue,
           next line needs to be executed in higher precision. */
 
 	*rt2 = acmx / *rt1 * acmn - *b / *rt1 * *b;
@@ -119,8 +119,8 @@ extern "C" {
 	*rt1 = (sm + rt) * .5;
 	sgn1 = 1;
 
-/*        Order of execution important.   
-          To get fully accurate smaller eigenvalue,   
+/*        Order of execution important.
+          To get fully accurate smaller eigenvalue,
           next line needs to be executed in higher precision. */
 
 	*rt2 = acmx / *rt1 * acmn - *b / *rt1 * *b;
diff --git a/external/hypre/src/lapack/dlamch.c b/external/hypre/src/lapack/dlamch.c
index f4715206..2bc9eb82 100644
--- a/external/hypre/src/lapack/dlamch.c
+++ b/external/hypre/src/lapack/dlamch.c
@@ -10,69 +10,69 @@ extern "C" {
 
 doublereal dlamch_(const char *cmach)
 {
-/*  -- LAPACK auxiliary routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       October 31, 1992   
-
-
-    Purpose   
-    =======   
-
-    DLAMCH determines doublereal precision machine parameters.   
-
-    Arguments   
-    =========   
-
-    CMACH   (input) CHARACTER*1   
-            Specifies the value to be returned by DLAMCH:   
-            = 'E' or 'e',   DLAMCH := eps   
-            = 'S' or 's ,   DLAMCH := sfmin   
-            = 'B' or 'b',   DLAMCH := base   
-            = 'P' or 'p',   DLAMCH := eps*base   
-            = 'N' or 'n',   DLAMCH := t   
-            = 'R' or 'r',   DLAMCH := rnd   
-            = 'M' or 'm',   DLAMCH := emin   
-            = 'U' or 'u',   DLAMCH := rmin   
-            = 'L' or 'l',   DLAMCH := emax   
-            = 'O' or 'o',   DLAMCH := rmax   
-
-            where   
-
-            eps   = relative machine precision   
-            sfmin = safe minimum, such that 1/sfmin does not overflow   
-            base  = base of the machine   
-            prec  = eps*base   
-            t     = number of (base) digits in the mantissa   
-            rnd   = 1.0 when rounding occurs in addition, 0.0 otherwise   
-            emin  = minimum exponent before (gradual) underflow   
-            rmin  = underflow threshold - base**(emin-1)   
-            emax  = largest exponent before overflow   
-            rmax  = overflow threshold  - (base**emax)*(1-eps)   
-
-   ===================================================================== 
+/*  -- LAPACK auxiliary routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       October 31, 1992
+
+
+    Purpose
+    =======
+
+    DLAMCH determines doublereal precision machine parameters.
+
+    Arguments
+    =========
+
+    CMACH   (input) CHARACTER*1
+            Specifies the value to be returned by DLAMCH:
+            = 'E' or 'e',   DLAMCH := eps
+            = 'S' or 's ,   DLAMCH := sfmin
+            = 'B' or 'b',   DLAMCH := base
+            = 'P' or 'p',   DLAMCH := eps*base
+            = 'N' or 'n',   DLAMCH := t
+            = 'R' or 'r',   DLAMCH := rnd
+            = 'M' or 'm',   DLAMCH := emin
+            = 'U' or 'u',   DLAMCH := rmin
+            = 'L' or 'l',   DLAMCH := emax
+            = 'O' or 'o',   DLAMCH := rmax
+
+            where
+
+            eps   = relative machine precision
+            sfmin = safe minimum, such that 1/sfmin does not overflow
+            base  = base of the machine
+            prec  = eps*base
+            t     = number of (base) digits in the mantissa
+            rnd   = 1.0 when rounding occurs in addition, 0.0 otherwise
+            emin  = minimum exponent before (gradual) underflow
+            rmin  = underflow threshold - base**(emin-1)
+            emax  = largest exponent before overflow
+            rmax  = overflow threshold  - (base**emax)*(1-eps)
+
+   =====================================================================
 */
-/* >>Start of File<<   
+/* >>Start of File<<
        Initialized data */
-    static logical first = TRUE_;
+    logical first = TRUE_;
     /* System generated locals */
     integer i__1;
     doublereal ret_val;
     /* Builtin functions */
     doublereal pow_di(doublereal *, integer *);
     /* Local variables */
-    static doublereal base;
-    static integer beta;
-    static doublereal emin, prec, emax;
-    static integer imin, imax;
-    static logical lrnd;
-    static doublereal rmin, rmax, t, rmach;
+    doublereal base;
+    integer beta;
+    doublereal emin, prec, emax;
+    integer imin, imax;
+    logical lrnd;
+    doublereal rmin, rmax, t, rmach = 0.;
     extern logical lsame_(const char *,const char *);
-    static doublereal small, sfmin;
-    extern /* Subroutine */ integer dlamc2_(integer *, integer *, logical *, 
+    doublereal small, sfmin;
+    extern /* Subroutine */ integer dlamc2_(integer *, integer *, logical *,
 	    doublereal *, integer *, doublereal *, integer *, doublereal *);
-    static integer it;
-    static doublereal rnd, eps;
+    integer it;
+    doublereal rnd, eps;
 
 
 
@@ -98,7 +98,7 @@ doublereal dlamch_(const char *cmach)
 	if (small >= sfmin) {
 
 /*           Use SMALL plus a bit, to avoid the possibility of rou
-nding   
+nding
              causing overflow when computing  1/sfmin. */
 
 	    sfmin = small * (eps + 1.);
@@ -134,71 +134,71 @@ nding
 
 } /* dlamch_ */
 
-/* Subroutine */ integer dlamc1_(integer *beta, integer *t, logical *rnd, logical 
+/* Subroutine */ integer dlamc1_(integer *beta, integer *t, logical *rnd, logical
 	*ieee1)
 {
-/*  -- LAPACK auxiliary routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       October 31, 1992   
+/*  -- LAPACK auxiliary routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       October 31, 1992
 
 
-    Purpose   
-    =======   
+    Purpose
+    =======
 
-    DLAMC1 determines the machine parameters given by BETA, T, RND, and   
-    IEEE1.   
+    DLAMC1 determines the machine parameters given by BETA, T, RND, and
+    IEEE1.
 
-    Arguments   
-    =========   
+    Arguments
+    =========
 
-    BETA    (output) INTEGER   
-            The base of the machine.   
+    BETA    (output) INTEGER
+            The base of the machine.
 
-    T       (output) INTEGER   
-            The number of ( BETA ) digits in the mantissa.   
+    T       (output) INTEGER
+            The number of ( BETA ) digits in the mantissa.
 
-    RND     (output) LOGICAL   
-            Specifies whether proper rounding  ( RND = .TRUE. )  or   
-            chopping  ( RND = .FALSE. )  occurs in addition. This may not 
-  
-            be a reliable guide to the way in which the machine performs 
-  
-            its arithmetic.   
+    RND     (output) LOGICAL
+            Specifies whether proper rounding  ( RND = .TRUE. )  or
+            chopping  ( RND = .FALSE. )  occurs in addition. This may not
 
-    IEEE1   (output) LOGICAL   
-            Specifies whether rounding appears to be done in the IEEE   
-            'round to nearest' style.   
+            be a reliable guide to the way in which the machine performs
 
-    Further Details   
-    ===============   
+            its arithmetic.
 
-    The routine is based on the routine  ENVRON  by Malcolm and   
-    incorporates suggestions by Gentleman and Marovich. See   
+    IEEE1   (output) LOGICAL
+            Specifies whether rounding appears to be done in the IEEE
+            'round to nearest' style.
 
-       Malcolm M. A. (1972) Algorithms to reveal properties of   
-          floating-point arithmetic. Comms. of the ACM, 15, 949-951.   
+    Further Details
+    ===============
 
-       Gentleman W. M. and Marovich S. B. (1974) More on algorithms   
-          that reveal properties of floating point arithmetic units.   
-          Comms. of the ACM, 17, 276-277.   
+    The routine is based on the routine  ENVRON  by Malcolm and
+    incorporates suggestions by Gentleman and Marovich. See
 
-   ===================================================================== 
+       Malcolm M. A. (1972) Algorithms to reveal properties of
+          floating-point arithmetic. Comms. of the ACM, 15, 949-951.
+
+       Gentleman W. M. and Marovich S. B. (1974) More on algorithms
+          that reveal properties of floating point arithmetic units.
+          Comms. of the ACM, 17, 276-277.
+
+   =====================================================================
 */
     /* Initialized data */
-    static logical first = TRUE_;
+    logical first = TRUE_;
     /* System generated locals */
     doublereal d__1, d__2;
     /* Local variables */
-    static logical lrnd;
-    static doublereal a, b, c, f;
-    static integer lbeta;
-    static doublereal savec;
+    logical lrnd = FALSE_;
+    doublereal a, b, c, f;
+    integer lbeta = 0;
+    doublereal savec;
     extern doublereal dlamc3_(doublereal *, doublereal *);
-    static logical lieee1;
-    static doublereal t1, t2;
-    static integer lt;
-    static doublereal one, qtr;
+    logical lieee1 = FALSE_;
+    doublereal t1, t2;
+    integer lt = 0;
+    doublereal one, qtr;
 
 
 
@@ -207,18 +207,18 @@ nding
 	one = 1.;
 
 /*        LBETA,  LIEEE1,  LT and  LRND  are the  local values  of  BE
-TA,   
-          IEEE1, T and RND.   
+TA,
+          IEEE1, T and RND.
 
           Throughout this routine  we use the function  DLAMC3  to ens
-ure   
-          that relevant values are  stored and not held in registers, 
- or   
-          are not affected by optimizers.   
+ure
+          that relevant values are  stored and not held in registers,
+ or
+          are not affected by optimizers.
 
           Compute  a = 2.0**m  with the  smallest positive integer m s
-uch   
-          that   
+uch
+          that
 
              fl( a + 1.0 ) = a. */
 
@@ -234,11 +234,11 @@ uch
 	    c = dlamc3_(&c, &d__1);
 	    goto L10;
 	}
-/* +       END WHILE   
+/* +       END WHILE
 
-          Now compute  b = 2.0**m  with the smallest positive integer 
-m   
-          such that   
+          Now compute  b = 2.0**m  with the smallest positive integer
+m
+          such that
 
              fl( a + b ) .gt. a. */
 
@@ -252,14 +252,14 @@ m
 	    c = dlamc3_(&a, &b);
 	    goto L20;
 	}
-/* +       END WHILE   
+/* +       END WHILE
 
           Now compute the base.  a and c  are neighbouring floating po
-integer   
+integer
           numbers  in the  interval  ( beta**t, beta**( t + 1 ) )  and
- so   
+ so
           their difference is beta. Adding 0.25 to c is to ensure that
- it   
+ it
           is truncated to beta and not ( beta - 1 ). */
 
 	qtr = one / 4;
@@ -269,8 +269,8 @@ integer
 	lbeta = (integer) (c + qtr);
 
 /*        Now determine whether rounding or chopping occurs,  by addin
-g a   
-          bit  less  than  beta/2  and a  bit  more  than  beta/2  to 
+g a
+          bit  less  than  beta/2  and a  bit  more  than  beta/2  to
  a. */
 
 	b = (doublereal) lbeta;
@@ -292,13 +292,13 @@ g a
 	}
 
 /*        Try and decide whether rounding is done in the  IEEE  'round
- to   
-          nearest' style. B/2 is half a unit in the last place of the 
-two   
-          numbers A and SAVEC. Furthermore, A is even, i.e. has last  
-bit   
+ to
+          nearest' style. B/2 is half a unit in the last place of the
+two
+          numbers A and SAVEC. Furthermore, A is even, i.e. has last
+bit
           zero, and SAVEC is odd. Thus adding B/2 to A should not  cha
-nge   
+nge
           A, but adding B/2 to SAVEC should change SAVEC. */
 
 	d__1 = b / 2;
@@ -308,12 +308,12 @@ nge
 	lieee1 = t1 == a && t2 > savec && lrnd;
 
 /*        Now find  the  mantissa, t.  It should  be the  integer part
- of   
+ of
           log to the base beta of a,  however it is safer to determine
-  t   
-          by powering.  So we find t as the smallest positive integer 
-for   
-          which   
+  t
+          by powering.  So we find t as the smallest positive integer
+for
+          which
 
              fl( beta**t + 1.0 ) = 1.0. */
 
@@ -345,103 +345,103 @@ for
 
 } /* dlamc1_ */
 
-/* Subroutine */ integer dlamc2_(integer *beta, integer *t, logical *rnd, 
-	doublereal *eps, integer *emin, doublereal *rmin, integer *emax, 
+/* Subroutine */ integer dlamc2_(integer *beta, integer *t, logical *rnd,
+	doublereal *eps, integer *emin, doublereal *rmin, integer *emax,
 	doublereal *rmax)
 {
-/*  -- LAPACK auxiliary routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       October 31, 1992   
+/*  -- LAPACK auxiliary routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       October 31, 1992
+
+
+    Purpose
+    =======
+
+    DLAMC2 determines the machine parameters specified in its argument
+    list.
 
+    Arguments
+    =========
 
-    Purpose   
-    =======   
+    BETA    (output) INTEGER
+            The base of the machine.
 
-    DLAMC2 determines the machine parameters specified in its argument   
-    list.   
+    T       (output) INTEGER
+            The number of ( BETA ) digits in the mantissa.
 
-    Arguments   
-    =========   
+    RND     (output) LOGICAL
+            Specifies whether proper rounding  ( RND = .TRUE. )  or
+            chopping  ( RND = .FALSE. )  occurs in addition. This may not
 
-    BETA    (output) INTEGER   
-            The base of the machine.   
+            be a reliable guide to the way in which the machine performs
 
-    T       (output) INTEGER   
-            The number of ( BETA ) digits in the mantissa.   
+            its arithmetic.
 
-    RND     (output) LOGICAL   
-            Specifies whether proper rounding  ( RND = .TRUE. )  or   
-            chopping  ( RND = .FALSE. )  occurs in addition. This may not 
-  
-            be a reliable guide to the way in which the machine performs 
-  
-            its arithmetic.   
+    EPS     (output) DOUBLE PRECISION
+            The smallest positive number such that
 
-    EPS     (output) DOUBLE PRECISION   
-            The smallest positive number such that   
+               fl( 1.0 - EPS ) .LT. 1.0,
 
-               fl( 1.0 - EPS ) .LT. 1.0,   
+            where fl denotes the computed value.
 
-            where fl denotes the computed value.   
+    EMIN    (output) INTEGER
+            The minimum exponent before (gradual) underflow occurs.
 
-    EMIN    (output) INTEGER   
-            The minimum exponent before (gradual) underflow occurs.   
+    RMIN    (output) DOUBLE PRECISION
+            The smallest normalized number for the machine, given by
+            BASE**( EMIN - 1 ), where  BASE  is the floating point value
 
-    RMIN    (output) DOUBLE PRECISION   
-            The smallest normalized number for the machine, given by   
-            BASE**( EMIN - 1 ), where  BASE  is the floating point value 
-  
-            of BETA.   
+            of BETA.
 
-    EMAX    (output) INTEGER   
-            The maximum exponent before overflow occurs.   
+    EMAX    (output) INTEGER
+            The maximum exponent before overflow occurs.
 
-    RMAX    (output) DOUBLE PRECISION   
-            The largest positive number for the machine, given by   
-            BASE**EMAX * ( 1 - EPS ), where  BASE  is the floating point 
-  
-            value of BETA.   
+    RMAX    (output) DOUBLE PRECISION
+            The largest positive number for the machine, given by
+            BASE**EMAX * ( 1 - EPS ), where  BASE  is the floating point
 
-    Further Details   
-    ===============   
+            value of BETA.
 
-    The computation of  EPS  is based on a routine PARANOIA by   
-    W. Kahan of the University of California at Berkeley.   
+    Further Details
+    ===============
 
-   ===================================================================== 
+    The computation of  EPS  is based on a routine PARANOIA by
+    W. Kahan of the University of California at Berkeley.
+
+   =====================================================================
 */
     /* Table of constant values */
-/***static integer c__1 = 1;***/
-    
+/*** integer c__1 = 1;***/
+
     /* Initialized data */
-    static logical first = TRUE_;
-    static logical iwarn = FALSE_;
+    logical first = TRUE_;
+    logical iwarn = FALSE_;
     /* System generated locals */
     integer i__1;
     doublereal d__1, d__2, d__3, d__4, d__5;
     /* Builtin functions */
     doublereal pow_di(doublereal *, integer *);
     /* Local variables */
-    static logical ieee;
-    static doublereal half;
-    static logical lrnd;
-    static doublereal leps, zero, a, b, c;
-    static integer i, lbeta;
-    static doublereal rbase;
-    static integer lemin, lemax, gnmin;
-    static doublereal small;
-    static integer gpmin;
-    static doublereal third, lrmin, lrmax, sixth;
-    extern /* Subroutine */ integer dlamc1_(integer *, integer *, logical *, 
+    logical ieee;
+    doublereal half;
+    logical lrnd= FALSE_;
+    doublereal leps = 0., zero, a, b, c;
+    integer i, lbeta = 0;
+    doublereal rbase;
+    integer lemin = 0, lemax = 0, gnmin;
+    doublereal small;
+    integer gpmin;
+    doublereal third, lrmin = 0., lrmax = 0., sixth;
+    extern /* Subroutine */ integer dlamc1_(integer *, integer *, logical *,
 	    logical *);
     extern doublereal dlamc3_(doublereal *, doublereal *);
-    static logical lieee1;
-    extern /* Subroutine */ integer dlamc4_(integer *, doublereal *, integer *), 
-	    dlamc5_(integer *, integer *, integer *, logical *, integer *, 
+    logical lieee1;
+    extern /* Subroutine */ integer dlamc4_(integer *, doublereal *, integer *),
+	    dlamc5_(integer *, integer *, integer *, logical *, integer *,
 	    doublereal *);
-    static integer lt, ngnmin, ngpmin;
-    static doublereal one, two;
+    integer lt = 0, ngnmin, ngpmin;
+    doublereal one, two;
 
 
 
@@ -452,16 +452,16 @@ for
 	two = 2.;
 
 /*        LBETA, LT, LRND, LEPS, LEMIN and LRMIN  are the local values
- of   
-          BETA, T, RND, EPS, EMIN and RMIN.   
+ of
+          BETA, T, RND, EPS, EMIN and RMIN.
 
           Throughout this routine  we use the function  DLAMC3  to ens
-ure   
-          that relevant values are stored  and not held in registers, 
- or   
-          are not affected by optimizers.   
+ure
+          that relevant values are stored  and not held in registers,
+ or
+          are not affected by optimizers.
 
-          DLAMC1 returns the parameters  LBETA, LT, LRND and LIEEE1. 
+          DLAMC1 returns the parameters  LBETA, LT, LRND and LIEEE1.
 */
 
 	dlamc1_(&lbeta, &lt, &lrnd, &lieee1);
@@ -516,12 +516,12 @@ PS. */
 	    leps = a;
 	}
 
-/*        Computation of EPS complete.   
+/*        Computation of EPS complete.
 
           Now find  EMIN.  Let A = + or - 1, and + or - (1 + BASE**(-3
-)).   
+)).
           Keep dividing  A by BETA until (gradual) underflow occurs. T
-his   
+his
           is detected when we cannot recover the previous A. */
 
 	rbase = one / lbeta;
@@ -544,13 +544,13 @@ his
 	    if (ngpmin == gpmin) {
 		lemin = ngpmin;
 /*            ( Non twos-complement machines, no gradual under
-flow;   
+flow;
                 e.g.,  VAX ) */
 	    } else if (gpmin - ngpmin == 3) {
 		lemin = ngpmin - 1 + lt;
 		ieee = TRUE_;
 /*            ( Non twos-complement machines, with gradual und
-erflow;   
+erflow;
                 e.g., IEEE standard followers ) */
 	    } else {
 		lemin = min(ngpmin,gpmin);
@@ -562,7 +562,7 @@ erflow;
 	    if ((i__1 = ngpmin - ngnmin, abs(i__1)) == 1) {
 		lemin = max(ngpmin,ngnmin);
 /*            ( Twos-complement machines, no gradual underflow
-;   
+;
                 e.g., CYBER 205 ) */
 	    } else {
 		lemin = min(ngpmin,ngnmin);
@@ -575,7 +575,7 @@ erflow;
 	    if (gpmin - min(ngpmin,ngnmin) == 3) {
 		lemin = max(ngpmin,ngnmin) - 1 + lt;
 /*            ( Twos-complement machines with gradual underflo
-w;   
+w;
                 no known machine ) */
 	    } else {
 		lemin = min(ngpmin,ngnmin);
@@ -590,33 +590,33 @@ w;
 /*         ( A guess; no known machine ) */
 	    iwarn = TRUE_;
 	}
-/* **   
+/* **
    Comment out this if block if EMIN is ok */
 	if (iwarn) {
 	    first = TRUE_;
 	    hypre_printf("\n\n WARNING. The value EMIN may be incorrect:- ");
 	    hypre_printf("EMIN = %8i\n",(integer)lemin);
 	    hypre_printf("If, after inspection, the value EMIN looks acceptable");
-            hypre_printf("please comment out \n the IF block as marked within the"); 
-            hypre_printf("code of routine DLAMC2, \n otherwise supply EMIN"); 
+            hypre_printf("please comment out \n the IF block as marked within the");
+            hypre_printf("code of routine DLAMC2, \n otherwise supply EMIN");
             hypre_printf("explicitly.\n");
 	}
-/* **   
+/* **
 
           Assume IEEE arithmetic if we found denormalised  numbers abo
-ve,   
+ve,
           or if arithmetic seems to round in the  IEEE style,  determi
-ned   
+ned
           in routine DLAMC1. A true IEEE machine should have both  thi
-ngs   
+ngs
           true; however, faulty machines may have one or the other. */
 
 	ieee = ieee || lieee1;
 
 /*        Compute  RMIN by successive division by  BETA. We could comp
-ute   
+ute
           RMIN as BASE**( EMIN - 1 ),  but some machines underflow dur
-ing   
+ing
           this computation. */
 
 	lrmin = 1.;
@@ -650,30 +650,30 @@ ing
 
 doublereal dlamc3_(doublereal *a, doublereal *b)
 {
-/*  -- LAPACK auxiliary routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       October 31, 1992   
+/*  -- LAPACK auxiliary routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       October 31, 1992
+
+
+    Purpose
+    =======
 
+    DLAMC3  is intended to force  A  and  B  to be stored prior to doing
 
-    Purpose   
-    =======   
+    the addition of  A  and  B ,  for use in situations where optimizers
 
-    DLAMC3  is intended to force  A  and  B  to be stored prior to doing 
-  
-    the addition of  A  and  B ,  for use in situations where optimizers 
-  
-    might hold one of these in a register.   
+    might hold one of these in a register.
 
-    Arguments   
-    =========   
+    Arguments
+    =========
 
-    A, B    (input) DOUBLE PRECISION   
-            The values A and B.   
+    A, B    (input) DOUBLE PRECISION
+            The values A and B.
 
-   ===================================================================== 
+   =====================================================================
 */
-/* >>Start of File<<   
+/* >>Start of File<<
        System generated locals */
     doublereal ret_val;
 
@@ -689,43 +689,43 @@ doublereal dlamc3_(doublereal *a, doublereal *b)
 
 /* Subroutine */ integer dlamc4_(integer *emin, doublereal *start, integer *base)
 {
-/*  -- LAPACK auxiliary routine (version 2.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       October 31, 1992   
+/*  -- LAPACK auxiliary routine (version 2.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       October 31, 1992
 
 
-    Purpose   
-    =======   
+    Purpose
+    =======
 
-    DLAMC4 is a service routine for DLAMC2.   
+    DLAMC4 is a service routine for DLAMC2.
 
-    Arguments   
-    =========   
+    Arguments
+    =========
 
-    EMIN    (output) EMIN   
-            The minimum exponent before (gradual) underflow, computed by 
-  
-            setting A = START and dividing by BASE until the previous A   
-            can not be recovered.   
+    EMIN    (output) EMIN
+            The minimum exponent before (gradual) underflow, computed by
 
-    START   (input) DOUBLE PRECISION   
-            The starting point for determining EMIN.   
+            setting A = START and dividing by BASE until the previous A
+            can not be recovered.
 
-    BASE    (input) INTEGER   
-            The base of the machine.   
+    START   (input) DOUBLE PRECISION
+            The starting point for determining EMIN.
 
-   ===================================================================== 
+    BASE    (input) INTEGER
+            The base of the machine.
+
+   =====================================================================
 */
     /* System generated locals */
 /***integer i__1;***/
     doublereal d__1;
     /* Local variables */
-    static doublereal zero, a;
-    static integer i;
-    static doublereal rbase, b1, b2, c1, c2, d1, d2;
+    doublereal zero, a;
+    integer i;
+    doublereal rbase, b1, b2, c1, c2, d1, d2;
     extern doublereal dlamc3_(doublereal *, doublereal *);
-    static doublereal one;
+    doublereal one;
 
 
 
@@ -740,7 +740,7 @@ doublereal dlamc3_(doublereal *a, doublereal *b)
     c2 = a;
     d1 = a;
     d2 = a;
-/* +    WHILE( ( C1.EQ.A ).AND.( C2.EQ.A ).AND.   
+/* +    WHILE( ( C1.EQ.A ).AND.( C2.EQ.A ).AND.
       $       ( D1.EQ.A ).AND.( D2.EQ.A )      )LOOP */
 L10:
     if (c1 == a && c2 == a && d1 == a && d2 == a) {
@@ -776,72 +776,73 @@ doublereal dlamc3_(doublereal *a, doublereal *b)
 
 } /* dlamc4_ */
 
-/* Subroutine */ integer dlamc5_(integer *beta, integer *p, integer *emin, 
+/* Subroutine */ integer dlamc5_(integer *beta, integer *p, integer *emin,
 	logical *ieee, integer *emax, doublereal *rmax)
 {
-/*  -- LAPACK auxiliary routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       October 31, 1992   
+/*  -- LAPACK auxiliary routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       October 31, 1992
+
+
+    Purpose
+    =======
 
+    DLAMC5 attempts to compute RMAX, the largest machine floating-point
+    number, without overflow.  It assumes that EMAX + abs(EMIN) sum
+    approximately to a power of 2.  It will fail on machines where this
+    assumption does not hold, for example, the Cyber 205 (EMIN = -28625,
 
-    Purpose   
-    =======   
+    EMAX = 28718).  It will also fail if the value supplied for EMIN is
+    too large (i.e. too close to zero), probably with overflow.
 
-    DLAMC5 attempts to compute RMAX, the largest machine floating-point   
-    number, without overflow.  It assumes that EMAX + abs(EMIN) sum   
-    approximately to a power of 2.  It will fail on machines where this   
-    assumption does not hold, for example, the Cyber 205 (EMIN = -28625, 
-  
-    EMAX = 28718).  It will also fail if the value supplied for EMIN is   
-    too large (i.e. too close to zero), probably with overflow.   
+    Arguments
+    =========
 
-    Arguments   
-    =========   
+    BETA    (input) INTEGER
+            The base of floating-point arithmetic.
 
-    BETA    (input) INTEGER   
-            The base of floating-point arithmetic.   
+    P       (input) INTEGER
+            The number of base BETA digits in the mantissa of a
+            floating-point value.
 
-    P       (input) INTEGER   
-            The number of base BETA digits in the mantissa of a   
-            floating-point value.   
+    EMIN    (input) INTEGER
+            The minimum exponent before (gradual) underflow.
 
-    EMIN    (input) INTEGER   
-            The minimum exponent before (gradual) underflow.   
+    IEEE    (input) LOGICAL
+            A logical flag specifying whether or not the arithmetic
+            system is thought to comply with the IEEE standard.
 
-    IEEE    (input) LOGICAL   
-            A logical flag specifying whether or not the arithmetic   
-            system is thought to comply with the IEEE standard.   
+    EMAX    (output) INTEGER
+            The largest exponent before overflow
 
-    EMAX    (output) INTEGER   
-            The largest exponent before overflow   
+    RMAX    (output) DOUBLE PRECISION
+            The largest machine floating-point number.
 
-    RMAX    (output) DOUBLE PRECISION   
-            The largest machine floating-point number.   
+   =====================================================================
 
-   ===================================================================== 
-  
 
 
-       First compute LEXP and UEXP, two powers of 2 that bound   
-       abs(EMIN). We then assume that EMAX + abs(EMIN) will sum   
-       approximately to the bound that is closest to abs(EMIN).   
+       First compute LEXP and UEXP, two powers of 2 that bound
+       abs(EMIN). We then assume that EMAX + abs(EMIN) will sum
+       approximately to the bound that is closest to abs(EMIN).
        (EMAX is the exponent of the required number RMAX). */
     /* Table of constant values */
-    static doublereal c_b5 = 0.;
-    
+    doublereal c_b5 = 0.;
+
     /* System generated locals */
 /***integer i__1;***/
     doublereal d__1;
     /* Local variables */
-    static integer lexp;
-    static doublereal oldy;
-    static integer uexp, i;
-    static doublereal y, z;
-    static integer nbits;
+    integer lexp;
+    doublereal oldy = 0.;
+    integer uexp, i;
+    doublereal z;
+    integer nbits;
     extern doublereal dlamc3_(doublereal *, doublereal *);
-    static doublereal recbas;
-    static integer exbits, expsum, try__;
+    doublereal recbas;
+    integer exbits, expsum, try__;
+    doublereal y;
 
 
 
@@ -861,8 +862,8 @@ doublereal dlamc3_(doublereal *a, doublereal *b)
 	++exbits;
     }
 
-/*     Now -LEXP is less than or equal to EMIN, and -UEXP is greater   
-       than or equal to EMIN. EXBITS is the number of bits needed to   
+/*     Now -LEXP is less than or equal to EMIN, and -UEXP is greater
+       than or equal to EMIN. EXBITS is the number of bits needed to
        store the exponent. */
 
     if (uexp + *emin > -lexp - *emin) {
@@ -871,32 +872,32 @@ doublereal dlamc3_(doublereal *a, doublereal *b)
 	expsum = uexp << 1;
     }
 
-/*     EXPSUM is the exponent range, approximately equal to   
+/*     EXPSUM is the exponent range, approximately equal to
        EMAX - EMIN + 1 . */
 
     *emax = expsum + *emin - 1;
     nbits = exbits + 1 + *p;
 
-/*     NBITS is the total number of bits needed to store a   
+/*     NBITS is the total number of bits needed to store a
        floating-point number. */
 
     if (nbits % 2 == 1 && *beta == 2) {
 
-/*        Either there are an odd number of bits used to store a   
-          floating-point number, which is unlikely, or some bits are 
-  
+/*        Either there are an odd number of bits used to store a
+          floating-point number, which is unlikely, or some bits are
+
           not used in the representation of numbers, which is possible
-,   
-          (e.g. Cray machines) or the mantissa has an implicit bit,   
+,
+          (e.g. Cray machines) or the mantissa has an implicit bit,
           (e.g. IEEE machines, Dec Vax machines), which is perhaps the
-   
-          most likely. We have to assume the last alternative.   
-          If this is true, then we need to reduce EMAX by one because 
-  
+
+          most likely. We have to assume the last alternative.
+          If this is true, then we need to reduce EMAX by one because
+
           there must be some way of representing zero in an implicit-b
-it   
-          system. On machines like Cray, we are reducing EMAX by one 
-  
+it
+          system. On machines like Cray, we are reducing EMAX by one
+
           unnecessarily. */
 
 	--(*emax);
@@ -905,16 +906,16 @@ it
     if (*ieee) {
 
 /*        Assume we are on an IEEE machine which reserves one exponent
-   
+
           for infinity and NaN. */
 
 	--(*emax);
     }
 
-/*     Now create RMAX, the largest machine number, which should   
-       be equal to (1.0 - BETA**(-P)) * BETA**EMAX .   
+/*     Now create RMAX, the largest machine number, which should
+       be equal to (1.0 - BETA**(-P)) * BETA**EMAX .
 
-       First compute 1.0 - BETA**(-P), being careful that the   
+       First compute 1.0 - BETA**(-P), being careful that the
        result is less than 1.0 . */
 
     recbas = 1. / *beta;
@@ -937,7 +938,7 @@ it
 
 /***i__1 = *emax;***/
     for (i = 1; i <= *emax; ++i) {
-	d__1 = y * *beta;
+	d__1 = y * ((doublereal) *beta);
 	y = dlamc3_(&d__1, &c_b5);
 /* L30: */
     }
diff --git a/external/hypre/src/lapack/dlange.c b/external/hypre/src/lapack/dlange.c
index 64d4598e..267085e0 100644
--- a/external/hypre/src/lapack/dlange.c
+++ b/external/hypre/src/lapack/dlange.c
@@ -8,85 +8,85 @@ extern "C" {
 #include "f2c.h"
 #include "hypre_lapack.h"
 
-doublereal dlange_(const char *norm, integer *m, integer *n, doublereal *a, integer 
+doublereal dlange_(const char *norm, integer *m, integer *n, doublereal *a, integer
 	*lda, doublereal *work)
 {
-/*  -- LAPACK auxiliary routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       October 31, 1992   
+/*  -- LAPACK auxiliary routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       October 31, 1992
 
 
-    Purpose   
-    =======   
+    Purpose
+    =======
 
-    DLANGE  returns the value of the one norm,  or the Frobenius norm, or   
-    the  infinity norm,  or the  element of  largest absolute value  of a   
-    real matrix A.   
+    DLANGE  returns the value of the one norm,  or the Frobenius norm, or
+    the  infinity norm,  or the  element of  largest absolute value  of a
+    real matrix A.
 
-    Description   
-    ===========   
+    Description
+    ===========
 
-    DLANGE returns the value   
+    DLANGE returns the value
 
-       DLANGE = ( max(abs(A(i,j))), NORM = 'M' or 'm'   
-                (   
-                ( norm1(A),         NORM = '1', 'O' or 'o'   
-                (   
-                ( normI(A),         NORM = 'I' or 'i'   
-                (   
-                ( normF(A),         NORM = 'F', 'f', 'E' or 'e'   
+       DLANGE = ( max(abs(A(i,j))), NORM = 'M' or 'm'
+                (
+                ( norm1(A),         NORM = '1', 'O' or 'o'
+                (
+                ( normI(A),         NORM = 'I' or 'i'
+                (
+                ( normF(A),         NORM = 'F', 'f', 'E' or 'e'
 
-    where  norm1  denotes the  one norm of a matrix (maximum column sum),   
-    normI  denotes the  infinity norm  of a matrix  (maximum row sum) and   
-    normF  denotes the  Frobenius norm of a matrix (square root of sum of   
-    squares).  Note that  max(abs(A(i,j)))  is not a  matrix norm.   
+    where  norm1  denotes the  one norm of a matrix (maximum column sum),
+    normI  denotes the  infinity norm  of a matrix  (maximum row sum) and
+    normF  denotes the  Frobenius norm of a matrix (square root of sum of
+    squares).  Note that  max(abs(A(i,j)))  is not a  matrix norm.
 
-    Arguments   
-    =========   
+    Arguments
+    =========
 
-    NORM    (input) CHARACTER*1   
-            Specifies the value to be returned in DLANGE as described   
-            above.   
+    NORM    (input) CHARACTER*1
+            Specifies the value to be returned in DLANGE as described
+            above.
 
-    M       (input) INTEGER   
-            The number of rows of the matrix A.  M >= 0.  When M = 0,   
-            DLANGE is set to zero.   
+    M       (input) INTEGER
+            The number of rows of the matrix A.  M >= 0.  When M = 0,
+            DLANGE is set to zero.
 
-    N       (input) INTEGER   
-            The number of columns of the matrix A.  N >= 0.  When N = 0,   
-            DLANGE is set to zero.   
+    N       (input) INTEGER
+            The number of columns of the matrix A.  N >= 0.  When N = 0,
+            DLANGE is set to zero.
 
-    A       (input) DOUBLE PRECISION array, dimension (LDA,N)   
-            The m by n matrix A.   
+    A       (input) DOUBLE PRECISION array, dimension (LDA,N)
+            The m by n matrix A.
 
-    LDA     (input) INTEGER   
-            The leading dimension of the array A.  LDA >= max(M,1).   
+    LDA     (input) INTEGER
+            The leading dimension of the array A.  LDA >= max(M,1).
 
-    WORK    (workspace) DOUBLE PRECISION array, dimension (LWORK),   
-            where LWORK >= M when NORM = 'I'; otherwise, WORK is not   
-            referenced.   
+    WORK    (workspace) DOUBLE PRECISION array, dimension (LWORK),
+            where LWORK >= M when NORM = 'I'; otherwise, WORK is not
+            referenced.
 
-   =====================================================================   
+   =====================================================================
 
 
        Parameter adjustments */
     /* Table of constant values */
-    static integer c__1 = 1;
-    
+    integer c__1 = 1;
+
     /* System generated locals */
     integer a_dim1, a_offset, i__1, i__2;
     doublereal ret_val, d__1, d__2, d__3;
     /* Builtin functions */
     /*doublereal sqrt(doublereal);*/
     /* Local variables */
-    static integer i__, j;
-    static doublereal scale;
+    integer i__, j;
+    doublereal scale;
     extern logical lsame_(const char *,const char *);
-    static doublereal value;
-    extern /* Subroutine */ integer dlassq_(integer *, doublereal *, integer *, 
+    doublereal value;
+    extern /* Subroutine */ integer dlassq_(integer *, doublereal *, integer *,
 	    doublereal *, doublereal *);
-    static doublereal sum;
+    doublereal sum;
 #define a_ref(a_1,a_2) a[(a_2)*a_dim1 + a_1]
 
 
@@ -94,6 +94,7 @@ doublereal dlange_(const char *norm, integer *m, integer *n, doublereal *a, inte
     a_offset = 1 + a_dim1 * 1;
     a -= a_offset;
     --work;
+    value = 0.;
 
     /* Function Body */
     if (min(*m,*n) == 0) {
diff --git a/external/hypre/src/lapack/dlanst.c b/external/hypre/src/lapack/dlanst.c
index 0a49c7f4..b5c55b52 100644
--- a/external/hypre/src/lapack/dlanst.c
+++ b/external/hypre/src/lapack/dlanst.c
@@ -10,76 +10,77 @@ extern "C" {
 
 doublereal dlanst_(const char *norm, integer *n, doublereal *d__, doublereal *e)
 {
-/*  -- LAPACK auxiliary routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       February 29, 1992   
+/*  -- LAPACK auxiliary routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       February 29, 1992
 
 
-    Purpose   
-    =======   
+    Purpose
+    =======
 
-    DLANST  returns the value of the one norm,  or the Frobenius norm, or   
-    the  infinity norm,  or the  element of  largest absolute value  of a   
-    real symmetric tridiagonal matrix A.   
+    DLANST  returns the value of the one norm,  or the Frobenius norm, or
+    the  infinity norm,  or the  element of  largest absolute value  of a
+    real symmetric tridiagonal matrix A.
 
-    Description   
-    ===========   
+    Description
+    ===========
 
-    DLANST returns the value   
+    DLANST returns the value
 
-       DLANST = ( max(abs(A(i,j))), NORM = 'M' or 'm'   
-                (   
-                ( norm1(A),         NORM = '1', 'O' or 'o'   
-                (   
-                ( normI(A),         NORM = 'I' or 'i'   
-                (   
-                ( normF(A),         NORM = 'F', 'f', 'E' or 'e'   
+       DLANST = ( max(abs(A(i,j))), NORM = 'M' or 'm'
+                (
+                ( norm1(A),         NORM = '1', 'O' or 'o'
+                (
+                ( normI(A),         NORM = 'I' or 'i'
+                (
+                ( normF(A),         NORM = 'F', 'f', 'E' or 'e'
 
-    where  norm1  denotes the  one norm of a matrix (maximum column sum),   
-    normI  denotes the  infinity norm  of a matrix  (maximum row sum) and   
-    normF  denotes the  Frobenius norm of a matrix (square root of sum of   
-    squares).  Note that  max(abs(A(i,j)))  is not a  matrix norm.   
+    where  norm1  denotes the  one norm of a matrix (maximum column sum),
+    normI  denotes the  infinity norm  of a matrix  (maximum row sum) and
+    normF  denotes the  Frobenius norm of a matrix (square root of sum of
+    squares).  Note that  max(abs(A(i,j)))  is not a  matrix norm.
 
-    Arguments   
-    =========   
+    Arguments
+    =========
 
-    NORM    (input) CHARACTER*1   
-            Specifies the value to be returned in DLANST as described   
-            above.   
+    NORM    (input) CHARACTER*1
+            Specifies the value to be returned in DLANST as described
+            above.
 
-    N       (input) INTEGER   
-            The order of the matrix A.  N >= 0.  When N = 0, DLANST is   
-            set to zero.   
+    N       (input) INTEGER
+            The order of the matrix A.  N >= 0.  When N = 0, DLANST is
+            set to zero.
 
-    D       (input) DOUBLE PRECISION array, dimension (N)   
-            The diagonal elements of A.   
+    D       (input) DOUBLE PRECISION array, dimension (N)
+            The diagonal elements of A.
 
-    E       (input) DOUBLE PRECISION array, dimension (N-1)   
-            The (n-1) sub-diagonal or super-diagonal elements of A.   
+    E       (input) DOUBLE PRECISION array, dimension (N-1)
+            The (n-1) sub-diagonal or super-diagonal elements of A.
 
-    =====================================================================   
+    =====================================================================
 
 
        Parameter adjustments */
     /* Table of constant values */
-    static integer c__1 = 1;
-    
+    integer c__1 = 1;
+
     /* System generated locals */
     integer i__1;
     doublereal ret_val, d__1, d__2, d__3, d__4, d__5;
     /* Local variables */
-    static integer i__;
-    static doublereal scale;
+    integer i__;
+    doublereal scale;
     extern logical lsame_(const char *,const char *);
-    static doublereal anorm;
-    extern /* Subroutine */ integer dlassq_(integer *, doublereal *, integer *, 
+    doublereal anorm;
+    extern /* Subroutine */ integer dlassq_(integer *, doublereal *, integer *,
 	    doublereal *, doublereal *);
-    static doublereal sum;
+    doublereal sum;
 
 
     --e;
     --d__;
+    anorm = 0.;
 
     /* Function Body */
     if (*n <= 0) {
diff --git a/external/hypre/src/lapack/dlansy.c b/external/hypre/src/lapack/dlansy.c
index 77ccf479..d482aded 100644
--- a/external/hypre/src/lapack/dlansy.c
+++ b/external/hypre/src/lapack/dlansy.c
@@ -8,94 +8,94 @@ extern "C" {
 #include "f2c.h"
 #include "hypre_lapack.h"
 
-doublereal dlansy_(const char *norm,const char *uplo, integer *n, doublereal *a, integer 
+doublereal dlansy_(const char *norm,const char *uplo, integer *n, doublereal *a, integer
 	*lda, doublereal *work)
 {
-/*  -- LAPACK auxiliary routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       October 31, 1992   
+/*  -- LAPACK auxiliary routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       October 31, 1992
 
 
-    Purpose   
-    =======   
+    Purpose
+    =======
 
-    DLANSY  returns the value of the one norm,  or the Frobenius norm, or   
-    the  infinity norm,  or the  element of  largest absolute value  of a   
-    real symmetric matrix A.   
+    DLANSY  returns the value of the one norm,  or the Frobenius norm, or
+    the  infinity norm,  or the  element of  largest absolute value  of a
+    real symmetric matrix A.
 
-    Description   
-    ===========   
+    Description
+    ===========
 
-    DLANSY returns the value   
+    DLANSY returns the value
 
-       DLANSY = ( max(abs(A(i,j))), NORM = 'M' or 'm'   
-                (   
-                ( norm1(A),         NORM = '1', 'O' or 'o'   
-                (   
-                ( normI(A),         NORM = 'I' or 'i'   
-                (   
-                ( normF(A),         NORM = 'F', 'f', 'E' or 'e'   
+       DLANSY = ( max(abs(A(i,j))), NORM = 'M' or 'm'
+                (
+                ( norm1(A),         NORM = '1', 'O' or 'o'
+                (
+                ( normI(A),         NORM = 'I' or 'i'
+                (
+                ( normF(A),         NORM = 'F', 'f', 'E' or 'e'
 
-    where  norm1  denotes the  one norm of a matrix (maximum column sum),   
-    normI  denotes the  infinity norm  of a matrix  (maximum row sum) and   
-    normF  denotes the  Frobenius norm of a matrix (square root of sum of   
-    squares).  Note that  max(abs(A(i,j)))  is not a  matrix norm.   
+    where  norm1  denotes the  one norm of a matrix (maximum column sum),
+    normI  denotes the  infinity norm  of a matrix  (maximum row sum) and
+    normF  denotes the  Frobenius norm of a matrix (square root of sum of
+    squares).  Note that  max(abs(A(i,j)))  is not a  matrix norm.
 
-    Arguments   
-    =========   
+    Arguments
+    =========
 
-    NORM    (input) CHARACTER*1   
-            Specifies the value to be returned in DLANSY as described   
-            above.   
+    NORM    (input) CHARACTER*1
+            Specifies the value to be returned in DLANSY as described
+            above.
 
-    UPLO    (input) CHARACTER*1   
-            Specifies whether the upper or lower triangular part of the   
-            symmetric matrix A is to be referenced.   
-            = 'U':  Upper triangular part of A is referenced   
-            = 'L':  Lower triangular part of A is referenced   
+    UPLO    (input) CHARACTER*1
+            Specifies whether the upper or lower triangular part of the
+            symmetric matrix A is to be referenced.
+            = 'U':  Upper triangular part of A is referenced
+            = 'L':  Lower triangular part of A is referenced
 
-    N       (input) INTEGER   
-            The order of the matrix A.  N >= 0.  When N = 0, DLANSY is   
-            set to zero.   
+    N       (input) INTEGER
+            The order of the matrix A.  N >= 0.  When N = 0, DLANSY is
+            set to zero.
 
-    A       (input) DOUBLE PRECISION array, dimension (LDA,N)   
-            The symmetric matrix A.  If UPLO = 'U', the leading n by n   
-            upper triangular part of A contains the upper triangular part   
-            of the matrix A, and the strictly lower triangular part of A   
-            is not referenced.  If UPLO = 'L', the leading n by n lower   
-            triangular part of A contains the lower triangular part of   
-            the matrix A, and the strictly upper triangular part of A is   
-            not referenced.   
+    A       (input) DOUBLE PRECISION array, dimension (LDA,N)
+            The symmetric matrix A.  If UPLO = 'U', the leading n by n
+            upper triangular part of A contains the upper triangular part
+            of the matrix A, and the strictly lower triangular part of A
+            is not referenced.  If UPLO = 'L', the leading n by n lower
+            triangular part of A contains the lower triangular part of
+            the matrix A, and the strictly upper triangular part of A is
+            not referenced.
 
-    LDA     (input) INTEGER   
-            The leading dimension of the array A.  LDA >= max(N,1).   
+    LDA     (input) INTEGER
+            The leading dimension of the array A.  LDA >= max(N,1).
 
-    WORK    (workspace) DOUBLE PRECISION array, dimension (LWORK),   
-            where LWORK >= N when NORM = 'I' or '1' or 'O'; otherwise,   
-            WORK is not referenced.   
+    WORK    (workspace) DOUBLE PRECISION array, dimension (LWORK),
+            where LWORK >= N when NORM = 'I' or '1' or 'O'; otherwise,
+            WORK is not referenced.
 
-   =====================================================================   
+   =====================================================================
 
 
        Parameter adjustments */
     /* Table of constant values */
-    static integer c__1 = 1;
-    
+     integer c__1 = 1;
+
     /* System generated locals */
     integer a_dim1, a_offset, i__1, i__2;
     doublereal ret_val, d__1, d__2, d__3;
     /* Builtin functions */
     /*doublereal sqrt(doublereal);*/
     /* Local variables */
-    static doublereal absa;
-    static integer i__, j;
-    static doublereal scale;
+     doublereal absa;
+     integer i__, j;
+     doublereal scale;
     extern logical lsame_(const char *,const char *);
-    static doublereal value;
-    extern /* Subroutine */ integer dlassq_(integer *, doublereal *, integer *, 
+     doublereal value;
+    extern /* Subroutine */ integer dlassq_(integer *, doublereal *, integer *,
 	    doublereal *, doublereal *);
-    static doublereal sum;
+     doublereal sum;
 #define a_ref(a_1,a_2) a[(a_2)*a_dim1 + a_1]
 
 
@@ -103,6 +103,7 @@ doublereal dlansy_(const char *norm,const char *uplo, integer *n, doublereal *a,
     a_offset = 1 + a_dim1 * 1;
     a -= a_offset;
     --work;
+    value = 0.;
 
     /* Function Body */
     if (*n == 0) {
diff --git a/external/hypre/src/lapack/dlapy2.c b/external/hypre/src/lapack/dlapy2.c
index 64bc4314..d54a16b5 100644
--- a/external/hypre/src/lapack/dlapy2.c
+++ b/external/hypre/src/lapack/dlapy2.c
@@ -10,24 +10,24 @@ extern "C" {
 
 doublereal dlapy2_(doublereal *x, doublereal *y)
 {
-/*  -- LAPACK auxiliary routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       October 31, 1992   
+/*  -- LAPACK auxiliary routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       October 31, 1992
 
 
-    Purpose   
-    =======   
+    Purpose
+    =======
 
-    DLAPY2 returns sqrt(x**2+y**2), taking care not to cause unnecessary   
-    overflow.   
+    DLAPY2 returns sqrt(x**2+y**2), taking care not to cause unnecessary
+    overflow.
 
-    Arguments   
-    =========   
+    Arguments
+    =========
 
-    X       (input) DOUBLE PRECISION   
-    Y       (input) DOUBLE PRECISION   
-            X and Y specify the values x and y.   
+    X       (input) DOUBLE PRECISION
+    Y       (input) DOUBLE PRECISION
+            X and Y specify the values x and y.
 
     ===================================================================== */
     /* System generated locals */
@@ -35,7 +35,7 @@ doublereal dlapy2_(doublereal *x, doublereal *y)
     /* Builtin functions */
     /*doublereal sqrt(doublereal);*/
     /* Local variables */
-    static doublereal xabs, yabs, w, z__;
+    doublereal xabs, yabs, w, z__;
 
 
 
diff --git a/external/hypre/src/lapack/dlarf.c b/external/hypre/src/lapack/dlarf.c
index 1f1cc74a..f8792349 100644
--- a/external/hypre/src/lapack/dlarf.c
+++ b/external/hypre/src/lapack/dlarf.c
@@ -9,83 +9,83 @@ extern "C" {
 #include "hypre_lapack.h"
 
 /* Subroutine */ integer dlarf_(const char *side, integer *m, integer *n, doublereal *v,
-	 integer *incv, doublereal *tau, doublereal *c__, integer *ldc, 
+	 integer *incv, doublereal *tau, doublereal *c__, integer *ldc,
 	doublereal *work)
 {
-/*  -- LAPACK auxiliary routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       February 29, 1992   
+/*  -- LAPACK auxiliary routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       February 29, 1992
 
 
-    Purpose   
-    =======   
+    Purpose
+    =======
 
-    DLARF applies a real elementary reflector H to a real m by n matrix   
-    C, from either the left or the right. H is represented in the form   
+    DLARF applies a real elementary reflector H to a real m by n matrix
+    C, from either the left or the right. H is represented in the form
 
-          H = I - tau * v * v'   
+          H = I - tau * v * v'
 
-    where tau is a real scalar and v is a real vector.   
+    where tau is a real scalar and v is a real vector.
 
-    If tau = 0, then H is taken to be the unit matrix.   
+    If tau = 0, then H is taken to be the unit matrix.
 
-    Arguments   
-    =========   
+    Arguments
+    =========
 
-    SIDE    (input) CHARACTER*1   
-            = 'L': form  H * C   
-            = 'R': form  C * H   
+    SIDE    (input) CHARACTER*1
+            = 'L': form  H * C
+            = 'R': form  C * H
 
-    M       (input) INTEGER   
-            The number of rows of the matrix C.   
+    M       (input) INTEGER
+            The number of rows of the matrix C.
 
-    N       (input) INTEGER   
-            The number of columns of the matrix C.   
+    N       (input) INTEGER
+            The number of columns of the matrix C.
 
-    V       (input) DOUBLE PRECISION array, dimension   
-                       (1 + (M-1)*abs(INCV)) if SIDE = 'L'   
-                    or (1 + (N-1)*abs(INCV)) if SIDE = 'R'   
-            The vector v in the representation of H. V is not used if   
-            TAU = 0.   
+    V       (input) DOUBLE PRECISION array, dimension
+                       (1 + (M-1)*abs(INCV)) if SIDE = 'L'
+                    or (1 + (N-1)*abs(INCV)) if SIDE = 'R'
+            The vector v in the representation of H. V is not used if
+            TAU = 0.
 
-    INCV    (input) INTEGER   
-            The increment between elements of v. INCV <> 0.   
+    INCV    (input) INTEGER
+            The increment between elements of v. INCV <> 0.
 
-    TAU     (input) DOUBLE PRECISION   
-            The value tau in the representation of H.   
+    TAU     (input) DOUBLE PRECISION
+            The value tau in the representation of H.
 
-    C       (input/output) DOUBLE PRECISION array, dimension (LDC,N)   
-            On entry, the m by n matrix C.   
-            On exit, C is overwritten by the matrix H * C if SIDE = 'L',   
-            or C * H if SIDE = 'R'.   
+    C       (input/output) DOUBLE PRECISION array, dimension (LDC,N)
+            On entry, the m by n matrix C.
+            On exit, C is overwritten by the matrix H * C if SIDE = 'L',
+            or C * H if SIDE = 'R'.
 
-    LDC     (input) INTEGER   
-            The leading dimension of the array C. LDC >= max(1,M).   
+    LDC     (input) INTEGER
+            The leading dimension of the array C. LDC >= max(1,M).
 
-    WORK    (workspace) DOUBLE PRECISION array, dimension   
-                           (N) if SIDE = 'L'   
-                        or (M) if SIDE = 'R'   
+    WORK    (workspace) DOUBLE PRECISION array, dimension
+                           (N) if SIDE = 'L'
+                        or (M) if SIDE = 'R'
 
-    =====================================================================   
+    =====================================================================
 
 
        Parameter adjustments */
     /* Table of constant values */
-    static doublereal c_b4 = 1.;
-    static doublereal c_b5 = 0.;
-    static integer c__1 = 1;
-    
+    doublereal c_b4 = 1.;
+    doublereal c_b5 = 0.;
+    integer c__1 = 1;
+
     /* System generated locals */
     integer c_dim1, c_offset;
     doublereal d__1;
     /* Local variables */
-    extern /* Subroutine */ integer dger_(integer *, integer *, doublereal *, 
-	    doublereal *, integer *, doublereal *, integer *, doublereal *, 
+    extern /* Subroutine */ integer dger_(integer *, integer *, doublereal *,
+	    doublereal *, integer *, doublereal *, integer *, doublereal *,
 	    integer *);
     extern logical lsame_(const char *,const char *);
-    extern /* Subroutine */ integer dgemv_(const char *, integer *, integer *, 
-	    doublereal *, doublereal *, integer *, doublereal *, integer *, 
+    extern /* Subroutine */ integer dgemv_(const char *, integer *, integer *,
+	    doublereal *, doublereal *, integer *, doublereal *, integer *,
 	    doublereal *, doublereal *, integer *);
 
 
@@ -110,7 +110,7 @@ extern "C" {
 /*           C := C - v * w' */
 
 	    d__1 = -(*tau);
-	    dger_(m, n, &d__1, &v[1], incv, &work[1], &c__1, &c__[c_offset], 
+	    dger_(m, n, &d__1, &v[1], incv, &work[1], &c__1, &c__[c_offset],
 		    ldc);
 	}
     } else {
@@ -121,13 +121,13 @@ extern "C" {
 
 /*           w := C * v */
 
-	    dgemv_("No transpose", m, n, &c_b4, &c__[c_offset], ldc, &v[1], 
+	    dgemv_("No transpose", m, n, &c_b4, &c__[c_offset], ldc, &v[1],
 		    incv, &c_b5, &work[1], &c__1);
 
 /*           C := C - w * v' */
 
 	    d__1 = -(*tau);
-	    dger_(m, n, &d__1, &work[1], &c__1, &v[1], incv, &c__[c_offset], 
+	    dger_(m, n, &d__1, &work[1], &c__1, &v[1], incv, &c__[c_offset],
 		    ldc);
 	}
     }
diff --git a/external/hypre/src/lapack/dlarfb.c b/external/hypre/src/lapack/dlarfb.c
index ce7b3eb9..c48c3fe8 100644
--- a/external/hypre/src/lapack/dlarfb.c
+++ b/external/hypre/src/lapack/dlarfb.c
@@ -98,15 +98,15 @@ extern "C" {
 
        Parameter adjustments */
     /* Table of constant values */
-    static integer c__1 = 1;
-    static doublereal c_b14 = 1.;
-    static doublereal c_b25 = -1.;
+     integer c__1 = 1;
+     doublereal c_b14 = 1.;
+     doublereal c_b25 = -1.;
     
     /* System generated locals */
     integer c_dim1, c_offset, t_dim1, t_offset, v_dim1, v_offset, work_dim1, 
 	    work_offset, i__1, i__2;
     /* Local variables */
-    static integer i__, j;
+     integer i__, j;
     extern /* Subroutine */ integer dgemm_(const char *,const char *, integer *, integer *, 
 	    integer *, doublereal *, doublereal *, integer *, doublereal *, 
 	    integer *, doublereal *, doublereal *, integer *);
@@ -115,7 +115,7 @@ extern "C" {
 	    doublereal *, integer *), dtrmm_(const char *,const char *,const char *,const char *, 
 	    integer *, integer *, doublereal *, doublereal *, integer *, 
 	    doublereal *, integer *);
-    static char transt[1];
+     char transt[1];
 #define work_ref(a_1,a_2) work[(a_2)*work_dim1 + a_1]
 #define c___ref(a_1,a_2) c__[(a_2)*c_dim1 + a_1]
 #define v_ref(a_1,a_2) v[(a_2)*v_dim1 + a_1]
diff --git a/external/hypre/src/lapack/dlarfg.c b/external/hypre/src/lapack/dlarfg.c
index 99f8d8db..9686390f 100644
--- a/external/hypre/src/lapack/dlarfg.c
+++ b/external/hypre/src/lapack/dlarfg.c
@@ -8,60 +8,60 @@ extern "C" {
 #include "f2c.h"
 #include "hypre_lapack.h"
 
-/* Subroutine */ integer dlarfg_(integer *n, doublereal *alpha, doublereal *x, 
+/* Subroutine */ integer dlarfg_(integer *n, doublereal *alpha, doublereal *x,
 	integer *incx, doublereal *tau)
 {
-/*  -- LAPACK auxiliary routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       September 30, 1994   
+/*  -- LAPACK auxiliary routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       September 30, 1994
 
 
-    Purpose   
-    =======   
+    Purpose
+    =======
 
-    DLARFG generates a real elementary reflector H of order n, such   
-    that   
+    DLARFG generates a real elementary reflector H of order n, such
+    that
 
-          H * ( alpha ) = ( beta ),   H' * H = I.   
-              (   x   )   (   0  )   
+          H * ( alpha ) = ( beta ),   H' * H = I.
+              (   x   )   (   0  )
 
-    where alpha and beta are scalars, and x is an (n-1)-element real   
-    vector. H is represented in the form   
+    where alpha and beta are scalars, and x is an (n-1)-element real
+    vector. H is represented in the form
 
-          H = I - tau * ( 1 ) * ( 1 v' ) ,   
-                        ( v )   
+          H = I - tau * ( 1 ) * ( 1 v' ) ,
+                        ( v )
 
-    where tau is a real scalar and v is a real (n-1)-element   
-    vector.   
+    where tau is a real scalar and v is a real (n-1)-element
+    vector.
 
-    If the elements of x are all zero, then tau = 0 and H is taken to be   
-    the unit matrix.   
+    If the elements of x are all zero, then tau = 0 and H is taken to be
+    the unit matrix.
 
-    Otherwise  1 <= tau <= 2.   
+    Otherwise  1 <= tau <= 2.
 
-    Arguments   
-    =========   
+    Arguments
+    =========
 
-    N       (input) INTEGER   
-            The order of the elementary reflector.   
+    N       (input) INTEGER
+            The order of the elementary reflector.
 
-    ALPHA   (input/output) DOUBLE PRECISION   
-            On entry, the value alpha.   
-            On exit, it is overwritten with the value beta.   
+    ALPHA   (input/output) DOUBLE PRECISION
+            On entry, the value alpha.
+            On exit, it is overwritten with the value beta.
 
-    X       (input/output) DOUBLE PRECISION array, dimension   
-                           (1+(N-2)*abs(INCX))   
-            On entry, the vector x.   
-            On exit, it is overwritten with the vector v.   
+    X       (input/output) DOUBLE PRECISION array, dimension
+                           (1+(N-2)*abs(INCX))
+            On entry, the vector x.
+            On exit, it is overwritten with the vector v.
 
-    INCX    (input) INTEGER   
-            The increment between elements of X. INCX > 0.   
+    INCX    (input) INTEGER
+            The increment between elements of X. INCX > 0.
 
-    TAU     (output) DOUBLE PRECISION   
-            The value tau.   
+    TAU     (output) DOUBLE PRECISION
+            The value tau.
 
-    =====================================================================   
+    =====================================================================
 
 
        Parameter adjustments */
@@ -71,15 +71,15 @@ extern "C" {
     /* Builtin functions */
     doublereal d_sign(doublereal *, doublereal *);
     /* Local variables */
-    static doublereal beta;
+    doublereal beta;
     extern doublereal dnrm2_(integer *, doublereal *, integer *);
-    static integer j;
-    extern /* Subroutine */ integer dscal_(integer *, doublereal *, doublereal *, 
+    integer j;
+    extern /* Subroutine */ integer dscal_(integer *, doublereal *, doublereal *,
 	    integer *);
-    static doublereal xnorm;
+    doublereal xnorm;
     extern doublereal dlapy2_(doublereal *, doublereal *), dlamch_(const char *);
-    static doublereal safmin, rsafmn;
-    static integer knt;
+    doublereal safmin, rsafmn;
+    integer knt;
 
     --x;
 
diff --git a/external/hypre/src/lapack/dlarft.c b/external/hypre/src/lapack/dlarft.c
index 3820cb34..361679f3 100644
--- a/external/hypre/src/lapack/dlarft.c
+++ b/external/hypre/src/lapack/dlarft.c
@@ -113,21 +113,21 @@ extern "C" {
 
        Parameter adjustments */
     /* Table of constant values */
-    static integer c__1 = 1;
-    static doublereal c_b8 = 0.;
+     integer c__1 = 1;
+     doublereal c_b8 = 0.;
     
     /* System generated locals */
     integer t_dim1, t_offset, v_dim1, v_offset, i__1, i__2, i__3;
     doublereal d__1;
     /* Local variables */
-    static integer i__, j;
+     integer i__, j;
     extern logical lsame_(const char *,const char *);
     extern /* Subroutine */ integer dgemv_(const char *, integer *, integer *, 
 	    doublereal *, doublereal *, integer *, doublereal *, integer *, 
 	    doublereal *, doublereal *, integer *), dtrmv_(const char *, 
 	    const char *,const char *, integer *, doublereal *, integer *, doublereal *, 
 	    integer *);
-    static doublereal vii;
+     doublereal vii;
 #define t_ref(a_1,a_2) t[(a_2)*t_dim1 + a_1]
 #define v_ref(a_1,a_2) v[(a_2)*v_dim1 + a_1]
 
diff --git a/external/hypre/src/lapack/dlartg.c b/external/hypre/src/lapack/dlartg.c
index 76315071..9fe4bc70 100644
--- a/external/hypre/src/lapack/dlartg.c
+++ b/external/hypre/src/lapack/dlartg.c
@@ -8,54 +8,54 @@ extern "C" {
 #include "f2c.h"
 #include "hypre_lapack.h"
 
-/* Subroutine */ integer dlartg_(doublereal *f, doublereal *g, doublereal *cs, 
+/* Subroutine */ integer dlartg_(doublereal *f, doublereal *g, doublereal *cs,
 	doublereal *sn, doublereal *r__)
 {
-/*  -- LAPACK auxiliary routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       September 30, 1994   
+/*  -- LAPACK auxiliary routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       September 30, 1994
 
 
-    Purpose   
-    =======   
+    Purpose
+    =======
 
-    DLARTG generate a plane rotation so that   
+    DLARTG generate a plane rotation so that
 
-       [  CS  SN  ]  .  [ F ]  =  [ R ]   where CS**2 + SN**2 = 1.   
-       [ -SN  CS  ]     [ G ]     [ 0 ]   
+       [  CS  SN  ]  .  [ F ]  =  [ R ]   where CS**2 + SN**2 = 1.
+       [ -SN  CS  ]     [ G ]     [ 0 ]
 
-    This is a slower, more accurate version of the BLAS1 routine DROTG,   
-    with the following other differences:   
-       F and G are unchanged on return.   
-       If G=0, then CS=1 and SN=0.   
-       If F=0 and (G .ne. 0), then CS=0 and SN=1 without doing any   
-          floating point operations (saves work in DBDSQR when   
-          there are zeros on the diagonal).   
+    This is a slower, more accurate version of the BLAS1 routine DROTG,
+    with the following other differences:
+       F and G are unchanged on return.
+       If G=0, then CS=1 and SN=0.
+       If F=0 and (G .ne. 0), then CS=0 and SN=1 without doing any
+          floating point operations (saves work in DBDSQR when
+          there are zeros on the diagonal).
 
-    If F exceeds G in magnitude, CS will be positive.   
+    If F exceeds G in magnitude, CS will be positive.
 
-    Arguments   
-    =========   
+    Arguments
+    =========
 
-    F       (input) DOUBLE PRECISION   
-            The first component of vector to be rotated.   
+    F       (input) DOUBLE PRECISION
+            The first component of vector to be rotated.
 
-    G       (input) DOUBLE PRECISION   
-            The second component of vector to be rotated.   
+    G       (input) DOUBLE PRECISION
+            The second component of vector to be rotated.
 
-    CS      (output) DOUBLE PRECISION   
-            The cosine of the rotation.   
+    CS      (output) DOUBLE PRECISION
+            The cosine of the rotation.
 
-    SN      (output) DOUBLE PRECISION   
-            The sine of the rotation.   
+    SN      (output) DOUBLE PRECISION
+            The sine of the rotation.
 
-    R       (output) DOUBLE PRECISION   
-            The nonzero component of the rotated vector.   
+    R       (output) DOUBLE PRECISION
+            The nonzero component of the rotated vector.
 
     ===================================================================== */
     /* Initialized data */
-    static logical first = TRUE_;
+    logical first = TRUE_;
     /* System generated locals */
     integer i__1;
     doublereal d__1, d__2;
@@ -63,12 +63,12 @@ extern "C" {
 //    doublereal log(doublereal), pow_di(doublereal *, integer *), sqrt(doublereal);
     doublereal pow_di(doublereal *, integer *);
     /* Local variables */
-    static integer i__;
-    static doublereal scale;
-    static integer count;
-    static doublereal f1, g1, safmn2, safmx2;
+    integer i__;
+    doublereal scale;
+    integer count;
+    doublereal f1, g1, safmn2, safmx2;
     extern doublereal dlamch_(const char *);
-//    static doublereal safmin, eps;
+//     doublereal safmin, eps;
 
 
 
@@ -77,7 +77,7 @@ extern "C" {
 //	safmin = dlamch_("S");
 //	eps = dlamch_("E");
 	d__1 = dlamch_("B");
-//	i__1 = (integer) (log(safmin / eps) / log(dlamch_("B")) / 
+//	i__1 = (integer) (log(safmin / eps) / log(dlamch_("B")) /
 //		2.);
         i__1 = HYPRE_REAL_MIN_EXP>>1;
 	safmn2 = pow_di(&d__1, &i__1);
diff --git a/external/hypre/src/lapack/dlas2.c b/external/hypre/src/lapack/dlas2.c
index 55cca2a6..1e5d51a6 100644
--- a/external/hypre/src/lapack/dlas2.c
+++ b/external/hypre/src/lapack/dlas2.c
@@ -67,7 +67,7 @@ extern "C" {
     /* System generated locals */
     doublereal d__1, d__2;
     /* Local variables */
-    static doublereal fhmn, fhmx, c__, fa, ga, ha, as, at, au;
+     doublereal fhmn, fhmx, c__, fa, ga, ha, as, at, au;
 
 
 
diff --git a/external/hypre/src/lapack/dlascl.c b/external/hypre/src/lapack/dlascl.c
index 53bbbaa5..8c351eb8 100644
--- a/external/hypre/src/lapack/dlascl.c
+++ b/external/hypre/src/lapack/dlascl.c
@@ -8,94 +8,94 @@ extern "C" {
 #include "f2c.h"
 #include "hypre_lapack.h"
 
-/* Subroutine */ integer dlascl_(const char *type__, integer *kl, integer *ku, 
-	doublereal *cfrom, doublereal *cto, integer *m, integer *n, 
+/* Subroutine */ integer dlascl_(const char *type__, integer *kl, integer *ku,
+	doublereal *cfrom, doublereal *cto, integer *m, integer *n,
 	doublereal *a, integer *lda, integer *info)
 {
-/*  -- LAPACK auxiliary routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       February 29, 1992   
+/*  -- LAPACK auxiliary routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       February 29, 1992
 
 
-    Purpose   
-    =======   
+    Purpose
+    =======
 
-    DLASCL multiplies the M by N real matrix A by the real scalar   
-    CTO/CFROM.  This is done without over/underflow as long as the final   
-    result CTO*A(I,J)/CFROM does not over/underflow. TYPE specifies that   
-    A may be full, upper triangular, lower triangular, upper Hessenberg,   
-    or banded.   
+    DLASCL multiplies the M by N real matrix A by the real scalar
+    CTO/CFROM.  This is done without over/underflow as long as the final
+    result CTO*A(I,J)/CFROM does not over/underflow. TYPE specifies that
+    A may be full, upper triangular, lower triangular, upper Hessenberg,
+    or banded.
 
-    Arguments   
-    =========   
+    Arguments
+    =========
 
-    TYPE    (input) CHARACTER*1   
-            TYPE indices the storage type of the input matrix.   
-            = 'G':  A is a full matrix.   
-            = 'L':  A is a lower triangular matrix.   
-            = 'U':  A is an upper triangular matrix.   
-            = 'H':  A is an upper Hessenberg matrix.   
-            = 'B':  A is a symmetric band matrix with lower bandwidth KL   
-                    and upper bandwidth KU and with the only the lower   
-                    half stored.   
-            = 'Q':  A is a symmetric band matrix with lower bandwidth KL   
-                    and upper bandwidth KU and with the only the upper   
-                    half stored.   
-            = 'Z':  A is a band matrix with lower bandwidth KL and upper   
-                    bandwidth KU.   
+    TYPE    (input) CHARACTER*1
+            TYPE indices the storage type of the input matrix.
+            = 'G':  A is a full matrix.
+            = 'L':  A is a lower triangular matrix.
+            = 'U':  A is an upper triangular matrix.
+            = 'H':  A is an upper Hessenberg matrix.
+            = 'B':  A is a symmetric band matrix with lower bandwidth KL
+                    and upper bandwidth KU and with the only the lower
+                    half stored.
+            = 'Q':  A is a symmetric band matrix with lower bandwidth KL
+                    and upper bandwidth KU and with the only the upper
+                    half stored.
+            = 'Z':  A is a band matrix with lower bandwidth KL and upper
+                    bandwidth KU.
 
-    KL      (input) INTEGER   
-            The lower bandwidth of A.  Referenced only if TYPE = 'B',   
-            'Q' or 'Z'.   
+    KL      (input) INTEGER
+            The lower bandwidth of A.  Referenced only if TYPE = 'B',
+            'Q' or 'Z'.
 
-    KU      (input) INTEGER   
-            The upper bandwidth of A.  Referenced only if TYPE = 'B',   
-            'Q' or 'Z'.   
+    KU      (input) INTEGER
+            The upper bandwidth of A.  Referenced only if TYPE = 'B',
+            'Q' or 'Z'.
 
-    CFROM   (input) DOUBLE PRECISION   
-    CTO     (input) DOUBLE PRECISION   
-            The matrix A is multiplied by CTO/CFROM. A(I,J) is computed   
-            without over/underflow if the final result CTO*A(I,J)/CFROM   
-            can be represented without over/underflow.  CFROM must be   
-            nonzero.   
+    CFROM   (input) DOUBLE PRECISION
+    CTO     (input) DOUBLE PRECISION
+            The matrix A is multiplied by CTO/CFROM. A(I,J) is computed
+            without over/underflow if the final result CTO*A(I,J)/CFROM
+            can be represented without over/underflow.  CFROM must be
+            nonzero.
 
-    M       (input) INTEGER   
-            The number of rows of the matrix A.  M >= 0.   
+    M       (input) INTEGER
+            The number of rows of the matrix A.  M >= 0.
 
-    N       (input) INTEGER   
-            The number of columns of the matrix A.  N >= 0.   
+    N       (input) INTEGER
+            The number of columns of the matrix A.  N >= 0.
 
-    A       (input/output) DOUBLE PRECISION array, dimension (LDA,M)   
-            The matrix to be multiplied by CTO/CFROM.  See TYPE for the   
-            storage type.   
+    A       (input/output) DOUBLE PRECISION array, dimension (LDA,M)
+            The matrix to be multiplied by CTO/CFROM.  See TYPE for the
+            storage type.
 
-    LDA     (input) INTEGER   
-            The leading dimension of the array A.  LDA >= max(1,M).   
+    LDA     (input) INTEGER
+            The leading dimension of the array A.  LDA >= max(1,M).
 
-    INFO    (output) INTEGER   
-            0  - successful exit   
-            <0 - if INFO = -i, the i-th argument had an illegal value.   
+    INFO    (output) INTEGER
+            0  - successful exit
+            <0 - if INFO = -i, the i-th argument had an illegal value.
 
-    =====================================================================   
+    =====================================================================
 
 
-       Test the input arguments   
+       Test the input arguments
 
        Parameter adjustments */
     /* System generated locals */
     integer a_dim1, a_offset, i__1, i__2, i__3, i__4, i__5;
     /* Local variables */
-    static logical done;
-    static doublereal ctoc;
-    static integer i__, j;
+    logical done;
+    doublereal ctoc;
+    integer i__, j;
     extern logical lsame_(const char *,const char *);
-    static integer itype, k1, k2, k3, k4;
-    static doublereal cfrom1;
+    integer itype, k1, k2, k3, k4;
+    doublereal cfrom1;
     extern doublereal dlamch_(const char *);
-    static doublereal cfromc;
+    doublereal cfromc;
     extern /* Subroutine */ integer xerbla_(const char *, integer *);
-    static doublereal bignum, smlnum, mul, cto1;
+    doublereal bignum, smlnum, mul, cto1;
 #define a_ref(a_1,a_2) a[(a_2)*a_dim1 + a_1]
 
     a_dim1 = *lda;
@@ -129,7 +129,7 @@ extern "C" {
 	*info = -4;
     } else if (*m < 0) {
 	*info = -6;
-    } else if ((*n < 0) || ((itype == 4) && (*n != *m)) || 
+    } else if ((*n < 0) || ((itype == 4) && (*n != *m)) ||
                ((itype == 5) && (*n != *m))) {
 	*info = -7;
     } else if ((itype <= 3) && (*lda < max(1,*m))) {
@@ -142,11 +142,11 @@ extern "C" {
 	} else /* if(complicated condition) */ {
 /* Computing MAX */
 	    i__1 = *n - 1;
-	    if ((*ku < 0) || (*ku > max(i__1,0)) || (itype == 4) || 
+	    if ((*ku < 0) || (*ku > max(i__1,0)) || (itype == 4) ||
                 ((itype == 5) && (*kl != *ku))) {
 		*info = -3;
-	    } else if (((itype == 4) && (*lda < (*kl + 1))) || 
-                       ((itype == 5) && (*lda < (*ku + 1))) || 
+	    } else if (((itype == 4) && (*lda < (*kl + 1))) ||
+                       ((itype == 5) && (*lda < (*ku + 1))) ||
                        ((itype == 6) && (*lda < ((*kl << 1) + *ku + 1)))) {
 		*info = -9;
 	    }
diff --git a/external/hypre/src/lapack/dlaset.c b/external/hypre/src/lapack/dlaset.c
index d72084ed..41675c22 100644
--- a/external/hypre/src/lapack/dlaset.c
+++ b/external/hypre/src/lapack/dlaset.c
@@ -11,61 +11,61 @@ extern "C" {
 /* Subroutine */ integer dlaset_(const char *uplo, integer *m, integer *n, doublereal *
 	alpha, doublereal *beta, doublereal *a, integer *lda)
 {
-/*  -- LAPACK auxiliary routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       October 31, 1992   
+/*  -- LAPACK auxiliary routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       October 31, 1992
 
 
-    Purpose   
-    =======   
+    Purpose
+    =======
 
-    DLASET initializes an m-by-n matrix A to BETA on the diagonal and   
-    ALPHA on the offdiagonals.   
+    DLASET initializes an m-by-n matrix A to BETA on the diagonal and
+    ALPHA on the offdiagonals.
 
-    Arguments   
-    =========   
+    Arguments
+    =========
 
-    UPLO    (input) CHARACTER*1   
-            Specifies the part of the matrix A to be set.   
-            = 'U':      Upper triangular part is set; the strictly lower   
-                        triangular part of A is not changed.   
-            = 'L':      Lower triangular part is set; the strictly upper   
-                        triangular part of A is not changed.   
-            Otherwise:  All of the matrix A is set.   
+    UPLO    (input) CHARACTER*1
+            Specifies the part of the matrix A to be set.
+            = 'U':      Upper triangular part is set; the strictly lower
+                        triangular part of A is not changed.
+            = 'L':      Lower triangular part is set; the strictly upper
+                        triangular part of A is not changed.
+            Otherwise:  All of the matrix A is set.
 
-    M       (input) INTEGER   
-            The number of rows of the matrix A.  M >= 0.   
+    M       (input) INTEGER
+            The number of rows of the matrix A.  M >= 0.
 
-    N       (input) INTEGER   
-            The number of columns of the matrix A.  N >= 0.   
+    N       (input) INTEGER
+            The number of columns of the matrix A.  N >= 0.
 
-    ALPHA   (input) DOUBLE PRECISION   
-            The constant to which the offdiagonal elements are to be set.   
+    ALPHA   (input) DOUBLE PRECISION
+            The constant to which the offdiagonal elements are to be set.
 
-    BETA    (input) DOUBLE PRECISION   
-            The constant to which the diagonal elements are to be set.   
+    BETA    (input) DOUBLE PRECISION
+            The constant to which the diagonal elements are to be set.
 
-    A       (input/output) DOUBLE PRECISION array, dimension (LDA,N)   
-            On exit, the leading m-by-n submatrix of A is set as follows:   
+    A       (input/output) DOUBLE PRECISION array, dimension (LDA,N)
+            On exit, the leading m-by-n submatrix of A is set as follows:
 
-            if UPLO = 'U', A(i,j) = ALPHA, 1<=i<=j-1, 1<=j<=n,   
-            if UPLO = 'L', A(i,j) = ALPHA, j+1<=i<=m, 1<=j<=n,   
-            otherwise,     A(i,j) = ALPHA, 1<=i<=m, 1<=j<=n, i.ne.j,   
+            if UPLO = 'U', A(i,j) = ALPHA, 1<=i<=j-1, 1<=j<=n,
+            if UPLO = 'L', A(i,j) = ALPHA, j+1<=i<=m, 1<=j<=n,
+            otherwise,     A(i,j) = ALPHA, 1<=i<=m, 1<=j<=n, i.ne.j,
 
-            and, for all UPLO, A(i,i) = BETA, 1<=i<=min(m,n).   
+            and, for all UPLO, A(i,i) = BETA, 1<=i<=min(m,n).
 
-    LDA     (input) INTEGER   
-            The leading dimension of the array A.  LDA >= max(1,M).   
+    LDA     (input) INTEGER
+            The leading dimension of the array A.  LDA >= max(1,M).
 
-   =====================================================================   
+   =====================================================================
 
 
        Parameter adjustments */
     /* System generated locals */
     integer a_dim1, a_offset, i__1, i__2, i__3;
     /* Local variables */
-    static integer i__, j;
+    integer i__, j;
     extern logical lsame_(const char *,const char *);
 #define a_ref(a_1,a_2) a[(a_2)*a_dim1 + a_1]
 
@@ -76,7 +76,7 @@ extern "C" {
     /* Function Body */
     if (lsame_(uplo, "U")) {
 
-/*        Set the strictly upper triangular or trapezoidal part of the   
+/*        Set the strictly upper triangular or trapezoidal part of the
           array to ALPHA. */
 
 	i__1 = *n;
@@ -93,7 +93,7 @@ extern "C" {
 
     } else if (lsame_(uplo, "L")) {
 
-/*        Set the strictly lower triangular or trapezoidal part of the   
+/*        Set the strictly lower triangular or trapezoidal part of the
           array to ALPHA. */
 
 	i__1 = min(*m,*n);
diff --git a/external/hypre/src/lapack/dlasq1.c b/external/hypre/src/lapack/dlasq1.c
index 3a996792..a6b53c26 100644
--- a/external/hypre/src/lapack/dlasq1.c
+++ b/external/hypre/src/lapack/dlasq1.c
@@ -13,13 +13,7 @@ extern "C" {
 	-lf2c -lm   (in that order)
 */
 
-/* Table of constant values */
-
-static integer c__1 = 1;
-static integer c__2 = 2;
-static integer c__0 = 0;
-
-/* Subroutine */ integer dlasq1_(integer *n, doublereal *d__, doublereal *e, 
+/* Subroutine */ integer dlasq1_(integer *n, doublereal *d__, doublereal *e,
 	doublereal *work, integer *info)
 {
     /* System generated locals */
@@ -27,77 +21,83 @@ static integer c__0 = 0;
     doublereal d__1, d__2, d__3;
 
     /* Local variables */
-    extern /* Subroutine */ integer dlas2_(doublereal *, doublereal *, doublereal 
+    extern /* Subroutine */ integer dlas2_(doublereal *, doublereal *, doublereal
 	    *, doublereal *, doublereal *);
-    static integer i__;
-    static doublereal scale;
-    static integer iinfo;
-    static doublereal sigmn;
-    extern /* Subroutine */ integer dcopy_(integer *, doublereal *, integer *, 
+    integer i__;
+    doublereal scale;
+    integer iinfo;
+    doublereal sigmn;
+    extern /* Subroutine */ integer dcopy_(integer *, doublereal *, integer *,
 	    doublereal *, integer *);
-    static doublereal sigmx;
+    doublereal sigmx;
     extern /* Subroutine */ integer dlasq2_(integer *, doublereal *, integer *);
     extern doublereal dlamch_(const char *);
-    extern /* Subroutine */ integer dlascl_(const char *, integer *, integer *, 
-	    doublereal *, doublereal *, integer *, integer *, doublereal *, 
+    extern /* Subroutine */ integer dlascl_(const char *, integer *, integer *,
+	    doublereal *, doublereal *, integer *, integer *, doublereal *,
 	    integer *, integer *);
-    static doublereal safmin;
+    doublereal safmin;
     extern /* Subroutine */ integer xerbla_(const char *, integer *), dlasrt_(
 	    const char *, integer *, doublereal *, integer *);
-    static doublereal eps;
+    doublereal eps;
+
+    /* Table of constant values */
+    integer c__1 = 1;
+    integer c__2 = 2;
+    integer c__0 = 0;
+
 
 
-/*  -- LAPACK routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       October 31, 1999   
+/*  -- LAPACK routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       October 31, 1999
 
 
-    Purpose   
-    =======   
+    Purpose
+    =======
 
-    DLASQ1 computes the singular values of a real N-by-N bidiagonal   
-    matrix with diagonal D and off-diagonal E. The singular values   
-    are computed to high relative accuracy, in the absence of   
-    denormalization, underflow and overflow. The algorithm was first   
-    presented in   
+    DLASQ1 computes the singular values of a real N-by-N bidiagonal
+    matrix with diagonal D and off-diagonal E. The singular values
+    are computed to high relative accuracy, in the absence of
+    denormalization, underflow and overflow. The algorithm was first
+    presented in
 
-    "Accurate singular values and differential qd algorithms" by K. V.   
-    Fernando and B. N. Parlett, Numer. Math., Vol-67, No. 2, pp. 191-230,   
-    1994,   
+    "Accurate singular values and differential qd algorithms" by K. V.
+    Fernando and B. N. Parlett, Numer. Math., Vol-67, No. 2, pp. 191-230,
+    1994,
 
-    and the present implementation is described in "An implementation of   
-    the dqds Algorithm (Positive Case)", LAPACK Working Note.   
+    and the present implementation is described in "An implementation of
+    the dqds Algorithm (Positive Case)", LAPACK Working Note.
 
-    Arguments   
-    =========   
+    Arguments
+    =========
 
-    N     (input) INTEGER   
-          The number of rows and columns in the matrix. N >= 0.   
+    N     (input) INTEGER
+          The number of rows and columns in the matrix. N >= 0.
 
-    D     (input/output) DOUBLE PRECISION array, dimension (N)   
-          On entry, D contains the diagonal elements of the   
-          bidiagonal matrix whose SVD is desired. On normal exit,   
-          D contains the singular values in decreasing order.   
+    D     (input/output) DOUBLE PRECISION array, dimension (N)
+          On entry, D contains the diagonal elements of the
+          bidiagonal matrix whose SVD is desired. On normal exit,
+          D contains the singular values in decreasing order.
 
-    E     (input/output) DOUBLE PRECISION array, dimension (N)   
-          On entry, elements E(1:N-1) contain the off-diagonal elements   
-          of the bidiagonal matrix whose SVD is desired.   
-          On exit, E is overwritten.   
+    E     (input/output) DOUBLE PRECISION array, dimension (N)
+          On entry, elements E(1:N-1) contain the off-diagonal elements
+          of the bidiagonal matrix whose SVD is desired.
+          On exit, E is overwritten.
 
-    WORK  (workspace) DOUBLE PRECISION array, dimension (4*N)   
+    WORK  (workspace) DOUBLE PRECISION array, dimension (4*N)
 
-    INFO  (output) INTEGER   
-          = 0: successful exit   
-          < 0: if INFO = -i, the i-th argument had an illegal value   
-          > 0: the algorithm failed   
-               = 1, a split was marked by a positive value in E   
-               = 2, current block of Z not diagonalized after 30*N   
-                    iterations (in inner while loop)   
-               = 3, termination criterion of outer while loop not met   
-                    (program created more than N unreduced blocks)   
+    INFO  (output) INTEGER
+          = 0: successful exit
+          < 0: if INFO = -i, the i-th argument had an illegal value
+          > 0: the algorithm failed
+               = 1, a split was marked by a positive value in E
+               = 2, current block of Z not diagonalized after 30*N
+                    iterations (in inner while loop)
+               = 3, termination criterion of outer while loop not met
+                    (program created more than N unreduced blocks)
 
-    =====================================================================   
+    =====================================================================
 
 
        Parameter adjustments */
@@ -152,7 +152,7 @@ static integer c__0 = 0;
 /* L20: */
     }
 
-/*     Copy D and E into WORK (in the Z format) and scale (squaring the   
+/*     Copy D and E into WORK (in the Z format) and scale (squaring the
        input data makes scaling by a power of the radix pointless). */
 
     eps = dlamch_("Precision");
@@ -163,7 +163,7 @@ static integer c__0 = 0;
     dcopy_(&i__1, &e[1], &c__1, &work[2], &c__2);
     i__1 = (*n << 1) - 1;
     i__2 = (*n << 1) - 1;
-    dlascl_("G", &c__0, &c__0, &sigmx, &scale, &i__1, &c__1, &work[1], &i__2, 
+    dlascl_("G", &c__0, &c__0, &sigmx, &scale, &i__1, &c__1, &work[1], &i__2,
 	    &iinfo);
 
 /*     Compute the q's and e's. */
diff --git a/external/hypre/src/lapack/dlasq2.c b/external/hypre/src/lapack/dlasq2.c
index b45f945c..ed1f3702 100644
--- a/external/hypre/src/lapack/dlasq2.c
+++ b/external/hypre/src/lapack/dlasq2.c
@@ -13,15 +13,6 @@ extern "C" {
 	-lf2c -lm   (in that order)
 */
 
-/* Table of constant values */
-
-static integer c__1 = 1;
-static integer c__2 = 2;
-static integer c__10 = 10;
-static integer c__3 = 3;
-static integer c__4 = 4;
-static integer c__11 = 11;
-
 /* Subroutine */ integer dlasq2_(integer *n, doublereal *z__, integer *info)
 {
     /* System generated locals */
@@ -29,97 +20,105 @@ static integer c__11 = 11;
     doublereal d__1, d__2;
 
     /* Local variables */
-    static logical ieee;
-    static integer nbig;
-    static doublereal dmin__, emin, emax;
-    static integer ndiv, iter;
-    static doublereal qmin, temp, qmax, zmax;
-    static integer splt;
-    static doublereal d__, e;
-    static integer k;
-    static doublereal s, t;
-    static integer nfail;
-    static doublereal desig, trace, sigma;
-    static integer iinfo, i0, i4, n0;
-    extern /* Subroutine */ integer dlasq3_(integer *, integer *, doublereal *, 
+    logical ieee;
+    integer nbig;
+    doublereal dmin__, emin, emax;
+    integer ndiv, iter;
+    doublereal qmin, temp, qmax, zmax;
+    integer splt;
+    doublereal d__, e;
+    integer k;
+    doublereal s, t;
+    integer nfail;
+    doublereal desig, trace, sigma;
+    integer iinfo, i0, i4, n0;
+    extern /* Subroutine */ integer dlasq3_(integer *, integer *, doublereal *,
 	    integer *, doublereal *, doublereal *, doublereal *, doublereal *,
 	     integer *, integer *, integer *, logical *);
     extern doublereal dlamch_(const char *);
-    static integer pp, iwhila, iwhilb;
-    static doublereal oldemn, safmin;
+    integer pp, iwhila, iwhilb;
+    doublereal oldemn, safmin;
     extern /* Subroutine */ integer xerbla_(const char *, integer *);
-    extern integer ilaenv_(integer *,const char *,const char *, integer *, integer *, 
+    extern integer ilaenv_(integer *,const char *,const char *, integer *, integer *,
 	    integer *, integer *, ftnlen, ftnlen);
-    extern /* Subroutine */ integer dlasrt_(const char *, integer *, doublereal *, 
+    extern /* Subroutine */ integer dlasrt_(const char *, integer *, doublereal *,
 	    integer *);
-    static doublereal eps, tol;
-    static integer ipn4;
-    static doublereal tol2;
-
-
-/*  -- LAPACK routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       October 31, 1999   
-
-
-    Purpose   
-    =======   
-
-    DLASQ2 computes all the eigenvalues of the symmetric positive   
-    definite tridiagonal matrix associated with the qd array Z to high   
-    relative accuracy are computed to high relative accuracy, in the   
-    absence of denormalization, underflow and overflow.   
-
-    To see the relation of Z to the tridiagonal matrix, let L be a   
-    unit lower bidiagonal matrix with subdiagonals Z(2,4,6,,..) and   
-    let U be an upper bidiagonal matrix with 1's above and diagonal   
-    Z(1,3,5,,..). The tridiagonal is L*U or, if you prefer, the   
-    symmetric tridiagonal to which it is similar.   
-
-    Note : DLASQ2 defines a logical variable, IEEE, which is true   
-    on machines which follow ieee-754 floating-point standard in their   
-    handling of infinities and NaNs, and false otherwise. This variable   
-    is passed to DLASQ3.   
-
-    Arguments   
-    =========   
-
-    N     (input) INTEGER   
-          The number of rows and columns in the matrix. N >= 0.   
-
-    Z     (workspace) DOUBLE PRECISION array, dimension ( 4*N )   
-          On entry Z holds the qd array. On exit, entries 1 to N hold   
-          the eigenvalues in decreasing order, Z( 2*N+1 ) holds the   
-          trace, and Z( 2*N+2 ) holds the sum of the eigenvalues. If   
-          N > 2, then Z( 2*N+3 ) holds the iteration count, Z( 2*N+4 )   
-          holds NDIVS/NIN^2, and Z( 2*N+5 ) holds the percentage of   
-          shifts that failed.   
-
-    INFO  (output) INTEGER   
-          = 0: successful exit   
-          < 0: if the i-th argument is a scalar and had an illegal   
-               value, then INFO = -i, if the i-th argument is an   
-               array and the j-entry had an illegal value, then   
-               INFO = -(i*100+j)   
-          > 0: the algorithm failed   
-                = 1, a split was marked by a positive value in E   
-                = 2, current block of Z not diagonalized after 30*N   
-                     iterations (in inner while loop)   
-                = 3, termination criterion of outer while loop not met   
-                     (program created more than N unreduced blocks)   
-
-    Further Details   
-    ===============   
-    Local Variables: I0:N0 defines a current unreduced segment of Z.   
-    The shifts are accumulated in SIGMA. Iteration count is in ITER.   
-    Ping-pong is controlled by PP (alternates between 0 and 1).   
-
-    =====================================================================   
-
-
-       Test the input arguments.   
-       (in case DLASQ2 is not called by DLASQ1)   
+    doublereal eps, tol;
+    integer ipn4;
+    doublereal tol2;
+
+    /* Table of constant values */
+    integer c__1 = 1;
+    integer c__2 = 2;
+    integer c__10 = 10;
+    integer c__3 = 3;
+    integer c__4 = 4;
+    integer c__11 = 11;
+
+
+/*  -- LAPACK routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       October 31, 1999
+
+
+    Purpose
+    =======
+
+    DLASQ2 computes all the eigenvalues of the symmetric positive
+    definite tridiagonal matrix associated with the qd array Z to high
+    relative accuracy are computed to high relative accuracy, in the
+    absence of denormalization, underflow and overflow.
+
+    To see the relation of Z to the tridiagonal matrix, let L be a
+    unit lower bidiagonal matrix with subdiagonals Z(2,4,6,,..) and
+    let U be an upper bidiagonal matrix with 1's above and diagonal
+    Z(1,3,5,,..). The tridiagonal is L*U or, if you prefer, the
+    symmetric tridiagonal to which it is similar.
+
+    Note : DLASQ2 defines a logical variable, IEEE, which is true
+    on machines which follow ieee-754 floating-point standard in their
+    handling of infinities and NaNs, and false otherwise. This variable
+    is passed to DLASQ3.
+
+    Arguments
+    =========
+
+    N     (input) INTEGER
+          The number of rows and columns in the matrix. N >= 0.
+
+    Z     (workspace) DOUBLE PRECISION array, dimension ( 4*N )
+          On entry Z holds the qd array. On exit, entries 1 to N hold
+          the eigenvalues in decreasing order, Z( 2*N+1 ) holds the
+          trace, and Z( 2*N+2 ) holds the sum of the eigenvalues. If
+          N > 2, then Z( 2*N+3 ) holds the iteration count, Z( 2*N+4 )
+          holds NDIVS/NIN^2, and Z( 2*N+5 ) holds the percentage of
+          shifts that failed.
+
+    INFO  (output) INTEGER
+          = 0: successful exit
+          < 0: if the i-th argument is a scalar and had an illegal
+               value, then INFO = -i, if the i-th argument is an
+               array and the j-entry had an illegal value, then
+               INFO = -(i*100+j)
+          > 0: the algorithm failed
+                = 1, a split was marked by a positive value in E
+                = 2, current block of Z not diagonalized after 30*N
+                     iterations (in inner while loop)
+                = 3, termination criterion of outer while loop not met
+                     (program created more than N unreduced blocks)
+
+    Further Details
+    ===============
+    Local Variables: I0:N0 defines a current unreduced segment of Z.
+    The shifts are accumulated in SIGMA. Iteration count is in ITER.
+    Ping-pong is controlled by PP (alternates between 0 and 1).
+
+    =====================================================================
+
+
+       Test the input arguments.
+       (in case DLASQ2 is not called by DLASQ1)
 
        Parameter adjustments */
     --z__;
@@ -310,7 +309,7 @@ static integer c__11 = 11;
 		z__[i4 - (pp << 1) - 2] = d__;
 		z__[i4 - (pp << 1)] = 0.;
 		d__ = z__[i4 + 1];
-	    } else if (safmin * z__[i4 + 1] < z__[i4 - (pp << 1) - 2] && 
+	    } else if (safmin * z__[i4 + 1] < z__[i4 - (pp << 1) - 2] &&
 		    safmin * z__[i4 - (pp << 1) - 2] < z__[i4 + 1]) {
 		temp = z__[i4 + 1] / z__[i4 - (pp << 1) - 2];
 		z__[i4 - (pp << 1)] = z__[i4 - 1] * temp;
@@ -354,9 +353,9 @@ static integer c__11 = 11;
 	    goto L150;
 	}
 
-/*        While array unfinished do   
+/*        While array unfinished do
 
-          E(N0) holds the value of SIGMA when submatrix in I0:N0   
+          E(N0) holds the value of SIGMA when submatrix in I0:N0
           splits from the rest of the array, but is negated. */
 
 	desig = 0.;
@@ -370,7 +369,7 @@ static integer c__11 = 11;
 	    return 0;
 	}
 
-/*        Find last unreduced submatrix's top index I0, find QMAX and   
+/*        Find last unreduced submatrix's top index I0, find QMAX and
           EMIN. Find Gershgorin-type bound if Q's much greater than E's. */
 
 	emax = 0.;
@@ -410,7 +409,7 @@ static integer c__11 = 11;
 
 	z__[(n0 << 2) - 1] = emin;
 
-/*        Put -(initial shift) into DMIN.   
+/*        Put -(initial shift) into DMIN.
 
    Computing MAX */
 	d__1 = 0., d__2 = qmin - sqrt(qmin) * 2. * sqrt(emax);
@@ -445,7 +444,7 @@ static integer c__11 = 11;
 		    oldemn = z__[i0 * 4];
 		    i__3 = (n0 - 3) << 2;
 		    for (i4 = i0 << 2; i4 <= i__3; i4 += 4) {
-			if (z__[i4] <= tol2 * z__[i4 - 3] || z__[i4 - 1] <= 
+			if (z__[i4] <= tol2 * z__[i4 - 3] || z__[i4 - 1] <=
 				tol2 * sigma) {
 			    z__[i4 - 1] = -sigma;
 			    splt = i4 / 4;
diff --git a/external/hypre/src/lapack/dlasq3.c b/external/hypre/src/lapack/dlasq3.c
index f73c64e3..81d6f7e0 100644
--- a/external/hypre/src/lapack/dlasq3.c
+++ b/external/hypre/src/lapack/dlasq3.c
@@ -8,97 +8,97 @@ extern "C" {
 #include "f2c.h"
 #include "hypre_lapack.h"
 
-/* Subroutine */ integer dlasq3_(integer *i0, integer *n0, doublereal *z__, 
+/* Subroutine */ integer dlasq3_(integer *i0, integer *n0, doublereal *z__,
 	integer *pp, doublereal *dmin__, doublereal *sigma, doublereal *desig,
-	 doublereal *qmax, integer *nfail, integer *iter, integer *ndiv, 
+	 doublereal *qmax, integer *nfail, integer *iter, integer *ndiv,
 	logical *ieee)
 {
-/*  -- LAPACK auxiliary routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       May 17, 2000   
+/*  -- LAPACK auxiliary routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       May 17, 2000
 
 
-    Purpose   
-    =======   
+    Purpose
+    =======
 
-    DLASQ3 checks for deflation, computes a shift (TAU) and calls dqds.   
-    In case of failure it changes shifts, and tries again until output   
-    is positive.   
+    DLASQ3 checks for deflation, computes a shift (TAU) and calls dqds.
+    In case of failure it changes shifts, and tries again until output
+    is positive.
 
-    Arguments   
-    =========   
+    Arguments
+    =========
 
-    I0     (input) INTEGER   
-           First index.   
+    I0     (input) INTEGER
+           First index.
 
-    N0     (input) INTEGER   
-           Last index.   
+    N0     (input) INTEGER
+           Last index.
 
-    Z      (input) DOUBLE PRECISION array, dimension ( 4*N )   
-           Z holds the qd array.   
+    Z      (input) DOUBLE PRECISION array, dimension ( 4*N )
+           Z holds the qd array.
 
-    PP     (input) INTEGER   
-           PP=0 for ping, PP=1 for pong.   
+    PP     (input) INTEGER
+           PP=0 for ping, PP=1 for pong.
 
-    DMIN   (output) DOUBLE PRECISION   
-           Minimum value of d.   
+    DMIN   (output) DOUBLE PRECISION
+           Minimum value of d.
 
-    SIGMA  (output) DOUBLE PRECISION   
-           Sum of shifts used in current segment.   
+    SIGMA  (output) DOUBLE PRECISION
+           Sum of shifts used in current segment.
 
-    DESIG  (input/output) DOUBLE PRECISION   
-           Lower order part of SIGMA   
+    DESIG  (input/output) DOUBLE PRECISION
+           Lower order part of SIGMA
 
-    QMAX   (input) DOUBLE PRECISION   
-           Maximum value of q.   
+    QMAX   (input) DOUBLE PRECISION
+           Maximum value of q.
 
-    NFAIL  (output) INTEGER   
-           Number of times shift was too big.   
+    NFAIL  (output) INTEGER
+           Number of times shift was too big.
 
-    ITER   (output) INTEGER   
-           Number of iterations.   
+    ITER   (output) INTEGER
+           Number of iterations.
 
-    NDIV   (output) INTEGER   
-           Number of divisions.   
+    NDIV   (output) INTEGER
+           Number of divisions.
 
-    TTYPE  (output) INTEGER   
-           Shift type.   
+    TTYPE  (output) INTEGER
+           Shift type.
 
-    IEEE   (input) LOGICAL   
-           Flag for IEEE or non IEEE arithmetic (passed to DLASQ5).   
+    IEEE   (input) LOGICAL
+           Flag for IEEE or non IEEE arithmetic (passed to DLASQ5).
 
-    =====================================================================   
+    =====================================================================
 
        Parameter adjustments */
     /* Initialized data */
-    static integer ttype = 0;
-    static doublereal dmin1 = 0.;
-    static doublereal dmin2 = 0.;
-    static doublereal dn = 0.;
-    static doublereal dn1 = 0.;
-    static doublereal dn2 = 0.;
-    static doublereal tau = 0.;
+    integer ttype = 0;
+    doublereal dmin1 = 0.;
+    doublereal dmin2 = 0.;
+    doublereal dn = 0.;
+    doublereal dn1 = 0.;
+    doublereal dn2 = 0.;
+    doublereal tau = 0.;
     /* System generated locals */
     integer i__1;
     doublereal d__1, d__2;
     /* Local variables */
-    static doublereal temp, s, t;
-    static integer j4;
-    extern /* Subroutine */ integer dlasq4_(integer *, integer *, doublereal *, 
-	    integer *, integer *, doublereal *, doublereal *, doublereal *, 
+    doublereal temp, s, t;
+    integer j4;
+    extern /* Subroutine */ integer dlasq4_(integer *, integer *, doublereal *,
+	    integer *, integer *, doublereal *, doublereal *, doublereal *,
 	    doublereal *, doublereal *, doublereal *, doublereal *, integer *)
-	    , dlasq5_(integer *, integer *, doublereal *, integer *, 
-	    doublereal *, doublereal *, doublereal *, doublereal *, 
+	    , dlasq5_(integer *, integer *, doublereal *, integer *,
+	    doublereal *, doublereal *, doublereal *, doublereal *,
 	    doublereal *, doublereal *, doublereal *, logical *), dlasq6_(
-	    integer *, integer *, doublereal *, integer *, doublereal *, 
-	    doublereal *, doublereal *, doublereal *, doublereal *, 
+	    integer *, integer *, doublereal *, integer *, doublereal *,
+	    doublereal *, doublereal *, doublereal *, doublereal *,
 	    doublereal *);
     extern doublereal dlamch_(const char *);
-    static integer nn;
-    static doublereal safmin, eps, tol;
-    static integer n0in, ipn4;
-    static doublereal tol2;
+    integer nn;
+    doublereal safmin, eps, tol;
+    integer n0in, ipn4;
+    doublereal tol2;
 
     --z__;
 
@@ -129,7 +129,7 @@ extern "C" {
 
 /*     Check whether E(N0-1) is negligible, 1 eigenvalue. */
 
-    if (z__[nn - 5] > tol2 * (*sigma + z__[nn - 3]) && z__[nn - (*pp << 1) - 
+    if (z__[nn - 5] > tol2 * (*sigma + z__[nn - 3]) && z__[nn - (*pp << 1) -
 	    4] > tol2 * z__[nn - 7]) {
 	goto L30;
     }
@@ -219,7 +219,7 @@ extern "C" {
 	}
     }
 
-/* L70:   
+/* L70:
 
    Computing MIN */
     d__1 = z__[(*n0 << 2) + *pp - 1], d__2 = z__[(*n0 << 2) + *pp - 9], d__1 =
@@ -235,7 +235,7 @@ extern "C" {
 
 L80:
 
-	dlasq5_(i0, n0, &z__[1], pp, &tau, dmin__, &dmin1, &dmin2, &dn, &dn1, 
+	dlasq5_(i0, n0, &z__[1], pp, &tau, dmin__, &dmin1, &dmin2, &dn, &dn1,
 		&dn2, ieee);
 
 	*ndiv += *n0 - *i0 + 2;
@@ -249,7 +249,7 @@ extern "C" {
 
 	    goto L100;
 
-	} else if (*dmin__ < 0. && dmin1 > 0. && z__[((*n0 - 1) << 2) - *pp] < 
+	} else if (*dmin__ < 0. && dmin1 > 0. && z__[((*n0 - 1) << 2) - *pp] <
 		tol * (*sigma + dn1) && abs(dn) < tol * *sigma) {
 
 /*           Convergence hidden by negative DN. */
diff --git a/external/hypre/src/lapack/dlasq4.c b/external/hypre/src/lapack/dlasq4.c
index d5af3fee..aac71acb 100644
--- a/external/hypre/src/lapack/dlasq4.c
+++ b/external/hypre/src/lapack/dlasq4.c
@@ -13,88 +13,88 @@ extern "C" {
 	-lf2c -lm   (in that order)
 */
 
-/* Subroutine */ integer dlasq4_(integer *i0, integer *n0, doublereal *z__, 
-	integer *pp, integer *n0in, doublereal *dmin__, doublereal *dmin1, 
-	doublereal *dmin2, doublereal *dn, doublereal *dn1, doublereal *dn2, 
+/* Subroutine */ integer dlasq4_(integer *i0, integer *n0, doublereal *z__,
+	integer *pp, integer *n0in, doublereal *dmin__, doublereal *dmin1,
+	doublereal *dmin2, doublereal *dn, doublereal *dn1, doublereal *dn2,
 	doublereal *tau, integer *ttype)
 {
     /* Initialized data */
-
-    static doublereal g = 0.;
+    doublereal g = 0.;
 
     /* System generated locals */
     integer i__1;
     doublereal d__1, d__2;
 
     /* Local variables */
-    static doublereal s, a2, b1, b2;
-    static integer i4, nn, np;
-    static doublereal gam, gap1, gap2;
+    doublereal s, a2, b1, b2;
+    integer i4, nn, np;
+    doublereal gam, gap1, gap2;
 
 
-/*  -- LAPACK auxiliary routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       October 31, 1999   
+/*  -- LAPACK auxiliary routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       October 31, 1999
 
 
-    Purpose   
-    =======   
+    Purpose
+    =======
 
-    DLASQ4 computes an approximation TAU to the smallest eigenvalue   
-    using values of d from the previous transform.   
+    DLASQ4 computes an approximation TAU to the smallest eigenvalue
+    using values of d from the previous transform.
 
-    I0    (input) INTEGER   
-          First index.   
+    I0    (input) INTEGER
+          First index.
 
-    N0    (input) INTEGER   
-          Last index.   
+    N0    (input) INTEGER
+          Last index.
 
-    Z     (input) DOUBLE PRECISION array, dimension ( 4*N )   
-          Z holds the qd array.   
+    Z     (input) DOUBLE PRECISION array, dimension ( 4*N )
+          Z holds the qd array.
 
-    PP    (input) INTEGER   
-          PP=0 for ping, PP=1 for pong.   
+    PP    (input) INTEGER
+          PP=0 for ping, PP=1 for pong.
 
-    NOIN  (input) INTEGER   
-          The value of N0 at start of EIGTEST.   
+    NOIN  (input) INTEGER
+          The value of N0 at start of EIGTEST.
 
-    DMIN  (input) DOUBLE PRECISION   
-          Minimum value of d.   
+    DMIN  (input) DOUBLE PRECISION
+          Minimum value of d.
 
-    DMIN1 (input) DOUBLE PRECISION   
-          Minimum value of d, excluding D( N0 ).   
+    DMIN1 (input) DOUBLE PRECISION
+          Minimum value of d, excluding D( N0 ).
 
-    DMIN2 (input) DOUBLE PRECISION   
-          Minimum value of d, excluding D( N0 ) and D( N0-1 ).   
+    DMIN2 (input) DOUBLE PRECISION
+          Minimum value of d, excluding D( N0 ) and D( N0-1 ).
 
-    DN    (input) DOUBLE PRECISION   
-          d(N)   
+    DN    (input) DOUBLE PRECISION
+          d(N)
 
-    DN1   (input) DOUBLE PRECISION   
-          d(N-1)   
+    DN1   (input) DOUBLE PRECISION
+          d(N-1)
 
-    DN2   (input) DOUBLE PRECISION   
-          d(N-2)   
+    DN2   (input) DOUBLE PRECISION
+          d(N-2)
 
-    TAU   (output) DOUBLE PRECISION   
-          This is the shift.   
+    TAU   (output) DOUBLE PRECISION
+          This is the shift.
 
-    TTYPE (output) INTEGER   
-          Shift type.   
+    TTYPE (output) INTEGER
+          Shift type.
 
-    Further Details   
-    ===============   
-    CNST1 = 9/16   
+    Further Details
+    ===============
+    CNST1 = 9/16
 
-    =====================================================================   
+    =====================================================================
 
        Parameter adjustments */
     --z__;
+    s = 0.;
 
-    /* Function Body   
+    /* Function Body
 
-       A negative DMIN forces the shift to take that absolute value   
+       A negative DMIN forces the shift to take that absolute value
        TTYPE records the type of shift. */
 
     if (*dmin__ <= 0.) {
@@ -321,7 +321,7 @@ extern "C" {
 
     } else if (*n0in == *n0 + 2) {
 
-/*        Two eigenvalues deflated. Use DMIN2, DN2 for DMIN and DN.   
+/*        Two eigenvalues deflated. Use DMIN2, DN2 for DMIN and DN.
 
           Cases 10 and 11. */
 
diff --git a/external/hypre/src/lapack/dlasq5.c b/external/hypre/src/lapack/dlasq5.c
index 869768c6..0a7147a5 100644
--- a/external/hypre/src/lapack/dlasq5.c
+++ b/external/hypre/src/lapack/dlasq5.c
@@ -8,64 +8,64 @@ extern "C" {
 #include "f2c.h"
 #include "hypre_lapack.h"
 
-/* Subroutine */ integer dlasq5_(integer *i0, integer *n0, doublereal *z__, 
-	integer *pp, doublereal *tau, doublereal *dmin__, doublereal *dmin1, 
+/* Subroutine */ integer dlasq5_(integer *i0, integer *n0, doublereal *z__,
+	integer *pp, doublereal *tau, doublereal *dmin__, doublereal *dmin1,
 	doublereal *dmin2, doublereal *dn, doublereal *dnm1, doublereal *dnm2,
 	 logical *ieee)
 {
-/*  -- LAPACK auxiliary routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       May 17, 2000   
+/*  -- LAPACK auxiliary routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       May 17, 2000
 
 
-    Purpose   
-    =======   
+    Purpose
+    =======
 
-    DLASQ5 computes one dqds transform in ping-pong form, one   
-    version for IEEE machines another for non IEEE machines.   
+    DLASQ5 computes one dqds transform in ping-pong form, one
+    version for IEEE machines another for non IEEE machines.
 
-    Arguments   
-    =========   
+    Arguments
+    =========
 
-    I0    (input) INTEGER   
-          First index.   
+    I0    (input) INTEGER
+          First index.
 
-    N0    (input) INTEGER   
-          Last index.   
+    N0    (input) INTEGER
+          Last index.
 
-    Z     (input) DOUBLE PRECISION array, dimension ( 4*N )   
-          Z holds the qd array. EMIN is stored in Z(4*N0) to avoid   
-          an extra argument.   
+    Z     (input) DOUBLE PRECISION array, dimension ( 4*N )
+          Z holds the qd array. EMIN is stored in Z(4*N0) to avoid
+          an extra argument.
 
-    PP    (input) INTEGER   
-          PP=0 for ping, PP=1 for pong.   
+    PP    (input) INTEGER
+          PP=0 for ping, PP=1 for pong.
 
-    TAU   (input) DOUBLE PRECISION   
-          This is the shift.   
+    TAU   (input) DOUBLE PRECISION
+          This is the shift.
 
-    DMIN  (output) DOUBLE PRECISION   
-          Minimum value of d.   
+    DMIN  (output) DOUBLE PRECISION
+          Minimum value of d.
 
-    DMIN1 (output) DOUBLE PRECISION   
-          Minimum value of d, excluding D( N0 ).   
+    DMIN1 (output) DOUBLE PRECISION
+          Minimum value of d, excluding D( N0 ).
 
-    DMIN2 (output) DOUBLE PRECISION   
-          Minimum value of d, excluding D( N0 ) and D( N0-1 ).   
+    DMIN2 (output) DOUBLE PRECISION
+          Minimum value of d, excluding D( N0 ) and D( N0-1 ).
 
-    DN    (output) DOUBLE PRECISION   
-          d(N0), the last value of d.   
+    DN    (output) DOUBLE PRECISION
+          d(N0), the last value of d.
 
-    DNM1  (output) DOUBLE PRECISION   
-          d(N0-1).   
+    DNM1  (output) DOUBLE PRECISION
+          d(N0-1).
 
-    DNM2  (output) DOUBLE PRECISION   
-          d(N0-2).   
+    DNM2  (output) DOUBLE PRECISION
+          d(N0-2).
 
-    IEEE  (input) LOGICAL   
-          Flag for IEEE or non IEEE arithmetic.   
+    IEEE  (input) LOGICAL
+          Flag for IEEE or non IEEE arithmetic.
 
-    =====================================================================   
+    =====================================================================
 
 
        Parameter adjustments */
@@ -73,8 +73,8 @@ extern "C" {
     integer i__1;
     doublereal d__1, d__2;
     /* Local variables */
-    static doublereal emin, temp, d__;
-    static integer j4, j4p2;
+    doublereal emin, temp, d__;
+    integer j4, j4p2;
 
     --z__;
 
diff --git a/external/hypre/src/lapack/dlasq6.c b/external/hypre/src/lapack/dlasq6.c
index e72a7bc8..0d4b95ad 100644
--- a/external/hypre/src/lapack/dlasq6.c
+++ b/external/hypre/src/lapack/dlasq6.c
@@ -22,11 +22,11 @@ extern "C" {
     doublereal d__1, d__2;
 
     /* Local variables */
-    static doublereal emin, temp, d__;
-    static integer j4;
+     doublereal emin, temp, d__;
+     integer j4;
     extern doublereal dlamch_(const char *);
-    static doublereal safmin;
-    static integer j4p2;
+     doublereal safmin;
+     integer j4p2;
 
 
 /*  -- LAPACK auxiliary routine (version 3.0) --   
diff --git a/external/hypre/src/lapack/dlasr.c b/external/hypre/src/lapack/dlasr.c
index 62b2ba83..07d73f9d 100644
--- a/external/hypre/src/lapack/dlasr.c
+++ b/external/hypre/src/lapack/dlasr.c
@@ -12,114 +12,114 @@ extern "C" {
 	 integer *n, doublereal *c__, doublereal *s, doublereal *a, integer *
 	lda)
 {
-/*  -- LAPACK auxiliary routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       October 31, 1992   
+/*  -- LAPACK auxiliary routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       October 31, 1992
 
 
-    Purpose   
-    =======   
+    Purpose
+    =======
 
-    DLASR   performs the transformation   
+    DLASR   performs the transformation
 
-       A := P*A,   when SIDE = 'L' or 'l'  (  Left-hand side )   
+       A := P*A,   when SIDE = 'L' or 'l'  (  Left-hand side )
 
-       A := A*P',  when SIDE = 'R' or 'r'  ( Right-hand side )   
+       A := A*P',  when SIDE = 'R' or 'r'  ( Right-hand side )
 
-    where A is an m by n real matrix and P is an orthogonal matrix,   
-    consisting of a sequence of plane rotations determined by the   
-    parameters PIVOT and DIRECT as follows ( z = m when SIDE = 'L' or 'l'   
-    and z = n when SIDE = 'R' or 'r' ):   
+    where A is an m by n real matrix and P is an orthogonal matrix,
+    consisting of a sequence of plane rotations determined by the
+    parameters PIVOT and DIRECT as follows ( z = m when SIDE = 'L' or 'l'
+    and z = n when SIDE = 'R' or 'r' ):
 
-    When  DIRECT = 'F' or 'f'  ( Forward sequence ) then   
+    When  DIRECT = 'F' or 'f'  ( Forward sequence ) then
 
-       P = P( z - 1 )*...*P( 2 )*P( 1 ),   
+       P = P( z - 1 )*...*P( 2 )*P( 1 ),
 
-    and when DIRECT = 'B' or 'b'  ( Backward sequence ) then   
+    and when DIRECT = 'B' or 'b'  ( Backward sequence ) then
 
-       P = P( 1 )*P( 2 )*...*P( z - 1 ),   
+       P = P( 1 )*P( 2 )*...*P( z - 1 ),
 
-    where  P( k ) is a plane rotation matrix for the following planes:   
+    where  P( k ) is a plane rotation matrix for the following planes:
 
-       when  PIVOT = 'V' or 'v'  ( Variable pivot ),   
-          the plane ( k, k + 1 )   
+       when  PIVOT = 'V' or 'v'  ( Variable pivot ),
+          the plane ( k, k + 1 )
 
-       when  PIVOT = 'T' or 't'  ( Top pivot ),   
-          the plane ( 1, k + 1 )   
+       when  PIVOT = 'T' or 't'  ( Top pivot ),
+          the plane ( 1, k + 1 )
 
-       when  PIVOT = 'B' or 'b'  ( Bottom pivot ),   
-          the plane ( k, z )   
+       when  PIVOT = 'B' or 'b'  ( Bottom pivot ),
+          the plane ( k, z )
 
-    c( k ) and s( k )  must contain the  cosine and sine that define the   
-    matrix  P( k ).  The two by two plane rotation part of the matrix   
-    P( k ), R( k ), is assumed to be of the form   
+    c( k ) and s( k )  must contain the  cosine and sine that define the
+    matrix  P( k ).  The two by two plane rotation part of the matrix
+    P( k ), R( k ), is assumed to be of the form
 
-       R( k ) = (  c( k )  s( k ) ).   
-                ( -s( k )  c( k ) )   
+       R( k ) = (  c( k )  s( k ) ).
+                ( -s( k )  c( k ) )
 
-    This version vectorises across rows of the array A when SIDE = 'L'.   
+    This version vectorises across rows of the array A when SIDE = 'L'.
 
-    Arguments   
-    =========   
+    Arguments
+    =========
 
-    SIDE    (input) CHARACTER*1   
-            Specifies whether the plane rotation matrix P is applied to   
-            A on the left or the right.   
-            = 'L':  Left, compute A := P*A   
-            = 'R':  Right, compute A:= A*P'   
+    SIDE    (input) CHARACTER*1
+            Specifies whether the plane rotation matrix P is applied to
+            A on the left or the right.
+            = 'L':  Left, compute A := P*A
+            = 'R':  Right, compute A:= A*P'
 
-    DIRECT  (input) CHARACTER*1   
-            Specifies whether P is a forward or backward sequence of   
-            plane rotations.   
-            = 'F':  Forward, P = P( z - 1 )*...*P( 2 )*P( 1 )   
-            = 'B':  Backward, P = P( 1 )*P( 2 )*...*P( z - 1 )   
+    DIRECT  (input) CHARACTER*1
+            Specifies whether P is a forward or backward sequence of
+            plane rotations.
+            = 'F':  Forward, P = P( z - 1 )*...*P( 2 )*P( 1 )
+            = 'B':  Backward, P = P( 1 )*P( 2 )*...*P( z - 1 )
 
-    PIVOT   (input) CHARACTER*1   
-            Specifies the plane for which P(k) is a plane rotation   
-            matrix.   
-            = 'V':  Variable pivot, the plane (k,k+1)   
-            = 'T':  Top pivot, the plane (1,k+1)   
-            = 'B':  Bottom pivot, the plane (k,z)   
+    PIVOT   (input) CHARACTER*1
+            Specifies the plane for which P(k) is a plane rotation
+            matrix.
+            = 'V':  Variable pivot, the plane (k,k+1)
+            = 'T':  Top pivot, the plane (1,k+1)
+            = 'B':  Bottom pivot, the plane (k,z)
 
-    M       (input) INTEGER   
-            The number of rows of the matrix A.  If m <= 1, an immediate   
-            return is effected.   
+    M       (input) INTEGER
+            The number of rows of the matrix A.  If m <= 1, an immediate
+            return is effected.
 
-    N       (input) INTEGER   
-            The number of columns of the matrix A.  If n <= 1, an   
-            immediate return is effected.   
+    N       (input) INTEGER
+            The number of columns of the matrix A.  If n <= 1, an
+            immediate return is effected.
 
-    C, S    (input) DOUBLE PRECISION arrays, dimension   
-                    (M-1) if SIDE = 'L'   
-                    (N-1) if SIDE = 'R'   
-            c(k) and s(k) contain the cosine and sine that define the   
-            matrix P(k).  The two by two plane rotation part of the   
-            matrix P(k), R(k), is assumed to be of the form   
-            R( k ) = (  c( k )  s( k ) ).   
-                     ( -s( k )  c( k ) )   
+    C, S    (input) DOUBLE PRECISION arrays, dimension
+                    (M-1) if SIDE = 'L'
+                    (N-1) if SIDE = 'R'
+            c(k) and s(k) contain the cosine and sine that define the
+            matrix P(k).  The two by two plane rotation part of the
+            matrix P(k), R(k), is assumed to be of the form
+            R( k ) = (  c( k )  s( k ) ).
+                     ( -s( k )  c( k ) )
 
-    A       (input/output) DOUBLE PRECISION array, dimension (LDA,N)   
-            The m by n matrix A.  On exit, A is overwritten by P*A if   
-            SIDE = 'R' or by A*P' if SIDE = 'L'.   
+    A       (input/output) DOUBLE PRECISION array, dimension (LDA,N)
+            The m by n matrix A.  On exit, A is overwritten by P*A if
+            SIDE = 'R' or by A*P' if SIDE = 'L'.
 
-    LDA     (input) INTEGER   
-            The leading dimension of the array A.  LDA >= max(1,M).   
+    LDA     (input) INTEGER
+            The leading dimension of the array A.  LDA >= max(1,M).
 
-    =====================================================================   
+    =====================================================================
 
 
-       Test the input parameters   
+       Test the input parameters
 
        Parameter adjustments */
     /* System generated locals */
     integer a_dim1, a_offset, i__1, i__2;
     /* Local variables */
-    static integer info;
-    static doublereal temp;
-    static integer i__, j;
+    integer info;
+    doublereal temp;
+    integer i__, j;
     extern logical lsame_(const char *,const char *);
-    static doublereal ctemp, stemp;
+    doublereal ctemp, stemp;
     extern /* Subroutine */ integer xerbla_(const char *, integer *);
 #define a_ref(a_1,a_2) a[(a_2)*a_dim1 + a_1]
 
@@ -133,10 +133,10 @@ extern "C" {
     info = 0;
     if (! (lsame_(side, "L") || lsame_(side, "R"))) {
 	info = 1;
-    } else if (! (lsame_(pivot, "V") || lsame_(pivot, 
+    } else if (! (lsame_(pivot, "V") || lsame_(pivot,
 	    "T") || lsame_(pivot, "B"))) {
 	info = 2;
-    } else if (! (lsame_(direct, "F") || lsame_(direct, 
+    } else if (! (lsame_(direct, "F") || lsame_(direct,
 	    "B"))) {
 	info = 3;
     } else if (*m < 0) {
@@ -172,7 +172,7 @@ extern "C" {
 			    temp = a_ref(j + 1, i__);
 			    a_ref(j + 1, i__) = ctemp * temp - stemp * a_ref(
 				    j, i__);
-			    a_ref(j, i__) = stemp * temp + ctemp * a_ref(j, 
+			    a_ref(j, i__) = stemp * temp + ctemp * a_ref(j,
 				    i__);
 /* L10: */
 			}
@@ -189,7 +189,7 @@ extern "C" {
 			    temp = a_ref(j + 1, i__);
 			    a_ref(j + 1, i__) = ctemp * temp - stemp * a_ref(
 				    j, i__);
-			    a_ref(j, i__) = stemp * temp + ctemp * a_ref(j, 
+			    a_ref(j, i__) = stemp * temp + ctemp * a_ref(j,
 				    i__);
 /* L30: */
 			}
@@ -207,9 +207,9 @@ extern "C" {
 			i__2 = *n;
 			for (i__ = 1; i__ <= i__2; ++i__) {
 			    temp = a_ref(j, i__);
-			    a_ref(j, i__) = ctemp * temp - stemp * a_ref(1, 
+			    a_ref(j, i__) = ctemp * temp - stemp * a_ref(1,
 				    i__);
-			    a_ref(1, i__) = stemp * temp + ctemp * a_ref(1, 
+			    a_ref(1, i__) = stemp * temp + ctemp * a_ref(1,
 				    i__);
 /* L50: */
 			}
@@ -224,9 +224,9 @@ extern "C" {
 			i__1 = *n;
 			for (i__ = 1; i__ <= i__1; ++i__) {
 			    temp = a_ref(j, i__);
-			    a_ref(j, i__) = ctemp * temp - stemp * a_ref(1, 
+			    a_ref(j, i__) = ctemp * temp - stemp * a_ref(1,
 				    i__);
-			    a_ref(1, i__) = stemp * temp + ctemp * a_ref(1, 
+			    a_ref(1, i__) = stemp * temp + ctemp * a_ref(1,
 				    i__);
 /* L70: */
 			}
@@ -244,9 +244,9 @@ extern "C" {
 			i__2 = *n;
 			for (i__ = 1; i__ <= i__2; ++i__) {
 			    temp = a_ref(j, i__);
-			    a_ref(j, i__) = stemp * a_ref(*m, i__) + ctemp * 
+			    a_ref(j, i__) = stemp * a_ref(*m, i__) + ctemp *
 				    temp;
-			    a_ref(*m, i__) = ctemp * a_ref(*m, i__) - stemp * 
+			    a_ref(*m, i__) = ctemp * a_ref(*m, i__) - stemp *
 				    temp;
 /* L90: */
 			}
@@ -261,9 +261,9 @@ extern "C" {
 			i__1 = *n;
 			for (i__ = 1; i__ <= i__1; ++i__) {
 			    temp = a_ref(j, i__);
-			    a_ref(j, i__) = stemp * a_ref(*m, i__) + ctemp * 
+			    a_ref(j, i__) = stemp * a_ref(*m, i__) + ctemp *
 				    temp;
-			    a_ref(*m, i__) = ctemp * a_ref(*m, i__) - stemp * 
+			    a_ref(*m, i__) = ctemp * a_ref(*m, i__) - stemp *
 				    temp;
 /* L110: */
 			}
@@ -288,7 +288,7 @@ extern "C" {
 			    temp = a_ref(i__, j + 1);
 			    a_ref(i__, j + 1) = ctemp * temp - stemp * a_ref(
 				    i__, j);
-			    a_ref(i__, j) = stemp * temp + ctemp * a_ref(i__, 
+			    a_ref(i__, j) = stemp * temp + ctemp * a_ref(i__,
 				    j);
 /* L130: */
 			}
@@ -305,7 +305,7 @@ extern "C" {
 			    temp = a_ref(i__, j + 1);
 			    a_ref(i__, j + 1) = ctemp * temp - stemp * a_ref(
 				    i__, j);
-			    a_ref(i__, j) = stemp * temp + ctemp * a_ref(i__, 
+			    a_ref(i__, j) = stemp * temp + ctemp * a_ref(i__,
 				    j);
 /* L150: */
 			}
@@ -323,9 +323,9 @@ extern "C" {
 			i__2 = *m;
 			for (i__ = 1; i__ <= i__2; ++i__) {
 			    temp = a_ref(i__, j);
-			    a_ref(i__, j) = ctemp * temp - stemp * a_ref(i__, 
+			    a_ref(i__, j) = ctemp * temp - stemp * a_ref(i__,
 				    1);
-			    a_ref(i__, 1) = stemp * temp + ctemp * a_ref(i__, 
+			    a_ref(i__, 1) = stemp * temp + ctemp * a_ref(i__,
 				    1);
 /* L170: */
 			}
@@ -340,9 +340,9 @@ extern "C" {
 			i__1 = *m;
 			for (i__ = 1; i__ <= i__1; ++i__) {
 			    temp = a_ref(i__, j);
-			    a_ref(i__, j) = ctemp * temp - stemp * a_ref(i__, 
+			    a_ref(i__, j) = ctemp * temp - stemp * a_ref(i__,
 				    1);
-			    a_ref(i__, 1) = stemp * temp + ctemp * a_ref(i__, 
+			    a_ref(i__, 1) = stemp * temp + ctemp * a_ref(i__,
 				    1);
 /* L190: */
 			}
@@ -360,9 +360,9 @@ extern "C" {
 			i__2 = *m;
 			for (i__ = 1; i__ <= i__2; ++i__) {
 			    temp = a_ref(i__, j);
-			    a_ref(i__, j) = stemp * a_ref(i__, *n) + ctemp * 
+			    a_ref(i__, j) = stemp * a_ref(i__, *n) + ctemp *
 				    temp;
-			    a_ref(i__, *n) = ctemp * a_ref(i__, *n) - stemp * 
+			    a_ref(i__, *n) = ctemp * a_ref(i__, *n) - stemp *
 				    temp;
 /* L210: */
 			}
@@ -377,9 +377,9 @@ extern "C" {
 			i__1 = *m;
 			for (i__ = 1; i__ <= i__1; ++i__) {
 			    temp = a_ref(i__, j);
-			    a_ref(i__, j) = stemp * a_ref(i__, *n) + ctemp * 
+			    a_ref(i__, j) = stemp * a_ref(i__, *n) + ctemp *
 				    temp;
-			    a_ref(i__, *n) = ctemp * a_ref(i__, *n) - stemp * 
+			    a_ref(i__, *n) = ctemp * a_ref(i__, *n) - stemp *
 				    temp;
 /* L230: */
 			}
diff --git a/external/hypre/src/lapack/dlasrt.c b/external/hypre/src/lapack/dlasrt.c
index 70b85d8c..68a6c06f 100644
--- a/external/hypre/src/lapack/dlasrt.c
+++ b/external/hypre/src/lapack/dlasrt.c
@@ -11,58 +11,58 @@ extern "C" {
 /* Subroutine */ integer dlasrt_(const char *id, integer *n, doublereal *d__, integer *
 	info)
 {
-/*  -- LAPACK routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       September 30, 1994   
+/*  -- LAPACK routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       September 30, 1994
 
 
-    Purpose   
-    =======   
+    Purpose
+    =======
 
-    Sort the numbers in D in increasing order (if ID = 'I') or   
-    in decreasing order (if ID = 'D' ).   
+    Sort the numbers in D in increasing order (if ID = 'I') or
+    in decreasing order (if ID = 'D' ).
 
-    Use Quick Sort, reverting to Insertion sort on arrays of   
-    size <= 20. Dimension of STACK limits N to about 2**32.   
+    Use Quick Sort, reverting to Insertion sort on arrays of
+    size <= 20. Dimension of STACK limits N to about 2**32.
 
-    Arguments   
-    =========   
+    Arguments
+    =========
 
-    ID      (input) CHARACTER*1   
-            = 'I': sort D in increasing order;   
-            = 'D': sort D in decreasing order.   
+    ID      (input) CHARACTER*1
+            = 'I': sort D in increasing order;
+            = 'D': sort D in decreasing order.
 
-    N       (input) INTEGER   
-            The length of the array D.   
+    N       (input) INTEGER
+            The length of the array D.
 
-    D       (input/output) DOUBLE PRECISION array, dimension (N)   
-            On entry, the array to be sorted.   
-            On exit, D has been sorted into increasing order   
-            (D(1) <= ... <= D(N) ) or into decreasing order   
-            (D(1) >= ... >= D(N) ), depending on ID.   
+    D       (input/output) DOUBLE PRECISION array, dimension (N)
+            On entry, the array to be sorted.
+            On exit, D has been sorted into increasing order
+            (D(1) <= ... <= D(N) ) or into decreasing order
+            (D(1) >= ... >= D(N) ), depending on ID.
 
-    INFO    (output) INTEGER   
-            = 0:  successful exit   
-            < 0:  if INFO = -i, the i-th argument had an illegal value   
+    INFO    (output) INTEGER
+            = 0:  successful exit
+            < 0:  if INFO = -i, the i-th argument had an illegal value
 
-    =====================================================================   
+    =====================================================================
 
 
-       Test the input paramters.   
+       Test the input paramters.
 
        Parameter adjustments */
     /* System generated locals */
     integer i__1, i__2;
     /* Local variables */
-    static integer endd, i__, j;
+    integer endd, i__, j;
     extern logical lsame_(const char *,const char *);
-    static integer stack[64]	/* was [2][32] */;
-    static doublereal dmnmx, d1, d2, d3;
-    static integer start;
+    integer stack[64]	/* was [2][32] */;
+    doublereal dmnmx, d1, d2, d3;
+    integer start;
     extern /* Subroutine */ integer xerbla_(const char *, integer *);
-    static integer stkpnt, dir;
-    static doublereal tmp;
+    integer stkpnt, dir;
+    doublereal tmp;
 #define stack_ref(a_1,a_2) stack[(a_2)*2 + a_1 - 3]
 
     --d__;
@@ -149,7 +149,7 @@ extern "C" {
 
     } else if (endd - start > 20) {
 
-/*        Partition D( START:ENDD ) and stack parts, largest one first   
+/*        Partition D( START:ENDD ) and stack parts, largest one first
 
           Choose partition entry as median of 3 */
 
diff --git a/external/hypre/src/lapack/dlassq.c b/external/hypre/src/lapack/dlassq.c
index 2eed9d3b..ba0e2c5f 100644
--- a/external/hypre/src/lapack/dlassq.c
+++ b/external/hypre/src/lapack/dlassq.c
@@ -8,57 +8,57 @@ extern "C" {
 #include "f2c.h"
 #include "hypre_lapack.h"
 
-/* Subroutine */ integer dlassq_(integer *n, doublereal *x, integer *incx, 
+/* Subroutine */ integer dlassq_(integer *n, doublereal *x, integer *incx,
 	doublereal *scale, doublereal *sumsq)
 {
-/*  -- LAPACK auxiliary routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       June 30, 1999   
+/*  -- LAPACK auxiliary routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       June 30, 1999
 
 
-    Purpose   
-    =======   
+    Purpose
+    =======
 
-    DLASSQ  returns the values  scl  and  smsq  such that   
+    DLASSQ  returns the values  scl  and  smsq  such that
 
-       ( scl**2 )*smsq = x( 1 )**2 +...+ x( n )**2 + ( scale**2 )*sumsq,   
+       ( scl**2 )*smsq = x( 1 )**2 +...+ x( n )**2 + ( scale**2 )*sumsq,
 
-    where  x( i ) = X( 1 + ( i - 1 )*INCX ). The value of  sumsq  is   
-    assumed to be non-negative and  scl  returns the value   
+    where  x( i ) = X( 1 + ( i - 1 )*INCX ). The value of  sumsq  is
+    assumed to be non-negative and  scl  returns the value
 
-       scl = max( scale, abs( x( i ) ) ).   
+       scl = max( scale, abs( x( i ) ) ).
 
-    scale and sumsq must be supplied in SCALE and SUMSQ and   
-    scl and smsq are overwritten on SCALE and SUMSQ respectively.   
+    scale and sumsq must be supplied in SCALE and SUMSQ and
+    scl and smsq are overwritten on SCALE and SUMSQ respectively.
 
-    The routine makes only one pass through the vector x.   
+    The routine makes only one pass through the vector x.
 
-    Arguments   
-    =========   
+    Arguments
+    =========
 
-    N       (input) INTEGER   
-            The number of elements to be used from the vector X.   
+    N       (input) INTEGER
+            The number of elements to be used from the vector X.
 
-    X       (input) DOUBLE PRECISION array, dimension (N)   
-            The vector for which a scaled sum of squares is computed.   
-               x( i )  = X( 1 + ( i - 1 )*INCX ), 1 <= i <= n.   
+    X       (input) DOUBLE PRECISION array, dimension (N)
+            The vector for which a scaled sum of squares is computed.
+               x( i )  = X( 1 + ( i - 1 )*INCX ), 1 <= i <= n.
 
-    INCX    (input) INTEGER   
-            The increment between successive values of the vector X.   
-            INCX > 0.   
+    INCX    (input) INTEGER
+            The increment between successive values of the vector X.
+            INCX > 0.
 
-    SCALE   (input/output) DOUBLE PRECISION   
-            On entry, the value  scale  in the equation above.   
-            On exit, SCALE is overwritten with  scl , the scaling factor   
-            for the sum of squares.   
+    SCALE   (input/output) DOUBLE PRECISION
+            On entry, the value  scale  in the equation above.
+            On exit, SCALE is overwritten with  scl , the scaling factor
+            for the sum of squares.
 
-    SUMSQ   (input/output) DOUBLE PRECISION   
-            On entry, the value  sumsq  in the equation above.   
-            On exit, SUMSQ is overwritten with  smsq , the basic sum of   
-            squares from which  scl  has been factored out.   
+    SUMSQ   (input/output) DOUBLE PRECISION
+            On entry, the value  sumsq  in the equation above.
+            On exit, SUMSQ is overwritten with  smsq , the basic sum of
+            squares from which  scl  has been factored out.
 
-   =====================================================================   
+   =====================================================================
 
 
        Parameter adjustments */
@@ -66,8 +66,8 @@ extern "C" {
     integer i__1, i__2;
     doublereal d__1;
     /* Local variables */
-    static doublereal absxi;
-    static integer ix;
+    doublereal absxi;
+    integer ix;
 
     --x;
 
diff --git a/external/hypre/src/lapack/dlasv2.c b/external/hypre/src/lapack/dlasv2.c
index fe55cdd9..c00dfa23 100644
--- a/external/hypre/src/lapack/dlasv2.c
+++ b/external/hypre/src/lapack/dlasv2.c
@@ -8,97 +8,97 @@ extern "C" {
 #include "f2c.h"
 #include "hypre_lapack.h"
 
-/* Subroutine */ integer dlasv2_(doublereal *f, doublereal *g, doublereal *h__, 
+/* Subroutine */ integer dlasv2_(doublereal *f, doublereal *g, doublereal *h__,
 	doublereal *ssmin, doublereal *ssmax, doublereal *snr, doublereal *
 	csr, doublereal *snl, doublereal *csl)
 {
-/*  -- LAPACK auxiliary routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       October 31, 1992   
+/*  -- LAPACK auxiliary routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       October 31, 1992
 
 
-    Purpose   
-    =======   
+    Purpose
+    =======
 
-    DLASV2 computes the singular value decomposition of a 2-by-2   
-    triangular matrix   
-       [  F   G  ]   
-       [  0   H  ].   
-    On return, abs(SSMAX) is the larger singular value, abs(SSMIN) is the   
-    smaller singular value, and (CSL,SNL) and (CSR,SNR) are the left and   
-    right singular vectors for abs(SSMAX), giving the decomposition   
+    DLASV2 computes the singular value decomposition of a 2-by-2
+    triangular matrix
+       [  F   G  ]
+       [  0   H  ].
+    On return, abs(SSMAX) is the larger singular value, abs(SSMIN) is the
+    smaller singular value, and (CSL,SNL) and (CSR,SNR) are the left and
+    right singular vectors for abs(SSMAX), giving the decomposition
 
-       [ CSL  SNL ] [  F   G  ] [ CSR -SNR ]  =  [ SSMAX   0   ]   
-       [-SNL  CSL ] [  0   H  ] [ SNR  CSR ]     [  0    SSMIN ].   
+       [ CSL  SNL ] [  F   G  ] [ CSR -SNR ]  =  [ SSMAX   0   ]
+       [-SNL  CSL ] [  0   H  ] [ SNR  CSR ]     [  0    SSMIN ].
 
-    Arguments   
-    =========   
+    Arguments
+    =========
 
-    F       (input) DOUBLE PRECISION   
-            The (1,1) element of the 2-by-2 matrix.   
+    F       (input) DOUBLE PRECISION
+            The (1,1) element of the 2-by-2 matrix.
 
-    G       (input) DOUBLE PRECISION   
-            The (1,2) element of the 2-by-2 matrix.   
+    G       (input) DOUBLE PRECISION
+            The (1,2) element of the 2-by-2 matrix.
 
-    H       (input) DOUBLE PRECISION   
-            The (2,2) element of the 2-by-2 matrix.   
+    H       (input) DOUBLE PRECISION
+            The (2,2) element of the 2-by-2 matrix.
 
-    SSMIN   (output) DOUBLE PRECISION   
-            abs(SSMIN) is the smaller singular value.   
+    SSMIN   (output) DOUBLE PRECISION
+            abs(SSMIN) is the smaller singular value.
 
-    SSMAX   (output) DOUBLE PRECISION   
-            abs(SSMAX) is the larger singular value.   
+    SSMAX   (output) DOUBLE PRECISION
+            abs(SSMAX) is the larger singular value.
 
-    SNL     (output) DOUBLE PRECISION   
-    CSL     (output) DOUBLE PRECISION   
-            The vector (CSL, SNL) is a unit left singular vector for the   
-            singular value abs(SSMAX).   
+    SNL     (output) DOUBLE PRECISION
+    CSL     (output) DOUBLE PRECISION
+            The vector (CSL, SNL) is a unit left singular vector for the
+            singular value abs(SSMAX).
 
-    SNR     (output) DOUBLE PRECISION   
-    CSR     (output) DOUBLE PRECISION   
-            The vector (CSR, SNR) is a unit right singular vector for the   
-            singular value abs(SSMAX).   
+    SNR     (output) DOUBLE PRECISION
+    CSR     (output) DOUBLE PRECISION
+            The vector (CSR, SNR) is a unit right singular vector for the
+            singular value abs(SSMAX).
 
-    Further Details   
-    ===============   
+    Further Details
+    ===============
 
-    Any input parameter may be aliased with any output parameter.   
+    Any input parameter may be aliased with any output parameter.
 
-    Barring over/underflow and assuming a guard digit in subtraction, all   
-    output quantities are correct to within a few units in the last   
-    place (ulps).   
+    Barring over/underflow and assuming a guard digit in subtraction, all
+    output quantities are correct to within a few units in the last
+    place (ulps).
 
-    In IEEE arithmetic, the code works correctly if one matrix element is   
-    infinite.   
+    In IEEE arithmetic, the code works correctly if one matrix element is
+    infinite.
 
-    Overflow will not occur unless the largest singular value itself   
-    overflows or is within a few ulps of overflow. (On machines with   
-    partial overflow, like the Cray, overflow may occur if the largest   
-    singular value is within a factor of 2 of overflow.)   
+    Overflow will not occur unless the largest singular value itself
+    overflows or is within a few ulps of overflow. (On machines with
+    partial overflow, like the Cray, overflow may occur if the largest
+    singular value is within a factor of 2 of overflow.)
 
-    Underflow is harmless if underflow is gradual. Otherwise, results   
-    may correspond to a matrix modified by perturbations of size near   
-    the underflow threshold.   
+    Underflow is harmless if underflow is gradual. Otherwise, results
+    may correspond to a matrix modified by perturbations of size near
+    the underflow threshold.
 
    ===================================================================== */
     /* Table of constant values */
-    static doublereal c_b3 = 2.;
-    static doublereal c_b4 = 1.;
-    
+    doublereal c_b3 = 2.;
+    doublereal c_b4 = 1.;
+
     /* System generated locals */
     doublereal d__1;
     /* Builtin functions */
     doublereal d_sign(doublereal *, doublereal *);
     /* Local variables */
-    static integer pmax;
-    static doublereal temp;
-    static logical swap;
-    static doublereal a, d__, l, m, r__, s, t, tsign, fa, ga, ha;
+    integer pmax;
+    doublereal temp;
+    logical swap;
+    doublereal a, d__, l, m, r__, s, t, tsign, fa, ga, ha;
     extern doublereal dlamch_(const char *);
-    static doublereal ft, gt, ht, mm;
-    static logical gasmal;
-    static doublereal tt, clt, crt, slt, srt;
+    doublereal ft, gt, ht, mm;
+    logical gasmal;
+    doublereal tt, clt, crt, slt, srt;
 
 
 
@@ -108,9 +108,9 @@ extern "C" {
     ht = *h__;
     ha = abs(*h__);
 
-/*     PMAX points to the maximum absolute element of matrix   
-         PMAX = 1 if F largest in absolute values   
-         PMAX = 2 if G largest in absolute values   
+/*     PMAX points to the maximum absolute element of matrix
+         PMAX = 1 if F largest in absolute values
+         PMAX = 2 if G largest in absolute values
          PMAX = 3 if H largest in absolute values */
 
     pmax = 1;
diff --git a/external/hypre/src/lapack/dlaswp.c b/external/hypre/src/lapack/dlaswp.c
index 1a35885b..0c7f889a 100644
--- a/external/hypre/src/lapack/dlaswp.c
+++ b/external/hypre/src/lapack/dlaswp.c
@@ -8,69 +8,69 @@ extern "C" {
 #include "f2c.h"
 #include "hypre_lapack.h"
 
-/* Subroutine */ integer dlaswp_(integer *n, doublereal *a, integer *lda, integer 
+/* Subroutine */ integer dlaswp_(integer *n, doublereal *a, integer *lda, integer
 	*k1, integer *k2, integer *ipiv, integer *incx)
 {
-/*  -- LAPACK auxiliary routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       June 30, 1999   
+/*  -- LAPACK auxiliary routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       June 30, 1999
 
 
-    Purpose   
-    =======   
+    Purpose
+    =======
 
-    DLASWP performs a series of row interchanges on the matrix A.   
-    One row interchange is initiated for each of rows K1 through K2 of A.   
+    DLASWP performs a series of row interchanges on the matrix A.
+    One row interchange is initiated for each of rows K1 through K2 of A.
 
-    Arguments   
-    =========   
+    Arguments
+    =========
 
-    N       (input) INTEGER   
-            The number of columns of the matrix A.   
+    N       (input) INTEGER
+            The number of columns of the matrix A.
 
-    A       (input/output) DOUBLE PRECISION array, dimension (LDA,N)   
-            On entry, the matrix of column dimension N to which the row   
-            interchanges will be applied.   
-            On exit, the permuted matrix.   
+    A       (input/output) DOUBLE PRECISION array, dimension (LDA,N)
+            On entry, the matrix of column dimension N to which the row
+            interchanges will be applied.
+            On exit, the permuted matrix.
 
-    LDA     (input) INTEGER   
-            The leading dimension of the array A.   
+    LDA     (input) INTEGER
+            The leading dimension of the array A.
 
-    K1      (input) INTEGER   
-            The first element of IPIV for which a row interchange will   
-            be done.   
+    K1      (input) INTEGER
+            The first element of IPIV for which a row interchange will
+            be done.
 
-    K2      (input) INTEGER   
-            The last element of IPIV for which a row interchange will   
-            be done.   
+    K2      (input) INTEGER
+            The last element of IPIV for which a row interchange will
+            be done.
 
-    IPIV    (input) INTEGER array, dimension (M*abs(INCX))   
-            The vector of pivot indices.  Only the elements in positions   
-            K1 through K2 of IPIV are accessed.   
-            IPIV(K) = L implies rows K and L are to be interchanged.   
+    IPIV    (input) INTEGER array, dimension (M*abs(INCX))
+            The vector of pivot indices.  Only the elements in positions
+            K1 through K2 of IPIV are accessed.
+            IPIV(K) = L implies rows K and L are to be interchanged.
 
-    INCX    (input) INTEGER   
-            The increment between successive values of IPIV.  If IPIV   
-            is negative, the pivots are applied in reverse order.   
+    INCX    (input) INTEGER
+            The increment between successive values of IPIV.  If IPIV
+            is negative, the pivots are applied in reverse order.
 
-    Further Details   
-    ===============   
+    Further Details
+    ===============
 
-    Modified by   
-     R. C. Whaley, Computer Science Dept., Univ. of Tenn., Knoxville, USA   
+    Modified by
+     R. C. Whaley, Computer Science Dept., Univ. of Tenn., Knoxville, USA
 
-   =====================================================================   
+   =====================================================================
 
 
-       Interchange row I with row IPIV(I) for each of rows K1 through K2.   
+       Interchange row I with row IPIV(I) for each of rows K1 through K2.
 
        Parameter adjustments */
     /* System generated locals */
     integer a_dim1, a_offset, i__1, i__2, i__3, i__4;
     /* Local variables */
-    static doublereal temp;
-    static integer i__, j, k, i1, i2, n32, ip, ix, ix0, inc;
+    doublereal temp;
+    integer i__, j, k, i1, i2, n32, ip, ix, ix0, inc;
 #define a_ref(a_1,a_2) a[(a_2)*a_dim1 + a_1]
 
     a_dim1 = *lda;
@@ -100,7 +100,7 @@ extern "C" {
 	    ix = ix0;
 	    i__2 = i2;
 	    i__3 = inc;
-	    for (i__ = i1; i__3 < 0 ? i__ >= i__2 : i__ <= i__2; i__ += i__3) 
+	    for (i__ = i1; i__3 < 0 ? i__ >= i__2 : i__ <= i__2; i__ += i__3)
 		    {
 		ip = ipiv[ix];
 		if (ip != i__) {
diff --git a/external/hypre/src/lapack/dlatrd.c b/external/hypre/src/lapack/dlatrd.c
index 0e82a9d6..0221988d 100644
--- a/external/hypre/src/lapack/dlatrd.c
+++ b/external/hypre/src/lapack/dlatrd.c
@@ -9,166 +9,166 @@ extern "C" {
 #include "hypre_lapack.h"
 
 /* Subroutine */ integer dlatrd_(const char *uplo, integer *n, integer *nb, doublereal *
-	a, integer *lda, doublereal *e, doublereal *tau, doublereal *w, 
+	a, integer *lda, doublereal *e, doublereal *tau, doublereal *w,
 	integer *ldw)
 {
-/*  -- LAPACK auxiliary routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       October 31, 1992   
+/*  -- LAPACK auxiliary routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       October 31, 1992
 
 
-    Purpose   
-    =======   
+    Purpose
+    =======
 
-    DLATRD reduces NB rows and columns of a real symmetric matrix A to   
-    symmetric tridiagonal form by an orthogonal similarity   
-    transformation Q' * A * Q, and returns the matrices V and W which are   
-    needed to apply the transformation to the unreduced part of A.   
+    DLATRD reduces NB rows and columns of a real symmetric matrix A to
+    symmetric tridiagonal form by an orthogonal similarity
+    transformation Q' * A * Q, and returns the matrices V and W which are
+    needed to apply the transformation to the unreduced part of A.
 
-    If UPLO = 'U', DLATRD reduces the last NB rows and columns of a   
-    matrix, of which the upper triangle is supplied;   
-    if UPLO = 'L', DLATRD reduces the first NB rows and columns of a   
-    matrix, of which the lower triangle is supplied.   
+    If UPLO = 'U', DLATRD reduces the last NB rows and columns of a
+    matrix, of which the upper triangle is supplied;
+    if UPLO = 'L', DLATRD reduces the first NB rows and columns of a
+    matrix, of which the lower triangle is supplied.
 
-    This is an auxiliary routine called by DSYTRD.   
+    This is an auxiliary routine called by DSYTRD.
 
-    Arguments   
-    =========   
+    Arguments
+    =========
 
-    UPLO    (input) CHARACTER   
-            Specifies whether the upper or lower triangular part of the   
-            symmetric matrix A is stored:   
-            = 'U': Upper triangular   
-            = 'L': Lower triangular   
+    UPLO    (input) CHARACTER
+            Specifies whether the upper or lower triangular part of the
+            symmetric matrix A is stored:
+            = 'U': Upper triangular
+            = 'L': Lower triangular
 
-    N       (input) INTEGER   
-            The order of the matrix A.   
+    N       (input) INTEGER
+            The order of the matrix A.
 
-    NB      (input) INTEGER   
-            The number of rows and columns to be reduced.   
+    NB      (input) INTEGER
+            The number of rows and columns to be reduced.
 
-    A       (input/output) DOUBLE PRECISION array, dimension (LDA,N)   
-            On entry, the symmetric matrix A.  If UPLO = 'U', the leading   
-            n-by-n upper triangular part of A contains the upper   
-            triangular part of the matrix A, and the strictly lower   
-            triangular part of A is not referenced.  If UPLO = 'L', the   
-            leading n-by-n lower triangular part of A contains the lower   
-            triangular part of the matrix A, and the strictly upper   
-            triangular part of A is not referenced.   
-            On exit:   
-            if UPLO = 'U', the last NB columns have been reduced to   
-              tridiagonal form, with the diagonal elements overwriting   
-              the diagonal elements of A; the elements above the diagonal   
-              with the array TAU, represent the orthogonal matrix Q as a   
-              product of elementary reflectors;   
-            if UPLO = 'L', the first NB columns have been reduced to   
-              tridiagonal form, with the diagonal elements overwriting   
-              the diagonal elements of A; the elements below the diagonal   
-              with the array TAU, represent the  orthogonal matrix Q as a   
-              product of elementary reflectors.   
-            See Further Details.   
+    A       (input/output) DOUBLE PRECISION array, dimension (LDA,N)
+            On entry, the symmetric matrix A.  If UPLO = 'U', the leading
+            n-by-n upper triangular part of A contains the upper
+            triangular part of the matrix A, and the strictly lower
+            triangular part of A is not referenced.  If UPLO = 'L', the
+            leading n-by-n lower triangular part of A contains the lower
+            triangular part of the matrix A, and the strictly upper
+            triangular part of A is not referenced.
+            On exit:
+            if UPLO = 'U', the last NB columns have been reduced to
+              tridiagonal form, with the diagonal elements overwriting
+              the diagonal elements of A; the elements above the diagonal
+              with the array TAU, represent the orthogonal matrix Q as a
+              product of elementary reflectors;
+            if UPLO = 'L', the first NB columns have been reduced to
+              tridiagonal form, with the diagonal elements overwriting
+              the diagonal elements of A; the elements below the diagonal
+              with the array TAU, represent the  orthogonal matrix Q as a
+              product of elementary reflectors.
+            See Further Details.
 
-    LDA     (input) INTEGER   
-            The leading dimension of the array A.  LDA >= (1,N).   
+    LDA     (input) INTEGER
+            The leading dimension of the array A.  LDA >= (1,N).
 
-    E       (output) DOUBLE PRECISION array, dimension (N-1)   
-            If UPLO = 'U', E(n-nb:n-1) contains the superdiagonal   
-            elements of the last NB columns of the reduced matrix;   
-            if UPLO = 'L', E(1:nb) contains the subdiagonal elements of   
-            the first NB columns of the reduced matrix.   
+    E       (output) DOUBLE PRECISION array, dimension (N-1)
+            If UPLO = 'U', E(n-nb:n-1) contains the superdiagonal
+            elements of the last NB columns of the reduced matrix;
+            if UPLO = 'L', E(1:nb) contains the subdiagonal elements of
+            the first NB columns of the reduced matrix.
 
-    TAU     (output) DOUBLE PRECISION array, dimension (N-1)   
-            The scalar factors of the elementary reflectors, stored in   
-            TAU(n-nb:n-1) if UPLO = 'U', and in TAU(1:nb) if UPLO = 'L'.   
-            See Further Details.   
+    TAU     (output) DOUBLE PRECISION array, dimension (N-1)
+            The scalar factors of the elementary reflectors, stored in
+            TAU(n-nb:n-1) if UPLO = 'U', and in TAU(1:nb) if UPLO = 'L'.
+            See Further Details.
 
-    W       (output) DOUBLE PRECISION array, dimension (LDW,NB)   
-            The n-by-nb matrix W required to update the unreduced part   
-            of A.   
+    W       (output) DOUBLE PRECISION array, dimension (LDW,NB)
+            The n-by-nb matrix W required to update the unreduced part
+            of A.
 
-    LDW     (input) INTEGER   
-            The leading dimension of the array W. LDW >= max(1,N).   
+    LDW     (input) INTEGER
+            The leading dimension of the array W. LDW >= max(1,N).
 
-    Further Details   
-    ===============   
+    Further Details
+    ===============
 
-    If UPLO = 'U', the matrix Q is represented as a product of elementary   
-    reflectors   
+    If UPLO = 'U', the matrix Q is represented as a product of elementary
+    reflectors
 
-       Q = H(n) H(n-1) . . . H(n-nb+1).   
+       Q = H(n) H(n-1) . . . H(n-nb+1).
 
-    Each H(i) has the form   
+    Each H(i) has the form
 
-       H(i) = I - tau * v * v'   
+       H(i) = I - tau * v * v'
 
-    where tau is a real scalar, and v is a real vector with   
-    v(i:n) = 0 and v(i-1) = 1; v(1:i-1) is stored on exit in A(1:i-1,i),   
-    and tau in TAU(i-1).   
+    where tau is a real scalar, and v is a real vector with
+    v(i:n) = 0 and v(i-1) = 1; v(1:i-1) is stored on exit in A(1:i-1,i),
+    and tau in TAU(i-1).
 
-    If UPLO = 'L', the matrix Q is represented as a product of elementary   
-    reflectors   
+    If UPLO = 'L', the matrix Q is represented as a product of elementary
+    reflectors
 
-       Q = H(1) H(2) . . . H(nb).   
+       Q = H(1) H(2) . . . H(nb).
 
-    Each H(i) has the form   
+    Each H(i) has the form
 
-       H(i) = I - tau * v * v'   
+       H(i) = I - tau * v * v'
 
-    where tau is a real scalar, and v is a real vector with   
-    v(1:i) = 0 and v(i+1) = 1; v(i+1:n) is stored on exit in A(i+1:n,i),   
-    and tau in TAU(i).   
+    where tau is a real scalar, and v is a real vector with
+    v(1:i) = 0 and v(i+1) = 1; v(i+1:n) is stored on exit in A(i+1:n,i),
+    and tau in TAU(i).
 
-    The elements of the vectors v together form the n-by-nb matrix V   
-    which is needed, with W, to apply the transformation to the unreduced   
-    part of the matrix, using a symmetric rank-2k update of the form:   
-    A := A - V*W' - W*V'.   
+    The elements of the vectors v together form the n-by-nb matrix V
+    which is needed, with W, to apply the transformation to the unreduced
+    part of the matrix, using a symmetric rank-2k update of the form:
+    A := A - V*W' - W*V'.
 
-    The contents of A on exit are illustrated by the following examples   
-    with n = 5 and nb = 2:   
+    The contents of A on exit are illustrated by the following examples
+    with n = 5 and nb = 2:
 
-    if UPLO = 'U':                       if UPLO = 'L':   
+    if UPLO = 'U':                       if UPLO = 'L':
 
-      (  a   a   a   v4  v5 )              (  d                  )   
-      (      a   a   v4  v5 )              (  1   d              )   
-      (          a   1   v5 )              (  v1  1   a          )   
-      (              d   1  )              (  v1  v2  a   a      )   
-      (                  d  )              (  v1  v2  a   a   a  )   
+      (  a   a   a   v4  v5 )              (  d                  )
+      (      a   a   v4  v5 )              (  1   d              )
+      (          a   1   v5 )              (  v1  1   a          )
+      (              d   1  )              (  v1  v2  a   a      )
+      (                  d  )              (  v1  v2  a   a   a  )
 
-    where d denotes a diagonal element of the reduced matrix, a denotes   
-    an element of the original matrix that is unchanged, and vi denotes   
-    an element of the vector defining H(i).   
+    where d denotes a diagonal element of the reduced matrix, a denotes
+    an element of the original matrix that is unchanged, and vi denotes
+    an element of the vector defining H(i).
 
-    =====================================================================   
+    =====================================================================
 
 
-       Quick return if possible   
+       Quick return if possible
 
        Parameter adjustments */
     /* Table of constant values */
-    static doublereal c_b5 = -1.;
-    static doublereal c_b6 = 1.;
-    static integer c__1 = 1;
-    static doublereal c_b16 = 0.;
-    
+    doublereal c_b5 = -1.;
+    doublereal c_b6 = 1.;
+    integer c__1 = 1;
+    doublereal c_b16 = 0.;
+
     /* System generated locals */
     integer a_dim1, a_offset, w_dim1, w_offset, i__1, i__2, i__3;
     /* Local variables */
-    extern doublereal ddot_(integer *, doublereal *, integer *, doublereal *, 
+    extern doublereal ddot_(integer *, doublereal *, integer *, doublereal *,
 	    integer *);
-    static integer i__;
-    static doublereal alpha;
-    extern /* Subroutine */ integer dscal_(integer *, doublereal *, doublereal *, 
+    integer i__;
+    doublereal alpha;
+    extern /* Subroutine */ integer dscal_(integer *, doublereal *, doublereal *,
 	    integer *);
     extern logical lsame_(const char *,const char *);
-    extern /* Subroutine */ integer dgemv_(const char *, integer *, integer *, 
-	    doublereal *, doublereal *, integer *, doublereal *, integer *, 
-	    doublereal *, doublereal *, integer *), daxpy_(integer *, 
-	    doublereal *, doublereal *, integer *, doublereal *, integer *), 
-	    dsymv_(const char *, integer *, doublereal *, doublereal *, integer *, 
+    extern /* Subroutine */ integer dgemv_(const char *, integer *, integer *,
+	    doublereal *, doublereal *, integer *, doublereal *, integer *,
+	    doublereal *, doublereal *, integer *), daxpy_(integer *,
+	    doublereal *, doublereal *, integer *, doublereal *, integer *),
+	    dsymv_(const char *, integer *, doublereal *, doublereal *, integer *,
 	    doublereal *, integer *, doublereal *, doublereal *, integer *), dlarfg_(integer *, doublereal *, doublereal *, integer *,
 	     doublereal *);
-    static integer iw;
+    integer iw;
 #define a_ref(a_1,a_2) a[(a_2)*a_dim1 + a_1]
 #define w_ref(a_1,a_2) w[(a_2)*w_dim1 + a_1]
 
@@ -203,13 +203,13 @@ extern "C" {
 			 lda, &w_ref(i__, iw + 1), ldw, &c_b6, &a_ref(1, i__),
 			 &c__1);
 		i__2 = *n - i__;
-		dgemv_("No transpose", &i__, &i__2, &c_b5, &w_ref(1, iw + 1), 
+		dgemv_("No transpose", &i__, &i__2, &c_b5, &w_ref(1, iw + 1),
 			ldw, &a_ref(i__, i__ + 1), lda, &c_b6, &a_ref(1, i__),
 			 &c__1);
 	    }
 	    if (i__ > 1) {
 
-/*              Generate elementary reflector H(i) to annihilate   
+/*              Generate elementary reflector H(i) to annihilate
                 A(1:i-2,i) */
 
 		i__2 = i__ - 1;
@@ -221,27 +221,27 @@ extern "C" {
 /*              Compute W(1:i-1,i) */
 
 		i__2 = i__ - 1;
-		dsymv_("Upper", &i__2, &c_b6, &a[a_offset], lda, &a_ref(1, 
+		dsymv_("Upper", &i__2, &c_b6, &a[a_offset], lda, &a_ref(1,
 			i__), &c__1, &c_b16, &w_ref(1, iw), &c__1);
 		if (i__ < *n) {
 		    i__2 = i__ - 1;
 		    i__3 = *n - i__;
 		    dgemv_("Transpose", &i__2, &i__3, &c_b6, &w_ref(1, iw + 1)
-			    , ldw, &a_ref(1, i__), &c__1, &c_b16, &w_ref(i__ 
+			    , ldw, &a_ref(1, i__), &c__1, &c_b16, &w_ref(i__
 			    + 1, iw), &c__1);
 		    i__2 = i__ - 1;
 		    i__3 = *n - i__;
-		    dgemv_("No transpose", &i__2, &i__3, &c_b5, &a_ref(1, i__ 
+		    dgemv_("No transpose", &i__2, &i__3, &c_b5, &a_ref(1, i__
 			    + 1), lda, &w_ref(i__ + 1, iw), &c__1, &c_b6, &
 			    w_ref(1, iw), &c__1);
 		    i__2 = i__ - 1;
 		    i__3 = *n - i__;
-		    dgemv_("Transpose", &i__2, &i__3, &c_b6, &a_ref(1, i__ + 
+		    dgemv_("Transpose", &i__2, &i__3, &c_b6, &a_ref(1, i__ +
 			    1), lda, &a_ref(1, i__), &c__1, &c_b16, &w_ref(
 			    i__ + 1, iw), &c__1);
 		    i__2 = i__ - 1;
 		    i__3 = *n - i__;
-		    dgemv_("No transpose", &i__2, &i__3, &c_b5, &w_ref(1, iw 
+		    dgemv_("No transpose", &i__2, &i__3, &c_b5, &w_ref(1, iw
 			    + 1), ldw, &w_ref(i__ + 1, iw), &c__1, &c_b6, &
 			    w_ref(1, iw), &c__1);
 		}
@@ -276,8 +276,8 @@ extern "C" {
 		    a_ref(i__, 1), lda, &c_b6, &a_ref(i__, i__), &c__1);
 	    if (i__ < *n) {
 
-/*              Generate elementary reflector H(i) to annihilate   
-                A(i+2:n,i)   
+/*              Generate elementary reflector H(i) to annihilate
+                A(i+2:n,i)
 
    Computing MIN */
 		i__2 = i__ + 2;
@@ -291,27 +291,27 @@ extern "C" {
 
 		i__2 = *n - i__;
 		dsymv_("Lower", &i__2, &c_b6, &a_ref(i__ + 1, i__ + 1), lda, &
-			a_ref(i__ + 1, i__), &c__1, &c_b16, &w_ref(i__ + 1, 
+			a_ref(i__ + 1, i__), &c__1, &c_b16, &w_ref(i__ + 1,
 			i__), &c__1);
 		i__2 = *n - i__;
 		i__3 = i__ - 1;
-		dgemv_("Transpose", &i__2, &i__3, &c_b6, &w_ref(i__ + 1, 1), 
-			ldw, &a_ref(i__ + 1, i__), &c__1, &c_b16, &w_ref(1, 
+		dgemv_("Transpose", &i__2, &i__3, &c_b6, &w_ref(i__ + 1, 1),
+			ldw, &a_ref(i__ + 1, i__), &c__1, &c_b16, &w_ref(1,
 			i__), &c__1);
 		i__2 = *n - i__;
 		i__3 = i__ - 1;
 		dgemv_("No transpose", &i__2, &i__3, &c_b5, &a_ref(i__ + 1, 1)
-			, lda, &w_ref(1, i__), &c__1, &c_b6, &w_ref(i__ + 1, 
+			, lda, &w_ref(1, i__), &c__1, &c_b6, &w_ref(i__ + 1,
 			i__), &c__1);
 		i__2 = *n - i__;
 		i__3 = i__ - 1;
-		dgemv_("Transpose", &i__2, &i__3, &c_b6, &a_ref(i__ + 1, 1), 
-			lda, &a_ref(i__ + 1, i__), &c__1, &c_b16, &w_ref(1, 
+		dgemv_("Transpose", &i__2, &i__3, &c_b6, &a_ref(i__ + 1, 1),
+			lda, &a_ref(i__ + 1, i__), &c__1, &c_b16, &w_ref(1,
 			i__), &c__1);
 		i__2 = *n - i__;
 		i__3 = i__ - 1;
 		dgemv_("No transpose", &i__2, &i__3, &c_b5, &w_ref(i__ + 1, 1)
-			, ldw, &w_ref(1, i__), &c__1, &c_b6, &w_ref(i__ + 1, 
+			, ldw, &w_ref(1, i__), &c__1, &c_b6, &w_ref(i__ + 1,
 			i__), &c__1);
 		i__2 = *n - i__;
 		dscal_(&i__2, &tau[i__], &w_ref(i__ + 1, i__), &c__1);
@@ -319,7 +319,7 @@ extern "C" {
 		alpha = tau[i__] * -.5 * ddot_(&i__2, &w_ref(i__ + 1, i__), &
 			c__1, &a_ref(i__ + 1, i__), &c__1);
 		i__2 = *n - i__;
-		daxpy_(&i__2, &alpha, &a_ref(i__ + 1, i__), &c__1, &w_ref(i__ 
+		daxpy_(&i__2, &alpha, &a_ref(i__ + 1, i__), &c__1, &w_ref(i__
 			+ 1, i__), &c__1);
 	    }
 
diff --git a/external/hypre/src/lapack/dorg2l.c b/external/hypre/src/lapack/dorg2l.c
index 39f99b5b..acbd3c67 100644
--- a/external/hypre/src/lapack/dorg2l.c
+++ b/external/hypre/src/lapack/dorg2l.c
@@ -68,17 +68,17 @@ extern "C" {
 
        Parameter adjustments */
     /* Table of constant values */
-    static integer c__1 = 1;
+     integer c__1 = 1;
     
     /* System generated locals */
     integer a_dim1, a_offset, i__1, i__2, i__3;
     doublereal d__1;
     /* Local variables */
-    static integer i__, j, l;
+     integer i__, j, l;
     extern /* Subroutine */ integer dscal_(integer *, doublereal *, doublereal *, 
 	    integer *), dlarf_(const char *, integer *, integer *, doublereal *, 
 	    integer *, doublereal *, doublereal *, integer *, doublereal *);
-    static integer ii;
+     integer ii;
     extern /* Subroutine */ integer xerbla_(const char *, integer *);
 #define a_ref(a_1,a_2) a[(a_2)*a_dim1 + a_1]
 
diff --git a/external/hypre/src/lapack/dorg2r.c b/external/hypre/src/lapack/dorg2r.c
index b3a1314e..e06eb51f 100644
--- a/external/hypre/src/lapack/dorg2r.c
+++ b/external/hypre/src/lapack/dorg2r.c
@@ -11,72 +11,72 @@ extern "C" {
 /* Subroutine */ integer dorg2r_(integer *m, integer *n, integer *k, doublereal *
 	a, integer *lda, doublereal *tau, doublereal *work, integer *info)
 {
-/*  -- LAPACK routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       February 29, 1992   
+/*  -- LAPACK routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       February 29, 1992
 
 
-    Purpose   
-    =======   
+    Purpose
+    =======
 
-    DORG2R generates an m by n real matrix Q with orthonormal columns,   
-    which is defined as the first n columns of a product of k elementary   
-    reflectors of order m   
+    DORG2R generates an m by n real matrix Q with orthonormal columns,
+    which is defined as the first n columns of a product of k elementary
+    reflectors of order m
 
-          Q  =  H(1) H(2) . . . H(k)   
+          Q  =  H(1) H(2) . . . H(k)
 
-    as returned by DGEQRF.   
+    as returned by DGEQRF.
 
-    Arguments   
-    =========   
+    Arguments
+    =========
 
-    M       (input) INTEGER   
-            The number of rows of the matrix Q. M >= 0.   
+    M       (input) INTEGER
+            The number of rows of the matrix Q. M >= 0.
 
-    N       (input) INTEGER   
-            The number of columns of the matrix Q. M >= N >= 0.   
+    N       (input) INTEGER
+            The number of columns of the matrix Q. M >= N >= 0.
 
-    K       (input) INTEGER   
-            The number of elementary reflectors whose product defines the   
-            matrix Q. N >= K >= 0.   
+    K       (input) INTEGER
+            The number of elementary reflectors whose product defines the
+            matrix Q. N >= K >= 0.
 
-    A       (input/output) DOUBLE PRECISION array, dimension (LDA,N)   
-            On entry, the i-th column must contain the vector which   
-            defines the elementary reflector H(i), for i = 1,2,...,k, as   
-            returned by DGEQRF in the first k columns of its array   
-            argument A.   
-            On exit, the m-by-n matrix Q.   
+    A       (input/output) DOUBLE PRECISION array, dimension (LDA,N)
+            On entry, the i-th column must contain the vector which
+            defines the elementary reflector H(i), for i = 1,2,...,k, as
+            returned by DGEQRF in the first k columns of its array
+            argument A.
+            On exit, the m-by-n matrix Q.
 
-    LDA     (input) INTEGER   
-            The first dimension of the array A. LDA >= max(1,M).   
+    LDA     (input) INTEGER
+            The first dimension of the array A. LDA >= max(1,M).
 
-    TAU     (input) DOUBLE PRECISION array, dimension (K)   
-            TAU(i) must contain the scalar factor of the elementary   
-            reflector H(i), as returned by DGEQRF.   
+    TAU     (input) DOUBLE PRECISION array, dimension (K)
+            TAU(i) must contain the scalar factor of the elementary
+            reflector H(i), as returned by DGEQRF.
 
-    WORK    (workspace) DOUBLE PRECISION array, dimension (N)   
+    WORK    (workspace) DOUBLE PRECISION array, dimension (N)
 
-    INFO    (output) INTEGER   
-            = 0: successful exit   
-            < 0: if INFO = -i, the i-th argument has an illegal value   
+    INFO    (output) INTEGER
+            = 0: successful exit
+            < 0: if INFO = -i, the i-th argument has an illegal value
 
-    =====================================================================   
+    =====================================================================
 
 
-       Test the input arguments   
+       Test the input arguments
 
        Parameter adjustments */
     /* Table of constant values */
-    static integer c__1 = 1;
-    
+    integer c__1 = 1;
+
     /* System generated locals */
     integer a_dim1, a_offset, i__1, i__2;
     doublereal d__1;
     /* Local variables */
-    static integer i__, j, l;
-    extern /* Subroutine */ integer dscal_(integer *, doublereal *, doublereal *, 
-	    integer *), dlarf_(const char *, integer *, integer *, doublereal *, 
+    integer i__, j, l;
+    extern /* Subroutine */ integer dscal_(integer *, doublereal *, doublereal *,
+	    integer *), dlarf_(const char *, integer *, integer *, doublereal *,
 	    integer *, doublereal *, doublereal *, integer *, doublereal *), xerbla_(const char *, integer *);
 #define a_ref(a_1,a_2) a[(a_2)*a_dim1 + a_1]
 
diff --git a/external/hypre/src/lapack/dorgbr.c b/external/hypre/src/lapack/dorgbr.c
index 9e3c6b93..555309ef 100644
--- a/external/hypre/src/lapack/dorgbr.c
+++ b/external/hypre/src/lapack/dorgbr.c
@@ -8,123 +8,123 @@ extern "C" {
 #include "f2c.h"
 #include "hypre_lapack.h"
 
-/* Subroutine */ integer dorgbr_(const char *vect, integer *m, integer *n, integer *k, 
-	doublereal *a, integer *lda, doublereal *tau, doublereal *work, 
+/* Subroutine */ integer dorgbr_(const char *vect, integer *m, integer *n, integer *k,
+	doublereal *a, integer *lda, doublereal *tau, doublereal *work,
 	integer *lwork, integer *info)
 {
-/*  -- LAPACK routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       June 30, 1999   
-
-
-    Purpose   
-    =======   
-
-    DORGBR generates one of the real orthogonal matrices Q or P**T   
-    determined by DGEBRD when reducing a real matrix A to bidiagonal   
-    form: A = Q * B * P**T.  Q and P**T are defined as products of   
-    elementary reflectors H(i) or G(i) respectively.   
-
-    If VECT = 'Q', A is assumed to have been an M-by-K matrix, and Q   
-    is of order M:   
-    if m >= k, Q = H(1) H(2) . . . H(k) and DORGBR returns the first n   
-    columns of Q, where m >= n >= k;   
-    if m < k, Q = H(1) H(2) . . . H(m-1) and DORGBR returns Q as an   
-    M-by-M matrix.   
-
-    If VECT = 'P', A is assumed to have been a K-by-N matrix, and P**T   
-    is of order N:   
-    if k < n, P**T = G(k) . . . G(2) G(1) and DORGBR returns the first m   
-    rows of P**T, where n >= m >= k;   
-    if k >= n, P**T = G(n-1) . . . G(2) G(1) and DORGBR returns P**T as   
-    an N-by-N matrix.   
-
-    Arguments   
-    =========   
-
-    VECT    (input) CHARACTER*1   
-            Specifies whether the matrix Q or the matrix P**T is   
-            required, as defined in the transformation applied by DGEBRD:   
-            = 'Q':  generate Q;   
-            = 'P':  generate P**T.   
-
-    M       (input) INTEGER   
-            The number of rows of the matrix Q or P**T to be returned.   
-            M >= 0.   
-
-    N       (input) INTEGER   
-            The number of columns of the matrix Q or P**T to be returned.   
-            N >= 0.   
-            If VECT = 'Q', M >= N >= min(M,K);   
-            if VECT = 'P', N >= M >= min(N,K).   
-
-    K       (input) INTEGER   
-            If VECT = 'Q', the number of columns in the original M-by-K   
-            matrix reduced by DGEBRD.   
-            If VECT = 'P', the number of rows in the original K-by-N   
-            matrix reduced by DGEBRD.   
-            K >= 0.   
-
-    A       (input/output) DOUBLE PRECISION array, dimension (LDA,N)   
-            On entry, the vectors which define the elementary reflectors,   
-            as returned by DGEBRD.   
-            On exit, the M-by-N matrix Q or P**T.   
-
-    LDA     (input) INTEGER   
-            The leading dimension of the array A. LDA >= max(1,M).   
-
-    TAU     (input) DOUBLE PRECISION array, dimension   
-                                  (min(M,K)) if VECT = 'Q'   
-                                  (min(N,K)) if VECT = 'P'   
-            TAU(i) must contain the scalar factor of the elementary   
-            reflector H(i) or G(i), which determines Q or P**T, as   
-            returned by DGEBRD in its array argument TAUQ or TAUP.   
-
-    WORK    (workspace/output) DOUBLE PRECISION array, dimension (LWORK)   
-            On exit, if INFO = 0, WORK(1) returns the optimal LWORK.   
-
-    LWORK   (input) INTEGER   
-            The dimension of the array WORK. LWORK >= max(1,min(M,N)).   
-            For optimum performance LWORK >= min(M,N)*NB, where NB   
-            is the optimal blocksize.   
-
-            If LWORK = -1, then a workspace query is assumed; the routine   
-            only calculates the optimal size of the WORK array, returns   
-            this value as the first entry of the WORK array, and no error   
-            message related to LWORK is issued by XERBLA.   
-
-    INFO    (output) INTEGER   
-            = 0:  successful exit   
-            < 0:  if INFO = -i, the i-th argument had an illegal value   
-
-    =====================================================================   
-
-
-       Test the input arguments   
+/*  -- LAPACK routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       June 30, 1999
+
+
+    Purpose
+    =======
+
+    DORGBR generates one of the real orthogonal matrices Q or P**T
+    determined by DGEBRD when reducing a real matrix A to bidiagonal
+    form: A = Q * B * P**T.  Q and P**T are defined as products of
+    elementary reflectors H(i) or G(i) respectively.
+
+    If VECT = 'Q', A is assumed to have been an M-by-K matrix, and Q
+    is of order M:
+    if m >= k, Q = H(1) H(2) . . . H(k) and DORGBR returns the first n
+    columns of Q, where m >= n >= k;
+    if m < k, Q = H(1) H(2) . . . H(m-1) and DORGBR returns Q as an
+    M-by-M matrix.
+
+    If VECT = 'P', A is assumed to have been a K-by-N matrix, and P**T
+    is of order N:
+    if k < n, P**T = G(k) . . . G(2) G(1) and DORGBR returns the first m
+    rows of P**T, where n >= m >= k;
+    if k >= n, P**T = G(n-1) . . . G(2) G(1) and DORGBR returns P**T as
+    an N-by-N matrix.
+
+    Arguments
+    =========
+
+    VECT    (input) CHARACTER*1
+            Specifies whether the matrix Q or the matrix P**T is
+            required, as defined in the transformation applied by DGEBRD:
+            = 'Q':  generate Q;
+            = 'P':  generate P**T.
+
+    M       (input) INTEGER
+            The number of rows of the matrix Q or P**T to be returned.
+            M >= 0.
+
+    N       (input) INTEGER
+            The number of columns of the matrix Q or P**T to be returned.
+            N >= 0.
+            If VECT = 'Q', M >= N >= min(M,K);
+            if VECT = 'P', N >= M >= min(N,K).
+
+    K       (input) INTEGER
+            If VECT = 'Q', the number of columns in the original M-by-K
+            matrix reduced by DGEBRD.
+            If VECT = 'P', the number of rows in the original K-by-N
+            matrix reduced by DGEBRD.
+            K >= 0.
+
+    A       (input/output) DOUBLE PRECISION array, dimension (LDA,N)
+            On entry, the vectors which define the elementary reflectors,
+            as returned by DGEBRD.
+            On exit, the M-by-N matrix Q or P**T.
+
+    LDA     (input) INTEGER
+            The leading dimension of the array A. LDA >= max(1,M).
+
+    TAU     (input) DOUBLE PRECISION array, dimension
+                                  (min(M,K)) if VECT = 'Q'
+                                  (min(N,K)) if VECT = 'P'
+            TAU(i) must contain the scalar factor of the elementary
+            reflector H(i) or G(i), which determines Q or P**T, as
+            returned by DGEBRD in its array argument TAUQ or TAUP.
+
+    WORK    (workspace/output) DOUBLE PRECISION array, dimension (LWORK)
+            On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
+
+    LWORK   (input) INTEGER
+            The dimension of the array WORK. LWORK >= max(1,min(M,N)).
+            For optimum performance LWORK >= min(M,N)*NB, where NB
+            is the optimal blocksize.
+
+            If LWORK = -1, then a workspace query is assumed; the routine
+            only calculates the optimal size of the WORK array, returns
+            this value as the first entry of the WORK array, and no error
+            message related to LWORK is issued by XERBLA.
+
+    INFO    (output) INTEGER
+            = 0:  successful exit
+            < 0:  if INFO = -i, the i-th argument had an illegal value
+
+    =====================================================================
+
+
+       Test the input arguments
 
        Parameter adjustments */
     /* Table of constant values */
-    static integer c__1 = 1;
-    static integer c_n1 = -1;
-    
+    integer c__1 = 1;
+    integer c_n1 = -1;
+
     /* System generated locals */
     integer a_dim1, a_offset, i__1, i__2, i__3;
     /* Local variables */
-    static integer i__, j;
+    integer i__, j;
     extern logical lsame_(const char *,const char *);
-    static integer iinfo;
-    static logical wantq;
-    static integer nb, mn;
+    integer iinfo;
+    logical wantq;
+    integer nb, mn;
     extern /* Subroutine */ integer xerbla_(const char *, integer *);
-    extern integer ilaenv_(integer *,const char *,const char *, integer *, integer *, 
+    extern integer ilaenv_(integer *,const char *,const char *, integer *, integer *,
 	    integer *, integer *, ftnlen, ftnlen);
-    extern /* Subroutine */ integer dorglq_(integer *, integer *, integer *, 
-	    doublereal *, integer *, doublereal *, doublereal *, integer *, 
+    extern /* Subroutine */ integer dorglq_(integer *, integer *, integer *,
+	    doublereal *, integer *, doublereal *, doublereal *, integer *,
 	    integer *), dorgqr_(integer *, integer *, integer *, doublereal *,
 	     integer *, doublereal *, doublereal *, integer *, integer *);
-    static integer lwkopt;
-    static logical lquery;
+    integer lwkopt;
+    logical lquery;
 #define a_ref(a_1,a_2) a[(a_2)*a_dim1 + a_1]
 
 
@@ -143,7 +143,7 @@ extern "C" {
 	*info = -1;
     } else if (*m < 0) {
 	*info = -2;
-    } else if (*n < 0 || ((wantq) && (*n > *m || *n < min(*m,*k))) || 
+    } else if (*n < 0 || ((wantq) && (*n > *m || *n < min(*m,*k))) ||
               ((! wantq) && (*m > *n || *m < min(*n,*k)))) {
 	*info = -3;
     } else if (*k < 0) {
@@ -183,7 +183,7 @@ extern "C" {
 
     if (wantq) {
 
-/*        Form Q, determined by a call to DGEBRD to reduce an m-by-k   
+/*        Form Q, determined by a call to DGEBRD to reduce an m-by-k
           matrix */
 
 	if (*m >= *k) {
@@ -195,10 +195,10 @@ extern "C" {
 
 	} else {
 
-/*           If m < k, assume m = n   
+/*           If m < k, assume m = n
 
-             Shift the vectors which define the elementary reflectors one   
-             column to the right, and set the first row and column of Q   
+             Shift the vectors which define the elementary reflectors one
+             column to the right, and set the first row and column of Q
              to those of the unit matrix */
 
 	    for (j = *m; j >= 2; --j) {
@@ -229,7 +229,7 @@ extern "C" {
 	}
     } else {
 
-/*        Form P', determined by a call to DGEBRD to reduce a k-by-n   
+/*        Form P', determined by a call to DGEBRD to reduce a k-by-n
           matrix */
 
 	if (*k < *n) {
@@ -241,10 +241,10 @@ extern "C" {
 
 	} else {
 
-/*           If k >= n, assume m = n   
+/*           If k >= n, assume m = n
 
-             Shift the vectors which define the elementary reflectors one   
-             row downward, and set the first row and column of P' to   
+             Shift the vectors which define the elementary reflectors one
+             row downward, and set the first row and column of P' to
              those of the unit matrix */
 
 	    a_ref(1, 1) = 1.;
diff --git a/external/hypre/src/lapack/dorgl2.c b/external/hypre/src/lapack/dorgl2.c
index 39a61c34..6fa4209e 100644
--- a/external/hypre/src/lapack/dorgl2.c
+++ b/external/hypre/src/lapack/dorgl2.c
@@ -11,68 +11,68 @@ extern "C" {
 /* Subroutine */ integer dorgl2_(integer *m, integer *n, integer *k, doublereal *
 	a, integer *lda, doublereal *tau, doublereal *work, integer *info)
 {
-/*  -- LAPACK routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       June 30, 1999   
+/*  -- LAPACK routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       June 30, 1999
 
 
-    Purpose   
-    =======   
+    Purpose
+    =======
 
-    DORGL2 generates an m by n real matrix Q with orthonormal rows,   
-    which is defined as the first m rows of a product of k elementary   
-    reflectors of order n   
+    DORGL2 generates an m by n real matrix Q with orthonormal rows,
+    which is defined as the first m rows of a product of k elementary
+    reflectors of order n
 
-          Q  =  H(k) . . . H(2) H(1)   
+          Q  =  H(k) . . . H(2) H(1)
 
-    as returned by DGELQF.   
+    as returned by DGELQF.
 
-    Arguments   
-    =========   
+    Arguments
+    =========
 
-    M       (input) INTEGER   
-            The number of rows of the matrix Q. M >= 0.   
+    M       (input) INTEGER
+            The number of rows of the matrix Q. M >= 0.
 
-    N       (input) INTEGER   
-            The number of columns of the matrix Q. N >= M.   
+    N       (input) INTEGER
+            The number of columns of the matrix Q. N >= M.
 
-    K       (input) INTEGER   
-            The number of elementary reflectors whose product defines the   
-            matrix Q. M >= K >= 0.   
+    K       (input) INTEGER
+            The number of elementary reflectors whose product defines the
+            matrix Q. M >= K >= 0.
 
-    A       (input/output) DOUBLE PRECISION array, dimension (LDA,N)   
-            On entry, the i-th row must contain the vector which defines   
-            the elementary reflector H(i), for i = 1,2,...,k, as returned   
-            by DGELQF in the first k rows of its array argument A.   
-            On exit, the m-by-n matrix Q.   
+    A       (input/output) DOUBLE PRECISION array, dimension (LDA,N)
+            On entry, the i-th row must contain the vector which defines
+            the elementary reflector H(i), for i = 1,2,...,k, as returned
+            by DGELQF in the first k rows of its array argument A.
+            On exit, the m-by-n matrix Q.
 
-    LDA     (input) INTEGER   
-            The first dimension of the array A. LDA >= max(1,M).   
+    LDA     (input) INTEGER
+            The first dimension of the array A. LDA >= max(1,M).
 
-    TAU     (input) DOUBLE PRECISION array, dimension (K)   
-            TAU(i) must contain the scalar factor of the elementary   
-            reflector H(i), as returned by DGELQF.   
+    TAU     (input) DOUBLE PRECISION array, dimension (K)
+            TAU(i) must contain the scalar factor of the elementary
+            reflector H(i), as returned by DGELQF.
 
-    WORK    (workspace) DOUBLE PRECISION array, dimension (M)   
+    WORK    (workspace) DOUBLE PRECISION array, dimension (M)
 
-    INFO    (output) INTEGER   
-            = 0: successful exit   
-            < 0: if INFO = -i, the i-th argument has an illegal value   
+    INFO    (output) INTEGER
+            = 0: successful exit
+            < 0: if INFO = -i, the i-th argument has an illegal value
 
-    =====================================================================   
+    =====================================================================
 
 
-       Test the input arguments   
+       Test the input arguments
 
        Parameter adjustments */
     /* System generated locals */
     integer a_dim1, a_offset, i__1, i__2;
     doublereal d__1;
     /* Local variables */
-    static integer i__, j, l;
-    extern /* Subroutine */ integer dscal_(integer *, doublereal *, doublereal *, 
-	    integer *), dlarf_(const char *, integer *, integer *, doublereal *, 
+    integer i__, j, l;
+    extern /* Subroutine */ integer dscal_(integer *, doublereal *, doublereal *,
+	    integer *), dlarf_(const char *, integer *, integer *, doublereal *,
 	    integer *, doublereal *, doublereal *, integer *, doublereal *), xerbla_(const char *, integer *);
 #define a_ref(a_1,a_2) a[(a_2)*a_dim1 + a_1]
 
diff --git a/external/hypre/src/lapack/dorglq.c b/external/hypre/src/lapack/dorglq.c
index 3c4cbf37..408648f5 100644
--- a/external/hypre/src/lapack/dorglq.c
+++ b/external/hypre/src/lapack/dorglq.c
@@ -9,100 +9,100 @@ extern "C" {
 #include "hypre_lapack.h"
 
 /* Subroutine */ integer dorglq_(integer *m, integer *n, integer *k, doublereal *
-	a, integer *lda, doublereal *tau, doublereal *work, integer *lwork, 
+	a, integer *lda, doublereal *tau, doublereal *work, integer *lwork,
 	integer *info)
 {
-/*  -- LAPACK routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       June 30, 1999   
+/*  -- LAPACK routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       June 30, 1999
 
 
-    Purpose   
-    =======   
+    Purpose
+    =======
 
-    DORGLQ generates an M-by-N real matrix Q with orthonormal rows,   
-    which is defined as the first M rows of a product of K elementary   
-    reflectors of order N   
+    DORGLQ generates an M-by-N real matrix Q with orthonormal rows,
+    which is defined as the first M rows of a product of K elementary
+    reflectors of order N
 
-          Q  =  H(k) . . . H(2) H(1)   
+          Q  =  H(k) . . . H(2) H(1)
 
-    as returned by DGELQF.   
+    as returned by DGELQF.
 
-    Arguments   
-    =========   
+    Arguments
+    =========
 
-    M       (input) INTEGER   
-            The number of rows of the matrix Q. M >= 0.   
+    M       (input) INTEGER
+            The number of rows of the matrix Q. M >= 0.
 
-    N       (input) INTEGER   
-            The number of columns of the matrix Q. N >= M.   
+    N       (input) INTEGER
+            The number of columns of the matrix Q. N >= M.
 
-    K       (input) INTEGER   
-            The number of elementary reflectors whose product defines the   
-            matrix Q. M >= K >= 0.   
+    K       (input) INTEGER
+            The number of elementary reflectors whose product defines the
+            matrix Q. M >= K >= 0.
 
-    A       (input/output) DOUBLE PRECISION array, dimension (LDA,N)   
-            On entry, the i-th row must contain the vector which defines   
-            the elementary reflector H(i), for i = 1,2,...,k, as returned   
-            by DGELQF in the first k rows of its array argument A.   
-            On exit, the M-by-N matrix Q.   
+    A       (input/output) DOUBLE PRECISION array, dimension (LDA,N)
+            On entry, the i-th row must contain the vector which defines
+            the elementary reflector H(i), for i = 1,2,...,k, as returned
+            by DGELQF in the first k rows of its array argument A.
+            On exit, the M-by-N matrix Q.
 
-    LDA     (input) INTEGER   
-            The first dimension of the array A. LDA >= max(1,M).   
+    LDA     (input) INTEGER
+            The first dimension of the array A. LDA >= max(1,M).
 
-    TAU     (input) DOUBLE PRECISION array, dimension (K)   
-            TAU(i) must contain the scalar factor of the elementary   
-            reflector H(i), as returned by DGELQF.   
+    TAU     (input) DOUBLE PRECISION array, dimension (K)
+            TAU(i) must contain the scalar factor of the elementary
+            reflector H(i), as returned by DGELQF.
 
-    WORK    (workspace/output) DOUBLE PRECISION array, dimension (LWORK)   
-            On exit, if INFO = 0, WORK(1) returns the optimal LWORK.   
+    WORK    (workspace/output) DOUBLE PRECISION array, dimension (LWORK)
+            On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
 
-    LWORK   (input) INTEGER   
-            The dimension of the array WORK. LWORK >= max(1,M).   
-            For optimum performance LWORK >= M*NB, where NB is   
-            the optimal blocksize.   
+    LWORK   (input) INTEGER
+            The dimension of the array WORK. LWORK >= max(1,M).
+            For optimum performance LWORK >= M*NB, where NB is
+            the optimal blocksize.
 
-            If LWORK = -1, then a workspace query is assumed; the routine   
-            only calculates the optimal size of the WORK array, returns   
-            this value as the first entry of the WORK array, and no error   
-            message related to LWORK is issued by XERBLA.   
+            If LWORK = -1, then a workspace query is assumed; the routine
+            only calculates the optimal size of the WORK array, returns
+            this value as the first entry of the WORK array, and no error
+            message related to LWORK is issued by XERBLA.
 
-    INFO    (output) INTEGER   
-            = 0:  successful exit   
-            < 0:  if INFO = -i, the i-th argument has an illegal value   
+    INFO    (output) INTEGER
+            = 0:  successful exit
+            < 0:  if INFO = -i, the i-th argument has an illegal value
 
-    =====================================================================   
+    =====================================================================
 
 
-       Test the input arguments   
+       Test the input arguments
 
        Parameter adjustments */
     /* Table of constant values */
-    static integer c__1 = 1;
-    static integer c_n1 = -1;
-    static integer c__3 = 3;
-    static integer c__2 = 2;
-    
+    integer c__1 = 1;
+    integer c_n1 = -1;
+    integer c__3 = 3;
+    integer c__2 = 2;
+
     /* System generated locals */
     integer a_dim1, a_offset, i__1, i__2, i__3;
     /* Local variables */
-    static integer i__, j, l, nbmin, iinfo;
-    extern /* Subroutine */ integer dorgl2_(integer *, integer *, integer *, 
+    integer i__, j, l, nbmin, iinfo;
+    extern /* Subroutine */ integer dorgl2_(integer *, integer *, integer *,
 	    doublereal *, integer *, doublereal *, doublereal *, integer *);
-    static integer ib, nb, ki, kk;
-    extern /* Subroutine */ integer dlarfb_(const char *,const char *,const char *,const char *, 
-	    integer *, integer *, integer *, doublereal *, integer *, 
-	    doublereal *, integer *, doublereal *, integer *, doublereal *, 
+    integer ib, nb, ki, kk;
+    extern /* Subroutine */ integer dlarfb_(const char *,const char *,const char *,const char *,
+	    integer *, integer *, integer *, doublereal *, integer *,
+	    doublereal *, integer *, doublereal *, integer *, doublereal *,
 	    integer *);
-    static integer nx;
-    extern /* Subroutine */ integer dlarft_(const char *,const char *, integer *, integer *, 
+    integer nx;
+    extern /* Subroutine */ integer dlarft_(const char *,const char *, integer *, integer *,
 	    doublereal *, integer *, doublereal *, doublereal *, integer *), xerbla_(const char *, integer *);
-    extern integer ilaenv_(integer *,const char *,const char *, integer *, integer *, 
+    extern integer ilaenv_(integer *,const char *,const char *, integer *, integer *,
 	    integer *, integer *, ftnlen, ftnlen);
-    static integer ldwork, lwkopt;
-    static logical lquery;
-    static integer iws;
+    integer ldwork, lwkopt;
+    logical lquery;
+    integer iws;
 #define a_ref(a_1,a_2) a[(a_2)*a_dim1 + a_1]
 
 
@@ -149,7 +149,7 @@ extern "C" {
     iws = *m;
     if (nb > 1 && nb < *k) {
 
-/*        Determine when to cross over from blocked to unblocked code.   
+/*        Determine when to cross over from blocked to unblocked code.
 
    Computing MAX */
 	i__1 = 0, i__2 = ilaenv_(&c__3, "DORGLQ", " ", m, n, k, &c_n1, (
@@ -163,7 +163,7 @@ extern "C" {
 	    iws = ldwork * nb;
 	    if (*lwork < iws) {
 
-/*              Not enough workspace to use optimal NB:  reduce NB and   
+/*              Not enough workspace to use optimal NB:  reduce NB and
                 determine the minimum value of NB. */
 
 		nb = *lwork / ldwork;
@@ -177,7 +177,7 @@ extern "C" {
 
     if (nb >= nbmin && nb < *k && nx < *k) {
 
-/*        Use blocked code after the last block.   
+/*        Use blocked code after the last block.
           The first kk rows are handled by the block method. */
 
 	ki = (*k - nx - 1) / nb * nb;
@@ -221,11 +221,11 @@ extern "C" {
 	    ib = min(i__2,i__3);
 	    if (i__ + ib <= *m) {
 
-/*              Form the triangular factor of the block reflector   
+/*              Form the triangular factor of the block reflector
                 H = H(i) H(i+1) . . . H(i+ib-1) */
 
 		i__2 = *n - i__ + 1;
-		dlarft_("Forward", "Rowwise", &i__2, &ib, &a_ref(i__, i__), 
+		dlarft_("Forward", "Rowwise", &i__2, &ib, &a_ref(i__, i__),
 			lda, &tau[i__], &work[1], &ldwork);
 
 /*              Apply H' to A(i+ib:m,i:n) from the right */
diff --git a/external/hypre/src/lapack/dorgql.c b/external/hypre/src/lapack/dorgql.c
index 814f222c..f5c8f8d4 100644
--- a/external/hypre/src/lapack/dorgql.c
+++ b/external/hypre/src/lapack/dorgql.c
@@ -9,101 +9,101 @@ extern "C" {
 #include "hypre_lapack.h"
 
 /* Subroutine */ integer dorgql_(integer *m, integer *n, integer *k, doublereal *
-	a, integer *lda, doublereal *tau, doublereal *work, integer *lwork, 
+	a, integer *lda, doublereal *tau, doublereal *work, integer *lwork,
 	integer *info)
 {
-/*  -- LAPACK routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       June 30, 1999   
+/*  -- LAPACK routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       June 30, 1999
 
 
-    Purpose   
-    =======   
+    Purpose
+    =======
 
-    DORGQL generates an M-by-N real matrix Q with orthonormal columns,   
-    which is defined as the last N columns of a product of K elementary   
-    reflectors of order M   
+    DORGQL generates an M-by-N real matrix Q with orthonormal columns,
+    which is defined as the last N columns of a product of K elementary
+    reflectors of order M
 
-          Q  =  H(k) . . . H(2) H(1)   
+          Q  =  H(k) . . . H(2) H(1)
 
-    as returned by DGEQLF.   
+    as returned by DGEQLF.
 
-    Arguments   
-    =========   
+    Arguments
+    =========
 
-    M       (input) INTEGER   
-            The number of rows of the matrix Q. M >= 0.   
+    M       (input) INTEGER
+            The number of rows of the matrix Q. M >= 0.
 
-    N       (input) INTEGER   
-            The number of columns of the matrix Q. M >= N >= 0.   
+    N       (input) INTEGER
+            The number of columns of the matrix Q. M >= N >= 0.
 
-    K       (input) INTEGER   
-            The number of elementary reflectors whose product defines the   
-            matrix Q. N >= K >= 0.   
+    K       (input) INTEGER
+            The number of elementary reflectors whose product defines the
+            matrix Q. N >= K >= 0.
 
-    A       (input/output) DOUBLE PRECISION array, dimension (LDA,N)   
-            On entry, the (n-k+i)-th column must contain the vector which   
-            defines the elementary reflector H(i), for i = 1,2,...,k, as   
-            returned by DGEQLF in the last k columns of its array   
-            argument A.   
-            On exit, the M-by-N matrix Q.   
+    A       (input/output) DOUBLE PRECISION array, dimension (LDA,N)
+            On entry, the (n-k+i)-th column must contain the vector which
+            defines the elementary reflector H(i), for i = 1,2,...,k, as
+            returned by DGEQLF in the last k columns of its array
+            argument A.
+            On exit, the M-by-N matrix Q.
 
-    LDA     (input) INTEGER   
-            The first dimension of the array A. LDA >= max(1,M).   
+    LDA     (input) INTEGER
+            The first dimension of the array A. LDA >= max(1,M).
 
-    TAU     (input) DOUBLE PRECISION array, dimension (K)   
-            TAU(i) must contain the scalar factor of the elementary   
-            reflector H(i), as returned by DGEQLF.   
+    TAU     (input) DOUBLE PRECISION array, dimension (K)
+            TAU(i) must contain the scalar factor of the elementary
+            reflector H(i), as returned by DGEQLF.
 
-    WORK    (workspace/output) DOUBLE PRECISION array, dimension (LWORK)   
-            On exit, if INFO = 0, WORK(1) returns the optimal LWORK.   
+    WORK    (workspace/output) DOUBLE PRECISION array, dimension (LWORK)
+            On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
 
-    LWORK   (input) INTEGER   
-            The dimension of the array WORK. LWORK >= max(1,N).   
-            For optimum performance LWORK >= N*NB, where NB is the   
-            optimal blocksize.   
+    LWORK   (input) INTEGER
+            The dimension of the array WORK. LWORK >= max(1,N).
+            For optimum performance LWORK >= N*NB, where NB is the
+            optimal blocksize.
 
-            If LWORK = -1, then a workspace query is assumed; the routine   
-            only calculates the optimal size of the WORK array, returns   
-            this value as the first entry of the WORK array, and no error   
-            message related to LWORK is issued by XERBLA.   
+            If LWORK = -1, then a workspace query is assumed; the routine
+            only calculates the optimal size of the WORK array, returns
+            this value as the first entry of the WORK array, and no error
+            message related to LWORK is issued by XERBLA.
 
-    INFO    (output) INTEGER   
-            = 0:  successful exit   
-            < 0:  if INFO = -i, the i-th argument has an illegal value   
+    INFO    (output) INTEGER
+            = 0:  successful exit
+            < 0:  if INFO = -i, the i-th argument has an illegal value
 
-    =====================================================================   
+    =====================================================================
 
 
-       Test the input arguments   
+       Test the input arguments
 
        Parameter adjustments */
     /* Table of constant values */
-    static integer c__1 = 1;
-    static integer c_n1 = -1;
-    static integer c__3 = 3;
-    static integer c__2 = 2;
-    
+    integer c__1 = 1;
+    integer c_n1 = -1;
+    integer c__3 = 3;
+    integer c__2 = 2;
+
     /* System generated locals */
     integer a_dim1, a_offset, i__1, i__2, i__3, i__4;
     /* Local variables */
-    static integer i__, j, l, nbmin, iinfo;
-    extern /* Subroutine */ integer dorg2l_(integer *, integer *, integer *, 
+    integer i__, j, l, nbmin, iinfo;
+    extern /* Subroutine */ integer dorg2l_(integer *, integer *, integer *,
 	    doublereal *, integer *, doublereal *, doublereal *, integer *);
-    static integer ib, nb, kk;
-    extern /* Subroutine */ integer dlarfb_(const char *,const char *,const char *,const char *, 
-	    integer *, integer *, integer *, doublereal *, integer *, 
-	    doublereal *, integer *, doublereal *, integer *, doublereal *, 
+    integer ib, nb, kk;
+    extern /* Subroutine */ integer dlarfb_(const char *,const char *,const char *,const char *,
+	    integer *, integer *, integer *, doublereal *, integer *,
+	    doublereal *, integer *, doublereal *, integer *, doublereal *,
 	    integer *);
-    static integer nx;
-    extern /* Subroutine */ integer dlarft_(const char *,const char *, integer *, integer *, 
+    integer nx;
+    extern /* Subroutine */ integer dlarft_(const char *,const char *, integer *, integer *,
 	    doublereal *, integer *, doublereal *, doublereal *, integer *), xerbla_(const char *, integer *);
-    extern integer ilaenv_(integer *,const char *,const char *, integer *, integer *, 
+    extern integer ilaenv_(integer *,const char *,const char *, integer *, integer *,
 	    integer *, integer *, ftnlen, ftnlen);
-    static integer ldwork, lwkopt;
-    static logical lquery;
-    static integer iws;
+    integer ldwork, lwkopt;
+    logical lquery;
+    integer iws;
 #define a_ref(a_1,a_2) a[(a_2)*a_dim1 + a_1]
 
 
@@ -150,7 +150,7 @@ extern "C" {
     iws = *n;
     if (nb > 1 && nb < *k) {
 
-/*        Determine when to cross over from blocked to unblocked code.   
+/*        Determine when to cross over from blocked to unblocked code.
 
    Computing MAX */
 	i__1 = 0, i__2 = ilaenv_(&c__3, "DORGQL", " ", m, n, k, &c_n1, (
@@ -164,7 +164,7 @@ extern "C" {
 	    iws = ldwork * nb;
 	    if (*lwork < iws) {
 
-/*              Not enough workspace to use optimal NB:  reduce NB and   
+/*              Not enough workspace to use optimal NB:  reduce NB and
                 determine the minimum value of NB. */
 
 		nb = *lwork / ldwork;
@@ -178,8 +178,8 @@ extern "C" {
 
     if (nb >= nbmin && nb < *k && nx < *k) {
 
-/*        Use blocked code after the first block.   
-          The last kk columns are handled by the block method.   
+/*        Use blocked code after the first block.
+          The last kk columns are handled by the block method.
 
    Computing MIN */
 	i__1 = *k, i__2 = (*k - nx + nb - 1) / nb * nb;
@@ -214,14 +214,14 @@ extern "C" {
 
 	i__1 = *k;
 	i__2 = nb;
-	for (i__ = *k - kk + 1; i__2 < 0 ? i__ >= i__1 : i__ <= i__1; i__ += 
+	for (i__ = *k - kk + 1; i__2 < 0 ? i__ >= i__1 : i__ <= i__1; i__ +=
 		i__2) {
 /* Computing MIN */
 	    i__3 = nb, i__4 = *k - i__ + 1;
 	    ib = min(i__3,i__4);
 	    if (*n - *k + i__ > 1) {
 
-/*              Form the triangular factor of the block reflector   
+/*              Form the triangular factor of the block reflector
                 H = H(i+ib-1) . . . H(i+1) H(i) */
 
 		i__3 = *m - *k + i__ + ib - 1;
diff --git a/external/hypre/src/lapack/dorgqr.c b/external/hypre/src/lapack/dorgqr.c
index 9fcd5e87..7e252a27 100644
--- a/external/hypre/src/lapack/dorgqr.c
+++ b/external/hypre/src/lapack/dorgqr.c
@@ -9,101 +9,101 @@ extern "C" {
 #include "hypre_lapack.h"
 
 /* Subroutine */ integer dorgqr_(integer *m, integer *n, integer *k, doublereal *
-	a, integer *lda, doublereal *tau, doublereal *work, integer *lwork, 
+	a, integer *lda, doublereal *tau, doublereal *work, integer *lwork,
 	integer *info)
 {
-/*  -- LAPACK routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       June 30, 1999   
+/*  -- LAPACK routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       June 30, 1999
 
 
-    Purpose   
-    =======   
+    Purpose
+    =======
 
-    DORGQR generates an M-by-N real matrix Q with orthonormal columns,   
-    which is defined as the first N columns of a product of K elementary   
-    reflectors of order M   
+    DORGQR generates an M-by-N real matrix Q with orthonormal columns,
+    which is defined as the first N columns of a product of K elementary
+    reflectors of order M
 
-          Q  =  H(1) H(2) . . . H(k)   
+          Q  =  H(1) H(2) . . . H(k)
 
-    as returned by DGEQRF.   
+    as returned by DGEQRF.
 
-    Arguments   
-    =========   
+    Arguments
+    =========
 
-    M       (input) INTEGER   
-            The number of rows of the matrix Q. M >= 0.   
+    M       (input) INTEGER
+            The number of rows of the matrix Q. M >= 0.
 
-    N       (input) INTEGER   
-            The number of columns of the matrix Q. M >= N >= 0.   
+    N       (input) INTEGER
+            The number of columns of the matrix Q. M >= N >= 0.
 
-    K       (input) INTEGER   
-            The number of elementary reflectors whose product defines the   
-            matrix Q. N >= K >= 0.   
+    K       (input) INTEGER
+            The number of elementary reflectors whose product defines the
+            matrix Q. N >= K >= 0.
 
-    A       (input/output) DOUBLE PRECISION array, dimension (LDA,N)   
-            On entry, the i-th column must contain the vector which   
-            defines the elementary reflector H(i), for i = 1,2,...,k, as   
-            returned by DGEQRF in the first k columns of its array   
-            argument A.   
-            On exit, the M-by-N matrix Q.   
+    A       (input/output) DOUBLE PRECISION array, dimension (LDA,N)
+            On entry, the i-th column must contain the vector which
+            defines the elementary reflector H(i), for i = 1,2,...,k, as
+            returned by DGEQRF in the first k columns of its array
+            argument A.
+            On exit, the M-by-N matrix Q.
 
-    LDA     (input) INTEGER   
-            The first dimension of the array A. LDA >= max(1,M).   
+    LDA     (input) INTEGER
+            The first dimension of the array A. LDA >= max(1,M).
 
-    TAU     (input) DOUBLE PRECISION array, dimension (K)   
-            TAU(i) must contain the scalar factor of the elementary   
-            reflector H(i), as returned by DGEQRF.   
+    TAU     (input) DOUBLE PRECISION array, dimension (K)
+            TAU(i) must contain the scalar factor of the elementary
+            reflector H(i), as returned by DGEQRF.
 
-    WORK    (workspace/output) DOUBLE PRECISION array, dimension (LWORK)   
-            On exit, if INFO = 0, WORK(1) returns the optimal LWORK.   
+    WORK    (workspace/output) DOUBLE PRECISION array, dimension (LWORK)
+            On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
 
-    LWORK   (input) INTEGER   
-            The dimension of the array WORK. LWORK >= max(1,N).   
-            For optimum performance LWORK >= N*NB, where NB is the   
-            optimal blocksize.   
+    LWORK   (input) INTEGER
+            The dimension of the array WORK. LWORK >= max(1,N).
+            For optimum performance LWORK >= N*NB, where NB is the
+            optimal blocksize.
 
-            If LWORK = -1, then a workspace query is assumed; the routine   
-            only calculates the optimal size of the WORK array, returns   
-            this value as the first entry of the WORK array, and no error   
-            message related to LWORK is issued by XERBLA.   
+            If LWORK = -1, then a workspace query is assumed; the routine
+            only calculates the optimal size of the WORK array, returns
+            this value as the first entry of the WORK array, and no error
+            message related to LWORK is issued by XERBLA.
 
-    INFO    (output) INTEGER   
-            = 0:  successful exit   
-            < 0:  if INFO = -i, the i-th argument has an illegal value   
+    INFO    (output) INTEGER
+            = 0:  successful exit
+            < 0:  if INFO = -i, the i-th argument has an illegal value
 
-    =====================================================================   
+    =====================================================================
 
 
-       Test the input arguments   
+       Test the input arguments
 
        Parameter adjustments */
     /* Table of constant values */
-    static integer c__1 = 1;
-    static integer c_n1 = -1;
-    static integer c__3 = 3;
-    static integer c__2 = 2;
-    
+    integer c__1 = 1;
+    integer c_n1 = -1;
+    integer c__3 = 3;
+    integer c__2 = 2;
+
     /* System generated locals */
     integer a_dim1, a_offset, i__1, i__2, i__3;
     /* Local variables */
-    static integer i__, j, l, nbmin, iinfo;
-    extern /* Subroutine */ integer dorg2r_(integer *, integer *, integer *, 
+    integer i__, j, l, nbmin, iinfo;
+    extern /* Subroutine */ integer dorg2r_(integer *, integer *, integer *,
 	    doublereal *, integer *, doublereal *, doublereal *, integer *);
-    static integer ib, nb, ki, kk;
-    extern /* Subroutine */ integer dlarfb_(const char *,const char *,const char *,const char *, 
-	    integer *, integer *, integer *, doublereal *, integer *, 
-	    doublereal *, integer *, doublereal *, integer *, doublereal *, 
+    integer ib, nb, ki, kk;
+    extern /* Subroutine */ integer dlarfb_(const char *,const char *,const char *,const char *,
+	    integer *, integer *, integer *, doublereal *, integer *,
+	    doublereal *, integer *, doublereal *, integer *, doublereal *,
 	    integer *);
-    static integer nx;
-    extern /* Subroutine */ integer dlarft_(const char *,const char *, integer *, integer *, 
+    integer nx;
+    extern /* Subroutine */ integer dlarft_(const char *,const char *, integer *, integer *,
 	    doublereal *, integer *, doublereal *, doublereal *, integer *), xerbla_(const char *, integer *);
-    extern integer ilaenv_(integer *,const char *,const char *, integer *, integer *, 
+    extern integer ilaenv_(integer *,const char *,const char *, integer *, integer *,
 	    integer *, integer *, ftnlen, ftnlen);
-    static integer ldwork, lwkopt;
-    static logical lquery;
-    static integer iws;
+    integer ldwork, lwkopt;
+    logical lquery;
+    integer iws;
 #define a_ref(a_1,a_2) a[(a_2)*a_dim1 + a_1]
 
 
@@ -150,7 +150,7 @@ extern "C" {
     iws = *n;
     if (nb > 1 && nb < *k) {
 
-/*        Determine when to cross over from blocked to unblocked code.   
+/*        Determine when to cross over from blocked to unblocked code.
 
    Computing MAX */
 	i__1 = 0, i__2 = ilaenv_(&c__3, "DORGQR", " ", m, n, k, &c_n1, (
@@ -164,7 +164,7 @@ extern "C" {
 	    iws = ldwork * nb;
 	    if (*lwork < iws) {
 
-/*              Not enough workspace to use optimal NB:  reduce NB and   
+/*              Not enough workspace to use optimal NB:  reduce NB and
                 determine the minimum value of NB. */
 
 		nb = *lwork / ldwork;
@@ -178,7 +178,7 @@ extern "C" {
 
     if (nb >= nbmin && nb < *k && nx < *k) {
 
-/*        Use blocked code after the last block.   
+/*        Use blocked code after the last block.
           The first kk columns are handled by the block method. */
 
 	ki = (*k - nx - 1) / nb * nb;
@@ -222,7 +222,7 @@ extern "C" {
 	    ib = min(i__2,i__3);
 	    if (i__ + ib <= *n) {
 
-/*              Form the triangular factor of the block reflector   
+/*              Form the triangular factor of the block reflector
                 H = H(i) H(i+1) . . . H(i+ib-1) */
 
 		i__2 = *m - i__ + 1;
diff --git a/external/hypre/src/lapack/dorgtr.c b/external/hypre/src/lapack/dorgtr.c
index 44a73828..152c1cfd 100644
--- a/external/hypre/src/lapack/dorgtr.c
+++ b/external/hypre/src/lapack/dorgtr.c
@@ -11,91 +11,91 @@ extern "C" {
 /* Subroutine */ integer dorgtr_(const char *uplo, integer *n, doublereal *a, integer *
 	lda, doublereal *tau, doublereal *work, integer *lwork, integer *info)
 {
-/*  -- LAPACK routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       June 30, 1999   
+/*  -- LAPACK routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       June 30, 1999
 
 
-    Purpose   
-    =======   
+    Purpose
+    =======
 
-    DORGTR generates a real orthogonal matrix Q which is defined as the   
-    product of n-1 elementary reflectors of order N, as returned by   
-    DSYTRD:   
+    DORGTR generates a real orthogonal matrix Q which is defined as the
+    product of n-1 elementary reflectors of order N, as returned by
+    DSYTRD:
 
-    if UPLO = 'U', Q = H(n-1) . . . H(2) H(1),   
+    if UPLO = 'U', Q = H(n-1) . . . H(2) H(1),
 
-    if UPLO = 'L', Q = H(1) H(2) . . . H(n-1).   
+    if UPLO = 'L', Q = H(1) H(2) . . . H(n-1).
 
-    Arguments   
-    =========   
+    Arguments
+    =========
 
-    UPLO    (input) CHARACTER*1   
-            = 'U': Upper triangle of A contains elementary reflectors   
-                   from DSYTRD;   
-            = 'L': Lower triangle of A contains elementary reflectors   
-                   from DSYTRD.   
+    UPLO    (input) CHARACTER*1
+            = 'U': Upper triangle of A contains elementary reflectors
+                   from DSYTRD;
+            = 'L': Lower triangle of A contains elementary reflectors
+                   from DSYTRD.
 
-    N       (input) INTEGER   
-            The order of the matrix Q. N >= 0.   
+    N       (input) INTEGER
+            The order of the matrix Q. N >= 0.
 
-    A       (input/output) DOUBLE PRECISION array, dimension (LDA,N)   
-            On entry, the vectors which define the elementary reflectors,   
-            as returned by DSYTRD.   
-            On exit, the N-by-N orthogonal matrix Q.   
+    A       (input/output) DOUBLE PRECISION array, dimension (LDA,N)
+            On entry, the vectors which define the elementary reflectors,
+            as returned by DSYTRD.
+            On exit, the N-by-N orthogonal matrix Q.
 
-    LDA     (input) INTEGER   
-            The leading dimension of the array A. LDA >= max(1,N).   
+    LDA     (input) INTEGER
+            The leading dimension of the array A. LDA >= max(1,N).
 
-    TAU     (input) DOUBLE PRECISION array, dimension (N-1)   
-            TAU(i) must contain the scalar factor of the elementary   
-            reflector H(i), as returned by DSYTRD.   
+    TAU     (input) DOUBLE PRECISION array, dimension (N-1)
+            TAU(i) must contain the scalar factor of the elementary
+            reflector H(i), as returned by DSYTRD.
 
-    WORK    (workspace/output) DOUBLE PRECISION array, dimension (LWORK)   
-            On exit, if INFO = 0, WORK(1) returns the optimal LWORK.   
+    WORK    (workspace/output) DOUBLE PRECISION array, dimension (LWORK)
+            On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
 
-    LWORK   (input) INTEGER   
-            The dimension of the array WORK. LWORK >= max(1,N-1).   
-            For optimum performance LWORK >= (N-1)*NB, where NB is   
-            the optimal blocksize.   
+    LWORK   (input) INTEGER
+            The dimension of the array WORK. LWORK >= max(1,N-1).
+            For optimum performance LWORK >= (N-1)*NB, where NB is
+            the optimal blocksize.
 
-            If LWORK = -1, then a workspace query is assumed; the routine   
-            only calculates the optimal size of the WORK array, returns   
-            this value as the first entry of the WORK array, and no error   
-            message related to LWORK is issued by XERBLA.   
+            If LWORK = -1, then a workspace query is assumed; the routine
+            only calculates the optimal size of the WORK array, returns
+            this value as the first entry of the WORK array, and no error
+            message related to LWORK is issued by XERBLA.
 
-    INFO    (output) INTEGER   
-            = 0:  successful exit   
-            < 0:  if INFO = -i, the i-th argument had an illegal value   
+    INFO    (output) INTEGER
+            = 0:  successful exit
+            < 0:  if INFO = -i, the i-th argument had an illegal value
 
-    =====================================================================   
+    =====================================================================
 
 
-       Test the input arguments   
+       Test the input arguments
 
        Parameter adjustments */
     /* Table of constant values */
-    static integer c__1 = 1;
-    static integer c_n1 = -1;
-    
+    integer c__1 = 1;
+    integer c_n1 = -1;
+
     /* System generated locals */
     integer a_dim1, a_offset, i__1, i__2, i__3;
     /* Local variables */
-    static integer i__, j;
+    integer i__, j;
     extern logical lsame_(const char *,const char *);
-    static integer iinfo;
-    static logical upper;
-    static integer nb;
+    integer iinfo;
+    logical upper;
+    integer nb;
     extern /* Subroutine */ integer xerbla_(const char *, integer *);
-    extern integer ilaenv_(integer *,const char *,const char *, integer *, integer *, 
+    extern integer ilaenv_(integer *,const char *,const char *, integer *, integer *,
 	    integer *, integer *, ftnlen, ftnlen);
-    extern /* Subroutine */ integer dorgql_(integer *, integer *, integer *, 
-	    doublereal *, integer *, doublereal *, doublereal *, integer *, 
+    extern /* Subroutine */ integer dorgql_(integer *, integer *, integer *,
+	    doublereal *, integer *, doublereal *, doublereal *, integer *,
 	    integer *), dorgqr_(integer *, integer *, integer *, doublereal *,
 	     integer *, doublereal *, doublereal *, integer *, integer *);
-    static integer lwkopt;
-    static logical lquery;
+    integer lwkopt;
+    logical lquery;
 #define a_ref(a_1,a_2) a[(a_2)*a_dim1 + a_1]
 
 
@@ -160,10 +160,10 @@ extern "C" {
 
     if (upper) {
 
-/*        Q was determined by a call to DSYTRD with UPLO = 'U'   
+/*        Q was determined by a call to DSYTRD with UPLO = 'U'
 
-          Shift the vectors which define the elementary reflectors one   
-          column to the left, and set the last row and column of Q to   
+          Shift the vectors which define the elementary reflectors one
+          column to the left, and set the last row and column of Q to
           those of the unit matrix */
 
 	i__1 = *n - 1;
@@ -188,15 +188,15 @@ extern "C" {
 	i__1 = *n - 1;
 	i__2 = *n - 1;
 	i__3 = *n - 1;
-	dorgql_(&i__1, &i__2, &i__3, &a[a_offset], lda, &tau[1], &work[1], 
+	dorgql_(&i__1, &i__2, &i__3, &a[a_offset], lda, &tau[1], &work[1],
 		lwork, &iinfo);
 
     } else {
 
-/*        Q was determined by a call to DSYTRD with UPLO = 'L'.   
+/*        Q was determined by a call to DSYTRD with UPLO = 'L'.
 
-          Shift the vectors which define the elementary reflectors one   
-          column to the right, and set the first row and column of Q to   
+          Shift the vectors which define the elementary reflectors one
+          column to the right, and set the first row and column of Q to
           those of the unit matrix */
 
 	for (j = *n; j >= 2; --j) {
diff --git a/external/hypre/src/lapack/dorm2r.c b/external/hypre/src/lapack/dorm2r.c
index 699a4abc..33370d52 100644
--- a/external/hypre/src/lapack/dorm2r.c
+++ b/external/hypre/src/lapack/dorm2r.c
@@ -99,21 +99,21 @@ extern "C" {
 
        Parameter adjustments */
     /* Table of constant values */
-    static integer c__1 = 1;
+     integer c__1 = 1;
     
     /* System generated locals */
     integer a_dim1, a_offset, c_dim1, c_offset, i__1, i__2;
     /* Local variables */
-    static logical left;
-    static integer i__;
+     logical left;
+     integer i__;
     extern /* Subroutine */ integer dlarf_(const char *, integer *, integer *, 
 	    doublereal *, integer *, doublereal *, doublereal *, integer *, 
 	    doublereal *);
     extern logical lsame_(const char *,const char *);
-    static integer i1, i2, i3, ic, jc, mi, ni, nq;
+     integer i1, i2, i3, ic, jc, mi, ni, nq;
     extern /* Subroutine */ integer xerbla_(const char *, integer *);
-    static logical notran;
-    static doublereal aii;
+     logical notran;
+     doublereal aii;
 #define a_ref(a_1,a_2) a[(a_2)*a_dim1 + a_1]
 #define c___ref(a_1,a_2) c__[(a_2)*c_dim1 + a_1]
 
diff --git a/external/hypre/src/lapack/dormbr.c b/external/hypre/src/lapack/dormbr.c
index 29336a45..d973db8b 100644
--- a/external/hypre/src/lapack/dormbr.c
+++ b/external/hypre/src/lapack/dormbr.c
@@ -8,156 +8,156 @@ extern "C" {
 #include "f2c.h"
 #include "hypre_lapack.h"
 
-/* Subroutine */ integer dormbr_(const char *vect,const char *side,const char *trans, integer *m, 
-	integer *n, integer *k, doublereal *a, integer *lda, doublereal *tau, 
-	doublereal *c__, integer *ldc, doublereal *work, integer *lwork, 
+/* Subroutine */ integer dormbr_(const char *vect,const char *side,const char *trans, integer *m,
+	integer *n, integer *k, doublereal *a, integer *lda, doublereal *tau,
+	doublereal *c__, integer *ldc, doublereal *work, integer *lwork,
 	integer *info)
 {
-/*  -- LAPACK routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       June 30, 1999   
-
-
-    Purpose   
-    =======   
-
-    If VECT = 'Q', DORMBR overwrites the general real M-by-N matrix C   
-    with   
-                    SIDE = 'L'     SIDE = 'R'   
-    TRANS = 'N':      Q * C          C * Q   
-    TRANS = 'T':      Q**T * C       C * Q**T   
+/*  -- LAPACK routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       June 30, 1999
+
+
+    Purpose
+    =======
+
+    If VECT = 'Q', DORMBR overwrites the general real M-by-N matrix C
+    with
+                    SIDE = 'L'     SIDE = 'R'
+    TRANS = 'N':      Q * C          C * Q
+    TRANS = 'T':      Q**T * C       C * Q**T
 
-    If VECT = 'P', DORMBR overwrites the general real M-by-N matrix C   
-    with   
-                    SIDE = 'L'     SIDE = 'R'   
-    TRANS = 'N':      P * C          C * P   
-    TRANS = 'T':      P**T * C       C * P**T   
+    If VECT = 'P', DORMBR overwrites the general real M-by-N matrix C
+    with
+                    SIDE = 'L'     SIDE = 'R'
+    TRANS = 'N':      P * C          C * P
+    TRANS = 'T':      P**T * C       C * P**T
 
-    Here Q and P**T are the orthogonal matrices determined by DGEBRD when   
-    reducing a real matrix A to bidiagonal form: A = Q * B * P**T. Q and   
-    P**T are defined as products of elementary reflectors H(i) and G(i)   
-    respectively.   
+    Here Q and P**T are the orthogonal matrices determined by DGEBRD when
+    reducing a real matrix A to bidiagonal form: A = Q * B * P**T. Q and
+    P**T are defined as products of elementary reflectors H(i) and G(i)
+    respectively.
 
-    Let nq = m if SIDE = 'L' and nq = n if SIDE = 'R'. Thus nq is the   
-    order of the orthogonal matrix Q or P**T that is applied.   
+    Let nq = m if SIDE = 'L' and nq = n if SIDE = 'R'. Thus nq is the
+    order of the orthogonal matrix Q or P**T that is applied.
 
-    If VECT = 'Q', A is assumed to have been an NQ-by-K matrix:   
-    if nq >= k, Q = H(1) H(2) . . . H(k);   
-    if nq < k, Q = H(1) H(2) . . . H(nq-1).   
+    If VECT = 'Q', A is assumed to have been an NQ-by-K matrix:
+    if nq >= k, Q = H(1) H(2) . . . H(k);
+    if nq < k, Q = H(1) H(2) . . . H(nq-1).
 
-    If VECT = 'P', A is assumed to have been a K-by-NQ matrix:   
-    if k < nq, P = G(1) G(2) . . . G(k);   
-    if k >= nq, P = G(1) G(2) . . . G(nq-1).   
+    If VECT = 'P', A is assumed to have been a K-by-NQ matrix:
+    if k < nq, P = G(1) G(2) . . . G(k);
+    if k >= nq, P = G(1) G(2) . . . G(nq-1).
 
-    Arguments   
-    =========   
+    Arguments
+    =========
 
-    VECT    (input) CHARACTER*1   
-            = 'Q': apply Q or Q**T;   
-            = 'P': apply P or P**T.   
+    VECT    (input) CHARACTER*1
+            = 'Q': apply Q or Q**T;
+            = 'P': apply P or P**T.
 
-    SIDE    (input) CHARACTER*1   
-            = 'L': apply Q, Q**T, P or P**T from the Left;   
-            = 'R': apply Q, Q**T, P or P**T from the Right.   
+    SIDE    (input) CHARACTER*1
+            = 'L': apply Q, Q**T, P or P**T from the Left;
+            = 'R': apply Q, Q**T, P or P**T from the Right.
 
-    TRANS   (input) CHARACTER*1   
-            = 'N':  No transpose, apply Q  or P;   
-            = 'T':  Transpose, apply Q**T or P**T.   
+    TRANS   (input) CHARACTER*1
+            = 'N':  No transpose, apply Q  or P;
+            = 'T':  Transpose, apply Q**T or P**T.
 
-    M       (input) INTEGER   
-            The number of rows of the matrix C. M >= 0.   
+    M       (input) INTEGER
+            The number of rows of the matrix C. M >= 0.
 
-    N       (input) INTEGER   
-            The number of columns of the matrix C. N >= 0.   
+    N       (input) INTEGER
+            The number of columns of the matrix C. N >= 0.
 
-    K       (input) INTEGER   
-            If VECT = 'Q', the number of columns in the original   
-            matrix reduced by DGEBRD.   
-            If VECT = 'P', the number of rows in the original   
-            matrix reduced by DGEBRD.   
-            K >= 0.   
+    K       (input) INTEGER
+            If VECT = 'Q', the number of columns in the original
+            matrix reduced by DGEBRD.
+            If VECT = 'P', the number of rows in the original
+            matrix reduced by DGEBRD.
+            K >= 0.
 
-    A       (input) DOUBLE PRECISION array, dimension   
-                                  (LDA,min(nq,K)) if VECT = 'Q'   
-                                  (LDA,nq)        if VECT = 'P'   
-            The vectors which define the elementary reflectors H(i) and   
-            G(i), whose products determine the matrices Q and P, as   
-            returned by DGEBRD.   
+    A       (input) DOUBLE PRECISION array, dimension
+                                  (LDA,min(nq,K)) if VECT = 'Q'
+                                  (LDA,nq)        if VECT = 'P'
+            The vectors which define the elementary reflectors H(i) and
+            G(i), whose products determine the matrices Q and P, as
+            returned by DGEBRD.
 
-    LDA     (input) INTEGER   
-            The leading dimension of the array A.   
-            If VECT = 'Q', LDA >= max(1,nq);   
-            if VECT = 'P', LDA >= max(1,min(nq,K)).   
+    LDA     (input) INTEGER
+            The leading dimension of the array A.
+            If VECT = 'Q', LDA >= max(1,nq);
+            if VECT = 'P', LDA >= max(1,min(nq,K)).
 
-    TAU     (input) DOUBLE PRECISION array, dimension (min(nq,K))   
-            TAU(i) must contain the scalar factor of the elementary   
-            reflector H(i) or G(i) which determines Q or P, as returned   
-            by DGEBRD in the array argument TAUQ or TAUP.   
+    TAU     (input) DOUBLE PRECISION array, dimension (min(nq,K))
+            TAU(i) must contain the scalar factor of the elementary
+            reflector H(i) or G(i) which determines Q or P, as returned
+            by DGEBRD in the array argument TAUQ or TAUP.
 
-    C       (input/output) DOUBLE PRECISION array, dimension (LDC,N)   
-            On entry, the M-by-N matrix C.   
-            On exit, C is overwritten by Q*C or Q**T*C or C*Q**T or C*Q   
-            or P*C or P**T*C or C*P or C*P**T.   
+    C       (input/output) DOUBLE PRECISION array, dimension (LDC,N)
+            On entry, the M-by-N matrix C.
+            On exit, C is overwritten by Q*C or Q**T*C or C*Q**T or C*Q
+            or P*C or P**T*C or C*P or C*P**T.
 
-    LDC     (input) INTEGER   
-            The leading dimension of the array C. LDC >= max(1,M).   
+    LDC     (input) INTEGER
+            The leading dimension of the array C. LDC >= max(1,M).
 
-    WORK    (workspace/output) DOUBLE PRECISION array, dimension (LWORK)   
-            On exit, if INFO = 0, WORK(1) returns the optimal LWORK.   
+    WORK    (workspace/output) DOUBLE PRECISION array, dimension (LWORK)
+            On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
 
-    LWORK   (input) INTEGER   
-            The dimension of the array WORK.   
-            If SIDE = 'L', LWORK >= max(1,N);   
-            if SIDE = 'R', LWORK >= max(1,M).   
-            For optimum performance LWORK >= N*NB if SIDE = 'L', and   
-            LWORK >= M*NB if SIDE = 'R', where NB is the optimal   
-            blocksize.   
+    LWORK   (input) INTEGER
+            The dimension of the array WORK.
+            If SIDE = 'L', LWORK >= max(1,N);
+            if SIDE = 'R', LWORK >= max(1,M).
+            For optimum performance LWORK >= N*NB if SIDE = 'L', and
+            LWORK >= M*NB if SIDE = 'R', where NB is the optimal
+            blocksize.
 
-            If LWORK = -1, then a workspace query is assumed; the routine   
-            only calculates the optimal size of the WORK array, returns   
-            this value as the first entry of the WORK array, and no error   
-            message related to LWORK is issued by XERBLA.   
-
-    INFO    (output) INTEGER   
-            = 0:  successful exit   
-            < 0:  if INFO = -i, the i-th argument had an illegal value   
-
-    =====================================================================   
+            If LWORK = -1, then a workspace query is assumed; the routine
+            only calculates the optimal size of the WORK array, returns
+            this value as the first entry of the WORK array, and no error
+            message related to LWORK is issued by XERBLA.
+
+    INFO    (output) INTEGER
+            = 0:  successful exit
+            < 0:  if INFO = -i, the i-th argument had an illegal value
+
+    =====================================================================
 
 
-       Test the input arguments   
+       Test the input arguments
 
        Parameter adjustments */
     /* Table of constant values */
-    static integer c__1 = 1;
-    static integer c_n1 = -1;
-    static integer c__2 = 2;
-    
+    integer c__1 = 1;
+    integer c_n1 = -1;
+    integer c__2 = 2;
+
     /* System generated locals */
     address a__1[2];
     integer a_dim1, a_offset, c_dim1, c_offset, i__1, i__2, i__3[2];
     char ch__1[2];
-    /* Builtin functions   
+    /* Builtin functions
        Subroutine */ integer s_cat(char *, char **, integer *, integer *, ftnlen);
     /* Local variables */
-    static logical left;
+    logical left;
     extern logical lsame_(const char *,const char *);
-    static integer iinfo, i1, i2, nb, mi, ni, nq, nw;
+    integer iinfo, i1, i2, nb, mi, ni, nq, nw;
     extern /* Subroutine */ integer xerbla_(const char *, integer *);
-    extern integer ilaenv_(integer *,const char *,const char *, integer *, integer *, 
+    extern integer ilaenv_(integer *,const char *,const char *, integer *, integer *,
 	    integer *, integer *, ftnlen, ftnlen);
-    extern /* Subroutine */ integer dormlq_(const char *,const char *, integer *, integer *, 
-	    integer *, doublereal *, integer *, doublereal *, doublereal *, 
+    extern /* Subroutine */ integer dormlq_(const char *,const char *, integer *, integer *,
+	    integer *, doublereal *, integer *, doublereal *, doublereal *,
 	    integer *, doublereal *, integer *, integer *);
-    static logical notran;
-    extern /* Subroutine */ integer dormqr_(const char *,const char *, integer *, integer *, 
-	    integer *, doublereal *, integer *, doublereal *, doublereal *, 
+    logical notran;
+    extern /* Subroutine */ integer dormqr_(const char *,const char *, integer *, integer *,
+	    integer *, doublereal *, integer *, doublereal *, doublereal *,
 	    integer *, doublereal *, integer *, integer *);
-    static logical applyq;
-    static char transt[1];
-    static integer lwkopt;
-    static logical lquery;
+    logical applyq;
+    char transt[1];
+    integer lwkopt;
+    logical lquery;
 #define a_ref(a_1,a_2) a[(a_2)*a_dim1 + a_1]
 #define c___ref(a_1,a_2) c__[(a_2)*c_dim1 + a_1]
 
@@ -202,7 +202,7 @@ extern "C" {
     } else /* if(complicated condition) */ {
 /* Computing MAX */
 	i__1 = 1, i__2 = min(nq,*k);
-	if (((applyq) && (*lda < max(1,nq))) || 
+	if (((applyq) && (*lda < max(1,nq))) ||
             ((! applyq) && (*lda < max(i__1,i__2)))) {
 	    *info = -8;
 	} else if (*ldc < max(1,*m)) {
@@ -299,7 +299,7 @@ extern "C" {
 		i2 = 2;
 	    }
 	    i__1 = nq - 1;
-	    dormqr_(side, trans, &mi, &ni, &i__1, &a_ref(2, 1), lda, &tau[1], 
+	    dormqr_(side, trans, &mi, &ni, &i__1, &a_ref(2, 1), lda, &tau[1],
 		    &c___ref(i1, i2), ldc, &work[1], lwork, &iinfo);
 	}
     } else {
diff --git a/external/hypre/src/lapack/dorml2.c b/external/hypre/src/lapack/dorml2.c
index fff71a62..def6ce1f 100644
--- a/external/hypre/src/lapack/dorml2.c
+++ b/external/hypre/src/lapack/dorml2.c
@@ -8,109 +8,109 @@ extern "C" {
 #include "f2c.h"
 #include "hypre_lapack.h"
 
-/* Subroutine */ integer dorml2_(const char *side,const char *trans, integer *m, integer *n, 
+/* Subroutine */ integer dorml2_(const char *side,const char *trans, integer *m, integer *n,
 	integer *k, doublereal *a, integer *lda, doublereal *tau, doublereal *
 	c__, integer *ldc, doublereal *work, integer *info)
 {
-/*  -- LAPACK routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       February 29, 1992   
+/*  -- LAPACK routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       February 29, 1992
 
 
-    Purpose   
-    =======   
+    Purpose
+    =======
 
-    DORML2 overwrites the general real m by n matrix C with   
+    DORML2 overwrites the general real m by n matrix C with
 
-          Q * C  if SIDE = 'L' and TRANS = 'N', or   
+          Q * C  if SIDE = 'L' and TRANS = 'N', or
 
-          Q'* C  if SIDE = 'L' and TRANS = 'T', or   
+          Q'* C  if SIDE = 'L' and TRANS = 'T', or
 
-          C * Q  if SIDE = 'R' and TRANS = 'N', or   
+          C * Q  if SIDE = 'R' and TRANS = 'N', or
 
-          C * Q' if SIDE = 'R' and TRANS = 'T',   
+          C * Q' if SIDE = 'R' and TRANS = 'T',
 
-    where Q is a real orthogonal matrix defined as the product of k   
-    elementary reflectors   
+    where Q is a real orthogonal matrix defined as the product of k
+    elementary reflectors
 
-          Q = H(k) . . . H(2) H(1)   
+          Q = H(k) . . . H(2) H(1)
 
-    as returned by DGELQF. Q is of order m if SIDE = 'L' and of order n   
-    if SIDE = 'R'.   
+    as returned by DGELQF. Q is of order m if SIDE = 'L' and of order n
+    if SIDE = 'R'.
 
-    Arguments   
-    =========   
+    Arguments
+    =========
 
-    SIDE    (input) CHARACTER*1   
-            = 'L': apply Q or Q' from the Left   
-            = 'R': apply Q or Q' from the Right   
+    SIDE    (input) CHARACTER*1
+            = 'L': apply Q or Q' from the Left
+            = 'R': apply Q or Q' from the Right
 
-    TRANS   (input) CHARACTER*1   
-            = 'N': apply Q  (No transpose)   
-            = 'T': apply Q' (Transpose)   
+    TRANS   (input) CHARACTER*1
+            = 'N': apply Q  (No transpose)
+            = 'T': apply Q' (Transpose)
 
-    M       (input) INTEGER   
-            The number of rows of the matrix C. M >= 0.   
+    M       (input) INTEGER
+            The number of rows of the matrix C. M >= 0.
 
-    N       (input) INTEGER   
-            The number of columns of the matrix C. N >= 0.   
+    N       (input) INTEGER
+            The number of columns of the matrix C. N >= 0.
 
-    K       (input) INTEGER   
-            The number of elementary reflectors whose product defines   
-            the matrix Q.   
-            If SIDE = 'L', M >= K >= 0;   
-            if SIDE = 'R', N >= K >= 0.   
+    K       (input) INTEGER
+            The number of elementary reflectors whose product defines
+            the matrix Q.
+            If SIDE = 'L', M >= K >= 0;
+            if SIDE = 'R', N >= K >= 0.
 
-    A       (input) DOUBLE PRECISION array, dimension   
-                                 (LDA,M) if SIDE = 'L',   
-                                 (LDA,N) if SIDE = 'R'   
-            The i-th row must contain the vector which defines the   
-            elementary reflector H(i), for i = 1,2,...,k, as returned by   
-            DGELQF in the first k rows of its array argument A.   
-            A is modified by the routine but restored on exit.   
+    A       (input) DOUBLE PRECISION array, dimension
+                                 (LDA,M) if SIDE = 'L',
+                                 (LDA,N) if SIDE = 'R'
+            The i-th row must contain the vector which defines the
+            elementary reflector H(i), for i = 1,2,...,k, as returned by
+            DGELQF in the first k rows of its array argument A.
+            A is modified by the routine but restored on exit.
 
-    LDA     (input) INTEGER   
-            The leading dimension of the array A. LDA >= max(1,K).   
+    LDA     (input) INTEGER
+            The leading dimension of the array A. LDA >= max(1,K).
 
-    TAU     (input) DOUBLE PRECISION array, dimension (K)   
-            TAU(i) must contain the scalar factor of the elementary   
-            reflector H(i), as returned by DGELQF.   
+    TAU     (input) DOUBLE PRECISION array, dimension (K)
+            TAU(i) must contain the scalar factor of the elementary
+            reflector H(i), as returned by DGELQF.
 
-    C       (input/output) DOUBLE PRECISION array, dimension (LDC,N)   
-            On entry, the m by n matrix C.   
-            On exit, C is overwritten by Q*C or Q'*C or C*Q' or C*Q.   
+    C       (input/output) DOUBLE PRECISION array, dimension (LDC,N)
+            On entry, the m by n matrix C.
+            On exit, C is overwritten by Q*C or Q'*C or C*Q' or C*Q.
 
-    LDC     (input) INTEGER   
-            The leading dimension of the array C. LDC >= max(1,M).   
+    LDC     (input) INTEGER
+            The leading dimension of the array C. LDC >= max(1,M).
 
-    WORK    (workspace) DOUBLE PRECISION array, dimension   
-                                     (N) if SIDE = 'L',   
-                                     (M) if SIDE = 'R'   
+    WORK    (workspace) DOUBLE PRECISION array, dimension
+                                     (N) if SIDE = 'L',
+                                     (M) if SIDE = 'R'
 
-    INFO    (output) INTEGER   
-            = 0: successful exit   
-            < 0: if INFO = -i, the i-th argument had an illegal value   
+    INFO    (output) INTEGER
+            = 0: successful exit
+            < 0: if INFO = -i, the i-th argument had an illegal value
 
-    =====================================================================   
+    =====================================================================
 
 
-       Test the input arguments   
+       Test the input arguments
 
        Parameter adjustments */
     /* System generated locals */
     integer a_dim1, a_offset, c_dim1, c_offset, i__1, i__2;
     /* Local variables */
-    static logical left;
-    static integer i__;
-    extern /* Subroutine */ integer dlarf_(const char *, integer *, integer *, 
-	    doublereal *, integer *, doublereal *, doublereal *, integer *, 
+    logical left;
+    integer i__;
+    extern /* Subroutine */ integer dlarf_(const char *, integer *, integer *,
+	    doublereal *, integer *, doublereal *, doublereal *, integer *,
 	    doublereal *);
     extern logical lsame_(const char *,const char *);
-    static integer i1, i2, i3, ic, jc, mi, ni, nq;
+    integer i1, i2, i3, ic, jc, mi, ni, nq;
     extern /* Subroutine */ integer xerbla_(const char *, integer *);
-    static logical notran;
-    static doublereal aii;
+    logical notran;
+    doublereal aii;
 #define a_ref(a_1,a_2) a[(a_2)*a_dim1 + a_1]
 #define c___ref(a_1,a_2) c__[(a_2)*c_dim1 + a_1]
 
@@ -201,7 +201,7 @@ extern "C" {
 
 	aii = a_ref(i__, i__);
 	a_ref(i__, i__) = 1.;
-	dlarf_(side, &mi, &ni, &a_ref(i__, i__), lda, &tau[i__], &c___ref(ic, 
+	dlarf_(side, &mi, &ni, &a_ref(i__, i__), lda, &tau[i__], &c___ref(ic,
 		jc), ldc, &work[1]);
 	a_ref(i__, i__) = aii;
 /* L10: */
diff --git a/external/hypre/src/lapack/dormlq.c b/external/hypre/src/lapack/dormlq.c
index fc9781ac..9ac48784 100644
--- a/external/hypre/src/lapack/dormlq.c
+++ b/external/hypre/src/lapack/dormlq.c
@@ -8,142 +8,142 @@ extern "C" {
 #include "f2c.h"
 #include "hypre_lapack.h"
 
-/* Subroutine */ integer dormlq_(const char *side,const char *trans, integer *m, integer *n, 
+/* Subroutine */ integer dormlq_(const char *side,const char *trans, integer *m, integer *n,
 	integer *k, doublereal *a, integer *lda, doublereal *tau, doublereal *
 	c__, integer *ldc, doublereal *work, integer *lwork, integer *info)
 {
-/*  -- LAPACK routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       June 30, 1999   
+/*  -- LAPACK routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       June 30, 1999
 
 
-    Purpose   
-    =======   
+    Purpose
+    =======
 
-    DORMLQ overwrites the general real M-by-N matrix C with   
+    DORMLQ overwrites the general real M-by-N matrix C with
 
-                    SIDE = 'L'     SIDE = 'R'   
-    TRANS = 'N':      Q * C          C * Q   
-    TRANS = 'T':      Q**T * C       C * Q**T   
+                    SIDE = 'L'     SIDE = 'R'
+    TRANS = 'N':      Q * C          C * Q
+    TRANS = 'T':      Q**T * C       C * Q**T
 
-    where Q is a real orthogonal matrix defined as the product of k   
-    elementary reflectors   
+    where Q is a real orthogonal matrix defined as the product of k
+    elementary reflectors
 
-          Q = H(k) . . . H(2) H(1)   
+          Q = H(k) . . . H(2) H(1)
 
-    as returned by DGELQF. Q is of order M if SIDE = 'L' and of order N   
-    if SIDE = 'R'.   
+    as returned by DGELQF. Q is of order M if SIDE = 'L' and of order N
+    if SIDE = 'R'.
 
-    Arguments   
-    =========   
+    Arguments
+    =========
 
-    SIDE    (input) CHARACTER*1   
-            = 'L': apply Q or Q**T from the Left;   
-            = 'R': apply Q or Q**T from the Right.   
+    SIDE    (input) CHARACTER*1
+            = 'L': apply Q or Q**T from the Left;
+            = 'R': apply Q or Q**T from the Right.
 
-    TRANS   (input) CHARACTER*1   
-            = 'N':  No transpose, apply Q;   
-            = 'T':  Transpose, apply Q**T.   
+    TRANS   (input) CHARACTER*1
+            = 'N':  No transpose, apply Q;
+            = 'T':  Transpose, apply Q**T.
 
-    M       (input) INTEGER   
-            The number of rows of the matrix C. M >= 0.   
+    M       (input) INTEGER
+            The number of rows of the matrix C. M >= 0.
 
-    N       (input) INTEGER   
-            The number of columns of the matrix C. N >= 0.   
+    N       (input) INTEGER
+            The number of columns of the matrix C. N >= 0.
 
-    K       (input) INTEGER   
-            The number of elementary reflectors whose product defines   
-            the matrix Q.   
-            If SIDE = 'L', M >= K >= 0;   
-            if SIDE = 'R', N >= K >= 0.   
+    K       (input) INTEGER
+            The number of elementary reflectors whose product defines
+            the matrix Q.
+            If SIDE = 'L', M >= K >= 0;
+            if SIDE = 'R', N >= K >= 0.
 
-    A       (input) DOUBLE PRECISION array, dimension   
-                                 (LDA,M) if SIDE = 'L',   
-                                 (LDA,N) if SIDE = 'R'   
-            The i-th row must contain the vector which defines the   
-            elementary reflector H(i), for i = 1,2,...,k, as returned by   
-            DGELQF in the first k rows of its array argument A.   
-            A is modified by the routine but restored on exit.   
+    A       (input) DOUBLE PRECISION array, dimension
+                                 (LDA,M) if SIDE = 'L',
+                                 (LDA,N) if SIDE = 'R'
+            The i-th row must contain the vector which defines the
+            elementary reflector H(i), for i = 1,2,...,k, as returned by
+            DGELQF in the first k rows of its array argument A.
+            A is modified by the routine but restored on exit.
 
-    LDA     (input) INTEGER   
-            The leading dimension of the array A. LDA >= max(1,K).   
+    LDA     (input) INTEGER
+            The leading dimension of the array A. LDA >= max(1,K).
 
-    TAU     (input) DOUBLE PRECISION array, dimension (K)   
-            TAU(i) must contain the scalar factor of the elementary   
-            reflector H(i), as returned by DGELQF.   
+    TAU     (input) DOUBLE PRECISION array, dimension (K)
+            TAU(i) must contain the scalar factor of the elementary
+            reflector H(i), as returned by DGELQF.
 
-    C       (input/output) DOUBLE PRECISION array, dimension (LDC,N)   
-            On entry, the M-by-N matrix C.   
-            On exit, C is overwritten by Q*C or Q**T*C or C*Q**T or C*Q.   
+    C       (input/output) DOUBLE PRECISION array, dimension (LDC,N)
+            On entry, the M-by-N matrix C.
+            On exit, C is overwritten by Q*C or Q**T*C or C*Q**T or C*Q.
 
-    LDC     (input) INTEGER   
-            The leading dimension of the array C. LDC >= max(1,M).   
+    LDC     (input) INTEGER
+            The leading dimension of the array C. LDC >= max(1,M).
 
-    WORK    (workspace/output) DOUBLE PRECISION array, dimension (LWORK)   
-            On exit, if INFO = 0, WORK(1) returns the optimal LWORK.   
+    WORK    (workspace/output) DOUBLE PRECISION array, dimension (LWORK)
+            On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
 
-    LWORK   (input) INTEGER   
-            The dimension of the array WORK.   
-            If SIDE = 'L', LWORK >= max(1,N);   
-            if SIDE = 'R', LWORK >= max(1,M).   
-            For optimum performance LWORK >= N*NB if SIDE = 'L', and   
-            LWORK >= M*NB if SIDE = 'R', where NB is the optimal   
-            blocksize.   
+    LWORK   (input) INTEGER
+            The dimension of the array WORK.
+            If SIDE = 'L', LWORK >= max(1,N);
+            if SIDE = 'R', LWORK >= max(1,M).
+            For optimum performance LWORK >= N*NB if SIDE = 'L', and
+            LWORK >= M*NB if SIDE = 'R', where NB is the optimal
+            blocksize.
 
-            If LWORK = -1, then a workspace query is assumed; the routine   
-            only calculates the optimal size of the WORK array, returns   
-            this value as the first entry of the WORK array, and no error   
-            message related to LWORK is issued by XERBLA.   
+            If LWORK = -1, then a workspace query is assumed; the routine
+            only calculates the optimal size of the WORK array, returns
+            this value as the first entry of the WORK array, and no error
+            message related to LWORK is issued by XERBLA.
 
-    INFO    (output) INTEGER   
-            = 0:  successful exit   
-            < 0:  if INFO = -i, the i-th argument had an illegal value   
+    INFO    (output) INTEGER
+            = 0:  successful exit
+            < 0:  if INFO = -i, the i-th argument had an illegal value
 
-    =====================================================================   
+    =====================================================================
 
 
-       Test the input arguments   
+       Test the input arguments
 
        Parameter adjustments */
     /* Table of constant values */
-    static integer c__1 = 1;
-    static integer c_n1 = -1;
-    static integer c__2 = 2;
-    static integer c__65 = 65;
-    
+    integer c__1 = 1;
+    integer c_n1 = -1;
+    integer c__2 = 2;
+    integer c__65 = 65;
+
     /* System generated locals */
     address a__1[2];
-    integer a_dim1, a_offset, c_dim1, c_offset, i__1, i__2, i__3[2], i__4, 
+    integer a_dim1, a_offset, c_dim1, c_offset, i__1, i__2, i__3[2], i__4,
 	    i__5;
     char ch__1[2];
-    /* Builtin functions   
+    /* Builtin functions
        Subroutine */ integer s_cat(char *, char **, integer *, integer *, ftnlen);
     /* Local variables */
-    static logical left;
-    static integer i__;
-    static doublereal t[4160]	/* was [65][64] */;
+    logical left;
+    integer i__;
+    doublereal t[4160]	/* was [65][64] */;
     extern logical lsame_(const char *,const char *);
-    static integer nbmin, iinfo, i1, i2, i3;
-    extern /* Subroutine */ integer dorml2_(const char *,const char *, integer *, integer *, 
-	    integer *, doublereal *, integer *, doublereal *, doublereal *, 
+    integer nbmin, iinfo, i1, i2, i3;
+    extern /* Subroutine */ integer dorml2_(const char *,const char *, integer *, integer *,
+	    integer *, doublereal *, integer *, doublereal *, doublereal *,
 	    integer *, doublereal *, integer *);
-    static integer ib, ic, jc, nb, mi, ni;
-    extern /* Subroutine */ integer dlarfb_(const char *,const char *,const char *,const char *, 
-	    integer *, integer *, integer *, doublereal *, integer *, 
-	    doublereal *, integer *, doublereal *, integer *, doublereal *, 
+    integer ib, ic, jc, nb, mi, ni;
+    extern /* Subroutine */ integer dlarfb_(const char *,const char *,const char *,const char *,
+	    integer *, integer *, integer *, doublereal *, integer *,
+	    doublereal *, integer *, doublereal *, integer *, doublereal *,
 	    integer *);
-    static integer nq, nw;
-    extern /* Subroutine */ integer dlarft_(const char *,const char *, integer *, integer *, 
+    integer nq, nw;
+    extern /* Subroutine */ integer dlarft_(const char *,const char *, integer *, integer *,
 	    doublereal *, integer *, doublereal *, doublereal *, integer *), xerbla_(const char *, integer *);
-    extern integer ilaenv_(integer *,const char *,const char *, integer *, integer *, 
+    extern integer ilaenv_(integer *,const char *,const char *, integer *, integer *,
 	    integer *, integer *, ftnlen, ftnlen);
-    static logical notran;
-    static integer ldwork;
-    static char transt[1];
-    static integer lwkopt;
-    static logical lquery;
-    static integer iws;
+    logical notran;
+    integer ldwork;
+    char transt[1];
+    integer lwkopt;
+    logical lquery;
+    integer iws;
 #define a_ref(a_1,a_2) a[(a_2)*a_dim1 + a_1]
 #define c___ref(a_1,a_2) c__[(a_2)*c_dim1 + a_1]
 
@@ -192,10 +192,10 @@ extern "C" {
 
     if (*info == 0) {
 
-/*        Determine the block size.  NB may be at most NBMAX, where NBMAX   
-          is used to define the local array T.   
+/*        Determine the block size.  NB may be at most NBMAX, where NBMAX
+          is used to define the local array T.
 
-   Computing MIN   
+   Computing MIN
    Writing concatenation */
 		i__3[0] = 1, a__1[0] = (char*)side;
 		i__3[1] = 1, a__1[1] = (char*)trans;
@@ -228,7 +228,7 @@ extern "C" {
 	iws = nw * nb;
 	if (*lwork < iws) {
 	    nb = *lwork / ldwork;
-/* Computing MAX   
+/* Computing MAX
    Writing concatenation */
 	    i__3[0] = 1, a__1[0] =(char*) side;
 	    i__3[1] = 1, a__1[1] =(char*) trans;
@@ -282,7 +282,7 @@ extern "C" {
 	    i__4 = nb, i__5 = *k - i__ + 1;
 	    ib = min(i__4,i__5);
 
-/*           Form the triangular factor of the block reflector   
+/*           Form the triangular factor of the block reflector
              H = H(i) H(i+1) . . . H(i+ib-1) */
 
 	    i__4 = nq - i__ + 1;
diff --git a/external/hypre/src/lapack/dormqr.c b/external/hypre/src/lapack/dormqr.c
index 44202875..879403fa 100644
--- a/external/hypre/src/lapack/dormqr.c
+++ b/external/hypre/src/lapack/dormqr.c
@@ -8,140 +8,140 @@ extern "C" {
 #include "f2c.h"
 #include "hypre_lapack.h"
 
-/* Subroutine */ integer dormqr_(const char *side,const char *trans, integer *m, integer *n, 
+/* Subroutine */ integer dormqr_(const char *side,const char *trans, integer *m, integer *n,
 	integer *k, doublereal *a, integer *lda, doublereal *tau, doublereal *
 	c__, integer *ldc, doublereal *work, integer *lwork, integer *info)
 {
-/*  -- LAPACK routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       June 30, 1999   
+/*  -- LAPACK routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       June 30, 1999
 
 
-    Purpose   
-    =======   
+    Purpose
+    =======
 
-    DORMQR overwrites the general real M-by-N matrix C with   
+    DORMQR overwrites the general real M-by-N matrix C with
 
-                    SIDE = 'L'     SIDE = 'R'   
-    TRANS = 'N':      Q * C          C * Q   
-    TRANS = 'T':      Q**T * C       C * Q**T   
+                    SIDE = 'L'     SIDE = 'R'
+    TRANS = 'N':      Q * C          C * Q
+    TRANS = 'T':      Q**T * C       C * Q**T
 
-    where Q is a real orthogonal matrix defined as the product of k   
-    elementary reflectors   
+    where Q is a real orthogonal matrix defined as the product of k
+    elementary reflectors
 
-          Q = H(1) H(2) . . . H(k)   
+          Q = H(1) H(2) . . . H(k)
 
-    as returned by DGEQRF. Q is of order M if SIDE = 'L' and of order N   
-    if SIDE = 'R'.   
+    as returned by DGEQRF. Q is of order M if SIDE = 'L' and of order N
+    if SIDE = 'R'.
 
-    Arguments   
-    =========   
+    Arguments
+    =========
 
-    SIDE    (input) CHARACTER*1   
-            = 'L': apply Q or Q**T from the Left;   
-            = 'R': apply Q or Q**T from the Right.   
+    SIDE    (input) CHARACTER*1
+            = 'L': apply Q or Q**T from the Left;
+            = 'R': apply Q or Q**T from the Right.
 
-    TRANS   (input) CHARACTER*1   
-            = 'N':  No transpose, apply Q;   
-            = 'T':  Transpose, apply Q**T.   
+    TRANS   (input) CHARACTER*1
+            = 'N':  No transpose, apply Q;
+            = 'T':  Transpose, apply Q**T.
 
-    M       (input) INTEGER   
-            The number of rows of the matrix C. M >= 0.   
+    M       (input) INTEGER
+            The number of rows of the matrix C. M >= 0.
 
-    N       (input) INTEGER   
-            The number of columns of the matrix C. N >= 0.   
+    N       (input) INTEGER
+            The number of columns of the matrix C. N >= 0.
 
-    K       (input) INTEGER   
-            The number of elementary reflectors whose product defines   
-            the matrix Q.   
-            If SIDE = 'L', M >= K >= 0;   
-            if SIDE = 'R', N >= K >= 0.   
+    K       (input) INTEGER
+            The number of elementary reflectors whose product defines
+            the matrix Q.
+            If SIDE = 'L', M >= K >= 0;
+            if SIDE = 'R', N >= K >= 0.
 
-    A       (input) DOUBLE PRECISION array, dimension (LDA,K)   
-            The i-th column must contain the vector which defines the   
-            elementary reflector H(i), for i = 1,2,...,k, as returned by   
-            DGEQRF in the first k columns of its array argument A.   
-            A is modified by the routine but restored on exit.   
+    A       (input) DOUBLE PRECISION array, dimension (LDA,K)
+            The i-th column must contain the vector which defines the
+            elementary reflector H(i), for i = 1,2,...,k, as returned by
+            DGEQRF in the first k columns of its array argument A.
+            A is modified by the routine but restored on exit.
 
-    LDA     (input) INTEGER   
-            The leading dimension of the array A.   
-            If SIDE = 'L', LDA >= max(1,M);   
-            if SIDE = 'R', LDA >= max(1,N).   
+    LDA     (input) INTEGER
+            The leading dimension of the array A.
+            If SIDE = 'L', LDA >= max(1,M);
+            if SIDE = 'R', LDA >= max(1,N).
 
-    TAU     (input) DOUBLE PRECISION array, dimension (K)   
-            TAU(i) must contain the scalar factor of the elementary   
-            reflector H(i), as returned by DGEQRF.   
+    TAU     (input) DOUBLE PRECISION array, dimension (K)
+            TAU(i) must contain the scalar factor of the elementary
+            reflector H(i), as returned by DGEQRF.
 
-    C       (input/output) DOUBLE PRECISION array, dimension (LDC,N)   
-            On entry, the M-by-N matrix C.   
-            On exit, C is overwritten by Q*C or Q**T*C or C*Q**T or C*Q.   
+    C       (input/output) DOUBLE PRECISION array, dimension (LDC,N)
+            On entry, the M-by-N matrix C.
+            On exit, C is overwritten by Q*C or Q**T*C or C*Q**T or C*Q.
 
-    LDC     (input) INTEGER   
-            The leading dimension of the array C. LDC >= max(1,M).   
+    LDC     (input) INTEGER
+            The leading dimension of the array C. LDC >= max(1,M).
 
-    WORK    (workspace/output) DOUBLE PRECISION array, dimension (LWORK)   
-            On exit, if INFO = 0, WORK(1) returns the optimal LWORK.   
+    WORK    (workspace/output) DOUBLE PRECISION array, dimension (LWORK)
+            On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
 
-    LWORK   (input) INTEGER   
-            The dimension of the array WORK.   
-            If SIDE = 'L', LWORK >= max(1,N);   
-            if SIDE = 'R', LWORK >= max(1,M).   
-            For optimum performance LWORK >= N*NB if SIDE = 'L', and   
-            LWORK >= M*NB if SIDE = 'R', where NB is the optimal   
-            blocksize.   
+    LWORK   (input) INTEGER
+            The dimension of the array WORK.
+            If SIDE = 'L', LWORK >= max(1,N);
+            if SIDE = 'R', LWORK >= max(1,M).
+            For optimum performance LWORK >= N*NB if SIDE = 'L', and
+            LWORK >= M*NB if SIDE = 'R', where NB is the optimal
+            blocksize.
 
-            If LWORK = -1, then a workspace query is assumed; the routine   
-            only calculates the optimal size of the WORK array, returns   
-            this value as the first entry of the WORK array, and no error   
-            message related to LWORK is issued by XERBLA.   
+            If LWORK = -1, then a workspace query is assumed; the routine
+            only calculates the optimal size of the WORK array, returns
+            this value as the first entry of the WORK array, and no error
+            message related to LWORK is issued by XERBLA.
 
-    INFO    (output) INTEGER   
-            = 0:  successful exit   
-            < 0:  if INFO = -i, the i-th argument had an illegal value   
+    INFO    (output) INTEGER
+            = 0:  successful exit
+            < 0:  if INFO = -i, the i-th argument had an illegal value
 
-    =====================================================================   
+    =====================================================================
 
 
-       Test the input arguments   
+       Test the input arguments
 
        Parameter adjustments */
     /* Table of constant values */
-    static integer c__1 = 1;
-    static integer c_n1 = -1;
-    static integer c__2 = 2;
-    static integer c__65 = 65;
-    
+    integer c__1 = 1;
+    integer c_n1 = -1;
+    integer c__2 = 2;
+    integer c__65 = 65;
+
     /* System generated locals */
     address a__1[2];
-    integer a_dim1, a_offset, c_dim1, c_offset, i__1, i__2, i__3[2], i__4, 
+    integer a_dim1, a_offset, c_dim1, c_offset, i__1, i__2, i__3[2], i__4,
 	    i__5;
     char ch__1[2];
-    /* Builtin functions   
+    /* Builtin functions
        Subroutine */ integer s_cat(char *, char **, integer *, integer *, ftnlen);
     /* Local variables */
-    static logical left;
-    static integer i__;
-    static doublereal t[4160]	/* was [65][64] */;
+    logical left;
+    integer i__;
+    doublereal t[4160]	/* was [65][64] */;
     extern logical lsame_(const char *,const char *);
-    static integer nbmin, iinfo, i1, i2, i3;
-    extern /* Subroutine */ integer dorm2r_(const char *,const char *, integer *, integer *, 
-	    integer *, doublereal *, integer *, doublereal *, doublereal *, 
+    integer nbmin, iinfo, i1, i2, i3;
+    extern /* Subroutine */ integer dorm2r_(const char *,const char *, integer *, integer *,
+	    integer *, doublereal *, integer *, doublereal *, doublereal *,
 	    integer *, doublereal *, integer *);
-    static integer ib, ic, jc, nb, mi, ni;
-    extern /* Subroutine */ integer dlarfb_(const char *,const char *,const char *,const char *, 
-	    integer *, integer *, integer *, doublereal *, integer *, 
-	    doublereal *, integer *, doublereal *, integer *, doublereal *, 
+    integer ib, ic, jc, nb, mi, ni;
+    extern /* Subroutine */ integer dlarfb_(const char *,const char *,const char *,const char *,
+	    integer *, integer *, integer *, doublereal *, integer *,
+	    doublereal *, integer *, doublereal *, integer *, doublereal *,
 	    integer *);
-    static integer nq, nw;
-    extern /* Subroutine */ integer dlarft_(const char *,const char *, integer *, integer *, 
+    integer nq, nw;
+    extern /* Subroutine */ integer dlarft_(const char *,const char *, integer *, integer *,
 	    doublereal *, integer *, doublereal *, doublereal *, integer *), xerbla_(const char *, integer *);
-    extern integer ilaenv_(integer *,const char *,const char *, integer *, integer *, 
+    extern integer ilaenv_(integer *,const char *,const char *, integer *, integer *,
 	    integer *, integer *, ftnlen, ftnlen);
-    static logical notran;
-    static integer ldwork, lwkopt;
-    static logical lquery;
-    static integer iws;
+    logical notran;
+    integer ldwork, lwkopt;
+    logical lquery;
+    integer iws;
 #define a_ref(a_1,a_2) a[(a_2)*a_dim1 + a_1]
 #define c___ref(a_1,a_2) c__[(a_2)*c_dim1 + a_1]
 
@@ -190,10 +190,10 @@ extern "C" {
 
     if (*info == 0) {
 
-/*        Determine the block size.  NB may be at most NBMAX, where NBMAX   
-          is used to define the local array T.   
+/*        Determine the block size.  NB may be at most NBMAX, where NBMAX
+          is used to define the local array T.
 
-   Computing MIN   
+   Computing MIN
    Writing concatenation */
 		i__3[0] = 1, a__1[0] = (char*) side;
 		i__3[1] = 1, a__1[1] = (char*) trans;
@@ -226,7 +226,7 @@ extern "C" {
 	iws = nw * nb;
 	if (*lwork < iws) {
 	    nb = *lwork / ldwork;
-/* Computing MAX   
+/* Computing MAX
    Writing concatenation */
 	    i__3[0] = 1, a__1[0] = (char*) side;
 	    i__3[1] = 1, a__1[1] = (char*) trans;
@@ -274,11 +274,11 @@ extern "C" {
 	    i__4 = nb, i__5 = *k - i__ + 1;
 	    ib = min(i__4,i__5);
 
-/*           Form the triangular factor of the block reflector   
+/*           Form the triangular factor of the block reflector
              H = H(i) H(i+1) . . . H(i+ib-1) */
 
 	    i__4 = nq - i__ + 1;
-	    dlarft_("Forward", "Columnwise", &i__4, &ib, &a_ref(i__, i__), 
+	    dlarft_("Forward", "Columnwise", &i__4, &ib, &a_ref(i__, i__),
 		    lda, &tau[i__], t, &c__65);
 	    if (left) {
 
diff --git a/external/hypre/src/lapack/dpotf2.c b/external/hypre/src/lapack/dpotf2.c
index bc17f3df..4ff26215 100644
--- a/external/hypre/src/lapack/dpotf2.c
+++ b/external/hypre/src/lapack/dpotf2.c
@@ -11,88 +11,88 @@ extern "C" {
 /* Subroutine */ integer dpotf2_(const char *uplo, integer *n, doublereal *a, integer *
 	lda, integer *info)
 {
-/*  -- LAPACK routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       February 29, 1992   
+/*  -- LAPACK routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       February 29, 1992
 
 
-    Purpose   
-    =======   
+    Purpose
+    =======
 
-    DPOTF2 computes the Cholesky factorization of a real symmetric   
-    positive definite matrix A.   
+    DPOTF2 computes the Cholesky factorization of a real symmetric
+    positive definite matrix A.
 
-    The factorization has the form   
-       A = U' * U ,  if UPLO = 'U', or   
-       A = L  * L',  if UPLO = 'L',   
-    where U is an upper triangular matrix and L is lower triangular.   
+    The factorization has the form
+       A = U' * U ,  if UPLO = 'U', or
+       A = L  * L',  if UPLO = 'L',
+    where U is an upper triangular matrix and L is lower triangular.
 
-    This is the unblocked version of the algorithm, calling Level 2 BLAS.   
+    This is the unblocked version of the algorithm, calling Level 2 BLAS.
 
-    Arguments   
-    =========   
+    Arguments
+    =========
 
-    UPLO    (input) CHARACTER*1   
-            Specifies whether the upper or lower triangular part of the   
-            symmetric matrix A is stored.   
-            = 'U':  Upper triangular   
-            = 'L':  Lower triangular   
+    UPLO    (input) CHARACTER*1
+            Specifies whether the upper or lower triangular part of the
+            symmetric matrix A is stored.
+            = 'U':  Upper triangular
+            = 'L':  Lower triangular
 
-    N       (input) INTEGER   
-            The order of the matrix A.  N >= 0.   
+    N       (input) INTEGER
+            The order of the matrix A.  N >= 0.
 
-    A       (input/output) DOUBLE PRECISION array, dimension (LDA,N)   
-            On entry, the symmetric matrix A.  If UPLO = 'U', the leading   
-            n by n upper triangular part of A contains the upper   
-            triangular part of the matrix A, and the strictly lower   
-            triangular part of A is not referenced.  If UPLO = 'L', the   
-            leading n by n lower triangular part of A contains the lower   
-            triangular part of the matrix A, and the strictly upper   
-            triangular part of A is not referenced.   
+    A       (input/output) DOUBLE PRECISION array, dimension (LDA,N)
+            On entry, the symmetric matrix A.  If UPLO = 'U', the leading
+            n by n upper triangular part of A contains the upper
+            triangular part of the matrix A, and the strictly lower
+            triangular part of A is not referenced.  If UPLO = 'L', the
+            leading n by n lower triangular part of A contains the lower
+            triangular part of the matrix A, and the strictly upper
+            triangular part of A is not referenced.
 
-            On exit, if INFO = 0, the factor U or L from the Cholesky   
-            factorization A = U'*U  or A = L*L'.   
+            On exit, if INFO = 0, the factor U or L from the Cholesky
+            factorization A = U'*U  or A = L*L'.
 
-    LDA     (input) INTEGER   
-            The leading dimension of the array A.  LDA >= max(1,N).   
+    LDA     (input) INTEGER
+            The leading dimension of the array A.  LDA >= max(1,N).
 
-    INFO    (output) INTEGER   
-            = 0: successful exit   
-            < 0: if INFO = -k, the k-th argument had an illegal value   
-            > 0: if INFO = k, the leading minor of order k is not   
-                 positive definite, and the factorization could not be   
-                 completed.   
+    INFO    (output) INTEGER
+            = 0: successful exit
+            < 0: if INFO = -k, the k-th argument had an illegal value
+            > 0: if INFO = k, the leading minor of order k is not
+                 positive definite, and the factorization could not be
+                 completed.
 
-    =====================================================================   
+    =====================================================================
 
 
-       Test the input parameters.   
+       Test the input parameters.
 
        Parameter adjustments */
     /* Table of constant values */
-    static integer c__1 = 1;
-    static doublereal c_b10 = -1.;
-    static doublereal c_b12 = 1.;
-    
+    integer c__1 = 1;
+    doublereal c_b10 = -1.;
+    doublereal c_b12 = 1.;
+
     /* System generated locals */
     integer a_dim1, a_offset, i__1, i__2, i__3;
     doublereal d__1;
     /* Builtin functions */
     /*doublereal sqrt(doublereal);*/
     /* Local variables */
-    extern doublereal ddot_(integer *, doublereal *, integer *, doublereal *, 
+    extern doublereal ddot_(integer *, doublereal *, integer *, doublereal *,
 	    integer *);
-    static integer j;
-    extern /* Subroutine */ integer dscal_(integer *, doublereal *, doublereal *, 
+    integer j;
+    extern /* Subroutine */ integer dscal_(integer *, doublereal *, doublereal *,
 	    integer *);
     extern logical lsame_(const char *,const char *);
-    extern /* Subroutine */ integer dgemv_(const char *, integer *, integer *, 
-	    doublereal *, doublereal *, integer *, doublereal *, integer *, 
+    extern /* Subroutine */ integer dgemv_(const char *, integer *, integer *,
+	    doublereal *, doublereal *, integer *, doublereal *, integer *,
 	    doublereal *, doublereal *, integer *);
-    static logical upper;
+    logical upper;
     extern /* Subroutine */ integer xerbla_(const char *, integer *);
-    static doublereal ajj;
+    doublereal ajj;
 #define a_ref(a_1,a_2) a[(a_2)*a_dim1 + a_1]
 
 
@@ -146,8 +146,8 @@ extern "C" {
 	    if (j < *n) {
 		i__2 = j - 1;
 		i__3 = *n - j;
-		dgemv_("Transpose", &i__2, &i__3, &c_b10, &a_ref(1, j + 1), 
-			lda, &a_ref(1, j), &c__1, &c_b12, &a_ref(j, j + 1), 
+		dgemv_("Transpose", &i__2, &i__3, &c_b10, &a_ref(1, j + 1),
+			lda, &a_ref(1, j), &c__1, &c_b12, &a_ref(j, j + 1),
 			lda);
 		i__2 = *n - j;
 		d__1 = 1. / ajj;
@@ -165,7 +165,7 @@ extern "C" {
 /*           Compute L(J,J) and test for non-positive-definiteness. */
 
 	    i__2 = j - 1;
-	    ajj = a_ref(j, j) - ddot_(&i__2, &a_ref(j, 1), lda, &a_ref(j, 1), 
+	    ajj = a_ref(j, j) - ddot_(&i__2, &a_ref(j, 1), lda, &a_ref(j, 1),
 		    lda);
 	    if (ajj <= 0.) {
 		a_ref(j, j) = ajj;
diff --git a/external/hypre/src/lapack/dpotrf.c b/external/hypre/src/lapack/dpotrf.c
index 2b5e67d5..7b0d2d75 100644
--- a/external/hypre/src/lapack/dpotrf.c
+++ b/external/hypre/src/lapack/dpotrf.c
@@ -11,88 +11,88 @@ extern "C" {
 /* Subroutine */ integer dpotrf_(const char *uplo, integer *n, doublereal *a, integer *
 	lda, integer *info)
 {
-/*  -- LAPACK routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       March 31, 1993   
+/*  -- LAPACK routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       March 31, 1993
 
 
-    Purpose   
-    =======   
+    Purpose
+    =======
 
-    DPOTRF computes the Cholesky factorization of a real symmetric   
-    positive definite matrix A.   
+    DPOTRF computes the Cholesky factorization of a real symmetric
+    positive definite matrix A.
 
-    The factorization has the form   
-       A = U**T * U,  if UPLO = 'U', or   
-       A = L  * L**T,  if UPLO = 'L',   
-    where U is an upper triangular matrix and L is lower triangular.   
+    The factorization has the form
+       A = U**T * U,  if UPLO = 'U', or
+       A = L  * L**T,  if UPLO = 'L',
+    where U is an upper triangular matrix and L is lower triangular.
 
-    This is the block version of the algorithm, calling Level 3 BLAS.   
+    This is the block version of the algorithm, calling Level 3 BLAS.
 
-    Arguments   
-    =========   
+    Arguments
+    =========
 
-    UPLO    (input) CHARACTER*1   
-            = 'U':  Upper triangle of A is stored;   
-            = 'L':  Lower triangle of A is stored.   
+    UPLO    (input) CHARACTER*1
+            = 'U':  Upper triangle of A is stored;
+            = 'L':  Lower triangle of A is stored.
 
-    N       (input) INTEGER   
-            The order of the matrix A.  N >= 0.   
+    N       (input) INTEGER
+            The order of the matrix A.  N >= 0.
 
-    A       (input/output) DOUBLE PRECISION array, dimension (LDA,N)   
-            On entry, the symmetric matrix A.  If UPLO = 'U', the leading   
-            N-by-N upper triangular part of A contains the upper   
-            triangular part of the matrix A, and the strictly lower   
-            triangular part of A is not referenced.  If UPLO = 'L', the   
-            leading N-by-N lower triangular part of A contains the lower   
-            triangular part of the matrix A, and the strictly upper   
-            triangular part of A is not referenced.   
+    A       (input/output) DOUBLE PRECISION array, dimension (LDA,N)
+            On entry, the symmetric matrix A.  If UPLO = 'U', the leading
+            N-by-N upper triangular part of A contains the upper
+            triangular part of the matrix A, and the strictly lower
+            triangular part of A is not referenced.  If UPLO = 'L', the
+            leading N-by-N lower triangular part of A contains the lower
+            triangular part of the matrix A, and the strictly upper
+            triangular part of A is not referenced.
 
-            On exit, if INFO = 0, the factor U or L from the Cholesky   
-            factorization A = U**T*U or A = L*L**T.   
+            On exit, if INFO = 0, the factor U or L from the Cholesky
+            factorization A = U**T*U or A = L*L**T.
 
-    LDA     (input) INTEGER   
-            The leading dimension of the array A.  LDA >= max(1,N).   
+    LDA     (input) INTEGER
+            The leading dimension of the array A.  LDA >= max(1,N).
 
-    INFO    (output) INTEGER   
-            = 0:  successful exit   
-            < 0:  if INFO = -i, the i-th argument had an illegal value   
-            > 0:  if INFO = i, the leading minor of order i is not   
-                  positive definite, and the factorization could not be   
-                  completed.   
+    INFO    (output) INTEGER
+            = 0:  successful exit
+            < 0:  if INFO = -i, the i-th argument had an illegal value
+            > 0:  if INFO = i, the leading minor of order i is not
+                  positive definite, and the factorization could not be
+                  completed.
 
-    =====================================================================   
+    =====================================================================
 
 
-       Test the input parameters.   
+       Test the input parameters.
 
        Parameter adjustments */
     /* Table of constant values */
-    static integer c__1 = 1;
-    static integer c_n1 = -1;
-    static doublereal c_b13 = -1.;
-    static doublereal c_b14 = 1.;
-    
+    integer c__1 = 1;
+    integer c_n1 = -1;
+    doublereal c_b13 = -1.;
+    doublereal c_b14 = 1.;
+
     /* System generated locals */
     integer a_dim1, a_offset, i__1, i__2, i__3, i__4;
     /* Local variables */
-    static integer j;
-    extern /* Subroutine */ integer dgemm_(const char *,const char *, integer *, integer *, 
-	    integer *, doublereal *, doublereal *, integer *, doublereal *, 
+    integer j;
+    extern /* Subroutine */ integer dgemm_(const char *,const char *, integer *, integer *,
+	    integer *, doublereal *, doublereal *, integer *, doublereal *,
 	    integer *, doublereal *, doublereal *, integer *);
     extern logical lsame_(const char *,const char *);
-    extern /* Subroutine */ integer dtrsm_(const char *,const char *,const char *,const char *, 
-	    integer *, integer *, doublereal *, doublereal *, integer *, 
+    extern /* Subroutine */ integer dtrsm_(const char *,const char *,const char *,const char *,
+	    integer *, integer *, doublereal *, doublereal *, integer *,
 	    doublereal *, integer *);
-    static logical upper;
-    extern /* Subroutine */ integer dsyrk_(const char *,const char *, integer *, integer *, 
+    logical upper;
+    extern /* Subroutine */ integer dsyrk_(const char *,const char *, integer *, integer *,
 	    doublereal *, doublereal *, integer *, doublereal *, doublereal *,
-	     integer *), dpotf2_(const char *, integer *, 
+	     integer *), dpotf2_(const char *, integer *,
 	    doublereal *, integer *, integer *);
-    static integer jb, nb;
+    integer jb, nb;
     extern /* Subroutine */ integer xerbla_(const char *, integer *);
-    extern integer ilaenv_(integer *,const char *,const char *, integer *, integer *, 
+    extern integer ilaenv_(integer *,const char *,const char *, integer *, integer *,
 	    integer *, integer *, ftnlen, ftnlen);
 #define a_ref(a_1,a_2) a[(a_2)*a_dim1 + a_1]
 
@@ -144,8 +144,8 @@ extern "C" {
 	    i__2 = nb;
 	    for (j = 1; i__2 < 0 ? j >= i__1 : j <= i__1; j += i__2) {
 
-/*              Update and factorize the current diagonal block and test   
-                for non-positive-definiteness.   
+/*              Update and factorize the current diagonal block and test
+                for non-positive-definiteness.
 
    Computing MIN */
 		i__3 = nb, i__4 = *n - j + 1;
@@ -165,7 +165,7 @@ extern "C" {
 		    i__3 = *n - j - jb + 1;
 		    i__4 = j - 1;
 		    dgemm_("Transpose", "No transpose", &jb, &i__3, &i__4, &
-			    c_b13, &a_ref(1, j), lda, &a_ref(1, j + jb), lda, 
+			    c_b13, &a_ref(1, j), lda, &a_ref(1, j + jb), lda,
 			    &c_b14, &a_ref(j, j + jb), lda);
 		    i__3 = *n - j - jb + 1;
 		    dtrsm_("Left", "Upper", "Transpose", "Non-unit", &jb, &
@@ -184,14 +184,14 @@ extern "C" {
 	    i__1 = nb;
 	    for (j = 1; i__1 < 0 ? j >= i__2 : j <= i__2; j += i__1) {
 
-/*              Update and factorize the current diagonal block and test   
-                for non-positive-definiteness.   
+/*              Update and factorize the current diagonal block and test
+                for non-positive-definiteness.
 
    Computing MIN */
 		i__3 = nb, i__4 = *n - j + 1;
 		jb = min(i__3,i__4);
 		i__3 = j - 1;
-		dsyrk_("Lower", "No transpose", &jb, &i__3, &c_b13, &a_ref(j, 
+		dsyrk_("Lower", "No transpose", &jb, &i__3, &c_b13, &a_ref(j,
 			1), lda, &c_b14, &a_ref(j, j), lda);
 		dpotf2_("Lower", &jb, &a_ref(j, j), lda, info);
 		if (*info != 0) {
@@ -204,11 +204,11 @@ extern "C" {
 		    i__3 = *n - j - jb + 1;
 		    i__4 = j - 1;
 		    dgemm_("No transpose", "Transpose", &i__3, &jb, &i__4, &
-			    c_b13, &a_ref(j + jb, 1), lda, &a_ref(j, 1), lda, 
+			    c_b13, &a_ref(j + jb, 1), lda, &a_ref(j, 1), lda,
 			    &c_b14, &a_ref(j + jb, j), lda);
 		    i__3 = *n - j - jb + 1;
 		    dtrsm_("Right", "Lower", "Transpose", "Non-unit", &i__3, &
-			    jb, &c_b14, &a_ref(j, j), lda, &a_ref(j + jb, j), 
+			    jb, &c_b14, &a_ref(j, j), lda, &a_ref(j + jb, j),
 			    lda);
 		}
 /* L20: */
diff --git a/external/hypre/src/lapack/dpotrs.c b/external/hypre/src/lapack/dpotrs.c
index 7aabc84d..eef3b3b4 100644
--- a/external/hypre/src/lapack/dpotrs.c
+++ b/external/hypre/src/lapack/dpotrs.c
@@ -8,72 +8,72 @@ extern "C" {
 #include "f2c.h"
 #include "hypre_lapack.h"
 
-/* Subroutine */ integer dpotrs_(char *uplo, integer *n, integer *nrhs, 
+/* Subroutine */ integer dpotrs_(char *uplo, integer *n, integer *nrhs,
 	doublereal *a, integer *lda, doublereal *b, integer *ldb, integer *
 	info)
 {
-/*  -- LAPACK routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       March 31, 1993   
+/*  -- LAPACK routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       March 31, 1993
 
 
-    Purpose   
-    =======   
+    Purpose
+    =======
 
-    DPOTRS solves a system of linear equations A*X = B with a symmetric   
-    positive definite matrix A using the Cholesky factorization   
-    A = U**T*U or A = L*L**T computed by DPOTRF.   
+    DPOTRS solves a system of linear equations A*X = B with a symmetric
+    positive definite matrix A using the Cholesky factorization
+    A = U**T*U or A = L*L**T computed by DPOTRF.
 
-    Arguments   
-    =========   
+    Arguments
+    =========
 
-    UPLO    (input) CHARACTER*1   
-            = 'U':  Upper triangle of A is stored;   
-            = 'L':  Lower triangle of A is stored.   
+    UPLO    (input) CHARACTER*1
+            = 'U':  Upper triangle of A is stored;
+            = 'L':  Lower triangle of A is stored.
 
-    N       (input) INTEGER   
-            The order of the matrix A.  N >= 0.   
+    N       (input) INTEGER
+            The order of the matrix A.  N >= 0.
 
-    NRHS    (input) INTEGER   
-            The number of right hand sides, i.e., the number of columns   
-            of the matrix B.  NRHS >= 0.   
+    NRHS    (input) INTEGER
+            The number of right hand sides, i.e., the number of columns
+            of the matrix B.  NRHS >= 0.
 
-    A       (input) DOUBLE PRECISION array, dimension (LDA,N)   
-            The triangular factor U or L from the Cholesky factorization   
-            A = U**T*U or A = L*L**T, as computed by DPOTRF.   
+    A       (input) DOUBLE PRECISION array, dimension (LDA,N)
+            The triangular factor U or L from the Cholesky factorization
+            A = U**T*U or A = L*L**T, as computed by DPOTRF.
 
-    LDA     (input) INTEGER   
-            The leading dimension of the array A.  LDA >= max(1,N).   
+    LDA     (input) INTEGER
+            The leading dimension of the array A.  LDA >= max(1,N).
 
-    B       (input/output) DOUBLE PRECISION array, dimension (LDB,NRHS)   
-            On entry, the right hand side matrix B.   
-            On exit, the solution matrix X.   
+    B       (input/output) DOUBLE PRECISION array, dimension (LDB,NRHS)
+            On entry, the right hand side matrix B.
+            On exit, the solution matrix X.
 
-    LDB     (input) INTEGER   
-            The leading dimension of the array B.  LDB >= max(1,N).   
+    LDB     (input) INTEGER
+            The leading dimension of the array B.  LDB >= max(1,N).
 
-    INFO    (output) INTEGER   
-            = 0:  successful exit   
-            < 0:  if INFO = -i, the i-th argument had an illegal value   
+    INFO    (output) INTEGER
+            = 0:  successful exit
+            < 0:  if INFO = -i, the i-th argument had an illegal value
 
-    =====================================================================   
+    =====================================================================
 
 
-       Test the input parameters.   
+       Test the input parameters.
 
        Parameter adjustments */
     /* Table of constant values */
-    static doublereal c_b9 = 1.;
-    
+    doublereal c_b9 = 1.;
+
     /* System generated locals */
     integer a_dim1, a_offset, b_dim1, b_offset, i__1;
     /* Local variables */
     extern logical lsame_(const char *,const char *);
-    extern /* Subroutine */ integer dtrsm_(const char *,const char *,const char *,const char *, 
-	    integer *, integer *, doublereal *, doublereal *, integer *, 
+    extern /* Subroutine */ integer dtrsm_(const char *,const char *,const char *,const char *,
+	    integer *, integer *, doublereal *, doublereal *, integer *,
 	    doublereal *, integer *);
-    static logical upper;
+    logical upper;
     extern /* Subroutine */ integer xerbla_(const char *, integer *);
 
 
@@ -112,7 +112,7 @@ extern "C" {
 
     if (upper) {
 
-/*        Solve A*X = B where A = U'*U.   
+/*        Solve A*X = B where A = U'*U.
 
           Solve U'*X = B, overwriting B with X. */
 
@@ -125,7 +125,7 @@ extern "C" {
 		a[a_offset], lda, &b[b_offset], ldb);
     } else {
 
-/*        Solve A*X = B where A = L*L'.   
+/*        Solve A*X = B where A = L*L'.
 
           Solve L*X = B, overwriting B with X. */
 
diff --git a/external/hypre/src/lapack/dsteqr.c b/external/hypre/src/lapack/dsteqr.c
index 0c3163a3..0cf6063c 100644
--- a/external/hypre/src/lapack/dsteqr.c
+++ b/external/hypre/src/lapack/dsteqr.c
@@ -8,136 +8,136 @@ extern "C" {
 #include "f2c.h"
 #include "hypre_lapack.h"
 
-/* Subroutine */ integer dsteqr_(const char *compz, integer *n, doublereal *d__, 
-	doublereal *e, doublereal *z__, integer *ldz, doublereal *work, 
+/* Subroutine */ integer dsteqr_(const char *compz, integer *n, doublereal *d__,
+	doublereal *e, doublereal *z__, integer *ldz, doublereal *work,
 	integer *info)
 {
-/*  -- LAPACK routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       September 30, 1994   
-
-
-    Purpose   
-    =======   
-
-    DSTEQR computes all eigenvalues and, optionally, eigenvectors of a   
-    symmetric tridiagonal matrix using the implicit QL or QR method.   
-    The eigenvectors of a full or band symmetric matrix can also be found   
-    if DSYTRD or DSPTRD or DSBTRD has been used to reduce this matrix to   
-    tridiagonal form.   
-
-    Arguments   
-    =========   
-
-    COMPZ   (input) CHARACTER*1   
-            = 'N':  Compute eigenvalues only.   
-            = 'V':  Compute eigenvalues and eigenvectors of the original   
-                    symmetric matrix.  On entry, Z must contain the   
-                    orthogonal matrix used to reduce the original matrix   
-                    to tridiagonal form.   
-            = 'I':  Compute eigenvalues and eigenvectors of the   
-                    tridiagonal matrix.  Z is initialized to the identity   
-                    matrix.   
-
-    N       (input) INTEGER   
-            The order of the matrix.  N >= 0.   
-
-    D       (input/output) DOUBLE PRECISION array, dimension (N)   
-            On entry, the diagonal elements of the tridiagonal matrix.   
-            On exit, if INFO = 0, the eigenvalues in ascending order.   
-
-    E       (input/output) DOUBLE PRECISION array, dimension (N-1)   
-            On entry, the (n-1) subdiagonal elements of the tridiagonal   
-            matrix.   
-            On exit, E has been destroyed.   
-
-    Z       (input/output) DOUBLE PRECISION array, dimension (LDZ, N)   
-            On entry, if  COMPZ = 'V', then Z contains the orthogonal   
-            matrix used in the reduction to tridiagonal form.   
-            On exit, if INFO = 0, then if  COMPZ = 'V', Z contains the   
-            orthonormal eigenvectors of the original symmetric matrix,   
-            and if COMPZ = 'I', Z contains the orthonormal eigenvectors   
-            of the symmetric tridiagonal matrix.   
-            If COMPZ = 'N', then Z is not referenced.   
-
-    LDZ     (input) INTEGER   
-            The leading dimension of the array Z.  LDZ >= 1, and if   
-            eigenvectors are desired, then  LDZ >= max(1,N).   
-
-    WORK    (workspace) DOUBLE PRECISION array, dimension (max(1,2*N-2))   
-            If COMPZ = 'N', then WORK is not referenced.   
-
-    INFO    (output) INTEGER   
-            = 0:  successful exit   
-            < 0:  if INFO = -i, the i-th argument had an illegal value   
-            > 0:  the algorithm has failed to find all the eigenvalues in   
-                  a total of 30*N iterations; if INFO = i, then i   
-                  elements of E have not converged to zero; on exit, D   
-                  and E contain the elements of a symmetric tridiagonal   
-                  matrix which is orthogonally similar to the original   
-                  matrix.   
-
-    =====================================================================   
-
-
-       Test the input parameters.   
+/*  -- LAPACK routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       September 30, 1994
+
+
+    Purpose
+    =======
+
+    DSTEQR computes all eigenvalues and, optionally, eigenvectors of a
+    symmetric tridiagonal matrix using the implicit QL or QR method.
+    The eigenvectors of a full or band symmetric matrix can also be found
+    if DSYTRD or DSPTRD or DSBTRD has been used to reduce this matrix to
+    tridiagonal form.
+
+    Arguments
+    =========
+
+    COMPZ   (input) CHARACTER*1
+            = 'N':  Compute eigenvalues only.
+            = 'V':  Compute eigenvalues and eigenvectors of the original
+                    symmetric matrix.  On entry, Z must contain the
+                    orthogonal matrix used to reduce the original matrix
+                    to tridiagonal form.
+            = 'I':  Compute eigenvalues and eigenvectors of the
+                    tridiagonal matrix.  Z is initialized to the identity
+                    matrix.
+
+    N       (input) INTEGER
+            The order of the matrix.  N >= 0.
+
+    D       (input/output) DOUBLE PRECISION array, dimension (N)
+            On entry, the diagonal elements of the tridiagonal matrix.
+            On exit, if INFO = 0, the eigenvalues in ascending order.
+
+    E       (input/output) DOUBLE PRECISION array, dimension (N-1)
+            On entry, the (n-1) subdiagonal elements of the tridiagonal
+            matrix.
+            On exit, E has been destroyed.
+
+    Z       (input/output) DOUBLE PRECISION array, dimension (LDZ, N)
+            On entry, if  COMPZ = 'V', then Z contains the orthogonal
+            matrix used in the reduction to tridiagonal form.
+            On exit, if INFO = 0, then if  COMPZ = 'V', Z contains the
+            orthonormal eigenvectors of the original symmetric matrix,
+            and if COMPZ = 'I', Z contains the orthonormal eigenvectors
+            of the symmetric tridiagonal matrix.
+            If COMPZ = 'N', then Z is not referenced.
+
+    LDZ     (input) INTEGER
+            The leading dimension of the array Z.  LDZ >= 1, and if
+            eigenvectors are desired, then  LDZ >= max(1,N).
+
+    WORK    (workspace) DOUBLE PRECISION array, dimension (max(1,2*N-2))
+            If COMPZ = 'N', then WORK is not referenced.
+
+    INFO    (output) INTEGER
+            = 0:  successful exit
+            < 0:  if INFO = -i, the i-th argument had an illegal value
+            > 0:  the algorithm has failed to find all the eigenvalues in
+                  a total of 30*N iterations; if INFO = i, then i
+                  elements of E have not converged to zero; on exit, D
+                  and E contain the elements of a symmetric tridiagonal
+                  matrix which is orthogonally similar to the original
+                  matrix.
+
+    =====================================================================
+
+
+       Test the input parameters.
 
        Parameter adjustments */
     /* Table of constant values */
-    static doublereal c_b9 = 0.;
-    static doublereal c_b10 = 1.;
-    static integer c__0 = 0;
-    static integer c__1 = 1;
-    static integer c__2 = 2;
-    
+    doublereal c_b9 = 0.;
+    doublereal c_b10 = 1.;
+    integer c__0 = 0;
+    integer c__1 = 1;
+    integer c__2 = 2;
+
     /* System generated locals */
     integer z_dim1, z_offset, i__1, i__2;
     doublereal d__1, d__2;
     /* Builtin functions */
     doublereal d_sign(doublereal *, doublereal *);
     /* Local variables */
-    static integer lend, jtot;
-    extern /* Subroutine */ integer dlae2_(doublereal *, doublereal *, doublereal 
+    integer lend, jtot;
+    extern /* Subroutine */ integer dlae2_(doublereal *, doublereal *, doublereal
 	    *, doublereal *, doublereal *);
-    static doublereal b, c__, f, g;
-    static integer i__, j, k, l, m;
-    static doublereal p, r__, s;
+    doublereal b, c__, f, g;
+    integer i__, j, k, l, m;
+    doublereal p, r__, s;
     extern logical lsame_(const char *,const char *);
-    extern /* Subroutine */ integer dlasr_(const char *,const char *,const char *, integer *, 
+    extern /* Subroutine */ integer dlasr_(const char *,const char *,const char *, integer *,
 	    integer *, doublereal *, doublereal *, doublereal *, integer *);
-    static doublereal anorm;
-    extern /* Subroutine */ integer dswap_(integer *, doublereal *, integer *, 
+    doublereal anorm;
+    extern /* Subroutine */ integer dswap_(integer *, doublereal *, integer *,
 	    doublereal *, integer *);
-    static integer l1;
-    extern /* Subroutine */ integer dlaev2_(doublereal *, doublereal *, 
-	    doublereal *, doublereal *, doublereal *, doublereal *, 
+    integer l1;
+    extern /* Subroutine */ integer dlaev2_(doublereal *, doublereal *,
+	    doublereal *, doublereal *, doublereal *, doublereal *,
 	    doublereal *);
-    static integer lendm1, lendp1;
+    integer lendm1, lendp1;
     extern doublereal dlapy2_(doublereal *, doublereal *);
-    static integer ii;
+    integer ii;
     extern doublereal dlamch_(const char *);
-    static integer mm, iscale;
-    extern /* Subroutine */ integer dlascl_(const char *, integer *, integer *, 
-	    doublereal *, doublereal *, integer *, integer *, doublereal *, 
-	    integer *, integer *), dlaset_(const char *, integer *, integer 
+    integer mm, iscale;
+    extern /* Subroutine */ integer dlascl_(const char *, integer *, integer *,
+	    doublereal *, doublereal *, integer *, integer *, doublereal *,
+	    integer *, integer *), dlaset_(const char *, integer *, integer
 	    *, doublereal *, doublereal *, doublereal *, integer *);
-    static doublereal safmin;
-    extern /* Subroutine */ integer dlartg_(doublereal *, doublereal *, 
+    doublereal safmin;
+    extern /* Subroutine */ integer dlartg_(doublereal *, doublereal *,
 	    doublereal *, doublereal *, doublereal *);
-    static doublereal safmax;
+    doublereal safmax;
     extern /* Subroutine */ integer xerbla_(const char *, integer *);
     extern doublereal dlanst_(const char *, integer *, doublereal *, doublereal *);
-    extern /* Subroutine */ integer dlasrt_(const char *, integer *, doublereal *, 
+    extern /* Subroutine */ integer dlasrt_(const char *, integer *, doublereal *,
 	    integer *);
-    static integer lendsv;
-    static doublereal ssfmin;
-    static integer nmaxit, icompz;
-    static doublereal ssfmax;
-    static integer lm1, mm1, nm1;
-    static doublereal rt1, rt2, eps;
-    static integer lsv;
-    static doublereal tst, eps2;
+    integer lendsv;
+    doublereal ssfmin;
+    integer nmaxit, icompz;
+    doublereal ssfmax;
+    integer lm1, mm1, nm1;
+    doublereal rt1, rt2, eps;
+    integer lsv;
+    doublereal tst, eps2;
 #define z___ref(a_1,a_2) z__[(a_2)*z_dim1 + a_1]
 
 
@@ -197,7 +197,7 @@ extern "C" {
     ssfmax = sqrt(safmax) / 3.;
     ssfmin = sqrt(safmin) / eps2;
 
-/*     Compute the eigenvalues and eigenvectors of the tridiagonal   
+/*     Compute the eigenvalues and eigenvectors of the tridiagonal
        matrix. */
 
     if (icompz == 2) {
@@ -207,8 +207,8 @@ extern "C" {
     nmaxit = *n * 30;
     jtot = 0;
 
-/*     Determine where the matrix splits and choose QL or QR iteration   
-       for each block, according to whether top or bottom diagonal   
+/*     Determine where the matrix splits and choose QL or QR iteration
+       for each block, according to whether top or bottom diagonal
        element is smaller. */
 
     l1 = 1;
@@ -228,7 +228,7 @@ extern "C" {
 	    if (tst == 0.) {
 		goto L30;
 	    }
-	    if (tst <= sqrt((d__1 = d__[m], abs(d__1))) * sqrt((d__2 = d__[m 
+	    if (tst <= sqrt((d__1 = d__[m], abs(d__1))) * sqrt((d__2 = d__[m
 		    + 1], abs(d__2))) * eps) {
 		e[m] = 0.;
 		goto L30;
@@ -259,18 +259,18 @@ extern "C" {
     if (anorm > ssfmax) {
 	iscale = 1;
 	i__1 = lend - l + 1;
-	dlascl_("G", &c__0, &c__0, &anorm, &ssfmax, &i__1, &c__1, &d__[l], n, 
+	dlascl_("G", &c__0, &c__0, &anorm, &ssfmax, &i__1, &c__1, &d__[l], n,
 		info);
 	i__1 = lend - l;
-	dlascl_("G", &c__0, &c__0, &anorm, &ssfmax, &i__1, &c__1, &e[l], n, 
+	dlascl_("G", &c__0, &c__0, &anorm, &ssfmax, &i__1, &c__1, &e[l], n,
 		info);
     } else if (anorm < ssfmin) {
 	iscale = 2;
 	i__1 = lend - l + 1;
-	dlascl_("G", &c__0, &c__0, &anorm, &ssfmin, &i__1, &c__1, &d__[l], n, 
+	dlascl_("G", &c__0, &c__0, &anorm, &ssfmin, &i__1, &c__1, &d__[l], n,
 		info);
 	i__1 = lend - l;
-	dlascl_("G", &c__0, &c__0, &anorm, &ssfmin, &i__1, &c__1, &e[l], n, 
+	dlascl_("G", &c__0, &c__0, &anorm, &ssfmin, &i__1, &c__1, &e[l], n,
 		info);
     }
 
@@ -283,7 +283,7 @@ extern "C" {
 
     if (lend > l) {
 
-/*        QL Iteration   
+/*        QL Iteration
 
           Look for small subdiagonal element. */
 
@@ -295,7 +295,7 @@ extern "C" {
 /* Computing 2nd power */
 		d__2 = (d__1 = e[m], abs(d__1));
 		tst = d__2 * d__2;
-		if (tst <= eps2 * (d__1 = d__[m], abs(d__1)) * (d__2 = d__[m 
+		if (tst <= eps2 * (d__1 = d__[m], abs(d__1)) * (d__2 = d__[m
 			+ 1], abs(d__2)) + safmin) {
 		    goto L60;
 		}
@@ -314,7 +314,7 @@ extern "C" {
 	    goto L80;
 	}
 
-/*        If remaining matrix is 2-by-2, use DLAE2 or SLAEV2   
+/*        If remaining matrix is 2-by-2, use DLAE2 or SLAEV2
           to compute its eigensystem. */
 
 	if (m == l + 1) {
@@ -404,7 +404,7 @@ extern "C" {
 
     } else {
 
-/*        QR Iteration   
+/*        QR Iteration
 
           Look for small superdiagonal element. */
 
@@ -416,7 +416,7 @@ extern "C" {
 /* Computing 2nd power */
 		d__2 = (d__1 = e[m - 1], abs(d__1));
 		tst = d__2 * d__2;
-		if (tst <= eps2 * (d__1 = d__[m], abs(d__1)) * (d__2 = d__[m 
+		if (tst <= eps2 * (d__1 = d__[m], abs(d__1)) * (d__2 = d__[m
 			- 1], abs(d__2)) + safmin) {
 		    goto L110;
 		}
@@ -435,7 +435,7 @@ extern "C" {
 	    goto L130;
 	}
 
-/*        If remaining matrix is 2-by-2, use DLAE2 or SLAEV2   
+/*        If remaining matrix is 2-by-2, use DLAE2 or SLAEV2
           to compute its eigensystem. */
 
 	if (m == l - 1) {
@@ -531,21 +531,21 @@ extern "C" {
 L140:
     if (iscale == 1) {
 	i__1 = lendsv - lsv + 1;
-	dlascl_("G", &c__0, &c__0, &ssfmax, &anorm, &i__1, &c__1, &d__[lsv], 
+	dlascl_("G", &c__0, &c__0, &ssfmax, &anorm, &i__1, &c__1, &d__[lsv],
 		n, info);
 	i__1 = lendsv - lsv;
-	dlascl_("G", &c__0, &c__0, &ssfmax, &anorm, &i__1, &c__1, &e[lsv], n, 
+	dlascl_("G", &c__0, &c__0, &ssfmax, &anorm, &i__1, &c__1, &e[lsv], n,
 		info);
     } else if (iscale == 2) {
 	i__1 = lendsv - lsv + 1;
-	dlascl_("G", &c__0, &c__0, &ssfmin, &anorm, &i__1, &c__1, &d__[lsv], 
+	dlascl_("G", &c__0, &c__0, &ssfmin, &anorm, &i__1, &c__1, &d__[lsv],
 		n, info);
 	i__1 = lendsv - lsv;
-	dlascl_("G", &c__0, &c__0, &ssfmin, &anorm, &i__1, &c__1, &e[lsv], n, 
+	dlascl_("G", &c__0, &c__0, &ssfmin, &anorm, &i__1, &c__1, &e[lsv], n,
 		info);
     }
 
-/*     Check for no convergence to an eigenvalue after a total   
+/*     Check for no convergence to an eigenvalue after a total
        of N*MAXIT iterations. */
 
     if (jtot < nmaxit) {
diff --git a/external/hypre/src/lapack/dsterf.c b/external/hypre/src/lapack/dsterf.c
index 80d25f58..7daab0ba 100644
--- a/external/hypre/src/lapack/dsterf.c
+++ b/external/hypre/src/lapack/dsterf.c
@@ -8,87 +8,87 @@ extern "C" {
 #include "f2c.h"
 #include "hypre_lapack.h"
 
-/* Subroutine */ integer dsterf_(integer *n, doublereal *d__, doublereal *e, 
+/* Subroutine */ integer dsterf_(integer *n, doublereal *d__, doublereal *e,
 	integer *info)
 {
-/*  -- LAPACK routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       June 30, 1999   
+/*  -- LAPACK routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       June 30, 1999
 
 
-    Purpose   
-    =======   
+    Purpose
+    =======
 
-    DSTERF computes all eigenvalues of a symmetric tridiagonal matrix   
-    using the Pal-Walker-Kahan variant of the QL or QR algorithm.   
+    DSTERF computes all eigenvalues of a symmetric tridiagonal matrix
+    using the Pal-Walker-Kahan variant of the QL or QR algorithm.
 
-    Arguments   
-    =========   
+    Arguments
+    =========
 
-    N       (input) INTEGER   
-            The order of the matrix.  N >= 0.   
+    N       (input) INTEGER
+            The order of the matrix.  N >= 0.
 
-    D       (input/output) DOUBLE PRECISION array, dimension (N)   
-            On entry, the n diagonal elements of the tridiagonal matrix.   
-            On exit, if INFO = 0, the eigenvalues in ascending order.   
+    D       (input/output) DOUBLE PRECISION array, dimension (N)
+            On entry, the n diagonal elements of the tridiagonal matrix.
+            On exit, if INFO = 0, the eigenvalues in ascending order.
 
-    E       (input/output) DOUBLE PRECISION array, dimension (N-1)   
-            On entry, the (n-1) subdiagonal elements of the tridiagonal   
-            matrix.   
-            On exit, E has been destroyed.   
+    E       (input/output) DOUBLE PRECISION array, dimension (N-1)
+            On entry, the (n-1) subdiagonal elements of the tridiagonal
+            matrix.
+            On exit, E has been destroyed.
 
-    INFO    (output) INTEGER   
-            = 0:  successful exit   
-            < 0:  if INFO = -i, the i-th argument had an illegal value   
-            > 0:  the algorithm failed to find all of the eigenvalues in   
-                  a total of 30*N iterations; if INFO = i, then i   
-                  elements of E have not converged to zero.   
+    INFO    (output) INTEGER
+            = 0:  successful exit
+            < 0:  if INFO = -i, the i-th argument had an illegal value
+            > 0:  the algorithm failed to find all of the eigenvalues in
+                  a total of 30*N iterations; if INFO = i, then i
+                  elements of E have not converged to zero.
 
-    =====================================================================   
+    =====================================================================
 
 
-       Test the input parameters.   
+       Test the input parameters.
 
        Parameter adjustments */
     /* Table of constant values */
-    static integer c__0 = 0;
-    static integer c__1 = 1;
-    static doublereal c_b32 = 1.;
-    
+    integer c__0 = 0;
+    integer c__1 = 1;
+    doublereal c_b32 = 1.;
+
     /* System generated locals */
     integer i__1;
     doublereal d__1, d__2, d__3;
     /* Builtin functions */
     doublereal d_sign(doublereal *, doublereal *);
     /* Local variables */
-    static doublereal oldc;
-    static integer lend, jtot;
-    extern /* Subroutine */ integer dlae2_(doublereal *, doublereal *, doublereal 
+    doublereal oldc;
+    integer lend, jtot;
+    extern /* Subroutine */ integer dlae2_(doublereal *, doublereal *, doublereal
 	    *, doublereal *, doublereal *);
-    static doublereal c__;
-    static integer i__, l, m;
-    static doublereal p, gamma, r__, s, alpha, sigma, anorm;
-    static integer l1;
+    doublereal c__;
+    integer i__, l, m;
+    doublereal p, gamma, r__, s, alpha, sigma, anorm;
+    integer l1;
     extern doublereal dlapy2_(doublereal *, doublereal *);
-    static doublereal bb;
+    doublereal bb;
     extern doublereal dlamch_(const char *);
-    static integer iscale;
-    extern /* Subroutine */ integer dlascl_(const char *, integer *, integer *, 
-	    doublereal *, doublereal *, integer *, integer *, doublereal *, 
+    integer iscale;
+    extern /* Subroutine */ integer dlascl_(const char *, integer *, integer *,
+	    doublereal *, doublereal *, integer *, integer *, doublereal *,
 	    integer *, integer *);
-    static doublereal oldgam, safmin;
+    doublereal oldgam, safmin;
     extern /* Subroutine */ integer xerbla_(const char *, integer *);
-    static doublereal safmax;
+    doublereal safmax;
     extern doublereal dlanst_(const char *, integer *, doublereal *, doublereal *);
-    extern /* Subroutine */ integer dlasrt_(const char *, integer *, doublereal *, 
+    extern /* Subroutine */ integer dlasrt_(const char *, integer *, doublereal *,
 	    integer *);
-    static integer lendsv;
-    static doublereal ssfmin;
-    static integer nmaxit;
-    static doublereal ssfmax, rt1, rt2, eps, rte;
-    static integer lsv;
-    static doublereal eps2;
+    integer lendsv;
+    doublereal ssfmin;
+    integer nmaxit;
+    doublereal ssfmax, rt1, rt2, eps, rte;
+    integer lsv;
+    doublereal eps2;
 
 
     --e;
@@ -126,8 +126,8 @@ extern "C" {
     sigma = 0.;
     jtot = 0;
 
-/*     Determine where the matrix splits and choose QL or QR iteration   
-       for each block, according to whether top or bottom diagonal   
+/*     Determine where the matrix splits and choose QL or QR iteration
+       for each block, according to whether top or bottom diagonal
        element is smaller. */
 
     l1 = 1;
@@ -141,7 +141,7 @@ extern "C" {
     }
     i__1 = *n - 1;
     for (m = l1; m <= i__1; ++m) {
-	if ((d__3 = e[m], abs(d__3)) <= sqrt((d__1 = d__[m], abs(d__1))) * 
+	if ((d__3 = e[m], abs(d__3)) <= sqrt((d__1 = d__[m], abs(d__1))) *
 		sqrt((d__2 = d__[m + 1], abs(d__2))) * eps) {
 	    e[m] = 0.;
 	    goto L30;
@@ -168,18 +168,18 @@ extern "C" {
     if (anorm > ssfmax) {
 	iscale = 1;
 	i__1 = lend - l + 1;
-	dlascl_("G", &c__0, &c__0, &anorm, &ssfmax, &i__1, &c__1, &d__[l], n, 
+	dlascl_("G", &c__0, &c__0, &anorm, &ssfmax, &i__1, &c__1, &d__[l], n,
 		info);
 	i__1 = lend - l;
-	dlascl_("G", &c__0, &c__0, &anorm, &ssfmax, &i__1, &c__1, &e[l], n, 
+	dlascl_("G", &c__0, &c__0, &anorm, &ssfmax, &i__1, &c__1, &e[l], n,
 		info);
     } else if (anorm < ssfmin) {
 	iscale = 2;
 	i__1 = lend - l + 1;
-	dlascl_("G", &c__0, &c__0, &anorm, &ssfmin, &i__1, &c__1, &d__[l], n, 
+	dlascl_("G", &c__0, &c__0, &anorm, &ssfmin, &i__1, &c__1, &d__[l], n,
 		info);
 	i__1 = lend - l;
-	dlascl_("G", &c__0, &c__0, &anorm, &ssfmin, &i__1, &c__1, &e[l], n, 
+	dlascl_("G", &c__0, &c__0, &anorm, &ssfmin, &i__1, &c__1, &e[l], n,
 		info);
     }
 
@@ -200,7 +200,7 @@ extern "C" {
 
     if (lend >= l) {
 
-/*        QL Iteration   
+/*        QL Iteration
 
           Look for small subdiagonal element. */
 
@@ -208,7 +208,7 @@ extern "C" {
 	if (l != lend) {
 	    i__1 = lend - 1;
 	    for (m = l; m <= i__1; ++m) {
-		if ((d__2 = e[m], abs(d__2)) <= eps2 * (d__1 = d__[m] * d__[m 
+		if ((d__2 = e[m], abs(d__2)) <= eps2 * (d__1 = d__[m] * d__[m
 			+ 1], abs(d__1))) {
 		    goto L70;
 		}
@@ -226,7 +226,7 @@ extern "C" {
 	    goto L90;
 	}
 
-/*        If remaining matrix is 2 by 2, use DLAE2 to compute its   
+/*        If remaining matrix is 2 by 2, use DLAE2 to compute its
           eigenvalues. */
 
 	if (m == l + 1) {
@@ -300,14 +300,14 @@ extern "C" {
 
     } else {
 
-/*        QR Iteration   
+/*        QR Iteration
 
           Look for small superdiagonal element. */
 
 L100:
 	i__1 = lend + 1;
 	for (m = l; m >= i__1; --m) {
-	    if ((d__2 = e[m - 1], abs(d__2)) <= eps2 * (d__1 = d__[m] * d__[m 
+	    if ((d__2 = e[m - 1], abs(d__2)) <= eps2 * (d__1 = d__[m] * d__[m
 		    - 1], abs(d__1))) {
 		goto L120;
 	    }
@@ -324,7 +324,7 @@ extern "C" {
 	    goto L140;
 	}
 
-/*        If remaining matrix is 2 by 2, use DLAE2 to compute its   
+/*        If remaining matrix is 2 by 2, use DLAE2 to compute its
           eigenvalues. */
 
 	if (m == l - 1) {
@@ -403,16 +403,16 @@ extern "C" {
 L150:
     if (iscale == 1) {
 	i__1 = lendsv - lsv + 1;
-	dlascl_("G", &c__0, &c__0, &ssfmax, &anorm, &i__1, &c__1, &d__[lsv], 
+	dlascl_("G", &c__0, &c__0, &ssfmax, &anorm, &i__1, &c__1, &d__[lsv],
 		n, info);
     }
     if (iscale == 2) {
 	i__1 = lendsv - lsv + 1;
-	dlascl_("G", &c__0, &c__0, &ssfmin, &anorm, &i__1, &c__1, &d__[lsv], 
+	dlascl_("G", &c__0, &c__0, &ssfmin, &anorm, &i__1, &c__1, &d__[lsv],
 		n, info);
     }
 
-/*     Check for no convergence to an eigenvalue after a total   
+/*     Check for no convergence to an eigenvalue after a total
        of N*MAXIT iterations. */
 
     if (jtot < nmaxit) {
diff --git a/external/hypre/src/lapack/dsyev.c b/external/hypre/src/lapack/dsyev.c
index 5ac2fca9..937115ce 100644
--- a/external/hypre/src/lapack/dsyev.c
+++ b/external/hypre/src/lapack/dsyev.c
@@ -9,127 +9,127 @@ extern "C" {
 #include "hypre_lapack.h"
 
 /* Subroutine */ integer dsyev_(const char *jobz,const char *uplo, integer *n, doublereal *a,
-	 integer *lda, doublereal *w, doublereal *work, integer *lwork, 
+	 integer *lda, doublereal *w, doublereal *work, integer *lwork,
 	integer *info)
 {
-/*  -- LAPACK driver routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       June 30, 1999   
+/*  -- LAPACK driver routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       June 30, 1999
 
 
-    Purpose   
-    =======   
+    Purpose
+    =======
 
-    DSYEV computes all eigenvalues and, optionally, eigenvectors of a   
-    real symmetric matrix A.   
+    DSYEV computes all eigenvalues and, optionally, eigenvectors of a
+    real symmetric matrix A.
 
-    Arguments   
-    =========   
+    Arguments
+    =========
 
-    JOBZ    (input) CHARACTER*1   
-            = 'N':  Compute eigenvalues only;   
-            = 'V':  Compute eigenvalues and eigenvectors.   
+    JOBZ    (input) CHARACTER*1
+            = 'N':  Compute eigenvalues only;
+            = 'V':  Compute eigenvalues and eigenvectors.
 
-    UPLO    (input) CHARACTER*1   
-            = 'U':  Upper triangle of A is stored;   
-            = 'L':  Lower triangle of A is stored.   
+    UPLO    (input) CHARACTER*1
+            = 'U':  Upper triangle of A is stored;
+            = 'L':  Lower triangle of A is stored.
 
-    N       (input) INTEGER   
-            The order of the matrix A.  N >= 0.   
+    N       (input) INTEGER
+            The order of the matrix A.  N >= 0.
 
-    A       (input/output) DOUBLE PRECISION array, dimension (LDA, N)   
-            On entry, the symmetric matrix A.  If UPLO = 'U', the   
-            leading N-by-N upper triangular part of A contains the   
-            upper triangular part of the matrix A.  If UPLO = 'L',   
-            the leading N-by-N lower triangular part of A contains   
-            the lower triangular part of the matrix A.   
-            On exit, if JOBZ = 'V', then if INFO = 0, A contains the   
-            orthonormal eigenvectors of the matrix A.   
-            If JOBZ = 'N', then on exit the lower triangle (if UPLO='L')   
-            or the upper triangle (if UPLO='U') of A, including the   
-            diagonal, is destroyed.   
+    A       (input/output) DOUBLE PRECISION array, dimension (LDA, N)
+            On entry, the symmetric matrix A.  If UPLO = 'U', the
+            leading N-by-N upper triangular part of A contains the
+            upper triangular part of the matrix A.  If UPLO = 'L',
+            the leading N-by-N lower triangular part of A contains
+            the lower triangular part of the matrix A.
+            On exit, if JOBZ = 'V', then if INFO = 0, A contains the
+            orthonormal eigenvectors of the matrix A.
+            If JOBZ = 'N', then on exit the lower triangle (if UPLO='L')
+            or the upper triangle (if UPLO='U') of A, including the
+            diagonal, is destroyed.
 
-    LDA     (input) INTEGER   
-            The leading dimension of the array A.  LDA >= max(1,N).   
+    LDA     (input) INTEGER
+            The leading dimension of the array A.  LDA >= max(1,N).
 
-    W       (output) DOUBLE PRECISION array, dimension (N)   
-            If INFO = 0, the eigenvalues in ascending order.   
+    W       (output) DOUBLE PRECISION array, dimension (N)
+            If INFO = 0, the eigenvalues in ascending order.
 
-    WORK    (workspace/output) DOUBLE PRECISION array, dimension (LWORK)   
-            On exit, if INFO = 0, WORK(1) returns the optimal LWORK.   
+    WORK    (workspace/output) DOUBLE PRECISION array, dimension (LWORK)
+            On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
 
-    LWORK   (input) INTEGER   
-            The length of the array WORK.  LWORK >= max(1,3*N-1).   
-            For optimal efficiency, LWORK >= (NB+2)*N,   
-            where NB is the blocksize for DSYTRD returned by ILAENV.   
+    LWORK   (input) INTEGER
+            The length of the array WORK.  LWORK >= max(1,3*N-1).
+            For optimal efficiency, LWORK >= (NB+2)*N,
+            where NB is the blocksize for DSYTRD returned by ILAENV.
 
-            If LWORK = -1, then a workspace query is assumed; the routine   
-            only calculates the optimal size of the WORK array, returns   
-            this value as the first entry of the WORK array, and no error   
-            message related to LWORK is issued by XERBLA.   
+            If LWORK = -1, then a workspace query is assumed; the routine
+            only calculates the optimal size of the WORK array, returns
+            this value as the first entry of the WORK array, and no error
+            message related to LWORK is issued by XERBLA.
 
-    INFO    (output) INTEGER   
-            = 0:  successful exit   
-            < 0:  if INFO = -i, the i-th argument had an illegal value   
-            > 0:  if INFO = i, the algorithm failed to converge; i   
-                  off-diagonal elements of an intermediate tridiagonal   
-                  form did not converge to zero.   
+    INFO    (output) INTEGER
+            = 0:  successful exit
+            < 0:  if INFO = -i, the i-th argument had an illegal value
+            > 0:  if INFO = i, the algorithm failed to converge; i
+                  off-diagonal elements of an intermediate tridiagonal
+                  form did not converge to zero.
 
-    =====================================================================   
+    =====================================================================
 
 
-       Test the input parameters.   
+       Test the input parameters.
 
        Parameter adjustments */
     /* Table of constant values */
-    static integer c__1 = 1;
-    static integer c_n1 = -1;
-    static integer c__0 = 0;
-    static doublereal c_b17 = 1.;
-    
+    integer c__1 = 1;
+    integer c_n1 = -1;
+    integer c__0 = 0;
+    doublereal c_b17 = 1.;
+
     /* System generated locals */
     integer a_dim1, a_offset, i__1, i__2;
     doublereal d__1;
     /* Local variables */
-    static integer inde;
-    static doublereal anrm;
-    static integer imax;
-    static doublereal rmin, rmax;
-/***static integer lopt;***/
-    extern /* Subroutine */ integer dscal_(integer *, doublereal *, doublereal *, 
+    integer inde;
+    doublereal anrm;
+    integer imax;
+    doublereal rmin, rmax;
+/*** integer lopt;***/
+    extern /* Subroutine */ integer dscal_(integer *, doublereal *, doublereal *,
 	    integer *);
-    static doublereal sigma;
+    doublereal sigma;
     extern logical lsame_(const char *,const char *);
-    static integer iinfo;
-    static logical lower, wantz;
-    static integer nb;
+    integer iinfo;
+    logical lower, wantz;
+    integer nb;
     extern doublereal dlamch_(const char *);
-    static integer iscale;
-    extern /* Subroutine */ integer dlascl_(const char *, integer *, integer *, 
-	    doublereal *, doublereal *, integer *, integer *, doublereal *, 
+    integer iscale;
+    extern /* Subroutine */ integer dlascl_(const char *, integer *, integer *,
+	    doublereal *, doublereal *, integer *, integer *, doublereal *,
 	    integer *, integer *);
-    static doublereal safmin;
-    extern integer ilaenv_(integer *,const char *,const char *, integer *, integer *, 
+    doublereal safmin;
+    extern integer ilaenv_(integer *,const char *,const char *, integer *, integer *,
 	    integer *, integer *, ftnlen, ftnlen);
     extern /* Subroutine */ integer xerbla_(const char *, integer *);
-    static doublereal bignum;
-    static integer indtau;
+    doublereal bignum;
+    integer indtau;
     extern /* Subroutine */ integer dsterf_(integer *, doublereal *, doublereal *,
 	     integer *);
-    extern doublereal dlansy_(const char *,const char *, integer *, doublereal *, 
+    extern doublereal dlansy_(const char *,const char *, integer *, doublereal *,
 	    integer *, doublereal *);
-    static integer indwrk;
-    extern /* Subroutine */ integer dorgtr_(const char *, integer *, doublereal *, 
-	    integer *, doublereal *, doublereal *, integer *, integer *), dsteqr_(const char *, integer *, doublereal *, doublereal *, 
-	    doublereal *, integer *, doublereal *, integer *), 
-	    dsytrd_(const char *, integer *, doublereal *, integer *, doublereal *, 
+    integer indwrk;
+    extern /* Subroutine */ integer dorgtr_(const char *, integer *, doublereal *,
+	    integer *, doublereal *, doublereal *, integer *, integer *), dsteqr_(const char *, integer *, doublereal *, doublereal *,
+	    doublereal *, integer *, doublereal *, integer *),
+	    dsytrd_(const char *, integer *, doublereal *, integer *, doublereal *,
 	    doublereal *, doublereal *, doublereal *, integer *, integer *);
-    static integer llwork;
-    static doublereal smlnum;
-    static integer lwkopt;
-    static logical lquery;
-    static doublereal eps;
+    integer llwork;
+    doublereal smlnum;
+    integer lwkopt;
+    logical lquery;
+    doublereal eps;
 #define a_ref(a_1,a_2) a[(a_2)*a_dim1 + a_1]
 
 
@@ -215,7 +215,7 @@ extern "C" {
 	sigma = rmax / anrm;
     }
     if (iscale == 1) {
-	dlascl_(uplo, &c__0, &c__0, &c_b17, &sigma, n, n, &a[a_offset], lda, 
+	dlascl_(uplo, &c__0, &c__0, &c_b17, &sigma, n, n, &a[a_offset], lda,
 		info);
     }
 
@@ -229,7 +229,7 @@ extern "C" {
 	    work[indwrk], &llwork, &iinfo);
 /***lopt = (integer) ((*n << 1) + work[indwrk]);***/
 
-/*     For eigenvalues only, call DSTERF.  For eigenvectors, first call   
+/*     For eigenvalues only, call DSTERF.  For eigenvectors, first call
        DORGTR to generate the orthogonal matrix, then call DSTEQR. */
 
     if (! wantz) {
diff --git a/external/hypre/src/lapack/dsygs2.c b/external/hypre/src/lapack/dsygs2.c
index af4c4ec4..66c1aff0 100644
--- a/external/hypre/src/lapack/dsygs2.c
+++ b/external/hypre/src/lapack/dsygs2.c
@@ -8,103 +8,103 @@ extern "C" {
 #include "f2c.h"
 #include "hypre_lapack.h"
 
-/* Subroutine */ integer dsygs2_(integer *itype,const char *uplo, integer *n, 
+/* Subroutine */ integer dsygs2_(integer *itype,const char *uplo, integer *n,
 	doublereal *a, integer *lda, doublereal *b, integer *ldb, integer *
 	info)
 {
-/*  -- LAPACK routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       February 29, 1992   
+/*  -- LAPACK routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       February 29, 1992
 
 
-    Purpose   
-    =======   
+    Purpose
+    =======
 
-    DSYGS2 reduces a real symmetric-definite generalized eigenproblem   
-    to standard form.   
+    DSYGS2 reduces a real symmetric-definite generalized eigenproblem
+    to standard form.
 
-    If ITYPE = 1, the problem is A*x = lambda*B*x,   
-    and A is overwritten by inv(U')*A*inv(U) or inv(L)*A*inv(L')   
+    If ITYPE = 1, the problem is A*x = lambda*B*x,
+    and A is overwritten by inv(U')*A*inv(U) or inv(L)*A*inv(L')
 
-    If ITYPE = 2 or 3, the problem is A*B*x = lambda*x or   
-    B*A*x = lambda*x, and A is overwritten by U*A*U` or L'*A*L.   
+    If ITYPE = 2 or 3, the problem is A*B*x = lambda*x or
+    B*A*x = lambda*x, and A is overwritten by U*A*U` or L'*A*L.
 
-    B must have been previously factorized as U'*U or L*L' by DPOTRF.   
+    B must have been previously factorized as U'*U or L*L' by DPOTRF.
 
-    Arguments   
-    =========   
+    Arguments
+    =========
 
-    ITYPE   (input) INTEGER   
-            = 1: compute inv(U')*A*inv(U) or inv(L)*A*inv(L');   
-            = 2 or 3: compute U*A*U' or L'*A*L.   
+    ITYPE   (input) INTEGER
+            = 1: compute inv(U')*A*inv(U) or inv(L)*A*inv(L');
+            = 2 or 3: compute U*A*U' or L'*A*L.
 
-    UPLO    (input) CHARACTER   
-            Specifies whether the upper or lower triangular part of the   
-            symmetric matrix A is stored, and how B has been factorized.   
-            = 'U':  Upper triangular   
-            = 'L':  Lower triangular   
+    UPLO    (input) CHARACTER
+            Specifies whether the upper or lower triangular part of the
+            symmetric matrix A is stored, and how B has been factorized.
+            = 'U':  Upper triangular
+            = 'L':  Lower triangular
 
-    N       (input) INTEGER   
-            The order of the matrices A and B.  N >= 0.   
+    N       (input) INTEGER
+            The order of the matrices A and B.  N >= 0.
 
-    A       (input/output) DOUBLE PRECISION array, dimension (LDA,N)   
-            On entry, the symmetric matrix A.  If UPLO = 'U', the leading   
-            n by n upper triangular part of A contains the upper   
-            triangular part of the matrix A, and the strictly lower   
-            triangular part of A is not referenced.  If UPLO = 'L', the   
-            leading n by n lower triangular part of A contains the lower   
-            triangular part of the matrix A, and the strictly upper   
-            triangular part of A is not referenced.   
+    A       (input/output) DOUBLE PRECISION array, dimension (LDA,N)
+            On entry, the symmetric matrix A.  If UPLO = 'U', the leading
+            n by n upper triangular part of A contains the upper
+            triangular part of the matrix A, and the strictly lower
+            triangular part of A is not referenced.  If UPLO = 'L', the
+            leading n by n lower triangular part of A contains the lower
+            triangular part of the matrix A, and the strictly upper
+            triangular part of A is not referenced.
 
-            On exit, if INFO = 0, the transformed matrix, stored in the   
-            same format as A.   
+            On exit, if INFO = 0, the transformed matrix, stored in the
+            same format as A.
 
-    LDA     (input) INTEGER   
-            The leading dimension of the array A.  LDA >= max(1,N).   
+    LDA     (input) INTEGER
+            The leading dimension of the array A.  LDA >= max(1,N).
 
-    B       (input) DOUBLE PRECISION array, dimension (LDB,N)   
-            The triangular factor from the Cholesky factorization of B,   
-            as returned by DPOTRF.   
+    B       (input) DOUBLE PRECISION array, dimension (LDB,N)
+            The triangular factor from the Cholesky factorization of B,
+            as returned by DPOTRF.
 
-    LDB     (input) INTEGER   
-            The leading dimension of the array B.  LDB >= max(1,N).   
+    LDB     (input) INTEGER
+            The leading dimension of the array B.  LDB >= max(1,N).
 
-    INFO    (output) INTEGER   
-            = 0:  successful exit.   
-            < 0:  if INFO = -i, the i-th argument had an illegal value.   
+    INFO    (output) INTEGER
+            = 0:  successful exit.
+            < 0:  if INFO = -i, the i-th argument had an illegal value.
 
-    =====================================================================   
+    =====================================================================
 
 
-       Test the input parameters.   
+       Test the input parameters.
 
        Parameter adjustments */
     /* Table of constant values */
-    static doublereal c_b6 = -1.;
-    static integer c__1 = 1;
-    static doublereal c_b27 = 1.;
-    
+    doublereal c_b6 = -1.;
+    integer c__1 = 1;
+    doublereal c_b27 = 1.;
+
     /* System generated locals */
     integer a_dim1, a_offset, b_dim1, b_offset, i__1, i__2;
     doublereal d__1;
     /* Local variables */
-    extern /* Subroutine */ integer dsyr2_(const char *, integer *, doublereal *, 
-	    doublereal *, integer *, doublereal *, integer *, doublereal *, 
+    extern /* Subroutine */ integer dsyr2_(const char *, integer *, doublereal *,
+	    doublereal *, integer *, doublereal *, integer *, doublereal *,
 	    integer *);
-    static integer k;
-    extern /* Subroutine */ integer dscal_(integer *, doublereal *, doublereal *, 
+    integer k;
+    extern /* Subroutine */ integer dscal_(integer *, doublereal *, doublereal *,
 	    integer *);
     extern logical lsame_(const char *,const char *);
-    extern /* Subroutine */ integer daxpy_(integer *, doublereal *, doublereal *, 
+    extern /* Subroutine */ integer daxpy_(integer *, doublereal *, doublereal *,
 	    integer *, doublereal *, integer *);
-    static logical upper;
-    extern /* Subroutine */ integer dtrmv_(const char *,const char *,const char *, integer *, 
-	    doublereal *, integer *, doublereal *, integer *), dtrsv_(const char *,const char *,const char *, integer *, doublereal *, 
+    logical upper;
+    extern /* Subroutine */ integer dtrmv_(const char *,const char *,const char *, integer *,
+	    doublereal *, integer *, doublereal *, integer *), dtrsv_(const char *,const char *,const char *, integer *, doublereal *,
 	    integer *, doublereal *, integer *);
-    static doublereal ct;
+    doublereal ct;
     extern /* Subroutine */ integer xerbla_(const char *, integer *);
-    static doublereal akk, bkk;
+    doublereal akk, bkk;
 #define a_ref(a_1,a_2) a[(a_2)*a_dim1 + a_1]
 #define b_ref(a_1,a_2) b[(a_2)*b_dim1 + a_1]
 
@@ -193,16 +193,16 @@ extern "C" {
 		    dscal_(&i__2, &d__1, &a_ref(k + 1, k), &c__1);
 		    ct = akk * -.5;
 		    i__2 = *n - k;
-		    daxpy_(&i__2, &ct, &b_ref(k + 1, k), &c__1, &a_ref(k + 1, 
+		    daxpy_(&i__2, &ct, &b_ref(k + 1, k), &c__1, &a_ref(k + 1,
 			    k), &c__1);
 		    i__2 = *n - k;
 		    dsyr2_(uplo, &i__2, &c_b6, &a_ref(k + 1, k), &c__1, &
 			    b_ref(k + 1, k), &c__1, &a_ref(k + 1, k + 1), lda);
 		    i__2 = *n - k;
-		    daxpy_(&i__2, &ct, &b_ref(k + 1, k), &c__1, &a_ref(k + 1, 
+		    daxpy_(&i__2, &ct, &b_ref(k + 1, k), &c__1, &a_ref(k + 1,
 			    k), &c__1);
 		    i__2 = *n - k;
-		    dtrsv_(uplo, "No transpose", "Non-unit", &i__2, &b_ref(k 
+		    dtrsv_(uplo, "No transpose", "Non-unit", &i__2, &b_ref(k
 			    + 1, k + 1), ldb, &a_ref(k + 1, k), &c__1);
 		}
 /* L20: */
@@ -221,7 +221,7 @@ extern "C" {
 		akk = a_ref(k, k);
 		bkk = b_ref(k, k);
 		i__2 = k - 1;
-		dtrmv_(uplo, "No transpose", "Non-unit", &i__2, &b[b_offset], 
+		dtrmv_(uplo, "No transpose", "Non-unit", &i__2, &b[b_offset],
 			ldb, &a_ref(1, k), &c__1);
 		ct = akk * .5;
 		i__2 = k - 1;
@@ -250,13 +250,13 @@ extern "C" {
 		akk = a_ref(k, k);
 		bkk = b_ref(k, k);
 		i__2 = k - 1;
-		dtrmv_(uplo, "Transpose", "Non-unit", &i__2, &b[b_offset], 
+		dtrmv_(uplo, "Transpose", "Non-unit", &i__2, &b[b_offset],
 			ldb, &a_ref(k, 1), lda);
 		ct = akk * .5;
 		i__2 = k - 1;
 		daxpy_(&i__2, &ct, &b_ref(k, 1), ldb, &a_ref(k, 1), lda);
 		i__2 = k - 1;
-		dsyr2_(uplo, &i__2, &c_b27, &a_ref(k, 1), lda, &b_ref(k, 1), 
+		dsyr2_(uplo, &i__2, &c_b27, &a_ref(k, 1), lda, &b_ref(k, 1),
 			ldb, &a[a_offset], lda);
 		i__2 = k - 1;
 		daxpy_(&i__2, &ct, &b_ref(k, 1), ldb, &a_ref(k, 1), lda);
diff --git a/external/hypre/src/lapack/dsygst.c b/external/hypre/src/lapack/dsygst.c
index 17b40629..6e101d16 100644
--- a/external/hypre/src/lapack/dsygst.c
+++ b/external/hypre/src/lapack/dsygst.c
@@ -8,110 +8,110 @@ extern "C" {
 #include "f2c.h"
 #include "hypre_lapack.h"
 
-/* Subroutine */ integer dsygst_(integer *itype,const char *uplo, integer *n, 
+/* Subroutine */ integer dsygst_(integer *itype,const char *uplo, integer *n,
 	doublereal *a, integer *lda, doublereal *b, integer *ldb, integer *
 	info)
 {
-/*  -- LAPACK routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       September 30, 1994   
+/*  -- LAPACK routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       September 30, 1994
 
 
-    Purpose   
-    =======   
+    Purpose
+    =======
 
-    DSYGST reduces a real symmetric-definite generalized eigenproblem   
-    to standard form.   
+    DSYGST reduces a real symmetric-definite generalized eigenproblem
+    to standard form.
 
-    If ITYPE = 1, the problem is A*x = lambda*B*x,   
-    and A is overwritten by inv(U**T)*A*inv(U) or inv(L)*A*inv(L**T)   
+    If ITYPE = 1, the problem is A*x = lambda*B*x,
+    and A is overwritten by inv(U**T)*A*inv(U) or inv(L)*A*inv(L**T)
 
-    If ITYPE = 2 or 3, the problem is A*B*x = lambda*x or   
-    B*A*x = lambda*x, and A is overwritten by U*A*U**T or L**T*A*L.   
+    If ITYPE = 2 or 3, the problem is A*B*x = lambda*x or
+    B*A*x = lambda*x, and A is overwritten by U*A*U**T or L**T*A*L.
 
-    B must have been previously factorized as U**T*U or L*L**T by DPOTRF.   
+    B must have been previously factorized as U**T*U or L*L**T by DPOTRF.
 
-    Arguments   
-    =========   
+    Arguments
+    =========
 
-    ITYPE   (input) INTEGER   
-            = 1: compute inv(U**T)*A*inv(U) or inv(L)*A*inv(L**T);   
-            = 2 or 3: compute U*A*U**T or L**T*A*L.   
+    ITYPE   (input) INTEGER
+            = 1: compute inv(U**T)*A*inv(U) or inv(L)*A*inv(L**T);
+            = 2 or 3: compute U*A*U**T or L**T*A*L.
 
-    UPLO    (input) CHARACTER   
-            = 'U':  Upper triangle of A is stored and B is factored as   
-                    U**T*U;   
-            = 'L':  Lower triangle of A is stored and B is factored as   
-                    L*L**T.   
+    UPLO    (input) CHARACTER
+            = 'U':  Upper triangle of A is stored and B is factored as
+                    U**T*U;
+            = 'L':  Lower triangle of A is stored and B is factored as
+                    L*L**T.
 
-    N       (input) INTEGER   
-            The order of the matrices A and B.  N >= 0.   
+    N       (input) INTEGER
+            The order of the matrices A and B.  N >= 0.
 
-    A       (input/output) DOUBLE PRECISION array, dimension (LDA,N)   
-            On entry, the symmetric matrix A.  If UPLO = 'U', the leading   
-            N-by-N upper triangular part of A contains the upper   
-            triangular part of the matrix A, and the strictly lower   
-            triangular part of A is not referenced.  If UPLO = 'L', the   
-            leading N-by-N lower triangular part of A contains the lower   
-            triangular part of the matrix A, and the strictly upper   
-            triangular part of A is not referenced.   
+    A       (input/output) DOUBLE PRECISION array, dimension (LDA,N)
+            On entry, the symmetric matrix A.  If UPLO = 'U', the leading
+            N-by-N upper triangular part of A contains the upper
+            triangular part of the matrix A, and the strictly lower
+            triangular part of A is not referenced.  If UPLO = 'L', the
+            leading N-by-N lower triangular part of A contains the lower
+            triangular part of the matrix A, and the strictly upper
+            triangular part of A is not referenced.
 
-            On exit, if INFO = 0, the transformed matrix, stored in the   
-            same format as A.   
+            On exit, if INFO = 0, the transformed matrix, stored in the
+            same format as A.
 
-    LDA     (input) INTEGER   
-            The leading dimension of the array A.  LDA >= max(1,N).   
+    LDA     (input) INTEGER
+            The leading dimension of the array A.  LDA >= max(1,N).
 
-    B       (input) DOUBLE PRECISION array, dimension (LDB,N)   
-            The triangular factor from the Cholesky factorization of B,   
-            as returned by DPOTRF.   
+    B       (input) DOUBLE PRECISION array, dimension (LDB,N)
+            The triangular factor from the Cholesky factorization of B,
+            as returned by DPOTRF.
 
-    LDB     (input) INTEGER   
-            The leading dimension of the array B.  LDB >= max(1,N).   
+    LDB     (input) INTEGER
+            The leading dimension of the array B.  LDB >= max(1,N).
 
-    INFO    (output) INTEGER   
-            = 0:  successful exit   
-            < 0:  if INFO = -i, the i-th argument had an illegal value   
+    INFO    (output) INTEGER
+            = 0:  successful exit
+            < 0:  if INFO = -i, the i-th argument had an illegal value
 
-    =====================================================================   
+    =====================================================================
 
 
-       Test the input parameters.   
+       Test the input parameters.
 
        Parameter adjustments */
     /* Table of constant values */
-    static integer c__1 = 1;
-    static integer c_n1 = -1;
-    static doublereal c_b14 = 1.;
-    static doublereal c_b16 = -.5;
-    static doublereal c_b19 = -1.;
-    static doublereal c_b52 = .5;
-    
+    integer c__1 = 1;
+    integer c_n1 = -1;
+    doublereal c_b14 = 1.;
+    doublereal c_b16 = -.5;
+    doublereal c_b19 = -1.;
+    doublereal c_b52 = .5;
+
     /* System generated locals */
     integer a_dim1, a_offset, b_dim1, b_offset, i__1, i__2, i__3;
     /* Local variables */
-    static integer k;
+    integer k;
     extern logical lsame_(const char *,const char *);
-    extern /* Subroutine */ integer dtrmm_(const char *,const char *,const char *,const char *, 
-	    integer *, integer *, doublereal *, doublereal *, integer *, 
+    extern /* Subroutine */ integer dtrmm_(const char *,const char *,const char *,const char *,
+	    integer *, integer *, doublereal *, doublereal *, integer *,
 	    doublereal *, integer *), dsymm_(
-	    const char *,const char *, integer *, integer *, doublereal *, doublereal *, 
-	    integer *, doublereal *, integer *, doublereal *, doublereal *, 
+	    const char *,const char *, integer *, integer *, doublereal *, doublereal *,
+	    integer *, doublereal *, integer *, doublereal *, doublereal *,
 	    integer *);
-    static logical upper;
-    extern /* Subroutine */ integer dtrsm_(const char *,const char *,const char *,const char *, 
-	    integer *, integer *, doublereal *, doublereal *, integer *, 
+    logical upper;
+    extern /* Subroutine */ integer dtrsm_(const char *,const char *,const char *,const char *,
+	    integer *, integer *, doublereal *, doublereal *, integer *,
 	    doublereal *, integer *), dsygs2_(
-	    integer *,const char *, integer *, doublereal *, integer *, doublereal 
+	    integer *,const char *, integer *, doublereal *, integer *, doublereal
 	    *, integer *, integer *);
-    static integer kb;
-    extern /* Subroutine */ integer dsyr2k_(const char *,const char *, integer *, integer *, 
-	    doublereal *, doublereal *, integer *, doublereal *, integer *, 
+    integer kb;
+    extern /* Subroutine */ integer dsyr2k_(const char *,const char *, integer *, integer *,
+	    doublereal *, doublereal *, integer *, doublereal *, integer *,
 	    doublereal *, doublereal *, integer *);
-    static integer nb;
+    integer nb;
     extern /* Subroutine */ integer xerbla_(const char *, integer *);
-    extern integer ilaenv_(integer *,const char *,const char *, integer *, integer *, 
+    extern integer ilaenv_(integer *,const char *,const char *, integer *, integer *,
 	    integer *, integer *, ftnlen, ftnlen);
 #define a_ref(a_1,a_2) a[(a_2)*a_dim1 + a_1]
 #define b_ref(a_1,a_2) b[(a_2)*b_dim1 + a_1]
@@ -183,7 +183,7 @@ extern "C" {
 		    if (k + kb <= *n) {
 			i__3 = *n - k - kb + 1;
 			dtrsm_("Left", uplo, "Transpose", "Non-unit", &kb, &
-				i__3, &c_b14, &b_ref(k, k), ldb, &a_ref(k, k 
+				i__3, &c_b14, &b_ref(k, k), ldb, &a_ref(k, k
 				+ kb), lda);
 			i__3 = *n - k - kb + 1;
 			dsymm_("Left", uplo, &kb, &i__3, &c_b16, &a_ref(k, k),
@@ -221,7 +221,7 @@ extern "C" {
 			     ldb, info);
 		    if (k + kb <= *n) {
 			i__3 = *n - k - kb + 1;
-			dtrsm_("Right", uplo, "Transpose", "Non-unit", &i__3, 
+			dtrsm_("Right", uplo, "Transpose", "Non-unit", &i__3,
 				&kb, &c_b14, &b_ref(k, k), ldb, &a_ref(k + kb,
 				 k), lda);
 			i__3 = *n - k - kb + 1;
@@ -238,7 +238,7 @@ extern "C" {
 				k + kb, k), lda);
 			i__3 = *n - k - kb + 1;
 			dtrsm_("Left", uplo, "No transpose", "Non-unit", &
-				i__3, &kb, &c_b14, &b_ref(k + kb, k + kb), 
+				i__3, &kb, &c_b14, &b_ref(k + kb, k + kb),
 				ldb, &a_ref(k + kb, k), lda);
 		    }
 /* L20: */
@@ -262,14 +262,14 @@ extern "C" {
 		    dtrmm_("Left", uplo, "No transpose", "Non-unit", &i__3, &
 			    kb, &c_b14, &b[b_offset], ldb, &a_ref(1, k), lda);
 		    i__3 = k - 1;
-		    dsymm_("Right", uplo, &i__3, &kb, &c_b52, &a_ref(k, k), 
+		    dsymm_("Right", uplo, &i__3, &kb, &c_b52, &a_ref(k, k),
 			    lda, &b_ref(1, k), ldb, &c_b14, &a_ref(1, k), lda);
 		    i__3 = k - 1;
 		    dsyr2k_(uplo, "No transpose", &i__3, &kb, &c_b14, &a_ref(
 			    1, k), lda, &b_ref(1, k), ldb, &c_b14, &a[
 			    a_offset], lda);
 		    i__3 = k - 1;
-		    dsymm_("Right", uplo, &i__3, &kb, &c_b52, &a_ref(k, k), 
+		    dsymm_("Right", uplo, &i__3, &kb, &c_b52, &a_ref(k, k),
 			    lda, &b_ref(1, k), ldb, &c_b14, &a_ref(1, k), lda);
 		    i__3 = k - 1;
 		    dtrmm_("Right", uplo, "Transpose", "Non-unit", &i__3, &kb,
@@ -293,20 +293,20 @@ extern "C" {
 
 		    i__3 = k - 1;
 		    dtrmm_("Right", uplo, "No transpose", "Non-unit", &kb, &
-			    i__3, &c_b14, &b[b_offset], ldb, &a_ref(k, 1), 
+			    i__3, &c_b14, &b[b_offset], ldb, &a_ref(k, 1),
 			    lda);
 		    i__3 = k - 1;
-		    dsymm_("Left", uplo, &kb, &i__3, &c_b52, &a_ref(k, k), 
+		    dsymm_("Left", uplo, &kb, &i__3, &c_b52, &a_ref(k, k),
 			    lda, &b_ref(k, 1), ldb, &c_b14, &a_ref(k, 1), lda);
 		    i__3 = k - 1;
-		    dsyr2k_(uplo, "Transpose", &i__3, &kb, &c_b14, &a_ref(k, 
-			    1), lda, &b_ref(k, 1), ldb, &c_b14, &a[a_offset], 
+		    dsyr2k_(uplo, "Transpose", &i__3, &kb, &c_b14, &a_ref(k,
+			    1), lda, &b_ref(k, 1), ldb, &c_b14, &a[a_offset],
 			    lda);
 		    i__3 = k - 1;
-		    dsymm_("Left", uplo, &kb, &i__3, &c_b52, &a_ref(k, k), 
+		    dsymm_("Left", uplo, &kb, &i__3, &c_b52, &a_ref(k, k),
 			    lda, &b_ref(k, 1), ldb, &c_b14, &a_ref(k, 1), lda);
 		    i__3 = k - 1;
-		    dtrmm_("Left", uplo, "Transpose", "Non-unit", &kb, &i__3, 
+		    dtrmm_("Left", uplo, "Transpose", "Non-unit", &kb, &i__3,
 			    &c_b14, &b_ref(k, k), ldb, &a_ref(k, 1), lda);
 		    dsygs2_(itype, uplo, &kb, &a_ref(k, k), lda, &b_ref(k, k),
 			     ldb, info);
diff --git a/external/hypre/src/lapack/dsygv.c b/external/hypre/src/lapack/dsygv.c
index bf8ef81c..8eaf18b2 100644
--- a/external/hypre/src/lapack/dsygv.c
+++ b/external/hypre/src/lapack/dsygv.c
@@ -115,35 +115,35 @@ extern "C" {
 
        Parameter adjustments */
     /* Table of constant values */
-    static integer c__1 = 1;
-    static integer c_n1 = -1;
-    static doublereal c_b16 = 1.;
+     integer c__1 = 1;
+     integer c_n1 = -1;
+     doublereal c_b16 = 1.;
     
     /* System generated locals */
     integer a_dim1, a_offset, b_dim1, b_offset, i__1, i__2;
     /* Local variables */
-    static integer neig;
+     integer neig;
     extern logical lsame_(const char *,const char *);
     extern /* Subroutine */ integer dtrmm_(const char *,const char *,const char *,const char *, 
 	    integer *, integer *, doublereal *, doublereal *, integer *, 
 	    doublereal *, integer *);
-    static char trans[1];
+     char trans[1];
     extern /* Subroutine */ integer dtrsm_(const char *,const char *,const char *,const char *, 
 	    integer *, integer *, doublereal *, doublereal *, integer *, 
 	    doublereal *, integer *);
-    static logical upper;
+     logical upper;
     extern /* Subroutine */ integer dsyev_(const char *,const char *, integer *, doublereal *
 	    , integer *, doublereal *, doublereal *, integer *, integer *);
-    static logical wantz;
-    static integer nb;
+     logical wantz;
+     integer nb;
     extern /* Subroutine */ integer xerbla_(const char *, integer *);
     extern integer ilaenv_(integer *,const char *,const char *, integer *, integer *, 
 	    integer *, integer *, ftnlen, ftnlen);
     extern /* Subroutine */ integer dpotrf_(const char *, integer *, doublereal *, 
 	    integer *, integer *), dsygst_(integer *,const char *, integer 
 	    *, doublereal *, integer *, doublereal *, integer *, integer *);
-    static integer lwkopt;
-    static logical lquery;
+     integer lwkopt;
+     logical lquery;
 
 
     a_dim1 = *lda;
diff --git a/external/hypre/src/lapack/dsytd2.c b/external/hypre/src/lapack/dsytd2.c
index d63b4bf5..14911e28 100644
--- a/external/hypre/src/lapack/dsytd2.c
+++ b/external/hypre/src/lapack/dsytd2.c
@@ -11,139 +11,139 @@ extern "C" {
 /* Subroutine */ integer dsytd2_(const char *uplo, integer *n, doublereal *a, integer *
 	lda, doublereal *d__, doublereal *e, doublereal *tau, integer *info)
 {
-/*  -- LAPACK routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       October 31, 1992   
+/*  -- LAPACK routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       October 31, 1992
 
 
-    Purpose   
-    =======   
+    Purpose
+    =======
 
-    DSYTD2 reduces a real symmetric matrix A to symmetric tridiagonal   
-    form T by an orthogonal similarity transformation: Q' * A * Q = T.   
+    DSYTD2 reduces a real symmetric matrix A to symmetric tridiagonal
+    form T by an orthogonal similarity transformation: Q' * A * Q = T.
 
-    Arguments   
-    =========   
+    Arguments
+    =========
 
-    UPLO    (input) CHARACTER*1   
-            Specifies whether the upper or lower triangular part of the   
-            symmetric matrix A is stored:   
-            = 'U':  Upper triangular   
-            = 'L':  Lower triangular   
+    UPLO    (input) CHARACTER*1
+            Specifies whether the upper or lower triangular part of the
+            symmetric matrix A is stored:
+            = 'U':  Upper triangular
+            = 'L':  Lower triangular
 
-    N       (input) INTEGER   
-            The order of the matrix A.  N >= 0.   
+    N       (input) INTEGER
+            The order of the matrix A.  N >= 0.
 
-    A       (input/output) DOUBLE PRECISION array, dimension (LDA,N)   
-            On entry, the symmetric matrix A.  If UPLO = 'U', the leading   
-            n-by-n upper triangular part of A contains the upper   
-            triangular part of the matrix A, and the strictly lower   
-            triangular part of A is not referenced.  If UPLO = 'L', the   
-            leading n-by-n lower triangular part of A contains the lower   
-            triangular part of the matrix A, and the strictly upper   
-            triangular part of A is not referenced.   
-            On exit, if UPLO = 'U', the diagonal and first superdiagonal   
-            of A are overwritten by the corresponding elements of the   
-            tridiagonal matrix T, and the elements above the first   
-            superdiagonal, with the array TAU, represent the orthogonal   
-            matrix Q as a product of elementary reflectors; if UPLO   
-            = 'L', the diagonal and first subdiagonal of A are over-   
-            written by the corresponding elements of the tridiagonal   
-            matrix T, and the elements below the first subdiagonal, with   
-            the array TAU, represent the orthogonal matrix Q as a product   
-            of elementary reflectors. See Further Details.   
+    A       (input/output) DOUBLE PRECISION array, dimension (LDA,N)
+            On entry, the symmetric matrix A.  If UPLO = 'U', the leading
+            n-by-n upper triangular part of A contains the upper
+            triangular part of the matrix A, and the strictly lower
+            triangular part of A is not referenced.  If UPLO = 'L', the
+            leading n-by-n lower triangular part of A contains the lower
+            triangular part of the matrix A, and the strictly upper
+            triangular part of A is not referenced.
+            On exit, if UPLO = 'U', the diagonal and first superdiagonal
+            of A are overwritten by the corresponding elements of the
+            tridiagonal matrix T, and the elements above the first
+            superdiagonal, with the array TAU, represent the orthogonal
+            matrix Q as a product of elementary reflectors; if UPLO
+            = 'L', the diagonal and first subdiagonal of A are over-
+            written by the corresponding elements of the tridiagonal
+            matrix T, and the elements below the first subdiagonal, with
+            the array TAU, represent the orthogonal matrix Q as a product
+            of elementary reflectors. See Further Details.
 
-    LDA     (input) INTEGER   
-            The leading dimension of the array A.  LDA >= max(1,N).   
+    LDA     (input) INTEGER
+            The leading dimension of the array A.  LDA >= max(1,N).
 
-    D       (output) DOUBLE PRECISION array, dimension (N)   
-            The diagonal elements of the tridiagonal matrix T:   
-            D(i) = A(i,i).   
+    D       (output) DOUBLE PRECISION array, dimension (N)
+            The diagonal elements of the tridiagonal matrix T:
+            D(i) = A(i,i).
 
-    E       (output) DOUBLE PRECISION array, dimension (N-1)   
-            The off-diagonal elements of the tridiagonal matrix T:   
-            E(i) = A(i,i+1) if UPLO = 'U', E(i) = A(i+1,i) if UPLO = 'L'.   
+    E       (output) DOUBLE PRECISION array, dimension (N-1)
+            The off-diagonal elements of the tridiagonal matrix T:
+            E(i) = A(i,i+1) if UPLO = 'U', E(i) = A(i+1,i) if UPLO = 'L'.
 
-    TAU     (output) DOUBLE PRECISION array, dimension (N-1)   
-            The scalar factors of the elementary reflectors (see Further   
-            Details).   
+    TAU     (output) DOUBLE PRECISION array, dimension (N-1)
+            The scalar factors of the elementary reflectors (see Further
+            Details).
 
-    INFO    (output) INTEGER   
-            = 0:  successful exit   
-            < 0:  if INFO = -i, the i-th argument had an illegal value.   
+    INFO    (output) INTEGER
+            = 0:  successful exit
+            < 0:  if INFO = -i, the i-th argument had an illegal value.
 
-    Further Details   
-    ===============   
+    Further Details
+    ===============
 
-    If UPLO = 'U', the matrix Q is represented as a product of elementary   
-    reflectors   
+    If UPLO = 'U', the matrix Q is represented as a product of elementary
+    reflectors
 
-       Q = H(n-1) . . . H(2) H(1).   
+       Q = H(n-1) . . . H(2) H(1).
 
-    Each H(i) has the form   
+    Each H(i) has the form
 
-       H(i) = I - tau * v * v'   
+       H(i) = I - tau * v * v'
 
-    where tau is a real scalar, and v is a real vector with   
-    v(i+1:n) = 0 and v(i) = 1; v(1:i-1) is stored on exit in   
-    A(1:i-1,i+1), and tau in TAU(i).   
+    where tau is a real scalar, and v is a real vector with
+    v(i+1:n) = 0 and v(i) = 1; v(1:i-1) is stored on exit in
+    A(1:i-1,i+1), and tau in TAU(i).
 
-    If UPLO = 'L', the matrix Q is represented as a product of elementary   
-    reflectors   
+    If UPLO = 'L', the matrix Q is represented as a product of elementary
+    reflectors
 
-       Q = H(1) H(2) . . . H(n-1).   
+       Q = H(1) H(2) . . . H(n-1).
 
-    Each H(i) has the form   
+    Each H(i) has the form
 
-       H(i) = I - tau * v * v'   
+       H(i) = I - tau * v * v'
 
-    where tau is a real scalar, and v is a real vector with   
-    v(1:i) = 0 and v(i+1) = 1; v(i+2:n) is stored on exit in A(i+2:n,i),   
-    and tau in TAU(i).   
+    where tau is a real scalar, and v is a real vector with
+    v(1:i) = 0 and v(i+1) = 1; v(i+2:n) is stored on exit in A(i+2:n,i),
+    and tau in TAU(i).
 
-    The contents of A on exit are illustrated by the following examples   
-    with n = 5:   
+    The contents of A on exit are illustrated by the following examples
+    with n = 5:
 
-    if UPLO = 'U':                       if UPLO = 'L':   
+    if UPLO = 'U':                       if UPLO = 'L':
 
-      (  d   e   v2  v3  v4 )              (  d                  )   
-      (      d   e   v3  v4 )              (  e   d              )   
-      (          d   e   v4 )              (  v1  e   d          )   
-      (              d   e  )              (  v1  v2  e   d      )   
-      (                  d  )              (  v1  v2  v3  e   d  )   
+      (  d   e   v2  v3  v4 )              (  d                  )
+      (      d   e   v3  v4 )              (  e   d              )
+      (          d   e   v4 )              (  v1  e   d          )
+      (              d   e  )              (  v1  v2  e   d      )
+      (                  d  )              (  v1  v2  v3  e   d  )
 
-    where d and e denote diagonal and off-diagonal elements of T, and vi   
-    denotes an element of the vector defining H(i).   
+    where d and e denote diagonal and off-diagonal elements of T, and vi
+    denotes an element of the vector defining H(i).
 
-    =====================================================================   
+    =====================================================================
 
 
-       Test the input parameters   
+       Test the input parameters
 
        Parameter adjustments */
     /* Table of constant values */
-    static integer c__1 = 1;
-    static doublereal c_b8 = 0.;
-    static doublereal c_b14 = -1.;
-    
+    integer c__1 = 1;
+    doublereal c_b8 = 0.;
+    doublereal c_b14 = -1.;
+
     /* System generated locals */
     integer a_dim1, a_offset, i__1, i__2, i__3;
     /* Local variables */
-    extern doublereal ddot_(integer *, doublereal *, integer *, doublereal *, 
+    extern doublereal ddot_(integer *, doublereal *, integer *, doublereal *,
 	    integer *);
-    static doublereal taui;
-    extern /* Subroutine */ integer dsyr2_(const char *, integer *, doublereal *, 
-	    doublereal *, integer *, doublereal *, integer *, doublereal *, 
+    doublereal taui;
+    extern /* Subroutine */ integer dsyr2_(const char *, integer *, doublereal *,
+	    doublereal *, integer *, doublereal *, integer *, doublereal *,
 	    integer *);
-    static integer i__;
-    static doublereal alpha;
+    integer i__;
+    doublereal alpha;
     extern logical lsame_(const char *,const char *);
-    extern /* Subroutine */ integer daxpy_(integer *, doublereal *, doublereal *, 
+    extern /* Subroutine */ integer daxpy_(integer *, doublereal *, doublereal *,
 	    integer *, doublereal *, integer *);
-    static logical upper;
-    extern /* Subroutine */ integer dsymv_(const char *, integer *, doublereal *, 
-	    doublereal *, integer *, doublereal *, integer *, doublereal *, 
+    logical upper;
+    extern /* Subroutine */ integer dsymv_(const char *, integer *, doublereal *,
+	    doublereal *, integer *, doublereal *, integer *, doublereal *,
 	    doublereal *, integer *), dlarfg_(integer *, doublereal *,
 	     doublereal *, integer *, doublereal *), xerbla_(const char *, integer *
 	    );
@@ -185,7 +185,7 @@ extern "C" {
 
 	for (i__ = *n - 1; i__ >= 1; --i__) {
 
-/*           Generate elementary reflector H(i) = I - tau * v * v'   
+/*           Generate elementary reflector H(i) = I - tau * v * v'
              to annihilate A(1:i-1,i+1) */
 
 	    dlarfg_(&i__, &a_ref(i__, i__ + 1), &a_ref(1, i__ + 1), &c__1, &
@@ -200,17 +200,17 @@ extern "C" {
 
 /*              Compute  x := tau * A * v  storing x in TAU(1:i) */
 
-		dsymv_(uplo, &i__, &taui, &a[a_offset], lda, &a_ref(1, i__ + 
+		dsymv_(uplo, &i__, &taui, &a[a_offset], lda, &a_ref(1, i__ +
 			1), &c__1, &c_b8, &tau[1], &c__1);
 
 /*              Compute  w := x - 1/2 * tau * (x'*v) * v */
 
-		alpha = taui * -.5 * ddot_(&i__, &tau[1], &c__1, &a_ref(1, 
+		alpha = taui * -.5 * ddot_(&i__, &tau[1], &c__1, &a_ref(1,
 			i__ + 1), &c__1);
 		daxpy_(&i__, &alpha, &a_ref(1, i__ + 1), &c__1, &tau[1], &
 			c__1);
 
-/*              Apply the transformation as a rank-2 update:   
+/*              Apply the transformation as a rank-2 update:
                    A := A - v * w' - w * v' */
 
 		dsyr2_(uplo, &i__, &c_b14, &a_ref(1, i__ + 1), &c__1, &tau[1],
@@ -230,8 +230,8 @@ extern "C" {
 	i__1 = *n - 1;
 	for (i__ = 1; i__ <= i__1; ++i__) {
 
-/*           Generate elementary reflector H(i) = I - tau * v * v'   
-             to annihilate A(i+2:n,i)   
+/*           Generate elementary reflector H(i) = I - tau * v * v'
+             to annihilate A(i+2:n,i)
 
    Computing MIN */
 	    i__2 = i__ + 2;
@@ -258,10 +258,10 @@ extern "C" {
 		alpha = taui * -.5 * ddot_(&i__2, &tau[i__], &c__1, &a_ref(
 			i__ + 1, i__), &c__1);
 		i__2 = *n - i__;
-		daxpy_(&i__2, &alpha, &a_ref(i__ + 1, i__), &c__1, &tau[i__], 
+		daxpy_(&i__2, &alpha, &a_ref(i__ + 1, i__), &c__1, &tau[i__],
 			&c__1);
 
-/*              Apply the transformation as a rank-2 update:   
+/*              Apply the transformation as a rank-2 update:
                    A := A - v * w' - w * v' */
 
 		i__2 = *n - i__;
diff --git a/external/hypre/src/lapack/dsytrd.c b/external/hypre/src/lapack/dsytrd.c
index 827f5bf8..a87c5596 100644
--- a/external/hypre/src/lapack/dsytrd.c
+++ b/external/hypre/src/lapack/dsytrd.c
@@ -12,157 +12,157 @@ extern "C" {
 	lda, doublereal *d__, doublereal *e, doublereal *tau, doublereal *
 	work, integer *lwork, integer *info)
 {
-/*  -- LAPACK routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       June 30, 1999   
+/*  -- LAPACK routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       June 30, 1999
 
 
-    Purpose   
-    =======   
+    Purpose
+    =======
 
-    DSYTRD reduces a real symmetric matrix A to real symmetric   
-    tridiagonal form T by an orthogonal similarity transformation:   
-    Q**T * A * Q = T.   
+    DSYTRD reduces a real symmetric matrix A to real symmetric
+    tridiagonal form T by an orthogonal similarity transformation:
+    Q**T * A * Q = T.
 
-    Arguments   
-    =========   
+    Arguments
+    =========
 
-    UPLO    (input) CHARACTER*1   
-            = 'U':  Upper triangle of A is stored;   
-            = 'L':  Lower triangle of A is stored.   
+    UPLO    (input) CHARACTER*1
+            = 'U':  Upper triangle of A is stored;
+            = 'L':  Lower triangle of A is stored.
 
-    N       (input) INTEGER   
-            The order of the matrix A.  N >= 0.   
+    N       (input) INTEGER
+            The order of the matrix A.  N >= 0.
 
-    A       (input/output) DOUBLE PRECISION array, dimension (LDA,N)   
-            On entry, the symmetric matrix A.  If UPLO = 'U', the leading   
-            N-by-N upper triangular part of A contains the upper   
-            triangular part of the matrix A, and the strictly lower   
-            triangular part of A is not referenced.  If UPLO = 'L', the   
-            leading N-by-N lower triangular part of A contains the lower   
-            triangular part of the matrix A, and the strictly upper   
-            triangular part of A is not referenced.   
-            On exit, if UPLO = 'U', the diagonal and first superdiagonal   
-            of A are overwritten by the corresponding elements of the   
-            tridiagonal matrix T, and the elements above the first   
-            superdiagonal, with the array TAU, represent the orthogonal   
-            matrix Q as a product of elementary reflectors; if UPLO   
-            = 'L', the diagonal and first subdiagonal of A are over-   
-            written by the corresponding elements of the tridiagonal   
-            matrix T, and the elements below the first subdiagonal, with   
-            the array TAU, represent the orthogonal matrix Q as a product   
-            of elementary reflectors. See Further Details.   
+    A       (input/output) DOUBLE PRECISION array, dimension (LDA,N)
+            On entry, the symmetric matrix A.  If UPLO = 'U', the leading
+            N-by-N upper triangular part of A contains the upper
+            triangular part of the matrix A, and the strictly lower
+            triangular part of A is not referenced.  If UPLO = 'L', the
+            leading N-by-N lower triangular part of A contains the lower
+            triangular part of the matrix A, and the strictly upper
+            triangular part of A is not referenced.
+            On exit, if UPLO = 'U', the diagonal and first superdiagonal
+            of A are overwritten by the corresponding elements of the
+            tridiagonal matrix T, and the elements above the first
+            superdiagonal, with the array TAU, represent the orthogonal
+            matrix Q as a product of elementary reflectors; if UPLO
+            = 'L', the diagonal and first subdiagonal of A are over-
+            written by the corresponding elements of the tridiagonal
+            matrix T, and the elements below the first subdiagonal, with
+            the array TAU, represent the orthogonal matrix Q as a product
+            of elementary reflectors. See Further Details.
 
-    LDA     (input) INTEGER   
-            The leading dimension of the array A.  LDA >= max(1,N).   
+    LDA     (input) INTEGER
+            The leading dimension of the array A.  LDA >= max(1,N).
 
-    D       (output) DOUBLE PRECISION array, dimension (N)   
-            The diagonal elements of the tridiagonal matrix T:   
-            D(i) = A(i,i).   
+    D       (output) DOUBLE PRECISION array, dimension (N)
+            The diagonal elements of the tridiagonal matrix T:
+            D(i) = A(i,i).
 
-    E       (output) DOUBLE PRECISION array, dimension (N-1)   
-            The off-diagonal elements of the tridiagonal matrix T:   
-            E(i) = A(i,i+1) if UPLO = 'U', E(i) = A(i+1,i) if UPLO = 'L'.   
+    E       (output) DOUBLE PRECISION array, dimension (N-1)
+            The off-diagonal elements of the tridiagonal matrix T:
+            E(i) = A(i,i+1) if UPLO = 'U', E(i) = A(i+1,i) if UPLO = 'L'.
 
-    TAU     (output) DOUBLE PRECISION array, dimension (N-1)   
-            The scalar factors of the elementary reflectors (see Further   
-            Details).   
+    TAU     (output) DOUBLE PRECISION array, dimension (N-1)
+            The scalar factors of the elementary reflectors (see Further
+            Details).
 
-    WORK    (workspace/output) DOUBLE PRECISION array, dimension (LWORK)   
-            On exit, if INFO = 0, WORK(1) returns the optimal LWORK.   
+    WORK    (workspace/output) DOUBLE PRECISION array, dimension (LWORK)
+            On exit, if INFO = 0, WORK(1) returns the optimal LWORK.
 
-    LWORK   (input) INTEGER   
-            The dimension of the array WORK.  LWORK >= 1.   
-            For optimum performance LWORK >= N*NB, where NB is the   
-            optimal blocksize.   
+    LWORK   (input) INTEGER
+            The dimension of the array WORK.  LWORK >= 1.
+            For optimum performance LWORK >= N*NB, where NB is the
+            optimal blocksize.
 
-            If LWORK = -1, then a workspace query is assumed; the routine   
-            only calculates the optimal size of the WORK array, returns   
-            this value as the first entry of the WORK array, and no error   
-            message related to LWORK is issued by XERBLA.   
+            If LWORK = -1, then a workspace query is assumed; the routine
+            only calculates the optimal size of the WORK array, returns
+            this value as the first entry of the WORK array, and no error
+            message related to LWORK is issued by XERBLA.
 
-    INFO    (output) INTEGER   
-            = 0:  successful exit   
-            < 0:  if INFO = -i, the i-th argument had an illegal value   
+    INFO    (output) INTEGER
+            = 0:  successful exit
+            < 0:  if INFO = -i, the i-th argument had an illegal value
 
-    Further Details   
-    ===============   
+    Further Details
+    ===============
 
-    If UPLO = 'U', the matrix Q is represented as a product of elementary   
-    reflectors   
+    If UPLO = 'U', the matrix Q is represented as a product of elementary
+    reflectors
 
-       Q = H(n-1) . . . H(2) H(1).   
+       Q = H(n-1) . . . H(2) H(1).
 
-    Each H(i) has the form   
+    Each H(i) has the form
 
-       H(i) = I - tau * v * v'   
+       H(i) = I - tau * v * v'
 
-    where tau is a real scalar, and v is a real vector with   
-    v(i+1:n) = 0 and v(i) = 1; v(1:i-1) is stored on exit in   
-    A(1:i-1,i+1), and tau in TAU(i).   
+    where tau is a real scalar, and v is a real vector with
+    v(i+1:n) = 0 and v(i) = 1; v(1:i-1) is stored on exit in
+    A(1:i-1,i+1), and tau in TAU(i).
 
-    If UPLO = 'L', the matrix Q is represented as a product of elementary   
-    reflectors   
+    If UPLO = 'L', the matrix Q is represented as a product of elementary
+    reflectors
 
-       Q = H(1) H(2) . . . H(n-1).   
+       Q = H(1) H(2) . . . H(n-1).
 
-    Each H(i) has the form   
+    Each H(i) has the form
 
-       H(i) = I - tau * v * v'   
+       H(i) = I - tau * v * v'
 
-    where tau is a real scalar, and v is a real vector with   
-    v(1:i) = 0 and v(i+1) = 1; v(i+2:n) is stored on exit in A(i+2:n,i),   
-    and tau in TAU(i).   
+    where tau is a real scalar, and v is a real vector with
+    v(1:i) = 0 and v(i+1) = 1; v(i+2:n) is stored on exit in A(i+2:n,i),
+    and tau in TAU(i).
 
-    The contents of A on exit are illustrated by the following examples   
-    with n = 5:   
+    The contents of A on exit are illustrated by the following examples
+    with n = 5:
 
-    if UPLO = 'U':                       if UPLO = 'L':   
+    if UPLO = 'U':                       if UPLO = 'L':
 
-      (  d   e   v2  v3  v4 )              (  d                  )   
-      (      d   e   v3  v4 )              (  e   d              )   
-      (          d   e   v4 )              (  v1  e   d          )   
-      (              d   e  )              (  v1  v2  e   d      )   
-      (                  d  )              (  v1  v2  v3  e   d  )   
+      (  d   e   v2  v3  v4 )              (  d                  )
+      (      d   e   v3  v4 )              (  e   d              )
+      (          d   e   v4 )              (  v1  e   d          )
+      (              d   e  )              (  v1  v2  e   d      )
+      (                  d  )              (  v1  v2  v3  e   d  )
 
-    where d and e denote diagonal and off-diagonal elements of T, and vi   
-    denotes an element of the vector defining H(i).   
+    where d and e denote diagonal and off-diagonal elements of T, and vi
+    denotes an element of the vector defining H(i).
 
-    =====================================================================   
+    =====================================================================
 
 
-       Test the input parameters   
+       Test the input parameters
 
        Parameter adjustments */
     /* Table of constant values */
-    static integer c__1 = 1;
-    static integer c_n1 = -1;
-    static integer c__3 = 3;
-    static integer c__2 = 2;
-    static doublereal c_b22 = -1.;
-    static doublereal c_b23 = 1.;
-    
+    integer c__1 = 1;
+    integer c_n1 = -1;
+    integer c__3 = 3;
+    integer c__2 = 2;
+    doublereal c_b22 = -1.;
+    doublereal c_b23 = 1.;
+
     /* System generated locals */
     integer a_dim1, a_offset, i__1, i__2, i__3;
     /* Local variables */
-    static integer i__, j;
+    integer i__, j;
     extern logical lsame_(const char *,const char *);
-    static integer nbmin, iinfo;
-    static logical upper;
-    extern /* Subroutine */ integer dsytd2_(const char *, integer *, doublereal *, 
-	    integer *, doublereal *, doublereal *, doublereal *, integer *), dsyr2k_(const char *,const char *, integer *, integer *, doublereal 
+    integer nbmin, iinfo;
+    logical upper;
+    extern /* Subroutine */ integer dsytd2_(const char *, integer *, doublereal *,
+	    integer *, doublereal *, doublereal *, doublereal *, integer *), dsyr2k_(const char *,const char *, integer *, integer *, doublereal
 	    *, doublereal *, integer *, doublereal *, integer *, doublereal *,
 	     doublereal *, integer *);
-    static integer nb, kk, nx;
-    extern /* Subroutine */ integer dlatrd_(const char *, integer *, integer *, 
+    integer nb, kk, nx;
+    extern /* Subroutine */ integer dlatrd_(const char *, integer *, integer *,
 	    doublereal *, integer *, doublereal *, doublereal *, doublereal *,
 	     integer *), xerbla_(const char *, integer *);
-    extern integer ilaenv_(integer *,const char *,const char *, integer *, integer *, 
+    extern integer ilaenv_(integer *,const char *,const char *, integer *, integer *,
 	    integer *, integer *, ftnlen, ftnlen);
-    static integer ldwork, lwkopt;
-    static logical lquery;
-    static integer iws;
+    integer ldwork, lwkopt;
+    logical lquery;
+    integer iws;
 #define a_ref(a_1,a_2) a[(a_2)*a_dim1 + a_1]
 
 
@@ -217,8 +217,8 @@ extern "C" {
     iws = 1;
     if (nb > 1 && nb < *n) {
 
-/*        Determine when to cross over from blocked to unblocked code   
-          (last block is always handled by unblocked code).   
+/*        Determine when to cross over from blocked to unblocked code
+          (last block is always handled by unblocked code).
 
    Computing MAX */
 	i__1 = nb, i__2 = ilaenv_(&c__3, "DSYTRD", uplo, n, &c_n1, &c_n1, &
@@ -232,9 +232,9 @@ extern "C" {
 	    iws = ldwork * nb;
 	    if (*lwork < iws) {
 
-/*              Not enough workspace to use optimal NB:  determine the   
-                minimum value of NB, and reduce NB or force use of   
-                unblocked code by setting NX = N.   
+/*              Not enough workspace to use optimal NB:  determine the
+                minimum value of NB, and reduce NB or force use of
+                unblocked code by setting NX = N.
 
    Computing MAX */
 		i__1 = *lwork / ldwork;
@@ -254,31 +254,31 @@ extern "C" {
 
     if (upper) {
 
-/*        Reduce the upper triangle of A.   
+/*        Reduce the upper triangle of A.
           Columns 1:kk are handled by the unblocked method. */
 
 	kk = *n - (*n - nx + nb - 1) / nb * nb;
 	i__1 = kk + 1;
 	i__2 = -nb;
-	for (i__ = *n - nb + 1; i__2 < 0 ? i__ >= i__1 : i__ <= i__1; i__ += 
+	for (i__ = *n - nb + 1; i__2 < 0 ? i__ >= i__1 : i__ <= i__1; i__ +=
 		i__2) {
 
-/*           Reduce columns i:i+nb-1 to tridiagonal form and form the   
-             matrix W which is needed to update the unreduced part of   
+/*           Reduce columns i:i+nb-1 to tridiagonal form and form the
+             matrix W which is needed to update the unreduced part of
              the matrix */
 
 	    i__3 = i__ + nb - 1;
 	    dlatrd_(uplo, &i__3, &nb, &a[a_offset], lda, &e[1], &tau[1], &
 		    work[1], &ldwork);
 
-/*           Update the unreduced submatrix A(1:i-1,1:i-1), using an   
+/*           Update the unreduced submatrix A(1:i-1,1:i-1), using an
              update of the form:  A := A - V*W' - W*V' */
 
 	    i__3 = i__ - 1;
-	    dsyr2k_(uplo, "No transpose", &i__3, &nb, &c_b22, &a_ref(1, i__), 
+	    dsyr2k_(uplo, "No transpose", &i__3, &nb, &c_b22, &a_ref(1, i__),
 		    lda, &work[1], &ldwork, &c_b23, &a[a_offset], lda);
 
-/*           Copy superdiagonal elements back into A, and diagonal   
+/*           Copy superdiagonal elements back into A, and diagonal
              elements into D */
 
 	    i__3 = i__ + nb - 1;
@@ -301,23 +301,23 @@ extern "C" {
 	i__1 = nb;
 	for (i__ = 1; i__1 < 0 ? i__ >= i__2 : i__ <= i__2; i__ += i__1) {
 
-/*           Reduce columns i:i+nb-1 to tridiagonal form and form the   
-             matrix W which is needed to update the unreduced part of   
+/*           Reduce columns i:i+nb-1 to tridiagonal form and form the
+             matrix W which is needed to update the unreduced part of
              the matrix */
 
 	    i__3 = *n - i__ + 1;
 	    dlatrd_(uplo, &i__3, &nb, &a_ref(i__, i__), lda, &e[i__], &tau[
 		    i__], &work[1], &ldwork);
 
-/*           Update the unreduced submatrix A(i+ib:n,i+ib:n), using   
+/*           Update the unreduced submatrix A(i+ib:n,i+ib:n), using
              an update of the form:  A := A - V*W' - W*V' */
 
 	    i__3 = *n - i__ - nb + 1;
 	    dsyr2k_(uplo, "No transpose", &i__3, &nb, &c_b22, &a_ref(i__ + nb,
-		     i__), lda, &work[nb + 1], &ldwork, &c_b23, &a_ref(i__ + 
+		     i__), lda, &work[nb + 1], &ldwork, &c_b23, &a_ref(i__ +
 		    nb, i__ + nb), lda);
 
-/*           Copy subdiagonal elements back into A, and diagonal   
+/*           Copy subdiagonal elements back into A, and diagonal
              elements into D */
 
 	    i__3 = i__ + nb - 1;
diff --git a/external/hypre/src/lapack/dtrti2.c b/external/hypre/src/lapack/dtrti2.c
index 84bbf4a8..2237824c 100644
--- a/external/hypre/src/lapack/dtrti2.c
+++ b/external/hypre/src/lapack/dtrti2.c
@@ -11,78 +11,78 @@ extern "C" {
 /* Subroutine */ integer dtrti2_(const char *uplo, const char *diag, integer *n, doublereal *
 	a, integer *lda, integer *info)
 {
-/*  -- LAPACK routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       February 29, 1992   
+/*  -- LAPACK routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       February 29, 1992
 
 
-    Purpose   
-    =======   
+    Purpose
+    =======
 
-    DTRTI2 computes the inverse of a real upper or lower triangular   
-    matrix.   
+    DTRTI2 computes the inverse of a real upper or lower triangular
+    matrix.
 
-    This is the Level 2 BLAS version of the algorithm.   
+    This is the Level 2 BLAS version of the algorithm.
 
-    Arguments   
-    =========   
+    Arguments
+    =========
 
-    UPLO    (input) CHARACTER*1   
-            Specifies whether the matrix A is upper or lower triangular.   
-            = 'U':  Upper triangular   
-            = 'L':  Lower triangular   
+    UPLO    (input) CHARACTER*1
+            Specifies whether the matrix A is upper or lower triangular.
+            = 'U':  Upper triangular
+            = 'L':  Lower triangular
 
-    DIAG    (input) CHARACTER*1   
-            Specifies whether or not the matrix A is unit triangular.   
-            = 'N':  Non-unit triangular   
-            = 'U':  Unit triangular   
+    DIAG    (input) CHARACTER*1
+            Specifies whether or not the matrix A is unit triangular.
+            = 'N':  Non-unit triangular
+            = 'U':  Unit triangular
 
-    N       (input) INTEGER   
-            The order of the matrix A.  N >= 0.   
+    N       (input) INTEGER
+            The order of the matrix A.  N >= 0.
 
-    A       (input/output) DOUBLE PRECISION array, dimension (LDA,N)   
-            On entry, the triangular matrix A.  If UPLO = 'U', the   
-            leading n by n upper triangular part of the array A contains   
-            the upper triangular matrix, and the strictly lower   
-            triangular part of A is not referenced.  If UPLO = 'L', the   
-            leading n by n lower triangular part of the array A contains   
-            the lower triangular matrix, and the strictly upper   
-            triangular part of A is not referenced.  If DIAG = 'U', the   
-            diagonal elements of A are also not referenced and are   
-            assumed to be 1.   
+    A       (input/output) DOUBLE PRECISION array, dimension (LDA,N)
+            On entry, the triangular matrix A.  If UPLO = 'U', the
+            leading n by n upper triangular part of the array A contains
+            the upper triangular matrix, and the strictly lower
+            triangular part of A is not referenced.  If UPLO = 'L', the
+            leading n by n lower triangular part of the array A contains
+            the lower triangular matrix, and the strictly upper
+            triangular part of A is not referenced.  If DIAG = 'U', the
+            diagonal elements of A are also not referenced and are
+            assumed to be 1.
 
-            On exit, the (triangular) inverse of the original matrix, in   
-            the same storage format.   
+            On exit, the (triangular) inverse of the original matrix, in
+            the same storage format.
 
-    LDA     (input) INTEGER   
-            The leading dimension of the array A.  LDA >= max(1,N).   
+    LDA     (input) INTEGER
+            The leading dimension of the array A.  LDA >= max(1,N).
 
-    INFO    (output) INTEGER   
-            = 0: successful exit   
-            < 0: if INFO = -k, the k-th argument had an illegal value   
+    INFO    (output) INTEGER
+            = 0: successful exit
+            < 0: if INFO = -k, the k-th argument had an illegal value
 
-    =====================================================================   
+    =====================================================================
 
 
-       Test the input parameters.   
+       Test the input parameters.
 
        Parameter adjustments */
     /* Table of constant values */
-    static integer c__1 = 1;
-    
+    integer c__1 = 1;
+
     /* System generated locals */
     integer a_dim1, a_offset, i__1, i__2;
     /* Local variables */
-    static integer j;
-    extern /* Subroutine */ integer dscal_(integer *, doublereal *, doublereal *, 
+    integer j;
+    extern /* Subroutine */ integer dscal_(integer *, doublereal *, doublereal *,
 	    integer *);
     extern logical lsame_(const char *, const char *);
-    static logical upper;
-    extern /* Subroutine */ integer dtrmv_(const char *, const char *, const char *, integer *, 
+    logical upper;
+    extern /* Subroutine */ integer dtrmv_(const char *, const char *, const char *, integer *,
 	    doublereal *, integer *, doublereal *, integer *), xerbla_(const char *, integer *);
-    static logical nounit;
-    static doublereal ajj;
+    logical nounit;
+    doublereal ajj;
 #define a_ref(a_1,a_2) a[(a_2)*a_dim1 + a_1]
 
 
@@ -147,7 +147,7 @@ extern "C" {
 /*              Compute elements j+1:n of j-th column. */
 
 		i__1 = *n - j;
-		dtrmv_("Lower", "No transpose", diag, &i__1, &a_ref(j + 1, j 
+		dtrmv_("Lower", "No transpose", diag, &i__1, &a_ref(j + 1, j
 			+ 1), lda, &a_ref(j + 1, j), &c__1);
 		i__1 = *n - j;
 		dscal_(&i__1, &ajj, &a_ref(j + 1, j), &c__1);
diff --git a/external/hypre/src/lapack/dtrtri.c b/external/hypre/src/lapack/dtrtri.c
index 8a43ccce..cd859cae 100644
--- a/external/hypre/src/lapack/dtrtri.c
+++ b/external/hypre/src/lapack/dtrtri.c
@@ -68,11 +68,11 @@ extern "C" {
 
        Parameter adjustments */
     /* Table of constant values */
-    static integer c__1 = 1;
-    static integer c_n1 = -1;
-    static integer c__2 = 2;
-    static doublereal c_b18 = 1.;
-    static doublereal c_b22 = -1.;
+     integer c__1 = 1;
+     integer c_n1 = -1;
+     integer c__2 = 2;
+     doublereal c_b18 = 1.;
+     doublereal c_b22 = -1.;
     
     /* System generated locals */
     address a__1[2];
@@ -81,21 +81,21 @@ extern "C" {
     /* Builtin functions   
        Subroutine */ integer s_cat(char *, char **, integer *, integer *, ftnlen);
     /* Local variables */
-    static integer j;
+     integer j;
     extern logical lsame_(const char *, const char *);
     extern /* Subroutine */ integer dtrmm_(const char *, const char *, const char *, const char *, 
 	    integer *, integer *, doublereal *, doublereal *, integer *, 
 	    doublereal *, integer *), dtrsm_(
 	    const char *, const char *, const char *, const char *, integer *, integer *, doublereal *
 	    , doublereal *, integer *, doublereal *, integer *);
-    static logical upper;
+     logical upper;
     extern /* Subroutine */ integer dtrti2_(const char *, const char *, integer *, doublereal 
 	    *, integer *, integer *);
-    static integer jb, nb, nn;
+     integer jb, nb, nn;
     extern /* Subroutine */ integer xerbla_(const char *, integer *);
     extern integer ilaenv_(integer *, const char *, const char *, integer *, integer *, 
 	    integer *, integer *, ftnlen, ftnlen);
-    static logical nounit;
+     logical nounit;
 #define a_ref(a_1,a_2) a[(a_2)*a_dim1 + a_1]
 
 
diff --git a/external/hypre/src/lapack/f2c.h b/external/hypre/src/lapack/f2c.h
index 5182c58b..f8353406 100644
--- a/external/hypre/src/lapack/f2c.h
+++ b/external/hypre/src/lapack/f2c.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -22,11 +22,7 @@
 #include "_hypre_utilities.h"
 #include "math.h"
 
-#if defined(HYPRE_SINGLE)
-#define sqrt sqrtf
-#elif defined(HYPRE_LONG_DOUBLE)
-#define sqrt sqrtl
-#endif
+#define sqrt hypre_sqrt
 
 #ifdef HYPRE_BIGINT
 typedef long long int HYPRE_LongInt;
@@ -221,17 +217,17 @@ typedef shortlogical (*K_fp)(...);
 typedef /* Character */ VOID (*H_fp)(...);
 typedef /* Subroutine */ HYPRE_Int (*S_fp)(...);
 #else
-typedef HYPRE_Int /* Unknown procedure type */ (*U_fp)();
-typedef shortint (*J_fp)();
-typedef integer (*I_fp)();
-typedef real (*R_fp)();
-typedef doublereal (*D_fp)(), (*E_fp)();
-typedef /* Complex */ VOID (*C_fp)();
-typedef /* Double Complex */ VOID (*Z_fp)();
-typedef logical (*L_fp)();
-typedef shortlogical (*K_fp)();
-typedef /* Character */ VOID (*H_fp)();
-typedef /* Subroutine */ HYPRE_Int (*S_fp)();
+typedef HYPRE_Int /* Unknown procedure type */ (*U_fp)(void);
+typedef shortint (*J_fp)(void);
+typedef integer (*I_fp)(void);
+typedef real (*R_fp)(void);
+typedef doublereal (*D_fp)(void), (*E_fp)(void);
+typedef /* Complex */ VOID (*C_fp)(void);
+typedef /* Double Complex */ VOID (*Z_fp)(void);
+typedef logical (*L_fp)(void);
+typedef shortlogical (*K_fp)(void);
+typedef /* Character */ VOID (*H_fp)(void);
+typedef /* Subroutine */ HYPRE_Int (*S_fp)(void);
 #endif
 /* E_fp is for real functions when -R is not specified */
 typedef VOID C_f;	/* complex function */
diff --git a/external/hypre/src/lapack/hypre_lapack.h b/external/hypre/src/lapack/hypre_lapack.h
index 18c5fc4e..0fec7348 100644
--- a/external/hypre/src/lapack/hypre_lapack.h
+++ b/external/hypre/src/lapack/hypre_lapack.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/lapack/ieeeck.c b/external/hypre/src/lapack/ieeeck.c
index 809a7102..bad3a854 100644
--- a/external/hypre/src/lapack/ieeeck.c
+++ b/external/hypre/src/lapack/ieeeck.c
@@ -10,44 +10,44 @@ extern "C" {
 
 integer ieeeck_(integer *ispec, real *zero, real *one)
 {
-/*  -- LAPACK auxiliary routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       June 30, 1998   
+/*  -- LAPACK auxiliary routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       June 30, 1998
 
 
-    Purpose   
-    =======   
+    Purpose
+    =======
 
-    IEEECK is called from the ILAENV to verify that Infinity and   
-    possibly NaN arithmetic is safe (i.e. will not trap).   
+    IEEECK is called from the ILAENV to verify that Infinity and
+    possibly NaN arithmetic is safe (i.e. will not trap).
 
-    Arguments   
-    =========   
+    Arguments
+    =========
 
-    ISPEC   (input) INTEGER   
-            Specifies whether to test just for inifinity arithmetic   
-            or whether to test for infinity and NaN arithmetic.   
-            = 0: Verify infinity arithmetic only.   
-            = 1: Verify infinity and NaN arithmetic.   
+    ISPEC   (input) INTEGER
+            Specifies whether to test just for inifinity arithmetic
+            or whether to test for infinity and NaN arithmetic.
+            = 0: Verify infinity arithmetic only.
+            = 1: Verify infinity and NaN arithmetic.
 
-    ZERO    (input) REAL   
-            Must contain the value 0.0   
-            This is passed to prevent the compiler from optimizing   
-            away this code.   
+    ZERO    (input) REAL
+            Must contain the value 0.0
+            This is passed to prevent the compiler from optimizing
+            away this code.
 
-    ONE     (input) REAL   
-            Must contain the value 1.0   
-            This is passed to prevent the compiler from optimizing   
-            away this code.   
+    ONE     (input) REAL
+            Must contain the value 1.0
+            This is passed to prevent the compiler from optimizing
+            away this code.
 
-    RETURN VALUE:  INTEGER   
-            = 0:  Arithmetic failed to produce the correct answers   
+    RETURN VALUE:  INTEGER
+            = 0:  Arithmetic failed to produce the correct answers
             = 1:  Arithmetic produced the correct answers */
     /* System generated locals */
     integer ret_val;
     /* Local variables */
-    static real neginf, posinf, negzro, newzro, nan1, nan2, nan3, nan4, nan5, 
+    real neginf, posinf, negzro, newzro, nan1, nan2, nan3, nan4, nan5,
 	    nan6;
 
 
diff --git a/external/hypre/src/lapack/ilaenv.c b/external/hypre/src/lapack/ilaenv.c
index b766e403..2186b452 100644
--- a/external/hypre/src/lapack/ilaenv.c
+++ b/external/hypre/src/lapack/ilaenv.c
@@ -8,114 +8,114 @@ extern "C" {
 #include "f2c.h"
 #include "hypre_lapack.h"
 
-integer ilaenv_(integer *ispec,const char *name__,const char *opts, integer *n1, 
-	integer *n2, integer *n3, integer *n4, ftnlen name_len, ftnlen 
+integer ilaenv_(integer *ispec,const char *name__,const char *opts, integer *n1,
+	integer *n2, integer *n3, integer *n4, ftnlen name_len, ftnlen
 	opts_len)
 {
-/*  -- LAPACK auxiliary routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       June 30, 1999   
-
-
-    Purpose   
-    =======   
-
-    ILAENV is called from the LAPACK routines to choose problem-dependent   
-    parameters for the local environment.  See ISPEC for a description of   
-    the parameters.   
-
-    This version provides a set of parameters which should give good,   
-    but not optimal, performance on many of the currently available   
-    computers.  Users are encouraged to modify this subroutine to set   
-    the tuning parameters for their particular machine using the option   
-    and problem size information in the arguments.   
-
-    This routine will not function correctly if it is converted to all   
-    lower case.  Converting it to all upper case is allowed.   
-
-    Arguments   
-    =========   
-
-    ISPEC   (input) INTEGER   
-            Specifies the parameter to be returned as the value of   
-            ILAENV.   
-            = 1: the optimal blocksize; if this value is 1, an unblocked   
-                 algorithm will give the best performance.   
-            = 2: the minimum block size for which the block routine   
-                 should be used; if the usable block size is less than   
-                 this value, an unblocked routine should be used.   
-            = 3: the crossover point (in a block routine, for N less   
-                 than this value, an unblocked routine should be used)   
-            = 4: the number of shifts, used in the nonsymmetric   
-                 eigenvalue routines   
-            = 5: the minimum column dimension for blocking to be used;   
-                 rectangular blocks must have dimension at least k by m,   
-                 where k is given by ILAENV(2,...) and m by ILAENV(5,...)   
-            = 6: the crossover point for the SVD (when reducing an m by n   
-                 matrix to bidiagonal form, if max(m,n)/min(m,n) exceeds   
-                 this value, a QR factorization is used first to reduce   
-                 the matrix to a triangular form.)   
-            = 7: the number of processors   
-            = 8: the crossover point for the multishift QR and QZ methods   
-                 for nonsymmetric eigenvalue problems.   
-            = 9: maximum size of the subproblems at the bottom of the   
-                 computation tree in the divide-and-conquer algorithm   
-                 (used by xGELSD and xGESDD)   
-            =10: ieee NaN arithmetic can be trusted not to trap   
-            =11: infinity arithmetic can be trusted not to trap   
-
-    NAME    (input) CHARACTER*(*)   
-            The name of the calling subroutine, in either upper case or   
-            lower case.   
-
-    OPTS    (input) CHARACTER*(*)   
-            The character options to the subroutine NAME, concatenated   
-            into a single character string.  For example, UPLO = 'U',   
-            TRANS = 'T', and DIAG = 'N' for a triangular routine would   
-            be specified as OPTS = 'UTN'.   
-
-    N1      (input) INTEGER   
-    N2      (input) INTEGER   
-    N3      (input) INTEGER   
-    N4      (input) INTEGER   
-            Problem dimensions for the subroutine NAME; these may not all   
-            be required.   
-
-   (ILAENV) (output) INTEGER   
-            >= 0: the value of the parameter specified by ISPEC   
-            < 0:  if ILAENV = -k, the k-th argument had an illegal value.   
-
-    Further Details   
-    ===============   
-
-    The following conventions have been used when calling ILAENV from the   
-    LAPACK routines:   
-    1)  OPTS is a concatenation of all of the character options to   
-        subroutine NAME, in the same order that they appear in the   
-        argument list for NAME, even if they are not used in determining   
-        the value of the parameter specified by ISPEC.   
-    2)  The problem dimensions N1, N2, N3, N4 are specified in the order   
-        that they appear in the argument list for NAME.  N1 is used   
-        first, N2 second, and so on, and unused problem dimensions are   
-        passed a value of -1.   
-    3)  The parameter value returned by ILAENV is checked for validity in   
-        the calling subroutine.  For example, ILAENV is used to retrieve   
-        the optimal blocksize for STRTRI as follows:   
-
-        NB = ILAENV( 1, 'STRTRI', UPLO // DIAG, N, -1, -1, -1 )   
-        IF( NB.LE.1 ) NB = MAX( 1, N )   
+/*  -- LAPACK auxiliary routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       June 30, 1999
+
+
+    Purpose
+    =======
+
+    ILAENV is called from the LAPACK routines to choose problem-dependent
+    parameters for the local environment.  See ISPEC for a description of
+    the parameters.
+
+    This version provides a set of parameters which should give good,
+    but not optimal, performance on many of the currently available
+    computers.  Users are encouraged to modify this subroutine to set
+    the tuning parameters for their particular machine using the option
+    and problem size information in the arguments.
+
+    This routine will not function correctly if it is converted to all
+    lower case.  Converting it to all upper case is allowed.
+
+    Arguments
+    =========
+
+    ISPEC   (input) INTEGER
+            Specifies the parameter to be returned as the value of
+            ILAENV.
+            = 1: the optimal blocksize; if this value is 1, an unblocked
+                 algorithm will give the best performance.
+            = 2: the minimum block size for which the block routine
+                 should be used; if the usable block size is less than
+                 this value, an unblocked routine should be used.
+            = 3: the crossover point (in a block routine, for N less
+                 than this value, an unblocked routine should be used)
+            = 4: the number of shifts, used in the nonsymmetric
+                 eigenvalue routines
+            = 5: the minimum column dimension for blocking to be used;
+                 rectangular blocks must have dimension at least k by m,
+                 where k is given by ILAENV(2,...) and m by ILAENV(5,...)
+            = 6: the crossover point for the SVD (when reducing an m by n
+                 matrix to bidiagonal form, if max(m,n)/min(m,n) exceeds
+                 this value, a QR factorization is used first to reduce
+                 the matrix to a triangular form.)
+            = 7: the number of processors
+            = 8: the crossover point for the multishift QR and QZ methods
+                 for nonsymmetric eigenvalue problems.
+            = 9: maximum size of the subproblems at the bottom of the
+                 computation tree in the divide-and-conquer algorithm
+                 (used by xGELSD and xGESDD)
+            =10: ieee NaN arithmetic can be trusted not to trap
+            =11: infinity arithmetic can be trusted not to trap
+
+    NAME    (input) CHARACTER*(*)
+            The name of the calling subroutine, in either upper case or
+            lower case.
+
+    OPTS    (input) CHARACTER*(*)
+            The character options to the subroutine NAME, concatenated
+            into a single character string.  For example, UPLO = 'U',
+            TRANS = 'T', and DIAG = 'N' for a triangular routine would
+            be specified as OPTS = 'UTN'.
+
+    N1      (input) INTEGER
+    N2      (input) INTEGER
+    N3      (input) INTEGER
+    N4      (input) INTEGER
+            Problem dimensions for the subroutine NAME; these may not all
+            be required.
+
+   (ILAENV) (output) INTEGER
+            >= 0: the value of the parameter specified by ISPEC
+            < 0:  if ILAENV = -k, the k-th argument had an illegal value.
+
+    Further Details
+    ===============
+
+    The following conventions have been used when calling ILAENV from the
+    LAPACK routines:
+    1)  OPTS is a concatenation of all of the character options to
+        subroutine NAME, in the same order that they appear in the
+        argument list for NAME, even if they are not used in determining
+        the value of the parameter specified by ISPEC.
+    2)  The problem dimensions N1, N2, N3, N4 are specified in the order
+        that they appear in the argument list for NAME.  N1 is used
+        first, N2 second, and so on, and unused problem dimensions are
+        passed a value of -1.
+    3)  The parameter value returned by ILAENV is checked for validity in
+        the calling subroutine.  For example, ILAENV is used to retrieve
+        the optimal blocksize for STRTRI as follows:
+
+        NB = ILAENV( 1, 'STRTRI', UPLO // DIAG, N, -1, -1, -1 )
+        IF( NB.LE.1 ) NB = MAX( 1, N )
 
     ===================================================================== */
     /* Table of constant values */
-    static integer c__0 = 0;
-    static real c_b162 = 0.f;
-    static real c_b163 = 1.f;
-    static integer c__1 = 1;
-    
+    integer c__0 = 0;
+    real c_b162 = 0.f;
+    real c_b163 = 1.f;
+    integer c__1 = 1;
+
     /* System generated locals */
     integer ret_val;
-    /* Builtin functions   
+    /* Builtin functions
        Subroutine */
 
     /* Builtin functions */
@@ -123,15 +123,17 @@ integer ilaenv_(integer *ispec,const char *name__,const char *opts, integer *n1,
     integer s_cmp(char *, const char *, ftnlen, ftnlen);
 
     /* Local variables */
-    static integer i__;
-    static logical cname, sname;
-    static integer nbmin;
-    static char c1[1], c2[2], c3[3], c4[2];
-    static integer ic, nb;
+    integer i__;
+    logical cname, sname;
+    integer nbmin;
+    char c1[1], c2[2], c3[3], c4[2];
+    integer ic, nb;
     extern integer ieeeck_(integer *, real *, real *);
-    static integer iz, nx;
-    static char subnam[6];
-
+    integer iz, nx;
+    char subnam[6];
+    HYPRE_UNUSED_VAR(opts);
+    HYPRE_UNUSED_VAR(n3);
+    HYPRE_UNUSED_VAR(opts_len);
 
 
 
@@ -181,14 +183,14 @@ integer ilaenv_(integer *ispec,const char *name__,const char *opts, integer *n1,
 
 /*        EBCDIC character set */
 
-	if (((ic >= 129) && (ic <= 137)) || 
-            ((ic >= 145) && (ic <= 153)) || 
+	if (((ic >= 129) && (ic <= 137)) ||
+            ((ic >= 145) && (ic <= 153)) ||
             ((ic >= 162) && (ic <= 169))) {
 	    *(unsigned char *)subnam = (char) (ic + 64);
 	    for (i__ = 2; i__ <= 6; ++i__) {
 		ic = *(unsigned char *)&subnam[i__ - 1];
-		if (((ic >= 129) && (ic <= 137)) || 
-                    ((ic >= 145) && (ic <= 153)) || 
+		if (((ic >= 129) && (ic <= 137)) ||
+                    ((ic >= 145) && (ic <= 153)) ||
                     ((ic >= 162) && (ic <= 169))) {
 		    *(unsigned char *)&subnam[i__ - 1] = (char) (ic + 64);
 		}
@@ -230,10 +232,10 @@ integer ilaenv_(integer *ispec,const char *name__,const char *opts, integer *n1,
 
 L110:
 
-/*     ISPEC = 1:  block size   
+/*     ISPEC = 1:  block size
 
-       In these examples, separate code is provided for setting NB for   
-       real and complex.  We assume that NB will take the same value in   
+       In these examples, separate code is provided for setting NB for
+       real and complex.  We assume that NB will take the same value in
        single or doublereal precision. */
 
     nb = 1;
@@ -245,9 +247,9 @@ integer ilaenv_(integer *ispec,const char *name__,const char *opts, integer *n1,
 	    } else {
 		nb = 64;
 	    }
-	} else if (s_cmp(c3, "QRF", (ftnlen)3, (ftnlen)3) == 0 || s_cmp(c3, 
+	} else if (s_cmp(c3, "QRF", (ftnlen)3, (ftnlen)3) == 0 || s_cmp(c3,
 		"RQF", (ftnlen)3, (ftnlen)3) == 0 || s_cmp(c3, "LQF", (ftnlen)
-		3, (ftnlen)3) == 0 || s_cmp(c3, "QLF", (ftnlen)3, (ftnlen)3) 
+		3, (ftnlen)3) == 0 || s_cmp(c3, "QLF", (ftnlen)3, (ftnlen)3)
 		== 0) {
 	    if (sname) {
 		nb = 32;
@@ -303,7 +305,7 @@ integer ilaenv_(integer *ispec,const char *name__,const char *opts, integer *n1,
 	}
     } else if (sname && s_cmp(c2, "OR", (ftnlen)2, (ftnlen)2) == 0) {
 	if (*(unsigned char *)c3 == 'G') {
-	    if (s_cmp(c4, "QR", (ftnlen)2, (ftnlen)2) == 0 || s_cmp(c4, "RQ", 
+	    if (s_cmp(c4, "QR", (ftnlen)2, (ftnlen)2) == 0 || s_cmp(c4, "RQ",
 		    (ftnlen)2, (ftnlen)2) == 0 || s_cmp(c4, "LQ", (ftnlen)2, (
 		    ftnlen)2) == 0 || s_cmp(c4, "QL", (ftnlen)2, (ftnlen)2) ==
 		     0 || s_cmp(c4, "HR", (ftnlen)2, (ftnlen)2) == 0 || s_cmp(
@@ -312,7 +314,7 @@ integer ilaenv_(integer *ispec,const char *name__,const char *opts, integer *n1,
 		nb = 32;
 	    }
 	} else if (*(unsigned char *)c3 == 'M') {
-	    if (s_cmp(c4, "QR", (ftnlen)2, (ftnlen)2) == 0 || s_cmp(c4, "RQ", 
+	    if (s_cmp(c4, "QR", (ftnlen)2, (ftnlen)2) == 0 || s_cmp(c4, "RQ",
 		    (ftnlen)2, (ftnlen)2) == 0 || s_cmp(c4, "LQ", (ftnlen)2, (
 		    ftnlen)2) == 0 || s_cmp(c4, "QL", (ftnlen)2, (ftnlen)2) ==
 		     0 || s_cmp(c4, "HR", (ftnlen)2, (ftnlen)2) == 0 || s_cmp(
@@ -323,7 +325,7 @@ integer ilaenv_(integer *ispec,const char *name__,const char *opts, integer *n1,
 	}
     } else if (cname && s_cmp(c2, "UN", (ftnlen)2, (ftnlen)2) == 0) {
 	if (*(unsigned char *)c3 == 'G') {
-	    if (s_cmp(c4, "QR", (ftnlen)2, (ftnlen)2) == 0 || s_cmp(c4, "RQ", 
+	    if (s_cmp(c4, "QR", (ftnlen)2, (ftnlen)2) == 0 || s_cmp(c4, "RQ",
 		    (ftnlen)2, (ftnlen)2) == 0 || s_cmp(c4, "LQ", (ftnlen)2, (
 		    ftnlen)2) == 0 || s_cmp(c4, "QL", (ftnlen)2, (ftnlen)2) ==
 		     0 || s_cmp(c4, "HR", (ftnlen)2, (ftnlen)2) == 0 || s_cmp(
@@ -332,7 +334,7 @@ integer ilaenv_(integer *ispec,const char *name__,const char *opts, integer *n1,
 		nb = 32;
 	    }
 	} else if (*(unsigned char *)c3 == 'M') {
-	    if (s_cmp(c4, "QR", (ftnlen)2, (ftnlen)2) == 0 || s_cmp(c4, "RQ", 
+	    if (s_cmp(c4, "QR", (ftnlen)2, (ftnlen)2) == 0 || s_cmp(c4, "RQ",
 		    (ftnlen)2, (ftnlen)2) == 0 || s_cmp(c4, "LQ", (ftnlen)2, (
 		    ftnlen)2) == 0 || s_cmp(c4, "QL", (ftnlen)2, (ftnlen)2) ==
 		     0 || s_cmp(c4, "HR", (ftnlen)2, (ftnlen)2) == 0 || s_cmp(
@@ -447,7 +449,7 @@ integer ilaenv_(integer *ispec,const char *name__,const char *opts, integer *n1,
 	}
     } else if (sname && s_cmp(c2, "OR", (ftnlen)2, (ftnlen)2) == 0) {
 	if (*(unsigned char *)c3 == 'G') {
-	    if (s_cmp(c4, "QR", (ftnlen)2, (ftnlen)2) == 0 || s_cmp(c4, "RQ", 
+	    if (s_cmp(c4, "QR", (ftnlen)2, (ftnlen)2) == 0 || s_cmp(c4, "RQ",
 		    (ftnlen)2, (ftnlen)2) == 0 || s_cmp(c4, "LQ", (ftnlen)2, (
 		    ftnlen)2) == 0 || s_cmp(c4, "QL", (ftnlen)2, (ftnlen)2) ==
 		     0 || s_cmp(c4, "HR", (ftnlen)2, (ftnlen)2) == 0 || s_cmp(
@@ -456,7 +458,7 @@ integer ilaenv_(integer *ispec,const char *name__,const char *opts, integer *n1,
 		nbmin = 2;
 	    }
 	} else if (*(unsigned char *)c3 == 'M') {
-	    if (s_cmp(c4, "QR", (ftnlen)2, (ftnlen)2) == 0 || s_cmp(c4, "RQ", 
+	    if (s_cmp(c4, "QR", (ftnlen)2, (ftnlen)2) == 0 || s_cmp(c4, "RQ",
 		    (ftnlen)2, (ftnlen)2) == 0 || s_cmp(c4, "LQ", (ftnlen)2, (
 		    ftnlen)2) == 0 || s_cmp(c4, "QL", (ftnlen)2, (ftnlen)2) ==
 		     0 || s_cmp(c4, "HR", (ftnlen)2, (ftnlen)2) == 0 || s_cmp(
@@ -467,7 +469,7 @@ integer ilaenv_(integer *ispec,const char *name__,const char *opts, integer *n1,
 	}
     } else if (cname && s_cmp(c2, "UN", (ftnlen)2, (ftnlen)2) == 0) {
 	if (*(unsigned char *)c3 == 'G') {
-	    if (s_cmp(c4, "QR", (ftnlen)2, (ftnlen)2) == 0 || s_cmp(c4, "RQ", 
+	    if (s_cmp(c4, "QR", (ftnlen)2, (ftnlen)2) == 0 || s_cmp(c4, "RQ",
 		    (ftnlen)2, (ftnlen)2) == 0 || s_cmp(c4, "LQ", (ftnlen)2, (
 		    ftnlen)2) == 0 || s_cmp(c4, "QL", (ftnlen)2, (ftnlen)2) ==
 		     0 || s_cmp(c4, "HR", (ftnlen)2, (ftnlen)2) == 0 || s_cmp(
@@ -476,7 +478,7 @@ integer ilaenv_(integer *ispec,const char *name__,const char *opts, integer *n1,
 		nbmin = 2;
 	    }
 	} else if (*(unsigned char *)c3 == 'M') {
-	    if (s_cmp(c4, "QR", (ftnlen)2, (ftnlen)2) == 0 || s_cmp(c4, "RQ", 
+	    if (s_cmp(c4, "QR", (ftnlen)2, (ftnlen)2) == 0 || s_cmp(c4, "RQ",
 		    (ftnlen)2, (ftnlen)2) == 0 || s_cmp(c4, "LQ", (ftnlen)2, (
 		    ftnlen)2) == 0 || s_cmp(c4, "QL", (ftnlen)2, (ftnlen)2) ==
 		     0 || s_cmp(c4, "HR", (ftnlen)2, (ftnlen)2) == 0 || s_cmp(
@@ -527,7 +529,7 @@ integer ilaenv_(integer *ispec,const char *name__,const char *opts, integer *n1,
 	}
     } else if (sname && s_cmp(c2, "OR", (ftnlen)2, (ftnlen)2) == 0) {
 	if (*(unsigned char *)c3 == 'G') {
-	    if (s_cmp(c4, "QR", (ftnlen)2, (ftnlen)2) == 0 || s_cmp(c4, "RQ", 
+	    if (s_cmp(c4, "QR", (ftnlen)2, (ftnlen)2) == 0 || s_cmp(c4, "RQ",
 		    (ftnlen)2, (ftnlen)2) == 0 || s_cmp(c4, "LQ", (ftnlen)2, (
 		    ftnlen)2) == 0 || s_cmp(c4, "QL", (ftnlen)2, (ftnlen)2) ==
 		     0 || s_cmp(c4, "HR", (ftnlen)2, (ftnlen)2) == 0 || s_cmp(
@@ -538,7 +540,7 @@ integer ilaenv_(integer *ispec,const char *name__,const char *opts, integer *n1,
 	}
     } else if (cname && s_cmp(c2, "UN", (ftnlen)2, (ftnlen)2) == 0) {
 	if (*(unsigned char *)c3 == 'G') {
-	    if (s_cmp(c4, "QR", (ftnlen)2, (ftnlen)2) == 0 || s_cmp(c4, "RQ", 
+	    if (s_cmp(c4, "QR", (ftnlen)2, (ftnlen)2) == 0 || s_cmp(c4, "RQ",
 		    (ftnlen)2, (ftnlen)2) == 0 || s_cmp(c4, "LQ", (ftnlen)2, (
 		    ftnlen)2) == 0 || s_cmp(c4, "QL", (ftnlen)2, (ftnlen)2) ==
 		     0 || s_cmp(c4, "HR", (ftnlen)2, (ftnlen)2) == 0 || s_cmp(
@@ -588,8 +590,8 @@ integer ilaenv_(integer *ispec,const char *name__,const char *opts, integer *n1,
 
 L900:
 
-/*     ISPEC = 9:  maximum size of the subproblems at the bottom of the   
-                   computation tree in the divide-and-conquer algorithm   
+/*     ISPEC = 9:  maximum size of the subproblems at the bottom of the
+                   computation tree in the divide-and-conquer algorithm
                    (used by xGELSD and xGESDD) */
 
     ret_val = 25;
@@ -597,7 +599,7 @@ integer ilaenv_(integer *ispec,const char *name__,const char *opts, integer *n1,
 
 L1000:
 
-/*     ISPEC = 10: ieee NaN arithmetic can be trusted not to trap   
+/*     ISPEC = 10: ieee NaN arithmetic can be trusted not to trap
 
        ILAENV = 0 */
     ret_val = 1;
@@ -608,7 +610,7 @@ integer ilaenv_(integer *ispec,const char *name__,const char *opts, integer *n1,
 
 L1100:
 
-/*     ISPEC = 11: infinity arithmetic can be trusted not to trap   
+/*     ISPEC = 11: infinity arithmetic can be trusted not to trap
 
        ILAENV = 0 */
     ret_val = 1;
diff --git a/external/hypre/src/lapack/lsame.c b/external/hypre/src/lapack/lsame.c
index 51196653..5ac6f61e 100644
--- a/external/hypre/src/lapack/lsame.c
+++ b/external/hypre/src/lapack/lsame.c
@@ -10,34 +10,34 @@ extern "C" {
 
 logical lsame_(const char *ca,const char *cb)
 {
-/*  -- LAPACK auxiliary routine (version 3.0) --   
-       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,   
-       Courant Institute, Argonne National Lab, and Rice University   
-       September 30, 1994   
+/*  -- LAPACK auxiliary routine (version 3.0) --
+       Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
+       Courant Institute, Argonne National Lab, and Rice University
+       September 30, 1994
 
 
-    Purpose   
-    =======   
+    Purpose
+    =======
 
-    LSAME returns .TRUE. if CA is the same letter as CB regardless of   
-    case.   
+    LSAME returns .TRUE. if CA is the same letter as CB regardless of
+    case.
 
-    Arguments   
-    =========   
+    Arguments
+    =========
 
-    CA      (input) CHARACTER*1   
-    CB      (input) CHARACTER*1   
-            CA and CB specify the single characters to be compared.   
+    CA      (input) CHARACTER*1
+    CB      (input) CHARACTER*1
+            CA and CB specify the single characters to be compared.
+
+   =====================================================================
 
-   ===================================================================== 
-  
 
 
        Test if the characters are equal */
     /* System generated locals */
     logical ret_val;
     /* Local variables */
-    static integer inta, intb, zcode;
+    integer inta, intb, zcode;
 
 
     ret_val = *(unsigned char *)ca == *(unsigned char *)cb;
@@ -49,9 +49,9 @@ logical lsame_(const char *ca,const char *cb)
 
     zcode = 'Z';
 
-/*     Use 'Z' rather than 'A' so that ASCII can be detected on Prime   
-       machines, on which ICHAR returns a value with bit 8 set.   
-       ICHAR('A') on Prime machines returns 193 which is the same as   
+/*     Use 'Z' rather than 'A' so that ASCII can be detected on Prime
+       machines, on which ICHAR returns a value with bit 8 set.
+       ICHAR('A') on Prime machines returns 193 which is the same as
        ICHAR('A') on an EBCDIC machine. */
 
     inta = *(unsigned char *)ca;
@@ -60,7 +60,7 @@ logical lsame_(const char *ca,const char *cb)
     if (zcode == 90 || zcode == 122) {
 
 /*        ASCII is assumed - ZCODE is the ASCII code of either lower o
-r   
+r
           upper case 'Z'. */
 
 	if (inta >= 97 && inta <= 122) {
@@ -73,16 +73,16 @@ r
     } else if (zcode == 233 || zcode == 169) {
 
 /*        EBCDIC is assumed - ZCODE is the EBCDIC code of either lower
- or   
+ or
           upper case 'Z'. */
 
-	if (((inta >= 129) && (inta <= 137)) || 
-            ((inta >= 145) && (inta <= 153)) || 
+	if (((inta >= 129) && (inta <= 137)) ||
+            ((inta >= 145) && (inta <= 153)) ||
             ((inta >= 162) && (inta <= 169))) {
 	    inta += 64;
 	}
-	if (((intb >= 129) && (intb <= 137)) || 
-            ((intb >= 145) && (intb <= 153)) || 
+	if (((intb >= 129) && (intb <= 137)) ||
+            ((intb >= 145) && (intb <= 153)) ||
             ((intb >= 162) && (intb <= 169))) {
 	    intb += 64;
 	}
@@ -90,7 +90,7 @@ r
     } else if (zcode == 218 || zcode == 250) {
 
 /*        ASCII is assumed, on Prime machines - ZCODE is the ASCII cod
-e   
+e
           plus 128 of either lower or upper case 'Z'. */
 
 	if (inta >= 225 && inta <= 250) {
@@ -102,7 +102,7 @@ e
     }
     ret_val = inta == intb;
 
-/*     RETURN   
+/*     RETURN
 
        End of LSAME */
 
diff --git a/external/hypre/src/matrix_matrix/CMakeLists.txt b/external/hypre/src/matrix_matrix/CMakeLists.txt
index b1762f60..f47b69c7 100644
--- a/external/hypre/src/matrix_matrix/CMakeLists.txt
+++ b/external/hypre/src/matrix_matrix/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/matrix_matrix/HYPRE_BuildIJMatrixFromDistributedMatrix.c b/external/hypre/src/matrix_matrix/HYPRE_BuildIJMatrixFromDistributedMatrix.c
index 1d713044..99ce6deb 100644
--- a/external/hypre/src/matrix_matrix/HYPRE_BuildIJMatrixFromDistributedMatrix.c
+++ b/external/hypre/src/matrix_matrix/HYPRE_BuildIJMatrixFromDistributedMatrix.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -30,15 +30,15 @@
 #include "IJ_mv/HYPRE_IJ_mv.h"
 
 /* Local routine prototypes */
-HYPRE_Int HYPRE_IJMatrixSetLocalStorageType(HYPRE_IJMatrix ij_matrix, 
-                                      HYPRE_Int local_storage_type );
+HYPRE_Int HYPRE_IJMatrixSetLocalStorageType(HYPRE_IJMatrix ij_matrix,
+                                            HYPRE_Int local_storage_type );
 
-HYPRE_Int HYPRE_IJMatrixSetLocalSize(HYPRE_IJMatrix ij_matrix, 
-                               HYPRE_Int row, HYPRE_Int col );
+HYPRE_Int HYPRE_IJMatrixSetLocalSize(HYPRE_IJMatrix ij_matrix,
+                                     HYPRE_Int row, HYPRE_Int col );
 
-HYPRE_Int HYPRE_IJMatrixInsertRow( HYPRE_IJMatrix ij_matrix, 
-                             HYPRE_Int size, HYPRE_BigInt i, HYPRE_BigInt *col_ind,
-                             HYPRE_Real *values );
+HYPRE_Int HYPRE_IJMatrixInsertRow( HYPRE_IJMatrix ij_matrix,
+                                   HYPRE_Int size, HYPRE_BigInt i, HYPRE_BigInt *col_ind,
+                                   HYPRE_Real *values );
 
 /*--------------------------------------------------------------------------
  * HYPRE_BuildIJMatrixFromDistributedMatrix
@@ -49,13 +49,13 @@ distributed_matrix and putting them into the IJMatrix. This routine does not
 effect the distributed matrix. In essence, it makes a copy of the input matrix
 in another format. NOTE: because this routine makes a copy and is not just
 a simple conversion, it is memory-expensive and should only be used in
-low-memory requirement situations (such as unit-testing code). 
+low-memory requirement situations (such as unit-testing code).
 */
-HYPRE_Int 
+HYPRE_Int
 HYPRE_BuildIJMatrixFromDistributedMatrix(
-                 HYPRE_DistributedMatrix DistributedMatrix,
-                 HYPRE_IJMatrix *ij_matrix,
-                 HYPRE_Int local_storage_type )
+   HYPRE_DistributedMatrix DistributedMatrix,
+   HYPRE_IJMatrix *ij_matrix,
+   HYPRE_Int local_storage_type )
 {
    HYPRE_Int ierr;
    MPI_Comm comm;
@@ -69,32 +69,32 @@ HYPRE_BuildIJMatrixFromDistributedMatrix(
 
 
 
-   if (!DistributedMatrix) return(-1);
+   if (!DistributedMatrix) { return (-1); }
 
    comm = HYPRE_DistributedMatrixGetContext( DistributedMatrix );
    ierr = HYPRE_DistributedMatrixGetDims( DistributedMatrix, &M, &N );
 
-   ierr = HYPRE_DistributedMatrixGetLocalRange( DistributedMatrix, 
-             &first_local_row, &last_local_row ,
-             &first_local_col, &last_local_col );
+   ierr = HYPRE_DistributedMatrixGetLocalRange( DistributedMatrix,
+                                                &first_local_row, &last_local_row,
+                                                &first_local_col, &last_local_col );
 
    ierr = HYPRE_IJMatrixCreate( comm, first_local_row, last_local_row,
                                 first_local_col, last_local_col,
                                 ij_matrix );
 
-   ierr = HYPRE_IJMatrixSetLocalStorageType( 
-                 *ij_matrix, local_storage_type );
+   ierr = HYPRE_IJMatrixSetLocalStorageType(
+             *ij_matrix, local_storage_type );
    /* if(ierr) return(ierr); */
 
-   ierr = HYPRE_IJMatrixSetLocalSize( *ij_matrix, 
-                last_local_row-first_local_row+1,
-                last_local_col-first_local_col+1 );
+   ierr = HYPRE_IJMatrixSetLocalSize( *ij_matrix,
+                                      last_local_row - first_local_row + 1,
+                                      last_local_col - first_local_col + 1 );
 
    ierr = HYPRE_IJMatrixInitialize( *ij_matrix );
    /* if(ierr) return(ierr);*/
 
    /* Loop through all locally stored rows and insert them into ij_matrix */
-   for (i=first_local_row; i<= last_local_row; i++)
+   for (i = first_local_row; i <= last_local_row; i++)
    {
       ierr = HYPRE_DistributedMatrixGetRow( DistributedMatrix, i, &size, &col_ind, &values );
       /* if( ierr ) return(ierr);*/
@@ -110,6 +110,6 @@ HYPRE_BuildIJMatrixFromDistributedMatrix(
    ierr = HYPRE_IJMatrixAssemble( *ij_matrix );
    /* if(ierr) return(ierr); */
 
-   return(ierr);
+   return (ierr);
 }
 
diff --git a/external/hypre/src/matrix_matrix/HYPRE_ConvertPETScMatrixToDistributedMatrix.c b/external/hypre/src/matrix_matrix/HYPRE_ConvertPETScMatrixToDistributedMatrix.c
index 7caae03e..81b83e38 100644
--- a/external/hypre/src/matrix_matrix/HYPRE_ConvertPETScMatrixToDistributedMatrix.c
+++ b/external/hypre/src/matrix_matrix/HYPRE_ConvertPETScMatrixToDistributedMatrix.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -36,8 +36,8 @@
 
 HYPRE_Int
 HYPRE_ConvertPETScMatrixToDistributedMatrix(
-                 Mat PETSc_matrix,
-                 HYPRE_DistributedMatrix *DistributedMatrix )
+   Mat PETSc_matrix,
+   HYPRE_DistributedMatrix *DistributedMatrix )
 {
    HYPRE_Int ierr;
    MPI_Comm hypre_MPI_Comm;
@@ -48,7 +48,7 @@ HYPRE_ConvertPETScMatrixToDistributedMatrix(
 
 
 
-   if (!PETSc_matrix) return(-1);
+   if (!PETSc_matrix) { return (-1); }
 
 #ifdef HYPRE_TIMING
    timer = hypre_InitializeTiming( "ConvertPETScMatrixToDistributedMatrix");
@@ -62,7 +62,7 @@ HYPRE_ConvertPETScMatrixToDistributedMatrix(
    /* if(ierr) return(ierr); */
 
    ierr = HYPRE_DistributedMatrixSetLocalStorageType( *DistributedMatrix,
-                                                     HYPRE_PETSC );
+                                                      HYPRE_PETSC );
    /* if(ierr) return(ierr);*/
 
    ierr = HYPRE_DistributedMatrixInitialize( *DistributedMatrix );
@@ -76,7 +76,8 @@ HYPRE_ConvertPETScMatrixToDistributedMatrix(
       the latter is really a "just in case" option, and so if we don't *have*
       to use it, we won't.*/
 
-   ierr = MatGetSize( PETSc_matrix, &M, &N); if(ierr) return(ierr);
+   ierr = MatGetSize( PETSc_matrix, &M, &N);
+   if (ierr) { return (ierr); }
    ierr = HYPRE_DistributedMatrixSetDims( *DistributedMatrix, M, N);
 
    ierr = HYPRE_DistributedMatrixAssemble( *DistributedMatrix );
@@ -87,7 +88,7 @@ HYPRE_ConvertPETScMatrixToDistributedMatrix(
    /* hypre_FinalizeTiming( timer ); */
 #endif
 
-   return(0);
+   return (0);
 }
 
 #endif
diff --git a/external/hypre/src/matrix_matrix/HYPRE_ConvertParCSRMatrixToDistributedMatrix.c b/external/hypre/src/matrix_matrix/HYPRE_ConvertParCSRMatrixToDistributedMatrix.c
index c030abdb..f16f7304 100644
--- a/external/hypre/src/matrix_matrix/HYPRE_ConvertParCSRMatrixToDistributedMatrix.c
+++ b/external/hypre/src/matrix_matrix/HYPRE_ConvertParCSRMatrixToDistributedMatrix.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/matrix_matrix/HYPRE_matrix_matrix_protos.h b/external/hypre/src/matrix_matrix/HYPRE_matrix_matrix_protos.h
index 979c4d8b..5cb97266 100644
--- a/external/hypre/src/matrix_matrix/HYPRE_matrix_matrix_protos.h
+++ b/external/hypre/src/matrix_matrix/HYPRE_matrix_matrix_protos.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -9,9 +9,11 @@
 
 #ifdef PETSC_AVAILABLE
 /* HYPRE_ConvertPETScMatrixToDistributedMatrix.c */
-HYPRE_Int HYPRE_ConvertPETScMatrixToDistributedMatrix (Mat PETSc_matrix , HYPRE_DistributedMatrix *DistributedMatrix );
+HYPRE_Int HYPRE_ConvertPETScMatrixToDistributedMatrix (Mat PETSc_matrix,
+                                                       HYPRE_DistributedMatrix *DistributedMatrix );
 #endif
 
 /* HYPRE_ConvertParCSRMatrixToDistributedMatrix.c */
-HYPRE_Int HYPRE_ConvertParCSRMatrixToDistributedMatrix (HYPRE_ParCSRMatrix parcsr_matrix , HYPRE_DistributedMatrix *DistributedMatrix );
+HYPRE_Int HYPRE_ConvertParCSRMatrixToDistributedMatrix (HYPRE_ParCSRMatrix parcsr_matrix,
+                                                        HYPRE_DistributedMatrix *DistributedMatrix );
 
diff --git a/external/hypre/src/matrix_matrix/internal_protos.h b/external/hypre/src/matrix_matrix/internal_protos.h
index 9ce600c5..3df89435 100644
--- a/external/hypre/src/matrix_matrix/internal_protos.h
+++ b/external/hypre/src/matrix_matrix/internal_protos.h
@@ -1,9 +1,10 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
  ******************************************************************************/
 
 /* HYPRE_ConvertPETScMatrixToDistributedMatrix.c */
-HYPRE_Int HYPRE_ConvertPETScMatrixToDistributedMatrix (Mat PETSc_matrix , HYPRE_DistributedMatrix *DistributedMatrix );
+HYPRE_Int HYPRE_ConvertPETScMatrixToDistributedMatrix (Mat PETSc_matrix,
+                                                       HYPRE_DistributedMatrix *DistributedMatrix );
diff --git a/external/hypre/src/multivector/CMakeLists.txt b/external/hypre/src/multivector/CMakeLists.txt
index 0f298b99..ad396ed3 100644
--- a/external/hypre/src/multivector/CMakeLists.txt
+++ b/external/hypre/src/multivector/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/multivector/backup.c b/external/hypre/src/multivector/backup.c
index 4dec1cc7..12b8fdaf 100644
--- a/external/hypre/src/multivector/backup.c
+++ b/external/hypre/src/multivector/backup.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -10,556 +10,637 @@
 #include "temp_multivector.h"
 
 void*
-hypre_TempMultiVectorCreateFromSampleVector( void* ii_, HYPRE_Int n, void* sample ) {
+hypre_TempMultiVectorCreateFromSampleVector( void* ii_, HYPRE_Int n, void* sample )
+{
 
-  HYPRE_Int i;
-  hypre_TempMultiVector* data;
-  HYPRE_InterfaceInterpreter* ii = (HYPRE_InterfaceInterpreter*)ii_;
+   HYPRE_Int i;
+   hypre_TempMultiVector* data;
+   HYPRE_InterfaceInterpreter* ii = (HYPRE_InterfaceInterpreter*)ii_;
 
-  data = hypre_TAlloc(hypre_TempMultiVector, 1, HYPRE_MEMORY_HOST);
-  hypre_assert( data != NULL );
+   data = hypre_TAlloc(hypre_TempMultiVector, 1, HYPRE_MEMORY_HOST);
+   hypre_assert( data != NULL );
 
-  data->interpreter = ii;
-  data->numVectors = n;
+   data->interpreter = ii;
+   data->numVectors = n;
 
-  data->vector = hypre_CTAlloc(void*,  n, HYPRE_MEMORY_HOST);
-  hypre_assert( data->vector != NULL );
+   data->vector = hypre_CTAlloc(void*,  n, HYPRE_MEMORY_HOST);
+   hypre_assert( data->vector != NULL );
 
-  data->ownsVectors = 1;
-  data->mask = NULL;
-  data->ownsMask = 0;
+   data->ownsVectors = 1;
+   data->mask = NULL;
+   data->ownsMask = 0;
 
-  for ( i = 0; i < n; i++ )
-    data->vector[i] = (ii->CreateVector)(sample);
+   for ( i = 0; i < n; i++ )
+   {
+      data->vector[i] = (ii->CreateVector)(sample);
+   }
 
-  return data;
+   return data;
 
 }
 
 void*
-hypre_TempMultiVectorCreateCopy( void* src_, HYPRE_Int copyValues ) {
+hypre_TempMultiVectorCreateCopy( void* src_, HYPRE_Int copyValues )
+{
 
-  HYPRE_Int i, n;
+   HYPRE_Int i, n;
 
-  hypre_TempMultiVector* src;
-  hypre_TempMultiVector* dest;
+   hypre_TempMultiVector* src;
+   hypre_TempMultiVector* dest;
 
-  src = (hypre_TempMultiVector*)src_;
-  hypre_assert( src != NULL );
+   src = (hypre_TempMultiVector*)src_;
+   hypre_assert( src != NULL );
 
-  n = src->numVectors;
+   n = src->numVectors;
 
-  dest = hypre_TempMultiVectorCreateFromSampleVector( src->interpreter,
-                                                      n, src->vector[0] );
-  if ( copyValues )
-    for ( i = 0; i < n; i++ ) {
-      (dest->interpreter->CopyVector)(src->vector[i],dest->vector[i]);
-  }
+   dest = hypre_TempMultiVectorCreateFromSampleVector( src->interpreter,
+                                                       n, src->vector[0] );
+   if ( copyValues )
+      for ( i = 0; i < n; i++ )
+      {
+         (dest->interpreter->CopyVector)(src->vector[i], dest->vector[i]);
+      }
 
-  return dest;
+   return dest;
 }
 
 void
-hypre_TempMultiVectorDestroy( void* v_ ) {
-
-  HYPRE_Int i;
-  hypre_TempMultiVector* data = (hypre_TempMultiVector*)v_;
-
-  if ( data == NULL )
-    return;
-
-  if ( data->ownsVectors && data->vector != NULL ) {
-    for ( i = 0; i < data->numVectors; i++ )
-      (data->interpreter->DestroyVector)(data->vector[i]);
-    hypre_TFree(data->vector, HYPRE_MEMORY_HOST);
-  }
-  if ( data->mask && data->ownsMask )
-    hypre_TFree(data->mask, HYPRE_MEMORY_HOST);
-  hypre_TFree(data, HYPRE_MEMORY_HOST);
+hypre_TempMultiVectorDestroy( void* v_ )
+{
+
+   HYPRE_Int i;
+   hypre_TempMultiVector* data = (hypre_TempMultiVector*)v_;
+
+   if ( data == NULL )
+   {
+      return;
+   }
+
+   if ( data->ownsVectors && data->vector != NULL )
+   {
+      for ( i = 0; i < data->numVectors; i++ )
+      {
+         (data->interpreter->DestroyVector)(data->vector[i]);
+      }
+      hypre_TFree(data->vector, HYPRE_MEMORY_HOST);
+   }
+   if ( data->mask && data->ownsMask )
+   {
+      hypre_TFree(data->mask, HYPRE_MEMORY_HOST);
+   }
+   hypre_TFree(data, HYPRE_MEMORY_HOST);
 }
 
 HYPRE_Int
-hypre_TempMultiVectorWidth( void* v ) {
+hypre_TempMultiVectorWidth( void* v )
+{
 
-  hypre_TempMultiVector* data = (hypre_TempMultiVector*)v;
+   hypre_TempMultiVector* data = (hypre_TempMultiVector*)v;
 
-  if ( data == NULL )
-    return 0;
+   if ( data == NULL )
+   {
+      return 0;
+   }
 
-  return data->numVectors;
+   return data->numVectors;
 }
 
 HYPRE_Int
-hypre_TempMultiVectorHeight( void* v ) {
+hypre_TempMultiVectorHeight( void* v )
+{
 
-  return 0;
+   return 0;
 }
 
 void
-hypre_TempMultiVectorSetMask( void* v, HYPRE_Int* mask ) {
+hypre_TempMultiVectorSetMask( void* v, HYPRE_Int* mask )
+{
 
-  hypre_TempMultiVector* data = (hypre_TempMultiVector*)v;
+   hypre_TempMultiVector* data = (hypre_TempMultiVector*)v;
 
-  hypre_assert( data != NULL );
-  data->mask = mask;
-  data->ownsMask = 0;
+   hypre_assert( data != NULL );
+   data->mask = mask;
+   data->ownsMask = 0;
 }
 
 void
-hypre_TempMultiVectorClear( void* v ) {
+hypre_TempMultiVectorClear( void* v )
+{
 
-  HYPRE_Int i;
-  hypre_TempMultiVector* data = (hypre_TempMultiVector*)v;
+   HYPRE_Int i;
+   hypre_TempMultiVector* data = (hypre_TempMultiVector*)v;
 
-  hypre_assert( data != NULL );
+   hypre_assert( data != NULL );
 
-  for ( i = 0; i < data->numVectors; i++ )
-    if ( data->mask == NULL || (data->mask)[i] )
-      (data->interpreter->ClearVector)(data->vector[i]);
+   for ( i = 0; i < data->numVectors; i++ )
+      if ( data->mask == NULL || (data->mask)[i] )
+      {
+         (data->interpreter->ClearVector)(data->vector[i]);
+      }
 }
 
 void
-hypre_TempMultiVectorSetRandom( void* v, HYPRE_Int seed ) {
-
-  HYPRE_Int i;
-  hypre_TempMultiVector* data = (hypre_TempMultiVector*)v;
-
-  hypre_assert( data != NULL );
-
-  hypre_SeedRand( seed );
-  for ( i = 0; i < data->numVectors; i++ ) {
-    if ( data->mask == NULL || (data->mask)[i] ) {
-      seed = hypre_RandI();
-      (data->interpreter->SetRandomValues)(data->vector[i],seed);
-    }
-  }
+hypre_TempMultiVectorSetRandom( void* v, HYPRE_Int seed )
+{
+
+   HYPRE_Int i;
+   hypre_TempMultiVector* data = (hypre_TempMultiVector*)v;
+
+   hypre_assert( data != NULL );
+
+   hypre_SeedRand( seed );
+   for ( i = 0; i < data->numVectors; i++ )
+   {
+      if ( data->mask == NULL || (data->mask)[i] )
+      {
+         seed = hypre_RandI();
+         (data->interpreter->SetRandomValues)(data->vector[i], seed);
+      }
+   }
 }
 
 void
-hypre_collectVectorPtr( HYPRE_Int* mask, hypre_TempMultiVector* x, void** px ) {
-
-  HYPRE_Int ix, jx;
-
-  if ( mask != NULL ) {
-    for ( ix = 0, jx = 0; ix < x->numVectors; ix++ )
-      if ( mask[ix] )
-	px[jx++] = x->vector[ix];
-  }
-  else
-    for ( ix = 0; ix < x->numVectors; ix++ )
-      px[ix] = x->vector[ix];
+hypre_collectVectorPtr( HYPRE_Int* mask, hypre_TempMultiVector* x, void** px )
+{
+
+   HYPRE_Int ix, jx;
+
+   if ( mask != NULL )
+   {
+      for ( ix = 0, jx = 0; ix < x->numVectors; ix++ )
+         if ( mask[ix] )
+         {
+            px[jx++] = x->vector[ix];
+         }
+   }
+   else
+      for ( ix = 0; ix < x->numVectors; ix++ )
+      {
+         px[ix] = x->vector[ix];
+      }
 
 }
 
 void
-hypre_TempMultiVectorCopy( void* src, void* dest ) {
+hypre_TempMultiVectorCopy( void* src, void* dest )
+{
 
-  HYPRE_Int i, ms, md;
-  void** ps;
-  void** pd;
-  hypre_TempMultiVector* srcData = (hypre_TempMultiVector*)src;
-  hypre_TempMultiVector* destData = (hypre_TempMultiVector*)dest;
+   HYPRE_Int i, ms, md;
+   void** ps;
+   void** pd;
+   hypre_TempMultiVector* srcData = (hypre_TempMultiVector*)src;
+   hypre_TempMultiVector* destData = (hypre_TempMultiVector*)dest;
 
-  hypre_assert( srcData != NULL && destData != NULL );
+   hypre_assert( srcData != NULL && destData != NULL );
 
-  ms = aux_maskCount( srcData->numVectors, srcData->mask );
-  md = aux_maskCount( destData->numVectors, destData->mask );
-  hypre_assert( ms == md );
+   ms = aux_maskCount( srcData->numVectors, srcData->mask );
+   md = aux_maskCount( destData->numVectors, destData->mask );
+   hypre_assert( ms == md );
 
-  ps = hypre_CTAlloc(void*,  ms, HYPRE_MEMORY_HOST);
-  hypre_assert( ps != NULL );
-  pd = hypre_CTAlloc(void*,  md, HYPRE_MEMORY_HOST);
-  hypre_assert( pd != NULL );
+   ps = hypre_CTAlloc(void*,  ms, HYPRE_MEMORY_HOST);
+   hypre_assert( ps != NULL );
+   pd = hypre_CTAlloc(void*,  md, HYPRE_MEMORY_HOST);
+   hypre_assert( pd != NULL );
 
-  hypre_collectVectorPtr( srcData->mask, srcData, ps );
-  hypre_collectVectorPtr( destData->mask, destData, pd );
+   hypre_collectVectorPtr( srcData->mask, srcData, ps );
+   hypre_collectVectorPtr( destData->mask, destData, pd );
 
-  for ( i = 0; i < ms; i++ )
-    (srcData->interpreter->CopyVector)(ps[i],pd[i]);
+   for ( i = 0; i < ms; i++ )
+   {
+      (srcData->interpreter->CopyVector)(ps[i], pd[i]);
+   }
 
-  hypre_TFree(ps, HYPRE_MEMORY_HOST);
-  hypre_TFree(pd, HYPRE_MEMORY_HOST);
+   hypre_TFree(ps, HYPRE_MEMORY_HOST);
+   hypre_TFree(pd, HYPRE_MEMORY_HOST);
 }
 
 void
-hypre_TempMultiVectorAxpy( HYPRE_Complex a, void* x_, void* y_ ) {
-
-  HYPRE_Int i, mx, my;
-  void** px;
-  void** py;
-  hypre_TempMultiVector* xData;
-  hypre_TempMultiVector* yData;
-
-  xData = (hypre_TempMultiVector*)x_;
-  yData = (hypre_TempMultiVector*)y_;
-  hypre_assert( xData != NULL && yData != NULL );
-
-  mx = aux_maskCount( xData->numVectors, xData->mask );
-  my = aux_maskCount( yData->numVectors, yData->mask );
-  hypre_assert( mx == my );
-
-  px = hypre_CTAlloc(void*,  mx, HYPRE_MEMORY_HOST);
-  hypre_assert( px != NULL );
-  py = hypre_CTAlloc(void*,  my, HYPRE_MEMORY_HOST);
-  hypre_assert( py != NULL );
-
-  hypre_collectVectorPtr( xData->mask, xData, px );
-  hypre_collectVectorPtr( yData->mask, yData, py );
-
-  for ( i = 0; i < mx; i++ )
-    (xData->interpreter->Axpy)(a,px[i],py[i]);
-
-  hypre_TFree(px, HYPRE_MEMORY_HOST);
-  hypre_TFree(py, HYPRE_MEMORY_HOST);
+hypre_TempMultiVectorAxpy( HYPRE_Complex a, void* x_, void* y_ )
+{
+
+   HYPRE_Int i, mx, my;
+   void** px;
+   void** py;
+   hypre_TempMultiVector* xData;
+   hypre_TempMultiVector* yData;
+
+   xData = (hypre_TempMultiVector*)x_;
+   yData = (hypre_TempMultiVector*)y_;
+   hypre_assert( xData != NULL && yData != NULL );
+
+   mx = aux_maskCount( xData->numVectors, xData->mask );
+   my = aux_maskCount( yData->numVectors, yData->mask );
+   hypre_assert( mx == my );
+
+   px = hypre_CTAlloc(void*,  mx, HYPRE_MEMORY_HOST);
+   hypre_assert( px != NULL );
+   py = hypre_CTAlloc(void*,  my, HYPRE_MEMORY_HOST);
+   hypre_assert( py != NULL );
+
+   hypre_collectVectorPtr( xData->mask, xData, px );
+   hypre_collectVectorPtr( yData->mask, yData, py );
+
+   for ( i = 0; i < mx; i++ )
+   {
+      (xData->interpreter->Axpy)(a, px[i], py[i]);
+   }
+
+   hypre_TFree(px, HYPRE_MEMORY_HOST);
+   hypre_TFree(py, HYPRE_MEMORY_HOST);
 }
 
 void
 hypre_TempMultiVectorByMultiVector( void* x_, void* y_,
                                     HYPRE_Int xyGHeight, HYPRE_Int xyHeight,
-                                    HYPRE_Int xyWidth, HYPRE_Complex* xyVal ) {
-/* xy = x'*y */
-
-  HYPRE_Int ix, iy, mx, my, jxy;
-  HYPRE_Complex* p;
-  void** px;
-  void** py;
-  hypre_TempMultiVector* xData;
-  hypre_TempMultiVector* yData;
-
-  xData = (hypre_TempMultiVector*)x_;
-  yData = (hypre_TempMultiVector*)y_;
-  hypre_assert( xData != NULL && yData != NULL );
-
-  mx = aux_maskCount( xData->numVectors, xData->mask );
-  hypre_assert( mx == xyHeight );
-
-  my = aux_maskCount( yData->numVectors, yData->mask );
-  hypre_assert( my == xyWidth );
-
-  px = hypre_CTAlloc(void*,  mx, HYPRE_MEMORY_HOST);
-  hypre_assert( px != NULL );
-  py = hypre_CTAlloc(void*,  my, HYPRE_MEMORY_HOST);
-  hypre_assert( py != NULL );
-
-  hypre_collectVectorPtr( xData->mask, xData, px );
-  hypre_collectVectorPtr( yData->mask, yData, py );
-
-  jxy = xyGHeight - xyHeight;
-  for ( iy = 0, p = xyVal; iy < my; iy++ ) {
-    for ( ix = 0; ix < mx; ix++, p++ )
-      *p = (xData->interpreter->InnerProd)(px[ix],py[iy]);
-    p += jxy;
-  }
-
-  hypre_TFree(px, HYPRE_MEMORY_HOST);
-  hypre_TFree(py, HYPRE_MEMORY_HOST);
+                                    HYPRE_Int xyWidth, HYPRE_Complex* xyVal )
+{
+   /* xy = x'*y */
+
+   HYPRE_Int ix, iy, mx, my, jxy;
+   HYPRE_Complex* p;
+   void** px;
+   void** py;
+   hypre_TempMultiVector* xData;
+   hypre_TempMultiVector* yData;
+
+   xData = (hypre_TempMultiVector*)x_;
+   yData = (hypre_TempMultiVector*)y_;
+   hypre_assert( xData != NULL && yData != NULL );
+
+   mx = aux_maskCount( xData->numVectors, xData->mask );
+   hypre_assert( mx == xyHeight );
+
+   my = aux_maskCount( yData->numVectors, yData->mask );
+   hypre_assert( my == xyWidth );
+
+   px = hypre_CTAlloc(void*,  mx, HYPRE_MEMORY_HOST);
+   hypre_assert( px != NULL );
+   py = hypre_CTAlloc(void*,  my, HYPRE_MEMORY_HOST);
+   hypre_assert( py != NULL );
+
+   hypre_collectVectorPtr( xData->mask, xData, px );
+   hypre_collectVectorPtr( yData->mask, yData, py );
+
+   jxy = xyGHeight - xyHeight;
+   for ( iy = 0, p = xyVal; iy < my; iy++ )
+   {
+      for ( ix = 0; ix < mx; ix++, p++ )
+      {
+         *p = (xData->interpreter->InnerProd)(px[ix], py[iy]);
+      }
+      p += jxy;
+   }
+
+   hypre_TFree(px, HYPRE_MEMORY_HOST);
+   hypre_TFree(py, HYPRE_MEMORY_HOST);
 }
 
 void
 hypre_TempMultiVectorByMultiVectorDiag( void* x_, void* y_,
-                                        HYPRE_Int* mask, HYPRE_Int n, HYPRE_Complex* diag ) {
-/* diag = diag(x'*y) */
-
-  HYPRE_Int i, mx, my, m;
-  void** px;
-  void** py;
-  HYPRE_Int* index;
-  hypre_TempMultiVector* xData;
-  hypre_TempMultiVector* yData;
-
-  xData = (hypre_TempMultiVector*)x_;
-  yData = (hypre_TempMultiVector*)y_;
-  hypre_assert( xData != NULL && yData != NULL );
-
-  mx = aux_maskCount( xData->numVectors, xData->mask );
-  my = aux_maskCount( yData->numVectors, yData->mask );
-  m = aux_maskCount( n, mask );
-  hypre_assert( mx == my && mx == m );
-
-  px = hypre_CTAlloc(void*,  mx, HYPRE_MEMORY_HOST);
-  hypre_assert( px != NULL );
-  py = hypre_CTAlloc(void*,  my, HYPRE_MEMORY_HOST);
-  hypre_assert( py != NULL );
-
-  hypre_collectVectorPtr( xData->mask, xData, px );
-  hypre_collectVectorPtr( yData->mask, yData, py );
-
-  index = hypre_CTAlloc(HYPRE_Int,  m, HYPRE_MEMORY_HOST);
-  aux_indexFromMask( n, mask, index );
-
-  for ( i = 0; i < m; i++ )
-    *(diag+index[i]-1) = (xData->interpreter->InnerProd)(px[i],py[i]);
-
-  hypre_TFree(index, HYPRE_MEMORY_HOST);
-  hypre_TFree(px, HYPRE_MEMORY_HOST);
-  hypre_TFree(py, HYPRE_MEMORY_HOST);
+                                        HYPRE_Int* mask, HYPRE_Int n, HYPRE_Complex* diag )
+{
+   /* diag = diag(x'*y) */
+
+   HYPRE_Int i, mx, my, m;
+   void** px;
+   void** py;
+   HYPRE_Int* index;
+   hypre_TempMultiVector* xData;
+   hypre_TempMultiVector* yData;
+
+   xData = (hypre_TempMultiVector*)x_;
+   yData = (hypre_TempMultiVector*)y_;
+   hypre_assert( xData != NULL && yData != NULL );
+
+   mx = aux_maskCount( xData->numVectors, xData->mask );
+   my = aux_maskCount( yData->numVectors, yData->mask );
+   m = aux_maskCount( n, mask );
+   hypre_assert( mx == my && mx == m );
+
+   px = hypre_CTAlloc(void*,  mx, HYPRE_MEMORY_HOST);
+   hypre_assert( px != NULL );
+   py = hypre_CTAlloc(void*,  my, HYPRE_MEMORY_HOST);
+   hypre_assert( py != NULL );
+
+   hypre_collectVectorPtr( xData->mask, xData, px );
+   hypre_collectVectorPtr( yData->mask, yData, py );
+
+   index = hypre_CTAlloc(HYPRE_Int,  m, HYPRE_MEMORY_HOST);
+   aux_indexFromMask( n, mask, index );
+
+   for ( i = 0; i < m; i++ )
+   {
+      *(diag + index[i] - 1) = (xData->interpreter->InnerProd)(px[i], py[i]);
+   }
+
+   hypre_TFree(index, HYPRE_MEMORY_HOST);
+   hypre_TFree(px, HYPRE_MEMORY_HOST);
+   hypre_TFree(py, HYPRE_MEMORY_HOST);
 }
 
 void
 hypre_TempMultiVectorByMatrix( void* x_,
                                HYPRE_Int rGHeight, HYPRE_Int rHeight,
                                HYPRE_Int rWidth, HYPRE_Complex* rVal,
-                               void* y_ ) {
-
-  HYPRE_Int i, j, jump;
-  HYPRE_Int mx, my;
-  HYPRE_Complex* p;
-  void** px;
-  void** py;
-  hypre_TempMultiVector* xData;
-  hypre_TempMultiVector* yData;
-
-  xData = (hypre_TempMultiVector*)x_;
-  yData = (hypre_TempMultiVector*)y_;
-  hypre_assert( xData != NULL && yData != NULL );
-
-  mx = aux_maskCount( xData->numVectors, xData->mask );
-  my = aux_maskCount( yData->numVectors, yData->mask );
-
-  hypre_assert( mx == rHeight && my == rWidth );
-
-  px = hypre_CTAlloc(void*,  mx, HYPRE_MEMORY_HOST);
-  hypre_assert( px != NULL );
-  py = hypre_CTAlloc(void*,  my, HYPRE_MEMORY_HOST);
-  hypre_assert( py != NULL );
-
-  hypre_collectVectorPtr( xData->mask, xData, px );
-  hypre_collectVectorPtr( yData->mask, yData, py );
-
-  jump = rGHeight - rHeight;
-  for ( j = 0, p = rVal; j < my; j++ ) {
-    (xData->interpreter->ClearVector)( py[j] );
-    for ( i = 0; i < mx; i++, p++ )
-      (xData->interpreter->Axpy)(*p,px[i],py[j]);
-    p += jump;
-  }
-
-  hypre_TFree(px, HYPRE_MEMORY_HOST);
-  hypre_TFree(py, HYPRE_MEMORY_HOST);
+                               void* y_ )
+{
+
+   HYPRE_Int i, j, jump;
+   HYPRE_Int mx, my;
+   HYPRE_Complex* p;
+   void** px;
+   void** py;
+   hypre_TempMultiVector* xData;
+   hypre_TempMultiVector* yData;
+
+   xData = (hypre_TempMultiVector*)x_;
+   yData = (hypre_TempMultiVector*)y_;
+   hypre_assert( xData != NULL && yData != NULL );
+
+   mx = aux_maskCount( xData->numVectors, xData->mask );
+   my = aux_maskCount( yData->numVectors, yData->mask );
+
+   hypre_assert( mx == rHeight && my == rWidth );
+
+   px = hypre_CTAlloc(void*,  mx, HYPRE_MEMORY_HOST);
+   hypre_assert( px != NULL );
+   py = hypre_CTAlloc(void*,  my, HYPRE_MEMORY_HOST);
+   hypre_assert( py != NULL );
+
+   hypre_collectVectorPtr( xData->mask, xData, px );
+   hypre_collectVectorPtr( yData->mask, yData, py );
+
+   jump = rGHeight - rHeight;
+   for ( j = 0, p = rVal; j < my; j++ )
+   {
+      (xData->interpreter->ClearVector)( py[j] );
+      for ( i = 0; i < mx; i++, p++ )
+      {
+         (xData->interpreter->Axpy)(*p, px[i], py[j]);
+      }
+      p += jump;
+   }
+
+   hypre_TFree(px, HYPRE_MEMORY_HOST);
+   hypre_TFree(py, HYPRE_MEMORY_HOST);
 }
 
 void
 hypre_TempMultiVectorXapy( void* x_,
                            HYPRE_Int rGHeight, HYPRE_Int rHeight,
                            HYPRE_Int rWidth, HYPRE_Complex* rVal,
-                           void* y_ ) {
-
-  HYPRE_Int i, j, jump;
-  HYPRE_Int mx, my;
-  HYPRE_Complex* p;
-  void** px;
-  void** py;
-  hypre_TempMultiVector* xData;
-  hypre_TempMultiVector* yData;
-
-  xData = (hypre_TempMultiVector*)x_;
-  yData = (hypre_TempMultiVector*)y_;
-  hypre_assert( xData != NULL && yData != NULL );
-
-  mx = aux_maskCount( xData->numVectors, xData->mask );
-  my = aux_maskCount( yData->numVectors, yData->mask );
-
-  hypre_assert( mx == rHeight && my == rWidth );
-
-  px = hypre_CTAlloc(void*,  mx, HYPRE_MEMORY_HOST);
-  hypre_assert( px != NULL );
-  py = hypre_CTAlloc(void*,  my, HYPRE_MEMORY_HOST);
-  hypre_assert( py != NULL );
-
-  hypre_collectVectorPtr( xData->mask, xData, px );
-  hypre_collectVectorPtr( yData->mask, yData, py );
-
-  jump = rGHeight - rHeight;
-  for ( j = 0, p = rVal; j < my; j++ ) {
-    for ( i = 0; i < mx; i++, p++ )
-      (xData->interpreter->Axpy)(*p,px[i],py[j]);
-    p += jump;
-  }
-
-  hypre_TFree(px, HYPRE_MEMORY_HOST);
-  hypre_TFree(py, HYPRE_MEMORY_HOST);
+                           void* y_ )
+{
+
+   HYPRE_Int i, j, jump;
+   HYPRE_Int mx, my;
+   HYPRE_Complex* p;
+   void** px;
+   void** py;
+   hypre_TempMultiVector* xData;
+   hypre_TempMultiVector* yData;
+
+   xData = (hypre_TempMultiVector*)x_;
+   yData = (hypre_TempMultiVector*)y_;
+   hypre_assert( xData != NULL && yData != NULL );
+
+   mx = aux_maskCount( xData->numVectors, xData->mask );
+   my = aux_maskCount( yData->numVectors, yData->mask );
+
+   hypre_assert( mx == rHeight && my == rWidth );
+
+   px = hypre_CTAlloc(void*,  mx, HYPRE_MEMORY_HOST);
+   hypre_assert( px != NULL );
+   py = hypre_CTAlloc(void*,  my, HYPRE_MEMORY_HOST);
+   hypre_assert( py != NULL );
+
+   hypre_collectVectorPtr( xData->mask, xData, px );
+   hypre_collectVectorPtr( yData->mask, yData, py );
+
+   jump = rGHeight - rHeight;
+   for ( j = 0, p = rVal; j < my; j++ )
+   {
+      for ( i = 0; i < mx; i++, p++ )
+      {
+         (xData->interpreter->Axpy)(*p, px[i], py[j]);
+      }
+      p += jump;
+   }
+
+   hypre_TFree(px, HYPRE_MEMORY_HOST);
+   hypre_TFree(py, HYPRE_MEMORY_HOST);
 }
 
 void
 hypre_TempMultiVectorByDiagonal( void* x_,
                                  HYPRE_Int* mask, HYPRE_Int n, HYPRE_Complex* diag,
-                                 void* y_ ) {
-
-  HYPRE_Int j;
-  HYPRE_Int mx, my, m;
-  void** px;
-  void** py;
-  HYPRE_Int* index;
-  hypre_TempMultiVector* xData;
-  hypre_TempMultiVector* yData;
-
-  xData = (hypre_TempMultiVector*)x_;
-  yData = (hypre_TempMultiVector*)y_;
-  hypre_assert( xData != NULL && yData != NULL );
-
-  mx = aux_maskCount( xData->numVectors, xData->mask );
-  my = aux_maskCount( yData->numVectors, yData->mask );
-  m = aux_maskCount( n, mask );
-
-  hypre_assert( mx == m && my == m );
-
-  if ( m < 1 )
-    return;
-
-  px = hypre_CTAlloc(void*,  mx, HYPRE_MEMORY_HOST);
-  hypre_assert( px != NULL );
-  py = hypre_CTAlloc(void*,  my, HYPRE_MEMORY_HOST);
-  hypre_assert( py != NULL );
-
-  index = hypre_CTAlloc(HYPRE_Int,  m, HYPRE_MEMORY_HOST);
-  aux_indexFromMask( n, mask, index );
-
-  hypre_collectVectorPtr( xData->mask, xData, px );
-  hypre_collectVectorPtr( yData->mask, yData, py );
-
-  for ( j = 0; j < my; j++ ) {
-    (xData->interpreter->ClearVector)(py[j]);
-    (xData->interpreter->Axpy)(diag[index[j]-1],px[j],py[j]);
-  }
-
-  hypre_TFree(px, HYPRE_MEMORY_HOST);
-  hypre_TFree(py, HYPRE_MEMORY_HOST);
-  hypre_TFree(index, HYPRE_MEMORY_HOST);
+                                 void* y_ )
+{
+
+   HYPRE_Int j;
+   HYPRE_Int mx, my, m;
+   void** px;
+   void** py;
+   HYPRE_Int* index;
+   hypre_TempMultiVector* xData;
+   hypre_TempMultiVector* yData;
+
+   xData = (hypre_TempMultiVector*)x_;
+   yData = (hypre_TempMultiVector*)y_;
+   hypre_assert( xData != NULL && yData != NULL );
+
+   mx = aux_maskCount( xData->numVectors, xData->mask );
+   my = aux_maskCount( yData->numVectors, yData->mask );
+   m = aux_maskCount( n, mask );
+
+   hypre_assert( mx == m && my == m );
+
+   if ( m < 1 )
+   {
+      return;
+   }
+
+   px = hypre_CTAlloc(void*,  mx, HYPRE_MEMORY_HOST);
+   hypre_assert( px != NULL );
+   py = hypre_CTAlloc(void*,  my, HYPRE_MEMORY_HOST);
+   hypre_assert( py != NULL );
+
+   index = hypre_CTAlloc(HYPRE_Int,  m, HYPRE_MEMORY_HOST);
+   aux_indexFromMask( n, mask, index );
+
+   hypre_collectVectorPtr( xData->mask, xData, px );
+   hypre_collectVectorPtr( yData->mask, yData, py );
+
+   for ( j = 0; j < my; j++ )
+   {
+      (xData->interpreter->ClearVector)(py[j]);
+      (xData->interpreter->Axpy)(diag[index[j] - 1], px[j], py[j]);
+   }
+
+   hypre_TFree(px, HYPRE_MEMORY_HOST);
+   hypre_TFree(py, HYPRE_MEMORY_HOST);
+   hypre_TFree(index, HYPRE_MEMORY_HOST);
 }
 
 void
 hypre_TempMultiVectorEval( void (*f)( void*, void*, void* ), void* par,
-                           void* x_, void* y_ ) {
-
-  HYPRE_Int i, mx, my;
-  void** px;
-  void** py;
-  hypre_TempMultiVector* x;
-  hypre_TempMultiVector* y;
-
-  x = (hypre_TempMultiVector*)x_;
-  y = (hypre_TempMultiVector*)y_;
-  hypre_assert( x != NULL && y != NULL );
-
-  if ( f == NULL ) {
-    hypre_TempMultiVectorCopy( x, y );
-    return;
-  }
-
-  mx = aux_maskCount( x->numVectors, x->mask );
-  my = aux_maskCount( y->numVectors, y->mask );
-  hypre_assert( mx == my );
-
-  px = hypre_CTAlloc(void*,  mx, HYPRE_MEMORY_HOST);
-  hypre_assert( px != NULL );
-  py = hypre_CTAlloc(void*,  my, HYPRE_MEMORY_HOST);
-  hypre_assert( py != NULL );
-
-  hypre_collectVectorPtr( x->mask, x, px );
-  hypre_collectVectorPtr( y->mask, y, py );
-
-  for ( i = 0; i < mx; i++ )
-    f( par, (void*)px[i], (void*)py[i] );
-
-  hypre_TFree(px, HYPRE_MEMORY_HOST);
-  hypre_TFree(py, HYPRE_MEMORY_HOST);
+                           void* x_, void* y_ )
+{
+
+   HYPRE_Int i, mx, my;
+   void** px;
+   void** py;
+   hypre_TempMultiVector* x;
+   hypre_TempMultiVector* y;
+
+   x = (hypre_TempMultiVector*)x_;
+   y = (hypre_TempMultiVector*)y_;
+   hypre_assert( x != NULL && y != NULL );
+
+   if ( f == NULL )
+   {
+      hypre_TempMultiVectorCopy( x, y );
+      return;
+   }
+
+   mx = aux_maskCount( x->numVectors, x->mask );
+   my = aux_maskCount( y->numVectors, y->mask );
+   hypre_assert( mx == my );
+
+   px = hypre_CTAlloc(void*,  mx, HYPRE_MEMORY_HOST);
+   hypre_assert( px != NULL );
+   py = hypre_CTAlloc(void*,  my, HYPRE_MEMORY_HOST);
+   hypre_assert( py != NULL );
+
+   hypre_collectVectorPtr( x->mask, x, px );
+   hypre_collectVectorPtr( y->mask, y, py );
+
+   for ( i = 0; i < mx; i++ )
+   {
+      f( par, (void*)px[i], (void*)py[i] );
+   }
+
+   hypre_TFree(px, HYPRE_MEMORY_HOST);
+   hypre_TFree(py, HYPRE_MEMORY_HOST);
 }
 
 HYPRE_Int
-hypre_TempMultiVectorPrint( void* x_, const char* fileName ) {
-
-  HYPRE_Int i, ierr;
-  hypre_TempMultiVector* x;
-  char fullName[128];
-
-  x = (hypre_TempMultiVector*)x_;
-  hypre_assert( x != NULL );
-  if ( x->interpreter->PrintVector == NULL )
-    return 1;
-
-  ierr = 0;
-  for ( i = 0; i < x->numVectors; i++ ) {
-    hypre_sprintf( fullName, "%s.%d", fileName, i );
-    ierr = ierr ||
-      (x->interpreter->PrintVector)( x->vector[i], fullName );
-  }
-  return ierr;
+hypre_TempMultiVectorPrint( void* x_, const char* fileName )
+{
+
+   HYPRE_Int i, ierr;
+   hypre_TempMultiVector* x;
+   char fullName[128];
+
+   x = (hypre_TempMultiVector*)x_;
+   hypre_assert( x != NULL );
+   if ( x->interpreter->PrintVector == NULL )
+   {
+      return 1;
+   }
+
+   ierr = 0;
+   for ( i = 0; i < x->numVectors; i++ )
+   {
+      hypre_sprintf( fullName, "%s.%d", fileName, i );
+      ierr = ierr ||
+             (x->interpreter->PrintVector)( x->vector[i], fullName );
+   }
+   return ierr;
 }
 
 void*
-hypre_TempMultiVectorRead( MPI_Comm comm, void* ii_, const char* fileName ) {
+hypre_TempMultiVectorRead( MPI_Comm comm, void* ii_, const char* fileName )
+{
 
-  HYPRE_Int i, n, id;
-  FILE* fp;
-  char fullName[128];
-  hypre_TempMultiVector* x;
-  HYPRE_InterfaceInterpreter* ii = (HYPRE_InterfaceInterpreter*)ii_;
+   HYPRE_Int i, n, id;
+   FILE* fp;
+   char fullName[128];
+   hypre_TempMultiVector* x;
+   HYPRE_InterfaceInterpreter* ii = (HYPRE_InterfaceInterpreter*)ii_;
 
-  if ( ii->ReadVector == NULL )
-    return NULL;
+   if ( ii->ReadVector == NULL )
+   {
+      return NULL;
+   }
 
-  hypre_MPI_Comm_rank( comm, &id );
+   hypre_MPI_Comm_rank( comm, &id );
 
-  n = 0;
-  do {
-    hypre_sprintf( fullName, "%s.%d.%d", fileName, n, id );
-    if ( (fp = fopen(fullName, "r")) ) {
-	  n++;
-      fclose( fp );
-	}
-  } while ( fp );
+   n = 0;
+   do
+   {
+      hypre_sprintf( fullName, "%s.%d.%d", fileName, n, id );
+      if ( (fp = fopen(fullName, "r")) )
+      {
+         n++;
+         fclose( fp );
+      }
+   }
+   while ( fp );
 
-  x = hypre_TAlloc(hypre_TempMultiVector, 1, HYPRE_MEMORY_HOST);
-  hypre_assert( x != NULL );
+   x = hypre_TAlloc(hypre_TempMultiVector, 1, HYPRE_MEMORY_HOST);
+   hypre_assert( x != NULL );
 
-  x->interpreter = ii;
+   x->interpreter = ii;
 
-  x->numVectors = n;
+   x->numVectors = n;
 
-  x->vector = hypre_CTAlloc(void*,  n, HYPRE_MEMORY_HOST);
-  hypre_assert( x->vector != NULL );
+   x->vector = hypre_CTAlloc(void*,  n, HYPRE_MEMORY_HOST);
+   hypre_assert( x->vector != NULL );
 
-  x->ownsVectors = 1;
+   x->ownsVectors = 1;
 
-  for ( i = 0; i < n; i++ ) {
-    hypre_sprintf( fullName, "%s.%d", fileName, i );
-    x->vector[i] = (ii->ReadVector)( comm, fullName );
-  }
+   for ( i = 0; i < n; i++ )
+   {
+      hypre_sprintf( fullName, "%s.%d", fileName, i );
+      x->vector[i] = (ii->ReadVector)( comm, fullName );
+   }
 
-  x->mask = NULL;
-  x->ownsMask = 0;
+   x->mask = NULL;
+   x->ownsMask = 0;
 
-  return x;
+   return x;
 }
 
 HYPRE_Int
-aux_maskCount( HYPRE_Int n, HYPRE_Int* mask ) {
+aux_maskCount( HYPRE_Int n, HYPRE_Int* mask )
+{
 
-  HYPRE_Int i, m;
+   HYPRE_Int i, m;
 
-  if ( mask == NULL )
-    return n;
+   if ( mask == NULL )
+   {
+      return n;
+   }
 
-  for ( i = m = 0; i < n; i++ )
-    if ( mask[i] )
-      m++;
+   for ( i = m = 0; i < n; i++ )
+      if ( mask[i] )
+      {
+         m++;
+      }
 
-  return m;
+   return m;
 }
 
 void
-aux_indexFromMask( HYPRE_Int n, HYPRE_Int* mask, HYPRE_Int* index ) {
-
-  HYPRE_Int i, j;
-
-  if ( mask != NULL ) {
-    for ( i = 0, j = 0; i < n; i++ )
-      if ( mask[i] )
-	index[j++] = i + 1;
-  }
-  else
-    for ( i = 0; i < n; i++ )
-      index[i] = i + 1;
+aux_indexFromMask( HYPRE_Int n, HYPRE_Int* mask, HYPRE_Int* index )
+{
+
+   HYPRE_Int i, j;
+
+   if ( mask != NULL )
+   {
+      for ( i = 0, j = 0; i < n; i++ )
+         if ( mask[i] )
+         {
+            index[j++] = i + 1;
+         }
+   }
+   else
+      for ( i = 0; i < n; i++ )
+      {
+         index[i] = i + 1;
+      }
 
 }
 
diff --git a/external/hypre/src/multivector/csr_matmultivec.c b/external/hypre/src/multivector/csr_matmultivec.c
index 6975e1f2..192d7369 100644
--- a/external/hypre/src/multivector/csr_matmultivec.c
+++ b/external/hypre/src/multivector/csr_matmultivec.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -34,11 +34,11 @@ hypre_CSRMatrixMatMultivec(HYPRE_Complex alpha, hypre_CSRMatrix *A,
    HYPRE_Int    x_size = hypre_MultivectorSize(x);
    HYPRE_Int    y_size = hypre_MultivectorSize(y);
    HYPRE_Int    num_vectors = hypre_MultivectorNumVectors(x);
-   HYPRE_Int    *x_active_ind= x->active_indices;
-   HYPRE_Int    *y_active_ind= y->active_indices;
+   HYPRE_Int    *x_active_ind = x->active_indices;
+   HYPRE_Int    *y_active_ind = y->active_indices;
    HYPRE_Int    num_active_vectors = x->num_active_vectors;
    HYPRE_Int    i, j, jj, m, ierr = 0, optimize;
-   HYPRE_Complex temp, tempx, xpar=0.7, *xptr, *yptr;
+   HYPRE_Complex temp, tempx, xpar = 0.7, *xptr, *yptr;
 
    /*---------------------------------------------------------------------
     *  Check for size compatibility.  Matvec returns ierr = 1 if
@@ -51,27 +51,29 @@ hypre_CSRMatrixMatMultivec(HYPRE_Complex alpha, hypre_CSRMatrix *A,
     *  is informational only.
     *--------------------------------------------------------------------*/
 
-    hypre_assert(num_active_vectors == y->num_active_vectors);
-    if (num_cols != x_size) ierr = 1;
-    if (num_rows != y_size) ierr = 2;
-    if (num_cols != x_size && num_rows != y_size) ierr = 3;
-    optimize = 0;
-    if (num_active_vectors == num_vectors && num_vectors == y->num_vectors)
-       optimize = 1;
+   hypre_assert(num_active_vectors == y->num_active_vectors);
+   if (num_cols != x_size) { ierr = 1; }
+   if (num_rows != y_size) { ierr = 2; }
+   if (num_cols != x_size && num_rows != y_size) { ierr = 3; }
+   optimize = 0;
+   if (num_active_vectors == num_vectors && num_vectors == y->num_vectors)
+   {
+      optimize = 1;
+   }
 
    /*-----------------------------------------------------------------------
     * Do (alpha == 0.0) computation - RDF: USE MACHINE EPS
     *-----------------------------------------------------------------------*/
 
-    if (alpha == 0.0)
-    {
+   if (alpha == 0.0)
+   {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-       for (i = 0; i < num_rows*num_vectors; i++) y_data[i] *= beta;
+      for (i = 0; i < num_rows * num_vectors; i++) { y_data[i] *= beta; }
 
-       return ierr;
-    }
+      return ierr;
+   }
 
    /*-----------------------------------------------------------------------
     * y = (beta/alpha)*y
@@ -84,16 +86,16 @@ hypre_CSRMatrixMatMultivec(HYPRE_Complex alpha, hypre_CSRMatrix *A,
       if (temp == 0.0)
       {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+         #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-	 for (i = 0; i < num_rows*num_vectors; i++) y_data[i] = 0.0;
+         for (i = 0; i < num_rows * num_vectors; i++) { y_data[i] = 0.0; }
       }
       else
       {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+         #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-	 for (i = 0; i < num_rows*num_vectors; i++) y_data[i] *= temp;
+         for (i = 0; i < num_rows * num_vectors; i++) { y_data[i] *= temp; }
       }
    }
 
@@ -101,13 +103,15 @@ hypre_CSRMatrixMatMultivec(HYPRE_Complex alpha, hypre_CSRMatrix *A,
     * y += A*x
     *-----------------------------------------------------------------*/
 
-   if ( num_vectors==1 )
+   if ( num_vectors == 1 )
    {
       for (i = 0; i < num_rows; i++)
       {
          temp = y_data[i];
-         for (jj = A_i[i]; jj < A_i[i+1]; jj++)
+         for (jj = A_i[i]; jj < A_i[i + 1]; jj++)
+         {
             temp += A_data[jj] * x_data[A_j[jj]];
+         }
          y_data[i] = temp;
       }
    }
@@ -117,13 +121,15 @@ hypre_CSRMatrixMatMultivec(HYPRE_Complex alpha, hypre_CSRMatrix *A,
       {
          for (i = 0; i < num_rows; i++)
          {
-            for (j=0; j<num_active_vectors; ++j)
+            for (j = 0; j < num_active_vectors; ++j)
             {
-               xptr = x_data[x_active_ind[j]*x_size];
-               temp = y_data[y_active_ind[j]*y_size+i];
-               for (jj = A_i[i]; jj < A_i[i+1]; jj++)
+               xptr = x_data[x_active_ind[j] * x_size];
+               temp = y_data[y_active_ind[j] * y_size + i];
+               for (jj = A_i[i]; jj < A_i[i + 1]; jj++)
+               {
                   temp += A_data[jj] * xptr[A_j[jj]];
-               y_data[y_active_ind[j]*y_size+i] = temp;
+               }
+               y_data[y_active_ind[j]*y_size + i] = temp;
             }
          }
       }
@@ -131,13 +137,15 @@ hypre_CSRMatrixMatMultivec(HYPRE_Complex alpha, hypre_CSRMatrix *A,
       {
          for (i = 0; i < num_rows; i++)
          {
-            for (j=0; j<num_vectors; ++j)
+            for (j = 0; j < num_vectors; ++j)
             {
-               xptr = x_data[j*x_size];
-               temp = y_data[j*y_size+i];
-               for (jj = A_i[i]; jj < A_i[i+1]; jj++)
+               xptr = x_data[j * x_size];
+               temp = y_data[j * y_size + i];
+               for (jj = A_i[i]; jj < A_i[i + 1]; jj++)
+               {
                   temp += A_data[jj] * xptr[A_j[jj]];
-               y_data[j*y_size+i] = temp;
+               }
+               y_data[j * y_size + i] = temp;
             }
          }
          /* different version
@@ -163,10 +171,12 @@ hypre_CSRMatrixMatMultivec(HYPRE_Complex alpha, hypre_CSRMatrix *A,
    if (alpha != 1.0)
    {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-      for (i = 0; i < num_rows*num_vectors; i++)
-	 y_data[i] *= alpha;
+      for (i = 0; i < num_rows * num_vectors; i++)
+      {
+         y_data[i] *= alpha;
+      }
    }
    return ierr;
 }
@@ -194,8 +204,8 @@ hypre_CSRMatrixMatMultivecT(HYPRE_Complex alpha, hypre_CSRMatrix *A,
    HYPRE_Int    x_size = hypre_MultivectorSize(x);
    HYPRE_Int    y_size = hypre_MultivectorSize(y);
    HYPRE_Int    num_vectors = hypre_MultivectorNumVectors(x);
-   HYPRE_Int    *x_active_ind= x->active_indices;
-   HYPRE_Int    *y_active_ind= y->active_indices;
+   HYPRE_Int    *x_active_ind = x->active_indices;
+   HYPRE_Int    *y_active_ind = y->active_indices;
    HYPRE_Int    num_active_vectors = x->num_active_vectors;
    HYPRE_Complex temp;
    HYPRE_Int    i, jv, jj, size, ierr = 0;
@@ -211,10 +221,10 @@ hypre_CSRMatrixMatMultivecT(HYPRE_Complex alpha, hypre_CSRMatrix *A,
     *  is informational only.
     *--------------------------------------------------------------------*/
 
-    hypre_assert(num_active_vectors == y->num_active_vectors);
-    if (num_rows != x_size) ierr = 1;
-    if (num_cols != y_size) ierr = 2;
-    if (num_rows != x_size && num_cols != y_size) ierr = 3;
+   hypre_assert(num_active_vectors == y->num_active_vectors);
+   if (num_rows != x_size) { ierr = 1; }
+   if (num_cols != y_size) { ierr = 2; }
+   if (num_rows != x_size && num_cols != y_size) { ierr = 3; }
 
    /*-----------------------------------------------------------------------
     * Do (alpha == 0.0) computation - RDF: USE MACHINE EPS
@@ -223,9 +233,9 @@ hypre_CSRMatrixMatMultivecT(HYPRE_Complex alpha, hypre_CSRMatrix *A,
    if (alpha == 0.0)
    {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-      for (i = 0; i < num_cols*num_vectors; i++) y_data[i] *= beta;
+      for (i = 0; i < num_cols * num_vectors; i++) { y_data[i] *= beta; }
       return ierr;
    }
 
@@ -240,16 +250,16 @@ hypre_CSRMatrixMatMultivecT(HYPRE_Complex alpha, hypre_CSRMatrix *A,
       if (temp == 0.0)
       {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+         #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-	 for (i = 0; i < num_cols*num_vectors; i++) y_data[i] = 0.0;
+         for (i = 0; i < num_cols * num_vectors; i++) { y_data[i] = 0.0; }
       }
       else
       {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+         #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-	 for (i = 0; i < num_cols*num_vectors; i++) y_data[i] *= temp;
+         for (i = 0; i < num_cols * num_vectors; i++) { y_data[i] *= temp; }
       }
    }
 
@@ -257,20 +267,24 @@ hypre_CSRMatrixMatMultivecT(HYPRE_Complex alpha, hypre_CSRMatrix *A,
     * y += A^T*x
     *-----------------------------------------------------------------*/
 
-   if ( num_vectors==1 )
+   if ( num_vectors == 1 )
    {
       for (i = 0; i < num_rows; i++)
       {
-         for (jj = A_i[i]; jj < A_i[i+1]; jj++)
+         for (jj = A_i[i]; jj < A_i[i + 1]; jj++)
+         {
             y_data[A_j[jj]] += A_data[jj] * x_data[i];
+         }
       }
    }
    else
    {
-      for ( jv=0; jv<num_vectors; ++jv )
+      for ( jv = 0; jv < num_vectors; ++jv )
       {
-         for (jj = A_i[i]; jj < A_i[i+1]; jj++)
-            y_data[A_j[jj]+jv*y_size] += A_data[jj] * x_data[i+jv*x_size];
+         for (jj = A_i[i]; jj < A_i[i + 1]; jj++)
+         {
+            y_data[A_j[jj] + jv * y_size] += A_data[jj] * x_data[i + jv * x_size];
+         }
       }
    }
 
@@ -281,10 +295,12 @@ hypre_CSRMatrixMatMultivecT(HYPRE_Complex alpha, hypre_CSRMatrix *A,
    if (alpha != 1.0)
    {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-      for (i = 0; i < num_cols*num_vectors; i++)
-	 y_data[i] *= alpha;
+      for (i = 0; i < num_cols * num_vectors; i++)
+      {
+         y_data[i] *= alpha;
+      }
    }
 
    return ierr;
diff --git a/external/hypre/src/multivector/csr_matmultivec.h b/external/hypre/src/multivector/csr_matmultivec.h
index 184dfc76..92bcd54e 100644
--- a/external/hypre/src/multivector/csr_matmultivec.h
+++ b/external/hypre/src/multivector/csr_matmultivec.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -21,7 +21,7 @@ HYPRE_Int
 hypre_CSRMatrixMatMultivec(HYPRE_Complex alpha, hypre_CSRMatrix *A,
                            hypre_Multivector *x, HYPRE_Complex beta,
                            hypre_Multivector *y);
-                            
+
 
 /*--------------------------------------------------------------------------
  * hypre_CSRMatrixMultiMatvecT
@@ -35,7 +35,7 @@ HYPRE_Int
 hypre_CSRMatrixMatMultivecT(HYPRE_Complex alpha, hypre_CSRMatrix *A,
                             hypre_Multivector *x, HYPRE_Complex beta,
                             hypre_Multivector *y);
-                             
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/external/hypre/src/multivector/interpreter.h b/external/hypre/src/multivector/interpreter.h
index 7d46fcbb..468eeca6 100644
--- a/external/hypre/src/multivector/interpreter.h
+++ b/external/hypre/src/multivector/interpreter.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -12,41 +12,44 @@
 
 typedef struct
 {
-  /* vector operations */
-  void*  (*CreateVector)  ( void *vector );
-  HYPRE_Int    (*DestroyVector) ( void *vector );
-
-  HYPRE_Real   (*InnerProd)     ( void *x, void *y );
-  HYPRE_Int    (*CopyVector)    ( void *x, void *y );
-  HYPRE_Int    (*ClearVector)   ( void *x );
-  HYPRE_Int    (*SetRandomValues)   ( void *x, HYPRE_Int seed );
-  HYPRE_Int    (*ScaleVector)   ( HYPRE_Complex alpha, void *x );
-  HYPRE_Int    (*Axpy)          ( HYPRE_Complex alpha, void *x, void *y );
-  HYPRE_Int    (*VectorSize)    (void * vector);
-  
-  /* multivector operations */
-  /* do we need the following entry? */
-  void*  (*CreateMultiVector)  ( void*, HYPRE_Int n, void *vector );
-  void*  (*CopyCreateMultiVector)  ( void *x, HYPRE_Int );
-  void    (*DestroyMultiVector) ( void *x );
-
-  HYPRE_Int    (*Width)  ( void *x );
-  HYPRE_Int    (*Height) ( void *x );
-
-  void   (*SetMask) ( void *x, HYPRE_Int *mask );
-
-  void   (*CopyMultiVector)    ( void *x, void *y );
-  void   (*ClearMultiVector)   ( void *x );
-  void   (*SetRandomVectors)   ( void *x, HYPRE_Int seed );
-  void   (*MultiInnerProd)     ( void *x, void *y, HYPRE_Int, HYPRE_Int, HYPRE_Int, HYPRE_Real* );
-  void   (*MultiInnerProdDiag) ( void *x, void *y, HYPRE_Int*, HYPRE_Int, HYPRE_Real* );
-  void   (*MultiVecMat)        ( void *x, HYPRE_Int, HYPRE_Int, HYPRE_Int, HYPRE_Complex*, void *y );
-  void   (*MultiVecMatDiag)    ( void *x, HYPRE_Int*, HYPRE_Int, HYPRE_Complex*, void *y );
-  void   (*MultiAxpy)          ( HYPRE_Complex alpha, void *x, void *y );
-
-  /* do we need the following 2 entries? */
-  void   (*MultiXapy)          ( void *x, HYPRE_Int, HYPRE_Int, HYPRE_Int, HYPRE_Complex*, void *y );
-  void   (*Eval)               ( void (*f)( void*, void*, void* ), void*, void *x, void *y );
+   /* vector operations */
+   void*  (*CreateVector)  ( void *vector );
+   HYPRE_Int    (*DestroyVector) ( void *vector );
+
+   HYPRE_Real   (*InnerProd)     ( void *x, void *y );
+   HYPRE_Int    (*CopyVector)    ( void *x, void *y );
+   HYPRE_Int    (*ClearVector)   ( void *x );
+   HYPRE_Int    (*SetRandomValues)   ( void *x, HYPRE_Int seed );
+   HYPRE_Int    (*ScaleVector)   ( HYPRE_Complex alpha, void *x );
+   HYPRE_Int    (*Axpy)          ( HYPRE_Complex alpha, void *x, void *y );
+   HYPRE_Int    (*VectorSize)    (void * vector);
+
+   /* multivector operations */
+   /* do we need the following entry? */
+   void*  (*CreateMultiVector)  ( void*, HYPRE_Int n, void *vector );
+   void*  (*CopyCreateMultiVector)  ( void *x, HYPRE_Int );
+   void    (*DestroyMultiVector) ( void *x );
+
+   HYPRE_Int    (*Width)  ( void *x );
+   HYPRE_Int    (*Height) ( void *x );
+
+   void   (*SetMask) ( void *x, HYPRE_Int *mask );
+
+   void   (*CopyMultiVector)    ( void *x, void *y );
+   void   (*ClearMultiVector)   ( void *x );
+   void   (*SetRandomVectors)   ( void *x, HYPRE_Int seed );
+   void   (*MultiInnerProd)     ( void *x, void *y, HYPRE_BigInt, HYPRE_Int, HYPRE_Int,
+                                  HYPRE_Complex* );
+   void   (*MultiInnerProdDiag) ( void *x, void *y, HYPRE_Int*, HYPRE_Int, HYPRE_Complex* );
+   void   (*MultiVecMat)        ( void *x, HYPRE_BigInt, HYPRE_Int, HYPRE_Int, HYPRE_Complex*,
+                                  void *y );
+   void   (*MultiVecMatDiag)    ( void *x, HYPRE_Int*, HYPRE_Int, HYPRE_Complex*, void *y );
+   void   (*MultiAxpy)          ( HYPRE_Complex alpha, void *x, void *y );
+
+   /* do we need the following 2 entries? */
+   void   (*MultiXapy)          ( void *x, HYPRE_BigInt, HYPRE_Int, HYPRE_Int, HYPRE_Complex*,
+                                  void *y );
+   void   (*Eval)               ( void (*f)( void*, void*, void* ), void*, void *x, void *y );
 
 } mv_InterfaceInterpreter;
 
diff --git a/external/hypre/src/multivector/multivector.c b/external/hypre/src/multivector/multivector.c
index ea88e048..94af6473 100644
--- a/external/hypre/src/multivector/multivector.c
+++ b/external/hypre/src/multivector/multivector.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -14,202 +14,224 @@
 /* abstract multivector */
 struct mv_MultiVector
 {
-  void*	data;      /* the pointer to the actual multivector */
-  HYPRE_Int	ownsData;
+   void*  data;      /* the pointer to the actual multivector */
+   HYPRE_Int ownsData;
 
-  mv_InterfaceInterpreter* interpreter; /* a structure that defines
-					      multivector operations */
+   mv_InterfaceInterpreter* interpreter; /* a structure that defines
+                     multivector operations */
 } ;
 
 void *
 mv_MultiVectorGetData (mv_MultiVectorPtr x)
 {
-  hypre_assert (x!=NULL);
-  return x->data;
+   hypre_assert (x != NULL);
+   return x->data;
 }
 
 mv_MultiVectorPtr
 mv_MultiVectorWrap( mv_InterfaceInterpreter* ii, void * data, HYPRE_Int ownsData )
 {
-  mv_MultiVectorPtr x;
+   mv_MultiVectorPtr x;
 
-  x = hypre_TAlloc(struct mv_MultiVector, 1, HYPRE_MEMORY_HOST);
-  hypre_assert( x != NULL );
+   x = hypre_TAlloc(struct mv_MultiVector, 1, HYPRE_MEMORY_HOST);
+   hypre_assert( x != NULL );
 
-  x->interpreter = ii;
-  x->data = data;
-  x->ownsData = ownsData;
+   x->interpreter = ii;
+   x->data = data;
+   x->ownsData = ownsData;
 
-  return x;
+   return x;
 }
 
 mv_MultiVectorPtr
-mv_MultiVectorCreateFromSampleVector( void* ii_, HYPRE_Int n, void* sample ) {
+mv_MultiVectorCreateFromSampleVector( void* ii_, HYPRE_Int n, void* sample )
+{
 
-  mv_MultiVectorPtr x;
-  mv_InterfaceInterpreter* ii = (mv_InterfaceInterpreter*)ii_;
+   mv_MultiVectorPtr x;
+   mv_InterfaceInterpreter* ii = (mv_InterfaceInterpreter*)ii_;
 
-  x = hypre_TAlloc(struct mv_MultiVector, 1, HYPRE_MEMORY_HOST);
-  hypre_assert( x != NULL );
+   x = hypre_TAlloc(struct mv_MultiVector, 1, HYPRE_MEMORY_HOST);
+   hypre_assert( x != NULL );
 
-  x->interpreter = ii;
-  x->data = (ii->CreateMultiVector)( ii, n, sample );
-  x->ownsData = 1;
+   x->interpreter = ii;
+   x->data = (ii->CreateMultiVector)( ii, n, sample );
+   x->ownsData = 1;
 
-  return x;
+   return x;
 }
 
 mv_MultiVectorPtr
-mv_MultiVectorCreateCopy( mv_MultiVectorPtr x, HYPRE_Int copyValues ) {
+mv_MultiVectorCreateCopy( mv_MultiVectorPtr x, HYPRE_Int copyValues )
+{
 
-  mv_MultiVectorPtr y;
-  void* data;
-  mv_InterfaceInterpreter* ii;
+   mv_MultiVectorPtr y;
+   void* data;
+   mv_InterfaceInterpreter* ii;
 
-  hypre_assert( x != NULL );
-  ii = x->interpreter;
+   hypre_assert( x != NULL );
+   ii = x->interpreter;
 
-  y = hypre_TAlloc(struct mv_MultiVector, 1, HYPRE_MEMORY_HOST);
-  hypre_assert( y != NULL );
+   y = hypre_TAlloc(struct mv_MultiVector, 1, HYPRE_MEMORY_HOST);
+   hypre_assert( y != NULL );
 
-  data = (ii->CopyCreateMultiVector)( x->data, copyValues );
+   data = (ii->CopyCreateMultiVector)( x->data, copyValues );
 
-  y->interpreter = ii;
-  y->data = data;
-  y->ownsData = 1;
+   y->interpreter = ii;
+   y->data = data;
+   y->ownsData = 1;
 
-  return y;
+   return y;
 }
 
 void
-mv_MultiVectorDestroy( mv_MultiVectorPtr v) {
+mv_MultiVectorDestroy( mv_MultiVectorPtr v)
+{
 
-  if ( v == NULL )
-    return;
+   if ( v == NULL )
+   {
+      return;
+   }
 
-  if ( v->ownsData )
-    (v->interpreter->DestroyMultiVector)( v->data );
-  hypre_TFree( v ,HYPRE_MEMORY_HOST);
+   if ( v->ownsData )
+   {
+      (v->interpreter->DestroyMultiVector)( v->data );
+   }
+   hypre_TFree( v, HYPRE_MEMORY_HOST);
 }
 
 void
-mv_MultiVectorSetMask( mv_MultiVectorPtr v, HYPRE_Int* mask ) {
+mv_MultiVectorSetMask( mv_MultiVectorPtr v, HYPRE_Int* mask )
+{
 
-  hypre_assert( v != NULL );
-  (v->interpreter->SetMask)( v->data, mask );
+   hypre_assert( v != NULL );
+   (v->interpreter->SetMask)( v->data, mask );
 }
 
 HYPRE_Int
-mv_MultiVectorWidth( mv_MultiVectorPtr v ) {
+mv_MultiVectorWidth( mv_MultiVectorPtr v )
+{
 
-  if ( v == NULL )
-    return 0;
+   if ( v == NULL )
+   {
+      return 0;
+   }
 
-  return (v->interpreter->Width)( v->data );
+   return (v->interpreter->Width)( v->data );
 }
 
 HYPRE_Int
-mv_MultiVectorHeight( mv_MultiVectorPtr v ) {
+mv_MultiVectorHeight( mv_MultiVectorPtr v )
+{
 
-  if ( v == NULL )
-    return 0;
+   if ( v == NULL )
+   {
+      return 0;
+   }
 
-  return (v->interpreter->Height)(v->data);
+   return (v->interpreter->Height)(v->data);
 }
 
 void
-mv_MultiVectorClear( mv_MultiVectorPtr v ) {
+mv_MultiVectorClear( mv_MultiVectorPtr v )
+{
 
-  hypre_assert( v != NULL );
-  (v->interpreter->ClearMultiVector)( v->data );
+   hypre_assert( v != NULL );
+   (v->interpreter->ClearMultiVector)( v->data );
 }
 
 void
-mv_MultiVectorSetRandom( mv_MultiVectorPtr v, HYPRE_Int seed ) {
+mv_MultiVectorSetRandom( mv_MultiVectorPtr v, HYPRE_Int seed )
+{
 
-  hypre_assert( v != NULL );
-  (v->interpreter->SetRandomVectors)( v->data, seed );
+   hypre_assert( v != NULL );
+   (v->interpreter->SetRandomVectors)( v->data, seed );
 }
 
 void
-mv_MultiVectorCopy( mv_MultiVectorPtr src, mv_MultiVectorPtr dest ) {
+mv_MultiVectorCopy( mv_MultiVectorPtr src, mv_MultiVectorPtr dest )
+{
 
-  hypre_assert( src != NULL && dest != NULL );
-  (src->interpreter->CopyMultiVector)( src->data, dest->data );
+   hypre_assert( src != NULL && dest != NULL );
+   (src->interpreter->CopyMultiVector)( src->data, dest->data );
 }
 
 void
-mv_MultiVectorAxpy( HYPRE_Complex a, mv_MultiVectorPtr x, mv_MultiVectorPtr y ) {
+mv_MultiVectorAxpy( HYPRE_Complex a, mv_MultiVectorPtr x, mv_MultiVectorPtr y )
+{
 
-  hypre_assert( x != NULL && y != NULL );
-  (x->interpreter->MultiAxpy)( a, x->data, y->data );
+   hypre_assert( x != NULL && y != NULL );
+   (x->interpreter->MultiAxpy)( a, x->data, y->data );
 }
 
 void
 mv_MultiVectorByMultiVector( mv_MultiVectorPtr x, mv_MultiVectorPtr y,
-				     HYPRE_Int xyGHeight, HYPRE_Int xyHeight,
-				     HYPRE_Int xyWidth, HYPRE_Real* xy ) {
-/* xy = x'*y */
+                             HYPRE_BigInt xyGHeight, HYPRE_Int xyHeight,
+                             HYPRE_Int xyWidth, HYPRE_Real* xy )
+{
+   /* xy = x'*y */
 
-  hypre_assert( x != NULL && y != NULL );
-  (x->interpreter->MultiInnerProd)
-    ( x->data, y->data, xyGHeight, xyHeight, xyWidth, xy );
+   hypre_assert( x != NULL && y != NULL );
+   (x->interpreter->MultiInnerProd)
+   ( x->data, y->data, xyGHeight, xyHeight, xyWidth, xy );
 }
 
 void
 mv_MultiVectorByMultiVectorDiag( mv_MultiVectorPtr x, mv_MultiVectorPtr y,
-					 HYPRE_Int* mask, HYPRE_Int n, HYPRE_Real* d ) {
-/* d = diag(x'*y) */
+                                 HYPRE_Int* mask, HYPRE_Int n, HYPRE_Real* d )
+{
+   /* d = diag(x'*y) */
 
-  hypre_assert( x != NULL && y != NULL );
-  (x->interpreter->MultiInnerProdDiag)( x->data, y->data, mask, n, d );
+   hypre_assert( x != NULL && y != NULL );
+   (x->interpreter->MultiInnerProdDiag)( x->data, y->data, mask, n, d );
 }
 
 void
 mv_MultiVectorByMatrix( mv_MultiVectorPtr x,
-			   HYPRE_Int rGHeight, HYPRE_Int rHeight,
-			   HYPRE_Int rWidth, HYPRE_Complex* rVal,
-			   mv_MultiVectorPtr y ) {
+                        HYPRE_BigInt rGHeight, HYPRE_Int rHeight,
+                        HYPRE_Int rWidth, HYPRE_Complex* rVal,
+                        mv_MultiVectorPtr y )
+{
 
-  /* y = x*r */
+   /* y = x*r */
 
-  hypre_assert( x != NULL && y != NULL );
-  (x->interpreter->MultiVecMat)
-    ( x->data, rGHeight, rHeight, rWidth, rVal, y->data );
+   hypre_assert( x != NULL && y != NULL );
+   (x->interpreter->MultiVecMat)
+   ( x->data, rGHeight, rHeight, rWidth, rVal, y->data );
 }
 
 void
 mv_MultiVectorXapy( mv_MultiVectorPtr x,
-		       HYPRE_Int rGHeight, HYPRE_Int rHeight,
-		       HYPRE_Int rWidth, HYPRE_Complex* rVal,
-		       mv_MultiVectorPtr y ) {
+                    HYPRE_BigInt rGHeight, HYPRE_Int rHeight,
+                    HYPRE_Int rWidth, HYPRE_Complex* rVal,
+                    mv_MultiVectorPtr y )
+{
 
-  /* y = y + x*a */
+   /* y = y + x*a */
 
-  hypre_assert( x != NULL && y != NULL );
-  (x->interpreter->MultiXapy)
-    ( x->data, rGHeight, rHeight, rWidth, rVal, y->data );
+   hypre_assert( x != NULL && y != NULL );
+   (x->interpreter->MultiXapy)
+   ( x->data, rGHeight, rHeight, rWidth, rVal, y->data );
 }
 
 void
 mv_MultiVectorByDiagonal( mv_MultiVectorPtr x,
-			     HYPRE_Int* mask, HYPRE_Int n, HYPRE_Complex* d,
-			     mv_MultiVectorPtr y ) {
+                          HYPRE_Int* mask, HYPRE_Int n, HYPRE_Complex* d,
+                          mv_MultiVectorPtr y )
+{
 
-  /* y = x*d */
+   /* y = x*d */
 
-  hypre_assert( x != NULL && y != NULL );
-  (x->interpreter->MultiVecMatDiag)( x->data, mask, n, d, y->data );
+   hypre_assert( x != NULL && y != NULL );
+   (x->interpreter->MultiVecMatDiag)( x->data, mask, n, d, y->data );
 }
 
 void
 mv_MultiVectorEval( void (*f)( void*, void*, void* ), void* par,
-		       mv_MultiVectorPtr x, mv_MultiVectorPtr y ) {
+                    mv_MultiVectorPtr x, mv_MultiVectorPtr y )
+{
 
-  /* y = f(x) computed vector-wise */
+   /* y = f(x) computed vector-wise */
 
-  hypre_assert( x != NULL && y != NULL );
-  (x->interpreter->Eval)( f, par, x->data, y->data );
+   hypre_assert( x != NULL && y != NULL );
+   (x->interpreter->Eval)( f, par, x->data, y->data );
 }
-
-
diff --git a/external/hypre/src/multivector/multivector.h b/external/hypre/src/multivector/multivector.h
index 21c1a232..7fef6af3 100644
--- a/external/hypre/src/multivector/multivector.h
+++ b/external/hypre/src/multivector/multivector.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -25,20 +25,20 @@ extern "C" {
 void *
 mv_MultiVectorGetData (mv_MultiVectorPtr x);
 
-  /* wraps our multivector structure around the data provided by user */
+/* wraps our multivector structure around the data provided by user */
 mv_MultiVectorPtr
 mv_MultiVectorWrap( mv_InterfaceInterpreter* ii, void * data, HYPRE_Int ownsData );
 
-  /* creates a multivector of width n using sample vector */
-mv_MultiVectorPtr 
+/* creates a multivector of width n using sample vector */
+mv_MultiVectorPtr
 mv_MultiVectorCreateFromSampleVector( void*, HYPRE_Int n, void* sample );
 
-  /* creates a multivector of the same shape as x; copies values
-     if copyValues is non-zero */
-mv_MultiVectorPtr 
+/* creates a multivector of the same shape as x; copies values
+   if copyValues is non-zero */
+mv_MultiVectorPtr
 mv_MultiVectorCreateCopy( mv_MultiVectorPtr x, HYPRE_Int copyValues );
 
-void 
+void
 mv_MultiVectorDestroy( mv_MultiVectorPtr );
 
 HYPRE_Int
@@ -47,58 +47,58 @@ mv_MultiVectorWidth( mv_MultiVectorPtr v );
 HYPRE_Int
 mv_MultiVectorHeight( mv_MultiVectorPtr v );
 
-  /* sets mask for v; all the subsequent operations
-     apply only to masked vectors */
+/* sets mask for v; all the subsequent operations
+   apply only to masked vectors */
 void
 mv_MultiVectorSetMask( mv_MultiVectorPtr v, HYPRE_Int* mask );
 
-void 
+void
 mv_MultiVectorClear( mv_MultiVectorPtr );
 
-void 
+void
 mv_MultiVectorSetRandom( mv_MultiVectorPtr v, HYPRE_Int seed );
 
-void 
+void
 mv_MultiVectorCopy( mv_MultiVectorPtr src, mv_MultiVectorPtr dest );
 
-  /* computes y = a*x + y */
-void 
-mv_MultiVectorAxpy( HYPRE_Complex a, mv_MultiVectorPtr x, mv_MultiVectorPtr y ); 
+/* computes y = a*x + y */
+void
+mv_MultiVectorAxpy( HYPRE_Complex a, mv_MultiVectorPtr x, mv_MultiVectorPtr y );
 
-  /* computes the matrix v = x'*y stored in fortran style: gh is the leading dimension,
-     h the number of rows and w the number of columns (cf. blas or lapack) */
-void 
+/* computes the matrix v = x'*y stored in fortran style: gh is the leading dimension,
+   h the number of rows and w the number of columns (cf. blas or lapack) */
+void
 mv_MultiVectorByMultiVector( mv_MultiVectorPtr x, mv_MultiVectorPtr y,
-				HYPRE_Int gh, HYPRE_Int h, HYPRE_Int w, HYPRE_Real* v );
+                             HYPRE_BigInt gh, HYPRE_Int h, HYPRE_Int w, HYPRE_Real* v );
 
-  /*computes the diagonal of x'*y stored in diag(mask) */
-void 
+/*computes the diagonal of x'*y stored in diag(mask) */
+void
 mv_MultiVectorByMultiVectorDiag( mv_MultiVectorPtr, mv_MultiVectorPtr,
-				   HYPRE_Int* mask, HYPRE_Int n, HYPRE_Real* diag );
-
-  /* computes y = x*v, where v is stored in fortran style */
-void 
-mv_MultiVectorByMatrix( mv_MultiVectorPtr x, 
-			   HYPRE_Int gh, HYPRE_Int h, HYPRE_Int w, HYPRE_Complex* v,
-			   mv_MultiVectorPtr y );
-
-  /* computes y = x*v + y, where v is stored in fortran style */
-void 
-mv_MultiVectorXapy( mv_MultiVectorPtr x, 
-		       HYPRE_Int gh, HYPRE_Int h, HYPRE_Int w, HYPRE_Complex* v,
-		       mv_MultiVectorPtr y );
-
-  /* computes y = x*diag(mask) */
-void mv_MultiVectorByDiagonal( mv_MultiVectorPtr x, 
-				  HYPRE_Int* mask, HYPRE_Int n, HYPRE_Complex* diag,
-				  mv_MultiVectorPtr y );
-
-  /* computes y = f(x) vector-by-vector */
-void 
-mv_MultiVectorEval( void (*f)( void*, void*, void* ), 
-		       void* par,
-		       mv_MultiVectorPtr x, 
-		       mv_MultiVectorPtr y );
+                                 HYPRE_Int* mask, HYPRE_Int n, HYPRE_Real* diag );
+
+/* computes y = x*v, where v is stored in fortran style */
+void
+mv_MultiVectorByMatrix( mv_MultiVectorPtr x,
+                        HYPRE_BigInt gh, HYPRE_Int h, HYPRE_Int w, HYPRE_Complex* v,
+                        mv_MultiVectorPtr y );
+
+/* computes y = x*v + y, where v is stored in fortran style */
+void
+mv_MultiVectorXapy( mv_MultiVectorPtr x,
+                    HYPRE_BigInt gh, HYPRE_Int h, HYPRE_Int w, HYPRE_Complex* v,
+                    mv_MultiVectorPtr y );
+
+/* computes y = x*diag(mask) */
+void mv_MultiVectorByDiagonal( mv_MultiVectorPtr x,
+                               HYPRE_Int* mask, HYPRE_Int n, HYPRE_Complex* diag,
+                               mv_MultiVectorPtr y );
+
+/* computes y = f(x) vector-by-vector */
+void
+mv_MultiVectorEval( void (*f)( void*, void*, void* ),
+                    void* par,
+                    mv_MultiVectorPtr x,
+                    mv_MultiVectorPtr y );
 
 #ifdef __cplusplus
 }
diff --git a/external/hypre/src/multivector/par_csr_matmultivec.c b/external/hypre/src/multivector/par_csr_matmultivec.c
index a932bed2..0d10a8c3 100644
--- a/external/hypre/src/multivector/par_csr_matmultivec.c
+++ b/external/hypre/src/multivector/par_csr_matmultivec.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -32,7 +32,7 @@ hypre_ParCSRMatrixMatMultiVec(HYPRE_Complex alpha, hypre_ParCSRMatrix *A,
                               hypre_ParMultivector *x, HYPRE_Complex beta,
                               hypre_ParMultivector *y)
 {
-   hypre_ParCSRCommMultiHandle	*comm_handle;
+   hypre_ParCSRCommMultiHandle   *comm_handle;
    hypre_ParCSRCommPkg *comm_pkg = hypre_ParCSRMatrixCommPkg(A);
    hypre_CSRMatrix     *diag   = hypre_ParCSRMatrixDiag(A);
    hypre_CSRMatrix     *offd   = hypre_ParCSRMatrixOffd(A);
@@ -47,9 +47,9 @@ hypre_ParCSRMatrixMatMultiVec(HYPRE_Complex alpha, hypre_ParCSRMatrix *A,
    HYPRE_Int        x_size = hypre_MultivectorSize(x_local);
    HYPRE_Int        y_size = hypre_MultivectorSize(y_local);
    HYPRE_Int        num_vectors = hypre_MultivectorNumVectors(x_local);
-   HYPRE_Int	      num_cols_offd = hypre_CSRMatrixNumCols(offd);
+   HYPRE_Int         num_cols_offd = hypre_CSRMatrixNumCols(offd);
    HYPRE_Int        ierr = 0, send_leng, num_vec_sends, endp1;
-   HYPRE_Int	      num_sends, i, j, jj, index, start, offset, length, jv;
+   HYPRE_Int         num_sends, i, j, jj, index, start, offset, length, jv;
    HYPRE_Int        num_active_vectors;
 
    HYPRE_Complex     *x_tmp_data, *x_buf_data;
@@ -61,8 +61,8 @@ hypre_ParCSRMatrixMatMultiVec(HYPRE_Complex alpha, hypre_ParCSRMatrix *A,
 
    num_active_vectors = x->num_active_vectors;
    hypre_assert(num_active_vectors == y->num_active_vectors);
-   if (x_active_ind == NULL) num_vec_sends = num_vectors;
-   else                      num_vec_sends = x->num_active_vectors;
+   if (x_active_ind == NULL) { num_vec_sends = num_vectors; }
+   else { num_vec_sends = x->num_active_vectors; }
 
    /*---------------------------------------------------------------------
     *  Check for size compatibility.  ParMatvec returns ierr = 11 if
@@ -75,9 +75,9 @@ hypre_ParCSRMatrixMatMultiVec(HYPRE_Complex alpha, hypre_ParCSRMatrix *A,
     *  is informational only.
     *--------------------------------------------------------------------*/
 
-   if (num_cols != x_size) ierr = 11;
-   if (num_rows != y_size) ierr = 12;
-   if (num_cols != x_size && num_rows != y_size) ierr = 13;
+   if (num_cols != x_size) { ierr = 11; }
+   if (num_rows != y_size) { ierr = 12; }
+   if (num_cols != x_size && num_rows != y_size) { ierr = 13; }
 
    /*---------------------------------------------------------------------
     * If there exists no CommPkg for A, a CommPkg is generated using
@@ -96,7 +96,7 @@ hypre_ParCSRMatrixMatMultiVec(HYPRE_Complex alpha, hypre_ParCSRMatrix *A,
     * allocate temporary and send buffers and communication handle
     *--------------------------------------------------------------------*/
 
-   x_buf_data = hypre_CTAlloc(HYPRE_Complex,  num_vec_sends*send_leng, HYPRE_MEMORY_HOST);
+   x_buf_data = hypre_CTAlloc(HYPRE_Complex,  num_vec_sends * send_leng, HYPRE_MEMORY_HOST);
    x_tmp = hypre_SeqMultivectorCreate( num_cols_offd, num_vectors );
    hypre_SeqMultivectorInitialize(x_tmp);
    x_tmp_data = hypre_MultivectorData(x_tmp);
@@ -113,12 +113,12 @@ hypre_ParCSRMatrixMatMultiVec(HYPRE_Complex alpha, hypre_ParCSRMatrix *A,
       for (i = 0; i < num_sends; i++)
       {
          start  = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-         endp1  = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1);
+         endp1  = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1);
          length = endp1 - start;
          for (j = start; j < endp1; j++)
          {
-            index = hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j);
-            x_buf_data[offset+j] = x_local_data[jj*x_size + index];
+            index = hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j);
+            x_buf_data[offset + j] = x_local_data[jj * x_size + index];
          }
       }
       offset += hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends);
@@ -128,8 +128,8 @@ hypre_ParCSRMatrixMatMultiVec(HYPRE_Complex alpha, hypre_ParCSRMatrix *A,
     * initiate sending data
     *--------------------------------------------------------------------*/
 
-   comm_handle = hypre_ParCSRCommMultiHandleCreate(1,comm_pkg,x_buf_data,
-                                   x_tmp_data, num_vec_sends);
+   comm_handle = hypre_ParCSRCommMultiHandleCreate(1, comm_pkg, x_buf_data,
+                                                   x_tmp_data, num_vec_sends);
 
    hypre_CSRMatrixMatMultivec(alpha, diag, x_local, beta, y_local);
 
@@ -138,7 +138,9 @@ hypre_ParCSRMatrixMatMultiVec(HYPRE_Complex alpha, hypre_ParCSRMatrix *A,
    hypre_TFree(comm_handle, HYPRE_MEMORY_HOST);
 
    if (num_cols_offd)
+   {
       hypre_CSRMatrixMultiMatvec(alpha, offd, x_tmp, 1.0, y_local);
+   }
 
    hypre_SeqMultivectorDestroy(x_tmp);
    x_tmp = NULL;
@@ -159,7 +161,7 @@ hypre_ParCSRMatrixMultiMatVecT(HYPRE_Complex alpha, hypre_ParCSRMatrix *A,
                                hypre_ParMultivector *x, HYPRE_Complex beta,
                                hypre_ParMultivector *y)
 {
-   hypre_ParCSRCommMultiHandle	*comm_handle;
+   hypre_ParCSRCommMultiHandle   *comm_handle;
    hypre_ParCSRCommPkg *comm_pkg = hypre_ParCSRMatrixCommPkg(A);
    hypre_CSRMatrix     *diag   = hypre_ParCSRMatrixDiag(A);
    hypre_CSRMatrix     *offd   = hypre_ParCSRMatrixOffd(A);
@@ -173,9 +175,9 @@ hypre_ParCSRMatrixMultiMatVecT(HYPRE_Complex alpha, hypre_ParCSRMatrix *A,
    HYPRE_Int        x_size = hypre_MultivectorSize(x_local);
    HYPRE_Int        y_size = hypre_MultivectorSize(y_local);
    HYPRE_Int        num_vectors = hypre_MultivectorNumVectors(x_local);
-   HYPRE_Int	      num_cols_offd = hypre_CSRMatrixNumCols(offd);
+   HYPRE_Int         num_cols_offd = hypre_CSRMatrixNumCols(offd);
    HYPRE_Int        ierr = 0, send_leng, num_vec_sends, endp1;
-   HYPRE_Int	      num_sends, i, j, jj, index, start, offset, length, jv;
+   HYPRE_Int         num_sends, i, j, jj, index, start, offset, length, jv;
    HYPRE_Int        num_active_vectors;
 
    HYPRE_Complex     *y_tmp_data, *y_buf_data;
@@ -187,8 +189,8 @@ hypre_ParCSRMatrixMultiMatVecT(HYPRE_Complex alpha, hypre_ParCSRMatrix *A,
 
    num_active_vectors = x->num_active_vectors;
    hypre_assert(num_active_vectors == y->num_active_vectors);
-   if (x_active_ind == NULL) num_vec_sends = num_vectors;
-   else                      num_vec_sends = x->num_active_vectors;
+   if (x_active_ind == NULL) { num_vec_sends = num_vectors; }
+   else { num_vec_sends = x->num_active_vectors; }
 
    /*---------------------------------------------------------------------
     *  Check for size compatibility.  MatvecT returns ierr = 1 if
@@ -201,14 +203,14 @@ hypre_ParCSRMatrixMultiMatVecT(HYPRE_Complex alpha, hypre_ParCSRMatrix *A,
     *  is informational only.
     *--------------------------------------------------------------------*/
 
-    if (num_rows != x_size)  ierr = 1;
-    if (num_cols != y_size)  ierr = 2;
-    if (num_rows != x_size && num_cols != y_size)  ierr = 3;
+   if (num_rows != x_size) { ierr = 1; }
+   if (num_cols != y_size) { ierr = 2; }
+   if (num_rows != x_size && num_cols != y_size) { ierr = 3; }
 
-    /*---------------------------------------------------------------------
-    * If there exists no CommPkg for A, a CommPkg is generated using
-    * equally load balanced partitionings
-    *--------------------------------------------------------------------*/
+   /*---------------------------------------------------------------------
+   * If there exists no CommPkg for A, a CommPkg is generated using
+   * equally load balanced partitionings
+   *--------------------------------------------------------------------*/
 
    if (!comm_pkg)
    {
@@ -218,11 +220,11 @@ hypre_ParCSRMatrixMultiMatVecT(HYPRE_Complex alpha, hypre_ParCSRMatrix *A,
    num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
    send_leng = hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends);
 
-    /*---------------------------------------------------------------------
-    * allocate temporary and send buffers and communication handle
-    *--------------------------------------------------------------------*/
+   /*---------------------------------------------------------------------
+   * allocate temporary and send buffers and communication handle
+   *--------------------------------------------------------------------*/
 
-   y_buf_data = hypre_CTAlloc(HYPRE_Complex,  num_vec_sends*send_leng, HYPRE_MEMORY_HOST);
+   y_buf_data = hypre_CTAlloc(HYPRE_Complex,  num_vec_sends * send_leng, HYPRE_MEMORY_HOST);
    y_tmp = hypre_SeqMultivectorCreate( num_cols_offd, num_vectors );
    hypre_SeqMultivectorInitialize(y_tmp);
    y_tmp_data = hypre_MultivectorData(y_tmp);
@@ -239,12 +241,12 @@ hypre_ParCSRMatrixMultiMatVecT(HYPRE_Complex alpha, hypre_ParCSRMatrix *A,
       for (i = 0; i < num_sends; i++)
       {
          start  = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-         endp1  = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1);
+         endp1  = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1);
          length = endp1 - start;
          for (j = start; j < endp1; j++)
          {
-            index = hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j);
-            y_buf_data[offset+j] = y_local_data[jj*y_size + index];
+            index = hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j);
+            y_buf_data[offset + j] = y_local_data[jj * y_size + index];
          }
       }
       offset += hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends);
@@ -255,7 +257,7 @@ hypre_ParCSRMatrixMultiMatVecT(HYPRE_Complex alpha, hypre_ParCSRMatrix *A,
     *--------------------------------------------------------------------*/
 
    comm_handle = hypre_ParCSRCommMultiHandleCreate(1, comm_pkg,
-		            y_buf_data, y_tmp_data, num_vec_sends);
+                                                   y_buf_data, y_tmp_data, num_vec_sends);
 
    hypre_CSRMatrixMultiMatvecT(alpha, diag, x_local, beta, y_local);
 
@@ -264,7 +266,9 @@ hypre_ParCSRMatrixMultiMatVecT(HYPRE_Complex alpha, hypre_ParCSRMatrix *A,
    hypre_TFree(comm_handle, HYPRE_MEMORY_HOST);
 
    if (num_cols_offd)
+   {
       hypre_CSRMatrixMultiMatvecT(alpha, offd, y_tmp, 1.0, y_local);
+   }
 
    hypre_SeqMultivectorDestroy(y_tmp);
    y_tmp = NULL;
diff --git a/external/hypre/src/multivector/par_csr_matmultivec.h b/external/hypre/src/multivector/par_csr_matmultivec.h
index 7eaf6e75..74cc2c73 100644
--- a/external/hypre/src/multivector/par_csr_matmultivec.h
+++ b/external/hypre/src/multivector/par_csr_matmultivec.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -22,13 +22,13 @@ extern "C" {
 #endif
 
 HYPRE_Int hypre_ParCSRMatrixMatMultiVec(HYPRE_Complex, hypre_ParCSRMatrix*,
-                                  hypre_ParMultiVector*,
-                                  HYPRE_Complex, hypre_ParMultiVector*);
+                                        hypre_ParMultiVector*,
+                                        HYPRE_Complex, hypre_ParMultiVector*);
 
 
 HYPRE_Int hypre_ParCSRMatrixMatMultiVecT(HYPRE_Complex, hypre_ParCSRMatrix*,
-                                  hypre_ParMultiVector*,
-                                  HYPRE_Complex, hypre_ParMultiVector*);
+                                         hypre_ParMultiVector*,
+                                         HYPRE_Complex, hypre_ParMultiVector*);
 
 #ifdef __cplusplus
 }
diff --git a/external/hypre/src/multivector/par_csr_pmvcomm.c b/external/hypre/src/multivector/par_csr_pmvcomm.c
index dbfbe5cb..75ca4bfd 100644
--- a/external/hypre/src/multivector/par_csr_pmvcomm.c
+++ b/external/hypre/src/multivector/par_csr_pmvcomm.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -14,8 +14,8 @@
 hypre_ParCSRCommMultiHandle *
 hypre_ParCSRCommMultiHandleCreate (HYPRE_Int                   job,
                                    hypre_ParCSRCommPkg *comm_pkg,
-                                   void                *send_data, 
-                                   void                *recv_data, 
+                                   void                *send_data,
+                                   void                *recv_data,
                                    HYPRE_Int                 num_vecs )
 {
    HYPRE_Int            num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
@@ -29,27 +29,27 @@ hypre_ParCSRCommMultiHandleCreate (HYPRE_Int                   job,
    HYPRE_Int                  i, j;
    HYPRE_Int                  my_id, num_procs;
    HYPRE_Int                  ip, vec_start, vec_len;
-                  
+
    /*--------------------------------------------------------------------
     * hypre_Initialize sets up a communication handle,
-    * posts receives and initiates sends. It always requires num_sends, 
+    * posts receives and initiates sends. It always requires num_sends,
     * num_recvs, recv_procs and send_procs to be set in comm_pkg.
     * There are different options for job:
     * job = 1 : is used to initialize communication exchange for the parts
-    *           of vector needed to perform a Matvec,  it requires send_data 
-    *           and recv_data to be doubles, recv_vec_starts and 
+    *           of vector needed to perform a Matvec,  it requires send_data
+    *           and recv_data to be doubles, recv_vec_starts and
     *           send_map_starts need to be set in comm_pkg.
     * job = 2 : is used to initialize communication exchange for the parts
-    *           of vector needed to perform a MatvecT,  it requires send_data 
-    *           and recv_data to be doubles, recv_vec_starts and 
+    *           of vector needed to perform a MatvecT,  it requires send_data
+    *           and recv_data to be doubles, recv_vec_starts and
     *           send_map_starts need to be set in comm_pkg.
     *--------------------------------------------------------------------*/
 
    num_requests = num_sends + num_recvs;
    requests = hypre_CTAlloc(hypre_MPI_Request,  num_requests, HYPRE_MEMORY_HOST);
- 
-   hypre_MPI_Comm_size(comm,&num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+
+   hypre_MPI_Comm_size(comm, &num_procs);
+   hypre_MPI_Comm_rank(comm, &my_id);
 
    j = 0;
    switch (job)
@@ -60,18 +60,18 @@ hypre_ParCSRCommMultiHandleCreate (HYPRE_Int                   job,
          HYPRE_Complex *d_recv_data = (HYPRE_Complex *) recv_data;
          for (i = 0; i < num_recvs; i++)
          {
-            ip = hypre_ParCSRCommPkgRecvProc(comm_pkg, i); 
-            vec_start = hypre_ParCSRCommPkgRecvVecStart(comm_pkg,i);
-            vec_len = hypre_ParCSRCommPkgRecvVecStart(comm_pkg,i+1)-vec_start;
-            hypre_MPI_Irecv(&d_recv_data[vec_start*num_vecs], vec_len*num_vecs, 
+            ip = hypre_ParCSRCommPkgRecvProc(comm_pkg, i);
+            vec_start = hypre_ParCSRCommPkgRecvVecStart(comm_pkg, i);
+            vec_len = hypre_ParCSRCommPkgRecvVecStart(comm_pkg, i + 1) - vec_start;
+            hypre_MPI_Irecv(&d_recv_data[vec_start * num_vecs], vec_len * num_vecs,
                             HYPRE_MPI_COMPLEX, ip, 0, comm, &requests[j++]);
          }
          for (i = 0; i < num_sends; i++)
          {
             vec_start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-            vec_len = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1)-vec_start;
-            ip = hypre_ParCSRCommPkgSendProc(comm_pkg, i); 
-            hypre_MPI_Isend(&d_send_data[vec_start*num_vecs], vec_len*num_vecs,
+            vec_len = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1) - vec_start;
+            ip = hypre_ParCSRCommPkgSendProc(comm_pkg, i);
+            hypre_MPI_Isend(&d_send_data[vec_start * num_vecs], vec_len * num_vecs,
                             HYPRE_MPI_COMPLEX, ip, 0, comm, &requests[j++]);
          }
          break;
@@ -83,17 +83,17 @@ hypre_ParCSRCommMultiHandleCreate (HYPRE_Int                   job,
          for (i = 0; i < num_sends; i++)
          {
             vec_start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-            vec_len = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1) - vec_start;
-            ip = hypre_ParCSRCommPkgSendProc(comm_pkg, i); 
-            hypre_MPI_Irecv(&d_recv_data[vec_start*num_vecs], vec_len*num_vecs,
+            vec_len = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1) - vec_start;
+            ip = hypre_ParCSRCommPkgSendProc(comm_pkg, i);
+            hypre_MPI_Irecv(&d_recv_data[vec_start * num_vecs], vec_len * num_vecs,
                             HYPRE_MPI_COMPLEX, ip, 0, comm, &requests[j++]);
          }
          for (i = 0; i < num_recvs; i++)
          {
-            ip = hypre_ParCSRCommPkgRecvProc(comm_pkg, i); 
-            vec_start = hypre_ParCSRCommPkgRecvVecStart(comm_pkg,i);
-            vec_len = hypre_ParCSRCommPkgRecvVecStart(comm_pkg,i+1)-vec_start;
-            hypre_MPI_Isend(&d_send_data[vec_start*num_vecs], vec_len*num_vecs,
+            ip = hypre_ParCSRCommPkgRecvProc(comm_pkg, i);
+            vec_start = hypre_ParCSRCommPkgRecvVecStart(comm_pkg, i);
+            vec_len = hypre_ParCSRCommPkgRecvVecStart(comm_pkg, i + 1) - vec_start;
+            hypre_MPI_Isend(&d_send_data[vec_start * num_vecs], vec_len * num_vecs,
                             HYPRE_MPI_COMPLEX, ip, 0, comm, &requests[j++]);
          }
          break;
@@ -123,7 +123,7 @@ hypre_ParCSRCommMultiHandleDestroy(hypre_ParCSRCommMultiHandle *comm_handle)
 
    if (hypre_ParCSRCommMultiHandleNumRequests(comm_handle))
    {
-      status0 = hypre_CTAlloc(hypre_MPI_Status, 
+      status0 = hypre_CTAlloc(hypre_MPI_Status,
                               hypre_ParCSRCommMultiHandleNumRequests(comm_handle), HYPRE_MEMORY_HOST);
       hypre_MPI_Waitall(hypre_ParCSRCommMultiHandleNumRequests(comm_handle),
                         hypre_ParCSRCommMultiHandleRequests(comm_handle), status0);
diff --git a/external/hypre/src/multivector/par_csr_pmvcomm.h b/external/hypre/src/multivector/par_csr_pmvcomm.h
index a3284dc0..fc8464dc 100644
--- a/external/hypre/src/multivector/par_csr_pmvcomm.h
+++ b/external/hypre/src/multivector/par_csr_pmvcomm.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -21,8 +21,8 @@ extern "C" {
 typedef struct
 {
    hypre_ParCSRCommPkg  *comm_pkg;
-   void 	        *send_data;
-   void 	        *recv_data;
+   void          *send_data;
+   void          *recv_data;
    HYPRE_Int                  num_requests;
    hypre_MPI_Request          *requests;
 
@@ -31,7 +31,7 @@ typedef struct
 /*--------------------------------------------------------------------------
  * Accessor macros: hypre_ParCSRCommMultiHandle
  *--------------------------------------------------------------------------*/
- 
+
 #define hypre_ParCSRCommMultiHandleCommPkg(comm_handle)     (comm_handle -> comm_pkg)
 #define hypre_ParCSRCommMultiHandleSendData(comm_handle)    (comm_handle -> send_data)
 #define hypre_ParCSRCommMultiHandleRecvData(comm_handle)    (comm_handle -> recv_data)
@@ -40,11 +40,11 @@ typedef struct
 #define hypre_ParCSRCommMultiHandleRequest(comm_handle, i)  (comm_handle -> requests[i])
 
 hypre_ParCSRCommMultiHandle *
-hypre_ParCSRCommMultiHandleCreate ( HYPRE_Int 	          job,
-			            hypre_ParCSRCommPkg   *comm_pkg,
-                                    void                  *send_data, 
-                                    void                  *recv_data, 
-				    HYPRE_Int                   nvecs       );
+hypre_ParCSRCommMultiHandleCreate ( HYPRE_Int             job,
+                                    hypre_ParCSRCommPkg   *comm_pkg,
+                                    void                  *send_data,
+                                    void                  *recv_data,
+                                    HYPRE_Int                   nvecs       );
 
 
 HYPRE_Int
@@ -54,4 +54,4 @@ hypre_ParCSRCommMultiHandleDestroy(hypre_ParCSRCommMultiHandle *comm_handle);
 }
 #endif
 
-#endif /* HYPRE_PAR_CSR_MULTICOMMUNICATION_HEADER */ 
+#endif /* HYPRE_PAR_CSR_MULTICOMMUNICATION_HEADER */
diff --git a/external/hypre/src/multivector/par_multivector.c b/external/hypre/src/multivector/par_multivector.c
index 227fa6d1..00f6d278 100644
--- a/external/hypre/src/multivector/par_multivector.c
+++ b/external/hypre/src/multivector/par_multivector.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -46,11 +46,11 @@ hypre_ParMultiVectorCreate(MPI_Comm comm, HYPRE_Int global_size, HYPRE_Int *part
    hypre_ParMultiVectorNumVectors(vector) = num_vectors;
 
    hypre_ParMultiVectorLocalVector(vector) =
-         hypre_SeqMultivectorCreate((partitioning[my_id+1]-partitioning[my_id]), num_vectors);
+      hypre_SeqMultivectorCreate((partitioning[my_id + 1] - partitioning[my_id]), num_vectors);
 
    hypre_ParMultiVectorFirstIndex(vector) = partitioning[my_id];
 
-  /* we set these 2 defaults exactly as in par_vector.c, although it's questionable */
+   /* we set these 2 defaults exactly as in par_vector.c, although it's questionable */
    hypre_ParMultiVectorOwnsData(vector) = 1;
    hypre_ParMultiVectorOwnsPartitioning(vector) = 1;
 
@@ -64,13 +64,17 @@ hypre_ParMultiVectorCreate(MPI_Comm comm, HYPRE_Int global_size, HYPRE_Int *part
 HYPRE_Int
 hypre_ParMultiVectorDestroy( hypre_ParMultiVector *pm_vector )
 {
-   if (NULL!=pm_vector)
+   if (NULL != pm_vector)
    {
       if ( hypre_ParMultiVectorOwnsData(pm_vector) )
+      {
          hypre_SeqMultivectorDestroy(hypre_ParMultiVectorLocalVector(pm_vector));
+      }
 
       if ( hypre_ParMultiVectorOwnsPartitioning(pm_vector) )
+      {
          hypre_TFree(hypre_ParMultiVectorPartitioning(pm_vector), HYPRE_MEMORY_HOST);
+      }
 
       hypre_TFree(pm_vector, HYPRE_MEMORY_HOST);
    }
@@ -87,7 +91,7 @@ hypre_ParMultiVectorInitialize( hypre_ParMultiVector *pm_vector )
    HYPRE_Int  ierr;
 
    ierr = hypre_SeqMultivectorInitialize(
-                               hypre_ParMultiVectorLocalVector(pm_vector));
+             hypre_ParMultiVectorLocalVector(pm_vector));
 
    return ierr;
 }
@@ -100,7 +104,7 @@ HYPRE_Int
 hypre_ParMultiVectorSetDataOwner( hypre_ParMultiVector *pm_vector,
                                   HYPRE_Int           owns_data   )
 {
-   HYPRE_Int    ierr=0;
+   HYPRE_Int    ierr = 0;
 
    hypre_ParMultiVectorOwnsData(pm_vector) = owns_data;
 
@@ -128,7 +132,7 @@ hypre_ParMultiVectorSetConstantValues( hypre_ParMultiVector *v,
 {
    hypre_Multivector *v_local = hypre_ParMultiVectorLocalVector(v);
 
-   return hypre_SeqMultivectorSetConstantValues(v_local,value);
+   return hypre_SeqMultivectorSetConstantValues(v_local, value);
 }
 
 /*--------------------------------------------------------------------------
@@ -141,12 +145,12 @@ hypre_ParMultiVectorSetRandomValues( hypre_ParMultiVector *v, HYPRE_Int  seed)
    HYPRE_Int my_id;
    hypre_Multivector *v_local = hypre_ParMultiVectorLocalVector(v);
 
-   MPI_Comm 	comm = hypre_ParMultiVectorComm(v);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   MPI_Comm    comm = hypre_ParMultiVectorComm(v);
+   hypre_MPI_Comm_rank(comm, &my_id);
 
-   seed *= (my_id+1);
+   seed *= (my_id + 1);
 
-   return hypre_SeqMultivectorSetRandomValues(v_local,seed);
+   return hypre_SeqMultivectorSetRandomValues(v_local, seed);
 }
 
 /*--------------------------------------------------------------------------
@@ -216,7 +220,7 @@ hypre_ParMultiVectorByDiag(hypre_ParMultiVector *x, HYPRE_Int *mask, HYPRE_Int n
                            HYPRE_Complex *alpha, hypre_ParMultiVector *y)
 {
    return hypre_SeqMultivectorByDiag(x->local_vector, mask, n, alpha,
-                                      y->local_vector);
+                                     y->local_vector);
 }
 
 /*--------------------------------------------------------------------------
@@ -230,10 +234,10 @@ hypre_ParMultiVectorInnerProd(hypre_ParMultiVector *x, hypre_ParMultiVector *y,
    MPI_Comm           comm;
    HYPRE_Int                count;
    HYPRE_Int                ierr;
-/*
- *    HYPRE_Int                myid;
- *    HYPRE_Int                i
- */
+   /*
+    *    HYPRE_Int                myid;
+    *    HYPRE_Int                i
+    */
 
    /* assuming "results" and "workspace" are arrays of size ("n_active_x" by "n_active_y")
       n_active_x is the number of active vectors in multivector x
@@ -250,16 +254,16 @@ hypre_ParMultiVectorInnerProd(hypre_ParMultiVector *x, hypre_ParMultiVector *y,
                               hypre_MPI_SUM, comm);
    hypre_assert (ierr == hypre_MPI_SUCCESS);
 
-/* debug */
+   /* debug */
 
-/*
- *    hypre_MPI_Comm_rank(comm, &myid);
- *    if (myid==0)
- *       for (i=0; i<count; i++)
- *          hypre_printf("%22.14e\n",results[i])
- */
+   /*
+    *    hypre_MPI_Comm_rank(comm, &myid);
+    *    if (myid==0)
+    *       for (i=0; i<count; i++)
+    *          hypre_printf("%22.14e\n",results[i])
+    */
 
-/* ------------ */
+   /* ------------ */
 
    return 0;
 }
@@ -286,26 +290,26 @@ hypre_ParMultiVectorInnerProdDiag(hypre_ParMultiVector *x, hypre_ParMultiVector
 }
 
 HYPRE_Int
-hypre_ParMultiVectorByMatrix(hypre_ParMultiVector *x, HYPRE_Int rGHeight, HYPRE_Int rHeight,
+hypre_ParMultiVectorByMatrix(hypre_ParMultiVector *x, HYPRE_BigInt rGHeight, HYPRE_Int rHeight,
                              HYPRE_Int rWidth, HYPRE_Complex* rVal, hypre_ParMultiVector * y)
 {
    return hypre_SeqMultivectorByMatrix(x->local_vector, rGHeight, rHeight,
-                                        rWidth, rVal, y->local_vector);
+                                       rWidth, rVal, y->local_vector);
 }
 
 HYPRE_Int
-hypre_ParMultiVectorXapy(hypre_ParMultiVector *x, HYPRE_Int rGHeight, HYPRE_Int rHeight,
+hypre_ParMultiVectorXapy(hypre_ParMultiVector *x, HYPRE_BigInt rGHeight, HYPRE_Int rHeight,
                          HYPRE_Int rWidth, HYPRE_Complex* rVal, hypre_ParMultiVector * y)
 {
    return hypre_SeqMultivectorXapy(x->local_vector, rGHeight, rHeight,
-                                    rWidth, rVal, y->local_vector);
+                                   rWidth, rVal, y->local_vector);
 }
 
 /* temporary function; allows to do "matvec" and preconditioner in
    vector-by-vector fashion */
 HYPRE_Int
 hypre_ParMultiVectorEval(void (*f)( void*, void*, void* ), void* par,
-                           hypre_ParMultiVector * x, hypre_ParMultiVector * y)
+                         hypre_ParMultiVector * x, hypre_ParMultiVector * y)
 {
    hypre_ParVector  *temp_x, *temp_y;
    HYPRE_Int i;
@@ -317,19 +321,19 @@ hypre_ParMultiVectorEval(void (*f)( void*, void*, void* ), void* par,
    hypre_assert(x->local_vector->num_active_vectors == y->local_vector->num_active_vectors);
    hypre_assert(x->local_vector->size == y->local_vector->size);
 
-   temp_x=hypre_ParVectorCreate(x->comm,x->global_size, x->partitioning);
-   hypre_assert(temp_x!=NULL);
-   temp_x->local_vector->owns_data=0;
+   temp_x = hypre_ParVectorCreate(x->comm, x->global_size, x->partitioning);
+   hypre_assert(temp_x != NULL);
+   temp_x->local_vector->owns_data = 0;
    temp_x->local_vector->vecstride = temp_x->local_vector->size;
    temp_x->local_vector->idxstride = 1;
-/* no initialization for temp_x needed! */
+   /* no initialization for temp_x needed! */
 
-   temp_y=hypre_ParVectorCreate(y->comm,y->global_size, y->partitioning);
-   hypre_assert(temp_y!=NULL);
-   temp_y->local_vector->owns_data=0;
+   temp_y = hypre_ParVectorCreate(y->comm, y->global_size, y->partitioning);
+   hypre_assert(temp_y != NULL);
+   temp_y->local_vector->owns_data = 0;
    temp_y->local_vector->vecstride = temp_y->local_vector->size;
    temp_y->local_vector->idxstride = 1;
-/* no initialization for temp_y needed! */
+   /* no initialization for temp_y needed! */
 
    num_active_vectors = x->local_vector->num_active_vectors;
    x_active_indices = x->local_vector->active_indices;
@@ -338,10 +342,10 @@ hypre_ParMultiVectorEval(void (*f)( void*, void*, void* ), void* par,
    y_data = y->local_vector->data;
    size = x->local_vector->size;
 
-   for ( i=0; i<num_active_vectors; i++ )
+   for ( i = 0; i < num_active_vectors; i++ )
    {
-      temp_x->local_vector->data = x_data + x_active_indices[i]*size;
-      temp_y->local_vector->data = y_data + y_active_indices[i]*size;
+      temp_x->local_vector->data = x_data + x_active_indices[i] * size;
+      temp_y->local_vector->data = y_data + y_active_indices[i] * size;
 
       /*** here i make an assumption that "f" will treat temp_x and temp_y like
             "hypre_ParVector *" variables ***/
@@ -358,7 +362,7 @@ hypre_ParMultiVectorEval(void (*f)( void*, void*, void* ), void* par,
 
 hypre_ParMultiVector *
 hypre_ParMultiVectorTempRead(MPI_Comm comm, const char *fileName)
-        /* ***** temporary implementation ****** */
+/* ***** temporary implementation ****** */
 {
    HYPRE_Int i, n, id;
    HYPRE_Complex * dest;
@@ -372,48 +376,54 @@ hypre_ParMultiVectorTempRead(MPI_Comm comm, const char *fileName)
    /* calculate the number of files */
    hypre_MPI_Comm_rank( comm, &id );
    n = 0;
-   do {
-     hypre_sprintf( temp_string, "test -f %s.%d.%d", fileName, n, id );
-     if (!(retcode=system(temp_string))) /* zero retcode mean file exists */
-       n++;
-   } while (!retcode);
+   do
+   {
+      hypre_sprintf( temp_string, "test -f %s.%d.%d", fileName, n, id );
+      if (!(retcode = system(temp_string))) /* zero retcode mean file exists */
+      {
+         n++;
+      }
+   }
+   while (!retcode);
 
-   if ( n == 0 ) return NULL;
+   if ( n == 0 ) { return NULL; }
 
    /* now read the first vector using hypre_ParVectorRead into temp_vec */
 
-   hypre_sprintf(temp_string,"%s.%d",fileName,0);
+   hypre_sprintf(temp_string, "%s.%d", fileName, 0);
    temp_vec = hypre_ParVectorRead(comm, temp_string);
 
    /* now create multivector using temp_vec as a sample */
 
    x = hypre_ParMultiVectorCreate(hypre_ParVectorComm(temp_vec),
-        hypre_ParVectorGlobalSize(temp_vec),hypre_ParVectorPartitioning(temp_vec),n);
+                                  hypre_ParVectorGlobalSize(temp_vec), hypre_ParVectorPartitioning(temp_vec), n);
 
    hypre_ParMultiVectorInitialize(x);
 
    /* read data from first and all other vectors into "x" */
 
    i = 0;
-   do {
-   /* copy data from current vector */
-      dest = x->local_vector->data + i*(x->local_vector->size);
+   do
+   {
+      /* copy data from current vector */
+      dest = x->local_vector->data + i * (x->local_vector->size);
       src = temp_vec->local_vector->data;
       count = temp_vec->local_vector->size;
 
       hypre_TMemcpy(dest, src, HYPRE_Complex, count, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
 
-   /* destroy current vector */
+      /* destroy current vector */
       hypre_ParVectorDestroy(temp_vec);
 
-   /* read the data to new current vector, if there are more vectors to read */
-      if (i<n-1)
+      /* read the data to new current vector, if there are more vectors to read */
+      if (i < n - 1)
       {
-         hypre_sprintf(temp_string,"%s.%d",fileName,i+1);
+         hypre_sprintf(temp_string, "%s.%d", fileName, i + 1);
          temp_vec = hypre_ParVectorRead(comm, temp_string);
 
       }
-   } while (++i<n);
+   }
+   while (++i < n);
 
    return x;
 }
@@ -427,21 +437,21 @@ hypre_ParMultiVectorTempPrint(hypre_ParMultiVector *vector, const char *fileName
 
    hypre_assert( vector != NULL );
 
-   temp_vec=hypre_ParVectorCreate(vector->comm,vector->global_size, vector->partitioning);
-   hypre_assert(temp_vec!=NULL);
-   temp_vec->local_vector->owns_data=0;
+   temp_vec = hypre_ParVectorCreate(vector->comm, vector->global_size, vector->partitioning);
+   hypre_assert(temp_vec != NULL);
+   temp_vec->local_vector->owns_data = 0;
 
    /* no initialization for temp_vec needed! */
 
    ierr = 0;
    for ( i = 0; i < vector->local_vector->num_vectors; i++ )
    {
-     hypre_sprintf( fullName, "%s.%d", fileName, i );
+      hypre_sprintf( fullName, "%s.%d", fileName, i );
 
-     temp_vec->local_vector->data=vector->local_vector->data + i *
+      temp_vec->local_vector->data = vector->local_vector->data + i *
                                      vector->local_vector->size;
 
-     ierr = ierr || hypre_ParVectorPrint(temp_vec, fullName);
+      ierr = ierr || hypre_ParVectorPrint(temp_vec, fullName);
    }
 
    ierr = ierr || hypre_ParVectorDestroy(temp_vec);
diff --git a/external/hypre/src/multivector/par_multivector.h b/external/hypre/src/multivector/par_multivector.h
index fcaecf52..358c01ea 100644
--- a/external/hypre/src/multivector/par_multivector.h
+++ b/external/hypre/src/multivector/par_multivector.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -26,20 +26,20 @@ extern "C" {
 
 typedef struct
 {
-   MPI_Comm	      comm;
+   MPI_Comm       comm;
    HYPRE_Int                global_size;
    HYPRE_Int                first_index;
-   HYPRE_Int      	      *partitioning;
-   HYPRE_Int      	      owns_data;
-   HYPRE_Int      	      num_vectors;
+   HYPRE_Int               *partitioning;
+   HYPRE_Int               owns_data;
+   HYPRE_Int               num_vectors;
    hypre_Multivector  *local_vector;
 
-/* using mask on "parallel" level seems to be inconvenient, so i (IL) moved it to
-       "sequential" level. Also i now store it as a number of active indices and an array of
-       active indices. hypre_ParMultiVectorSetMask converts user-provided "(1,1,0,1,...)" mask
-       to the format above.
-   HYPRE_Int                *mask;
-*/
+   /* using mask on "parallel" level seems to be inconvenient, so i (IL) moved it to
+          "sequential" level. Also i now store it as a number of active indices and an array of
+          active indices. hypre_ParMultiVectorSetMask converts user-provided "(1,1,0,1,...)" mask
+          to the format above.
+      HYPRE_Int                *mask;
+   */
 
 } hypre_ParMultivector;
 
@@ -73,30 +73,30 @@ HYPRE_Int hypre_ParMultiVectorCopy(hypre_ParMultiVector *, hypre_ParMultiVector
 HYPRE_Int hypre_ParMultiVectorScale(HYPRE_Complex, hypre_ParMultiVector *);
 HYPRE_Int hypre_ParMultiVectorMultiScale(HYPRE_Complex *, hypre_ParMultiVector *);
 HYPRE_Int hypre_ParMultiVectorAxpy(HYPRE_Complex, hypre_ParMultiVector *,
-                             hypre_ParMultiVector *);
+                                   hypre_ParMultiVector *);
 
 HYPRE_Int hypre_ParMultiVectorByDiag(  hypre_ParMultiVector *x,
-                                 HYPRE_Int                *mask,
-                                 HYPRE_Int                n,
-                                 HYPRE_Complex      *alpha,
-                                 hypre_ParMultiVector *y);
+                                       HYPRE_Int                *mask,
+                                       HYPRE_Int                n,
+                                       HYPRE_Complex      *alpha,
+                                       hypre_ParMultiVector *y);
 
 HYPRE_Int hypre_ParMultiVectorInnerProd(hypre_ParMultiVector *,
-                                      hypre_ParMultiVector *, HYPRE_Real *, HYPRE_Real *);
+                                        hypre_ParMultiVector *, HYPRE_Real *, HYPRE_Real *);
 HYPRE_Int hypre_ParMultiVectorInnerProdDiag(hypre_ParMultiVector *,
-                                      hypre_ParMultiVector *, HYPRE_Real *, HYPRE_Real *);
+                                            hypre_ParMultiVector *, HYPRE_Real *, HYPRE_Real *);
 HYPRE_Int
 hypre_ParMultiVectorCopyWithoutMask(hypre_ParMultiVector *x, hypre_ParMultiVector *y);
 HYPRE_Int
-hypre_ParMultiVectorByMatrix(hypre_ParMultiVector *x, HYPRE_Int rGHeight, HYPRE_Int rHeight,
-                              HYPRE_Int rWidth, HYPRE_Complex* rVal, hypre_ParMultiVector * y);
+hypre_ParMultiVectorByMatrix(hypre_ParMultiVector *x, HYPRE_BigInt rGHeight, HYPRE_Int rHeight,
+                             HYPRE_Int rWidth, HYPRE_Complex* rVal, hypre_ParMultiVector * y);
 HYPRE_Int
-hypre_ParMultiVectorXapy(hypre_ParMultiVector *x, HYPRE_Int rGHeight, HYPRE_Int rHeight,
-                              HYPRE_Int rWidth, HYPRE_Complex* rVal, hypre_ParMultiVector * y);
+hypre_ParMultiVectorXapy(hypre_ParMultiVector *x, HYPRE_BigInt rGHeight, HYPRE_Int rHeight,
+                         HYPRE_Int rWidth, HYPRE_Complex* rVal, hypre_ParMultiVector * y);
 
 HYPRE_Int
 hypre_ParMultiVectorEval(void (*f)( void*, void*, void* ), void* par,
-                           hypre_ParMultiVector * x, hypre_ParMultiVector * y);
+                         hypre_ParMultiVector * x, hypre_ParMultiVector * y);
 
 /* to be replaced by better implementation when format for multivector files established */
 hypre_ParMultiVector * hypre_ParMultiVectorTempRead(MPI_Comm comm, const char *file_name);
diff --git a/external/hypre/src/multivector/seq_multivector.c b/external/hypre/src/multivector/seq_multivector.c
index 9525a020..970af418 100644
--- a/external/hypre/src/multivector/seq_multivector.c
+++ b/external/hypre/src/multivector/seq_multivector.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -26,7 +26,7 @@ hypre_SeqMultivectorCreate( HYPRE_Int size, HYPRE_Int num_vectors  )
 {
    hypre_Multivector *mvector;
 
-   mvector = (hypre_Multivector *) hypre_MAlloc(sizeof(hypre_Multivector), HYPRE_MEMORY_HOST);
+   mvector = hypre_TAlloc(hypre_Multivector, 1, HYPRE_MEMORY_HOST);
 
    hypre_MultivectorNumVectors(mvector) = num_vectors;
    hypre_MultivectorSize(mvector) = size;
@@ -34,8 +34,8 @@ hypre_SeqMultivectorCreate( HYPRE_Int size, HYPRE_Int num_vectors  )
    hypre_MultivectorOwnsData(mvector) = 1;
    hypre_MultivectorData(mvector) = NULL;
 
-   mvector->num_active_vectors=0;
-   mvector->active_indices=NULL;
+   mvector->num_active_vectors = 0;
+   mvector->active_indices = NULL;
 
    return mvector;
 }
@@ -52,17 +52,17 @@ hypre_SeqMultivectorInitialize( hypre_Multivector *mvector )
    size        = hypre_MultivectorSize(mvector);
    num_vectors = hypre_MultivectorNumVectors(mvector);
 
-   if (NULL==hypre_MultivectorData(mvector))
+   if (NULL == hypre_MultivectorData(mvector))
       hypre_MultivectorData(mvector) =
-            (HYPRE_Complex *) hypre_MAlloc(sizeof(HYPRE_Complex)*size*num_vectors, HYPRE_MEMORY_HOST);
+         hypre_TAlloc(HYPRE_Complex, size * num_vectors, HYPRE_MEMORY_HOST);
 
    /* now we create a "mask" of "active" vectors; initially all active */
-   if (NULL==mvector->active_indices)
+   if (NULL == mvector->active_indices)
    {
-      mvector->active_indices hypre_CTAlloc(HYPRE_Int,  num_vectors, HYPRE_MEMORY_HOST);
+      mvector->active_indices hypre_CTAlloc(HYPRE_Int, num_vectors, HYPRE_MEMORY_HOST);
 
-      for (i=0; i<num_vectors; i++) mvector->active_indices[i] = i;
-      mvector->num_active_vectors=num_vectors;
+      for (i = 0; i < num_vectors; i++) { mvector->active_indices[i] = i; }
+      mvector->num_active_vectors = num_vectors;
    }
    return ierr;
 }
@@ -74,7 +74,7 @@ hypre_SeqMultivectorInitialize( hypre_Multivector *mvector )
 HYPRE_Int
 hypre_SeqMultivectorSetDataOwner(hypre_Multivector *mvector, HYPRE_Int owns_data)
 {
-   HYPRE_Int    ierr=0;
+   HYPRE_Int    ierr = 0;
 
    hypre_MultivectorOwnsData(mvector) = owns_data;
 
@@ -89,15 +89,19 @@ hypre_SeqMultivectorSetDataOwner(hypre_Multivector *mvector, HYPRE_Int owns_data
 HYPRE_Int
 hypre_SeqMultivectorDestroy(hypre_Multivector *mvector)
 {
-   HYPRE_Int    ierr=0;
+   HYPRE_Int    ierr = 0;
 
-   if (NULL!=mvector)
+   if (NULL != mvector)
    {
-      if (hypre_MultivectorOwnsData(mvector) && NULL!=hypre_MultivectorData(mvector))
-         hypre_TFree( hypre_MultivectorData(mvector) , HYPRE_MEMORY_HOST);
+      if (hypre_MultivectorOwnsData(mvector) && NULL != hypre_MultivectorData(mvector))
+      {
+         hypre_TFree( hypre_MultivectorData(mvector), HYPRE_MEMORY_HOST);
+      }
 
-      if (NULL!=mvector->active_indices)
-            hypre_TFree(mvector->active_indices, HYPRE_MEMORY_HOST);
+      if (NULL != mvector->active_indices)
+      {
+         hypre_TFree(mvector->active_indices, HYPRE_MEMORY_HOST);
+      }
 
       hypre_TFree(mvector, HYPRE_MEMORY_HOST);
    }
@@ -115,23 +119,27 @@ hypre_SeqMultivectorSetMask(hypre_Multivector *mvector, HYPRE_Int * mask)
 {
    HYPRE_Int  i, num_vectors = mvector->num_vectors;
 
-   if (mvector->active_indices != NULL) hypre_TFree(mvector->active_indices, HYPRE_MEMORY_HOST);
-   mvector->active_indices hypre_CTAlloc(HYPRE_Int,  num_vectors, HYPRE_MEMORY_HOST);
+   if (mvector->active_indices != NULL) { hypre_TFree(mvector->active_indices, HYPRE_MEMORY_HOST); }
+   mvector->active_indices hypre_CTAlloc(HYPRE_Int, num_vectors, HYPRE_MEMORY_HOST);
 
-   mvector->num_active_vectors=0;
+   mvector->num_active_vectors = 0;
 
-   if (mask!=NULL)
-      for (i=0; i<num_vectors; i++)
+   if (mask != NULL)
+      for (i = 0; i < num_vectors; i++)
       {
          if ( mask[i] )
-            mvector->active_indices[mvector->num_active_vectors++]=i;
+         {
+            mvector->active_indices[mvector->num_active_vectors++] = i;
+         }
       }
    else
-      for (i=0; i<num_vectors; i++)
-         mvector->active_indices[mvector->num_active_vectors++]=i;
+      for (i = 0; i < num_vectors; i++)
+      {
+         mvector->active_indices[mvector->num_active_vectors++] = i;
+      }
 
    return 0;
- }
+}
 
 /*--------------------------------------------------------------------------
  * hypre_SeqMultivectorSetConstantValues
@@ -147,21 +155,21 @@ hypre_SeqMultivectorSetConstantValues(hypre_Multivector *v, HYPRE_Complex value)
    if (v->num_active_vectors == v->num_vectors)
    {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(j) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(j) HYPRE_SMP_SCHEDULE
 #endif
-      for (j = 0; j < v->num_vectors*size; j++) vector_data[j] = value;
+      for (j = 0; j < v->num_vectors * size; j++) { vector_data[j] = value; }
    }
    else
    {
       for (i = 0; i < v->num_active_vectors; i++)
       {
-         start_offset = v->active_indices[i]*size;
-         end_offset = start_offset+size;
+         start_offset = v->active_indices[i] * size;
+         end_offset = start_offset + size;
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(j) HYPRE_SMP_SCHEDULE
+         #pragma omp parallel for private(j) HYPRE_SMP_SCHEDULE
 #endif
-         for (j = start_offset; j < end_offset; j++) vector_data[j]= value;
+         for (j = start_offset; j < end_offset; j++) { vector_data[j] = value; }
       }
    }
    return 0;
@@ -187,17 +195,21 @@ hypre_SeqMultivectorSetRandomValues(hypre_Multivector *v, HYPRE_Int seed)
 
    if (v->num_active_vectors == v->num_vectors)
    {
-      for (j = 0; j < v->num_vectors*size; j++)
+      for (j = 0; j < v->num_vectors * size; j++)
+      {
          vector_data[j] = 2.0 * hypre_Rand() - 1.0;
+      }
    }
    else
    {
       for (i = 0; i < v->num_active_vectors; i++)
       {
-         start_offset = v->active_indices[i]*size;
-         end_offset = start_offset+size;
+         start_offset = v->active_indices[i] * size;
+         end_offset = start_offset + size;
          for (j = start_offset; j < end_offset; j++)
-            vector_data[j]= 2.0 * hypre_Rand() - 1.0;
+         {
+            vector_data[j] = 2.0 * hypre_Rand() - 1.0;
+         }
       }
    }
    return 0;
@@ -221,8 +233,8 @@ hypre_SeqMultivectorCopy(hypre_Multivector *x, hypre_Multivector *y)
    size = x->size;
    x_data = x->data;
    y_data = y->data;
-   x_active_ind=x->active_indices;
-   y_active_ind=y->active_indices;
+   x_active_ind = x->active_indices;
+   y_active_ind = y->active_indices;
 
    if (x->num_active_vectors == x->num_vectors &&
        y->num_active_vectors == y->num_vectors)
@@ -233,25 +245,25 @@ hypre_SeqMultivectorCopy(hypre_Multivector *x, hypre_Multivector *y)
    else
    {
       num_bytes = size;
-      for (i=0; i < num_active_vectors; i++)
+      for (i = 0; i < num_active_vectors; i++)
       {
-         src=x_data + size * x_active_ind[i];
+         src = x_data + size * x_active_ind[i];
          dest = y_data + size * y_active_ind[i];
-         hypre_Memcpy(dest, src, HYPRE_Complex, num_bytes, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
+         hypre_TMemcpy(dest, src, HYPRE_Complex, num_bytes, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
       }
    }
    return 0;
 }
 
 HYPRE_Int
-hypre_SeqMultivectorCopyWithoutMask(hypre_Multivector *x ,
+hypre_SeqMultivectorCopyWithoutMask(hypre_Multivector *x,
                                     hypre_Multivector *y)
 {
    HYPRE_Int byte_count;
 
    hypre_assert (x->size == y->size && x->num_vectors == y->num_vectors);
    byte_count = x->size * x->num_vectors;
-   hypre_Memcpy(y->data, x->data, HYPRE_Complex, byte_count, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
+   hypre_TMemcpy(y->data, x->data, HYPRE_Complex, byte_count, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
    return 0;
 }
 
@@ -278,20 +290,20 @@ hypre_SeqMultivectorAxpy(HYPRE_Complex alpha, hypre_Multivector *x,
    if (x->num_active_vectors == x->num_vectors &&
        y->num_active_vectors == y->num_vectors)
    {
-      for(i = 0; i < x->num_vectors*size; i++) dest[i] += alpha * src[i];
+      for (i = 0; i < x->num_vectors * size; i++) { dest[i] += alpha * src[i]; }
    }
    else
    {
-      for(i = 0; i < num_active_vectors; i++)
+      for (i = 0; i < num_active_vectors; i++)
       {
-         src = x_data + x_active_ind[i]*size;
-         dest = y_data + y_active_ind[i]*size;
+         src = x_data + x_active_ind[i] * size;
+         dest = y_data + y_active_ind[i] * size;
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(j) HYPRE_SMP_SCHEDULE
+         #pragma omp parallel for private(j) HYPRE_SMP_SCHEDULE
 #endif
 
-         for (j = 0; j < size; j++) dest[j] += alpha * src[j];
+         for (j = 0; j < size; j++) { dest[j] += alpha * src[j]; }
       }
    }
    return 0;
@@ -316,17 +328,21 @@ hypre_SeqMultivectorByDiag(hypre_Multivector *x, HYPRE_Int *mask, HYPRE_Int n,
    al_active_ind = hypre_TAlloc(HYPRE_Int, n, HYPRE_MEMORY_HOST);
    num_active_als = 0;
 
-   if (mask!=NULL)
-      for (i=0; i<n; i++)
+   if (mask != NULL)
+      for (i = 0; i < n; i++)
       {
          if (mask[i])
-            al_active_ind[num_active_als++]=i;
+         {
+            al_active_ind[num_active_als++] = i;
+         }
       }
    else
-      for (i=0; i<n; i++)
-         al_active_ind[num_active_als++]=i;
+      for (i = 0; i < n; i++)
+      {
+         al_active_ind[num_active_als++] = i;
+      }
 
-   hypre_assert (num_active_als==x->num_active_vectors);
+   hypre_assert (num_active_als == x->num_active_vectors);
 
    x_data = x->data;
    y_data = y->data;
@@ -335,18 +351,20 @@ hypre_SeqMultivectorByDiag(hypre_Multivector *x, HYPRE_Int *mask, HYPRE_Int n,
    x_active_ind = x->active_indices;
    y_active_ind = y->active_indices;
 
-   for(i = 0; i < num_active_vectors; i++)
+   for (i = 0; i < num_active_vectors; i++)
    {
-      src = x_data + x_active_ind[i]*size;
-      dest = y_data + y_active_ind[i]*size;
-      current_alpha=alpha[ al_active_ind[i] ];
+      src = x_data + x_active_ind[i] * size;
+      dest = y_data + y_active_ind[i] * size;
+      current_alpha = alpha[ al_active_ind[i] ];
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(j) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(j) HYPRE_SMP_SCHEDULE
 #endif
 
       for (j = 0; j < size; j++)
-         dest[j] = current_alpha*src[j];
+      {
+         dest[j] = current_alpha * src[j];
+      }
    }
 
    hypre_TFree(al_active_ind, HYPRE_MEMORY_HOST);
@@ -358,14 +376,14 @@ hypre_SeqMultivectorByDiag(hypre_Multivector *x, HYPRE_Int *mask, HYPRE_Int n,
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int hypre_SeqMultivectorInnerProd(hypre_Multivector *x, hypre_Multivector *y,
-                                  HYPRE_Real *results )
+                                        HYPRE_Real *results )
 {
    HYPRE_Int      i, j, k, size, *x_active_ind, *y_active_ind;
    HYPRE_Int      x_num_active_vectors, y_num_active_vectors;
    HYPRE_Complex *x_data, *y_data, *y_ptr, *x_ptr;
    HYPRE_Real     current_product;
 
-   hypre_assert (x->size==y->size);
+   hypre_assert (x->size == y->size);
 
    x_data = x->data;
    y_data = y->data;
@@ -373,27 +391,29 @@ HYPRE_Int hypre_SeqMultivectorInnerProd(hypre_Multivector *x, hypre_Multivector
    x_num_active_vectors = x->num_active_vectors;
    y_num_active_vectors = y->num_active_vectors;
 
-/* we assume that "results" points to contiguous array of (x_num_active_vectors X
-   y_num_active_vectors) doubles */
+   /* we assume that "results" points to contiguous array of (x_num_active_vectors X
+      y_num_active_vectors) doubles */
 
    x_active_ind = x->active_indices;
    y_active_ind = y->active_indices;
 
-   for(j = 0; j < y_num_active_vectors; j++)
+   for (j = 0; j < y_num_active_vectors; j++)
    {
-      y_ptr = y_data + y_active_ind[j]*size;
+      y_ptr = y_data + y_active_ind[j] * size;
 
       for (i = 0; i < x_num_active_vectors; i++)
       {
-         x_ptr = x_data + x_active_ind[i]*size;
+         x_ptr = x_data + x_active_ind[i] * size;
          current_product = 0.0;
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(k) reduction(+:current_product) HYPRE_SMP_SCHEDULE
+         #pragma omp parallel for private(k) reduction(+:current_product) HYPRE_SMP_SCHEDULE
 #endif
 
-         for(k = 0; k < size; k++)
+         for (k = 0; k < size; k++)
+         {
             current_product += x_ptr[k] * hypre_conj(y_ptr[k]);
+         }
 
          /* column-wise storage for results */
          *results++ = current_product;
@@ -409,13 +429,13 @@ HYPRE_Int hypre_SeqMultivectorInnerProd(hypre_Multivector *x, hypre_Multivector
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int hypre_SeqMultivectorInnerProdDiag(hypre_Multivector *x,
-                            hypre_Multivector *y, HYPRE_Real *diagResults)
+                                            hypre_Multivector *y, HYPRE_Real *diagResults)
 {
    HYPRE_Complex *x_data, *y_data, *y_ptr, *x_ptr;
    HYPRE_Real     current_product;
    HYPRE_Int      i, k, size, num_active_vectors, *x_active_ind, *y_active_ind;
 
-   hypre_assert(x->size==y->size && x->num_active_vectors == y->num_active_vectors);
+   hypre_assert(x->size == y->size && x->num_active_vectors == y->num_active_vectors);
 
    x_data = x->data;
    y_data = y->data;
@@ -424,18 +444,20 @@ HYPRE_Int hypre_SeqMultivectorInnerProdDiag(hypre_Multivector *x,
    x_active_ind = x->active_indices;
    y_active_ind = y->active_indices;
 
-   for (i=0; i<num_active_vectors; i++)
+   for (i = 0; i < num_active_vectors; i++)
    {
-      x_ptr = x_data + x_active_ind[i]*size;
-      y_ptr = y_data + y_active_ind[i]*size;
+      x_ptr = x_data + x_active_ind[i] * size;
+      y_ptr = y_data + y_active_ind[i] * size;
       current_product = 0.0;
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(k) reduction(+:current_product) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(k) reduction(+:current_product) HYPRE_SMP_SCHEDULE
 #endif
 
-      for(k=0; k<size; k++)
+      for (k = 0; k < size; k++)
+      {
          current_product += x_ptr[k] * hypre_conj(y_ptr[k]);
+      }
 
       *diagResults++ = current_product;
    }
@@ -443,47 +465,52 @@ HYPRE_Int hypre_SeqMultivectorInnerProdDiag(hypre_Multivector *x,
 }
 
 HYPRE_Int
-hypre_SeqMultivectorByMatrix(hypre_Multivector *x, HYPRE_Int rGHeight, HYPRE_Int rHeight,
+hypre_SeqMultivectorByMatrix(hypre_Multivector *x, HYPRE_BigInt rGHeight, HYPRE_Int rHeight,
                              HYPRE_Int rWidth, HYPRE_Complex* rVal, hypre_Multivector *y)
 {
-   HYPRE_Int    i, j, k, size, gap, *x_active_ind, *y_active_ind;
-   HYPRE_Complex *x_data, *y_data, *x_ptr, *y_ptr, current_coef;
+   HYPRE_Complex  *x_data, *y_data, *x_ptr, *y_ptr, current_coef;
+   HYPRE_Int       i, j, k, size, *x_active_ind, *y_active_ind;
+   HYPRE_BigInt    gap;
 
-   hypre_assert(rHeight>0);
-   hypre_assert (rHeight==x->num_active_vectors && rWidth==y->num_active_vectors);
+   hypre_assert(rHeight > 0);
+   hypre_assert(rHeight == x->num_active_vectors && rWidth == y->num_active_vectors);
 
    x_data = x->data;
    y_data = y->data;
    size = x->size;
    x_active_ind = x->active_indices;
    y_active_ind = y->active_indices;
-   gap = rGHeight - rHeight;
+   gap = rGHeight - (HYPRE_BigInt) rHeight;
 
-   for (j=0; j<rWidth; j++)
+   for (j = 0; j < rWidth; j++)
    {
-      y_ptr = y_data + y_active_ind[j]*size;
+      y_ptr = y_data + y_active_ind[j] * size;
 
       /* ------ set current "y" to first member in a sum ------ */
-      x_ptr = x_data + x_active_ind[0]*size;
+      x_ptr = x_data + x_active_ind[0] * size;
       current_coef = *rVal++;
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(k) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(k) HYPRE_SMP_SCHEDULE
 #endif
-      for (k=0; k<size; k++)
+      for (k = 0; k < size; k++)
+      {
          y_ptr[k] = current_coef * x_ptr[k];
+      }
 
       /* ------ now add all other members of a sum to "y" ----- */
-      for (i=1; i<rHeight; i++)
+      for (i = 1; i < rHeight; i++)
       {
-         x_ptr = x_data + x_active_ind[i]*size;
+         x_ptr = x_data + x_active_ind[i] * size;
          current_coef = *rVal++;
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(k) HYPRE_SMP_SCHEDULE
+         #pragma omp parallel for private(k) HYPRE_SMP_SCHEDULE
 #endif
-         for (k=0; k<size; k++)
+         for (k = 0; k < size; k++)
+         {
             y_ptr[k] += current_coef * x_ptr[k];
+         }
       }
 
       rVal += gap;
@@ -493,35 +520,38 @@ hypre_SeqMultivectorByMatrix(hypre_Multivector *x, HYPRE_Int rGHeight, HYPRE_Int
 }
 
 HYPRE_Int
-hypre_SeqMultivectorXapy (hypre_Multivector *x, HYPRE_Int rGHeight, HYPRE_Int rHeight,
+hypre_SeqMultivectorXapy (hypre_Multivector *x, HYPRE_BigInt rGHeight, HYPRE_Int rHeight,
                           HYPRE_Int rWidth, HYPRE_Complex* rVal, hypre_Multivector *y)
 {
-   HYPRE_Complex *x_data, *y_data, *x_ptr, *y_ptr, current_coef;
-   HYPRE_Int    i, j, k, size, gap, *x_active_ind, *y_active_ind;
+   HYPRE_Complex  *x_data, *y_data, *x_ptr, *y_ptr, current_coef;
+   HYPRE_Int       i, j, k, size, *x_active_ind, *y_active_ind;
+   HYPRE_BigInt    gap;
 
-   hypre_assert (rHeight==x->num_active_vectors && rWidth==y->num_active_vectors);
+   hypre_assert(rHeight == x->num_active_vectors && rWidth == y->num_active_vectors);
 
    x_data = x->data;
    y_data = y->data;
    size = x->size;
    x_active_ind = x->active_indices;
    y_active_ind = y->active_indices;
-   gap = rGHeight - rHeight;
+   gap = rGHeight - (HYPRE_BigInt) rHeight;
 
-   for (j=0; j<rWidth; j++)
+   for (j = 0; j < rWidth; j++)
    {
-      y_ptr = y_data + y_active_ind[j]*size;
+      y_ptr = y_data + y_active_ind[j] * size;
 
-      for (i=0; i<rHeight; i++)
+      for (i = 0; i < rHeight; i++)
       {
-         x_ptr = x_data + x_active_ind[i]*size;
+         x_ptr = x_data + x_active_ind[i] * size;
          current_coef = *rVal++;
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(k) HYPRE_SMP_SCHEDULE
+         #pragma omp parallel for private(k) HYPRE_SMP_SCHEDULE
 #endif
-         for (k=0; k<size; k++)
+         for (k = 0; k < size; k++)
+         {
             y_ptr[k] += current_coef * x_ptr[k];
+         }
       }
 
       rVal += gap;
diff --git a/external/hypre/src/multivector/seq_multivector.h b/external/hypre/src/multivector/seq_multivector.h
index 8db6ed81..0b989dfe 100644
--- a/external/hypre/src/multivector/seq_multivector.h
+++ b/external/hypre/src/multivector/seq_multivector.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -28,10 +28,10 @@ typedef struct
    HYPRE_Int      size;
    HYPRE_Int      owns_data;
    HYPRE_Int      num_vectors;  /* the above "size" is size of one vector */
-   
+
    HYPRE_Int      num_active_vectors;
    HYPRE_Int     *active_indices;  /* indices of active vectors; 0-based notation */
-       
+
 } hypre_Multivector;
 
 /*--------------------------------------------------------------------------
@@ -48,35 +48,36 @@ hypre_Multivector *hypre_SeqMultivectorRead(char *file_name);
 
 HYPRE_Int hypre_SeqMultivectorDestroy(hypre_Multivector *vector);
 HYPRE_Int hypre_SeqMultivectorInitialize(hypre_Multivector *vector);
-HYPRE_Int hypre_SeqMultivectorSetDataOwner(hypre_Multivector *vector , HYPRE_Int owns_data);
-HYPRE_Int hypre_SeqMultivectorPrint(hypre_Multivector *vector , char *file_name);
-HYPRE_Int hypre_SeqMultivectorSetConstantValues(hypre_Multivector *v,HYPRE_Complex value);
-HYPRE_Int hypre_SeqMultivectorSetRandomValues(hypre_Multivector *v , HYPRE_Int seed);
-HYPRE_Int hypre_SeqMultivectorCopy(hypre_Multivector *x , hypre_Multivector *y);
-HYPRE_Int hypre_SeqMultivectorScale(HYPRE_Complex alpha , hypre_Multivector *y, HYPRE_Int *mask);
-HYPRE_Int hypre_SeqMultivectorAxpy(HYPRE_Complex alpha , hypre_Multivector *x , 
-                             hypre_Multivector *y);
-HYPRE_Int hypre_SeqMultivectorInnerProd(hypre_Multivector *x , hypre_Multivector *y,
-                                  HYPRE_Real *results);
-HYPRE_Int hypre_SeqMultivectorMultiScale(HYPRE_Complex *alpha, hypre_Multivector *v, 
-                                   HYPRE_Int *mask);
+HYPRE_Int hypre_SeqMultivectorSetDataOwner(hypre_Multivector *vector, HYPRE_Int owns_data);
+HYPRE_Int hypre_SeqMultivectorPrint(hypre_Multivector *vector, char *file_name);
+HYPRE_Int hypre_SeqMultivectorSetConstantValues(hypre_Multivector *v, HYPRE_Complex value);
+HYPRE_Int hypre_SeqMultivectorSetRandomValues(hypre_Multivector *v, HYPRE_Int seed);
+HYPRE_Int hypre_SeqMultivectorCopy(hypre_Multivector *x, hypre_Multivector *y);
+HYPRE_Int hypre_SeqMultivectorScale(HYPRE_Complex alpha, hypre_Multivector *y, HYPRE_Int *mask);
+HYPRE_Int hypre_SeqMultivectorAxpy(HYPRE_Complex alpha, hypre_Multivector *x,
+                                   hypre_Multivector *y);
+HYPRE_Int hypre_SeqMultivectorInnerProd(hypre_Multivector *x, hypre_Multivector *y,
+                                        HYPRE_Real *results);
+HYPRE_Int hypre_SeqMultivectorMultiScale(HYPRE_Complex *alpha, hypre_Multivector *v,
+                                         HYPRE_Int *mask);
 HYPRE_Int hypre_SeqMultivectorByDiag(hypre_Multivector *x, HYPRE_Int *mask, HYPRE_Int n,
-                               HYPRE_Complex *alpha, hypre_Multivector *y);
+                                     HYPRE_Complex *alpha, hypre_Multivector *y);
 
-HYPRE_Int hypre_SeqMultivectorInnerProdDiag(hypre_Multivector *x, 
-                                      hypre_Multivector *y, 
-                                      HYPRE_Real *diagResults );
+HYPRE_Int hypre_SeqMultivectorInnerProdDiag(hypre_Multivector *x,
+                                            hypre_Multivector *y,
+                                            HYPRE_Real *diagResults );
 
 HYPRE_Int hypre_SeqMultivectorSetMask(hypre_Multivector *mvector, HYPRE_Int * mask);
 
-HYPRE_Int hypre_SeqMultivectorCopyWithoutMask(hypre_Multivector *x ,
-                                        hypre_Multivector *y);
+HYPRE_Int hypre_SeqMultivectorCopyWithoutMask(hypre_Multivector *x,
+                                              hypre_Multivector *y);
 
-HYPRE_Int hypre_SeqMultivectorByMatrix(hypre_Multivector *x, HYPRE_Int rGHeight, HYPRE_Int rHeight, 
-                                 HYPRE_Int rWidth, HYPRE_Complex* rVal, hypre_Multivector *y);
+HYPRE_Int hypre_SeqMultivectorByMatrix(hypre_Multivector *x, HYPRE_BigInt rGHeight,
+                                       HYPRE_Int rHeight,
+                                       HYPRE_Int rWidth, HYPRE_Complex* rVal, hypre_Multivector *y);
 
-HYPRE_Int hypre_SeqMultivectorXapy (hypre_Multivector *x, HYPRE_Int rGHeight, HYPRE_Int rHeight, 
-                              HYPRE_Int rWidth, HYPRE_Complex* rVal, hypre_Multivector *y);
+HYPRE_Int hypre_SeqMultivectorXapy (hypre_Multivector *x, HYPRE_BigInt rGHeight, HYPRE_Int rHeight,
+                                    HYPRE_Int rWidth, HYPRE_Complex* rVal, hypre_Multivector *y);
 
 #ifdef __cplusplus
 }
diff --git a/external/hypre/src/multivector/temp_multivector.c b/external/hypre/src/multivector/temp_multivector.c
index 3db444b9..8308cdc9 100644
--- a/external/hypre/src/multivector/temp_multivector.c
+++ b/external/hypre/src/multivector/temp_multivector.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -13,49 +13,66 @@
 #include "_hypre_utilities.h"
 
 static void
-mv_collectVectorPtr( HYPRE_Int* mask, mv_TempMultiVector* x, void** px ) {
-
-  HYPRE_Int ix, jx;
-
-  if ( mask != NULL ) {
-    for ( ix = 0, jx = 0; ix < x->numVectors; ix++ )
-      if ( mask[ix] )
-	px[jx++] = x->vector[ix];
-  }
-  else
-    for ( ix = 0; ix < x->numVectors; ix++ )
-      px[ix] = x->vector[ix];
+mv_collectVectorPtr( HYPRE_Int* mask, mv_TempMultiVector* x, void** px )
+{
+
+   HYPRE_Int ix, jx;
+
+   if ( mask != NULL )
+   {
+      for ( ix = 0, jx = 0; ix < x->numVectors; ix++ )
+         if ( mask[ix] )
+         {
+            px[jx++] = x->vector[ix];
+         }
+   }
+   else
+      for ( ix = 0; ix < x->numVectors; ix++ )
+      {
+         px[ix] = x->vector[ix];
+      }
 
 }
 
 static HYPRE_Int
-aux_maskCount( HYPRE_Int n, HYPRE_Int* mask ) {
+aux_maskCount( HYPRE_Int n, HYPRE_Int* mask )
+{
 
-  HYPRE_Int i, m;
+   HYPRE_Int i, m;
 
-  if ( mask == NULL )
-    return n;
+   if ( mask == NULL )
+   {
+      return n;
+   }
 
-  for ( i = m = 0; i < n; i++ )
-    if ( mask[i] )
-      m++;
+   for ( i = m = 0; i < n; i++ )
+      if ( mask[i] )
+      {
+         m++;
+      }
 
-  return m;
+   return m;
 }
 
 static void
-aux_indexFromMask( HYPRE_Int n, HYPRE_Int* mask, HYPRE_Int* index ) {
-
-  HYPRE_Int i, j;
-
-  if ( mask != NULL ) {
-    for ( i = 0, j = 0; i < n; i++ )
-      if ( mask[i] )
-	index[j++] = i + 1;
-  }
-  else
-    for ( i = 0; i < n; i++ )
-      index[i] = i + 1;
+aux_indexFromMask( HYPRE_Int n, HYPRE_Int* mask, HYPRE_Int* index )
+{
+
+   HYPRE_Int i, j;
+
+   if ( mask != NULL )
+   {
+      for ( i = 0, j = 0; i < n; i++ )
+         if ( mask[i] )
+         {
+            index[j++] = i + 1;
+         }
+   }
+   else
+      for ( i = 0; i < n; i++ )
+      {
+         index[i] = i + 1;
+      }
 
 }
 
@@ -64,464 +81,524 @@ aux_indexFromMask( HYPRE_Int n, HYPRE_Int* mask, HYPRE_Int* index ) {
 static hypre_ulongint next = 1;
 
 /* RAND_MAX assumed to be 32767 */
-static HYPRE_Int myrand(void) {
+static HYPRE_Int myrand(void)
+{
    next = next * 1103515245 + 12345;
-   return((unsigned)(next/65536) % 32768);
+   return ((unsigned)(next / 65536) % 32768);
 }
 
-static void mysrand(unsigned seed) {
+static void mysrand(unsigned seed)
+{
    next = seed;
 }
 
 
 void*
-mv_TempMultiVectorCreateFromSampleVector( void* ii_, HYPRE_Int n, void* sample ) {
+mv_TempMultiVectorCreateFromSampleVector( void* ii_, HYPRE_Int n, void* sample )
+{
 
-  HYPRE_Int i;
-  mv_TempMultiVector* x;
-  mv_InterfaceInterpreter* ii = (mv_InterfaceInterpreter*)ii_;
+   HYPRE_Int i;
+   mv_TempMultiVector* x;
+   mv_InterfaceInterpreter* ii = (mv_InterfaceInterpreter*)ii_;
 
-  x = hypre_TAlloc(mv_TempMultiVector, 1, HYPRE_MEMORY_HOST);
-  hypre_assert( x != NULL );
+   x = hypre_TAlloc(mv_TempMultiVector, 1, HYPRE_MEMORY_HOST);
+   hypre_assert( x != NULL );
 
-  x->interpreter = ii;
-  x->numVectors = n;
+   x->interpreter = ii;
+   x->numVectors = n;
 
-  x->vector = hypre_CTAlloc(void*,  n, HYPRE_MEMORY_HOST);
-  hypre_assert( x->vector != NULL );
+   x->vector = hypre_CTAlloc(void*,  n, HYPRE_MEMORY_HOST);
+   hypre_assert( x->vector != NULL );
 
-  x->ownsVectors = 1;
-  x->mask = NULL;
-  x->ownsMask = 0;
+   x->ownsVectors = 1;
+   x->mask = NULL;
+   x->ownsMask = 0;
 
-  for ( i = 0; i < n; i++ )
-    x->vector[i] = (ii->CreateVector)(sample);
+   for ( i = 0; i < n; i++ )
+   {
+      x->vector[i] = (ii->CreateVector)(sample);
+   }
 
-  return x;
+   return x;
 
 }
 
 void*
-mv_TempMultiVectorCreateCopy( void* src_, HYPRE_Int copyValues ) {
+mv_TempMultiVectorCreateCopy( void* src_, HYPRE_Int copyValues )
+{
 
-  HYPRE_Int i, n;
+   HYPRE_Int i, n;
 
-  mv_TempMultiVector* src;
-  mv_TempMultiVector* dest;
+   mv_TempMultiVector* src;
+   mv_TempMultiVector* dest;
 
-  src = (mv_TempMultiVector*)src_;
-  hypre_assert( src != NULL );
+   src = (mv_TempMultiVector*)src_;
+   hypre_assert( src != NULL );
 
-  n = src->numVectors;
+   n = src->numVectors;
 
-  dest = (mv_TempMultiVector*)mv_TempMultiVectorCreateFromSampleVector( src->interpreter,
-												   n, src->vector[0] );
-  if ( copyValues )
-    for ( i = 0; i < n; i++ ) {
-      (dest->interpreter->CopyVector)(src->vector[i],dest->vector[i]);
-  }
+   dest = (mv_TempMultiVector*)mv_TempMultiVectorCreateFromSampleVector( src->interpreter,
+                                                                         n, src->vector[0] );
+   if ( copyValues )
+      for ( i = 0; i < n; i++ )
+      {
+         (dest->interpreter->CopyVector)(src->vector[i], dest->vector[i]);
+      }
 
-  return dest;
+   return dest;
 }
 
 void
-mv_TempMultiVectorDestroy( void* x_ ) {
-
-  HYPRE_Int i;
-  mv_TempMultiVector* x = (mv_TempMultiVector*)x_;
-
-  if ( x == NULL )
-    return;
-
-  if ( x->ownsVectors && x->vector != NULL ) {
-    for ( i = 0; i < x->numVectors; i++ )
-      (x->interpreter->DestroyVector)(x->vector[i]);
-    hypre_TFree(x->vector,HYPRE_MEMORY_HOST);
-  }
-  if ( x->mask && x->ownsMask )
-    hypre_TFree(x->mask,HYPRE_MEMORY_HOST);
-  hypre_TFree(x,HYPRE_MEMORY_HOST);
+mv_TempMultiVectorDestroy( void* x_ )
+{
+
+   HYPRE_Int i;
+   mv_TempMultiVector* x = (mv_TempMultiVector*)x_;
+
+   if ( x == NULL )
+   {
+      return;
+   }
+
+   if ( x->ownsVectors && x->vector != NULL )
+   {
+      for ( i = 0; i < x->numVectors; i++ )
+      {
+         (x->interpreter->DestroyVector)(x->vector[i]);
+      }
+      hypre_TFree(x->vector, HYPRE_MEMORY_HOST);
+   }
+   if ( x->mask && x->ownsMask )
+   {
+      hypre_TFree(x->mask, HYPRE_MEMORY_HOST);
+   }
+   hypre_TFree(x, HYPRE_MEMORY_HOST);
 }
 
 HYPRE_Int
-mv_TempMultiVectorWidth( void* x_ ) {
+mv_TempMultiVectorWidth( void* x_ )
+{
 
-  mv_TempMultiVector* x = (mv_TempMultiVector*)x_;
+   mv_TempMultiVector* x = (mv_TempMultiVector*)x_;
 
-  if ( x == NULL )
-    return 0;
+   if ( x == NULL )
+   {
+      return 0;
+   }
 
-  return x->numVectors;
+   return x->numVectors;
 }
 
 HYPRE_Int
-mv_TempMultiVectorHeight( void* x_ ) {
+mv_TempMultiVectorHeight( void* x_ )
+{
 
-  mv_TempMultiVector* x = (mv_TempMultiVector*)x_;
+   mv_TempMultiVector* x = (mv_TempMultiVector*)x_;
 
-  if ( x == NULL )
-   return 0;
+   if ( x == NULL )
+   {
+      return 0;
+   }
 
-  return (x->interpreter->VectorSize)(x->vector[0]);
+   return (x->interpreter->VectorSize)(x->vector[0]);
 }
 
 /* this shallow copy of the mask is convenient but not safe;
    a proper copy should be considered */
 void
-mv_TempMultiVectorSetMask( void* x_, HYPRE_Int* mask ) {
+mv_TempMultiVectorSetMask( void* x_, HYPRE_Int* mask )
+{
 
-  mv_TempMultiVector* x = (mv_TempMultiVector*)x_;
+   mv_TempMultiVector* x = (mv_TempMultiVector*)x_;
 
-  hypre_assert( x != NULL );
-  x->mask = mask;
-  x->ownsMask = 0;
+   hypre_assert( x != NULL );
+   x->mask = mask;
+   x->ownsMask = 0;
 }
 
 void
-mv_TempMultiVectorClear( void* x_ ) {
+mv_TempMultiVectorClear( void* x_ )
+{
 
-  HYPRE_Int i;
-  mv_TempMultiVector* x = (mv_TempMultiVector*)x_;
+   HYPRE_Int i;
+   mv_TempMultiVector* x = (mv_TempMultiVector*)x_;
 
-  hypre_assert( x != NULL );
+   hypre_assert( x != NULL );
 
-  for ( i = 0; i < x->numVectors; i++ )
-    if ( x->mask == NULL || (x->mask)[i] )
-      (x->interpreter->ClearVector)(x->vector[i]);
+   for ( i = 0; i < x->numVectors; i++ )
+      if ( x->mask == NULL || (x->mask)[i] )
+      {
+         (x->interpreter->ClearVector)(x->vector[i]);
+      }
 }
 
 void
-mv_TempMultiVectorSetRandom( void* x_, HYPRE_Int seed ) {
+mv_TempMultiVectorSetRandom( void* x_, HYPRE_Int seed )
+{
 
-  HYPRE_Int i;
-  mv_TempMultiVector* x = (mv_TempMultiVector*)x_;
+   HYPRE_Int i;
+   mv_TempMultiVector* x = (mv_TempMultiVector*)x_;
 
-  hypre_assert( x != NULL );
+   hypre_assert( x != NULL );
 
-  mysrand(seed);
+   mysrand(seed);
 
-  for ( i = 0; i < x->numVectors; i++ ) {
-    if ( x->mask == NULL || (x->mask)[i] ) {
-      seed=myrand();
-      (x->interpreter->SetRandomValues)(x->vector[i], seed);
-    }
-  }
+   for ( i = 0; i < x->numVectors; i++ )
+   {
+      if ( x->mask == NULL || (x->mask)[i] )
+      {
+         seed = myrand();
+         (x->interpreter->SetRandomValues)(x->vector[i], seed);
+      }
+   }
 }
 
 
 
 void
-mv_TempMultiVectorCopy( void* src_, void* dest_ ) {
+mv_TempMultiVectorCopy( void* src_, void* dest_ )
+{
 
-  HYPRE_Int i, ms, md;
-  void** ps;
-  void** pd;
-  mv_TempMultiVector* src = (mv_TempMultiVector*)src_;
-  mv_TempMultiVector* dest = (mv_TempMultiVector*)dest_;
+   HYPRE_Int i, ms, md;
+   void** ps;
+   void** pd;
+   mv_TempMultiVector* src = (mv_TempMultiVector*)src_;
+   mv_TempMultiVector* dest = (mv_TempMultiVector*)dest_;
 
-  hypre_assert( src != NULL && dest != NULL );
+   hypre_assert( src != NULL && dest != NULL );
 
-  ms = aux_maskCount( src->numVectors, src->mask );
-  md = aux_maskCount( dest->numVectors, dest->mask );
-  hypre_assert( ms == md );
+   ms = aux_maskCount( src->numVectors, src->mask );
+   md = aux_maskCount( dest->numVectors, dest->mask );
+   hypre_assert( ms == md );
 
-  ps = hypre_CTAlloc(void*,  ms, HYPRE_MEMORY_HOST);
-  hypre_assert( ps != NULL );
-  pd = hypre_CTAlloc(void*,  md, HYPRE_MEMORY_HOST);
-  hypre_assert( pd != NULL );
+   ps = hypre_CTAlloc(void*,  ms, HYPRE_MEMORY_HOST);
+   hypre_assert( ps != NULL );
+   pd = hypre_CTAlloc(void*,  md, HYPRE_MEMORY_HOST);
+   hypre_assert( pd != NULL );
 
-  mv_collectVectorPtr( src->mask, src, ps );
-  mv_collectVectorPtr( dest->mask, dest, pd );
+   mv_collectVectorPtr( src->mask, src, ps );
+   mv_collectVectorPtr( dest->mask, dest, pd );
 
-  for ( i = 0; i < ms; i++ )
-    (src->interpreter->CopyVector)(ps[i],pd[i]);
+   for ( i = 0; i < ms; i++ )
+   {
+      (src->interpreter->CopyVector)(ps[i], pd[i]);
+   }
 
-  hypre_TFree(ps,HYPRE_MEMORY_HOST);
-  hypre_TFree(pd,HYPRE_MEMORY_HOST);
+   hypre_TFree(ps, HYPRE_MEMORY_HOST);
+   hypre_TFree(pd, HYPRE_MEMORY_HOST);
 }
 
 void
-mv_TempMultiVectorAxpy( HYPRE_Complex a, void* x_, void* y_ ) {
-
-  HYPRE_Int i, mx, my;
-  void** px;
-  void** py;
-  mv_TempMultiVector* x;
-  mv_TempMultiVector* y;
-
-  x = (mv_TempMultiVector*)x_;
-  y = (mv_TempMultiVector*)y_;
-  hypre_assert( x != NULL && y != NULL );
-
-  mx = aux_maskCount( x->numVectors, x->mask );
-  my = aux_maskCount( y->numVectors, y->mask );
-  hypre_assert( mx == my );
-
-  px = hypre_CTAlloc(void*,  mx, HYPRE_MEMORY_HOST);
-  hypre_assert( px != NULL );
-  py = hypre_CTAlloc(void*,  my, HYPRE_MEMORY_HOST);
-  hypre_assert( py != NULL );
-
-  mv_collectVectorPtr( x->mask, x, px );
-  mv_collectVectorPtr( y->mask, y, py );
-
-  for ( i = 0; i < mx; i++ )
-    (x->interpreter->Axpy)(a,px[i],py[i]);
-
-  hypre_TFree(px,HYPRE_MEMORY_HOST);
-  hypre_TFree(py,HYPRE_MEMORY_HOST);
+mv_TempMultiVectorAxpy( HYPRE_Complex a, void* x_, void* y_ )
+{
+
+   HYPRE_Int i, mx, my;
+   void** px;
+   void** py;
+   mv_TempMultiVector* x;
+   mv_TempMultiVector* y;
+
+   x = (mv_TempMultiVector*)x_;
+   y = (mv_TempMultiVector*)y_;
+   hypre_assert( x != NULL && y != NULL );
+
+   mx = aux_maskCount( x->numVectors, x->mask );
+   my = aux_maskCount( y->numVectors, y->mask );
+   hypre_assert( mx == my );
+
+   px = hypre_CTAlloc(void*,  mx, HYPRE_MEMORY_HOST);
+   hypre_assert( px != NULL );
+   py = hypre_CTAlloc(void*,  my, HYPRE_MEMORY_HOST);
+   hypre_assert( py != NULL );
+
+   mv_collectVectorPtr( x->mask, x, px );
+   mv_collectVectorPtr( y->mask, y, py );
+
+   for ( i = 0; i < mx; i++ )
+   {
+      (x->interpreter->Axpy)(a, px[i], py[i]);
+   }
+
+   hypre_TFree(px, HYPRE_MEMORY_HOST);
+   hypre_TFree(py, HYPRE_MEMORY_HOST);
 }
 
 void
 mv_TempMultiVectorByMultiVector( void* x_, void* y_,
-				     HYPRE_Int xyGHeight, HYPRE_Int xyHeight,
-				     HYPRE_Int xyWidth, HYPRE_Complex* xyVal ) {
-/* xy = x'*y */
-
-  HYPRE_Int ix, iy, mx, my, jxy;
-  HYPRE_Complex* p;
-  void** px;
-  void** py;
-  mv_TempMultiVector* x;
-  mv_TempMultiVector* y;
-
-  x = (mv_TempMultiVector*)x_;
-  y = (mv_TempMultiVector*)y_;
-  hypre_assert( x != NULL && y != NULL );
-
-  mx = aux_maskCount( x->numVectors, x->mask );
-  hypre_assert( mx == xyHeight );
-
-  my = aux_maskCount( y->numVectors, y->mask );
-  hypre_assert( my == xyWidth );
-
-  px = hypre_CTAlloc(void*,  mx, HYPRE_MEMORY_HOST);
-  hypre_assert( px != NULL );
-  py = hypre_CTAlloc(void*,  my, HYPRE_MEMORY_HOST);
-  hypre_assert( py != NULL );
-
-  mv_collectVectorPtr( x->mask, x, px );
-  mv_collectVectorPtr( y->mask, y, py );
-
-  jxy = xyGHeight - xyHeight;
-  for ( iy = 0, p = xyVal; iy < my; iy++ ) {
-    for ( ix = 0; ix < mx; ix++, p++ )
-      *p = (x->interpreter->InnerProd)(px[ix],py[iy]);
-    p += jxy;
-  }
-
-  hypre_TFree(px,HYPRE_MEMORY_HOST);
-  hypre_TFree(py,HYPRE_MEMORY_HOST);
+                                 HYPRE_BigInt xyGHeight, HYPRE_Int xyHeight,
+                                 HYPRE_Int xyWidth, HYPRE_Complex* xyVal )
+{
+   /* xy = x'*y */
+
+   HYPRE_Int ix, iy, mx, my;
+   HYPRE_BigInt jxy;
+   HYPRE_Complex* p;
+   void** px;
+   void** py;
+   mv_TempMultiVector* x;
+   mv_TempMultiVector* y;
+
+   x = (mv_TempMultiVector*)x_;
+   y = (mv_TempMultiVector*)y_;
+   hypre_assert( x != NULL && y != NULL );
+
+   mx = aux_maskCount( x->numVectors, x->mask );
+   hypre_assert( mx == xyHeight );
+
+   my = aux_maskCount( y->numVectors, y->mask );
+   hypre_assert( my == xyWidth );
+
+   px = hypre_CTAlloc(void*,  mx, HYPRE_MEMORY_HOST);
+   hypre_assert( px != NULL );
+   py = hypre_CTAlloc(void*,  my, HYPRE_MEMORY_HOST);
+   hypre_assert( py != NULL );
+
+   mv_collectVectorPtr( x->mask, x, px );
+   mv_collectVectorPtr( y->mask, y, py );
+
+   jxy = xyGHeight - (HYPRE_BigInt) xyHeight;
+   for ( iy = 0, p = xyVal; iy < my; iy++ )
+   {
+      for ( ix = 0; ix < mx; ix++, p++ )
+      {
+         *p = (x->interpreter->InnerProd)(px[ix], py[iy]);
+      }
+      p += jxy;
+   }
+
+   hypre_TFree(px, HYPRE_MEMORY_HOST);
+   hypre_TFree(py, HYPRE_MEMORY_HOST);
 
 }
 
 void
 mv_TempMultiVectorByMultiVectorDiag( void* x_, void* y_,
-					HYPRE_Int* mask, HYPRE_Int n, HYPRE_Complex* diag ) {
-/* diag = diag(x'*y) */
-
-  HYPRE_Int i, mx, my, m;
-  void** px;
-  void** py;
-  HYPRE_Int* index;
-  mv_TempMultiVector* x;
-  mv_TempMultiVector* y;
-
-  x = (mv_TempMultiVector*)x_;
-  y = (mv_TempMultiVector*)y_;
-  hypre_assert( x != NULL && y != NULL );
-
-  mx = aux_maskCount( x->numVectors, x->mask );
-  my = aux_maskCount( y->numVectors, y->mask );
-  m = aux_maskCount( n, mask );
-  hypre_assert( mx == my && mx == m );
-
-  px = hypre_CTAlloc(void*,  mx, HYPRE_MEMORY_HOST);
-  hypre_assert( px != NULL );
-  py = hypre_CTAlloc(void*,  my, HYPRE_MEMORY_HOST);
-  hypre_assert( py != NULL );
-
-  mv_collectVectorPtr( x->mask, x, px );
-  mv_collectVectorPtr( y->mask, y, py );
-
-  index = hypre_CTAlloc(HYPRE_Int,  m, HYPRE_MEMORY_HOST);
-  aux_indexFromMask( n, mask, index );
-
-  for ( i = 0; i < m; i++ )
-    *(diag+index[i]-1) = (x->interpreter->InnerProd)(px[i],py[i]);
-
-  hypre_TFree(index,HYPRE_MEMORY_HOST);
-  hypre_TFree(px,HYPRE_MEMORY_HOST);
-  hypre_TFree(py,HYPRE_MEMORY_HOST);
+                                     HYPRE_Int* mask, HYPRE_Int n, HYPRE_Complex* diag )
+{
+   /* diag = diag(x'*y) */
+
+   HYPRE_Int i, mx, my, m;
+   void** px;
+   void** py;
+   HYPRE_Int* index;
+   mv_TempMultiVector* x;
+   mv_TempMultiVector* y;
+
+   x = (mv_TempMultiVector*)x_;
+   y = (mv_TempMultiVector*)y_;
+   hypre_assert( x != NULL && y != NULL );
+
+   mx = aux_maskCount( x->numVectors, x->mask );
+   my = aux_maskCount( y->numVectors, y->mask );
+   m = aux_maskCount( n, mask );
+   hypre_assert( mx == my && mx == m );
+
+   px = hypre_CTAlloc(void*,  mx, HYPRE_MEMORY_HOST);
+   hypre_assert( px != NULL );
+   py = hypre_CTAlloc(void*,  my, HYPRE_MEMORY_HOST);
+   hypre_assert( py != NULL );
+
+   mv_collectVectorPtr( x->mask, x, px );
+   mv_collectVectorPtr( y->mask, y, py );
+
+   index = hypre_CTAlloc(HYPRE_Int,  m, HYPRE_MEMORY_HOST);
+   aux_indexFromMask( n, mask, index );
+
+   for ( i = 0; i < m; i++ )
+   {
+      *(diag + index[i] - 1) = (x->interpreter->InnerProd)(px[i], py[i]);
+   }
+
+   hypre_TFree(index, HYPRE_MEMORY_HOST);
+   hypre_TFree(px, HYPRE_MEMORY_HOST);
+   hypre_TFree(py, HYPRE_MEMORY_HOST);
 
 }
 
 void
 mv_TempMultiVectorByMatrix( void* x_,
-			       HYPRE_Int rGHeight, HYPRE_Int rHeight,
-			       HYPRE_Int rWidth, HYPRE_Complex* rVal,
-			       void* y_ ) {
-
-  HYPRE_Int i, j, jump;
-  HYPRE_Int mx, my;
-  HYPRE_Complex* p;
-  void** px;
-  void** py;
-  mv_TempMultiVector* x;
-  mv_TempMultiVector* y;
-
-  x = (mv_TempMultiVector*)x_;
-  y = (mv_TempMultiVector*)y_;
-  hypre_assert( x != NULL && y != NULL );
-
-  mx = aux_maskCount( x->numVectors, x->mask );
-  my = aux_maskCount( y->numVectors, y->mask );
-
-  hypre_assert( mx == rHeight && my == rWidth );
-
-  px = hypre_CTAlloc(void*,  mx, HYPRE_MEMORY_HOST);
-  hypre_assert( px != NULL );
-  py = hypre_CTAlloc(void*,  my, HYPRE_MEMORY_HOST);
-  hypre_assert( py != NULL );
-
-  mv_collectVectorPtr( x->mask, x, px );
-  mv_collectVectorPtr( y->mask, y, py );
-
-  jump = rGHeight - rHeight;
-  for ( j = 0, p = rVal; j < my; j++ ) {
-    (x->interpreter->ClearVector)( py[j] );
-    for ( i = 0; i < mx; i++, p++ )
-      (x->interpreter->Axpy)(*p,px[i],py[j]);
-    p += jump;
-  }
-
-  hypre_TFree(px,HYPRE_MEMORY_HOST);
-  hypre_TFree(py,HYPRE_MEMORY_HOST);
+                            HYPRE_BigInt rGHeight, HYPRE_Int rHeight,
+                            HYPRE_Int rWidth, HYPRE_Complex* rVal,
+                            void* y_ )
+{
+
+   HYPRE_Int i, j;
+   HYPRE_BigInt jump;
+   HYPRE_Int mx, my;
+   HYPRE_Complex* p;
+   void** px;
+   void** py;
+   mv_TempMultiVector* x;
+   mv_TempMultiVector* y;
+
+   x = (mv_TempMultiVector*)x_;
+   y = (mv_TempMultiVector*)y_;
+   hypre_assert( x != NULL && y != NULL );
+
+   mx = aux_maskCount( x->numVectors, x->mask );
+   my = aux_maskCount( y->numVectors, y->mask );
+
+   hypre_assert( mx == rHeight && my == rWidth );
+
+   px = hypre_CTAlloc(void*,  mx, HYPRE_MEMORY_HOST);
+   hypre_assert( px != NULL );
+   py = hypre_CTAlloc(void*,  my, HYPRE_MEMORY_HOST);
+   hypre_assert( py != NULL );
+
+   mv_collectVectorPtr( x->mask, x, px );
+   mv_collectVectorPtr( y->mask, y, py );
+
+   jump = rGHeight - (HYPRE_BigInt) rHeight;
+   for ( j = 0, p = rVal; j < my; j++ )
+   {
+      (x->interpreter->ClearVector)( py[j] );
+      for ( i = 0; i < mx; i++, p++ )
+      {
+         (x->interpreter->Axpy)(*p, px[i], py[j]);
+      }
+      p += jump;
+   }
+
+   hypre_TFree(px, HYPRE_MEMORY_HOST);
+   hypre_TFree(py, HYPRE_MEMORY_HOST);
 }
 
 void
 mv_TempMultiVectorXapy( void* x_,
-			   HYPRE_Int rGHeight, HYPRE_Int rHeight,
-			   HYPRE_Int rWidth, HYPRE_Complex* rVal,
-			   void* y_ ) {
-
-  HYPRE_Int i, j, jump;
-  HYPRE_Int mx, my;
-  HYPRE_Complex* p;
-  void** px;
-  void** py;
-  mv_TempMultiVector* x;
-  mv_TempMultiVector* y;
-
-  x = (mv_TempMultiVector*)x_;
-  y = (mv_TempMultiVector*)y_;
-  hypre_assert( x != NULL && y != NULL );
-
-  mx = aux_maskCount( x->numVectors, x->mask );
-  my = aux_maskCount( y->numVectors, y->mask );
-
-  hypre_assert( mx == rHeight && my == rWidth );
-
-  px = hypre_CTAlloc(void*,  mx, HYPRE_MEMORY_HOST);
-  hypre_assert( px != NULL );
-  py = hypre_CTAlloc(void*,  my, HYPRE_MEMORY_HOST);
-  hypre_assert( py != NULL );
-
-  mv_collectVectorPtr( x->mask, x, px );
-  mv_collectVectorPtr( y->mask, y, py );
-
-  jump = rGHeight - rHeight;
-  for ( j = 0, p = rVal; j < my; j++ ) {
-    for ( i = 0; i < mx; i++, p++ )
-      (x->interpreter->Axpy)(*p,px[i],py[j]);
-    p += jump;
-  }
-
-  hypre_TFree(px,HYPRE_MEMORY_HOST);
-  hypre_TFree(py,HYPRE_MEMORY_HOST);
+                        HYPRE_BigInt rGHeight, HYPRE_Int rHeight,
+                        HYPRE_Int rWidth, HYPRE_Complex* rVal,
+                        void* y_ )
+{
+
+   HYPRE_Int i, j;
+   HYPRE_BigInt jump;
+   HYPRE_Int mx, my;
+   HYPRE_Complex* p;
+   void** px;
+   void** py;
+   mv_TempMultiVector* x;
+   mv_TempMultiVector* y;
+
+   x = (mv_TempMultiVector*)x_;
+   y = (mv_TempMultiVector*)y_;
+   hypre_assert( x != NULL && y != NULL );
+
+   mx = aux_maskCount( x->numVectors, x->mask );
+   my = aux_maskCount( y->numVectors, y->mask );
+
+   hypre_assert( mx == rHeight && my == rWidth );
+
+   px = hypre_CTAlloc(void*,  mx, HYPRE_MEMORY_HOST);
+   hypre_assert( px != NULL );
+   py = hypre_CTAlloc(void*,  my, HYPRE_MEMORY_HOST);
+   hypre_assert( py != NULL );
+
+   mv_collectVectorPtr( x->mask, x, px );
+   mv_collectVectorPtr( y->mask, y, py );
+
+   jump = rGHeight - (HYPRE_BigInt) rHeight;
+   for ( j = 0, p = rVal; j < my; j++ )
+   {
+      for ( i = 0; i < mx; i++, p++ )
+      {
+         (x->interpreter->Axpy)(*p, px[i], py[j]);
+      }
+      p += jump;
+   }
+
+   hypre_TFree(px, HYPRE_MEMORY_HOST);
+   hypre_TFree(py, HYPRE_MEMORY_HOST);
 }
 
 void
 mv_TempMultiVectorByDiagonal( void* x_,
-				HYPRE_Int* mask, HYPRE_Int n, HYPRE_Complex* diag,
-				void* y_ ) {
-
-  HYPRE_Int j;
-  HYPRE_Int mx, my, m;
-  void** px;
-  void** py;
-  HYPRE_Int* index;
-  mv_TempMultiVector* x;
-  mv_TempMultiVector* y;
-
-  x = (mv_TempMultiVector*)x_;
-  y = (mv_TempMultiVector*)y_;
-  hypre_assert( x != NULL && y != NULL );
-
-  mx = aux_maskCount( x->numVectors, x->mask );
-  my = aux_maskCount( y->numVectors, y->mask );
-  m = aux_maskCount( n, mask );
-
-  hypre_assert( mx == m && my == m );
-
-  if ( m < 1 )
-    return;
-
-  px = hypre_CTAlloc(void*,  mx, HYPRE_MEMORY_HOST);
-  hypre_assert( px != NULL );
-  py = hypre_CTAlloc(void*,  my, HYPRE_MEMORY_HOST);
-  hypre_assert( py != NULL );
-
-  index = hypre_CTAlloc(HYPRE_Int,  m, HYPRE_MEMORY_HOST);
-  aux_indexFromMask( n, mask, index );
-
-  mv_collectVectorPtr( x->mask, x, px );
-  mv_collectVectorPtr( y->mask, y, py );
-
-  for ( j = 0; j < my; j++ ) {
-    (x->interpreter->ClearVector)(py[j]);
-    (x->interpreter->Axpy)(diag[index[j]-1],px[j],py[j]);
-  }
-
-  hypre_TFree(px,HYPRE_MEMORY_HOST);
-  hypre_TFree(py,HYPRE_MEMORY_HOST);
-  hypre_TFree( index ,HYPRE_MEMORY_HOST);
+                              HYPRE_Int* mask, HYPRE_Int n, HYPRE_Complex* diag,
+                              void* y_ )
+{
+
+   HYPRE_Int j;
+   HYPRE_Int mx, my, m;
+   void** px;
+   void** py;
+   HYPRE_Int* index;
+   mv_TempMultiVector* x;
+   mv_TempMultiVector* y;
+
+   x = (mv_TempMultiVector*)x_;
+   y = (mv_TempMultiVector*)y_;
+   hypre_assert( x != NULL && y != NULL );
+
+   mx = aux_maskCount( x->numVectors, x->mask );
+   my = aux_maskCount( y->numVectors, y->mask );
+   m = aux_maskCount( n, mask );
+
+   hypre_assert( mx == m && my == m );
+
+   if ( m < 1 )
+   {
+      return;
+   }
+
+   px = hypre_CTAlloc(void*,  mx, HYPRE_MEMORY_HOST);
+   hypre_assert( px != NULL );
+   py = hypre_CTAlloc(void*,  my, HYPRE_MEMORY_HOST);
+   hypre_assert( py != NULL );
+
+   index = hypre_CTAlloc(HYPRE_Int,  m, HYPRE_MEMORY_HOST);
+   aux_indexFromMask( n, mask, index );
+
+   mv_collectVectorPtr( x->mask, x, px );
+   mv_collectVectorPtr( y->mask, y, py );
+
+   for ( j = 0; j < my; j++ )
+   {
+      (x->interpreter->ClearVector)(py[j]);
+      (x->interpreter->Axpy)(diag[index[j] - 1], px[j], py[j]);
+   }
+
+   hypre_TFree(px, HYPRE_MEMORY_HOST);
+   hypre_TFree(py, HYPRE_MEMORY_HOST);
+   hypre_TFree( index, HYPRE_MEMORY_HOST);
 }
 
 void
 mv_TempMultiVectorEval( void (*f)( void*, void*, void* ), void* par,
-			   void* x_, void* y_ ) {
-
-  HYPRE_Int i, mx, my;
-  void** px;
-  void** py;
-  mv_TempMultiVector* x;
-  mv_TempMultiVector* y;
-
-  x = (mv_TempMultiVector*)x_;
-  y = (mv_TempMultiVector*)y_;
-  hypre_assert( x != NULL && y != NULL );
-
-  if ( f == NULL ) {
-    mv_TempMultiVectorCopy( x, y );
-    return;
-  }
-
-  mx = aux_maskCount( x->numVectors, x->mask );
-  my = aux_maskCount( y->numVectors, y->mask );
-  hypre_assert( mx == my );
-
-  px = hypre_CTAlloc(void*,  mx, HYPRE_MEMORY_HOST);
-  hypre_assert( px != NULL );
-  py = hypre_CTAlloc(void*,  my, HYPRE_MEMORY_HOST);
-  hypre_assert( py != NULL );
-
-  mv_collectVectorPtr( x->mask, x, px );
-  mv_collectVectorPtr( y->mask, y, py );
-
-  for ( i = 0; i < mx; i++ )
-    f( par, (void*)px[i], (void*)py[i] );
-
-  hypre_TFree(px,HYPRE_MEMORY_HOST);
-  hypre_TFree(py,HYPRE_MEMORY_HOST);
+                        void* x_, void* y_ )
+{
+
+   HYPRE_Int i, mx, my;
+   void** px;
+   void** py;
+   mv_TempMultiVector* x;
+   mv_TempMultiVector* y;
+
+   x = (mv_TempMultiVector*)x_;
+   y = (mv_TempMultiVector*)y_;
+   hypre_assert( x != NULL && y != NULL );
+
+   if ( f == NULL )
+   {
+      mv_TempMultiVectorCopy( x, y );
+      return;
+   }
+
+   mx = aux_maskCount( x->numVectors, x->mask );
+   my = aux_maskCount( y->numVectors, y->mask );
+   hypre_assert( mx == my );
+
+   px = hypre_CTAlloc(void*,  mx, HYPRE_MEMORY_HOST);
+   hypre_assert( px != NULL );
+   py = hypre_CTAlloc(void*,  my, HYPRE_MEMORY_HOST);
+   hypre_assert( py != NULL );
+
+   mv_collectVectorPtr( x->mask, x, px );
+   mv_collectVectorPtr( y->mask, y, py );
+
+   for ( i = 0; i < mx; i++ )
+   {
+      f( par, (void*)px[i], (void*)py[i] );
+   }
+
+   hypre_TFree(px, HYPRE_MEMORY_HOST);
+   hypre_TFree(py, HYPRE_MEMORY_HOST);
 }
diff --git a/external/hypre/src/multivector/temp_multivector.h b/external/hypre/src/multivector/temp_multivector.h
index 2ebde545..fb2ee9e4 100644
--- a/external/hypre/src/multivector/temp_multivector.h
+++ b/external/hypre/src/multivector/temp_multivector.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -12,13 +12,13 @@
 
 typedef struct
 {
-  HYPRE_Int    numVectors;
-  HYPRE_Int*   mask;
-  void**       vector;
-  HYPRE_Int    ownsVectors;
-  HYPRE_Int    ownsMask;
+   HYPRE_Int    numVectors;
+   HYPRE_Int*   mask;
+   void**       vector;
+   HYPRE_Int    ownsVectors;
+   HYPRE_Int    ownsMask;
 
-  mv_InterfaceInterpreter* interpreter;
+   mv_InterfaceInterpreter* interpreter;
 
 } mv_TempMultiVector;
 
@@ -109,29 +109,29 @@ mv_TempMultiVectorAxpy( HYPRE_Complex, void*, void* );
 
 void
 mv_TempMultiVectorByMultiVector( void*, void*,
-                                    HYPRE_Int gh, HYPRE_Int h, HYPRE_Int w, HYPRE_Complex* v );
+                                 HYPRE_BigInt gh, HYPRE_Int h, HYPRE_Int w, HYPRE_Complex* v );
 
 void
 mv_TempMultiVectorByMultiVectorDiag( void* x, void* y,
-                                        HYPRE_Int* mask, HYPRE_Int n, HYPRE_Complex* diag );
+                                     HYPRE_Int* mask, HYPRE_Int n, HYPRE_Complex* diag );
 
 void
 mv_TempMultiVectorByMatrix( void*,
-                               HYPRE_Int gh, HYPRE_Int h, HYPRE_Int w, HYPRE_Complex* v,
-                               void* );
+                            HYPRE_BigInt gh, HYPRE_Int h, HYPRE_Int w, HYPRE_Complex* v,
+                            void* );
 
 void
 mv_TempMultiVectorXapy( void* x,
-                           HYPRE_Int gh, HYPRE_Int h, HYPRE_Int w, HYPRE_Complex* v,
-                           void* y );
+                        HYPRE_BigInt gh, HYPRE_Int h, HYPRE_Int w, HYPRE_Complex* v,
+                        void* y );
 
 void mv_TempMultiVectorByDiagonal( void* x,
-                                      HYPRE_Int* mask, HYPRE_Int n, HYPRE_Complex* diag,
-                                      void* y );
+                                   HYPRE_Int* mask, HYPRE_Int n, HYPRE_Complex* diag,
+                                   void* y );
 
 void
 mv_TempMultiVectorEval( void (*f)( void*, void*, void* ), void* par,
-                           void* x, void* y );
+                        void* x, void* y );
 
 #ifdef __cplusplus
 }
diff --git a/external/hypre/src/nopoe b/external/hypre/src/nopoe
old mode 100644
new mode 100755
diff --git a/external/hypre/src/parcsr_block_mv/CMakeLists.txt b/external/hypre/src/parcsr_block_mv/CMakeLists.txt
index 3559fff8..d8e5685d 100644
--- a/external/hypre/src/parcsr_block_mv/CMakeLists.txt
+++ b/external/hypre/src/parcsr_block_mv/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/parcsr_block_mv/_hypre_parcsr_block_mv.h b/external/hypre/src/parcsr_block_mv/_hypre_parcsr_block_mv.h
index 72fe1265..5c9ddea3 100644
--- a/external/hypre/src/parcsr_block_mv/_hypre_parcsr_block_mv.h
+++ b/external/hypre/src/parcsr_block_mv/_hypre_parcsr_block_mv.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -10,5 +10,5 @@
 #include <math.h>
 
 #include "csr_block_matrix.h"
-#include "par_csr_block_matrix.h" 
+#include "par_csr_block_matrix.h"
 #include "_hypre_parcsr_ls.h"
diff --git a/external/hypre/src/parcsr_block_mv/csr_block_matop.c b/external/hypre/src/parcsr_block_mv/csr_block_matop.c
index 96485f4a..ce4ae00f 100644
--- a/external/hypre/src/parcsr_block_mv/csr_block_matop.c
+++ b/external/hypre/src/parcsr_block_mv/csr_block_matop.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -16,7 +16,7 @@
  * adds two CSR Matrices A and B and returns a CSR Matrix C;
  * Note: The routine does not check for 0-elements which might be generated
  *       through cancellation of elements in A and B or already contained
-         in A and B. To remove those, use hypre_CSRMatrixDeleteZeros 
+         in A and B. To remove those, use hypre_CSRMatrixDeleteZeros
  *--------------------------------------------------------------------------*/
 
 hypre_CSRBlockMatrix *
@@ -37,8 +37,8 @@ hypre_CSRBlockMatrixAdd(hypre_CSRBlockMatrix *A, hypre_CSRBlockMatrix *B)
    HYPRE_Int        *C_i;
    HYPRE_Int        *C_j;
 
-   HYPRE_Int         block_size  = hypre_CSRBlockMatrixBlockSize(A); 
-   HYPRE_Int         block_sizeB = hypre_CSRBlockMatrixBlockSize(B); 
+   HYPRE_Int         block_size  = hypre_CSRBlockMatrixBlockSize(A);
+   HYPRE_Int         block_sizeB = hypre_CSRBlockMatrixBlockSize(B);
    HYPRE_Int         ia, ib, ic, ii, jcol, num_nonzeros, bnnz;
    HYPRE_Int           pos;
    HYPRE_Int         *marker;
@@ -56,21 +56,21 @@ hypre_CSRBlockMatrixAdd(hypre_CSRBlockMatrix *A, hypre_CSRBlockMatrix *B)
 
    bnnz = block_size * block_size;
    marker = hypre_CTAlloc(HYPRE_Int,  ncols_A, HYPRE_MEMORY_HOST);
-   C_i = hypre_CTAlloc(HYPRE_Int,  nrows_A+1, HYPRE_MEMORY_HOST);
+   C_i = hypre_CTAlloc(HYPRE_Int,  nrows_A + 1, HYPRE_MEMORY_HOST);
 
-   for (ia = 0; ia < ncols_A; ia++) marker[ia] = -1;
+   for (ia = 0; ia < ncols_A; ia++) { marker[ia] = -1; }
 
    num_nonzeros = 0;
    C_i[0] = 0;
    for (ic = 0; ic < nrows_A; ic++)
    {
-      for (ia = A_i[ic]; ia < A_i[ic+1]; ia++)
+      for (ia = A_i[ic]; ia < A_i[ic + 1]; ia++)
       {
          jcol = A_j[ia];
          marker[jcol] = ic;
          num_nonzeros++;
       }
-      for (ib = B_i[ic]; ib < B_i[ic+1]; ib++)
+      for (ib = B_i[ic]; ib < B_i[ic + 1]; ib++)
       {
          jcol = B_j[ib];
          if (marker[jcol] != ic)
@@ -79,57 +79,63 @@ hypre_CSRBlockMatrixAdd(hypre_CSRBlockMatrix *A, hypre_CSRBlockMatrix *B)
             num_nonzeros++;
          }
       }
-      C_i[ic+1] = num_nonzeros;
+      C_i[ic + 1] = num_nonzeros;
    }
 
-   C = hypre_CSRBlockMatrixCreate(block_size,nrows_A,ncols_A,num_nonzeros);
+   C = hypre_CSRBlockMatrixCreate(block_size, nrows_A, ncols_A, num_nonzeros);
    hypre_CSRMatrixI(C) = C_i;
    hypre_CSRMatrixInitialize(C);
    C_j = hypre_CSRMatrixJ(C);
    C_data = hypre_CSRMatrixData(C);
 
-   for (ia = 0; ia < ncols_A; ia++) marker[ia] = -1;
+   for (ia = 0; ia < ncols_A; ia++) { marker[ia] = -1; }
 
    pos = 0;
    for (ic = 0; ic < nrows_A; ic++)
    {
-      for (ia = A_i[ic]; ia < A_i[ic+1]; ia++)
+      for (ia = A_i[ic]; ia < A_i[ic + 1]; ia++)
       {
          jcol = A_j[ia];
          C_j[pos] = jcol;
          for (ii = 0; ii < bnnz; ii++)
-            C_data[pos*bnnz+ii] = A_data[ia*bnnz+ii];
+         {
+            C_data[pos * bnnz + ii] = A_data[ia * bnnz + ii];
+         }
          marker[jcol] = pos;
          pos++;
       }
-      for (ib = B_i[ic]; ib < B_i[ic+1]; ib++)
+      for (ib = B_i[ic]; ib < B_i[ic + 1]; ib++)
       {
          jcol = B_j[ib];
          if (marker[jcol] < C_i[ic])
          {
             C_j[pos] = jcol;
             for (ii = 0; ii < bnnz; ii++)
-               C_data[pos*bnnz+ii] = B_data[ib*bnnz+ii];
+            {
+               C_data[pos * bnnz + ii] = B_data[ib * bnnz + ii];
+            }
             marker[jcol] = pos;
             pos++;
          }
-         else 
+         else
          {
             for (ii = 0; ii < bnnz; ii++)
-               C_data[marker[jcol]*bnnz+ii] = B_data[ib*bnnz+ii];
+            {
+               C_data[marker[jcol]*bnnz + ii] = B_data[ib * bnnz + ii];
+            }
          }
       }
    }
    hypre_TFree(marker, HYPRE_MEMORY_HOST);
    return C;
-}       
+}
 
 /*--------------------------------------------------------------------------
  * hypre_CSRMatrixMultiply
  * multiplies two CSR Matrices A and B and returns a CSR Matrix C;
  * Note: The routine does not check for 0-elements which might be generated
  *       through cancellation of elements in A and B or already contained
-         in A and B. To remove those, use hypre_CSRMatrixDeleteZeros 
+         in A and B. To remove those, use hypre_CSRMatrixDeleteZeros
  *--------------------------------------------------------------------------*/
 
 hypre_CSRBlockMatrix *
@@ -140,21 +146,21 @@ hypre_CSRBlockMatrixMultiply(hypre_CSRBlockMatrix *A, hypre_CSRBlockMatrix *B)
    HYPRE_Int        *A_j      = hypre_CSRMatrixJ(A);
    HYPRE_Int         nrows_A  = hypre_CSRMatrixNumRows(A);
    HYPRE_Int         ncols_A  = hypre_CSRMatrixNumCols(A);
-   HYPRE_Int         block_size  = hypre_CSRBlockMatrixBlockSize(A); 
+   HYPRE_Int         block_size  = hypre_CSRBlockMatrixBlockSize(A);
    HYPRE_Complex    *B_data   = hypre_CSRMatrixData(B);
    HYPRE_Int        *B_i      = hypre_CSRMatrixI(B);
    HYPRE_Int        *B_j      = hypre_CSRMatrixJ(B);
    HYPRE_Int         nrows_B  = hypre_CSRMatrixNumRows(B);
    HYPRE_Int         ncols_B  = hypre_CSRMatrixNumCols(B);
-   HYPRE_Int         block_sizeB = hypre_CSRBlockMatrixBlockSize(B); 
+   HYPRE_Int         block_sizeB = hypre_CSRBlockMatrixBlockSize(B);
    hypre_CSRMatrix  *C;
    HYPRE_Complex    *C_data;
    HYPRE_Int        *C_i;
    HYPRE_Int        *C_j;
 
-   HYPRE_Int         ia, ib, ic, ja, jb, num_nonzeros=0, bnnz;
+   HYPRE_Int         ia, ib, ic, ja, jb, num_nonzeros = 0, bnnz;
    HYPRE_Int         row_start, counter;
-   HYPRE_Complex    *a_entries, *b_entries, *c_entries, dzero=0.0, done=1.0;
+   HYPRE_Complex    *a_entries, *b_entries, *c_entries, dzero = 0.0, done = 1.0;
    HYPRE_Int        *B_marker;
 
    if (ncols_A != nrows_B)
@@ -170,16 +176,16 @@ hypre_CSRBlockMatrixMultiply(hypre_CSRBlockMatrix *A, hypre_CSRBlockMatrix *B)
 
    bnnz = block_size * block_size;
    B_marker = hypre_CTAlloc(HYPRE_Int,  ncols_B, HYPRE_MEMORY_HOST);
-   C_i = hypre_CTAlloc(HYPRE_Int,  nrows_A+1, HYPRE_MEMORY_HOST);
+   C_i = hypre_CTAlloc(HYPRE_Int,  nrows_A + 1, HYPRE_MEMORY_HOST);
 
-   for (ib = 0; ib < ncols_B; ib++) B_marker[ib] = -1;
+   for (ib = 0; ib < ncols_B; ib++) { B_marker[ib] = -1; }
 
    for (ic = 0; ic < nrows_A; ic++)
    {
-      for (ia = A_i[ic]; ia < A_i[ic+1]; ia++)
+      for (ia = A_i[ic]; ia < A_i[ic + 1]; ia++)
       {
          ja = A_j[ia];
-         for (ib = B_i[ja]; ib < B_i[ja+1]; ib++)
+         for (ib = B_i[ja]; ib < B_i[ja + 1]; ib++)
          {
             jb = B_j[ib];
             if (B_marker[jb] != ic)
@@ -189,42 +195,42 @@ hypre_CSRBlockMatrixMultiply(hypre_CSRBlockMatrix *A, hypre_CSRBlockMatrix *B)
             }
          }
       }
-      C_i[ic+1] = num_nonzeros;
+      C_i[ic + 1] = num_nonzeros;
    }
 
-   C = hypre_CSRBlockMatrixCreate(block_size,nrows_A,ncols_B,num_nonzeros);
+   C = hypre_CSRBlockMatrixCreate(block_size, nrows_A, ncols_B, num_nonzeros);
    hypre_CSRMatrixI(C) = C_i;
    hypre_CSRMatrixInitialize(C);
    C_j = hypre_CSRMatrixJ(C);
    C_data = hypre_CSRMatrixData(C);
 
-   for (ib = 0; ib < ncols_B; ib++) B_marker[ib] = -1;
+   for (ib = 0; ib < ncols_B; ib++) { B_marker[ib] = -1; }
 
    counter = 0;
    for (ic = 0; ic < nrows_A; ic++)
    {
       row_start = C_i[ic];
-      for (ia = A_i[ic]; ia < A_i[ic+1]; ia++)
+      for (ia = A_i[ic]; ia < A_i[ic + 1]; ia++)
       {
          ja = A_j[ia];
-         a_entries = &(A_data[ia*bnnz]);
-         for (ib = B_i[ja]; ib < B_i[ja+1]; ib++)
+         a_entries = &(A_data[ia * bnnz]);
+         for (ib = B_i[ja]; ib < B_i[ja + 1]; ib++)
          {
             jb = B_j[ib];
-            b_entries = &(B_data[ib*bnnz]);
+            b_entries = &(B_data[ib * bnnz]);
             if (B_marker[jb] < row_start)
             {
                B_marker[jb] = counter;
                C_j[B_marker[jb]] = jb;
-               c_entries = &(C_data[B_marker[jb]*bnnz]);
-               hypre_CSRBlockMatrixBlockMultAdd(a_entries,b_entries,dzero,
+               c_entries = &(C_data[B_marker[jb] * bnnz]);
+               hypre_CSRBlockMatrixBlockMultAdd(a_entries, b_entries, dzero,
                                                 c_entries, block_size);
                counter++;
             }
             else
             {
-               c_entries = &(C_data[B_marker[jb]*bnnz]);
-               hypre_CSRBlockMatrixBlockMultAdd(a_entries,b_entries,done,
+               c_entries = &(C_data[B_marker[jb] * bnnz]);
+               hypre_CSRBlockMatrixBlockMultAdd(a_entries, b_entries, done,
                                                 c_entries, block_size);
             }
          }
@@ -232,5 +238,5 @@ hypre_CSRBlockMatrixMultiply(hypre_CSRBlockMatrix *A, hypre_CSRBlockMatrix *B)
    }
    hypre_TFree(B_marker, HYPRE_MEMORY_HOST);
    return C;
-}       
+}
 
diff --git a/external/hypre/src/parcsr_block_mv/csr_block_matrix.c b/external/hypre/src/parcsr_block_mv/csr_block_matrix.c
index a1a2d17d..1cdf356b 100644
--- a/external/hypre/src/parcsr_block_mv/csr_block_matrix.c
+++ b/external/hypre/src/parcsr_block_mv/csr_block_matrix.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -13,6 +13,8 @@
 
 #include "_hypre_parcsr_block_mv.h"
 
+#define LB_VERSION 0
+
 /*--------------------------------------------------------------------------
  * hypre_CSRBlockMatrixCreate
  *--------------------------------------------------------------------------*/
@@ -46,10 +48,10 @@ hypre_CSRBlockMatrixCreate(HYPRE_Int block_size,
  * hypre_CSRBlockMatrixDestroy
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 hypre_CSRBlockMatrixDestroy(hypre_CSRBlockMatrix *matrix)
 {
-   HYPRE_Int  ierr=0;
+   HYPRE_Int  ierr = 0;
 
    if (matrix)
    {
@@ -70,29 +72,37 @@ hypre_CSRBlockMatrixDestroy(hypre_CSRBlockMatrix *matrix)
  * hypre_CSRBlockMatrixInitialize
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 hypre_CSRBlockMatrixInitialize(hypre_CSRBlockMatrix *matrix)
 {
    HYPRE_Int block_size   = hypre_CSRBlockMatrixBlockSize(matrix);
    HYPRE_Int num_rows     = hypre_CSRBlockMatrixNumRows(matrix);
    HYPRE_Int num_nonzeros = hypre_CSRBlockMatrixNumNonzeros(matrix);
-   HYPRE_Int ierr=0, nnz;
+   HYPRE_Int ierr = 0, nnz;
 
    if ( ! hypre_CSRBlockMatrixI(matrix) )
+   {
       hypre_TFree(hypre_CSRBlockMatrixI(matrix), HYPRE_MEMORY_HOST);
+   }
    if ( ! hypre_CSRBlockMatrixJ(matrix) )
+   {
       hypre_TFree(hypre_CSRBlockMatrixJ(matrix), HYPRE_MEMORY_HOST);
+   }
    if ( ! hypre_CSRBlockMatrixBigJ(matrix) )
+   {
       hypre_TFree(hypre_CSRBlockMatrixBigJ(matrix), HYPRE_MEMORY_HOST);
+   }
    if ( ! hypre_CSRBlockMatrixData(matrix) )
+   {
       hypre_TFree(hypre_CSRBlockMatrixData(matrix), HYPRE_MEMORY_HOST);
+   }
 
    nnz = num_nonzeros * block_size * block_size;
    hypre_CSRBlockMatrixI(matrix) = hypre_CTAlloc(HYPRE_Int,  num_rows + 1, HYPRE_MEMORY_HOST);
-   if (nnz) hypre_CSRBlockMatrixData(matrix) = hypre_CTAlloc(HYPRE_Complex,  nnz, HYPRE_MEMORY_HOST);
-   else     hypre_CSRBlockMatrixData(matrix) = NULL;
-   if (nnz) hypre_CSRBlockMatrixJ(matrix) = hypre_CTAlloc(HYPRE_Int, num_nonzeros, HYPRE_MEMORY_HOST);
-   else     hypre_CSRBlockMatrixJ(matrix) = NULL;
+   if (nnz) { hypre_CSRBlockMatrixData(matrix) = hypre_CTAlloc(HYPRE_Complex,  nnz, HYPRE_MEMORY_HOST); }
+   else { hypre_CSRBlockMatrixData(matrix) = NULL; }
+   if (nnz) { hypre_CSRBlockMatrixJ(matrix) = hypre_CTAlloc(HYPRE_Int, num_nonzeros, HYPRE_MEMORY_HOST); }
+   else { hypre_CSRBlockMatrixJ(matrix) = NULL; }
 
    return ierr;
 }
@@ -101,29 +111,37 @@ hypre_CSRBlockMatrixInitialize(hypre_CSRBlockMatrix *matrix)
  * hypre_CSRBlockMatrixBigInitialize
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 hypre_CSRBlockMatrixBigInitialize(hypre_CSRBlockMatrix *matrix)
 {
    HYPRE_Int block_size   = hypre_CSRBlockMatrixBlockSize(matrix);
    HYPRE_Int num_rows     = hypre_CSRBlockMatrixNumRows(matrix);
    HYPRE_Int num_nonzeros = hypre_CSRBlockMatrixNumNonzeros(matrix);
-   HYPRE_Int ierr=0, nnz;
+   HYPRE_Int ierr = 0, nnz;
 
    if ( ! hypre_CSRBlockMatrixI(matrix) )
+   {
       hypre_TFree(hypre_CSRBlockMatrixI(matrix), HYPRE_MEMORY_HOST);
+   }
    if ( ! hypre_CSRBlockMatrixJ(matrix) )
+   {
       hypre_TFree(hypre_CSRBlockMatrixJ(matrix), HYPRE_MEMORY_HOST);
+   }
    if ( ! hypre_CSRBlockMatrixBigJ(matrix) )
+   {
       hypre_TFree(hypre_CSRBlockMatrixBigJ(matrix), HYPRE_MEMORY_HOST);
+   }
    if ( ! hypre_CSRBlockMatrixData(matrix) )
+   {
       hypre_TFree(hypre_CSRBlockMatrixData(matrix), HYPRE_MEMORY_HOST);
+   }
 
    nnz = num_nonzeros * block_size * block_size;
    hypre_CSRBlockMatrixI(matrix) = hypre_CTAlloc(HYPRE_Int,  num_rows + 1, HYPRE_MEMORY_HOST);
-   if (nnz) hypre_CSRBlockMatrixData(matrix) = hypre_CTAlloc(HYPRE_Complex,  nnz, HYPRE_MEMORY_HOST);
-   else     hypre_CSRBlockMatrixData(matrix) = NULL;
-   if (nnz) hypre_CSRBlockMatrixBigJ(matrix) = hypre_CTAlloc(HYPRE_BigInt, num_nonzeros, HYPRE_MEMORY_HOST);
-   else     hypre_CSRBlockMatrixJ(matrix) = NULL;
+   if (nnz) { hypre_CSRBlockMatrixData(matrix) = hypre_CTAlloc(HYPRE_Complex,  nnz, HYPRE_MEMORY_HOST); }
+   else { hypre_CSRBlockMatrixData(matrix) = NULL; }
+   if (nnz) { hypre_CSRBlockMatrixBigJ(matrix) = hypre_CTAlloc(HYPRE_BigInt, num_nonzeros, HYPRE_MEMORY_HOST); }
+   else { hypre_CSRBlockMatrixJ(matrix) = NULL; }
 
    return ierr;
 }
@@ -132,10 +150,10 @@ hypre_CSRBlockMatrixBigInitialize(hypre_CSRBlockMatrix *matrix)
  * hypre_CSRBlockMatrixSetDataOwner
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 hypre_CSRBlockMatrixSetDataOwner(hypre_CSRBlockMatrix *matrix, HYPRE_Int owns_data)
 {
-   HYPRE_Int    ierr=0;
+   HYPRE_Int    ierr = 0;
 
    hypre_CSRBlockMatrixOwnsData(matrix) = owns_data;
 
@@ -160,21 +178,23 @@ hypre_CSRBlockMatrixCompress(hypre_CSRBlockMatrix *matrix)
    HYPRE_Int     *matrix_C_i, *matrix_C_j, i, j, bnnz;
    HYPRE_Complex *matrix_C_data, ddata;
 
-   matrix_C = hypre_CSRMatrixCreate(num_rows,num_cols,num_nonzeros);
+   matrix_C = hypre_CSRMatrixCreate(num_rows, num_cols, num_nonzeros);
    hypre_CSRMatrixInitialize(matrix_C);
    matrix_C_i = hypre_CSRMatrixI(matrix_C);
    matrix_C_j = hypre_CSRMatrixJ(matrix_C);
    matrix_C_data = hypre_CSRMatrixData(matrix_C);
 
    bnnz = block_size * block_size;
-   for(i = 0; i < num_rows + 1; i++) matrix_C_i[i] = matrix_i[i];
-   for(i = 0; i < num_nonzeros; i++)
+   for (i = 0; i < num_rows + 1; i++) { matrix_C_i[i] = matrix_i[i]; }
+   for (i = 0; i < num_nonzeros; i++)
    {
       matrix_C_j[i] = matrix_j[i];
       ddata = 0.0;
-      for(j = 0; j < bnnz; j++)
-         ddata += matrix_data[i*bnnz+j] * matrix_data[i*bnnz+j];
-      matrix_C_data[i] = sqrt(ddata);
+      for (j = 0; j < bnnz; j++)
+      {
+         ddata += matrix_data[i * bnnz + j] * matrix_data[i * bnnz + j];
+      }
+      matrix_C_data[i] = hypre_sqrt(ddata);
    }
    return matrix_C;
 }
@@ -203,36 +223,36 @@ hypre_CSRBlockMatrixConvertToCSRMatrix( hypre_CSRBlockMatrix *matrix )
    new_nrows = num_rows * block_size;
    new_ncols = num_cols * block_size;
    new_num_nonzeros = block_size * block_size * num_nonzeros;
-   matrix_C = hypre_CSRMatrixCreate(new_nrows,new_ncols,new_num_nonzeros);
+   matrix_C = hypre_CSRMatrixCreate(new_nrows, new_ncols, new_num_nonzeros);
    hypre_CSRMatrixInitialize(matrix_C);
    matrix_C_i    = hypre_CSRMatrixI(matrix_C);
    matrix_C_j    = hypre_CSRMatrixJ(matrix_C);
    matrix_C_data = hypre_CSRMatrixData(matrix_C);
-   for(i = 0; i < num_rows; i++)
+   for (i = 0; i < num_rows; i++)
    {
-      for(j = 0; j < block_size; j++)
-         matrix_C_i[i*block_size + j] = matrix_i[i]*bnnz + 
-                               j * (matrix_i[i + 1] - matrix_i[i])*block_size;
+      for (j = 0; j < block_size; j++)
+         matrix_C_i[i * block_size + j] = matrix_i[i] * bnnz +
+                                          j * (matrix_i[i + 1] - matrix_i[i]) * block_size;
    }
    matrix_C_i[new_nrows] = matrix_i[num_rows] * bnnz;
 
    C_ii = 0;
-   for(i = 0; i < num_rows; i++)
+   for (i = 0; i < num_rows; i++)
    {
-      for(j = 0; j < block_size; j++)
+      for (j = 0; j < block_size; j++)
       {
-         for(ii = matrix_i[i]; ii < matrix_i[i + 1]; ii++)
+         for (ii = matrix_i[i]; ii < matrix_i[i + 1]; ii++)
          {
             k = j;
-            matrix_C_j[C_ii] = matrix_j[ii]*block_size + k;
-            matrix_C_data[C_ii] = matrix_data[ii*bnnz+j*block_size+k];
+            matrix_C_j[C_ii] = matrix_j[ii] * block_size + k;
+            matrix_C_data[C_ii] = matrix_data[ii * bnnz + j * block_size + k];
             C_ii++;
-            for(k = 0; k < block_size; k++)
+            for (k = 0; k < block_size; k++)
             {
-               if(j != k)
+               if (j != k)
                {
-                  matrix_C_j[C_ii] = matrix_j[ii]*block_size + k;
-                  matrix_C_data[C_ii] = matrix_data[ii*bnnz+j*block_size+k];
+                  matrix_C_j[C_ii] = matrix_j[ii] * block_size + k;
+                  matrix_C_data[C_ii] = matrix_data[ii * bnnz + j * block_size + k];
                   C_ii++;
                }
             }
@@ -251,7 +271,7 @@ hypre_CSRBlockMatrixConvertToCSRMatrix( hypre_CSRBlockMatrix *matrix )
  *--------------------------------------------------------------------------*/
 
 hypre_CSRBlockMatrix *
-hypre_CSRBlockMatrixConvertFromCSRMatrix(hypre_CSRMatrix *matrix, 
+hypre_CSRBlockMatrixConvertFromCSRMatrix(hypre_CSRMatrix *matrix,
                                          HYPRE_Int matrix_C_block_size )
 {
    HYPRE_Int num_rows = hypre_CSRMatrixNumRows(matrix);
@@ -266,53 +286,53 @@ hypre_CSRBlockMatrixConvertFromCSRMatrix(hypre_CSRMatrix *matrix,
    HYPRE_Int    matrix_C_num_rows, matrix_C_num_cols, matrix_C_num_nonzeros;
    HYPRE_Int    i, j, ii, jj, s_jj, index, *counter;
 
-   matrix_C_num_rows = num_rows/matrix_C_block_size;
-   matrix_C_num_cols = num_cols/matrix_C_block_size;
+   matrix_C_num_rows = num_rows / matrix_C_block_size;
+   matrix_C_num_cols = num_cols / matrix_C_block_size;
 
    counter = hypre_CTAlloc(HYPRE_Int,  matrix_C_num_cols, HYPRE_MEMORY_HOST);
-   for(i = 0; i < matrix_C_num_cols; i++) counter[i] = -1;
+   for (i = 0; i < matrix_C_num_cols; i++) { counter[i] = -1; }
    matrix_C_num_nonzeros = 0;
-   for(i = 0; i < matrix_C_num_rows; i++)
+   for (i = 0; i < matrix_C_num_rows; i++)
    {
-      for(j = 0; j < matrix_C_block_size; j++)
+      for (j = 0; j < matrix_C_block_size; j++)
       {
-         for(ii = matrix_i[i*matrix_C_block_size+j]; 
-             ii < matrix_i[i*matrix_C_block_size+j+1]; ii++)
+         for (ii = matrix_i[i * matrix_C_block_size + j];
+              ii < matrix_i[i * matrix_C_block_size + j + 1]; ii++)
          {
-            if(counter[matrix_j[ii]/matrix_C_block_size] < i)
+            if (counter[matrix_j[ii] / matrix_C_block_size] < i)
             {
-               counter[matrix_j[ii]/matrix_C_block_size] = i;
+               counter[matrix_j[ii] / matrix_C_block_size] = i;
                matrix_C_num_nonzeros++;
             }
          }
       }
    }
-   matrix_C = hypre_CSRBlockMatrixCreate(matrix_C_block_size, matrix_C_num_rows, 
-                                       matrix_C_num_cols, matrix_C_num_nonzeros);
+   matrix_C = hypre_CSRBlockMatrixCreate(matrix_C_block_size, matrix_C_num_rows,
+                                         matrix_C_num_cols, matrix_C_num_nonzeros);
    hypre_CSRBlockMatrixInitialize(matrix_C);
    matrix_C_i = hypre_CSRBlockMatrixI(matrix_C);
    matrix_C_j = hypre_CSRBlockMatrixJ(matrix_C);
    matrix_C_data = hypre_CSRBlockMatrixData(matrix_C);
- 
-   for(i = 0; i < matrix_C_num_cols; i++) counter[i] = -1;
+
+   for (i = 0; i < matrix_C_num_cols; i++) { counter[i] = -1; }
    jj = s_jj = 0;
    for (i = 0; i < matrix_C_num_rows; i++)
    {
       matrix_C_i[i] = jj;
-      for(j = 0; j < matrix_C_block_size; j++)
+      for (j = 0; j < matrix_C_block_size; j++)
       {
-         for(ii = matrix_i[i*matrix_C_block_size+j];
-             ii < matrix_i[i*matrix_C_block_size+j+1]; ii++)
+         for (ii = matrix_i[i * matrix_C_block_size + j];
+              ii < matrix_i[i * matrix_C_block_size + j + 1]; ii++)
          {
-            if(counter[matrix_j[ii]/matrix_C_block_size] < s_jj)
+            if (counter[matrix_j[ii] / matrix_C_block_size] < s_jj)
             {
-               counter[matrix_j[ii]/matrix_C_block_size] = jj;
-               matrix_C_j[jj] = matrix_j[ii]/matrix_C_block_size;
+               counter[matrix_j[ii] / matrix_C_block_size] = jj;
+               matrix_C_j[jj] = matrix_j[ii] / matrix_C_block_size;
                jj++;
             }
-            index = counter[matrix_j[ii]/matrix_C_block_size] * matrix_C_block_size *
-                    matrix_C_block_size + j * matrix_C_block_size + 
-                    matrix_j[ii]%matrix_C_block_size;
+            index = counter[matrix_j[ii] / matrix_C_block_size] * matrix_C_block_size *
+                    matrix_C_block_size + j * matrix_C_block_size +
+                    matrix_j[ii] % matrix_C_block_size;
             matrix_C_data[index] = matrix_data[ii];
          }
       }
@@ -321,14 +341,14 @@ hypre_CSRBlockMatrixConvertFromCSRMatrix(hypre_CSRMatrix *matrix,
    matrix_C_i[matrix_C_num_rows] = matrix_C_num_nonzeros;
 
    hypre_TFree(counter, HYPRE_MEMORY_HOST);
-   
+
 
    return matrix_C;
 }
 
 /*--------------------------------------------------------------------------
  * hypre_CSRBlockMatrixBlockAdd
- * (o = i1 + i2) 
+ * (o = i1 + i2)
  *--------------------------------------------------------------------------*/
 HYPRE_Int
 hypre_CSRBlockMatrixBlockAdd(HYPRE_Complex* i1,
@@ -337,10 +357,12 @@ hypre_CSRBlockMatrixBlockAdd(HYPRE_Complex* i1,
                              HYPRE_Int block_size)
 {
    HYPRE_Int i;
-   HYPRE_Int sz = block_size*block_size;
-   
+   HYPRE_Int sz = block_size * block_size;
+
    for (i = 0; i < sz; i++)
+   {
       o[i] = i1[i] + i2[i];
+   }
 
    return 0;
 }
@@ -348,7 +370,7 @@ hypre_CSRBlockMatrixBlockAdd(HYPRE_Complex* i1,
 
 /*--------------------------------------------------------------------------
  * hypre_CSRBlockMatrixBlockAddAccumulate
- * (o = i1 + o) 
+ * (o = i1 + o)
  *--------------------------------------------------------------------------*/
 HYPRE_Int
 hypre_CSRBlockMatrixBlockAddAccumulate(HYPRE_Complex* i1,
@@ -356,17 +378,19 @@ hypre_CSRBlockMatrixBlockAddAccumulate(HYPRE_Complex* i1,
                                        HYPRE_Int block_size)
 {
    HYPRE_Int i;
-   HYPRE_Int sz = block_size*block_size;
-   
+   HYPRE_Int sz = block_size * block_size;
+
    for (i = 0; i < sz; i++)
+   {
       o[i] += i1[i];
+   }
 
    return 0;
 }
 
 /*--------------------------------------------------------------------------
  * hypre_CSRBlockMatrixBlockAddAccumulateDiag
- * (diag(o) = diag(i1) + diag(o)) 
+ * (diag(o) = diag(i1) + diag(o))
  *--------------------------------------------------------------------------*/
 HYPRE_Int
 hypre_CSRBlockMatrixBlockAddAccumulateDiag(HYPRE_Complex* i1,
@@ -376,14 +400,16 @@ hypre_CSRBlockMatrixBlockAddAccumulateDiag(HYPRE_Complex* i1,
    HYPRE_Int i;
 
    for (i = 0; i < block_size; i++)
-         o[i*block_size+i] += i1[i*block_size+i];
+   {
+      o[i * block_size + i] += i1[i * block_size + i];
+   }
    return 0;
 }
 
 /*--------------------------------------------------------------------------
  * hypre_CSRBlockMatrixBlockAddAccumulateDiagCheckSign
  * only add elements of sign*i1 that are negative (sign is size block_size)
- * (diag(o) = diag(i1) + diag(o)) 
+ * (diag(o) = diag(i1) + diag(o))
  *--------------------------------------------------------------------------*/
 HYPRE_Int
 hypre_CSRBlockMatrixBlockAddAccumulateDiagCheckSign(HYPRE_Complex* i1,
@@ -396,18 +422,20 @@ hypre_CSRBlockMatrixBlockAddAccumulateDiagCheckSign(HYPRE_Complex* i1,
 
    for (i = 0; i < block_size; i++)
    {
-      tmp = (HYPRE_Real) i1[i*block_size+i]*sign[i];
-      if (tmp < 0) 
-         o[i*block_size+i] += i1[i*block_size+i];
+      tmp = (HYPRE_Real) i1[i * block_size + i] * sign[i];
+      if (tmp < 0)
+      {
+         o[i * block_size + i] += i1[i * block_size + i];
+      }
    }
-   
+
    return 0;
 }
 
 /*--------------------------------------------------------------------------
  *  hypre_CSRBlockMatrixComputeSign
 
- * o = sign(diag(i1)) 
+ * o = sign(diag(i1))
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int hypre_CSRBlockMatrixComputeSign(HYPRE_Complex *i1,
@@ -416,12 +444,16 @@ HYPRE_Int hypre_CSRBlockMatrixComputeSign(HYPRE_Complex *i1,
 {
    HYPRE_Int i;
 
-    for (i = 0; i < block_size; i++)
+   for (i = 0; i < block_size; i++)
    {
-      if ((HYPRE_Real) i1[i*block_size+i] < 0)
+      if ((HYPRE_Real) i1[i * block_size + i] < 0)
+      {
          o[i] = -1;
+      }
       else
+      {
          o[i] = 1;
+      }
    }
 
    return 0;
@@ -430,7 +462,7 @@ HYPRE_Int hypre_CSRBlockMatrixComputeSign(HYPRE_Complex *i1,
 
 /*--------------------------------------------------------------------------
  * hypre_CSRBlockMatrixBlockSetScalar
- * (each entry in block o is set to beta ) 
+ * (each entry in block o is set to beta )
  *--------------------------------------------------------------------------*/
 HYPRE_Int
 hypre_CSRBlockMatrixBlockSetScalar(HYPRE_Complex* o,
@@ -438,10 +470,12 @@ hypre_CSRBlockMatrixBlockSetScalar(HYPRE_Complex* o,
                                    HYPRE_Int block_size)
 {
    HYPRE_Int i;
-   HYPRE_Int sz = block_size*block_size;
-   
+   HYPRE_Int sz = block_size * block_size;
+
    for (i = 0; i < sz; i++)
+   {
       o[i] = beta;
+   }
 
    return 0;
 }
@@ -449,7 +483,7 @@ hypre_CSRBlockMatrixBlockSetScalar(HYPRE_Complex* o,
 
 /*--------------------------------------------------------------------------
  * hypre_CSRBlockMatrixBlockCopyData
- * (o = beta*i1 ) 
+ * (o = beta*i1 )
  *--------------------------------------------------------------------------*/
 HYPRE_Int
 hypre_CSRBlockMatrixBlockCopyData(HYPRE_Complex* i1,
@@ -458,17 +492,19 @@ hypre_CSRBlockMatrixBlockCopyData(HYPRE_Complex* i1,
                                   HYPRE_Int block_size)
 {
    HYPRE_Int i;
-   HYPRE_Int sz = block_size*block_size;
-   
+   HYPRE_Int sz = block_size * block_size;
+
    for (i = 0; i < sz; i++)
-      o[i] = beta*i1[i];
-   
+   {
+      o[i] = beta * i1[i];
+   }
+
    return 0;
 }
 
 /*--------------------------------------------------------------------------
  * hypre_CSRBlockMatrixBlockCopyDataDiag - zeros off-diag entries
- * (o = beta*diag(i1)) 
+ * (o = beta*diag(i1))
  *--------------------------------------------------------------------------*/
 HYPRE_Int
 hypre_CSRBlockMatrixBlockCopyDataDiag(HYPRE_Complex* i1,
@@ -476,22 +512,26 @@ hypre_CSRBlockMatrixBlockCopyDataDiag(HYPRE_Complex* i1,
                                       HYPRE_Complex beta,
                                       HYPRE_Int block_size)
 {
-    HYPRE_Int i;
+   HYPRE_Int i;
 
-    HYPRE_Int sz = block_size*block_size;
-   
-    for (i = 0; i < sz; i++)
-       o[i] = 0.0;
+   HYPRE_Int sz = block_size * block_size;
 
-    for (i = 0; i < block_size; i++)
-       o[i*block_size+i] = beta*i1[i*block_size+i];
+   for (i = 0; i < sz; i++)
+   {
+      o[i] = 0.0;
+   }
+
+   for (i = 0; i < block_size; i++)
+   {
+      o[i * block_size + i] = beta * i1[i * block_size + i];
+   }
 
    return 0;
 }
 
 /*--------------------------------------------------------------------------
  * hypre_CSRBlockMatrixBlockTranspose
- * (o = i1' ) 
+ * (o = i1' )
  *--------------------------------------------------------------------------*/
 HYPRE_Int
 hypre_CSRBlockMatrixBlockTranspose(HYPRE_Complex* i1,
@@ -502,31 +542,34 @@ hypre_CSRBlockMatrixBlockTranspose(HYPRE_Complex* i1,
 
    for (i = 0; i < block_size; i++)
       for (j = 0; j < block_size; j++)
-         o[i*block_size+j] = i1[j*block_size+i];
+      {
+         o[i * block_size + j] = i1[j * block_size + i];
+      }
    return 0;
 }
 
 /*--------------------------------------------------------------------------
  * hypre_CSRBlockMatrixBlockNorm
- * (out = norm(data) ) 
+ * (out = norm(data) )
  *
  *  (note: these are not all actually "norms")
- *  
+ *
  *--------------------------------------------------------------------------*/
 HYPRE_Int
-hypre_CSRBlockMatrixBlockNorm(HYPRE_Int norm_type, HYPRE_Complex* data, HYPRE_Real* out, HYPRE_Int block_size)
+hypre_CSRBlockMatrixBlockNorm(HYPRE_Int norm_type, HYPRE_Complex* data, HYPRE_Real* out,
+                              HYPRE_Int block_size)
 {
    HYPRE_Int ierr = 0;
-   HYPRE_Int i,j;
+   HYPRE_Int i, j;
    HYPRE_Real sum = 0.0;
    HYPRE_Real *totals;
-   HYPRE_Int sz = block_size*block_size;
+   HYPRE_Int sz = block_size * block_size;
 
    switch (norm_type)
    {
       case 6: /* sum of all elements in the block  */
       {
-         for(i = 0; i < sz; i++) 
+         for (i = 0; i < sz; i++)
          {
             sum += (HYPRE_Real)(data[i]);
          }
@@ -534,65 +577,65 @@ hypre_CSRBlockMatrixBlockNorm(HYPRE_Int norm_type, HYPRE_Complex* data, HYPRE_Re
       }
       case 5: /* one norm  - max col sum*/
       {
-        
+
          totals = hypre_CTAlloc(HYPRE_Real,  block_size, HYPRE_MEMORY_HOST);
-         for(i = 0; i < block_size; i++) /* row */
+         for (i = 0; i < block_size; i++) /* row */
          {
-            for(j = 0; j < block_size; j++) /* col */
+            for (j = 0; j < block_size; j++) /* col */
             {
-               totals[j] += hypre_cabs(data[i*block_size + j]);
+               totals[j] += hypre_cabs(data[i * block_size + j]);
             }
          }
 
          sum = totals[0];
-         for(j = 1; j < block_size; j++) /* col */
+         for (j = 1; j < block_size; j++) /* col */
          {
-            if (totals[j] > sum) sum = totals[j];
+            if (totals[j] > sum) { sum = totals[j]; }
          }
          hypre_TFree(totals, HYPRE_MEMORY_HOST);
-         
+
          break;
-         
+
       }
       case 4: /* inf norm - max row sum */
       {
-      
+
          totals = hypre_CTAlloc(HYPRE_Real,  block_size, HYPRE_MEMORY_HOST);
-         for(i = 0; i < block_size; i++) /* row */
+         for (i = 0; i < block_size; i++) /* row */
          {
-            for(j = 0; j < block_size; j++) /* col */
+            for (j = 0; j < block_size; j++) /* col */
             {
-               totals[i] += hypre_cabs(data[i*block_size + j]);
+               totals[i] += hypre_cabs(data[i * block_size + j]);
             }
          }
 
          sum = totals[0];
-         for(i = 1; i < block_size; i++) /* row */
+         for (i = 1; i < block_size; i++) /* row */
          {
-            if (totals[i] > sum) sum = totals[i];
+            if (totals[i] > sum) { sum = totals[i]; }
          }
          hypre_TFree(totals, HYPRE_MEMORY_HOST);
-         
+
          break;
       }
 
       case 3: /* largest element of block (return value includes sign) */
       {
-      
+
          sum = (HYPRE_Real)data[0];
-  
-         for(i = 0; i < sz; i++) 
+
+         for (i = 0; i < sz; i++)
          {
-            if (hypre_cabs(data[i]) > hypre_cabs(sum))  sum = (HYPRE_Real)data[i];
+            if (hypre_cabs(data[i]) > hypre_cabs(sum)) { sum = (HYPRE_Real)data[i]; }
          }
-         
+
          break;
       }
       case 2: /* sum of abs values of all elements in the block  */
       {
-         for(i = 0; i < sz; i++) 
+         for (i = 0; i < sz; i++)
          {
-               sum += hypre_cabs(data[i]);
+            sum += hypre_cabs(data[i]);
          }
          break;
       }
@@ -600,27 +643,27 @@ hypre_CSRBlockMatrixBlockNorm(HYPRE_Int norm_type, HYPRE_Complex* data, HYPRE_Re
 
       default: /* 1 = frobenius*/
       {
-          for(i = 0; i < sz; i++) 
-          {
-             sum += ((HYPRE_Real)data[i])*((HYPRE_Real)data[i]);
-          }
-          sum = sqrt(sum);
+         for (i = 0; i < sz; i++)
+         {
+            sum += ((HYPRE_Real)data[i]) * ((HYPRE_Real)data[i]);
+         }
+         sum = hypre_sqrt(sum);
       }
    }
-   
+
    *out = sum;
-   
+
    return ierr;
 }
 
 /*--------------------------------------------------------------------------
  * hypre_CSRBlockMatrixBlockMultAdd
- * (o = i1 * i2 + beta * o) 
+ * (o = i1 * i2 + beta * o)
  *--------------------------------------------------------------------------*/
 HYPRE_Int
 hypre_CSRBlockMatrixBlockMultAdd(HYPRE_Complex* i1,
                                  HYPRE_Complex* i2,
-                                 HYPRE_Complex beta, 
+                                 HYPRE_Complex beta,
                                  HYPRE_Complex* o,
                                  HYPRE_Int block_size)
 {
@@ -628,8 +671,8 @@ hypre_CSRBlockMatrixBlockMultAdd(HYPRE_Complex* i1,
 #if LB_VERSION
    {
       HYPRE_Complex alp = 1.0;
-      dgemm_("N","N", &block_size, &block_size, &block_size, &alp, i2, &block_size, i1,
-          &block_size, &beta, o, &block_size);
+      dgemm_("N", "N", &block_size, &block_size, &block_size, &alp, i2, &block_size, i1,
+             &block_size, &beta, o, &block_size);
    }
 #else
    {
@@ -645,40 +688,44 @@ hypre_CSRBlockMatrixBlockMultAdd(HYPRE_Complex* i1,
                ddata = 0.0;
                for (k = 0; k < block_size; k++)
                {
-                  ddata += i1[i*block_size + k] * i2[k*block_size + j];
+                  ddata += i1[i * block_size + k] * i2[k * block_size + j];
                }
-               o[i*block_size + j] = ddata;
+               o[i * block_size + j] = ddata;
             }
          }
       }
       else if (beta == 1.0)
       {
-         for(i = 0; i < block_size; i++)
+         for (i = 0; i < block_size; i++)
          {
-            for(j = 0; j < block_size; j++)
+            for (j = 0; j < block_size; j++)
             {
-               ddata = o[i*block_size + j];
-               for(k = 0; k < block_size; k++)
-                  ddata += i1[i*block_size + k] * i2[k*block_size + j];
-               o[i*block_size + j] = ddata;
+               ddata = o[i * block_size + j];
+               for (k = 0; k < block_size; k++)
+               {
+                  ddata += i1[i * block_size + k] * i2[k * block_size + j];
+               }
+               o[i * block_size + j] = ddata;
             }
          }
       }
       else
       {
-         for(i = 0; i < block_size; i++)
+         for (i = 0; i < block_size; i++)
          {
-            for(j = 0; j < block_size; j++)
+            for (j = 0; j < block_size; j++)
             {
-               ddata = beta * o[i*block_size + j];
-               for(k = 0; k < block_size; k++)
-                  ddata += i1[i*block_size + k] * i2[k*block_size + j];
-               o[i*block_size + j] = ddata;
+               ddata = beta * o[i * block_size + j];
+               for (k = 0; k < block_size; k++)
+               {
+                  ddata += i1[i * block_size + k] * i2[k * block_size + j];
+               }
+               o[i * block_size + j] = ddata;
             }
          }
       }
    }
-   
+
 #endif
 
    return 0;
@@ -687,12 +734,12 @@ hypre_CSRBlockMatrixBlockMultAdd(HYPRE_Complex* i1,
 
 /*--------------------------------------------------------------------------
  * hypre_CSRBlockMatrixBlockMultAddDiag
- * (diag(o) = diag(i1) * diag(i2) + beta * diag(o)) 
+ * (diag(o) = diag(i1) * diag(i2) + beta * diag(o))
  *--------------------------------------------------------------------------*/
 HYPRE_Int
 hypre_CSRBlockMatrixBlockMultAddDiag(HYPRE_Complex* i1,
                                      HYPRE_Complex* i2,
-                                     HYPRE_Complex beta, 
+                                     HYPRE_Complex beta,
                                      HYPRE_Complex* o,
                                      HYPRE_Int block_size)
 {
@@ -702,21 +749,22 @@ hypre_CSRBlockMatrixBlockMultAddDiag(HYPRE_Complex* i1,
    {
       for (i = 0; i < block_size; i++)
       {
-         o[i*block_size + i] = i1[i*block_size + i] * i2[i*block_size + i];
+         o[i * block_size + i] = i1[i * block_size + i] * i2[i * block_size + i];
       }
    }
    else if (beta == 1.0)
    {
-      for(i = 0; i < block_size; i++)
+      for (i = 0; i < block_size; i++)
       {
-         o[i*block_size + i] = o[i*block_size + i] + i1[i*block_size + i] * i2[i*block_size + i];
+         o[i * block_size + i] = o[i * block_size + i] + i1[i * block_size + i] * i2[i * block_size + i];
       }
    }
    else
    {
-      for(i = 0; i < block_size; i++)
+      for (i = 0; i < block_size; i++)
       {
-            o[i*block_size + i] = beta* o[i*block_size + i] + i1[i*block_size + i] * i2[i*block_size + i];
+         o[i * block_size + i] = beta * o[i * block_size + i] + i1[i * block_size + i] * i2[i * block_size +
+                                                                                            i];
       }
    }
    return 0;
@@ -724,14 +772,14 @@ hypre_CSRBlockMatrixBlockMultAddDiag(HYPRE_Complex* i1,
 
 /*--------------------------------------------------------------------------
  * hypre_CSRBlockMatrixBlockMultAddDiagCheckSign
- * 
+ *
  *  only mult elements if sign*diag(i2) is negative
- *(diag(o) = diag(i1) * diag(i2) + beta * diag(o)) 
+ *(diag(o) = diag(i1) * diag(i2) + beta * diag(o))
  *--------------------------------------------------------------------------*/
 HYPRE_Int
 hypre_CSRBlockMatrixBlockMultAddDiagCheckSign(HYPRE_Complex *i1,
                                               HYPRE_Complex *i2,
-                                              HYPRE_Complex  beta, 
+                                              HYPRE_Complex  beta,
                                               HYPRE_Complex *o,
                                               HYPRE_Int      block_size,
                                               HYPRE_Real    *sign)
@@ -743,27 +791,34 @@ hypre_CSRBlockMatrixBlockMultAddDiagCheckSign(HYPRE_Complex *i1,
    {
       for (i = 0; i < block_size; i++)
       {
-         tmp = (HYPRE_Real) i2[i*block_size+i]*sign[i];
+         tmp = (HYPRE_Real) i2[i * block_size + i] * sign[i];
          if (tmp < 0)
-            o[i*block_size + i] = i1[i*block_size + i] * i2[i*block_size + i];
+         {
+            o[i * block_size + i] = i1[i * block_size + i] * i2[i * block_size + i];
+         }
       }
    }
    else if (beta == 1.0)
    {
-      for(i = 0; i < block_size; i++)
+      for (i = 0; i < block_size; i++)
       {
-         tmp = (HYPRE_Real) i2[i*block_size+i]*sign[i];
+         tmp = (HYPRE_Real) i2[i * block_size + i] * sign[i];
          if (tmp < 0)
-            o[i*block_size + i] = o[i*block_size + i] + i1[i*block_size + i] * i2[i*block_size + i];
+         {
+            o[i * block_size + i] = o[i * block_size + i] + i1[i * block_size + i] * i2[i * block_size + i];
+         }
       }
    }
    else
    {
-      for(i = 0; i < block_size; i++)
+      for (i = 0; i < block_size; i++)
       {
-         tmp = i2[i*block_size+i]*sign[i];
+         tmp = i2[i * block_size + i] * sign[i];
          if (tmp < 0)
-            o[i*block_size + i] = beta* o[i*block_size + i] + i1[i*block_size + i] * i2[i*block_size + i];
+         {
+            o[i * block_size + i] = beta * o[i * block_size + i] + i1[i * block_size + i] * i2[i * block_size +
+                                                                                               i];
+         }
       }
    }
    return 0;
@@ -771,12 +826,12 @@ hypre_CSRBlockMatrixBlockMultAddDiagCheckSign(HYPRE_Complex *i1,
 
 /*--------------------------------------------------------------------------
  * hypre_CSRBlockMatrixBlockMultAddDiag2 (scales cols of il by diag of i2)
- * ((o) = (i1) * diag(i2) + beta * (o)) 
+ * ((o) = (i1) * diag(i2) + beta * (o))
  *--------------------------------------------------------------------------*/
 HYPRE_Int
 hypre_CSRBlockMatrixBlockMultAddDiag2(HYPRE_Complex* i1,
                                       HYPRE_Complex* i2,
-                                      HYPRE_Complex beta, 
+                                      HYPRE_Complex beta,
                                       HYPRE_Complex* o,
                                       HYPRE_Int block_size)
 {
@@ -788,8 +843,8 @@ hypre_CSRBlockMatrixBlockMultAddDiag2(HYPRE_Complex* i1,
       {
          for (j = 0; j < block_size; j++)
          {
-            o[i*block_size + j] =  i1[i*block_size + j] * i2[j*block_size + j];
-            
+            o[i * block_size + j] =  i1[i * block_size + j] * i2[j * block_size + j];
+
          }
       }
    }
@@ -799,8 +854,8 @@ hypre_CSRBlockMatrixBlockMultAddDiag2(HYPRE_Complex* i1,
       {
          for (j = 0; j < block_size; j++)
          {
-            o[i*block_size + j] =  o[i*block_size + j] +  i1[i*block_size + j] * i2[j*block_size + j];
-            
+            o[i * block_size + j] =  o[i * block_size + j] +  i1[i * block_size + j] * i2[j * block_size + j];
+
          }
       }
 
@@ -808,12 +863,13 @@ hypre_CSRBlockMatrixBlockMultAddDiag2(HYPRE_Complex* i1,
    }
    else
    {
-     for (i = 0; i < block_size; i++)
+      for (i = 0; i < block_size; i++)
       {
          for (j = 0; j < block_size; j++)
          {
-            o[i*block_size + j] =  beta * o[i*block_size + j] +  i1[i*block_size + j] * i2[j*block_size + j];
-            
+            o[i * block_size + j] =  beta * o[i * block_size + j] +  i1[i * block_size + j] * i2[j * block_size
+                                                                                                 + j];
+
          }
       }
    }
@@ -821,14 +877,14 @@ hypre_CSRBlockMatrixBlockMultAddDiag2(HYPRE_Complex* i1,
 }
 
 /*--------------------------------------------------------------------------
- * hypre_CSRBlockMatrixBlockMultAddDiag3 (scales cols of il by i2 - 
+ * hypre_CSRBlockMatrixBlockMultAddDiag3 (scales cols of il by i2 -
                                           whose diag elements are row sums)
- * ((o) = (i1) * diag(i2) + beta * (o)) 
+ * ((o) = (i1) * diag(i2) + beta * (o))
  *--------------------------------------------------------------------------*/
 HYPRE_Int
 hypre_CSRBlockMatrixBlockMultAddDiag3(HYPRE_Complex* i1,
                                       HYPRE_Complex* i2,
-                                      HYPRE_Complex beta, 
+                                      HYPRE_Complex beta,
                                       HYPRE_Complex* o,
                                       HYPRE_Int block_size)
 {
@@ -838,21 +894,21 @@ hypre_CSRBlockMatrixBlockMultAddDiag3(HYPRE_Complex* i1,
 
    row_sum = hypre_CTAlloc(HYPRE_Complex,  block_size, HYPRE_MEMORY_HOST);
    for (i = 0; i < block_size; i++)
+   {
+      for (j = 0; j < block_size; j++)
       {
-         for (j = 0; j < block_size; j++)
-         {
-            row_sum[i] +=  i2[i*block_size + j];
-         }
+         row_sum[i] +=  i2[i * block_size + j];
       }
-   
+   }
+
    if (beta == 0.0)
    {
       for (i = 0; i < block_size; i++)
       {
          for (j = 0; j < block_size; j++)
          {
-            o[i*block_size + j] =  i1[i*block_size + j] * row_sum[j];
-            
+            o[i * block_size + j] =  i1[i * block_size + j] * row_sum[j];
+
          }
       }
    }
@@ -862,39 +918,39 @@ hypre_CSRBlockMatrixBlockMultAddDiag3(HYPRE_Complex* i1,
       {
          for (j = 0; j < block_size; j++)
          {
-            o[i*block_size + j] =  o[i*block_size + j] +  i1[i*block_size + j] * row_sum[j];
-            
+            o[i * block_size + j] =  o[i * block_size + j] +  i1[i * block_size + j] * row_sum[j];
+
          }
       }
    }
    else
    {
-     for (i = 0; i < block_size; i++)
+      for (i = 0; i < block_size; i++)
       {
          for (j = 0; j < block_size; j++)
          {
-            o[i*block_size + j] =  beta * o[i*block_size + j] +  i1[i*block_size + j] * row_sum[j];
-            
+            o[i * block_size + j] =  beta * o[i * block_size + j] +  i1[i * block_size + j] * row_sum[j];
+
          }
       }
    }
 
    hypre_TFree(row_sum, HYPRE_MEMORY_HOST);
-      
+
    return 0;
 }
 /*--------------------------------------------------------------------------
  * hypre_CSRBlockMatrixBlockMatvec
  * (ov = alpha* mat * v + beta * ov)
- * mat is the matrix - size is block_size^2 
+ * mat is the matrix - size is block_size^2
  * alpha and beta are scalars
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 hypre_CSRBlockMatrixBlockMatvec(HYPRE_Complex alpha,
                                 HYPRE_Complex* mat,
                                 HYPRE_Complex* v,
-                                HYPRE_Complex beta, 
+                                HYPRE_Complex beta,
                                 HYPRE_Complex* ov,
                                 HYPRE_Int block_size)
 {
@@ -907,7 +963,7 @@ hypre_CSRBlockMatrixBlockMatvec(HYPRE_Complex alpha,
       dgemv_("T",  &block_size, &block_size, &alpha, mat, &block_size, v,
              &one, &beta, ov, &one);
    }
-   
+
 #else
    {
       HYPRE_Int    i, j;
@@ -922,7 +978,7 @@ hypre_CSRBlockMatrixBlockMatvec(HYPRE_Complex alpha,
          }
          return ierr;
       }
-      
+
       /* ov = (beta/alpha) * ov; */
       ddata = beta / alpha;
       if (ddata != 1.0)
@@ -934,7 +990,7 @@ hypre_CSRBlockMatrixBlockMatvec(HYPRE_Complex alpha,
                ov[j] = 0.0;
             }
          }
-         else 
+         else
          {
             for (j = 0; j < block_size; j++)
             {
@@ -942,18 +998,18 @@ hypre_CSRBlockMatrixBlockMatvec(HYPRE_Complex alpha,
             }
          }
       }
-      
+
       /* ov = ov + mat*v */
       for (i = 0; i < block_size; i++)
       {
          ddata =  ov[i];
          for (j = 0; j < block_size; j++)
          {
-            ddata += mat[i*block_size + j] * v[j];
+            ddata += mat[i * block_size + j] * v[j];
          }
          ov[i] = ddata;
       }
-      
+
       /* ov = alpha*ov */
       if (alpha != 1.0)
       {
@@ -963,28 +1019,28 @@ hypre_CSRBlockMatrixBlockMatvec(HYPRE_Complex alpha,
          }
       }
    }
-   
+
 #endif
 
    return ierr;
-   
+
 }
 
 
 /*--------------------------------------------------------------------------
  * hypre_CSRBlockMatrixBlockInvMatvec
- * (ov = mat^{-1} * v) 
+ * (ov = mat^{-1} * v)
  * o and v are vectors
- * mat is the matrix - size is block_size^2 
+ * mat is the matrix - size is block_size^2
  *--------------------------------------------------------------------------*/
 HYPRE_Int
-hypre_CSRBlockMatrixBlockInvMatvec(HYPRE_Complex* mat, HYPRE_Complex* v, 
+hypre_CSRBlockMatrixBlockInvMatvec(HYPRE_Complex* mat, HYPRE_Complex* v,
                                    HYPRE_Complex* ov, HYPRE_Int block_size)
 {
    HYPRE_Int ierr = 0;
    HYPRE_Complex *mat_i;
 
-   mat_i = hypre_CTAlloc(HYPRE_Complex,  block_size*block_size, HYPRE_MEMORY_HOST);
+   mat_i = hypre_CTAlloc(HYPRE_Complex,  block_size * block_size, HYPRE_MEMORY_HOST);
 
 #if LB_VERSION
    {
@@ -992,41 +1048,41 @@ hypre_CSRBlockMatrixBlockInvMatvec(HYPRE_Complex* mat, HYPRE_Complex* v,
       HYPRE_Int one, info;
       HYPRE_Int *piv;
       HYPRE_Int sz;
-      
-      
+
+
       one = 1;
       piv = hypre_CTAlloc(HYPRE_Int,  block_size, HYPRE_MEMORY_HOST);
-      sz = block_size*block_size;
-      
+      sz = block_size * block_size;
 
-     /* copy v to ov and  mat to mat_i*/
+
+      /* copy v to ov and  mat to mat_i*/
 
       dcopy_(&sz, mat, &one, mat_i, &one);
       dcopy_(&block_size, v, &one, ov, &one);
-      
+
       /* writes over mat_i with LU */
-      dgetrf_(&block_size,&block_size, mat_i, &block_size, piv , &info);
-      if (info) 
+      dgetrf_(&block_size, &block_size, mat_i, &block_size, piv, &info);
+      if (info)
       {
          hypre_TFree(mat_i, HYPRE_MEMORY_HOST);
          hypre_TFree(piv, HYPRE_MEMORY_HOST);
-         return(-1);
+         return (-1);
       }
-      
+
       /* writes over ov */
-      dgetrs_("T", &block_size, &one , 
-           mat_i, &block_size, piv, ov, &block_size, &info);
-      if (info) 
+      dgetrs_("T", &block_size, &one,
+              mat_i, &block_size, piv, ov, &block_size, &info);
+      if (info)
       {
          hypre_TFree(mat_i, HYPRE_MEMORY_HOST);
          hypre_TFree(piv, HYPRE_MEMORY_HOST);
-         return(-1);
+         return (-1);
       }
 
       hypre_TFree(piv, HYPRE_MEMORY_HOST);
 
    }
-   
+
 #else
    {
       HYPRE_Int m, j, k;
@@ -1035,78 +1091,78 @@ hypre_CSRBlockMatrixBlockInvMatvec(HYPRE_Complex* mat, HYPRE_Complex* v,
       HYPRE_Complex factor;
       HYPRE_Complex piv, tmp;
       eps = 1.0e-6;
-      
-      if (block_size ==1 )
+
+      if (block_size == 1 )
       {
          if (hypre_cabs(mat[0]) > 1e-10)
          {
-            ov[0] = v[0]/mat[0];
+            ov[0] = v[0] / mat[0];
             hypre_TFree(mat_i, HYPRE_MEMORY_HOST);
-            return(ierr);
+            return (ierr);
          }
          else
          {
             /* hypre_printf("GE zero pivot error\n"); */
             hypre_TFree(mat_i, HYPRE_MEMORY_HOST);
-            return(-1);
+            return (-1);
          }
       }
       else
       {
          /* copy v to ov and mat to mat_i*/
-         for (k = 0; k < block_size; k++)   
+         for (k = 0; k < block_size; k++)
          {
             ov[k] = v[k];
-            for (j=0; j<block_size; j++)
+            for (j = 0; j < block_size; j++)
             {
-               mat_i[k*block_size + j] =  mat[k*block_size + j];
+               mat_i[k * block_size + j] =  mat[k * block_size + j];
             }
          }
-         /* start ge  - turning m_i into U factor (don't save L - just apply to 
+         /* start ge  - turning m_i into U factor (don't save L - just apply to
             rhs - which is ov)*/
          /* we do partial pivoting for size */
-         
-         /* loop through the rows (row k) */ 
-         for (k = 0; k < block_size-1; k++)
+
+         /* loop through the rows (row k) */
+         for (k = 0; k < block_size - 1; k++)
          {
-            piv = mat_i[k*block_size+k];
+            piv = mat_i[k * block_size + k];
             piv_row = k;
-            
+
             /* find the largest pivot in position k*/
-            for (j=k+1; j < block_size; j++)         
+            for (j = k + 1; j < block_size; j++)
             {
-               if (hypre_cabs(mat_i[j*block_size+k]) > hypre_cabs(piv))
+               if (hypre_cabs(mat_i[j * block_size + k]) > hypre_cabs(piv))
                {
-                  piv =  mat_i[j*block_size+k];
+                  piv =  mat_i[j * block_size + k];
                   piv_row = j;
                }
-               
+
             }
-            if (piv_row !=k) /* do a row exchange  - rows k and piv_row*/
+            if (piv_row != k) /* do a row exchange  - rows k and piv_row*/
             {
-               for (j=0; j < block_size; j++)
+               for (j = 0; j < block_size; j++)
                {
-                  tmp = mat_i[k*block_size + j];
-                  mat_i[k*block_size + j] = mat_i[piv_row*block_size + j];
-                  mat_i[piv_row*block_size + j] = tmp;
+                  tmp = mat_i[k * block_size + j];
+                  mat_i[k * block_size + j] = mat_i[piv_row * block_size + j];
+                  mat_i[piv_row * block_size + j] = tmp;
                }
                tmp = ov[k];
                ov[k] = ov[piv_row];
                ov[piv_row] = tmp;
             }
             /* end of pivoting */
-            
+
             if (hypre_cabs(piv) > eps)
             {
                /* now we can factor into U */
-               for (j = k+1; j < block_size; j++)
+               for (j = k + 1; j < block_size; j++)
                {
-                  factor = mat_i[j*block_size+k]/piv;
-                  for (m = k+1; m < block_size; m++)
+                  factor = mat_i[j * block_size + k] / piv;
+                  for (m = k + 1; m < block_size; m++)
                   {
-                     mat_i[j*block_size+m]  -= factor * mat_i[k*block_size+m];
+                     mat_i[j * block_size + m]  -= factor * mat_i[k * block_size + m];
                   }
-                  /* Elimination step for rhs */ 
+                  /* Elimination step for rhs */
                   ov[j]  -= factor * ov[k];
                }
             }
@@ -1114,41 +1170,41 @@ hypre_CSRBlockMatrixBlockInvMatvec(HYPRE_Complex* mat, HYPRE_Complex* v,
             {
                /* hypre_printf("Block of matrix is nearly singular: zero pivot error\n");  */
                hypre_TFree(mat_i, HYPRE_MEMORY_HOST);
-               return(-1);
+               return (-1);
             }
          }
 
-         /* we also need to check the pivot in the last row to see if it is zero */  
+         /* we also need to check the pivot in the last row to see if it is zero */
          k = block_size - 1; /* last row */
-         if ( hypre_cabs(mat_i[k*block_size+k]) < eps)
+         if ( hypre_cabs(mat_i[k * block_size + k]) < eps)
          {
             /* hypre_printf("Block of matrix is nearly singular: zero pivot error\n");  */
             hypre_TFree(mat_i, HYPRE_MEMORY_HOST);
-            return(-1);
+            return (-1);
          }
-         
+
          /* Back Substitution  - do rhs (U is now in m_i1)*/
-         for (k = block_size-1; k > 0; --k)
+         for (k = block_size - 1; k > 0; --k)
          {
-            ov[k] /= mat_i[k*block_size+k];
+            ov[k] /= mat_i[k * block_size + k];
             for (j = 0; j < k; j++)
             {
-               if (mat_i[j*block_size+k] != 0.0)
+               if (mat_i[j * block_size + k] != 0.0)
                {
-                  ov[j] -= ov[k] * mat_i[j*block_size+k];
+                  ov[j] -= ov[k] * mat_i[j * block_size + k];
                }
             }
          }
          ov[0] /= mat_i[0];
-         
+
       }
-      
+
    }
 #endif
-  
+
 
    hypre_TFree(mat_i, HYPRE_MEMORY_HOST);
-   
+
    return (ierr);
 }
 
@@ -1156,17 +1212,18 @@ hypre_CSRBlockMatrixBlockInvMatvec(HYPRE_Complex* mat, HYPRE_Complex* v,
 
 /*--------------------------------------------------------------------------
  * hypre_CSRBlockMatrixBlockInvMult
- * (o = i1^{-1} * i2) 
+ * (o = i1^{-1} * i2)
  *--------------------------------------------------------------------------*/
 HYPRE_Int
-hypre_CSRBlockMatrixBlockInvMult(HYPRE_Complex* i1, HYPRE_Complex* i2, HYPRE_Complex* o, HYPRE_Int block_size)
+hypre_CSRBlockMatrixBlockInvMult(HYPRE_Complex* i1, HYPRE_Complex* i2, HYPRE_Complex* o,
+                                 HYPRE_Int block_size)
 {
 
    HYPRE_Int ierr = 0;
    HYPRE_Int i, j;
    HYPRE_Complex *m_i1;
 
-   m_i1 = hypre_CTAlloc(HYPRE_Complex,  block_size*block_size, HYPRE_MEMORY_HOST);
+   m_i1 = hypre_CTAlloc(HYPRE_Complex,  block_size * block_size, HYPRE_MEMORY_HOST);
 
 #if LB_VERSION
    {
@@ -1174,63 +1231,63 @@ hypre_CSRBlockMatrixBlockInvMult(HYPRE_Complex* i1, HYPRE_Complex* i2, HYPRE_Com
       HYPRE_Int one, info;
       HYPRE_Int *piv;
       HYPRE_Int sz;
-      
+
       HYPRE_Complex *i2_t;
 
       one = 1;
-      i2_t = hypre_CTAlloc(HYPRE_Complex,  block_size*block_size, HYPRE_MEMORY_HOST);
+      i2_t = hypre_CTAlloc(HYPRE_Complex,  block_size * block_size, HYPRE_MEMORY_HOST);
       piv = hypre_CTAlloc(HYPRE_Int,  block_size, HYPRE_MEMORY_HOST);
-      
 
-     /* copy i1 to m_i1*/
-      sz = block_size*block_size;
+
+      /* copy i1 to m_i1*/
+      sz = block_size * block_size;
       dcopy_(&sz, i1, &one, m_i1, &one);
 
 
       /* writes over m_i1 with LU */
-      dgetrf_(&block_size, &block_size, m_i1, &block_size, piv , &info);
-      if (info) 
+      dgetrf_(&block_size, &block_size, m_i1, &block_size, piv, &info);
+      if (info)
       {
          hypre_TFree(m_i1, HYPRE_MEMORY_HOST);
          hypre_TFree(i2_t, HYPRE_MEMORY_HOST);
          hypre_TFree(piv, HYPRE_MEMORY_HOST);
          return (-1);
       }
-      
+
       /* need the transpose of i_2*/
-     for (i=0; i < block_size; i++)
-     {
-        for (j=0; j< block_size; j++)
-        {
-           i2_t[i*block_size+j] = i2[j*block_size+i];  
-        }
-     }
-     
+      for (i = 0; i < block_size; i++)
+      {
+         for (j = 0; j < block_size; j++)
+         {
+            i2_t[i * block_size + j] = i2[j * block_size + i];
+         }
+      }
+
       /* writes over i2_t */
-      dgetrs_("T", &block_size, &block_size, 
-           m_i1, &block_size, piv, i2_t, &block_size, &info);
-      if (info) 
+      dgetrs_("T", &block_size, &block_size,
+              m_i1, &block_size, piv, i2_t, &block_size, &info);
+      if (info)
       {
          hypre_TFree(m_i1, HYPRE_MEMORY_HOST);
          hypre_TFree(i2_t, HYPRE_MEMORY_HOST);
          hypre_TFree(piv, HYPRE_MEMORY_HOST);
          return (-1);
       }
-   
+
       /* ans. is the transpose of i2_t*/
-      for (i=0; i < block_size; i++)
+      for (i = 0; i < block_size; i++)
       {
-         for (j=0; j< block_size; j++)
+         for (j = 0; j < block_size; j++)
          {
-            o[i*block_size+j] = i2_t[j*block_size+i];  
+            o[i * block_size + j] = i2_t[j * block_size + i];
          }
       }
-     
+
       hypre_TFree(i2_t, HYPRE_MEMORY_HOST);
       hypre_TFree(piv, HYPRE_MEMORY_HOST);
-      
+
    }
-   
+
 #else
    {
       HYPRE_Int m, k;
@@ -1238,87 +1295,87 @@ hypre_CSRBlockMatrixBlockInvMult(HYPRE_Complex* i1, HYPRE_Complex* i2, HYPRE_Com
       HYPRE_Real eps;
       HYPRE_Complex factor;
       HYPRE_Complex piv, tmp;
-      
+
       eps = 1.0e-6;
-      
-      if (block_size ==1 )
+
+      if (block_size == 1 )
       {
          if (hypre_cabs(m_i1[0]) > 1e-10)
          {
-            o[0] = i2[0]/i1[0];
+            o[0] = i2[0] / i1[0];
             hypre_TFree(m_i1, HYPRE_MEMORY_HOST);
-            return(ierr);
+            return (ierr);
          }
          else
          {
             /* hypre_printf("GE zero pivot error\n"); */
             hypre_TFree(m_i1, HYPRE_MEMORY_HOST);
-            return(-1);
+            return (-1);
          }
       }
       else
       {
          /* copy i2 to o and i1 to m_i1*/
-         for (k = 0; k < block_size*block_size; k++)   
+         for (k = 0; k < block_size * block_size; k++)
          {
             o[k] = i2[k];
             m_i1[k] = i1[k];
          }
-         
-         
-         /* start ge  - turning m_i1 into U factor (don't save L - just apply to 
+
+
+         /* start ge  - turning m_i1 into U factor (don't save L - just apply to
             rhs - which is o)*/
          /* we do partial pivoting for size */
-         
-         /* loop through the rows (row k) */ 
-         for (k = 0; k < block_size-1; k++)
+
+         /* loop through the rows (row k) */
+         for (k = 0; k < block_size - 1; k++)
          {
-            piv = m_i1[k*block_size+k];
+            piv = m_i1[k * block_size + k];
             piv_row = k;
-            
+
             /* find the largest pivot in position k*/
-            for (j=k+1; j < block_size; j++)         
+            for (j = k + 1; j < block_size; j++)
             {
-               if (hypre_cabs(m_i1[j*block_size+k]) > hypre_cabs(piv))
+               if (hypre_cabs(m_i1[j * block_size + k]) > hypre_cabs(piv))
                {
-                  piv =  m_i1[j*block_size+k];
+                  piv =  m_i1[j * block_size + k];
                   piv_row = j;
                }
-               
+
             }
-            if (piv_row !=k) /* do a row exchange  - rows k and piv_row*/
+            if (piv_row != k) /* do a row exchange  - rows k and piv_row*/
             {
-               for (j=0; j < block_size; j++)
+               for (j = 0; j < block_size; j++)
                {
-                  tmp = m_i1[k*block_size + j];
-                  m_i1[k*block_size + j] = m_i1[piv_row*block_size + j];
-                  m_i1[piv_row*block_size + j] = tmp;
-                  
-                  tmp = o[k*block_size + j];
-                  o[k*block_size + j] = o[piv_row*block_size + j];
-                  o[piv_row*block_size + j] = tmp;
-                  
+                  tmp = m_i1[k * block_size + j];
+                  m_i1[k * block_size + j] = m_i1[piv_row * block_size + j];
+                  m_i1[piv_row * block_size + j] = tmp;
+
+                  tmp = o[k * block_size + j];
+                  o[k * block_size + j] = o[piv_row * block_size + j];
+                  o[piv_row * block_size + j] = tmp;
+
                }
             }
             /* end of pivoting */
-            
-            
+
+
             if (hypre_cabs(piv) > eps)
             {
                /* now we can factor into U */
-               for (j = k+1; j < block_size; j++)
+               for (j = k + 1; j < block_size; j++)
                {
-                  factor = m_i1[j*block_size+k]/piv;
-                  for (m = k+1; m < block_size; m++)
+                  factor = m_i1[j * block_size + k] / piv;
+                  for (m = k + 1; m < block_size; m++)
                   {
-                     m_i1[j*block_size+m]  -= factor * m_i1[k*block_size+m];
+                     m_i1[j * block_size + m]  -= factor * m_i1[k * block_size + m];
                   }
-                  /* Elimination step for rhs */ 
+                  /* Elimination step for rhs */
                   /* do for each of the "rhs" */
-                  for (i=0; i < block_size; i++)
+                  for (i = 0; i < block_size; i++)
                   {
-                     /* o(row, col) = o(row*block_size + col) */ 
-                     o[j*block_size+i] -= factor * o[k*block_size + i];              
+                     /* o(row, col) = o(row*block_size + col) */
+                     o[j * block_size + i] -= factor * o[k * block_size + i];
                   }
                }
             }
@@ -1326,90 +1383,91 @@ hypre_CSRBlockMatrixBlockInvMult(HYPRE_Complex* i1, HYPRE_Complex* i2, HYPRE_Com
             {
                /* hypre_printf("Block of matrix is nearly singular: zero pivot error\n"); */
                hypre_TFree(m_i1, HYPRE_MEMORY_HOST);
-               return(-1);
+               return (-1);
             }
          }
 
 
-         /* we also need to check the pivot in the last row to see if it is zero */  
+         /* we also need to check the pivot in the last row to see if it is zero */
          k = block_size - 1; /* last row */
-         if ( hypre_cabs(m_i1[k*block_size+k]) < eps)
+         if ( hypre_cabs(m_i1[k * block_size + k]) < eps)
          {
             /* hypre_printf("Block of matrix is nearly singular: zero pivot error\n"); */
             hypre_TFree(m_i1, HYPRE_MEMORY_HOST);
-            return(-1);
+            return (-1);
          }
-         
-         
+
+
          /* Back Substitution  - do for each "rhs" (U is now in m_i1)*/
-         for (i=0; i < block_size; i++)
+         for (i = 0; i < block_size; i++)
          {
-            for (k = block_size-1; k > 0; --k)
+            for (k = block_size - 1; k > 0; --k)
             {
-               o[k*block_size + i] /= m_i1[k*block_size+k];
+               o[k * block_size + i] /= m_i1[k * block_size + k];
                for (j = 0; j < k; j++)
                {
-                  if (m_i1[j*block_size+k] != 0.0)
+                  if (m_i1[j * block_size + k] != 0.0)
                   {
-                     o[j*block_size + i] -= o[k*block_size + i] * m_i1[j*block_size+k];
+                     o[j * block_size + i] -= o[k * block_size + i] * m_i1[j * block_size + k];
                   }
                }
             }
-            o[0*block_size + i] /= m_i1[0];
+            o[0 * block_size + i] /= m_i1[0];
          }
       }
    }
-   
+
 #endif
    hypre_TFree(m_i1, HYPRE_MEMORY_HOST);
-   
+
    return ierr;
 }
 
 
 /*--------------------------------------------------------------------------
  * hypre_CSRBlockMatrixBlockMultInv
- * (o = i2*il^(-1)) 
+ * (o = i2*il^(-1))
  *--------------------------------------------------------------------------*/
 HYPRE_Int
-hypre_CSRBlockMatrixBlockMultInv(HYPRE_Complex* i1, HYPRE_Complex* i2, HYPRE_Complex* o, HYPRE_Int block_size)
+hypre_CSRBlockMatrixBlockMultInv(HYPRE_Complex* i1, HYPRE_Complex* i2, HYPRE_Complex* o,
+                                 HYPRE_Int block_size)
 {
 
    HYPRE_Int ierr = 0;
- 
-   
+
+
 #if LB_VERSION
-   
+
    {
-     /* same as solving A^T C^T = B^T */
+      /* same as solving A^T C^T = B^T */
       HYPRE_Complex *m_i1;
       HYPRE_Int info;
       HYPRE_Int *piv;
       HYPRE_Int sz, one;
-      
+
 
       piv = hypre_CTAlloc(HYPRE_Int,  block_size, HYPRE_MEMORY_HOST);
-      m_i1 = hypre_CTAlloc(HYPRE_Complex,  block_size*block_size, HYPRE_MEMORY_HOST);
+      m_i1 = hypre_CTAlloc(HYPRE_Complex,  block_size * block_size, HYPRE_MEMORY_HOST);
       one = 1;
-      sz = block_size*block_size;
+      sz = block_size * block_size;
 
-     /* copy i1 to m_i1 and i2 to o*/
+      /* copy i1 to m_i1 and i2 to o*/
 
       dcopy_(&sz, i1, &one, m_i1, &one);
       dcopy_(&sz, i2, &one, o, &one);
 
       /* writes over m_i1 with LU */
-      dgetrf_(&block_size, &block_size, m_i1, &block_size, piv , &info);
-      if (info) 
+      dgetrf_(&block_size, &block_size, m_i1, &block_size, piv, &info);
+      if (info)
       {
          hypre_TFree(m_i1, HYPRE_MEMORY_HOST);
          hypre_TFree(piv, HYPRE_MEMORY_HOST);
          return (-1);
       }
-     /* writes over B */
-      dgetrs_("N", &block_size, &block_size, 
-           m_i1, &block_size, piv, o, &block_size, &info);
-      if (info) 
+      /* writes over B */
+      dgetrs_("N", &block_size, &block_size,
+              m_i1, &block_size, piv, o, &block_size, &info);
+      if (info)
       {
          hypre_TFree(m_i1, HYPRE_MEMORY_HOST);
          hypre_TFree(piv, HYPRE_MEMORY_HOST);
@@ -1419,49 +1477,49 @@ hypre_CSRBlockMatrixBlockMultInv(HYPRE_Complex* i1, HYPRE_Complex* i2, HYPRE_Com
       hypre_TFree(m_i1, HYPRE_MEMORY_HOST);
       hypre_TFree(piv, HYPRE_MEMORY_HOST);
    }
-   
+
 #else
    {
       HYPRE_Real     eps;
       HYPRE_Complex *i1_t, *i2_t, *o_t;
-      
+
       eps = 1.0e-12;
-      
-      if (block_size ==1 )
+
+      if (block_size == 1 )
       {
          if (hypre_cabs(i1[0]) > eps)
          {
-            o[0] = i2[0]/i1[0];
-            return(ierr);
+            o[0] = i2[0] / i1[0];
+            return (ierr);
          }
          else
          {
             /* hypre_printf("GE zero pivot error\n"); */
-            return(-1);
+            return (-1);
          }
       }
       else
       {
-         
-         i1_t = hypre_CTAlloc(HYPRE_Complex,  block_size*block_size, HYPRE_MEMORY_HOST);
-         i2_t = hypre_CTAlloc(HYPRE_Complex,  block_size*block_size, HYPRE_MEMORY_HOST);
-         o_t = hypre_CTAlloc(HYPRE_Complex,  block_size*block_size, HYPRE_MEMORY_HOST);
-         
-         /* TO DO:: this could be done more efficiently! */  
+
+         i1_t = hypre_CTAlloc(HYPRE_Complex,  block_size * block_size, HYPRE_MEMORY_HOST);
+         i2_t = hypre_CTAlloc(HYPRE_Complex,  block_size * block_size, HYPRE_MEMORY_HOST);
+         o_t = hypre_CTAlloc(HYPRE_Complex,  block_size * block_size, HYPRE_MEMORY_HOST);
+
+         /* TO DO:: this could be done more efficiently! */
          hypre_CSRBlockMatrixBlockTranspose(i1, i1_t, block_size);
          hypre_CSRBlockMatrixBlockTranspose(i2, i2_t, block_size);
          ierr = hypre_CSRBlockMatrixBlockInvMult(i1_t, i2_t, o_t, block_size);
-         
-         if (!ierr) hypre_CSRBlockMatrixBlockTranspose(o_t, o, block_size);
-         
+
+         if (!ierr) { hypre_CSRBlockMatrixBlockTranspose(o_t, o, block_size); }
+
          hypre_TFree(i1_t, HYPRE_MEMORY_HOST);
          hypre_TFree(i2_t, HYPRE_MEMORY_HOST);
          hypre_TFree(o_t, HYPRE_MEMORY_HOST);
-         
+
       }
    }
-   
-#endif   
+
+#endif
    return (ierr);
 }
 
@@ -1469,43 +1527,47 @@ hypre_CSRBlockMatrixBlockMultInv(HYPRE_Complex* i1, HYPRE_Complex* i2, HYPRE_Com
 
 /*--------------------------------------------------------------------------
  * hypre_CSRBlockMatrixBlockInvMultDiag - zeros off-d entires
- * (o = diag(i1)^{-1} * diag(i2)) 
+ * (o = diag(i1)^{-1} * diag(i2))
  *--------------------------------------------------------------------------*/
 HYPRE_Int
-hypre_CSRBlockMatrixBlockInvMultDiag(HYPRE_Complex* i1, HYPRE_Complex* i2, HYPRE_Complex* o, HYPRE_Int block_size)
+hypre_CSRBlockMatrixBlockInvMultDiag(HYPRE_Complex* i1, HYPRE_Complex* i2, HYPRE_Complex* o,
+                                     HYPRE_Int block_size)
 {
 
    HYPRE_Int  ierr = 0;
    HYPRE_Int  i;
-   HYPRE_Int  sz = block_size*block_size;
+   HYPRE_Int  sz = block_size * block_size;
    HYPRE_Real eps = 1.0e-8;
-   
+
    for (i = 0; i < sz; i++)
+   {
       o[i] = 0.0;
-   
+   }
+
    for (i = 0; i < block_size; i++)
    {
-      if (hypre_cabs(i1[i*block_size + i]) > eps)
+      if (hypre_cabs(i1[i * block_size + i]) > eps)
       {
-         o[i*block_size + i] = i2[i*block_size + i] / i1[i*block_size + i];
+         o[i * block_size + i] = i2[i * block_size + i] / i1[i * block_size + i];
       }
       else
       {
          /* hypre_printf("GE zero pivot error\n"); */
-         return(-1);
+         return (-1);
       }
    }
-   
+
    return (ierr);
 }
 
 /*--------------------------------------------------------------------------
  * hypre_CSRBlockMatrixBlockInvMultDiag2
- * (o = (i1)* diag(i2)^-1) - so this scales the cols of il by 
-                             the diag entries in i2 
+ * (o = (i1)* diag(i2)^-1) - so this scales the cols of il by
+                             the diag entries in i2
  *--------------------------------------------------------------------------*/
 HYPRE_Int
-hypre_CSRBlockMatrixBlockInvMultDiag2(HYPRE_Complex* i1, HYPRE_Complex* i2, HYPRE_Complex* o, HYPRE_Int block_size)
+hypre_CSRBlockMatrixBlockInvMultDiag2(HYPRE_Complex* i1, HYPRE_Complex* i2, HYPRE_Complex* o,
+                                      HYPRE_Int block_size)
 {
 
    HYPRE_Int ierr = 0;
@@ -1513,50 +1575,51 @@ hypre_CSRBlockMatrixBlockInvMultDiag2(HYPRE_Complex* i1, HYPRE_Complex* i2, HYPR
 
    HYPRE_Real    eps = 1.0e-8;
    HYPRE_Complex tmp;
-   
+
    for (i = 0; i < block_size; i++)
    {
-      if (hypre_cabs(i2[i*block_size + i]) > eps)
+      if (hypre_cabs(i2[i * block_size + i]) > eps)
       {
-         tmp = 1 / i2[i*block_size + i];
+         tmp = 1 / i2[i * block_size + i];
       }
       else
       {
          tmp = 1.0;
       }
-      for (j=0; j< block_size; j++)  /* this should be re-written to access by row (not col)! */
+      for (j = 0; j < block_size; j++) /* this should be re-written to access by row (not col)! */
       {
-         o[j*block_size + i] = i1[j*block_size + i] *tmp;
+         o[j * block_size + i] = i1[j * block_size + i] * tmp;
       }
    }
-   
+
    return (ierr);
 }
 
 
 /*--------------------------------------------------------------------------
  * hypre_CSRBlockMatrixBlockInvMultDiag3
- * (o = (i1)* diag(i2)^-1) - so this scales the cols of il by 
-                             the i2 whose diags are row sums 
+ * (o = (i1)* diag(i2)^-1) - so this scales the cols of il by
+                             the i2 whose diags are row sums
  *--------------------------------------------------------------------------*/
 HYPRE_Int
-hypre_CSRBlockMatrixBlockInvMultDiag3(HYPRE_Complex* i1, HYPRE_Complex* i2, HYPRE_Complex* o, HYPRE_Int block_size)
+hypre_CSRBlockMatrixBlockInvMultDiag3(HYPRE_Complex* i1, HYPRE_Complex* i2, HYPRE_Complex* o,
+                                      HYPRE_Int block_size)
 {
 
    HYPRE_Int ierr = 0;
    HYPRE_Int i, j;
    HYPRE_Real    eps = 1.0e-8;
    HYPRE_Complex tmp, row_sum;
-   
+
    for (i = 0; i < block_size; i++)
    {
       /* get row sum of i2, row i */
       row_sum = 0.0;
-      for (j=0; j< block_size; j++)  
+      for (j = 0; j < block_size; j++)
       {
-         row_sum += i2[i*block_size + j];   
+         row_sum += i2[i * block_size + j];
       }
-      
+
       /* invert */
       if (hypre_cabs(row_sum) > eps)
       {
@@ -1567,12 +1630,12 @@ hypre_CSRBlockMatrixBlockInvMultDiag3(HYPRE_Complex* i1, HYPRE_Complex* i2, HYPR
          tmp = 1.0;
       }
       /* scale col of i1 */
-      for (j=0; j< block_size; j++)  /* this should be re-written to access by row (not col)! */
+      for (j = 0; j < block_size; j++) /* this should be re-written to access by row (not col)! */
       {
-         o[j*block_size + i] = i1[j*block_size + i] *tmp;
+         o[j * block_size + i] = i1[j * block_size + i] * tmp;
       }
    }
-   
+
    return (ierr);
 }
 
@@ -1583,8 +1646,8 @@ hypre_CSRBlockMatrixBlockInvMultDiag3(HYPRE_Complex* i1, HYPRE_Complex* i2, HYPR
  * hypre_CSRBlockMatrixTranspose
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int hypre_CSRBlockMatrixTranspose(hypre_CSRBlockMatrix *A, 
-                                  hypre_CSRBlockMatrix **AT, HYPRE_Int data)
+HYPRE_Int hypre_CSRBlockMatrixTranspose(hypre_CSRBlockMatrix *A,
+                                        hypre_CSRBlockMatrix **AT, HYPRE_Int data)
 
 {
    HYPRE_Complex       *A_data = hypre_CSRBlockMatrixData(A);
@@ -1605,35 +1668,35 @@ HYPRE_Int hypre_CSRBlockMatrixTranspose(hypre_CSRBlockMatrix *A,
    HYPRE_Int           max_col;
    HYPRE_Int           i, j, k, m, offset, bnnz;
 
-   /*-------------------------------------------------------------- 
-    * First, ascertain that num_cols and num_nonzeros has been set. 
+   /*--------------------------------------------------------------
+    * First, ascertain that num_cols and num_nonzeros has been set.
     * If not, set them.
     *--------------------------------------------------------------*/
 
-   if (! num_nonzerosA) num_nonzerosA = A_i[num_rowsA];
+   if (! num_nonzerosA) { num_nonzerosA = A_i[num_rowsA]; }
    if (num_rowsA && ! num_colsA)
    {
       max_col = -1;
       for (i = 0; i < num_rowsA; ++i)
-         for (j = A_i[i]; j < A_i[i+1]; j++)
-            if (A_j[j] > max_col) max_col = A_j[j];
-      num_colsA = max_col+1;
+         for (j = A_i[i]; j < A_i[i + 1]; j++)
+            if (A_j[j] > max_col) { max_col = A_j[j]; }
+      num_colsA = max_col + 1;
    }
    num_rowsAT = num_colsA;
    num_colsAT = num_rowsA;
    num_nonzerosAT = num_nonzerosA;
    bnnz = block_size * block_size;
 
-   *AT = hypre_CSRBlockMatrixCreate(block_size, num_rowsAT, num_colsAT, 
+   *AT = hypre_CSRBlockMatrixCreate(block_size, num_rowsAT, num_colsAT,
                                     num_nonzerosAT);
 
-   AT_i = hypre_CTAlloc(HYPRE_Int,  num_rowsAT+1, HYPRE_MEMORY_HOST);
+   AT_i = hypre_CTAlloc(HYPRE_Int,  num_rowsAT + 1, HYPRE_MEMORY_HOST);
    AT_j = hypre_CTAlloc(HYPRE_Int,  num_nonzerosAT, HYPRE_MEMORY_HOST);
    hypre_CSRBlockMatrixI(*AT) = AT_i;
    hypre_CSRBlockMatrixJ(*AT) = AT_j;
-   if (data) 
+   if (data)
    {
-      AT_data = hypre_CTAlloc(HYPRE_Complex,  num_nonzerosAT*bnnz, HYPRE_MEMORY_HOST);
+      AT_data = hypre_CTAlloc(HYPRE_Complex,  num_nonzerosAT * bnnz, HYPRE_MEMORY_HOST);
       hypre_CSRBlockMatrixData(*AT) = AT_data;
    }
 
@@ -1642,8 +1705,8 @@ HYPRE_Int hypre_CSRBlockMatrixTranspose(hypre_CSRBlockMatrix *A,
     * and fill the AT_i array.
     *-----------------------------------------------------------------*/
 
-   for (i = 0; i < num_nonzerosA; i++) ++AT_i[A_j[i]+1];
-   for (i = 2; i <= num_rowsAT; i++) AT_i[i] += AT_i[i-1];
+   for (i = 0; i < num_nonzerosA; i++) { ++AT_i[A_j[i] + 1]; }
+   for (i = 2; i <= num_rowsAT; i++) { AT_i[i] += AT_i[i - 1]; }
 
    /*----------------------------------------------------------------
     * Load the data and column numbers of AT
@@ -1651,7 +1714,7 @@ HYPRE_Int hypre_CSRBlockMatrixTranspose(hypre_CSRBlockMatrix *A,
 
    for (i = 0; i < num_rowsA; i++)
    {
-      for (j = A_i[i]; j < A_i[i+1]; j++)
+      for (j = A_i[i]; j < A_i[i + 1]; j++)
       {
          AT_j[AT_i[A_j[j]]] = i;
          if (data)
@@ -1659,8 +1722,8 @@ HYPRE_Int hypre_CSRBlockMatrixTranspose(hypre_CSRBlockMatrix *A,
             offset = AT_i[A_j[j]] * bnnz;
             for (k = 0; k < block_size; k++)
                for (m = 0; m < block_size; m++)
-                  AT_data[offset+k*block_size+m] = 
-                       A_data[j*bnnz+m*block_size+k];
+                  AT_data[offset + k * block_size + m] =
+                     A_data[j * bnnz + m * block_size + k];
          }
          AT_i[A_j[j]]++;
       }
@@ -1671,9 +1734,8 @@ HYPRE_Int hypre_CSRBlockMatrixTranspose(hypre_CSRBlockMatrix *A,
     * instead of the beginning.  Restore AT_i to front of row.
     *------------------------------------------------------------*/
 
-   for (i = num_rowsAT; i > 0; i--) AT_i[i] = AT_i[i-1];
+   for (i = num_rowsAT; i > 0; i--) { AT_i[i] = AT_i[i - 1]; }
    AT_i[0] = 0;
 
-   return(0);
+   return (0);
 }
-
diff --git a/external/hypre/src/parcsr_block_mv/csr_block_matrix.h b/external/hypre/src/parcsr_block_mv/csr_block_matrix.h
index 3f4bbdac..c05ba0d5 100644
--- a/external/hypre/src/parcsr_block_mv/csr_block_matrix.h
+++ b/external/hypre/src/parcsr_block_mv/csr_block_matrix.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -31,15 +31,15 @@ extern "C" {
 
 typedef struct
 {
-  HYPRE_Complex    *data;
-  HYPRE_Int        *i;
-  HYPRE_Int        *j;
-  HYPRE_BigInt     *big_j;
-  HYPRE_Int         block_size;
-  HYPRE_Int         num_rows;
-  HYPRE_Int         num_cols;
-  HYPRE_Int         num_nonzeros;
-  HYPRE_Int         owns_data;
+   HYPRE_Complex    *data;
+   HYPRE_Int        *i;
+   HYPRE_Int        *j;
+   HYPRE_BigInt     *big_j;
+   HYPRE_Int         block_size;
+   HYPRE_Int         num_rows;
+   HYPRE_Int         num_cols;
+   HYPRE_Int         num_nonzeros;
+   HYPRE_Int         owns_data;
 
 } hypre_CSRBlockMatrix;
 
@@ -61,81 +61,97 @@ typedef struct
  * other functions for the CSR Block Matrix structure
  *--------------------------------------------------------------------------*/
 
-hypre_CSRBlockMatrix 
-      *hypre_CSRBlockMatrixCreate(HYPRE_Int, HYPRE_Int, HYPRE_Int, HYPRE_Int);
+hypre_CSRBlockMatrix
+*hypre_CSRBlockMatrixCreate(HYPRE_Int, HYPRE_Int, HYPRE_Int, HYPRE_Int);
 HYPRE_Int hypre_CSRBlockMatrixDestroy(hypre_CSRBlockMatrix *);
 HYPRE_Int hypre_CSRBlockMatrixInitialize(hypre_CSRBlockMatrix *);
 HYPRE_Int hypre_CSRBlockMatrixBigInitialize(hypre_CSRBlockMatrix *);
 HYPRE_Int hypre_CSRBlockMatrixSetDataOwner(hypre_CSRBlockMatrix *, HYPRE_Int);
-hypre_CSRMatrix 
-      *hypre_CSRBlockMatrixCompress(hypre_CSRBlockMatrix *);
-hypre_CSRMatrix 
-      *hypre_CSRBlockMatrixConvertToCSRMatrix(hypre_CSRBlockMatrix *);
+hypre_CSRMatrix
+*hypre_CSRBlockMatrixCompress(hypre_CSRBlockMatrix *);
+hypre_CSRMatrix
+*hypre_CSRBlockMatrixConvertToCSRMatrix(hypre_CSRBlockMatrix *);
 hypre_CSRBlockMatrix
-      *hypre_CSRBlockMatrixConvertFromCSRMatrix(hypre_CSRMatrix *, HYPRE_Int);
+*hypre_CSRBlockMatrixConvertFromCSRMatrix(hypre_CSRMatrix *, HYPRE_Int);
 HYPRE_Int hypre_CSRBlockMatrixBlockAdd(HYPRE_Complex *, HYPRE_Complex *, HYPRE_Complex*, HYPRE_Int);
 
-HYPRE_Int hypre_CSRBlockMatrixBlockMultAdd(HYPRE_Complex *, HYPRE_Complex *, HYPRE_Complex, HYPRE_Complex *, HYPRE_Int);
-HYPRE_Int hypre_CSRBlockMatrixBlockMultAddDiag(HYPRE_Complex *, HYPRE_Complex *, HYPRE_Complex, HYPRE_Complex *, HYPRE_Int);
+HYPRE_Int hypre_CSRBlockMatrixBlockMultAdd(HYPRE_Complex *, HYPRE_Complex *, HYPRE_Complex,
+                                           HYPRE_Complex *, HYPRE_Int);
+HYPRE_Int hypre_CSRBlockMatrixBlockMultAddDiag(HYPRE_Complex *, HYPRE_Complex *, HYPRE_Complex,
+                                               HYPRE_Complex *, HYPRE_Int);
 HYPRE_Int
-hypre_CSRBlockMatrixBlockMultAddDiag2(HYPRE_Complex* i1, HYPRE_Complex* i2, HYPRE_Complex beta, 
+hypre_CSRBlockMatrixBlockMultAddDiag2(HYPRE_Complex* i1, HYPRE_Complex* i2, HYPRE_Complex beta,
                                       HYPRE_Complex* o, HYPRE_Int block_size);
 HYPRE_Int
-hypre_CSRBlockMatrixBlockMultAddDiag3(HYPRE_Complex* i1, HYPRE_Complex* i2, HYPRE_Complex beta, 
+hypre_CSRBlockMatrixBlockMultAddDiag3(HYPRE_Complex* i1, HYPRE_Complex* i2, HYPRE_Complex beta,
                                       HYPRE_Complex* o, HYPRE_Int block_size);
-   
 
-HYPRE_Int hypre_CSRBlockMatrixBlockInvMult(HYPRE_Complex *, HYPRE_Complex *, HYPRE_Complex *, HYPRE_Int);
-HYPRE_Int hypre_CSRBlockMatrixBlockInvMultDiag(HYPRE_Complex *, HYPRE_Complex *, HYPRE_Complex *, HYPRE_Int);
+
+HYPRE_Int hypre_CSRBlockMatrixBlockInvMult(HYPRE_Complex *, HYPRE_Complex *, HYPRE_Complex *,
+                                           HYPRE_Int);
+HYPRE_Int hypre_CSRBlockMatrixBlockInvMultDiag(HYPRE_Complex *, HYPRE_Complex *, HYPRE_Complex *,
+                                               HYPRE_Int);
 
 HYPRE_Int
-hypre_CSRBlockMatrixBlockInvMultDiag2(HYPRE_Complex* i1, HYPRE_Complex* i2, HYPRE_Complex* o, HYPRE_Int block_size);
-   
+hypre_CSRBlockMatrixBlockInvMultDiag2(HYPRE_Complex* i1, HYPRE_Complex* i2, HYPRE_Complex* o,
+                                      HYPRE_Int block_size);
+
 HYPRE_Int
-hypre_CSRBlockMatrixBlockInvMultDiag3(HYPRE_Complex* i1, HYPRE_Complex* i2, HYPRE_Complex* o, HYPRE_Int block_size);
-   
+hypre_CSRBlockMatrixBlockInvMultDiag3(HYPRE_Complex* i1, HYPRE_Complex* i2, HYPRE_Complex* o,
+                                      HYPRE_Int block_size);
 
 
 
-HYPRE_Int hypre_CSRBlockMatrixBlockMultInv(HYPRE_Complex *, HYPRE_Complex *, HYPRE_Complex *, HYPRE_Int);
+
+HYPRE_Int hypre_CSRBlockMatrixBlockMultInv(HYPRE_Complex *, HYPRE_Complex *, HYPRE_Complex *,
+                                           HYPRE_Int);
 HYPRE_Int hypre_CSRBlockMatrixBlockTranspose(HYPRE_Complex *, HYPRE_Complex *, HYPRE_Int);
 
 HYPRE_Int hypre_CSRBlockMatrixTranspose(hypre_CSRBlockMatrix *A,
-                                  hypre_CSRBlockMatrix **AT, HYPRE_Int data);
+                                        hypre_CSRBlockMatrix **AT, HYPRE_Int data);
 
-HYPRE_Int hypre_CSRBlockMatrixBlockCopyData(HYPRE_Complex*, HYPRE_Complex*, HYPRE_Complex, HYPRE_Int);
-HYPRE_Int hypre_CSRBlockMatrixBlockCopyDataDiag(HYPRE_Complex*, HYPRE_Complex*, HYPRE_Complex, HYPRE_Int);
+HYPRE_Int hypre_CSRBlockMatrixBlockCopyData(HYPRE_Complex*, HYPRE_Complex*, HYPRE_Complex,
+                                            HYPRE_Int);
+HYPRE_Int hypre_CSRBlockMatrixBlockCopyDataDiag(HYPRE_Complex*, HYPRE_Complex*, HYPRE_Complex,
+                                                HYPRE_Int);
 
 HYPRE_Int hypre_CSRBlockMatrixBlockAddAccumulate(HYPRE_Complex*, HYPRE_Complex*, HYPRE_Int);
-HYPRE_Int hypre_CSRBlockMatrixBlockAddAccumulateDiag(HYPRE_Complex* i1, HYPRE_Complex* o, HYPRE_Int block_size);
-   
+HYPRE_Int hypre_CSRBlockMatrixBlockAddAccumulateDiag(HYPRE_Complex* i1, HYPRE_Complex* o,
+                                                     HYPRE_Int block_size);
+
 
 
 HYPRE_Int
 hypre_CSRBlockMatrixMatvec(HYPRE_Complex alpha, hypre_CSRBlockMatrix *A,
                            hypre_Vector *x, HYPRE_Complex beta, hypre_Vector *y);
-   
+
 
 HYPRE_Int
 hypre_CSRBlockMatrixMatvecT( HYPRE_Complex alpha, hypre_CSRBlockMatrix *A, hypre_Vector  *x,
                              HYPRE_Complex beta, hypre_Vector *y );
 
 HYPRE_Int
-hypre_CSRBlockMatrixBlockInvMatvec(HYPRE_Complex* mat, HYPRE_Complex* v, 
+hypre_CSRBlockMatrixBlockInvMatvec(HYPRE_Complex* mat, HYPRE_Complex* v,
                                    HYPRE_Complex* ov, HYPRE_Int block_size);
-   
-HYPRE_Int 
-hypre_CSRBlockMatrixBlockMatvec(HYPRE_Complex alpha, HYPRE_Complex* mat, HYPRE_Complex* v, HYPRE_Complex beta, 
+
+HYPRE_Int
+hypre_CSRBlockMatrixBlockMatvec(HYPRE_Complex alpha, HYPRE_Complex* mat, HYPRE_Complex* v,
+                                HYPRE_Complex beta,
                                 HYPRE_Complex* ov, HYPRE_Int block_size);
-   
-
-HYPRE_Int hypre_CSRBlockMatrixBlockNorm(HYPRE_Int norm_type, HYPRE_Complex* data, HYPRE_Real* out, HYPRE_Int block_size);
-   
-HYPRE_Int hypre_CSRBlockMatrixBlockSetScalar(HYPRE_Complex* o, HYPRE_Complex beta, HYPRE_Int block_size);
-   
-HYPRE_Int hypre_CSRBlockMatrixComputeSign(HYPRE_Complex *i1, HYPRE_Complex *o, HYPRE_Int block_size);
-HYPRE_Int hypre_CSRBlockMatrixBlockAddAccumulateDiagCheckSign(HYPRE_Complex* i1, HYPRE_Complex* o, HYPRE_Int block_size, HYPRE_Real *sign);
-HYPRE_Int hypre_CSRBlockMatrixBlockMultAddDiagCheckSign(HYPRE_Complex* i1, HYPRE_Complex* i2, HYPRE_Complex beta, HYPRE_Complex* o, HYPRE_Int block_size, HYPRE_Real *sign);
+
+
+HYPRE_Int hypre_CSRBlockMatrixBlockNorm(HYPRE_Int norm_type, HYPRE_Complex* data, HYPRE_Real* out,
+                                        HYPRE_Int block_size);
+
+HYPRE_Int hypre_CSRBlockMatrixBlockSetScalar(HYPRE_Complex* o, HYPRE_Complex beta,
+                                             HYPRE_Int block_size);
+
+HYPRE_Int hypre_CSRBlockMatrixComputeSign(HYPRE_Complex *i1, HYPRE_Complex *o,
+                                          HYPRE_Int block_size);
+HYPRE_Int hypre_CSRBlockMatrixBlockAddAccumulateDiagCheckSign(HYPRE_Complex* i1, HYPRE_Complex* o,
+                                                              HYPRE_Int block_size, HYPRE_Real *sign);
+HYPRE_Int hypre_CSRBlockMatrixBlockMultAddDiagCheckSign(HYPRE_Complex* i1, HYPRE_Complex* i2,
+                                                        HYPRE_Complex beta, HYPRE_Complex* o, HYPRE_Int block_size, HYPRE_Real *sign);
 
 #ifdef __cplusplus
 }
diff --git a/external/hypre/src/parcsr_block_mv/csr_block_matvec.c b/external/hypre/src/parcsr_block_mv/csr_block_matvec.c
index c07e19d7..84c49478 100644
--- a/external/hypre/src/parcsr_block_mv/csr_block_matvec.c
+++ b/external/hypre/src/parcsr_block_mv/csr_block_matvec.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -34,7 +34,7 @@ hypre_CSRBlockMatrixMatvec(HYPRE_Complex alpha, hypre_CSRBlockMatrix *A,
    HYPRE_Int         x_size = hypre_VectorSize(x);
    HYPRE_Int         y_size = hypre_VectorSize(y);
 
-   HYPRE_Int         i, b1, b2, jj, bnnz=blk_size*blk_size;
+   HYPRE_Int         i, b1, b2, jj, bnnz = blk_size * blk_size;
    HYPRE_Int         ierr = 0;
    HYPRE_Complex     temp;
 
@@ -49,9 +49,9 @@ hypre_CSRBlockMatrixMatvec(HYPRE_Complex alpha, hypre_CSRBlockMatrix *A,
     *  is informational only.
     *--------------------------------------------------------------------*/
 
-   if (num_cols*blk_size != x_size) ierr = 1;
-   if (num_rows*blk_size != y_size) ierr = 2;
-   if (num_cols*blk_size != x_size && num_rows*blk_size != y_size) ierr = 3;
+   if (num_cols * blk_size != x_size) { ierr = 1; }
+   if (num_rows * blk_size != y_size) { ierr = 2; }
+   if (num_cols * blk_size != x_size && num_rows * blk_size != y_size) { ierr = 3; }
 
    /*-----------------------------------------------------------------------
     * Do (alpha == 0.0) computation - RDF: USE MACHINE EPS
@@ -60,9 +60,9 @@ hypre_CSRBlockMatrixMatvec(HYPRE_Complex alpha, hypre_CSRBlockMatrix *A,
    if (alpha == 0.0)
    {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-      for (i = 0; i < num_rows*blk_size; i++) y_data[i] *= beta;
+      for (i = 0; i < num_rows * blk_size; i++) { y_data[i] *= beta; }
 
       return ierr;
    }
@@ -78,18 +78,22 @@ hypre_CSRBlockMatrixMatvec(HYPRE_Complex alpha, hypre_CSRBlockMatrix *A,
       if (temp == 0.0)
       {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+         #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-         for (i = 0; i < num_rows*blk_size; i++)
+         for (i = 0; i < num_rows * blk_size; i++)
+         {
             y_data[i] = 0.0;
+         }
       }
       else
       {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+         #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-         for (i = 0; i < num_rows*blk_size; i++)
+         for (i = 0; i < num_rows * blk_size; i++)
+         {
             y_data[i] *= temp;
+         }
       }
    }
 
@@ -98,19 +102,21 @@ hypre_CSRBlockMatrixMatvec(HYPRE_Complex alpha, hypre_CSRBlockMatrix *A,
     *-----------------------------------------------------------------*/
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i,jj,b1,b2,temp) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i,jj,b1,b2,temp) HYPRE_SMP_SCHEDULE
 #endif
 
    for (i = 0; i < num_rows; i++)
    {
-      for (jj = A_i[i]; jj < A_i[i+1]; jj++)
+      for (jj = A_i[i]; jj < A_i[i + 1]; jj++)
       {
          for (b1 = 0; b1 < blk_size; b1++)
          {
-            temp = y_data[i*blk_size+b1];
+            temp = y_data[i * blk_size + b1];
             for (b2 = 0; b2 < blk_size; b2++)
-               temp += A_data[jj*bnnz+b1*blk_size+b2] * x_data[A_j[jj]*blk_size+b2];
-            y_data[i*blk_size+b1] = temp;
+            {
+               temp += A_data[jj * bnnz + b1 * blk_size + b2] * x_data[A_j[jj] * blk_size + b2];
+            }
+            y_data[i * blk_size + b1] = temp;
          }
       }
    }
@@ -122,10 +128,12 @@ hypre_CSRBlockMatrixMatvec(HYPRE_Complex alpha, hypre_CSRBlockMatrix *A,
    if (alpha != 1.0)
    {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-      for (i = 0; i < num_rows*blk_size; i++)
+      for (i = 0; i < num_rows * blk_size; i++)
+      {
          y_data[i] *= alpha;
+      }
    }
 
    return ierr;
@@ -165,7 +173,7 @@ hypre_CSRBlockMatrixMatvecT( HYPRE_Complex         alpha,
    HYPRE_Int         b1, b2;
 
    HYPRE_Int         blk_size = hypre_CSRBlockMatrixBlockSize(A);
-   HYPRE_Int         bnnz=blk_size*blk_size;
+   HYPRE_Int         bnnz = blk_size * blk_size;
 
    /*---------------------------------------------------------------------
     *  Check for size compatibility.  MatvecT returns ierr = 1 if
@@ -178,14 +186,20 @@ hypre_CSRBlockMatrixMatvecT( HYPRE_Complex         alpha,
     *  is informational only.
     *--------------------------------------------------------------------*/
 
-   if (num_rows*blk_size != x_size)
+   if (num_rows * blk_size != x_size)
+   {
       ierr = 1;
+   }
 
-   if (num_cols*blk_size != y_size)
+   if (num_cols * blk_size != y_size)
+   {
       ierr = 2;
+   }
 
-   if (num_rows*blk_size != x_size && num_cols*blk_size != y_size)
+   if (num_rows * blk_size != x_size && num_cols * blk_size != y_size)
+   {
       ierr = 3;
+   }
    /*-----------------------------------------------------------------------
     * Do (alpha == 0.0) computation - RDF: USE MACHINE EPS
     *-----------------------------------------------------------------------*/
@@ -193,10 +207,12 @@ hypre_CSRBlockMatrixMatvecT( HYPRE_Complex         alpha,
    if (alpha == 0.0)
    {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-      for (i = 0; i < num_cols*blk_size; i++)
+      for (i = 0; i < num_cols * blk_size; i++)
+      {
          y_data[i] *= beta;
+      }
 
       return ierr;
    }
@@ -212,18 +228,22 @@ hypre_CSRBlockMatrixMatvecT( HYPRE_Complex         alpha,
       if (temp == 0.0)
       {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+         #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-         for (i = 0; i < num_cols*blk_size; i++)
+         for (i = 0; i < num_cols * blk_size; i++)
+         {
             y_data[i] = 0.0;
+         }
       }
       else
       {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+         #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-         for (i = 0; i < num_cols*blk_size; i++)
+         for (i = 0; i < num_cols * blk_size; i++)
+         {
             y_data[i] *= temp;
+         }
       }
    }
 
@@ -232,20 +252,20 @@ hypre_CSRBlockMatrixMatvecT( HYPRE_Complex         alpha,
     *-----------------------------------------------------------------*/
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i, jj,j, b1, b2) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i, jj,j, b1, b2) HYPRE_SMP_SCHEDULE
 #endif
 
    for (i = 0; i < num_rows; i++)
    {
-      for (jj = A_i[i]; jj < A_i[i+1]; jj++) /*each nonzero in that row*/
+      for (jj = A_i[i]; jj < A_i[i + 1]; jj++) /*each nonzero in that row*/
       {
          for (b1 = 0; b1 < blk_size; b1++) /*row */
          {
             for (b2 = 0; b2 < blk_size; b2++) /*col*/
             {
                j = A_j[jj]; /*col */
-               y_data[j*blk_size+b2] +=
-                  A_data[jj*bnnz+b1*blk_size+b2] * x_data[i*blk_size + b1];
+               y_data[j * blk_size + b2] +=
+                  A_data[jj * bnnz + b1 * blk_size + b2] * x_data[i * blk_size + b1];
             }
          }
       }
@@ -258,10 +278,12 @@ hypre_CSRBlockMatrixMatvecT( HYPRE_Complex         alpha,
    if (alpha != 1.0)
    {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-      for (i = 0; i < num_cols*blk_size; i++)
+      for (i = 0; i < num_cols * blk_size; i++)
+      {
          y_data[i] *= alpha;
+      }
    }
 
    return ierr;
diff --git a/external/hypre/src/parcsr_block_mv/driver_matvec.c b/external/hypre/src/parcsr_block_mv/driver_matvec.c
index cd2d8b32..8e88dc6c 100644
--- a/external/hypre/src/parcsr_block_mv/driver_matvec.c
+++ b/external/hypre/src/parcsr_block_mv/driver_matvec.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -40,7 +40,7 @@ HYPRE_Int main( HYPRE_Int   argc, char *argv[] )
    HYPRE_Complex               *data, ddata, *y_data;
    HYPRE_Int                   *row_starts, *col_starts, *rstarts, *cstarts;
    HYPRE_Int                   *row_starts2, *col_starts2;
-   HYPRE_Int                 block_size=2, bnnz=4, *index_set;
+   HYPRE_Int                 block_size = 2, bnnz = 4, *index_set;
    FILE                *fp;
 
    /* --------------------------------------------- */
@@ -67,17 +67,17 @@ HYPRE_Int main( HYPRE_Int   argc, char *argv[] )
    /* build vector and apply matvec                 */
    /* --------------------------------------------- */
 
-   x = hypre_ParVectorCreate(hypre_MPI_COMM_WORLD,global_num_cols,col_starts);
+   x = hypre_ParVectorCreate(hypre_MPI_COMM_WORLD, global_num_cols, col_starts);
    hypre_ParVectorInitialize(x);
    x_local = hypre_ParVectorLocalVector(x);
    data    = hypre_VectorData(x_local);
-   local_size = col_starts[mypid+1] - col_starts[mypid];
-   for (ii = 0; ii < local_size; ii++) data[ii] = 1.0;
-   y = hypre_ParVectorCreate(hypre_MPI_COMM_WORLD,global_num_rows,row_starts);
+   local_size = col_starts[mypid + 1] - col_starts[mypid];
+   for (ii = 0; ii < local_size; ii++) { data[ii] = 1.0; }
+   y = hypre_ParVectorCreate(hypre_MPI_COMM_WORLD, global_num_rows, row_starts);
    hypre_ParVectorInitialize(y);
    hypre_ParCSRMatrixMatvec (1.0, par_matrix, x, 0.0, y);
    ddata = hypre_ParVectorInnerProd(y, y);
-   if (mypid == 0) hypre_printf("y inner product = %e\n", ddata);
+   if (mypid == 0) { hypre_printf("y inner product = %e\n", ddata); }
    hypre_ParVectorDestroy(x);
    hypre_ParVectorDestroy(y);
 
@@ -85,29 +85,29 @@ HYPRE_Int main( HYPRE_Int   argc, char *argv[] )
    /* build block matrix                            */
    /* --------------------------------------------- */
 
-   rstarts = hypre_CTAlloc(HYPRE_Int,  nprocs+1, HYPRE_MEMORY_HOST);
-   for (ii = 0; ii <= nprocs; ii++) rstarts[ii] = row_starts[ii];
-   cstarts = hypre_CTAlloc(HYPRE_Int,  nprocs+1, HYPRE_MEMORY_HOST);
-   for (ii = 0; ii <= nprocs; ii++) cstarts[ii] = col_starts[ii];
+   rstarts = hypre_CTAlloc(HYPRE_Int,  nprocs + 1, HYPRE_MEMORY_HOST);
+   for (ii = 0; ii <= nprocs; ii++) { rstarts[ii] = row_starts[ii]; }
+   cstarts = hypre_CTAlloc(HYPRE_Int,  nprocs + 1, HYPRE_MEMORY_HOST);
+   for (ii = 0; ii <= nprocs; ii++) { cstarts[ii] = col_starts[ii]; }
 
-   par_blk_matrix = hypre_ParCSRBlockMatrixCreate(hypre_MPI_COMM_WORLD,block_size,
-                          global_num_rows, global_num_cols, rstarts,
-                          cstarts, num_cols_offd, num_nonzeros_diag,
-                          num_nonzeros_offd);
+   par_blk_matrix = hypre_ParCSRBlockMatrixCreate(hypre_MPI_COMM_WORLD, block_size,
+                                                  global_num_rows, global_num_cols, rstarts,
+                                                  cstarts, num_cols_offd, num_nonzeros_diag,
+                                                  num_nonzeros_offd);
    colMap  = hypre_ParCSRMatrixColMapOffd(par_matrix);
-   if (num_cols_offd > 0) colMap2 = hypre_CTAlloc(HYPRE_Int,  num_cols_offd, HYPRE_MEMORY_HOST);
-   else                   colMap2 = NULL;
-   for (ii = 0; ii < num_cols_offd; ii++) colMap2[ii] = colMap[ii];
+   if (num_cols_offd > 0) { colMap2 = hypre_CTAlloc(HYPRE_Int,  num_cols_offd, HYPRE_MEMORY_HOST); }
+   else { colMap2 = NULL; }
+   for (ii = 0; ii < num_cols_offd; ii++) { colMap2[ii] = colMap[ii]; }
    hypre_ParCSRBlockMatrixColMapOffd(par_blk_matrix) = colMap2;
    diag_i = hypre_CSRMatrixI(hypre_ParCSRMatrixDiag(par_matrix));
    diag_j = hypre_CSRMatrixJ(hypre_ParCSRMatrixDiag(par_matrix));
    diag_d = hypre_CSRMatrixData(hypre_ParCSRMatrixDiag(par_matrix));
    diag = hypre_ParCSRBlockMatrixDiag(par_blk_matrix);
-   diag_i2 = hypre_CTAlloc(HYPRE_Int,  local_size+1, HYPRE_MEMORY_HOST);
+   diag_i2 = hypre_CTAlloc(HYPRE_Int,  local_size + 1, HYPRE_MEMORY_HOST);
    diag_j2 = hypre_CTAlloc(HYPRE_Int,  num_nonzeros_diag, HYPRE_MEMORY_HOST);
-   diag_d2 = hypre_CTAlloc(HYPRE_Complex,  num_nonzeros_diag*bnnz, HYPRE_MEMORY_HOST);
-   for (ii = 0; ii <= local_size; ii++) diag_i2[ii] = diag_i[ii];
-   for (ii = 0; ii < num_nonzeros_diag; ii++) diag_j2[ii] = diag_j[ii];
+   diag_d2 = hypre_CTAlloc(HYPRE_Complex,  num_nonzeros_diag * bnnz, HYPRE_MEMORY_HOST);
+   for (ii = 0; ii <= local_size; ii++) { diag_i2[ii] = diag_i[ii]; }
+   for (ii = 0; ii < num_nonzeros_diag; ii++) { diag_j2[ii] = diag_j[ii]; }
    hypre_CSRBlockMatrixI(diag) = diag_i2;
    hypre_CSRBlockMatrixJ(diag) = diag_j2;
    for (ii = 0; ii < num_nonzeros_diag; ii++)
@@ -116,9 +116,13 @@ HYPRE_Int main( HYPRE_Int   argc, char *argv[] )
          for (kk = 0; kk < block_size; kk++)
          {
             if (jj <= kk)
-               diag_d2[ii*bnnz+jj*block_size+kk] = diag_d[ii];
+            {
+               diag_d2[ii * bnnz + jj * block_size + kk] = diag_d[ii];
+            }
             else
-               diag_d2[ii*bnnz+jj*block_size+kk] = 0.0;
+            {
+               diag_d2[ii * bnnz + jj * block_size + kk] = 0.0;
+            }
          }
    }
    hypre_CSRBlockMatrixData(diag) = diag_d2;
@@ -127,24 +131,28 @@ HYPRE_Int main( HYPRE_Int   argc, char *argv[] )
    offd_j = hypre_CSRMatrixJ(hypre_ParCSRMatrixOffd(par_matrix));
    offd_d = hypre_CSRMatrixData(hypre_ParCSRMatrixOffd(par_matrix));
    offd   = hypre_ParCSRBlockMatrixOffd(par_blk_matrix);
-   offd_i2 = hypre_CTAlloc(HYPRE_Int,  local_size+1, HYPRE_MEMORY_HOST);
-   for (ii = 0; ii <= local_size; ii++) offd_i2[ii] = offd_i[ii];
+   offd_i2 = hypre_CTAlloc(HYPRE_Int,  local_size + 1, HYPRE_MEMORY_HOST);
+   for (ii = 0; ii <= local_size; ii++) { offd_i2[ii] = offd_i[ii]; }
    hypre_CSRBlockMatrixI(offd) = offd_i2;
    if (num_cols_offd)
    {
       offd_j2 = hypre_CTAlloc(HYPRE_Int,  num_nonzeros_offd, HYPRE_MEMORY_HOST);
-      for (ii = 0; ii < num_nonzeros_offd; ii++) offd_j2[ii] = offd_j[ii];
+      for (ii = 0; ii < num_nonzeros_offd; ii++) { offd_j2[ii] = offd_j[ii]; }
       hypre_CSRBlockMatrixJ(offd) = offd_j2;
-      offd_d2 = hypre_CTAlloc(HYPRE_Complex,  num_nonzeros_offd*bnnz, HYPRE_MEMORY_HOST);
+      offd_d2 = hypre_CTAlloc(HYPRE_Complex,  num_nonzeros_offd * bnnz, HYPRE_MEMORY_HOST);
       for (ii = 0; ii < num_nonzeros_offd; ii++)
       {
          for (jj = 0; jj < block_size; jj++)
             for (kk = 0; kk < block_size; kk++)
             {
                if (jj <= kk)
-                  offd_d2[ii*bnnz+jj*block_size+kk] = offd_d[ii];
+               {
+                  offd_d2[ii * bnnz + jj * block_size + kk] = offd_d[ii];
+               }
                else
-                  offd_d2[ii*bnnz+jj*block_size+kk] = 0.0;
+               {
+                  offd_d2[ii * bnnz + jj * block_size + kk] = 0.0;
+               }
             }
       }
       hypre_CSRBlockMatrixData(offd) = offd_d2;
@@ -159,28 +167,28 @@ HYPRE_Int main( HYPRE_Int   argc, char *argv[] )
    /* build block matrix transpose                  */
    /* --------------------------------------------- */
 
-   rstarts = hypre_CTAlloc(HYPRE_Int,  nprocs+1, HYPRE_MEMORY_HOST);
-   for (ii = 0; ii <= nprocs; ii++) rstarts[ii] = row_starts[ii];
-   cstarts = hypre_CTAlloc(HYPRE_Int,  nprocs+1, HYPRE_MEMORY_HOST);
-   for (ii = 0; ii <= nprocs; ii++) cstarts[ii] = col_starts[ii];
+   rstarts = hypre_CTAlloc(HYPRE_Int,  nprocs + 1, HYPRE_MEMORY_HOST);
+   for (ii = 0; ii <= nprocs; ii++) { rstarts[ii] = row_starts[ii]; }
+   cstarts = hypre_CTAlloc(HYPRE_Int,  nprocs + 1, HYPRE_MEMORY_HOST);
+   for (ii = 0; ii <= nprocs; ii++) { cstarts[ii] = col_starts[ii]; }
 
-   par_blk_matrixT = hypre_ParCSRBlockMatrixCreate(hypre_MPI_COMM_WORLD,block_size,
-                          global_num_rows, global_num_cols, rstarts,
-                          cstarts, num_cols_offd, num_nonzeros_diag,
-                          num_nonzeros_offd);
+   par_blk_matrixT = hypre_ParCSRBlockMatrixCreate(hypre_MPI_COMM_WORLD, block_size,
+                                                   global_num_rows, global_num_cols, rstarts,
+                                                   cstarts, num_cols_offd, num_nonzeros_diag,
+                                                   num_nonzeros_offd);
    colMap  = hypre_ParCSRMatrixColMapOffd(par_matrix);
    colMap2 = hypre_CTAlloc(HYPRE_Int,  num_cols_offd, HYPRE_MEMORY_HOST);
-   for (ii = 0; ii < num_cols_offd; ii++) colMap2[ii] = colMap[ii];
+   for (ii = 0; ii < num_cols_offd; ii++) { colMap2[ii] = colMap[ii]; }
    hypre_ParCSRBlockMatrixColMapOffd(par_blk_matrixT) = colMap2;
    diag_i = hypre_CSRMatrixI(hypre_ParCSRMatrixDiag(par_matrix));
    diag_j = hypre_CSRMatrixJ(hypre_ParCSRMatrixDiag(par_matrix));
    diag_d = hypre_CSRMatrixData(hypre_ParCSRMatrixDiag(par_matrix));
    diag = hypre_ParCSRBlockMatrixDiag(par_blk_matrixT);
-   diag_i2 = hypre_CTAlloc(HYPRE_Int,  local_size+1, HYPRE_MEMORY_HOST);
+   diag_i2 = hypre_CTAlloc(HYPRE_Int,  local_size + 1, HYPRE_MEMORY_HOST);
    diag_j2 = hypre_CTAlloc(HYPRE_Int,  num_nonzeros_diag, HYPRE_MEMORY_HOST);
-   diag_d2 = hypre_CTAlloc(HYPRE_Complex,  num_nonzeros_diag*bnnz, HYPRE_MEMORY_HOST);
-   for (ii = 0; ii <= local_size; ii++) diag_i2[ii] = diag_i[ii];
-   for (ii = 0; ii < num_nonzeros_diag; ii++) diag_j2[ii] = diag_j[ii];
+   diag_d2 = hypre_CTAlloc(HYPRE_Complex,  num_nonzeros_diag * bnnz, HYPRE_MEMORY_HOST);
+   for (ii = 0; ii <= local_size; ii++) { diag_i2[ii] = diag_i[ii]; }
+   for (ii = 0; ii < num_nonzeros_diag; ii++) { diag_j2[ii] = diag_j[ii]; }
    hypre_CSRBlockMatrixI(diag) = diag_i2;
    hypre_CSRBlockMatrixJ(diag) = diag_j2;
    for (ii = 0; ii < num_nonzeros_diag; ii++)
@@ -189,9 +197,13 @@ HYPRE_Int main( HYPRE_Int   argc, char *argv[] )
          for (kk = 0; kk < block_size; kk++)
          {
             if (jj >= kk)
-               diag_d2[ii*bnnz+jj*block_size+kk] = diag_d[ii];
+            {
+               diag_d2[ii * bnnz + jj * block_size + kk] = diag_d[ii];
+            }
             else
-               diag_d2[ii*bnnz+jj*block_size+kk] = 0.0;
+            {
+               diag_d2[ii * bnnz + jj * block_size + kk] = 0.0;
+            }
          }
    }
    hypre_CSRBlockMatrixData(diag) = diag_d2;
@@ -200,24 +212,28 @@ HYPRE_Int main( HYPRE_Int   argc, char *argv[] )
    offd_j = hypre_CSRMatrixJ(hypre_ParCSRMatrixOffd(par_matrix));
    offd_d = hypre_CSRMatrixData(hypre_ParCSRMatrixOffd(par_matrix));
    offd   = hypre_ParCSRBlockMatrixOffd(par_blk_matrixT);
-   offd_i2 = hypre_CTAlloc(HYPRE_Int,  local_size+1, HYPRE_MEMORY_HOST);
-   for (ii = 0; ii <= local_size; ii++) offd_i2[ii] = offd_i[ii];
+   offd_i2 = hypre_CTAlloc(HYPRE_Int,  local_size + 1, HYPRE_MEMORY_HOST);
+   for (ii = 0; ii <= local_size; ii++) { offd_i2[ii] = offd_i[ii]; }
    hypre_CSRBlockMatrixI(offd) = offd_i2;
    if (num_cols_offd)
    {
       offd_j2 = hypre_CTAlloc(HYPRE_Int,  num_nonzeros_offd, HYPRE_MEMORY_HOST);
-      for (ii = 0; ii < num_nonzeros_offd; ii++) offd_j2[ii] = offd_j[ii];
+      for (ii = 0; ii < num_nonzeros_offd; ii++) { offd_j2[ii] = offd_j[ii]; }
       hypre_CSRBlockMatrixJ(offd) = offd_j2;
-      offd_d2 = hypre_CTAlloc(HYPRE_Complex,  num_nonzeros_offd*bnnz, HYPRE_MEMORY_HOST);
+      offd_d2 = hypre_CTAlloc(HYPRE_Complex,  num_nonzeros_offd * bnnz, HYPRE_MEMORY_HOST);
       for (ii = 0; ii < num_nonzeros_offd; ii++)
       {
          for (jj = 0; jj < block_size; jj++)
             for (kk = 0; kk < block_size; kk++)
             {
                if (jj >= kk)
-                  offd_d2[ii*bnnz+jj*block_size+kk] = offd_d[ii];
+               {
+                  offd_d2[ii * bnnz + jj * block_size + kk] = offd_d[ii];
+               }
                else
-                  offd_d2[ii*bnnz+jj*block_size+kk] = 0.0;
+               {
+                  offd_d2[ii * bnnz + jj * block_size + kk] = 0.0;
+               }
             }
       }
       hypre_CSRBlockMatrixData(offd) = offd_d2;
@@ -232,20 +248,24 @@ HYPRE_Int main( HYPRE_Int   argc, char *argv[] )
    /* block matvec                                  */
    /* --------------------------------------------- */
 
-   col_starts2 = hypre_CTAlloc(HYPRE_Int,  nprocs+1, HYPRE_MEMORY_HOST);
+   col_starts2 = hypre_CTAlloc(HYPRE_Int,  nprocs + 1, HYPRE_MEMORY_HOST);
    for (ii = 0; ii <= nprocs; ii++)
+   {
       col_starts2[ii] = col_starts[ii] * block_size;
-   x = hypre_ParVectorCreate(hypre_MPI_COMM_WORLD,global_num_cols*block_size,
+   }
+   x = hypre_ParVectorCreate(hypre_MPI_COMM_WORLD, global_num_cols * block_size,
                              col_starts2);
    hypre_ParVectorInitialize(x);
    x_local = hypre_ParVectorLocalVector(x);
    data = hypre_VectorData(x_local);
-   local_size = col_starts2[mypid+1] - col_starts2[mypid];
-   for (ii=0; ii < local_size; ii++) data[ii] = 1.0;
-   row_starts2 = hypre_CTAlloc(HYPRE_Int,  nprocs+1, HYPRE_MEMORY_HOST);
+   local_size = col_starts2[mypid + 1] - col_starts2[mypid];
+   for (ii = 0; ii < local_size; ii++) { data[ii] = 1.0; }
+   row_starts2 = hypre_CTAlloc(HYPRE_Int,  nprocs + 1, HYPRE_MEMORY_HOST);
    for (ii = 0; ii <= nprocs; ii++)
+   {
       row_starts2[ii] = row_starts[ii] * block_size;
-   y = hypre_ParVectorCreate(hypre_MPI_COMM_WORLD,global_num_rows*block_size,
+   }
+   y = hypre_ParVectorCreate(hypre_MPI_COMM_WORLD, global_num_rows * block_size,
                              row_starts2);
    hypre_ParVectorInitialize(y);
    y_local = hypre_ParVectorLocalVector(y);
@@ -253,10 +273,10 @@ HYPRE_Int main( HYPRE_Int   argc, char *argv[] )
 
    hypre_BlockMatvecCommPkgCreate(par_blk_matrix);
    ddata = hypre_ParVectorInnerProd(x, x);
-   if (mypid == 0) hypre_printf("block x inner product = %e\n", ddata);
+   if (mypid == 0) { hypre_printf("block x inner product = %e\n", ddata); }
    hypre_ParCSRBlockMatrixMatvec (1.0, par_blk_matrix, x, 0.0, y);
    ddata = hypre_ParVectorInnerProd(y, y);
-   if (mypid == 0) hypre_printf("block y inner product = %e\n", ddata);
+   if (mypid == 0) { hypre_printf("block y inner product = %e\n", ddata); }
 
    /* --------------------------------------------- */
    /* RAP                                           */
@@ -265,17 +285,17 @@ HYPRE_Int main( HYPRE_Int   argc, char *argv[] )
    hypre_printf("Verifying RAP\n");
    hypre_ParCSRBlockMatrixRAP(par_blk_matrix, par_blk_matrix,
                               par_blk_matrix, &rap_matrix);
-   for (ii = 0; ii < local_size; ii++) data[ii] = 1.0;
+   for (ii = 0; ii < local_size; ii++) { data[ii] = 1.0; }
    hypre_ParCSRBlockMatrixMatvec (1.0, par_blk_matrix, x, 0.0, y);
    hypre_ParCSRBlockMatrixMatvec (1.0, par_blk_matrix, y, 0.0, x);
    hypre_ParCSRBlockMatrixMatvec (1.0, par_blk_matrixT, x, 0.0, y);
    ddata = hypre_ParVectorInnerProd(y, y);
-   if (mypid == 0) hypre_printf("(1) A^2 block inner product = %e\n", ddata);
-   for (ii = 0; ii < local_size; ii++) data[ii] = 1.0;
+   if (mypid == 0) { hypre_printf("(1) A^2 block inner product = %e\n", ddata); }
+   for (ii = 0; ii < local_size; ii++) { data[ii] = 1.0; }
    hypre_ParCSRBlockMatrixMatvec (1.0, rap_matrix, x, 0.0, y);
    ddata = hypre_ParVectorInnerProd(y, y);
-   if (mypid == 0) hypre_printf("(2) A^2 block inner product = %e\n", ddata);
-   if (mypid == 0) hypre_printf("(1) and (2) should be equal.\n");
+   if (mypid == 0) { hypre_printf("(2) A^2 block inner product = %e\n", ddata); }
+   if (mypid == 0) { hypre_printf("(1) and (2) should be equal.\n"); }
 
 #if 0
    /* --------------------------------------------- */
@@ -286,21 +306,23 @@ HYPRE_Int main( HYPRE_Int   argc, char *argv[] )
    diag_j = hypre_CSRBlockMatrixJ(A_diag);
    diag_d = hypre_CSRBlockMatrixData(A_diag);
    for (ii = 0; ii < hypre_ParCSRMatrixNumRows(par_matrix); ii++)
-      for (jj = diag_i[ii]; jj < diag_i[ii+1]; jj++)
-         hypre_printf("A %4d %4d = %e\n",ii,diag_j[jj],diag_d[jj]);
+      for (jj = diag_i[ii]; jj < diag_i[ii + 1]; jj++)
+      {
+         hypre_printf("A %4d %4d = %e\n", ii, diag_j[jj], diag_d[jj]);
+      }
 
    diag = hypre_ParCSRBlockMatrixDiag(rap_matrix);
    diag_i = hypre_CSRBlockMatrixI(diag);
    diag_j = hypre_CSRBlockMatrixJ(diag);
    diag_d = hypre_CSRBlockMatrixData(diag);
-   hypre_printf("RAP block size = %d\n",hypre_ParCSRBlockMatrixBlockSize(rap_matrix));
-   hypre_printf("RAP num rows   = %d\n",hypre_ParCSRBlockMatrixNumRows(rap_matrix));
+   hypre_printf("RAP block size = %d\n", hypre_ParCSRBlockMatrixBlockSize(rap_matrix));
+   hypre_printf("RAP num rows   = %d\n", hypre_ParCSRBlockMatrixNumRows(rap_matrix));
    for (ii = 0; ii < hypre_ParCSRBlockMatrixNumRows(rap_matrix); ii++)
       for (row = 0; row < block_size; row++)
-         for (jj = diag_i[ii]; jj < diag_i[ii+1]; jj++)
+         for (jj = diag_i[ii]; jj < diag_i[ii + 1]; jj++)
             for (col = 0; col < block_size; col++)
-               hypre_printf("RAP %4d %4d = %e\n",ii*block_size+row,
-                   diag_j[jj]*block_size+col,diag_d[(jj+row)*block_size+col]);
+               hypre_printf("RAP %4d %4d = %e\n", ii * block_size + row,
+                            diag_j[jj]*block_size + col, diag_d[(jj + row)*block_size + col]);
    offd = hypre_ParCSRBlockMatrixOffd(rap_matrix);
    offd_i = hypre_CSRBlockMatrixI(offd);
    offd_j = hypre_CSRBlockMatrixJ(offd);
@@ -309,10 +331,10 @@ HYPRE_Int main( HYPRE_Int   argc, char *argv[] )
    {
       for (ii = 0; ii < hypre_ParCSRBlockMatrixNumRows(rap_matrix); ii++)
          for (row = 0; row < block_size; row++)
-            for (jj = offd_i[ii]; jj < offd_i[ii+1]; jj++)
+            for (jj = offd_i[ii]; jj < offd_i[ii + 1]; jj++)
                for (col = 0; col < block_size; col++)
-                  hypre_printf("RAPOFFD %4d %4d = %e\n",ii*block_size+row,
-                     offd_j[jj]*block_size+col,offd_d[(jj+row)*block_size+col]);
+                  hypre_printf("RAPOFFD %4d %4d = %e\n", ii * block_size + row,
+                               offd_j[jj]*block_size + col, offd_d[(jj + row)*block_size + col]);
    }
 #endif
    hypre_ParVectorDestroy(x);
@@ -331,16 +353,16 @@ HYPRE_Int main( HYPRE_Int   argc, char *argv[] )
    {
       fp = fopen("Amat_ee", "r");
       hypre_fscanf(fp, "%d %d", &global_num_rows, &num_nonzeros_diag);
-      diag_i = hypre_TAlloc(HYPRE_Int, (global_num_rows+1) , HYPRE_MEMORY_HOST);
-      diag_j = hypre_TAlloc(HYPRE_Int, num_nonzeros_diag , HYPRE_MEMORY_HOST);
-      diag_d = hypre_TAlloc(HYPRE_Complex, num_nonzeros_diag , HYPRE_MEMORY_HOST);
+      diag_i = hypre_TAlloc(HYPRE_Int, (global_num_rows + 1), HYPRE_MEMORY_HOST);
+      diag_j = hypre_TAlloc(HYPRE_Int, num_nonzeros_diag, HYPRE_MEMORY_HOST);
+      diag_d = hypre_TAlloc(HYPRE_Complex, num_nonzeros_diag, HYPRE_MEMORY_HOST);
       row = 0;
       nnz = 0;
       diag_i[0] = 0;
       for (ii = 0; ii < num_nonzeros_diag; ii++)
       {
          hypre_fscanf(fp, "%d %d %lg", &jj, &col, &ddata);
-         if ((jj-1) != row)
+         if ((jj - 1) != row)
          {
             row++;
             diag_i[row] = nnz;
@@ -350,17 +372,17 @@ HYPRE_Int main( HYPRE_Int   argc, char *argv[] )
       }
       diag_i[global_num_rows] = nnz;
       fclose(fp);
-      hypre_printf("nrows = %d, nnz = %d\n", row+1, nnz);
+      hypre_printf("nrows = %d, nnz = %d\n", row + 1, nnz);
 
-      row_starts = hypre_TAlloc(HYPRE_Int, 2 , HYPRE_MEMORY_HOST);
-      col_starts = hypre_TAlloc(HYPRE_Int, 2 , HYPRE_MEMORY_HOST);
+      row_starts = hypre_TAlloc(HYPRE_Int, 2, HYPRE_MEMORY_HOST);
+      col_starts = hypre_TAlloc(HYPRE_Int, 2, HYPRE_MEMORY_HOST);
       row_starts[0] = col_starts[0] = 0;
       row_starts[1] = col_starts[1] = global_num_rows;
       num_cols_offd = 0;
       num_nonzeros_offd = 0;
-      par_matrix = hypre_ParCSRMatrixCreate(hypre_MPI_COMM_WORLD,global_num_rows,
-                      global_num_rows, row_starts, col_starts, num_cols_offd,
-                      num_nonzeros_diag, num_nonzeros_offd);
+      par_matrix = hypre_ParCSRMatrixCreate(hypre_MPI_COMM_WORLD, global_num_rows,
+                                            global_num_rows, row_starts, col_starts, num_cols_offd,
+                                            num_nonzeros_diag, num_nonzeros_offd);
       A_diag = hypre_ParCSRMatrixDiag(par_matrix);
       hypre_CSRMatrixI(A_diag) = diag_i;
       hypre_CSRMatrixJ(A_diag) = diag_j;
@@ -372,17 +394,17 @@ HYPRE_Int main( HYPRE_Int   argc, char *argv[] )
 
       fp = fopen("Gmat", "r");
       hypre_fscanf(fp, "%d %d %d", &global_num_rows, &global_num_cols,
-             &num_nonzeros_diag);
-      diag_i = hypre_TAlloc(HYPRE_Int, (global_num_rows+1) , HYPRE_MEMORY_HOST);
-      diag_j = hypre_TAlloc(HYPRE_Int, num_nonzeros_diag , HYPRE_MEMORY_HOST);
-      diag_d = hypre_TAlloc(HYPRE_Complex, num_nonzeros_diag , HYPRE_MEMORY_HOST);
+                   &num_nonzeros_diag);
+      diag_i = hypre_TAlloc(HYPRE_Int, (global_num_rows + 1), HYPRE_MEMORY_HOST);
+      diag_j = hypre_TAlloc(HYPRE_Int, num_nonzeros_diag, HYPRE_MEMORY_HOST);
+      diag_d = hypre_TAlloc(HYPRE_Complex, num_nonzeros_diag, HYPRE_MEMORY_HOST);
       row = 0;
       nnz = 0;
       diag_i[0] = 0;
       for (ii = 0; ii < num_nonzeros_diag; ii++)
       {
          hypre_fscanf(fp, "%d %d %lg", &jj, &col, &ddata);
-         if ((jj-1) != row)
+         if ((jj - 1) != row)
          {
             row++;
             diag_i[row] = nnz;
@@ -393,16 +415,16 @@ HYPRE_Int main( HYPRE_Int   argc, char *argv[] )
       diag_i[global_num_rows] = nnz;
       fclose(fp);
 
-      row_starts = hypre_TAlloc(HYPRE_Int, 2 , HYPRE_MEMORY_HOST);
-      col_starts = hypre_TAlloc(HYPRE_Int, 2 , HYPRE_MEMORY_HOST);
+      row_starts = hypre_TAlloc(HYPRE_Int, 2, HYPRE_MEMORY_HOST);
+      col_starts = hypre_TAlloc(HYPRE_Int, 2, HYPRE_MEMORY_HOST);
       row_starts[0] = col_starts[0] = 0;
       row_starts[1] = global_num_rows;
       col_starts[1] = global_num_cols;
       num_cols_offd = 0;
       num_nonzeros_offd = 0;
-      g_matrix = hypre_ParCSRMatrixCreate(hypre_MPI_COMM_WORLD,global_num_rows,
-                      global_num_cols, row_starts, col_starts, num_cols_offd,
-                      num_nonzeros_diag, num_nonzeros_offd);
+      g_matrix = hypre_ParCSRMatrixCreate(hypre_MPI_COMM_WORLD, global_num_rows,
+                                          global_num_cols, row_starts, col_starts, num_cols_offd,
+                                          num_nonzeros_diag, num_nonzeros_offd);
       A_diag = hypre_ParCSRMatrixDiag(g_matrix);
       hypre_CSRMatrixI(A_diag) = diag_i;
       hypre_CSRMatrixJ(A_diag) = diag_j;
@@ -433,33 +455,33 @@ HYPRE_Int main( HYPRE_Int   argc, char *argv[] )
       HYPRE_GMRESSetLogging(gmres_solver, 1);
       HYPRE_GMRESSetPrintLevel(gmres_solver, 2);
       HYPRE_BlockTridiagCreate(&precon);
-      HYPRE_BlockTridiagSetPrintLevel(precon,0);
-      HYPRE_BlockTridiagSetAMGNumSweeps(precon,1);
-      local_size = col_starts[mypid+1] - col_starts[mypid];
-      index_set = hypre_CTAlloc(HYPRE_Int,  local_size+1, HYPRE_MEMORY_HOST);
+      HYPRE_BlockTridiagSetPrintLevel(precon, 0);
+      HYPRE_BlockTridiagSetAMGNumSweeps(precon, 1);
+      local_size = col_starts[mypid + 1] - col_starts[mypid];
+      index_set = hypre_CTAlloc(HYPRE_Int,  local_size + 1, HYPRE_MEMORY_HOST);
       jj = 0;
       /* for (ii = 0; ii < local_size/2; ii++) index_set[jj++] = ii * 2; */
-      for (ii = 0; ii < local_size/2; ii++) index_set[jj++] = ii;
+      for (ii = 0; ii < local_size / 2; ii++) { index_set[jj++] = ii; }
       HYPRE_BlockTridiagSetIndexSet(precon, jj, index_set);
       HYPRE_GMRESSetPrecond(gmres_solver,
-                         (HYPRE_PtrToSolverFcn) HYPRE_BlockTridiagSolve,
-                         (HYPRE_PtrToSolverFcn) HYPRE_BlockTridiagSetup,
-                         precon);
-      col_starts2 = hypre_CTAlloc(HYPRE_Int,  nprocs+1, HYPRE_MEMORY_HOST);
-      for (ii = 0; ii <= nprocs; ii++) col_starts2[ii] = col_starts[ii];
-      x = hypre_ParVectorCreate(hypre_MPI_COMM_WORLD,global_num_cols,col_starts2);
+                            (HYPRE_PtrToSolverFcn) HYPRE_BlockTridiagSolve,
+                            (HYPRE_PtrToSolverFcn) HYPRE_BlockTridiagSetup,
+                            precon);
+      col_starts2 = hypre_CTAlloc(HYPRE_Int,  nprocs + 1, HYPRE_MEMORY_HOST);
+      for (ii = 0; ii <= nprocs; ii++) { col_starts2[ii] = col_starts[ii]; }
+      x = hypre_ParVectorCreate(hypre_MPI_COMM_WORLD, global_num_cols, col_starts2);
       hypre_ParVectorInitialize(x);
       x_local = hypre_ParVectorLocalVector(x);
-      local_size = col_starts2[mypid+1] - col_starts2[mypid];
+      local_size = col_starts2[mypid + 1] - col_starts2[mypid];
       data = hypre_VectorData(x_local);
-      for (ii=0; ii < local_size; ii++) data[ii] = 0.0;
-      row_starts2 = hypre_CTAlloc(HYPRE_Int,  nprocs+1, HYPRE_MEMORY_HOST);
-      for (ii = 0; ii <= nprocs; ii++) row_starts2[ii] = row_starts[ii];
-      y = hypre_ParVectorCreate(hypre_MPI_COMM_WORLD,global_num_rows,row_starts2);
+      for (ii = 0; ii < local_size; ii++) { data[ii] = 0.0; }
+      row_starts2 = hypre_CTAlloc(HYPRE_Int,  nprocs + 1, HYPRE_MEMORY_HOST);
+      for (ii = 0; ii <= nprocs; ii++) { row_starts2[ii] = row_starts[ii]; }
+      y = hypre_ParVectorCreate(hypre_MPI_COMM_WORLD, global_num_rows, row_starts2);
       hypre_ParVectorInitialize(y);
       y_local = hypre_ParVectorLocalVector(y);
       data = hypre_VectorData(y_local);
-      for (ii = 0; ii < local_size; ii++) data[ii] = 1.0;
+      for (ii = 0; ii < local_size; ii++) { data[ii] = 1.0; }
 
       HYPRE_GMRESSetup(gmres_solver, (HYPRE_Matrix) par_matrix,
                        (HYPRE_Vector) y, (HYPRE_Vector) x);
@@ -504,8 +526,8 @@ HYPRE_Int MyBuildParLaplacian9pt(HYPRE_ParCSRMatrix  *A_ptr)
    nx = 200;
    ny = 200;
    P  = 2;
-   if (num_procs == 1) P = 1;
-   Q  = num_procs/P;
+   if (num_procs == 1) { P = 1; }
+   Q  = num_procs / P;
 
    /*-----------------------------------------------------------
     * Print driver parameters
@@ -523,7 +545,7 @@ HYPRE_Int MyBuildParLaplacian9pt(HYPRE_ParCSRMatrix  *A_ptr)
     *-----------------------------------------------------------*/
 
    p = myid % P;
-   q = ( myid - p)/P;
+   q = ( myid - p) / P;
 
    /*-----------------------------------------------------------
     * Generate the matrix
@@ -532,11 +554,11 @@ HYPRE_Int MyBuildParLaplacian9pt(HYPRE_ParCSRMatrix  *A_ptr)
    values = hypre_CTAlloc(HYPRE_Complex,  2, HYPRE_MEMORY_HOST);
    values[1] = -1.;
    values[0] = 0.;
-   if (nx > 1) values[0] += 2.0;
-   if (ny > 1) values[0] += 2.0;
-   if (nx > 1 && ny > 1) values[0] += 4.0;
+   if (nx > 1) { values[0] += 2.0; }
+   if (ny > 1) { values[0] += 2.0; }
+   if (nx > 1 && ny > 1) { values[0] += 4.0; }
    A = (HYPRE_ParCSRMatrix) GenerateLaplacian9pt(hypre_MPI_COMM_WORLD,
-                                  nx, ny, P, Q, p, q, values);
+                                                 nx, ny, P, Q, p, q, values);
    hypre_TFree(values, HYPRE_MEMORY_HOST);
    *A_ptr = A;
    return (0);
diff --git a/external/hypre/src/parcsr_block_mv/par_block_nodal_systems.c b/external/hypre/src/parcsr_block_mv/par_block_nodal_systems.c
index e4f88d99..5998b81c 100644
--- a/external/hypre/src/parcsr_block_mv/par_block_nodal_systems.c
+++ b/external/hypre/src/parcsr_block_mv/par_block_nodal_systems.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -9,17 +9,17 @@
 
 /*---------------------------------------------------------------------------
  * hypre_BoomerAMGBlockCreateNodalA
-
- This is the block version of creating a nodal norm matrix.
-
- option: determine which type of "norm" (or other measurement) is used.
-
- 1 = frobenius
- 2 = sum of abs. value of all elements
- 3 = largest element (positive or negative)
- 4 = 1-norm
- 5 = inf - norm
- 6 = sum of all elements
+ *
+ * This is the block version of creating a nodal norm matrix.
+ *
+ * Option: determine which type of "norm" (or other measurement) is used.
+ *
+ *   1 = frobenius
+ *   2 = sum of abs. value of all elements
+ *   3 = largest element (positive or negative)
+ *   4 = 1-norm
+ *   5 = inf - norm
+ *   6 = sum of all elements
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
@@ -34,7 +34,7 @@ hypre_BoomerAMGBlockCreateNodalA(hypre_ParCSRBlockMatrix *A,
    HYPRE_Real              *A_diag_data  = hypre_CSRBlockMatrixData(A_diag);
 
    HYPRE_Int                block_size = hypre_CSRBlockMatrixBlockSize(A_diag);
-   HYPRE_Int                bnnz = block_size*block_size;
+   HYPRE_Int                bnnz = block_size * block_size;
 
    hypre_CSRBlockMatrix    *A_offd          = hypre_ParCSRMatrixOffd(A);
    HYPRE_Int               *A_offd_i        = hypre_CSRBlockMatrixI(A_offd);
@@ -51,7 +51,7 @@ hypre_BoomerAMGBlockCreateNodalA(hypre_ParCSRBlockMatrix *A,
    hypre_ParCSRMatrix *AN;
    hypre_CSRMatrix    *AN_diag;
    HYPRE_Int          *AN_diag_i;
-   HYPRE_Int          *AN_diag_j=NULL;
+   HYPRE_Int          *AN_diag_j = NULL;
    HYPRE_Real         *AN_diag_data = NULL;
    hypre_CSRMatrix    *AN_offd;
    HYPRE_Int          *AN_offd_i;
@@ -89,7 +89,7 @@ hypre_BoomerAMGBlockCreateNodalA(hypre_ParCSRBlockMatrix *A,
    HYPRE_Real           tmp;
    HYPRE_Real           sum;
 
-   hypre_MPI_Comm_size(comm,&num_procs);
+   hypre_MPI_Comm_size(comm, &num_procs);
 
    if (!comm_pkg)
    {
@@ -107,7 +107,7 @@ hypre_BoomerAMGBlockCreateNodalA(hypre_ParCSRBlockMatrix *A,
    /* the diag part */
 
    num_nonzeros_diag = A_diag_i[num_nodes];
-   AN_diag_i = hypre_CTAlloc(HYPRE_Int,  num_nodes+1, HYPRE_MEMORY_HOST);
+   AN_diag_i = hypre_CTAlloc(HYPRE_Int,  num_nodes + 1, HYPRE_MEMORY_HOST);
 
    for (i = 0; i <= num_nodes; i++)
    {
@@ -125,7 +125,7 @@ hypre_BoomerAMGBlockCreateNodalA(hypre_ParCSRBlockMatrix *A,
    for (i = 0; i < num_nonzeros_diag; i++)
    {
       AN_diag_j[i]  = A_diag_j[i];
-      hypre_CSRBlockMatrixBlockNorm(norm_type, &A_diag_data[i*bnnz],
+      hypre_CSRBlockMatrixBlockNorm(norm_type, &A_diag_data[i * bnnz],
                                     &tmp, block_size);
       AN_diag_data[i] = tmp;
    }
@@ -140,7 +140,7 @@ hypre_BoomerAMGBlockCreateNodalA(hypre_ParCSRBlockMatrix *A,
       {
          index = AN_diag_i[i];
          sum = 0.0;
-         for (k = AN_diag_i[i]+1; k < AN_diag_i[i+1]; k++)
+         for (k = AN_diag_i[i] + 1; k < AN_diag_i[i + 1]; k++)
          {
             sum += AN_diag_data[k];
 
@@ -164,54 +164,50 @@ hypre_BoomerAMGBlockCreateNodalA(hypre_ParCSRBlockMatrix *A,
    /* copy the commpkg */
    if (comm_pkg)
    {
-      comm_pkg_AN = hypre_CTAlloc(hypre_ParCSRCommPkg, 1, HYPRE_MEMORY_HOST);
-      hypre_ParCSRCommPkgComm(comm_pkg_AN) = comm;
-
-      num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
-      hypre_ParCSRCommPkgNumSends(comm_pkg_AN) = num_sends;
-
       num_recvs = hypre_ParCSRCommPkgNumRecvs(comm_pkg);
-      hypre_ParCSRCommPkgNumRecvs(comm_pkg_AN) = num_recvs;
-
+      recv_procs = hypre_ParCSRCommPkgRecvProcs(comm_pkg);
+      recv_vec_starts = hypre_ParCSRCommPkgRecvVecStarts(comm_pkg);
+      num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
       send_procs = hypre_ParCSRCommPkgSendProcs(comm_pkg);
       send_map_starts = hypre_ParCSRCommPkgSendMapStarts(comm_pkg);
       send_map_elmts = hypre_ParCSRCommPkgSendMapElmts(comm_pkg);
+
       if (num_sends)
       {
          send_procs_AN = hypre_CTAlloc(HYPRE_Int,  num_sends, HYPRE_MEMORY_HOST);
-         send_map_elmts_AN = hypre_CTAlloc(HYPRE_Int,  send_map_starts[num_sends], HYPRE_MEMORY_HOST);
+         send_map_elmts_AN = hypre_CTAlloc(HYPRE_Int, send_map_starts[num_sends],
+                                           HYPRE_MEMORY_HOST);
       }
-      send_map_starts_AN = hypre_CTAlloc(HYPRE_Int,  num_sends+1, HYPRE_MEMORY_HOST);
-      send_map_starts_AN[0] = 0;
+      send_map_starts_AN = hypre_CTAlloc(HYPRE_Int,  num_sends + 1, HYPRE_MEMORY_HOST);
       for (i = 0; i < num_sends; i++)
       {
          send_procs_AN[i] = send_procs[i];
-         send_map_starts_AN[i+1] = send_map_starts[i+1];
+         send_map_starts_AN[i + 1] = send_map_starts[i + 1];
       }
+
       cnt = send_map_starts_AN[num_sends];
       for (i = 0; i < cnt; i++)
       {
          send_map_elmts_AN[i] = send_map_elmts[i];
       }
-      hypre_ParCSRCommPkgSendProcs(comm_pkg_AN) = send_procs_AN;
-      hypre_ParCSRCommPkgSendMapStarts(comm_pkg_AN) = send_map_starts_AN;
-      hypre_ParCSRCommPkgSendMapElmts(comm_pkg_AN) = send_map_elmts_AN;
-
-      recv_procs = hypre_ParCSRCommPkgRecvProcs(comm_pkg);
-      recv_vec_starts = hypre_ParCSRCommPkgRecvVecStarts(comm_pkg);
-      recv_vec_starts_AN = hypre_CTAlloc(HYPRE_Int,  num_recvs+1, HYPRE_MEMORY_HOST);
-      if (num_recvs) recv_procs_AN = hypre_CTAlloc(HYPRE_Int,  num_recvs, HYPRE_MEMORY_HOST);
 
-      recv_vec_starts_AN[0] = recv_vec_starts[0];
+      recv_vec_starts_AN = hypre_CTAlloc(HYPRE_Int,  num_recvs + 1, HYPRE_MEMORY_HOST);
+      if (num_recvs)
+      {
+         recv_procs_AN = hypre_CTAlloc(HYPRE_Int,  num_recvs, HYPRE_MEMORY_HOST);
+      }
       for (i = 0; i < num_recvs; i++)
       {
          recv_procs_AN[i] = recv_procs[i];
-         recv_vec_starts_AN[i+1] = recv_vec_starts[i+1];
-
+         recv_vec_starts_AN[i + 1] = recv_vec_starts[i + 1];
       }
-      hypre_ParCSRCommPkgRecvProcs(comm_pkg_AN) = recv_procs_AN;
-      hypre_ParCSRCommPkgRecvVecStarts(comm_pkg_AN) = recv_vec_starts_AN;
 
+      /* Create communication package */
+      hypre_ParCSRCommPkgCreateAndFill(comm,
+                                       num_recvs, recv_procs_AN, recv_vec_starts_AN,
+                                       num_sends, send_procs_AN, send_map_starts_AN,
+                                       send_map_elmts_AN,
+                                       &comm_pkg_AN);
    }
 
    /* the off-diag part */
@@ -224,7 +220,7 @@ hypre_BoomerAMGBlockCreateNodalA(hypre_ParCSRBlockMatrix *A,
    }
 
    num_nonzeros_offd = A_offd_i[num_nodes];
-   AN_offd_i = hypre_CTAlloc(HYPRE_Int,  num_nodes+1, HYPRE_MEMORY_HOST);
+   AN_offd_i = hypre_CTAlloc(HYPRE_Int,  num_nodes + 1, HYPRE_MEMORY_HOST);
    for (i = 0; i <= num_nodes; i++)
    {
       AN_offd_i[i] = A_offd_i[i];
@@ -236,7 +232,7 @@ hypre_BoomerAMGBlockCreateNodalA(hypre_ParCSRBlockMatrix *A,
    for (i = 0; i < num_nonzeros_offd; i++)
    {
       AN_offd_j[i]  = A_offd_j[i];
-      hypre_CSRBlockMatrixBlockNorm(norm_type, &A_offd_data[i*bnnz],
+      hypre_CSRBlockMatrixBlockNorm(norm_type, &A_offd_data[i * bnnz],
                                     &tmp, block_size);
       AN_offd_data[i] = tmp;
    }
@@ -255,7 +251,7 @@ hypre_BoomerAMGBlockCreateNodalA(hypre_ParCSRBlockMatrix *A,
       for (i = 0; i < num_nodes; i++)
       {
          sum = 0.0;
-         for (k = AN_offd_i[i]; k < AN_offd_i[i+1]; k++)
+         for (k = AN_offd_i[i]; k < AN_offd_i[i + 1]; k++)
          {
             sum += AN_offd_data[k];
          }
diff --git a/external/hypre/src/parcsr_block_mv/par_csr_block_comm.c b/external/hypre/src/parcsr_block_mv/par_csr_block_comm.c
index 195b10a0..af5c08f7 100644
--- a/external/hypre/src/parcsr_block_mv/par_csr_block_comm.c
+++ b/external/hypre/src/parcsr_block_mv/par_csr_block_comm.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -44,8 +44,8 @@ hypre_ParCSRBlockCommHandleCreate(HYPRE_Int job,
    num_requests = num_sends + num_recvs;
    requests = hypre_CTAlloc(hypre_MPI_Request,  num_requests, HYPRE_MEMORY_HOST);
 
-   hypre_MPI_Comm_size(comm,&num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_size(comm, &num_procs);
+   hypre_MPI_Comm_rank(comm, &my_id);
 
    j = 0;
 
@@ -56,19 +56,19 @@ hypre_ParCSRBlockCommHandleCreate(HYPRE_Int job,
          for (i = 0; i < num_recvs; i++)
          {
             ip = hypre_ParCSRCommPkgRecvProc(comm_pkg, i);
-            vec_start = hypre_ParCSRCommPkgRecvVecStart(comm_pkg,i);
+            vec_start = hypre_ParCSRCommPkgRecvVecStart(comm_pkg, i);
             vec_len =
-               (hypre_ParCSRCommPkgRecvVecStart(comm_pkg,i+1)-vec_start)*bnnz;
-            hypre_MPI_Irecv(&d_recv_data[vec_start*bnnz], vec_len,
+               (hypre_ParCSRCommPkgRecvVecStart(comm_pkg, i + 1) - vec_start) * bnnz;
+            hypre_MPI_Irecv(&d_recv_data[vec_start * bnnz], vec_len,
                             HYPRE_MPI_COMPLEX, ip, 0, comm, &requests[j++]);
          }
          for (i = 0; i < num_sends; i++)
          {
             vec_start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
             vec_len =
-               (hypre_ParCSRCommPkgSendMapStart(comm_pkg,i+1)-vec_start)*bnnz;
+               (hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1) - vec_start) * bnnz;
             ip = hypre_ParCSRCommPkgSendProc(comm_pkg, i);
-            hypre_MPI_Isend(&d_send_data[vec_start*bnnz], vec_len,
+            hypre_MPI_Isend(&d_send_data[vec_start * bnnz], vec_len,
                             HYPRE_MPI_COMPLEX, ip, 0, comm, &requests[j++]);
          }
          break;
@@ -80,18 +80,18 @@ hypre_ParCSRBlockCommHandleCreate(HYPRE_Int job,
          {
             vec_start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
             vec_len =
-               (hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1) - vec_start)*bnnz;
+               (hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1) - vec_start) * bnnz;
             ip = hypre_ParCSRCommPkgSendProc(comm_pkg, i);
-            hypre_MPI_Irecv(&d_recv_data[vec_start*bnnz], vec_len,
+            hypre_MPI_Irecv(&d_recv_data[vec_start * bnnz], vec_len,
                             HYPRE_MPI_COMPLEX, ip, 0, comm, &requests[j++]);
          }
          for (i = 0; i < num_recvs; i++)
          {
             ip = hypre_ParCSRCommPkgRecvProc(comm_pkg, i);
-            vec_start = hypre_ParCSRCommPkgRecvVecStart(comm_pkg,i);
+            vec_start = hypre_ParCSRCommPkgRecvVecStart(comm_pkg, i);
             vec_len =
-               (hypre_ParCSRCommPkgRecvVecStart(comm_pkg,i+1)-vec_start)*bnnz;
-            hypre_MPI_Isend(&d_send_data[vec_start*bnnz], vec_len,
+               (hypre_ParCSRCommPkgRecvVecStart(comm_pkg, i + 1) - vec_start) * bnnz;
+            hypre_MPI_Isend(&d_send_data[vec_start * bnnz], vec_len,
                             HYPRE_MPI_COMPLEX, ip, 0, comm, &requests[j++]);
          }
          break;
@@ -121,7 +121,7 @@ hypre_ParCSRBlockCommHandleDestroy(hypre_ParCSRCommHandle *comm_handle)
 {
    hypre_MPI_Status          *status0;
 
-   if ( comm_handle==NULL ) return hypre_error_flag;
+   if ( comm_handle == NULL ) { return hypre_error_flag; }
 
    if (hypre_ParCSRCommHandleNumRequests(comm_handle))
    {
@@ -205,7 +205,7 @@ hypre_ParCSRBlockMatrixDestroyAssumedPartition( hypre_ParCSRBlockMatrix *matrix
 
    apart = hypre_ParCSRMatrixAssumedPartition(matrix);
 
-   if(apart->storage_length > 0)
+   if (apart->storage_length > 0)
    {
       hypre_TFree(apart->proc_list, HYPRE_MEMORY_HOST);
       hypre_TFree(apart->row_start_list, HYPRE_MEMORY_HOST);
diff --git a/external/hypre/src/parcsr_block_mv/par_csr_block_interp.c b/external/hypre/src/parcsr_block_mv/par_csr_block_interp.c
index 9c733ecb..b2d11201 100644
--- a/external/hypre/src/parcsr_block_mv/par_csr_block_interp.c
+++ b/external/hypre/src/parcsr_block_mv/par_csr_block_interp.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -24,18 +24,19 @@
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_BoomerAMGBuildBlockInterp( hypre_ParCSRBlockMatrix *A,
-                                 HYPRE_Int               *CF_marker,
-                                 hypre_ParCSRMatrix   *S,
-                                 HYPRE_BigInt         *num_cpts_global,
-                                 HYPRE_Int             num_functions,
-                                 HYPRE_Int            *dof_func,
-                                 HYPRE_Int             debug_flag,
-                                 HYPRE_Real            trunc_factor,
-                                 HYPRE_Int             max_elmts,
-                                 HYPRE_Int             add_weak_to_diag,
-                                 hypre_ParCSRBlockMatrix  **P_ptr )
+hypre_BoomerAMGBuildBlockInterp( hypre_ParCSRBlockMatrix  *A,
+                                 HYPRE_Int                *CF_marker,
+                                 hypre_ParCSRMatrix       *S,
+                                 HYPRE_BigInt             *num_cpts_global,
+                                 HYPRE_Int                 num_functions,
+                                 HYPRE_Int                *dof_func,
+                                 HYPRE_Int                 debug_flag,
+                                 HYPRE_Real                trunc_factor,
+                                 HYPRE_Int                 max_elmts,
+                                 HYPRE_Int                 add_weak_to_diag,
+                                 hypre_ParCSRBlockMatrix **P_ptr )
 {
+   HYPRE_UNUSED_VAR(dof_func);
 
    MPI_Comm                 comm = hypre_ParCSRBlockMatrixComm(A);
    hypre_ParCSRCommPkg     *comm_pkg = hypre_ParCSRBlockMatrixCommPkg(A);
@@ -47,7 +48,7 @@ hypre_BoomerAMGBuildBlockInterp( hypre_ParCSRBlockMatrix *A,
    HYPRE_Int            *A_diag_j = hypre_CSRBlockMatrixJ(A_diag);
 
    HYPRE_Int             block_size = hypre_CSRBlockMatrixBlockSize(A_diag);
-   HYPRE_Int             bnnz = block_size*block_size;
+   HYPRE_Int             bnnz = block_size * block_size;
 
    hypre_CSRBlockMatrix *A_offd = hypre_ParCSRBlockMatrixOffd(A);
    HYPRE_Real           *A_offd_data = hypre_CSRBlockMatrixData(A_offd);
@@ -70,8 +71,7 @@ hypre_BoomerAMGBuildBlockInterp( hypre_ParCSRBlockMatrix *A,
 
    HYPRE_Int             *CF_marker_offd = NULL;
 
-   hypre_CSRBlockMatrix  *A_ext;
-
+   hypre_CSRBlockMatrix  *A_ext = NULL;
    HYPRE_Real            *A_ext_data = NULL;
    HYPRE_Int             *A_ext_i = NULL;
    HYPRE_BigInt          *A_ext_j = NULL;
@@ -90,10 +90,10 @@ hypre_BoomerAMGBuildBlockInterp( hypre_ParCSRBlockMatrix *A,
 
    HYPRE_Int             *P_marker, *P_marker_offd;
 
-   HYPRE_Int              jj_counter,jj_counter_offd;
+   HYPRE_Int              jj_counter, jj_counter_offd;
    HYPRE_Int             *jj_count, *jj_count_offd = NULL;
-   HYPRE_Int              jj_begin_row,jj_begin_row_offd;
-   HYPRE_Int              jj_end_row,jj_end_row_offd;
+   HYPRE_Int              jj_begin_row, jj_begin_row_offd;
+   HYPRE_Int              jj_end_row, jj_end_row_offd;
 
    HYPRE_Int              start_indexing = 0; /* start indexing for P_data at 0 */
 
@@ -110,8 +110,8 @@ hypre_BoomerAMGBuildBlockInterp( hypre_ParCSRBlockMatrix *A,
 
    HYPRE_Int              bd;
 
-   HYPRE_Int              i,i1,i2;
-   HYPRE_Int              j,jl,jj,jj1;
+   HYPRE_Int              i, i1, i2;
+   HYPRE_Int              j, jl, jj, jj1;
    HYPRE_Int              kc;
    HYPRE_BigInt           big_k;
    HYPRE_Int              start;
@@ -131,7 +131,7 @@ hypre_BoomerAMGBuildBlockInterp( hypre_ParCSRBlockMatrix *A,
    HYPRE_Int local_numrows = hypre_CSRBlockMatrixNumRows(A_diag);
    HYPRE_BigInt col_n = col_1 + (HYPRE_BigInt)local_numrows;
 
-   HYPRE_Real       wall_time;  /* for debugging instrumentation  */
+   HYPRE_Real       wall_time = 0.0;  /* for debugging instrumentation  */
 
    HYPRE_Real       *identity_block;
    HYPRE_Real       *zero_block;
@@ -140,19 +140,24 @@ hypre_BoomerAMGBuildBlockInterp( hypre_ParCSRBlockMatrix *A,
    HYPRE_Real       *distribute_block;
 
    hypre_MPI_Comm_size(comm, &num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_rank(comm, &my_id);
    /* num_threads = hypre_NumThreads(); */
    num_threads = 1;
 
+   if (num_functions > 1)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Not implemented for num_functions > 1!");
+   }
+
    my_first_cpt = num_cpts_global[0];
-   if (my_id == (num_procs -1)) total_global_cpts = num_cpts_global[1];
-   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
+   if (my_id == (num_procs - 1)) { total_global_cpts = num_cpts_global[1]; }
+   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
 
    /*-------------------------------------------------------------------
     * Get the CF_marker data for the off-processor columns
     *-------------------------------------------------------------------*/
 
-   if (debug_flag==4) wall_time = time_getWallclockSeconds();
+   if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
 
    CF_marker_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_A_offd, HYPRE_MEMORY_HOST);
 
@@ -164,31 +169,29 @@ hypre_BoomerAMGBuildBlockInterp( hypre_ParCSRBlockMatrix *A,
    }
 
    num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
-   int_buf_data = hypre_CTAlloc(HYPRE_Int,  hypre_ParCSRCommPkgSendMapStart(comm_pkg,
-                                                   num_sends), HYPRE_MEMORY_HOST);
+   int_buf_data = hypre_CTAlloc(HYPRE_Int,
+                                hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                                HYPRE_MEMORY_HOST);
 
    index = 0;
    for (i = 0; i < num_sends; i++)
    {
       start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
       {
          int_buf_data[index++]
-            = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+            = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
       }
-
    }
 
    /* we do not need the block version of comm handle - because
       CF_marker corresponds to the nodal matrix.  This call populates
       CF_marker_offd */
-   comm_handle = hypre_ParCSRCommHandleCreate( 11, comm_pkg, int_buf_data,
-                                               CF_marker_offd);
-
+   comm_handle = hypre_ParCSRCommHandleCreate(11, comm_pkg, int_buf_data,
+                                              CF_marker_offd);
    hypre_ParCSRCommHandleDestroy(comm_handle);
 
-
-   if (debug_flag==4)
+   if (debug_flag == 4)
    {
       wall_time = time_getWallclockSeconds() - wall_time;
       hypre_printf("Proc = %d     Interp: Comm 1 CF_marker =    %f\n",
@@ -200,7 +203,7 @@ hypre_BoomerAMGBuildBlockInterp( hypre_ParCSRBlockMatrix *A,
     * Get the ghost rows of A
     *---------------------------------------------------------------------*/
 
-   if (debug_flag==4) wall_time = time_getWallclockSeconds();
+   if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
 
    if (num_procs > 1)
    {
@@ -211,9 +214,9 @@ hypre_BoomerAMGBuildBlockInterp( hypre_ParCSRBlockMatrix *A,
    }
 
    index = 0;
-   for (i=0; i < num_cols_A_offd; i++)
+   for (i = 0; i < num_cols_A_offd; i++)
    {
-      for (j=A_ext_i[i]; j < A_ext_i[i+1]; j++)
+      for (j = A_ext_i[i]; j < A_ext_i[i + 1]; j++)
       {
          big_k = A_ext_j[j];
          if (big_k >= col_1 && big_k < col_n)
@@ -222,7 +225,7 @@ hypre_BoomerAMGBuildBlockInterp( hypre_ParCSRBlockMatrix *A,
             /* for the data field we must get all of the block data */
             for (bd = 0; bd < bnnz; bd++)
             {
-               A_ext_data[index*bnnz + bd] = A_ext_data[j*bnnz + bd];
+               A_ext_data[index * bnnz + bd] = A_ext_data[j * bnnz + bd];
             }
             index++;
          }
@@ -231,10 +234,10 @@ hypre_BoomerAMGBuildBlockInterp( hypre_ParCSRBlockMatrix *A,
             kc = hypre_BigBinarySearch(col_map_offd, big_k, num_cols_A_offd);
             if (kc > -1)
             {
-               A_ext_j[index] = (HYPRE_BigInt)(-kc-1);
+               A_ext_j[index] = (HYPRE_BigInt)(-kc - 1);
                for (bd = 0; bd < bnnz; bd++)
                {
-                  A_ext_data[index*bnnz + bd] = A_ext_data[j*bnnz + bd];
+                  A_ext_data[index * bnnz + bd] = A_ext_data[j * bnnz + bd];
                }
                index++;
             }
@@ -243,10 +246,12 @@ hypre_BoomerAMGBuildBlockInterp( hypre_ParCSRBlockMatrix *A,
       A_ext_i[i] = index;
    }
    for (i = num_cols_A_offd; i > 0; i--)
-      A_ext_i[i] = A_ext_i[i-1];
-   if (num_procs > 1) A_ext_i[0] = 0;
+   {
+      A_ext_i[i] = A_ext_i[i - 1];
+   }
+   if (num_procs > 1) { A_ext_i[0] = 0; }
 
-   if (debug_flag==4)
+   if (debug_flag == 4)
    {
       wall_time = time_getWallclockSeconds() - wall_time;
       hypre_printf("Proc = %d  Interp: Comm 2   Get A_ext =  %f\n",
@@ -269,7 +274,7 @@ hypre_BoomerAMGBuildBlockInterp( hypre_ParCSRBlockMatrix *A,
 
    fine_to_coarse = hypre_CTAlloc(HYPRE_Int,  n_fine, HYPRE_MEMORY_HOST);
 
-   for (i = 0; i < n_fine; i++) fine_to_coarse[i] = -1;
+   for (i = 0; i < n_fine; i++) { fine_to_coarse[i] = -1; }
 
    jj_counter = start_indexing;
    jj_counter_offd = start_indexing;
@@ -281,17 +286,17 @@ hypre_BoomerAMGBuildBlockInterp( hypre_ParCSRBlockMatrix *A,
 
    for (j = 0; j < num_threads; j++)
    {
-      size = n_fine/num_threads;
-      rest = n_fine - size*num_threads;
+      size = n_fine / num_threads;
+      rest = n_fine - size * num_threads;
       if (j < rest)
       {
-         ns = j*size+j;
-         ne = (j+1)*size+j+1;
+         ns = j * size + j;
+         ne = (j + 1) * size + j + 1;
       }
       else
       {
-         ns = j*size+rest;
-         ne = (j+1)*size+rest;
+         ns = j * size + rest;
+         ne = (j + 1) * size + rest;
       }
 
 
@@ -318,7 +323,7 @@ hypre_BoomerAMGBuildBlockInterp( hypre_ParCSRBlockMatrix *A,
 
          else
          {
-            for (jj = S_diag_i[i]; jj < S_diag_i[i+1]; jj++)
+            for (jj = S_diag_i[i]; jj < S_diag_i[i + 1]; jj++)
             {
                i1 = S_diag_j[jj];
                if (CF_marker[i1] >= 0)
@@ -329,7 +334,7 @@ hypre_BoomerAMGBuildBlockInterp( hypre_ParCSRBlockMatrix *A,
 
             if (num_procs > 1)
             {
-               for (jj = S_offd_i[i]; jj < S_offd_i[i+1]; jj++)
+               for (jj = S_offd_i[i]; jj < S_offd_i[i + 1]; jj++)
                {
                   i1 = S_offd_j[jj];
                   if (CF_marker_offd[i1] >= 0)
@@ -346,32 +351,32 @@ hypre_BoomerAMGBuildBlockInterp( hypre_ParCSRBlockMatrix *A,
     *  Allocate  arrays.
     *-----------------------------------------------------------------------*/
 
-   for (i=0; i < num_threads-1; i++)
+   for (i = 0; i < num_threads - 1; i++)
    {
-      coarse_counter[i+1] += coarse_counter[i];
-      jj_count[i+1] += jj_count[i];
-      jj_count_offd[i+1] += jj_count_offd[i];
+      coarse_counter[i + 1] += coarse_counter[i];
+      jj_count[i + 1] += jj_count[i];
+      jj_count_offd[i + 1] += jj_count_offd[i];
    }
-   i = num_threads-1;
+   i = num_threads - 1;
    jj_counter = jj_count[i];
    jj_counter_offd = jj_count_offd[i];
 
    P_diag_size = jj_counter;
 
-   P_diag_i    = hypre_CTAlloc(HYPRE_Int,  n_fine+1, HYPRE_MEMORY_HOST);
+   P_diag_i    = hypre_CTAlloc(HYPRE_Int,  n_fine + 1, HYPRE_MEMORY_HOST);
    P_diag_j    = hypre_CTAlloc(HYPRE_Int,  P_diag_size, HYPRE_MEMORY_HOST);
    /* we need to include the size of the blocks in the data size */
-   P_diag_data = hypre_CTAlloc(HYPRE_Real,  P_diag_size*bnnz, HYPRE_MEMORY_HOST);
+   P_diag_data = hypre_CTAlloc(HYPRE_Real,  P_diag_size * bnnz, HYPRE_MEMORY_HOST);
 
    P_diag_i[n_fine] = jj_counter;
 
 
    P_offd_size = jj_counter_offd;
 
-   P_offd_i    = hypre_CTAlloc(HYPRE_Int,  n_fine+1, HYPRE_MEMORY_HOST);
+   P_offd_i    = hypre_CTAlloc(HYPRE_Int,  n_fine + 1, HYPRE_MEMORY_HOST);
    P_offd_j    = hypre_CTAlloc(HYPRE_Int,  P_offd_size, HYPRE_MEMORY_HOST);
    /* we need to include the size of the blocks in the data size */
-   P_offd_data = hypre_CTAlloc(HYPRE_Real,  P_offd_size*bnnz, HYPRE_MEMORY_HOST);
+   P_offd_data = hypre_CTAlloc(HYPRE_Real,  P_offd_size * bnnz, HYPRE_MEMORY_HOST);
 
    /*-----------------------------------------------------------------------
     *  Intialize some stuff.
@@ -380,7 +385,7 @@ hypre_BoomerAMGBuildBlockInterp( hypre_ParCSRBlockMatrix *A,
    jj_counter = start_indexing;
    jj_counter_offd = start_indexing;
 
-   if (debug_flag==4)
+   if (debug_flag == 4)
    {
       wall_time = time_getWallclockSeconds() - wall_time;
       hypre_printf("Proc = %d     Interp: Internal work 1 =     %f\n",
@@ -392,9 +397,9 @@ hypre_BoomerAMGBuildBlockInterp( hypre_ParCSRBlockMatrix *A,
    identity_block = hypre_CTAlloc(HYPRE_Real,  bnnz, HYPRE_MEMORY_HOST);
    zero_block =  hypre_CTAlloc(HYPRE_Real,  bnnz, HYPRE_MEMORY_HOST);
 
-   for(i = 0; i < block_size; i++)
+   for (i = 0; i < block_size; i++)
    {
-      identity_block[i*block_size + i] = 1.0;
+      identity_block[i * block_size + i] = 1.0;
    }
 
 
@@ -407,38 +412,40 @@ hypre_BoomerAMGBuildBlockInterp( hypre_ParCSRBlockMatrix *A,
     *  Send and receive fine_to_coarse info.
     *-----------------------------------------------------------------------*/
 
-   if (debug_flag==4) wall_time = time_getWallclockSeconds();
+   if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
 
    fine_to_coarse_offd = hypre_CTAlloc(HYPRE_BigInt,  num_cols_A_offd, HYPRE_MEMORY_HOST);
    big_buf_data = hypre_CTAlloc(HYPRE_BigInt,  hypre_ParCSRCommPkgSendMapStart(comm_pkg,
-                                                          num_sends), HYPRE_MEMORY_HOST);
+                                                                               num_sends), HYPRE_MEMORY_HOST);
 
    for (j = 0; j < num_threads; j++)
    {
       coarse_shift = 0;
-      if (j > 0) coarse_shift = coarse_counter[j-1];
-      size = n_fine/num_threads;
-      rest = n_fine - size*num_threads;
+      if (j > 0) { coarse_shift = coarse_counter[j - 1]; }
+      size = n_fine / num_threads;
+      rest = n_fine - size * num_threads;
       if (j < rest)
       {
-         ns = j*size+j;
-         ne = (j+1)*size+j+1;
+         ns = j * size + j;
+         ne = (j + 1) * size + j + 1;
       }
       else
       {
-         ns = j*size+rest;
-         ne = (j+1)*size+rest;
+         ns = j * size + rest;
+         ne = (j + 1) * size + rest;
       }
       for (i = ns; i < ne; i++)
+      {
          fine_to_coarse[i] += coarse_shift;
+      }
    }
    index = 0;
    for (i = 0; i < num_sends; i++)
    {
       start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
          big_buf_data[index++]
-            = my_first_cpt+fine_to_coarse[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+            = my_first_cpt + fine_to_coarse[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
    }
 
    /* again, we do not need to use the block version of comm handle since
@@ -449,7 +456,7 @@ hypre_BoomerAMGBuildBlockInterp( hypre_ParCSRBlockMatrix *A,
 
    hypre_ParCSRCommHandleDestroy(comm_handle);
 
-   if (debug_flag==4)
+   if (debug_flag == 4)
    {
       wall_time = time_getWallclockSeconds() - wall_time;
       hypre_printf("Proc = %d     Interp: Comm 4 FineToCoarse = %f\n",
@@ -457,7 +464,7 @@ hypre_BoomerAMGBuildBlockInterp( hypre_ParCSRBlockMatrix *A,
       fflush(NULL);
    }
 
-   if (debug_flag==4) wall_time = time_getWallclockSeconds();
+   if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
 
    /*-----------------------------------------------------------------------
     *  Loop over fine grid points.
@@ -465,22 +472,22 @@ hypre_BoomerAMGBuildBlockInterp( hypre_ParCSRBlockMatrix *A,
 
    for (jl = 0; jl < num_threads; jl++)
    {
-      size = n_fine/num_threads;
-      rest = n_fine - size*num_threads;
+      size = n_fine / num_threads;
+      rest = n_fine - size * num_threads;
       if (jl < rest)
       {
-         ns = jl*size+jl;
-         ne = (jl+1)*size+jl+1;
+         ns = jl * size + jl;
+         ne = (jl + 1) * size + jl + 1;
       }
       else
       {
-         ns = jl*size+rest;
-         ne = (jl+1)*size+rest;
+         ns = jl * size + rest;
+         ne = (jl + 1) * size + rest;
       }
       jj_counter = 0;
-      if (jl > 0) jj_counter = jj_count[jl-1];
+      if (jl > 0) { jj_counter = jj_count[jl - 1]; }
       jj_counter_offd = 0;
-      if (jl > 0) jj_counter_offd = jj_count_offd[jl-1];
+      if (jl > 0) { jj_counter_offd = jj_count_offd[jl - 1]; }
 
       P_marker = hypre_CTAlloc(HYPRE_Int,  n_fine, HYPRE_MEMORY_HOST);
       P_marker_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_A_offd, HYPRE_MEMORY_HOST);
@@ -508,7 +515,7 @@ hypre_BoomerAMGBuildBlockInterp( hypre_ParCSRBlockMatrix *A,
             P_diag_j[jj_counter]    = fine_to_coarse[i];
             /* P_diag_data[jj_counter] = one; */
             hypre_CSRBlockMatrixBlockCopyData(identity_block,
-                                              &P_diag_data[jj_counter*bnnz],
+                                              &P_diag_data[jj_counter * bnnz],
                                               1.0, block_size);
             jj_counter++;
          }
@@ -523,7 +530,7 @@ hypre_BoomerAMGBuildBlockInterp( hypre_ParCSRBlockMatrix *A,
             P_diag_i[i] = jj_counter;
             jj_begin_row = jj_counter;
 
-            for (jj = S_diag_i[i]; jj < S_diag_i[i+1]; jj++)
+            for (jj = S_diag_i[i]; jj < S_diag_i[i + 1]; jj++)
             {
                i1 = S_diag_j[jj];
 
@@ -538,7 +545,7 @@ hypre_BoomerAMGBuildBlockInterp( hypre_ParCSRBlockMatrix *A,
                   P_diag_j[jj_counter]    = fine_to_coarse[i1];
                   /* P_diag_data[jj_counter] = zero; */
                   hypre_CSRBlockMatrixBlockCopyData(zero_block,
-                                                    &P_diag_data[jj_counter*bnnz],
+                                                    &P_diag_data[jj_counter * bnnz],
                                                     1.0, block_size);
                   jj_counter++;
                }
@@ -562,7 +569,7 @@ hypre_BoomerAMGBuildBlockInterp( hypre_ParCSRBlockMatrix *A,
 
             if (num_procs > 1)
             {
-               for (jj = S_offd_i[i]; jj < S_offd_i[i+1]; jj++)
+               for (jj = S_offd_i[i]; jj < S_offd_i[i + 1]; jj++)
                {
                   i1 = S_offd_j[jj];
 
@@ -577,10 +584,10 @@ hypre_BoomerAMGBuildBlockInterp( hypre_ParCSRBlockMatrix *A,
                      P_offd_j[jj_counter_offd]  = i1;
                      /* P_offd_data[jj_counter_offd] = zero; */
                      hypre_CSRBlockMatrixBlockCopyData(zero_block,
-                                                       &P_offd_data[jj_counter_offd*bnnz],
+                                                       &P_offd_data[jj_counter_offd * bnnz],
                                                        1.0, block_size);
 
-                      jj_counter_offd++;
+                     jj_counter_offd++;
                   }
 
                   /*-----------------------------------------------------------
@@ -609,7 +616,7 @@ hypre_BoomerAMGBuildBlockInterp( hypre_ParCSRBlockMatrix *A,
 
             /* Loop over ith row of A.  First, the diagonal part of A */
 
-            for (jj = A_diag_i[i]+1; jj < A_diag_i[i+1]; jj++)
+            for (jj = A_diag_i[i] + 1; jj < A_diag_i[i + 1]; jj++)
             {
                i1 = A_diag_j[jj];
 
@@ -621,7 +628,7 @@ hypre_BoomerAMGBuildBlockInterp( hypre_ParCSRBlockMatrix *A,
                if (P_marker[i1] >= jj_begin_row)
                {
                   /*   P_diag_data[P_marker[i1]] += A_diag_data[jj]; */
-                  hypre_CSRBlockMatrixBlockAddAccumulate(&A_diag_data[jj*bnnz],
+                  hypre_CSRBlockMatrixBlockAddAccumulate(&A_diag_data[jj * bnnz],
                                                          &P_diag_data[P_marker[i1]*bnnz],
                                                          block_size);
 
@@ -647,14 +654,14 @@ hypre_BoomerAMGBuildBlockInterp( hypre_ParCSRBlockMatrix *A,
                    *-----------------------------------------------------------*/
 
                   /* Diagonal block part of row i1 */
-                  for (jj1 = A_diag_i[i1]; jj1 < A_diag_i[i1+1]; jj1++)
+                  for (jj1 = A_diag_i[i1]; jj1 < A_diag_i[i1 + 1]; jj1++)
                   {
                      i2 = A_diag_j[jj1];
                      if (P_marker[i2] >= jj_begin_row)
                      {
                         /* add diag data to sum */
                         /* sum += A_diag_data[jj1]; */
-                        hypre_CSRBlockMatrixBlockAddAccumulate(&A_diag_data[jj1*bnnz],
+                        hypre_CSRBlockMatrixBlockAddAccumulate(&A_diag_data[jj1 * bnnz],
                                                                sum_block, block_size);
                      }
                   }
@@ -662,14 +669,14 @@ hypre_BoomerAMGBuildBlockInterp( hypre_ParCSRBlockMatrix *A,
                   /* Off-Diagonal block part of row i1 */
                   if (num_procs > 1)
                   {
-                     for (jj1 = A_offd_i[i1]; jj1 < A_offd_i[i1+1]; jj1++)
+                     for (jj1 = A_offd_i[i1]; jj1 < A_offd_i[i1 + 1]; jj1++)
                      {
                         i2 = A_offd_j[jj1];
                         if (P_marker_offd[i2] >= jj_begin_row_offd )
                         {
                            /* add off diag data to sum */
                            /*sum += A_offd_data[jj1];*/
-                           hypre_CSRBlockMatrixBlockAddAccumulate(&A_offd_data[jj1*bnnz],
+                           hypre_CSRBlockMatrixBlockAddAccumulate(&A_offd_data[jj1 * bnnz],
                                                                   sum_block, block_size);
 
                         }
@@ -683,7 +690,7 @@ hypre_BoomerAMGBuildBlockInterp( hypre_ParCSRBlockMatrix *A,
                      we do sum^(-1) * A_diag_data - but it seems to matter
                      a little for very non-sym */
 
-                  if (hypre_CSRBlockMatrixBlockMultInv(sum_block, &A_diag_data[jj*bnnz],
+                  if (hypre_CSRBlockMatrixBlockMultInv(sum_block, &A_diag_data[jj * bnnz],
                                                        distribute_block, block_size) == 0)
                   {
 
@@ -693,7 +700,7 @@ hypre_BoomerAMGBuildBlockInterp( hypre_ParCSRBlockMatrix *A,
                       *-----------------------------------------------------------*/
 
                      /* Diagonal block part of row i1 */
-                     for (jj1 = A_diag_i[i1]; jj1 < A_diag_i[i1+1]; jj1++)
+                     for (jj1 = A_diag_i[i1]; jj1 < A_diag_i[i1 + 1]; jj1++)
                      {
                         i2 = A_diag_j[jj1];
                         if (P_marker[i2] >= jj_begin_row )
@@ -704,7 +711,7 @@ hypre_BoomerAMGBuildBlockInterp( hypre_ParCSRBlockMatrix *A,
 
                            /* multiply - result in sum_block */
                            hypre_CSRBlockMatrixBlockMultAdd(distribute_block,
-                                                            &A_diag_data[jj1*bnnz], 0.0,
+                                                            &A_diag_data[jj1 * bnnz], 0.0,
                                                             sum_block, block_size);
 
 
@@ -719,7 +726,7 @@ hypre_BoomerAMGBuildBlockInterp( hypre_ParCSRBlockMatrix *A,
                      /* Off-Diagonal block part of row i1 */
                      if (num_procs > 1)
                      {
-                        for (jj1 = A_offd_i[i1]; jj1 < A_offd_i[i1+1]; jj1++)
+                        for (jj1 = A_offd_i[i1]; jj1 < A_offd_i[i1 + 1]; jj1++)
                         {
                            i2 = A_offd_j[jj1];
                            if (P_marker_offd[i2] >= jj_begin_row_offd)
@@ -729,7 +736,7 @@ hypre_BoomerAMGBuildBlockInterp( hypre_ParCSRBlockMatrix *A,
 
                               /* multiply - result in sum_block */
                               hypre_CSRBlockMatrixBlockMultAdd(distribute_block,
-                                                               &A_offd_data[jj1*bnnz], 0.0,
+                                                               &A_offd_data[jj1 * bnnz], 0.0,
                                                                sum_block, block_size);
 
 
@@ -744,9 +751,9 @@ hypre_BoomerAMGBuildBlockInterp( hypre_ParCSRBlockMatrix *A,
                   else /* sum block is all zeros (or almost singular) - just add to diagonal */
                   {
                      /* diagonal += A_diag_data[jj]; */
-                     if (add_weak_to_diag) hypre_CSRBlockMatrixBlockAddAccumulate(&A_diag_data[jj*bnnz],
-                                                                                  diagonal_block,
-                                                                                  block_size);
+                     if (add_weak_to_diag) hypre_CSRBlockMatrixBlockAddAccumulate(&A_diag_data[jj * bnnz],
+                                                                                     diagonal_block,
+                                                                                     block_size);
 
                   }
                }
@@ -759,7 +766,7 @@ hypre_BoomerAMGBuildBlockInterp( hypre_ParCSRBlockMatrix *A,
                else if (CF_marker[i1] != -3 && add_weak_to_diag)
                {
                   /* diagonal += A_diag_data[jj];*/
-                  hypre_CSRBlockMatrixBlockAddAccumulate(&A_diag_data[jj*bnnz],
+                  hypre_CSRBlockMatrixBlockAddAccumulate(&A_diag_data[jj * bnnz],
                                                          diagonal_block,
                                                          block_size);
 
@@ -775,7 +782,7 @@ hypre_BoomerAMGBuildBlockInterp( hypre_ParCSRBlockMatrix *A,
 
             if (num_procs > 1)
             {
-               for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+               for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
                {
                   i1 = A_offd_j[jj];
 
@@ -787,7 +794,7 @@ hypre_BoomerAMGBuildBlockInterp( hypre_ParCSRBlockMatrix *A,
                   if (P_marker_offd[i1] >= jj_begin_row_offd)
                   {
                      /* P_offd_data[P_marker_offd[i1]] += A_offd_data[jj]; */
-                     hypre_CSRBlockMatrixBlockAddAccumulate( &A_offd_data[jj*bnnz],
+                     hypre_CSRBlockMatrixBlockAddAccumulate( &A_offd_data[jj * bnnz],
                                                              &P_offd_data[P_marker_offd[i1]*bnnz],
                                                              block_size);
                   }
@@ -813,7 +820,7 @@ hypre_BoomerAMGBuildBlockInterp( hypre_ParCSRBlockMatrix *A,
                      /* find row number */
                      c_num = A_offd_j[jj];
 
-                     for (jj1 = A_ext_i[c_num]; jj1 < A_ext_i[c_num+1]; jj1++)
+                     for (jj1 = A_ext_i[c_num]; jj1 < A_ext_i[c_num + 1]; jj1++)
                      {
                         i2 = (HYPRE_Int)A_ext_j[jj1];
 
@@ -823,17 +830,17 @@ hypre_BoomerAMGBuildBlockInterp( hypre_ParCSRBlockMatrix *A,
                            if (P_marker[i2] >= jj_begin_row)
                            {
                               /* sum += A_ext_data[jj1]; */
-                              hypre_CSRBlockMatrixBlockAddAccumulate(&A_ext_data[jj1*bnnz],
+                              hypre_CSRBlockMatrixBlockAddAccumulate(&A_ext_data[jj1 * bnnz],
                                                                      sum_block, block_size);
                            }
                         }
                         else
                         {
                            /* in the off_diagonal block  */
-                           if (P_marker_offd[-i2-1] >= jj_begin_row_offd)
+                           if (P_marker_offd[-i2 - 1] >= jj_begin_row_offd)
                            {
                               /* sum += A_ext_data[jj1]; */
-                              hypre_CSRBlockMatrixBlockAddAccumulate(&A_ext_data[jj1*bnnz],
+                              hypre_CSRBlockMatrixBlockAddAccumulate(&A_ext_data[jj1 * bnnz],
                                                                      sum_block, block_size);
 
                            }
@@ -845,7 +852,7 @@ hypre_BoomerAMGBuildBlockInterp( hypre_ParCSRBlockMatrix *A,
 
                      /* distribute = A_offd_data[jj] / sum;  */
                      /* here we want: A_offd_data * sum^(-1) */
-                     if (hypre_CSRBlockMatrixBlockMultInv(sum_block, &A_offd_data[jj*bnnz],
+                     if (hypre_CSRBlockMatrixBlockMultInv(sum_block, &A_offd_data[jj * bnnz],
                                                           distribute_block, block_size) == 0)
                      {
 
@@ -856,7 +863,7 @@ hypre_BoomerAMGBuildBlockInterp( hypre_ParCSRBlockMatrix *A,
 
                         /* Diagonal block part of row i1 */
 
-                        for (jj1 = A_ext_i[c_num]; jj1 < A_ext_i[c_num+1]; jj1++)
+                        for (jj1 = A_ext_i[c_num]; jj1 < A_ext_i[c_num + 1]; jj1++)
                         {
                            i2 = (HYPRE_Int)A_ext_j[jj1];
 
@@ -869,7 +876,7 @@ hypre_BoomerAMGBuildBlockInterp( hypre_ParCSRBlockMatrix *A,
 
                                  /* multiply - result in sum_block */
                                  hypre_CSRBlockMatrixBlockMultAdd(distribute_block,
-                                                                  &A_ext_data[jj1*bnnz], 0.0,
+                                                                  &A_ext_data[jj1 * bnnz], 0.0,
                                                                   sum_block, block_size);
 
 
@@ -883,7 +890,7 @@ hypre_BoomerAMGBuildBlockInterp( hypre_ParCSRBlockMatrix *A,
                            else
                            {
                               /* in the off_diagonal block  */
-                              if (P_marker_offd[-i2-1] >= jj_begin_row_offd)
+                              if (P_marker_offd[-i2 - 1] >= jj_begin_row_offd)
 
                                  /*P_offd_data[P_marker_offd[-i2-1]]
                                    += distribute * A_ext_data[jj1];*/
@@ -891,13 +898,13 @@ hypre_BoomerAMGBuildBlockInterp( hypre_ParCSRBlockMatrix *A,
 
                                  /* multiply - result in sum_block */
                                  hypre_CSRBlockMatrixBlockMultAdd(distribute_block,
-                                                                  &A_ext_data[jj1*bnnz], 0.0,
+                                                                  &A_ext_data[jj1 * bnnz], 0.0,
                                                                   sum_block, block_size);
 
 
                                  /* add result to p_offd_data */
                                  hypre_CSRBlockMatrixBlockAddAccumulate(sum_block,
-                                                                        &P_offd_data[P_marker_offd[-i2-1]*bnnz],
+                                                                        &P_offd_data[P_marker_offd[-i2 - 1]*bnnz],
                                                                         block_size);
                               }
 
@@ -908,9 +915,9 @@ hypre_BoomerAMGBuildBlockInterp( hypre_ParCSRBlockMatrix *A,
                      else /* sum block is all zeros - just add to diagonal */
                      {
                         /* diagonal += A_offd_data[jj]; */
-                        if (add_weak_to_diag) hypre_CSRBlockMatrixBlockAddAccumulate(&A_offd_data[jj*bnnz],
-                                                                                     diagonal_block,
-                                                                                     block_size);
+                        if (add_weak_to_diag) hypre_CSRBlockMatrixBlockAddAccumulate(&A_offd_data[jj * bnnz],
+                                                                                        diagonal_block,
+                                                                                        block_size);
 
                      }
                   }
@@ -923,7 +930,7 @@ hypre_BoomerAMGBuildBlockInterp( hypre_ParCSRBlockMatrix *A,
                   else if (CF_marker_offd[i1] != -3 && add_weak_to_diag)
                   {
                      /* diagonal += A_offd_data[jj]; */
-                     hypre_CSRBlockMatrixBlockAddAccumulate(&A_offd_data[jj*bnnz],
+                     hypre_CSRBlockMatrixBlockAddAccumulate(&A_offd_data[jj * bnnz],
                                                             diagonal_block,
                                                             block_size);
 
@@ -942,18 +949,18 @@ hypre_BoomerAMGBuildBlockInterp( hypre_ParCSRBlockMatrix *A,
 
                /* want diagonal^(-1)*P_diag_data */
                /* do division - put in sum_block */
-               if ( hypre_CSRBlockMatrixBlockInvMult(diagonal_block, &P_diag_data[jj*bnnz],
+               if ( hypre_CSRBlockMatrixBlockInvMult(diagonal_block, &P_diag_data[jj * bnnz],
                                                      sum_block, block_size) == 0)
                {
                   /* now copy to  P_diag_data[jj] and make negative */
-                  hypre_CSRBlockMatrixBlockCopyData(sum_block, &P_diag_data[jj*bnnz],
+                  hypre_CSRBlockMatrixBlockCopyData(sum_block, &P_diag_data[jj * bnnz],
                                                     -1.0, block_size);
                }
                else
                {
                   /* hypre_printf(" Warning! singular diagonal block! Proc id %d row %d\n", my_id,i);  */
                   /* just make P_diag_data negative since diagonal is singular) */
-                  hypre_CSRBlockMatrixBlockCopyData(&P_diag_data[jj*bnnz], &P_diag_data[jj*bnnz],
+                  hypre_CSRBlockMatrixBlockCopyData(&P_diag_data[jj * bnnz], &P_diag_data[jj * bnnz],
                                                     -1.0, block_size);
 
                }
@@ -964,11 +971,11 @@ hypre_BoomerAMGBuildBlockInterp( hypre_ParCSRBlockMatrix *A,
                /* P_offd_data[jj] /= -diagonal; */
 
                /* do division - put in sum_block */
-               hypre_CSRBlockMatrixBlockInvMult(diagonal_block, &P_offd_data[jj*bnnz],
+               hypre_CSRBlockMatrixBlockInvMult(diagonal_block, &P_offd_data[jj * bnnz],
                                                 sum_block, block_size);
 
                /* now copy to  P_offd_data[jj] and make negative */
-               hypre_CSRBlockMatrixBlockCopyData(sum_block, &P_offd_data[jj*bnnz],
+               hypre_CSRBlockMatrixBlockCopyData(sum_block, &P_offd_data[jj * bnnz],
                                                  -1.0, block_size);
 
 
@@ -979,7 +986,7 @@ hypre_BoomerAMGBuildBlockInterp( hypre_ParCSRBlockMatrix *A,
 
          strong_f_marker--;
 
-         P_offd_i[i+1] = jj_counter_offd;
+         P_offd_i[i + 1] = jj_counter_offd;
       }
       hypre_TFree(P_marker, HYPRE_MEMORY_HOST);
       hypre_TFree(P_marker_offd, HYPRE_MEMORY_HOST);
@@ -1024,11 +1031,13 @@ hypre_BoomerAMGBuildBlockInterp( hypre_ParCSRBlockMatrix *A,
    {
       P_marker = hypre_CTAlloc(HYPRE_Int,  num_cols_A_offd, HYPRE_MEMORY_HOST);
 
-      for (i=0; i < num_cols_A_offd; i++)
+      for (i = 0; i < num_cols_A_offd; i++)
+      {
          P_marker[i] = 0;
+      }
 
       num_cols_P_offd = 0;
-      for (i=0; i < P_offd_size; i++)
+      for (i = 0; i < P_offd_size; i++)
       {
          index = P_offd_j[i];
          if (!P_marker[index])
@@ -1042,21 +1051,21 @@ hypre_BoomerAMGBuildBlockInterp( hypre_ParCSRBlockMatrix *A,
       tmp_map_offd = hypre_CTAlloc(HYPRE_Int, num_cols_P_offd, HYPRE_MEMORY_HOST);
 
       index = 0;
-      for (i=0; i < num_cols_P_offd; i++)
+      for (i = 0; i < num_cols_P_offd; i++)
       {
-         while (P_marker[index]==0) index++;
+         while (P_marker[index] == 0) { index++; }
          tmp_map_offd[i] = index++;
       }
 
-      for (i=0; i < P_offd_size; i++)
+      for (i = 0; i < P_offd_size; i++)
          P_offd_j[i] = hypre_BinarySearch(tmp_map_offd,
                                           P_offd_j[i],
                                           num_cols_P_offd);
       hypre_TFree(P_marker, HYPRE_MEMORY_HOST);
    }
 
-   for (i=0; i < n_fine; i++)
-      if (CF_marker[i] == -3) CF_marker[i] = -1;
+   for (i = 0; i < n_fine; i++)
+      if (CF_marker[i] == -3) { CF_marker[i] = -1; }
 
    if (num_cols_P_offd)
    {
@@ -1065,7 +1074,7 @@ hypre_BoomerAMGBuildBlockInterp( hypre_ParCSRBlockMatrix *A,
    }
 
    /* use block version */
-   hypre_GetCommPkgBlockRTFromCommPkgBlockA(P,A, tmp_map_offd, fine_to_coarse_offd);
+   hypre_GetCommPkgBlockRTFromCommPkgBlockA(P, A, tmp_map_offd, fine_to_coarse_offd);
 
 
    *P_ptr = P;
@@ -1087,7 +1096,7 @@ hypre_BoomerAMGBuildBlockInterp( hypre_ParCSRBlockMatrix *A,
    hypre_TFree(jj_count, HYPRE_MEMORY_HOST);
    hypre_TFree(jj_count_offd, HYPRE_MEMORY_HOST);
 
-   if (num_procs > 1) hypre_CSRBlockMatrixDestroy(A_ext);
+   if (num_procs > 1) { hypre_CSRBlockMatrixDestroy(A_ext); }
 
    return hypre_error_flag;
 }
@@ -1116,7 +1125,7 @@ hypre_BoomerAMGBlockInterpTruncation( hypre_ParCSRBlockMatrix *P,
    HYPRE_Real    *P_offd_data_new;
 
    HYPRE_Int   block_size = hypre_CSRBlockMatrixBlockSize(P_diag);
-   HYPRE_Int   bnnz = block_size*block_size;
+   HYPRE_Int   bnnz = block_size * block_size;
 
    HYPRE_Int   n_fine = hypre_CSRBlockMatrixNumRows(P_diag);
    HYPRE_Int   num_cols = hypre_CSRBlockMatrixNumCols(P_diag);
@@ -1151,16 +1160,16 @@ hypre_BoomerAMGBlockInterpTruncation( hypre_ParCSRBlockMatrix *P,
          max_coef = 0.0;
 
          /* diag */
-         for (j = P_diag_i[i]; j < P_diag_i[i+1]; j++)
+         for (j = P_diag_i[i]; j < P_diag_i[i + 1]; j++)
          {
-            hypre_CSRBlockMatrixBlockNorm(1, &P_diag_data[j*bnnz] , &tmp, block_size);
+            hypre_CSRBlockMatrixBlockNorm(1, &P_diag_data[j * bnnz], &tmp, block_size);
             max_coef = (max_coef < tmp) ?  tmp : max_coef;
          }
 
          /* off_diag */
-         for (j = P_offd_i[i]; j < P_offd_i[i+1]; j++)
+         for (j = P_offd_i[i]; j < P_offd_i[i + 1]; j++)
          {
-            hypre_CSRBlockMatrixBlockNorm(1, &P_offd_data[j*bnnz], &tmp, block_size);
+            hypre_CSRBlockMatrixBlockNorm(1, &P_offd_data[j * bnnz], &tmp, block_size);
             max_coef = (max_coef < tmp) ?  tmp : max_coef;
          }
 
@@ -1173,12 +1182,12 @@ hypre_BoomerAMGBlockInterpTruncation( hypre_ParCSRBlockMatrix *P,
          hypre_CSRBlockMatrixBlockSetScalar(scale, 0.0, block_size);
          hypre_CSRBlockMatrixBlockSetScalar(row_sum, 0.0, block_size);
 
-         for (j = start_j; j < P_diag_i[i+1]; j++)
+         for (j = start_j; j < P_diag_i[i + 1]; j++)
          {
             /* row_sum += P_diag_data[now_checking];*/
-            hypre_CSRBlockMatrixBlockAddAccumulate(&P_diag_data[now_checking*bnnz], row_sum, block_size);
+            hypre_CSRBlockMatrixBlockAddAccumulate(&P_diag_data[now_checking * bnnz], row_sum, block_size);
 
-            hypre_CSRBlockMatrixBlockNorm(1, &P_diag_data[now_checking*bnnz] , &tmp, block_size);
+            hypre_CSRBlockMatrixBlockNorm(1, &P_diag_data[now_checking * bnnz], &tmp, block_size);
 
             if ( tmp < max_coef)
             {
@@ -1188,10 +1197,11 @@ hypre_BoomerAMGBlockInterpTruncation( hypre_ParCSRBlockMatrix *P,
             else
             {
                /* scale += P_diag_data[now_checking]; */
-               hypre_CSRBlockMatrixBlockAddAccumulate(&P_diag_data[now_checking*bnnz], scale, block_size);
+               hypre_CSRBlockMatrixBlockAddAccumulate(&P_diag_data[now_checking * bnnz], scale, block_size);
 
                /* P_diag_data[next_open] = P_diag_data[now_checking]; */
-               hypre_CSRBlockMatrixBlockCopyData( &P_diag_data[now_checking*bnnz], &P_diag_data[next_open*bnnz],
+               hypre_CSRBlockMatrixBlockCopyData( &P_diag_data[now_checking * bnnz],
+                                                  &P_diag_data[next_open * bnnz],
                                                   1.0, block_size);
 
                P_diag_j[next_open] = P_diag_j[now_checking];
@@ -1203,12 +1213,12 @@ hypre_BoomerAMGBlockInterpTruncation( hypre_ParCSRBlockMatrix *P,
          start_j = P_offd_i[i];
          P_offd_i[i] -= num_lost_offd;
 
-         for (j = start_j; j < P_offd_i[i+1]; j++)
+         for (j = start_j; j < P_offd_i[i + 1]; j++)
          {
             /* row_sum += P_offd_data[now_checking_offd]; */
-            hypre_CSRBlockMatrixBlockAddAccumulate(&P_offd_data[now_checking_offd*bnnz], row_sum, block_size);
+            hypre_CSRBlockMatrixBlockAddAccumulate(&P_offd_data[now_checking_offd * bnnz], row_sum, block_size);
 
-            hypre_CSRBlockMatrixBlockNorm(1, &P_offd_data[now_checking_offd*bnnz] , &tmp, block_size);
+            hypre_CSRBlockMatrixBlockNorm(1, &P_offd_data[now_checking_offd * bnnz], &tmp, block_size);
 
             if ( tmp < max_coef)
             {
@@ -1218,10 +1228,11 @@ hypre_BoomerAMGBlockInterpTruncation( hypre_ParCSRBlockMatrix *P,
             else
             {
                /* scale += P_offd_data[now_checking_offd]; */
-               hypre_CSRBlockMatrixBlockAddAccumulate(&P_offd_data[now_checking_offd*bnnz], scale, block_size);
+               hypre_CSRBlockMatrixBlockAddAccumulate(&P_offd_data[now_checking_offd * bnnz], scale, block_size);
 
                /* P_offd_data[next_open_offd] = P_offd_data[now_checking_offd];*/
-               hypre_CSRBlockMatrixBlockCopyData( &P_offd_data[now_checking_offd*bnnz], &P_offd_data[next_open_offd*bnnz],
+               hypre_CSRBlockMatrixBlockCopyData( &P_offd_data[now_checking_offd * bnnz],
+                                                  &P_offd_data[next_open_offd * bnnz],
                                                   1.0, block_size);
 
 
@@ -1236,27 +1247,27 @@ hypre_BoomerAMGBlockInterpTruncation( hypre_ParCSRBlockMatrix *P,
          if (hypre_CSRBlockMatrixBlockInvMult(scale, row_sum, out_block, block_size) == 0)
          {
 
-            for (j = P_diag_i[i]; j < (P_diag_i[i+1]-num_lost); j++)
+            for (j = P_diag_i[i]; j < (P_diag_i[i + 1] - num_lost); j++)
             {
                /* P_diag_data[j] *= out_block; */
 
                /* put mult result in row_sum */
-               hypre_CSRBlockMatrixBlockMultAdd(out_block, &P_diag_data[j*bnnz], 0.0,
+               hypre_CSRBlockMatrixBlockMultAdd(out_block, &P_diag_data[j * bnnz], 0.0,
                                                 row_sum, block_size);
                /* add to P_diag_data */
-               hypre_CSRBlockMatrixBlockAddAccumulate(row_sum, &P_diag_data[j*bnnz], block_size);
+               hypre_CSRBlockMatrixBlockAddAccumulate(row_sum, &P_diag_data[j * bnnz], block_size);
             }
 
-            for (j = P_offd_i[i]; j < (P_offd_i[i+1]-num_lost_offd); j++)
+            for (j = P_offd_i[i]; j < (P_offd_i[i + 1] - num_lost_offd); j++)
             {
 
                /* P_offd_data[j] *= out_block; */
 
                /* put mult result in row_sum */
-               hypre_CSRBlockMatrixBlockMultAdd(out_block, &P_offd_data[j*bnnz], 0.0,
+               hypre_CSRBlockMatrixBlockMultAdd(out_block, &P_offd_data[j * bnnz], 0.0,
                                                 row_sum, block_size);
                /* add to to P_offd_data */
-               hypre_CSRBlockMatrixBlockAddAccumulate(row_sum, &P_offd_data[j*bnnz], block_size);
+               hypre_CSRBlockMatrixBlockAddAccumulate(row_sum, &P_offd_data[j * bnnz], block_size);
 
             }
 
@@ -1276,17 +1287,19 @@ hypre_BoomerAMGBlockInterpTruncation( hypre_ParCSRBlockMatrix *P,
 
       rowlength = 0;
       if (n_fine)
-         rowlength = P_diag_i[1]+P_offd_i[1];
+      {
+         rowlength = P_diag_i[1] + P_offd_i[1];
+      }
       P_mxnum = rowlength;
-      for (i=1; i<n_fine; i++)
+      for (i = 1; i < n_fine; i++)
       {
-         rowlength = P_diag_i[i+1]-P_diag_i[i]+P_offd_i[i+1]-P_offd_i[i];
-         if (rowlength > P_mxnum) P_mxnum = rowlength;
+         rowlength = P_diag_i[i + 1] - P_diag_i[i] + P_offd_i[i + 1] - P_offd_i[i];
+         if (rowlength > P_mxnum) { P_mxnum = rowlength; }
       }
       if (P_mxnum > max_elmts)
       {
          P_aux_j = hypre_CTAlloc(HYPRE_Int,  P_mxnum, HYPRE_MEMORY_HOST);
-         P_aux_data = hypre_CTAlloc(HYPRE_Real,  P_mxnum*bnnz, HYPRE_MEMORY_HOST);
+         P_aux_data = hypre_CTAlloc(HYPRE_Real,  P_mxnum * bnnz, HYPRE_MEMORY_HOST);
          cnt_diag = 0;
          cnt_offd = 0;
 
@@ -1295,48 +1308,48 @@ hypre_BoomerAMGBlockInterpTruncation( hypre_ParCSRBlockMatrix *P,
             hypre_CSRBlockMatrixBlockSetScalar(row_sum, 0.0, block_size);
             /*row_sum = 0; */
 
-            num_elmts = P_diag_i[i+1]-P_diag_i[i]+P_offd_i[i+1]-P_offd_i[i];
+            num_elmts = P_diag_i[i + 1] - P_diag_i[i] + P_offd_i[i + 1] - P_offd_i[i];
             if (max_elmts < num_elmts)
             {
                cnt = 0;
-               for (j = P_diag_i[i]; j < P_diag_i[i+1]; j++)
+               for (j = P_diag_i[i]; j < P_diag_i[i + 1]; j++)
                {
                   P_aux_j[cnt] = P_diag_j[j];
                   /*P_aux_data[cnt++] = P_diag_data[j];*/
-                  hypre_CSRBlockMatrixBlockCopyData(&P_diag_data[j*bnnz],
-                                                    &P_aux_data[cnt*bnnz],
+                  hypre_CSRBlockMatrixBlockCopyData(&P_diag_data[j * bnnz],
+                                                    &P_aux_data[cnt * bnnz],
                                                     1.0, block_size);
                   cnt++;
                   /*row_sum += P_diag_data[j];*/
-                  hypre_CSRBlockMatrixBlockAddAccumulate(&P_diag_data[j*bnnz], row_sum, block_size);
+                  hypre_CSRBlockMatrixBlockAddAccumulate(&P_diag_data[j * bnnz], row_sum, block_size);
 
 
                }
                num_lost += cnt;
                cnt1 = cnt;
-               for (j = P_offd_i[i]; j < P_offd_i[i+1]; j++)
+               for (j = P_offd_i[i]; j < P_offd_i[i + 1]; j++)
                {
-                  P_aux_j[cnt] = P_offd_j[j]+num_cols;
+                  P_aux_j[cnt] = P_offd_j[j] + num_cols;
                   /*P_aux_data[cnt++] = P_offd_data[j];*/
-                  hypre_CSRBlockMatrixBlockCopyData(&P_offd_data[j*bnnz],
-                                                    &P_aux_data[cnt*bnnz],
+                  hypre_CSRBlockMatrixBlockCopyData(&P_offd_data[j * bnnz],
+                                                    &P_aux_data[cnt * bnnz],
                                                     1.0, block_size);
                   cnt++;
 
                   /*row_sum += P_offd_data[j];*/
-                  hypre_CSRBlockMatrixBlockAddAccumulate(&P_offd_data[j*bnnz], row_sum, block_size);
+                  hypre_CSRBlockMatrixBlockAddAccumulate(&P_offd_data[j * bnnz], row_sum, block_size);
 
 
                }
-               num_lost_offd += cnt-cnt1;
+               num_lost_offd += cnt - cnt1;
                /* sort data */
                norm_array = hypre_CTAlloc(HYPRE_Real,  cnt, HYPRE_MEMORY_HOST);
-               for (j=0; j< cnt; j++)
+               for (j = 0; j < cnt; j++)
                {
-                  hypre_CSRBlockMatrixBlockNorm(1, &P_aux_data[j*bnnz] , &norm_array[j], block_size);
+                  hypre_CSRBlockMatrixBlockNorm(1, &P_aux_data[j * bnnz], &norm_array[j], block_size);
                }
 
-               hypre_block_qsort(P_aux_j, norm_array, P_aux_data,block_size, 0,cnt-1);
+               hypre_block_qsort(P_aux_j, norm_array, P_aux_data, block_size, 0, cnt - 1);
 
                hypre_TFree(norm_array, HYPRE_MEMORY_HOST);
 
@@ -1347,7 +1360,7 @@ hypre_BoomerAMGBlockInterpTruncation( hypre_ParCSRBlockMatrix *P,
                for (j = 0; j < max_elmts; j++)
                {
                   /* scale += P_aux_data[j];*/
-                  hypre_CSRBlockMatrixBlockAddAccumulate(&P_aux_data[j*bnnz],
+                  hypre_CSRBlockMatrixBlockAddAccumulate(&P_aux_data[j * bnnz],
                                                          scale, block_size);
 
 
@@ -1355,8 +1368,8 @@ hypre_BoomerAMGBlockInterpTruncation( hypre_ParCSRBlockMatrix *P,
                   {
                      P_diag_j[cnt_diag] = P_aux_j[j];
                      /*P_diag_data[cnt_diag++] = P_aux_data[j];*/
-                     hypre_CSRBlockMatrixBlockCopyData(&P_aux_data[j*bnnz],
-                                                       &P_diag_data[cnt_diag*bnnz],
+                     hypre_CSRBlockMatrixBlockCopyData(&P_aux_data[j * bnnz],
+                                                       &P_diag_data[cnt_diag * bnnz],
                                                        1.0, block_size);
 
                      cnt_diag++;
@@ -1365,17 +1378,17 @@ hypre_BoomerAMGBlockInterpTruncation( hypre_ParCSRBlockMatrix *P,
                   }
                   else
                   {
-                     P_offd_j[cnt_offd] = P_aux_j[j]-num_cols;
+                     P_offd_j[cnt_offd] = P_aux_j[j] - num_cols;
                      /*P_offd_data[cnt_offd++] = P_aux_data[j];*/
-                     hypre_CSRBlockMatrixBlockCopyData(&P_aux_data[j*bnnz],
-                                                       &P_offd_data[cnt_offd*bnnz],
+                     hypre_CSRBlockMatrixBlockCopyData(&P_aux_data[j * bnnz],
+                                                       &P_offd_data[cnt_offd * bnnz],
                                                        1.0, block_size);
                      cnt_offd++;
 
                   }
                }
-               num_lost -= cnt_diag-P_diag_i[i];
-               num_lost_offd -= cnt_offd-P_offd_i[i];
+               num_lost -= cnt_diag - P_diag_i[i];
+               num_lost_offd -= cnt_offd - P_offd_i[i];
                /* normalize row of P */
                /* out_block = row_sum/scale; */
                /*if (scale != 0.)*/
@@ -1389,10 +1402,10 @@ hypre_BoomerAMGBlockInterpTruncation( hypre_ParCSRBlockMatrix *P,
                      /* P_diag_data[j] *= out_block; */
 
                      /* put mult result in row_sum */
-                     hypre_CSRBlockMatrixBlockMultAdd(out_block, &P_diag_data[j*bnnz], 0.0,
+                     hypre_CSRBlockMatrixBlockMultAdd(out_block, &P_diag_data[j * bnnz], 0.0,
                                                       row_sum, block_size);
                      /* add to P_diag_data */
-                     hypre_CSRBlockMatrixBlockAddAccumulate(row_sum, &P_diag_data[j*bnnz], block_size);
+                     hypre_CSRBlockMatrixBlockAddAccumulate(row_sum, &P_diag_data[j * bnnz], block_size);
                   }
 
                   for (j = P_offd_i[i]; j < cnt_offd; j++)
@@ -1401,10 +1414,10 @@ hypre_BoomerAMGBlockInterpTruncation( hypre_ParCSRBlockMatrix *P,
                      /* P_offd_data[j] *= out_block; */
 
                      /* put mult result in row_sum */
-                     hypre_CSRBlockMatrixBlockMultAdd(out_block, &P_offd_data[j*bnnz], 0.0,
+                     hypre_CSRBlockMatrixBlockMultAdd(out_block, &P_offd_data[j * bnnz], 0.0,
                                                       row_sum, block_size);
                      /* add to to P_offd_data */
-                     hypre_CSRBlockMatrixBlockAddAccumulate(row_sum, &P_offd_data[j*bnnz], block_size);
+                     hypre_CSRBlockMatrixBlockAddAccumulate(row_sum, &P_offd_data[j * bnnz], block_size);
                   }
 
 
@@ -1417,12 +1430,12 @@ hypre_BoomerAMGBlockInterpTruncation( hypre_ParCSRBlockMatrix *P,
                {
                   start_j = P_diag_i[i];
                   P_diag_i[i] = cnt_diag;
-                  for (j = start_j; j < P_diag_i[i+1]; j++)
+                  for (j = start_j; j < P_diag_i[i + 1]; j++)
                   {
                      P_diag_j[cnt_diag] = P_diag_j[j];
                      /*P_diag_data[cnt_diag++] = P_diag_data[j];*/
-                     hypre_CSRBlockMatrixBlockCopyData(&P_diag_data[j*bnnz],
-                                                       &P_diag_data[cnt_diag*bnnz],
+                     hypre_CSRBlockMatrixBlockCopyData(&P_diag_data[j * bnnz],
+                                                       &P_diag_data[cnt_diag * bnnz],
                                                        1.0, block_size);
                      cnt_diag++;
 
@@ -1430,24 +1443,28 @@ hypre_BoomerAMGBlockInterpTruncation( hypre_ParCSRBlockMatrix *P,
                   }
                }
                else
-                  cnt_diag += P_diag_i[i+1]-P_diag_i[i];
+               {
+                  cnt_diag += P_diag_i[i + 1] - P_diag_i[i];
+               }
                if (P_offd_i[i] != cnt_offd)
                {
                   start_j = P_offd_i[i];
                   P_offd_i[i] = cnt_offd;
-                  for (j = start_j; j < P_offd_i[i+1]; j++)
+                  for (j = start_j; j < P_offd_i[i + 1]; j++)
                   {
                      P_offd_j[cnt_offd] = P_offd_j[j];
                      /*P_offd_data[cnt_offd++] = P_offd_data[j];*/
 
-                     hypre_CSRBlockMatrixBlockCopyData(&P_offd_data[j*bnnz],
-                                                       &P_offd_data[cnt_offd*bnnz],
+                     hypre_CSRBlockMatrixBlockCopyData(&P_offd_data[j * bnnz],
+                                                       &P_offd_data[cnt_offd * bnnz],
                                                        1.0, block_size);
                      cnt_offd++;
                   }
                }
                else
-                  cnt_offd += P_offd_i[i+1]-P_offd_i[i];
+               {
+                  cnt_offd += P_offd_i[i + 1] - P_offd_i[i];
+               }
             }
          }
          P_diag_i[n_fine] = cnt_diag;
@@ -1464,13 +1481,13 @@ hypre_BoomerAMGBlockInterpTruncation( hypre_ParCSRBlockMatrix *P,
    {
       P_diag_size = P_diag_i[n_fine];
       P_diag_j_new = hypre_CTAlloc(HYPRE_Int,  P_diag_size, HYPRE_MEMORY_HOST);
-      P_diag_data_new = hypre_CTAlloc(HYPRE_Real,  P_diag_size*bnnz, HYPRE_MEMORY_HOST);
-      for (i=0; i < P_diag_size; i++)
+      P_diag_data_new = hypre_CTAlloc(HYPRE_Real,  P_diag_size * bnnz, HYPRE_MEMORY_HOST);
+      for (i = 0; i < P_diag_size; i++)
       {
          P_diag_j_new[i] = P_diag_j[i];
-         for (k=0; k < bnnz; k++)
+         for (k = 0; k < bnnz; k++)
          {
-            P_diag_data_new[i*bnnz+k] = P_diag_data[i*bnnz+k];
+            P_diag_data_new[i * bnnz + k] = P_diag_data[i * bnnz + k];
          }
 
       }
@@ -1484,13 +1501,13 @@ hypre_BoomerAMGBlockInterpTruncation( hypre_ParCSRBlockMatrix *P,
    {
       P_offd_size = P_offd_i[n_fine];
       P_offd_j_new = hypre_CTAlloc(HYPRE_Int,  P_offd_size, HYPRE_MEMORY_HOST);
-      P_offd_data_new = hypre_CTAlloc(HYPRE_Real,  P_offd_size*bnnz, HYPRE_MEMORY_HOST);
-      for (i=0; i < P_offd_size; i++)
+      P_offd_data_new = hypre_CTAlloc(HYPRE_Real,  P_offd_size * bnnz, HYPRE_MEMORY_HOST);
+      for (i = 0; i < P_offd_size; i++)
       {
          P_offd_j_new[i] = P_offd_j[i];
-         for (k=0; k < bnnz; k++)
+         for (k = 0; k < bnnz; k++)
          {
-            P_offd_data_new[i*bnnz + k] = P_offd_data[i*bnnz + k];
+            P_offd_data_new[i * bnnz + k] = P_offd_data[i * bnnz + k];
          }
 
       }
@@ -1521,12 +1538,14 @@ void hypre_block_qsort( HYPRE_Int  *v,
    HYPRE_Int i, last;
 
    if (left >= right)
+   {
       return;
+   }
 
-   hypre_swap2( v, w, left, (left+right)/2);
-   hypre_swap_blk(blk_array, block_size, left, (left+right)/2);
+   hypre_swap2( v, w, left, (left + right) / 2);
+   hypre_swap_blk(blk_array, block_size, left, (left + right) / 2);
    last = left;
-   for (i = left+1; i <= right; i++)
+   for (i = left + 1; i <= right; i++)
       if (hypre_cabs(w[i]) > hypre_cabs(w[left]))
       {
          hypre_swap2(v, w, ++last, i);
@@ -1534,26 +1553,26 @@ void hypre_block_qsort( HYPRE_Int  *v,
       }
    hypre_swap2(v, w, left, last);
    hypre_swap_blk(blk_array, block_size, left, last);
-   hypre_block_qsort(v, w, blk_array, block_size, left, last-1);
-   hypre_block_qsort(v, w, blk_array, block_size, last+1, right);
+   hypre_block_qsort(v, w, blk_array, block_size, left, last - 1);
+   hypre_block_qsort(v, w, blk_array, block_size, last + 1, right);
 }
 
 void hypre_swap_blk( HYPRE_Complex *v,
-               HYPRE_Int   block_size,
-               HYPRE_Int   i,
-               HYPRE_Int   j )
+                     HYPRE_Int   block_size,
+                     HYPRE_Int   i,
+                     HYPRE_Int   j )
 {
-   HYPRE_Int bnnz = block_size*block_size;
+   HYPRE_Int bnnz = block_size * block_size;
    HYPRE_Real    *temp;
 
    temp = hypre_CTAlloc(HYPRE_Real,  bnnz, HYPRE_MEMORY_HOST);
 
    /*temp = v[i];*/
-   hypre_CSRBlockMatrixBlockCopyData(&v[i*bnnz],temp, 1.0, block_size);
+   hypre_CSRBlockMatrixBlockCopyData(&v[i * bnnz], temp, 1.0, block_size);
    /*v[i] = v[j];*/
-   hypre_CSRBlockMatrixBlockCopyData(&v[j*bnnz],&v[i*bnnz], 1.0, block_size);
+   hypre_CSRBlockMatrixBlockCopyData(&v[j * bnnz], &v[i * bnnz], 1.0, block_size);
    /* v[j] = temp; */
-   hypre_CSRBlockMatrixBlockCopyData(temp,&v[j*bnnz], 1.0, block_size);
+   hypre_CSRBlockMatrixBlockCopyData(temp, &v[j * bnnz], 1.0, block_size);
 
    hypre_TFree(temp, HYPRE_MEMORY_HOST);
 }
@@ -1574,7 +1593,7 @@ void hypre_swap_blk( HYPRE_Complex *v,
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix *A,
+hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix  *A,
                                      HYPRE_Int                *CF_marker,
                                      hypre_ParCSRMatrix       *S,
                                      HYPRE_BigInt             *num_cpts_global,
@@ -1584,8 +1603,9 @@ hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix *A,
                                      HYPRE_Real                trunc_factor,
                                      HYPRE_Int                 max_elmts,
                                      HYPRE_Int                 add_weak_to_diag,
-                                     hypre_ParCSRBlockMatrix  **P_ptr)
+                                     hypre_ParCSRBlockMatrix **P_ptr)
 {
+   HYPRE_UNUSED_VAR(dof_func);
 
    MPI_Comm                 comm = hypre_ParCSRBlockMatrixComm(A);
    hypre_ParCSRCommPkg     *comm_pkg = hypre_ParCSRBlockMatrixCommPkg(A);
@@ -1597,7 +1617,7 @@ hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix *A,
    HYPRE_Int             *A_diag_j = hypre_CSRBlockMatrixJ(A_diag);
 
    HYPRE_Int              block_size = hypre_CSRBlockMatrixBlockSize(A_diag);
-   HYPRE_Int              bnnz = block_size*block_size;
+   HYPRE_Int              bnnz = block_size * block_size;
 
    hypre_CSRBlockMatrix  *A_offd = hypre_ParCSRBlockMatrixOffd(A);
    HYPRE_Real            *A_offd_data = hypre_CSRBlockMatrixData(A_offd);
@@ -1620,8 +1640,7 @@ hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix *A,
 
    HYPRE_Int             *CF_marker_offd = NULL;
 
-   hypre_CSRBlockMatrix  *A_ext;
-
+   hypre_CSRBlockMatrix  *A_ext = NULL;
    HYPRE_Real            *A_ext_data = NULL;
    HYPRE_Int             *A_ext_i = NULL;
    HYPRE_BigInt          *A_ext_j = NULL;
@@ -1640,10 +1659,10 @@ hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix *A,
 
    HYPRE_Int             *P_marker, *P_marker_offd = NULL;
 
-   HYPRE_Int              jj_counter,jj_counter_offd;
+   HYPRE_Int              jj_counter, jj_counter_offd;
    HYPRE_Int             *jj_count, *jj_count_offd = NULL;
-   HYPRE_Int              jj_begin_row,jj_begin_row_offd;
-   HYPRE_Int              jj_end_row,jj_end_row_offd;
+   HYPRE_Int              jj_begin_row, jj_begin_row_offd;
+   HYPRE_Int              jj_end_row, jj_end_row_offd;
 
    HYPRE_Int              start_indexing = 0; /* start indexing for P_data at 0 */
 
@@ -1655,13 +1674,13 @@ hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix *A,
    HYPRE_BigInt          *fine_to_coarse_offd = NULL;
    HYPRE_Int             *coarse_counter;
    HYPRE_Int              coarse_shift;
-   HYPRE_BigInt           total_global_cpts;
-   HYPRE_Int              num_cols_P_offd, my_first_cpt;
+   HYPRE_BigInt           my_first_cpt, total_global_cpts;
+   HYPRE_Int              num_cols_P_offd;
 
    HYPRE_Int              bd;
 
-   HYPRE_Int              i,i1,i2;
-   HYPRE_Int              j,jl,jj,jj1;
+   HYPRE_Int              i, i1, i2;
+   HYPRE_Int              j, jl, jj, jj1;
    HYPRE_Int              kc;
    HYPRE_BigInt           big_k;
    HYPRE_Int              start;
@@ -1681,7 +1700,7 @@ hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix *A,
    HYPRE_Int local_numrows = hypre_CSRBlockMatrixNumRows(A_diag);
    HYPRE_BigInt col_n = col_1 + (HYPRE_BigInt)local_numrows;
 
-   HYPRE_Real       wall_time;  /* for debugging instrumentation  */
+   HYPRE_Real       wall_time = 0.0;  /* for debugging instrumentation  */
 
 
    HYPRE_Real       *identity_block;
@@ -1693,22 +1712,25 @@ hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix *A,
    HYPRE_Real       *sign;
 
    hypre_MPI_Comm_size(comm, &num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_rank(comm, &my_id);
    num_threads = hypre_NumThreads();
 
+   if (num_functions > 1)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Not implemented for num_functions > 1!");
+   }
 
    my_first_cpt = num_cpts_global[0];
-   if (my_id == (num_procs -1)) total_global_cpts = num_cpts_global[1];
-   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
+   if (my_id == (num_procs - 1)) { total_global_cpts = num_cpts_global[1]; }
+   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
 
    /*-------------------------------------------------------------------
     * Get the CF_marker data for the off-processor columns
     *-------------------------------------------------------------------*/
 
-   if (debug_flag==4) wall_time = time_getWallclockSeconds();
-
-   CF_marker_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_A_offd, HYPRE_MEMORY_HOST);
+   if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
 
+   CF_marker_offd = hypre_CTAlloc(HYPRE_Int, num_cols_A_offd, HYPRE_MEMORY_HOST);
 
    if (!comm_pkg)
    {
@@ -1717,17 +1739,18 @@ hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix *A,
    }
 
    num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
-   int_buf_data = hypre_CTAlloc(HYPRE_Int,  hypre_ParCSRCommPkgSendMapStart(comm_pkg,
-                                                       num_sends), HYPRE_MEMORY_HOST);
+   int_buf_data = hypre_CTAlloc(HYPRE_Int,
+                                hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                                HYPRE_MEMORY_HOST);
 
    index = 0;
    for (i = 0; i < num_sends; i++)
    {
       start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
       {
          int_buf_data[index++]
-            = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+            = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
       }
 
    }
@@ -1741,7 +1764,7 @@ hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix *A,
    hypre_ParCSRCommHandleDestroy(comm_handle);
 
 
-   if (debug_flag==4)
+   if (debug_flag == 4)
    {
       wall_time = time_getWallclockSeconds() - wall_time;
       hypre_printf("Proc = %d     Interp: Comm 1 CF_marker =    %f\n",
@@ -1753,7 +1776,7 @@ hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix *A,
     * Get the ghost rows of A
     *---------------------------------------------------------------------*/
 
-   if (debug_flag==4) wall_time = time_getWallclockSeconds();
+   if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
 
    if (num_procs > 1)
    {
@@ -1764,9 +1787,9 @@ hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix *A,
    }
 
    index = 0;
-   for (i=0; i < num_cols_A_offd; i++)
+   for (i = 0; i < num_cols_A_offd; i++)
    {
-      for (j=A_ext_i[i]; j < A_ext_i[i+1]; j++)
+      for (j = A_ext_i[i]; j < A_ext_i[i + 1]; j++)
       {
          big_k = A_ext_j[j];
          if (big_k >= col_1 && big_k < col_n)
@@ -1775,7 +1798,7 @@ hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix *A,
             /* for the data field we must get all of the block data */
             for (bd = 0; bd < bnnz; bd++)
             {
-               A_ext_data[index*bnnz + bd] = A_ext_data[j*bnnz + bd];
+               A_ext_data[index * bnnz + bd] = A_ext_data[j * bnnz + bd];
             }
             index++;
          }
@@ -1784,10 +1807,10 @@ hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix *A,
             kc = hypre_BigBinarySearch(col_map_offd, big_k, num_cols_A_offd);
             if (kc > -1)
             {
-               A_ext_j[index] = (HYPRE_BigInt)(-kc-1);
+               A_ext_j[index] = (HYPRE_BigInt)(-kc - 1);
                for (bd = 0; bd < bnnz; bd++)
                {
-                  A_ext_data[index*bnnz + bd] = A_ext_data[j*bnnz + bd];
+                  A_ext_data[index * bnnz + bd] = A_ext_data[j * bnnz + bd];
                }
                index++;
             }
@@ -1796,10 +1819,12 @@ hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix *A,
       A_ext_i[i] = index;
    }
    for (i = num_cols_A_offd; i > 0; i--)
-      A_ext_i[i] = A_ext_i[i-1];
-   if (num_procs > 1) A_ext_i[0] = 0;
+   {
+      A_ext_i[i] = A_ext_i[i - 1];
+   }
+   if (num_procs > 1) { A_ext_i[0] = 0; }
 
-   if (debug_flag==4)
+   if (debug_flag == 4)
    {
       wall_time = time_getWallclockSeconds() - wall_time;
       hypre_printf("Proc = %d  Interp: Comm 2   Get A_ext =  %f\n",
@@ -1822,7 +1847,7 @@ hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix *A,
 
    fine_to_coarse = hypre_CTAlloc(HYPRE_Int,  n_fine, HYPRE_MEMORY_HOST);
 
-   for (i = 0; i < n_fine; i++) fine_to_coarse[i] = -1;
+   for (i = 0; i < n_fine; i++) { fine_to_coarse[i] = -1; }
 
    jj_counter = start_indexing;
    jj_counter_offd = start_indexing;
@@ -1834,17 +1859,17 @@ hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix *A,
 
    for (j = 0; j < num_threads; j++)
    {
-      size = n_fine/num_threads;
-      rest = n_fine - size*num_threads;
+      size = n_fine / num_threads;
+      rest = n_fine - size * num_threads;
       if (j < rest)
       {
-         ns = j*size+j;
-         ne = (j+1)*size+j+1;
+         ns = j * size + j;
+         ne = (j + 1) * size + j + 1;
       }
       else
       {
-         ns = j*size+rest;
-         ne = (j+1)*size+rest;
+         ns = j * size + rest;
+         ne = (j + 1) * size + rest;
       }
 
 
@@ -1871,7 +1896,7 @@ hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix *A,
 
          else
          {
-            for (jj = S_diag_i[i]; jj < S_diag_i[i+1]; jj++)
+            for (jj = S_diag_i[i]; jj < S_diag_i[i + 1]; jj++)
             {
                i1 = S_diag_j[jj];
                if (CF_marker[i1] >= 0)
@@ -1882,7 +1907,7 @@ hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix *A,
 
             if (num_procs > 1)
             {
-               for (jj = S_offd_i[i]; jj < S_offd_i[i+1]; jj++)
+               for (jj = S_offd_i[i]; jj < S_offd_i[i + 1]; jj++)
                {
                   i1 = S_offd_j[jj];
                   if (CF_marker_offd[i1] >= 0)
@@ -1899,32 +1924,32 @@ hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix *A,
     *  Allocate  arrays.
     *-----------------------------------------------------------------------*/
 
-   for (i=0; i < num_threads-1; i++)
+   for (i = 0; i < num_threads - 1; i++)
    {
-      coarse_counter[i+1] += coarse_counter[i];
-      jj_count[i+1] += jj_count[i];
-      jj_count_offd[i+1] += jj_count_offd[i];
+      coarse_counter[i + 1] += coarse_counter[i];
+      jj_count[i + 1] += jj_count[i];
+      jj_count_offd[i + 1] += jj_count_offd[i];
    }
-   i = num_threads-1;
+   i = num_threads - 1;
    jj_counter = jj_count[i];
    jj_counter_offd = jj_count_offd[i];
 
    P_diag_size = jj_counter;
 
-   P_diag_i    = hypre_CTAlloc(HYPRE_Int,  n_fine+1, HYPRE_MEMORY_HOST);
+   P_diag_i    = hypre_CTAlloc(HYPRE_Int,  n_fine + 1, HYPRE_MEMORY_HOST);
    P_diag_j    = hypre_CTAlloc(HYPRE_Int,  P_diag_size, HYPRE_MEMORY_HOST);
    /* we need to include the size of the blocks in the data size */
-   P_diag_data = hypre_CTAlloc(HYPRE_Real,  P_diag_size*bnnz, HYPRE_MEMORY_HOST);
+   P_diag_data = hypre_CTAlloc(HYPRE_Real,  P_diag_size * bnnz, HYPRE_MEMORY_HOST);
 
    P_diag_i[n_fine] = jj_counter;
 
 
    P_offd_size = jj_counter_offd;
 
-   P_offd_i    = hypre_CTAlloc(HYPRE_Int,  n_fine+1, HYPRE_MEMORY_HOST);
+   P_offd_i    = hypre_CTAlloc(HYPRE_Int,  n_fine + 1, HYPRE_MEMORY_HOST);
    P_offd_j    = hypre_CTAlloc(HYPRE_Int,  P_offd_size, HYPRE_MEMORY_HOST);
    /* we need to include the size of the blocks in the data size */
-   P_offd_data = hypre_CTAlloc(HYPRE_Real,  P_offd_size*bnnz, HYPRE_MEMORY_HOST);
+   P_offd_data = hypre_CTAlloc(HYPRE_Real,  P_offd_size * bnnz, HYPRE_MEMORY_HOST);
 
    /*-----------------------------------------------------------------------
     *  Intialize some stuff.
@@ -1933,7 +1958,7 @@ hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix *A,
    jj_counter = start_indexing;
    jj_counter_offd = start_indexing;
 
-   if (debug_flag==4)
+   if (debug_flag == 4)
    {
       wall_time = time_getWallclockSeconds() - wall_time;
       hypre_printf("Proc = %d     Interp: Internal work 1 =     %f\n",
@@ -1942,72 +1967,71 @@ hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix *A,
    }
 
    /* we need a block identity and a block of zeros*/
-   identity_block = hypre_CTAlloc(HYPRE_Real,  bnnz, HYPRE_MEMORY_HOST);
-   zero_block =  hypre_CTAlloc(HYPRE_Real,  bnnz, HYPRE_MEMORY_HOST);
-
+   identity_block = hypre_CTAlloc(HYPRE_Real, bnnz, HYPRE_MEMORY_HOST);
+   zero_block     = hypre_CTAlloc(HYPRE_Real, bnnz, HYPRE_MEMORY_HOST);
 
-
-   for(i = 0; i < block_size; i++)
+   for (i = 0; i < block_size; i++)
    {
-      identity_block[i*block_size + i] = 1.0;
+      identity_block[i * block_size + i] = 1.0;
    }
 
-
    /* we also need a block to keep track of the diagonal values and a sum */
-   diagonal_block =  hypre_CTAlloc(HYPRE_Real,  bnnz, HYPRE_MEMORY_HOST);
-   sum_block =  hypre_CTAlloc(HYPRE_Real,  bnnz, HYPRE_MEMORY_HOST);
-   distribute_block =  hypre_CTAlloc(HYPRE_Real,  bnnz, HYPRE_MEMORY_HOST);
-
+   diagonal_block   = hypre_CTAlloc(HYPRE_Real, bnnz, HYPRE_MEMORY_HOST);
+   sum_block        = hypre_CTAlloc(HYPRE_Real, bnnz, HYPRE_MEMORY_HOST);
+   distribute_block = hypre_CTAlloc(HYPRE_Real, bnnz, HYPRE_MEMORY_HOST);
 
-   sign =  hypre_CTAlloc(HYPRE_Real,  block_size, HYPRE_MEMORY_HOST);
+   sign = hypre_CTAlloc(HYPRE_Real, block_size, HYPRE_MEMORY_HOST);
 
    /*-----------------------------------------------------------------------
     *  Send and receive fine_to_coarse info.
     *-----------------------------------------------------------------------*/
 
-   if (debug_flag==4) wall_time = time_getWallclockSeconds();
+   if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
 
-   fine_to_coarse_offd = hypre_CTAlloc(HYPRE_BigInt,  num_cols_A_offd, HYPRE_MEMORY_HOST);
-   big_buf_data = hypre_CTAlloc(HYPRE_BigInt,  hypre_ParCSRCommPkgSendMapStart(comm_pkg,
-                                                   num_sends), HYPRE_MEMORY_HOST);
+   fine_to_coarse_offd = hypre_CTAlloc(HYPRE_BigInt, num_cols_A_offd, HYPRE_MEMORY_HOST);
+   big_buf_data = hypre_CTAlloc(HYPRE_BigInt,
+                                hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                                HYPRE_MEMORY_HOST);
 
    for (j = 0; j < num_threads; j++)
    {
       coarse_shift = 0;
-      if (j > 0) coarse_shift = coarse_counter[j-1];
-      size = n_fine/num_threads;
-      rest = n_fine - size*num_threads;
+      if (j > 0) { coarse_shift = coarse_counter[j - 1]; }
+      size = n_fine / num_threads;
+      rest = n_fine - size * num_threads;
       if (j < rest)
       {
-         ns = j*size+j;
-         ne = (j+1)*size+j+1;
+         ns = j * size + j;
+         ne = (j + 1) * size + j + 1;
       }
       else
       {
-         ns = j*size+rest;
-         ne = (j+1)*size+rest;
+         ns = j * size + rest;
+         ne = (j + 1) * size + rest;
       }
       for (i = ns; i < ne; i++)
+      {
          fine_to_coarse[i] += coarse_shift;
+      }
    }
    index = 0;
    for (i = 0; i < num_sends; i++)
    {
       start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
+      {
          big_buf_data[index++] = my_first_cpt
-            + fine_to_coarse[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+                                 + fine_to_coarse[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
+      }
    }
 
    /* again, we do not need to use the block version of comm handle since
       the fine to coarse mapping is size of the nodes */
 
-   comm_handle = hypre_ParCSRCommHandleCreate( 21, comm_pkg, big_buf_data,
-                                               fine_to_coarse_offd);
-
+   comm_handle = hypre_ParCSRCommHandleCreate(21, comm_pkg, big_buf_data, fine_to_coarse_offd);
    hypre_ParCSRCommHandleDestroy(comm_handle);
 
-   if (debug_flag==4)
+   if (debug_flag == 4)
    {
       wall_time = time_getWallclockSeconds() - wall_time;
       hypre_printf("Proc = %d     Interp: Comm 4 FineToCoarse = %f\n",
@@ -2015,7 +2039,7 @@ hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix *A,
       fflush(NULL);
    }
 
-   if (debug_flag==4) wall_time = time_getWallclockSeconds();
+   if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
 
    /*-----------------------------------------------------------------------
     *  Loop over fine grid points.
@@ -2023,22 +2047,22 @@ hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix *A,
 
    for (jl = 0; jl < num_threads; jl++)
    {
-      size = n_fine/num_threads;
-      rest = n_fine - size*num_threads;
+      size = n_fine / num_threads;
+      rest = n_fine - size * num_threads;
       if (jl < rest)
       {
-         ns = jl*size+jl;
-         ne = (jl+1)*size+jl+1;
+         ns = jl * size + jl;
+         ne = (jl + 1) * size + jl + 1;
       }
       else
       {
-         ns = jl*size+rest;
-         ne = (jl+1)*size+rest;
+         ns = jl * size + rest;
+         ne = (jl + 1) * size + rest;
       }
       jj_counter = 0;
-      if (jl > 0) jj_counter = jj_count[jl-1];
+      if (jl > 0) { jj_counter = jj_count[jl - 1]; }
       jj_counter_offd = 0;
-      if (jl > 0) jj_counter_offd = jj_count_offd[jl-1];
+      if (jl > 0) { jj_counter_offd = jj_count_offd[jl - 1]; }
 
       P_marker = hypre_CTAlloc(HYPRE_Int,  n_fine, HYPRE_MEMORY_HOST);
       P_marker_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_A_offd, HYPRE_MEMORY_HOST);
@@ -2066,7 +2090,7 @@ hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix *A,
             P_diag_j[jj_counter]    = fine_to_coarse[i];
             /* P_diag_data[jj_counter] = one; */
             hypre_CSRBlockMatrixBlockCopyData(identity_block,
-                                              &P_diag_data[jj_counter*bnnz],
+                                              &P_diag_data[jj_counter * bnnz],
                                               1.0, block_size);
             jj_counter++;
          }
@@ -2081,7 +2105,7 @@ hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix *A,
             P_diag_i[i] = jj_counter;
             jj_begin_row = jj_counter;
 
-            for (jj = S_diag_i[i]; jj < S_diag_i[i+1]; jj++)
+            for (jj = S_diag_i[i]; jj < S_diag_i[i + 1]; jj++)
             {
                i1 = S_diag_j[jj];
 
@@ -2096,7 +2120,7 @@ hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix *A,
                   P_diag_j[jj_counter]    = fine_to_coarse[i1];
                   /* P_diag_data[jj_counter] = zero; */
                   hypre_CSRBlockMatrixBlockCopyData(zero_block,
-                                                    &P_diag_data[jj_counter*bnnz],
+                                                    &P_diag_data[jj_counter * bnnz],
                                                     1.0, block_size);
                   jj_counter++;
                }
@@ -2120,7 +2144,7 @@ hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix *A,
 
             if (num_procs > 1)
             {
-               for (jj = S_offd_i[i]; jj < S_offd_i[i+1]; jj++)
+               for (jj = S_offd_i[i]; jj < S_offd_i[i + 1]; jj++)
                {
                   i1 = S_offd_j[jj];
 
@@ -2135,7 +2159,7 @@ hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix *A,
                      P_offd_j[jj_counter_offd]  = i1;
                      /* P_offd_data[jj_counter_offd] = zero; */
                      hypre_CSRBlockMatrixBlockCopyData(zero_block,
-                                                       &P_offd_data[jj_counter_offd*bnnz],
+                                                       &P_offd_data[jj_counter_offd * bnnz],
                                                        1.0, block_size);
 
                      jj_counter_offd++;
@@ -2167,7 +2191,7 @@ hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix *A,
 
             /* Loop over ith row of A.  First, the diagonal part of A */
 
-            for (jj = A_diag_i[i]+1; jj < A_diag_i[i+1]; jj++)
+            for (jj = A_diag_i[i] + 1; jj < A_diag_i[i + 1]; jj++)
             {
                i1 = A_diag_j[jj];
 
@@ -2179,7 +2203,7 @@ hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix *A,
                if (P_marker[i1] >= jj_begin_row)
                {
                   /*   P_diag_data[P_marker[i1]] += A_diag_data[jj]; */
-                  hypre_CSRBlockMatrixBlockAddAccumulateDiag(&A_diag_data[jj*bnnz],
+                  hypre_CSRBlockMatrixBlockAddAccumulateDiag(&A_diag_data[jj * bnnz],
                                                              &P_diag_data[P_marker[i1]*bnnz],
                                                              block_size);
 
@@ -2208,7 +2232,7 @@ hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix *A,
 
 
                   /* Diagonal block part of row i1 */
-                  for (jj1 = A_diag_i[i1]; jj1 < A_diag_i[i1+1]; jj1++)
+                  for (jj1 = A_diag_i[i1]; jj1 < A_diag_i[i1 + 1]; jj1++)
                   {
                      i2 = A_diag_j[jj1];
                      if (P_marker[i2] >= jj_begin_row)
@@ -2218,7 +2242,7 @@ hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix *A,
                         /* hypre_CSRBlockMatrixBlockAddAccumulateDiag(&A_diag_data[jj1*bnnz],
                            sum_block, block_size);*/
 
-                        hypre_CSRBlockMatrixBlockAddAccumulateDiagCheckSign(&A_diag_data[jj1*bnnz],
+                        hypre_CSRBlockMatrixBlockAddAccumulateDiagCheckSign(&A_diag_data[jj1 * bnnz],
                                                                             sum_block, block_size, sign);
                      }
                   }
@@ -2226,7 +2250,7 @@ hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix *A,
                   /* Off-Diagonal block part of row i1 */
                   if (num_procs > 1)
                   {
-                     for (jj1 = A_offd_i[i1]; jj1 < A_offd_i[i1+1]; jj1++)
+                     for (jj1 = A_offd_i[i1]; jj1 < A_offd_i[i1 + 1]; jj1++)
                      {
                         i2 = A_offd_j[jj1];
                         if (P_marker_offd[i2] >= jj_begin_row_offd )
@@ -2235,7 +2259,7 @@ hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix *A,
                            /*sum += A_offd_data[jj1];*/
                            /* hypre_CSRBlockMatrixBlockAddAccumulateDiag(&A_offd_data[jj1*bnnz],
                               sum_block, block_size);*/
-                           hypre_CSRBlockMatrixBlockAddAccumulateDiagCheckSign(&A_offd_data[jj1*bnnz],
+                           hypre_CSRBlockMatrixBlockAddAccumulateDiagCheckSign(&A_offd_data[jj1 * bnnz],
                                                                                sum_block, block_size, sign);
                         }
                      }
@@ -2245,7 +2269,7 @@ hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix *A,
                   /* distribute = A_diag_data[jj] / sum;*/
                   /* here we want: A_diag_data * sum^(-1) */
 
-                  if (hypre_CSRBlockMatrixBlockInvMultDiag(sum_block, &A_diag_data[jj*bnnz],
+                  if (hypre_CSRBlockMatrixBlockInvMultDiag(sum_block, &A_diag_data[jj * bnnz],
                                                            distribute_block, block_size) == 0)
                   {
 
@@ -2255,7 +2279,7 @@ hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix *A,
                       *-----------------------------------------------------------*/
 
                      /* Diagonal block part of row i1 */
-                     for (jj1 = A_diag_i[i1]; jj1 < A_diag_i[i1+1]; jj1++)
+                     for (jj1 = A_diag_i[i1]; jj1 < A_diag_i[i1 + 1]; jj1++)
                      {
                         i2 = A_diag_j[jj1];
                         if (P_marker[i2] >= jj_begin_row )
@@ -2273,7 +2297,7 @@ hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix *A,
                               &A_diag_data[jj1*bnnz], 0.0,
                               sum_block, block_size);*/
                            hypre_CSRBlockMatrixBlockMultAddDiagCheckSign(distribute_block,
-                                                                         &A_diag_data[jj1*bnnz], 0.0,
+                                                                         &A_diag_data[jj1 * bnnz], 0.0,
                                                                          sum_block, block_size, sign);
 
 
@@ -2288,7 +2312,7 @@ hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix *A,
                      /* Off-Diagonal block part of row i1 */
                      if (num_procs > 1)
                      {
-                        for (jj1 = A_offd_i[i1]; jj1 < A_offd_i[i1+1]; jj1++)
+                        for (jj1 = A_offd_i[i1]; jj1 < A_offd_i[i1 + 1]; jj1++)
                         {
                            i2 = A_offd_j[jj1];
                            if (P_marker_offd[i2] >= jj_begin_row_offd)
@@ -2305,7 +2329,7 @@ hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix *A,
                                  sum_block, block_size); */
 
                               hypre_CSRBlockMatrixBlockMultAddDiagCheckSign(distribute_block,
-                                                                            &A_offd_data[jj1*bnnz], 0.0,
+                                                                            &A_offd_data[jj1 * bnnz], 0.0,
                                                                             sum_block, block_size, sign);
 
 
@@ -2323,9 +2347,9 @@ hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix *A,
                   else /* sum block is all zeros (or almost singular) - just add to diagonal */
                   {
                      /* diagonal += A_diag_data[jj]; */
-                     if (add_weak_to_diag) hypre_CSRBlockMatrixBlockAddAccumulateDiag(&A_diag_data[jj*bnnz],
-                                                                                      diagonal_block,
-                                                                                      block_size);
+                     if (add_weak_to_diag) hypre_CSRBlockMatrixBlockAddAccumulateDiag(&A_diag_data[jj * bnnz],
+                                                                                         diagonal_block,
+                                                                                         block_size);
                   }
                }
 
@@ -2337,7 +2361,7 @@ hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix *A,
                else if (CF_marker[i1] != -3 && add_weak_to_diag)
                {
                   /* diagonal += A_diag_data[jj];*/
-                  hypre_CSRBlockMatrixBlockAddAccumulateDiag(&A_diag_data[jj*bnnz],
+                  hypre_CSRBlockMatrixBlockAddAccumulateDiag(&A_diag_data[jj * bnnz],
                                                              diagonal_block,
                                                              block_size);
                }
@@ -2351,7 +2375,7 @@ hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix *A,
 
             if (num_procs > 1)
             {
-               for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+               for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
                {
                   i1 = A_offd_j[jj];
 
@@ -2363,7 +2387,7 @@ hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix *A,
                   if (P_marker_offd[i1] >= jj_begin_row_offd)
                   {
                      /* P_offd_data[P_marker_offd[i1]] += A_offd_data[jj]; */
-                     hypre_CSRBlockMatrixBlockAddAccumulateDiag( &A_offd_data[jj*bnnz],
+                     hypre_CSRBlockMatrixBlockAddAccumulateDiag( &A_offd_data[jj * bnnz],
                                                                  &P_offd_data[P_marker_offd[i1]*bnnz],
                                                                  block_size);
                   }
@@ -2392,7 +2416,7 @@ hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix *A,
                      hypre_CSRBlockMatrixComputeSign(&A_ext_data[A_ext_i[c_num]*bnnz], sign, block_size);
 
 
-                     for (jj1 = A_ext_i[c_num]; jj1 < A_ext_i[c_num+1]; jj1++)
+                     for (jj1 = A_ext_i[c_num]; jj1 < A_ext_i[c_num + 1]; jj1++)
                      {
                         i2 = (HYPRE_Int)A_ext_j[jj1];
 
@@ -2404,19 +2428,19 @@ hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix *A,
                               /* sum += A_ext_data[jj1]; */
                               /*  hypre_CSRBlockMatrixBlockAddAccumulateDiag(&A_ext_data[jj1*bnnz],
                                   sum_block, block_size);*/
-                              hypre_CSRBlockMatrixBlockAddAccumulateDiagCheckSign(&A_ext_data[jj1*bnnz],
+                              hypre_CSRBlockMatrixBlockAddAccumulateDiagCheckSign(&A_ext_data[jj1 * bnnz],
                                                                                   sum_block, block_size, sign);
                            }
                         }
                         else
                         {
                            /* in the off_diagonal block  */
-                           if (P_marker_offd[-i2-1] >= jj_begin_row_offd)
+                           if (P_marker_offd[-i2 - 1] >= jj_begin_row_offd)
                            {
                               /* sum += A_ext_data[jj1]; */
                               /* hypre_CSRBlockMatrixBlockAddAccumulateDiag(&A_ext_data[jj1*bnnz],
                                  sum_block, block_size);*/
-                              hypre_CSRBlockMatrixBlockAddAccumulateDiagCheckSign(&A_ext_data[jj1*bnnz],
+                              hypre_CSRBlockMatrixBlockAddAccumulateDiagCheckSign(&A_ext_data[jj1 * bnnz],
                                                                                   sum_block, block_size, sign);
                            }
                         }
@@ -2427,7 +2451,7 @@ hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix *A,
 
                      /* distribute = A_offd_data[jj] / sum;  */
                      /* here we want: A_offd_data * sum^(-1) */
-                     if (hypre_CSRBlockMatrixBlockInvMultDiag(sum_block, &A_offd_data[jj*bnnz],
+                     if (hypre_CSRBlockMatrixBlockInvMultDiag(sum_block, &A_offd_data[jj * bnnz],
                                                               distribute_block, block_size) == 0)
                      {
 
@@ -2438,7 +2462,7 @@ hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix *A,
 
                         /* Diagonal block part of row i1 */
 
-                        for (jj1 = A_ext_i[c_num]; jj1 < A_ext_i[c_num+1]; jj1++)
+                        for (jj1 = A_ext_i[c_num]; jj1 < A_ext_i[c_num + 1]; jj1++)
                         {
                            i2 = (HYPRE_Int)A_ext_j[jj1];
 
@@ -2457,7 +2481,7 @@ hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix *A,
                                     sum_block, block_size); */
 
                                  hypre_CSRBlockMatrixBlockMultAddDiagCheckSign(distribute_block,
-                                                                               &A_ext_data[jj1*bnnz], 0.0,
+                                                                               &A_ext_data[jj1 * bnnz], 0.0,
                                                                                sum_block, block_size, sign);
                                  /* add result to p_diag_data */
                                  hypre_CSRBlockMatrixBlockAddAccumulateDiag(sum_block,
@@ -2468,7 +2492,7 @@ hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix *A,
                            else
                            {
                               /* in the off_diagonal block  */
-                              if (P_marker_offd[-i2-1] >= jj_begin_row_offd)
+                              if (P_marker_offd[-i2 - 1] >= jj_begin_row_offd)
 
                                  /*P_offd_data[P_marker_offd[-i2-1]]
                                    += distribute * A_ext_data[jj1];*/
@@ -2482,11 +2506,11 @@ hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix *A,
                                     sum_block, block_size);*/
 
                                  hypre_CSRBlockMatrixBlockMultAddDiagCheckSign(distribute_block,
-                                                                               &A_ext_data[jj1*bnnz], 0.0,
+                                                                               &A_ext_data[jj1 * bnnz], 0.0,
                                                                                sum_block, block_size, sign);
                                  /* add result to p_offd_data */
                                  hypre_CSRBlockMatrixBlockAddAccumulateDiag(sum_block,
-                                                                            &P_offd_data[P_marker_offd[-i2-1]*bnnz],
+                                                                            &P_offd_data[P_marker_offd[-i2 - 1]*bnnz],
                                                                             block_size);
                               }
                            }
@@ -2495,9 +2519,9 @@ hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix *A,
                      else /* sum block is all zeros - just add to diagonal */
                      {
                         /* diagonal += A_offd_data[jj]; */
-                        if (add_weak_to_diag) hypre_CSRBlockMatrixBlockAddAccumulateDiag(&A_offd_data[jj*bnnz],
-                                                                                         diagonal_block,
-                                                                                         block_size);
+                        if (add_weak_to_diag) hypre_CSRBlockMatrixBlockAddAccumulateDiag(&A_offd_data[jj * bnnz],
+                                                                                            diagonal_block,
+                                                                                            block_size);
                      }
                   }
 
@@ -2509,8 +2533,8 @@ hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix *A,
                   else if (CF_marker_offd[i1] != -3 && add_weak_to_diag)
                   {
                      /* diagonal += A_offd_data[jj]; */
-                     hypre_CSRBlockMatrixBlockAddAccumulateDiag(&A_offd_data[jj*bnnz],
-                                              diagonal_block, block_size);
+                     hypre_CSRBlockMatrixBlockAddAccumulateDiag(&A_offd_data[jj * bnnz],
+                                                                diagonal_block, block_size);
                   }
                }
             }
@@ -2526,18 +2550,18 @@ hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix *A,
 
                /* want diagonal^(-1)*P_diag_data */
                /* do division - put in sum_block */
-               if ( hypre_CSRBlockMatrixBlockInvMultDiag(diagonal_block, &P_diag_data[jj*bnnz],
+               if ( hypre_CSRBlockMatrixBlockInvMultDiag(diagonal_block, &P_diag_data[jj * bnnz],
                                                          sum_block, block_size) == 0)
                {
                   /* now copy to  P_diag_data[jj] and make negative */
-                  hypre_CSRBlockMatrixBlockCopyData(sum_block, &P_diag_data[jj*bnnz],
-                                                   -1.0, block_size);
+                  hypre_CSRBlockMatrixBlockCopyData(sum_block, &P_diag_data[jj * bnnz],
+                                                    -1.0, block_size);
                }
                else
                {
                   /* hypre_printf(" Warning! singular diagonal block! Proc id %d row %d\n", my_id,i);  */
                   /* just make P_diag_data negative since diagonal is zero */
-                  hypre_CSRBlockMatrixBlockCopyData(&P_diag_data[jj*bnnz], &P_diag_data[jj*bnnz],
+                  hypre_CSRBlockMatrixBlockCopyData(&P_diag_data[jj * bnnz], &P_diag_data[jj * bnnz],
                                                     -1.0, block_size);
                }
             }
@@ -2547,18 +2571,18 @@ hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix *A,
                /* P_offd_data[jj] /= -diagonal; */
 
                /* do division - put in sum_block */
-               hypre_CSRBlockMatrixBlockInvMultDiag(diagonal_block, &P_offd_data[jj*bnnz],
+               hypre_CSRBlockMatrixBlockInvMultDiag(diagonal_block, &P_offd_data[jj * bnnz],
                                                     sum_block, block_size);
 
                /* now copy to  P_offd_data[jj] and make negative */
-               hypre_CSRBlockMatrixBlockCopyData(sum_block, &P_offd_data[jj*bnnz],
+               hypre_CSRBlockMatrixBlockCopyData(sum_block, &P_offd_data[jj * bnnz],
                                                  -1.0, block_size);
             }
          }
 
          strong_f_marker--;
 
-         P_offd_i[i+1] = jj_counter_offd;
+         P_offd_i[i + 1] = jj_counter_offd;
       }
       hypre_TFree(P_marker, HYPRE_MEMORY_HOST);
       hypre_TFree(P_marker_offd, HYPRE_MEMORY_HOST);
@@ -2605,11 +2629,13 @@ hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix *A,
    {
       P_marker = hypre_CTAlloc(HYPRE_Int,  num_cols_A_offd, HYPRE_MEMORY_HOST);
 
-      for (i=0; i < num_cols_A_offd; i++)
+      for (i = 0; i < num_cols_A_offd; i++)
+      {
          P_marker[i] = 0;
+      }
 
       num_cols_P_offd = 0;
-      for (i=0; i < P_offd_size; i++)
+      for (i = 0; i < P_offd_size; i++)
       {
          index = P_offd_j[i];
          if (!P_marker[index])
@@ -2623,21 +2649,21 @@ hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix *A,
       col_map_offd_P = hypre_CTAlloc(HYPRE_BigInt, num_cols_P_offd, HYPRE_MEMORY_HOST);
 
       index = 0;
-      for (i=0; i < num_cols_P_offd; i++)
+      for (i = 0; i < num_cols_P_offd; i++)
       {
-         while (P_marker[index]==0) index++;
+         while (P_marker[index] == 0) { index++; }
          tmp_map_offd[i] = index++;
       }
 
-      for (i=0; i < P_offd_size; i++)
+      for (i = 0; i < P_offd_size; i++)
          P_offd_j[i] = hypre_BinarySearch(tmp_map_offd,
                                           P_offd_j[i],
                                           num_cols_P_offd);
       hypre_TFree(P_marker, HYPRE_MEMORY_HOST);
    }
 
-   for (i=0; i < n_fine; i++)
-      if (CF_marker[i] == -3) CF_marker[i] = -1;
+   for (i = 0; i < n_fine; i++)
+      if (CF_marker[i] == -3) { CF_marker[i] = -1; }
 
    if (num_cols_P_offd)
    {
@@ -2646,7 +2672,7 @@ hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix *A,
    }
 
    /* use block version */
-   hypre_GetCommPkgBlockRTFromCommPkgBlockA(P,A, tmp_map_offd, fine_to_coarse_offd);
+   hypre_GetCommPkgBlockRTFromCommPkgBlockA(P, A, tmp_map_offd, fine_to_coarse_offd);
 
 
    *P_ptr = P;
@@ -2670,9 +2696,9 @@ hypre_BoomerAMGBuildBlockInterpDiag( hypre_ParCSRBlockMatrix *A,
    hypre_TFree(jj_count, HYPRE_MEMORY_HOST);
    hypre_TFree(jj_count_offd, HYPRE_MEMORY_HOST);
 
-   if (num_procs > 1) hypre_CSRBlockMatrixDestroy(A_ext);
+   if (num_procs > 1) { hypre_CSRBlockMatrixDestroy(A_ext); }
 
-   return(0);
+   return (0);
 
 }
 
@@ -2704,6 +2730,7 @@ hypre_BoomerAMGBuildBlockInterpRV( hypre_ParCSRBlockMatrix    *A,
                                    HYPRE_Int                   max_elmts,
                                    hypre_ParCSRBlockMatrix   **P_ptr)
 {
+   HYPRE_UNUSED_VAR(dof_func);
 
    MPI_Comm                 comm = hypre_ParCSRBlockMatrixComm(A);
    hypre_ParCSRCommPkg     *comm_pkg = hypre_ParCSRBlockMatrixCommPkg(A);
@@ -2715,7 +2742,7 @@ hypre_BoomerAMGBuildBlockInterpRV( hypre_ParCSRBlockMatrix    *A,
    HYPRE_Int             *A_diag_j = hypre_CSRBlockMatrixJ(A_diag);
 
    HYPRE_Int              block_size = hypre_CSRBlockMatrixBlockSize(A_diag);
-   HYPRE_Int              bnnz = block_size*block_size;
+   HYPRE_Int              bnnz = block_size * block_size;
 
    hypre_CSRBlockMatrix  *A_offd = hypre_ParCSRBlockMatrixOffd(A);
    HYPRE_Real            *A_offd_data = hypre_CSRBlockMatrixData(A_offd);
@@ -2738,8 +2765,7 @@ hypre_BoomerAMGBuildBlockInterpRV( hypre_ParCSRBlockMatrix    *A,
 
    HYPRE_Int             *CF_marker_offd = NULL;
 
-   hypre_CSRBlockMatrix  *A_ext;
-
+   hypre_CSRBlockMatrix  *A_ext = NULL;
    HYPRE_Real            *A_ext_data = NULL;
    HYPRE_Int             *A_ext_i = NULL;
    HYPRE_BigInt          *A_ext_j = NULL;
@@ -2758,10 +2784,10 @@ hypre_BoomerAMGBuildBlockInterpRV( hypre_ParCSRBlockMatrix    *A,
 
    HYPRE_Int             *P_marker, *P_marker_offd = NULL;
 
-   HYPRE_Int              jj_counter,jj_counter_offd;
+   HYPRE_Int              jj_counter, jj_counter_offd;
    HYPRE_Int             *jj_count, *jj_count_offd = NULL;
-   HYPRE_Int              jj_begin_row,jj_begin_row_offd;
-   HYPRE_Int              jj_end_row,jj_end_row_offd;
+   HYPRE_Int              jj_begin_row, jj_begin_row_offd;
+   HYPRE_Int              jj_end_row, jj_end_row_offd;
 
    HYPRE_Int              start_indexing = 0; /* start indexing for P_data at 0 */
 
@@ -2779,8 +2805,8 @@ hypre_BoomerAMGBuildBlockInterpRV( hypre_ParCSRBlockMatrix    *A,
 
    HYPRE_Int              bd;
 
-   HYPRE_Int              i,i1,i2;
-   HYPRE_Int              j,jl,jj,jj1;
+   HYPRE_Int              i, i1, i2;
+   HYPRE_Int              j, jl, jj, jj1;
    HYPRE_Int              kc;
    HYPRE_BigInt           big_k;
    HYPRE_Int              start;
@@ -2800,7 +2826,7 @@ hypre_BoomerAMGBuildBlockInterpRV( hypre_ParCSRBlockMatrix    *A,
    HYPRE_Int local_numrows = hypre_CSRBlockMatrixNumRows(A_diag);
    HYPRE_BigInt col_n = col_1 + (HYPRE_BigInt)local_numrows;
 
-   HYPRE_Real       wall_time;  /* for debugging instrumentation  */
+   HYPRE_Real       wall_time = 0.0;  /* for debugging instrumentation  */
 
 
    HYPRE_Real       *identity_block;
@@ -2810,18 +2836,23 @@ hypre_BoomerAMGBuildBlockInterpRV( hypre_ParCSRBlockMatrix    *A,
    HYPRE_Real       *distribute_block;
 
    hypre_MPI_Comm_size(comm, &num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_rank(comm, &my_id);
    num_threads = hypre_NumThreads();
 
+   if (num_functions > 1)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Not implemented for num_functions > 1!");
+   }
+
    my_first_cpt = num_cpts_global[0];
-   if (my_id == (num_procs -1)) total_global_cpts = num_cpts_global[1];
-   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
+   if (my_id == (num_procs - 1)) { total_global_cpts = num_cpts_global[1]; }
+   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
 
    /*-------------------------------------------------------------------
     * Get the CF_marker data for the off-processor columns
     *-------------------------------------------------------------------*/
 
-   if (debug_flag==4) wall_time = time_getWallclockSeconds();
+   if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
 
    CF_marker_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_A_offd, HYPRE_MEMORY_HOST);
 
@@ -2833,19 +2864,19 @@ hypre_BoomerAMGBuildBlockInterpRV( hypre_ParCSRBlockMatrix    *A,
    }
 
    num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
-   int_buf_data = hypre_CTAlloc(HYPRE_Int,  hypre_ParCSRCommPkgSendMapStart(comm_pkg,
-                                                      num_sends), HYPRE_MEMORY_HOST);
+   int_buf_data = hypre_CTAlloc(HYPRE_Int,
+                                hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                                HYPRE_MEMORY_HOST);
 
    index = 0;
    for (i = 0; i < num_sends; i++)
    {
       start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
       {
          int_buf_data[index++]
-            = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+            = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
       }
-
    }
 
    /* we do not need the block version of comm handle - because
@@ -2857,7 +2888,7 @@ hypre_BoomerAMGBuildBlockInterpRV( hypre_ParCSRBlockMatrix    *A,
    hypre_ParCSRCommHandleDestroy(comm_handle);
 
 
-   if (debug_flag==4)
+   if (debug_flag == 4)
    {
       wall_time = time_getWallclockSeconds() - wall_time;
       hypre_printf("Proc = %d     Interp: Comm 1 CF_marker =    %f\n",
@@ -2869,7 +2900,7 @@ hypre_BoomerAMGBuildBlockInterpRV( hypre_ParCSRBlockMatrix    *A,
     * Get the ghost rows of A
     *---------------------------------------------------------------------*/
 
-   if (debug_flag==4) wall_time = time_getWallclockSeconds();
+   if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
 
    if (num_procs > 1)
    {
@@ -2880,9 +2911,9 @@ hypre_BoomerAMGBuildBlockInterpRV( hypre_ParCSRBlockMatrix    *A,
    }
 
    index = 0;
-   for (i=0; i < num_cols_A_offd; i++)
+   for (i = 0; i < num_cols_A_offd; i++)
    {
-      for (j=A_ext_i[i]; j < A_ext_i[i+1]; j++)
+      for (j = A_ext_i[i]; j < A_ext_i[i + 1]; j++)
       {
          big_k = A_ext_j[j];
          if (big_k >= col_1 && big_k < col_n)
@@ -2891,7 +2922,7 @@ hypre_BoomerAMGBuildBlockInterpRV( hypre_ParCSRBlockMatrix    *A,
             /* for the data field we must get all of the blocbig_k data */
             for (bd = 0; bd < bnnz; bd++)
             {
-               A_ext_data[index*bnnz + bd] = A_ext_data[j*bnnz + bd];
+               A_ext_data[index * bnnz + bd] = A_ext_data[j * bnnz + bd];
             }
             index++;
          }
@@ -2900,10 +2931,10 @@ hypre_BoomerAMGBuildBlockInterpRV( hypre_ParCSRBlockMatrix    *A,
             kc = hypre_BigBinarySearch(col_map_offd, big_k, num_cols_A_offd);
             if (kc > -1)
             {
-               A_ext_j[index] = (HYPRE_BigInt)(-kc-1);
+               A_ext_j[index] = (HYPRE_BigInt)(-kc - 1);
                for (bd = 0; bd < bnnz; bd++)
                {
-                  A_ext_data[index*bnnz + bd] = A_ext_data[j*bnnz + bd];
+                  A_ext_data[index * bnnz + bd] = A_ext_data[j * bnnz + bd];
                }
                index++;
             }
@@ -2912,10 +2943,12 @@ hypre_BoomerAMGBuildBlockInterpRV( hypre_ParCSRBlockMatrix    *A,
       A_ext_i[i] = index;
    }
    for (i = num_cols_A_offd; i > 0; i--)
-      A_ext_i[i] = A_ext_i[i-1];
-   if (num_procs > 1) A_ext_i[0] = 0;
+   {
+      A_ext_i[i] = A_ext_i[i - 1];
+   }
+   if (num_procs > 1) { A_ext_i[0] = 0; }
 
-   if (debug_flag==4)
+   if (debug_flag == 4)
    {
       wall_time = time_getWallclockSeconds() - wall_time;
       hypre_printf("Proc = %d  Interp: Comm 2   Get A_ext =  %f\n",
@@ -2938,7 +2971,7 @@ hypre_BoomerAMGBuildBlockInterpRV( hypre_ParCSRBlockMatrix    *A,
 
    fine_to_coarse = hypre_CTAlloc(HYPRE_Int,  n_fine, HYPRE_MEMORY_HOST);
 
-   for (i = 0; i < n_fine; i++) fine_to_coarse[i] = -1;
+   for (i = 0; i < n_fine; i++) { fine_to_coarse[i] = -1; }
 
    jj_counter = start_indexing;
    jj_counter_offd = start_indexing;
@@ -2949,17 +2982,17 @@ hypre_BoomerAMGBuildBlockInterpRV( hypre_ParCSRBlockMatrix    *A,
 
    for (j = 0; j < num_threads; j++)
    {
-      size = n_fine/num_threads;
-      rest = n_fine - size*num_threads;
+      size = n_fine / num_threads;
+      rest = n_fine - size * num_threads;
       if (j < rest)
       {
-         ns = j*size+j;
-         ne = (j+1)*size+j+1;
+         ns = j * size + j;
+         ne = (j + 1) * size + j + 1;
       }
       else
       {
-         ns = j*size+rest;
-         ne = (j+1)*size+rest;
+         ns = j * size + rest;
+         ne = (j + 1) * size + rest;
       }
 
 
@@ -2986,7 +3019,7 @@ hypre_BoomerAMGBuildBlockInterpRV( hypre_ParCSRBlockMatrix    *A,
 
          else
          {
-            for (jj = S_diag_i[i]; jj < S_diag_i[i+1]; jj++)
+            for (jj = S_diag_i[i]; jj < S_diag_i[i + 1]; jj++)
             {
                i1 = S_diag_j[jj];
                if (CF_marker[i1] >= 0)
@@ -2997,7 +3030,7 @@ hypre_BoomerAMGBuildBlockInterpRV( hypre_ParCSRBlockMatrix    *A,
 
             if (num_procs > 1)
             {
-               for (jj = S_offd_i[i]; jj < S_offd_i[i+1]; jj++)
+               for (jj = S_offd_i[i]; jj < S_offd_i[i + 1]; jj++)
                {
                   i1 = S_offd_j[jj];
                   if (CF_marker_offd[i1] >= 0)
@@ -3014,32 +3047,32 @@ hypre_BoomerAMGBuildBlockInterpRV( hypre_ParCSRBlockMatrix    *A,
     *  Allocate  arrays.
     *-----------------------------------------------------------------------*/
 
-   for (i=0; i < num_threads-1; i++)
+   for (i = 0; i < num_threads - 1; i++)
    {
-      coarse_counter[i+1] += coarse_counter[i];
-      jj_count[i+1] += jj_count[i];
-      jj_count_offd[i+1] += jj_count_offd[i];
+      coarse_counter[i + 1] += coarse_counter[i];
+      jj_count[i + 1] += jj_count[i];
+      jj_count_offd[i + 1] += jj_count_offd[i];
    }
-   i = num_threads-1;
+   i = num_threads - 1;
    jj_counter = jj_count[i];
    jj_counter_offd = jj_count_offd[i];
 
    P_diag_size = jj_counter;
 
-   P_diag_i    = hypre_CTAlloc(HYPRE_Int,  n_fine+1, HYPRE_MEMORY_HOST);
+   P_diag_i    = hypre_CTAlloc(HYPRE_Int,  n_fine + 1, HYPRE_MEMORY_HOST);
    P_diag_j    = hypre_CTAlloc(HYPRE_Int,  P_diag_size, HYPRE_MEMORY_HOST);
    /* we need to include the size of the blocks in the data size */
-   P_diag_data = hypre_CTAlloc(HYPRE_Real,  P_diag_size*bnnz, HYPRE_MEMORY_HOST);
+   P_diag_data = hypre_CTAlloc(HYPRE_Real,  P_diag_size * bnnz, HYPRE_MEMORY_HOST);
 
    P_diag_i[n_fine] = jj_counter;
 
 
    P_offd_size = jj_counter_offd;
 
-   P_offd_i    = hypre_CTAlloc(HYPRE_Int,  n_fine+1, HYPRE_MEMORY_HOST);
+   P_offd_i    = hypre_CTAlloc(HYPRE_Int,  n_fine + 1, HYPRE_MEMORY_HOST);
    P_offd_j    = hypre_CTAlloc(HYPRE_Int,  P_offd_size, HYPRE_MEMORY_HOST);
    /* we need to include the size of the blocks in the data size */
-   P_offd_data = hypre_CTAlloc(HYPRE_Real,  P_offd_size*bnnz, HYPRE_MEMORY_HOST);
+   P_offd_data = hypre_CTAlloc(HYPRE_Real,  P_offd_size * bnnz, HYPRE_MEMORY_HOST);
 
    /*-----------------------------------------------------------------------
     *  Intialize some stuff.
@@ -3048,7 +3081,7 @@ hypre_BoomerAMGBuildBlockInterpRV( hypre_ParCSRBlockMatrix    *A,
    jj_counter = start_indexing;
    jj_counter_offd = start_indexing;
 
-   if (debug_flag==4)
+   if (debug_flag == 4)
    {
       wall_time = time_getWallclockSeconds() - wall_time;
       hypre_printf("Proc = %d     Interp: Internal work 1 =     %f\n",
@@ -3060,9 +3093,9 @@ hypre_BoomerAMGBuildBlockInterpRV( hypre_ParCSRBlockMatrix    *A,
    identity_block = hypre_CTAlloc(HYPRE_Real,  bnnz, HYPRE_MEMORY_HOST);
    zero_block =  hypre_CTAlloc(HYPRE_Real,  bnnz, HYPRE_MEMORY_HOST);
 
-   for(i = 0; i < block_size; i++)
+   for (i = 0; i < block_size; i++)
    {
-      identity_block[i*block_size + i] = 1.0;
+      identity_block[i * block_size + i] = 1.0;
    }
 
 
@@ -3075,38 +3108,40 @@ hypre_BoomerAMGBuildBlockInterpRV( hypre_ParCSRBlockMatrix    *A,
     *  Send and receive fine_to_coarse info.
     *-----------------------------------------------------------------------*/
 
-   if (debug_flag==4) wall_time = time_getWallclockSeconds();
+   if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
 
    fine_to_coarse_offd = hypre_CTAlloc(HYPRE_BigInt,  num_cols_A_offd, HYPRE_MEMORY_HOST);
    big_buf_data = hypre_CTAlloc(HYPRE_BigInt,  hypre_ParCSRCommPkgSendMapStart(comm_pkg,
-                                                      num_sends), HYPRE_MEMORY_HOST);
+                                                                               num_sends), HYPRE_MEMORY_HOST);
 
    for (j = 0; j < num_threads; j++)
    {
       coarse_shift = 0;
-      if (j > 0) coarse_shift = coarse_counter[j-1];
-      size = n_fine/num_threads;
-      rest = n_fine - size*num_threads;
+      if (j > 0) { coarse_shift = coarse_counter[j - 1]; }
+      size = n_fine / num_threads;
+      rest = n_fine - size * num_threads;
       if (j < rest)
       {
-         ns = j*size+j;
-         ne = (j+1)*size+j+1;
+         ns = j * size + j;
+         ne = (j + 1) * size + j + 1;
       }
       else
       {
-         ns = j*size+rest;
-         ne = (j+1)*size+rest;
+         ns = j * size + rest;
+         ne = (j + 1) * size + rest;
       }
       for (i = ns; i < ne; i++)
+      {
          fine_to_coarse[i] += coarse_shift;
+      }
    }
    index = 0;
    for (i = 0; i < num_sends; i++)
    {
       start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
          big_buf_data[index++] = my_first_cpt
-            + fine_to_coarse[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+                                 + fine_to_coarse[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
    }
 
    /* again, we do not need to use the block version of comm handle since
@@ -3117,7 +3152,7 @@ hypre_BoomerAMGBuildBlockInterpRV( hypre_ParCSRBlockMatrix    *A,
 
    hypre_ParCSRCommHandleDestroy(comm_handle);
 
-   if (debug_flag==4)
+   if (debug_flag == 4)
    {
       wall_time = time_getWallclockSeconds() - wall_time;
       hypre_printf("Proc = %d     Interp: Comm 4 FineToCoarse = %f\n",
@@ -3125,9 +3160,9 @@ hypre_BoomerAMGBuildBlockInterpRV( hypre_ParCSRBlockMatrix    *A,
       fflush(NULL);
    }
 
-   if (debug_flag==4) wall_time = time_getWallclockSeconds();
+   if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
 
-   for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;
+   for (i = 0; i < n_fine; i++) { fine_to_coarse[i] -= my_first_cpt; }
 
    /*-----------------------------------------------------------------------
     *  Loop over fine grid points.
@@ -3135,22 +3170,22 @@ hypre_BoomerAMGBuildBlockInterpRV( hypre_ParCSRBlockMatrix    *A,
 
    for (jl = 0; jl < num_threads; jl++)
    {
-      size = n_fine/num_threads;
-      rest = n_fine - size*num_threads;
+      size = n_fine / num_threads;
+      rest = n_fine - size * num_threads;
       if (jl < rest)
       {
-         ns = jl*size+jl;
-         ne = (jl+1)*size+jl+1;
+         ns = jl * size + jl;
+         ne = (jl + 1) * size + jl + 1;
       }
       else
       {
-         ns = jl*size+rest;
-         ne = (jl+1)*size+rest;
+         ns = jl * size + rest;
+         ne = (jl + 1) * size + rest;
       }
       jj_counter = 0;
-      if (jl > 0) jj_counter = jj_count[jl-1];
+      if (jl > 0) { jj_counter = jj_count[jl - 1]; }
       jj_counter_offd = 0;
-      if (jl > 0) jj_counter_offd = jj_count_offd[jl-1];
+      if (jl > 0) { jj_counter_offd = jj_count_offd[jl - 1]; }
 
       P_marker = hypre_CTAlloc(HYPRE_Int,  n_fine, HYPRE_MEMORY_HOST);
       P_marker_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_A_offd, HYPRE_MEMORY_HOST);
@@ -3178,7 +3213,7 @@ hypre_BoomerAMGBuildBlockInterpRV( hypre_ParCSRBlockMatrix    *A,
             P_diag_j[jj_counter]    = fine_to_coarse[i];
             /* P_diag_data[jj_counter] = one; */
             hypre_CSRBlockMatrixBlockCopyData(identity_block,
-                                              &P_diag_data[jj_counter*bnnz],
+                                              &P_diag_data[jj_counter * bnnz],
                                               1.0, block_size);
             jj_counter++;
          }
@@ -3193,7 +3228,7 @@ hypre_BoomerAMGBuildBlockInterpRV( hypre_ParCSRBlockMatrix    *A,
             P_diag_i[i] = jj_counter;
             jj_begin_row = jj_counter;
 
-            for (jj = S_diag_i[i]; jj < S_diag_i[i+1]; jj++)
+            for (jj = S_diag_i[i]; jj < S_diag_i[i + 1]; jj++)
             {
                i1 = S_diag_j[jj];
 
@@ -3208,7 +3243,7 @@ hypre_BoomerAMGBuildBlockInterpRV( hypre_ParCSRBlockMatrix    *A,
                   P_diag_j[jj_counter]    = fine_to_coarse[i1];
                   /* P_diag_data[jj_counter] = zero; */
                   hypre_CSRBlockMatrixBlockCopyData(zero_block,
-                                                    &P_diag_data[jj_counter*bnnz],
+                                                    &P_diag_data[jj_counter * bnnz],
                                                     1.0, block_size);
                   jj_counter++;
                }
@@ -3232,7 +3267,7 @@ hypre_BoomerAMGBuildBlockInterpRV( hypre_ParCSRBlockMatrix    *A,
 
             if (num_procs > 1)
             {
-               for (jj = S_offd_i[i]; jj < S_offd_i[i+1]; jj++)
+               for (jj = S_offd_i[i]; jj < S_offd_i[i + 1]; jj++)
                {
                   i1 = S_offd_j[jj];
 
@@ -3247,7 +3282,7 @@ hypre_BoomerAMGBuildBlockInterpRV( hypre_ParCSRBlockMatrix    *A,
                      P_offd_j[jj_counter_offd]  = i1;
                      /* P_offd_data[jj_counter_offd] = zero; */
                      hypre_CSRBlockMatrixBlockCopyData(zero_block,
-                                                       &P_offd_data[jj_counter_offd*bnnz],
+                                                       &P_offd_data[jj_counter_offd * bnnz],
                                                        1.0, block_size);
 
                      jj_counter_offd++;
@@ -3279,7 +3314,7 @@ hypre_BoomerAMGBuildBlockInterpRV( hypre_ParCSRBlockMatrix    *A,
 
             /* Loop over ith row of A.  First, the diagonal part of A */
 
-            for (jj = A_diag_i[i]+1; jj < A_diag_i[i+1]; jj++)
+            for (jj = A_diag_i[i] + 1; jj < A_diag_i[i + 1]; jj++)
             {
                i1 = A_diag_j[jj];
 
@@ -3291,7 +3326,7 @@ hypre_BoomerAMGBuildBlockInterpRV( hypre_ParCSRBlockMatrix    *A,
                if (P_marker[i1] >= jj_begin_row)
                {
                   /*   P_diag_data[P_marker[i1]] += A_diag_data[jj]; */
-                  hypre_CSRBlockMatrixBlockAddAccumulate(&A_diag_data[jj*bnnz],
+                  hypre_CSRBlockMatrixBlockAddAccumulate(&A_diag_data[jj * bnnz],
                                                          &P_diag_data[P_marker[i1]*bnnz],
                                                          block_size);
 
@@ -3320,14 +3355,14 @@ hypre_BoomerAMGBuildBlockInterpRV( hypre_ParCSRBlockMatrix    *A,
                    *-----------------------------------------------------------*/
 
                   /* Diagonal block part of row i1 */
-                  for (jj1 = A_diag_i[i1]; jj1 < A_diag_i[i1+1]; jj1++)
+                  for (jj1 = A_diag_i[i1]; jj1 < A_diag_i[i1 + 1]; jj1++)
                   {
                      i2 = A_diag_j[jj1];
                      if (P_marker[i2] >= jj_begin_row)
                      {
                         /* add diag data to sum */
                         /* sum += A_diag_data[jj1]; */
-                        hypre_CSRBlockMatrixBlockAddAccumulateDiag(&A_diag_data[jj1*bnnz],
+                        hypre_CSRBlockMatrixBlockAddAccumulateDiag(&A_diag_data[jj1 * bnnz],
                                                                    sum_block, block_size);
                      }
                   }
@@ -3335,14 +3370,14 @@ hypre_BoomerAMGBuildBlockInterpRV( hypre_ParCSRBlockMatrix    *A,
                   /* Off-Diagonal block part of row i1 */
                   if (num_procs > 1)
                   {
-                     for (jj1 = A_offd_i[i1]; jj1 < A_offd_i[i1+1]; jj1++)
+                     for (jj1 = A_offd_i[i1]; jj1 < A_offd_i[i1 + 1]; jj1++)
                      {
                         i2 = A_offd_j[jj1];
                         if (P_marker_offd[i2] >= jj_begin_row_offd )
                         {
                            /* add off diag data to sum */
                            /*sum += A_offd_data[jj1];*/
-                           hypre_CSRBlockMatrixBlockAddAccumulateDiag(&A_offd_data[jj1*bnnz],
+                           hypre_CSRBlockMatrixBlockAddAccumulateDiag(&A_offd_data[jj1 * bnnz],
                                                                       sum_block, block_size);
 
                         }
@@ -3351,7 +3386,7 @@ hypre_BoomerAMGBuildBlockInterpRV( hypre_ParCSRBlockMatrix    *A,
                   /* check whether sum_block is singular (NOW SUM IS A DIAG MATRIX)*/
                   /* distribute = A_diag_data[jj] / sum;  (if a diag element is 0 then
                      that col is scaled by 1 instead of 1/diag) - doesn'treturn 0*/
-                  if (hypre_CSRBlockMatrixBlockInvMultDiag2(&A_diag_data[jj*bnnz], sum_block,
+                  if (hypre_CSRBlockMatrixBlockInvMultDiag2(&A_diag_data[jj * bnnz], sum_block,
                                                             distribute_block, block_size) == 0)
                   {
 
@@ -3362,7 +3397,7 @@ hypre_BoomerAMGBuildBlockInterpRV( hypre_ParCSRBlockMatrix    *A,
                       *-----------------------------------------------------------*/
 
                      /* Diagonal block part of row i1 */
-                     for (jj1 = A_diag_i[i1]; jj1 < A_diag_i[i1+1]; jj1++)
+                     for (jj1 = A_diag_i[i1]; jj1 < A_diag_i[i1 + 1]; jj1++)
                      {
                         i2 = A_diag_j[jj1];
                         if (P_marker[i2] >= jj_begin_row )
@@ -3373,7 +3408,7 @@ hypre_BoomerAMGBuildBlockInterpRV( hypre_ParCSRBlockMatrix    *A,
 
                            /* multiply - result in sum_block */
                            hypre_CSRBlockMatrixBlockMultAddDiag2(distribute_block,
-                                                                 &A_diag_data[jj1*bnnz], 0.0,
+                                                                 &A_diag_data[jj1 * bnnz], 0.0,
                                                                  sum_block, block_size);
 
 
@@ -3388,7 +3423,7 @@ hypre_BoomerAMGBuildBlockInterpRV( hypre_ParCSRBlockMatrix    *A,
                      /* Off-Diagonal block part of row i1 */
                      if (num_procs > 1)
                      {
-                        for (jj1 = A_offd_i[i1]; jj1 < A_offd_i[i1+1]; jj1++)
+                        for (jj1 = A_offd_i[i1]; jj1 < A_offd_i[i1 + 1]; jj1++)
                         {
                            i2 = A_offd_j[jj1];
                            if (P_marker_offd[i2] >= jj_begin_row_offd)
@@ -3398,7 +3433,7 @@ hypre_BoomerAMGBuildBlockInterpRV( hypre_ParCSRBlockMatrix    *A,
 
                               /* multiply - result in sum_block */
                               hypre_CSRBlockMatrixBlockMultAddDiag2(distribute_block,
-                                                                    &A_offd_data[jj1*bnnz], 0.0,
+                                                                    &A_offd_data[jj1 * bnnz], 0.0,
                                                                     sum_block, block_size);
 
 
@@ -3422,7 +3457,7 @@ hypre_BoomerAMGBuildBlockInterpRV( hypre_ParCSRBlockMatrix    *A,
 
             if (num_procs > 1)
             {
-               for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+               for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
                {
                   i1 = A_offd_j[jj];
 
@@ -3434,7 +3469,7 @@ hypre_BoomerAMGBuildBlockInterpRV( hypre_ParCSRBlockMatrix    *A,
                   if (P_marker_offd[i1] >= jj_begin_row_offd)
                   {
                      /* P_offd_data[P_marker_offd[i1]] += A_offd_data[jj]; */
-                     hypre_CSRBlockMatrixBlockAddAccumulate( &A_offd_data[jj*bnnz],
+                     hypre_CSRBlockMatrixBlockAddAccumulate( &A_offd_data[jj * bnnz],
                                                              &P_offd_data[P_marker_offd[i1]*bnnz],
                                                              block_size);
                   }
@@ -3464,7 +3499,7 @@ hypre_BoomerAMGBuildBlockInterpRV( hypre_ParCSRBlockMatrix    *A,
                      /* find row number */
                      c_num = A_offd_j[jj];
 
-                     for (jj1 = A_ext_i[c_num]; jj1 < A_ext_i[c_num+1]; jj1++)
+                     for (jj1 = A_ext_i[c_num]; jj1 < A_ext_i[c_num + 1]; jj1++)
                      {
                         i2 = (HYPRE_Int)A_ext_j[jj1];
 
@@ -3474,17 +3509,17 @@ hypre_BoomerAMGBuildBlockInterpRV( hypre_ParCSRBlockMatrix    *A,
                            if (P_marker[i2] >= jj_begin_row)
                            {
                               /* sum += A_ext_data[jj1]; */
-                              hypre_CSRBlockMatrixBlockAddAccumulateDiag(&A_ext_data[jj1*bnnz],
+                              hypre_CSRBlockMatrixBlockAddAccumulateDiag(&A_ext_data[jj1 * bnnz],
                                                                          sum_block, block_size);
                            }
                         }
                         else
                         {
                            /* in the off_diagonal block  */
-                           if (P_marker_offd[-i2-1] >= jj_begin_row_offd)
+                           if (P_marker_offd[-i2 - 1] >= jj_begin_row_offd)
                            {
                               /* sum += A_ext_data[jj1]; */
-                              hypre_CSRBlockMatrixBlockAddAccumulateDiag(&A_ext_data[jj1*bnnz],
+                              hypre_CSRBlockMatrixBlockAddAccumulateDiag(&A_ext_data[jj1 * bnnz],
                                                                          sum_block, block_size);
 
                            }
@@ -3496,7 +3531,7 @@ hypre_BoomerAMGBuildBlockInterpRV( hypre_ParCSRBlockMatrix    *A,
 
                      /* distribute = A_offd_data[jj] / sum;  */
                      /* here we want: A_offd_data * sum^(-1) */
-                     if (hypre_CSRBlockMatrixBlockInvMultDiag2(&A_offd_data[jj*bnnz], sum_block,
+                     if (hypre_CSRBlockMatrixBlockInvMultDiag2(&A_offd_data[jj * bnnz], sum_block,
                                                                distribute_block, block_size) == 0)
                      {
 
@@ -3510,7 +3545,7 @@ hypre_BoomerAMGBuildBlockInterpRV( hypre_ParCSRBlockMatrix    *A,
 
                         /* Diagonal block part of row i1 */
 
-                        for (jj1 = A_ext_i[c_num]; jj1 < A_ext_i[c_num+1]; jj1++)
+                        for (jj1 = A_ext_i[c_num]; jj1 < A_ext_i[c_num + 1]; jj1++)
                         {
                            i2 = (HYPRE_Int)A_ext_j[jj1];
 
@@ -3523,7 +3558,7 @@ hypre_BoomerAMGBuildBlockInterpRV( hypre_ParCSRBlockMatrix    *A,
 
                                  /* multiply - result in sum_block */
                                  hypre_CSRBlockMatrixBlockMultAddDiag2(distribute_block,
-                                                                       &A_ext_data[jj1*bnnz], 0.0,
+                                                                       &A_ext_data[jj1 * bnnz], 0.0,
                                                                        sum_block, block_size);
 
 
@@ -3537,7 +3572,7 @@ hypre_BoomerAMGBuildBlockInterpRV( hypre_ParCSRBlockMatrix    *A,
                            else
                            {
                               /* in the off_diagonal block  */
-                              if (P_marker_offd[-i2-1] >= jj_begin_row_offd)
+                              if (P_marker_offd[-i2 - 1] >= jj_begin_row_offd)
 
                                  /*P_offd_data[P_marker_offd[-i2-1]]
                                    += distribute * A_ext_data[jj1];*/
@@ -3545,13 +3580,13 @@ hypre_BoomerAMGBuildBlockInterpRV( hypre_ParCSRBlockMatrix    *A,
 
                                  /* multiply - result in sum_block */
                                  hypre_CSRBlockMatrixBlockMultAddDiag2(distribute_block,
-                                                                       &A_ext_data[jj1*bnnz], 0.0,
+                                                                       &A_ext_data[jj1 * bnnz], 0.0,
                                                                        sum_block, block_size);
 
 
                                  /* add result to p_offd_data */
                                  hypre_CSRBlockMatrixBlockAddAccumulate(sum_block,
-                                                                        &P_offd_data[P_marker_offd[-i2-1]*bnnz],
+                                                                        &P_offd_data[P_marker_offd[-i2 - 1]*bnnz],
                                                                         block_size);
                               }
                            }
@@ -3572,18 +3607,18 @@ hypre_BoomerAMGBuildBlockInterpRV( hypre_ParCSRBlockMatrix    *A,
 
                /* want diagonal^(-1)*P_diag_data */
                /* do division - put in sum_block */
-               if ( hypre_CSRBlockMatrixBlockInvMult(diagonal_block, &P_diag_data[jj*bnnz],
+               if ( hypre_CSRBlockMatrixBlockInvMult(diagonal_block, &P_diag_data[jj * bnnz],
                                                      sum_block, block_size) == 0)
                {
                   /* now copy to  P_diag_data[jj] and make negative */
-                  hypre_CSRBlockMatrixBlockCopyData(sum_block, &P_diag_data[jj*bnnz],
+                  hypre_CSRBlockMatrixBlockCopyData(sum_block, &P_diag_data[jj * bnnz],
                                                     -1.0, block_size);
                }
                else
                {
                   /* hypre_printf(" Warning! singular diagonal block! Proc id %d row %d\n", my_id,i);  */
                   /* just make P_diag_data negative since diagonal is singular) */
-                  hypre_CSRBlockMatrixBlockCopyData(&P_diag_data[jj*bnnz], &P_diag_data[jj*bnnz],
+                  hypre_CSRBlockMatrixBlockCopyData(&P_diag_data[jj * bnnz], &P_diag_data[jj * bnnz],
                                                     -1.0, block_size);
 
                }
@@ -3594,11 +3629,11 @@ hypre_BoomerAMGBuildBlockInterpRV( hypre_ParCSRBlockMatrix    *A,
                /* P_offd_data[jj] /= -diagonal; */
 
                /* do division - put in sum_block */
-               hypre_CSRBlockMatrixBlockInvMult(diagonal_block, &P_offd_data[jj*bnnz],
+               hypre_CSRBlockMatrixBlockInvMult(diagonal_block, &P_offd_data[jj * bnnz],
                                                 sum_block, block_size);
 
                /* now copy to  P_offd_data[jj] and make negative */
-               hypre_CSRBlockMatrixBlockCopyData(sum_block, &P_offd_data[jj*bnnz],
+               hypre_CSRBlockMatrixBlockCopyData(sum_block, &P_offd_data[jj * bnnz],
                                                  -1.0, block_size);
 
 
@@ -3609,7 +3644,7 @@ hypre_BoomerAMGBuildBlockInterpRV( hypre_ParCSRBlockMatrix    *A,
 
          strong_f_marker--;
 
-         P_offd_i[i+1] = jj_counter_offd;
+         P_offd_i[i + 1] = jj_counter_offd;
       }
       hypre_TFree(P_marker, HYPRE_MEMORY_HOST);
       hypre_TFree(P_marker_offd, HYPRE_MEMORY_HOST);
@@ -3656,11 +3691,13 @@ hypre_BoomerAMGBuildBlockInterpRV( hypre_ParCSRBlockMatrix    *A,
       P_marker = hypre_CTAlloc(HYPRE_Int,  num_cols_A_offd, HYPRE_MEMORY_HOST);
 
 
-      for (i=0; i < num_cols_A_offd; i++)
+      for (i = 0; i < num_cols_A_offd; i++)
+      {
          P_marker[i] = 0;
+      }
 
       num_cols_P_offd = 0;
-      for (i=0; i < P_offd_size; i++)
+      for (i = 0; i < P_offd_size; i++)
       {
          index = P_offd_j[i];
          if (!P_marker[index])
@@ -3674,21 +3711,21 @@ hypre_BoomerAMGBuildBlockInterpRV( hypre_ParCSRBlockMatrix    *A,
       tmp_map_offd = hypre_CTAlloc(HYPRE_Int, num_cols_P_offd, HYPRE_MEMORY_HOST);
 
       index = 0;
-      for (i=0; i < num_cols_P_offd; i++)
+      for (i = 0; i < num_cols_P_offd; i++)
       {
-         while (P_marker[index]==0) index++;
+         while (P_marker[index] == 0) { index++; }
          tmp_map_offd[i] = index++;
       }
 
-      for (i=0; i < P_offd_size; i++)
+      for (i = 0; i < P_offd_size; i++)
          P_offd_j[i] = hypre_BinarySearch(tmp_map_offd,
                                           P_offd_j[i],
                                           num_cols_P_offd);
       hypre_TFree(P_marker, HYPRE_MEMORY_HOST);
    }
 
-   for (i=0; i < n_fine; i++)
-      if (CF_marker[i] == -3) CF_marker[i] = -1;
+   for (i = 0; i < n_fine; i++)
+      if (CF_marker[i] == -3) { CF_marker[i] = -1; }
 
    if (num_cols_P_offd)
    {
@@ -3697,7 +3734,7 @@ hypre_BoomerAMGBuildBlockInterpRV( hypre_ParCSRBlockMatrix    *A,
    }
 
    /* use block version */
-   hypre_GetCommPkgBlockRTFromCommPkgBlockA(P,A, tmp_map_offd, fine_to_coarse_offd);
+   hypre_GetCommPkgBlockRTFromCommPkgBlockA(P, A, tmp_map_offd, fine_to_coarse_offd);
 
 
    *P_ptr = P;
@@ -3719,9 +3756,9 @@ hypre_BoomerAMGBuildBlockInterpRV( hypre_ParCSRBlockMatrix    *A,
    hypre_TFree(jj_count, HYPRE_MEMORY_HOST);
    hypre_TFree(jj_count_offd, HYPRE_MEMORY_HOST);
 
-   if (num_procs > 1) hypre_CSRBlockMatrixDestroy(A_ext);
+   if (num_procs > 1) { hypre_CSRBlockMatrixDestroy(A_ext); }
 
-   return(0);
+   return (0);
 
 }
 
@@ -3750,6 +3787,8 @@ hypre_BoomerAMGBuildBlockInterpRV2( hypre_ParCSRBlockMatrix   *A,
                                     HYPRE_Int                  max_elmts,
                                     hypre_ParCSRBlockMatrix  **P_ptr)
 {
+   HYPRE_UNUSED_VAR(dof_func);
+   HYPRE_UNUSED_VAR(num_functions);
 
    MPI_Comm           comm = hypre_ParCSRBlockMatrixComm(A);
    hypre_ParCSRCommPkg     *comm_pkg = hypre_ParCSRBlockMatrixCommPkg(A);
@@ -3761,7 +3800,7 @@ hypre_BoomerAMGBuildBlockInterpRV2( hypre_ParCSRBlockMatrix   *A,
    HYPRE_Int            *A_diag_j = hypre_CSRBlockMatrixJ(A_diag);
 
    HYPRE_Int             block_size = hypre_CSRBlockMatrixBlockSize(A_diag);
-   HYPRE_Int             bnnz = block_size*block_size;
+   HYPRE_Int             bnnz = block_size * block_size;
 
    hypre_CSRBlockMatrix *A_offd = hypre_ParCSRBlockMatrixOffd(A);
    HYPRE_Real      *A_offd_data = hypre_CSRBlockMatrixData(A_offd);
@@ -3784,8 +3823,7 @@ hypre_BoomerAMGBuildBlockInterpRV2( hypre_ParCSRBlockMatrix   *A,
 
    HYPRE_Int             *CF_marker_offd = NULL;
 
-   hypre_CSRBlockMatrix *A_ext;
-
+   hypre_CSRBlockMatrix  *A_ext = NULL;
    HYPRE_Real            *A_ext_data = NULL;
    HYPRE_Int             *A_ext_i = NULL;
    HYPRE_BigInt          *A_ext_j = NULL;
@@ -3804,10 +3842,10 @@ hypre_BoomerAMGBuildBlockInterpRV2( hypre_ParCSRBlockMatrix   *A,
 
    HYPRE_Int       *P_marker, *P_marker_offd = NULL;
 
-   HYPRE_Int        jj_counter,jj_counter_offd;
+   HYPRE_Int        jj_counter, jj_counter_offd;
    HYPRE_Int       *jj_count, *jj_count_offd = NULL;
-   HYPRE_Int        jj_begin_row,jj_begin_row_offd;
-   HYPRE_Int        jj_end_row,jj_end_row_offd;
+   HYPRE_Int        jj_begin_row, jj_begin_row_offd;
+   HYPRE_Int        jj_end_row, jj_end_row_offd;
 
    HYPRE_Int        start_indexing = 0; /* start indexing for P_data at 0 */
 
@@ -3825,8 +3863,8 @@ hypre_BoomerAMGBuildBlockInterpRV2( hypre_ParCSRBlockMatrix   *A,
 
    HYPRE_Int        bd;
 
-   HYPRE_Int        i,i1,i2;
-   HYPRE_Int        j,jl,jj,jj1;
+   HYPRE_Int        i, i1, i2;
+   HYPRE_Int        j, jl, jj, jj1;
    HYPRE_Int        kc;
    HYPRE_BigInt     big_k;
    HYPRE_Int        start;
@@ -3846,7 +3884,7 @@ hypre_BoomerAMGBuildBlockInterpRV2( hypre_ParCSRBlockMatrix   *A,
    HYPRE_Int local_numrows = hypre_CSRBlockMatrixNumRows(A_diag);
    HYPRE_BigInt col_n = col_1 + (HYPRE_BigInt)local_numrows;
 
-   HYPRE_Real       wall_time;  /* for debugging instrumentation  */
+   HYPRE_Real       wall_time = 0.0;  /* for debugging instrumentation  */
 
 
    HYPRE_Real       *identity_block;
@@ -3856,18 +3894,18 @@ hypre_BoomerAMGBuildBlockInterpRV2( hypre_ParCSRBlockMatrix   *A,
    HYPRE_Real       *distribute_block;
 
    hypre_MPI_Comm_size(comm, &num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_rank(comm, &my_id);
    num_threads = hypre_NumThreads();
 
    my_first_cpt = num_cpts_global[0];
-   if (my_id == (num_procs -1)) total_global_cpts = num_cpts_global[1];
-   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
+   if (my_id == (num_procs - 1)) { total_global_cpts = num_cpts_global[1]; }
+   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
 
    /*-------------------------------------------------------------------
     * Get the CF_marker data for the off-processor columns
     *-------------------------------------------------------------------*/
 
-   if (debug_flag==4) wall_time = time_getWallclockSeconds();
+   if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
 
    CF_marker_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_A_offd, HYPRE_MEMORY_HOST);
 
@@ -3880,16 +3918,16 @@ hypre_BoomerAMGBuildBlockInterpRV2( hypre_ParCSRBlockMatrix   *A,
 
    num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
    int_buf_data = hypre_CTAlloc(HYPRE_Int,  hypre_ParCSRCommPkgSendMapStart(comm_pkg,
-                                                       num_sends), HYPRE_MEMORY_HOST);
+                                                                            num_sends), HYPRE_MEMORY_HOST);
 
    index = 0;
    for (i = 0; i < num_sends; i++)
    {
       start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
       {
          int_buf_data[index++]
-            = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+            = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
       }
 
    }
@@ -3903,7 +3941,7 @@ hypre_BoomerAMGBuildBlockInterpRV2( hypre_ParCSRBlockMatrix   *A,
    hypre_ParCSRCommHandleDestroy(comm_handle);
 
 
-   if (debug_flag==4)
+   if (debug_flag == 4)
    {
       wall_time = time_getWallclockSeconds() - wall_time;
       hypre_printf("Proc = %d     Interp: Comm 1 CF_marker =    %f\n",
@@ -3915,7 +3953,7 @@ hypre_BoomerAMGBuildBlockInterpRV2( hypre_ParCSRBlockMatrix   *A,
     * Get the ghost rows of A
     *---------------------------------------------------------------------*/
 
-   if (debug_flag==4) wall_time = time_getWallclockSeconds();
+   if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
 
    if (num_procs > 1)
    {
@@ -3926,9 +3964,9 @@ hypre_BoomerAMGBuildBlockInterpRV2( hypre_ParCSRBlockMatrix   *A,
    }
 
    index = 0;
-   for (i=0; i < num_cols_A_offd; i++)
+   for (i = 0; i < num_cols_A_offd; i++)
    {
-      for (j=A_ext_i[i]; j < A_ext_i[i+1]; j++)
+      for (j = A_ext_i[i]; j < A_ext_i[i + 1]; j++)
       {
          big_k = A_ext_j[j];
          if (big_k >= col_1 && big_k < col_n)
@@ -3937,7 +3975,7 @@ hypre_BoomerAMGBuildBlockInterpRV2( hypre_ParCSRBlockMatrix   *A,
             /* for the data field we must get all of the blocbig_k data */
             for (bd = 0; bd < bnnz; bd++)
             {
-               A_ext_data[index*bnnz + bd] = A_ext_data[j*bnnz + bd];
+               A_ext_data[index * bnnz + bd] = A_ext_data[j * bnnz + bd];
             }
             index++;
          }
@@ -3946,10 +3984,10 @@ hypre_BoomerAMGBuildBlockInterpRV2( hypre_ParCSRBlockMatrix   *A,
             kc = hypre_BigBinarySearch(col_map_offd, big_k, num_cols_A_offd);
             if (kc > -1)
             {
-               A_ext_j[index] = (HYPRE_BigInt)(-kc-1);
+               A_ext_j[index] = (HYPRE_BigInt)(-kc - 1);
                for (bd = 0; bd < bnnz; bd++)
                {
-                  A_ext_data[index*bnnz + bd] = A_ext_data[j*bnnz + bd];
+                  A_ext_data[index * bnnz + bd] = A_ext_data[j * bnnz + bd];
                }
                index++;
             }
@@ -3958,10 +3996,12 @@ hypre_BoomerAMGBuildBlockInterpRV2( hypre_ParCSRBlockMatrix   *A,
       A_ext_i[i] = index;
    }
    for (i = num_cols_A_offd; i > 0; i--)
-      A_ext_i[i] = A_ext_i[i-1];
-   if (num_procs > 1) A_ext_i[0] = 0;
+   {
+      A_ext_i[i] = A_ext_i[i - 1];
+   }
+   if (num_procs > 1) { A_ext_i[0] = 0; }
 
-   if (debug_flag==4)
+   if (debug_flag == 4)
    {
       wall_time = time_getWallclockSeconds() - wall_time;
       hypre_printf("Proc = %d  Interp: Comm 2   Get A_ext =  %f\n",
@@ -3984,7 +4024,7 @@ hypre_BoomerAMGBuildBlockInterpRV2( hypre_ParCSRBlockMatrix   *A,
 
    fine_to_coarse = hypre_CTAlloc(HYPRE_Int,  n_fine, HYPRE_MEMORY_HOST);
 
-   for (i = 0; i < n_fine; i++) fine_to_coarse[i] = -1;
+   for (i = 0; i < n_fine; i++) { fine_to_coarse[i] = -1; }
 
    jj_counter = start_indexing;
    jj_counter_offd = start_indexing;
@@ -3996,17 +4036,17 @@ hypre_BoomerAMGBuildBlockInterpRV2( hypre_ParCSRBlockMatrix   *A,
 
    for (j = 0; j < num_threads; j++)
    {
-      size = n_fine/num_threads;
-      rest = n_fine - size*num_threads;
+      size = n_fine / num_threads;
+      rest = n_fine - size * num_threads;
       if (j < rest)
       {
-         ns = j*size+j;
-         ne = (j+1)*size+j+1;
+         ns = j * size + j;
+         ne = (j + 1) * size + j + 1;
       }
       else
       {
-         ns = j*size+rest;
-         ne = (j+1)*size+rest;
+         ns = j * size + rest;
+         ne = (j + 1) * size + rest;
       }
 
 
@@ -4033,7 +4073,7 @@ hypre_BoomerAMGBuildBlockInterpRV2( hypre_ParCSRBlockMatrix   *A,
 
          else
          {
-            for (jj = S_diag_i[i]; jj < S_diag_i[i+1]; jj++)
+            for (jj = S_diag_i[i]; jj < S_diag_i[i + 1]; jj++)
             {
                i1 = S_diag_j[jj];
                if (CF_marker[i1] >= 0)
@@ -4044,7 +4084,7 @@ hypre_BoomerAMGBuildBlockInterpRV2( hypre_ParCSRBlockMatrix   *A,
 
             if (num_procs > 1)
             {
-               for (jj = S_offd_i[i]; jj < S_offd_i[i+1]; jj++)
+               for (jj = S_offd_i[i]; jj < S_offd_i[i + 1]; jj++)
                {
                   i1 = S_offd_j[jj];
                   if (CF_marker_offd[i1] >= 0)
@@ -4061,32 +4101,32 @@ hypre_BoomerAMGBuildBlockInterpRV2( hypre_ParCSRBlockMatrix   *A,
     *  Allocate  arrays.
     *-----------------------------------------------------------------------*/
 
-   for (i=0; i < num_threads-1; i++)
+   for (i = 0; i < num_threads - 1; i++)
    {
-      coarse_counter[i+1] += coarse_counter[i];
-      jj_count[i+1] += jj_count[i];
-      jj_count_offd[i+1] += jj_count_offd[i];
+      coarse_counter[i + 1] += coarse_counter[i];
+      jj_count[i + 1] += jj_count[i];
+      jj_count_offd[i + 1] += jj_count_offd[i];
    }
-   i = num_threads-1;
+   i = num_threads - 1;
    jj_counter = jj_count[i];
    jj_counter_offd = jj_count_offd[i];
 
    P_diag_size = jj_counter;
 
-   P_diag_i    = hypre_CTAlloc(HYPRE_Int,  n_fine+1, HYPRE_MEMORY_HOST);
+   P_diag_i    = hypre_CTAlloc(HYPRE_Int,  n_fine + 1, HYPRE_MEMORY_HOST);
    P_diag_j    = hypre_CTAlloc(HYPRE_Int,  P_diag_size, HYPRE_MEMORY_HOST);
    /* we need to include the size of the blocks in the data size */
-   P_diag_data = hypre_CTAlloc(HYPRE_Real,  P_diag_size*bnnz, HYPRE_MEMORY_HOST);
+   P_diag_data = hypre_CTAlloc(HYPRE_Real,  P_diag_size * bnnz, HYPRE_MEMORY_HOST);
 
    P_diag_i[n_fine] = jj_counter;
 
 
    P_offd_size = jj_counter_offd;
 
-   P_offd_i    = hypre_CTAlloc(HYPRE_Int,  n_fine+1, HYPRE_MEMORY_HOST);
+   P_offd_i    = hypre_CTAlloc(HYPRE_Int,  n_fine + 1, HYPRE_MEMORY_HOST);
    P_offd_j    = hypre_CTAlloc(HYPRE_Int,  P_offd_size, HYPRE_MEMORY_HOST);
    /* we need to include the size of the blocks in the data size */
-   P_offd_data = hypre_CTAlloc(HYPRE_Real,  P_offd_size*bnnz, HYPRE_MEMORY_HOST);
+   P_offd_data = hypre_CTAlloc(HYPRE_Real,  P_offd_size * bnnz, HYPRE_MEMORY_HOST);
 
    /*-----------------------------------------------------------------------
     *  Intialize some stuff.
@@ -4095,7 +4135,7 @@ hypre_BoomerAMGBuildBlockInterpRV2( hypre_ParCSRBlockMatrix   *A,
    jj_counter = start_indexing;
    jj_counter_offd = start_indexing;
 
-   if (debug_flag==4)
+   if (debug_flag == 4)
    {
       wall_time = time_getWallclockSeconds() - wall_time;
       hypre_printf("Proc = %d     Interp: Internal work 1 =     %f\n",
@@ -4107,9 +4147,9 @@ hypre_BoomerAMGBuildBlockInterpRV2( hypre_ParCSRBlockMatrix   *A,
    identity_block = hypre_CTAlloc(HYPRE_Real,  bnnz, HYPRE_MEMORY_HOST);
    zero_block =  hypre_CTAlloc(HYPRE_Real,  bnnz, HYPRE_MEMORY_HOST);
 
-   for(i = 0; i < block_size; i++)
+   for (i = 0; i < block_size; i++)
    {
-      identity_block[i*block_size + i] = 1.0;
+      identity_block[i * block_size + i] = 1.0;
    }
 
 
@@ -4122,38 +4162,40 @@ hypre_BoomerAMGBuildBlockInterpRV2( hypre_ParCSRBlockMatrix   *A,
     *  Send and receive fine_to_coarse info.
     *-----------------------------------------------------------------------*/
 
-   if (debug_flag==4) wall_time = time_getWallclockSeconds();
+   if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
 
    fine_to_coarse_offd = hypre_CTAlloc(HYPRE_BigInt,  num_cols_A_offd, HYPRE_MEMORY_HOST);
    big_buf_data = hypre_CTAlloc(HYPRE_BigInt,  hypre_ParCSRCommPkgSendMapStart(comm_pkg,
-                                                       num_sends), HYPRE_MEMORY_HOST);
+                                                                               num_sends), HYPRE_MEMORY_HOST);
 
    for (j = 0; j < num_threads; j++)
    {
       coarse_shift = 0;
-      if (j > 0) coarse_shift = coarse_counter[j-1];
-      size = n_fine/num_threads;
-      rest = n_fine - size*num_threads;
+      if (j > 0) { coarse_shift = coarse_counter[j - 1]; }
+      size = n_fine / num_threads;
+      rest = n_fine - size * num_threads;
       if (j < rest)
       {
-         ns = j*size+j;
-         ne = (j+1)*size+j+1;
+         ns = j * size + j;
+         ne = (j + 1) * size + j + 1;
       }
       else
       {
-         ns = j*size+rest;
-         ne = (j+1)*size+rest;
+         ns = j * size + rest;
+         ne = (j + 1) * size + rest;
       }
       for (i = ns; i < ne; i++)
+      {
          fine_to_coarse[i] += coarse_shift;
+      }
    }
    index = 0;
    for (i = 0; i < num_sends; i++)
    {
       start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
          big_buf_data[index++] = my_first_cpt
-            + fine_to_coarse[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+                                 + fine_to_coarse[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
    }
 
    /* again, we do not need to use the block version of comm handle since
@@ -4164,7 +4206,7 @@ hypre_BoomerAMGBuildBlockInterpRV2( hypre_ParCSRBlockMatrix   *A,
 
    hypre_ParCSRCommHandleDestroy(comm_handle);
 
-   if (debug_flag==4)
+   if (debug_flag == 4)
    {
       wall_time = time_getWallclockSeconds() - wall_time;
       hypre_printf("Proc = %d     Interp: Comm 4 FineToCoarse = %f\n",
@@ -4172,7 +4214,7 @@ hypre_BoomerAMGBuildBlockInterpRV2( hypre_ParCSRBlockMatrix   *A,
       fflush(NULL);
    }
 
-   if (debug_flag==4) wall_time = time_getWallclockSeconds();
+   if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
 
 
    /*-----------------------------------------------------------------------
@@ -4182,22 +4224,22 @@ hypre_BoomerAMGBuildBlockInterpRV2( hypre_ParCSRBlockMatrix   *A,
 
    for (jl = 0; jl < num_threads; jl++)
    {
-      size = n_fine/num_threads;
-      rest = n_fine - size*num_threads;
+      size = n_fine / num_threads;
+      rest = n_fine - size * num_threads;
       if (jl < rest)
       {
-         ns = jl*size+jl;
-         ne = (jl+1)*size+jl+1;
+         ns = jl * size + jl;
+         ne = (jl + 1) * size + jl + 1;
       }
       else
       {
-         ns = jl*size+rest;
-         ne = (jl+1)*size+rest;
+         ns = jl * size + rest;
+         ne = (jl + 1) * size + rest;
       }
       jj_counter = 0;
-      if (jl > 0) jj_counter = jj_count[jl-1];
+      if (jl > 0) { jj_counter = jj_count[jl - 1]; }
       jj_counter_offd = 0;
-      if (jl > 0) jj_counter_offd = jj_count_offd[jl-1];
+      if (jl > 0) { jj_counter_offd = jj_count_offd[jl - 1]; }
 
       P_marker = hypre_CTAlloc(HYPRE_Int,  n_fine, HYPRE_MEMORY_HOST);
       P_marker_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_A_offd, HYPRE_MEMORY_HOST);
@@ -4225,7 +4267,7 @@ hypre_BoomerAMGBuildBlockInterpRV2( hypre_ParCSRBlockMatrix   *A,
             P_diag_j[jj_counter]    = fine_to_coarse[i];
             /* P_diag_data[jj_counter] = one; */
             hypre_CSRBlockMatrixBlockCopyData(identity_block,
-                                              &P_diag_data[jj_counter*bnnz],
+                                              &P_diag_data[jj_counter * bnnz],
                                               1.0, block_size);
             jj_counter++;
          }
@@ -4240,7 +4282,7 @@ hypre_BoomerAMGBuildBlockInterpRV2( hypre_ParCSRBlockMatrix   *A,
             P_diag_i[i] = jj_counter;
             jj_begin_row = jj_counter;
 
-            for (jj = S_diag_i[i]; jj < S_diag_i[i+1]; jj++)
+            for (jj = S_diag_i[i]; jj < S_diag_i[i + 1]; jj++)
             {
                i1 = S_diag_j[jj];
 
@@ -4255,7 +4297,7 @@ hypre_BoomerAMGBuildBlockInterpRV2( hypre_ParCSRBlockMatrix   *A,
                   P_diag_j[jj_counter]    = fine_to_coarse[i1];
                   /* P_diag_data[jj_counter] = zero; */
                   hypre_CSRBlockMatrixBlockCopyData(zero_block,
-                                                    &P_diag_data[jj_counter*bnnz],
+                                                    &P_diag_data[jj_counter * bnnz],
                                                     1.0, block_size);
                   jj_counter++;
                }
@@ -4279,7 +4321,7 @@ hypre_BoomerAMGBuildBlockInterpRV2( hypre_ParCSRBlockMatrix   *A,
 
             if (num_procs > 1)
             {
-               for (jj = S_offd_i[i]; jj < S_offd_i[i+1]; jj++)
+               for (jj = S_offd_i[i]; jj < S_offd_i[i + 1]; jj++)
                {
                   i1 = S_offd_j[jj];
 
@@ -4294,7 +4336,7 @@ hypre_BoomerAMGBuildBlockInterpRV2( hypre_ParCSRBlockMatrix   *A,
                      P_offd_j[jj_counter_offd]  = i1;
                      /* P_offd_data[jj_counter_offd] = zero; */
                      hypre_CSRBlockMatrixBlockCopyData(zero_block,
-                                                       &P_offd_data[jj_counter_offd*bnnz],
+                                                       &P_offd_data[jj_counter_offd * bnnz],
                                                        1.0, block_size);
 
                      jj_counter_offd++;
@@ -4326,7 +4368,7 @@ hypre_BoomerAMGBuildBlockInterpRV2( hypre_ParCSRBlockMatrix   *A,
 
             /* Loop over ith row of A.  First, the diagonal part of A */
 
-            for (jj = A_diag_i[i]+1; jj < A_diag_i[i+1]; jj++)
+            for (jj = A_diag_i[i] + 1; jj < A_diag_i[i + 1]; jj++)
             {
                i1 = A_diag_j[jj];
 
@@ -4338,7 +4380,7 @@ hypre_BoomerAMGBuildBlockInterpRV2( hypre_ParCSRBlockMatrix   *A,
                if (P_marker[i1] >= jj_begin_row)
                {
                   /*   P_diag_data[P_marker[i1]] += A_diag_data[jj]; */
-                  hypre_CSRBlockMatrixBlockAddAccumulate(&A_diag_data[jj*bnnz],
+                  hypre_CSRBlockMatrixBlockAddAccumulate(&A_diag_data[jj * bnnz],
                                                          &P_diag_data[P_marker[i1]*bnnz],
                                                          block_size);
 
@@ -4366,14 +4408,14 @@ hypre_BoomerAMGBuildBlockInterpRV2( hypre_ParCSRBlockMatrix   *A,
                    *-----------------------------------------------------------*/
 
                   /* Diagonal block part of row i1 */
-                  for (jj1 = A_diag_i[i1]; jj1 < A_diag_i[i1+1]; jj1++)
+                  for (jj1 = A_diag_i[i1]; jj1 < A_diag_i[i1 + 1]; jj1++)
                   {
                      i2 = A_diag_j[jj1];
                      if (P_marker[i2] >= jj_begin_row)
                      {
                         /* add diag data to sum */
                         /* sum += A_diag_data[jj1]; */
-                        hypre_CSRBlockMatrixBlockAddAccumulateDiag(&A_diag_data[jj1*bnnz],
+                        hypre_CSRBlockMatrixBlockAddAccumulateDiag(&A_diag_data[jj1 * bnnz],
                                                                    sum_block, block_size);
                      }
                   }
@@ -4381,14 +4423,14 @@ hypre_BoomerAMGBuildBlockInterpRV2( hypre_ParCSRBlockMatrix   *A,
                   /* Off-Diagonal block part of row i1 */
                   if (num_procs > 1)
                   {
-                     for (jj1 = A_offd_i[i1]; jj1 < A_offd_i[i1+1]; jj1++)
+                     for (jj1 = A_offd_i[i1]; jj1 < A_offd_i[i1 + 1]; jj1++)
                      {
                         i2 = A_offd_j[jj1];
                         if (P_marker_offd[i2] >= jj_begin_row_offd )
                         {
                            /* add off diag data to sum */
                            /*sum += A_offd_data[jj1];*/
-                           hypre_CSRBlockMatrixBlockAddAccumulateDiag(&A_offd_data[jj1*bnnz],
+                           hypre_CSRBlockMatrixBlockAddAccumulateDiag(&A_offd_data[jj1 * bnnz],
                                                                       sum_block, block_size);
                         }
                      }
@@ -4397,7 +4439,7 @@ hypre_BoomerAMGBuildBlockInterpRV2( hypre_ParCSRBlockMatrix   *A,
                      ENTRIES ARE THE ROW SUMS)*/
                   /* distribute = A_diag_data[jj] / sum;  (if a diag element is 0 then
                      that col is scaled by 1 instead of 1/diag) - doesn'treturn 0*/
-                  if (hypre_CSRBlockMatrixBlockInvMultDiag3(&A_diag_data[jj*bnnz], sum_block,
+                  if (hypre_CSRBlockMatrixBlockInvMultDiag3(&A_diag_data[jj * bnnz], sum_block,
                                                             distribute_block, block_size) == 0)
                   {
 
@@ -4407,7 +4449,7 @@ hypre_BoomerAMGBuildBlockInterpRV2( hypre_ParCSRBlockMatrix   *A,
                       *-----------------------------------------------------------*/
 
                      /* Diagonal block part of row i1 */
-                     for (jj1 = A_diag_i[i1]; jj1 < A_diag_i[i1+1]; jj1++)
+                     for (jj1 = A_diag_i[i1]; jj1 < A_diag_i[i1 + 1]; jj1++)
                      {
                         i2 = A_diag_j[jj1];
                         if (P_marker[i2] >= jj_begin_row )
@@ -4418,7 +4460,7 @@ hypre_BoomerAMGBuildBlockInterpRV2( hypre_ParCSRBlockMatrix   *A,
 
                            /* multiply - result in sum_block */
                            hypre_CSRBlockMatrixBlockMultAddDiag3(distribute_block,
-                                                                 &A_diag_data[jj1*bnnz], 0.0,
+                                                                 &A_diag_data[jj1 * bnnz], 0.0,
                                                                  sum_block, block_size);
 
                            /* add result to p_diag_data */
@@ -4431,7 +4473,7 @@ hypre_BoomerAMGBuildBlockInterpRV2( hypre_ParCSRBlockMatrix   *A,
                      /* Off-Diagonal block part of row i1 */
                      if (num_procs > 1)
                      {
-                        for (jj1 = A_offd_i[i1]; jj1 < A_offd_i[i1+1]; jj1++)
+                        for (jj1 = A_offd_i[i1]; jj1 < A_offd_i[i1 + 1]; jj1++)
                         {
                            i2 = A_offd_j[jj1];
                            if (P_marker_offd[i2] >= jj_begin_row_offd)
@@ -4441,7 +4483,7 @@ hypre_BoomerAMGBuildBlockInterpRV2( hypre_ParCSRBlockMatrix   *A,
 
                               /* multiply - result in sum_block */
                               hypre_CSRBlockMatrixBlockMultAddDiag3(distribute_block,
-                                                                    &A_offd_data[jj1*bnnz], 0.0,
+                                                                    &A_offd_data[jj1 * bnnz], 0.0,
                                                                     sum_block, block_size);
 
 
@@ -4464,7 +4506,7 @@ hypre_BoomerAMGBuildBlockInterpRV2( hypre_ParCSRBlockMatrix   *A,
 
             if (num_procs > 1)
             {
-               for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+               for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
                {
                   i1 = A_offd_j[jj];
 
@@ -4476,7 +4518,7 @@ hypre_BoomerAMGBuildBlockInterpRV2( hypre_ParCSRBlockMatrix   *A,
                   if (P_marker_offd[i1] >= jj_begin_row_offd)
                   {
                      /* P_offd_data[P_marker_offd[i1]] += A_offd_data[jj]; */
-                     hypre_CSRBlockMatrixBlockAddAccumulate( &A_offd_data[jj*bnnz],
+                     hypre_CSRBlockMatrixBlockAddAccumulate( &A_offd_data[jj * bnnz],
                                                              &P_offd_data[P_marker_offd[i1]*bnnz],
                                                              block_size);
                   }
@@ -4506,7 +4548,7 @@ hypre_BoomerAMGBuildBlockInterpRV2( hypre_ParCSRBlockMatrix   *A,
                      /* find row number */
                      c_num = A_offd_j[jj];
 
-                     for (jj1 = A_ext_i[c_num]; jj1 < A_ext_i[c_num+1]; jj1++)
+                     for (jj1 = A_ext_i[c_num]; jj1 < A_ext_i[c_num + 1]; jj1++)
                      {
                         i2 = (HYPRE_Int)A_ext_j[jj1];
 
@@ -4516,17 +4558,17 @@ hypre_BoomerAMGBuildBlockInterpRV2( hypre_ParCSRBlockMatrix   *A,
                            if (P_marker[i2] >= jj_begin_row)
                            {
                               /* sum += A_ext_data[jj1]; */
-                              hypre_CSRBlockMatrixBlockAddAccumulateDiag(&A_ext_data[jj1*bnnz],
+                              hypre_CSRBlockMatrixBlockAddAccumulateDiag(&A_ext_data[jj1 * bnnz],
                                                                          sum_block, block_size);
                            }
                         }
                         else
                         {
                            /* in the off_diagonal block  */
-                           if (P_marker_offd[-i2-1] >= jj_begin_row_offd)
+                           if (P_marker_offd[-i2 - 1] >= jj_begin_row_offd)
                            {
                               /* sum += A_ext_data[jj1]; */
-                              hypre_CSRBlockMatrixBlockAddAccumulateDiag(&A_ext_data[jj1*bnnz],
+                              hypre_CSRBlockMatrixBlockAddAccumulateDiag(&A_ext_data[jj1 * bnnz],
                                                                          sum_block, block_size);
 
                            }
@@ -4539,7 +4581,7 @@ hypre_BoomerAMGBuildBlockInterpRV2( hypre_ParCSRBlockMatrix   *A,
                      /* distribute = A_offd_data[jj] / sum;  */
                      /* here we want: A_offd_data * sum^(-1)  - use the row sums as the
                         diag for sum*/
-                     if (hypre_CSRBlockMatrixBlockInvMultDiag3(&A_offd_data[jj*bnnz], sum_block,
+                     if (hypre_CSRBlockMatrixBlockInvMultDiag3(&A_offd_data[jj * bnnz], sum_block,
                                                                distribute_block, block_size) == 0)
                      {
 
@@ -4552,7 +4594,7 @@ hypre_BoomerAMGBuildBlockInterpRV2( hypre_ParCSRBlockMatrix   *A,
 
                         /* Diagonal block part of row i1 */
 
-                        for (jj1 = A_ext_i[c_num]; jj1 < A_ext_i[c_num+1]; jj1++)
+                        for (jj1 = A_ext_i[c_num]; jj1 < A_ext_i[c_num + 1]; jj1++)
                         {
                            i2 = (HYPRE_Int)A_ext_j[jj1];
 
@@ -4565,7 +4607,7 @@ hypre_BoomerAMGBuildBlockInterpRV2( hypre_ParCSRBlockMatrix   *A,
 
                                  /* multiply - result in sum_block */
                                  hypre_CSRBlockMatrixBlockMultAddDiag3(distribute_block,
-                                                                       &A_ext_data[jj1*bnnz], 0.0,
+                                                                       &A_ext_data[jj1 * bnnz], 0.0,
                                                                        sum_block, block_size);
 
 
@@ -4578,7 +4620,7 @@ hypre_BoomerAMGBuildBlockInterpRV2( hypre_ParCSRBlockMatrix   *A,
                            else
                            {
                               /* in the off_diagonal block  */
-                              if (P_marker_offd[-i2-1] >= jj_begin_row_offd)
+                              if (P_marker_offd[-i2 - 1] >= jj_begin_row_offd)
 
                                  /*P_offd_data[P_marker_offd[-i2-1]]
                                    += distribute * A_ext_data[jj1];*/
@@ -4586,12 +4628,12 @@ hypre_BoomerAMGBuildBlockInterpRV2( hypre_ParCSRBlockMatrix   *A,
 
                                  /* multiply - result in sum_block */
                                  hypre_CSRBlockMatrixBlockMultAddDiag3(distribute_block,
-                                                                       &A_ext_data[jj1*bnnz], 0.0,
+                                                                       &A_ext_data[jj1 * bnnz], 0.0,
                                                                        sum_block, block_size);
 
                                  /* add result to p_offd_data */
                                  hypre_CSRBlockMatrixBlockAddAccumulate(sum_block,
-                                                                        &P_offd_data[P_marker_offd[-i2-1]*bnnz],
+                                                                        &P_offd_data[P_marker_offd[-i2 - 1]*bnnz],
                                                                         block_size);
                               }
                            }
@@ -4612,18 +4654,18 @@ hypre_BoomerAMGBuildBlockInterpRV2( hypre_ParCSRBlockMatrix   *A,
 
                /* want diagonal^(-1)*P_diag_data */
                /* do division - put in sum_block */
-               if ( hypre_CSRBlockMatrixBlockInvMult(diagonal_block, &P_diag_data[jj*bnnz],
+               if ( hypre_CSRBlockMatrixBlockInvMult(diagonal_block, &P_diag_data[jj * bnnz],
                                                      sum_block, block_size) == 0)
                {
                   /* now copy to  P_diag_data[jj] and make negative */
-                  hypre_CSRBlockMatrixBlockCopyData(sum_block, &P_diag_data[jj*bnnz],
+                  hypre_CSRBlockMatrixBlockCopyData(sum_block, &P_diag_data[jj * bnnz],
                                                     -1.0, block_size);
                }
                else
                {
                   /* hypre_printf(" Warning! singular diagonal block! Proc id %d row %d\n", my_id,i);  */
                   /* just make P_diag_data negative since diagonal is singular) */
-                  hypre_CSRBlockMatrixBlockCopyData(&P_diag_data[jj*bnnz], &P_diag_data[jj*bnnz],
+                  hypre_CSRBlockMatrixBlockCopyData(&P_diag_data[jj * bnnz], &P_diag_data[jj * bnnz],
                                                     -1.0, block_size);
                }
             }
@@ -4633,18 +4675,18 @@ hypre_BoomerAMGBuildBlockInterpRV2( hypre_ParCSRBlockMatrix   *A,
                /* P_offd_data[jj] /= -diagonal; */
 
                /* do division - put in sum_block */
-               hypre_CSRBlockMatrixBlockInvMult(diagonal_block, &P_offd_data[jj*bnnz],
+               hypre_CSRBlockMatrixBlockInvMult(diagonal_block, &P_offd_data[jj * bnnz],
                                                 sum_block, block_size);
 
                /* now copy to  P_offd_data[jj] and make negative */
-               hypre_CSRBlockMatrixBlockCopyData(sum_block, &P_offd_data[jj*bnnz],
+               hypre_CSRBlockMatrixBlockCopyData(sum_block, &P_offd_data[jj * bnnz],
                                                  -1.0, block_size);
             }
          }
 
          strong_f_marker--;
 
-         P_offd_i[i+1] = jj_counter_offd;
+         P_offd_i[i + 1] = jj_counter_offd;
       }
       hypre_TFree(P_marker, HYPRE_MEMORY_HOST);
       hypre_TFree(P_marker_offd, HYPRE_MEMORY_HOST);
@@ -4690,11 +4732,13 @@ hypre_BoomerAMGBuildBlockInterpRV2( hypre_ParCSRBlockMatrix   *A,
    {
       P_marker = hypre_CTAlloc(HYPRE_Int,  num_cols_A_offd, HYPRE_MEMORY_HOST);
 
-      for (i=0; i < num_cols_A_offd; i++)
+      for (i = 0; i < num_cols_A_offd; i++)
+      {
          P_marker[i] = 0;
+      }
 
       num_cols_P_offd = 0;
-      for (i=0; i < P_offd_size; i++)
+      for (i = 0; i < P_offd_size; i++)
       {
          index = P_offd_j[i];
          if (!P_marker[index])
@@ -4708,21 +4752,21 @@ hypre_BoomerAMGBuildBlockInterpRV2( hypre_ParCSRBlockMatrix   *A,
       col_map_offd_P = hypre_CTAlloc(HYPRE_BigInt, num_cols_P_offd, HYPRE_MEMORY_HOST);
 
       index = 0;
-      for (i=0; i < num_cols_P_offd; i++)
+      for (i = 0; i < num_cols_P_offd; i++)
       {
-         while (P_marker[index]==0) index++;
+         while (P_marker[index] == 0) { index++; }
          tmp_map_offd[i] = index++;
       }
 
-      for (i=0; i < P_offd_size; i++)
+      for (i = 0; i < P_offd_size; i++)
          P_offd_j[i] = hypre_BinarySearch(tmp_map_offd,
                                           P_offd_j[i],
                                           num_cols_P_offd);
       hypre_TFree(P_marker, HYPRE_MEMORY_HOST);
    }
 
-   for (i=0; i < n_fine; i++)
-      if (CF_marker[i] == -3) CF_marker[i] = -1;
+   for (i = 0; i < n_fine; i++)
+      if (CF_marker[i] == -3) { CF_marker[i] = -1; }
 
    if (num_cols_P_offd)
    {
@@ -4731,7 +4775,7 @@ hypre_BoomerAMGBuildBlockInterpRV2( hypre_ParCSRBlockMatrix   *A,
    }
 
    /* use block version */
-   hypre_GetCommPkgBlockRTFromCommPkgBlockA(P,A, tmp_map_offd,fine_to_coarse_offd);
+   hypre_GetCommPkgBlockRTFromCommPkgBlockA(P, A, tmp_map_offd, fine_to_coarse_offd);
 
 
    *P_ptr = P;
@@ -4753,9 +4797,9 @@ hypre_BoomerAMGBuildBlockInterpRV2( hypre_ParCSRBlockMatrix   *A,
    hypre_TFree(jj_count, HYPRE_MEMORY_HOST);
    hypre_TFree(jj_count_offd, HYPRE_MEMORY_HOST);
 
-   if (num_procs > 1) hypre_CSRBlockMatrixDestroy(A_ext);
+   if (num_procs > 1) { hypre_CSRBlockMatrixDestroy(A_ext); }
 
-   return(0);
+   return (0);
 
 }
 
@@ -4775,6 +4819,7 @@ hypre_BoomerAMGBuildBlockDirInterp( hypre_ParCSRBlockMatrix    *A,
                                     HYPRE_Int                   max_elmts,
                                     hypre_ParCSRBlockMatrix   **P_ptr)
 {
+   HYPRE_UNUSED_VAR(dof_func);
 
    MPI_Comm           comm = hypre_ParCSRBlockMatrixComm(A);
    hypre_ParCSRCommPkg     *comm_pkg = hypre_ParCSRBlockMatrixCommPkg(A);
@@ -4786,7 +4831,7 @@ hypre_BoomerAMGBuildBlockDirInterp( hypre_ParCSRBlockMatrix    *A,
    HYPRE_Int            *A_diag_j = hypre_CSRBlockMatrixJ(A_diag);
 
    HYPRE_Int             block_size = hypre_CSRBlockMatrixBlockSize(A_diag);
-   HYPRE_Int             bnnz = block_size*block_size;
+   HYPRE_Int             bnnz = block_size * block_size;
 
 
    hypre_CSRBlockMatrix *A_offd = hypre_ParCSRBlockMatrixOffd(A);
@@ -4824,10 +4869,10 @@ hypre_BoomerAMGBuildBlockDirInterp( hypre_ParCSRBlockMatrix    *A,
 
    HYPRE_Int            *P_marker, *P_marker_offd = NULL;
 
-   HYPRE_Int             jj_counter,jj_counter_offd;
+   HYPRE_Int             jj_counter, jj_counter_offd;
    HYPRE_Int            *jj_count, *jj_count_offd = NULL;
-   HYPRE_Int             jj_begin_row,jj_begin_row_offd;
-   HYPRE_Int             jj_end_row,jj_end_row_offd;
+   HYPRE_Int             jj_begin_row, jj_begin_row_offd;
+   HYPRE_Int             jj_end_row, jj_end_row_offd;
 
    HYPRE_Int             start_indexing = 0; /* start indexing for P_data at 0 */
 
@@ -4841,8 +4886,8 @@ hypre_BoomerAMGBuildBlockDirInterp( hypre_ParCSRBlockMatrix    *A,
    HYPRE_Int             num_cols_P_offd;
    HYPRE_BigInt          my_first_cpt;
 
-   HYPRE_Int             i,i1;
-   HYPRE_Int             j,jl,jj;
+   HYPRE_Int             i, i1;
+   HYPRE_Int             j, jl, jj;
    HYPRE_Int             start;
 
    HYPRE_Int             my_id;
@@ -4854,7 +4899,7 @@ hypre_BoomerAMGBuildBlockDirInterp( hypre_ParCSRBlockMatrix    *A,
    HYPRE_Int            *int_buf_data = NULL;
    HYPRE_BigInt         *big_buf_data = NULL;
 
-   HYPRE_Real       wall_time;  /* for debugging instrumentation  */
+   HYPRE_Real       wall_time = 0.0;  /* for debugging instrumentation  */
 
    HYPRE_Real       *identity_block;
    HYPRE_Real       *zero_block;
@@ -4864,22 +4909,26 @@ hypre_BoomerAMGBuildBlockDirInterp( hypre_ParCSRBlockMatrix    *A,
    HYPRE_Real       *r_block;
 
    hypre_MPI_Comm_size(comm, &num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_rank(comm, &my_id);
    num_threads = hypre_NumThreads();
 
+   if (num_functions > 1)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Not implemented for num_functions > 1!");
+   }
+
    my_first_cpt = num_cpts_global[0];
-   if (my_id == (num_procs -1)) total_global_cpts = num_cpts_global[1];
-   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
+   if (my_id == (num_procs - 1)) { total_global_cpts = num_cpts_global[1]; }
+   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
 
    /*-------------------------------------------------------------------
     * Get the CF_marker data for the off-processor columns
     *-------------------------------------------------------------------*/
 
-   if (debug_flag==4) wall_time = time_getWallclockSeconds();
+   if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
 
    CF_marker_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_A_offd, HYPRE_MEMORY_HOST);
 
-
    if (!comm_pkg)
    {
       hypre_BlockMatvecCommPkgCreate(A);
@@ -4887,24 +4936,25 @@ hypre_BoomerAMGBuildBlockDirInterp( hypre_ParCSRBlockMatrix    *A,
    }
 
    num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
-   int_buf_data = hypre_CTAlloc(HYPRE_Int,  hypre_ParCSRCommPkgSendMapStart(comm_pkg,
-                                                       num_sends), HYPRE_MEMORY_HOST);
+   int_buf_data = hypre_CTAlloc(HYPRE_Int,
+                                hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                                HYPRE_MEMORY_HOST);
 
    index = 0;
    for (i = 0; i < num_sends; i++)
    {
       start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
+      {
          int_buf_data[index++]
-            = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+            = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
+      }
    }
 
-   comm_handle = hypre_ParCSRCommHandleCreate( 11, comm_pkg, int_buf_data,
-                                               CF_marker_offd);
-
+   comm_handle = hypre_ParCSRCommHandleCreate(11, comm_pkg, int_buf_data, CF_marker_offd);
    hypre_ParCSRCommHandleDestroy(comm_handle);
 
-   if (debug_flag==4)
+   if (debug_flag == 4)
    {
       wall_time = time_getWallclockSeconds() - wall_time;
       hypre_printf("Proc = %d     Interp: Comm 1 CF_marker =    %f\n",
@@ -4926,7 +4976,7 @@ hypre_BoomerAMGBuildBlockDirInterp( hypre_ParCSRBlockMatrix    *A,
 
    fine_to_coarse = hypre_CTAlloc(HYPRE_Int,  n_fine, HYPRE_MEMORY_HOST);
 
-   for (i = 0; i < n_fine; i++) fine_to_coarse[i] = -1;
+   for (i = 0; i < n_fine; i++) { fine_to_coarse[i] = -1; }
 
    jj_counter = start_indexing;
    jj_counter_offd = start_indexing;
@@ -4938,24 +4988,22 @@ hypre_BoomerAMGBuildBlockDirInterp( hypre_ParCSRBlockMatrix    *A,
 
    for (j = 0; j < num_threads; j++)
    {
-      size = n_fine/num_threads;
-      rest = n_fine - size*num_threads;
+      size = n_fine / num_threads;
+      rest = n_fine - size * num_threads;
       if (j < rest)
       {
-         ns = j*size+j;
-         ne = (j+1)*size+j+1;
+         ns = j * size + j;
+         ne = (j + 1) * size + j + 1;
       }
       else
       {
-         ns = j*size+rest;
-         ne = (j+1)*size+rest;
+         ns = j * size + rest;
+         ne = (j + 1) * size + rest;
       }
 
-
       /* loop over the fine grid points */
       for (i = ns; i < ne; i++)
       {
-
          /*--------------------------------------------------------------------
           *  If i is a C-point, interpolation is the identity. Also set up
           *  mapping vector (fine_to_coarse is the mapping vector).
@@ -4975,7 +5023,7 @@ hypre_BoomerAMGBuildBlockDirInterp( hypre_ParCSRBlockMatrix    *A,
 
          else
          {
-            for (jj = S_diag_i[i]; jj < S_diag_i[i+1]; jj++)
+            for (jj = S_diag_i[i]; jj < S_diag_i[i + 1]; jj++)
             {
                i1 = S_diag_j[jj];
                if (CF_marker[i1] > 0)
@@ -4986,7 +5034,7 @@ hypre_BoomerAMGBuildBlockDirInterp( hypre_ParCSRBlockMatrix    *A,
 
             if (num_procs > 1)
             {
-               for (jj = S_offd_i[i]; jj < S_offd_i[i+1]; jj++)
+               for (jj = S_offd_i[i]; jj < S_offd_i[i + 1]; jj++)
                {
                   i1 = S_offd_j[jj];
                   if (CF_marker_offd[i1] > 0)
@@ -5003,32 +5051,32 @@ hypre_BoomerAMGBuildBlockDirInterp( hypre_ParCSRBlockMatrix    *A,
     *  Allocate  arrays.
     *-----------------------------------------------------------------------*/
 
-   for (i=0; i < num_threads-1; i++)
+   for (i = 0; i < num_threads - 1; i++)
    {
-      coarse_counter[i+1] += coarse_counter[i];
-      jj_count[i+1] += jj_count[i];
-      jj_count_offd[i+1] += jj_count_offd[i];
+      coarse_counter[i + 1] += coarse_counter[i];
+      jj_count[i + 1] += jj_count[i];
+      jj_count_offd[i + 1] += jj_count_offd[i];
    }
-   i = num_threads-1;
+   i = num_threads - 1;
    jj_counter = jj_count[i];
    jj_counter_offd = jj_count_offd[i];
 
    P_diag_size = jj_counter;
 
-   P_diag_i    = hypre_CTAlloc(HYPRE_Int,  n_fine+1, HYPRE_MEMORY_HOST);
+   P_diag_i    = hypre_CTAlloc(HYPRE_Int,  n_fine + 1, HYPRE_MEMORY_HOST);
    P_diag_j    = hypre_CTAlloc(HYPRE_Int,  P_diag_size, HYPRE_MEMORY_HOST);
    /* we need to include the size of the blocks in the data size */
-   P_diag_data = hypre_CTAlloc(HYPRE_Real,  P_diag_size*bnnz, HYPRE_MEMORY_HOST);
+   P_diag_data = hypre_CTAlloc(HYPRE_Real,  P_diag_size * bnnz, HYPRE_MEMORY_HOST);
 
    P_diag_i[n_fine] = jj_counter;
 
 
    P_offd_size = jj_counter_offd;
 
-   P_offd_i    = hypre_CTAlloc(HYPRE_Int,  n_fine+1, HYPRE_MEMORY_HOST);
+   P_offd_i    = hypre_CTAlloc(HYPRE_Int,  n_fine + 1, HYPRE_MEMORY_HOST);
    P_offd_j    = hypre_CTAlloc(HYPRE_Int,  P_offd_size, HYPRE_MEMORY_HOST);
    /* we need to include the size of the blocks in the data size */
-   P_offd_data = hypre_CTAlloc(HYPRE_Real,  P_offd_size*bnnz, HYPRE_MEMORY_HOST);
+   P_offd_data = hypre_CTAlloc(HYPRE_Real,  P_offd_size * bnnz, HYPRE_MEMORY_HOST);
 
    /*-----------------------------------------------------------------------
     *  Intialize some stuff.
@@ -5037,7 +5085,7 @@ hypre_BoomerAMGBuildBlockDirInterp( hypre_ParCSRBlockMatrix    *A,
    jj_counter = start_indexing;
    jj_counter_offd = start_indexing;
 
-   if (debug_flag==4)
+   if (debug_flag == 4)
    {
       wall_time = time_getWallclockSeconds() - wall_time;
       hypre_printf("Proc = %d     Interp: Internal work 1 =     %f\n",
@@ -5049,9 +5097,9 @@ hypre_BoomerAMGBuildBlockDirInterp( hypre_ParCSRBlockMatrix    *A,
    identity_block = hypre_CTAlloc(HYPRE_Real,  bnnz, HYPRE_MEMORY_HOST);
    zero_block =  hypre_CTAlloc(HYPRE_Real,  bnnz, HYPRE_MEMORY_HOST);
 
-   for(i = 0; i < block_size; i++)
+   for (i = 0; i < block_size; i++)
    {
-      identity_block[i*block_size + i] = 1.0;
+      identity_block[i * block_size + i] = 1.0;
    }
    /* we also need a block to keep track of the diagonal values and a sum */
    diagonal_block =  hypre_CTAlloc(HYPRE_Real,  bnnz, HYPRE_MEMORY_HOST);
@@ -5063,46 +5111,49 @@ hypre_BoomerAMGBuildBlockDirInterp( hypre_ParCSRBlockMatrix    *A,
     *  Send and receive fine_to_coarse info.
     *-----------------------------------------------------------------------*/
 
-   if (debug_flag==4) wall_time = time_getWallclockSeconds();
+   if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
 
-   fine_to_coarse_offd = hypre_CTAlloc(HYPRE_BigInt,  num_cols_A_offd, HYPRE_MEMORY_HOST);
-   big_buf_data = hypre_CTAlloc(HYPRE_BigInt,  hypre_ParCSRCommPkgSendMapStart(comm_pkg,
-                                                       num_sends), HYPRE_MEMORY_HOST);
+   fine_to_coarse_offd = hypre_CTAlloc(HYPRE_BigInt, num_cols_A_offd, HYPRE_MEMORY_HOST);
+   big_buf_data = hypre_CTAlloc(HYPRE_BigInt,
+                                hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                                HYPRE_MEMORY_HOST);
 
    for (j = 0; j < num_threads; j++)
    {
       coarse_shift = 0;
-      if (j > 0) coarse_shift = coarse_counter[j-1];
-      size = n_fine/num_threads;
-      rest = n_fine - size*num_threads;
+      if (j > 0) { coarse_shift = coarse_counter[j - 1]; }
+      size = n_fine / num_threads;
+      rest = n_fine - size * num_threads;
       if (j < rest)
       {
-         ns = j*size+j;
-         ne = (j+1)*size+j+1;
+         ns = j * size + j;
+         ne = (j + 1) * size + j + 1;
       }
       else
       {
-         ns = j*size+rest;
-         ne = (j+1)*size+rest;
+         ns = j * size + rest;
+         ne = (j + 1) * size + rest;
       }
       for (i = ns; i < ne; i++)
+      {
          fine_to_coarse[i] += coarse_shift;
+      }
    }
    index = 0;
    for (i = 0; i < num_sends; i++)
    {
       start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
+      {
          big_buf_data[index++] = my_first_cpt
-            + fine_to_coarse[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+                                 + fine_to_coarse[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
+      }
    }
 
-   comm_handle = hypre_ParCSRCommHandleCreate( 21, comm_pkg, big_buf_data,
-                                               fine_to_coarse_offd);
-
+   comm_handle = hypre_ParCSRCommHandleCreate(21, comm_pkg, big_buf_data, fine_to_coarse_offd);
    hypre_ParCSRCommHandleDestroy(comm_handle);
 
-   if (debug_flag==4)
+   if (debug_flag == 4)
    {
       wall_time = time_getWallclockSeconds() - wall_time;
       hypre_printf("Proc = %d     Interp: Comm 4 FineToCoarse = %f\n",
@@ -5110,7 +5161,7 @@ hypre_BoomerAMGBuildBlockDirInterp( hypre_ParCSRBlockMatrix    *A,
       fflush(NULL);
    }
 
-   if (debug_flag==4) wall_time = time_getWallclockSeconds();
+   if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
 
    /*-----------------------------------------------------------------------
     *  Loop over fine grid points.
@@ -5118,22 +5169,22 @@ hypre_BoomerAMGBuildBlockDirInterp( hypre_ParCSRBlockMatrix    *A,
 
    for (jl = 0; jl < num_threads; jl++)
    {
-      size = n_fine/num_threads;
-      rest = n_fine - size*num_threads;
+      size = n_fine / num_threads;
+      rest = n_fine - size * num_threads;
       if (jl < rest)
       {
-         ns = jl*size+jl;
-         ne = (jl+1)*size+jl+1;
+         ns = jl * size + jl;
+         ne = (jl + 1) * size + jl + 1;
       }
       else
       {
-         ns = jl*size+rest;
-         ne = (jl+1)*size+rest;
+         ns = jl * size + rest;
+         ne = (jl + 1) * size + rest;
       }
       jj_counter = 0;
-      if (jl > 0) jj_counter = jj_count[jl-1];
+      if (jl > 0) { jj_counter = jj_count[jl - 1]; }
       jj_counter_offd = 0;
-      if (jl > 0) jj_counter_offd = jj_count_offd[jl-1];
+      if (jl > 0) { jj_counter_offd = jj_count_offd[jl - 1]; }
 
       P_marker = hypre_CTAlloc(HYPRE_Int,  n_fine, HYPRE_MEMORY_HOST);
       P_marker_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_A_offd, HYPRE_MEMORY_HOST);
@@ -5160,7 +5211,7 @@ hypre_BoomerAMGBuildBlockDirInterp( hypre_ParCSRBlockMatrix    *A,
             P_diag_j[jj_counter]    = fine_to_coarse[i];
             /* P_diag_data[jj_counter] = one; */
             hypre_CSRBlockMatrixBlockCopyData(identity_block,
-                                              &P_diag_data[jj_counter*bnnz],
+                                              &P_diag_data[jj_counter * bnnz],
                                               1.0, block_size);
             jj_counter++;
          }
@@ -5175,7 +5226,7 @@ hypre_BoomerAMGBuildBlockDirInterp( hypre_ParCSRBlockMatrix    *A,
             P_diag_i[i] = jj_counter;
             jj_begin_row = jj_counter;
 
-            for (jj = S_diag_i[i]; jj < S_diag_i[i+1]; jj++)
+            for (jj = S_diag_i[i]; jj < S_diag_i[i + 1]; jj++)
             {
                i1 = S_diag_j[jj];
 
@@ -5190,7 +5241,7 @@ hypre_BoomerAMGBuildBlockDirInterp( hypre_ParCSRBlockMatrix    *A,
                   P_diag_j[jj_counter]    = fine_to_coarse[i1];
                   /* P_diag_data[jj_counter] = zero; */
                   hypre_CSRBlockMatrixBlockCopyData(zero_block,
-                                                    &P_diag_data[jj_counter*bnnz],
+                                                    &P_diag_data[jj_counter * bnnz],
                                                     1.0, block_size);
                   jj_counter++;
                }
@@ -5205,7 +5256,7 @@ hypre_BoomerAMGBuildBlockDirInterp( hypre_ParCSRBlockMatrix    *A,
 
             if (num_procs > 1)
             {
-               for (jj = S_offd_i[i]; jj < S_offd_i[i+1]; jj++)
+               for (jj = S_offd_i[i]; jj < S_offd_i[i + 1]; jj++)
                {
                   i1 = S_offd_j[jj];
 
@@ -5220,7 +5271,7 @@ hypre_BoomerAMGBuildBlockDirInterp( hypre_ParCSRBlockMatrix    *A,
                      P_offd_j[jj_counter_offd]  = i1;
                      /* P_offd_data[jj_counter_offd] = zero; */
                      hypre_CSRBlockMatrixBlockCopyData(zero_block,
-                                                       &P_offd_data[jj_counter_offd*bnnz],
+                                                       &P_offd_data[jj_counter_offd * bnnz],
                                                        1.0, block_size);
                      jj_counter_offd++;
 
@@ -5246,7 +5297,7 @@ hypre_BoomerAMGBuildBlockDirInterp( hypre_ParCSRBlockMatrix    *A,
                                               block_size);
 
 
-            for (jj = A_diag_i[i]+1; jj < A_diag_i[i+1]; jj++)
+            for (jj = A_diag_i[i] + 1; jj < A_diag_i[i + 1]; jj++)
             {
                i1 = A_diag_j[jj];
 
@@ -5255,7 +5306,7 @@ hypre_BoomerAMGBuildBlockDirInterp( hypre_ParCSRBlockMatrix    *A,
                  else
                  sum_N_neg += A_diag_data[jj];*/
 
-               hypre_CSRBlockMatrixBlockAddAccumulate(&A_diag_data[jj*bnnz],
+               hypre_CSRBlockMatrixBlockAddAccumulate(&A_diag_data[jj * bnnz],
                                                       sum_block_n, block_size);
 
                /*--------------------------------------------------------------
@@ -5268,7 +5319,7 @@ hypre_BoomerAMGBuildBlockDirInterp( hypre_ParCSRBlockMatrix    *A,
 
 
                   /* P_diag_data[P_marker[i1]] += A_diag_data[jj];*/
-                  hypre_CSRBlockMatrixBlockAddAccumulate(&A_diag_data[jj*bnnz],
+                  hypre_CSRBlockMatrixBlockAddAccumulate(&A_diag_data[jj * bnnz],
                                                          &P_diag_data[P_marker[i1]*bnnz],
                                                          block_size);
 
@@ -5277,7 +5328,7 @@ hypre_BoomerAMGBuildBlockDirInterp( hypre_ParCSRBlockMatrix    *A,
                     sum_P_pos += A_diag_data[jj];
                     else
                     sum_P_neg += A_diag_data[jj];*/
-                  hypre_CSRBlockMatrixBlockAddAccumulate(&A_diag_data[jj*bnnz],
+                  hypre_CSRBlockMatrixBlockAddAccumulate(&A_diag_data[jj * bnnz],
                                                          sum_block_p, block_size);
 
                }
@@ -5290,7 +5341,7 @@ hypre_BoomerAMGBuildBlockDirInterp( hypre_ParCSRBlockMatrix    *A,
 
             if (num_procs > 1)
             {
-               for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+               for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
                {
                   i1 = A_offd_j[jj];
 
@@ -5298,7 +5349,7 @@ hypre_BoomerAMGBuildBlockDirInterp( hypre_ParCSRBlockMatrix    *A,
                     sum_N_pos += A_offd_data[jj];
                     else
                     sum_N_neg += A_offd_data[jj];*/
-                  hypre_CSRBlockMatrixBlockAddAccumulate(&A_offd_data[jj*bnnz],
+                  hypre_CSRBlockMatrixBlockAddAccumulate(&A_offd_data[jj * bnnz],
                                                          sum_block_n, block_size);
 
                   /*--------------------------------------------------------------
@@ -5309,14 +5360,14 @@ hypre_BoomerAMGBuildBlockDirInterp( hypre_ParCSRBlockMatrix    *A,
                   if (P_marker_offd[i1] >= jj_begin_row_offd)
                   {
                      /* P_offd_data[P_marker_offd[i1]] += A_offd_data[jj];*/
-                     hypre_CSRBlockMatrixBlockAddAccumulate( &A_offd_data[jj*bnnz],
+                     hypre_CSRBlockMatrixBlockAddAccumulate( &A_offd_data[jj * bnnz],
                                                              &P_offd_data[P_marker_offd[i1]*bnnz],
                                                              block_size);
                      /*if (A_offd_data[jj] > 0)
                        sum_P_pos += A_offd_data[jj];
                        else
                        sum_P_neg += A_offd_data[jj];*/
-                     hypre_CSRBlockMatrixBlockAddAccumulate(&A_offd_data[jj*bnnz],
+                     hypre_CSRBlockMatrixBlockAddAccumulate(&A_offd_data[jj * bnnz],
                                                             sum_block_p, block_size);
 
                   }
@@ -5346,12 +5397,12 @@ hypre_BoomerAMGBuildBlockDirInterp( hypre_ParCSRBlockMatrix    *A,
                  else
                  P_diag_data[jj] *= -alfa;*/
 
-               hypre_CSRBlockMatrixBlockCopyData( &P_diag_data[jj*bnnz],
+               hypre_CSRBlockMatrixBlockCopyData( &P_diag_data[jj * bnnz],
                                                   r_block, -1.0, block_size);
 
 
                hypre_CSRBlockMatrixBlockMultAdd(sum_block_n, r_block, 0.0,
-                                                &P_diag_data[jj*bnnz], block_size);
+                                                &P_diag_data[jj * bnnz], block_size);
             }
 
             for (jj = jj_begin_row_offd; jj < jj_end_row_offd; jj++)
@@ -5361,22 +5412,22 @@ hypre_BoomerAMGBuildBlockDirInterp( hypre_ParCSRBlockMatrix    *A,
                  else
                  P_offd_data[jj] *= -alfa;*/
 
-               hypre_CSRBlockMatrixBlockCopyData( &P_offd_data[jj*bnnz],
+               hypre_CSRBlockMatrixBlockCopyData( &P_offd_data[jj * bnnz],
                                                   r_block, -1.0, block_size);
 
                hypre_CSRBlockMatrixBlockMultAdd(sum_block_n, r_block, 0.0,
-                                                &P_offd_data[jj*bnnz], block_size);
+                                                &P_offd_data[jj * bnnz], block_size);
             }
          }
 
-         P_offd_i[i+1] = jj_counter_offd;
+         P_offd_i[i + 1] = jj_counter_offd;
       }
       hypre_TFree(P_marker, HYPRE_MEMORY_HOST);
       hypre_TFree(P_marker_offd, HYPRE_MEMORY_HOST);
    }
 
    /* Now create P - as a block matrix */
-   P = hypre_ParCSRBlockMatrixCreate(comm,block_size,
+   P = hypre_ParCSRBlockMatrixCreate(comm, block_size,
                                      hypre_ParCSRBlockMatrixGlobalNumRows(A),
                                      total_global_cpts,
                                      hypre_ParCSRBlockMatrixColStarts(A),
@@ -5415,11 +5466,13 @@ hypre_BoomerAMGBuildBlockDirInterp( hypre_ParCSRBlockMatrix    *A,
    {
       P_marker = hypre_CTAlloc(HYPRE_Int,  num_cols_A_offd, HYPRE_MEMORY_HOST);
 
-      for (i=0; i < num_cols_A_offd; i++)
+      for (i = 0; i < num_cols_A_offd; i++)
+      {
          P_marker[i] = 0;
+      }
 
       num_cols_P_offd = 0;
-      for (i=0; i < P_offd_size; i++)
+      for (i = 0; i < P_offd_size; i++)
       {
          index = P_offd_j[i];
          if (!P_marker[index])
@@ -5433,21 +5486,21 @@ hypre_BoomerAMGBuildBlockDirInterp( hypre_ParCSRBlockMatrix    *A,
       tmp_map_offd = hypre_CTAlloc(HYPRE_Int, num_cols_P_offd, HYPRE_MEMORY_HOST);
 
       index = 0;
-      for (i=0; i < num_cols_P_offd; i++)
+      for (i = 0; i < num_cols_P_offd; i++)
       {
-         while (P_marker[index]==0) index++;
+         while (P_marker[index] == 0) { index++; }
          tmp_map_offd[i] = index++;
       }
 
-      for (i=0; i < P_offd_size; i++)
+      for (i = 0; i < P_offd_size; i++)
          P_offd_j[i] = hypre_BinarySearch(tmp_map_offd,
                                           P_offd_j[i],
                                           num_cols_P_offd);
       hypre_TFree(P_marker, HYPRE_MEMORY_HOST);
    }
 
-   for (i=0; i < n_fine; i++)
-      if (CF_marker[i] == -3) CF_marker[i] = -1;
+   for (i = 0; i < n_fine; i++)
+      if (CF_marker[i] == -3) { CF_marker[i] = -1; }
 
    if (num_cols_P_offd)
    {
@@ -5455,7 +5508,7 @@ hypre_BoomerAMGBuildBlockDirInterp( hypre_ParCSRBlockMatrix    *A,
       hypre_CSRBlockMatrixNumCols(P_offd) = num_cols_P_offd;
    }
 
-   hypre_GetCommPkgBlockRTFromCommPkgBlockA(P,A,tmp_map_offd,fine_to_coarse_offd);
+   hypre_GetCommPkgBlockRTFromCommPkgBlockA(P, A, tmp_map_offd, fine_to_coarse_offd);
 
    *P_ptr = P;
 
@@ -5478,7 +5531,7 @@ hypre_BoomerAMGBuildBlockDirInterp( hypre_ParCSRBlockMatrix    *A,
    hypre_TFree(jj_count, HYPRE_MEMORY_HOST);
    hypre_TFree(jj_count_offd, HYPRE_MEMORY_HOST);
 
-   return(0);
+   return (0);
 
 }
 
@@ -5616,19 +5669,19 @@ hypre_BoomerAMGBuildBlockStdInterp(hypre_ParCSRBlockMatrix *A,
    HYPRE_Real       *distribute_block;
 
    HYPRE_Int                  block_size = hypre_CSRBlockMatrixBlockSize(A_diag);
-   HYPRE_Int                  bnnz = block_size*block_size;
+   HYPRE_Int                  bnnz = block_size * block_size;
 
 
 
-   if (debug_flag== 4) wall_time = time_getWallclockSeconds();
+   if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
 
    /* BEGIN */
    hypre_MPI_Comm_size(comm, &num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_rank(comm, &my_id);
 
    my_first_cpt = num_cpts_global[0];
-   if (my_id == (num_procs -1)) total_global_cpts = num_cpts_global[1];
-   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_INT, num_procs-1, comm);
+   if (my_id == (num_procs - 1)) { total_global_cpts = num_cpts_global[1]; }
+   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_INT, num_procs - 1, comm);
 
    if (!comm_pkg)
    {
@@ -5646,16 +5699,16 @@ hypre_BoomerAMGBuildBlockStdInterp(hypre_ParCSRBlockMatrix *A,
        * Get the off processors rows for A and S, associated with columns in
        * A_offd and S_offd.
        *---------------------------------------------------------------------*/
-      A_ext         = hypre_ParCSRBlockMatrixExtractBExt(A,A,1);
+      A_ext         = hypre_ParCSRBlockMatrixExtractBExt(A, A, 1);
       A_ext_i       = hypre_CSRBlockMatrixI(A_ext);
       A_ext_j       = hypre_CSRBlockMatrixJ(A_ext);
       A_ext_data    = hypre_CSRBlockMatrixData(A_ext);
       A_ext_rows    = hypre_CSRBlockMatrixNumRows(A_ext);
 
 
-/* FIX THIS! - Sop - block or ???*/
+      /* FIX THIS! - Sop - block or ???*/
 
-      Sop           = hypre_ParCSRMatrixExtractBExt(S,A,0);
+      Sop           = hypre_ParCSRMatrixExtractBExt(S, A, 0);
       Sop_i         = hypre_CSRMatrixI(Sop);
       Sop_j         = hypre_CSRMatrixJ(Sop);
       Soprows       = hypre_CSRMatrixNumRows(Sop);
@@ -5664,10 +5717,14 @@ hypre_BoomerAMGBuildBlockStdInterp(hypre_ParCSRBlockMatrix *A,
       newoff = new_offd_nodes(&found, A_ext_rows, A_ext_i, A_ext_j,
                               Soprows, col_map_offd, col_1, col_n,
                               Sop_i, Sop_j, CF_marker, comm_pkg);
-      if(newoff >= 0)
+      if (newoff >= 0)
+      {
          full_off_procNodes = newoff + num_cols_A_offd;
+      }
       else
-         return(1);
+      {
+         return (1);
+      }
 
       /* Possibly add new points and new processors to the comm_pkg, all
        * processors need new_comm_pkg */
@@ -5675,24 +5732,27 @@ hypre_BoomerAMGBuildBlockStdInterp(hypre_ParCSRBlockMatrix *A,
       /* AHB - create a new comm package just for extended info -
          this will work better with the assumed partition*/
 
-/* FIX THIS: Block version of this? */
+      /* FIX THIS: Block version of this? */
       hypre_ParCSRFindExtendCommPkg(A, newoff, found,
                                     &extend_comm_pkg);
 
       CF_marker_offd = hypre_CTAlloc(HYPRE_Int,  full_off_procNodes, HYPRE_MEMORY_HOST);
 
       if (num_functions > 1 && full_off_procNodes > 0)
+      {
          dof_func_offd = hypre_CTAlloc(HYPRE_Int,  full_off_procNodes, HYPRE_MEMORY_HOST);
+      }
 
       alt_insert_new_nodes(comm_pkg, extend_comm_pkg, CF_marker,
                            full_off_procNodes, CF_marker_offd);
 
-      if(num_functions > 1)
+      if (num_functions > 1)
+      {
          alt_insert_new_nodes(comm_pkg, extend_comm_pkg, dof_func,
                               full_off_procNodes, dof_func_offd);
+      }
    }
 
-
    /*-----------------------------------------------------------------------
     *  First Pass: Determine size of P and fill in fine_to_coarse mapping.
     *-----------------------------------------------------------------------*/
@@ -5700,15 +5760,15 @@ hypre_BoomerAMGBuildBlockStdInterp(hypre_ParCSRBlockMatrix *A,
    /*-----------------------------------------------------------------------
     *  Intialize counters and allocate mapping vector.
     *-----------------------------------------------------------------------*/
-   P_diag_i    = hypre_CTAlloc(HYPRE_Int,  n_fine+1, HYPRE_MEMORY_HOST);
-   P_offd_i    = hypre_CTAlloc(HYPRE_Int,  n_fine+1, HYPRE_MEMORY_HOST);
+   P_diag_i    = hypre_CTAlloc(HYPRE_Int,  n_fine + 1, HYPRE_MEMORY_HOST);
+   P_offd_i    = hypre_CTAlloc(HYPRE_Int,  n_fine + 1, HYPRE_MEMORY_HOST);
 
    fine_to_coarse = hypre_CTAlloc(HYPRE_Int,  n_fine, HYPRE_MEMORY_HOST);
 
    P_marker = hypre_CTAlloc(HYPRE_Int,  n_fine, HYPRE_MEMORY_HOST);
 
 
-/* FIX THIS - figure out sizes - need bnnz? */
+   /* FIX THIS - figure out sizes - need bnnz? */
    if (full_off_procNodes)
    {
       P_marker_offd = hypre_CTAlloc(HYPRE_Int,  full_off_procNodes, HYPRE_MEMORY_HOST);
@@ -5726,17 +5786,15 @@ hypre_BoomerAMGBuildBlockStdInterp(hypre_ParCSRBlockMatrix *A,
    identity_block = hypre_CTAlloc(HYPRE_Real,  bnnz, HYPRE_MEMORY_HOST);
    zero_block =  hypre_CTAlloc(HYPRE_Real,  bnnz, HYPRE_MEMORY_HOST);
 
-   for(i = 0; i < block_size; i++)
+   for (i = 0; i < block_size; i++)
    {
-      identity_block[i*block_size + i] = 1.0;
+      identity_block[i * block_size + i] = 1.0;
    }
    /* we also need a block to keep track of the diagonal values and a sum */
    diagonal_block =  hypre_CTAlloc(HYPRE_Real,  bnnz, HYPRE_MEMORY_HOST);
    sum_block =  hypre_CTAlloc(HYPRE_Real,  bnnz, HYPRE_MEMORY_HOST);
    distribute_block =  hypre_CTAlloc(HYPRE_Real,  bnnz, HYPRE_MEMORY_HOST);
 
-
-
    jj_counter = start_indexing;
    jj_counter_offd = start_indexing;
    coarse_counter = 0;
@@ -5749,7 +5807,9 @@ hypre_BoomerAMGBuildBlockStdInterp(hypre_ParCSRBlockMatrix *A,
    {
       P_diag_i[i] = jj_counter;
       if (num_procs > 1)
+      {
          P_offd_i[i] = jj_counter_offd;
+      }
 
       if (CF_marker[i] >= 0)
       {
@@ -5765,11 +5825,12 @@ hypre_BoomerAMGBuildBlockStdInterp(hypre_ParCSRBlockMatrix *A,
        *--------------------------------------------------------------------*/
       else if (CF_marker[i] != -3)
       {
-         for (jj = S_diag_i[i]; jj < S_diag_i[i+1]; jj++)
+         for (jj = S_diag_i[i]; jj < S_diag_i[i + 1]; jj++)
          {
             i1 = S_diag_j[jj];
             if (CF_marker[i1] >= 0)
-            { /* i1 is a C point */
+            {
+               /* i1 is a C point */
                if (P_marker[i1] < P_diag_i[i])
                {
                   P_marker[i1] = jj_counter;
@@ -5777,27 +5838,28 @@ hypre_BoomerAMGBuildBlockStdInterp(hypre_ParCSRBlockMatrix *A,
                }
             }
             else if (CF_marker[i1] != -3)
-            { /* i1 is a F point, loop through it's strong neighbors */
-               for (kk = S_diag_i[i1]; kk < S_diag_i[i1+1]; kk++)
+            {
+               /* i1 is a F point, loop through it's strong neighbors */
+               for (kk = S_diag_i[i1]; kk < S_diag_i[i1 + 1]; kk++)
                {
                   k1 = S_diag_j[kk];
                   if (CF_marker[k1] >= 0)
                   {
-                     if(P_marker[k1] < P_diag_i[i])
+                     if (P_marker[k1] < P_diag_i[i])
                      {
                         P_marker[k1] = jj_counter;
                         jj_counter++;
                      }
                   }
                }
-               if(num_procs > 1)
+               if (num_procs > 1)
                {
-                  for (kk = S_offd_i[i1]; kk < S_offd_i[i1+1]; kk++)
+                  for (kk = S_offd_i[i1]; kk < S_offd_i[i1 + 1]; kk++)
                   {
                      k1 = S_offd_j[kk];
                      if (CF_marker_offd[k1] >= 0)
                      {
-                        if(P_marker_offd[k1] < P_offd_i[i])
+                        if (P_marker_offd[k1] < P_offd_i[i])
                         {
                            tmp_CF_marker_offd[k1] = 1;
                            P_marker_offd[k1] = jj_counter_offd;
@@ -5811,12 +5873,12 @@ hypre_BoomerAMGBuildBlockStdInterp(hypre_ParCSRBlockMatrix *A,
          /* Look at off diag strong connections of i */
          if (num_procs > 1)
          {
-            for (jj = S_offd_i[i]; jj < S_offd_i[i+1]; jj++)
+            for (jj = S_offd_i[i]; jj < S_offd_i[i + 1]; jj++)
             {
                i1 = S_offd_j[jj];
                if (CF_marker_offd[i1] >= 0)
                {
-                  if(P_marker_offd[i1] < P_offd_i[i])
+                  if (P_marker_offd[i1] < P_offd_i[i])
                   {
                      tmp_CF_marker_offd[i1] = 1;
                      P_marker_offd[i1] = jj_counter_offd;
@@ -5824,18 +5886,20 @@ hypre_BoomerAMGBuildBlockStdInterp(hypre_ParCSRBlockMatrix *A,
                   }
                }
                else if (CF_marker_offd[i1] != -3)
-               { /* F point; look at neighbors of i1. Sop contains global col
-                  * numbers and entries that could be in S_diag or S_offd or
-                  * neither. */
-                  for(kk = Sop_i[i1]; kk < Sop_i[i1+1]; kk++)
+               {
+                  /* F point; look at neighbors of i1. Sop contains global col
+                   * numbers and entries that could be in S_diag or S_offd or
+                   * neither. */
+                  for (kk = Sop_i[i1]; kk < Sop_i[i1 + 1]; kk++)
                   {
                      k1 = Sop_j[kk];
-                     if(k1 >= col_1 && k1 < col_n)
-                     { /* In S_diag */
-                        loc_col = k1-col_1;
-                        if(CF_marker[loc_col] >= 0)
+                     if (k1 >= col_1 && k1 < col_n)
+                     {
+                        /* In S_diag */
+                        loc_col = k1 - col_1;
+                        if (CF_marker[loc_col] >= 0)
                         {
-                           if(P_marker[loc_col] < P_diag_i[i])
+                           if (P_marker[loc_col] < P_diag_i[i])
                            {
                               P_marker[loc_col] = jj_counter;
                               jj_counter++;
@@ -5845,9 +5909,9 @@ hypre_BoomerAMGBuildBlockStdInterp(hypre_ParCSRBlockMatrix *A,
                      else
                      {
                         loc_col = -k1 - 1;
-                        if(CF_marker_offd[loc_col] >= 0)
+                        if (CF_marker_offd[loc_col] >= 0)
                         {
-                           if(P_marker_offd[loc_col] < P_offd_i[i])
+                           if (P_marker_offd[loc_col] < P_offd_i[i])
                            {
                               P_marker_offd[loc_col] = jj_counter_offd;
                               tmp_CF_marker_offd[loc_col] = 1;
@@ -5862,7 +5926,7 @@ hypre_BoomerAMGBuildBlockStdInterp(hypre_ParCSRBlockMatrix *A,
       }
    }
 
-   if (debug_flag==4)
+   if (debug_flag == 4)
    {
       wall_time = time_getWallclockSeconds() - wall_time;
       hypre_printf("Proc = %d     determine structure    %f\n",
@@ -5879,11 +5943,11 @@ hypre_BoomerAMGBuildBlockStdInterp(hypre_ParCSRBlockMatrix *A,
 
    P_diag_j    = hypre_CTAlloc(HYPRE_Int,  P_diag_size, HYPRE_MEMORY_HOST);
    /* we need to include the size of the blocks in the data size */
-   P_diag_data = hypre_CTAlloc(HYPRE_Real,  P_diag_size, HYPRE_MEMORY_HOST)*bnnz;
+   P_diag_data = hypre_CTAlloc(HYPRE_Real,  P_diag_size, HYPRE_MEMORY_HOST) * bnnz;
 
    P_offd_j    = hypre_CTAlloc(HYPRE_Int,  P_offd_size, HYPRE_MEMORY_HOST);
    /* we need to include the size of the blocks in the data size */
-   P_offd_data = hypre_CTAlloc(HYPRE_Real,  P_offd_size*bnnz, HYPRE_MEMORY_HOST);
+   P_offd_data = hypre_CTAlloc(HYPRE_Real,  P_offd_size * bnnz, HYPRE_MEMORY_HOST);
 
    P_diag_i[n_fine] = jj_counter;
    P_offd_i[n_fine] = jj_counter_offd;
@@ -5892,29 +5956,34 @@ hypre_BoomerAMGBuildBlockStdInterp(hypre_ParCSRBlockMatrix *A,
    jj_counter_offd = start_indexing;
 
    /* Fine to coarse mapping */
-   if(num_procs > 1)
+   if (num_procs > 1)
    {
       for (i = 0; i < n_fine; i++)
+      {
          fine_to_coarse[i] += my_first_cpt;
+      }
 
       alt_insert_new_nodes(comm_pkg, extend_comm_pkg, fine_to_coarse,
                            full_off_procNodes,
                            fine_to_coarse_offd);
 
       for (i = 0; i < n_fine; i++)
+      {
          fine_to_coarse[i] -= my_first_cpt;
+      }
    }
 
    /* Initialize ahat, which is a modification to a, used in the standard
     * interpolation routine. */
-   ahat = hypre_CTAlloc(HYPRE_Real,  n_fine*bnnz, HYPRE_MEMORY_HOST); /* this is data array */
+   ahat = hypre_CTAlloc(HYPRE_Real,  n_fine * bnnz, HYPRE_MEMORY_HOST); /* this is data array */
    ihat = hypre_CTAlloc(HYPRE_Int,  n_fine, HYPRE_MEMORY_HOST);
    ipnt = hypre_CTAlloc(HYPRE_Int,  n_fine, HYPRE_MEMORY_HOST);
 
 
    if (full_off_procNodes)
    {
-      ahat_offd = hypre_CTAlloc(HYPRE_Real,  full_off_procNodes*bnnz, HYPRE_MEMORY_HOST);  /* this is data array */
+      ahat_offd = hypre_CTAlloc(HYPRE_Real,  full_off_procNodes * bnnz,
+                                HYPRE_MEMORY_HOST);  /* this is data array */
       ihat_offd = hypre_CTAlloc(HYPRE_Int,  full_off_procNodes, HYPRE_MEMORY_HOST);
       ipnt_offd = hypre_CTAlloc(HYPRE_Int,  full_off_procNodes, HYPRE_MEMORY_HOST);
    }
@@ -5938,8 +6007,10 @@ hypre_BoomerAMGBuildBlockStdInterp(hypre_ParCSRBlockMatrix *A,
    for (i = 0; i < n_fine; i++)
    {
       jj_begin_row = jj_counter;
-      if(num_procs > 1)
+      if (num_procs > 1)
+      {
          jj_begin_row_offd = jj_counter_offd;
+      }
 
       /*--------------------------------------------------------------------
        *  If i is a c-point, interpolation is the identity.
@@ -5952,7 +6023,7 @@ hypre_BoomerAMGBuildBlockStdInterp(hypre_ParCSRBlockMatrix *A,
 
          /* P_diag_data[jj_counter] = one; */
          hypre_CSRBlockMatrixBlockCopyData(identity_block,
-                                           &P_diag_data[jj_counter*bnnz],
+                                           &P_diag_data[jj_counter * bnnz],
                                            1.0, block_size);
 
          jj_counter++;
@@ -5964,9 +6035,9 @@ hypre_BoomerAMGBuildBlockStdInterp(hypre_ParCSRBlockMatrix *A,
 
       else if (CF_marker[i] != -3)
       {
-         if (debug_flag==4) wall_time = time_getWallclockSeconds();
+         if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
          strong_f_marker--;
-         for (jj = S_diag_i[i]; jj < S_diag_i[i+1]; jj++)
+         for (jj = S_diag_i[i]; jj < S_diag_i[i + 1]; jj++)
          {
             i1 = S_diag_j[jj];
 
@@ -5983,7 +6054,7 @@ hypre_BoomerAMGBuildBlockStdInterp(hypre_ParCSRBlockMatrix *A,
                   P_diag_j[jj_counter]    = i1;
                   /* P_diag_data[jj_counter] = zero; */
                   hypre_CSRBlockMatrixBlockCopyData(zero_block,
-                                                    &P_diag_data[jj_counter*bnnz],
+                                                    &P_diag_data[jj_counter * bnnz],
                                                     1.0, block_size);
 
                   jj_counter++;
@@ -5992,38 +6063,38 @@ hypre_BoomerAMGBuildBlockStdInterp(hypre_ParCSRBlockMatrix *A,
             else  if (CF_marker[i1] != -3)
             {
                P_marker[i1] = strong_f_marker;
-               for (kk = S_diag_i[i1]; kk < S_diag_i[i1+1]; kk++)
+               for (kk = S_diag_i[i1]; kk < S_diag_i[i1 + 1]; kk++)
                {
                   k1 = S_diag_j[kk];
                   if (CF_marker[k1] >= 0)
                   {
-                     if(P_marker[k1] < jj_begin_row)
+                     if (P_marker[k1] < jj_begin_row)
                      {
                         P_marker[k1] = jj_counter;
                         P_diag_j[jj_counter] = k1;
                         /* P_diag_data[jj_counter] = zero; */
                         hypre_CSRBlockMatrixBlockCopyData(zero_block,
-                                                          &P_diag_data[jj_counter*bnnz],
+                                                          &P_diag_data[jj_counter * bnnz],
                                                           1.0, block_size);
 
                         jj_counter++;
                      }
                   }
                }
-               if(num_procs > 1)
+               if (num_procs > 1)
                {
-                  for (kk = S_offd_i[i1]; kk < S_offd_i[i1+1]; kk++)
+                  for (kk = S_offd_i[i1]; kk < S_offd_i[i1 + 1]; kk++)
                   {
                      k1 = S_offd_j[kk];
-                     if(CF_marker_offd[k1] >= 0)
+                     if (CF_marker_offd[k1] >= 0)
                      {
-                        if(P_marker_offd[k1] < jj_begin_row_offd)
+                        if (P_marker_offd[k1] < jj_begin_row_offd)
                         {
                            P_marker_offd[k1] = jj_counter_offd;
                            P_offd_j[jj_counter_offd] = k1;
                            /* P_offd_data[jj_counter_offd] = zero; */
                            hypre_CSRBlockMatrixBlockCopyData(zero_block,
-                                                             &P_offd_data[jj_counter_offd*bnnz],
+                                                             &P_offd_data[jj_counter_offd * bnnz],
                                                              1.0, block_size);
 
                            jj_counter_offd++;
@@ -6036,18 +6107,18 @@ hypre_BoomerAMGBuildBlockStdInterp(hypre_ParCSRBlockMatrix *A,
 
          if ( num_procs > 1)
          {
-            for (jj=S_offd_i[i]; jj < S_offd_i[i+1]; jj++)
+            for (jj = S_offd_i[i]; jj < S_offd_i[i + 1]; jj++)
             {
                i1 = S_offd_j[jj];
                if ( CF_marker_offd[i1] >= 0)
                {
-                  if(P_marker_offd[i1] < jj_begin_row_offd)
+                  if (P_marker_offd[i1] < jj_begin_row_offd)
                   {
                      P_marker_offd[i1] = jj_counter_offd;
-                     P_offd_j[jj_counter_offd]=i1;
+                     P_offd_j[jj_counter_offd] = i1;
                      /* P_offd_data[jj_counter_offd] = zero;*/
                      hypre_CSRBlockMatrixBlockCopyData(zero_block,
-                                                       &P_offd_data[jj_counter_offd*bnnz],
+                                                       &P_offd_data[jj_counter_offd * bnnz],
                                                        1.0, block_size);
 
                      jj_counter_offd++;
@@ -6056,21 +6127,21 @@ hypre_BoomerAMGBuildBlockStdInterp(hypre_ParCSRBlockMatrix *A,
                else if (CF_marker_offd[i1] != -3)
                {
                   P_marker_offd[i1] = strong_f_marker;
-                  for(kk = Sop_i[i1]; kk < Sop_i[i1+1]; kk++)
+                  for (kk = Sop_i[i1]; kk < Sop_i[i1 + 1]; kk++)
                   {
                      k1 = Sop_j[kk];
-                     if(k1 >= col_1 && k1 < col_n)
+                     if (k1 >= col_1 && k1 < col_n)
                      {
-                        loc_col = k1-col_1;
-                        if(CF_marker[loc_col] >= 0)
+                        loc_col = k1 - col_1;
+                        if (CF_marker[loc_col] >= 0)
                         {
-                           if(P_marker[loc_col] < jj_begin_row)
+                           if (P_marker[loc_col] < jj_begin_row)
                            {
                               P_marker[loc_col] = jj_counter;
                               P_diag_j[jj_counter] = loc_col;
                               /* P_diag_data[jj_counter] = zero;*/
                               hypre_CSRBlockMatrixBlockCopyData(zero_block,
-                                                                &P_diag_data[jj_counter*bnnz],
+                                                                &P_diag_data[jj_counter * bnnz],
                                                                 1.0, block_size);
                               jj_counter++;
                            }
@@ -6079,15 +6150,15 @@ hypre_BoomerAMGBuildBlockStdInterp(hypre_ParCSRBlockMatrix *A,
                      else
                      {
                         loc_col = -k1 - 1;
-                        if(CF_marker_offd[loc_col] >= 0)
+                        if (CF_marker_offd[loc_col] >= 0)
                         {
-                           if(P_marker_offd[loc_col] < jj_begin_row_offd)
+                           if (P_marker_offd[loc_col] < jj_begin_row_offd)
                            {
                               P_marker_offd[loc_col] = jj_counter_offd;
-                              P_offd_j[jj_counter_offd]=loc_col;
+                              P_offd_j[jj_counter_offd] = loc_col;
                               /* P_offd_data[jj_counter_offd] = zero;*/
                               hypre_CSRBlockMatrixBlockCopyData(zero_block,
-                                                                &P_offd_data[jj_counter_offd*bnnz],
+                                                                &P_offd_data[jj_counter_offd * bnnz],
                                                                 1.0, block_size);
                               jj_counter_offd++;
                            }
@@ -6101,31 +6172,34 @@ hypre_BoomerAMGBuildBlockStdInterp(hypre_ParCSRBlockMatrix *A,
          jj_end_row = jj_counter;
          jj_end_row_offd = jj_counter_offd;
 
-         if (debug_flag==4)
+         if (debug_flag == 4)
          {
             wall_time = time_getWallclockSeconds() - wall_time;
             wall_1 += wall_time;
             fflush(NULL);
          }
 
-/* FIX THIS - is a_hat  - need to copy block data to ahat */
+         /* FIX THIS - is a_hat  - need to copy block data to ahat */
 
-         if (debug_flag==4) wall_time = time_getWallclockSeconds();
+         if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
          cnt_c = 0;
-         cnt_f = jj_end_row-jj_begin_row;
+         cnt_f = jj_end_row - jj_begin_row;
          cnt_c_offd = 0;
-         cnt_f_offd = jj_end_row_offd-jj_begin_row_offd;
+         cnt_f_offd = jj_end_row_offd - jj_begin_row_offd;
          ihat[i] = cnt_f;
          ipnt[cnt_f] = i;
          ahat[cnt_f++] = A_diag_data[A_diag_i[i]];
-         for (jj = A_diag_i[i]+1; jj < A_diag_i[i+1]; jj++)
-         { /* i1 is direct neighbor */
+         for (jj = A_diag_i[i] + 1; jj < A_diag_i[i + 1]; jj++)
+         {
+            /* i1 is direct neighbor */
             i1 = A_diag_j[jj];
             if (P_marker[i1] != strong_f_marker)
             {
                indx = ihat[i1];
                if (indx > -1)
+               {
                   ahat[indx] += A_diag_data[jj];
+               }
                else if (P_marker[i1] >= jj_begin_row)
                {
                   ihat[i1] = cnt_c;
@@ -6141,49 +6215,53 @@ hypre_BoomerAMGBuildBlockStdInterp(hypre_ParCSRBlockMatrix *A,
             }
             else
             {
-               if(num_functions == 1 || dof_func[i] == dof_func[i1])
+               if (num_functions == 1 || dof_func[i] == dof_func[i1])
                {
-                  distribute = A_diag_data[jj]/A_diag_data[A_diag_i[i1]];
-                  for (kk = A_diag_i[i1]+1; kk < A_diag_i[i1+1]; kk++)
+                  distribute = A_diag_data[jj] / A_diag_data[A_diag_i[i1]];
+                  for (kk = A_diag_i[i1] + 1; kk < A_diag_i[i1 + 1]; kk++)
                   {
                      k1 = A_diag_j[kk];
                      indx = ihat[k1];
                      if (indx > -1)
-                        ahat[indx] -= A_diag_data[kk]*distribute;
+                     {
+                        ahat[indx] -= A_diag_data[kk] * distribute;
+                     }
                      else if (P_marker[k1] >= jj_begin_row)
                      {
                         ihat[k1] = cnt_c;
                         ipnt[cnt_c] = k1;
-                        ahat[cnt_c++] -= A_diag_data[kk]*distribute;
+                        ahat[cnt_c++] -= A_diag_data[kk] * distribute;
                      }
                      else
                      {
                         ihat[k1] = cnt_f;
                         ipnt[cnt_f] = k1;
-                        ahat[cnt_f++] -= A_diag_data[kk]*distribute;
+                        ahat[cnt_f++] -= A_diag_data[kk] * distribute;
                      }
                   }
-                  if(num_procs > 1)
+                  if (num_procs > 1)
                   {
-                     for (kk = A_offd_i[i1]; kk < A_offd_i[i1+1]; kk++)
+                     for (kk = A_offd_i[i1]; kk < A_offd_i[i1 + 1]; kk++)
                      {
                         k1 = A_offd_j[kk];
                         indx = ihat_offd[k1];
-                        if(num_functions == 1 || dof_func[i1] == dof_func_offd[k1])
+                        if (num_functions == 1 || dof_func[i1] == dof_func_offd[k1])
                         {
                            if (indx > -1)
-                              ahat_offd[indx] -= A_offd_data[kk]*distribute;
+                           {
+                              ahat_offd[indx] -= A_offd_data[kk] * distribute;
+                           }
                            else if (P_marker_offd[k1] >= jj_begin_row_offd)
                            {
                               ihat_offd[k1] = cnt_c_offd;
                               ipnt_offd[cnt_c_offd] = k1;
-                              ahat_offd[cnt_c_offd++] -= A_offd_data[kk]*distribute;
+                              ahat_offd[cnt_c_offd++] -= A_offd_data[kk] * distribute;
                            }
                            else
                            {
                               ihat_offd[k1] = cnt_f_offd;
                               ipnt_offd[cnt_f_offd] = k1;
-                              ahat_offd[cnt_f_offd++] -= A_offd_data[kk]*distribute;
+                              ahat_offd[cnt_f_offd++] -= A_offd_data[kk] * distribute;
                            }
                         }
                      }
@@ -6191,16 +6269,18 @@ hypre_BoomerAMGBuildBlockStdInterp(hypre_ParCSRBlockMatrix *A,
                }
             }
          }
-         if(num_procs > 1)
+         if (num_procs > 1)
          {
-            for(jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+            for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
             {
                i1 = A_offd_j[jj];
-               if(P_marker_offd[i1] != strong_f_marker)
+               if (P_marker_offd[i1] != strong_f_marker)
                {
                   indx = ihat_offd[i1];
                   if (indx > -1)
+                  {
                      ahat_offd[indx] += A_offd_data[jj];
+                  }
                   else if (P_marker_offd[i1] >= jj_begin_row_offd)
                   {
                      ihat_offd[i1] = cnt_c_offd;
@@ -6216,51 +6296,56 @@ hypre_BoomerAMGBuildBlockStdInterp(hypre_ParCSRBlockMatrix *A,
                }
                else
                {
-                  if(num_functions == 1 || dof_func[i] == dof_func_offd[i1])
+                  if (num_functions == 1 || dof_func[i] == dof_func_offd[i1])
                   {
-                     distribute = A_offd_data[jj]/A_ext_data[A_ext_i[i1]];
-                     for (kk = A_ext_i[i1]+1; kk < A_ext_i[i1+1]; kk++)
+                     distribute = A_offd_data[jj] / A_ext_data[A_ext_i[i1]];
+                     for (kk = A_ext_i[i1] + 1; kk < A_ext_i[i1 + 1]; kk++)
                      {
                         k1 = A_ext_j[kk];
-                        if(k1 >= col_1 && k1 < col_n)
-                        { /*diag*/
+                        if (k1 >= col_1 && k1 < col_n)
+                        {
+                           /*diag*/
                            loc_col = k1 - col_1;
                            indx = ihat[loc_col];
                            if (indx > -1)
-                              ahat[indx] -= A_ext_data[kk]*distribute;
+                           {
+                              ahat[indx] -= A_ext_data[kk] * distribute;
+                           }
                            else if (P_marker[loc_col] >= jj_begin_row)
                            {
                               ihat[loc_col] = cnt_c;
                               ipnt[cnt_c] = loc_col;
-                              ahat[cnt_c++] -= A_ext_data[kk]*distribute;
+                              ahat[cnt_c++] -= A_ext_data[kk] * distribute;
                            }
                            else
                            {
                               ihat[loc_col] = cnt_f;
                               ipnt[cnt_f] = loc_col;
-                              ahat[cnt_f++] -= A_ext_data[kk]*distribute;
+                              ahat[cnt_f++] -= A_ext_data[kk] * distribute;
                            }
                         }
                         else
                         {
                            loc_col = -k1 - 1;
-                           if(num_functions == 1 ||
-                              dof_func_offd[loc_col] == dof_func_offd[i1])
+                           if (num_functions == 1 ||
+                               dof_func_offd[loc_col] == dof_func_offd[i1])
                            {
                               indx = ihat_offd[loc_col];
                               if (indx > -1)
-                                 ahat_offd[indx] -= A_ext_data[kk]*distribute;
-                              else if(P_marker_offd[loc_col] >= jj_begin_row_offd)
+                              {
+                                 ahat_offd[indx] -= A_ext_data[kk] * distribute;
+                              }
+                              else if (P_marker_offd[loc_col] >= jj_begin_row_offd)
                               {
                                  ihat_offd[loc_col] = cnt_c_offd;
                                  ipnt_offd[cnt_c_offd] = loc_col;
-                                 ahat_offd[cnt_c_offd++] -= A_ext_data[kk]*distribute;
+                                 ahat_offd[cnt_c_offd++] -= A_ext_data[kk] * distribute;
                               }
                               else
                               {
                                  ihat_offd[loc_col] = cnt_f_offd;
                                  ipnt_offd[cnt_f_offd] = loc_col;
-                                 ahat_offd[cnt_f_offd++] -= A_ext_data[kk]*distribute;
+                                 ahat_offd[cnt_f_offd++] -= A_ext_data[kk] * distribute;
                               }
                            }
                         }
@@ -6269,14 +6354,14 @@ hypre_BoomerAMGBuildBlockStdInterp(hypre_ParCSRBlockMatrix *A,
                }
             }
          }
-         if (debug_flag==4)
+         if (debug_flag == 4)
          {
             wall_time = time_getWallclockSeconds() - wall_time;
             wall_2 += wall_time;
             fflush(NULL);
          }
 
-         if (debug_flag==4) wall_time = time_getWallclockSeconds();
+         if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
          diagonal = ahat[cnt_c];
          ahat[cnt_c] = 0;
          sum_pos = 0;
@@ -6285,9 +6370,9 @@ hypre_BoomerAMGBuildBlockStdInterp(hypre_ParCSRBlockMatrix *A,
          sum_neg_C = 0;
          sum = 0;
          sum_C = 0;
-         if(sep_weight == 1)
+         if (sep_weight == 1)
          {
-            for (jj=0; jj < cnt_c; jj++)
+            for (jj = 0; jj < cnt_c; jj++)
             {
                if (ahat[jj] > 0)
                {
@@ -6298,9 +6383,9 @@ hypre_BoomerAMGBuildBlockStdInterp(hypre_ParCSRBlockMatrix *A,
                   sum_neg_C += ahat[jj];
                }
             }
-            if(num_procs > 1)
+            if (num_procs > 1)
             {
-               for (jj=0; jj < cnt_c_offd; jj++)
+               for (jj = 0; jj < cnt_c_offd; jj++)
                {
                   if (ahat_offd[jj] > 0)
                   {
@@ -6314,7 +6399,7 @@ hypre_BoomerAMGBuildBlockStdInterp(hypre_ParCSRBlockMatrix *A,
             }
             sum_pos = sum_pos_C;
             sum_neg = sum_neg_C;
-            for (jj=cnt_c+1; jj < cnt_f; jj++)
+            for (jj = cnt_c + 1; jj < cnt_f; jj++)
             {
                if (ahat[jj] > 0)
                {
@@ -6326,9 +6411,9 @@ hypre_BoomerAMGBuildBlockStdInterp(hypre_ParCSRBlockMatrix *A,
                }
                ahat[jj] = 0;
             }
-            if(num_procs > 1)
+            if (num_procs > 1)
             {
-               for (jj=cnt_c_offd; jj < cnt_f_offd; jj++)
+               for (jj = cnt_c_offd; jj < cnt_f_offd; jj++)
                {
                   if (ahat_offd[jj] > 0)
                   {
@@ -6341,8 +6426,8 @@ hypre_BoomerAMGBuildBlockStdInterp(hypre_ParCSRBlockMatrix *A,
                   ahat_offd[jj] = 0;
                }
             }
-            if (sum_neg_C) alfa = sum_neg/sum_neg_C/diagonal;
-            if (sum_pos_C) beta = sum_pos/sum_pos_C/diagonal;
+            if (sum_neg_C) { alfa = sum_neg / sum_neg_C / diagonal; }
+            if (sum_pos_C) { beta = sum_pos / sum_pos_C / diagonal; }
 
             /*-----------------------------------------------------------------
              * Set interpolation weight by dividing by the diagonal.
@@ -6352,59 +6437,71 @@ hypre_BoomerAMGBuildBlockStdInterp(hypre_ParCSRBlockMatrix *A,
             {
                j1 = ihat[P_diag_j[jj]];
                if (ahat[j1] > 0)
-                  P_diag_data[jj] = -beta*ahat[j1];
+               {
+                  P_diag_data[jj] = -beta * ahat[j1];
+               }
                else
-                  P_diag_data[jj] = -alfa*ahat[j1];
+               {
+                  P_diag_data[jj] = -alfa * ahat[j1];
+               }
 
                P_diag_j[jj] = fine_to_coarse[P_diag_j[jj]];
                ahat[j1] = 0;
             }
-            for (jj=0; jj < cnt_f; jj++)
+            for (jj = 0; jj < cnt_f; jj++)
+            {
                ihat[ipnt[jj]] = -1;
-            if(num_procs > 1)
+            }
+            if (num_procs > 1)
             {
                for (jj = jj_begin_row_offd; jj < jj_end_row_offd; jj++)
                {
                   j1 = ihat_offd[P_offd_j[jj]];
                   if (ahat_offd[j1] > 0)
-                     P_offd_data[jj] = -beta*ahat_offd[j1];
+                  {
+                     P_offd_data[jj] = -beta * ahat_offd[j1];
+                  }
                   else
-                     P_offd_data[jj] = -alfa*ahat_offd[j1];
+                  {
+                     P_offd_data[jj] = -alfa * ahat_offd[j1];
+                  }
 
                   ahat_offd[j1] = 0;
                }
-               for (jj=0; jj < cnt_f_offd; jj++)
+               for (jj = 0; jj < cnt_f_offd; jj++)
+               {
                   ihat_offd[ipnt_offd[jj]] = -1;
+               }
             }
          }
          else
          {
-            for (jj=0; jj < cnt_c; jj++)
+            for (jj = 0; jj < cnt_c; jj++)
             {
                sum_C += ahat[jj];
             }
-            if(num_procs > 1)
+            if (num_procs > 1)
             {
-               for (jj=0; jj < cnt_c_offd; jj++)
+               for (jj = 0; jj < cnt_c_offd; jj++)
                {
                   sum_C += ahat_offd[jj];
                }
             }
             sum = sum_C;
-            for (jj=cnt_c+1; jj < cnt_f; jj++)
+            for (jj = cnt_c + 1; jj < cnt_f; jj++)
             {
                sum += ahat[jj];
                ahat[jj] = 0;
             }
-            if(num_procs > 1)
+            if (num_procs > 1)
             {
-               for (jj=cnt_c_offd; jj < cnt_f_offd; jj++)
+               for (jj = cnt_c_offd; jj < cnt_f_offd; jj++)
                {
                   sum += ahat_offd[jj];
                   ahat_offd[jj] = 0;
                }
             }
-            if (sum_C) alfa = sum/sum_C/diagonal;
+            if (sum_C) { alfa = sum / sum_C / diagonal; }
 
             /*-----------------------------------------------------------------
              * Set interpolation weight by dividing by the diagonal.
@@ -6413,25 +6510,29 @@ hypre_BoomerAMGBuildBlockStdInterp(hypre_ParCSRBlockMatrix *A,
             for (jj = jj_begin_row; jj < jj_end_row; jj++)
             {
                j1 = ihat[P_diag_j[jj]];
-               P_diag_data[jj] = -alfa*ahat[j1];
+               P_diag_data[jj] = -alfa * ahat[j1];
                P_diag_j[jj] = fine_to_coarse[P_diag_j[jj]];
                ahat[j1] = 0;
             }
-            for (jj=0; jj < cnt_f; jj++)
+            for (jj = 0; jj < cnt_f; jj++)
+            {
                ihat[ipnt[jj]] = -1;
-            if(num_procs > 1)
+            }
+            if (num_procs > 1)
             {
                for (jj = jj_begin_row_offd; jj < jj_end_row_offd; jj++)
                {
                   j1 = ihat_offd[P_offd_j[jj]];
-                  P_offd_data[jj] = -alfa*ahat_offd[j1];
+                  P_offd_data[jj] = -alfa * ahat_offd[j1];
                   ahat_offd[j1] = 0;
                }
-               for (jj=0; jj < cnt_f_offd; jj++)
+               for (jj = 0; jj < cnt_f_offd; jj++)
+               {
                   ihat_offd[ipnt_offd[jj]] = -1;
+               }
             }
          }
-         if (debug_flag==4)
+         if (debug_flag == 4)
          {
             wall_time = time_getWallclockSeconds() - wall_time;
             wall_3 += wall_time;
@@ -6440,7 +6541,7 @@ hypre_BoomerAMGBuildBlockStdInterp(hypre_ParCSRBlockMatrix *A,
       }
    }
 
-   if (debug_flag==4)
+   if (debug_flag == 4)
    {
       hypre_printf("Proc = %d fill part 1 %f part 2 %f  part 3 %f\n",
                    my_id, wall_1, wall_2, wall_3);
@@ -6481,21 +6582,23 @@ hypre_BoomerAMGBuildBlockStdInterp(hypre_ParCSRBlockMatrix *A,
    /* This builds col_map, col_map should be monotone increasing and contain
     * global numbers. */
    num_cols_P_offd = 0;
-   if(P_offd_size)
+   if (P_offd_size)
    {
       hypre_TFree(P_marker, HYPRE_MEMORY_HOST);
       P_marker = hypre_CTAlloc(HYPRE_Int,  full_off_procNodes, HYPRE_MEMORY_HOST);
 
-      for (i=0; i < full_off_procNodes; i++)
+      for (i = 0; i < full_off_procNodes; i++)
+      {
          P_marker[i] = 0;
+      }
 
       num_cols_P_offd = 0;
-      for (i=0; i < P_offd_size; i++)
+      for (i = 0; i < P_offd_size; i++)
       {
          index = P_offd_j[i];
          if (!P_marker[index])
          {
-            if(tmp_CF_marker_offd[index] >= 0)
+            if (tmp_CF_marker_offd[index] >= 0)
             {
                num_cols_P_offd++;
                P_marker[index] = 1;
@@ -6506,35 +6609,37 @@ hypre_BoomerAMGBuildBlockStdInterp(hypre_ParCSRBlockMatrix *A,
       col_map_offd_P = hypre_CTAlloc(HYPRE_Int,  num_cols_P_offd, HYPRE_MEMORY_HOST);
 
       index = 0;
-      for(i = 0; i < num_cols_P_offd; i++)
+      for (i = 0; i < num_cols_P_offd; i++)
       {
-         while( P_marker[index] == 0) index++;
+         while ( P_marker[index] == 0) { index++; }
          col_map_offd_P[i] = index++;
       }
-      for(i = 0; i < P_offd_size; i++)
+      for (i = 0; i < P_offd_size; i++)
          P_offd_j[i] = hypre_BinarySearch(col_map_offd_P,
                                           P_offd_j[i],
                                           num_cols_P_offd);
 
       index = 0;
-      for(i = 0; i < num_cols_P_offd; i++)
+      for (i = 0; i < num_cols_P_offd; i++)
       {
-         while (P_marker[index] == 0) index++;
+         while (P_marker[index] == 0) { index++; }
 
          col_map_offd_P[i] = fine_to_coarse_offd[index];
          index++;
       }
 
       /* Sort the col_map_offd_P and P_offd_j correctly */
-      for(i = 0; i < num_cols_P_offd; i++)
+      for (i = 0; i < num_cols_P_offd; i++)
+      {
          P_marker[i] = col_map_offd_P[i];
+      }
 
       /* Check if sort actually changed anything */
-      if(ssort(col_map_offd_P,num_cols_P_offd))
+      if (ssort(col_map_offd_P, num_cols_P_offd))
       {
-         for(i = 0; i < P_offd_size; i++)
-            for(j = 0; j < num_cols_P_offd; j++)
-               if(P_marker[P_offd_j[i]] == col_map_offd_P[j])
+         for (i = 0; i < P_offd_size; i++)
+            for (j = 0; j < num_cols_P_offd; j++)
+               if (P_marker[P_offd_j[i]] == col_map_offd_P[j])
                {
                   P_offd_j[i] = j;
                   j = num_cols_P_offd;
@@ -6551,8 +6656,8 @@ hypre_BoomerAMGBuildBlockStdInterp(hypre_ParCSRBlockMatrix *A,
 
    hypre_MatvecCommPkgCreate(P);
 
-   for (i=0; i < n_fine; i++)
-      if (CF_marker[i] == -3) CF_marker[i] = -1;
+   for (i = 0; i < n_fine; i++)
+      if (CF_marker[i] == -3) { CF_marker[i] = -1; }
 
    *P_ptr = P;
 
@@ -6578,8 +6683,10 @@ hypre_BoomerAMGBuildBlockStdInterp(hypre_ParCSRBlockMatrix *A,
       hypre_TFree(CF_marker_offd, HYPRE_MEMORY_HOST);
       hypre_TFree(tmp_CF_marker_offd, HYPRE_MEMORY_HOST);
 
-      if(num_functions > 1)
+      if (num_functions > 1)
+      {
          hypre_TFree(dof_func_offd, HYPRE_MEMORY_HOST);
+      }
       hypre_TFree(found, HYPRE_MEMORY_HOST);
 
       hypre_MatvecCommPkgDestroy(extend_comm_pkg);
diff --git a/external/hypre/src/parcsr_block_mv/par_csr_block_matrix.c b/external/hypre/src/parcsr_block_mv/par_csr_block_matrix.c
index 358529a5..8e2820f7 100644
--- a/external/hypre/src/parcsr_block_mv/par_csr_block_matrix.c
+++ b/external/hypre/src/parcsr_block_mv/par_csr_block_matrix.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -66,9 +66,9 @@ hypre_ParCSRBlockMatrixCreate( MPI_Comm      comm,
    /* row_starts[0] is start of local rows.
       row_starts[1] is start of next processor's rows */
    first_row_index = row_starts[0];
-   local_num_rows = (HYPRE_Int)(row_starts[1]-first_row_index) ;
+   local_num_rows = (HYPRE_Int)(row_starts[1] - first_row_index) ;
    first_col_diag = col_starts[0];
-   local_num_cols = (HYPRE_Int)(col_starts[1]-first_col_diag);
+   local_num_cols = (HYPRE_Int)(col_starts[1] - first_col_diag);
    hypre_ParCSRBlockMatrixComm(matrix) = comm;
    hypre_ParCSRBlockMatrixDiag(matrix) =
       hypre_CSRBlockMatrixCreate(block_size, local_num_rows,
@@ -114,15 +114,23 @@ hypre_ParCSRBlockMatrixDestroy( hypre_ParCSRBlockMatrix *matrix )
          hypre_CSRBlockMatrixDestroy(hypre_ParCSRBlockMatrixDiag(matrix));
          hypre_CSRBlockMatrixDestroy(hypre_ParCSRBlockMatrixOffd(matrix));
          if (hypre_ParCSRBlockMatrixColMapOffd(matrix))
+         {
             hypre_TFree(hypre_ParCSRBlockMatrixColMapOffd(matrix), HYPRE_MEMORY_HOST);
+         }
          if (hypre_ParCSRBlockMatrixCommPkg(matrix))
+         {
             hypre_MatvecCommPkgDestroy(hypre_ParCSRBlockMatrixCommPkg(matrix));
+         }
          if (hypre_ParCSRBlockMatrixCommPkgT(matrix))
+         {
             hypre_MatvecCommPkgDestroy(hypre_ParCSRBlockMatrixCommPkgT(matrix));
+         }
       }
 
       if (hypre_ParCSRBlockMatrixAssumedPartition(matrix))
+      {
          hypre_ParCSRBlockMatrixDestroyAssumedPartition(matrix);
+      }
 
       hypre_TFree(matrix, HYPRE_MEMORY_HOST);
    }
@@ -137,7 +145,7 @@ hypre_ParCSRBlockMatrixDestroy( hypre_ParCSRBlockMatrix *matrix )
 HYPRE_Int
 hypre_ParCSRBlockMatrixInitialize( hypre_ParCSRBlockMatrix *matrix )
 {
-   HYPRE_Int  ierr=0;
+   HYPRE_Int  ierr = 0;
 
    hypre_CSRBlockMatrixInitialize(hypre_ParCSRBlockMatrixDiag(matrix));
    hypre_CSRBlockMatrixInitialize(hypre_ParCSRBlockMatrixOffd(matrix));
@@ -205,7 +213,7 @@ HYPRE_Int
 hypre_ParCSRBlockMatrixSetDataOwner( hypre_ParCSRBlockMatrix *matrix,
                                      HYPRE_Int              owns_data )
 {
-   HYPRE_Int    ierr=0;
+   HYPRE_Int    ierr = 0;
 
    hypre_ParCSRBlockMatrixOwnsData(matrix) = owns_data;
 
@@ -235,7 +243,7 @@ hypre_ParCSRBlockMatrixCompress( hypre_ParCSRBlockMatrix *matrix )
    HYPRE_Int i;
 
    matrix_C = hypre_ParCSRMatrixCreate(comm, global_num_rows, global_num_cols,
-                                       row_starts,col_starts,num_cols_offd,num_nonzeros_diag,num_nonzeros_offd);
+                                       row_starts, col_starts, num_cols_offd, num_nonzeros_diag, num_nonzeros_offd);
    hypre_ParCSRMatrixInitialize(matrix_C);
 
    hypre_CSRMatrixDestroy(hypre_ParCSRMatrixDiag(matrix_C));
@@ -243,7 +251,7 @@ hypre_ParCSRBlockMatrixCompress( hypre_ParCSRBlockMatrix *matrix )
    hypre_CSRMatrixDestroy(hypre_ParCSRMatrixOffd(matrix_C));
    hypre_ParCSRMatrixOffd(matrix_C) = hypre_CSRBlockMatrixCompress(offd);
 
-   for(i = 0; i < num_cols_offd; i++)
+   for (i = 0; i < num_cols_offd; i++)
       hypre_ParCSRMatrixColMapOffd(matrix_C)[i] =
          hypre_ParCSRBlockMatrixColMapOffd(matrix)[i];
    return matrix_C;
@@ -269,8 +277,8 @@ hypre_ParCSRBlockMatrixConvertToParCSRMatrix(hypre_ParCSRBlockMatrix *matrix)
    HYPRE_Int num_nonzeros_offd = hypre_CSRBlockMatrixNumNonzeros(offd);
 
    hypre_ParCSRMatrix *matrix_C;
-   HYPRE_BigInt *matrix_C_row_starts;
-   HYPRE_BigInt *matrix_C_col_starts;
+   HYPRE_BigInt matrix_C_row_starts[2];
+   HYPRE_BigInt matrix_C_col_starts[2];
 
    HYPRE_Int *counter, *new_j_map;
    HYPRE_Int size_j, size_map, index, new_num_cols, removed = 0;
@@ -282,26 +290,22 @@ hypre_ParCSRBlockMatrixConvertToParCSRMatrix(hypre_ParCSRBlockMatrix *matrix)
 
    hypre_CSRMatrix *diag_nozeros, *offd_nozeros;
 
-   hypre_MPI_Comm_size(comm,&num_procs);
+   hypre_MPI_Comm_size(comm, &num_procs);
 
-   matrix_C_row_starts = hypre_CTAlloc(HYPRE_BigInt, 2, HYPRE_MEMORY_HOST);
-   matrix_C_col_starts = hypre_CTAlloc(HYPRE_BigInt, 2, HYPRE_MEMORY_HOST);
-   for(i = 0; i < 2; i++)
+   for (i = 0; i < 2; i++)
    {
-      matrix_C_row_starts[i] = row_starts[i]*(HYPRE_BigInt)block_size;
-      matrix_C_col_starts[i] = col_starts[i]*(HYPRE_BigInt)block_size;
+      matrix_C_row_starts[i] = row_starts[i] * (HYPRE_BigInt)block_size;
+      matrix_C_col_starts[i] = col_starts[i] * (HYPRE_BigInt)block_size;
    }
 
-   matrix_C = hypre_ParCSRMatrixCreate(comm, global_num_rows*(HYPRE_BigInt)block_size,
-                                       global_num_cols*(HYPRE_BigInt)block_size,
+   matrix_C = hypre_ParCSRMatrixCreate(comm, global_num_rows * (HYPRE_BigInt)block_size,
+                                       global_num_cols * (HYPRE_BigInt)block_size,
                                        matrix_C_row_starts,
                                        matrix_C_col_starts,
-                                       num_cols_offd*block_size,
-                                       num_nonzeros_diag*block_size*block_size,
-                                       num_nonzeros_offd*block_size*block_size);
+                                       num_cols_offd * block_size,
+                                       num_nonzeros_diag * block_size * block_size,
+                                       num_nonzeros_offd * block_size * block_size);
    hypre_ParCSRMatrixInitialize(matrix_C);
-   hypre_TFree(matrix_C_row_starts, HYPRE_MEMORY_HOST);
-   hypre_TFree(matrix_C_col_starts, HYPRE_MEMORY_HOST);
 
    /* DIAG */
    hypre_CSRMatrixDestroy(hypre_ParCSRMatrixDiag(matrix_C));
@@ -310,8 +314,8 @@ hypre_ParCSRBlockMatrixConvertToParCSRMatrix(hypre_ParCSRBlockMatrix *matrix)
 
    /* AB - added to delete zeros */
    diag_nozeros = hypre_CSRMatrixDeleteZeros(
-      hypre_ParCSRMatrixDiag(matrix_C), 1e-14);
-   if(diag_nozeros)
+                     hypre_ParCSRMatrixDiag(matrix_C), 1e-14);
+   if (diag_nozeros)
    {
       hypre_CSRMatrixDestroy(hypre_ParCSRMatrixDiag(matrix_C));
       hypre_ParCSRMatrixDiag(matrix_C) = diag_nozeros;
@@ -324,8 +328,8 @@ hypre_ParCSRBlockMatrixConvertToParCSRMatrix(hypre_ParCSRBlockMatrix *matrix)
 
    /* AB - added to delete zeros - this just deletes from data and j arrays */
    offd_nozeros = hypre_CSRMatrixDeleteZeros(
-      hypre_ParCSRMatrixOffd(matrix_C), 1e-14);
-   if(offd_nozeros)
+                     hypre_ParCSRMatrixOffd(matrix_C), 1e-14);
+   if (offd_nozeros)
    {
       hypre_CSRMatrixDestroy(hypre_ParCSRMatrixOffd(matrix_C));
       hypre_ParCSRMatrixOffd(matrix_C) = offd_nozeros;
@@ -336,15 +340,15 @@ hypre_ParCSRBlockMatrixConvertToParCSRMatrix(hypre_ParCSRBlockMatrix *matrix)
    /* now convert the col_map_offd */
    for (i = 0; i < num_cols_offd; i++)
       for (j = 0; j < block_size; j++)
-         hypre_ParCSRMatrixColMapOffd(matrix_C)[i*block_size + j] =
-            hypre_ParCSRBlockMatrixColMapOffd(matrix)[i]*(HYPRE_BigInt)block_size + (HYPRE_BigInt)j;
+         hypre_ParCSRMatrixColMapOffd(matrix_C)[i * block_size + j] =
+            hypre_ParCSRBlockMatrixColMapOffd(matrix)[i] * (HYPRE_BigInt)block_size + (HYPRE_BigInt)j;
 
    /* if we deleted zeros, then it is possible that col_map_offd can be
       compressed as well - this requires some amount of work that could be skipped... */
 
    if (removed)
    {
-      size_map =   num_cols_offd*block_size;
+      size_map =   num_cols_offd * block_size;
       counter = hypre_CTAlloc(HYPRE_Int,  size_map, HYPRE_MEMORY_HOST);
       new_j_map = hypre_CTAlloc(HYPRE_Int,  size_map, HYPRE_MEMORY_HOST);
 
@@ -353,30 +357,30 @@ hypre_ParCSRBlockMatrixConvertToParCSRMatrix(hypre_ParCSRBlockMatrix *matrix)
 
       size_j = hypre_CSRMatrixNumNonzeros(hypre_ParCSRMatrixOffd(matrix_C));
       /* mark which off_d entries are found in j */
-      for (i=0; i < size_j; i++)
+      for (i = 0; i < size_j; i++)
       {
          counter[offd_j[i]] = 1;
       }
       /*now find new numbering for columns (we will delete the
         cols where counter = 0*/
       index = 0;
-      for (i=0; i < size_map; i++)
+      for (i = 0; i < size_map; i++)
       {
-         if (counter[i]) new_j_map[i] = index++;
+         if (counter[i]) { new_j_map[i] = index++; }
       }
       new_num_cols = index;
       /* if there are some col entries to remove: */
       if (!(index == size_map))
       {
          /* go thru j and adjust entries */
-         for (i=0; i < size_j; i++)
+         for (i = 0; i < size_j; i++)
          {
             offd_j[i] = new_j_map[offd_j[i]];
          }
          /*now go thru col map and get rid of non-needed entries */
          new_col_map_offd = hypre_CTAlloc(HYPRE_BigInt,  new_num_cols, HYPRE_MEMORY_HOST);
          index = 0;
-         for (i=0; i < size_map; i++)
+         for (i = 0; i < size_map; i++)
          {
             if (counter[i])
             {
@@ -420,8 +424,8 @@ hypre_ParCSRBlockMatrixConvertFromParCSRMatrix(hypre_ParCSRMatrix *matrix,
    HYPRE_BigInt *col_starts = hypre_ParCSRMatrixColStarts(matrix);
    HYPRE_Int num_cols_offd = hypre_CSRMatrixNumCols(offd);
    HYPRE_BigInt *col_map_offd = hypre_ParCSRBlockMatrixColMapOffd(matrix);
-   HYPRE_BigInt *map_to_node=NULL;
-   HYPRE_Int *counter=NULL, *col_in_j_map=NULL;
+   HYPRE_BigInt *map_to_node = NULL;
+   HYPRE_Int *counter = NULL, *col_in_j_map = NULL;
    HYPRE_BigInt *matrix_C_col_map_offd = NULL;
 
    HYPRE_Int matrix_C_num_cols_offd;
@@ -433,24 +437,22 @@ hypre_ParCSRBlockMatrixConvertFromParCSRMatrix(hypre_ParCSRMatrix *matrix,
    HYPRE_Complex * offd_data = hypre_CSRMatrixData(offd);
 
    hypre_ParCSRBlockMatrix *matrix_C;
-   HYPRE_BigInt *matrix_C_row_starts;
-   HYPRE_BigInt *matrix_C_col_starts;
+   HYPRE_BigInt matrix_C_row_starts[2];
+   HYPRE_BigInt matrix_C_col_starts[2];
    hypre_CSRBlockMatrix *matrix_C_diag;
    hypre_CSRBlockMatrix *matrix_C_offd;
 
-   HYPRE_Int *matrix_C_offd_i=NULL, *matrix_C_offd_j = NULL;
+   HYPRE_Int *matrix_C_offd_i = NULL, *matrix_C_offd_j = NULL;
    HYPRE_Complex *matrix_C_offd_data = NULL;
 
    HYPRE_Int num_procs, i, j, k, k_map, count, index, start_index, pos, row;
 
-   hypre_MPI_Comm_size(comm,&num_procs);
+   hypre_MPI_Comm_size(comm, &num_procs);
 
-   matrix_C_row_starts = hypre_CTAlloc(HYPRE_BigInt,  2, HYPRE_MEMORY_HOST);
-   matrix_C_col_starts = hypre_CTAlloc(HYPRE_BigInt,  2, HYPRE_MEMORY_HOST);
-   for(i = 0; i < 2; i++)
+   for (i = 0; i < 2; i++)
    {
-      matrix_C_row_starts[i] = row_starts[i]/(HYPRE_BigInt)matrix_C_block_size;
-      matrix_C_col_starts[i] = col_starts[i]/(HYPRE_BigInt)matrix_C_block_size;
+      matrix_C_row_starts[i] = row_starts[i] / (HYPRE_BigInt)matrix_C_block_size;
+      matrix_C_col_starts[i] = col_starts[i] / (HYPRE_BigInt)matrix_C_block_size;
    }
 
    /************* create the diagonal part ************/
@@ -466,7 +468,7 @@ hypre_ParCSRBlockMatrixConvertFromParCSRMatrix(hypre_ParCSRMatrix *matrix,
    /* figure out the new number of offd columns (num rows is same as diag) */
    num_cols_offd = hypre_CSRMatrixNumCols(offd);
    num_rows = hypre_CSRMatrixNumRows(diag);
-   num_nodes =  num_rows/matrix_C_block_size;
+   num_nodes =  num_rows / matrix_C_block_size;
 
    matrix_C_offd_i = hypre_CTAlloc(HYPRE_Int,  num_nodes + 1, HYPRE_MEMORY_HOST);
 
@@ -478,11 +480,11 @@ hypre_ParCSRBlockMatrixConvertFromParCSRMatrix(hypre_ParCSRMatrix *matrix,
    {
       map_to_node = hypre_CTAlloc(HYPRE_BigInt,  num_cols_offd, HYPRE_MEMORY_HOST);
       matrix_C_num_cols_offd = 1;
-      map_to_node[0] = col_map_offd[0]/(HYPRE_BigInt)matrix_C_block_size;
-      for (i=1; i < num_cols_offd; i++)
+      map_to_node[0] = col_map_offd[0] / (HYPRE_BigInt)matrix_C_block_size;
+      for (i = 1; i < num_cols_offd; i++)
       {
-         map_to_node[i] = col_map_offd[i]/(HYPRE_BigInt)matrix_C_block_size;
-         if (map_to_node[i] > map_to_node[i-1]) matrix_C_num_cols_offd++;
+         map_to_node[i] = col_map_offd[i] / (HYPRE_BigInt)matrix_C_block_size;
+         if (map_to_node[i] > map_to_node[i - 1]) { matrix_C_num_cols_offd++; }
       }
 
       matrix_C_col_map_offd = hypre_CTAlloc(HYPRE_BigInt,  matrix_C_num_cols_offd, HYPRE_MEMORY_HOST);
@@ -495,9 +497,9 @@ hypre_ParCSRBlockMatrixConvertFromParCSRMatrix(hypre_ParCSRMatrix *matrix,
 
       /* fill in the col_map_off_d - these are global numbers.  Then we need to
          map these to j entries (these have local numbers) */
-      for (i=1; i < num_cols_offd; i++)
+      for (i = 1; i < num_cols_offd; i++)
       {
-         if (map_to_node[i] > map_to_node[i-1])
+         if (map_to_node[i] > map_to_node[i - 1])
          {
             matrix_C_col_map_offd[count++] = map_to_node[i];
          }
@@ -507,16 +509,18 @@ hypre_ParCSRBlockMatrixConvertFromParCSRMatrix(hypre_ParCSRMatrix *matrix,
       /* now figure the nonzeros */
       matrix_C_num_nonzeros_offd = 0;
       counter = hypre_CTAlloc(HYPRE_Int,  matrix_C_num_cols_offd, HYPRE_MEMORY_HOST);
-      for (i=0; i < matrix_C_num_cols_offd; i++)
+      for (i = 0; i < matrix_C_num_cols_offd; i++)
+      {
          counter[i] = -1;
+      }
 
-      for (i=0; i < num_nodes; i++) /* for each block row */
+      for (i = 0; i < num_nodes; i++) /* for each block row */
       {
          matrix_C_offd_i[i] = matrix_C_num_nonzeros_offd;
-         for (j=0; j < matrix_C_block_size; j++)
+         for (j = 0; j < matrix_C_block_size; j++)
          {
-            row = i*matrix_C_block_size+j;
-            for (k=offd_i[row]; k < offd_i[row+1]; k++) /* go through single row */
+            row = i * matrix_C_block_size + j;
+            for (k = offd_i[row]; k < offd_i[row + 1]; k++) /* go through single row */
             {
                k_map = col_in_j_map[offd_j[k]]; /*nodal col - see if this has
                                                   been in this block row (i)
@@ -549,23 +553,25 @@ hypre_ParCSRBlockMatrixConvertFromParCSRMatrix(hypre_ParCSRMatrix *matrix,
       matrix_C_offd_j = hypre_CTAlloc(HYPRE_Int,  matrix_C_num_nonzeros_offd, HYPRE_MEMORY_HOST);
       matrix_C_offd_data =
          hypre_CTAlloc(HYPRE_Complex,
-                       matrix_C_num_nonzeros_offd*matrix_C_block_size*
+                       matrix_C_num_nonzeros_offd * matrix_C_block_size *
                        matrix_C_block_size, HYPRE_MEMORY_HOST);
       hypre_CSRBlockMatrixJ(matrix_C_offd) = matrix_C_offd_j;
       hypre_CSRMatrixData(matrix_C_offd) = matrix_C_offd_data;
 
-      for (i=0; i < matrix_C_num_cols_offd; i++)
+      for (i = 0; i < matrix_C_num_cols_offd; i++)
+      {
          counter[i] = -1;
+      }
 
       index = 0; /*keep track of entry in matrix_C_offd_j*/
       start_index = 0;
-      for (i=0; i < num_nodes; i++) /* for each block row */
+      for (i = 0; i < num_nodes; i++) /* for each block row */
       {
 
-         for (j=0; j < matrix_C_block_size; j++) /* for each row in block */
+         for (j = 0; j < matrix_C_block_size; j++) /* for each row in block */
          {
-            row = i*matrix_C_block_size+j;
-            for (k=offd_i[row]; k < offd_i[row+1]; k++) /* go through single row's cols */
+            row = i * matrix_C_block_size + j;
+            for (k = offd_i[row]; k < offd_i[row + 1]; k++) /* go through single row's cols */
             {
                k_map = col_in_j_map[offd_j[k]]; /*nodal col  for off_d */
                if (counter[k_map] < start_index) /* not yet counted for this nodal row */
@@ -574,7 +580,7 @@ hypre_ParCSRBlockMatrixConvertFromParCSRMatrix(hypre_ParCSRMatrix *matrix,
                   matrix_C_offd_j[index] = k_map;
                   /*copy the data: which position (corresponds to j array) + which row + which col */
                   pos =  (index * matrix_C_block_size * matrix_C_block_size) + (j * matrix_C_block_size) +
-                     (HYPRE_Int)(col_map_offd[offd_j[k]]%(HYPRE_BigInt)matrix_C_block_size);
+                         (HYPRE_Int)(col_map_offd[offd_j[k]] % (HYPRE_BigInt)matrix_C_block_size);
                   matrix_C_offd_data[pos] = offd_data[k];
                   index ++;
                }
@@ -582,8 +588,8 @@ hypre_ParCSRBlockMatrixConvertFromParCSRMatrix(hypre_ParCSRMatrix *matrix,
                {
 
                   /*copy the data: which position (corresponds to j array) + which row + which col */
-                  pos =  (counter[k_map]* matrix_C_block_size * matrix_C_block_size) + (j * matrix_C_block_size) +
-                     (HYPRE_Int)(col_map_offd[offd_j[k]]%(HYPRE_BigInt)(matrix_C_block_size));
+                  pos =  (counter[k_map] * matrix_C_block_size * matrix_C_block_size) + (j * matrix_C_block_size) +
+                         (HYPRE_Int)(col_map_offd[offd_j[k]] % (HYPRE_BigInt)(matrix_C_block_size));
                   matrix_C_offd_data[pos] = offd_data[k];
                }
             }
@@ -594,8 +600,8 @@ hypre_ParCSRBlockMatrixConvertFromParCSRMatrix(hypre_ParCSRMatrix *matrix,
 
    /* *********create the new matrix  *************/
    matrix_C = hypre_ParCSRBlockMatrixCreate(comm, matrix_C_block_size,
-                                            global_num_rows/(HYPRE_BigInt)matrix_C_block_size,
-                                            global_num_cols/(HYPRE_BigInt)matrix_C_block_size,
+                                            global_num_rows / (HYPRE_BigInt)matrix_C_block_size,
+                                            global_num_cols / (HYPRE_BigInt)matrix_C_block_size,
                                             matrix_C_row_starts,
                                             matrix_C_col_starts,
                                             matrix_C_num_cols_offd,
@@ -618,8 +624,6 @@ hypre_ParCSRBlockMatrixConvertFromParCSRMatrix(hypre_ParCSRMatrix *matrix,
    hypre_TFree(map_to_node, HYPRE_MEMORY_HOST);
    hypre_TFree(col_in_j_map, HYPRE_MEMORY_HOST);
    hypre_TFree(counter, HYPRE_MEMORY_HOST);
-   hypre_TFree(matrix_C_row_starts, HYPRE_MEMORY_HOST);
-   hypre_TFree(matrix_C_col_starts, HYPRE_MEMORY_HOST);
 
    return matrix_C;
 }
@@ -631,11 +635,9 @@ hypre_ParCSRBlockMatrixConvertFromParCSRMatrix(hypre_ParCSRMatrix *matrix,
 HYPRE_Int
 hypre_BlockMatvecCommPkgCreate(hypre_ParCSRBlockMatrix *A)
 {
-
    HYPRE_Int        num_recvs, *recv_procs, *recv_vec_starts;
-
    HYPRE_Int        num_sends, *send_procs, *send_map_starts;
-   HYPRE_Int        *send_map_elmts;
+   HYPRE_Int       *send_map_elmts;
 
    HYPRE_Int        num_cols_off_d;
    HYPRE_BigInt    *col_map_off_d;
@@ -643,10 +645,9 @@ hypre_BlockMatvecCommPkgCreate(hypre_ParCSRBlockMatrix *A)
    HYPRE_BigInt     first_col_diag;
    HYPRE_BigInt     global_num_cols;
 
+   MPI_Comm         comm;
 
-   MPI_Comm   comm;
-
-   hypre_ParCSRCommPkg   *comm_pkg;
+   hypre_ParCSRCommPkg   *comm_pkg = NULL;
    hypre_IJAssumedPart   *apart;
 
    /*-----------------------------------------------------------
@@ -662,7 +663,7 @@ hypre_BlockMatvecCommPkgCreate(hypre_ParCSRBlockMatrix *A)
    first_col_diag = hypre_ParCSRBlockMatrixFirstColDiag(A);
 
    /* Create the assumed partition */
-   if  (hypre_ParCSRBlockMatrixAssumedPartition(A) == NULL)
+   if (hypre_ParCSRBlockMatrixAssumedPartition(A) == NULL)
    {
       hypre_ParCSRBlockMatrixCreateAssumedPartition(A);
    }
@@ -696,18 +697,11 @@ hypre_BlockMatvecCommPkgCreate(hypre_ParCSRBlockMatrix *A)
     * setup commpkg
     *----------------------------------------------------------*/
 
-   comm_pkg = hypre_CTAlloc(hypre_ParCSRCommPkg,  1, HYPRE_MEMORY_HOST);
-
-   hypre_ParCSRCommPkgComm(comm_pkg) = comm;
-
-   hypre_ParCSRCommPkgNumRecvs(comm_pkg) = num_recvs;
-   hypre_ParCSRCommPkgRecvProcs(comm_pkg) = recv_procs;
-   hypre_ParCSRCommPkgRecvVecStarts(comm_pkg) = recv_vec_starts;
-
-   hypre_ParCSRCommPkgNumSends(comm_pkg) = num_sends;
-   hypre_ParCSRCommPkgSendProcs(comm_pkg) = send_procs;
-   hypre_ParCSRCommPkgSendMapStarts(comm_pkg) = send_map_starts;
-   hypre_ParCSRCommPkgSendMapElmts(comm_pkg) = send_map_elmts;
+   hypre_ParCSRCommPkgCreateAndFill(comm,
+                                    num_recvs, recv_procs, recv_vec_starts,
+                                    num_sends, send_procs, send_map_starts,
+                                    send_map_elmts,
+                                    &comm_pkg);
 
    hypre_ParCSRBlockMatrixCommPkg(A) = comm_pkg;
 
@@ -737,7 +731,7 @@ hypre_ParCSRBlockMatrixExtractBExt(hypre_ParCSRBlockMatrix *B,
    HYPRE_Int *send_map_elmts = hypre_ParCSRCommPkgSendMapElmts(comm_pkg);
 
    hypre_ParCSRCommHandle *comm_handle;
-   hypre_ParCSRCommPkg *tmp_comm_pkg;
+   hypre_ParCSRCommPkg *tmp_comm_pkg = NULL;
 
    hypre_CSRBlockMatrix *diag = hypre_ParCSRBlockMatrixDiag(B);
 
@@ -753,7 +747,7 @@ hypre_ParCSRBlockMatrixExtractBExt(hypre_ParCSRBlockMatrix *B,
 
    HYPRE_Int *B_int_i;
    HYPRE_BigInt *B_int_j;
-   HYPRE_Complex *B_int_data;
+   HYPRE_Complex *B_int_data = NULL;
 
    HYPRE_Int num_cols_B, num_nonzeros;
    HYPRE_Int num_rows_B_ext;
@@ -763,7 +757,7 @@ hypre_ParCSRBlockMatrixExtractBExt(hypre_ParCSRBlockMatrix *B,
 
    HYPRE_Int *B_ext_i;
    HYPRE_BigInt *B_ext_j;
-   HYPRE_Complex *B_ext_data;
+   HYPRE_Complex *B_ext_data = NULL;
 
    HYPRE_Int *jdata_recv_vec_starts;
    HYPRE_Int *jdata_send_map_starts;
@@ -772,122 +766,134 @@ hypre_ParCSRBlockMatrixExtractBExt(hypre_ParCSRBlockMatrix *B,
    HYPRE_Int start_index;
    HYPRE_Int j_cnt, jrow;
 
-   hypre_MPI_Comm_size(comm,&num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_size(comm, &num_procs);
+   hypre_MPI_Comm_rank(comm, &my_id);
 
    bnnz = block_size * block_size;
    num_cols_B = hypre_ParCSRMatrixGlobalNumCols(B);
    num_rows_B_ext = recv_vec_starts[num_recvs];
-   B_int_i = hypre_CTAlloc(HYPRE_Int,  send_map_starts[num_sends]+1, HYPRE_MEMORY_HOST);
-   B_ext_i = hypre_CTAlloc(HYPRE_Int,  num_rows_B_ext+1, HYPRE_MEMORY_HOST);
-/*--------------------------------------------------------------------------
- * generate B_int_i through adding number of row-elements of offd and diag
- * for corresponding rows. B_int_i[j+1] contains the number of elements of
- * a row j (which is determined through send_map_elmts)
- *--------------------------------------------------------------------------*/
+   B_int_i = hypre_CTAlloc(HYPRE_Int,  send_map_starts[num_sends] + 1, HYPRE_MEMORY_HOST);
+   B_ext_i = hypre_CTAlloc(HYPRE_Int,  num_rows_B_ext + 1, HYPRE_MEMORY_HOST);
+   /*--------------------------------------------------------------------------
+    * generate B_int_i through adding number of row-elements of offd and diag
+    * for corresponding rows. B_int_i[j+1] contains the number of elements of
+    * a row j (which is determined through send_map_elmts)
+    *--------------------------------------------------------------------------*/
    B_int_i[0] = 0;
    j_cnt = 0;
    num_nonzeros = 0;
-   for (i=0; i < num_sends; i++)
+   for (i = 0; i < num_sends; i++)
    {
-      for (j = send_map_starts[i]; j < send_map_starts[i+1]; j++)
+      for (j = send_map_starts[i]; j < send_map_starts[i + 1]; j++)
       {
          jrow = send_map_elmts[j];
-         B_int_i[++j_cnt] = offd_i[jrow+1] - offd_i[jrow]
-            + diag_i[jrow+1] - diag_i[jrow];
+         B_int_i[++j_cnt] = offd_i[jrow + 1] - offd_i[jrow]
+                            + diag_i[jrow + 1] - diag_i[jrow];
          num_nonzeros += B_int_i[j_cnt];
       }
    }
 
-/*--------------------------------------------------------------------------
- * initialize communication
- *--------------------------------------------------------------------------*/
-   comm_handle = hypre_ParCSRCommHandleCreate(11,comm_pkg,
-                                              &B_int_i[1],&B_ext_i[1]);
+   /*--------------------------------------------------------------------------
+    * initialize communication
+    *--------------------------------------------------------------------------*/
+   comm_handle = hypre_ParCSRCommHandleCreate(11, comm_pkg,
+                                              &B_int_i[1], &B_ext_i[1]);
 
    B_int_j = hypre_CTAlloc(HYPRE_BigInt,  num_nonzeros, HYPRE_MEMORY_HOST);
-   if (data) B_int_data = hypre_CTAlloc(HYPRE_Complex,  num_nonzeros*bnnz, HYPRE_MEMORY_HOST);
+   if (data) { B_int_data = hypre_CTAlloc(HYPRE_Complex,  num_nonzeros * bnnz, HYPRE_MEMORY_HOST); }
 
-   jdata_send_map_starts = hypre_CTAlloc(HYPRE_Int,  num_sends+1, HYPRE_MEMORY_HOST);
-   jdata_recv_vec_starts = hypre_CTAlloc(HYPRE_Int,  num_recvs+1, HYPRE_MEMORY_HOST);
+   jdata_send_map_starts = hypre_CTAlloc(HYPRE_Int,  num_sends + 1, HYPRE_MEMORY_HOST);
+   jdata_recv_vec_starts = hypre_CTAlloc(HYPRE_Int,  num_recvs + 1, HYPRE_MEMORY_HOST);
    start_index = B_int_i[0];
    jdata_send_map_starts[0] = start_index;
    counter = 0;
-   for (i=0; i < num_sends; i++)
+   for (i = 0; i < num_sends; i++)
    {
       num_nonzeros = counter;
-      for (j = send_map_starts[i]; j < send_map_starts[i+1]; j++)
+      for (j = send_map_starts[i]; j < send_map_starts[i + 1]; j++)
       {
          jrow = send_map_elmts[j];
-         for (k=diag_i[jrow]; k < diag_i[jrow+1]; k++)
+         for (k = diag_i[jrow]; k < diag_i[jrow + 1]; k++)
          {
-            B_int_j[counter] = (HYPRE_BigInt)diag_j[k]+first_col_diag;
-            if (data) {
-               for(l = 0; l < bnnz; l++)
-                  B_int_data[counter*bnnz+ l] = diag_data[k*bnnz+ l];
+            B_int_j[counter] = (HYPRE_BigInt)diag_j[k] + first_col_diag;
+            if (data)
+            {
+               for (l = 0; l < bnnz; l++)
+               {
+                  B_int_data[counter * bnnz + l] = diag_data[k * bnnz + l];
+               }
             }
             counter++;
          }
-         for (k=offd_i[jrow]; k < offd_i[jrow+1]; k++)
+         for (k = offd_i[jrow]; k < offd_i[jrow + 1]; k++)
          {
             B_int_j[counter] = col_map_offd[offd_j[k]];
-            if (data) {
-               for(l = 0; l < bnnz; l++)
-                  B_int_data[counter*bnnz+ l] =
-                     offd_data[k*bnnz+ l];
+            if (data)
+            {
+               for (l = 0; l < bnnz; l++)
+                  B_int_data[counter * bnnz + l] =
+                     offd_data[k * bnnz + l];
             }
             counter++;
          }
       }
       num_nonzeros = counter - num_nonzeros;
       start_index += num_nonzeros;
-      jdata_send_map_starts[i+1] = start_index;
+      jdata_send_map_starts[i + 1] = start_index;
    }
 
-   tmp_comm_pkg = hypre_CTAlloc(hypre_ParCSRCommPkg, 1, HYPRE_MEMORY_HOST);
-   hypre_ParCSRCommPkgComm(tmp_comm_pkg) = comm;
-   hypre_ParCSRCommPkgNumSends(tmp_comm_pkg) = num_sends;
-   hypre_ParCSRCommPkgNumRecvs(tmp_comm_pkg) = num_recvs;
-   hypre_ParCSRCommPkgSendProcs(tmp_comm_pkg) = hypre_ParCSRCommPkgSendProcs(comm_pkg);
-   hypre_ParCSRCommPkgRecvProcs(tmp_comm_pkg) = hypre_ParCSRCommPkgRecvProcs(comm_pkg);
-   hypre_ParCSRCommPkgSendMapStarts(tmp_comm_pkg) = jdata_send_map_starts;
+   /* Create temporary communication package */
+   hypre_ParCSRCommPkgCreateAndFill(comm,
+                                    num_recvs,
+                                    hypre_ParCSRCommPkgRecvProcs(comm_pkg),
+                                    jdata_recv_vec_starts,
+                                    num_sends,
+                                    hypre_ParCSRCommPkgSendProcs(comm_pkg),
+                                    jdata_send_map_starts,
+                                    NULL,
+                                    &tmp_comm_pkg);
 
    hypre_ParCSRCommHandleDestroy(comm_handle);
    comm_handle = NULL;
 
-/*--------------------------------------------------------------------------
- * after communication exchange B_ext_i[j+1] contains the number of elements
- * of a row j !
- * evaluate B_ext_i and compute num_nonzeros for B_ext
- *--------------------------------------------------------------------------*/
+   /*--------------------------------------------------------------------------
+    * after communication exchange B_ext_i[j+1] contains the number of elements
+    * of a row j !
+    * evaluate B_ext_i and compute num_nonzeros for B_ext
+    *--------------------------------------------------------------------------*/
 
-   for (i=0; i < num_recvs; i++)
-      for (j = recv_vec_starts[i]; j < recv_vec_starts[i+1]; j++)
-         B_ext_i[j+1] += B_ext_i[j];
+   for (i = 0; i < num_recvs; i++)
+   {
+      for (j = recv_vec_starts[i]; j < recv_vec_starts[i + 1]; j++)
+      {
+         B_ext_i[j + 1] += B_ext_i[j];
+      }
+   }
 
    num_nonzeros = B_ext_i[num_rows_B_ext];
 
    B_ext = hypre_CSRBlockMatrixCreate(block_size, num_rows_B_ext, num_cols_B,
                                       num_nonzeros);
    B_ext_j = hypre_CTAlloc(HYPRE_BigInt,  num_nonzeros, HYPRE_MEMORY_HOST);
-   if (data) B_ext_data = hypre_CTAlloc(HYPRE_Complex,  num_nonzeros*bnnz, HYPRE_MEMORY_HOST);
+   if (data)
+   {
+      B_ext_data = hypre_CTAlloc(HYPRE_Complex,  num_nonzeros * bnnz, HYPRE_MEMORY_HOST);
+   }
 
-   for (i=0; i < num_recvs; i++)
+   for (i = 0; i < num_recvs; i++)
    {
       start_index = B_ext_i[recv_vec_starts[i]];
-      num_nonzeros = B_ext_i[recv_vec_starts[i+1]]-start_index;
-      jdata_recv_vec_starts[i+1] = B_ext_i[recv_vec_starts[i+1]];
+      num_nonzeros = B_ext_i[recv_vec_starts[i + 1]] - start_index;
+      jdata_recv_vec_starts[i + 1] = B_ext_i[recv_vec_starts[i + 1]];
    }
 
-   hypre_ParCSRCommPkgRecvVecStarts(tmp_comm_pkg) = jdata_recv_vec_starts;
-
-   comm_handle = hypre_ParCSRCommHandleCreate(21,tmp_comm_pkg,B_int_j,B_ext_j);
+   comm_handle = hypre_ParCSRCommHandleCreate(21, tmp_comm_pkg, B_int_j, B_ext_j);
    hypre_ParCSRCommHandleDestroy(comm_handle);
    comm_handle = NULL;
 
    if (data)
    {
-      comm_handle = hypre_ParCSRBlockCommHandleCreate(1, bnnz,tmp_comm_pkg,
+      comm_handle = hypre_ParCSRBlockCommHandleCreate(1, bnnz, tmp_comm_pkg,
                                                       B_int_data, B_ext_data);
       hypre_ParCSRBlockCommHandleDestroy(comm_handle);
       comm_handle = NULL;
@@ -895,17 +901,25 @@ hypre_ParCSRBlockMatrixExtractBExt(hypre_ParCSRBlockMatrix *B,
 
    hypre_CSRBlockMatrixI(B_ext) = B_ext_i;
    hypre_CSRBlockMatrixBigJ(B_ext) = B_ext_j;
-   if (data) hypre_CSRBlockMatrixData(B_ext) = B_ext_data;
+   if (data)
+   {
+      hypre_CSRBlockMatrixData(B_ext) = B_ext_data;
+   }
 
-   hypre_TFree(B_int_i, HYPRE_MEMORY_HOST);
-   hypre_TFree(B_int_j, HYPRE_MEMORY_HOST);
-   if (data) hypre_TFree(B_int_data, HYPRE_MEMORY_HOST);
+   /* Free memory */
    hypre_TFree(jdata_send_map_starts, HYPRE_MEMORY_HOST);
    hypre_TFree(jdata_recv_vec_starts, HYPRE_MEMORY_HOST);
    hypre_TFree(tmp_comm_pkg, HYPRE_MEMORY_HOST);
+   hypre_TFree(B_int_i, HYPRE_MEMORY_HOST);
+   hypre_TFree(B_int_j, HYPRE_MEMORY_HOST);
+   if (data)
+   {
+      hypre_TFree(B_int_data, HYPRE_MEMORY_HOST);
+   }
 
    return B_ext;
 }
+
 /*--------------------------------------------------------------------------
  * hypre_ParVectorCreateFromBlock
  *--------------------------------------------------------------------------*/
@@ -921,11 +935,11 @@ hypre_ParVectorCreateFromBlock(  MPI_Comm comm,
    HYPRE_BigInt new_partitioning[2]; /* need to create a new partitioning - son't want to write over
                                      what is passed in */
 
-   global_size = p_global_size*(HYPRE_BigInt)block_size;
+   global_size = p_global_size * (HYPRE_BigInt)block_size;
 
    vector = hypre_CTAlloc(hypre_ParVector, 1, HYPRE_MEMORY_HOST);
-   hypre_MPI_Comm_rank(comm,&my_id);
-   hypre_MPI_Comm_size(comm,&num_procs);
+   hypre_MPI_Comm_rank(comm, &my_id);
+   hypre_MPI_Comm_size(comm, &num_procs);
 
    if (!p_partitioning)
    {
@@ -933,8 +947,8 @@ hypre_ParVectorCreateFromBlock(  MPI_Comm comm,
    }
    else /* adjust for block_size */
    {
-      new_partitioning[0] = p_partitioning[0]*(HYPRE_BigInt)block_size;
-      new_partitioning[1] = p_partitioning[1]*(HYPRE_BigInt)block_size;
+      new_partitioning[0] = p_partitioning[0] * (HYPRE_BigInt)block_size;
+      new_partitioning[1] = p_partitioning[1] * (HYPRE_BigInt)block_size;
    }
 
    hypre_ParVectorComm(vector) = comm;
@@ -944,7 +958,7 @@ hypre_ParVectorCreateFromBlock(  MPI_Comm comm,
    hypre_ParVectorPartitioning(vector)[0] = new_partitioning[0];
    hypre_ParVectorPartitioning(vector)[1] = new_partitioning[1];
    hypre_ParVectorLocalVector(vector) =
-      hypre_SeqVectorCreate(new_partitioning[1]-new_partitioning[0]);
+      hypre_SeqVectorCreate(new_partitioning[1] - new_partitioning[0]);
 
    /* set defaults */
    hypre_ParVectorOwnsData(vector) = 1;
diff --git a/external/hypre/src/parcsr_block_mv/par_csr_block_matrix.h b/external/hypre/src/parcsr_block_mv/par_csr_block_matrix.h
index b349dafa..b5acdedb 100644
--- a/external/hypre/src/parcsr_block_mv/par_csr_block_matrix.h
+++ b/external/hypre/src/parcsr_block_mv/par_csr_block_matrix.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -37,15 +37,15 @@ typedef struct
    HYPRE_BigInt         first_row_index;
    HYPRE_BigInt         first_col_diag;
 
- /* need to know entire local range in case row_starts and col_starts
-    are null */
+   /* need to know entire local range in case row_starts and col_starts
+      are null */
    HYPRE_BigInt         last_row_index;
    HYPRE_BigInt         last_col_diag;
 
    hypre_CSRBlockMatrix *diag;
    hypre_CSRBlockMatrix *offd;
    HYPRE_BigInt         *col_map_offd;
-        /* maps columns of offd to global columns */
+   /* maps columns of offd to global columns */
    HYPRE_BigInt          row_starts[2];
    /* row_starts[0] is start of local rows
       row_starts[1] is start of next processor's rows */
@@ -294,9 +294,9 @@ void hypre_block_qsort( HYPRE_Int *v,
 
 
 void hypre_swap_blk( HYPRE_Complex *v,
-               HYPRE_Int block_size,
-               HYPRE_Int  i,
-               HYPRE_Int  j );
+                     HYPRE_Int block_size,
+                     HYPRE_Int  i,
+                     HYPRE_Int  j );
 
 
 #ifdef __cplusplus
diff --git a/external/hypre/src/parcsr_block_mv/par_csr_block_matvec.c b/external/hypre/src/parcsr_block_mv/par_csr_block_matvec.c
index f4ef1db4..bc26eb58 100644
--- a/external/hypre/src/parcsr_block_mv/par_csr_block_matvec.c
+++ b/external/hypre/src/parcsr_block_mv/par_csr_block_matvec.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -28,17 +28,17 @@ hypre_ParCSRBlockMatrixMatvec(HYPRE_Complex alpha,
                               HYPRE_Complex beta,
                               hypre_ParVector *y)
 {
-   hypre_ParCSRCommHandle *comm_handle;
+   hypre_ParCSRCommHandle *comm_handle = NULL;
    hypre_ParCSRCommPkg    *comm_pkg;
    hypre_CSRBlockMatrix   *diag, *offd;
-   hypre_Vector           *x_local, *y_local, *x_tmp;
+   hypre_Vector           *x_local, *y_local, *x_tmp = NULL;
    HYPRE_BigInt            num_rows, num_cols;
    HYPRE_Int               i, j, k, index;
    HYPRE_Int               blk_size, size;
    HYPRE_BigInt            x_size, y_size;
    HYPRE_Int               num_cols_offd, start, finish, elem;
    HYPRE_Int               ierr = 0, nprocs, num_sends, mypid;
-   HYPRE_Complex          *x_tmp_data, *x_buf_data, *x_local_data;
+   HYPRE_Complex          *x_tmp_data, *x_buf_data = NULL, *x_local_data;
 
    hypre_MPI_Comm_size(hypre_ParCSRBlockMatrixComm(A), &nprocs);
    hypre_MPI_Comm_rank(hypre_ParCSRBlockMatrixComm(A), &mypid);
@@ -59,13 +59,13 @@ hypre_ParCSRBlockMatrixMatvec(HYPRE_Complex alpha,
     *  Check for size compatibility.
     *--------------------------------------------------------------------*/
 
-   if (num_cols*(HYPRE_BigInt)blk_size != x_size) ierr = 11;
-   if (num_rows*(HYPRE_BigInt)blk_size != y_size) ierr = 12;
-   if (num_cols*(HYPRE_BigInt)blk_size != x_size && num_rows*(HYPRE_BigInt)blk_size != y_size) ierr = 13;
+   if (num_cols * (HYPRE_BigInt)blk_size != x_size) { ierr = 11; }
+   if (num_rows * (HYPRE_BigInt)blk_size != y_size) { ierr = 12; }
+   if (num_cols * (HYPRE_BigInt)blk_size != x_size && num_rows * (HYPRE_BigInt)blk_size != y_size) { ierr = 13; }
 
    if (nprocs > 1)
    {
-      x_tmp = hypre_SeqVectorCreate(num_cols_offd*blk_size);
+      x_tmp = hypre_SeqVectorCreate(num_cols_offd * blk_size);
       hypre_SeqVectorInitialize(x_tmp);
       x_tmp_data = hypre_VectorData(x_tmp);
 
@@ -75,21 +75,23 @@ hypre_ParCSRBlockMatrixMatvec(HYPRE_Complex alpha,
          comm_pkg = hypre_ParCSRBlockMatrixCommPkg(A);
       }
       num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
-      size = hypre_ParCSRCommPkgSendMapStart(comm_pkg,num_sends)*blk_size;
+      size = hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends) * blk_size;
       x_buf_data = hypre_CTAlloc(HYPRE_Complex,  size, HYPRE_MEMORY_HOST);
       index = 0;
       for (i = 0; i < num_sends; i++)
       {
          start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-         finish = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1);
+         finish = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1);
          for (j = start; j < finish; j++)
          {
-            elem = hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)*blk_size;
+            elem = hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j) * blk_size;
             for (k = 0; k < blk_size; k++)
+            {
                x_buf_data[index++] = x_local_data[elem++];
+            }
          }
       }
-      comm_handle = hypre_ParCSRBlockCommHandleCreate(1, blk_size,comm_pkg,
+      comm_handle = hypre_ParCSRBlockCommHandleCreate(1, blk_size, comm_pkg,
                                                       x_buf_data, x_tmp_data);
    }
    hypre_CSRBlockMatrixMatvec(alpha, diag, x_local, beta, y_local);
@@ -98,7 +100,9 @@ hypre_ParCSRBlockMatrixMatvec(HYPRE_Complex alpha,
       hypre_ParCSRBlockCommHandleDestroy(comm_handle);
       comm_handle = NULL;
       if (num_cols_offd)
-         hypre_CSRBlockMatrixMatvec(alpha,offd,x_tmp,1.0,y_local);
+      {
+         hypre_CSRBlockMatrixMatvec(alpha, offd, x_tmp, 1.0, y_local);
+      }
       hypre_SeqVectorDestroy(x_tmp);
       x_tmp = NULL;
       hypre_TFree(x_buf_data, HYPRE_MEMORY_HOST);
@@ -157,19 +161,25 @@ hypre_ParCSRBlockMatrixMatvecT( HYPRE_Complex    alpha,
     *  is informational only.
     *--------------------------------------------------------------------*/
 
-   if (num_rows*(HYPRE_BigInt)blk_size != x_size)
+   if (num_rows * (HYPRE_BigInt)blk_size != x_size)
+   {
       ierr = 1;
+   }
 
-   if (num_cols*(HYPRE_BigInt)blk_size != y_size)
+   if (num_cols * (HYPRE_BigInt)blk_size != y_size)
+   {
       ierr = 2;
+   }
 
-   if (num_rows*(HYPRE_BigInt)blk_size != x_size && num_cols*(HYPRE_BigInt)blk_size != y_size)
+   if (num_rows * (HYPRE_BigInt)blk_size != x_size && num_cols * (HYPRE_BigInt)blk_size != y_size)
+   {
       ierr = 3;
+   }
    /*-----------------------------------------------------------------------
     *-----------------------------------------------------------------------*/
 
 
-   y_tmp = hypre_SeqVectorCreate(num_cols_offd*blk_size);
+   y_tmp = hypre_SeqVectorCreate(num_cols_offd * blk_size);
    hypre_SeqVectorInitialize(y_tmp);
 
    /*---------------------------------------------------------------------
@@ -183,16 +193,16 @@ hypre_ParCSRBlockMatrixMatvecT( HYPRE_Complex    alpha,
    }
 
    num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
-   size = hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends)*blk_size;
+   size = hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends) * blk_size;
    y_buf_data = hypre_CTAlloc(HYPRE_Complex,  size, HYPRE_MEMORY_HOST);
 
    y_tmp_data = hypre_VectorData(y_tmp);
    y_local_data = hypre_VectorData(y_local);
 
-   if (num_cols_offd) hypre_CSRBlockMatrixMatvecT(alpha, offd, x_local, 0.0, y_tmp);
+   if (num_cols_offd) { hypre_CSRBlockMatrixMatvecT(alpha, offd, x_local, 0.0, y_tmp); }
 
    comm_handle = hypre_ParCSRBlockCommHandleCreate
-      ( 2, blk_size, comm_pkg, y_tmp_data, y_buf_data);
+                 ( 2, blk_size, comm_pkg, y_tmp_data, y_buf_data);
 
 
    hypre_CSRBlockMatrixMatvecT(alpha, diag, x_local, beta, y_local);
@@ -205,15 +215,15 @@ hypre_ParCSRBlockMatrixMatvecT( HYPRE_Complex    alpha,
    for (i = 0; i < num_sends; i++)
    {
       start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-      finish = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1);
+      finish = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1);
 
       for (j = start; j < finish; j++)
       {
-         elem =  hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)*blk_size;
+         elem =  hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j) * blk_size;
          for (k = 0; k < blk_size; k++)
          {
             y_local_data[elem++]
-               += y_buf_data[index++];
+            += y_buf_data[index++];
          }
       }
    }
diff --git a/external/hypre/src/parcsr_block_mv/par_csr_block_rap.c b/external/hypre/src/parcsr_block_mv/par_csr_block_rap.c
index 2dd0bd89..40974ade 100644
--- a/external/hypre/src/parcsr_block_mv/par_csr_block_rap.c
+++ b/external/hypre/src/parcsr_block_mv/par_csr_block_rap.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -32,7 +32,7 @@ hypre_ExchangeRAPBlockData(hypre_CSRBlockMatrix *RAP_int,
    HYPRE_Int *send_procs = hypre_ParCSRCommPkgSendProcs(comm_pkg_RT);
    HYPRE_Int *send_map_starts = hypre_ParCSRCommPkgSendMapStarts(comm_pkg_RT);
 
-/*   HYPRE_Int block_size = hypre_CSRBlockMatrixBlockSize(RAP_int); */
+   /*   HYPRE_Int block_size = hypre_CSRBlockMatrixBlockSize(RAP_int); */
 
    hypre_CSRBlockMatrix *RAP_ext;
 
@@ -41,7 +41,7 @@ hypre_ExchangeRAPBlockData(hypre_CSRBlockMatrix *RAP_int,
    HYPRE_Complex *RAP_ext_data = NULL;
 
    hypre_ParCSRCommHandle *comm_handle = NULL;
-   hypre_ParCSRCommPkg *tmp_comm_pkg;
+   hypre_ParCSRCommPkg *tmp_comm_pkg = NULL;
 
    HYPRE_Int *jdata_recv_vec_starts;
    HYPRE_Int *jdata_send_map_starts;
@@ -51,20 +51,20 @@ hypre_ExchangeRAPBlockData(hypre_CSRBlockMatrix *RAP_int,
    HYPRE_Int i, j, bnnz;
    HYPRE_Int num_procs, my_id;
 
-   hypre_MPI_Comm_size(comm,&num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_size(comm, &num_procs);
+   hypre_MPI_Comm_rank(comm, &my_id);
 
    bnnz = block_size * block_size;
 
-   RAP_ext_i = hypre_CTAlloc(HYPRE_Int,  send_map_starts[num_sends]+1, HYPRE_MEMORY_HOST);
-   jdata_recv_vec_starts = hypre_CTAlloc(HYPRE_Int,  num_recvs+1, HYPRE_MEMORY_HOST);
-   jdata_send_map_starts = hypre_CTAlloc(HYPRE_Int,  num_sends+1, HYPRE_MEMORY_HOST);
+   RAP_ext_i = hypre_CTAlloc(HYPRE_Int,  send_map_starts[num_sends] + 1, HYPRE_MEMORY_HOST);
+   jdata_recv_vec_starts = hypre_CTAlloc(HYPRE_Int,  num_recvs + 1, HYPRE_MEMORY_HOST);
+   jdata_send_map_starts = hypre_CTAlloc(HYPRE_Int,  num_sends + 1, HYPRE_MEMORY_HOST);
 
-/*--------------------------------------------------------------------------
- * recompute RAP_int_i so that RAP_int_i[j+1] contains the number of
- * elements of row j (to be determined through send_map_elmnts on the
- * receiving end)
- *--------------------------------------------------------------------------*/
+   /*--------------------------------------------------------------------------
+    * recompute RAP_int_i so that RAP_int_i[j+1] contains the number of
+    * elements of row j (to be determined through send_map_elmnts on the
+    * receiving end)
+    *--------------------------------------------------------------------------*/
 
    if (num_recvs)
    {
@@ -74,69 +74,79 @@ hypre_ExchangeRAPBlockData(hypre_CSRBlockMatrix *RAP_int,
       num_cols = hypre_CSRBlockMatrixNumCols(RAP_int);
    }
    jdata_recv_vec_starts[0] = 0;
-   for (i=0; i < num_recvs; i++)
-      jdata_recv_vec_starts[i+1] = RAP_int_i[recv_vec_starts[i+1]];
+   for (i = 0; i < num_recvs; i++)
+   {
+      jdata_recv_vec_starts[i + 1] = RAP_int_i[recv_vec_starts[i + 1]];
+   }
 
-   for (i=num_recvs; i > 0; i--)
-      for (j = recv_vec_starts[i]; j > recv_vec_starts[i-1]; j--)
-         RAP_int_i[j] -= RAP_int_i[j-1];
+   for (i = num_recvs; i > 0; i--)
+      for (j = recv_vec_starts[i]; j > recv_vec_starts[i - 1]; j--)
+      {
+         RAP_int_i[j] -= RAP_int_i[j - 1];
+      }
 
-/*--------------------------------------------------------------------------
- * initialize communication
- *--------------------------------------------------------------------------*/
+   /*--------------------------------------------------------------------------
+    * initialize communication
+    *--------------------------------------------------------------------------*/
 
    if (num_recvs && num_sends)
-      comm_handle = hypre_ParCSRCommHandleCreate(12,comm_pkg_RT,
+   {
+      comm_handle = hypre_ParCSRCommHandleCreate(12, comm_pkg_RT,
                                                  &RAP_int_i[1], &RAP_ext_i[1]);
+   }
    else if (num_recvs)
-      comm_handle = hypre_ParCSRCommHandleCreate(12,comm_pkg_RT,
+   {
+      comm_handle = hypre_ParCSRCommHandleCreate(12, comm_pkg_RT,
                                                  &RAP_int_i[1], NULL);
+   }
    else if (num_sends)
-      comm_handle = hypre_ParCSRCommHandleCreate(12,comm_pkg_RT,
+   {
+      comm_handle = hypre_ParCSRCommHandleCreate(12, comm_pkg_RT,
                                                  NULL, &RAP_ext_i[1]);
+   }
 
-   tmp_comm_pkg = hypre_CTAlloc(hypre_ParCSRCommPkg,  1, HYPRE_MEMORY_HOST);
-   hypre_ParCSRCommPkgComm(tmp_comm_pkg) = comm;
-   hypre_ParCSRCommPkgNumSends(tmp_comm_pkg) = num_recvs;
-   hypre_ParCSRCommPkgNumRecvs(tmp_comm_pkg) = num_sends;
-   hypre_ParCSRCommPkgSendProcs(tmp_comm_pkg) = recv_procs;
-   hypre_ParCSRCommPkgRecvProcs(tmp_comm_pkg) = send_procs;
+   /* Create temporary communication package - note: send and recv are reversed */
+   hypre_ParCSRCommPkgCreateAndFill(comm,
+                                    num_sends, send_procs, jdata_send_map_starts,
+                                    num_recvs, recv_procs, jdata_recv_vec_starts,
+                                    NULL, &tmp_comm_pkg);
 
    hypre_ParCSRCommHandleDestroy(comm_handle);
    comm_handle = NULL;
 
-/*--------------------------------------------------------------------------
- * compute num_nonzeros for RAP_ext
- *--------------------------------------------------------------------------*/
+   /*--------------------------------------------------------------------------
+    * compute num_nonzeros for RAP_ext
+    *--------------------------------------------------------------------------*/
 
-   for (i=0; i < num_sends; i++)
-      for (j = send_map_starts[i]; j < send_map_starts[i+1]; j++)
-         RAP_ext_i[j+1] += RAP_ext_i[j];
+   for (i = 0; i < num_sends; i++)
+   {
+      for (j = send_map_starts[i]; j < send_map_starts[i + 1]; j++)
+      {
+         RAP_ext_i[j + 1] += RAP_ext_i[j];
+      }
+   }
 
    num_rows = send_map_starts[num_sends];
    num_nonzeros = RAP_ext_i[num_rows];
    if (num_nonzeros)
    {
       RAP_ext_j = hypre_CTAlloc(HYPRE_BigInt,  num_nonzeros, HYPRE_MEMORY_HOST);
-      RAP_ext_data = hypre_CTAlloc(HYPRE_Complex,  num_nonzeros*bnnz, HYPRE_MEMORY_HOST);
+      RAP_ext_data = hypre_CTAlloc(HYPRE_Complex,  num_nonzeros * bnnz, HYPRE_MEMORY_HOST);
    }
 
-   for (i=0; i < num_sends+1; i++)
+   for (i = 0; i < num_sends + 1; i++)
    {
       jdata_send_map_starts[i] = RAP_ext_i[send_map_starts[i]];
    }
 
-   hypre_ParCSRCommPkgRecvVecStarts(tmp_comm_pkg) = jdata_send_map_starts;
-   hypre_ParCSRCommPkgSendMapStarts(tmp_comm_pkg) = jdata_recv_vec_starts;
-
    comm_handle = hypre_ParCSRBlockCommHandleCreate(1, bnnz, tmp_comm_pkg,
                                                    (void *) RAP_int_data, (void *) RAP_ext_data);
    hypre_ParCSRBlockCommHandleDestroy(comm_handle);
    comm_handle = NULL;
 
-   comm_handle = hypre_ParCSRCommHandleCreate(21,tmp_comm_pkg,RAP_int_j,
+   comm_handle = hypre_ParCSRCommHandleCreate(21, tmp_comm_pkg, RAP_int_j,
                                               RAP_ext_j);
-   RAP_ext = hypre_CSRBlockMatrixCreate(block_size,num_rows,num_cols,
+   RAP_ext = hypre_CSRBlockMatrixCreate(block_size, num_rows, num_cols,
                                         num_nonzeros);
 
    hypre_CSRBlockMatrixI(RAP_ext) = RAP_ext_i;
@@ -146,12 +156,12 @@ hypre_ExchangeRAPBlockData(hypre_CSRBlockMatrix *RAP_int,
       hypre_CSRBlockMatrixData(RAP_ext) = RAP_ext_data;
    }
 
-   hypre_ParCSRCommHandleDestroy(comm_handle);
-   comm_handle = NULL;
-
+   /* Free memory */
    hypre_TFree(jdata_recv_vec_starts, HYPRE_MEMORY_HOST);
    hypre_TFree(jdata_send_map_starts, HYPRE_MEMORY_HOST);
    hypre_TFree(tmp_comm_pkg, HYPRE_MEMORY_HOST);
+   hypre_ParCSRCommHandleDestroy(comm_handle);
+   comm_handle = NULL;
 
    return RAP_ext;
 }
@@ -176,7 +186,7 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
    hypre_ParCSRCommPkg   *comm_pkg_RT = hypre_ParCSRBlockMatrixCommPkg(RT);
    HYPRE_Int             num_recvs_RT = 0;
    HYPRE_Int             num_sends_RT = 0;
-   HYPRE_Int             *send_map_starts_RT;
+   HYPRE_Int             *send_map_starts_RT = NULL;
    HYPRE_Int             *send_map_elmts_RT;
 
    hypre_CSRBlockMatrix *A_diag = hypre_ParCSRBlockMatrixDiag(A);
@@ -213,34 +223,32 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
    HYPRE_Int  num_cols_diag_P = hypre_CSRBlockMatrixNumCols(P_diag);
    HYPRE_Int  num_cols_offd_P = hypre_CSRBlockMatrixNumCols(P_offd);
    HYPRE_BigInt *coarse_partitioning = hypre_ParCSRBlockMatrixColStarts(P);
-   HYPRE_BigInt *row_starts, *col_starts;
+   HYPRE_BigInt row_starts[2], col_starts[2];
 
    hypre_ParCSRBlockMatrix *RAP;
-   HYPRE_BigInt            *col_map_offd_RAP;
+   HYPRE_BigInt            *col_map_offd_RAP = NULL;
 
-   hypre_CSRBlockMatrix *RAP_int = NULL;
+   hypre_CSRBlockMatrix  *RAP_int = NULL;
 
    HYPRE_Complex         *RAP_int_data;
    HYPRE_Int             *RAP_int_i;
    HYPRE_BigInt          *RAP_int_j;
 
-   hypre_CSRBlockMatrix *RAP_ext;
-
-   HYPRE_Complex         *RAP_ext_data;
-   HYPRE_Int             *RAP_ext_i;
-   HYPRE_BigInt          *RAP_ext_j;
+   hypre_CSRBlockMatrix  *RAP_ext       = NULL;
 
-   hypre_CSRBlockMatrix *RAP_diag;
+   HYPRE_Complex         *RAP_ext_data  = NULL;
+   HYPRE_Int             *RAP_ext_i     = NULL;
+   HYPRE_BigInt          *RAP_ext_j     = NULL;
 
-   HYPRE_Complex         *RAP_diag_data;
-   HYPRE_Int             *RAP_diag_i;
-   HYPRE_Int             *RAP_diag_j;
+   hypre_CSRBlockMatrix  *RAP_diag;
+   HYPRE_Complex         *RAP_diag_data = NULL;
+   HYPRE_Int             *RAP_diag_i    = NULL;
+   HYPRE_Int             *RAP_diag_j    = NULL;
 
-   hypre_CSRBlockMatrix *RAP_offd;
-
-   HYPRE_Complex         *RAP_offd_data;
-   HYPRE_Int             *RAP_offd_i;
-   HYPRE_Int             *RAP_offd_j;
+   hypre_CSRBlockMatrix  *RAP_offd;
+   HYPRE_Complex         *RAP_offd_data = NULL;
+   HYPRE_Int             *RAP_offd_i    = NULL;
+   HYPRE_Int             *RAP_offd_j    = NULL;
 
    HYPRE_Int              RAP_size;
    HYPRE_Int              RAP_ext_size;
@@ -248,48 +256,45 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
    HYPRE_Int              RAP_offd_size;
    HYPRE_Int              P_ext_diag_size;
    HYPRE_Int              P_ext_offd_size;
-   HYPRE_Int              first_col_diag_RAP;
-   HYPRE_Int              last_col_diag_RAP;
+   HYPRE_BigInt           first_col_diag_RAP;
+   HYPRE_BigInt           last_col_diag_RAP;
    HYPRE_Int              num_cols_offd_RAP = 0;
 
-   hypre_CSRBlockMatrix *R_diag;
-
-   HYPRE_Complex         *R_diag_data;
-   HYPRE_Int             *R_diag_i;
-   HYPRE_Int             *R_diag_j;
-
-   hypre_CSRBlockMatrix *R_offd;
-
-   HYPRE_Complex         *R_offd_data;
-   HYPRE_Int             *R_offd_i;
-   HYPRE_Int             *R_offd_j;
+   hypre_CSRBlockMatrix  *R_diag;
+   HYPRE_Complex         *R_diag_data = NULL;
+   HYPRE_Int             *R_diag_i    = NULL;
+   HYPRE_Int             *R_diag_j    = NULL;
 
-   hypre_CSRBlockMatrix *Ps_ext;
+   hypre_CSRBlockMatrix  *R_offd;
+   HYPRE_Complex         *R_offd_data = NULL;
+   HYPRE_Int             *R_offd_i    = NULL;
+   HYPRE_Int             *R_offd_j    = NULL;
 
-   HYPRE_Complex         *Ps_ext_data;
-   HYPRE_Int             *Ps_ext_i;
-   HYPRE_BigInt          *Ps_ext_j;
+   hypre_CSRBlockMatrix  *Ps_ext          = NULL;
+   HYPRE_Complex         *Ps_ext_data     = NULL;
+   HYPRE_Int             *Ps_ext_i        = NULL;
+   HYPRE_BigInt          *Ps_ext_j        = NULL;
 
-   HYPRE_Complex         *P_ext_diag_data;
-   HYPRE_Int             *P_ext_diag_i;
-   HYPRE_Int             *P_ext_diag_j;
+   HYPRE_Complex         *P_ext_diag_data = NULL;
+   HYPRE_Int             *P_ext_diag_i    = NULL;
+   HYPRE_Int             *P_ext_diag_j    = NULL;
 
-   HYPRE_Complex         *P_ext_offd_data;
-   HYPRE_Int             *P_ext_offd_i;
-   HYPRE_Int             *P_ext_offd_j;
+   HYPRE_Complex         *P_ext_offd_data = NULL;
+   HYPRE_Int             *P_ext_offd_i    = NULL;
+   HYPRE_Int             *P_ext_offd_j    = NULL;
 
-   HYPRE_BigInt          *col_map_offd_Pext;
-   HYPRE_Int             *map_P_to_Pext;
-   HYPRE_Int             *map_P_to_RAP;
-   HYPRE_Int             *map_Pext_to_RAP;
+   HYPRE_BigInt          *col_map_offd_Pext = NULL;
+   HYPRE_Int             *map_P_to_Pext   = NULL;
+   HYPRE_Int             *map_P_to_RAP    = NULL;
+   HYPRE_Int             *map_Pext_to_RAP = NULL;
 
-   HYPRE_Int             *P_marker;
+   HYPRE_Int             *P_marker = NULL;
    HYPRE_Int            **P_mark_array;
    HYPRE_Int            **A_mark_array;
    HYPRE_Int             *A_marker;
    HYPRE_BigInt          *temp = NULL;
 
-   HYPRE_Int              n_coarse;
+   HYPRE_BigInt           n_coarse;
    HYPRE_Int              num_cols_offd_Pext = 0;
 
    HYPRE_Int              ic, i, j, k, bnnz, kk;
@@ -317,26 +322,26 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
     *  row-wise access to restriction .
     *-----------------------------------------------------------------------*/
 
-   hypre_MPI_Comm_size(comm,&num_procs);
+   hypre_MPI_Comm_size(comm, &num_procs);
    /* num_threads = hypre_NumThreads(); */
    num_threads = 1;
 
    bnnz = block_size * block_size;
-   r_a_products = hypre_TAlloc(HYPRE_Complex, bnnz , HYPRE_MEMORY_HOST);
-   r_a_p_products = hypre_TAlloc(HYPRE_Complex, bnnz , HYPRE_MEMORY_HOST);
+   r_a_products = hypre_TAlloc(HYPRE_Complex, bnnz, HYPRE_MEMORY_HOST);
+   r_a_p_products = hypre_TAlloc(HYPRE_Complex, bnnz, HYPRE_MEMORY_HOST);
 
    if (comm_pkg_RT)
    {
       num_recvs_RT = hypre_ParCSRCommPkgNumRecvs(comm_pkg_RT);
       num_sends_RT = hypre_ParCSRCommPkgNumSends(comm_pkg_RT);
-      send_map_starts_RT =hypre_ParCSRCommPkgSendMapStarts(comm_pkg_RT);
+      send_map_starts_RT = hypre_ParCSRCommPkgSendMapStarts(comm_pkg_RT);
       send_map_elmts_RT = hypre_ParCSRCommPkgSendMapElmts(comm_pkg_RT);
    }
 
-   hypre_CSRBlockMatrixTranspose(RT_diag,&R_diag,1);
+   hypre_CSRBlockMatrixTranspose(RT_diag, &R_diag, 1);
    if (num_cols_offd_RT)
    {
-      hypre_CSRBlockMatrixTranspose(RT_offd,&R_offd,1);
+      hypre_CSRBlockMatrixTranspose(RT_offd, &R_offd, 1);
       R_offd_data = hypre_CSRBlockMatrixData(R_offd);
       R_offd_i    = hypre_CSRBlockMatrixI(R_offd);
       R_offd_j    = hypre_CSRBlockMatrixJ(R_offd);
@@ -361,77 +366,93 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
 
    if (num_procs > 1)
    {
-      Ps_ext = hypre_ParCSRBlockMatrixExtractBExt(P,A,1);
+      Ps_ext = hypre_ParCSRBlockMatrixExtractBExt(P, A, 1);
       Ps_ext_data = hypre_CSRBlockMatrixData(Ps_ext);
       Ps_ext_i    = hypre_CSRBlockMatrixI(Ps_ext);
       Ps_ext_j    = hypre_CSRBlockMatrixBigJ(Ps_ext);
    }
 
-   P_ext_diag_i = hypre_CTAlloc(HYPRE_Int, num_cols_offd_A+1, HYPRE_MEMORY_HOST);
-   P_ext_offd_i = hypre_CTAlloc(HYPRE_Int, num_cols_offd_A+1, HYPRE_MEMORY_HOST);
+   P_ext_diag_i = hypre_CTAlloc(HYPRE_Int, num_cols_offd_A + 1, HYPRE_MEMORY_HOST);
+   P_ext_offd_i = hypre_CTAlloc(HYPRE_Int, num_cols_offd_A + 1, HYPRE_MEMORY_HOST);
    P_ext_diag_size = 0;
    P_ext_offd_size = 0;
    last_col_diag_P = first_col_diag_P + (HYPRE_BigInt)num_cols_diag_P - 1;
 
-   for (i=0; i < num_cols_offd_A; i++)
+   for (i = 0; i < num_cols_offd_A; i++)
    {
-      for (j=Ps_ext_i[i]; j < Ps_ext_i[i+1]; j++)
+      for (j = Ps_ext_i[i]; j < Ps_ext_i[i + 1]; j++)
+      {
          if (Ps_ext_j[j] < first_col_diag_P || Ps_ext_j[j] > last_col_diag_P)
+         {
             P_ext_offd_size++;
+         }
          else
+         {
             P_ext_diag_size++;
-      P_ext_diag_i[i+1] = P_ext_diag_size;
-      P_ext_offd_i[i+1] = P_ext_offd_size;
+         }
+      }
+      P_ext_diag_i[i + 1] = P_ext_diag_size;
+      P_ext_offd_i[i + 1] = P_ext_offd_size;
    }
 
    if (P_ext_diag_size)
    {
       P_ext_diag_j = hypre_CTAlloc(HYPRE_Int,  P_ext_diag_size, HYPRE_MEMORY_HOST);
-      P_ext_diag_data = hypre_CTAlloc(HYPRE_Complex,  P_ext_diag_size*bnnz, HYPRE_MEMORY_HOST);
+      P_ext_diag_data = hypre_CTAlloc(HYPRE_Complex,  P_ext_diag_size * bnnz, HYPRE_MEMORY_HOST);
    }
    if (P_ext_offd_size)
    {
       P_ext_offd_j = hypre_CTAlloc(HYPRE_Int,  P_ext_offd_size, HYPRE_MEMORY_HOST);
-      P_ext_offd_data = hypre_CTAlloc(HYPRE_Complex,  P_ext_offd_size*bnnz, HYPRE_MEMORY_HOST);
+      P_ext_offd_data = hypre_CTAlloc(HYPRE_Complex,  P_ext_offd_size * bnnz, HYPRE_MEMORY_HOST);
    }
 
    cnt_offd = 0;
    cnt_diag = 0;
    cnt = 0;
-   for (i=0; i < num_cols_offd_A; i++)
+   for (i = 0; i < num_cols_offd_A; i++)
    {
-      for (j=Ps_ext_i[i]; j < Ps_ext_i[i+1]; j++)
+      for (j = Ps_ext_i[i]; j < Ps_ext_i[i + 1]; j++)
+      {
          if (Ps_ext_j[j] < first_col_diag_P || Ps_ext_j[j] > last_col_diag_P)
          {
             Ps_ext_j[cnt_offd] = Ps_ext_j[j];
             for (kk = 0; kk < bnnz; kk++)
-               P_ext_offd_data[cnt_offd*bnnz+kk] = Ps_ext_data[j*bnnz+kk];
+            {
+               P_ext_offd_data[cnt_offd * bnnz + kk] = Ps_ext_data[j * bnnz + kk];
+            }
             cnt_offd++;
          }
          else
          {
             P_ext_diag_j[cnt_diag] = (HYPRE_Int)(Ps_ext_j[j] - first_col_diag_P);
             for (kk = 0; kk < bnnz; kk++)
-               P_ext_diag_data[cnt_diag*bnnz+kk] = Ps_ext_data[j*bnnz+kk];
+            {
+               P_ext_diag_data[cnt_diag * bnnz + kk] = Ps_ext_data[j * bnnz + kk];
+            }
             cnt_diag++;
          }
+      }
    }
    if (P_ext_offd_size || num_cols_offd_P)
    {
-      temp = hypre_CTAlloc(HYPRE_BigInt,  P_ext_offd_size+num_cols_offd_P, HYPRE_MEMORY_HOST);
-      for (i=0; i < P_ext_offd_size; i++)
+      temp = hypre_CTAlloc(HYPRE_BigInt,  P_ext_offd_size + num_cols_offd_P, HYPRE_MEMORY_HOST);
+      for (i = 0; i < P_ext_offd_size; i++)
+      {
          temp[i] = Ps_ext_j[i];
+      }
       cnt = P_ext_offd_size;
-      for (i=0; i < num_cols_offd_P; i++)
+      for (i = 0; i < num_cols_offd_P; i++)
+      {
          temp[cnt++] = col_map_offd_P[i];
+      }
    }
    if (cnt)
    {
-      hypre_BigQsort0(temp, 0, cnt-1);
+      hypre_BigQsort0(temp, 0, cnt - 1);
 
       num_cols_offd_Pext = 1;
       value = temp[0];
-      for (i=1; i < cnt; i++)
+      for (i = 1; i < cnt; i++)
       {
          if (temp[i] > value)
          {
@@ -442,28 +463,37 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
    }
 
    if (num_cols_offd_Pext)
+   {
       col_map_offd_Pext = hypre_CTAlloc(HYPRE_BigInt, num_cols_offd_Pext, HYPRE_MEMORY_HOST);
+   }
 
-   for (i=0; i < num_cols_offd_Pext; i++)
+   for (i = 0; i < num_cols_offd_Pext; i++)
+   {
       col_map_offd_Pext[i] = temp[i];
+   }
 
    if (P_ext_offd_size || num_cols_offd_P)
+   {
       hypre_TFree(temp, HYPRE_MEMORY_HOST);
+   }
 
-   for (i=0 ; i < P_ext_offd_size; i++)
+   for (i = 0 ; i < P_ext_offd_size; i++)
+   {
       P_ext_offd_j[i] = hypre_BigBinarySearch(col_map_offd_Pext,
-                                           Ps_ext_j[i],
-                                           num_cols_offd_Pext);
+                                              Ps_ext_j[i],
+                                              num_cols_offd_Pext);
+   }
+
    if (num_cols_offd_P)
    {
       map_P_to_Pext = hypre_CTAlloc(HYPRE_Int, num_cols_offd_P, HYPRE_MEMORY_HOST);
 
       cnt = 0;
-      for (i=0; i < num_cols_offd_Pext; i++)
+      for (i = 0; i < num_cols_offd_Pext; i++)
          if (col_map_offd_Pext[i] == col_map_offd_P[cnt])
          {
             map_P_to_Pext[cnt++] = i;
-            if (cnt == num_cols_offd_P) break;
+            if (cnt == num_cols_offd_P) { break; }
          }
    }
 
@@ -487,17 +517,17 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
 
       for (ii = 0; ii < num_threads; ii++)
       {
-         size = num_cols_offd_RT/num_threads;
-         rest = num_cols_offd_RT - size*num_threads;
+         size = num_cols_offd_RT / num_threads;
+         rest = num_cols_offd_RT - size * num_threads;
          if (ii < rest)
          {
-            ns = ii*size+ii;
-            ne = (ii+1)*size+ii+1;
+            ns = ii * size + ii;
+            ne = (ii + 1) * size + ii + 1;
          }
          else
          {
-            ns = ii*size+rest;
-            ne = (ii+1)*size+rest;
+            ns = ii * size + rest;
+            ne = (ii + 1) * size + rest;
          }
 
          /*--------------------------------------------------------------------
@@ -506,7 +536,8 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
 
          if (num_cols_offd_Pext || num_cols_diag_P)
          {
-            P_mark_array[ii] = hypre_CTAlloc(HYPRE_Int, num_cols_diag_P+num_cols_offd_Pext, HYPRE_MEMORY_HOST);
+            P_mark_array[ii] = hypre_CTAlloc(HYPRE_Int, num_cols_diag_P + num_cols_offd_Pext,
+                                             HYPRE_MEMORY_HOST);
             P_marker = P_mark_array[ii];
          }
          A_mark_array[ii] = hypre_CTAlloc(HYPRE_Int,  num_nz_cols_A, HYPRE_MEMORY_HOST);
@@ -517,7 +548,7 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
           *--------------------------------------------------------------------*/
 
          jj_counter = start_indexing;
-         for (ic = 0; ic < num_cols_diag_P+num_cols_offd_Pext; ic++)
+         for (ic = 0; ic < num_cols_diag_P + num_cols_offd_Pext; ic++)
          {
             P_marker[ic] = -1;
          }
@@ -539,7 +570,7 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
              *  Loop over entries in row ic of R_offd.
              *-----------------------------------------------------------------*/
 
-            for (jj1 = R_offd_i[ic]; jj1 < R_offd_i[ic+1]; jj1++)
+            for (jj1 = R_offd_i[ic]; jj1 < R_offd_i[ic + 1]; jj1++)
             {
                i1  = R_offd_j[jj1];
 
@@ -547,7 +578,7 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
                 *  Loop over entries in row i1 of A_offd.
                 *--------------------------------------------------------------*/
 
-               for (jj2 = A_offd_i[i1]; jj2 < A_offd_i[i1+1]; jj2++)
+               for (jj2 = A_offd_i[i1]; jj2 < A_offd_i[i1 + 1]; jj2++)
                {
                   i2 = A_offd_j[jj2];
 
@@ -569,7 +600,7 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
                       *  Loop over entries in row i2 of P_ext.
                       *--------------------------------------------------------*/
 
-                     for (jj3=P_ext_diag_i[i2]; jj3 < P_ext_diag_i[i2+1]; jj3++)
+                     for (jj3 = P_ext_diag_i[i2]; jj3 < P_ext_diag_i[i2 + 1]; jj3++)
                      {
                         i3 = P_ext_diag_j[jj3];
 
@@ -585,7 +616,7 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
                            jj_counter++;
                         }
                      }
-                     for (jj3=P_ext_offd_i[i2]; jj3 < P_ext_offd_i[i2+1]; jj3++)
+                     for (jj3 = P_ext_offd_i[i2]; jj3 < P_ext_offd_i[i2 + 1]; jj3++)
                      {
                         i3 = P_ext_offd_j[jj3] + num_cols_diag_P;
 
@@ -607,7 +638,7 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
                 *  Loop over entries in row i1 of A_diag.
                 *--------------------------------------------------------------*/
 
-               for (jj2 = A_diag_i[i1]; jj2 < A_diag_i[i1+1]; jj2++)
+               for (jj2 = A_diag_i[i1]; jj2 < A_diag_i[i1 + 1]; jj2++)
                {
                   i2 = A_diag_j[jj2];
 
@@ -617,20 +648,20 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
                    * points.
                    *-----------------------------------------------------------*/
 
-                  if (A_marker[i2+num_cols_offd_A] != ic)
+                  if (A_marker[i2 + num_cols_offd_A] != ic)
                   {
 
                      /*--------------------------------------------------------
                       *  Mark i2 as visited.
                       *--------------------------------------------------------*/
 
-                     A_marker[i2+num_cols_offd_A] = ic;
+                     A_marker[i2 + num_cols_offd_A] = ic;
 
                      /*--------------------------------------------------------
                       *  Loop over entries in row i2 of P_diag.
                       *--------------------------------------------------------*/
 
-                     for (jj3 = P_diag_i[i2]; jj3 < P_diag_i[i2+1]; jj3++)
+                     for (jj3 = P_diag_i[i2]; jj3 < P_diag_i[i2 + 1]; jj3++)
                      {
                         i3 = P_diag_j[jj3];
 
@@ -651,7 +682,7 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
                       *  Loop over entries in row i2 of P_offd.
                       *--------------------------------------------------------*/
 
-                     for (jj3 = P_offd_i[i2]; jj3 < P_offd_i[i2+1]; jj3++)
+                     for (jj3 = P_offd_i[i2]; jj3 < P_offd_i[i2 + 1]; jj3++)
                      {
                         i3 = map_P_to_Pext[P_offd_j[jj3]] + num_cols_diag_P;
 
@@ -678,11 +709,11 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
        *  Allocate RAP_int_data and RAP_int_j arrays.
        *-----------------------------------------------------------------------*/
 
-      for (i = 0; i < num_threads-1; i++) jj_count[i+1] += jj_count[i];
+      for (i = 0; i < num_threads - 1; i++) { jj_count[i + 1] += jj_count[i]; }
 
-      RAP_size = jj_count[num_threads-1];
-      RAP_int_i = hypre_CTAlloc(HYPRE_Int,  num_cols_offd_RT+1, HYPRE_MEMORY_HOST);
-      RAP_int_data = hypre_CTAlloc(HYPRE_Complex,  RAP_size*bnnz, HYPRE_MEMORY_HOST);
+      RAP_size = jj_count[num_threads - 1];
+      RAP_int_i = hypre_CTAlloc(HYPRE_Int,  num_cols_offd_RT + 1, HYPRE_MEMORY_HOST);
+      RAP_int_data = hypre_CTAlloc(HYPRE_Complex,  RAP_size * bnnz, HYPRE_MEMORY_HOST);
       RAP_int_j    = hypre_CTAlloc(HYPRE_BigInt,  RAP_size, HYPRE_MEMORY_HOST);
       RAP_int_i[num_cols_offd_RT] = RAP_size;
 
@@ -692,17 +723,17 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
 
       for (ii = 0; ii < num_threads; ii++)
       {
-         size = num_cols_offd_RT/num_threads;
-         rest = num_cols_offd_RT - size*num_threads;
+         size = num_cols_offd_RT / num_threads;
+         rest = num_cols_offd_RT - size * num_threads;
          if (ii < rest)
          {
-            ns = ii*size+ii;
-            ne = (ii+1)*size+ii+1;
+            ns = ii * size + ii;
+            ne = (ii + 1) * size + ii + 1;
          }
          else
          {
-            ns = ii*size+rest;
-            ne = (ii+1)*size+rest;
+            ns = ii * size + rest;
+            ne = (ii + 1) * size + rest;
          }
 
          /*--------------------------------------------------------------------
@@ -710,13 +741,15 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
           *--------------------------------------------------------------------*/
 
          if (num_cols_offd_Pext || num_cols_diag_P)
+         {
             P_marker = P_mark_array[ii];
+         }
          A_marker = A_mark_array[ii];
 
          jj_counter = start_indexing;
-         if (ii > 0) jj_counter = jj_count[ii-1];
+         if (ii > 0) { jj_counter = jj_count[ii - 1]; }
 
-         for (ic = 0; ic < num_cols_diag_P+num_cols_offd_Pext; ic++)
+         for (ic = 0; ic < num_cols_diag_P + num_cols_offd_Pext; ic++)
          {
             P_marker[ic] = -1;
          }
@@ -738,20 +771,20 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
              *  Loop over entries in row ic of R_offd.
              *-----------------------------------------------------------------*/
 
-            for (jj1 = R_offd_i[ic]; jj1 < R_offd_i[ic+1]; jj1++)
+            for (jj1 = R_offd_i[ic]; jj1 < R_offd_i[ic + 1]; jj1++)
             {
                i1  = R_offd_j[jj1];
-               r_entries = &(R_offd_data[jj1*bnnz]);
+               r_entries = &(R_offd_data[jj1 * bnnz]);
 
                /*--------------------------------------------------------------
                 *  Loop over entries in row i1 of A_offd.
                 *--------------------------------------------------------------*/
 
-               for (jj2 = A_offd_i[i1]; jj2 < A_offd_i[i1+1]; jj2++)
+               for (jj2 = A_offd_i[i1]; jj2 < A_offd_i[i1 + 1]; jj2++)
                {
                   i2 = A_offd_j[jj2];
                   hypre_CSRBlockMatrixBlockMultAdd(r_entries,
-                                                   &(A_offd_data[jj2*bnnz]), zero,
+                                                   &(A_offd_data[jj2 * bnnz]), zero,
                                                    r_a_products, block_size);
 
                   /*-----------------------------------------------------------
@@ -771,11 +804,11 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
                       *  Loop over entries in row i2 of P_ext.
                       *--------------------------------------------------------*/
 
-                     for (jj3=P_ext_diag_i[i2]; jj3 < P_ext_diag_i[i2+1]; jj3++)
+                     for (jj3 = P_ext_diag_i[i2]; jj3 < P_ext_diag_i[i2 + 1]; jj3++)
                      {
                         i3 = P_ext_diag_j[jj3];
                         hypre_CSRBlockMatrixBlockMultAdd(r_a_products,
-                                                         &(P_ext_diag_data[jj3*bnnz]), zero,
+                                                         &(P_ext_diag_data[jj3 * bnnz]), zero,
                                                          r_a_p_products, block_size);
 
                         /*-----------------------------------------------------
@@ -788,7 +821,7 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
                         {
                            P_marker[i3] = jj_counter;
                            for (kk = 0; kk < bnnz; kk++)
-                              RAP_int_data[jj_counter*bnnz+kk] =
+                              RAP_int_data[jj_counter * bnnz + kk] =
                                  r_a_p_products[kk];
                            RAP_int_j[jj_counter] = i3 + first_col_diag_P;
                            jj_counter++;
@@ -796,15 +829,15 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
                         else
                         {
                            for (kk = 0; kk < bnnz; kk++)
-                              RAP_int_data[P_marker[i3]*bnnz+kk] +=
+                              RAP_int_data[P_marker[i3]*bnnz + kk] +=
                                  r_a_p_products[kk];
                         }
                      }
-                     for (jj3=P_ext_offd_i[i2]; jj3 < P_ext_offd_i[i2+1]; jj3++)
+                     for (jj3 = P_ext_offd_i[i2]; jj3 < P_ext_offd_i[i2 + 1]; jj3++)
                      {
                         i3 = P_ext_offd_j[jj3] + num_cols_diag_P;
                         hypre_CSRBlockMatrixBlockMultAdd(r_a_products,
-                                                         &(P_ext_offd_data[jj3*bnnz]), zero,
+                                                         &(P_ext_offd_data[jj3 * bnnz]), zero,
                                                          r_a_p_products, block_size);
 
                         /*--------------------------------------------------
@@ -817,16 +850,16 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
                         {
                            P_marker[i3] = jj_counter;
                            for (kk = 0; kk < bnnz; kk++)
-                              RAP_int_data[jj_counter*bnnz+kk] =
+                              RAP_int_data[jj_counter * bnnz + kk] =
                                  r_a_p_products[kk];
                            RAP_int_j[jj_counter]
-                              = col_map_offd_Pext[i3-num_cols_diag_P];
+                              = col_map_offd_Pext[i3 - num_cols_diag_P];
                            jj_counter++;
                         }
                         else
                         {
                            for (kk = 0; kk < bnnz; kk++)
-                              RAP_int_data[P_marker[i3]*bnnz+kk] +=
+                              RAP_int_data[P_marker[i3]*bnnz + kk] +=
                                  r_a_p_products[kk];
                         }
                      }
@@ -839,25 +872,27 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
 
                   else
                   {
-                     for (jj3=P_ext_diag_i[i2]; jj3 < P_ext_diag_i[i2+1]; jj3++)
+                     for (jj3 = P_ext_diag_i[i2]; jj3 < P_ext_diag_i[i2 + 1]; jj3++)
                      {
                         i3 = P_ext_diag_j[jj3];
                         hypre_CSRBlockMatrixBlockMultAdd(r_a_products,
-                                                         &(P_ext_diag_data[jj3*bnnz]), zero,
+                                                         &(P_ext_diag_data[jj3 * bnnz]), zero,
                                                          r_a_p_products, block_size);
                         for (kk = 0; kk < bnnz; kk++)
-                           RAP_int_data[P_marker[i3]*bnnz+kk] +=
+                           RAP_int_data[P_marker[i3]*bnnz + kk] +=
                               r_a_p_products[kk];
                      }
-                     for (jj3=P_ext_offd_i[i2]; jj3 < P_ext_offd_i[i2+1]; jj3++)
+                     for (jj3 = P_ext_offd_i[i2]; jj3 < P_ext_offd_i[i2 + 1]; jj3++)
                      {
                         i3 = P_ext_offd_j[jj3] + num_cols_diag_P;
                         hypre_CSRBlockMatrixBlockMultAdd(r_a_products,
-                                                         &(P_ext_offd_data[jj3*bnnz]), zero,
+                                                         &(P_ext_offd_data[jj3 * bnnz]), zero,
                                                          r_a_p_products, block_size);
                         ind = P_marker[i3] * bnnz;
                         for (kk = 0; kk < bnnz; kk++)
+                        {
                            RAP_int_data[ind++] += r_a_p_products[kk];
+                        }
                      }
                   }
                }
@@ -866,11 +901,11 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
                 *  Loop over entries in row i1 of A_diag.
                 *--------------------------------------------------------------*/
 
-               for (jj2 = A_diag_i[i1]; jj2 < A_diag_i[i1+1]; jj2++)
+               for (jj2 = A_diag_i[i1]; jj2 < A_diag_i[i1 + 1]; jj2++)
                {
                   i2 = A_diag_j[jj2];
                   hypre_CSRBlockMatrixBlockMultAdd(r_entries,
-                                                   &(A_diag_data[jj2*bnnz]), zero, r_a_products,
+                                                   &(A_diag_data[jj2 * bnnz]), zero, r_a_products,
                                                    block_size);
 
                   /*-----------------------------------------------------------
@@ -878,24 +913,24 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
                    *  visited. New entries in RAP only occur from unmarked points.
                    *-----------------------------------------------------------*/
 
-                  if (A_marker[i2+num_cols_offd_A] != ic)
+                  if (A_marker[i2 + num_cols_offd_A] != ic)
                   {
 
                      /*--------------------------------------------------------
                       *  Mark i2 as visited.
                       *--------------------------------------------------------*/
 
-                     A_marker[i2+num_cols_offd_A] = ic;
+                     A_marker[i2 + num_cols_offd_A] = ic;
 
                      /*--------------------------------------------------------
                       *  Loop over entries in row i2 of P_diag.
                       *--------------------------------------------------------*/
 
-                     for (jj3 = P_diag_i[i2]; jj3 < P_diag_i[i2+1]; jj3++)
+                     for (jj3 = P_diag_i[i2]; jj3 < P_diag_i[i2 + 1]; jj3++)
                      {
                         i3 = P_diag_j[jj3];
                         hypre_CSRBlockMatrixBlockMultAdd(r_a_products,
-                                                         &(P_diag_data[jj3*bnnz]), zero,
+                                                         &(P_diag_data[jj3 * bnnz]), zero,
                                                          r_a_p_products, block_size);
 
                         /*-----------------------------------------------------
@@ -909,7 +944,9 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
                            P_marker[i3] = jj_counter;
                            ind = jj_counter * bnnz;
                            for (kk = 0; kk < bnnz; kk++)
+                           {
                               RAP_int_data[ind++] = r_a_p_products[kk];
+                           }
                            RAP_int_j[jj_counter] = (HYPRE_BigInt)i3 + first_col_diag_P;
                            jj_counter++;
                         }
@@ -917,14 +954,16 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
                         {
                            ind = P_marker[i3] * bnnz;
                            for (kk = 0; kk < bnnz; kk++)
+                           {
                               RAP_int_data[ind++] += r_a_p_products[kk];
+                           }
                         }
                      }
-                     for (jj3 = P_offd_i[i2]; jj3 < P_offd_i[i2+1]; jj3++)
+                     for (jj3 = P_offd_i[i2]; jj3 < P_offd_i[i2 + 1]; jj3++)
                      {
                         i3 = map_P_to_Pext[P_offd_j[jj3]] + num_cols_diag_P;
                         hypre_CSRBlockMatrixBlockMultAdd(r_a_products,
-                                                         &(P_offd_data[jj3*bnnz]), zero,
+                                                         &(P_offd_data[jj3 * bnnz]), zero,
                                                          r_a_p_products, block_size);
 
                         /*-----------------------------------------------------
@@ -938,16 +977,20 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
                            P_marker[i3] = jj_counter;
                            ind = jj_counter * bnnz;
                            for (kk = 0; kk < bnnz; kk++)
+                           {
                               RAP_int_data[ind++] = r_a_p_products[kk];
+                           }
                            RAP_int_j[jj_counter] =
-                              col_map_offd_Pext[i3-num_cols_diag_P];
+                              col_map_offd_Pext[i3 - num_cols_diag_P];
                            jj_counter++;
                         }
                         else
                         {
                            ind = P_marker[i3] * bnnz;
                            for (kk = 0; kk < bnnz; kk++)
+                           {
                               RAP_int_data[ind++] += r_a_p_products[kk];
+                           }
                         }
                      }
                   }
@@ -959,37 +1002,43 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
 
                   else
                   {
-                     for (jj3 = P_diag_i[i2]; jj3 < P_diag_i[i2+1]; jj3++)
+                     for (jj3 = P_diag_i[i2]; jj3 < P_diag_i[i2 + 1]; jj3++)
                      {
                         i3 = P_diag_j[jj3];
                         hypre_CSRBlockMatrixBlockMultAdd(r_a_products,
-                                                         &(P_diag_data[jj3*bnnz]), zero,
+                                                         &(P_diag_data[jj3 * bnnz]), zero,
                                                          r_a_p_products, block_size);
                         ind = P_marker[i3] * bnnz;
                         for (kk = 0; kk < bnnz; kk++)
+                        {
                            RAP_int_data[ind++] += r_a_p_products[kk];
+                        }
                      }
-                     for (jj3 = P_offd_i[i2]; jj3 < P_offd_i[i2+1]; jj3++)
+                     for (jj3 = P_offd_i[i2]; jj3 < P_offd_i[i2 + 1]; jj3++)
                      {
                         i3 = map_P_to_Pext[P_offd_j[jj3]] + num_cols_diag_P;
                         hypre_CSRBlockMatrixBlockMultAdd(r_a_products,
-                                                         &(P_offd_data[jj3*bnnz]), zero,
+                                                         &(P_offd_data[jj3 * bnnz]), zero,
                                                          r_a_p_products, block_size);
                         ind = P_marker[i3] * bnnz;
                         for (kk = 0; kk < bnnz; kk++)
+                        {
                            RAP_int_data[ind++] += r_a_p_products[kk];
+                        }
                      }
                   }
                }
             }
          }
          if (num_cols_offd_Pext || num_cols_diag_P)
+         {
             hypre_TFree(P_mark_array[ii], HYPRE_MEMORY_HOST);
+         }
          hypre_TFree(A_mark_array[ii], HYPRE_MEMORY_HOST);
       }
 
-      RAP_int = hypre_CSRBlockMatrixCreate(block_size,num_cols_offd_RT,
-                                           num_rows_offd_RT,RAP_size);
+      RAP_int = hypre_CSRBlockMatrixCreate(block_size, num_cols_offd_RT,
+                                           num_rows_offd_RT, RAP_size);
       hypre_CSRBlockMatrixI(RAP_int) = RAP_int_i;
       hypre_CSRBlockMatrixBigJ(RAP_int) = RAP_int_j;
       hypre_CSRBlockMatrixData(RAP_int) = RAP_int_data;
@@ -999,7 +1048,7 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
    RAP_ext_size = 0;
    if (num_sends_RT || num_recvs_RT)
    {
-      RAP_ext = hypre_ExchangeRAPBlockData(RAP_int,comm_pkg_RT, block_size);
+      RAP_ext = hypre_ExchangeRAPBlockData(RAP_int, comm_pkg_RT, block_size);
       RAP_ext_i = hypre_CSRBlockMatrixI(RAP_ext);
       RAP_ext_j = hypre_CSRBlockMatrixBigJ(RAP_ext);
       RAP_ext_data = hypre_CSRBlockMatrixData(RAP_ext);
@@ -1011,11 +1060,11 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
       RAP_int = NULL;
    }
 
-   RAP_diag_i = hypre_CTAlloc(HYPRE_Int,  num_cols_diag_P+1, HYPRE_MEMORY_HOST);
-   RAP_offd_i = hypre_CTAlloc(HYPRE_Int,  num_cols_diag_P+1, HYPRE_MEMORY_HOST);
+   RAP_diag_i = hypre_CTAlloc(HYPRE_Int,  num_cols_diag_P + 1, HYPRE_MEMORY_HOST);
+   RAP_offd_i = hypre_CTAlloc(HYPRE_Int,  num_cols_diag_P + 1, HYPRE_MEMORY_HOST);
 
    first_col_diag_RAP = first_col_diag_P;
-   last_col_diag_RAP = first_col_diag_P + (HYPRE_BigInt)num_cols_diag_P - 1;
+   last_col_diag_RAP  = first_col_diag_P + (HYPRE_BigInt) num_cols_diag_P - 1;
 
    /*-----------------------------------------------------------------------
     *  check for new nonzero columns in RAP_offd generated through RAP_ext
@@ -1023,21 +1072,26 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
 
    if (RAP_ext_size || num_cols_offd_Pext)
    {
-      temp = hypre_CTAlloc(HYPRE_BigInt, RAP_ext_size+num_cols_offd_Pext, HYPRE_MEMORY_HOST);
+      temp = hypre_CTAlloc(HYPRE_BigInt, RAP_ext_size + num_cols_offd_Pext, HYPRE_MEMORY_HOST);
       cnt = 0;
-      for (i=0; i < RAP_ext_size; i++)
-         if (RAP_ext_j[i] < first_col_diag_RAP
-             || RAP_ext_j[i] > last_col_diag_RAP)
+      for (i = 0; i < RAP_ext_size; i++)
+      {
+         if (RAP_ext_j[i] < first_col_diag_RAP || RAP_ext_j[i] > last_col_diag_RAP)
+         {
             temp[cnt++] = RAP_ext_j[i];
-      for (i=0; i < num_cols_offd_Pext; i++)
+         }
+      }
+      for (i = 0; i < num_cols_offd_Pext; i++)
+      {
          temp[cnt++] = col_map_offd_Pext[i];
+      }
 
       if (cnt)
       {
-         hypre_BigQsort0(temp,0,cnt-1);
+         hypre_BigQsort0(temp, 0, cnt - 1);
          value = temp[0];
          num_cols_offd_RAP = 1;
-         for (i=1; i < cnt; i++)
+         for (i = 1; i < cnt; i++)
          {
             if (temp[i] > value)
             {
@@ -1049,10 +1103,14 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
 
       /* now evaluate col_map_offd_RAP */
       if (num_cols_offd_RAP)
-         col_map_offd_RAP = hypre_CTAlloc(HYPRE_BigInt,  num_cols_offd_RAP, HYPRE_MEMORY_HOST);
+      {
+         col_map_offd_RAP = hypre_CTAlloc(HYPRE_BigInt, num_cols_offd_RAP, HYPRE_MEMORY_HOST);
+      }
 
-      for (i=0 ; i < num_cols_offd_RAP; i++)
+      for (i = 0 ; i < num_cols_offd_RAP; i++)
+      {
          col_map_offd_RAP[i] = temp[i];
+      }
 
       hypre_TFree(temp, HYPRE_MEMORY_HOST);
    }
@@ -1062,12 +1120,14 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
       map_P_to_RAP = hypre_CTAlloc(HYPRE_Int, num_cols_offd_P, HYPRE_MEMORY_HOST);
 
       cnt = 0;
-      for (i=0; i < num_cols_offd_RAP; i++)
+      for (i = 0; i < num_cols_offd_RAP; i++)
+      {
          if (col_map_offd_RAP[i] == col_map_offd_P[cnt])
          {
             map_P_to_RAP[cnt++] = i;
-            if (cnt == num_cols_offd_P) break;
+            if (cnt == num_cols_offd_P) { break; }
          }
+      }
    }
 
    if (num_cols_offd_Pext)
@@ -1075,57 +1135,65 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
       map_Pext_to_RAP = hypre_CTAlloc(HYPRE_Int, num_cols_offd_Pext, HYPRE_MEMORY_HOST);
 
       cnt = 0;
-      for (i=0; i < num_cols_offd_RAP; i++)
+      for (i = 0; i < num_cols_offd_RAP; i++)
+      {
          if (col_map_offd_RAP[i] == col_map_offd_Pext[cnt])
          {
             map_Pext_to_RAP[cnt++] = i;
-            if (cnt == num_cols_offd_Pext) break;
+            if (cnt == num_cols_offd_Pext) { break; }
          }
+      }
    }
 
    /*-----------------------------------------------------------------------
     *  Convert RAP_ext column indices
     *-----------------------------------------------------------------------*/
 
-   for (i=0; i < RAP_ext_size; i++)
-      if (RAP_ext_j[i] < first_col_diag_RAP
-          || RAP_ext_j[i] > last_col_diag_RAP)
+   for (i = 0; i < RAP_ext_size; i++)
+   {
+      if (RAP_ext_j[i] < first_col_diag_RAP || RAP_ext_j[i] > last_col_diag_RAP)
+      {
          RAP_ext_j[i] = (HYPRE_BigInt)(num_cols_diag_P)
-            + hypre_BigBinarySearch(col_map_offd_RAP,
-                                 RAP_ext_j[i],num_cols_offd_RAP);
+                        + hypre_BigBinarySearch(col_map_offd_RAP,
+                                                RAP_ext_j[i], num_cols_offd_RAP);
+      }
       else
+      {
          RAP_ext_j[i] -= first_col_diag_RAP;
+      }
+   }
 
    /*-----------------------------------------------------------------------
     *  Initialize some stuff.
     *-----------------------------------------------------------------------*/
 
-   jj_cnt_diag = hypre_CTAlloc(HYPRE_Int,  num_threads, HYPRE_MEMORY_HOST);
-   jj_cnt_offd = hypre_CTAlloc(HYPRE_Int,  num_threads, HYPRE_MEMORY_HOST);
+   jj_cnt_diag = hypre_CTAlloc(HYPRE_Int, num_threads, HYPRE_MEMORY_HOST);
+   jj_cnt_offd = hypre_CTAlloc(HYPRE_Int, num_threads, HYPRE_MEMORY_HOST);
 
    for (ii = 0; ii < num_threads; ii++)
    {
-      size = num_cols_diag_P/num_threads;
-      rest = num_cols_diag_P - size*num_threads;
+      size = num_cols_diag_P / num_threads;
+      rest = num_cols_diag_P - size * num_threads;
       if (ii < rest)
       {
-         ns = ii*size+ii;
-         ne = (ii+1)*size+ii+1;
+         ns = ii * size + ii;
+         ne = (ii + 1) * size + ii + 1;
       }
       else
       {
-         ns = ii*size+rest;
-         ne = (ii+1)*size+rest;
+         ns = ii * size + rest;
+         ne = (ii + 1) * size + rest;
       }
 
-      P_mark_array[ii] = hypre_CTAlloc(HYPRE_Int,  num_cols_diag_P+num_cols_offd_RAP, HYPRE_MEMORY_HOST);
+      P_mark_array[ii] = hypre_CTAlloc(HYPRE_Int,  num_cols_diag_P + num_cols_offd_RAP,
+                                       HYPRE_MEMORY_HOST);
       A_mark_array[ii] = hypre_CTAlloc(HYPRE_Int,  num_nz_cols_A, HYPRE_MEMORY_HOST);
       P_marker = P_mark_array[ii];
       A_marker = A_mark_array[ii];
       jj_count_diag = start_indexing;
       jj_count_offd = start_indexing;
 
-      for (ic = 0; ic < num_cols_diag_P+num_cols_offd_RAP; ic++)
+      for (ic = 0; ic < num_cols_diag_P + num_cols_offd_RAP; ic++)
       {
          P_marker[ic] = -1;
       }
@@ -1151,11 +1219,13 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
          jj_row_begin_offd = jj_count_offd;
          jj_count_diag++;
 
-         for (i=0; i < num_sends_RT; i++)
-            for (j = send_map_starts_RT[i]; j < send_map_starts_RT[i+1]; j++)
+         for (i = 0; i < num_sends_RT; i++)
+         {
+            for (j = send_map_starts_RT[i]; j < send_map_starts_RT[i + 1]; j++)
+            {
                if (send_map_elmts_RT[j] == ic)
                {
-                  for (k=RAP_ext_i[j]; k < RAP_ext_i[j+1]; k++)
+                  for (k = RAP_ext_i[j]; k < RAP_ext_i[j + 1]; k++)
                   {
                      jcol = (HYPRE_Int)RAP_ext_j[k];
                      if (jcol < num_cols_diag_P)
@@ -1177,12 +1247,14 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
                   }
                   break;
                }
+            }
+         }
 
          /*-----------------------------------------------------------------
           *  Loop over entries in row ic of R_diag.
           *-----------------------------------------------------------------*/
 
-         for (jj1 = R_diag_i[ic]; jj1 < R_diag_i[ic+1]; jj1++)
+         for (jj1 = R_diag_i[ic]; jj1 < R_diag_i[ic + 1]; jj1++)
          {
             i1  = R_diag_j[jj1];
 
@@ -1192,7 +1264,7 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
 
             if (num_cols_offd_A)
             {
-               for (jj2 = A_offd_i[i1]; jj2 < A_offd_i[i1+1]; jj2++)
+               for (jj2 = A_offd_i[i1]; jj2 < A_offd_i[i1 + 1]; jj2++)
                {
                   i2 = A_offd_j[jj2];
 
@@ -1213,7 +1285,7 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
                       *  Loop over entries in row i2 of P_ext.
                       *--------------------------------------------------------*/
 
-                     for (jj3=P_ext_diag_i[i2]; jj3 < P_ext_diag_i[i2+1]; jj3++)
+                     for (jj3 = P_ext_diag_i[i2]; jj3 < P_ext_diag_i[i2 + 1]; jj3++)
                      {
                         i3 = P_ext_diag_j[jj3];
 
@@ -1229,9 +1301,9 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
                            jj_count_diag++;
                         }
                      }
-                     for (jj3=P_ext_offd_i[i2]; jj3 < P_ext_offd_i[i2+1]; jj3++)
+                     for (jj3 = P_ext_offd_i[i2]; jj3 < P_ext_offd_i[i2 + 1]; jj3++)
                      {
-                        i3 = map_Pext_to_RAP[P_ext_offd_j[jj3]]+num_cols_diag_P;
+                        i3 = map_Pext_to_RAP[P_ext_offd_j[jj3]] + num_cols_diag_P;
 
                         /*-----------------------------------------------------
                          *  Check P_marker to see that RAP_{ic,i3} has not
@@ -1253,7 +1325,7 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
              *  Loop over entries in row i1 of A_diag.
              *-----------------------------------------------------------------*/
 
-            for (jj2 = A_diag_i[i1]; jj2 < A_diag_i[i1+1]; jj2++)
+            for (jj2 = A_diag_i[i1]; jj2 < A_diag_i[i1 + 1]; jj2++)
             {
                i2 = A_diag_j[jj2];
 
@@ -1262,20 +1334,20 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
                 *  visited. New entries in RAP only occur from unmarked points.
                 *--------------------------------------------------------------*/
 
-               if (A_marker[i2+num_cols_offd_A] != ic)
+               if (A_marker[i2 + num_cols_offd_A] != ic)
                {
 
                   /*-----------------------------------------------------------
                    *  Mark i2 as visited.
                    *-----------------------------------------------------------*/
 
-                  A_marker[i2+num_cols_offd_A] = ic;
+                  A_marker[i2 + num_cols_offd_A] = ic;
 
                   /*-----------------------------------------------------------
                    *  Loop over entries in row i2 of P_diag.
                    *-----------------------------------------------------------*/
 
-                  for (jj3 = P_diag_i[i2]; jj3 < P_diag_i[i2+1]; jj3++)
+                  for (jj3 = P_diag_i[i2]; jj3 < P_diag_i[i2 + 1]; jj3++)
                   {
                      i3 = P_diag_j[jj3];
 
@@ -1298,7 +1370,7 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
 
                   if (num_cols_offd_P)
                   {
-                     for (jj3 = P_offd_i[i2]; jj3 < P_offd_i[i2+1]; jj3++)
+                     for (jj3 = P_offd_i[i2]; jj3 < P_offd_i[i2 + 1]; jj3++)
                      {
                         i3 = map_P_to_RAP[P_offd_j[jj3]] + num_cols_diag_P;
 
@@ -1327,14 +1399,14 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
       jj_cnt_offd[ii] = jj_count_offd;
    }
 
-   for (i=0; i < num_threads-1; i++)
+   for (i = 0; i < num_threads - 1; i++)
    {
-      jj_cnt_diag[i+1] += jj_cnt_diag[i];
-      jj_cnt_offd[i+1] += jj_cnt_offd[i];
+      jj_cnt_diag[i + 1] += jj_cnt_diag[i];
+      jj_cnt_offd[i + 1] += jj_cnt_offd[i];
    }
 
-   jj_count_diag = jj_cnt_diag[num_threads-1];
-   jj_count_offd = jj_cnt_offd[num_threads-1];
+   jj_count_diag = jj_cnt_diag[num_threads - 1];
+   jj_count_offd = jj_cnt_offd[num_threads - 1];
 
    RAP_diag_i[num_cols_diag_P] = jj_count_diag;
    RAP_offd_i[num_cols_diag_P] = jj_count_offd;
@@ -1347,14 +1419,14 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
    RAP_diag_size = jj_count_diag;
    if (RAP_diag_size)
    {
-      RAP_diag_data = hypre_CTAlloc(HYPRE_Complex,  RAP_diag_size*bnnz, HYPRE_MEMORY_HOST);
+      RAP_diag_data = hypre_CTAlloc(HYPRE_Complex,  RAP_diag_size * bnnz, HYPRE_MEMORY_HOST);
       RAP_diag_j    = hypre_CTAlloc(HYPRE_Int,  RAP_diag_size, HYPRE_MEMORY_HOST);
    }
 
    RAP_offd_size = jj_count_offd;
    if (RAP_offd_size)
    {
-      RAP_offd_data = hypre_CTAlloc(HYPRE_Complex,  RAP_offd_size*bnnz, HYPRE_MEMORY_HOST);
+      RAP_offd_data = hypre_CTAlloc(HYPRE_Complex,  RAP_offd_size * bnnz, HYPRE_MEMORY_HOST);
       RAP_offd_j    = hypre_CTAlloc(HYPRE_Int,  RAP_offd_size, HYPRE_MEMORY_HOST);
    }
 
@@ -1371,17 +1443,17 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
 
    for (ii = 0; ii < num_threads; ii++)
    {
-      size = num_cols_diag_P/num_threads;
-      rest = num_cols_diag_P - size*num_threads;
+      size = num_cols_diag_P / num_threads;
+      rest = num_cols_diag_P - size * num_threads;
       if (ii < rest)
       {
-         ns = ii*size+ii;
-         ne = (ii+1)*size+ii+1;
+         ns = ii * size + ii;
+         ne = (ii + 1) * size + ii + 1;
       }
       else
       {
-         ns = ii*size+rest;
-         ne = (ii+1)*size+rest;
+         ns = ii * size + rest;
+         ne = (ii + 1) * size + rest;
       }
 
       /*-----------------------------------------------------------------------
@@ -1390,7 +1462,7 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
 
       P_marker = P_mark_array[ii];
       A_marker = A_mark_array[ii];
-      for (ic = 0; ic < num_cols_diag_P+num_cols_offd_RAP; ic++)
+      for (ic = 0; ic < num_cols_diag_P + num_cols_offd_RAP; ic++)
       {
          P_marker[ic] = -1;
       }
@@ -1403,8 +1475,8 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
       jj_count_offd = start_indexing;
       if (ii > 0)
       {
-         jj_count_diag = jj_cnt_diag[ii-1];
-         jj_count_offd = jj_cnt_offd[ii-1];
+         jj_count_diag = jj_cnt_diag[ii - 1];
+         jj_count_offd = jj_cnt_offd[ii - 1];
       }
 
       /*-----------------------------------------------------------------------
@@ -1413,7 +1485,6 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
 
       for (ic = ns; ic < ne; ic++)
       {
-
          /*--------------------------------------------------------------------
           *  Create diagonal entry, RAP_{ic,ic} and add entries of RAP_ext
           *--------------------------------------------------------------------*/
@@ -1425,17 +1496,21 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
          RAP_offd_i[ic] = jj_row_begin_offd;
          ind = jj_count_diag * bnnz;
          for (kk = 0; kk < bnnz; kk++)
+         {
             RAP_diag_data[ind++] = zero;
+         }
          RAP_diag_j[jj_count_diag] = ic;
          jj_count_diag++;
 
-         for (i=0; i < num_sends_RT; i++)
-            for (j = send_map_starts_RT[i]; j < send_map_starts_RT[i+1]; j++)
+         for (i = 0; i < num_sends_RT; i++)
+         {
+            for (j = send_map_starts_RT[i]; j < send_map_starts_RT[i + 1]; j++)
+            {
                if (send_map_elmts_RT[j] == ic)
                {
-                  for (k=RAP_ext_i[j]; k < RAP_ext_i[j+1]; k++)
+                  for (k = RAP_ext_i[j]; k < RAP_ext_i[j + 1]; k++)
                   {
-                     jcol = (HYPRE_Int)RAP_ext_j[k];
+                     jcol = (HYPRE_Int) RAP_ext_j[k];
                      if (jcol < num_cols_diag_P)
                      {
                         if (P_marker[jcol] < jj_row_begin_diag)
@@ -1443,7 +1518,9 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
                            P_marker[jcol] = jj_count_diag;
                            ind = jj_count_diag * bnnz;
                            for (kk = 0; kk < bnnz; kk++)
-                              RAP_diag_data[ind++] = RAP_ext_data[k*bnnz+kk];
+                           {
+                              RAP_diag_data[ind++] = RAP_ext_data[k * bnnz + kk];
+                           }
                            RAP_diag_j[jj_count_diag] = jcol;
                            jj_count_diag++;
                         }
@@ -1451,7 +1528,9 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
                         {
                            ind = P_marker[jcol] * bnnz;
                            for (kk = 0; kk < bnnz; kk++)
-                              RAP_diag_data[ind++] += RAP_ext_data[k*bnnz+kk];
+                           {
+                              RAP_diag_data[ind++] += RAP_ext_data[k * bnnz + kk];
+                           }
                         }
                      }
                      else
@@ -1461,30 +1540,36 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
                            P_marker[jcol] = jj_count_offd;
                            ind = jj_count_offd * bnnz;
                            for (kk = 0; kk < bnnz; kk++)
-                              RAP_offd_data[ind++] = RAP_ext_data[k*bnnz+kk];
+                           {
+                              RAP_offd_data[ind++] = RAP_ext_data[k * bnnz + kk];
+                           }
                            RAP_offd_j[jj_count_offd]
-                              = jcol-num_cols_diag_P;
+                              = jcol - num_cols_diag_P;
                            jj_count_offd++;
                         }
                         else
                         {
                            ind = P_marker[jcol] * bnnz;
                            for (kk = 0; kk < bnnz; kk++)
-                              RAP_offd_data[ind++] += RAP_ext_data[k*bnnz+kk];
+                           {
+                              RAP_offd_data[ind++] += RAP_ext_data[k * bnnz + kk];
+                           }
                         }
                      }
                   }
                   break;
                }
+            }
+         }
 
          /*--------------------------------------------------------------------
           *  Loop over entries in row ic of R_diag.
           *--------------------------------------------------------------------*/
 
-         for (jj1 = R_diag_i[ic]; jj1 < R_diag_i[ic+1]; jj1++)
+         for (jj1 = R_diag_i[ic]; jj1 < R_diag_i[ic + 1]; jj1++)
          {
             i1  = R_diag_j[jj1];
-            r_entries = &(R_diag_data[jj1*bnnz]);
+            r_entries = &(R_diag_data[jj1 * bnnz]);
 
             /*-----------------------------------------------------------------
              *  Loop over entries in row i1 of A_offd.
@@ -1492,11 +1577,11 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
 
             if (num_cols_offd_A)
             {
-               for (jj2 = A_offd_i[i1]; jj2 < A_offd_i[i1+1]; jj2++)
+               for (jj2 = A_offd_i[i1]; jj2 < A_offd_i[i1 + 1]; jj2++)
                {
                   i2 = A_offd_j[jj2];
                   hypre_CSRBlockMatrixBlockMultAdd(r_entries,
-                                                   &(A_offd_data[jj2*bnnz]), zero, r_a_products,
+                                                   &(A_offd_data[jj2 * bnnz]), zero, r_a_products,
                                                    block_size);
 
                   /*-----------------------------------------------------------
@@ -1516,11 +1601,11 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
                       *  Loop over entries in row i2 of P_ext.
                       *--------------------------------------------------------*/
 
-                     for (jj3=P_ext_diag_i[i2]; jj3 < P_ext_diag_i[i2+1]; jj3++)
+                     for (jj3 = P_ext_diag_i[i2]; jj3 < P_ext_diag_i[i2 + 1]; jj3++)
                      {
                         i3 = P_ext_diag_j[jj3];
                         hypre_CSRBlockMatrixBlockMultAdd(r_a_products,
-                                                         &(P_ext_diag_data[jj3*bnnz]), zero,
+                                                         &(P_ext_diag_data[jj3 * bnnz]), zero,
                                                          r_a_p_products, block_size);
 
                         /*-----------------------------------------------------
@@ -1534,7 +1619,9 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
                            P_marker[i3] = jj_count_diag;
                            ind = jj_count_diag * bnnz;
                            for (kk = 0; kk < bnnz; kk++)
+                           {
                               RAP_diag_data[ind++] = r_a_p_products[kk];
+                           }
                            RAP_diag_j[jj_count_diag] = i3;
                            jj_count_diag++;
                         }
@@ -1542,14 +1629,16 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
                         {
                            ind = P_marker[i3] * bnnz;
                            for (kk = 0; kk < bnnz; kk++)
+                           {
                               RAP_diag_data[ind++] += r_a_p_products[kk];
+                           }
                         }
                      }
-                     for (jj3=P_ext_offd_i[i2]; jj3 < P_ext_offd_i[i2+1]; jj3++)
+                     for (jj3 = P_ext_offd_i[i2]; jj3 < P_ext_offd_i[i2 + 1]; jj3++)
                      {
-                        i3 = map_Pext_to_RAP[P_ext_offd_j[jj3]]+num_cols_diag_P;
+                        i3 = map_Pext_to_RAP[P_ext_offd_j[jj3]] + num_cols_diag_P;
                         hypre_CSRBlockMatrixBlockMultAdd(r_a_products,
-                                                         &(P_ext_offd_data[jj3*bnnz]),
+                                                         &(P_ext_offd_data[jj3 * bnnz]),
                                                          zero, r_a_p_products, block_size);
 
                         /*-----------------------------------------------------
@@ -1562,7 +1651,9 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
                            P_marker[i3] = jj_count_offd;
                            ind = jj_count_offd * bnnz;
                            for (kk = 0; kk < bnnz; kk++)
+                           {
                               RAP_offd_data[ind++] = r_a_p_products[kk];
+                           }
                            RAP_offd_j[jj_count_offd] = i3 - num_cols_diag_P;
                            jj_count_offd++;
                         }
@@ -1570,7 +1661,9 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
                         {
                            ind = P_marker[i3] * bnnz;
                            for (kk = 0; kk < bnnz; kk++)
+                           {
                               RAP_offd_data[ind++] += r_a_p_products[kk];
+                           }
                         }
                      }
                   }
@@ -1581,25 +1674,29 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
                    *-----------------------------------------------------------*/
                   else
                   {
-                     for (jj3=P_ext_diag_i[i2]; jj3 < P_ext_diag_i[i2+1]; jj3++)
+                     for (jj3 = P_ext_diag_i[i2]; jj3 < P_ext_diag_i[i2 + 1]; jj3++)
                      {
                         i3 = P_ext_diag_j[jj3];
                         hypre_CSRBlockMatrixBlockMultAdd(r_a_products,
-                                                         &(P_ext_diag_data[jj3*bnnz]), zero,
+                                                         &(P_ext_diag_data[jj3 * bnnz]), zero,
                                                          r_a_p_products, block_size);
                         ind = P_marker[i3] * bnnz;
                         for (kk = 0; kk < bnnz; kk++)
+                        {
                            RAP_diag_data[ind++] += r_a_p_products[kk];
+                        }
                      }
-                     for (jj3=P_ext_offd_i[i2]; jj3 < P_ext_offd_i[i2+1]; jj3++)
+                     for (jj3 = P_ext_offd_i[i2]; jj3 < P_ext_offd_i[i2 + 1]; jj3++)
                      {
-                        i3=map_Pext_to_RAP[P_ext_offd_j[jj3]] + num_cols_diag_P;
+                        i3 = map_Pext_to_RAP[P_ext_offd_j[jj3]] + num_cols_diag_P;
                         hypre_CSRBlockMatrixBlockMultAdd(r_a_products,
-                                                         &(P_ext_offd_data[jj3*bnnz]),
+                                                         &(P_ext_offd_data[jj3 * bnnz]),
                                                          zero, r_a_p_products, block_size);
                         ind = P_marker[i3] * bnnz;
                         for (kk = 0; kk < bnnz; kk++)
+                        {
                            RAP_offd_data[ind++] += r_a_p_products[kk];
+                        }
                      }
                   }
                }
@@ -1609,11 +1706,11 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
              *  Loop over entries in row i1 of A_diag.
              *-----------------------------------------------------------------*/
 
-            for (jj2 = A_diag_i[i1]; jj2 < A_diag_i[i1+1]; jj2++)
+            for (jj2 = A_diag_i[i1]; jj2 < A_diag_i[i1 + 1]; jj2++)
             {
                i2 = A_diag_j[jj2];
                hypre_CSRBlockMatrixBlockMultAdd(r_entries,
-                                                &(A_diag_data[jj2*bnnz]),
+                                                &(A_diag_data[jj2 * bnnz]),
                                                 zero, r_a_products, block_size);
 
                /*--------------------------------------------------------------
@@ -1621,24 +1718,24 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
                 *  visited. New entries in RAP only occur from unmarked points.
                 *--------------------------------------------------------------*/
 
-               if (A_marker[i2+num_cols_offd_A] != ic)
+               if (A_marker[i2 + num_cols_offd_A] != ic)
                {
 
                   /*-----------------------------------------------------------
                    *  Mark i2 as visited.
                    *-----------------------------------------------------------*/
 
-                  A_marker[i2+num_cols_offd_A] = ic;
+                  A_marker[i2 + num_cols_offd_A] = ic;
 
                   /*-----------------------------------------------------------
                    *  Loop over entries in row i2 of P_diag.
                    *-----------------------------------------------------------*/
 
-                  for (jj3 = P_diag_i[i2]; jj3 < P_diag_i[i2+1]; jj3++)
+                  for (jj3 = P_diag_i[i2]; jj3 < P_diag_i[i2 + 1]; jj3++)
                   {
                      i3 = P_diag_j[jj3];
                      hypre_CSRBlockMatrixBlockMultAdd(r_a_products,
-                                                      &(P_diag_data[jj3*bnnz]),
+                                                      &(P_diag_data[jj3 * bnnz]),
                                                       zero, r_a_p_products, block_size);
 
                      /*--------------------------------------------------------
@@ -1652,7 +1749,9 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
                         P_marker[i3] = jj_count_diag;
                         ind = jj_count_diag * bnnz;
                         for (kk = 0; kk < bnnz; kk++)
+                        {
                            RAP_diag_data[ind++] = r_a_p_products[kk];
+                        }
                         RAP_diag_j[jj_count_diag] = P_diag_j[jj3];
                         jj_count_diag++;
                      }
@@ -1660,16 +1759,18 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
                      {
                         ind = P_marker[i3] * bnnz;
                         for (kk = 0; kk < bnnz; kk++)
+                        {
                            RAP_diag_data[ind++] += r_a_p_products[kk];
+                        }
                      }
                   }
                   if (num_cols_offd_P)
                   {
-                     for (jj3 = P_offd_i[i2]; jj3 < P_offd_i[i2+1]; jj3++)
+                     for (jj3 = P_offd_i[i2]; jj3 < P_offd_i[i2 + 1]; jj3++)
                      {
                         i3 = map_P_to_RAP[P_offd_j[jj3]] + num_cols_diag_P;
                         hypre_CSRBlockMatrixBlockMultAdd(r_a_products,
-                                                         &(P_offd_data[jj3*bnnz]),
+                                                         &(P_offd_data[jj3 * bnnz]),
                                                          zero, r_a_p_products, block_size);
 
                         /*-----------------------------------------------------
@@ -1683,7 +1784,9 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
                            P_marker[i3] = jj_count_offd;
                            ind = jj_count_offd * bnnz;
                            for (kk = 0; kk < bnnz; kk++)
+                           {
                               RAP_offd_data[ind++] = r_a_p_products[kk];
+                           }
                            RAP_offd_j[jj_count_offd] = i3 - num_cols_diag_P;
                            jj_count_offd++;
                         }
@@ -1691,7 +1794,9 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
                         {
                            ind = P_marker[i3] * bnnz;
                            for (kk = 0; kk < bnnz; kk++)
+                           {
                               RAP_offd_data[ind++] += r_a_p_products[kk];
+                           }
                         }
                      }
                   }
@@ -1704,27 +1809,31 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
 
                else
                {
-                  for (jj3 = P_diag_i[i2]; jj3 < P_diag_i[i2+1]; jj3++)
+                  for (jj3 = P_diag_i[i2]; jj3 < P_diag_i[i2 + 1]; jj3++)
                   {
                      i3 = P_diag_j[jj3];
                      hypre_CSRBlockMatrixBlockMultAdd(r_a_products,
-                                                      &(P_diag_data[jj3*bnnz]),
+                                                      &(P_diag_data[jj3 * bnnz]),
                                                       zero, r_a_p_products, block_size);
                      ind = P_marker[i3] * bnnz;
                      for (kk = 0; kk < bnnz; kk++)
+                     {
                         RAP_diag_data[ind++] += r_a_p_products[kk];
+                     }
                   }
                   if (num_cols_offd_P)
                   {
-                     for (jj3 = P_offd_i[i2]; jj3 < P_offd_i[i2+1]; jj3++)
+                     for (jj3 = P_offd_i[i2]; jj3 < P_offd_i[i2 + 1]; jj3++)
                      {
                         i3 = map_P_to_RAP[P_offd_j[jj3]] + num_cols_diag_P;
                         hypre_CSRBlockMatrixBlockMultAdd(r_a_products,
-                                                         &(P_offd_data[jj3*bnnz]),
+                                                         &(P_offd_data[jj3 * bnnz]),
                                                          zero, r_a_p_products, block_size);
                         ind = P_marker[i3] * bnnz;
                         for (kk = 0; kk < bnnz; kk++)
+                        {
                            RAP_offd_data[ind++] += r_a_p_products[kk];
+                        }
                      }
                   }
                }
@@ -1736,9 +1845,7 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
    }
 
 
-   row_starts = hypre_CTAlloc(HYPRE_BigInt,  2, HYPRE_MEMORY_HOST);
-   col_starts = hypre_CTAlloc(HYPRE_BigInt,  2, HYPRE_MEMORY_HOST);
-   for (i = 0; i <= 1; i++)
+   for (i = 0; i < 2; i++)
    {
       row_starts[i] = col_starts[i] = coarse_partitioning[i];
    }
@@ -1815,10 +1922,8 @@ hypre_ParCSRBlockMatrixRAP(hypre_ParCSRBlockMatrix  *RT,
       hypre_TFree(P_ext_offd_j, HYPRE_MEMORY_HOST);
    }
 
-   hypre_TFree(r_a_products,HYPRE_MEMORY_HOST);
-   hypre_TFree(r_a_p_products,HYPRE_MEMORY_HOST);
-   hypre_TFree(row_starts,HYPRE_MEMORY_HOST);
-   hypre_TFree(col_starts,HYPRE_MEMORY_HOST);
+   hypre_TFree(r_a_products, HYPRE_MEMORY_HOST);
+   hypre_TFree(r_a_p_products, HYPRE_MEMORY_HOST);
 
    return hypre_error_flag;
 }
diff --git a/external/hypre/src/parcsr_block_mv/par_csr_block_rap_communication.c b/external/hypre/src/parcsr_block_mv/par_csr_block_rap_communication.c
index 135e58b2..5c6ef688 100644
--- a/external/hypre/src/parcsr_block_mv/par_csr_block_rap_communication.c
+++ b/external/hypre/src/parcsr_block_mv/par_csr_block_rap_communication.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -17,9 +17,9 @@ the commpkg is not different for a block matrix.) */
 
 HYPRE_Int
 hypre_GetCommPkgBlockRTFromCommPkgBlockA( hypre_ParCSRBlockMatrix *RT,
-			       	hypre_ParCSRBlockMatrix *A,
-			       	HYPRE_Int *tmp_map_offd,
-			       	HYPRE_BigInt *fine_to_coarse_offd)
+                                          hypre_ParCSRBlockMatrix *A,
+                                          HYPRE_Int *tmp_map_offd,
+                                          HYPRE_BigInt *fine_to_coarse_offd)
 {
    MPI_Comm comm = hypre_ParCSRBlockMatrixComm(RT);
    hypre_ParCSRCommPkg *comm_pkg_A = hypre_ParCSRBlockMatrixCommPkg(A);
@@ -29,15 +29,15 @@ hypre_GetCommPkgBlockRTFromCommPkgBlockA( hypre_ParCSRBlockMatrix *RT,
    HYPRE_Int num_sends_A = hypre_ParCSRCommPkgNumSends(comm_pkg_A);
    HYPRE_Int *send_procs_A = hypre_ParCSRCommPkgSendProcs(comm_pkg_A);
 
-   hypre_ParCSRCommPkg *comm_pkg;
+   hypre_ParCSRCommPkg *comm_pkg = NULL;
    HYPRE_Int num_recvs_RT;
-   HYPRE_Int *recv_procs_RT;   
-   HYPRE_Int *recv_vec_starts_RT;   
+   HYPRE_Int *recv_procs_RT;
+   HYPRE_Int *recv_vec_starts_RT;
    HYPRE_Int num_sends_RT;
-   HYPRE_Int *send_procs_RT;   
-   HYPRE_Int *send_map_starts_RT;   
-   HYPRE_Int *send_map_elmts_RT;   
-   HYPRE_BigInt *send_big_elmts = NULL;   
+   HYPRE_Int *send_procs_RT;
+   HYPRE_Int *send_map_starts_RT;
+   HYPRE_Int *send_map_elmts_RT;
+   HYPRE_BigInt *send_big_elmts = NULL;
 
    HYPRE_BigInt *col_map_offd_RT = hypre_ParCSRBlockMatrixColMapOffd(RT);
    HYPRE_Int num_cols_offd_RT = hypre_CSRBlockMatrixNumCols( hypre_ParCSRMatrixOffd(RT));
@@ -46,159 +46,165 @@ hypre_GetCommPkgBlockRTFromCommPkgBlockA( hypre_ParCSRBlockMatrix *RT,
    HYPRE_Int i, j;
    HYPRE_Int vec_len, vec_start;
    HYPRE_Int num_procs, my_id;
-   HYPRE_Int ierr = 0;
    HYPRE_Int num_requests;
    HYPRE_Int offd_col, proc_num;
- 
+
    HYPRE_Int *proc_mark;
    HYPRE_Int *change_array;
 
    hypre_MPI_Request *requests;
    hypre_MPI_Status *status;
 
-   hypre_MPI_Comm_size(comm,&num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_size(comm, &num_procs);
+   hypre_MPI_Comm_rank(comm, &my_id);
 
-/*--------------------------------------------------------------------------
- * determine num_recvs, recv_procs and recv_vec_starts for RT
- *--------------------------------------------------------------------------*/
+   /*--------------------------------------------------------------------------
+    * determine num_recvs, recv_procs and recv_vec_starts for RT
+    *--------------------------------------------------------------------------*/
 
    proc_mark = hypre_CTAlloc(HYPRE_Int,  num_recvs_A, HYPRE_MEMORY_HOST);
 
-   for (i=0; i < num_recvs_A; i++)
-                proc_mark[i] = 0;
+   for (i = 0; i < num_recvs_A; i++)
+   {
+      proc_mark[i] = 0;
+   }
 
    proc_num = 0;
    num_recvs_RT = 0;
    if (num_cols_offd_RT)
    {
-      for (i=0; i < num_recvs_A; i++)
+      for (i = 0; i < num_recvs_A; i++)
       {
-         for (j=recv_vec_starts_A[i]; j<recv_vec_starts_A[i+1]; j++)
+         for (j = recv_vec_starts_A[i]; j < recv_vec_starts_A[i + 1]; j++)
          {
             offd_col = tmp_map_offd[proc_num];
             if (offd_col == j)
             {
-                proc_mark[i]++;
-                proc_num++;
-                if (proc_num == num_cols_offd_RT) break;
+               proc_mark[i]++;
+               proc_num++;
+               if (proc_num == num_cols_offd_RT) { break; }
             }
          }
-         if (proc_mark[i]) num_recvs_RT++;
-         if (proc_num == num_cols_offd_RT) break;
+         if (proc_mark[i]) { num_recvs_RT++; }
+         if (proc_num == num_cols_offd_RT) { break; }
       }
    }
 
-   for (i=0; i < num_cols_offd_RT; i++)
+   for (i = 0; i < num_cols_offd_RT; i++)
+   {
       col_map_offd_RT[i] = fine_to_coarse_offd[tmp_map_offd[i]];
- 
+   }
+
    recv_procs_RT = hypre_CTAlloc(HYPRE_Int, num_recvs_RT, HYPRE_MEMORY_HOST);
-   recv_vec_starts_RT = hypre_CTAlloc(HYPRE_Int,  num_recvs_RT+1, HYPRE_MEMORY_HOST);
- 
+   recv_vec_starts_RT = hypre_CTAlloc(HYPRE_Int,  num_recvs_RT + 1, HYPRE_MEMORY_HOST);
+
    j = 0;
    recv_vec_starts_RT[0] = 0;
-   for (i=0; i < num_recvs_A; i++)
-        if (proc_mark[i])
-        {
-                recv_procs_RT[j] = recv_procs_A[i];
-                recv_vec_starts_RT[j+1] = recv_vec_starts_RT[j]+proc_mark[i];
-                j++;
-        }
-
-/*--------------------------------------------------------------------------
- * send num_changes to recv_procs_A and receive change_array from send_procs_A
- *--------------------------------------------------------------------------*/
-
-   num_requests = num_recvs_A+num_sends_A;
+   for (i = 0; i < num_recvs_A; i++)
+      if (proc_mark[i])
+      {
+         recv_procs_RT[j] = recv_procs_A[i];
+         recv_vec_starts_RT[j + 1] = recv_vec_starts_RT[j] + proc_mark[i];
+         j++;
+      }
+
+   /*--------------------------------------------------------------------------
+    * send num_changes to recv_procs_A and receive change_array from send_procs_A
+    *--------------------------------------------------------------------------*/
+
+   num_requests = num_recvs_A + num_sends_A;
    requests = hypre_CTAlloc(hypre_MPI_Request,  num_requests, HYPRE_MEMORY_HOST);
    status = hypre_CTAlloc(hypre_MPI_Status,  num_requests, HYPRE_MEMORY_HOST);
 
    change_array = hypre_CTAlloc(HYPRE_Int,  num_sends_A, HYPRE_MEMORY_HOST);
 
    j = 0;
-   for (i=0; i < num_sends_A; i++)
-	hypre_MPI_Irecv(&change_array[i],1,HYPRE_MPI_INT,send_procs_A[i],0,comm,
-		&requests[j++]);
+   for (i = 0; i < num_sends_A; i++)
+      hypre_MPI_Irecv(&change_array[i], 1, HYPRE_MPI_INT, send_procs_A[i], 0, comm,
+                      &requests[j++]);
 
-   for (i=0; i < num_recvs_A; i++)
-	hypre_MPI_Isend(&proc_mark[i],1,HYPRE_MPI_INT,recv_procs_A[i],0,comm,
-		&requests[j++]);
-   
-   hypre_MPI_Waitall(num_requests,requests,status);
+   for (i = 0; i < num_recvs_A; i++)
+      hypre_MPI_Isend(&proc_mark[i], 1, HYPRE_MPI_INT, recv_procs_A[i], 0, comm,
+                      &requests[j++]);
+
+   hypre_MPI_Waitall(num_requests, requests, status);
 
    hypre_TFree(proc_mark, HYPRE_MEMORY_HOST);
-   
-/*--------------------------------------------------------------------------
- * if change_array[i] is 0 , omit send_procs_A[i] in send_procs_RT
- *--------------------------------------------------------------------------*/
+
+   /*--------------------------------------------------------------------------
+    * if change_array[i] is 0 , omit send_procs_A[i] in send_procs_RT
+    *--------------------------------------------------------------------------*/
 
    num_sends_RT = 0;
-   for (i=0; i < num_sends_A; i++)
-      if (change_array[i]) 
+   for (i = 0; i < num_sends_A; i++)
+      if (change_array[i])
       {
-	 num_sends_RT++;
+         num_sends_RT++;
       }
 
    send_procs_RT = hypre_CTAlloc(HYPRE_Int,  num_sends_RT, HYPRE_MEMORY_HOST);
-   send_map_starts_RT = hypre_CTAlloc(HYPRE_Int,  num_sends_RT+1, HYPRE_MEMORY_HOST);
+   send_map_starts_RT = hypre_CTAlloc(HYPRE_Int,  num_sends_RT + 1, HYPRE_MEMORY_HOST);
 
    j = 0;
    send_map_starts_RT[0] = 0;
-   for (i=0; i < num_sends_A; i++)
-      if (change_array[i]) 
+   for (i = 0; i < num_sends_A; i++)
+      if (change_array[i])
       {
-	 send_procs_RT[j] = send_procs_A[i];
-	 send_map_starts_RT[j+1] = send_map_starts_RT[j]+change_array[i];
-	 j++;
+         send_procs_RT[j] = send_procs_A[i];
+         send_map_starts_RT[j + 1] = send_map_starts_RT[j] + change_array[i];
+         j++;
       }
 
-/*--------------------------------------------------------------------------
- * generate send_map_elmts
- *--------------------------------------------------------------------------*/
+   /*--------------------------------------------------------------------------
+    * generate send_map_elmts
+    *--------------------------------------------------------------------------*/
 
    send_big_elmts = hypre_CTAlloc(HYPRE_BigInt, send_map_starts_RT[num_sends_RT], HYPRE_MEMORY_HOST);
    send_map_elmts_RT = hypre_CTAlloc(HYPRE_Int, send_map_starts_RT[num_sends_RT], HYPRE_MEMORY_HOST);
 
    j = 0;
-   for (i=0; i < num_sends_RT; i++)
+   for (i = 0; i < num_sends_RT; i++)
+   {
+      vec_start = send_map_starts_RT[i];
+      vec_len = send_map_starts_RT[i + 1] - vec_start;
+      hypre_MPI_Irecv(&send_big_elmts[vec_start], vec_len, HYPRE_MPI_BIG_INT,
+                      send_procs_RT[i], 0, comm, &requests[j++]);
+   }
+
+   for (i = 0; i < num_recvs_RT; i++)
    {
-	vec_start = send_map_starts_RT[i];
-	vec_len = send_map_starts_RT[i+1]-vec_start;
-	hypre_MPI_Irecv(&send_big_elmts[vec_start],vec_len,HYPRE_MPI_BIG_INT,
-		send_procs_RT[i],0,comm,&requests[j++]);
+      vec_start = recv_vec_starts_RT[i];
+      vec_len = recv_vec_starts_RT[i + 1] - vec_start;
+      hypre_MPI_Isend(&col_map_offd_RT[vec_start], vec_len, HYPRE_MPI_BIG_INT,
+                      recv_procs_RT[i], 0, comm, &requests[j++]);
    }
 
-   for (i=0; i < num_recvs_RT; i++)
+   hypre_MPI_Waitall(j, requests, status);
+
+   for (i = 0; i < send_map_starts_RT[num_sends_RT]; i++)
    {
-	vec_start = recv_vec_starts_RT[i];
-	vec_len = recv_vec_starts_RT[i+1] - vec_start;
-	hypre_MPI_Isend(&col_map_offd_RT[vec_start],vec_len,HYPRE_MPI_BIG_INT, 
-		recv_procs_RT[i],0,comm,&requests[j++]);
+      send_map_elmts_RT[i] = (HYPRE_Int)(send_big_elmts[i] - first_col_diag);
    }
-   
-   hypre_MPI_Waitall(j,requests,status);
-
-   for (i=0; i < send_map_starts_RT[num_sends_RT]; i++)
-	send_map_elmts_RT[i] = (HYPRE_Int)(send_big_elmts[i] - first_col_diag); 
-	
-   comm_pkg = hypre_CTAlloc(hypre_ParCSRCommPkg, 1, HYPRE_MEMORY_HOST);
-
-   hypre_ParCSRCommPkgComm(comm_pkg) = comm;
-   hypre_ParCSRCommPkgNumSends(comm_pkg) = num_sends_RT;
-   hypre_ParCSRCommPkgNumRecvs(comm_pkg) = num_recvs_RT;
-   hypre_ParCSRCommPkgSendProcs(comm_pkg) = send_procs_RT;
-   hypre_ParCSRCommPkgRecvProcs(comm_pkg) = recv_procs_RT;
-   hypre_ParCSRCommPkgRecvVecStarts(comm_pkg) = recv_vec_starts_RT;
-   hypre_ParCSRCommPkgSendMapStarts(comm_pkg) = send_map_starts_RT;
-   hypre_ParCSRCommPkgSendMapElmts(comm_pkg) = send_map_elmts_RT;
 
+   /* Create communication package */
+   hypre_ParCSRCommPkgCreateAndFill(comm,
+                                    num_recvs_RT,
+                                    recv_procs_RT,
+                                    recv_vec_starts_RT,
+                                    num_sends_RT,
+                                    send_procs_RT,
+                                    send_map_starts_RT,
+                                    send_map_elmts_RT,
+                                    &comm_pkg);
+
+   hypre_ParCSRBlockMatrixCommPkg(RT) = comm_pkg;
+
+   /* Free memory */
    hypre_TFree(status, HYPRE_MEMORY_HOST);
    hypre_TFree(requests, HYPRE_MEMORY_HOST);
    hypre_TFree(send_big_elmts, HYPRE_MEMORY_HOST);
-
-   hypre_ParCSRBlockMatrixCommPkg(RT) = comm_pkg;
    hypre_TFree(change_array, HYPRE_MEMORY_HOST);
 
-   return ierr;
+   return hypre_error_flag;
 }
 
diff --git a/external/hypre/src/parcsr_block_mv/par_csr_block_relax.c b/external/hypre/src/parcsr_block_mv/par_csr_block_relax.c
index c0f4a34f..d10dd62b 100644
--- a/external/hypre/src/parcsr_block_mv/par_csr_block_relax.c
+++ b/external/hypre/src/parcsr_block_mv/par_csr_block_relax.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -47,7 +47,7 @@ HYPRE_Int  hypre_BoomerAMGBlockRelaxIF( hypre_ParCSRBlockMatrix *A,
          relax_points[0] = -1;
          relax_points[1] = 1;
       }
-      for (i=0; i < 2; i++)
+      for (i = 0; i < 2; i++)
       {
          Solve_err_flag = hypre_BoomerAMGBlockRelax(A,
                                                     f,
@@ -110,10 +110,10 @@ HYPRE_Int  hypre_BoomerAMGBlockRelax( hypre_ParCSRBlockMatrix *A,
    HYPRE_Int            *A_offd_j     = hypre_CSRBlockMatrixJ(A_offd);
 
    hypre_ParCSRCommPkg    *comm_pkg = hypre_ParCSRBlockMatrixCommPkg(A);
-   hypre_ParCSRCommHandle *comm_handle;
+   hypre_ParCSRCommHandle *comm_handle = NULL;
 
    HYPRE_Int             block_size = hypre_CSRBlockMatrixBlockSize(A_diag);
-   HYPRE_Int             bnnz = block_size*block_size;
+   HYPRE_Int             bnnz = block_size * block_size;
 
    HYPRE_BigInt          n_global;
    HYPRE_Int             n             = hypre_CSRBlockMatrixNumRows(A_diag);
@@ -128,8 +128,8 @@ HYPRE_Int  hypre_BoomerAMGBlockRelax( hypre_ParCSRBlockMatrix *A,
 
    hypre_Vector   *Vtemp_local = hypre_ParVectorLocalVector(Vtemp);
    HYPRE_Real     *Vtemp_data  = hypre_VectorData(Vtemp_local);
-   HYPRE_Real     *Vext_data;
-   HYPRE_Real     *v_buf_data;
+   HYPRE_Real     *Vext_data = NULL;
+   HYPRE_Real     *v_buf_data = NULL;
 
    HYPRE_Real     *tmp_data;
 
@@ -197,9 +197,9 @@ HYPRE_Int  hypre_BoomerAMGBlockRelax( hypre_ParCSRBlockMatrix *A,
    switch (relax_type)
    {
 
-/*---------------------------------------------------------------------------
-  Jacobi
-  ---------------------------------------------------------------------------*/
+      /*---------------------------------------------------------------------------
+        Jacobi
+        ---------------------------------------------------------------------------*/
       case 20:
       {
 
@@ -207,8 +207,8 @@ HYPRE_Int  hypre_BoomerAMGBlockRelax( hypre_ParCSRBlockMatrix *A,
          {
             num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
             v_buf_data = hypre_CTAlloc(HYPRE_Real,
-                                       hypre_ParCSRCommPkgSendMapStart(comm_pkg,  num_sends)*block_size, HYPRE_MEMORY_HOST);
-            Vext_data = hypre_CTAlloc(HYPRE_Real,  num_cols_offd*block_size, HYPRE_MEMORY_HOST);
+                                       hypre_ParCSRCommPkgSendMapStart(comm_pkg,  num_sends) * block_size, HYPRE_MEMORY_HOST);
+            Vext_data = hypre_CTAlloc(HYPRE_Real,  num_cols_offd * block_size, HYPRE_MEMORY_HOST);
             if (num_cols_offd)
             {
                A_offd_j = hypre_CSRBlockMatrixJ(A_offd);
@@ -218,12 +218,12 @@ HYPRE_Int  hypre_BoomerAMGBlockRelax( hypre_ParCSRBlockMatrix *A,
             for (i = 0; i < num_sends; i++)
             {
                start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-               for (j=start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+               for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
                {
                   for (k = 0; k < block_size; k++)
                   {
                      v_buf_data[index++]
-                        = u_data[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)*block_size + k];
+                        = u_data[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j) * block_size + k];
                   }
                }
             }
@@ -238,14 +238,13 @@ HYPRE_Int  hypre_BoomerAMGBlockRelax( hypre_ParCSRBlockMatrix *A,
           * Copy current approximation into temporary vector.
           *-----------------------------------------------------------------*/
 
-         for (i = 0; i < n*block_size; i++)
+         for (i = 0; i < n * block_size; i++)
          {
             Vtemp_data[i] = u_data[i];
          }
          if (num_procs > 1)
          {
-            hypre_ParCSRBlockCommHandleDestroy(comm_handle); /* now Vext_data
-                                                                is populated */
+            hypre_ParCSRBlockCommHandleDestroy(comm_handle); /* now Vext_data is populated */
             comm_handle = NULL;
          }
          /*-----------------------------------------------------------------
@@ -261,24 +260,24 @@ HYPRE_Int  hypre_BoomerAMGBlockRelax( hypre_ParCSRBlockMatrix *A,
                 * If diagonal is nonzero, relax point i; otherwise, skip it.
                 *-----------------------------------------------------------*/
 
-               for (k=0; k< block_size; k++)
+               for (k = 0; k < block_size; k++)
                {
-                  res_vec[k] = f_data[i*block_size+k];
+                  res_vec[k] = f_data[i * block_size + k];
                }
-               for (jj = A_diag_i[i]+1; jj < A_diag_i[i+1]; jj++)
+               for (jj = A_diag_i[i] + 1; jj < A_diag_i[i + 1]; jj++)
                {
                   ii = A_diag_j[jj];
                   /* res -= A_diag_data[jj] * Vtemp_data[ii]; */
-                  hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj*bnnz],
-                                                  &Vtemp_data[ii*block_size],
+                  hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj * bnnz],
+                                                  &Vtemp_data[ii * block_size],
                                                   1.0, res_vec, block_size);
                }
-               for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+               for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
                {
                   ii = A_offd_j[jj];
                   /* res -= A_offd_data[jj] * Vext_data[ii]; */
-                  hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_offd_data[jj*bnnz],
-                                                  &Vext_data[ii*block_size],
+                  hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_offd_data[jj * bnnz],
+                                                  &Vext_data[ii * block_size],
                                                   1.0, res_vec, block_size);
                }
 
@@ -286,10 +285,10 @@ HYPRE_Int  hypre_BoomerAMGBlockRelax( hypre_ParCSRBlockMatrix *A,
                if (hypre_CSRBlockMatrixBlockInvMatvec( &A_diag_data[A_diag_i[i]*bnnz], res_vec,
                                                        out_vec, block_size) == 0)
                {
-                  for (k=0; k< block_size; k++)
+                  for (k = 0; k < block_size; k++)
                   {
-                     u_data[i*block_size+k] *= one_minus_weight;
-                     u_data[i*block_size+k] += relax_weight *out_vec[k];
+                     u_data[i * block_size + k] *= one_minus_weight;
+                     u_data[i * block_size + k] += relax_weight * out_vec[k];
                   }
 
                }
@@ -313,24 +312,24 @@ HYPRE_Int  hypre_BoomerAMGBlockRelax( hypre_ParCSRBlockMatrix *A,
                if (cf_marker[i] == relax_points)
                {
 
-                  for (k=0; k< block_size; k++)
+                  for (k = 0; k < block_size; k++)
                   {
-                     res_vec[k] = f_data[i*block_size+k];
+                     res_vec[k] = f_data[i * block_size + k];
                   }
-                  for (jj = A_diag_i[i]+1; jj < A_diag_i[i+1]; jj++)
+                  for (jj = A_diag_i[i] + 1; jj < A_diag_i[i + 1]; jj++)
                   {
                      ii = A_diag_j[jj];
                      /* res -= A_diag_data[jj] * Vtemp_data[ii]; */
-                     hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj*bnnz],
-                                                     &Vtemp_data[ii*block_size],
+                     hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj * bnnz],
+                                                     &Vtemp_data[ii * block_size],
                                                      1.0, res_vec, block_size);
                   }
-                  for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+                  for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
                   {
                      ii = A_offd_j[jj];
                      /* res -= A_offd_data[jj] * Vext_data[ii]; */
-                     hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_offd_data[jj*bnnz],
-                                                     &Vext_data[ii*block_size],
+                     hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_offd_data[jj * bnnz],
+                                                     &Vext_data[ii * block_size],
                                                      1.0, res_vec, block_size);
                   }
 
@@ -338,10 +337,10 @@ HYPRE_Int  hypre_BoomerAMGBlockRelax( hypre_ParCSRBlockMatrix *A,
                   if (hypre_CSRBlockMatrixBlockInvMatvec( &A_diag_data[A_diag_i[i]*bnnz], res_vec,
                                                           out_vec, block_size) == 0)
                   {
-                     for (k=0; k< block_size; k++)
+                     for (k = 0; k < block_size; k++)
                      {
-                        u_data[i*block_size+k] *= one_minus_weight;
-                        u_data[i*block_size+k] += relax_weight *out_vec[k];
+                        u_data[i * block_size + k] *= one_minus_weight;
+                        u_data[i * block_size + k] += relax_weight * out_vec[k];
                      }
 
                   }
@@ -356,19 +355,19 @@ HYPRE_Int  hypre_BoomerAMGBlockRelax( hypre_ParCSRBlockMatrix *A,
 
          break;
 
-      } /* end case 20 */
+         } /* end case 20 */
 
-/*---------------------------------------------------------------------------
-  Hybrid: G-S on proc. and Jacobi off proc.
-  ---------------------------------------------------------------------------*/
+      /*---------------------------------------------------------------------------
+        Hybrid: G-S on proc. and Jacobi off proc.
+        ---------------------------------------------------------------------------*/
       case 23:
       {
          if (num_procs > 1)
          {
             num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
             v_buf_data = hypre_CTAlloc(HYPRE_Real,
-                                       hypre_ParCSRCommPkgSendMapStart(comm_pkg,  num_sends)*block_size, HYPRE_MEMORY_HOST);
-            Vext_data = hypre_CTAlloc(HYPRE_Real,  num_cols_offd*block_size, HYPRE_MEMORY_HOST);
+                                       hypre_ParCSRCommPkgSendMapStart(comm_pkg,  num_sends) * block_size, HYPRE_MEMORY_HOST);
+            Vext_data = hypre_CTAlloc(HYPRE_Real,  num_cols_offd * block_size, HYPRE_MEMORY_HOST);
             if (num_cols_offd)
             {
                A_offd_j = hypre_CSRBlockMatrixJ(A_offd);
@@ -378,12 +377,12 @@ HYPRE_Int  hypre_BoomerAMGBlockRelax( hypre_ParCSRBlockMatrix *A,
             for (i = 0; i < num_sends; i++)
             {
                start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-               for (j=start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+               for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
                {
                   for (k = 0; k < block_size; k++)
                   {
                      v_buf_data[index++]
-                        = u_data[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)*block_size + k];
+                        = u_data[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j) * block_size + k];
                   }
                }
             }
@@ -399,15 +398,14 @@ HYPRE_Int  hypre_BoomerAMGBlockRelax( hypre_ParCSRBlockMatrix *A,
           *-----------------------------------------------------------------*/
 
 
-         for (i = 0; i < n*block_size; i++)
+         for (i = 0; i < n * block_size; i++)
          {
             Vtemp_data[i] = u_data[i];
          }
 
          if (num_procs > 1)
          {
-            hypre_ParCSRBlockCommHandleDestroy(comm_handle); /* now Vext_data
-                                                                is populated */
+            hypre_ParCSRBlockCommHandleDestroy(comm_handle); /* now Vext_data is populated */
             comm_handle = NULL;
          }
 
@@ -429,21 +427,23 @@ HYPRE_Int  hypre_BoomerAMGBlockRelax( hypre_ParCSRBlockMatrix *A,
                   tmp_data = hypre_CTAlloc(HYPRE_Real, n, HYPRE_MEMORY_HOST);
 
                   for (i = 0; i < n; i++)
+                  {
                      tmp_data[i] = u_data[i];
+                  }
 
                   for (j = 0; j < num_threads; j++)
                   {
-                     size = n/num_threads;
-                     rest = n - size*num_threads;
+                     size = n / num_threads;
+                     rest = n - size * num_threads;
                      if (j < rest)
                      {
-                        ns = j*size+j;
-                        ne = (j+1)*size+j+1;
+                        ns = j * size + j;
+                        ne = (j + 1) * size + j + 1;
                      }
                      else
                      {
-                        ns = j*size+rest;
-                        ne = (j+1)*size+rest;
+                        ns = j * size + rest;
+                        ne = (j + 1) * size + rest;
                      }
                      for (i = ns; i < ne; i++)  /* interior points first */
                      {
@@ -451,34 +451,34 @@ HYPRE_Int  hypre_BoomerAMGBlockRelax( hypre_ParCSRBlockMatrix *A,
                          * If diagonal is nonzero, relax point i; otherwise, skip it.
                          *-----------------------------------------------------------*/
 
-                        for (k=0; k< block_size; k++)
+                        for (k = 0; k < block_size; k++)
                         {
-                           res_vec[k] = f_data[i*block_size+k];
+                           res_vec[k] = f_data[i * block_size + k];
                         }
-                        for (jj = A_diag_i[i]+1; jj < A_diag_i[i+1]; jj++)
+                        for (jj = A_diag_i[i] + 1; jj < A_diag_i[i + 1]; jj++)
                         {
                            ii = A_diag_j[jj];
                            if (ii >= ns && ii < ne)
                            {
                               /*  res -= A_diag_data[jj] * u_data[ii]; */
-                              hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj*bnnz],
-                                                              &u_data[ii*block_size],
+                              hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj * bnnz],
+                                                              &u_data[ii * block_size],
                                                               1.0, res_vec, block_size);
                            }
                            else
                            {
                               /* res -= A_diag_data[jj] * tmp_data[ii]; */
-                              hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj*bnnz],
-                                                              &tmp_data[ii*block_size],
+                              hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj * bnnz],
+                                                              &tmp_data[ii * block_size],
                                                               1.0, res_vec, block_size);
                            }
                         }
-                        for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+                        for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
                         {
                            ii = A_offd_j[jj];
                            /* res -= A_offd_data[jj] * Vext_data[ii];*/
-                           hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_offd_data[jj*bnnz],
-                                                           &Vext_data[ii*block_size],
+                           hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_offd_data[jj * bnnz],
+                                                           &Vext_data[ii * block_size],
                                                            1.0, res_vec, block_size);
 
                         }
@@ -487,9 +487,9 @@ HYPRE_Int  hypre_BoomerAMGBlockRelax( hypre_ParCSRBlockMatrix *A,
                         if (hypre_CSRBlockMatrixBlockInvMatvec( &A_diag_data[A_diag_i[i]*bnnz], res_vec,
                                                                 out_vec, block_size) == 0)
                         {
-                           for (k=0; k< block_size; k++)
+                           for (k = 0; k < block_size; k++)
                            {
-                              u_data[i*block_size+k] = out_vec[k];
+                              u_data[i * block_size + k] = out_vec[k];
                            }
                         }
                      } /* for loop over points */
@@ -504,33 +504,33 @@ HYPRE_Int  hypre_BoomerAMGBlockRelax( hypre_ParCSRBlockMatrix *A,
                      /*-----------------------------------------------------------
                       * If diagonal is nonzero, relax point i; otherwise, skip it.
                       *-----------------------------------------------------------*/
-                     for (k=0; k< block_size; k++)
+                     for (k = 0; k < block_size; k++)
                      {
-                        res_vec[k] = f_data[i*block_size+k];
+                        res_vec[k] = f_data[i * block_size + k];
                      }
-                     for (jj = A_diag_i[i]+1; jj < A_diag_i[i+1]; jj++)
+                     for (jj = A_diag_i[i] + 1; jj < A_diag_i[i + 1]; jj++)
                      {
                         ii = A_diag_j[jj];
                         /* res -= A_diag_data[jj] * u_data[ii]; */
-                        hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj*bnnz],
-                                                        &u_data[ii*block_size],
+                        hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj * bnnz],
+                                                        &u_data[ii * block_size],
                                                         1.0, res_vec, block_size);
                      }
-                     for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+                     for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
                      {
                         ii = A_offd_j[jj];
                         /* res -= A_offd_data[jj] * Vext_data[ii]; */
-                        hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_offd_data[jj*bnnz],
-                                                        &Vext_data[ii*block_size],
+                        hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_offd_data[jj * bnnz],
+                                                        &Vext_data[ii * block_size],
                                                         1.0, res_vec, block_size);
                      }
                      /* u_data[i] = res / A_diag_data[A_diag_i[i]]; */
                      if (hypre_CSRBlockMatrixBlockInvMatvec( &A_diag_data[A_diag_i[i]*bnnz], res_vec,
                                                              out_vec, block_size) == 0)
                      {
-                        for (k=0; k< block_size; k++)
+                        for (k = 0; k < block_size; k++)
                         {
-                           u_data[i*block_size+k] = out_vec[k];
+                           u_data[i * block_size + k] = out_vec[k];
                         }
                      }
                   } /* for loop over points */
@@ -547,21 +547,23 @@ HYPRE_Int  hypre_BoomerAMGBlockRelax( hypre_ParCSRBlockMatrix *A,
                   tmp_data = hypre_CTAlloc(HYPRE_Real, n, HYPRE_MEMORY_HOST);
 
                   for (i = 0; i < n; i++)
+                  {
                      tmp_data[i] = u_data[i];
+                  }
 
                   for (j = 0; j < num_threads; j++)
                   {
-                     size = n/num_threads;
-                     rest = n - size*num_threads;
+                     size = n / num_threads;
+                     rest = n - size * num_threads;
                      if (j < rest)
                      {
-                        ns = j*size+j;
-                        ne = (j+1)*size+j+1;
+                        ns = j * size + j;
+                        ne = (j + 1) * size + j + 1;
                      }
                      else
                      {
-                        ns = j*size+rest;
-                        ne = (j+1)*size+rest;
+                        ns = j * size + rest;
+                        ne = (j + 1) * size + rest;
                      }
                      for (i = ns; i < ne; i++) /* relax interior points */
                      {
@@ -571,34 +573,34 @@ HYPRE_Int  hypre_BoomerAMGBlockRelax( hypre_ParCSRBlockMatrix *A,
                          *-----------------------------------------------------------*/
                         if (cf_marker[i] == relax_points )
                         {
-                           for (k=0; k< block_size; k++)
+                           for (k = 0; k < block_size; k++)
                            {
-                              res_vec[k] = f_data[i*block_size+k];
+                              res_vec[k] = f_data[i * block_size + k];
                            }
-                           for (jj = A_diag_i[i]+1; jj < A_diag_i[i+1]; jj++)
+                           for (jj = A_diag_i[i] + 1; jj < A_diag_i[i + 1]; jj++)
                            {
                               ii = A_diag_j[jj];
                               if (ii >= ns && ii < ne)
                               {
                                  /* res -= A_diag_data[jj] * u_data[ii]; */
-                                 hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj*bnnz],
-                                                                 &u_data[ii*block_size],
+                                 hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj * bnnz],
+                                                                 &u_data[ii * block_size],
                                                                  1.0, res_vec, block_size);
                               }
                               else
                               {
                                  /* res -= A_diag_data[jj] * tmp_data[ii]; */
-                                 hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj*bnnz],
-                                                                 &tmp_data[ii*block_size],
+                                 hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj * bnnz],
+                                                                 &tmp_data[ii * block_size],
                                                                  1.0, res_vec, block_size);
                               }
                            }
-                           for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+                           for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
                            {
                               ii = A_offd_j[jj];
                               /* res -= A_offd_data[jj] * Vext_data[ii];*/
-                              hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_offd_data[jj*bnnz],
-                                                              &Vext_data[ii*block_size],
+                              hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_offd_data[jj * bnnz],
+                                                              &Vext_data[ii * block_size],
                                                               1.0, res_vec, block_size);
 
                            }
@@ -607,9 +609,9 @@ HYPRE_Int  hypre_BoomerAMGBlockRelax( hypre_ParCSRBlockMatrix *A,
                            if (hypre_CSRBlockMatrixBlockInvMatvec( &A_diag_data[A_diag_i[i]*bnnz], res_vec,
                                                                    out_vec, block_size) == 0)
                            {
-                              for (k=0; k< block_size; k++)
+                              for (k = 0; k < block_size; k++)
                               {
-                                 u_data[i*block_size+k] = out_vec[k];
+                                 u_data[i * block_size + k] = out_vec[k];
                               }
                            }
                         }
@@ -627,24 +629,24 @@ HYPRE_Int  hypre_BoomerAMGBlockRelax( hypre_ParCSRBlockMatrix *A,
                       *-----------------------------------------------------------*/
                      if (cf_marker[i] == relax_points )
                      {
-                        for (k=0; k< block_size; k++)
+                        for (k = 0; k < block_size; k++)
                         {
-                           res_vec[k] = f_data[i*block_size+k];
+                           res_vec[k] = f_data[i * block_size + k];
                         }
-                        for (jj = A_diag_i[i]+1; jj < A_diag_i[i+1]; jj++)
+                        for (jj = A_diag_i[i] + 1; jj < A_diag_i[i + 1]; jj++)
                         {
                            ii = A_diag_j[jj];
                            /* res -= A_diag_data[jj] * u_data[ii]; */
-                           hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj*bnnz],
-                                                           &u_data[ii*block_size],
+                           hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj * bnnz],
+                                                           &u_data[ii * block_size],
                                                            1.0, res_vec, block_size);
                         }
-                        for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+                        for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
                         {
                            ii = A_offd_j[jj];
                            /* res -= A_offd_data[jj] * Vext_data[ii];*/
-                           hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_offd_data[jj*bnnz],
-                                                           &Vext_data[ii*block_size],
+                           hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_offd_data[jj * bnnz],
+                                                           &Vext_data[ii * block_size],
                                                            1.0, res_vec, block_size);
 
                         }
@@ -653,9 +655,9 @@ HYPRE_Int  hypre_BoomerAMGBlockRelax( hypre_ParCSRBlockMatrix *A,
                         if (hypre_CSRBlockMatrixBlockInvMatvec( &A_diag_data[A_diag_i[i]*bnnz], res_vec,
                                                                 out_vec, block_size) == 0)
                         {
-                           for (k=0; k< block_size; k++)
+                           for (k = 0; k < block_size; k++)
                            {
-                              u_data[i*block_size+k] = out_vec[k];
+                              u_data[i * block_size + k] = out_vec[k];
                            }
                         }
                      }
@@ -668,7 +670,7 @@ HYPRE_Int  hypre_BoomerAMGBlockRelax( hypre_ParCSRBlockMatrix *A,
             /*-----------------------------------------------------------------
              * relax weight and omega do not = 1
              *-----------------------------------------------------------------*/
-            prod = (1.0-relax_weight*omega);
+            prod = (1.0 - relax_weight * omega);
             res0_vec = hypre_CTAlloc(HYPRE_Real,  block_size, HYPRE_MEMORY_HOST);
             res2_vec = hypre_CTAlloc(HYPRE_Real,  block_size, HYPRE_MEMORY_HOST);
 
@@ -682,76 +684,78 @@ HYPRE_Int  hypre_BoomerAMGBlockRelax( hypre_ParCSRBlockMatrix *A,
                {
                   tmp_data = hypre_CTAlloc(HYPRE_Real, n, HYPRE_MEMORY_HOST);
                   for (i = 0; i < n; i++)
+                  {
                      tmp_data[i] = u_data[i];
+                  }
                   for (j = 0; j < num_threads; j++)
                   {
-                     size = n/num_threads;
-                     rest = n - size*num_threads;
+                     size = n / num_threads;
+                     rest = n - size * num_threads;
                      if (j < rest)
                      {
-                        ns = j*size+j;
-                        ne = (j+1)*size+j+1;
+                        ns = j * size + j;
+                        ne = (j + 1) * size + j + 1;
                      }
                      else
                      {
-                        ns = j*size+rest;
-                        ne = (j+1)*size+rest;
+                        ns = j * size + rest;
+                        ne = (j + 1) * size + rest;
                      }
                      for (i = ns; i < ne; i++)  /* interior points first */
                      {
                         /*-----------------------------------------------------------
                          * If diagonal is nonzero, relax point i; otherwise, skip it.
                          *-----------------------------------------------------------*/
-                        for (k=0; k< block_size; k++)
+                        for (k = 0; k < block_size; k++)
                         {
-                           res_vec[k] = f_data[i*block_size+k];
+                           res_vec[k] = f_data[i * block_size + k];
                            res0_vec[k] = 0.0;
                            res2_vec[k] = 0.0;
                         }
-                        for (jj = A_diag_i[i]+1; jj < A_diag_i[i+1]; jj++)
+                        for (jj = A_diag_i[i] + 1; jj < A_diag_i[i + 1]; jj++)
                         {
                            ii = A_diag_j[jj];
                            if (ii >= ns && ii < ne)
                            {
                               /* res0 -= A_diag_data[jj] * u_data[ii]; */
-                              hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj*bnnz],
-                                                              &u_data[ii*block_size],
+                              hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj * bnnz],
+                                                              &u_data[ii * block_size],
                                                               1.0, res0_vec, block_size);
                               /* res2 += A_diag_data[jj] * Vtemp_data[ii];*/
-                              hypre_CSRBlockMatrixBlockMatvec(1.0, &A_diag_data[jj*bnnz],
-                                                              &Vtemp_data[ii*block_size],
+                              hypre_CSRBlockMatrixBlockMatvec(1.0, &A_diag_data[jj * bnnz],
+                                                              &Vtemp_data[ii * block_size],
                                                               1.0, res2_vec, block_size);
                            }
                            else
                            {
                               /* res -= A_diag_data[jj] * tmp_data[ii]; */
-                              hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj*bnnz],
-                                                              &tmp_data[ii*block_size],
+                              hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj * bnnz],
+                                                              &tmp_data[ii * block_size],
                                                               1.0, res_vec, block_size);
                            }
                         }
-                        for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+                        for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
                         {
                            ii = A_offd_j[jj];
                            /* res -= A_offd_data[jj] * Vext_data[ii];*/
-                           hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_offd_data[jj*bnnz],
-                                                           &Vext_data[ii*block_size],
+                           hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_offd_data[jj * bnnz],
+                                                           &Vext_data[ii * block_size],
                                                            1.0, res_vec, block_size);
                         }
                         /* u_data[i] *= prod;
                            u_data[i] += relax_weight*(omega*res + res0 +
                            one_minus_omega*res2) / A_diag_data[A_diag_i[i]];*/
-                        for (k=0; k< block_size; k++)
+                        for (k = 0; k < block_size; k++)
                         {
-                           tmp_vec[k] =  omega*res_vec[k] + res0_vec[k] + one_minus_omega*res2_vec[k];
+                           tmp_vec[k] =  omega * res_vec[k] + res0_vec[k] + one_minus_omega * res2_vec[k];
                         }
                         if (hypre_CSRBlockMatrixBlockInvMatvec( &A_diag_data[A_diag_i[i]*bnnz], tmp_vec,
                                                                 out_vec, block_size) == 0)
                         {
-                           for (k=0; k< block_size; k++)
+                           for (k = 0; k < block_size; k++)
                            {
-                              u_data[i*block_size+k] *= prod;
-                              u_data[i*block_size+k] += relax_weight *out_vec[k];
+                              u_data[i * block_size + k] *= prod;
+                              u_data[i * block_size + k] += relax_weight * out_vec[k];
                            }
                         }
 
@@ -766,46 +770,46 @@ HYPRE_Int  hypre_BoomerAMGBlockRelax( hypre_ParCSRBlockMatrix *A,
                      /*-----------------------------------------------------------
                       * If diagonal is nonzero, relax point i; otherwise, skip it.
                       *-----------------------------------------------------------*/
-                     for (k=0; k< block_size; k++)
+                     for (k = 0; k < block_size; k++)
                      {
-                        res_vec[k] = f_data[i*block_size+k];
+                        res_vec[k] = f_data[i * block_size + k];
                         res0_vec[k] = 0.0;
                         res2_vec[k] = 0.0;
                      }
-                     for (jj = A_diag_i[i]+1; jj < A_diag_i[i+1]; jj++)
+                     for (jj = A_diag_i[i] + 1; jj < A_diag_i[i + 1]; jj++)
                      {
                         ii = A_diag_j[jj];
                         /* res0 -= A_diag_data[jj] * u_data[ii]; */
-                        hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj*bnnz],
-                                                        &u_data[ii*block_size],
+                        hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj * bnnz],
+                                                        &u_data[ii * block_size],
                                                         1.0, res0_vec, block_size);
                         /* res2 += A_diag_data[jj] * Vtemp_data[ii];*/
-                        hypre_CSRBlockMatrixBlockMatvec(1.0, &A_diag_data[jj*bnnz],
-                                                        &Vtemp_data[ii*block_size],
+                        hypre_CSRBlockMatrixBlockMatvec(1.0, &A_diag_data[jj * bnnz],
+                                                        &Vtemp_data[ii * block_size],
                                                         1.0, res2_vec, block_size);
                      }
-                     for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+                     for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
                      {
                         ii = A_offd_j[jj];
                         /* res -= A_offd_data[jj] * Vext_data[ii];*/
-                        hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_offd_data[jj*bnnz],
-                                                        &Vext_data[ii*block_size],
+                        hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_offd_data[jj * bnnz],
+                                                        &Vext_data[ii * block_size],
                                                         1.0, res_vec, block_size);
                      }
                      /* u_data[i] *= prod;
                         u_data[i] += relax_weight*(omega*res + res0 +
                         one_minus_omega*res2) / A_diag_data[A_diag_i[i]]; */
-                     for (k=0; k< block_size; k++)
+                     for (k = 0; k < block_size; k++)
                      {
-                        tmp_vec[k] =  omega*res_vec[k] + res0_vec[k] + one_minus_omega*res2_vec[k];
+                        tmp_vec[k] =  omega * res_vec[k] + res0_vec[k] + one_minus_omega * res2_vec[k];
                      }
                      if (hypre_CSRBlockMatrixBlockInvMatvec( &A_diag_data[A_diag_i[i]*bnnz], tmp_vec,
                                                              out_vec, block_size) == 0)
                      {
-                        for (k=0; k< block_size; k++)
+                        for (k = 0; k < block_size; k++)
                         {
-                           u_data[i*block_size+k] *= prod;
-                           u_data[i*block_size+k] += relax_weight *out_vec[k];
+                           u_data[i * block_size + k] *= prod;
+                           u_data[i * block_size + k] += relax_weight * out_vec[k];
                         }
                      }
                   } /* end of loop over points */
@@ -820,20 +824,22 @@ HYPRE_Int  hypre_BoomerAMGBlockRelax( hypre_ParCSRBlockMatrix *A,
                {
                   tmp_data = hypre_CTAlloc(HYPRE_Real, n, HYPRE_MEMORY_HOST);
                   for (i = 0; i < n; i++)
+                  {
                      tmp_data[i] = u_data[i];
+                  }
                   for (j = 0; j < num_threads; j++)
                   {
-                     size = n/num_threads;
-                     rest = n - size*num_threads;
+                     size = n / num_threads;
+                     rest = n - size * num_threads;
                      if (j < rest)
                      {
-                        ns = j*size+j;
-                        ne = (j+1)*size+j+1;
+                        ns = j * size + j;
+                        ne = (j + 1) * size + j + 1;
                      }
                      else
                      {
-                        ns = j*size+rest;
-                        ne = (j+1)*size+rest;
+                        ns = j * size + rest;
+                        ne = (j + 1) * size + rest;
                      }
                      for (i = ns; i < ne; i++) /* relax interior points */
                      {
@@ -848,56 +854,56 @@ HYPRE_Int  hypre_BoomerAMGBlockRelax( hypre_ParCSRBlockMatrix *A,
                            /*-----------------------------------------------------------
                             * If diagonal is nonzero, relax point i; otherwise, skip it.
                             *-----------------------------------------------------------*/
-                           for (k=0; k< block_size; k++)
+                           for (k = 0; k < block_size; k++)
                            {
-                              res_vec[k] = f_data[i*block_size+k];
+                              res_vec[k] = f_data[i * block_size + k];
                               res0_vec[k] = 0.0;
                               res2_vec[k] = 0.0;
                            }
-                           for (jj = A_diag_i[i]+1; jj < A_diag_i[i+1]; jj++)
+                           for (jj = A_diag_i[i] + 1; jj < A_diag_i[i + 1]; jj++)
                            {
                               ii = A_diag_j[jj];
                               if (ii >= ns && ii < ne)
                               {
                                  /* res0 -= A_diag_data[jj] * u_data[ii]; */
-                                 hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj*bnnz],
-                                                                 &u_data[ii*block_size],
+                                 hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj * bnnz],
+                                                                 &u_data[ii * block_size],
                                                                  1.0, res0_vec, block_size);
                                  /* res2 += A_diag_data[jj] * Vtemp_data[ii];*/
-                                 hypre_CSRBlockMatrixBlockMatvec(1.0, &A_diag_data[jj*bnnz],
-                                                                 &Vtemp_data[ii*block_size],
+                                 hypre_CSRBlockMatrixBlockMatvec(1.0, &A_diag_data[jj * bnnz],
+                                                                 &Vtemp_data[ii * block_size],
                                                                  1.0, res2_vec, block_size);
                               }
                               else
                               {
                                  /* res -= A_diag_data[jj] * tmp_data[ii]; */
-                                 hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj*bnnz],
-                                                                 &tmp_data[ii*block_size],
+                                 hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj * bnnz],
+                                                                 &tmp_data[ii * block_size],
                                                                  1.0, res_vec, block_size);
                               }
                            }
-                           for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+                           for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
                            {
                               ii = A_offd_j[jj];
                               /* res -= A_offd_data[jj] * Vext_data[ii];*/
-                              hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_offd_data[jj*bnnz],
-                                                              &Vext_data[ii*block_size],
+                              hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_offd_data[jj * bnnz],
+                                                              &Vext_data[ii * block_size],
                                                               1.0, res_vec, block_size);
                            }
                            /* u_data[i] *= prod;
                               u_data[i] += relax_weight*(omega*res + res0 +
                               one_minus_omega*res2) / A_diag_data[A_diag_i[i]];*/
-                           for (k=0; k< block_size; k++)
+                           for (k = 0; k < block_size; k++)
                            {
-                              tmp_vec[k] =  omega*res_vec[k] + res0_vec[k] + one_minus_omega*res2_vec[k];
+                              tmp_vec[k] =  omega * res_vec[k] + res0_vec[k] + one_minus_omega * res2_vec[k];
                            }
                            if (hypre_CSRBlockMatrixBlockInvMatvec( &A_diag_data[A_diag_i[i]*bnnz], tmp_vec,
                                                                    out_vec, block_size) == 0)
                            {
-                              for (k=0; k< block_size; k++)
+                              for (k = 0; k < block_size; k++)
                               {
-                                 u_data[i*block_size+k] *= prod;
-                                 u_data[i*block_size+k] += relax_weight *out_vec[k];
+                                 u_data[i * block_size + k] *= prod;
+                                 u_data[i * block_size + k] += relax_weight * out_vec[k];
                               }
                            }
                         } /* end of if cf_marker */
@@ -920,46 +926,46 @@ HYPRE_Int  hypre_BoomerAMGBlockRelax( hypre_ParCSRBlockMatrix *A,
                         /*-----------------------------------------------------------
                          * If diagonal is nonzero, relax point i; otherwise, skip it.
                          *-----------------------------------------------------------*/
-                        for (k=0; k< block_size; k++)
+                        for (k = 0; k < block_size; k++)
                         {
-                           res_vec[k] = f_data[i*block_size+k];
+                           res_vec[k] = f_data[i * block_size + k];
                            res0_vec[k] = 0.0;
                            res2_vec[k] = 0.0;
                         }
-                        for (jj = A_diag_i[i]+1; jj < A_diag_i[i+1]; jj++)
+                        for (jj = A_diag_i[i] + 1; jj < A_diag_i[i + 1]; jj++)
                         {
                            ii = A_diag_j[jj];
                            /* res0 -= A_diag_data[jj] * u_data[ii]; */
-                           hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj*bnnz],
-                                                           &u_data[ii*block_size],
+                           hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj * bnnz],
+                                                           &u_data[ii * block_size],
                                                            1.0, res0_vec, block_size);
                            /* res2 += A_diag_data[jj] * Vtemp_data[ii];*/
-                           hypre_CSRBlockMatrixBlockMatvec(1.0, &A_diag_data[jj*bnnz],
-                                                           &Vtemp_data[ii*block_size],
+                           hypre_CSRBlockMatrixBlockMatvec(1.0, &A_diag_data[jj * bnnz],
+                                                           &Vtemp_data[ii * block_size],
                                                            1.0, res2_vec, block_size);
                         }
-                        for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+                        for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
                         {
                            ii = A_offd_j[jj];
                            /* res -= A_offd_data[jj] * Vext_data[ii];*/
-                           hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_offd_data[jj*bnnz],
-                                                           &Vext_data[ii*block_size],
+                           hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_offd_data[jj * bnnz],
+                                                           &Vext_data[ii * block_size],
                                                            1.0, res_vec, block_size);
                         }
                         /* u_data[i] *= prod;
                            u_data[i] += relax_weight*(omega*res + res0 +
                            one_minus_omega*res2) / A_diag_data[A_diag_i[i]];*/
-                        for (k=0; k< block_size; k++)
+                        for (k = 0; k < block_size; k++)
                         {
-                           tmp_vec[k] =  omega*res_vec[k] + res0_vec[k] + one_minus_omega*res2_vec[k];
+                           tmp_vec[k] =  omega * res_vec[k] + res0_vec[k] + one_minus_omega * res2_vec[k];
                         }
                         if (hypre_CSRBlockMatrixBlockInvMatvec( &A_diag_data[A_diag_i[i]*bnnz], tmp_vec,
                                                                 out_vec, block_size) == 0)
                         {
-                           for (k=0; k< block_size; k++)
+                           for (k = 0; k < block_size; k++)
                            {
-                              u_data[i*block_size+k] *= prod;
-                              u_data[i*block_size+k] += relax_weight *out_vec[k];
+                              u_data[i * block_size + k] *= prod;
+                              u_data[i * block_size + k] += relax_weight * out_vec[k];
                            }
                         }
                      } /* end cf_marker */
@@ -982,11 +988,11 @@ HYPRE_Int  hypre_BoomerAMGBlockRelax( hypre_ParCSRBlockMatrix *A,
 
 
 
-/*-----------------------------------------------------------------
-  Hybrid: Jacobi off-processor,
-  Symm. Gauss-Seidel/ SSOR on-processor
-  with outer relaxation parameter
-  *-----------------------------------------------------------------*/
+      /*-----------------------------------------------------------------
+        Hybrid: Jacobi off-processor,
+        Symm. Gauss-Seidel/ SSOR on-processor
+        with outer relaxation parameter
+        *-----------------------------------------------------------------*/
 
       case 26:
       {
@@ -996,9 +1002,9 @@ HYPRE_Int  hypre_BoomerAMGBlockRelax( hypre_ParCSRBlockMatrix *A,
             num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
 
             v_buf_data = hypre_CTAlloc(HYPRE_Real,
-                                       hypre_ParCSRCommPkgSendMapStart(comm_pkg,  num_sends)*block_size, HYPRE_MEMORY_HOST);
+                                       hypre_ParCSRCommPkgSendMapStart(comm_pkg,  num_sends) * block_size, HYPRE_MEMORY_HOST);
 
-            Vext_data = hypre_CTAlloc(HYPRE_Real, num_cols_offd*block_size, HYPRE_MEMORY_HOST);
+            Vext_data = hypre_CTAlloc(HYPRE_Real, num_cols_offd * block_size, HYPRE_MEMORY_HOST);
 
             if (num_cols_offd)
             {
@@ -1010,12 +1016,12 @@ HYPRE_Int  hypre_BoomerAMGBlockRelax( hypre_ParCSRBlockMatrix *A,
             for (i = 0; i < num_sends; i++)
             {
                start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-               for (j=start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg,i+1); j++)
+               for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
                {
                   for (k = 0; k < block_size; k++)
                   {
                      v_buf_data[index++]
-                        = u_data[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)*block_size + k];
+                        = u_data[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j) * block_size + k];
                   }
                }
 
@@ -1043,20 +1049,22 @@ HYPRE_Int  hypre_BoomerAMGBlockRelax( hypre_ParCSRBlockMatrix *A,
                {
                   tmp_data = hypre_CTAlloc(HYPRE_Real, n, HYPRE_MEMORY_HOST);
                   for (i = 0; i < n; i++)
+                  {
                      tmp_data[i] = u_data[i];
+                  }
                   for (j = 0; j < num_threads; j++)
                   {
-                     size = n/num_threads;
-                     rest = n - size*num_threads;
+                     size = n / num_threads;
+                     rest = n - size * num_threads;
                      if (j < rest)
                      {
-                        ns = j*size+j;
-                        ne = (j+1)*size+j+1;
+                        ns = j * size + j;
+                        ne = (j + 1) * size + j + 1;
                      }
                      else
                      {
-                        ns = j*size+rest;
-                        ne = (j+1)*size+rest;
+                        ns = j * size + rest;
+                        ne = (j + 1) * size + rest;
                      }
                      for (i = ns; i < ne; i++)   /* interior points first */
                      {
@@ -1065,37 +1073,37 @@ HYPRE_Int  hypre_BoomerAMGBlockRelax( hypre_ParCSRBlockMatrix *A,
                          * If diagonal is nonzero, relax point i; otherwise, skip it.
                          *-----------------------------------------------------------*/
 
-                        for (k=0; k< block_size; k++)
+                        for (k = 0; k < block_size; k++)
                         {
-                           res_vec[k] = f_data[i*block_size+k];
+                           res_vec[k] = f_data[i * block_size + k];
                         }
 
-                        for (jj = A_diag_i[i]+1; jj < A_diag_i[i+1]; jj++)
+                        for (jj = A_diag_i[i] + 1; jj < A_diag_i[i + 1]; jj++)
                         {
                            ii = A_diag_j[jj];
                            if (ii >= ns && ii < ne)
                            {
                               /* res -= A_diag_data[jj] * u_data[ii]; */
-                              hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj*bnnz],
-                                                              &u_data[ii*block_size],
+                              hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj * bnnz],
+                                                              &u_data[ii * block_size],
                                                               1.0, res_vec, block_size);
                            }
                            else
                            {
                               /* res -= A_diag_data[jj] * tmp_data[ii]; */
-                              hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj*bnnz],
-                                                              &tmp_data[ii*block_size],
+                              hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj * bnnz],
+                                                              &tmp_data[ii * block_size],
                                                               1.0, res_vec, block_size);
                            }
 
                         }
-                        for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+                        for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
                         {
                            ii = A_offd_j[jj];
 
                            /* res -= A_offd_data[jj] * Vext_data[ii];*/
-                           hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_offd_data[jj*bnnz],
-                                                           &Vext_data[ii*block_size],
+                           hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_offd_data[jj * bnnz],
+                                                           &Vext_data[ii * block_size],
                                                            1.0, res_vec, block_size);
                         }
                         /* u_data[i] = res / A_diag_data[A_diag_i[i]]; */
@@ -1103,52 +1111,52 @@ HYPRE_Int  hypre_BoomerAMGBlockRelax( hypre_ParCSRBlockMatrix *A,
                         if (hypre_CSRBlockMatrixBlockInvMatvec( &A_diag_data[A_diag_i[i]*bnnz], res_vec,
                                                                 out_vec, block_size) == 0)
                         {
-                           for (k=0; k< block_size; k++)
+                           for (k = 0; k < block_size; k++)
                            {
-                              u_data[i*block_size+k] = out_vec[k];
+                              u_data[i * block_size + k] = out_vec[k];
                            }
                         }
                      } /* end of interior points loop */
 
-                     for (i = ne-1; i > ns-1; i--)       /* interior points first */
+                     for (i = ne - 1; i > ns - 1; i--)   /* interior points first */
                      {
 
                         /*-----------------------------------------------------------
                          * If diagonal is nonzero, relax point i; otherwise, skip it.
                          *-----------------------------------------------------------*/
 
-                        for (k=0; k< block_size; k++)
+                        for (k = 0; k < block_size; k++)
                         {
-                           res_vec[k] = f_data[i*block_size+k];
+                           res_vec[k] = f_data[i * block_size + k];
                         }
 
-                        for (jj = A_diag_i[i]+1; jj < A_diag_i[i+1]; jj++)
+                        for (jj = A_diag_i[i] + 1; jj < A_diag_i[i + 1]; jj++)
                         {
                            ii = A_diag_j[jj];
                            if (ii >= ns && ii < ne)
                            {
 
                               /* res -= A_diag_data[jj] * u_data[ii]; */
-                              hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj*bnnz],
-                                                              &u_data[ii*block_size],
+                              hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj * bnnz],
+                                                              &u_data[ii * block_size],
                                                               1.0, res_vec, block_size);
 
                            }
                            else
                            {
                               /* res -= A_diag_data[jj] * tmp_data[ii]; */
-                              hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj*bnnz],
-                                                              &tmp_data[ii*block_size],
+                              hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj * bnnz],
+                                                              &tmp_data[ii * block_size],
                                                               1.0, res_vec, block_size);
 
                            }
                         }
-                        for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+                        for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
                         {
                            ii = A_offd_j[jj];
                            /* res -= A_offd_data[jj] * Vext_data[ii]; */
-                           hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_offd_data[jj*bnnz],
-                                                           &Vext_data[ii*block_size],
+                           hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_offd_data[jj * bnnz],
+                                                           &Vext_data[ii * block_size],
                                                            1.0, res_vec, block_size);
                         }
                         /* u_data[i] = res / A_diag_data[A_diag_i[i]]; */
@@ -1156,9 +1164,9 @@ HYPRE_Int  hypre_BoomerAMGBlockRelax( hypre_ParCSRBlockMatrix *A,
                         if (hypre_CSRBlockMatrixBlockInvMatvec( &A_diag_data[A_diag_i[i]*bnnz], res_vec,
                                                                 out_vec, block_size) == 0)
                         {
-                           for (k=0; k< block_size; k++)
+                           for (k = 0; k < block_size; k++)
                            {
-                              u_data[i*block_size+k] = out_vec[k];
+                              u_data[i * block_size + k] = out_vec[k];
                            }
                         }
                      } /* end of loop over points */
@@ -1173,71 +1181,71 @@ HYPRE_Int  hypre_BoomerAMGBlockRelax( hypre_ParCSRBlockMatrix *A,
                      /*-----------------------------------------------------------
                       * If diagonal is nonzero, relax point i; otherwise, skip it.
                       *-----------------------------------------------------------*/
-                     for (k=0; k< block_size; k++)
+                     for (k = 0; k < block_size; k++)
                      {
-                        res_vec[k] = f_data[i*block_size+k];
+                        res_vec[k] = f_data[i * block_size + k];
                      }
-                     for (jj = A_diag_i[i]+1; jj < A_diag_i[i+1]; jj++)
+                     for (jj = A_diag_i[i] + 1; jj < A_diag_i[i + 1]; jj++)
                      {
                         ii = A_diag_j[jj];
                         /* res -= A_diag_data[jj] * u_data[ii]; */
-                        hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj*bnnz],
-                                                        &u_data[ii*block_size],
+                        hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj * bnnz],
+                                                        &u_data[ii * block_size],
                                                         1.0, res_vec, block_size);
                      }
-                     for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+                     for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
                      {
                         ii = A_offd_j[jj];
 
                         /* res -= A_offd_data[jj] * Vext_data[ii]; */
-                        hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_offd_data[jj*bnnz],
-                                                        &Vext_data[ii*block_size],
+                        hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_offd_data[jj * bnnz],
+                                                        &Vext_data[ii * block_size],
                                                         1.0, res_vec, block_size);
                      }
                      /* u_data[i] = res / A_diag_data[A_diag_i[i]]; */
                      if (hypre_CSRBlockMatrixBlockInvMatvec( &A_diag_data[A_diag_i[i]*bnnz], res_vec,
                                                              out_vec, block_size) == 0)
                      {
-                        for (k=0; k< block_size; k++)
+                        for (k = 0; k < block_size; k++)
                         {
-                           u_data[i*block_size+k] = out_vec[k];
+                           u_data[i * block_size + k] = out_vec[k];
                         }
                      }
                   } /* end of loop over points */
-                  for (i = n-1; i > -1; i--)     /* interior points first */
+                  for (i = n - 1; i > -1; i--)   /* interior points first */
                   {
 
                      /*-----------------------------------------------------------
                       * If diagonal is nonzero, relax point i; otherwise, skip it.
                       *-----------------------------------------------------------*/
-                     for (k=0; k< block_size; k++)
+                     for (k = 0; k < block_size; k++)
                      {
-                        res_vec[k] = f_data[i*block_size+k];
+                        res_vec[k] = f_data[i * block_size + k];
                      }
 
-                     for (jj = A_diag_i[i]+1; jj < A_diag_i[i+1]; jj++)
+                     for (jj = A_diag_i[i] + 1; jj < A_diag_i[i + 1]; jj++)
                      {
                         ii = A_diag_j[jj];
                         /* res -= A_diag_data[jj] * u_data[ii]; */
-                        hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj*bnnz],
-                                                        &u_data[ii*block_size],
+                        hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj * bnnz],
+                                                        &u_data[ii * block_size],
                                                         1.0, res_vec, block_size);
                      }
-                     for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+                     for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
                      {
                         ii = A_offd_j[jj];
                         /* res -= A_offd_data[jj] * Vext_data[ii]; */
-                        hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_offd_data[jj*bnnz],
-                                                        &Vext_data[ii*block_size],
+                        hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_offd_data[jj * bnnz],
+                                                        &Vext_data[ii * block_size],
                                                         1.0, res_vec, block_size);
                      }
                      /* u_data[i] = res / A_diag_data[A_diag_i[i]]; */
                      if (hypre_CSRBlockMatrixBlockInvMatvec( &A_diag_data[A_diag_i[i]*bnnz], res_vec,
                                                              out_vec, block_size) == 0)
                      {
-                        for (k=0; k< block_size; k++)
+                        for (k = 0; k < block_size; k++)
                         {
-                           u_data[i*block_size+k] = out_vec[k];
+                           u_data[i * block_size + k] = out_vec[k];
                         }
                      }
 
@@ -1254,20 +1262,22 @@ HYPRE_Int  hypre_BoomerAMGBlockRelax( hypre_ParCSRBlockMatrix *A,
                {
                   tmp_data = hypre_CTAlloc(HYPRE_Real, n, HYPRE_MEMORY_HOST);
                   for (i = 0; i < n; i++)
+                  {
                      tmp_data[i] = u_data[i];
+                  }
                   for (j = 0; j < num_threads; j++)
                   {
-                     size = n/num_threads;
-                     rest = n - size*num_threads;
+                     size = n / num_threads;
+                     rest = n - size * num_threads;
                      if (j < rest)
                      {
-                        ns = j*size+j;
-                        ne = (j+1)*size+j+1;
+                        ns = j * size + j;
+                        ne = (j + 1) * size + j + 1;
                      }
                      else
                      {
-                        ns = j*size+rest;
-                        ne = (j+1)*size+rest;
+                        ns = j * size + rest;
+                        ne = (j + 1) * size + rest;
                      }
                      for (i = ns; i < ne; i++) /* relax interior points */
                      {
@@ -1279,34 +1289,34 @@ HYPRE_Int  hypre_BoomerAMGBlockRelax( hypre_ParCSRBlockMatrix *A,
 
                         if (cf_marker[i] == relax_points)
                         {
-                           for (k=0; k< block_size; k++)
+                           for (k = 0; k < block_size; k++)
                            {
-                              res_vec[k] = f_data[i*block_size+k];
+                              res_vec[k] = f_data[i * block_size + k];
                            }
-                           for (jj = A_diag_i[i]+1; jj < A_diag_i[i+1]; jj++)
+                           for (jj = A_diag_i[i] + 1; jj < A_diag_i[i + 1]; jj++)
                            {
                               ii = A_diag_j[jj];
                               if (ii >= ns && ii < ne)
                               {
                                  /* res -= A_diag_data[jj] * u_data[ii]; */
-                                 hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj*bnnz],
-                                                                 &u_data[ii*block_size],
+                                 hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj * bnnz],
+                                                                 &u_data[ii * block_size],
                                                                  1.0, res_vec, block_size);
                               }
                               else
                               {
                                  /* res -= A_diag_data[jj] * tmp_data[ii]; */
-                                 hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj*bnnz],
-                                                                 &tmp_data[ii*block_size],
+                                 hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj * bnnz],
+                                                                 &tmp_data[ii * block_size],
                                                                  1.0, res_vec, block_size);
                               }
                            }
-                           for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+                           for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
                            {
                               ii = A_offd_j[jj];
                               /* res -= A_offd_data[jj] * Vext_data[ii];*/
-                              hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_offd_data[jj*bnnz],
-                                                              &Vext_data[ii*block_size],
+                              hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_offd_data[jj * bnnz],
+                                                              &Vext_data[ii * block_size],
                                                               1.0, res_vec, block_size);
 
                            }
@@ -1315,15 +1325,15 @@ HYPRE_Int  hypre_BoomerAMGBlockRelax( hypre_ParCSRBlockMatrix *A,
                            if (hypre_CSRBlockMatrixBlockInvMatvec( &A_diag_data[A_diag_i[i]*bnnz], res_vec,
                                                                    out_vec, block_size) == 0)
                            {
-                              for (k=0; k< block_size; k++)
+                              for (k = 0; k < block_size; k++)
                               {
-                                 u_data[i*block_size+k] = out_vec[k];
+                                 u_data[i * block_size + k] = out_vec[k];
                               }
                            }
                         }
                      }
 
-                     for (i = ne-1; i > ns-1; i--) /* relax interior points */
+                     for (i = ne - 1; i > ns - 1; i--) /* relax interior points */
                      {
 
                         /*-----------------------------------------------------------
@@ -1333,34 +1343,34 @@ HYPRE_Int  hypre_BoomerAMGBlockRelax( hypre_ParCSRBlockMatrix *A,
 
                         if (cf_marker[i] == relax_points)
                         {
-                           for (k=0; k< block_size; k++)
+                           for (k = 0; k < block_size; k++)
                            {
-                              res_vec[k] = f_data[i*block_size+k];
+                              res_vec[k] = f_data[i * block_size + k];
                            }
-                           for (jj = A_diag_i[i]+1; jj < A_diag_i[i+1]; jj++)
+                           for (jj = A_diag_i[i] + 1; jj < A_diag_i[i + 1]; jj++)
                            {
                               ii = A_diag_j[jj];
                               if (ii >= ns && ii < ne)
                               {
                                  /* res -= A_diag_data[jj] * u_data[ii]; */
-                                 hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj*bnnz],
-                                                                 &u_data[ii*block_size],
+                                 hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj * bnnz],
+                                                                 &u_data[ii * block_size],
                                                                  1.0, res_vec, block_size);
                               }
                               else
                               {
                                  /* res -= A_diag_data[jj] * tmp_data[ii]; */
-                                 hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj*bnnz],
-                                                                 &tmp_data[ii*block_size],
+                                 hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj * bnnz],
+                                                                 &tmp_data[ii * block_size],
                                                                  1.0, res_vec, block_size);
                               }
                            }
-                           for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+                           for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
                            {
                               ii = A_offd_j[jj];
                               /* res -= A_offd_data[jj] * Vext_data[ii];*/
-                              hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_offd_data[jj*bnnz],
-                                                              &Vext_data[ii*block_size],
+                              hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_offd_data[jj * bnnz],
+                                                              &Vext_data[ii * block_size],
                                                               1.0, res_vec, block_size);
 
                            }
@@ -1369,9 +1379,9 @@ HYPRE_Int  hypre_BoomerAMGBlockRelax( hypre_ParCSRBlockMatrix *A,
                            if (hypre_CSRBlockMatrixBlockInvMatvec( &A_diag_data[A_diag_i[i]*bnnz], res_vec,
                                                                    out_vec, block_size) == 0)
                            {
-                              for (k=0; k< block_size; k++)
+                              for (k = 0; k < block_size; k++)
                               {
-                                 u_data[i*block_size+k] = out_vec[k];
+                                 u_data[i * block_size + k] = out_vec[k];
                               }
                            }
                         }
@@ -1392,24 +1402,24 @@ HYPRE_Int  hypre_BoomerAMGBlockRelax( hypre_ParCSRBlockMatrix *A,
 
                      if (cf_marker[i] == relax_points)
                      {
-                        for (k=0; k< block_size; k++)
+                        for (k = 0; k < block_size; k++)
                         {
-                           res_vec[k] = f_data[i*block_size+k];
+                           res_vec[k] = f_data[i * block_size + k];
                         }
-                        for (jj = A_diag_i[i]+1; jj < A_diag_i[i+1]; jj++)
+                        for (jj = A_diag_i[i] + 1; jj < A_diag_i[i + 1]; jj++)
                         {
                            ii = A_diag_j[jj];
                            /* res -= A_diag_data[jj] * u_data[ii]; */
-                           hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj*bnnz],
-                                                           &u_data[ii*block_size],
+                           hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj * bnnz],
+                                                           &u_data[ii * block_size],
                                                            1.0, res_vec, block_size);
                         }
-                        for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+                        for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
                         {
                            ii = A_offd_j[jj];
                            /* res -= A_offd_data[jj] * Vext_data[ii];*/
-                           hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_offd_data[jj*bnnz],
-                                                           &Vext_data[ii*block_size],
+                           hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_offd_data[jj * bnnz],
+                                                           &Vext_data[ii * block_size],
                                                            1.0, res_vec, block_size);
 
                         }
@@ -1418,14 +1428,14 @@ HYPRE_Int  hypre_BoomerAMGBlockRelax( hypre_ParCSRBlockMatrix *A,
                         if (hypre_CSRBlockMatrixBlockInvMatvec( &A_diag_data[A_diag_i[i]*bnnz], res_vec,
                                                                 out_vec, block_size) == 0)
                         {
-                           for (k=0; k< block_size; k++)
+                           for (k = 0; k < block_size; k++)
                            {
-                              u_data[i*block_size+k] = out_vec[k];
+                              u_data[i * block_size + k] = out_vec[k];
                            }
                         }
                      }
                   }
-                  for (i = n-1; i > -1; i--) /* relax interior points */
+                  for (i = n - 1; i > -1; i--) /* relax interior points */
                   {
 
                      /*-----------------------------------------------------------
@@ -1436,24 +1446,24 @@ HYPRE_Int  hypre_BoomerAMGBlockRelax( hypre_ParCSRBlockMatrix *A,
 
                      if (cf_marker[i] == relax_points)
                      {
-                        for (k=0; k< block_size; k++)
+                        for (k = 0; k < block_size; k++)
                         {
-                           res_vec[k] = f_data[i*block_size+k];
+                           res_vec[k] = f_data[i * block_size + k];
                         }
-                        for (jj = A_diag_i[i]+1; jj < A_diag_i[i+1]; jj++)
+                        for (jj = A_diag_i[i] + 1; jj < A_diag_i[i + 1]; jj++)
                         {
                            ii = A_diag_j[jj];
                            /* res -= A_diag_data[jj] * u_data[ii]; */
-                           hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj*bnnz],
-                                                           &u_data[ii*block_size],
+                           hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj * bnnz],
+                                                           &u_data[ii * block_size],
                                                            1.0, res_vec, block_size);
                         }
-                        for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+                        for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
                         {
                            ii = A_offd_j[jj];
                            /* res -= A_offd_data[jj] * Vext_data[ii];*/
-                           hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_offd_data[jj*bnnz],
-                                                           &Vext_data[ii*block_size],
+                           hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_offd_data[jj * bnnz],
+                                                           &Vext_data[ii * block_size],
                                                            1.0, res_vec, block_size);
                         }
                         /* u_data[i] = res / A_diag_data[A_diag_i[i]]; */
@@ -1461,9 +1471,9 @@ HYPRE_Int  hypre_BoomerAMGBlockRelax( hypre_ParCSRBlockMatrix *A,
                         if (hypre_CSRBlockMatrixBlockInvMatvec( &A_diag_data[A_diag_i[i]*bnnz], res_vec,
                                                                 out_vec, block_size) == 0)
                         {
-                           for (k=0; k< block_size; k++)
+                           for (k = 0; k < block_size; k++)
                            {
-                              u_data[i*block_size+k] = out_vec[k];
+                              u_data[i * block_size + k] = out_vec[k];
                            }
                         }
                      }
@@ -1476,34 +1486,36 @@ HYPRE_Int  hypre_BoomerAMGBlockRelax( hypre_ParCSRBlockMatrix *A,
             /*-----------------------------------------------------------------
              * relax weight and omega do not = 1
              *-----------------------------------------------------------------*/
-            prod = (1.0-relax_weight*omega);
+            prod = (1.0 - relax_weight * omega);
             res0_vec = hypre_CTAlloc(HYPRE_Real,  block_size, HYPRE_MEMORY_HOST);
             res2_vec = hypre_CTAlloc(HYPRE_Real,  block_size, HYPRE_MEMORY_HOST);
             for (i = 0; i < n; i++)
             {
                Vtemp_data[i] = u_data[i];
             }
-            prod = (1.0-relax_weight*omega);
+            prod = (1.0 - relax_weight * omega);
             if (relax_points == 0)
             {
                if (num_threads > 1)
                {
                   tmp_data = hypre_CTAlloc(HYPRE_Real, n, HYPRE_MEMORY_HOST);
                   for (i = 0; i < n; i++)
+                  {
                      tmp_data[i] = u_data[i];
+                  }
                   for (j = 0; j < num_threads; j++)
                   {
-                     size = n/num_threads;
-                     rest = n - size*num_threads;
+                     size = n / num_threads;
+                     rest = n - size * num_threads;
                      if (j < rest)
                      {
-                        ns = j*size+j;
-                        ne = (j+1)*size+j+1;
+                        ns = j * size + j;
+                        ne = (j + 1) * size + j + 1;
                      }
                      else
                      {
-                        ns = j*size+rest;
-                        ne = (j+1)*size+rest;
+                        ns = j * size + rest;
+                        ne = (j + 1) * size + rest;
                      }
                      for (i = ns; i < ne; i++)   /* interior points first */
                      {
@@ -1511,43 +1523,43 @@ HYPRE_Int  hypre_BoomerAMGBlockRelax( hypre_ParCSRBlockMatrix *A,
                          * If diagonal is nonzero, relax point i; otherwise, skip it.
                          *-----------------------------------------------------------*/
 
-                        for (k=0; k< block_size; k++)
+                        for (k = 0; k < block_size; k++)
                         {
-                           res_vec[k] = f_data[i*block_size+k];
+                           res_vec[k] = f_data[i * block_size + k];
                            res0_vec[k] = 0.0;
                            res2_vec[k] = 0.0;
                         }
 
-                        for (jj = A_diag_i[i]+1; jj < A_diag_i[i+1]; jj++)
+                        for (jj = A_diag_i[i] + 1; jj < A_diag_i[i + 1]; jj++)
                         {
                            ii = A_diag_j[jj];
 
                            if (ii >= ns && ii < ne)
                            {
                               /* res0 -= A_diag_data[jj] * u_data[ii]; */
-                              hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj*bnnz],
-                                                              &u_data[ii*block_size],
+                              hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj * bnnz],
+                                                              &u_data[ii * block_size],
                                                               1.0, res0_vec, block_size);
                               /* res2 += A_diag_data[jj] * Vtemp_data[ii];*/
-                              hypre_CSRBlockMatrixBlockMatvec(1.0, &A_diag_data[jj*bnnz],
-                                                              &Vtemp_data[ii*block_size],
+                              hypre_CSRBlockMatrixBlockMatvec(1.0, &A_diag_data[jj * bnnz],
+                                                              &Vtemp_data[ii * block_size],
                                                               1.0, res2_vec, block_size);
                            }
                            else
                            {
                               /* res -= A_diag_data[jj] * tmp_data[ii]; */
-                              hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj*bnnz],
-                                                              &tmp_data[ii*block_size],
+                              hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj * bnnz],
+                                                              &tmp_data[ii * block_size],
                                                               1.0, res_vec, block_size);
                            }
                         }
 
-                        for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+                        for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
                         {
                            ii = A_offd_j[jj];
                            /* res -= A_offd_data[jj] * Vext_data[ii]; */
-                           hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_offd_data[jj*bnnz],
-                                                           &Vext_data[ii*block_size],
+                           hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_offd_data[jj * bnnz],
+                                                           &Vext_data[ii * block_size],
                                                            1.0, res_vec, block_size);
 
 
@@ -1555,78 +1567,78 @@ HYPRE_Int  hypre_BoomerAMGBlockRelax( hypre_ParCSRBlockMatrix *A,
                         /* u_data[i] *= prod;
                            u_data[i] += relax_weight*(omega*res + res0 +
                            one_minus_omega*res2) / A_diag_data[A_diag_i[i]];*/
-                        for (k=0; k< block_size; k++)
+                        for (k = 0; k < block_size; k++)
                         {
-                           tmp_vec[k] =  omega*res_vec[k] + res0_vec[k] + one_minus_omega*res2_vec[k];
+                           tmp_vec[k] =  omega * res_vec[k] + res0_vec[k] + one_minus_omega * res2_vec[k];
                         }
                         if (hypre_CSRBlockMatrixBlockInvMatvec( &A_diag_data[A_diag_i[i]*bnnz], tmp_vec,
                                                                 out_vec, block_size) == 0)
                         {
-                           for (k=0; k< block_size; k++)
+                           for (k = 0; k < block_size; k++)
                            {
-                              u_data[i*block_size+k] *= prod;
-                              u_data[i*block_size+k] += relax_weight *out_vec[k];
+                              u_data[i * block_size + k] *= prod;
+                              u_data[i * block_size + k] += relax_weight * out_vec[k];
                            }
                         }
                      }
 
-                     for (i = ne-1; i > ns-1; i--)       /* interior points first */
+                     for (i = ne - 1; i > ns - 1; i--)   /* interior points first */
                      {
 
                         /*-----------------------------------------------------------
                          * If diagonal is nonzero, relax point i; otherwise, skip it.
                          *-----------------------------------------------------------*/
-                        for (k=0; k< block_size; k++)
+                        for (k = 0; k < block_size; k++)
                         {
-                           res_vec[k] = f_data[i*block_size+k];
+                           res_vec[k] = f_data[i * block_size + k];
                            res0_vec[k] = 0.0;
                            res2_vec[k] = 0.0;
                         }
 
-                        for (jj = A_diag_i[i]+1; jj < A_diag_i[i+1]; jj++)
+                        for (jj = A_diag_i[i] + 1; jj < A_diag_i[i + 1]; jj++)
                         {
                            ii = A_diag_j[jj];
                            if (ii >= ns && ii < ne)
                            {
                               /* res0 -= A_diag_data[jj] * u_data[ii]; */
-                              hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj*bnnz],
-                                                              &u_data[ii*block_size],
+                              hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj * bnnz],
+                                                              &u_data[ii * block_size],
                                                               1.0, res0_vec, block_size);
                               /* res2 += A_diag_data[jj] * Vtemp_data[ii];*/
-                              hypre_CSRBlockMatrixBlockMatvec(1.0, &A_diag_data[jj*bnnz],
-                                                              &Vtemp_data[ii*block_size],
+                              hypre_CSRBlockMatrixBlockMatvec(1.0, &A_diag_data[jj * bnnz],
+                                                              &Vtemp_data[ii * block_size],
                                                               1.0, res2_vec, block_size);
                            }
                            else
                            {
                               /* res -= A_diag_data[jj] * tmp_data[ii]; */
-                              hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj*bnnz],
-                                                              &tmp_data[ii*block_size],
+                              hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj * bnnz],
+                                                              &tmp_data[ii * block_size],
                                                               1.0, res_vec, block_size);
                            }
                         }
-                        for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+                        for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
                         {
                            ii = A_offd_j[jj];
                            /* res -= A_offd_data[jj] * Vext_data[ii];*/
-                           hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_offd_data[jj*bnnz],
-                                                           &Vext_data[ii*block_size],
+                           hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_offd_data[jj * bnnz],
+                                                           &Vext_data[ii * block_size],
                                                            1.0, res_vec, block_size);
                         }
                         /* u_data[i] *= prod;
                            u_data[i] += relax_weight*(omega*res + res0 +
                            one_minus_omega*res2) / A_diag_data[A_diag_i[i]];*/
-                        for (k=0; k< block_size; k++)
+                        for (k = 0; k < block_size; k++)
                         {
-                           tmp_vec[k] =  omega*res_vec[k] + res0_vec[k] + one_minus_omega*res2_vec[k];
+                           tmp_vec[k] =  omega * res_vec[k] + res0_vec[k] + one_minus_omega * res2_vec[k];
                         }
                         if (hypre_CSRBlockMatrixBlockInvMatvec( &A_diag_data[A_diag_i[i]*bnnz], tmp_vec,
                                                                 out_vec, block_size) == 0)
                         {
-                           for (k=0; k< block_size; k++)
+                           for (k = 0; k < block_size; k++)
                            {
-                              u_data[i*block_size+k] *= prod;
-                              u_data[i*block_size+k] += relax_weight *out_vec[k];
+                              u_data[i * block_size + k] *= prod;
+                              u_data[i * block_size + k] += relax_weight * out_vec[k];
                            }
                         }
                      } /* end of loop over points */
@@ -1641,95 +1653,95 @@ HYPRE_Int  hypre_BoomerAMGBlockRelax( hypre_ParCSRBlockMatrix *A,
                      /*-----------------------------------------------------------
                       * If diagonal is nonzero, relax point i; otherwise, skip it.
                       *-----------------------------------------------------------*/
-                     for (k=0; k< block_size; k++)
+                     for (k = 0; k < block_size; k++)
                      {
-                        res_vec[k] = f_data[i*block_size+k];
+                        res_vec[k] = f_data[i * block_size + k];
                         res0_vec[k] = 0.0;
                         res2_vec[k] = 0.0;
                      }
-                     for (jj = A_diag_i[i]+1; jj < A_diag_i[i+1]; jj++)
+                     for (jj = A_diag_i[i] + 1; jj < A_diag_i[i + 1]; jj++)
                      {
                         ii = A_diag_j[jj];
                         /* res0 -= A_diag_data[jj] * u_data[ii]; */
-                        hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj*bnnz],
-                                                        &u_data[ii*block_size],
+                        hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj * bnnz],
+                                                        &u_data[ii * block_size],
                                                         1.0, res0_vec, block_size);
                         /* res2 += A_diag_data[jj] * Vtemp_data[ii];*/
-                        hypre_CSRBlockMatrixBlockMatvec(1.0, &A_diag_data[jj*bnnz],
-                                                        &Vtemp_data[ii*block_size],
+                        hypre_CSRBlockMatrixBlockMatvec(1.0, &A_diag_data[jj * bnnz],
+                                                        &Vtemp_data[ii * block_size],
                                                         1.0, res2_vec, block_size);
                      }
-                     for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+                     for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
                      {
                         ii = A_offd_j[jj];
                         /* res -= A_offd_data[jj] * Vext_data[ii];*/
-                        hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_offd_data[jj*bnnz],
-                                                        &Vext_data[ii*block_size],
+                        hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_offd_data[jj * bnnz],
+                                                        &Vext_data[ii * block_size],
                                                         1.0, res_vec, block_size);
                      }
                      /* u_data[i] *= prod;
                         u_data[i] += relax_weight*(omega*res + res0 +
                         one_minus_omega*res2) / A_diag_data[A_diag_i[i]]; */
-                     for (k=0; k< block_size; k++)
+                     for (k = 0; k < block_size; k++)
                      {
-                        tmp_vec[k] =  omega*res_vec[k] + res0_vec[k] + one_minus_omega*res2_vec[k];
+                        tmp_vec[k] =  omega * res_vec[k] + res0_vec[k] + one_minus_omega * res2_vec[k];
                      }
                      if (hypre_CSRBlockMatrixBlockInvMatvec( &A_diag_data[A_diag_i[i]*bnnz], tmp_vec,
                                                              out_vec, block_size) == 0)
                      {
-                        for (k=0; k< block_size; k++)
+                        for (k = 0; k < block_size; k++)
                         {
-                           u_data[i*block_size+k] *= prod;
-                           u_data[i*block_size+k] += relax_weight *out_vec[k];
+                           u_data[i * block_size + k] *= prod;
+                           u_data[i * block_size + k] += relax_weight * out_vec[k];
                         }
                      }
                   }
-                  for (i = n-1; i > -1; i--)     /* interior points first */
+                  for (i = n - 1; i > -1; i--)   /* interior points first */
                   {
 
                      /*-----------------------------------------------------------
                       * If diagonal is nonzero, relax point i; otherwise, skip it.
                       *-----------------------------------------------------------*/
-                     for (k=0; k< block_size; k++)
+                     for (k = 0; k < block_size; k++)
                      {
-                        res_vec[k] = f_data[i*block_size+k];
+                        res_vec[k] = f_data[i * block_size + k];
                         res0_vec[k] = 0.0;
                         res2_vec[k] = 0.0;
                      }
-                     for (jj = A_diag_i[i]+1; jj < A_diag_i[i+1]; jj++)
+                     for (jj = A_diag_i[i] + 1; jj < A_diag_i[i + 1]; jj++)
                      {
                         ii = A_diag_j[jj];
                         /* res0 -= A_diag_data[jj] * u_data[ii]; */
-                        hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj*bnnz],
-                                                        &u_data[ii*block_size],
+                        hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj * bnnz],
+                                                        &u_data[ii * block_size],
                                                         1.0, res0_vec, block_size);
                         /* res2 += A_diag_data[jj] * Vtemp_data[ii];*/
-                        hypre_CSRBlockMatrixBlockMatvec(1.0, &A_diag_data[jj*bnnz],
-                                                        &Vtemp_data[ii*block_size],
+                        hypre_CSRBlockMatrixBlockMatvec(1.0, &A_diag_data[jj * bnnz],
+                                                        &Vtemp_data[ii * block_size],
                                                         1.0, res2_vec, block_size);
                      }
-                     for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+                     for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
                      {
                         ii = A_offd_j[jj];
                         /* res -= A_offd_data[jj] * Vext_data[ii];*/
-                        hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_offd_data[jj*bnnz],
-                                                        &Vext_data[ii*block_size],
+                        hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_offd_data[jj * bnnz],
+                                                        &Vext_data[ii * block_size],
                                                         1.0, res_vec, block_size);
                      }
                      /* u_data[i] *= prod;
                         u_data[i] += relax_weight*(omega*res + res0 +
                         one_minus_omega*res2) / A_diag_data[A_diag_i[i]]; */
-                     for (k=0; k< block_size; k++)
+                     for (k = 0; k < block_size; k++)
                      {
-                        tmp_vec[k] =  omega*res_vec[k] + res0_vec[k] + one_minus_omega*res2_vec[k];
+                        tmp_vec[k] =  omega * res_vec[k] + res0_vec[k] + one_minus_omega * res2_vec[k];
                      }
                      if (hypre_CSRBlockMatrixBlockInvMatvec( &A_diag_data[A_diag_i[i]*bnnz], tmp_vec,
                                                              out_vec, block_size) == 0)
                      {
-                        for (k=0; k< block_size; k++)
+                        for (k = 0; k < block_size; k++)
                         {
-                           u_data[i*block_size+k] *= prod;
-                           u_data[i*block_size+k] += relax_weight *out_vec[k];
+                           u_data[i * block_size + k] *= prod;
+                           u_data[i * block_size + k] += relax_weight * out_vec[k];
                         }
                      }
                   }/* end of loop over points */
@@ -1746,20 +1758,22 @@ HYPRE_Int  hypre_BoomerAMGBlockRelax( hypre_ParCSRBlockMatrix *A,
                {
                   tmp_data = hypre_CTAlloc(HYPRE_Real, n, HYPRE_MEMORY_HOST);
                   for (i = 0; i < n; i++)
+                  {
                      tmp_data[i] = u_data[i];
+                  }
                   for (j = 0; j < num_threads; j++)
                   {
-                     size = n/num_threads;
-                     rest = n - size*num_threads;
+                     size = n / num_threads;
+                     rest = n - size * num_threads;
                      if (j < rest)
                      {
-                        ns = j*size+j;
-                        ne = (j+1)*size+j+1;
+                        ns = j * size + j;
+                        ne = (j + 1) * size + j + 1;
                      }
                      else
                      {
-                        ns = j*size+rest;
-                        ne = (j+1)*size+rest;
+                        ns = j * size + rest;
+                        ne = (j + 1) * size + rest;
                      }
                      for (i = ns; i < ne; i++) /* relax interior points */
                      {
@@ -1774,61 +1788,61 @@ HYPRE_Int  hypre_BoomerAMGBlockRelax( hypre_ParCSRBlockMatrix *A,
                            /*-----------------------------------------------------------
                             * If diagonal is nonzero, relax point i; otherwise, skip it.
                             *-----------------------------------------------------------*/
-                           for (k=0; k< block_size; k++)
+                           for (k = 0; k < block_size; k++)
                            {
-                              res_vec[k] = f_data[i*block_size+k];
+                              res_vec[k] = f_data[i * block_size + k];
                               res0_vec[k] = 0.0;
                               res2_vec[k] = 0.0;
                            }
-                           for (jj = A_diag_i[i]+1; jj < A_diag_i[i+1]; jj++)
+                           for (jj = A_diag_i[i] + 1; jj < A_diag_i[i + 1]; jj++)
                            {
                               ii = A_diag_j[jj];
                               if (ii >= ns && ii < ne)
                               {
                                  /* res0 -= A_diag_data[jj] * u_data[ii]; */
-                                 hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj*bnnz],
-                                                                 &u_data[ii*block_size],
+                                 hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj * bnnz],
+                                                                 &u_data[ii * block_size],
                                                                  1.0, res0_vec, block_size);
                                  /* res2 += A_diag_data[jj] * Vtemp_data[ii];*/
-                                 hypre_CSRBlockMatrixBlockMatvec(1.0, &A_diag_data[jj*bnnz],
-                                                                 &Vtemp_data[ii*block_size],
+                                 hypre_CSRBlockMatrixBlockMatvec(1.0, &A_diag_data[jj * bnnz],
+                                                                 &Vtemp_data[ii * block_size],
                                                                  1.0, res2_vec, block_size);
                               }
                               else
                               {
                                  /* res -= A_diag_data[jj] * tmp_data[ii]; */
-                                 hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj*bnnz],
-                                                                 &tmp_data[ii*block_size],
+                                 hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj * bnnz],
+                                                                 &tmp_data[ii * block_size],
                                                                  1.0, res_vec, block_size);
                               }
                            }
-                           for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+                           for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
                            {
                               ii = A_offd_j[jj];
                               /* res -= A_offd_data[jj] * Vext_data[ii];*/
-                              hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_offd_data[jj*bnnz],
-                                                              &Vext_data[ii*block_size],
+                              hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_offd_data[jj * bnnz],
+                                                              &Vext_data[ii * block_size],
                                                               1.0, res_vec, block_size);
                            }
                            /* u_data[i] *= prod;
                               u_data[i] += relax_weight*(omega*res + res0 +
                               one_minus_omega*res2) / A_diag_data[A_diag_i[i]];*/
-                           for (k=0; k< block_size; k++)
+                           for (k = 0; k < block_size; k++)
                            {
-                              tmp_vec[k] =  omega*res_vec[k] + res0_vec[k] + one_minus_omega*res2_vec[k];
+                              tmp_vec[k] =  omega * res_vec[k] + res0_vec[k] + one_minus_omega * res2_vec[k];
                            }
                            if (hypre_CSRBlockMatrixBlockInvMatvec( &A_diag_data[A_diag_i[i]*bnnz], tmp_vec,
                                                                    out_vec, block_size) == 0)
                            {
-                              for (k=0; k< block_size; k++)
+                              for (k = 0; k < block_size; k++)
                               {
-                                 u_data[i*block_size+k] *= prod;
-                                 u_data[i*block_size+k] += relax_weight *out_vec[k];
+                                 u_data[i * block_size + k] *= prod;
+                                 u_data[i * block_size + k] += relax_weight * out_vec[k];
                               }
                            }
                         }
                      }
-                     for (i = ne-1; i > ns-1; i--) /* relax interior points */
+                     for (i = ne - 1; i > ns - 1; i--) /* relax interior points */
                      {
                         /*-----------------------------------------------------------
                          * If i is of the right type ( C or F ) and diagonal is
@@ -1840,56 +1854,56 @@ HYPRE_Int  hypre_BoomerAMGBlockRelax( hypre_ParCSRBlockMatrix *A,
                            /*-----------------------------------------------------------
                             * If diagonal is nonzero, relax point i; otherwise, skip it.
                             *-----------------------------------------------------------*/
-                           for (k=0; k< block_size; k++)
+                           for (k = 0; k < block_size; k++)
                            {
-                              res_vec[k] = f_data[i*block_size+k];
+                              res_vec[k] = f_data[i * block_size + k];
                               res0_vec[k] = 0.0;
                               res2_vec[k] = 0.0;
                            }
-                           for (jj = A_diag_i[i]+1; jj < A_diag_i[i+1]; jj++)
+                           for (jj = A_diag_i[i] + 1; jj < A_diag_i[i + 1]; jj++)
                            {
                               ii = A_diag_j[jj];
                               if (ii >= ns && ii < ne)
                               {
                                  /* res0 -= A_diag_data[jj] * u_data[ii]; */
-                                 hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj*bnnz],
-                                                                 &u_data[ii*block_size],
+                                 hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj * bnnz],
+                                                                 &u_data[ii * block_size],
                                                                  1.0, res0_vec, block_size);
                                  /* res2 += A_diag_data[jj] * Vtemp_data[ii];*/
-                                 hypre_CSRBlockMatrixBlockMatvec(1.0, &A_diag_data[jj*bnnz],
-                                                                 &Vtemp_data[ii*block_size],
+                                 hypre_CSRBlockMatrixBlockMatvec(1.0, &A_diag_data[jj * bnnz],
+                                                                 &Vtemp_data[ii * block_size],
                                                                  1.0, res2_vec, block_size);
                               }
                               else
                               {
                                  /* res -= A_diag_data[jj] * tmp_data[ii]; */
-                                 hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj*bnnz],
-                                                                 &tmp_data[ii*block_size],
+                                 hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj * bnnz],
+                                                                 &tmp_data[ii * block_size],
                                                                  1.0, res_vec, block_size);
                               }
                            }
-                           for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+                           for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
                            {
                               ii = A_offd_j[jj];
                               /* res -= A_offd_data[jj] * Vext_data[ii];*/
-                              hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_offd_data[jj*bnnz],
-                                                              &Vext_data[ii*block_size],
+                              hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_offd_data[jj * bnnz],
+                                                              &Vext_data[ii * block_size],
                                                               1.0, res_vec, block_size);
                            }
                            /* u_data[i] *= prod;
                               u_data[i] += relax_weight*(omega*res + res0 +
                               one_minus_omega*res2) / A_diag_data[A_diag_i[i]];*/
-                           for (k=0; k< block_size; k++)
+                           for (k = 0; k < block_size; k++)
                            {
-                              tmp_vec[k] =  omega*res_vec[k] + res0_vec[k] + one_minus_omega*res2_vec[k];
+                              tmp_vec[k] =  omega * res_vec[k] + res0_vec[k] + one_minus_omega * res2_vec[k];
                            }
                            if (hypre_CSRBlockMatrixBlockInvMatvec( &A_diag_data[A_diag_i[i]*bnnz], tmp_vec,
                                                                    out_vec, block_size) == 0)
                            {
-                              for (k=0; k< block_size; k++)
+                              for (k = 0; k < block_size; k++)
                               {
-                                 u_data[i*block_size+k] *= prod;
-                                 u_data[i*block_size+k] += relax_weight *out_vec[k];
+                                 u_data[i * block_size + k] *= prod;
+                                 u_data[i * block_size + k] += relax_weight * out_vec[k];
                               }
                            }
                         }
@@ -1909,51 +1923,51 @@ HYPRE_Int  hypre_BoomerAMGBlockRelax( hypre_ParCSRBlockMatrix *A,
 
                      if (cf_marker[i] == relax_points )
                      {
-                        for (k=0; k< block_size; k++)
+                        for (k = 0; k < block_size; k++)
                         {
-                           res_vec[k] = f_data[i*block_size+k];
+                           res_vec[k] = f_data[i * block_size + k];
                            res0_vec[k] = 0.0;
                            res2_vec[k] = 0.0;
                         }
-                        for (jj = A_diag_i[i]+1; jj < A_diag_i[i+1]; jj++)
+                        for (jj = A_diag_i[i] + 1; jj < A_diag_i[i + 1]; jj++)
                         {
                            ii = A_diag_j[jj];
                            /* res0 -= A_diag_data[jj] * u_data[ii]; */
-                           hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj*bnnz],
-                                                           &u_data[ii*block_size],
+                           hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj * bnnz],
+                                                           &u_data[ii * block_size],
                                                            1.0, res0_vec, block_size);
                            /* res2 += A_diag_data[jj] * Vtemp_data[ii];*/
-                           hypre_CSRBlockMatrixBlockMatvec(1.0, &A_diag_data[jj*bnnz],
-                                                           &Vtemp_data[ii*block_size],
+                           hypre_CSRBlockMatrixBlockMatvec(1.0, &A_diag_data[jj * bnnz],
+                                                           &Vtemp_data[ii * block_size],
                                                            1.0, res2_vec, block_size);
                         }
-                        for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+                        for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
                         {
                            ii = A_offd_j[jj];
                            /* res -= A_offd_data[jj] * Vext_data[ii];*/
-                           hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_offd_data[jj*bnnz],
-                                                           &Vext_data[ii*block_size],
+                           hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_offd_data[jj * bnnz],
+                                                           &Vext_data[ii * block_size],
                                                            1.0, res_vec, block_size);
                         }
                         /* u_data[i] *= prod;
                            u_data[i] += relax_weight*(omega*res + res0 +
                            one_minus_omega*res2) / A_diag_data[A_diag_i[i]];*/
-                        for (k=0; k< block_size; k++)
+                        for (k = 0; k < block_size; k++)
                         {
-                           tmp_vec[k] =  omega*res_vec[k] + res0_vec[k] + one_minus_omega*res2_vec[k];
+                           tmp_vec[k] =  omega * res_vec[k] + res0_vec[k] + one_minus_omega * res2_vec[k];
                         }
                         if (hypre_CSRBlockMatrixBlockInvMatvec( &A_diag_data[A_diag_i[i]*bnnz], tmp_vec,
                                                                 out_vec, block_size) == 0)
                         {
-                           for (k=0; k< block_size; k++)
+                           for (k = 0; k < block_size; k++)
                            {
-                              u_data[i*block_size+k] *= prod;
-                              u_data[i*block_size+k] += relax_weight *out_vec[k];
+                              u_data[i * block_size + k] *= prod;
+                              u_data[i * block_size + k] += relax_weight * out_vec[k];
                            }
                         }
                      }
                   }
-                  for (i = n-1; i > -1; i--) /* relax interior points */
+                  for (i = n - 1; i > -1; i--) /* relax interior points */
                   {
 
                      /*-----------------------------------------------------------
@@ -1964,46 +1978,46 @@ HYPRE_Int  hypre_BoomerAMGBlockRelax( hypre_ParCSRBlockMatrix *A,
 
                      if (cf_marker[i] == relax_points )
                      {
-                        for (k=0; k< block_size; k++)
+                        for (k = 0; k < block_size; k++)
                         {
-                           res_vec[k] = f_data[i*block_size+k];
+                           res_vec[k] = f_data[i * block_size + k];
                            res0_vec[k] = 0.0;
                            res2_vec[k] = 0.0;
                         }
-                        for (jj = A_diag_i[i]+1; jj < A_diag_i[i+1]; jj++)
+                        for (jj = A_diag_i[i] + 1; jj < A_diag_i[i + 1]; jj++)
                         {
                            ii = A_diag_j[jj];
                            /* res0 -= A_diag_data[jj] * u_data[ii]; */
-                           hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj*bnnz],
-                                                           &u_data[ii*block_size],
+                           hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_diag_data[jj * bnnz],
+                                                           &u_data[ii * block_size],
                                                            1.0, res0_vec, block_size);
                            /* res2 += A_diag_data[jj] * Vtemp_data[ii];*/
-                           hypre_CSRBlockMatrixBlockMatvec(1.0, &A_diag_data[jj*bnnz],
-                                                           &Vtemp_data[ii*block_size],
+                           hypre_CSRBlockMatrixBlockMatvec(1.0, &A_diag_data[jj * bnnz],
+                                                           &Vtemp_data[ii * block_size],
                                                            1.0, res2_vec, block_size);
                         }
-                        for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+                        for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
                         {
                            ii = A_offd_j[jj];
                            /* res -= A_offd_data[jj] * Vext_data[ii];*/
-                           hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_offd_data[jj*bnnz],
-                                                           &Vext_data[ii*block_size],
+                           hypre_CSRBlockMatrixBlockMatvec(-1.0, &A_offd_data[jj * bnnz],
+                                                           &Vext_data[ii * block_size],
                                                            1.0, res_vec, block_size);
                         }
                         /* u_data[i] *= prod;
                            u_data[i] += relax_weight*(omega*res + res0 +
                            one_minus_omega*res2) / A_diag_data[A_diag_i[i]];*/
-                        for (k=0; k< block_size; k++)
+                        for (k = 0; k < block_size; k++)
                         {
-                           tmp_vec[k] =  omega*res_vec[k] + res0_vec[k] + one_minus_omega*res2_vec[k];
+                           tmp_vec[k] =  omega * res_vec[k] + res0_vec[k] + one_minus_omega * res2_vec[k];
                         }
                         if (hypre_CSRBlockMatrixBlockInvMatvec( &A_diag_data[A_diag_i[i]*bnnz], tmp_vec,
                                                                 out_vec, block_size) == 0)
                         {
-                           for (k=0; k< block_size; k++)
+                           for (k = 0; k < block_size; k++)
                            {
-                              u_data[i*block_size+k] *= prod;
-                              u_data[i*block_size+k] += relax_weight *out_vec[k];
+                              u_data[i * block_size + k] *= prod;
+                              u_data[i * block_size + k] += relax_weight * out_vec[k];
                            }
                         }
                      }
@@ -2021,9 +2035,9 @@ HYPRE_Int  hypre_BoomerAMGBlockRelax( hypre_ParCSRBlockMatrix *A,
          break;
       }
 
-/*---------------------------------------------------------------------------
- * Direct solve: use gaussian elimination
- *---------------------------------------------------------------------------*/
+      /*---------------------------------------------------------------------------
+       * Direct solve: use gaussian elimination
+       *---------------------------------------------------------------------------*/
       case 29:
       {
 
@@ -2049,7 +2063,7 @@ HYPRE_Int  hypre_BoomerAMGBlockRelax( hypre_ParCSRBlockMatrix *A,
             A_CSR_data = hypre_CSRMatrixData(A_CSR);
             f_vector_data = hypre_VectorData(f_vector);
 
-            A_mat = hypre_CTAlloc(HYPRE_Real,  n_small*n_small, HYPRE_MEMORY_HOST);
+            A_mat = hypre_CTAlloc(HYPRE_Real,  n_small * n_small, HYPRE_MEMORY_HOST);
             b_vec = hypre_CTAlloc(HYPRE_Real,  n_small, HYPRE_MEMORY_HOST);
 
             /*  Load CSR matrix into A_mat. */
@@ -2057,23 +2071,23 @@ HYPRE_Int  hypre_BoomerAMGBlockRelax( hypre_ParCSRBlockMatrix *A,
 
             for (i = 0; i < n_small; i++)
             {
-               for (jj = A_CSR_i[i]; jj < A_CSR_i[i+1]; jj++)
+               for (jj = A_CSR_i[i]; jj < A_CSR_i[i + 1]; jj++)
                {
                   column = A_CSR_j[jj];
-                  A_mat[i*n_small+column] = A_CSR_data[jj];
+                  A_mat[i * n_small + column] = A_CSR_data[jj];
                }
                b_vec[i] = f_vector_data[i];
             }
 
-            relax_error = gselim_piv(A_mat,b_vec,n_small);
+            relax_error = gselim_piv(A_mat, b_vec, n_small);
 
             /* should check the relax error */
 
             for (i = 0; i < n; i++)
             {
-               for (k=0; k < block_size; k++)
+               for (k = 0; k < block_size; k++)
                {
-                  u_data[i*block_size + k] = b_vec[first_index+i*block_size + k];
+                  u_data[i * block_size + k] = b_vec[first_index + i * block_size + k];
                }
             }
 
@@ -2119,47 +2133,47 @@ HYPRE_Int  hypre_BoomerAMGBlockRelax( hypre_ParCSRBlockMatrix *A,
 HYPRE_Int gselim_piv(HYPRE_Real *A, HYPRE_Real *x, HYPRE_Int n)
 {
    HYPRE_Int    err_flag = 0;
-   HYPRE_Int    j,k,m, piv_row;
+   HYPRE_Int    j, k, m, piv_row;
    HYPRE_Real   factor, piv, tmp;
    HYPRE_Real   eps = 1e-8;
 
-   if (n==1)                           /* A is 1x1 */
+   if (n == 1)                         /* A is 1x1 */
    {
-      if (fabs(A[0]) >  1e-10)
+      if (hypre_abs(A[0]) >  1e-10)
       {
-         x[0] = x[0]/A[0];
-         return(err_flag);
+         x[0] = x[0] / A[0];
+         return (err_flag);
       }
       else
       {
          err_flag = 1;
-         return(err_flag);
+         return (err_flag);
       }
    }
    else                               /* A is nxn.  Forward elimination */
    {
-      for (k = 0; k < n-1; k++)
+      for (k = 0; k < n - 1; k++)
       {
          /* we do partial pivoting for size */
 
-         piv = A[k*n+k];
+         piv = A[k * n + k];
          piv_row = k;
          /* find the largest pivot in position k*/
-         for (j=k+1; j < n; j++)
+         for (j = k + 1; j < n; j++)
          {
-            if (fabs(A[j*n+k]) > fabs(piv))
+            if (hypre_abs(A[j * n + k]) > hypre_abs(piv))
             {
-               piv =  A[j*n+k];
+               piv =  A[j * n + k];
                piv_row = j;
             }
          }
-         if (piv_row !=k) /* do a row exchange  - rows k and piv_row*/
+         if (piv_row != k) /* do a row exchange  - rows k and piv_row*/
          {
-            for (j=0; j < n; j++)
+            for (j = 0; j < n; j++)
             {
-               tmp = A[k*n + j];
-               A[k*n + j] = A[piv_row*n + j];
-               A[piv_row*n + j] = tmp;
+               tmp = A[k * n + j];
+               A[k * n + j] = A[piv_row * n + j];
+               A[piv_row * n + j] = tmp;
             }
             tmp = x[k];
             x[k] = x[piv_row];
@@ -2167,16 +2181,16 @@ HYPRE_Int gselim_piv(HYPRE_Real *A, HYPRE_Real *x, HYPRE_Int n)
          }
 
 
-         if (fabs(piv) > eps)
+         if (hypre_abs(piv) > eps)
          {
-            for (j = k+1; j < n; j++)
+            for (j = k + 1; j < n; j++)
             {
-               if (A[j*n+k] != 0.0)
+               if (A[j * n + k] != 0.0)
                {
-                  factor = A[j*n+k]/A[k*n+k];
-                  for (m = k+1; m < n; m++)
+                  factor = A[j * n + k] / A[k * n + k];
+                  for (m = k + 1; m < n; m++)
                   {
-                     A[j*n+m]  -= factor * A[k*n+m];
+                     A[j * n + m]  -= factor * A[k * n + m];
                   }
                   /* Elimination step for rhs */
                   x[j] -= factor * x[k];
@@ -2186,30 +2200,30 @@ HYPRE_Int gselim_piv(HYPRE_Real *A, HYPRE_Real *x, HYPRE_Int n)
          else
          {
             /* hypre_printf("Matrix is nearly singular: zero pivot error\n"); */
-            return(-1);
+            return (-1);
          }
       }
       /* we also need to check the pivot in the last row to see if it is zero */
       k = n - 1; /* last row */
-      if ( fabs(A[k*n+k]) < eps)
+      if ( hypre_abs(A[k * n + k]) < eps)
       {
          /* hypre_printf("Block of matrix is nearly singular: zero pivot error\n"); */
-         return(-1);
+         return (-1);
       }
 
       /* Back Substitution  */
-      for (k = n-1; k > 0; --k)
+      for (k = n - 1; k > 0; --k)
       {
-         x[k] /= A[k*n+k];
+         x[k] /= A[k * n + k];
          for (j = 0; j < k; j++)
          {
-            if (A[j*n+k] != 0.0)
+            if (A[j * n + k] != 0.0)
             {
-               x[j] -= x[k] * A[j*n+k];
+               x[j] -= x[k] * A[j * n + k];
             }
          }
       }
       x[0] /= A[0];
-      return(err_flag);
+      return (err_flag);
    }
 }
diff --git a/external/hypre/src/parcsr_ls/CMakeLists.txt b/external/hypre/src/parcsr_ls/CMakeLists.txt
index 9660e340..87148a24 100644
--- a/external/hypre/src/parcsr_ls/CMakeLists.txt
+++ b/external/hypre/src/parcsr_ls/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -27,6 +27,8 @@ set(SRCS
   F90_HYPRE_parcsr_pcg.c
   F90_HYPRE_parcsr_pilut.c
   F90_HYPRE_parcsr_schwarz.c
+  F90_HYPRE_parcsr_mgr.c
+  F90_HYPRE_parcsr_ilu.c
   F90_HYPRE_ams.c
   gen_redcs_mat.c
   HYPRE_parcsr_amg.c
@@ -47,6 +49,7 @@ set(SRCS
   HYPRE_parcsr_pcg.c
   HYPRE_parcsr_pilut.c
   HYPRE_parcsr_schwarz.c
+  HYPRE_parcsr_fsai.c
   HYPRE_ams.c
   HYPRE_ads.c
   HYPRE_ame.c
@@ -73,21 +76,32 @@ set(SRCS
   par_cycle.c
   par_add_cycle.c
   par_difconv.c
+  par_fsai.c
+  par_fsai_device.c
+  par_fsai_setup.c
+  par_fsai_solve.c
+  par_fsai_device.c
   par_gauss_elim.c
+  par_ge_device.c
   par_gsmg.c
   par_indepset.c
   par_interp.c
   par_jacobi_interp.c
   par_krylov_func.c
   par_mod_lr_interp.c
+  par_mod_multi_interp.c
   par_multi_interp.c
   par_laplace_27pt.c
   par_laplace_9pt.c
   par_laplace.c
   par_lr_interp.c
   par_mgr.c
+  par_mgr_coarsen.c
+  par_mgr_interp.c
+  par_mgr_rap.c
   par_mgr_setup.c
   par_mgr_solve.c
+  par_mgr_stats.c
   par_nongalerkin.c
   par_nodal_systems.c
   par_rap.c
@@ -118,7 +132,9 @@ set(SRCS
   par_mgr_solve.c
   par_ilu.c
   par_ilu_setup.c
+  par_ilu_setup_device.c
   par_ilu_solve.c
+  par_ilu_solve_device.c
   par_coarsen_device.c
   par_indepset_device.c
   par_interp_device.c
@@ -130,25 +146,27 @@ set(SRCS
   par_amgdd_fac_cycle_device.c
   par_2s_interp_device.c
   par_relax_device.c
+  par_mod_multi_interp_device.c
+  par_mgr_device.c
 )
 
-if (HYPRE_USING_DSUPERLU)
-  list(APPEND SRCS dsuperlu.c)
-endif()
-
 target_sources(${PROJECT_NAME}
   PRIVATE ${SRCS}
           ${HDRS}
 )
 
-if (HYPRE_USING_CUDA)
-  set(CUDA_SRCS
+if (HYPRE_USING_GPU)
+  set(GPU_SRCS
     ams.c
     ads.c
     ame.c
+    par_amg_setup.c
+    par_ge_device.c
     par_ilu.c
     par_ilu_setup.c
+    par_ilu_setup_device.c
     par_ilu_solve.c
+    par_ilu_solve_device.c
     par_coarsen_device.c
     par_coarse_parms_device.c
     par_indepset_device.c
@@ -156,6 +174,7 @@ if (HYPRE_USING_CUDA)
     par_interp_trunc_device.c
     par_lr_interp_device.c
     par_lr_restr_device.c
+    par_mod_multi_interp_device.c
     par_strength_device.c
     par_strength2nd_device.c
     par_relax_more_device.c
@@ -163,9 +182,12 @@ if (HYPRE_USING_CUDA)
     par_amgdd_fac_cycle_device.c
     par_2s_interp_device.c
     par_relax_device.c
+    par_mgr_device.c
+    par_fsai_device.c
+    dsuperlu.c
   )
-  convert_filenames_to_full_paths(CUDA_SRCS)
-  set(HYPRE_CUDA_SOURCES ${HYPRE_CUDA_SOURCES} ${CUDA_SRCS} PARENT_SCOPE)
+  convert_filenames_to_full_paths(GPU_SRCS)
+  set(HYPRE_GPU_SOURCES ${HYPRE_GPU_SOURCES} ${GPU_SRCS} PARENT_SCOPE)
 endif ()
 
 convert_filenames_to_full_paths(HDRS)
diff --git a/external/hypre/src/parcsr_ls/Common.h b/external/hypre/src/parcsr_ls/Common.h
index b8ff4fe5..6958ddc6 100644
--- a/external/hypre/src/parcsr_ls/Common.h
+++ b/external/hypre/src/parcsr_ls/Common.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/parcsr_ls/F90_HYPRE_ams.c b/external/hypre/src/parcsr_ls/F90_HYPRE_ams.c
index 33892ed4..2ede61ca 100644
--- a/external/hypre/src/parcsr_ls/F90_HYPRE_ams.c
+++ b/external/hypre/src/parcsr_ls/F90_HYPRE_ams.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -17,19 +17,19 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-    
+
 /*--------------------------------------------------------------------------
  * HYPRE_AMSCreate
  *--------------------------------------------------------------------------*/
 
 void
 hypre_F90_IFACE(hypre_amscreate, HYPRE_AMSCREATE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *ierr)
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_AMSCreate(
-           hypre_F90_PassObjRef (HYPRE_Solver, solver) ) );
+           ( HYPRE_AMSCreate(
+                hypre_F90_PassObjRef (HYPRE_Solver, solver) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -38,12 +38,12 @@ hypre_F90_IFACE(hypre_amscreate, HYPRE_AMSCREATE)
 
 void
 hypre_F90_IFACE(hypre_amsdestroy, HYPRE_AMSDESTROY)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *ierr)
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_AMSDestroy(
-           hypre_F90_PassObj (HYPRE_Solver, solver) ) );
+           ( HYPRE_AMSDestroy(
+                hypre_F90_PassObj (HYPRE_Solver, solver) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -52,18 +52,18 @@ hypre_F90_IFACE(hypre_amsdestroy, HYPRE_AMSDESTROY)
 
 void
 hypre_F90_IFACE(hypre_amssetup, HYPRE_AMSSETUP)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *A,
-     hypre_F90_Obj *b,
-     hypre_F90_Obj *x,
-     hypre_F90_Int *ierr)
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *A,
+  hypre_F90_Obj *b,
+  hypre_F90_Obj *x,
+  hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_AMSSetup(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
-           hypre_F90_PassObj (HYPRE_ParVector, b),
-           hypre_F90_PassObj (HYPRE_ParVector, x) ) );
+           ( HYPRE_AMSSetup(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
+                hypre_F90_PassObj (HYPRE_ParVector, b),
+                hypre_F90_PassObj (HYPRE_ParVector, x) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -72,18 +72,18 @@ hypre_F90_IFACE(hypre_amssetup, HYPRE_AMSSETUP)
 
 void
 hypre_F90_IFACE(hypre_amssolve, HYPRE_AMSSOLVE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *A,
-     hypre_F90_Obj *b,
-     hypre_F90_Obj *x,
-     hypre_F90_Int *ierr)
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *A,
+  hypre_F90_Obj *b,
+  hypre_F90_Obj *x,
+  hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_AMSSolve(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
-           hypre_F90_PassObj (HYPRE_ParVector, b),
-           hypre_F90_PassObj (HYPRE_ParVector, x) ) );
+           ( HYPRE_AMSSolve(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
+                hypre_F90_PassObj (HYPRE_ParVector, b),
+                hypre_F90_PassObj (HYPRE_ParVector, x) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -92,14 +92,14 @@ hypre_F90_IFACE(hypre_amssolve, HYPRE_AMSSOLVE)
 
 void
 hypre_F90_IFACE(hypre_amssetdimension, HYPRE_AMSSETDIMENSION)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *dim,
-     hypre_F90_Int *ierr)
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *dim,
+  hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_AMSSetDimension(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (dim) ) );
+           ( HYPRE_AMSSetDimension(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (dim) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -108,14 +108,14 @@ hypre_F90_IFACE(hypre_amssetdimension, HYPRE_AMSSETDIMENSION)
 
 void
 hypre_F90_IFACE(hypre_amssetdiscretegradient, HYPRE_AMSSETDISCRETEGRADIENT)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *G,
-     hypre_F90_Int *ierr)
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *G,
+  hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_AMSSetDiscreteGradient(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassObj (HYPRE_ParCSRMatrix, G) ) );
+           ( HYPRE_AMSSetDiscreteGradient(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassObj (HYPRE_ParCSRMatrix, G) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -124,18 +124,18 @@ hypre_F90_IFACE(hypre_amssetdiscretegradient, HYPRE_AMSSETDISCRETEGRADIENT)
 
 void
 hypre_F90_IFACE(hypre_amssetcoordinatevectors, HYPRE_AMSSETCOORDINATEVECTORS)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *x,
-     hypre_F90_Obj *y,
-     hypre_F90_Obj *z,
-     hypre_F90_Int *ierr)
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *x,
+  hypre_F90_Obj *y,
+  hypre_F90_Obj *z,
+  hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_AMSSetCoordinateVectors(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassObj (HYPRE_ParVector, x),
-           hypre_F90_PassObj (HYPRE_ParVector, y),
-           hypre_F90_PassObj (HYPRE_ParVector, z) ) );
+           ( HYPRE_AMSSetCoordinateVectors(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassObj (HYPRE_ParVector, x),
+                hypre_F90_PassObj (HYPRE_ParVector, y),
+                hypre_F90_PassObj (HYPRE_ParVector, z) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -144,18 +144,18 @@ hypre_F90_IFACE(hypre_amssetcoordinatevectors, HYPRE_AMSSETCOORDINATEVECTORS)
 
 void
 hypre_F90_IFACE(hypre_amssetedgeconstantvectors, HYPRE_AMSSETEDGECONSTANTVECTORS)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *Gx,
-     hypre_F90_Obj *Gy,
-     hypre_F90_Obj *Gz,
-     hypre_F90_Int *ierr)
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *Gx,
+  hypre_F90_Obj *Gy,
+  hypre_F90_Obj *Gz,
+  hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_AMSSetEdgeConstantVectors(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassObj (HYPRE_ParVector, Gx),
-           hypre_F90_PassObj (HYPRE_ParVector, Gy),
-           hypre_F90_PassObj (HYPRE_ParVector, Gz) ) );
+           ( HYPRE_AMSSetEdgeConstantVectors(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassObj (HYPRE_ParVector, Gx),
+                hypre_F90_PassObj (HYPRE_ParVector, Gy),
+                hypre_F90_PassObj (HYPRE_ParVector, Gz) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -164,14 +164,14 @@ hypre_F90_IFACE(hypre_amssetedgeconstantvectors, HYPRE_AMSSETEDGECONSTANTVECTORS
 
 void
 hypre_F90_IFACE(hypre_amssetalphapoissonmatrix, HYPRE_AMSSETALPHAPOISSONMATRIX)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *A_alpha,
-     hypre_F90_Int *ierr)
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *A_alpha,
+  hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_AMSSetAlphaPoissonMatrix(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassObj (HYPRE_ParCSRMatrix, A_alpha) ) );
+           ( HYPRE_AMSSetAlphaPoissonMatrix(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassObj (HYPRE_ParCSRMatrix, A_alpha) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -180,14 +180,14 @@ hypre_F90_IFACE(hypre_amssetalphapoissonmatrix, HYPRE_AMSSETALPHAPOISSONMATRIX)
 
 void
 hypre_F90_IFACE(hypre_amssetbetapoissonmatrix, HYPRE_AMSSETBETAPOISSONMATRIX)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *A_beta,
-     hypre_F90_Int *ierr)
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *A_beta,
+  hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_AMSSetBetaPoissonMatrix(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassObj (HYPRE_ParCSRMatrix, A_beta) ) );
+           ( HYPRE_AMSSetBetaPoissonMatrix(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassObj (HYPRE_ParCSRMatrix, A_beta) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -196,14 +196,14 @@ hypre_F90_IFACE(hypre_amssetbetapoissonmatrix, HYPRE_AMSSETBETAPOISSONMATRIX)
 
 void
 hypre_F90_IFACE(hypre_amssetmaxiter, HYPRE_AMSSETMAXITER)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *maxiter,
-     hypre_F90_Int *ierr)
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *maxiter,
+  hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_AMSSetMaxIter(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (maxiter) ) );
+           ( HYPRE_AMSSetMaxIter(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (maxiter) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -212,14 +212,14 @@ hypre_F90_IFACE(hypre_amssetmaxiter, HYPRE_AMSSETMAXITER)
 
 void
 hypre_F90_IFACE(hypre_amssettol, HYPRE_AMSSETTOL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *tol,
-     hypre_F90_Int *ierr)
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *tol,
+  hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_AMSSetTol(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassReal (tol) ) );
+           ( HYPRE_AMSSetTol(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassReal (tol) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -228,14 +228,14 @@ hypre_F90_IFACE(hypre_amssettol, HYPRE_AMSSETTOL)
 
 void
 hypre_F90_IFACE(hypre_amssetcycletype, HYPRE_AMSSETCYCLETYPE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *cycle_type,
-     hypre_F90_Int *ierr)
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *cycle_type,
+  hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_AMSSetCycleType(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (cycle_type) ) );
+           ( HYPRE_AMSSetCycleType(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (cycle_type) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -244,14 +244,14 @@ hypre_F90_IFACE(hypre_amssetcycletype, HYPRE_AMSSETCYCLETYPE)
 
 void
 hypre_F90_IFACE(hypre_amssetprintlevel, HYPRE_AMSSETPRINTLEVEL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *print_level,
-     hypre_F90_Int *ierr)
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *print_level,
+  hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_AMSSetPrintLevel(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (print_level) ) );
+           ( HYPRE_AMSSetPrintLevel(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (print_level) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -260,20 +260,20 @@ hypre_F90_IFACE(hypre_amssetprintlevel, HYPRE_AMSSETPRINTLEVEL)
 
 void
 hypre_F90_IFACE(hypre_amssetsmoothingoptions, HYPRE_AMSSETSMOOTHINGOPTIONS)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *relax_type,
-     hypre_F90_Int *relax_times,
-     hypre_F90_Real *relax_weight,
-     hypre_F90_Real *omega,
-     hypre_F90_Int *ierr)
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *relax_type,
+  hypre_F90_Int *relax_times,
+  hypre_F90_Real *relax_weight,
+  hypre_F90_Real *omega,
+  hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_AMSSetSmoothingOptions(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (relax_type),
-           hypre_F90_PassInt (relax_times),
-           hypre_F90_PassReal (relax_weight),
-           hypre_F90_PassReal (omega) ) );
+           ( HYPRE_AMSSetSmoothingOptions(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (relax_type),
+                hypre_F90_PassInt (relax_times),
+                hypre_F90_PassReal (relax_weight),
+                hypre_F90_PassReal (omega) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -282,25 +282,25 @@ hypre_F90_IFACE(hypre_amssetsmoothingoptions, HYPRE_AMSSETSMOOTHINGOPTIONS)
 
 void
 hypre_F90_IFACE(hypre_amssetalphaamgoptions, HYPRE_AMSSETALPHAAMGOPTIONS)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *alpha_coarsen_type,
-     hypre_F90_Int *alpha_agg_levels,
-     hypre_F90_Int *alpha_relax_type,
-     hypre_F90_Real *alpha_strength_threshold,
-     hypre_F90_Int *alpha_interp_type,
-     hypre_F90_Int *alpha_Pmax,
-     hypre_F90_Int *ierr)
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *alpha_coarsen_type,
+  hypre_F90_Int *alpha_agg_levels,
+  hypre_F90_Int *alpha_relax_type,
+  hypre_F90_Real *alpha_strength_threshold,
+  hypre_F90_Int *alpha_interp_type,
+  hypre_F90_Int *alpha_Pmax,
+  hypre_F90_Int *ierr)
 
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_AMSSetAlphaAMGOptions(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (alpha_coarsen_type),
-           hypre_F90_PassInt (alpha_agg_levels),
-           hypre_F90_PassInt (alpha_relax_type),
-           hypre_F90_PassReal (alpha_strength_threshold),
-           hypre_F90_PassInt (alpha_interp_type),
-           hypre_F90_PassInt (alpha_Pmax) ) );
+           ( HYPRE_AMSSetAlphaAMGOptions(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (alpha_coarsen_type),
+                hypre_F90_PassInt (alpha_agg_levels),
+                hypre_F90_PassInt (alpha_relax_type),
+                hypre_F90_PassReal (alpha_strength_threshold),
+                hypre_F90_PassInt (alpha_interp_type),
+                hypre_F90_PassInt (alpha_Pmax) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -309,25 +309,25 @@ hypre_F90_IFACE(hypre_amssetalphaamgoptions, HYPRE_AMSSETALPHAAMGOPTIONS)
 
 void
 hypre_F90_IFACE(hypre_amssetbetaamgoptions, HYPRE_AMSSETBETAAMGOPTIONS)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *beta_coarsen_type,
-     hypre_F90_Int *beta_agg_levels,
-     hypre_F90_Int *beta_relax_type,
-     hypre_F90_Real *beta_strength_threshold,
-     hypre_F90_Int *beta_interp_type,
-     hypre_F90_Int *beta_Pmax,
-     hypre_F90_Int *ierr)
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *beta_coarsen_type,
+  hypre_F90_Int *beta_agg_levels,
+  hypre_F90_Int *beta_relax_type,
+  hypre_F90_Real *beta_strength_threshold,
+  hypre_F90_Int *beta_interp_type,
+  hypre_F90_Int *beta_Pmax,
+  hypre_F90_Int *ierr)
 
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_AMSSetBetaAMGOptions(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (beta_coarsen_type),
-           hypre_F90_PassInt (beta_agg_levels),
-           hypre_F90_PassInt (beta_relax_type),
-           hypre_F90_PassReal (beta_strength_threshold),
-           hypre_F90_PassInt (beta_interp_type),
-           hypre_F90_PassInt (beta_Pmax) ) );
+           ( HYPRE_AMSSetBetaAMGOptions(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (beta_coarsen_type),
+                hypre_F90_PassInt (beta_agg_levels),
+                hypre_F90_PassInt (beta_relax_type),
+                hypre_F90_PassReal (beta_strength_threshold),
+                hypre_F90_PassInt (beta_interp_type),
+                hypre_F90_PassInt (beta_Pmax) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -336,14 +336,14 @@ hypre_F90_IFACE(hypre_amssetbetaamgoptions, HYPRE_AMSSETBETAAMGOPTIONS)
 
 void
 hypre_F90_IFACE(hypre_amsgetnumiterations, HYPRE_AMSGETNUMITERATIONS)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *num_iterations,
-     hypre_F90_Int *ierr)
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *num_iterations,
+  hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_AMSGetNumIterations(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassIntRef (num_iterations) ) );
+           ( HYPRE_AMSGetNumIterations(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassIntRef (num_iterations) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -352,14 +352,14 @@ hypre_F90_IFACE(hypre_amsgetnumiterations, HYPRE_AMSGETNUMITERATIONS)
 
 void
 hypre_F90_IFACE(hypre_amsgetfinalrelativeresidualnorm, HYPRE_AMSGETFINALRELATIVERESIDUALNORM)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *rel_resid_norm,
-     hypre_F90_Int *ierr)
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *rel_resid_norm,
+  hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_AMSGetFinalRelativeResidualNorm(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassRealRef (rel_resid_norm) ) );
+           ( HYPRE_AMSGetFinalRelativeResidualNorm(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassRealRef (rel_resid_norm) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -368,22 +368,22 @@ hypre_F90_IFACE(hypre_amsgetfinalrelativeresidualnorm, HYPRE_AMSGETFINALRELATIVE
 
 void
 hypre_F90_IFACE(hypre_amsconstructdiscretegradient, HYPRE_AMSCONSTRUCTDISCRETEGRADIENT)
-   ( hypre_F90_Obj *A,
-     hypre_F90_Obj *x_coord,
-     hypre_F90_BigIntArray *edge_vertex,
-     hypre_F90_Int *edge_orientation,
-     hypre_F90_Obj *G,
-     hypre_F90_Int *ierr)
+( hypre_F90_Obj *A,
+  hypre_F90_Obj *x_coord,
+  hypre_F90_BigIntArray *edge_vertex,
+  hypre_F90_Int *edge_orientation,
+  hypre_F90_Obj *G,
+  hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_AMSConstructDiscreteGradient(
-           hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
-           hypre_F90_PassObj (HYPRE_ParVector, x_coord),
-           hypre_F90_PassBigIntArray (edge_vertex),
-           hypre_F90_PassInt (edge_orientation),
-           hypre_F90_PassObjRef (HYPRE_ParCSRMatrix, G) ) );
+           ( HYPRE_AMSConstructDiscreteGradient(
+                hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
+                hypre_F90_PassObj (HYPRE_ParVector, x_coord),
+                hypre_F90_PassBigIntArray (edge_vertex),
+                hypre_F90_PassInt (edge_orientation),
+                hypre_F90_PassObjRef (HYPRE_ParCSRMatrix, G) ) );
 }
-    
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_Euclid.c b/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_Euclid.c
index 2052fdce..6e1ce68a 100644
--- a/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_Euclid.c
+++ b/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_Euclid.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -17,103 +17,103 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-    
+
 /*--------------------------------------------------------------------------
- * HYPRE_EuclidCreate - Return a Euclid "solver".  
+ * HYPRE_EuclidCreate - Return a Euclid "solver".
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_euclidcreate, HYPRE_EUCLIDCREATE)
-   (hypre_F90_Comm *comm,
-    hypre_F90_Obj *solver,
-    hypre_F90_Int *ierr)
+(hypre_F90_Comm *comm,
+ hypre_F90_Obj *solver,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int) HYPRE_EuclidCreate(
-      hypre_F90_PassComm (comm),
-      hypre_F90_PassObjRef (HYPRE_Solver, solver) );
+              hypre_F90_PassComm (comm),
+              hypre_F90_PassObjRef (HYPRE_Solver, solver) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_EuclidDestroy - Destroy a Euclid object.
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_eucliddestroy, HYPRE_EUCLIDDESTROY)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int) HYPRE_EuclidDestroy(
-      hypre_F90_PassObj (HYPRE_Solver, solver) );
+              hypre_F90_PassObj (HYPRE_Solver, solver) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_EuclidSetup - Set up function for Euclid.
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_euclidsetup, HYPRE_EUCLIDSETUP)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Obj *A,
-    hypre_F90_Obj *b,
-    hypre_F90_Obj *x,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Obj *A,
+ hypre_F90_Obj *b,
+ hypre_F90_Obj *x,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int) HYPRE_EuclidSetup(
-      hypre_F90_PassObj (HYPRE_Solver, solver),
-      hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
-      hypre_F90_PassObj (HYPRE_ParVector, b),
-      hypre_F90_PassObj (HYPRE_ParVector, x)   );
+              hypre_F90_PassObj (HYPRE_Solver, solver),
+              hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
+              hypre_F90_PassObj (HYPRE_ParVector, b),
+              hypre_F90_PassObj (HYPRE_ParVector, x)   );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_EuclidSolve - Solve function for Euclid.
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_euclidsolve, HYPRE_EUCLIDSOLVE)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Obj *A,
-    hypre_F90_Obj *b,
-    hypre_F90_Obj *x,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Obj *A,
+ hypre_F90_Obj *b,
+ hypre_F90_Obj *x,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int) HYPRE_EuclidSolve(
-      hypre_F90_PassObj (HYPRE_Solver, solver),
-      hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
-      hypre_F90_PassObj (HYPRE_ParVector, b),
-      hypre_F90_PassObj (HYPRE_ParVector, x)  );
+              hypre_F90_PassObj (HYPRE_Solver, solver),
+              hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
+              hypre_F90_PassObj (HYPRE_ParVector, b),
+              hypre_F90_PassObj (HYPRE_ParVector, x)  );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_EuclidSetParams
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_euclidsetparams, HYPRE_EUCLIDSETPARAMS)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *argc,
-    char **argv,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *argc,
+ char **argv,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int) HYPRE_EuclidSetParams(
-      hypre_F90_PassObj (HYPRE_Solver, solver), 
-      hypre_F90_PassInt (argc),
-      (char **)       argv );
+              hypre_F90_PassObj (HYPRE_Solver, solver),
+              hypre_F90_PassInt (argc),
+              (char **)       argv );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_EuclidSetParamsFromFile
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_euclidsetparamsfromfile, HYPRE_EUCLIDSETPARAMSFROMFILE)
-   (hypre_F90_Obj *solver,
-    char *filename,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ char *filename,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int) HYPRE_EuclidSetParamsFromFile(
-      hypre_F90_PassObj (HYPRE_Solver, solver), 
-      (char *)        filename );
+              hypre_F90_PassObj (HYPRE_Solver, solver),
+              (char *)        filename );
 }
 
 /*--------------------------------------------------------------------------
@@ -122,13 +122,13 @@ hypre_F90_IFACE(hypre_euclidsetparamsfromfile, HYPRE_EUCLIDSETPARAMSFROMFILE)
 
 void
 hypre_F90_IFACE(hypre_euclidsetlevel, HYPRE_EUCLIDSETLEVEL)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *eu_level,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *eu_level,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int) HYPRE_EuclidSetLevel(
-      hypre_F90_PassObj (HYPRE_Solver, solver),
-      hypre_F90_PassInt (eu_level) );
+              hypre_F90_PassObj (HYPRE_Solver, solver),
+              hypre_F90_PassInt (eu_level) );
 }
 
 /*--------------------------------------------------------------------------
@@ -137,13 +137,13 @@ hypre_F90_IFACE(hypre_euclidsetlevel, HYPRE_EUCLIDSETLEVEL)
 
 void
 hypre_F90_IFACE(hypre_euclidsetbj, HYPRE_EUCLIDSETBJ)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *bj,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *bj,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int) HYPRE_EuclidSetBJ(
-      hypre_F90_PassObj (HYPRE_Solver, solver),
-      hypre_F90_PassInt (bj) );
+              hypre_F90_PassObj (HYPRE_Solver, solver),
+              hypre_F90_PassInt (bj) );
 }
 
 /*--------------------------------------------------------------------------
@@ -152,13 +152,13 @@ hypre_F90_IFACE(hypre_euclidsetbj, HYPRE_EUCLIDSETBJ)
 
 void
 hypre_F90_IFACE(hypre_euclidsetstats, HYPRE_EUCLIDSETSTATS)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *eu_stats,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *eu_stats,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int) HYPRE_EuclidSetStats(
-      hypre_F90_PassObj (HYPRE_Solver, solver),
-      hypre_F90_PassInt (eu_stats) );
+              hypre_F90_PassObj (HYPRE_Solver, solver),
+              hypre_F90_PassInt (eu_stats) );
 }
 
 /*--------------------------------------------------------------------------
@@ -167,13 +167,13 @@ hypre_F90_IFACE(hypre_euclidsetstats, HYPRE_EUCLIDSETSTATS)
 
 void
 hypre_F90_IFACE(hypre_euclidsetmem, HYPRE_EUCLIDSETMEM)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *eu_mem,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *eu_mem,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int) HYPRE_EuclidSetMem(
-      hypre_F90_PassObj (HYPRE_Solver, solver),
-      hypre_F90_PassInt (eu_mem) );
+              hypre_F90_PassObj (HYPRE_Solver, solver),
+              hypre_F90_PassInt (eu_mem) );
 }
 
 /*--------------------------------------------------------------------------
@@ -182,13 +182,13 @@ hypre_F90_IFACE(hypre_euclidsetmem, HYPRE_EUCLIDSETMEM)
 
 void
 hypre_F90_IFACE(hypre_euclidsetsparsea, HYPRE_EUCLIDSETSPARSEA)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Real *spa,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Real *spa,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int) HYPRE_EuclidSetSparseA(
-      hypre_F90_PassObj (HYPRE_Solver, solver),
-      hypre_F90_PassReal (spa) );
+              hypre_F90_PassObj (HYPRE_Solver, solver),
+              hypre_F90_PassReal (spa) );
 }
 
 /*--------------------------------------------------------------------------
@@ -197,13 +197,13 @@ hypre_F90_IFACE(hypre_euclidsetsparsea, HYPRE_EUCLIDSETSPARSEA)
 
 void
 hypre_F90_IFACE(hypre_euclidsetrowscale, HYPRE_EUCLIDSETROWSCALE)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *row_scale,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *row_scale,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int) HYPRE_EuclidSetRowScale(
-      hypre_F90_PassObj (HYPRE_Solver, solver),
-      hypre_F90_PassInt (row_scale) );
+              hypre_F90_PassObj (HYPRE_Solver, solver),
+              hypre_F90_PassInt (row_scale) );
 }
 
 /*--------------------------------------------------------------------------
@@ -212,13 +212,13 @@ hypre_F90_IFACE(hypre_euclidsetrowscale, HYPRE_EUCLIDSETROWSCALE)
 
 void
 hypre_F90_IFACE(hypre_euclidsetilut, HYPRE_EUCLIDSETILUT)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Real *drop_tol,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Real *drop_tol,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int) HYPRE_EuclidSetILUT(
-      hypre_F90_PassObj (HYPRE_Solver, solver),
-      hypre_F90_PassReal (drop_tol) );
+              hypre_F90_PassObj (HYPRE_Solver, solver),
+              hypre_F90_PassReal (drop_tol) );
 }
 
 #ifdef __cplusplus
diff --git a/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_ParaSails.c b/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_ParaSails.c
index fa5c468b..f072459a 100644
--- a/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_ParaSails.c
+++ b/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_ParaSails.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -17,21 +17,21 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-    
+
 /*--------------------------------------------------------------------------
  * HYPRE_ParaSailsCreate
  *--------------------------------------------------------------------------*/
 
 void
 hypre_F90_IFACE(hypre_parasailscreate, HYPRE_PARASAILSCREATE)
-   ( hypre_F90_Comm *comm,
-     hypre_F90_Obj *solver,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Comm *comm,
+  hypre_F90_Obj *solver,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParaSailsCreate(
-           hypre_F90_PassComm (comm),
-           hypre_F90_PassObjRef (HYPRE_Solver, solver) ) );
+           ( HYPRE_ParaSailsCreate(
+                hypre_F90_PassComm (comm),
+                hypre_F90_PassObjRef (HYPRE_Solver, solver) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -40,128 +40,128 @@ hypre_F90_IFACE(hypre_parasailscreate, HYPRE_PARASAILSCREATE)
 
 void
 hypre_F90_IFACE(hypre_parasailsdestroy, HYPRE_PARASAILSDESTROY)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParaSailsDestroy(
-           hypre_F90_PassObj (HYPRE_Solver, solver) ) );
+           ( HYPRE_ParaSailsDestroy(
+                hypre_F90_PassObj (HYPRE_Solver, solver) ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_ParaSailsSetup
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_parasailssetup, HYPRE_PARASAILSSETUP)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *A,
-     hypre_F90_Obj *b,
-     hypre_F90_Obj *x,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *A,
+  hypre_F90_Obj *b,
+  hypre_F90_Obj *x,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParaSailsSetup(
-           hypre_F90_PassObj (HYPRE_Solver, solver), 
-           hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
-           hypre_F90_PassObj (HYPRE_ParVector, b),
-           hypre_F90_PassObj (HYPRE_ParVector, x) ) );
+           ( HYPRE_ParaSailsSetup(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
+                hypre_F90_PassObj (HYPRE_ParVector, b),
+                hypre_F90_PassObj (HYPRE_ParVector, x) ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_ParaSailsSolve
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_parasailssolve, HYPRE_PARASAILSSOLVE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *A,
-     hypre_F90_Obj *b,
-     hypre_F90_Obj *x,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *A,
+  hypre_F90_Obj *b,
+  hypre_F90_Obj *x,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParaSailsSolve(
-           hypre_F90_PassObj (HYPRE_Solver, solver), 
-           hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
-           hypre_F90_PassObj (HYPRE_ParVector, b),
-           hypre_F90_PassObj (HYPRE_ParVector, x) ) );
+           ( HYPRE_ParaSailsSolve(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
+                hypre_F90_PassObj (HYPRE_ParVector, b),
+                hypre_F90_PassObj (HYPRE_ParVector, x) ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_ParaSailsSetParams
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_parasailssetparams, HYPRE_PARASAILSSETPARAMS)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *thresh,
-     hypre_F90_Int *nlevels,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *thresh,
+  hypre_F90_Int *nlevels,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParaSailsSetParams(
-           hypre_F90_PassObj (HYPRE_Solver, solver), 
-           hypre_F90_PassReal (thresh),
-           hypre_F90_PassInt (nlevels) ) );
+           ( HYPRE_ParaSailsSetParams(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassReal (thresh),
+                hypre_F90_PassInt (nlevels) ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_ParaSailsSetThresh,  HYPRE_ParaSailsGetThresh
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_parasailssetthresh, HYPRE_PARASAILSSETTHRESH)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *thresh,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *thresh,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParaSailsSetThresh(
-           hypre_F90_PassObj (HYPRE_Solver, solver), 
-           hypre_F90_PassReal (thresh) ) );
+           ( HYPRE_ParaSailsSetThresh(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassReal (thresh) ) );
 }
 
 
-void 
+void
 hypre_F90_IFACE(hypre_parasailsgetthresh, HYPRE_PARASAILSGETTHRESH)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *thresh,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *thresh,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParaSailsGetThresh(
-           hypre_F90_PassObj (HYPRE_Solver, solver), 
-           hypre_F90_PassRealRef (thresh) ) );
+           ( HYPRE_ParaSailsGetThresh(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassRealRef (thresh) ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_ParaSailsSetNlevels,  HYPRE_ParaSailsGetNlevels
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_parasailssetnlevels, HYPRE_PARASAILSSETNLEVELS)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *nlevels,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *nlevels,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParaSailsSetNlevels(
-           hypre_F90_PassObj (HYPRE_Solver, solver), 
-           hypre_F90_PassInt (nlevels)) );
+           ( HYPRE_ParaSailsSetNlevels(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (nlevels)) );
 }
 
 
-void 
+void
 hypre_F90_IFACE(hypre_parasailsgetnlevels, HYPRE_PARASAILSGETNLEVELS)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *nlevels,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *nlevels,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParaSailsGetNlevels(
-           hypre_F90_PassObj (HYPRE_Solver, solver), 
-           hypre_F90_PassIntRef (nlevels)) );
+           ( HYPRE_ParaSailsGetNlevels(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassIntRef (nlevels)) );
 }
 
 /*--------------------------------------------------------------------------
@@ -170,27 +170,27 @@ hypre_F90_IFACE(hypre_parasailsgetnlevels, HYPRE_PARASAILSGETNLEVELS)
 
 void
 hypre_F90_IFACE(hypre_parasailssetfilter, HYPRE_PARASAILSSETFILTER)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *filter,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *filter,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParaSailsSetFilter(
-           hypre_F90_PassObj (HYPRE_Solver, solver), 
-           hypre_F90_PassReal (filter)  ) );
+           ( HYPRE_ParaSailsSetFilter(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassReal (filter)  ) );
 }
 
 
 void
 hypre_F90_IFACE(hypre_parasailsgetfilter, HYPRE_PARASAILSGETFILTER)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *filter,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *filter,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParaSailsGetFilter(
-           hypre_F90_PassObj (HYPRE_Solver, solver), 
-           hypre_F90_PassRealRef (filter)  ) );
+           ( HYPRE_ParaSailsGetFilter(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassRealRef (filter)  ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -199,26 +199,26 @@ hypre_F90_IFACE(hypre_parasailsgetfilter, HYPRE_PARASAILSGETFILTER)
 
 void
 hypre_F90_IFACE(hypre_parasailssetsym, HYPRE_PARASAILSSETSYM)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *sym,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *sym,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParaSailsSetSym(
-           hypre_F90_PassObj (HYPRE_Solver, solver), 
-           hypre_F90_PassInt (sym)     ) );
+           ( HYPRE_ParaSailsSetSym(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (sym)     ) );
 }
 
 void
 hypre_F90_IFACE(hypre_parasailsgetsym, HYPRE_PARASAILSGETSYM)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *sym,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *sym,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParaSailsGetSym(
-           hypre_F90_PassObj (HYPRE_Solver, solver), 
-           hypre_F90_PassIntRef (sym)     ) );
+           ( HYPRE_ParaSailsGetSym(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassIntRef (sym)     ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -227,26 +227,26 @@ hypre_F90_IFACE(hypre_parasailsgetsym, HYPRE_PARASAILSGETSYM)
 
 void
 hypre_F90_IFACE(hypre_parasailssetloadbal, HYPRE_PARASAILSSETLOADBAL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *loadbal,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *loadbal,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParaSailsSetLoadbal(
-           hypre_F90_PassObj (HYPRE_Solver, solver), 
-           hypre_F90_PassReal (loadbal) ) );
+           ( HYPRE_ParaSailsSetLoadbal(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassReal (loadbal) ) );
 }
 
 void
 hypre_F90_IFACE(hypre_parasailsgetloadbal, HYPRE_PARASAILSGETLOADBAL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *loadbal,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *loadbal,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParaSailsGetLoadbal(
-           hypre_F90_PassObj (HYPRE_Solver, solver), 
-           hypre_F90_PassRealRef (loadbal) ) );
+           ( HYPRE_ParaSailsGetLoadbal(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassRealRef (loadbal) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -255,26 +255,26 @@ hypre_F90_IFACE(hypre_parasailsgetloadbal, HYPRE_PARASAILSGETLOADBAL)
 
 void
 hypre_F90_IFACE(hypre_parasailssetreuse, HYPRE_PARASAILSSETREUSE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *reuse,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *reuse,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParaSailsSetReuse(
-           hypre_F90_PassObj (HYPRE_Solver, solver), 
-           hypre_F90_PassInt (reuse) ) );
+           ( HYPRE_ParaSailsSetReuse(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (reuse) ) );
 }
 
 void
 hypre_F90_IFACE(hypre_parasailsgetreuse, HYPRE_PARASAILSGETREUSE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *reuse,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *reuse,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParaSailsGetReuse(
-           hypre_F90_PassObj (HYPRE_Solver, solver), 
-           hypre_F90_PassIntRef (reuse) ) );
+           ( HYPRE_ParaSailsGetReuse(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassIntRef (reuse) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -283,28 +283,28 @@ hypre_F90_IFACE(hypre_parasailsgetreuse, HYPRE_PARASAILSGETREUSE)
 
 void
 hypre_F90_IFACE(hypre_parasailssetlogging, HYPRE_PARASAILSSETLOGGING)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *logging,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *logging,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParaSailsSetLogging(
-           hypre_F90_PassObj (HYPRE_Solver, solver), 
-           hypre_F90_PassInt (logging) ) );
+           ( HYPRE_ParaSailsSetLogging(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (logging) ) );
 }
 
 void
 hypre_F90_IFACE(hypre_parasailsgetlogging, HYPRE_PARASAILSGETLOGGING)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *logging,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *logging,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParaSailsGetLogging(
-           hypre_F90_PassObj (HYPRE_Solver, solver), 
-           hypre_F90_PassIntRef (logging) ) );
+           ( HYPRE_ParaSailsGetLogging(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassIntRef (logging) ) );
 }
-    
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_amg.c b/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_amg.c
index db490b91..82812091 100644
--- a/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_amg.c
+++ b/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_amg.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -24,12 +24,12 @@ extern "C" {
 
 void
 hypre_F90_IFACE(hypre_boomeramgcreate, HYPRE_BOOMERAMGCREATE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGCreate(
-           hypre_F90_PassObjRef (HYPRE_Solver, solver)) );
+           ( HYPRE_BoomerAMGCreate(
+                hypre_F90_PassObjRef (HYPRE_Solver, solver)) );
 }
 
 /*--------------------------------------------------------------------------
@@ -38,12 +38,12 @@ hypre_F90_IFACE(hypre_boomeramgcreate, HYPRE_BOOMERAMGCREATE)
 
 void
 hypre_F90_IFACE(hypre_boomeramgdestroy, HYPRE_BOOMERAMGDESTROY)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGDestroy(
-           hypre_F90_PassObj (HYPRE_Solver, solver) ) );
+           ( HYPRE_BoomerAMGDestroy(
+                hypre_F90_PassObj (HYPRE_Solver, solver) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -52,18 +52,18 @@ hypre_F90_IFACE(hypre_boomeramgdestroy, HYPRE_BOOMERAMGDESTROY)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetup, HYPRE_BOOMERAMGSETUP)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *A,
-     hypre_F90_Obj *b,
-     hypre_F90_Obj *x,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *A,
+  hypre_F90_Obj *b,
+  hypre_F90_Obj *x,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetup(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
-           hypre_F90_PassObj (HYPRE_ParVector, b),
-           hypre_F90_PassObj (HYPRE_ParVector, x)       ) );
+           ( HYPRE_BoomerAMGSetup(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
+                hypre_F90_PassObj (HYPRE_ParVector, b),
+                hypre_F90_PassObj (HYPRE_ParVector, x)       ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -72,18 +72,18 @@ hypre_F90_IFACE(hypre_boomeramgsetup, HYPRE_BOOMERAMGSETUP)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsolve, HYPRE_BOOMERAMGSOLVE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *A,
-     hypre_F90_Obj *b,
-     hypre_F90_Obj *x,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *A,
+  hypre_F90_Obj *b,
+  hypre_F90_Obj *x,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSolve(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
-           hypre_F90_PassObj (HYPRE_ParVector, b),
-           hypre_F90_PassObj (HYPRE_ParVector, x)       ) );
+           ( HYPRE_BoomerAMGSolve(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
+                hypre_F90_PassObj (HYPRE_ParVector, b),
+                hypre_F90_PassObj (HYPRE_ParVector, x)       ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -92,18 +92,18 @@ hypre_F90_IFACE(hypre_boomeramgsolve, HYPRE_BOOMERAMGSOLVE)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsolvet, HYPRE_BOOMERAMGSOLVET)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *A,
-     hypre_F90_Obj *b,
-     hypre_F90_Obj *x,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *A,
+  hypre_F90_Obj *b,
+  hypre_F90_Obj *x,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSolveT(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
-           hypre_F90_PassObj (HYPRE_ParVector, b),
-           hypre_F90_PassObj (HYPRE_ParVector, x)       ) );
+           ( HYPRE_BoomerAMGSolveT(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
+                hypre_F90_PassObj (HYPRE_ParVector, b),
+                hypre_F90_PassObj (HYPRE_ParVector, x)       ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -112,14 +112,14 @@ hypre_F90_IFACE(hypre_boomeramgsolvet, HYPRE_BOOMERAMGSOLVET)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetrestriction, HYPRE_BOOMERAMGSETRESTRICTION)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *restr_par,
-     hypre_F90_Int *ierr       )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *restr_par,
+  hypre_F90_Int *ierr       )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetRestriction(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (restr_par) ) );
+           ( HYPRE_BoomerAMGSetRestriction(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (restr_par) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -128,28 +128,28 @@ hypre_F90_IFACE(hypre_boomeramgsetrestriction, HYPRE_BOOMERAMGSETRESTRICTION)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetmaxlevels, HYPRE_BOOMERAMGSETMAXLEVELS)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *max_levels,
-     hypre_F90_Int *ierr        )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *max_levels,
+  hypre_F90_Int *ierr        )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetMaxLevels(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (max_levels) ) );
+           ( HYPRE_BoomerAMGSetMaxLevels(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (max_levels) ) );
 }
 
 
 
 void
 hypre_F90_IFACE(hypre_boomeramggetmaxlevels, HYPRE_BOOMERAMGGETMAXLEVELS)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *max_levels,
-     hypre_F90_Int *ierr        )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *max_levels,
+  hypre_F90_Int *ierr        )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGGetMaxLevels(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassIntRef (max_levels) ) );
+           ( HYPRE_BoomerAMGGetMaxLevels(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassIntRef (max_levels) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -159,28 +159,28 @@ hypre_F90_IFACE(hypre_boomeramggetmaxlevels, HYPRE_BOOMERAMGGETMAXLEVELS)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetmaxcoarsesize, HYPRE_BOOMERAMGSETMAXCOARSESIZE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *max_coarse_size,
-     hypre_F90_Int *ierr        )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *max_coarse_size,
+  hypre_F90_Int *ierr        )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetMaxCoarseSize(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (max_coarse_size) ) );
+           ( HYPRE_BoomerAMGSetMaxCoarseSize(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (max_coarse_size) ) );
 }
 
 
 
 void
 hypre_F90_IFACE(hypre_boomeramggetmaxcoarsesize, HYPRE_BOOMERAMGGETMAXCOARSESIZE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *max_coarse_size,
-     hypre_F90_Int *ierr        )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *max_coarse_size,
+  hypre_F90_Int *ierr        )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGGetMaxCoarseSize(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassIntRef (max_coarse_size) ) );
+           ( HYPRE_BoomerAMGGetMaxCoarseSize(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassIntRef (max_coarse_size) ) );
 }
 
 
@@ -191,28 +191,28 @@ hypre_F90_IFACE(hypre_boomeramggetmaxcoarsesize, HYPRE_BOOMERAMGGETMAXCOARSESIZE
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetmincoarsesize, HYPRE_BOOMERAMGSETMINCOARSESIZE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *min_coarse_size,
-     hypre_F90_Int *ierr        )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *min_coarse_size,
+  hypre_F90_Int *ierr        )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetMinCoarseSize(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (min_coarse_size) ) );
+           ( HYPRE_BoomerAMGSetMinCoarseSize(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (min_coarse_size) ) );
 }
 
 
 
 void
 hypre_F90_IFACE(hypre_boomeramggetmincoarsesize, HYPRE_BOOMERAMGGETMINCOARSESIZE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *min_coarse_size,
-     hypre_F90_Int *ierr        )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *min_coarse_size,
+  hypre_F90_Int *ierr        )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGGetMinCoarseSize(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassIntRef (min_coarse_size) ) );
+           ( HYPRE_BoomerAMGGetMinCoarseSize(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassIntRef (min_coarse_size) ) );
 }
 
 
@@ -224,26 +224,26 @@ hypre_F90_IFACE(hypre_boomeramggetmincoarsesize, HYPRE_BOOMERAMGGETMINCOARSESIZE
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetstrongthrshld, HYPRE_BOOMERAMGSETSTRONGTHRSHLD)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *strong_threshold,
-     hypre_F90_Int *ierr              )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *strong_threshold,
+  hypre_F90_Int *ierr              )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetStrongThreshold(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassReal (strong_threshold) ) );
+           ( HYPRE_BoomerAMGSetStrongThreshold(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassReal (strong_threshold) ) );
 }
 
 void
 hypre_F90_IFACE(hypre_boomeramggetstrongthrshld, HYPRE_BOOMERAMGGETSTRONGTHRSHLD)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *strong_threshold,
-     hypre_F90_Int *ierr              )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *strong_threshold,
+  hypre_F90_Int *ierr              )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGGetStrongThreshold(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassRealRef (strong_threshold) ) );
+           ( HYPRE_BoomerAMGGetStrongThreshold(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassRealRef (strong_threshold) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -252,26 +252,26 @@ hypre_F90_IFACE(hypre_boomeramggetstrongthrshld, HYPRE_BOOMERAMGGETSTRONGTHRSHLD
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetmaxrowsum, HYPRE_BOOMERAMGSETMAXROWSUM)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *max_row_sum,
-     hypre_F90_Int *ierr              )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *max_row_sum,
+  hypre_F90_Int *ierr              )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetMaxRowSum(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassReal (max_row_sum) ) );
+           ( HYPRE_BoomerAMGSetMaxRowSum(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassReal (max_row_sum) ) );
 }
 
 void
 hypre_F90_IFACE(hypre_boomeramggetmaxrowsum, HYPRE_BOOMERAMGGETMAXROWSUM)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *max_row_sum,
-     hypre_F90_Int *ierr              )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *max_row_sum,
+  hypre_F90_Int *ierr              )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGGetMaxRowSum(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassRealRef (max_row_sum) ) );
+           ( HYPRE_BoomerAMGGetMaxRowSum(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassRealRef (max_row_sum) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -280,26 +280,26 @@ hypre_F90_IFACE(hypre_boomeramggetmaxrowsum, HYPRE_BOOMERAMGGETMAXROWSUM)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsettruncfactor, HYPRE_BOOMERAMGSETTRUNCFACTOR)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *trunc_factor,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *trunc_factor,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetTruncFactor(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassReal (trunc_factor) ) );
+           ( HYPRE_BoomerAMGSetTruncFactor(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassReal (trunc_factor) ) );
 }
 
 void
 hypre_F90_IFACE(hypre_boomeramggettruncfactor, HYPRE_BOOMERAMGGETTRUNCFACTOR)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *trunc_factor,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *trunc_factor,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGGetTruncFactor(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassRealRef (trunc_factor) ) );
+           ( HYPRE_BoomerAMGGetTruncFactor(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassRealRef (trunc_factor) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -308,26 +308,26 @@ hypre_F90_IFACE(hypre_boomeramggettruncfactor, HYPRE_BOOMERAMGGETTRUNCFACTOR)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetpmaxelmts, HYPRE_BOOMERAMGSETPMAXELMTS)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *p_max_elmts,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *p_max_elmts,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetPMaxElmts(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (p_max_elmts) ) );
+           ( HYPRE_BoomerAMGSetPMaxElmts(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (p_max_elmts) ) );
 }
 
 void
 hypre_F90_IFACE(hypre_boomeramggetpmaxelmts, HYPRE_BOOMERAMGGETPMAXELMTS)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *p_max_elmts,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *p_max_elmts,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGGetPMaxElmts(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassIntRef (p_max_elmts) ) );
+           ( HYPRE_BoomerAMGGetPMaxElmts(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassIntRef (p_max_elmts) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -336,26 +336,26 @@ hypre_F90_IFACE(hypre_boomeramggetpmaxelmts, HYPRE_BOOMERAMGGETPMAXELMTS)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetjacobitrunc, HYPRE_BOOMERAMGSETJACOBITRUNC)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *trunc_factor,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *trunc_factor,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetJacobiTruncThreshold(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassReal (trunc_factor) ) );
+           ( HYPRE_BoomerAMGSetJacobiTruncThreshold(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassReal (trunc_factor) ) );
 }
 
 void
 hypre_F90_IFACE(hypre_boomeramggetjacobitrunc, HYPRE_BOOMERAMGGETJACOBITRUNC)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *trunc_factor,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *trunc_factor,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGGetJacobiTruncThreshold(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassRealRef (trunc_factor) ) );
+           ( HYPRE_BoomerAMGGetJacobiTruncThreshold(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassRealRef (trunc_factor) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -366,14 +366,14 @@ hypre_F90_IFACE(hypre_boomeramggetjacobitrunc, HYPRE_BOOMERAMGGETJACOBITRUNC)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetpostinterp, HYPRE_BOOMERAMGSETPOSTINTERP)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *type,
-     hypre_F90_Int *ierr            )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *type,
+  hypre_F90_Int *ierr            )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetPostInterpType(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (type) ) );
+           ( HYPRE_BoomerAMGSetPostInterpType(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (type) ) );
 }
 
 
@@ -383,28 +383,28 @@ hypre_F90_IFACE(hypre_boomeramgsetpostinterp, HYPRE_BOOMERAMGSETPOSTINTERP)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetinterptype, HYPRE_BOOMERAMGSETINTERPTYPE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *interp_type,
-     hypre_F90_Int *ierr         )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *interp_type,
+  hypre_F90_Int *ierr         )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetInterpType(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (interp_type) ) );
+           ( HYPRE_BoomerAMGSetInterpType(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (interp_type) ) );
 }
 /*--------------------------------------------------------------------------
  * HYPRE_BoomerAMGSetSepWeight
  *--------------------------------------------------------------------------*/
 void
 hypre_F90_IFACE(hypre_boomeramgsetsepweight, HYPRE_BOOMERAMGSETSEPWEIGHT)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *sep_weight,
-     hypre_F90_Int *ierr         )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *sep_weight,
+  hypre_F90_Int *ierr         )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetSepWeight(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (sep_weight) ) );
+           ( HYPRE_BoomerAMGSetSepWeight(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (sep_weight) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -413,14 +413,14 @@ hypre_F90_IFACE(hypre_boomeramgsetsepweight, HYPRE_BOOMERAMGSETSEPWEIGHT)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetminiter, HYPRE_BOOMERAMGSETMINITER)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *min_iter,
-     hypre_F90_Int *ierr      )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *min_iter,
+  hypre_F90_Int *ierr      )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetMinIter(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (min_iter) ) );
+           ( HYPRE_BoomerAMGSetMinIter(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (min_iter) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -429,26 +429,26 @@ hypre_F90_IFACE(hypre_boomeramgsetminiter, HYPRE_BOOMERAMGSETMINITER)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetmaxiter, HYPRE_BOOMERAMGSETMAXITER)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *max_iter,
-     hypre_F90_Int *ierr      )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *max_iter,
+  hypre_F90_Int *ierr      )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetMaxIter(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (max_iter) ) );
+           ( HYPRE_BoomerAMGSetMaxIter(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (max_iter) ) );
 }
 
 void
 hypre_F90_IFACE(hypre_boomeramggetmaxiter, HYPRE_BOOMERAMGGETMAXITER)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *max_iter,
-     hypre_F90_Int *ierr      )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *max_iter,
+  hypre_F90_Int *ierr      )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGGetMaxIter(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassIntRef (max_iter) ) );
+           ( HYPRE_BoomerAMGGetMaxIter(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassIntRef (max_iter) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -457,26 +457,26 @@ hypre_F90_IFACE(hypre_boomeramggetmaxiter, HYPRE_BOOMERAMGGETMAXITER)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetcoarsentype, HYPRE_BOOMERAMGSETCOARSENTYPE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *coarsen_type,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *coarsen_type,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetCoarsenType(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (coarsen_type) ) );
+           ( HYPRE_BoomerAMGSetCoarsenType(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (coarsen_type) ) );
 }
 
 void
 hypre_F90_IFACE(hypre_boomeramggetcoarsentype, HYPRE_BOOMERAMGGETCOARSENTYPE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *coarsen_type,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *coarsen_type,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGGetCoarsenType(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassIntRef (coarsen_type) ) );
+           ( HYPRE_BoomerAMGGetCoarsenType(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassIntRef (coarsen_type) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -485,26 +485,26 @@ hypre_F90_IFACE(hypre_boomeramggetcoarsentype, HYPRE_BOOMERAMGGETCOARSENTYPE)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetmeasuretype, HYPRE_BOOMERAMGSETMEASURETYPE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *measure_type,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *measure_type,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetMeasureType(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (measure_type) ) );
+           ( HYPRE_BoomerAMGSetMeasureType(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (measure_type) ) );
 }
 
 void
 hypre_F90_IFACE(hypre_boomeramggetmeasuretype, HYPRE_BOOMERAMGGETMEASURETYPE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *measure_type,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *measure_type,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGGetMeasureType(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassIntRef (measure_type) ) );
+           ( HYPRE_BoomerAMGGetMeasureType(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassIntRef (measure_type) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -513,12 +513,12 @@ hypre_F90_IFACE(hypre_boomeramggetmeasuretype, HYPRE_BOOMERAMGGETMEASURETYPE)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetolddefault, HYPRE_BOOMERAMGSETOLDDEFAULT)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetOldDefault(
-           hypre_F90_PassObj (HYPRE_Solver, solver) ) );
+           ( HYPRE_BoomerAMGSetOldDefault(
+                hypre_F90_PassObj (HYPRE_Solver, solver) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -527,14 +527,14 @@ hypre_F90_IFACE(hypre_boomeramgsetolddefault, HYPRE_BOOMERAMGSETOLDDEFAULT)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetsetuptype, HYPRE_BOOMERAMGSETSETUPTYPE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *setup_type,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *setup_type,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetSetupType(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (setup_type) ) );
+           ( HYPRE_BoomerAMGSetSetupType(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (setup_type) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -543,26 +543,26 @@ hypre_F90_IFACE(hypre_boomeramgsetsetuptype, HYPRE_BOOMERAMGSETSETUPTYPE)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetcycletype, HYPRE_BOOMERAMGSETCYCLETYPE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *cycle_type,
-     hypre_F90_Int *ierr        )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *cycle_type,
+  hypre_F90_Int *ierr        )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetCycleType(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (cycle_type) ) );
+           ( HYPRE_BoomerAMGSetCycleType(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (cycle_type) ) );
 }
 
 void
 hypre_F90_IFACE(hypre_boomeramggetcycletype, HYPRE_BOOMERAMGGETCYCLETYPE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *cycle_type,
-     hypre_F90_Int *ierr        )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *cycle_type,
+  hypre_F90_Int *ierr        )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGGetCycleType(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassIntRef (cycle_type) ) );
+           ( HYPRE_BoomerAMGGetCycleType(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassIntRef (cycle_type) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -571,26 +571,26 @@ hypre_F90_IFACE(hypre_boomeramggetcycletype, HYPRE_BOOMERAMGGETCYCLETYPE)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsettol, HYPRE_BOOMERAMGSETTOL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *tol,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *tol,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetTol(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassReal (tol)     ) );
+           ( HYPRE_BoomerAMGSetTol(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassReal (tol)     ) );
 }
 
 void
 hypre_F90_IFACE(hypre_boomeramggettol, HYPRE_BOOMERAMGGETTOL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *tol,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *tol,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGGetTol(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassRealRef (tol)     ) );
+           ( HYPRE_BoomerAMGGetTol(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassRealRef (tol)     ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -600,14 +600,14 @@ hypre_F90_IFACE(hypre_boomeramggettol, HYPRE_BOOMERAMGGETTOL)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetnumgridsweeps, HYPRE_BOOMERAMGSETNUMGRIDSWEEPS)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *num_grid_sweeps,
-     hypre_F90_Int *ierr             )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *num_grid_sweeps,
+  hypre_F90_Int *ierr             )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetNumGridSweeps(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassIntRef (num_grid_sweeps) ) );
+           ( HYPRE_BoomerAMGSetNumGridSweeps(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassIntRef (num_grid_sweeps) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -616,14 +616,14 @@ hypre_F90_IFACE(hypre_boomeramgsetnumgridsweeps, HYPRE_BOOMERAMGSETNUMGRIDSWEEPS
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetnumsweeps, HYPRE_BOOMERAMGSETNUMSWEEPS)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *num_sweeps,
-     hypre_F90_Int *ierr             )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *num_sweeps,
+  hypre_F90_Int *ierr             )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetNumSweeps(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (num_sweeps) ) );
+           ( HYPRE_BoomerAMGSetNumSweeps(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (num_sweeps) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -632,30 +632,30 @@ hypre_F90_IFACE(hypre_boomeramgsetnumsweeps, HYPRE_BOOMERAMGSETNUMSWEEPS)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetcyclenumsweeps, HYPRE_BOOMERAMGSETCYCLENUMSWEEPS)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *num_sweeps,
-     hypre_F90_Int *k,
-     hypre_F90_Int *ierr             )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *num_sweeps,
+  hypre_F90_Int *k,
+  hypre_F90_Int *ierr             )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetCycleNumSweeps(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (num_sweeps),
-           hypre_F90_PassInt (k) ) );
+           ( HYPRE_BoomerAMGSetCycleNumSweeps(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (num_sweeps),
+                hypre_F90_PassInt (k) ) );
 }
 
 void
 hypre_F90_IFACE(hypre_boomeramggetcyclenumsweeps, HYPRE_BOOMERAMGGETCYCLENUMSWEEPS)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *num_sweeps,
-     hypre_F90_Int *k,
-     hypre_F90_Int *ierr             )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *num_sweeps,
+  hypre_F90_Int *k,
+  hypre_F90_Int *ierr             )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGGetCycleNumSweeps(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassIntRef (num_sweeps),
-           hypre_F90_PassInt (k) ) );
+           ( HYPRE_BoomerAMGGetCycleNumSweeps(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassIntRef (num_sweeps),
+                hypre_F90_PassInt (k) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -667,13 +667,13 @@ hypre_F90_IFACE(hypre_boomeramggetcyclenumsweeps, HYPRE_BOOMERAMGGETCYCLENUMSWEE
 
 void
 hypre_F90_IFACE(hypre_boomeramginitgridrelaxatn, HYPRE_BOOMERAMGINITGRIDRELAXATN)
-   ( hypre_F90_Obj *num_grid_sweeps,
-     hypre_F90_Obj *grid_relax_type,
-     hypre_F90_Obj *grid_relax_points,
-     hypre_F90_Int *coarsen_type,
-     hypre_F90_Obj *relax_weights,
-     hypre_F90_Int *max_levels,
-     hypre_F90_Int *ierr               )
+( hypre_F90_Obj *num_grid_sweeps,
+  hypre_F90_Obj *grid_relax_type,
+  hypre_F90_Obj *grid_relax_points,
+  hypre_F90_Int *coarsen_type,
+  hypre_F90_Obj *relax_weights,
+  hypre_F90_Int *max_levels,
+  hypre_F90_Int *ierr               )
 {
    *num_grid_sweeps   = (hypre_F90_Obj) hypre_CTAlloc(HYPRE_Int*,  1, HYPRE_MEMORY_HOST);
    *grid_relax_type   = (hypre_F90_Obj) hypre_CTAlloc(HYPRE_Int*,  1, HYPRE_MEMORY_HOST);
@@ -681,13 +681,13 @@ hypre_F90_IFACE(hypre_boomeramginitgridrelaxatn, HYPRE_BOOMERAMGINITGRIDRELAXATN
    *relax_weights     = (hypre_F90_Obj) hypre_CTAlloc(HYPRE_Real*,  1, HYPRE_MEMORY_HOST);
 
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGInitGridRelaxation(
-           (HYPRE_Int **)    *num_grid_sweeps,
-           (HYPRE_Int **)    *grid_relax_type,
-           (HYPRE_Int ***)   *grid_relax_points,
-           hypre_F90_PassInt (coarsen_type),
-           (HYPRE_Real **) *relax_weights,
-           hypre_F90_PassInt (max_levels)         ) );
+           ( HYPRE_BoomerAMGInitGridRelaxation(
+                (HYPRE_Int **)    *num_grid_sweeps,
+                (HYPRE_Int **)    *grid_relax_type,
+                (HYPRE_Int ***)   *grid_relax_points,
+                hypre_F90_PassInt (coarsen_type),
+                (HYPRE_Real **) *relax_weights,
+                hypre_F90_PassInt (max_levels)         ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -699,11 +699,11 @@ hypre_F90_IFACE(hypre_boomeramginitgridrelaxatn, HYPRE_BOOMERAMGINITGRIDRELAXATN
 
 void
 hypre_F90_IFACE(hypre_boomeramgfingridrelaxatn, HYPRE_BOOMERAMGFINGRIDRELAXATN)
-   ( hypre_F90_Obj *num_grid_sweeps,
-     hypre_F90_Obj *grid_relax_type,
-     hypre_F90_Obj *grid_relax_points,
-     hypre_F90_Obj *relax_weights,
-     hypre_F90_Int *ierr               )
+( hypre_F90_Obj *num_grid_sweeps,
+  hypre_F90_Obj *grid_relax_type,
+  hypre_F90_Obj *grid_relax_points,
+  hypre_F90_Obj *relax_weights,
+  hypre_F90_Int *ierr               )
 {
    char *ptr_num_grid_sweeps   = (char *) *num_grid_sweeps;
    char *ptr_grid_relax_type   = (char *) *grid_relax_type;
@@ -725,14 +725,14 @@ hypre_F90_IFACE(hypre_boomeramgfingridrelaxatn, HYPRE_BOOMERAMGFINGRIDRELAXATN)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetgridrelaxtype, HYPRE_BOOMERAMGSETGRIDRELAXTYPE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_IntArray *grid_relax_type,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_IntArray *grid_relax_type,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetGridRelaxType(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassIntArray (grid_relax_type) ) );
+           ( HYPRE_BoomerAMGSetGridRelaxType(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassIntArray (grid_relax_type) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -741,14 +741,14 @@ hypre_F90_IFACE(hypre_boomeramgsetgridrelaxtype, HYPRE_BOOMERAMGSETGRIDRELAXTYPE
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetrelaxtype, HYPRE_BOOMERAMGSETRELAXTYPE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *relax_type,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *relax_type,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetRelaxType(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (relax_type) ) );
+           ( HYPRE_BoomerAMGSetRelaxType(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (relax_type) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -757,30 +757,30 @@ hypre_F90_IFACE(hypre_boomeramgsetrelaxtype, HYPRE_BOOMERAMGSETRELAXTYPE)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetcyclerelaxtype, HYPRE_BOOMERAMGSETCYCLERELAXTYPE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *relax_type,
-     hypre_F90_Int *k,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *relax_type,
+  hypre_F90_Int *k,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetCycleRelaxType(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (relax_type),
-           hypre_F90_PassInt (k) ) );
+           ( HYPRE_BoomerAMGSetCycleRelaxType(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (relax_type),
+                hypre_F90_PassInt (k) ) );
 }
 
 void
 hypre_F90_IFACE(hypre_boomeramggetcyclerelaxtype, HYPRE_BOOMERAMGGETCYCLERELAXTYPE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *relax_type,
-     hypre_F90_Int *k,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *relax_type,
+  hypre_F90_Int *k,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGGetCycleRelaxType(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassIntRef (relax_type),
-           hypre_F90_PassInt (k)  ) );
+           ( HYPRE_BoomerAMGGetCycleRelaxType(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassIntRef (relax_type),
+                hypre_F90_PassInt (k)  ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -789,14 +789,14 @@ hypre_F90_IFACE(hypre_boomeramggetcyclerelaxtype, HYPRE_BOOMERAMGGETCYCLERELAXTY
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetrelaxorder, HYPRE_BOOMERAMGSETRELAXORDER)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *relax_order,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *relax_order,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetRelaxOrder(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (relax_order) ) );
+           ( HYPRE_BoomerAMGSetRelaxOrder(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (relax_order) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -806,14 +806,14 @@ hypre_F90_IFACE(hypre_boomeramgsetrelaxorder, HYPRE_BOOMERAMGSETRELAXORDER)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetgridrelaxpnts, HYPRE_BOOMERAMGSETGRIDRELAXPNTS)
-   ( hypre_F90_Obj *solver,
-     HYPRE_Int      **grid_relax_points,
-     hypre_F90_Int *ierr               )
+( hypre_F90_Obj *solver,
+  HYPRE_Int      **grid_relax_points,
+  hypre_F90_Int *ierr               )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetGridRelaxPoints(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           (HYPRE_Int **)        grid_relax_points ) );
+           ( HYPRE_BoomerAMGSetGridRelaxPoints(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                (HYPRE_Int **)        grid_relax_points ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -823,14 +823,14 @@ hypre_F90_IFACE(hypre_boomeramgsetgridrelaxpnts, HYPRE_BOOMERAMGSETGRIDRELAXPNTS
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetrelaxweight, HYPRE_BOOMERAMGSETRELAXWEIGHT)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_IntArray *relax_weights,
-     hypre_F90_Int *ierr     )
+( hypre_F90_Obj *solver,
+  hypre_F90_IntArray *relax_weights,
+  hypre_F90_Int *ierr     )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetRelaxWeight(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassRealArray (relax_weights) ) );
+           ( HYPRE_BoomerAMGSetRelaxWeight(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassRealArray (relax_weights) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -839,14 +839,14 @@ hypre_F90_IFACE(hypre_boomeramgsetrelaxweight, HYPRE_BOOMERAMGSETRELAXWEIGHT)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetrelaxwt, HYPRE_BOOMERAMGSETRELAXWT)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *relax_weight,
-     hypre_F90_Int *ierr     )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *relax_weight,
+  hypre_F90_Int *ierr     )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetRelaxWt(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassReal (relax_weight) ) );
+           ( HYPRE_BoomerAMGSetRelaxWt(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassReal (relax_weight) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -855,16 +855,16 @@ hypre_F90_IFACE(hypre_boomeramgsetrelaxwt, HYPRE_BOOMERAMGSETRELAXWT)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetlevelrelaxwt, HYPRE_BOOMERAMGSETLEVELRELAXWT)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *relax_weight,
-     hypre_F90_Int *level,
-     hypre_F90_Int *ierr     )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *relax_weight,
+  hypre_F90_Int *level,
+  hypre_F90_Int *ierr     )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetLevelRelaxWt(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassReal (relax_weight),
-           hypre_F90_PassInt (level) ) );
+           ( HYPRE_BoomerAMGSetLevelRelaxWt(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassReal (relax_weight),
+                hypre_F90_PassInt (level) ) );
 }
 
 
@@ -876,14 +876,14 @@ hypre_F90_IFACE(hypre_boomeramgsetlevelrelaxwt, HYPRE_BOOMERAMGSETLEVELRELAXWT)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetouterwt, HYPRE_BOOMERAMGSETOUTERWT)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *outer_wt,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *outer_wt,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetOuterWt(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassReal (outer_wt) ) );
+           ( HYPRE_BoomerAMGSetOuterWt(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassReal (outer_wt) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -892,16 +892,16 @@ hypre_F90_IFACE(hypre_boomeramgsetouterwt, HYPRE_BOOMERAMGSETOUTERWT)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetlevelouterwt, HYPRE_BOOMERAMGSETLEVELOUTERWT)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *outer_wt,
-     hypre_F90_Int *level,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *outer_wt,
+  hypre_F90_Int *level,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetLevelOuterWt(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassReal (outer_wt),
-           hypre_F90_PassInt (level) ) );
+           ( HYPRE_BoomerAMGSetLevelOuterWt(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassReal (outer_wt),
+                hypre_F90_PassInt (level) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -910,26 +910,26 @@ hypre_F90_IFACE(hypre_boomeramgsetlevelouterwt, HYPRE_BOOMERAMGSETLEVELOUTERWT)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetsmoothtype, HYPRE_BOOMERAMGSETSMOOTHTYPE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *smooth_type,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *smooth_type,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetSmoothType(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (smooth_type) ) );
+           ( HYPRE_BoomerAMGSetSmoothType(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (smooth_type) ) );
 }
 
 void
 hypre_F90_IFACE(hypre_boomeramggetsmoothtype, HYPRE_BOOMERAMGGETSMOOTHTYPE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *smooth_type,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *smooth_type,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGGetSmoothType(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassIntRef (smooth_type) ) );
+           ( HYPRE_BoomerAMGGetSmoothType(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassIntRef (smooth_type) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -938,26 +938,26 @@ hypre_F90_IFACE(hypre_boomeramggetsmoothtype, HYPRE_BOOMERAMGGETSMOOTHTYPE)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetsmoothnumlvls, HYPRE_BOOMERAMGSETSMOOTHNUMLVLS)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *smooth_num_levels,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *smooth_num_levels,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetSmoothNumLevels(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (smooth_num_levels) ) );
+           ( HYPRE_BoomerAMGSetSmoothNumLevels(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (smooth_num_levels) ) );
 }
 
 void
 hypre_F90_IFACE(hypre_boomeramggetsmoothnumlvls, HYPRE_BOOMERAMGGETSMOOTHNUMLVLS)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *smooth_num_levels,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *smooth_num_levels,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGGetSmoothNumLevels(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassIntRef (smooth_num_levels) ) );
+           ( HYPRE_BoomerAMGGetSmoothNumLevels(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassIntRef (smooth_num_levels) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -966,26 +966,26 @@ hypre_F90_IFACE(hypre_boomeramggetsmoothnumlvls, HYPRE_BOOMERAMGGETSMOOTHNUMLVLS
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetsmoothnumswps, HYPRE_BOOMERAMGSETSMOOTHNUMSWPS)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *smooth_num_sweeps,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *smooth_num_sweeps,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetSmoothNumSweeps(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (smooth_num_sweeps) ) );
+           ( HYPRE_BoomerAMGSetSmoothNumSweeps(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (smooth_num_sweeps) ) );
 }
 
 void
 hypre_F90_IFACE(hypre_boomeramggetsmoothnumswps, HYPRE_BOOMERAMGGETSMOOTHNUMSWPS)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *smooth_num_sweeps,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *smooth_num_sweeps,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGGetSmoothNumSweeps(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassIntRef (smooth_num_sweeps) ) );
+           ( HYPRE_BoomerAMGGetSmoothNumSweeps(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassIntRef (smooth_num_sweeps) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -994,26 +994,26 @@ hypre_F90_IFACE(hypre_boomeramggetsmoothnumswps, HYPRE_BOOMERAMGGETSMOOTHNUMSWPS
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetlogging, HYPRE_BOOMERAMGSETLOGGING)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *logging,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *logging,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetLogging(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (logging) ) );
+           ( HYPRE_BoomerAMGSetLogging(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (logging) ) );
 }
 
 void
 hypre_F90_IFACE(hypre_boomeramggetlogging, HYPRE_BOOMERAMGGETLOGGING)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *logging,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *logging,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGGetLogging(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassIntRef (logging) ) );
+           ( HYPRE_BoomerAMGGetLogging(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassIntRef (logging) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1022,26 +1022,26 @@ hypre_F90_IFACE(hypre_boomeramggetlogging, HYPRE_BOOMERAMGGETLOGGING)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetprintlevel, HYPRE_BOOMERAMGSETPRINTLEVEL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *print_level,
-     hypre_F90_Int *ierr     )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *print_level,
+  hypre_F90_Int *ierr     )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetPrintLevel(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (print_level) ) );
+           ( HYPRE_BoomerAMGSetPrintLevel(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (print_level) ) );
 }
 
 void
 hypre_F90_IFACE(hypre_boomeramggetprintlevel, HYPRE_BOOMERAMGGETPRINTLEVEL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *print_level,
-     hypre_F90_Int *ierr     )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *print_level,
+  hypre_F90_Int *ierr     )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGGetPrintLevel(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassIntRef (print_level) ) );
+           ( HYPRE_BoomerAMGGetPrintLevel(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassIntRef (print_level) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1050,14 +1050,14 @@ hypre_F90_IFACE(hypre_boomeramggetprintlevel, HYPRE_BOOMERAMGGETPRINTLEVEL)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetprintfilename, HYPRE_BOOMERAMGSETPRINTFILENAME)
-   ( hypre_F90_Obj *solver,
-     char     *print_file_name,
-     hypre_F90_Int *ierr     )
+( hypre_F90_Obj *solver,
+  char     *print_file_name,
+  hypre_F90_Int *ierr     )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetPrintFileName(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           (char *)        print_file_name ) );
+           ( HYPRE_BoomerAMGSetPrintFileName(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                (char *)        print_file_name ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1066,26 +1066,26 @@ hypre_F90_IFACE(hypre_boomeramgsetprintfilename, HYPRE_BOOMERAMGSETPRINTFILENAME
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetdebugflag, HYPRE_BOOMERAMGSETDEBUGFLAG)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *debug_flag,
-     hypre_F90_Int *ierr     )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *debug_flag,
+  hypre_F90_Int *ierr     )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetDebugFlag(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (debug_flag) ) );
+           ( HYPRE_BoomerAMGSetDebugFlag(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (debug_flag) ) );
 }
 
 void
 hypre_F90_IFACE(hypre_boomeramggetdebugflag, HYPRE_BOOMERAMGGETDEBUGFLAG)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *debug_flag,
-     hypre_F90_Int *ierr     )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *debug_flag,
+  hypre_F90_Int *ierr     )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGGetDebugFlag(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassIntRef (debug_flag) ) );
+           ( HYPRE_BoomerAMGGetDebugFlag(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassIntRef (debug_flag) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1094,14 +1094,14 @@ hypre_F90_IFACE(hypre_boomeramggetdebugflag, HYPRE_BOOMERAMGGETDEBUGFLAG)
 
 void
 hypre_F90_IFACE(hypre_boomeramggetnumiterations, HYPRE_BOOMERAMGGETNUMITERATIONS)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *num_iterations,
-     hypre_F90_Int *ierr     )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *num_iterations,
+  hypre_F90_Int *ierr     )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGGetNumIterations(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassIntRef (num_iterations) ) );
+           ( HYPRE_BoomerAMGGetNumIterations(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassIntRef (num_iterations) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1110,14 +1110,14 @@ hypre_F90_IFACE(hypre_boomeramggetnumiterations, HYPRE_BOOMERAMGGETNUMITERATIONS
 
 void
 hypre_F90_IFACE(hypre_boomeramggetcumnumiterati, HYPRE_BOOMERAMGGETCUMNUMITERATI)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *cum_num_iterations,
-     hypre_F90_Int *ierr     )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *cum_num_iterations,
+  hypre_F90_Int *ierr     )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGGetCumNumIterations(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassIntRef (cum_num_iterations) ) );
+           ( HYPRE_BoomerAMGGetCumNumIterations(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassIntRef (cum_num_iterations) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1126,14 +1126,14 @@ hypre_F90_IFACE(hypre_boomeramggetcumnumiterati, HYPRE_BOOMERAMGGETCUMNUMITERATI
 
 void
 hypre_F90_IFACE(hypre_boomeramggetresidual, HYPRE_BOOMERAMGGETRESIDUAL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *residual,
-     hypre_F90_Int *ierr     )
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *residual,
+  hypre_F90_Int *ierr     )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGGetResidual(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassObjRef (HYPRE_ParVector, residual)) );
+           ( HYPRE_BoomerAMGGetResidual(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassObjRef (HYPRE_ParVector, residual)) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1142,14 +1142,14 @@ hypre_F90_IFACE(hypre_boomeramggetresidual, HYPRE_BOOMERAMGGETRESIDUAL)
 
 void
 hypre_F90_IFACE(hypre_boomeramggetfinalreltvres, HYPRE_BOOMERAMGGETFINALRELTVRES)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *rel_resid_norm,
-     hypre_F90_Int *ierr            )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *rel_resid_norm,
+  hypre_F90_Int *ierr            )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGGetFinalRelativeResidualNorm(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassRealRef (rel_resid_norm) ) );
+           ( HYPRE_BoomerAMGGetFinalRelativeResidualNorm(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassRealRef (rel_resid_norm) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1158,26 +1158,26 @@ hypre_F90_IFACE(hypre_boomeramggetfinalreltvres, HYPRE_BOOMERAMGGETFINALRELTVRES
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetvariant, HYPRE_BOOMERAMGSETVARIANT)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *variant,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *variant,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetVariant(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (variant) ) );
+           ( HYPRE_BoomerAMGSetVariant(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (variant) ) );
 }
 
 void
 hypre_F90_IFACE(hypre_boomeramggetvariant, HYPRE_BOOMERAMGGETVARIANT)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *variant,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *variant,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGGetVariant(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassIntRef (variant) ) );
+           ( HYPRE_BoomerAMGGetVariant(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassIntRef (variant) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1186,26 +1186,26 @@ hypre_F90_IFACE(hypre_boomeramggetvariant, HYPRE_BOOMERAMGGETVARIANT)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetoverlap, HYPRE_BOOMERAMGSETOVERLAP)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *overlap,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *overlap,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetOverlap(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (overlap) ) );
+           ( HYPRE_BoomerAMGSetOverlap(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (overlap) ) );
 }
 
 void
 hypre_F90_IFACE(hypre_boomeramggetoverlap, HYPRE_BOOMERAMGGETOVERLAP)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *overlap,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *overlap,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGGetOverlap(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassIntRef (overlap) ) );
+           ( HYPRE_BoomerAMGGetOverlap(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassIntRef (overlap) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1214,38 +1214,38 @@ hypre_F90_IFACE(hypre_boomeramggetoverlap, HYPRE_BOOMERAMGGETOVERLAP)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetdomaintype, HYPRE_BOOMERAMGSETDOMAINTYPE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *domain_type,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *domain_type,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetDomainType(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (domain_type) ) );
+           ( HYPRE_BoomerAMGSetDomainType(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (domain_type) ) );
 }
 
 void
 hypre_F90_IFACE(hypre_boomeramggetdomaintype, HYPRE_BOOMERAMGGETDOMAINTYPE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *domain_type,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *domain_type,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGGetDomainType(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassIntRef (domain_type) ) );
+           ( HYPRE_BoomerAMGGetDomainType(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassIntRef (domain_type) ) );
 }
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetschwarznonsym, HYPRE_BOOMERAMGSETSCHWARZNONSYM)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *schwarz_non_symm,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *schwarz_non_symm,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetSchwarzUseNonSymm(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (schwarz_non_symm) ) );
+           ( HYPRE_BoomerAMGSetSchwarzUseNonSymm(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (schwarz_non_symm) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1254,26 +1254,26 @@ hypre_F90_IFACE(hypre_boomeramgsetschwarznonsym, HYPRE_BOOMERAMGSETSCHWARZNONSYM
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetschwarzrlxwt, HYPRE_BOOMERAMGSETSCHWARZRLXWT)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *schwarz_rlx_weight,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *schwarz_rlx_weight,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetSchwarzRlxWeight(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassReal (schwarz_rlx_weight)) );
+           ( HYPRE_BoomerAMGSetSchwarzRlxWeight(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassReal (schwarz_rlx_weight)) );
 }
 
 void
 hypre_F90_IFACE(hypre_boomeramggetschwarzrlxwt, HYPRE_BOOMERAMGGETSCHWARZRLXWT)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *schwarz_rlx_weight,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *schwarz_rlx_weight,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGGetSchwarzRlxWeight(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassRealRef (schwarz_rlx_weight)) );
+           ( HYPRE_BoomerAMGGetSchwarzRlxWeight(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassRealRef (schwarz_rlx_weight)) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1282,14 +1282,14 @@ hypre_F90_IFACE(hypre_boomeramggetschwarzrlxwt, HYPRE_BOOMERAMGGETSCHWARZRLXWT)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetsym, HYPRE_BOOMERAMGSETSYM)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *sym,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *sym,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetSym(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (sym) ) );
+           ( HYPRE_BoomerAMGSetSym(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (sym) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1298,14 +1298,14 @@ hypre_F90_IFACE(hypre_boomeramgsetsym, HYPRE_BOOMERAMGSETSYM)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetlevel, HYPRE_BOOMERAMGSETLEVEL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *level,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *level,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetLevel(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (level) ) );
+           ( HYPRE_BoomerAMGSetLevel(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (level) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1314,14 +1314,14 @@ hypre_F90_IFACE(hypre_boomeramgsetlevel, HYPRE_BOOMERAMGSETLEVEL)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetthreshold, HYPRE_BOOMERAMGSETTHRESHOLD)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *threshold,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *threshold,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetThreshold(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassReal (threshold)) );
+           ( HYPRE_BoomerAMGSetThreshold(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassReal (threshold)) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1330,14 +1330,14 @@ hypre_F90_IFACE(hypre_boomeramgsetthreshold, HYPRE_BOOMERAMGSETTHRESHOLD)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetfilter, HYPRE_BOOMERAMGSETFILTER)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *filter,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *filter,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetFilter(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassReal (filter)) );
+           ( HYPRE_BoomerAMGSetFilter(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassReal (filter)) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1346,14 +1346,14 @@ hypre_F90_IFACE(hypre_boomeramgsetfilter, HYPRE_BOOMERAMGSETFILTER)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetdroptol, HYPRE_BOOMERAMGSETDROPTOL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *drop_tol,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *drop_tol,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetDropTol(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassReal (drop_tol)) );
+           ( HYPRE_BoomerAMGSetDropTol(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassReal (drop_tol)) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1362,14 +1362,14 @@ hypre_F90_IFACE(hypre_boomeramgsetdroptol, HYPRE_BOOMERAMGSETDROPTOL)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetmaxnzperrow, HYPRE_BOOMERAMGSETMAXNZPERROW)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *max_nz_per_row,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *max_nz_per_row,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetMaxNzPerRow(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (max_nz_per_row) ) );
+           ( HYPRE_BoomerAMGSetMaxNzPerRow(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (max_nz_per_row) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1378,14 +1378,14 @@ hypre_F90_IFACE(hypre_boomeramgsetmaxnzperrow, HYPRE_BOOMERAMGSETMAXNZPERROW)
 
 void
 hypre_F90_IFACE(hypre_boomeramgseteubj, HYPRE_BOOMERAMGSETEUBJ)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *eu_bj,
-     hypre_F90_Int *ierr     )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *eu_bj,
+  hypre_F90_Int *ierr     )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetEuBJ(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (eu_bj) ) );
+           ( HYPRE_BoomerAMGSetEuBJ(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (eu_bj) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1394,14 +1394,14 @@ hypre_F90_IFACE(hypre_boomeramgseteubj, HYPRE_BOOMERAMGSETEUBJ)
 
 void
 hypre_F90_IFACE(hypre_boomeramgseteulevel, HYPRE_BOOMERAMGSETEULEVEL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *eu_level,
-     hypre_F90_Int *ierr     )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *eu_level,
+  hypre_F90_Int *ierr     )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetEuLevel(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (eu_level) ) );
+           ( HYPRE_BoomerAMGSetEuLevel(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (eu_level) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1410,14 +1410,14 @@ hypre_F90_IFACE(hypre_boomeramgseteulevel, HYPRE_BOOMERAMGSETEULEVEL)
 
 void
 hypre_F90_IFACE(hypre_boomeramgseteusparsea, HYPRE_BOOMERAMGSETEUSPARSEA)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *eu_sparse_a,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *eu_sparse_a,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetEuSparseA(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassReal (eu_sparse_a)) );
+           ( HYPRE_BoomerAMGSetEuSparseA(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassReal (eu_sparse_a)) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1426,14 +1426,14 @@ hypre_F90_IFACE(hypre_boomeramgseteusparsea, HYPRE_BOOMERAMGSETEUSPARSEA)
 
 void
 hypre_F90_IFACE(hypre_boomeramgseteuclidfile, HYPRE_BOOMERAMGSETEUCLIDFILE)
-   ( hypre_F90_Obj *solver,
-     char     *euclidfile,
-     hypre_F90_Int *ierr     )
+( hypre_F90_Obj *solver,
+  char     *euclidfile,
+  hypre_F90_Int *ierr     )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetEuclidFile(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           (char *)        euclidfile ) );
+           ( HYPRE_BoomerAMGSetEuclidFile(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                (char *)        euclidfile ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1441,26 +1441,26 @@ hypre_F90_IFACE(hypre_boomeramgseteuclidfile, HYPRE_BOOMERAMGSETEUCLIDFILE)
  *--------------------------------------------------------------------------*/
 void
 hypre_F90_IFACE(hypre_boomeramgsetnumfunctions, HYPRE_BOOMERAMGSETNUMFUNCTIONS)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *num_functions,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *num_functions,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetNumFunctions(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (num_functions) ) );
+           ( HYPRE_BoomerAMGSetNumFunctions(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (num_functions) ) );
 }
 
 void
 hypre_F90_IFACE(hypre_boomeramggetnumfunctions, HYPRE_BOOMERAMGGETNUMFUNCTIONS)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *num_functions,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *num_functions,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGGetNumFunctions(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassIntRef (num_functions) ) );
+           ( HYPRE_BoomerAMGGetNumFunctions(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassIntRef (num_functions) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1468,14 +1468,14 @@ hypre_F90_IFACE(hypre_boomeramggetnumfunctions, HYPRE_BOOMERAMGGETNUMFUNCTIONS)
  *--------------------------------------------------------------------------*/
 void
 hypre_F90_IFACE(hypre_boomeramgsetnodal, HYPRE_BOOMERAMGSETNODAL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *nodal,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *nodal,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetNodal(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (nodal) ) );
+           ( HYPRE_BoomerAMGSetNodal(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (nodal) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1483,14 +1483,14 @@ hypre_F90_IFACE(hypre_boomeramgsetnodal, HYPRE_BOOMERAMGSETNODAL)
  *--------------------------------------------------------------------------*/
 void
 hypre_F90_IFACE(hypre_boomeramgsetnodaldiag, HYPRE_BOOMERAMGSETNODALDIAG)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *nodal_diag,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *nodal_diag,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetNodalDiag(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (nodal_diag) ) );
+           ( HYPRE_BoomerAMGSetNodalDiag(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (nodal_diag) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1499,14 +1499,14 @@ hypre_F90_IFACE(hypre_boomeramgsetnodaldiag, HYPRE_BOOMERAMGSETNODALDIAG)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetdoffunc, HYPRE_BOOMERAMGSETDOFFUNC)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_IntArray *dof_func,
-     hypre_F90_Int *ierr             )
+( hypre_F90_Obj *solver,
+  hypre_F90_IntArray *dof_func,
+  hypre_F90_Int *ierr             )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetDofFunc(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassIntArray (dof_func) ) );
+           ( HYPRE_BoomerAMGSetDofFunc(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassIntArray (dof_func) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1515,14 +1515,14 @@ hypre_F90_IFACE(hypre_boomeramgsetdoffunc, HYPRE_BOOMERAMGSETDOFFUNC)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetnumpaths, HYPRE_BOOMERAMGSETNUMPATHS)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *num_paths,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *num_paths,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetNumPaths(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (num_paths) ) );
+           ( HYPRE_BoomerAMGSetNumPaths(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (num_paths) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1531,14 +1531,14 @@ hypre_F90_IFACE(hypre_boomeramgsetnumpaths, HYPRE_BOOMERAMGSETNUMPATHS)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetaggnumlevels, HYPRE_BOOMERAMGSETAGGNUMLEVELS)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *agg_num_levels,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *agg_num_levels,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetAggNumLevels(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (agg_num_levels) ) );
+           ( HYPRE_BoomerAMGSetAggNumLevels(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (agg_num_levels) ) );
 }
 
 
@@ -1549,14 +1549,14 @@ hypre_F90_IFACE(hypre_boomeramgsetaggnumlevels, HYPRE_BOOMERAMGSETAGGNUMLEVELS)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetagginterptype, HYPRE_BOOMERAMGSETAGGINTERPTYPE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *agg_interp_type,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *agg_interp_type,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetAggInterpType(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (agg_interp_type) ) );
+           ( HYPRE_BoomerAMGSetAggInterpType(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (agg_interp_type) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1564,14 +1564,14 @@ hypre_F90_IFACE(hypre_boomeramgsetagginterptype, HYPRE_BOOMERAMGSETAGGINTERPTYPE
  *--------------------------------------------------------------------------*/
 void
 hypre_F90_IFACE(hypre_boomeramgsetaggtrfactor, HYPRE_BOOMERAMGSETAGGTRFACTOR)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *trunc_factor,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *trunc_factor,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetAggTruncFactor(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassReal (trunc_factor) ) );
+           ( HYPRE_BoomerAMGSetAggTruncFactor(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassReal (trunc_factor) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1579,14 +1579,14 @@ hypre_F90_IFACE(hypre_boomeramgsetaggtrfactor, HYPRE_BOOMERAMGSETAGGTRFACTOR)
  *--------------------------------------------------------------------------*/
 void
 hypre_F90_IFACE(hypre_boomeramgsetaggp12trfac, HYPRE_BOOMERAMGSETAGGP12TRFAC)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *trunc_factor,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *trunc_factor,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetAggP12TruncFactor(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassReal (trunc_factor) ) );
+           ( HYPRE_BoomerAMGSetAggP12TruncFactor(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassReal (trunc_factor) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1595,14 +1595,14 @@ hypre_F90_IFACE(hypre_boomeramgsetaggp12trfac, HYPRE_BOOMERAMGSETAGGP12TRFAC)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetaggpmaxelmts, HYPRE_BOOMERAMGSETAGGPMAXELMTS)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *p_max_elmts,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *p_max_elmts,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetAggPMaxElmts(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (p_max_elmts) ) );
+           ( HYPRE_BoomerAMGSetAggPMaxElmts(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (p_max_elmts) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1611,14 +1611,14 @@ hypre_F90_IFACE(hypre_boomeramgsetaggpmaxelmts, HYPRE_BOOMERAMGSETAGGPMAXELMTS)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetaggp12maxelmt, HYPRE_BOOMERAMGSETAGGP12MAXELMT)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *p_max_elmts,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *p_max_elmts,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetAggP12MaxElmts(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (p_max_elmts) ) );
+           ( HYPRE_BoomerAMGSetAggP12MaxElmts(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (p_max_elmts) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1627,16 +1627,16 @@ hypre_F90_IFACE(hypre_boomeramgsetaggp12maxelmt, HYPRE_BOOMERAMGSETAGGP12MAXELMT
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetinterpvecs, HYPRE_BOOMERAMGSETINTERPVECS)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *num_vectors,
-     hypre_F90_Obj *interp_vectors,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *num_vectors,
+  hypre_F90_Obj *interp_vectors,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetInterpVectors(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (num_vectors) ,
-           hypre_F90_PassObjRef (HYPRE_ParVector, interp_vectors) ) );
+           ( HYPRE_BoomerAMGSetInterpVectors(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (num_vectors),
+                hypre_F90_PassObjRef (HYPRE_ParVector, interp_vectors) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1645,14 +1645,14 @@ hypre_F90_IFACE(hypre_boomeramgsetinterpvecs, HYPRE_BOOMERAMGSETINTERPVECS)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetinterpvecvar, HYPRE_BOOMERAMGSETINTERPVECVAR)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *var,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *var,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetInterpVecVariant(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (var) ) );
+           ( HYPRE_BoomerAMGSetInterpVecVariant(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (var) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1661,14 +1661,14 @@ hypre_F90_IFACE(hypre_boomeramgsetinterpvecvar, HYPRE_BOOMERAMGSETINTERPVECVAR)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetinterpvecqmx, HYPRE_BOOMERAMGSETINTERPVECQMX)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *q_max,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *q_max,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetInterpVecQMax(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (q_max) ) );
+           ( HYPRE_BoomerAMGSetInterpVecQMax(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (q_max) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1677,14 +1677,14 @@ hypre_F90_IFACE(hypre_boomeramgsetinterpvecqmx, HYPRE_BOOMERAMGSETINTERPVECQMX)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetinterpvecqtr, HYPRE_BOOMERAMGSETINTERPVECQTR)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *q_trunc,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *q_trunc,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetInterpVecAbsQTrunc(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassReal (q_trunc) ) );
+           ( HYPRE_BoomerAMGSetInterpVecAbsQTrunc(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassReal (q_trunc) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1693,14 +1693,14 @@ hypre_F90_IFACE(hypre_boomeramgsetinterpvecqtr, HYPRE_BOOMERAMGSETINTERPVECQTR)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetchebyorder, HYPRE_BOOMERAMGSETCHEBYORDER)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *cheby_order,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *cheby_order,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetChebyOrder(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (cheby_order) ) );
+           ( HYPRE_BoomerAMGSetChebyOrder(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (cheby_order) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1709,14 +1709,14 @@ hypre_F90_IFACE(hypre_boomeramgsetchebyorder, HYPRE_BOOMERAMGSETCHEBYORDER)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetchebyfract, HYPRE_BOOMERAMGSETCHEBYFRACT)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *cheby_fraction,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *cheby_fraction,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetChebyFraction(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassReal (cheby_fraction) ) );
+           ( HYPRE_BoomerAMGSetChebyFraction(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassReal (cheby_fraction) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1725,14 +1725,14 @@ hypre_F90_IFACE(hypre_boomeramgsetchebyfract, HYPRE_BOOMERAMGSETCHEBYFRACT)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetchebyscale, HYPRE_BOOMERAMGSETCHEBYSCALE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *cheby_scale,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *cheby_scale,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetChebyScale(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (cheby_scale) ) );
+           ( HYPRE_BoomerAMGSetChebyScale(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (cheby_scale) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1741,14 +1741,14 @@ hypre_F90_IFACE(hypre_boomeramgsetchebyscale, HYPRE_BOOMERAMGSETCHEBYSCALE)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetchebyvariant, HYPRE_BOOMERAMGSETCHEBYVARIANT)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *cheby_variant,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *cheby_variant,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetChebyVariant(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (cheby_variant) ) );
+           ( HYPRE_BoomerAMGSetChebyVariant(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (cheby_variant) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1757,14 +1757,14 @@ hypre_F90_IFACE(hypre_boomeramgsetchebyvariant, HYPRE_BOOMERAMGSETCHEBYVARIANT)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetchebyeigest, HYPRE_BOOMERAMGSETCHEBYEIGEST)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *cheby_eig_est,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *cheby_eig_est,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetChebyEigEst(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (cheby_eig_est) ) );
+           ( HYPRE_BoomerAMGSetChebyEigEst(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (cheby_eig_est) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1773,14 +1773,14 @@ hypre_F90_IFACE(hypre_boomeramgsetchebyeigest, HYPRE_BOOMERAMGSETCHEBYEIGEST)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetkeeptransp, HYPRE_BOOMERAMGSETKEEPTRANSP)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *keep_transpose,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *keep_transpose,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetKeepTranspose(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (keep_transpose) ) );
+           ( HYPRE_BoomerAMGSetKeepTranspose(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (keep_transpose) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1789,14 +1789,14 @@ hypre_F90_IFACE(hypre_boomeramgsetkeeptransp, HYPRE_BOOMERAMGSETKEEPTRANSP)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetrap2, HYPRE_BOOMERAMGSETRAP2)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *rap2,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *rap2,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetRAP2(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (rap2) ) );
+           ( HYPRE_BoomerAMGSetRAP2(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (rap2) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1805,26 +1805,26 @@ hypre_F90_IFACE(hypre_boomeramgsetrap2, HYPRE_BOOMERAMGSETRAP2)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetadditive, HYPRE_BOOMERAMGSETADDITIVE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *add_lvl,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *add_lvl,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetAdditive(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (add_lvl) ) );
+           ( HYPRE_BoomerAMGSetAdditive(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (add_lvl) ) );
 }
 
 void
 hypre_F90_IFACE(hypre_boomeramggetadditive, HYPRE_BOOMERAMGGETADDITIVE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *add_lvl,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *add_lvl,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGGetAdditive(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassIntRef (add_lvl) ) );
+           ( HYPRE_BoomerAMGGetAdditive(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassIntRef (add_lvl) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1833,26 +1833,26 @@ hypre_F90_IFACE(hypre_boomeramggetadditive, HYPRE_BOOMERAMGGETADDITIVE)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetmultadd, HYPRE_BOOMERAMGSETMULTADD)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *add_lvl,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *add_lvl,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetMultAdditive(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (add_lvl) ) );
+           ( HYPRE_BoomerAMGSetMultAdditive(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (add_lvl) ) );
 }
 
 void
 hypre_F90_IFACE(hypre_boomeramggetmultadd, HYPRE_BOOMERAMGGETMULTADD)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *add_lvl,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *add_lvl,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGGetMultAdditive(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassIntRef (add_lvl) ) );
+           ( HYPRE_BoomerAMGGetMultAdditive(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassIntRef (add_lvl) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1861,26 +1861,26 @@ hypre_F90_IFACE(hypre_boomeramggetmultadd, HYPRE_BOOMERAMGGETMULTADD)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetsimple, HYPRE_BOOMERAMGSETSIMPLE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *add_lvl,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *add_lvl,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetSimple(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (add_lvl) ) );
+           ( HYPRE_BoomerAMGSetSimple(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (add_lvl) ) );
 }
 
 void
 hypre_F90_IFACE(hypre_boomeramggetsimple, HYPRE_BOOMERAMGGETSIMPLE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *add_lvl,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *add_lvl,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGGetSimple(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassIntRef (add_lvl) ) );
+           ( HYPRE_BoomerAMGGetSimple(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassIntRef (add_lvl) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1889,14 +1889,14 @@ hypre_F90_IFACE(hypre_boomeramggetsimple, HYPRE_BOOMERAMGGETSIMPLE)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetaddlastlvl, HYPRE_BOOMERAMGSETADDLASTLVL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *add_last_lvl,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *add_last_lvl,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetAddLastLvl(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (add_last_lvl) ) );
+           ( HYPRE_BoomerAMGSetAddLastLvl(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (add_last_lvl) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1905,14 +1905,14 @@ hypre_F90_IFACE(hypre_boomeramgsetaddlastlvl, HYPRE_BOOMERAMGSETADDLASTLVL)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetmultaddtrf, HYPRE_BOOMERAMGSETMULTADDTRF)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *add_tr,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *add_tr,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetMultAddTruncFactor(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassReal (add_tr) ) );
+           ( HYPRE_BoomerAMGSetMultAddTruncFactor(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassReal (add_tr) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1921,14 +1921,14 @@ hypre_F90_IFACE(hypre_boomeramgsetmultaddtrf, HYPRE_BOOMERAMGSETMULTADDTRF)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetmultaddpmx, HYPRE_BOOMERAMGSETMULTADDPMX)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *add_pmx,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *add_pmx,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetMultAddPMaxElmts(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (add_pmx) ) );
+           ( HYPRE_BoomerAMGSetMultAddPMaxElmts(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (add_pmx) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1937,14 +1937,14 @@ hypre_F90_IFACE(hypre_boomeramgsetmultaddpmx, HYPRE_BOOMERAMGSETMULTADDPMX)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetaddrlxtype, HYPRE_BOOMERAMGSETADDRLXTYPE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *add_rlx_type,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *add_rlx_type,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetAddRelaxType(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (add_rlx_type) ) );
+           ( HYPRE_BoomerAMGSetAddRelaxType(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (add_rlx_type) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1953,14 +1953,14 @@ hypre_F90_IFACE(hypre_boomeramgsetaddrlxtype, HYPRE_BOOMERAMGSETADDRLXTYPE)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetaddrlxwt, HYPRE_BOOMERAMGSETADDRLXWT)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *add_rlx_wt,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *add_rlx_wt,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetAddRelaxWt(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassReal (add_rlx_wt) ) );
+           ( HYPRE_BoomerAMGSetAddRelaxWt(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassReal (add_rlx_wt) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1969,14 +1969,14 @@ hypre_F90_IFACE(hypre_boomeramgsetaddrlxwt, HYPRE_BOOMERAMGSETADDRLXWT)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetseqthrshold, HYPRE_BOOMERAMGSETSEQTHRSHOLD)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *seq_th,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *seq_th,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetSeqThreshold(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (seq_th) ) );
+           ( HYPRE_BoomerAMGSetSeqThreshold(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (seq_th) ) );
 }
 
 #ifdef HYPRE_USING_DSUPERLU
@@ -1986,14 +1986,14 @@ hypre_F90_IFACE(hypre_boomeramgsetseqthrshold, HYPRE_BOOMERAMGSETSEQTHRSHOLD)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetdsluthrshold, HYPRE_BOOMERAMGSETDSLUTHRSHOLD)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *dslu_th,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *dslu_th,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetDSLUThreshold(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (dslu_th) ) );
+           ( HYPRE_BoomerAMGSetDSLUThreshold(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (dslu_th) ) );
 }
 #endif
 
@@ -2003,14 +2003,14 @@ hypre_F90_IFACE(hypre_boomeramgsetdsluthrshold, HYPRE_BOOMERAMGSETDSLUTHRSHOLD)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetredundant, HYPRE_BOOMERAMGSETREDUNDANT)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *redundant,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *redundant,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetRedundant(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (redundant) ) );
+           ( HYPRE_BoomerAMGSetRedundant(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (redundant) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -2019,14 +2019,14 @@ hypre_F90_IFACE(hypre_boomeramgsetredundant, HYPRE_BOOMERAMGSETREDUNDANT)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetnongaltol, HYPRE_BOOMERAMGSETNONGALTOL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *nongal_tol,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *nongal_tol,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetNonGalerkinTol(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassReal (nongal_tol) ) );
+           ( HYPRE_BoomerAMGSetNonGalerkinTol(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassReal (nongal_tol) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -2035,16 +2035,16 @@ hypre_F90_IFACE(hypre_boomeramgsetnongaltol, HYPRE_BOOMERAMGSETNONGALTOL)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetlvlnongaltol, HYPRE_BOOMERAMGSETLVLNONGALTOL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *nongal_tol,
-     hypre_F90_Int *level,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *nongal_tol,
+  hypre_F90_Int *level,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetLevelNonGalerkinTol(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassReal (nongal_tol) ,
-           hypre_F90_PassInt (level) ) );
+           ( HYPRE_BoomerAMGSetLevelNonGalerkinTol(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassReal (nongal_tol),
+                hypre_F90_PassInt (level) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -2053,14 +2053,14 @@ hypre_F90_IFACE(hypre_boomeramgsetlvlnongaltol, HYPRE_BOOMERAMGSETLVLNONGALTOL)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetgsmg, HYPRE_BOOMERAMGSETGSMG)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *gsmg,
-     hypre_F90_Int *ierr            )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *gsmg,
+  hypre_F90_Int *ierr            )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetGSMG(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (gsmg) ) );
+           ( HYPRE_BoomerAMGSetGSMG(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (gsmg) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -2069,14 +2069,14 @@ hypre_F90_IFACE(hypre_boomeramgsetgsmg, HYPRE_BOOMERAMGSETGSMG)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetnumsamples, HYPRE_BOOMERAMGSETNUMSAMPLES)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *gsmg,
-     hypre_F90_Int *ierr            )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *gsmg,
+  hypre_F90_Int *ierr            )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetNumSamples(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (gsmg) ) );
+           ( HYPRE_BoomerAMGSetNumSamples(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (gsmg) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -2085,14 +2085,14 @@ hypre_F90_IFACE(hypre_boomeramgsetnumsamples, HYPRE_BOOMERAMGSETNUMSAMPLES)
 
 void
 hypre_F90_IFACE(hypre_boomeramgsetcgcits, HYPRE_BOOMERAMGSETCGCITS)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *its,
-     hypre_F90_Int *ierr            )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *its,
+  hypre_F90_Int *ierr            )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_BoomerAMGSetCGCIts(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (its) ) );
+           ( HYPRE_BoomerAMGSetCGCIts(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (its) ) );
 }
 
 #ifdef __cplusplus
diff --git a/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_bicgstab.c b/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_bicgstab.c
index b6b9e870..5a13a151 100644
--- a/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_bicgstab.c
+++ b/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_bicgstab.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -17,75 +17,75 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-    
+
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRBiCGSTABCreate
  *--------------------------------------------------------------------------*/
 
 void
 hypre_F90_IFACE(hypre_parcsrbicgstabcreate, HYPRE_PARCSRBICGSTABCREATE)
-   ( hypre_F90_Comm *comm,
-     hypre_F90_Obj *solver,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Comm *comm,
+  hypre_F90_Obj *solver,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRBiCGSTABCreate(
-           hypre_F90_PassComm (comm),
-           hypre_F90_PassObjRef (HYPRE_Solver, solver) ) );
+           ( HYPRE_ParCSRBiCGSTABCreate(
+                hypre_F90_PassComm (comm),
+                hypre_F90_PassObjRef (HYPRE_Solver, solver) ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRBiCGSTABDestroy
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_parcsrbicgstabdestroy, HYPRE_PARCSRBICGSTABDESTROY)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRBiCGSTABDestroy(
-           hypre_F90_PassObj (HYPRE_Solver, solver) ) );
+           ( HYPRE_ParCSRBiCGSTABDestroy(
+                hypre_F90_PassObj (HYPRE_Solver, solver) ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRBiCGSTABSetup
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_parcsrbicgstabsetup, HYPRE_PARCSRBICGSTABSETUP)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *A,
-     hypre_F90_Obj *b,
-     hypre_F90_Obj *x,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *A,
+  hypre_F90_Obj *b,
+  hypre_F90_Obj *x,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRBiCGSTABSetup(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
-           hypre_F90_PassObj (HYPRE_ParVector, b),
-           hypre_F90_PassObj (HYPRE_ParVector, x)       ) );
+           ( HYPRE_ParCSRBiCGSTABSetup(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
+                hypre_F90_PassObj (HYPRE_ParVector, b),
+                hypre_F90_PassObj (HYPRE_ParVector, x)       ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRBiCGSTABSolve
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_parcsrbicgstabsolve, HYPRE_PARCSRBICGSTABSOLVE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *A,
-     hypre_F90_Obj *b,
-     hypre_F90_Obj *x,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *A,
+  hypre_F90_Obj *b,
+  hypre_F90_Obj *x,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRBiCGSTABSolve(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
-           hypre_F90_PassObj (HYPRE_ParVector, b),
-           hypre_F90_PassObj (HYPRE_ParVector, x)       ) );
+           ( HYPRE_ParCSRBiCGSTABSolve(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
+                hypre_F90_PassObj (HYPRE_ParVector, b),
+                hypre_F90_PassObj (HYPRE_ParVector, x)       ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -94,14 +94,14 @@ hypre_F90_IFACE(hypre_parcsrbicgstabsolve, HYPRE_PARCSRBICGSTABSOLVE)
 
 void
 hypre_F90_IFACE(hypre_parcsrbicgstabsettol, HYPRE_PARCSRBICGSTABSETTOL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *tol,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *tol,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRBiCGSTABSetTol(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassReal (tol)     ) );
+           ( HYPRE_ParCSRBiCGSTABSetTol(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassReal (tol)     ) );
 }
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRBiCGSTABSetAbsoluteTol
@@ -109,14 +109,14 @@ hypre_F90_IFACE(hypre_parcsrbicgstabsettol, HYPRE_PARCSRBICGSTABSETTOL)
 
 void
 hypre_F90_IFACE(hypre_parcsrbicgstabsetatol, HYPRE_PARCSRBICGSTABSETATOL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *tol,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *tol,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRBiCGSTABSetAbsoluteTol(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassReal (tol)     ) );
+           ( HYPRE_ParCSRBiCGSTABSetAbsoluteTol(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassReal (tol)     ) );
 }
 
 
@@ -127,14 +127,14 @@ hypre_F90_IFACE(hypre_parcsrbicgstabsetatol, HYPRE_PARCSRBICGSTABSETATOL)
 
 void
 hypre_F90_IFACE(hypre_parcsrbicgstabsetminiter, HYPRE_PARCSRBICGSTABSETMINITER)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *min_iter,
-     hypre_F90_Int *ierr      )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *min_iter,
+  hypre_F90_Int *ierr      )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRBiCGSTABSetMinIter(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (min_iter) ) );
+           ( HYPRE_ParCSRBiCGSTABSetMinIter(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (min_iter) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -143,14 +143,14 @@ hypre_F90_IFACE(hypre_parcsrbicgstabsetminiter, HYPRE_PARCSRBICGSTABSETMINITER)
 
 void
 hypre_F90_IFACE(hypre_parcsrbicgstabsetmaxiter, HYPRE_PARCSRBICGSTABSETMAXITER)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *max_iter,
-     hypre_F90_Int *ierr      )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *max_iter,
+  hypre_F90_Int *ierr      )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRBiCGSTABSetMaxIter(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (max_iter) ) );
+           ( HYPRE_ParCSRBiCGSTABSetMaxIter(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (max_iter) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -159,14 +159,14 @@ hypre_F90_IFACE(hypre_parcsrbicgstabsetmaxiter, HYPRE_PARCSRBICGSTABSETMAXITER)
 
 void
 hypre_F90_IFACE(hypre_parcsrbicgstabsetstopcrit, HYPRE_PARCSRBICGSTABSETSTOP)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *stop_crit,
-     hypre_F90_Int *ierr      )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *stop_crit,
+  hypre_F90_Int *ierr      )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRBiCGSTABSetStopCrit(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (stop_crit) ) );
+           ( HYPRE_ParCSRBiCGSTABSetStopCrit(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (stop_crit) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -175,10 +175,10 @@ hypre_F90_IFACE(hypre_parcsrbicgstabsetstopcrit, HYPRE_PARCSRBICGSTABSETSTOP)
 
 void
 hypre_F90_IFACE(hypre_parcsrbicgstabsetprecond, HYPRE_PARCSRBICGSTABSETPRECOND)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *precond_id,
-     hypre_F90_Obj *precond_solver,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *precond_id,
+  hypre_F90_Obj *precond_solver,
+  hypre_F90_Int *ierr          )
 {
    /*------------------------------------------------------------
     * The precond_id flags mean :
@@ -187,6 +187,9 @@ hypre_F90_IFACE(hypre_parcsrbicgstabsetprecond, HYPRE_PARCSRBICGSTABSETPRECOND)
     *  2 - set up an amg preconditioner
     *  3 - set up a pilut preconditioner
     *  4 - set up a parasails preconditioner
+    *  5 - set up a Euclid preconditioner
+    *  6 - set up a ILU preconditioner
+    *  7 - set up a MGR preconditioner
     *------------------------------------------------------------*/
 
    if (*precond_id == 0)
@@ -196,48 +199,66 @@ hypre_F90_IFACE(hypre_parcsrbicgstabsetprecond, HYPRE_PARCSRBICGSTABSETPRECOND)
    else if (*precond_id == 1)
    {
       *ierr = (hypre_F90_Int)
-         ( HYPRE_ParCSRBiCGSTABSetPrecond(
-              hypre_F90_PassObj (HYPRE_Solver, solver),
-              HYPRE_ParCSRDiagScale,
-              HYPRE_ParCSRDiagScaleSetup,
-              NULL                        ) );
+              ( HYPRE_ParCSRBiCGSTABSetPrecond(
+                   hypre_F90_PassObj (HYPRE_Solver, solver),
+                   HYPRE_ParCSRDiagScale,
+                   HYPRE_ParCSRDiagScaleSetup,
+                   NULL                        ) );
    }
    else if (*precond_id == 2)
    {
 
       *ierr = (hypre_F90_Int)
-         ( HYPRE_ParCSRBiCGSTABSetPrecond(
-              hypre_F90_PassObj (HYPRE_Solver, solver),
-              HYPRE_BoomerAMGSolve,
-              HYPRE_BoomerAMGSetup,
-              (HYPRE_Solver)      *precond_solver ) );
+              ( HYPRE_ParCSRBiCGSTABSetPrecond(
+                   hypre_F90_PassObj (HYPRE_Solver, solver),
+                   HYPRE_BoomerAMGSolve,
+                   HYPRE_BoomerAMGSetup,
+                   (HYPRE_Solver)      * precond_solver ) );
    }
    else if (*precond_id == 3)
    {
       *ierr = (hypre_F90_Int)
-         ( HYPRE_ParCSRBiCGSTABSetPrecond(
-              hypre_F90_PassObj (HYPRE_Solver, solver),
-              HYPRE_ParCSRPilutSolve,
-              HYPRE_ParCSRPilutSetup,
-              (HYPRE_Solver)       *precond_solver ) );
+              ( HYPRE_ParCSRBiCGSTABSetPrecond(
+                   hypre_F90_PassObj (HYPRE_Solver, solver),
+                   HYPRE_ParCSRPilutSolve,
+                   HYPRE_ParCSRPilutSetup,
+                   (HYPRE_Solver)       * precond_solver ) );
    }
    else if (*precond_id == 4)
    {
       *ierr = (hypre_F90_Int)
-         ( HYPRE_ParCSRBiCGSTABSetPrecond(
-              hypre_F90_PassObj (HYPRE_Solver, solver),
-              HYPRE_ParCSRParaSailsSolve,
-              HYPRE_ParCSRParaSailsSetup,
-               (HYPRE_Solver)      *precond_solver ) );
+              ( HYPRE_ParCSRBiCGSTABSetPrecond(
+                   hypre_F90_PassObj (HYPRE_Solver, solver),
+                   HYPRE_ParCSRParaSailsSolve,
+                   HYPRE_ParCSRParaSailsSetup,
+                   (HYPRE_Solver)      * precond_solver ) );
    }
    else if (*precond_id == 5)
    {
       *ierr = (hypre_F90_Int)
-         ( HYPRE_ParCSRBiCGSTABSetPrecond(
-              hypre_F90_PassObj (HYPRE_Solver, solver),
-              HYPRE_EuclidSolve,
-              HYPRE_EuclidSetup,
-			  (HYPRE_Solver)      *precond_solver ) );
+              ( HYPRE_ParCSRBiCGSTABSetPrecond(
+                   hypre_F90_PassObj (HYPRE_Solver, solver),
+                   HYPRE_EuclidSolve,
+                   HYPRE_EuclidSetup,
+                   (HYPRE_Solver)      * precond_solver ) );
+   }
+   else if (*precond_id == 6)
+   {
+      *ierr = (hypre_F90_Int)
+              ( HYPRE_ParCSRBiCGSTABSetPrecond(
+                   hypre_F90_PassObj (HYPRE_Solver, solver),
+                   HYPRE_ILUSolve,
+                   HYPRE_ILUSetup,
+                   (HYPRE_Solver)       * precond_solver ) );
+   }
+   else if (*precond_id == 7)
+   {
+      *ierr = (hypre_F90_Int)
+              ( HYPRE_ParCSRBiCGSTABSetPrecond(
+                   hypre_F90_PassObj (HYPRE_Solver, solver),
+                   HYPRE_MGRSolve,
+                   HYPRE_MGRSetup,
+                   (HYPRE_Solver)       * precond_solver ) );
    }
    else
    {
@@ -251,14 +272,14 @@ hypre_F90_IFACE(hypre_parcsrbicgstabsetprecond, HYPRE_PARCSRBICGSTABSETPRECOND)
 
 void
 hypre_F90_IFACE(hypre_parcsrbicgstabgetprecond, HYPRE_PARCSRBICGSTABGETPRECOND)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *precond_solver_ptr,
-     hypre_F90_Int *ierr                )
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *precond_solver_ptr,
+  hypre_F90_Int *ierr                )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRBiCGSTABGetPrecond(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassObjRef (HYPRE_Solver, precond_solver_ptr) ) );
+           ( HYPRE_ParCSRBiCGSTABGetPrecond(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassObjRef (HYPRE_Solver, precond_solver_ptr) ) );
 
 }
 
@@ -268,14 +289,14 @@ hypre_F90_IFACE(hypre_parcsrbicgstabgetprecond, HYPRE_PARCSRBICGSTABGETPRECOND)
 
 void
 hypre_F90_IFACE(hypre_parcsrbicgstabsetlogging, HYPRE_PARCSRBICGSTABSETLOGGING)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *logging,
-     hypre_F90_Int *ierr     )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *logging,
+  hypre_F90_Int *ierr     )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRBiCGSTABSetLogging(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (logging) ) );
+           ( HYPRE_ParCSRBiCGSTABSetLogging(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (logging) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -284,14 +305,14 @@ hypre_F90_IFACE(hypre_parcsrbicgstabsetlogging, HYPRE_PARCSRBICGSTABSETLOGGING)
 
 void
 hypre_F90_IFACE(hypre_parcsrbicgstabsetprintlev, HYPRE_PARCSRBICGSTABSETPRINTLEV)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *print_level,
-     hypre_F90_Int *ierr     )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *print_level,
+  hypre_F90_Int *ierr     )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRBiCGSTABSetPrintLevel(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (print_level) ) );
+           ( HYPRE_ParCSRBiCGSTABSetPrintLevel(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (print_level) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -300,14 +321,14 @@ hypre_F90_IFACE(hypre_parcsrbicgstabsetprintlev, HYPRE_PARCSRBICGSTABSETPRINTLEV
 
 void
 hypre_F90_IFACE(hypre_parcsrbicgstabgetnumiter, HYPRE_PARCSRBICGSTABGETNUMITER)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *num_iterations,
-     hypre_F90_Int *ierr            )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *num_iterations,
+  hypre_F90_Int *ierr            )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRBiCGSTABGetNumIterations(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassIntRef (num_iterations) ) );
+           ( HYPRE_ParCSRBiCGSTABGetNumIterations(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassIntRef (num_iterations) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -316,16 +337,16 @@ hypre_F90_IFACE(hypre_parcsrbicgstabgetnumiter, HYPRE_PARCSRBICGSTABGETNUMITER)
 
 void
 hypre_F90_IFACE(hypre_parcsrbicgstabgetfinalrel, HYPRE_PARCSRBICGSTABGETFINALREL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *norm,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *norm,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRBiCGSTABGetFinalRelativeResidualNorm(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassRealRef (norm)    ) );
+           ( HYPRE_ParCSRBiCGSTABGetFinalRelativeResidualNorm(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassRealRef (norm)    ) );
 }
-    
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_block.c b/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_block.c
index 1f5e5d51..c1b9ca4c 100644
--- a/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_block.c
+++ b/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_block.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -18,18 +18,18 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-    
+
 /*--------------------------------------------------------------------------
  * HYPRE_BlockTridiagCreate
  *--------------------------------------------------------------------------*/
 
 void
 hypre_F90_IFACE(hypre_blocktridiagcreate, HYPRE_BLOCKTRIDIAGCREATE)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int) HYPRE_BlockTridiagCreate(
-      hypre_F90_PassObjRef (HYPRE_Solver, solver));
+              hypre_F90_PassObjRef (HYPRE_Solver, solver));
 }
 
 /*--------------------------------------------------------------------------
@@ -38,11 +38,11 @@ hypre_F90_IFACE(hypre_blocktridiagcreate, HYPRE_BLOCKTRIDIAGCREATE)
 
 void
 hypre_F90_IFACE(hypre_blocktridiagdestroy, HYPRE_BLOCKTRIDIAGDESTROY)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int) HYPRE_BlockTridiagDestroy(
-      hypre_F90_PassObj (HYPRE_Solver, solver));
+              hypre_F90_PassObj (HYPRE_Solver, solver));
 }
 
 /*--------------------------------------------------------------------------
@@ -51,17 +51,17 @@ hypre_F90_IFACE(hypre_blocktridiagdestroy, HYPRE_BLOCKTRIDIAGDESTROY)
 
 void
 hypre_F90_IFACE(hypre_blocktridiagsetup, HYPRE_BLOCKTRIDIAGSETUP)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Obj *A,
-    hypre_F90_Obj *b,
-    hypre_F90_Obj *x,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Obj *A,
+ hypre_F90_Obj *b,
+ hypre_F90_Obj *x,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int) HYPRE_BlockTridiagSetup(
-      hypre_F90_PassObj (HYPRE_Solver, solver), 
-      hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
-      hypre_F90_PassObj (HYPRE_ParVector, b), 
-      hypre_F90_PassObj (HYPRE_ParVector, x));
+              hypre_F90_PassObj (HYPRE_Solver, solver),
+              hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
+              hypre_F90_PassObj (HYPRE_ParVector, b),
+              hypre_F90_PassObj (HYPRE_ParVector, x));
 }
 
 /*--------------------------------------------------------------------------
@@ -70,17 +70,17 @@ hypre_F90_IFACE(hypre_blocktridiagsetup, HYPRE_BLOCKTRIDIAGSETUP)
 
 void
 hypre_F90_IFACE(hypre_blocktridiagsolve, HYPRE_BLOCKTRIDIAGSOLVE)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Obj *A,
-    hypre_F90_Obj *b,
-    hypre_F90_Obj *x,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Obj *A,
+ hypre_F90_Obj *b,
+ hypre_F90_Obj *x,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int) HYPRE_BlockTridiagSolve(
-      hypre_F90_PassObj (HYPRE_Solver, solver), 
-      hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
-      hypre_F90_PassObj (HYPRE_ParVector, b), 
-      hypre_F90_PassObj (HYPRE_ParVector, x));
+              hypre_F90_PassObj (HYPRE_Solver, solver),
+              hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
+              hypre_F90_PassObj (HYPRE_ParVector, b),
+              hypre_F90_PassObj (HYPRE_ParVector, x));
 }
 
 /*--------------------------------------------------------------------------
@@ -89,15 +89,15 @@ hypre_F90_IFACE(hypre_blocktridiagsolve, HYPRE_BLOCKTRIDIAGSOLVE)
 
 void
 hypre_F90_IFACE(hypre_blocktridiagsetindexset, HYPRE_BLOCKTRIDIAGSETINDEXSET)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *n,
-    hypre_F90_IntArray *inds,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *n,
+ hypre_F90_IntArray *inds,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int) HYPRE_BlockTridiagSetIndexSet(
-      hypre_F90_PassObj (HYPRE_Solver, solver),
-      hypre_F90_PassInt (n), 
-      hypre_F90_PassIntArray (inds));
+              hypre_F90_PassObj (HYPRE_Solver, solver),
+              hypre_F90_PassInt (n),
+              hypre_F90_PassIntArray (inds));
 }
 
 /*--------------------------------------------------------------------------
@@ -106,13 +106,13 @@ hypre_F90_IFACE(hypre_blocktridiagsetindexset, HYPRE_BLOCKTRIDIAGSETINDEXSET)
 
 void
 hypre_F90_IFACE(hypre_blocktridiagsetamgstrengt, HYPRE_BLOCKTRIDIAGSETAMGSTRENGT)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Real *thresh,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Real *thresh,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int) HYPRE_BlockTridiagSetAMGStrengthThreshold(
-      hypre_F90_PassObj (HYPRE_Solver, solver),
-      hypre_F90_PassReal (thresh));
+              hypre_F90_PassObj (HYPRE_Solver, solver),
+              hypre_F90_PassReal (thresh));
 }
 
 /*--------------------------------------------------------------------------
@@ -121,13 +121,13 @@ hypre_F90_IFACE(hypre_blocktridiagsetamgstrengt, HYPRE_BLOCKTRIDIAGSETAMGSTRENGT
 
 void
 hypre_F90_IFACE(hypre_blocktridiagsetamgnumswee, HYPRE_BLOCKTRIDIAGSETAMGNUMSWEE)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *num_sweeps,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *num_sweeps,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int) HYPRE_BlockTridiagSetAMGNumSweeps(
-      hypre_F90_PassObj (HYPRE_Solver, solver),
-      hypre_F90_PassInt (num_sweeps));
+              hypre_F90_PassObj (HYPRE_Solver, solver),
+              hypre_F90_PassInt (num_sweeps));
 }
 
 /*--------------------------------------------------------------------------
@@ -136,13 +136,13 @@ hypre_F90_IFACE(hypre_blocktridiagsetamgnumswee, HYPRE_BLOCKTRIDIAGSETAMGNUMSWEE
 
 void
 hypre_F90_IFACE(hypre_blocktridiagsetamgrelaxty, HYPRE_BLOCKTRIDIAGSETAMGRELAXTY)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *relax_type,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *relax_type,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int) HYPRE_BlockTridiagSetAMGRelaxType(
-      hypre_F90_PassObj (HYPRE_Solver, solver),
-      hypre_F90_PassInt (relax_type));
+              hypre_F90_PassObj (HYPRE_Solver, solver),
+              hypre_F90_PassInt (relax_type));
 }
 
 /*--------------------------------------------------------------------------
@@ -151,15 +151,15 @@ hypre_F90_IFACE(hypre_blocktridiagsetamgrelaxty, HYPRE_BLOCKTRIDIAGSETAMGRELAXTY
 
 void
 hypre_F90_IFACE(hypre_blocktridiagsetprintlevel, HYPRE_BLOCKTRIDIAGSETPRINTLEVEL)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *print_level,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *print_level,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int) HYPRE_BlockTridiagSetPrintLevel(
-      hypre_F90_PassObj (HYPRE_Solver, solver),
-      hypre_F90_PassInt (print_level));
+              hypre_F90_PassObj (HYPRE_Solver, solver),
+              hypre_F90_PassInt (print_level));
 }
-    
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_cgnr.c b/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_cgnr.c
index 0b509aac..da69cf0d 100644
--- a/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_cgnr.c
+++ b/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_cgnr.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -17,76 +17,76 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-    
+
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRCGNRCreate
  *--------------------------------------------------------------------------*/
 
 void
 hypre_F90_IFACE(hypre_parcsrcgnrcreate, HYPRE_PARCSRCGNRCREATE)
-   ( hypre_F90_Comm *comm,
-     hypre_F90_Obj *solver,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Comm *comm,
+  hypre_F90_Obj *solver,
+  hypre_F90_Int *ierr    )
 
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRCGNRCreate(
-           hypre_F90_PassComm (comm),
-           hypre_F90_PassObjRef (HYPRE_Solver, solver) ) );
+           ( HYPRE_ParCSRCGNRCreate(
+                hypre_F90_PassComm (comm),
+                hypre_F90_PassObjRef (HYPRE_Solver, solver) ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRCGNRDestroy
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_parcsrcgnrdestroy, HYPRE_PARCSRCGNRDESTROY)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRCGNRDestroy(
-           hypre_F90_PassObj (HYPRE_Solver, solver) ) );
+           ( HYPRE_ParCSRCGNRDestroy(
+                hypre_F90_PassObj (HYPRE_Solver, solver) ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRCGNRSetup
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_parcsrcgnrsetup, HYPRE_PARCSRCGNRSETUP)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *A,
-     hypre_F90_Obj *b,
-     hypre_F90_Obj *x,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *A,
+  hypre_F90_Obj *b,
+  hypre_F90_Obj *x,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRCGNRSetup(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
-           hypre_F90_PassObj (HYPRE_ParVector, b),
-           hypre_F90_PassObj (HYPRE_ParVector, x)       ) );
+           ( HYPRE_ParCSRCGNRSetup(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
+                hypre_F90_PassObj (HYPRE_ParVector, b),
+                hypre_F90_PassObj (HYPRE_ParVector, x)       ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRCGNRSolve
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_parcsrcgnrsolve, HYPRE_PARCSRCGNRSOLVE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *A,
-     hypre_F90_Obj *b,
-     hypre_F90_Obj *x,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *A,
+  hypre_F90_Obj *b,
+  hypre_F90_Obj *x,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRCGNRSolve(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
-           hypre_F90_PassObj (HYPRE_ParVector, b),
-           hypre_F90_PassObj (HYPRE_ParVector, x)       ) );
+           ( HYPRE_ParCSRCGNRSolve(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
+                hypre_F90_PassObj (HYPRE_ParVector, b),
+                hypre_F90_PassObj (HYPRE_ParVector, x)       ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -95,14 +95,14 @@ hypre_F90_IFACE(hypre_parcsrcgnrsolve, HYPRE_PARCSRCGNRSOLVE)
 
 void
 hypre_F90_IFACE(hypre_parcsrcgnrsettol, HYPRE_PARCSRCGNRSETTOL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *tol,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *tol,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRCGNRSetTol(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassReal (tol)     ) );
+           ( HYPRE_ParCSRCGNRSetTol(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassReal (tol)     ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -111,14 +111,14 @@ hypre_F90_IFACE(hypre_parcsrcgnrsettol, HYPRE_PARCSRCGNRSETTOL)
 
 void
 hypre_F90_IFACE(hypre_parcsrcgnrsetminiter, HYPRE_PARCSRCGNRSETMINITER)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *min_iter,
-     hypre_F90_Int *ierr      )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *min_iter,
+  hypre_F90_Int *ierr      )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRCGNRSetMinIter(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (min_iter) ) );
+           ( HYPRE_ParCSRCGNRSetMinIter(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (min_iter) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -127,14 +127,14 @@ hypre_F90_IFACE(hypre_parcsrcgnrsetminiter, HYPRE_PARCSRCGNRSETMINITER)
 
 void
 hypre_F90_IFACE(hypre_parcsrcgnrsetmaxiter, HYPRE_PARCSRCGNRSETMAXITER)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *max_iter,
-     hypre_F90_Int *ierr      )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *max_iter,
+  hypre_F90_Int *ierr      )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRCGNRSetMaxIter(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (max_iter) ) );
+           ( HYPRE_ParCSRCGNRSetMaxIter(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (max_iter) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -143,14 +143,14 @@ hypre_F90_IFACE(hypre_parcsrcgnrsetmaxiter, HYPRE_PARCSRCGNRSETMAXITER)
 
 void
 hypre_F90_IFACE(hypre_parcsrcgnrsetstopcrit, HYPRE_PARCSRCGNRSETSTOPCRIT)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *stop_crit,
-     hypre_F90_Int *ierr      )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *stop_crit,
+  hypre_F90_Int *ierr      )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRCGNRSetStopCrit(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (stop_crit) ) );
+           ( HYPRE_ParCSRCGNRSetStopCrit(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (stop_crit) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -159,10 +159,10 @@ hypre_F90_IFACE(hypre_parcsrcgnrsetstopcrit, HYPRE_PARCSRCGNRSETSTOPCRIT)
 
 void
 hypre_F90_IFACE(hypre_parcsrcgnrsetprecond, HYPRE_PARCSRCGNRSETPRECOND)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *precond_id,
-     hypre_F90_Obj *precond_solver,
-     hypre_F90_Int *ierr            )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *precond_id,
+  hypre_F90_Obj *precond_solver,
+  hypre_F90_Int *ierr            )
 {
    /*------------------------------------------------------------
     * The precond_id flags mean :
@@ -170,6 +170,10 @@ hypre_F90_IFACE(hypre_parcsrcgnrsetprecond, HYPRE_PARCSRCGNRSETPRECOND)
     * 1 - set up a ds preconditioner
     * 2 - set up an amg preconditioner
     * 3 - set up a pilut preconditioner
+    * 4 - set up a ParaSails preconditioner
+    * 5 - set up a Euclid preconditioner
+    * 6 - set up a ILU preconditioner
+    * 7 - set up a MGR preconditioner
     *------------------------------------------------------------*/
 
    if (*precond_id == 0)
@@ -179,52 +183,72 @@ hypre_F90_IFACE(hypre_parcsrcgnrsetprecond, HYPRE_PARCSRCGNRSETPRECOND)
    else if (*precond_id == 1)
    {
       *ierr = (hypre_F90_Int)
-         ( HYPRE_ParCSRCGNRSetPrecond(
-              hypre_F90_PassObj (HYPRE_Solver, solver),
-              HYPRE_ParCSRDiagScale,
-              HYPRE_ParCSRDiagScale,
-              HYPRE_ParCSRDiagScaleSetup,
-              NULL                        ) );
+              ( HYPRE_ParCSRCGNRSetPrecond(
+                   hypre_F90_PassObj (HYPRE_Solver, solver),
+                   HYPRE_ParCSRDiagScale,
+                   HYPRE_ParCSRDiagScale,
+                   HYPRE_ParCSRDiagScaleSetup,
+                   NULL                        ) );
    }
    else if (*precond_id == 2)
    {
       *ierr = (hypre_F90_Int)
-         ( HYPRE_ParCSRCGNRSetPrecond(
-              hypre_F90_PassObj (HYPRE_Solver, solver),
-              HYPRE_BoomerAMGSolve,
-              HYPRE_BoomerAMGSolve,
-              HYPRE_BoomerAMGSetup,
-              (HYPRE_Solver)       *precond_solver ) );
+              ( HYPRE_ParCSRCGNRSetPrecond(
+                   hypre_F90_PassObj (HYPRE_Solver, solver),
+                   HYPRE_BoomerAMGSolve,
+                   HYPRE_BoomerAMGSolve,
+                   HYPRE_BoomerAMGSetup,
+                   (HYPRE_Solver)       * precond_solver ) );
    }
    if (*precond_id == 3)
    {
       *ierr = (hypre_F90_Int)
-         ( HYPRE_ParCSRCGNRSetPrecond(
-              hypre_F90_PassObj (HYPRE_Solver, solver),
-              HYPRE_ParCSRPilutSolve,
-              HYPRE_ParCSRPilutSolve,
-              HYPRE_ParCSRPilutSetup,
-              (HYPRE_Solver)       *precond_solver ) );
+              ( HYPRE_ParCSRCGNRSetPrecond(
+                   hypre_F90_PassObj (HYPRE_Solver, solver),
+                   HYPRE_ParCSRPilutSolve,
+                   HYPRE_ParCSRPilutSolve,
+                   HYPRE_ParCSRPilutSetup,
+                   (HYPRE_Solver)       * precond_solver ) );
    }
    if (*precond_id == 4)
    {
       *ierr = (hypre_F90_Int)
-         ( HYPRE_ParCSRCGNRSetPrecond(
-              hypre_F90_PassObj (HYPRE_Solver, solver),
-              HYPRE_ParCSRParaSailsSolve,
-              HYPRE_ParCSRParaSailsSolve,
-              HYPRE_ParCSRParaSailsSetup,
-              (HYPRE_Solver)       *precond_solver ) );
+              ( HYPRE_ParCSRCGNRSetPrecond(
+                   hypre_F90_PassObj (HYPRE_Solver, solver),
+                   HYPRE_ParCSRParaSailsSolve,
+                   HYPRE_ParCSRParaSailsSolve,
+                   HYPRE_ParCSRParaSailsSetup,
+                   (HYPRE_Solver)       * precond_solver ) );
    }
    if (*precond_id == 5)
    {
       *ierr = (hypre_F90_Int)
-         ( HYPRE_ParCSRCGNRSetPrecond(
-              hypre_F90_PassObj (HYPRE_Solver, solver),
-              HYPRE_EuclidSolve,
-              HYPRE_EuclidSolve,
-              HYPRE_EuclidSetup,
-              (HYPRE_Solver)       *precond_solver ) );
+              ( HYPRE_ParCSRCGNRSetPrecond(
+                   hypre_F90_PassObj (HYPRE_Solver, solver),
+                   HYPRE_EuclidSolve,
+                   HYPRE_EuclidSolve,
+                   HYPRE_EuclidSetup,
+                   (HYPRE_Solver)       * precond_solver ) );
+   }
+   else if (*precond_id == 6)
+   {
+      *ierr = (hypre_F90_Int)
+              ( HYPRE_ParCSRCGNRSetPrecond(
+                   hypre_F90_PassObj (HYPRE_Solver, solver),
+                   HYPRE_ILUSolve,
+                   HYPRE_ILUSolve,
+                   HYPRE_ILUSetup,
+                   (HYPRE_Solver)       * precond_solver ) );
+   }
+   else if (*precond_id == 7)
+   {
+      *ierr = (hypre_F90_Int)
+              ( HYPRE_ParCSRCGNRSetPrecond(
+                   hypre_F90_PassObj (HYPRE_Solver, solver),
+                   HYPRE_MGRSolve,
+                   HYPRE_MGRSolve,
+                   HYPRE_MGRSetup,
+                   (HYPRE_Solver)       * precond_solver ) );
    }
    else
    {
@@ -238,14 +262,14 @@ hypre_F90_IFACE(hypre_parcsrcgnrsetprecond, HYPRE_PARCSRCGNRSETPRECOND)
 
 void
 hypre_F90_IFACE(hypre_parcsrcgnrgetprecond, HYPRE_PARCSRCGNRGETPRECOND)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *precond_solver_ptr,
-     hypre_F90_Int *ierr                 )
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *precond_solver_ptr,
+  hypre_F90_Int *ierr                 )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRCGNRGetPrecond(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassObjRef (HYPRE_Solver, precond_solver_ptr) ) );
+           ( HYPRE_ParCSRCGNRGetPrecond(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassObjRef (HYPRE_Solver, precond_solver_ptr) ) );
 
 }
 
@@ -255,14 +279,14 @@ hypre_F90_IFACE(hypre_parcsrcgnrgetprecond, HYPRE_PARCSRCGNRGETPRECOND)
 
 void
 hypre_F90_IFACE(hypre_parcsrcgnrsetlogging, HYPRE_PARCSRCGNRSETLOGGING)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *logging,
-     hypre_F90_Int *ierr     )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *logging,
+  hypre_F90_Int *ierr     )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRCGNRSetLogging(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (logging) ) );
+           ( HYPRE_ParCSRCGNRSetLogging(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (logging) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -271,14 +295,14 @@ hypre_F90_IFACE(hypre_parcsrcgnrsetlogging, HYPRE_PARCSRCGNRSETLOGGING)
 
 void
 hypre_F90_IFACE(hypre_parcsrcgnrgetnumiteration, HYPRE_PARCSRCGNRGETNUMITERATION)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *num_iterations,
-     hypre_F90_Int *ierr            )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *num_iterations,
+  hypre_F90_Int *ierr            )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRCGNRGetNumIterations(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassIntRef (num_iterations) ) );
+           ( HYPRE_ParCSRCGNRGetNumIterations(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassIntRef (num_iterations) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -287,16 +311,16 @@ hypre_F90_IFACE(hypre_parcsrcgnrgetnumiteration, HYPRE_PARCSRCGNRGETNUMITERATION
 
 void
 hypre_F90_IFACE(hypre_parcsrcgnrgetfinalrelativ, HYPRE_PARCSRCGNRGETFINALRELATIV)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *norm,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *norm,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRCGNRGetFinalRelativeResidualNorm(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassRealRef (norm)     ) );
+           ( HYPRE_ParCSRCGNRGetFinalRelativeResidualNorm(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassRealRef (norm)     ) );
 }
-    
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_cogmres.c b/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_cogmres.c
index 28d1baf9..aed38a8f 100644
--- a/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_cogmres.c
+++ b/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_cogmres.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -17,75 +17,75 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-    
+
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRCOGMRESCreate
  *--------------------------------------------------------------------------*/
 
 void
 hypre_F90_IFACE(hypre_parcsrcogmrescreate, HYPRE_PARCSRCOGMRESCREATE)
-   ( hypre_F90_Comm *comm,
-     hypre_F90_Obj *solver,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Comm *comm,
+  hypre_F90_Obj *solver,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRCOGMRESCreate(
-           hypre_F90_PassComm (comm),
-           hypre_F90_PassObjRef (HYPRE_Solver, solver) ) );
+           ( HYPRE_ParCSRCOGMRESCreate(
+                hypre_F90_PassComm (comm),
+                hypre_F90_PassObjRef (HYPRE_Solver, solver) ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRCOGMRESDestroy
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_parcsrcogmresdestroy, HYPRE_PARCSRCOGMRESDESTROY)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRCOGMRESDestroy(
-           hypre_F90_PassObj (HYPRE_Solver, solver) ) );
+           ( HYPRE_ParCSRCOGMRESDestroy(
+                hypre_F90_PassObj (HYPRE_Solver, solver) ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRCOGMRESSetup
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_parcsrcogmressetup, HYPRE_PARCSRCOGMRESSETUP)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *A,
-     hypre_F90_Obj *b,
-     hypre_F90_Obj *x,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *A,
+  hypre_F90_Obj *b,
+  hypre_F90_Obj *x,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRCOGMRESSetup(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
-           hypre_F90_PassObj (HYPRE_ParVector, b),
-           hypre_F90_PassObj (HYPRE_ParVector, x)       ) );
+           ( HYPRE_ParCSRCOGMRESSetup(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
+                hypre_F90_PassObj (HYPRE_ParVector, b),
+                hypre_F90_PassObj (HYPRE_ParVector, x)       ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRCOGMRESSolve
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_parcsrcogmressolve, HYPRE_PARCSRCOGMRESSOLVE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *A,
-     hypre_F90_Obj *b,
-     hypre_F90_Obj *x,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *A,
+  hypre_F90_Obj *b,
+  hypre_F90_Obj *x,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRCOGMRESSolve(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
-           hypre_F90_PassObj (HYPRE_ParVector, b),
-           hypre_F90_PassObj (HYPRE_ParVector, x)       ) );
+           ( HYPRE_ParCSRCOGMRESSolve(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
+                hypre_F90_PassObj (HYPRE_ParVector, b),
+                hypre_F90_PassObj (HYPRE_ParVector, x)       ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -94,14 +94,14 @@ hypre_F90_IFACE(hypre_parcsrcogmressolve, HYPRE_PARCSRCOGMRESSOLVE)
 
 void
 hypre_F90_IFACE(hypre_parcsrcogmressetkdim, HYPRE_PARCSRCOGMRESSETKDIM)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *kdim,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *kdim,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRCOGMRESSetKDim(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (kdim)    ) );
+           ( HYPRE_ParCSRCOGMRESSetKDim(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (kdim)    ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -110,14 +110,14 @@ hypre_F90_IFACE(hypre_parcsrcogmressetkdim, HYPRE_PARCSRCOGMRESSETKDIM)
 
 void
 hypre_F90_IFACE(hypre_parcsrcogmressetunroll, HYPRE_PARCSRCOGMRESSETUNROLL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *unroll,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *unroll,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRCOGMRESSetUnroll(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (unroll)    ) );
+           ( HYPRE_ParCSRCOGMRESSetUnroll(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (unroll)    ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -126,14 +126,14 @@ hypre_F90_IFACE(hypre_parcsrcogmressetunroll, HYPRE_PARCSRCOGMRESSETUNROLL)
 
 void
 hypre_F90_IFACE(hypre_parcsrcogmressetcgs, HYPRE_PARCSRCOGMRESSETCGS)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *cgs,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *cgs,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRCOGMRESSetCGS(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (cgs)    ) );
+           ( HYPRE_ParCSRCOGMRESSetCGS(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (cgs)    ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -142,14 +142,14 @@ hypre_F90_IFACE(hypre_parcsrcogmressetcgs, HYPRE_PARCSRCOGMRESSETCGS)
 
 void
 hypre_F90_IFACE(hypre_parcsrcogmressettol, HYPRE_PARCSRCOGMRESSETTOL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *tol,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *tol,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRCOGMRESSetTol(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassReal (tol)     ) );
+           ( HYPRE_ParCSRCOGMRESSetTol(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassReal (tol)     ) );
 }
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRCOGMRESSetAbsoluteTol
@@ -157,14 +157,14 @@ hypre_F90_IFACE(hypre_parcsrcogmressettol, HYPRE_PARCSRCOGMRESSETTOL)
 
 void
 hypre_F90_IFACE(hypre_parcsrcogmressetabsolutet, HYPRE_PARCSRCOGMRESSETABSOLUTET)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *tol,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *tol,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRCOGMRESSetAbsoluteTol(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassReal (tol)     ) );
+           ( HYPRE_ParCSRCOGMRESSetAbsoluteTol(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassReal (tol)     ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -173,14 +173,14 @@ hypre_F90_IFACE(hypre_parcsrcogmressetabsolutet, HYPRE_PARCSRCOGMRESSETABSOLUTET
 
 void
 hypre_F90_IFACE(hypre_parcsrcogmressetminiter, HYPRE_PARCSRCOGMRESSETMINITER)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *min_iter,
-     hypre_F90_Int *ierr      )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *min_iter,
+  hypre_F90_Int *ierr      )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRCOGMRESSetMinIter(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (min_iter) ) );
+           ( HYPRE_ParCSRCOGMRESSetMinIter(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (min_iter) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -189,14 +189,14 @@ hypre_F90_IFACE(hypre_parcsrcogmressetminiter, HYPRE_PARCSRCOGMRESSETMINITER)
 
 void
 hypre_F90_IFACE(hypre_parcsrcogmressetmaxiter, HYPRE_PARCSRCOGMRESSETMAXITER)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *max_iter,
-     hypre_F90_Int *ierr      )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *max_iter,
+  hypre_F90_Int *ierr      )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRCOGMRESSetMaxIter(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (max_iter) ) );
+           ( HYPRE_ParCSRCOGMRESSetMaxIter(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (max_iter) ) );
 }
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRCOGMRESSetPrecond
@@ -204,20 +204,22 @@ hypre_F90_IFACE(hypre_parcsrcogmressetmaxiter, HYPRE_PARCSRCOGMRESSETMAXITER)
 
 void
 hypre_F90_IFACE(hypre_parcsrcogmressetprecond, HYPRE_PARCSRCOGMRESSETPRECOND)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *precond_id,
-     hypre_F90_Obj *precond_solver,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *precond_id,
+  hypre_F90_Obj *precond_solver,
+  hypre_F90_Int *ierr          )
 {
-/*------------------------------------------------------------
- * The precond_id flags mean :
- * 0 - no preconditioner
- * 1 - set up a ds preconditioner
- * 2 - set up an amg preconditioner
- * 3 - set up a pilut preconditioner
- * 4 - set up a parasails preconditioner
- * 5 - set up a Euclid preconditioner
- *------------------------------------------------------------*/
+   /*------------------------------------------------------------
+    * The precond_id flags mean :
+    * 0 - no preconditioner
+    * 1 - set up a ds preconditioner
+    * 2 - set up an amg preconditioner
+    * 3 - set up a pilut preconditioner
+    * 4 - set up a parasails preconditioner
+    * 5 - set up a Euclid preconditioner
+    * 6 - set up a ILU preconditioner
+    * 7 - set up a MGR preconditioner
+    *------------------------------------------------------------*/
 
    if (*precond_id == 0)
    {
@@ -226,48 +228,66 @@ hypre_F90_IFACE(hypre_parcsrcogmressetprecond, HYPRE_PARCSRCOGMRESSETPRECOND)
    else if (*precond_id == 1)
    {
       *ierr = (hypre_F90_Int)
-         ( HYPRE_ParCSRCOGMRESSetPrecond(
-              hypre_F90_PassObj (HYPRE_Solver, solver),
-              HYPRE_ParCSRDiagScale,
-              HYPRE_ParCSRDiagScaleSetup,
-              NULL                        ) );
+              ( HYPRE_ParCSRCOGMRESSetPrecond(
+                   hypre_F90_PassObj (HYPRE_Solver, solver),
+                   HYPRE_ParCSRDiagScale,
+                   HYPRE_ParCSRDiagScaleSetup,
+                   NULL                        ) );
    }
    else if (*precond_id == 2)
    {
 
       *ierr = (hypre_F90_Int)
-         ( HYPRE_ParCSRCOGMRESSetPrecond(
-              hypre_F90_PassObj (HYPRE_Solver, solver),
-              HYPRE_BoomerAMGSolve,
-              HYPRE_BoomerAMGSetup,
-              (HYPRE_Solver)       *precond_solver ) );
+              ( HYPRE_ParCSRCOGMRESSetPrecond(
+                   hypre_F90_PassObj (HYPRE_Solver, solver),
+                   HYPRE_BoomerAMGSolve,
+                   HYPRE_BoomerAMGSetup,
+                   (HYPRE_Solver)       * precond_solver ) );
    }
    else if (*precond_id == 3)
    {
       *ierr = (hypre_F90_Int)
-         ( HYPRE_ParCSRCOGMRESSetPrecond(
-              hypre_F90_PassObj (HYPRE_Solver, solver),
-              HYPRE_ParCSRPilutSolve,
-              HYPRE_ParCSRPilutSetup,
-              (HYPRE_Solver)       *precond_solver ) );
+              ( HYPRE_ParCSRCOGMRESSetPrecond(
+                   hypre_F90_PassObj (HYPRE_Solver, solver),
+                   HYPRE_ParCSRPilutSolve,
+                   HYPRE_ParCSRPilutSetup,
+                   (HYPRE_Solver)       * precond_solver ) );
    }
    else if (*precond_id == 4)
    {
       *ierr = (hypre_F90_Int)
-         ( HYPRE_ParCSRCOGMRESSetPrecond(
-              hypre_F90_PassObj (HYPRE_Solver, solver),
-              HYPRE_ParCSRParaSailsSolve,
-              HYPRE_ParCSRParaSailsSetup,
-              (HYPRE_Solver)       *precond_solver ) );
+              ( HYPRE_ParCSRCOGMRESSetPrecond(
+                   hypre_F90_PassObj (HYPRE_Solver, solver),
+                   HYPRE_ParCSRParaSailsSolve,
+                   HYPRE_ParCSRParaSailsSetup,
+                   (HYPRE_Solver)       * precond_solver ) );
    }
    else if (*precond_id == 5)
    {
       *ierr = (hypre_F90_Int)
-         ( HYPRE_ParCSRCOGMRESSetPrecond(
-              hypre_F90_PassObj (HYPRE_Solver, solver),
-              HYPRE_EuclidSolve,
-              HYPRE_EuclidSetup,
-              (HYPRE_Solver)       *precond_solver ) );
+              ( HYPRE_ParCSRCOGMRESSetPrecond(
+                   hypre_F90_PassObj (HYPRE_Solver, solver),
+                   HYPRE_EuclidSolve,
+                   HYPRE_EuclidSetup,
+                   (HYPRE_Solver)       * precond_solver ) );
+   }
+   else if (*precond_id == 6)
+   {
+      *ierr = (hypre_F90_Int)
+              ( HYPRE_ParCSRCOGMRESSetPrecond(
+                   hypre_F90_PassObj (HYPRE_Solver, solver),
+                   HYPRE_ILUSolve,
+                   HYPRE_ILUSetup,
+                   (HYPRE_Solver)       * precond_solver ) );
+   }
+   else if (*precond_id == 7)
+   {
+      *ierr = (hypre_F90_Int)
+              ( HYPRE_ParCSRCOGMRESSetPrecond(
+                   hypre_F90_PassObj (HYPRE_Solver, solver),
+                   HYPRE_MGRSolve,
+                   HYPRE_MGRSetup,
+                   (HYPRE_Solver)       * precond_solver ) );
    }
    else
    {
@@ -281,14 +301,14 @@ hypre_F90_IFACE(hypre_parcsrcogmressetprecond, HYPRE_PARCSRCOGMRESSETPRECOND)
 
 void
 hypre_F90_IFACE(hypre_parcsrcogmresgetprecond, HYPRE_PARCSRCOGMRESGETPRECOND)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *precond_solver_ptr,
-     hypre_F90_Int *ierr                )
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *precond_solver_ptr,
+  hypre_F90_Int *ierr                )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRCOGMRESGetPrecond(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassObjRef (HYPRE_Solver, precond_solver_ptr) ) );
+           ( HYPRE_ParCSRCOGMRESGetPrecond(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassObjRef (HYPRE_Solver, precond_solver_ptr) ) );
 
 }
 
@@ -298,14 +318,14 @@ hypre_F90_IFACE(hypre_parcsrcogmresgetprecond, HYPRE_PARCSRCOGMRESGETPRECOND)
 
 void
 hypre_F90_IFACE(hypre_parcsrcogmressetlogging, HYPRE_PARCSRCOGMRESSETLOGGING)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *logging,
-     hypre_F90_Int *ierr     )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *logging,
+  hypre_F90_Int *ierr     )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRCOGMRESSetLogging(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (logging) ) );
+           ( HYPRE_ParCSRCOGMRESSetLogging(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (logging) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -314,14 +334,14 @@ hypre_F90_IFACE(hypre_parcsrcogmressetlogging, HYPRE_PARCSRCOGMRESSETLOGGING)
 
 void
 hypre_F90_IFACE(hypre_parcsrcogmressetprintleve, HYPRE_PARCSRCOGMRESSETPRINTLEVE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *print_level,
-     hypre_F90_Int *ierr     )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *print_level,
+  hypre_F90_Int *ierr     )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRCOGMRESSetPrintLevel(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (print_level) ) );
+           ( HYPRE_ParCSRCOGMRESSetPrintLevel(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (print_level) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -330,14 +350,14 @@ hypre_F90_IFACE(hypre_parcsrcogmressetprintleve, HYPRE_PARCSRCOGMRESSETPRINTLEVE
 
 void
 hypre_F90_IFACE(hypre_parcsrcogmresgetnumiterat, HYPRE_PARCSRCOGMRESGETNUMITERAT)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *num_iterations,
-     hypre_F90_Int *ierr            )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *num_iterations,
+  hypre_F90_Int *ierr            )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRCOGMRESGetNumIterations(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassIntRef (num_iterations) ) );
+           ( HYPRE_ParCSRCOGMRESGetNumIterations(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassIntRef (num_iterations) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -346,16 +366,16 @@ hypre_F90_IFACE(hypre_parcsrcogmresgetnumiterat, HYPRE_PARCSRCOGMRESGETNUMITERAT
 
 void
 hypre_F90_IFACE(hypre_parcsrcogmresgetfinalrela, HYPRE_PARCSRCOGMRESGETFINALRELA)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *norm,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *norm,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRCOGMRESGetFinalRelativeResidualNorm(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassRealRef (norm)    ) );
+           ( HYPRE_ParCSRCOGMRESGetFinalRelativeResidualNorm(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassRealRef (norm)    ) );
 }
-    
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_flexgmres.c b/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_flexgmres.c
index c27e3a02..567f2e7f 100644
--- a/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_flexgmres.c
+++ b/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_flexgmres.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -17,75 +17,75 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-    
+
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRFlexGMRESCreate
  *--------------------------------------------------------------------------*/
 
 void
 hypre_F90_IFACE(hypre_parcsrflexgmrescreate, HYPRE_PARCSRFLEXGMRESCREATE)
-   ( hypre_F90_Comm *comm,
-     hypre_F90_Obj *solver,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Comm *comm,
+  hypre_F90_Obj *solver,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRFlexGMRESCreate(
-           hypre_F90_PassComm (comm),
-           hypre_F90_PassObjRef (HYPRE_Solver, solver) ) );
+           ( HYPRE_ParCSRFlexGMRESCreate(
+                hypre_F90_PassComm (comm),
+                hypre_F90_PassObjRef (HYPRE_Solver, solver) ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRFlexGMRESDestroy
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_parcsrflexgmresdestroy, HYPRE_PARCSRFLEXGMRESDESTROY)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRFlexGMRESDestroy(
-           hypre_F90_PassObj (HYPRE_Solver, solver) ) );
+           ( HYPRE_ParCSRFlexGMRESDestroy(
+                hypre_F90_PassObj (HYPRE_Solver, solver) ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRFlexGMRESSetup
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_parcsrflexgmressetup, HYPRE_PARCSRFLEXGMRESSETUP)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *A,
-     hypre_F90_Obj *b,
-     hypre_F90_Obj *x,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *A,
+  hypre_F90_Obj *b,
+  hypre_F90_Obj *x,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRFlexGMRESSetup(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
-           hypre_F90_PassObj (HYPRE_ParVector, b),
-           hypre_F90_PassObj (HYPRE_ParVector, x)       ) );
+           ( HYPRE_ParCSRFlexGMRESSetup(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
+                hypre_F90_PassObj (HYPRE_ParVector, b),
+                hypre_F90_PassObj (HYPRE_ParVector, x)       ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRFlexGMRESSolve
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_parcsrflexgmressolve, HYPRE_PARCSRFLEXGMRESSOLVE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *A,
-     hypre_F90_Obj *b,
-     hypre_F90_Obj *x,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *A,
+  hypre_F90_Obj *b,
+  hypre_F90_Obj *x,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRFlexGMRESSolve(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
-           hypre_F90_PassObj (HYPRE_ParVector, b),
-           hypre_F90_PassObj (HYPRE_ParVector, x)       ) );
+           ( HYPRE_ParCSRFlexGMRESSolve(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
+                hypre_F90_PassObj (HYPRE_ParVector, b),
+                hypre_F90_PassObj (HYPRE_ParVector, x)       ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -94,14 +94,14 @@ hypre_F90_IFACE(hypre_parcsrflexgmressolve, HYPRE_PARCSRFLEXGMRESSOLVE)
 
 void
 hypre_F90_IFACE(hypre_parcsrflexgmressetkdim, HYPRE_PARCSRFLEXGMRESSETKDIM)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *kdim,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *kdim,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRFlexGMRESSetKDim(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (kdim)    ) );
+           ( HYPRE_ParCSRFlexGMRESSetKDim(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (kdim)    ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -110,14 +110,14 @@ hypre_F90_IFACE(hypre_parcsrflexgmressetkdim, HYPRE_PARCSRFLEXGMRESSETKDIM)
 
 void
 hypre_F90_IFACE(hypre_parcsrflexgmressettol, HYPRE_PARCSRFLEXGMRESSETTOL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *tol,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *tol,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRFlexGMRESSetTol(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassReal (tol)     ) );
+           ( HYPRE_ParCSRFlexGMRESSetTol(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassReal (tol)     ) );
 }
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRFlexGMRESSetAbsoluteTol
@@ -125,14 +125,14 @@ hypre_F90_IFACE(hypre_parcsrflexgmressettol, HYPRE_PARCSRFLEXGMRESSETTOL)
 
 void
 hypre_F90_IFACE(hypre_parcsrflexgmressetabsolutetol, HYPRE_PARCSRFLEXGMRESSETABSOLUTETOL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *tol,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *tol,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRFlexGMRESSetAbsoluteTol(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassReal (tol)     ) );
+           ( HYPRE_ParCSRFlexGMRESSetAbsoluteTol(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassReal (tol)     ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -141,14 +141,14 @@ hypre_F90_IFACE(hypre_parcsrflexgmressetabsolutetol, HYPRE_PARCSRFLEXGMRESSETABS
 
 void
 hypre_F90_IFACE(hypre_parcsrflexgmressetminiter, HYPRE_PARCSRFLEXGMRESSETMINITER)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *min_iter,
-     hypre_F90_Int *ierr      )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *min_iter,
+  hypre_F90_Int *ierr      )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRFlexGMRESSetMinIter(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (min_iter) ) );
+           ( HYPRE_ParCSRFlexGMRESSetMinIter(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (min_iter) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -157,14 +157,14 @@ hypre_F90_IFACE(hypre_parcsrflexgmressetminiter, HYPRE_PARCSRFLEXGMRESSETMINITER
 
 void
 hypre_F90_IFACE(hypre_parcsrflexgmressetmaxiter, HYPRE_PARCSRFLEXGMRESSETMAXITER)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *max_iter,
-     hypre_F90_Int *ierr      )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *max_iter,
+  hypre_F90_Int *ierr      )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRFlexGMRESSetMaxIter(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (max_iter) ) );
+           ( HYPRE_ParCSRFlexGMRESSetMaxIter(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (max_iter) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -173,10 +173,10 @@ hypre_F90_IFACE(hypre_parcsrflexgmressetmaxiter, HYPRE_PARCSRFLEXGMRESSETMAXITER
 
 void
 hypre_F90_IFACE(hypre_parcsrflexgmressetprecond, HYPRE_PARCSRFLEXGMRESSETPRECOND)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *precond_id,
-     hypre_F90_Obj *precond_solver,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *precond_id,
+  hypre_F90_Obj *precond_solver,
+  hypre_F90_Int *ierr          )
 {
    /*------------------------------------------------------------
     * The precond_id flags mean :
@@ -185,6 +185,9 @@ hypre_F90_IFACE(hypre_parcsrflexgmressetprecond, HYPRE_PARCSRFLEXGMRESSETPRECOND
     *  2 - set up an amg preconditioner
     *  3 - set up a pilut preconditioner
     *  4 - set up a parasails preconditioner
+    *  5 - set up a Euclid preconditioner
+    *  6 - set up a ILU preconditioner
+    *  7 - set up a MGR preconditioner
     *------------------------------------------------------------*/
 
    if (*precond_id == 0)
@@ -194,48 +197,66 @@ hypre_F90_IFACE(hypre_parcsrflexgmressetprecond, HYPRE_PARCSRFLEXGMRESSETPRECOND
    else if (*precond_id == 1)
    {
       *ierr = (hypre_F90_Int)
-         ( HYPRE_ParCSRFlexGMRESSetPrecond(
-              hypre_F90_PassObj (HYPRE_Solver, solver),
-              HYPRE_ParCSRDiagScale,
-              HYPRE_ParCSRDiagScaleSetup,
-              NULL                        ) );
+              ( HYPRE_ParCSRFlexGMRESSetPrecond(
+                   hypre_F90_PassObj (HYPRE_Solver, solver),
+                   HYPRE_ParCSRDiagScale,
+                   HYPRE_ParCSRDiagScaleSetup,
+                   NULL                        ) );
    }
    else if (*precond_id == 2)
    {
 
       *ierr = (hypre_F90_Int)
-         ( HYPRE_ParCSRFlexGMRESSetPrecond(
-              hypre_F90_PassObj (HYPRE_Solver, solver),
-              HYPRE_BoomerAMGSolve,
-              HYPRE_BoomerAMGSetup,
-              (HYPRE_Solver)       *precond_solver ) );
+              ( HYPRE_ParCSRFlexGMRESSetPrecond(
+                   hypre_F90_PassObj (HYPRE_Solver, solver),
+                   HYPRE_BoomerAMGSolve,
+                   HYPRE_BoomerAMGSetup,
+                   (HYPRE_Solver)       * precond_solver ) );
    }
    else if (*precond_id == 3)
    {
       *ierr = (hypre_F90_Int)
-         ( HYPRE_ParCSRFlexGMRESSetPrecond(
-              hypre_F90_PassObj (HYPRE_Solver, solver),
-              HYPRE_ParCSRPilutSolve,
-              HYPRE_ParCSRPilutSetup,
-              (HYPRE_Solver)      *precond_solver ) );
+              ( HYPRE_ParCSRFlexGMRESSetPrecond(
+                   hypre_F90_PassObj (HYPRE_Solver, solver),
+                   HYPRE_ParCSRPilutSolve,
+                   HYPRE_ParCSRPilutSetup,
+                   (HYPRE_Solver)      * precond_solver ) );
    }
    else if (*precond_id == 4)
    {
       *ierr = (hypre_F90_Int)
-         ( HYPRE_ParCSRFlexGMRESSetPrecond(
-              hypre_F90_PassObj (HYPRE_Solver, solver),
-              HYPRE_ParCSRParaSailsSolve,
-              HYPRE_ParCSRParaSailsSetup,
-              (HYPRE_Solver)       *precond_solver ) );
+              ( HYPRE_ParCSRFlexGMRESSetPrecond(
+                   hypre_F90_PassObj (HYPRE_Solver, solver),
+                   HYPRE_ParCSRParaSailsSolve,
+                   HYPRE_ParCSRParaSailsSetup,
+                   (HYPRE_Solver)       * precond_solver ) );
    }
    else if (*precond_id == 5)
    {
       *ierr = (hypre_F90_Int)
-         ( HYPRE_ParCSRFlexGMRESSetPrecond(
-              hypre_F90_PassObj (HYPRE_Solver, solver),
-              HYPRE_EuclidSolve,
-              HYPRE_EuclidSetup,
-              (HYPRE_Solver)       *precond_solver ) );
+              ( HYPRE_ParCSRFlexGMRESSetPrecond(
+                   hypre_F90_PassObj (HYPRE_Solver, solver),
+                   HYPRE_EuclidSolve,
+                   HYPRE_EuclidSetup,
+                   (HYPRE_Solver)       * precond_solver ) );
+   }
+   else if (*precond_id == 6)
+   {
+      *ierr = (hypre_F90_Int)
+              ( HYPRE_ParCSRFlexGMRESSetPrecond(
+                   hypre_F90_PassObj (HYPRE_Solver, solver),
+                   HYPRE_ILUSolve,
+                   HYPRE_ILUSetup,
+                   (HYPRE_Solver)       * precond_solver ) );
+   }
+   else if (*precond_id == 7)
+   {
+      *ierr = (hypre_F90_Int)
+              ( HYPRE_ParCSRFlexGMRESSetPrecond(
+                   hypre_F90_PassObj (HYPRE_Solver, solver),
+                   HYPRE_MGRSolve,
+                   HYPRE_MGRSetup,
+                   (HYPRE_Solver)       * precond_solver ) );
    }
    else
    {
@@ -249,14 +270,14 @@ hypre_F90_IFACE(hypre_parcsrflexgmressetprecond, HYPRE_PARCSRFLEXGMRESSETPRECOND
 
 void
 hypre_F90_IFACE(hypre_parcsrflexgmresgetprecond, HYPRE_PARCSRFLEXGMRESGETPRECOND)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *precond_solver_ptr,
-     hypre_F90_Int *ierr                )
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *precond_solver_ptr,
+  hypre_F90_Int *ierr                )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRFlexGMRESGetPrecond(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassObjRef (HYPRE_Solver, precond_solver_ptr) ) );
+           ( HYPRE_ParCSRFlexGMRESGetPrecond(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassObjRef (HYPRE_Solver, precond_solver_ptr) ) );
 
 }
 
@@ -266,14 +287,14 @@ hypre_F90_IFACE(hypre_parcsrflexgmresgetprecond, HYPRE_PARCSRFLEXGMRESGETPRECOND
 
 void
 hypre_F90_IFACE(hypre_parcsrflexgmressetlogging, HYPRE_PARCSRFLEXGMRESSETLOGGING)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *logging,
-     hypre_F90_Int *ierr     )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *logging,
+  hypre_F90_Int *ierr     )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRFlexGMRESSetLogging(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (logging) ) );
+           ( HYPRE_ParCSRFlexGMRESSetLogging(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (logging) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -282,14 +303,14 @@ hypre_F90_IFACE(hypre_parcsrflexgmressetlogging, HYPRE_PARCSRFLEXGMRESSETLOGGING
 
 void
 hypre_F90_IFACE(hypre_parcsrflexgmressetprintlevel, HYPRE_PARCSRFLEXGMRESSETPRINTLEVEL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *print_level,
-     hypre_F90_Int *ierr     )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *print_level,
+  hypre_F90_Int *ierr     )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRFlexGMRESSetPrintLevel(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (print_level) ) );
+           ( HYPRE_ParCSRFlexGMRESSetPrintLevel(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (print_level) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -298,14 +319,14 @@ hypre_F90_IFACE(hypre_parcsrflexgmressetprintlevel, HYPRE_PARCSRFLEXGMRESSETPRIN
 
 void
 hypre_F90_IFACE(hypre_parcsrflexgmresgetnumiteratio, HYPRE_PARCSRFLEXGMRESGETNUMITERATIO)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *num_iterations,
-     hypre_F90_Int *ierr            )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *num_iterations,
+  hypre_F90_Int *ierr            )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRFlexGMRESGetNumIterations(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassIntRef (num_iterations) ) );
+           ( HYPRE_ParCSRFlexGMRESGetNumIterations(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassIntRef (num_iterations) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -314,16 +335,16 @@ hypre_F90_IFACE(hypre_parcsrflexgmresgetnumiteratio, HYPRE_PARCSRFLEXGMRESGETNUM
 
 void
 hypre_F90_IFACE(hypre_parcsrflexgmresgetfinalrelati, HYPRE_PARCSRFLEXGMRESGETFINALRELATI)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *norm,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *norm,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRFlexGMRESGetFinalRelativeResidualNorm(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassRealRef (norm)    ) );
+           ( HYPRE_ParCSRFlexGMRESGetFinalRelativeResidualNorm(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassRealRef (norm)    ) );
 }
-    
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_gmres.c b/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_gmres.c
index 4d0578b8..30be183a 100644
--- a/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_gmres.c
+++ b/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_gmres.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -17,75 +17,75 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-    
+
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRGMRESCreate
  *--------------------------------------------------------------------------*/
 
 void
 hypre_F90_IFACE(hypre_parcsrgmrescreate, HYPRE_PARCSRGMRESCREATE)
-   ( hypre_F90_Comm *comm,
-     hypre_F90_Obj *solver,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Comm *comm,
+  hypre_F90_Obj *solver,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRGMRESCreate(
-           hypre_F90_PassComm (comm),
-           hypre_F90_PassObjRef (HYPRE_Solver, solver) ) );
+           ( HYPRE_ParCSRGMRESCreate(
+                hypre_F90_PassComm (comm),
+                hypre_F90_PassObjRef (HYPRE_Solver, solver) ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRGMRESDestroy
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_parcsrgmresdestroy, HYPRE_PARCSRGMRESDESTROY)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRGMRESDestroy(
-           hypre_F90_PassObj (HYPRE_Solver, solver) ) );
+           ( HYPRE_ParCSRGMRESDestroy(
+                hypre_F90_PassObj (HYPRE_Solver, solver) ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRGMRESSetup
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_parcsrgmressetup, HYPRE_PARCSRGMRESSETUP)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *A,
-     hypre_F90_Obj *b,
-     hypre_F90_Obj *x,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *A,
+  hypre_F90_Obj *b,
+  hypre_F90_Obj *x,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRGMRESSetup(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
-           hypre_F90_PassObj (HYPRE_ParVector, b),
-           hypre_F90_PassObj (HYPRE_ParVector, x)       ) );
+           ( HYPRE_ParCSRGMRESSetup(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
+                hypre_F90_PassObj (HYPRE_ParVector, b),
+                hypre_F90_PassObj (HYPRE_ParVector, x)       ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRGMRESSolve
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_parcsrgmressolve, HYPRE_PARCSRGMRESSOLVE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *A,
-     hypre_F90_Obj *b,
-     hypre_F90_Obj *x,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *A,
+  hypre_F90_Obj *b,
+  hypre_F90_Obj *x,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRGMRESSolve(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
-           hypre_F90_PassObj (HYPRE_ParVector, b),
-           hypre_F90_PassObj (HYPRE_ParVector, x)       ) );
+           ( HYPRE_ParCSRGMRESSolve(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
+                hypre_F90_PassObj (HYPRE_ParVector, b),
+                hypre_F90_PassObj (HYPRE_ParVector, x)       ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -94,14 +94,14 @@ hypre_F90_IFACE(hypre_parcsrgmressolve, HYPRE_PARCSRGMRESSOLVE)
 
 void
 hypre_F90_IFACE(hypre_parcsrgmressetkdim, HYPRE_PARCSRGMRESSETKDIM)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *kdim,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *kdim,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRGMRESSetKDim(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (kdim)    ) );
+           ( HYPRE_ParCSRGMRESSetKDim(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (kdim)    ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -110,14 +110,14 @@ hypre_F90_IFACE(hypre_parcsrgmressetkdim, HYPRE_PARCSRGMRESSETKDIM)
 
 void
 hypre_F90_IFACE(hypre_parcsrgmressettol, HYPRE_PARCSRGMRESSETTOL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *tol,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *tol,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRGMRESSetTol(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassReal (tol)     ) );
+           ( HYPRE_ParCSRGMRESSetTol(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassReal (tol)     ) );
 }
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRGMRESSetAbsoluteTol
@@ -125,14 +125,14 @@ hypre_F90_IFACE(hypre_parcsrgmressettol, HYPRE_PARCSRGMRESSETTOL)
 
 void
 hypre_F90_IFACE(hypre_parcsrgmressetabsolutetol, HYPRE_PARCSRGMRESSETABSOLUTETOL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *tol,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *tol,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRGMRESSetAbsoluteTol(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassReal (tol)     ) );
+           ( HYPRE_ParCSRGMRESSetAbsoluteTol(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassReal (tol)     ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -141,14 +141,14 @@ hypre_F90_IFACE(hypre_parcsrgmressetabsolutetol, HYPRE_PARCSRGMRESSETABSOLUTETOL
 
 void
 hypre_F90_IFACE(hypre_parcsrgmressetminiter, HYPRE_PARCSRGMRESSETMINITER)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *min_iter,
-     hypre_F90_Int *ierr      )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *min_iter,
+  hypre_F90_Int *ierr      )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRGMRESSetMinIter(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (min_iter) ) );
+           ( HYPRE_ParCSRGMRESSetMinIter(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (min_iter) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -157,14 +157,14 @@ hypre_F90_IFACE(hypre_parcsrgmressetminiter, HYPRE_PARCSRGMRESSETMINITER)
 
 void
 hypre_F90_IFACE(hypre_parcsrgmressetmaxiter, HYPRE_PARCSRGMRESSETMAXITER)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *max_iter,
-     hypre_F90_Int *ierr      )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *max_iter,
+  hypre_F90_Int *ierr      )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRGMRESSetMaxIter(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (max_iter) ) );
+           ( HYPRE_ParCSRGMRESSetMaxIter(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (max_iter) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -173,14 +173,14 @@ hypre_F90_IFACE(hypre_parcsrgmressetmaxiter, HYPRE_PARCSRGMRESSETMAXITER)
 
 void
 hypre_F90_IFACE(hypre_parcsrgmressetstopcrit, HYPRE_PARCSRGMRESSETSTOPCRIT)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *stop_crit,
-     hypre_F90_Int *ierr      )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *stop_crit,
+  hypre_F90_Int *ierr      )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRGMRESSetStopCrit(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (stop_crit) ) );
+           ( HYPRE_ParCSRGMRESSetStopCrit(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (stop_crit) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -189,10 +189,10 @@ hypre_F90_IFACE(hypre_parcsrgmressetstopcrit, HYPRE_PARCSRGMRESSETSTOPCRIT)
 
 void
 hypre_F90_IFACE(hypre_parcsrgmressetprecond, HYPRE_PARCSRGMRESSETPRECOND)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *precond_id,
-     hypre_F90_Obj *precond_solver,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *precond_id,
+  hypre_F90_Obj *precond_solver,
+  hypre_F90_Int *ierr          )
 {
    /*------------------------------------------------------------
     * The precond_id flags mean :
@@ -201,6 +201,9 @@ hypre_F90_IFACE(hypre_parcsrgmressetprecond, HYPRE_PARCSRGMRESSETPRECOND)
     *  2 - set up an amg preconditioner
     *  3 - set up a pilut preconditioner
     *  4 - set up a parasails preconditioner
+    *  5 - set up a Euclid preconditioner
+    *  6 - set up a ILU preconditioner
+    *  7 - set up a MGR preconditioner
     *------------------------------------------------------------*/
 
    if (*precond_id == 0)
@@ -210,49 +213,67 @@ hypre_F90_IFACE(hypre_parcsrgmressetprecond, HYPRE_PARCSRGMRESSETPRECOND)
    else if (*precond_id == 1)
    {
       *ierr = (hypre_F90_Int)
-         ( HYPRE_ParCSRGMRESSetPrecond(
-              hypre_F90_PassObj (HYPRE_Solver, solver),
-              HYPRE_ParCSRDiagScale,
-              HYPRE_ParCSRDiagScaleSetup,
-              NULL                        ) );
+              ( HYPRE_ParCSRGMRESSetPrecond(
+                   hypre_F90_PassObj (HYPRE_Solver, solver),
+                   HYPRE_ParCSRDiagScale,
+                   HYPRE_ParCSRDiagScaleSetup,
+                   NULL                        ) );
    }
    else if (*precond_id == 2)
    {
 
       *ierr = (hypre_F90_Int)
-         ( HYPRE_ParCSRGMRESSetPrecond(
-              hypre_F90_PassObj (HYPRE_Solver, solver),
-              HYPRE_BoomerAMGSolve,
-              HYPRE_BoomerAMGSetup,
-              (HYPRE_Solver)       *precond_solver ) );
+              ( HYPRE_ParCSRGMRESSetPrecond(
+                   hypre_F90_PassObj (HYPRE_Solver, solver),
+                   HYPRE_BoomerAMGSolve,
+                   HYPRE_BoomerAMGSetup,
+                   (HYPRE_Solver)       * precond_solver ) );
    }
    else if (*precond_id == 3)
    {
       *ierr = (hypre_F90_Int)
-         ( HYPRE_ParCSRGMRESSetPrecond(
-              hypre_F90_PassObj (HYPRE_Solver, solver),
-              HYPRE_ParCSRPilutSolve,
-              HYPRE_ParCSRPilutSetup,
-              (HYPRE_Solver)       *precond_solver ) );
+              ( HYPRE_ParCSRGMRESSetPrecond(
+                   hypre_F90_PassObj (HYPRE_Solver, solver),
+                   HYPRE_ParCSRPilutSolve,
+                   HYPRE_ParCSRPilutSetup,
+                   (HYPRE_Solver)       * precond_solver ) );
    }
    else if (*precond_id == 4)
    {
       *ierr = (hypre_F90_Int)
-         ( HYPRE_ParCSRGMRESSetPrecond(
-              hypre_F90_PassObj (HYPRE_Solver, solver),
-              HYPRE_ParCSRParaSailsSolve,
-              HYPRE_ParCSRParaSailsSetup,
-              (HYPRE_Solver)       *precond_solver ) );
-   } 
+              ( HYPRE_ParCSRGMRESSetPrecond(
+                   hypre_F90_PassObj (HYPRE_Solver, solver),
+                   HYPRE_ParCSRParaSailsSolve,
+                   HYPRE_ParCSRParaSailsSetup,
+                   (HYPRE_Solver)       * precond_solver ) );
+   }
    else if (*precond_id == 5)
    {
       *ierr = (hypre_F90_Int)
-         ( HYPRE_ParCSRGMRESSetPrecond(
-              hypre_F90_PassObj (HYPRE_Solver, solver),
-              HYPRE_EuclidSolve,
-              HYPRE_EuclidSetup,
-              (HYPRE_Solver)       *precond_solver ) );
-   } 
+              ( HYPRE_ParCSRGMRESSetPrecond(
+                   hypre_F90_PassObj (HYPRE_Solver, solver),
+                   HYPRE_EuclidSolve,
+                   HYPRE_EuclidSetup,
+                   (HYPRE_Solver)       * precond_solver ) );
+   }
+   else if (*precond_id == 6)
+   {
+      *ierr = (hypre_F90_Int)
+              ( HYPRE_ParCSRGMRESSetPrecond(
+                   hypre_F90_PassObj (HYPRE_Solver, solver),
+                   HYPRE_ILUSolve,
+                   HYPRE_ILUSetup,
+                   (HYPRE_Solver)       * precond_solver ) );
+   }
+   else if (*precond_id == 7)
+   {
+      *ierr = (hypre_F90_Int)
+              ( HYPRE_ParCSRGMRESSetPrecond(
+                   hypre_F90_PassObj (HYPRE_Solver, solver),
+                   HYPRE_MGRSolve,
+                   HYPRE_MGRSetup,
+                   (HYPRE_Solver)       * precond_solver ) );
+   }
    else
    {
       *ierr = -1;
@@ -265,14 +286,14 @@ hypre_F90_IFACE(hypre_parcsrgmressetprecond, HYPRE_PARCSRGMRESSETPRECOND)
 
 void
 hypre_F90_IFACE(hypre_parcsrgmresgetprecond, HYPRE_PARCSRGMRESGETPRECOND)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *precond_solver_ptr,
-     hypre_F90_Int *ierr                )
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *precond_solver_ptr,
+  hypre_F90_Int *ierr                )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRGMRESGetPrecond(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassObjRef (HYPRE_Solver, precond_solver_ptr) ) );
+           ( HYPRE_ParCSRGMRESGetPrecond(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassObjRef (HYPRE_Solver, precond_solver_ptr) ) );
 
 }
 
@@ -282,14 +303,14 @@ hypre_F90_IFACE(hypre_parcsrgmresgetprecond, HYPRE_PARCSRGMRESGETPRECOND)
 
 void
 hypre_F90_IFACE(hypre_parcsrgmressetlogging, HYPRE_PARCSRGMRESSETLOGGING)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *logging,
-     hypre_F90_Int *ierr     )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *logging,
+  hypre_F90_Int *ierr     )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRGMRESSetLogging(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (logging) ) );
+           ( HYPRE_ParCSRGMRESSetLogging(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (logging) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -298,14 +319,14 @@ hypre_F90_IFACE(hypre_parcsrgmressetlogging, HYPRE_PARCSRGMRESSETLOGGING)
 
 void
 hypre_F90_IFACE(hypre_parcsrgmressetprintlevel, HYPRE_PARCSRGMRESSETPRINTLEVEL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *print_level,
-     hypre_F90_Int *ierr     )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *print_level,
+  hypre_F90_Int *ierr     )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRGMRESSetPrintLevel(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (print_level) ) );
+           ( HYPRE_ParCSRGMRESSetPrintLevel(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (print_level) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -314,14 +335,14 @@ hypre_F90_IFACE(hypre_parcsrgmressetprintlevel, HYPRE_PARCSRGMRESSETPRINTLEVEL)
 
 void
 hypre_F90_IFACE(hypre_parcsrgmresgetnumiteratio, HYPRE_PARCSRGMRESGETNUMITERATIO)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *num_iterations,
-     hypre_F90_Int *ierr            )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *num_iterations,
+  hypre_F90_Int *ierr            )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRGMRESGetNumIterations(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassIntRef (num_iterations) ) );
+           ( HYPRE_ParCSRGMRESGetNumIterations(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassIntRef (num_iterations) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -330,16 +351,16 @@ hypre_F90_IFACE(hypre_parcsrgmresgetnumiteratio, HYPRE_PARCSRGMRESGETNUMITERATIO
 
 void
 hypre_F90_IFACE(hypre_parcsrgmresgetfinalrelati, HYPRE_PARCSRGMRESGETFINALRELATI)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *norm,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *norm,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRGMRESGetFinalRelativeResidualNorm(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassRealRef (norm)    ) );
+           ( HYPRE_ParCSRGMRESGetFinalRelativeResidualNorm(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassRealRef (norm)    ) );
 }
-    
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_hybrid.c b/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_hybrid.c
index 71bff34a..e9065d4c 100644
--- a/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_hybrid.c
+++ b/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_hybrid.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -17,19 +17,19 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-    
+
 /*--------------------------------------------------------------------------
  *    HYPRE_ParCSRHybridCreate
  *--------------------------------------------------------------------------*/
 
 void
 hypre_F90_IFACE(hypre_parcsrhybridcreate, HYPRE_PARCSRHYBRIDCREATE)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_ParCSRHybridCreate(
-          hypre_F90_PassObjRef (HYPRE_Solver, solver) ));
+           (HYPRE_ParCSRHybridCreate(
+               hypre_F90_PassObjRef (HYPRE_Solver, solver) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -38,12 +38,12 @@ hypre_F90_IFACE(hypre_parcsrhybridcreate, HYPRE_PARCSRHYBRIDCREATE)
 
 void
 hypre_F90_IFACE(hypre_parcsrhybriddestroy, HYPRE_PARCSRHYBRIDDESTROY)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_ParCSRHybridDestroy(
-          hypre_F90_PassObj (HYPRE_Solver, solver) ) );
+           (HYPRE_ParCSRHybridDestroy(
+               hypre_F90_PassObj (HYPRE_Solver, solver) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -52,18 +52,18 @@ hypre_F90_IFACE(hypre_parcsrhybriddestroy, HYPRE_PARCSRHYBRIDDESTROY)
 
 void
 hypre_F90_IFACE(hypre_parcsrhybridsetup, HYPRE_PARCSRHYBRIDSETUP)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Obj *A,
-    hypre_F90_Obj *b,
-    hypre_F90_Obj *x,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Obj *A,
+ hypre_F90_Obj *b,
+ hypre_F90_Obj *x,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_ParCSRHybridSetup(
-          hypre_F90_PassObj (HYPRE_Solver, solver),
-          hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
-          hypre_F90_PassObj (HYPRE_ParVector, b),
-          hypre_F90_PassObj (HYPRE_ParVector, x)   ) );
+           (HYPRE_ParCSRHybridSetup(
+               hypre_F90_PassObj (HYPRE_Solver, solver),
+               hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
+               hypre_F90_PassObj (HYPRE_ParVector, b),
+               hypre_F90_PassObj (HYPRE_ParVector, x)   ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -72,18 +72,18 @@ hypre_F90_IFACE(hypre_parcsrhybridsetup, HYPRE_PARCSRHYBRIDSETUP)
 
 void
 hypre_F90_IFACE(hypre_parcsrhybridsolve, HYPRE_PARCSRHYBRIDSOLVE)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Obj *A,
-    hypre_F90_Obj *b,
-    hypre_F90_Obj *x,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Obj *A,
+ hypre_F90_Obj *b,
+ hypre_F90_Obj *x,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_ParCSRHybridSolve(
-          hypre_F90_PassObj (HYPRE_Solver, solver),
-          hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
-          hypre_F90_PassObj (HYPRE_ParVector, b),
-          hypre_F90_PassObj (HYPRE_ParVector, x)   ) );
+           (HYPRE_ParCSRHybridSolve(
+               hypre_F90_PassObj (HYPRE_Solver, solver),
+               hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
+               hypre_F90_PassObj (HYPRE_ParVector, b),
+               hypre_F90_PassObj (HYPRE_ParVector, x)   ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -92,14 +92,14 @@ hypre_F90_IFACE(hypre_parcsrhybridsolve, HYPRE_PARCSRHYBRIDSOLVE)
 
 void
 hypre_F90_IFACE(hypre_parcsrhybridsettol, HYPRE_PARCSRHYBRIDSETTOL)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Real *tol,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Real *tol,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_ParCSRHybridSetTol(
-          hypre_F90_PassObj (HYPRE_Solver, solver),
-          hypre_F90_PassReal (tol)    ) );
+           (HYPRE_ParCSRHybridSetTol(
+               hypre_F90_PassObj (HYPRE_Solver, solver),
+               hypre_F90_PassReal (tol)    ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -108,14 +108,14 @@ hypre_F90_IFACE(hypre_parcsrhybridsettol, HYPRE_PARCSRHYBRIDSETTOL)
 
 void
 hypre_F90_IFACE(hypre_parcsrhybridsetconvergenc, HYPRE_PARCSRHYBRIDSETCONVERGENC)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Real *cf_tol,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Real *cf_tol,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_ParCSRHybridSetConvergenceTol(
-          hypre_F90_PassObj (HYPRE_Solver, solver),
-          hypre_F90_PassReal (cf_tol) ) );
+           (HYPRE_ParCSRHybridSetConvergenceTol(
+               hypre_F90_PassObj (HYPRE_Solver, solver),
+               hypre_F90_PassReal (cf_tol) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -124,14 +124,14 @@ hypre_F90_IFACE(hypre_parcsrhybridsetconvergenc, HYPRE_PARCSRHYBRIDSETCONVERGENC
 
 void
 hypre_F90_IFACE(hypre_parcsrhybridsetdscgmaxite, HYPRE_PARCSRHYBRIDSETDSCGMAXITE)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *dscg_max_its,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *dscg_max_its,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_ParCSRHybridSetDSCGMaxIter(
-          hypre_F90_PassObj (HYPRE_Solver, solver),
-          hypre_F90_PassInt (dscg_max_its) ) );
+           (HYPRE_ParCSRHybridSetDSCGMaxIter(
+               hypre_F90_PassObj (HYPRE_Solver, solver),
+               hypre_F90_PassInt (dscg_max_its) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -140,14 +140,14 @@ hypre_F90_IFACE(hypre_parcsrhybridsetdscgmaxite, HYPRE_PARCSRHYBRIDSETDSCGMAXITE
 
 void
 hypre_F90_IFACE(hypre_parcsrhybridsetpcgmaxiter, HYPRE_PARCSRHYBRIDSETPCGMAXITER)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *pcg_max_its,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *pcg_max_its,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_ParCSRHybridSetPCGMaxIter(
-          hypre_F90_PassObj (HYPRE_Solver, solver),
-          hypre_F90_PassInt (pcg_max_its) ) );
+           (HYPRE_ParCSRHybridSetPCGMaxIter(
+               hypre_F90_PassObj (HYPRE_Solver, solver),
+               hypre_F90_PassInt (pcg_max_its) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -156,14 +156,14 @@ hypre_F90_IFACE(hypre_parcsrhybridsetpcgmaxiter, HYPRE_PARCSRHYBRIDSETPCGMAXITER
 
 void
 hypre_F90_IFACE(hypre_parcsrhybridsetsolvertype, HYPRE_PARCSRHYBRIDSETSOLVERTYPE)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *solver_type,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *solver_type,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_ParCSRHybridSetSolverType(
-          hypre_F90_PassObj (HYPRE_Solver, solver),
-          hypre_F90_PassInt (solver_type) ) );
+           (HYPRE_ParCSRHybridSetSolverType(
+               hypre_F90_PassObj (HYPRE_Solver, solver),
+               hypre_F90_PassInt (solver_type) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -172,14 +172,14 @@ hypre_F90_IFACE(hypre_parcsrhybridsetsolvertype, HYPRE_PARCSRHYBRIDSETSOLVERTYPE
 
 void
 hypre_F90_IFACE(hypre_parcsrhybridsetkdim, HYPRE_PARCSRHYBRIDSETKDIM)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *kdim,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *kdim,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_ParCSRHybridSetKDim(
-          hypre_F90_PassObj (HYPRE_Solver, solver),
-          hypre_F90_PassInt (kdim)  ) );
+           (HYPRE_ParCSRHybridSetKDim(
+               hypre_F90_PassObj (HYPRE_Solver, solver),
+               hypre_F90_PassInt (kdim)  ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -188,14 +188,14 @@ hypre_F90_IFACE(hypre_parcsrhybridsetkdim, HYPRE_PARCSRHYBRIDSETKDIM)
 
 void
 hypre_F90_IFACE(hypre_parcsrhybridsettwonorm, HYPRE_PARCSRHYBRIDSETTWONORM)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *two_norm,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *two_norm,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_ParCSRHybridSetTwoNorm(
-          hypre_F90_PassObj (HYPRE_Solver, solver),
-          hypre_F90_PassInt (two_norm)    ) );
+           (HYPRE_ParCSRHybridSetTwoNorm(
+               hypre_F90_PassObj (HYPRE_Solver, solver),
+               hypre_F90_PassInt (two_norm)    ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -204,14 +204,14 @@ hypre_F90_IFACE(hypre_parcsrhybridsettwonorm, HYPRE_PARCSRHYBRIDSETTWONORM)
 
 void
 hypre_F90_IFACE(hypre_parcsrhybridsetstopcrit, HYPRE_PARCSRHYBRIDSETSTOPCRIT)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *stop_crit,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *stop_crit,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_ParCSRHybridSetStopCrit(
-          hypre_F90_PassObj (HYPRE_Solver, solver),
-          hypre_F90_PassInt (stop_crit) ) );
+           (HYPRE_ParCSRHybridSetStopCrit(
+               hypre_F90_PassObj (HYPRE_Solver, solver),
+               hypre_F90_PassInt (stop_crit) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -220,14 +220,14 @@ hypre_F90_IFACE(hypre_parcsrhybridsetstopcrit, HYPRE_PARCSRHYBRIDSETSTOPCRIT)
 
 void
 hypre_F90_IFACE(hypre_parcsrhybridsetrelchange, HYPRE_PARCSRHYBRIDSETRELCHANGE)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *rel_change,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *rel_change,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_ParCSRHybridSetRelChange(
-          hypre_F90_PassObj (HYPRE_Solver, solver),
-          hypre_F90_PassInt (rel_change)  ) );
+           (HYPRE_ParCSRHybridSetRelChange(
+               hypre_F90_PassObj (HYPRE_Solver, solver),
+               hypre_F90_PassInt (rel_change)  ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -236,10 +236,10 @@ hypre_F90_IFACE(hypre_parcsrhybridsetrelchange, HYPRE_PARCSRHYBRIDSETRELCHANGE)
 
 void
 hypre_F90_IFACE(hypre_parcsrhybridsetprecond, HYPRE_PARCSRHYBRIDSETPRECOND)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *precond_id,
-    hypre_F90_Obj *precond_solver,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *precond_id,
+ hypre_F90_Obj *precond_solver,
+ hypre_F90_Int *ierr)
 {
    /*----------------------------------------------------------------
     * precond_id definitions
@@ -248,7 +248,11 @@ hypre_F90_IFACE(hypre_parcsrhybridsetprecond, HYPRE_PARCSRHYBRIDSETPRECOND)
     * 2 - use amg preconditioner
     * 3 - use pilut preconditioner
     * 4 - use parasails preconditioner
+    * 5 - use Euclid preconditioner
+    * 6 - use ILU preconditioner
+    * 7 - use MGR preconditioner
     *---------------------------------------------------------------*/
+
    if (*precond_id == 0)
    {
       *ierr = 0;
@@ -256,52 +260,70 @@ hypre_F90_IFACE(hypre_parcsrhybridsetprecond, HYPRE_PARCSRHYBRIDSETPRECOND)
    else if (*precond_id == 1)
    {
       *ierr = (hypre_F90_Int)
-         (HYPRE_ParCSRHybridSetPrecond(
-             hypre_F90_PassObj (HYPRE_Solver, solver),
-             HYPRE_ParCSRDiagScale,
-             HYPRE_ParCSRDiagScaleSetup,
-             NULL                      ));
+              (HYPRE_ParCSRHybridSetPrecond(
+                  hypre_F90_PassObj (HYPRE_Solver, solver),
+                  HYPRE_ParCSRDiagScale,
+                  HYPRE_ParCSRDiagScaleSetup,
+                  NULL                      ));
    }
    else if (*precond_id == 2)
    {
       *ierr = (hypre_F90_Int)
-         (HYPRE_ParCSRHybridSetPrecond(
-             hypre_F90_PassObj (HYPRE_Solver, solver),
-             HYPRE_BoomerAMGSolve,
-             HYPRE_BoomerAMGSetup,
-             (HYPRE_Solver)         *precond_solver ));
+              (HYPRE_ParCSRHybridSetPrecond(
+                  hypre_F90_PassObj (HYPRE_Solver, solver),
+                  HYPRE_BoomerAMGSolve,
+                  HYPRE_BoomerAMGSetup,
+                  (HYPRE_Solver)         * precond_solver ));
    }
    else if (*precond_id == 3)
    {
       *ierr = (hypre_F90_Int)
-         (HYPRE_ParCSRHybridSetPrecond(
-             hypre_F90_PassObj (HYPRE_Solver, solver),
-             HYPRE_ParCSRPilutSolve,
-             HYPRE_ParCSRPilutSetup,
-             (HYPRE_Solver)          *precond_solver ));
+              (HYPRE_ParCSRHybridSetPrecond(
+                  hypre_F90_PassObj (HYPRE_Solver, solver),
+                  HYPRE_ParCSRPilutSolve,
+                  HYPRE_ParCSRPilutSetup,
+                  (HYPRE_Solver)          * precond_solver ));
    }
    else if (*precond_id == 4)
    {
       *ierr = (hypre_F90_Int)
-         (HYPRE_ParCSRHybridSetPrecond(
-             hypre_F90_PassObj (HYPRE_Solver, solver),
-             HYPRE_ParCSRParaSailsSolve,
-             HYPRE_ParCSRParaSailsSetup,
-             (HYPRE_Solver)          *precond_solver ));
+              (HYPRE_ParCSRHybridSetPrecond(
+                  hypre_F90_PassObj (HYPRE_Solver, solver),
+                  HYPRE_ParCSRParaSailsSolve,
+                  HYPRE_ParCSRParaSailsSetup,
+                  (HYPRE_Solver)          * precond_solver ));
    }
    else if (*precond_id == 5)
    {
       *ierr = (hypre_F90_Int)
-         (HYPRE_ParCSRHybridSetPrecond(
-             hypre_F90_PassObj (HYPRE_Solver, solver),
-             HYPRE_EuclidSolve,
-             HYPRE_EuclidSetup,
-             (HYPRE_Solver)          *precond_solver ));
+              (HYPRE_ParCSRHybridSetPrecond(
+                  hypre_F90_PassObj (HYPRE_Solver, solver),
+                  HYPRE_EuclidSolve,
+                  HYPRE_EuclidSetup,
+                  (HYPRE_Solver)          * precond_solver ));
+   }
+   else if (*precond_id == 6)
+   {
+      *ierr = (hypre_F90_Int)
+              ( HYPRE_ParCSRHybridSetPrecond(
+                   hypre_F90_PassObj (HYPRE_Solver, solver),
+                   HYPRE_ILUSolve,
+                   HYPRE_ILUSetup,
+                   (HYPRE_Solver)       * precond_solver ) );
+   }
+   else if (*precond_id == 7)
+   {
+      *ierr = (hypre_F90_Int)
+              ( HYPRE_ParCSRHybridSetPrecond(
+                   hypre_F90_PassObj (HYPRE_Solver, solver),
+                   HYPRE_MGRSolve,
+                   HYPRE_MGRSetup,
+                   (HYPRE_Solver)       * precond_solver ) );
    }
    else
    {
       *ierr = -1;
-   }    
+   }
 }
 
 /*--------------------------------------------------------------------------
@@ -310,14 +332,14 @@ hypre_F90_IFACE(hypre_parcsrhybridsetprecond, HYPRE_PARCSRHYBRIDSETPRECOND)
 
 void
 hypre_F90_IFACE(hypre_parcsrhybridsetlogging, HYPRE_PARCSRHYBRIDSETLOGGING)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *logging,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *logging,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_ParCSRHybridSetLogging(
-          hypre_F90_PassObj (HYPRE_Solver, solver),
-          hypre_F90_PassInt (logging)  ) );
+           (HYPRE_ParCSRHybridSetLogging(
+               hypre_F90_PassObj (HYPRE_Solver, solver),
+               hypre_F90_PassInt (logging)  ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -326,14 +348,14 @@ hypre_F90_IFACE(hypre_parcsrhybridsetlogging, HYPRE_PARCSRHYBRIDSETLOGGING)
 
 void
 hypre_F90_IFACE(hypre_parcsrhybridsetprintlevel, HYPRE_PARCSRHYBRIDSETPRINTLEVEL)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *print_level,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *print_level,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_ParCSRHybridSetPrintLevel(
-          hypre_F90_PassObj (HYPRE_Solver, solver),
-          hypre_F90_PassInt (print_level)  ));
+           (HYPRE_ParCSRHybridSetPrintLevel(
+               hypre_F90_PassObj (HYPRE_Solver, solver),
+               hypre_F90_PassInt (print_level)  ));
 }
 
 /*--------------------------------------------------------------------------
@@ -342,14 +364,14 @@ hypre_F90_IFACE(hypre_parcsrhybridsetprintlevel, HYPRE_PARCSRHYBRIDSETPRINTLEVEL
 
 void
 hypre_F90_IFACE(hypre_parcsrhybridsetstrongthre, HYPRE_PARCSRHYBRIDSETSTRONGTHRE)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Real *strong_threshold,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Real *strong_threshold,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_ParCSRHybridSetStrongThreshold(
-          hypre_F90_PassObj (HYPRE_Solver, solver),
-          hypre_F90_PassReal (strong_threshold) ));
+           (HYPRE_ParCSRHybridSetStrongThreshold(
+               hypre_F90_PassObj (HYPRE_Solver, solver),
+               hypre_F90_PassReal (strong_threshold) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -358,14 +380,14 @@ hypre_F90_IFACE(hypre_parcsrhybridsetstrongthre, HYPRE_PARCSRHYBRIDSETSTRONGTHRE
 
 void
 hypre_F90_IFACE(hypre_parcsrhybridsetmaxrowsum, HYPRE_PARCSRHYBRIDSETMAXROWSUM)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Real *max_row_sum,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Real *max_row_sum,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_ParCSRHybridSetMaxRowSum(
-          hypre_F90_PassObj (HYPRE_Solver, solver),
-          hypre_F90_PassReal (max_row_sum)   ));
+           (HYPRE_ParCSRHybridSetMaxRowSum(
+               hypre_F90_PassObj (HYPRE_Solver, solver),
+               hypre_F90_PassReal (max_row_sum)   ));
 }
 
 /*--------------------------------------------------------------------------
@@ -374,14 +396,14 @@ hypre_F90_IFACE(hypre_parcsrhybridsetmaxrowsum, HYPRE_PARCSRHYBRIDSETMAXROWSUM)
 
 void
 hypre_F90_IFACE(hypre_parcsrhybridsettruncfacto, HYPRE_PARCSRHYBRIDSETTRUNCFACTO)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Real *trunc_factor,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Real *trunc_factor,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_ParCSRHybridSetTruncFactor(
-          hypre_F90_PassObj (HYPRE_Solver, solver),
-          hypre_F90_PassReal (trunc_factor) ));
+           (HYPRE_ParCSRHybridSetTruncFactor(
+               hypre_F90_PassObj (HYPRE_Solver, solver),
+               hypre_F90_PassReal (trunc_factor) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -390,14 +412,14 @@ hypre_F90_IFACE(hypre_parcsrhybridsettruncfacto, HYPRE_PARCSRHYBRIDSETTRUNCFACTO
 
 void
 hypre_F90_IFACE(hypre_parcsrhybridsetpmaxelmts, HYPRE_PARCSRHYBRIDSETPMAXELMTS)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *p_max_elmts,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *p_max_elmts,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_ParCSRHybridSetPMaxElmts(
-          hypre_F90_PassObj (HYPRE_Solver, solver),
-          hypre_F90_PassInt (p_max_elmts) ));
+           (HYPRE_ParCSRHybridSetPMaxElmts(
+               hypre_F90_PassObj (HYPRE_Solver, solver),
+               hypre_F90_PassInt (p_max_elmts) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -406,14 +428,14 @@ hypre_F90_IFACE(hypre_parcsrhybridsetpmaxelmts, HYPRE_PARCSRHYBRIDSETPMAXELMTS)
 
 void
 hypre_F90_IFACE(hypre_parcsrhybridsetmaxlevels, HYPRE_PARCSRHYBRIDSETMAXLEVELS)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *max_levels,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *max_levels,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_ParCSRHybridSetMaxLevels(
-          hypre_F90_PassObj (HYPRE_Solver, solver),
-          hypre_F90_PassInt (max_levels)  ));
+           (HYPRE_ParCSRHybridSetMaxLevels(
+               hypre_F90_PassObj (HYPRE_Solver, solver),
+               hypre_F90_PassInt (max_levels)  ));
 }
 
 /*--------------------------------------------------------------------------
@@ -422,14 +444,14 @@ hypre_F90_IFACE(hypre_parcsrhybridsetmaxlevels, HYPRE_PARCSRHYBRIDSETMAXLEVELS)
 
 void
 hypre_F90_IFACE(hypre_parcsrhybridsetmeasuretyp, HYPRE_PARCSRHYBRIDSETMEASURETYP)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *measure_type,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *measure_type,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_ParCSRHybridSetMeasureType(
-          hypre_F90_PassObj (HYPRE_Solver, solver),
-          hypre_F90_PassInt (measure_type) ));
+           (HYPRE_ParCSRHybridSetMeasureType(
+               hypre_F90_PassObj (HYPRE_Solver, solver),
+               hypre_F90_PassInt (measure_type) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -438,14 +460,14 @@ hypre_F90_IFACE(hypre_parcsrhybridsetmeasuretyp, HYPRE_PARCSRHYBRIDSETMEASURETYP
 
 void
 hypre_F90_IFACE(hypre_parcsrhybridsetcoarsentyp, HYPRE_PARCSRHYBRIDSETCOARSENTYP)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *coarsen_type,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *coarsen_type,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_ParCSRHybridSetCoarsenType(
-          hypre_F90_PassObj (HYPRE_Solver, solver),
-          hypre_F90_PassInt (coarsen_type)  ));
+           (HYPRE_ParCSRHybridSetCoarsenType(
+               hypre_F90_PassObj (HYPRE_Solver, solver),
+               hypre_F90_PassInt (coarsen_type)  ));
 }
 
 /*--------------------------------------------------------------------------
@@ -454,14 +476,14 @@ hypre_F90_IFACE(hypre_parcsrhybridsetcoarsentyp, HYPRE_PARCSRHYBRIDSETCOARSENTYP
 
 void
 hypre_F90_IFACE(hypre_parcsrhybridsetinterptyp, HYPRE_PARCSRHYBRIDSETINTERPTYP)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *interp_type,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *interp_type,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_ParCSRHybridSetCoarsenType(
-          hypre_F90_PassObj (HYPRE_Solver, solver),
-          hypre_F90_PassInt (interp_type)  ));
+           (HYPRE_ParCSRHybridSetCoarsenType(
+               hypre_F90_PassObj (HYPRE_Solver, solver),
+               hypre_F90_PassInt (interp_type)  ));
 }
 
 /*--------------------------------------------------------------------------
@@ -470,14 +492,14 @@ hypre_F90_IFACE(hypre_parcsrhybridsetinterptyp, HYPRE_PARCSRHYBRIDSETINTERPTYP)
 
 void
 hypre_F90_IFACE(hypre_parcsrhybridsetcycletype, HYPRE_PARCSRHYBRIDSETCYCLETYPE)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *cycle_type,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *cycle_type,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_ParCSRHybridSetCycleType(
-          hypre_F90_PassObj (HYPRE_Solver, solver),
-          hypre_F90_PassInt (cycle_type) ));
+           (HYPRE_ParCSRHybridSetCycleType(
+               hypre_F90_PassObj (HYPRE_Solver, solver),
+               hypre_F90_PassInt (cycle_type) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -486,14 +508,14 @@ hypre_F90_IFACE(hypre_parcsrhybridsetcycletype, HYPRE_PARCSRHYBRIDSETCYCLETYPE)
 
 void
 hypre_F90_IFACE(hypre_parcsrhybridsetnumgridswe, HYPRE_PARCSRHYBRIDSETNUMGRIDSWE)
-   (hypre_F90_Obj *solver,
-    hypre_F90_IntArray *num_grid_sweeps,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_IntArray *num_grid_sweeps,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_ParCSRHybridSetNumGridSweeps(
-          hypre_F90_PassObj (HYPRE_Solver, solver),
-          hypre_F90_PassIntArray (num_grid_sweeps) ));
+           (HYPRE_ParCSRHybridSetNumGridSweeps(
+               hypre_F90_PassObj (HYPRE_Solver, solver),
+               hypre_F90_PassIntArray (num_grid_sweeps) ));
 }
 
 /*------------------------------------------------------------------------
@@ -502,14 +524,14 @@ hypre_F90_IFACE(hypre_parcsrhybridsetnumgridswe, HYPRE_PARCSRHYBRIDSETNUMGRIDSWE
 
 void
 hypre_F90_IFACE(hypre_parcsrhybridsetgridrelaxt, HYPRE_PARCSRHYBRIDSETGRIDRELAXT)
-   (hypre_F90_Obj *solver,
-    hypre_F90_IntArray *grid_relax_type,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_IntArray *grid_relax_type,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_ParCSRHybridSetGridRelaxType(
-          hypre_F90_PassObj (HYPRE_Solver, solver),
-          hypre_F90_PassIntArray (grid_relax_type) ));
+           (HYPRE_ParCSRHybridSetGridRelaxType(
+               hypre_F90_PassObj (HYPRE_Solver, solver),
+               hypre_F90_PassIntArray (grid_relax_type) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -518,14 +540,14 @@ hypre_F90_IFACE(hypre_parcsrhybridsetgridrelaxt, HYPRE_PARCSRHYBRIDSETGRIDRELAXT
 
 void
 hypre_F90_IFACE(hypre_parcsrhybridsetgridrelaxp, HYPRE_PARCSRHYBRIDSETGRIDRELAXP)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *grid_relax_points,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *grid_relax_points,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_ParCSRHybridSetGridRelaxPoints(
-          hypre_F90_PassObj (HYPRE_Solver, solver),
-          (HYPRE_Int **)        grid_relax_points  ));
+           (HYPRE_ParCSRHybridSetGridRelaxPoints(
+               hypre_F90_PassObj (HYPRE_Solver, solver),
+               (HYPRE_Int **)        grid_relax_points  ));
 }
 
 /*--------------------------------------------------------------------------
@@ -534,14 +556,14 @@ hypre_F90_IFACE(hypre_parcsrhybridsetgridrelaxp, HYPRE_PARCSRHYBRIDSETGRIDRELAXP
 
 void
 hypre_F90_IFACE(hypre_parcsrhybridsetnumsweeps, HYPRE_PARCSRHYBRIDSETNUMSWEEPS)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *num_sweeps,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *num_sweeps,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_ParCSRHybridSetNumSweeps(
-          hypre_F90_PassObj (HYPRE_Solver, solver),
-          hypre_F90_PassInt (num_sweeps)  ));
+           (HYPRE_ParCSRHybridSetNumSweeps(
+               hypre_F90_PassObj (HYPRE_Solver, solver),
+               hypre_F90_PassInt (num_sweeps)  ));
 }
 
 /*--------------------------------------------------------------------------
@@ -550,16 +572,16 @@ hypre_F90_IFACE(hypre_parcsrhybridsetnumsweeps, HYPRE_PARCSRHYBRIDSETNUMSWEEPS)
 
 void
 hypre_F90_IFACE(hypre_parcsrhybridsetcyclenumsw, HYPRE_PARCSRHYBRIDSETCYCLENUMSW)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *num_sweeps,
-    hypre_F90_Int *k,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *num_sweeps,
+ hypre_F90_Int *k,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_ParCSRHybridSetCycleNumSweeps(
-          hypre_F90_PassObj (HYPRE_Solver, solver),
-          hypre_F90_PassInt (num_sweeps),
-          hypre_F90_PassInt (k) ));
+           (HYPRE_ParCSRHybridSetCycleNumSweeps(
+               hypre_F90_PassObj (HYPRE_Solver, solver),
+               hypre_F90_PassInt (num_sweeps),
+               hypre_F90_PassInt (k) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -568,14 +590,14 @@ hypre_F90_IFACE(hypre_parcsrhybridsetcyclenumsw, HYPRE_PARCSRHYBRIDSETCYCLENUMSW
 
 void
 hypre_F90_IFACE(hypre_parcsrhybridsetrelaxtype, HYPRE_PARCSRHYBRIDSETRELAXTYPE)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *relax_type,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *relax_type,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_ParCSRHybridSetRelaxType(
-          hypre_F90_PassObj (HYPRE_Solver, solver),
-          hypre_F90_PassInt (relax_type) ));
+           (HYPRE_ParCSRHybridSetRelaxType(
+               hypre_F90_PassObj (HYPRE_Solver, solver),
+               hypre_F90_PassInt (relax_type) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -584,16 +606,16 @@ hypre_F90_IFACE(hypre_parcsrhybridsetrelaxtype, HYPRE_PARCSRHYBRIDSETRELAXTYPE)
 
 void
 hypre_F90_IFACE(hypre_parcsrhybridsetcyclerelax, HYPRE_PARCSRHYBRIDSETCYCLERELAX)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *relax_type,
-    hypre_F90_Int *k,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *relax_type,
+ hypre_F90_Int *k,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_ParCSRHybridSetCycleRelaxType(
-          hypre_F90_PassObj (HYPRE_Solver, solver),
-          hypre_F90_PassInt (relax_type),
-          hypre_F90_PassInt (k) ));
+           (HYPRE_ParCSRHybridSetCycleRelaxType(
+               hypre_F90_PassObj (HYPRE_Solver, solver),
+               hypre_F90_PassInt (relax_type),
+               hypre_F90_PassInt (k) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -602,14 +624,14 @@ hypre_F90_IFACE(hypre_parcsrhybridsetcyclerelax, HYPRE_PARCSRHYBRIDSETCYCLERELAX
 
 void
 hypre_F90_IFACE(hypre_parcsrhybridsetaggnumlev, HYPRE_PARCSRHYBRIDSETAGGNUMLEV)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *agg_nl,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *agg_nl,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_ParCSRHybridSetAggNumLevels(
-          hypre_F90_PassObj (HYPRE_Solver, solver),
-          hypre_F90_PassInt (agg_nl) ));
+           (HYPRE_ParCSRHybridSetAggNumLevels(
+               hypre_F90_PassObj (HYPRE_Solver, solver),
+               hypre_F90_PassInt (agg_nl) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -618,14 +640,14 @@ hypre_F90_IFACE(hypre_parcsrhybridsetaggnumlev, HYPRE_PARCSRHYBRIDSETAGGNUMLEV)
 
 void
 hypre_F90_IFACE(hypre_parcsrhybridsetnumpaths, HYPRE_PARCSRHYBRIDSETNUMPATHS)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *num_paths,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *num_paths,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_ParCSRHybridSetNumPaths(
-          hypre_F90_PassObj (HYPRE_Solver, solver),
-          hypre_F90_PassInt (num_paths) ));
+           (HYPRE_ParCSRHybridSetNumPaths(
+               hypre_F90_PassObj (HYPRE_Solver, solver),
+               hypre_F90_PassInt (num_paths) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -634,14 +656,14 @@ hypre_F90_IFACE(hypre_parcsrhybridsetnumpaths, HYPRE_PARCSRHYBRIDSETNUMPATHS)
 
 void
 hypre_F90_IFACE(hypre_parcsrhybridsetnumfunc, HYPRE_PARCSRHYBRIDSETNUMFUNC)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *num_fun,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *num_fun,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_ParCSRHybridSetNumFunctions(
-          hypre_F90_PassObj (HYPRE_Solver, solver),
-          hypre_F90_PassInt (num_fun) ));
+           (HYPRE_ParCSRHybridSetNumFunctions(
+               hypre_F90_PassObj (HYPRE_Solver, solver),
+               hypre_F90_PassInt (num_fun) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -650,14 +672,14 @@ hypre_F90_IFACE(hypre_parcsrhybridsetnumfunc, HYPRE_PARCSRHYBRIDSETNUMFUNC)
 
 void
 hypre_F90_IFACE(hypre_parcsrhybridsetnodal, HYPRE_PARCSRHYBRIDSETNODAL)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *nodal,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *nodal,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_ParCSRHybridSetNodal(
-          hypre_F90_PassObj (HYPRE_Solver, solver),
-          hypre_F90_PassInt (nodal) ));
+           (HYPRE_ParCSRHybridSetNodal(
+               hypre_F90_PassObj (HYPRE_Solver, solver),
+               hypre_F90_PassInt (nodal) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -666,14 +688,14 @@ hypre_F90_IFACE(hypre_parcsrhybridsetnodal, HYPRE_PARCSRHYBRIDSETNODAL)
 
 void
 hypre_F90_IFACE(hypre_parcsrhybridsetkeeptrans, HYPRE_PARCSRHYBRIDSETKEEPTRANS)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *keepT,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *keepT,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_ParCSRHybridSetKeepTranspose(
-          hypre_F90_PassObj (HYPRE_Solver, solver),
-          hypre_F90_PassInt (keepT) ));
+           (HYPRE_ParCSRHybridSetKeepTranspose(
+               hypre_F90_PassObj (HYPRE_Solver, solver),
+               hypre_F90_PassInt (keepT) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -682,14 +704,14 @@ hypre_F90_IFACE(hypre_parcsrhybridsetkeeptrans, HYPRE_PARCSRHYBRIDSETKEEPTRANS)
 
 void
 hypre_F90_IFACE(hypre_parcsrhybridsetdoffunc, HYPRE_PARCSRHYBRIDSETDOFFUNC)
-   (hypre_F90_Obj *solver,
-    hypre_F90_IntArray *dof_func,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_IntArray *dof_func,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_ParCSRHybridSetDofFunc(
-          hypre_F90_PassObj (HYPRE_Solver, solver),
-          hypre_F90_PassIntArray (dof_func) ));
+           (HYPRE_ParCSRHybridSetDofFunc(
+               hypre_F90_PassObj (HYPRE_Solver, solver),
+               hypre_F90_PassIntArray (dof_func) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -698,16 +720,16 @@ hypre_F90_IFACE(hypre_parcsrhybridsetdoffunc, HYPRE_PARCSRHYBRIDSETDOFFUNC)
 
 void
 hypre_F90_IFACE(hypre_parcsrhybridsetnongaltol, HYPRE_PARCSRHYBRIDSETNONGALTOL)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *ng_num_tol,
-    hypre_F90_RealArray *nongal_tol,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *ng_num_tol,
+ hypre_F90_RealArray *nongal_tol,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_ParCSRHybridSetNonGalerkinTol(
-          hypre_F90_PassObj (HYPRE_Solver, solver),
-          hypre_F90_PassInt (ng_num_tol),
-          hypre_F90_PassRealArray (nongal_tol) ));
+           (HYPRE_ParCSRHybridSetNonGalerkinTol(
+               hypre_F90_PassObj (HYPRE_Solver, solver),
+               hypre_F90_PassInt (ng_num_tol),
+               hypre_F90_PassRealArray (nongal_tol) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -716,14 +738,14 @@ hypre_F90_IFACE(hypre_parcsrhybridsetnongaltol, HYPRE_PARCSRHYBRIDSETNONGALTOL)
 
 void
 hypre_F90_IFACE(hypre_parcsrhybridsetrelaxorder, HYPRE_PARCSRHYBRIDSETRELAXORDER)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *relax_order,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *relax_order,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_ParCSRHybridSetRelaxOrder(
-          hypre_F90_PassObj (HYPRE_Solver, solver),
-          hypre_F90_PassInt (relax_order) ));
+           (HYPRE_ParCSRHybridSetRelaxOrder(
+               hypre_F90_PassObj (HYPRE_Solver, solver),
+               hypre_F90_PassInt (relax_order) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -732,14 +754,14 @@ hypre_F90_IFACE(hypre_parcsrhybridsetrelaxorder, HYPRE_PARCSRHYBRIDSETRELAXORDER
 
 void
 hypre_F90_IFACE(hypre_parcsrhybridsetrelaxwt, HYPRE_PARCSRHYBRIDSETRELAXWT)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Real *relax_wt,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Real *relax_wt,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_ParCSRHybridSetRelaxWt(
-          hypre_F90_PassObj (HYPRE_Solver, solver),
-          hypre_F90_PassReal (relax_wt) ));
+           (HYPRE_ParCSRHybridSetRelaxWt(
+               hypre_F90_PassObj (HYPRE_Solver, solver),
+               hypre_F90_PassReal (relax_wt) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -748,16 +770,16 @@ hypre_F90_IFACE(hypre_parcsrhybridsetrelaxwt, HYPRE_PARCSRHYBRIDSETRELAXWT)
 
 void
 hypre_F90_IFACE(hypre_parcsrhybridsetlevelrelax, HYPRE_PARCSRHYBRIDSETLEVELRELAX)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Real *relax_wt,
-    hypre_F90_Int *level,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Real *relax_wt,
+ hypre_F90_Int *level,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_ParCSRHybridSetLevelRelaxWt(
-          hypre_F90_PassObj (HYPRE_Solver, solver),
-          hypre_F90_PassReal (relax_wt),
-          hypre_F90_PassInt (level) ));
+           (HYPRE_ParCSRHybridSetLevelRelaxWt(
+               hypre_F90_PassObj (HYPRE_Solver, solver),
+               hypre_F90_PassReal (relax_wt),
+               hypre_F90_PassInt (level) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -766,14 +788,14 @@ hypre_F90_IFACE(hypre_parcsrhybridsetlevelrelax, HYPRE_PARCSRHYBRIDSETLEVELRELAX
 
 void
 hypre_F90_IFACE(hypre_parcsrhybridsetouterwt, HYPRE_PARCSRHYBRIDSETOUTERWT)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Real *outer_wt,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Real *outer_wt,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_ParCSRHybridSetOuterWt(
-          hypre_F90_PassObj (HYPRE_Solver, solver),
-          hypre_F90_PassReal (outer_wt) ));
+           (HYPRE_ParCSRHybridSetOuterWt(
+               hypre_F90_PassObj (HYPRE_Solver, solver),
+               hypre_F90_PassReal (outer_wt) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -782,16 +804,16 @@ hypre_F90_IFACE(hypre_parcsrhybridsetouterwt, HYPRE_PARCSRHYBRIDSETOUTERWT)
 
 void
 hypre_F90_IFACE(hypre_parcsrhybridsetlevelouter, HYPRE_PARCSRHYBRIDSETLEVELOUTER)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Real *outer_wt,
-    hypre_F90_Int *level,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Real *outer_wt,
+ hypre_F90_Int *level,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_ParCSRHybridSetLevelOuterWt(
-          hypre_F90_PassObj (HYPRE_Solver, solver),
-          hypre_F90_PassReal (outer_wt),
-          hypre_F90_PassInt (level) ));
+           (HYPRE_ParCSRHybridSetLevelOuterWt(
+               hypre_F90_PassObj (HYPRE_Solver, solver),
+               hypre_F90_PassReal (outer_wt),
+               hypre_F90_PassInt (level) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -800,14 +822,14 @@ hypre_F90_IFACE(hypre_parcsrhybridsetlevelouter, HYPRE_PARCSRHYBRIDSETLEVELOUTER
 
 void
 hypre_F90_IFACE(hypre_parcsrhybridsetrelaxweigh, HYPRE_PARCSRHYBRIDSETRELAXWEIGH)
-   (hypre_F90_Obj *solver,
-    hypre_F90_RealArray *relax_weight,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_RealArray *relax_weight,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_ParCSRHybridSetRelaxWeight(
-          hypre_F90_PassObj (HYPRE_Solver, solver),
-          hypre_F90_PassRealArray (relax_weight) ));
+           (HYPRE_ParCSRHybridSetRelaxWeight(
+               hypre_F90_PassObj (HYPRE_Solver, solver),
+               hypre_F90_PassRealArray (relax_weight) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -816,14 +838,14 @@ hypre_F90_IFACE(hypre_parcsrhybridsetrelaxweigh, HYPRE_PARCSRHYBRIDSETRELAXWEIGH
 
 void
 hypre_F90_IFACE(hypre_parcsrhybridsetomega, HYPRE_PARCSRHYBRIDSETOMEGA)
-   (hypre_F90_Obj *solver,
-    hypre_F90_RealArray *omega,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_RealArray *omega,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_ParCSRHybridSetOmega(
-          hypre_F90_PassObj (HYPRE_Solver, solver),
-          hypre_F90_PassRealArray (omega) ));
+           (HYPRE_ParCSRHybridSetOmega(
+               hypre_F90_PassObj (HYPRE_Solver, solver),
+               hypre_F90_PassRealArray (omega) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -832,14 +854,14 @@ hypre_F90_IFACE(hypre_parcsrhybridsetomega, HYPRE_PARCSRHYBRIDSETOMEGA)
 
 void
 hypre_F90_IFACE(hypre_parcsrhybridgetnumiterati, HYPRE_PARCSRHYBRIDGETNUMITERATI)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *num_its,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *num_its,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_ParCSRHybridGetNumIterations(
-          hypre_F90_PassObj (HYPRE_Solver, solver),
-          hypre_F90_PassIntRef (num_its) ));
+           (HYPRE_ParCSRHybridGetNumIterations(
+               hypre_F90_PassObj (HYPRE_Solver, solver),
+               hypre_F90_PassIntRef (num_its) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -848,14 +870,14 @@ hypre_F90_IFACE(hypre_parcsrhybridgetnumiterati, HYPRE_PARCSRHYBRIDGETNUMITERATI
 
 void
 hypre_F90_IFACE(hypre_parcsrhybridgetdscgnumite, HYPRE_PARCSRHYBRIDGETDSCGNUMITE)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *dscg_num_its,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *dscg_num_its,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_ParCSRHybridGetDSCGNumIterations(
-          hypre_F90_PassObj (HYPRE_Solver, solver),
-          hypre_F90_PassIntRef (dscg_num_its) ));
+           (HYPRE_ParCSRHybridGetDSCGNumIterations(
+               hypre_F90_PassObj (HYPRE_Solver, solver),
+               hypre_F90_PassIntRef (dscg_num_its) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -864,14 +886,14 @@ hypre_F90_IFACE(hypre_parcsrhybridgetdscgnumite, HYPRE_PARCSRHYBRIDGETDSCGNUMITE
 
 void
 hypre_F90_IFACE(hypre_parcsrhybridgetpcgnumiter, HYPRE_PARCSRHYBRIDGETPCGNUMITER)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *pcg_num_its,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *pcg_num_its,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_ParCSRHybridGetPCGNumIterations(
-          hypre_F90_PassObj (HYPRE_Solver, solver),
-          hypre_F90_PassIntRef (pcg_num_its) ));
+           (HYPRE_ParCSRHybridGetPCGNumIterations(
+               hypre_F90_PassObj (HYPRE_Solver, solver),
+               hypre_F90_PassIntRef (pcg_num_its) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -880,16 +902,16 @@ hypre_F90_IFACE(hypre_parcsrhybridgetpcgnumiter, HYPRE_PARCSRHYBRIDGETPCGNUMITER
 
 void
 hypre_F90_IFACE(hypre_parcsrhybridgetfinalrelat, HYPRE_PARCSRHYBRIDGETFINALRELAT)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Real *norm,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Real *norm,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_ParCSRHybridGetFinalRelativeResidualNorm(
-          hypre_F90_PassObj (HYPRE_Solver, solver),
-          hypre_F90_PassRealRef (norm) ));
+           (HYPRE_ParCSRHybridGetFinalRelativeResidualNorm(
+               hypre_F90_PassObj (HYPRE_Solver, solver),
+               hypre_F90_PassRealRef (norm) ));
 }
-    
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_ilu.c b/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_ilu.c
new file mode 100644
index 00000000..381d513e
--- /dev/null
+++ b/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_ilu.c
@@ -0,0 +1,316 @@
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ * HYPRE_ILU Fortran interface
+ *
+ *****************************************************************************/
+
+#include "_hypre_parcsr_ls.h"
+#include "fortran.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*--------------------------------------------------------------------------
+ * HYPRE_ILUCreate
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_ilucreate, HYPRE_ILUCREATE)
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *ierr )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_ILUCreate(
+                hypre_F90_PassObjRef (HYPRE_Solver, solver) ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_ILUDestroy
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_iludestroy, HYPRE_ILUDESTROY)
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *ierr )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_ILUDestroy(
+                hypre_F90_PassObj (HYPRE_Solver, solver) ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_ILUSetup
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_ilusetup, HYPRE_ILUSETUP)
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *A,
+  hypre_F90_Obj *b,
+  hypre_F90_Obj *x,
+  hypre_F90_Int *ierr )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_ILUSetup(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
+                hypre_F90_PassObj (HYPRE_ParVector, b),
+                hypre_F90_PassObj (HYPRE_ParVector, x)       ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_ILUSolve
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_ilusolve, HYPRE_ILUSOLVE)
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *A,
+  hypre_F90_Obj *b,
+  hypre_F90_Obj *x,
+  hypre_F90_Int *ierr )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_ILUSolve(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
+                hypre_F90_PassObj (HYPRE_ParVector, b),
+                hypre_F90_PassObj (HYPRE_ParVector, x)       ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_ILUSetPrintLevel
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_ilusetprintlevel, HYPRE_ILUSETPRINTLEVEL)
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *print_level,
+  hypre_F90_Int *ierr )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_ILUSetPrintLevel(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (print_level) ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_ILUSetLogging
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_ilusetlogging, HYPRE_ILUSETLOGGING)
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *logging,
+  hypre_F90_Int *ierr )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_ILUSetLogging(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (logging) ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_ILUSetMaxIter
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_ilusetmaxiter, HYPRE_ILUSETMAXITER)
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *max_iter,
+  hypre_F90_Int *ierr )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_ILUSetMaxIter(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (max_iter) ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_ILUSetTol
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_ilusettol, HYPRE_ILUSETTOL)
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *tol,
+  hypre_F90_Int *ierr )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_ILUSetTol(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassReal (tol)     ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_ILUSetDropThreshold
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_ilusetdropthreshold, HYPRE_ILUSETDROPTHRESHOLD)
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *threshold,
+  hypre_F90_Int *ierr )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_ILUSetDropThreshold(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassReal (threshold)     ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_ILUSetDropThresholdArray
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_ilusetdropthresholdarray, HYPRE_ILUSETDROPTHRESHOLDARRAY)
+( hypre_F90_Obj *solver,
+  hypre_F90_RealArray *threshold,
+  hypre_F90_Int *ierr )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_ILUSetDropThresholdArray(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassRealArray (threshold)     ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_ILUSetNSHDropThreshold
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_ilusetnshdropthreshold, HYPRE_ILUSETNSHDROPTHRESHOLD)
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *threshold,
+  hypre_F90_Int *ierr )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_ILUSetNSHDropThreshold(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassReal (threshold)     ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_ILUSetSchurMaxIter
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_ilusetschurmaxiter, HYPRE_ILUSETSCHURMAXITER)
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *ss_max_iter,
+  hypre_F90_Int *ierr )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_ILUSetMaxIter(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (ss_max_iter) ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_ILUSetMaxNnzPerRow
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_ilusetmaxnnzperrow, HYPRE_ILUSETMAXNNZPERROW)
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *nzmax,
+  hypre_F90_Int *ierr )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_ILUSetMaxNnzPerRow(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (nzmax) ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_ILUSetLevelOfFill
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_ilusetleveloffill, HYPRE_ILUSETLEVELOFFILL)
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *lfil,
+  hypre_F90_Int *ierr )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_ILUSetMaxNnzPerRow(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (lfil) ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_ILUSetType
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_ilusettype, HYPRE_ILUSETTYPE)
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *ilu_type,
+  hypre_F90_Int *ierr )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_ILUSetType(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (ilu_type) ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_ILUSetLocalReordering
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_ilusetlocalreordering, HYPRE_ILUSETLOCALREORDERING)
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *ordering_type,
+  hypre_F90_Int *ierr )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_ILUSetType(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (ordering_type) ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_ILUGetNumIterations
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_ilugetnumiterations, HYPRE_ILUGETNUMITERATIONS)
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *num_iterations,
+  hypre_F90_Int *ierr )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_ILUGetNumIterations(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassIntRef (num_iterations) ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_ILUGetFinalRelResNorm
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_ilugetfinalrelresnorm, HYPRE_ILUGETFINALRELRESNORM)
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *res_norm,
+  hypre_F90_Int *ierr )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_ILUGetFinalRelativeResidualNorm(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassRealRef (res_norm) ) );
+}
+
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_int.c b/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_int.c
index b5e510d6..ca76ca2f 100644
--- a/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_int.c
+++ b/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_int.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -17,7 +17,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-    
+
 HYPRE_Int hypre_ParVectorSize( void *x );
 HYPRE_Int aux_maskCount( HYPRE_Int n, hypre_F90_Int *mask );
 void aux_indexFromMask( HYPRE_Int n, hypre_F90_Int *mask, hypre_F90_Int *index );
@@ -28,14 +28,14 @@ void aux_indexFromMask( HYPRE_Int n, hypre_F90_Int *mask, hypre_F90_Int *index )
 
 void
 hypre_F90_IFACE(hypre_parsetrandomvalues, HYPRE_PARSETRANDOMVALUES)
-   (hypre_F90_Obj *v,
-    hypre_F90_Int *seed,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *v,
+ hypre_F90_Int *seed,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParVectorSetRandomValues(
-           hypre_F90_PassObj (HYPRE_ParVector, v),
-           hypre_F90_PassInt (seed)));
+           ( HYPRE_ParVectorSetRandomValues(
+                hypre_F90_PassObj (HYPRE_ParVector, v),
+                hypre_F90_PassInt (seed)));
 }
 
 /*--------------------------------------------------------------------------
@@ -44,14 +44,14 @@ hypre_F90_IFACE(hypre_parsetrandomvalues, HYPRE_PARSETRANDOMVALUES)
 
 void
 hypre_F90_IFACE(hypre_parprintvector, HYPRE_PARPRINTVECTOR)
-   (hypre_F90_Obj *v,
-    char *file,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *v,
+ char *file,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( hypre_ParVectorPrint(
-           (hypre_ParVector *) v,
-           (char *)            file));
+           ( hypre_ParVectorPrint(
+                (hypre_ParVector *) v,
+                (char *)            file));
 }
 
 /*--------------------------------------------------------------------------
@@ -60,15 +60,15 @@ hypre_F90_IFACE(hypre_parprintvector, HYPRE_PARPRINTVECTOR)
 
 void
 hypre_F90_IFACE(hypre_parreadvector, HYPRE_PARREADVECTOR)
-   (hypre_F90_Comm *comm,
-    char *file,
-    hypre_F90_Int *ierr)
+(hypre_F90_Comm *comm,
+ char *file,
+ hypre_F90_Int *ierr)
 {
    *ierr = 0;
 
    hypre_ParReadVector(
-               hypre_F90_PassComm (comm),
-               (char *) file );
+      hypre_F90_PassComm (comm),
+      (char *) file );
 }
 
 /*--------------------------------------------------------------------------
@@ -77,12 +77,12 @@ hypre_F90_IFACE(hypre_parreadvector, HYPRE_PARREADVECTOR)
 
 void
 hypre_F90_IFACE(hypre_parvectorsize, HYPRE_PARVECTORSIZE)
-   (hypre_F90_Obj *x,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *x,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( hypre_ParVectorSize(
-           (void *) x) );
+           ( hypre_ParVectorSize(
+                (void *) x) );
 }
 
 /*--------------------------------------------------------------------------
@@ -91,14 +91,14 @@ hypre_F90_IFACE(hypre_parvectorsize, HYPRE_PARVECTORSIZE)
 
 void
 hypre_F90_IFACE(hypre_parcsrmultivectorprint, HYPRE_PARCSRMULTIVECTORPRINT)
-   (hypre_F90_Obj *x,
-    char *file,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *x,
+ char *file,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRMultiVectorPrint(
-           (void *)       x, 
-           (char *) file));
+           ( HYPRE_ParCSRMultiVectorPrint(
+                (void *)       x,
+                (char *) file));
 }
 
 /*--------------------------------------------------------------------------
@@ -107,10 +107,10 @@ hypre_F90_IFACE(hypre_parcsrmultivectorprint, HYPRE_PARCSRMULTIVECTORPRINT)
 
 void
 hypre_F90_IFACE(hypre_parcsrmultivectorread, HYPRE_PARCSRMULTIVECTORREAD)
-   (hypre_F90_Comm *comm,
-    hypre_F90_Obj *ii,
-    char *file,
-    hypre_F90_Int *ierr)
+(hypre_F90_Comm *comm,
+ hypre_F90_Obj *ii,
+ char *file,
+ hypre_F90_Int *ierr)
 {
    *ierr = 0;
 
@@ -126,12 +126,12 @@ hypre_F90_IFACE(hypre_parcsrmultivectorread, HYPRE_PARCSRMULTIVECTORREAD)
 
 void
 hypre_F90_IFACE(hypre_tempparcsrsetupinterprete, HYPRE_TEMPPARCSRSETUPINTERPRETE)
-   (hypre_F90_Obj *i,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *i,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_TempParCSRSetupInterpreter(
-           (mv_InterfaceInterpreter *) i ));
+           ( HYPRE_TempParCSRSetupInterpreter(
+                (mv_InterfaceInterpreter *) i ));
 }
 
 /*--------------------------------------------------------------------------
@@ -140,12 +140,12 @@ hypre_F90_IFACE(hypre_tempparcsrsetupinterprete, HYPRE_TEMPPARCSRSETUPINTERPRETE
 
 void
 hypre_F90_IFACE(hypre_parcsrsetupinterpreter, HYPRE_PARCSRSETUPINTERPRETER)
-   (hypre_F90_Obj *i,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *i,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRSetupInterpreter(
-           (mv_InterfaceInterpreter *) i ));
+           ( HYPRE_ParCSRSetupInterpreter(
+                (mv_InterfaceInterpreter *) i ));
 }
 
 /*--------------------------------------------------------------------------
@@ -154,12 +154,12 @@ hypre_F90_IFACE(hypre_parcsrsetupinterpreter, HYPRE_PARCSRSETUPINTERPRETER)
 
 void
 hypre_F90_IFACE(hypre_parcsrsetupmatvec, HYPRE_PARCSRSETUPMATVEC)
-   (hypre_F90_Obj *mv,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *mv,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRSetupMatvec(
-           hypre_F90_PassObjRef (HYPRE_MatvecFunctions, mv)));
+           ( HYPRE_ParCSRSetupMatvec(
+                hypre_F90_PassObjRef (HYPRE_MatvecFunctions, mv)));
 }
 #ifdef __cplusplus
 }
diff --git a/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_lgmres.c b/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_lgmres.c
index 661bcaf0..18f4488c 100644
--- a/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_lgmres.c
+++ b/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_lgmres.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -17,75 +17,75 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-    
+
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRLGMRESCreate
  *--------------------------------------------------------------------------*/
 
 void
 hypre_F90_IFACE(hypre_parcsrlgmrescreate, HYPRE_PARCSRLGMRESCREATE)
-   ( hypre_F90_Comm *comm,
-     hypre_F90_Obj *solver,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Comm *comm,
+  hypre_F90_Obj *solver,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRLGMRESCreate(
-           hypre_F90_PassComm (comm),
-           hypre_F90_PassObjRef (HYPRE_Solver, solver) ) );
+           ( HYPRE_ParCSRLGMRESCreate(
+                hypre_F90_PassComm (comm),
+                hypre_F90_PassObjRef (HYPRE_Solver, solver) ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRLGMRESDestroy
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_parcsrlgmresdestroy, HYPRE_PARCSRLGMRESDESTROY)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRLGMRESDestroy(
-           hypre_F90_PassObj (HYPRE_Solver, solver) ) );
+           ( HYPRE_ParCSRLGMRESDestroy(
+                hypre_F90_PassObj (HYPRE_Solver, solver) ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRLGMRESSetup
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_parcsrlgmressetup, HYPRE_PARCSRLGMRESSETUP)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *A,
-     hypre_F90_Obj *b,
-     hypre_F90_Obj *x,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *A,
+  hypre_F90_Obj *b,
+  hypre_F90_Obj *x,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRLGMRESSetup(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
-           hypre_F90_PassObj (HYPRE_ParVector, b),
-           hypre_F90_PassObj (HYPRE_ParVector, x)       ) );
+           ( HYPRE_ParCSRLGMRESSetup(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
+                hypre_F90_PassObj (HYPRE_ParVector, b),
+                hypre_F90_PassObj (HYPRE_ParVector, x)       ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRLGMRESSolve
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_parcsrlgmressolve, HYPRE_PARCSRLGMRESSOLVE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *A,
-     hypre_F90_Obj *b,
-     hypre_F90_Obj *x,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *A,
+  hypre_F90_Obj *b,
+  hypre_F90_Obj *x,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRLGMRESSolve(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
-           hypre_F90_PassObj (HYPRE_ParVector, b),
-           hypre_F90_PassObj (HYPRE_ParVector, x)       ) );
+           ( HYPRE_ParCSRLGMRESSolve(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
+                hypre_F90_PassObj (HYPRE_ParVector, b),
+                hypre_F90_PassObj (HYPRE_ParVector, x)       ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -94,14 +94,14 @@ hypre_F90_IFACE(hypre_parcsrlgmressolve, HYPRE_PARCSRLGMRESSOLVE)
 
 void
 hypre_F90_IFACE(hypre_parcsrlgmressetkdim, HYPRE_PARCSRLGMRESSETKDIM)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *kdim,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *kdim,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRLGMRESSetKDim(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (kdim)    ) );
+           ( HYPRE_ParCSRLGMRESSetKDim(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (kdim)    ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -110,14 +110,14 @@ hypre_F90_IFACE(hypre_parcsrlgmressetkdim, HYPRE_PARCSRLGMRESSETKDIM)
 
 void
 hypre_F90_IFACE(hypre_parcsrlgmressettol, HYPRE_PARCSRLGMRESSETTOL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *tol,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *tol,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRLGMRESSetTol(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassReal (tol)     ) );
+           ( HYPRE_ParCSRLGMRESSetTol(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassReal (tol)     ) );
 }
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRLGMRESSetAbsoluteTol
@@ -125,14 +125,14 @@ hypre_F90_IFACE(hypre_parcsrlgmressettol, HYPRE_PARCSRLGMRESSETTOL)
 
 void
 hypre_F90_IFACE(hypre_parcsrlgmressetabsolutetol, HYPRE_PARCSRLGMRESSETABSOLUTETOL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *tol,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *tol,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRLGMRESSetAbsoluteTol(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassReal (tol)     ) );
+           ( HYPRE_ParCSRLGMRESSetAbsoluteTol(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassReal (tol)     ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -141,14 +141,14 @@ hypre_F90_IFACE(hypre_parcsrlgmressetabsolutetol, HYPRE_PARCSRLGMRESSETABSOLUTET
 
 void
 hypre_F90_IFACE(hypre_parcsrlgmressetminiter, HYPRE_PARCSRLGMRESSETMINITER)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *min_iter,
-     hypre_F90_Int *ierr      )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *min_iter,
+  hypre_F90_Int *ierr      )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRLGMRESSetMinIter(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (min_iter) ) );
+           ( HYPRE_ParCSRLGMRESSetMinIter(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (min_iter) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -157,14 +157,14 @@ hypre_F90_IFACE(hypre_parcsrlgmressetminiter, HYPRE_PARCSRLGMRESSETMINITER)
 
 void
 hypre_F90_IFACE(hypre_parcsrlgmressetmaxiter, HYPRE_PARCSRLGMRESSETMAXITER)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *max_iter,
-     hypre_F90_Int *ierr      )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *max_iter,
+  hypre_F90_Int *ierr      )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRLGMRESSetMaxIter(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (max_iter) ) );
+           ( HYPRE_ParCSRLGMRESSetMaxIter(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (max_iter) ) );
 }
 
 
@@ -174,10 +174,10 @@ hypre_F90_IFACE(hypre_parcsrlgmressetmaxiter, HYPRE_PARCSRLGMRESSETMAXITER)
 
 void
 hypre_F90_IFACE(hypre_parcsrlgmressetprecond, HYPRE_PARCSRLGMRESSETPRECOND)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *precond_id,
-     hypre_F90_Obj *precond_solver,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *precond_id,
+  hypre_F90_Obj *precond_solver,
+  hypre_F90_Int *ierr          )
 {
    /*------------------------------------------------------------
     * The precond_id flags mean :
@@ -186,6 +186,9 @@ hypre_F90_IFACE(hypre_parcsrlgmressetprecond, HYPRE_PARCSRLGMRESSETPRECOND)
     *  2 - set up an amg preconditioner
     *  3 - set up a pilut preconditioner
     *  4 - set up a parasails preconditioner
+    *  5 - set up a Euclid preconditioner
+    *  6 - set up a ILU preconditioner
+    *  7 - set up a MGR preconditioner
     *------------------------------------------------------------*/
 
    if (*precond_id == 0)
@@ -195,48 +198,66 @@ hypre_F90_IFACE(hypre_parcsrlgmressetprecond, HYPRE_PARCSRLGMRESSETPRECOND)
    else if (*precond_id == 1)
    {
       *ierr = (hypre_F90_Int)
-         ( HYPRE_ParCSRLGMRESSetPrecond(
-              hypre_F90_PassObj (HYPRE_Solver, solver),
-              HYPRE_ParCSRDiagScale,
-              HYPRE_ParCSRDiagScaleSetup,
-              NULL                        ) );
+              ( HYPRE_ParCSRLGMRESSetPrecond(
+                   hypre_F90_PassObj (HYPRE_Solver, solver),
+                   HYPRE_ParCSRDiagScale,
+                   HYPRE_ParCSRDiagScaleSetup,
+                   NULL                        ) );
    }
    else if (*precond_id == 2)
    {
 
       *ierr = (hypre_F90_Int)
-         ( HYPRE_ParCSRLGMRESSetPrecond(
-              hypre_F90_PassObj (HYPRE_Solver, solver),
-              HYPRE_BoomerAMGSolve,
-              HYPRE_BoomerAMGSetup,
-              (HYPRE_Solver)       *precond_solver ) );
+              ( HYPRE_ParCSRLGMRESSetPrecond(
+                   hypre_F90_PassObj (HYPRE_Solver, solver),
+                   HYPRE_BoomerAMGSolve,
+                   HYPRE_BoomerAMGSetup,
+                   (HYPRE_Solver)       * precond_solver ) );
    }
    else if (*precond_id == 3)
    {
       *ierr = (hypre_F90_Int)
-         ( HYPRE_ParCSRLGMRESSetPrecond(
-              hypre_F90_PassObj (HYPRE_Solver, solver),
-              HYPRE_ParCSRPilutSolve,
-              HYPRE_ParCSRPilutSetup,
-              (HYPRE_Solver)       *precond_solver ) );
+              ( HYPRE_ParCSRLGMRESSetPrecond(
+                   hypre_F90_PassObj (HYPRE_Solver, solver),
+                   HYPRE_ParCSRPilutSolve,
+                   HYPRE_ParCSRPilutSetup,
+                   (HYPRE_Solver)       * precond_solver ) );
    }
    else if (*precond_id == 4)
    {
       *ierr = (hypre_F90_Int)
-         ( HYPRE_ParCSRLGMRESSetPrecond(
-              hypre_F90_PassObj (HYPRE_Solver, solver),
-              HYPRE_ParCSRParaSailsSolve,
-              HYPRE_ParCSRParaSailsSetup,
-              (HYPRE_Solver)       *precond_solver ) );
+              ( HYPRE_ParCSRLGMRESSetPrecond(
+                   hypre_F90_PassObj (HYPRE_Solver, solver),
+                   HYPRE_ParCSRParaSailsSolve,
+                   HYPRE_ParCSRParaSailsSetup,
+                   (HYPRE_Solver)       * precond_solver ) );
    }
    else if (*precond_id == 5)
    {
       *ierr = (hypre_F90_Int)
-         ( HYPRE_ParCSRLGMRESSetPrecond(
-              hypre_F90_PassObj (HYPRE_Solver, solver),
-              HYPRE_EuclidSolve,
-              HYPRE_EuclidSetup,
-              (HYPRE_Solver)       *precond_solver ) );
+              ( HYPRE_ParCSRLGMRESSetPrecond(
+                   hypre_F90_PassObj (HYPRE_Solver, solver),
+                   HYPRE_EuclidSolve,
+                   HYPRE_EuclidSetup,
+                   (HYPRE_Solver)       * precond_solver ) );
+   }
+   else if (*precond_id == 6)
+   {
+      *ierr = (hypre_F90_Int)
+              ( HYPRE_ParCSRLGMRESSetPrecond(
+                   hypre_F90_PassObj (HYPRE_Solver, solver),
+                   HYPRE_ILUSolve,
+                   HYPRE_ILUSetup,
+                   (HYPRE_Solver)       * precond_solver ) );
+   }
+   else if (*precond_id == 7)
+   {
+      *ierr = (hypre_F90_Int)
+              ( HYPRE_ParCSRLGMRESSetPrecond(
+                   hypre_F90_PassObj (HYPRE_Solver, solver),
+                   HYPRE_MGRSolve,
+                   HYPRE_MGRSetup,
+                   (HYPRE_Solver)       * precond_solver ) );
    }
    else
    {
@@ -250,14 +271,14 @@ hypre_F90_IFACE(hypre_parcsrlgmressetprecond, HYPRE_PARCSRLGMRESSETPRECOND)
 
 void
 hypre_F90_IFACE(hypre_parcsrlgmresgetprecond, HYPRE_PARCSRLGMRESGETPRECOND)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *precond_solver_ptr,
-     hypre_F90_Int *ierr                )
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *precond_solver_ptr,
+  hypre_F90_Int *ierr                )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRLGMRESGetPrecond(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassObjRef (HYPRE_Solver, precond_solver_ptr) ) );
+           ( HYPRE_ParCSRLGMRESGetPrecond(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassObjRef (HYPRE_Solver, precond_solver_ptr) ) );
 
 }
 
@@ -267,14 +288,14 @@ hypre_F90_IFACE(hypre_parcsrlgmresgetprecond, HYPRE_PARCSRLGMRESGETPRECOND)
 
 void
 hypre_F90_IFACE(hypre_parcsrlgmressetlogging, HYPRE_PARCSRLGMRESSETLOGGING)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *logging,
-     hypre_F90_Int *ierr     )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *logging,
+  hypre_F90_Int *ierr     )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRLGMRESSetLogging(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (logging) ) );
+           ( HYPRE_ParCSRLGMRESSetLogging(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (logging) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -283,14 +304,14 @@ hypre_F90_IFACE(hypre_parcsrlgmressetlogging, HYPRE_PARCSRLGMRESSETLOGGING)
 
 void
 hypre_F90_IFACE(hypre_parcsrlgmressetprintlevel, HYPRE_PARCSRLGMRESSETPRINTLEVEL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *print_level,
-     hypre_F90_Int *ierr     )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *print_level,
+  hypre_F90_Int *ierr     )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRLGMRESSetPrintLevel(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (print_level) ) );
+           ( HYPRE_ParCSRLGMRESSetPrintLevel(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (print_level) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -299,14 +320,14 @@ hypre_F90_IFACE(hypre_parcsrlgmressetprintlevel, HYPRE_PARCSRLGMRESSETPRINTLEVEL
 
 void
 hypre_F90_IFACE(hypre_parcsrlgmresgetnumiteratio, HYPRE_PARCSRLGMRESGETNUMITERATIO)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *num_iterations,
-     hypre_F90_Int *ierr            )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *num_iterations,
+  hypre_F90_Int *ierr            )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRLGMRESGetNumIterations(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassIntRef (num_iterations) ) );
+           ( HYPRE_ParCSRLGMRESGetNumIterations(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassIntRef (num_iterations) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -315,16 +336,16 @@ hypre_F90_IFACE(hypre_parcsrlgmresgetnumiteratio, HYPRE_PARCSRLGMRESGETNUMITERAT
 
 void
 hypre_F90_IFACE(hypre_parcsrlgmresgetfinalrelati, HYPRE_PARCSRLGMRESGETFINALRELATI)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *norm,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *norm,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRLGMRESGetFinalRelativeResidualNorm(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassRealRef (norm)    ) );
+           ( HYPRE_ParCSRLGMRESGetFinalRelativeResidualNorm(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassRealRef (norm)    ) );
 }
-    
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_mgr.c b/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_mgr.c
new file mode 100644
index 00000000..b3c0dccc
--- /dev/null
+++ b/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_mgr.c
@@ -0,0 +1,807 @@
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ * HYPRE_MGR Fortran interface
+ *
+ *****************************************************************************/
+
+#include "_hypre_parcsr_ls.h"
+#include "fortran.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*--------------------------------------------------------------------------
+ * HYPRE_MGRCreate
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_mgrcreate, HYPRE_MGRCREATE)
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *ierr )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_MGRCreate(
+                hypre_F90_PassObjRef (HYPRE_Solver, solver) ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_MGRDestroy
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_mgrdestroy, HYPRE_MGRDESTROY)
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *ierr )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_MGRDestroy(
+                hypre_F90_PassObj (HYPRE_Solver, solver) ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_MGRSetup
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_mgrsetup, HYPRE_MGRSETUP)
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *A,
+  hypre_F90_Obj *b,
+  hypre_F90_Obj *x,
+  hypre_F90_Int *ierr )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_MGRSetup(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
+                hypre_F90_PassObj (HYPRE_ParVector, b),
+                hypre_F90_PassObj (HYPRE_ParVector, x) ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_MGRSolve
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_mgrsolve, HYPRE_MGRSOLVE)
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *A,
+  hypre_F90_Obj *b,
+  hypre_F90_Obj *x,
+  hypre_F90_Int *ierr )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_MGRSolve(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
+                hypre_F90_PassObj (HYPRE_ParVector, b),
+                hypre_F90_PassObj (HYPRE_ParVector, x) ) );
+}
+
+#ifdef HYPRE_USING_DSUPERLU
+
+/*--------------------------------------------------------------------------
+ * HYPRE_MGRDirectSolverCreate
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_mgrdirectsolvercreate, HYPRE_MGRDIRECTSOLVERCREATE)
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *ierr )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_MGRDirectSolverCreate(
+                hypre_F90_PassObjRef (HYPRE_Solver, solver) ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_MGRDirectSolverDestroy
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_mgrdirectsolverdestroy, HYPRE_MGRDIRECTSOLVERDESTROY)
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *ierr )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_MGRDirectSolverDestroy(
+                hypre_F90_PassObj (HYPRE_Solver, solver) ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_MGRDirectSolverSetup
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_mgrdirectsolversetup, HYPRE_MGRDIRECTSOLVERSETUP)
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *A,
+  hypre_F90_Obj *b,
+  hypre_F90_Obj *x,
+  hypre_F90_Int *ierr)
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_MGRDirectSolverSetup(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
+                hypre_F90_PassObj (HYPRE_ParVector, b),
+                hypre_F90_PassObj (HYPRE_ParVector, x) ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_MGRDirectSolverSolve
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_mgrdirectsolversolve, HYPRE_MGRDIRECTSOLVERSOLVE)
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *A,
+  hypre_F90_Obj *b,
+  hypre_F90_Obj *x,
+  hypre_F90_Int *ierr )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_MGRDirectSolverSolve(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
+                hypre_F90_PassObj (HYPRE_ParVector, b),
+                hypre_F90_PassObj (HYPRE_ParVector, x) ) );
+}
+
+#endif
+
+/*--------------------------------------------------------------------------
+ * HYPRE_MGRSetCptsByCtgBlock
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_mgrsetcptsbyctgblock, HYPRE_MGRSETCPTSBYCTGBLOCK)
+( hypre_F90_Obj           *solver,
+  hypre_F90_Int           *block_size,
+  hypre_F90_Int           *max_num_levels,
+  hypre_F90_BigIntArray   *idx_array,
+  hypre_F90_IntArray      *block_num_coarse_points,
+  hypre_F90_IntArrayArray *block_coarse_indexes,
+  hypre_F90_Int           *ierr )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_MGRSetCpointsByContiguousBlock(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (block_size),
+                hypre_F90_PassInt (max_num_levels),
+                hypre_F90_PassBigIntArray (idx_array),
+                hypre_F90_PassIntArray (block_num_coarse_points),
+                hypre_F90_PassIntArrayArray (block_coarse_indexes) ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_MGRSetCpointsByBlock
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_mgrsetcpointsbyblock, HYPRE_MGRSETCPOINTSBYBLOCK)
+( hypre_F90_Obj           *solver,
+  hypre_F90_Int           *block_size,
+  hypre_F90_Int           *max_num_levels,
+  hypre_F90_IntArray      *block_num_coarse_points,
+  hypre_F90_IntArrayArray *block_coarse_indexes,
+  hypre_F90_Int           *ierr )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_MGRSetCpointsByBlock(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (block_size),
+                hypre_F90_PassInt (max_num_levels),
+                hypre_F90_PassIntArray (block_num_coarse_points),
+                hypre_F90_PassIntArrayArray (block_coarse_indexes) ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_MGRSetCptsByMarkerArray
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_mgrsetcptsbymarkerarray, HYPRE_MGRSETCPTSBYMARKERARRAY)
+( hypre_F90_Obj           *solver,
+  hypre_F90_Int           *block_size,
+  hypre_F90_Int           *max_num_levels,
+  hypre_F90_IntArray      *num_block_coarse_points,
+  hypre_F90_IntArrayArray *lvl_block_coarse_indexes,
+  hypre_F90_IntArray      *point_marker_array,
+  hypre_F90_Int           *ierr )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_MGRSetCpointsByPointMarkerArray(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (block_size),
+                hypre_F90_PassInt (max_num_levels),
+                hypre_F90_PassIntArray (num_block_coarse_points),
+                hypre_F90_PassIntArrayArray (lvl_block_coarse_indexes),
+                hypre_F90_PassIntArray (point_marker_array) ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_MGRSetNonCptsToFpts
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_mgrsetnoncptstofpts, HYPRE_MGRSETNONCPTSTOFPTS)
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *nonCptToFptFlag,
+  hypre_F90_Int *ierr )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_MGRSetNonCpointsToFpoints(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (nonCptToFptFlag) ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_MGRSetFSolver
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_mgrsetfsolver, HYPRE_MGRSETFSOLVER)
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *fsolver_id,
+  hypre_F90_Obj *fsolver,
+  hypre_F90_Int *ierr )
+{
+   /*------------------------------------------------------------
+    * The fsolver_id flag means:
+    *   0 - do not setup a F-solver.
+    *   1 - BoomerAMG.
+    *------------------------------------------------------------*/
+
+   if (*fsolver_id == 0)
+   {
+      *ierr = 0;
+   }
+   else if (*fsolver_id == 1)
+   {
+      *ierr = (hypre_F90_Int)
+              ( HYPRE_MGRSetFSolver(
+                   hypre_F90_PassObj (HYPRE_Solver, solver),
+                   (HYPRE_PtrToParSolverFcn) HYPRE_BoomerAMGSolve,
+                   (HYPRE_PtrToParSolverFcn) HYPRE_BoomerAMGSetup,
+                   (HYPRE_Solver) * fsolver) );
+   }
+   else
+   {
+      *ierr = -1;
+   }
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_MGRBuildAff
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_mgrbuildaff, HYPRE_MGRBUILDAFF)
+( hypre_F90_Obj      *A,
+  hypre_F90_IntArray *CF_marker,
+  hypre_F90_Int      *debug_flag,
+  hypre_F90_Obj      *A_ff,
+  hypre_F90_Int      *ierr )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_MGRBuildAff(
+                hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
+                hypre_F90_PassIntArray (CF_marker),
+                hypre_F90_PassInt (debug_flag),
+                hypre_F90_PassObjRef (HYPRE_ParCSRMatrix, A_ff) ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_MGRSetCoarseSolver
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_mgrsetcoarsesolver, HYPRE_MGRSETCOARSESOLVER)
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *csolver_id,
+  hypre_F90_Obj *csolver,
+  hypre_F90_Int *ierr )
+{
+   /*------------------------------------------------------------
+    * The csolver_id flag means:
+    *   0 - do not setup a coarse solver.
+    *   1 - BoomerAMG.
+    *------------------------------------------------------------*/
+
+   if (*csolver_id == 0)
+   {
+      *ierr = 0;
+   }
+   else if (*csolver_id == 1)
+   {
+      *ierr = (hypre_F90_Int)
+              ( HYPRE_MGRSetCoarseSolver(
+                   hypre_F90_PassObj (HYPRE_Solver, solver),
+                   (HYPRE_PtrToParSolverFcn) HYPRE_BoomerAMGSolve,
+                   (HYPRE_PtrToParSolverFcn) HYPRE_BoomerAMGSetup,
+                   (HYPRE_Solver) * csolver) );
+   }
+   else
+   {
+      *ierr = -1;
+   }
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_MGRSetMaxCoarseLevels
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_mgrsetmaxcoarselevels, HYPRE_MGRSETMAXCOARSELEVELS)
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *maxlev,
+  hypre_F90_Int *ierr )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_MGRSetMaxCoarseLevels(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (maxlev) ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_MGRSetBlockSize
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_mgrsetblocksize, HYPRE_MGRSETBLOCKSIZE)
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *bsize,
+  hypre_F90_Int *ierr )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_MGRSetBlockSize(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (bsize) ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_MGRSetReservedCoarseNodes
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_mgrsetreservedcoarsenodes, HYPRE_MGRSETRESERVEDCOARSENODES)
+( hypre_F90_Obj         *solver,
+  hypre_F90_Int         *reserved_coarse_size,
+  hypre_F90_BigIntArray *reserved_coarse_indexes,
+  hypre_F90_Int         *ierr )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_MGRSetReservedCoarseNodes(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (reserved_coarse_size),
+                hypre_F90_PassBigIntArray (reserved_coarse_indexes) ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_MGRSetReservedCptsLevel
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_mgrsetreservedcptslevel, HYPRE_MGRSETRESERVEDCPTSLEVEL)
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *level,
+  hypre_F90_Int *ierr )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_MGRSetReservedCpointsLevelToKeep(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (level) ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_MGRSetRestrictType
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_mgrsetrestricttype, HYPRE_MGRSETRESTRICTTYPE)
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *restrict_type,
+  hypre_F90_Int *ierr )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_MGRSetRestrictType(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (restrict_type) ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_MGRSetLevelRestrictType
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_mgrsetlevelrestricttype, HYPRE_MGRSETLEVELRESTRICTTYPE)
+( hypre_F90_Obj      *solver,
+  hypre_F90_IntArray *restrict_type,
+  hypre_F90_Int      *ierr )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_MGRSetLevelRestrictType(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassIntArray (restrict_type) ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_MGRSetFRelaxMethod
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_mgrsetfrelaxmethod, HYPRE_MGRSETFRELAXMETHOD)
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *relax_method,
+  hypre_F90_Int *ierr )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_MGRSetFRelaxMethod(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (relax_method) ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_MGRSetLevelFRelaxMethod
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_mgrsetlevelfrelaxmethod, HYPRE_MGRSETLEVELFRELAXMETHOD)
+( hypre_F90_Obj      *solver,
+  hypre_F90_IntArray *relax_method,
+  hypre_F90_Int      *ierr )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_MGRSetLevelFRelaxMethod(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassIntArray (relax_method) ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_MGRSetCoarseGridMethod
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_mgrsetcoarsegridmethod, HYPRE_MGRSETCOARSEGRIDMETHOD)
+( hypre_F90_Obj      *solver,
+  hypre_F90_IntArray *cg_method,
+  hypre_F90_Int      *ierr )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_MGRSetCoarseGridMethod(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassIntArray (cg_method) ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_MGRSetLevelFRelaxNumFunc
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_mgrsetlevelfrelaxnumfunc, HYPRE_MGRSETLEVELFRELAXNUMFUNC)
+( hypre_F90_Obj      *solver,
+  hypre_F90_IntArray *num_functions,
+  hypre_F90_Int      *ierr )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_MGRSetLevelFRelaxNumFunctions(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassIntArray (num_functions) ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_MGRSetRelaxType
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_mgrsetrelaxtype, HYPRE_MGRSETRELAXTYPE)
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *relax_type,
+  hypre_F90_Int *ierr )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_MGRSetRelaxType(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (relax_type) ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_MGRSetNumRelaxSweeps
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_mgrsetnumrelaxsweeps, HYPRE_MGRSETNUMRELAXSWEEPS)
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *nsweeps,
+  hypre_F90_Int *ierr )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_MGRSetNumRelaxSweeps(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (nsweeps) ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_MGRSetInterpType
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_mgrsetinterptype, HYPRE_MGRSETINTERPTYPE)
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *interpType,
+  hypre_F90_Int *ierr )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_MGRSetInterpType(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (interpType) ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_MGRSetLevelInterpType
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_mgrsetlevelinterptype, HYPRE_MGRSETLEVELINTERPTYPE)
+( hypre_F90_Obj      *solver,
+  hypre_F90_IntArray *interpType,
+  hypre_F90_Int      *ierr )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_MGRSetLevelInterpType(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassIntArray (interpType) ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_MGRSetNumInterpSweeps
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_mgrsetnuminterpsweeps, HYPRE_MGRSETNUMINTERPSWEEPS)
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *nsweeps,
+  hypre_F90_Int *ierr )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_MGRSetNumInterpSweeps(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (nsweeps) ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_MGRSetNumRestrictSweeps
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_mgrsetnumrestrictsweeps, HYPRE_MGRSETNUMRESTRICTSWEEPS)
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *nsweeps,
+  hypre_F90_Int *ierr )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_MGRSetNumRestrictSweeps(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (nsweeps) ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_MGRSetCGridThreshold
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_mgrsetcgridthreshold, HYPRE_MGRSETCGRIDTHRESHOLD)
+( hypre_F90_Obj  *solver,
+  hypre_F90_Real *threshold,
+  hypre_F90_Int  *ierr )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_MGRSetTruncateCoarseGridThreshold(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassReal (threshold) ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_MGRSetFrelaxPrintLevel
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_mgrsetfrelaxprintlevel, HYPRE_MGRSETFRELAXPRINTLEVEL)
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *print_level,
+  hypre_F90_Int *ierr )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_MGRSetFrelaxPrintLevel(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (print_level) ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_MGRSetCgridPrintLevel
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_mgrsetcgridprintlevel, HYPRE_MGRSETCGRIDPRINTLEVEL)
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *print_level,
+  hypre_F90_Int *ierr )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_MGRSetCoarseGridPrintLevel(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (print_level) ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_MGRSetPrintLevel
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_mgrsetprintlevel, HYPRE_MGRSETPRINTLEVEL)
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *print_level,
+  hypre_F90_Int *ierr )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_MGRSetPrintLevel(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (print_level) ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_MGRSetLogging
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_mgrsetlogging, HYPRE_MGRSETLOGGING)
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *logging,
+  hypre_F90_Int *ierr )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_MGRSetLogging(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (logging) ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_MGRSetMaxIter
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_mgrsetmaxiter, HYPRE_MGRSETMAXITER)
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *max_iter,
+  hypre_F90_Int *ierr )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_MGRSetMaxIter(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (max_iter) ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_MGRSetTol
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_mgrsettol, HYPRE_MGRSETTOL)
+( hypre_F90_Obj  *solver,
+  hypre_F90_Real *tol,
+  hypre_F90_Int  *ierr )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_MGRSetTol(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassReal (tol) ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_MGRSetMaxGlobalsmoothIt
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_mgrsetmaxglobalsmoothit, HYPRE_MGRSETMAXGLOBALSMOOTHIT)
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *max_iter,
+  hypre_F90_Int *ierr )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_MGRSetMaxGlobalSmoothIters(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (max_iter) ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_MGRSetGlobalsmoothType
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_mgrsetglobalsmoothtype, HYPRE_MGRSETGLOBALSMOOTHTYPE)
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *iter_type,
+  hypre_F90_Int *ierr )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_MGRSetGlobalSmoothType(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (iter_type) ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_MGRSetPMaxElmts
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_mgrsetpmaxelmts, HYPRE_MGRSETPMAXELMTS)
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *P_max_elmts,
+  hypre_F90_Int *ierr )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_MGRSetPMaxElmts(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (P_max_elmts) ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_MGRGetCoarseGridConvFac
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_mgrgetcoarsegridconvfac, HYPRE_MGRGETCOARSEGRIDCONVFAC)
+( hypre_F90_Obj  *solver,
+  hypre_F90_Real *conv_factor,
+  hypre_F90_Int  *ierr )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_MGRGetCoarseGridConvergenceFactor(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassRealRef (conv_factor) ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_MGRGetNumIterations
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_mgrgetnumiterations, HYPRE_MGRGETNUMITERATIONS)
+( hypre_F90_Obj  *solver,
+  hypre_F90_Int  *num_iterations,
+  hypre_F90_Int  *ierr )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_MGRGetNumIterations(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassIntRef (num_iterations) ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_MGRGetFinalRelResNorm
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_F90_IFACE(hypre_mgrgetfinalrelresnorm, HYPRE_MGRGETFINALRELRESNORM)
+( hypre_F90_Obj   *solver,
+  hypre_F90_Real  *res_norm,
+  hypre_F90_Int   *ierr )
+{
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_MGRGetFinalRelativeResidualNorm(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassRealRef (res_norm) ) );
+}
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_pcg.c b/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_pcg.c
index 15e1201d..bce3e16f 100644
--- a/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_pcg.c
+++ b/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_pcg.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -17,75 +17,75 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-    
+
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRPCGCreate
  *--------------------------------------------------------------------------*/
 
 void
 hypre_F90_IFACE(hypre_parcsrpcgcreate, HYPRE_PARCSRPCGCREATE)
-   ( hypre_F90_Comm *comm,
-     hypre_F90_Obj *solver,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Comm *comm,
+  hypre_F90_Obj *solver,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRPCGCreate(
-           hypre_F90_PassComm (comm),
-           hypre_F90_PassObjRef (HYPRE_Solver, solver) ) );
+           ( HYPRE_ParCSRPCGCreate(
+                hypre_F90_PassComm (comm),
+                hypre_F90_PassObjRef (HYPRE_Solver, solver) ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRPCGDestroy
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_parcsrpcgdestroy, HYPRE_PARCSRPCGDESTROY)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRPCGDestroy(
-           hypre_F90_PassObj (HYPRE_Solver, solver) ) );
+           ( HYPRE_ParCSRPCGDestroy(
+                hypre_F90_PassObj (HYPRE_Solver, solver) ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRPCGSetup
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_parcsrpcgsetup, HYPRE_PARCSRPCGSETUP)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *A,
-     hypre_F90_Obj *b,
-     hypre_F90_Obj *x,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *A,
+  hypre_F90_Obj *b,
+  hypre_F90_Obj *x,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRPCGSetup(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
-           hypre_F90_PassObj (HYPRE_ParVector, b),
-           hypre_F90_PassObj (HYPRE_ParVector, x)       ) );
+           ( HYPRE_ParCSRPCGSetup(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
+                hypre_F90_PassObj (HYPRE_ParVector, b),
+                hypre_F90_PassObj (HYPRE_ParVector, x)       ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRPCGSolve
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_parcsrpcgsolve, HYPRE_PARCSRPCGSOLVE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *A,
-     hypre_F90_Obj *b,
-     hypre_F90_Obj *x,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *A,
+  hypre_F90_Obj *b,
+  hypre_F90_Obj *x,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRPCGSolve(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
-           hypre_F90_PassObj (HYPRE_ParVector, b),
-           hypre_F90_PassObj (HYPRE_ParVector, x)       ) );
+           ( HYPRE_ParCSRPCGSolve(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
+                hypre_F90_PassObj (HYPRE_ParVector, b),
+                hypre_F90_PassObj (HYPRE_ParVector, x)       ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -94,14 +94,14 @@ hypre_F90_IFACE(hypre_parcsrpcgsolve, HYPRE_PARCSRPCGSOLVE)
 
 void
 hypre_F90_IFACE(hypre_parcsrpcgsettol, HYPRE_PARCSRPCGSETTOL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *tol,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *tol,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRPCGSetTol(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassReal (tol)     ) );
+           ( HYPRE_ParCSRPCGSetTol(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassReal (tol)     ) );
 }
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRPCGSetAbsoluteTol
@@ -109,14 +109,14 @@ hypre_F90_IFACE(hypre_parcsrpcgsettol, HYPRE_PARCSRPCGSETTOL)
 
 void
 hypre_F90_IFACE(hypre_parcsrpcgsetatol, HYPRE_PARCSRPCGSETATOL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *tol,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *tol,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRPCGSetAbsoluteTol(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassReal (tol)     ) );
+           ( HYPRE_ParCSRPCGSetAbsoluteTol(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassReal (tol)     ) );
 }
 
 
@@ -126,14 +126,14 @@ hypre_F90_IFACE(hypre_parcsrpcgsetatol, HYPRE_PARCSRPCGSETATOL)
 
 void
 hypre_F90_IFACE(hypre_parcsrpcgsetmaxiter, HYPRE_PARCSRPCGSETMAXITER)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *max_iter,
-     hypre_F90_Int *ierr      )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *max_iter,
+  hypre_F90_Int *ierr      )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRPCGSetMaxIter(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (max_iter) ) );
+           ( HYPRE_ParCSRPCGSetMaxIter(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (max_iter) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -142,14 +142,14 @@ hypre_F90_IFACE(hypre_parcsrpcgsetmaxiter, HYPRE_PARCSRPCGSETMAXITER)
 
 void
 hypre_F90_IFACE(hypre_parcsrpcgsetstopcrit, HYPRE_PARCSRPCGSETSTOPCRIT)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *stop_crit,
-     hypre_F90_Int *ierr      )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *stop_crit,
+  hypre_F90_Int *ierr      )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRPCGSetStopCrit(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (stop_crit) ) );
+           ( HYPRE_ParCSRPCGSetStopCrit(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (stop_crit) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -158,14 +158,14 @@ hypre_F90_IFACE(hypre_parcsrpcgsetstopcrit, HYPRE_PARCSRPCGSETSTOPCRIT)
 
 void
 hypre_F90_IFACE(hypre_parcsrpcgsettwonorm, HYPRE_PARCSRPCGSETTWONORM)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *two_norm,
-     hypre_F90_Int *ierr      )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *two_norm,
+  hypre_F90_Int *ierr      )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRPCGSetTwoNorm(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (two_norm) ) );
+           ( HYPRE_ParCSRPCGSetTwoNorm(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (two_norm) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -174,14 +174,14 @@ hypre_F90_IFACE(hypre_parcsrpcgsettwonorm, HYPRE_PARCSRPCGSETTWONORM)
 
 void
 hypre_F90_IFACE(hypre_parcsrpcgsetrelchange, HYPRE_PARCSRPCGSETRELCHANGE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *rel_change,
-     hypre_F90_Int *ierr        )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *rel_change,
+  hypre_F90_Int *ierr        )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRPCGSetRelChange(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (rel_change) ) );
+           ( HYPRE_ParCSRPCGSetRelChange(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (rel_change) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -190,10 +190,10 @@ hypre_F90_IFACE(hypre_parcsrpcgsetrelchange, HYPRE_PARCSRPCGSETRELCHANGE)
 
 void
 hypre_F90_IFACE(hypre_parcsrpcgsetprecond, HYPRE_PARCSRPCGSETPRECOND)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *precond_id,
-     hypre_F90_Obj *precond_solver,
-     hypre_F90_Int *ierr            )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *precond_id,
+  hypre_F90_Obj *precond_solver,
+  hypre_F90_Int *ierr            )
 {
 
    /*------------------------------------------------------------
@@ -203,6 +203,9 @@ hypre_F90_IFACE(hypre_parcsrpcgsetprecond, HYPRE_PARCSRPCGSETPRECOND)
     * 2 - set up an amg preconditioner
     * 3 - set up a pilut preconditioner
     * 4 - set up a ParaSails preconditioner
+    * 5 - set up a Euclid preconditioner
+    * 6 - set up a ILU preconditioner
+    * 7 - set up a MGR preconditioner
     *------------------------------------------------------------*/
 
    if (*precond_id == 0)
@@ -212,47 +215,65 @@ hypre_F90_IFACE(hypre_parcsrpcgsetprecond, HYPRE_PARCSRPCGSETPRECOND)
    else if (*precond_id == 1)
    {
       *ierr = (hypre_F90_Int)
-         ( HYPRE_ParCSRPCGSetPrecond(
-              hypre_F90_PassObj (HYPRE_Solver, solver),
-              HYPRE_ParCSRDiagScale,
-              HYPRE_ParCSRDiagScaleSetup,
-              NULL                        ) );
+              ( HYPRE_ParCSRPCGSetPrecond(
+                   hypre_F90_PassObj (HYPRE_Solver, solver),
+                   HYPRE_ParCSRDiagScale,
+                   HYPRE_ParCSRDiagScaleSetup,
+                   NULL                        ) );
    }
    else if (*precond_id == 2)
    {
       *ierr = (hypre_F90_Int)
-         ( HYPRE_ParCSRPCGSetPrecond(
-              hypre_F90_PassObj (HYPRE_Solver, solver),
-              HYPRE_BoomerAMGSolve,
-              HYPRE_BoomerAMGSetup,
-              (HYPRE_Solver)       *precond_solver) );
+              ( HYPRE_ParCSRPCGSetPrecond(
+                   hypre_F90_PassObj (HYPRE_Solver, solver),
+                   HYPRE_BoomerAMGSolve,
+                   HYPRE_BoomerAMGSetup,
+                   (HYPRE_Solver)       * precond_solver) );
    }
    else if (*precond_id == 3)
    {
       *ierr = (hypre_F90_Int)
-         ( HYPRE_ParCSRPCGSetPrecond(
-              hypre_F90_PassObj (HYPRE_Solver, solver),
-              HYPRE_ParCSRPilutSolve,
-              HYPRE_ParCSRPilutSetup,
-              (HYPRE_Solver)       *precond_solver) );
+              ( HYPRE_ParCSRPCGSetPrecond(
+                   hypre_F90_PassObj (HYPRE_Solver, solver),
+                   HYPRE_ParCSRPilutSolve,
+                   HYPRE_ParCSRPilutSetup,
+                   (HYPRE_Solver)       * precond_solver) );
    }
    else if (*precond_id == 4)
    {
       *ierr = (hypre_F90_Int)
-         ( HYPRE_ParCSRPCGSetPrecond(
-              hypre_F90_PassObj (HYPRE_Solver, solver),
-              HYPRE_ParaSailsSolve,
-              HYPRE_ParaSailsSetup,
-              (HYPRE_Solver)       *precond_solver) );
+              ( HYPRE_ParCSRPCGSetPrecond(
+                   hypre_F90_PassObj (HYPRE_Solver, solver),
+                   HYPRE_ParaSailsSolve,
+                   HYPRE_ParaSailsSetup,
+                   (HYPRE_Solver)       * precond_solver) );
    }
    else if (*precond_id == 5)
    {
       *ierr = (hypre_F90_Int)
-         ( HYPRE_ParCSRPCGSetPrecond(
-              hypre_F90_PassObj (HYPRE_Solver, solver),
-              HYPRE_EuclidSolve,
-              HYPRE_EuclidSetup,
-              (HYPRE_Solver)       *precond_solver) );
+              ( HYPRE_ParCSRPCGSetPrecond(
+                   hypre_F90_PassObj (HYPRE_Solver, solver),
+                   HYPRE_EuclidSolve,
+                   HYPRE_EuclidSetup,
+                   (HYPRE_Solver)       * precond_solver) );
+   }
+   else if (*precond_id == 6)
+   {
+      *ierr = (hypre_F90_Int)
+              ( HYPRE_ParCSRPCGSetPrecond(
+                   hypre_F90_PassObj (HYPRE_Solver, solver),
+                   HYPRE_ILUSolve,
+                   HYPRE_ILUSetup,
+                   (HYPRE_Solver)       * precond_solver ) );
+   }
+   else if (*precond_id == 7)
+   {
+      *ierr = (hypre_F90_Int)
+              ( HYPRE_ParCSRPCGSetPrecond(
+                   hypre_F90_PassObj (HYPRE_Solver, solver),
+                   HYPRE_MGRSolve,
+                   HYPRE_MGRSetup,
+                   (HYPRE_Solver)       * precond_solver ) );
    }
    else
    {
@@ -266,14 +287,14 @@ hypre_F90_IFACE(hypre_parcsrpcgsetprecond, HYPRE_PARCSRPCGSETPRECOND)
 
 void
 hypre_F90_IFACE(hypre_parcsrpcggetprecond, HYPRE_PARCSRPCGGETPRECOND)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *precond_solver_ptr,
-     hypre_F90_Int *ierr                )
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *precond_solver_ptr,
+  hypre_F90_Int *ierr                )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRPCGGetPrecond(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassObjRef (HYPRE_Solver, precond_solver_ptr) ) );
+           ( HYPRE_ParCSRPCGGetPrecond(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassObjRef (HYPRE_Solver, precond_solver_ptr) ) );
 
 }
 
@@ -283,14 +304,14 @@ hypre_F90_IFACE(hypre_parcsrpcggetprecond, HYPRE_PARCSRPCGGETPRECOND)
 
 void
 hypre_F90_IFACE(hypre_parcsrpcgsetprintlevel, HYPRE_PARCSRPCGSETPRINTLEVEL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *level,
-     hypre_F90_Int *ierr     )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *level,
+  hypre_F90_Int *ierr     )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRPCGSetPrintLevel(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (level) ) );
+           ( HYPRE_ParCSRPCGSetPrintLevel(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (level) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -299,14 +320,14 @@ hypre_F90_IFACE(hypre_parcsrpcgsetprintlevel, HYPRE_PARCSRPCGSETPRINTLEVEL)
 
 void
 hypre_F90_IFACE(hypre_parcsrpcgsetlogging, HYPRE_PARCSRPCGSETLOGGING)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *level,
-     hypre_F90_Int *ierr     )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *level,
+  hypre_F90_Int *ierr     )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRPCGSetLogging(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (level) ) );
+           ( HYPRE_ParCSRPCGSetLogging(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (level) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -315,14 +336,14 @@ hypre_F90_IFACE(hypre_parcsrpcgsetlogging, HYPRE_PARCSRPCGSETLOGGING)
 
 void
 hypre_F90_IFACE(hypre_parcsrpcggetnumiterations, HYPRE_PARCSRPCGGETNUMITERATIONS)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *num_iterations,
-     hypre_F90_Int *ierr            )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *num_iterations,
+  hypre_F90_Int *ierr            )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRPCGGetNumIterations(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassIntRef (num_iterations) ) );
+           ( HYPRE_ParCSRPCGGetNumIterations(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassIntRef (num_iterations) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -331,14 +352,14 @@ hypre_F90_IFACE(hypre_parcsrpcggetnumiterations, HYPRE_PARCSRPCGGETNUMITERATIONS
 
 void
 hypre_F90_IFACE(hypre_parcsrpcggetfinalrelative, HYPRE_PARCSRPCGGETFINALRELATIVE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *norm,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *norm,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRPCGGetFinalRelativeResidualNorm(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassRealRef (norm)    ) );
+           ( HYPRE_ParCSRPCGGetFinalRelativeResidualNorm(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassRealRef (norm)    ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -347,18 +368,18 @@ hypre_F90_IFACE(hypre_parcsrpcggetfinalrelative, HYPRE_PARCSRPCGGETFINALRELATIVE
 
 void
 hypre_F90_IFACE(hypre_parcsrdiagscalesetup, HYPRE_PARCSRDIAGSCALESETUP)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *A,
-     hypre_F90_Obj *y,
-     hypre_F90_Obj *x,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *A,
+  hypre_F90_Obj *y,
+  hypre_F90_Obj *x,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRDiagScaleSetup(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
-           hypre_F90_PassObj (HYPRE_ParVector, y),
-           hypre_F90_PassObj (HYPRE_ParVector, x)       ) );
+           ( HYPRE_ParCSRDiagScaleSetup(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
+                hypre_F90_PassObj (HYPRE_ParVector, y),
+                hypre_F90_PassObj (HYPRE_ParVector, x)       ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -367,20 +388,20 @@ hypre_F90_IFACE(hypre_parcsrdiagscalesetup, HYPRE_PARCSRDIAGSCALESETUP)
 
 void
 hypre_F90_IFACE(hypre_parcsrdiagscale, HYPRE_PARCSRDIAGSCALE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *HA,
-     hypre_F90_Obj *Hy,
-     hypre_F90_Obj *Hx,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *HA,
+  hypre_F90_Obj *Hy,
+  hypre_F90_Obj *Hx,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRDiagScale(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassObj (HYPRE_ParCSRMatrix, HA),
-           hypre_F90_PassObj (HYPRE_ParVector, Hy),
-           hypre_F90_PassObj (HYPRE_ParVector, Hx)      ) );
+           ( HYPRE_ParCSRDiagScale(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassObj (HYPRE_ParCSRMatrix, HA),
+                hypre_F90_PassObj (HYPRE_ParVector, Hy),
+                hypre_F90_PassObj (HYPRE_ParVector, Hx)      ) );
 }
-    
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_pilut.c b/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_pilut.c
index ab61e0aa..e770faf8 100644
--- a/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_pilut.c
+++ b/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_pilut.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -17,21 +17,21 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-    
+
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRPilutCreate
  *--------------------------------------------------------------------------*/
 
 void
 hypre_F90_IFACE(hypre_parcsrpilutcreate, HYPRE_PARCSRPILUTCREATE)
-   ( hypre_F90_Comm *comm,
-     hypre_F90_Obj *solver,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Comm *comm,
+  hypre_F90_Obj *solver,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRPilutCreate(
-           hypre_F90_PassComm (comm),
-           hypre_F90_PassObjRef (HYPRE_Solver, solver) ) );
+           ( HYPRE_ParCSRPilutCreate(
+                hypre_F90_PassComm (comm),
+                hypre_F90_PassObjRef (HYPRE_Solver, solver) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -40,100 +40,100 @@ hypre_F90_IFACE(hypre_parcsrpilutcreate, HYPRE_PARCSRPILUTCREATE)
 
 void
 hypre_F90_IFACE(hypre_parcsrpilutdestroy, HYPRE_PARCSRPILUTDESTROY)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRPilutDestroy(
-           hypre_F90_PassObj (HYPRE_Solver, solver) ) );
+           ( HYPRE_ParCSRPilutDestroy(
+                hypre_F90_PassObj (HYPRE_Solver, solver) ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRPilutSetup
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_parcsrpilutsetup, HYPRE_PARCSRPILUTSETUP)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *A,
-     hypre_F90_Obj *b,
-     hypre_F90_Obj *x,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *A,
+  hypre_F90_Obj *b,
+  hypre_F90_Obj *x,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRPilutSetup(
-           hypre_F90_PassObj (HYPRE_Solver, solver), 
-           hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
-           hypre_F90_PassObj (HYPRE_ParVector, b),
-           hypre_F90_PassObj (HYPRE_ParVector, x)       ) );
+           ( HYPRE_ParCSRPilutSetup(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
+                hypre_F90_PassObj (HYPRE_ParVector, b),
+                hypre_F90_PassObj (HYPRE_ParVector, x)       ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRPilutSolve
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_parcsrpilutsolve, HYPRE_PARCSRPILUTSOLVE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *A,
-     hypre_F90_Obj *b,
-     hypre_F90_Obj *x,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *A,
+  hypre_F90_Obj *b,
+  hypre_F90_Obj *x,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRPilutSolve(
-           hypre_F90_PassObj (HYPRE_Solver, solver), 
-           hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
-           hypre_F90_PassObj (HYPRE_ParVector, b),
-           hypre_F90_PassObj (HYPRE_ParVector, x)       ) );
+           ( HYPRE_ParCSRPilutSolve(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
+                hypre_F90_PassObj (HYPRE_ParVector, b),
+                hypre_F90_PassObj (HYPRE_ParVector, x)       ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRPilutSetMaxIter
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_parcsrpilutsetmaxiter, HYPRE_PARCSRPILUTSETMAXITER)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *max_iter,
-     hypre_F90_Int *ierr      )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *max_iter,
+  hypre_F90_Int *ierr      )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRPilutSetMaxIter(
-           hypre_F90_PassObj (HYPRE_Solver, solver), 
-           hypre_F90_PassInt (max_iter) ) );
+           ( HYPRE_ParCSRPilutSetMaxIter(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (max_iter) ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRPilutSetDropToleran
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_parcsrpilutsetdroptoleran, HYPRE_PARCSRPILUTSETDROPTOLERAN)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *tol,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *tol,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRPilutSetDropTolerance(
-           hypre_F90_PassObj (HYPRE_Solver, solver), 
-           hypre_F90_PassReal (tol)     ) );
+           ( HYPRE_ParCSRPilutSetDropTolerance(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassReal (tol)     ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRPilutSetFacRowSize
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_parcsrpilutsetfacrowsize, HYPRE_PARCSRPILUTSETFACROWSIZE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *size,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *size,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRPilutSetFactorRowSize(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (size)    ) );
+           ( HYPRE_ParCSRPilutSetFactorRowSize(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (size)    ) );
 }
 
 #ifdef __cplusplus
diff --git a/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_schwarz.c b/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_schwarz.c
index 6e5cc6b7..c5ffe99b 100644
--- a/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_schwarz.c
+++ b/external/hypre/src/parcsr_ls/F90_HYPRE_parcsr_schwarz.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -17,19 +17,19 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-    
+
 /*--------------------------------------------------------------------------
  * HYPRE_SchwarzCreate
  *--------------------------------------------------------------------------*/
 
 void
 hypre_F90_IFACE(hypre_schwarzcreate, HYPRE_SCHWARZCREATE)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_SchwarzCreate(
-           hypre_F90_PassObjRef (HYPRE_Solver, solver)));
+           ( HYPRE_SchwarzCreate(
+                hypre_F90_PassObjRef (HYPRE_Solver, solver)));
 }
 
 /*--------------------------------------------------------------------------
@@ -38,12 +38,12 @@ hypre_F90_IFACE(hypre_schwarzcreate, HYPRE_SCHWARZCREATE)
 
 void
 hypre_F90_IFACE(hypre_schwarzdestroy, HYPRE_SCHWARZDESTROY)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_SchwarzDestroy(
-           hypre_F90_PassObj (HYPRE_Solver, solver) ));
+           ( HYPRE_SchwarzDestroy(
+                hypre_F90_PassObj (HYPRE_Solver, solver) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -52,18 +52,18 @@ hypre_F90_IFACE(hypre_schwarzdestroy, HYPRE_SCHWARZDESTROY)
 
 void
 hypre_F90_IFACE(hypre_schwarzsetup, HYPRE_SCHWARZSETUP)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Obj *A,
-    hypre_F90_Obj *b,
-    hypre_F90_Obj *x,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Obj *A,
+ hypre_F90_Obj *b,
+ hypre_F90_Obj *x,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_SchwarzSetup(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
-           hypre_F90_PassObj (HYPRE_ParVector, b),
-           hypre_F90_PassObj (HYPRE_ParVector, x) ));
+           ( HYPRE_SchwarzSetup(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
+                hypre_F90_PassObj (HYPRE_ParVector, b),
+                hypre_F90_PassObj (HYPRE_ParVector, x) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -72,18 +72,18 @@ hypre_F90_IFACE(hypre_schwarzsetup, HYPRE_SCHWARZSETUP)
 
 void
 hypre_F90_IFACE(hypre_schwarzsolve, HYPRE_SCHWARZSOLVE)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Obj *A,
-    hypre_F90_Obj *b,
-    hypre_F90_Obj *x,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Obj *A,
+ hypre_F90_Obj *b,
+ hypre_F90_Obj *x,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_SchwarzSolve(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
-           hypre_F90_PassObj (HYPRE_ParVector, b),
-           hypre_F90_PassObj (HYPRE_ParVector, x) ));
+           ( HYPRE_SchwarzSolve(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
+                hypre_F90_PassObj (HYPRE_ParVector, b),
+                hypre_F90_PassObj (HYPRE_ParVector, x) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -91,14 +91,14 @@ hypre_F90_IFACE(hypre_schwarzsolve, HYPRE_SCHWARZSOLVE)
  *--------------------------------------------------------------------------*/
 void
 hypre_F90_IFACE(hypre_schwarzsetvariant, HYPRE_SCHWARZSETVARIANT)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *variant,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *variant,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_SchwarzSetVariant(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (variant) ));
+           ( HYPRE_SchwarzSetVariant(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (variant) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -107,14 +107,14 @@ hypre_F90_IFACE(hypre_schwarzsetvariant, HYPRE_SCHWARZSETVARIANT)
 
 void
 hypre_F90_IFACE(hypre_schwarzsetoverlap, HYPRE_SCHWARZSETOVERLAP)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *overlap,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *overlap,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_SchwarzSetOverlap(
-           hypre_F90_PassObj (HYPRE_Solver, solver), 
-           hypre_F90_PassInt (overlap)));
+           ( HYPRE_SchwarzSetOverlap(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (overlap)));
 }
 
 /*--------------------------------------------------------------------------
@@ -123,14 +123,14 @@ hypre_F90_IFACE(hypre_schwarzsetoverlap, HYPRE_SCHWARZSETOVERLAP)
 
 void
 hypre_F90_IFACE(hypre_schwarzsetdomaintype, HYPRE_SCHWARZSETDOMAINTYPE)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *domain_type,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *domain_type,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_SchwarzSetDomainType(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassInt (domain_type) ));
+           ( HYPRE_SchwarzSetDomainType(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassInt (domain_type) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -139,14 +139,14 @@ hypre_F90_IFACE(hypre_schwarzsetdomaintype, HYPRE_SCHWARZSETDOMAINTYPE)
 
 void
 hypre_F90_IFACE(hypre_schwarzsetdomainstructure, HYPRE_SCHWARZSETDOMAINSTRUCTURE)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Obj *domain_structure,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Obj *domain_structure,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_SchwarzSetDomainStructure(
-           hypre_F90_PassObj (HYPRE_Solver, solver),
-           hypre_F90_PassObj (HYPRE_CSRMatrix, domain_structure)));
+           ( HYPRE_SchwarzSetDomainStructure(
+                hypre_F90_PassObj (HYPRE_Solver, solver),
+                hypre_F90_PassObj (HYPRE_CSRMatrix, domain_structure)));
 }
 
 /*--------------------------------------------------------------------------
@@ -155,14 +155,14 @@ hypre_F90_IFACE(hypre_schwarzsetdomainstructure, HYPRE_SCHWARZSETDOMAINSTRUCTURE
 
 void
 hypre_F90_IFACE(hypre_schwarzsetnumfunctions, HYPRE_SCHWARZSETNUMFUNCTIONS)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *num_functions,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *num_functions,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SchwarzSetNumFunctions(
-          hypre_F90_PassObj (HYPRE_Solver, solver),
-          hypre_F90_PassInt (num_functions) ));
+           (HYPRE_SchwarzSetNumFunctions(
+               hypre_F90_PassObj (HYPRE_Solver, solver),
+               hypre_F90_PassInt (num_functions) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -171,14 +171,14 @@ hypre_F90_IFACE(hypre_schwarzsetnumfunctions, HYPRE_SCHWARZSETNUMFUNCTIONS)
 
 void
 hypre_F90_IFACE(hypre_schwarzsetrelaxweight, HYPRE_SCHWARZSETRELAXWEIGHT)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Real *relax_weight,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Real *relax_weight,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SchwarzSetRelaxWeight(
-          hypre_F90_PassObj (HYPRE_Solver, solver),
-          hypre_F90_PassReal (relax_weight)));
+           (HYPRE_SchwarzSetRelaxWeight(
+               hypre_F90_PassObj (HYPRE_Solver, solver),
+               hypre_F90_PassReal (relax_weight)));
 }
 
 /*--------------------------------------------------------------------------
@@ -187,14 +187,14 @@ hypre_F90_IFACE(hypre_schwarzsetrelaxweight, HYPRE_SCHWARZSETRELAXWEIGHT)
 
 void
 hypre_F90_IFACE(hypre_schwarzsetdoffunc, HYPRE_SCHWARZSETDOFFUNC)
-   (hypre_F90_Obj *solver,
-    hypre_F90_IntArray *dof_func,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_IntArray *dof_func,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SchwarzSetDofFunc(
-          hypre_F90_PassObj (HYPRE_Solver, solver),
-          hypre_F90_PassIntArray (dof_func)  ));
+           (HYPRE_SchwarzSetDofFunc(
+               hypre_F90_PassObj (HYPRE_Solver, solver),
+               hypre_F90_PassIntArray (dof_func)  ));
 }
 #ifdef __cplusplus
 }
diff --git a/external/hypre/src/parcsr_ls/F90_hypre_laplace.c b/external/hypre/src/parcsr_ls/F90_hypre_laplace.c
index 192c6964..4a4b0d6d 100644
--- a/external/hypre/src/parcsr_ls/F90_hypre_laplace.c
+++ b/external/hypre/src/parcsr_ls/F90_hypre_laplace.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -17,41 +17,41 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-    
+
 /*--------------------------------------------------------------------------
  * GenerateLaplacian
  *--------------------------------------------------------------------------*/
-    
+
 void
 hypre_F90_IFACE(hypre_generatelaplacian, HYPRE_GENERATELAPLACIAN)
-   ( hypre_F90_Comm *comm,
-     hypre_F90_Int *nx,
-     hypre_F90_Int *ny,
-     hypre_F90_Int *nz,
-     hypre_F90_Int *P,
-     hypre_F90_Int *Q,
-     hypre_F90_Int *R,
-     hypre_F90_Int *p,
-     hypre_F90_Int *q,
-     hypre_F90_Int *r,
-     hypre_F90_RealArray *value,
-     hypre_F90_Obj *matrix,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Comm *comm,
+  hypre_F90_Int *nx,
+  hypre_F90_Int *ny,
+  hypre_F90_Int *nz,
+  hypre_F90_Int *P,
+  hypre_F90_Int *Q,
+  hypre_F90_Int *R,
+  hypre_F90_Int *p,
+  hypre_F90_Int *q,
+  hypre_F90_Int *r,
+  hypre_F90_RealArray *value,
+  hypre_F90_Obj *matrix,
+  hypre_F90_Int *ierr   )
 
 {
    *matrix = (hypre_F90_Obj)
-      ( GenerateLaplacian(
-           hypre_F90_PassComm (comm),
-           hypre_F90_PassInt (nx),
-           hypre_F90_PassInt (ny),
-           hypre_F90_PassInt (nz),
-           hypre_F90_PassInt (P),
-           hypre_F90_PassInt (Q),
-           hypre_F90_PassInt (R),
-           hypre_F90_PassInt (p),
-           hypre_F90_PassInt (q),
-           hypre_F90_PassInt (r),
-           hypre_F90_PassRealArray (value) ) );
+             ( GenerateLaplacian(
+                  hypre_F90_PassComm (comm),
+                  hypre_F90_PassInt (nx),
+                  hypre_F90_PassInt (ny),
+                  hypre_F90_PassInt (nz),
+                  hypre_F90_PassInt (P),
+                  hypre_F90_PassInt (Q),
+                  hypre_F90_PassInt (R),
+                  hypre_F90_PassInt (p),
+                  hypre_F90_PassInt (q),
+                  hypre_F90_PassInt (r),
+                  hypre_F90_PassRealArray (value) ) );
 
    *ierr = 0;
 }
diff --git a/external/hypre/src/parcsr_ls/HYPRE_ads.c b/external/hypre/src/parcsr_ls/HYPRE_ads.c
index fea04f6f..25e9b621 100644
--- a/external/hypre/src/parcsr_ls/HYPRE_ads.c
+++ b/external/hypre/src/parcsr_ls/HYPRE_ads.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -183,7 +183,7 @@ HYPRE_Int HYPRE_ADSSetSmoothingOptions(HYPRE_Solver solver,
 
 HYPRE_Int HYPRE_ADSSetChebySmoothingOptions(HYPRE_Solver solver,
                                             HYPRE_Int cheby_order,
-                                            HYPRE_Int cheby_fraction)
+                                            HYPRE_Real cheby_fraction)
 {
    return hypre_ADSSetChebySmoothingOptions((void *) solver,
                                             cheby_order,
diff --git a/external/hypre/src/parcsr_ls/HYPRE_ame.c b/external/hypre/src/parcsr_ls/HYPRE_ame.c
index 6699ddd3..57418b91 100644
--- a/external/hypre/src/parcsr_ls/HYPRE_ame.c
+++ b/external/hypre/src/parcsr_ls/HYPRE_ame.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -86,6 +86,16 @@ HYPRE_Int HYPRE_AMESetMaxIter(HYPRE_Solver esolver,
    return hypre_AMESetMaxIter((void *) esolver, maxit);
 }
 
+/*--------------------------------------------------------------------------
+ * HYPRE_AMESetMaxPCGIter
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int HYPRE_AMESetMaxPCGIter(HYPRE_Solver esolver,
+                                 HYPRE_Int maxit)
+{
+   return hypre_AMESetMaxPCGIter((void *) esolver, maxit);
+}
+
 /*--------------------------------------------------------------------------
  * HYPRE_AMESetTol
  *--------------------------------------------------------------------------*/
@@ -101,7 +111,7 @@ HYPRE_Int HYPRE_AMESetTol(HYPRE_Solver esolver,
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int HYPRE_AMESetRTol(HYPRE_Solver esolver,
-			   HYPRE_Real tol)
+                           HYPRE_Real tol)
 {
    return hypre_AMESetRTol((void *) esolver, tol);
 }
diff --git a/external/hypre/src/parcsr_ls/HYPRE_ams.c b/external/hypre/src/parcsr_ls/HYPRE_ams.c
index 3de3a7e6..b616e02c 100644
--- a/external/hypre/src/parcsr_ls/HYPRE_ams.c
+++ b/external/hypre/src/parcsr_ls/HYPRE_ams.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -231,7 +231,7 @@ HYPRE_Int HYPRE_AMSSetSmoothingOptions(HYPRE_Solver solver,
 
 HYPRE_Int HYPRE_AMSSetChebySmoothingOptions(HYPRE_Solver solver,
                                             HYPRE_Int cheby_order,
-                                            HYPRE_Int cheby_fraction)
+                                            HYPRE_Real cheby_fraction)
 {
    return hypre_AMSSetChebySmoothingOptions((void *) solver,
                                             cheby_order,
diff --git a/external/hypre/src/parcsr_ls/HYPRE_parcsr_Euclid.c b/external/hypre/src/parcsr_ls/HYPRE_parcsr_Euclid.c
index 2e983baa..38bff44f 100644
--- a/external/hypre/src/parcsr_ls/HYPRE_parcsr_Euclid.c
+++ b/external/hypre/src/parcsr_ls/HYPRE_parcsr_Euclid.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -37,32 +37,32 @@
             hypre_MPI_Abort(comm_dh, -1); \
           }
 
-  /* What is best to do here?  
-   * What is HYPRE's error checking strategy?  
-   * The shadow knows . . .
-   *
-   * Note: HYPRE_EUCLID_ERRCHKA macro is only used within this file.
-   *
-   * Note: "printErrorMsg(stderr)" is O.K. for debugging and
-   *        development, possibly not for production.  This
-   *        call causes Euclid to print a function call stack
-   *        trace that led to the error.  (Potentially, each
-   *        MPI task could print a trace.)
-   *
-   * Note: the __FUNC__ defines at the beginning of the function
-   *       calls are used in Euclid's internal error-checking scheme.
-   *       The "START_FUNC_DH" and "END_FUNC_VAL" macros are
-   *       used for debugging: when "logFuncsToStderr == true"
-   *       a function call trace is force-written to stderr;
-   *       (useful for debugging over dial-up lines!)  See
-   *       src/distributed_ls/Euclid/macros_dh.h and
-   *       src/distributed_ls/Euclid/src/globalObjects.c
-   *       for further info.
-   */
+/* What is best to do here?
+ * What is HYPRE's error checking strategy?
+ * The shadow knows . . .
+ *
+ * Note: HYPRE_EUCLID_ERRCHKA macro is only used within this file.
+ *
+ * Note: "printErrorMsg(stderr)" is O.K. for debugging and
+ *        development, possibly not for production.  This
+ *        call causes Euclid to print a function call stack
+ *        trace that led to the error.  (Potentially, each
+ *        MPI task could print a trace.)
+ *
+ * Note: the __FUNC__ defines at the beginning of the function
+ *       calls are used in Euclid's internal error-checking scheme.
+ *       The "START_FUNC_DH" and "END_FUNC_VAL" macros are
+ *       used for debugging: when "logFuncsToStderr == true"
+ *       a function call trace is force-written to stderr;
+ *       (useful for debugging over dial-up lines!)  See
+ *       src/distributed_ls/Euclid/macros_dh.h and
+ *       src/distributed_ls/Euclid/src/globalObjects.c
+ *       for further info.
+ */
 
 
 /*--------------------------------------------------------------------------
- * debugging: if ENABLE_EUCLID_LOGGING is defined, each MPI task will open 
+ * debugging: if ENABLE_EUCLID_LOGGING is defined, each MPI task will open
  * "logFile.id" for writing; also, function-call tracing is operational
  * (ie, you can set logFuncsToFile = true, logFuncsToSterr = true).
  *
@@ -80,59 +80,64 @@
 
 
 /*--------------------------------------------------------------------------
- * HYPRE_EuclidCreate - Return a Euclid "solver".  
+ * HYPRE_EuclidCreate - Return a Euclid "solver".
  *--------------------------------------------------------------------------*/
 
 #undef __FUNC__
 #define __FUNC__ "HYPRE_EuclidCreate"
-HYPRE_Int 
+HYPRE_Int
 HYPRE_EuclidCreate( MPI_Comm comm,
                     HYPRE_Solver *solver )
 {
 #ifdef HYPRE_MIXEDINT
-  hypre_error_w_msg(HYPRE_ERROR_GENERIC,"Euclid cannot be used in mixedint mode!");
-  return hypre_error_flag;
+   HYPRE_UNUSED_VAR(comm);
+   HYPRE_UNUSED_VAR(solver);
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Euclid cannot be used in mixedint mode!");
+   return hypre_error_flag;
 #else
 
-  START_FUNC_DH
-  Euclid_dh eu; 
+   START_FUNC_DH
+   Euclid_dh eu;
 
-  /*----------------------------------------------------------- 
-   * create a few global objects (yuck!) for Euclid's use;
-   * these  are all pointers, are initially NULL, and are be set 
-   * back to NULL in HYPRE_EuclidDestroy()
-   * Global objects are defined in 
-   * src/distributed_ls/Euclid/src/globalObjects.c
-   *-----------------------------------------------------------*/
+   /*-----------------------------------------------------------
+    * create a few global objects (yuck!) for Euclid's use;
+    * these  are all pointers, are initially NULL, and are be set
+    * back to NULL in HYPRE_EuclidDestroy()
+    * Global objects are defined in
+    * src/distributed_ls/Euclid/src/globalObjects.c
+    *-----------------------------------------------------------*/
 
-  comm_dh = comm;
-  hypre_MPI_Comm_size(comm_dh, &np_dh);    HYPRE_EUCLID_ERRCHKA;
-  hypre_MPI_Comm_rank(comm_dh, &myid_dh);  HYPRE_EUCLID_ERRCHKA;
+   comm_dh = comm;
+   hypre_MPI_Comm_size(comm_dh, &np_dh);    HYPRE_EUCLID_ERRCHKA;
+   hypre_MPI_Comm_rank(comm_dh, &myid_dh);  HYPRE_EUCLID_ERRCHKA;
 
 #ifdef ENABLE_EUCLID_LOGGING
-  openLogfile_dh(0, NULL); HYPRE_EUCLID_ERRCHKA;
+   openLogfile_dh(0, NULL); HYPRE_EUCLID_ERRCHKA;
 #endif
 
-  if (mem_dh == NULL) {
-    Mem_dhCreate(&mem_dh);  HYPRE_EUCLID_ERRCHKA;
-  }
-
-  if (tlog_dh == NULL) {
-    TimeLog_dhCreate(&tlog_dh); HYPRE_EUCLID_ERRCHKA;
-  }
-
-  if (parser_dh == NULL) {
-    Parser_dhCreate(&parser_dh); HYPRE_EUCLID_ERRCHKA;
-  }
-  Parser_dhInit(parser_dh, 0, NULL); HYPRE_EUCLID_ERRCHKA;
-
-  /*----------------------------------------------------------- 
-   * create and return a Euclid object
-   *-----------------------------------------------------------*/
-  Euclid_dhCreate(&eu); HYPRE_EUCLID_ERRCHKA;
-  *solver = (HYPRE_Solver) eu;
-
-  END_FUNC_VAL(0)
+   if (mem_dh == NULL)
+   {
+      Mem_dhCreate(&mem_dh);  HYPRE_EUCLID_ERRCHKA;
+   }
+
+   if (tlog_dh == NULL)
+   {
+      TimeLog_dhCreate(&tlog_dh); HYPRE_EUCLID_ERRCHKA;
+   }
+
+   if (parser_dh == NULL)
+   {
+      Parser_dhCreate(&parser_dh); HYPRE_EUCLID_ERRCHKA;
+   }
+   Parser_dhInit(parser_dh, 0, NULL); HYPRE_EUCLID_ERRCHKA;
+
+   /*-----------------------------------------------------------
+    * create and return a Euclid object
+    *-----------------------------------------------------------*/
+   Euclid_dhCreate(&eu); HYPRE_EUCLID_ERRCHKA;
+   *solver = (HYPRE_Solver) eu;
+
+   END_FUNC_VAL(0)
 #endif
 }
 
@@ -142,102 +147,114 @@ HYPRE_EuclidCreate( MPI_Comm comm,
 
 #undef __FUNC__
 #define __FUNC__ "HYPRE_EuclidDestroy"
-HYPRE_Int 
+HYPRE_Int
 HYPRE_EuclidDestroy( HYPRE_Solver solver )
 {
 #ifdef HYPRE_MIXEDINT
-  hypre_error_w_msg(HYPRE_ERROR_GENERIC,"Euclid cannot be used in mixedint mode!");
-  return hypre_error_flag;
+   HYPRE_UNUSED_VAR(solver);
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Euclid cannot be used in mixedint mode!");
+   return hypre_error_flag;
 #else
 
-  START_FUNC_DH
-  Euclid_dh eu = (Euclid_dh)solver;
-  bool printMemReport = false;
-  bool printStats = false;
-  bool logging = eu->logging;
-
-  /*---------------------------------------------------------------- 
-     this block is for printing test data; this is used
-     for diffing in autotests.
-   *---------------------------------------------------------------- */
-  if (Parser_dhHasSwitch(parser_dh, "-printTestData")) {
-    FILE *fp;
-
-    /* get filename to which to write report */
-    char fname[] = "test_data_dh.temp", *fnamePtr = fname;
-    Parser_dhReadString(parser_dh, "-printTestData", &fnamePtr); HYPRE_EUCLID_ERRCHKA;
-    if (!strcmp(fnamePtr, "1")) {  /* in case usr didn't supply a name! */
-      fnamePtr = fname;
-    }
-
-    /* print the report */
-    fp = openFile_dh(fnamePtr, "w"); HYPRE_EUCLID_ERRCHKA;
-    Euclid_dhPrintTestData(eu, fp); HYPRE_EUCLID_ERRCHKA;
-    closeFile_dh(fp); HYPRE_EUCLID_ERRCHKA;
-   
-    printf_dh("\n@@@@@ Euclid test data was printed to file: %s\n\n", fnamePtr);
-  }
-
-
-  /*---------------------------------------------------------------- 
-     determine which of Euclid's internal reports to print
-   *----------------------------------------------------------------*/
-  if (logging) {
-    printStats = true;
-    printMemReport = true;
-  }
-  if (parser_dh != NULL) {
-    if (Parser_dhHasSwitch(parser_dh, "-eu_stats")) {
+   START_FUNC_DH
+   Euclid_dh eu = (Euclid_dh)solver;
+   bool printMemReport = false;
+   bool printStats = false;
+   bool logging = eu->logging;
+
+   /*----------------------------------------------------------------
+      this block is for printing test data; this is used
+      for diffing in autotests.
+    *---------------------------------------------------------------- */
+   if (Parser_dhHasSwitch(parser_dh, "-printTestData"))
+   {
+      FILE *fp;
+
+      /* get filename to which to write report */
+      char fname[] = "test_data_dh.temp", *fnamePtr = fname;
+      Parser_dhReadString(parser_dh, "-printTestData", &fnamePtr); HYPRE_EUCLID_ERRCHKA;
+      if (!strcmp(fnamePtr, "1"))    /* in case usr didn't supply a name! */
+      {
+         fnamePtr = fname;
+      }
+
+      /* print the report */
+      fp = openFile_dh(fnamePtr, "w"); HYPRE_EUCLID_ERRCHKA;
+      Euclid_dhPrintTestData(eu, fp); HYPRE_EUCLID_ERRCHKA;
+      closeFile_dh(fp); HYPRE_EUCLID_ERRCHKA;
+
+      printf_dh("\n@@@@@ Euclid test data was printed to file: %s\n\n", fnamePtr);
+   }
+
+
+   /*----------------------------------------------------------------
+      determine which of Euclid's internal reports to print
+    *----------------------------------------------------------------*/
+   if (logging)
+   {
       printStats = true;
-    }
-    if (Parser_dhHasSwitch(parser_dh, "-eu_mem")) {
       printMemReport = true;
-    }
-  }
-
-  /*------------------------------------------------------------------ 
-     print Euclid's internal report, then destroy the Euclid object 
-   *------------------------------------------------------------------ */
-  if (printStats) {
-    Euclid_dhPrintHypreReport(eu, stdout); HYPRE_EUCLID_ERRCHKA;
-  }
-  Euclid_dhDestroy(eu); HYPRE_EUCLID_ERRCHKA;
-
-
-  /*------------------------------------------------------------------ 
-     destroy all remaining Euclid library objects 
-     (except the memory object)
-   *------------------------------------------------------------------ */
-  /*if (parser_dh != NULL) { dah 3/16/06  */
-  if (parser_dh != NULL && ref_counter == 0) {
-    Parser_dhDestroy(parser_dh); HYPRE_EUCLID_ERRCHKA;
-    parser_dh = NULL;
-  }
-
-  /*if (tlog_dh != NULL) {  dah 3/16/06  */
-  if (tlog_dh != NULL && ref_counter == 0) {
-    TimeLog_dhDestroy(tlog_dh); HYPRE_EUCLID_ERRCHKA;
-    tlog_dh = NULL;
-  }
-
-  /*------------------------------------------------------------------ 
-     optionally print Euclid's memory report, 
-     then destroy the memory object.
-   *------------------------------------------------------------------ */
-  /*if (mem_dh != NULL) {  dah 3/16/06  */
-  if (mem_dh != NULL && ref_counter == 0) {
-    if (printMemReport) { 
-      Mem_dhPrint(mem_dh, stdout, false); HYPRE_EUCLID_ERRCHKA; 
-    }
-    Mem_dhDestroy(mem_dh);  HYPRE_EUCLID_ERRCHKA;
-    mem_dh = NULL;
-  }
+   }
+   if (parser_dh != NULL)
+   {
+      if (Parser_dhHasSwitch(parser_dh, "-eu_stats"))
+      {
+         printStats = true;
+      }
+      if (Parser_dhHasSwitch(parser_dh, "-eu_mem"))
+      {
+         printMemReport = true;
+      }
+   }
+
+   /*------------------------------------------------------------------
+      print Euclid's internal report, then destroy the Euclid object
+    *------------------------------------------------------------------ */
+   if (printStats)
+   {
+      Euclid_dhPrintHypreReport(eu, stdout); HYPRE_EUCLID_ERRCHKA;
+   }
+   Euclid_dhDestroy(eu); HYPRE_EUCLID_ERRCHKA;
+
+
+   /*------------------------------------------------------------------
+      destroy all remaining Euclid library objects
+      (except the memory object)
+    *------------------------------------------------------------------ */
+   /*if (parser_dh != NULL) { dah 3/16/06  */
+   if (parser_dh != NULL && ref_counter == 0)
+   {
+      Parser_dhDestroy(parser_dh); HYPRE_EUCLID_ERRCHKA;
+      parser_dh = NULL;
+   }
+
+   /*if (tlog_dh != NULL) {  dah 3/16/06  */
+   if (tlog_dh != NULL && ref_counter == 0)
+   {
+      TimeLog_dhDestroy(tlog_dh); HYPRE_EUCLID_ERRCHKA;
+      tlog_dh = NULL;
+   }
+
+   /*------------------------------------------------------------------
+      optionally print Euclid's memory report,
+      then destroy the memory object.
+    *------------------------------------------------------------------ */
+   /*if (mem_dh != NULL) {  dah 3/16/06  */
+   if (mem_dh != NULL && ref_counter == 0)
+   {
+      if (printMemReport)
+      {
+         Mem_dhPrint(mem_dh, stdout, false); HYPRE_EUCLID_ERRCHKA;
+      }
+      Mem_dhDestroy(mem_dh);  HYPRE_EUCLID_ERRCHKA;
+      mem_dh = NULL;
+   }
 
 #ifdef ENABLE_EUCLID_LOGGING
-  closeLogfile_dh(); HYPRE_EUCLID_ERRCHKA;
+   closeLogfile_dh(); HYPRE_EUCLID_ERRCHKA;
 #endif
 
-  END_FUNC_VAL(0)
+   END_FUNC_VAL(0)
 #endif
 }
 
@@ -247,49 +264,54 @@ HYPRE_EuclidDestroy( HYPRE_Solver solver )
 
 #undef __FUNC__
 #define __FUNC__ "HYPRE_EuclidSetup"
-HYPRE_Int 
+HYPRE_Int
 HYPRE_EuclidSetup( HYPRE_Solver solver,
                    HYPRE_ParCSRMatrix A,
                    HYPRE_ParVector b,
                    HYPRE_ParVector x   )
 {
+   HYPRE_UNUSED_VAR(b);
+   HYPRE_UNUSED_VAR(x);
+
 #ifdef HYPRE_MIXEDINT
-  hypre_error_w_msg(HYPRE_ERROR_GENERIC,"Euclid cannot be used in mixedint mode!");
-  return hypre_error_flag;
+   HYPRE_UNUSED_VAR(solver);
+   HYPRE_UNUSED_VAR(A);
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Euclid cannot be used in mixedint mode!");
+   return hypre_error_flag;
 #else
 
-  START_FUNC_DH
-  Euclid_dh eu = (Euclid_dh)solver;
+   START_FUNC_DH
+   Euclid_dh eu = (Euclid_dh)solver;
 
 
 #if 0
 
-for testing!
-  {
-  HYPRE_Int ierr;
-  HYPRE_Int m,n,rs,re,cs,ce;
+   for testing!
+{
+   HYPRE_Int ierr;
+   HYPRE_Int m, n, rs, re, cs, ce;
 
    HYPRE_DistributedMatrix mat;
    ierr = HYPRE_ConvertParCSRMatrixToDistributedMatrix( A, &mat );
-   if (ierr) exit(-1);
+      if (ierr) { exit(-1); }
 
-    ierr = HYPRE_DistributedMatrixGetDims(mat, &m, &n);
-    ierr = HYPRE_DistributedMatrixGetLocalRange(mat, &rs, &re,
-                                       &cs, &ce);
+      ierr = HYPRE_DistributedMatrixGetDims(mat, &m, &n);
+      ierr = HYPRE_DistributedMatrixGetLocalRange(mat, &rs, &re,
+                                                  &cs, &ce);
 
-    hypre_printf("\n### [%i] m= %i, n= %i, rs= %i, re= %i, cs= %i, ce= %i\n",
-                                            myid_dh, m, n, rs, re, cs, ce);
+      hypre_printf("\n### [%i] m= %i, n= %i, rs= %i, re= %i, cs= %i, ce= %i\n",
+                   myid_dh, m, n, rs, re, cs, ce);
 
-   ierr = HYPRE_DistributedMatrixDestroy(mat);
+      ierr = HYPRE_DistributedMatrixDestroy(mat);
 
-   if (ierr) exit(-1);
-  }
+      if (ierr) { exit(-1); }
+   }
 #endif
 
-  Euclid_dhInputHypreMat(eu, A); HYPRE_EUCLID_ERRCHKA;
-  Euclid_dhSetup(eu); HYPRE_EUCLID_ERRCHKA;
+   Euclid_dhInputHypreMat(eu, A); HYPRE_EUCLID_ERRCHKA;
+   Euclid_dhSetup(eu); HYPRE_EUCLID_ERRCHKA;
 
-  END_FUNC_VAL(0)
+   END_FUNC_VAL(0)
 #endif
 }
 
@@ -299,51 +321,60 @@ for testing!
 
 #undef __FUNC__
 #define __FUNC__ "HYPRE_EuclidSolve"
-HYPRE_Int 
-HYPRE_EuclidSolve( HYPRE_Solver solver,
-                   HYPRE_ParCSRMatrix A,
-                   HYPRE_ParVector bb,
-                   HYPRE_ParVector xx  )
+HYPRE_Int
+HYPRE_EuclidSolve( HYPRE_Solver        solver,
+                   HYPRE_ParCSRMatrix  A,
+                   HYPRE_ParVector     bb,
+                   HYPRE_ParVector     xx  )
 {
+   HYPRE_UNUSED_VAR(A);
+
 #ifdef HYPRE_MIXEDINT
-  hypre_error_w_msg(HYPRE_ERROR_GENERIC,"Euclid cannot be used in mixedint mode!");
-  return hypre_error_flag;
+   HYPRE_UNUSED_VAR(solver);
+   HYPRE_UNUSED_VAR(bb);
+   HYPRE_UNUSED_VAR(xx);
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Euclid cannot be used in mixedint mode!");
+   return hypre_error_flag;
 #else
 
-  START_FUNC_DH
-  Euclid_dh eu = (Euclid_dh)solver;
-  HYPRE_Real *b, *x;
+   START_FUNC_DH
+   Euclid_dh eu = (Euclid_dh)solver;
+   HYPRE_Real *b, *x;
 
-  x = hypre_VectorData(hypre_ParVectorLocalVector((hypre_ParVector *) bb));
-  b = hypre_VectorData(hypre_ParVectorLocalVector((hypre_ParVector *) xx));
+   x = hypre_VectorData(hypre_ParVectorLocalVector((hypre_ParVector *) bb));
+   b = hypre_VectorData(hypre_ParVectorLocalVector((hypre_ParVector *) xx));
 
-  Euclid_dhApply(eu, x, b); HYPRE_EUCLID_ERRCHKA;
-  END_FUNC_VAL(0)
+   Euclid_dhApply(eu, x, b); HYPRE_EUCLID_ERRCHKA;
+   END_FUNC_VAL(0)
 #endif
 }
 
 /*--------------------------------------------------------------------------
- * Insert command line (flag, value) pairs in Euclid's 
+ * Insert command line (flag, value) pairs in Euclid's
  *--------------------------------------------------------------------------*/
 
 #undef __FUNC__
 #define __FUNC__ "HYPRE_EuclidSetParams"
 HYPRE_Int
-HYPRE_EuclidSetParams(HYPRE_Solver solver, 
+HYPRE_EuclidSetParams(HYPRE_Solver solver,
                       HYPRE_Int argc,
                       char *argv[] )
 {
+   HYPRE_UNUSED_VAR(solver);
+
 #ifdef HYPRE_MIXEDINT
-  hypre_error_w_msg(HYPRE_ERROR_GENERIC,"Euclid cannot be used in mixedint mode!");
-  return hypre_error_flag;
+   HYPRE_UNUSED_VAR(argc);
+   HYPRE_UNUSED_VAR(argv);
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Euclid cannot be used in mixedint mode!");
+   return hypre_error_flag;
 #else
-  START_FUNC_DH
-  Parser_dhInit(parser_dh, argc, argv); HYPRE_EUCLID_ERRCHKA;
+   START_FUNC_DH
+   Parser_dhInit(parser_dh, argc, argv); HYPRE_EUCLID_ERRCHKA;
 
-  /* maintainers note: even though Parser_dhInit() was called in
-     HYPRE_EuclidCreate(), it's O.K. to call it again.
-   */
-  END_FUNC_VAL(0)
+   /* maintainers note: even though Parser_dhInit() was called in
+      HYPRE_EuclidCreate(), it's O.K. to call it again.
+    */
+   END_FUNC_VAL(0)
 #endif
 }
 
@@ -354,138 +385,161 @@ HYPRE_EuclidSetParams(HYPRE_Solver solver,
 #undef __FUNC__
 #define __FUNC__ "HYPRE_EuclidSetParamsFromFile"
 HYPRE_Int
-HYPRE_EuclidSetParamsFromFile(HYPRE_Solver solver, 
+HYPRE_EuclidSetParamsFromFile(HYPRE_Solver solver,
                               char *filename )
 {
+   HYPRE_UNUSED_VAR(solver);
+
 #ifdef HYPRE_MIXEDINT
-  hypre_error_w_msg(HYPRE_ERROR_GENERIC,"Euclid cannot be used in mixedint mode!");
-  return hypre_error_flag;
+   HYPRE_UNUSED_VAR(filename);
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Euclid cannot be used in mixedint mode!");
+   return hypre_error_flag;
 #else
 
-  START_FUNC_DH
-  Parser_dhUpdateFromFile(parser_dh, filename); HYPRE_EUCLID_ERRCHKA;
-  END_FUNC_VAL(0)
+   START_FUNC_DH
+   Parser_dhUpdateFromFile(parser_dh, filename); HYPRE_EUCLID_ERRCHKA;
+   END_FUNC_VAL(0)
 #endif
 }
 
 HYPRE_Int
-HYPRE_EuclidSetLevel(HYPRE_Solver solver, 
+HYPRE_EuclidSetLevel(HYPRE_Solver solver,
                      HYPRE_Int level)
 {
+   HYPRE_UNUSED_VAR(solver);
+
 #ifdef HYPRE_MIXEDINT
-  hypre_error_w_msg(HYPRE_ERROR_GENERIC,"Euclid cannot be used in mixedint mode!");
-  return hypre_error_flag;
+   HYPRE_UNUSED_VAR(level);
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Euclid cannot be used in mixedint mode!");
+   return hypre_error_flag;
 #else
 
-  char str_level[8];
-  START_FUNC_DH
-  hypre_sprintf(str_level,"%d",level);
-  Parser_dhInsert(parser_dh, "-level", str_level); HYPRE_EUCLID_ERRCHKA;
-  END_FUNC_VAL(0)
+   char str_level[8];
+   START_FUNC_DH
+   hypre_sprintf(str_level, "%d", level);
+   Parser_dhInsert(parser_dh, "-level", str_level); HYPRE_EUCLID_ERRCHKA;
+   END_FUNC_VAL(0)
 #endif
 }
 
 HYPRE_Int
-HYPRE_EuclidSetBJ(HYPRE_Solver solver, 
+HYPRE_EuclidSetBJ(HYPRE_Solver solver,
                   HYPRE_Int bj)
 {
+   HYPRE_UNUSED_VAR(solver);
+
 #ifdef HYPRE_MIXEDINT
-  hypre_error_w_msg(HYPRE_ERROR_GENERIC,"Euclid cannot be used in mixedint mode!");
-  return hypre_error_flag;
+   HYPRE_UNUSED_VAR(bj);
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Euclid cannot be used in mixedint mode!");
+   return hypre_error_flag;
 #else
 
-  char str_bj[8];
-  START_FUNC_DH
-  hypre_sprintf(str_bj,"%d",bj);
-  Parser_dhInsert(parser_dh, "-bj", str_bj); HYPRE_EUCLID_ERRCHKA;
-  END_FUNC_VAL(0)
+   char str_bj[8];
+   START_FUNC_DH
+   hypre_sprintf(str_bj, "%d", bj);
+   Parser_dhInsert(parser_dh, "-bj", str_bj); HYPRE_EUCLID_ERRCHKA;
+   END_FUNC_VAL(0)
 #endif
 }
 
 HYPRE_Int
-HYPRE_EuclidSetStats(HYPRE_Solver solver, 
+HYPRE_EuclidSetStats(HYPRE_Solver solver,
                      HYPRE_Int eu_stats)
 {
+   HYPRE_UNUSED_VAR(solver);
+
 #ifdef HYPRE_MIXEDINT
-  hypre_error_w_msg(HYPRE_ERROR_GENERIC,"Euclid cannot be used in mixedint mode!");
-  return hypre_error_flag;
+   HYPRE_UNUSED_VAR(eu_stats);
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Euclid cannot be used in mixedint mode!");
+   return hypre_error_flag;
 #else
 
-  char str_eu_stats[8];
-  START_FUNC_DH
-  hypre_sprintf(str_eu_stats,"%d",eu_stats);
-  Parser_dhInsert(parser_dh, "-eu_stats", str_eu_stats); HYPRE_EUCLID_ERRCHKA;
-  END_FUNC_VAL(0)
+   char str_eu_stats[8];
+   START_FUNC_DH
+   hypre_sprintf(str_eu_stats, "%d", eu_stats);
+   Parser_dhInsert(parser_dh, "-eu_stats", str_eu_stats); HYPRE_EUCLID_ERRCHKA;
+   END_FUNC_VAL(0)
 #endif
 }
 
 HYPRE_Int
-HYPRE_EuclidSetMem(HYPRE_Solver solver, 
+HYPRE_EuclidSetMem(HYPRE_Solver solver,
                    HYPRE_Int eu_mem)
 {
+   HYPRE_UNUSED_VAR(solver);
+
 #ifdef HYPRE_MIXEDINT
-  hypre_error_w_msg(HYPRE_ERROR_GENERIC,"Euclid cannot be used in mixedint mode!");
-  return hypre_error_flag;
+   HYPRE_UNUSED_VAR(eu_mem);
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Euclid cannot be used in mixedint mode!");
+   return hypre_error_flag;
 #else
 
-  char str_eu_mem[8];
-  START_FUNC_DH
-  hypre_sprintf(str_eu_mem,"%d",eu_mem);
-  Parser_dhInsert(parser_dh, "-eu_mem", str_eu_mem); HYPRE_EUCLID_ERRCHKA;
-  END_FUNC_VAL(0)
+   char str_eu_mem[8];
+   START_FUNC_DH
+   hypre_sprintf(str_eu_mem, "%d", eu_mem);
+   Parser_dhInsert(parser_dh, "-eu_mem", str_eu_mem); HYPRE_EUCLID_ERRCHKA;
+   END_FUNC_VAL(0)
 #endif
 }
 
 HYPRE_Int
-HYPRE_EuclidSetSparseA(HYPRE_Solver solver, 
+HYPRE_EuclidSetSparseA(HYPRE_Solver solver,
                        HYPRE_Real sparse_A)
 {
+   HYPRE_UNUSED_VAR(solver);
+
 #ifdef HYPRE_MIXEDINT
-  hypre_error_w_msg(HYPRE_ERROR_GENERIC,"Euclid cannot be used in mixedint mode!");
-  return hypre_error_flag;
+   HYPRE_UNUSED_VAR(sparse_A);
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Euclid cannot be used in mixedint mode!");
+   return hypre_error_flag;
 #else
 
-  char str_sparse_A[256];
-  START_FUNC_DH
-  hypre_sprintf(str_sparse_A,"%f",sparse_A);
-  Parser_dhInsert(parser_dh, "-sparseA", str_sparse_A); 
-  HYPRE_EUCLID_ERRCHKA;
-  END_FUNC_VAL(0)
+   char str_sparse_A[256];
+   START_FUNC_DH
+   hypre_sprintf(str_sparse_A, "%f", sparse_A);
+   Parser_dhInsert(parser_dh, "-sparseA", str_sparse_A);
+   HYPRE_EUCLID_ERRCHKA;
+   END_FUNC_VAL(0)
 #endif
 }
 
 HYPRE_Int
-HYPRE_EuclidSetRowScale(HYPRE_Solver solver, 
+HYPRE_EuclidSetRowScale(HYPRE_Solver solver,
                         HYPRE_Int row_scale)
 {
+   HYPRE_UNUSED_VAR(solver);
+
 #ifdef HYPRE_MIXEDINT
-  hypre_error_w_msg(HYPRE_ERROR_GENERIC,"Euclid cannot be used in mixedint mode!");
-  return hypre_error_flag;
+   HYPRE_UNUSED_VAR(row_scale);
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Euclid cannot be used in mixedint mode!");
+   return hypre_error_flag;
 #else
 
-  char str_row_scale[8];
-  START_FUNC_DH
-  hypre_sprintf(str_row_scale,"%d",row_scale);
-  Parser_dhInsert(parser_dh, "-rowScale", str_row_scale); 
-  HYPRE_EUCLID_ERRCHKA;
-  END_FUNC_VAL(0)
+   char str_row_scale[8];
+   START_FUNC_DH
+   hypre_sprintf(str_row_scale, "%d", row_scale);
+   Parser_dhInsert(parser_dh, "-rowScale", str_row_scale);
+   HYPRE_EUCLID_ERRCHKA;
+   END_FUNC_VAL(0)
 #endif
 }
 
 HYPRE_Int
-HYPRE_EuclidSetILUT(HYPRE_Solver solver, 
+HYPRE_EuclidSetILUT(HYPRE_Solver solver,
                     HYPRE_Real ilut)
 {
+   HYPRE_UNUSED_VAR(solver);
+
 #ifdef HYPRE_MIXEDINT
-  hypre_error_w_msg(HYPRE_ERROR_GENERIC,"Euclid cannot be used in mixedint mode!");
-  return hypre_error_flag;
+   HYPRE_UNUSED_VAR(ilut);
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Euclid cannot be used in mixedint mode!");
+   return hypre_error_flag;
 #else
 
-  char str_ilut[256];
-  START_FUNC_DH
-  hypre_sprintf(str_ilut,"%f",ilut);
-  Parser_dhInsert(parser_dh, "-ilut", str_ilut); HYPRE_EUCLID_ERRCHKA;
-  END_FUNC_VAL(0)
+   char str_ilut[256];
+   START_FUNC_DH
+   hypre_sprintf(str_ilut, "%f", ilut);
+   Parser_dhInsert(parser_dh, "-ilut", str_ilut); HYPRE_EUCLID_ERRCHKA;
+   END_FUNC_VAL(0)
 #endif
 }
-
diff --git a/external/hypre/src/parcsr_ls/HYPRE_parcsr_ParaSails.c b/external/hypre/src/parcsr_ls/HYPRE_parcsr_ParaSails.c
index cfbdeec3..8e5a30c2 100644
--- a/external/hypre/src/parcsr_ls/HYPRE_parcsr_ParaSails.c
+++ b/external/hypre/src/parcsr_ls/HYPRE_parcsr_ParaSails.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -35,7 +35,7 @@
 /* AB 8/06 - replace header file */
 /* #include "../parcsr_mv/par_vector.h" */
 #include "../parcsr_mv/_hypre_parcsr_mv.h"
-    
+
 /* If code is more mysterious, then it must be good */
 typedef struct
 {
@@ -49,22 +49,24 @@ typedef struct
    MPI_Comm        comm;
    HYPRE_Int       logging;
 }
-   Secret;
+Secret;
 
 /*--------------------------------------------------------------------------
- * HYPRE_ParCSRParaSailsCreate - Return a ParaSails preconditioner object 
+ * HYPRE_ParCSRParaSailsCreate - Return a ParaSails preconditioner object
  * "solver".  The default parameters for the preconditioner are also set,
  * so a call to HYPRE_ParCSRParaSailsSetParams is not absolutely necessary.
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_ParCSRParaSailsCreate( MPI_Comm comm, HYPRE_Solver *solver )
 {
 #ifdef HYPRE_MIXEDINT
-   hypre_error_w_msg(HYPRE_ERROR_GENERIC,"ParaSails not usable in mixedint mode!");
+   HYPRE_UNUSED_VAR(comm);
+   HYPRE_UNUSED_VAR(solver);
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "ParaSails not usable in mixedint mode!");
    return hypre_error_flag;
 #else
-   
+
    Secret *secret;
 
    secret = hypre_TAlloc(Secret, 1, HYPRE_MEMORY_HOST);
@@ -96,20 +98,21 @@ HYPRE_ParCSRParaSailsCreate( MPI_Comm comm, HYPRE_Solver *solver )
  * HYPRE_ParCSRParaSailsDestroy - Destroy a ParaSails object.
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_ParCSRParaSailsDestroy( HYPRE_Solver solver )
 {
 #ifdef HYPRE_MIXEDINT
-   hypre_error_w_msg(HYPRE_ERROR_GENERIC,"ParaSails not usable in mixedint mode!");
+   HYPRE_UNUSED_VAR(solver);
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "ParaSails not usable in mixedint mode!");
    return hypre_error_flag;
 #else
-   
+
    Secret *secret;
 
    secret = (Secret *) solver;
    hypre_ParaSailsDestroy(secret->obj);
 
-   hypre_TFree(secret,HYPRE_MEMORY_HOST);
+   hypre_TFree(secret, HYPRE_MEMORY_HOST);
 
    return hypre_error_flag;
 #endif
@@ -117,21 +120,26 @@ HYPRE_ParCSRParaSailsDestroy( HYPRE_Solver solver )
 
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRParaSailsSetup - Set up function for ParaSails.
- * This function is not called on subsequent times if the preconditioner is 
+ * This function is not called on subsequent times if the preconditioner is
  * being reused.
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_ParCSRParaSailsSetup( HYPRE_Solver solver,
                             HYPRE_ParCSRMatrix A,
                             HYPRE_ParVector b,
                             HYPRE_ParVector x      )
 {
+   HYPRE_UNUSED_VAR(b);
+   HYPRE_UNUSED_VAR(x);
+
 #ifdef HYPRE_MIXEDINT
-   hypre_error_w_msg(HYPRE_ERROR_GENERIC,"ParaSails not usable in mixedint mode!");
+   HYPRE_UNUSED_VAR(solver);
+   HYPRE_UNUSED_VAR(A);
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "ParaSails not usable in mixedint mode!");
    return hypre_error_flag;
 #else
-   
+
    static HYPRE_Int virgin = 1;
    HYPRE_DistributedMatrix mat;
    Secret *secret = (Secret *) solver;
@@ -139,7 +147,7 @@ HYPRE_ParCSRParaSailsSetup( HYPRE_Solver solver,
    /* The following call will also create the distributed matrix */
 
    HYPRE_ConvertParCSRMatrixToDistributedMatrix( A, &mat );
-   if (hypre_error_flag) return hypre_error_flag;
+   if (hypre_error_flag) { return hypre_error_flag; }
 
    if (virgin || secret->reuse == 0) /* call set up at least once */
    {
@@ -147,14 +155,14 @@ HYPRE_ParCSRParaSailsSetup( HYPRE_Solver solver,
       hypre_ParaSailsSetup(
          secret->obj, mat, secret->sym, secret->thresh, secret->nlevels,
          secret->filter, secret->loadbal, secret->logging);
-      if (hypre_error_flag) return hypre_error_flag;
+      if (hypre_error_flag) { return hypre_error_flag; }
    }
    else /* reuse is true; this is a subsequent call */
    {
       /* reuse pattern: always use filter value of 0 and loadbal of 0 */
       hypre_ParaSailsSetupValues(secret->obj, mat,
                                  0.0, 0.0, secret->logging);
-      if (hypre_error_flag) return hypre_error_flag;
+      if (hypre_error_flag) { return hypre_error_flag; }
    }
 
    HYPRE_DistributedMatrixDestroy(mat);
@@ -167,17 +175,23 @@ HYPRE_ParCSRParaSailsSetup( HYPRE_Solver solver,
  * HYPRE_ParCSRParaSailsSolve - Solve function for ParaSails.
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_ParCSRParaSailsSolve( HYPRE_Solver solver,
                             HYPRE_ParCSRMatrix A,
                             HYPRE_ParVector b,
                             HYPRE_ParVector x     )
 {
+   HYPRE_UNUSED_VAR(A);
+
 #ifdef HYPRE_MIXEDINT
-   hypre_error_w_msg(HYPRE_ERROR_GENERIC,"ParaSails not usable in mixedint mode!");
+   HYPRE_UNUSED_VAR(b);
+   HYPRE_UNUSED_VAR(x);
+   HYPRE_UNUSED_VAR(solver);
+
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "ParaSails not usable in mixedint mode!");
    return hypre_error_flag;
 #else
-   
+
    HYPRE_Real *rhs, *soln;
    Secret *secret = (Secret *) solver;
 
@@ -196,15 +210,19 @@ HYPRE_ParCSRParaSailsSolve( HYPRE_Solver solver,
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-HYPRE_ParCSRParaSailsSetParams(HYPRE_Solver solver, 
+HYPRE_ParCSRParaSailsSetParams(HYPRE_Solver solver,
                                HYPRE_Real   thresh,
                                HYPRE_Int    nlevels )
 {
 #ifdef HYPRE_MIXEDINT
-   hypre_error_w_msg(HYPRE_ERROR_GENERIC,"ParaSails not usable in mixedint mode!");
+   HYPRE_UNUSED_VAR(solver);
+   HYPRE_UNUSED_VAR(thresh);
+   HYPRE_UNUSED_VAR(nlevels);
+
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "ParaSails not usable in mixedint mode!");
    return hypre_error_flag;
 #else
-   
+
    Secret *secret = (Secret *) solver;
 
    secret->thresh  = thresh;
@@ -220,14 +238,17 @@ HYPRE_ParCSRParaSailsSetParams(HYPRE_Solver solver,
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-HYPRE_ParCSRParaSailsSetFilter(HYPRE_Solver solver, 
+HYPRE_ParCSRParaSailsSetFilter(HYPRE_Solver solver,
                                HYPRE_Real   filter  )
 {
 #ifdef HYPRE_MIXEDINT
-   hypre_error_w_msg(HYPRE_ERROR_GENERIC,"ParaSails not usable in mixedint mode!");
+   HYPRE_UNUSED_VAR(solver);
+   HYPRE_UNUSED_VAR(filter);
+
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "ParaSails not usable in mixedint mode!");
    return hypre_error_flag;
 #else
-   
+
    Secret *secret = (Secret *) solver;
 
    secret->filter = filter;
@@ -237,14 +258,17 @@ HYPRE_ParCSRParaSailsSetFilter(HYPRE_Solver solver,
 }
 
 HYPRE_Int
-HYPRE_ParCSRParaSailsGetFilter(HYPRE_Solver solver, 
+HYPRE_ParCSRParaSailsGetFilter(HYPRE_Solver solver,
                                HYPRE_Real * filter  )
 {
 #ifdef HYPRE_MIXEDINT
-   hypre_error_w_msg(HYPRE_ERROR_GENERIC,"ParaSails not usable in mixedint mode!");
+   HYPRE_UNUSED_VAR(solver);
+   HYPRE_UNUSED_VAR(filter);
+
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "ParaSails not usable in mixedint mode!");
    return hypre_error_flag;
 #else
-   
+
    Secret *secret = (Secret *) solver;
 
    *filter = secret->filter;
@@ -259,14 +283,17 @@ HYPRE_ParCSRParaSailsGetFilter(HYPRE_Solver solver,
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-HYPRE_ParCSRParaSailsSetSym(HYPRE_Solver solver, 
+HYPRE_ParCSRParaSailsSetSym(HYPRE_Solver solver,
                             HYPRE_Int    sym     )
 {
 #ifdef HYPRE_MIXEDINT
-   hypre_error_w_msg(HYPRE_ERROR_GENERIC,"ParaSails not usable in mixedint mode!");
+   HYPRE_UNUSED_VAR(solver);
+   HYPRE_UNUSED_VAR(sym);
+
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "ParaSails not usable in mixedint mode!");
    return hypre_error_flag;
 #else
-   
+
    Secret *secret = (Secret *) solver;
 
    secret->sym = sym;
@@ -280,14 +307,17 @@ HYPRE_ParCSRParaSailsSetSym(HYPRE_Solver solver,
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-HYPRE_ParCSRParaSailsSetLoadbal(HYPRE_Solver solver, 
+HYPRE_ParCSRParaSailsSetLoadbal(HYPRE_Solver solver,
                                 HYPRE_Real   loadbal )
 {
 #ifdef HYPRE_MIXEDINT
-   hypre_error_w_msg(HYPRE_ERROR_GENERIC,"ParaSails not usable in mixedint mode!");
+   HYPRE_UNUSED_VAR(solver);
+   HYPRE_UNUSED_VAR(loadbal);
+
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "ParaSails not usable in mixedint mode!");
    return hypre_error_flag;
 #else
-   
+
    Secret *secret = (Secret *) solver;
 
    secret->loadbal = loadbal;
@@ -297,14 +327,17 @@ HYPRE_ParCSRParaSailsSetLoadbal(HYPRE_Solver solver,
 }
 
 HYPRE_Int
-HYPRE_ParCSRParaSailsGetLoadbal(HYPRE_Solver solver, 
+HYPRE_ParCSRParaSailsGetLoadbal(HYPRE_Solver solver,
                                 HYPRE_Real * loadbal )
 {
 #ifdef HYPRE_MIXEDINT
-   hypre_error_w_msg(HYPRE_ERROR_GENERIC,"ParaSails not usable in mixedint mode!");
+   HYPRE_UNUSED_VAR(solver);
+   HYPRE_UNUSED_VAR(loadbal);
+
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "ParaSails not usable in mixedint mode!");
    return hypre_error_flag;
 #else
-   
+
    Secret *secret = (Secret *) solver;
 
    *loadbal = secret->loadbal;
@@ -318,14 +351,17 @@ HYPRE_ParCSRParaSailsGetLoadbal(HYPRE_Solver solver,
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-HYPRE_ParCSRParaSailsSetReuse(HYPRE_Solver solver, 
+HYPRE_ParCSRParaSailsSetReuse(HYPRE_Solver solver,
                               HYPRE_Int    reuse   )
 {
 #ifdef HYPRE_MIXEDINT
-   hypre_error_w_msg(HYPRE_ERROR_GENERIC,"ParaSails not usable in mixedint mode!");
+   HYPRE_UNUSED_VAR(solver);
+   HYPRE_UNUSED_VAR(reuse);
+
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "ParaSails not usable in mixedint mode!");
    return hypre_error_flag;
 #else
-   
+
    Secret *secret = (Secret *) solver;
 
    secret->reuse = reuse;
@@ -339,14 +375,17 @@ HYPRE_ParCSRParaSailsSetReuse(HYPRE_Solver solver,
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-HYPRE_ParCSRParaSailsSetLogging(HYPRE_Solver solver, 
+HYPRE_ParCSRParaSailsSetLogging(HYPRE_Solver solver,
                                 HYPRE_Int    logging )
 {
 #ifdef HYPRE_MIXEDINT
-   hypre_error_w_msg(HYPRE_ERROR_GENERIC,"ParaSails not usable in mixedint mode!");
+   HYPRE_UNUSED_VAR(solver);
+   HYPRE_UNUSED_VAR(logging);
+
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "ParaSails not usable in mixedint mode!");
    return hypre_error_flag;
 #else
-   
+
    Secret *secret = (Secret *) solver;
 
    secret->logging = logging;
@@ -362,21 +401,24 @@ HYPRE_ParCSRParaSailsSetLogging(HYPRE_Solver solver,
  *****************************************************************************/
 
 /*--------------------------------------------------------------------------
- * HYPRE_ParaSailsCreate - Return a ParaSails preconditioner object 
+ * HYPRE_ParaSailsCreate - Return a ParaSails preconditioner object
  * "solver".  The default parameters for the preconditioner are also set,
  * so a call to HYPRE_ParaSailsSetParams is not absolutely necessary.
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_ParaSailsCreate( MPI_Comm comm, HYPRE_Solver *solver )
 {
 #ifdef HYPRE_MIXEDINT
-   hypre_error_w_msg(HYPRE_ERROR_GENERIC,"ParaSails not usable in mixedint mode!");
+   HYPRE_UNUSED_VAR(solver);
+   HYPRE_UNUSED_VAR(comm);
+
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "ParaSails not usable in mixedint mode!");
    return hypre_error_flag;
 #else
-   
+
    Secret *secret;
-   
+
    secret = hypre_TAlloc(Secret, 1, HYPRE_MEMORY_HOST);
 
    if (secret == NULL)
@@ -406,20 +448,22 @@ HYPRE_ParaSailsCreate( MPI_Comm comm, HYPRE_Solver *solver )
  * HYPRE_ParaSailsDestroy - Destroy a ParaSails object.
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_ParaSailsDestroy( HYPRE_Solver solver )
 {
 #ifdef HYPRE_MIXEDINT
-   hypre_error_w_msg(HYPRE_ERROR_GENERIC,"ParaSails not usable in mixedint mode!");
+   HYPRE_UNUSED_VAR(solver);
+
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "ParaSails not usable in mixedint mode!");
    return hypre_error_flag;
 #else
-   
+
    Secret *secret;
 
    secret = (Secret *) solver;
    hypre_ParaSailsDestroy(secret->obj);
 
-   hypre_TFree(secret,HYPRE_MEMORY_HOST);
+   hypre_TFree(secret, HYPRE_MEMORY_HOST);
 
    return hypre_error_flag;
 #endif
@@ -427,21 +471,26 @@ HYPRE_ParaSailsDestroy( HYPRE_Solver solver )
 
 /*--------------------------------------------------------------------------
  * HYPRE_ParaSailsSetup - Set up function for ParaSails.
- * This function is not called on subsequent times if the preconditioner is 
+ * This function is not called on subsequent times if the preconditioner is
  * being reused.
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_ParaSailsSetup( HYPRE_Solver solver,
                       HYPRE_ParCSRMatrix A,
                       HYPRE_ParVector b,
                       HYPRE_ParVector x     )
 {
+   HYPRE_UNUSED_VAR(b);
+   HYPRE_UNUSED_VAR(x);
+
 #ifdef HYPRE_MIXEDINT
-   hypre_error_w_msg(HYPRE_ERROR_GENERIC,"ParaSails not usable in mixedint mode!");
+   HYPRE_UNUSED_VAR(solver);
+   HYPRE_UNUSED_VAR(A);
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "ParaSails not usable in mixedint mode!");
    return hypre_error_flag;
 #else
-   
+
    static HYPRE_Int virgin = 1;
    HYPRE_DistributedMatrix mat;
    Secret *secret = (Secret *) solver;
@@ -451,7 +500,7 @@ HYPRE_ParaSailsSetup( HYPRE_Solver solver,
 
    ierr = HYPRE_GetError(); HYPRE_ClearAllErrors();
    HYPRE_ConvertParCSRMatrixToDistributedMatrix( A, &mat );
-   if (hypre_error_flag) return hypre_error_flag |= ierr;
+   if (hypre_error_flag) { return hypre_error_flag |= ierr; }
 
    if (virgin || secret->reuse == 0) /* call set up at least once */
    {
@@ -459,14 +508,14 @@ HYPRE_ParaSailsSetup( HYPRE_Solver solver,
       hypre_ParaSailsSetup(
          secret->obj, mat, secret->sym, secret->thresh, secret->nlevels,
          secret->filter, secret->loadbal, secret->logging);
-      if (hypre_error_flag) return hypre_error_flag |= ierr;
+      if (hypre_error_flag) { return hypre_error_flag |= ierr; }
    }
    else /* reuse is true; this is a subsequent call */
    {
       /* reuse pattern: always use filter value of 0 and loadbal of 0 */
       hypre_ParaSailsSetupValues(secret->obj, mat,
                                  0.0, 0.0, secret->logging);
-      if (hypre_error_flag) return hypre_error_flag |= ierr;
+      if (hypre_error_flag) { return hypre_error_flag |= ierr; }
    }
 
    HYPRE_DistributedMatrixDestroy(mat);
@@ -478,17 +527,23 @@ HYPRE_ParaSailsSetup( HYPRE_Solver solver,
  * HYPRE_ParaSailsSolve - Solve function for ParaSails.
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_ParaSailsSolve( HYPRE_Solver solver,
                       HYPRE_ParCSRMatrix A,
                       HYPRE_ParVector b,
                       HYPRE_ParVector x     )
 {
+   HYPRE_UNUSED_VAR(A);
+
 #ifdef HYPRE_MIXEDINT
-   hypre_error_w_msg(HYPRE_ERROR_GENERIC,"ParaSails not usable in mixedint mode!");
+   HYPRE_UNUSED_VAR(solver);
+   HYPRE_UNUSED_VAR(b);
+   HYPRE_UNUSED_VAR(x);
+
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "ParaSails not usable in mixedint mode!");
    return hypre_error_flag;
 #else
-   
+
    HYPRE_Real *rhs, *soln;
    Secret *secret = (Secret *) solver;
 
@@ -507,15 +562,19 @@ HYPRE_ParaSailsSolve( HYPRE_Solver solver,
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-HYPRE_ParaSailsSetParams(HYPRE_Solver solver, 
+HYPRE_ParaSailsSetParams(HYPRE_Solver solver,
                          HYPRE_Real   thresh,
                          HYPRE_Int    nlevels )
 {
 #ifdef HYPRE_MIXEDINT
-   hypre_error_w_msg(HYPRE_ERROR_GENERIC,"ParaSails not usable in mixedint mode!");
+   HYPRE_UNUSED_VAR(solver);
+   HYPRE_UNUSED_VAR(thresh);
+   HYPRE_UNUSED_VAR(nlevels);
+
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "ParaSails not usable in mixedint mode!");
    return hypre_error_flag;
 #else
-   
+
    Secret *secret = (Secret *) solver;
 
    secret->thresh  = thresh;
@@ -532,14 +591,17 @@ HYPRE_ParaSailsSetParams(HYPRE_Solver solver,
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-HYPRE_ParaSailsSetThresh( HYPRE_Solver solver, 
+HYPRE_ParaSailsSetThresh( HYPRE_Solver solver,
                           HYPRE_Real   thresh )
 {
 #ifdef HYPRE_MIXEDINT
-   hypre_error_w_msg(HYPRE_ERROR_GENERIC,"ParaSails not usable in mixedint mode!");
+   HYPRE_UNUSED_VAR(solver);
+   HYPRE_UNUSED_VAR(thresh);
+
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "ParaSails not usable in mixedint mode!");
    return hypre_error_flag;
 #else
-   
+
    Secret *secret = (Secret *) solver;
 
    secret->thresh  = thresh;
@@ -549,14 +611,17 @@ HYPRE_ParaSailsSetThresh( HYPRE_Solver solver,
 }
 
 HYPRE_Int
-HYPRE_ParaSailsGetThresh( HYPRE_Solver solver, 
+HYPRE_ParaSailsGetThresh( HYPRE_Solver solver,
                           HYPRE_Real * thresh )
 {
 #ifdef HYPRE_MIXEDINT
-   hypre_error_w_msg(HYPRE_ERROR_GENERIC,"ParaSails not usable in mixedint mode!");
+   HYPRE_UNUSED_VAR(solver);
+   HYPRE_UNUSED_VAR(thresh);
+
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "ParaSails not usable in mixedint mode!");
    return hypre_error_flag;
 #else
-   
+
    Secret *secret = (Secret *) solver;
 
    *thresh = secret->thresh;
@@ -572,14 +637,17 @@ HYPRE_ParaSailsGetThresh( HYPRE_Solver solver,
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-HYPRE_ParaSailsSetNlevels( HYPRE_Solver solver, 
+HYPRE_ParaSailsSetNlevels( HYPRE_Solver solver,
                            HYPRE_Int    nlevels )
 {
 #ifdef HYPRE_MIXEDINT
-   hypre_error_w_msg(HYPRE_ERROR_GENERIC,"ParaSails not usable in mixedint mode!");
+   HYPRE_UNUSED_VAR(solver);
+   HYPRE_UNUSED_VAR(nlevels);
+
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "ParaSails not usable in mixedint mode!");
    return hypre_error_flag;
 #else
-   
+
    Secret *secret = (Secret *) solver;
 
    secret->nlevels  = nlevels;
@@ -589,14 +657,17 @@ HYPRE_ParaSailsSetNlevels( HYPRE_Solver solver,
 }
 
 HYPRE_Int
-HYPRE_ParaSailsGetNlevels( HYPRE_Solver solver, 
+HYPRE_ParaSailsGetNlevels( HYPRE_Solver solver,
                            HYPRE_Int  * nlevels )
 {
 #ifdef HYPRE_MIXEDINT
-   hypre_error_w_msg(HYPRE_ERROR_GENERIC,"ParaSails not usable in mixedint mode!");
+   HYPRE_UNUSED_VAR(solver);
+   HYPRE_UNUSED_VAR(nlevels);
+
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "ParaSails not usable in mixedint mode!");
    return hypre_error_flag;
 #else
-   
+
    Secret *secret = (Secret *) solver;
 
    *nlevels = secret->nlevels;
@@ -611,14 +682,17 @@ HYPRE_ParaSailsGetNlevels( HYPRE_Solver solver,
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-HYPRE_ParaSailsSetFilter(HYPRE_Solver solver, 
+HYPRE_ParaSailsSetFilter(HYPRE_Solver solver,
                          HYPRE_Real   filter  )
 {
 #ifdef HYPRE_MIXEDINT
-   hypre_error_w_msg(HYPRE_ERROR_GENERIC,"ParaSails not usable in mixedint mode!");
+   HYPRE_UNUSED_VAR(solver);
+   HYPRE_UNUSED_VAR(filter);
+
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "ParaSails not usable in mixedint mode!");
    return hypre_error_flag;
 #else
-   
+
    Secret *secret = (Secret *) solver;
 
    secret->filter = filter;
@@ -628,14 +702,17 @@ HYPRE_ParaSailsSetFilter(HYPRE_Solver solver,
 }
 
 HYPRE_Int
-HYPRE_ParaSailsGetFilter(HYPRE_Solver solver, 
+HYPRE_ParaSailsGetFilter(HYPRE_Solver solver,
                          HYPRE_Real * filter  )
 {
 #ifdef HYPRE_MIXEDINT
-   hypre_error_w_msg(HYPRE_ERROR_GENERIC,"ParaSails not usable in mixedint mode!");
+   HYPRE_UNUSED_VAR(solver);
+   HYPRE_UNUSED_VAR(filter);
+
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "ParaSails not usable in mixedint mode!");
    return hypre_error_flag;
 #else
-   
+
    Secret *secret = (Secret *) solver;
 
    *filter = secret->filter;
@@ -651,14 +728,17 @@ HYPRE_ParaSailsGetFilter(HYPRE_Solver solver,
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-HYPRE_ParaSailsSetSym(HYPRE_Solver solver, 
+HYPRE_ParaSailsSetSym(HYPRE_Solver solver,
                       HYPRE_Int    sym     )
 {
 #ifdef HYPRE_MIXEDINT
-   hypre_error_w_msg(HYPRE_ERROR_GENERIC,"ParaSails not usable in mixedint mode!");
+   HYPRE_UNUSED_VAR(solver);
+   HYPRE_UNUSED_VAR(sym);
+
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "ParaSails not usable in mixedint mode!");
    return hypre_error_flag;
 #else
-   
+
    Secret *secret = (Secret *) solver;
 
    secret->sym = sym;
@@ -668,14 +748,17 @@ HYPRE_ParaSailsSetSym(HYPRE_Solver solver,
 }
 
 HYPRE_Int
-HYPRE_ParaSailsGetSym(HYPRE_Solver solver, 
+HYPRE_ParaSailsGetSym(HYPRE_Solver solver,
                       HYPRE_Int  * sym     )
 {
 #ifdef HYPRE_MIXEDINT
-   hypre_error_w_msg(HYPRE_ERROR_GENERIC,"ParaSails not usable in mixedint mode!");
+   HYPRE_UNUSED_VAR(solver);
+   HYPRE_UNUSED_VAR(sym);
+
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "ParaSails not usable in mixedint mode!");
    return hypre_error_flag;
 #else
-   
+
    Secret *secret = (Secret *) solver;
 
    *sym = secret->sym;
@@ -689,14 +772,17 @@ HYPRE_ParaSailsGetSym(HYPRE_Solver solver,
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-HYPRE_ParaSailsSetLoadbal(HYPRE_Solver solver, 
+HYPRE_ParaSailsSetLoadbal(HYPRE_Solver solver,
                           HYPRE_Real   loadbal )
 {
 #ifdef HYPRE_MIXEDINT
-   hypre_error_w_msg(HYPRE_ERROR_GENERIC,"ParaSails not usable in mixedint mode!");
+   HYPRE_UNUSED_VAR(solver);
+   HYPRE_UNUSED_VAR(loadbal);
+
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "ParaSails not usable in mixedint mode!");
    return hypre_error_flag;
 #else
-   
+
    Secret *secret = (Secret *) solver;
 
    secret->loadbal = loadbal;
@@ -706,14 +792,17 @@ HYPRE_ParaSailsSetLoadbal(HYPRE_Solver solver,
 }
 
 HYPRE_Int
-HYPRE_ParaSailsGetLoadbal(HYPRE_Solver solver, 
+HYPRE_ParaSailsGetLoadbal(HYPRE_Solver solver,
                           HYPRE_Real * loadbal )
 {
 #ifdef HYPRE_MIXEDINT
-   hypre_error_w_msg(HYPRE_ERROR_GENERIC,"ParaSails not usable in mixedint mode!");
+   HYPRE_UNUSED_VAR(solver);
+   HYPRE_UNUSED_VAR(loadbal);
+
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "ParaSails not usable in mixedint mode!");
    return hypre_error_flag;
 #else
-   
+
    Secret *secret = (Secret *) solver;
 
    *loadbal = secret->loadbal;
@@ -728,14 +817,17 @@ HYPRE_ParaSailsGetLoadbal(HYPRE_Solver solver,
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-HYPRE_ParaSailsSetReuse(HYPRE_Solver solver, 
+HYPRE_ParaSailsSetReuse(HYPRE_Solver solver,
                         HYPRE_Int    reuse   )
 {
 #ifdef HYPRE_MIXEDINT
-   hypre_error_w_msg(HYPRE_ERROR_GENERIC,"ParaSails not usable in mixedint mode!");
+   HYPRE_UNUSED_VAR(solver);
+   HYPRE_UNUSED_VAR(reuse);
+
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "ParaSails not usable in mixedint mode!");
    return hypre_error_flag;
 #else
-   
+
    Secret *secret = (Secret *) solver;
 
    secret->reuse = reuse;
@@ -745,14 +837,17 @@ HYPRE_ParaSailsSetReuse(HYPRE_Solver solver,
 }
 
 HYPRE_Int
-HYPRE_ParaSailsGetReuse(HYPRE_Solver solver, 
+HYPRE_ParaSailsGetReuse(HYPRE_Solver solver,
                         HYPRE_Int  * reuse   )
 {
 #ifdef HYPRE_MIXEDINT
-   hypre_error_w_msg(HYPRE_ERROR_GENERIC,"ParaSails not usable in mixedint mode!");
+   HYPRE_UNUSED_VAR(solver);
+   HYPRE_UNUSED_VAR(reuse);
+
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "ParaSails not usable in mixedint mode!");
    return hypre_error_flag;
 #else
-   
+
    Secret *secret = (Secret *) solver;
 
    *reuse = secret->reuse;
@@ -766,14 +861,17 @@ HYPRE_ParaSailsGetReuse(HYPRE_Solver solver,
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-HYPRE_ParaSailsSetLogging(HYPRE_Solver solver, 
+HYPRE_ParaSailsSetLogging(HYPRE_Solver solver,
                           HYPRE_Int    logging )
 {
 #ifdef HYPRE_MIXEDINT
-   hypre_error_w_msg(HYPRE_ERROR_GENERIC,"ParaSails not usable in mixedint mode!");
+   HYPRE_UNUSED_VAR(solver);
+   HYPRE_UNUSED_VAR(logging);
+
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "ParaSails not usable in mixedint mode!");
    return hypre_error_flag;
 #else
-   
+
    Secret *secret = (Secret *) solver;
 
    secret->logging = logging;
@@ -783,14 +881,17 @@ HYPRE_ParaSailsSetLogging(HYPRE_Solver solver,
 }
 
 HYPRE_Int
-HYPRE_ParaSailsGetLogging(HYPRE_Solver solver, 
+HYPRE_ParaSailsGetLogging(HYPRE_Solver solver,
                           HYPRE_Int  * logging )
 {
 #ifdef HYPRE_MIXEDINT
-   hypre_error_w_msg(HYPRE_ERROR_GENERIC,"ParaSails not usable in mixedint mode!");
+   HYPRE_UNUSED_VAR(solver);
+   HYPRE_UNUSED_VAR(logging);
+
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "ParaSails not usable in mixedint mode!");
    return hypre_error_flag;
 #else
-   
+
    Secret *secret = (Secret *) solver;
 
    *logging = secret->logging;
@@ -806,14 +907,17 @@ HYPRE_Int
 HYPRE_ParaSailsBuildIJMatrix(HYPRE_Solver solver, HYPRE_IJMatrix *pij_A)
 {
 #ifdef HYPRE_MIXEDINT
-   hypre_error_w_msg(HYPRE_ERROR_GENERIC,"ParaSails not usable in mixedint mode!");
+   HYPRE_UNUSED_VAR(solver);
+   HYPRE_UNUSED_VAR(pij_A);
+
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "ParaSails not usable in mixedint mode!");
    return hypre_error_flag;
 #else
-   
+
    Secret *secret = (Secret *) solver;
 
    hypre_ParaSailsBuildIJMatrix(secret->obj, pij_A);
-    
+
    return hypre_error_flag;
 #endif
 }
diff --git a/external/hypre/src/parcsr_ls/HYPRE_parcsr_amg.c b/external/hypre/src/parcsr_ls/HYPRE_parcsr_amg.c
index 6ed00417..5c8dfd45 100644
--- a/external/hypre/src/parcsr_ls/HYPRE_parcsr_amg.c
+++ b/external/hypre/src/parcsr_ls/HYPRE_parcsr_amg.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -31,7 +31,7 @@ HYPRE_BoomerAMGCreate( HYPRE_Solver *solver)
 HYPRE_Int
 HYPRE_BoomerAMGDestroy( HYPRE_Solver solver )
 {
-   return( hypre_BoomerAMGDestroy( (void *) solver ) );
+   return ( hypre_BoomerAMGDestroy( (void *) solver ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -44,10 +44,16 @@ HYPRE_BoomerAMGSetup( HYPRE_Solver solver,
                       HYPRE_ParVector b,
                       HYPRE_ParVector x      )
 {
-   return( hypre_BoomerAMGSetup( (void *) solver,
-                                 (hypre_ParCSRMatrix *) A,
-                                 (hypre_ParVector *) b,
-                                 (hypre_ParVector *) x ) );
+   if (!A)
+   {
+      hypre_error_in_arg(2);
+      return hypre_error_flag;
+   }
+
+   return ( hypre_BoomerAMGSetup( (void *) solver,
+                                  (hypre_ParCSRMatrix *) A,
+                                  (hypre_ParVector *) b,
+                                  (hypre_ParVector *) x ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -60,12 +66,28 @@ HYPRE_BoomerAMGSolve( HYPRE_Solver solver,
                       HYPRE_ParVector b,
                       HYPRE_ParVector x      )
 {
+   if (!A)
+   {
+      hypre_error_in_arg(2);
+      return hypre_error_flag;
+   }
 
+   if (!b)
+   {
+      hypre_error_in_arg(3);
+      return hypre_error_flag;
+   }
+
+   if (!x)
+   {
+      hypre_error_in_arg(4);
+      return hypre_error_flag;
+   }
 
-   return( hypre_BoomerAMGSolve( (void *) solver,
-                                 (hypre_ParCSRMatrix *) A,
-                                 (hypre_ParVector *) b,
-                                 (hypre_ParVector *) x ) );
+   return ( hypre_BoomerAMGSolve( (void *) solver,
+                                  (hypre_ParCSRMatrix *) A,
+                                  (hypre_ParVector *) b,
+                                  (hypre_ParVector *) x ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -78,12 +100,28 @@ HYPRE_BoomerAMGSolveT( HYPRE_Solver solver,
                        HYPRE_ParVector b,
                        HYPRE_ParVector x      )
 {
+   if (!A)
+   {
+      hypre_error_in_arg(2);
+      return hypre_error_flag;
+   }
 
+   if (!b)
+   {
+      hypre_error_in_arg(3);
+      return hypre_error_flag;
+   }
 
-   return( hypre_BoomerAMGSolveT( (void *) solver,
-                                  (hypre_ParCSRMatrix *) A,
-                                  (hypre_ParVector *) b,
-                                  (hypre_ParVector *) x ) );
+   if (!x)
+   {
+      hypre_error_in_arg(4);
+      return hypre_error_flag;
+   }
+
+   return ( hypre_BoomerAMGSolveT( (void *) solver,
+                                   (hypre_ParCSRMatrix *) A,
+                                   (hypre_ParVector *) b,
+                                   (hypre_ParVector *) x ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -94,7 +132,7 @@ HYPRE_Int
 HYPRE_BoomerAMGSetRestriction( HYPRE_Solver solver,
                                HYPRE_Int    restr_par  )
 {
-   return( hypre_BoomerAMGSetRestriction( (void *) solver, restr_par ) );
+   return ( hypre_BoomerAMGSetRestriction( (void *) solver, restr_par ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -105,7 +143,7 @@ HYPRE_Int
 HYPRE_BoomerAMGSetIsTriangular( HYPRE_Solver solver,
                                 HYPRE_Int    is_triangular  )
 {
-   return( hypre_BoomerAMGSetIsTriangular( (void *) solver, is_triangular ) );
+   return ( hypre_BoomerAMGSetIsTriangular( (void *) solver, is_triangular ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -116,7 +154,7 @@ HYPRE_Int
 HYPRE_BoomerAMGSetGMRESSwitchR( HYPRE_Solver solver,
                                 HYPRE_Int    gmres_switch  )
 {
-   return( hypre_BoomerAMGSetGMRESSwitchR( (void *) solver, gmres_switch ) );
+   return ( hypre_BoomerAMGSetGMRESSwitchR( (void *) solver, gmres_switch ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -127,14 +165,14 @@ HYPRE_Int
 HYPRE_BoomerAMGSetMaxLevels( HYPRE_Solver solver,
                              HYPRE_Int          max_levels  )
 {
-   return( hypre_BoomerAMGSetMaxLevels( (void *) solver, max_levels ) );
+   return ( hypre_BoomerAMGSetMaxLevels( (void *) solver, max_levels ) );
 }
 
 HYPRE_Int
 HYPRE_BoomerAMGGetMaxLevels( HYPRE_Solver solver,
                              HYPRE_Int        * max_levels  )
 {
-   return( hypre_BoomerAMGGetMaxLevels( (void *) solver, max_levels ) );
+   return ( hypre_BoomerAMGGetMaxLevels( (void *) solver, max_levels ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -145,14 +183,14 @@ HYPRE_Int
 HYPRE_BoomerAMGSetMaxCoarseSize( HYPRE_Solver solver,
                                  HYPRE_Int          max_coarse_size  )
 {
-   return( hypre_BoomerAMGSetMaxCoarseSize( (void *) solver, max_coarse_size ) );
+   return ( hypre_BoomerAMGSetMaxCoarseSize( (void *) solver, max_coarse_size ) );
 }
 
 HYPRE_Int
 HYPRE_BoomerAMGGetMaxCoarseSize( HYPRE_Solver solver,
                                  HYPRE_Int        * max_coarse_size  )
 {
-   return( hypre_BoomerAMGGetMaxCoarseSize( (void *) solver, max_coarse_size ) );
+   return ( hypre_BoomerAMGGetMaxCoarseSize( (void *) solver, max_coarse_size ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -163,14 +201,14 @@ HYPRE_Int
 HYPRE_BoomerAMGSetMinCoarseSize( HYPRE_Solver solver,
                                  HYPRE_Int          min_coarse_size  )
 {
-   return( hypre_BoomerAMGSetMinCoarseSize( (void *) solver, min_coarse_size ) );
+   return ( hypre_BoomerAMGSetMinCoarseSize( (void *) solver, min_coarse_size ) );
 }
 
 HYPRE_Int
 HYPRE_BoomerAMGGetMinCoarseSize( HYPRE_Solver solver,
                                  HYPRE_Int        * min_coarse_size  )
 {
-   return( hypre_BoomerAMGGetMinCoarseSize( (void *) solver, min_coarse_size ) );
+   return ( hypre_BoomerAMGGetMinCoarseSize( (void *) solver, min_coarse_size ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -181,14 +219,14 @@ HYPRE_Int
 HYPRE_BoomerAMGSetSeqThreshold( HYPRE_Solver solver,
                                 HYPRE_Int          seq_threshold  )
 {
-   return( hypre_BoomerAMGSetSeqThreshold( (void *) solver, seq_threshold ) );
+   return ( hypre_BoomerAMGSetSeqThreshold( (void *) solver, seq_threshold ) );
 }
 
 HYPRE_Int
 HYPRE_BoomerAMGGetSeqThreshold( HYPRE_Solver solver,
                                 HYPRE_Int        * seq_threshold  )
 {
-   return( hypre_BoomerAMGGetSeqThreshold( (void *) solver, seq_threshold ) );
+   return ( hypre_BoomerAMGGetSeqThreshold( (void *) solver, seq_threshold ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -197,16 +235,16 @@ HYPRE_BoomerAMGGetSeqThreshold( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_BoomerAMGSetRedundant( HYPRE_Solver solver,
-                                HYPRE_Int          redundant  )
+                             HYPRE_Int          redundant  )
 {
-   return( hypre_BoomerAMGSetRedundant( (void *) solver, redundant ) );
+   return ( hypre_BoomerAMGSetRedundant( (void *) solver, redundant ) );
 }
 
 HYPRE_Int
 HYPRE_BoomerAMGGetRedundant( HYPRE_Solver solver,
-                                HYPRE_Int        * redundant  )
+                             HYPRE_Int        * redundant  )
 {
-   return( hypre_BoomerAMGGetRedundant( (void *) solver, redundant ) );
+   return ( hypre_BoomerAMGGetRedundant( (void *) solver, redundant ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -217,14 +255,14 @@ HYPRE_Int
 HYPRE_BoomerAMGSetCoarsenCutFactor( HYPRE_Solver solver,
                                     HYPRE_Int    coarsen_cut_factor )
 {
-   return( hypre_BoomerAMGSetCoarsenCutFactor( (void *) solver, coarsen_cut_factor ) );
+   return ( hypre_BoomerAMGSetCoarsenCutFactor( (void *) solver, coarsen_cut_factor ) );
 }
 
 HYPRE_Int
 HYPRE_BoomerAMGGetCoarsenCutFactor( HYPRE_Solver  solver,
                                     HYPRE_Int    *coarsen_cut_factor )
 {
-   return( hypre_BoomerAMGGetCoarsenCutFactor( (void *) solver, coarsen_cut_factor ) );
+   return ( hypre_BoomerAMGGetCoarsenCutFactor( (void *) solver, coarsen_cut_factor ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -235,48 +273,48 @@ HYPRE_Int
 HYPRE_BoomerAMGSetStrongThreshold( HYPRE_Solver solver,
                                    HYPRE_Real   strong_threshold  )
 {
-   return( hypre_BoomerAMGSetStrongThreshold( (void *) solver,
-                                              strong_threshold ) );
+   return ( hypre_BoomerAMGSetStrongThreshold( (void *) solver,
+                                               strong_threshold ) );
 }
 
 HYPRE_Int
 HYPRE_BoomerAMGGetStrongThreshold( HYPRE_Solver solver,
                                    HYPRE_Real * strong_threshold  )
 {
-   return( hypre_BoomerAMGGetStrongThreshold( (void *) solver,
-                                              strong_threshold ) );
+   return ( hypre_BoomerAMGGetStrongThreshold( (void *) solver,
+                                               strong_threshold ) );
 }
 
 HYPRE_Int
 HYPRE_BoomerAMGSetStrongThresholdR( HYPRE_Solver solver,
                                     HYPRE_Real   strong_threshold  )
 {
-   return( hypre_BoomerAMGSetStrongThresholdR( (void *) solver,
-                                              strong_threshold ) );
+   return ( hypre_BoomerAMGSetStrongThresholdR( (void *) solver,
+                                                strong_threshold ) );
 }
 
 HYPRE_Int
 HYPRE_BoomerAMGGetStrongThresholdR( HYPRE_Solver solver,
                                     HYPRE_Real * strong_threshold  )
 {
-   return( hypre_BoomerAMGGetStrongThresholdR( (void *) solver,
-                                              strong_threshold ) );
+   return ( hypre_BoomerAMGGetStrongThresholdR( (void *) solver,
+                                                strong_threshold ) );
 }
 
 HYPRE_Int
 HYPRE_BoomerAMGSetFilterThresholdR( HYPRE_Solver solver,
                                     HYPRE_Real   filter_threshold  )
 {
-   return( hypre_BoomerAMGSetFilterThresholdR( (void *) solver,
-                                              filter_threshold ) );
+   return ( hypre_BoomerAMGSetFilterThresholdR( (void *) solver,
+                                                filter_threshold ) );
 }
 
 HYPRE_Int
 HYPRE_BoomerAMGGetFilterThresholdR( HYPRE_Solver solver,
                                     HYPRE_Real * filter_threshold  )
 {
-   return( hypre_BoomerAMGGetFilterThresholdR( (void *) solver,
-                                              filter_threshold ) );
+   return ( hypre_BoomerAMGGetFilterThresholdR( (void *) solver,
+                                                filter_threshold ) );
 }
 
 
@@ -284,8 +322,8 @@ HYPRE_Int
 HYPRE_BoomerAMGSetSabs( HYPRE_Solver solver,
                         HYPRE_Int    Sabs  )
 {
-   return( hypre_BoomerAMGSetSabs( (void *) solver,
-                                   Sabs ) );
+   return ( hypre_BoomerAMGSetSabs( (void *) solver,
+                                    Sabs ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -296,16 +334,16 @@ HYPRE_Int
 HYPRE_BoomerAMGSetMaxRowSum( HYPRE_Solver solver,
                              HYPRE_Real   max_row_sum  )
 {
-   return( hypre_BoomerAMGSetMaxRowSum( (void *) solver,
-                                        max_row_sum ) );
+   return ( hypre_BoomerAMGSetMaxRowSum( (void *) solver,
+                                         max_row_sum ) );
 }
 
 HYPRE_Int
 HYPRE_BoomerAMGGetMaxRowSum( HYPRE_Solver solver,
                              HYPRE_Real * max_row_sum  )
 {
-   return( hypre_BoomerAMGGetMaxRowSum( (void *) solver,
-                                        max_row_sum ) );
+   return ( hypre_BoomerAMGGetMaxRowSum( (void *) solver,
+                                         max_row_sum ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -316,16 +354,16 @@ HYPRE_Int
 HYPRE_BoomerAMGSetTruncFactor( HYPRE_Solver solver,
                                HYPRE_Real   trunc_factor  )
 {
-   return( hypre_BoomerAMGSetTruncFactor( (void *) solver,
-                                          trunc_factor ) );
+   return ( hypre_BoomerAMGSetTruncFactor( (void *) solver,
+                                           trunc_factor ) );
 }
 
 HYPRE_Int
 HYPRE_BoomerAMGGetTruncFactor( HYPRE_Solver solver,
                                HYPRE_Real * trunc_factor  )
 {
-   return( hypre_BoomerAMGGetTruncFactor( (void *) solver,
-                                          trunc_factor ) );
+   return ( hypre_BoomerAMGGetTruncFactor( (void *) solver,
+                                           trunc_factor ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -336,16 +374,16 @@ HYPRE_Int
 HYPRE_BoomerAMGSetPMaxElmts( HYPRE_Solver solver,
                              HYPRE_Int   P_max_elmts  )
 {
-   return( hypre_BoomerAMGSetPMaxElmts( (void *) solver,
-                                        P_max_elmts ) );
+   return ( hypre_BoomerAMGSetPMaxElmts( (void *) solver,
+                                         P_max_elmts ) );
 }
 
 HYPRE_Int
 HYPRE_BoomerAMGGetPMaxElmts( HYPRE_Solver solver,
                              HYPRE_Int   * P_max_elmts  )
 {
-   return( hypre_BoomerAMGGetPMaxElmts( (void *) solver,
-                                        P_max_elmts ) );
+   return ( hypre_BoomerAMGGetPMaxElmts( (void *) solver,
+                                         P_max_elmts ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -356,16 +394,16 @@ HYPRE_Int
 HYPRE_BoomerAMGSetJacobiTruncThreshold( HYPRE_Solver solver,
                                         HYPRE_Real   jacobi_trunc_threshold  )
 {
-   return( hypre_BoomerAMGSetJacobiTruncThreshold( (void *) solver,
-                                                   jacobi_trunc_threshold ) );
+   return ( hypre_BoomerAMGSetJacobiTruncThreshold( (void *) solver,
+                                                    jacobi_trunc_threshold ) );
 }
 
 HYPRE_Int
 HYPRE_BoomerAMGGetJacobiTruncThreshold( HYPRE_Solver solver,
                                         HYPRE_Real * jacobi_trunc_threshold  )
 {
-   return( hypre_BoomerAMGGetJacobiTruncThreshold( (void *) solver,
-                                                   jacobi_trunc_threshold ) );
+   return ( hypre_BoomerAMGGetJacobiTruncThreshold( (void *) solver,
+                                                    jacobi_trunc_threshold ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -378,16 +416,16 @@ HYPRE_Int
 HYPRE_BoomerAMGSetPostInterpType( HYPRE_Solver solver,
                                   HYPRE_Int       post_interp_type  )
 {
-   return( hypre_BoomerAMGSetPostInterpType( (void *) solver,
-                                             post_interp_type ) );
+   return ( hypre_BoomerAMGSetPostInterpType( (void *) solver,
+                                              post_interp_type ) );
 }
 
 HYPRE_Int
 HYPRE_BoomerAMGGetPostInterpType( HYPRE_Solver solver,
                                   HYPRE_Int     * post_interp_type  )
 {
-   return( hypre_BoomerAMGGetPostInterpType( (void *) solver,
-                                             post_interp_type ) );
+   return ( hypre_BoomerAMGGetPostInterpType( (void *) solver,
+                                              post_interp_type ) );
 }
 
 
@@ -399,6 +437,9 @@ HYPRE_Int
 HYPRE_BoomerAMGSetSCommPkgSwitch( HYPRE_Solver solver,
                                   HYPRE_Real   S_commpkg_switch  )
 {
+   HYPRE_UNUSED_VAR(solver);
+   HYPRE_UNUSED_VAR(S_commpkg_switch);
+
    return 0;
 }
 
@@ -410,7 +451,7 @@ HYPRE_Int
 HYPRE_BoomerAMGSetInterpType( HYPRE_Solver solver,
                               HYPRE_Int          interp_type  )
 {
-   return( hypre_BoomerAMGSetInterpType( (void *) solver, interp_type ) );
+   return ( hypre_BoomerAMGSetInterpType( (void *) solver, interp_type ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -421,7 +462,7 @@ HYPRE_Int
 HYPRE_BoomerAMGSetSepWeight( HYPRE_Solver solver,
                              HYPRE_Int          sep_weight  )
 {
-   return( hypre_BoomerAMGSetSepWeight( (void *) solver, sep_weight ) );
+   return ( hypre_BoomerAMGSetSepWeight( (void *) solver, sep_weight ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -432,7 +473,7 @@ HYPRE_Int
 HYPRE_BoomerAMGSetMinIter( HYPRE_Solver solver,
                            HYPRE_Int          min_iter  )
 {
-   return( hypre_BoomerAMGSetMinIter( (void *) solver, min_iter ) );
+   return ( hypre_BoomerAMGSetMinIter( (void *) solver, min_iter ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -443,14 +484,14 @@ HYPRE_Int
 HYPRE_BoomerAMGSetMaxIter( HYPRE_Solver solver,
                            HYPRE_Int          max_iter  )
 {
-   return( hypre_BoomerAMGSetMaxIter( (void *) solver, max_iter ) );
+   return ( hypre_BoomerAMGSetMaxIter( (void *) solver, max_iter ) );
 }
 
 HYPRE_Int
 HYPRE_BoomerAMGGetMaxIter( HYPRE_Solver solver,
                            HYPRE_Int        * max_iter  )
 {
-   return( hypre_BoomerAMGGetMaxIter( (void *) solver, max_iter ) );
+   return ( hypre_BoomerAMGGetMaxIter( (void *) solver, max_iter ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -461,14 +502,14 @@ HYPRE_Int
 HYPRE_BoomerAMGSetCoarsenType( HYPRE_Solver solver,
                                HYPRE_Int          coarsen_type  )
 {
-   return( hypre_BoomerAMGSetCoarsenType( (void *) solver, coarsen_type ) );
+   return ( hypre_BoomerAMGSetCoarsenType( (void *) solver, coarsen_type ) );
 }
 
 HYPRE_Int
 HYPRE_BoomerAMGGetCoarsenType( HYPRE_Solver solver,
                                HYPRE_Int        * coarsen_type  )
 {
-   return( hypre_BoomerAMGGetCoarsenType( (void *) solver, coarsen_type ) );
+   return ( hypre_BoomerAMGGetCoarsenType( (void *) solver, coarsen_type ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -479,14 +520,14 @@ HYPRE_Int
 HYPRE_BoomerAMGSetMeasureType( HYPRE_Solver solver,
                                HYPRE_Int          measure_type  )
 {
-   return( hypre_BoomerAMGSetMeasureType( (void *) solver, measure_type ) );
+   return ( hypre_BoomerAMGSetMeasureType( (void *) solver, measure_type ) );
 }
 
 HYPRE_Int
 HYPRE_BoomerAMGGetMeasureType( HYPRE_Solver solver,
                                HYPRE_Int        * measure_type  )
 {
-   return( hypre_BoomerAMGGetMeasureType( (void *) solver, measure_type ) );
+   return ( hypre_BoomerAMGGetMeasureType( (void *) solver, measure_type ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -510,7 +551,7 @@ HYPRE_Int
 HYPRE_BoomerAMGSetSetupType( HYPRE_Solver solver,
                              HYPRE_Int          setup_type  )
 {
-   return( hypre_BoomerAMGSetSetupType( (void *) solver, setup_type ) );
+   return ( hypre_BoomerAMGSetSetupType( (void *) solver, setup_type ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -521,14 +562,14 @@ HYPRE_Int
 HYPRE_BoomerAMGSetCycleType( HYPRE_Solver solver,
                              HYPRE_Int          cycle_type  )
 {
-   return( hypre_BoomerAMGSetCycleType( (void *) solver, cycle_type ) );
+   return ( hypre_BoomerAMGSetCycleType( (void *) solver, cycle_type ) );
 }
 
 HYPRE_Int
 HYPRE_BoomerAMGGetCycleType( HYPRE_Solver solver,
                              HYPRE_Int        * cycle_type  )
 {
-   return( hypre_BoomerAMGGetCycleType( (void *) solver, cycle_type ) );
+   return ( hypre_BoomerAMGGetCycleType( (void *) solver, cycle_type ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -539,14 +580,14 @@ HYPRE_Int
 HYPRE_BoomerAMGSetFCycle( HYPRE_Solver solver,
                           HYPRE_Int    fcycle  )
 {
-   return( hypre_BoomerAMGSetFCycle( (void *) solver, fcycle ) );
+   return ( hypre_BoomerAMGSetFCycle( (void *) solver, fcycle ) );
 }
 
 HYPRE_Int
 HYPRE_BoomerAMGGetFCycle( HYPRE_Solver solver,
                           HYPRE_Int   *fcycle  )
 {
-   return( hypre_BoomerAMGGetFCycle( (void *) solver, fcycle ) );
+   return ( hypre_BoomerAMGGetFCycle( (void *) solver, fcycle ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -557,14 +598,14 @@ HYPRE_Int
 HYPRE_BoomerAMGSetConvergeType( HYPRE_Solver solver,
                                 HYPRE_Int    type    )
 {
-   return( hypre_BoomerAMGSetConvergeType( (void *) solver, type ) );
+   return ( hypre_BoomerAMGSetConvergeType( (void *) solver, type ) );
 }
 
 HYPRE_Int
 HYPRE_BoomerAMGGetConvergeType( HYPRE_Solver solver,
                                 HYPRE_Int   *type    )
 {
-   return( hypre_BoomerAMGGetConvergeType( (void *) solver, type ) );
+   return ( hypre_BoomerAMGGetConvergeType( (void *) solver, type ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -575,14 +616,14 @@ HYPRE_Int
 HYPRE_BoomerAMGSetTol( HYPRE_Solver solver,
                        HYPRE_Real   tol    )
 {
-   return( hypre_BoomerAMGSetTol( (void *) solver, tol ) );
+   return ( hypre_BoomerAMGSetTol( (void *) solver, tol ) );
 }
 
 HYPRE_Int
 HYPRE_BoomerAMGGetTol( HYPRE_Solver solver,
                        HYPRE_Real * tol    )
 {
-   return( hypre_BoomerAMGGetTol( (void *) solver, tol ) );
+   return ( hypre_BoomerAMGGetTol( (void *) solver, tol ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -596,7 +637,7 @@ HYPRE_Int
 HYPRE_BoomerAMGSetNumGridSweeps( HYPRE_Solver  solver,
                                  HYPRE_Int          *num_grid_sweeps  )
 {
-   return( hypre_BoomerAMGSetNumGridSweeps( (void *) solver, num_grid_sweeps ) );
+   return ( hypre_BoomerAMGSetNumGridSweeps( (void *) solver, num_grid_sweeps ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -608,7 +649,7 @@ HYPRE_Int
 HYPRE_BoomerAMGSetNumSweeps( HYPRE_Solver  solver,
                              HYPRE_Int          num_sweeps  )
 {
-   return( hypre_BoomerAMGSetNumSweeps( (void *) solver, num_sweeps ) );
+   return ( hypre_BoomerAMGSetNumSweeps( (void *) solver, num_sweeps ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -619,14 +660,14 @@ HYPRE_Int
 HYPRE_BoomerAMGSetCycleNumSweeps( HYPRE_Solver  solver,
                                   HYPRE_Int          num_sweeps, HYPRE_Int k  )
 {
-   return( hypre_BoomerAMGSetCycleNumSweeps( (void *) solver, num_sweeps, k ) );
+   return ( hypre_BoomerAMGSetCycleNumSweeps( (void *) solver, num_sweeps, k ) );
 }
 
 HYPRE_Int
 HYPRE_BoomerAMGGetCycleNumSweeps( HYPRE_Solver  solver,
                                   HYPRE_Int        * num_sweeps, HYPRE_Int k  )
 {
-   return( hypre_BoomerAMGGetCycleNumSweeps( (void *) solver, num_sweeps, k ) );
+   return ( hypre_BoomerAMGGetCycleNumSweeps( (void *) solver, num_sweeps, k ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -640,7 +681,8 @@ HYPRE_BoomerAMGInitGridRelaxation( HYPRE_Int     **num_grid_sweeps_ptr,
                                    HYPRE_Int       coarsen_type,
                                    HYPRE_Real  **relax_weights_ptr,
                                    HYPRE_Int       max_levels         )
-{  HYPRE_Int i;
+{
+   HYPRE_Int i;
    HYPRE_Int *num_grid_sweeps;
    HYPRE_Int *grid_relax_type;
    HYPRE_Int **grid_relax_points;
@@ -714,7 +756,9 @@ HYPRE_BoomerAMGInitGridRelaxation( HYPRE_Int     **num_grid_sweeps_ptr,
    grid_relax_points[3][0] = 0;
 
    for (i = 0; i < max_levels; i++)
+   {
       relax_weights[i] = 1.;
+   }
 
    return hypre_error_flag;
 }
@@ -730,7 +774,7 @@ HYPRE_Int
 HYPRE_BoomerAMGSetGridRelaxType( HYPRE_Solver  solver,
                                  HYPRE_Int          *grid_relax_type  )
 {
-   return( hypre_BoomerAMGSetGridRelaxType( (void *) solver, grid_relax_type ) );
+   return ( hypre_BoomerAMGSetGridRelaxType( (void *) solver, grid_relax_type ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -741,7 +785,7 @@ HYPRE_Int
 HYPRE_BoomerAMGSetRelaxType( HYPRE_Solver  solver,
                              HYPRE_Int          relax_type  )
 {
-   return( hypre_BoomerAMGSetRelaxType( (void *) solver, relax_type ) );
+   return ( hypre_BoomerAMGSetRelaxType( (void *) solver, relax_type ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -752,14 +796,14 @@ HYPRE_Int
 HYPRE_BoomerAMGSetCycleRelaxType( HYPRE_Solver  solver,
                                   HYPRE_Int          relax_type, HYPRE_Int k  )
 {
-   return( hypre_BoomerAMGSetCycleRelaxType( (void *) solver, relax_type, k ) );
+   return ( hypre_BoomerAMGSetCycleRelaxType( (void *) solver, relax_type, k ) );
 }
 
 HYPRE_Int
 HYPRE_BoomerAMGGetCycleRelaxType( HYPRE_Solver  solver,
                                   HYPRE_Int        * relax_type, HYPRE_Int k  )
 {
-   return( hypre_BoomerAMGGetCycleRelaxType( (void *) solver, relax_type, k ) );
+   return ( hypre_BoomerAMGGetCycleRelaxType( (void *) solver, relax_type, k ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -770,7 +814,7 @@ HYPRE_Int
 HYPRE_BoomerAMGSetRelaxOrder( HYPRE_Solver  solver,
                               HYPRE_Int           relax_order)
 {
-   return( hypre_BoomerAMGSetRelaxOrder( (void *) solver, relax_order ) );
+   return ( hypre_BoomerAMGSetRelaxOrder( (void *) solver, relax_order ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -784,7 +828,7 @@ HYPRE_Int
 HYPRE_BoomerAMGSetGridRelaxPoints( HYPRE_Solver   solver,
                                    HYPRE_Int          **grid_relax_points  )
 {
-   return( hypre_BoomerAMGSetGridRelaxPoints( (void *) solver, grid_relax_points ) );
+   return ( hypre_BoomerAMGSetGridRelaxPoints( (void *) solver, grid_relax_points ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -798,7 +842,7 @@ HYPRE_Int
 HYPRE_BoomerAMGSetRelaxWeight( HYPRE_Solver  solver,
                                HYPRE_Real   *relax_weight  )
 {
-   return( hypre_BoomerAMGSetRelaxWeight( (void *) solver, relax_weight ) );
+   return ( hypre_BoomerAMGSetRelaxWeight( (void *) solver, relax_weight ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -809,7 +853,7 @@ HYPRE_Int
 HYPRE_BoomerAMGSetRelaxWt( HYPRE_Solver  solver,
                            HYPRE_Real    relax_wt  )
 {
-   return( hypre_BoomerAMGSetRelaxWt( (void *) solver, relax_wt ) );
+   return ( hypre_BoomerAMGSetRelaxWt( (void *) solver, relax_wt ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -819,9 +863,9 @@ HYPRE_BoomerAMGSetRelaxWt( HYPRE_Solver  solver,
 HYPRE_Int
 HYPRE_BoomerAMGSetLevelRelaxWt( HYPRE_Solver  solver,
                                 HYPRE_Real    relax_wt,
-				HYPRE_Int 	      level  )
+                                HYPRE_Int         level  )
 {
-   return( hypre_BoomerAMGSetLevelRelaxWt( (void *) solver, relax_wt, level ) );
+   return ( hypre_BoomerAMGSetLevelRelaxWt( (void *) solver, relax_wt, level ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -832,7 +876,7 @@ HYPRE_Int
 HYPRE_BoomerAMGSetOmega( HYPRE_Solver  solver,
                          HYPRE_Real   *omega  )
 {
-   return( hypre_BoomerAMGSetOmega( (void *) solver, omega ) );
+   return ( hypre_BoomerAMGSetOmega( (void *) solver, omega ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -843,7 +887,7 @@ HYPRE_Int
 HYPRE_BoomerAMGSetOuterWt( HYPRE_Solver  solver,
                            HYPRE_Real    outer_wt  )
 {
-   return( hypre_BoomerAMGSetOuterWt( (void *) solver, outer_wt ) );
+   return ( hypre_BoomerAMGSetOuterWt( (void *) solver, outer_wt ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -853,9 +897,9 @@ HYPRE_BoomerAMGSetOuterWt( HYPRE_Solver  solver,
 HYPRE_Int
 HYPRE_BoomerAMGSetLevelOuterWt( HYPRE_Solver  solver,
                                 HYPRE_Real    outer_wt,
-				HYPRE_Int 	      level  )
+                                HYPRE_Int         level  )
 {
-   return( hypre_BoomerAMGSetLevelOuterWt( (void *) solver, outer_wt, level ) );
+   return ( hypre_BoomerAMGSetLevelOuterWt( (void *) solver, outer_wt, level ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -866,14 +910,14 @@ HYPRE_Int
 HYPRE_BoomerAMGSetSmoothType( HYPRE_Solver  solver,
                               HYPRE_Int       smooth_type )
 {
-   return( hypre_BoomerAMGSetSmoothType( (void *) solver, smooth_type ) );
+   return ( hypre_BoomerAMGSetSmoothType( (void *) solver, smooth_type ) );
 }
 
 HYPRE_Int
 HYPRE_BoomerAMGGetSmoothType( HYPRE_Solver  solver,
                               HYPRE_Int     * smooth_type )
 {
-   return( hypre_BoomerAMGGetSmoothType( (void *) solver, smooth_type ) );
+   return ( hypre_BoomerAMGGetSmoothType( (void *) solver, smooth_type ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -884,14 +928,14 @@ HYPRE_Int
 HYPRE_BoomerAMGSetSmoothNumLevels( HYPRE_Solver  solver,
                                    HYPRE_Int       smooth_num_levels  )
 {
-   return( hypre_BoomerAMGSetSmoothNumLevels((void *)solver,smooth_num_levels ));
+   return ( hypre_BoomerAMGSetSmoothNumLevels((void *)solver, smooth_num_levels ));
 }
 
 HYPRE_Int
 HYPRE_BoomerAMGGetSmoothNumLevels( HYPRE_Solver  solver,
                                    HYPRE_Int     * smooth_num_levels  )
 {
-   return( hypre_BoomerAMGGetSmoothNumLevels((void *)solver,smooth_num_levels ));
+   return ( hypre_BoomerAMGGetSmoothNumLevels((void *)solver, smooth_num_levels ));
 }
 
 /*--------------------------------------------------------------------------
@@ -902,14 +946,14 @@ HYPRE_Int
 HYPRE_BoomerAMGSetSmoothNumSweeps( HYPRE_Solver  solver,
                                    HYPRE_Int       smooth_num_sweeps  )
 {
-   return( hypre_BoomerAMGSetSmoothNumSweeps((void *)solver,smooth_num_sweeps ));
+   return ( hypre_BoomerAMGSetSmoothNumSweeps((void *)solver, smooth_num_sweeps ));
 }
 
 HYPRE_Int
 HYPRE_BoomerAMGGetSmoothNumSweeps( HYPRE_Solver  solver,
                                    HYPRE_Int     * smooth_num_sweeps  )
 {
-   return( hypre_BoomerAMGGetSmoothNumSweeps((void *)solver,smooth_num_sweeps ));
+   return ( hypre_BoomerAMGGetSmoothNumSweeps((void *)solver, smooth_num_sweeps ));
 }
 
 /*--------------------------------------------------------------------------
@@ -926,14 +970,14 @@ HYPRE_BoomerAMGSetLogging( HYPRE_Solver solver,
       It may be possible to support logging changes at other times,
       but there is little need.
    */
-   return( hypre_BoomerAMGSetLogging( (void *) solver, logging ) );
+   return ( hypre_BoomerAMGSetLogging( (void *) solver, logging ) );
 }
 
 HYPRE_Int
 HYPRE_BoomerAMGGetLogging( HYPRE_Solver solver,
                            HYPRE_Int        * logging  )
 {
-   return( hypre_BoomerAMGGetLogging( (void *) solver, logging ) );
+   return ( hypre_BoomerAMGGetLogging( (void *) solver, logging ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -944,14 +988,14 @@ HYPRE_Int
 HYPRE_BoomerAMGSetPrintLevel( HYPRE_Solver solver,
                               HYPRE_Int        print_level  )
 {
-   return( hypre_BoomerAMGSetPrintLevel( (void *) solver, print_level ) );
+   return ( hypre_BoomerAMGSetPrintLevel( (void *) solver, print_level ) );
 }
 
 HYPRE_Int
 HYPRE_BoomerAMGGetPrintLevel( HYPRE_Solver solver,
                               HYPRE_Int      * print_level  )
 {
-   return( hypre_BoomerAMGGetPrintLevel( (void *) solver, print_level ) );
+   return ( hypre_BoomerAMGGetPrintLevel( (void *) solver, print_level ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -962,7 +1006,7 @@ HYPRE_Int
 HYPRE_BoomerAMGSetPrintFileName( HYPRE_Solver  solver,
                                  const char   *print_file_name  )
 {
-   return( hypre_BoomerAMGSetPrintFileName( (void *) solver, print_file_name ) );
+   return ( hypre_BoomerAMGSetPrintFileName( (void *) solver, print_file_name ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -973,14 +1017,14 @@ HYPRE_Int
 HYPRE_BoomerAMGSetDebugFlag( HYPRE_Solver solver,
                              HYPRE_Int          debug_flag  )
 {
-   return( hypre_BoomerAMGSetDebugFlag( (void *) solver, debug_flag ) );
+   return ( hypre_BoomerAMGSetDebugFlag( (void *) solver, debug_flag ) );
 }
 
 HYPRE_Int
 HYPRE_BoomerAMGGetDebugFlag( HYPRE_Solver solver,
                              HYPRE_Int        * debug_flag  )
 {
-   return( hypre_BoomerAMGGetDebugFlag( (void *) solver, debug_flag ) );
+   return ( hypre_BoomerAMGGetDebugFlag( (void *) solver, debug_flag ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -991,7 +1035,7 @@ HYPRE_Int
 HYPRE_BoomerAMGGetNumIterations( HYPRE_Solver  solver,
                                  HYPRE_Int          *num_iterations  )
 {
-   return( hypre_BoomerAMGGetNumIterations( (void *) solver, num_iterations ) );
+   return ( hypre_BoomerAMGGetNumIterations( (void *) solver, num_iterations ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1002,7 +1046,7 @@ HYPRE_Int
 HYPRE_BoomerAMGGetCumNumIterations( HYPRE_Solver  solver,
                                     HYPRE_Int          *cum_num_iterations  )
 {
-   return( hypre_BoomerAMGGetCumNumIterations( (void *) solver, cum_num_iterations ) );
+   return ( hypre_BoomerAMGGetCumNumIterations( (void *) solver, cum_num_iterations ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1025,7 +1069,7 @@ HYPRE_Int
 HYPRE_BoomerAMGGetFinalRelativeResidualNorm( HYPRE_Solver  solver,
                                              HYPRE_Real   *rel_resid_norm  )
 {
-   return( hypre_BoomerAMGGetRelResidualNorm( (void *) solver, rel_resid_norm ) );
+   return ( hypre_BoomerAMGGetRelResidualNorm( (void *) solver, rel_resid_norm ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1036,14 +1080,14 @@ HYPRE_Int
 HYPRE_BoomerAMGSetVariant( HYPRE_Solver  solver,
                            HYPRE_Int          variant  )
 {
-   return( hypre_BoomerAMGSetVariant( (void *) solver, variant ) );
+   return ( hypre_BoomerAMGSetVariant( (void *) solver, variant ) );
 }
 
 HYPRE_Int
 HYPRE_BoomerAMGGetVariant( HYPRE_Solver  solver,
                            HYPRE_Int        * variant  )
 {
-   return( hypre_BoomerAMGGetVariant( (void *) solver, variant ) );
+   return ( hypre_BoomerAMGGetVariant( (void *) solver, variant ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1054,14 +1098,14 @@ HYPRE_Int
 HYPRE_BoomerAMGSetOverlap( HYPRE_Solver  solver,
                            HYPRE_Int          overlap  )
 {
-   return( hypre_BoomerAMGSetOverlap( (void *) solver, overlap ) );
+   return ( hypre_BoomerAMGSetOverlap( (void *) solver, overlap ) );
 }
 
 HYPRE_Int
 HYPRE_BoomerAMGGetOverlap( HYPRE_Solver  solver,
                            HYPRE_Int        * overlap  )
 {
-   return( hypre_BoomerAMGGetOverlap( (void *) solver, overlap ) );
+   return ( hypre_BoomerAMGGetOverlap( (void *) solver, overlap ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1072,14 +1116,14 @@ HYPRE_Int
 HYPRE_BoomerAMGSetDomainType( HYPRE_Solver  solver,
                               HYPRE_Int          domain_type  )
 {
-   return( hypre_BoomerAMGSetDomainType( (void *) solver, domain_type ) );
+   return ( hypre_BoomerAMGSetDomainType( (void *) solver, domain_type ) );
 }
 
 HYPRE_Int
 HYPRE_BoomerAMGGetDomainType( HYPRE_Solver  solver,
                               HYPRE_Int        * domain_type  )
 {
-   return( hypre_BoomerAMGGetDomainType( (void *) solver, domain_type ) );
+   return ( hypre_BoomerAMGGetDomainType( (void *) solver, domain_type ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1090,16 +1134,16 @@ HYPRE_Int
 HYPRE_BoomerAMGSetSchwarzRlxWeight( HYPRE_Solver  solver,
                                     HYPRE_Real schwarz_rlx_weight)
 {
-   return( hypre_BoomerAMGSetSchwarzRlxWeight( (void *) solver,
-                                               schwarz_rlx_weight ) );
+   return ( hypre_BoomerAMGSetSchwarzRlxWeight( (void *) solver,
+                                                schwarz_rlx_weight ) );
 }
 
 HYPRE_Int
 HYPRE_BoomerAMGGetSchwarzRlxWeight( HYPRE_Solver  solver,
                                     HYPRE_Real * schwarz_rlx_weight)
 {
-   return( hypre_BoomerAMGGetSchwarzRlxWeight( (void *) solver,
-                                               schwarz_rlx_weight ) );
+   return ( hypre_BoomerAMGGetSchwarzRlxWeight( (void *) solver,
+                                                schwarz_rlx_weight ) );
 }
 /*--------------------------------------------------------------------------
  * HYPRE_BoomerAMGSetSchwarzUseNonSymm
@@ -1109,8 +1153,8 @@ HYPRE_Int
 HYPRE_BoomerAMGSetSchwarzUseNonSymm( HYPRE_Solver  solver,
                                      HYPRE_Int use_nonsymm)
 {
-   return( hypre_BoomerAMGSetSchwarzUseNonSymm( (void *) solver,
-                                                use_nonsymm ) );
+   return ( hypre_BoomerAMGSetSchwarzUseNonSymm( (void *) solver,
+                                                 use_nonsymm ) );
 }
 /*--------------------------------------------------------------------------
  * HYPRE_BoomerAMGSym
@@ -1120,7 +1164,7 @@ HYPRE_Int
 HYPRE_BoomerAMGSetSym( HYPRE_Solver  solver,
                        HYPRE_Int           sym)
 {
-   return( hypre_BoomerAMGSetSym( (void *) solver, sym ) );
+   return ( hypre_BoomerAMGSetSym( (void *) solver, sym ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1131,7 +1175,7 @@ HYPRE_Int
 HYPRE_BoomerAMGSetLevel( HYPRE_Solver  solver,
                          HYPRE_Int           level)
 {
-   return( hypre_BoomerAMGSetLevel( (void *) solver, level ) );
+   return ( hypre_BoomerAMGSetLevel( (void *) solver, level ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1142,7 +1186,7 @@ HYPRE_Int
 HYPRE_BoomerAMGSetThreshold( HYPRE_Solver  solver,
                              HYPRE_Real    threshold  )
 {
-   return( hypre_BoomerAMGSetThreshold( (void *) solver, threshold ) );
+   return ( hypre_BoomerAMGSetThreshold( (void *) solver, threshold ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1153,7 +1197,7 @@ HYPRE_Int
 HYPRE_BoomerAMGSetFilter( HYPRE_Solver  solver,
                           HYPRE_Real    filter  )
 {
-   return( hypre_BoomerAMGSetFilter( (void *) solver, filter ) );
+   return ( hypre_BoomerAMGSetFilter( (void *) solver, filter ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1164,7 +1208,7 @@ HYPRE_Int
 HYPRE_BoomerAMGSetDropTol( HYPRE_Solver  solver,
                            HYPRE_Real    drop_tol  )
 {
-   return( hypre_BoomerAMGSetDropTol( (void *) solver, drop_tol ) );
+   return ( hypre_BoomerAMGSetDropTol( (void *) solver, drop_tol ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1175,7 +1219,7 @@ HYPRE_Int
 HYPRE_BoomerAMGSetMaxNzPerRow( HYPRE_Solver  solver,
                                HYPRE_Int          max_nz_per_row  )
 {
-   return( hypre_BoomerAMGSetMaxNzPerRow( (void *) solver, max_nz_per_row ) );
+   return ( hypre_BoomerAMGSetMaxNzPerRow( (void *) solver, max_nz_per_row ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1186,7 +1230,7 @@ HYPRE_Int
 HYPRE_BoomerAMGSetEuclidFile( HYPRE_Solver  solver,
                               char         *euclidfile)
 {
-   return( hypre_BoomerAMGSetEuclidFile( (void *) solver, euclidfile ) );
+   return ( hypre_BoomerAMGSetEuclidFile( (void *) solver, euclidfile ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1197,7 +1241,7 @@ HYPRE_Int
 HYPRE_BoomerAMGSetEuLevel( HYPRE_Solver  solver,
                            HYPRE_Int           eu_level)
 {
-   return( hypre_BoomerAMGSetEuLevel( (void *) solver, eu_level ) );
+   return ( hypre_BoomerAMGSetEuLevel( (void *) solver, eu_level ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1208,7 +1252,7 @@ HYPRE_Int
 HYPRE_BoomerAMGSetEuSparseA( HYPRE_Solver  solver,
                              HYPRE_Real    eu_sparse_A  )
 {
-   return( hypre_BoomerAMGSetEuSparseA( (void *) solver, eu_sparse_A ) );
+   return ( hypre_BoomerAMGSetEuSparseA( (void *) solver, eu_sparse_A ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1217,9 +1261,9 @@ HYPRE_BoomerAMGSetEuSparseA( HYPRE_Solver  solver,
 
 HYPRE_Int
 HYPRE_BoomerAMGSetEuBJ( HYPRE_Solver  solver,
-                        HYPRE_Int	      eu_bj)
+                        HYPRE_Int         eu_bj)
 {
-   return( hypre_BoomerAMGSetEuBJ( (void *) solver, eu_bj ) );
+   return ( hypre_BoomerAMGSetEuBJ( (void *) solver, eu_bj ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1228,9 +1272,9 @@ HYPRE_BoomerAMGSetEuBJ( HYPRE_Solver  solver,
 
 HYPRE_Int
 HYPRE_BoomerAMGSetILUType( HYPRE_Solver  solver,
-                        HYPRE_Int	      ilu_type)
+                           HYPRE_Int         ilu_type)
 {
-   return( hypre_BoomerAMGSetILUType( (void *) solver, ilu_type ) );
+   return ( hypre_BoomerAMGSetILUType( (void *) solver, ilu_type ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1239,9 +1283,9 @@ HYPRE_BoomerAMGSetILUType( HYPRE_Solver  solver,
 
 HYPRE_Int
 HYPRE_BoomerAMGSetILULevel( HYPRE_Solver  solver,
-                        HYPRE_Int	      ilu_lfil)
+                            HYPRE_Int         ilu_lfil)
 {
-   return( hypre_BoomerAMGSetILULevel( (void *) solver, ilu_lfil ) );
+   return ( hypre_BoomerAMGSetILULevel( (void *) solver, ilu_lfil ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1250,9 +1294,9 @@ HYPRE_BoomerAMGSetILULevel( HYPRE_Solver  solver,
 
 HYPRE_Int
 HYPRE_BoomerAMGSetILUMaxRowNnz( HYPRE_Solver  solver,
-                        HYPRE_Int	      ilu_max_row_nnz)
+                                HYPRE_Int         ilu_max_row_nnz)
 {
-   return( hypre_BoomerAMGSetILUMaxRowNnz( (void *) solver, ilu_max_row_nnz ) );
+   return ( hypre_BoomerAMGSetILUMaxRowNnz( (void *) solver, ilu_max_row_nnz ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1261,9 +1305,9 @@ HYPRE_BoomerAMGSetILUMaxRowNnz( HYPRE_Solver  solver,
 
 HYPRE_Int
 HYPRE_BoomerAMGSetILUMaxIter( HYPRE_Solver  solver,
-                        HYPRE_Int	      ilu_max_iter)
+                              HYPRE_Int         ilu_max_iter)
 {
-   return( hypre_BoomerAMGSetILUMaxIter( (void *) solver, ilu_max_iter ) );
+   return ( hypre_BoomerAMGSetILUMaxIter( (void *) solver, ilu_max_iter ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1272,9 +1316,42 @@ HYPRE_BoomerAMGSetILUMaxIter( HYPRE_Solver  solver,
 
 HYPRE_Int
 HYPRE_BoomerAMGSetILUDroptol( HYPRE_Solver  solver,
-                        HYPRE_Real	      ilu_droptol)
+                              HYPRE_Real        ilu_droptol)
 {
-   return( hypre_BoomerAMGSetILUDroptol( (void *) solver, ilu_droptol ) );
+   return ( hypre_BoomerAMGSetILUDroptol( (void *) solver, ilu_droptol ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_BoomerAMGSetILUTriSolve
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_BoomerAMGSetILUTriSolve( HYPRE_Solver  solver,
+                               HYPRE_Int        ilu_tri_solve)
+{
+   return ( hypre_BoomerAMGSetILUTriSolve( (void *) solver, ilu_tri_solve ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_BoomerAMGSetILULowerJacobiIters
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_BoomerAMGSetILULowerJacobiIters( HYPRE_Solver  solver,
+                                       HYPRE_Int        ilu_lower_jacobi_iters)
+{
+   return ( hypre_BoomerAMGSetILULowerJacobiIters( (void *) solver, ilu_lower_jacobi_iters ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_BoomerAMGSetILUUpperJacobiIters
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_BoomerAMGSetILUUpperJacobiIters( HYPRE_Solver  solver,
+                                       HYPRE_Int        ilu_upper_jacobi_iters)
+{
+   return ( hypre_BoomerAMGSetILUUpperJacobiIters( (void *) solver, ilu_upper_jacobi_iters ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1283,27 +1360,196 @@ HYPRE_BoomerAMGSetILUDroptol( HYPRE_Solver  solver,
 
 HYPRE_Int
 HYPRE_BoomerAMGSetILULocalReordering( HYPRE_Solver  solver,
-                        HYPRE_Int	      ilu_reordering_type)
+                                      HYPRE_Int         ilu_reordering_type)
+{
+   return ( hypre_BoomerAMGSetILULocalReordering( (void *) solver, ilu_reordering_type ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_BoomerAMGSetILUIterSetupType
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_BoomerAMGSetILUIterSetupType( HYPRE_Solver  solver,
+                                    HYPRE_Int     ilu_iter_setup_type)
+{
+   return ( hypre_BoomerAMGSetILUIterSetupType( (void *) solver, ilu_iter_setup_type ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_BoomerAMGSetILUIterSetupOption
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_BoomerAMGSetILUIterSetupOption( HYPRE_Solver  solver,
+                                      HYPRE_Int     ilu_iter_setup_option)
+{
+   return ( hypre_BoomerAMGSetILUIterSetupOption( (void *) solver, ilu_iter_setup_option ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_BoomerAMGSetILUIterSetupMaxIter
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_BoomerAMGSetILUIterSetupMaxIter( HYPRE_Solver  solver,
+                                       HYPRE_Int     ilu_iter_setup_max_iter)
+{
+   return ( hypre_BoomerAMGSetILUIterSetupMaxIter( (void *) solver, ilu_iter_setup_max_iter ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_BoomerAMGSetILUIterSetupTolerance
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_BoomerAMGSetILUIterSetupTolerance( HYPRE_Solver  solver,
+                                         HYPRE_Real    ilu_iter_setup_tolerance)
+{
+   return ( hypre_BoomerAMGSetILUIterSetupTolerance( (void *) solver, ilu_iter_setup_tolerance ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_BoomerAMGSetFSAIAlgoType
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_BoomerAMGSetFSAIAlgoType( HYPRE_Solver  solver,
+                                HYPRE_Int     algo_type )
+{
+   return ( hypre_BoomerAMGSetFSAIAlgoType( (void *) solver, algo_type ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_BoomerAMGSetFSAILocalSolveType
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_BoomerAMGSetFSAILocalSolveType( HYPRE_Solver  solver,
+                                      HYPRE_Int     local_solve_type )
+{
+   return ( hypre_BoomerAMGSetFSAILocalSolveType( (void *) solver, local_solve_type ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_BoomerAMGSetFSAIMaxSteps
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_BoomerAMGSetFSAIMaxSteps( HYPRE_Solver  solver,
+                                HYPRE_Int     max_steps  )
+{
+   return ( hypre_BoomerAMGSetFSAIMaxSteps( (void *) solver, max_steps ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_BoomerAMGSetFSAIMaxStepSize
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_BoomerAMGSetFSAIMaxStepSize( HYPRE_Solver  solver,
+                                   HYPRE_Int     max_step_size  )
 {
-   return( hypre_BoomerAMGSetILULocalReordering( (void *) solver, ilu_reordering_type ) );
+   return ( hypre_BoomerAMGSetFSAIMaxStepSize( (void *) solver, max_step_size ) );
 }
 
 /*--------------------------------------------------------------------------
- * HYPRE_BoomerAMGSetNumFunctions, HYPRE_BoomerAMGGetNumFunctions
+ * HYPRE_BoomerAMGSetFSAIMaxNnzRow
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_BoomerAMGSetFSAIMaxNnzRow( HYPRE_Solver  solver,
+                                 HYPRE_Int     max_nnz_row )
+{
+   return ( hypre_BoomerAMGSetFSAIMaxNnzRow( (void *) solver, max_nnz_row ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_BoomerAMGSetFSAINumLevels
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_BoomerAMGSetFSAINumLevels( HYPRE_Solver  solver,
+                                 HYPRE_Int     num_levels )
+{
+   return ( hypre_BoomerAMGSetFSAINumLevels( (void *) solver, num_levels ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_BoomerAMGSetFSAIThreshold
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_BoomerAMGSetFSAIThreshold( HYPRE_Solver  solver,
+                                 HYPRE_Real    threshold )
+{
+   return ( hypre_BoomerAMGSetFSAIThreshold( (void *) solver, threshold ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_BoomerAMGSetFSAIEigMaxIters
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_BoomerAMGSetFSAIEigMaxIters( HYPRE_Solver  solver,
+                                   HYPRE_Int     eig_max_iters )
+{
+   return ( hypre_BoomerAMGSetFSAIEigMaxIters( (void *) solver, eig_max_iters ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_BoomerAMGSetFSAIKapTolerance
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_BoomerAMGSetFSAIKapTolerance( HYPRE_Solver  solver,
+                                    HYPRE_Real    kap_tolerance  )
+{
+   return ( hypre_BoomerAMGSetFSAIKapTolerance( (void *) solver, kap_tolerance ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_BoomerAMGSetNumFunctions
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
 HYPRE_BoomerAMGSetNumFunctions( HYPRE_Solver  solver,
-                                HYPRE_Int          num_functions  )
+                                HYPRE_Int     num_functions  )
 {
-   return( hypre_BoomerAMGSetNumFunctions( (void *) solver, num_functions ) );
+   return ( hypre_BoomerAMGSetNumFunctions( (void *) solver, num_functions ) );
 }
 
+/*--------------------------------------------------------------------------
+ * HYPRE_BoomerAMGGetNumFunctions
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 HYPRE_BoomerAMGGetNumFunctions( HYPRE_Solver  solver,
-                                HYPRE_Int        * num_functions  )
+                                HYPRE_Int     *num_functions  )
 {
-   return( hypre_BoomerAMGGetNumFunctions( (void *) solver, num_functions ) );
+   return ( hypre_BoomerAMGGetNumFunctions( (void *) solver, num_functions ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_BoomerAMGSetFilterFunctions
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_BoomerAMGSetFilterFunctions( HYPRE_Solver  solver,
+                                   HYPRE_Int     filter_functions  )
+{
+   return ( hypre_BoomerAMGSetFilterFunctions( (void *) solver, filter_functions ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_BoomerAMGGetFilterFunctions
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_BoomerAMGGetFilterFunctions( HYPRE_Solver  solver,
+                                   HYPRE_Int    *filter_functions  )
+{
+   return ( hypre_BoomerAMGGetFilterFunctions( (void *) solver, filter_functions ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1314,7 +1560,7 @@ HYPRE_Int
 HYPRE_BoomerAMGSetNodal( HYPRE_Solver  solver,
                          HYPRE_Int          nodal  )
 {
-   return( hypre_BoomerAMGSetNodal( (void *) solver, nodal ) );
+   return ( hypre_BoomerAMGSetNodal( (void *) solver, nodal ) );
 }
 /*--------------------------------------------------------------------------
  * HYPRE_BoomerAMGSetNodalLevels
@@ -1324,10 +1570,9 @@ HYPRE_Int
 HYPRE_BoomerAMGSetNodalLevels( HYPRE_Solver  solver,
                                HYPRE_Int          nodal_levels  )
 {
-   return( hypre_BoomerAMGSetNodalLevels( (void *) solver, nodal_levels ) );
+   return ( hypre_BoomerAMGSetNodalLevels( (void *) solver, nodal_levels ) );
 }
 
-
 /*--------------------------------------------------------------------------
  * HYPRE_BoomerAMGSetNodalDiag
  *--------------------------------------------------------------------------*/
@@ -1336,7 +1581,7 @@ HYPRE_Int
 HYPRE_BoomerAMGSetNodalDiag( HYPRE_Solver  solver,
                              HYPRE_Int          nodal  )
 {
-   return( hypre_BoomerAMGSetNodalDiag( (void *) solver, nodal ) );
+   return ( hypre_BoomerAMGSetNodalDiag( (void *) solver, nodal ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1347,7 +1592,7 @@ HYPRE_Int
 HYPRE_BoomerAMGSetKeepSameSign( HYPRE_Solver  solver,
                                 HYPRE_Int     keep_same_sign  )
 {
-   return( hypre_BoomerAMGSetKeepSameSign( (void *) solver, keep_same_sign ) );
+   return ( hypre_BoomerAMGSetKeepSameSign( (void *) solver, keep_same_sign ) );
 }
 /*--------------------------------------------------------------------------
  * HYPRE_BoomerAMGSetDofFunc
@@ -1362,7 +1607,7 @@ HYPRE_BoomerAMGSetDofFunc( HYPRE_Solver  solver,
    dof_func by calling HYPRE_BoomerAMGSetDofFunc, this could be an unwanted surprise.
    As hypre is currently commonly used, this situation is likely to be rare. */
 {
-   return( hypre_BoomerAMGSetDofFunc( (void *) solver, dof_func ) );
+   return ( hypre_BoomerAMGSetDofFunc( (void *) solver, dof_func ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1373,7 +1618,7 @@ HYPRE_Int
 HYPRE_BoomerAMGSetNumPaths( HYPRE_Solver  solver,
                             HYPRE_Int          num_paths  )
 {
-   return( hypre_BoomerAMGSetNumPaths( (void *) solver, num_paths ) );
+   return ( hypre_BoomerAMGSetNumPaths( (void *) solver, num_paths ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1384,7 +1629,7 @@ HYPRE_Int
 HYPRE_BoomerAMGSetAggNumLevels( HYPRE_Solver  solver,
                                 HYPRE_Int          agg_num_levels  )
 {
-   return( hypre_BoomerAMGSetAggNumLevels( (void *) solver, agg_num_levels ) );
+   return ( hypre_BoomerAMGSetAggNumLevels( (void *) solver, agg_num_levels ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1395,7 +1640,7 @@ HYPRE_Int
 HYPRE_BoomerAMGSetAggInterpType( HYPRE_Solver  solver,
                                  HYPRE_Int          agg_interp_type  )
 {
-   return( hypre_BoomerAMGSetAggInterpType( (void *) solver, agg_interp_type ) );
+   return ( hypre_BoomerAMGSetAggInterpType( (void *) solver, agg_interp_type ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1406,7 +1651,7 @@ HYPRE_Int
 HYPRE_BoomerAMGSetAggTruncFactor( HYPRE_Solver  solver,
                                   HYPRE_Real    agg_trunc_factor  )
 {
-   return( hypre_BoomerAMGSetAggTruncFactor( (void *) solver, agg_trunc_factor ) );
+   return ( hypre_BoomerAMGSetAggTruncFactor( (void *) solver, agg_trunc_factor ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1417,7 +1662,7 @@ HYPRE_Int
 HYPRE_BoomerAMGSetAddTruncFactor( HYPRE_Solver  solver,
                                   HYPRE_Real        add_trunc_factor  )
 {
-   return( hypre_BoomerAMGSetMultAddTruncFactor( (void *) solver, add_trunc_factor ) );
+   return ( hypre_BoomerAMGSetMultAddTruncFactor( (void *) solver, add_trunc_factor ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1426,9 +1671,9 @@ HYPRE_BoomerAMGSetAddTruncFactor( HYPRE_Solver  solver,
 
 HYPRE_Int
 HYPRE_BoomerAMGSetMultAddTruncFactor( HYPRE_Solver  solver,
-                                  HYPRE_Real        add_trunc_factor  )
+                                      HYPRE_Real        add_trunc_factor  )
 {
-   return( hypre_BoomerAMGSetMultAddTruncFactor( (void *) solver, add_trunc_factor ) );
+   return ( hypre_BoomerAMGSetMultAddTruncFactor( (void *) solver, add_trunc_factor ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1437,9 +1682,9 @@ HYPRE_BoomerAMGSetMultAddTruncFactor( HYPRE_Solver  solver,
 
 HYPRE_Int
 HYPRE_BoomerAMGSetAddRelaxWt( HYPRE_Solver  solver,
-                                  HYPRE_Real        add_rlx_wt  )
+                              HYPRE_Real        add_rlx_wt  )
 {
-   return( hypre_BoomerAMGSetAddRelaxWt( (void *) solver, add_rlx_wt ) );
+   return ( hypre_BoomerAMGSetAddRelaxWt( (void *) solver, add_rlx_wt ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1448,9 +1693,9 @@ HYPRE_BoomerAMGSetAddRelaxWt( HYPRE_Solver  solver,
 
 HYPRE_Int
 HYPRE_BoomerAMGSetAddRelaxType( HYPRE_Solver  solver,
-                                  HYPRE_Int        add_rlx_type  )
+                                HYPRE_Int        add_rlx_type  )
 {
-   return( hypre_BoomerAMGSetAddRelaxType( (void *) solver, add_rlx_type ) );
+   return ( hypre_BoomerAMGSetAddRelaxType( (void *) solver, add_rlx_type ) );
 }
 /*--------------------------------------------------------------------------
  * HYPRE_BoomerAMGSetAggP12TruncFactor
@@ -1460,7 +1705,7 @@ HYPRE_Int
 HYPRE_BoomerAMGSetAggP12TruncFactor( HYPRE_Solver  solver,
                                      HYPRE_Real    agg_P12_trunc_factor  )
 {
-   return( hypre_BoomerAMGSetAggP12TruncFactor( (void *) solver, agg_P12_trunc_factor ) );
+   return ( hypre_BoomerAMGSetAggP12TruncFactor( (void *) solver, agg_P12_trunc_factor ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1471,7 +1716,7 @@ HYPRE_Int
 HYPRE_BoomerAMGSetAggPMaxElmts( HYPRE_Solver  solver,
                                 HYPRE_Int          agg_P_max_elmts  )
 {
-   return( hypre_BoomerAMGSetAggPMaxElmts( (void *) solver, agg_P_max_elmts ) );
+   return ( hypre_BoomerAMGSetAggPMaxElmts( (void *) solver, agg_P_max_elmts ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1482,7 +1727,7 @@ HYPRE_Int
 HYPRE_BoomerAMGSetAddPMaxElmts( HYPRE_Solver  solver,
                                 HYPRE_Int          add_P_max_elmts  )
 {
-   return( hypre_BoomerAMGSetMultAddPMaxElmts( (void *) solver, add_P_max_elmts ) );
+   return ( hypre_BoomerAMGSetMultAddPMaxElmts( (void *) solver, add_P_max_elmts ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1491,9 +1736,9 @@ HYPRE_BoomerAMGSetAddPMaxElmts( HYPRE_Solver  solver,
 
 HYPRE_Int
 HYPRE_BoomerAMGSetMultAddPMaxElmts( HYPRE_Solver  solver,
-                                HYPRE_Int          add_P_max_elmts  )
+                                    HYPRE_Int          add_P_max_elmts  )
 {
-   return( hypre_BoomerAMGSetMultAddPMaxElmts( (void *) solver, add_P_max_elmts ) );
+   return ( hypre_BoomerAMGSetMultAddPMaxElmts( (void *) solver, add_P_max_elmts ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1504,7 +1749,7 @@ HYPRE_Int
 HYPRE_BoomerAMGSetAggP12MaxElmts( HYPRE_Solver  solver,
                                   HYPRE_Int          agg_P12_max_elmts  )
 {
-   return( hypre_BoomerAMGSetAggP12MaxElmts( (void *) solver, agg_P12_max_elmts ) );
+   return ( hypre_BoomerAMGSetAggP12MaxElmts( (void *) solver, agg_P12_max_elmts ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1515,7 +1760,7 @@ HYPRE_Int
 HYPRE_BoomerAMGSetNumCRRelaxSteps( HYPRE_Solver  solver,
                                    HYPRE_Int          num_CR_relax_steps  )
 {
-   return( hypre_BoomerAMGSetNumCRRelaxSteps( (void *) solver, num_CR_relax_steps ) );
+   return ( hypre_BoomerAMGSetNumCRRelaxSteps( (void *) solver, num_CR_relax_steps ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1526,7 +1771,7 @@ HYPRE_Int
 HYPRE_BoomerAMGSetCRRate( HYPRE_Solver  solver,
                           HYPRE_Real    CR_rate  )
 {
-   return( hypre_BoomerAMGSetCRRate( (void *) solver, CR_rate ) );
+   return ( hypre_BoomerAMGSetCRRate( (void *) solver, CR_rate ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1537,21 +1782,21 @@ HYPRE_Int
 HYPRE_BoomerAMGSetCRStrongTh( HYPRE_Solver  solver,
                               HYPRE_Real    CR_strong_th  )
 {
-   return( hypre_BoomerAMGSetCRStrongTh( (void *) solver, CR_strong_th ) );
+   return ( hypre_BoomerAMGSetCRStrongTh( (void *) solver, CR_strong_th ) );
 }
 
 HYPRE_Int
 HYPRE_BoomerAMGSetADropTol( HYPRE_Solver  solver,
                             HYPRE_Real    A_drop_tol  )
 {
-   return( hypre_BoomerAMGSetADropTol( (void *) solver, A_drop_tol ) );
+   return ( hypre_BoomerAMGSetADropTol( (void *) solver, A_drop_tol ) );
 }
 
 HYPRE_Int
 HYPRE_BoomerAMGSetADropType( HYPRE_Solver  solver,
                              HYPRE_Int     A_drop_type  )
 {
-   return( hypre_BoomerAMGSetADropType( (void *) solver, A_drop_type ) );
+   return ( hypre_BoomerAMGSetADropType( (void *) solver, A_drop_type ) );
 }
 /*--------------------------------------------------------------------------
  * HYPRE_BoomerAMGSetISType
@@ -1561,7 +1806,7 @@ HYPRE_Int
 HYPRE_BoomerAMGSetISType( HYPRE_Solver  solver,
                           HYPRE_Int          IS_type  )
 {
-   return( hypre_BoomerAMGSetISType( (void *) solver, IS_type ) );
+   return ( hypre_BoomerAMGSetISType( (void *) solver, IS_type ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1572,7 +1817,7 @@ HYPRE_Int
 HYPRE_BoomerAMGSetCRUseCG( HYPRE_Solver  solver,
                            HYPRE_Int    CR_use_CG  )
 {
-   return( hypre_BoomerAMGSetCRUseCG( (void *) solver, CR_use_CG ) );
+   return ( hypre_BoomerAMGSetCRUseCG( (void *) solver, CR_use_CG ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1583,7 +1828,7 @@ HYPRE_Int
 HYPRE_BoomerAMGSetGSMG( HYPRE_Solver  solver,
                         HYPRE_Int        gsmg  )
 {
-   return( hypre_BoomerAMGSetGSMG( (void *) solver, gsmg ) );
+   return ( hypre_BoomerAMGSetGSMG( (void *) solver, gsmg ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1594,7 +1839,7 @@ HYPRE_Int
 HYPRE_BoomerAMGSetNumSamples( HYPRE_Solver  solver,
                               HYPRE_Int        gsmg  )
 {
-   return( hypre_BoomerAMGSetNumSamples( (void *) solver, gsmg ) );
+   return ( hypre_BoomerAMGSetNumSamples( (void *) solver, gsmg ) );
 }
 /* BM Aug 25, 2006 */
 
@@ -1662,7 +1907,7 @@ HYPRE_BoomerAMGSetCoordinates (HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_BoomerAMGGetGridHierarchy(HYPRE_Solver solver,
-                              HYPRE_Int *cgrid )
+                                HYPRE_Int *cgrid )
 {
    return (hypre_BoomerAMGGetGridHierarchy ( (void *) solver, cgrid ) );
 }
@@ -1675,7 +1920,7 @@ HYPRE_Int
 HYPRE_BoomerAMGSetChebyOrder( HYPRE_Solver  solver,
                               HYPRE_Int        order )
 {
-   return( hypre_BoomerAMGSetChebyOrder( (void *) solver, order ) );
+   return ( hypre_BoomerAMGSetChebyOrder( (void *) solver, order ) );
 }
 /*--------------------------------------------------------------------------
  * HYPRE_BoomerAMGSetChebyFraction
@@ -1685,7 +1930,7 @@ HYPRE_Int
 HYPRE_BoomerAMGSetChebyFraction( HYPRE_Solver  solver,
                                  HYPRE_Real     ratio )
 {
-   return( hypre_BoomerAMGSetChebyFraction( (void *) solver, ratio ) );
+   return ( hypre_BoomerAMGSetChebyFraction( (void *) solver, ratio ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1694,9 +1939,9 @@ HYPRE_BoomerAMGSetChebyFraction( HYPRE_Solver  solver,
 
 HYPRE_Int
 HYPRE_BoomerAMGSetChebyScale( HYPRE_Solver  solver,
-                                 HYPRE_Int     scale )
+                              HYPRE_Int     scale )
 {
-   return( hypre_BoomerAMGSetChebyScale( (void *) solver, scale ) );
+   return ( hypre_BoomerAMGSetChebyScale( (void *) solver, scale ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1705,9 +1950,9 @@ HYPRE_BoomerAMGSetChebyScale( HYPRE_Solver  solver,
 
 HYPRE_Int
 HYPRE_BoomerAMGSetChebyVariant( HYPRE_Solver  solver,
-                                 HYPRE_Int     variant )
+                                HYPRE_Int     variant )
 {
-   return( hypre_BoomerAMGSetChebyVariant( (void *) solver, variant ) );
+   return ( hypre_BoomerAMGSetChebyVariant( (void *) solver, variant ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1716,9 +1961,9 @@ HYPRE_BoomerAMGSetChebyVariant( HYPRE_Solver  solver,
 
 HYPRE_Int
 HYPRE_BoomerAMGSetChebyEigEst( HYPRE_Solver  solver,
-                                 HYPRE_Int     eig_est )
+                               HYPRE_Int     eig_est )
 {
-   return( hypre_BoomerAMGSetChebyEigEst( (void *) solver, eig_est ) );
+   return ( hypre_BoomerAMGSetChebyEigEst( (void *) solver, eig_est ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1750,8 +1995,8 @@ HYPRE_Int
 HYPRE_BoomerAMGSetInterpVecQMax( HYPRE_Solver solver,
                                  HYPRE_Int       q_max  )
 {
-   return( hypre_BoomerAMGSetInterpVecQMax( (void *) solver,
-                                            q_max ) );
+   return ( hypre_BoomerAMGSetInterpVecQMax( (void *) solver,
+                                             q_max ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1761,8 +2006,8 @@ HYPRE_Int
 HYPRE_BoomerAMGSetInterpVecAbsQTrunc( HYPRE_Solver solver,
                                       HYPRE_Real   q_trunc  )
 {
-   return( hypre_BoomerAMGSetInterpVecAbsQTrunc( (void *) solver,
-                                                 q_trunc ) );
+   return ( hypre_BoomerAMGSetInterpVecAbsQTrunc( (void *) solver,
+                                                  q_trunc ) );
 }
 /*--------------------------------------------------------------------------
  * HYPRE_BoomerAMGSetSmoothInterpVectors
@@ -1771,8 +2016,8 @@ HYPRE_Int
 HYPRE_BoomerAMGSetSmoothInterpVectors( HYPRE_Solver solver,
                                        HYPRE_Int    smooth_interp_vectors  )
 {
-   return( hypre_BoomerAMGSetSmoothInterpVectors( (void *) solver,
-                                                  smooth_interp_vectors) );
+   return ( hypre_BoomerAMGSetSmoothInterpVectors( (void *) solver,
+                                                   smooth_interp_vectors) );
 }
 /*--------------------------------------------------------------------------
  * HYPRE_BoomerAMGSetInterpRefine
@@ -1781,8 +2026,8 @@ HYPRE_Int
 HYPRE_BoomerAMGSetInterpRefine( HYPRE_Solver solver,
                                 HYPRE_Int    num_refine  )
 {
-   return( hypre_BoomerAMGSetInterpRefine( (void *) solver,
-                                           num_refine ) );
+   return ( hypre_BoomerAMGSetInterpRefine( (void *) solver,
+                                            num_refine ) );
 }
 /*--------------------------------------------------------------------------
  * HYPRE_BoomerAMGSetInterpVecFirstLevel(
@@ -1791,8 +2036,8 @@ HYPRE_Int
 HYPRE_BoomerAMGSetInterpVecFirstLevel( HYPRE_Solver solver,
                                        HYPRE_Int    level  )
 {
-   return( hypre_BoomerAMGSetInterpVecFirstLevel( (void *) solver,
-                                                  level ) );
+   return ( hypre_BoomerAMGSetInterpVecFirstLevel( (void *) solver,
+                                                   level ) );
 }
 /*--------------------------------------------------------------------------
  * HYPRE_BoomerAMGSetAdditive, HYPRE_BoomerAMGGetAdditive
@@ -1802,14 +2047,14 @@ HYPRE_Int
 HYPRE_BoomerAMGSetAdditive( HYPRE_Solver solver,
                             HYPRE_Int    additive  )
 {
-   return( hypre_BoomerAMGSetAdditive( (void *) solver, additive ) );
+   return ( hypre_BoomerAMGSetAdditive( (void *) solver, additive ) );
 }
 
 HYPRE_Int
 HYPRE_BoomerAMGGetAdditive( HYPRE_Solver solver,
                             HYPRE_Int  * additive  )
 {
-   return( hypre_BoomerAMGGetAdditive( (void *) solver, additive ) );
+   return ( hypre_BoomerAMGGetAdditive( (void *) solver, additive ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1820,14 +2065,14 @@ HYPRE_Int
 HYPRE_BoomerAMGSetMultAdditive( HYPRE_Solver solver,
                                 HYPRE_Int    mult_additive  )
 {
-   return( hypre_BoomerAMGSetMultAdditive( (void *) solver, mult_additive ) );
+   return ( hypre_BoomerAMGSetMultAdditive( (void *) solver, mult_additive ) );
 }
 
 HYPRE_Int
 HYPRE_BoomerAMGGetMultAdditive( HYPRE_Solver solver,
                                 HYPRE_Int   *mult_additive  )
 {
-   return( hypre_BoomerAMGGetMultAdditive( (void *) solver, mult_additive ) );
+   return ( hypre_BoomerAMGGetMultAdditive( (void *) solver, mult_additive ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1838,14 +2083,14 @@ HYPRE_Int
 HYPRE_BoomerAMGSetSimple( HYPRE_Solver solver,
                           HYPRE_Int    simple  )
 {
-   return( hypre_BoomerAMGSetSimple( (void *) solver, simple ) );
+   return ( hypre_BoomerAMGSetSimple( (void *) solver, simple ) );
 }
 
 HYPRE_Int
 HYPRE_BoomerAMGGetSimple( HYPRE_Solver solver,
                           HYPRE_Int   *simple  )
 {
-   return( hypre_BoomerAMGGetSimple( (void *) solver, simple ) );
+   return ( hypre_BoomerAMGGetSimple( (void *) solver, simple ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1856,7 +2101,7 @@ HYPRE_Int
 HYPRE_BoomerAMGSetAddLastLvl( HYPRE_Solver solver,
                               HYPRE_Int    add_last_lvl  )
 {
-   return( hypre_BoomerAMGSetAddLastLvl( (void *) solver, add_last_lvl ) );
+   return ( hypre_BoomerAMGSetAddLastLvl( (void *) solver, add_last_lvl ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1879,7 +2124,7 @@ HYPRE_BoomerAMGSetLevelNonGalerkinTol (HYPRE_Solver solver,
                                        HYPRE_Real   nongalerkin_tol,
                                        HYPRE_Int    level)
 {
-   return (hypre_BoomerAMGSetLevelNonGalerkinTol ( (void *) solver, nongalerkin_tol , level ) );
+   return (hypre_BoomerAMGSetLevelNonGalerkinTol ( (void *) solver, nongalerkin_tol, level ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1891,7 +2136,7 @@ HYPRE_BoomerAMGSetNonGalerkTol (HYPRE_Solver solver,
                                 HYPRE_Int    nongalerk_num_tol,
                                 HYPRE_Real  *nongalerk_tol)
 {
-   return (hypre_BoomerAMGSetNonGalerkTol ( (void *) solver, nongalerk_num_tol , nongalerk_tol ) );
+   return (hypre_BoomerAMGSetNonGalerkTol ( (void *) solver, nongalerk_num_tol, nongalerk_tol ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -1950,7 +2195,8 @@ HYPRE_BoomerAMGSetCpointsToKeep(HYPRE_Solver  solver,
                                 HYPRE_Int     num_cpt_coarse,
                                 HYPRE_BigInt *cpt_coarse_index)
 {
-   return (hypre_BoomerAMGSetCPoints( (void *) solver, cpt_coarse_level, num_cpt_coarse, cpt_coarse_index));
+   return (hypre_BoomerAMGSetCPoints( (void *) solver, cpt_coarse_level, num_cpt_coarse,
+                                      cpt_coarse_index));
 }
 
 /*--------------------------------------------------------------------------
@@ -1963,7 +2209,8 @@ HYPRE_BoomerAMGSetCPoints(HYPRE_Solver  solver,
                           HYPRE_Int     num_cpt_coarse,
                           HYPRE_BigInt *cpt_coarse_index)
 {
-   return (hypre_BoomerAMGSetCPoints( (void *) solver, cpt_coarse_level, num_cpt_coarse, cpt_coarse_index));
+   return (hypre_BoomerAMGSetCPoints( (void *) solver, cpt_coarse_level, num_cpt_coarse,
+                                      cpt_coarse_index));
 }
 
 /*--------------------------------------------------------------------------
@@ -1994,3 +2241,24 @@ HYPRE_BoomerAMGSetIsolatedFPoints(HYPRE_Solver   solver,
                                       isolated_fpt_index) );
 }
 
+/*--------------------------------------------------------------------------
+ * HYPRE_BoomerAMGSetCumNnzAP
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_BoomerAMGSetCumNnzAP( HYPRE_Solver  solver,
+                            HYPRE_Real    cum_nnz_AP )
+{
+   return ( hypre_BoomerAMGSetCumNnzAP( (void *) solver, cum_nnz_AP ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_BoomerAMGGetCumNnzAP
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_BoomerAMGGetCumNnzAP( HYPRE_Solver  solver,
+                            HYPRE_Real   *cum_nnz_AP )
+{
+   return ( hypre_BoomerAMGGetCumNnzAP( (void *) solver, cum_nnz_AP ) );
+}
diff --git a/external/hypre/src/parcsr_ls/HYPRE_parcsr_amgdd.c b/external/hypre/src/parcsr_ls/HYPRE_parcsr_amgdd.c
index 555b15a9..485d926e 100644
--- a/external/hypre/src/parcsr_ls/HYPRE_parcsr_amgdd.c
+++ b/external/hypre/src/parcsr_ls/HYPRE_parcsr_amgdd.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -31,7 +31,7 @@ HYPRE_BoomerAMGDDCreate( HYPRE_Solver *solver)
 HYPRE_Int
 HYPRE_BoomerAMGDDDestroy( HYPRE_Solver solver )
 {
-   return( hypre_BoomerAMGDDDestroy( (void *) solver ) );
+   return ( hypre_BoomerAMGDDDestroy( (void *) solver ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -60,10 +60,10 @@ HYPRE_BoomerAMGDDSolve( HYPRE_Solver solver,
                         HYPRE_ParVector b,
                         HYPRE_ParVector x )
 {
-   return( hypre_BoomerAMGDDSolve( (void *) solver,
-                                   (hypre_ParCSRMatrix *) A,
-                                   (hypre_ParVector *) b,
-                                   (hypre_ParVector *) x ) );
+   return ( hypre_BoomerAMGDDSolve( (void *) solver,
+                                    (hypre_ParCSRMatrix *) A,
+                                    (hypre_ParVector *) b,
+                                    (hypre_ParVector *) x ) );
 }
 
 /*-------------------------------------------------------------------------
@@ -74,14 +74,14 @@ HYPRE_Int
 HYPRE_BoomerAMGDDSetStartLevel( HYPRE_Solver solver,
                                 HYPRE_Int    start_level )
 {
-   return( hypre_BoomerAMGDDSetStartLevel( (void *) solver, start_level ) );
+   return ( hypre_BoomerAMGDDSetStartLevel( (void *) solver, start_level ) );
 }
 
 HYPRE_Int
 HYPRE_BoomerAMGDDGetStartLevel( HYPRE_Solver  solver,
                                 HYPRE_Int    *start_level )
 {
-   return( hypre_BoomerAMGDDGetStartLevel( (void *) solver, start_level ) );
+   return ( hypre_BoomerAMGDDGetStartLevel( (void *) solver, start_level ) );
 }
 
 /*-------------------------------------------------------------------------
@@ -92,14 +92,14 @@ HYPRE_Int
 HYPRE_BoomerAMGDDSetFACNumRelax( HYPRE_Solver solver,
                                  HYPRE_Int    amgdd_fac_num_relax )
 {
-   return( hypre_BoomerAMGDDSetFACNumRelax( (void *) solver, amgdd_fac_num_relax ) );
+   return ( hypre_BoomerAMGDDSetFACNumRelax( (void *) solver, amgdd_fac_num_relax ) );
 }
 
 HYPRE_Int
 HYPRE_BoomerAMGDDGetFACNumRelax( HYPRE_Solver  solver,
                                  HYPRE_Int    *amgdd_fac_num_relax )
 {
-   return( hypre_BoomerAMGDDGetFACNumRelax( (void *) solver, amgdd_fac_num_relax ) );
+   return ( hypre_BoomerAMGDDGetFACNumRelax( (void *) solver, amgdd_fac_num_relax ) );
 }
 
 /*-------------------------------------------------------------------------
@@ -110,14 +110,14 @@ HYPRE_Int
 HYPRE_BoomerAMGDDSetFACNumCycles( HYPRE_Solver solver,
                                   HYPRE_Int    amgdd_fac_num_cycles )
 {
-   return( hypre_BoomerAMGDDSetFACNumCycles( (void *) solver, amgdd_fac_num_cycles ) );
+   return ( hypre_BoomerAMGDDSetFACNumCycles( (void *) solver, amgdd_fac_num_cycles ) );
 }
 
 HYPRE_Int
 HYPRE_BoomerAMGDDGetFACNumCycles( HYPRE_Solver  solver,
                                   HYPRE_Int    *amgdd_fac_num_cycles  )
 {
-   return( hypre_BoomerAMGDDGetFACNumCycles( (void *) solver, amgdd_fac_num_cycles ) );
+   return ( hypre_BoomerAMGDDGetFACNumCycles( (void *) solver, amgdd_fac_num_cycles ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -128,14 +128,14 @@ HYPRE_Int
 HYPRE_BoomerAMGDDSetFACCycleType( HYPRE_Solver solver,
                                   HYPRE_Int    amgdd_fac_cycle_type )
 {
-   return( hypre_BoomerAMGDDSetFACCycleType( (void *) solver, amgdd_fac_cycle_type ) );
+   return ( hypre_BoomerAMGDDSetFACCycleType( (void *) solver, amgdd_fac_cycle_type ) );
 }
 
 HYPRE_Int
 HYPRE_BoomerAMGDDGetFACCycleType( HYPRE_Solver  solver,
                                   HYPRE_Int    *amgdd_fac_cycle_type )
 {
-   return( hypre_BoomerAMGDDGetFACCycleType( (void *) solver, amgdd_fac_cycle_type ) );
+   return ( hypre_BoomerAMGDDGetFACCycleType( (void *) solver, amgdd_fac_cycle_type ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -146,14 +146,14 @@ HYPRE_Int
 HYPRE_BoomerAMGDDSetFACRelaxType( HYPRE_Solver solver,
                                   HYPRE_Int    amgdd_fac_relax_type )
 {
-   return( hypre_BoomerAMGDDSetFACRelaxType( (void *) solver, amgdd_fac_relax_type ) );
+   return ( hypre_BoomerAMGDDSetFACRelaxType( (void *) solver, amgdd_fac_relax_type ) );
 }
 
 HYPRE_Int
 HYPRE_BoomerAMGDDGetFACRelaxType( HYPRE_Solver  solver,
                                   HYPRE_Int    *amgdd_fac_relax_type )
 {
-   return( hypre_BoomerAMGDDGetFACRelaxType( (void *) solver, amgdd_fac_relax_type ) );
+   return ( hypre_BoomerAMGDDGetFACRelaxType( (void *) solver, amgdd_fac_relax_type ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -164,14 +164,14 @@ HYPRE_Int
 HYPRE_BoomerAMGDDSetFACRelaxWeight( HYPRE_Solver solver,
                                     HYPRE_Real   amgdd_fac_relax_weight )
 {
-   return( hypre_BoomerAMGDDSetFACRelaxWeight( (void *) solver, amgdd_fac_relax_weight ) );
+   return ( hypre_BoomerAMGDDSetFACRelaxWeight( (void *) solver, amgdd_fac_relax_weight ) );
 }
 
 HYPRE_Int
 HYPRE_BoomerAMGDDGetFACRelaxWeight( HYPRE_Solver  solver,
                                     HYPRE_Real   *amgdd_fac_relax_weight )
 {
-   return( hypre_BoomerAMGDDGetFACRelaxWeight( (void *) solver, amgdd_fac_relax_weight ) );
+   return ( hypre_BoomerAMGDDGetFACRelaxWeight( (void *) solver, amgdd_fac_relax_weight ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -182,14 +182,14 @@ HYPRE_Int
 HYPRE_BoomerAMGDDSetPadding( HYPRE_Solver solver,
                              HYPRE_Int    padding )
 {
-   return( hypre_BoomerAMGDDSetPadding( (void *) solver, padding ) );
+   return ( hypre_BoomerAMGDDSetPadding( (void *) solver, padding ) );
 }
 
 HYPRE_Int
 HYPRE_BoomerAMGDDGetPadding( HYPRE_Solver  solver,
                              HYPRE_Int    *padding  )
 {
-   return( hypre_BoomerAMGDDGetPadding( (void *) solver, padding ) );
+   return ( hypre_BoomerAMGDDGetPadding( (void *) solver, padding ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -200,14 +200,14 @@ HYPRE_Int
 HYPRE_BoomerAMGDDSetNumGhostLayers( HYPRE_Solver solver,
                                     HYPRE_Int    num_ghost_layers )
 {
-   return( hypre_BoomerAMGDDSetNumGhostLayers( (void *) solver, num_ghost_layers ) );
+   return ( hypre_BoomerAMGDDSetNumGhostLayers( (void *) solver, num_ghost_layers ) );
 }
 
 HYPRE_Int
 HYPRE_BoomerAMGDDGetNumGhostLayers( HYPRE_Solver  solver,
                                     HYPRE_Int    *num_ghost_layers )
 {
-   return( hypre_BoomerAMGDDGetNumGhostLayers( (void *) solver, num_ghost_layers ) );
+   return ( hypre_BoomerAMGDDGetNumGhostLayers( (void *) solver, num_ghost_layers ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -216,11 +216,11 @@ HYPRE_BoomerAMGDDGetNumGhostLayers( HYPRE_Solver  solver,
 
 HYPRE_Int
 HYPRE_BoomerAMGDDSetUserFACRelaxation( HYPRE_Solver solver,
-   HYPRE_Int (*userFACRelaxation)( void      *amgdd_vdata,
-                                   HYPRE_Int  level,
-                                   HYPRE_Int  cycle_param ) )
+                                       HYPRE_Int (*userFACRelaxation)( void      *amgdd_vdata,
+                                                                       HYPRE_Int  level,
+                                                                       HYPRE_Int  cycle_param ) )
 {
-   return( hypre_BoomerAMGDDSetUserFACRelaxation( (void *) solver, userFACRelaxation ) );
+   return ( hypre_BoomerAMGDDSetUserFACRelaxation( (void *) solver, userFACRelaxation ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -231,7 +231,7 @@ HYPRE_Int
 HYPRE_BoomerAMGDDGetAMG( HYPRE_Solver  solver,
                          HYPRE_Solver *amg_solver )
 {
-   return( hypre_BoomerAMGDDGetAMG( (void *) solver, (void **) amg_solver ) );
+   return ( hypre_BoomerAMGDDGetAMG( (void *) solver, (void **) amg_solver ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -245,7 +245,7 @@ HYPRE_BoomerAMGDDGetFinalRelativeResidualNorm( HYPRE_Solver  solver,
    HYPRE_Solver amg_solver;
 
    HYPRE_BoomerAMGDDGetAMG(solver, &amg_solver);
-   return( hypre_BoomerAMGGetRelResidualNorm( (void *) amg_solver, rel_resid_norm ) );
+   return ( hypre_BoomerAMGGetRelResidualNorm( (void *) amg_solver, rel_resid_norm ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -259,5 +259,5 @@ HYPRE_BoomerAMGDDGetNumIterations( HYPRE_Solver   solver,
    HYPRE_Solver amg_solver;
 
    HYPRE_BoomerAMGDDGetAMG(solver, &amg_solver);
-   return( hypre_BoomerAMGGetNumIterations( (void *) amg_solver, num_iterations ) );
+   return ( hypre_BoomerAMGGetNumIterations( (void *) amg_solver, num_iterations ) );
 }
diff --git a/external/hypre/src/parcsr_ls/HYPRE_parcsr_bicgstab.c b/external/hypre/src/parcsr_ls/HYPRE_parcsr_bicgstab.c
index 6fbf0c91..edf31cf4 100644
--- a/external/hypre/src/parcsr_ls/HYPRE_parcsr_bicgstab.c
+++ b/external/hypre/src/parcsr_ls/HYPRE_parcsr_bicgstab.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -14,6 +14,8 @@
 HYPRE_Int
 HYPRE_ParCSRBiCGSTABCreate( MPI_Comm comm, HYPRE_Solver *solver )
 {
+   HYPRE_UNUSED_VAR(comm);
+
    hypre_BiCGSTABFunctions * bicgstab_functions;
 
    if (!solver)
@@ -24,13 +26,18 @@ HYPRE_ParCSRBiCGSTABCreate( MPI_Comm comm, HYPRE_Solver *solver )
    bicgstab_functions =
       hypre_BiCGSTABFunctionsCreate(
          hypre_ParKrylovCreateVector,
-         hypre_ParKrylovDestroyVector, hypre_ParKrylovMatvecCreate,
-         hypre_ParKrylovMatvec, hypre_ParKrylovMatvecDestroy,
-         hypre_ParKrylovInnerProd, hypre_ParKrylovCopyVector,
+         hypre_ParKrylovDestroyVector,
+         hypre_ParKrylovMatvecCreate,
+         hypre_ParKrylovMatvec,
+         hypre_ParKrylovMatvecDestroy,
+         hypre_ParKrylovInnerProd,
+         hypre_ParKrylovCopyVector,
          hypre_ParKrylovClearVector,
-         hypre_ParKrylovScaleVector, hypre_ParKrylovAxpy,
+         hypre_ParKrylovScaleVector,
+         hypre_ParKrylovAxpy,
          hypre_ParKrylovCommInfo,
-         hypre_ParKrylovIdentitySetup, hypre_ParKrylovIdentity );
+         hypre_ParKrylovIdentitySetup,
+         hypre_ParKrylovIdentity );
    *solver = ( (HYPRE_Solver) hypre_BiCGSTABCreate( bicgstab_functions) );
 
    return hypre_error_flag;
@@ -43,7 +50,7 @@ HYPRE_ParCSRBiCGSTABCreate( MPI_Comm comm, HYPRE_Solver *solver )
 HYPRE_Int
 HYPRE_ParCSRBiCGSTABDestroy( HYPRE_Solver solver )
 {
-   return( hypre_BiCGSTABDestroy( (void *) solver ) );
+   return ( hypre_BiCGSTABDestroy( (void *) solver ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -56,10 +63,10 @@ HYPRE_ParCSRBiCGSTABSetup( HYPRE_Solver solver,
                            HYPRE_ParVector b,
                            HYPRE_ParVector x      )
 {
-   return( HYPRE_BiCGSTABSetup( solver,
-                                (HYPRE_Matrix) A,
-                                (HYPRE_Vector) b,
-                                (HYPRE_Vector) x ) );
+   return ( HYPRE_BiCGSTABSetup( solver,
+                                 (HYPRE_Matrix) A,
+                                 (HYPRE_Vector) b,
+                                 (HYPRE_Vector) x ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -72,10 +79,10 @@ HYPRE_ParCSRBiCGSTABSolve( HYPRE_Solver solver,
                            HYPRE_ParVector b,
                            HYPRE_ParVector x      )
 {
-   return( HYPRE_BiCGSTABSolve( solver,
-                                (HYPRE_Matrix) A,
-                                (HYPRE_Vector) b,
-                                (HYPRE_Vector) x ) );
+   return ( HYPRE_BiCGSTABSolve( solver,
+                                 (HYPRE_Matrix) A,
+                                 (HYPRE_Vector) b,
+                                 (HYPRE_Vector) x ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -86,7 +93,7 @@ HYPRE_Int
 HYPRE_ParCSRBiCGSTABSetTol( HYPRE_Solver solver,
                             HYPRE_Real         tol    )
 {
-   return( HYPRE_BiCGSTABSetTol( solver, tol ) );
+   return ( HYPRE_BiCGSTABSetTol( solver, tol ) );
 }
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRBiCGSTABSetAbsoluteTol
@@ -96,7 +103,7 @@ HYPRE_Int
 HYPRE_ParCSRBiCGSTABSetAbsoluteTol( HYPRE_Solver solver,
                                     HYPRE_Real         a_tol    )
 {
-   return( HYPRE_BiCGSTABSetAbsoluteTol( solver, a_tol ) );
+   return ( HYPRE_BiCGSTABSetAbsoluteTol( solver, a_tol ) );
 }
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRBiCGSTABSetMinIter
@@ -106,7 +113,7 @@ HYPRE_Int
 HYPRE_ParCSRBiCGSTABSetMinIter( HYPRE_Solver solver,
                                 HYPRE_Int          min_iter )
 {
-   return( HYPRE_BiCGSTABSetMinIter( solver, min_iter ) );
+   return ( HYPRE_BiCGSTABSetMinIter( solver, min_iter ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -117,7 +124,7 @@ HYPRE_Int
 HYPRE_ParCSRBiCGSTABSetMaxIter( HYPRE_Solver solver,
                                 HYPRE_Int          max_iter )
 {
-   return( HYPRE_BiCGSTABSetMaxIter( solver, max_iter ) );
+   return ( HYPRE_BiCGSTABSetMaxIter( solver, max_iter ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -128,7 +135,7 @@ HYPRE_Int
 HYPRE_ParCSRBiCGSTABSetStopCrit( HYPRE_Solver solver,
                                  HYPRE_Int          stop_crit )
 {
-   return( HYPRE_BiCGSTABSetStopCrit( solver, stop_crit ) );
+   return ( HYPRE_BiCGSTABSetStopCrit( solver, stop_crit ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -141,10 +148,10 @@ HYPRE_ParCSRBiCGSTABSetPrecond( HYPRE_Solver         solver,
                                 HYPRE_PtrToParSolverFcn precond_setup,
                                 HYPRE_Solver         precond_solver )
 {
-   return( HYPRE_BiCGSTABSetPrecond( solver,
-                                     (HYPRE_PtrToSolverFcn) precond,
-                                     (HYPRE_PtrToSolverFcn) precond_setup,
-                                     precond_solver ) );
+   return ( HYPRE_BiCGSTABSetPrecond( solver,
+                                      (HYPRE_PtrToSolverFcn) precond,
+                                      (HYPRE_PtrToSolverFcn) precond_setup,
+                                      precond_solver ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -155,7 +162,7 @@ HYPRE_Int
 HYPRE_ParCSRBiCGSTABGetPrecond( HYPRE_Solver  solver,
                                 HYPRE_Solver *precond_data_ptr )
 {
-   return( HYPRE_BiCGSTABGetPrecond( solver, precond_data_ptr ) );
+   return ( HYPRE_BiCGSTABGetPrecond( solver, precond_data_ptr ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -166,7 +173,7 @@ HYPRE_Int
 HYPRE_ParCSRBiCGSTABSetLogging( HYPRE_Solver solver,
                                 HYPRE_Int logging)
 {
-   return( HYPRE_BiCGSTABSetLogging( solver, logging ) );
+   return ( HYPRE_BiCGSTABSetLogging( solver, logging ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -177,7 +184,7 @@ HYPRE_Int
 HYPRE_ParCSRBiCGSTABSetPrintLevel( HYPRE_Solver solver,
                                    HYPRE_Int print_level)
 {
-   return( HYPRE_BiCGSTABSetPrintLevel( solver, print_level ) );
+   return ( HYPRE_BiCGSTABSetPrintLevel( solver, print_level ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -188,7 +195,7 @@ HYPRE_Int
 HYPRE_ParCSRBiCGSTABGetNumIterations( HYPRE_Solver  solver,
                                       HYPRE_Int                *num_iterations )
 {
-   return( HYPRE_BiCGSTABGetNumIterations( solver, num_iterations ) );
+   return ( HYPRE_BiCGSTABGetNumIterations( solver, num_iterations ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -199,7 +206,7 @@ HYPRE_Int
 HYPRE_ParCSRBiCGSTABGetFinalRelativeResidualNorm( HYPRE_Solver  solver,
                                                   HYPRE_Real         *norm   )
 {
-   return( HYPRE_BiCGSTABGetFinalRelativeResidualNorm( solver, norm ) );
+   return ( HYPRE_BiCGSTABGetFinalRelativeResidualNorm( solver, norm ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -210,5 +217,5 @@ HYPRE_Int
 HYPRE_ParCSRBiCGSTABGetResidual( HYPRE_Solver  solver,
                                  HYPRE_ParVector *residual)
 {
-   return( HYPRE_BiCGSTABGetResidual( solver, (void *) residual ) );
+   return ( HYPRE_BiCGSTABGetResidual( solver, (void *) residual ) );
 }
diff --git a/external/hypre/src/parcsr_ls/HYPRE_parcsr_block.c b/external/hypre/src/parcsr_ls/HYPRE_parcsr_block.c
index e9c2e5e8..9dcd1125 100644
--- a/external/hypre/src/parcsr_ls/HYPRE_parcsr_block.c
+++ b/external/hypre/src/parcsr_ls/HYPRE_parcsr_block.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -29,7 +29,7 @@ HYPRE_Int HYPRE_BlockTridiagCreate(HYPRE_Solver *solver)
 
 HYPRE_Int HYPRE_BlockTridiagDestroy(HYPRE_Solver solver)
 {
-   return(hypre_BlockTridiagDestroy((void *) solver ));
+   return (hypre_BlockTridiagDestroy((void *) solver ));
 }
 
 /*--------------------------------------------------------------------------
@@ -37,10 +37,10 @@ HYPRE_Int HYPRE_BlockTridiagDestroy(HYPRE_Solver solver)
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int HYPRE_BlockTridiagSetup(HYPRE_Solver solver, HYPRE_ParCSRMatrix A,
-                            HYPRE_ParVector b, HYPRE_ParVector x)
+                                  HYPRE_ParVector b, HYPRE_ParVector x)
 {
-   return(hypre_BlockTridiagSetup((void *) solver, (hypre_ParCSRMatrix *) A,
-                              (hypre_ParVector *) b, (hypre_ParVector *) x));
+   return (hypre_BlockTridiagSetup((void *) solver, (hypre_ParCSRMatrix *) A,
+                                   (hypre_ParVector *) b, (hypre_ParVector *) x));
 }
 
 /*--------------------------------------------------------------------------
@@ -48,28 +48,28 @@ HYPRE_Int HYPRE_BlockTridiagSetup(HYPRE_Solver solver, HYPRE_ParCSRMatrix A,
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int HYPRE_BlockTridiagSolve(HYPRE_Solver solver, HYPRE_ParCSRMatrix A,
-                        HYPRE_ParVector b,   HYPRE_ParVector x)
+                                  HYPRE_ParVector b,   HYPRE_ParVector x)
 {
-   return(hypre_BlockTridiagSolve((void *) solver, (hypre_ParCSRMatrix *) A,
-                               (hypre_ParVector *) b, (hypre_ParVector *) x));
+   return (hypre_BlockTridiagSolve((void *) solver, (hypre_ParCSRMatrix *) A,
+                                   (hypre_ParVector *) b, (hypre_ParVector *) x));
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_BlockTridiagSetIndexSet
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int HYPRE_BlockTridiagSetIndexSet(HYPRE_Solver solver,HYPRE_Int n, HYPRE_Int *inds)
+HYPRE_Int HYPRE_BlockTridiagSetIndexSet(HYPRE_Solver solver, HYPRE_Int n, HYPRE_Int *inds)
 {
-   return(hypre_BlockTridiagSetIndexSet((void *) solver, n, inds));
+   return (hypre_BlockTridiagSetIndexSet((void *) solver, n, inds));
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_BlockTridiagSetAMGStrengthThreshold
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int HYPRE_BlockTridiagSetAMGStrengthThreshold(HYPRE_Solver solver,HYPRE_Real thresh)
+HYPRE_Int HYPRE_BlockTridiagSetAMGStrengthThreshold(HYPRE_Solver solver, HYPRE_Real thresh)
 {
-   return(hypre_BlockTridiagSetAMGStrengthThreshold((void *) solver, thresh));
+   return (hypre_BlockTridiagSetAMGStrengthThreshold((void *) solver, thresh));
 }
 
 /*--------------------------------------------------------------------------
@@ -78,7 +78,7 @@ HYPRE_Int HYPRE_BlockTridiagSetAMGStrengthThreshold(HYPRE_Solver solver,HYPRE_Re
 
 HYPRE_Int HYPRE_BlockTridiagSetAMGNumSweeps(HYPRE_Solver solver, HYPRE_Int num_sweeps)
 {
-   return(hypre_BlockTridiagSetAMGNumSweeps((void *) solver,num_sweeps));
+   return (hypre_BlockTridiagSetAMGNumSweeps((void *) solver, num_sweeps));
 }
 
 /*--------------------------------------------------------------------------
@@ -87,7 +87,7 @@ HYPRE_Int HYPRE_BlockTridiagSetAMGNumSweeps(HYPRE_Solver solver, HYPRE_Int num_s
 
 HYPRE_Int HYPRE_BlockTridiagSetAMGRelaxType(HYPRE_Solver solver, HYPRE_Int relax_type)
 {
-   return(hypre_BlockTridiagSetAMGRelaxType( (void *) solver, relax_type));
+   return (hypre_BlockTridiagSetAMGRelaxType( (void *) solver, relax_type));
 }
 
 /*--------------------------------------------------------------------------
@@ -96,6 +96,6 @@ HYPRE_Int HYPRE_BlockTridiagSetAMGRelaxType(HYPRE_Solver solver, HYPRE_Int relax
 
 HYPRE_Int HYPRE_BlockTridiagSetPrintLevel(HYPRE_Solver solver, HYPRE_Int print_level)
 {
-   return(hypre_BlockTridiagSetPrintLevel( (void *) solver, print_level));
+   return (hypre_BlockTridiagSetPrintLevel( (void *) solver, print_level));
 }
 
diff --git a/external/hypre/src/parcsr_ls/HYPRE_parcsr_cgnr.c b/external/hypre/src/parcsr_ls/HYPRE_parcsr_cgnr.c
index 48b095ba..ca98f699 100644
--- a/external/hypre/src/parcsr_ls/HYPRE_parcsr_cgnr.c
+++ b/external/hypre/src/parcsr_ls/HYPRE_parcsr_cgnr.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -14,6 +14,8 @@
 HYPRE_Int
 HYPRE_ParCSRCGNRCreate( MPI_Comm comm, HYPRE_Solver *solver )
 {
+   HYPRE_UNUSED_VAR(comm);
+
    hypre_CGNRFunctions * cgnr_functions;
 
    if (!solver)
@@ -25,15 +27,21 @@ HYPRE_ParCSRCGNRCreate( MPI_Comm comm, HYPRE_Solver *solver )
       hypre_CGNRFunctionsCreate(
          hypre_ParKrylovCommInfo,
          hypre_ParKrylovCreateVector,
-         hypre_ParKrylovDestroyVector, hypre_ParKrylovMatvecCreate,
-         hypre_ParKrylovMatvec, hypre_ParKrylovMatvecT,
+         hypre_ParKrylovDestroyVector,
+         hypre_ParKrylovMatvecCreate,
+         hypre_ParKrylovMatvec,
+         hypre_ParKrylovMatvecT,
          hypre_ParKrylovMatvecDestroy,
          hypre_ParKrylovInnerProd,
-         hypre_ParKrylovCopyVector, hypre_ParKrylovClearVector,
-         hypre_ParKrylovScaleVector, hypre_ParKrylovAxpy,
+         hypre_ParKrylovCopyVector,
+         hypre_ParKrylovClearVector,
+         hypre_ParKrylovScaleVector,
+         hypre_ParKrylovAxpy,
          hypre_ParKrylovIdentitySetup,
-         hypre_ParKrylovIdentity, hypre_ParKrylovIdentity );
+         hypre_ParKrylovIdentity,
+         hypre_ParKrylovIdentity );
    *solver = ( (HYPRE_Solver) hypre_CGNRCreate( cgnr_functions) );
+
    return hypre_error_flag;
 }
 
@@ -41,42 +49,42 @@ HYPRE_ParCSRCGNRCreate( MPI_Comm comm, HYPRE_Solver *solver )
  * HYPRE_ParCSRCGNRDestroy
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_ParCSRCGNRDestroy( HYPRE_Solver solver )
 {
-   return( hypre_CGNRDestroy( (void *) solver ) );
+   return ( hypre_CGNRDestroy( (void *) solver ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRCGNRSetup
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_ParCSRCGNRSetup( HYPRE_Solver solver,
                        HYPRE_ParCSRMatrix A,
                        HYPRE_ParVector b,
                        HYPRE_ParVector x      )
 {
-   return( HYPRE_CGNRSetup( solver,
-                            (HYPRE_Matrix) A,
-                            (HYPRE_Vector) b,
-                            (HYPRE_Vector) x ) );
+   return ( HYPRE_CGNRSetup( solver,
+                             (HYPRE_Matrix) A,
+                             (HYPRE_Vector) b,
+                             (HYPRE_Vector) x ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRCGNRSolve
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_ParCSRCGNRSolve( HYPRE_Solver solver,
                        HYPRE_ParCSRMatrix A,
                        HYPRE_ParVector b,
                        HYPRE_ParVector x      )
 {
-   return( HYPRE_CGNRSolve( solver,
-                            (HYPRE_Matrix) A,
-                            (HYPRE_Vector) b,
-                            (HYPRE_Vector) x ) );
+   return ( HYPRE_CGNRSolve( solver,
+                             (HYPRE_Matrix) A,
+                             (HYPRE_Vector) b,
+                             (HYPRE_Vector) x ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -87,7 +95,7 @@ HYPRE_Int
 HYPRE_ParCSRCGNRSetTol( HYPRE_Solver solver,
                         HYPRE_Real         tol    )
 {
-   return( HYPRE_CGNRSetTol( solver, tol ) );
+   return ( HYPRE_CGNRSetTol( solver, tol ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -98,7 +106,7 @@ HYPRE_Int
 HYPRE_ParCSRCGNRSetMinIter( HYPRE_Solver solver,
                             HYPRE_Int                min_iter )
 {
-   return( HYPRE_CGNRSetMinIter( solver, min_iter ) );
+   return ( HYPRE_CGNRSetMinIter( solver, min_iter ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -109,7 +117,7 @@ HYPRE_Int
 HYPRE_ParCSRCGNRSetMaxIter( HYPRE_Solver solver,
                             HYPRE_Int                max_iter )
 {
-   return( HYPRE_CGNRSetMaxIter( solver, max_iter ) );
+   return ( HYPRE_CGNRSetMaxIter( solver, max_iter ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -120,7 +128,7 @@ HYPRE_Int
 HYPRE_ParCSRCGNRSetStopCrit( HYPRE_Solver solver,
                              HYPRE_Int                stop_crit )
 {
-   return( HYPRE_CGNRSetStopCrit( solver, stop_crit ) );
+   return ( HYPRE_CGNRSetStopCrit( solver, stop_crit ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -134,11 +142,11 @@ HYPRE_ParCSRCGNRSetPrecond( HYPRE_Solver         solver,
                             HYPRE_PtrToParSolverFcn precond_setup,
                             HYPRE_Solver         precond_solver )
 {
-   return( HYPRE_CGNRSetPrecond( solver,
-                                 (HYPRE_PtrToSolverFcn) precond,
-                                 (HYPRE_PtrToSolverFcn) precondT,
-                                 (HYPRE_PtrToSolverFcn) precond_setup,
-                                 precond_solver ) );
+   return ( HYPRE_CGNRSetPrecond( solver,
+                                  (HYPRE_PtrToSolverFcn) precond,
+                                  (HYPRE_PtrToSolverFcn) precondT,
+                                  (HYPRE_PtrToSolverFcn) precond_setup,
+                                  precond_solver ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -149,7 +157,7 @@ HYPRE_Int
 HYPRE_ParCSRCGNRGetPrecond( HYPRE_Solver   solver,
                             HYPRE_Solver  *precond_data_ptr )
 {
-   return( HYPRE_CGNRGetPrecond( solver, precond_data_ptr ) );
+   return ( HYPRE_CGNRGetPrecond( solver, precond_data_ptr ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -160,7 +168,7 @@ HYPRE_Int
 HYPRE_ParCSRCGNRSetLogging( HYPRE_Solver solver,
                             HYPRE_Int logging)
 {
-   return( HYPRE_CGNRSetLogging( solver, logging ) );
+   return ( HYPRE_CGNRSetLogging( solver, logging ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -171,7 +179,7 @@ HYPRE_Int
 HYPRE_ParCSRCGNRGetNumIterations( HYPRE_Solver  solver,
                                   HYPRE_Int    *num_iterations )
 {
-   return( HYPRE_CGNRGetNumIterations( solver, num_iterations ) );
+   return ( HYPRE_CGNRGetNumIterations( solver, num_iterations ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -182,5 +190,5 @@ HYPRE_Int
 HYPRE_ParCSRCGNRGetFinalRelativeResidualNorm( HYPRE_Solver  solver,
                                               HYPRE_Real   *norm   )
 {
-   return( HYPRE_CGNRGetFinalRelativeResidualNorm( solver, norm ) );
+   return ( HYPRE_CGNRGetFinalRelativeResidualNorm( solver, norm ) );
 }
diff --git a/external/hypre/src/parcsr_ls/HYPRE_parcsr_cogmres.c b/external/hypre/src/parcsr_ls/HYPRE_parcsr_cogmres.c
index fbdc6b47..be386c09 100644
--- a/external/hypre/src/parcsr_ls/HYPRE_parcsr_cogmres.c
+++ b/external/hypre/src/parcsr_ls/HYPRE_parcsr_cogmres.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -14,6 +14,8 @@
 HYPRE_Int
 HYPRE_ParCSRCOGMRESCreate( MPI_Comm comm, HYPRE_Solver *solver )
 {
+   HYPRE_UNUSED_VAR(comm);
+
    hypre_COGMRESFunctions * cogmres_functions;
 
    if (!solver)
@@ -23,17 +25,26 @@ HYPRE_ParCSRCOGMRESCreate( MPI_Comm comm, HYPRE_Solver *solver )
    }
    cogmres_functions =
       hypre_COGMRESFunctionsCreate(
-         hypre_ParKrylovCAlloc, hypre_ParKrylovFree, hypre_ParKrylovCommInfo,
+         hypre_ParKrylovCAlloc,
+         hypre_ParKrylovFree,
+         hypre_ParKrylovCommInfo,
          hypre_ParKrylovCreateVector,
          hypre_ParKrylovCreateVectorArray,
-         hypre_ParKrylovDestroyVector, hypre_ParKrylovMatvecCreate,
-         hypre_ParKrylovMatvec, hypre_ParKrylovMatvecDestroy,
-         hypre_ParKrylovInnerProd, hypre_ParKrylovMassInnerProd, 
-         hypre_ParKrylovMassDotpTwo, hypre_ParKrylovCopyVector,
+         hypre_ParKrylovDestroyVector,
+         hypre_ParKrylovMatvecCreate,
+         hypre_ParKrylovMatvec,
+         hypre_ParKrylovMatvecDestroy,
+         hypre_ParKrylovInnerProd,
+         hypre_ParKrylovMassInnerProd,
+         hypre_ParKrylovMassDotpTwo,
+         hypre_ParKrylovCopyVector,
          //hypre_ParKrylovCopyVector,
          hypre_ParKrylovClearVector,
-         hypre_ParKrylovScaleVector, hypre_ParKrylovAxpy,hypre_ParKrylovMassAxpy,
-         hypre_ParKrylovIdentitySetup, hypre_ParKrylovIdentity );
+         hypre_ParKrylovScaleVector,
+         hypre_ParKrylovAxpy,
+         hypre_ParKrylovMassAxpy,
+         hypre_ParKrylovIdentitySetup,
+         hypre_ParKrylovIdentity );
    *solver = ( (HYPRE_Solver) hypre_COGMRESCreate( cogmres_functions ) );
 
    return hypre_error_flag;
@@ -43,42 +54,42 @@ HYPRE_ParCSRCOGMRESCreate( MPI_Comm comm, HYPRE_Solver *solver )
  * HYPRE_ParCSRCOGMRESDestroy
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_ParCSRCOGMRESDestroy( HYPRE_Solver solver )
 {
-   return( hypre_COGMRESDestroy( (void *) solver ) );
+   return ( hypre_COGMRESDestroy( (void *) solver ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRCOGMRESSetup
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_ParCSRCOGMRESSetup( HYPRE_Solver solver,
-                        HYPRE_ParCSRMatrix A,
-                        HYPRE_ParVector b,
-                        HYPRE_ParVector x      )
+                          HYPRE_ParCSRMatrix A,
+                          HYPRE_ParVector b,
+                          HYPRE_ParVector x      )
 {
-   return( HYPRE_COGMRESSetup( solver,
-                             (HYPRE_Matrix) A,
-                             (HYPRE_Vector) b,
-                             (HYPRE_Vector) x ) );
+   return ( HYPRE_COGMRESSetup( solver,
+                                (HYPRE_Matrix) A,
+                                (HYPRE_Vector) b,
+                                (HYPRE_Vector) x ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRCOGMRESSolve
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_ParCSRCOGMRESSolve( HYPRE_Solver solver,
-                        HYPRE_ParCSRMatrix A,
-                        HYPRE_ParVector b,
-                        HYPRE_ParVector x      )
+                          HYPRE_ParCSRMatrix A,
+                          HYPRE_ParVector b,
+                          HYPRE_ParVector x      )
 {
-   return( HYPRE_COGMRESSolve( solver,
-                             (HYPRE_Matrix) A,
-                             (HYPRE_Vector) b,
-                             (HYPRE_Vector) x ) );
+   return ( HYPRE_COGMRESSolve( solver,
+                                (HYPRE_Matrix) A,
+                                (HYPRE_Vector) b,
+                                (HYPRE_Vector) x ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -87,9 +98,9 @@ HYPRE_ParCSRCOGMRESSolve( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_ParCSRCOGMRESSetKDim( HYPRE_Solver solver,
-                          HYPRE_Int             k_dim    )
+                            HYPRE_Int             k_dim    )
 {
-   return( HYPRE_COGMRESSetKDim( solver, k_dim ) );
+   return ( HYPRE_COGMRESSetKDim( solver, k_dim ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -98,9 +109,9 @@ HYPRE_ParCSRCOGMRESSetKDim( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_ParCSRCOGMRESSetUnroll( HYPRE_Solver solver,
-                          HYPRE_Int             unroll    )
+                              HYPRE_Int             unroll    )
 {
-   return( HYPRE_COGMRESSetUnroll( solver, unroll ) );
+   return ( HYPRE_COGMRESSetUnroll( solver, unroll ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -109,9 +120,9 @@ HYPRE_ParCSRCOGMRESSetUnroll( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_ParCSRCOGMRESSetCGS( HYPRE_Solver solver,
-                          HYPRE_Int             cgs    )
+                           HYPRE_Int             cgs    )
 {
-   return( HYPRE_COGMRESSetCGS( solver, cgs ) );
+   return ( HYPRE_COGMRESSetCGS( solver, cgs ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -120,9 +131,9 @@ HYPRE_ParCSRCOGMRESSetCGS( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_ParCSRCOGMRESSetTol( HYPRE_Solver solver,
-                         HYPRE_Real         tol    )
+                           HYPRE_Real         tol    )
 {
-   return( HYPRE_COGMRESSetTol( solver, tol ) );
+   return ( HYPRE_COGMRESSetTol( solver, tol ) );
 }
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRCOGMRESSetAbsoluteTol
@@ -130,9 +141,9 @@ HYPRE_ParCSRCOGMRESSetTol( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_ParCSRCOGMRESSetAbsoluteTol( HYPRE_Solver solver,
-                                 HYPRE_Real         a_tol    )
+                                   HYPRE_Real         a_tol    )
 {
-   return( HYPRE_COGMRESSetAbsoluteTol( solver, a_tol ) );
+   return ( HYPRE_COGMRESSetAbsoluteTol( solver, a_tol ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -141,9 +152,9 @@ HYPRE_ParCSRCOGMRESSetAbsoluteTol( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_ParCSRCOGMRESSetMinIter( HYPRE_Solver solver,
-                             HYPRE_Int          min_iter )
+                               HYPRE_Int          min_iter )
 {
-   return( HYPRE_COGMRESSetMinIter( solver, min_iter ) );
+   return ( HYPRE_COGMRESSetMinIter( solver, min_iter ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -152,9 +163,9 @@ HYPRE_ParCSRCOGMRESSetMinIter( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_ParCSRCOGMRESSetMaxIter( HYPRE_Solver solver,
-                             HYPRE_Int          max_iter )
+                               HYPRE_Int          max_iter )
 {
-   return( HYPRE_COGMRESSetMaxIter( solver, max_iter ) );
+   return ( HYPRE_COGMRESSetMaxIter( solver, max_iter ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -163,14 +174,14 @@ HYPRE_ParCSRCOGMRESSetMaxIter( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_ParCSRCOGMRESSetPrecond( HYPRE_Solver          solver,
-                             HYPRE_PtrToParSolverFcn  precond,
-                             HYPRE_PtrToParSolverFcn  precond_setup,
-                             HYPRE_Solver          precond_solver )
+                               HYPRE_PtrToParSolverFcn  precond,
+                               HYPRE_PtrToParSolverFcn  precond_setup,
+                               HYPRE_Solver          precond_solver )
 {
-   return( HYPRE_COGMRESSetPrecond( solver,
-                                  (HYPRE_PtrToSolverFcn) precond,
-                                  (HYPRE_PtrToSolverFcn) precond_setup,
-                                  precond_solver ) );
+   return ( HYPRE_COGMRESSetPrecond( solver,
+                                     (HYPRE_PtrToSolverFcn) precond,
+                                     (HYPRE_PtrToSolverFcn) precond_setup,
+                                     precond_solver ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -179,9 +190,9 @@ HYPRE_ParCSRCOGMRESSetPrecond( HYPRE_Solver          solver,
 
 HYPRE_Int
 HYPRE_ParCSRCOGMRESGetPrecond( HYPRE_Solver  solver,
-                             HYPRE_Solver *precond_data_ptr )
+                               HYPRE_Solver *precond_data_ptr )
 {
-   return( HYPRE_COGMRESGetPrecond( solver, precond_data_ptr ) );
+   return ( HYPRE_COGMRESGetPrecond( solver, precond_data_ptr ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -190,9 +201,9 @@ HYPRE_ParCSRCOGMRESGetPrecond( HYPRE_Solver  solver,
 
 HYPRE_Int
 HYPRE_ParCSRCOGMRESSetLogging( HYPRE_Solver solver,
-                             HYPRE_Int logging)
+                               HYPRE_Int logging)
 {
-   return( HYPRE_COGMRESSetLogging( solver, logging ) );
+   return ( HYPRE_COGMRESSetLogging( solver, logging ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -201,9 +212,9 @@ HYPRE_ParCSRCOGMRESSetLogging( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_ParCSRCOGMRESSetPrintLevel( HYPRE_Solver solver,
-                                HYPRE_Int print_level)
+                                  HYPRE_Int print_level)
 {
-   return( HYPRE_COGMRESSetPrintLevel( solver, print_level ) );
+   return ( HYPRE_COGMRESSetPrintLevel( solver, print_level ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -212,9 +223,9 @@ HYPRE_ParCSRCOGMRESSetPrintLevel( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_ParCSRCOGMRESGetNumIterations( HYPRE_Solver  solver,
-                                   HYPRE_Int    *num_iterations )
+                                     HYPRE_Int    *num_iterations )
 {
-   return( HYPRE_COGMRESGetNumIterations( solver, num_iterations ) );
+   return ( HYPRE_COGMRESGetNumIterations( solver, num_iterations ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -223,9 +234,9 @@ HYPRE_ParCSRCOGMRESGetNumIterations( HYPRE_Solver  solver,
 
 HYPRE_Int
 HYPRE_ParCSRCOGMRESGetFinalRelativeResidualNorm( HYPRE_Solver  solver,
-                                               HYPRE_Real   *norm   )
+                                                 HYPRE_Real   *norm   )
 {
-   return( HYPRE_COGMRESGetFinalRelativeResidualNorm( solver, norm ) );
+   return ( HYPRE_COGMRESGetFinalRelativeResidualNorm( solver, norm ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -236,5 +247,5 @@ HYPRE_Int
 HYPRE_ParCSRCOGMRESGetResidual( HYPRE_Solver  solver,
                                 HYPRE_ParVector *residual)
 {
-   return( HYPRE_COGMRESGetResidual( solver, (void *) residual ) );
+   return ( HYPRE_COGMRESGetResidual( solver, (void *) residual ) );
 }
diff --git a/external/hypre/src/parcsr_ls/HYPRE_parcsr_flexgmres.c b/external/hypre/src/parcsr_ls/HYPRE_parcsr_flexgmres.c
index c5a0cf90..ac8c824f 100644
--- a/external/hypre/src/parcsr_ls/HYPRE_parcsr_flexgmres.c
+++ b/external/hypre/src/parcsr_ls/HYPRE_parcsr_flexgmres.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -14,6 +14,8 @@
 HYPRE_Int
 HYPRE_ParCSRFlexGMRESCreate( MPI_Comm comm, HYPRE_Solver *solver )
 {
+   HYPRE_UNUSED_VAR(comm);
+
    hypre_FlexGMRESFunctions * fgmres_functions;
 
    if (!solver)
@@ -23,15 +25,22 @@ HYPRE_ParCSRFlexGMRESCreate( MPI_Comm comm, HYPRE_Solver *solver )
    }
    fgmres_functions =
       hypre_FlexGMRESFunctionsCreate(
-         hypre_ParKrylovCAlloc, hypre_ParKrylovFree, hypre_ParKrylovCommInfo,
+         hypre_ParKrylovCAlloc,
+         hypre_ParKrylovFree,
+         hypre_ParKrylovCommInfo,
          hypre_ParKrylovCreateVector,
          hypre_ParKrylovCreateVectorArray,
-         hypre_ParKrylovDestroyVector, hypre_ParKrylovMatvecCreate,
-         hypre_ParKrylovMatvec, hypre_ParKrylovMatvecDestroy,
-         hypre_ParKrylovInnerProd, hypre_ParKrylovCopyVector,
+         hypre_ParKrylovDestroyVector,
+         hypre_ParKrylovMatvecCreate,
+         hypre_ParKrylovMatvec,
+         hypre_ParKrylovMatvecDestroy,
+         hypre_ParKrylovInnerProd,
+         hypre_ParKrylovCopyVector,
          hypre_ParKrylovClearVector,
-         hypre_ParKrylovScaleVector, hypre_ParKrylovAxpy,
-         hypre_ParKrylovIdentitySetup, hypre_ParKrylovIdentity );
+         hypre_ParKrylovScaleVector,
+         hypre_ParKrylovAxpy,
+         hypre_ParKrylovIdentitySetup,
+         hypre_ParKrylovIdentity );
    *solver = ( (HYPRE_Solver) hypre_FlexGMRESCreate( fgmres_functions ) );
 
    return hypre_error_flag;
@@ -41,42 +50,42 @@ HYPRE_ParCSRFlexGMRESCreate( MPI_Comm comm, HYPRE_Solver *solver )
  * HYPRE_ParCSRFlexGMRESDestroy
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_ParCSRFlexGMRESDestroy( HYPRE_Solver solver )
 {
-   return( hypre_FlexGMRESDestroy( (void *) solver ) );
+   return ( hypre_FlexGMRESDestroy( (void *) solver ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRFlexGMRESSetup
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_ParCSRFlexGMRESSetup( HYPRE_Solver solver,
                             HYPRE_ParCSRMatrix A,
                             HYPRE_ParVector b,
                             HYPRE_ParVector x      )
 {
-   return( HYPRE_FlexGMRESSetup( solver,
-                                 (HYPRE_Matrix) A,
-                                 (HYPRE_Vector) b,
-                                 (HYPRE_Vector) x ) );
+   return ( HYPRE_FlexGMRESSetup( solver,
+                                  (HYPRE_Matrix) A,
+                                  (HYPRE_Vector) b,
+                                  (HYPRE_Vector) x ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRFlexGMRESSolve
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_ParCSRFlexGMRESSolve( HYPRE_Solver solver,
                             HYPRE_ParCSRMatrix A,
                             HYPRE_ParVector b,
                             HYPRE_ParVector x      )
 {
-   return( HYPRE_FlexGMRESSolve( solver,
-                                 (HYPRE_Matrix) A,
-                                 (HYPRE_Vector) b,
-                                 (HYPRE_Vector) x ) );
+   return ( HYPRE_FlexGMRESSolve( solver,
+                                  (HYPRE_Matrix) A,
+                                  (HYPRE_Vector) b,
+                                  (HYPRE_Vector) x ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -87,7 +96,7 @@ HYPRE_Int
 HYPRE_ParCSRFlexGMRESSetKDim( HYPRE_Solver solver,
                               HYPRE_Int             k_dim    )
 {
-   return( HYPRE_FlexGMRESSetKDim( solver, k_dim ) );
+   return ( HYPRE_FlexGMRESSetKDim( solver, k_dim ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -98,7 +107,7 @@ HYPRE_Int
 HYPRE_ParCSRFlexGMRESSetTol( HYPRE_Solver solver,
                              HYPRE_Real         tol    )
 {
-   return( HYPRE_FlexGMRESSetTol( solver, tol ) );
+   return ( HYPRE_FlexGMRESSetTol( solver, tol ) );
 }
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRFlexGMRESSetAbsoluteTol
@@ -108,7 +117,7 @@ HYPRE_Int
 HYPRE_ParCSRFlexGMRESSetAbsoluteTol( HYPRE_Solver solver,
                                      HYPRE_Real         a_tol    )
 {
-   return( HYPRE_FlexGMRESSetAbsoluteTol( solver, a_tol ) );
+   return ( HYPRE_FlexGMRESSetAbsoluteTol( solver, a_tol ) );
 }
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRFlexGMRESSetMinIter
@@ -118,7 +127,7 @@ HYPRE_Int
 HYPRE_ParCSRFlexGMRESSetMinIter( HYPRE_Solver solver,
                                  HYPRE_Int          min_iter )
 {
-   return( HYPRE_FlexGMRESSetMinIter( solver, min_iter ) );
+   return ( HYPRE_FlexGMRESSetMinIter( solver, min_iter ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -129,7 +138,7 @@ HYPRE_Int
 HYPRE_ParCSRFlexGMRESSetMaxIter( HYPRE_Solver solver,
                                  HYPRE_Int          max_iter )
 {
-   return( HYPRE_FlexGMRESSetMaxIter( solver, max_iter ) );
+   return ( HYPRE_FlexGMRESSetMaxIter( solver, max_iter ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -142,10 +151,10 @@ HYPRE_ParCSRFlexGMRESSetPrecond( HYPRE_Solver          solver,
                                  HYPRE_PtrToParSolverFcn  precond_setup,
                                  HYPRE_Solver          precond_solver )
 {
-   return( HYPRE_FlexGMRESSetPrecond( solver,
-                                      (HYPRE_PtrToSolverFcn) precond,
-                                      (HYPRE_PtrToSolverFcn) precond_setup,
-                                      precond_solver ) );
+   return ( HYPRE_FlexGMRESSetPrecond( solver,
+                                       (HYPRE_PtrToSolverFcn) precond,
+                                       (HYPRE_PtrToSolverFcn) precond_setup,
+                                       precond_solver ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -156,7 +165,7 @@ HYPRE_Int
 HYPRE_ParCSRFlexGMRESGetPrecond( HYPRE_Solver  solver,
                                  HYPRE_Solver *precond_data_ptr )
 {
-   return( HYPRE_FlexGMRESGetPrecond( solver, precond_data_ptr ) );
+   return ( HYPRE_FlexGMRESGetPrecond( solver, precond_data_ptr ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -167,7 +176,7 @@ HYPRE_Int
 HYPRE_ParCSRFlexGMRESSetLogging( HYPRE_Solver solver,
                                  HYPRE_Int logging)
 {
-   return( HYPRE_FlexGMRESSetLogging( solver, logging ) );
+   return ( HYPRE_FlexGMRESSetLogging( solver, logging ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -178,7 +187,7 @@ HYPRE_Int
 HYPRE_ParCSRFlexGMRESSetPrintLevel( HYPRE_Solver solver,
                                     HYPRE_Int print_level)
 {
-   return( HYPRE_FlexGMRESSetPrintLevel( solver, print_level ) );
+   return ( HYPRE_FlexGMRESSetPrintLevel( solver, print_level ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -189,7 +198,7 @@ HYPRE_Int
 HYPRE_ParCSRFlexGMRESGetNumIterations( HYPRE_Solver  solver,
                                        HYPRE_Int                *num_iterations )
 {
-   return( HYPRE_FlexGMRESGetNumIterations( solver, num_iterations ) );
+   return ( HYPRE_FlexGMRESGetNumIterations( solver, num_iterations ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -200,7 +209,7 @@ HYPRE_Int
 HYPRE_ParCSRFlexGMRESGetFinalRelativeResidualNorm( HYPRE_Solver  solver,
                                                    HYPRE_Real         *norm   )
 {
-   return( HYPRE_FlexGMRESGetFinalRelativeResidualNorm( solver, norm ) );
+   return ( HYPRE_FlexGMRESGetFinalRelativeResidualNorm( solver, norm ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -211,13 +220,13 @@ HYPRE_Int
 HYPRE_ParCSRFlexGMRESGetResidual( HYPRE_Solver  solver,
                                   HYPRE_ParVector *residual)
 {
-   return( HYPRE_FlexGMRESGetResidual( solver, (void *) residual ) );
+   return ( HYPRE_FlexGMRESGetResidual( solver, (void *) residual ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRFlexGMRESSetModifyPC
  *--------------------------------------------------------------------------*/
- 
+
 HYPRE_Int HYPRE_ParCSRFlexGMRESSetModifyPC( HYPRE_Solver  solver,
                                             HYPRE_PtrToModifyPCFcn modify_pc)
 
@@ -225,6 +234,3 @@ HYPRE_Int HYPRE_ParCSRFlexGMRESSetModifyPC( HYPRE_Solver  solver,
    return ( HYPRE_FlexGMRESSetModifyPC( solver,
                                         (HYPRE_PtrToModifyPCFcn) modify_pc));
 }
-
-
-
diff --git a/external/hypre/src/parcsr_ls/HYPRE_parcsr_fsai.c b/external/hypre/src/parcsr_ls/HYPRE_parcsr_fsai.c
new file mode 100644
index 00000000..88e654a2
--- /dev/null
+++ b/external/hypre/src/parcsr_ls/HYPRE_parcsr_fsai.c
@@ -0,0 +1,375 @@
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+#include "_hypre_parcsr_ls.h"
+
+/*--------------------------------------------------------------------------
+ * HYPRE_FSAICreate
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_FSAICreate( HYPRE_Solver *solver)
+{
+   if (!solver)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+   *solver = (HYPRE_Solver) hypre_FSAICreate( ) ;
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_FSAIDestroy
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_FSAIDestroy( HYPRE_Solver solver )
+{
+   return ( hypre_FSAIDestroy( (void *) solver ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_FSAISetup
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_FSAISetup( HYPRE_Solver       solver,
+                 HYPRE_ParCSRMatrix A,
+                 HYPRE_ParVector    b,
+                 HYPRE_ParVector    x )
+{
+   return ( hypre_FSAISetup( (void *) solver,
+                             (hypre_ParCSRMatrix *) A,
+                             (hypre_ParVector *) b,
+                             (hypre_ParVector *) x ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_FSAISolve
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_FSAISolve( HYPRE_Solver       solver,
+                 HYPRE_ParCSRMatrix A,
+                 HYPRE_ParVector    b,
+                 HYPRE_ParVector    x )
+{
+   return ( hypre_FSAISolve( (void *) solver,
+                             (hypre_ParCSRMatrix *) A,
+                             (hypre_ParVector *) b,
+                             (hypre_ParVector *) x ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_FSAISetAlgoType
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_FSAISetAlgoType( HYPRE_Solver solver,
+                       HYPRE_Int    algo_type  )
+{
+   return ( hypre_FSAISetAlgoType( (void *) solver, algo_type ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_FSAIGetAlgoType
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_FSAIGetAlgoType( HYPRE_Solver  solver,
+                       HYPRE_Int    *algo_type  )
+{
+   return ( hypre_FSAIGetAlgoType( (void *) solver, algo_type ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_FSAISetLocalSolveType
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_FSAISetLocalSolveType( HYPRE_Solver solver,
+                             HYPRE_Int    local_solve_type  )
+{
+   return ( hypre_FSAISetLocalSolveType( (void *) solver, local_solve_type ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_FSAIGetLocalSolveType
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_FSAIGetLocalSolveType( HYPRE_Solver  solver,
+                             HYPRE_Int    *local_solve_type  )
+{
+   return ( hypre_FSAIGetLocalSolveType( (void *) solver, local_solve_type ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_FSAISetMaxSteps
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_FSAISetMaxSteps( HYPRE_Solver solver,
+                       HYPRE_Int    max_steps  )
+{
+   return ( hypre_FSAISetMaxSteps( (void *) solver, max_steps ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_FSAIGetMaxSteps
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_FSAIGetMaxSteps( HYPRE_Solver  solver,
+                       HYPRE_Int    *max_steps  )
+{
+   return ( hypre_FSAIGetMaxSteps( (void *) solver, max_steps ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_FSAISetMaxNnzRow
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_FSAISetMaxNnzRow( HYPRE_Solver solver,
+                        HYPRE_Int    max_nnz_row  )
+{
+   return ( hypre_FSAISetMaxNnzRow( (void *) solver, max_nnz_row ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_FSAIGetMaxNnzRow
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_FSAIGetMaxNnzRow( HYPRE_Solver  solver,
+                        HYPRE_Int    *max_nnz_row  )
+{
+   return ( hypre_FSAIGetMaxNnzRow( (void *) solver, max_nnz_row ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_FSAISetMaxStepSize
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_FSAISetMaxStepSize( HYPRE_Solver solver,
+                          HYPRE_Int    max_step_size )
+{
+   return ( hypre_FSAISetMaxStepSize( (void *) solver, max_step_size ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_FSAIGetMaxStepSize
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_FSAIGetMaxStepSize( HYPRE_Solver  solver,
+                          HYPRE_Int    *max_step_size )
+{
+   return ( hypre_FSAIGetMaxStepSize( (void *) solver, max_step_size ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_FSAISetNumLevels
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_FSAISetNumLevels( HYPRE_Solver solver,
+                        HYPRE_Int    num_levels )
+{
+   return ( hypre_FSAISetNumLevels( (void *) solver, num_levels ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_FSAIGetNumLevels
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_FSAIGetNumLevels( HYPRE_Solver  solver,
+                        HYPRE_Int    *num_levels )
+{
+   return ( hypre_FSAIGetNumLevels( (void *) solver, num_levels ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_FSAISetThreshold
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_FSAISetThreshold( HYPRE_Solver solver,
+                        HYPRE_Real   threshold )
+{
+   return ( hypre_FSAISetThreshold( (void *) solver, threshold ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_FSAIGetThreshold
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_FSAIGetThreshold( HYPRE_Solver  solver,
+                        HYPRE_Real   *threshold )
+{
+   return ( hypre_FSAIGetThreshold( (void *) solver, threshold ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_FSAISetZeroGuess
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_FSAISetZeroGuess( HYPRE_Solver solver,
+                        HYPRE_Int    zero_guess )
+{
+   return ( hypre_FSAISetZeroGuess( (void *) solver, zero_guess ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_FSAIGetZeroGuess
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_FSAIGetZeroGuess( HYPRE_Solver  solver,
+                        HYPRE_Int    *zero_guess )
+{
+   return ( hypre_FSAIGetZeroGuess( (void *) solver, zero_guess ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_FSAISetKapTolerance
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_FSAISetKapTolerance( HYPRE_Solver solver,
+                           HYPRE_Real   kap_tolerance )
+{
+   return ( hypre_FSAISetKapTolerance( (void *) solver, kap_tolerance ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_FSAIGetKapTolerance
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_FSAIGetKapTolerance( HYPRE_Solver  solver,
+                           HYPRE_Real   *kap_tolerance )
+{
+   return ( hypre_FSAIGetKapTolerance( (void *) solver, kap_tolerance ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_FSAISetTolerance
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_FSAISetTolerance( HYPRE_Solver solver,
+                        HYPRE_Real   tolerance )
+{
+   return ( hypre_FSAISetTolerance( (void *) solver, tolerance ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_FSAIGetTolerance
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_FSAIGetTolerance( HYPRE_Solver  solver,
+                        HYPRE_Real   *tolerance )
+{
+   return ( hypre_FSAIGetTolerance( (void *) solver, tolerance ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_FSAISetOmega
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_FSAISetOmega( HYPRE_Solver solver,
+                    HYPRE_Real   omega )
+{
+   return ( hypre_FSAISetOmega( (void *) solver, omega ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_FSAIGetOmega
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_FSAIGetOmega( HYPRE_Solver  solver,
+                    HYPRE_Real   *omega )
+{
+   return ( hypre_FSAIGetOmega( (void *) solver, omega ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_FSAISetMaxIterations
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_FSAISetMaxIterations( HYPRE_Solver solver,
+                            HYPRE_Int    max_iterations )
+{
+   return ( hypre_FSAISetMaxIterations( (void *) solver, max_iterations ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_FSAIGetMaxIterations
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_FSAIGetMaxIterations( HYPRE_Solver  solver,
+                            HYPRE_Int    *max_iterations )
+{
+   return ( hypre_FSAIGetMaxIterations( (void *) solver, max_iterations ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_FSAISetEigMaxIters
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_FSAISetEigMaxIters( HYPRE_Solver solver,
+                          HYPRE_Int    eig_max_iters )
+{
+   return ( hypre_FSAISetEigMaxIters( (void *) solver, eig_max_iters ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_FSAIGetEigMaxIters
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_FSAIGetEigMaxIters( HYPRE_Solver  solver,
+                          HYPRE_Int    *eig_max_iters )
+{
+   return ( hypre_FSAIGetEigMaxIters( (void *) solver, eig_max_iters ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_FSAISetPrintLevel
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_FSAISetPrintLevel( HYPRE_Solver solver,
+                         HYPRE_Int    print_level )
+{
+   return ( hypre_FSAISetPrintLevel( (void *) solver, print_level ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_FSAIGetPrintLevel
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_FSAIGetPrintLevel( HYPRE_Solver  solver,
+                         HYPRE_Int    *print_level )
+{
+   return ( hypre_FSAIGetPrintLevel( (void *) solver, print_level ) );
+}
diff --git a/external/hypre/src/parcsr_ls/HYPRE_parcsr_gmres.c b/external/hypre/src/parcsr_ls/HYPRE_parcsr_gmres.c
index 7d77bcfd..dd7215e6 100644
--- a/external/hypre/src/parcsr_ls/HYPRE_parcsr_gmres.c
+++ b/external/hypre/src/parcsr_ls/HYPRE_parcsr_gmres.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -14,6 +14,8 @@
 HYPRE_Int
 HYPRE_ParCSRGMRESCreate( MPI_Comm comm, HYPRE_Solver *solver )
 {
+   HYPRE_UNUSED_VAR(comm);
+
    hypre_GMRESFunctions * gmres_functions;
 
    if (!solver)
@@ -23,15 +25,22 @@ HYPRE_ParCSRGMRESCreate( MPI_Comm comm, HYPRE_Solver *solver )
    }
    gmres_functions =
       hypre_GMRESFunctionsCreate(
-         hypre_ParKrylovCAlloc, hypre_ParKrylovFree, hypre_ParKrylovCommInfo,
+         hypre_ParKrylovCAlloc,
+         hypre_ParKrylovFree,
+         hypre_ParKrylovCommInfo,
          hypre_ParKrylovCreateVector,
          hypre_ParKrylovCreateVectorArray,
-         hypre_ParKrylovDestroyVector, hypre_ParKrylovMatvecCreate,
-         hypre_ParKrylovMatvec, hypre_ParKrylovMatvecDestroy,
-         hypre_ParKrylovInnerProd, hypre_ParKrylovCopyVector,
+         hypre_ParKrylovDestroyVector,
+         hypre_ParKrylovMatvecCreate,
+         hypre_ParKrylovMatvec,
+         hypre_ParKrylovMatvecDestroy,
+         hypre_ParKrylovInnerProd,
+         hypre_ParKrylovCopyVector,
          hypre_ParKrylovClearVector,
-         hypre_ParKrylovScaleVector, hypre_ParKrylovAxpy,
-         hypre_ParKrylovIdentitySetup, hypre_ParKrylovIdentity );
+         hypre_ParKrylovScaleVector,
+         hypre_ParKrylovAxpy,
+         hypre_ParKrylovIdentitySetup,
+         hypre_ParKrylovIdentity );
    *solver = ( (HYPRE_Solver) hypre_GMRESCreate( gmres_functions ) );
 
    return hypre_error_flag;
@@ -44,7 +53,7 @@ HYPRE_ParCSRGMRESCreate( MPI_Comm comm, HYPRE_Solver *solver )
 HYPRE_Int
 HYPRE_ParCSRGMRESDestroy( HYPRE_Solver solver )
 {
-   return( hypre_GMRESDestroy( (void *) solver ) );
+   return ( hypre_GMRESDestroy( (void *) solver ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -57,10 +66,10 @@ HYPRE_ParCSRGMRESSetup( HYPRE_Solver solver,
                         HYPRE_ParVector b,
                         HYPRE_ParVector x      )
 {
-   return( HYPRE_GMRESSetup( solver,
-                             (HYPRE_Matrix) A,
-                             (HYPRE_Vector) b,
-                             (HYPRE_Vector) x ) );
+   return ( HYPRE_GMRESSetup( solver,
+                              (HYPRE_Matrix) A,
+                              (HYPRE_Vector) b,
+                              (HYPRE_Vector) x ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -73,10 +82,10 @@ HYPRE_ParCSRGMRESSolve( HYPRE_Solver solver,
                         HYPRE_ParVector b,
                         HYPRE_ParVector x      )
 {
-   return( HYPRE_GMRESSolve( solver,
-                             (HYPRE_Matrix) A,
-                             (HYPRE_Vector) b,
-                             (HYPRE_Vector) x ) );
+   return ( HYPRE_GMRESSolve( solver,
+                              (HYPRE_Matrix) A,
+                              (HYPRE_Vector) b,
+                              (HYPRE_Vector) x ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -87,7 +96,7 @@ HYPRE_Int
 HYPRE_ParCSRGMRESSetKDim( HYPRE_Solver solver,
                           HYPRE_Int             k_dim    )
 {
-   return( HYPRE_GMRESSetKDim( solver, k_dim ) );
+   return ( HYPRE_GMRESSetKDim( solver, k_dim ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -98,7 +107,7 @@ HYPRE_Int
 HYPRE_ParCSRGMRESSetTol( HYPRE_Solver solver,
                          HYPRE_Real         tol    )
 {
-   return( HYPRE_GMRESSetTol( solver, tol ) );
+   return ( HYPRE_GMRESSetTol( solver, tol ) );
 }
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRGMRESSetAbsoluteTol
@@ -108,7 +117,7 @@ HYPRE_Int
 HYPRE_ParCSRGMRESSetAbsoluteTol( HYPRE_Solver solver,
                                  HYPRE_Real         a_tol    )
 {
-   return( HYPRE_GMRESSetAbsoluteTol( solver, a_tol ) );
+   return ( HYPRE_GMRESSetAbsoluteTol( solver, a_tol ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -119,7 +128,7 @@ HYPRE_Int
 HYPRE_ParCSRGMRESSetMinIter( HYPRE_Solver solver,
                              HYPRE_Int          min_iter )
 {
-   return( HYPRE_GMRESSetMinIter( solver, min_iter ) );
+   return ( HYPRE_GMRESSetMinIter( solver, min_iter ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -130,7 +139,7 @@ HYPRE_Int
 HYPRE_ParCSRGMRESSetMaxIter( HYPRE_Solver solver,
                              HYPRE_Int          max_iter )
 {
-   return( HYPRE_GMRESSetMaxIter( solver, max_iter ) );
+   return ( HYPRE_GMRESSetMaxIter( solver, max_iter ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -141,7 +150,7 @@ HYPRE_Int
 HYPRE_ParCSRGMRESSetStopCrit( HYPRE_Solver solver,
                               HYPRE_Int          stop_crit )
 {
-   return( HYPRE_GMRESSetStopCrit( solver, stop_crit ) );
+   return ( HYPRE_GMRESSetStopCrit( solver, stop_crit ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -154,10 +163,10 @@ HYPRE_ParCSRGMRESSetPrecond( HYPRE_Solver          solver,
                              HYPRE_PtrToParSolverFcn  precond_setup,
                              HYPRE_Solver          precond_solver )
 {
-   return( HYPRE_GMRESSetPrecond( solver,
-                                  (HYPRE_PtrToSolverFcn) precond,
-                                  (HYPRE_PtrToSolverFcn) precond_setup,
-                                  precond_solver ) );
+   return ( HYPRE_GMRESSetPrecond( solver,
+                                   (HYPRE_PtrToSolverFcn) precond,
+                                   (HYPRE_PtrToSolverFcn) precond_setup,
+                                   precond_solver ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -168,7 +177,7 @@ HYPRE_Int
 HYPRE_ParCSRGMRESGetPrecond( HYPRE_Solver  solver,
                              HYPRE_Solver *precond_data_ptr )
 {
-   return( HYPRE_GMRESGetPrecond( solver, precond_data_ptr ) );
+   return ( HYPRE_GMRESGetPrecond( solver, precond_data_ptr ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -179,7 +188,7 @@ HYPRE_Int
 HYPRE_ParCSRGMRESSetLogging( HYPRE_Solver solver,
                              HYPRE_Int logging)
 {
-   return( HYPRE_GMRESSetLogging( solver, logging ) );
+   return ( HYPRE_GMRESSetLogging( solver, logging ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -190,7 +199,7 @@ HYPRE_Int
 HYPRE_ParCSRGMRESSetPrintLevel( HYPRE_Solver solver,
                                 HYPRE_Int print_level)
 {
-   return( HYPRE_GMRESSetPrintLevel( solver, print_level ) );
+   return ( HYPRE_GMRESSetPrintLevel( solver, print_level ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -201,7 +210,7 @@ HYPRE_Int
 HYPRE_ParCSRGMRESGetNumIterations( HYPRE_Solver  solver,
                                    HYPRE_Int    *num_iterations )
 {
-   return( HYPRE_GMRESGetNumIterations( solver, num_iterations ) );
+   return ( HYPRE_GMRESGetNumIterations( solver, num_iterations ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -212,7 +221,7 @@ HYPRE_Int
 HYPRE_ParCSRGMRESGetFinalRelativeResidualNorm( HYPRE_Solver  solver,
                                                HYPRE_Real   *norm   )
 {
-   return( HYPRE_GMRESGetFinalRelativeResidualNorm( solver, norm ) );
+   return ( HYPRE_GMRESGetFinalRelativeResidualNorm( solver, norm ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -223,28 +232,35 @@ HYPRE_Int
 HYPRE_ParCSRGMRESGetResidual( HYPRE_Solver solver,
                               HYPRE_ParVector *residual   )
 {
-   return( HYPRE_GMRESGetResidual( solver, (void *) residual ) );
+   return ( HYPRE_GMRESGetResidual( solver, (void *) residual ) );
 }
 
 /*--------------------------------------------------------------------------
  * Setup routine for on-processor triangular solve as preconditioning.
  *--------------------------------------------------------------------------*/
-HYPRE_Int HYPRE_ParCSROnProcTriSetup(HYPRE_Solver       solver,
-                                     HYPRE_ParCSRMatrix HA,
-                                     HYPRE_ParVector    Hy,
-                                     HYPRE_ParVector    Hx)
+
+HYPRE_Int
+HYPRE_ParCSROnProcTriSetup(HYPRE_Solver       solver,
+                           HYPRE_ParCSRMatrix HA,
+                           HYPRE_ParVector    Hy,
+                           HYPRE_ParVector    Hx)
 {
+   HYPRE_UNUSED_VAR(solver);
+   HYPRE_UNUSED_VAR(Hy);
+   HYPRE_UNUSED_VAR(Hx);
+
    hypre_ParCSRMatrix *A = (hypre_ParCSRMatrix *) HA;
 
-   // Check for and get topological ordering of matrix
+   /* Check for and get topological ordering of matrix */
    if (!hypre_ParCSRMatrixProcOrdering(A))
    {
-      hypre_CSRMatrix *A_diag  = hypre_ParCSRMatrixDiag(A);
-      HYPRE_Real *A_diag_data  = hypre_CSRMatrixData(A_diag);
-      HYPRE_Int *A_diag_i      = hypre_CSRMatrixI(A_diag);
-      HYPRE_Int *A_diag_j      = hypre_CSRMatrixJ(A_diag);
-      HYPRE_Int n              = hypre_CSRMatrixNumRows(A_diag);
-      HYPRE_Int *proc_ordering = hypre_TAlloc(HYPRE_Int, n, HYPRE_MEMORY_HOST);
+      hypre_CSRMatrix *A_diag        = hypre_ParCSRMatrixDiag(A);
+      HYPRE_Real      *A_diag_data   = hypre_CSRMatrixData(A_diag);
+      HYPRE_Int       *A_diag_i      = hypre_CSRMatrixI(A_diag);
+      HYPRE_Int       *A_diag_j      = hypre_CSRMatrixJ(A_diag);
+      HYPRE_Int        n             = hypre_CSRMatrixNumRows(A_diag);
+      HYPRE_Int       *proc_ordering = hypre_TAlloc(HYPRE_Int, n, HYPRE_MEMORY_HOST);
+
       hypre_topo_sort(A_diag_i, A_diag_j, A_diag_data, proc_ordering, n);
       hypre_ParCSRMatrixProcOrdering(A) = proc_ordering;
    }
@@ -252,20 +268,24 @@ HYPRE_Int HYPRE_ParCSROnProcTriSetup(HYPRE_Solver       solver,
    return 0;
 }
 
-
 /*--------------------------------------------------------------------------
  * Solve routine for on-processor triangular solve as preconditioning.
  *--------------------------------------------------------------------------*/
-HYPRE_Int HYPRE_ParCSROnProcTriSolve(HYPRE_Solver       solver,
-                                     HYPRE_ParCSRMatrix HA,
-                                     HYPRE_ParVector    Hy,
-                                     HYPRE_ParVector    Hx)
+
+HYPRE_Int
+HYPRE_ParCSROnProcTriSolve(HYPRE_Solver       solver,
+                           HYPRE_ParCSRMatrix HA,
+                           HYPRE_ParVector    Hy,
+                           HYPRE_ParVector    Hx)
 {
+   HYPRE_UNUSED_VAR(solver);
+
    hypre_ParCSRMatrix *A = (hypre_ParCSRMatrix *) HA;
    hypre_ParVector    *y = (hypre_ParVector *) Hy;
    hypre_ParVector    *x = (hypre_ParVector *) Hx;
-   HYPRE_Int ierr = 0;
-   ierr = hypre_BoomerAMGRelax(A,y,NULL,10,0,1,1,NULL,x,NULL,NULL);
+   HYPRE_Int           ierr = 0;
+
+   ierr = hypre_BoomerAMGRelax(A, y, NULL, 10, 0, 1, 1, NULL, x, NULL, NULL);
+
    return ierr;
 }
-
diff --git a/external/hypre/src/parcsr_ls/HYPRE_parcsr_hybrid.c b/external/hypre/src/parcsr_ls/HYPRE_parcsr_hybrid.c
index a8ec2753..7c1e1c62 100644
--- a/external/hypre/src/parcsr_ls/HYPRE_parcsr_hybrid.c
+++ b/external/hypre/src/parcsr_ls/HYPRE_parcsr_hybrid.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -27,42 +27,42 @@ HYPRE_ParCSRHybridCreate( HYPRE_Solver *solver )
  * HYPRE_ParCSRHybridDestroy
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_ParCSRHybridDestroy( HYPRE_Solver solver )
 {
-   return( hypre_AMGHybridDestroy( (void *) solver ) );
+   return ( hypre_AMGHybridDestroy( (void *) solver ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRHybridSetup
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_ParCSRHybridSetup( HYPRE_Solver solver,
                          HYPRE_ParCSRMatrix A,
                          HYPRE_ParVector b,
                          HYPRE_ParVector x      )
 {
-   return( hypre_AMGHybridSetup( (void *) solver,
-                                 (hypre_ParCSRMatrix *) A,
-                                 (hypre_ParVector *) b,
-                                 (hypre_ParVector *) x ) );
+   return ( hypre_AMGHybridSetup( (void *) solver,
+                                  (hypre_ParCSRMatrix *) A,
+                                  (hypre_ParVector *) b,
+                                  (hypre_ParVector *) x ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRHybridSolve
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_ParCSRHybridSolve( HYPRE_Solver solver,
                          HYPRE_ParCSRMatrix A,
                          HYPRE_ParVector b,
                          HYPRE_ParVector x      )
 {
-   return( hypre_AMGHybridSolve( (void *) solver,
-                                 (hypre_ParCSRMatrix *) A,
-                                 (hypre_ParVector *) b,
-                                 (hypre_ParVector *) x ) );
+   return ( hypre_AMGHybridSolve( (void *) solver,
+                                  (hypre_ParCSRMatrix *) A,
+                                  (hypre_ParVector *) b,
+                                  (hypre_ParVector *) x ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -73,7 +73,7 @@ HYPRE_Int
 HYPRE_ParCSRHybridSetTol( HYPRE_Solver solver,
                           HYPRE_Real   tol    )
 {
-   return( hypre_AMGHybridSetTol( (void *) solver, tol ) );
+   return ( hypre_AMGHybridSetTol( (void *) solver, tol ) );
 }
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRHybridSetAbsoluteTol
@@ -83,7 +83,7 @@ HYPRE_Int
 HYPRE_ParCSRHybridSetAbsoluteTol( HYPRE_Solver solver,
                                   HYPRE_Real   tol    )
 {
-   return( hypre_AMGHybridSetAbsoluteTol( (void *) solver, tol ) );
+   return ( hypre_AMGHybridSetAbsoluteTol( (void *) solver, tol ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -94,7 +94,7 @@ HYPRE_Int
 HYPRE_ParCSRHybridSetConvergenceTol( HYPRE_Solver solver,
                                      HYPRE_Real   cf_tol    )
 {
-   return( hypre_AMGHybridSetConvergenceTol( (void *) solver, cf_tol ) );
+   return ( hypre_AMGHybridSetConvergenceTol( (void *) solver, cf_tol ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -105,7 +105,7 @@ HYPRE_Int
 HYPRE_ParCSRHybridSetDSCGMaxIter( HYPRE_Solver solver,
                                   HYPRE_Int    dscg_max_its )
 {
-   return( hypre_AMGHybridSetDSCGMaxIter( (void *) solver, dscg_max_its ) );
+   return ( hypre_AMGHybridSetDSCGMaxIter( (void *) solver, dscg_max_its ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -116,7 +116,7 @@ HYPRE_Int
 HYPRE_ParCSRHybridSetPCGMaxIter( HYPRE_Solver solver,
                                  HYPRE_Int    pcg_max_its )
 {
-   return( hypre_AMGHybridSetPCGMaxIter( (void *) solver, pcg_max_its ) );
+   return ( hypre_AMGHybridSetPCGMaxIter( (void *) solver, pcg_max_its ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -127,7 +127,7 @@ HYPRE_Int
 HYPRE_ParCSRHybridSetSetupType( HYPRE_Solver solver,
                                 HYPRE_Int    setup_type )
 {
-   return( hypre_AMGHybridSetSetupType( (void *) solver, setup_type ) );
+   return ( hypre_AMGHybridSetSetupType( (void *) solver, setup_type ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -138,7 +138,7 @@ HYPRE_Int
 HYPRE_ParCSRHybridSetSolverType( HYPRE_Solver solver,
                                  HYPRE_Int    solver_type )
 {
-   return( hypre_AMGHybridSetSolverType( (void *) solver, solver_type ) );
+   return ( hypre_AMGHybridSetSolverType( (void *) solver, solver_type ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -148,14 +148,14 @@ HYPRE_Int
 HYPRE_ParCSRHybridSetRecomputeResidual( HYPRE_Solver  solver,
                                         HYPRE_Int     recompute_residual )
 {
-   return( hypre_AMGHybridSetRecomputeResidual( (void *) solver, recompute_residual ) );
+   return ( hypre_AMGHybridSetRecomputeResidual( (void *) solver, recompute_residual ) );
 }
 
 HYPRE_Int
 HYPRE_ParCSRHybridGetRecomputeResidual( HYPRE_Solver  solver,
                                         HYPRE_Int    *recompute_residual )
 {
-   return( hypre_AMGHybridGetRecomputeResidual( (void *) solver, recompute_residual ) );
+   return ( hypre_AMGHybridGetRecomputeResidual( (void *) solver, recompute_residual ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -165,14 +165,14 @@ HYPRE_Int
 HYPRE_ParCSRHybridSetRecomputeResidualP( HYPRE_Solver  solver,
                                          HYPRE_Int     recompute_residual_p )
 {
-   return( hypre_AMGHybridSetRecomputeResidualP( (void *) solver, recompute_residual_p ) );
+   return ( hypre_AMGHybridSetRecomputeResidualP( (void *) solver, recompute_residual_p ) );
 }
 
 HYPRE_Int
 HYPRE_ParCSRHybridGetRecomputeResidualP( HYPRE_Solver  solver,
                                          HYPRE_Int    *recompute_residual_p )
 {
-   return( hypre_AMGHybridGetRecomputeResidualP( (void *) solver, recompute_residual_p ) );
+   return ( hypre_AMGHybridGetRecomputeResidualP( (void *) solver, recompute_residual_p ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -183,7 +183,7 @@ HYPRE_Int
 HYPRE_ParCSRHybridSetKDim( HYPRE_Solver solver,
                            HYPRE_Int    k_dim    )
 {
-   return( hypre_AMGHybridSetKDim( (void *) solver, k_dim ) );
+   return ( hypre_AMGHybridSetKDim( (void *) solver, k_dim ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -194,7 +194,7 @@ HYPRE_Int
 HYPRE_ParCSRHybridSetTwoNorm( HYPRE_Solver solver,
                               HYPRE_Int    two_norm    )
 {
-   return( hypre_AMGHybridSetTwoNorm( (void *) solver, two_norm ) );
+   return ( hypre_AMGHybridSetTwoNorm( (void *) solver, two_norm ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -205,7 +205,7 @@ HYPRE_Int
 HYPRE_ParCSRHybridSetStopCrit( HYPRE_Solver solver,
                                HYPRE_Int    stop_crit    )
 {
-   return( hypre_AMGHybridSetStopCrit( (void *) solver, stop_crit ) );
+   return ( hypre_AMGHybridSetStopCrit( (void *) solver, stop_crit ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -216,7 +216,7 @@ HYPRE_Int
 HYPRE_ParCSRHybridSetRelChange( HYPRE_Solver solver,
                                 HYPRE_Int    rel_change    )
 {
-   return( hypre_AMGHybridSetRelChange( (void *) solver, rel_change ) );
+   return ( hypre_AMGHybridSetRelChange( (void *) solver, rel_change ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -229,10 +229,10 @@ HYPRE_ParCSRHybridSetPrecond( HYPRE_Solver         solver,
                               HYPRE_PtrToParSolverFcn precond_setup,
                               HYPRE_Solver         precond_solver )
 {
-   return( hypre_AMGHybridSetPrecond( (void *) solver,
-                                      (HYPRE_Int (*)(void*, void*, void*, void*) ) precond,
-									  (HYPRE_Int (*)(void*, void*, void*, void*) ) precond_setup,
-                                      (void *) precond_solver ) );
+   return ( hypre_AMGHybridSetPrecond( (void *) solver,
+                                       (HYPRE_Int (*)(void*, void*, void*, void*) ) precond,
+                                       (HYPRE_Int (*)(void*, void*, void*, void*) ) precond_setup,
+                                       (void *) precond_solver ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -243,7 +243,7 @@ HYPRE_Int
 HYPRE_ParCSRHybridSetLogging( HYPRE_Solver solver,
                               HYPRE_Int    logging    )
 {
-   return( hypre_AMGHybridSetLogging( (void *) solver, logging ) );
+   return ( hypre_AMGHybridSetLogging( (void *) solver, logging ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -254,7 +254,7 @@ HYPRE_Int
 HYPRE_ParCSRHybridSetPrintLevel( HYPRE_Solver solver,
                                  HYPRE_Int    print_level    )
 {
-   return( hypre_AMGHybridSetPrintLevel( (void *) solver, print_level ) );
+   return ( hypre_AMGHybridSetPrintLevel( (void *) solver, print_level ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -265,8 +265,8 @@ HYPRE_Int
 HYPRE_ParCSRHybridSetStrongThreshold( HYPRE_Solver solver,
                                       HYPRE_Real   strong_threshold    )
 {
-   return( hypre_AMGHybridSetStrongThreshold( (void *) solver, 
-                                              strong_threshold ) );
+   return ( hypre_AMGHybridSetStrongThreshold( (void *) solver,
+                                               strong_threshold ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -277,7 +277,7 @@ HYPRE_Int
 HYPRE_ParCSRHybridSetMaxRowSum( HYPRE_Solver solver,
                                 HYPRE_Real   max_row_sum    )
 {
-   return( hypre_AMGHybridSetMaxRowSum( (void *) solver, max_row_sum ) );
+   return ( hypre_AMGHybridSetMaxRowSum( (void *) solver, max_row_sum ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -288,7 +288,7 @@ HYPRE_Int
 HYPRE_ParCSRHybridSetTruncFactor( HYPRE_Solver solver,
                                   HYPRE_Real   trunc_factor    )
 {
-   return( hypre_AMGHybridSetTruncFactor( (void *) solver, trunc_factor ) );
+   return ( hypre_AMGHybridSetTruncFactor( (void *) solver, trunc_factor ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -299,7 +299,7 @@ HYPRE_Int
 HYPRE_ParCSRHybridSetPMaxElmts( HYPRE_Solver solver,
                                 HYPRE_Int    p_max    )
 {
-   return( hypre_AMGHybridSetPMaxElmts( (void *) solver, p_max ) );
+   return ( hypre_AMGHybridSetPMaxElmts( (void *) solver, p_max ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -310,7 +310,7 @@ HYPRE_Int
 HYPRE_ParCSRHybridSetMaxLevels( HYPRE_Solver solver,
                                 HYPRE_Int    max_levels    )
 {
-   return( hypre_AMGHybridSetMaxLevels( (void *) solver, max_levels ) );
+   return ( hypre_AMGHybridSetMaxLevels( (void *) solver, max_levels ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -321,7 +321,7 @@ HYPRE_Int
 HYPRE_ParCSRHybridSetMeasureType( HYPRE_Solver solver,
                                   HYPRE_Int    measure_type    )
 {
-   return( hypre_AMGHybridSetMeasureType( (void *) solver, measure_type ) );
+   return ( hypre_AMGHybridSetMeasureType( (void *) solver, measure_type ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -332,7 +332,7 @@ HYPRE_Int
 HYPRE_ParCSRHybridSetCoarsenType( HYPRE_Solver solver,
                                   HYPRE_Int    coarsen_type    )
 {
-   return( hypre_AMGHybridSetCoarsenType( (void *) solver, coarsen_type ) );
+   return ( hypre_AMGHybridSetCoarsenType( (void *) solver, coarsen_type ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -343,7 +343,7 @@ HYPRE_Int
 HYPRE_ParCSRHybridSetInterpType( HYPRE_Solver solver,
                                  HYPRE_Int    interp_type    )
 {
-   return( hypre_AMGHybridSetInterpType( (void *) solver, interp_type ) );
+   return ( hypre_AMGHybridSetInterpType( (void *) solver, interp_type ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -354,7 +354,7 @@ HYPRE_Int
 HYPRE_ParCSRHybridSetCycleType( HYPRE_Solver solver,
                                 HYPRE_Int    cycle_type    )
 {
-   return( hypre_AMGHybridSetCycleType( (void *) solver, cycle_type ) );
+   return ( hypre_AMGHybridSetCycleType( (void *) solver, cycle_type ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -365,7 +365,7 @@ HYPRE_Int
 HYPRE_ParCSRHybridSetNumGridSweeps( HYPRE_Solver solver,
                                     HYPRE_Int   *num_grid_sweeps    )
 {
-   return( hypre_AMGHybridSetNumGridSweeps( (void *) solver, num_grid_sweeps ) );
+   return ( hypre_AMGHybridSetNumGridSweeps( (void *) solver, num_grid_sweeps ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -376,7 +376,7 @@ HYPRE_Int
 HYPRE_ParCSRHybridSetGridRelaxType( HYPRE_Solver solver,
                                     HYPRE_Int   *grid_relax_type    )
 {
-   return( hypre_AMGHybridSetGridRelaxType( (void *) solver, grid_relax_type ) );
+   return ( hypre_AMGHybridSetGridRelaxType( (void *) solver, grid_relax_type ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -387,7 +387,7 @@ HYPRE_Int
 HYPRE_ParCSRHybridSetGridRelaxPoints( HYPRE_Solver solver,
                                       HYPRE_Int  **grid_relax_points    )
 {
-   return( hypre_AMGHybridSetGridRelaxPoints( (void *) solver, grid_relax_points ) );
+   return ( hypre_AMGHybridSetGridRelaxPoints( (void *) solver, grid_relax_points ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -398,7 +398,7 @@ HYPRE_Int
 HYPRE_ParCSRHybridSetNumSweeps( HYPRE_Solver solver,
                                 HYPRE_Int    num_sweeps    )
 {
-   return( hypre_AMGHybridSetNumSweeps( (void *) solver, num_sweeps ) );
+   return ( hypre_AMGHybridSetNumSweeps( (void *) solver, num_sweeps ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -407,10 +407,10 @@ HYPRE_ParCSRHybridSetNumSweeps( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_ParCSRHybridSetCycleNumSweeps( HYPRE_Solver solver,
-                                     HYPRE_Int    num_sweeps ,
+                                     HYPRE_Int    num_sweeps,
                                      HYPRE_Int    k )
 {
-   return( hypre_AMGHybridSetCycleNumSweeps( (void *) solver, num_sweeps, k ) );
+   return ( hypre_AMGHybridSetCycleNumSweeps( (void *) solver, num_sweeps, k ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -421,7 +421,7 @@ HYPRE_Int
 HYPRE_ParCSRHybridSetRelaxType( HYPRE_Solver solver,
                                 HYPRE_Int    relax_type    )
 {
-   return( hypre_AMGHybridSetRelaxType( (void *) solver, relax_type ) );
+   return ( hypre_AMGHybridSetRelaxType( (void *) solver, relax_type ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -430,10 +430,10 @@ HYPRE_ParCSRHybridSetRelaxType( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_ParCSRHybridSetCycleRelaxType( HYPRE_Solver solver,
-                                     HYPRE_Int    relax_type ,
+                                     HYPRE_Int    relax_type,
                                      HYPRE_Int    k )
 {
-   return( hypre_AMGHybridSetCycleRelaxType( (void *) solver, relax_type, k ) );
+   return ( hypre_AMGHybridSetCycleRelaxType( (void *) solver, relax_type, k ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -444,7 +444,7 @@ HYPRE_Int
 HYPRE_ParCSRHybridSetRelaxOrder( HYPRE_Solver solver,
                                  HYPRE_Int    relax_order    )
 {
-   return( hypre_AMGHybridSetRelaxOrder( (void *) solver, relax_order ) );
+   return ( hypre_AMGHybridSetRelaxOrder( (void *) solver, relax_order ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -453,9 +453,9 @@ HYPRE_ParCSRHybridSetRelaxOrder( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_ParCSRHybridSetKeepTranspose( HYPRE_Solver solver,
-                            HYPRE_Int    keepT    )
+                                    HYPRE_Int    keepT    )
 {
-   return( hypre_AMGHybridSetKeepTranspose( (void *) solver, keepT ) );
+   return ( hypre_AMGHybridSetKeepTranspose( (void *) solver, keepT ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -466,7 +466,7 @@ HYPRE_Int
 HYPRE_ParCSRHybridSetMaxCoarseSize( HYPRE_Solver solver,
                                     HYPRE_Int    max_coarse_size    )
 {
-   return( hypre_AMGHybridSetMaxCoarseSize( (void *) solver, max_coarse_size ) );
+   return ( hypre_AMGHybridSetMaxCoarseSize( (void *) solver, max_coarse_size ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -477,7 +477,7 @@ HYPRE_Int
 HYPRE_ParCSRHybridSetMinCoarseSize( HYPRE_Solver solver,
                                     HYPRE_Int    min_coarse_size    )
 {
-   return( hypre_AMGHybridSetMinCoarseSize( (void *) solver, min_coarse_size ) );
+   return ( hypre_AMGHybridSetMinCoarseSize( (void *) solver, min_coarse_size ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -488,7 +488,7 @@ HYPRE_Int
 HYPRE_ParCSRHybridSetSeqThreshold( HYPRE_Solver solver,
                                    HYPRE_Int    seq_threshold    )
 {
-   return( hypre_AMGHybridSetSeqThreshold( (void *) solver, seq_threshold ) );
+   return ( hypre_AMGHybridSetSeqThreshold( (void *) solver, seq_threshold ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -499,7 +499,7 @@ HYPRE_Int
 HYPRE_ParCSRHybridSetRelaxWt( HYPRE_Solver solver,
                               HYPRE_Real   relax_wt    )
 {
-   return( hypre_AMGHybridSetRelaxWt( (void *) solver, relax_wt ) );
+   return ( hypre_AMGHybridSetRelaxWt( (void *) solver, relax_wt ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -511,7 +511,7 @@ HYPRE_ParCSRHybridSetLevelRelaxWt( HYPRE_Solver solver,
                                    HYPRE_Real   relax_wt,
                                    HYPRE_Int    level )
 {
-   return( hypre_AMGHybridSetLevelRelaxWt( (void *) solver, relax_wt, level ) );
+   return ( hypre_AMGHybridSetLevelRelaxWt( (void *) solver, relax_wt, level ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -522,7 +522,7 @@ HYPRE_Int
 HYPRE_ParCSRHybridSetOuterWt( HYPRE_Solver solver,
                               HYPRE_Real   outer_wt    )
 {
-   return( hypre_AMGHybridSetOuterWt( (void *) solver, outer_wt ) );
+   return ( hypre_AMGHybridSetOuterWt( (void *) solver, outer_wt ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -534,7 +534,7 @@ HYPRE_ParCSRHybridSetLevelOuterWt( HYPRE_Solver solver,
                                    HYPRE_Real   outer_wt,
                                    HYPRE_Int    level )
 {
-   return( hypre_AMGHybridSetLevelOuterWt( (void *) solver, outer_wt, level ) );
+   return ( hypre_AMGHybridSetLevelOuterWt( (void *) solver, outer_wt, level ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -545,7 +545,7 @@ HYPRE_Int
 HYPRE_ParCSRHybridSetRelaxWeight( HYPRE_Solver solver,
                                   HYPRE_Real  *relax_weight    )
 {
-   return( hypre_AMGHybridSetRelaxWeight( (void *) solver, relax_weight ) );
+   return ( hypre_AMGHybridSetRelaxWeight( (void *) solver, relax_weight ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -556,7 +556,7 @@ HYPRE_Int
 HYPRE_ParCSRHybridSetOmega( HYPRE_Solver solver,
                             HYPRE_Real  *omega    )
 {
-   return( hypre_AMGHybridSetOmega( (void *) solver, omega ) );
+   return ( hypre_AMGHybridSetOmega( (void *) solver, omega ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -567,7 +567,7 @@ HYPRE_Int
 HYPRE_ParCSRHybridSetAggNumLevels( HYPRE_Solver solver,
                                    HYPRE_Int    agg_num_levels    )
 {
-   return( hypre_AMGHybridSetAggNumLevels( (void *) solver, agg_num_levels ) );
+   return ( hypre_AMGHybridSetAggNumLevels( (void *) solver, agg_num_levels ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -578,7 +578,7 @@ HYPRE_Int
 HYPRE_ParCSRHybridSetAggInterpType( HYPRE_Solver solver,
                                     HYPRE_Int    agg_interp_type    )
 {
-   return( hypre_AMGHybridSetAggInterpType( (void *) solver, agg_interp_type ) );
+   return ( hypre_AMGHybridSetAggInterpType( (void *) solver, agg_interp_type ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -589,7 +589,7 @@ HYPRE_Int
 HYPRE_ParCSRHybridSetNumPaths( HYPRE_Solver solver,
                                HYPRE_Int    num_paths    )
 {
-   return( hypre_AMGHybridSetNumPaths( (void *) solver, num_paths ) );
+   return ( hypre_AMGHybridSetNumPaths( (void *) solver, num_paths ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -600,7 +600,7 @@ HYPRE_Int
 HYPRE_ParCSRHybridSetNumFunctions( HYPRE_Solver solver,
                                    HYPRE_Int    num_functions    )
 {
-   return( hypre_AMGHybridSetNumFunctions( (void *) solver, num_functions ) );
+   return ( hypre_AMGHybridSetNumFunctions( (void *) solver, num_functions ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -611,7 +611,7 @@ HYPRE_Int
 HYPRE_ParCSRHybridSetNodal( HYPRE_Solver solver,
                             HYPRE_Int    nodal    )
 {
-   return( hypre_AMGHybridSetNodal( (void *) solver, nodal ) );
+   return ( hypre_AMGHybridSetNodal( (void *) solver, nodal ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -622,7 +622,7 @@ HYPRE_Int
 HYPRE_ParCSRHybridSetDofFunc( HYPRE_Solver solver,
                               HYPRE_Int   *dof_func    )
 {
-   return( hypre_AMGHybridSetDofFunc( (void *) solver, dof_func ) );
+   return ( hypre_AMGHybridSetDofFunc( (void *) solver, dof_func ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -631,10 +631,10 @@ HYPRE_ParCSRHybridSetDofFunc( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_ParCSRHybridSetNonGalerkinTol( HYPRE_Solver solver,
-                              HYPRE_Int   nongalerk_num_tol,
-                              HYPRE_Real  *nongalerkin_tol)
+                                     HYPRE_Int   nongalerk_num_tol,
+                                     HYPRE_Real  *nongalerkin_tol)
 {
-   return( hypre_AMGHybridSetNonGalerkinTol( (void *) solver, nongalerk_num_tol, nongalerkin_tol ) );
+   return ( hypre_AMGHybridSetNonGalerkinTol( (void *) solver, nongalerk_num_tol, nongalerkin_tol ) );
 }
 
 
@@ -646,7 +646,7 @@ HYPRE_Int
 HYPRE_ParCSRHybridGetNumIterations( HYPRE_Solver solver,
                                     HYPRE_Int   *num_its    )
 {
-   return( hypre_AMGHybridGetNumIterations( (void *) solver, num_its ) );
+   return ( hypre_AMGHybridGetNumIterations( (void *) solver, num_its ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -657,7 +657,7 @@ HYPRE_Int
 HYPRE_ParCSRHybridGetDSCGNumIterations( HYPRE_Solver solver,
                                         HYPRE_Int   *dscg_num_its )
 {
-   return( hypre_AMGHybridGetDSCGNumIterations( (void *) solver, dscg_num_its ) );
+   return ( hypre_AMGHybridGetDSCGNumIterations( (void *) solver, dscg_num_its ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -668,7 +668,7 @@ HYPRE_Int
 HYPRE_ParCSRHybridGetPCGNumIterations( HYPRE_Solver solver,
                                        HYPRE_Int   *pcg_num_its )
 {
-   return( hypre_AMGHybridGetPCGNumIterations( (void *) solver, pcg_num_its ) );
+   return ( hypre_AMGHybridGetPCGNumIterations( (void *) solver, pcg_num_its ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -679,7 +679,7 @@ HYPRE_Int
 HYPRE_ParCSRHybridGetFinalRelativeResidualNorm( HYPRE_Solver solver,
                                                 HYPRE_Real  *norm    )
 {
-   return( hypre_AMGHybridGetFinalRelativeResidualNorm( (void *) solver, norm ) );
+   return ( hypre_AMGHybridGetFinalRelativeResidualNorm( (void *) solver, norm ) );
 }
 
 
@@ -687,5 +687,5 @@ HYPRE_Int
 HYPRE_ParCSRHybridGetSetupSolveTime( HYPRE_Solver solver,
                                      HYPRE_Real  *time    )
 {
-   return( hypre_AMGHybridGetSetupSolveTime( (void *) solver, time ) );
+   return ( hypre_AMGHybridGetSetupSolveTime( (void *) solver, time ) );
 }
diff --git a/external/hypre/src/parcsr_ls/HYPRE_parcsr_ilu.c b/external/hypre/src/parcsr_ls/HYPRE_parcsr_ilu.c
index 140775ac..68f355f0 100644
--- a/external/hypre/src/parcsr_ls/HYPRE_parcsr_ilu.c
+++ b/external/hypre/src/parcsr_ls/HYPRE_parcsr_ilu.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -30,7 +30,7 @@ HYPRE_ILUCreate( HYPRE_Solver *solver )
 HYPRE_Int
 HYPRE_ILUDestroy( HYPRE_Solver solver )
 {
-   return( hypre_ILUDestroy( (void *) solver ) );
+   return ( hypre_ILUDestroy( (void *) solver ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -39,14 +39,14 @@ HYPRE_ILUDestroy( HYPRE_Solver solver )
 
 HYPRE_Int
 HYPRE_ILUSetup( HYPRE_Solver solver,
-                         HYPRE_ParCSRMatrix A,
-                         HYPRE_ParVector b,
-                         HYPRE_ParVector x      )
+                HYPRE_ParCSRMatrix A,
+                HYPRE_ParVector b,
+                HYPRE_ParVector x      )
 {
-   return( hypre_ILUSetup( (void *) solver,
-                                 (hypre_ParCSRMatrix *) A,
-                                 (hypre_ParVector *) b,
-                                 (hypre_ParVector *) x ) );
+   return ( hypre_ILUSetup( (void *) solver,
+                            (hypre_ParCSRMatrix *) A,
+                            (hypre_ParVector *) b,
+                            (hypre_ParVector *) x ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -55,133 +55,232 @@ HYPRE_ILUSetup( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_ILUSolve( HYPRE_Solver solver,
-                         HYPRE_ParCSRMatrix A,
-                         HYPRE_ParVector b,
-                         HYPRE_ParVector x      )
+                HYPRE_ParCSRMatrix A,
+                HYPRE_ParVector b,
+                HYPRE_ParVector x      )
 {
-   return( hypre_ILUSolve( (void *) solver,
-                                 (hypre_ParCSRMatrix *) A,
-                                 (hypre_ParVector *) b,
-                                 (hypre_ParVector *) x ) );
+   return ( hypre_ILUSolve( (void *) solver,
+                            (hypre_ParCSRMatrix *) A,
+                            (hypre_ParVector *) b,
+                            (hypre_ParVector *) x ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_ILUSetPrintLevel
  *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 HYPRE_ILUSetPrintLevel( HYPRE_Solver solver, HYPRE_Int print_level )
 {
    return hypre_ILUSetPrintLevel( solver, print_level );
 }
+
 /*--------------------------------------------------------------------------
  * HYPRE_ILUSetLogging
  *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 HYPRE_ILUSetLogging( HYPRE_Solver solver, HYPRE_Int logging )
 {
    return hypre_ILUSetLogging(solver, logging );
 }
+
 /*--------------------------------------------------------------------------
  * HYPRE_ILUSetMaxIter
  *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 HYPRE_ILUSetMaxIter( HYPRE_Solver solver, HYPRE_Int max_iter )
 {
    return hypre_ILUSetMaxIter( solver, max_iter );
 }
+
+/*--------------------------------------------------------------------------
+ * HYPRE_ILUSetIterativeSetupType
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_ILUSetIterativeSetupType( HYPRE_Solver solver, HYPRE_Int iter_setup_type )
+{
+   return hypre_ILUSetIterativeSetupType( solver, iter_setup_type );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_ILUSetIterativeSetupOption
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_ILUSetIterativeSetupOption( HYPRE_Solver solver, HYPRE_Int iter_setup_option )
+{
+   return hypre_ILUSetIterativeSetupOption( solver, iter_setup_option );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_ILUSetIterativeSetupMaxIter
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_ILUSetIterativeSetupMaxIter( HYPRE_Solver solver, HYPRE_Int iter_setup_max_iter )
+{
+   return hypre_ILUSetIterativeSetupMaxIter( solver, iter_setup_max_iter );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_ILUSetIterativeSetupTolerance
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_ILUSetIterativeSetupTolerance( HYPRE_Solver solver, HYPRE_Real iter_setup_tolerance )
+{
+   return hypre_ILUSetIterativeSetupTolerance( solver, iter_setup_tolerance );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_ILUSetTriSolve
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_ILUSetTriSolve( HYPRE_Solver solver, HYPRE_Int tri_solve )
+{
+   return hypre_ILUSetTriSolve( solver, tri_solve );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_ILUSetLowerJacobiIters
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_ILUSetLowerJacobiIters( HYPRE_Solver solver, HYPRE_Int lower_jacobi_iters )
+{
+   return hypre_ILUSetLowerJacobiIters( solver, lower_jacobi_iters );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_ILUSetUpperJacobiIters
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_ILUSetUpperJacobiIters( HYPRE_Solver solver, HYPRE_Int upper_jacobi_iters )
+{
+   return hypre_ILUSetUpperJacobiIters( solver, upper_jacobi_iters );
+}
+
 /*--------------------------------------------------------------------------
  * HYPRE_ILUSetTol
  *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 HYPRE_ILUSetTol( HYPRE_Solver solver, HYPRE_Real tol )
 {
    return hypre_ILUSetTol( solver, tol );
 }
+
 /*--------------------------------------------------------------------------
  * HYPRE_ILUSetDropThreshold
  *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 HYPRE_ILUSetDropThreshold( HYPRE_Solver solver, HYPRE_Real threshold )
 {
    return hypre_ILUSetDropThreshold( solver, threshold );
 }
+
 /*--------------------------------------------------------------------------
  * HYPRE_ILUSetDropThresholdArray
  *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 HYPRE_ILUSetDropThresholdArray( HYPRE_Solver solver, HYPRE_Real *threshold )
 {
    return hypre_ILUSetDropThresholdArray( solver, threshold );
 }
+
 /*--------------------------------------------------------------------------
  * HYPRE_ILUSetNSHDropThreshold
  *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 HYPRE_ILUSetNSHDropThreshold( HYPRE_Solver solver, HYPRE_Real threshold )
 {
    return hypre_ILUSetSchurNSHDropThreshold( solver, threshold );
 }
+
 /*--------------------------------------------------------------------------
  * HYPRE_ILUSetNSHDropThresholdArray
  *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 HYPRE_ILUSetNSHDropThresholdArray( HYPRE_Solver solver, HYPRE_Real *threshold )
 {
    return hypre_ILUSetSchurNSHDropThresholdArray( solver, threshold );
 }
+
 /*--------------------------------------------------------------------------
  * HYPRE_ILUSetSchurMaxIter
  *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 HYPRE_ILUSetSchurMaxIter( HYPRE_Solver solver, HYPRE_Int ss_max_iter )
 {
    return hypre_ILUSetSchurSolverMaxIter( solver, ss_max_iter );
 }
+
 /*--------------------------------------------------------------------------
  * HYPRE_ILUSetMaxNnzPerRow
  *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 HYPRE_ILUSetMaxNnzPerRow( HYPRE_Solver solver, HYPRE_Int nzmax )
 {
    return hypre_ILUSetMaxNnzPerRow( solver, nzmax );
 }
+
 /*--------------------------------------------------------------------------
- * HYPRE_ILUSetFillLevel
+ * HYPRE_ILUSetLevelOfFill
  *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 HYPRE_ILUSetLevelOfFill( HYPRE_Solver solver, HYPRE_Int lfil )
 {
    return hypre_ILUSetLevelOfFill( solver, lfil );
 }
+
 /*--------------------------------------------------------------------------
  * HYPRE_ILUSetType
  *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 HYPRE_ILUSetType( HYPRE_Solver solver, HYPRE_Int ilu_type )
 {
    return hypre_ILUSetType( solver, ilu_type );
 }
+
+/*--------------------------------------------------------------------------
+ * HYPRE_ILUSetLocalReordering
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_ILUSetLocalReordering(  HYPRE_Solver solver, HYPRE_Int ordering_type )
+{
+   return hypre_ILUSetLocalReordering(solver, ordering_type);
+}
+
 /*--------------------------------------------------------------------------
  * HYPRE_ILUGetNumIterations
  *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 HYPRE_ILUGetNumIterations( HYPRE_Solver solver, HYPRE_Int *num_iterations )
 {
    return hypre_ILUGetNumIterations( solver, num_iterations );
 }
+
 /*--------------------------------------------------------------------------
  * HYPRE_ILUGetFinalRelativeResidualNorm
  *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 HYPRE_ILUGetFinalRelativeResidualNorm(  HYPRE_Solver solver, HYPRE_Real *res_norm )
 {
    return hypre_ILUGetFinalRelativeResidualNorm(solver, res_norm);
 }
-/*--------------------------------------------------------------------------
- * HYPRE_ILUSetLocalReordering
- *--------------------------------------------------------------------------*/
-HYPRE_Int
-HYPRE_ILUSetLocalReordering(  HYPRE_Solver solver, HYPRE_Int ordering_type )
-{
-   return hypre_ILUSetLocalReordering(solver, ordering_type);
-}
diff --git a/external/hypre/src/parcsr_ls/HYPRE_parcsr_int.c b/external/hypre/src/parcsr_ls/HYPRE_parcsr_int.c
index 2744a29c..2ed1266e 100644
--- a/external/hypre/src/parcsr_ls/HYPRE_parcsr_int.c
+++ b/external/hypre/src/parcsr_ls/HYPRE_parcsr_int.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -11,122 +11,147 @@
 #include "temp_multivector.h"
 
 HYPRE_Int
-hypre_ParSetRandomValues( void* v, HYPRE_Int seed ) {
+hypre_ParSetRandomValues( void* v, HYPRE_Int seed )
+{
 
-  HYPRE_ParVectorSetRandomValues( (HYPRE_ParVector)v, seed );
-  return 0;
+   HYPRE_ParVectorSetRandomValues( (HYPRE_ParVector)v, seed );
+   return 0;
 }
 
 HYPRE_Int
-hypre_ParPrintVector( void* v, const char* file ) {
+hypre_ParPrintVector( void* v, const char* file )
+{
 
-  return hypre_ParVectorPrint( (hypre_ParVector*)v, file );
+   return hypre_ParVectorPrint( (hypre_ParVector*)v, file );
 }
 
 void*
-hypre_ParReadVector( MPI_Comm comm, const char* file ) {
+hypre_ParReadVector( MPI_Comm comm, const char* file )
+{
 
-  return (void*)hypre_ParVectorRead( comm, file );
+   return (void*)hypre_ParVectorRead( comm, file );
 }
 
 HYPRE_Int hypre_ParVectorSize(void * x)
 {
-  return 0;
+   HYPRE_UNUSED_VAR(x);
+
+   return 0;
 }
 
 HYPRE_Int
-HYPRE_ParCSRMultiVectorPrint( void* x_, const char* fileName ) {
-
-  HYPRE_Int i, ierr;
-  mv_TempMultiVector* x;
-  char fullName[128];
-
-  x = (mv_TempMultiVector*)x_;
-  hypre_assert( x != NULL );
-
-  ierr = 0;
-  for ( i = 0; i < x->numVectors; i++ ) {
-    hypre_sprintf( fullName, "%s.%d", fileName, i );
-    ierr = ierr ||
-      hypre_ParPrintVector( x->vector[i], fullName );
-  }
-  return ierr;
+HYPRE_ParCSRMultiVectorPrint( void* x_, const char* fileName )
+{
+
+   HYPRE_Int i, ierr;
+   mv_TempMultiVector* x;
+   char fullName[128];
+
+   x = (mv_TempMultiVector*)x_;
+   hypre_assert( x != NULL );
+
+   ierr = 0;
+   for ( i = 0; i < x->numVectors; i++ )
+   {
+      hypre_sprintf( fullName, "%s.%d", fileName, i );
+      ierr = ierr ||
+             hypre_ParPrintVector( x->vector[i], fullName );
+   }
+   return ierr;
 }
 
 void*
-HYPRE_ParCSRMultiVectorRead( MPI_Comm comm, void* ii_, const char* fileName ) {
+HYPRE_ParCSRMultiVectorRead( MPI_Comm comm, void* ii_, const char* fileName )
+{
 
-  HYPRE_Int i, n, id;
-  FILE* fp;
-  char fullName[128];
-  mv_TempMultiVector* x;
-  mv_InterfaceInterpreter* ii = (mv_InterfaceInterpreter*)ii_;
+   HYPRE_Int i, n, id;
+   FILE* fp;
+   char fullName[128];
+   mv_TempMultiVector* x;
+   mv_InterfaceInterpreter* ii = (mv_InterfaceInterpreter*)ii_;
 
-  hypre_MPI_Comm_rank( comm, &id );
+   hypre_MPI_Comm_rank( comm, &id );
 
-  n = 0;
-  do {
-    hypre_sprintf( fullName, "%s.%d.%d", fileName, n, id );
-    if ( (fp = fopen(fullName, "r")) ) {
-	  n++;
-      fclose( fp );
-	}
-  } while ( fp );
+   n = 0;
+   do
+   {
+      hypre_sprintf( fullName, "%s.%d.%d", fileName, n, id );
+      if ( (fp = fopen(fullName, "r")) )
+      {
+         n++;
+         fclose( fp );
+      }
+   }
+   while ( fp );
 
-  if ( n == 0 )
-    return NULL;
+   if ( n == 0 )
+   {
+      return NULL;
+   }
 
-  x = hypre_TAlloc(mv_TempMultiVector, 1, HYPRE_MEMORY_HOST);
-  hypre_assert( x != NULL );
+   x = hypre_TAlloc(mv_TempMultiVector, 1, HYPRE_MEMORY_HOST);
+   hypre_assert( x != NULL );
 
-  x->interpreter = ii;
+   x->interpreter = ii;
 
-  x->numVectors = n;
+   x->numVectors = n;
 
-  x->vector = hypre_CTAlloc(void*,  n, HYPRE_MEMORY_HOST);
-  hypre_assert( x->vector != NULL );
+   x->vector = hypre_CTAlloc(void*,  n, HYPRE_MEMORY_HOST);
+   hypre_assert( x->vector != NULL );
 
-  x->ownsVectors = 1;
+   x->ownsVectors = 1;
 
-  for ( i = 0; i < n; i++ ) {
-    hypre_sprintf( fullName, "%s.%d", fileName, i );
-    x->vector[i] = hypre_ParReadVector( comm, fullName );
-  }
+   for ( i = 0; i < n; i++ )
+   {
+      hypre_sprintf( fullName, "%s.%d", fileName, i );
+      x->vector[i] = hypre_ParReadVector( comm, fullName );
+   }
 
-  x->mask = NULL;
-  x->ownsMask = 0;
+   x->mask = NULL;
+   x->ownsMask = 0;
 
-  return x;
+   return x;
 }
 
 HYPRE_Int
-aux_maskCount( HYPRE_Int n, HYPRE_Int* mask ) {
+aux_maskCount( HYPRE_Int n, HYPRE_Int* mask )
+{
 
-  HYPRE_Int i, m;
+   HYPRE_Int i, m;
 
-  if ( mask == NULL )
-    return n;
+   if ( mask == NULL )
+   {
+      return n;
+   }
 
-  for ( i = m = 0; i < n; i++ )
-    if ( mask[i] )
-      m++;
+   for ( i = m = 0; i < n; i++ )
+      if ( mask[i] )
+      {
+         m++;
+      }
 
-  return m;
+   return m;
 }
 
 void
-aux_indexFromMask( HYPRE_Int n, HYPRE_Int* mask, HYPRE_Int* index ) {
-
-  HYPRE_Int i, j;
+aux_indexFromMask( HYPRE_Int n, HYPRE_Int* mask, HYPRE_Int* index )
+{
 
-  if ( mask != NULL ) {
-    for ( i = 0, j = 0; i < n; i++ )
-      if ( mask[i] )
-	index[j++] = i + 1;
-  }
-  else
-    for ( i = 0; i < n; i++ )
-      index[i] = i + 1;
+   HYPRE_Int i, j;
+
+   if ( mask != NULL )
+   {
+      for ( i = 0, j = 0; i < n; i++ )
+         if ( mask[i] )
+         {
+            index[j++] = i + 1;
+         }
+   }
+   else
+      for ( i = 0; i < n; i++ )
+      {
+         index[i] = i + 1;
+      }
 
 }
 
@@ -142,56 +167,56 @@ aux_indexFromMask( HYPRE_Int n, HYPRE_Int* mask, HYPRE_Int* index ) {
 HYPRE_Int
 HYPRE_TempParCSRSetupInterpreter( mv_InterfaceInterpreter *i )
 {
-  /* Vector part */
-
-  i->CreateVector = hypre_ParKrylovCreateVector;
-  i->DestroyVector = hypre_ParKrylovDestroyVector;
-  i->InnerProd = hypre_ParKrylovInnerProd;
-  i->CopyVector = hypre_ParKrylovCopyVector;
-  i->ClearVector = hypre_ParKrylovClearVector;
-  i->SetRandomValues = hypre_ParSetRandomValues;
-  i->ScaleVector = hypre_ParKrylovScaleVector;
-  i->Axpy = hypre_ParKrylovAxpy;
-
-  /* Multivector part */
-
-  i->CreateMultiVector = mv_TempMultiVectorCreateFromSampleVector;
-  i->CopyCreateMultiVector = mv_TempMultiVectorCreateCopy;
-  i->DestroyMultiVector = mv_TempMultiVectorDestroy;
-
-  i->Width = mv_TempMultiVectorWidth;
-  i->Height = mv_TempMultiVectorHeight;
-  i->SetMask = mv_TempMultiVectorSetMask;
-  i->CopyMultiVector = mv_TempMultiVectorCopy;
-  i->ClearMultiVector = mv_TempMultiVectorClear;
-  i->SetRandomVectors = mv_TempMultiVectorSetRandom;
-  i->MultiInnerProd = mv_TempMultiVectorByMultiVector;
-  i->MultiInnerProdDiag = mv_TempMultiVectorByMultiVectorDiag;
-  i->MultiVecMat = mv_TempMultiVectorByMatrix;
-  i->MultiVecMatDiag = mv_TempMultiVectorByDiagonal;
-  i->MultiAxpy = mv_TempMultiVectorAxpy;
-  i->MultiXapy = mv_TempMultiVectorXapy;
-  i->Eval = mv_TempMultiVectorEval;
-
-  return 0;
+   /* Vector part */
+
+   i->CreateVector = hypre_ParKrylovCreateVector;
+   i->DestroyVector = hypre_ParKrylovDestroyVector;
+   i->InnerProd = hypre_ParKrylovInnerProd;
+   i->CopyVector = hypre_ParKrylovCopyVector;
+   i->ClearVector = hypre_ParKrylovClearVector;
+   i->SetRandomValues = hypre_ParSetRandomValues;
+   i->ScaleVector = hypre_ParKrylovScaleVector;
+   i->Axpy = hypre_ParKrylovAxpy;
+
+   /* Multivector part */
+
+   i->CreateMultiVector = mv_TempMultiVectorCreateFromSampleVector;
+   i->CopyCreateMultiVector = mv_TempMultiVectorCreateCopy;
+   i->DestroyMultiVector = mv_TempMultiVectorDestroy;
+
+   i->Width = mv_TempMultiVectorWidth;
+   i->Height = mv_TempMultiVectorHeight;
+   i->SetMask = mv_TempMultiVectorSetMask;
+   i->CopyMultiVector = mv_TempMultiVectorCopy;
+   i->ClearMultiVector = mv_TempMultiVectorClear;
+   i->SetRandomVectors = mv_TempMultiVectorSetRandom;
+   i->MultiInnerProd = mv_TempMultiVectorByMultiVector;
+   i->MultiInnerProdDiag = mv_TempMultiVectorByMultiVectorDiag;
+   i->MultiVecMat = mv_TempMultiVectorByMatrix;
+   i->MultiVecMatDiag = mv_TempMultiVectorByDiagonal;
+   i->MultiAxpy = mv_TempMultiVectorAxpy;
+   i->MultiXapy = mv_TempMultiVectorXapy;
+   i->Eval = mv_TempMultiVectorEval;
+
+   return 0;
 }
 
 HYPRE_Int
 HYPRE_ParCSRSetupInterpreter( mv_InterfaceInterpreter *i )
 {
-  return HYPRE_TempParCSRSetupInterpreter( i );
+   return HYPRE_TempParCSRSetupInterpreter( i );
 }
 
 HYPRE_Int
 HYPRE_ParCSRSetupMatvec(HYPRE_MatvecFunctions * mv)
 {
-  mv->MatvecCreate = hypre_ParKrylovMatvecCreate;
-  mv->Matvec = hypre_ParKrylovMatvec;
-  mv->MatvecDestroy = hypre_ParKrylovMatvecDestroy;
+   mv->MatvecCreate = hypre_ParKrylovMatvecCreate;
+   mv->Matvec = hypre_ParKrylovMatvec;
+   mv->MatvecDestroy = hypre_ParKrylovMatvecDestroy;
 
-  mv->MatMultiVecCreate = NULL;
-  mv->MatMultiVec = NULL;
-  mv->MatMultiVecDestroy = NULL;
+   mv->MatMultiVecCreate = NULL;
+   mv->MatMultiVec = NULL;
+   mv->MatMultiVecDestroy = NULL;
 
-  return 0;
+   return 0;
 }
diff --git a/external/hypre/src/parcsr_ls/HYPRE_parcsr_lgmres.c b/external/hypre/src/parcsr_ls/HYPRE_parcsr_lgmres.c
index ff872c7b..ddfa88fc 100644
--- a/external/hypre/src/parcsr_ls/HYPRE_parcsr_lgmres.c
+++ b/external/hypre/src/parcsr_ls/HYPRE_parcsr_lgmres.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -14,7 +14,9 @@
 HYPRE_Int
 HYPRE_ParCSRLGMRESCreate( MPI_Comm comm, HYPRE_Solver *solver )
 {
-   hypre_LGMRESFunctions * lgmres_functions;
+   HYPRE_UNUSED_VAR(comm);
+
+   hypre_LGMRESFunctions *lgmres_functions;
 
    if (!solver)
    {
@@ -23,15 +25,22 @@ HYPRE_ParCSRLGMRESCreate( MPI_Comm comm, HYPRE_Solver *solver )
    }
    lgmres_functions =
       hypre_LGMRESFunctionsCreate(
-         hypre_ParKrylovCAlloc, hypre_ParKrylovFree, hypre_ParKrylovCommInfo,
+         hypre_ParKrylovCAlloc,
+         hypre_ParKrylovFree,
+         hypre_ParKrylovCommInfo,
          hypre_ParKrylovCreateVector,
          hypre_ParKrylovCreateVectorArray,
-         hypre_ParKrylovDestroyVector, hypre_ParKrylovMatvecCreate,
-         hypre_ParKrylovMatvec, hypre_ParKrylovMatvecDestroy,
-         hypre_ParKrylovInnerProd, hypre_ParKrylovCopyVector,
+         hypre_ParKrylovDestroyVector,
+         hypre_ParKrylovMatvecCreate,
+         hypre_ParKrylovMatvec,
+         hypre_ParKrylovMatvecDestroy,
+         hypre_ParKrylovInnerProd,
+         hypre_ParKrylovCopyVector,
          hypre_ParKrylovClearVector,
-         hypre_ParKrylovScaleVector, hypre_ParKrylovAxpy,
-         hypre_ParKrylovIdentitySetup, hypre_ParKrylovIdentity );
+         hypre_ParKrylovScaleVector,
+         hypre_ParKrylovAxpy,
+         hypre_ParKrylovIdentitySetup,
+         hypre_ParKrylovIdentity );
    *solver = ( (HYPRE_Solver) hypre_LGMRESCreate( lgmres_functions ) );
 
    return hypre_error_flag;
@@ -41,42 +50,42 @@ HYPRE_ParCSRLGMRESCreate( MPI_Comm comm, HYPRE_Solver *solver )
  * HYPRE_ParCSRLGMRESDestroy
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_ParCSRLGMRESDestroy( HYPRE_Solver solver )
 {
-   return( hypre_LGMRESDestroy( (void *) solver ) );
+   return ( hypre_LGMRESDestroy( (void *) solver ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRLGMRESSetup
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_ParCSRLGMRESSetup( HYPRE_Solver solver,
                          HYPRE_ParCSRMatrix A,
                          HYPRE_ParVector b,
                          HYPRE_ParVector x      )
 {
-   return( HYPRE_LGMRESSetup( solver,
-                              (HYPRE_Matrix) A,
-                              (HYPRE_Vector) b,
-                              (HYPRE_Vector) x ) );
+   return ( HYPRE_LGMRESSetup( solver,
+                               (HYPRE_Matrix) A,
+                               (HYPRE_Vector) b,
+                               (HYPRE_Vector) x ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRLGMRESSolve
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_ParCSRLGMRESSolve( HYPRE_Solver solver,
                          HYPRE_ParCSRMatrix A,
                          HYPRE_ParVector b,
                          HYPRE_ParVector x      )
 {
-   return( HYPRE_LGMRESSolve( solver,
-                              (HYPRE_Matrix) A,
-                              (HYPRE_Vector) b,
-                              (HYPRE_Vector) x ) );
+   return ( HYPRE_LGMRESSolve( solver,
+                               (HYPRE_Matrix) A,
+                               (HYPRE_Vector) b,
+                               (HYPRE_Vector) x ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -87,7 +96,7 @@ HYPRE_Int
 HYPRE_ParCSRLGMRESSetKDim( HYPRE_Solver solver,
                            HYPRE_Int    k_dim    )
 {
-   return( HYPRE_LGMRESSetKDim( solver, k_dim ) );
+   return ( HYPRE_LGMRESSetKDim( solver, k_dim ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -98,7 +107,7 @@ HYPRE_Int
 HYPRE_ParCSRLGMRESSetAugDim( HYPRE_Solver solver,
                              HYPRE_Int    aug_dim    )
 {
-   return( HYPRE_LGMRESSetAugDim( solver, aug_dim ) );
+   return ( HYPRE_LGMRESSetAugDim( solver, aug_dim ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -109,7 +118,7 @@ HYPRE_Int
 HYPRE_ParCSRLGMRESSetTol( HYPRE_Solver solver,
                           HYPRE_Real   tol    )
 {
-   return( HYPRE_LGMRESSetTol( solver, tol ) );
+   return ( HYPRE_LGMRESSetTol( solver, tol ) );
 }
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRLGMRESSetAbsoluteTol
@@ -119,7 +128,7 @@ HYPRE_Int
 HYPRE_ParCSRLGMRESSetAbsoluteTol( HYPRE_Solver solver,
                                   HYPRE_Real   a_tol    )
 {
-   return( HYPRE_LGMRESSetAbsoluteTol( solver, a_tol ) );
+   return ( HYPRE_LGMRESSetAbsoluteTol( solver, a_tol ) );
 }
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRLGMRESSetMinIter
@@ -129,7 +138,7 @@ HYPRE_Int
 HYPRE_ParCSRLGMRESSetMinIter( HYPRE_Solver solver,
                               HYPRE_Int    min_iter )
 {
-   return( HYPRE_LGMRESSetMinIter( solver, min_iter ) );
+   return ( HYPRE_LGMRESSetMinIter( solver, min_iter ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -140,7 +149,7 @@ HYPRE_Int
 HYPRE_ParCSRLGMRESSetMaxIter( HYPRE_Solver solver,
                               HYPRE_Int    max_iter )
 {
-   return( HYPRE_LGMRESSetMaxIter( solver, max_iter ) );
+   return ( HYPRE_LGMRESSetMaxIter( solver, max_iter ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -153,10 +162,10 @@ HYPRE_ParCSRLGMRESSetPrecond( HYPRE_Solver          solver,
                               HYPRE_PtrToParSolverFcn  precond_setup,
                               HYPRE_Solver          precond_solver )
 {
-   return( HYPRE_LGMRESSetPrecond( solver,
-                                   (HYPRE_PtrToSolverFcn) precond,
-                                   (HYPRE_PtrToSolverFcn) precond_setup,
-                                   precond_solver ) );
+   return ( HYPRE_LGMRESSetPrecond( solver,
+                                    (HYPRE_PtrToSolverFcn) precond,
+                                    (HYPRE_PtrToSolverFcn) precond_setup,
+                                    precond_solver ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -167,7 +176,7 @@ HYPRE_Int
 HYPRE_ParCSRLGMRESGetPrecond( HYPRE_Solver  solver,
                               HYPRE_Solver *precond_data_ptr )
 {
-   return( HYPRE_LGMRESGetPrecond( solver, precond_data_ptr ) );
+   return ( HYPRE_LGMRESGetPrecond( solver, precond_data_ptr ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -178,7 +187,7 @@ HYPRE_Int
 HYPRE_ParCSRLGMRESSetLogging( HYPRE_Solver solver,
                               HYPRE_Int logging)
 {
-   return( HYPRE_LGMRESSetLogging( solver, logging ) );
+   return ( HYPRE_LGMRESSetLogging( solver, logging ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -189,7 +198,7 @@ HYPRE_Int
 HYPRE_ParCSRLGMRESSetPrintLevel( HYPRE_Solver solver,
                                  HYPRE_Int print_level)
 {
-   return( HYPRE_LGMRESSetPrintLevel( solver, print_level ) );
+   return ( HYPRE_LGMRESSetPrintLevel( solver, print_level ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -200,7 +209,7 @@ HYPRE_Int
 HYPRE_ParCSRLGMRESGetNumIterations( HYPRE_Solver  solver,
                                     HYPRE_Int    *num_iterations )
 {
-   return( HYPRE_LGMRESGetNumIterations( solver, num_iterations ) );
+   return ( HYPRE_LGMRESGetNumIterations( solver, num_iterations ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -211,7 +220,7 @@ HYPRE_Int
 HYPRE_ParCSRLGMRESGetFinalRelativeResidualNorm( HYPRE_Solver  solver,
                                                 HYPRE_Real   *norm   )
 {
-   return( HYPRE_LGMRESGetFinalRelativeResidualNorm( solver, norm ) );
+   return ( HYPRE_LGMRESGetFinalRelativeResidualNorm( solver, norm ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -222,5 +231,5 @@ HYPRE_Int
 HYPRE_ParCSRLGMRESGetResidual( HYPRE_Solver  solver,
                                HYPRE_ParVector *residual)
 {
-   return( HYPRE_LGMRESGetResidual( solver, (void *) residual ) );
+   return ( HYPRE_LGMRESGetResidual( solver, (void *) residual ) );
 }
diff --git a/external/hypre/src/parcsr_ls/HYPRE_parcsr_ls.h b/external/hypre/src/parcsr_ls/HYPRE_parcsr_ls.h
index b3852ed7..5f0d0620 100644
--- a/external/hypre/src/parcsr_ls/HYPRE_parcsr_ls.h
+++ b/external/hypre/src/parcsr_ls/HYPRE_parcsr_ls.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -24,10 +24,8 @@ extern "C" {
 /**
  * @defgroup ParCSRSolvers ParCSR Solvers
  *
- * These solvers use matrix/vector storage schemes that are taylored
- * for general sparse matrix systems.
- *
- * @memo Linear solvers for sparse matrix systems
+ * Linear solvers for sparse matrix systems. These solvers use matrix/vector
+ * storage schemes that are taylored for general sparse matrix systems.
  *
  * @{
  **/
@@ -41,27 +39,20 @@ extern "C" {
  * @{
  **/
 
-struct hypre_Solver_struct;
 /**
  * The solver object.
  **/
 
-#ifndef HYPRE_SOLVER_STRUCT
-#define HYPRE_SOLVER_STRUCT
-struct hypre_Solver_struct;
-typedef struct hypre_Solver_struct *HYPRE_Solver;
-#endif
-
 typedef HYPRE_Int (*HYPRE_PtrToParSolverFcn)(HYPRE_Solver,
-                                       HYPRE_ParCSRMatrix,
-                                       HYPRE_ParVector,
-                                       HYPRE_ParVector);
+                                             HYPRE_ParCSRMatrix,
+                                             HYPRE_ParVector,
+                                             HYPRE_ParVector);
 
 #ifndef HYPRE_MODIFYPC
 #define HYPRE_MODIFYPC
 typedef HYPRE_Int (*HYPRE_PtrToModifyPCFcn)(HYPRE_Solver,
-                                      HYPRE_Int,
-                                      HYPRE_Real);
+                                            HYPRE_Int,
+                                            HYPRE_Real);
 #endif
 
 /**@}*/
@@ -155,6 +146,19 @@ HYPRE_Int HYPRE_BoomerAMGGetResidual(HYPRE_Solver     solver,
 HYPRE_Int HYPRE_BoomerAMGGetNumIterations(HYPRE_Solver  solver,
                                           HYPRE_Int          *num_iterations);
 
+/**
+ * Returns cumulative num of nonzeros for A and P operators
+ **/
+HYPRE_Int HYPRE_BoomerAMGGetCumNnzAP(HYPRE_Solver  solver,
+                                     HYPRE_Real   *cum_nnz_AP);
+
+/**
+ * Activates cumulative num of nonzeros for A and P operators.
+ * Needs to be set to a positive number for activation.
+ **/
+HYPRE_Int HYPRE_BoomerAMGSetCumNnzAP(HYPRE_Solver  solver,
+                                     HYPRE_Real    cum_nnz_AP);
+
 /**
  * Returns the norm of the final relative residual.
  **/
@@ -166,7 +170,24 @@ HYPRE_Int HYPRE_BoomerAMGGetFinalRelativeResidualNorm(HYPRE_Solver  solver,
  * The default is 1, i.e. a scalar system.
  **/
 HYPRE_Int HYPRE_BoomerAMGSetNumFunctions(HYPRE_Solver solver,
-                                         HYPRE_Int          num_functions);
+                                         HYPRE_Int    num_functions);
+
+/**
+ * (Optional) Sets filtering for system of PDEs (\e num_functions > 1).
+ *
+ * \param filter_functions An integer flag to enable or disable filtering of inter-variable
+ * connections in the input matrix used for preconditioning.
+ *   - A value of 0 (default) indicates no filtering, preserving all inter-variable connections.
+ *   - A value of 1 enables filtering, removing inter-variable connections to lower
+ *     operator and memory complexities.
+ *
+ * @note This option assumes that variables are stored in an interleaved format,
+ *       where multiple variables are combined in a single vector. Enabling filtering
+ *       can be beneficial when the problem has multiple coupled variables (functions)
+ *       that are not strongly coupled.
+ **/
+HYPRE_Int HYPRE_BoomerAMGSetFilterFunctions(HYPRE_Solver solver,
+                                            HYPRE_Int    filter_functions);
 
 /**
  * (Optional) Sets the mapping that assigns the function to each variable,
@@ -312,7 +333,7 @@ HYPRE_Int HYPRE_BoomerAMGSetCoarsenType(HYPRE_Solver solver,
  * then can be used to change individual levels if desired
  **/
 HYPRE_Int HYPRE_BoomerAMGSetNonGalerkinTol (HYPRE_Solver solver,
-                                          HYPRE_Real  nongalerkin_tol);
+                                            HYPRE_Real  nongalerkin_tol);
 
 /**
  * (Optional) Defines the level specific non-Galerkin drop-tolerances
@@ -340,8 +361,8 @@ HYPRE_Int HYPRE_BoomerAMGSetNonGalerkinTol (HYPRE_Solver solver,
  * @param level [IN] level on which drop tolerance is used
  **/
 HYPRE_Int HYPRE_BoomerAMGSetLevelNonGalerkinTol (HYPRE_Solver solver,
-                                          HYPRE_Real   nongalerkin_tol,
-                                          HYPRE_Int  level);
+                                                 HYPRE_Real   nongalerkin_tol,
+                                                 HYPRE_Int  level);
 
 /**
  * (Optional) Defines the non-Galerkin drop-tolerance (old version)
@@ -520,8 +541,8 @@ HYPRE_Int HYPRE_BoomerAMGSetAggP12MaxElmts(HYPRE_Solver solver,
  * This can only be used in context with nodal coarsening and still
  * requires the user to choose an interpolation.
  **/
-HYPRE_Int HYPRE_BoomerAMGSetInterpVectors (HYPRE_Solver     solver ,
-                                           HYPRE_Int        num_vectors ,
+HYPRE_Int HYPRE_BoomerAMGSetInterpVectors (HYPRE_Solver     solver,
+                                           HYPRE_Int        num_vectors,
                                            HYPRE_ParVector *interp_vectors );
 
 /**
@@ -624,7 +645,7 @@ HYPRE_Int HYPRE_BoomerAMGSetSimple(HYPRE_Solver solver,
  * Can only be used when AMG is used as a preconditioner !!!
  **/
 HYPRE_Int HYPRE_BoomerAMGSetAddLastLvl(HYPRE_Solver solver,
-                                     HYPRE_Int    add_last_lvl);
+                                       HYPRE_Int    add_last_lvl);
 
 /**
  * (Optional) Defines the truncation factor for the
@@ -632,7 +653,7 @@ HYPRE_Int HYPRE_BoomerAMGSetAddLastLvl(HYPRE_Solver solver,
  * The default is 0.
  **/
 HYPRE_Int HYPRE_BoomerAMGSetMultAddTruncFactor(HYPRE_Solver solver,
-                                           HYPRE_Real   add_trunc_factor);
+                                               HYPRE_Real   add_trunc_factor);
 
 /**
  * (Optional) Defines the maximal number of elements per row for the
@@ -640,7 +661,7 @@ HYPRE_Int HYPRE_BoomerAMGSetMultAddTruncFactor(HYPRE_Solver solver,
  * The default is 0.
  **/
 HYPRE_Int HYPRE_BoomerAMGSetMultAddPMaxElmts(HYPRE_Solver solver,
-                                         HYPRE_Int    add_P_max_elmts);
+                                             HYPRE_Int    add_P_max_elmts);
 /**
  * (Optional) Defines the relaxation type used in the (mult)additive cycle
  * portion (also affects simple method.)
@@ -658,7 +679,7 @@ HYPRE_Int HYPRE_BoomerAMGSetAddRelaxType(HYPRE_Solver solver,
  * The weight only affects the Jacobi method, and has no effect on L1-Jacobi
  **/
 HYPRE_Int HYPRE_BoomerAMGSetAddRelaxWt(HYPRE_Solver solver,
-                                         HYPRE_Real    add_rlx_wt);
+                                       HYPRE_Real    add_rlx_wt);
 
 /**
  * (Optional) Sets maximal size for agglomeration or redundant coarse grid solve.
@@ -730,22 +751,54 @@ HYPRE_Int HYPRE_BoomerAMGSetGridRelaxType(HYPRE_Solver  solver,
  *    - 4  : hybrid Gauss-Seidel or SOR, backward solve
  *    - 5  : hybrid chaotic Gauss-Seidel (works only with OpenMP)
  *    - 6  : hybrid symmetric Gauss-Seidel or SSOR
+ *    - 7  : Jacobi (uses Matvec)
  *    - 8  : \f$\ell_1\f$-scaled hybrid symmetric Gauss-Seidel
  *    - 9  : Gaussian elimination (only on coarsest level)
+ *    - 10 : On-processor direct forward solve for matrices with
+ *           triangular structure
+ *    - 11 : Two Stage approximation to GS. Uses the strict lower
+ *           part of the diagonal matrix
+ *    - 12 : Two Stage approximation to GS. Uses the strict lower
+ *           part of the diagonal matrix and a second iteration
+ *           for additional error approximation
  *    - 13 : \f$\ell_1\f$ Gauss-Seidel, forward solve
  *    - 14 : \f$\ell_1\f$ Gauss-Seidel, backward solve
  *    - 15 : CG (warning - not a fixed smoother - may require FGMRES)
  *    - 16 : Chebyshev
  *    - 17 : FCF-Jacobi
  *    - 18 : \f$\ell_1\f$-scaled jacobi
+ *    - 19 : Gaussian elimination (old version)
+ *    - 21 : The same as 8 except forcing serialization on CPU (#OMP-thread = 1)
+ *    - 29 : Direct solve: use Gaussian elimination & BLAS
+ *                        (with pivoting) (old version)
+ *    - 30 : Kaczmarz
+ *    - 88:  The same methods as 8 with a convergent l1-term
+ *    - 89:  Symmetric l1-hybrid Gauss-Seidel (i.e., 13 followed by 14)
+ *    - 98 : LU with pivoting
+ *    - 99 : LU with pivoting
+ *    -199 : Matvec with the inverse
  **/
 HYPRE_Int HYPRE_BoomerAMGSetRelaxType(HYPRE_Solver  solver,
                                       HYPRE_Int     relax_type);
 
 /**
  * (Optional) Defines the smoother at a given cycle.
- * For options of \e relax_type see
- * description of HYPRE_BoomerAMGSetRelaxType). Options for \e k are
+ *
+ * For options of \e relax_type see description of HYPRE_BoomerAMGSetRelaxType.
+ * In addition, the following options for \e relax_type are available when choosing
+ * the coarsest level solver (k = 3):
+ *
+ *   For coarsest level systems formed via a sub-communicator defined with active ranks:
+ *      - 9   : hypre's internal Gaussian elimination (host only).
+ *      - 99  : LU factorization with pivoting.
+ *      - 199 : explicit (dense) inverse.
+ *
+ *   For coarsest level systems formed via hypre_DataExchangeList:
+ *      - 19  : hypre's internal Gaussian elimination (host only).
+ *      - 98  : LU factorization with pivoting.
+ *      - 198 : explicit (dense) inverse.
+ *
+ * Options for \e k are
  *
  *    - 1 : the down cycle
  *    - 2 : the up cycle
@@ -774,8 +827,7 @@ HYPRE_Int HYPRE_BoomerAMGSetRelaxOrder(HYPRE_Solver  solver,
 /**
  * (Optional) Defines in which order the points are relaxed.
  *
- * Note: This routine will be phased out!!!!
- * Use HYPRE_BoomerAMGSetRelaxOrder instead.
+ * See also HYPRE_BoomerAMGSetRelaxOrder.
  **/
 HYPRE_Int HYPRE_BoomerAMGSetGridRelaxPoints(HYPRE_Solver   solver,
                                             HYPRE_Int    **grid_relax_points);
@@ -870,14 +922,14 @@ HYPRE_Int HYPRE_BoomerAMGSetChebyFraction (HYPRE_Solver solver,
  *  The default is 1 (i.e., scaled).
  **/
 HYPRE_Int HYPRE_BoomerAMGSetChebyScale (HYPRE_Solver solver,
-                                           HYPRE_Int   scale);
+                                        HYPRE_Int   scale);
 
 /**
  * (Optional) Defines which polynomial variant should be used.
  *  The default is 0 (i.e., scaled).
  **/
 HYPRE_Int HYPRE_BoomerAMGSetChebyVariant (HYPRE_Solver solver,
-                                           HYPRE_Int   variant);
+                                          HYPRE_Int   variant);
 
 /**
  * (Optional) Defines how to estimate eigenvalues.
@@ -888,12 +940,16 @@ HYPRE_Int HYPRE_BoomerAMGSetChebyVariant (HYPRE_Solver solver,
  *  determine the smallest and largest eigenvalue.
  **/
 HYPRE_Int HYPRE_BoomerAMGSetChebyEigEst (HYPRE_Solver solver,
-                                           HYPRE_Int   eig_est);
+                                         HYPRE_Int   eig_est);
 
 /**
  * (Optional) Enables the use of more complex smoothers.
  * The following options exist for \e smooth_type:
  *
+ *    - 4 : FSAI (routines needed to set: HYPRE_BoomerAMGSetFSAIMaxSteps,
+ *          HYPRE_BoomerAMGSetFSAIMaxStepSize, HYPRE_BoomerAMGSetFSAIEigMaxIters,
+ *          HYPRE_BoomerAMGSetFSAIKapTolerance)
+ *    - 5 : ParILUK (routines needed to set: HYPRE_ILUSetLevelOfFill, HYPRE_ILUSetType)
  *    - 6 : Schwarz (routines needed to set: HYPRE_BoomerAMGSetDomainType,
  *          HYPRE_BoomerAMGSetOverlap, HYPRE_BoomerAMGSetVariant,
  *          HYPRE_BoomerAMGSetSchwarzRlxWeight)
@@ -903,7 +959,6 @@ HYPRE_Int HYPRE_BoomerAMGSetChebyEigEst (HYPRE_Solver solver,
  *          HYPRE_BoomerAMGSetLevel, HYPRE_BoomerAMGSetFilter,
  *          HYPRE_BoomerAMGSetThreshold)
  *    - 9 : Euclid (routines needed to set: HYPRE_BoomerAMGSetEuclidFile)
- *    - 5 : ParILUK (routines needed to set: HYPRE_ILUSetLevelOfFill, HYPRE_ILUSetType)
  *
  * The default is 6.  Also, if no smoother parameters are set via the routines
  * mentioned in the table above, default values are used.
@@ -1056,35 +1111,155 @@ HYPRE_Int HYPRE_BoomerAMGSetEuBJ(HYPRE_Solver solver,
  * For further explanation see description of ILU.
  **/
 HYPRE_Int HYPRE_BoomerAMGSetILUType( HYPRE_Solver  solver,
-                        HYPRE_Int	      ilu_type);
+                                     HYPRE_Int     ilu_type);
 
 /**
  * Defines level k for ILU(k) smoother
  * For further explanation see description of ILU.
  **/
 HYPRE_Int HYPRE_BoomerAMGSetILULevel( HYPRE_Solver  solver,
-                        HYPRE_Int	      ilu_lfil);
+                                      HYPRE_Int     ilu_lfil);
 
 /**
  * Defines max row nonzeros for ILUT smoother
  * For further explanation see description of ILU.
  **/
 HYPRE_Int HYPRE_BoomerAMGSetILUMaxRowNnz( HYPRE_Solver  solver,
-                        HYPRE_Int	      ilu_max_row_nnz);
+                                          HYPRE_Int     ilu_max_row_nnz);
 
 /**
  * Defines number of iterations for ILU smoother on each level
  * For further explanation see description of ILU.
  **/
 HYPRE_Int HYPRE_BoomerAMGSetILUMaxIter( HYPRE_Solver  solver,
-                        HYPRE_Int	      ilu_max_iter);
+                                        HYPRE_Int     ilu_max_iter);
 
 /**
  * Defines drop tolorance for iLUT smoother
  * For further explanation see description of ILU.
  **/
 HYPRE_Int HYPRE_BoomerAMGSetILUDroptol( HYPRE_Solver  solver,
-                        HYPRE_Real	      ilu_droptol);
+                                        HYPRE_Real    ilu_droptol);
+
+/**
+ * (Optional) Defines triangular solver for ILU(k,T) smoother: 0-iterative, 1-direct (default)
+ * For further explanation see description of ILU.
+ **/
+HYPRE_Int HYPRE_BoomerAMGSetILUTriSolve( HYPRE_Solver  solver,
+                                         HYPRE_Int     ilu_tri_solve);
+
+/**
+ * (Optional) Defines number of lower Jacobi iterations for ILU(k,T) smoother triangular solve.
+ * For further explanation see description of ILU.
+ **/
+HYPRE_Int HYPRE_BoomerAMGSetILULowerJacobiIters( HYPRE_Solver  solver,
+                                                 HYPRE_Int     ilu_lower_jacobi_iters);
+
+/**
+ * (Optional) Defines number of upper Jacobi iterations for ILU(k,T) smoother triangular solve.
+ * For further explanation see description of ILU.
+ **/
+HYPRE_Int HYPRE_BoomerAMGSetILUUpperJacobiIters( HYPRE_Solver  solver,
+                                                 HYPRE_Int     ilu_upper_jacobi_iters);
+
+/**
+ * (Optional) Set Local Reordering paramter (1==RCM, 0==None)
+ * For further explanation see description of ILU.
+ **/
+HYPRE_Int HYPRE_BoomerAMGSetILULocalReordering( HYPRE_Solver solver,
+                                                HYPRE_Int    ilu_reordering_type);
+
+/**
+ * (Optional) Set iterative ILU's algorithm type.
+ * For further explanation see \e HYPRE_ILUSetIterativeSetupType.
+ **/
+HYPRE_Int HYPRE_BoomerAMGSetILUIterSetupType( HYPRE_Solver solver,
+                                              HYPRE_Int    ilu_iter_setup_type);
+
+/**
+ * (Optional) Set iterative ILU's option.
+ * For further explanation see \e HYPRE_ILUSetIterativeSetupOption.
+ **/
+HYPRE_Int HYPRE_BoomerAMGSetILUIterSetupOption( HYPRE_Solver solver,
+                                                HYPRE_Int    ilu_iter_setup_option);
+
+/**
+ * (Optional) Set iterative ILU's max. number of iterations.
+ * For further explanation see \e HYPRE_ILUSetIterativeSetupMaxIter.
+ **/
+HYPRE_Int HYPRE_BoomerAMGSetILUIterSetupMaxIter( HYPRE_Solver solver,
+                                                 HYPRE_Int    ilu_iter_setup_max_iter);
+
+/**
+ * (Optional) Set iterative ILU's tolerance.
+ * For further explanation see \e HYPRE_ILUSetIterativeSetupTolerance.
+ **/
+HYPRE_Int HYPRE_BoomerAMGSetILUIterSetupTolerance( HYPRE_Solver solver,
+                                                   HYPRE_Real    ilu_iter_setup_tolerance);
+
+/**
+ * (Optional) Defines the algorithm type for setting up FSAI
+ * For further explanation see \e HYPRE_FSAISetAlgoType.
+ **/
+HYPRE_Int HYPRE_BoomerAMGSetFSAIAlgoType(HYPRE_Solver solver,
+                                         HYPRE_Int    algo_type);
+
+/**
+ * (Optional) Sets the solver type for solving local linear systems in FSAI.
+ * For further explanation see \e HYPRE_FSAISetLocalSolveType.
+ **/
+HYPRE_Int HYPRE_BoomerAMGSetFSAILocalSolveType( HYPRE_Solver solver,
+                                                HYPRE_Int    local_solve_type );
+
+/**
+ * (Optional) Defines maximum number of steps for FSAI.
+ * For further explanation see \e HYPRE_FSAISetMaxSteps.
+ **/
+HYPRE_Int HYPRE_BoomerAMGSetFSAIMaxSteps(HYPRE_Solver solver,
+                                         HYPRE_Int    max_steps);
+
+/**
+ * (Optional) Defines maximum step size for FSAI.
+ * For further explanation see \e HYPRE_FSAISetMaxStepSize.
+ **/
+HYPRE_Int HYPRE_BoomerAMGSetFSAIMaxStepSize(HYPRE_Solver solver,
+                                            HYPRE_Int    max_step_size);
+
+/**
+ * (Optional) Defines maximum number of nonzero entries per row for FSAI.
+ * For further explanation see \e HYPRE_FSAISetMaxNnzRow.
+ **/
+HYPRE_Int HYPRE_BoomerAMGSetFSAIMaxNnzRow(HYPRE_Solver solver,
+                                          HYPRE_Int    max_nnz_row);
+
+/**
+ * (Optional) Defines number of levels for computing the candidate pattern for FSAI
+ * For further explanation see \e HYPRE_FSAISetNumLevels.
+ **/
+HYPRE_Int HYPRE_BoomerAMGSetFSAINumLevels(HYPRE_Solver solver,
+                                          HYPRE_Int    num_levels);
+
+/**
+ * (Optional) Defines the threshold for computing the candidate pattern for FSAI
+ * For further explanation see \e HYPRE_FSAISetThreshold.
+ **/
+HYPRE_Int HYPRE_BoomerAMGSetFSAIThreshold(HYPRE_Solver solver,
+                                          HYPRE_Real   threshold);
+
+/**
+ * (Optional) Defines maximum number of iterations for estimating the
+ * largest eigenvalue of the FSAI preconditioned matrix (G^T * G * A).
+ * For further explanation see \e HYPRE_FSAISetEigMaxIters.
+ **/
+HYPRE_Int HYPRE_BoomerAMGSetFSAIEigMaxIters(HYPRE_Solver solver,
+                                            HYPRE_Int    eig_max_iters);
+
+/**
+ * (Optional) Defines the kaporin dropping tolerance.
+ * For further explanation see \e HYPRE_FSAISetKapTolerance.
+ **/
+HYPRE_Int HYPRE_BoomerAMGSetFSAIKapTolerance(HYPRE_Solver solver,
+                                             HYPRE_Real   kap_tolerance);
 
 /**
  * (Optional) Defines which parallel restriction operator is used.
@@ -1157,7 +1332,7 @@ HYPRE_Int HYPRE_BoomerAMGSetPrintLevel(HYPRE_Solver solver,
 
 /**
  * (Optional) Requests additional computations for diagnostic and similar
- * data to be logged by the user. Default to 0 for do nothing.  The latest
+ * data to be logged by the user. Default to 0 to do nothing.  The latest
  * residual will be available if logging > 1.
  **/
 HYPRE_Int HYPRE_BoomerAMGSetLogging(HYPRE_Solver solver,
@@ -1202,7 +1377,7 @@ HYPRE_Int HYPRE_BoomerAMGSetModuleRAP2(HYPRE_Solver solver,
  * (Recommended for efficient use on GPUs)
  **/
 HYPRE_Int HYPRE_BoomerAMGSetKeepTranspose(HYPRE_Solver solver,
-                                      HYPRE_Int    keepTranspose);
+                                          HYPRE_Int    keepTranspose);
 
 /**
  * HYPRE_BoomerAMGSetPlotGrids
@@ -1237,7 +1412,7 @@ HYPRE_Int HYPRE_BoomerAMGSetCoordinates (HYPRE_Solver  solver,
  * @param cgrid [IN/ OUT] preallocated array. On return, contains grid hierarchy info.
  **/
 HYPRE_Int HYPRE_BoomerAMGGetGridHierarchy(HYPRE_Solver solver,
-                                                  HYPRE_Int *cgrid );
+                                          HYPRE_Int *cgrid );
 
 #ifdef HYPRE_USING_DSUPERLU
 /**
@@ -1251,7 +1426,7 @@ HYPRE_Int HYPRE_BoomerAMGGetGridHierarchy(HYPRE_Solver solver,
  **/
 
 HYPRE_Int HYPRE_BoomerAMGSetDSLUThreshold (HYPRE_Solver solver,
-                                HYPRE_Int    slu_threshold);
+                                           HYPRE_Int    slu_threshold);
 #endif
 
 /**
@@ -1271,8 +1446,8 @@ HYPRE_Int HYPRE_BoomerAMGSetCPoints(HYPRE_Solver  solver,
  * (Optional) Deprecated function. Use HYPRE_BoomerAMGSetCPoints instead.
  **/
 HYPRE_Int HYPRE_BoomerAMGSetCpointsToKeep(HYPRE_Solver solver,
-				HYPRE_Int  cpt_coarse_level,
-				HYPRE_Int  num_cpt_coarse,
+                                          HYPRE_Int  cpt_coarse_level,
+                                          HYPRE_Int  num_cpt_coarse,
                                           HYPRE_BigInt *cpt_coarse_index);
 
 /**
@@ -1425,7 +1600,7 @@ HYPRE_BoomerAMGDDSetNumGhostLayers( HYPRE_Solver solver,
  **/
 HYPRE_Int
 HYPRE_BoomerAMGDDSetUserFACRelaxation( HYPRE_Solver solver,
-   HYPRE_Int (*userFACRelaxation)( void *amgdd_vdata, HYPRE_Int level, HYPRE_Int cycle_param ) );
+                                       HYPRE_Int (*userFACRelaxation)( void *amgdd_vdata, HYPRE_Int level, HYPRE_Int cycle_param ) );
 
 /**
  * (Optional) Get the underlying AMG hierarchy as a HYPRE_Solver object.
@@ -1450,6 +1625,180 @@ HYPRE_BoomerAMGDDGetNumIterations( HYPRE_Solver   solver,
 
 /**@}*/
 
+/*--------------------------------------------------------------------------
+ *--------------------------------------------------------------------------*/
+
+/**
+ * @name ParCSR FSAI Solver and Preconditioner
+ *
+ * An adaptive factorized sparse approximate inverse solver/preconditioner/smoother
+ * that computes a sparse approximation G to the inverse of the lower cholesky
+ * factor of A such that M^{-1} \approx G^T * G.
+ *
+ * @{
+ **/
+
+/**
+ * Create a solver object.
+ **/
+HYPRE_Int HYPRE_FSAICreate( HYPRE_Solver *solver );
+
+/**
+ * Destroy a solver object.
+ **/
+HYPRE_Int HYPRE_FSAIDestroy( HYPRE_Solver solver );
+
+/**
+ * Set up the FSAI solver or preconditioner.
+ * If used as a preconditioner, this function should be passed
+ * to the iterative solver \e SetPrecond function.
+ *
+ * @param solver [IN] object to be set up.
+ * @param A [IN] ParCSR matrix used to construct the solver/preconditioner.
+ * @param b Ignored by this function.
+ * @param x Ignored by this function.
+ **/
+HYPRE_Int HYPRE_FSAISetup( HYPRE_Solver       solver,
+                           HYPRE_ParCSRMatrix A,
+                           HYPRE_ParVector    b,
+                           HYPRE_ParVector    x );
+
+/**
+ * Solve the system or apply FSAI as a preconditioner.
+ * If used as a preconditioner, this function should be passed
+ * to the iterative solver \e SetPrecond function.
+ *
+ * @param solver [IN] solver or preconditioner object to be applied.
+ * @param A [IN] ParCSR matrix, matrix of the linear system to be solved
+ * @param b [IN] right hand side of the linear system to be solved
+ * @param x [OUT] approximated solution of the linear system to be solved
+ **/
+HYPRE_Int HYPRE_FSAISolve( HYPRE_Solver       solver,
+                           HYPRE_ParCSRMatrix A,
+                           HYPRE_ParVector    b,
+                           HYPRE_ParVector    x );
+
+/**
+ * (Optional) Sets the algorithm type used to compute the lower triangular factor G
+ *
+ *      - 1: Adaptive (can use OpenMP with static scheduling)
+ *      - 2: Adaptive OpenMP with dynamic scheduling
+ *      - 3: Static - power pattern
+ **/
+HYPRE_Int HYPRE_FSAISetAlgoType( HYPRE_Solver solver,
+                                 HYPRE_Int    algo_type );
+
+/**
+ * (Optional) Sets the solver type for solving local linear systems in FSAI. This
+ * option makes sense only for GPU runs.
+ *
+ *      - 0: Gauss-Jordan solver
+ *      - 1: Vendor solver (cuSOLVER/rocSOLVER)
+ *      - 2: MAGMA solver
+ **/
+HYPRE_Int HYPRE_FSAISetLocalSolveType( HYPRE_Solver solver,
+                                       HYPRE_Int    local_solve_type );
+
+/**
+ * (Optional) Sets the maximum number of steps for computing the sparsity
+ * pattern of G. This input parameter makes sense when using adaptive FSAI,
+ * i.e., algorithm type 1 or 2.
+ **/
+HYPRE_Int HYPRE_FSAISetMaxSteps( HYPRE_Solver solver,
+                                 HYPRE_Int    max_steps );
+
+/**
+ * (Optional) Sets the maximum step size for computing the sparsity pattern of G.
+ * This input parameter makes sense when using adaptive FSAI, i.e., algorithm
+ * type 1 or 2.
+ **/
+HYPRE_Int HYPRE_FSAISetMaxStepSize( HYPRE_Solver solver,
+                                    HYPRE_Int    max_step_size );
+
+/**
+ * (Optional) Sets the maximum number of off-diagonal entries per row of G.
+ * This input parameter makes sense when using static FSAI, i.e., algorithm
+ * type 3.
+ **/
+HYPRE_Int HYPRE_FSAISetMaxNnzRow( HYPRE_Solver solver,
+                                  HYPRE_Int    max_nnz_row );
+
+/**
+ * (Optional) Sets the number of levels for computing the candidate pattern of G.
+ * This input parameter must be a positive integer and it makes sense
+ * when using static FSAI, i.e., algorithm type 3.
+ **/
+HYPRE_Int HYPRE_FSAISetNumLevels( HYPRE_Solver solver,
+                                  HYPRE_Int    num_levels );
+
+/**
+ * (Optional) Sets the threshold for computing the candidate pattern of G
+ * This input parameter makes sense when using static FSAI, i.e., algorithm
+ * type 3.
+ **/
+HYPRE_Int HYPRE_FSAISetThreshold( HYPRE_Solver solver,
+                                  HYPRE_Real   threshold );
+
+/**
+ * (Optional) Sets the kaporin gradient reduction factor for computing the
+ * sparsity pattern of G. This input parameter makes sense when using adaptive
+ * FSAI, i.e., algorithm types 1 or 2.
+ **/
+HYPRE_Int HYPRE_FSAISetKapTolerance( HYPRE_Solver solver,
+                                     HYPRE_Real   kap_tolerance );
+
+/**
+ * (Optional) Sets the relaxation factor for FSAI. This input parameter makes
+ * sense to all algorithm types for setting up FSAI.
+ **/
+HYPRE_Int HYPRE_FSAISetOmega( HYPRE_Solver solver,
+                              HYPRE_Real   omega );
+
+/**
+ * (Optional) Sets the maximum number of iterations (sweeps) for FSAI. This
+ * input parameter makes sense to all algorithm types for setting up FSAI.
+ **/
+HYPRE_Int HYPRE_FSAISetMaxIterations( HYPRE_Solver solver,
+                                      HYPRE_Int    max_iterations );
+
+/**
+ * (Optional) Set number of iterations for computing maximum
+ * eigenvalue of the preconditioned operator. This input parameter makes
+ * sense to all algorithm types for setting up FSAI.
+ **/
+HYPRE_Int HYPRE_FSAISetEigMaxIters( HYPRE_Solver solver,
+                                    HYPRE_Int    eig_max_iters );
+
+/**
+ * (Optional) Set the convergence tolerance, if FSAI is used
+ * as a solver. This input parameter makes sense to all algorithm types
+ * for setting up FSAI. When using FSAI as a preconditioner, set the
+ * tolerance to 0.0. The default is \f$10^{-6}\f$.
+ **/
+HYPRE_Int HYPRE_FSAISetTolerance( HYPRE_Solver solver,
+                                  HYPRE_Real   tolerance );
+
+/**
+ * (Optional) Requests automatic printing of setup information.
+ *
+ *    - 0 : no printout (default)
+ *    - 1 : print setup information
+ **/
+HYPRE_Int HYPRE_FSAISetPrintLevel(HYPRE_Solver solver,
+                                  HYPRE_Int    print_level);
+
+/**
+ * (Optional) Use a zero initial guess. This allows the solver to cut corners
+ * in the case where a zero initial guess is needed (e.g., for preconditioning)
+ * to reduce compuational cost.
+ **/
+HYPRE_Int HYPRE_FSAISetZeroGuess(HYPRE_Solver solver,
+                                 HYPRE_Int    zero_guess);
+
+
+/**@}*/
+
+
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
 
@@ -2191,9 +2540,9 @@ HYPRE_Int HYPRE_ADSDestroy(HYPRE_Solver solver);
  * @param b Ignored by this function.
  * @param x Ignored by this function.
  **/
-HYPRE_Int HYPRE_ADSSetup(HYPRE_Solver       solver ,
-                         HYPRE_ParCSRMatrix A ,
-                         HYPRE_ParVector    b ,
+HYPRE_Int HYPRE_ADSSetup(HYPRE_Solver       solver,
+                         HYPRE_ParCSRMatrix A,
+                         HYPRE_ParVector    b,
                          HYPRE_ParVector    x);
 
 /**
@@ -2206,32 +2555,32 @@ HYPRE_Int HYPRE_ADSSetup(HYPRE_Solver       solver ,
  * @param b [IN] right hand side of the linear system to be solved
  * @param x [OUT] approximated solution of the linear system to be solved
  **/
-HYPRE_Int HYPRE_ADSSolve(HYPRE_Solver       solver ,
-                         HYPRE_ParCSRMatrix A ,
-                         HYPRE_ParVector    b ,
+HYPRE_Int HYPRE_ADSSolve(HYPRE_Solver       solver,
+                         HYPRE_ParCSRMatrix A,
+                         HYPRE_ParVector    b,
                          HYPRE_ParVector    x);
 
 /**
  * Sets the discrete curl matrix \e C.
  * This function should be called before HYPRE_ADSSetup()!
  **/
-HYPRE_Int HYPRE_ADSSetDiscreteCurl(HYPRE_Solver       solver ,
+HYPRE_Int HYPRE_ADSSetDiscreteCurl(HYPRE_Solver       solver,
                                    HYPRE_ParCSRMatrix C);
 
 /**
  * Sets the discrete gradient matrix \e G.
  * This function should be called before HYPRE_ADSSetup()!
  **/
-HYPRE_Int HYPRE_ADSSetDiscreteGradient(HYPRE_Solver       solver ,
+HYPRE_Int HYPRE_ADSSetDiscreteGradient(HYPRE_Solver       solver,
                                        HYPRE_ParCSRMatrix G);
 
 /**
  * Sets the \e x, \e y and \e z coordinates of the vertices in the mesh.
  * This function should be called before HYPRE_ADSSetup()!
  **/
-HYPRE_Int HYPRE_ADSSetCoordinateVectors(HYPRE_Solver    solver ,
-                                        HYPRE_ParVector x ,
-                                        HYPRE_ParVector y ,
+HYPRE_Int HYPRE_ADSSetCoordinateVectors(HYPRE_Solver    solver,
+                                        HYPRE_ParVector x,
+                                        HYPRE_ParVector y,
                                         HYPRE_ParVector z);
 
 /**
@@ -2282,7 +2631,7 @@ HYPRE_Int HYPRE_ADSSetInterpolations(HYPRE_Solver       solver,
  * as a solver. To use ADS as a preconditioner, set the maximum
  * number of iterations to 1. The default is 20.
  **/
-HYPRE_Int HYPRE_ADSSetMaxIter(HYPRE_Solver solver ,
+HYPRE_Int HYPRE_ADSSetMaxIter(HYPRE_Solver solver,
                               HYPRE_Int    maxit);
 
 /**
@@ -2290,7 +2639,7 @@ HYPRE_Int HYPRE_ADSSetMaxIter(HYPRE_Solver solver ,
  * as a solver. When using ADS as a preconditioner, set the tolerance
  * to 0.0. The default is \f$10^{-6}\f$.
  **/
-HYPRE_Int HYPRE_ADSSetTol(HYPRE_Solver solver ,
+HYPRE_Int HYPRE_ADSSetTol(HYPRE_Solver solver,
                           HYPRE_Real   tol);
 
 /**
@@ -2311,7 +2660,7 @@ HYPRE_Int HYPRE_ADSSetTol(HYPRE_Solver solver ,
  *
  * The default is 1. See the user's manual for more details.
  **/
-HYPRE_Int HYPRE_ADSSetCycleType(HYPRE_Solver solver ,
+HYPRE_Int HYPRE_ADSSetCycleType(HYPRE_Solver solver,
                                 HYPRE_Int    cycle_type);
 
 /**
@@ -2319,7 +2668,7 @@ HYPRE_Int HYPRE_ADSSetCycleType(HYPRE_Solver solver ,
  * solution iterations.
  * The default is 1 (print residual norm at each step).
  **/
-HYPRE_Int HYPRE_ADSSetPrintLevel(HYPRE_Solver solver ,
+HYPRE_Int HYPRE_ADSSetPrintLevel(HYPRE_Solver solver,
                                  HYPRE_Int    print_level);
 
 /**
@@ -2334,19 +2683,19 @@ HYPRE_Int HYPRE_ADSSetPrintLevel(HYPRE_Solver solver ,
  *    - 4  : truncated version of \f$\ell_1\f$-scaled block symmetric Gauss-Seidel/SSOR
  *    - 16 : Chebyshev
  **/
-HYPRE_Int HYPRE_ADSSetSmoothingOptions(HYPRE_Solver solver ,
-                                       HYPRE_Int    relax_type ,
-                                       HYPRE_Int    relax_times ,
-                                       HYPRE_Real   relax_weight ,
+HYPRE_Int HYPRE_ADSSetSmoothingOptions(HYPRE_Solver solver,
+                                       HYPRE_Int    relax_type,
+                                       HYPRE_Int    relax_times,
+                                       HYPRE_Real   relax_weight,
                                        HYPRE_Real   omega);
 
 /**
  * (Optional) Sets parameters for Chebyshev relaxation.
  * The defaults are 2, 0.3.
  **/
-HYPRE_Int HYPRE_ADSSetChebySmoothingOptions(HYPRE_Solver solver ,
-                                            HYPRE_Int    cheby_order ,
-                                            HYPRE_Int    cheby_fraction);
+HYPRE_Int HYPRE_ADSSetChebySmoothingOptions(HYPRE_Solver solver,
+                                            HYPRE_Int    cheby_order,
+                                            HYPRE_Real   cheby_fraction);
 
 /**
  * (Optional) Sets AMS parameters for \f$B_C\f$.
@@ -2355,37 +2704,37 @@ HYPRE_Int HYPRE_ADSSetChebySmoothingOptions(HYPRE_Solver solver ,
  * interface of HYPRE_ADSSetInterpolations is being used!
  * See the user's manual for more details.
  **/
-HYPRE_Int HYPRE_ADSSetAMSOptions(HYPRE_Solver solver ,
-                                 HYPRE_Int    cycle_type ,
-                                 HYPRE_Int    coarsen_type ,
-                                 HYPRE_Int    agg_levels ,
-                                 HYPRE_Int    relax_type ,
-                                 HYPRE_Real   strength_threshold ,
-                                 HYPRE_Int    interp_type ,
+HYPRE_Int HYPRE_ADSSetAMSOptions(HYPRE_Solver solver,
+                                 HYPRE_Int    cycle_type,
+                                 HYPRE_Int    coarsen_type,
+                                 HYPRE_Int    agg_levels,
+                                 HYPRE_Int    relax_type,
+                                 HYPRE_Real   strength_threshold,
+                                 HYPRE_Int    interp_type,
                                  HYPRE_Int    Pmax);
 
 /**
  * (Optional) Sets AMG parameters for \f$B_\Pi\f$.
  * The defaults are 10, 1, 3, 0.25, 0, 0. See the user's manual for more details.
  **/
-HYPRE_Int HYPRE_ADSSetAMGOptions(HYPRE_Solver solver ,
-                                 HYPRE_Int    coarsen_type ,
-                                 HYPRE_Int    agg_levels ,
-                                 HYPRE_Int    relax_type ,
-                                 HYPRE_Real   strength_threshold ,
-                                 HYPRE_Int    interp_type ,
+HYPRE_Int HYPRE_ADSSetAMGOptions(HYPRE_Solver solver,
+                                 HYPRE_Int    coarsen_type,
+                                 HYPRE_Int    agg_levels,
+                                 HYPRE_Int    relax_type,
+                                 HYPRE_Real   strength_threshold,
+                                 HYPRE_Int    interp_type,
                                  HYPRE_Int    Pmax);
 
 /**
  * Returns the number of iterations taken.
  **/
-HYPRE_Int HYPRE_ADSGetNumIterations(HYPRE_Solver  solver ,
+HYPRE_Int HYPRE_ADSGetNumIterations(HYPRE_Solver  solver,
                                     HYPRE_Int    *num_iterations);
 
 /**
  * Returns the norm of the final relative residual.
  **/
-HYPRE_Int HYPRE_ADSGetFinalRelativeResidualNorm(HYPRE_Solver  solver ,
+HYPRE_Int HYPRE_ADSGetFinalRelativeResidualNorm(HYPRE_Solver  solver,
                                                 HYPRE_Real   *rel_resid_norm);
 
 /**@}*/
@@ -2427,7 +2776,7 @@ HYPRE_Int HYPRE_ParCSRPCGSetTol(HYPRE_Solver solver,
                                 HYPRE_Real   tol);
 
 HYPRE_Int HYPRE_ParCSRPCGSetAbsoluteTol(HYPRE_Solver solver,
-                                  HYPRE_Real   tol);
+                                        HYPRE_Real   tol);
 
 HYPRE_Int HYPRE_ParCSRPCGSetMaxIter(HYPRE_Solver solver,
                                     HYPRE_Int    max_iter);
@@ -2449,6 +2798,9 @@ HYPRE_Int HYPRE_ParCSRPCGSetPrecond(HYPRE_Solver            solver,
                                     HYPRE_PtrToParSolverFcn precond_setup,
                                     HYPRE_Solver            precond_solver);
 
+HYPRE_Int HYPRE_ParCSRPCGSetPreconditioner(HYPRE_Solver solver,
+                                           HYPRE_Solver precond);
+
 HYPRE_Int HYPRE_ParCSRPCGGetPrecond(HYPRE_Solver  solver,
                                     HYPRE_Solver *precond_data);
 
@@ -2485,13 +2837,17 @@ HYPRE_Int HYPRE_ParCSRDiagScale(HYPRE_Solver       solver,
                                 HYPRE_ParVector    Hy,
                                 HYPRE_ParVector    Hx);
 
-/* Setup routine for on-processor triangular solve as preconditioning. */
+/**
+ * Setup routine for on-processor triangular solve as preconditioning.
+ **/
 HYPRE_Int HYPRE_ParCSROnProcTriSetup(HYPRE_Solver       solver,
                                      HYPRE_ParCSRMatrix HA,
                                      HYPRE_ParVector    Hy,
                                      HYPRE_ParVector    Hx);
 
-/* Solve routine for on-processor triangular solve as preconditioning. */
+/**
+ * Solve routine for on-processor triangular solve as preconditioning.
+ **/
 HYPRE_Int HYPRE_ParCSROnProcTriSolve(HYPRE_Solver       solver,
                                      HYPRE_ParCSRMatrix HA,
                                      HYPRE_ParVector    Hy,
@@ -2579,7 +2935,7 @@ HYPRE_Int HYPRE_ParCSRGMRESGetFinalRelativeResidualNorm(HYPRE_Solver  solver,
  * Returns the residual.
  **/
 HYPRE_Int HYPRE_ParCSRGMRESGetResidual(HYPRE_Solver     solver,
-                                     HYPRE_ParVector *residual);
+                                       HYPRE_ParVector *residual);
 
 
 /* ParCSR CO-GMRES, author: KS */
@@ -2588,7 +2944,7 @@ HYPRE_Int HYPRE_ParCSRGMRESGetResidual(HYPRE_Solver     solver,
  * Create a solver object.
  **/
 HYPRE_Int HYPRE_ParCSRCOGMRESCreate(MPI_Comm      comm,
-                                  HYPRE_Solver *solver);
+                                    HYPRE_Solver *solver);
 
 /**
  * Destroy a solver object.
@@ -2596,64 +2952,64 @@ HYPRE_Int HYPRE_ParCSRCOGMRESCreate(MPI_Comm      comm,
 HYPRE_Int HYPRE_ParCSRCOGMRESDestroy(HYPRE_Solver solver);
 
 HYPRE_Int HYPRE_ParCSRCOGMRESSetup(HYPRE_Solver       solver,
-                                 HYPRE_ParCSRMatrix A,
-                                 HYPRE_ParVector    b,
-                                 HYPRE_ParVector    x);
+                                   HYPRE_ParCSRMatrix A,
+                                   HYPRE_ParVector    b,
+                                   HYPRE_ParVector    x);
 
 HYPRE_Int HYPRE_ParCSRCOGMRESSolve(HYPRE_Solver       solver,
-                                 HYPRE_ParCSRMatrix A,
-                                 HYPRE_ParVector    b,
-                                 HYPRE_ParVector    x);
+                                   HYPRE_ParCSRMatrix A,
+                                   HYPRE_ParVector    b,
+                                   HYPRE_ParVector    x);
 
 HYPRE_Int HYPRE_ParCSRCOGMRESSetKDim(HYPRE_Solver solver,
-                                   HYPRE_Int    k_dim);
+                                     HYPRE_Int    k_dim);
 
 HYPRE_Int HYPRE_ParCSRCOGMRESSetUnroll(HYPRE_Solver solver,
-                                   HYPRE_Int    unroll);
+                                       HYPRE_Int    unroll);
 
 HYPRE_Int HYPRE_ParCSRCOGMRESSetCGS(HYPRE_Solver solver,
-                                   HYPRE_Int    cgs);
+                                    HYPRE_Int    cgs);
 
 HYPRE_Int HYPRE_ParCSRCOGMRESSetTol(HYPRE_Solver solver,
-                                  HYPRE_Real   tol);
+                                    HYPRE_Real   tol);
 
 HYPRE_Int HYPRE_ParCSRCOGMRESSetAbsoluteTol(HYPRE_Solver solver,
-                                          HYPRE_Real   a_tol);
+                                            HYPRE_Real   a_tol);
 
 /*
  * RE-VISIT
  **/
 HYPRE_Int HYPRE_ParCSRCOGMRESSetMinIter(HYPRE_Solver solver,
-                                      HYPRE_Int    min_iter);
+                                        HYPRE_Int    min_iter);
 
 HYPRE_Int HYPRE_ParCSRCOGMRESSetMaxIter(HYPRE_Solver solver,
-                                      HYPRE_Int    max_iter);
+                                        HYPRE_Int    max_iter);
 
 HYPRE_Int HYPRE_ParCSRCOGMRESSetPrecond(HYPRE_Solver             solver,
-                                      HYPRE_PtrToParSolverFcn  precond,
-                                      HYPRE_PtrToParSolverFcn  precond_setup,
-                                      HYPRE_Solver             precond_solver);
+                                        HYPRE_PtrToParSolverFcn  precond,
+                                        HYPRE_PtrToParSolverFcn  precond_setup,
+                                        HYPRE_Solver             precond_solver);
 
 HYPRE_Int HYPRE_ParCSRCOGMRESGetPrecond(HYPRE_Solver  solver,
-                                      HYPRE_Solver *precond_data);
+                                        HYPRE_Solver *precond_data);
 
 HYPRE_Int HYPRE_ParCSRCOGMRESSetLogging(HYPRE_Solver solver,
-                                      HYPRE_Int    logging);
+                                        HYPRE_Int    logging);
 
 HYPRE_Int HYPRE_ParCSRCOGMRESSetPrintLevel(HYPRE_Solver solver,
-                                         HYPRE_Int    print_level);
+                                           HYPRE_Int    print_level);
 
 HYPRE_Int HYPRE_ParCSRCOGMRESGetNumIterations(HYPRE_Solver  solver,
-                                            HYPRE_Int    *num_iterations);
+                                              HYPRE_Int    *num_iterations);
 
 HYPRE_Int HYPRE_ParCSRCOGMRESGetFinalRelativeResidualNorm(HYPRE_Solver  solver,
-                                                        HYPRE_Real   *norm);
+                                                          HYPRE_Real   *norm);
 
 /**
  * Returns the residual.
  **/
 HYPRE_Int HYPRE_ParCSRCOGMRESGetResidual(HYPRE_Solver     solver,
-                                     HYPRE_ParVector *residual);
+                                         HYPRE_ParVector *residual);
 
 /* end of parCSR CO-GMRES */
 
@@ -2732,7 +3088,7 @@ HYPRE_Int HYPRE_ParCSRFlexGMRESGetFinalRelativeResidualNorm(HYPRE_Solver  solver
                                                             HYPRE_Real   *norm);
 
 HYPRE_Int HYPRE_ParCSRFlexGMRESGetResidual(HYPRE_Solver     solver,
-                                     HYPRE_ParVector *residual);
+                                           HYPRE_ParVector *residual);
 
 
 HYPRE_Int HYPRE_ParCSRFlexGMRESSetModifyPC( HYPRE_Solver           solver,
@@ -2815,7 +3171,7 @@ HYPRE_Int HYPRE_ParCSRLGMRESGetFinalRelativeResidualNorm(HYPRE_Solver  solver,
                                                          HYPRE_Real   *norm);
 
 HYPRE_Int HYPRE_ParCSRLGMRESGetResidual(HYPRE_Solver     solver,
-                                     HYPRE_ParVector *residual);
+                                        HYPRE_ParVector *residual);
 
 /**@}*/
 
@@ -2888,7 +3244,7 @@ HYPRE_Int HYPRE_ParCSRBiCGSTABGetFinalRelativeResidualNorm(HYPRE_Solver  solver,
                                                            HYPRE_Real   *norm);
 
 HYPRE_Int HYPRE_ParCSRBiCGSTABGetResidual(HYPRE_Solver     solver,
-                                     HYPRE_ParVector *residual);
+                                          HYPRE_ParVector *residual);
 
 /**@}*/
 
@@ -3347,7 +3703,7 @@ HYPRE_Int
 HYPRE_ParCSRHybridSetAggNumLevels(HYPRE_Solver solver,
                                   HYPRE_Int    agg_num_levels);
 
-/*
+/**
  * (Optional) Defines the interpolation used on levels of aggressive coarsening
  * The default is 4, i.e. multipass interpolation.
  * The following options exist:
@@ -3403,7 +3759,7 @@ HYPRE_ParCSRHybridSetNodal(HYPRE_Solver solver,
  **/
 HYPRE_Int
 HYPRE_ParCSRHybridSetKeepTranspose(HYPRE_Solver solver,
-                           HYPRE_Int    keepT);
+                                   HYPRE_Int    keepT);
 
 /**
  * (Optional) Sets whether to use non-Galerkin option
@@ -3413,8 +3769,8 @@ HYPRE_ParCSRHybridSetKeepTranspose(HYPRE_Solver solver,
  **/
 HYPRE_Int
 HYPRE_ParCSRHybridSetNonGalerkinTol(HYPRE_Solver solver,
-                           HYPRE_Int   num_levels,
-                           HYPRE_Real *nongalerkin_tol);
+                                    HYPRE_Int   num_levels,
+                                    HYPRE_Real *nongalerkin_tol);
 
 /**
  * Retrieves the total number of iterations.
@@ -3577,29 +3933,30 @@ HYPRE_Int HYPRE_MGRDirectSolverCreate( HYPRE_Solver *solver );
 HYPRE_Int HYPRE_MGRDirectSolverDestroy( HYPRE_Solver solver );
 
 /**
- * Setup the MGR direct solver using DSUPERLU
+ * Setup the MGR direct solver using SuperLU_dist
+ *
  * @param solver [IN] object to be set up.
  * @param A [IN] ParCSR matrix used to construct the solver/preconditioner.
  * @param b right-hand-side of the linear system to be solved (Ignored by this function).
  * @param x approximate solution of the linear system to be solved (Ignored by this function).
  **/
 HYPRE_Int HYPRE_MGRDirectSolverSetup( HYPRE_Solver solver,
-                         HYPRE_ParCSRMatrix A,
-                         HYPRE_ParVector b,
-                         HYPRE_ParVector x      );
+                                      HYPRE_ParCSRMatrix A,
+                                      HYPRE_ParVector b,
+                                      HYPRE_ParVector x );
 
- /**
- * Solve the system using DSUPERLU.
- *
- * @param solver [IN] solver or preconditioner object to be applied.
- * @param A [IN] ParCSR matrix, matrix of the linear system to be solved (Ignored by this function).
- * @param b [IN] right hand side of the linear system to be solved
- * @param x [OUT] approximated solution of the linear system to be solved
- **/
+/**
+* Solve the system using SuperLU_dist.
+*
+* @param solver [IN] solver or preconditioner object to be applied.
+* @param A [IN] ParCSR matrix, matrix of the linear system to be solved (Ignored by this function).
+* @param b [IN] right hand side of the linear system to be solved
+* @param x [OUT] approximated solution of the linear system to be solved
+**/
 HYPRE_Int HYPRE_MGRDirectSolverSolve( HYPRE_Solver solver,
-                         HYPRE_ParCSRMatrix A,
-                         HYPRE_ParVector b,
-                         HYPRE_ParVector x      );
+                                      HYPRE_ParCSRMatrix A,
+                                      HYPRE_ParVector b,
+                                      HYPRE_ParVector x );
 #endif
 
 /**
@@ -3623,24 +3980,24 @@ HYPRE_Int HYPRE_MGRDestroy( HYPRE_Solver solver );
  * @param x approximate solution of the linear system to be solved (Ignored by this function).
  **/
 HYPRE_Int HYPRE_MGRSetup( HYPRE_Solver solver,
-                         HYPRE_ParCSRMatrix A,
-                         HYPRE_ParVector b,
-                         HYPRE_ParVector x      );
-
- /**
- * Solve the system or apply MGR as a preconditioner.
- * If used as a preconditioner, this function should be passed
- * to the iterative solver \e SetPrecond function.
- *
- * @param solver [IN] solver or preconditioner object to be applied.
- * @param A [IN] ParCSR matrix, matrix of the linear system to be solved
- * @param b [IN] right hand side of the linear system to be solved
- * @param x [OUT] approximated solution of the linear system to be solved
- **/
+                          HYPRE_ParCSRMatrix A,
+                          HYPRE_ParVector b,
+                          HYPRE_ParVector x );
+
+/**
+* Solve the system or apply MGR as a preconditioner.
+* If used as a preconditioner, this function should be passed
+* to the iterative solver \e SetPrecond function.
+*
+* @param solver [IN] solver or preconditioner object to be applied.
+* @param A [IN] ParCSR matrix, matrix of the linear system to be solved
+* @param b [IN] right hand side of the linear system to be solved
+* @param x [OUT] approximated solution of the linear system to be solved
+**/
 HYPRE_Int HYPRE_MGRSolve( HYPRE_Solver solver,
-                         HYPRE_ParCSRMatrix A,
-                         HYPRE_ParVector b,
-                         HYPRE_ParVector x      );
+                          HYPRE_ParCSRMatrix A,
+                          HYPRE_ParVector b,
+                          HYPRE_ParVector x );
 
 /**
  * Set the block data assuming that the physical variables are ordered contiguously,
@@ -3653,11 +4010,11 @@ HYPRE_Int HYPRE_MGRSolve( HYPRE_Solver solver,
  * @param block_coarse_indexes [IN] index for each block coarse point per level
  **/
 HYPRE_Int HYPRE_MGRSetCpointsByContiguousBlock( HYPRE_Solver solver,
-                         HYPRE_Int  block_size,
-                         HYPRE_Int max_num_levels,
-                         HYPRE_BigInt *idx_array,
-                         HYPRE_Int *num_block_coarse_points,
-                         HYPRE_Int  **block_coarse_indexes);
+                                                HYPRE_Int  block_size,
+                                                HYPRE_Int max_num_levels,
+                                                HYPRE_BigInt *idx_array,
+                                                HYPRE_Int *num_block_coarse_points,
+                                                HYPRE_Int  **block_coarse_indexes);
 
 /**
  * Set the block data (by grid points) and prescribe the coarse indexes per block
@@ -3670,14 +4027,11 @@ HYPRE_Int HYPRE_MGRSetCpointsByContiguousBlock( HYPRE_Solver solver,
  * @param block_coarse_indexes [IN] index for each block coarse point per level
  **/
 HYPRE_Int HYPRE_MGRSetCpointsByBlock( HYPRE_Solver solver,
-                         HYPRE_Int  block_size,
-                         HYPRE_Int max_num_levels,
-                         HYPRE_Int *num_block_coarse_points,
-                         HYPRE_Int  **block_coarse_indexes);
+                                      HYPRE_Int  block_size,
+                                      HYPRE_Int max_num_levels,
+                                      HYPRE_Int *num_block_coarse_points,
+                                      HYPRE_Int  **block_coarse_indexes);
 
-/*--------------------------------------------------------------------------
- * HYPRE_Int HYPRE_MGRSetCpointsByPointMarkerArray
- *--------------------------------------------------------------------------*/
 /**
  * Set the coarse indices for the levels using an array of tags for all the
  * local degrees of freedom.
@@ -3691,11 +4045,11 @@ HYPRE_Int HYPRE_MGRSetCpointsByBlock( HYPRE_Solver solver,
  * @param point_marker_array [IN] array of tags for the local degrees of freedom
  **/
 HYPRE_Int HYPRE_MGRSetCpointsByPointMarkerArray( HYPRE_Solver solver,
-                         HYPRE_Int  block_size,
-                         HYPRE_Int  max_num_levels,
-                         HYPRE_Int  *num_block_coarse_points,
-                         HYPRE_Int  **lvl_block_coarse_indexes,
-                         HYPRE_Int  *point_marker_array);
+                                                 HYPRE_Int  block_size,
+                                                 HYPRE_Int  max_num_levels,
+                                                 HYPRE_Int  *num_block_coarse_points,
+                                                 HYPRE_Int  **lvl_block_coarse_indexes,
+                                                 HYPRE_Int  *point_marker_array);
 
 /**
  * (Optional) Set non C-points to F-points.
@@ -3742,15 +4096,17 @@ HYPRE_MGRSetReservedCoarseNodes( HYPRE_Solver solver,
                                  HYPRE_Int reserved_coarse_size,
                                  HYPRE_BigInt *reserved_coarse_nodes );
 
-/* (Optional) Set the level for reducing the reserved Cpoints before the coarse
+/**
+ * (Optional) Set the level for reducing the reserved Cpoints before the coarse
  * grid solve. This is necessary for some applications, such as phase transitions.
  * The default is 0 (no reduction, i.e. keep the reserved cpoints in the coarse grid solve).
+ *
  * The default setup for the reduction is as follows:
- * interp_type = 2
- * restrict_type = 0
- * F-relax method = 99
- * Galerkin coarse grid
-**/
+ *    - Interpolation type: Jacobi (2)
+ *    - Restriction type: Injection (0)
+ *    - F-relaxation type: LU factorization with pivoting (99)
+ *    - Coarse grid type: galerkin (0)
+ **/
 HYPRE_Int
 HYPRE_MGRSetReservedCpointsLevelToKeep( HYPRE_Solver solver, HYPRE_Int level);
 
@@ -3758,7 +4114,8 @@ HYPRE_MGRSetReservedCpointsLevelToKeep( HYPRE_Solver solver, HYPRE_Int level);
  * (Optional) Set the relaxation type for F-relaxation.
  * Currently supports the following flavors of relaxation types
  * as described in the \e BoomerAMGSetRelaxType:
- * \e relax_type 0 - 8, 13, 14, 18, 19, 98.
+ * \e relax_type 0, 3 - 8, 13, 14, 18. Also supports AMG (options 1 and 2)
+ *    and direct solver variants (9, 99, 199). See \e HYPRE_MGRSetLevelFRelaxType for details.
  **/
 HYPRE_Int
 HYPRE_MGRSetRelaxType(HYPRE_Solver solver,
@@ -3770,23 +4127,72 @@ HYPRE_MGRSetRelaxType(HYPRE_Solver solver,
  *
  *    - 0 : Single-level relaxation sweeps for F-relaxation as prescribed by \e MGRSetRelaxType
  *    - 1 : Multi-level relaxation strategy for F-relaxation (V(1,0) cycle currently supported).
+ *
+ *    NOTE: This function will be removed in favor of \e HYPRE_MGRSetLevelFRelaxType!!
  **/
 HYPRE_Int
 HYPRE_MGRSetFRelaxMethod(HYPRE_Solver solver,
                          HYPRE_Int relax_method );
 
+/**
+ * (Optional) This function is an extension of HYPRE_MGRSetFRelaxMethod. It allows setting
+ * the F-relaxation strategy for each MGR level.
+ **/
+HYPRE_Int
+HYPRE_MGRSetLevelFRelaxMethod(HYPRE_Solver solver,
+                              HYPRE_Int *relax_method );
+
+/**
+ * (Optional) Set the relaxation type for F-relaxation at each level.
+ * This function takes precedence over, and will replace \e HYPRE_MGRSetFRelaxMethod
+ * and HYPRE_MGRSetRelaxType.
+ * Options for \e relax_type entries are:
+ *
+ *    - 0, 3 - 8, 13, 14, 18: (as described in \e BoomerAMGSetRelaxType)
+ *    - 1 : Multi-level relaxation strategy for F-relaxation (V(1,0) cycle currently supported).
+ *    - 2 : AMG
+ *    - 9, 99, 199 : Gaussian Elimination variants (GE, GE with pivoting, direct inversion respectively)
+ **/
 HYPRE_Int
-HYPRE_MGRSetLevelFRelaxMethod(HYPRE_Solver solver, HYPRE_Int *relax_method );
+HYPRE_MGRSetLevelFRelaxType(HYPRE_Solver solver,
+                            HYPRE_Int *relax_type );
 
 /**
  * (Optional) Set the strategy for coarse grid computation.
  * Options for \e cg_method are:
  *
  *    - 0 : Galerkin coarse grid computation using RAP.
- *    - 1 : Non-Galerkin coarse grid computation with dropping strategy.
+ *    - 1 - 5 : Non-Galerkin coarse grid computation with dropping strategy.
+ *         - 1: inv(A_FF) approximated by its (block) diagonal inverse
+ *         - 2: CPR-like approximation with inv(A_FF) approximated by its diagonal inverse
+ *         - 3: CPR-like approximation with inv(A_FF) approximated by its block diagonal inverse
+ *         - 4: inv(A_FF) approximated by sparse approximate inverse
+ *         - 5: inv(A_FF) is an empty matrix and coarse level matrix is set to A_CC
+ **/
+HYPRE_Int
+HYPRE_MGRSetCoarseGridMethod(HYPRE_Solver solver,
+                             HYPRE_Int *cg_method );
+
+/**
+ * (Optional) Set the maximum number of nonzeros per row of the coarse grid correction
+ * operator computed in the Non-Galerkin approach. Options for \e max_elmts are:
+ *
+ *     - 0: keep only the (block) diagonal portion of the correction matrix (default).
+ *     - k > 0: keep the (block) diagonal plus the k-th largest entries per row
+ *              of the correction matrix.
+ **/
+HYPRE_Int
+HYPRE_MGRSetNonGalerkinMaxElmts(HYPRE_Solver solver,
+                                HYPRE_Int    max_elmts);
+
+/**
+ * (Optional) Set the maximum number of nonzeros per row of the coarse grid correction
+ * operator computed in the Non-Galerkin approach at each MGR level. For options, see
+ * \e HYPRE_MGRSetNonGalerkinMaxElmts.
  **/
 HYPRE_Int
-HYPRE_MGRSetCoarseGridMethod(HYPRE_Solver solver, HYPRE_Int *cg_method );
+HYPRE_MGRSetLevelNonGalerkinMaxElmts(HYPRE_Solver  solver,
+                                     HYPRE_Int    *max_elmts);
 
 /**
  * (Optional) Set the number of functions for F-relaxation V-cycle.
@@ -3795,7 +4201,8 @@ HYPRE_MGRSetCoarseGridMethod(HYPRE_Solver solver, HYPRE_Int *cg_method );
  * to the number of scalar PDEs in the system.
  **/
 HYPRE_Int
-HYPRE_MGRSetLevelFRelaxNumFunctions(HYPRE_Solver solver, HYPRE_Int *num_functions);
+HYPRE_MGRSetLevelFRelaxNumFunctions(HYPRE_Solver solver,
+                                    HYPRE_Int *num_functions);
 
 /**
  * (Optional) Set the strategy for computing the MGR restriction operator.
@@ -3808,6 +4215,9 @@ HYPRE_MGRSetLevelFRelaxNumFunctions(HYPRE_Solver solver, HYPRE_Int *num_function
  *    - 3    : approximate inverse
  *    - 4    : pAIR distance 1
  *    - 5    : pAIR distance 2
+ *    - 12   : Block Jacobi
+ *    - 13   : CPR-like restriction operator
+ *    - 14   : (Block) Column-lumped restriction
  *    - else : use classical modified interpolation
  *
  * The default is injection.
@@ -3816,6 +4226,10 @@ HYPRE_Int
 HYPRE_MGRSetRestrictType( HYPRE_Solver solver,
                           HYPRE_Int restrict_type);
 
+/**
+ * (Optional) This function is an extension of \e HYPRE_MGRSetRestrictType. It allows setting
+ * the restriction operator strategy for each MGR level.
+ **/
 HYPRE_Int
 HYPRE_MGRSetLevelRestrictType( HYPRE_Solver solver,
                                HYPRE_Int *restrict_type);
@@ -3833,10 +4247,11 @@ HYPRE_MGRSetNumRestrictSweeps( HYPRE_Solver solver,
  * Options for \e interp_type are:
  *
  *    - 0    : injection \f$[0  I]^{T}\f$
- *    - 1    : unscaled (not recommended)
+ *    - 1    : L1-Jacobi
  *    - 2    : diagonal scaling (Jacobi)
  *    - 3    : classical modified interpolation
  *    - 4    : approximate inverse
+ *    - 12   : Block Jacobi
  *    - else : classical modified interpolation
  *
  * The default is diagonal scaling.
@@ -3845,6 +4260,10 @@ HYPRE_Int
 HYPRE_MGRSetInterpType( HYPRE_Solver solver,
                         HYPRE_Int interp_type );
 
+/**
+ * (Optional) This function is an extension of \e HYPRE_MGRSetInterpType. It allows setting
+ * the prolongation (interpolation) operator strategy for each MGR level.
+ **/
 HYPRE_Int
 HYPRE_MGRSetLevelInterpType( HYPRE_Solver solver,
                              HYPRE_Int *interp_type );
@@ -3857,6 +4276,14 @@ HYPRE_Int
 HYPRE_MGRSetNumRelaxSweeps( HYPRE_Solver solver,
                             HYPRE_Int nsweeps );
 
+/**
+ * (Optional) This function is an extension of \e HYPRE_MGRSetNumRelaxSweeps. It allows setting
+ * the number of single-level relaxation sweeps for each MGR level.
+ **/
+HYPRE_Int
+HYPRE_MGRSetLevelNumRelaxSweeps( HYPRE_Solver solver,
+                                 HYPRE_Int *nsweeps );
+
 /**
  * (Optional) Set number of interpolation sweeps.
  * This option is for \e interp_type > 2.
@@ -3865,67 +4292,121 @@ HYPRE_Int
 HYPRE_MGRSetNumInterpSweeps( HYPRE_Solver solver,
                              HYPRE_Int nsweeps );
 
+/**
+ * (Optional) Set block size for block (global) smoother and interp/restriction.
+ * This option is for \e interp_type/restrict_type == 12, and
+ * \e smooth_type == 0 or 1.
+ **/
+HYPRE_Int
+HYPRE_MGRSetBlockJacobiBlockSize( HYPRE_Solver solver,
+                                  HYPRE_Int blk_size );
 
-HYPRE_Int HYPRE_MGRSetFSolver(HYPRE_Solver          solver,
-                             HYPRE_PtrToParSolverFcn  fine_grid_solver_solve,
-                             HYPRE_PtrToParSolverFcn  fine_grid_solver_setup,
-                             HYPRE_Solver          fsolver );
+/**
+ * (Optional) Set the fine grid solver.
+ *
+ * @param solver [IN] MGR solver/preconditioner object
+ * @param fine_grid_solver_solve [IN] solve routine
+ * @param fine_grid_solver_setup [IN] setup routine
+ * @param fine_grid_solver [IN] fine grid solver object
+ **/
+HYPRE_Int HYPRE_MGRSetFSolver(HYPRE_Solver             solver,
+                              HYPRE_PtrToParSolverFcn  fine_grid_solver_solve,
+                              HYPRE_PtrToParSolverFcn  fine_grid_solver_setup,
+                              HYPRE_Solver             fsolver );
 
+/**
+ * (Optional) Set the F-relaxation solver at a given level.
+ *
+ * @param solver [IN] MGR solver/preconditioner object
+ * @param fsolver [IN] F-relaxation solver object
+ * @param level [IN] MGR solver level
+ **/
+HYPRE_Int HYPRE_MGRSetFSolverAtLevel(HYPRE_Solver  solver,
+                                     HYPRE_Solver  fsolver,
+                                     HYPRE_Int     level );
+
+/**
+ * (Optional) Extract A_FF block from matrix A.
+ *
+ * TODO (VPM): Does this need to be exposed? Move to parcsr_mv?
+ **/
 HYPRE_Int HYPRE_MGRBuildAff(HYPRE_ParCSRMatrix A,
-                               HYPRE_Int *CF_marker,
-                               HYPRE_Int debug_flag,
-                               HYPRE_ParCSRMatrix *A_ff);
+                            HYPRE_Int *CF_marker,
+                            HYPRE_Int debug_flag,
+                            HYPRE_ParCSRMatrix *A_ff);
 
 /**
  * (Optional) Set the coarse grid solver.
  * Currently uses BoomerAMG.
  * The default, if not set, is BoomerAMG with default options.
  *
- * @param solver [IN] solver or preconditioner object
+ * @param solver [IN] MGR solver/preconditioner object
  * @param coarse_grid_solver_solve [IN] solve routine for BoomerAMG
  * @param coarse_grid_solver_setup [IN] setup routine for BoomerAMG
- * @param coarse_grid_solver [IN] BoomerAMG solver
+ * @param coarse_grid_solver [IN] coarse grid solver object
  **/
-HYPRE_Int HYPRE_MGRSetCoarseSolver(HYPRE_Solver          solver,
-                             HYPRE_PtrToParSolverFcn  coarse_grid_solver_solve,
-                             HYPRE_PtrToParSolverFcn  coarse_grid_solver_setup,
-                             HYPRE_Solver          coarse_grid_solver );
+HYPRE_Int HYPRE_MGRSetCoarseSolver(HYPRE_Solver             solver,
+                                   HYPRE_PtrToParSolverFcn  coarse_grid_solver_solve,
+                                   HYPRE_PtrToParSolverFcn  coarse_grid_solver_setup,
+                                   HYPRE_Solver             coarse_grid_solver );
 
 /**
- * (Optional) Set the print level to print setup and solve information.
+ * @brief (Optional) Set the verbosity level for MGR.
  *
- *    - 0 : no printout (default)
- *    - 1 : print setup information
- *    - 2 : print solve information
- *    - 3 : print both setup and solve information
+ * @details Control what information gets printed by specifying the output levels
+ * using this function. Each option corresponds to a specific type of information, and you
+ * can activate several of them at the same time by summing their respective numeric codes,
+*  which are given below:
+ *
+ *   - 1:   Print MGR's setup information.
+ *   - 2:   Print MGR's solve information.
+ *   - 4:   Print MGR's parameters information.
+ *   - 8:   Set print mode for matrices and vectors to ASCII (binary mode is used by default)
+ *   - 16:  Print the finest level matrix to NP files where NP is the number of ranks.
+ *   - 32:  Print the finest level right-hand-side to NP files.
+ *   - 64:  Print the coarsest level matrix to NP files.
+ *   - 128: Print the full MGR hierarchy (operator, interpolation, and restriction).
+ *
+ * @param solver [IN] The solver to configure.
+ * @param print_level [IN] The desired output level.
+ *
+ * @example To print setup information (1); fine matrix (16) and rhs (32) to binary files,
+ * set \c print_level to 49 (1 + 16 + 32). In the previous example, to use ASCII
+ * files for matrices and vectors, set \c print_level to 57 (1 + 8 + 16 + 32).
+ *
+ * @note The default print level is zero, which means no information will be
+ * printed by default. Options starting from 8 are intended for developers' usage.
  **/
 HYPRE_Int
 HYPRE_MGRSetPrintLevel( HYPRE_Solver solver,
                         HYPRE_Int print_level );
 
+/**
+ * (Optional) Set the print level of the F-relaxation solver
+ **/
 HYPRE_Int
 HYPRE_MGRSetFrelaxPrintLevel( HYPRE_Solver solver,
-                        HYPRE_Int print_level );
-                        
+                              HYPRE_Int print_level );
+
+/**
+ * (Optional) Set the print level of the coarse grid solver
+ **/
 HYPRE_Int
 HYPRE_MGRSetCoarseGridPrintLevel( HYPRE_Solver solver,
-                        HYPRE_Int print_level );                        
+                                  HYPRE_Int print_level );
 
 /**
- * (Optional) Set the threshold to compress the coarse grid at each level
- * Use threshold = 0.0 if no truncation is applied. Otherwise, set the threshold
- * value for dropping entries for the coarse grid.
- * The default is 0.0.
+ * (Optional) Set the threshold for dropping small entries on the coarse grid at each level.
+ * No dropping is applied if \e threshold = 0.0 (default).
  **/
 HYPRE_Int
 HYPRE_MGRSetTruncateCoarseGridThreshold( HYPRE_Solver solver,
-                        HYPRE_Real threshold);
-
+                                         HYPRE_Real threshold);
 
 /**
  * (Optional) Requests logging of solver diagnostics.
  * Requests additional computations for diagnostic and similar
- * data to be logged by the user. Default to 0 for do nothing.  The latest
+ * data to be logged by the user. Default is 0, do nothing.  The latest
  * residual will be available if logging > 1.
  **/
 HYPRE_Int
@@ -3953,27 +4434,100 @@ HYPRE_MGRSetTol( HYPRE_Solver solver,
  * Default is 0 (no global smoothing).
  **/
 HYPRE_Int
-HYPRE_MGRSetMaxGlobalsmoothIters( HYPRE_Solver solver,
+HYPRE_MGRSetMaxGlobalSmoothIters( HYPRE_Solver solver,
                                   HYPRE_Int smooth_iter );
 
+/**
+ * (Optional) Determines how many sweeps of global smoothing to do on each level.
+ * Default is 0 (no global smoothing).
+ **/
+HYPRE_Int
+HYPRE_MGRSetLevelSmoothIters( HYPRE_Solver solver,
+                              HYPRE_Int *smooth_iters );
+/**
+ * (Optional) Set the cycle for global smoothing.
+ * Options for \e global_smooth_cycle are:
+ *    - 1 : Pre-smoothing - Down cycle (default)
+ *    - 2 : Post-smoothing - Up cycle
+ **/
+HYPRE_Int
+HYPRE_MGRSetGlobalSmoothCycle( HYPRE_Solver solver,
+                               HYPRE_Int global_smooth_cycle );
+
 /**
  * (Optional) Determines type of global smoother.
  * Options for \e smooth_type are:
  *
- *    - 0 : block Jacobi (default)
- *    - 1 : Jacobi
- *    - 2 : Gauss-Seidel, sequential (very slow!)
- *    - 3 : Gauss-Seidel, interior points in parallel, boundary sequential (slow!)
- *    - 4 : hybrid Gauss-Seidel or SOR, forward solve
- *    - 5 : hybrid Gauss-Seidel or SOR, backward solve
- *    - 6 : hybrid chaotic Gauss-Seidel (works only with OpenMP)
- *    - 7 : hybrid symmetric Gauss-Seidel or SSOR
- *    - 8 : Euclid (ILU)
+ *    -  0 : block Jacobi (default)
+ *    -  1 : block Gauss-Seidel
+ *    -  2 : Jacobi
+ *    -  3 : Gauss-Seidel, sequential (very slow!)
+ *    -  4 : Gauss-Seidel, interior points in parallel, boundary sequential (slow!)
+ *    -  5 : hybrid Gauss-Seidel or SOR, forward solve
+ *    -  6 : hybrid Gauss-Seidel or SOR, backward solve
+ *    -  8 : Euclid (ILU)
+ *    - 16 : HYPRE_ILU
+ *    - 18 : L1-Jacobi
  **/
 HYPRE_Int
-HYPRE_MGRSetGlobalsmoothType( HYPRE_Solver solver,
+HYPRE_MGRSetGlobalSmoothType( HYPRE_Solver solver,
                               HYPRE_Int smooth_type );
 
+/**
+ * @brief Sets the type of global smoother for each level in the multigrid reduction (MGR) solver.
+ *
+ * This function allows the user to specify the type of global smoother to be used at each level
+ * of the multigrid reduction process. The types of smoothers available can be found in the
+ * documentation for \e HYPRE_MGRSetGlobalSmoothType. The smoother type for each level is indicated
+ * by the \e smooth_type array, which should have a size equal to \e max_num_coarse_levels.
+ *
+ * @note This function does not take ownership of the \e smooth_type array.
+ * @note If \e smooth_type is a NULL pointer, a default global smoother (Jacobi) is used for all levels.
+ * @note This call is optional. It is intended for advanced users who need specific control over the
+ *       smoothing process at different levels of the solver. If not called, the solver will proceed
+ *       with default smoothing parameters.
+ *
+ * @param[in] \e solver The HYPRE solver object to configure.
+ * @param[in] \e smooth_type An array of integers where each value specifies the type of smoother to
+ *            be used at the corresponding level.
+ *
+ * @return HYPRE_Int Error code (0 for success, non-zero for failure).
+ *
+ * @see HYPRE_MGRSetGlobalSmoothType for details on global smoother options.
+ */
+
+HYPRE_Int
+HYPRE_MGRSetLevelSmoothType(HYPRE_Solver  solver,
+                            HYPRE_Int    *smooth_type);
+
+/**
+ * @brief Sets the global smoother method for a specified MGR level using a HYPRE solver object.
+ *
+ * This function enables solvers within hypre to be used as complex smoothers for a specific level
+ * within the multigrid reduction (MGR) scheme. Users can configure the solver options and pass the
+ * solver in as the smoother. Currently supported solver options via this interface are ILU and AMG.
+ *
+ * @note Unlike some other setup functions that might require an array to set options across multiple
+ *       levels, this function focuses on a single level, identified by the \e level parameter.
+ *
+ * @warning The smoother passed to function takes precedence over the smoother type set for that level
+ *       in the MGR hierarchy.
+ *
+ * @param[in,out] \e solver A pointer to the MGR solver object. This object is modified to include the
+ *                specified smoother for the given level.
+ * @param[in] \e smoother The HYPRE solver object that specifies the global relaxation method to be used
+ *            at the specified level. Currently available choices are BoomerAMG and ILU.
+ * @param[in] \e level The level identifier for which the global relaxation method is to be set.
+ *            Must be within the range of the number of levels in the MGR solver.
+ *
+ * @return HYPRE_Int Returns an error code. Success is indicated by 0, while any non-zero value signifies an error.
+ */
+
+HYPRE_Int
+HYPRE_MGRSetGlobalSmootherAtLevel( HYPRE_Solver  solver,
+                                   HYPRE_Solver  smoother,
+                                   HYPRE_Int     level );
+
 /**
  * (Optional) Return the number of MGR iterations.
  **/
@@ -3981,21 +4535,33 @@ HYPRE_Int
 HYPRE_MGRGetNumIterations( HYPRE_Solver solver,
                            HYPRE_Int *num_iterations );
 
+/**
+ * (Optional) Return the relative residual for the coarse level system.
+ **/
+HYPRE_Int
+HYPRE_MGRGetCoarseGridConvergenceFactor( HYPRE_Solver solver,
+                                         HYPRE_Real *conv_factor );
+
+/**
+ * (Optional) Set the maximum number of nonzeros per row for interpolation operators.
+ **/
 HYPRE_Int
-HYPRE_MGRGetCoarseGridConvergenceFactor (HYPRE_Solver solver, HYPRE_Real *conv_factor );
+HYPRE_MGRSetPMaxElmts( HYPRE_Solver solver,
+                       HYPRE_Int P_max_elmts );
 
 /**
- * (Optional) Set the number of maximum points for interpolation operator.
+ * (Optional) Set the maximum number of nonzeros per row for interpolation operators for each level.
  **/
 HYPRE_Int
-HYPRE_MGRSetPMaxElmts( HYPRE_Solver solver, HYPRE_Int P_max_elmts);
+HYPRE_MGRSetLevelPMaxElmts( HYPRE_Solver solver,
+                            HYPRE_Int *P_max_elmts );
 
 /**
  * (Optional) Return the norm of the final relative residual.
  **/
 HYPRE_Int
-HYPRE_MGRGetFinalRelativeResidualNorm(  HYPRE_Solver solver,
-                                        HYPRE_Real *res_norm );
+HYPRE_MGRGetFinalRelativeResidualNorm( HYPRE_Solver solver,
+                                       HYPRE_Real *res_norm );
 
 /**@}*/
 
@@ -4004,7 +4570,7 @@ HYPRE_MGRGetFinalRelativeResidualNorm(  HYPRE_Solver solver,
 /**
  * @name ParCSR ILU Solver
  *
- * (Parallel) ILU smoother
+ * (Parallel) Incomplete LU factorization.
  *
  * @{
  **/
@@ -4012,12 +4578,14 @@ HYPRE_MGRGetFinalRelativeResidualNorm(  HYPRE_Solver solver,
 /**
  * Create a solver object
  **/
-HYPRE_Int HYPRE_ILUCreate( HYPRE_Solver *solver );
+HYPRE_Int
+HYPRE_ILUCreate( HYPRE_Solver *solver );
 
 /**
  * Destroy a solver object
  **/
-HYPRE_Int HYPRE_ILUDestroy( HYPRE_Solver solver );
+HYPRE_Int
+HYPRE_ILUDestroy( HYPRE_Solver solver );
 
 /**
  * Setup the ILU solver or preconditioner.
@@ -4029,24 +4597,26 @@ HYPRE_Int HYPRE_ILUDestroy( HYPRE_Solver solver );
  * @param b right-hand-side of the linear system to be solved (Ignored by this function).
  * @param x approximate solution of the linear system to be solved (Ignored by this function).
  **/
-HYPRE_Int HYPRE_ILUSetup( HYPRE_Solver solver,
-                         HYPRE_ParCSRMatrix A,
-                         HYPRE_ParVector b,
-                         HYPRE_ParVector x      );
- /**
- * Solve the system or apply ILU as a preconditioner.
- * If used as a preconditioner, this function should be passed
- * to the iterative solver \e SetPrecond function.
- *
- * @param solver [IN] solver or preconditioner object to be applied.
- * @param A [IN] ParCSR matrix, matrix of the linear system to be solved
- * @param b [IN] right hand side of the linear system to be solved
- * @param x [OUT] approximated solution of the linear system to be solved
- **/
-HYPRE_Int HYPRE_ILUSolve( HYPRE_Solver solver,
-                         HYPRE_ParCSRMatrix A,
-                         HYPRE_ParVector b,
-                         HYPRE_ParVector x      );
+HYPRE_Int
+HYPRE_ILUSetup( HYPRE_Solver solver,
+                HYPRE_ParCSRMatrix A,
+                HYPRE_ParVector b,
+                HYPRE_ParVector x      );
+/**
+* Solve the system or apply ILU as a preconditioner.
+* If used as a preconditioner, this function should be passed
+* to the iterative solver \e SetPrecond function.
+*
+* @param solver [IN] solver or preconditioner object to be applied.
+* @param A [IN] ParCSR matrix, matrix of the linear system to be solved
+* @param b [IN] right hand side of the linear system to be solved
+* @param x [OUT] approximated solution of the linear system to be solved
+**/
+HYPRE_Int
+HYPRE_ILUSolve( HYPRE_Solver solver,
+                HYPRE_ParCSRMatrix A,
+                HYPRE_ParVector b,
+                HYPRE_ParVector x      );
 
 /**
  * (Optional) Set maximum number of iterations if used as a solver.
@@ -4056,7 +4626,82 @@ HYPRE_Int
 HYPRE_ILUSetMaxIter( HYPRE_Solver solver, HYPRE_Int max_iter );
 
 /**
- * (Optional) Set the convergence tolerance for the ILU smoother.
+ * (Optional) Set the algorithm type to compute the ILU factorization. Options are:
+ *
+ *    -  0 : Non-iterative algorithm (default)
+ *    -  1 : Asynchronous with in-place storage
+ *    -  2 : Asynchronous with explicit storage splitting
+ *    -  3 : Synchronous with explicit storage splitting
+ *    -  4 : Semi-synchronous with explicit storage splitting
+ *
+ * Note: Iterative ILU is available only for zero fill-in and it depends on rocSPARSE.
+ **/
+HYPRE_Int
+HYPRE_ILUSetIterativeSetupType( HYPRE_Solver solver, HYPRE_Int iter_setup_type );
+
+/**
+ * (Optional) Set the compute option for iterative ILU in an additive fashion, i.e.; multiple
+ * options can be turned on by summing their respective numeric codes as given below:
+ *
+ *    -  2: Use stopping tolerance to finish the algorithm
+ *    -  4: Compute correction norms
+ *    -  8: Compute residual norms
+ *    - 16: Save convergence history
+ *    - 32: Use rocSPARSE's internal COO format
+ *
+ * The iterative ILU algorithm can terminate based on the maximum number of iterations (default)
+ * or a target tolerance (option 2). In the tolerance-based case, the max. number of iterations
+ * is still used to terminate the algorithm in case it does not converge to the requested
+ * tolerance. In addition, the tolerance-based mode uses residual norms by default (option 8).
+ * To use correction norms instead, enable option 4. Lastly, the convergence history for
+ * computing the triangular factors can be saved and printed out by enabling option 16.
+ *
+ * Note: Iterative ILU is available only for zero fill-in, and it depends on rocSPARSE.
+ **/
+HYPRE_Int
+HYPRE_ILUSetIterativeSetupOption( HYPRE_Solver solver, HYPRE_Int iter_setup_option );
+
+/**
+ * (Optional) Set the max. number of iterations for the iterative ILU algorithm.
+ *
+ * Note: Iterative ILU is available only for zero fill-in and it depends on rocSPARSE.
+ **/
+HYPRE_Int
+HYPRE_ILUSetIterativeSetupMaxIter( HYPRE_Solver solver, HYPRE_Int iter_setup_max_iter );
+
+/**
+ * (Optional) Set the stop tolerance for the iterative ILU algorithm.
+ *
+ * Note: Iterative ILU is available only for zero fill-in and it depends on rocSPARSE.
+ **/
+HYPRE_Int
+HYPRE_ILUSetIterativeSetupTolerance( HYPRE_Solver solver, HYPRE_Real iter_setup_tolerance );
+
+/**
+ * (Optional) Set triangular solver type. Options are:
+ *
+ *    -  0 : iterative
+ *    -  1 : direct (default)
+ **/
+HYPRE_Int
+HYPRE_ILUSetTriSolve( HYPRE_Solver solver, HYPRE_Int tri_solve );
+
+/**
+ * (Optional) Set number of lower Jacobi iterations for the triangular L solves
+ * Set this to integer > 0 when using iterative tri_solve (0). The default is 5 iterations.
+ **/
+HYPRE_Int
+HYPRE_ILUSetLowerJacobiIters( HYPRE_Solver solver, HYPRE_Int lower_jacobi_iterations );
+
+/**
+ * (Optional) Set number of upper Jacobi iterations for the triangular U solves
+ * Set this to integer > 0 when using iterative tri_solve (0). The default is 5 iterations.
+ **/
+HYPRE_Int
+HYPRE_ILUSetUpperJacobiIters( HYPRE_Solver solver, HYPRE_Int upper_jacobi_iterations );
+
+/**
+ * (Optional) Set the convergence tolerance for ILU.
  * Use tol = 0.0 if ILU is used as a preconditioner. The default is 1.e-7.
  **/
 HYPRE_Int
@@ -4098,7 +4743,7 @@ HYPRE_Int
 HYPRE_ILUSetDropThresholdArray( HYPRE_Solver solver, HYPRE_Real *threshold );
 
 /**
- * (Optional) Set the threshold for dropping in Newton–Schulz–Hotelling iteration (NHS-ILU).
+ * (Optional) Set the threshold for dropping in Newton–Schulz–Hotelling iteration (NSH-ILU).
  * Any entries less than this threshold are dropped when forming the approximate inverse matrix.
  * The default is 1.0e-2.
  **/
@@ -4107,7 +4752,7 @@ HYPRE_ILUSetNSHDropThreshold( HYPRE_Solver solver, HYPRE_Real threshold );
 
 /**
  * (Optional) Set the array of thresholds for dropping in Newton–Schulz–Hotelling
- * iteration (for NHS-ILU).  Any fill-in less than thresholds is dropped when
+ * iteration (for NSH-ILU).  Any fill-in less than thresholds is dropped when
  * forming the approximate inverse matrix.
  *
  *    - threshold[0] : threshold for Minimal Residual iteration (initial guess for NSH).
@@ -4284,62 +4929,62 @@ GenerateRSVarDifConv(MPI_Comm         comm,
                      HYPRE_Int        type);
 
 float*
-GenerateCoordinates(MPI_Comm  comm,
-                    HYPRE_BigInt nx,
-                    HYPRE_BigInt ny,
-                    HYPRE_BigInt nz,
-                    HYPRE_Int P,
-                    HYPRE_Int Q,
-                    HYPRE_Int R,
-                    HYPRE_Int p,
-                    HYPRE_Int q,
-                    HYPRE_Int r,
-                    HYPRE_Int coorddim);
+hypre_GenerateCoordinates(MPI_Comm  comm,
+                          HYPRE_BigInt nx,
+                          HYPRE_BigInt ny,
+                          HYPRE_BigInt nz,
+                          HYPRE_Int P,
+                          HYPRE_Int Q,
+                          HYPRE_Int R,
+                          HYPRE_Int p,
+                          HYPRE_Int q,
+                          HYPRE_Int r,
+                          HYPRE_Int coorddim);
 
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
 
-/*
+/**
  * (Optional) Switches on use of Jacobi interpolation after computing
  * an original interpolation
  **/
 HYPRE_Int HYPRE_BoomerAMGSetPostInterpType(HYPRE_Solver solver,
                                            HYPRE_Int    post_interp_type);
 
-/*
+/**
  * (Optional) Sets a truncation threshold for Jacobi interpolation.
  **/
 HYPRE_Int HYPRE_BoomerAMGSetJacobiTruncThreshold(HYPRE_Solver solver,
                                                  HYPRE_Real   jacobi_trunc_threshold);
 
-/*
+/**
  * (Optional) Defines the number of relaxation steps for CR
  * The default is 2.
  **/
 HYPRE_Int HYPRE_BoomerAMGSetNumCRRelaxSteps(HYPRE_Solver solver,
                                             HYPRE_Int    num_CR_relax_steps);
 
-/*
+/**
  * (Optional) Defines convergence rate for CR
  * The default is 0.7.
  **/
 HYPRE_Int HYPRE_BoomerAMGSetCRRate(HYPRE_Solver solver,
                                    HYPRE_Real   CR_rate);
 
-/*
+/**
  * (Optional) Defines strong threshold for CR
  * The default is 0.0.
  **/
 HYPRE_Int HYPRE_BoomerAMGSetCRStrongTh(HYPRE_Solver solver,
                                        HYPRE_Real   CR_strong_th);
 
-/*
+/**
  * (Optional) Defines whether to use CG
  **/
 HYPRE_Int HYPRE_BoomerAMGSetCRUseCG(HYPRE_Solver solver,
                                     HYPRE_Int    CR_use_CG);
 
-/*
+/**
  * (Optional) Defines the Type of independent set algorithm used for CR
  **/
 HYPRE_Int HYPRE_BoomerAMGSetISType(HYPRE_Solver solver,
diff --git a/external/hypre/src/parcsr_ls/HYPRE_parcsr_mgr.c b/external/hypre/src/parcsr_ls/HYPRE_parcsr_mgr.c
index 1c80a0d8..4123a6f6 100644
--- a/external/hypre/src/parcsr_ls/HYPRE_parcsr_mgr.c
+++ b/external/hypre/src/parcsr_ls/HYPRE_parcsr_mgr.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -16,7 +16,7 @@ HYPRE_MGRCreate( HYPRE_Solver *solver )
 {
    if (!solver)
    {
-      hypre_error_in_arg(2);
+      hypre_error_in_arg(1);
       return hypre_error_flag;
    }
    *solver = ( (HYPRE_Solver) hypre_MGRCreate( ) );
@@ -30,7 +30,7 @@ HYPRE_MGRCreate( HYPRE_Solver *solver )
 HYPRE_Int
 HYPRE_MGRDestroy( HYPRE_Solver solver )
 {
-   return( hypre_MGRDestroy( (void *) solver ) );
+   return ( hypre_MGRDestroy( (void *) solver ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -39,14 +39,20 @@ HYPRE_MGRDestroy( HYPRE_Solver solver )
 
 HYPRE_Int
 HYPRE_MGRSetup( HYPRE_Solver solver,
-                         HYPRE_ParCSRMatrix A,
-                         HYPRE_ParVector b,
-                         HYPRE_ParVector x      )
+                HYPRE_ParCSRMatrix A,
+                HYPRE_ParVector b,
+                HYPRE_ParVector x      )
 {
-   return( hypre_MGRSetup( (void *) solver,
-                                 (hypre_ParCSRMatrix *) A,
-                                 (hypre_ParVector *) b,
-                                 (hypre_ParVector *) x ) );
+   if (!A)
+   {
+      hypre_error_in_arg(2);
+      return hypre_error_flag;
+   }
+
+   return ( hypre_MGRSetup( (void *) solver,
+                            (hypre_ParCSRMatrix *) A,
+                            (hypre_ParVector *) b,
+                            (hypre_ParVector *) x ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -55,14 +61,32 @@ HYPRE_MGRSetup( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_MGRSolve( HYPRE_Solver solver,
-                         HYPRE_ParCSRMatrix A,
-                         HYPRE_ParVector b,
-                         HYPRE_ParVector x      )
+                HYPRE_ParCSRMatrix A,
+                HYPRE_ParVector b,
+                HYPRE_ParVector x      )
 {
-   return( hypre_MGRSolve( (void *) solver,
-                                 (hypre_ParCSRMatrix *) A,
-                                 (hypre_ParVector *) b,
-                                 (hypre_ParVector *) x ) );
+   if (!A)
+   {
+      hypre_error_in_arg(2);
+      return hypre_error_flag;
+   }
+
+   if (!b)
+   {
+      hypre_error_in_arg(3);
+      return hypre_error_flag;
+   }
+
+   if (!x)
+   {
+      hypre_error_in_arg(4);
+      return hypre_error_flag;
+   }
+
+   return ( hypre_MGRSolve( (void *) solver,
+                            (hypre_ParCSRMatrix *) A,
+                            (hypre_ParVector *) b,
+                            (hypre_ParVector *) x ) );
 }
 
 #ifdef HYPRE_USING_DSUPERLU
@@ -75,12 +99,13 @@ HYPRE_MGRDirectSolverCreate( HYPRE_Solver *solver )
 {
    if (!solver)
    {
-      hypre_error_in_arg(2);
+      hypre_error_in_arg(1);
       return hypre_error_flag;
    }
    *solver = ( (HYPRE_Solver) hypre_MGRDirectSolverCreate( ) );
    return hypre_error_flag;
 }
+
 /*--------------------------------------------------------------------------
  * HYPRE_MGRDirectSolverDestroy
  *--------------------------------------------------------------------------*/
@@ -88,7 +113,7 @@ HYPRE_MGRDirectSolverCreate( HYPRE_Solver *solver )
 HYPRE_Int
 HYPRE_MGRDirectSolverDestroy( HYPRE_Solver solver )
 {
-   return( hypre_MGRDirectSolverDestroy( (void *) solver ) );
+   return ( hypre_MGRDirectSolverDestroy( (void *) solver ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -97,30 +122,30 @@ HYPRE_MGRDirectSolverDestroy( HYPRE_Solver solver )
 
 HYPRE_Int
 HYPRE_MGRDirectSolverSetup( HYPRE_Solver solver,
-                         HYPRE_ParCSRMatrix A,
-                         HYPRE_ParVector b,
-                         HYPRE_ParVector x      )
+                            HYPRE_ParCSRMatrix A,
+                            HYPRE_ParVector b,
+                            HYPRE_ParVector x      )
 {
-   return( hypre_MGRDirectSolverSetup( (void *) solver,
-                                 (hypre_ParCSRMatrix *) A,
-                                 (hypre_ParVector *) b,
-                                 (hypre_ParVector *) x ) );
+   return ( hypre_MGRDirectSolverSetup( (void *) solver,
+                                        (hypre_ParCSRMatrix *) A,
+                                        (hypre_ParVector *) b,
+                                        (hypre_ParVector *) x ) );
 }
 
 /*--------------------------------------------------------------------------
- * HYPRE_MGRSolve
+ * HYPRE_MGRDirectSolverSolve
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
 HYPRE_MGRDirectSolverSolve( HYPRE_Solver solver,
-                         HYPRE_ParCSRMatrix A,
-                         HYPRE_ParVector b,
-                         HYPRE_ParVector x      )
+                            HYPRE_ParCSRMatrix A,
+                            HYPRE_ParVector b,
+                            HYPRE_ParVector x      )
 {
-   return( hypre_MGRDirectSolverSolve( (void *) solver,
-                                 (hypre_ParCSRMatrix *) A,
-                                 (hypre_ParVector *) b,
-                                 (hypre_ParVector *) x ) );
+   return ( hypre_MGRDirectSolverSolve( (void *) solver,
+                                        (hypre_ParCSRMatrix *) A,
+                                        (hypre_ParVector *) b,
+                                        (hypre_ParVector *) x ) );
 }
 #endif
 
@@ -130,13 +155,14 @@ HYPRE_MGRDirectSolverSolve( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_MGRSetCpointsByContiguousBlock( HYPRE_Solver solver,
-      HYPRE_Int  block_size,
-      HYPRE_Int  max_num_levels,
-      HYPRE_BigInt  *idx_array,
-      HYPRE_Int  *block_num_coarse_points,
-      HYPRE_Int  **block_coarse_indexes)
+                                      HYPRE_Int  block_size,
+                                      HYPRE_Int  max_num_levels,
+                                      HYPRE_BigInt  *idx_array,
+                                      HYPRE_Int  *block_num_coarse_points,
+                                      HYPRE_Int  **block_coarse_indexes)
 {
-   return( hypre_MGRSetCpointsByContiguousBlock( (void *) solver, block_size, max_num_levels, idx_array, block_num_coarse_points, block_coarse_indexes));
+   return ( hypre_MGRSetCpointsByContiguousBlock( (void *) solver, block_size, max_num_levels,
+                                                  idx_array, block_num_coarse_points, block_coarse_indexes));
 }
 
 /*--------------------------------------------------------------------------
@@ -145,12 +171,13 @@ HYPRE_MGRSetCpointsByContiguousBlock( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_MGRSetCpointsByBlock( HYPRE_Solver solver,
-			HYPRE_Int  block_size,
-			HYPRE_Int  max_num_levels,
-			HYPRE_Int *block_num_coarse_points,
-			HYPRE_Int  **block_coarse_indexes)
+                            HYPRE_Int  block_size,
+                            HYPRE_Int  max_num_levels,
+                            HYPRE_Int *block_num_coarse_points,
+                            HYPRE_Int  **block_coarse_indexes)
 {
-   return( hypre_MGRSetCpointsByBlock( (void *) solver, block_size, max_num_levels, block_num_coarse_points, block_coarse_indexes));
+   return ( hypre_MGRSetCpointsByBlock( (void *) solver, block_size, max_num_levels,
+                                        block_num_coarse_points, block_coarse_indexes));
 }
 
 /*--------------------------------------------------------------------------
@@ -159,13 +186,14 @@ HYPRE_MGRSetCpointsByBlock( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_MGRSetCpointsByPointMarkerArray( HYPRE_Solver solver,
-      HYPRE_Int  block_size,
-      HYPRE_Int  max_num_levels,
-      HYPRE_Int  *num_block_coarse_points,
-      HYPRE_Int  **lvl_block_coarse_indexes,
-      HYPRE_Int  *point_marker_array)
+                                       HYPRE_Int  block_size,
+                                       HYPRE_Int  max_num_levels,
+                                       HYPRE_Int  *num_block_coarse_points,
+                                       HYPRE_Int  **lvl_block_coarse_indexes,
+                                       HYPRE_Int  *point_marker_array)
 {
-   return( hypre_MGRSetCpointsByPointMarkerArray( (void *) solver, block_size, max_num_levels, num_block_coarse_points, lvl_block_coarse_indexes, point_marker_array));
+   return ( hypre_MGRSetCpointsByPointMarkerArray( (void *) solver, block_size, max_num_levels,
+                                                   num_block_coarse_points, lvl_block_coarse_indexes, point_marker_array));
 }
 
 /*--------------------------------------------------------------------------
@@ -183,21 +211,63 @@ HYPRE_MGRSetNonCpointsToFpoints( HYPRE_Solver solver, HYPRE_Int nonCptToFptFlag)
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-HYPRE_MGRSetFSolver(HYPRE_Solver          solver,
+HYPRE_MGRSetFSolver(HYPRE_Solver             solver,
                     HYPRE_PtrToParSolverFcn  fine_grid_solver_solve,
                     HYPRE_PtrToParSolverFcn  fine_grid_solver_setup,
-                    HYPRE_Solver          fsolver )
+                    HYPRE_Solver             fsolver )
 {
-   return( hypre_MGRSetFSolver( (void *) solver,
-                     (HYPRE_Int (*)(void*, void*, void*, void*)) fine_grid_solver_solve,
-                     (HYPRE_Int (*)(void*, void*, void*, void*)) fine_grid_solver_setup,
-                     (void *) fsolver ) );
+   if (!solver)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+   else if (!fsolver)
+   {
+      hypre_error_in_arg(4);
+      return hypre_error_flag;
+   }
+
+
+   return ( hypre_MGRSetFSolver( (void *) solver,
+                                 (HYPRE_Int (*)(void*, void*, void*, void*)) fine_grid_solver_solve,
+                                 (HYPRE_Int (*)(void*, void*, void*, void*)) fine_grid_solver_setup,
+                                 (void *) fsolver ) );
 }
 
-HYPRE_Int HYPRE_MGRBuildAff(HYPRE_ParCSRMatrix A,
-                               HYPRE_Int *CF_marker,
-                               HYPRE_Int debug_flag,
-                               HYPRE_ParCSRMatrix *A_ff)
+/*--------------------------------------------------------------------------
+ * HYPRE_MGRSetFSolverAtLevel
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_MGRSetFSolverAtLevel(HYPRE_Solver  solver,
+                           HYPRE_Solver  fsolver,
+                           HYPRE_Int     level )
+{
+   if (!solver)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+   else if (!fsolver)
+   {
+      hypre_error_in_arg(2);
+      return hypre_error_flag;
+   }
+
+   return ( hypre_MGRSetFSolverAtLevel( (void *) solver,
+                                        (void *) fsolver,
+                                        level ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_MGRBuildAff
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_MGRBuildAff(HYPRE_ParCSRMatrix A,
+                  HYPRE_Int *CF_marker,
+                  HYPRE_Int debug_flag,
+                  HYPRE_ParCSRMatrix *A_ff)
 {
    return (hypre_MGRBuildAff(A, CF_marker, debug_flag, A_ff));
 }
@@ -207,258 +277,709 @@ HYPRE_Int HYPRE_MGRBuildAff(HYPRE_ParCSRMatrix A,
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-HYPRE_MGRSetCoarseSolver(HYPRE_Solver          solver,
-                             HYPRE_PtrToParSolverFcn  coarse_grid_solver_solve,
-                             HYPRE_PtrToParSolverFcn  coarse_grid_solver_setup,
-                             HYPRE_Solver          coarse_grid_solver )
+HYPRE_MGRSetCoarseSolver(HYPRE_Solver             solver,
+                         HYPRE_PtrToParSolverFcn  coarse_grid_solver_solve,
+                         HYPRE_PtrToParSolverFcn  coarse_grid_solver_setup,
+                         HYPRE_Solver             coarse_grid_solver )
 {
-   return( hypre_MGRSetCoarseSolver( (void *) solver,
-									   (HYPRE_Int (*)(void*, void*, void*, void*)) coarse_grid_solver_solve,
-									   (HYPRE_Int (*)(void*, void*, void*, void*)) coarse_grid_solver_setup,
-									   (void *) coarse_grid_solver ) );
+   if (!solver)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+   else if (!coarse_grid_solver)
+   {
+      hypre_error_in_arg(4);
+      return hypre_error_flag;
+   }
+
+   return ( hypre_MGRSetCoarseSolver( (void *) solver,
+                                      (HYPRE_Int (*)(void*, void*, void*, void*)) coarse_grid_solver_solve,
+                                      (HYPRE_Int (*)(void*, void*, void*, void*)) coarse_grid_solver_setup,
+                                      (void *) coarse_grid_solver ) );
 }
 
 /*--------------------------------------------------------------------------
- * HYPRE_MGRSetMaxLevels
+ * HYPRE_MGRSetMaxCoarseLevels
  *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-HYPRE_MGRSetMaxCoarseLevels( HYPRE_Solver solver, HYPRE_Int maxlev )
+HYPRE_MGRSetMaxCoarseLevels( HYPRE_Solver solver,
+                             HYPRE_Int    maxlev )
 {
+   if (!solver)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
    return hypre_MGRSetMaxCoarseLevels(solver, maxlev);
 }
+
 /*--------------------------------------------------------------------------
  * HYPRE_MGRSetBlockSize
  *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-HYPRE_MGRSetBlockSize( HYPRE_Solver solver, HYPRE_Int bsize )
+HYPRE_MGRSetBlockSize( HYPRE_Solver solver,
+                       HYPRE_Int    bsize )
 {
+   if (!solver)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
    return hypre_MGRSetBlockSize(solver, bsize );
 }
+
 /*--------------------------------------------------------------------------
  * HYPRE_MGRSetReservedCoarseNodes
  *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-HYPRE_MGRSetReservedCoarseNodes( HYPRE_Solver solver, HYPRE_Int reserved_coarse_size, HYPRE_BigInt *reserved_coarse_indexes )
+HYPRE_MGRSetReservedCoarseNodes( HYPRE_Solver  solver,
+                                 HYPRE_Int     reserved_coarse_size,
+                                 HYPRE_BigInt *reserved_coarse_indices )
 {
-   return hypre_MGRSetReservedCoarseNodes(solver, reserved_coarse_size, reserved_coarse_indexes );
+   if (!solver)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+   else if (reserved_coarse_size < 0)
+   {
+      hypre_error_in_arg(2);
+      return hypre_error_flag;
+   }
+   else if (!reserved_coarse_indices)
+   {
+      hypre_error_in_arg(3);
+      return hypre_error_flag;
+   }
+
+   return hypre_MGRSetReservedCoarseNodes(solver, reserved_coarse_size, reserved_coarse_indices);
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_MGRSetReservedCpointsLevelToKeep
  *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-HYPRE_MGRSetReservedCpointsLevelToKeep( HYPRE_Solver solver, HYPRE_Int level)
+HYPRE_MGRSetReservedCpointsLevelToKeep( HYPRE_Solver solver,
+                                        HYPRE_Int    level)
 {
+   if (!solver)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
    return hypre_MGRSetReservedCpointsLevelToKeep((void *) solver, level);
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_MGRSetRestrictType
  *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-HYPRE_MGRSetRestrictType(HYPRE_Solver solver, HYPRE_Int restrict_type )
+HYPRE_MGRSetRestrictType(HYPRE_Solver solver,
+                         HYPRE_Int    restrict_type )
 {
+   if (!solver)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
    return hypre_MGRSetRestrictType(solver, restrict_type );
 }
 
+/*--------------------------------------------------------------------------
+ * HYPRE_MGRSetLevelRestrictType
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-HYPRE_MGRSetLevelRestrictType( HYPRE_Solver solver, HYPRE_Int *restrict_type )
+HYPRE_MGRSetLevelRestrictType( HYPRE_Solver  solver,
+                               HYPRE_Int    *restrict_type )
 {
+   if (!solver)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
    return hypre_MGRSetLevelRestrictType( solver, restrict_type );
 }
 
 /*--------------------------------------------------------------------------
- * HYPRE_MGRSetRelaxMethod
+ * HYPRE_MGRSetFRelaxMethod
  *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-HYPRE_MGRSetFRelaxMethod(HYPRE_Solver solver, HYPRE_Int relax_method )
+HYPRE_MGRSetFRelaxMethod( HYPRE_Solver solver,
+                          HYPRE_Int    relax_method )
 {
+   if (!solver)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
    return hypre_MGRSetFRelaxMethod(solver, relax_method );
 }
 
+/*--------------------------------------------------------------------------
+ * HYPRE_MGRSetLevelFRelaxMethod
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-HYPRE_MGRSetLevelFRelaxMethod( HYPRE_Solver solver, HYPRE_Int *relax_method )
+HYPRE_MGRSetLevelFRelaxMethod( HYPRE_Solver  solver,
+                               HYPRE_Int    *relax_method )
 {
+   if (!solver)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
    return hypre_MGRSetLevelFRelaxMethod( solver, relax_method );
 }
 
+/*--------------------------------------------------------------------------
+ * HYPRE_MGRSetLevelFRelaxType
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_MGRSetLevelFRelaxType( HYPRE_Solver  solver,
+                             HYPRE_Int    *relax_type )
+{
+   if (!solver)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   return hypre_MGRSetLevelFRelaxType( solver, relax_type );
+}
+
 /*--------------------------------------------------------------------------
  * HYPRE_MGRSetCoarseGridMethod
  *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 HYPRE_MGRSetCoarseGridMethod( HYPRE_Solver solver, HYPRE_Int *cg_method )
 {
+   if (!solver)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
    return hypre_MGRSetCoarseGridMethod( solver, cg_method );
 }
 
 /*--------------------------------------------------------------------------
- * HYPRE_MGRSetRelaxNumFunctions
+ * HYPRE_MGRSetNonGalerkinMaxElmts
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_MGRSetNonGalerkinMaxElmts( HYPRE_Solver solver, HYPRE_Int max_elmts )
+{
+   return hypre_MGRSetNonGalerkinMaxElmts( solver, max_elmts );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_MGRSetLevelNonGalerkinMaxElmts
  *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_MGRSetLevelNonGalerkinMaxElmts( HYPRE_Solver solver, HYPRE_Int *max_elmts )
+{
+   return hypre_MGRSetLevelNonGalerkinMaxElmts( solver, max_elmts );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_MGRSetLevelFRelaxNumFunctions
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-HYPRE_MGRSetLevelFRelaxNumFunctions( HYPRE_Solver solver, HYPRE_Int *num_functions )
+HYPRE_MGRSetLevelFRelaxNumFunctions( HYPRE_Solver  solver,
+                                     HYPRE_Int    *num_functions )
 {
+   if (!solver)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
    return hypre_MGRSetLevelFRelaxNumFunctions( solver, num_functions );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_MGRSetRelaxType
  *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-HYPRE_MGRSetRelaxType(HYPRE_Solver solver, HYPRE_Int relax_type )
+HYPRE_MGRSetRelaxType( HYPRE_Solver solver,
+                       HYPRE_Int    relax_type )
 {
+   if (!solver)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
    return hypre_MGRSetRelaxType(solver, relax_type );
 }
+
 /*--------------------------------------------------------------------------
  * HYPRE_MGRSetNumRelaxSweeps
  *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-HYPRE_MGRSetNumRelaxSweeps( HYPRE_Solver solver, HYPRE_Int nsweeps )
+HYPRE_MGRSetNumRelaxSweeps( HYPRE_Solver solver,
+                            HYPRE_Int    nsweeps )
 {
+   if (!solver)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
    return hypre_MGRSetNumRelaxSweeps(solver, nsweeps);
 }
+
+/*--------------------------------------------------------------------------
+ * HYPRE_MGRSetLevelNumRelaxSweeps
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_MGRSetLevelNumRelaxSweeps( HYPRE_Solver  solver,
+                                 HYPRE_Int    *nsweeps )
+{
+   if (!solver)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   return hypre_MGRSetLevelNumRelaxSweeps(solver, nsweeps);
+}
+
 /*--------------------------------------------------------------------------
  * HYPRE_MGRSetInterpType
  *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-HYPRE_MGRSetInterpType( HYPRE_Solver solver, HYPRE_Int interpType )
+HYPRE_MGRSetInterpType( HYPRE_Solver solver,
+                        HYPRE_Int    interpType )
 {
+   if (!solver)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
    return hypre_MGRSetInterpType(solver, interpType);
 }
 
+/*--------------------------------------------------------------------------
+ * HYPRE_MGRSetLevelInterpType
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-HYPRE_MGRSetLevelInterpType( HYPRE_Solver solver, HYPRE_Int *interpType )
+HYPRE_MGRSetLevelInterpType( HYPRE_Solver  solver,
+                             HYPRE_Int    *interpType )
 {
+   if (!solver)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
    return hypre_MGRSetLevelInterpType(solver, interpType);
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_MGRSetNumInterpSweeps
  *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-HYPRE_MGRSetNumInterpSweeps( HYPRE_Solver solver, HYPRE_Int nsweeps )
+HYPRE_MGRSetNumInterpSweeps( HYPRE_Solver solver,
+                             HYPRE_Int    nsweeps )
 {
+   if (!solver)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
    return hypre_MGRSetNumInterpSweeps(solver, nsweeps);
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_MGRSetNumRestrictSweeps
  *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-HYPRE_MGRSetNumRestrictSweeps( HYPRE_Solver solver, HYPRE_Int nsweeps )
+HYPRE_MGRSetNumRestrictSweeps( HYPRE_Solver solver,
+                               HYPRE_Int    nsweeps )
 {
+   if (!solver)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
    return hypre_MGRSetNumRestrictSweeps(solver, nsweeps);
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_MGRSetTruncateCoarseGridThreshold
  *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-HYPRE_MGRSetTruncateCoarseGridThreshold( HYPRE_Solver solver, HYPRE_Real threshold)
+HYPRE_MGRSetTruncateCoarseGridThreshold( HYPRE_Solver solver,
+                                         HYPRE_Real   threshold)
 {
+   if (!solver)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
    return hypre_MGRSetTruncateCoarseGridThreshold( solver, threshold );
 }
 
+/*--------------------------------------------------------------------------
+ * HYPRE_MGRSetBlockJacobiBlockSize
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_MGRSetBlockJacobiBlockSize( HYPRE_Solver solver,
+                                  HYPRE_Int    blk_size )
+{
+   if (!solver)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+   else if (blk_size < 1)
+   {
+      hypre_error_in_arg(2);
+      return hypre_error_flag;
+   }
+
+   return hypre_MGRSetBlockJacobiBlockSize(solver, blk_size);
+}
+
 /*--------------------------------------------------------------------------
  * HYPRE_MGRSetFrelaxPrintLevel
  *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-HYPRE_MGRSetFrelaxPrintLevel( HYPRE_Solver solver, HYPRE_Int print_level )
+HYPRE_MGRSetFrelaxPrintLevel( HYPRE_Solver solver,
+                              HYPRE_Int    print_level )
 {
+   if (!solver)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
    return hypre_MGRSetFrelaxPrintLevel( solver, print_level );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_MGRSetCoarseGridPrintLevel
  *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-HYPRE_MGRSetCoarseGridPrintLevel( HYPRE_Solver solver, HYPRE_Int print_level )
+HYPRE_MGRSetCoarseGridPrintLevel( HYPRE_Solver solver,
+                                  HYPRE_Int    print_level )
 {
+   if (!solver)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
    return hypre_MGRSetCoarseGridPrintLevel( solver, print_level );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_MGRSetPrintLevel
  *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-HYPRE_MGRSetPrintLevel( HYPRE_Solver solver, HYPRE_Int print_level )
+HYPRE_MGRSetPrintLevel( HYPRE_Solver solver,
+                        HYPRE_Int    print_level )
 {
+   if (!solver)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
    return hypre_MGRSetPrintLevel( solver, print_level );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_MGRSetLogging
  *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-HYPRE_MGRSetLogging( HYPRE_Solver solver, HYPRE_Int logging )
+HYPRE_MGRSetLogging( HYPRE_Solver solver,
+                     HYPRE_Int    logging )
 {
+   if (!solver)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
    return hypre_MGRSetLogging(solver, logging );
 }
+
 /*--------------------------------------------------------------------------
  * HYPRE_MGRSetMaxIter
  *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-HYPRE_MGRSetMaxIter( HYPRE_Solver solver, HYPRE_Int max_iter )
+HYPRE_MGRSetMaxIter( HYPRE_Solver solver,
+                     HYPRE_Int    max_iter )
 {
+   if (!solver)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+   else if (max_iter < 0)
+   {
+      hypre_error_in_arg(2);
+      return hypre_error_flag;
+   }
+
    return hypre_MGRSetMaxIter( solver, max_iter );
 }
+
 /*--------------------------------------------------------------------------
  * HYPRE_MGRSetTol
  *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-HYPRE_MGRSetTol( HYPRE_Solver solver, HYPRE_Real tol )
+HYPRE_MGRSetTol( HYPRE_Solver solver,
+                 HYPRE_Real   tol )
 {
+   if (!solver)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+   else if (tol < 0.0)
+   {
+      hypre_error_in_arg(2);
+      return hypre_error_flag;
+   }
+
    return hypre_MGRSetTol( solver, tol );
 }
+
 /*--------------------------------------------------------------------------
  * HYPRE_MGRSetMaxGlobalsmoothIters
  *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_MGRSetMaxGlobalSmoothIters( HYPRE_Solver solver,
+                                  HYPRE_Int    max_iter )
+{
+   if (!solver)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+   else if (max_iter < 0)
+   {
+      hypre_error_in_arg(2);
+      return hypre_error_flag;
+   }
+
+   return hypre_MGRSetMaxGlobalSmoothIters(solver, max_iter);
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_MGRSetLevelsmoothIters
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-HYPRE_MGRSetMaxGlobalsmoothIters( HYPRE_Solver solver, HYPRE_Int max_iter )
+HYPRE_MGRSetLevelSmoothIters( HYPRE_Solver  solver,
+                              HYPRE_Int    *smooth_iters )
 {
-	return hypre_MGRSetMaxGlobalsmoothIters(solver, max_iter);
+   if (!solver)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   return hypre_MGRSetLevelSmoothIters(solver, smooth_iters);
 }
+
 /*--------------------------------------------------------------------------
  * HYPRE_MGRSetGlobalsmoothType
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-HYPRE_MGRSetGlobalsmoothType( HYPRE_Solver solver, HYPRE_Int iter_type )
+HYPRE_MGRSetGlobalSmoothType( HYPRE_Solver solver,
+                              HYPRE_Int    smooth_type )
+{
+   if (!solver)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   return hypre_MGRSetGlobalSmoothType(solver, smooth_type);
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_MGRSetLevelsmoothType
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_MGRSetLevelSmoothType( HYPRE_Solver  solver,
+                             HYPRE_Int    *smooth_type )
+{
+   if (!solver)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   return hypre_MGRSetLevelSmoothType(solver, smooth_type);
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_MGRSetGlobalSmoothCycle
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_MGRSetGlobalSmoothCycle( HYPRE_Solver solver,
+                               HYPRE_Int    global_smooth_cycle )
+{
+   if (!solver)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   return hypre_MGRSetGlobalSmoothCycle(solver, global_smooth_cycle);
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_MGRSetGlobalSmootherAtLevel
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_MGRSetGlobalSmootherAtLevel( HYPRE_Solver  solver,
+                                   HYPRE_Solver  smoother,
+                                   HYPRE_Int     level )
+{
+   if (!solver)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+   else if (!smoother)
+   {
+      hypre_error_in_arg(2);
+      return hypre_error_flag;
+   }
+
+   return hypre_MGRSetGlobalSmootherAtLevel((void*) solver, smoother, level);
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_MGRSetPMaxElmts
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_MGRSetPMaxElmts( HYPRE_Solver solver,
+                       HYPRE_Int    P_max_elmts )
 {
-	return hypre_MGRSetGlobalsmoothType(solver, iter_type);
+   if (!solver)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   return hypre_MGRSetPMaxElmts(solver, P_max_elmts);
 }
 
 /*--------------------------------------------------------------------------
- * HYPRE_MGRSetMaxPElmts
+ * HYPRE_MGRSetLevelPMaxElmts
  *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-HYPRE_MGRSetPMaxElmts( HYPRE_Solver solver, HYPRE_Int P_max_elmts )
+HYPRE_MGRSetLevelPMaxElmts( HYPRE_Solver  solver,
+                            HYPRE_Int    *P_max_elmts )
 {
-  return hypre_MGRSetPMaxElmts(solver, P_max_elmts);
+   if (!solver)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   return hypre_MGRSetLevelPMaxElmts(solver, P_max_elmts);
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_MGRGetCoarseGridConvergenceFactor
  *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-HYPRE_MGRGetCoarseGridConvergenceFactor( HYPRE_Solver solver, HYPRE_Real *conv_factor )
+HYPRE_MGRGetCoarseGridConvergenceFactor( HYPRE_Solver solver,
+                                         HYPRE_Real  *conv_factor )
 {
+   if (!solver)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
    return hypre_MGRGetCoarseGridConvergenceFactor( solver, conv_factor );
 }
 
-
 /*--------------------------------------------------------------------------
  * HYPRE_MGRGetNumIterations
  *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-HYPRE_MGRGetNumIterations( HYPRE_Solver solver, HYPRE_Int *num_iterations )
+HYPRE_MGRGetNumIterations( HYPRE_Solver  solver,
+                           HYPRE_Int    *num_iterations )
 {
+   if (!solver)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
    return hypre_MGRGetNumIterations( solver, num_iterations );
 }
+
 /*--------------------------------------------------------------------------
  * HYPRE_MGRGetFinalRelativeResidualNorm
  *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-HYPRE_MGRGetFinalRelativeResidualNorm(  HYPRE_Solver solver, HYPRE_Real *res_norm )
+HYPRE_MGRGetFinalRelativeResidualNorm( HYPRE_Solver  solver,
+                                       HYPRE_Real   *res_norm )
 {
+   if (!solver)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
    return hypre_MGRGetFinalRelativeResidualNorm(solver, res_norm);
 }
diff --git a/external/hypre/src/parcsr_ls/HYPRE_parcsr_pcg.c b/external/hypre/src/parcsr_ls/HYPRE_parcsr_pcg.c
index ff7aae64..33554980 100644
--- a/external/hypre/src/parcsr_ls/HYPRE_parcsr_pcg.c
+++ b/external/hypre/src/parcsr_ls/HYPRE_parcsr_pcg.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -14,6 +14,8 @@
 HYPRE_Int
 HYPRE_ParCSRPCGCreate( MPI_Comm comm, HYPRE_Solver *solver )
 {
+   HYPRE_UNUSED_VAR(comm);
+
    hypre_PCGFunctions * pcg_functions;
 
    if (!solver)
@@ -43,7 +45,7 @@ HYPRE_ParCSRPCGCreate( MPI_Comm comm, HYPRE_Solver *solver )
 HYPRE_Int
 HYPRE_ParCSRPCGDestroy( HYPRE_Solver solver )
 {
-   return( hypre_PCGDestroy( (void *) solver ) );
+   return ( hypre_PCGDestroy( (void *) solver ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -56,10 +58,10 @@ HYPRE_ParCSRPCGSetup( HYPRE_Solver solver,
                       HYPRE_ParVector b,
                       HYPRE_ParVector x      )
 {
-   return( HYPRE_PCGSetup( solver,
-                           (HYPRE_Matrix) A,
-                           (HYPRE_Vector) b,
-                           (HYPRE_Vector) x ) );
+   return ( HYPRE_PCGSetup( solver,
+                            (HYPRE_Matrix) A,
+                            (HYPRE_Vector) b,
+                            (HYPRE_Vector) x ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -72,10 +74,10 @@ HYPRE_ParCSRPCGSolve( HYPRE_Solver solver,
                       HYPRE_ParVector b,
                       HYPRE_ParVector x      )
 {
-   return( HYPRE_PCGSolve( solver,
-                           (HYPRE_Matrix) A,
-                           (HYPRE_Vector) b,
-                           (HYPRE_Vector) x ) );
+   return ( HYPRE_PCGSolve( solver,
+                            (HYPRE_Matrix) A,
+                            (HYPRE_Vector) b,
+                            (HYPRE_Vector) x ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -86,7 +88,7 @@ HYPRE_Int
 HYPRE_ParCSRPCGSetTol( HYPRE_Solver solver,
                        HYPRE_Real   tol    )
 {
-   return( HYPRE_PCGSetTol( solver, tol ) );
+   return ( HYPRE_PCGSetTol( solver, tol ) );
 }
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRPCGSetAbsoluteTol
@@ -96,7 +98,7 @@ HYPRE_Int
 HYPRE_ParCSRPCGSetAbsoluteTol( HYPRE_Solver solver,
                                HYPRE_Real   a_tol    )
 {
-   return( HYPRE_PCGSetAbsoluteTol( solver, a_tol ) );
+   return ( HYPRE_PCGSetAbsoluteTol( solver, a_tol ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -107,7 +109,7 @@ HYPRE_Int
 HYPRE_ParCSRPCGSetMaxIter( HYPRE_Solver solver,
                            HYPRE_Int    max_iter )
 {
-   return( HYPRE_PCGSetMaxIter( solver, max_iter ) );
+   return ( HYPRE_PCGSetMaxIter( solver, max_iter ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -118,7 +120,7 @@ HYPRE_Int
 HYPRE_ParCSRPCGSetStopCrit( HYPRE_Solver solver,
                             HYPRE_Int    stop_crit )
 {
-   return( HYPRE_PCGSetStopCrit( solver, stop_crit ) );
+   return ( HYPRE_PCGSetStopCrit( solver, stop_crit ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -129,7 +131,7 @@ HYPRE_Int
 HYPRE_ParCSRPCGSetTwoNorm( HYPRE_Solver solver,
                            HYPRE_Int    two_norm )
 {
-   return( HYPRE_PCGSetTwoNorm( solver, two_norm ) );
+   return ( HYPRE_PCGSetTwoNorm( solver, two_norm ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -140,7 +142,7 @@ HYPRE_Int
 HYPRE_ParCSRPCGSetRelChange( HYPRE_Solver solver,
                              HYPRE_Int    rel_change )
 {
-   return( HYPRE_PCGSetRelChange( solver, rel_change ) );
+   return ( HYPRE_PCGSetRelChange( solver, rel_change ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -148,15 +150,26 @@ HYPRE_ParCSRPCGSetRelChange( HYPRE_Solver solver,
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-HYPRE_ParCSRPCGSetPrecond( HYPRE_Solver         solver,
+HYPRE_ParCSRPCGSetPrecond( HYPRE_Solver            solver,
                            HYPRE_PtrToParSolverFcn precond,
                            HYPRE_PtrToParSolverFcn precond_setup,
-                           HYPRE_Solver         precond_solver )
+                           HYPRE_Solver            precond_solver )
 {
-   return( HYPRE_PCGSetPrecond( solver,
-                                (HYPRE_PtrToSolverFcn) precond,
-                                (HYPRE_PtrToSolverFcn) precond_setup,
-                                precond_solver ) );
+   return ( HYPRE_PCGSetPrecond( solver,
+                                 (HYPRE_PtrToSolverFcn) precond,
+                                 (HYPRE_PtrToSolverFcn) precond_setup,
+                                 precond_solver ) );
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_ParCSRPCGSetPreconditioner
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_ParCSRPCGSetPreconditioner( HYPRE_Solver solver,
+                                  HYPRE_Solver precond )
+{
+   return ( HYPRE_PCGSetPreconditioner( solver, precond ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -167,7 +180,7 @@ HYPRE_Int
 HYPRE_ParCSRPCGGetPrecond( HYPRE_Solver  solver,
                            HYPRE_Solver *precond_data_ptr )
 {
-   return( HYPRE_PCGGetPrecond( solver, precond_data_ptr ) );
+   return ( HYPRE_PCGGetPrecond( solver, precond_data_ptr ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -179,7 +192,7 @@ HYPRE_Int
 HYPRE_ParCSRPCGSetPrintLevel( HYPRE_Solver solver,
                               HYPRE_Int level )
 {
-   return( HYPRE_PCGSetPrintLevel( solver, level ) );
+   return ( HYPRE_PCGSetPrintLevel( solver, level ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -191,7 +204,7 @@ HYPRE_Int
 HYPRE_ParCSRPCGSetLogging( HYPRE_Solver solver,
                            HYPRE_Int level )
 {
-   return( HYPRE_PCGSetLogging( solver, level ) );
+   return ( HYPRE_PCGSetLogging( solver, level ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -202,7 +215,7 @@ HYPRE_Int
 HYPRE_ParCSRPCGGetNumIterations( HYPRE_Solver  solver,
                                  HYPRE_Int    *num_iterations )
 {
-   return( HYPRE_PCGGetNumIterations( solver, num_iterations ) );
+   return ( HYPRE_PCGGetNumIterations( solver, num_iterations ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -213,7 +226,7 @@ HYPRE_Int
 HYPRE_ParCSRPCGGetFinalRelativeResidualNorm( HYPRE_Solver  solver,
                                              HYPRE_Real   *norm   )
 {
-   return( HYPRE_PCGGetFinalRelativeResidualNorm( solver, norm ) );
+   return ( HYPRE_PCGGetFinalRelativeResidualNorm( solver, norm ) );
 }
 
 
@@ -223,9 +236,9 @@ HYPRE_ParCSRPCGGetFinalRelativeResidualNorm( HYPRE_Solver  solver,
 
 HYPRE_Int
 HYPRE_ParCSRPCGGetResidual( HYPRE_Solver  solver,
-                                      HYPRE_ParVector *residual   )
+                            HYPRE_ParVector *residual   )
 {
-   return( HYPRE_PCGGetResidual( solver, (void *) residual ) );
+   return ( HYPRE_PCGGetResidual( solver, (void *) residual ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -238,7 +251,12 @@ HYPRE_ParCSRDiagScaleSetup( HYPRE_Solver solver,
                             HYPRE_ParVector y,
                             HYPRE_ParVector x      )
 {
-   return 0;
+   HYPRE_UNUSED_VAR(solver);
+   HYPRE_UNUSED_VAR(A);
+   HYPRE_UNUSED_VAR(y);
+   HYPRE_UNUSED_VAR(x);
+
+   return hypre_error_flag;
 }
 
 /*--------------------------------------------------------------------------
@@ -251,49 +269,9 @@ HYPRE_ParCSRDiagScale( HYPRE_Solver solver,
                        HYPRE_ParVector Hy,
                        HYPRE_ParVector Hx      )
 {
-   return hypre_ParCSRDiagScale(HA, Hy, Hx);
-}
+   HYPRE_UNUSED_VAR(solver);
 
-/*--------------------------------------------------------------------------
- * HYPRE_ParCSRSymPrecondSetup
- *--------------------------------------------------------------------------*/
-
-/*
-
-HYPRE_Int
-HYPRE_ParCSRSymPrecondSetup( HYPRE_Solver solver,
-                             HYPRE_ParCSRMatrix A,
-                             HYPRE_ParVector b,
-                             HYPRE_ParVector x      )
-{
-   hypre_ParCSRMatrix *A = (hypre_ParCSRMatrix *) A;
-   hypre_ParVector    *y = (hypre_ParVector *) b;
-   hypre_ParVector    *x = (hypre_ParVector *) x;
-
-   HYPRE_Real *x_data = hypre_VectorData(hypre_ParVectorLocalVector(x));
-   HYPRE_Real *y_data = hypre_VectorData(hypre_ParVectorLocalVector(y));
-   HYPRE_Real *A_diag = hypre_CSRMatrixData(hypre_ParCSRMatrixDiag(A));
-   HYPRE_Real *A_offd = hypre_CSRMatrixData(hypre_ParCSRMatrixOffD(A));
-
-   HYPRE_Int i, ierr = 0;
-   hypre_ParCSRMatrix *Asym;
-   MPI_Comm comm;
-   HYPRE_Int global_num_rows;
-   HYPRE_Int global_num_cols;
-   HYPRE_Int *row_starts;
-   HYPRE_Int *col_starts;
-   HYPRE_Int num_cols_offd;
-   HYPRE_Int num_nonzeros_diag;
-   HYPRE_Int num_nonzeros_offd;
-
-   Asym = hypre_ParCSRMatrixCreate(comm, global_num_rows, global_num_cols,
-                                   row_starts, col_starts, num_cols_offd,
-                                   num_nonzeros_diag, num_nonzeros_offd);
-
-   for (i=0; i < hypre_VectorSize(hypre_ParVectorLocalVector(x)); i++)
-   {
-      x_data[i] = y_data[i]/A_data[A_i[i]];
-   }
-
-   return ierr;
-} */
+   return hypre_ParCSRDiagScaleVector((hypre_ParCSRMatrix *) HA,
+                                      (hypre_ParVector *)    Hy,
+                                      (hypre_ParVector *)    Hx);
+}
diff --git a/external/hypre/src/parcsr_ls/HYPRE_parcsr_pilut.c b/external/hypre/src/parcsr_ls/HYPRE_parcsr_pilut.c
index c38bf70e..06416b10 100644
--- a/external/hypre/src/parcsr_ls/HYPRE_parcsr_pilut.c
+++ b/external/hypre/src/parcsr_ls/HYPRE_parcsr_pilut.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -38,18 +38,21 @@
  * HYPRE_ParCSRPilutCreate
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_ParCSRPilutCreate( MPI_Comm comm, HYPRE_Solver *solver )
 {
 #ifdef HYPRE_MIXEDINT
-   hypre_error_w_msg(HYPRE_ERROR_GENERIC,"Pilut cannot be used in mixedint mode!");
+   HYPRE_UNUSED_VAR(solver);
+   HYPRE_UNUSED_VAR(comm);
+
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Pilut cannot be used in mixedint mode!");
    return hypre_error_flag;
 #else
 
-   HYPRE_NewDistributedMatrixPilutSolver( comm, NULL, 
-            (HYPRE_DistributedMatrixPilutSolver *) solver);
+   HYPRE_NewDistributedMatrixPilutSolver( comm, NULL,
+                                          (HYPRE_DistributedMatrixPilutSolver *) solver);
 
-   HYPRE_DistributedMatrixPilutSolverInitialize( 
+   HYPRE_DistributedMatrixPilutSolverInitialize(
       (HYPRE_DistributedMatrixPilutSolver) solver );
 
    return hypre_error_flag;
@@ -60,17 +63,19 @@ HYPRE_ParCSRPilutCreate( MPI_Comm comm, HYPRE_Solver *solver )
  * HYPRE_ParCSRPilutDestroy
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_ParCSRPilutDestroy( HYPRE_Solver solver )
 {
 #ifdef HYPRE_MIXEDINT
-   hypre_error_w_msg(HYPRE_ERROR_GENERIC,"Pilut cannot be used in mixedint mode!");
+   HYPRE_UNUSED_VAR(solver);
+
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Pilut cannot be used in mixedint mode!");
    return hypre_error_flag;
 #else
 
    HYPRE_DistributedMatrix mat = HYPRE_DistributedMatrixPilutSolverGetMatrix(
-      (HYPRE_DistributedMatrixPilutSolver) solver );
-   if ( mat ) HYPRE_DistributedMatrixDestroy( mat );
+                                    (HYPRE_DistributedMatrixPilutSolver) solver );
+   if ( mat ) { HYPRE_DistributedMatrixDestroy( mat ); }
 
    HYPRE_FreeDistributedMatrixPilutSolver(
       (HYPRE_DistributedMatrixPilutSolver) solver );
@@ -83,23 +88,29 @@ HYPRE_ParCSRPilutDestroy( HYPRE_Solver solver )
  * HYPRE_ParCSRPilutSetup
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_ParCSRPilutSetup( HYPRE_Solver solver,
-                   HYPRE_ParCSRMatrix A,
-                   HYPRE_ParVector b,
-                   HYPRE_ParVector x      )
+                        HYPRE_ParCSRMatrix A,
+                        HYPRE_ParVector b,
+                        HYPRE_ParVector x      )
 {
+   HYPRE_UNUSED_VAR(b);
+   HYPRE_UNUSED_VAR(x);
+
 #ifdef HYPRE_MIXEDINT
-   hypre_error_w_msg(HYPRE_ERROR_GENERIC,"Pilut cannot be used in mixedint mode!");
+   HYPRE_UNUSED_VAR(solver);
+   HYPRE_UNUSED_VAR(A);
+
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Pilut cannot be used in mixedint mode!");
    return hypre_error_flag;
 #else
 
    HYPRE_DistributedMatrix matrix;
-   HYPRE_DistributedMatrixPilutSolver distributed_solver = 
+   HYPRE_DistributedMatrixPilutSolver distributed_solver =
       (HYPRE_DistributedMatrixPilutSolver) solver;
 
    HYPRE_ConvertParCSRMatrixToDistributedMatrix(
-             A, &matrix );
+      A, &matrix );
 
    HYPRE_DistributedMatrixPilutSolverSetMatrix( distributed_solver, matrix );
 
@@ -113,14 +124,20 @@ HYPRE_ParCSRPilutSetup( HYPRE_Solver solver,
  * HYPRE_ParCSRPilutSolve
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_ParCSRPilutSolve( HYPRE_Solver solver,
-                   HYPRE_ParCSRMatrix A,
-                   HYPRE_ParVector b,
-                   HYPRE_ParVector x      )
+                        HYPRE_ParCSRMatrix A,
+                        HYPRE_ParVector b,
+                        HYPRE_ParVector x      )
 {
+   HYPRE_UNUSED_VAR(A);
+
 #ifdef HYPRE_MIXEDINT
-   hypre_error_w_msg(HYPRE_ERROR_GENERIC,"Pilut cannot be used in mixedint mode!");
+   HYPRE_UNUSED_VAR(b);
+   HYPRE_UNUSED_VAR(x);
+   HYPRE_UNUSED_VAR(solver);
+
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Pilut cannot be used in mixedint mode!");
    return hypre_error_flag;
 #else
 
@@ -143,14 +160,16 @@ HYPRE_ParCSRPilutSolve( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_ParCSRPilutSetMaxIter( HYPRE_Solver solver,
-                        HYPRE_Int          max_iter  )
+                             HYPRE_Int          max_iter  )
 {
 #ifdef HYPRE_MIXEDINT
-   hypre_error_w_msg(HYPRE_ERROR_GENERIC,"Pilut cannot be used in mixedint mode!");
+   HYPRE_UNUSED_VAR(solver);
+   HYPRE_UNUSED_VAR(max_iter);
+
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Pilut cannot be used in mixedint mode!");
    return hypre_error_flag;
 #else
 
-
    HYPRE_DistributedMatrixPilutSolverSetMaxIts(
       (HYPRE_DistributedMatrixPilutSolver) solver, max_iter );
 
@@ -164,10 +183,13 @@ HYPRE_ParCSRPilutSetMaxIter( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_ParCSRPilutSetDropTolerance( HYPRE_Solver solver,
-                    HYPRE_Real   tol    )
+                                   HYPRE_Real   tol    )
 {
 #ifdef HYPRE_MIXEDINT
-   hypre_error_w_msg(HYPRE_ERROR_GENERIC,"Pilut cannot be used in mixedint mode!");
+   HYPRE_UNUSED_VAR(solver);
+   HYPRE_UNUSED_VAR(tol);
+
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Pilut cannot be used in mixedint mode!");
    return hypre_error_flag;
 #else
 
@@ -184,10 +206,13 @@ HYPRE_ParCSRPilutSetDropTolerance( HYPRE_Solver solver,
 
 HYPRE_Int
 HYPRE_ParCSRPilutSetFactorRowSize( HYPRE_Solver solver,
-                    HYPRE_Int       size    )
+                                   HYPRE_Int       size    )
 {
 #ifdef HYPRE_MIXEDINT
-   hypre_error_w_msg(HYPRE_ERROR_GENERIC,"Pilut cannot be used in mixedint mode!");
+   HYPRE_UNUSED_VAR(solver);
+   HYPRE_UNUSED_VAR(size);
+
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Pilut cannot be used in mixedint mode!");
    return hypre_error_flag;
 #else
 
@@ -203,7 +228,10 @@ HYPRE_ParCSRPilutSetLogging( HYPRE_Solver solver,
                              HYPRE_Int    logging    )
 {
 #ifdef HYPRE_MIXEDINT
-   hypre_error_w_msg(HYPRE_ERROR_GENERIC,"Pilut cannot be used in mixedint mode!");
+   HYPRE_UNUSED_VAR(solver);
+   HYPRE_UNUSED_VAR(logging);
+
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Pilut cannot be used in mixedint mode!");
    return hypre_error_flag;
 #else
 
@@ -213,4 +241,3 @@ HYPRE_ParCSRPilutSetLogging( HYPRE_Solver solver,
    return hypre_error_flag;
 #endif
 }
-
diff --git a/external/hypre/src/parcsr_ls/HYPRE_parcsr_schwarz.c b/external/hypre/src/parcsr_ls/HYPRE_parcsr_schwarz.c
index 45ef7c6d..64a6fb52 100644
--- a/external/hypre/src/parcsr_ls/HYPRE_parcsr_schwarz.c
+++ b/external/hypre/src/parcsr_ls/HYPRE_parcsr_schwarz.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -27,33 +27,33 @@ HYPRE_SchwarzCreate( HYPRE_Solver *solver)
  * HYPRE_SchwarzDestroy
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_SchwarzDestroy( HYPRE_Solver solver )
 {
-   return( hypre_SchwarzDestroy( (void *) solver ) );
+   return ( hypre_SchwarzDestroy( (void *) solver ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_SchwarzSetup
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_SchwarzSetup(HYPRE_Solver solver,
                    HYPRE_ParCSRMatrix A,
                    HYPRE_ParVector b,
                    HYPRE_ParVector x      )
 {
-   return( hypre_SchwarzSetup( (void *) solver,
-                               (hypre_ParCSRMatrix *) A,
-                               (hypre_ParVector *) b,
-                               (hypre_ParVector *) x ) );
+   return ( hypre_SchwarzSetup( (void *) solver,
+                                (hypre_ParCSRMatrix *) A,
+                                (hypre_ParVector *) b,
+                                (hypre_ParVector *) x ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_SchwarzSolve
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_SchwarzSolve( HYPRE_Solver solver,
                     HYPRE_ParCSRMatrix A,
                     HYPRE_ParVector b,
@@ -61,10 +61,10 @@ HYPRE_SchwarzSolve( HYPRE_Solver solver,
 {
 
 
-   return( hypre_SchwarzSolve( (void *) solver,
-                               (hypre_ParCSRMatrix *) A,
-                               (hypre_ParVector *) b,
-                               (hypre_ParVector *) x ) );
+   return ( hypre_SchwarzSolve( (void *) solver,
+                                (hypre_ParCSRMatrix *) A,
+                                (hypre_ParVector *) b,
+                                (hypre_ParVector *) x ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -75,7 +75,7 @@ HYPRE_Int
 HYPRE_SchwarzSetVariant( HYPRE_Solver solver,
                          HYPRE_Int    variant )
 {
-   return( hypre_SchwarzSetVariant( (void *) solver, variant ) );
+   return ( hypre_SchwarzSetVariant( (void *) solver, variant ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -85,7 +85,7 @@ HYPRE_SchwarzSetVariant( HYPRE_Solver solver,
 HYPRE_Int
 HYPRE_SchwarzSetOverlap( HYPRE_Solver solver, HYPRE_Int overlap)
 {
-   return( hypre_SchwarzSetOverlap( (void *) solver, overlap ) );
+   return ( hypre_SchwarzSetOverlap( (void *) solver, overlap ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -96,7 +96,7 @@ HYPRE_Int
 HYPRE_SchwarzSetDomainType( HYPRE_Solver solver,
                             HYPRE_Int    domain_type  )
 {
-   return( hypre_SchwarzSetDomainType( (void *) solver, domain_type ) );
+   return ( hypre_SchwarzSetDomainType( (void *) solver, domain_type ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -107,8 +107,8 @@ HYPRE_Int
 HYPRE_SchwarzSetDomainStructure( HYPRE_Solver solver,
                                  HYPRE_CSRMatrix domain_structure  )
 {
-   return( hypre_SchwarzSetDomainStructure(
-              (void *) solver, (hypre_CSRMatrix *) domain_structure ) );
+   return ( hypre_SchwarzSetDomainStructure(
+               (void *) solver, (hypre_CSRMatrix *) domain_structure ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -119,7 +119,7 @@ HYPRE_Int
 HYPRE_SchwarzSetNumFunctions( HYPRE_Solver  solver,
                               HYPRE_Int     num_functions  )
 {
-   return( hypre_SchwarzSetNumFunctions( (void *) solver, num_functions ) );
+   return ( hypre_SchwarzSetNumFunctions( (void *) solver, num_functions ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -130,7 +130,7 @@ HYPRE_Int
 HYPRE_SchwarzSetNonSymm( HYPRE_Solver  solver,
                          HYPRE_Int     use_nonsymm  )
 {
-   return( hypre_SchwarzSetNonSymm( (void *) solver, use_nonsymm ));
+   return ( hypre_SchwarzSetNonSymm( (void *) solver, use_nonsymm ));
 }
 
 /*--------------------------------------------------------------------------
@@ -141,7 +141,7 @@ HYPRE_Int
 HYPRE_SchwarzSetRelaxWeight( HYPRE_Solver  solver,
                              HYPRE_Real relax_weight)
 {
-   return( hypre_SchwarzSetRelaxWeight((void *) solver,relax_weight));
+   return ( hypre_SchwarzSetRelaxWeight((void *) solver, relax_weight));
 }
 
 /*--------------------------------------------------------------------------
@@ -152,6 +152,6 @@ HYPRE_Int
 HYPRE_SchwarzSetDofFunc( HYPRE_Solver  solver,
                          HYPRE_Int    *dof_func  )
 {
-   return( hypre_SchwarzSetDofFunc( (void *) solver, dof_func ) );
+   return ( hypre_SchwarzSetDofFunc( (void *) solver, dof_func ) );
 }
 
diff --git a/external/hypre/src/parcsr_ls/_hypre_parcsr_ls.h b/external/hypre/src/parcsr_ls/_hypre_parcsr_ls.h
index c2d46ebb..08ed2f37 100644
--- a/external/hypre/src/parcsr_ls/_hypre_parcsr_ls.h
+++ b/external/hypre/src/parcsr_ls/_hypre_parcsr_ls.h
@@ -17,7 +17,7 @@ extern "C" {
 typedef struct { HYPRE_Int prev; HYPRE_Int next; } Link;
 
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -36,7 +36,11 @@ typedef struct { HYPRE_Int prev; HYPRE_Int next; } Link;
 
 typedef struct
 {
-   HYPRE_MemoryLocation  memory_location;   /* memory location of matrices/vectors in AMGData */
+   /* Base solver data structure */
+   hypre_Solver   base;
+
+   /* Memory location of matrices/vectors in AMGData */
+   HYPRE_MemoryLocation  memory_location;
 
    /* setup params */
    HYPRE_Int      max_levels;
@@ -106,6 +110,7 @@ typedef struct
    hypre_ParCSRMatrix  *A;
    HYPRE_Int            num_variables;
    HYPRE_Int            num_functions;
+   HYPRE_Int            filter_functions;
    HYPRE_Int            nodal;
    HYPRE_Int            nodal_levels;
    HYPRE_Int            nodal_diag;
@@ -155,13 +160,33 @@ typedef struct
    HYPRE_Real           pi_drop_tol;
    HYPRE_Real           eu_sparse_A;
    char                *euclidfile;
+
+   /* ILU parameters */
    HYPRE_Int            ilu_lfil;
    HYPRE_Int            ilu_type;
    HYPRE_Int            ilu_max_row_nnz;
    HYPRE_Int            ilu_max_iter;
    HYPRE_Real           ilu_droptol;
+   HYPRE_Int            ilu_tri_solve;
+   HYPRE_Int            ilu_lower_jacobi_iters;
+   HYPRE_Int            ilu_upper_jacobi_iters;
    HYPRE_Int            ilu_reordering_type;
-   
+   HYPRE_Int            ilu_iter_setup_type;
+   HYPRE_Int            ilu_iter_setup_option;
+   HYPRE_Int            ilu_iter_setup_max_iter;
+   HYPRE_Real           ilu_iter_setup_tolerance;
+
+   /* FSAI parameters */
+   HYPRE_Int            fsai_algo_type;
+   HYPRE_Int            fsai_local_solve_type;
+   HYPRE_Int            fsai_max_steps;
+   HYPRE_Int            fsai_max_step_size;
+   HYPRE_Int            fsai_max_nnz_row;
+   HYPRE_Int            fsai_num_levels;
+   HYPRE_Real           fsai_threshold;
+   HYPRE_Int            fsai_eig_max_iters;
+   HYPRE_Real           fsai_kap_tolerance;
+
    HYPRE_Real          *max_eig_est;
    HYPRE_Real          *min_eig_est;
    HYPRE_Int            cheby_eig_est;
@@ -172,6 +197,8 @@ typedef struct
    hypre_Vector       **cheby_ds;
    HYPRE_Real         **cheby_coefs;
 
+   HYPRE_Real           cum_nnz_AP;
+
    /* data needed for non-Galerkin option */
    HYPRE_Int           nongalerk_num_tol;
    HYPRE_Real         *nongalerk_tol;
@@ -234,10 +261,14 @@ typedef struct
    MPI_Comm             new_comm;
 
    /* store matrix, vector and communication info for Gaussian elimination */
+   HYPRE_MemoryLocation ge_memory_location;
    HYPRE_Int   gs_setup;
-   HYPRE_Real *A_mat, *A_inv;
-   HYPRE_Real *b_vec;
    HYPRE_Int  *comm_info;
+   HYPRE_Int  *A_piv;
+   HYPRE_Real *A_mat;
+   HYPRE_Real *A_work;
+   HYPRE_Real *b_vec;
+   HYPRE_Real *u_vec;
 
    /* information for multiplication with Lambda - additive AMG */
    HYPRE_Int      additive;
@@ -274,7 +305,7 @@ typedef struct
    HYPRE_BigInt  *F_points_marker;
 
 #ifdef HYPRE_USING_DSUPERLU
- /* Parameters and data for SuperLU_Dist */
+   /* Parameters and data for SuperLU_Dist */
    HYPRE_Int dslu_threshold;
    HYPRE_Solver dslu_solver;
 #endif
@@ -286,7 +317,6 @@ typedef struct
  *--------------------------------------------------------------------------*/
 
 /* setup params */
-
 #define hypre_ParAMGDataMemoryLocation(amg_data)       ((amg_data) -> memory_location)
 #define hypre_ParAMGDataRestriction(amg_data)          ((amg_data) -> restr_par)
 #define hypre_ParAMGDataIsTriangular(amg_data)         ((amg_data) -> is_triangular)
@@ -351,8 +381,9 @@ typedef struct
 #define hypre_ParAMGDataOuterWt(amg_data) ((amg_data)->outer_wt)
 
 /* problem data parameters */
-#define  hypre_ParAMGDataNumVariables(amg_data)  ((amg_data)->num_variables)
+#define hypre_ParAMGDataNumVariables(amg_data)  ((amg_data)->num_variables)
 #define hypre_ParAMGDataNumFunctions(amg_data) ((amg_data)->num_functions)
+#define hypre_ParAMGDataFilterFunctions(amg_data) ((amg_data)->filter_functions)
 #define hypre_ParAMGDataNodal(amg_data) ((amg_data)->nodal)
 #define hypre_ParAMGDataNodalLevels(amg_data) ((amg_data)->nodal_levels)
 #define hypre_ParAMGDataNodalDiag(amg_data) ((amg_data)->nodal_diag)
@@ -401,8 +432,24 @@ typedef struct
 #define hypre_ParAMGDataILULevel(amg_data) ((amg_data)->ilu_lfil)
 #define hypre_ParAMGDataILUMaxRowNnz(amg_data) ((amg_data)->ilu_max_row_nnz)
 #define hypre_ParAMGDataILUDroptol(amg_data) ((amg_data)->ilu_droptol)
+#define hypre_ParAMGDataILUTriSolve(amg_data) ((amg_data)->ilu_tri_solve)
+#define hypre_ParAMGDataILULowerJacobiIters(amg_data) ((amg_data)->ilu_lower_jacobi_iters)
+#define hypre_ParAMGDataILUUpperJacobiIters(amg_data) ((amg_data)->ilu_upper_jacobi_iters)
 #define hypre_ParAMGDataILUMaxIter(amg_data) ((amg_data)->ilu_max_iter)
 #define hypre_ParAMGDataILULocalReordering(amg_data) ((amg_data)->ilu_reordering_type)
+#define hypre_ParAMGDataILUIterSetupType(amg_data) ((amg_data)->ilu_iter_setup_type)
+#define hypre_ParAMGDataILUIterSetupOption(amg_data) ((amg_data)->ilu_iter_setup_option)
+#define hypre_ParAMGDataILUIterSetupMaxIter(amg_data) ((amg_data)->ilu_iter_setup_max_iter)
+#define hypre_ParAMGDataILUIterSetupTolerance(amg_data) ((amg_data)->ilu_iter_setup_tolerance)
+#define hypre_ParAMGDataFSAIAlgoType(amg_data) ((amg_data)->fsai_algo_type)
+#define hypre_ParAMGDataFSAILocalSolveType(amg_data) ((amg_data)->fsai_local_solve_type)
+#define hypre_ParAMGDataFSAIMaxSteps(amg_data) ((amg_data)->fsai_max_steps)
+#define hypre_ParAMGDataFSAIMaxStepSize(amg_data) ((amg_data)->fsai_max_step_size)
+#define hypre_ParAMGDataFSAIMaxNnzRow(amg_data) ((amg_data)->fsai_max_nnz_row)
+#define hypre_ParAMGDataFSAINumLevels(amg_data) ((amg_data)->fsai_num_levels)
+#define hypre_ParAMGDataFSAIThreshold(amg_data) ((amg_data)->fsai_threshold)
+#define hypre_ParAMGDataFSAIEigMaxIters(amg_data) ((amg_data)->fsai_eig_max_iters)
+#define hypre_ParAMGDataFSAIKapTolerance(amg_data) ((amg_data)->fsai_kap_tolerance)
 
 #define hypre_ParAMGDataMaxEigEst(amg_data) ((amg_data)->max_eig_est)
 #define hypre_ParAMGDataMinEigEst(amg_data) ((amg_data)->min_eig_est)
@@ -414,6 +461,8 @@ typedef struct
 #define hypre_ParAMGDataChebyDS(amg_data) ((amg_data)->cheby_ds)
 #define hypre_ParAMGDataChebyCoefs(amg_data) ((amg_data)->cheby_coefs)
 
+#define hypre_ParAMGDataCumNnzAP(amg_data)   ((amg_data)->cum_nnz_AP)
+
 /* block */
 #define hypre_ParAMGDataABlockArray(amg_data) ((amg_data)->A_block_array)
 #define hypre_ParAMGDataPBlockArray(amg_data) ((amg_data)->P_block_array)
@@ -479,9 +528,12 @@ typedef struct
 #define hypre_ParAMGDataParticipate(amg_data) ((amg_data)->participate)
 
 #define hypre_ParAMGDataGSSetup(amg_data) ((amg_data)->gs_setup)
+#define hypre_ParAMGDataGEMemoryLocation(amg_data) ((amg_data)->ge_memory_location)
 #define hypre_ParAMGDataAMat(amg_data) ((amg_data)->A_mat)
-#define hypre_ParAMGDataAInv(amg_data) ((amg_data)->A_inv)
+#define hypre_ParAMGDataAWork(amg_data) ((amg_data)->A_work)
+#define hypre_ParAMGDataAPiv(amg_data) ((amg_data)->A_piv)
 #define hypre_ParAMGDataBVec(amg_data) ((amg_data)->b_vec)
+#define hypre_ParAMGDataUVec(amg_data) ((amg_data)->u_vec)
 #define hypre_ParAMGDataCommInfo(amg_data) ((amg_data)->comm_info)
 
 /* additive AMG parameters */
@@ -531,7 +583,7 @@ typedef struct
 
 #endif
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -561,7 +613,8 @@ typedef struct
    HYPRE_Int        ***num_recv_nodes; // number of nodes to recv on each composite level
 
    HYPRE_Int       ****send_flag; // flags which nodes to send after composite grid is built
-   HYPRE_Int       ****recv_map; // mapping from recv buffer to appropriate local indices on each comp grid
+   HYPRE_Int
+   ****recv_map; // mapping from recv buffer to appropriate local indices on each comp grid
    HYPRE_Int       ****recv_red_marker; // marker indicating a redundant recv
 
 } hypre_AMGDDCommPkg;
@@ -591,7 +644,8 @@ typedef struct
 {
    hypre_CSRMatrix      *owned_diag; // Domain: owned domain of mat. Range: owned range of mat.
    hypre_CSRMatrix      *owned_offd; // Domain: nonowned domain of mat. Range: owned range of mat.
-   hypre_CSRMatrix      *nonowned_diag; // Domain: nonowned domain of mat. Range: nonowned range of mat.
+   hypre_CSRMatrix
+   *nonowned_diag; // Domain: nonowned domain of mat. Range: nonowned range of mat.
    hypre_CSRMatrix      *nonowned_offd; // Domain: owned domain of mat. Range: nonowned range of mat.
 
    hypre_CSRMatrix      *real_real;  // Domain: nonowned real. Range: nonowned real.
@@ -647,8 +701,8 @@ typedef struct
    HYPRE_Int             level;
    HYPRE_MemoryLocation  memory_location;   /* memory location of matrices/vectors */
 
-   HYPRE_Int             first_global_index;
-   HYPRE_Int             last_global_index;
+   HYPRE_BigInt          first_global_index;
+   HYPRE_BigInt          last_global_index;
    HYPRE_Int             num_owned_nodes;
    HYPRE_Int             num_nonowned_nodes;
    HYPRE_Int             num_nonowned_real_nodes;
@@ -723,7 +777,7 @@ typedef struct
 
 #endif
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -754,7 +808,8 @@ typedef struct
    hypre_AMGDDCommPkg       *amgdd_comm_pkg;
    hypre_ParVector          *Ztemp;
 
-   HYPRE_Int       (*amgddUserFACRelaxation)( void *amgdd_vdata, HYPRE_Int level, HYPRE_Int cycle_param );
+   HYPRE_Int       (*amgddUserFACRelaxation)( void *amgdd_vdata, HYPRE_Int level,
+                                              HYPRE_Int cycle_param );
 } hypre_ParAMGDDData;
 
 /*--------------------------------------------------------------------------
@@ -776,7 +831,630 @@ typedef struct
 
 #endif
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+#ifndef hypre_ParFSAI_DATA_HEADER
+#define hypre_ParFSAI_DATA_HEADER
+
+//#define DEBUG_FSAI
+
+/*--------------------------------------------------------------------------
+ * hypre_ParFSAIData
+ *--------------------------------------------------------------------------*/
+
+typedef struct hypre_ParFSAIData_struct
+{
+   /* FSAI Setup input data */
+   HYPRE_Int             algo_type;        /* FSAI algorithm type */
+   HYPRE_Int             local_solve_type; /* Local linear solver type */
+   HYPRE_Int             max_steps;        /* Max. iterations run per row */
+   HYPRE_Int             max_step_size;    /* Max. number of nonzeros added to a row of G per step */
+   HYPRE_Int             max_nnz_row;      /* Max. number of nonzeros per row of G */
+   HYPRE_Int             num_levels;       /* Number of levels for computing the candidate pattern */
+   HYPRE_Real            threshold;        /* Filtering threshold for the candidate pattern */
+   HYPRE_Real            kap_tolerance;    /* Min. amount of change between two steps */
+
+   /* FSAI Setup data */
+   HYPRE_Real            density;          /* Density of matrix G wrt. A */
+   hypre_ParCSRMatrix   *Gmat;             /* Matrix holding FSAI factor. M^(-1) = G'G */
+   hypre_ParCSRMatrix   *GTmat;            /* Matrix holding the transpose of the FSAI factor */
+
+   /* Solver data */
+   HYPRE_Int             zero_guess;       /* Flag indicating x0 = 0 */
+   HYPRE_Int             eig_max_iters;    /* Iters for computing max. eigenvalue of G^T*G*A */
+   HYPRE_Int             max_iterations;   /* Maximum iterations run for the solver */
+   HYPRE_Int             num_iterations;   /* Number of iterations the solver ran */
+   HYPRE_Real            omega;            /* Step size for Preconditioned Richardson Solver */
+   HYPRE_Real            tolerance;        /* Tolerance for the solver */
+   HYPRE_Real            rel_resnorm;      /* available if logging > 1 */
+
+   /* Work data */
+   hypre_ParVector      *r_work;           /* work vector used to compute the residual */
+   hypre_ParVector      *z_work;           /* work vector used for applying FSAI */
+
+   /* Log info data */
+   HYPRE_Int             logging;
+   HYPRE_Int             print_level;
+} hypre_ParFSAIData;
+
+/*--------------------------------------------------------------------------
+ *  Accessor functions for the hypre_ParFSAIData structure
+ *--------------------------------------------------------------------------*/
+
+/* FSAI Setup input data */
+#define hypre_ParFSAIDataAlgoType(fsai_data)                ((fsai_data) -> algo_type)
+#define hypre_ParFSAIDataLocalSolveType(fsai_data)          ((fsai_data) -> local_solve_type)
+#define hypre_ParFSAIDataMaxSteps(fsai_data)                ((fsai_data) -> max_steps)
+#define hypre_ParFSAIDataMaxStepSize(fsai_data)             ((fsai_data) -> max_step_size)
+#define hypre_ParFSAIDataMaxNnzRow(fsai_data)               ((fsai_data) -> max_nnz_row)
+#define hypre_ParFSAIDataNumLevels(fsai_data)               ((fsai_data) -> num_levels)
+#define hypre_ParFSAIDataThreshold(fsai_data)               ((fsai_data) -> threshold)
+#define hypre_ParFSAIDataKapTolerance(fsai_data)            ((fsai_data) -> kap_tolerance)
+
+/* FSAI Setup data */
+#define hypre_ParFSAIDataGmat(fsai_data)                    ((fsai_data) -> Gmat)
+#define hypre_ParFSAIDataGTmat(fsai_data)                   ((fsai_data) -> GTmat)
+#define hypre_ParFSAIDataDensity(fsai_data)                 ((fsai_data) -> density)
+
+/* Solver problem data */
+#define hypre_ParFSAIDataZeroGuess(fsai_data)               ((fsai_data) -> zero_guess)
+#define hypre_ParFSAIDataEigMaxIters(fsai_data)             ((fsai_data) -> eig_max_iters)
+#define hypre_ParFSAIDataMaxIterations(fsai_data)           ((fsai_data) -> max_iterations)
+#define hypre_ParFSAIDataNumIterations(fsai_data)           ((fsai_data) -> num_iterations)
+#define hypre_ParFSAIDataOmega(fsai_data)                   ((fsai_data) -> omega)
+#define hypre_ParFSAIDataRelResNorm(fsai_data)              ((fsai_data) -> rel_resnorm)
+#define hypre_ParFSAIDataTolerance(fsai_data)               ((fsai_data) -> tolerance)
+
+/* Work data */
+#define hypre_ParFSAIDataRWork(fsai_data)                   ((fsai_data) -> r_work)
+#define hypre_ParFSAIDataZWork(fsai_data)                   ((fsai_data) -> z_work)
+
+/* Log info data */
+#define hypre_ParFSAIDataLogging(fsai_data)                 ((fsai_data) -> logging)
+#define hypre_ParFSAIDataPrintLevel(fsai_data)              ((fsai_data) -> print_level)
+
+#endif
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+#ifndef hypre_AMS_DATA_HEADER
+#define hypre_AMS_DATA_HEADER
+
+/*--------------------------------------------------------------------------
+ * Auxiliary space Maxwell Solver data
+ *--------------------------------------------------------------------------*/
+typedef struct
+{
+   /* Space dimension (2 or 3) */
+   HYPRE_Int dim;
+
+   /* Edge element (ND1) stiffness matrix */
+   hypre_ParCSRMatrix *A;
+
+   /* Discrete gradient matrix (vertex-to-edge) */
+   hypre_ParCSRMatrix *G;
+   /* Coarse grid matrix on the range of G^T */
+   hypre_ParCSRMatrix *A_G;
+   /* AMG solver for A_G */
+   HYPRE_Solver B_G;
+   /* Is the mass term coefficient zero? */
+   HYPRE_Int beta_is_zero;
+
+   /* Nedelec nodal interpolation matrix (vertex^dim-to-edge) */
+   hypre_ParCSRMatrix *Pi;
+   /* Coarse grid matrix on the range of Pi^T */
+   hypre_ParCSRMatrix *A_Pi;
+   /* AMG solver for A_Pi */
+   HYPRE_Solver B_Pi;
+
+   /* Components of the Nedelec interpolation matrix (vertex-to-edge each) */
+   hypre_ParCSRMatrix *Pix, *Piy, *Piz;
+   /* Coarse grid matrices on the ranges of Pi{x,y,z}^T */
+   hypre_ParCSRMatrix *A_Pix, *A_Piy, *A_Piz;
+   /* AMG solvers for A_Pi{x,y,z} */
+   HYPRE_Solver B_Pix, B_Piy, B_Piz;
+
+   /* Does the solver own the Nedelec interpolations? */
+   HYPRE_Int owns_Pi;
+   /* Does the solver own the coarse grid matrices? */
+   HYPRE_Int owns_A_G, owns_A_Pi;
+
+   /* Coordinates of the vertices (z = 0 if dim == 2) */
+   hypre_ParVector *x, *y, *z;
+
+   /* Representations of the constant vectors in the Nedelec basis */
+   hypre_ParVector *Gx, *Gy, *Gz;
+
+   /* Nodes in the interior of the zero-conductivity region */
+   hypre_ParVector *interior_nodes;
+   /* Discrete gradient matrix for the interior nodes only */
+   hypre_ParCSRMatrix *G0;
+   /* Coarse grid matrix on the interior nodes */
+   hypre_ParCSRMatrix *A_G0;
+   /* AMG solver for A_G0 */
+   HYPRE_Solver B_G0;
+   /* How frequently to project the r.h.s. onto Ker(G0^T)? */
+   HYPRE_Int projection_frequency;
+   /* Internal counter to use with projection_frequency in PCG */
+   HYPRE_Int solve_counter;
+
+   /* Solver options */
+   HYPRE_Int maxit;
+   HYPRE_Real tol;
+   HYPRE_Int cycle_type;
+   HYPRE_Int print_level;
+
+   /* Smoothing options for A */
+   HYPRE_Int A_relax_type;
+   HYPRE_Int A_relax_times;
+   hypre_Vector *A_l1_norms;
+   HYPRE_Real A_relax_weight;
+   HYPRE_Real A_omega;
+   HYPRE_Real A_max_eig_est;
+   HYPRE_Real A_min_eig_est;
+   HYPRE_Int A_cheby_order;
+   HYPRE_Real  A_cheby_fraction;
+
+   /* AMG options for B_G */
+   HYPRE_Int B_G_coarsen_type;
+   HYPRE_Int B_G_agg_levels;
+   HYPRE_Int B_G_relax_type;
+   HYPRE_Int B_G_coarse_relax_type;
+   HYPRE_Real B_G_theta;
+   HYPRE_Int B_G_interp_type;
+   HYPRE_Int B_G_Pmax;
+
+   /* AMG options for B_Pi */
+   HYPRE_Int B_Pi_coarsen_type;
+   HYPRE_Int B_Pi_agg_levels;
+   HYPRE_Int B_Pi_relax_type;
+   HYPRE_Int B_Pi_coarse_relax_type;
+   HYPRE_Real B_Pi_theta;
+   HYPRE_Int B_Pi_interp_type;
+   HYPRE_Int B_Pi_Pmax;
+
+   /* Temporary vectors */
+   hypre_ParVector *r0, *g0, *r1, *g1, *r2, *g2, *zz;
+
+   /* Output log info */
+   HYPRE_Int num_iterations;
+   HYPRE_Real rel_resid_norm;
+
+} hypre_AMSData;
+
+/* Space dimension */
+#define hypre_AMSDataDimension(ams_data) ((ams_data)->dim)
+
+/* Edge stiffness matrix */
+#define hypre_AMSDataA(ams_data) ((ams_data)->A)
+
+/* Vertex space data */
+#define hypre_AMSDataDiscreteGradient(ams_data) ((ams_data)->G)
+#define hypre_AMSDataPoissonBeta(ams_data) ((ams_data)->A_G)
+#define hypre_AMSDataPoissonBetaAMG(ams_data) ((ams_data)->B_G)
+#define hypre_AMSDataOwnsPoissonBeta(ams_data) ((ams_data)->owns_A_G)
+#define hypre_AMSDataBetaIsZero(ams_data) ((ams_data)->beta_is_zero)
+
+/* Vector vertex space data */
+#define hypre_AMSDataPiInterpolation(ams_data) ((ams_data)->Pi)
+#define hypre_AMSDataOwnsPiInterpolation(ams_data) ((ams_data)->owns_Pi)
+#define hypre_AMSDataPoissonAlpha(ams_data) ((ams_data)->A_Pi)
+#define hypre_AMSDataPoissonAlphaAMG(ams_data) ((ams_data)->B_Pi)
+#define hypre_AMSDataOwnsPoissonAlpha(ams_data) ((ams_data)->owns_A_Pi)
+
+/* Vector vertex components data */
+#define hypre_AMSDataPiXInterpolation(ams_data) ((ams_data)->Pix)
+#define hypre_AMSDataPiYInterpolation(ams_data) ((ams_data)->Piy)
+#define hypre_AMSDataPiZInterpolation(ams_data) ((ams_data)->Piz)
+#define hypre_AMSDataPoissonAlphaX(ams_data) ((ams_data)->A_Pix)
+#define hypre_AMSDataPoissonAlphaY(ams_data) ((ams_data)->A_Piy)
+#define hypre_AMSDataPoissonAlphaZ(ams_data) ((ams_data)->A_Piz)
+#define hypre_AMSDataPoissonAlphaXAMG(ams_data) ((ams_data)->B_Pix)
+#define hypre_AMSDataPoissonAlphaYAMG(ams_data) ((ams_data)->B_Piy)
+#define hypre_AMSDataPoissonAlphaZAMG(ams_data) ((ams_data)->B_Piz)
+
+/* Coordinates of the vertices */
+#define hypre_AMSDataVertexCoordinateX(ams_data) ((ams_data)->x)
+#define hypre_AMSDataVertexCoordinateY(ams_data) ((ams_data)->y)
+#define hypre_AMSDataVertexCoordinateZ(ams_data) ((ams_data)->z)
+
+/* Representations of the constant vectors in the Nedelec basis */
+#define hypre_AMSDataEdgeConstantX(ams_data) ((ams_data)->Gx)
+#define hypre_AMSDataEdgeConstantY(ams_data) ((ams_data)->Gy)
+#define hypre_AMSDataEdgeConstantZ(ams_data) ((ams_data)->Gz)
+
+/* Interior zero conductivity region */
+#define hypre_AMSDataInteriorNodes(ams_data) ((ams_data)->interior_nodes)
+#define hypre_AMSDataInteriorDiscreteGradient(ams_data) ((ams_data)->G0)
+#define hypre_AMSDataInteriorPoissonBeta(ams_data) ((ams_data)->A_G0)
+#define hypre_AMSDataInteriorPoissonBetaAMG(ams_data) ((ams_data)->B_G0)
+#define hypre_AMSDataInteriorProjectionFrequency(ams_data) ((ams_data)->projection_frequency)
+#define hypre_AMSDataInteriorSolveCounter(ams_data) ((ams_data)->solve_counter)
+
+/* Solver options */
+#define hypre_AMSDataMaxIter(ams_data) ((ams_data)->maxit)
+#define hypre_AMSDataTol(ams_data) ((ams_data)->tol)
+#define hypre_AMSDataCycleType(ams_data) ((ams_data)->cycle_type)
+#define hypre_AMSDataPrintLevel(ams_data) ((ams_data)->print_level)
+
+/* Smoothing and AMG options */
+#define hypre_AMSDataARelaxType(ams_data) ((ams_data)->A_relax_type)
+#define hypre_AMSDataARelaxTimes(ams_data) ((ams_data)->A_relax_times)
+#define hypre_AMSDataAL1Norms(ams_data) ((ams_data)->A_l1_norms)
+#define hypre_AMSDataARelaxWeight(ams_data) ((ams_data)->A_relax_weight)
+#define hypre_AMSDataAOmega(ams_data) ((ams_data)->A_omega)
+#define hypre_AMSDataAMaxEigEst(ams_data) ((ams_data)->A_max_eig_est)
+#define hypre_AMSDataAMinEigEst(ams_data) ((ams_data)->A_min_eig_est)
+#define hypre_AMSDataAChebyOrder(ams_data) ((ams_data)->A_cheby_order)
+#define hypre_AMSDataAChebyFraction(ams_data) ((ams_data)->A_cheby_fraction)
+
+#define hypre_AMSDataPoissonBetaAMGCoarsenType(ams_data) ((ams_data)->B_G_coarsen_type)
+#define hypre_AMSDataPoissonBetaAMGAggLevels(ams_data) ((ams_data)->B_G_agg_levels)
+#define hypre_AMSDataPoissonBetaAMGRelaxType(ams_data) ((ams_data)->B_G_relax_type)
+#define hypre_AMSDataPoissonBetaAMGCoarseRelaxType(ams_data) ((ams_data)->B_G_coarse_relax_type)
+#define hypre_AMSDataPoissonBetaAMGStrengthThreshold(ams_data) ((ams_data)->B_G_theta)
+#define hypre_AMSDataPoissonBetaAMGInterpType(ams_data) ((ams_data)->B_G_interp_type)
+#define hypre_AMSDataPoissonBetaAMGPMax(ams_data) ((ams_data)->B_G_Pmax)
+
+#define hypre_AMSDataPoissonAlphaAMGCoarsenType(ams_data) ((ams_data)->B_Pi_coarsen_type)
+#define hypre_AMSDataPoissonAlphaAMGAggLevels(ams_data) ((ams_data)->B_Pi_agg_levels)
+#define hypre_AMSDataPoissonAlphaAMGRelaxType(ams_data) ((ams_data)->B_Pi_relax_type)
+#define hypre_AMSDataPoissonAlphaAMGCoarseRelaxType(ams_data) ((ams_data)->B_Pi_coarse_relax_type)
+#define hypre_AMSDataPoissonAlphaAMGStrengthThreshold(ams_data) ((ams_data)->B_Pi_theta)
+#define hypre_AMSDataPoissonAlphaAMGInterpType(ams_data) ((ams_data)->B_Pi_interp_type)
+#define hypre_AMSDataPoissonAlphaAMGPMax(ams_data) ((ams_data)->B_Pi_Pmax)
+
+/* Temporary vectors */
+#define hypre_AMSDataTempEdgeVectorR(ams_data) ((ams_data)->r0)
+#define hypre_AMSDataTempEdgeVectorG(ams_data) ((ams_data)->g0)
+#define hypre_AMSDataTempVertexVectorR(ams_data) ((ams_data)->r1)
+#define hypre_AMSDataTempVertexVectorG(ams_data) ((ams_data)->g1)
+#define hypre_AMSDataTempVecVertexVectorR(ams_data) ((ams_data)->r2)
+#define hypre_AMSDataTempVecVertexVectorG(ams_data) ((ams_data)->g2)
+#define hypre_AMSDataTempVecVertexVectorZZ(ams_data) ((ams_data)->zz)
+
+/* Output log info */
+#define hypre_AMSDataNumIterations(ams_data) ((ams_data)->num_iterations)
+#define hypre_AMSDataResidualNorm(ams_data) ((ams_data)->rel_resid_norm)
+
+#endif
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+#ifndef hypre_ParILU_DATA_HEADER
+#define hypre_ParILU_DATA_HEADER
+
+/*--------------------------------------------------------------------------
+ * hypre_ParILUData
+ *--------------------------------------------------------------------------*/
+
+typedef struct hypre_ParILUData_struct
+{
+   /* Base solver data structure */
+   hypre_Solver          base;
+
+   /* General data */
+   HYPRE_Int             global_solver;
+   hypre_ParCSRMatrix   *matA;
+   hypre_ParCSRMatrix   *matL;
+   HYPRE_Real           *matD;
+   hypre_ParCSRMatrix   *matU;
+   hypre_ParCSRMatrix   *matmL;
+   HYPRE_Real           *matmD;
+   hypre_ParCSRMatrix   *matmU;
+   hypre_ParCSRMatrix   *matS;
+   HYPRE_Real           *droptol; /* Array of 3 elements, for B, (E and F), S respectively */
+   HYPRE_Int             lfil;
+   HYPRE_Int             maxRowNnz;
+   HYPRE_Int            *CF_marker_array;
+   HYPRE_Int            *perm;
+   HYPRE_Int            *qperm;
+   HYPRE_Real            tol_ddPQ;
+   hypre_ParVector      *F;
+   hypre_ParVector      *U;
+   hypre_ParVector      *residual;
+   HYPRE_Real           *rel_res_norms;
+   HYPRE_Int             num_iterations;
+   HYPRE_Real           *l1_norms;
+   HYPRE_Real            final_rel_residual_norm;
+   HYPRE_Real            tol;
+   HYPRE_Real            operator_complexity;
+   HYPRE_Int             logging;
+   HYPRE_Int             print_level;
+   HYPRE_Int             max_iter;
+   HYPRE_Int             tri_solve;
+   HYPRE_Int             lower_jacobi_iters;
+   HYPRE_Int             upper_jacobi_iters;
+   HYPRE_Int             ilu_type;
+   HYPRE_Int             nLU;
+   HYPRE_Int             nI;
+   HYPRE_Int            *u_end; /* used when schur block is formed */
+
+   /* Iterative ILU parameters */
+   HYPRE_Int             iter_setup_type;
+   HYPRE_Int             iter_setup_option;
+   HYPRE_Int             setup_max_iter;
+   HYPRE_Int             setup_num_iter;
+   HYPRE_Real            setup_tolerance;
+   HYPRE_Complex        *setup_history;
+
+   /* temp vectors for solve phase */
+   hypre_ParVector      *Utemp;
+   hypre_ParVector      *Ftemp;
+   hypre_ParVector      *Xtemp;
+   hypre_ParVector      *Ytemp;
+   hypre_ParVector      *Ztemp;
+   HYPRE_Real           *uext;
+   HYPRE_Real           *fext;
+
+   /* On GPU, we have to form E and F explicitly, since we don't have much control to it */
+#if defined(HYPRE_USING_GPU)
+   hypre_CSRMatrix      *matALU_d; /* Matrix holding ILU of A (for A-smoothing) */
+   hypre_CSRMatrix      *matBLU_d; /* Matrix holding ILU of B */
+   hypre_CSRMatrix      *matSLU_d; /* Matrix holding ILU of S */
+   hypre_CSRMatrix      *matE_d;
+   hypre_CSRMatrix      *matF_d;
+   hypre_ParCSRMatrix   *Aperm;
+   hypre_ParCSRMatrix   *R;
+   hypre_ParCSRMatrix   *P;
+   hypre_Vector         *Ftemp_upper;
+   hypre_Vector         *Utemp_lower;
+   hypre_Vector         *Adiag_diag;
+   hypre_Vector         *Sdiag_diag;
+#endif
+
+   /* data structure sor solving Schur System */
+   HYPRE_Solver          schur_solver;
+   HYPRE_Solver          schur_precond;
+   hypre_ParVector      *rhs;
+   hypre_ParVector      *x;
+
+   /* Schur solver data */
+   HYPRE_Int             ss_logging;
+   HYPRE_Int             ss_print_level;
+
+   /* Schur-GMRES */
+   HYPRE_Int             ss_kDim;               /* max number of iterations for GMRES */
+   HYPRE_Int             ss_max_iter;           /* max number of iterations for GMRES solve */
+   HYPRE_Real            ss_tol;                /* stop iteration tol for GMRES */
+   HYPRE_Real            ss_absolute_tol;       /* absolute tol for GMRES or tol for NSH solve */
+   HYPRE_Int             ss_rel_change;
+
+   /* Schur-NSH */
+   HYPRE_Int             ss_nsh_setup_max_iter; /* number of iterations for NSH inverse */
+   HYPRE_Int             ss_nsh_solve_max_iter; /* max number of iterations for NSH solve */
+   HYPRE_Real            ss_nsh_setup_tol;      /* stop iteration tol for NSH inverse */
+   HYPRE_Real            ss_nsh_solve_tol;      /* absolute tol for NSH solve */
+   HYPRE_Int             ss_nsh_max_row_nnz;    /* max rows of nonzeros for NSH */
+   HYPRE_Int             ss_nsh_mr_col_version; /* MR column version setting in NSH */
+   HYPRE_Int             ss_nsh_mr_max_row_nnz; /* max rows for MR  */
+   HYPRE_Real           *ss_nsh_droptol;        /* droptol array for NSH */
+   HYPRE_Int             ss_nsh_mr_max_iter;    /* max MR iteration */
+   HYPRE_Real            ss_nsh_mr_tol;
+
+   /* Schur precond data */
+   HYPRE_Int             sp_ilu_type;           /* ilu type is use ILU */
+   HYPRE_Int             sp_ilu_lfil;           /* level of fill in for ILUK */
+   HYPRE_Int             sp_ilu_max_row_nnz;    /* max rows for ILUT  */
+   /* droptol for ILUT or MR
+    * ILUT: [0], [1], [2] B, E&F, S respectively
+    * NSH: [0] for MR, [1] for NSH
+    */
+   HYPRE_Real           *sp_ilu_droptol;        /* droptol array for ILUT */
+   HYPRE_Int             sp_print_level;
+   HYPRE_Int             sp_max_iter;           /* max precond iter or max MR iteration */
+   HYPRE_Int             sp_tri_solve;
+   HYPRE_Int             sp_lower_jacobi_iters;
+   HYPRE_Int             sp_upper_jacobi_iters;
+   HYPRE_Real            sp_tol;
+   HYPRE_Int             test_opt; /* TODO (VPM): change this to something more descriptive*/
+
+   /* local reordering */
+   HYPRE_Int             reordering_type;
+} hypre_ParILUData;
+
+#define hypre_ParILUDataTestOption(ilu_data)                   ((ilu_data) -> test_opt)
+
+#if defined(HYPRE_USING_GPU)
+#define hypre_ParILUDataMatAILUDevice(ilu_data)                ((ilu_data) -> matALU_d)
+#define hypre_ParILUDataMatBILUDevice(ilu_data)                ((ilu_data) -> matBLU_d)
+#define hypre_ParILUDataMatSILUDevice(ilu_data)                ((ilu_data) -> matSLU_d)
+#define hypre_ParILUDataMatEDevice(ilu_data)                   ((ilu_data) -> matE_d)
+#define hypre_ParILUDataMatFDevice(ilu_data)                   ((ilu_data) -> matF_d)
+#define hypre_ParILUDataAperm(ilu_data)                        ((ilu_data) -> Aperm)
+#define hypre_ParILUDataR(ilu_data)                            ((ilu_data) -> R)
+#define hypre_ParILUDataP(ilu_data)                            ((ilu_data) -> P)
+#define hypre_ParILUDataFTempUpper(ilu_data)                   ((ilu_data) -> Ftemp_upper)
+#define hypre_ParILUDataUTempLower(ilu_data)                   ((ilu_data) -> Utemp_lower)
+#define hypre_ParILUDataADiagDiag(ilu_data)                    ((ilu_data) -> Adiag_diag)
+#define hypre_ParILUDataSDiagDiag(ilu_data)                    ((ilu_data) -> Sdiag_diag)
+#endif
+
+#define hypre_ParILUDataGlobalSolver(ilu_data)                 ((ilu_data) -> global_solver)
+#define hypre_ParILUDataMatA(ilu_data)                         ((ilu_data) -> matA)
+#define hypre_ParILUDataMatL(ilu_data)                         ((ilu_data) -> matL)
+#define hypre_ParILUDataMatD(ilu_data)                         ((ilu_data) -> matD)
+#define hypre_ParILUDataMatU(ilu_data)                         ((ilu_data) -> matU)
+#define hypre_ParILUDataMatLModified(ilu_data)                 ((ilu_data) -> matmL)
+#define hypre_ParILUDataMatDModified(ilu_data)                 ((ilu_data) -> matmD)
+#define hypre_ParILUDataMatUModified(ilu_data)                 ((ilu_data) -> matmU)
+#define hypre_ParILUDataMatS(ilu_data)                         ((ilu_data) -> matS)
+#define hypre_ParILUDataDroptol(ilu_data)                      ((ilu_data) -> droptol)
+#define hypre_ParILUDataLfil(ilu_data)                         ((ilu_data) -> lfil)
+#define hypre_ParILUDataMaxRowNnz(ilu_data)                    ((ilu_data) -> maxRowNnz)
+#define hypre_ParILUDataCFMarkerArray(ilu_data)                ((ilu_data) -> CF_marker_array)
+#define hypre_ParILUDataPerm(ilu_data)                         ((ilu_data) -> perm)
+#define hypre_ParILUDataPPerm(ilu_data)                        ((ilu_data) -> perm)
+#define hypre_ParILUDataQPerm(ilu_data)                        ((ilu_data) -> qperm)
+#define hypre_ParILUDataTolDDPQ(ilu_data)                      ((ilu_data) -> tol_ddPQ)
+#define hypre_ParILUDataF(ilu_data)                            ((ilu_data) -> F)
+#define hypre_ParILUDataU(ilu_data)                            ((ilu_data) -> U)
+#define hypre_ParILUDataResidual(ilu_data)                     ((ilu_data) -> residual)
+#define hypre_ParILUDataRelResNorms(ilu_data)                  ((ilu_data) -> rel_res_norms)
+#define hypre_ParILUDataNumIterations(ilu_data)                ((ilu_data) -> num_iterations)
+#define hypre_ParILUDataL1Norms(ilu_data)                      ((ilu_data) -> l1_norms)
+#define hypre_ParILUDataFinalRelResidualNorm(ilu_data)         ((ilu_data) -> final_rel_residual_norm)
+#define hypre_ParILUDataTol(ilu_data)                          ((ilu_data) -> tol)
+#define hypre_ParILUDataOperatorComplexity(ilu_data)           ((ilu_data) -> operator_complexity)
+#define hypre_ParILUDataLogging(ilu_data)                      ((ilu_data) -> logging)
+#define hypre_ParILUDataPrintLevel(ilu_data)                   ((ilu_data) -> print_level)
+#define hypre_ParILUDataMaxIter(ilu_data)                      ((ilu_data) -> max_iter)
+#define hypre_ParILUDataTriSolve(ilu_data)                     ((ilu_data) -> tri_solve)
+#define hypre_ParILUDataLowerJacobiIters(ilu_data)             ((ilu_data) -> lower_jacobi_iters)
+#define hypre_ParILUDataUpperJacobiIters(ilu_data)             ((ilu_data) -> upper_jacobi_iters)
+#define hypre_ParILUDataIluType(ilu_data)                      ((ilu_data) -> ilu_type)
+#define hypre_ParILUDataNLU(ilu_data)                          ((ilu_data) -> nLU)
+#define hypre_ParILUDataNI(ilu_data)                           ((ilu_data) -> nI)
+#define hypre_ParILUDataUEnd(ilu_data)                         ((ilu_data) -> u_end)
+#define hypre_ParILUDataUTemp(ilu_data)                        ((ilu_data) -> Utemp)
+#define hypre_ParILUDataFTemp(ilu_data)                        ((ilu_data) -> Ftemp)
+#define hypre_ParILUDataXTemp(ilu_data)                        ((ilu_data) -> Xtemp)
+#define hypre_ParILUDataYTemp(ilu_data)                        ((ilu_data) -> Ytemp)
+#define hypre_ParILUDataZTemp(ilu_data)                        ((ilu_data) -> Ztemp)
+#define hypre_ParILUDataUExt(ilu_data)                         ((ilu_data) -> uext)
+#define hypre_ParILUDataFExt(ilu_data)                         ((ilu_data) -> fext)
+#define hypre_ParILUDataSchurSolver(ilu_data)                  ((ilu_data) -> schur_solver)
+#define hypre_ParILUDataSchurPrecond(ilu_data)                 ((ilu_data) -> schur_precond)
+#define hypre_ParILUDataRhs(ilu_data)                          ((ilu_data) -> rhs)
+#define hypre_ParILUDataX(ilu_data)                            ((ilu_data) -> x)
+#define hypre_ParILUDataReorderingType(ilu_data)               ((ilu_data) -> reordering_type)
+
+/* Iterative ILU setup */
+#define hypre_ParILUDataIterativeSetupType(ilu_data)           ((ilu_data) -> iter_setup_type)
+#define hypre_ParILUDataIterativeSetupOption(ilu_data)         ((ilu_data) -> iter_setup_option)
+#define hypre_ParILUDataIterativeSetupMaxIter(ilu_data)        ((ilu_data) -> setup_max_iter)
+#define hypre_ParILUDataIterativeSetupNumIter(ilu_data)        ((ilu_data) -> setup_num_iter)
+#define hypre_ParILUDataIterativeSetupTolerance(ilu_data)      ((ilu_data) -> setup_tolerance)
+#define hypre_ParILUDataIterativeSetupHistory(ilu_data)        ((ilu_data) -> setup_history)
+#define hypre_ParILUDataIterSetupCorrectionNorm(ilu_data,i)    ((ilu_data) -> setup_history[i])
+#define hypre_ParILUDataIterSetupResidualNorm(ilu_data,i)      (((ilu_data) -> setup_history + \
+                                                                 (ilu_data) -> setup_num_iter)[i])
+
+/* Schur System */
+#define hypre_ParILUDataSchurGMRESKDim(ilu_data)               ((ilu_data) -> ss_kDim)
+#define hypre_ParILUDataSchurGMRESMaxIter(ilu_data)            ((ilu_data) -> ss_max_iter)
+#define hypre_ParILUDataSchurGMRESTol(ilu_data)                ((ilu_data) -> ss_tol)
+#define hypre_ParILUDataSchurGMRESAbsoluteTol(ilu_data)        ((ilu_data) -> ss_absolute_tol)
+#define hypre_ParILUDataSchurGMRESRelChange(ilu_data)          ((ilu_data) -> ss_rel_change)
+#define hypre_ParILUDataSchurPrecondIluType(ilu_data)          ((ilu_data) -> sp_ilu_type)
+#define hypre_ParILUDataSchurPrecondIluLfil(ilu_data)          ((ilu_data) -> sp_ilu_lfil)
+#define hypre_ParILUDataSchurPrecondIluMaxRowNnz(ilu_data)     ((ilu_data) -> sp_ilu_max_row_nnz)
+#define hypre_ParILUDataSchurPrecondIluDroptol(ilu_data)       ((ilu_data) -> sp_ilu_droptol)
+#define hypre_ParILUDataSchurPrecondPrintLevel(ilu_data)       ((ilu_data) -> sp_print_level)
+#define hypre_ParILUDataSchurPrecondMaxIter(ilu_data)          ((ilu_data) -> sp_max_iter)
+#define hypre_ParILUDataSchurPrecondTriSolve(ilu_data)         ((ilu_data) -> sp_tri_solve)
+#define hypre_ParILUDataSchurPrecondLowerJacobiIters(ilu_data) ((ilu_data) -> sp_lower_jacobi_iters)
+#define hypre_ParILUDataSchurPrecondUpperJacobiIters(ilu_data) ((ilu_data) -> sp_upper_jacobi_iters)
+#define hypre_ParILUDataSchurPrecondTol(ilu_data)              ((ilu_data) -> sp_tol)
+
+#define hypre_ParILUDataSchurNSHMaxNumIter(ilu_data)           ((ilu_data) -> ss_nsh_setup_max_iter)
+#define hypre_ParILUDataSchurNSHSolveMaxIter(ilu_data)         ((ilu_data) -> ss_nsh_solve_max_iter)
+#define hypre_ParILUDataSchurNSHTol(ilu_data)                  ((ilu_data) -> ss_nsh_setup_tol)
+#define hypre_ParILUDataSchurNSHSolveTol(ilu_data)             ((ilu_data) -> ss_nsh_solve_tol)
+#define hypre_ParILUDataSchurNSHMaxRowNnz(ilu_data)            ((ilu_data) -> ss_nsh_max_row_nnz)
+#define hypre_ParILUDataSchurMRColVersion(ilu_data)            ((ilu_data) -> ss_nsh_mr_col_version)
+#define hypre_ParILUDataSchurMRMaxRowNnz(ilu_data)             ((ilu_data) -> ss_nsh_mr_max_row_nnz)
+#define hypre_ParILUDataSchurNSHDroptol(ilu_data)              ((ilu_data) -> ss_nsh_droptol)
+#define hypre_ParILUDataSchurMRMaxIter(ilu_data)               ((ilu_data) -> ss_nsh_mr_max_iter)
+#define hypre_ParILUDataSchurMRTol(ilu_data)                   ((ilu_data) -> ss_nsh_mr_tol)
+
+#define hypre_ParILUDataSchurSolverLogging(ilu_data)           ((ilu_data) -> ss_logging)
+#define hypre_ParILUDataSchurSolverPrintLevel(ilu_data)        ((ilu_data) -> ss_print_level)
+
+#define FMRK   -1
+#define CMRK    1
+#define UMRK    0
+#define S_CMRK  2
+
+#define FPT(i, bsize) (((i) % (bsize)) == FMRK)
+#define CPT(i, bsize) (((i) % (bsize)) == CMRK)
+
+#define MAT_TOL     1e-14
+#define EXPAND_FACT 1.3
+
+/* NSH data structure */
+
+typedef struct hypre_ParNSHData_struct
+{
+   /* solver information */
+   HYPRE_Int              global_solver;
+   hypre_ParCSRMatrix    *matA;
+   hypre_ParCSRMatrix    *matM;
+   hypre_ParVector       *F;
+   hypre_ParVector       *U;
+   hypre_ParVector       *residual;
+   HYPRE_Real            *rel_res_norms;
+   HYPRE_Int              num_iterations;
+   HYPRE_Real            *l1_norms;
+   HYPRE_Real             final_rel_residual_norm;
+   HYPRE_Real             tol;
+   HYPRE_Real             operator_complexity;
+   HYPRE_Int              logging;
+   HYPRE_Int              print_level;
+   HYPRE_Int              max_iter;
+
+   /* common data slots */
+   HYPRE_Real            *droptol; /* 2 drop torelances for {MR, NSH}*/
+   HYPRE_Int              own_droptol_data;
+
+   /* temp vectors for solve phase */
+   hypre_ParVector       *Utemp;
+   hypre_ParVector       *Ftemp;
+
+   /* data slots for local MR */
+   HYPRE_Int              mr_max_iter;
+   HYPRE_Real             mr_tol;
+   HYPRE_Int              mr_max_row_nnz;
+   HYPRE_Int              mr_col_version; /* global version or column version MR */
+
+   /* data slots for global NSH */
+   HYPRE_Int              nsh_max_iter;
+   HYPRE_Real             nsh_tol;
+   HYPRE_Int              nsh_max_row_nnz;
+} hypre_ParNSHData;
+
+#define hypre_ParNSHDataGlobalSolver(nsh_data)           ((nsh_data) -> global_solver)
+#define hypre_ParNSHDataMatA(nsh_data)                   ((nsh_data) -> matA)
+#define hypre_ParNSHDataMatM(nsh_data)                   ((nsh_data) -> matM)
+#define hypre_ParNSHDataF(nsh_data)                      ((nsh_data) -> F)
+#define hypre_ParNSHDataU(nsh_data)                      ((nsh_data) -> U)
+#define hypre_ParNSHDataResidual(nsh_data)               ((nsh_data) -> residual)
+#define hypre_ParNSHDataRelResNorms(nsh_data)            ((nsh_data) -> rel_res_norms)
+#define hypre_ParNSHDataNumIterations(nsh_data)          ((nsh_data) -> num_iterations)
+#define hypre_ParNSHDataL1Norms(nsh_data)                ((nsh_data) -> l1_norms)
+#define hypre_ParNSHDataFinalRelResidualNorm(nsh_data)   ((nsh_data) -> final_rel_residual_norm)
+#define hypre_ParNSHDataTol(nsh_data)                    ((nsh_data) -> tol)
+#define hypre_ParNSHDataOperatorComplexity(nsh_data)     ((nsh_data) -> operator_complexity)
+#define hypre_ParNSHDataLogging(nsh_data)                ((nsh_data) -> logging)
+#define hypre_ParNSHDataPrintLevel(nsh_data)             ((nsh_data) -> print_level)
+#define hypre_ParNSHDataMaxIter(nsh_data)                ((nsh_data) -> max_iter)
+#define hypre_ParNSHDataDroptol(nsh_data)                ((nsh_data) -> droptol)
+#define hypre_ParNSHDataOwnDroptolData(nsh_data)         ((nsh_data) -> own_droptol_data)
+#define hypre_ParNSHDataUTemp(nsh_data)                  ((nsh_data) -> Utemp)
+#define hypre_ParNSHDataFTemp(nsh_data)                  ((nsh_data) -> Ftemp)
+#define hypre_ParNSHDataMRMaxIter(nsh_data)              ((nsh_data) -> mr_max_iter)
+#define hypre_ParNSHDataMRTol(nsh_data)                  ((nsh_data) -> mr_tol)
+#define hypre_ParNSHDataMRMaxRowNnz(nsh_data)            ((nsh_data) -> mr_max_row_nnz)
+#define hypre_ParNSHDataMRColVersion(nsh_data)           ((nsh_data) -> mr_col_version)
+#define hypre_ParNSHDataNSHMaxIter(nsh_data)             ((nsh_data) -> nsh_max_iter)
+#define hypre_ParNSHDataNSHTol(nsh_data)                 ((nsh_data) -> nsh_tol)
+#define hypre_ParNSHDataNSHMaxRowNnz(nsh_data)           ((nsh_data) -> nsh_max_row_nnz)
+
+#endif /* #ifndef hypre_ParILU_DATA_HEADER */
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -785,756 +1463,1004 @@ typedef struct
 /* ads.c */
 void *hypre_ADSCreate ( void );
 HYPRE_Int hypre_ADSDestroy ( void *solver );
-HYPRE_Int hypre_ADSSetDiscreteCurl ( void *solver , hypre_ParCSRMatrix *C );
-HYPRE_Int hypre_ADSSetDiscreteGradient ( void *solver , hypre_ParCSRMatrix *G );
-HYPRE_Int hypre_ADSSetCoordinateVectors ( void *solver , hypre_ParVector *x , hypre_ParVector *y , hypre_ParVector *z );
-HYPRE_Int hypre_ADSSetInterpolations ( void *solver , hypre_ParCSRMatrix *RT_Pi , hypre_ParCSRMatrix *RT_Pix , hypre_ParCSRMatrix *RT_Piy , hypre_ParCSRMatrix *RT_Piz , hypre_ParCSRMatrix *ND_Pi , hypre_ParCSRMatrix *ND_Pix , hypre_ParCSRMatrix *ND_Piy , hypre_ParCSRMatrix *ND_Piz );
-HYPRE_Int hypre_ADSSetMaxIter ( void *solver , HYPRE_Int maxit );
-HYPRE_Int hypre_ADSSetTol ( void *solver , HYPRE_Real tol );
-HYPRE_Int hypre_ADSSetCycleType ( void *solver , HYPRE_Int cycle_type );
-HYPRE_Int hypre_ADSSetPrintLevel ( void *solver , HYPRE_Int print_level );
-HYPRE_Int hypre_ADSSetSmoothingOptions ( void *solver , HYPRE_Int A_relax_type , HYPRE_Int A_relax_times , HYPRE_Real A_relax_weight , HYPRE_Real A_omega );
-HYPRE_Int hypre_ADSSetChebySmoothingOptions ( void *solver , HYPRE_Int A_cheby_order , HYPRE_Int A_cheby_fraction );
-HYPRE_Int hypre_ADSSetAMSOptions ( void *solver , HYPRE_Int B_C_cycle_type , HYPRE_Int B_C_coarsen_type , HYPRE_Int B_C_agg_levels , HYPRE_Int B_C_relax_type , HYPRE_Real B_C_theta , HYPRE_Int B_C_interp_type , HYPRE_Int B_C_Pmax );
-HYPRE_Int hypre_ADSSetAMGOptions ( void *solver , HYPRE_Int B_Pi_coarsen_type , HYPRE_Int B_Pi_agg_levels , HYPRE_Int B_Pi_relax_type , HYPRE_Real B_Pi_theta , HYPRE_Int B_Pi_interp_type , HYPRE_Int B_Pi_Pmax );
-HYPRE_Int hypre_ADSComputePi ( hypre_ParCSRMatrix *A , hypre_ParCSRMatrix *C , hypre_ParCSRMatrix *G , hypre_ParVector *x , hypre_ParVector *y , hypre_ParVector *z , hypre_ParCSRMatrix *PiNDx , hypre_ParCSRMatrix *PiNDy , hypre_ParCSRMatrix *PiNDz , hypre_ParCSRMatrix **Pi_ptr );
-HYPRE_Int hypre_ADSComputePixyz ( hypre_ParCSRMatrix *A , hypre_ParCSRMatrix *C , hypre_ParCSRMatrix *G , hypre_ParVector *x , hypre_ParVector *y , hypre_ParVector *z , hypre_ParCSRMatrix *PiNDx , hypre_ParCSRMatrix *PiNDy , hypre_ParCSRMatrix *PiNDz , hypre_ParCSRMatrix **Pix_ptr , hypre_ParCSRMatrix **Piy_ptr , hypre_ParCSRMatrix **Piz_ptr );
-HYPRE_Int hypre_ADSSetup ( void *solver , hypre_ParCSRMatrix *A , hypre_ParVector *b , hypre_ParVector *x );
-HYPRE_Int hypre_ADSSolve ( void *solver , hypre_ParCSRMatrix *A , hypre_ParVector *b , hypre_ParVector *x );
-HYPRE_Int hypre_ADSGetNumIterations ( void *solver , HYPRE_Int *num_iterations );
-HYPRE_Int hypre_ADSGetFinalRelativeResidualNorm ( void *solver , HYPRE_Real *rel_resid_norm );
+HYPRE_Int hypre_ADSSetDiscreteCurl ( void *solver, hypre_ParCSRMatrix *C );
+HYPRE_Int hypre_ADSSetDiscreteGradient ( void *solver, hypre_ParCSRMatrix *G );
+HYPRE_Int hypre_ADSSetCoordinateVectors ( void *solver, hypre_ParVector *x, hypre_ParVector *y,
+                                          hypre_ParVector *z );
+HYPRE_Int hypre_ADSSetInterpolations ( void *solver, hypre_ParCSRMatrix *RT_Pi,
+                                       hypre_ParCSRMatrix *RT_Pix, hypre_ParCSRMatrix *RT_Piy,
+                                       hypre_ParCSRMatrix *RT_Piz, hypre_ParCSRMatrix *ND_Pi,
+                                       hypre_ParCSRMatrix *ND_Pix, hypre_ParCSRMatrix *ND_Piy,
+                                       hypre_ParCSRMatrix *ND_Piz );
+HYPRE_Int hypre_ADSSetMaxIter ( void *solver, HYPRE_Int maxit );
+HYPRE_Int hypre_ADSSetTol ( void *solver, HYPRE_Real tol );
+HYPRE_Int hypre_ADSSetCycleType ( void *solver, HYPRE_Int cycle_type );
+HYPRE_Int hypre_ADSSetPrintLevel ( void *solver, HYPRE_Int print_level );
+HYPRE_Int hypre_ADSSetSmoothingOptions ( void *solver, HYPRE_Int A_relax_type,
+                                         HYPRE_Int A_relax_times, HYPRE_Real A_relax_weight, HYPRE_Real A_omega );
+HYPRE_Int hypre_ADSSetChebySmoothingOptions ( void *solver, HYPRE_Int A_cheby_order,
+                                              HYPRE_Real A_cheby_fraction );
+HYPRE_Int hypre_ADSSetAMSOptions ( void *solver, HYPRE_Int B_C_cycle_type,
+                                   HYPRE_Int B_C_coarsen_type, HYPRE_Int B_C_agg_levels, HYPRE_Int B_C_relax_type,
+                                   HYPRE_Real B_C_theta, HYPRE_Int B_C_interp_type, HYPRE_Int B_C_Pmax );
+HYPRE_Int hypre_ADSSetAMGOptions ( void *solver, HYPRE_Int B_Pi_coarsen_type,
+                                   HYPRE_Int B_Pi_agg_levels, HYPRE_Int B_Pi_relax_type, HYPRE_Real B_Pi_theta,
+                                   HYPRE_Int B_Pi_interp_type, HYPRE_Int B_Pi_Pmax );
+HYPRE_Int hypre_ADSComputePi ( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *C, hypre_ParCSRMatrix *G,
+                               hypre_ParVector *x, hypre_ParVector *y, hypre_ParVector *z, hypre_ParCSRMatrix *PiNDx,
+                               hypre_ParCSRMatrix *PiNDy, hypre_ParCSRMatrix *PiNDz, hypre_ParCSRMatrix **Pi_ptr );
+HYPRE_Int hypre_ADSComputePixyz ( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *C,
+                                  hypre_ParCSRMatrix *G, hypre_ParVector *x, hypre_ParVector *y, hypre_ParVector *z,
+                                  hypre_ParCSRMatrix *PiNDx, hypre_ParCSRMatrix *PiNDy, hypre_ParCSRMatrix *PiNDz,
+                                  hypre_ParCSRMatrix **Pix_ptr, hypre_ParCSRMatrix **Piy_ptr, hypre_ParCSRMatrix **Piz_ptr );
+HYPRE_Int hypre_ADSSetup ( void *solver, hypre_ParCSRMatrix *A, hypre_ParVector *b,
+                           hypre_ParVector *x );
+HYPRE_Int hypre_ADSSolve ( void *solver, hypre_ParCSRMatrix *A, hypre_ParVector *b,
+                           hypre_ParVector *x );
+HYPRE_Int hypre_ADSGetNumIterations ( void *solver, HYPRE_Int *num_iterations );
+HYPRE_Int hypre_ADSGetFinalRelativeResidualNorm ( void *solver, HYPRE_Real *rel_resid_norm );
 
 /* ame.c */
 void *hypre_AMECreate ( void );
 HYPRE_Int hypre_AMEDestroy ( void *esolver );
-HYPRE_Int hypre_AMESetAMSSolver ( void *esolver , void *ams_solver );
-HYPRE_Int hypre_AMESetMassMatrix ( void *esolver , hypre_ParCSRMatrix *M );
-HYPRE_Int hypre_AMESetBlockSize ( void *esolver , HYPRE_Int block_size );
-HYPRE_Int hypre_AMESetMaxIter ( void *esolver , HYPRE_Int maxit );
-HYPRE_Int hypre_AMESetTol ( void *esolver , HYPRE_Real tol );
-HYPRE_Int hypre_AMESetRTol ( void *esolver , HYPRE_Real tol );
-HYPRE_Int hypre_AMESetPrintLevel ( void *esolver , HYPRE_Int print_level );
+HYPRE_Int hypre_AMESetAMSSolver ( void *esolver, void *ams_solver );
+HYPRE_Int hypre_AMESetMassMatrix ( void *esolver, hypre_ParCSRMatrix *M );
+HYPRE_Int hypre_AMESetBlockSize ( void *esolver, HYPRE_Int block_size );
+HYPRE_Int hypre_AMESetMaxIter ( void *esolver, HYPRE_Int maxit );
+HYPRE_Int hypre_AMESetMaxPCGIter ( void *esolver, HYPRE_Int maxit );
+HYPRE_Int hypre_AMESetTol ( void *esolver, HYPRE_Real tol );
+HYPRE_Int hypre_AMESetRTol ( void *esolver, HYPRE_Real tol );
+HYPRE_Int hypre_AMESetPrintLevel ( void *esolver, HYPRE_Int print_level );
 HYPRE_Int hypre_AMESetup ( void *esolver );
-HYPRE_Int hypre_AMEDiscrDivFreeComponent ( void *esolver , hypre_ParVector *b );
-void hypre_AMEOperatorA ( void *data , void *x , void *y );
-void hypre_AMEMultiOperatorA ( void *data , void *x , void *y );
-void hypre_AMEOperatorM ( void *data , void *x , void *y );
-void hypre_AMEMultiOperatorM ( void *data , void *x , void *y );
-void hypre_AMEOperatorB ( void *data , void *x , void *y );
-void hypre_AMEMultiOperatorB ( void *data , void *x , void *y );
+HYPRE_Int hypre_AMEDiscrDivFreeComponent ( void *esolver, hypre_ParVector *b );
+void hypre_AMEOperatorA ( void *data, void *x, void *y );
+void hypre_AMEMultiOperatorA ( void *data, void *x, void *y );
+void hypre_AMEOperatorM ( void *data, void *x, void *y );
+void hypre_AMEMultiOperatorM ( void *data, void *x, void *y );
+void hypre_AMEOperatorB ( void *data, void *x, void *y );
+void hypre_AMEMultiOperatorB ( void *data, void *x, void *y );
 HYPRE_Int hypre_AMESolve ( void *esolver );
-HYPRE_Int hypre_AMEGetEigenvectors ( void *esolver , HYPRE_ParVector **eigenvectors_ptr );
-HYPRE_Int hypre_AMEGetEigenvalues ( void *esolver , HYPRE_Real **eigenvalues_ptr );
+HYPRE_Int hypre_AMEGetEigenvectors ( void *esolver, HYPRE_ParVector **eigenvectors_ptr );
+HYPRE_Int hypre_AMEGetEigenvalues ( void *esolver, HYPRE_Real **eigenvalues_ptr );
 
 /* amg_hybrid.c */
 void *hypre_AMGHybridCreate ( void );
 HYPRE_Int hypre_AMGHybridDestroy ( void *AMGhybrid_vdata );
-HYPRE_Int hypre_AMGHybridSetTol ( void *AMGhybrid_vdata , HYPRE_Real tol );
-HYPRE_Int hypre_AMGHybridSetAbsoluteTol ( void *AMGhybrid_vdata , HYPRE_Real a_tol );
-HYPRE_Int hypre_AMGHybridSetConvergenceTol ( void *AMGhybrid_vdata , HYPRE_Real cf_tol );
-HYPRE_Int hypre_AMGHybridSetNonGalerkinTol ( void *AMGhybrid_vdata , HYPRE_Int nongalerk_num_tol, HYPRE_Real *nongalerkin_tol );
-HYPRE_Int hypre_AMGHybridSetDSCGMaxIter ( void *AMGhybrid_vdata , HYPRE_Int dscg_max_its );
-HYPRE_Int hypre_AMGHybridSetPCGMaxIter ( void *AMGhybrid_vdata , HYPRE_Int pcg_max_its );
-HYPRE_Int hypre_AMGHybridSetSetupType ( void *AMGhybrid_vdata , HYPRE_Int setup_type );
-HYPRE_Int hypre_AMGHybridSetSolverType ( void *AMGhybrid_vdata , HYPRE_Int solver_type );
-HYPRE_Int hypre_AMGHybridSetRecomputeResidual ( void *AMGhybrid_vdata , HYPRE_Int recompute_residual );
-HYPRE_Int hypre_AMGHybridGetRecomputeResidual ( void *AMGhybrid_vdata , HYPRE_Int *recompute_residual );
-HYPRE_Int hypre_AMGHybridSetRecomputeResidualP ( void *AMGhybrid_vdata , HYPRE_Int recompute_residual_p );
-HYPRE_Int hypre_AMGHybridGetRecomputeResidualP ( void *AMGhybrid_vdata , HYPRE_Int *recompute_residual_p );
-HYPRE_Int hypre_AMGHybridSetKDim ( void *AMGhybrid_vdata , HYPRE_Int k_dim );
-HYPRE_Int hypre_AMGHybridSetStopCrit ( void *AMGhybrid_vdata , HYPRE_Int stop_crit );
-HYPRE_Int hypre_AMGHybridSetTwoNorm ( void *AMGhybrid_vdata , HYPRE_Int two_norm );
-HYPRE_Int hypre_AMGHybridSetRelChange ( void *AMGhybrid_vdata , HYPRE_Int rel_change );
-HYPRE_Int hypre_AMGHybridSetPrecond ( void *pcg_vdata , HYPRE_Int (*pcg_precond_solve )(void*,void*,void*,void*), HYPRE_Int (*pcg_precond_setup )(void*,void*,void*,void*), void *pcg_precond );
-HYPRE_Int hypre_AMGHybridSetLogging ( void *AMGhybrid_vdata , HYPRE_Int logging );
-HYPRE_Int hypre_AMGHybridSetPrintLevel ( void *AMGhybrid_vdata , HYPRE_Int print_level );
-HYPRE_Int hypre_AMGHybridSetStrongThreshold ( void *AMGhybrid_vdata , HYPRE_Real strong_threshold );
-HYPRE_Int hypre_AMGHybridSetMaxRowSum ( void *AMGhybrid_vdata , HYPRE_Real max_row_sum );
-HYPRE_Int hypre_AMGHybridSetTruncFactor ( void *AMGhybrid_vdata , HYPRE_Real trunc_factor );
-HYPRE_Int hypre_AMGHybridSetPMaxElmts ( void *AMGhybrid_vdata , HYPRE_Int P_max_elmts );
-HYPRE_Int hypre_AMGHybridSetMaxLevels ( void *AMGhybrid_vdata , HYPRE_Int max_levels );
-HYPRE_Int hypre_AMGHybridSetMeasureType ( void *AMGhybrid_vdata , HYPRE_Int measure_type );
-HYPRE_Int hypre_AMGHybridSetCoarsenType ( void *AMGhybrid_vdata , HYPRE_Int coarsen_type );
-HYPRE_Int hypre_AMGHybridSetInterpType ( void *AMGhybrid_vdata , HYPRE_Int interp_type );
-HYPRE_Int hypre_AMGHybridSetCycleType ( void *AMGhybrid_vdata , HYPRE_Int cycle_type );
-HYPRE_Int hypre_AMGHybridSetNumSweeps ( void *AMGhybrid_vdata , HYPRE_Int num_sweeps );
-HYPRE_Int hypre_AMGHybridSetCycleNumSweeps ( void *AMGhybrid_vdata , HYPRE_Int num_sweeps , HYPRE_Int k );
-HYPRE_Int hypre_AMGHybridSetRelaxType ( void *AMGhybrid_vdata , HYPRE_Int relax_type );
-HYPRE_Int hypre_AMGHybridSetKeepTranspose ( void *AMGhybrid_vdata , HYPRE_Int keepT );
-HYPRE_Int hypre_AMGHybridSetSplittingStrategy( void *AMGhybrid_vdata , HYPRE_Int splitting_strategy );
-HYPRE_Int hypre_AMGHybridSetCycleRelaxType ( void *AMGhybrid_vdata , HYPRE_Int relax_type , HYPRE_Int k );
-HYPRE_Int hypre_AMGHybridSetRelaxOrder ( void *AMGhybrid_vdata , HYPRE_Int relax_order );
-HYPRE_Int hypre_AMGHybridSetMaxCoarseSize ( void *AMGhybrid_vdata , HYPRE_Int max_coarse_size );
-HYPRE_Int hypre_AMGHybridSetMinCoarseSize ( void *AMGhybrid_vdata , HYPRE_Int min_coarse_size );
-HYPRE_Int hypre_AMGHybridSetSeqThreshold ( void *AMGhybrid_vdata , HYPRE_Int seq_threshold );
-HYPRE_Int hypre_AMGHybridSetNumGridSweeps ( void *AMGhybrid_vdata , HYPRE_Int *num_grid_sweeps );
-HYPRE_Int hypre_AMGHybridSetGridRelaxType ( void *AMGhybrid_vdata , HYPRE_Int *grid_relax_type );
-HYPRE_Int hypre_AMGHybridSetGridRelaxPoints ( void *AMGhybrid_vdata , HYPRE_Int **grid_relax_points );
-HYPRE_Int hypre_AMGHybridSetRelaxWeight ( void *AMGhybrid_vdata , HYPRE_Real *relax_weight );
-HYPRE_Int hypre_AMGHybridSetOmega ( void *AMGhybrid_vdata , HYPRE_Real *omega );
-HYPRE_Int hypre_AMGHybridSetRelaxWt ( void *AMGhybrid_vdata , HYPRE_Real relax_wt );
-HYPRE_Int hypre_AMGHybridSetLevelRelaxWt ( void *AMGhybrid_vdata , HYPRE_Real relax_wt , HYPRE_Int level );
-HYPRE_Int hypre_AMGHybridSetOuterWt ( void *AMGhybrid_vdata , HYPRE_Real outer_wt );
-HYPRE_Int hypre_AMGHybridSetLevelOuterWt ( void *AMGhybrid_vdata , HYPRE_Real outer_wt , HYPRE_Int level );
-HYPRE_Int hypre_AMGHybridSetNumPaths ( void *AMGhybrid_vdata , HYPRE_Int num_paths );
-HYPRE_Int hypre_AMGHybridSetDofFunc ( void *AMGhybrid_vdata , HYPRE_Int *dof_func );
-HYPRE_Int hypre_AMGHybridSetAggNumLevels ( void *AMGhybrid_vdata , HYPRE_Int agg_num_levels );
-HYPRE_Int hypre_AMGHybridSetAggInterpType ( void *AMGhybrid_vdata , HYPRE_Int agg_interp_type );
-HYPRE_Int hypre_AMGHybridSetNumFunctions ( void *AMGhybrid_vdata , HYPRE_Int num_functions );
-HYPRE_Int hypre_AMGHybridSetNodal ( void *AMGhybrid_vdata , HYPRE_Int nodal );
+HYPRE_Int hypre_AMGHybridSetTol ( void *AMGhybrid_vdata, HYPRE_Real tol );
+HYPRE_Int hypre_AMGHybridSetAbsoluteTol ( void *AMGhybrid_vdata, HYPRE_Real a_tol );
+HYPRE_Int hypre_AMGHybridSetConvergenceTol ( void *AMGhybrid_vdata, HYPRE_Real cf_tol );
+HYPRE_Int hypre_AMGHybridSetNonGalerkinTol ( void *AMGhybrid_vdata, HYPRE_Int nongalerk_num_tol,
+                                             HYPRE_Real *nongalerkin_tol );
+HYPRE_Int hypre_AMGHybridSetDSCGMaxIter ( void *AMGhybrid_vdata, HYPRE_Int dscg_max_its );
+HYPRE_Int hypre_AMGHybridSetPCGMaxIter ( void *AMGhybrid_vdata, HYPRE_Int pcg_max_its );
+HYPRE_Int hypre_AMGHybridSetSetupType ( void *AMGhybrid_vdata, HYPRE_Int setup_type );
+HYPRE_Int hypre_AMGHybridSetSolverType ( void *AMGhybrid_vdata, HYPRE_Int solver_type );
+HYPRE_Int hypre_AMGHybridSetRecomputeResidual ( void *AMGhybrid_vdata,
+                                                HYPRE_Int recompute_residual );
+HYPRE_Int hypre_AMGHybridGetRecomputeResidual ( void *AMGhybrid_vdata,
+                                                HYPRE_Int *recompute_residual );
+HYPRE_Int hypre_AMGHybridSetRecomputeResidualP ( void *AMGhybrid_vdata,
+                                                 HYPRE_Int recompute_residual_p );
+HYPRE_Int hypre_AMGHybridGetRecomputeResidualP ( void *AMGhybrid_vdata,
+                                                 HYPRE_Int *recompute_residual_p );
+HYPRE_Int hypre_AMGHybridSetKDim ( void *AMGhybrid_vdata, HYPRE_Int k_dim );
+HYPRE_Int hypre_AMGHybridSetStopCrit ( void *AMGhybrid_vdata, HYPRE_Int stop_crit );
+HYPRE_Int hypre_AMGHybridSetTwoNorm ( void *AMGhybrid_vdata, HYPRE_Int two_norm );
+HYPRE_Int hypre_AMGHybridSetRelChange ( void *AMGhybrid_vdata, HYPRE_Int rel_change );
+HYPRE_Int hypre_AMGHybridSetPrecond ( void *pcg_vdata, HYPRE_Int (*pcg_precond_solve )(void*, void*,
+                                                                                       void*, void*), HYPRE_Int (*pcg_precond_setup )(void*, void*, void*, void*), void *pcg_precond );
+HYPRE_Int hypre_AMGHybridSetLogging ( void *AMGhybrid_vdata, HYPRE_Int logging );
+HYPRE_Int hypre_AMGHybridSetPrintLevel ( void *AMGhybrid_vdata, HYPRE_Int print_level );
+HYPRE_Int hypre_AMGHybridSetStrongThreshold ( void *AMGhybrid_vdata, HYPRE_Real strong_threshold );
+HYPRE_Int hypre_AMGHybridSetMaxRowSum ( void *AMGhybrid_vdata, HYPRE_Real max_row_sum );
+HYPRE_Int hypre_AMGHybridSetTruncFactor ( void *AMGhybrid_vdata, HYPRE_Real trunc_factor );
+HYPRE_Int hypre_AMGHybridSetPMaxElmts ( void *AMGhybrid_vdata, HYPRE_Int P_max_elmts );
+HYPRE_Int hypre_AMGHybridSetMaxLevels ( void *AMGhybrid_vdata, HYPRE_Int max_levels );
+HYPRE_Int hypre_AMGHybridSetMeasureType ( void *AMGhybrid_vdata, HYPRE_Int measure_type );
+HYPRE_Int hypre_AMGHybridSetCoarsenType ( void *AMGhybrid_vdata, HYPRE_Int coarsen_type );
+HYPRE_Int hypre_AMGHybridSetInterpType ( void *AMGhybrid_vdata, HYPRE_Int interp_type );
+HYPRE_Int hypre_AMGHybridSetCycleType ( void *AMGhybrid_vdata, HYPRE_Int cycle_type );
+HYPRE_Int hypre_AMGHybridSetNumSweeps ( void *AMGhybrid_vdata, HYPRE_Int num_sweeps );
+HYPRE_Int hypre_AMGHybridSetCycleNumSweeps ( void *AMGhybrid_vdata, HYPRE_Int num_sweeps,
+                                             HYPRE_Int k );
+HYPRE_Int hypre_AMGHybridSetRelaxType ( void *AMGhybrid_vdata, HYPRE_Int relax_type );
+HYPRE_Int hypre_AMGHybridSetKeepTranspose ( void *AMGhybrid_vdata, HYPRE_Int keepT );
+HYPRE_Int hypre_AMGHybridSetSplittingStrategy( void *AMGhybrid_vdata,
+                                               HYPRE_Int splitting_strategy );
+HYPRE_Int hypre_AMGHybridSetCycleRelaxType ( void *AMGhybrid_vdata, HYPRE_Int relax_type,
+                                             HYPRE_Int k );
+HYPRE_Int hypre_AMGHybridSetRelaxOrder ( void *AMGhybrid_vdata, HYPRE_Int relax_order );
+HYPRE_Int hypre_AMGHybridSetMaxCoarseSize ( void *AMGhybrid_vdata, HYPRE_Int max_coarse_size );
+HYPRE_Int hypre_AMGHybridSetMinCoarseSize ( void *AMGhybrid_vdata, HYPRE_Int min_coarse_size );
+HYPRE_Int hypre_AMGHybridSetSeqThreshold ( void *AMGhybrid_vdata, HYPRE_Int seq_threshold );
+HYPRE_Int hypre_AMGHybridSetNumGridSweeps ( void *AMGhybrid_vdata, HYPRE_Int *num_grid_sweeps );
+HYPRE_Int hypre_AMGHybridSetGridRelaxType ( void *AMGhybrid_vdata, HYPRE_Int *grid_relax_type );
+HYPRE_Int hypre_AMGHybridSetGridRelaxPoints ( void *AMGhybrid_vdata,
+                                              HYPRE_Int **grid_relax_points );
+HYPRE_Int hypre_AMGHybridSetRelaxWeight ( void *AMGhybrid_vdata, HYPRE_Real *relax_weight );
+HYPRE_Int hypre_AMGHybridSetOmega ( void *AMGhybrid_vdata, HYPRE_Real *omega );
+HYPRE_Int hypre_AMGHybridSetRelaxWt ( void *AMGhybrid_vdata, HYPRE_Real relax_wt );
+HYPRE_Int hypre_AMGHybridSetLevelRelaxWt ( void *AMGhybrid_vdata, HYPRE_Real relax_wt,
+                                           HYPRE_Int level );
+HYPRE_Int hypre_AMGHybridSetOuterWt ( void *AMGhybrid_vdata, HYPRE_Real outer_wt );
+HYPRE_Int hypre_AMGHybridSetLevelOuterWt ( void *AMGhybrid_vdata, HYPRE_Real outer_wt,
+                                           HYPRE_Int level );
+HYPRE_Int hypre_AMGHybridSetNumPaths ( void *AMGhybrid_vdata, HYPRE_Int num_paths );
+HYPRE_Int hypre_AMGHybridSetDofFunc ( void *AMGhybrid_vdata, HYPRE_Int *dof_func );
+HYPRE_Int hypre_AMGHybridSetAggNumLevels ( void *AMGhybrid_vdata, HYPRE_Int agg_num_levels );
+HYPRE_Int hypre_AMGHybridSetAggInterpType ( void *AMGhybrid_vdata, HYPRE_Int agg_interp_type );
+HYPRE_Int hypre_AMGHybridSetNumFunctions ( void *AMGhybrid_vdata, HYPRE_Int num_functions );
+HYPRE_Int hypre_AMGHybridSetNodal ( void *AMGhybrid_vdata, HYPRE_Int nodal );
 HYPRE_Int hypre_AMGHybridGetSetupSolveTime( void *AMGhybrid_vdata, HYPRE_Real *time );
-HYPRE_Int hypre_AMGHybridGetNumIterations ( void *AMGhybrid_vdata , HYPRE_Int *num_its );
-HYPRE_Int hypre_AMGHybridGetDSCGNumIterations ( void *AMGhybrid_vdata , HYPRE_Int *dscg_num_its );
-HYPRE_Int hypre_AMGHybridGetPCGNumIterations ( void *AMGhybrid_vdata , HYPRE_Int *pcg_num_its );
-HYPRE_Int hypre_AMGHybridGetFinalRelativeResidualNorm ( void *AMGhybrid_vdata , HYPRE_Real *final_rel_res_norm );
-HYPRE_Int hypre_AMGHybridSetup ( void *AMGhybrid_vdata , hypre_ParCSRMatrix *A , hypre_ParVector *b , hypre_ParVector *x );
-HYPRE_Int hypre_AMGHybridSolve ( void *AMGhybrid_vdata , hypre_ParCSRMatrix *A , hypre_ParVector *b , hypre_ParVector *x );
+HYPRE_Int hypre_AMGHybridGetNumIterations ( void *AMGhybrid_vdata, HYPRE_Int *num_its );
+HYPRE_Int hypre_AMGHybridGetDSCGNumIterations ( void *AMGhybrid_vdata, HYPRE_Int *dscg_num_its );
+HYPRE_Int hypre_AMGHybridGetPCGNumIterations ( void *AMGhybrid_vdata, HYPRE_Int *pcg_num_its );
+HYPRE_Int hypre_AMGHybridGetFinalRelativeResidualNorm ( void *AMGhybrid_vdata,
+                                                        HYPRE_Real *final_rel_res_norm );
+HYPRE_Int hypre_AMGHybridSetup ( void *AMGhybrid_vdata, hypre_ParCSRMatrix *A, hypre_ParVector *b,
+                                 hypre_ParVector *x );
+HYPRE_Int hypre_AMGHybridSolve ( void *AMGhybrid_vdata, hypre_ParCSRMatrix *A, hypre_ParVector *b,
+                                 hypre_ParVector *x );
 
 /* ams.c */
-HYPRE_Int hypre_ParCSRRelax ( hypre_ParCSRMatrix *A , hypre_ParVector *f , HYPRE_Int relax_type , HYPRE_Int relax_times , HYPRE_Real *l1_norms , HYPRE_Real relax_weight , HYPRE_Real omega , HYPRE_Real max_eig_est , HYPRE_Real min_eig_est , HYPRE_Int cheby_order , HYPRE_Real cheby_fraction , hypre_ParVector *u , hypre_ParVector *v , hypre_ParVector *z );
+HYPRE_Int hypre_ParCSRRelax ( hypre_ParCSRMatrix *A, hypre_ParVector *f, HYPRE_Int relax_type,
+                              HYPRE_Int relax_times, HYPRE_Real *l1_norms, HYPRE_Real relax_weight, HYPRE_Real omega,
+                              HYPRE_Real max_eig_est, HYPRE_Real min_eig_est, HYPRE_Int cheby_order, HYPRE_Real cheby_fraction,
+                              hypre_ParVector *u, hypre_ParVector *v, hypre_ParVector *z );
 hypre_ParVector *hypre_ParVectorInRangeOf ( hypre_ParCSRMatrix *A );
 hypre_ParVector *hypre_ParVectorInDomainOf ( hypre_ParCSRMatrix *A );
-HYPRE_Int hypre_ParVectorBlockSplit ( hypre_ParVector *x , hypre_ParVector *x_ [3 ], HYPRE_Int dim );
-HYPRE_Int hypre_ParVectorBlockGather ( hypre_ParVector *x , hypre_ParVector *x_ [3 ], HYPRE_Int dim );
-HYPRE_Int hypre_BoomerAMGBlockSolve ( void *B , hypre_ParCSRMatrix *A , hypre_ParVector *b , hypre_ParVector *x );
+HYPRE_Int hypre_ParVectorBlockSplit ( hypre_ParVector *x, hypre_ParVector *x_ [3 ], HYPRE_Int dim );
+HYPRE_Int hypre_ParVectorBlockGather ( hypre_ParVector *x, hypre_ParVector *x_ [3 ],
+                                       HYPRE_Int dim );
+HYPRE_Int hypre_BoomerAMGBlockSolve ( void *B, hypre_ParCSRMatrix *A, hypre_ParVector *b,
+                                      hypre_ParVector *x );
 HYPRE_Int hypre_ParCSRMatrixFixZeroRows ( hypre_ParCSRMatrix *A );
-HYPRE_Int hypre_ParCSRComputeL1Norms ( hypre_ParCSRMatrix *A , HYPRE_Int option , HYPRE_Int *cf_marker , HYPRE_Real **l1_norm_ptr );
-HYPRE_Int hypre_ParCSRMatrixSetDiagRows ( hypre_ParCSRMatrix *A , HYPRE_Real d );
+HYPRE_Int hypre_ParCSRComputeL1Norms ( hypre_ParCSRMatrix *A, HYPRE_Int option,
+                                       HYPRE_Int *cf_marker, HYPRE_Real **l1_norm_ptr );
+HYPRE_Int hypre_ParCSRMatrixSetDiagRows ( hypre_ParCSRMatrix *A, HYPRE_Real d );
 void *hypre_AMSCreate ( void );
 HYPRE_Int hypre_AMSDestroy ( void *solver );
-HYPRE_Int hypre_AMSSetDimension ( void *solver , HYPRE_Int dim );
-HYPRE_Int hypre_AMSSetDiscreteGradient ( void *solver , hypre_ParCSRMatrix *G );
-HYPRE_Int hypre_AMSSetCoordinateVectors ( void *solver , hypre_ParVector *x , hypre_ParVector *y , hypre_ParVector *z );
-HYPRE_Int hypre_AMSSetEdgeConstantVectors ( void *solver , hypre_ParVector *Gx , hypre_ParVector *Gy , hypre_ParVector *Gz );
-HYPRE_Int hypre_AMSSetInterpolations ( void *solver , hypre_ParCSRMatrix *Pi , hypre_ParCSRMatrix *Pix , hypre_ParCSRMatrix *Piy , hypre_ParCSRMatrix *Piz );
-HYPRE_Int hypre_AMSSetAlphaPoissonMatrix ( void *solver , hypre_ParCSRMatrix *A_Pi );
-HYPRE_Int hypre_AMSSetBetaPoissonMatrix ( void *solver , hypre_ParCSRMatrix *A_G );
-HYPRE_Int hypre_AMSSetInteriorNodes ( void *solver , hypre_ParVector *interior_nodes );
-HYPRE_Int hypre_AMSSetProjectionFrequency ( void *solver , HYPRE_Int projection_frequency );
-HYPRE_Int hypre_AMSSetMaxIter ( void *solver , HYPRE_Int maxit );
-HYPRE_Int hypre_AMSSetTol ( void *solver , HYPRE_Real tol );
-HYPRE_Int hypre_AMSSetCycleType ( void *solver , HYPRE_Int cycle_type );
-HYPRE_Int hypre_AMSSetPrintLevel ( void *solver , HYPRE_Int print_level );
-HYPRE_Int hypre_AMSSetSmoothingOptions ( void *solver , HYPRE_Int A_relax_type , HYPRE_Int A_relax_times , HYPRE_Real A_relax_weight , HYPRE_Real A_omega );
-HYPRE_Int hypre_AMSSetChebySmoothingOptions ( void *solver , HYPRE_Int A_cheby_order , HYPRE_Int A_cheby_fraction );
-HYPRE_Int hypre_AMSSetAlphaAMGOptions ( void *solver , HYPRE_Int B_Pi_coarsen_type , HYPRE_Int B_Pi_agg_levels , HYPRE_Int B_Pi_relax_type , HYPRE_Real B_Pi_theta , HYPRE_Int B_Pi_interp_type , HYPRE_Int B_Pi_Pmax );
-HYPRE_Int hypre_AMSSetAlphaAMGCoarseRelaxType ( void *solver , HYPRE_Int B_Pi_coarse_relax_type );
-HYPRE_Int hypre_AMSSetBetaAMGOptions ( void *solver , HYPRE_Int B_G_coarsen_type , HYPRE_Int B_G_agg_levels , HYPRE_Int B_G_relax_type , HYPRE_Real B_G_theta , HYPRE_Int B_G_interp_type , HYPRE_Int B_G_Pmax );
-HYPRE_Int hypre_AMSSetBetaAMGCoarseRelaxType ( void *solver , HYPRE_Int B_G_coarse_relax_type );
-HYPRE_Int hypre_AMSComputePi ( hypre_ParCSRMatrix *A , hypre_ParCSRMatrix *G , hypre_ParVector *Gx , hypre_ParVector *Gy , hypre_ParVector *Gz , HYPRE_Int dim , hypre_ParCSRMatrix **Pi_ptr );
-HYPRE_Int hypre_AMSComputePixyz ( hypre_ParCSRMatrix *A , hypre_ParCSRMatrix *G , hypre_ParVector *Gx , hypre_ParVector *Gy , hypre_ParVector *Gz , HYPRE_Int dim , hypre_ParCSRMatrix **Pix_ptr , hypre_ParCSRMatrix **Piy_ptr , hypre_ParCSRMatrix **Piz_ptr );
-HYPRE_Int hypre_AMSComputeGPi ( hypre_ParCSRMatrix *A , hypre_ParCSRMatrix *G , hypre_ParVector *Gx , hypre_ParVector *Gy , hypre_ParVector *Gz , HYPRE_Int dim , hypre_ParCSRMatrix **GPi_ptr );
-HYPRE_Int hypre_AMSSetup ( void *solver , hypre_ParCSRMatrix *A , hypre_ParVector *b , hypre_ParVector *x );
-HYPRE_Int hypre_AMSSolve ( void *solver , hypre_ParCSRMatrix *A , hypre_ParVector *b , hypre_ParVector *x );
-HYPRE_Int hypre_ParCSRSubspacePrec ( hypre_ParCSRMatrix *A0 , HYPRE_Int A0_relax_type , HYPRE_Int A0_relax_times , HYPRE_Real *A0_l1_norms , HYPRE_Real A0_relax_weight , HYPRE_Real A0_omega , HYPRE_Real A0_max_eig_est , HYPRE_Real A0_min_eig_est , HYPRE_Int A0_cheby_order , HYPRE_Real A0_cheby_fraction , hypre_ParCSRMatrix **A , HYPRE_Solver *B , HYPRE_PtrToSolverFcn *HB , hypre_ParCSRMatrix **P , hypre_ParVector **r , hypre_ParVector **g , hypre_ParVector *x , hypre_ParVector *y , hypre_ParVector *r0 , hypre_ParVector *g0 , char *cycle , hypre_ParVector *z );
-HYPRE_Int hypre_AMSGetNumIterations ( void *solver , HYPRE_Int *num_iterations );
-HYPRE_Int hypre_AMSGetFinalRelativeResidualNorm ( void *solver , HYPRE_Real *rel_resid_norm );
-HYPRE_Int hypre_AMSProjectOutGradients ( void *solver , hypre_ParVector *x );
-HYPRE_Int hypre_AMSConstructDiscreteGradient ( hypre_ParCSRMatrix *A , hypre_ParVector *x_coord , HYPRE_BigInt *edge_vertex , HYPRE_Int edge_orientation , hypre_ParCSRMatrix **G_ptr );
-HYPRE_Int hypre_AMSFEISetup ( void *solver , hypre_ParCSRMatrix *A , hypre_ParVector *b , hypre_ParVector *x , HYPRE_Int num_vert , HYPRE_Int num_local_vert , HYPRE_BigInt *vert_number , HYPRE_Real *vert_coord , HYPRE_Int num_edges , HYPRE_BigInt *edge_vertex );
+HYPRE_Int hypre_AMSSetDimension ( void *solver, HYPRE_Int dim );
+HYPRE_Int hypre_AMSSetDiscreteGradient ( void *solver, hypre_ParCSRMatrix *G );
+HYPRE_Int hypre_AMSSetCoordinateVectors ( void *solver, hypre_ParVector *x, hypre_ParVector *y,
+                                          hypre_ParVector *z );
+HYPRE_Int hypre_AMSSetEdgeConstantVectors ( void *solver, hypre_ParVector *Gx, hypre_ParVector *Gy,
+                                            hypre_ParVector *Gz );
+HYPRE_Int hypre_AMSSetInterpolations ( void *solver, hypre_ParCSRMatrix *Pi,
+                                       hypre_ParCSRMatrix *Pix, hypre_ParCSRMatrix *Piy, hypre_ParCSRMatrix *Piz );
+HYPRE_Int hypre_AMSSetAlphaPoissonMatrix ( void *solver, hypre_ParCSRMatrix *A_Pi );
+HYPRE_Int hypre_AMSSetBetaPoissonMatrix ( void *solver, hypre_ParCSRMatrix *A_G );
+HYPRE_Int hypre_AMSSetInteriorNodes ( void *solver, hypre_ParVector *interior_nodes );
+HYPRE_Int hypre_AMSSetProjectionFrequency ( void *solver, HYPRE_Int projection_frequency );
+HYPRE_Int hypre_AMSSetMaxIter ( void *solver, HYPRE_Int maxit );
+HYPRE_Int hypre_AMSSetTol ( void *solver, HYPRE_Real tol );
+HYPRE_Int hypre_AMSSetCycleType ( void *solver, HYPRE_Int cycle_type );
+HYPRE_Int hypre_AMSSetPrintLevel ( void *solver, HYPRE_Int print_level );
+HYPRE_Int hypre_AMSSetSmoothingOptions ( void *solver, HYPRE_Int A_relax_type,
+                                         HYPRE_Int A_relax_times, HYPRE_Real A_relax_weight, HYPRE_Real A_omega );
+HYPRE_Int hypre_AMSSetChebySmoothingOptions ( void *solver, HYPRE_Int A_cheby_order,
+                                              HYPRE_Real A_cheby_fraction );
+HYPRE_Int hypre_AMSSetAlphaAMGOptions ( void *solver, HYPRE_Int B_Pi_coarsen_type,
+                                        HYPRE_Int B_Pi_agg_levels, HYPRE_Int B_Pi_relax_type, HYPRE_Real B_Pi_theta,
+                                        HYPRE_Int B_Pi_interp_type, HYPRE_Int B_Pi_Pmax );
+HYPRE_Int hypre_AMSSetAlphaAMGCoarseRelaxType ( void *solver, HYPRE_Int B_Pi_coarse_relax_type );
+HYPRE_Int hypre_AMSSetBetaAMGOptions ( void *solver, HYPRE_Int B_G_coarsen_type,
+                                       HYPRE_Int B_G_agg_levels, HYPRE_Int B_G_relax_type, HYPRE_Real B_G_theta, HYPRE_Int B_G_interp_type,
+                                       HYPRE_Int B_G_Pmax );
+HYPRE_Int hypre_AMSSetBetaAMGCoarseRelaxType ( void *solver, HYPRE_Int B_G_coarse_relax_type );
+HYPRE_Int hypre_AMSComputePi ( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *G, hypre_ParVector *Gx,
+                               hypre_ParVector *Gy, hypre_ParVector *Gz, HYPRE_Int dim, hypre_ParCSRMatrix **Pi_ptr );
+HYPRE_Int hypre_AMSComputePixyz ( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *G, hypre_ParVector *Gx,
+                                  hypre_ParVector *Gy, hypre_ParVector *Gz, HYPRE_Int dim, hypre_ParCSRMatrix **Pix_ptr,
+                                  hypre_ParCSRMatrix **Piy_ptr, hypre_ParCSRMatrix **Piz_ptr );
+HYPRE_Int hypre_AMSComputeGPi ( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *G, hypre_ParVector *Gx,
+                                hypre_ParVector *Gy, hypre_ParVector *Gz, HYPRE_Int dim, hypre_ParCSRMatrix **GPi_ptr );
+HYPRE_Int hypre_AMSSetup ( void *solver, hypre_ParCSRMatrix *A, hypre_ParVector *b,
+                           hypre_ParVector *x );
+HYPRE_Int hypre_AMSSolve ( void *solver, hypre_ParCSRMatrix *A, hypre_ParVector *b,
+                           hypre_ParVector *x );
+HYPRE_Int hypre_ParCSRSubspacePrec ( hypre_ParCSRMatrix *A0, HYPRE_Int A0_relax_type,
+                                     HYPRE_Int A0_relax_times, HYPRE_Real *A0_l1_norms, HYPRE_Real A0_relax_weight, HYPRE_Real A0_omega,
+                                     HYPRE_Real A0_max_eig_est, HYPRE_Real A0_min_eig_est, HYPRE_Int A0_cheby_order,
+                                     HYPRE_Real A0_cheby_fraction, hypre_ParCSRMatrix **A, HYPRE_Solver *B, HYPRE_PtrToSolverFcn *HB,
+                                     hypre_ParCSRMatrix **P, hypre_ParVector **r, hypre_ParVector **g, hypre_ParVector *x,
+                                     hypre_ParVector *y, hypre_ParVector *r0, hypre_ParVector *g0, char *cycle, hypre_ParVector *z );
+HYPRE_Int hypre_AMSGetNumIterations ( void *solver, HYPRE_Int *num_iterations );
+HYPRE_Int hypre_AMSGetFinalRelativeResidualNorm ( void *solver, HYPRE_Real *rel_resid_norm );
+HYPRE_Int hypre_AMSProjectOutGradients ( void *solver, hypre_ParVector *x );
+HYPRE_Int hypre_AMSConstructDiscreteGradient ( hypre_ParCSRMatrix *A, hypre_ParVector *x_coord,
+                                               HYPRE_BigInt *edge_vertex, HYPRE_Int edge_orientation, hypre_ParCSRMatrix **G_ptr );
+HYPRE_Int hypre_AMSFEISetup ( void *solver, hypre_ParCSRMatrix *A, hypre_ParVector *b,
+                              hypre_ParVector *x, HYPRE_Int num_vert, HYPRE_Int num_local_vert, HYPRE_BigInt *vert_number,
+                              HYPRE_Real *vert_coord, HYPRE_Int num_edges, HYPRE_BigInt *edge_vertex );
 HYPRE_Int hypre_AMSFEIDestroy ( void *solver );
-HYPRE_Int hypre_ParCSRComputeL1NormsThreads ( hypre_ParCSRMatrix *A , HYPRE_Int option , HYPRE_Int num_threads , HYPRE_Int *cf_marker , HYPRE_Real **l1_norm_ptr );
+HYPRE_Int hypre_ParCSRComputeL1NormsThreads ( hypre_ParCSRMatrix *A, HYPRE_Int option,
+                                              HYPRE_Int num_threads, HYPRE_Int *cf_marker, HYPRE_Real **l1_norm_ptr );
 
 /* aux_interp.c */
-HYPRE_Int hypre_alt_insert_new_nodes ( hypre_ParCSRCommPkg *comm_pkg , hypre_ParCSRCommPkg *extend_comm_pkg , HYPRE_Int *IN_marker , HYPRE_Int full_off_procNodes , HYPRE_Int *OUT_marker );
-HYPRE_Int hypre_big_insert_new_nodes ( hypre_ParCSRCommPkg *comm_pkg , hypre_ParCSRCommPkg *extend_comm_pkg , HYPRE_Int *IN_marker , HYPRE_Int full_off_procNodes , HYPRE_BigInt offset , HYPRE_BigInt *OUT_marker );
-HYPRE_Int hypre_ssort ( HYPRE_BigInt *data , HYPRE_Int n );
-HYPRE_Int hypre_index_of_minimum ( HYPRE_BigInt *data , HYPRE_Int n );
-void hypre_swap_int ( HYPRE_BigInt *data , HYPRE_Int a , HYPRE_Int b );
-void hypre_initialize_vecs ( HYPRE_Int diag_n , HYPRE_Int offd_n , HYPRE_Int *diag_ftc , HYPRE_BigInt *offd_ftc , HYPRE_Int *diag_pm , HYPRE_Int *offd_pm , HYPRE_Int *tmp_CF );
+HYPRE_Int hypre_alt_insert_new_nodes ( hypre_ParCSRCommPkg *comm_pkg,
+                                       hypre_ParCSRCommPkg *extend_comm_pkg, HYPRE_Int *IN_marker, HYPRE_Int full_off_procNodes,
+                                       HYPRE_Int *OUT_marker );
+HYPRE_Int hypre_big_insert_new_nodes ( hypre_ParCSRCommPkg *comm_pkg,
+                                       hypre_ParCSRCommPkg *extend_comm_pkg, HYPRE_Int *IN_marker, HYPRE_Int full_off_procNodes,
+                                       HYPRE_BigInt offset, HYPRE_BigInt *OUT_marker );
+HYPRE_Int hypre_ssort ( HYPRE_BigInt *data, HYPRE_Int n );
+HYPRE_Int hypre_index_of_minimum ( HYPRE_BigInt *data, HYPRE_Int n );
+void hypre_swap_int ( HYPRE_BigInt *data, HYPRE_Int a, HYPRE_Int b );
+void hypre_initialize_vecs ( HYPRE_Int diag_n, HYPRE_Int offd_n, HYPRE_Int *diag_ftc,
+                             HYPRE_BigInt *offd_ftc, HYPRE_Int *diag_pm, HYPRE_Int *offd_pm, HYPRE_Int *tmp_CF );
 /*HYPRE_Int hypre_new_offd_nodes(HYPRE_Int **found , HYPRE_Int num_cols_A_offd , HYPRE_Int *A_ext_i , HYPRE_Int *A_ext_j, HYPRE_Int num_cols_S_offd, HYPRE_Int *col_map_offd, HYPRE_Int col_1, HYPRE_Int col_n, HYPRE_Int *Sop_i, HYPRE_Int *Sop_j, HYPRE_Int *CF_marker_offd );*/
-HYPRE_Int hypre_exchange_marker(hypre_ParCSRCommPkg *comm_pkg, HYPRE_Int *IN_marker, HYPRE_Int *OUT_marker);
-HYPRE_Int hypre_exchange_interp_data( HYPRE_Int **CF_marker_offd, HYPRE_Int **dof_func_offd, hypre_CSRMatrix **A_ext, HYPRE_Int *full_off_procNodes, hypre_CSRMatrix **Sop, hypre_ParCSRCommPkg **extend_comm_pkg, hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker, hypre_ParCSRMatrix *S, HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int skip_fine_or_same_sign);
-void hypre_build_interp_colmap(hypre_ParCSRMatrix *P, HYPRE_Int full_off_procNodes, HYPRE_Int *tmp_CF_marker_offd, HYPRE_BigInt *fine_to_coarse_offd);
+HYPRE_Int hypre_exchange_marker(hypre_ParCSRCommPkg *comm_pkg, HYPRE_Int *IN_marker,
+                                HYPRE_Int *OUT_marker);
+HYPRE_Int hypre_exchange_interp_data( HYPRE_Int **CF_marker_offd, HYPRE_Int **dof_func_offd,
+                                      hypre_CSRMatrix **A_ext, HYPRE_Int *full_off_procNodes, hypre_CSRMatrix **Sop,
+                                      hypre_ParCSRCommPkg **extend_comm_pkg, hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                      hypre_ParCSRMatrix *S, HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                      HYPRE_Int skip_fine_or_same_sign);
+void hypre_build_interp_colmap(hypre_ParCSRMatrix *P, HYPRE_Int full_off_procNodes,
+                               HYPRE_Int *tmp_CF_marker_offd, HYPRE_BigInt *fine_to_coarse_offd);
 
 /* block_tridiag.c */
 void *hypre_BlockTridiagCreate ( void );
 HYPRE_Int hypre_BlockTridiagDestroy ( void *data );
-HYPRE_Int hypre_BlockTridiagSetup ( void *data , hypre_ParCSRMatrix *A , hypre_ParVector *b , hypre_ParVector *x );
-HYPRE_Int hypre_BlockTridiagSolve ( void *data , hypre_ParCSRMatrix *A , hypre_ParVector *b , hypre_ParVector *x );
-HYPRE_Int hypre_BlockTridiagSetIndexSet ( void *data , HYPRE_Int n , HYPRE_Int *inds );
-HYPRE_Int hypre_BlockTridiagSetAMGStrengthThreshold ( void *data , HYPRE_Real thresh );
-HYPRE_Int hypre_BlockTridiagSetAMGNumSweeps ( void *data , HYPRE_Int nsweeps );
-HYPRE_Int hypre_BlockTridiagSetAMGRelaxType ( void *data , HYPRE_Int relax_type );
-HYPRE_Int hypre_BlockTridiagSetPrintLevel ( void *data , HYPRE_Int print_level );
+HYPRE_Int hypre_BlockTridiagSetup ( void *data, hypre_ParCSRMatrix *A, hypre_ParVector *b,
+                                    hypre_ParVector *x );
+HYPRE_Int hypre_BlockTridiagSolve ( void *data, hypre_ParCSRMatrix *A, hypre_ParVector *b,
+                                    hypre_ParVector *x );
+HYPRE_Int hypre_BlockTridiagSetIndexSet ( void *data, HYPRE_Int n, HYPRE_Int *inds );
+HYPRE_Int hypre_BlockTridiagSetAMGStrengthThreshold ( void *data, HYPRE_Real thresh );
+HYPRE_Int hypre_BlockTridiagSetAMGNumSweeps ( void *data, HYPRE_Int nsweeps );
+HYPRE_Int hypre_BlockTridiagSetAMGRelaxType ( void *data, HYPRE_Int relax_type );
+HYPRE_Int hypre_BlockTridiagSetPrintLevel ( void *data, HYPRE_Int print_level );
 
 /* driver.c */
-HYPRE_Int BuildParFromFile ( HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix *A_ptr );
-HYPRE_Int BuildParLaplacian ( HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix *A_ptr );
-HYPRE_Int BuildParDifConv ( HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix *A_ptr );
-HYPRE_Int BuildParFromOneFile ( HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix *A_ptr );
-HYPRE_Int BuildRhsParFromOneFile ( HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix A , HYPRE_ParVector *b_ptr );
-HYPRE_Int BuildParLaplacian9pt ( HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix *A_ptr );
-HYPRE_Int BuildParLaplacian27pt ( HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix *A_ptr );
+HYPRE_Int BuildParFromFile ( HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                             HYPRE_ParCSRMatrix *A_ptr );
+HYPRE_Int BuildParLaplacian ( HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                              HYPRE_ParCSRMatrix *A_ptr );
+HYPRE_Int BuildParDifConv ( HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                            HYPRE_ParCSRMatrix *A_ptr );
+HYPRE_Int BuildParFromOneFile ( HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                                HYPRE_ParCSRMatrix *A_ptr );
+HYPRE_Int BuildRhsParFromOneFile ( HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                                   HYPRE_ParCSRMatrix A, HYPRE_ParVector *b_ptr );
+HYPRE_Int BuildParLaplacian9pt ( HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                                 HYPRE_ParCSRMatrix *A_ptr );
+HYPRE_Int BuildParLaplacian27pt ( HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                                  HYPRE_ParCSRMatrix *A_ptr );
 
 /* gen_redcs_mat.c */
-HYPRE_Int hypre_seqAMGSetup ( hypre_ParAMGData *amg_data , HYPRE_Int p_level , HYPRE_Int coarse_threshold );
-HYPRE_Int hypre_seqAMGCycle ( hypre_ParAMGData *amg_data , HYPRE_Int p_level , hypre_ParVector **Par_F_array , hypre_ParVector **Par_U_array );
-HYPRE_Int hypre_GenerateSubComm ( MPI_Comm comm , HYPRE_Int participate , MPI_Comm *new_comm_ptr );
-void hypre_merge_lists ( HYPRE_Int *list1 , HYPRE_Int *list2 , hypre_int *np1 , hypre_MPI_Datatype *dptr );
+HYPRE_Int hypre_seqAMGSetup ( hypre_ParAMGData *amg_data, HYPRE_Int p_level,
+                              HYPRE_Int coarse_threshold );
+HYPRE_Int hypre_seqAMGCycle ( hypre_ParAMGData *amg_data, HYPRE_Int p_level,
+                              hypre_ParVector **Par_F_array, hypre_ParVector **Par_U_array );
+HYPRE_Int hypre_GenerateSubComm ( MPI_Comm comm, HYPRE_Int participate, MPI_Comm *new_comm_ptr );
+void hypre_merge_lists ( HYPRE_Int *list1, HYPRE_Int *list2, hypre_int *np1,
+                         hypre_MPI_Datatype *dptr );
 
 /* HYPRE_ads.c */
 HYPRE_Int HYPRE_ADSCreate ( HYPRE_Solver *solver );
 HYPRE_Int HYPRE_ADSDestroy ( HYPRE_Solver solver );
-HYPRE_Int HYPRE_ADSSetup ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_ADSSolve ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_ADSSetDiscreteCurl ( HYPRE_Solver solver , HYPRE_ParCSRMatrix C );
-HYPRE_Int HYPRE_ADSSetDiscreteGradient ( HYPRE_Solver solver , HYPRE_ParCSRMatrix G );
-HYPRE_Int HYPRE_ADSSetCoordinateVectors ( HYPRE_Solver solver , HYPRE_ParVector x , HYPRE_ParVector y , HYPRE_ParVector z );
-HYPRE_Int HYPRE_ADSSetInterpolations ( HYPRE_Solver solver , HYPRE_ParCSRMatrix RT_Pi , HYPRE_ParCSRMatrix RT_Pix , HYPRE_ParCSRMatrix RT_Piy , HYPRE_ParCSRMatrix RT_Piz , HYPRE_ParCSRMatrix ND_Pi , HYPRE_ParCSRMatrix ND_Pix , HYPRE_ParCSRMatrix ND_Piy , HYPRE_ParCSRMatrix ND_Piz );
-HYPRE_Int HYPRE_ADSSetMaxIter ( HYPRE_Solver solver , HYPRE_Int maxit );
-HYPRE_Int HYPRE_ADSSetTol ( HYPRE_Solver solver , HYPRE_Real tol );
-HYPRE_Int HYPRE_ADSSetCycleType ( HYPRE_Solver solver , HYPRE_Int cycle_type );
-HYPRE_Int HYPRE_ADSSetPrintLevel ( HYPRE_Solver solver , HYPRE_Int print_level );
-HYPRE_Int HYPRE_ADSSetSmoothingOptions ( HYPRE_Solver solver , HYPRE_Int relax_type , HYPRE_Int relax_times , HYPRE_Real relax_weight , HYPRE_Real omega );
-HYPRE_Int HYPRE_ADSSetChebySmoothingOptions ( HYPRE_Solver solver , HYPRE_Int cheby_order , HYPRE_Int cheby_fraction );
-HYPRE_Int HYPRE_ADSSetAMSOptions ( HYPRE_Solver solver , HYPRE_Int cycle_type , HYPRE_Int coarsen_type , HYPRE_Int agg_levels , HYPRE_Int relax_type , HYPRE_Real strength_threshold , HYPRE_Int interp_type , HYPRE_Int Pmax );
-HYPRE_Int HYPRE_ADSSetAMGOptions ( HYPRE_Solver solver , HYPRE_Int coarsen_type , HYPRE_Int agg_levels , HYPRE_Int relax_type , HYPRE_Real strength_threshold , HYPRE_Int interp_type , HYPRE_Int Pmax );
-HYPRE_Int HYPRE_ADSGetNumIterations ( HYPRE_Solver solver , HYPRE_Int *num_iterations );
-HYPRE_Int HYPRE_ADSGetFinalRelativeResidualNorm ( HYPRE_Solver solver , HYPRE_Real *rel_resid_norm );
+HYPRE_Int HYPRE_ADSSetup ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                           HYPRE_ParVector x );
+HYPRE_Int HYPRE_ADSSolve ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                           HYPRE_ParVector x );
+HYPRE_Int HYPRE_ADSSetDiscreteCurl ( HYPRE_Solver solver, HYPRE_ParCSRMatrix C );
+HYPRE_Int HYPRE_ADSSetDiscreteGradient ( HYPRE_Solver solver, HYPRE_ParCSRMatrix G );
+HYPRE_Int HYPRE_ADSSetCoordinateVectors ( HYPRE_Solver solver, HYPRE_ParVector x, HYPRE_ParVector y,
+                                          HYPRE_ParVector z );
+HYPRE_Int HYPRE_ADSSetInterpolations ( HYPRE_Solver solver, HYPRE_ParCSRMatrix RT_Pi,
+                                       HYPRE_ParCSRMatrix RT_Pix, HYPRE_ParCSRMatrix RT_Piy, HYPRE_ParCSRMatrix RT_Piz,
+                                       HYPRE_ParCSRMatrix ND_Pi, HYPRE_ParCSRMatrix ND_Pix, HYPRE_ParCSRMatrix ND_Piy,
+                                       HYPRE_ParCSRMatrix ND_Piz );
+HYPRE_Int HYPRE_ADSSetMaxIter ( HYPRE_Solver solver, HYPRE_Int maxit );
+HYPRE_Int HYPRE_ADSSetTol ( HYPRE_Solver solver, HYPRE_Real tol );
+HYPRE_Int HYPRE_ADSSetCycleType ( HYPRE_Solver solver, HYPRE_Int cycle_type );
+HYPRE_Int HYPRE_ADSSetPrintLevel ( HYPRE_Solver solver, HYPRE_Int print_level );
+HYPRE_Int HYPRE_ADSSetSmoothingOptions ( HYPRE_Solver solver, HYPRE_Int relax_type,
+                                         HYPRE_Int relax_times, HYPRE_Real relax_weight, HYPRE_Real omega );
+HYPRE_Int HYPRE_ADSSetChebySmoothingOptions ( HYPRE_Solver solver, HYPRE_Int cheby_order,
+                                              HYPRE_Real cheby_fraction );
+HYPRE_Int HYPRE_ADSSetAMSOptions ( HYPRE_Solver solver, HYPRE_Int cycle_type,
+                                   HYPRE_Int coarsen_type, HYPRE_Int agg_levels, HYPRE_Int relax_type, HYPRE_Real strength_threshold,
+                                   HYPRE_Int interp_type, HYPRE_Int Pmax );
+HYPRE_Int HYPRE_ADSSetAMGOptions ( HYPRE_Solver solver, HYPRE_Int coarsen_type,
+                                   HYPRE_Int agg_levels, HYPRE_Int relax_type, HYPRE_Real strength_threshold, HYPRE_Int interp_type,
+                                   HYPRE_Int Pmax );
+HYPRE_Int HYPRE_ADSGetNumIterations ( HYPRE_Solver solver, HYPRE_Int *num_iterations );
+HYPRE_Int HYPRE_ADSGetFinalRelativeResidualNorm ( HYPRE_Solver solver, HYPRE_Real *rel_resid_norm );
 
 /* HYPRE_ame.c */
 HYPRE_Int HYPRE_AMECreate ( HYPRE_Solver *esolver );
 HYPRE_Int HYPRE_AMEDestroy ( HYPRE_Solver esolver );
 HYPRE_Int HYPRE_AMESetup ( HYPRE_Solver esolver );
 HYPRE_Int HYPRE_AMESolve ( HYPRE_Solver esolver );
-HYPRE_Int HYPRE_AMESetAMSSolver ( HYPRE_Solver esolver , HYPRE_Solver ams_solver );
-HYPRE_Int HYPRE_AMESetMassMatrix ( HYPRE_Solver esolver , HYPRE_ParCSRMatrix M );
-HYPRE_Int HYPRE_AMESetBlockSize ( HYPRE_Solver esolver , HYPRE_Int block_size );
-HYPRE_Int HYPRE_AMESetMaxIter ( HYPRE_Solver esolver , HYPRE_Int maxit );
-HYPRE_Int HYPRE_AMESetTol ( HYPRE_Solver esolver , HYPRE_Real tol );
-HYPRE_Int HYPRE_AMESetRTol ( HYPRE_Solver esolver , HYPRE_Real tol );
-HYPRE_Int HYPRE_AMESetPrintLevel ( HYPRE_Solver esolver , HYPRE_Int print_level );
-HYPRE_Int HYPRE_AMEGetEigenvalues ( HYPRE_Solver esolver , HYPRE_Real **eigenvalues );
-HYPRE_Int HYPRE_AMEGetEigenvectors ( HYPRE_Solver esolver , HYPRE_ParVector **eigenvectors );
+HYPRE_Int HYPRE_AMESetAMSSolver ( HYPRE_Solver esolver, HYPRE_Solver ams_solver );
+HYPRE_Int HYPRE_AMESetMassMatrix ( HYPRE_Solver esolver, HYPRE_ParCSRMatrix M );
+HYPRE_Int HYPRE_AMESetBlockSize ( HYPRE_Solver esolver, HYPRE_Int block_size );
+HYPRE_Int HYPRE_AMESetMaxIter ( HYPRE_Solver esolver, HYPRE_Int maxit );
+HYPRE_Int HYPRE_AMESetMaxPCGIter ( HYPRE_Solver esolver, HYPRE_Int maxit );
+HYPRE_Int HYPRE_AMESetTol ( HYPRE_Solver esolver, HYPRE_Real tol );
+HYPRE_Int HYPRE_AMESetRTol ( HYPRE_Solver esolver, HYPRE_Real tol );
+HYPRE_Int HYPRE_AMESetPrintLevel ( HYPRE_Solver esolver, HYPRE_Int print_level );
+HYPRE_Int HYPRE_AMEGetEigenvalues ( HYPRE_Solver esolver, HYPRE_Real **eigenvalues );
+HYPRE_Int HYPRE_AMEGetEigenvectors ( HYPRE_Solver esolver, HYPRE_ParVector **eigenvectors );
 
 /* HYPRE_ams.c */
 HYPRE_Int HYPRE_AMSCreate ( HYPRE_Solver *solver );
 HYPRE_Int HYPRE_AMSDestroy ( HYPRE_Solver solver );
-HYPRE_Int HYPRE_AMSSetup ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_AMSSolve ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_AMSSetDimension ( HYPRE_Solver solver , HYPRE_Int dim );
-HYPRE_Int HYPRE_AMSSetDiscreteGradient ( HYPRE_Solver solver , HYPRE_ParCSRMatrix G );
-HYPRE_Int HYPRE_AMSSetCoordinateVectors ( HYPRE_Solver solver , HYPRE_ParVector x , HYPRE_ParVector y , HYPRE_ParVector z );
-HYPRE_Int HYPRE_AMSSetEdgeConstantVectors ( HYPRE_Solver solver , HYPRE_ParVector Gx , HYPRE_ParVector Gy , HYPRE_ParVector Gz );
-HYPRE_Int HYPRE_AMSSetInterpolations ( HYPRE_Solver solver , HYPRE_ParCSRMatrix Pi , HYPRE_ParCSRMatrix Pix , HYPRE_ParCSRMatrix Piy , HYPRE_ParCSRMatrix Piz );
-HYPRE_Int HYPRE_AMSSetAlphaPoissonMatrix ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A_alpha );
-HYPRE_Int HYPRE_AMSSetBetaPoissonMatrix ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A_beta );
-HYPRE_Int HYPRE_AMSSetInteriorNodes ( HYPRE_Solver solver , HYPRE_ParVector interior_nodes );
-HYPRE_Int HYPRE_AMSSetProjectionFrequency ( HYPRE_Solver solver , HYPRE_Int projection_frequency );
-HYPRE_Int HYPRE_AMSSetMaxIter ( HYPRE_Solver solver , HYPRE_Int maxit );
-HYPRE_Int HYPRE_AMSSetTol ( HYPRE_Solver solver , HYPRE_Real tol );
-HYPRE_Int HYPRE_AMSSetCycleType ( HYPRE_Solver solver , HYPRE_Int cycle_type );
-HYPRE_Int HYPRE_AMSSetPrintLevel ( HYPRE_Solver solver , HYPRE_Int print_level );
-HYPRE_Int HYPRE_AMSSetSmoothingOptions ( HYPRE_Solver solver , HYPRE_Int relax_type , HYPRE_Int relax_times , HYPRE_Real relax_weight , HYPRE_Real omega );
-HYPRE_Int HYPRE_AMSSetChebySmoothingOptions ( HYPRE_Solver solver , HYPRE_Int cheby_order , HYPRE_Int cheby_fraction );
-HYPRE_Int HYPRE_AMSSetAlphaAMGOptions ( HYPRE_Solver solver , HYPRE_Int alpha_coarsen_type , HYPRE_Int alpha_agg_levels , HYPRE_Int alpha_relax_type , HYPRE_Real alpha_strength_threshold , HYPRE_Int alpha_interp_type , HYPRE_Int alpha_Pmax );
-HYPRE_Int HYPRE_AMSSetAlphaAMGCoarseRelaxType ( HYPRE_Solver solver , HYPRE_Int alpha_coarse_relax_type );
-HYPRE_Int HYPRE_AMSSetBetaAMGOptions ( HYPRE_Solver solver , HYPRE_Int beta_coarsen_type , HYPRE_Int beta_agg_levels , HYPRE_Int beta_relax_type , HYPRE_Real beta_strength_threshold , HYPRE_Int beta_interp_type , HYPRE_Int beta_Pmax );
-HYPRE_Int HYPRE_AMSSetBetaAMGCoarseRelaxType ( HYPRE_Solver solver , HYPRE_Int beta_coarse_relax_type );
-HYPRE_Int HYPRE_AMSGetNumIterations ( HYPRE_Solver solver , HYPRE_Int *num_iterations );
-HYPRE_Int HYPRE_AMSGetFinalRelativeResidualNorm ( HYPRE_Solver solver , HYPRE_Real *rel_resid_norm );
-HYPRE_Int HYPRE_AMSProjectOutGradients ( HYPRE_Solver solver , HYPRE_ParVector x );
-HYPRE_Int HYPRE_AMSConstructDiscreteGradient ( HYPRE_ParCSRMatrix A , HYPRE_ParVector x_coord , HYPRE_BigInt *edge_vertex , HYPRE_Int edge_orientation , HYPRE_ParCSRMatrix *G );
-HYPRE_Int HYPRE_AMSFEISetup ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x , HYPRE_BigInt *EdgeNodeList_ , HYPRE_BigInt *NodeNumbers_ , HYPRE_Int numEdges_ , HYPRE_Int numLocalNodes_ , HYPRE_Int numNodes_ , HYPRE_Real *NodalCoord_ );
+HYPRE_Int HYPRE_AMSSetup ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                           HYPRE_ParVector x );
+HYPRE_Int HYPRE_AMSSolve ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                           HYPRE_ParVector x );
+HYPRE_Int HYPRE_AMSSetDimension ( HYPRE_Solver solver, HYPRE_Int dim );
+HYPRE_Int HYPRE_AMSSetDiscreteGradient ( HYPRE_Solver solver, HYPRE_ParCSRMatrix G );
+HYPRE_Int HYPRE_AMSSetCoordinateVectors ( HYPRE_Solver solver, HYPRE_ParVector x, HYPRE_ParVector y,
+                                          HYPRE_ParVector z );
+HYPRE_Int HYPRE_AMSSetEdgeConstantVectors ( HYPRE_Solver solver, HYPRE_ParVector Gx,
+                                            HYPRE_ParVector Gy, HYPRE_ParVector Gz );
+HYPRE_Int HYPRE_AMSSetInterpolations ( HYPRE_Solver solver, HYPRE_ParCSRMatrix Pi,
+                                       HYPRE_ParCSRMatrix Pix, HYPRE_ParCSRMatrix Piy, HYPRE_ParCSRMatrix Piz );
+HYPRE_Int HYPRE_AMSSetAlphaPoissonMatrix ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A_alpha );
+HYPRE_Int HYPRE_AMSSetBetaPoissonMatrix ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A_beta );
+HYPRE_Int HYPRE_AMSSetInteriorNodes ( HYPRE_Solver solver, HYPRE_ParVector interior_nodes );
+HYPRE_Int HYPRE_AMSSetProjectionFrequency ( HYPRE_Solver solver, HYPRE_Int projection_frequency );
+HYPRE_Int HYPRE_AMSSetMaxIter ( HYPRE_Solver solver, HYPRE_Int maxit );
+HYPRE_Int HYPRE_AMSSetTol ( HYPRE_Solver solver, HYPRE_Real tol );
+HYPRE_Int HYPRE_AMSSetCycleType ( HYPRE_Solver solver, HYPRE_Int cycle_type );
+HYPRE_Int HYPRE_AMSSetPrintLevel ( HYPRE_Solver solver, HYPRE_Int print_level );
+HYPRE_Int HYPRE_AMSSetSmoothingOptions ( HYPRE_Solver solver, HYPRE_Int relax_type,
+                                         HYPRE_Int relax_times, HYPRE_Real relax_weight, HYPRE_Real omega );
+HYPRE_Int HYPRE_AMSSetChebySmoothingOptions ( HYPRE_Solver solver, HYPRE_Int cheby_order,
+                                              HYPRE_Real cheby_fraction );
+HYPRE_Int HYPRE_AMSSetAlphaAMGOptions ( HYPRE_Solver solver, HYPRE_Int alpha_coarsen_type,
+                                        HYPRE_Int alpha_agg_levels, HYPRE_Int alpha_relax_type, HYPRE_Real alpha_strength_threshold,
+                                        HYPRE_Int alpha_interp_type, HYPRE_Int alpha_Pmax );
+HYPRE_Int HYPRE_AMSSetAlphaAMGCoarseRelaxType ( HYPRE_Solver solver,
+                                                HYPRE_Int alpha_coarse_relax_type );
+HYPRE_Int HYPRE_AMSSetBetaAMGOptions ( HYPRE_Solver solver, HYPRE_Int beta_coarsen_type,
+                                       HYPRE_Int beta_agg_levels, HYPRE_Int beta_relax_type, HYPRE_Real beta_strength_threshold,
+                                       HYPRE_Int beta_interp_type, HYPRE_Int beta_Pmax );
+HYPRE_Int HYPRE_AMSSetBetaAMGCoarseRelaxType ( HYPRE_Solver solver,
+                                               HYPRE_Int beta_coarse_relax_type );
+HYPRE_Int HYPRE_AMSGetNumIterations ( HYPRE_Solver solver, HYPRE_Int *num_iterations );
+HYPRE_Int HYPRE_AMSGetFinalRelativeResidualNorm ( HYPRE_Solver solver, HYPRE_Real *rel_resid_norm );
+HYPRE_Int HYPRE_AMSProjectOutGradients ( HYPRE_Solver solver, HYPRE_ParVector x );
+HYPRE_Int HYPRE_AMSConstructDiscreteGradient ( HYPRE_ParCSRMatrix A, HYPRE_ParVector x_coord,
+                                               HYPRE_BigInt *edge_vertex, HYPRE_Int edge_orientation, HYPRE_ParCSRMatrix *G );
+HYPRE_Int HYPRE_AMSFEISetup ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                              HYPRE_ParVector x, HYPRE_BigInt *EdgeNodeList_, HYPRE_BigInt *NodeNumbers_, HYPRE_Int numEdges_,
+                              HYPRE_Int numLocalNodes_, HYPRE_Int numNodes_, HYPRE_Real *NodalCoord_ );
 HYPRE_Int HYPRE_AMSFEIDestroy ( HYPRE_Solver solver );
 
 /* HYPRE_parcsr_amg.c */
 HYPRE_Int HYPRE_BoomerAMGCreate ( HYPRE_Solver *solver );
 HYPRE_Int HYPRE_BoomerAMGDestroy ( HYPRE_Solver solver );
-HYPRE_Int HYPRE_BoomerAMGSetup ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_BoomerAMGSolve ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_BoomerAMGSolveT ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_BoomerAMGSetRestriction ( HYPRE_Solver solver , HYPRE_Int restr_par );
-HYPRE_Int HYPRE_BoomerAMGSetIsTriangular ( HYPRE_Solver solver , HYPRE_Int is_triangular );
-HYPRE_Int HYPRE_BoomerAMGSetGMRESSwitchR ( HYPRE_Solver solver , HYPRE_Int gmres_switch );
-HYPRE_Int HYPRE_BoomerAMGSetMaxLevels ( HYPRE_Solver solver , HYPRE_Int max_levels );
-HYPRE_Int HYPRE_BoomerAMGGetMaxLevels ( HYPRE_Solver solver , HYPRE_Int *max_levels );
-HYPRE_Int HYPRE_BoomerAMGSetMaxCoarseSize ( HYPRE_Solver solver , HYPRE_Int max_coarse_size );
-HYPRE_Int HYPRE_BoomerAMGGetMaxCoarseSize ( HYPRE_Solver solver , HYPRE_Int *max_coarse_size );
-HYPRE_Int HYPRE_BoomerAMGSetMinCoarseSize ( HYPRE_Solver solver , HYPRE_Int min_coarse_size );
-HYPRE_Int HYPRE_BoomerAMGGetMinCoarseSize ( HYPRE_Solver solver , HYPRE_Int *min_coarse_size );
-HYPRE_Int HYPRE_BoomerAMGSetSeqThreshold ( HYPRE_Solver solver , HYPRE_Int seq_threshold );
-HYPRE_Int HYPRE_BoomerAMGGetSeqThreshold ( HYPRE_Solver solver , HYPRE_Int *seq_threshold );
-HYPRE_Int HYPRE_BoomerAMGSetRedundant ( HYPRE_Solver solver , HYPRE_Int redundant );
-HYPRE_Int HYPRE_BoomerAMGGetRedundant ( HYPRE_Solver solver , HYPRE_Int *redundant );
+HYPRE_Int HYPRE_BoomerAMGSetup ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                                 HYPRE_ParVector x );
+HYPRE_Int HYPRE_BoomerAMGSolve ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                                 HYPRE_ParVector x );
+HYPRE_Int HYPRE_BoomerAMGSolveT ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                                  HYPRE_ParVector x );
+HYPRE_Int HYPRE_BoomerAMGSetRestriction ( HYPRE_Solver solver, HYPRE_Int restr_par );
+HYPRE_Int HYPRE_BoomerAMGSetIsTriangular ( HYPRE_Solver solver, HYPRE_Int is_triangular );
+HYPRE_Int HYPRE_BoomerAMGSetGMRESSwitchR ( HYPRE_Solver solver, HYPRE_Int gmres_switch );
+HYPRE_Int HYPRE_BoomerAMGSetMaxLevels ( HYPRE_Solver solver, HYPRE_Int max_levels );
+HYPRE_Int HYPRE_BoomerAMGGetMaxLevels ( HYPRE_Solver solver, HYPRE_Int *max_levels );
+HYPRE_Int HYPRE_BoomerAMGSetMaxCoarseSize ( HYPRE_Solver solver, HYPRE_Int max_coarse_size );
+HYPRE_Int HYPRE_BoomerAMGGetMaxCoarseSize ( HYPRE_Solver solver, HYPRE_Int *max_coarse_size );
+HYPRE_Int HYPRE_BoomerAMGSetMinCoarseSize ( HYPRE_Solver solver, HYPRE_Int min_coarse_size );
+HYPRE_Int HYPRE_BoomerAMGGetMinCoarseSize ( HYPRE_Solver solver, HYPRE_Int *min_coarse_size );
+HYPRE_Int HYPRE_BoomerAMGSetSeqThreshold ( HYPRE_Solver solver, HYPRE_Int seq_threshold );
+HYPRE_Int HYPRE_BoomerAMGGetSeqThreshold ( HYPRE_Solver solver, HYPRE_Int *seq_threshold );
+HYPRE_Int HYPRE_BoomerAMGSetRedundant ( HYPRE_Solver solver, HYPRE_Int redundant );
+HYPRE_Int HYPRE_BoomerAMGGetRedundant ( HYPRE_Solver solver, HYPRE_Int *redundant );
 HYPRE_Int HYPRE_BoomerAMGSetCoarsenCutFactor( HYPRE_Solver solver, HYPRE_Int coarsen_cut_factor );
 HYPRE_Int HYPRE_BoomerAMGGetCoarsenCutFactor( HYPRE_Solver solver, HYPRE_Int *coarsen_cut_factor );
-HYPRE_Int HYPRE_BoomerAMGSetStrongThreshold ( HYPRE_Solver solver , HYPRE_Real strong_threshold );
-HYPRE_Int HYPRE_BoomerAMGGetStrongThreshold ( HYPRE_Solver solver , HYPRE_Real *strong_threshold );
-HYPRE_Int HYPRE_BoomerAMGSetStrongThresholdR ( HYPRE_Solver solver , HYPRE_Real strong_threshold );
-HYPRE_Int HYPRE_BoomerAMGGetStrongThresholdR ( HYPRE_Solver solver , HYPRE_Real *strong_threshold );
-HYPRE_Int HYPRE_BoomerAMGSetFilterThresholdR ( HYPRE_Solver solver , HYPRE_Real filter_threshold );
-HYPRE_Int HYPRE_BoomerAMGGetFilterThresholdR ( HYPRE_Solver solver , HYPRE_Real *filter_threshold );
-HYPRE_Int HYPRE_BoomerAMGSetGMRESSwitchR ( HYPRE_Solver solver , HYPRE_Int gmres_switch );
-HYPRE_Int HYPRE_BoomerAMGSetSabs ( HYPRE_Solver solver , HYPRE_Int Sabs );
-HYPRE_Int HYPRE_BoomerAMGSetMaxRowSum ( HYPRE_Solver solver , HYPRE_Real max_row_sum );
-HYPRE_Int HYPRE_BoomerAMGGetMaxRowSum ( HYPRE_Solver solver , HYPRE_Real *max_row_sum );
-HYPRE_Int HYPRE_BoomerAMGSetTruncFactor ( HYPRE_Solver solver , HYPRE_Real trunc_factor );
-HYPRE_Int HYPRE_BoomerAMGGetTruncFactor ( HYPRE_Solver solver , HYPRE_Real *trunc_factor );
-HYPRE_Int HYPRE_BoomerAMGSetPMaxElmts ( HYPRE_Solver solver , HYPRE_Int P_max_elmts );
-HYPRE_Int HYPRE_BoomerAMGGetPMaxElmts ( HYPRE_Solver solver , HYPRE_Int *P_max_elmts );
-HYPRE_Int HYPRE_BoomerAMGSetJacobiTruncThreshold ( HYPRE_Solver solver , HYPRE_Real jacobi_trunc_threshold );
-HYPRE_Int HYPRE_BoomerAMGGetJacobiTruncThreshold ( HYPRE_Solver solver , HYPRE_Real *jacobi_trunc_threshold );
-HYPRE_Int HYPRE_BoomerAMGSetPostInterpType ( HYPRE_Solver solver , HYPRE_Int post_interp_type );
-HYPRE_Int HYPRE_BoomerAMGGetPostInterpType ( HYPRE_Solver solver , HYPRE_Int *post_interp_type );
-HYPRE_Int HYPRE_BoomerAMGSetSCommPkgSwitch ( HYPRE_Solver solver , HYPRE_Real S_commpkg_switch );
-HYPRE_Int HYPRE_BoomerAMGSetInterpType ( HYPRE_Solver solver , HYPRE_Int interp_type );
-HYPRE_Int HYPRE_BoomerAMGSetSepWeight ( HYPRE_Solver solver , HYPRE_Int sep_weight );
-HYPRE_Int HYPRE_BoomerAMGSetMinIter ( HYPRE_Solver solver , HYPRE_Int min_iter );
-HYPRE_Int HYPRE_BoomerAMGSetMaxIter ( HYPRE_Solver solver , HYPRE_Int max_iter );
-HYPRE_Int HYPRE_BoomerAMGGetMaxIter ( HYPRE_Solver solver , HYPRE_Int *max_iter );
-HYPRE_Int HYPRE_BoomerAMGSetCoarsenType ( HYPRE_Solver solver , HYPRE_Int coarsen_type );
-HYPRE_Int HYPRE_BoomerAMGGetCoarsenType ( HYPRE_Solver solver , HYPRE_Int *coarsen_type );
-HYPRE_Int HYPRE_BoomerAMGSetMeasureType ( HYPRE_Solver solver , HYPRE_Int measure_type );
-HYPRE_Int HYPRE_BoomerAMGGetMeasureType ( HYPRE_Solver solver , HYPRE_Int *measure_type );
-HYPRE_Int HYPRE_BoomerAMGSetSetupType ( HYPRE_Solver solver , HYPRE_Int setup_type );
+HYPRE_Int HYPRE_BoomerAMGSetStrongThreshold ( HYPRE_Solver solver, HYPRE_Real strong_threshold );
+HYPRE_Int HYPRE_BoomerAMGGetStrongThreshold ( HYPRE_Solver solver, HYPRE_Real *strong_threshold );
+HYPRE_Int HYPRE_BoomerAMGSetStrongThresholdR ( HYPRE_Solver solver, HYPRE_Real strong_threshold );
+HYPRE_Int HYPRE_BoomerAMGGetStrongThresholdR ( HYPRE_Solver solver, HYPRE_Real *strong_threshold );
+HYPRE_Int HYPRE_BoomerAMGSetFilterThresholdR ( HYPRE_Solver solver, HYPRE_Real filter_threshold );
+HYPRE_Int HYPRE_BoomerAMGGetFilterThresholdR ( HYPRE_Solver solver, HYPRE_Real *filter_threshold );
+HYPRE_Int HYPRE_BoomerAMGSetGMRESSwitchR ( HYPRE_Solver solver, HYPRE_Int gmres_switch );
+HYPRE_Int HYPRE_BoomerAMGSetSabs ( HYPRE_Solver solver, HYPRE_Int Sabs );
+HYPRE_Int HYPRE_BoomerAMGSetMaxRowSum ( HYPRE_Solver solver, HYPRE_Real max_row_sum );
+HYPRE_Int HYPRE_BoomerAMGGetMaxRowSum ( HYPRE_Solver solver, HYPRE_Real *max_row_sum );
+HYPRE_Int HYPRE_BoomerAMGSetTruncFactor ( HYPRE_Solver solver, HYPRE_Real trunc_factor );
+HYPRE_Int HYPRE_BoomerAMGGetTruncFactor ( HYPRE_Solver solver, HYPRE_Real *trunc_factor );
+HYPRE_Int HYPRE_BoomerAMGSetPMaxElmts ( HYPRE_Solver solver, HYPRE_Int P_max_elmts );
+HYPRE_Int HYPRE_BoomerAMGGetPMaxElmts ( HYPRE_Solver solver, HYPRE_Int *P_max_elmts );
+HYPRE_Int HYPRE_BoomerAMGSetJacobiTruncThreshold ( HYPRE_Solver solver,
+                                                   HYPRE_Real jacobi_trunc_threshold );
+HYPRE_Int HYPRE_BoomerAMGGetJacobiTruncThreshold ( HYPRE_Solver solver,
+                                                   HYPRE_Real *jacobi_trunc_threshold );
+HYPRE_Int HYPRE_BoomerAMGSetPostInterpType ( HYPRE_Solver solver, HYPRE_Int post_interp_type );
+HYPRE_Int HYPRE_BoomerAMGGetPostInterpType ( HYPRE_Solver solver, HYPRE_Int *post_interp_type );
+HYPRE_Int HYPRE_BoomerAMGSetSCommPkgSwitch ( HYPRE_Solver solver, HYPRE_Real S_commpkg_switch );
+HYPRE_Int HYPRE_BoomerAMGSetInterpType ( HYPRE_Solver solver, HYPRE_Int interp_type );
+HYPRE_Int HYPRE_BoomerAMGSetSepWeight ( HYPRE_Solver solver, HYPRE_Int sep_weight );
+HYPRE_Int HYPRE_BoomerAMGSetMinIter ( HYPRE_Solver solver, HYPRE_Int min_iter );
+HYPRE_Int HYPRE_BoomerAMGSetMaxIter ( HYPRE_Solver solver, HYPRE_Int max_iter );
+HYPRE_Int HYPRE_BoomerAMGGetMaxIter ( HYPRE_Solver solver, HYPRE_Int *max_iter );
+HYPRE_Int HYPRE_BoomerAMGSetCoarsenType ( HYPRE_Solver solver, HYPRE_Int coarsen_type );
+HYPRE_Int HYPRE_BoomerAMGGetCoarsenType ( HYPRE_Solver solver, HYPRE_Int *coarsen_type );
+HYPRE_Int HYPRE_BoomerAMGSetMeasureType ( HYPRE_Solver solver, HYPRE_Int measure_type );
+HYPRE_Int HYPRE_BoomerAMGGetMeasureType ( HYPRE_Solver solver, HYPRE_Int *measure_type );
+HYPRE_Int HYPRE_BoomerAMGSetSetupType ( HYPRE_Solver solver, HYPRE_Int setup_type );
 HYPRE_Int HYPRE_BoomerAMGSetOldDefault ( HYPRE_Solver solver );
-HYPRE_Int HYPRE_BoomerAMGSetFCycle ( HYPRE_Solver solver , HYPRE_Int fcycle );
-HYPRE_Int HYPRE_BoomerAMGGetFCycle ( HYPRE_Solver solver , HYPRE_Int *fcycle );
-HYPRE_Int HYPRE_BoomerAMGSetCycleType ( HYPRE_Solver solver , HYPRE_Int cycle_type );
-HYPRE_Int HYPRE_BoomerAMGGetCycleType ( HYPRE_Solver solver , HYPRE_Int *cycle_type );
-HYPRE_Int HYPRE_BoomerAMGSetConvergeType ( HYPRE_Solver solver , HYPRE_Int type );
-HYPRE_Int HYPRE_BoomerAMGGetConvergeType ( HYPRE_Solver solver , HYPRE_Int *type );
-HYPRE_Int HYPRE_BoomerAMGSetTol ( HYPRE_Solver solver , HYPRE_Real tol );
-HYPRE_Int HYPRE_BoomerAMGGetTol ( HYPRE_Solver solver , HYPRE_Real *tol );
-HYPRE_Int HYPRE_BoomerAMGSetNumGridSweeps ( HYPRE_Solver solver , HYPRE_Int *num_grid_sweeps );
-HYPRE_Int HYPRE_BoomerAMGSetNumSweeps ( HYPRE_Solver solver , HYPRE_Int num_sweeps );
-HYPRE_Int HYPRE_BoomerAMGSetCycleNumSweeps ( HYPRE_Solver solver , HYPRE_Int num_sweeps , HYPRE_Int k );
-HYPRE_Int HYPRE_BoomerAMGGetCycleNumSweeps ( HYPRE_Solver solver , HYPRE_Int *num_sweeps , HYPRE_Int k );
-HYPRE_Int HYPRE_BoomerAMGInitGridRelaxation ( HYPRE_Int **num_grid_sweeps_ptr , HYPRE_Int **grid_relax_type_ptr , HYPRE_Int ***grid_relax_points_ptr , HYPRE_Int coarsen_type , HYPRE_Real **relax_weights_ptr , HYPRE_Int max_levels );
-HYPRE_Int HYPRE_BoomerAMGSetGridRelaxType ( HYPRE_Solver solver , HYPRE_Int *grid_relax_type );
-HYPRE_Int HYPRE_BoomerAMGSetRelaxType ( HYPRE_Solver solver , HYPRE_Int relax_type );
-HYPRE_Int HYPRE_BoomerAMGSetCycleRelaxType ( HYPRE_Solver solver , HYPRE_Int relax_type , HYPRE_Int k );
-HYPRE_Int HYPRE_BoomerAMGGetCycleRelaxType ( HYPRE_Solver solver , HYPRE_Int *relax_type , HYPRE_Int k );
-HYPRE_Int HYPRE_BoomerAMGSetRelaxOrder ( HYPRE_Solver solver , HYPRE_Int relax_order );
-HYPRE_Int HYPRE_BoomerAMGSetGridRelaxPoints ( HYPRE_Solver solver , HYPRE_Int **grid_relax_points );
-HYPRE_Int HYPRE_BoomerAMGSetRelaxWeight ( HYPRE_Solver solver , HYPRE_Real *relax_weight );
-HYPRE_Int HYPRE_BoomerAMGSetRelaxWt ( HYPRE_Solver solver , HYPRE_Real relax_wt );
-HYPRE_Int HYPRE_BoomerAMGSetLevelRelaxWt ( HYPRE_Solver solver , HYPRE_Real relax_wt , HYPRE_Int level );
-HYPRE_Int HYPRE_BoomerAMGSetOmega ( HYPRE_Solver solver , HYPRE_Real *omega );
-HYPRE_Int HYPRE_BoomerAMGSetOuterWt ( HYPRE_Solver solver , HYPRE_Real outer_wt );
-HYPRE_Int HYPRE_BoomerAMGSetLevelOuterWt ( HYPRE_Solver solver , HYPRE_Real outer_wt , HYPRE_Int level );
-HYPRE_Int HYPRE_BoomerAMGSetSmoothType ( HYPRE_Solver solver , HYPRE_Int smooth_type );
-HYPRE_Int HYPRE_BoomerAMGGetSmoothType ( HYPRE_Solver solver , HYPRE_Int *smooth_type );
-HYPRE_Int HYPRE_BoomerAMGSetSmoothNumLevels ( HYPRE_Solver solver , HYPRE_Int smooth_num_levels );
-HYPRE_Int HYPRE_BoomerAMGGetSmoothNumLevels ( HYPRE_Solver solver , HYPRE_Int *smooth_num_levels );
-HYPRE_Int HYPRE_BoomerAMGSetSmoothNumSweeps ( HYPRE_Solver solver , HYPRE_Int smooth_num_sweeps );
-HYPRE_Int HYPRE_BoomerAMGGetSmoothNumSweeps ( HYPRE_Solver solver , HYPRE_Int *smooth_num_sweeps );
-HYPRE_Int HYPRE_BoomerAMGSetLogging ( HYPRE_Solver solver , HYPRE_Int logging );
-HYPRE_Int HYPRE_BoomerAMGGetLogging ( HYPRE_Solver solver , HYPRE_Int *logging );
-HYPRE_Int HYPRE_BoomerAMGSetPrintLevel ( HYPRE_Solver solver , HYPRE_Int print_level );
-HYPRE_Int HYPRE_BoomerAMGGetPrintLevel ( HYPRE_Solver solver , HYPRE_Int *print_level );
-HYPRE_Int HYPRE_BoomerAMGSetPrintFileName ( HYPRE_Solver solver , const char *print_file_name );
-HYPRE_Int HYPRE_BoomerAMGSetDebugFlag ( HYPRE_Solver solver , HYPRE_Int debug_flag );
-HYPRE_Int HYPRE_BoomerAMGGetDebugFlag ( HYPRE_Solver solver , HYPRE_Int *debug_flag );
-HYPRE_Int HYPRE_BoomerAMGGetNumIterations ( HYPRE_Solver solver , HYPRE_Int *num_iterations );
-HYPRE_Int HYPRE_BoomerAMGGetCumNumIterations ( HYPRE_Solver solver , HYPRE_Int *cum_num_iterations );
-HYPRE_Int HYPRE_BoomerAMGGetResidual ( HYPRE_Solver solver , HYPRE_ParVector *residual );
-HYPRE_Int HYPRE_BoomerAMGGetFinalRelativeResidualNorm ( HYPRE_Solver solver , HYPRE_Real *rel_resid_norm );
-HYPRE_Int HYPRE_BoomerAMGSetVariant ( HYPRE_Solver solver , HYPRE_Int variant );
-HYPRE_Int HYPRE_BoomerAMGGetVariant ( HYPRE_Solver solver , HYPRE_Int *variant );
-HYPRE_Int HYPRE_BoomerAMGSetOverlap ( HYPRE_Solver solver , HYPRE_Int overlap );
-HYPRE_Int HYPRE_BoomerAMGGetOverlap ( HYPRE_Solver solver , HYPRE_Int *overlap );
-HYPRE_Int HYPRE_BoomerAMGSetDomainType ( HYPRE_Solver solver , HYPRE_Int domain_type );
-HYPRE_Int HYPRE_BoomerAMGGetDomainType ( HYPRE_Solver solver , HYPRE_Int *domain_type );
-HYPRE_Int HYPRE_BoomerAMGSetSchwarzRlxWeight ( HYPRE_Solver solver , HYPRE_Real schwarz_rlx_weight );
-HYPRE_Int HYPRE_BoomerAMGGetSchwarzRlxWeight ( HYPRE_Solver solver , HYPRE_Real *schwarz_rlx_weight );
-HYPRE_Int HYPRE_BoomerAMGSetSchwarzUseNonSymm ( HYPRE_Solver solver , HYPRE_Int use_nonsymm );
-HYPRE_Int HYPRE_BoomerAMGSetSym ( HYPRE_Solver solver , HYPRE_Int sym );
-HYPRE_Int HYPRE_BoomerAMGSetLevel ( HYPRE_Solver solver , HYPRE_Int level );
-HYPRE_Int HYPRE_BoomerAMGSetThreshold ( HYPRE_Solver solver , HYPRE_Real threshold );
-HYPRE_Int HYPRE_BoomerAMGSetFilter ( HYPRE_Solver solver , HYPRE_Real filter );
-HYPRE_Int HYPRE_BoomerAMGSetDropTol ( HYPRE_Solver solver , HYPRE_Real drop_tol );
-HYPRE_Int HYPRE_BoomerAMGSetMaxNzPerRow ( HYPRE_Solver solver , HYPRE_Int max_nz_per_row );
-HYPRE_Int HYPRE_BoomerAMGSetEuclidFile ( HYPRE_Solver solver , char *euclidfile );
-HYPRE_Int HYPRE_BoomerAMGSetEuLevel ( HYPRE_Solver solver , HYPRE_Int eu_level );
-HYPRE_Int HYPRE_BoomerAMGSetEuSparseA ( HYPRE_Solver solver , HYPRE_Real eu_sparse_A );
-HYPRE_Int HYPRE_BoomerAMGSetEuBJ ( HYPRE_Solver solver , HYPRE_Int eu_bj );
+HYPRE_Int HYPRE_BoomerAMGSetFCycle ( HYPRE_Solver solver, HYPRE_Int fcycle );
+HYPRE_Int HYPRE_BoomerAMGGetFCycle ( HYPRE_Solver solver, HYPRE_Int *fcycle );
+HYPRE_Int HYPRE_BoomerAMGSetCycleType ( HYPRE_Solver solver, HYPRE_Int cycle_type );
+HYPRE_Int HYPRE_BoomerAMGGetCycleType ( HYPRE_Solver solver, HYPRE_Int *cycle_type );
+HYPRE_Int HYPRE_BoomerAMGSetConvergeType ( HYPRE_Solver solver, HYPRE_Int type );
+HYPRE_Int HYPRE_BoomerAMGGetConvergeType ( HYPRE_Solver solver, HYPRE_Int *type );
+HYPRE_Int HYPRE_BoomerAMGSetTol ( HYPRE_Solver solver, HYPRE_Real tol );
+HYPRE_Int HYPRE_BoomerAMGGetTol ( HYPRE_Solver solver, HYPRE_Real *tol );
+HYPRE_Int HYPRE_BoomerAMGSetNumGridSweeps ( HYPRE_Solver solver, HYPRE_Int *num_grid_sweeps );
+HYPRE_Int HYPRE_BoomerAMGSetNumSweeps ( HYPRE_Solver solver, HYPRE_Int num_sweeps );
+HYPRE_Int HYPRE_BoomerAMGSetCycleNumSweeps ( HYPRE_Solver solver, HYPRE_Int num_sweeps,
+                                             HYPRE_Int k );
+HYPRE_Int HYPRE_BoomerAMGGetCycleNumSweeps ( HYPRE_Solver solver, HYPRE_Int *num_sweeps,
+                                             HYPRE_Int k );
+HYPRE_Int HYPRE_BoomerAMGInitGridRelaxation ( HYPRE_Int **num_grid_sweeps_ptr,
+                                              HYPRE_Int **grid_relax_type_ptr, HYPRE_Int ***grid_relax_points_ptr, HYPRE_Int coarsen_type,
+                                              HYPRE_Real **relax_weights_ptr, HYPRE_Int max_levels );
+HYPRE_Int HYPRE_BoomerAMGSetGridRelaxType ( HYPRE_Solver solver, HYPRE_Int *grid_relax_type );
+HYPRE_Int HYPRE_BoomerAMGSetRelaxType ( HYPRE_Solver solver, HYPRE_Int relax_type );
+HYPRE_Int HYPRE_BoomerAMGSetCycleRelaxType ( HYPRE_Solver solver, HYPRE_Int relax_type,
+                                             HYPRE_Int k );
+HYPRE_Int HYPRE_BoomerAMGGetCycleRelaxType ( HYPRE_Solver solver, HYPRE_Int *relax_type,
+                                             HYPRE_Int k );
+HYPRE_Int HYPRE_BoomerAMGSetRelaxOrder ( HYPRE_Solver solver, HYPRE_Int relax_order );
+HYPRE_Int HYPRE_BoomerAMGSetGridRelaxPoints ( HYPRE_Solver solver, HYPRE_Int **grid_relax_points );
+HYPRE_Int HYPRE_BoomerAMGSetRelaxWeight ( HYPRE_Solver solver, HYPRE_Real *relax_weight );
+HYPRE_Int HYPRE_BoomerAMGSetRelaxWt ( HYPRE_Solver solver, HYPRE_Real relax_wt );
+HYPRE_Int HYPRE_BoomerAMGSetLevelRelaxWt ( HYPRE_Solver solver, HYPRE_Real relax_wt,
+                                           HYPRE_Int level );
+HYPRE_Int HYPRE_BoomerAMGSetOmega ( HYPRE_Solver solver, HYPRE_Real *omega );
+HYPRE_Int HYPRE_BoomerAMGSetOuterWt ( HYPRE_Solver solver, HYPRE_Real outer_wt );
+HYPRE_Int HYPRE_BoomerAMGSetLevelOuterWt ( HYPRE_Solver solver, HYPRE_Real outer_wt,
+                                           HYPRE_Int level );
+HYPRE_Int HYPRE_BoomerAMGSetSmoothType ( HYPRE_Solver solver, HYPRE_Int smooth_type );
+HYPRE_Int HYPRE_BoomerAMGGetSmoothType ( HYPRE_Solver solver, HYPRE_Int *smooth_type );
+HYPRE_Int HYPRE_BoomerAMGSetSmoothNumLevels ( HYPRE_Solver solver, HYPRE_Int smooth_num_levels );
+HYPRE_Int HYPRE_BoomerAMGGetSmoothNumLevels ( HYPRE_Solver solver, HYPRE_Int *smooth_num_levels );
+HYPRE_Int HYPRE_BoomerAMGSetSmoothNumSweeps ( HYPRE_Solver solver, HYPRE_Int smooth_num_sweeps );
+HYPRE_Int HYPRE_BoomerAMGGetSmoothNumSweeps ( HYPRE_Solver solver, HYPRE_Int *smooth_num_sweeps );
+HYPRE_Int HYPRE_BoomerAMGSetLogging ( HYPRE_Solver solver, HYPRE_Int logging );
+HYPRE_Int HYPRE_BoomerAMGGetLogging ( HYPRE_Solver solver, HYPRE_Int *logging );
+HYPRE_Int HYPRE_BoomerAMGSetPrintLevel ( HYPRE_Solver solver, HYPRE_Int print_level );
+HYPRE_Int HYPRE_BoomerAMGGetPrintLevel ( HYPRE_Solver solver, HYPRE_Int *print_level );
+HYPRE_Int HYPRE_BoomerAMGSetPrintFileName ( HYPRE_Solver solver, const char *print_file_name );
+HYPRE_Int HYPRE_BoomerAMGSetDebugFlag ( HYPRE_Solver solver, HYPRE_Int debug_flag );
+HYPRE_Int HYPRE_BoomerAMGGetDebugFlag ( HYPRE_Solver solver, HYPRE_Int *debug_flag );
+HYPRE_Int HYPRE_BoomerAMGGetNumIterations ( HYPRE_Solver solver, HYPRE_Int *num_iterations );
+HYPRE_Int HYPRE_BoomerAMGGetCumNumIterations ( HYPRE_Solver solver, HYPRE_Int *cum_num_iterations );
+HYPRE_Int HYPRE_BoomerAMGGetResidual ( HYPRE_Solver solver, HYPRE_ParVector *residual );
+HYPRE_Int HYPRE_BoomerAMGGetFinalRelativeResidualNorm ( HYPRE_Solver solver,
+                                                        HYPRE_Real *rel_resid_norm );
+HYPRE_Int HYPRE_BoomerAMGSetVariant ( HYPRE_Solver solver, HYPRE_Int variant );
+HYPRE_Int HYPRE_BoomerAMGGetVariant ( HYPRE_Solver solver, HYPRE_Int *variant );
+HYPRE_Int HYPRE_BoomerAMGSetOverlap ( HYPRE_Solver solver, HYPRE_Int overlap );
+HYPRE_Int HYPRE_BoomerAMGGetOverlap ( HYPRE_Solver solver, HYPRE_Int *overlap );
+HYPRE_Int HYPRE_BoomerAMGSetDomainType ( HYPRE_Solver solver, HYPRE_Int domain_type );
+HYPRE_Int HYPRE_BoomerAMGGetDomainType ( HYPRE_Solver solver, HYPRE_Int *domain_type );
+HYPRE_Int HYPRE_BoomerAMGSetSchwarzRlxWeight ( HYPRE_Solver solver, HYPRE_Real schwarz_rlx_weight );
+HYPRE_Int HYPRE_BoomerAMGGetSchwarzRlxWeight ( HYPRE_Solver solver,
+                                               HYPRE_Real *schwarz_rlx_weight );
+HYPRE_Int HYPRE_BoomerAMGSetSchwarzUseNonSymm ( HYPRE_Solver solver, HYPRE_Int use_nonsymm );
+HYPRE_Int HYPRE_BoomerAMGSetSym ( HYPRE_Solver solver, HYPRE_Int sym );
+HYPRE_Int HYPRE_BoomerAMGSetLevel ( HYPRE_Solver solver, HYPRE_Int level );
+HYPRE_Int HYPRE_BoomerAMGSetThreshold ( HYPRE_Solver solver, HYPRE_Real threshold );
+HYPRE_Int HYPRE_BoomerAMGSetFilter ( HYPRE_Solver solver, HYPRE_Real filter );
+HYPRE_Int HYPRE_BoomerAMGSetDropTol ( HYPRE_Solver solver, HYPRE_Real drop_tol );
+HYPRE_Int HYPRE_BoomerAMGSetMaxNzPerRow ( HYPRE_Solver solver, HYPRE_Int max_nz_per_row );
+HYPRE_Int HYPRE_BoomerAMGSetEuclidFile ( HYPRE_Solver solver, char *euclidfile );
+HYPRE_Int HYPRE_BoomerAMGSetEuLevel ( HYPRE_Solver solver, HYPRE_Int eu_level );
+HYPRE_Int HYPRE_BoomerAMGSetEuSparseA ( HYPRE_Solver solver, HYPRE_Real eu_sparse_A );
+HYPRE_Int HYPRE_BoomerAMGSetEuBJ ( HYPRE_Solver solver, HYPRE_Int eu_bj );
 HYPRE_Int HYPRE_BoomerAMGSetILUType( HYPRE_Solver solver, HYPRE_Int ilu_type);
 HYPRE_Int HYPRE_BoomerAMGSetILULevel( HYPRE_Solver solver, HYPRE_Int ilu_lfil);
 HYPRE_Int HYPRE_BoomerAMGSetILUMaxRowNnz( HYPRE_Solver  solver, HYPRE_Int ilu_max_row_nnz);
 HYPRE_Int HYPRE_BoomerAMGSetILUMaxIter( HYPRE_Solver solver, HYPRE_Int ilu_max_iter);
 HYPRE_Int HYPRE_BoomerAMGSetILUDroptol( HYPRE_Solver solver, HYPRE_Real ilu_droptol);
+HYPRE_Int HYPRE_BoomerAMGSetILUTriSolve( HYPRE_Solver solver, HYPRE_Int ilu_tri_solve);
+HYPRE_Int HYPRE_BoomerAMGSetILULowerJacobiIters( HYPRE_Solver solver,
+                                                 HYPRE_Int ilu_lower_jacobi_iters);
+HYPRE_Int HYPRE_BoomerAMGSetILUUpperJacobiIters( HYPRE_Solver solver,
+                                                 HYPRE_Int ilu_upper_jacobi_iters);
 HYPRE_Int HYPRE_BoomerAMGSetILULocalReordering( HYPRE_Solver solver, HYPRE_Int ilu_reordering_type);
-HYPRE_Int HYPRE_BoomerAMGSetNumFunctions ( HYPRE_Solver solver , HYPRE_Int num_functions );
-HYPRE_Int HYPRE_BoomerAMGGetNumFunctions ( HYPRE_Solver solver , HYPRE_Int *num_functions );
-HYPRE_Int HYPRE_BoomerAMGSetNodal ( HYPRE_Solver solver , HYPRE_Int nodal );
-HYPRE_Int HYPRE_BoomerAMGSetNodalLevels ( HYPRE_Solver solver , HYPRE_Int nodal_levels );
-HYPRE_Int HYPRE_BoomerAMGSetNodalDiag ( HYPRE_Solver solver , HYPRE_Int nodal );
-HYPRE_Int HYPRE_BoomerAMGSetKeepSameSign ( HYPRE_Solver solver , HYPRE_Int keep_same_sign );
-HYPRE_Int HYPRE_BoomerAMGSetDofFunc ( HYPRE_Solver solver , HYPRE_Int *dof_func );
-HYPRE_Int HYPRE_BoomerAMGSetNumPaths ( HYPRE_Solver solver , HYPRE_Int num_paths );
-HYPRE_Int HYPRE_BoomerAMGSetAggNumLevels ( HYPRE_Solver solver , HYPRE_Int agg_num_levels );
-HYPRE_Int HYPRE_BoomerAMGSetAggInterpType ( HYPRE_Solver solver , HYPRE_Int agg_interp_type );
-HYPRE_Int HYPRE_BoomerAMGSetAggTruncFactor ( HYPRE_Solver solver , HYPRE_Real agg_trunc_factor );
-HYPRE_Int HYPRE_BoomerAMGSetAddTruncFactor ( HYPRE_Solver solver , HYPRE_Real add_trunc_factor );
-HYPRE_Int HYPRE_BoomerAMGSetMultAddTruncFactor ( HYPRE_Solver solver , HYPRE_Real add_trunc_factor );
-HYPRE_Int HYPRE_BoomerAMGSetAggP12TruncFactor ( HYPRE_Solver solver , HYPRE_Real agg_P12_trunc_factor );
-HYPRE_Int HYPRE_BoomerAMGSetAggPMaxElmts ( HYPRE_Solver solver , HYPRE_Int agg_P_max_elmts );
-HYPRE_Int HYPRE_BoomerAMGSetAddPMaxElmts ( HYPRE_Solver solver , HYPRE_Int add_P_max_elmts );
-HYPRE_Int HYPRE_BoomerAMGSetMultAddPMaxElmts ( HYPRE_Solver solver , HYPRE_Int add_P_max_elmts );
-HYPRE_Int HYPRE_BoomerAMGSetAddRelaxType ( HYPRE_Solver solver , HYPRE_Int add_rlx_type );
-HYPRE_Int HYPRE_BoomerAMGSetAddRelaxWt ( HYPRE_Solver solver , HYPRE_Real add_rlx_wt );
-HYPRE_Int HYPRE_BoomerAMGSetAggP12MaxElmts ( HYPRE_Solver solver , HYPRE_Int agg_P12_max_elmts );
-HYPRE_Int HYPRE_BoomerAMGSetNumCRRelaxSteps ( HYPRE_Solver solver , HYPRE_Int num_CR_relax_steps );
-HYPRE_Int HYPRE_BoomerAMGSetCRRate ( HYPRE_Solver solver , HYPRE_Real CR_rate );
-HYPRE_Int HYPRE_BoomerAMGSetCRStrongTh ( HYPRE_Solver solver , HYPRE_Real CR_strong_th );
+HYPRE_Int HYPRE_BoomerAMGSetFSAIAlgoType ( HYPRE_Solver solver, HYPRE_Int algo_type );
+HYPRE_Int HYPRE_BoomerAMGSetFSAILocalSolveType ( HYPRE_Solver solver, HYPRE_Int local_solve_type );
+HYPRE_Int HYPRE_BoomerAMGSetFSAIMaxSteps ( HYPRE_Solver solver, HYPRE_Int max_steps );
+HYPRE_Int HYPRE_BoomerAMGSetFSAIMaxStepSize ( HYPRE_Solver solver, HYPRE_Int max_step_size );
+HYPRE_Int HYPRE_BoomerAMGSetFSAIMaxNnzRow ( HYPRE_Solver solver, HYPRE_Int max_nnz_row );
+HYPRE_Int HYPRE_BoomerAMGSetFSAINumLevels ( HYPRE_Solver solver, HYPRE_Int num_levels );
+HYPRE_Int HYPRE_BoomerAMGSetFSAIEigMaxIters ( HYPRE_Solver solver, HYPRE_Int eig_max_iters );
+HYPRE_Int HYPRE_BoomerAMGSetFSAIThreshold ( HYPRE_Solver solver, HYPRE_Real threshold );
+HYPRE_Int HYPRE_BoomerAMGSetFSAIKapTolerance ( HYPRE_Solver solver, HYPRE_Real kap_tolerance );
+HYPRE_Int HYPRE_BoomerAMGSetNumFunctions ( HYPRE_Solver solver, HYPRE_Int num_functions );
+HYPRE_Int HYPRE_BoomerAMGGetNumFunctions ( HYPRE_Solver solver, HYPRE_Int *num_functions );
+HYPRE_Int HYPRE_BoomerAMGSetFilterFunctions ( HYPRE_Solver solver, HYPRE_Int filter_functions );
+HYPRE_Int HYPRE_BoomerAMGGetFilterFunctions ( HYPRE_Solver solver, HYPRE_Int *filter_functions );
+HYPRE_Int HYPRE_BoomerAMGSetNodal ( HYPRE_Solver solver, HYPRE_Int nodal );
+HYPRE_Int HYPRE_BoomerAMGSetNodalLevels ( HYPRE_Solver solver, HYPRE_Int nodal_levels );
+HYPRE_Int HYPRE_BoomerAMGSetNodalDiag ( HYPRE_Solver solver, HYPRE_Int nodal );
+HYPRE_Int HYPRE_BoomerAMGSetKeepSameSign ( HYPRE_Solver solver, HYPRE_Int keep_same_sign );
+HYPRE_Int HYPRE_BoomerAMGSetDofFunc ( HYPRE_Solver solver, HYPRE_Int *dof_func );
+HYPRE_Int HYPRE_BoomerAMGSetNumPaths ( HYPRE_Solver solver, HYPRE_Int num_paths );
+HYPRE_Int HYPRE_BoomerAMGSetAggNumLevels ( HYPRE_Solver solver, HYPRE_Int agg_num_levels );
+HYPRE_Int HYPRE_BoomerAMGSetAggInterpType ( HYPRE_Solver solver, HYPRE_Int agg_interp_type );
+HYPRE_Int HYPRE_BoomerAMGSetAggTruncFactor ( HYPRE_Solver solver, HYPRE_Real agg_trunc_factor );
+HYPRE_Int HYPRE_BoomerAMGSetAddTruncFactor ( HYPRE_Solver solver, HYPRE_Real add_trunc_factor );
+HYPRE_Int HYPRE_BoomerAMGSetMultAddTruncFactor ( HYPRE_Solver solver, HYPRE_Real add_trunc_factor );
+HYPRE_Int HYPRE_BoomerAMGSetAggP12TruncFactor ( HYPRE_Solver solver,
+                                                HYPRE_Real agg_P12_trunc_factor );
+HYPRE_Int HYPRE_BoomerAMGSetAggPMaxElmts ( HYPRE_Solver solver, HYPRE_Int agg_P_max_elmts );
+HYPRE_Int HYPRE_BoomerAMGSetAddPMaxElmts ( HYPRE_Solver solver, HYPRE_Int add_P_max_elmts );
+HYPRE_Int HYPRE_BoomerAMGSetMultAddPMaxElmts ( HYPRE_Solver solver, HYPRE_Int add_P_max_elmts );
+HYPRE_Int HYPRE_BoomerAMGSetAddRelaxType ( HYPRE_Solver solver, HYPRE_Int add_rlx_type );
+HYPRE_Int HYPRE_BoomerAMGSetAddRelaxWt ( HYPRE_Solver solver, HYPRE_Real add_rlx_wt );
+HYPRE_Int HYPRE_BoomerAMGSetAggP12MaxElmts ( HYPRE_Solver solver, HYPRE_Int agg_P12_max_elmts );
+HYPRE_Int HYPRE_BoomerAMGSetNumCRRelaxSteps ( HYPRE_Solver solver, HYPRE_Int num_CR_relax_steps );
+HYPRE_Int HYPRE_BoomerAMGSetCRRate ( HYPRE_Solver solver, HYPRE_Real CR_rate );
+HYPRE_Int HYPRE_BoomerAMGSetCRStrongTh ( HYPRE_Solver solver, HYPRE_Real CR_strong_th );
 HYPRE_Int HYPRE_BoomerAMGSetADropTol( HYPRE_Solver solver, HYPRE_Real A_drop_tol  );
 HYPRE_Int HYPRE_BoomerAMGSetADropType( HYPRE_Solver solver, HYPRE_Int A_drop_type  );
-HYPRE_Int HYPRE_BoomerAMGSetISType ( HYPRE_Solver solver , HYPRE_Int IS_type );
-HYPRE_Int HYPRE_BoomerAMGSetCRUseCG ( HYPRE_Solver solver , HYPRE_Int CR_use_CG );
-HYPRE_Int HYPRE_BoomerAMGSetGSMG ( HYPRE_Solver solver , HYPRE_Int gsmg );
-HYPRE_Int HYPRE_BoomerAMGSetNumSamples ( HYPRE_Solver solver , HYPRE_Int gsmg );
-HYPRE_Int HYPRE_BoomerAMGSetCGCIts ( HYPRE_Solver solver , HYPRE_Int its );
-HYPRE_Int HYPRE_BoomerAMGSetPlotGrids ( HYPRE_Solver solver , HYPRE_Int plotgrids );
-HYPRE_Int HYPRE_BoomerAMGSetPlotFileName ( HYPRE_Solver solver , const char *plotfilename );
-HYPRE_Int HYPRE_BoomerAMGSetCoordDim ( HYPRE_Solver solver , HYPRE_Int coorddim );
-HYPRE_Int HYPRE_BoomerAMGSetCoordinates ( HYPRE_Solver solver , float *coordinates );
+HYPRE_Int HYPRE_BoomerAMGSetISType ( HYPRE_Solver solver, HYPRE_Int IS_type );
+HYPRE_Int HYPRE_BoomerAMGSetCRUseCG ( HYPRE_Solver solver, HYPRE_Int CR_use_CG );
+HYPRE_Int HYPRE_BoomerAMGSetGSMG ( HYPRE_Solver solver, HYPRE_Int gsmg );
+HYPRE_Int HYPRE_BoomerAMGSetNumSamples ( HYPRE_Solver solver, HYPRE_Int gsmg );
+HYPRE_Int HYPRE_BoomerAMGSetCGCIts ( HYPRE_Solver solver, HYPRE_Int its );
+HYPRE_Int HYPRE_BoomerAMGSetPlotGrids ( HYPRE_Solver solver, HYPRE_Int plotgrids );
+HYPRE_Int HYPRE_BoomerAMGSetPlotFileName ( HYPRE_Solver solver, const char *plotfilename );
+HYPRE_Int HYPRE_BoomerAMGSetCoordDim ( HYPRE_Solver solver, HYPRE_Int coorddim );
+HYPRE_Int HYPRE_BoomerAMGSetCoordinates ( HYPRE_Solver solver, float *coordinates );
 HYPRE_Int HYPRE_BoomerAMGGetGridHierarchy(HYPRE_Solver solver, HYPRE_Int *cgrid );
-HYPRE_Int HYPRE_BoomerAMGSetChebyOrder ( HYPRE_Solver solver , HYPRE_Int order );
-HYPRE_Int HYPRE_BoomerAMGSetChebyFraction ( HYPRE_Solver solver , HYPRE_Real ratio );
-HYPRE_Int HYPRE_BoomerAMGSetChebyEigEst ( HYPRE_Solver solver , HYPRE_Int eig_est );
-HYPRE_Int HYPRE_BoomerAMGSetChebyVariant ( HYPRE_Solver solver , HYPRE_Int variant );
-HYPRE_Int HYPRE_BoomerAMGSetChebyScale ( HYPRE_Solver solver , HYPRE_Int scale );
-HYPRE_Int HYPRE_BoomerAMGSetInterpVectors ( HYPRE_Solver solver , HYPRE_Int num_vectors , HYPRE_ParVector *vectors );
-HYPRE_Int HYPRE_BoomerAMGSetInterpVecVariant ( HYPRE_Solver solver , HYPRE_Int num );
-HYPRE_Int HYPRE_BoomerAMGSetInterpVecQMax ( HYPRE_Solver solver , HYPRE_Int q_max );
-HYPRE_Int HYPRE_BoomerAMGSetInterpVecAbsQTrunc ( HYPRE_Solver solver , HYPRE_Real q_trunc );
-HYPRE_Int HYPRE_BoomerAMGSetSmoothInterpVectors ( HYPRE_Solver solver , HYPRE_Int smooth_interp_vectors );
-HYPRE_Int HYPRE_BoomerAMGSetInterpRefine ( HYPRE_Solver solver , HYPRE_Int num_refine );
-HYPRE_Int HYPRE_BoomerAMGSetInterpVecFirstLevel ( HYPRE_Solver solver , HYPRE_Int level );
-HYPRE_Int HYPRE_BoomerAMGSetAdditive ( HYPRE_Solver solver , HYPRE_Int additive );
-HYPRE_Int HYPRE_BoomerAMGGetAdditive ( HYPRE_Solver solver , HYPRE_Int *additive );
-HYPRE_Int HYPRE_BoomerAMGSetMultAdditive ( HYPRE_Solver solver , HYPRE_Int mult_additive );
-HYPRE_Int HYPRE_BoomerAMGGetMultAdditive ( HYPRE_Solver solver , HYPRE_Int *mult_additive );
-HYPRE_Int HYPRE_BoomerAMGSetSimple ( HYPRE_Solver solver , HYPRE_Int simple );
-HYPRE_Int HYPRE_BoomerAMGGetSimple ( HYPRE_Solver solver , HYPRE_Int *simple );
-HYPRE_Int HYPRE_BoomerAMGSetAddLastLvl ( HYPRE_Solver solver , HYPRE_Int add_last_lvl );
-HYPRE_Int HYPRE_BoomerAMGSetNonGalerkinTol ( HYPRE_Solver solver , HYPRE_Real nongalerkin_tol );
-HYPRE_Int HYPRE_BoomerAMGSetLevelNonGalerkinTol ( HYPRE_Solver solver , HYPRE_Real nongalerkin_tol , HYPRE_Int level );
-HYPRE_Int HYPRE_BoomerAMGSetNonGalerkTol ( HYPRE_Solver solver , HYPRE_Int nongalerk_num_tol , HYPRE_Real *nongalerk_tol );
-HYPRE_Int HYPRE_BoomerAMGSetRAP2 ( HYPRE_Solver solver , HYPRE_Int rap2 );
-HYPRE_Int HYPRE_BoomerAMGSetModuleRAP2 ( HYPRE_Solver solver , HYPRE_Int mod_rap2 );
-HYPRE_Int HYPRE_BoomerAMGSetKeepTranspose ( HYPRE_Solver solver , HYPRE_Int keepTranspose );
+HYPRE_Int HYPRE_BoomerAMGSetChebyOrder ( HYPRE_Solver solver, HYPRE_Int order );
+HYPRE_Int HYPRE_BoomerAMGSetChebyFraction ( HYPRE_Solver solver, HYPRE_Real ratio );
+HYPRE_Int HYPRE_BoomerAMGSetChebyEigEst ( HYPRE_Solver solver, HYPRE_Int eig_est );
+HYPRE_Int HYPRE_BoomerAMGSetChebyVariant ( HYPRE_Solver solver, HYPRE_Int variant );
+HYPRE_Int HYPRE_BoomerAMGSetChebyScale ( HYPRE_Solver solver, HYPRE_Int scale );
+HYPRE_Int HYPRE_BoomerAMGSetInterpVectors ( HYPRE_Solver solver, HYPRE_Int num_vectors,
+                                            HYPRE_ParVector *vectors );
+HYPRE_Int HYPRE_BoomerAMGSetInterpVecVariant ( HYPRE_Solver solver, HYPRE_Int num );
+HYPRE_Int HYPRE_BoomerAMGSetInterpVecQMax ( HYPRE_Solver solver, HYPRE_Int q_max );
+HYPRE_Int HYPRE_BoomerAMGSetInterpVecAbsQTrunc ( HYPRE_Solver solver, HYPRE_Real q_trunc );
+HYPRE_Int HYPRE_BoomerAMGSetSmoothInterpVectors ( HYPRE_Solver solver,
+                                                  HYPRE_Int smooth_interp_vectors );
+HYPRE_Int HYPRE_BoomerAMGSetInterpRefine ( HYPRE_Solver solver, HYPRE_Int num_refine );
+HYPRE_Int HYPRE_BoomerAMGSetInterpVecFirstLevel ( HYPRE_Solver solver, HYPRE_Int level );
+HYPRE_Int HYPRE_BoomerAMGSetAdditive ( HYPRE_Solver solver, HYPRE_Int additive );
+HYPRE_Int HYPRE_BoomerAMGGetAdditive ( HYPRE_Solver solver, HYPRE_Int *additive );
+HYPRE_Int HYPRE_BoomerAMGSetMultAdditive ( HYPRE_Solver solver, HYPRE_Int mult_additive );
+HYPRE_Int HYPRE_BoomerAMGGetMultAdditive ( HYPRE_Solver solver, HYPRE_Int *mult_additive );
+HYPRE_Int HYPRE_BoomerAMGSetSimple ( HYPRE_Solver solver, HYPRE_Int simple );
+HYPRE_Int HYPRE_BoomerAMGGetSimple ( HYPRE_Solver solver, HYPRE_Int *simple );
+HYPRE_Int HYPRE_BoomerAMGSetAddLastLvl ( HYPRE_Solver solver, HYPRE_Int add_last_lvl );
+HYPRE_Int HYPRE_BoomerAMGSetNonGalerkinTol ( HYPRE_Solver solver, HYPRE_Real nongalerkin_tol );
+HYPRE_Int HYPRE_BoomerAMGSetLevelNonGalerkinTol ( HYPRE_Solver solver, HYPRE_Real nongalerkin_tol,
+                                                  HYPRE_Int level );
+HYPRE_Int HYPRE_BoomerAMGSetNonGalerkTol ( HYPRE_Solver solver, HYPRE_Int nongalerk_num_tol,
+                                           HYPRE_Real *nongalerk_tol );
+HYPRE_Int HYPRE_BoomerAMGSetRAP2 ( HYPRE_Solver solver, HYPRE_Int rap2 );
+HYPRE_Int HYPRE_BoomerAMGSetModuleRAP2 ( HYPRE_Solver solver, HYPRE_Int mod_rap2 );
+HYPRE_Int HYPRE_BoomerAMGSetKeepTranspose ( HYPRE_Solver solver, HYPRE_Int keepTranspose );
 #ifdef HYPRE_USING_DSUPERLU
-HYPRE_Int HYPRE_BoomerAMGSetDSLUThreshold ( HYPRE_Solver solver , HYPRE_Int slu_threshold );
+HYPRE_Int HYPRE_BoomerAMGSetDSLUThreshold ( HYPRE_Solver solver, HYPRE_Int slu_threshold );
 #endif
-HYPRE_Int HYPRE_BoomerAMGSetCpointsToKeep( HYPRE_Solver solver, HYPRE_Int cpt_coarse_level, HYPRE_Int num_cpt_coarse, HYPRE_BigInt *cpt_coarse_index);
-HYPRE_Int HYPRE_BoomerAMGSetCPoints( HYPRE_Solver solver, HYPRE_Int cpt_coarse_level, HYPRE_Int num_cpt_coarse, HYPRE_BigInt *cpt_coarse_index);
-HYPRE_Int HYPRE_BoomerAMGSetIsolatedFPoints( HYPRE_Solver solver, HYPRE_Int num_isolated_fpt, HYPRE_BigInt *isolated_fpt_index );
-HYPRE_Int HYPRE_BoomerAMGSetFPoints( HYPRE_Solver solver, HYPRE_Int num_fpt, HYPRE_BigInt *fpt_index );
+HYPRE_Int HYPRE_BoomerAMGSetCpointsToKeep( HYPRE_Solver solver, HYPRE_Int cpt_coarse_level,
+                                           HYPRE_Int num_cpt_coarse, HYPRE_BigInt *cpt_coarse_index);
+HYPRE_Int HYPRE_BoomerAMGSetCPoints( HYPRE_Solver solver, HYPRE_Int cpt_coarse_level,
+                                     HYPRE_Int num_cpt_coarse, HYPRE_BigInt *cpt_coarse_index);
+HYPRE_Int HYPRE_BoomerAMGSetIsolatedFPoints( HYPRE_Solver solver, HYPRE_Int num_isolated_fpt,
+                                             HYPRE_BigInt *isolated_fpt_index );
+HYPRE_Int HYPRE_BoomerAMGSetFPoints( HYPRE_Solver solver, HYPRE_Int num_fpt,
+                                     HYPRE_BigInt *fpt_index );
+HYPRE_Int HYPRE_BoomerAMGSetCumNnzAP ( HYPRE_Solver solver, HYPRE_Real cum_nnz_AP );
+HYPRE_Int HYPRE_BoomerAMGGetCumNnzAP ( HYPRE_Solver solver, HYPRE_Real *cum_nnz_AP );
 
 /* HYPRE_parcsr_amgdd.c */
-HYPRE_Int HYPRE_BoomerAMGDDSetup ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b, HYPRE_ParVector x );
-HYPRE_Int HYPRE_BoomerAMGDDSolve ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b, HYPRE_ParVector x );
-HYPRE_Int HYPRE_BoomerAMGDDSetStartLevel ( HYPRE_Solver solver , HYPRE_Int start_level );
-HYPRE_Int HYPRE_BoomerAMGDDGetStartLevel ( HYPRE_Solver solver , HYPRE_Int *start_level );
-HYPRE_Int HYPRE_BoomerAMGDDSetFACNumCycles ( HYPRE_Solver solver , HYPRE_Int fac_num_cycles );
-HYPRE_Int HYPRE_BoomerAMGDDGetFACNumCycles ( HYPRE_Solver solver , HYPRE_Int *fac_num_cycles );
-HYPRE_Int HYPRE_BoomerAMGDDSetFACCycleType ( HYPRE_Solver solver , HYPRE_Int fac_cycle_type );
-HYPRE_Int HYPRE_BoomerAMGDDGetFACCycleType ( HYPRE_Solver solver , HYPRE_Int *fac_cycle_type );
-HYPRE_Int HYPRE_BoomerAMGDDSetFACNumRelax ( HYPRE_Solver solver , HYPRE_Int fac_num_relax );
-HYPRE_Int HYPRE_BoomerAMGDDGetFACNumRelax ( HYPRE_Solver solver , HYPRE_Int *fac_num_relax );
-HYPRE_Int HYPRE_BoomerAMGDDSetFACRelaxType ( HYPRE_Solver solver , HYPRE_Int fac_relax_type );
-HYPRE_Int HYPRE_BoomerAMGDDGetFACRelaxType ( HYPRE_Solver solver , HYPRE_Int *fac_relax_type );
-HYPRE_Int HYPRE_BoomerAMGDDSetFACRelaxWeight ( HYPRE_Solver solver , HYPRE_Real fac_relax_weight );
-HYPRE_Int HYPRE_BoomerAMGDDGetFACRelaxWeight ( HYPRE_Solver solver , HYPRE_Real *fac_relax_weight );
-HYPRE_Int HYPRE_BoomerAMGDDSetPadding ( HYPRE_Solver solver , HYPRE_Int padding );
-HYPRE_Int HYPRE_BoomerAMGDDGetPadding ( HYPRE_Solver solver , HYPRE_Int *padding );
-HYPRE_Int HYPRE_BoomerAMGDDSetNumGhostLayers ( HYPRE_Solver solver , HYPRE_Int num_ghost_layers );
-HYPRE_Int HYPRE_BoomerAMGDDGetNumGhostLayers ( HYPRE_Solver solver , HYPRE_Int *num_ghost_layers );
-HYPRE_Int HYPRE_BoomerAMGDDSetUserFACRelaxation( HYPRE_Solver solver, HYPRE_Int (*userFACRelaxation)( void *amgdd_vdata, HYPRE_Int level, HYPRE_Int cycle_param ) );
-HYPRE_Int HYPRE_BoomerAMGDDGetAMG ( HYPRE_Solver solver , HYPRE_Solver *amg_solver );
+HYPRE_Int HYPRE_BoomerAMGDDSetup ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                                   HYPRE_ParVector x );
+HYPRE_Int HYPRE_BoomerAMGDDSolve ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                                   HYPRE_ParVector x );
+HYPRE_Int HYPRE_BoomerAMGDDSetStartLevel ( HYPRE_Solver solver, HYPRE_Int start_level );
+HYPRE_Int HYPRE_BoomerAMGDDGetStartLevel ( HYPRE_Solver solver, HYPRE_Int *start_level );
+HYPRE_Int HYPRE_BoomerAMGDDSetFACNumCycles ( HYPRE_Solver solver, HYPRE_Int fac_num_cycles );
+HYPRE_Int HYPRE_BoomerAMGDDGetFACNumCycles ( HYPRE_Solver solver, HYPRE_Int *fac_num_cycles );
+HYPRE_Int HYPRE_BoomerAMGDDSetFACCycleType ( HYPRE_Solver solver, HYPRE_Int fac_cycle_type );
+HYPRE_Int HYPRE_BoomerAMGDDGetFACCycleType ( HYPRE_Solver solver, HYPRE_Int *fac_cycle_type );
+HYPRE_Int HYPRE_BoomerAMGDDSetFACNumRelax ( HYPRE_Solver solver, HYPRE_Int fac_num_relax );
+HYPRE_Int HYPRE_BoomerAMGDDGetFACNumRelax ( HYPRE_Solver solver, HYPRE_Int *fac_num_relax );
+HYPRE_Int HYPRE_BoomerAMGDDSetFACRelaxType ( HYPRE_Solver solver, HYPRE_Int fac_relax_type );
+HYPRE_Int HYPRE_BoomerAMGDDGetFACRelaxType ( HYPRE_Solver solver, HYPRE_Int *fac_relax_type );
+HYPRE_Int HYPRE_BoomerAMGDDSetFACRelaxWeight ( HYPRE_Solver solver, HYPRE_Real fac_relax_weight );
+HYPRE_Int HYPRE_BoomerAMGDDGetFACRelaxWeight ( HYPRE_Solver solver, HYPRE_Real *fac_relax_weight );
+HYPRE_Int HYPRE_BoomerAMGDDSetPadding ( HYPRE_Solver solver, HYPRE_Int padding );
+HYPRE_Int HYPRE_BoomerAMGDDGetPadding ( HYPRE_Solver solver, HYPRE_Int *padding );
+HYPRE_Int HYPRE_BoomerAMGDDSetNumGhostLayers ( HYPRE_Solver solver, HYPRE_Int num_ghost_layers );
+HYPRE_Int HYPRE_BoomerAMGDDGetNumGhostLayers ( HYPRE_Solver solver, HYPRE_Int *num_ghost_layers );
+HYPRE_Int HYPRE_BoomerAMGDDSetUserFACRelaxation( HYPRE_Solver solver,
+                                                 HYPRE_Int (*userFACRelaxation)( void *amgdd_vdata, HYPRE_Int level, HYPRE_Int cycle_param ) );
+HYPRE_Int HYPRE_BoomerAMGDDGetAMG ( HYPRE_Solver solver, HYPRE_Solver *amg_solver );
 
 /* HYPRE_parcsr_bicgstab.c */
-HYPRE_Int HYPRE_ParCSRBiCGSTABCreate ( MPI_Comm comm , HYPRE_Solver *solver );
+HYPRE_Int HYPRE_ParCSRBiCGSTABCreate ( MPI_Comm comm, HYPRE_Solver *solver );
 HYPRE_Int HYPRE_ParCSRBiCGSTABDestroy ( HYPRE_Solver solver );
-HYPRE_Int HYPRE_ParCSRBiCGSTABSetup ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_ParCSRBiCGSTABSolve ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_ParCSRBiCGSTABSetTol ( HYPRE_Solver solver , HYPRE_Real tol );
-HYPRE_Int HYPRE_ParCSRBiCGSTABSetAbsoluteTol ( HYPRE_Solver solver , HYPRE_Real a_tol );
-HYPRE_Int HYPRE_ParCSRBiCGSTABSetMinIter ( HYPRE_Solver solver , HYPRE_Int min_iter );
-HYPRE_Int HYPRE_ParCSRBiCGSTABSetMaxIter ( HYPRE_Solver solver , HYPRE_Int max_iter );
-HYPRE_Int HYPRE_ParCSRBiCGSTABSetStopCrit ( HYPRE_Solver solver , HYPRE_Int stop_crit );
-HYPRE_Int HYPRE_ParCSRBiCGSTABSetPrecond ( HYPRE_Solver solver , HYPRE_PtrToParSolverFcn precond , HYPRE_PtrToParSolverFcn precond_setup , HYPRE_Solver precond_solver );
-HYPRE_Int HYPRE_ParCSRBiCGSTABGetPrecond ( HYPRE_Solver solver , HYPRE_Solver *precond_data_ptr );
-HYPRE_Int HYPRE_ParCSRBiCGSTABSetLogging ( HYPRE_Solver solver , HYPRE_Int logging );
-HYPRE_Int HYPRE_ParCSRBiCGSTABSetPrintLevel ( HYPRE_Solver solver , HYPRE_Int print_level );
-HYPRE_Int HYPRE_ParCSRBiCGSTABGetNumIterations ( HYPRE_Solver solver , HYPRE_Int *num_iterations );
-HYPRE_Int HYPRE_ParCSRBiCGSTABGetFinalRelativeResidualNorm ( HYPRE_Solver solver , HYPRE_Real *norm );
-HYPRE_Int HYPRE_ParCSRBiCGSTABGetResidual ( HYPRE_Solver solver , HYPRE_ParVector *residual );
+HYPRE_Int HYPRE_ParCSRBiCGSTABSetup ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                                      HYPRE_ParVector x );
+HYPRE_Int HYPRE_ParCSRBiCGSTABSolve ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                                      HYPRE_ParVector x );
+HYPRE_Int HYPRE_ParCSRBiCGSTABSetTol ( HYPRE_Solver solver, HYPRE_Real tol );
+HYPRE_Int HYPRE_ParCSRBiCGSTABSetAbsoluteTol ( HYPRE_Solver solver, HYPRE_Real a_tol );
+HYPRE_Int HYPRE_ParCSRBiCGSTABSetMinIter ( HYPRE_Solver solver, HYPRE_Int min_iter );
+HYPRE_Int HYPRE_ParCSRBiCGSTABSetMaxIter ( HYPRE_Solver solver, HYPRE_Int max_iter );
+HYPRE_Int HYPRE_ParCSRBiCGSTABSetStopCrit ( HYPRE_Solver solver, HYPRE_Int stop_crit );
+HYPRE_Int HYPRE_ParCSRBiCGSTABSetPrecond ( HYPRE_Solver solver, HYPRE_PtrToParSolverFcn precond,
+                                           HYPRE_PtrToParSolverFcn precond_setup, HYPRE_Solver precond_solver );
+HYPRE_Int HYPRE_ParCSRBiCGSTABGetPrecond ( HYPRE_Solver solver, HYPRE_Solver *precond_data_ptr );
+HYPRE_Int HYPRE_ParCSRBiCGSTABSetLogging ( HYPRE_Solver solver, HYPRE_Int logging );
+HYPRE_Int HYPRE_ParCSRBiCGSTABSetPrintLevel ( HYPRE_Solver solver, HYPRE_Int print_level );
+HYPRE_Int HYPRE_ParCSRBiCGSTABGetNumIterations ( HYPRE_Solver solver, HYPRE_Int *num_iterations );
+HYPRE_Int HYPRE_ParCSRBiCGSTABGetFinalRelativeResidualNorm ( HYPRE_Solver solver,
+                                                             HYPRE_Real *norm );
+HYPRE_Int HYPRE_ParCSRBiCGSTABGetResidual ( HYPRE_Solver solver, HYPRE_ParVector *residual );
 
 /* HYPRE_parcsr_block.c */
 HYPRE_Int HYPRE_BlockTridiagCreate ( HYPRE_Solver *solver );
 HYPRE_Int HYPRE_BlockTridiagDestroy ( HYPRE_Solver solver );
-HYPRE_Int HYPRE_BlockTridiagSetup ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_BlockTridiagSolve ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_BlockTridiagSetIndexSet ( HYPRE_Solver solver , HYPRE_Int n , HYPRE_Int *inds );
-HYPRE_Int HYPRE_BlockTridiagSetAMGStrengthThreshold ( HYPRE_Solver solver , HYPRE_Real thresh );
-HYPRE_Int HYPRE_BlockTridiagSetAMGNumSweeps ( HYPRE_Solver solver , HYPRE_Int num_sweeps );
-HYPRE_Int HYPRE_BlockTridiagSetAMGRelaxType ( HYPRE_Solver solver , HYPRE_Int relax_type );
-HYPRE_Int HYPRE_BlockTridiagSetPrintLevel ( HYPRE_Solver solver , HYPRE_Int print_level );
+HYPRE_Int HYPRE_BlockTridiagSetup ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                                    HYPRE_ParVector x );
+HYPRE_Int HYPRE_BlockTridiagSolve ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                                    HYPRE_ParVector x );
+HYPRE_Int HYPRE_BlockTridiagSetIndexSet ( HYPRE_Solver solver, HYPRE_Int n, HYPRE_Int *inds );
+HYPRE_Int HYPRE_BlockTridiagSetAMGStrengthThreshold ( HYPRE_Solver solver, HYPRE_Real thresh );
+HYPRE_Int HYPRE_BlockTridiagSetAMGNumSweeps ( HYPRE_Solver solver, HYPRE_Int num_sweeps );
+HYPRE_Int HYPRE_BlockTridiagSetAMGRelaxType ( HYPRE_Solver solver, HYPRE_Int relax_type );
+HYPRE_Int HYPRE_BlockTridiagSetPrintLevel ( HYPRE_Solver solver, HYPRE_Int print_level );
 
 /* HYPRE_parcsr_cgnr.c */
-HYPRE_Int HYPRE_ParCSRCGNRCreate ( MPI_Comm comm , HYPRE_Solver *solver );
+HYPRE_Int HYPRE_ParCSRCGNRCreate ( MPI_Comm comm, HYPRE_Solver *solver );
 HYPRE_Int HYPRE_ParCSRCGNRDestroy ( HYPRE_Solver solver );
-HYPRE_Int HYPRE_ParCSRCGNRSetup ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_ParCSRCGNRSolve ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_ParCSRCGNRSetTol ( HYPRE_Solver solver , HYPRE_Real tol );
-HYPRE_Int HYPRE_ParCSRCGNRSetMinIter ( HYPRE_Solver solver , HYPRE_Int min_iter );
-HYPRE_Int HYPRE_ParCSRCGNRSetMaxIter ( HYPRE_Solver solver , HYPRE_Int max_iter );
-HYPRE_Int HYPRE_ParCSRCGNRSetStopCrit ( HYPRE_Solver solver , HYPRE_Int stop_crit );
-HYPRE_Int HYPRE_ParCSRCGNRSetPrecond ( HYPRE_Solver solver , HYPRE_PtrToParSolverFcn precond , HYPRE_PtrToParSolverFcn precondT , HYPRE_PtrToParSolverFcn precond_setup , HYPRE_Solver precond_solver );
-HYPRE_Int HYPRE_ParCSRCGNRGetPrecond ( HYPRE_Solver solver , HYPRE_Solver *precond_data_ptr );
-HYPRE_Int HYPRE_ParCSRCGNRSetLogging ( HYPRE_Solver solver , HYPRE_Int logging );
-HYPRE_Int HYPRE_ParCSRCGNRGetNumIterations ( HYPRE_Solver solver , HYPRE_Int *num_iterations );
-HYPRE_Int HYPRE_ParCSRCGNRGetFinalRelativeResidualNorm ( HYPRE_Solver solver , HYPRE_Real *norm );
+HYPRE_Int HYPRE_ParCSRCGNRSetup ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                                  HYPRE_ParVector x );
+HYPRE_Int HYPRE_ParCSRCGNRSolve ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                                  HYPRE_ParVector x );
+HYPRE_Int HYPRE_ParCSRCGNRSetTol ( HYPRE_Solver solver, HYPRE_Real tol );
+HYPRE_Int HYPRE_ParCSRCGNRSetMinIter ( HYPRE_Solver solver, HYPRE_Int min_iter );
+HYPRE_Int HYPRE_ParCSRCGNRSetMaxIter ( HYPRE_Solver solver, HYPRE_Int max_iter );
+HYPRE_Int HYPRE_ParCSRCGNRSetStopCrit ( HYPRE_Solver solver, HYPRE_Int stop_crit );
+HYPRE_Int HYPRE_ParCSRCGNRSetPrecond ( HYPRE_Solver solver, HYPRE_PtrToParSolverFcn precond,
+                                       HYPRE_PtrToParSolverFcn precondT, HYPRE_PtrToParSolverFcn precond_setup,
+                                       HYPRE_Solver precond_solver );
+HYPRE_Int HYPRE_ParCSRCGNRGetPrecond ( HYPRE_Solver solver, HYPRE_Solver *precond_data_ptr );
+HYPRE_Int HYPRE_ParCSRCGNRSetLogging ( HYPRE_Solver solver, HYPRE_Int logging );
+HYPRE_Int HYPRE_ParCSRCGNRGetNumIterations ( HYPRE_Solver solver, HYPRE_Int *num_iterations );
+HYPRE_Int HYPRE_ParCSRCGNRGetFinalRelativeResidualNorm ( HYPRE_Solver solver, HYPRE_Real *norm );
 
 /* HYPRE_parcsr_Euclid.c */
-HYPRE_Int HYPRE_EuclidCreate ( MPI_Comm comm , HYPRE_Solver *solver );
+HYPRE_Int HYPRE_EuclidCreate ( MPI_Comm comm, HYPRE_Solver *solver );
 HYPRE_Int HYPRE_EuclidDestroy ( HYPRE_Solver solver );
-HYPRE_Int HYPRE_EuclidSetup ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_EuclidSolve ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector bb , HYPRE_ParVector xx );
-HYPRE_Int HYPRE_EuclidSetParams ( HYPRE_Solver solver , HYPRE_Int argc , char *argv []);
-HYPRE_Int HYPRE_EuclidSetParamsFromFile ( HYPRE_Solver solver , char *filename );
-HYPRE_Int HYPRE_EuclidSetLevel ( HYPRE_Solver solver , HYPRE_Int level );
-HYPRE_Int HYPRE_EuclidSetBJ ( HYPRE_Solver solver , HYPRE_Int bj );
-HYPRE_Int HYPRE_EuclidSetStats ( HYPRE_Solver solver , HYPRE_Int eu_stats );
-HYPRE_Int HYPRE_EuclidSetMem ( HYPRE_Solver solver , HYPRE_Int eu_mem );
-HYPRE_Int HYPRE_EuclidSetSparseA ( HYPRE_Solver solver , HYPRE_Real sparse_A );
-HYPRE_Int HYPRE_EuclidSetRowScale ( HYPRE_Solver solver , HYPRE_Int row_scale );
-HYPRE_Int HYPRE_EuclidSetILUT ( HYPRE_Solver solver , HYPRE_Real ilut );
+HYPRE_Int HYPRE_EuclidSetup ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                              HYPRE_ParVector x );
+HYPRE_Int HYPRE_EuclidSolve ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector bb,
+                              HYPRE_ParVector xx );
+HYPRE_Int HYPRE_EuclidSetParams ( HYPRE_Solver solver, HYPRE_Int argc, char *argv []);
+HYPRE_Int HYPRE_EuclidSetParamsFromFile ( HYPRE_Solver solver, char *filename );
+HYPRE_Int HYPRE_EuclidSetLevel ( HYPRE_Solver solver, HYPRE_Int level );
+HYPRE_Int HYPRE_EuclidSetBJ ( HYPRE_Solver solver, HYPRE_Int bj );
+HYPRE_Int HYPRE_EuclidSetStats ( HYPRE_Solver solver, HYPRE_Int eu_stats );
+HYPRE_Int HYPRE_EuclidSetMem ( HYPRE_Solver solver, HYPRE_Int eu_mem );
+HYPRE_Int HYPRE_EuclidSetSparseA ( HYPRE_Solver solver, HYPRE_Real sparse_A );
+HYPRE_Int HYPRE_EuclidSetRowScale ( HYPRE_Solver solver, HYPRE_Int row_scale );
+HYPRE_Int HYPRE_EuclidSetILUT ( HYPRE_Solver solver, HYPRE_Real ilut );
 
 /* HYPRE_parcsr_flexgmres.c */
-HYPRE_Int HYPRE_ParCSRFlexGMRESCreate ( MPI_Comm comm , HYPRE_Solver *solver );
+HYPRE_Int HYPRE_ParCSRFlexGMRESCreate ( MPI_Comm comm, HYPRE_Solver *solver );
 HYPRE_Int HYPRE_ParCSRFlexGMRESDestroy ( HYPRE_Solver solver );
-HYPRE_Int HYPRE_ParCSRFlexGMRESSetup ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_ParCSRFlexGMRESSolve ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_ParCSRFlexGMRESSetKDim ( HYPRE_Solver solver , HYPRE_Int k_dim );
-HYPRE_Int HYPRE_ParCSRFlexGMRESSetTol ( HYPRE_Solver solver , HYPRE_Real tol );
-HYPRE_Int HYPRE_ParCSRFlexGMRESSetAbsoluteTol ( HYPRE_Solver solver , HYPRE_Real a_tol );
-HYPRE_Int HYPRE_ParCSRFlexGMRESSetMinIter ( HYPRE_Solver solver , HYPRE_Int min_iter );
-HYPRE_Int HYPRE_ParCSRFlexGMRESSetMaxIter ( HYPRE_Solver solver , HYPRE_Int max_iter );
-HYPRE_Int HYPRE_ParCSRFlexGMRESSetPrecond ( HYPRE_Solver solver , HYPRE_PtrToParSolverFcn precond , HYPRE_PtrToParSolverFcn precond_setup , HYPRE_Solver precond_solver );
-HYPRE_Int HYPRE_ParCSRFlexGMRESGetPrecond ( HYPRE_Solver solver , HYPRE_Solver *precond_data_ptr );
-HYPRE_Int HYPRE_ParCSRFlexGMRESSetLogging ( HYPRE_Solver solver , HYPRE_Int logging );
-HYPRE_Int HYPRE_ParCSRFlexGMRESSetPrintLevel ( HYPRE_Solver solver , HYPRE_Int print_level );
-HYPRE_Int HYPRE_ParCSRFlexGMRESGetNumIterations ( HYPRE_Solver solver , HYPRE_Int *num_iterations );
-HYPRE_Int HYPRE_ParCSRFlexGMRESGetFinalRelativeResidualNorm ( HYPRE_Solver solver , HYPRE_Real *norm );
-HYPRE_Int HYPRE_ParCSRFlexGMRESGetResidual ( HYPRE_Solver solver , HYPRE_ParVector *residual );
-HYPRE_Int HYPRE_ParCSRFlexGMRESSetModifyPC ( HYPRE_Solver solver , HYPRE_PtrToModifyPCFcn modify_pc );
+HYPRE_Int HYPRE_ParCSRFlexGMRESSetup ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                                       HYPRE_ParVector x );
+HYPRE_Int HYPRE_ParCSRFlexGMRESSolve ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                                       HYPRE_ParVector x );
+HYPRE_Int HYPRE_ParCSRFlexGMRESSetKDim ( HYPRE_Solver solver, HYPRE_Int k_dim );
+HYPRE_Int HYPRE_ParCSRFlexGMRESSetTol ( HYPRE_Solver solver, HYPRE_Real tol );
+HYPRE_Int HYPRE_ParCSRFlexGMRESSetAbsoluteTol ( HYPRE_Solver solver, HYPRE_Real a_tol );
+HYPRE_Int HYPRE_ParCSRFlexGMRESSetMinIter ( HYPRE_Solver solver, HYPRE_Int min_iter );
+HYPRE_Int HYPRE_ParCSRFlexGMRESSetMaxIter ( HYPRE_Solver solver, HYPRE_Int max_iter );
+HYPRE_Int HYPRE_ParCSRFlexGMRESSetPrecond ( HYPRE_Solver solver, HYPRE_PtrToParSolverFcn precond,
+                                            HYPRE_PtrToParSolverFcn precond_setup, HYPRE_Solver precond_solver );
+HYPRE_Int HYPRE_ParCSRFlexGMRESGetPrecond ( HYPRE_Solver solver, HYPRE_Solver *precond_data_ptr );
+HYPRE_Int HYPRE_ParCSRFlexGMRESSetLogging ( HYPRE_Solver solver, HYPRE_Int logging );
+HYPRE_Int HYPRE_ParCSRFlexGMRESSetPrintLevel ( HYPRE_Solver solver, HYPRE_Int print_level );
+HYPRE_Int HYPRE_ParCSRFlexGMRESGetNumIterations ( HYPRE_Solver solver, HYPRE_Int *num_iterations );
+HYPRE_Int HYPRE_ParCSRFlexGMRESGetFinalRelativeResidualNorm ( HYPRE_Solver solver,
+                                                              HYPRE_Real *norm );
+HYPRE_Int HYPRE_ParCSRFlexGMRESGetResidual ( HYPRE_Solver solver, HYPRE_ParVector *residual );
+HYPRE_Int HYPRE_ParCSRFlexGMRESSetModifyPC ( HYPRE_Solver solver,
+                                             HYPRE_PtrToModifyPCFcn modify_pc );
 
 /* HYPRE_parcsr_gmres.c */
-HYPRE_Int HYPRE_ParCSRGMRESCreate ( MPI_Comm comm , HYPRE_Solver *solver );
+HYPRE_Int HYPRE_ParCSRGMRESCreate ( MPI_Comm comm, HYPRE_Solver *solver );
 HYPRE_Int HYPRE_ParCSRGMRESDestroy ( HYPRE_Solver solver );
-HYPRE_Int HYPRE_ParCSRGMRESSetup ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_ParCSRGMRESSolve ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_ParCSRGMRESSetKDim ( HYPRE_Solver solver , HYPRE_Int k_dim );
-HYPRE_Int HYPRE_ParCSRGMRESSetTol ( HYPRE_Solver solver , HYPRE_Real tol );
-HYPRE_Int HYPRE_ParCSRGMRESSetAbsoluteTol ( HYPRE_Solver solver , HYPRE_Real a_tol );
-HYPRE_Int HYPRE_ParCSRGMRESSetMinIter ( HYPRE_Solver solver , HYPRE_Int min_iter );
-HYPRE_Int HYPRE_ParCSRGMRESSetMaxIter ( HYPRE_Solver solver , HYPRE_Int max_iter );
-HYPRE_Int HYPRE_ParCSRGMRESSetStopCrit ( HYPRE_Solver solver , HYPRE_Int stop_crit );
-HYPRE_Int HYPRE_ParCSRGMRESSetPrecond ( HYPRE_Solver solver , HYPRE_PtrToParSolverFcn precond , HYPRE_PtrToParSolverFcn precond_setup , HYPRE_Solver precond_solver );
-HYPRE_Int HYPRE_ParCSRGMRESGetPrecond ( HYPRE_Solver solver , HYPRE_Solver *precond_data_ptr );
-HYPRE_Int HYPRE_ParCSRGMRESSetLogging ( HYPRE_Solver solver , HYPRE_Int logging );
-HYPRE_Int HYPRE_ParCSRGMRESSetPrintLevel ( HYPRE_Solver solver , HYPRE_Int print_level );
-HYPRE_Int HYPRE_ParCSRGMRESGetNumIterations ( HYPRE_Solver solver , HYPRE_Int *num_iterations );
-HYPRE_Int HYPRE_ParCSRGMRESGetFinalRelativeResidualNorm ( HYPRE_Solver solver , HYPRE_Real *norm );
-HYPRE_Int HYPRE_ParCSRGMRESGetResidual ( HYPRE_Solver solver , HYPRE_ParVector *residual );
+HYPRE_Int HYPRE_ParCSRGMRESSetup ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                                   HYPRE_ParVector x );
+HYPRE_Int HYPRE_ParCSRGMRESSolve ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                                   HYPRE_ParVector x );
+HYPRE_Int HYPRE_ParCSRGMRESSetKDim ( HYPRE_Solver solver, HYPRE_Int k_dim );
+HYPRE_Int HYPRE_ParCSRGMRESSetTol ( HYPRE_Solver solver, HYPRE_Real tol );
+HYPRE_Int HYPRE_ParCSRGMRESSetAbsoluteTol ( HYPRE_Solver solver, HYPRE_Real a_tol );
+HYPRE_Int HYPRE_ParCSRGMRESSetMinIter ( HYPRE_Solver solver, HYPRE_Int min_iter );
+HYPRE_Int HYPRE_ParCSRGMRESSetMaxIter ( HYPRE_Solver solver, HYPRE_Int max_iter );
+HYPRE_Int HYPRE_ParCSRGMRESSetStopCrit ( HYPRE_Solver solver, HYPRE_Int stop_crit );
+HYPRE_Int HYPRE_ParCSRGMRESSetPrecond ( HYPRE_Solver solver, HYPRE_PtrToParSolverFcn precond,
+                                        HYPRE_PtrToParSolverFcn precond_setup, HYPRE_Solver precond_solver );
+HYPRE_Int HYPRE_ParCSRGMRESGetPrecond ( HYPRE_Solver solver, HYPRE_Solver *precond_data_ptr );
+HYPRE_Int HYPRE_ParCSRGMRESSetLogging ( HYPRE_Solver solver, HYPRE_Int logging );
+HYPRE_Int HYPRE_ParCSRGMRESSetPrintLevel ( HYPRE_Solver solver, HYPRE_Int print_level );
+HYPRE_Int HYPRE_ParCSRGMRESGetNumIterations ( HYPRE_Solver solver, HYPRE_Int *num_iterations );
+HYPRE_Int HYPRE_ParCSRGMRESGetFinalRelativeResidualNorm ( HYPRE_Solver solver, HYPRE_Real *norm );
+HYPRE_Int HYPRE_ParCSRGMRESGetResidual ( HYPRE_Solver solver, HYPRE_ParVector *residual );
 
 
 /*HYPRE_parcsr_cogmres.c*/
-HYPRE_Int HYPRE_ParCSRCOGMRESCreate ( MPI_Comm comm , HYPRE_Solver *solver );
+HYPRE_Int HYPRE_ParCSRCOGMRESCreate ( MPI_Comm comm, HYPRE_Solver *solver );
 HYPRE_Int HYPRE_ParCSRCOGMRESDestroy ( HYPRE_Solver solver );
-HYPRE_Int HYPRE_ParCSRCOGMRESSetup ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_ParCSRCOGMRESSolve ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_ParCSRCOGMRESSetKDim ( HYPRE_Solver solver , HYPRE_Int k_dim );
-HYPRE_Int HYPRE_ParCSRCOGMRESSetCGS2 ( HYPRE_Solver solver , HYPRE_Int cgs2 );
-HYPRE_Int HYPRE_ParCSRCOGMRESSetTol ( HYPRE_Solver solver , HYPRE_Real tol );
-HYPRE_Int HYPRE_ParCSRCOGMRESSetAbsoluteTol ( HYPRE_Solver solver , HYPRE_Real a_tol );
-HYPRE_Int HYPRE_ParCSRCOGMRESSetMinIter ( HYPRE_Solver solver , HYPRE_Int min_iter );
-HYPRE_Int HYPRE_ParCSRCOGMRESSetMaxIter ( HYPRE_Solver solver , HYPRE_Int max_iter );
-HYPRE_Int HYPRE_ParCSRCOGMRESSetPrecond ( HYPRE_Solver solver , HYPRE_PtrToParSolverFcn precond , HYPRE_PtrToParSolverFcn precond_setup , HYPRE_Solver precond_solver );
-HYPRE_Int HYPRE_ParCSRCOGMRESGetPrecond ( HYPRE_Solver solver , HYPRE_Solver *precond_data_ptr );
-HYPRE_Int HYPRE_ParCSRCOGMRESSetLogging ( HYPRE_Solver solver , HYPRE_Int logging );
-HYPRE_Int HYPRE_ParCSRCOGMRESSetPrintLevel ( HYPRE_Solver solver , HYPRE_Int print_level );
-HYPRE_Int HYPRE_ParCSRCOGMRESGetNumIterations ( HYPRE_Solver solver , HYPRE_Int *num_iterations );
-HYPRE_Int HYPRE_ParCSRCOGMRESGetFinalRelativeResidualNorm ( HYPRE_Solver solver , HYPRE_Real *norm );
-HYPRE_Int HYPRE_ParCSRCOGMRESGetResidual ( HYPRE_Solver solver , HYPRE_ParVector *residual );
+HYPRE_Int HYPRE_ParCSRCOGMRESSetup ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                                     HYPRE_ParVector x );
+HYPRE_Int HYPRE_ParCSRCOGMRESSolve ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                                     HYPRE_ParVector x );
+HYPRE_Int HYPRE_ParCSRCOGMRESSetKDim ( HYPRE_Solver solver, HYPRE_Int k_dim );
+HYPRE_Int HYPRE_ParCSRCOGMRESSetCGS2 ( HYPRE_Solver solver, HYPRE_Int cgs2 );
+HYPRE_Int HYPRE_ParCSRCOGMRESSetTol ( HYPRE_Solver solver, HYPRE_Real tol );
+HYPRE_Int HYPRE_ParCSRCOGMRESSetAbsoluteTol ( HYPRE_Solver solver, HYPRE_Real a_tol );
+HYPRE_Int HYPRE_ParCSRCOGMRESSetMinIter ( HYPRE_Solver solver, HYPRE_Int min_iter );
+HYPRE_Int HYPRE_ParCSRCOGMRESSetMaxIter ( HYPRE_Solver solver, HYPRE_Int max_iter );
+HYPRE_Int HYPRE_ParCSRCOGMRESSetPrecond ( HYPRE_Solver solver, HYPRE_PtrToParSolverFcn precond,
+                                          HYPRE_PtrToParSolverFcn precond_setup, HYPRE_Solver precond_solver );
+HYPRE_Int HYPRE_ParCSRCOGMRESGetPrecond ( HYPRE_Solver solver, HYPRE_Solver *precond_data_ptr );
+HYPRE_Int HYPRE_ParCSRCOGMRESSetLogging ( HYPRE_Solver solver, HYPRE_Int logging );
+HYPRE_Int HYPRE_ParCSRCOGMRESSetPrintLevel ( HYPRE_Solver solver, HYPRE_Int print_level );
+HYPRE_Int HYPRE_ParCSRCOGMRESGetNumIterations ( HYPRE_Solver solver, HYPRE_Int *num_iterations );
+HYPRE_Int HYPRE_ParCSRCOGMRESGetFinalRelativeResidualNorm ( HYPRE_Solver solver, HYPRE_Real *norm );
+HYPRE_Int HYPRE_ParCSRCOGMRESGetResidual ( HYPRE_Solver solver, HYPRE_ParVector *residual );
 
 
 
 /* HYPRE_parcsr_hybrid.c */
 HYPRE_Int HYPRE_ParCSRHybridCreate ( HYPRE_Solver *solver );
 HYPRE_Int HYPRE_ParCSRHybridDestroy ( HYPRE_Solver solver );
-HYPRE_Int HYPRE_ParCSRHybridSetup ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_ParCSRHybridSolve ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_ParCSRHybridSetTol ( HYPRE_Solver solver , HYPRE_Real tol );
-HYPRE_Int HYPRE_ParCSRHybridSetAbsoluteTol ( HYPRE_Solver solver , HYPRE_Real tol );
-HYPRE_Int HYPRE_ParCSRHybridSetConvergenceTol ( HYPRE_Solver solver , HYPRE_Real cf_tol );
-HYPRE_Int HYPRE_ParCSRHybridSetDSCGMaxIter ( HYPRE_Solver solver , HYPRE_Int dscg_max_its );
-HYPRE_Int HYPRE_ParCSRHybridSetPCGMaxIter ( HYPRE_Solver solver , HYPRE_Int pcg_max_its );
-HYPRE_Int HYPRE_ParCSRHybridSetSetupType ( HYPRE_Solver solver , HYPRE_Int setup_type );
-HYPRE_Int HYPRE_ParCSRHybridSetSolverType ( HYPRE_Solver solver , HYPRE_Int solver_type );
-HYPRE_Int HYPRE_ParCSRHybridSetKDim ( HYPRE_Solver solver , HYPRE_Int k_dim );
-HYPRE_Int HYPRE_ParCSRHybridSetTwoNorm ( HYPRE_Solver solver , HYPRE_Int two_norm );
-HYPRE_Int HYPRE_ParCSRHybridSetStopCrit ( HYPRE_Solver solver , HYPRE_Int stop_crit );
-HYPRE_Int HYPRE_ParCSRHybridSetRelChange ( HYPRE_Solver solver , HYPRE_Int rel_change );
-HYPRE_Int HYPRE_ParCSRHybridSetPrecond ( HYPRE_Solver solver , HYPRE_PtrToParSolverFcn precond , HYPRE_PtrToParSolverFcn precond_setup , HYPRE_Solver precond_solver );
-HYPRE_Int HYPRE_ParCSRHybridSetLogging ( HYPRE_Solver solver , HYPRE_Int logging );
-HYPRE_Int HYPRE_ParCSRHybridSetPrintLevel ( HYPRE_Solver solver , HYPRE_Int print_level );
-HYPRE_Int HYPRE_ParCSRHybridSetStrongThreshold ( HYPRE_Solver solver , HYPRE_Real strong_threshold );
-HYPRE_Int HYPRE_ParCSRHybridSetMaxRowSum ( HYPRE_Solver solver , HYPRE_Real max_row_sum );
-HYPRE_Int HYPRE_ParCSRHybridSetTruncFactor ( HYPRE_Solver solver , HYPRE_Real trunc_factor );
-HYPRE_Int HYPRE_ParCSRHybridSetPMaxElmts ( HYPRE_Solver solver , HYPRE_Int p_max );
-HYPRE_Int HYPRE_ParCSRHybridSetMaxLevels ( HYPRE_Solver solver , HYPRE_Int max_levels );
-HYPRE_Int HYPRE_ParCSRHybridSetMeasureType ( HYPRE_Solver solver , HYPRE_Int measure_type );
-HYPRE_Int HYPRE_ParCSRHybridSetCoarsenType ( HYPRE_Solver solver , HYPRE_Int coarsen_type );
-HYPRE_Int HYPRE_ParCSRHybridSetInterpType ( HYPRE_Solver solver , HYPRE_Int interp_type );
-HYPRE_Int HYPRE_ParCSRHybridSetCycleType ( HYPRE_Solver solver , HYPRE_Int cycle_type );
-HYPRE_Int HYPRE_ParCSRHybridSetNumGridSweeps ( HYPRE_Solver solver , HYPRE_Int *num_grid_sweeps );
-HYPRE_Int HYPRE_ParCSRHybridSetGridRelaxType ( HYPRE_Solver solver , HYPRE_Int *grid_relax_type );
-HYPRE_Int HYPRE_ParCSRHybridSetGridRelaxPoints ( HYPRE_Solver solver , HYPRE_Int **grid_relax_points );
-HYPRE_Int HYPRE_ParCSRHybridSetNumSweeps ( HYPRE_Solver solver , HYPRE_Int num_sweeps );
-HYPRE_Int HYPRE_ParCSRHybridSetCycleNumSweeps ( HYPRE_Solver solver , HYPRE_Int num_sweeps , HYPRE_Int k );
-HYPRE_Int HYPRE_ParCSRHybridSetRelaxType ( HYPRE_Solver solver , HYPRE_Int relax_type );
-HYPRE_Int HYPRE_ParCSRHybridSetKeepTranspose ( HYPRE_Solver solver , HYPRE_Int keepT );
-HYPRE_Int HYPRE_ParCSRHybridSetCycleRelaxType ( HYPRE_Solver solver , HYPRE_Int relax_type , HYPRE_Int k );
-HYPRE_Int HYPRE_ParCSRHybridSetRelaxOrder ( HYPRE_Solver solver , HYPRE_Int relax_order );
-HYPRE_Int HYPRE_ParCSRHybridSetMaxCoarseSize ( HYPRE_Solver solver , HYPRE_Int max_coarse_size );
-HYPRE_Int HYPRE_ParCSRHybridSetMinCoarseSize ( HYPRE_Solver solver , HYPRE_Int min_coarse_size );
-HYPRE_Int HYPRE_ParCSRHybridSetSeqThreshold ( HYPRE_Solver solver , HYPRE_Int seq_threshold );
-HYPRE_Int HYPRE_ParCSRHybridSetRelaxWt ( HYPRE_Solver solver , HYPRE_Real relax_wt );
-HYPRE_Int HYPRE_ParCSRHybridSetLevelRelaxWt ( HYPRE_Solver solver , HYPRE_Real relax_wt , HYPRE_Int level );
-HYPRE_Int HYPRE_ParCSRHybridSetOuterWt ( HYPRE_Solver solver , HYPRE_Real outer_wt );
-HYPRE_Int HYPRE_ParCSRHybridSetLevelOuterWt ( HYPRE_Solver solver , HYPRE_Real outer_wt , HYPRE_Int level );
-HYPRE_Int HYPRE_ParCSRHybridSetRelaxWeight ( HYPRE_Solver solver , HYPRE_Real *relax_weight );
-HYPRE_Int HYPRE_ParCSRHybridSetOmega ( HYPRE_Solver solver , HYPRE_Real *omega );
-HYPRE_Int HYPRE_ParCSRHybridSetAggNumLevels ( HYPRE_Solver solver , HYPRE_Int agg_num_levels );
-HYPRE_Int HYPRE_ParCSRHybridSetNumPaths ( HYPRE_Solver solver , HYPRE_Int num_paths );
-HYPRE_Int HYPRE_ParCSRHybridSetNumFunctions ( HYPRE_Solver solver , HYPRE_Int num_functions );
-HYPRE_Int HYPRE_ParCSRHybridSetNodal ( HYPRE_Solver solver , HYPRE_Int nodal );
-HYPRE_Int HYPRE_ParCSRHybridSetDofFunc ( HYPRE_Solver solver , HYPRE_Int *dof_func );
-HYPRE_Int HYPRE_ParCSRHybridSetNonGalerkinTol ( HYPRE_Solver solver , HYPRE_Int nongalerk_num_tol, HYPRE_Real *nongalerkin_tol );
-HYPRE_Int HYPRE_ParCSRHybridGetNumIterations ( HYPRE_Solver solver , HYPRE_Int *num_its );
-HYPRE_Int HYPRE_ParCSRHybridGetDSCGNumIterations ( HYPRE_Solver solver , HYPRE_Int *dscg_num_its );
-HYPRE_Int HYPRE_ParCSRHybridGetPCGNumIterations ( HYPRE_Solver solver , HYPRE_Int *pcg_num_its );
-HYPRE_Int HYPRE_ParCSRHybridGetFinalRelativeResidualNorm ( HYPRE_Solver solver , HYPRE_Real *norm );
+HYPRE_Int HYPRE_ParCSRHybridSetup ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                                    HYPRE_ParVector x );
+HYPRE_Int HYPRE_ParCSRHybridSolve ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                                    HYPRE_ParVector x );
+HYPRE_Int HYPRE_ParCSRHybridSetTol ( HYPRE_Solver solver, HYPRE_Real tol );
+HYPRE_Int HYPRE_ParCSRHybridSetAbsoluteTol ( HYPRE_Solver solver, HYPRE_Real tol );
+HYPRE_Int HYPRE_ParCSRHybridSetConvergenceTol ( HYPRE_Solver solver, HYPRE_Real cf_tol );
+HYPRE_Int HYPRE_ParCSRHybridSetDSCGMaxIter ( HYPRE_Solver solver, HYPRE_Int dscg_max_its );
+HYPRE_Int HYPRE_ParCSRHybridSetPCGMaxIter ( HYPRE_Solver solver, HYPRE_Int pcg_max_its );
+HYPRE_Int HYPRE_ParCSRHybridSetSetupType ( HYPRE_Solver solver, HYPRE_Int setup_type );
+HYPRE_Int HYPRE_ParCSRHybridSetSolverType ( HYPRE_Solver solver, HYPRE_Int solver_type );
+HYPRE_Int HYPRE_ParCSRHybridSetKDim ( HYPRE_Solver solver, HYPRE_Int k_dim );
+HYPRE_Int HYPRE_ParCSRHybridSetTwoNorm ( HYPRE_Solver solver, HYPRE_Int two_norm );
+HYPRE_Int HYPRE_ParCSRHybridSetStopCrit ( HYPRE_Solver solver, HYPRE_Int stop_crit );
+HYPRE_Int HYPRE_ParCSRHybridSetRelChange ( HYPRE_Solver solver, HYPRE_Int rel_change );
+HYPRE_Int HYPRE_ParCSRHybridSetPrecond ( HYPRE_Solver solver, HYPRE_PtrToParSolverFcn precond,
+                                         HYPRE_PtrToParSolverFcn precond_setup, HYPRE_Solver precond_solver );
+HYPRE_Int HYPRE_ParCSRHybridSetLogging ( HYPRE_Solver solver, HYPRE_Int logging );
+HYPRE_Int HYPRE_ParCSRHybridSetPrintLevel ( HYPRE_Solver solver, HYPRE_Int print_level );
+HYPRE_Int HYPRE_ParCSRHybridSetStrongThreshold ( HYPRE_Solver solver, HYPRE_Real strong_threshold );
+HYPRE_Int HYPRE_ParCSRHybridSetMaxRowSum ( HYPRE_Solver solver, HYPRE_Real max_row_sum );
+HYPRE_Int HYPRE_ParCSRHybridSetTruncFactor ( HYPRE_Solver solver, HYPRE_Real trunc_factor );
+HYPRE_Int HYPRE_ParCSRHybridSetPMaxElmts ( HYPRE_Solver solver, HYPRE_Int p_max );
+HYPRE_Int HYPRE_ParCSRHybridSetMaxLevels ( HYPRE_Solver solver, HYPRE_Int max_levels );
+HYPRE_Int HYPRE_ParCSRHybridSetMeasureType ( HYPRE_Solver solver, HYPRE_Int measure_type );
+HYPRE_Int HYPRE_ParCSRHybridSetCoarsenType ( HYPRE_Solver solver, HYPRE_Int coarsen_type );
+HYPRE_Int HYPRE_ParCSRHybridSetInterpType ( HYPRE_Solver solver, HYPRE_Int interp_type );
+HYPRE_Int HYPRE_ParCSRHybridSetCycleType ( HYPRE_Solver solver, HYPRE_Int cycle_type );
+HYPRE_Int HYPRE_ParCSRHybridSetNumGridSweeps ( HYPRE_Solver solver, HYPRE_Int *num_grid_sweeps );
+HYPRE_Int HYPRE_ParCSRHybridSetGridRelaxType ( HYPRE_Solver solver, HYPRE_Int *grid_relax_type );
+HYPRE_Int HYPRE_ParCSRHybridSetGridRelaxPoints ( HYPRE_Solver solver,
+                                                 HYPRE_Int **grid_relax_points );
+HYPRE_Int HYPRE_ParCSRHybridSetNumSweeps ( HYPRE_Solver solver, HYPRE_Int num_sweeps );
+HYPRE_Int HYPRE_ParCSRHybridSetCycleNumSweeps ( HYPRE_Solver solver, HYPRE_Int num_sweeps,
+                                                HYPRE_Int k );
+HYPRE_Int HYPRE_ParCSRHybridSetRelaxType ( HYPRE_Solver solver, HYPRE_Int relax_type );
+HYPRE_Int HYPRE_ParCSRHybridSetKeepTranspose ( HYPRE_Solver solver, HYPRE_Int keepT );
+HYPRE_Int HYPRE_ParCSRHybridSetCycleRelaxType ( HYPRE_Solver solver, HYPRE_Int relax_type,
+                                                HYPRE_Int k );
+HYPRE_Int HYPRE_ParCSRHybridSetRelaxOrder ( HYPRE_Solver solver, HYPRE_Int relax_order );
+HYPRE_Int HYPRE_ParCSRHybridSetMaxCoarseSize ( HYPRE_Solver solver, HYPRE_Int max_coarse_size );
+HYPRE_Int HYPRE_ParCSRHybridSetMinCoarseSize ( HYPRE_Solver solver, HYPRE_Int min_coarse_size );
+HYPRE_Int HYPRE_ParCSRHybridSetSeqThreshold ( HYPRE_Solver solver, HYPRE_Int seq_threshold );
+HYPRE_Int HYPRE_ParCSRHybridSetRelaxWt ( HYPRE_Solver solver, HYPRE_Real relax_wt );
+HYPRE_Int HYPRE_ParCSRHybridSetLevelRelaxWt ( HYPRE_Solver solver, HYPRE_Real relax_wt,
+                                              HYPRE_Int level );
+HYPRE_Int HYPRE_ParCSRHybridSetOuterWt ( HYPRE_Solver solver, HYPRE_Real outer_wt );
+HYPRE_Int HYPRE_ParCSRHybridSetLevelOuterWt ( HYPRE_Solver solver, HYPRE_Real outer_wt,
+                                              HYPRE_Int level );
+HYPRE_Int HYPRE_ParCSRHybridSetRelaxWeight ( HYPRE_Solver solver, HYPRE_Real *relax_weight );
+HYPRE_Int HYPRE_ParCSRHybridSetOmega ( HYPRE_Solver solver, HYPRE_Real *omega );
+HYPRE_Int HYPRE_ParCSRHybridSetAggNumLevels ( HYPRE_Solver solver, HYPRE_Int agg_num_levels );
+HYPRE_Int HYPRE_ParCSRHybridSetNumPaths ( HYPRE_Solver solver, HYPRE_Int num_paths );
+HYPRE_Int HYPRE_ParCSRHybridSetNumFunctions ( HYPRE_Solver solver, HYPRE_Int num_functions );
+HYPRE_Int HYPRE_ParCSRHybridSetNodal ( HYPRE_Solver solver, HYPRE_Int nodal );
+HYPRE_Int HYPRE_ParCSRHybridSetDofFunc ( HYPRE_Solver solver, HYPRE_Int *dof_func );
+HYPRE_Int HYPRE_ParCSRHybridSetNonGalerkinTol ( HYPRE_Solver solver, HYPRE_Int nongalerk_num_tol,
+                                                HYPRE_Real *nongalerkin_tol );
+HYPRE_Int HYPRE_ParCSRHybridGetNumIterations ( HYPRE_Solver solver, HYPRE_Int *num_its );
+HYPRE_Int HYPRE_ParCSRHybridGetDSCGNumIterations ( HYPRE_Solver solver, HYPRE_Int *dscg_num_its );
+HYPRE_Int HYPRE_ParCSRHybridGetPCGNumIterations ( HYPRE_Solver solver, HYPRE_Int *pcg_num_its );
+HYPRE_Int HYPRE_ParCSRHybridGetFinalRelativeResidualNorm ( HYPRE_Solver solver, HYPRE_Real *norm );
 HYPRE_Int HYPRE_ParCSRHybridGetSetupSolveTime( HYPRE_Solver solver, HYPRE_Real *time );
 
 /* HYPRE_parcsr_int.c */
-HYPRE_Int hypre_ParSetRandomValues ( void *v , HYPRE_Int seed );
-HYPRE_Int hypre_ParPrintVector ( void *v , const char *file );
-void *hypre_ParReadVector ( MPI_Comm comm , const char *file );
+HYPRE_Int hypre_ParSetRandomValues ( void *v, HYPRE_Int seed );
+HYPRE_Int hypre_ParPrintVector ( void *v, const char *file );
+void *hypre_ParReadVector ( MPI_Comm comm, const char *file );
 HYPRE_Int hypre_ParVectorSize ( void *x );
-HYPRE_Int HYPRE_ParCSRMultiVectorPrint ( void *x_ , const char *fileName );
-void *HYPRE_ParCSRMultiVectorRead ( MPI_Comm comm , void *ii_ , const char *fileName );
-HYPRE_Int aux_maskCount ( HYPRE_Int n , HYPRE_Int *mask );
-void aux_indexFromMask ( HYPRE_Int n , HYPRE_Int *mask , HYPRE_Int *index );
+HYPRE_Int HYPRE_ParCSRMultiVectorPrint ( void *x_, const char *fileName );
+void *HYPRE_ParCSRMultiVectorRead ( MPI_Comm comm, void *ii_, const char *fileName );
+HYPRE_Int aux_maskCount ( HYPRE_Int n, HYPRE_Int *mask );
+void aux_indexFromMask ( HYPRE_Int n, HYPRE_Int *mask, HYPRE_Int *index );
 HYPRE_Int HYPRE_TempParCSRSetupInterpreter ( mv_InterfaceInterpreter *i );
 HYPRE_Int HYPRE_ParCSRSetupInterpreter ( mv_InterfaceInterpreter *i );
 HYPRE_Int HYPRE_ParCSRSetupMatvec ( HYPRE_MatvecFunctions *mv );
 
 /* HYPRE_parcsr_lgmres.c */
-HYPRE_Int HYPRE_ParCSRLGMRESCreate ( MPI_Comm comm , HYPRE_Solver *solver );
+HYPRE_Int HYPRE_ParCSRLGMRESCreate ( MPI_Comm comm, HYPRE_Solver *solver );
 HYPRE_Int HYPRE_ParCSRLGMRESDestroy ( HYPRE_Solver solver );
-HYPRE_Int HYPRE_ParCSRLGMRESSetup ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_ParCSRLGMRESSolve ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_ParCSRLGMRESSetKDim ( HYPRE_Solver solver , HYPRE_Int k_dim );
-HYPRE_Int HYPRE_ParCSRLGMRESSetAugDim ( HYPRE_Solver solver , HYPRE_Int aug_dim );
-HYPRE_Int HYPRE_ParCSRLGMRESSetTol ( HYPRE_Solver solver , HYPRE_Real tol );
-HYPRE_Int HYPRE_ParCSRLGMRESSetAbsoluteTol ( HYPRE_Solver solver , HYPRE_Real a_tol );
-HYPRE_Int HYPRE_ParCSRLGMRESSetMinIter ( HYPRE_Solver solver , HYPRE_Int min_iter );
-HYPRE_Int HYPRE_ParCSRLGMRESSetMaxIter ( HYPRE_Solver solver , HYPRE_Int max_iter );
-HYPRE_Int HYPRE_ParCSRLGMRESSetPrecond ( HYPRE_Solver solver , HYPRE_PtrToParSolverFcn precond , HYPRE_PtrToParSolverFcn precond_setup , HYPRE_Solver precond_solver );
-HYPRE_Int HYPRE_ParCSRLGMRESGetPrecond ( HYPRE_Solver solver , HYPRE_Solver *precond_data_ptr );
-HYPRE_Int HYPRE_ParCSRLGMRESSetLogging ( HYPRE_Solver solver , HYPRE_Int logging );
-HYPRE_Int HYPRE_ParCSRLGMRESSetPrintLevel ( HYPRE_Solver solver , HYPRE_Int print_level );
-HYPRE_Int HYPRE_ParCSRLGMRESGetNumIterations ( HYPRE_Solver solver , HYPRE_Int *num_iterations );
-HYPRE_Int HYPRE_ParCSRLGMRESGetFinalRelativeResidualNorm ( HYPRE_Solver solver , HYPRE_Real *norm );
-HYPRE_Int HYPRE_ParCSRLGMRESGetResidual ( HYPRE_Solver solver , HYPRE_ParVector *residual );
+HYPRE_Int HYPRE_ParCSRLGMRESSetup ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                                    HYPRE_ParVector x );
+HYPRE_Int HYPRE_ParCSRLGMRESSolve ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                                    HYPRE_ParVector x );
+HYPRE_Int HYPRE_ParCSRLGMRESSetKDim ( HYPRE_Solver solver, HYPRE_Int k_dim );
+HYPRE_Int HYPRE_ParCSRLGMRESSetAugDim ( HYPRE_Solver solver, HYPRE_Int aug_dim );
+HYPRE_Int HYPRE_ParCSRLGMRESSetTol ( HYPRE_Solver solver, HYPRE_Real tol );
+HYPRE_Int HYPRE_ParCSRLGMRESSetAbsoluteTol ( HYPRE_Solver solver, HYPRE_Real a_tol );
+HYPRE_Int HYPRE_ParCSRLGMRESSetMinIter ( HYPRE_Solver solver, HYPRE_Int min_iter );
+HYPRE_Int HYPRE_ParCSRLGMRESSetMaxIter ( HYPRE_Solver solver, HYPRE_Int max_iter );
+HYPRE_Int HYPRE_ParCSRLGMRESSetPrecond ( HYPRE_Solver solver, HYPRE_PtrToParSolverFcn precond,
+                                         HYPRE_PtrToParSolverFcn precond_setup, HYPRE_Solver precond_solver );
+HYPRE_Int HYPRE_ParCSRLGMRESGetPrecond ( HYPRE_Solver solver, HYPRE_Solver *precond_data_ptr );
+HYPRE_Int HYPRE_ParCSRLGMRESSetLogging ( HYPRE_Solver solver, HYPRE_Int logging );
+HYPRE_Int HYPRE_ParCSRLGMRESSetPrintLevel ( HYPRE_Solver solver, HYPRE_Int print_level );
+HYPRE_Int HYPRE_ParCSRLGMRESGetNumIterations ( HYPRE_Solver solver, HYPRE_Int *num_iterations );
+HYPRE_Int HYPRE_ParCSRLGMRESGetFinalRelativeResidualNorm ( HYPRE_Solver solver, HYPRE_Real *norm );
+HYPRE_Int HYPRE_ParCSRLGMRESGetResidual ( HYPRE_Solver solver, HYPRE_ParVector *residual );
 
 /* HYPRE_parcsr_ParaSails.c */
-HYPRE_Int HYPRE_ParCSRParaSailsCreate ( MPI_Comm comm , HYPRE_Solver *solver );
+HYPRE_Int HYPRE_ParCSRParaSailsCreate ( MPI_Comm comm, HYPRE_Solver *solver );
 HYPRE_Int HYPRE_ParCSRParaSailsDestroy ( HYPRE_Solver solver );
-HYPRE_Int HYPRE_ParCSRParaSailsSetup ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_ParCSRParaSailsSolve ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_ParCSRParaSailsSetParams ( HYPRE_Solver solver , HYPRE_Real thresh , HYPRE_Int nlevels );
-HYPRE_Int HYPRE_ParCSRParaSailsSetFilter ( HYPRE_Solver solver , HYPRE_Real filter );
-HYPRE_Int HYPRE_ParCSRParaSailsGetFilter ( HYPRE_Solver solver , HYPRE_Real *filter );
-HYPRE_Int HYPRE_ParCSRParaSailsSetSym ( HYPRE_Solver solver , HYPRE_Int sym );
-HYPRE_Int HYPRE_ParCSRParaSailsSetLoadbal ( HYPRE_Solver solver , HYPRE_Real loadbal );
-HYPRE_Int HYPRE_ParCSRParaSailsGetLoadbal ( HYPRE_Solver solver , HYPRE_Real *loadbal );
-HYPRE_Int HYPRE_ParCSRParaSailsSetReuse ( HYPRE_Solver solver , HYPRE_Int reuse );
-HYPRE_Int HYPRE_ParCSRParaSailsSetLogging ( HYPRE_Solver solver , HYPRE_Int logging );
-HYPRE_Int HYPRE_ParaSailsCreate ( MPI_Comm comm , HYPRE_Solver *solver );
+HYPRE_Int HYPRE_ParCSRParaSailsSetup ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                                       HYPRE_ParVector x );
+HYPRE_Int HYPRE_ParCSRParaSailsSolve ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                                       HYPRE_ParVector x );
+HYPRE_Int HYPRE_ParCSRParaSailsSetParams ( HYPRE_Solver solver, HYPRE_Real thresh,
+                                           HYPRE_Int nlevels );
+HYPRE_Int HYPRE_ParCSRParaSailsSetFilter ( HYPRE_Solver solver, HYPRE_Real filter );
+HYPRE_Int HYPRE_ParCSRParaSailsGetFilter ( HYPRE_Solver solver, HYPRE_Real *filter );
+HYPRE_Int HYPRE_ParCSRParaSailsSetSym ( HYPRE_Solver solver, HYPRE_Int sym );
+HYPRE_Int HYPRE_ParCSRParaSailsSetLoadbal ( HYPRE_Solver solver, HYPRE_Real loadbal );
+HYPRE_Int HYPRE_ParCSRParaSailsGetLoadbal ( HYPRE_Solver solver, HYPRE_Real *loadbal );
+HYPRE_Int HYPRE_ParCSRParaSailsSetReuse ( HYPRE_Solver solver, HYPRE_Int reuse );
+HYPRE_Int HYPRE_ParCSRParaSailsSetLogging ( HYPRE_Solver solver, HYPRE_Int logging );
+HYPRE_Int HYPRE_ParaSailsCreate ( MPI_Comm comm, HYPRE_Solver *solver );
 HYPRE_Int HYPRE_ParaSailsDestroy ( HYPRE_Solver solver );
-HYPRE_Int HYPRE_ParaSailsSetup ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_ParaSailsSolve ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_ParaSailsSetParams ( HYPRE_Solver solver , HYPRE_Real thresh , HYPRE_Int nlevels );
-HYPRE_Int HYPRE_ParaSailsSetThresh ( HYPRE_Solver solver , HYPRE_Real thresh );
-HYPRE_Int HYPRE_ParaSailsGetThresh ( HYPRE_Solver solver , HYPRE_Real *thresh );
-HYPRE_Int HYPRE_ParaSailsSetNlevels ( HYPRE_Solver solver , HYPRE_Int nlevels );
-HYPRE_Int HYPRE_ParaSailsGetNlevels ( HYPRE_Solver solver , HYPRE_Int *nlevels );
-HYPRE_Int HYPRE_ParaSailsSetFilter ( HYPRE_Solver solver , HYPRE_Real filter );
-HYPRE_Int HYPRE_ParaSailsGetFilter ( HYPRE_Solver solver , HYPRE_Real *filter );
-HYPRE_Int HYPRE_ParaSailsSetSym ( HYPRE_Solver solver , HYPRE_Int sym );
-HYPRE_Int HYPRE_ParaSailsGetSym ( HYPRE_Solver solver , HYPRE_Int *sym );
-HYPRE_Int HYPRE_ParaSailsSetLoadbal ( HYPRE_Solver solver , HYPRE_Real loadbal );
-HYPRE_Int HYPRE_ParaSailsGetLoadbal ( HYPRE_Solver solver , HYPRE_Real *loadbal );
-HYPRE_Int HYPRE_ParaSailsSetReuse ( HYPRE_Solver solver , HYPRE_Int reuse );
-HYPRE_Int HYPRE_ParaSailsGetReuse ( HYPRE_Solver solver , HYPRE_Int *reuse );
-HYPRE_Int HYPRE_ParaSailsSetLogging ( HYPRE_Solver solver , HYPRE_Int logging );
-HYPRE_Int HYPRE_ParaSailsGetLogging ( HYPRE_Solver solver , HYPRE_Int *logging );
-HYPRE_Int HYPRE_ParaSailsBuildIJMatrix ( HYPRE_Solver solver , HYPRE_IJMatrix *pij_A );
+HYPRE_Int HYPRE_ParaSailsSetup ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                                 HYPRE_ParVector x );
+HYPRE_Int HYPRE_ParaSailsSolve ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                                 HYPRE_ParVector x );
+HYPRE_Int HYPRE_ParaSailsSetParams ( HYPRE_Solver solver, HYPRE_Real thresh, HYPRE_Int nlevels );
+HYPRE_Int HYPRE_ParaSailsSetThresh ( HYPRE_Solver solver, HYPRE_Real thresh );
+HYPRE_Int HYPRE_ParaSailsGetThresh ( HYPRE_Solver solver, HYPRE_Real *thresh );
+HYPRE_Int HYPRE_ParaSailsSetNlevels ( HYPRE_Solver solver, HYPRE_Int nlevels );
+HYPRE_Int HYPRE_ParaSailsGetNlevels ( HYPRE_Solver solver, HYPRE_Int *nlevels );
+HYPRE_Int HYPRE_ParaSailsSetFilter ( HYPRE_Solver solver, HYPRE_Real filter );
+HYPRE_Int HYPRE_ParaSailsGetFilter ( HYPRE_Solver solver, HYPRE_Real *filter );
+HYPRE_Int HYPRE_ParaSailsSetSym ( HYPRE_Solver solver, HYPRE_Int sym );
+HYPRE_Int HYPRE_ParaSailsGetSym ( HYPRE_Solver solver, HYPRE_Int *sym );
+HYPRE_Int HYPRE_ParaSailsSetLoadbal ( HYPRE_Solver solver, HYPRE_Real loadbal );
+HYPRE_Int HYPRE_ParaSailsGetLoadbal ( HYPRE_Solver solver, HYPRE_Real *loadbal );
+HYPRE_Int HYPRE_ParaSailsSetReuse ( HYPRE_Solver solver, HYPRE_Int reuse );
+HYPRE_Int HYPRE_ParaSailsGetReuse ( HYPRE_Solver solver, HYPRE_Int *reuse );
+HYPRE_Int HYPRE_ParaSailsSetLogging ( HYPRE_Solver solver, HYPRE_Int logging );
+HYPRE_Int HYPRE_ParaSailsGetLogging ( HYPRE_Solver solver, HYPRE_Int *logging );
+HYPRE_Int HYPRE_ParaSailsBuildIJMatrix ( HYPRE_Solver solver, HYPRE_IJMatrix *pij_A );
+
+/* HYPRE_parcsr_fsai.c */
+HYPRE_Int HYPRE_FSAICreate ( HYPRE_Solver *solver);
+HYPRE_Int HYPRE_FSAIDestroy ( HYPRE_Solver solver );
+HYPRE_Int HYPRE_FSAISetup ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                            HYPRE_ParVector x );
+HYPRE_Int HYPRE_FSAISolve ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                            HYPRE_ParVector x );
+HYPRE_Int HYPRE_FSAISetAlgoType ( HYPRE_Solver solver, HYPRE_Int algo_type );
+HYPRE_Int HYPRE_FSAIGetAlgoType ( HYPRE_Solver solver, HYPRE_Int *algo_type );
+HYPRE_Int HYPRE_FSAISetLocalSolveType ( HYPRE_Solver solver, HYPRE_Int local_solve_type );
+HYPRE_Int HYPRE_FSAIGetLocalSolveType ( HYPRE_Solver solver, HYPRE_Int *local_solve_type );
+HYPRE_Int HYPRE_FSAISetMaxSteps ( HYPRE_Solver solver, HYPRE_Int max_steps );
+HYPRE_Int HYPRE_FSAIGetMaxSteps ( HYPRE_Solver solver, HYPRE_Int *max_steps );
+HYPRE_Int HYPRE_FSAISetMaxStepSize ( HYPRE_Solver solver, HYPRE_Int max_step_size );
+HYPRE_Int HYPRE_FSAIGetMaxStepSize ( HYPRE_Solver solver, HYPRE_Int *max_step_size );
+HYPRE_Int HYPRE_FSAISetMaxNnzRow ( HYPRE_Solver solver, HYPRE_Int max_nnz_row );
+HYPRE_Int HYPRE_FSAIGetMaxNnzRow ( HYPRE_Solver solver, HYPRE_Int *max_nnz_row );
+HYPRE_Int HYPRE_FSAISetNumLevels ( HYPRE_Solver solver, HYPRE_Int num_levels );
+HYPRE_Int HYPRE_FSAIGetNumLevels ( HYPRE_Solver solver, HYPRE_Int *num_levels );
+HYPRE_Int HYPRE_FSAISetThreshold ( HYPRE_Solver solver, HYPRE_Real threshold );
+HYPRE_Int HYPRE_FSAIGetThreshold ( HYPRE_Solver solver, HYPRE_Real *threshold );
+HYPRE_Int HYPRE_FSAISetKapTolerance ( HYPRE_Solver solver, HYPRE_Real kap_tolerance );
+HYPRE_Int HYPRE_FSAIGetKapTolerance ( HYPRE_Solver solver, HYPRE_Real *kap_tolerance );
+HYPRE_Int HYPRE_FSAISetTolerance ( HYPRE_Solver solver, HYPRE_Real tolerance );
+HYPRE_Int HYPRE_FSAIGetTolerance ( HYPRE_Solver solver, HYPRE_Real *tolerance );
+HYPRE_Int HYPRE_FSAISetOmega ( HYPRE_Solver solver, HYPRE_Real omega );
+HYPRE_Int HYPRE_FSAIGetOmega ( HYPRE_Solver solver, HYPRE_Real *omega );
+HYPRE_Int HYPRE_FSAISetMaxIterations ( HYPRE_Solver solver, HYPRE_Int max_iterations );
+HYPRE_Int HYPRE_FSAIGetMaxIterations ( HYPRE_Solver solver, HYPRE_Int *max_iterations );
+HYPRE_Int HYPRE_FSAISetEigMaxIters ( HYPRE_Solver solver, HYPRE_Int eig_max_iters );
+HYPRE_Int HYPRE_FSAIGetEigMaxIters ( HYPRE_Solver solver, HYPRE_Int *eig_max_iters );
+HYPRE_Int HYPRE_FSAISetZeroGuess ( HYPRE_Solver solver, HYPRE_Int zero_guess );
+HYPRE_Int HYPRE_FSAIGetZeroGuess ( HYPRE_Solver solver, HYPRE_Int *zero_guess );
+HYPRE_Int HYPRE_FSAISetPrintLevel ( HYPRE_Solver solver, HYPRE_Int print_level );
+HYPRE_Int HYPRE_FSAIGetPrintLevel ( HYPRE_Solver solver, HYPRE_Int *print_level );
 
 /* HYPRE_parcsr_pcg.c */
-HYPRE_Int HYPRE_ParCSRPCGCreate ( MPI_Comm comm , HYPRE_Solver *solver );
+HYPRE_Int HYPRE_ParCSRPCGCreate ( MPI_Comm comm, HYPRE_Solver *solver );
 HYPRE_Int HYPRE_ParCSRPCGDestroy ( HYPRE_Solver solver );
-HYPRE_Int HYPRE_ParCSRPCGSetup ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_ParCSRPCGSolve ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_ParCSRPCGSetTol ( HYPRE_Solver solver , HYPRE_Real tol );
-HYPRE_Int HYPRE_ParCSRPCGSetAbsoluteTol ( HYPRE_Solver solver , HYPRE_Real a_tol );
-HYPRE_Int HYPRE_ParCSRPCGSetMaxIter ( HYPRE_Solver solver , HYPRE_Int max_iter );
-HYPRE_Int HYPRE_ParCSRPCGSetStopCrit ( HYPRE_Solver solver , HYPRE_Int stop_crit );
-HYPRE_Int HYPRE_ParCSRPCGSetTwoNorm ( HYPRE_Solver solver , HYPRE_Int two_norm );
-HYPRE_Int HYPRE_ParCSRPCGSetRelChange ( HYPRE_Solver solver , HYPRE_Int rel_change );
-HYPRE_Int HYPRE_ParCSRPCGSetPrecond ( HYPRE_Solver solver , HYPRE_PtrToParSolverFcn precond , HYPRE_PtrToParSolverFcn precond_setup , HYPRE_Solver precond_solver );
-HYPRE_Int HYPRE_ParCSRPCGGetPrecond ( HYPRE_Solver solver , HYPRE_Solver *precond_data_ptr );
-HYPRE_Int HYPRE_ParCSRPCGSetPrintLevel ( HYPRE_Solver solver , HYPRE_Int level );
-HYPRE_Int HYPRE_ParCSRPCGSetLogging ( HYPRE_Solver solver , HYPRE_Int level );
-HYPRE_Int HYPRE_ParCSRPCGGetNumIterations ( HYPRE_Solver solver , HYPRE_Int *num_iterations );
-HYPRE_Int HYPRE_ParCSRPCGGetFinalRelativeResidualNorm ( HYPRE_Solver solver , HYPRE_Real *norm );
-HYPRE_Int HYPRE_ParCSRPCGGetResidual ( HYPRE_Solver solver , HYPRE_ParVector *residual );
-HYPRE_Int HYPRE_ParCSRDiagScaleSetup ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector y , HYPRE_ParVector x );
-HYPRE_Int HYPRE_ParCSRDiagScale ( HYPRE_Solver solver , HYPRE_ParCSRMatrix HA , HYPRE_ParVector Hy , HYPRE_ParVector Hx );
-HYPRE_Int HYPRE_ParCSROnProcTriSetup ( HYPRE_Solver solver , HYPRE_ParCSRMatrix HA , HYPRE_ParVector Hy , HYPRE_ParVector Hx );
-HYPRE_Int HYPRE_ParCSROnProcTriSolve ( HYPRE_Solver solver , HYPRE_ParCSRMatrix HA , HYPRE_ParVector Hy , HYPRE_ParVector Hx );
+HYPRE_Int HYPRE_ParCSRPCGSetup ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                                 HYPRE_ParVector x );
+HYPRE_Int HYPRE_ParCSRPCGSolve ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                                 HYPRE_ParVector x );
+HYPRE_Int HYPRE_ParCSRPCGSetTol ( HYPRE_Solver solver, HYPRE_Real tol );
+HYPRE_Int HYPRE_ParCSRPCGSetAbsoluteTol ( HYPRE_Solver solver, HYPRE_Real a_tol );
+HYPRE_Int HYPRE_ParCSRPCGSetMaxIter ( HYPRE_Solver solver, HYPRE_Int max_iter );
+HYPRE_Int HYPRE_ParCSRPCGSetStopCrit ( HYPRE_Solver solver, HYPRE_Int stop_crit );
+HYPRE_Int HYPRE_ParCSRPCGSetTwoNorm ( HYPRE_Solver solver, HYPRE_Int two_norm );
+HYPRE_Int HYPRE_ParCSRPCGSetRelChange ( HYPRE_Solver solver, HYPRE_Int rel_change );
+HYPRE_Int HYPRE_ParCSRPCGSetPrecond ( HYPRE_Solver solver, HYPRE_PtrToParSolverFcn precond,
+                                      HYPRE_PtrToParSolverFcn precond_setup, HYPRE_Solver precond_solver );
+HYPRE_Int HYPRE_ParCSRPCGGetPrecond ( HYPRE_Solver solver, HYPRE_Solver *precond_data_ptr );
+HYPRE_Int HYPRE_ParCSRPCGSetPrintLevel ( HYPRE_Solver solver, HYPRE_Int level );
+HYPRE_Int HYPRE_ParCSRPCGSetLogging ( HYPRE_Solver solver, HYPRE_Int level );
+HYPRE_Int HYPRE_ParCSRPCGGetNumIterations ( HYPRE_Solver solver, HYPRE_Int *num_iterations );
+HYPRE_Int HYPRE_ParCSRPCGGetFinalRelativeResidualNorm ( HYPRE_Solver solver, HYPRE_Real *norm );
+HYPRE_Int HYPRE_ParCSRPCGGetResidual ( HYPRE_Solver solver, HYPRE_ParVector *residual );
+HYPRE_Int HYPRE_ParCSRDiagScaleSetup ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector y,
+                                       HYPRE_ParVector x );
+HYPRE_Int HYPRE_ParCSRDiagScale ( HYPRE_Solver solver, HYPRE_ParCSRMatrix HA, HYPRE_ParVector Hy,
+                                  HYPRE_ParVector Hx );
+HYPRE_Int HYPRE_ParCSROnProcTriSetup ( HYPRE_Solver solver, HYPRE_ParCSRMatrix HA,
+                                       HYPRE_ParVector Hy, HYPRE_ParVector Hx );
+HYPRE_Int HYPRE_ParCSROnProcTriSolve ( HYPRE_Solver solver, HYPRE_ParCSRMatrix HA,
+                                       HYPRE_ParVector Hy, HYPRE_ParVector Hx );
 
 /* HYPRE_parcsr_pilut.c */
-HYPRE_Int HYPRE_ParCSRPilutCreate ( MPI_Comm comm , HYPRE_Solver *solver );
+HYPRE_Int HYPRE_ParCSRPilutCreate ( MPI_Comm comm, HYPRE_Solver *solver );
 HYPRE_Int HYPRE_ParCSRPilutDestroy ( HYPRE_Solver solver );
-HYPRE_Int HYPRE_ParCSRPilutSetup ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_ParCSRPilutSolve ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_ParCSRPilutSetMaxIter ( HYPRE_Solver solver , HYPRE_Int max_iter );
-HYPRE_Int HYPRE_ParCSRPilutSetDropTolerance ( HYPRE_Solver solver , HYPRE_Real tol );
-HYPRE_Int HYPRE_ParCSRPilutSetFactorRowSize ( HYPRE_Solver solver , HYPRE_Int size );
+HYPRE_Int HYPRE_ParCSRPilutSetup ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                                   HYPRE_ParVector x );
+HYPRE_Int HYPRE_ParCSRPilutSolve ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                                   HYPRE_ParVector x );
+HYPRE_Int HYPRE_ParCSRPilutSetMaxIter ( HYPRE_Solver solver, HYPRE_Int max_iter );
+HYPRE_Int HYPRE_ParCSRPilutSetDropTolerance ( HYPRE_Solver solver, HYPRE_Real tol );
+HYPRE_Int HYPRE_ParCSRPilutSetFactorRowSize ( HYPRE_Solver solver, HYPRE_Int size );
 
 /* HYPRE_parcsr_schwarz.c */
 HYPRE_Int HYPRE_SchwarzCreate ( HYPRE_Solver *solver );
 HYPRE_Int HYPRE_SchwarzDestroy ( HYPRE_Solver solver );
-HYPRE_Int HYPRE_SchwarzSetup ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_SchwarzSolve ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_SchwarzSetVariant ( HYPRE_Solver solver , HYPRE_Int variant );
-HYPRE_Int HYPRE_SchwarzSetOverlap ( HYPRE_Solver solver , HYPRE_Int overlap );
-HYPRE_Int HYPRE_SchwarzSetDomainType ( HYPRE_Solver solver , HYPRE_Int domain_type );
-HYPRE_Int HYPRE_SchwarzSetDomainStructure ( HYPRE_Solver solver , HYPRE_CSRMatrix domain_structure );
-HYPRE_Int HYPRE_SchwarzSetNumFunctions ( HYPRE_Solver solver , HYPRE_Int num_functions );
-HYPRE_Int HYPRE_SchwarzSetNonSymm ( HYPRE_Solver solver , HYPRE_Int use_nonsymm );
-HYPRE_Int HYPRE_SchwarzSetRelaxWeight ( HYPRE_Solver solver , HYPRE_Real relax_weight );
-HYPRE_Int HYPRE_SchwarzSetDofFunc ( HYPRE_Solver solver , HYPRE_Int *dof_func );
+HYPRE_Int HYPRE_SchwarzSetup ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                               HYPRE_ParVector x );
+HYPRE_Int HYPRE_SchwarzSolve ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                               HYPRE_ParVector x );
+HYPRE_Int HYPRE_SchwarzSetVariant ( HYPRE_Solver solver, HYPRE_Int variant );
+HYPRE_Int HYPRE_SchwarzSetOverlap ( HYPRE_Solver solver, HYPRE_Int overlap );
+HYPRE_Int HYPRE_SchwarzSetDomainType ( HYPRE_Solver solver, HYPRE_Int domain_type );
+HYPRE_Int HYPRE_SchwarzSetDomainStructure ( HYPRE_Solver solver, HYPRE_CSRMatrix domain_structure );
+HYPRE_Int HYPRE_SchwarzSetNumFunctions ( HYPRE_Solver solver, HYPRE_Int num_functions );
+HYPRE_Int HYPRE_SchwarzSetNonSymm ( HYPRE_Solver solver, HYPRE_Int use_nonsymm );
+HYPRE_Int HYPRE_SchwarzSetRelaxWeight ( HYPRE_Solver solver, HYPRE_Real relax_weight );
+HYPRE_Int HYPRE_SchwarzSetDofFunc ( HYPRE_Solver solver, HYPRE_Int *dof_func );
 
 /* par_add_cycle.c */
 HYPRE_Int hypre_BoomerAMGAdditiveCycle ( void *amg_vdata );
@@ -1544,596 +2470,1082 @@ HYPRE_Int hypre_CreateDinv ( void *amg_vdata );
 /* par_amg.c */
 void *hypre_BoomerAMGCreate ( void );
 HYPRE_Int hypre_BoomerAMGDestroy ( void *data );
-HYPRE_Int hypre_BoomerAMGSetRestriction ( void *data , HYPRE_Int restr_par );
-HYPRE_Int hypre_BoomerAMGSetIsTriangular ( void *data , HYPRE_Int is_triangular );
-HYPRE_Int hypre_BoomerAMGSetGMRESSwitchR ( void *data , HYPRE_Int gmres_switch );
-HYPRE_Int hypre_BoomerAMGSetMaxLevels ( void *data , HYPRE_Int max_levels );
-HYPRE_Int hypre_BoomerAMGGetMaxLevels ( void *data , HYPRE_Int *max_levels );
-HYPRE_Int hypre_BoomerAMGSetMaxCoarseSize ( void *data , HYPRE_Int max_coarse_size );
-HYPRE_Int hypre_BoomerAMGGetMaxCoarseSize ( void *data , HYPRE_Int *max_coarse_size );
-HYPRE_Int hypre_BoomerAMGSetMinCoarseSize ( void *data , HYPRE_Int min_coarse_size );
-HYPRE_Int hypre_BoomerAMGGetMinCoarseSize ( void *data , HYPRE_Int *min_coarse_size );
-HYPRE_Int hypre_BoomerAMGSetSeqThreshold ( void *data , HYPRE_Int seq_threshold );
-HYPRE_Int hypre_BoomerAMGGetSeqThreshold ( void *data , HYPRE_Int *seq_threshold );
+HYPRE_Int hypre_BoomerAMGSetRestriction ( void *data, HYPRE_Int restr_par );
+HYPRE_Int hypre_BoomerAMGSetIsTriangular ( void *data, HYPRE_Int is_triangular );
+HYPRE_Int hypre_BoomerAMGSetGMRESSwitchR ( void *data, HYPRE_Int gmres_switch );
+HYPRE_Int hypre_BoomerAMGSetMaxLevels ( void *data, HYPRE_Int max_levels );
+HYPRE_Int hypre_BoomerAMGGetMaxLevels ( void *data, HYPRE_Int *max_levels );
+HYPRE_Int hypre_BoomerAMGSetMaxCoarseSize ( void *data, HYPRE_Int max_coarse_size );
+HYPRE_Int hypre_BoomerAMGGetMaxCoarseSize ( void *data, HYPRE_Int *max_coarse_size );
+HYPRE_Int hypre_BoomerAMGSetMinCoarseSize ( void *data, HYPRE_Int min_coarse_size );
+HYPRE_Int hypre_BoomerAMGGetMinCoarseSize ( void *data, HYPRE_Int *min_coarse_size );
+HYPRE_Int hypre_BoomerAMGSetSeqThreshold ( void *data, HYPRE_Int seq_threshold );
+HYPRE_Int hypre_BoomerAMGGetSeqThreshold ( void *data, HYPRE_Int *seq_threshold );
 HYPRE_Int hypre_BoomerAMGSetCoarsenCutFactor( void *data, HYPRE_Int coarsen_cut_factor );
 HYPRE_Int hypre_BoomerAMGGetCoarsenCutFactor( void *data, HYPRE_Int *coarsen_cut_factor );
-HYPRE_Int hypre_BoomerAMGSetRedundant ( void *data , HYPRE_Int redundant );
-HYPRE_Int hypre_BoomerAMGGetRedundant ( void *data , HYPRE_Int *redundant );
-HYPRE_Int hypre_BoomerAMGSetStrongThreshold ( void *data , HYPRE_Real strong_threshold );
-HYPRE_Int hypre_BoomerAMGGetStrongThreshold ( void *data , HYPRE_Real *strong_threshold );
-HYPRE_Int hypre_BoomerAMGSetStrongThresholdR ( void *data , HYPRE_Real strong_threshold );
-HYPRE_Int hypre_BoomerAMGGetStrongThresholdR ( void *data , HYPRE_Real *strong_threshold );
-HYPRE_Int hypre_BoomerAMGSetFilterThresholdR ( void *data , HYPRE_Real filter_threshold );
-HYPRE_Int hypre_BoomerAMGGetFilterThresholdR ( void *data , HYPRE_Real *filter_threshold );
-HYPRE_Int hypre_BoomerAMGSetSabs ( void *data , HYPRE_Int Sabs );
-HYPRE_Int hypre_BoomerAMGSetMaxRowSum ( void *data , HYPRE_Real max_row_sum );
-HYPRE_Int hypre_BoomerAMGGetMaxRowSum ( void *data , HYPRE_Real *max_row_sum );
-HYPRE_Int hypre_BoomerAMGSetTruncFactor ( void *data , HYPRE_Real trunc_factor );
-HYPRE_Int hypre_BoomerAMGGetTruncFactor ( void *data , HYPRE_Real *trunc_factor );
-HYPRE_Int hypre_BoomerAMGSetPMaxElmts ( void *data , HYPRE_Int P_max_elmts );
-HYPRE_Int hypre_BoomerAMGGetPMaxElmts ( void *data , HYPRE_Int *P_max_elmts );
-HYPRE_Int hypre_BoomerAMGSetJacobiTruncThreshold ( void *data , HYPRE_Real jacobi_trunc_threshold );
-HYPRE_Int hypre_BoomerAMGGetJacobiTruncThreshold ( void *data , HYPRE_Real *jacobi_trunc_threshold );
-HYPRE_Int hypre_BoomerAMGSetPostInterpType ( void *data , HYPRE_Int post_interp_type );
-HYPRE_Int hypre_BoomerAMGGetPostInterpType ( void *data , HYPRE_Int *post_interp_type );
-HYPRE_Int hypre_BoomerAMGSetInterpType ( void *data , HYPRE_Int interp_type );
-HYPRE_Int hypre_BoomerAMGGetInterpType ( void *data , HYPRE_Int *interp_type );
-HYPRE_Int hypre_BoomerAMGSetSepWeight ( void *data , HYPRE_Int sep_weight );
-HYPRE_Int hypre_BoomerAMGSetMinIter ( void *data , HYPRE_Int min_iter );
-HYPRE_Int hypre_BoomerAMGGetMinIter ( void *data , HYPRE_Int *min_iter );
-HYPRE_Int hypre_BoomerAMGSetMaxIter ( void *data , HYPRE_Int max_iter );
-HYPRE_Int hypre_BoomerAMGGetMaxIter ( void *data , HYPRE_Int *max_iter );
-HYPRE_Int hypre_BoomerAMGSetCoarsenType ( void *data , HYPRE_Int coarsen_type );
-HYPRE_Int hypre_BoomerAMGGetCoarsenType ( void *data , HYPRE_Int *coarsen_type );
-HYPRE_Int hypre_BoomerAMGSetMeasureType ( void *data , HYPRE_Int measure_type );
-HYPRE_Int hypre_BoomerAMGGetMeasureType ( void *data , HYPRE_Int *measure_type );
-HYPRE_Int hypre_BoomerAMGSetSetupType ( void *data , HYPRE_Int setup_type );
-HYPRE_Int hypre_BoomerAMGGetSetupType ( void *data , HYPRE_Int *setup_type );
-HYPRE_Int hypre_BoomerAMGSetFCycle ( void *data , HYPRE_Int fcycle );
-HYPRE_Int hypre_BoomerAMGGetFCycle ( void *data , HYPRE_Int *fcycle );
-HYPRE_Int hypre_BoomerAMGSetCycleType ( void *data , HYPRE_Int cycle_type );
-HYPRE_Int hypre_BoomerAMGGetCycleType ( void *data , HYPRE_Int *cycle_type );
-HYPRE_Int hypre_BoomerAMGSetConvergeType ( void *data , HYPRE_Int type );
-HYPRE_Int hypre_BoomerAMGGetConvergeType ( void *data , HYPRE_Int *type );
-HYPRE_Int hypre_BoomerAMGSetTol ( void *data , HYPRE_Real tol );
-HYPRE_Int hypre_BoomerAMGGetTol ( void *data , HYPRE_Real *tol );
-HYPRE_Int hypre_BoomerAMGSetNumSweeps ( void *data , HYPRE_Int num_sweeps );
-HYPRE_Int hypre_BoomerAMGSetCycleNumSweeps ( void *data , HYPRE_Int num_sweeps , HYPRE_Int k );
-HYPRE_Int hypre_BoomerAMGGetCycleNumSweeps ( void *data , HYPRE_Int *num_sweeps , HYPRE_Int k );
-HYPRE_Int hypre_BoomerAMGSetNumGridSweeps ( void *data , HYPRE_Int *num_grid_sweeps );
-HYPRE_Int hypre_BoomerAMGGetNumGridSweeps ( void *data , HYPRE_Int **num_grid_sweeps );
-HYPRE_Int hypre_BoomerAMGSetRelaxType ( void *data , HYPRE_Int relax_type );
-HYPRE_Int hypre_BoomerAMGSetCycleRelaxType ( void *data , HYPRE_Int relax_type , HYPRE_Int k );
-HYPRE_Int hypre_BoomerAMGGetCycleRelaxType ( void *data , HYPRE_Int *relax_type , HYPRE_Int k );
-HYPRE_Int hypre_BoomerAMGSetRelaxOrder ( void *data , HYPRE_Int relax_order );
-HYPRE_Int hypre_BoomerAMGGetRelaxOrder ( void *data , HYPRE_Int *relax_order );
-HYPRE_Int hypre_BoomerAMGSetGridRelaxType ( void *data , HYPRE_Int *grid_relax_type );
-HYPRE_Int hypre_BoomerAMGGetGridRelaxType ( void *data , HYPRE_Int **grid_relax_type );
-HYPRE_Int hypre_BoomerAMGSetGridRelaxPoints ( void *data , HYPRE_Int **grid_relax_points );
-HYPRE_Int hypre_BoomerAMGGetGridRelaxPoints ( void *data , HYPRE_Int ***grid_relax_points );
-HYPRE_Int hypre_BoomerAMGSetRelaxWeight ( void *data , HYPRE_Real *relax_weight );
-HYPRE_Int hypre_BoomerAMGGetRelaxWeight ( void *data , HYPRE_Real **relax_weight );
-HYPRE_Int hypre_BoomerAMGSetRelaxWt ( void *data , HYPRE_Real relax_weight );
-HYPRE_Int hypre_BoomerAMGSetLevelRelaxWt ( void *data , HYPRE_Real relax_weight , HYPRE_Int level );
-HYPRE_Int hypre_BoomerAMGGetLevelRelaxWt ( void *data , HYPRE_Real *relax_weight , HYPRE_Int level );
-HYPRE_Int hypre_BoomerAMGSetOmega ( void *data , HYPRE_Real *omega );
-HYPRE_Int hypre_BoomerAMGGetOmega ( void *data , HYPRE_Real **omega );
-HYPRE_Int hypre_BoomerAMGSetOuterWt ( void *data , HYPRE_Real omega );
-HYPRE_Int hypre_BoomerAMGSetLevelOuterWt ( void *data , HYPRE_Real omega , HYPRE_Int level );
-HYPRE_Int hypre_BoomerAMGGetLevelOuterWt ( void *data , HYPRE_Real *omega , HYPRE_Int level );
-HYPRE_Int hypre_BoomerAMGSetSmoothType ( void *data , HYPRE_Int smooth_type );
-HYPRE_Int hypre_BoomerAMGGetSmoothType ( void *data , HYPRE_Int *smooth_type );
-HYPRE_Int hypre_BoomerAMGSetSmoothNumLevels ( void *data , HYPRE_Int smooth_num_levels );
-HYPRE_Int hypre_BoomerAMGGetSmoothNumLevels ( void *data , HYPRE_Int *smooth_num_levels );
-HYPRE_Int hypre_BoomerAMGSetSmoothNumSweeps ( void *data , HYPRE_Int smooth_num_sweeps );
-HYPRE_Int hypre_BoomerAMGGetSmoothNumSweeps ( void *data , HYPRE_Int *smooth_num_sweeps );
-HYPRE_Int hypre_BoomerAMGSetLogging ( void *data , HYPRE_Int logging );
-HYPRE_Int hypre_BoomerAMGGetLogging ( void *data , HYPRE_Int *logging );
-HYPRE_Int hypre_BoomerAMGSetPrintLevel ( void *data , HYPRE_Int print_level );
-HYPRE_Int hypre_BoomerAMGGetPrintLevel ( void *data , HYPRE_Int *print_level );
-HYPRE_Int hypre_BoomerAMGSetPrintFileName ( void *data , const char *print_file_name );
-HYPRE_Int hypre_BoomerAMGGetPrintFileName ( void *data , char **print_file_name );
-HYPRE_Int hypre_BoomerAMGSetNumIterations ( void *data , HYPRE_Int num_iterations );
-HYPRE_Int hypre_BoomerAMGSetDebugFlag ( void *data , HYPRE_Int debug_flag );
-HYPRE_Int hypre_BoomerAMGGetDebugFlag ( void *data , HYPRE_Int *debug_flag );
-HYPRE_Int hypre_BoomerAMGSetGSMG ( void *data , HYPRE_Int par );
-HYPRE_Int hypre_BoomerAMGSetNumSamples ( void *data , HYPRE_Int par );
-HYPRE_Int hypre_BoomerAMGSetCGCIts ( void *data , HYPRE_Int its );
-HYPRE_Int hypre_BoomerAMGSetPlotGrids ( void *data , HYPRE_Int plotgrids );
-HYPRE_Int hypre_BoomerAMGSetPlotFileName ( void *data , const char *plot_file_name );
-HYPRE_Int hypre_BoomerAMGSetCoordDim ( void *data , HYPRE_Int coorddim );
-HYPRE_Int hypre_BoomerAMGSetCoordinates ( void *data , float *coordinates );
+HYPRE_Int hypre_BoomerAMGSetRedundant ( void *data, HYPRE_Int redundant );
+HYPRE_Int hypre_BoomerAMGGetRedundant ( void *data, HYPRE_Int *redundant );
+HYPRE_Int hypre_BoomerAMGSetStrongThreshold ( void *data, HYPRE_Real strong_threshold );
+HYPRE_Int hypre_BoomerAMGGetStrongThreshold ( void *data, HYPRE_Real *strong_threshold );
+HYPRE_Int hypre_BoomerAMGSetStrongThresholdR ( void *data, HYPRE_Real strong_threshold );
+HYPRE_Int hypre_BoomerAMGGetStrongThresholdR ( void *data, HYPRE_Real *strong_threshold );
+HYPRE_Int hypre_BoomerAMGSetFilterThresholdR ( void *data, HYPRE_Real filter_threshold );
+HYPRE_Int hypre_BoomerAMGGetFilterThresholdR ( void *data, HYPRE_Real *filter_threshold );
+HYPRE_Int hypre_BoomerAMGSetSabs ( void *data, HYPRE_Int Sabs );
+HYPRE_Int hypre_BoomerAMGSetMaxRowSum ( void *data, HYPRE_Real max_row_sum );
+HYPRE_Int hypre_BoomerAMGGetMaxRowSum ( void *data, HYPRE_Real *max_row_sum );
+HYPRE_Int hypre_BoomerAMGSetTruncFactor ( void *data, HYPRE_Real trunc_factor );
+HYPRE_Int hypre_BoomerAMGGetTruncFactor ( void *data, HYPRE_Real *trunc_factor );
+HYPRE_Int hypre_BoomerAMGSetPMaxElmts ( void *data, HYPRE_Int P_max_elmts );
+HYPRE_Int hypre_BoomerAMGGetPMaxElmts ( void *data, HYPRE_Int *P_max_elmts );
+HYPRE_Int hypre_BoomerAMGSetJacobiTruncThreshold ( void *data, HYPRE_Real jacobi_trunc_threshold );
+HYPRE_Int hypre_BoomerAMGGetJacobiTruncThreshold ( void *data, HYPRE_Real *jacobi_trunc_threshold );
+HYPRE_Int hypre_BoomerAMGSetPostInterpType ( void *data, HYPRE_Int post_interp_type );
+HYPRE_Int hypre_BoomerAMGGetPostInterpType ( void *data, HYPRE_Int *post_interp_type );
+HYPRE_Int hypre_BoomerAMGSetInterpType ( void *data, HYPRE_Int interp_type );
+HYPRE_Int hypre_BoomerAMGGetInterpType ( void *data, HYPRE_Int *interp_type );
+HYPRE_Int hypre_BoomerAMGSetSepWeight ( void *data, HYPRE_Int sep_weight );
+HYPRE_Int hypre_BoomerAMGSetMinIter ( void *data, HYPRE_Int min_iter );
+HYPRE_Int hypre_BoomerAMGGetMinIter ( void *data, HYPRE_Int *min_iter );
+HYPRE_Int hypre_BoomerAMGSetMaxIter ( void *data, HYPRE_Int max_iter );
+HYPRE_Int hypre_BoomerAMGGetMaxIter ( void *data, HYPRE_Int *max_iter );
+HYPRE_Int hypre_BoomerAMGSetCoarsenType ( void *data, HYPRE_Int coarsen_type );
+HYPRE_Int hypre_BoomerAMGGetCoarsenType ( void *data, HYPRE_Int *coarsen_type );
+HYPRE_Int hypre_BoomerAMGSetMeasureType ( void *data, HYPRE_Int measure_type );
+HYPRE_Int hypre_BoomerAMGGetMeasureType ( void *data, HYPRE_Int *measure_type );
+HYPRE_Int hypre_BoomerAMGSetSetupType ( void *data, HYPRE_Int setup_type );
+HYPRE_Int hypre_BoomerAMGGetSetupType ( void *data, HYPRE_Int *setup_type );
+HYPRE_Int hypre_BoomerAMGSetFCycle ( void *data, HYPRE_Int fcycle );
+HYPRE_Int hypre_BoomerAMGGetFCycle ( void *data, HYPRE_Int *fcycle );
+HYPRE_Int hypre_BoomerAMGSetCycleType ( void *data, HYPRE_Int cycle_type );
+HYPRE_Int hypre_BoomerAMGGetCycleType ( void *data, HYPRE_Int *cycle_type );
+HYPRE_Int hypre_BoomerAMGSetConvergeType ( void *data, HYPRE_Int type );
+HYPRE_Int hypre_BoomerAMGGetConvergeType ( void *data, HYPRE_Int *type );
+HYPRE_Int hypre_BoomerAMGSetTol ( void *data, HYPRE_Real tol );
+HYPRE_Int hypre_BoomerAMGGetTol ( void *data, HYPRE_Real *tol );
+HYPRE_Int hypre_BoomerAMGSetNumSweeps ( void *data, HYPRE_Int num_sweeps );
+HYPRE_Int hypre_BoomerAMGSetCycleNumSweeps ( void *data, HYPRE_Int num_sweeps, HYPRE_Int k );
+HYPRE_Int hypre_BoomerAMGGetCycleNumSweeps ( void *data, HYPRE_Int *num_sweeps, HYPRE_Int k );
+HYPRE_Int hypre_BoomerAMGSetNumGridSweeps ( void *data, HYPRE_Int *num_grid_sweeps );
+HYPRE_Int hypre_BoomerAMGGetNumGridSweeps ( void *data, HYPRE_Int **num_grid_sweeps );
+HYPRE_Int hypre_BoomerAMGSetRelaxType ( void *data, HYPRE_Int relax_type );
+HYPRE_Int hypre_BoomerAMGSetCycleRelaxType ( void *data, HYPRE_Int relax_type, HYPRE_Int k );
+HYPRE_Int hypre_BoomerAMGGetCycleRelaxType ( void *data, HYPRE_Int *relax_type, HYPRE_Int k );
+HYPRE_Int hypre_BoomerAMGSetRelaxOrder ( void *data, HYPRE_Int relax_order );
+HYPRE_Int hypre_BoomerAMGGetRelaxOrder ( void *data, HYPRE_Int *relax_order );
+HYPRE_Int hypre_BoomerAMGSetGridRelaxType ( void *data, HYPRE_Int *grid_relax_type );
+HYPRE_Int hypre_BoomerAMGGetGridRelaxType ( void *data, HYPRE_Int **grid_relax_type );
+HYPRE_Int hypre_BoomerAMGSetGridRelaxPoints ( void *data, HYPRE_Int **grid_relax_points );
+HYPRE_Int hypre_BoomerAMGGetGridRelaxPoints ( void *data, HYPRE_Int ***grid_relax_points );
+HYPRE_Int hypre_BoomerAMGSetRelaxWeight ( void *data, HYPRE_Real *relax_weight );
+HYPRE_Int hypre_BoomerAMGGetRelaxWeight ( void *data, HYPRE_Real **relax_weight );
+HYPRE_Int hypre_BoomerAMGSetRelaxWt ( void *data, HYPRE_Real relax_weight );
+HYPRE_Int hypre_BoomerAMGSetLevelRelaxWt ( void *data, HYPRE_Real relax_weight, HYPRE_Int level );
+HYPRE_Int hypre_BoomerAMGGetLevelRelaxWt ( void *data, HYPRE_Real *relax_weight, HYPRE_Int level );
+HYPRE_Int hypre_BoomerAMGSetOmega ( void *data, HYPRE_Real *omega );
+HYPRE_Int hypre_BoomerAMGGetOmega ( void *data, HYPRE_Real **omega );
+HYPRE_Int hypre_BoomerAMGSetOuterWt ( void *data, HYPRE_Real omega );
+HYPRE_Int hypre_BoomerAMGSetLevelOuterWt ( void *data, HYPRE_Real omega, HYPRE_Int level );
+HYPRE_Int hypre_BoomerAMGGetLevelOuterWt ( void *data, HYPRE_Real *omega, HYPRE_Int level );
+HYPRE_Int hypre_BoomerAMGSetSmoothType ( void *data, HYPRE_Int smooth_type );
+HYPRE_Int hypre_BoomerAMGGetSmoothType ( void *data, HYPRE_Int *smooth_type );
+HYPRE_Int hypre_BoomerAMGSetSmoothNumLevels ( void *data, HYPRE_Int smooth_num_levels );
+HYPRE_Int hypre_BoomerAMGGetSmoothNumLevels ( void *data, HYPRE_Int *smooth_num_levels );
+HYPRE_Int hypre_BoomerAMGSetSmoothNumSweeps ( void *data, HYPRE_Int smooth_num_sweeps );
+HYPRE_Int hypre_BoomerAMGGetSmoothNumSweeps ( void *data, HYPRE_Int *smooth_num_sweeps );
+HYPRE_Int hypre_BoomerAMGSetLogging ( void *data, HYPRE_Int logging );
+HYPRE_Int hypre_BoomerAMGGetLogging ( void *data, HYPRE_Int *logging );
+HYPRE_Int hypre_BoomerAMGSetPrintLevel ( void *data, HYPRE_Int print_level );
+HYPRE_Int hypre_BoomerAMGGetPrintLevel ( void *data, HYPRE_Int *print_level );
+HYPRE_Int hypre_BoomerAMGSetPrintFileName ( void *data, const char *print_file_name );
+HYPRE_Int hypre_BoomerAMGGetPrintFileName ( void *data, char **print_file_name );
+HYPRE_Int hypre_BoomerAMGSetNumIterations ( void *data, HYPRE_Int num_iterations );
+HYPRE_Int hypre_BoomerAMGSetDebugFlag ( void *data, HYPRE_Int debug_flag );
+HYPRE_Int hypre_BoomerAMGGetDebugFlag ( void *data, HYPRE_Int *debug_flag );
+HYPRE_Int hypre_BoomerAMGSetGSMG ( void *data, HYPRE_Int par );
+HYPRE_Int hypre_BoomerAMGSetNumSamples ( void *data, HYPRE_Int par );
+HYPRE_Int hypre_BoomerAMGSetCGCIts ( void *data, HYPRE_Int its );
+HYPRE_Int hypre_BoomerAMGSetPlotGrids ( void *data, HYPRE_Int plotgrids );
+HYPRE_Int hypre_BoomerAMGSetPlotFileName ( void *data, const char *plot_file_name );
+HYPRE_Int hypre_BoomerAMGSetCoordDim ( void *data, HYPRE_Int coorddim );
+HYPRE_Int hypre_BoomerAMGSetCoordinates ( void *data, float *coordinates );
 HYPRE_Int hypre_BoomerAMGGetGridHierarchy(void *data, HYPRE_Int *cgrid );
-HYPRE_Int hypre_BoomerAMGSetNumFunctions ( void *data , HYPRE_Int num_functions );
-HYPRE_Int hypre_BoomerAMGGetNumFunctions ( void *data , HYPRE_Int *num_functions );
-HYPRE_Int hypre_BoomerAMGSetNodal ( void *data , HYPRE_Int nodal );
-HYPRE_Int hypre_BoomerAMGSetNodalLevels ( void *data , HYPRE_Int nodal_levels );
-HYPRE_Int hypre_BoomerAMGSetNodalDiag ( void *data , HYPRE_Int nodal );
-HYPRE_Int hypre_BoomerAMGSetKeepSameSign ( void *data , HYPRE_Int keep_same_sign );
-HYPRE_Int hypre_BoomerAMGSetNumPaths ( void *data , HYPRE_Int num_paths );
-HYPRE_Int hypre_BoomerAMGSetAggNumLevels ( void *data , HYPRE_Int agg_num_levels );
-HYPRE_Int hypre_BoomerAMGSetAggInterpType ( void *data , HYPRE_Int agg_interp_type );
-HYPRE_Int hypre_BoomerAMGSetAggPMaxElmts ( void *data , HYPRE_Int agg_P_max_elmts );
-HYPRE_Int hypre_BoomerAMGSetMultAddPMaxElmts ( void *data , HYPRE_Int add_P_max_elmts );
-HYPRE_Int hypre_BoomerAMGSetAddRelaxType ( void *data , HYPRE_Int add_rlx_type );
-HYPRE_Int hypre_BoomerAMGSetAddRelaxWt ( void *data , HYPRE_Real add_rlx_wt );
-HYPRE_Int hypre_BoomerAMGSetAggP12MaxElmts ( void *data , HYPRE_Int agg_P12_max_elmts );
-HYPRE_Int hypre_BoomerAMGSetAggTruncFactor ( void *data , HYPRE_Real agg_trunc_factor );
-HYPRE_Int hypre_BoomerAMGSetMultAddTruncFactor ( void *data , HYPRE_Real add_trunc_factor );
-HYPRE_Int hypre_BoomerAMGSetAggP12TruncFactor ( void *data , HYPRE_Real agg_P12_trunc_factor );
-HYPRE_Int hypre_BoomerAMGSetNumCRRelaxSteps ( void *data , HYPRE_Int num_CR_relax_steps );
-HYPRE_Int hypre_BoomerAMGSetCRRate ( void *data , HYPRE_Real CR_rate );
-HYPRE_Int hypre_BoomerAMGSetCRStrongTh ( void *data , HYPRE_Real CR_strong_th );
+HYPRE_Int hypre_BoomerAMGSetNumFunctions ( void *data, HYPRE_Int num_functions );
+HYPRE_Int hypre_BoomerAMGGetNumFunctions ( void *data, HYPRE_Int *num_functions );
+HYPRE_Int hypre_BoomerAMGSetFilterFunctions ( void *data, HYPRE_Int filter_functions );
+HYPRE_Int hypre_BoomerAMGGetFilterFunctions ( void *data, HYPRE_Int *filter_functions );
+HYPRE_Int hypre_BoomerAMGSetNodal ( void *data, HYPRE_Int nodal );
+HYPRE_Int hypre_BoomerAMGSetNodalLevels ( void *data, HYPRE_Int nodal_levels );
+HYPRE_Int hypre_BoomerAMGSetNodalDiag ( void *data, HYPRE_Int nodal );
+HYPRE_Int hypre_BoomerAMGSetKeepSameSign ( void *data, HYPRE_Int keep_same_sign );
+HYPRE_Int hypre_BoomerAMGSetNumPaths ( void *data, HYPRE_Int num_paths );
+HYPRE_Int hypre_BoomerAMGSetAggNumLevels ( void *data, HYPRE_Int agg_num_levels );
+HYPRE_Int hypre_BoomerAMGSetAggInterpType ( void *data, HYPRE_Int agg_interp_type );
+HYPRE_Int hypre_BoomerAMGSetAggPMaxElmts ( void *data, HYPRE_Int agg_P_max_elmts );
+HYPRE_Int hypre_BoomerAMGSetMultAddPMaxElmts ( void *data, HYPRE_Int add_P_max_elmts );
+HYPRE_Int hypre_BoomerAMGSetAddRelaxType ( void *data, HYPRE_Int add_rlx_type );
+HYPRE_Int hypre_BoomerAMGSetAddRelaxWt ( void *data, HYPRE_Real add_rlx_wt );
+HYPRE_Int hypre_BoomerAMGSetAggP12MaxElmts ( void *data, HYPRE_Int agg_P12_max_elmts );
+HYPRE_Int hypre_BoomerAMGSetAggTruncFactor ( void *data, HYPRE_Real agg_trunc_factor );
+HYPRE_Int hypre_BoomerAMGSetMultAddTruncFactor ( void *data, HYPRE_Real add_trunc_factor );
+HYPRE_Int hypre_BoomerAMGSetAggP12TruncFactor ( void *data, HYPRE_Real agg_P12_trunc_factor );
+HYPRE_Int hypre_BoomerAMGSetNumCRRelaxSteps ( void *data, HYPRE_Int num_CR_relax_steps );
+HYPRE_Int hypre_BoomerAMGSetCRRate ( void *data, HYPRE_Real CR_rate );
+HYPRE_Int hypre_BoomerAMGSetCRStrongTh ( void *data, HYPRE_Real CR_strong_th );
 HYPRE_Int hypre_BoomerAMGSetADropTol( void     *data, HYPRE_Real  A_drop_tol );
 HYPRE_Int hypre_BoomerAMGSetADropType( void     *data, HYPRE_Int  A_drop_type );
-HYPRE_Int hypre_BoomerAMGSetISType ( void *data , HYPRE_Int IS_type );
-HYPRE_Int hypre_BoomerAMGSetCRUseCG ( void *data , HYPRE_Int CR_use_CG );
-HYPRE_Int hypre_BoomerAMGSetNumPoints ( void *data , HYPRE_Int num_points );
-HYPRE_Int hypre_BoomerAMGSetDofFunc ( void *data , HYPRE_Int *dof_func );
-HYPRE_Int hypre_BoomerAMGSetPointDofMap ( void *data , HYPRE_Int *point_dof_map );
-HYPRE_Int hypre_BoomerAMGSetDofPoint ( void *data , HYPRE_Int *dof_point );
-HYPRE_Int hypre_BoomerAMGGetNumIterations ( void *data , HYPRE_Int *num_iterations );
-HYPRE_Int hypre_BoomerAMGGetCumNumIterations ( void *data , HYPRE_Int *cum_num_iterations );
-HYPRE_Int hypre_BoomerAMGGetResidual ( void *data , hypre_ParVector **resid );
-HYPRE_Int hypre_BoomerAMGGetRelResidualNorm ( void *data , HYPRE_Real *rel_resid_norm );
-HYPRE_Int hypre_BoomerAMGSetVariant ( void *data , HYPRE_Int variant );
-HYPRE_Int hypre_BoomerAMGGetVariant ( void *data , HYPRE_Int *variant );
-HYPRE_Int hypre_BoomerAMGSetOverlap ( void *data , HYPRE_Int overlap );
-HYPRE_Int hypre_BoomerAMGGetOverlap ( void *data , HYPRE_Int *overlap );
-HYPRE_Int hypre_BoomerAMGSetDomainType ( void *data , HYPRE_Int domain_type );
-HYPRE_Int hypre_BoomerAMGGetDomainType ( void *data , HYPRE_Int *domain_type );
-HYPRE_Int hypre_BoomerAMGSetSchwarzRlxWeight ( void *data , HYPRE_Real schwarz_rlx_weight );
-HYPRE_Int hypre_BoomerAMGGetSchwarzRlxWeight ( void *data , HYPRE_Real *schwarz_rlx_weight );
-HYPRE_Int hypre_BoomerAMGSetSchwarzUseNonSymm ( void *data , HYPRE_Int use_nonsymm );
-HYPRE_Int hypre_BoomerAMGSetSym ( void *data , HYPRE_Int sym );
-HYPRE_Int hypre_BoomerAMGSetLevel ( void *data , HYPRE_Int level );
-HYPRE_Int hypre_BoomerAMGSetThreshold ( void *data , HYPRE_Real thresh );
-HYPRE_Int hypre_BoomerAMGSetFilter ( void *data , HYPRE_Real filter );
-HYPRE_Int hypre_BoomerAMGSetDropTol ( void *data , HYPRE_Real drop_tol );
-HYPRE_Int hypre_BoomerAMGSetMaxNzPerRow ( void *data , HYPRE_Int max_nz_per_row );
-HYPRE_Int hypre_BoomerAMGSetEuclidFile ( void *data , char *euclidfile );
-HYPRE_Int hypre_BoomerAMGSetEuLevel ( void *data , HYPRE_Int eu_level );
-HYPRE_Int hypre_BoomerAMGSetEuSparseA ( void *data , HYPRE_Real eu_sparse_A );
-HYPRE_Int hypre_BoomerAMGSetEuBJ ( void *data , HYPRE_Int eu_bj );
-HYPRE_Int hypre_BoomerAMGSetILUType( void *data, HYPRE_Int ilu_type);
-HYPRE_Int hypre_BoomerAMGSetILULevel( void *data, HYPRE_Int ilu_lfil);
-HYPRE_Int hypre_BoomerAMGSetILUDroptol( void *data, HYPRE_Real ilu_droptol);
-HYPRE_Int hypre_BoomerAMGSetILUMaxIter( void *data, HYPRE_Int ilu_max_iter);
-HYPRE_Int hypre_BoomerAMGSetILUMaxRowNnz( void *data, HYPRE_Int ilu_max_row_nnz);
-HYPRE_Int hypre_BoomerAMGSetILULocalReordering( void *data, HYPRE_Int ilu_reordering_type);
-HYPRE_Int hypre_BoomerAMGSetChebyOrder ( void *data , HYPRE_Int order );
-HYPRE_Int hypre_BoomerAMGSetChebyFraction ( void *data , HYPRE_Real ratio );
-HYPRE_Int hypre_BoomerAMGSetChebyEigEst ( void *data , HYPRE_Int eig_est );
-HYPRE_Int hypre_BoomerAMGSetChebyVariant ( void *data , HYPRE_Int variant );
-HYPRE_Int hypre_BoomerAMGSetChebyScale ( void *data , HYPRE_Int scale );
-HYPRE_Int hypre_BoomerAMGSetInterpVectors ( void *solver , HYPRE_Int num_vectors , hypre_ParVector **interp_vectors );
-HYPRE_Int hypre_BoomerAMGSetInterpVecVariant ( void *solver , HYPRE_Int var );
-HYPRE_Int hypre_BoomerAMGSetInterpVecQMax ( void *data , HYPRE_Int q_max );
-HYPRE_Int hypre_BoomerAMGSetInterpVecAbsQTrunc ( void *data , HYPRE_Real q_trunc );
-HYPRE_Int hypre_BoomerAMGSetSmoothInterpVectors ( void *solver , HYPRE_Int smooth_interp_vectors );
-HYPRE_Int hypre_BoomerAMGSetInterpRefine ( void *data , HYPRE_Int num_refine );
-HYPRE_Int hypre_BoomerAMGSetInterpVecFirstLevel ( void *data , HYPRE_Int level );
-HYPRE_Int hypre_BoomerAMGSetAdditive ( void *data , HYPRE_Int additive );
-HYPRE_Int hypre_BoomerAMGGetAdditive ( void *data , HYPRE_Int *additive );
-HYPRE_Int hypre_BoomerAMGSetMultAdditive ( void *data , HYPRE_Int mult_additive );
-HYPRE_Int hypre_BoomerAMGGetMultAdditive ( void *data , HYPRE_Int *mult_additive );
-HYPRE_Int hypre_BoomerAMGSetSimple ( void *data , HYPRE_Int simple );
-HYPRE_Int hypre_BoomerAMGGetSimple ( void *data , HYPRE_Int *simple );
-HYPRE_Int hypre_BoomerAMGSetAddLastLvl ( void *data , HYPRE_Int add_last_lvl );
-HYPRE_Int hypre_BoomerAMGSetNonGalerkinTol ( void *data , HYPRE_Real nongalerkin_tol );
-HYPRE_Int hypre_BoomerAMGSetLevelNonGalerkinTol ( void *data , HYPRE_Real nongalerkin_tol , HYPRE_Int level );
-HYPRE_Int hypre_BoomerAMGSetNonGalerkTol ( void *data , HYPRE_Int nongalerk_num_tol , HYPRE_Real *nongalerk_tol );
-HYPRE_Int hypre_BoomerAMGSetRAP2 ( void *data , HYPRE_Int rap2 );
-HYPRE_Int hypre_BoomerAMGSetModuleRAP2 ( void *data , HYPRE_Int mod_rap2 );
-HYPRE_Int hypre_BoomerAMGSetKeepTranspose ( void *data , HYPRE_Int keepTranspose );
+HYPRE_Int hypre_BoomerAMGSetISType ( void *data, HYPRE_Int IS_type );
+HYPRE_Int hypre_BoomerAMGSetCRUseCG ( void *data, HYPRE_Int CR_use_CG );
+HYPRE_Int hypre_BoomerAMGSetNumPoints ( void *data, HYPRE_Int num_points );
+HYPRE_Int hypre_BoomerAMGSetDofFunc ( void *data, HYPRE_Int *dof_func );
+HYPRE_Int hypre_BoomerAMGSetPointDofMap ( void *data, HYPRE_Int *point_dof_map );
+HYPRE_Int hypre_BoomerAMGSetDofPoint ( void *data, HYPRE_Int *dof_point );
+HYPRE_Int hypre_BoomerAMGGetNumIterations ( void *data, HYPRE_Int *num_iterations );
+HYPRE_Int hypre_BoomerAMGGetCumNumIterations ( void *data, HYPRE_Int *cum_num_iterations );
+HYPRE_Int hypre_BoomerAMGGetResidual ( void *data, hypre_ParVector **resid );
+HYPRE_Int hypre_BoomerAMGGetRelResidualNorm ( void *data, HYPRE_Real *rel_resid_norm );
+HYPRE_Int hypre_BoomerAMGSetVariant ( void *data, HYPRE_Int variant );
+HYPRE_Int hypre_BoomerAMGGetVariant ( void *data, HYPRE_Int *variant );
+HYPRE_Int hypre_BoomerAMGSetOverlap ( void *data, HYPRE_Int overlap );
+HYPRE_Int hypre_BoomerAMGGetOverlap ( void *data, HYPRE_Int *overlap );
+HYPRE_Int hypre_BoomerAMGSetDomainType ( void *data, HYPRE_Int domain_type );
+HYPRE_Int hypre_BoomerAMGGetDomainType ( void *data, HYPRE_Int *domain_type );
+HYPRE_Int hypre_BoomerAMGSetSchwarzRlxWeight ( void *data, HYPRE_Real schwarz_rlx_weight );
+HYPRE_Int hypre_BoomerAMGGetSchwarzRlxWeight ( void *data, HYPRE_Real *schwarz_rlx_weight );
+HYPRE_Int hypre_BoomerAMGSetSchwarzUseNonSymm ( void *data, HYPRE_Int use_nonsymm );
+HYPRE_Int hypre_BoomerAMGSetSym ( void *data, HYPRE_Int sym );
+HYPRE_Int hypre_BoomerAMGSetLevel ( void *data, HYPRE_Int level );
+HYPRE_Int hypre_BoomerAMGSetThreshold ( void *data, HYPRE_Real thresh );
+HYPRE_Int hypre_BoomerAMGSetFilter ( void *data, HYPRE_Real filter );
+HYPRE_Int hypre_BoomerAMGSetDropTol ( void *data, HYPRE_Real drop_tol );
+HYPRE_Int hypre_BoomerAMGSetMaxNzPerRow ( void *data, HYPRE_Int max_nz_per_row );
+HYPRE_Int hypre_BoomerAMGSetEuclidFile ( void *data, char *euclidfile );
+HYPRE_Int hypre_BoomerAMGSetEuLevel ( void *data, HYPRE_Int eu_level );
+HYPRE_Int hypre_BoomerAMGSetEuSparseA ( void *data, HYPRE_Real eu_sparse_A );
+HYPRE_Int hypre_BoomerAMGSetEuBJ ( void *data, HYPRE_Int eu_bj );
+HYPRE_Int hypre_BoomerAMGSetILUType( void *data, HYPRE_Int ilu_type );
+HYPRE_Int hypre_BoomerAMGSetILULevel( void *data, HYPRE_Int ilu_lfil );
+HYPRE_Int hypre_BoomerAMGSetILUDroptol( void *data, HYPRE_Real ilu_droptol );
+HYPRE_Int hypre_BoomerAMGSetILUTriSolve( void *data, HYPRE_Int ilu_tri_solve );
+HYPRE_Int hypre_BoomerAMGSetILULowerJacobiIters( void *data, HYPRE_Int ilu_lower_jacobi_iters );
+HYPRE_Int hypre_BoomerAMGSetILUUpperJacobiIters( void *data, HYPRE_Int ilu_upper_jacobi_iters );
+HYPRE_Int hypre_BoomerAMGSetILUMaxIter( void *data, HYPRE_Int ilu_max_iter );
+HYPRE_Int hypre_BoomerAMGSetILUMaxRowNnz( void *data, HYPRE_Int ilu_max_row_nnz );
+HYPRE_Int hypre_BoomerAMGSetILULocalReordering( void *data, HYPRE_Int ilu_reordering_type );
+HYPRE_Int hypre_BoomerAMGSetILUIterSetupType( void *data, HYPRE_Int ilu_iter_setup_type );
+HYPRE_Int hypre_BoomerAMGSetILUIterSetupOption( void *data, HYPRE_Int ilu_iter_setup_option );
+HYPRE_Int hypre_BoomerAMGSetILUIterSetupMaxIter( void *data, HYPRE_Int ilu_iter_setup_max_iter );
+HYPRE_Int hypre_BoomerAMGSetILUIterSetupTolerance( void *data,
+                                                   HYPRE_Real ilu_iter_setup_tolerance );
+HYPRE_Int hypre_BoomerAMGSetFSAIAlgoType ( void *data, HYPRE_Int fsai_algo_type );
+HYPRE_Int hypre_BoomerAMGSetFSAILocalSolveType ( void *data, HYPRE_Int local_solve_type );
+HYPRE_Int hypre_BoomerAMGSetFSAIMaxSteps ( void *data, HYPRE_Int fsai_max_steps );
+HYPRE_Int hypre_BoomerAMGSetFSAIMaxStepSize ( void *data, HYPRE_Int fsai_max_step_size );
+HYPRE_Int hypre_BoomerAMGSetFSAIMaxNnzRow ( void *data, HYPRE_Int fsai_max_nnz_row );
+HYPRE_Int hypre_BoomerAMGSetFSAINumLevels ( void *data, HYPRE_Int fsai_num_levels );
+HYPRE_Int hypre_BoomerAMGSetFSAIEigMaxIters ( void *data, HYPRE_Int fsai_eig_max_iters );
+HYPRE_Int hypre_BoomerAMGSetFSAIThreshold ( void *data, HYPRE_Real fsai_threshold );
+HYPRE_Int hypre_BoomerAMGSetFSAIKapTolerance ( void *data, HYPRE_Real fsai_kap_tolerance );
+HYPRE_Int hypre_BoomerAMGSetChebyOrder ( void *data, HYPRE_Int order );
+HYPRE_Int hypre_BoomerAMGSetChebyFraction ( void *data, HYPRE_Real ratio );
+HYPRE_Int hypre_BoomerAMGSetChebyEigEst ( void *data, HYPRE_Int eig_est );
+HYPRE_Int hypre_BoomerAMGSetChebyVariant ( void *data, HYPRE_Int variant );
+HYPRE_Int hypre_BoomerAMGSetChebyScale ( void *data, HYPRE_Int scale );
+HYPRE_Int hypre_BoomerAMGSetInterpVectors ( void *solver, HYPRE_Int num_vectors,
+                                            hypre_ParVector **interp_vectors );
+HYPRE_Int hypre_BoomerAMGSetInterpVecVariant ( void *solver, HYPRE_Int var );
+HYPRE_Int hypre_BoomerAMGSetInterpVecQMax ( void *data, HYPRE_Int q_max );
+HYPRE_Int hypre_BoomerAMGSetInterpVecAbsQTrunc ( void *data, HYPRE_Real q_trunc );
+HYPRE_Int hypre_BoomerAMGSetSmoothInterpVectors ( void *solver, HYPRE_Int smooth_interp_vectors );
+HYPRE_Int hypre_BoomerAMGSetInterpRefine ( void *data, HYPRE_Int num_refine );
+HYPRE_Int hypre_BoomerAMGSetInterpVecFirstLevel ( void *data, HYPRE_Int level );
+HYPRE_Int hypre_BoomerAMGSetAdditive ( void *data, HYPRE_Int additive );
+HYPRE_Int hypre_BoomerAMGGetAdditive ( void *data, HYPRE_Int *additive );
+HYPRE_Int hypre_BoomerAMGSetMultAdditive ( void *data, HYPRE_Int mult_additive );
+HYPRE_Int hypre_BoomerAMGGetMultAdditive ( void *data, HYPRE_Int *mult_additive );
+HYPRE_Int hypre_BoomerAMGSetSimple ( void *data, HYPRE_Int simple );
+HYPRE_Int hypre_BoomerAMGGetSimple ( void *data, HYPRE_Int *simple );
+HYPRE_Int hypre_BoomerAMGSetAddLastLvl ( void *data, HYPRE_Int add_last_lvl );
+HYPRE_Int hypre_BoomerAMGSetNonGalerkinTol ( void *data, HYPRE_Real nongalerkin_tol );
+HYPRE_Int hypre_BoomerAMGSetLevelNonGalerkinTol ( void *data, HYPRE_Real nongalerkin_tol,
+                                                  HYPRE_Int level );
+HYPRE_Int hypre_BoomerAMGSetNonGalerkTol ( void *data, HYPRE_Int nongalerk_num_tol,
+                                           HYPRE_Real *nongalerk_tol );
+HYPRE_Int hypre_BoomerAMGSetRAP2 ( void *data, HYPRE_Int rap2 );
+HYPRE_Int hypre_BoomerAMGSetModuleRAP2 ( void *data, HYPRE_Int mod_rap2 );
+HYPRE_Int hypre_BoomerAMGSetKeepTranspose ( void *data, HYPRE_Int keepTranspose );
 #ifdef HYPRE_USING_DSUPERLU
-HYPRE_Int hypre_BoomerAMGSetDSLUThreshold ( void *data , HYPRE_Int slu_threshold );
+HYPRE_Int hypre_BoomerAMGSetDSLUThreshold ( void *data, HYPRE_Int slu_threshold );
 #endif
-HYPRE_Int hypre_BoomerAMGSetCPoints( void *data, HYPRE_Int cpt_coarse_level, HYPRE_Int  num_cpt_coarse, HYPRE_BigInt *cpt_coarse_index );
-HYPRE_Int hypre_BoomerAMGSetFPoints( void *data, HYPRE_Int isolated, HYPRE_Int num_points, HYPRE_BigInt *indices );
+HYPRE_Int hypre_BoomerAMGSetCPoints( void *data, HYPRE_Int cpt_coarse_level,
+                                     HYPRE_Int  num_cpt_coarse, HYPRE_BigInt *cpt_coarse_index );
+HYPRE_Int hypre_BoomerAMGSetFPoints( void *data, HYPRE_Int isolated, HYPRE_Int num_points,
+                                     HYPRE_BigInt *indices );
+HYPRE_Int hypre_BoomerAMGSetCumNnzAP ( void *data, HYPRE_Real cum_nnz_AP );
+HYPRE_Int hypre_BoomerAMGGetCumNnzAP ( void *data, HYPRE_Real *cum_nnz_AP );
 
 /* par_amg_setup.c */
-HYPRE_Int hypre_BoomerAMGSetup ( void *amg_vdata , hypre_ParCSRMatrix *A , hypre_ParVector *f , hypre_ParVector *u );
+HYPRE_Int hypre_BoomerAMGSetup ( void *amg_vdata, hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                 hypre_ParVector *u );
 
 /* par_amg_solve.c */
-HYPRE_Int hypre_BoomerAMGSolve ( void *amg_vdata , hypre_ParCSRMatrix *A , hypre_ParVector *f , hypre_ParVector *u );
+HYPRE_Int hypre_BoomerAMGSolve ( void *amg_vdata, hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                 hypre_ParVector *u );
 
 /* par_amg_solveT.c */
-HYPRE_Int hypre_BoomerAMGSolveT ( void *amg_vdata , hypre_ParCSRMatrix *A , hypre_ParVector *f , hypre_ParVector *u );
-HYPRE_Int hypre_BoomerAMGCycleT ( void *amg_vdata , hypre_ParVector **F_array , hypre_ParVector **U_array );
-HYPRE_Int hypre_BoomerAMGRelaxT ( hypre_ParCSRMatrix *A , hypre_ParVector *f , HYPRE_Int *cf_marker , HYPRE_Int relax_type , HYPRE_Int relax_points , HYPRE_Real relax_weight , hypre_ParVector *u , hypre_ParVector *Vtemp );
+HYPRE_Int hypre_BoomerAMGSolveT ( void *amg_vdata, hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                  hypre_ParVector *u );
+HYPRE_Int hypre_BoomerAMGCycleT ( void *amg_vdata, hypre_ParVector **F_array,
+                                  hypre_ParVector **U_array );
+HYPRE_Int hypre_BoomerAMGRelaxT ( hypre_ParCSRMatrix *A, hypre_ParVector *f, HYPRE_Int *cf_marker,
+                                  HYPRE_Int relax_type, HYPRE_Int relax_points, HYPRE_Real relax_weight, hypre_ParVector *u,
+                                  hypre_ParVector *Vtemp );
 
 /* par_cgc_coarsen.c */
-HYPRE_Int hypre_BoomerAMGCoarsenCGCb ( hypre_ParCSRMatrix *S , hypre_ParCSRMatrix *A , HYPRE_Int measure_type , HYPRE_Int coarsen_type , HYPRE_Int cgc_its , HYPRE_Int debug_flag , hypre_IntArray **CF_marker_ptr );
-HYPRE_Int hypre_BoomerAMGCoarsenCGC ( hypre_ParCSRMatrix *S , HYPRE_Int numberofgrids , HYPRE_Int coarsen_type , HYPRE_Int *CF_marker );
-HYPRE_Int hypre_AmgCGCPrepare ( hypre_ParCSRMatrix *S , HYPRE_Int nlocal , HYPRE_Int *CF_marker , HYPRE_Int **CF_marker_offd , HYPRE_Int coarsen_type , HYPRE_Int **vrange );
+HYPRE_Int hypre_BoomerAMGCoarsenCGCb ( hypre_ParCSRMatrix *S, hypre_ParCSRMatrix *A,
+                                       HYPRE_Int measure_type, HYPRE_Int coarsen_type, HYPRE_Int cgc_its, HYPRE_Int debug_flag,
+                                       hypre_IntArray **CF_marker_ptr );
+HYPRE_Int hypre_BoomerAMGCoarsenCGC ( hypre_ParCSRMatrix *S, HYPRE_Int numberofgrids,
+                                      HYPRE_Int coarsen_type, HYPRE_Int *CF_marker );
+HYPRE_Int hypre_AmgCGCPrepare ( hypre_ParCSRMatrix *S, HYPRE_Int nlocal, HYPRE_Int *CF_marker,
+                                HYPRE_Int **CF_marker_offd, HYPRE_Int coarsen_type, HYPRE_Int **vrange );
 //HYPRE_Int hypre_AmgCGCPrepare ( hypre_ParCSRMatrix *S , HYPRE_Int nlocal , HYPRE_Int *CF_marker , HYPRE_BigInt **CF_marker_offd , HYPRE_Int coarsen_type , HYPRE_BigInt **vrange );
-HYPRE_Int hypre_AmgCGCGraphAssemble ( hypre_ParCSRMatrix *S , HYPRE_Int *vertexrange , HYPRE_Int *CF_marker, HYPRE_Int *CF_marker_offd , HYPRE_Int coarsen_type , HYPRE_IJMatrix *ijG );
-HYPRE_Int hypre_AmgCGCChoose ( hypre_CSRMatrix *G , HYPRE_Int *vertexrange , HYPRE_Int mpisize , HYPRE_Int **coarse );
-HYPRE_Int hypre_AmgCGCBoundaryFix ( hypre_ParCSRMatrix *S , HYPRE_Int *CF_marker , HYPRE_Int *CF_marker_offd );
+HYPRE_Int hypre_AmgCGCGraphAssemble ( hypre_ParCSRMatrix *S, HYPRE_Int *vertexrange,
+                                      HYPRE_Int *CF_marker, HYPRE_Int *CF_marker_offd, HYPRE_Int coarsen_type, HYPRE_IJMatrix *ijG );
+HYPRE_Int hypre_AmgCGCChoose ( hypre_CSRMatrix *G, HYPRE_Int *vertexrange, HYPRE_Int mpisize,
+                               HYPRE_Int **coarse );
+HYPRE_Int hypre_AmgCGCBoundaryFix ( hypre_ParCSRMatrix *S, HYPRE_Int *CF_marker,
+                                    HYPRE_Int *CF_marker_offd );
 
 /* par_cg_relax_wt.c */
-HYPRE_Int hypre_BoomerAMGCGRelaxWt ( void *amg_vdata , HYPRE_Int level , HYPRE_Int num_cg_sweeps , HYPRE_Real *rlx_wt_ptr );
-HYPRE_Int hypre_Bisection ( HYPRE_Int n , HYPRE_Real *diag , HYPRE_Real *offd , HYPRE_Real y , HYPRE_Real z , HYPRE_Real tol , HYPRE_Int k , HYPRE_Real *ev_ptr );
+HYPRE_Int hypre_BoomerAMGCGRelaxWt ( void *amg_vdata, HYPRE_Int level, HYPRE_Int num_cg_sweeps,
+                                     HYPRE_Real *rlx_wt_ptr );
+HYPRE_Int hypre_Bisection ( HYPRE_Int n, HYPRE_Real *diag, HYPRE_Real *offd, HYPRE_Real y,
+                            HYPRE_Real z, HYPRE_Real tol, HYPRE_Int k, HYPRE_Real *ev_ptr );
 
 /* par_cheby.c */
-HYPRE_Int hypre_ParCSRRelax_Cheby_Setup ( hypre_ParCSRMatrix *A , HYPRE_Real max_eig , HYPRE_Real min_eig , HYPRE_Real fraction , HYPRE_Int order , HYPRE_Int scale , HYPRE_Int variant , HYPRE_Real **coefs_ptr , HYPRE_Real **ds_ptr );
-HYPRE_Int hypre_ParCSRRelax_Cheby_Solve ( hypre_ParCSRMatrix *A , hypre_ParVector *f , HYPRE_Real *ds_data , HYPRE_Real *coefs , HYPRE_Int order , HYPRE_Int scale , HYPRE_Int variant , hypre_ParVector *u , hypre_ParVector *v , hypre_ParVector *r , hypre_ParVector *orig_u_vec, hypre_ParVector *tmp_vec);
-
-HYPRE_Int hypre_ParCSRRelax_Cheby_SolveHost ( hypre_ParCSRMatrix *A , hypre_ParVector *f , HYPRE_Real *ds_data , HYPRE_Real *coefs , HYPRE_Int order , HYPRE_Int scale , HYPRE_Int variant , hypre_ParVector *u , hypre_ParVector *v , hypre_ParVector *r, hypre_ParVector *orig_u_vec, hypre_ParVector *tmp_vec);
+HYPRE_Int hypre_ParCSRRelax_Cheby_Setup ( hypre_ParCSRMatrix *A, HYPRE_Real max_eig,
+                                          HYPRE_Real min_eig, HYPRE_Real fraction, HYPRE_Int order, HYPRE_Int scale, HYPRE_Int variant,
+                                          HYPRE_Real **coefs_ptr, HYPRE_Real **ds_ptr );
+HYPRE_Int hypre_ParCSRRelax_Cheby_Solve ( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                          HYPRE_Real *ds_data, HYPRE_Real *coefs, HYPRE_Int order, HYPRE_Int scale, HYPRE_Int variant,
+                                          hypre_ParVector *u, hypre_ParVector *v, hypre_ParVector *r, hypre_ParVector *orig_u_vec,
+                                          hypre_ParVector *tmp_vec);
+
+HYPRE_Int hypre_ParCSRRelax_Cheby_SolveHost ( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                              HYPRE_Real *ds_data, HYPRE_Real *coefs, HYPRE_Int order, HYPRE_Int scale, HYPRE_Int variant,
+                                              hypre_ParVector *u, hypre_ParVector *v, hypre_ParVector *r, hypre_ParVector *orig_u_vec,
+                                              hypre_ParVector *tmp_vec);
 
 /* par_cheby_device.c */
-HYPRE_Int hypre_ParCSRRelax_Cheby_SolveDevice ( hypre_ParCSRMatrix *A , hypre_ParVector *f , HYPRE_Real *ds_data , HYPRE_Real *coefs , HYPRE_Int order , HYPRE_Int scale , HYPRE_Int variant , hypre_ParVector *u , hypre_ParVector *v , hypre_ParVector *r, hypre_ParVector *orig_u_vec, hypre_ParVector *tmp_vec);
+HYPRE_Int hypre_ParCSRRelax_Cheby_SolveDevice ( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                                HYPRE_Real *ds_data, HYPRE_Real *coefs, HYPRE_Int order, HYPRE_Int scale, HYPRE_Int variant,
+                                                hypre_ParVector *u, hypre_ParVector *v, hypre_ParVector *r, hypre_ParVector *orig_u_vec,
+                                                hypre_ParVector *tmp_vec);
 
 /* par_coarsen.c */
-HYPRE_Int hypre_BoomerAMGCoarsen ( hypre_ParCSRMatrix *S , hypre_ParCSRMatrix *A , HYPRE_Int CF_init , HYPRE_Int debug_flag , hypre_IntArray **CF_marker_ptr );
-HYPRE_Int hypre_BoomerAMGCoarsenRuge ( hypre_ParCSRMatrix *S , hypre_ParCSRMatrix *A , HYPRE_Int measure_type , HYPRE_Int coarsen_type , HYPRE_Int cut_factor , HYPRE_Int debug_flag , hypre_IntArray **CF_marker_ptr );
-HYPRE_Int hypre_BoomerAMGCoarsenFalgout ( hypre_ParCSRMatrix *S , hypre_ParCSRMatrix *A , HYPRE_Int measure_type , HYPRE_Int cut_factor , HYPRE_Int debug_flag , hypre_IntArray **CF_marker_ptr );
-HYPRE_Int hypre_BoomerAMGCoarsenHMIS ( hypre_ParCSRMatrix *S , hypre_ParCSRMatrix *A , HYPRE_Int measure_type , HYPRE_Int cut_factor , HYPRE_Int debug_flag , hypre_IntArray **CF_marker_ptr );
-HYPRE_Int hypre_BoomerAMGCoarsenPMIS ( hypre_ParCSRMatrix *S , hypre_ParCSRMatrix *A , HYPRE_Int CF_init , HYPRE_Int debug_flag , hypre_IntArray **CF_marker_ptr );
-HYPRE_Int hypre_BoomerAMGCoarsenPMISHost ( hypre_ParCSRMatrix *S , hypre_ParCSRMatrix *A , HYPRE_Int CF_init , HYPRE_Int debug_flag , hypre_IntArray **CF_marker_ptr );
-
-HYPRE_Int hypre_BoomerAMGCoarsenPMISDevice( hypre_ParCSRMatrix *S, hypre_ParCSRMatrix *A, HYPRE_Int CF_init, HYPRE_Int debug_flag, hypre_IntArray **CF_marker_ptr );
+HYPRE_Int hypre_BoomerAMGCoarsen ( hypre_ParCSRMatrix *S, hypre_ParCSRMatrix *A, HYPRE_Int CF_init,
+                                   HYPRE_Int debug_flag, hypre_IntArray **CF_marker_ptr );
+HYPRE_Int hypre_BoomerAMGCoarsenRuge ( hypre_ParCSRMatrix *S, hypre_ParCSRMatrix *A,
+                                       HYPRE_Int measure_type, HYPRE_Int coarsen_type, HYPRE_Int cut_factor, HYPRE_Int debug_flag,
+                                       hypre_IntArray **CF_marker_ptr );
+HYPRE_Int hypre_BoomerAMGCoarsenFalgout ( hypre_ParCSRMatrix *S, hypre_ParCSRMatrix *A,
+                                          HYPRE_Int measure_type, HYPRE_Int cut_factor, HYPRE_Int debug_flag,
+                                          hypre_IntArray **CF_marker_ptr );
+HYPRE_Int hypre_BoomerAMGCoarsenHMIS ( hypre_ParCSRMatrix *S, hypre_ParCSRMatrix *A,
+                                       HYPRE_Int measure_type, HYPRE_Int cut_factor, HYPRE_Int debug_flag,
+                                       hypre_IntArray **CF_marker_ptr );
+HYPRE_Int hypre_BoomerAMGCoarsenPMIS ( hypre_ParCSRMatrix *S, hypre_ParCSRMatrix *A,
+                                       HYPRE_Int CF_init, HYPRE_Int debug_flag, hypre_IntArray **CF_marker_ptr );
+HYPRE_Int hypre_BoomerAMGCoarsenPMISHost ( hypre_ParCSRMatrix *S, hypre_ParCSRMatrix *A,
+                                           HYPRE_Int CF_init, HYPRE_Int debug_flag, hypre_IntArray **CF_marker_ptr );
+
+HYPRE_Int hypre_BoomerAMGCoarsenPMISDevice( hypre_ParCSRMatrix *S, hypre_ParCSRMatrix *A,
+                                            HYPRE_Int CF_init, HYPRE_Int debug_flag, hypre_IntArray **CF_marker_ptr );
 
 /* par_coarsen_device.c */
-HYPRE_Int hypre_GetGlobalMeasureDevice( hypre_ParCSRMatrix *S, hypre_ParCSRCommPkg *comm_pkg, HYPRE_Int CF_init, HYPRE_Int aug_rand, HYPRE_Real *measure_diag, HYPRE_Real *measure_offd, HYPRE_Real *real_send_buf );
+HYPRE_Int hypre_GetGlobalMeasureDevice( hypre_ParCSRMatrix *S, hypre_ParCSRCommPkg *comm_pkg,
+                                        HYPRE_Int CF_init, HYPRE_Int aug_rand, HYPRE_Real *measure_diag, HYPRE_Real *measure_offd,
+                                        HYPRE_Real *real_send_buf );
 
 /* par_coarse_parms.c */
-HYPRE_Int hypre_BoomerAMGCoarseParms ( MPI_Comm comm , HYPRE_Int local_num_variables , HYPRE_Int num_functions , hypre_IntArray *dof_func , hypre_IntArray *CF_marker , hypre_IntArray **coarse_dof_func_ptr , HYPRE_BigInt **coarse_pnts_global_ptr );
-HYPRE_Int hypre_BoomerAMGCoarseParmsHost ( MPI_Comm comm , HYPRE_Int local_num_variables , HYPRE_Int num_functions , hypre_IntArray *dof_func , hypre_IntArray *CF_marker , hypre_IntArray **coarse_dof_func_ptr , HYPRE_BigInt **coarse_pnts_global_ptr );
-HYPRE_Int hypre_BoomerAMGCoarseParmsDevice ( MPI_Comm comm , HYPRE_Int local_num_variables , HYPRE_Int num_functions , hypre_IntArray *dof_func , hypre_IntArray *CF_marker , hypre_IntArray **coarse_dof_func_ptr , HYPRE_BigInt **coarse_pnts_global_ptr );
-HYPRE_Int hypre_BoomerAMGInitDofFuncDevice( HYPRE_Int *dof_func, HYPRE_Int local_size, HYPRE_Int offset, HYPRE_Int num_functions );
+HYPRE_Int hypre_BoomerAMGCoarseParms ( MPI_Comm comm, HYPRE_Int local_num_variables,
+                                       HYPRE_Int num_functions, hypre_IntArray *dof_func, hypre_IntArray *CF_marker,
+                                       hypre_IntArray **coarse_dof_func_ptr, HYPRE_BigInt *coarse_pnts_global );
+HYPRE_Int hypre_BoomerAMGCoarseParmsHost ( MPI_Comm comm, HYPRE_Int local_num_variables,
+                                           HYPRE_Int num_functions, hypre_IntArray *dof_func, hypre_IntArray *CF_marker,
+                                           hypre_IntArray **coarse_dof_func_ptr, HYPRE_BigInt *coarse_pnts_global );
+HYPRE_Int hypre_BoomerAMGCoarseParmsDevice ( MPI_Comm comm, HYPRE_Int local_num_variables,
+                                             HYPRE_Int num_functions, hypre_IntArray *dof_func, hypre_IntArray *CF_marker,
+                                             hypre_IntArray **coarse_dof_func_ptr, HYPRE_BigInt *coarse_pnts_global );
+HYPRE_Int hypre_BoomerAMGInitDofFuncDevice( HYPRE_Int *dof_func, HYPRE_Int local_size,
+                                            HYPRE_Int offset, HYPRE_Int num_functions );
 
 /* par_coordinates.c */
-float *GenerateCoordinates ( MPI_Comm comm , HYPRE_BigInt nx , HYPRE_BigInt ny , HYPRE_BigInt nz , HYPRE_Int P , HYPRE_Int Q , HYPRE_Int R , HYPRE_Int p , HYPRE_Int q , HYPRE_Int r , HYPRE_Int coorddim );
+float *hypre_GenerateCoordinates ( MPI_Comm comm, HYPRE_BigInt nx, HYPRE_BigInt ny,
+                                   HYPRE_BigInt nz, HYPRE_Int P, HYPRE_Int Q, HYPRE_Int R,
+                                   HYPRE_Int p, HYPRE_Int q, HYPRE_Int r, HYPRE_Int coorddim );
 
 /* par_cr.c */
-HYPRE_Int hypre_BoomerAMGCoarsenCR1 ( hypre_ParCSRMatrix *A , hypre_IntArray **CF_marker_ptr , HYPRE_BigInt *coarse_size_ptr , HYPRE_Int num_CR_relax_steps , HYPRE_Int IS_type , HYPRE_Int CRaddCpoints );
-HYPRE_Int hypre_cr ( HYPRE_Int *A_i , HYPRE_Int *A_j , HYPRE_Real *A_data , HYPRE_Int n , HYPRE_Int *cf , HYPRE_Int rlx , HYPRE_Real omega , HYPRE_Real tg , HYPRE_Int mu );
-HYPRE_Int hypre_GraphAdd ( Link *list , HYPRE_Int *head , HYPRE_Int *tail , HYPRE_Int index , HYPRE_Int istack );
-HYPRE_Int hypre_GraphRemove ( Link *list , HYPRE_Int *head , HYPRE_Int *tail , HYPRE_Int index );
-HYPRE_Int hypre_IndepSetGreedy ( HYPRE_Int *A_i , HYPRE_Int *A_j , HYPRE_Int n , HYPRE_Int *cf );
-HYPRE_Int hypre_IndepSetGreedyS ( HYPRE_Int *A_i , HYPRE_Int *A_j , HYPRE_Int n , HYPRE_Int *cf );
-HYPRE_Int hypre_fptjaccr ( HYPRE_Int *cf , HYPRE_Int *A_i , HYPRE_Int *A_j , HYPRE_Real *A_data , HYPRE_Int n , HYPRE_Real *e0 , HYPRE_Real omega , HYPRE_Real *e1 );
-HYPRE_Int hypre_fptgscr ( HYPRE_Int *cf , HYPRE_Int *A_i , HYPRE_Int *A_j , HYPRE_Real *A_data , HYPRE_Int n , HYPRE_Real *e0 , HYPRE_Real *e1 );
-HYPRE_Int hypre_formu ( HYPRE_Int *cf , HYPRE_Int n , HYPRE_Real *e1 , HYPRE_Int *A_i , HYPRE_Real rho );
-HYPRE_Int hypre_BoomerAMGIndepRS ( hypre_ParCSRMatrix *S , HYPRE_Int measure_type , HYPRE_Int debug_flag , HYPRE_Int *CF_marker );
-HYPRE_Int hypre_BoomerAMGIndepRSa ( hypre_ParCSRMatrix *S , HYPRE_Int measure_type , HYPRE_Int debug_flag , HYPRE_Int *CF_marker );
-HYPRE_Int hypre_BoomerAMGIndepHMIS ( hypre_ParCSRMatrix *S , HYPRE_Int measure_type , HYPRE_Int debug_flag , HYPRE_Int *CF_marker );
-HYPRE_Int hypre_BoomerAMGIndepHMISa ( hypre_ParCSRMatrix *S , HYPRE_Int measure_type , HYPRE_Int debug_flag , HYPRE_Int *CF_marker );
-HYPRE_Int hypre_BoomerAMGIndepPMIS ( hypre_ParCSRMatrix *S , HYPRE_Int CF_init , HYPRE_Int debug_flag , HYPRE_Int *CF_marker );
-HYPRE_Int hypre_BoomerAMGIndepPMISa ( hypre_ParCSRMatrix *S , HYPRE_Int CF_init , HYPRE_Int debug_flag , HYPRE_Int *CF_marker );
-HYPRE_Int hypre_BoomerAMGCoarsenCR ( hypre_ParCSRMatrix *A , hypre_IntArray **CF_marker_ptr , HYPRE_BigInt *coarse_size_ptr , HYPRE_Int num_CR_relax_steps , HYPRE_Int IS_type , HYPRE_Int num_functions , HYPRE_Int rlx_type , HYPRE_Real relax_weight , HYPRE_Real omega , HYPRE_Real theta , HYPRE_Solver smoother , hypre_ParCSRMatrix *AN , HYPRE_Int useCG , hypre_ParCSRMatrix *S );
+HYPRE_Int hypre_BoomerAMGCoarsenCR1 ( hypre_ParCSRMatrix *A, hypre_IntArray **CF_marker_ptr,
+                                      HYPRE_BigInt *coarse_size_ptr, HYPRE_Int num_CR_relax_steps, HYPRE_Int IS_type,
+                                      HYPRE_Int CRaddCpoints );
+HYPRE_Int hypre_cr ( HYPRE_Int *A_i, HYPRE_Int *A_j, HYPRE_Real *A_data, HYPRE_Int n, HYPRE_Int *cf,
+                     HYPRE_Int rlx, HYPRE_Real omega, HYPRE_Real tg, HYPRE_Int mu );
+HYPRE_Int hypre_GraphAdd ( Link *list, HYPRE_Int *head, HYPRE_Int *tail, HYPRE_Int index,
+                           HYPRE_Int istack );
+HYPRE_Int hypre_GraphRemove ( Link *list, HYPRE_Int *head, HYPRE_Int *tail, HYPRE_Int index );
+HYPRE_Int hypre_IndepSetGreedy ( HYPRE_Int *A_i, HYPRE_Int *A_j, HYPRE_Int n, HYPRE_Int *cf );
+HYPRE_Int hypre_IndepSetGreedyS ( HYPRE_Int *A_i, HYPRE_Int *A_j, HYPRE_Int n, HYPRE_Int *cf );
+HYPRE_Int hypre_fptjaccr ( HYPRE_Int *cf, HYPRE_Int *A_i, HYPRE_Int *A_j, HYPRE_Real *A_data,
+                           HYPRE_Int n, HYPRE_Real *e0, HYPRE_Real omega, HYPRE_Real *e1 );
+HYPRE_Int hypre_fptgscr ( HYPRE_Int *cf, HYPRE_Int *A_i, HYPRE_Int *A_j, HYPRE_Real *A_data,
+                          HYPRE_Int n, HYPRE_Real *e0, HYPRE_Real *e1 );
+HYPRE_Int hypre_formu ( HYPRE_Int *cf, HYPRE_Int n, HYPRE_Real *e1, HYPRE_Int *A_i,
+                        HYPRE_Real rho );
+HYPRE_Int hypre_BoomerAMGIndepRS ( hypre_ParCSRMatrix *S, HYPRE_Int measure_type,
+                                   HYPRE_Int debug_flag, HYPRE_Int *CF_marker );
+HYPRE_Int hypre_BoomerAMGIndepRSa ( hypre_ParCSRMatrix *S, HYPRE_Int measure_type,
+                                    HYPRE_Int debug_flag, HYPRE_Int *CF_marker );
+HYPRE_Int hypre_BoomerAMGIndepHMIS ( hypre_ParCSRMatrix *S, HYPRE_Int measure_type,
+                                     HYPRE_Int debug_flag, HYPRE_Int *CF_marker );
+HYPRE_Int hypre_BoomerAMGIndepHMISa ( hypre_ParCSRMatrix *S, HYPRE_Int measure_type,
+                                      HYPRE_Int debug_flag, HYPRE_Int *CF_marker );
+HYPRE_Int hypre_BoomerAMGIndepPMIS ( hypre_ParCSRMatrix *S, HYPRE_Int CF_init, HYPRE_Int debug_flag,
+                                     HYPRE_Int *CF_marker );
+HYPRE_Int hypre_BoomerAMGIndepPMISa ( hypre_ParCSRMatrix *S, HYPRE_Int CF_init,
+                                      HYPRE_Int debug_flag, HYPRE_Int *CF_marker );
+HYPRE_Int hypre_BoomerAMGCoarsenCR ( hypre_ParCSRMatrix *A, hypre_IntArray **CF_marker_ptr,
+                                     HYPRE_BigInt *coarse_size_ptr, HYPRE_Int num_CR_relax_steps, HYPRE_Int IS_type,
+                                     HYPRE_Int num_functions, HYPRE_Int rlx_type, HYPRE_Real relax_weight, HYPRE_Real omega,
+                                     HYPRE_Real theta, HYPRE_Solver smoother, hypre_ParCSRMatrix *AN, HYPRE_Int useCG,
+                                     hypre_ParCSRMatrix *S );
 
 /* par_cycle.c */
-HYPRE_Int hypre_BoomerAMGCycle ( void *amg_vdata , hypre_ParVector **F_array , hypre_ParVector **U_array );
+HYPRE_Int hypre_BoomerAMGCycle ( void *amg_vdata, hypre_ParVector **F_array,
+                                 hypre_ParVector **U_array );
 
 /* par_difconv.c */
-HYPRE_ParCSRMatrix GenerateDifConv ( MPI_Comm comm , HYPRE_BigInt nx , HYPRE_BigInt ny , HYPRE_BigInt nz , HYPRE_Int P , HYPRE_Int Q , HYPRE_Int R , HYPRE_Int p , HYPRE_Int q , HYPRE_Int r , HYPRE_Real *value );
+HYPRE_ParCSRMatrix GenerateDifConv ( MPI_Comm comm, HYPRE_BigInt nx, HYPRE_BigInt ny,
+                                     HYPRE_BigInt nz, HYPRE_Int P, HYPRE_Int Q, HYPRE_Int R, HYPRE_Int p, HYPRE_Int q, HYPRE_Int r,
+                                     HYPRE_Real *value );
 
 /* par_gsmg.c */
-HYPRE_Int hypre_ParCSRMatrixFillSmooth ( HYPRE_Int nsamples , HYPRE_Real *samples , hypre_ParCSRMatrix *S , hypre_ParCSRMatrix *A , HYPRE_Int num_functions , HYPRE_Int *dof_func );
+HYPRE_Int hypre_ParCSRMatrixFillSmooth ( HYPRE_Int nsamples, HYPRE_Real *samples,
+                                         hypre_ParCSRMatrix *S, hypre_ParCSRMatrix *A, HYPRE_Int num_functions, HYPRE_Int *dof_func );
 HYPRE_Real hypre_ParCSRMatrixChooseThresh ( hypre_ParCSRMatrix *S );
-HYPRE_Int hypre_ParCSRMatrixThreshold ( hypre_ParCSRMatrix *A , HYPRE_Real thresh );
-HYPRE_Int hypre_BoomerAMGCreateSmoothVecs ( void *data , hypre_ParCSRMatrix *A , HYPRE_Int num_sweeps , HYPRE_Int level , HYPRE_Real **SmoothVecs_p );
-HYPRE_Int hypre_BoomerAMGCreateSmoothDirs ( void *data , hypre_ParCSRMatrix *A , HYPRE_Real *SmoothVecs , HYPRE_Real thresh , HYPRE_Int num_functions , HYPRE_Int *dof_func , hypre_ParCSRMatrix **S_ptr );
-HYPRE_Int hypre_BoomerAMGNormalizeVecs ( HYPRE_Int n , HYPRE_Int num , HYPRE_Real *V );
-HYPRE_Int hypre_BoomerAMGFitVectors ( HYPRE_Int ip , HYPRE_Int n , HYPRE_Int num , const HYPRE_Real *V , HYPRE_Int nc , const HYPRE_Int *ind , HYPRE_Real *val );
-HYPRE_Int hypre_BoomerAMGBuildInterpLS ( hypre_ParCSRMatrix *A , HYPRE_Int *CF_marker , hypre_ParCSRMatrix *S , HYPRE_BigInt *num_cpts_global , HYPRE_Int num_functions , HYPRE_Int *dof_func , HYPRE_Int debug_flag , HYPRE_Real trunc_factor , HYPRE_Int num_smooth , HYPRE_Real *SmoothVecs , hypre_ParCSRMatrix **P_ptr );
-HYPRE_Int hypre_BoomerAMGBuildInterpGSMG ( hypre_ParCSRMatrix *A , HYPRE_Int *CF_marker , hypre_ParCSRMatrix *S , HYPRE_BigInt *num_cpts_global , HYPRE_Int num_functions , HYPRE_Int *dof_func , HYPRE_Int debug_flag , HYPRE_Real trunc_factor , hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_ParCSRMatrixThreshold ( hypre_ParCSRMatrix *A, HYPRE_Real thresh );
+HYPRE_Int hypre_BoomerAMGCreateSmoothVecs ( void *data, hypre_ParCSRMatrix *A, HYPRE_Int num_sweeps,
+                                            HYPRE_Int level, HYPRE_Real **SmoothVecs_p );
+HYPRE_Int hypre_BoomerAMGCreateSmoothDirs ( void *data, hypre_ParCSRMatrix *A,
+                                            HYPRE_Real *SmoothVecs, HYPRE_Real thresh, HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                            hypre_ParCSRMatrix **S_ptr );
+HYPRE_Int hypre_BoomerAMGNormalizeVecs ( HYPRE_Int n, HYPRE_Int num, HYPRE_Real *V );
+HYPRE_Int hypre_BoomerAMGFitVectors ( HYPRE_Int ip, HYPRE_Int n, HYPRE_Int num, const HYPRE_Real *V,
+                                      HYPRE_Int nc, const HYPRE_Int *ind, HYPRE_Real *val );
+HYPRE_Int hypre_BoomerAMGBuildInterpLS ( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                         hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                         HYPRE_Int debug_flag, HYPRE_Real trunc_factor, HYPRE_Int num_smooth, HYPRE_Real *SmoothVecs,
+                                         hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_BoomerAMGBuildInterpGSMG ( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                           hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                           HYPRE_Int debug_flag, HYPRE_Real trunc_factor, hypre_ParCSRMatrix **P_ptr );
 
 /* par_indepset.c */
-HYPRE_Int hypre_BoomerAMGIndepSetInit ( hypre_ParCSRMatrix *S , HYPRE_Real *measure_array , HYPRE_Int seq_rand );
-HYPRE_Int hypre_BoomerAMGIndepSet ( hypre_ParCSRMatrix *S , HYPRE_Real *measure_array , HYPRE_Int *graph_array , HYPRE_Int graph_array_size , HYPRE_Int *graph_array_offd , HYPRE_Int graph_array_offd_size , HYPRE_Int *IS_marker , HYPRE_Int *IS_marker_offd );
+HYPRE_Int hypre_BoomerAMGIndepSetInit ( hypre_ParCSRMatrix *S, HYPRE_Real *measure_array,
+                                        HYPRE_Int seq_rand );
+HYPRE_Int hypre_BoomerAMGIndepSet ( hypre_ParCSRMatrix *S, HYPRE_Real *measure_array,
+                                    HYPRE_Int *graph_array, HYPRE_Int graph_array_size, HYPRE_Int *graph_array_offd,
+                                    HYPRE_Int graph_array_offd_size, HYPRE_Int *IS_marker, HYPRE_Int *IS_marker_offd );
 
-HYPRE_Int hypre_BoomerAMGIndepSetInitDevice( hypre_ParCSRMatrix *S, HYPRE_Real *measure_array, HYPRE_Int aug_rand);
+HYPRE_Int hypre_BoomerAMGIndepSetInitDevice( hypre_ParCSRMatrix *S, HYPRE_Real *measure_array,
+                                             HYPRE_Int aug_rand);
 
-HYPRE_Int hypre_BoomerAMGIndepSetDevice( hypre_ParCSRMatrix *S, HYPRE_Real *measure_diag, HYPRE_Real *measure_offd, HYPRE_Int graph_diag_size, HYPRE_Int *graph_diag, HYPRE_Int *IS_marker_diag, HYPRE_Int *IS_marker_offd, hypre_ParCSRCommPkg *comm_pkg, HYPRE_Int *int_send_buf );
+HYPRE_Int hypre_BoomerAMGIndepSetDevice( hypre_ParCSRMatrix *S, HYPRE_Real *measure_diag,
+                                         HYPRE_Real *measure_offd, HYPRE_Int graph_diag_size, HYPRE_Int *graph_diag,
+                                         HYPRE_Int *IS_marker_diag, HYPRE_Int *IS_marker_offd, hypre_ParCSRCommPkg *comm_pkg,
+                                         HYPRE_Int *int_send_buf );
 
 /* par_interp.c */
-HYPRE_Int hypre_BoomerAMGBuildInterp ( hypre_ParCSRMatrix *A , HYPRE_Int *CF_marker , hypre_ParCSRMatrix *S , HYPRE_BigInt *num_cpts_global , HYPRE_Int num_functions , HYPRE_Int *dof_func , HYPRE_Int debug_flag , HYPRE_Real trunc_factor , HYPRE_Int max_elmts , hypre_ParCSRMatrix **P_ptr );
-HYPRE_Int hypre_BoomerAMGBuildInterpHE ( hypre_ParCSRMatrix *A , HYPRE_Int *CF_marker , hypre_ParCSRMatrix *S , HYPRE_BigInt *num_cpts_global , HYPRE_Int num_functions , HYPRE_Int *dof_func , HYPRE_Int debug_flag , HYPRE_Real trunc_factor , HYPRE_Int max_elmts , hypre_ParCSRMatrix **P_ptr );
-HYPRE_Int hypre_BoomerAMGBuildDirInterp ( hypre_ParCSRMatrix *A , HYPRE_Int *CF_marker , hypre_ParCSRMatrix *S , HYPRE_BigInt *num_cpts_global , HYPRE_Int num_functions , HYPRE_Int *dof_func , HYPRE_Int debug_flag , HYPRE_Real trunc_factor , HYPRE_Int max_elmts , HYPRE_Int interp_type, hypre_ParCSRMatrix **P_ptr );
-HYPRE_Int hypre_BoomerAMGBuildDirInterpDevice( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker , hypre_ParCSRMatrix *S , HYPRE_BigInt *num_cpts_global , HYPRE_Int num_functions , HYPRE_Int *dof_func , HYPRE_Int debug_flag , HYPRE_Real trunc_factor , HYPRE_Int max_elmts , HYPRE_Int interp_type, hypre_ParCSRMatrix **P_ptr );
-
-HYPRE_Int hypre_BoomerAMGInterpTruncation ( hypre_ParCSRMatrix *P, HYPRE_Real trunc_factor, HYPRE_Int max_elmts );
-HYPRE_Int hypre_BoomerAMGInterpTruncationDevice( hypre_ParCSRMatrix *P, HYPRE_Real trunc_factor, HYPRE_Int max_elmts );
-
-HYPRE_Int hypre_BoomerAMGBuildInterpModUnk ( hypre_ParCSRMatrix *A , HYPRE_Int *CF_marker , hypre_ParCSRMatrix *S , HYPRE_BigInt *num_cpts_global , HYPRE_Int num_functions , HYPRE_Int *dof_func , HYPRE_Int debug_flag , HYPRE_Real trunc_factor , HYPRE_Int max_elmts , hypre_ParCSRMatrix **P_ptr );
-HYPRE_Int hypre_BoomerAMGTruncandBuild ( hypre_ParCSRMatrix *P , HYPRE_Real trunc_factor , HYPRE_Int max_elmts );
-hypre_ParCSRMatrix *hypre_CreateC ( hypre_ParCSRMatrix *A , HYPRE_Real w );
-
-HYPRE_Int hypre_BoomerAMGBuildInterpOnePntHost( hypre_ParCSRMatrix  *A, HYPRE_Int *CF_marker, hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int debug_flag, hypre_ParCSRMatrix **P_ptr);
-HYPRE_Int hypre_BoomerAMGBuildInterpOnePntDevice( hypre_ParCSRMatrix  *A, HYPRE_Int *CF_marker, hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int debug_flag, hypre_ParCSRMatrix **P_ptr);
-HYPRE_Int hypre_BoomerAMGBuildInterpOnePnt( hypre_ParCSRMatrix  *A, HYPRE_Int *CF_marker, hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int debug_flag, hypre_ParCSRMatrix **P_ptr);
+HYPRE_Int hypre_BoomerAMGBuildInterp ( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                       hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                       HYPRE_Int debug_flag, HYPRE_Real trunc_factor, HYPRE_Int max_elmts, hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_BoomerAMGBuildInterpHE ( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                         hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                         HYPRE_Int debug_flag, HYPRE_Real trunc_factor, HYPRE_Int max_elmts, hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_BoomerAMGBuildDirInterp ( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                          hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                          HYPRE_Int debug_flag, HYPRE_Real trunc_factor, HYPRE_Int max_elmts, HYPRE_Int interp_type,
+                                          hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_BoomerAMGBuildDirInterpDevice( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                               hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                               HYPRE_Int debug_flag, HYPRE_Real trunc_factor, HYPRE_Int max_elmts, HYPRE_Int interp_type,
+                                               hypre_ParCSRMatrix **P_ptr );
+
+HYPRE_Int hypre_BoomerAMGInterpTruncation ( hypre_ParCSRMatrix *P, HYPRE_Real trunc_factor,
+                                            HYPRE_Int max_elmts );
+HYPRE_Int hypre_BoomerAMGInterpTruncationDevice( hypre_ParCSRMatrix *P, HYPRE_Real trunc_factor,
+                                                 HYPRE_Int max_elmts );
+
+HYPRE_Int hypre_BoomerAMGBuildInterpModUnk ( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                             hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                             HYPRE_Int debug_flag, HYPRE_Real trunc_factor, HYPRE_Int max_elmts, hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_BoomerAMGTruncandBuild ( hypre_ParCSRMatrix *P, HYPRE_Real trunc_factor,
+                                         HYPRE_Int max_elmts );
+hypre_ParCSRMatrix *hypre_CreateC ( hypre_ParCSRMatrix *A, HYPRE_Real w );
+
+HYPRE_Int hypre_BoomerAMGBuildInterpOnePntHost( hypre_ParCSRMatrix  *A, HYPRE_Int *CF_marker,
+                                                hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                                HYPRE_Int debug_flag, hypre_ParCSRMatrix **P_ptr);
+HYPRE_Int hypre_BoomerAMGBuildInterpOnePntDevice( hypre_ParCSRMatrix  *A, HYPRE_Int *CF_marker,
+                                                  hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                                  HYPRE_Int debug_flag, hypre_ParCSRMatrix **P_ptr);
+HYPRE_Int hypre_BoomerAMGBuildInterpOnePnt( hypre_ParCSRMatrix  *A, HYPRE_Int *CF_marker,
+                                            hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                            HYPRE_Int debug_flag, hypre_ParCSRMatrix **P_ptr);
 
 /* par_jacobi_interp.c */
-void hypre_BoomerAMGJacobiInterp ( hypre_ParCSRMatrix *A , hypre_ParCSRMatrix **P , hypre_ParCSRMatrix *S , HYPRE_Int num_functions , HYPRE_Int *dof_func , HYPRE_Int *CF_marker , HYPRE_Int level , HYPRE_Real truncation_threshold , HYPRE_Real truncation_threshold_minus );
-void hypre_BoomerAMGJacobiInterp_1 ( hypre_ParCSRMatrix *A , hypre_ParCSRMatrix **P , hypre_ParCSRMatrix *S , HYPRE_Int *CF_marker , HYPRE_Int level , HYPRE_Real truncation_threshold , HYPRE_Real truncation_threshold_minus , HYPRE_Int *dof_func , HYPRE_Int *dof_func_offd , HYPRE_Real weight_AF );
-void hypre_BoomerAMGTruncateInterp ( hypre_ParCSRMatrix *P , HYPRE_Real eps , HYPRE_Real dlt , HYPRE_Int *CF_marker );
-HYPRE_Int hypre_ParCSRMatrix_dof_func_offd ( hypre_ParCSRMatrix *A , HYPRE_Int num_functions , HYPRE_Int *dof_func , HYPRE_Int **dof_func_offd );
+void hypre_BoomerAMGJacobiInterp ( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix **P,
+                                   hypre_ParCSRMatrix *S, HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int *CF_marker,
+                                   HYPRE_Int level, HYPRE_Real truncation_threshold, HYPRE_Real truncation_threshold_minus );
+void hypre_BoomerAMGJacobiInterp_1 ( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix **P,
+                                     hypre_ParCSRMatrix *S, HYPRE_Int *CF_marker, HYPRE_Int level, HYPRE_Real truncation_threshold,
+                                     HYPRE_Real truncation_threshold_minus, HYPRE_Int *dof_func, HYPRE_Int *dof_func_offd,
+                                     HYPRE_Real weight_AF );
+void hypre_BoomerAMGTruncateInterp ( hypre_ParCSRMatrix *P, HYPRE_Real eps, HYPRE_Real dlt,
+                                     HYPRE_Int *CF_marker );
+HYPRE_Int hypre_ParCSRMatrix_dof_func_offd ( hypre_ParCSRMatrix *A, HYPRE_Int num_functions,
+                                             HYPRE_Int *dof_func, HYPRE_Int **dof_func_offd );
 
 /* par_laplace_27pt.c */
-HYPRE_ParCSRMatrix GenerateLaplacian27pt ( MPI_Comm comm , HYPRE_BigInt nx , HYPRE_BigInt ny , HYPRE_BigInt nz , HYPRE_Int P , HYPRE_Int Q , HYPRE_Int R , HYPRE_Int p , HYPRE_Int q , HYPRE_Int r , HYPRE_Real *value );
-HYPRE_Int hypre_map3 ( HYPRE_BigInt ix , HYPRE_BigInt iy , HYPRE_BigInt iz , HYPRE_Int p , HYPRE_Int q , HYPRE_Int r , HYPRE_Int P , HYPRE_Int Q , HYPRE_Int R , HYPRE_BigInt *nx_part , HYPRE_BigInt *ny_part , HYPRE_BigInt *nz_part );
+HYPRE_ParCSRMatrix GenerateLaplacian27pt ( MPI_Comm comm, HYPRE_BigInt nx, HYPRE_BigInt ny,
+                                           HYPRE_BigInt nz, HYPRE_Int P, HYPRE_Int Q, HYPRE_Int R, HYPRE_Int p, HYPRE_Int q, HYPRE_Int r,
+                                           HYPRE_Real *value );
+HYPRE_Int hypre_map3 ( HYPRE_BigInt ix, HYPRE_BigInt iy, HYPRE_BigInt iz, HYPRE_Int p, HYPRE_Int q,
+                       HYPRE_Int r, HYPRE_Int P, HYPRE_Int Q, HYPRE_Int R, HYPRE_BigInt *nx_part, HYPRE_BigInt *ny_part,
+                       HYPRE_BigInt *nz_part );
 
 /* par_laplace_9pt.c */
-HYPRE_ParCSRMatrix GenerateLaplacian9pt ( MPI_Comm comm , HYPRE_BigInt nx , HYPRE_BigInt ny , HYPRE_Int P , HYPRE_Int Q , HYPRE_Int p , HYPRE_Int q , HYPRE_Real *value );
-HYPRE_BigInt hypre_map2 ( HYPRE_BigInt ix , HYPRE_BigInt iy , HYPRE_Int p , HYPRE_Int q , HYPRE_BigInt nx , HYPRE_BigInt *nx_part , HYPRE_BigInt *ny_part );
+HYPRE_ParCSRMatrix GenerateLaplacian9pt ( MPI_Comm comm, HYPRE_BigInt nx, HYPRE_BigInt ny,
+                                          HYPRE_Int P, HYPRE_Int Q, HYPRE_Int p, HYPRE_Int q, HYPRE_Real *value );
+HYPRE_BigInt hypre_map2 ( HYPRE_BigInt ix, HYPRE_BigInt iy, HYPRE_Int p, HYPRE_Int q,
+                          HYPRE_BigInt nx, HYPRE_BigInt *nx_part, HYPRE_BigInt *ny_part );
 
 /* par_laplace.c */
-HYPRE_ParCSRMatrix GenerateLaplacian ( MPI_Comm comm , HYPRE_BigInt ix , HYPRE_BigInt ny , HYPRE_BigInt nz , HYPRE_Int P , HYPRE_Int Q , HYPRE_Int R , HYPRE_Int p , HYPRE_Int q , HYPRE_Int r , HYPRE_Real *value );
-HYPRE_BigInt hypre_map ( HYPRE_BigInt ix , HYPRE_BigInt iy , HYPRE_BigInt iz , HYPRE_Int p, HYPRE_Int q, HYPRE_Int r, HYPRE_BigInt nx , HYPRE_BigInt ny, HYPRE_BigInt *nx_part, HYPRE_BigInt *ny_part, HYPRE_BigInt *nz_part );
-HYPRE_ParCSRMatrix GenerateSysLaplacian ( MPI_Comm comm , HYPRE_BigInt nx , HYPRE_BigInt ny , HYPRE_BigInt nz , HYPRE_Int P , HYPRE_Int Q , HYPRE_Int R , HYPRE_Int p , HYPRE_Int q , HYPRE_Int r , HYPRE_Int num_fun , HYPRE_Real *mtrx , HYPRE_Real *value );
-HYPRE_ParCSRMatrix GenerateSysLaplacianVCoef ( MPI_Comm comm , HYPRE_BigInt nx , HYPRE_BigInt ny , HYPRE_BigInt nz , HYPRE_Int P , HYPRE_Int Q , HYPRE_Int R , HYPRE_Int p , HYPRE_Int q , HYPRE_Int r , HYPRE_Int num_fun , HYPRE_Real *mtrx , HYPRE_Real *value );
+HYPRE_ParCSRMatrix GenerateLaplacian ( MPI_Comm comm, HYPRE_BigInt ix, HYPRE_BigInt ny,
+                                       HYPRE_BigInt nz, HYPRE_Int P, HYPRE_Int Q, HYPRE_Int R, HYPRE_Int p, HYPRE_Int q, HYPRE_Int r,
+                                       HYPRE_Real *value );
+HYPRE_BigInt hypre_map ( HYPRE_BigInt ix, HYPRE_BigInt iy, HYPRE_BigInt iz, HYPRE_Int p,
+                         HYPRE_Int q, HYPRE_Int r, HYPRE_BigInt nx, HYPRE_BigInt ny, HYPRE_BigInt *nx_part,
+                         HYPRE_BigInt *ny_part, HYPRE_BigInt *nz_part );
+HYPRE_ParCSRMatrix GenerateSysLaplacian ( MPI_Comm comm, HYPRE_BigInt nx, HYPRE_BigInt ny,
+                                          HYPRE_BigInt nz, HYPRE_Int P, HYPRE_Int Q, HYPRE_Int R, HYPRE_Int p, HYPRE_Int q, HYPRE_Int r,
+                                          HYPRE_Int num_fun, HYPRE_Real *mtrx, HYPRE_Real *value );
+HYPRE_ParCSRMatrix GenerateSysLaplacianVCoef ( MPI_Comm comm, HYPRE_BigInt nx, HYPRE_BigInt ny,
+                                               HYPRE_BigInt nz, HYPRE_Int P, HYPRE_Int Q, HYPRE_Int R, HYPRE_Int p, HYPRE_Int q, HYPRE_Int r,
+                                               HYPRE_Int num_fun, HYPRE_Real *mtrx, HYPRE_Real *value );
 
 /* par_lr_interp.c */
-HYPRE_Int hypre_BoomerAMGBuildStdInterp ( hypre_ParCSRMatrix *A , HYPRE_Int *CF_marker , hypre_ParCSRMatrix *S , HYPRE_BigInt *num_cpts_global , HYPRE_Int num_functions , HYPRE_Int *dof_func , HYPRE_Int debug_flag , HYPRE_Real trunc_factor , HYPRE_Int max_elmts , HYPRE_Int sep_weight , hypre_ParCSRMatrix **P_ptr );
-HYPRE_Int hypre_BoomerAMGBuildExtPIInterp ( hypre_ParCSRMatrix *A , HYPRE_Int *CF_marker , hypre_ParCSRMatrix *S , HYPRE_BigInt *num_cpts_global , HYPRE_Int num_functions , HYPRE_Int *dof_func , HYPRE_Int debug_flag , HYPRE_Real trunc_factor , HYPRE_Int max_elmts , hypre_ParCSRMatrix **P_ptr );
-HYPRE_Int hypre_BoomerAMGBuildExtPIInterpHost ( hypre_ParCSRMatrix *A , HYPRE_Int *CF_marker , hypre_ParCSRMatrix *S , HYPRE_BigInt *num_cpts_global , HYPRE_Int num_functions , HYPRE_Int *dof_func , HYPRE_Int debug_flag , HYPRE_Real trunc_factor , HYPRE_Int max_elmts , hypre_ParCSRMatrix **P_ptr );
-HYPRE_Int hypre_BoomerAMGBuildExtPICCInterp ( hypre_ParCSRMatrix *A , HYPRE_Int *CF_marker , hypre_ParCSRMatrix *S , HYPRE_BigInt *num_cpts_global , HYPRE_Int num_functions , HYPRE_Int *dof_func , HYPRE_Int debug_flag , HYPRE_Real trunc_factor , HYPRE_Int max_elmts , hypre_ParCSRMatrix **P_ptr );
-HYPRE_Int hypre_BoomerAMGBuildFFInterp ( hypre_ParCSRMatrix *A , HYPRE_Int *CF_marker , hypre_ParCSRMatrix *S , HYPRE_BigInt *num_cpts_global , HYPRE_Int num_functions , HYPRE_Int *dof_func , HYPRE_Int debug_flag , HYPRE_Real trunc_factor , HYPRE_Int max_elmts , hypre_ParCSRMatrix **P_ptr );
-HYPRE_Int hypre_BoomerAMGBuildFF1Interp ( hypre_ParCSRMatrix *A , HYPRE_Int *CF_marker , hypre_ParCSRMatrix *S , HYPRE_BigInt *num_cpts_global , HYPRE_Int num_functions , HYPRE_Int *dof_func , HYPRE_Int debug_flag , HYPRE_Real trunc_factor , HYPRE_Int max_elmts , hypre_ParCSRMatrix **P_ptr );
-HYPRE_Int hypre_BoomerAMGBuildExtInterp ( hypre_ParCSRMatrix *A , HYPRE_Int *CF_marker , hypre_ParCSRMatrix *S , HYPRE_BigInt *num_cpts_global , HYPRE_Int num_functions , HYPRE_Int *dof_func , HYPRE_Int debug_flag , HYPRE_Real trunc_factor , HYPRE_Int max_elmts , hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypreDevice_extendWtoP ( HYPRE_Int P_nr_of_rows, HYPRE_Int W_nr_of_rows,
+                                   HYPRE_Int W_nr_of_cols, HYPRE_Int *CF_marker,
+                                   HYPRE_Int  W_diag_nnz, HYPRE_Int *W_diag_i,
+                                   HYPRE_Int *W_diag_j, HYPRE_Complex *W_diag_data,
+                                   HYPRE_Int *P_diag_i, HYPRE_Int *P_diag_j,
+                                   HYPRE_Complex *P_diag_data, HYPRE_Int *W_offd_i,
+                                   HYPRE_Int *P_offd_i );
+HYPRE_Int hypre_BoomerAMGBuildStdInterp ( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                          hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global,
+                                          HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                          HYPRE_Int debug_flag, HYPRE_Real trunc_factor,
+                                          HYPRE_Int max_elmts, HYPRE_Int sep_weight,
+                                          hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_BoomerAMGBuildExtPIInterp ( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                            hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global,
+                                            HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                            HYPRE_Int debug_flag, HYPRE_Real trunc_factor,
+                                            HYPRE_Int max_elmts, hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_BoomerAMGBuildExtPIInterpHost ( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                                hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global,
+                                                HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                                HYPRE_Int debug_flag, HYPRE_Real trunc_factor,
+                                                HYPRE_Int max_elmts, hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_BoomerAMGBuildExtPICCInterp ( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                              hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global,
+                                              HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                              HYPRE_Int debug_flag, HYPRE_Real trunc_factor,
+                                              HYPRE_Int max_elmts, hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_BoomerAMGBuildFFInterp ( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                         hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global,
+                                         HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                         HYPRE_Int debug_flag, HYPRE_Real trunc_factor,
+                                         HYPRE_Int max_elmts, hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_BoomerAMGBuildFF1Interp ( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                          hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global,
+                                          HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                          HYPRE_Int debug_flag, HYPRE_Real trunc_factor,
+                                          HYPRE_Int max_elmts, hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_BoomerAMGBuildExtInterp ( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                          hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global,
+                                          HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                          HYPRE_Int debug_flag, HYPRE_Real trunc_factor,
+                                          HYPRE_Int max_elmts, hypre_ParCSRMatrix **P_ptr );
 
 /* par_lr_interp_device.c */
-HYPRE_Int hypre_BoomerAMGBuildExtInterpDevice(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker, hypre_ParCSRMatrix   *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int debug_flag, HYPRE_Real trunc_factor, HYPRE_Int max_elmts, hypre_ParCSRMatrix  **P_ptr);
-HYPRE_Int hypre_BoomerAMGBuildExtPIInterpDevice( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker, hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int debug_flag, HYPRE_Real trunc_factor, HYPRE_Int max_elmts, hypre_ParCSRMatrix **P_ptr);
-HYPRE_Int hypre_BoomerAMGBuildExtPEInterpDevice(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker, hypre_ParCSRMatrix   *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int debug_flag, HYPRE_Real trunc_factor, HYPRE_Int max_elmts, hypre_ParCSRMatrix  **P_ptr);
+HYPRE_Int hypre_BoomerAMGBuildExtInterpDevice(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                              hypre_ParCSRMatrix   *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions,
+                                              HYPRE_Int *dof_func, HYPRE_Int debug_flag, HYPRE_Real trunc_factor, HYPRE_Int max_elmts,
+                                              hypre_ParCSRMatrix  **P_ptr);
+HYPRE_Int hypre_BoomerAMGBuildExtPIInterpDevice( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                                 hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                                 HYPRE_Int debug_flag, HYPRE_Real trunc_factor, HYPRE_Int max_elmts, hypre_ParCSRMatrix **P_ptr);
+HYPRE_Int hypre_BoomerAMGBuildExtPEInterpDevice(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                                hypre_ParCSRMatrix   *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions,
+                                                HYPRE_Int *dof_func, HYPRE_Int debug_flag, HYPRE_Real trunc_factor, HYPRE_Int max_elmts,
+                                                hypre_ParCSRMatrix  **P_ptr);
 
 /* par_mod_lr_interp.c */
-HYPRE_Int hypre_BoomerAMGBuildModExtInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker, hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int debug_flag, HYPRE_Real trunc_factor, HYPRE_Int max_elmts, hypre_ParCSRMatrix  **P_ptr);
-HYPRE_Int hypre_BoomerAMGBuildModExtPIInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker, hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int debug_flag, HYPRE_Real trunc_factor, HYPRE_Int max_elmts, hypre_ParCSRMatrix  **P_ptr);
-HYPRE_Int hypre_BoomerAMGBuildModExtPEInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker, hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int debug_flag, HYPRE_Real trunc_factor, HYPRE_Int max_elmts, hypre_ParCSRMatrix **P_ptr);
+HYPRE_Int hypre_BoomerAMGBuildModExtInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                           hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                           HYPRE_Int debug_flag, HYPRE_Real trunc_factor, HYPRE_Int max_elmts, hypre_ParCSRMatrix  **P_ptr);
+HYPRE_Int hypre_BoomerAMGBuildModExtPIInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                             hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                             HYPRE_Int debug_flag, HYPRE_Real trunc_factor, HYPRE_Int max_elmts, hypre_ParCSRMatrix  **P_ptr);
+HYPRE_Int hypre_BoomerAMGBuildModExtPEInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                             hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                             HYPRE_Int debug_flag, HYPRE_Real trunc_factor, HYPRE_Int max_elmts, hypre_ParCSRMatrix **P_ptr);
 
 /* par_2s_interp.c */
-HYPRE_Int hypre_BoomerAMGBuildModPartialExtInterpHost ( hypre_ParCSRMatrix *A , HYPRE_Int *CF_marker , hypre_ParCSRMatrix *S , HYPRE_BigInt *num_cpts_global , HYPRE_BigInt *num_old_cpts_global , HYPRE_Int num_functions , HYPRE_Int *dof_func , HYPRE_Int debug_flag , HYPRE_Real trunc_factor , HYPRE_Int max_elmts , hypre_ParCSRMatrix **P_ptr );
-HYPRE_Int hypre_BoomerAMGBuildModPartialExtInterpDevice ( hypre_ParCSRMatrix *A , HYPRE_Int *CF_marker , hypre_ParCSRMatrix *S , HYPRE_BigInt *num_cpts_global , HYPRE_BigInt *num_old_cpts_global , HYPRE_Int debug_flag , HYPRE_Real trunc_factor , HYPRE_Int max_elmts , hypre_ParCSRMatrix **P_ptr );
-HYPRE_Int hypre_BoomerAMGBuildModPartialExtInterp ( hypre_ParCSRMatrix *A , HYPRE_Int *CF_marker , hypre_ParCSRMatrix *S , HYPRE_BigInt *num_cpts_global , HYPRE_BigInt *num_old_cpts_global , HYPRE_Int num_functions , HYPRE_Int *dof_func , HYPRE_Int debug_flag , HYPRE_Real trunc_factor , HYPRE_Int max_elmts , hypre_ParCSRMatrix **P_ptr );
-HYPRE_Int hypre_BoomerAMGBuildModPartialExtPEInterpHost ( hypre_ParCSRMatrix *A , HYPRE_Int *CF_marker , hypre_ParCSRMatrix *S , HYPRE_BigInt *num_cpts_global , HYPRE_BigInt *num_old_cpts_global , HYPRE_Int num_functions , HYPRE_Int *dof_func , HYPRE_Int debug_flag , HYPRE_Real trunc_factor , HYPRE_Int max_elmts , hypre_ParCSRMatrix **P_ptr );
-HYPRE_Int hypre_BoomerAMGBuildModPartialExtPEInterpDevice ( hypre_ParCSRMatrix *A , HYPRE_Int *CF_marker , hypre_ParCSRMatrix *S , HYPRE_BigInt *num_cpts_global , HYPRE_BigInt *num_old_cpts_global , HYPRE_Int debug_flag , HYPRE_Real trunc_factor , HYPRE_Int max_elmts , hypre_ParCSRMatrix **P_ptr );
-HYPRE_Int hypre_BoomerAMGBuildModPartialExtPEInterp ( hypre_ParCSRMatrix *A , HYPRE_Int *CF_marker , hypre_ParCSRMatrix *S , HYPRE_BigInt *num_cpts_global , HYPRE_BigInt *num_old_cpts_global , HYPRE_Int num_functions , HYPRE_Int *dof_func , HYPRE_Int debug_flag , HYPRE_Real trunc_factor , HYPRE_Int max_elmts , hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_BoomerAMGBuildModPartialExtInterpHost ( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                                        hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_BigInt *num_old_cpts_global,
+                                                        HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int debug_flag, HYPRE_Real trunc_factor,
+                                                        HYPRE_Int max_elmts, hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_BoomerAMGBuildModPartialExtInterpDevice ( hypre_ParCSRMatrix *A,
+                                                          HYPRE_Int *CF_marker, hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global,
+                                                          HYPRE_BigInt *num_old_cpts_global, HYPRE_Int debug_flag, HYPRE_Real trunc_factor,
+                                                          HYPRE_Int max_elmts, hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_BoomerAMGBuildModPartialExtInterp ( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                                    hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_BigInt *num_old_cpts_global,
+                                                    HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int debug_flag, HYPRE_Real trunc_factor,
+                                                    HYPRE_Int max_elmts, hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_BoomerAMGBuildModPartialExtPEInterpHost ( hypre_ParCSRMatrix *A,
+                                                          HYPRE_Int *CF_marker, hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global,
+                                                          HYPRE_BigInt *num_old_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                                          HYPRE_Int debug_flag, HYPRE_Real trunc_factor, HYPRE_Int max_elmts, hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_BoomerAMGBuildModPartialExtPEInterpDevice ( hypre_ParCSRMatrix *A,
+                                                            HYPRE_Int *CF_marker, hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global,
+                                                            HYPRE_BigInt *num_old_cpts_global, HYPRE_Int debug_flag, HYPRE_Real trunc_factor,
+                                                            HYPRE_Int max_elmts, hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_BoomerAMGBuildModPartialExtPEInterp ( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                                      hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_BigInt *num_old_cpts_global,
+                                                      HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int debug_flag, HYPRE_Real trunc_factor,
+                                                      HYPRE_Int max_elmts, hypre_ParCSRMatrix **P_ptr );
+
+/* par_mod_multi_interp.c */
+HYPRE_Int hypre_BoomerAMGBuildModMultipass ( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                             hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Real trunc_factor,
+                                             HYPRE_Int P_max_elmts, HYPRE_Int interp_type, HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                             hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_BoomerAMGBuildModMultipassHost ( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                                 hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Real trunc_factor,
+                                                 HYPRE_Int P_max_elmts, HYPRE_Int interp_type, HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                                 hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_GenerateMultipassPi ( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *S,
+                                      HYPRE_BigInt *c_pts_starts, HYPRE_Int *pass_order, HYPRE_Int *pass_marker,
+                                      HYPRE_Int *pass_marker_offd, HYPRE_Int num_points, HYPRE_Int color, HYPRE_Real *row_sums,
+                                      hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_GenerateMultiPi ( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *S,
+                                  hypre_ParCSRMatrix *P, HYPRE_BigInt *c_pts_starts, HYPRE_Int *pass_order, HYPRE_Int *pass_marker,
+                                  HYPRE_Int *pass_marker_offd, HYPRE_Int num_points, HYPRE_Int color, HYPRE_Int num_functions,
+                                  HYPRE_Int *dof_func, HYPRE_Int *dof_func_offd, hypre_ParCSRMatrix **Pi_ptr );
+HYPRE_Int hypre_BoomerAMGBuildModMultipassDevice ( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                                   hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Real trunc_factor,
+                                                   HYPRE_Int P_max_elmts, HYPRE_Int interp_type, HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                                   hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_GenerateMultipassPiDevice ( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *S,
+                                            HYPRE_BigInt *c_pts_starts, HYPRE_Int *pass_order, HYPRE_Int *pass_marker,
+                                            HYPRE_Int *pass_marker_offd, HYPRE_Int num_points, HYPRE_Int color, HYPRE_Real *row_sums,
+                                            hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_GenerateMultiPiDevice ( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *S,
+                                        hypre_ParCSRMatrix *P, HYPRE_BigInt *c_pts_starts, HYPRE_Int *pass_order, HYPRE_Int *pass_marker,
+                                        HYPRE_Int *pass_marker_offd, HYPRE_Int num_points, HYPRE_Int color, HYPRE_Int num_functions,
+                                        HYPRE_Int *dof_func, HYPRE_Int *dof_func_offd, hypre_ParCSRMatrix **Pi_ptr );
 
 /* par_multi_interp.c */
-HYPRE_Int hypre_BoomerAMGBuildMultipass ( hypre_ParCSRMatrix *A , HYPRE_Int *CF_marker , hypre_ParCSRMatrix *S , HYPRE_BigInt *num_cpts_global , HYPRE_Int num_functions , HYPRE_Int *dof_func , HYPRE_Int debug_flag , HYPRE_Real trunc_factor , HYPRE_Int P_max_elmts , HYPRE_Int weight_option , hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_BoomerAMGBuildMultipass ( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                          hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                          HYPRE_Int debug_flag, HYPRE_Real trunc_factor, HYPRE_Int P_max_elmts, HYPRE_Int weight_option,
+                                          hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_BoomerAMGBuildMultipassHost ( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                              hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                              HYPRE_Int debug_flag, HYPRE_Real trunc_factor, HYPRE_Int P_max_elmts, HYPRE_Int weight_option,
+                                              hypre_ParCSRMatrix **P_ptr );
 
 /* par_nodal_systems.c */
-HYPRE_Int hypre_BoomerAMGCreateNodalA ( hypre_ParCSRMatrix *A , HYPRE_Int num_functions , HYPRE_Int *dof_func , HYPRE_Int option , HYPRE_Int diag_option , hypre_ParCSRMatrix **AN_ptr );
-HYPRE_Int hypre_BoomerAMGCreateScalarCFS ( hypre_ParCSRMatrix *SN , hypre_ParCSRMatrix *A , HYPRE_Int *CFN_marker , HYPRE_Int num_functions , HYPRE_Int nodal , HYPRE_Int keep_same_sign , hypre_IntArray **dof_func_ptr , hypre_IntArray **CF_marker_ptr , hypre_ParCSRMatrix **S_ptr );
-HYPRE_Int hypre_BoomerAMGCreateScalarCF ( HYPRE_Int *CFN_marker , HYPRE_Int num_functions , HYPRE_Int num_nodes , hypre_IntArray **dof_func_ptr , hypre_IntArray **CF_marker_ptr );
+HYPRE_Int hypre_BoomerAMGCreateNodalA ( hypre_ParCSRMatrix *A, HYPRE_Int num_functions,
+                                        HYPRE_Int *dof_func, HYPRE_Int option, HYPRE_Int diag_option, hypre_ParCSRMatrix **AN_ptr );
+HYPRE_Int hypre_BoomerAMGCreateScalarCFS ( hypre_ParCSRMatrix *SN, hypre_ParCSRMatrix *A,
+                                           HYPRE_Int *CFN_marker, HYPRE_Int num_functions, HYPRE_Int nodal, HYPRE_Int keep_same_sign,
+                                           hypre_IntArray **dof_func_ptr, hypre_IntArray **CF_marker_ptr, hypre_ParCSRMatrix **S_ptr );
+HYPRE_Int hypre_BoomerAMGCreateScalarCF ( HYPRE_Int *CFN_marker, HYPRE_Int num_functions,
+                                          HYPRE_Int num_nodes, hypre_IntArray **dof_func_ptr, hypre_IntArray **CF_marker_ptr );
 
 /* par_nongalerkin.c */
-HYPRE_Int hypre_GrabSubArray ( HYPRE_Int *indices , HYPRE_Int start , HYPRE_Int end , HYPRE_BigInt *array , HYPRE_BigInt *output );
-HYPRE_Int hypre_IntersectTwoArrays ( HYPRE_Int *x , HYPRE_Real *x_data , HYPRE_Int x_length , HYPRE_Int *y , HYPRE_Int y_length , HYPRE_Int *z , HYPRE_Real *output_x_data , HYPRE_Int *intersect_length );
-HYPRE_Int hypre_IntersectTwoBigArrays ( HYPRE_BigInt *x , HYPRE_Real *x_data , HYPRE_Int x_length , HYPRE_BigInt *y , HYPRE_Int y_length , HYPRE_BigInt *z , HYPRE_Real *output_x_data , HYPRE_Int *intersect_length );
-HYPRE_Int hypre_SortedCopyParCSRData ( hypre_ParCSRMatrix *A , hypre_ParCSRMatrix *B );
-HYPRE_Int hypre_BoomerAMG_MyCreateS ( hypre_ParCSRMatrix *A , HYPRE_Real strength_threshold , HYPRE_Real max_row_sum , HYPRE_Int num_functions , HYPRE_Int *dof_func , hypre_ParCSRMatrix **S_ptr );
-HYPRE_Int hypre_BoomerAMGCreateSFromCFMarker(hypre_ParCSRMatrix    *A, HYPRE_Real strength_threshold, HYPRE_Real max_row_sum, HYPRE_Int *CF_marker, HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int SMRK, hypre_ParCSRMatrix    **S_ptr);
-HYPRE_Int hypre_NonGalerkinIJBufferInit ( HYPRE_Int *ijbuf_cnt , HYPRE_Int *ijbuf_rowcounter , HYPRE_Int *ijbuf_numcols );
-HYPRE_Int hypre_NonGalerkinIJBigBufferInit ( HYPRE_Int *ijbuf_cnt , HYPRE_Int *ijbuf_rowcounter , HYPRE_BigInt *ijbuf_numcols );
-HYPRE_Int hypre_NonGalerkinIJBufferNewRow ( HYPRE_BigInt *ijbuf_rownums , HYPRE_Int *ijbuf_numcols , HYPRE_Int *ijbuf_rowcounter , HYPRE_BigInt new_row );
-HYPRE_Int hypre_NonGalerkinIJBufferCompressRow ( HYPRE_Int *ijbuf_cnt , HYPRE_Int ijbuf_rowcounter , HYPRE_Real *ijbuf_data , HYPRE_BigInt *ijbuf_cols , HYPRE_BigInt *ijbuf_rownums , HYPRE_Int *ijbuf_numcols );
-HYPRE_Int hypre_NonGalerkinIJBufferCompress ( HYPRE_Int ijbuf_size , HYPRE_Int *ijbuf_cnt , HYPRE_Int *ijbuf_rowcounter , HYPRE_Real **ijbuf_data , HYPRE_BigInt **ijbuf_cols , HYPRE_BigInt **ijbuf_rownums , HYPRE_Int **ijbuf_numcols );
-HYPRE_Int hypre_NonGalerkinIJBufferWrite ( HYPRE_IJMatrix B , HYPRE_Int *ijbuf_cnt , HYPRE_Int ijbuf_size , HYPRE_Int *ijbuf_rowcounter , HYPRE_Real **ijbuf_data , HYPRE_BigInt **ijbuf_cols , HYPRE_BigInt **ijbuf_rownums , HYPRE_Int **ijbuf_numcols , HYPRE_BigInt row_to_write , HYPRE_BigInt col_to_write , HYPRE_Real val_to_write );
-HYPRE_Int hypre_NonGalerkinIJBufferEmpty ( HYPRE_IJMatrix B , HYPRE_Int ijbuf_size , HYPRE_Int *ijbuf_cnt , HYPRE_Int ijbuf_rowcounter , HYPRE_Real **ijbuf_data , HYPRE_BigInt **ijbuf_cols , HYPRE_BigInt **ijbuf_rownums , HYPRE_Int **ijbuf_numcols );
-hypre_ParCSRMatrix * hypre_NonGalerkinSparsityPattern(hypre_ParCSRMatrix *R_IAP, hypre_ParCSRMatrix *RAP, HYPRE_Int * CF_marker, HYPRE_Real droptol, HYPRE_Int sym_collapse, HYPRE_Int collapse_beta );
-HYPRE_Int hypre_BoomerAMGBuildNonGalerkinCoarseOperator( hypre_ParCSRMatrix **RAP_ptr, hypre_ParCSRMatrix *AP, HYPRE_Real strong_threshold, HYPRE_Real max_row_sum, HYPRE_Int num_functions, HYPRE_Int * dof_func_value, HYPRE_Int * CF_marker, HYPRE_Real droptol, HYPRE_Int sym_collapse, HYPRE_Real lump_percent, HYPRE_Int collapse_beta );
+HYPRE_Int hypre_GrabSubArray ( HYPRE_Int *indices, HYPRE_Int start, HYPRE_Int end,
+                               HYPRE_BigInt *array, HYPRE_BigInt *output );
+HYPRE_Int hypre_IntersectTwoArrays ( HYPRE_Int *x, HYPRE_Real *x_data, HYPRE_Int x_length,
+                                     HYPRE_Int *y, HYPRE_Int y_length, HYPRE_Int *z, HYPRE_Real *output_x_data,
+                                     HYPRE_Int *intersect_length );
+HYPRE_Int hypre_IntersectTwoBigArrays ( HYPRE_BigInt *x, HYPRE_Real *x_data, HYPRE_Int x_length,
+                                        HYPRE_BigInt *y, HYPRE_Int y_length, HYPRE_BigInt *z, HYPRE_Real *output_x_data,
+                                        HYPRE_Int *intersect_length );
+HYPRE_Int hypre_SortedCopyParCSRData ( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *B );
+HYPRE_Int hypre_BoomerAMG_MyCreateS ( hypre_ParCSRMatrix *A, HYPRE_Real strength_threshold,
+                                      HYPRE_Real max_row_sum, HYPRE_Int num_functions, HYPRE_Int *dof_func, hypre_ParCSRMatrix **S_ptr );
+HYPRE_Int hypre_BoomerAMGCreateSFromCFMarker(hypre_ParCSRMatrix    *A,
+                                             HYPRE_Real strength_threshold, HYPRE_Real max_row_sum, HYPRE_Int *CF_marker,
+                                             HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int SMRK, hypre_ParCSRMatrix    **S_ptr);
+HYPRE_Int hypre_NonGalerkinIJBufferInit ( HYPRE_Int *ijbuf_cnt, HYPRE_Int *ijbuf_rowcounter,
+                                          HYPRE_Int *ijbuf_numcols );
+HYPRE_Int hypre_NonGalerkinIJBigBufferInit ( HYPRE_Int *ijbuf_cnt, HYPRE_Int *ijbuf_rowcounter,
+                                             HYPRE_BigInt *ijbuf_numcols );
+HYPRE_Int hypre_NonGalerkinIJBufferNewRow ( HYPRE_BigInt *ijbuf_rownums, HYPRE_Int *ijbuf_numcols,
+                                            HYPRE_Int *ijbuf_rowcounter, HYPRE_BigInt new_row );
+HYPRE_Int hypre_NonGalerkinIJBufferCompressRow ( HYPRE_Int *ijbuf_cnt, HYPRE_Int ijbuf_rowcounter,
+                                                 HYPRE_Real *ijbuf_data, HYPRE_BigInt *ijbuf_cols, HYPRE_BigInt *ijbuf_rownums,
+                                                 HYPRE_Int *ijbuf_numcols );
+HYPRE_Int hypre_NonGalerkinIJBufferCompress ( HYPRE_MemoryLocation memory_location,
+                                              HYPRE_Int ijbuf_size, HYPRE_Int *ijbuf_cnt,
+                                              HYPRE_Int *ijbuf_rowcounter, HYPRE_Real **ijbuf_data, HYPRE_BigInt **ijbuf_cols,
+                                              HYPRE_BigInt **ijbuf_rownums, HYPRE_Int **ijbuf_numcols );
+HYPRE_Int hypre_NonGalerkinIJBufferWrite ( HYPRE_IJMatrix B, HYPRE_Int *ijbuf_cnt,
+                                           HYPRE_Int ijbuf_size, HYPRE_Int *ijbuf_rowcounter, HYPRE_Real **ijbuf_data,
+                                           HYPRE_BigInt **ijbuf_cols, HYPRE_BigInt **ijbuf_rownums, HYPRE_Int **ijbuf_numcols,
+                                           HYPRE_BigInt row_to_write, HYPRE_BigInt col_to_write, HYPRE_Real val_to_write );
+HYPRE_Int hypre_NonGalerkinIJBufferEmpty ( HYPRE_IJMatrix B, HYPRE_Int ijbuf_size,
+                                           HYPRE_Int *ijbuf_cnt, HYPRE_Int ijbuf_rowcounter, HYPRE_Real **ijbuf_data,
+                                           HYPRE_BigInt **ijbuf_cols, HYPRE_BigInt **ijbuf_rownums, HYPRE_Int **ijbuf_numcols );
+hypre_ParCSRMatrix * hypre_NonGalerkinSparsityPattern(hypre_ParCSRMatrix *R_IAP,
+                                                      hypre_ParCSRMatrix *RAP, HYPRE_Int * CF_marker, HYPRE_Real droptol, HYPRE_Int sym_collapse,
+                                                      HYPRE_Int collapse_beta );
+HYPRE_Int hypre_BoomerAMGBuildNonGalerkinCoarseOperator( hypre_ParCSRMatrix **RAP_ptr,
+                                                         hypre_ParCSRMatrix *AP, HYPRE_Real strong_threshold, HYPRE_Real max_row_sum,
+                                                         HYPRE_Int num_functions, HYPRE_Int * dof_func_value, HYPRE_Int * CF_marker, HYPRE_Real droptol,
+                                                         HYPRE_Int sym_collapse, HYPRE_Real lump_percent, HYPRE_Int collapse_beta );
 
 /* par_rap.c */
-HYPRE_Int hypre_BoomerAMGBuildCoarseOperator ( hypre_ParCSRMatrix *RT , hypre_ParCSRMatrix *A , hypre_ParCSRMatrix *P , hypre_ParCSRMatrix **RAP_ptr );
-HYPRE_Int hypre_BoomerAMGBuildCoarseOperatorKT ( hypre_ParCSRMatrix *RT , hypre_ParCSRMatrix *A , hypre_ParCSRMatrix *P , HYPRE_Int keepTranspose, hypre_ParCSRMatrix **RAP_ptr );
+HYPRE_Int hypre_BoomerAMGBuildCoarseOperator ( hypre_ParCSRMatrix *RT, hypre_ParCSRMatrix *A,
+                                               hypre_ParCSRMatrix *P, hypre_ParCSRMatrix **RAP_ptr );
+HYPRE_Int hypre_BoomerAMGBuildCoarseOperatorKT ( hypre_ParCSRMatrix *RT, hypre_ParCSRMatrix *A,
+                                                 hypre_ParCSRMatrix *P, HYPRE_Int keepTranspose, hypre_ParCSRMatrix **RAP_ptr );
 
 /* par_rap_communication.c */
-HYPRE_Int hypre_GetCommPkgRTFromCommPkgA ( hypre_ParCSRMatrix *RT , hypre_ParCSRMatrix *A , HYPRE_Int *fine_to_coarse, HYPRE_Int *tmp_map_offd );
-HYPRE_Int hypre_GenerateSendMapAndCommPkg ( MPI_Comm comm , HYPRE_Int num_sends , HYPRE_Int num_recvs , HYPRE_Int *recv_procs , HYPRE_Int *send_procs , HYPRE_Int *recv_vec_starts , hypre_ParCSRMatrix *A );
+HYPRE_Int hypre_GetCommPkgRTFromCommPkgA ( hypre_ParCSRMatrix *RT, hypre_ParCSRMatrix *A,
+                                           HYPRE_Int *fine_to_coarse, HYPRE_Int *tmp_map_offd );
+HYPRE_Int hypre_GenerateSendMapAndCommPkg ( MPI_Comm comm, HYPRE_Int num_sends, HYPRE_Int num_recvs,
+                                            HYPRE_Int *recv_procs, HYPRE_Int *send_procs, HYPRE_Int *recv_vec_starts, hypre_ParCSRMatrix *A );
+
+/* par_ge_device.c */
+HYPRE_Int hypre_GaussElimSetupDevice ( hypre_ParAMGData *amg_data, HYPRE_Int level,
+                                       HYPRE_Int solver_type );
+HYPRE_Int hypre_GaussElimSolveDevice ( hypre_ParAMGData *amg_data, HYPRE_Int level,
+                                       HYPRE_Int solver_type );
+
+/* par_gauss_elim.c */
+HYPRE_Int hypre_GaussElimSetup ( hypre_ParAMGData *amg_data, HYPRE_Int level,
+                                 HYPRE_Int solver_type );
+HYPRE_Int hypre_GaussElimSolve ( hypre_ParAMGData *amg_data, HYPRE_Int level,
+                                 HYPRE_Int solver_type );
 
 /* par_relax.c */
-HYPRE_Int hypre_BoomerAMGRelax ( hypre_ParCSRMatrix *A , hypre_ParVector *f , HYPRE_Int *cf_marker , HYPRE_Int relax_type , HYPRE_Int relax_points , HYPRE_Real relax_weight , HYPRE_Real omega , HYPRE_Real *l1_norms , hypre_ParVector *u , hypre_ParVector *Vtemp , hypre_ParVector *Ztemp );
-HYPRE_Int hypre_GaussElimSetup ( hypre_ParAMGData *amg_data , HYPRE_Int level , HYPRE_Int relax_type );
-HYPRE_Int hypre_GaussElimSolve ( hypre_ParAMGData *amg_data , HYPRE_Int level , HYPRE_Int relax_type );
-HYPRE_Int hypre_BoomerAMGRelaxHybridGaussSeidel_core( hypre_ParCSRMatrix *A, hypre_ParVector *f, HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, HYPRE_Real omega, HYPRE_Real *l1_norms, hypre_ParVector *u, hypre_ParVector *Vtemp, hypre_ParVector *Ztemp, HYPRE_Int GS_order, HYPRE_Int Symm, HYPRE_Int Skip_diag, HYPRE_Int forced_seq, HYPRE_Int Topo_order );
-HYPRE_Int hypre_BoomerAMGRelax0WeightedJacobi( hypre_ParCSRMatrix *A, hypre_ParVector *f, HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, hypre_ParVector *u, hypre_ParVector *Vtemp );
-
-HYPRE_Int hypre_BoomerAMGRelax1GaussSeidel( hypre_ParCSRMatrix *A, hypre_ParVector *f, HYPRE_Int *cf_marker, HYPRE_Int relax_points, hypre_ParVector *u );
-
-HYPRE_Int hypre_BoomerAMGRelax2GaussSeidel( hypre_ParCSRMatrix *A, hypre_ParVector *f, HYPRE_Int *cf_marker, HYPRE_Int relax_points, hypre_ParVector *u );
-
-HYPRE_Int hypre_BoomerAMGRelax5ChaoticHybridGaussSeidel( hypre_ParCSRMatrix *A, hypre_ParVector *f, HYPRE_Int *cf_marker, HYPRE_Int relax_points, hypre_ParVector *u );
-
-HYPRE_Int hypre_BoomerAMGRelax3HybridGaussSeidel( hypre_ParCSRMatrix *A, hypre_ParVector *f, HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, HYPRE_Real omega, hypre_ParVector *u, hypre_ParVector *Vtemp, hypre_ParVector *Ztemp );
-
-HYPRE_Int hypre_BoomerAMGRelax4HybridGaussSeidel( hypre_ParCSRMatrix *A, hypre_ParVector *f, HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, HYPRE_Real omega, hypre_ParVector *u, hypre_ParVector *Vtemp, hypre_ParVector *Ztemp );
-
-HYPRE_Int hypre_BoomerAMGRelax6HybridSSOR( hypre_ParCSRMatrix *A, hypre_ParVector *f, HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, HYPRE_Real omega, hypre_ParVector *u, hypre_ParVector *Vtemp, hypre_ParVector *Ztemp );
-
-HYPRE_Int hypre_BoomerAMGRelax7Jacobi( hypre_ParCSRMatrix *A, hypre_ParVector *f, HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, HYPRE_Real *l1_norms, hypre_ParVector *u, hypre_ParVector *Vtemp );
-
-HYPRE_Int hypre_BoomerAMGRelax8HybridL1SSOR( hypre_ParCSRMatrix *A, hypre_ParVector *f, HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, HYPRE_Real omega, HYPRE_Real *l1_norms, hypre_ParVector *u, hypre_ParVector *Vtemp, hypre_ParVector *Ztemp );
-
-HYPRE_Int hypre_BoomerAMGRelax10TopoOrderedGaussSeidel( hypre_ParCSRMatrix *A, hypre_ParVector *f, HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, HYPRE_Real omega, hypre_ParVector *u, hypre_ParVector *Vtemp, hypre_ParVector *Ztemp );
-
-HYPRE_Int hypre_BoomerAMGRelax13HybridL1GaussSeidel( hypre_ParCSRMatrix *A, hypre_ParVector *f, HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, HYPRE_Real omega, HYPRE_Real *l1_norms, hypre_ParVector *u, hypre_ParVector *Vtemp, hypre_ParVector *Ztemp );
-
-HYPRE_Int hypre_BoomerAMGRelax14HybridL1GaussSeidel( hypre_ParCSRMatrix *A, hypre_ParVector *f, HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, HYPRE_Real omega, HYPRE_Real *l1_norms, hypre_ParVector *u, hypre_ParVector *Vtemp, hypre_ParVector *Ztemp );
-
-HYPRE_Int hypre_BoomerAMGRelax18WeightedL1Jacobi( hypre_ParCSRMatrix *A, hypre_ParVector *f, HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, HYPRE_Real *l1_norms, hypre_ParVector *u, hypre_ParVector *Vtemp );
-
-HYPRE_Int hypre_BoomerAMGRelax19GaussElim( hypre_ParCSRMatrix *A, hypre_ParVector *f, hypre_ParVector *u );
-
-HYPRE_Int hypre_BoomerAMGRelax98GaussElimPivot( hypre_ParCSRMatrix *A, hypre_ParVector *f, hypre_ParVector *u );
-
-HYPRE_Int hypre_BoomerAMGRelaxKaczmarz( hypre_ParCSRMatrix *A, hypre_ParVector *f, HYPRE_Real omega, HYPRE_Real *l1_norms, hypre_ParVector *u );
-
-HYPRE_Int hypre_BoomerAMGRelaxTwoStageGaussSeidelDevice ( hypre_ParCSRMatrix *A, hypre_ParVector *f, HYPRE_Real relax_weight, HYPRE_Real omega, hypre_ParVector *u, hypre_ParVector *r, hypre_ParVector *z, HYPRE_Int choice);
-
-HYPRE_Int hypre_BoomerAMGRelaxTwoStageGaussSeidel( hypre_ParCSRMatrix *A, hypre_ParVector *f, HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, HYPRE_Real omega, hypre_ParVector *u, hypre_ParVector *Vtemp, hypre_ParVector *Ztemp, HYPRE_Int num_inner_iters );
-
-HYPRE_Int hypre_BoomerAMGRelax11TwoStageGaussSeidel( hypre_ParCSRMatrix *A, hypre_ParVector *f, HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, HYPRE_Real omega, hypre_ParVector *u, hypre_ParVector *Vtemp, hypre_ParVector *Ztemp );
-
-HYPRE_Int hypre_BoomerAMGRelax12TwoStageGaussSeidel( hypre_ParCSRMatrix *A, hypre_ParVector *f, HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, HYPRE_Real omega, hypre_ParVector *u, hypre_ParVector *Vtemp, hypre_ParVector *Ztemp );
-
-/* par_realx_device.c */
-HYPRE_Int hypre_BoomerAMGRelaxHybridGaussSeidelDevice( hypre_ParCSRMatrix *A, hypre_ParVector *f, HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, HYPRE_Real omega, HYPRE_Real *l1_norms, hypre_ParVector *u, hypre_ParVector *Vtemp, hypre_ParVector *Ztemp, HYPRE_Int GS_order, HYPRE_Int Symm );
+HYPRE_Int hypre_BoomerAMGRelax ( hypre_ParCSRMatrix *A, hypre_ParVector *f, HYPRE_Int *cf_marker,
+                                 HYPRE_Int relax_type, HYPRE_Int relax_points, HYPRE_Real relax_weight, HYPRE_Real omega,
+                                 HYPRE_Real *l1_norms, hypre_ParVector *u, hypre_ParVector *Vtemp, hypre_ParVector *Ztemp );
+HYPRE_Int hypre_BoomerAMGRelaxHybridGaussSeidel_core( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                                      HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, HYPRE_Real omega,
+                                                      HYPRE_Real *l1_norms, hypre_ParVector *u, hypre_ParVector *Vtemp, hypre_ParVector *Ztemp,
+                                                      HYPRE_Int GS_order, HYPRE_Int Symm, HYPRE_Int Skip_diag, HYPRE_Int forced_seq,
+                                                      HYPRE_Int Topo_order );
+HYPRE_Int hypre_BoomerAMGRelax0WeightedJacobi( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                               HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, hypre_ParVector *u,
+                                               hypre_ParVector *Vtemp );
+
+HYPRE_Int hypre_BoomerAMGRelaxHybridSOR( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                         HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, HYPRE_Real omega,
+                                         HYPRE_Real *l1_norms, hypre_ParVector *u, hypre_ParVector *Vtemp, hypre_ParVector *Ztemp,
+                                         HYPRE_Int direction, HYPRE_Int symm, HYPRE_Int skip_diag, HYPRE_Int force_seq );
+
+HYPRE_Int hypre_BoomerAMGRelax1GaussSeidel( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                            HYPRE_Int *cf_marker, HYPRE_Int relax_points, hypre_ParVector *u );
+
+HYPRE_Int hypre_BoomerAMGRelax2GaussSeidel( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                            HYPRE_Int *cf_marker, HYPRE_Int relax_points, hypre_ParVector *u );
+
+HYPRE_Int hypre_BoomerAMGRelax5ChaoticHybridGaussSeidel( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                                         HYPRE_Int *cf_marker, HYPRE_Int relax_points, hypre_ParVector *u );
+
+HYPRE_Int hypre_BoomerAMGRelax3HybridGaussSeidel( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                                  HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, HYPRE_Real omega,
+                                                  hypre_ParVector *u, hypre_ParVector *Vtemp, hypre_ParVector *Ztemp );
+
+HYPRE_Int hypre_BoomerAMGRelax4HybridGaussSeidel( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                                  HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, HYPRE_Real omega,
+                                                  hypre_ParVector *u, hypre_ParVector *Vtemp, hypre_ParVector *Ztemp );
+
+HYPRE_Int hypre_BoomerAMGRelax6HybridSSOR( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                           HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, HYPRE_Real omega,
+                                           hypre_ParVector *u, hypre_ParVector *Vtemp, hypre_ParVector *Ztemp );
+
+HYPRE_Int hypre_BoomerAMGRelax7Jacobi( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                       HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, HYPRE_Real *l1_norms,
+                                       hypre_ParVector *u, hypre_ParVector *Vtemp );
+
+HYPRE_Int hypre_BoomerAMGRelax8HybridL1SSOR( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                             HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, HYPRE_Real omega,
+                                             HYPRE_Real *l1_norms, hypre_ParVector *u, hypre_ParVector *Vtemp, hypre_ParVector *Ztemp );
+
+HYPRE_Int hypre_BoomerAMGRelax10TopoOrderedGaussSeidel( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                                        HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, HYPRE_Real omega,
+                                                        hypre_ParVector *u, hypre_ParVector *Vtemp, hypre_ParVector *Ztemp );
+
+HYPRE_Int hypre_BoomerAMGRelax13HybridL1GaussSeidel( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                                     HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, HYPRE_Real omega,
+                                                     HYPRE_Real *l1_norms, hypre_ParVector *u, hypre_ParVector *Vtemp, hypre_ParVector *Ztemp );
+
+HYPRE_Int hypre_BoomerAMGRelax14HybridL1GaussSeidel( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                                     HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, HYPRE_Real omega,
+                                                     HYPRE_Real *l1_norms, hypre_ParVector *u, hypre_ParVector *Vtemp, hypre_ParVector *Ztemp );
+
+HYPRE_Int hypre_BoomerAMGRelax88HybridL1SSOR( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                              HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, HYPRE_Real omega,
+                                              HYPRE_Real *l1_norms, hypre_ParVector *u, hypre_ParVector *Vtemp, hypre_ParVector *Ztemp );
+
+HYPRE_Int hypre_BoomerAMGRelax89HybridL1SSOR( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                              HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, HYPRE_Real omega,
+                                              HYPRE_Real *l1_norms, hypre_ParVector *u, hypre_ParVector *Vtemp, hypre_ParVector *Ztemp );
+
+HYPRE_Int hypre_BoomerAMGRelax18WeightedL1Jacobi( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                                  HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, HYPRE_Real *l1_norms,
+                                                  hypre_ParVector *u, hypre_ParVector *Vtemp );
+
+HYPRE_Int hypre_BoomerAMGRelaxKaczmarz( hypre_ParCSRMatrix *A, hypre_ParVector *f, HYPRE_Real omega,
+                                        HYPRE_Real *l1_norms, hypre_ParVector *u );
+
+HYPRE_Int hypre_BoomerAMGRelaxTwoStageGaussSeidelDevice ( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                                          HYPRE_Real relax_weight, HYPRE_Real omega,
+                                                          HYPRE_Real *A_diag_diag, hypre_ParVector *u,
+                                                          hypre_ParVector *r, hypre_ParVector *z,
+                                                          HYPRE_Int choice );
+
+HYPRE_Int hypre_BoomerAMGRelax11TwoStageGaussSeidel( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                                     HYPRE_Int *cf_marker, HYPRE_Int relax_points,
+                                                     HYPRE_Real relax_weight, HYPRE_Real omega,
+                                                     HYPRE_Real *A_diag_diag, hypre_ParVector *u,
+                                                     hypre_ParVector *Vtemp, hypre_ParVector *Ztemp );
+
+HYPRE_Int hypre_BoomerAMGRelax12TwoStageGaussSeidel( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                                     HYPRE_Int *cf_marker, HYPRE_Int relax_points,
+                                                     HYPRE_Real relax_weight, HYPRE_Real omega,
+                                                     HYPRE_Real *A_diag_diag, hypre_ParVector *u,
+                                                     hypre_ParVector *Vtemp, hypre_ParVector *Ztemp );
+
+HYPRE_Int hypre_BoomerAMGRelaxComputeL1Norms( hypre_ParCSRMatrix *A, HYPRE_Int relax_type,
+                                              HYPRE_Int relax_order, HYPRE_Int coarsest_lvl,
+                                              hypre_IntArray *CF_marker,
+                                              HYPRE_Real **l1_norms_data_ptr );
+
+/* par_relax_device.c */
+HYPRE_Int hypre_BoomerAMGRelaxHybridGaussSeidelDevice( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                                       HYPRE_Int *cf_marker, HYPRE_Int relax_points,
+                                                       HYPRE_Real relax_weight, HYPRE_Real omega,
+                                                       HYPRE_Real *l1_norms, hypre_ParVector *u,
+                                                       hypre_ParVector *Vtemp, hypre_ParVector *Ztemp,
+                                                       HYPRE_Int GS_order, HYPRE_Int Symm );
 
 /* par_relax_interface.c */
-HYPRE_Int hypre_BoomerAMGRelaxIF ( hypre_ParCSRMatrix *A , hypre_ParVector *f , HYPRE_Int *cf_marker , HYPRE_Int relax_type , HYPRE_Int relax_order , HYPRE_Int cycle_type , HYPRE_Real relax_weight , HYPRE_Real omega , HYPRE_Real *l1_norms , hypre_ParVector *u , hypre_ParVector *Vtemp , hypre_ParVector *Ztemp );
+HYPRE_Int hypre_BoomerAMGRelaxIF ( hypre_ParCSRMatrix *A, hypre_ParVector *f, HYPRE_Int *cf_marker,
+                                   HYPRE_Int relax_type, HYPRE_Int relax_order, HYPRE_Int cycle_type, HYPRE_Real relax_weight,
+                                   HYPRE_Real omega, HYPRE_Real *l1_norms, hypre_ParVector *u, hypre_ParVector *Vtemp,
+                                   hypre_ParVector *Ztemp );
 
 /* par_relax_more.c */
-HYPRE_Int hypre_ParCSRMaxEigEstimate ( hypre_ParCSRMatrix *A , HYPRE_Int scale , HYPRE_Real *max_eig, HYPRE_Real *min_eig );
-HYPRE_Int hypre_ParCSRMaxEigEstimateHost ( hypre_ParCSRMatrix *A , HYPRE_Int scale , HYPRE_Real *max_eig, HYPRE_Real *min_eig );
-HYPRE_Int hypre_ParCSRMaxEigEstimateCG ( hypre_ParCSRMatrix *A , HYPRE_Int scale , HYPRE_Int max_iter , HYPRE_Real *max_eig , HYPRE_Real *min_eig );
-HYPRE_Int hypre_ParCSRMaxEigEstimateCGHost ( hypre_ParCSRMatrix *A , HYPRE_Int scale , HYPRE_Int max_iter , HYPRE_Real *max_eig , HYPRE_Real *min_eig );
-HYPRE_Int hypre_ParCSRRelax_Cheby ( hypre_ParCSRMatrix *A , hypre_ParVector *f , HYPRE_Real max_eig , HYPRE_Real min_eig , HYPRE_Real fraction , HYPRE_Int order , HYPRE_Int scale , HYPRE_Int variant , hypre_ParVector *u , hypre_ParVector *v , hypre_ParVector *r );
-HYPRE_Int hypre_BoomerAMGRelax_FCFJacobi ( hypre_ParCSRMatrix *A , hypre_ParVector *f , HYPRE_Int *cf_marker , HYPRE_Real relax_weight , hypre_ParVector *u , hypre_ParVector *Vtemp );
-HYPRE_Int hypre_ParCSRRelax_CG ( HYPRE_Solver solver , hypre_ParCSRMatrix *A , hypre_ParVector *f , hypre_ParVector *u , HYPRE_Int num_its );
-HYPRE_Int hypre_LINPACKcgtql1 ( HYPRE_Int *n , HYPRE_Real *d , HYPRE_Real *e , HYPRE_Int *ierr );
-HYPRE_Real hypre_LINPACKcgpthy ( HYPRE_Real *a , HYPRE_Real *b );
-HYPRE_Int hypre_ParCSRRelax_L1_Jacobi ( hypre_ParCSRMatrix *A , hypre_ParVector *f , HYPRE_Int *cf_marker , HYPRE_Int relax_points , HYPRE_Real relax_weight , HYPRE_Real *l1_norms , hypre_ParVector *u , hypre_ParVector *Vtemp );
-HYPRE_Int hypre_LINPACKcgtql1(HYPRE_Int*,HYPRE_Real *,HYPRE_Real *,HYPRE_Int *);
+HYPRE_Int hypre_ParCSRMaxEigEstimate ( hypre_ParCSRMatrix *A, HYPRE_Int scale, HYPRE_Real *max_eig,
+                                       HYPRE_Real *min_eig );
+HYPRE_Int hypre_ParCSRMaxEigEstimateHost ( hypre_ParCSRMatrix *A, HYPRE_Int scale,
+                                           HYPRE_Real *max_eig, HYPRE_Real *min_eig );
+HYPRE_Int hypre_ParCSRMaxEigEstimateCG ( hypre_ParCSRMatrix *A, HYPRE_Int scale, HYPRE_Int max_iter,
+                                         HYPRE_Real *max_eig, HYPRE_Real *min_eig );
+HYPRE_Int hypre_ParCSRMaxEigEstimateCGHost ( hypre_ParCSRMatrix *A, HYPRE_Int scale,
+                                             HYPRE_Int max_iter, HYPRE_Real *max_eig, HYPRE_Real *min_eig );
+HYPRE_Int hypre_ParCSRRelax_Cheby ( hypre_ParCSRMatrix *A, hypre_ParVector *f, HYPRE_Real max_eig,
+                                    HYPRE_Real min_eig, HYPRE_Real fraction, HYPRE_Int order, HYPRE_Int scale, HYPRE_Int variant,
+                                    hypre_ParVector *u, hypre_ParVector *v, hypre_ParVector *r );
+HYPRE_Int hypre_BoomerAMGRelax_FCFJacobi ( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                           HYPRE_Int *cf_marker, HYPRE_Real relax_weight,
+                                           hypre_ParVector *u, hypre_ParVector *Vtemp );
+HYPRE_Int hypre_ParCSRRelax_CG ( HYPRE_Solver solver, hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                 hypre_ParVector *u, HYPRE_Int num_its );
+HYPRE_Int hypre_LINPACKcgtql1 ( HYPRE_Int *n, HYPRE_Real *d, HYPRE_Real *e, HYPRE_Int *ierr );
+HYPRE_Real hypre_LINPACKcgpthy ( HYPRE_Real *a, HYPRE_Real *b );
+HYPRE_Int hypre_ParCSRRelax_L1_Jacobi ( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                        HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, HYPRE_Real *l1_norms,
+                                        hypre_ParVector *u, hypre_ParVector *Vtemp );
+HYPRE_Int hypre_LINPACKcgtql1(HYPRE_Int*, HYPRE_Real *, HYPRE_Real *, HYPRE_Int *);
 HYPRE_Real hypre_LINPACKcgpthy(HYPRE_Real*, HYPRE_Real*);
 
 /* par_relax_more_device.c */
-HYPRE_Int hypre_ParCSRMaxEigEstimateDevice ( hypre_ParCSRMatrix *A , HYPRE_Int scale , HYPRE_Real *max_eig , HYPRE_Real *min_eig );
-HYPRE_Int hypre_ParCSRMaxEigEstimateCGDevice ( hypre_ParCSRMatrix *A , HYPRE_Int scale , HYPRE_Int max_iter , HYPRE_Real *max_eig , HYPRE_Real *min_eig );
+HYPRE_Int hypre_ParCSRMaxEigEstimateDevice ( hypre_ParCSRMatrix *A, HYPRE_Int scale,
+                                             HYPRE_Real *max_eig, HYPRE_Real *min_eig );
+HYPRE_Int hypre_ParCSRMaxEigEstimateCGDevice ( hypre_ParCSRMatrix *A, HYPRE_Int scale,
+                                               HYPRE_Int max_iter, HYPRE_Real *max_eig, HYPRE_Real *min_eig );
 
 /* par_rotate_7pt.c */
-HYPRE_ParCSRMatrix GenerateRotate7pt ( MPI_Comm comm , HYPRE_BigInt nx , HYPRE_BigInt ny , HYPRE_Int P , HYPRE_Int Q , HYPRE_Int p , HYPRE_Int q , HYPRE_Real alpha , HYPRE_Real eps );
+HYPRE_ParCSRMatrix GenerateRotate7pt ( MPI_Comm comm, HYPRE_BigInt nx, HYPRE_BigInt ny, HYPRE_Int P,
+                                       HYPRE_Int Q, HYPRE_Int p, HYPRE_Int q, HYPRE_Real alpha, HYPRE_Real eps );
 
 /* par_scaled_matnorm.c */
-HYPRE_Int hypre_ParCSRMatrixScaledNorm ( hypre_ParCSRMatrix *A , HYPRE_Real *scnorm );
+HYPRE_Int hypre_ParCSRMatrixScaledNorm ( hypre_ParCSRMatrix *A, HYPRE_Real *scnorm );
 
 /* par_schwarz.c */
 void *hypre_SchwarzCreate ( void );
 HYPRE_Int hypre_SchwarzDestroy ( void *data );
-HYPRE_Int hypre_SchwarzSetup ( void *schwarz_vdata , hypre_ParCSRMatrix *A , hypre_ParVector *f , hypre_ParVector *u );
-HYPRE_Int hypre_SchwarzSolve ( void *schwarz_vdata , hypre_ParCSRMatrix *A , hypre_ParVector *f , hypre_ParVector *u );
-HYPRE_Int hypre_SchwarzCFSolve ( void *schwarz_vdata , hypre_ParCSRMatrix *A , hypre_ParVector *f , hypre_ParVector *u , HYPRE_Int *CF_marker , HYPRE_Int rlx_pt );
-HYPRE_Int hypre_SchwarzSetVariant ( void *data , HYPRE_Int variant );
-HYPRE_Int hypre_SchwarzSetDomainType ( void *data , HYPRE_Int domain_type );
-HYPRE_Int hypre_SchwarzSetOverlap ( void *data , HYPRE_Int overlap );
-HYPRE_Int hypre_SchwarzSetNumFunctions ( void *data , HYPRE_Int num_functions );
-HYPRE_Int hypre_SchwarzSetNonSymm ( void *data , HYPRE_Int value );
-HYPRE_Int hypre_SchwarzSetRelaxWeight ( void *data , HYPRE_Real relax_weight );
-HYPRE_Int hypre_SchwarzSetDomainStructure ( void *data , hypre_CSRMatrix *domain_structure );
-HYPRE_Int hypre_SchwarzSetScale ( void *data , HYPRE_Real *scale );
-HYPRE_Int hypre_SchwarzReScale ( void *data , HYPRE_Int size , HYPRE_Real value );
-HYPRE_Int hypre_SchwarzSetDofFunc ( void *data , HYPRE_Int *dof_func );
+HYPRE_Int hypre_SchwarzSetup ( void *schwarz_vdata, hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                               hypre_ParVector *u );
+HYPRE_Int hypre_SchwarzSolve ( void *schwarz_vdata, hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                               hypre_ParVector *u );
+HYPRE_Int hypre_SchwarzCFSolve ( void *schwarz_vdata, hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                 hypre_ParVector *u, HYPRE_Int *CF_marker, HYPRE_Int rlx_pt );
+HYPRE_Int hypre_SchwarzSetVariant ( void *data, HYPRE_Int variant );
+HYPRE_Int hypre_SchwarzSetDomainType ( void *data, HYPRE_Int domain_type );
+HYPRE_Int hypre_SchwarzSetOverlap ( void *data, HYPRE_Int overlap );
+HYPRE_Int hypre_SchwarzSetNumFunctions ( void *data, HYPRE_Int num_functions );
+HYPRE_Int hypre_SchwarzSetNonSymm ( void *data, HYPRE_Int value );
+HYPRE_Int hypre_SchwarzSetRelaxWeight ( void *data, HYPRE_Real relax_weight );
+HYPRE_Int hypre_SchwarzSetDomainStructure ( void *data, hypre_CSRMatrix *domain_structure );
+HYPRE_Int hypre_SchwarzSetScale ( void *data, HYPRE_Real *scale );
+HYPRE_Int hypre_SchwarzReScale ( void *data, HYPRE_Int size, HYPRE_Real value );
+HYPRE_Int hypre_SchwarzSetDofFunc ( void *data, HYPRE_Int *dof_func );
 
 /* par_stats.c */
-HYPRE_Int hypre_BoomerAMGSetupStats ( void *amg_vdata , hypre_ParCSRMatrix *A );
+HYPRE_Int hypre_BoomerAMGSetupStats ( void *amg_vdata, hypre_ParCSRMatrix *A );
 HYPRE_Int hypre_BoomerAMGWriteSolverParams ( void *data );
+const char* hypre_BoomerAMGGetProlongationName( hypre_ParAMGData *amg_data );
+const char* hypre_BoomerAMGGetAggProlongationName( hypre_ParAMGData *amg_data );
+const char* hypre_BoomerAMGGetCoarseningName( hypre_ParAMGData *amg_data );
+const char* hypre_BoomerAMGGetCycleName( hypre_ParAMGData *amg_data );
+HYPRE_Int hypre_BoomerAMGPrintGeneralInfo( hypre_ParAMGData *amg_data, HYPRE_Int shift );
 
 /* par_strength.c */
-HYPRE_Int hypre_BoomerAMGCreateS ( hypre_ParCSRMatrix *A , HYPRE_Real strength_threshold , HYPRE_Real max_row_sum , HYPRE_Int num_functions , HYPRE_Int *dof_func , hypre_ParCSRMatrix **S_ptr );
-HYPRE_Int hypre_BoomerAMGCreateSabs ( hypre_ParCSRMatrix *A , HYPRE_Real strength_threshold , HYPRE_Real max_row_sum , HYPRE_Int num_functions , HYPRE_Int *dof_func , hypre_ParCSRMatrix **S_ptr );
-HYPRE_Int hypre_BoomerAMGCreateSCommPkg ( hypre_ParCSRMatrix *A , hypre_ParCSRMatrix *S , HYPRE_Int **col_offd_S_to_A_ptr );
-HYPRE_Int hypre_BoomerAMGCreate2ndS ( hypre_ParCSRMatrix *S , HYPRE_Int *CF_marker , HYPRE_Int num_paths , HYPRE_BigInt *coarse_row_starts , hypre_ParCSRMatrix **C_ptr );
-HYPRE_Int hypre_BoomerAMGCorrectCFMarker ( hypre_IntArray *CF_marker , hypre_IntArray *new_CF_marker );
-HYPRE_Int hypre_BoomerAMGCorrectCFMarkerHost ( hypre_IntArray *CF_marker , hypre_IntArray *new_CF_marker );
-HYPRE_Int hypre_BoomerAMGCorrectCFMarkerDevice ( hypre_IntArray *CF_marker , hypre_IntArray *new_CF_marker );
-HYPRE_Int hypre_BoomerAMGCorrectCFMarker2 ( hypre_IntArray *CF_marker , hypre_IntArray *new_CF_marker );
-HYPRE_Int hypre_BoomerAMGCorrectCFMarker2Host ( hypre_IntArray *CF_marker , hypre_IntArray *new_CF_marker );
-HYPRE_Int hypre_BoomerAMGCorrectCFMarker2Device ( hypre_IntArray *CF_marker , hypre_IntArray *new_CF_marker );
-HYPRE_Int hypre_BoomerAMGCreateSHost(hypre_ParCSRMatrix *A, HYPRE_Real strength_threshold, HYPRE_Real max_row_sum, HYPRE_Int num_functions, HYPRE_Int *dof_func, hypre_ParCSRMatrix **S_ptr);
-HYPRE_Int hypre_BoomerAMGCreateSDevice(hypre_ParCSRMatrix *A, HYPRE_Int abs_soc, HYPRE_Real strength_threshold, HYPRE_Real max_row_sum, HYPRE_Int num_functions, HYPRE_Int *dof_func, hypre_ParCSRMatrix **S_ptr);
-HYPRE_Int hypre_BoomerAMGCreateSabsHost ( hypre_ParCSRMatrix *A , HYPRE_Real strength_threshold , HYPRE_Real max_row_sum , HYPRE_Int num_functions , HYPRE_Int *dof_func , hypre_ParCSRMatrix **S_ptr );
-HYPRE_Int hypre_BoomerAMGCreate2ndSDevice( hypre_ParCSRMatrix *S, HYPRE_Int *CF_marker, HYPRE_Int num_paths, HYPRE_BigInt *coarse_row_starts, hypre_ParCSRMatrix **C_ptr);
+HYPRE_Int hypre_BoomerAMGCreateS ( hypre_ParCSRMatrix *A, HYPRE_Real strength_threshold,
+                                   HYPRE_Real max_row_sum, HYPRE_Int num_functions, HYPRE_Int *dof_func, hypre_ParCSRMatrix **S_ptr );
+HYPRE_Int hypre_BoomerAMGCreateSabs ( hypre_ParCSRMatrix *A, HYPRE_Real strength_threshold,
+                                      HYPRE_Real max_row_sum, HYPRE_Int num_functions, HYPRE_Int *dof_func, hypre_ParCSRMatrix **S_ptr );
+HYPRE_Int hypre_BoomerAMGCreateSCommPkg ( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *S,
+                                          HYPRE_Int **col_offd_S_to_A_ptr );
+HYPRE_Int hypre_BoomerAMGCreate2ndS ( hypre_ParCSRMatrix *S, HYPRE_Int *CF_marker,
+                                      HYPRE_Int num_paths, HYPRE_BigInt *coarse_row_starts, hypre_ParCSRMatrix **C_ptr );
+HYPRE_Int hypre_BoomerAMGCorrectCFMarker ( hypre_IntArray *CF_marker,
+                                           hypre_IntArray *new_CF_marker );
+HYPRE_Int hypre_BoomerAMGCorrectCFMarkerHost ( hypre_IntArray *CF_marker,
+                                               hypre_IntArray *new_CF_marker );
+HYPRE_Int hypre_BoomerAMGCorrectCFMarkerDevice ( hypre_IntArray *CF_marker,
+                                                 hypre_IntArray *new_CF_marker );
+HYPRE_Int hypre_BoomerAMGCorrectCFMarker2 ( hypre_IntArray *CF_marker,
+                                            hypre_IntArray *new_CF_marker );
+HYPRE_Int hypre_BoomerAMGCorrectCFMarker2Host ( hypre_IntArray *CF_marker,
+                                                hypre_IntArray *new_CF_marker );
+HYPRE_Int hypre_BoomerAMGCorrectCFMarker2Device ( hypre_IntArray *CF_marker,
+                                                  hypre_IntArray *new_CF_marker );
+HYPRE_Int hypre_BoomerAMGCreateSHost(hypre_ParCSRMatrix *A, HYPRE_Real strength_threshold,
+                                     HYPRE_Real max_row_sum, HYPRE_Int num_functions, HYPRE_Int *dof_func, hypre_ParCSRMatrix **S_ptr);
+HYPRE_Int hypre_BoomerAMGCreateSDevice(hypre_ParCSRMatrix *A, HYPRE_Int abs_soc,
+                                       HYPRE_Real strength_threshold, HYPRE_Real max_row_sum, HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                       hypre_ParCSRMatrix **S_ptr);
+HYPRE_Int hypre_BoomerAMGCreateSabsHost ( hypre_ParCSRMatrix *A, HYPRE_Real strength_threshold,
+                                          HYPRE_Real max_row_sum, HYPRE_Int num_functions, HYPRE_Int *dof_func, hypre_ParCSRMatrix **S_ptr );
+HYPRE_Int hypre_BoomerAMGCreate2ndSDevice( hypre_ParCSRMatrix *S, HYPRE_Int *CF_marker,
+                                           HYPRE_Int num_paths, HYPRE_BigInt *coarse_row_starts, hypre_ParCSRMatrix **C_ptr);
 HYPRE_Int hypre_BoomerAMGMakeSocFromSDevice( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *S);
 
 
 /* par_sv_interp.c */
-HYPRE_Int hypre_BoomerAMGSmoothInterpVectors ( hypre_ParCSRMatrix *A , HYPRE_Int num_smooth_vecs , hypre_ParVector **smooth_vecs , HYPRE_Int smooth_steps );
-HYPRE_Int hypre_BoomerAMGCoarsenInterpVectors ( hypre_ParCSRMatrix *P , HYPRE_Int num_smooth_vecs , hypre_ParVector **smooth_vecs , HYPRE_Int *CF_marker , hypre_ParVector ***new_smooth_vecs , HYPRE_Int expand_level , HYPRE_Int num_functions );
-HYPRE_Int hypre_BoomerAMG_GMExpandInterp ( hypre_ParCSRMatrix *A , hypre_ParCSRMatrix **P , HYPRE_Int num_smooth_vecs , hypre_ParVector **smooth_vecs , HYPRE_Int *nf , HYPRE_Int *dof_func , hypre_IntArray **coarse_dof_func , HYPRE_Int variant , HYPRE_Int level , HYPRE_Real abs_trunc , HYPRE_Real *weights , HYPRE_Int q_max , HYPRE_Int *CF_marker , HYPRE_Int interp_vec_first_level );
-HYPRE_Int hypre_BoomerAMGRefineInterp ( hypre_ParCSRMatrix *A , hypre_ParCSRMatrix *P , HYPRE_BigInt *num_cpts_global , HYPRE_Int *nf , HYPRE_Int *dof_func , HYPRE_Int *CF_marker , HYPRE_Int level );
+HYPRE_Int hypre_BoomerAMGSmoothInterpVectors ( hypre_ParCSRMatrix *A, HYPRE_Int num_smooth_vecs,
+                                               hypre_ParVector **smooth_vecs, HYPRE_Int smooth_steps );
+HYPRE_Int hypre_BoomerAMGCoarsenInterpVectors ( hypre_ParCSRMatrix *P, HYPRE_Int num_smooth_vecs,
+                                                hypre_ParVector **smooth_vecs, HYPRE_Int *CF_marker, hypre_ParVector ***new_smooth_vecs,
+                                                HYPRE_Int expand_level, HYPRE_Int num_functions );
+HYPRE_Int hypre_BoomerAMG_GMExpandInterp ( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix **P,
+                                           HYPRE_Int num_smooth_vecs, hypre_ParVector **smooth_vecs, HYPRE_Int *nf, HYPRE_Int *dof_func,
+                                           hypre_IntArray **coarse_dof_func, HYPRE_Int variant, HYPRE_Int level, HYPRE_Real abs_trunc,
+                                           HYPRE_Real *weights, HYPRE_Int q_max, HYPRE_Int *CF_marker, HYPRE_Int interp_vec_first_level );
+HYPRE_Int hypre_BoomerAMGRefineInterp ( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *P,
+                                        HYPRE_BigInt *num_cpts_global, HYPRE_Int *nf, HYPRE_Int *dof_func, HYPRE_Int *CF_marker,
+                                        HYPRE_Int level );
 
 /* par_sv_interp_ln.c */
-HYPRE_Int hypre_BoomerAMG_LNExpandInterp ( hypre_ParCSRMatrix *A , hypre_ParCSRMatrix **P , HYPRE_BigInt *num_cpts_global , HYPRE_Int *nf , HYPRE_Int *dof_func , hypre_IntArray **coarse_dof_func , HYPRE_Int *CF_marker , HYPRE_Int level , HYPRE_Real *weights , HYPRE_Int num_smooth_vecs , hypre_ParVector **smooth_vecs , HYPRE_Real abs_trunc , HYPRE_Int q_max , HYPRE_Int interp_vec_first_level );
+HYPRE_Int hypre_BoomerAMG_LNExpandInterp ( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix **P,
+                                           HYPRE_BigInt *num_cpts_global, HYPRE_Int *nf, HYPRE_Int *dof_func, hypre_IntArray **coarse_dof_func,
+                                           HYPRE_Int *CF_marker, HYPRE_Int level, HYPRE_Real *weights, HYPRE_Int num_smooth_vecs,
+                                           hypre_ParVector **smooth_vecs, HYPRE_Real abs_trunc, HYPRE_Int q_max,
+                                           HYPRE_Int interp_vec_first_level );
 
 /* par_sv_interp_lsfit.c */
-HYPRE_Int hypre_BoomerAMGFitInterpVectors ( hypre_ParCSRMatrix *A , hypre_ParCSRMatrix **P , HYPRE_Int num_smooth_vecs , hypre_ParVector **smooth_vecs , hypre_ParVector **coarse_smooth_vecs , HYPRE_Real delta , HYPRE_Int num_functions , HYPRE_Int *dof_func , HYPRE_Int *CF_marker , HYPRE_Int max_elmts , HYPRE_Real trunc_factor , HYPRE_Int variant , HYPRE_Int level );
+HYPRE_Int hypre_BoomerAMGFitInterpVectors ( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix **P,
+                                            HYPRE_Int num_smooth_vecs, hypre_ParVector **smooth_vecs, hypre_ParVector **coarse_smooth_vecs,
+                                            HYPRE_Real delta, HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int *CF_marker,
+                                            HYPRE_Int max_elmts, HYPRE_Real trunc_factor, HYPRE_Int variant, HYPRE_Int level );
 
 /* partial.c */
-HYPRE_Int hypre_BoomerAMGBuildPartialExtPIInterp ( hypre_ParCSRMatrix *A , HYPRE_Int *CF_marker , hypre_ParCSRMatrix *S , HYPRE_BigInt *num_cpts_global , HYPRE_BigInt *num_old_cpts_global , HYPRE_Int num_functions , HYPRE_Int *dof_func , HYPRE_Int debug_flag , HYPRE_Real trunc_factor , HYPRE_Int max_elmts , hypre_ParCSRMatrix **P_ptr );
-HYPRE_Int hypre_BoomerAMGBuildPartialStdInterp ( hypre_ParCSRMatrix *A , HYPRE_Int *CF_marker , hypre_ParCSRMatrix *S , HYPRE_BigInt *num_cpts_global , HYPRE_BigInt *num_old_cpts_global , HYPRE_Int num_functions , HYPRE_Int *dof_func , HYPRE_Int debug_flag , HYPRE_Real trunc_factor , HYPRE_Int max_elmts , HYPRE_Int sep_weight , hypre_ParCSRMatrix **P_ptr );
-HYPRE_Int hypre_BoomerAMGBuildPartialExtInterp ( hypre_ParCSRMatrix *A , HYPRE_Int *CF_marker , hypre_ParCSRMatrix *S , HYPRE_BigInt *num_cpts_global , HYPRE_BigInt *num_old_cpts_global , HYPRE_Int num_functions , HYPRE_Int *dof_func , HYPRE_Int debug_flag , HYPRE_Real trunc_factor , HYPRE_Int max_elmts , hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_BoomerAMGBuildPartialExtPIInterp ( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                                   hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_BigInt *num_old_cpts_global,
+                                                   HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int debug_flag, HYPRE_Real trunc_factor,
+                                                   HYPRE_Int max_elmts, hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_BoomerAMGBuildPartialStdInterp ( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                                 hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_BigInt *num_old_cpts_global,
+                                                 HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int debug_flag, HYPRE_Real trunc_factor,
+                                                 HYPRE_Int max_elmts, HYPRE_Int sep_weight, hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_BoomerAMGBuildPartialExtInterp ( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                                 hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_BigInt *num_old_cpts_global,
+                                                 HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int debug_flag, HYPRE_Real trunc_factor,
+                                                 HYPRE_Int max_elmts, hypre_ParCSRMatrix **P_ptr );
 
 /* par_vardifconv.c */
-HYPRE_ParCSRMatrix GenerateVarDifConv ( MPI_Comm comm , HYPRE_BigInt nx , HYPRE_BigInt ny , HYPRE_BigInt nz , HYPRE_Int P , HYPRE_Int Q , HYPRE_Int R , HYPRE_Int p , HYPRE_Int q , HYPRE_Int r , HYPRE_Real eps , HYPRE_ParVector *rhs_ptr );
-HYPRE_Real afun ( HYPRE_Real xx , HYPRE_Real yy , HYPRE_Real zz );
-HYPRE_Real bfun ( HYPRE_Real xx , HYPRE_Real yy , HYPRE_Real zz );
-HYPRE_Real cfun ( HYPRE_Real xx , HYPRE_Real yy , HYPRE_Real zz );
-HYPRE_Real dfun ( HYPRE_Real xx , HYPRE_Real yy , HYPRE_Real zz );
-HYPRE_Real efun ( HYPRE_Real xx , HYPRE_Real yy , HYPRE_Real zz );
-HYPRE_Real ffun ( HYPRE_Real xx , HYPRE_Real yy , HYPRE_Real zz );
-HYPRE_Real gfun ( HYPRE_Real xx , HYPRE_Real yy , HYPRE_Real zz );
-HYPRE_Real rfun ( HYPRE_Real xx , HYPRE_Real yy , HYPRE_Real zz );
-HYPRE_Real bndfun ( HYPRE_Real xx , HYPRE_Real yy , HYPRE_Real zz );
+HYPRE_ParCSRMatrix GenerateVarDifConv ( MPI_Comm comm, HYPRE_BigInt nx, HYPRE_BigInt ny,
+                                        HYPRE_BigInt nz, HYPRE_Int P, HYPRE_Int Q, HYPRE_Int R, HYPRE_Int p, HYPRE_Int q, HYPRE_Int r,
+                                        HYPRE_Real eps, HYPRE_ParVector *rhs_ptr );
+HYPRE_Real afun ( HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz );
+HYPRE_Real bfun ( HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz );
+HYPRE_Real cfun ( HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz );
+HYPRE_Real dfun ( HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz );
+HYPRE_Real efun ( HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz );
+HYPRE_Real ffun ( HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz );
+HYPRE_Real gfun ( HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz );
+HYPRE_Real rfun ( HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz );
+HYPRE_Real bndfun ( HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz );
 
 /* par_vardifconv_rs.c */
-HYPRE_ParCSRMatrix GenerateRSVarDifConv ( MPI_Comm comm , HYPRE_BigInt nx , HYPRE_BigInt ny , HYPRE_BigInt nz , HYPRE_Int P , HYPRE_Int Q , HYPRE_Int R , HYPRE_Int p , HYPRE_Int q , HYPRE_Int r , HYPRE_Real eps , HYPRE_ParVector *rhs_ptr, HYPRE_Int type );
-HYPRE_Real afun_rs ( HYPRE_Real xx , HYPRE_Real yy , HYPRE_Real zz );
-HYPRE_Real bfun_rs ( HYPRE_Real xx , HYPRE_Real yy , HYPRE_Real zz );
-HYPRE_Real cfun_rs ( HYPRE_Real xx , HYPRE_Real yy , HYPRE_Real zz );
-HYPRE_Real dfun_rs ( HYPRE_Real xx , HYPRE_Real yy , HYPRE_Real zz );
-HYPRE_Real efun_rs ( HYPRE_Real xx , HYPRE_Real yy , HYPRE_Real zz );
-HYPRE_Real ffun_rs ( HYPRE_Real xx , HYPRE_Real yy , HYPRE_Real zz );
-HYPRE_Real gfun_rs ( HYPRE_Real xx , HYPRE_Real yy , HYPRE_Real zz );
-HYPRE_Real rfun_rs ( HYPRE_Real xx , HYPRE_Real yy , HYPRE_Real zz );
-HYPRE_Real bndfun_rs ( HYPRE_Real xx , HYPRE_Real yy , HYPRE_Real zz );
+HYPRE_ParCSRMatrix GenerateRSVarDifConv ( MPI_Comm comm, HYPRE_BigInt nx, HYPRE_BigInt ny,
+                                          HYPRE_BigInt nz, HYPRE_Int P, HYPRE_Int Q, HYPRE_Int R, HYPRE_Int p, HYPRE_Int q, HYPRE_Int r,
+                                          HYPRE_Real eps, HYPRE_ParVector *rhs_ptr, HYPRE_Int type );
+HYPRE_Real afun_rs ( HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz );
+HYPRE_Real bfun_rs ( HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz );
+HYPRE_Real cfun_rs ( HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz );
+HYPRE_Real dfun_rs ( HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz );
+HYPRE_Real efun_rs ( HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz );
+HYPRE_Real ffun_rs ( HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz );
+HYPRE_Real gfun_rs ( HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz );
+HYPRE_Real rfun_rs ( HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz );
+HYPRE_Real bndfun_rs ( HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz );
 
 
 /* pcg_par.c */
-void *hypre_ParKrylovCAlloc ( size_t count , size_t elt_size, HYPRE_MemoryLocation location );
+void *hypre_ParKrylovCAlloc ( size_t count, size_t elt_size, HYPRE_MemoryLocation location );
 HYPRE_Int hypre_ParKrylovFree ( void *ptr );
 void *hypre_ParKrylovCreateVector ( void *vvector );
-void *hypre_ParKrylovCreateVectorArray ( HYPRE_Int n , void *vvector );
+void *hypre_ParKrylovCreateVectorArray ( HYPRE_Int n, void *vvector );
 HYPRE_Int hypre_ParKrylovDestroyVector ( void *vvector );
-void *hypre_ParKrylovMatvecCreate ( void *A , void *x );
-HYPRE_Int hypre_ParKrylovMatvec ( void *matvec_data , HYPRE_Complex alpha , void *A , void *x , HYPRE_Complex beta , void *y );
-HYPRE_Int hypre_ParKrylovMatvecT ( void *matvec_data , HYPRE_Complex alpha , void *A , void *x , HYPRE_Complex beta , void *y );
+void *hypre_ParKrylovMatvecCreate ( void *A, void *x );
+HYPRE_Int hypre_ParKrylovMatvec ( void *matvec_data, HYPRE_Complex alpha, void *A, void *x,
+                                  HYPRE_Complex beta, void *y );
+HYPRE_Int hypre_ParKrylovMatvecT ( void *matvec_data, HYPRE_Complex alpha, void *A, void *x,
+                                   HYPRE_Complex beta, void *y );
 HYPRE_Int hypre_ParKrylovMatvecDestroy ( void *matvec_data );
-HYPRE_Real hypre_ParKrylovInnerProd ( void *x , void *y );
-HYPRE_Int hypre_ParKrylovMassInnerProd ( void *x , void **y, HYPRE_Int k, HYPRE_Int unroll, void *result );
-HYPRE_Int hypre_ParKrylovMassDotpTwo ( void *x , void *y , void **z, HYPRE_Int k, HYPRE_Int unroll, void *result_x, void *result_y );
-HYPRE_Int hypre_ParKrylovMassAxpy( HYPRE_Complex *alpha, void **x, void *y, HYPRE_Int k, HYPRE_Int unroll);
-HYPRE_Int hypre_ParKrylovCopyVector ( void *x , void *y );
+HYPRE_Real hypre_ParKrylovInnerProd ( void *x, void *y );
+HYPRE_Int hypre_ParKrylovMassInnerProd ( void *x, void **y, HYPRE_Int k, HYPRE_Int unroll,
+                                         void *result );
+HYPRE_Int hypre_ParKrylovMassDotpTwo ( void *x, void *y, void **z, HYPRE_Int k, HYPRE_Int unroll,
+                                       void *result_x, void *result_y );
+HYPRE_Int hypre_ParKrylovMassAxpy( HYPRE_Complex *alpha, void **x, void *y, HYPRE_Int k,
+                                   HYPRE_Int unroll);
+HYPRE_Int hypre_ParKrylovCopyVector ( void *x, void *y );
 HYPRE_Int hypre_ParKrylovClearVector ( void *x );
-HYPRE_Int hypre_ParKrylovScaleVector ( HYPRE_Complex alpha , void *x );
-HYPRE_Int hypre_ParKrylovAxpy ( HYPRE_Complex alpha , void *x , void *y );
-HYPRE_Int hypre_ParKrylovCommInfo ( void *A , HYPRE_Int *my_id , HYPRE_Int *num_procs );
-HYPRE_Int hypre_ParKrylovIdentitySetup ( void *vdata , void *A , void *b , void *x );
-HYPRE_Int hypre_ParKrylovIdentity ( void *vdata , void *A , void *b , void *x );
+HYPRE_Int hypre_ParKrylovScaleVector ( HYPRE_Complex alpha, void *x );
+HYPRE_Int hypre_ParKrylovAxpy ( HYPRE_Complex alpha, void *x, void *y );
+HYPRE_Int hypre_ParKrylovCommInfo ( void *A, HYPRE_Int *my_id, HYPRE_Int *num_procs );
+HYPRE_Int hypre_ParKrylovIdentitySetup ( void *vdata, void *A, void *b, void *x );
+HYPRE_Int hypre_ParKrylovIdentity ( void *vdata, void *A, void *b, void *x );
 
 /* schwarz.c */
-HYPRE_Int hypre_AMGNodalSchwarzSmoother ( hypre_CSRMatrix *A , HYPRE_Int num_functions , HYPRE_Int option , hypre_CSRMatrix **domain_structure_pointer );
-HYPRE_Int hypre_ParMPSchwarzSolve ( hypre_ParCSRMatrix *par_A , hypre_CSRMatrix *A_boundary , hypre_ParVector *rhs_vector , hypre_CSRMatrix *domain_structure , hypre_ParVector *par_x , HYPRE_Real relax_wt , HYPRE_Real *scale , hypre_ParVector *Vtemp , HYPRE_Int *pivots , HYPRE_Int use_nonsymm );
-HYPRE_Int hypre_MPSchwarzSolve ( hypre_ParCSRMatrix *par_A , hypre_Vector *rhs_vector , hypre_CSRMatrix *domain_structure , hypre_ParVector *par_x , HYPRE_Real relax_wt , hypre_Vector *aux_vector , HYPRE_Int *pivots , HYPRE_Int use_nonsymm );
-HYPRE_Int hypre_MPSchwarzCFSolve ( hypre_ParCSRMatrix *par_A , hypre_Vector *rhs_vector , hypre_CSRMatrix *domain_structure , hypre_ParVector *par_x , HYPRE_Real relax_wt , hypre_Vector *aux_vector , HYPRE_Int *CF_marker , HYPRE_Int rlx_pt , HYPRE_Int *pivots , HYPRE_Int use_nonsymm );
-HYPRE_Int hypre_MPSchwarzFWSolve ( hypre_ParCSRMatrix *par_A , hypre_Vector *rhs_vector , hypre_CSRMatrix *domain_structure , hypre_ParVector *par_x , HYPRE_Real relax_wt , hypre_Vector *aux_vector , HYPRE_Int *pivots , HYPRE_Int use_nonsymm );
-HYPRE_Int hypre_MPSchwarzCFFWSolve ( hypre_ParCSRMatrix *par_A , hypre_Vector *rhs_vector , hypre_CSRMatrix *domain_structure , hypre_ParVector *par_x , HYPRE_Real relax_wt , hypre_Vector *aux_vector , HYPRE_Int *CF_marker , HYPRE_Int rlx_pt , HYPRE_Int *pivots , HYPRE_Int use_nonsymm );
-HYPRE_Int transpose_matrix_create ( HYPRE_Int **i_face_element_pointer , HYPRE_Int **j_face_element_pointer , HYPRE_Int *i_element_face , HYPRE_Int *j_element_face , HYPRE_Int num_elements , HYPRE_Int num_faces );
-HYPRE_Int matrix_matrix_product ( HYPRE_Int **i_element_edge_pointer , HYPRE_Int **j_element_edge_pointer , HYPRE_Int *i_element_face , HYPRE_Int *j_element_face , HYPRE_Int *i_face_edge , HYPRE_Int *j_face_edge , HYPRE_Int num_elements , HYPRE_Int num_faces , HYPRE_Int num_edges );
-HYPRE_Int hypre_AMGCreateDomainDof ( hypre_CSRMatrix *A , HYPRE_Int domain_type , HYPRE_Int overlap , HYPRE_Int num_functions , HYPRE_Int *dof_func , hypre_CSRMatrix **domain_structure_pointer , HYPRE_Int **piv_pointer , HYPRE_Int use_nonsymm );
-HYPRE_Int hypre_AMGeAgglomerate ( HYPRE_Int *i_AE_element , HYPRE_Int *j_AE_element , HYPRE_Int *i_face_face , HYPRE_Int *j_face_face , HYPRE_Int *w_face_face , HYPRE_Int *i_face_element , HYPRE_Int *j_face_element , HYPRE_Int *i_element_face , HYPRE_Int *j_element_face , HYPRE_Int *i_face_to_prefer_weight , HYPRE_Int *i_face_weight , HYPRE_Int num_faces , HYPRE_Int num_elements , HYPRE_Int *num_AEs_pointer );
-HYPRE_Int hypre_update_entry ( HYPRE_Int weight , HYPRE_Int *weight_max , HYPRE_Int *previous , HYPRE_Int *next , HYPRE_Int *first , HYPRE_Int *last , HYPRE_Int head , HYPRE_Int tail , HYPRE_Int i );
-HYPRE_Int hypre_remove_entry ( HYPRE_Int weight , HYPRE_Int *weight_max , HYPRE_Int *previous , HYPRE_Int *next , HYPRE_Int *first , HYPRE_Int *last , HYPRE_Int head , HYPRE_Int tail , HYPRE_Int i );
-HYPRE_Int hypre_move_entry ( HYPRE_Int weight , HYPRE_Int *weight_max , HYPRE_Int *previous , HYPRE_Int *next , HYPRE_Int *first , HYPRE_Int *last , HYPRE_Int head , HYPRE_Int tail , HYPRE_Int i );
-HYPRE_Int hypre_matinv ( HYPRE_Real *x , HYPRE_Real *a , HYPRE_Int k );
-HYPRE_Int hypre_parCorrRes ( hypre_ParCSRMatrix *A , hypre_ParVector *x , hypre_Vector *rhs , hypre_Vector **tmp_ptr );
-HYPRE_Int hypre_AdSchwarzSolve ( hypre_ParCSRMatrix *par_A , hypre_ParVector *par_rhs , hypre_CSRMatrix *domain_structure , HYPRE_Real *scale , hypre_ParVector *par_x , hypre_ParVector *par_aux , HYPRE_Int *pivots , HYPRE_Int use_nonsymm );
-HYPRE_Int hypre_AdSchwarzCFSolve ( hypre_ParCSRMatrix *par_A , hypre_ParVector *par_rhs , hypre_CSRMatrix *domain_structure , HYPRE_Real *scale , hypre_ParVector *par_x , hypre_ParVector *par_aux , HYPRE_Int *CF_marker , HYPRE_Int rlx_pt , HYPRE_Int *pivots , HYPRE_Int use_nonsymm );
-HYPRE_Int hypre_GenerateScale ( hypre_CSRMatrix *domain_structure , HYPRE_Int num_variables , HYPRE_Real relaxation_weight , HYPRE_Real **scale_pointer );
-HYPRE_Int hypre_ParAdSchwarzSolve ( hypre_ParCSRMatrix *A , hypre_ParVector *F , hypre_CSRMatrix *domain_structure , HYPRE_Real *scale , hypre_ParVector *X , hypre_ParVector *Vtemp , HYPRE_Int *pivots , HYPRE_Int use_nonsymm );
-HYPRE_Int hypre_ParAMGCreateDomainDof ( hypre_ParCSRMatrix *A , HYPRE_Int domain_type , HYPRE_Int overlap , HYPRE_Int num_functions , HYPRE_Int *dof_func , hypre_CSRMatrix **domain_structure_pointer , HYPRE_Int **piv_pointer , HYPRE_Int use_nonsymm );
-HYPRE_Int hypre_ParGenerateScale ( hypre_ParCSRMatrix *A , hypre_CSRMatrix *domain_structure , HYPRE_Real relaxation_weight , HYPRE_Real **scale_pointer );
-HYPRE_Int hypre_ParGenerateHybridScale ( hypre_ParCSRMatrix *A , hypre_CSRMatrix *domain_structure , hypre_CSRMatrix **A_boundary_pointer , HYPRE_Real **scale_pointer );
+HYPRE_Int hypre_AMGNodalSchwarzSmoother ( hypre_CSRMatrix *A, HYPRE_Int num_functions,
+                                          HYPRE_Int option, hypre_CSRMatrix **domain_structure_pointer );
+HYPRE_Int hypre_ParMPSchwarzSolve ( hypre_ParCSRMatrix *par_A, hypre_CSRMatrix *A_boundary,
+                                    hypre_ParVector *rhs_vector, hypre_CSRMatrix *domain_structure, hypre_ParVector *par_x,
+                                    HYPRE_Real relax_wt, HYPRE_Real *scale, hypre_ParVector *Vtemp, HYPRE_Int *pivots,
+                                    HYPRE_Int use_nonsymm );
+HYPRE_Int hypre_MPSchwarzSolve ( hypre_ParCSRMatrix *par_A, hypre_Vector *rhs_vector,
+                                 hypre_CSRMatrix *domain_structure, hypre_ParVector *par_x, HYPRE_Real relax_wt,
+                                 hypre_Vector *aux_vector, HYPRE_Int *pivots, HYPRE_Int use_nonsymm );
+HYPRE_Int hypre_MPSchwarzCFSolve ( hypre_ParCSRMatrix *par_A, hypre_Vector *rhs_vector,
+                                   hypre_CSRMatrix *domain_structure, hypre_ParVector *par_x, HYPRE_Real relax_wt,
+                                   hypre_Vector *aux_vector, HYPRE_Int *CF_marker, HYPRE_Int rlx_pt, HYPRE_Int *pivots,
+                                   HYPRE_Int use_nonsymm );
+HYPRE_Int hypre_MPSchwarzFWSolve ( hypre_ParCSRMatrix *par_A, hypre_Vector *rhs_vector,
+                                   hypre_CSRMatrix *domain_structure, hypre_ParVector *par_x, HYPRE_Real relax_wt,
+                                   hypre_Vector *aux_vector, HYPRE_Int *pivots, HYPRE_Int use_nonsymm );
+HYPRE_Int hypre_MPSchwarzCFFWSolve ( hypre_ParCSRMatrix *par_A, hypre_Vector *rhs_vector,
+                                     hypre_CSRMatrix *domain_structure, hypre_ParVector *par_x, HYPRE_Real relax_wt,
+                                     hypre_Vector *aux_vector, HYPRE_Int *CF_marker, HYPRE_Int rlx_pt, HYPRE_Int *pivots,
+                                     HYPRE_Int use_nonsymm );
+HYPRE_Int transpose_matrix_create ( HYPRE_Int **i_face_element_pointer,
+                                    HYPRE_Int **j_face_element_pointer, HYPRE_Int *i_element_face, HYPRE_Int *j_element_face,
+                                    HYPRE_Int num_elements, HYPRE_Int num_faces );
+HYPRE_Int matrix_matrix_product ( HYPRE_Int **i_element_edge_pointer,
+                                  HYPRE_Int **j_element_edge_pointer, HYPRE_Int *i_element_face, HYPRE_Int *j_element_face,
+                                  HYPRE_Int *i_face_edge, HYPRE_Int *j_face_edge, HYPRE_Int num_elements, HYPRE_Int num_faces,
+                                  HYPRE_Int num_edges );
+HYPRE_Int hypre_AMGCreateDomainDof ( hypre_CSRMatrix *A, HYPRE_Int domain_type, HYPRE_Int overlap,
+                                     HYPRE_Int num_functions, HYPRE_Int *dof_func, hypre_CSRMatrix **domain_structure_pointer,
+                                     HYPRE_Int **piv_pointer, HYPRE_Int use_nonsymm );
+HYPRE_Int hypre_AMGeAgglomerate ( HYPRE_Int *i_AE_element, HYPRE_Int *j_AE_element,
+                                  HYPRE_Int *i_face_face, HYPRE_Int *j_face_face, HYPRE_Int *w_face_face, HYPRE_Int *i_face_element,
+                                  HYPRE_Int *j_face_element, HYPRE_Int *i_element_face, HYPRE_Int *j_element_face,
+                                  HYPRE_Int *i_face_to_prefer_weight, HYPRE_Int *i_face_weight, HYPRE_Int num_faces,
+                                  HYPRE_Int num_elements, HYPRE_Int *num_AEs_pointer );
+HYPRE_Int hypre_update_entry ( HYPRE_Int weight, HYPRE_Int *weight_max, HYPRE_Int *previous,
+                               HYPRE_Int *next, HYPRE_Int *first, HYPRE_Int *last, HYPRE_Int head, HYPRE_Int tail, HYPRE_Int i );
+HYPRE_Int hypre_remove_entry ( HYPRE_Int weight, HYPRE_Int *weight_max, HYPRE_Int *previous,
+                               HYPRE_Int *next, HYPRE_Int *first, HYPRE_Int *last, HYPRE_Int head, HYPRE_Int tail, HYPRE_Int i );
+HYPRE_Int hypre_move_entry ( HYPRE_Int weight, HYPRE_Int *weight_max, HYPRE_Int *previous,
+                             HYPRE_Int *next, HYPRE_Int *first, HYPRE_Int *last, HYPRE_Int head, HYPRE_Int tail, HYPRE_Int i );
+HYPRE_Int hypre_matinv ( HYPRE_Real *x, HYPRE_Real *a, HYPRE_Int k );
+HYPRE_Int hypre_parCorrRes ( hypre_ParCSRMatrix *A, hypre_ParVector *x, hypre_Vector *rhs,
+                             hypre_Vector **tmp_ptr );
+HYPRE_Int hypre_AdSchwarzSolve ( hypre_ParCSRMatrix *par_A, hypre_ParVector *par_rhs,
+                                 hypre_CSRMatrix *domain_structure, HYPRE_Real *scale, hypre_ParVector *par_x,
+                                 hypre_ParVector *par_aux, HYPRE_Int *pivots, HYPRE_Int use_nonsymm );
+HYPRE_Int hypre_AdSchwarzCFSolve ( hypre_ParCSRMatrix *par_A, hypre_ParVector *par_rhs,
+                                   hypre_CSRMatrix *domain_structure, HYPRE_Real *scale, hypre_ParVector *par_x,
+                                   hypre_ParVector *par_aux, HYPRE_Int *CF_marker, HYPRE_Int rlx_pt, HYPRE_Int *pivots,
+                                   HYPRE_Int use_nonsymm );
+HYPRE_Int hypre_GenerateScale ( hypre_CSRMatrix *domain_structure, HYPRE_Int num_variables,
+                                HYPRE_Real relaxation_weight, HYPRE_Real **scale_pointer );
+HYPRE_Int hypre_ParAdSchwarzSolve ( hypre_ParCSRMatrix *A, hypre_ParVector *F,
+                                    hypre_CSRMatrix *domain_structure, HYPRE_Real *scale, hypre_ParVector *X, hypre_ParVector *Vtemp,
+                                    HYPRE_Int *pivots, HYPRE_Int use_nonsymm );
+HYPRE_Int hypre_ParAMGCreateDomainDof ( hypre_ParCSRMatrix *A, HYPRE_Int domain_type,
+                                        HYPRE_Int overlap, HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                        hypre_CSRMatrix **domain_structure_pointer, HYPRE_Int **piv_pointer, HYPRE_Int use_nonsymm );
+HYPRE_Int hypre_ParGenerateScale ( hypre_ParCSRMatrix *A, hypre_CSRMatrix *domain_structure,
+                                   HYPRE_Real relaxation_weight, HYPRE_Real **scale_pointer );
+HYPRE_Int hypre_ParGenerateHybridScale ( hypre_ParCSRMatrix *A, hypre_CSRMatrix *domain_structure,
+                                         hypre_CSRMatrix **A_boundary_pointer, HYPRE_Real **scale_pointer );
 
 /* par_restr.c,  par_lr_restr.c */
-HYPRE_Int hypre_BoomerAMGBuildRestrAIR( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker, hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Real filter_thresholdR, HYPRE_Int debug_flag, hypre_ParCSRMatrix **R_ptr, HYPRE_Int is_triangular, HYPRE_Int gmres_switch);
-HYPRE_Int hypre_BoomerAMGBuildRestrDist2AIR( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker, hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Real filter_thresholdR, HYPRE_Int debug_flag, hypre_ParCSRMatrix **R_ptr, HYPRE_Int AIR1_5, HYPRE_Int is_triangular, HYPRE_Int gmres_switch);
-HYPRE_Int hypre_BoomerAMGBuildRestrNeumannAIR( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int NeumannDeg, HYPRE_Real strong_thresholdR, HYPRE_Real filter_thresholdR, HYPRE_Int debug_flag, hypre_ParCSRMatrix **R_ptr);
-HYPRE_Int hypre_BoomerAMGBuildRestrNeumannAIRDevice( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int NeumannDeg, HYPRE_Real strong_thresholdR, HYPRE_Real filter_thresholdR, HYPRE_Int debug_flag, hypre_ParCSRMatrix **R_ptr);
+HYPRE_Int hypre_BoomerAMGBuildRestrAIR( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                        hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                        HYPRE_Real filter_thresholdR, HYPRE_Int debug_flag, hypre_ParCSRMatrix **R_ptr,
+                                        HYPRE_Int is_triangular, HYPRE_Int gmres_switch);
+HYPRE_Int hypre_BoomerAMGBuildRestrDist2AIR( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                             hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                             HYPRE_Real filter_thresholdR, HYPRE_Int debug_flag, hypre_ParCSRMatrix **R_ptr, HYPRE_Int AIR1_5,
+                                             HYPRE_Int is_triangular, HYPRE_Int gmres_switch);
+HYPRE_Int hypre_BoomerAMGBuildRestrNeumannAIR( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                               HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int NeumannDeg,
+                                               HYPRE_Real strong_thresholdR, HYPRE_Real filter_thresholdR, HYPRE_Int debug_flag,
+                                               hypre_ParCSRMatrix **R_ptr);
+HYPRE_Int hypre_BoomerAMGBuildRestrNeumannAIRDevice( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                                     HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int NeumannDeg,
+                                                     HYPRE_Real strong_thresholdR, HYPRE_Real filter_thresholdR, HYPRE_Int debug_flag,
+                                                     hypre_ParCSRMatrix **R_ptr);
 HYPRE_Int hypre_BoomerAMGCFMarkerTo1minus1Device( HYPRE_Int *CF_marker, HYPRE_Int size );
 
 #ifdef HYPRE_USING_DSUPERLU
@@ -2147,46 +3559,101 @@ HYPRE_Int hypre_SLUDistDestroy( void* solver);
 void *hypre_MGRCreate ( void );
 HYPRE_Int hypre_MGRDestroy ( void *mgr_vdata );
 HYPRE_Int hypre_MGRCycle( void *mgr_vdata, hypre_ParVector **F_array, hypre_ParVector **U_array );
-void *hypre_MGRCreateFrelaxVcycleData();
+void *hypre_MGRCreateFrelaxVcycleData( void );
 HYPRE_Int hypre_MGRDestroyFrelaxVcycleData( void *mgr_vdata );
-HYPRE_Int hypre_MGRSetupFrelaxVcycleData( void *mgr_vdata, hypre_ParCSRMatrix *A, hypre_ParVector *f, hypre_ParVector *u, HYPRE_Int level);
+void *hypre_MGRCreateGSElimData( void );
+HYPRE_Int hypre_MGRDestroyGSElimData( void *mgr_vdata );
+HYPRE_Int hypre_MGRSetupFrelaxVcycleData( void *mgr_vdata, hypre_ParCSRMatrix *A,
+                                          hypre_ParVector *f, hypre_ParVector *u,
+                                          HYPRE_Int level );
 HYPRE_Int hypre_MGRFrelaxVcycle ( void *mgr_vdata, hypre_ParVector *f, hypre_ParVector *u );
-HYPRE_Int hypre_MGRSetCpointsByBlock( void *mgr_vdata, HYPRE_Int  block_size, HYPRE_Int  max_num_levels, HYPRE_Int *block_num_coarse_points, HYPRE_Int  **block_coarse_indexes);
-HYPRE_Int hypre_MGRSetCpointsByContiguousBlock( void *mgr_vdata, HYPRE_Int  block_size, HYPRE_Int  max_num_levels, HYPRE_BigInt *begin_idx_array, HYPRE_Int *block_num_coarse_points, HYPRE_Int  **block_coarse_indexes);
-HYPRE_Int hypre_MGRSetCpointsByPointMarkerArray( void *mgr_vdata, HYPRE_Int  block_size, HYPRE_Int  max_num_levels, HYPRE_Int *block_num_coarse_points, HYPRE_Int  **block_coarse_indexes, HYPRE_Int *point_marker_array);
-HYPRE_Int hypre_MGRCoarsen(hypre_ParCSRMatrix *S,  hypre_ParCSRMatrix *A,HYPRE_Int final_coarse_size,HYPRE_Int *final_coarse_indexes,HYPRE_Int debug_flag,hypre_IntArray **CF_marker,HYPRE_Int last_level);
-HYPRE_Int hypre_MGRSetReservedCoarseNodes(void      *mgr_vdata, HYPRE_Int reserved_coarse_size, HYPRE_BigInt *reserved_coarse_nodes);
-HYPRE_Int hypre_MGRSetReservedCpointsLevelToKeep( void      *mgr_vdata, HYPRE_Int level);
-HYPRE_Int hypre_MGRSetMaxGlobalsmoothIters( void *mgr_vdata, HYPRE_Int max_iter );
-HYPRE_Int hypre_MGRSetGlobalsmoothType( void *mgr_vdata, HYPRE_Int iter_type );
-HYPRE_Int hypre_MGRSetNonCpointsToFpoints( void      *mgr_vdata, HYPRE_Int nonCptToFptFlag);
-
+HYPRE_Int hypre_MGRSetCpointsByBlock( void *mgr_vdata, HYPRE_Int  block_size,
+                                      HYPRE_Int  max_num_levels,
+                                      HYPRE_Int *block_num_coarse_points,
+                                      HYPRE_Int  **block_coarse_indexes );
+HYPRE_Int hypre_MGRSetCpointsByContiguousBlock( void *mgr_vdata, HYPRE_Int block_size,
+                                                HYPRE_Int  max_num_levels,
+                                                HYPRE_BigInt *begin_idx_array,
+                                                HYPRE_Int *block_num_coarse_points,
+                                                HYPRE_Int **block_coarse_indexes );
+HYPRE_Int hypre_MGRSetCpointsByPointMarkerArray( void *mgr_vdata, HYPRE_Int block_size,
+                                                 HYPRE_Int  max_num_levels,
+                                                 HYPRE_Int *block_num_coarse_points,
+                                                 HYPRE_Int **block_coarse_indexes,
+                                                 HYPRE_Int *point_marker_array );
+HYPRE_Int hypre_MGRCoarsen( hypre_ParCSRMatrix *S, hypre_ParCSRMatrix *A,
+                            HYPRE_Int final_coarse_size, HYPRE_Int *final_coarse_indexes,
+                            HYPRE_Int debug_flag, hypre_IntArray **CF_marker,
+                            HYPRE_Int last_level );
+HYPRE_Int hypre_MGRSetReservedCoarseNodes( void *mgr_vdata, HYPRE_Int reserved_coarse_size,
+                                           HYPRE_BigInt *reserved_coarse_nodes );
+HYPRE_Int hypre_MGRSetReservedCpointsLevelToKeep( void *mgr_vdata, HYPRE_Int level );
+HYPRE_Int hypre_MGRSetMaxGlobalSmoothIters( void *mgr_vdata, HYPRE_Int max_iter );
+HYPRE_Int hypre_MGRSetGlobalSmoothType( void *mgr_vdata, HYPRE_Int iter_type );
+HYPRE_Int hypre_MGRSetNonCpointsToFpoints( void *mgr_vdata, HYPRE_Int nonCptToFptFlag );
 //HYPRE_Int hypre_MGRInitCFMarker(HYPRE_Int num_variables, HYPRE_Int *CF_marker, HYPRE_Int initial_coarse_size,HYPRE_Int *initial_coarse_indexes);
 //HYPRE_Int hypre_MGRUpdateCoarseIndexes(HYPRE_Int num_variables, HYPRE_Int *CF_marker, HYPRE_Int initial_coarse_size,HYPRE_Int *initial_coarse_indexes);
-HYPRE_Int hypre_MGRBuildInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker, hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int debug_flag, HYPRE_Real trunc_factor, HYPRE_Int max_elmts, hypre_ParCSRMatrix  **P, HYPRE_Int method, HYPRE_Int numsweeps);
-HYPRE_Int hypre_MGRBuildRestrict(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int debug_flag, HYPRE_Real trunc_factor, HYPRE_Int max_elmts, HYPRE_Real strong_threshold, HYPRE_Real max_row_sum, hypre_ParCSRMatrix  **RT, HYPRE_Int method, HYPRE_Int numsweeps);
-//HYPRE_Int hypre_MGRBuildRestrictionToper(hypre_ParCSRMatrix *AT, HYPRE_Int *CF_marker, hypre_ParCSRMatrix *ST, HYPRE_Int *num_cpts_global,HYPRE_Int num_functions,HYPRE_Int *dof_func,HYPRE_Int debug_flag,HYPRE_Real trunc_factor, HYPRE_Int max_elmts, hypre_ParCSRMatrix  **RT,HYPRE_Int last_level,HYPRE_Int level, HYPRE_Int numsweeps);
-//HYPRE_Int hypre_BoomerAMGBuildInjectionInterp( hypre_ParCSRMatrix   *A, HYPRE_Int *CF_marker, HYPRE_Int *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int debug_flag,HYPRE_Int init_data,hypre_ParCSRMatrix  **P_ptr);
-HYPRE_Int hypre_MGRSetCoarseSolver( void  *mgr_vdata, HYPRE_Int  (*coarse_grid_solver_solve)(void*,void*,void*,void*), HYPRE_Int  (*coarse_grid_solver_setup)(void*,void*,void*,void*), void  *coarse_grid_solver );
-HYPRE_Int hypre_MGRSetFSolver( void  *mgr_vdata, HYPRE_Int  (*fine_grid_solver_solve)(void*,void*,void*,void*), HYPRE_Int  (*fine_grid_solver_setup)(void*,void*,void*,void*), void  *fsolver );
-HYPRE_Int hypre_MGRSetup( void *mgr_vdata, hypre_ParCSRMatrix *A, hypre_ParVector    *f, hypre_ParVector    *u );
-HYPRE_Int hypre_MGRSolve( void *mgr_vdata, hypre_ParCSRMatrix *A, hypre_ParVector *f, hypre_ParVector  *u );
-HYPRE_Int hypre_block_jacobi_scaling(hypre_ParCSRMatrix *A,hypre_ParCSRMatrix **B_ptr,void               *mgr_vdata,HYPRE_Int             debug_flag);
-HYPRE_Int hypre_blockRelax_solve(hypre_ParCSRMatrix *A, hypre_ParVector *f, hypre_ParVector *u, HYPRE_Real blk_size, HYPRE_Int n_block, HYPRE_Int left_size, HYPRE_Int method, HYPRE_Real *diaginv, hypre_ParVector *Vtemp);
-HYPRE_Int hypre_blockRelax_setup(hypre_ParCSRMatrix *A,HYPRE_Int blk_size, HYPRE_Int reserved_coarse_size, HYPRE_Real **diaginvptr);
-HYPRE_Int hypre_blockRelax(hypre_ParCSRMatrix *A, hypre_ParVector *f, hypre_ParVector *u, HYPRE_Int blk_size, HYPRE_Int reserved_coarse_size, HYPRE_Int method, hypre_ParVector *Vtemp, hypre_ParVector *Ztemp);
-
+HYPRE_Int hypre_ParCSRMatrixExtractBlockDiagHost( hypre_ParCSRMatrix *par_A, HYPRE_Int blk_size,
+                                                  HYPRE_Int num_points, HYPRE_Int point_type,
+                                                  HYPRE_Int *CF_marker, HYPRE_Int diag_size,
+                                                  HYPRE_Int diag_type, HYPRE_Real *diag_data );
+HYPRE_Int hypre_ParCSRMatrixBlockDiagMatrix( hypre_ParCSRMatrix *A, HYPRE_Int blk_size,
+                                             HYPRE_Int point_type, HYPRE_Int *CF_marker,
+                                             HYPRE_Int diag_type, hypre_ParCSRMatrix **B_ptr );
+HYPRE_Int hypre_ParCSRMatrixBlockDiagMatrixHost( hypre_ParCSRMatrix *A, HYPRE_Int blk_size,
+                                                 HYPRE_Int point_type, HYPRE_Int *CF_marker,
+                                                 HYPRE_Int diag_type,
+                                                 hypre_ParCSRMatrix **B_ptr );
+HYPRE_Int hypre_MGRSetCoarseSolver( void *mgr_vdata,
+                                    HYPRE_Int (*cgrid_solver_solve)(void*, void*, void*, void*),
+                                    HYPRE_Int (*cgrid_solver_setup)(void*, void*, void*, void*),
+                                    void *coarse_grid_solver );
+HYPRE_Int hypre_MGRSetFSolver( void *mgr_vdata,
+                               HYPRE_Int (*fine_grid_solver_solve)(void*, void*, void*, void*),
+                               HYPRE_Int (*fine_grid_solver_setup)(void*, void*, void*, void*),
+                               void *fsolver );
+HYPRE_Int hypre_MGRSetFSolverAtLevel( void *mgr_vdata, void *fsolver, HYPRE_Int level );
+HYPRE_Int hypre_MGRSetup( void *mgr_vdata, hypre_ParCSRMatrix *A,
+                          hypre_ParVector *f, hypre_ParVector *u );
+HYPRE_Int hypre_MGRSolve( void *mgr_vdata, hypre_ParCSRMatrix *A,
+                          hypre_ParVector *f, hypre_ParVector  *u );
+HYPRE_Int hypre_block_jacobi_scaling( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix **B_ptr,
+                                      void *mgr_vdata, HYPRE_Int debug_flag );
+HYPRE_Int hypre_MGRBlockRelaxSolveDevice( hypre_ParCSRMatrix *B, hypre_ParCSRMatrix *A,
+                                          hypre_ParVector *f, hypre_ParVector *u,
+                                          hypre_ParVector *Vtemp, HYPRE_Real relax_weight );
+HYPRE_Int hypre_MGRBlockRelaxSolve( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                    hypre_ParVector *u, HYPRE_Int blk_size,
+                                    HYPRE_Int n_block, HYPRE_Int left_size,
+                                    HYPRE_Int method, HYPRE_Real *diaginv,
+                                    hypre_ParVector *Vtemp );
+HYPRE_Int hypre_BlockDiagInvLapack( HYPRE_Real *diag, HYPRE_Int N, HYPRE_Int blk_size );
+HYPRE_Int hypre_MGRBlockRelaxSetup( hypre_ParCSRMatrix *A, HYPRE_Int blk_size,
+                                    HYPRE_Real **diaginvptr );
+//HYPRE_Int hypre_blockRelax(hypre_ParCSRMatrix *A, hypre_ParVector *f, hypre_ParVector *u,
+//                           HYPRE_Int blk_size, HYPRE_Int reserved_coarse_size, HYPRE_Int method, hypre_ParVector *Vtemp,
+//                           hypre_ParVector *Ztemp);
+HYPRE_Int hypre_block_jacobi_solve( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                    hypre_ParVector *u, HYPRE_Int blk_size,
+                                    HYPRE_Int method, HYPRE_Real *diaginv,
+                                    hypre_ParVector *Vtemp );
 //HYPRE_Int hypre_MGRBuildAffRAP( MPI_Comm comm, HYPRE_Int local_num_variables, HYPRE_Int num_functions,
 //HYPRE_Int *dof_func, HYPRE_Int *CF_marker, HYPRE_Int **coarse_dof_func_ptr, HYPRE_BigInt **coarse_pnts_global_ptr,
 //hypre_ParCSRMatrix *A, HYPRE_Int debug_flag, hypre_ParCSRMatrix **P_f_ptr, hypre_ParCSRMatrix **A_ff_ptr );
-HYPRE_Int hypre_MGRGetSubBlock( hypre_ParCSRMatrix *A, HYPRE_Int *row_cf_marker, HYPRE_Int *col_cf_marker, HYPRE_Int debug_flag, hypre_ParCSRMatrix **A_ff_ptr );
-HYPRE_Int hypre_MGRBuildAff( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker, HYPRE_Int debug_flag, hypre_ParCSRMatrix **A_ff_ptr );
-HYPRE_Int hypre_MGRApproximateInverse(hypre_ParCSRMatrix *A, hypre_ParCSRMatrix **A_inv);
-HYPRE_Int hypre_MGRAddVectorP ( HYPRE_Int  *CF_marker, HYPRE_Int point_type, HYPRE_Real a, hypre_ParVector *fromVector, HYPRE_Real b, hypre_ParVector **toVector );
-HYPRE_Int hypre_MGRAddVectorR ( HYPRE_Int  *CF_marker, HYPRE_Int point_type, HYPRE_Real a, hypre_ParVector *fromVector, HYPRE_Real b, hypre_ParVector **toVector );
-HYPRE_Int hypre_MGRComputeNonGalerkinCoarseGrid(hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *P, hypre_ParCSRMatrix *RT, HYPRE_Int bsize, HYPRE_Int ordering, HYPRE_Int method, HYPRE_Int Pmax, HYPRE_Int keep_stencil, HYPRE_Int *CF_marker, hypre_ParCSRMatrix **A_h_ptr);
-
-HYPRE_Int hypre_MGRWriteSolverParams(void *mgr_vdata);
+HYPRE_Int hypre_MGRGetSubBlock( hypre_ParCSRMatrix *A, HYPRE_Int *row_cf_marker,
+                                HYPRE_Int *col_cf_marker, HYPRE_Int debug_flag,
+                                hypre_ParCSRMatrix **A_ff_ptr );
+HYPRE_Int hypre_MGRBuildAff( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker, HYPRE_Int debug_flag,
+                             hypre_ParCSRMatrix **A_ff_ptr );
+HYPRE_Int hypre_MGRApproximateInverse( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix **A_inv );
+HYPRE_Int hypre_MGRAddVectorP( hypre_IntArray *CF_marker, HYPRE_Int point_type, HYPRE_Real a,
+                               hypre_ParVector *fromVector, HYPRE_Real b,
+                               hypre_ParVector **toVector );
+HYPRE_Int hypre_MGRAddVectorR( hypre_IntArray *CF_marker, HYPRE_Int point_type, HYPRE_Real a,
+                               hypre_ParVector *fromVector, HYPRE_Real b,
+                               hypre_ParVector **toVector );
+HYPRE_Int hypre_MGRTruncateAcfCPRDevice( hypre_ParCSRMatrix  *A_CF,
+                                         hypre_ParCSRMatrix **A_CF_new_ptr );
 HYPRE_Int hypre_MGRSetAffSolverType( void *systg_vdata, HYPRE_Int *aff_solver_type );
 HYPRE_Int hypre_MGRSetCoarseSolverType( void *systg_vdata, HYPRE_Int coarse_solver_type );
 HYPRE_Int hypre_MGRSetCoarseSolverIter( void *systg_vdata, HYPRE_Int coarse_solver_iter );
@@ -2195,30 +3662,43 @@ HYPRE_Int hypre_MGRSetFineSolverMaxLevels( void *systg_vdata, HYPRE_Int fine_sol
 HYPRE_Int hypre_MGRSetMaxCoarseLevels( void *mgr_vdata, HYPRE_Int maxlev );
 HYPRE_Int hypre_MGRSetBlockSize( void *mgr_vdata, HYPRE_Int bsize );
 HYPRE_Int hypre_MGRSetRelaxType( void *mgr_vdata, HYPRE_Int relax_type );
-HYPRE_Int hypre_MGRSetFRelaxMethod( void *mgr_vdata, HYPRE_Int relax_method);
-HYPRE_Int hypre_MGRSetLevelFRelaxMethod( void *mgr_vdata, HYPRE_Int *relax_method);
-HYPRE_Int hypre_MGRSetLevelFRelaxNumFunctions( void *mgr_vdata, HYPRE_Int *num_functions);
-HYPRE_Int hypre_MGRSetCoarseGridMethod( void *mgr_vdata, HYPRE_Int *cg_method);
-HYPRE_Int hypre_MGRSetRestrictType( void *mgr_vdata, HYPRE_Int restrictType);
-HYPRE_Int hypre_MGRSetLevelRestrictType( void *mgr_vdata, HYPRE_Int *restrictType);
-HYPRE_Int hypre_MGRSetInterpType( void *mgr_vdata, HYPRE_Int interpType);
-HYPRE_Int hypre_MGRSetLevelInterpType( void *mgr_vdata, HYPRE_Int *interpType);
+HYPRE_Int hypre_MGRSetFRelaxMethod( void *mgr_vdata, HYPRE_Int relax_method );
+HYPRE_Int hypre_MGRSetLevelFRelaxMethod( void *mgr_vdata, HYPRE_Int *relax_method );
+HYPRE_Int hypre_MGRSetLevelFRelaxType( void *mgr_vdata, HYPRE_Int *relax_type );
+HYPRE_Int hypre_MGRSetLevelFRelaxNumFunctions( void *mgr_vdata, HYPRE_Int *num_functions );
+HYPRE_Int hypre_MGRSetCoarseGridMethod( void *mgr_vdata, HYPRE_Int *cg_method );
+HYPRE_Int hypre_MGRSetNonGalerkinMaxElmts( void *mgr_vdata, HYPRE_Int max_elmts );
+HYPRE_Int hypre_MGRSetLevelNonGalerkinMaxElmts( void *mgr_vdata, HYPRE_Int *max_elmts );
+HYPRE_Int hypre_MGRSetRestrictType( void *mgr_vdata, HYPRE_Int restrictType );
+HYPRE_Int hypre_MGRSetLevelRestrictType( void *mgr_vdata, HYPRE_Int *restrictType );
+HYPRE_Int hypre_MGRSetInterpType( void *mgr_vdata, HYPRE_Int interpType );
+HYPRE_Int hypre_MGRSetLevelInterpType( void *mgr_vdata, HYPRE_Int *interpType );
 HYPRE_Int hypre_MGRSetNumRelaxSweeps( void *mgr_vdata, HYPRE_Int nsweeps );
+HYPRE_Int hypre_MGRSetLevelNumRelaxSweeps( void *mgr_vdata, HYPRE_Int *nsweeps );
 HYPRE_Int hypre_MGRSetNumInterpSweeps( void *mgr_vdata, HYPRE_Int nsweeps );
 HYPRE_Int hypre_MGRSetNumRestrictSweeps( void *mgr_vdata, HYPRE_Int nsweeps );
+HYPRE_Int hypre_MGRSetLevelSmoothType( void *mgr_vdata, HYPRE_Int *level_smooth_type );
+HYPRE_Int hypre_MGRSetLevelSmoothIters( void *mgr_vdata, HYPRE_Int *level_smooth_iters );
+HYPRE_Int hypre_MGRSetGlobalSmoothCycle( void *mgr_vdata, HYPRE_Int global_smooth_cycle );
+HYPRE_Int hypre_MGRSetGlobalSmootherAtLevel( void *mgr_vdata, HYPRE_Solver smoother,
+                                             HYPRE_Int level );
 HYPRE_Int hypre_MGRSetPrintLevel( void *mgr_vdata, HYPRE_Int print_level );
 HYPRE_Int hypre_MGRSetFrelaxPrintLevel( void *mgr_vdata, HYPRE_Int print_level );
 HYPRE_Int hypre_MGRSetCoarseGridPrintLevel( void *mgr_vdata, HYPRE_Int print_level );
-HYPRE_Int hypre_MGRSetTruncateCoarseGridThreshold( void *mgr_vdata, HYPRE_Real threshold);
+HYPRE_Int hypre_MGRSetTruncateCoarseGridThreshold( void *mgr_vdata, HYPRE_Real threshold );
+HYPRE_Int hypre_MGRSetBlockJacobiBlockSize( void *mgr_vdata, HYPRE_Int blk_size );
 HYPRE_Int hypre_MGRSetLogging( void *mgr_vdata, HYPRE_Int logging );
 HYPRE_Int hypre_MGRSetMaxIter( void *mgr_vdata, HYPRE_Int max_iter );
-HYPRE_Int hypre_MGRSetPMaxElmts( void *mgr_vdata, HYPRE_Int P_max_elmts);
+HYPRE_Int hypre_MGRSetPMaxElmts( void *mgr_vdata, HYPRE_Int P_max_elmts );
+HYPRE_Int hypre_MGRSetLevelPMaxElmts( void *mgr_vdata, HYPRE_Int *P_max_elmts );
 HYPRE_Int hypre_MGRSetTol( void *mgr_vdata, HYPRE_Real tol );
-HYPRE_Int hypre_MGRSetAffInv( void *mgr_vdata, hypre_ParCSRMatrix *A_ff_inv);
+HYPRE_Int hypre_MGRDataPrint(void *mgr_vdata);
 #ifdef HYPRE_USING_DSUPERLU
 void *hypre_MGRDirectSolverCreate( void );
-HYPRE_Int hypre_MGRDirectSolverSetup( void *solver, hypre_ParCSRMatrix *A, hypre_ParVector *f, hypre_ParVector *u);
-HYPRE_Int hypre_MGRDirectSolverSolve( void *solver, hypre_ParCSRMatrix *A, hypre_ParVector *f, hypre_ParVector *u);
+HYPRE_Int hypre_MGRDirectSolverSetup( void *solver, hypre_ParCSRMatrix *A,
+                                      hypre_ParVector *f, hypre_ParVector *u );
+HYPRE_Int hypre_MGRDirectSolverSolve( void *solver, hypre_ParCSRMatrix *A,
+                                      hypre_ParVector *f, hypre_ParVector *u );
 HYPRE_Int hypre_MGRDirectSolverDestroy( void *solver );
 #endif
 // Accessor functions
@@ -2226,6 +3706,89 @@ HYPRE_Int hypre_MGRGetNumIterations( void *mgr_vdata, HYPRE_Int *num_iterations
 HYPRE_Int hypre_MGRGetFinalRelativeResidualNorm( void *mgr_vdata, HYPRE_Real *res_norm );
 HYPRE_Int hypre_MGRGetCoarseGridConvergenceFactor( void *mgr_data, HYPRE_Real *conv_factor );
 
+/* par_mgr_interp.c */
+HYPRE_Int hypre_MGRBuildInterp( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *A_FF,
+                                hypre_ParCSRMatrix *A_FC, hypre_ParCSRMatrix *S,
+                                hypre_IntArray *CF_marker, HYPRE_BigInt *num_cpts_global,
+                                HYPRE_Real trunc_factor, HYPRE_Int max_elmts,
+                                HYPRE_Int block_jacobi_bsize, HYPRE_Int method,
+                                HYPRE_Int num_sweeps_post, hypre_ParCSRMatrix **Wp_ptr,
+                                hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_MGRBuildRestrict( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *A_FF,
+                                  hypre_ParCSRMatrix *A_FC, hypre_ParCSRMatrix *A_CF,
+                                  hypre_IntArray *CF_marker, HYPRE_BigInt *num_cpts_global,
+                                  HYPRE_Real trunc_factor, HYPRE_Int max_elmts,
+                                  HYPRE_Real strong_threshold, HYPRE_Real max_row_sum,
+                                  HYPRE_Int blk_size, HYPRE_Int method,
+                                  hypre_ParCSRMatrix **W_ptr, hypre_ParCSRMatrix **R_ptr,
+                                  hypre_ParCSRMatrix **RT_ptr );
+HYPRE_Int hypre_MGRBuildPFromWp( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *Wp,
+                                 HYPRE_Int *CF_marker, hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_MGRBuildPFromWpHost( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *Wp,
+                                     HYPRE_Int *CF_marker, hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_MGRBuildBlockJacobiWp( hypre_ParCSRMatrix *A_FF, hypre_ParCSRMatrix *A_FC,
+                                       HYPRE_Int blk_size, hypre_ParCSRMatrix **Wp_ptr );
+HYPRE_Int hypre_MGRBuildBlockJacobiP( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *A_FF,
+                                      hypre_ParCSRMatrix *A_FC, hypre_ParCSRMatrix *Wp,
+                                      HYPRE_Int blk_size, HYPRE_Int *CF_marker,
+                                      hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_MGRBuildP( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                           HYPRE_BigInt *num_cpts_global, HYPRE_Int method,
+                           HYPRE_Int debug_flag, hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_MGRBuildPHost( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *A_FF,
+                               hypre_ParCSRMatrix *A_FC, HYPRE_Int *CF_marker,
+                               HYPRE_BigInt *num_cpts_global, HYPRE_Int method,
+                               hypre_ParCSRMatrix **Wp_ptr, hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_MGRBuildInterpApproximateInverse( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                                  HYPRE_BigInt *num_cpts_global,
+                                                  hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_MGRTruncateAcfCPR( hypre_ParCSRMatrix *A_CF, hypre_ParCSRMatrix **A_CF_new_ptr );
+HYPRE_Int hypre_MGRBuildRFromWr( hypre_IntArray *C_map, hypre_IntArray *F_map,
+                                 HYPRE_BigInt global_num_rows_R, HYPRE_BigInt global_num_cols_R,
+                                 HYPRE_BigInt *row_starts_R, HYPRE_BigInt *col_starts_R,
+                                 hypre_ParCSRMatrix *Wr, hypre_ParCSRMatrix **R_ptr );
+HYPRE_Int hypre_MGRBlockColLumpedRestrict( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *A_FF,
+                                           hypre_ParCSRMatrix *A_CF, hypre_IntArray *CF_marker,
+                                           HYPRE_Int blk_dim, hypre_ParCSRMatrix **Wr_ptr,
+                                           hypre_ParCSRMatrix **R_ptr);
+HYPRE_Int hypre_MGRColLumpedRestrict(hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *A_FF,
+                                     hypre_ParCSRMatrix *A_CF, hypre_IntArray *CF_marker,
+                                     hypre_ParCSRMatrix **Wr_ptr, hypre_ParCSRMatrix **R_ptr);
+
+/* par_mgr_rap.c */
+HYPRE_Int hypre_MGRBuildCoarseOperator(void *mgr_data, hypre_ParCSRMatrix *A_FF,
+                                       hypre_ParCSRMatrix *A_FC, hypre_ParCSRMatrix *A_CF,
+                                       hypre_ParCSRMatrix **A_CC_ptr, hypre_ParCSRMatrix *Wp,
+                                       hypre_ParCSRMatrix *Wr, HYPRE_Int level);
+
+/* par_mgr_coarsen.c */
+HYPRE_Int hypre_MGRCoarseParms( MPI_Comm comm, HYPRE_Int num_rows, hypre_IntArray *CF_marker,
+                                HYPRE_BigInt *row_starts_cpts, HYPRE_BigInt *row_starts_fpts );
+
+/* par_mgr_device.c */
+HYPRE_Int hypre_MGRRelaxL1JacobiDevice( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                        HYPRE_Int *CF_marker_host, HYPRE_Int relax_points,
+                                        HYPRE_Real relax_weight, HYPRE_Real *l1_norms,
+                                        hypre_ParVector *u, hypre_ParVector *Vtemp );
+HYPRE_Int hypre_MGRBuildPFromWpDevice( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *Wp,
+                                       HYPRE_Int *CF_marker, hypre_ParCSRMatrix **P_ptr);
+HYPRE_Int hypre_MGRBuildPDevice( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                 HYPRE_BigInt *num_cpts_global, HYPRE_Int method,
+                                 hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_ParCSRMatrixExtractBlockDiagDevice( hypre_ParCSRMatrix *A, HYPRE_Int blk_size,
+                                                    HYPRE_Int num_points, HYPRE_Int point_type,
+                                                    HYPRE_Int *CF_marker, HYPRE_Int diag_size,
+                                                    HYPRE_Int diag_type, HYPRE_Int *B_diag_i,
+                                                    HYPRE_Int *B_diag_j,
+                                                    HYPRE_Complex *B_diag_data );
+HYPRE_Int hypre_ParCSRMatrixBlockDiagMatrixDevice( hypre_ParCSRMatrix *A, HYPRE_Int blk_size,
+                                                   HYPRE_Int point_type, HYPRE_Int *CF_marker,
+                                                   HYPRE_Int diag_type,
+                                                   hypre_ParCSRMatrix **B_ptr );
+
+/* par_mgr_stats.c */
+HYPRE_Int hypre_MGRSetupStats( void *mgr_vdata );
+
 /* par_ilu.c */
 void *hypre_ILUCreate ( void );
 HYPRE_Int hypre_ILUDestroy ( void *ilu_vdata );
@@ -2236,12 +3799,18 @@ HYPRE_Int hypre_ILUSetDropThresholdArray( void *ilu_vdata, HYPRE_Real *threshold
 HYPRE_Int hypre_ILUSetType( void *ilu_vdata, HYPRE_Int ilu_type );
 HYPRE_Int hypre_ILUSetMaxIter( void *ilu_vdata, HYPRE_Int max_iter );
 HYPRE_Int hypre_ILUSetTol( void *ilu_vdata, HYPRE_Real tol );
-HYPRE_Int hypre_ILUSetup( void *ilu_vdata, hypre_ParCSRMatrix *A, hypre_ParVector    *f, hypre_ParVector    *u );
-HYPRE_Int hypre_ILUSolve( void *ilu_vdata, hypre_ParCSRMatrix *A, hypre_ParVector *f, hypre_ParVector  *u );
+HYPRE_Int hypre_ILUSetIterativeSetupType( void *ilu_vdata, HYPRE_Int iter_setup_type );
+HYPRE_Int hypre_ILUSetIterativeSetupOption( void *ilu_vdata, HYPRE_Int iter_setup_option );
+HYPRE_Int hypre_ILUSetIterativeSetupMaxIter( void *ilu_vdata, HYPRE_Int iter_setup_max_iter );
+HYPRE_Int hypre_ILUSetIterativeSetupTolerance( void *ilu_vdata, HYPRE_Real iter_setup_tolerance );
+HYPRE_Int hypre_ILUGetIterativeSetupHistory( void *ilu_vdata,
+                                             HYPRE_Complex **iter_setup_history );
+HYPRE_Int hypre_ILUSetTriSolve( void *ilu_vdata, HYPRE_Int tri_solve );
+HYPRE_Int hypre_ILUSetLowerJacobiIters( void *ilu_vdata, HYPRE_Int lower_jacobi_iters );
+HYPRE_Int hypre_ILUSetUpperJacobiIters( void *ilu_vdata, HYPRE_Int upper_jacobi_iters );
 HYPRE_Int hypre_ILUSetPrintLevel( void *ilu_vdata, HYPRE_Int print_level );
 HYPRE_Int hypre_ILUSetLogging( void *ilu_vdata, HYPRE_Int logging );
 HYPRE_Int hypre_ILUSetLocalReordering( void *ilu_vdata, HYPRE_Int ordering_type );
-HYPRE_Int hypre_ILUSetSchurSolverKDIM( void *ilu_vdata, HYPRE_Int ss_kDim );
 HYPRE_Int hypre_ILUSetSchurSolverMaxIter( void *ilu_vdata, HYPRE_Int ss_max_iter );
 HYPRE_Int hypre_ILUSetSchurSolverTol( void *ilu_vdata, HYPRE_Real ss_tol );
 HYPRE_Int hypre_ILUSetSchurSolverAbsoluteTol( void *ilu_vdata, HYPRE_Real ss_absolute_tol );
@@ -2250,70 +3819,98 @@ HYPRE_Int hypre_ILUSetSchurSolverPrintLevel( void *ilu_vdata, HYPRE_Int ss_print
 HYPRE_Int hypre_ILUSetSchurSolverRelChange( void *ilu_vdata, HYPRE_Int ss_rel_change );
 HYPRE_Int hypre_ILUSetSchurPrecondILUType( void *ilu_vdata, HYPRE_Int sp_ilu_type );
 HYPRE_Int hypre_ILUSetSchurPrecondILULevelOfFill( void *ilu_vdata, HYPRE_Int sp_ilu_lfil );
-HYPRE_Int hypre_ILUSetSchurPrecondILUMaxNnzPerRow( void *ilu_vdata, HYPRE_Int sp_ilu_max_row_nnz );
+HYPRE_Int hypre_ILUSetSchurPrecondILUMaxNnzPerRow( void *ilu_vdata,
+                                                   HYPRE_Int sp_ilu_max_row_nnz );
 HYPRE_Int hypre_ILUSetSchurPrecondILUDropThreshold( void *ilu_vdata, HYPRE_Real sp_ilu_droptol );
-HYPRE_Int hypre_ILUSetSchurPrecondILUDropThresholdArray( void *ilu_vdata, HYPRE_Real *sp_ilu_droptol );
+HYPRE_Int hypre_ILUSetSchurPrecondILUDropThresholdArray( void *ilu_vdata,
+                                                         HYPRE_Real *sp_ilu_droptol );
 HYPRE_Int hypre_ILUSetSchurPrecondPrintLevel( void *ilu_vdata, HYPRE_Int sp_print_level );
 HYPRE_Int hypre_ILUSetSchurPrecondMaxIter( void *ilu_vdata, HYPRE_Int sp_max_iter );
+HYPRE_Int hypre_ILUSetSchurPrecondTriSolve( void *ilu_vdata, HYPRE_Int sp_tri_solve );
+HYPRE_Int hypre_ILUSetSchurPrecondLowerJacobiIters( void *ilu_vdata,
+                                                    HYPRE_Int sp_lower_jacobi_iters );
+HYPRE_Int hypre_ILUSetSchurPrecondUpperJacobiIters( void *ilu_vdata,
+                                                    HYPRE_Int sp_upper_jacobi_iters );
 HYPRE_Int hypre_ILUSetSchurPrecondTol( void *ilu_vdata, HYPRE_Int sp_tol );
-HYPRE_Int hypre_ILUMinHeapAddI(HYPRE_Int *heap, HYPRE_Int len);
-HYPRE_Int hypre_ILUMinHeapAddIIIi(HYPRE_Int *heap, HYPRE_Int *I1, HYPRE_Int *Ii1, HYPRE_Int len);
-HYPRE_Int hypre_ILUMinHeapAddIRIi(HYPRE_Int *heap, HYPRE_Real *I1, HYPRE_Int *Ii1, HYPRE_Int len);
-HYPRE_Int hypre_ILUMaxHeapAddRabsIIi(HYPRE_Real *heap, HYPRE_Int *I1, HYPRE_Int *Ii1, HYPRE_Int len);
-HYPRE_Int hypre_ILUMaxrHeapAddRabsI(HYPRE_Real *heap, HYPRE_Int *I1, HYPRE_Int len);
-HYPRE_Int hypre_ILUMinHeapRemoveI(HYPRE_Int *heap, HYPRE_Int len);
-HYPRE_Int hypre_ILUMinHeapRemoveIIIi(HYPRE_Int *heap, HYPRE_Int *I1, HYPRE_Int *Ii1, HYPRE_Int len);
-HYPRE_Int hypre_ILUMinHeapRemoveIRIi(HYPRE_Int *heap, HYPRE_Real *I1, HYPRE_Int *Ii1, HYPRE_Int len);
-HYPRE_Int hypre_ILUMaxHeapRemoveRabsIIi(HYPRE_Real *heap, HYPRE_Int *I1, HYPRE_Int *Ii1, HYPRE_Int len);
-HYPRE_Int hypre_ILUMaxrHeapRemoveRabsI(HYPRE_Real *heap, HYPRE_Int *I1, HYPRE_Int len);
-HYPRE_Int hypre_ILUMaxQSplitRI(HYPRE_Real *array, HYPRE_Int *I1, HYPRE_Int left, HYPRE_Int bound, HYPRE_Int right);
-HYPRE_Int hypre_ILUMaxQSplitRabsI(HYPRE_Real *array, HYPRE_Int *I1, HYPRE_Int left, HYPRE_Int bound, HYPRE_Int right);
-//HYPRE_Int hypre_quickSortIR (HYPRE_Int *a, HYPRE_Real *b, HYPRE_Int *iw, const HYPRE_Int lo, const HYPRE_Int hi);
-HYPRE_Int hypre_ILUSortOffdColmap(hypre_ParCSRMatrix *A);
-HYPRE_Int hypre_ILUMaxRabs(HYPRE_Real *array_data, HYPRE_Int *array_j, HYPRE_Int start, HYPRE_Int end, HYPRE_Int nLU, HYPRE_Int *rperm, HYPRE_Real *value, HYPRE_Int *index, HYPRE_Real *l1_norm, HYPRE_Int *nnz);
-HYPRE_Int hypre_ILUGetPermddPQPre(HYPRE_Int n, HYPRE_Int nLU, HYPRE_Int *A_diag_i, HYPRE_Int *A_diag_j, HYPRE_Real *A_diag_data, HYPRE_Real tol, HYPRE_Int *perm, HYPRE_Int *rperm, HYPRE_Int *pperm_pre, HYPRE_Int *qperm_pre, HYPRE_Int *nB);
-HYPRE_Int hypre_ILUGetPermddPQ(hypre_ParCSRMatrix *A, HYPRE_Int **pperm, HYPRE_Int **qperm, HYPRE_Real tol, HYPRE_Int *nB, HYPRE_Int *nI, HYPRE_Int reordering_type);
-HYPRE_Int hypre_ILUGetInteriorExteriorPerm(hypre_ParCSRMatrix *A, HYPRE_Int **perm, HYPRE_Int *nLU, HYPRE_Int reordering_type);
-HYPRE_Int hypre_ILUGetLocalPerm(hypre_ParCSRMatrix *A, HYPRE_Int **perm, HYPRE_Int *nLU, HYPRE_Int reordering_type);
-HYPRE_Int hypre_ILUWriteSolverParams(void *ilu_vdata);
-HYPRE_Int hypre_ILUBuildRASExternalMatrix(hypre_ParCSRMatrix *A, HYPRE_Int *rperm, HYPRE_Int **E_i, HYPRE_Int **E_j, HYPRE_Real **E_data);
-HYPRE_Int hypre_ILUSetupILU0(hypre_ParCSRMatrix *A, HYPRE_Int *perm, HYPRE_Int *qperm, HYPRE_Int nLU, HYPRE_Int nI, hypre_ParCSRMatrix **Lptr, HYPRE_Real** Dptr, hypre_ParCSRMatrix **Uptr, hypre_ParCSRMatrix **Sptr, HYPRE_Int **u_end);
-HYPRE_Int hypre_ILUSetupMILU0(hypre_ParCSRMatrix *A, HYPRE_Int *permp, HYPRE_Int *qpermp, HYPRE_Int nLU, HYPRE_Int nI, hypre_ParCSRMatrix **Lptr, HYPRE_Real** Dptr, hypre_ParCSRMatrix **Uptr, hypre_ParCSRMatrix **Sptr, HYPRE_Int **u_end, HYPRE_Int modified);
-HYPRE_Int hypre_ILUSetupILUK(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *permp, HYPRE_Int *qpermp, HYPRE_Int nLU, HYPRE_Int nI, hypre_ParCSRMatrix **Lptr, HYPRE_Real** Dptr, hypre_ParCSRMatrix **Uptr, hypre_ParCSRMatrix **Sptr, HYPRE_Int **u_end);
-HYPRE_Int hypre_ILUSetupILUKSymbolic(HYPRE_Int n, HYPRE_Int *A_diag_i, HYPRE_Int *A_diag_j, HYPRE_Int lfil, HYPRE_Int *perm, HYPRE_Int *rperm, HYPRE_Int *iw, HYPRE_Int nLU, HYPRE_Int *L_diag_i, HYPRE_Int *U_diag_i, HYPRE_Int *S_diag_i, HYPRE_Int **L_diag_j, HYPRE_Int **U_diag_j, HYPRE_Int **S_diag_j, HYPRE_Int **u_end);
-HYPRE_Int hypre_ILUSetupILUT(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol, HYPRE_Int *permp, HYPRE_Int *qpermp, HYPRE_Int nLU, HYPRE_Int nI, hypre_ParCSRMatrix **Lptr, HYPRE_Real** Dptr, hypre_ParCSRMatrix **Uptr, hypre_ParCSRMatrix **Sptr, HYPRE_Int **u_end);
-HYPRE_Int hypre_ILUSetupILU0RAS(hypre_ParCSRMatrix *A, HYPRE_Int *perm, HYPRE_Int nLU, hypre_ParCSRMatrix **Lptr, HYPRE_Real** Dptr, hypre_ParCSRMatrix **Uptr);
-HYPRE_Int hypre_ILUSetupILUKRASSymbolic(HYPRE_Int n, HYPRE_Int *A_diag_i, HYPRE_Int *A_diag_j, HYPRE_Int *A_offd_i, HYPRE_Int *A_offd_j, HYPRE_Int *E_i, HYPRE_Int *E_j, HYPRE_Int ext, HYPRE_Int lfil, HYPRE_Int *perm, HYPRE_Int *rperm, HYPRE_Int *iw, HYPRE_Int nLU, HYPRE_Int *L_diag_i, HYPRE_Int *U_diag_i, HYPRE_Int **L_diag_j, HYPRE_Int **U_diag_j);
-HYPRE_Int hypre_ILUSetupILUKRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *perm, HYPRE_Int nLU, hypre_ParCSRMatrix **Lptr, HYPRE_Real** Dptr, hypre_ParCSRMatrix **Uptr);
-HYPRE_Int hypre_ILUSetupILUTRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol, HYPRE_Int *perm, HYPRE_Int nLU, hypre_ParCSRMatrix **Lptr, HYPRE_Real** Dptr, hypre_ParCSRMatrix **Uptr);
-HYPRE_Int hypre_ILUSolveLU(hypre_ParCSRMatrix *A, hypre_ParVector *f, hypre_ParVector *u, HYPRE_Int *perm, HYPRE_Int nLU, hypre_ParCSRMatrix *L, HYPRE_Real* D, hypre_ParCSRMatrix *U, hypre_ParVector *utemp, hypre_ParVector *ftemp);
-HYPRE_Int hypre_ILUSolveSchurGMRES(hypre_ParCSRMatrix *A, hypre_ParVector *f, hypre_ParVector *u, HYPRE_Int *perm, HYPRE_Int *qperm, HYPRE_Int nLU, hypre_ParCSRMatrix *L, HYPRE_Real* D, hypre_ParCSRMatrix *U, hypre_ParCSRMatrix *S, hypre_ParVector *ftemp, hypre_ParVector *utemp, HYPRE_Solver schur_solver, HYPRE_Solver schur_precond, hypre_ParVector *rhs, hypre_ParVector *x, HYPRE_Int *u_end);
-HYPRE_Int hypre_ILUSolveSchurNSH(hypre_ParCSRMatrix *A, hypre_ParVector *f, hypre_ParVector *u, HYPRE_Int *perm, HYPRE_Int nLU, hypre_ParCSRMatrix *L, HYPRE_Real* D, hypre_ParCSRMatrix *U, hypre_ParCSRMatrix *S, hypre_ParVector *ftemp, hypre_ParVector *utemp, HYPRE_Solver schur_solver, hypre_ParVector *rhs, hypre_ParVector *x, HYPRE_Int *u_end);
-HYPRE_Int hypre_ILUSolveLURAS(hypre_ParCSRMatrix *A, hypre_ParVector *f, hypre_ParVector *u, HYPRE_Int *perm, hypre_ParCSRMatrix *L, HYPRE_Real* D, hypre_ParCSRMatrix *U, hypre_ParVector *ftemp, hypre_ParVector *utemp, HYPRE_Real *fext, HYPRE_Real *uext);
-HYPRE_Int hypre_ILUSetSchurNSHDropThreshold( void *ilu_vdata, HYPRE_Real threshold);
-HYPRE_Int hypre_ILUSetSchurNSHDropThresholdArray( void *ilu_vdata, HYPRE_Real *threshold);
-HYPRE_Int hypre_ILUSetupRAPILU0(hypre_ParCSRMatrix *A, HYPRE_Int *perm, HYPRE_Int n, HYPRE_Int nLU, hypre_ParCSRMatrix **Lptr, HYPRE_Real **Dptr, hypre_ParCSRMatrix **Uptr, hypre_ParCSRMatrix **mLptr, HYPRE_Real **mDptr, hypre_ParCSRMatrix **mUptr, HYPRE_Int **u_end);
-HYPRE_Int hypre_ILUSolveRAPGMRESHOST(hypre_ParCSRMatrix *A, hypre_ParVector *f, hypre_ParVector *u, HYPRE_Int *perm, HYPRE_Int nLU, hypre_ParCSRMatrix *L, HYPRE_Real *D, hypre_ParCSRMatrix *U, hypre_ParCSRMatrix *mL, HYPRE_Real *mD, hypre_ParCSRMatrix *mU, hypre_ParVector *ftemp, hypre_ParVector *utemp,hypre_ParVector *xtemp, hypre_ParVector *ytemp, HYPRE_Solver schur_solver, HYPRE_Solver schur_precond, hypre_ParVector *rhs, hypre_ParVector *x, HYPRE_Int *u_end);
-HYPRE_Int hypre_ParILURAPSchurGMRESSolveH( void *ilu_vdata, void *ilu_vdata2, hypre_ParVector *f, hypre_ParVector *u );
-HYPRE_Int hypre_ParILURAPSchurGMRESDummySetupH(void *a, void *b, void *c, void *d);
-HYPRE_Int hypre_ParILURAPSchurGMRESCommInfoH( void *ilu_vdata, HYPRE_Int *my_id, HYPRE_Int *num_procs);
-void *hypre_ParILURAPSchurGMRESMatvecCreateH(void *ilu_vdata, void *x);
-HYPRE_Int hypre_ParILURAPSchurGMRESMatvecH(void *matvec_data, HYPRE_Complex alpha, void *ilu_vdata, void *x, HYPRE_Complex beta, void *y);
-HYPRE_Int hypre_ParILURAPSchurGMRESMatvecDestroyH(void *matvec_data );
-HYPRE_Int hypre_ILULocalRCM( hypre_CSRMatrix *A, HYPRE_Int start, HYPRE_Int end, HYPRE_Int **permp, HYPRE_Int **qpermp, HYPRE_Int sym);
-HYPRE_Int hypre_ILULocalRCMNumbering(hypre_CSRMatrix *A, HYPRE_Int root, HYPRE_Int *marker, HYPRE_Int *perm, HYPRE_Int *current_nump);
-HYPRE_Int hypre_ILULocalRCMFindPPNode( hypre_CSRMatrix *A, HYPRE_Int *rootp, HYPRE_Int *marker);
-HYPRE_Int hypre_ILULocalRCMMindegree(HYPRE_Int n, HYPRE_Int *degree, HYPRE_Int *marker, HYPRE_Int *rootp);
-HYPRE_Int hypre_ILULocalRCMOrder( hypre_CSRMatrix *A, HYPRE_Int *perm);
-HYPRE_Int hypre_ILULocalRCMBuildLevel(hypre_CSRMatrix *A, HYPRE_Int root, HYPRE_Int *marker, HYPRE_Int *level_i, HYPRE_Int *level_j, HYPRE_Int *nlevp);
-HYPRE_Int hypre_ILULocalRCMQsort(HYPRE_Int *perm, HYPRE_Int start, HYPRE_Int end, HYPRE_Int *degree);
-HYPRE_Int hypre_ILULocalRCMReverse(HYPRE_Int *perm, HYPRE_Int start, HYPRE_Int end);
-// Newton-Schultz-Hotelling (NSH) functions
-void * hypre_NSHCreate();
+HYPRE_Int hypre_ILUSetSchurNSHDropThreshold( void *ilu_vdata, HYPRE_Real threshold );
+HYPRE_Int hypre_ILUSetSchurNSHDropThresholdArray( void *ilu_vdata, HYPRE_Real *threshold );
+HYPRE_Int hypre_ILUGetNumIterations( void *ilu_vdata, HYPRE_Int *num_iterations );
+HYPRE_Int hypre_ILUGetFinalRelativeResidualNorm( void *ilu_vdata, HYPRE_Real *res_norm );
+HYPRE_Int hypre_ILUWriteSolverParams( void *ilu_vdata );
+
+HYPRE_Int hypre_ILUMinHeapAddI( HYPRE_Int *heap, HYPRE_Int len );
+HYPRE_Int hypre_ILUMinHeapAddIIIi( HYPRE_Int *heap, HYPRE_Int *I1,
+                                   HYPRE_Int *Ii1, HYPRE_Int len );
+HYPRE_Int hypre_ILUMinHeapAddIRIi( HYPRE_Int *heap, HYPRE_Real *I1,
+                                   HYPRE_Int *Ii1, HYPRE_Int len );
+HYPRE_Int hypre_ILUMaxrHeapAddRabsI( HYPRE_Real *heap, HYPRE_Int *I1, HYPRE_Int len );
+HYPRE_Int hypre_ILUMinHeapRemoveI( HYPRE_Int *heap, HYPRE_Int len );
+HYPRE_Int hypre_ILUMinHeapRemoveIIIi( HYPRE_Int *heap, HYPRE_Int *I1,
+                                      HYPRE_Int *Ii1, HYPRE_Int len );
+HYPRE_Int hypre_ILUMinHeapRemoveIRIi( HYPRE_Int *heap, HYPRE_Real *I1,
+                                      HYPRE_Int *Ii1, HYPRE_Int len );
+HYPRE_Int hypre_ILUMaxrHeapRemoveRabsI( HYPRE_Real *heap, HYPRE_Int *I1, HYPRE_Int len );
+HYPRE_Int hypre_ILUMaxQSplitRabsI( HYPRE_Real *arrayR, HYPRE_Int *arrayI, HYPRE_Int left,
+                                   HYPRE_Int bound, HYPRE_Int right );
+HYPRE_Int hypre_ILUMaxRabs( HYPRE_Real *array_data, HYPRE_Int *array_j, HYPRE_Int start,
+                            HYPRE_Int end, HYPRE_Int nLU, HYPRE_Int *rperm, HYPRE_Real *value,
+                            HYPRE_Int *index, HYPRE_Real *l1_norm, HYPRE_Int *nnz );
+
+HYPRE_Int hypre_ILUGetPermddPQPre( HYPRE_Int n, HYPRE_Int nLU, HYPRE_Int *A_diag_i,
+                                   HYPRE_Int *A_diag_j, HYPRE_Real *A_diag_data,
+                                   HYPRE_Real tol, HYPRE_Int *perm, HYPRE_Int *rperm,
+                                   HYPRE_Int *pperm_pre, HYPRE_Int *qperm_pre, HYPRE_Int *nB );
+HYPRE_Int hypre_ILUGetPermddPQ( hypre_ParCSRMatrix *A, HYPRE_Int **io_pperm, HYPRE_Int **io_qperm,
+                                HYPRE_Real tol, HYPRE_Int *nB, HYPRE_Int *nI,
+                                HYPRE_Int reordering_type );
+HYPRE_Int hypre_ILUGetInteriorExteriorPerm( hypre_ParCSRMatrix *A,
+                                            HYPRE_MemoryLocation memory_location,
+                                            HYPRE_Int **perm, HYPRE_Int *nLU,
+                                            HYPRE_Int reordering_type );
+HYPRE_Int hypre_ILUGetLocalPerm( hypre_ParCSRMatrix *A, HYPRE_Int **perm_ptr,
+                                 HYPRE_Int *nLU, HYPRE_Int reordering_type );
+HYPRE_Int hypre_ILUBuildRASExternalMatrix( hypre_ParCSRMatrix *A, HYPRE_Int *rperm,
+                                           HYPRE_Int **E_i, HYPRE_Int **E_j, HYPRE_Real **E_data );
+HYPRE_Int hypre_ILUSortOffdColmap( hypre_ParCSRMatrix *A );
+HYPRE_Int hypre_ILULocalRCMBuildFinalPerm( HYPRE_Int start, HYPRE_Int end,
+                                           HYPRE_Int * G_perm, HYPRE_Int *perm, HYPRE_Int *qperm,
+                                           HYPRE_Int **permp, HYPRE_Int **qpermp );
+HYPRE_Int hypre_ILULocalRCM( hypre_CSRMatrix *A, HYPRE_Int start, HYPRE_Int end,
+                             HYPRE_Int **permp, HYPRE_Int **qpermp, HYPRE_Int sym );
+HYPRE_Int hypre_ILULocalRCMMindegree( HYPRE_Int n, HYPRE_Int *degree,
+                                      HYPRE_Int *marker, HYPRE_Int *rootp );
+HYPRE_Int hypre_ILULocalRCMOrder( hypre_CSRMatrix *A, HYPRE_Int *perm );
+HYPRE_Int hypre_ILULocalRCMFindPPNode( hypre_CSRMatrix *A, HYPRE_Int *rootp, HYPRE_Int *marker );
+HYPRE_Int hypre_ILULocalRCMBuildLevel( hypre_CSRMatrix *A, HYPRE_Int root, HYPRE_Int *marker,
+                                       HYPRE_Int *level_i, HYPRE_Int *level_j, HYPRE_Int *nlevp );
+HYPRE_Int hypre_ILULocalRCMNumbering( hypre_CSRMatrix *A, HYPRE_Int root, HYPRE_Int *marker,
+                                      HYPRE_Int *perm, HYPRE_Int *current_nump );
+HYPRE_Int hypre_ILULocalRCMQsort( HYPRE_Int *perm, HYPRE_Int start, HYPRE_Int end,
+                                  HYPRE_Int *degree );
+HYPRE_Int hypre_ILULocalRCMReverse( HYPRE_Int *perm, HYPRE_Int start, HYPRE_Int end );
+
+#if defined(HYPRE_USING_GPU)
+HYPRE_Int hypre_ParILUSchurGMRESDummySolveDevice( void *ilu_vdata, void *ilu_vdata2,
+                                                  hypre_ParVector *f, hypre_ParVector *u );
+HYPRE_Int hypre_ParILUSchurGMRESCommInfoDevice( void *ilu_vdata, HYPRE_Int *my_id,
+                                                HYPRE_Int *num_procs );
+HYPRE_Int hypre_ParILURAPSchurGMRESSolveDevice( void *ilu_vdata, void *ilu_vdata2,
+                                                hypre_ParVector *par_f, hypre_ParVector *par_u );
+HYPRE_Int hypre_ParILURAPSchurGMRESMatvecDevice( void *matvec_data, HYPRE_Complex alpha,
+                                                 void *ilu_vdata, void *x,
+                                                 HYPRE_Complex beta, void *y );
+#endif
+HYPRE_Int hypre_ParILURAPSchurGMRESCommInfoHost( void *ilu_vdata, HYPRE_Int *my_id,
+                                                 HYPRE_Int *num_procs );
+HYPRE_Int hypre_ParILURAPSchurGMRESSolveHost( void *ilu_vdata, void *ilu_vdata2,
+                                              hypre_ParVector *f, hypre_ParVector *u );
+HYPRE_Int hypre_ParILURAPSchurGMRESMatvecHost( void *matvec_data, HYPRE_Complex alpha,
+                                               void *ilu_vdata, void *x,
+                                               HYPRE_Complex beta, void *y );
+
+void * hypre_NSHCreate( void );
 HYPRE_Int hypre_NSHDestroy( void *data );
-HYPRE_Int hypre_NSHSetup( void *nsh_vdata, hypre_ParCSRMatrix *A, hypre_ParVector *f, hypre_ParVector *u );
-HYPRE_Int hypre_NSHSolve( void *nsh_vdata, hypre_ParCSRMatrix *A, hypre_ParVector *f, hypre_ParVector *u );
-HYPRE_Int hypre_NSHWriteSolverParams(void *nsh_vdata);
+HYPRE_Int hypre_NSHWriteSolverParams( void *nsh_vdata );
 HYPRE_Int hypre_NSHSetPrintLevel( void *nsh_vdata, HYPRE_Int print_level );
 HYPRE_Int hypre_NSHSetLogging( void *nsh_vdata, HYPRE_Int logging );
 HYPRE_Int hypre_NSHSetMaxIter( void *nsh_vdata, HYPRE_Int max_iter );
@@ -2328,112 +3925,428 @@ HYPRE_Int hypre_NSHSetColVersion( void *nsh_vdata, HYPRE_Int mr_col_version );
 HYPRE_Int hypre_NSHSetNSHMaxIter( void *nsh_vdata, HYPRE_Int nsh_max_iter );
 HYPRE_Int hypre_NSHSetNSHTol( void *nsh_vdata, HYPRE_Real nsh_tol );
 HYPRE_Int hypre_NSHSetNSHMaxRowNnz( void *nsh_vdata, HYPRE_Int nsh_max_row_nnz );
-HYPRE_Int hypre_CSRMatrixNormFro(hypre_CSRMatrix *A, HYPRE_Real *norm_io);
-HYPRE_Int hypre_CSRMatrixResNormFro(hypre_CSRMatrix *A, HYPRE_Real *norm_io);
-HYPRE_Int hypre_ParCSRMatrixNormFro(hypre_ParCSRMatrix *A, HYPRE_Real *norm_io);
-HYPRE_Int hypre_ParCSRMatrixResNormFro(hypre_ParCSRMatrix *A, HYPRE_Real *norm_io);
-HYPRE_Int hypre_CSRMatrixTrace(hypre_CSRMatrix *A, HYPRE_Real *trace_io);
-HYPRE_Int hypre_CSRMatrixDropInplace(hypre_CSRMatrix *A, HYPRE_Real droptol, HYPRE_Int max_row_nnz);
-HYPRE_Int hypre_ILUCSRMatrixInverseSelfPrecondMRGlobal(hypre_CSRMatrix *matA, hypre_CSRMatrix **M, HYPRE_Real droptol, HYPRE_Real tol, HYPRE_Real eps_tol, HYPRE_Int max_row_nnz, HYPRE_Int max_iter, HYPRE_Int print_level );
-HYPRE_Int hypre_ILUParCSRInverseNSH(hypre_ParCSRMatrix *A, hypre_ParCSRMatrix **M, HYPRE_Real *droptol, HYPRE_Real mr_tol, HYPRE_Real nsh_tol, HYPRE_Real eps_tol, HYPRE_Int mr_max_row_nnz, HYPRE_Int nsh_max_row_nnz, HYPRE_Int mr_max_iter, HYPRE_Int nsh_max_iter, HYPRE_Int mr_col_version, HYPRE_Int print_level);
-HYPRE_Int hypre_NSHSolveInverse(hypre_ParCSRMatrix *A, hypre_ParVector *f, hypre_ParVector *u, hypre_ParCSRMatrix *M, hypre_ParVector *ftemp, hypre_ParVector *utemp);
-// Accessor functions
-HYPRE_Int hypre_ILUGetNumIterations( void *ilu_vdata, HYPRE_Int *num_iterations );
-HYPRE_Int hypre_ILUGetFinalRelativeResidualNorm( void *ilu_vdata, HYPRE_Real *res_norm );
+HYPRE_Int hypre_CSRMatrixNormFro( hypre_CSRMatrix *A, HYPRE_Real *norm_io);
+HYPRE_Int hypre_CSRMatrixResNormFro( hypre_CSRMatrix *A, HYPRE_Real *norm_io);
+HYPRE_Int hypre_ParCSRMatrixNormFro( hypre_ParCSRMatrix *A, HYPRE_Real *norm_io);
+HYPRE_Int hypre_ParCSRMatrixResNormFro( hypre_ParCSRMatrix *A, HYPRE_Real *norm_io);
+HYPRE_Int hypre_CSRMatrixTrace( hypre_CSRMatrix *A, HYPRE_Real *trace_io);
+HYPRE_Int hypre_CSRMatrixDropInplace( hypre_CSRMatrix *A, HYPRE_Real droptol,
+                                      HYPRE_Int max_row_nnz );
+HYPRE_Int hypre_ILUCSRMatrixInverseSelfPrecondMRGlobal( hypre_CSRMatrix *matA,
+                                                        hypre_CSRMatrix **M,
+                                                        HYPRE_Real droptol, HYPRE_Real tol,
+                                                        HYPRE_Real eps_tol, HYPRE_Int max_row_nnz,
+                                                        HYPRE_Int max_iter,
+                                                        HYPRE_Int print_level );
+HYPRE_Int hypre_ILUParCSRInverseNSH( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix **M,
+                                     HYPRE_Real *droptol, HYPRE_Real mr_tol,
+                                     HYPRE_Real nsh_tol, HYPRE_Real eps_tol,
+                                     HYPRE_Int mr_max_row_nnz, HYPRE_Int nsh_max_row_nnz,
+                                     HYPRE_Int mr_max_iter, HYPRE_Int nsh_max_iter,
+                                     HYPRE_Int mr_col_version, HYPRE_Int print_level );
+
+/* par_ilu_setup.c */
+HYPRE_Int hypre_ILUSetup( void *ilu_vdata, hypre_ParCSRMatrix *A,
+                          hypre_ParVector *f, hypre_ParVector *u );
+HYPRE_Int hypre_ParILUExtractEBFC( hypre_CSRMatrix *A_diag, HYPRE_Int nLU,
+                                   hypre_CSRMatrix **Bp, hypre_CSRMatrix **Cp,
+                                   hypre_CSRMatrix **Ep, hypre_CSRMatrix **Fp );
+HYPRE_Int hypre_ParILURAPReorder( hypre_ParCSRMatrix *A, HYPRE_Int *perm,
+                                  HYPRE_Int *rqperm, hypre_ParCSRMatrix **A_pq );
+HYPRE_Int hypre_ILUSetupLDUtoCusparse( hypre_ParCSRMatrix *L, HYPRE_Real *D,
+                                       hypre_ParCSRMatrix  *U, hypre_ParCSRMatrix **LDUp );
+HYPRE_Int hypre_ILUSetupRAPMILU0( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix **ALUp,
+                                  HYPRE_Int modified );
+HYPRE_Int hypre_ILUSetupRAPILU0Device( hypre_ParCSRMatrix *A, HYPRE_Int *perm, HYPRE_Int n,
+                                       HYPRE_Int nLU, hypre_ParCSRMatrix **Apermptr,
+                                       hypre_ParCSRMatrix **matSptr, hypre_CSRMatrix **ALUptr,
+                                       hypre_CSRMatrix **BLUptr, hypre_CSRMatrix **CLUptr,
+                                       hypre_CSRMatrix **Eptr, hypre_CSRMatrix **Fptr,
+                                       HYPRE_Int test_opt );
+HYPRE_Int hypre_ILUSetupRAPILU0( hypre_ParCSRMatrix *A, HYPRE_Int *perm, HYPRE_Int n,
+                                 HYPRE_Int nLU, hypre_ParCSRMatrix **Lptr, HYPRE_Real **Dptr,
+                                 hypre_ParCSRMatrix **Uptr, hypre_ParCSRMatrix **mLptr,
+                                 HYPRE_Real **mDptr, hypre_ParCSRMatrix **mUptr,
+                                 HYPRE_Int **u_end );
+HYPRE_Int hypre_ILUSetupILU0( hypre_ParCSRMatrix  *A, HYPRE_Int *perm, HYPRE_Int *qperm,
+                              HYPRE_Int nLU, HYPRE_Int nI, hypre_ParCSRMatrix **Lptr,
+                              HYPRE_Real **Dptr, hypre_ParCSRMatrix **Uptr,
+                              hypre_ParCSRMatrix **Sptr, HYPRE_Int **u_end );
+HYPRE_Int hypre_ILUSetupMILU0( hypre_ParCSRMatrix *A, HYPRE_Int *permp,
+                               HYPRE_Int *qpermp, HYPRE_Int nLU, HYPRE_Int nI,
+                               hypre_ParCSRMatrix **Lptr, HYPRE_Real **Dptr,
+                               hypre_ParCSRMatrix **Uptr, hypre_ParCSRMatrix **Sptr,
+                               HYPRE_Int **u_end, HYPRE_Int modified );
+HYPRE_Int hypre_ILUSetupILUKSymbolic( HYPRE_Int n, HYPRE_Int *A_diag_i, HYPRE_Int *A_diag_j,
+                                      HYPRE_Int lfil, HYPRE_Int *perm, HYPRE_Int *rperm,
+                                      HYPRE_Int *iw, HYPRE_Int nLU, HYPRE_Int *L_diag_i,
+                                      HYPRE_Int *U_diag_i, HYPRE_Int *S_diag_i,
+                                      HYPRE_Int **L_diag_j, HYPRE_Int **U_diag_j,
+                                      HYPRE_Int **S_diag_j, HYPRE_Int **u_end );
+HYPRE_Int hypre_ILUSetupILUK( hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *permp,
+                              HYPRE_Int *qpermp, HYPRE_Int nLU, HYPRE_Int nI,
+                              hypre_ParCSRMatrix **Lptr, HYPRE_Real **Dptr,
+                              hypre_ParCSRMatrix **Uptr, hypre_ParCSRMatrix **Sptr,
+                              HYPRE_Int **u_end );
+HYPRE_Int hypre_ILUSetupILUT( hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
+                              HYPRE_Int *permp, HYPRE_Int *qpermp, HYPRE_Int nLU,
+                              HYPRE_Int nI, hypre_ParCSRMatrix **Lptr, HYPRE_Real **Dptr,
+                              hypre_ParCSRMatrix **Uptr, hypre_ParCSRMatrix **Sptr,
+                              HYPRE_Int **u_end );
+HYPRE_Int hypre_NSHSetup( void *nsh_vdata, hypre_ParCSRMatrix *A,
+                          hypre_ParVector *f, hypre_ParVector *u );
+HYPRE_Int hypre_ILUSetupILU0RAS( hypre_ParCSRMatrix *A, HYPRE_Int *perm,
+                                 HYPRE_Int nLU, hypre_ParCSRMatrix **Lptr,
+                                 HYPRE_Real **Dptr, hypre_ParCSRMatrix **Uptr );
+HYPRE_Int hypre_ILUSetupILUKRASSymbolic( HYPRE_Int n, HYPRE_Int *A_diag_i, HYPRE_Int *A_diag_j,
+                                         HYPRE_Int *A_offd_i, HYPRE_Int *A_offd_j,
+                                         HYPRE_Int *E_i, HYPRE_Int *E_j, HYPRE_Int ext,
+                                         HYPRE_Int lfil, HYPRE_Int *perm, HYPRE_Int *rperm,
+                                         HYPRE_Int *iw, HYPRE_Int nLU, HYPRE_Int *L_diag_i,
+                                         HYPRE_Int *U_diag_i, HYPRE_Int **L_diag_j,
+                                         HYPRE_Int **U_diag_j );
+HYPRE_Int hypre_ILUSetupILUKRAS( hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *perm,
+                                 HYPRE_Int nLU, hypre_ParCSRMatrix **Lptr,
+                                 HYPRE_Real **Dptr, hypre_ParCSRMatrix **Uptr );
+HYPRE_Int hypre_ILUSetupILUTRAS( hypre_ParCSRMatrix *A, HYPRE_Int lfil,
+                                 HYPRE_Real *tol, HYPRE_Int *perm, HYPRE_Int nLU,
+                                 hypre_ParCSRMatrix **Lptr, HYPRE_Real **Dptr,
+                                 hypre_ParCSRMatrix **Uptr );
+
+/* par_ilu_setup_device.c */
+#if defined(HYPRE_USING_GPU)
+HYPRE_Int hypre_ILUSetupDevice(hypre_ParILUData *ilu_data, hypre_ParCSRMatrix *A,
+                               HYPRE_Int *perm_data, HYPRE_Int *qperm_data,
+                               HYPRE_Int n, HYPRE_Int nLU, hypre_CSRMatrix **BLUptr,
+                               hypre_ParCSRMatrix **matSptr, hypre_CSRMatrix **Eptr,
+                               hypre_CSRMatrix **Fptr);
+HYPRE_Int hypre_ILUSetupIterativeILU0Device( hypre_CSRMatrix *A, HYPRE_Int type,
+                                             HYPRE_Int option, HYPRE_Int max_iter,
+                                             HYPRE_Real tolerance, HYPRE_Int *num_iter_ptr,
+                                             HYPRE_Real **history_ptr );
+#endif
+
+/* par_ilu_solve.c */
+HYPRE_Int hypre_ILUSolve( void *ilu_vdata, hypre_ParCSRMatrix *A,
+                          hypre_ParVector *f, hypre_ParVector *u );
+HYPRE_Int hypre_ILUSolveSchurGMRES( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                    hypre_ParVector *u, HYPRE_Int *perm,
+                                    HYPRE_Int *qperm, HYPRE_Int nLU,
+                                    hypre_ParCSRMatrix *L, HYPRE_Real *D,
+                                    hypre_ParCSRMatrix *U, hypre_ParCSRMatrix *S,
+                                    hypre_ParVector *ftemp, hypre_ParVector *utemp,
+                                    HYPRE_Solver schur_solver, HYPRE_Solver schur_precond,
+                                    hypre_ParVector *rhs, hypre_ParVector *x, HYPRE_Int *u_end );
+HYPRE_Int hypre_ILUSolveSchurNSH( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                  hypre_ParVector *u, HYPRE_Int *perm, HYPRE_Int nLU,
+                                  hypre_ParCSRMatrix *L, HYPRE_Real *D,
+                                  hypre_ParCSRMatrix *U, hypre_ParCSRMatrix *S,
+                                  hypre_ParVector *ftemp, hypre_ParVector *utemp,
+                                  HYPRE_Solver schur_solver, hypre_ParVector *rhs,
+                                  hypre_ParVector *x, HYPRE_Int *u_end );
+HYPRE_Int hypre_ILUSolveLU( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                            hypre_ParVector *u, HYPRE_Int *perm, HYPRE_Int nLU,
+                            hypre_ParCSRMatrix *L, HYPRE_Real *D, hypre_ParCSRMatrix *U,
+                            hypre_ParVector *ftemp, hypre_ParVector *utemp );
+HYPRE_Int hypre_ILUSolveLUIter( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                hypre_ParVector *u, HYPRE_Int *perm, HYPRE_Int nLU,
+                                hypre_ParCSRMatrix *L, HYPRE_Real *D, hypre_ParCSRMatrix *U,
+                                hypre_ParVector *ftemp, hypre_ParVector *utemp,
+                                HYPRE_Int lower_jacobi_iters, HYPRE_Int upper_jacobi_iters );
+HYPRE_Int hypre_ILUSolveLURAS( hypre_ParCSRMatrix *A, hypre_ParVector *f, hypre_ParVector *u,
+                               HYPRE_Int *perm, hypre_ParCSRMatrix *L, HYPRE_Real *D,
+                               hypre_ParCSRMatrix *U, hypre_ParVector *ftemp,
+                               hypre_ParVector *utemp, HYPRE_Real *fext, HYPRE_Real *uext );
+HYPRE_Int hypre_ILUSolveRAPGMRESHost( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                      hypre_ParVector *u, HYPRE_Int *perm, HYPRE_Int nLU,
+                                      hypre_ParCSRMatrix *L, HYPRE_Real *D, hypre_ParCSRMatrix *U,
+                                      hypre_ParCSRMatrix *mL, HYPRE_Real *mD,
+                                      hypre_ParCSRMatrix *mU, hypre_ParVector *ftemp,
+                                      hypre_ParVector *utemp, hypre_ParVector *xtemp,
+                                      hypre_ParVector *ytemp, HYPRE_Solver schur_solver,
+                                      HYPRE_Solver schur_precond, hypre_ParVector *rhs,
+                                      hypre_ParVector *x, HYPRE_Int *u_end );
+HYPRE_Int hypre_NSHSolve( void *nsh_vdata, hypre_ParCSRMatrix *A,
+                          hypre_ParVector *f, hypre_ParVector *u );
+HYPRE_Int hypre_NSHSolveInverse( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                 hypre_ParVector *u, hypre_ParCSRMatrix *M,
+                                 hypre_ParVector *ftemp, hypre_ParVector *utemp );
+
+/* par_ilu_solve_device.c */
+#if defined(HYPRE_USING_GPU)
+HYPRE_Int hypre_ILUSolveLUDevice( hypre_ParCSRMatrix *A, hypre_CSRMatrix *matLU_d,
+                                  hypre_ParVector *f, hypre_ParVector *u,
+                                  HYPRE_Int *perm, hypre_ParVector *ftemp,
+                                  hypre_ParVector *utemp );
+HYPRE_Int hypre_ILUApplyLowerJacIterDevice( hypre_CSRMatrix *A, hypre_Vector *input,
+                                            hypre_Vector *work, hypre_Vector *output,
+                                            HYPRE_Int lower_jacobi_iters );
+HYPRE_Int hypre_ILUApplyUpperJacIterDevice( hypre_CSRMatrix *A, hypre_Vector *input,
+                                            hypre_Vector *work, hypre_Vector *output,
+                                            hypre_Vector *diag, HYPRE_Int upper_jacobi_iters );
+HYPRE_Int hypre_ILUApplyLowerUpperJacIterDevice( hypre_CSRMatrix *A, hypre_Vector *work1,
+                                                 hypre_Vector *work2, hypre_Vector *inout,
+                                                 hypre_Vector *diag, HYPRE_Int lower_jacobi_iters,
+                                                 HYPRE_Int upper_jacobi_iters );
+HYPRE_Int hypre_ILUSolveLUIterDevice( hypre_ParCSRMatrix *A, hypre_CSRMatrix *matLU,
+                                      hypre_ParVector *f, hypre_ParVector *u,
+                                      HYPRE_Int *perm, hypre_ParVector *ftemp,
+                                      hypre_ParVector *utemp, hypre_ParVector *xtemp,
+                                      hypre_Vector **diag_ptr, HYPRE_Int lower_jacobi_iters,
+                                      HYPRE_Int upper_jacobi_iters );
+HYPRE_Int hypre_ParILUSchurGMRESMatvecDevice( void *matvec_data, HYPRE_Complex alpha,
+                                              void *ilu_vdata, void *x,
+                                              HYPRE_Complex beta, void *y );
+HYPRE_Int hypre_ILUSolveSchurGMRESDevice( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                          hypre_ParVector *u, HYPRE_Int *perm,
+                                          HYPRE_Int nLU, hypre_ParCSRMatrix *S,
+                                          hypre_ParVector *ftemp, hypre_ParVector *utemp,
+                                          HYPRE_Solver schur_solver, HYPRE_Solver schur_precond,
+                                          hypre_ParVector *rhs, hypre_ParVector *x,
+                                          HYPRE_Int *u_end, hypre_CSRMatrix *matBLU_d,
+                                          hypre_CSRMatrix *matE_d, hypre_CSRMatrix *matF_d );
+HYPRE_Int hypre_ILUSolveSchurGMRESJacIterDevice( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                                 hypre_ParVector *u, HYPRE_Int *perm,
+                                                 HYPRE_Int nLU, hypre_ParCSRMatrix *S,
+                                                 hypre_ParVector *ftemp, hypre_ParVector *utemp,
+                                                 HYPRE_Solver schur_solver,
+                                                 HYPRE_Solver schur_precond,
+                                                 hypre_ParVector *rhs, hypre_ParVector *x,
+                                                 HYPRE_Int *u_end, hypre_CSRMatrix *matBLU_d,
+                                                 hypre_CSRMatrix *matE_d, hypre_CSRMatrix *matF_d,
+                                                 hypre_ParVector *ztemp,
+                                                 hypre_Vector **Adiag_diag,
+                                                 hypre_Vector **Sdiag_diag,
+                                                 HYPRE_Int lower_jacobi_iters,
+                                                 HYPRE_Int upper_jacobi_iters );
+HYPRE_Int hypre_ParILUSchurGMRESMatvecJacIterDevice( void *matvec_data, HYPRE_Complex alpha,
+                                                     void *ilu_vdata, void *x, HYPRE_Complex beta,
+                                                     void *y );
+HYPRE_Int hypre_ILUSolveRAPGMRESDevice( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                        hypre_ParVector *u, HYPRE_Int *perm, HYPRE_Int nLU,
+                                        hypre_ParCSRMatrix *S, hypre_ParVector *ftemp,
+                                        hypre_ParVector *utemp, hypre_ParVector *xtemp,
+                                        hypre_ParVector *ytemp, HYPRE_Solver schur_solver,
+                                        HYPRE_Solver schur_precond, hypre_ParVector *rhs,
+                                        hypre_ParVector *x, HYPRE_Int *u_end,
+                                        hypre_ParCSRMatrix *Aperm, hypre_CSRMatrix *matALU_d,
+                                        hypre_CSRMatrix *matBLU_d, hypre_CSRMatrix *matE_d,
+                                        hypre_CSRMatrix *matF_d, HYPRE_Int test_opt );
+#endif
 
 /* par_amgdd.c */
 void *hypre_BoomerAMGDDCreate ( void );
 HYPRE_Int hypre_BoomerAMGDDDestroy ( void *data );
-HYPRE_Int hypre_BoomerAMGDDSetStartLevel ( void *data , HYPRE_Int start_level );
-HYPRE_Int hypre_BoomerAMGDDGetStartLevel ( void *data , HYPRE_Int *start_level );
-HYPRE_Int hypre_BoomerAMGDDSetFACNumCycles ( void *data , HYPRE_Int fac_num_cycles );
-HYPRE_Int hypre_BoomerAMGDDGetFACNumCycles ( void *data , HYPRE_Int *fac_num_cycles );
-HYPRE_Int hypre_BoomerAMGDDSetFACCycleType ( void *data , HYPRE_Int fac_cycle_type );
-HYPRE_Int hypre_BoomerAMGDDGetFACCycleType ( void *data , HYPRE_Int *fac_cycle_type );
-HYPRE_Int hypre_BoomerAMGDDSetFACNumRelax ( void *data , HYPRE_Int fac_num_relax );
-HYPRE_Int hypre_BoomerAMGDDGetFACNumRelax ( void *data , HYPRE_Int *fac_num_relax );
-HYPRE_Int hypre_BoomerAMGDDSetFACRelaxType ( void *data , HYPRE_Int fac_relax_type );
-HYPRE_Int hypre_BoomerAMGDDGetFACRelaxType ( void *data , HYPRE_Int *fac_relax_type );
-HYPRE_Int hypre_BoomerAMGDDSetFACRelaxWeight ( void *data , HYPRE_Real fac_relax_weight );
-HYPRE_Int hypre_BoomerAMGDDGetFACRelaxWeight ( void *data , HYPRE_Real *fac_relax_weight );
-HYPRE_Int hypre_BoomerAMGDDSetPadding ( void *data , HYPRE_Int padding );
-HYPRE_Int hypre_BoomerAMGDDGetPadding ( void *data , HYPRE_Int *padding );
-HYPRE_Int hypre_BoomerAMGDDSetNumGhostLayers ( void *data , HYPRE_Int num_ghost_layers );
-HYPRE_Int hypre_BoomerAMGDDGetNumGhostLayers ( void *data , HYPRE_Int *num_ghost_layers );
-HYPRE_Int hypre_BoomerAMGDDSetUserFACRelaxation( void *data , HYPRE_Int (*userFACRelaxation)( void *amgdd_vdata, HYPRE_Int level, HYPRE_Int cycle_param ) );
-HYPRE_Int hypre_BoomerAMGDDGetAMG ( void *data , void **amg_solver );
+HYPRE_Int hypre_BoomerAMGDDSetStartLevel ( void *data, HYPRE_Int start_level );
+HYPRE_Int hypre_BoomerAMGDDGetStartLevel ( void *data, HYPRE_Int *start_level );
+HYPRE_Int hypre_BoomerAMGDDSetFACNumCycles ( void *data, HYPRE_Int fac_num_cycles );
+HYPRE_Int hypre_BoomerAMGDDGetFACNumCycles ( void *data, HYPRE_Int *fac_num_cycles );
+HYPRE_Int hypre_BoomerAMGDDSetFACCycleType ( void *data, HYPRE_Int fac_cycle_type );
+HYPRE_Int hypre_BoomerAMGDDGetFACCycleType ( void *data, HYPRE_Int *fac_cycle_type );
+HYPRE_Int hypre_BoomerAMGDDSetFACNumRelax ( void *data, HYPRE_Int fac_num_relax );
+HYPRE_Int hypre_BoomerAMGDDGetFACNumRelax ( void *data, HYPRE_Int *fac_num_relax );
+HYPRE_Int hypre_BoomerAMGDDSetFACRelaxType ( void *data, HYPRE_Int fac_relax_type );
+HYPRE_Int hypre_BoomerAMGDDGetFACRelaxType ( void *data, HYPRE_Int *fac_relax_type );
+HYPRE_Int hypre_BoomerAMGDDSetFACRelaxWeight ( void *data, HYPRE_Real fac_relax_weight );
+HYPRE_Int hypre_BoomerAMGDDGetFACRelaxWeight ( void *data, HYPRE_Real *fac_relax_weight );
+HYPRE_Int hypre_BoomerAMGDDSetPadding ( void *data, HYPRE_Int padding );
+HYPRE_Int hypre_BoomerAMGDDGetPadding ( void *data, HYPRE_Int *padding );
+HYPRE_Int hypre_BoomerAMGDDSetNumGhostLayers ( void *data, HYPRE_Int num_ghost_layers );
+HYPRE_Int hypre_BoomerAMGDDGetNumGhostLayers ( void *data, HYPRE_Int *num_ghost_layers );
+HYPRE_Int hypre_BoomerAMGDDSetUserFACRelaxation( void *data,
+                                                 HYPRE_Int (*userFACRelaxation)( void *amgdd_vdata, HYPRE_Int level, HYPRE_Int cycle_param ) );
+HYPRE_Int hypre_BoomerAMGDDGetAMG ( void *data, void **amg_solver );
 
 /* par_amgdd_solve.c */
-HYPRE_Int hypre_BoomerAMGDDSolve ( void *solver, hypre_ParCSRMatrix *A, hypre_ParVector *b,hypre_ParVector *x );
+HYPRE_Int hypre_BoomerAMGDDSolve ( void *solver, hypre_ParCSRMatrix *A, hypre_ParVector *b,
+                                   hypre_ParVector *x );
 HYPRE_Int hypre_BoomerAMGDD_Cycle ( hypre_ParAMGDDData *amgdd_data );
 HYPRE_Int hypre_BoomerAMGDD_ResidualCommunication ( hypre_ParAMGDDData *amgdd_data );
-HYPRE_Complex* hypre_BoomerAMGDD_PackResidualBuffer ( hypre_AMGDDCompGrid **compGrid, hypre_AMGDDCommPkg *compGridCommPkg, HYPRE_Int current_level, HYPRE_Int proc );
-HYPRE_Int hypre_BoomerAMGDD_UnpackResidualBuffer ( HYPRE_Complex *buffer, hypre_AMGDDCompGrid **compGrid, hypre_AMGDDCommPkg *compGridCommPkg, HYPRE_Int current_level, HYPRE_Int proc );
+HYPRE_Complex* hypre_BoomerAMGDD_PackResidualBuffer ( hypre_AMGDDCompGrid **compGrid,
+                                                      hypre_AMGDDCommPkg *compGridCommPkg, HYPRE_Int current_level, HYPRE_Int proc );
+HYPRE_Int hypre_BoomerAMGDD_UnpackResidualBuffer ( HYPRE_Complex *buffer,
+                                                   hypre_AMGDDCompGrid **compGrid, hypre_AMGDDCommPkg *compGridCommPkg, HYPRE_Int current_level,
+                                                   HYPRE_Int proc );
 
 /* par_amgdd_setup.c */
-HYPRE_Int hypre_BoomerAMGDDSetup ( void *amgdd_vdata, hypre_ParCSRMatrix *A, hypre_ParVector *b, hypre_ParVector *x );
+HYPRE_Int hypre_BoomerAMGDDSetup ( void *amgdd_vdata, hypre_ParCSRMatrix *A, hypre_ParVector *b,
+                                   hypre_ParVector *x );
 
 /* par_amgdd_fac_cycle.c */
 HYPRE_Int hypre_BoomerAMGDD_FAC ( void *amgdd_vdata, HYPRE_Int first_iteration );
-HYPRE_Int hypre_BoomerAMGDD_FAC_Cycle ( void *amgdd_vdata, HYPRE_Int level, HYPRE_Int cycle_type, HYPRE_Int first_iteration );
+HYPRE_Int hypre_BoomerAMGDD_FAC_Cycle ( void *amgdd_vdata, HYPRE_Int level, HYPRE_Int cycle_type,
+                                        HYPRE_Int first_iteration );
 HYPRE_Int hypre_BoomerAMGDD_FAC_FCycle ( void *amgdd_vdata, HYPRE_Int first_iteration );
-HYPRE_Int hypre_BoomerAMGDD_FAC_Interpolate ( hypre_AMGDDCompGrid *compGrid_f, hypre_AMGDDCompGrid *compGrid_c );
-HYPRE_Int hypre_BoomerAMGDD_FAC_Restrict ( hypre_AMGDDCompGrid *compGrid_f, hypre_AMGDDCompGrid *compGrid_c, HYPRE_Int first_iteration );
+HYPRE_Int hypre_BoomerAMGDD_FAC_Interpolate ( hypre_AMGDDCompGrid *compGrid_f,
+                                              hypre_AMGDDCompGrid *compGrid_c );
+HYPRE_Int hypre_BoomerAMGDD_FAC_Restrict ( hypre_AMGDDCompGrid *compGrid_f,
+                                           hypre_AMGDDCompGrid *compGrid_c, HYPRE_Int first_iteration );
 HYPRE_Int hypre_BoomerAMGDD_FAC_Relax ( void *amgdd_vdata, HYPRE_Int level, HYPRE_Int cycle_param );
-HYPRE_Int hypre_BoomerAMGDD_FAC_CFL1JacobiHost ( void *amgdd_vdata, HYPRE_Int level, HYPRE_Int relax_set );
-HYPRE_Int hypre_BoomerAMGDD_FAC_Jacobi ( void *amgdd_vdata, HYPRE_Int level, HYPRE_Int cycle_param );
+HYPRE_Int hypre_BoomerAMGDD_FAC_CFL1JacobiHost ( void *amgdd_vdata, HYPRE_Int level,
+                                                 HYPRE_Int relax_set );
+HYPRE_Int hypre_BoomerAMGDD_FAC_Jacobi ( void *amgdd_vdata, HYPRE_Int level,
+                                         HYPRE_Int cycle_param );
 HYPRE_Int hypre_BoomerAMGDD_FAC_JacobiHost ( void *amgdd_vdata, HYPRE_Int level );
-HYPRE_Int hypre_BoomerAMGDD_FAC_GaussSeidel ( void *amgdd_vdata, HYPRE_Int level, HYPRE_Int cycle_param );
-HYPRE_Int hypre_BoomerAMGDD_FAC_CFL1Jacobi ( void *amgdd_vdata, HYPRE_Int level, HYPRE_Int cycle_param );
-HYPRE_Int hypre_BoomerAMGDD_FAC_OrderedGaussSeidel ( void *amgdd_vdata, HYPRE_Int level, HYPRE_Int cycle_param );
+HYPRE_Int hypre_BoomerAMGDD_FAC_GaussSeidel ( void *amgdd_vdata, HYPRE_Int level,
+                                              HYPRE_Int cycle_param );
+HYPRE_Int hypre_BoomerAMGDD_FAC_CFL1Jacobi ( void *amgdd_vdata, HYPRE_Int level,
+                                             HYPRE_Int cycle_param );
+HYPRE_Int hypre_BoomerAMGDD_FAC_OrderedGaussSeidel ( void *amgdd_vdata, HYPRE_Int level,
+                                                     HYPRE_Int cycle_param );
 
 /* par_amgdd_fac_cycles_device.c */
 HYPRE_Int hypre_BoomerAMGDD_FAC_JacobiDevice ( void *amgdd_vdata, HYPRE_Int level );
-HYPRE_Int hypre_BoomerAMGDD_FAC_CFL1JacobiDevice ( void *amgdd_vdata, HYPRE_Int level, HYPRE_Int relax_set );
+HYPRE_Int hypre_BoomerAMGDD_FAC_CFL1JacobiDevice ( void *amgdd_vdata, HYPRE_Int level,
+                                                   HYPRE_Int relax_set );
 
 /* par_amgdd_comp_grid.c */
-hypre_AMGDDCompGridMatrix* hypre_AMGDDCompGridMatrixCreate();
+hypre_AMGDDCompGridMatrix* hypre_AMGDDCompGridMatrixCreate( void );
 HYPRE_Int hypre_AMGDDCompGridMatrixDestroy ( hypre_AMGDDCompGridMatrix *matrix );
-HYPRE_Int hypre_AMGDDCompGridMatvec ( HYPRE_Complex alpha, hypre_AMGDDCompGridMatrix *A, hypre_AMGDDCompGridVector *x, HYPRE_Complex beta, hypre_AMGDDCompGridVector *y );
-HYPRE_Int hypre_AMGDDCompGridRealMatvec ( HYPRE_Complex alpha, hypre_AMGDDCompGridMatrix *A, hypre_AMGDDCompGridVector *x, HYPRE_Complex beta, hypre_AMGDDCompGridVector *y );
-hypre_AMGDDCompGridVector* hypre_AMGDDCompGridVectorCreate();
-HYPRE_Int hypre_AMGDDCompGridVectorInitialize ( hypre_AMGDDCompGridVector *vector, HYPRE_Int num_owned, HYPRE_Int num_nonowned, HYPRE_Int num_real );
+HYPRE_Int hypre_AMGDDCompGridMatvec ( HYPRE_Complex alpha, hypre_AMGDDCompGridMatrix *A,
+                                      hypre_AMGDDCompGridVector *x, HYPRE_Complex beta, hypre_AMGDDCompGridVector *y );
+HYPRE_Int hypre_AMGDDCompGridRealMatvec ( HYPRE_Complex alpha, hypre_AMGDDCompGridMatrix *A,
+                                          hypre_AMGDDCompGridVector *x, HYPRE_Complex beta, hypre_AMGDDCompGridVector *y );
+hypre_AMGDDCompGridVector* hypre_AMGDDCompGridVectorCreate( void );
+HYPRE_Int hypre_AMGDDCompGridVectorInitialize ( hypre_AMGDDCompGridVector *vector,
+                                                HYPRE_Int num_owned, HYPRE_Int num_nonowned, HYPRE_Int num_real );
 HYPRE_Int hypre_AMGDDCompGridVectorDestroy ( hypre_AMGDDCompGridVector *vector );
-HYPRE_Real hypre_AMGDDCompGridVectorInnerProd ( hypre_AMGDDCompGridVector *x, hypre_AMGDDCompGridVector *y );
-HYPRE_Real hypre_AMGDDCompGridVectorRealInnerProd ( hypre_AMGDDCompGridVector *x, hypre_AMGDDCompGridVector *y );
+HYPRE_Real hypre_AMGDDCompGridVectorInnerProd ( hypre_AMGDDCompGridVector *x,
+                                                hypre_AMGDDCompGridVector *y );
+HYPRE_Real hypre_AMGDDCompGridVectorRealInnerProd ( hypre_AMGDDCompGridVector *x,
+                                                    hypre_AMGDDCompGridVector *y );
 HYPRE_Int hypre_AMGDDCompGridVectorScale ( HYPRE_Complex alpha, hypre_AMGDDCompGridVector *x );
 HYPRE_Int hypre_AMGDDCompGridVectorRealScale ( HYPRE_Complex alpha, hypre_AMGDDCompGridVector *x );
-HYPRE_Int hypre_AMGDDCompGridVectorAxpy ( HYPRE_Complex alpha, hypre_AMGDDCompGridVector *x, hypre_AMGDDCompGridVector *y );
-HYPRE_Int hypre_AMGDDCompGridVectorRealAxpy ( HYPRE_Complex alpha, hypre_AMGDDCompGridVector *x, hypre_AMGDDCompGridVector *y );
-HYPRE_Int hypre_AMGDDCompGridVectorSetConstantValues ( hypre_AMGDDCompGridVector *vector, HYPRE_Complex value );
-HYPRE_Int hypre_AMGDDCompGridVectorRealSetConstantValues ( hypre_AMGDDCompGridVector *vector, HYPRE_Complex value );
-HYPRE_Int hypre_AMGDDCompGridVectorCopy ( hypre_AMGDDCompGridVector *x, hypre_AMGDDCompGridVector *y );
-HYPRE_Int hypre_AMGDDCompGridVectorRealCopy ( hypre_AMGDDCompGridVector *x, hypre_AMGDDCompGridVector *y );
-hypre_AMGDDCompGrid *hypre_AMGDDCompGridCreate();
+HYPRE_Int hypre_AMGDDCompGridVectorAxpy ( HYPRE_Complex alpha, hypre_AMGDDCompGridVector *x,
+                                          hypre_AMGDDCompGridVector *y );
+HYPRE_Int hypre_AMGDDCompGridVectorRealAxpy ( HYPRE_Complex alpha, hypre_AMGDDCompGridVector *x,
+                                              hypre_AMGDDCompGridVector *y );
+HYPRE_Int hypre_AMGDDCompGridVectorSetConstantValues ( hypre_AMGDDCompGridVector *vector,
+                                                       HYPRE_Complex value );
+HYPRE_Int hypre_AMGDDCompGridVectorRealSetConstantValues ( hypre_AMGDDCompGridVector *vector,
+                                                           HYPRE_Complex value );
+HYPRE_Int hypre_AMGDDCompGridVectorCopy ( hypre_AMGDDCompGridVector *x,
+                                          hypre_AMGDDCompGridVector *y );
+HYPRE_Int hypre_AMGDDCompGridVectorRealCopy ( hypre_AMGDDCompGridVector *x,
+                                              hypre_AMGDDCompGridVector *y );
+hypre_AMGDDCompGrid *hypre_AMGDDCompGridCreate( void );
 HYPRE_Int hypre_AMGDDCompGridDestroy ( hypre_AMGDDCompGrid *compGrid );
-HYPRE_Int hypre_AMGDDCompGridInitialize ( hypre_ParAMGDDData *amgdd_data, HYPRE_Int padding, HYPRE_Int level );
+HYPRE_Int hypre_AMGDDCompGridInitialize ( hypre_ParAMGDDData *amgdd_data, HYPRE_Int padding,
+                                          HYPRE_Int level );
 HYPRE_Int hypre_AMGDDCompGridSetupRelax ( hypre_ParAMGDDData *amgdd_data );
 HYPRE_Int hypre_AMGDDCompGridFinalize ( hypre_ParAMGDDData *amgdd_data );
-HYPRE_Int hypre_AMGDDCompGridSetupRealDofMarker ( hypre_AMGDDCompGrid **compGrid, HYPRE_Int num_levels, HYPRE_Int num_ghost_layers );
-HYPRE_Int hypre_AMGDDCompGridResize ( hypre_AMGDDCompGrid *compGrid, HYPRE_Int new_size, HYPRE_Int need_coarse_info );
-HYPRE_Int hypre_AMGDDCompGridSetupLocalIndices ( hypre_AMGDDCompGrid **compGrid, HYPRE_Int *num_added_nodes, HYPRE_Int ****recv_map, HYPRE_Int num_recv_procs, HYPRE_Int **A_tmp_info, HYPRE_Int start_level, HYPRE_Int num_levels );
+HYPRE_Int hypre_AMGDDCompGridSetupRealDofMarker ( hypre_AMGDDCompGrid **compGrid,
+                                                  HYPRE_Int num_levels, HYPRE_Int num_ghost_layers );
+HYPRE_Int hypre_AMGDDCompGridResize ( hypre_AMGDDCompGrid *compGrid, HYPRE_Int new_size,
+                                      HYPRE_Int need_coarse_info );
+HYPRE_Int hypre_AMGDDCompGridSetupLocalIndices ( hypre_AMGDDCompGrid **compGrid,
+                                                 HYPRE_Int *num_added_nodes, HYPRE_Int ****recv_map, HYPRE_Int num_recv_procs,
+                                                 HYPRE_Int **A_tmp_info, HYPRE_Int start_level, HYPRE_Int num_levels );
 HYPRE_Int hypre_AMGDDCompGridSetupLocalIndicesP ( hypre_ParAMGDDData *amgdd_data );
 hypre_AMGDDCommPkg *hypre_AMGDDCommPkgCreate ( HYPRE_Int num_levels );
-HYPRE_Int hypre_AMGDDCommPkgSendLevelDestroy ( hypre_AMGDDCommPkg *amgddCommPkg, HYPRE_Int level, HYPRE_Int proc );
-HYPRE_Int hypre_AMGDDCommPkgRecvLevelDestroy ( hypre_AMGDDCommPkg *amgddCommPkg, HYPRE_Int level, HYPRE_Int proc );
+HYPRE_Int hypre_AMGDDCommPkgSendLevelDestroy ( hypre_AMGDDCommPkg *amgddCommPkg, HYPRE_Int level,
+                                               HYPRE_Int proc );
+HYPRE_Int hypre_AMGDDCommPkgRecvLevelDestroy ( hypre_AMGDDCommPkg *amgddCommPkg, HYPRE_Int level,
+                                               HYPRE_Int proc );
 HYPRE_Int hypre_AMGDDCommPkgDestroy ( hypre_AMGDDCommPkg *compGridCommPkg );
-HYPRE_Int hypre_AMGDDCommPkgFinalize ( hypre_ParAMGData* amg_data, hypre_AMGDDCommPkg *compGridCommPkg, hypre_AMGDDCompGrid **compGrid );
+HYPRE_Int hypre_AMGDDCommPkgFinalize ( hypre_ParAMGData* amg_data,
+                                       hypre_AMGDDCommPkg *compGridCommPkg, hypre_AMGDDCompGrid **compGrid );
 
 /* par_amgdd_helpers.c */
-HYPRE_Int hypre_BoomerAMGDD_SetupNearestProcessorNeighbors ( hypre_ParCSRMatrix *A, hypre_AMGDDCommPkg *compGridCommPkg, HYPRE_Int level, HYPRE_Int *padding, HYPRE_Int num_ghost_layers );
-HYPRE_Int hypre_BoomerAMGDD_RecursivelyBuildPsiComposite ( HYPRE_Int node, HYPRE_Int m, hypre_AMGDDCompGrid *compGrid, HYPRE_Int *add_flag, HYPRE_Int use_sort );
-HYPRE_Int hypre_BoomerAMGDD_MarkCoarse ( HYPRE_Int *list, HYPRE_Int *marker, HYPRE_Int *owned_coarse_indices, HYPRE_Int *nonowned_coarse_indices, HYPRE_Int *sort_map, HYPRE_Int num_owned, HYPRE_Int total_num_nodes, HYPRE_Int num_owned_coarse, HYPRE_Int list_size, HYPRE_Int dist, HYPRE_Int use_sort, HYPRE_Int *nodes_to_add );
-HYPRE_Int hypre_BoomerAMGDD_UnpackRecvBuffer ( hypre_ParAMGDDData *amgdd_data, HYPRE_Int *recv_buffer, HYPRE_Int **A_tmp_info, HYPRE_Int *recv_map_send_buffer_size, HYPRE_Int *nodes_added_on_level, HYPRE_Int current_level, HYPRE_Int buffer_number );
-HYPRE_Int* hypre_BoomerAMGDD_PackSendBuffer ( hypre_ParAMGDDData *amgdd_data, HYPRE_Int proc, HYPRE_Int current_level, HYPRE_Int *padding, HYPRE_Int *send_flag_buffer_size );
-HYPRE_Int hypre_BoomerAMGDD_PackRecvMapSendBuffer ( HYPRE_Int *recv_map_send_buffer, HYPRE_Int **recv_red_marker, HYPRE_Int *num_recv_nodes, HYPRE_Int *recv_buffer_size, HYPRE_Int current_level, HYPRE_Int num_levels );
-HYPRE_Int hypre_BoomerAMGDD_UnpackSendFlagBuffer ( hypre_AMGDDCompGrid **compGrid, HYPRE_Int *send_flag_buffer, HYPRE_Int **send_flag, HYPRE_Int *num_send_nodes, HYPRE_Int *send_buffer_size, HYPRE_Int current_level, HYPRE_Int num_levels );
+HYPRE_Int hypre_BoomerAMGDD_SetupNearestProcessorNeighbors ( hypre_ParCSRMatrix *A,
+                                                             hypre_AMGDDCommPkg *compGridCommPkg, HYPRE_Int level, HYPRE_Int *padding,
+                                                             HYPRE_Int num_ghost_layers );
+HYPRE_Int hypre_BoomerAMGDD_RecursivelyBuildPsiComposite ( HYPRE_Int node, HYPRE_Int m,
+                                                           hypre_AMGDDCompGrid *compGrid, HYPRE_Int *add_flag, HYPRE_Int use_sort );
+HYPRE_Int hypre_BoomerAMGDD_MarkCoarse ( HYPRE_Int *list, HYPRE_Int *marker,
+                                         HYPRE_Int *owned_coarse_indices, HYPRE_Int *nonowned_coarse_indices, HYPRE_Int *sort_map,
+                                         HYPRE_Int num_owned, HYPRE_Int total_num_nodes, HYPRE_Int num_owned_coarse, HYPRE_Int list_size,
+                                         HYPRE_Int dist, HYPRE_Int use_sort, HYPRE_Int *nodes_to_add );
+HYPRE_Int hypre_BoomerAMGDD_UnpackRecvBuffer ( hypre_ParAMGDDData *amgdd_data,
+                                               HYPRE_Int *recv_buffer, HYPRE_Int **A_tmp_info, HYPRE_Int *recv_map_send_buffer_size,
+                                               HYPRE_Int *nodes_added_on_level, HYPRE_Int current_level, HYPRE_Int buffer_number );
+HYPRE_Int* hypre_BoomerAMGDD_PackSendBuffer ( hypre_ParAMGDDData *amgdd_data, HYPRE_Int proc,
+                                              HYPRE_Int current_level, HYPRE_Int *padding, HYPRE_Int *send_flag_buffer_size );
+HYPRE_Int hypre_BoomerAMGDD_PackRecvMapSendBuffer ( HYPRE_Int *recv_map_send_buffer,
+                                                    HYPRE_Int **recv_red_marker, HYPRE_Int *num_recv_nodes, HYPRE_Int *recv_buffer_size,
+                                                    HYPRE_Int current_level, HYPRE_Int num_levels );
+HYPRE_Int hypre_BoomerAMGDD_UnpackSendFlagBuffer ( hypre_AMGDDCompGrid **compGrid,
+                                                   HYPRE_Int *send_flag_buffer, HYPRE_Int **send_flag, HYPRE_Int *num_send_nodes,
+                                                   HYPRE_Int *send_buffer_size, HYPRE_Int current_level, HYPRE_Int num_levels );
 HYPRE_Int hypre_BoomerAMGDD_CommunicateRemainingMatrixInfo ( hypre_ParAMGDDData* amgdd_data );
-HYPRE_Int hypre_BoomerAMGDD_FixUpRecvMaps ( hypre_AMGDDCompGrid **compGrid, hypre_AMGDDCommPkg *compGridCommPkg, HYPRE_Int start_level, HYPRE_Int num_levels );
+HYPRE_Int hypre_BoomerAMGDD_FixUpRecvMaps ( hypre_AMGDDCompGrid **compGrid,
+                                            hypre_AMGDDCommPkg *compGridCommPkg, HYPRE_Int start_level, HYPRE_Int num_levels );
+
+/* par_fsai.c */
+void* hypre_FSAICreate( void );
+HYPRE_Int hypre_FSAIDestroy ( void *data );
+HYPRE_Int hypre_FSAISetAlgoType ( void *data, HYPRE_Int algo_type );
+HYPRE_Int hypre_FSAISetLocalSolveType ( void *data, HYPRE_Int local_solve_type );
+HYPRE_Int hypre_FSAISetMaxSteps ( void *data, HYPRE_Int max_steps );
+HYPRE_Int hypre_FSAISetMaxStepSize ( void *data, HYPRE_Int max_step_size );
+HYPRE_Int hypre_FSAISetMaxNnzRow ( void *data, HYPRE_Int max_nnz_row );
+HYPRE_Int hypre_FSAISetNumLevels ( void *data, HYPRE_Int num_levels );
+HYPRE_Int hypre_FSAISetThreshold ( void *data, HYPRE_Real threshold );
+HYPRE_Int hypre_FSAISetKapTolerance ( void *data, HYPRE_Real kap_tolerance );
+HYPRE_Int hypre_FSAISetMaxIterations ( void *data, HYPRE_Int max_iterations );
+HYPRE_Int hypre_FSAISetEigMaxIters ( void *data, HYPRE_Int eig_max_iters );
+HYPRE_Int hypre_FSAISetZeroGuess ( void *data, HYPRE_Int zero_guess );
+HYPRE_Int hypre_FSAISetTolerance ( void *data, HYPRE_Real tolerance );
+HYPRE_Int hypre_FSAISetOmega ( void *data, HYPRE_Real omega );
+HYPRE_Int hypre_FSAISetLogging ( void *data, HYPRE_Int logging );
+HYPRE_Int hypre_FSAISetNumIterations ( void *data, HYPRE_Int num_iterations );
+HYPRE_Int hypre_FSAISetPrintLevel ( void *data, HYPRE_Int print_level );
+HYPRE_Int hypre_FSAIGetAlgoType ( void *data, HYPRE_Int *algo_type );
+HYPRE_Int hypre_FSAIGetLocalSolveType ( void *data, HYPRE_Int *local_solve_type );
+HYPRE_Int hypre_FSAIGetMaxSteps ( void *data, HYPRE_Int *max_steps );
+HYPRE_Int hypre_FSAIGetMaxStepSize ( void *data, HYPRE_Int *max_step_size );
+HYPRE_Int hypre_FSAIGetMaxNnzRow ( void *data, HYPRE_Int *max_nnz_row );
+HYPRE_Int hypre_FSAIGetNumLevels ( void *data, HYPRE_Int *num_levels );
+HYPRE_Int hypre_FSAIGetThreshold ( void *data, HYPRE_Real *threshold );
+HYPRE_Int hypre_FSAIGetKapTolerance ( void *data, HYPRE_Real *kap_tolerance );
+HYPRE_Int hypre_FSAIGetMaxIterations ( void *data, HYPRE_Int *max_iterations );
+HYPRE_Int hypre_FSAIGetEigMaxIters ( void *data, HYPRE_Int *eig_max_iters );
+HYPRE_Int hypre_FSAIGetZeroGuess ( void *data, HYPRE_Int *zero_guess );
+HYPRE_Int hypre_FSAIGetTolerance ( void *data, HYPRE_Real *tolerance );
+HYPRE_Int hypre_FSAIGetOmega ( void *data, HYPRE_Real *omega );
+HYPRE_Int hypre_FSAIGetLogging ( void *data, HYPRE_Int *logging );
+HYPRE_Int hypre_FSAIGetNumIterations ( void *data, HYPRE_Int *num_iterations );
+HYPRE_Int hypre_FSAIGetPrintLevel ( void *data, HYPRE_Int *print_level );
+
+/* par_fsai_setup.c */
+HYPRE_Int hypre_CSRMatrixExtractDenseMat ( hypre_CSRMatrix *A, hypre_Vector *A_sub,
+                                           HYPRE_Int *S_Pattern, HYPRE_Int S_nnz,
+                                           HYPRE_Int *marker );
+HYPRE_Int hypre_CSRMatrixExtractDenseRow ( hypre_CSRMatrix *A, hypre_Vector *A_subrow,
+                                           HYPRE_Int *marker, HYPRE_Int row_num );
+HYPRE_Int hypre_FindKapGrad ( hypre_CSRMatrix *A_diag, hypre_Vector *kaporin_gradient,
+                              HYPRE_Int *kap_grad_nonzeros, hypre_Vector *G_temp,
+                              HYPRE_Int *S_Pattern, HYPRE_Int S_nnz,
+                              HYPRE_Int max_row_size, HYPRE_Int row_num, HYPRE_Int *kg_marker );
+HYPRE_Int hypre_AddToPattern ( hypre_Vector *kaporin_gradient, HYPRE_Int *kap_grad_nonzeros,
+                               HYPRE_Int *S_Pattern, HYPRE_Int *S_nnz, HYPRE_Int *kg_marker,
+                               HYPRE_Int max_step_size );
+HYPRE_Int hypre_FSAISetup ( void *fsai_vdata, hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                            hypre_ParVector *u );
+HYPRE_Int hypre_FSAISetupNative ( void *fsai_vdata, hypre_ParCSRMatrix *A,
+                                  hypre_ParVector *f, hypre_ParVector *u );
+HYPRE_Int hypre_FSAISetupOMPDyn ( void *fsai_vdata, hypre_ParCSRMatrix *A,
+                                  hypre_ParVector *f, hypre_ParVector *u );
+HYPRE_Int hypre_FSAIPrintStats ( void *fsai_vdata, hypre_ParCSRMatrix *A );
+HYPRE_Int hypre_FSAIComputeOmega ( void *fsai_vdata, hypre_ParCSRMatrix *A );
+void hypre_swap2_ci ( HYPRE_Complex *v, HYPRE_Int *w, HYPRE_Int i, HYPRE_Int j );
+void hypre_qsort2_ci ( HYPRE_Complex *v, HYPRE_Int *w, HYPRE_Int left, HYPRE_Int right );
+HYPRE_Int hypre_FSAIDumpLocalLSDense ( void *fsai_vdata, const char *filename,
+                                       hypre_ParCSRMatrix *A );
+
+/* par_fsai_solve.c */
+HYPRE_Int hypre_FSAISolve ( void *fsai_vdata, hypre_ParCSRMatrix *A, hypre_ParVector *b,
+                            hypre_ParVector *x );
+HYPRE_Int hypre_FSAIApply ( void *fsai_vdata, HYPRE_Complex alpha, hypre_ParVector *b,
+                            hypre_ParVector *x );
+
+/* par_fsai_device.c */
+HYPRE_Int hypre_FSAISetupDevice( void *fsai_vdata, hypre_ParCSRMatrix *A,
+                                 hypre_ParVector *f, hypre_ParVector *u );
 
 #ifdef __cplusplus
 }
diff --git a/external/hypre/src/parcsr_ls/ads.c b/external/hypre/src/parcsr_ls/ads.c
index 63a2c0f3..b0849e30 100644
--- a/external/hypre/src/parcsr_ls/ads.c
+++ b/external/hypre/src/parcsr_ls/ads.c
@@ -1,20 +1,40 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
  ******************************************************************************/
 
+#include "_hypre_onedpl.hpp"
 #include "_hypre_parcsr_ls.h"
 #include "float.h"
 #include "ams.h"
 #include "ads.h"
 #include "_hypre_utilities.hpp"
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-__global__ void hypreCUDAKernel_AMSComputePi_copy1(HYPRE_Int nnz, HYPRE_Int dim, HYPRE_Int *j_in, HYPRE_Int *j_out);
-__global__ void hypreCUDAKernel_AMSComputePi_copy2(HYPRE_Int nrows, HYPRE_Int dim, HYPRE_Int *i_in, HYPRE_Real *data_in, HYPRE_Real *Gx_data, HYPRE_Real *Gy_data, HYPRE_Real *Gz_data, HYPRE_Real *data_out);
-__global__ void hypreCUDAKernel_AMSComputePixyz_copy(HYPRE_Int nrows, HYPRE_Int dim, HYPRE_Int *i_in, HYPRE_Real *data_in, HYPRE_Real *Gx_data, HYPRE_Real *Gy_data, HYPRE_Real *Gz_data, HYPRE_Real *data_x_out, HYPRE_Real *data_y_out, HYPRE_Real *data_z_out );
+#if defined(HYPRE_USING_GPU)
+#if defined(HYPRE_USING_SYCL)
+SYCL_EXTERNAL
+#endif
+__global__ void hypreGPUKernel_AMSComputePi_copy1(hypre_DeviceItem &item, HYPRE_Int nnz,
+                                                  HYPRE_Int dim,
+                                                  HYPRE_Int *j_in,
+                                                  HYPRE_Int *j_out);
+#if defined(HYPRE_USING_SYCL)
+SYCL_EXTERNAL
+#endif
+__global__ void hypreGPUKernel_AMSComputePi_copy2(hypre_DeviceItem &item, HYPRE_Int nrows,
+                                                  HYPRE_Int dim,
+                                                  HYPRE_Int *i_in,
+                                                  HYPRE_Real *data_in, HYPRE_Real *Gx_data, HYPRE_Real *Gy_data, HYPRE_Real *Gz_data,
+                                                  HYPRE_Real *data_out);
+#if defined(HYPRE_USING_SYCL)
+SYCL_EXTERNAL
+#endif
+__global__ void hypreGPUKernel_AMSComputePixyz_copy(hypre_DeviceItem &item, HYPRE_Int nrows,
+                                                    HYPRE_Int dim,
+                                                    HYPRE_Int *i_in, HYPRE_Real *data_in, HYPRE_Real *Gx_data, HYPRE_Real *Gy_data, HYPRE_Real *Gz_data,
+                                                    HYPRE_Real *data_x_out, HYPRE_Real *data_y_out, HYPRE_Real *data_z_out );
 #endif
 
 /*--------------------------------------------------------------------------
@@ -23,7 +43,7 @@ __global__ void hypreCUDAKernel_AMSComputePixyz_copy(HYPRE_Int nrows, HYPRE_Int
  * Allocate the ADS solver structure.
  *--------------------------------------------------------------------------*/
 
-void * hypre_ADSCreate()
+void * hypre_ADSCreate(void)
 {
    hypre_ADSData *ads_data;
 
@@ -118,57 +138,101 @@ HYPRE_Int hypre_ADSDestroy(void *solver)
    }
 
    if (ads_data -> A_C)
+   {
       hypre_ParCSRMatrixDestroy(ads_data -> A_C);
+   }
    if (ads_data -> B_C)
+   {
       HYPRE_AMSDestroy(ads_data -> B_C);
+   }
 
    if (ads_data -> owns_Pi && ads_data -> Pi)
+   {
       hypre_ParCSRMatrixDestroy(ads_data -> Pi);
+   }
    if (ads_data -> A_Pi)
+   {
       hypre_ParCSRMatrixDestroy(ads_data -> A_Pi);
+   }
    if (ads_data -> B_Pi)
+   {
       HYPRE_BoomerAMGDestroy(ads_data -> B_Pi);
+   }
 
    if (ads_data -> owns_Pi && ads_data -> Pix)
+   {
       hypre_ParCSRMatrixDestroy(ads_data -> Pix);
+   }
    if (ads_data -> A_Pix)
+   {
       hypre_ParCSRMatrixDestroy(ads_data -> A_Pix);
+   }
    if (ads_data -> B_Pix)
+   {
       HYPRE_BoomerAMGDestroy(ads_data -> B_Pix);
+   }
    if (ads_data -> owns_Pi && ads_data -> Piy)
+   {
       hypre_ParCSRMatrixDestroy(ads_data -> Piy);
+   }
    if (ads_data -> A_Piy)
+   {
       hypre_ParCSRMatrixDestroy(ads_data -> A_Piy);
+   }
    if (ads_data -> B_Piy)
+   {
       HYPRE_BoomerAMGDestroy(ads_data -> B_Piy);
+   }
    if (ads_data -> owns_Pi && ads_data -> Piz)
+   {
       hypre_ParCSRMatrixDestroy(ads_data -> Piz);
+   }
    if (ads_data -> A_Piz)
+   {
       hypre_ParCSRMatrixDestroy(ads_data -> A_Piz);
+   }
    if (ads_data -> B_Piz)
+   {
       HYPRE_BoomerAMGDestroy(ads_data -> B_Piz);
+   }
 
    if (ads_data -> r0)
+   {
       hypre_ParVectorDestroy(ads_data -> r0);
+   }
    if (ads_data -> g0)
+   {
       hypre_ParVectorDestroy(ads_data -> g0);
+   }
    if (ads_data -> r1)
+   {
       hypre_ParVectorDestroy(ads_data -> r1);
+   }
    if (ads_data -> g1)
+   {
       hypre_ParVectorDestroy(ads_data -> g1);
+   }
    if (ads_data -> r2)
+   {
       hypre_ParVectorDestroy(ads_data -> r2);
+   }
    if (ads_data -> g2)
+   {
       hypre_ParVectorDestroy(ads_data -> g2);
+   }
    if (ads_data -> zz)
+   {
       hypre_ParVectorDestroy(ads_data -> zz);
+   }
 
    hypre_SeqVectorDestroy(ads_data -> A_l1_norms);
 
    /* C, G, x, y and z are not destroyed */
 
    if (ads_data)
+   {
       hypre_TFree(ads_data, HYPRE_MEMORY_HOST);
+   }
 
    return hypre_error_flag;
 }
@@ -384,7 +448,7 @@ HYPRE_Int hypre_ADSSetSmoothingOptions(void *solver,
 
 HYPRE_Int hypre_ADSSetChebySmoothingOptions(void *solver,
                                             HYPRE_Int A_cheby_order,
-                                            HYPRE_Int A_cheby_fraction)
+                                            HYPRE_Real A_cheby_fraction)
 {
    hypre_ADSData *ads_data = (hypre_ADSData *) solver;
    ads_data -> A_cheby_order =  A_cheby_order;
@@ -471,8 +535,10 @@ HYPRE_Int hypre_ADSComputePi(hypre_ParCSRMatrix *A,
                              hypre_ParCSRMatrix *PiNDz,
                              hypre_ParCSRMatrix **Pi_ptr)
 {
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
    HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_ParCSRMatrixMemoryLocation(A) );
+#else
+   HYPRE_UNUSED_VAR(A);
 #endif
 
    hypre_ParCSRMatrix *Pi;
@@ -509,7 +575,7 @@ HYPRE_Int hypre_ADSComputePi(hypre_ParCSRMatrix *A,
       /* Each component of Pi has the sparsity pattern of the topological
          face-to-vertex matrix. */
       hypre_ParCSRMatrix *F2V;
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
       if (exec == HYPRE_EXEC_DEVICE)
       {
          F2V = hypre_ParCSRMatMat(C, G);
@@ -524,18 +590,20 @@ HYPRE_Int hypre_ADSComputePi(hypre_ParCSRMatrix *A,
       {
          MPI_Comm comm = hypre_ParCSRMatrixComm(F2V);
          HYPRE_BigInt global_num_rows = hypre_ParCSRMatrixGlobalNumRows(F2V);
-         HYPRE_BigInt global_num_cols = 3*hypre_ParCSRMatrixGlobalNumCols(F2V);
+         HYPRE_BigInt global_num_cols = 3 * hypre_ParCSRMatrixGlobalNumCols(F2V);
          HYPRE_BigInt *row_starts = hypre_ParCSRMatrixRowStarts(F2V);
          HYPRE_BigInt *col_starts;
          HYPRE_Int col_starts_size;
-         HYPRE_Int num_cols_offd = 3*hypre_CSRMatrixNumCols(hypre_ParCSRMatrixOffd(F2V));
-         HYPRE_Int num_nonzeros_diag = 3*hypre_CSRMatrixNumNonzeros(hypre_ParCSRMatrixDiag(F2V));
-         HYPRE_Int num_nonzeros_offd = 3*hypre_CSRMatrixNumNonzeros(hypre_ParCSRMatrixOffd(F2V));
+         HYPRE_Int num_cols_offd = 3 * hypre_CSRMatrixNumCols(hypre_ParCSRMatrixOffd(F2V));
+         HYPRE_Int num_nonzeros_diag = 3 * hypre_CSRMatrixNumNonzeros(hypre_ParCSRMatrixDiag(F2V));
+         HYPRE_Int num_nonzeros_offd = 3 * hypre_CSRMatrixNumNonzeros(hypre_ParCSRMatrixOffd(F2V));
          HYPRE_BigInt *col_starts_F2V = hypre_ParCSRMatrixColStarts(F2V);
          col_starts_size = 2;
          col_starts = hypre_TAlloc(HYPRE_BigInt, col_starts_size, HYPRE_MEMORY_HOST);
          for (i = 0; i < col_starts_size; i++)
+         {
             col_starts[i] = 3 * col_starts_F2V[i];
+         }
 
          Pi = hypre_ParCSRMatrixCreate(comm,
                                        global_num_rows,
@@ -564,39 +632,39 @@ HYPRE_Int hypre_ADSComputePi(hypre_ParCSRMatrix *A,
          HYPRE_Int *Pi_diag_J = hypre_CSRMatrixJ(Pi_diag);
          HYPRE_Real *Pi_diag_data = hypre_CSRMatrixData(Pi_diag);
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
          if (exec == HYPRE_EXEC_DEVICE)
          {
-            HYPRE_THRUST_CALL( transform,
-                               F2V_diag_I,
-                               F2V_diag_I + F2V_diag_nrows + 1,
-                               Pi_diag_I,
-                               3 * _1 );
+            hypreDevice_IntScalen( F2V_diag_I, F2V_diag_nrows + 1, Pi_diag_I, 3);
 
-            dim3 bDim = hypre_GetDefaultCUDABlockDimension();
-            dim3 gDim = hypre_GetDefaultCUDAGridDimension(F2V_diag_nnz, "thread", bDim);
+            dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+            dim3 gDim = hypre_GetDefaultDeviceGridDimension(F2V_diag_nnz, "thread", bDim);
 
-            HYPRE_CUDA_LAUNCH( hypreCUDAKernel_AMSComputePi_copy1, gDim, bDim,
-                               F2V_diag_nnz, 3, F2V_diag_J, Pi_diag_J );
+            HYPRE_GPU_LAUNCH( hypreGPUKernel_AMSComputePi_copy1, gDim, bDim,
+                              F2V_diag_nnz, 3, F2V_diag_J, Pi_diag_J );
 
-            gDim = hypre_GetDefaultCUDAGridDimension(F2V_diag_nrows, "warp", bDim);
+            gDim = hypre_GetDefaultDeviceGridDimension(F2V_diag_nrows, "warp", bDim);
 
-            HYPRE_CUDA_LAUNCH( hypreCUDAKernel_AMSComputePi_copy2, gDim, bDim,
-                               F2V_diag_nrows, 3, F2V_diag_I, NULL, RT100_data, RT010_data, RT001_data,
-                               Pi_diag_data );
+            HYPRE_GPU_LAUNCH( hypreGPUKernel_AMSComputePi_copy2, gDim, bDim,
+                              F2V_diag_nrows, 3, F2V_diag_I, NULL, RT100_data, RT010_data, RT001_data,
+                              Pi_diag_data );
          }
          else
 #endif
          {
-            for (i = 0; i < F2V_diag_nrows+1; i++)
+            for (i = 0; i < F2V_diag_nrows + 1; i++)
+            {
                Pi_diag_I[i] = 3 * F2V_diag_I[i];
+            }
 
             for (i = 0; i < F2V_diag_nnz; i++)
                for (d = 0; d < 3; d++)
-                  Pi_diag_J[3*i+d] = 3*F2V_diag_J[i]+d;
+               {
+                  Pi_diag_J[3 * i + d] = 3 * F2V_diag_J[i] + d;
+               }
 
             for (i = 0; i < F2V_diag_nrows; i++)
-               for (j = F2V_diag_I[i]; j < F2V_diag_I[i+1]; j++)
+               for (j = F2V_diag_I[i]; j < F2V_diag_I[i + 1]; j++)
                {
                   *Pi_diag_data++ = RT100_data[i];
                   *Pi_diag_data++ = RT010_data[i];
@@ -623,43 +691,43 @@ HYPRE_Int hypre_ADSComputePi(hypre_ParCSRMatrix *A,
          HYPRE_BigInt *F2V_cmap = hypre_ParCSRMatrixColMapOffd(F2V);
          HYPRE_BigInt *Pi_cmap = hypre_ParCSRMatrixColMapOffd(Pi);
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
          if (exec == HYPRE_EXEC_DEVICE)
          {
             if (F2V_offd_ncols)
             {
-               HYPRE_THRUST_CALL( transform,
-                                  F2V_offd_I,
-                                  F2V_offd_I + F2V_offd_nrows + 1,
-                                  Pi_offd_I,
-                                  3 * _1 );
+               hypreDevice_IntScalen( F2V_offd_I, F2V_offd_nrows + 1, Pi_offd_I, 3 );
             }
 
-            dim3 bDim = hypre_GetDefaultCUDABlockDimension();
-            dim3 gDim = hypre_GetDefaultCUDAGridDimension(F2V_offd_nnz, "thread", bDim);
+            dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+            dim3 gDim = hypre_GetDefaultDeviceGridDimension(F2V_offd_nnz, "thread", bDim);
 
-            HYPRE_CUDA_LAUNCH( hypreCUDAKernel_AMSComputePi_copy1, gDim, bDim,
-                               F2V_offd_nnz, 3, F2V_offd_J, Pi_offd_J );
+            HYPRE_GPU_LAUNCH( hypreGPUKernel_AMSComputePi_copy1, gDim, bDim,
+                              F2V_offd_nnz, 3, F2V_offd_J, Pi_offd_J );
 
-            gDim = hypre_GetDefaultCUDAGridDimension(F2V_offd_nrows, "warp", bDim);
+            gDim = hypre_GetDefaultDeviceGridDimension(F2V_offd_nrows, "warp", bDim);
 
-            HYPRE_CUDA_LAUNCH( hypreCUDAKernel_AMSComputePi_copy2, gDim, bDim,
-                               F2V_offd_nrows, 3, F2V_offd_I, NULL, RT100_data, RT010_data, RT001_data,
-                               Pi_offd_data );
+            HYPRE_GPU_LAUNCH( hypreGPUKernel_AMSComputePi_copy2, gDim, bDim,
+                              F2V_offd_nrows, 3, F2V_offd_I, NULL, RT100_data, RT010_data, RT001_data,
+                              Pi_offd_data );
          }
          else
 #endif
          {
             if (F2V_offd_ncols)
-               for (i = 0; i < F2V_offd_nrows+1; i++)
+               for (i = 0; i < F2V_offd_nrows + 1; i++)
+               {
                   Pi_offd_I[i] = 3 * F2V_offd_I[i];
+               }
 
             for (i = 0; i < F2V_offd_nnz; i++)
                for (d = 0; d < 3; d++)
-                  Pi_offd_J[3*i+d] = 3*F2V_offd_J[i]+d;
+               {
+                  Pi_offd_J[3 * i + d] = 3 * F2V_offd_J[i] + d;
+               }
 
             for (i = 0; i < F2V_offd_nrows; i++)
-               for (j = F2V_offd_I[i]; j < F2V_offd_I[i+1]; j++)
+               for (j = F2V_offd_I[i]; j < F2V_offd_I[i + 1]; j++)
                {
                   *Pi_offd_data++ = RT100_data[i];
                   *Pi_offd_data++ = RT010_data[i];
@@ -669,7 +737,9 @@ HYPRE_Int hypre_ADSComputePi(hypre_ParCSRMatrix *A,
 
          for (i = 0; i < F2V_offd_ncols; i++)
             for (d = 0; d < 3; d++)
-               Pi_cmap[3*i+d] = 3*F2V_cmap[i]+(HYPRE_BigInt)d;
+            {
+               Pi_cmap[3 * i + d] = 3 * F2V_cmap[i] + (HYPRE_BigInt)d;
+            }
       }
 
       hypre_ParCSRMatrixDestroy(F2V);
@@ -713,8 +783,10 @@ HYPRE_Int hypre_ADSComputePixyz(hypre_ParCSRMatrix *A,
 {
    hypre_ParCSRMatrix *Pix, *Piy, *Piz;
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
    HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_ParCSRMatrixMemoryLocation(A) );
+#else
+   HYPRE_UNUSED_VAR(A);
 #endif
 
    /* Compute the representations of the coordinate vectors, RT100, RT010 and
@@ -750,7 +822,7 @@ HYPRE_Int hypre_ADSComputePixyz(hypre_ParCSRMatrix *A,
          face-to-vertex matrix. */
       hypre_ParCSRMatrix *F2V;
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
       if (exec == HYPRE_EXEC_DEVICE)
       {
          F2V = hypre_ParCSRMatMat(C, G);
@@ -830,9 +902,20 @@ HYPRE_Int hypre_ADSComputePixyz(hypre_ParCSRMatrix *A,
          HYPRE_Int *Piz_diag_J = hypre_CSRMatrixJ(Piz_diag);
          HYPRE_Real *Piz_diag_data = hypre_CSRMatrixData(Piz_diag);
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
          if (exec == HYPRE_EXEC_DEVICE)
          {
+#if defined(HYPRE_USING_SYCL)
+            HYPRE_ONEDPL_CALL( std::copy_n,
+                               oneapi::dpl::make_zip_iterator(F2V_diag_I, F2V_diag_I, F2V_diag_I),
+                               F2V_diag_nrows + 1,
+                               oneapi::dpl::make_zip_iterator(Pix_diag_I, Piy_diag_I, Piz_diag_I) );
+
+            HYPRE_ONEDPL_CALL( std::copy_n,
+                               oneapi::dpl::make_zip_iterator(F2V_diag_J, F2V_diag_J, F2V_diag_J),
+                               F2V_diag_nnz,
+                               oneapi::dpl::make_zip_iterator(Pix_diag_J, Piy_diag_J, Piz_diag_J) );
+#else
             HYPRE_THRUST_CALL( copy_n,
                                thrust::make_zip_iterator(thrust::make_tuple(F2V_diag_I, F2V_diag_I, F2V_diag_I)),
                                F2V_diag_nrows + 1,
@@ -842,18 +925,19 @@ HYPRE_Int hypre_ADSComputePixyz(hypre_ParCSRMatrix *A,
                                thrust::make_zip_iterator(thrust::make_tuple(F2V_diag_J, F2V_diag_J, F2V_diag_J)),
                                F2V_diag_nnz,
                                thrust::make_zip_iterator(thrust::make_tuple(Pix_diag_J, Piy_diag_J, Piz_diag_J)) );
+#endif
 
-            dim3 bDim = hypre_GetDefaultCUDABlockDimension();
-            dim3 gDim = hypre_GetDefaultCUDAGridDimension(F2V_diag_nrows, "warp", bDim);
+            dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+            dim3 gDim = hypre_GetDefaultDeviceGridDimension(F2V_diag_nrows, "warp", bDim);
 
-            HYPRE_CUDA_LAUNCH( hypreCUDAKernel_AMSComputePixyz_copy, gDim, bDim,
-                               F2V_diag_nrows, 3, F2V_diag_I, NULL, RT100_data, RT010_data, RT001_data,
-                               Pix_diag_data, Piy_diag_data, Piz_diag_data );
+            HYPRE_GPU_LAUNCH( hypreGPUKernel_AMSComputePixyz_copy, gDim, bDim,
+                              F2V_diag_nrows, 3, F2V_diag_I, NULL, RT100_data, RT010_data, RT001_data,
+                              Pix_diag_data, Piy_diag_data, Piz_diag_data );
          }
          else
 #endif
          {
-            for (i = 0; i < F2V_diag_nrows+1; i++)
+            for (i = 0; i < F2V_diag_nrows + 1; i++)
             {
                Pix_diag_I[i] = F2V_diag_I[i];
                Piy_diag_I[i] = F2V_diag_I[i];
@@ -868,7 +952,7 @@ HYPRE_Int hypre_ADSComputePixyz(hypre_ParCSRMatrix *A,
             }
 
             for (i = 0; i < F2V_diag_nrows; i++)
-               for (j = F2V_diag_I[i]; j < F2V_diag_I[i+1]; j++)
+               for (j = F2V_diag_I[i]; j < F2V_diag_I[i + 1]; j++)
                {
                   *Pix_diag_data++ = RT100_data[i];
                   *Piy_diag_data++ = RT010_data[i];
@@ -907,9 +991,23 @@ HYPRE_Int hypre_ADSComputePixyz(hypre_ParCSRMatrix *A,
          HYPRE_BigInt *Piy_cmap = hypre_ParCSRMatrixColMapOffd(Piy);
          HYPRE_BigInt *Piz_cmap = hypre_ParCSRMatrixColMapOffd(Piz);
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
          if (exec == HYPRE_EXEC_DEVICE)
          {
+#if defined(HYPRE_USING_SYCL)
+            if (F2V_offd_ncols)
+            {
+               HYPRE_ONEDPL_CALL( std::copy_n,
+                                  oneapi::dpl::make_zip_iterator(F2V_offd_I, F2V_offd_I, F2V_offd_I),
+                                  F2V_offd_nrows + 1,
+                                  oneapi::dpl::make_zip_iterator(Pix_offd_I, Piy_offd_I, Piz_offd_I) );
+            }
+
+            HYPRE_ONEDPL_CALL( std::copy_n,
+                               oneapi::dpl::make_zip_iterator(F2V_offd_J, F2V_offd_J, F2V_offd_J),
+                               F2V_offd_nnz,
+                               oneapi::dpl::make_zip_iterator(Pix_offd_J, Piy_offd_J, Piz_offd_J) );
+#else
             if (F2V_offd_ncols)
             {
                HYPRE_THRUST_CALL( copy_n,
@@ -922,19 +1020,20 @@ HYPRE_Int hypre_ADSComputePixyz(hypre_ParCSRMatrix *A,
                                thrust::make_zip_iterator(thrust::make_tuple(F2V_offd_J, F2V_offd_J, F2V_offd_J)),
                                F2V_offd_nnz,
                                thrust::make_zip_iterator(thrust::make_tuple(Pix_offd_J, Piy_offd_J, Piz_offd_J)) );
+#endif
 
-            dim3 bDim = hypre_GetDefaultCUDABlockDimension();
-            dim3 gDim = hypre_GetDefaultCUDAGridDimension(F2V_offd_nrows, "warp", bDim);
+            dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+            dim3 gDim = hypre_GetDefaultDeviceGridDimension(F2V_offd_nrows, "warp", bDim);
 
-            HYPRE_CUDA_LAUNCH( hypreCUDAKernel_AMSComputePixyz_copy, gDim, bDim,
-                               F2V_offd_nrows, 3, F2V_offd_I, NULL, RT100_data, RT010_data, RT001_data,
-                               Pix_offd_data, Piy_offd_data, Piz_offd_data );
+            HYPRE_GPU_LAUNCH( hypreGPUKernel_AMSComputePixyz_copy, gDim, bDim,
+                              F2V_offd_nrows, 3, F2V_offd_I, NULL, RT100_data, RT010_data, RT001_data,
+                              Pix_offd_data, Piy_offd_data, Piz_offd_data );
          }
          else
 #endif
          {
             if (F2V_offd_ncols)
-               for (i = 0; i < F2V_offd_nrows+1; i++)
+               for (i = 0; i < F2V_offd_nrows + 1; i++)
                {
                   Pix_offd_I[i] = F2V_offd_I[i];
                   Piy_offd_I[i] = F2V_offd_I[i];
@@ -949,7 +1048,7 @@ HYPRE_Int hypre_ADSComputePixyz(hypre_ParCSRMatrix *A,
             }
 
             for (i = 0; i < F2V_offd_nrows; i++)
-               for (j = F2V_offd_I[i]; j < F2V_offd_I[i+1]; j++)
+               for (j = F2V_offd_I[i]; j < F2V_offd_I[i + 1]; j++)
                {
                   *Pix_offd_data++ = RT100_data[i];
                   *Piy_offd_data++ = RT010_data[i];
@@ -966,9 +1065,13 @@ HYPRE_Int hypre_ADSComputePixyz(hypre_ParCSRMatrix *A,
       }
 
       if (HYPRE_AssumedPartitionCheck())
+      {
          hypre_ParCSRMatrixDestroy(F2V);
+      }
       else
+      {
          hypre_ParCSRBooleanMatrixDestroy((hypre_ParCSRBooleanMatrix*)F2V);
+      }
    }
 
    hypre_ParVectorDestroy(RT100);
@@ -993,12 +1096,16 @@ HYPRE_Int hypre_ADSComputePixyz(hypre_ParCSRMatrix *A,
  * - hypre_ADSSetCoordinateVectors()
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int hypre_ADSSetup(void *solver,
-                         hypre_ParCSRMatrix *A,
-                         hypre_ParVector *b,
-                         hypre_ParVector *x)
+HYPRE_Int
+hypre_ADSSetup(void *solver,
+               hypre_ParCSRMatrix *A,
+               hypre_ParVector *b,
+               hypre_ParVector *x)
 {
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+   HYPRE_UNUSED_VAR(b);
+   HYPRE_UNUSED_VAR(x);
+
+#if defined(HYPRE_USING_GPU)
    HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_ParCSRMatrixMemoryLocation(A) );
 #endif
 
@@ -1019,7 +1126,8 @@ HYPRE_Int hypre_ADSSetup(void *solver,
 
       ads_data -> A_l1_norms = hypre_SeqVectorCreate(hypre_ParCSRMatrixNumRows(ads_data -> A));
       hypre_VectorData(ads_data -> A_l1_norms) = l1_norm_data;
-      hypre_SeqVectorInitialize_v2(ads_data -> A_l1_norms, hypre_ParCSRMatrixMemoryLocation(ads_data -> A));
+      hypre_SeqVectorInitialize_v2(ads_data -> A_l1_norms,
+                                   hypre_ParCSRMatrixMemoryLocation(ads_data -> A));
    }
 
    /* Chebyshev? */
@@ -1100,7 +1208,7 @@ HYPRE_Int hypre_ADSSetup(void *solver,
             hypre_MatvecCommPkgCreate(ads_data -> A);
          }
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
          if (exec == HYPRE_EXEC_DEVICE)
          {
             ads_data -> A_C = hypre_ParCSRMatrixRAPKT(ads_data -> C,
@@ -1129,6 +1237,7 @@ HYPRE_Int hypre_ADSSetup(void *solver,
    if (ads_data -> Pi == NULL && ads_data -> Pix == NULL)
    {
       if (ads_data -> cycle_type > 10)
+      {
          /* Construct Pi{x,y,z} instead of Pi = [Pix,Piy,Piz] */
          hypre_ADSComputePixyz(ads_data -> A,
                                ads_data -> C,
@@ -1142,7 +1251,9 @@ HYPRE_Int hypre_ADSSetup(void *solver,
                                &ads_data -> Pix,
                                &ads_data -> Piy,
                                &ads_data -> Piz);
+      }
       else
+      {
          /* Construct the Pi interpolation matrix */
          hypre_ADSComputePi(ads_data -> A,
                             ads_data -> C,
@@ -1154,10 +1265,11 @@ HYPRE_Int hypre_ADSSetup(void *solver,
                             ams_data -> Piy,
                             ams_data -> Piz,
                             &ads_data -> Pi);
+      }
    }
 
    if (ads_data -> cycle_type > 10)
-   /* Create the AMG solvers on the range of Pi{x,y,z}^T */
+      /* Create the AMG solvers on the range of Pi{x,y,z}^T */
    {
       HYPRE_BoomerAMGCreate(&ads_data -> B_Pix);
       HYPRE_BoomerAMGSetCoarsenType(ads_data -> B_Pix, ads_data -> B_Pi_coarsen_type);
@@ -1209,7 +1321,7 @@ HYPRE_Int hypre_ADSSetup(void *solver,
          hypre_MatvecCommPkgCreate(ads_data -> Pix);
       }
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
       if (exec == HYPRE_EXEC_DEVICE)
       {
          ads_data -> A_Pix = hypre_ParCSRMatrixRAPKT(ads_data -> Pix,
@@ -1234,7 +1346,7 @@ HYPRE_Int hypre_ADSSetup(void *solver,
          hypre_MatvecCommPkgCreate(ads_data -> Piy);
       }
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
       if (exec == HYPRE_EXEC_DEVICE)
       {
          ads_data -> A_Piy = hypre_ParCSRMatrixRAPKT(ads_data -> Piy,
@@ -1259,7 +1371,7 @@ HYPRE_Int hypre_ADSSetup(void *solver,
          hypre_MatvecCommPkgCreate(ads_data -> Piz);
       }
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
       if (exec == HYPRE_EXEC_DEVICE)
       {
          ads_data -> A_Piz = hypre_ParCSRMatrixRAPKT(ads_data -> Piz,
@@ -1280,8 +1392,8 @@ HYPRE_Int hypre_ADSSetup(void *solver,
                            NULL, NULL);
    }
    else
-   /* Create the AMG solver on the range of Pi^T */
    {
+      /* Create the AMG solver on the range of Pi^T */
       HYPRE_BoomerAMGCreate(&ads_data -> B_Pi);
       HYPRE_BoomerAMGSetCoarsenType(ads_data -> B_Pi, ads_data -> B_Pi_coarsen_type);
       HYPRE_BoomerAMGSetAggNumLevels(ads_data -> B_Pi, ads_data -> B_Pi_agg_levels);
@@ -1313,7 +1425,7 @@ HYPRE_Int hypre_ADSSetup(void *solver,
             hypre_MatvecCommPkgCreate(ads_data -> A);
          }
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
          if (exec == HYPRE_EXEC_DEVICE)
          {
             ads_data -> A_Pi = hypre_ParCSRMatrixRAPKT(ads_data -> Pi,
@@ -1373,8 +1485,11 @@ HYPRE_Int hypre_ADSSolve(void *solver,
 {
    hypre_ADSData *ads_data = (hypre_ADSData *) solver;
 
-   HYPRE_Int i, my_id = -1;
-   HYPRE_Real r0_norm, r_norm, b_norm, relative_resid = 0, old_resid;
+   HYPRE_Int   i, my_id = -1;
+   HYPRE_Real  r0_norm  = 1.0;
+   HYPRE_Real  r_norm   = 1.0;
+   HYPRE_Real  b_norm   = 1.0;
+   HYPRE_Real  relative_resid = 0, old_resid;
 
    char cycle[30];
    hypre_ParCSRMatrix *Ai[5], *Pi[5];
@@ -1403,15 +1518,17 @@ HYPRE_Int hypre_ADSSolve(void *solver,
    ri[3] = ads_data -> r2;     gi[3] = ads_data -> g2;
    ri[4] = ads_data -> r2;     gi[4] = ads_data -> g2;
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
    HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_ParCSRMatrixMemoryLocation(A) );
 #endif
 
    /* may need to create an additional temporary vector for relaxation */
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
    if (exec == HYPRE_EXEC_DEVICE)
    {
-      needZ = ads_data -> A_relax_type == 2 || ads_data -> A_relax_type == 4 || ads_data -> A_relax_type == 16;
+      needZ = ads_data -> A_relax_type == 2 ||
+              ads_data -> A_relax_type == 4 ||
+              ads_data -> A_relax_type == 16;
    }
    else
 #endif
@@ -1429,49 +1546,63 @@ HYPRE_Int hypre_ADSSolve(void *solver,
    }
 
    if (ads_data -> print_level > 0)
+   {
       hypre_MPI_Comm_rank(hypre_ParCSRMatrixComm(A), &my_id);
+   }
 
    switch (ads_data -> cycle_type)
    {
       case 1:
       default:
-         hypre_sprintf(cycle,"%s","01210");
+         hypre_sprintf(cycle, "%s", "01210");
          break;
+
       case 2:
-         hypre_sprintf(cycle,"%s","(0+1+2)");
+         hypre_sprintf(cycle, "%s", "(0+1+2)");
          break;
+
       case 3:
-         hypre_sprintf(cycle,"%s","02120");
+         hypre_sprintf(cycle, "%s", "02120");
          break;
+
       case 4:
-         hypre_sprintf(cycle,"%s","(010+2)");
+         hypre_sprintf(cycle, "%s", "(010+2)");
          break;
+
       case 5:
-         hypre_sprintf(cycle,"%s","0102010");
+         hypre_sprintf(cycle, "%s", "0102010");
          break;
+
       case 6:
-         hypre_sprintf(cycle,"%s","(020+1)");
+         hypre_sprintf(cycle, "%s", "(020+1)");
          break;
+
       case 7:
-         hypre_sprintf(cycle,"%s","0201020");
+         hypre_sprintf(cycle, "%s", "0201020");
          break;
+
       case 8:
-         hypre_sprintf(cycle,"%s","0(+1+2)0");
+         hypre_sprintf(cycle, "%s", "0(+1+2)0");
          break;
+
       case 9:
-         hypre_sprintf(cycle,"%s","01210");
+         hypre_sprintf(cycle, "%s", "01210");
          break;
+
       case 11:
-         hypre_sprintf(cycle,"%s","013454310");
+         hypre_sprintf(cycle, "%s", "013454310");
          break;
+
       case 12:
-         hypre_sprintf(cycle,"%s","(0+1+3+4+5)");
+         hypre_sprintf(cycle, "%s", "(0+1+3+4+5)");
          break;
+
       case 13:
-         hypre_sprintf(cycle,"%s","034515430");
+         hypre_sprintf(cycle, "%s", "034515430");
          break;
+
       case 14:
-         hypre_sprintf(cycle,"%s","01(+3+4+5)10");
+         hypre_sprintf(cycle, "%s", "01(+3+4+5)10");
          break;
    }
 
@@ -1482,13 +1613,17 @@ HYPRE_Int hypre_ADSSolve(void *solver,
       {
          hypre_ParVectorCopy(b, ads_data -> r0);
          hypre_ParCSRMatrixMatvec(-1.0, ads_data -> A, x, 1.0, ads_data -> r0);
-         r_norm = sqrt(hypre_ParVectorInnerProd(ads_data -> r0,ads_data -> r0));
+         r_norm = hypre_sqrt(hypre_ParVectorInnerProd(ads_data -> r0, ads_data -> r0));
          r0_norm = r_norm;
-         b_norm = sqrt(hypre_ParVectorInnerProd(b, b));
+         b_norm = hypre_sqrt(hypre_ParVectorInnerProd(b, b));
          if (b_norm)
+         {
             relative_resid = r_norm / b_norm;
+         }
          else
+         {
             relative_resid = r_norm;
+         }
          if (my_id == 0 && ads_data -> print_level > 0)
          {
             hypre_printf("                                            relative\n");
@@ -1523,14 +1658,18 @@ HYPRE_Int hypre_ADSSolve(void *solver,
          old_resid = r_norm;
          hypre_ParVectorCopy(b, ads_data -> r0);
          hypre_ParCSRMatrixMatvec(-1.0, ads_data -> A, x, 1.0, ads_data -> r0);
-         r_norm = sqrt(hypre_ParVectorInnerProd(ads_data -> r0,ads_data -> r0));
+         r_norm = hypre_sqrt(hypre_ParVectorInnerProd(ads_data -> r0, ads_data -> r0));
          if (b_norm)
+         {
             relative_resid = r_norm / b_norm;
+         }
          else
+         {
             relative_resid = r_norm;
+         }
          if (my_id == 0 && ads_data -> print_level > 0)
             hypre_printf("    Cycle %2d   %e    %f     %e \n",
-                         i+1, r_norm, r_norm / old_resid, relative_resid);
+                         i + 1, r_norm, r_norm / old_resid, relative_resid);
       }
 
       if (relative_resid < ads_data -> tol)
@@ -1541,14 +1680,18 @@ HYPRE_Int hypre_ADSSolve(void *solver,
    }
 
    if (my_id == 0 && ads_data -> print_level > 0 && ads_data -> maxit > 1)
+   {
       hypre_printf("\n\n Average Convergence Factor = %f\n\n",
-                   pow((r_norm/r0_norm),(1.0/(HYPRE_Real) i)));
+                   hypre_pow((r_norm / r0_norm), (1.0 / (HYPRE_Real) i)));
+   }
 
    ads_data -> num_iterations = i;
    ads_data -> rel_resid_norm = relative_resid;
 
    if (ads_data -> num_iterations == ads_data -> maxit && ads_data -> tol > 0.0)
+   {
       hypre_error(HYPRE_ERROR_CONV);
+   }
 
    return hypre_error_flag;
 }
diff --git a/external/hypre/src/parcsr_ls/ads.h b/external/hypre/src/parcsr_ls/ads.h
index c9c946c9..793e7543 100644
--- a/external/hypre/src/parcsr_ls/ads.h
+++ b/external/hypre/src/parcsr_ls/ads.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/parcsr_ls/ame.c b/external/hypre/src/parcsr_ls/ame.c
index fd34f4e1..fc7832ab 100644
--- a/external/hypre/src/parcsr_ls/ame.c
+++ b/external/hypre/src/parcsr_ls/ame.c
@@ -1,10 +1,11 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
  ******************************************************************************/
 
+#include "_hypre_onedpl.hpp"
 #include "_hypre_parcsr_ls.h"
 #include "float.h"
 #include "ams.h"
@@ -19,7 +20,7 @@
  * Allocate the AMS eigensolver structure.
  *--------------------------------------------------------------------------*/
 
-void * hypre_AMECreate()
+void * hypre_AMECreate(void)
 {
    hypre_AMEData *ame_data;
 
@@ -28,6 +29,7 @@ void * hypre_AMECreate()
    /* Default parameters */
 
    ame_data -> block_size = 1;  /* compute 1 eigenvector */
+   ame_data -> pcg_maxit = 20;  /* perform at most 20 PCG-AMG */
    ame_data -> maxit = 100;     /* perform at most 100 iterations */
    ame_data -> atol = 1e-6;     /* absolute convergence tolerance */
    ame_data -> rtol = 1e-6;     /* relative convergence tolerance */
@@ -84,32 +86,52 @@ HYPRE_Int hypre_AMEDestroy(void *esolver)
    }
 
    if (ame_data -> G)
+   {
       hypre_ParCSRMatrixDestroy(ame_data -> G);
+   }
    if (ame_data -> A_G)
+   {
       hypre_ParCSRMatrixDestroy(ame_data -> A_G);
+   }
    if (ame_data -> B1_G)
+   {
       HYPRE_BoomerAMGDestroy(ame_data -> B1_G);
+   }
    if (ame_data -> B2_G)
+   {
       HYPRE_ParCSRPCGDestroy(ame_data -> B2_G);
+   }
 
    if (ame_data -> eigenvalues)
+   {
       hypre_TFree(ame_data -> eigenvalues, HYPRE_MEMORY_HOST);
+   }
    if (eigenvectors)
+   {
       mv_MultiVectorDestroy(eigenvectors);
+   }
 
    if (interpreter)
+   {
       hypre_TFree(interpreter, HYPRE_MEMORY_HOST);
+   }
 
    if (ams_data ->  beta_is_zero)
    {
       if (ame_data -> t1)
+      {
          hypre_ParVectorDestroy(ame_data -> t1);
+      }
       if (ame_data -> t2)
+      {
          hypre_ParVectorDestroy(ame_data -> t2);
+      }
    }
 
    if (ame_data)
+   {
       hypre_TFree(ame_data, HYPRE_MEMORY_HOST);
+   }
 
    /* Fields initialized using the Set functions are not destroyed */
 
@@ -175,6 +197,20 @@ HYPRE_Int hypre_AMESetMaxIter(void *esolver,
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_AMESetMaxPCGIter
+ *
+ * Set the maximum number of iterations. The default value is 20.
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int hypre_AMESetMaxPCGIter(void *esolver,
+                                 HYPRE_Int maxit)
+{
+   hypre_AMEData *ame_data = (hypre_AMEData *) esolver;
+   ame_data -> pcg_maxit = maxit;
+   return hypre_error_flag;
+}
+
 /*--------------------------------------------------------------------------
  * hypre_AMESetTol
  *
@@ -227,27 +263,28 @@ HYPRE_Int hypre_AMESetPrintLevel(void *esolver,
  * - hypre_AMESetAMSSolver()
  * - hypre_AMESetMassMatrix()
  *--------------------------------------------------------------------------*/
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
 __global__ void
-hypreCUDAKernel_GtEliminateBoundary( HYPRE_Int      nrows,
-                                     HYPRE_Int     *Gt_diag_i,
-                                     HYPRE_Int     *Gt_diag_j,
-                                     HYPRE_Complex *Gt_diag_data,
-                                     HYPRE_Int     *Gt_offd_i,
-                                     HYPRE_Int     *Gt_offd_j,
-                                     HYPRE_Complex *Gt_offd_data,
-                                     HYPRE_Int     *edge_bc,
-                                     HYPRE_Int     *edge_bc_offd)
+hypreGPUKernel_GtEliminateBoundary( hypre_DeviceItem    &item,
+                                    HYPRE_Int      nrows,
+                                    HYPRE_Int     *Gt_diag_i,
+                                    HYPRE_Int     *Gt_diag_j,
+                                    HYPRE_Complex *Gt_diag_data,
+                                    HYPRE_Int     *Gt_offd_i,
+                                    HYPRE_Int     *Gt_offd_j,
+                                    HYPRE_Complex *Gt_offd_data,
+                                    HYPRE_Int     *edge_bc,
+                                    HYPRE_Int     *edge_bc_offd)
 {
-   HYPRE_Int row_i = hypre_cuda_get_grid_warp_id<1,1>();
+   HYPRE_Int row_i = hypre_gpu_get_grid_warp_id<1, 1>(item);
 
    if (row_i >= nrows)
    {
       return;
    }
 
-   HYPRE_Int lane = hypre_cuda_get_lane_id<1>();
-   HYPRE_Int p1, q1, p2 = 0, q2 = 0;
+   HYPRE_Int lane = hypre_gpu_get_lane_id<1>(item);
+   HYPRE_Int p1 = 0, q1, p2 = 0, q2 = 0;
    bool nonempty_offd = Gt_offd_j != NULL;
    bool bdr = false;
 
@@ -260,18 +297,19 @@ hypreCUDAKernel_GtEliminateBoundary( HYPRE_Int      nrows,
       }
    }
 
-   q1 = __shfl_sync(HYPRE_WARP_FULL_MASK, p1, 1);
-   p1 = __shfl_sync(HYPRE_WARP_FULL_MASK, p1, 0);
+   q1 = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p1, 1);
+   p1 = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p1, 0);
    if (nonempty_offd)
    {
-      q2 = __shfl_sync(HYPRE_WARP_FULL_MASK, p2, 1);
-      p2 = __shfl_sync(HYPRE_WARP_FULL_MASK, p2, 0);
+      q2 = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p2, 1);
+      p2 = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p2, 0);
    }
 
-   for (HYPRE_Int j = p1 + lane; __any_sync(HYPRE_WARP_FULL_MASK, j < q1); j += HYPRE_WARP_SIZE)
+   for (HYPRE_Int j = p1 + lane; warp_any_sync(item, HYPRE_WARP_FULL_MASK, j < q1);
+        j += HYPRE_WARP_SIZE)
    {
       const hypre_int k = j < q1 && read_only_load(&edge_bc[read_only_load(&Gt_diag_j[j])]) != 0;
-      if ( __any_sync(HYPRE_WARP_FULL_MASK, k) )
+      if ( warp_any_sync(item, HYPRE_WARP_FULL_MASK, k) )
       {
          bdr = true;
          break;
@@ -280,10 +318,11 @@ hypreCUDAKernel_GtEliminateBoundary( HYPRE_Int      nrows,
 
    if (!bdr)
    {
-      for (HYPRE_Int j = p2 + lane; __any_sync(HYPRE_WARP_FULL_MASK, j < q2); j += HYPRE_WARP_SIZE)
+      for (HYPRE_Int j = p2 + lane; warp_any_sync(item, HYPRE_WARP_FULL_MASK, j < q2);
+           j += HYPRE_WARP_SIZE)
       {
          const hypre_int k = j < q2 && read_only_load(&edge_bc_offd[read_only_load(&Gt_offd_j[j])]) != 0;
-         if ( __any_sync(HYPRE_WARP_FULL_MASK, k) )
+         if ( warp_any_sync(item, HYPRE_WARP_FULL_MASK, k) )
          {
             bdr = true;
             break;
@@ -325,7 +364,7 @@ HYPRE_Int hypre_AMESetup(void *esolver)
    ame_data -> t3 = ams_data -> r0;
 
    HYPRE_MemoryLocation memory_location = hypre_ParCSRMatrixMemoryLocation(ams_data -> A);
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
    HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1(memory_location);
 #endif
 
@@ -355,27 +394,44 @@ HYPRE_Int hypre_AMESetup(void *esolver)
          /* A row (edge) is boundary if its off-diag l1 norm is less than eps */
          HYPRE_Real eps = DBL_EPSILON * 1e+4;
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
          if (exec == HYPRE_EXEC_DEVICE)
          {
             HYPRE_Real *l1norm_arr = hypre_TAlloc(HYPRE_Real, ne, memory_location);
             hypre_CSRMatrixExtractDiagonalDevice(Ad, l1norm_arr, 1);
+#if defined(HYPRE_USING_SYCL)
+            HYPRE_ONEDPL_CALL( std::transform,
+                               l1norm_arr,
+                               l1norm_arr + ne,
+                               l1norm_arr,
+                               std::negate<HYPRE_Real>() );
+#else
             HYPRE_THRUST_CALL( transform,
                                l1norm_arr,
                                l1norm_arr + ne,
                                l1norm_arr,
                                thrust::negate<HYPRE_Real>() );
+#endif
             hypre_CSRMatrixComputeRowSumDevice(Ad, NULL, NULL, l1norm_arr, 1, 1.0, "add");
             if (AoA)
             {
                hypre_CSRMatrixComputeRowSumDevice(Ao, NULL, NULL, l1norm_arr, 1, 1.0, "add");
             }
+#if defined(HYPRE_USING_SYCL)
+            hypreSycl_transform_if( edge_bc,
+                                    edge_bc + ne,
+                                    l1norm_arr,
+                                    edge_bc,
+            [] (const auto & x) {return 1;},
+            less_than<HYPRE_Real>(eps) );
+#else
             HYPRE_THRUST_CALL( replace_if,
                                edge_bc,
                                edge_bc + ne,
                                l1norm_arr,
                                less_than<HYPRE_Real>(eps),
                                1 );
+#endif
             hypre_TFree(l1norm_arr, memory_location);
          }
          else
@@ -385,14 +441,20 @@ HYPRE_Int hypre_AMESetup(void *esolver)
             for (i = 0; i < ne; i++)
             {
                l1_norm = 0.0;
-               for (j = AdI[i]; j < AdI[i+1]; j++)
+               for (j = AdI[i]; j < AdI[i + 1]; j++)
                   if (AdJ[j] != i)
-                     l1_norm += fabs(AdA[j]);
+                  {
+                     l1_norm += hypre_abs(AdA[j]);
+                  }
                if (AoI)
-                  for (j = AoI[i]; j < AoI[i+1]; j++)
-                     l1_norm += fabs(AoA[j]);
+                  for (j = AoI[i]; j < AoI[i + 1]; j++)
+                  {
+                     l1_norm += hypre_abs(AoA[j]);
+                  }
                if (l1_norm < eps)
+               {
                   edge_bc[i] = 1;
+               }
             }
          }
       }
@@ -409,24 +471,43 @@ HYPRE_Int hypre_AMESetup(void *esolver)
          HYPRE_Int num_sends, *int_buf_data;
          HYPRE_Int index, start;
 
-         offd_edge_bc = hypre_TAlloc(HYPRE_Int, hypre_CSRMatrixNumCols(hypre_ParCSRMatrixOffd(Gt)), memory_location);
+         offd_edge_bc = hypre_TAlloc(HYPRE_Int, hypre_CSRMatrixNumCols(hypre_ParCSRMatrixOffd(Gt)),
+                                     memory_location);
 
          hypre_MatvecCommPkgCreate(Gt);
          comm_pkg = hypre_ParCSRMatrixCommPkg(Gt);
 
          num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
-         int_buf_data = hypre_TAlloc(HYPRE_Int, hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends), memory_location );
+         int_buf_data = hypre_TAlloc(HYPRE_Int, hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                                     memory_location );
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
          if (exec == HYPRE_EXEC_DEVICE)
          {
             hypre_ParCSRCommPkgCopySendMapElmtsToDevice(comm_pkg);
 
+#if defined(HYPRE_USING_SYCL)
+            hypreSycl_gather( hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg),
+                              hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg) + hypre_ParCSRCommPkgSendMapStart(comm_pkg,
+                                                                                                                num_sends),
+                              edge_bc,
+                              int_buf_data );
+#else
             HYPRE_THRUST_CALL( gather,
                                hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg),
-                               hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg) + hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                               hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg) + hypre_ParCSRCommPkgSendMapStart(comm_pkg,
+                                     num_sends),
                                edge_bc,
                                int_buf_data );
+#endif
+
+#if defined(HYPRE_USING_THRUST_NOSYNC)
+            /* RL: make sure int_buf_data is ready before issuing GPU-GPU MPI */
+            if (hypre_GetGpuAwareMPI())
+            {
+               hypre_ForceSyncComputeStream();
+            }
+#endif
          }
          else
 #endif
@@ -435,13 +516,14 @@ HYPRE_Int hypre_AMESetup(void *esolver)
             for (i = 0; i < num_sends; i++)
             {
                start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-               for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+               for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
                {
-                  k = hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j);
+                  k = hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j);
                   int_buf_data[index++] = edge_bc[k];
                }
             }
          }
+
          comm_handle = hypre_ParCSRCommHandleCreate_v2(11, comm_pkg,
                                                        memory_location, int_buf_data,
                                                        memory_location, offd_edge_bc);
@@ -462,13 +544,13 @@ HYPRE_Int hypre_AMESetup(void *esolver)
 
          HYPRE_Int bdr;
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
          if (exec == HYPRE_EXEC_DEVICE)
          {
-            dim3 bDim = hypre_GetDefaultCUDABlockDimension();
-            dim3 gDim = hypre_GetDefaultCUDAGridDimension(nv, "warp", bDim);
-            HYPRE_CUDA_LAUNCH( hypreCUDAKernel_GtEliminateBoundary, gDim, bDim,
-                               nv, GtdI, GtdJ, GtdA, GtoI, GtoJ, GtoA, edge_bc, offd_edge_bc );
+            dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+            dim3 gDim = hypre_GetDefaultDeviceGridDimension(nv, "warp", bDim);
+            HYPRE_GPU_LAUNCH( hypreGPUKernel_GtEliminateBoundary, gDim, bDim,
+                              nv, GtdI, GtdJ, GtdA, GtoI, GtoJ, GtoA, edge_bc, offd_edge_bc );
          }
          else
 #endif
@@ -477,21 +559,25 @@ HYPRE_Int hypre_AMESetup(void *esolver)
             {
                bdr = 0;
                /* A vertex is boundary if it belongs to a boundary edge */
-               for (j = GtdI[i]; j < GtdI[i+1]; j++)
+               for (j = GtdI[i]; j < GtdI[i + 1]; j++)
                   if (edge_bc[GtdJ[j]]) { bdr = 1; break; }
                if (!bdr && GtoI)
-                  for (j = GtoI[i]; j < GtoI[i+1]; j++)
+                  for (j = GtoI[i]; j < GtoI[i + 1]; j++)
                      if (offd_edge_bc[GtoJ[j]]) { bdr = 1; break; }
 
                if (bdr)
                {
-                  for (j = GtdI[i]; j < GtdI[i+1]; j++)
+                  for (j = GtdI[i]; j < GtdI[i + 1]; j++)
                      /* if (!edge_bc[GtdJ[j]]) */
+                  {
                      GtdA[j] = 0.0;
+                  }
                   if (GtoI)
-                     for (j = GtoI[i]; j < GtoI[i+1]; j++)
+                     for (j = GtoI[i]; j < GtoI[i + 1]; j++)
                         /* if (!offd_edge_bc[GtoJ[j]]) */
+                     {
                         GtoA[j] = 0.0;
+                     }
                }
             }
          }
@@ -506,24 +592,28 @@ HYPRE_Int hypre_AMESetup(void *esolver)
    /* Compute G^t M G */
    {
       if (!hypre_ParCSRMatrixCommPkg(ame_data -> G))
+      {
          hypre_MatvecCommPkgCreate(ame_data -> G);
+      }
 
       if (!hypre_ParCSRMatrixCommPkg(ame_data -> M))
+      {
          hypre_MatvecCommPkgCreate(ame_data -> M);
+      }
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-         if (exec == HYPRE_EXEC_DEVICE)
-         {
-            ame_data -> A_G = hypre_ParCSRMatrixRAPKT(ame_data -> G, ame_data -> M, ame_data -> G, 1);
-         }
-         else
+#if defined(HYPRE_USING_GPU)
+      if (exec == HYPRE_EXEC_DEVICE)
+      {
+         ame_data -> A_G = hypre_ParCSRMatrixRAPKT(ame_data -> G, ame_data -> M, ame_data -> G, 1);
+      }
+      else
 #endif
-         {
-            hypre_BoomerAMGBuildCoarseOperator(ame_data -> G,
-                                               ame_data -> M,
-                                               ame_data -> G,
-                                               &ame_data -> A_G);
-         }
+      {
+         hypre_BoomerAMGBuildCoarseOperator(ame_data -> G,
+                                            ame_data -> M,
+                                            ame_data -> G,
+                                            &ame_data -> A_G);
+      }
 
       hypre_ParCSRMatrixFixZeroRows(ame_data -> A_G);
    }
@@ -548,7 +638,7 @@ HYPRE_Int hypre_AMESetup(void *esolver)
                             &ame_data -> B2_G);
       HYPRE_PCGSetPrintLevel(ame_data -> B2_G, 0);
       HYPRE_PCGSetTol(ame_data -> B2_G, 1e-12);
-      HYPRE_PCGSetMaxIter(ame_data -> B2_G, 20);
+      HYPRE_PCGSetMaxIter(ame_data -> B2_G, ame_data -> pcg_maxit);
 
       HYPRE_PCGSetPrecond(ame_data -> B2_G,
                           (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSolve,
@@ -594,22 +684,33 @@ HYPRE_Int hypre_AMESetup(void *esolver)
          {
             vi = (hypre_ParVector*) v[i];
             data = hypre_VectorData(hypre_ParVectorLocalVector(vi));
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
             if (exec == HYPRE_EXEC_DEVICE)
             {
+#if defined(HYPRE_USING_SYCL)
+               hypreSycl_transform_if( data,
+                                       data + ne,
+                                       edge_bc,
+                                       data,
+               [] (const auto & x) {return 0.0;},
+               [] (const auto & x) {return x;} );
+#else
                HYPRE_THRUST_CALL( replace_if,
                                   data,
                                   data + ne,
                                   edge_bc,
                                   thrust::identity<HYPRE_Int>(),
                                   0.0 );
+#endif
             }
             else
 #endif
             {
                for (j = 0; j < ne; j++)
                   if (edge_bc[j])
+                  {
                      data[j] = 0.0;
+                  }
             }
             hypre_AMEDiscrDivFreeComponent(esolver, vi);
          }
@@ -671,7 +772,7 @@ void hypre_AMEMultiOperatorA(void *data, void* x, void* y)
 {
    hypre_AMEData *ame_data = (hypre_AMEData *) data;
    mv_InterfaceInterpreter*
-      interpreter = (mv_InterfaceInterpreter*) ame_data -> interpreter;
+   interpreter = (mv_InterfaceInterpreter*) ame_data -> interpreter;
    interpreter -> Eval(hypre_AMEOperatorA, data, x, y);
 }
 
@@ -692,7 +793,7 @@ void hypre_AMEMultiOperatorM(void *data, void* x, void* y)
 {
    hypre_AMEData *ame_data = (hypre_AMEData *) data;
    mv_InterfaceInterpreter*
-      interpreter = (mv_InterfaceInterpreter*) ame_data -> interpreter;
+   interpreter = (mv_InterfaceInterpreter*) ame_data -> interpreter;
    interpreter -> Eval(hypre_AMEOperatorM, data, x, y);
 }
 
@@ -709,7 +810,7 @@ void hypre_AMEOperatorB(void *data, void* x, void* y)
    hypre_AMSData *ams_data = ame_data -> precond;
 
    hypre_ParVectorSetConstantValues((hypre_ParVector*)y, 0.0);
-   hypre_AMSSolve(ame_data -> precond, ams_data -> A,(hypre_ParVector*) x,(hypre_ParVector*) y);
+   hypre_AMSSolve(ame_data -> precond, ams_data -> A, (hypre_ParVector*) x, (hypre_ParVector*) y);
 
    hypre_AMEDiscrDivFreeComponent(data, (hypre_ParVector *)y);
 }
@@ -718,7 +819,7 @@ void hypre_AMEMultiOperatorB(void *data, void* x, void* y)
 {
    hypre_AMEData *ame_data = (hypre_AMEData *) data;
    mv_InterfaceInterpreter*
-      interpreter = (mv_InterfaceInterpreter*) ame_data -> interpreter;
+   interpreter = (mv_InterfaceInterpreter*) ame_data -> interpreter;
    interpreter -> Eval(hypre_AMEOperatorB, data, x, y);
 }
 
@@ -771,7 +872,7 @@ HYPRE_Int hypre_AMEGetEigenvectors(void *esolver,
 {
    hypre_AMEData *ame_data = (hypre_AMEData *) esolver;
    mv_MultiVectorPtr
-      eigenvectors = (mv_MultiVectorPtr) ame_data -> eigenvectors;
+   eigenvectors = (mv_MultiVectorPtr) ame_data -> eigenvectors;
    mv_TempMultiVector* tmp = (mv_TempMultiVector*) mv_MultiVectorGetData(eigenvectors);
 
    *eigenvectors_ptr = (HYPRE_ParVector*)(tmp -> vector);
diff --git a/external/hypre/src/parcsr_ls/ame.h b/external/hypre/src/parcsr_ls/ame.h
index 03c5fe47..70089e50 100644
--- a/external/hypre/src/parcsr_ls/ame.h
+++ b/external/hypre/src/parcsr_ls/ame.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -34,6 +34,7 @@ typedef struct
    HYPRE_Real *eigenvalues;
 
    /* Eigensolver (LOBPCG) options */
+   HYPRE_Int pcg_maxit;
    HYPRE_Int maxit;
    HYPRE_Real atol;
    HYPRE_Real rtol;
diff --git a/external/hypre/src/parcsr_ls/amg_hybrid.c b/external/hypre/src/parcsr_ls/amg_hybrid.c
index 208b4e79..5c509cf3 100644
--- a/external/hypre/src/parcsr_ls/amg_hybrid.c
+++ b/external/hypre/src/parcsr_ls/amg_hybrid.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -32,8 +32,8 @@ typedef struct
    HYPRE_Int             k_dim;
 
    HYPRE_Int             pcg_default;              /* boolean */
-   HYPRE_Int           (*pcg_precond_solve)(void*,void*,void*,void*);
-   HYPRE_Int           (*pcg_precond_setup)(void*,void*,void*,void*);
+   HYPRE_Int           (*pcg_precond_solve)(void*, void*, void*, void*);
+   HYPRE_Int           (*pcg_precond_setup)(void*, void*, void*, void*);
    void                 *pcg_precond;
    void                 *pcg_solver;
 
@@ -92,7 +92,7 @@ typedef struct
  *--------------------------------------------------------------------------*/
 
 void *
-hypre_AMGHybridCreate( )
+hypre_AMGHybridCreate( void )
 {
    hypre_AMGHybridData *AMGhybrid_data;
 
@@ -177,43 +177,43 @@ hypre_AMGHybridDestroy( void  *AMGhybrid_vdata )
       void *pcg_solver = (AMGhybrid_data -> pcg_solver);
       void *pcg_precond = (AMGhybrid_data -> pcg_precond);
 
-      if (pcg_precond) hypre_BoomerAMGDestroy(pcg_precond);
-      if (solver_type == 1) hypre_PCGDestroy(pcg_solver);
-      if (solver_type == 2) hypre_GMRESDestroy(pcg_solver);
-      if (solver_type == 3) hypre_BiCGSTABDestroy(pcg_solver);
+      if (pcg_precond) { hypre_BoomerAMGDestroy(pcg_precond); }
+      if (solver_type == 1) { hypre_PCGDestroy(pcg_solver); }
+      if (solver_type == 2) { hypre_GMRESDestroy(pcg_solver); }
+      if (solver_type == 3) { hypre_BiCGSTABDestroy(pcg_solver); }
 
       if (AMGhybrid_data -> num_grid_sweeps)
       {
-         hypre_TFree( (AMGhybrid_data -> num_grid_sweeps) , HYPRE_MEMORY_HOST);
+         hypre_TFree( (AMGhybrid_data -> num_grid_sweeps), HYPRE_MEMORY_HOST);
          (AMGhybrid_data -> num_grid_sweeps) = NULL;
       }
       if (AMGhybrid_data -> grid_relax_type)
       {
-         hypre_TFree( (AMGhybrid_data -> grid_relax_type) , HYPRE_MEMORY_HOST);
+         hypre_TFree( (AMGhybrid_data -> grid_relax_type), HYPRE_MEMORY_HOST);
          (AMGhybrid_data -> grid_relax_type) = NULL;
       }
       if (AMGhybrid_data -> grid_relax_points)
       {
-         for (i=0; i < 4; i++)
+         for (i = 0; i < 4; i++)
          {
-            hypre_TFree( (AMGhybrid_data -> grid_relax_points)[i] , HYPRE_MEMORY_HOST);
+            hypre_TFree( (AMGhybrid_data -> grid_relax_points)[i], HYPRE_MEMORY_HOST);
          }
-         hypre_TFree( (AMGhybrid_data -> grid_relax_points) , HYPRE_MEMORY_HOST);
+         hypre_TFree( (AMGhybrid_data -> grid_relax_points), HYPRE_MEMORY_HOST);
          (AMGhybrid_data -> grid_relax_points) = NULL;
       }
       if (AMGhybrid_data -> relax_weight)
       {
-         hypre_TFree( (AMGhybrid_data -> relax_weight) , HYPRE_MEMORY_HOST);
+         hypre_TFree( (AMGhybrid_data -> relax_weight), HYPRE_MEMORY_HOST);
          (AMGhybrid_data -> relax_weight) = NULL;
       }
       if (AMGhybrid_data -> omega)
       {
-         hypre_TFree( (AMGhybrid_data -> omega) , HYPRE_MEMORY_HOST);
+         hypre_TFree( (AMGhybrid_data -> omega), HYPRE_MEMORY_HOST);
          (AMGhybrid_data -> omega) = NULL;
       }
       if (AMGhybrid_data -> dof_func)
       {
-         hypre_TFree( (AMGhybrid_data -> dof_func) , HYPRE_MEMORY_HOST);
+         hypre_TFree( (AMGhybrid_data -> dof_func), HYPRE_MEMORY_HOST);
          (AMGhybrid_data -> dof_func) = NULL;
       }
       hypre_TFree(AMGhybrid_data, HYPRE_MEMORY_HOST);
@@ -230,7 +230,7 @@ HYPRE_Int
 hypre_AMGHybridSetTol( void   *AMGhybrid_vdata,
                        HYPRE_Real  tol       )
 {
-   hypre_AMGHybridData *AMGhybrid_data =(hypre_AMGHybridData *) AMGhybrid_vdata;
+   hypre_AMGHybridData *AMGhybrid_data = (hypre_AMGHybridData *) AMGhybrid_vdata;
 
    if (!AMGhybrid_data)
    {
@@ -254,7 +254,7 @@ HYPRE_Int
 hypre_AMGHybridSetAbsoluteTol( void   *AMGhybrid_vdata,
                                HYPRE_Real  a_tol       )
 {
-   hypre_AMGHybridData *AMGhybrid_data =(hypre_AMGHybridData *) AMGhybrid_vdata;
+   hypre_AMGHybridData *AMGhybrid_data = (hypre_AMGHybridData *) AMGhybrid_vdata;
 
    if (!AMGhybrid_data)
    {
@@ -278,7 +278,7 @@ HYPRE_Int
 hypre_AMGHybridSetConvergenceTol( void   *AMGhybrid_vdata,
                                   HYPRE_Real  cf_tol       )
 {
-   hypre_AMGHybridData *AMGhybrid_data =(hypre_AMGHybridData *) AMGhybrid_vdata;
+   hypre_AMGHybridData *AMGhybrid_data = (hypre_AMGHybridData *) AMGhybrid_vdata;
    if (!AMGhybrid_data)
    {
       hypre_error_in_arg(1);
@@ -304,7 +304,7 @@ hypre_AMGHybridSetNonGalerkinTol( void   *AMGhybrid_vdata,
                                   HYPRE_Int  nongalerk_num_tol,
                                   HYPRE_Real *nongalerkin_tol       )
 {
-   hypre_AMGHybridData *AMGhybrid_data =(hypre_AMGHybridData *) AMGhybrid_vdata;
+   hypre_AMGHybridData *AMGhybrid_data = (hypre_AMGHybridData *) AMGhybrid_vdata;
    if (!AMGhybrid_data)
    {
       hypre_error_in_arg(1);
@@ -330,7 +330,7 @@ HYPRE_Int
 hypre_AMGHybridSetDSCGMaxIter( void   *AMGhybrid_vdata,
                                HYPRE_Int     dscg_max_its )
 {
-   hypre_AMGHybridData *AMGhybrid_data =(hypre_AMGHybridData *) AMGhybrid_vdata;
+   hypre_AMGHybridData *AMGhybrid_data = (hypre_AMGHybridData *) AMGhybrid_vdata;
    if (!AMGhybrid_data)
    {
       hypre_error_in_arg(1);
@@ -355,7 +355,7 @@ HYPRE_Int
 hypre_AMGHybridSetPCGMaxIter( void   *AMGhybrid_vdata,
                               HYPRE_Int     pcg_max_its  )
 {
-   hypre_AMGHybridData *AMGhybrid_data =(hypre_AMGHybridData *) AMGhybrid_vdata;
+   hypre_AMGHybridData *AMGhybrid_data = (hypre_AMGHybridData *) AMGhybrid_vdata;
    if (!AMGhybrid_data)
    {
       hypre_error_in_arg(1);
@@ -380,7 +380,7 @@ HYPRE_Int
 hypre_AMGHybridSetSetupType( void   *AMGhybrid_vdata,
                              HYPRE_Int     setup_type  )
 {
-   hypre_AMGHybridData *AMGhybrid_data =(hypre_AMGHybridData *) AMGhybrid_vdata;
+   hypre_AMGHybridData *AMGhybrid_data = (hypre_AMGHybridData *) AMGhybrid_vdata;
    if (!AMGhybrid_data)
    {
       hypre_error_in_arg(1);
@@ -400,7 +400,7 @@ HYPRE_Int
 hypre_AMGHybridSetSolverType( void   *AMGhybrid_vdata,
                               HYPRE_Int     solver_type  )
 {
-   hypre_AMGHybridData *AMGhybrid_data =(hypre_AMGHybridData *) AMGhybrid_vdata;
+   hypre_AMGHybridData *AMGhybrid_data = (hypre_AMGHybridData *) AMGhybrid_vdata;
    if (!AMGhybrid_data)
    {
       hypre_error_in_arg(1);
@@ -492,7 +492,7 @@ HYPRE_Int
 hypre_AMGHybridSetKDim( void   *AMGhybrid_vdata,
                         HYPRE_Int     k_dim  )
 {
-   hypre_AMGHybridData *AMGhybrid_data =(hypre_AMGHybridData *) AMGhybrid_vdata;
+   hypre_AMGHybridData *AMGhybrid_data = (hypre_AMGHybridData *) AMGhybrid_vdata;
    if (!AMGhybrid_data)
    {
       hypre_error_in_arg(1);
@@ -517,7 +517,7 @@ HYPRE_Int
 hypre_AMGHybridSetStopCrit( void *AMGhybrid_vdata,
                             HYPRE_Int   stop_crit  )
 {
-   hypre_AMGHybridData *AMGhybrid_data =(hypre_AMGHybridData *) AMGhybrid_vdata;
+   hypre_AMGHybridData *AMGhybrid_data = (hypre_AMGHybridData *) AMGhybrid_vdata;
    if (!AMGhybrid_data)
    {
       hypre_error_in_arg(1);
@@ -537,7 +537,7 @@ HYPRE_Int
 hypre_AMGHybridSetTwoNorm( void *AMGhybrid_vdata,
                            HYPRE_Int   two_norm  )
 {
-   hypre_AMGHybridData *AMGhybrid_data =(hypre_AMGHybridData *) AMGhybrid_vdata;
+   hypre_AMGHybridData *AMGhybrid_data = (hypre_AMGHybridData *) AMGhybrid_vdata;
    if (!AMGhybrid_data)
    {
       hypre_error_in_arg(1);
@@ -557,7 +557,7 @@ HYPRE_Int
 hypre_AMGHybridSetRelChange( void *AMGhybrid_vdata,
                              HYPRE_Int   rel_change  )
 {
-   hypre_AMGHybridData *AMGhybrid_data =(hypre_AMGHybridData *) AMGhybrid_vdata;
+   hypre_AMGHybridData *AMGhybrid_data = (hypre_AMGHybridData *) AMGhybrid_vdata;
    if (!AMGhybrid_data)
    {
       hypre_error_in_arg(1);
@@ -575,11 +575,11 @@ hypre_AMGHybridSetRelChange( void *AMGhybrid_vdata,
 
 HYPRE_Int
 hypre_AMGHybridSetPrecond( void  *pcg_vdata,
-                           HYPRE_Int  (*pcg_precond_solve)(void*,void*,void*,void*),
-                           HYPRE_Int  (*pcg_precond_setup)(void*,void*,void*,void*),
+                           HYPRE_Int  (*pcg_precond_solve)(void*, void*, void*, void*),
+                           HYPRE_Int  (*pcg_precond_setup)(void*, void*, void*, void*),
                            void  *pcg_precond          )
 {
-   hypre_AMGHybridData *pcg_data =(hypre_AMGHybridData *) pcg_vdata;
+   hypre_AMGHybridData *pcg_data = (hypre_AMGHybridData *) pcg_vdata;
    if (!pcg_data)
    {
       hypre_error_in_arg(1);
@@ -602,7 +602,7 @@ HYPRE_Int
 hypre_AMGHybridSetLogging( void *AMGhybrid_vdata,
                            HYPRE_Int   logging  )
 {
-   hypre_AMGHybridData *AMGhybrid_data =(hypre_AMGHybridData *) AMGhybrid_vdata;
+   hypre_AMGHybridData *AMGhybrid_data = (hypre_AMGHybridData *) AMGhybrid_vdata;
    if (!AMGhybrid_data)
    {
       hypre_error_in_arg(1);
@@ -622,7 +622,7 @@ HYPRE_Int
 hypre_AMGHybridSetPrintLevel( void *AMGhybrid_vdata,
                               HYPRE_Int   print_level  )
 {
-   hypre_AMGHybridData *AMGhybrid_data =(hypre_AMGHybridData *) AMGhybrid_vdata;
+   hypre_AMGHybridData *AMGhybrid_data = (hypre_AMGHybridData *) AMGhybrid_vdata;
    if (!AMGhybrid_data)
    {
       hypre_error_in_arg(1);
@@ -642,7 +642,7 @@ HYPRE_Int
 hypre_AMGHybridSetStrongThreshold( void *AMGhybrid_vdata,
                                    HYPRE_Real strong_threshold)
 {
-   hypre_AMGHybridData *AMGhybrid_data =(hypre_AMGHybridData *) AMGhybrid_vdata;
+   hypre_AMGHybridData *AMGhybrid_data = (hypre_AMGHybridData *) AMGhybrid_vdata;
    if (!AMGhybrid_data)
    {
       hypre_error_in_arg(1);
@@ -667,7 +667,7 @@ HYPRE_Int
 hypre_AMGHybridSetMaxRowSum( void *AMGhybrid_vdata,
                              HYPRE_Real   max_row_sum  )
 {
-   hypre_AMGHybridData *AMGhybrid_data =(hypre_AMGHybridData *) AMGhybrid_vdata;
+   hypre_AMGHybridData *AMGhybrid_data = (hypre_AMGHybridData *) AMGhybrid_vdata;
    if (!AMGhybrid_data)
    {
       hypre_error_in_arg(1);
@@ -692,7 +692,7 @@ HYPRE_Int
 hypre_AMGHybridSetTruncFactor( void *AMGhybrid_vdata,
                                HYPRE_Real   trunc_factor  )
 {
-   hypre_AMGHybridData *AMGhybrid_data =(hypre_AMGHybridData *) AMGhybrid_vdata;
+   hypre_AMGHybridData *AMGhybrid_data = (hypre_AMGHybridData *) AMGhybrid_vdata;
    if (!AMGhybrid_data)
    {
       hypre_error_in_arg(1);
@@ -718,7 +718,7 @@ hypre_AMGHybridSetPMaxElmts( void   *AMGhybrid_vdata,
                              HYPRE_Int    P_max_elmts )
 {
 
-   hypre_AMGHybridData *AMGhybrid_data =(hypre_AMGHybridData *) AMGhybrid_vdata;
+   hypre_AMGHybridData *AMGhybrid_data = (hypre_AMGHybridData *) AMGhybrid_vdata;
    if (!AMGhybrid_data)
    {
       hypre_error_in_arg(1);
@@ -744,7 +744,7 @@ HYPRE_Int
 hypre_AMGHybridSetMaxLevels( void *AMGhybrid_vdata,
                              HYPRE_Int   max_levels  )
 {
-   hypre_AMGHybridData *AMGhybrid_data =(hypre_AMGHybridData *) AMGhybrid_vdata;
+   hypre_AMGHybridData *AMGhybrid_data = (hypre_AMGHybridData *) AMGhybrid_vdata;
    if (!AMGhybrid_data)
    {
       hypre_error_in_arg(1);
@@ -769,7 +769,7 @@ HYPRE_Int
 hypre_AMGHybridSetMeasureType( void *AMGhybrid_vdata,
                                HYPRE_Int   measure_type  )
 {
-   hypre_AMGHybridData *AMGhybrid_data =(hypre_AMGHybridData *) AMGhybrid_vdata;
+   hypre_AMGHybridData *AMGhybrid_data = (hypre_AMGHybridData *) AMGhybrid_vdata;
    if (!AMGhybrid_data)
    {
       hypre_error_in_arg(1);
@@ -789,7 +789,7 @@ HYPRE_Int
 hypre_AMGHybridSetCoarsenType( void *AMGhybrid_vdata,
                                HYPRE_Int   coarsen_type  )
 {
-   hypre_AMGHybridData *AMGhybrid_data =(hypre_AMGHybridData *) AMGhybrid_vdata;
+   hypre_AMGHybridData *AMGhybrid_data = (hypre_AMGHybridData *) AMGhybrid_vdata;
    if (!AMGhybrid_data)
    {
       hypre_error_in_arg(1);
@@ -809,7 +809,7 @@ HYPRE_Int
 hypre_AMGHybridSetInterpType( void *AMGhybrid_vdata,
                               HYPRE_Int   interp_type  )
 {
-   hypre_AMGHybridData *AMGhybrid_data =(hypre_AMGHybridData *) AMGhybrid_vdata;
+   hypre_AMGHybridData *AMGhybrid_data = (hypre_AMGHybridData *) AMGhybrid_vdata;
    if (!AMGhybrid_data)
    {
       hypre_error_in_arg(1);
@@ -834,7 +834,7 @@ HYPRE_Int
 hypre_AMGHybridSetCycleType( void *AMGhybrid_vdata,
                              HYPRE_Int   cycle_type  )
 {
-   hypre_AMGHybridData *AMGhybrid_data =(hypre_AMGHybridData *) AMGhybrid_vdata;
+   hypre_AMGHybridData *AMGhybrid_data = (hypre_AMGHybridData *) AMGhybrid_vdata;
    if (!AMGhybrid_data)
    {
       hypre_error_in_arg(1);
@@ -859,7 +859,7 @@ HYPRE_Int
 hypre_AMGHybridSetNumSweeps( void *AMGhybrid_vdata,
                              HYPRE_Int   num_sweeps  )
 {
-   hypre_AMGHybridData *AMGhybrid_data =(hypre_AMGHybridData *) AMGhybrid_vdata;
+   hypre_AMGHybridData *AMGhybrid_data = (hypre_AMGHybridData *) AMGhybrid_vdata;
    HYPRE_Int                 *num_grid_sweeps;
    HYPRE_Int               i;
    if (!AMGhybrid_data)
@@ -878,7 +878,7 @@ hypre_AMGHybridSetNumSweeps( void *AMGhybrid_vdata,
       (AMGhybrid_data -> num_grid_sweeps) = hypre_CTAlloc(HYPRE_Int, 4, HYPRE_MEMORY_HOST);
    }
    num_grid_sweeps = (AMGhybrid_data -> num_grid_sweeps);
-   for (i=0; i < 3; i++)
+   for (i = 0; i < 3; i++)
    {
       num_grid_sweeps[i] = num_sweeps;
    }
@@ -895,7 +895,7 @@ hypre_AMGHybridSetCycleNumSweeps( void *AMGhybrid_vdata,
                                   HYPRE_Int   num_sweeps,
                                   HYPRE_Int   k)
 {
-   hypre_AMGHybridData *AMGhybrid_data =(hypre_AMGHybridData *) AMGhybrid_vdata;
+   hypre_AMGHybridData *AMGhybrid_data = (hypre_AMGHybridData *) AMGhybrid_vdata;
    HYPRE_Int                 *num_grid_sweeps;
    HYPRE_Int               i;
 
@@ -924,7 +924,7 @@ hypre_AMGHybridSetCycleNumSweeps( void *AMGhybrid_vdata,
    {
       (AMGhybrid_data -> num_grid_sweeps) = hypre_CTAlloc(HYPRE_Int, 4, HYPRE_MEMORY_HOST);
       num_grid_sweeps = (AMGhybrid_data -> num_grid_sweeps);
-      for (i=0; i < 4; i++)
+      for (i = 0; i < 4; i++)
       {
          num_grid_sweeps[i] = 1;
       }
@@ -941,7 +941,7 @@ HYPRE_Int
 hypre_AMGHybridSetRelaxType( void *AMGhybrid_vdata,
                              HYPRE_Int  relax_type  )
 {
-   hypre_AMGHybridData *AMGhybrid_data =(hypre_AMGHybridData *) AMGhybrid_vdata;
+   hypre_AMGHybridData *AMGhybrid_data = (hypre_AMGHybridData *) AMGhybrid_vdata;
    HYPRE_Int               *grid_relax_type;
    HYPRE_Int               i;
    if (!AMGhybrid_data)
@@ -955,7 +955,7 @@ hypre_AMGHybridSetRelaxType( void *AMGhybrid_vdata,
       (AMGhybrid_data -> grid_relax_type) = hypre_CTAlloc(HYPRE_Int, 4, HYPRE_MEMORY_HOST);
    }
    grid_relax_type = (AMGhybrid_data -> grid_relax_type);
-   for (i=0; i < 3; i++)
+   for (i = 0; i < 3; i++)
    {
       grid_relax_type[i] = relax_type;
    }
@@ -973,7 +973,7 @@ hypre_AMGHybridSetCycleRelaxType( void *AMGhybrid_vdata,
                                   HYPRE_Int   relax_type,
                                   HYPRE_Int   k  )
 {
-   hypre_AMGHybridData *AMGhybrid_data =(hypre_AMGHybridData *) AMGhybrid_vdata;
+   hypre_AMGHybridData *AMGhybrid_data = (hypre_AMGHybridData *) AMGhybrid_vdata;
    HYPRE_Int                 *grid_relax_type;
    if (!AMGhybrid_data)
    {
@@ -981,7 +981,7 @@ hypre_AMGHybridSetCycleRelaxType( void *AMGhybrid_vdata,
       return hypre_error_flag;
    }
 
-   if (k<1 || k > 3)
+   if (k < 1 || k > 3)
    {
       if (AMGhybrid_data -> print_level)
       {
@@ -1014,7 +1014,7 @@ HYPRE_Int
 hypre_AMGHybridSetRelaxOrder( void *AMGhybrid_vdata,
                               HYPRE_Int   relax_order  )
 {
-   hypre_AMGHybridData *AMGhybrid_data =(hypre_AMGHybridData *) AMGhybrid_vdata;
+   hypre_AMGHybridData *AMGhybrid_data = (hypre_AMGHybridData *) AMGhybrid_vdata;
    if (!AMGhybrid_data)
    {
       hypre_error_in_arg(1);
@@ -1034,7 +1034,7 @@ HYPRE_Int
 hypre_AMGHybridSetKeepTranspose( void *AMGhybrid_vdata,
                                  HYPRE_Int   keepT  )
 {
-   hypre_AMGHybridData *AMGhybrid_data =(hypre_AMGHybridData *) AMGhybrid_vdata;
+   hypre_AMGHybridData *AMGhybrid_data = (hypre_AMGHybridData *) AMGhybrid_vdata;
    if (!AMGhybrid_data)
    {
       hypre_error_in_arg(1);
@@ -1054,7 +1054,7 @@ HYPRE_Int
 hypre_AMGHybridSetMaxCoarseSize( void *AMGhybrid_vdata,
                                  HYPRE_Int   max_coarse_size  )
 {
-   hypre_AMGHybridData *AMGhybrid_data =(hypre_AMGHybridData *) AMGhybrid_vdata;
+   hypre_AMGHybridData *AMGhybrid_data = (hypre_AMGHybridData *) AMGhybrid_vdata;
    if (!AMGhybrid_data)
    {
       hypre_error_in_arg(1);
@@ -1079,7 +1079,7 @@ HYPRE_Int
 hypre_AMGHybridSetMinCoarseSize( void *AMGhybrid_vdata,
                                  HYPRE_Int   min_coarse_size  )
 {
-   hypre_AMGHybridData *AMGhybrid_data =(hypre_AMGHybridData *) AMGhybrid_vdata;
+   hypre_AMGHybridData *AMGhybrid_data = (hypre_AMGHybridData *) AMGhybrid_vdata;
    if (!AMGhybrid_data)
    {
       hypre_error_in_arg(1);
@@ -1104,7 +1104,7 @@ HYPRE_Int
 hypre_AMGHybridSetSeqThreshold( void *AMGhybrid_vdata,
                                 HYPRE_Int   seq_threshold  )
 {
-   hypre_AMGHybridData *AMGhybrid_data =(hypre_AMGHybridData *) AMGhybrid_vdata;
+   hypre_AMGHybridData *AMGhybrid_data = (hypre_AMGHybridData *) AMGhybrid_vdata;
    if (!AMGhybrid_data)
    {
       hypre_error_in_arg(1);
@@ -1129,7 +1129,7 @@ HYPRE_Int
 hypre_AMGHybridSetNumGridSweeps( void *AMGhybrid_vdata,
                                  HYPRE_Int  *num_grid_sweeps  )
 {
-   hypre_AMGHybridData *AMGhybrid_data =(hypre_AMGHybridData *) AMGhybrid_vdata;
+   hypre_AMGHybridData *AMGhybrid_data = (hypre_AMGHybridData *) AMGhybrid_vdata;
    if (!AMGhybrid_data)
    {
       hypre_error_in_arg(1);
@@ -1158,7 +1158,7 @@ HYPRE_Int
 hypre_AMGHybridSetGridRelaxType( void *AMGhybrid_vdata,
                                  HYPRE_Int  *grid_relax_type  )
 {
-   hypre_AMGHybridData *AMGhybrid_data =(hypre_AMGHybridData *) AMGhybrid_vdata;
+   hypre_AMGHybridData *AMGhybrid_data = (hypre_AMGHybridData *) AMGhybrid_vdata;
    if (!AMGhybrid_data)
    {
       hypre_error_in_arg(1);
@@ -1187,7 +1187,7 @@ HYPRE_Int
 hypre_AMGHybridSetGridRelaxPoints( void *AMGhybrid_vdata,
                                    HYPRE_Int  **grid_relax_points  )
 {
-   hypre_AMGHybridData *AMGhybrid_data =(hypre_AMGHybridData *) AMGhybrid_vdata;
+   hypre_AMGHybridData *AMGhybrid_data = (hypre_AMGHybridData *) AMGhybrid_vdata;
    if (!AMGhybrid_data)
    {
       hypre_error_in_arg(1);
@@ -1216,7 +1216,7 @@ HYPRE_Int
 hypre_AMGHybridSetRelaxWeight( void *AMGhybrid_vdata,
                                HYPRE_Real *relax_weight  )
 {
-   hypre_AMGHybridData *AMGhybrid_data =(hypre_AMGHybridData *) AMGhybrid_vdata;
+   hypre_AMGHybridData *AMGhybrid_data = (hypre_AMGHybridData *) AMGhybrid_vdata;
    if (!AMGhybrid_data)
    {
       hypre_error_in_arg(1);
@@ -1245,7 +1245,7 @@ HYPRE_Int
 hypre_AMGHybridSetOmega( void *AMGhybrid_vdata,
                          HYPRE_Real *omega  )
 {
-   hypre_AMGHybridData *AMGhybrid_data =(hypre_AMGHybridData *) AMGhybrid_vdata;
+   hypre_AMGHybridData *AMGhybrid_data = (hypre_AMGHybridData *) AMGhybrid_vdata;
    if (!AMGhybrid_data)
    {
       hypre_error_in_arg(1);
@@ -1274,8 +1274,8 @@ HYPRE_Int
 hypre_AMGHybridSetRelaxWt( void *AMGhybrid_vdata,
                            HYPRE_Real  relax_wt  )
 {
-   hypre_AMGHybridData *AMGhybrid_data =(hypre_AMGHybridData *) AMGhybrid_vdata;
-   HYPRE_Int               i , num_levels;
+   hypre_AMGHybridData *AMGhybrid_data = (hypre_AMGHybridData *) AMGhybrid_vdata;
+   HYPRE_Int               i, num_levels;
    HYPRE_Real          *relax_wt_array;
    if (!AMGhybrid_data)
    {
@@ -1290,7 +1290,7 @@ hypre_AMGHybridSetRelaxWt( void *AMGhybrid_vdata,
       relax_wt_array = hypre_CTAlloc(HYPRE_Real, num_levels, HYPRE_MEMORY_HOST);
       (AMGhybrid_data -> relax_weight) = relax_wt_array;
    }
-   for (i=0; i < num_levels; i++)
+   for (i = 0; i < num_levels; i++)
    {
       relax_wt_array[i] = relax_wt;
    }
@@ -1307,8 +1307,8 @@ hypre_AMGHybridSetLevelRelaxWt( void   *AMGhybrid_vdata,
                                 HYPRE_Real  relax_wt,
                                 HYPRE_Int     level  )
 {
-   hypre_AMGHybridData *AMGhybrid_data =(hypre_AMGHybridData *) AMGhybrid_vdata;
-   HYPRE_Int                i , num_levels;
+   hypre_AMGHybridData *AMGhybrid_data = (hypre_AMGHybridData *) AMGhybrid_vdata;
+   HYPRE_Int                i, num_levels;
    HYPRE_Real          *relax_wt_array;
    if (!AMGhybrid_data)
    {
@@ -1317,7 +1317,7 @@ hypre_AMGHybridSetLevelRelaxWt( void   *AMGhybrid_vdata,
    }
 
    num_levels = (AMGhybrid_data -> max_levels);
-   if (level > num_levels-1)
+   if (level > num_levels - 1)
    {
       if (AMGhybrid_data -> print_level)
       {
@@ -1330,7 +1330,7 @@ hypre_AMGHybridSetLevelRelaxWt( void   *AMGhybrid_vdata,
    if (relax_wt_array == NULL)
    {
       relax_wt_array = hypre_CTAlloc(HYPRE_Real, num_levels, HYPRE_MEMORY_HOST);
-      for (i=0; i < num_levels; i++)
+      for (i = 0; i < num_levels; i++)
       {
          relax_wt_array[i] = 1.0;
       }
@@ -1349,8 +1349,8 @@ HYPRE_Int
 hypre_AMGHybridSetOuterWt( void *AMGhybrid_vdata,
                            HYPRE_Real  outer_wt  )
 {
-   hypre_AMGHybridData *AMGhybrid_data =(hypre_AMGHybridData *) AMGhybrid_vdata;
-   HYPRE_Int                i , num_levels;
+   hypre_AMGHybridData *AMGhybrid_data = (hypre_AMGHybridData *) AMGhybrid_vdata;
+   HYPRE_Int                i, num_levels;
    HYPRE_Real          *outer_wt_array;
    if (!AMGhybrid_data)
    {
@@ -1365,7 +1365,7 @@ hypre_AMGHybridSetOuterWt( void *AMGhybrid_vdata,
       outer_wt_array = hypre_CTAlloc(HYPRE_Real, num_levels, HYPRE_MEMORY_HOST);
       (AMGhybrid_data -> omega) = outer_wt_array;
    }
-   for (i=0; i < num_levels; i++)
+   for (i = 0; i < num_levels; i++)
    {
       outer_wt_array[i] = outer_wt;
    }
@@ -1382,8 +1382,8 @@ hypre_AMGHybridSetLevelOuterWt( void   *AMGhybrid_vdata,
                                 HYPRE_Real  outer_wt,
                                 HYPRE_Int     level  )
 {
-   hypre_AMGHybridData *AMGhybrid_data =(hypre_AMGHybridData *) AMGhybrid_vdata;
-   HYPRE_Int                i , num_levels;
+   hypre_AMGHybridData *AMGhybrid_data = (hypre_AMGHybridData *) AMGhybrid_vdata;
+   HYPRE_Int                i, num_levels;
    HYPRE_Real          *outer_wt_array;
    if (!AMGhybrid_data)
    {
@@ -1392,7 +1392,7 @@ hypre_AMGHybridSetLevelOuterWt( void   *AMGhybrid_vdata,
    }
 
    num_levels = (AMGhybrid_data -> max_levels);
-   if (level > num_levels-1)
+   if (level > num_levels - 1)
    {
       if (AMGhybrid_data -> print_level)
       {
@@ -1405,7 +1405,7 @@ hypre_AMGHybridSetLevelOuterWt( void   *AMGhybrid_vdata,
    if (outer_wt_array == NULL)
    {
       outer_wt_array = hypre_CTAlloc(HYPRE_Real, num_levels, HYPRE_MEMORY_HOST);
-      for (i=0; i < num_levels; i++)
+      for (i = 0; i < num_levels; i++)
       {
          outer_wt_array[i] = 1.0;
       }
@@ -1424,7 +1424,7 @@ HYPRE_Int
 hypre_AMGHybridSetNumPaths( void   *AMGhybrid_vdata,
                             HYPRE_Int    num_paths      )
 {
-   hypre_AMGHybridData *AMGhybrid_data =(hypre_AMGHybridData *) AMGhybrid_vdata;
+   hypre_AMGHybridData *AMGhybrid_data = (hypre_AMGHybridData *) AMGhybrid_vdata;
    if (!AMGhybrid_data)
    {
       hypre_error_in_arg(1);
@@ -1449,7 +1449,7 @@ HYPRE_Int
 hypre_AMGHybridSetDofFunc( void *AMGhybrid_vdata,
                            HYPRE_Int *dof_func  )
 {
-   hypre_AMGHybridData *AMGhybrid_data =(hypre_AMGHybridData *) AMGhybrid_vdata;
+   hypre_AMGHybridData *AMGhybrid_data = (hypre_AMGHybridData *) AMGhybrid_vdata;
    if (!AMGhybrid_data)
    {
       hypre_error_in_arg(1);
@@ -1478,7 +1478,7 @@ HYPRE_Int
 hypre_AMGHybridSetAggNumLevels( void   *AMGhybrid_vdata,
                                 HYPRE_Int    agg_num_levels      )
 {
-   hypre_AMGHybridData *AMGhybrid_data =(hypre_AMGHybridData *) AMGhybrid_vdata;
+   hypre_AMGHybridData *AMGhybrid_data = (hypre_AMGHybridData *) AMGhybrid_vdata;
    if (!AMGhybrid_data)
    {
       hypre_error_in_arg(1);
@@ -1523,7 +1523,7 @@ HYPRE_Int
 hypre_AMGHybridSetNumFunctions( void   *AMGhybrid_vdata,
                                 HYPRE_Int    num_functions      )
 {
-   hypre_AMGHybridData *AMGhybrid_data =(hypre_AMGHybridData *) AMGhybrid_vdata;
+   hypre_AMGHybridData *AMGhybrid_data = (hypre_AMGHybridData *) AMGhybrid_vdata;
    if (!AMGhybrid_data)
    {
       hypre_error_in_arg(1);
@@ -1548,7 +1548,7 @@ HYPRE_Int
 hypre_AMGHybridSetNodal( void   *AMGhybrid_vdata,
                          HYPRE_Int    nodal      )
 {
-   hypre_AMGHybridData *AMGhybrid_data =(hypre_AMGHybridData *) AMGhybrid_vdata;
+   hypre_AMGHybridData *AMGhybrid_data = (hypre_AMGHybridData *) AMGhybrid_vdata;
    if (!AMGhybrid_data)
    {
       hypre_error_in_arg(1);
@@ -1567,7 +1567,7 @@ HYPRE_Int
 hypre_AMGHybridGetSetupSolveTime( void          *AMGhybrid_vdata,
                                   HYPRE_Real    *time )
 {
-   hypre_AMGHybridData *AMGhybrid_data =(hypre_AMGHybridData *) AMGhybrid_vdata;
+   hypre_AMGHybridData *AMGhybrid_data = (hypre_AMGHybridData *) AMGhybrid_vdata;
    if (!AMGhybrid_data)
    {
       hypre_error_in_arg(1);
@@ -1591,7 +1591,7 @@ HYPRE_Int
 hypre_AMGHybridGetNumIterations( void   *AMGhybrid_vdata,
                                  HYPRE_Int    *num_its      )
 {
-   hypre_AMGHybridData *AMGhybrid_data =(hypre_AMGHybridData *) AMGhybrid_vdata;
+   hypre_AMGHybridData *AMGhybrid_data = (hypre_AMGHybridData *) AMGhybrid_vdata;
    if (!AMGhybrid_data)
    {
       hypre_error_in_arg(1);
@@ -1611,7 +1611,7 @@ HYPRE_Int
 hypre_AMGHybridGetDSCGNumIterations( void   *AMGhybrid_vdata,
                                      HYPRE_Int    *dscg_num_its )
 {
-   hypre_AMGHybridData *AMGhybrid_data =(hypre_AMGHybridData *) AMGhybrid_vdata;
+   hypre_AMGHybridData *AMGhybrid_data = (hypre_AMGHybridData *) AMGhybrid_vdata;
    if (!AMGhybrid_data)
    {
       hypre_error_in_arg(1);
@@ -1631,7 +1631,7 @@ HYPRE_Int
 hypre_AMGHybridGetPCGNumIterations( void   *AMGhybrid_vdata,
                                     HYPRE_Int    *pcg_num_its  )
 {
-   hypre_AMGHybridData *AMGhybrid_data =(hypre_AMGHybridData *) AMGhybrid_vdata;
+   hypre_AMGHybridData *AMGhybrid_data = (hypre_AMGHybridData *) AMGhybrid_vdata;
    if (!AMGhybrid_data)
    {
       hypre_error_in_arg(1);
@@ -1651,7 +1651,7 @@ HYPRE_Int
 hypre_AMGHybridGetFinalRelativeResidualNorm( void   *AMGhybrid_vdata,
                                              HYPRE_Real *final_rel_res_norm )
 {
-   hypre_AMGHybridData *AMGhybrid_data =(hypre_AMGHybridData *) AMGhybrid_vdata;
+   hypre_AMGHybridData *AMGhybrid_data = (hypre_AMGHybridData *) AMGhybrid_vdata;
    if (!AMGhybrid_data)
    {
       hypre_error_in_arg(1);
@@ -1668,12 +1668,17 @@ hypre_AMGHybridGetFinalRelativeResidualNorm( void   *AMGhybrid_vdata,
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_AMGHybridSetup( void               *AMGhybrid_vdata,
-                      hypre_ParCSRMatrix *A,
-                      hypre_ParVector *b,
-                      hypre_ParVector *x            )
+hypre_AMGHybridSetup( void                *AMGhybrid_vdata,
+                      hypre_ParCSRMatrix  *A,
+                      hypre_ParVector     *b,
+                      hypre_ParVector     *x )
 {
-   hypre_AMGHybridData *AMGhybrid_data =(hypre_AMGHybridData *) AMGhybrid_vdata;
+   HYPRE_UNUSED_VAR(A);
+   HYPRE_UNUSED_VAR(b);
+   HYPRE_UNUSED_VAR(x);
+
+   hypre_AMGHybridData *AMGhybrid_data = (hypre_AMGHybridData *) AMGhybrid_vdata;
+
    if (!AMGhybrid_data)
    {
       hypre_error_in_arg(1);
@@ -1700,7 +1705,7 @@ hypre_AMGHybridSolve( void               *AMGhybrid_vdata,
                       hypre_ParVector    *b,
                       hypre_ParVector    *x )
 {
-   hypre_AMGHybridData  *AMGhybrid_data    =(hypre_AMGHybridData *) AMGhybrid_vdata;
+   hypre_AMGHybridData  *AMGhybrid_data    = (hypre_AMGHybridData *) AMGhybrid_vdata;
 
    HYPRE_Real         tol;
    HYPRE_Real         a_tol;
@@ -1749,8 +1754,8 @@ hypre_AMGHybridSolve( void               *AMGhybrid_vdata,
    HYPRE_Real        *boom_omega;
 
    HYPRE_Int          pcg_default;
-   HYPRE_Int          (*pcg_precond_solve)(void*,void*,void*,void*);
-   HYPRE_Int          (*pcg_precond_setup)(void*,void*,void*,void*);
+   HYPRE_Int          (*pcg_precond_solve)(void*, void*, void*, void*);
+   HYPRE_Int          (*pcg_precond_setup)(void*, void*, void*, void*);
    void              *pcg_precond;
 
    void              *pcg_solver;
@@ -1758,9 +1763,9 @@ hypre_AMGHybridSolve( void               *AMGhybrid_vdata,
    hypre_GMRESFunctions *gmres_functions;
    hypre_BiCGSTABFunctions *bicgstab_functions;
 
-   HYPRE_Int          dscg_num_its=0;
-   HYPRE_Int          pcg_num_its=0;
-   HYPRE_Int          converged=0;
+   HYPRE_Int          dscg_num_its = 0;
+   HYPRE_Int          pcg_num_its = 0;
+   HYPRE_Int          converged = 0;
    HYPRE_Int          num_variables = hypre_VectorSize(hypre_ParVectorLocalVector(b));
    HYPRE_Real         res_norm;
 
@@ -1850,8 +1855,8 @@ hypre_AMGHybridSolve( void               *AMGhybrid_vdata,
    }
 
    /* print_level definitions: xy,  sol_print_level = y, pre_print_level = x */
-   pre_print_level = print_level/10;
-   sol_print_level = print_level - pre_print_level*10;
+   pre_print_level = print_level / 10;
+   sol_print_level = print_level - pre_print_level * 10;
 
    pcg_solver = (AMGhybrid_data -> pcg_solver);
    pcg_precond = (AMGhybrid_data -> pcg_precond);
@@ -1895,7 +1900,7 @@ hypre_AMGHybridSolve( void               *AMGhybrid_vdata,
             hypre_PCGSetRecomputeResidualP(pcg_solver, recompute_residual_p);
             hypre_PCGSetLogging(pcg_solver, logging);
             hypre_PCGSetPrintLevel(pcg_solver, sol_print_level);
-            hypre_PCGSetHybrid(pcg_solver,-1);
+            hypre_PCGSetHybrid(pcg_solver, -1);
 
             pcg_precond = NULL;
          }
@@ -1960,7 +1965,7 @@ hypre_AMGHybridSolve( void               *AMGhybrid_vdata,
             hypre_GMRESSetRelChange(pcg_solver, rel_change);
             hypre_GMRESSetLogging(pcg_solver, logging);
             hypre_GMRESSetPrintLevel(pcg_solver, sol_print_level);
-            hypre_GMRESSetHybrid(pcg_solver,-1);
+            hypre_GMRESSetHybrid(pcg_solver, -1);
 
             pcg_precond = NULL;
          }
@@ -2021,7 +2026,7 @@ hypre_AMGHybridSolve( void               *AMGhybrid_vdata,
             hypre_BiCGSTABSetStopCrit(pcg_solver, stop_crit);
             hypre_BiCGSTABSetLogging(pcg_solver, logging);
             hypre_BiCGSTABSetPrintLevel(pcg_solver, sol_print_level);
-            hypre_BiCGSTABSetHybrid(pcg_solver,-1);
+            hypre_BiCGSTABSetHybrid(pcg_solver, -1);
 
             pcg_precond = NULL;
          }
@@ -2130,7 +2135,7 @@ hypre_AMGHybridSolve( void               *AMGhybrid_vdata,
          if (grid_relax_type)
          {
             boom_grt = hypre_CTAlloc(HYPRE_Int, 4, HYPRE_MEMORY_HOST);
-            for (i=0; i < 4; i++)
+            for (i = 0; i < 4; i++)
             {
                boom_grt[i] = grid_relax_type[i];
             }
@@ -2152,31 +2157,39 @@ hypre_AMGHybridSolve( void               *AMGhybrid_vdata,
          if (relax_weight)
          {
             boom_rlxw = hypre_CTAlloc(HYPRE_Real, max_levels, HYPRE_MEMORY_HOST);
-            for (i=0; i < max_levels; i++)
+            for (i = 0; i < max_levels; i++)
+            {
                boom_rlxw[i] = relax_weight[i];
+            }
             hypre_BoomerAMGSetRelaxWeight(pcg_precond, boom_rlxw);
          }
          if (omega)
          {
             boom_omega = hypre_CTAlloc(HYPRE_Real, max_levels, HYPRE_MEMORY_HOST);
-            for (i=0; i < max_levels; i++)
+            for (i = 0; i < max_levels; i++)
+            {
                boom_omega[i] = omega[i];
+            }
             hypre_BoomerAMGSetOmega(pcg_precond, boom_omega);
          }
          if (num_grid_sweeps)
          {
             boom_ngs = hypre_CTAlloc(HYPRE_Int, 4, HYPRE_MEMORY_HOST);
-            for (i=0; i < 4; i++)
+            for (i = 0; i < 4; i++)
+            {
                boom_ngs[i] = num_grid_sweeps[i];
+            }
             hypre_BoomerAMGSetNumGridSweeps(pcg_precond, boom_ngs);
             if (grid_relax_points)
             {
                boom_grp = hypre_CTAlloc(HYPRE_Int*, 4, HYPRE_MEMORY_HOST);
-               for (i=0; i < 4; i++)
+               for (i = 0; i < 4; i++)
                {
                   boom_grp[i] = hypre_CTAlloc(HYPRE_Int,  num_grid_sweeps[i], HYPRE_MEMORY_HOST);
-                  for (j=0; j < num_grid_sweeps[i]; j++)
+                  for (j = 0; j < num_grid_sweeps[i]; j++)
+                  {
                      boom_grp[i][j] = grid_relax_points[i][j];
+                  }
                }
                hypre_BoomerAMGSetGridRelaxPoints(pcg_precond, boom_grp);
             }
@@ -2184,8 +2197,10 @@ hypre_AMGHybridSolve( void               *AMGhybrid_vdata,
          if (dof_func)
          {
             boom_dof_func = hypre_CTAlloc(HYPRE_Int, num_variables, HYPRE_MEMORY_HOST);
-            for (i=0; i < num_variables; i++)
+            for (i = 0; i < num_variables; i++)
+            {
                boom_dof_func[i] = dof_func[i];
+            }
             hypre_BoomerAMGSetDofFunc(pcg_precond, boom_dof_func);
          }
          pcg_precond_solve = (HYPRE_Int (*)(void*, void*, void*, void*)) hypre_BoomerAMGSolve;
@@ -2296,4 +2311,3 @@ hypre_AMGHybridSolve( void               *AMGhybrid_vdata,
 
    return hypre_error_flag;
 }
-
diff --git a/external/hypre/src/parcsr_ls/ams.c b/external/hypre/src/parcsr_ls/ams.c
index 7262ae02..e7eb6b3e 100644
--- a/external/hypre/src/parcsr_ls/ams.c
+++ b/external/hypre/src/parcsr_ls/ams.c
@@ -1,10 +1,11 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
  ******************************************************************************/
 
+#include "_hypre_onedpl.hpp"
 #include "_hypre_parcsr_ls.h"
 #include "float.h"
 #include "ams.h"
@@ -53,19 +54,8 @@ hypre_ParCSRRelax( hypre_ParCSRMatrix *A,              /* matrix to relax with *
       else if (relax_type == 2 || relax_type == 4) /* offd-l1-scaled block GS */
       {
          /* !!! Note: relax_weight and omega flipped !!! */
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-         HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_ParCSRMatrixMemoryLocation(A) );
-         if (exec == HYPRE_EXEC_DEVICE)
-         {
-            hypre_BoomerAMGRelaxHybridGaussSeidelDevice(A, f, NULL, 0, omega, relax_weight, l1_norms, u, v, z,
-                                                        1,  1 /* symm */);
-         }
-         else
-#endif
-         {
-            hypre_BoomerAMGRelaxHybridGaussSeidel_core(A, f, NULL, 0, omega, relax_weight, l1_norms, u, v, z,
-                                                       1, 1 /* symm */, 0 /* skip diag */, 1, 0);
-         }
+         hypre_BoomerAMGRelaxHybridSOR(A, f, NULL, 0, omega,
+                                       relax_weight, l1_norms, u, v, z, 1, 1, 0, 1);
       }
       else if (relax_type == 3) /* Kaczmarz */
       {
@@ -133,17 +123,18 @@ hypre_ParVector *hypre_ParVectorInDomainOf(hypre_ParCSRMatrix *A)
  * Extract the dim sub-vectors x_0,...,x_{dim-1} composing a parallel
  * block vector x. It is assumed that &x[i] = [x_0[i],...,x_{dim-1}[i]].
  *--------------------------------------------------------------------------*/
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
 template<HYPRE_Int dir>
 __global__ void
-hypreCUDAKernel_ParVectorBlockSplitGather(HYPRE_Int   size,
-                                          HYPRE_Int   dim,
-                                          HYPRE_Real *x0,
-                                          HYPRE_Real *x1,
-                                          HYPRE_Real *x2,
-                                          HYPRE_Real *x)
+hypreGPUKernel_ParVectorBlockSplitGather(hypre_DeviceItem &item,
+                                         HYPRE_Int   size,
+                                         HYPRE_Int   dim,
+                                         HYPRE_Real *x0,
+                                         HYPRE_Real *x1,
+                                         HYPRE_Real *x2,
+                                         HYPRE_Real *x)
 {
-   const HYPRE_Int i = hypre_cuda_get_grid_thread_id<1,1>();
+   const HYPRE_Int i = hypre_gpu_get_grid_thread_id<1, 1>(item);
 
    if (i >= size * dim)
    {
@@ -170,14 +161,15 @@ hypreCUDAKernel_ParVectorBlockSplitGather(HYPRE_Int   size,
 }
 #endif
 
-HYPRE_Int hypre_ParVectorBlockSplit(hypre_ParVector *x,
-                                    hypre_ParVector *x_[3],
-                                    HYPRE_Int dim)
+HYPRE_Int
+hypre_ParVectorBlockSplit(hypre_ParVector *x,
+                          hypre_ParVector *x_[3],
+                          HYPRE_Int dim)
 {
    HYPRE_Int i, d, size_;
    HYPRE_Real *x_data, *x_data_[3];
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
    HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_ParVectorMemoryLocation(x) );
 #endif
 
@@ -185,22 +177,28 @@ HYPRE_Int hypre_ParVectorBlockSplit(hypre_ParVector *x,
 
    x_data = hypre_VectorData(hypre_ParVectorLocalVector(x));
    for (d = 0; d < dim; d++)
+   {
       x_data_[d] = hypre_VectorData(hypre_ParVectorLocalVector(x_[d]));
+   }
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
    if (exec == HYPRE_EXEC_DEVICE)
    {
-      dim3 bDim = hypre_GetDefaultCUDABlockDimension();
-      dim3 gDim = hypre_GetDefaultCUDAGridDimension(size_ * dim, "thread", bDim);
-      HYPRE_CUDA_LAUNCH( hypreCUDAKernel_ParVectorBlockSplitGather<0>, gDim, bDim,
-                         size_, dim, x_data_[0], x_data_[1], x_data_[2], x_data);
+      dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+      dim3 gDim = hypre_GetDefaultDeviceGridDimension(size_ * dim, "thread", bDim);
+      HYPRE_GPU_LAUNCH( hypreGPUKernel_ParVectorBlockSplitGather<0>, gDim, bDim,
+                        size_, dim, x_data_[0], x_data_[1], x_data_[2], x_data);
    }
    else
 #endif
    {
       for (i = 0; i < size_; i++)
+      {
          for (d = 0; d < dim; d++)
-            x_data_[d][i] = x_data[dim*i+d];
+         {
+            x_data_[d][i] = x_data[dim * i + d];
+         }
+      }
    }
 
    return hypre_error_flag;
@@ -213,14 +211,15 @@ HYPRE_Int hypre_ParVectorBlockSplit(hypre_ParVector *x,
  * x_0,...,x_{dim-1}, such that &x[i] = [x_0[i],...,x_{dim-1}[i]].
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int hypre_ParVectorBlockGather(hypre_ParVector *x,
-                                     hypre_ParVector *x_[3],
-                                     HYPRE_Int dim)
+HYPRE_Int
+hypre_ParVectorBlockGather(hypre_ParVector *x,
+                           hypre_ParVector *x_[3],
+                           HYPRE_Int dim)
 {
    HYPRE_Int i, d, size_;
    HYPRE_Real *x_data, *x_data_[3];
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
    HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_ParVectorMemoryLocation(x) );
 #endif
 
@@ -228,22 +227,28 @@ HYPRE_Int hypre_ParVectorBlockGather(hypre_ParVector *x,
 
    x_data = hypre_VectorData(hypre_ParVectorLocalVector(x));
    for (d = 0; d < dim; d++)
+   {
       x_data_[d] = hypre_VectorData(hypre_ParVectorLocalVector(x_[d]));
+   }
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
    if (exec == HYPRE_EXEC_DEVICE)
    {
-      dim3 bDim = hypre_GetDefaultCUDABlockDimension();
-      dim3 gDim = hypre_GetDefaultCUDAGridDimension(size_ * dim, "thread", bDim);
-      HYPRE_CUDA_LAUNCH( hypreCUDAKernel_ParVectorBlockSplitGather<1>, gDim, bDim,
-                         size_, dim, x_data_[0], x_data_[1], x_data_[2], x_data);
+      dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+      dim3 gDim = hypre_GetDefaultDeviceGridDimension(size_ * dim, "thread", bDim);
+      HYPRE_GPU_LAUNCH( hypreGPUKernel_ParVectorBlockSplitGather<1>, gDim, bDim,
+                        size_, dim, x_data_[0], x_data_[1], x_data_[2], x_data);
    }
    else
 #endif
    {
       for (i = 0; i < size_; i++)
+      {
          for (d = 0; d < dim; d++)
-            x_data[dim*i+d] = x_data_[d][i];
+         {
+            x_data[dim * i + d] = x_data_[d][i];
+         }
+      }
    }
 
    return hypre_error_flag;
@@ -264,8 +269,8 @@ HYPRE_Int hypre_BoomerAMGBlockSolve(void *B,
 {
    HYPRE_Int d, dim = 1;
 
-   hypre_ParVector *b_[3];
-   hypre_ParVector *x_[3];
+   hypre_ParVector *b_[3] = {NULL, NULL, NULL};
+   hypre_ParVector *x_[3] = {NULL, NULL, NULL};
 
    dim = hypre_ParVectorGlobalSize(x) / hypre_ParCSRMatrixGlobalNumRows(A);
 
@@ -285,7 +290,9 @@ HYPRE_Int hypre_BoomerAMGBlockSolve(void *B,
    hypre_ParVectorBlockSplit(x, x_, dim);
 
    for (d = 0; d < dim; d++)
+   {
       hypre_BoomerAMGSolve(B, A, b_[d], x_[d]);
+   }
 
    hypre_ParVectorBlockGather(x, x_, dim);
 
@@ -326,49 +333,60 @@ HYPRE_Int hypre_ParCSRMatrixFixZeroRowsHost(hypre_ParCSRMatrix *A)
    for (i = 0; i < num_rows; i++)
    {
       l1_norm = 0.0;
-      for (j = A_diag_I[i]; j < A_diag_I[i+1]; j++)
-         l1_norm += fabs(A_diag_data[j]);
+      for (j = A_diag_I[i]; j < A_diag_I[i + 1]; j++)
+      {
+         l1_norm += hypre_abs(A_diag_data[j]);
+      }
       if (num_cols_offd)
-         for (j = A_offd_I[i]; j < A_offd_I[i+1]; j++)
-            l1_norm += fabs(A_offd_data[j]);
+         for (j = A_offd_I[i]; j < A_offd_I[i + 1]; j++)
+         {
+            l1_norm += hypre_abs(A_offd_data[j]);
+         }
 
       if (l1_norm <= eps)
       {
-         for (j = A_diag_I[i]; j < A_diag_I[i+1]; j++)
+         for (j = A_diag_I[i]; j < A_diag_I[i + 1]; j++)
             if (A_diag_J[j] == i)
+            {
                A_diag_data[j] = 1.0;
+            }
             else
+            {
                A_diag_data[j] = 0.0;
+            }
          if (num_cols_offd)
-            for (j = A_offd_I[i]; j < A_offd_I[i+1]; j++)
+            for (j = A_offd_I[i]; j < A_offd_I[i + 1]; j++)
+            {
                A_offd_data[j] = 0.0;
+            }
       }
    }
 
    return hypre_error_flag;
 }
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
 __global__ void
-hypreCUDAKernel_ParCSRMatrixFixZeroRows( HYPRE_Int      nrows,
-                                         HYPRE_Int     *A_diag_i,
-                                         HYPRE_Int     *A_diag_j,
-                                         HYPRE_Complex *A_diag_data,
-                                         HYPRE_Int     *A_offd_i,
-                                         HYPRE_Complex *A_offd_data,
-                                         HYPRE_Int      num_cols_offd)
+hypreGPUKernel_ParCSRMatrixFixZeroRows( hypre_DeviceItem    &item,
+                                        HYPRE_Int      nrows,
+                                        HYPRE_Int     *A_diag_i,
+                                        HYPRE_Int     *A_diag_j,
+                                        HYPRE_Complex *A_diag_data,
+                                        HYPRE_Int     *A_offd_i,
+                                        HYPRE_Complex *A_offd_data,
+                                        HYPRE_Int      num_cols_offd)
 {
-   HYPRE_Int row_i = hypre_cuda_get_grid_warp_id<1,1>();
+   HYPRE_Int row_i = hypre_gpu_get_grid_warp_id<1, 1>(item);
 
    if (row_i >= nrows)
    {
       return;
    }
 
-   HYPRE_Int lane = hypre_cuda_get_lane_id<1>();
+   HYPRE_Int lane = hypre_gpu_get_lane_id<1>(item);
    HYPRE_Real eps = 0.0; /* DBL_EPSILON * 1e+4; */
    HYPRE_Real l1_norm = 0.0;
-   HYPRE_Int p1, q1, p2 = 0, q2 = 0;
+   HYPRE_Int p1 = 0, q1, p2 = 0, q2 = 0;
 
    if (lane < 2)
    {
@@ -379,25 +397,25 @@ hypreCUDAKernel_ParCSRMatrixFixZeroRows( HYPRE_Int      nrows,
       }
    }
 
-   q1 = __shfl_sync(HYPRE_WARP_FULL_MASK, p1, 1);
-   p1 = __shfl_sync(HYPRE_WARP_FULL_MASK, p1, 0);
+   q1 = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p1, 1);
+   p1 = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p1, 0);
    if (num_cols_offd)
    {
-      q2 = __shfl_sync(HYPRE_WARP_FULL_MASK, p2, 1);
-      p2 = __shfl_sync(HYPRE_WARP_FULL_MASK, p2, 0);
+      q2 = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p2, 1);
+      p2 = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p2, 0);
    }
 
    for (HYPRE_Int j = p1 + lane; j < q1; j += HYPRE_WARP_SIZE)
    {
-      l1_norm += fabs(A_diag_data[j]);
+      l1_norm += hypre_abs(A_diag_data[j]);
    }
 
    for (HYPRE_Int j = p2 + lane; j < q2; j += HYPRE_WARP_SIZE)
    {
-      l1_norm += fabs(A_offd_data[j]);
+      l1_norm += hypre_abs(A_offd_data[j]);
    }
 
-   l1_norm = warp_allreduce_sum(l1_norm);
+   l1_norm = warp_allreduce_sum(item, l1_norm);
 
    if (l1_norm <= eps)
    {
@@ -431,15 +449,14 @@ HYPRE_Int hypre_ParCSRMatrixFixZeroRowsDevice(hypre_ParCSRMatrix *A)
    HYPRE_Real      *A_offd_data   = hypre_CSRMatrixData(A_offd);
    HYPRE_Int       *A_offd_i      = hypre_CSRMatrixI(A_offd);
    HYPRE_Int        num_cols_offd = hypre_CSRMatrixNumCols(A_offd);
-   dim3             bDim, gDim;
 
-   bDim = hypre_GetDefaultCUDABlockDimension();
-   gDim = hypre_GetDefaultCUDAGridDimension(nrows, "warp", bDim);
+   dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+   dim3 gDim = hypre_GetDefaultDeviceGridDimension(nrows, "warp", bDim);
 
-   HYPRE_CUDA_LAUNCH(hypreCUDAKernel_ParCSRMatrixFixZeroRows, gDim, bDim,
-                     nrows, A_diag_i, A_diag_j, A_diag_data, A_offd_i, A_offd_data, num_cols_offd);
+   HYPRE_GPU_LAUNCH(hypreGPUKernel_ParCSRMatrixFixZeroRows, gDim, bDim,
+                    nrows, A_diag_i, A_diag_j, A_diag_data, A_offd_i, A_offd_data, num_cols_offd);
 
-   //hypre_SyncCudaComputeStream(hypre_handle());
+   //hypre_SyncComputeStream();
 
    return hypre_error_flag;
 }
@@ -447,7 +464,7 @@ HYPRE_Int hypre_ParCSRMatrixFixZeroRowsDevice(hypre_ParCSRMatrix *A)
 
 HYPRE_Int hypre_ParCSRMatrixFixZeroRows(hypre_ParCSRMatrix *A)
 {
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
    HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_ParCSRMatrixMemoryLocation(A) );
    if (exec == HYPRE_EXEC_DEVICE)
    {
@@ -477,13 +494,32 @@ HYPRE_Int hypre_ParCSRMatrixFixZeroRows(hypre_ParCSRMatrix *A)
  * cf_marker is not NULL.
  *--------------------------------------------------------------------------*/
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
+#if defined(HYPRE_USING_SYCL)
+struct l1_norm_op1
+#else
 struct l1_norm_op1 : public thrust::binary_function<HYPRE_Complex, HYPRE_Complex, HYPRE_Complex>
+#endif
 {
    __host__ __device__
-   HYPRE_Complex operator()(HYPRE_Complex &x, HYPRE_Complex &y) const
+   HYPRE_Complex operator()(const HYPRE_Complex &x, const HYPRE_Complex &y) const
    {
-      return x <= 4.0/3.0 * y ? y : x;
+      return x <= 4.0 / 3.0 * y ? y : x;
+   }
+};
+#endif
+
+#if defined(HYPRE_USING_GPU)
+#if defined(HYPRE_USING_SYCL)
+struct l1_norm_op6
+#else
+struct l1_norm_op6 : public thrust::binary_function<HYPRE_Complex, HYPRE_Complex, HYPRE_Complex>
+#endif
+{
+   __host__ __device__
+   HYPRE_Complex operator()(const HYPRE_Complex &d, const HYPRE_Complex &l) const
+   {
+      return (l + d + sqrt(l * l + d * d)) * 0.5;
    }
 };
 #endif
@@ -514,7 +550,9 @@ HYPRE_Int hypre_ParCSRComputeL1Norms(hypre_ParCSRMatrix  *A,
 
    HYPRE_Real *l1_norm = hypre_TAlloc(HYPRE_Real, num_rows, memory_location_l1);
 
-   HYPRE_MemoryLocation memory_location_tmp = exec == HYPRE_EXEC_HOST ? HYPRE_MEMORY_HOST : HYPRE_MEMORY_DEVICE;
+   HYPRE_MemoryLocation memory_location_tmp =
+      exec == HYPRE_EXEC_HOST ? HYPRE_MEMORY_HOST : HYPRE_MEMORY_DEVICE;
+
    HYPRE_Real *diag_tmp = NULL;
 
    HYPRE_Int *cf_marker_offd = NULL;
@@ -538,15 +576,32 @@ HYPRE_Int hypre_ParCSRComputeL1Norms(hypre_ParCSRMatrix  *A,
          int_buf_data = hypre_CTAlloc(HYPRE_Int, hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
                                       memory_location_tmp);
       }
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
       if (exec == HYPRE_EXEC_DEVICE)
       {
          hypre_ParCSRCommPkgCopySendMapElmtsToDevice(comm_pkg);
+#if defined(HYPRE_USING_SYCL)
+         hypreSycl_gather( hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg),
+                           hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg) + hypre_ParCSRCommPkgSendMapStart(comm_pkg,
+                                                                                                             num_sends),
+                           cf_marker,
+                           int_buf_data );
+#else
          HYPRE_THRUST_CALL( gather,
                             hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg),
-                            hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg) + hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                            hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg) + hypre_ParCSRCommPkgSendMapStart(comm_pkg,
+                                  num_sends),
                             cf_marker,
                             int_buf_data );
+#endif
+
+#if defined(HYPRE_USING_THRUST_NOSYNC)
+         /* RL: make sure int_buf_data is ready before issuing GPU-GPU MPI */
+         if (hypre_GetGpuAwareMPI())
+         {
+            hypre_ForceSyncComputeStream();
+         }
+#endif
       }
       else
 #endif
@@ -557,15 +612,15 @@ HYPRE_Int hypre_ParCSRComputeL1Norms(hypre_ParCSRMatrix  *A,
          for (i = 0; i < num_sends; i++)
          {
             start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-            for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+            for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
             {
-               int_buf_data[index++] = cf_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+               int_buf_data[index++] = cf_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
             }
          }
       }
 
       comm_handle = hypre_ParCSRCommHandleCreate_v2(11, comm_pkg, memory_location_tmp, int_buf_data,
-                                                     memory_location_tmp, cf_marker_offd);
+                                                    memory_location_tmp, cf_marker_offd);
       hypre_ParCSRCommHandleDestroy(comm_handle);
       hypre_TFree(int_buf_data, memory_location_tmp);
    }
@@ -616,17 +671,21 @@ HYPRE_Int hypre_ParCSRComputeL1Norms(hypre_ParCSRMatrix  *A,
       }
 
       /* Truncate according to Remark 6.2 */
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
       if (exec == HYPRE_EXEC_DEVICE)
       {
+#if defined(HYPRE_USING_SYCL)
+         HYPRE_ONEDPL_CALL( std::transform, l1_norm, l1_norm + num_rows, diag_tmp, l1_norm, l1_norm_op1() );
+#else
          HYPRE_THRUST_CALL( transform, l1_norm, l1_norm + num_rows, diag_tmp, l1_norm, l1_norm_op1() );
+#endif
       }
       else
 #endif
       {
          for (i = 0; i < num_rows; i++)
          {
-            if (l1_norm[i] <= 4.0/3.0 * diag_tmp[i])
+            if (l1_norm[i] <= 4.0 / 3.0 * diag_tmp[i])
             {
                l1_norm[i] = diag_tmp[i];
             }
@@ -638,11 +697,16 @@ HYPRE_Int hypre_ParCSRComputeL1Norms(hypre_ParCSRMatrix  *A,
       /* Set the diag element */
       hypre_CSRMatrixExtractDiagonal(A_diag, l1_norm, 0);
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
       if ( exec == HYPRE_EXEC_DEVICE)
       {
+#if defined(HYPRE_USING_SYCL)
+         HYPRE_ONEDPL_CALL( std::replace_if, l1_norm, l1_norm + num_rows, [] (const auto & x) {return !x;},
+         1.0 );
+#else
          thrust::identity<HYPRE_Complex> identity;
-         HYPRE_THRUST_CALL( replace_if, l1_norm, l1_norm + num_rows, thrust::not1(identity), 1.0 );
+         HYPRE_THRUST_CALL( replace_if, l1_norm, l1_norm + num_rows, HYPRE_THRUST_NOT(identity), 1.0 );
+#endif
       }
       else
 #endif
@@ -660,6 +724,35 @@ HYPRE_Int hypre_ParCSRComputeL1Norms(hypre_ParCSRMatrix  *A,
 
       return hypre_error_flag;
    }
+   else if (option == 6)
+   {
+      /* Set the abs(diag) element */
+      hypre_CSRMatrixExtractDiagonal(A_diag, l1_norm, 1);
+      /* Add the scaled l1 norm of the offd part */
+      if (num_cols_offd)
+      {
+         diag_tmp = hypre_TAlloc(HYPRE_Real, num_rows, memory_location_tmp);
+         hypre_CSRMatrixComputeRowSum(A_offd, cf_marker, cf_marker_offd, diag_tmp, 1, 1.0, "set");
+#if defined(HYPRE_USING_GPU)
+         if (exec == HYPRE_EXEC_DEVICE)
+         {
+#if defined(HYPRE_USING_SYCL)
+            HYPRE_ONEDPL_CALL( std::transform, l1_norm, l1_norm + num_rows, diag_tmp, l1_norm, l1_norm_op6() );
+#else
+            HYPRE_THRUST_CALL( transform, l1_norm, l1_norm + num_rows, diag_tmp, l1_norm, l1_norm_op6() );
+#endif
+         }
+         else
+#endif
+         {
+            for (i = 0; i < num_rows; i++)
+            {
+               l1_norm[i] = 0.5 * (diag_tmp[i] + l1_norm[i] +
+                                   hypre_sqrt(hypre_squared(diag_tmp[i]) + hypre_squared(l1_norm[i])));
+            }
+         }
+      }
+   }
 
    /* Handle negative definite matrices */
    if (!diag_tmp)
@@ -670,13 +763,22 @@ HYPRE_Int hypre_ParCSRComputeL1Norms(hypre_ParCSRMatrix  *A,
    /* Set the diag element */
    hypre_CSRMatrixExtractDiagonal(A_diag, diag_tmp, 0);
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
    if (exec == HYPRE_EXEC_DEVICE)
    {
-      HYPRE_THRUST_CALL( transform_if, l1_norm, l1_norm + num_rows, diag_tmp, l1_norm, thrust::negate<HYPRE_Real>(),
+#if defined(HYPRE_USING_SYCL)
+      hypreSycl_transform_if( l1_norm, l1_norm + num_rows, diag_tmp, l1_norm,
+                              std::negate<HYPRE_Real>(),
+                              is_negative<HYPRE_Real>() );
+      bool any_zero = 0.0 == HYPRE_ONEDPL_CALL( std::reduce, l1_norm, l1_norm + num_rows, 1.0,
+                                                oneapi::dpl::minimum<HYPRE_Real>() );
+#else
+      HYPRE_THRUST_CALL( transform_if, l1_norm, l1_norm + num_rows, diag_tmp, l1_norm,
+                         thrust::negate<HYPRE_Real>(),
                          is_negative<HYPRE_Real>() );
-      //bool any_zero = HYPRE_THRUST_CALL( any_of, l1_norm, l1_norm + num_rows, thrust::not1(thrust::identity<HYPRE_Complex>()) );
-      bool any_zero = 0.0 == HYPRE_THRUST_CALL( reduce, l1_norm, l1_norm + num_rows, 1.0, thrust::minimum<HYPRE_Real>() );
+      bool any_zero = 0.0 == HYPRE_THRUST_CALL( reduce, l1_norm, l1_norm + num_rows, 1.0,
+                                                thrust::minimum<HYPRE_Real>() );
+#endif
       if ( any_zero )
       {
          hypre_error_in_arg(1);
@@ -695,8 +797,8 @@ HYPRE_Int hypre_ParCSRComputeL1Norms(hypre_ParCSRMatrix  *A,
 
       for (i = 0; i < num_rows; i++)
       {
-         /* if (fabs(l1_norm[i]) < DBL_EPSILON) */
-         if (fabs(l1_norm[i]) == 0.0)
+         /* if (hypre_abs(l1_norm[i]) < DBL_EPSILON) */
+         if (hypre_abs(l1_norm[i]) == 0.0)
          {
             hypre_error_in_arg(1);
             break;
@@ -717,17 +819,18 @@ HYPRE_Int hypre_ParCSRComputeL1Norms(hypre_ParCSRMatrix  *A,
  *
  * For every row containing only a diagonal element: set it to d.
  *--------------------------------------------------------------------------*/
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
 __global__ void
-hypreCUDAKernel_ParCSRMatrixSetDiagRows(HYPRE_Int      nrows,
-                                        HYPRE_Int     *A_diag_I,
-                                        HYPRE_Int     *A_diag_J,
-                                        HYPRE_Complex *A_diag_data,
-                                        HYPRE_Int     *A_offd_I,
-                                        HYPRE_Int      num_cols_offd,
-                                        HYPRE_Real     d)
+hypreGPUKernel_ParCSRMatrixSetDiagRows(hypre_DeviceItem    &item,
+                                       HYPRE_Int      nrows,
+                                       HYPRE_Int     *A_diag_I,
+                                       HYPRE_Int     *A_diag_J,
+                                       HYPRE_Complex *A_diag_data,
+                                       HYPRE_Int     *A_offd_I,
+                                       HYPRE_Int      num_cols_offd,
+                                       HYPRE_Real     d)
 {
-   const HYPRE_Int i = hypre_cuda_get_grid_thread_id<1,1>();
+   const HYPRE_Int i = hypre_gpu_get_grid_thread_id<1, 1>(item);
    if (i >= nrows)
    {
       return;
@@ -735,8 +838,8 @@ hypreCUDAKernel_ParCSRMatrixSetDiagRows(HYPRE_Int      nrows,
 
    HYPRE_Int j = read_only_load(&A_diag_I[i]);
 
-   if ( (read_only_load(&A_diag_I[i+1]) == j+1) && (read_only_load(&A_diag_J[j]) == i) &&
-        (!num_cols_offd || (read_only_load(&A_offd_I[i+1]) == read_only_load(&A_offd_I[i]))) )
+   if ( (read_only_load(&A_diag_I[i + 1]) == j + 1) && (read_only_load(&A_diag_J[j]) == i) &&
+        (!num_cols_offd || (read_only_load(&A_offd_I[i + 1]) == read_only_load(&A_offd_I[i]))) )
    {
       A_diag_data[j] = d;
    }
@@ -757,14 +860,14 @@ HYPRE_Int hypre_ParCSRMatrixSetDiagRows(hypre_ParCSRMatrix *A, HYPRE_Real d)
    HYPRE_Int *A_offd_I = hypre_CSRMatrixI(A_offd);
    HYPRE_Int num_cols_offd = hypre_CSRMatrixNumCols(A_offd);
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
    HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_ParCSRMatrixMemoryLocation(A) );
    if (exec == HYPRE_EXEC_DEVICE)
    {
-      dim3 bDim = hypre_GetDefaultCUDABlockDimension();
-      dim3 gDim = hypre_GetDefaultCUDAGridDimension(num_rows, "thread", bDim);
-      HYPRE_CUDA_LAUNCH( hypreCUDAKernel_ParCSRMatrixSetDiagRows, gDim, bDim,
-                         num_rows, A_diag_I, A_diag_J, A_diag_data, A_offd_I, num_cols_offd, d);
+      dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+      dim3 gDim = hypre_GetDefaultDeviceGridDimension(num_rows, "thread", bDim);
+      HYPRE_GPU_LAUNCH( hypreGPUKernel_ParCSRMatrixSetDiagRows, gDim, bDim,
+                        num_rows, A_diag_I, A_diag_J, A_diag_data, A_offd_I, num_cols_offd, d);
    }
    else
 #endif
@@ -772,8 +875,8 @@ HYPRE_Int hypre_ParCSRMatrixSetDiagRows(hypre_ParCSRMatrix *A, HYPRE_Real d)
       for (i = 0; i < num_rows; i++)
       {
          j = A_diag_I[i];
-         if ((A_diag_I[i+1] == j+1) && (A_diag_J[j] == i) &&
-               (!num_cols_offd || (A_offd_I[i+1] == A_offd_I[i])))
+         if ((A_diag_I[i + 1] == j + 1) && (A_diag_J[j] == i) &&
+             (!num_cols_offd || (A_offd_I[i + 1] == A_offd_I[i])))
          {
             A_diag_data[j] = d;
          }
@@ -789,7 +892,7 @@ HYPRE_Int hypre_ParCSRMatrixSetDiagRows(hypre_ParCSRMatrix *A, HYPRE_Real d)
  * Allocate the AMS solver structure.
  *--------------------------------------------------------------------------*/
 
-void * hypre_AMSCreate()
+void * hypre_AMSCreate(void)
 {
    hypre_AMSData *ams_data;
 
@@ -897,61 +1000,111 @@ HYPRE_Int hypre_AMSDestroy(void *solver)
 
    if (ams_data -> owns_A_G)
       if (ams_data -> A_G)
+      {
          hypre_ParCSRMatrixDestroy(ams_data -> A_G);
+      }
    if (!ams_data -> beta_is_zero)
       if (ams_data -> B_G)
+      {
          HYPRE_BoomerAMGDestroy(ams_data -> B_G);
+      }
 
    if (ams_data -> owns_Pi && ams_data -> Pi)
+   {
       hypre_ParCSRMatrixDestroy(ams_data -> Pi);
+   }
    if (ams_data -> owns_A_Pi)
       if (ams_data -> A_Pi)
+      {
          hypre_ParCSRMatrixDestroy(ams_data -> A_Pi);
+      }
    if (ams_data -> B_Pi)
+   {
       HYPRE_BoomerAMGDestroy(ams_data -> B_Pi);
+   }
 
    if (ams_data -> owns_Pi && ams_data -> Pix)
+   {
       hypre_ParCSRMatrixDestroy(ams_data -> Pix);
+   }
    if (ams_data -> A_Pix)
+   {
       hypre_ParCSRMatrixDestroy(ams_data -> A_Pix);
+   }
    if (ams_data -> B_Pix)
+   {
       HYPRE_BoomerAMGDestroy(ams_data -> B_Pix);
+   }
    if (ams_data -> owns_Pi && ams_data -> Piy)
+   {
       hypre_ParCSRMatrixDestroy(ams_data -> Piy);
+   }
    if (ams_data -> A_Piy)
+   {
       hypre_ParCSRMatrixDestroy(ams_data -> A_Piy);
+   }
    if (ams_data -> B_Piy)
+   {
       HYPRE_BoomerAMGDestroy(ams_data -> B_Piy);
+   }
    if (ams_data -> owns_Pi && ams_data -> Piz)
+   {
       hypre_ParCSRMatrixDestroy(ams_data -> Piz);
+   }
    if (ams_data -> A_Piz)
+   {
       hypre_ParCSRMatrixDestroy(ams_data -> A_Piz);
+   }
    if (ams_data -> B_Piz)
+   {
       HYPRE_BoomerAMGDestroy(ams_data -> B_Piz);
+   }
 
    if (ams_data -> r0)
+   {
       hypre_ParVectorDestroy(ams_data -> r0);
+   }
    if (ams_data -> g0)
+   {
       hypre_ParVectorDestroy(ams_data -> g0);
+   }
    if (ams_data -> r1)
+   {
       hypre_ParVectorDestroy(ams_data -> r1);
+   }
    if (ams_data -> g1)
+   {
       hypre_ParVectorDestroy(ams_data -> g1);
+   }
    if (ams_data -> r2)
+   {
       hypre_ParVectorDestroy(ams_data -> r2);
+   }
    if (ams_data -> g2)
+   {
       hypre_ParVectorDestroy(ams_data -> g2);
+   }
    if (ams_data -> zz)
+   {
       hypre_ParVectorDestroy(ams_data -> zz);
+   }
 
    if (ams_data -> G0)
+   {
       hypre_ParCSRMatrixDestroy(ams_data -> A);
+   }
    if (ams_data -> G0)
+   {
       hypre_ParCSRMatrixDestroy(ams_data -> G0);
+   }
    if (ams_data -> A_G0)
+   {
       hypre_ParCSRMatrixDestroy(ams_data -> A_G0);
+   }
    if (ams_data -> B_G0)
+   {
       HYPRE_BoomerAMGDestroy(ams_data -> B_G0);
+   }
 
    hypre_SeqVectorDestroy(ams_data -> A_l1_norms);
 
@@ -977,7 +1130,9 @@ HYPRE_Int hypre_AMSSetDimension(void *solver,
    hypre_AMSData *ams_data = (hypre_AMSData *) solver;
 
    if (dim != 1 && dim != 2 && dim != 3)
+   {
       hypre_error_in_arg(2);
+   }
 
    ams_data -> dim = dim;
    return hypre_error_flag;
@@ -1131,7 +1286,9 @@ HYPRE_Int hypre_AMSSetBetaPoissonMatrix(void *solver,
    hypre_AMSData *ams_data = (hypre_AMSData *) solver;
    ams_data -> A_G = A_G;
    if (!A_G)
+   {
       ams_data -> beta_is_zero = 1;
+   }
    else
    {
       /* Penalize the eliminated degrees of freedom */
@@ -1282,9 +1439,10 @@ HYPRE_Int hypre_AMSSetSmoothingOptions(void *solver,
  * Set parameters for chebyshev smoother for A. Default values: 2,.3.
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int hypre_AMSSetChebySmoothingOptions(void *solver,
-                                            HYPRE_Int A_cheby_order,
-                                            HYPRE_Int A_cheby_fraction)
+HYPRE_Int
+hypre_AMSSetChebySmoothingOptions(void       *solver,
+                                  HYPRE_Int   A_cheby_order,
+                                  HYPRE_Real  A_cheby_fraction)
 {
    hypre_AMSData *ams_data = (hypre_AMSData *) solver;
    ams_data -> A_cheby_order =  A_cheby_order;
@@ -1379,14 +1537,15 @@ HYPRE_Int hypre_AMSSetBetaAMGCoarseRelaxType(void *solver,
  * can be computed from the vectors Gx, Gy, Gz.
  *--------------------------------------------------------------------------*/
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
 __global__ void
-hypreCUDAKernel_AMSComputePi_copy1(HYPRE_Int  nnz,
-                                   HYPRE_Int  dim,
-                                   HYPRE_Int *j_in,
-                                   HYPRE_Int *j_out)
+hypreGPUKernel_AMSComputePi_copy1(hypre_DeviceItem &item,
+                                  HYPRE_Int  nnz,
+                                  HYPRE_Int  dim,
+                                  HYPRE_Int *j_in,
+                                  HYPRE_Int *j_out)
 {
-   const HYPRE_Int i = hypre_cuda_get_grid_thread_id<1,1>();
+   const HYPRE_Int i = hypre_gpu_get_grid_thread_id<1, 1>(item);
 
    if (i < nnz)
    {
@@ -1394,30 +1553,31 @@ hypreCUDAKernel_AMSComputePi_copy1(HYPRE_Int  nnz,
 
       for (HYPRE_Int d = 0; d < dim; d++)
       {
-         j_out[j+d] = dim * read_only_load(&j_in[i]) + d;
+         j_out[j + d] = dim * read_only_load(&j_in[i]) + d;
       }
    }
 }
 
 __global__ void
-hypreCUDAKernel_AMSComputePi_copy2(HYPRE_Int   nrows,
-                                   HYPRE_Int   dim,
-                                   HYPRE_Int  *i_in,
-                                   HYPRE_Real *data_in,
-                                   HYPRE_Real *Gx_data,
-                                   HYPRE_Real *Gy_data,
-                                   HYPRE_Real *Gz_data,
-                                   HYPRE_Real *data_out)
+hypreGPUKernel_AMSComputePi_copy2(hypre_DeviceItem &item,
+                                  HYPRE_Int   nrows,
+                                  HYPRE_Int   dim,
+                                  HYPRE_Int  *i_in,
+                                  HYPRE_Real *data_in,
+                                  HYPRE_Real *Gx_data,
+                                  HYPRE_Real *Gy_data,
+                                  HYPRE_Real *Gz_data,
+                                  HYPRE_Real *data_out)
 {
-   const HYPRE_Int i = hypre_cuda_get_grid_warp_id<1,1>();
+   const HYPRE_Int i = hypre_gpu_get_grid_warp_id<1, 1>(item);
 
    if (i >= nrows)
    {
       return;
    }
 
-   const HYPRE_Int lane_id = hypre_cuda_get_lane_id<1>();
-   HYPRE_Int j, istart, iend;
+   const HYPRE_Int lane_id = hypre_gpu_get_lane_id<1>(item);
+   HYPRE_Int j = 0, istart, iend;
    HYPRE_Real t, G[3], *Gdata[3];
 
    Gdata[0] = Gx_data;
@@ -1429,8 +1589,8 @@ hypreCUDAKernel_AMSComputePi_copy2(HYPRE_Int   nrows,
       j = read_only_load(i_in + i + lane_id);
    }
 
-   istart = __shfl_sync(HYPRE_WARP_FULL_MASK, j, 0);
-   iend   = __shfl_sync(HYPRE_WARP_FULL_MASK, j, 1);
+   istart = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, j, 0);
+   iend   = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, j, 1);
 
    if (lane_id < dim)
    {
@@ -1439,54 +1599,53 @@ hypreCUDAKernel_AMSComputePi_copy2(HYPRE_Int   nrows,
 
    for (HYPRE_Int d = 0; d < dim; d++)
    {
-      G[d] = __shfl_sync(HYPRE_WARP_FULL_MASK, t, d);
+      G[d] = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, t, d);
    }
 
    for (j = istart + lane_id; j < iend; j += HYPRE_WARP_SIZE)
    {
-      const HYPRE_Real v = data_in ? fabs(read_only_load(&data_in[j])) * 0.5 : 1.0;
+      const HYPRE_Real v = data_in ? hypre_abs(read_only_load(&data_in[j])) * 0.5 : 1.0;
       const HYPRE_Int k = j * dim;
 
       for (HYPRE_Int d = 0; d < dim; d++)
       {
-         data_out[k+d] = v * G[d];
+         data_out[k + d] = v * G[d];
       }
    }
 }
 
 #endif
 
-HYPRE_Int hypre_AMSComputePi(hypre_ParCSRMatrix *A,
-                             hypre_ParCSRMatrix *G,
-                             hypre_ParVector *Gx,
-                             hypre_ParVector *Gy,
-                             hypre_ParVector *Gz,
-                             HYPRE_Int dim,
-                             hypre_ParCSRMatrix **Pi_ptr)
+HYPRE_Int
+hypre_AMSComputePi(hypre_ParCSRMatrix *A,
+                   hypre_ParCSRMatrix *G,
+                   hypre_ParVector *Gx,
+                   hypre_ParVector *Gy,
+                   hypre_ParVector *Gz,
+                   HYPRE_Int dim,
+                   hypre_ParCSRMatrix **Pi_ptr)
 {
+   HYPRE_UNUSED_VAR(A);
+
    hypre_ParCSRMatrix *Pi;
 
    /* Compute Pi = [Pi_x, Pi_y, Pi_z] */
    {
       HYPRE_Int i, j, d;
 
-      HYPRE_Real *Gx_data, *Gy_data, *Gz_data;
+      HYPRE_Real *Gx_data, *Gy_data = NULL, *Gz_data = NULL;
 
       MPI_Comm comm = hypre_ParCSRMatrixComm(G);
+      HYPRE_BigInt *col_starts_G = hypre_ParCSRMatrixColStarts(G);
       HYPRE_BigInt global_num_rows = hypre_ParCSRMatrixGlobalNumRows(G);
-      HYPRE_BigInt global_num_cols = dim*hypre_ParCSRMatrixGlobalNumCols(G);
+      HYPRE_BigInt global_num_cols = dim * hypre_ParCSRMatrixGlobalNumCols(G);
       HYPRE_BigInt *row_starts = hypre_ParCSRMatrixRowStarts(G);
-      HYPRE_BigInt *col_starts;
-      HYPRE_Int col_starts_size;
-      HYPRE_Int num_cols_offd = dim*hypre_CSRMatrixNumCols(hypre_ParCSRMatrixOffd(G));
-      HYPRE_Int num_nonzeros_diag = dim*hypre_CSRMatrixNumNonzeros(hypre_ParCSRMatrixDiag(G));
-      HYPRE_Int num_nonzeros_offd = dim*hypre_CSRMatrixNumNonzeros(hypre_ParCSRMatrixOffd(G));
-      HYPRE_BigInt *col_starts_G = hypre_ParCSRMatrixColStarts(G);
-
-      col_starts_size = 2;
-      col_starts = hypre_TAlloc(HYPRE_BigInt, col_starts_size, HYPRE_MEMORY_HOST);
-      for (i = 0; i < col_starts_size; i++)
-         col_starts[i] = (HYPRE_BigInt)dim * col_starts_G[i];
+      HYPRE_BigInt col_starts[2] = {(HYPRE_BigInt)dim * col_starts_G[0],
+                                    (HYPRE_BigInt)dim * col_starts_G[1]
+                                   };
+      HYPRE_Int num_cols_offd = dim * hypre_CSRMatrixNumCols(hypre_ParCSRMatrixOffd(G));
+      HYPRE_Int num_nonzeros_diag = dim * hypre_CSRMatrixNumNonzeros(hypre_ParCSRMatrixDiag(G));
+      HYPRE_Int num_nonzeros_offd = dim * hypre_CSRMatrixNumNonzeros(hypre_ParCSRMatrixOffd(G));
 
       Pi = hypre_ParCSRMatrixCreate(comm,
                                     global_num_rows,
@@ -1499,15 +1658,18 @@ HYPRE_Int hypre_AMSComputePi(hypre_ParCSRMatrix *A,
 
       hypre_ParCSRMatrixOwnsData(Pi) = 1;
       hypre_ParCSRMatrixInitialize(Pi);
-      hypre_TFree(col_starts, HYPRE_MEMORY_HOST);
 
       Gx_data = hypre_VectorData(hypre_ParVectorLocalVector(Gx));
       if (dim >= 2)
+      {
          Gy_data = hypre_VectorData(hypre_ParVectorLocalVector(Gy));
+      }
       if (dim == 3)
+      {
          Gz_data = hypre_VectorData(hypre_ParVectorLocalVector(Gz));
+      }
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
       HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy2( hypre_ParCSRMatrixMemoryLocation(G),
                                                          hypre_ParCSRMatrixMemoryLocation(Pi) );
 #endif
@@ -1527,45 +1689,49 @@ HYPRE_Int hypre_AMSComputePi(hypre_ParCSRMatrix *A,
          HYPRE_Int *Pi_diag_J = hypre_CSRMatrixJ(Pi_diag);
          HYPRE_Real *Pi_diag_data = hypre_CSRMatrixData(Pi_diag);
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
          if (exec == HYPRE_EXEC_DEVICE)
          {
-            HYPRE_THRUST_CALL( transform,
-                               G_diag_I,
-                               G_diag_I + G_diag_nrows + 1,
-                               Pi_diag_I,
-                               dim * _1 );
+            hypreDevice_IntScalen( G_diag_I, G_diag_nrows + 1, Pi_diag_I, dim );
 
-            dim3 bDim = hypre_GetDefaultCUDABlockDimension();
-            dim3 gDim = hypre_GetDefaultCUDAGridDimension(G_diag_nnz, "thread", bDim);
+            dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+            dim3 gDim = hypre_GetDefaultDeviceGridDimension(G_diag_nnz, "thread", bDim);
 
-            HYPRE_CUDA_LAUNCH( hypreCUDAKernel_AMSComputePi_copy1, gDim, bDim,
-                               G_diag_nnz, dim, G_diag_J, Pi_diag_J );
+            HYPRE_GPU_LAUNCH( hypreGPUKernel_AMSComputePi_copy1, gDim, bDim,
+                              G_diag_nnz, dim, G_diag_J, Pi_diag_J );
 
-            gDim = hypre_GetDefaultCUDAGridDimension(G_diag_nrows, "warp", bDim);
+            gDim = hypre_GetDefaultDeviceGridDimension(G_diag_nrows, "warp", bDim);
 
-            HYPRE_CUDA_LAUNCH( hypreCUDAKernel_AMSComputePi_copy2, gDim, bDim,
-                               G_diag_nrows, dim, G_diag_I, G_diag_data, Gx_data, Gy_data, Gz_data,
-                               Pi_diag_data );
+            HYPRE_GPU_LAUNCH( hypreGPUKernel_AMSComputePi_copy2, gDim, bDim,
+                              G_diag_nrows, dim, G_diag_I, G_diag_data, Gx_data, Gy_data, Gz_data,
+                              Pi_diag_data );
          }
          else
 #endif
          {
-            for (i = 0; i < G_diag_nrows+1; i++)
+            for (i = 0; i < G_diag_nrows + 1; i++)
+            {
                Pi_diag_I[i] = dim * G_diag_I[i];
+            }
 
             for (i = 0; i < G_diag_nnz; i++)
                for (d = 0; d < dim; d++)
-                  Pi_diag_J[dim*i+d] = dim*G_diag_J[i]+d;
+               {
+                  Pi_diag_J[dim * i + d] = dim * G_diag_J[i] + d;
+               }
 
             for (i = 0; i < G_diag_nrows; i++)
-               for (j = G_diag_I[i]; j < G_diag_I[i+1]; j++)
+               for (j = G_diag_I[i]; j < G_diag_I[i + 1]; j++)
                {
-                  *Pi_diag_data++ = fabs(G_diag_data[j]) * 0.5 * Gx_data[i];
+                  *Pi_diag_data++ = hypre_abs(G_diag_data[j]) * 0.5 * Gx_data[i];
                   if (dim >= 2)
-                     *Pi_diag_data++ = fabs(G_diag_data[j]) * 0.5 * Gy_data[i];
+                  {
+                     *Pi_diag_data++ = hypre_abs(G_diag_data[j]) * 0.5 * Gy_data[i];
+                  }
                   if (dim == 3)
-                     *Pi_diag_data++ = fabs(G_diag_data[j]) * 0.5 * Gz_data[i];
+                  {
+                     *Pi_diag_data++ = hypre_abs(G_diag_data[j]) * 0.5 * Gz_data[i];
+                  }
                }
          }
       }
@@ -1589,55 +1755,61 @@ HYPRE_Int hypre_AMSComputePi(hypre_ParCSRMatrix *A,
          HYPRE_BigInt *G_cmap = hypre_ParCSRMatrixColMapOffd(G);
          HYPRE_BigInt *Pi_cmap = hypre_ParCSRMatrixColMapOffd(Pi);
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
          if (exec == HYPRE_EXEC_DEVICE)
          {
             if (G_offd_ncols)
             {
-               HYPRE_THRUST_CALL( transform,
-                                  G_offd_I,
-                                  G_offd_I + G_offd_nrows + 1,
-                                  Pi_offd_I,
-                                  dim * _1 );
+               hypreDevice_IntScalen( G_offd_I, G_offd_nrows + 1, Pi_offd_I, dim );
             }
 
-            dim3 bDim = hypre_GetDefaultCUDABlockDimension();
-            dim3 gDim = hypre_GetDefaultCUDAGridDimension(G_offd_nnz, "thread", bDim);
+            dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+            dim3 gDim = hypre_GetDefaultDeviceGridDimension(G_offd_nnz, "thread", bDim);
 
-            HYPRE_CUDA_LAUNCH( hypreCUDAKernel_AMSComputePi_copy1, gDim, bDim,
-                               G_offd_nnz, dim, G_offd_J, Pi_offd_J );
+            HYPRE_GPU_LAUNCH( hypreGPUKernel_AMSComputePi_copy1, gDim, bDim,
+                              G_offd_nnz, dim, G_offd_J, Pi_offd_J );
 
-            gDim = hypre_GetDefaultCUDAGridDimension(G_offd_nrows, "warp", bDim);
+            gDim = hypre_GetDefaultDeviceGridDimension(G_offd_nrows, "warp", bDim);
 
-            HYPRE_CUDA_LAUNCH( hypreCUDAKernel_AMSComputePi_copy2, gDim, bDim,
-                               G_offd_nrows, dim, G_offd_I, G_offd_data, Gx_data, Gy_data, Gz_data,
-                               Pi_offd_data );
+            HYPRE_GPU_LAUNCH( hypreGPUKernel_AMSComputePi_copy2, gDim, bDim,
+                              G_offd_nrows, dim, G_offd_I, G_offd_data, Gx_data, Gy_data, Gz_data,
+                              Pi_offd_data );
          }
          else
 #endif
          {
             if (G_offd_ncols)
-               for (i = 0; i < G_offd_nrows+1; i++)
+               for (i = 0; i < G_offd_nrows + 1; i++)
+               {
                   Pi_offd_I[i] = dim * G_offd_I[i];
+               }
 
             for (i = 0; i < G_offd_nnz; i++)
                for (d = 0; d < dim; d++)
-                  Pi_offd_J[dim*i+d] = dim*G_offd_J[i]+d;
+               {
+                  Pi_offd_J[dim * i + d] = dim * G_offd_J[i] + d;
+               }
 
             for (i = 0; i < G_offd_nrows; i++)
-               for (j = G_offd_I[i]; j < G_offd_I[i+1]; j++)
+               for (j = G_offd_I[i]; j < G_offd_I[i + 1]; j++)
                {
-                  *Pi_offd_data++ = fabs(G_offd_data[j]) * 0.5 * Gx_data[i];
+                  *Pi_offd_data++ = hypre_abs(G_offd_data[j]) * 0.5 * Gx_data[i];
                   if (dim >= 2)
-                     *Pi_offd_data++ = fabs(G_offd_data[j]) * 0.5 * Gy_data[i];
+                  {
+                     *Pi_offd_data++ = hypre_abs(G_offd_data[j]) * 0.5 * Gy_data[i];
+                  }
                   if (dim == 3)
-                     *Pi_offd_data++ = fabs(G_offd_data[j]) * 0.5 * Gz_data[i];
+                  {
+                     *Pi_offd_data++ = hypre_abs(G_offd_data[j]) * 0.5 * Gz_data[i];
+                  }
                }
          }
 
          for (i = 0; i < G_offd_ncols; i++)
             for (d = 0; d < dim; d++)
-               Pi_cmap[dim*i+d] = (HYPRE_BigInt)dim * G_cmap[i] + (HYPRE_BigInt)d;
+            {
+               Pi_cmap[dim * i + d] = (HYPRE_BigInt)dim * G_cmap[i] + (HYPRE_BigInt)d;
+            }
       }
    }
 
@@ -1658,28 +1830,29 @@ HYPRE_Int hypre_AMSComputePi(hypre_ParCSRMatrix *A,
  * Gx, Gy, Gz.
  *--------------------------------------------------------------------------*/
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
 __global__ void
-hypreCUDAKernel_AMSComputePixyz_copy(HYPRE_Int   nrows,
-                                     HYPRE_Int   dim,
-                                     HYPRE_Int  *i_in,
-                                     HYPRE_Real *data_in,
-                                     HYPRE_Real *Gx_data,
-                                     HYPRE_Real *Gy_data,
-                                     HYPRE_Real *Gz_data,
-                                     HYPRE_Real *data_x_out,
-                                     HYPRE_Real *data_y_out,
-                                     HYPRE_Real *data_z_out )
+hypreGPUKernel_AMSComputePixyz_copy(hypre_DeviceItem &item,
+                                    HYPRE_Int   nrows,
+                                    HYPRE_Int   dim,
+                                    HYPRE_Int  *i_in,
+                                    HYPRE_Real *data_in,
+                                    HYPRE_Real *Gx_data,
+                                    HYPRE_Real *Gy_data,
+                                    HYPRE_Real *Gz_data,
+                                    HYPRE_Real *data_x_out,
+                                    HYPRE_Real *data_y_out,
+                                    HYPRE_Real *data_z_out )
 {
-   const HYPRE_Int i = hypre_cuda_get_grid_warp_id<1,1>();
+   const HYPRE_Int i = hypre_gpu_get_grid_warp_id<1, 1>(item);
 
    if (i >= nrows)
    {
       return;
    }
 
-   const HYPRE_Int lane_id = hypre_cuda_get_lane_id<1>();
-   HYPRE_Int j, istart, iend;
+   const HYPRE_Int lane_id = hypre_gpu_get_lane_id<1>(item);
+   HYPRE_Int j = 0, istart, iend;
    HYPRE_Real t, G[3], *Gdata[3], *Odata[3];
 
    Gdata[0] = Gx_data;
@@ -1695,8 +1868,8 @@ hypreCUDAKernel_AMSComputePixyz_copy(HYPRE_Int   nrows,
       j = read_only_load(i_in + i + lane_id);
    }
 
-   istart = __shfl_sync(HYPRE_WARP_FULL_MASK, j, 0);
-   iend   = __shfl_sync(HYPRE_WARP_FULL_MASK, j, 1);
+   istart = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, j, 0);
+   iend   = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, j, 1);
 
    if (lane_id < dim)
    {
@@ -1705,12 +1878,12 @@ hypreCUDAKernel_AMSComputePixyz_copy(HYPRE_Int   nrows,
 
    for (HYPRE_Int d = 0; d < dim; d++)
    {
-      G[d] = __shfl_sync(HYPRE_WARP_FULL_MASK, t, d);
+      G[d] = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, t, d);
    }
 
    for (j = istart + lane_id; j < iend; j += HYPRE_WARP_SIZE)
    {
-      const HYPRE_Real v = data_in ? fabs(read_only_load(&data_in[j])) * 0.5 : 1.0;
+      const HYPRE_Real v = data_in ? hypre_abs(read_only_load(&data_in[j])) * 0.5 : 1.0;
 
       for (HYPRE_Int d = 0; d < dim; d++)
       {
@@ -1720,19 +1893,22 @@ hypreCUDAKernel_AMSComputePixyz_copy(HYPRE_Int   nrows,
 }
 #endif
 
-HYPRE_Int hypre_AMSComputePixyz(hypre_ParCSRMatrix *A,
-                                hypre_ParCSRMatrix *G,
-                                hypre_ParVector *Gx,
-                                hypre_ParVector *Gy,
-                                hypre_ParVector *Gz,
-                                HYPRE_Int dim,
-                                hypre_ParCSRMatrix **Pix_ptr,
-                                hypre_ParCSRMatrix **Piy_ptr,
-                                hypre_ParCSRMatrix **Piz_ptr)
+HYPRE_Int
+hypre_AMSComputePixyz(hypre_ParCSRMatrix *A,
+                      hypre_ParCSRMatrix *G,
+                      hypre_ParVector *Gx,
+                      hypre_ParVector *Gy,
+                      hypre_ParVector *Gz,
+                      HYPRE_Int dim,
+                      hypre_ParCSRMatrix **Pix_ptr,
+                      hypre_ParCSRMatrix **Piy_ptr,
+                      hypre_ParCSRMatrix **Piz_ptr)
 {
-   hypre_ParCSRMatrix *Pix, *Piy, *Piz;
+   HYPRE_UNUSED_VAR(A);
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+   hypre_ParCSRMatrix *Pix, *Piy = NULL, *Piz = NULL;
+
+#if defined(HYPRE_USING_GPU)
    HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_ParCSRMatrixMemoryLocation(G) );
 #endif
 
@@ -1792,9 +1968,13 @@ HYPRE_Int hypre_AMSComputePixyz(hypre_ParCSRMatrix *A,
 
       Gx_data = hypre_VectorData(hypre_ParVectorLocalVector(Gx));
       if (dim >= 2)
+      {
          Gy_data = hypre_VectorData(hypre_ParVectorLocalVector(Gy));
+      }
       if (dim == 3)
+      {
          Gz_data = hypre_VectorData(hypre_ParVectorLocalVector(Gz));
+      }
 
       /* Fill-in the diagonal part */
       if (dim == 3)
@@ -1822,9 +2002,20 @@ HYPRE_Int hypre_AMSComputePixyz(hypre_ParCSRMatrix *A,
          HYPRE_Int *Piz_diag_J = hypre_CSRMatrixJ(Piz_diag);
          HYPRE_Real *Piz_diag_data = hypre_CSRMatrixData(Piz_diag);
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
          if (exec == HYPRE_EXEC_DEVICE)
          {
+#if defined(HYPRE_USING_SYCL)
+            HYPRE_ONEDPL_CALL( std::copy_n,
+                               oneapi::dpl::make_zip_iterator(G_diag_I, G_diag_I, G_diag_I),
+                               G_diag_nrows + 1,
+                               oneapi::dpl::make_zip_iterator(Pix_diag_I, Piy_diag_I, Piz_diag_I) );
+
+            HYPRE_ONEDPL_CALL( std::copy_n,
+                               oneapi::dpl::make_zip_iterator(G_diag_J, G_diag_J, G_diag_J),
+                               G_diag_nnz,
+                               oneapi::dpl::make_zip_iterator(Pix_diag_J, Piy_diag_J, Piz_diag_J) );
+#else
             HYPRE_THRUST_CALL( copy_n,
                                thrust::make_zip_iterator(thrust::make_tuple(G_diag_I, G_diag_I, G_diag_I)),
                                G_diag_nrows + 1,
@@ -1834,18 +2025,19 @@ HYPRE_Int hypre_AMSComputePixyz(hypre_ParCSRMatrix *A,
                                thrust::make_zip_iterator(thrust::make_tuple(G_diag_J, G_diag_J, G_diag_J)),
                                G_diag_nnz,
                                thrust::make_zip_iterator(thrust::make_tuple(Pix_diag_J, Piy_diag_J, Piz_diag_J)) );
+#endif
 
-            dim3 bDim = hypre_GetDefaultCUDABlockDimension();
-            dim3 gDim = hypre_GetDefaultCUDAGridDimension(G_diag_nrows, "warp", bDim);
+            dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+            dim3 gDim = hypre_GetDefaultDeviceGridDimension(G_diag_nrows, "warp", bDim);
 
-            HYPRE_CUDA_LAUNCH( hypreCUDAKernel_AMSComputePixyz_copy, gDim, bDim,
-                               G_diag_nrows, dim, G_diag_I, G_diag_data, Gx_data, Gy_data, Gz_data,
-                               Pix_diag_data, Piy_diag_data, Piz_diag_data );
+            HYPRE_GPU_LAUNCH( hypreGPUKernel_AMSComputePixyz_copy, gDim, bDim,
+                              G_diag_nrows, dim, G_diag_I, G_diag_data, Gx_data, Gy_data, Gz_data,
+                              Pix_diag_data, Piy_diag_data, Piz_diag_data );
          }
          else
 #endif
          {
-            for (i = 0; i < G_diag_nrows+1; i++)
+            for (i = 0; i < G_diag_nrows + 1; i++)
             {
                Pix_diag_I[i] = G_diag_I[i];
                Piy_diag_I[i] = G_diag_I[i];
@@ -1860,12 +2052,14 @@ HYPRE_Int hypre_AMSComputePixyz(hypre_ParCSRMatrix *A,
             }
 
             for (i = 0; i < G_diag_nrows; i++)
-               for (j = G_diag_I[i]; j < G_diag_I[i+1]; j++)
+            {
+               for (j = G_diag_I[i]; j < G_diag_I[i + 1]; j++)
                {
-                  *Pix_diag_data++ = fabs(G_diag_data[j]) * 0.5 * Gx_data[i];
-                  *Piy_diag_data++ = fabs(G_diag_data[j]) * 0.5 * Gy_data[i];
-                  *Piz_diag_data++ = fabs(G_diag_data[j]) * 0.5 * Gz_data[i];
+                  *Pix_diag_data++ = hypre_abs(G_diag_data[j]) * 0.5 * Gx_data[i];
+                  *Piy_diag_data++ = hypre_abs(G_diag_data[j]) * 0.5 * Gy_data[i];
+                  *Piz_diag_data++ = hypre_abs(G_diag_data[j]) * 0.5 * Gz_data[i];
                }
+            }
          }
       }
       else if (dim == 2)
@@ -1888,9 +2082,20 @@ HYPRE_Int hypre_AMSComputePixyz(hypre_ParCSRMatrix *A,
          HYPRE_Int *Piy_diag_J = hypre_CSRMatrixJ(Piy_diag);
          HYPRE_Real *Piy_diag_data = hypre_CSRMatrixData(Piy_diag);
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
          if (exec == HYPRE_EXEC_DEVICE)
          {
+#if defined(HYPRE_USING_SYCL)
+            HYPRE_ONEDPL_CALL( std::copy_n,
+                               oneapi::dpl::make_zip_iterator(G_diag_I, G_diag_I),
+                               G_diag_nrows + 1,
+                               oneapi::dpl::make_zip_iterator(Pix_diag_I, Piy_diag_I) );
+
+            HYPRE_ONEDPL_CALL( std::copy_n,
+                               oneapi::dpl::make_zip_iterator(G_diag_J, G_diag_J),
+                               G_diag_nnz,
+                               oneapi::dpl::make_zip_iterator(Pix_diag_J, Piy_diag_J) );
+#else
             HYPRE_THRUST_CALL( copy_n,
                                thrust::make_zip_iterator(thrust::make_tuple(G_diag_I, G_diag_I)),
                                G_diag_nrows + 1,
@@ -1900,18 +2105,19 @@ HYPRE_Int hypre_AMSComputePixyz(hypre_ParCSRMatrix *A,
                                thrust::make_zip_iterator(thrust::make_tuple(G_diag_J, G_diag_J)),
                                G_diag_nnz,
                                thrust::make_zip_iterator(thrust::make_tuple(Pix_diag_J, Piy_diag_J)) );
+#endif
 
-            dim3 bDim = hypre_GetDefaultCUDABlockDimension();
-            dim3 gDim = hypre_GetDefaultCUDAGridDimension(G_diag_nrows, "warp", bDim);
+            dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+            dim3 gDim = hypre_GetDefaultDeviceGridDimension(G_diag_nrows, "warp", bDim);
 
-            HYPRE_CUDA_LAUNCH( hypreCUDAKernel_AMSComputePixyz_copy, gDim, bDim,
-                               G_diag_nrows, dim, G_diag_I, G_diag_data, Gx_data, Gy_data, NULL,
-                               Pix_diag_data, Piy_diag_data, NULL );
+            HYPRE_GPU_LAUNCH( hypreGPUKernel_AMSComputePixyz_copy, gDim, bDim,
+                              G_diag_nrows, dim, G_diag_I, G_diag_data, Gx_data, Gy_data, NULL,
+                              Pix_diag_data, Piy_diag_data, NULL );
          }
          else
 #endif
          {
-            for (i = 0; i < G_diag_nrows+1; i++)
+            for (i = 0; i < G_diag_nrows + 1; i++)
             {
                Pix_diag_I[i] = G_diag_I[i];
                Piy_diag_I[i] = G_diag_I[i];
@@ -1924,10 +2130,10 @@ HYPRE_Int hypre_AMSComputePixyz(hypre_ParCSRMatrix *A,
             }
 
             for (i = 0; i < G_diag_nrows; i++)
-               for (j = G_diag_I[i]; j < G_diag_I[i+1]; j++)
+               for (j = G_diag_I[i]; j < G_diag_I[i + 1]; j++)
                {
-                  *Pix_diag_data++ = fabs(G_diag_data[j]) * 0.5 * Gx_data[i];
-                  *Piy_diag_data++ = fabs(G_diag_data[j]) * 0.5 * Gy_data[i];
+                  *Pix_diag_data++ = hypre_abs(G_diag_data[j]) * 0.5 * Gx_data[i];
+                  *Piy_diag_data++ = hypre_abs(G_diag_data[j]) * 0.5 * Gy_data[i];
                }
          }
       }
@@ -1946,9 +2152,20 @@ HYPRE_Int hypre_AMSComputePixyz(hypre_ParCSRMatrix *A,
          HYPRE_Int *Pix_diag_J = hypre_CSRMatrixJ(Pix_diag);
          HYPRE_Real *Pix_diag_data = hypre_CSRMatrixData(Pix_diag);
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
          if (exec == HYPRE_EXEC_DEVICE)
          {
+#if defined(HYPRE_USING_SYCL)
+            HYPRE_ONEDPL_CALL( std::copy_n,
+                               G_diag_I,
+                               G_diag_nrows + 1,
+                               Pix_diag_I );
+
+            HYPRE_ONEDPL_CALL( std::copy_n,
+                               G_diag_J,
+                               G_diag_nnz,
+                               Pix_diag_J );
+#else
             HYPRE_THRUST_CALL( copy_n,
                                G_diag_I,
                                G_diag_nrows + 1,
@@ -1958,18 +2175,19 @@ HYPRE_Int hypre_AMSComputePixyz(hypre_ParCSRMatrix *A,
                                G_diag_J,
                                G_diag_nnz,
                                Pix_diag_J );
+#endif
 
-            dim3 bDim = hypre_GetDefaultCUDABlockDimension();
-            dim3 gDim = hypre_GetDefaultCUDAGridDimension(G_diag_nrows, "warp", bDim);
+            dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+            dim3 gDim = hypre_GetDefaultDeviceGridDimension(G_diag_nrows, "warp", bDim);
 
-            HYPRE_CUDA_LAUNCH( hypreCUDAKernel_AMSComputePixyz_copy, gDim, bDim,
-                               G_diag_nrows, dim, G_diag_I, G_diag_data, Gx_data, NULL, NULL,
-                               Pix_diag_data, NULL, NULL );
+            HYPRE_GPU_LAUNCH( hypreGPUKernel_AMSComputePixyz_copy, gDim, bDim,
+                              G_diag_nrows, dim, G_diag_I, G_diag_data, Gx_data, NULL, NULL,
+                              Pix_diag_data, NULL, NULL );
          }
          else
 #endif
          {
-            for (i = 0; i < G_diag_nrows+1; i++)
+            for (i = 0; i < G_diag_nrows + 1; i++)
             {
                Pix_diag_I[i] = G_diag_I[i];
             }
@@ -1980,9 +2198,9 @@ HYPRE_Int hypre_AMSComputePixyz(hypre_ParCSRMatrix *A,
             }
 
             for (i = 0; i < G_diag_nrows; i++)
-               for (j = G_diag_I[i]; j < G_diag_I[i+1]; j++)
+               for (j = G_diag_I[i]; j < G_diag_I[i + 1]; j++)
                {
-                  *Pix_diag_data++ = fabs(G_diag_data[j]) * 0.5 * Gx_data[i];
+                  *Pix_diag_data++ = hypre_abs(G_diag_data[j]) * 0.5 * Gx_data[i];
                }
          }
       }
@@ -2020,9 +2238,23 @@ HYPRE_Int hypre_AMSComputePixyz(hypre_ParCSRMatrix *A,
          HYPRE_BigInt *Piy_cmap = hypre_ParCSRMatrixColMapOffd(Piy);
          HYPRE_BigInt *Piz_cmap = hypre_ParCSRMatrixColMapOffd(Piz);
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
          if (exec == HYPRE_EXEC_DEVICE)
          {
+#if defined(HYPRE_USING_SYCL)
+            if (G_offd_ncols)
+            {
+               HYPRE_ONEDPL_CALL( std::copy_n,
+                                  oneapi::dpl::make_zip_iterator(G_offd_I, G_offd_I, G_offd_I),
+                                  G_offd_nrows + 1,
+                                  oneapi::dpl::make_zip_iterator(Pix_offd_I, Piy_offd_I, Piz_offd_I) );
+            }
+
+            HYPRE_ONEDPL_CALL( std::copy_n,
+                               oneapi::dpl::make_zip_iterator(G_offd_J, G_offd_J, G_offd_J),
+                               G_offd_nnz,
+                               oneapi::dpl::make_zip_iterator(Pix_offd_J, Piy_offd_J, Piz_offd_J) );
+#else
             if (G_offd_ncols)
             {
                HYPRE_THRUST_CALL( copy_n,
@@ -2035,19 +2267,20 @@ HYPRE_Int hypre_AMSComputePixyz(hypre_ParCSRMatrix *A,
                                thrust::make_zip_iterator(thrust::make_tuple(G_offd_J, G_offd_J, G_offd_J)),
                                G_offd_nnz,
                                thrust::make_zip_iterator(thrust::make_tuple(Pix_offd_J, Piy_offd_J, Piz_offd_J)) );
+#endif
 
-            dim3 bDim = hypre_GetDefaultCUDABlockDimension();
-            dim3 gDim = hypre_GetDefaultCUDAGridDimension(G_offd_nrows, "warp", bDim);
+            dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+            dim3 gDim = hypre_GetDefaultDeviceGridDimension(G_offd_nrows, "warp", bDim);
 
-            HYPRE_CUDA_LAUNCH( hypreCUDAKernel_AMSComputePixyz_copy, gDim, bDim,
-                               G_offd_nrows, dim, G_offd_I, G_offd_data, Gx_data, Gy_data, Gz_data,
-                               Pix_offd_data, Piy_offd_data, Piz_offd_data );
+            HYPRE_GPU_LAUNCH( hypreGPUKernel_AMSComputePixyz_copy, gDim, bDim,
+                              G_offd_nrows, dim, G_offd_I, G_offd_data, Gx_data, Gy_data, Gz_data,
+                              Pix_offd_data, Piy_offd_data, Piz_offd_data );
          }
          else
 #endif
          {
             if (G_offd_ncols)
-               for (i = 0; i < G_offd_nrows+1; i++)
+               for (i = 0; i < G_offd_nrows + 1; i++)
                {
                   Pix_offd_I[i] = G_offd_I[i];
                   Piy_offd_I[i] = G_offd_I[i];
@@ -2062,11 +2295,11 @@ HYPRE_Int hypre_AMSComputePixyz(hypre_ParCSRMatrix *A,
             }
 
             for (i = 0; i < G_offd_nrows; i++)
-               for (j = G_offd_I[i]; j < G_offd_I[i+1]; j++)
+               for (j = G_offd_I[i]; j < G_offd_I[i + 1]; j++)
                {
-                  *Pix_offd_data++ = fabs(G_offd_data[j]) * 0.5 * Gx_data[i];
-                  *Piy_offd_data++ = fabs(G_offd_data[j]) * 0.5 * Gy_data[i];
-                  *Piz_offd_data++ = fabs(G_offd_data[j]) * 0.5 * Gz_data[i];
+                  *Pix_offd_data++ = hypre_abs(G_offd_data[j]) * 0.5 * Gx_data[i];
+                  *Piy_offd_data++ = hypre_abs(G_offd_data[j]) * 0.5 * Gy_data[i];
+                  *Piz_offd_data++ = hypre_abs(G_offd_data[j]) * 0.5 * Gz_data[i];
                }
          }
 
@@ -2102,9 +2335,23 @@ HYPRE_Int hypre_AMSComputePixyz(hypre_ParCSRMatrix *A,
          HYPRE_BigInt *Pix_cmap = hypre_ParCSRMatrixColMapOffd(Pix);
          HYPRE_BigInt *Piy_cmap = hypre_ParCSRMatrixColMapOffd(Piy);
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
          if (exec == HYPRE_EXEC_DEVICE)
          {
+#if defined(HYPRE_USING_SYCL)
+            if (G_offd_ncols)
+            {
+               HYPRE_ONEDPL_CALL( std::copy_n,
+                                  oneapi::dpl::make_zip_iterator(G_offd_I, G_offd_I),
+                                  G_offd_nrows + 1,
+                                  oneapi::dpl::make_zip_iterator(Pix_offd_I, Piy_offd_I) );
+            }
+
+            HYPRE_ONEDPL_CALL( std::copy_n,
+                               oneapi::dpl::make_zip_iterator(G_offd_J, G_offd_J),
+                               G_offd_nnz,
+                               oneapi::dpl::make_zip_iterator(Pix_offd_J, Piy_offd_J) );
+#else
             if (G_offd_ncols)
             {
                HYPRE_THRUST_CALL( copy_n,
@@ -2117,23 +2364,26 @@ HYPRE_Int hypre_AMSComputePixyz(hypre_ParCSRMatrix *A,
                                thrust::make_zip_iterator(thrust::make_tuple(G_offd_J, G_offd_J)),
                                G_offd_nnz,
                                thrust::make_zip_iterator(thrust::make_tuple(Pix_offd_J, Piy_offd_J)) );
+#endif
 
-            dim3 bDim = hypre_GetDefaultCUDABlockDimension();
-            dim3 gDim = hypre_GetDefaultCUDAGridDimension(G_offd_nrows, "warp", bDim);
+            dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+            dim3 gDim = hypre_GetDefaultDeviceGridDimension(G_offd_nrows, "warp", bDim);
 
-            HYPRE_CUDA_LAUNCH( hypreCUDAKernel_AMSComputePixyz_copy, gDim, bDim,
-                               G_offd_nrows, dim, G_offd_I, G_offd_data, Gx_data, Gy_data, NULL,
-                               Pix_offd_data, Piy_offd_data, NULL );
+            HYPRE_GPU_LAUNCH( hypreGPUKernel_AMSComputePixyz_copy, gDim, bDim,
+                              G_offd_nrows, dim, G_offd_I, G_offd_data, Gx_data, Gy_data, NULL,
+                              Pix_offd_data, Piy_offd_data, NULL );
          }
          else
 #endif
          {
             if (G_offd_ncols)
-               for (i = 0; i < G_offd_nrows+1; i++)
+            {
+               for (i = 0; i < G_offd_nrows + 1; i++)
                {
                   Pix_offd_I[i] = G_offd_I[i];
                   Piy_offd_I[i] = G_offd_I[i];
                }
+            }
 
             for (i = 0; i < G_offd_nnz; i++)
             {
@@ -2142,11 +2392,13 @@ HYPRE_Int hypre_AMSComputePixyz(hypre_ParCSRMatrix *A,
             }
 
             for (i = 0; i < G_offd_nrows; i++)
-               for (j = G_offd_I[i]; j < G_offd_I[i+1]; j++)
+            {
+               for (j = G_offd_I[i]; j < G_offd_I[i + 1]; j++)
                {
-                  *Pix_offd_data++ = fabs(G_offd_data[j]) * 0.5 * Gx_data[i];
-                  *Piy_offd_data++ = fabs(G_offd_data[j]) * 0.5 * Gy_data[i];
+                  *Pix_offd_data++ = hypre_abs(G_offd_data[j]) * 0.5 * Gx_data[i];
+                  *Piy_offd_data++ = hypre_abs(G_offd_data[j]) * 0.5 * Gy_data[i];
                }
+            }
          }
 
          for (i = 0; i < G_offd_ncols; i++)
@@ -2174,9 +2426,23 @@ HYPRE_Int hypre_AMSComputePixyz(hypre_ParCSRMatrix *A,
          HYPRE_BigInt *G_cmap = hypre_ParCSRMatrixColMapOffd(G);
          HYPRE_BigInt *Pix_cmap = hypre_ParCSRMatrixColMapOffd(Pix);
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
          if (exec == HYPRE_EXEC_DEVICE)
          {
+#if defined(HYPRE_USING_SYCL)
+            if (G_offd_ncols)
+            {
+               HYPRE_ONEDPL_CALL( std::copy_n,
+                                  G_offd_I,
+                                  G_offd_nrows + 1,
+                                  Pix_offd_I );
+            }
+
+            HYPRE_ONEDPL_CALL( std::copy_n,
+                               G_offd_J,
+                               G_offd_nnz,
+                               Pix_offd_J );
+#else
             if (G_offd_ncols)
             {
                HYPRE_THRUST_CALL( copy_n,
@@ -2189,19 +2455,20 @@ HYPRE_Int hypre_AMSComputePixyz(hypre_ParCSRMatrix *A,
                                G_offd_J,
                                G_offd_nnz,
                                Pix_offd_J );
+#endif
 
-            dim3 bDim = hypre_GetDefaultCUDABlockDimension();
-            dim3 gDim = hypre_GetDefaultCUDAGridDimension(G_offd_nrows, "warp", bDim);
+            dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+            dim3 gDim = hypre_GetDefaultDeviceGridDimension(G_offd_nrows, "warp", bDim);
 
-            HYPRE_CUDA_LAUNCH( hypreCUDAKernel_AMSComputePixyz_copy, gDim, bDim,
-                               G_offd_nrows, dim, G_offd_I, G_offd_data, Gx_data, NULL, NULL,
-                               Pix_offd_data, NULL, NULL );
+            HYPRE_GPU_LAUNCH( hypreGPUKernel_AMSComputePixyz_copy, gDim, bDim,
+                              G_offd_nrows, dim, G_offd_I, G_offd_data, Gx_data, NULL, NULL,
+                              Pix_offd_data, NULL, NULL );
          }
          else
 #endif
          {
             if (G_offd_ncols)
-               for (i = 0; i < G_offd_nrows+1; i++)
+               for (i = 0; i < G_offd_nrows + 1; i++)
                {
                   Pix_offd_I[i] = G_offd_I[i];
                }
@@ -2212,9 +2479,9 @@ HYPRE_Int hypre_AMSComputePixyz(hypre_ParCSRMatrix *A,
             }
 
             for (i = 0; i < G_offd_nrows; i++)
-               for (j = G_offd_I[i]; j < G_offd_I[i+1]; j++)
+               for (j = G_offd_I[i]; j < G_offd_I[i + 1]; j++)
                {
-                  *Pix_offd_data++ = fabs(G_offd_data[j]) * 0.5 * Gx_data[i];
+                  *Pix_offd_data++ = hypre_abs(G_offd_data[j]) * 0.5 * Gx_data[i];
                }
          }
 
@@ -2227,33 +2494,38 @@ HYPRE_Int hypre_AMSComputePixyz(hypre_ParCSRMatrix *A,
 
    *Pix_ptr = Pix;
    if (dim >= 2)
+   {
       *Piy_ptr = Piy;
+   }
    if (dim == 3)
+   {
       *Piz_ptr = Piz;
+   }
 
    return hypre_error_flag;
 }
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
 __global__ void
-hypreCUDAKernel_AMSComputeGPi_copy2(HYPRE_Int   nrows,
-                                    HYPRE_Int   dim,
-                                    HYPRE_Int  *i_in,
-                                    HYPRE_Real *data_in,
-                                    HYPRE_Real *Gx_data,
-                                    HYPRE_Real *Gy_data,
-                                    HYPRE_Real *Gz_data,
-                                    HYPRE_Real *data_out)
+hypreGPUKernel_AMSComputeGPi_copy2(hypre_DeviceItem &item,
+                                   HYPRE_Int   nrows,
+                                   HYPRE_Int   dim,
+                                   HYPRE_Int  *i_in,
+                                   HYPRE_Real *data_in,
+                                   HYPRE_Real *Gx_data,
+                                   HYPRE_Real *Gy_data,
+                                   HYPRE_Real *Gz_data,
+                                   HYPRE_Real *data_out)
 {
-   const HYPRE_Int i = hypre_cuda_get_grid_warp_id<1,1>();
+   const HYPRE_Int i = hypre_gpu_get_grid_warp_id<1, 1>(item);
 
    if (i >= nrows)
    {
       return;
    }
 
-   const HYPRE_Int lane_id = hypre_cuda_get_lane_id<1>();
-   HYPRE_Int j, istart, iend;
+   const HYPRE_Int lane_id = hypre_gpu_get_lane_id<1>(item);
+   HYPRE_Int j = 0, istart, iend;
    HYPRE_Real t, G[3], *Gdata[3];
 
    Gdata[0] = Gx_data;
@@ -2265,8 +2537,8 @@ hypreCUDAKernel_AMSComputeGPi_copy2(HYPRE_Int   nrows,
       j = read_only_load(i_in + i + lane_id);
    }
 
-   istart = __shfl_sync(HYPRE_WARP_FULL_MASK, j, 0);
-   iend   = __shfl_sync(HYPRE_WARP_FULL_MASK, j, 1);
+   istart = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, j, 0);
+   iend   = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, j, 1);
 
    if (lane_id < dim - 1)
    {
@@ -2275,19 +2547,19 @@ hypreCUDAKernel_AMSComputeGPi_copy2(HYPRE_Int   nrows,
 
    for (HYPRE_Int d = 0; d < dim - 1; d++)
    {
-      G[d] = __shfl_sync(HYPRE_WARP_FULL_MASK, t, d);
+      G[d] = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, t, d);
    }
 
    for (j = istart + lane_id; j < iend; j += HYPRE_WARP_SIZE)
    {
       const HYPRE_Real u = read_only_load(&data_in[j]);
-      const HYPRE_Real v = fabs(u) * 0.5;
+      const HYPRE_Real v = hypre_abs(u) * 0.5;
       const HYPRE_Int k = j * dim;
 
       data_out[k] = u;
       for (HYPRE_Int d = 0; d < dim - 1; d++)
       {
-         data_out[k+d+1] = v * G[d];
+         data_out[k + d + 1] = v * G[d];
       }
    }
 }
@@ -2301,14 +2573,17 @@ hypreCUDAKernel_AMSComputeGPi_copy2(HYPRE_Int   nrows,
  * to the edge finite elements space.
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int hypre_AMSComputeGPi(hypre_ParCSRMatrix *A,
-                              hypre_ParCSRMatrix *G,
-                              hypre_ParVector *Gx,
-                              hypre_ParVector *Gy,
-                              hypre_ParVector *Gz,
-                              HYPRE_Int dim,
-                              hypre_ParCSRMatrix **GPi_ptr)
+HYPRE_Int
+hypre_AMSComputeGPi(hypre_ParCSRMatrix *A,
+                    hypre_ParCSRMatrix *G,
+                    hypre_ParVector *Gx,
+                    hypre_ParVector *Gy,
+                    hypre_ParVector *Gz,
+                    HYPRE_Int dim,
+                    hypre_ParCSRMatrix **GPi_ptr)
 {
+   HYPRE_UNUSED_VAR(A);
+
    hypre_ParCSRMatrix *GPi;
 
    /* Take into account G */
@@ -2318,22 +2593,19 @@ HYPRE_Int hypre_AMSComputeGPi(hypre_ParCSRMatrix *A,
    {
       HYPRE_Int i, j, d;
 
-      HYPRE_Real *Gx_data, *Gy_data, *Gz_data;
+      HYPRE_Real *Gx_data, *Gy_data = NULL, *Gz_data = NULL;
 
       MPI_Comm comm = hypre_ParCSRMatrixComm(G);
+      HYPRE_BigInt *col_starts_G = hypre_ParCSRMatrixColStarts(G);
       HYPRE_BigInt global_num_rows = hypre_ParCSRMatrixGlobalNumRows(G);
-      HYPRE_BigInt global_num_cols = dim*hypre_ParCSRMatrixGlobalNumCols(G);
+      HYPRE_BigInt global_num_cols = dim * hypre_ParCSRMatrixGlobalNumCols(G);
       HYPRE_BigInt *row_starts = hypre_ParCSRMatrixRowStarts(G);
-      HYPRE_BigInt *col_starts;
-      HYPRE_Int col_starts_size;
-      HYPRE_Int num_cols_offd = dim*hypre_CSRMatrixNumCols(hypre_ParCSRMatrixOffd(G));
-      HYPRE_Int num_nonzeros_diag = dim*hypre_CSRMatrixNumNonzeros(hypre_ParCSRMatrixDiag(G));
-      HYPRE_Int num_nonzeros_offd = dim*hypre_CSRMatrixNumNonzeros(hypre_ParCSRMatrixOffd(G));
-      HYPRE_BigInt *col_starts_G = hypre_ParCSRMatrixColStarts(G);
-      col_starts_size = 2;
-      col_starts = hypre_TAlloc(HYPRE_BigInt, col_starts_size, HYPRE_MEMORY_HOST);
-      for (i = 0; i < col_starts_size; i++)
-         col_starts[i] = (HYPRE_BigInt) dim * col_starts_G[i];
+      HYPRE_BigInt col_starts[2] = {(HYPRE_BigInt)dim * col_starts_G[0],
+                                    (HYPRE_BigInt)dim * col_starts_G[1]
+                                   };
+      HYPRE_Int num_cols_offd = dim * hypre_CSRMatrixNumCols(hypre_ParCSRMatrixOffd(G));
+      HYPRE_Int num_nonzeros_diag = dim * hypre_CSRMatrixNumNonzeros(hypre_ParCSRMatrixDiag(G));
+      HYPRE_Int num_nonzeros_offd = dim * hypre_CSRMatrixNumNonzeros(hypre_ParCSRMatrixOffd(G));
 
       GPi = hypre_ParCSRMatrixCreate(comm,
                                      global_num_rows,
@@ -2349,11 +2621,15 @@ HYPRE_Int hypre_AMSComputeGPi(hypre_ParCSRMatrix *A,
 
       Gx_data = hypre_VectorData(hypre_ParVectorLocalVector(Gx));
       if (dim >= 3)
+      {
          Gy_data = hypre_VectorData(hypre_ParVectorLocalVector(Gy));
+      }
       if (dim == 4)
+      {
          Gz_data = hypre_VectorData(hypre_ParVectorLocalVector(Gz));
+      }
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
       HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy2( hypre_ParCSRMatrixMemoryLocation(G),
                                                          hypre_ParCSRMatrixMemoryLocation(GPi) );
 #endif
@@ -2373,46 +2649,50 @@ HYPRE_Int hypre_AMSComputeGPi(hypre_ParCSRMatrix *A,
          HYPRE_Int *GPi_diag_J = hypre_CSRMatrixJ(GPi_diag);
          HYPRE_Real *GPi_diag_data = hypre_CSRMatrixData(GPi_diag);
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
          if (exec == HYPRE_EXEC_DEVICE)
          {
-            HYPRE_THRUST_CALL( transform,
-                               G_diag_I,
-                               G_diag_I + G_diag_nrows + 1,
-                               GPi_diag_I,
-                               dim * _1 );
+            hypreDevice_IntScalen( G_diag_I, G_diag_nrows + 1, GPi_diag_I, dim );
 
-            dim3 bDim = hypre_GetDefaultCUDABlockDimension();
-            dim3 gDim = hypre_GetDefaultCUDAGridDimension(G_diag_nnz, "thread", bDim);
+            dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+            dim3 gDim = hypre_GetDefaultDeviceGridDimension(G_diag_nnz, "thread", bDim);
 
-            HYPRE_CUDA_LAUNCH( hypreCUDAKernel_AMSComputePi_copy1, gDim, bDim,
-                               G_diag_nnz, dim, G_diag_J, GPi_diag_J );
+            HYPRE_GPU_LAUNCH( hypreGPUKernel_AMSComputePi_copy1, gDim, bDim,
+                              G_diag_nnz, dim, G_diag_J, GPi_diag_J );
 
-            gDim = hypre_GetDefaultCUDAGridDimension(G_diag_nrows, "warp", bDim);
+            gDim = hypre_GetDefaultDeviceGridDimension(G_diag_nrows, "warp", bDim);
 
-            HYPRE_CUDA_LAUNCH( hypreCUDAKernel_AMSComputeGPi_copy2, gDim, bDim,
-                               G_diag_nrows, dim, G_diag_I, G_diag_data, Gx_data, Gy_data, Gz_data,
-                               GPi_diag_data );
+            HYPRE_GPU_LAUNCH( hypreGPUKernel_AMSComputeGPi_copy2, gDim, bDim,
+                              G_diag_nrows, dim, G_diag_I, G_diag_data, Gx_data, Gy_data, Gz_data,
+                              GPi_diag_data );
          }
          else
 #endif
          {
-            for (i = 0; i < G_diag_nrows+1; i++)
+            for (i = 0; i < G_diag_nrows + 1; i++)
+            {
                GPi_diag_I[i] = dim * G_diag_I[i];
+            }
 
             for (i = 0; i < G_diag_nnz; i++)
                for (d = 0; d < dim; d++)
-                  GPi_diag_J[dim*i+d] = dim*G_diag_J[i]+d;
+               {
+                  GPi_diag_J[dim * i + d] = dim * G_diag_J[i] + d;
+               }
 
             for (i = 0; i < G_diag_nrows; i++)
-               for (j = G_diag_I[i]; j < G_diag_I[i+1]; j++)
+               for (j = G_diag_I[i]; j < G_diag_I[i + 1]; j++)
                {
                   *GPi_diag_data++ = G_diag_data[j];
-                  *GPi_diag_data++ = fabs(G_diag_data[j]) * 0.5 * Gx_data[i];
+                  *GPi_diag_data++ = hypre_abs(G_diag_data[j]) * 0.5 * Gx_data[i];
                   if (dim >= 3)
-                     *GPi_diag_data++ = fabs(G_diag_data[j]) * 0.5 * Gy_data[i];
+                  {
+                     *GPi_diag_data++ = hypre_abs(G_diag_data[j]) * 0.5 * Gy_data[i];
+                  }
                   if (dim == 4)
-                     *GPi_diag_data++ = fabs(G_diag_data[j]) * 0.5 * Gz_data[i];
+                  {
+                     *GPi_diag_data++ = hypre_abs(G_diag_data[j]) * 0.5 * Gz_data[i];
+                  }
                }
          }
       }
@@ -2436,56 +2716,62 @@ HYPRE_Int hypre_AMSComputeGPi(hypre_ParCSRMatrix *A,
          HYPRE_BigInt *G_cmap = hypre_ParCSRMatrixColMapOffd(G);
          HYPRE_BigInt *GPi_cmap = hypre_ParCSRMatrixColMapOffd(GPi);
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
          if (exec == HYPRE_EXEC_DEVICE)
          {
             if (G_offd_ncols)
             {
-               HYPRE_THRUST_CALL( transform,
-                                  G_offd_I,
-                                  G_offd_I + G_offd_nrows + 1,
-                                  GPi_offd_I,
-                                  dim * _1 );
+               hypreDevice_IntScalen( G_offd_I, G_offd_nrows + 1, GPi_offd_I, dim );
             }
 
-            dim3 bDim = hypre_GetDefaultCUDABlockDimension();
-            dim3 gDim = hypre_GetDefaultCUDAGridDimension(G_offd_nnz, "thread", bDim);
+            dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+            dim3 gDim = hypre_GetDefaultDeviceGridDimension(G_offd_nnz, "thread", bDim);
 
-            HYPRE_CUDA_LAUNCH( hypreCUDAKernel_AMSComputePi_copy1, gDim, bDim,
-                               G_offd_nnz, dim, G_offd_J, GPi_offd_J );
+            HYPRE_GPU_LAUNCH( hypreGPUKernel_AMSComputePi_copy1, gDim, bDim,
+                              G_offd_nnz, dim, G_offd_J, GPi_offd_J );
 
-            gDim = hypre_GetDefaultCUDAGridDimension(G_offd_nrows, "warp", bDim);
+            gDim = hypre_GetDefaultDeviceGridDimension(G_offd_nrows, "warp", bDim);
 
-            HYPRE_CUDA_LAUNCH( hypreCUDAKernel_AMSComputeGPi_copy2, gDim, bDim,
-                               G_offd_nrows, dim, G_offd_I, G_offd_data, Gx_data, Gy_data, Gz_data,
-                               GPi_offd_data );
+            HYPRE_GPU_LAUNCH( hypreGPUKernel_AMSComputeGPi_copy2, gDim, bDim,
+                              G_offd_nrows, dim, G_offd_I, G_offd_data, Gx_data, Gy_data, Gz_data,
+                              GPi_offd_data );
          }
          else
 #endif
          {
             if (G_offd_ncols)
-               for (i = 0; i < G_offd_nrows+1; i++)
+               for (i = 0; i < G_offd_nrows + 1; i++)
+               {
                   GPi_offd_I[i] = dim * G_offd_I[i];
+               }
 
             for (i = 0; i < G_offd_nnz; i++)
                for (d = 0; d < dim; d++)
-                  GPi_offd_J[dim*i+d] = dim*G_offd_J[i]+d;
+               {
+                  GPi_offd_J[dim * i + d] = dim * G_offd_J[i] + d;
+               }
 
             for (i = 0; i < G_offd_nrows; i++)
-               for (j = G_offd_I[i]; j < G_offd_I[i+1]; j++)
+               for (j = G_offd_I[i]; j < G_offd_I[i + 1]; j++)
                {
                   *GPi_offd_data++ = G_offd_data[j];
-                  *GPi_offd_data++ = fabs(G_offd_data[j]) * 0.5 * Gx_data[i];
+                  *GPi_offd_data++ = hypre_abs(G_offd_data[j]) * 0.5 * Gx_data[i];
                   if (dim >= 3)
-                     *GPi_offd_data++ = fabs(G_offd_data[j]) * 0.5 * Gy_data[i];
+                  {
+                     *GPi_offd_data++ = hypre_abs(G_offd_data[j]) * 0.5 * Gy_data[i];
+                  }
                   if (dim == 4)
-                     *GPi_offd_data++ = fabs(G_offd_data[j]) * 0.5 * Gz_data[i];
+                  {
+                     *GPi_offd_data++ = hypre_abs(G_offd_data[j]) * 0.5 * Gz_data[i];
+                  }
                }
          }
 
          for (i = 0; i < G_offd_ncols; i++)
             for (d = 0; d < dim; d++)
-               GPi_cmap[dim*i+d] = dim*G_cmap[i]+d;
+            {
+               GPi_cmap[dim * i + d] = dim * G_cmap[i] + d;
+            }
       }
 
    }
@@ -2505,23 +2791,24 @@ HYPRE_Int hypre_AMSComputeGPi(hypre_ParCSRMatrix *A,
  * - hypre_AMSSetDiscreteGradient()
  * - hypre_AMSSetCoordinateVectors() or hypre_AMSSetEdgeConstantVectors
  *--------------------------------------------------------------------------*/
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
 __global__ void
-hypreCUDAKernel_FixInterNodes( HYPRE_Int      nrows,
-                               HYPRE_Int     *G0t_diag_i,
-                               HYPRE_Complex *G0t_diag_data,
-                               HYPRE_Int     *G0t_offd_i,
-                               HYPRE_Complex *G0t_offd_data,
-                               HYPRE_Real    *interior_nodes_data)
+hypreGPUKernel_FixInterNodes( hypre_DeviceItem    &item,
+                              HYPRE_Int      nrows,
+                              HYPRE_Int     *G0t_diag_i,
+                              HYPRE_Complex *G0t_diag_data,
+                              HYPRE_Int     *G0t_offd_i,
+                              HYPRE_Complex *G0t_offd_data,
+                              HYPRE_Real    *interior_nodes_data)
 {
-   HYPRE_Int row_i = hypre_cuda_get_grid_warp_id<1,1>();
+   HYPRE_Int row_i = hypre_gpu_get_grid_warp_id<1, 1>(item);
 
    if (row_i >= nrows)
    {
       return;
    }
 
-   HYPRE_Int lane = hypre_cuda_get_lane_id<1>();
+   HYPRE_Int lane = hypre_gpu_get_lane_id<1>(item);
    HYPRE_Int not1 = 0;
 
    if (lane == 0)
@@ -2529,14 +2816,14 @@ hypreCUDAKernel_FixInterNodes( HYPRE_Int      nrows,
       not1 = read_only_load(&interior_nodes_data[row_i]) != 1.0;
    }
 
-   not1 = __shfl_sync(HYPRE_WARP_FULL_MASK, not1, 0);
+   not1 = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, not1, 0);
 
    if (!not1)
    {
       return;
    }
 
-   HYPRE_Int p1, q1, p2 = 0, q2 = 0;
+   HYPRE_Int p1 = 0, q1, p2 = 0, q2 = 0;
    bool nonempty_offd = G0t_offd_data != NULL;
 
    if (lane < 2)
@@ -2548,12 +2835,12 @@ hypreCUDAKernel_FixInterNodes( HYPRE_Int      nrows,
       }
    }
 
-   q1 = __shfl_sync(HYPRE_WARP_FULL_MASK, p1, 1);
-   p1 = __shfl_sync(HYPRE_WARP_FULL_MASK, p1, 0);
+   q1 = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p1, 1);
+   p1 = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p1, 0);
    if (nonempty_offd)
    {
-      q2 = __shfl_sync(HYPRE_WARP_FULL_MASK, p2, 1);
-      p2 = __shfl_sync(HYPRE_WARP_FULL_MASK, p2, 0);
+      q2 = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p2, 1);
+      p2 = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p2, 0);
    }
 
    for (HYPRE_Int j = p1 + lane; j < q1; j += HYPRE_WARP_SIZE)
@@ -2567,33 +2854,34 @@ hypreCUDAKernel_FixInterNodes( HYPRE_Int      nrows,
 }
 
 __global__ void
-hypreCUDAKernel_AMSSetupScaleGGt( HYPRE_Int   Gt_num_rows,
-                                  HYPRE_Int  *Gt_diag_i,
-                                  HYPRE_Int  *Gt_diag_j,
-                                  HYPRE_Real *Gt_diag_data,
-                                  HYPRE_Int  *Gt_offd_i,
-                                  HYPRE_Real *Gt_offd_data,
-                                  HYPRE_Real *Gx_data,
-                                  HYPRE_Real *Gy_data,
-                                  HYPRE_Real *Gz_data )
+hypreGPUKernel_AMSSetupScaleGGt( hypre_DeviceItem &item,
+                                 HYPRE_Int   Gt_num_rows,
+                                 HYPRE_Int  *Gt_diag_i,
+                                 HYPRE_Int  *Gt_diag_j,
+                                 HYPRE_Real *Gt_diag_data,
+                                 HYPRE_Int  *Gt_offd_i,
+                                 HYPRE_Real *Gt_offd_data,
+                                 HYPRE_Real *Gx_data,
+                                 HYPRE_Real *Gy_data,
+                                 HYPRE_Real *Gz_data )
 {
-   HYPRE_Int row_i = hypre_cuda_get_grid_warp_id<1,1>();
+   HYPRE_Int row_i = hypre_gpu_get_grid_warp_id<1, 1>(item);
 
    if (row_i >= Gt_num_rows)
    {
       return;
    }
 
-   HYPRE_Int lane = hypre_cuda_get_lane_id<1>();
+   HYPRE_Int lane = hypre_gpu_get_lane_id<1>(item);
    HYPRE_Real h2 = 0.0;
-   HYPRE_Int ne, p1, q1, p2 = 0, q2 = 0;
+   HYPRE_Int ne, p1 = 0, q1, p2 = 0, q2 = 0;
 
    if (lane < 2)
    {
       p1 = read_only_load(Gt_diag_i + row_i + lane);
    }
-   q1 = __shfl_sync(HYPRE_WARP_FULL_MASK, p1, 1);
-   p1 = __shfl_sync(HYPRE_WARP_FULL_MASK, p1, 0);
+   q1 = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p1, 1);
+   p1 = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p1, 0);
    ne = q1 - p1;
 
    if (ne == 0)
@@ -2607,8 +2895,8 @@ hypreCUDAKernel_AMSSetupScaleGGt( HYPRE_Int   Gt_num_rows,
       {
          p2 = read_only_load(Gt_offd_i + row_i + lane);
       }
-      q2 = __shfl_sync(HYPRE_WARP_FULL_MASK, p2, 1);
-      p2 = __shfl_sync(HYPRE_WARP_FULL_MASK, p2, 0);
+      q2 = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p2, 1);
+      p2 = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p2, 0);
    }
 
    for (HYPRE_Int j = p1 + lane; j < q1; j += HYPRE_WARP_SIZE)
@@ -2618,10 +2906,10 @@ hypreCUDAKernel_AMSSetupScaleGGt( HYPRE_Int   Gt_num_rows,
       const HYPRE_Real Gy = read_only_load(&Gy_data[k]);
       const HYPRE_Real Gz = read_only_load(&Gz_data[k]);
 
-      h2 += Gx*Gx + Gy*Gy + Gz*Gz;
+      h2 += Gx * Gx + Gy * Gy + Gz * Gz;
    }
 
-   h2 = warp_allreduce_sum(h2) / ne;
+   h2 = warp_allreduce_sum(item, h2) / ne;
 
    for (HYPRE_Int j = p1 + lane; j < q1; j += HYPRE_WARP_SIZE)
    {
@@ -2635,12 +2923,16 @@ hypreCUDAKernel_AMSSetupScaleGGt( HYPRE_Int   Gt_num_rows,
 }
 #endif
 
-HYPRE_Int hypre_AMSSetup(void *solver,
-                         hypre_ParCSRMatrix *A,
-                         hypre_ParVector *b,
-                         hypre_ParVector *x)
+HYPRE_Int
+hypre_AMSSetup(void *solver,
+               hypre_ParCSRMatrix *A,
+               hypre_ParVector *b,
+               hypre_ParVector *x)
 {
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+   HYPRE_UNUSED_VAR(b);
+   HYPRE_UNUSED_VAR(x);
+
+#if defined(HYPRE_USING_GPU)
    HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_ParCSRMatrixMemoryLocation(A) );
 #endif
 
@@ -2673,16 +2965,16 @@ HYPRE_Int hypre_AMSSetup(void *solver,
          hypre_CSRMatrix *G0to = hypre_ParCSRMatrixOffd(G0t);
          HYPRE_Int *G0toI = hypre_CSRMatrixI(G0to);
          HYPRE_Real *G0toA = hypre_CSRMatrixData(G0to);
-         HYPRE_Real *interior_nodes_data=hypre_VectorData(
-            hypre_ParVectorLocalVector((hypre_ParVector*) ams_data -> interior_nodes));
+         HYPRE_Real *interior_nodes_data = hypre_VectorData(
+                                              hypre_ParVectorLocalVector((hypre_ParVector*) ams_data -> interior_nodes));
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
          if (exec == HYPRE_EXEC_DEVICE)
          {
-            dim3 bDim = hypre_GetDefaultCUDABlockDimension();
-            dim3 gDim = hypre_GetDefaultCUDAGridDimension(nv, "warp", bDim);
-            HYPRE_CUDA_LAUNCH( hypreCUDAKernel_FixInterNodes, gDim, bDim,
-                               nv, G0tdI, G0tdA, G0toI, G0toA, interior_nodes_data );
+            dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+            dim3 gDim = hypre_GetDefaultDeviceGridDimension(nv, "warp", bDim);
+            HYPRE_GPU_LAUNCH( hypreGPUKernel_FixInterNodes, gDim, bDim,
+                              nv, G0tdI, G0tdA, G0toI, G0toA, interior_nodes_data );
          }
          else
 #endif
@@ -2691,11 +2983,15 @@ HYPRE_Int hypre_AMSSetup(void *solver,
             {
                if (interior_nodes_data[i] != 1)
                {
-                  for (j = G0tdI[i]; j < G0tdI[i+1]; j++)
+                  for (j = G0tdI[i]; j < G0tdI[i + 1]; j++)
+                  {
                      G0tdA[j] = 0.0;
+                  }
                   if (G0toI)
-                     for (j = G0toI[i]; j < G0toI[i+1]; j++)
+                     for (j = G0toI[i]; j < G0toI[i + 1]; j++)
+                     {
                         G0toA[j] = 0.0;
+                     }
                }
             }
          }
@@ -2703,7 +2999,7 @@ HYPRE_Int hypre_AMSSetup(void *solver,
       hypre_ParCSRMatrixTranspose(G0t, & ams_data -> G0, 1);
 
       /* Construct the subspace matrix A_G0 = G0^T G0 */
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
       if (exec == HYPRE_EXEC_DEVICE)
       {
          ams_data -> A_G0 = hypre_ParCSRMatMat(G0t, ams_data -> G0);
@@ -2738,7 +3034,7 @@ HYPRE_Int hypre_AMSSetup(void *solver,
          NOTE: this can be optimized significantly by taking into account that
          the sparsity pattern of A is subset of the sparsity pattern of G0 G0^T */
       {
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
          hypre_ParCSRMatrix *A;
          if (exec == HYPRE_EXEC_DEVICE)
          {
@@ -2762,7 +3058,7 @@ HYPRE_Int hypre_AMSSetup(void *solver,
             HYPRE_Int *B_diag_i = hypre_CSRMatrixI(hypre_ParCSRMatrixDiag(B));
             HYPRE_Int *B_offd_i = hypre_CSRMatrixI(hypre_ParCSRMatrixOffd(B));
             lfactor = -1;
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
             if (exec == HYPRE_EXEC_DEVICE)
             {
                HYPRE_Int nnz_diag = hypre_CSRMatrixNumNonzeros(hypre_ParCSRMatrixDiag(B));
@@ -2774,6 +3070,26 @@ HYPRE_Int hypre_AMSSetup(void *solver,
                hypre_TMemcpy(&nnz, &B_offd_i[B_num_rows], HYPRE_Int, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
                hypre_assert(nnz == nnz_offd);
 #endif
+#if defined(HYPRE_USING_SYCL)
+               if (nnz_diag)
+               {
+                  lfactor = HYPRE_ONEDPL_CALL( std::reduce,
+                                               oneapi::dpl::make_transform_iterator(B_diag_data,            absolute_value<HYPRE_Real>()),
+                                               oneapi::dpl::make_transform_iterator(B_diag_data + nnz_diag, absolute_value<HYPRE_Real>()),
+                                               -1.0,
+                                               sycl::maximum<HYPRE_Real>() );
+               }
+
+               if (nnz_offd)
+               {
+                  lfactor = HYPRE_ONEDPL_CALL( std::reduce,
+                                               oneapi::dpl::make_transform_iterator(B_offd_data,            absolute_value<HYPRE_Real>()),
+                                               oneapi::dpl::make_transform_iterator(B_offd_data + nnz_offd, absolute_value<HYPRE_Real>()),
+                                               lfactor,
+                                               sycl::maximum<HYPRE_Real>() );
+
+               }
+#else
                if (nnz_diag)
                {
                   lfactor = HYPRE_THRUST_CALL( reduce,
@@ -2792,16 +3108,21 @@ HYPRE_Int hypre_AMSSetup(void *solver,
                                                thrust::maximum<HYPRE_Real>() );
 
                }
+#endif
             }
             else
 #endif
             {
                for (i = 0; i < B_diag_i[B_num_rows]; i++)
-                  if (fabs(B_diag_data[i]) > lfactor)
-                     lfactor = fabs(B_diag_data[i]);
+                  if (hypre_abs(B_diag_data[i]) > lfactor)
+                  {
+                     lfactor = hypre_abs(B_diag_data[i]);
+                  }
                for (i = 0; i < B_offd_i[B_num_rows]; i++)
-                  if (fabs(B_offd_data[i]) > lfactor)
-                     lfactor = fabs(B_offd_data[i]);
+                  if (hypre_abs(B_offd_data[i]) > lfactor)
+                  {
+                     lfactor = hypre_abs(B_offd_data[i]);
+                  }
             }
 
             lfactor *= 1e-10; /* scaling factor: max|A_ij|*1e-10 */
@@ -2835,8 +3156,8 @@ HYPRE_Int hypre_AMSSetup(void *solver,
             HYPRE_Real factor, lfactor;
             lfactor = -1;
             for (i = 0; i < nnzB; i++)
-               if (fabs(dataB[i]) > lfactor)
-                  lfactor = fabs(dataB[i]);
+               if (hypre_abs(dataB[i]) > lfactor)
+                  lfactor = hypre_abs(dataB[i]);
             lfactor *= 1e-10;
             hypre_MPI_Allreduce(&lfactor, &factor, 1, HYPRE_MPI_REAL, hypre_MPI_MAX,
                                 hypre_ParCSRMatrixComm(A));
@@ -2887,7 +3208,8 @@ HYPRE_Int hypre_AMSSetup(void *solver,
 
       ams_data -> A_l1_norms = hypre_SeqVectorCreate(hypre_ParCSRMatrixNumRows(ams_data -> A));
       hypre_VectorData(ams_data -> A_l1_norms) = l1_norm_data;
-      hypre_SeqVectorInitialize_v2(ams_data -> A_l1_norms, hypre_ParCSRMatrixMemoryLocation(ams_data -> A));
+      hypre_SeqVectorInitialize_v2(ams_data -> A_l1_norms,
+                                   hypre_ParCSRMatrixMemoryLocation(ams_data -> A));
    }
 
    /* Chebyshev? */
@@ -2903,12 +3225,16 @@ HYPRE_Int hypre_AMSSetup(void *solver,
       if (ams_data -> x != NULL &&
           (ams_data -> dim == 1 || ams_data -> y != NULL) &&
           (ams_data -> dim <= 2 || ams_data -> z != NULL))
+      {
          input_info = 1;
+      }
 
       if (ams_data -> Gx != NULL &&
           (ams_data -> dim == 1 || ams_data -> Gy != NULL) &&
           (ams_data -> dim <= 2 || ams_data -> Gz != NULL))
+      {
          input_info = 2;
+      }
 
       if (input_info == 1)
       {
@@ -2966,9 +3292,13 @@ HYPRE_Int hypre_AMSSetup(void *solver,
    {
       hypre_ParVectorDestroy(ams_data -> Gx);
       if (ams_data -> dim >= 2)
+      {
          hypre_ParVectorDestroy(ams_data -> Gy);
+      }
       if (ams_data -> dim == 3)
+      {
          hypre_ParVectorDestroy(ams_data -> Gz);
+      }
    }
 
    /* Create the AMG solver on the range of G^T */
@@ -2991,7 +3321,9 @@ HYPRE_Int hypre_AMSSetup(void *solver,
       HYPRE_BoomerAMGSetCycleRelaxType(ams_data -> B_G, ams_data -> B_G_coarse_relax_type, 3);
 
       if (ams_data -> cycle_type == 0)
+      {
          HYPRE_BoomerAMGSetMaxLevels(ams_data -> B_G, 2);
+      }
 
       /* If not given, construct the coarse space matrix by RAP */
       if (!ams_data -> A_G)
@@ -3006,7 +3338,7 @@ HYPRE_Int hypre_AMSSetup(void *solver,
             hypre_MatvecCommPkgCreate(ams_data -> A);
          }
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
          if (exec == HYPRE_EXEC_DEVICE)
          {
             ams_data -> A_G = hypre_ParCSRMatrixRAPKT(ams_data -> G,
@@ -3034,7 +3366,7 @@ HYPRE_Int hypre_AMSSetup(void *solver,
    }
 
    if (ams_data -> cycle_type > 10 && ams_data -> cycle_type != 20)
-   /* Create the AMG solvers on the range of Pi{x,y,z}^T */
+      /* Create the AMG solvers on the range of Pi{x,y,z}^T */
    {
       HYPRE_BoomerAMGCreate(&ams_data -> B_Pix);
       HYPRE_BoomerAMGSetCoarsenType(ams_data -> B_Pix, ams_data -> B_Pi_coarsen_type);
@@ -3093,7 +3425,7 @@ HYPRE_Int hypre_AMSSetup(void *solver,
          hypre_MatvecCommPkgCreate(ams_data -> Pix);
       }
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
       if (exec == HYPRE_EXEC_DEVICE)
       {
          ams_data -> A_Pix = hypre_ParCSRMatrixRAPKT(ams_data -> Pix, ams_data -> A, ams_data -> Pix, 1);
@@ -3122,7 +3454,7 @@ HYPRE_Int hypre_AMSSetup(void *solver,
             hypre_MatvecCommPkgCreate(ams_data -> Piy);
          }
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
          if (exec == HYPRE_EXEC_DEVICE)
          {
             ams_data -> A_Piy = hypre_ParCSRMatrixRAPKT(ams_data -> Piy,
@@ -3154,7 +3486,7 @@ HYPRE_Int hypre_AMSSetup(void *solver,
             hypre_MatvecCommPkgCreate(ams_data -> Piz);
          }
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
          if (exec == HYPRE_EXEC_DEVICE)
          {
             ams_data -> A_Piz = hypre_ParCSRMatrixRAPKT(ams_data -> Piz,
@@ -3180,7 +3512,7 @@ HYPRE_Int hypre_AMSSetup(void *solver,
       }
    }
    else
-   /* Create the AMG solver on the range of Pi^T */
+      /* Create the AMG solver on the range of Pi^T */
    {
       HYPRE_BoomerAMGCreate(&ams_data -> B_Pi);
       HYPRE_BoomerAMGSetCoarsenType(ams_data -> B_Pi, ams_data -> B_Pi_coarsen_type);
@@ -3199,7 +3531,9 @@ HYPRE_Int hypre_AMSSetup(void *solver,
       HYPRE_BoomerAMGSetCycleRelaxType(ams_data -> B_Pi, ams_data -> B_Pi_coarse_relax_type, 3);
 
       if (ams_data -> cycle_type == 0)
+      {
          HYPRE_BoomerAMGSetMaxLevels(ams_data -> B_Pi, 2);
+      }
 
       /* If not given, construct the coarse space matrix by RAP and
          notify BoomerAMG that this is a dim x dim block system. */
@@ -3219,7 +3553,7 @@ HYPRE_Int hypre_AMSSetup(void *solver,
          {
             /* Add a discrete divergence term to A before computing  Pi^t A Pi */
             {
-               hypre_ParCSRMatrix *Gt, *GGt, *ApGGt;
+               hypre_ParCSRMatrix *Gt, *GGt = NULL, *ApGGt;
                hypre_ParCSRMatrixTranspose(ams_data -> G, &Gt, 1);
 
                /* scale GGt by h^2 */
@@ -3241,14 +3575,14 @@ HYPRE_Int hypre_AMSSetup(void *solver,
                   HYPRE_Real *Gy_data = hypre_VectorData(hypre_ParVectorLocalVector(ams_data -> Gy));
                   HYPRE_Real *Gz_data = hypre_VectorData(hypre_ParVectorLocalVector(ams_data -> Gz));
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
                   if (exec == HYPRE_EXEC_DEVICE)
                   {
-                     dim3 bDim = hypre_GetDefaultCUDABlockDimension();
-                     dim3 gDim = hypre_GetDefaultCUDAGridDimension(Gt_num_rows, "warp", bDim);
-                     HYPRE_CUDA_LAUNCH( hypreCUDAKernel_AMSSetupScaleGGt, gDim, bDim,
-                           Gt_num_rows, Gt_diag_I, Gt_diag_J, Gt_diag_data, Gt_offd_I, Gt_offd_data,
-                           Gx_data, Gy_data, Gz_data );
+                     dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+                     dim3 gDim = hypre_GetDefaultDeviceGridDimension(Gt_num_rows, "warp", bDim);
+                     HYPRE_GPU_LAUNCH( hypreGPUKernel_AMSSetupScaleGGt, gDim, bDim,
+                                       Gt_num_rows, Gt_diag_I, Gt_diag_J, Gt_diag_data, Gt_offd_I, Gt_offd_data,
+                                       Gx_data, Gy_data, Gz_data );
                   }
                   else
 #endif
@@ -3258,20 +3592,24 @@ HYPRE_Int hypre_AMSSetup(void *solver,
                         /* determine the characteristic mesh size for vertex i */
                         h2 = 0.0;
                         ne = 0;
-                        for (j = Gt_diag_I[i]; j < Gt_diag_I[i+1]; j++)
+                        for (j = Gt_diag_I[i]; j < Gt_diag_I[i + 1]; j++)
                         {
                            k = Gt_diag_J[j];
-                           h2 += Gx_data[k]*Gx_data[k]+Gy_data[k]*Gy_data[k]+Gz_data[k]*Gz_data[k];
+                           h2 += Gx_data[k] * Gx_data[k] + Gy_data[k] * Gy_data[k] + Gz_data[k] * Gz_data[k];
                            ne++;
                         }
 
                         if (ne != 0)
                         {
                            h2 /= ne;
-                           for (j = Gt_diag_I[i]; j < Gt_diag_I[i+1]; j++)
+                           for (j = Gt_diag_I[i]; j < Gt_diag_I[i + 1]; j++)
+                           {
                               Gt_diag_data[j] *= h2;
-                           for (j = Gt_offd_I[i]; j < Gt_offd_I[i+1]; j++)
+                           }
+                           for (j = Gt_offd_I[i]; j < Gt_offd_I[i + 1]; j++)
+                           {
                               Gt_offd_data[j] *= h2;
+                           }
                         }
                      }
                   }
@@ -3282,18 +3620,22 @@ HYPRE_Int hypre_AMSSetup(void *solver,
                {
                   hypre_ParVectorDestroy(ams_data -> Gx);
                   if (ams_data -> dim >= 2)
+                  {
                      hypre_ParVectorDestroy(ams_data -> Gy);
+                  }
                   if (ams_data -> dim == 3)
+                  {
                      hypre_ParVectorDestroy(ams_data -> Gz);
+                  }
                }
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
                if (exec == HYPRE_EXEC_DEVICE)
                {
                   GGt = hypre_ParCSRMatMat(ams_data -> G, Gt);
                }
-#endif
                else
+#endif
                {
                   GGt = hypre_ParMatmul(ams_data -> G, Gt);
                }
@@ -3347,7 +3689,7 @@ HYPRE_Int hypre_AMSSetup(void *solver,
 
                hypre_ParCSRMatrixDestroy(GGt);
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
                if (exec == HYPRE_EXEC_DEVICE)
                {
                   ams_data -> A_Pi = hypre_ParCSRMatrixRAPKT(ams_data -> Pi, ApGGt, ams_data -> Pi, 1);
@@ -3364,7 +3706,7 @@ HYPRE_Int hypre_AMSSetup(void *solver,
          }
          else
          {
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
             if (exec == HYPRE_EXEC_DEVICE)
             {
                ams_data -> A_Pi = hypre_ParCSRMatrixRAPKT(ams_data -> Pi, ams_data -> A, ams_data -> Pi, 1);
@@ -3382,9 +3724,13 @@ HYPRE_Int hypre_AMSSetup(void *solver,
          ams_data -> owns_A_Pi = 1;
 
          if (ams_data -> cycle_type != 20)
+         {
             HYPRE_BoomerAMGSetNumFunctions(ams_data -> B_Pi, ams_data -> dim);
+         }
          else
+         {
             HYPRE_BoomerAMGSetNumFunctions(ams_data -> B_Pi, ams_data -> dim + 1);
+         }
          /* HYPRE_BoomerAMGSetNodal(ams_data -> B_Pi, 1); */
       }
 
@@ -3432,8 +3778,11 @@ HYPRE_Int hypre_AMSSolve(void *solver,
 {
    hypre_AMSData *ams_data = (hypre_AMSData *) solver;
 
-   HYPRE_Int i, my_id = -1;
-   HYPRE_Real r0_norm, r_norm, b_norm, relative_resid = 0, old_resid;
+   HYPRE_Int  i, my_id = -1;
+   HYPRE_Real r0_norm = 1.0;
+   HYPRE_Real r_norm  = 1.0;
+   HYPRE_Real b_norm  = 1.0;
+   HYPRE_Real relative_resid = 0, old_resid;
 
    char cycle[30];
    hypre_ParCSRMatrix *Ai[5], *Pi[5];
@@ -3463,12 +3812,13 @@ HYPRE_Int hypre_AMSSolve(void *solver,
    ri[4] = ams_data -> r1;     gi[4] = ams_data -> g1;
 
    /* may need to create an additional temporary vector for relaxation */
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
    HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_ParCSRMatrixMemoryLocation(A) );
 
    if (exec == HYPRE_EXEC_DEVICE)
    {
-      needZ = ams_data -> A_relax_type == 2 || ams_data -> A_relax_type == 4 || ams_data -> A_relax_type == 16;
+      needZ = ams_data -> A_relax_type == 2 || ams_data -> A_relax_type == 4 ||
+              ams_data -> A_relax_type == 16;
    }
    else
 #endif
@@ -3486,7 +3836,9 @@ HYPRE_Int hypre_AMSSolve(void *solver,
    }
 
    if (ams_data -> print_level > 0)
+   {
       hypre_MPI_Comm_rank(hypre_ParCSRMatrixComm(A), &my_id);
+   }
 
    /* Compatible subspace projection for problems with zero-conductivity regions.
       Note that this modifies the input (r.h.s.) vector b! */
@@ -3502,30 +3854,35 @@ HYPRE_Int hypre_AMSSolve(void *solver,
       switch (ams_data -> cycle_type)
       {
          case 0:
-            hypre_sprintf(cycle,"%s","0");
+            hypre_sprintf(cycle, "%s", "0");
             break;
+
          case 1:
          case 3:
          case 5:
          case 7:
          default:
-            hypre_sprintf(cycle,"%s","020");
+            hypre_sprintf(cycle, "%s", "020");
             break;
+
          case 2:
          case 4:
          case 6:
          case 8:
-            hypre_sprintf(cycle,"%s","(0+2)");
+            hypre_sprintf(cycle, "%s", "(0+2)");
             break;
+
          case 11:
          case 13:
-            hypre_sprintf(cycle,"%s","0345430");
+            hypre_sprintf(cycle, "%s", "0345430");
             break;
+
          case 12:
-            hypre_sprintf(cycle,"%s","(0+3+4+5)");
+            hypre_sprintf(cycle, "%s", "(0+3+4+5)");
             break;
+
          case 14:
-            hypre_sprintf(cycle,"%s","0(+3+4+5)0");
+            hypre_sprintf(cycle, "%s", "0(+3+4+5)0");
             break;
       }
    }
@@ -3534,50 +3891,63 @@ HYPRE_Int hypre_AMSSolve(void *solver,
       switch (ams_data -> cycle_type)
       {
          case 0:
-            hypre_sprintf(cycle,"%s","010");
+            hypre_sprintf(cycle, "%s", "010");
             break;
          case 1:
          default:
-            hypre_sprintf(cycle,"%s","01210");
+            hypre_sprintf(cycle, "%s", "01210");
             break;
+
          case 2:
-            hypre_sprintf(cycle,"%s","(0+1+2)");
+            hypre_sprintf(cycle, "%s", "(0+1+2)");
             break;
+
          case 3:
-            hypre_sprintf(cycle,"%s","02120");
+            hypre_sprintf(cycle, "%s", "02120");
             break;
+
          case 4:
-            hypre_sprintf(cycle,"%s","(010+2)");
+            hypre_sprintf(cycle, "%s", "(010+2)");
             break;
+
          case 5:
-            hypre_sprintf(cycle,"%s","0102010");
+            hypre_sprintf(cycle, "%s", "0102010");
             break;
+
          case 6:
-            hypre_sprintf(cycle,"%s","(020+1)");
+            hypre_sprintf(cycle, "%s", "(020+1)");
             break;
+
          case 7:
-            hypre_sprintf(cycle,"%s","0201020");
+            hypre_sprintf(cycle, "%s", "0201020");
             break;
+
          case 8:
-            hypre_sprintf(cycle,"%s","0(+1+2)0");
+            hypre_sprintf(cycle, "%s", "0(+1+2)0");
             break;
+
          case 9:
-            hypre_sprintf(cycle,"%s","01210");
+            hypre_sprintf(cycle, "%s", "01210");
             break;
+
          case 11:
-            hypre_sprintf(cycle,"%s","013454310");
+            hypre_sprintf(cycle, "%s", "013454310");
             break;
+
          case 12:
-            hypre_sprintf(cycle,"%s","(0+1+3+4+5)");
+            hypre_sprintf(cycle, "%s", "(0+1+3+4+5)");
             break;
+
          case 13:
-            hypre_sprintf(cycle,"%s","034515430");
+            hypre_sprintf(cycle, "%s", "034515430");
             break;
+
          case 14:
-            hypre_sprintf(cycle,"%s","01(+3+4+5)10");
+            hypre_sprintf(cycle, "%s", "01(+3+4+5)10");
             break;
+
          case 20:
-            hypre_sprintf(cycle,"%s","020");
+            hypre_sprintf(cycle, "%s", "020");
             break;
       }
    }
@@ -3589,13 +3959,17 @@ HYPRE_Int hypre_AMSSolve(void *solver,
       {
          hypre_ParVectorCopy(b, ams_data -> r0);
          hypre_ParCSRMatrixMatvec(-1.0, ams_data -> A, x, 1.0, ams_data -> r0);
-         r_norm = sqrt(hypre_ParVectorInnerProd(ams_data -> r0,ams_data -> r0));
+         r_norm = hypre_sqrt(hypre_ParVectorInnerProd(ams_data -> r0, ams_data -> r0));
          r0_norm = r_norm;
-         b_norm = sqrt(hypre_ParVectorInnerProd(b, b));
+         b_norm = hypre_sqrt(hypre_ParVectorInnerProd(b, b));
          if (b_norm)
+         {
             relative_resid = r_norm / b_norm;
+         }
          else
+         {
             relative_resid = r_norm;
+         }
          if (my_id == 0 && ams_data -> print_level > 0)
          {
             hypre_printf("                                            relative\n");
@@ -3630,14 +4004,18 @@ HYPRE_Int hypre_AMSSolve(void *solver,
          old_resid = r_norm;
          hypre_ParVectorCopy(b, ams_data -> r0);
          hypre_ParCSRMatrixMatvec(-1.0, ams_data -> A, x, 1.0, ams_data -> r0);
-         r_norm = sqrt(hypre_ParVectorInnerProd(ams_data -> r0,ams_data -> r0));
+         r_norm = hypre_sqrt(hypre_ParVectorInnerProd(ams_data -> r0, ams_data -> r0));
          if (b_norm)
+         {
             relative_resid = r_norm / b_norm;
+         }
          else
+         {
             relative_resid = r_norm;
+         }
          if (my_id == 0 && ams_data -> print_level > 0)
             hypre_printf("    Cycle %2d   %e    %f     %e \n",
-                         i+1, r_norm, r_norm / old_resid, relative_resid);
+                         i + 1, r_norm, r_norm / old_resid, relative_resid);
       }
 
       if (relative_resid < ams_data -> tol)
@@ -3648,14 +4026,18 @@ HYPRE_Int hypre_AMSSolve(void *solver,
    }
 
    if (my_id == 0 && ams_data -> print_level > 0 && ams_data -> maxit > 1)
+   {
       hypre_printf("\n\n Average Convergence Factor = %f\n\n",
-                   pow((r_norm/r0_norm),(1.0/(HYPRE_Real) i)));
+                   hypre_pow((r_norm / r0_norm), (1.0 / (HYPRE_Real) i)));
+   }
 
    ams_data -> num_iterations = i;
    ams_data -> rel_resid_norm = relative_resid;
 
    if (ams_data -> num_iterations == ams_data -> maxit && ams_data -> tol > 0.0)
+   {
       hypre_error(HYPRE_ERROR_CONV);
+   }
 
    return hypre_error_flag;
 }
@@ -3674,39 +4056,39 @@ HYPRE_Int hypre_AMSSolve(void *solver,
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int hypre_ParCSRSubspacePrec(/* fine space matrix */
-                                   hypre_ParCSRMatrix *A0,
-                                   /* relaxation parameters */
-                                   HYPRE_Int A0_relax_type,
-                                   HYPRE_Int A0_relax_times,
-                                   HYPRE_Real *A0_l1_norms,
-                                   HYPRE_Real A0_relax_weight,
-                                   HYPRE_Real A0_omega,
-                                   HYPRE_Real A0_max_eig_est,
-                                   HYPRE_Real A0_min_eig_est,
-                                   HYPRE_Int A0_cheby_order,
-                                   HYPRE_Real A0_cheby_fraction,
-                                   /* subspace matrices */
-                                   hypre_ParCSRMatrix **A,
-                                   /* subspace preconditioners */
-                                   HYPRE_Solver *B,
-                                   /* hypre solver functions for B */
-                                   HYPRE_PtrToSolverFcn *HB,
-                                   /* subspace interpolations */
-                                   hypre_ParCSRMatrix **P,
-                                   /* temporary subspace vectors */
-                                   hypre_ParVector **r,
-                                   hypre_ParVector **g,
-                                   /* right-hand side */
-                                   hypre_ParVector *x,
-                                   /* current approximation */
-                                   hypre_ParVector *y,
-                                   /* current residual */
-                                   hypre_ParVector *r0,
-                                   /* temporary vector */
-                                   hypre_ParVector *g0,
-                                   char *cycle,
-                                   /* temporary vector */
-                                   hypre_ParVector *z)
+   hypre_ParCSRMatrix *A0,
+   /* relaxation parameters */
+   HYPRE_Int A0_relax_type,
+   HYPRE_Int A0_relax_times,
+   HYPRE_Real *A0_l1_norms,
+   HYPRE_Real A0_relax_weight,
+   HYPRE_Real A0_omega,
+   HYPRE_Real A0_max_eig_est,
+   HYPRE_Real A0_min_eig_est,
+   HYPRE_Int A0_cheby_order,
+   HYPRE_Real A0_cheby_fraction,
+   /* subspace matrices */
+   hypre_ParCSRMatrix **A,
+   /* subspace preconditioners */
+   HYPRE_Solver *B,
+   /* hypre solver functions for B */
+   HYPRE_PtrToSolverFcn *HB,
+   /* subspace interpolations */
+   hypre_ParCSRMatrix **P,
+   /* temporary subspace vectors */
+   hypre_ParVector **r,
+   hypre_ParVector **g,
+   /* right-hand side */
+   hypre_ParVector *x,
+   /* current approximation */
+   hypre_ParVector *y,
+   /* current residual */
+   hypre_ParVector *r0,
+   /* temporary vector */
+   hypre_ParVector *g0,
+   char *cycle,
+   /* temporary vector */
+   hypre_ParVector *z)
 {
    char *op;
    HYPRE_Int use_saved_residual = 0;
@@ -3715,12 +4097,14 @@ HYPRE_Int hypre_ParCSRSubspacePrec(/* fine space matrix */
    {
       /* do nothing */
       if (*op == ')')
+      {
          continue;
+      }
 
       /* compute the residual: r = x - Ay */
       else if (*op == '(')
       {
-         hypre_ParVectorCopy(x,r0);
+         hypre_ParVectorCopy(x, r0);
          hypre_ParCSRMatrixMatvec(-1.0, A0, y, 1.0, r0);
       }
 
@@ -3752,10 +4136,12 @@ HYPRE_Int hypre_ParCSRSubspacePrec(/* fine space matrix */
       {
          HYPRE_Int i = *op - '1';
          if (i < 0)
+         {
             hypre_error_in_arg(16);
+         }
 
          /* skip empty subspaces */
-         if (!A[i]) continue;
+         if (!A[i]) { continue; }
 
          /* compute the residual? */
          if (use_saved_residual)
@@ -3765,7 +4151,7 @@ HYPRE_Int hypre_ParCSRSubspacePrec(/* fine space matrix */
          }
          else
          {
-            hypre_ParVectorCopy(x,g0);
+            hypre_ParVectorCopy(x, g0);
             hypre_ParCSRMatrixMatvec(-1.0, A0, y, 1.0, g0);
             hypre_ParCSRMatrixMatvecT(1.0, P[i], g0, 0.0, r[i]);
          }
@@ -3871,38 +4257,40 @@ HYPRE_Int hypre_AMSConstructDiscreteGradient(hypre_ParCSRMatrix *A,
    /* Construct the local part of G based on edge_vertex and the edge
       and vertex partitionings from A and x_coord */
    {
-      HYPRE_Int i, *I = hypre_CTAlloc(HYPRE_Int,  nedges+1, HYPRE_MEMORY_HOST);
-      HYPRE_Real *data = hypre_CTAlloc(HYPRE_Real,  2*nedges, HYPRE_MEMORY_HOST);
+      HYPRE_Int i, *I = hypre_CTAlloc(HYPRE_Int,  nedges + 1, HYPRE_MEMORY_HOST);
+      HYPRE_Real *data = hypre_CTAlloc(HYPRE_Real,  2 * nedges, HYPRE_MEMORY_HOST);
       hypre_CSRMatrix *local = hypre_CSRMatrixCreate (nedges,
                                                       hypre_ParVectorGlobalSize(x_coord),
-                                                      2*nedges);
+                                                      2 * nedges);
 
       for (i = 0; i <= nedges; i++)
-         I[i] = 2*i;
+      {
+         I[i] = 2 * i;
+      }
 
       if (edge_orientation == 1)
       {
          /* Assume that the edges are already oriented */
-         for (i = 0; i < 2*nedges; i+=2)
+         for (i = 0; i < 2 * nedges; i += 2)
          {
             data[i]   = -1.0;
-            data[i+1] =  1.0;
+            data[i + 1] =  1.0;
          }
       }
       else if (edge_orientation == 2)
       {
          /* Assume that the edge orientation is based on the vertex indexes */
-         for (i = 0; i < 2*nedges; i+=2)
+         for (i = 0; i < 2 * nedges; i += 2)
          {
-            if (edge_vertex[i] < edge_vertex[i+1])
+            if (edge_vertex[i] < edge_vertex[i + 1])
             {
                data[i]   = -1.0;
-               data[i+1] =  1.0;
+               data[i + 1] =  1.0;
             }
             else
             {
                data[i]   =  1.0;
-               data[i+1] = -1.0;
+               data[i + 1] = -1.0;
             }
          }
       }
@@ -3972,17 +4360,21 @@ HYPRE_Int hypre_AMSConstructDiscreteGradient(hypre_ParCSRMatrix *A,
  * be called before hypre_AMSSetup().
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int hypre_AMSFEISetup(void *solver,
-                            hypre_ParCSRMatrix *A,
-                            hypre_ParVector *b,
-                            hypre_ParVector *x,
-                            HYPRE_Int num_vert,
-                            HYPRE_Int num_local_vert,
-                            HYPRE_BigInt *vert_number,
-                            HYPRE_Real *vert_coord,
-                            HYPRE_Int num_edges,
-                            HYPRE_BigInt *edge_vertex)
+HYPRE_Int
+hypre_AMSFEISetup(void *solver,
+                  hypre_ParCSRMatrix *A,
+                  hypre_ParVector *b,
+                  hypre_ParVector *x,
+                  HYPRE_Int num_vert,
+                  HYPRE_Int num_local_vert,
+                  HYPRE_BigInt *vert_number,
+                  HYPRE_Real *vert_coord,
+                  HYPRE_Int num_edges,
+                  HYPRE_BigInt *edge_vertex)
 {
+   HYPRE_UNUSED_VAR(b);
+   HYPRE_UNUSED_VAR(x);
+
    hypre_AMSData *ams_data = (hypre_AMSData *) solver;
 
    HYPRE_Int i, j;
@@ -3992,12 +4384,11 @@ HYPRE_Int hypre_AMSFEISetup(void *solver,
    HYPRE_Real *x_data, *y_data, *z_data;
 
    MPI_Comm comm = hypre_ParCSRMatrixComm(A);
-   HYPRE_BigInt *vert_part, num_global_vert;
+   HYPRE_BigInt vert_part[2], num_global_vert;
    HYPRE_BigInt vert_start, vert_end;
    HYPRE_BigInt big_local_vert = (HYPRE_BigInt) num_local_vert;
 
    /* Find the processor partitioning of the vertices */
-   vert_part = hypre_TAlloc(HYPRE_BigInt, 2, HYPRE_MEMORY_HOST);
    hypre_MPI_Scan(&big_local_vert, &vert_part[1], 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
    vert_part[0] = vert_part[1] - big_local_vert;
    hypre_MPI_Allreduce(&big_local_vert, &num_global_vert, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
@@ -4027,33 +4418,37 @@ HYPRE_Int hypre_AMSFEISetup(void *solver,
       if (vert_number[i] >= vert_start && vert_number[i] <= vert_end)
       {
          j = (HYPRE_Int)(vert_number[i] - vert_start);
-         x_data[j] = vert_coord[3*i];
-         y_data[j] = vert_coord[3*i+1];
-         z_data[j] = vert_coord[3*i+2];
+         x_data[j] = vert_coord[3 * i];
+         y_data[j] = vert_coord[3 * i + 1];
+         z_data[j] = vert_coord[3 * i + 2];
       }
    }
 
    /* Change vertex numbers from local to global */
-   for (i = 0; i < 2*num_edges; i++)
+   for (i = 0; i < 2 * num_edges; i++)
+   {
       edge_vertex[i] = vert_number[edge_vertex[i]];
+   }
 
    /* Construct the local part of G based on edge_vertex */
    {
       /* HYPRE_Int num_edges = hypre_ParCSRMatrixNumRows(A); */
-      HYPRE_Int *I = hypre_CTAlloc(HYPRE_Int,  num_edges+1, HYPRE_MEMORY_HOST);
-      HYPRE_Real *data = hypre_CTAlloc(HYPRE_Real,  2*num_edges, HYPRE_MEMORY_HOST);
+      HYPRE_Int *I = hypre_CTAlloc(HYPRE_Int,  num_edges + 1, HYPRE_MEMORY_HOST);
+      HYPRE_Real *data = hypre_CTAlloc(HYPRE_Real,  2 * num_edges, HYPRE_MEMORY_HOST);
       hypre_CSRMatrix *local = hypre_CSRMatrixCreate (num_edges,
                                                       num_global_vert,
-                                                      2*num_edges);
+                                                      2 * num_edges);
 
       for (i = 0; i <= num_edges; i++)
-         I[i] = 2*i;
+      {
+         I[i] = 2 * i;
+      }
 
       /* Assume that the edge orientation is based on the vertex indexes */
-      for (i = 0; i < 2*num_edges; i+=2)
+      for (i = 0; i < 2 * num_edges; i += 2)
       {
          data[i]   =  1.0;
-         data[i+1] = -1.0;
+         data[i + 1] = -1.0;
       }
 
       hypre_CSRMatrixI(local) = I;
@@ -4100,14 +4495,22 @@ HYPRE_Int hypre_AMSFEIDestroy(void *solver)
    hypre_AMSData *ams_data = (hypre_AMSData *) solver;
 
    if (ams_data -> G)
+   {
       hypre_ParCSRMatrixDestroy(ams_data -> G);
+   }
 
    if (ams_data -> x)
+   {
       hypre_ParVectorDestroy(ams_data -> x);
+   }
    if (ams_data -> y)
+   {
       hypre_ParVectorDestroy(ams_data -> y);
+   }
    if (ams_data -> z)
+   {
       hypre_ParVectorDestroy(ams_data -> z);
+   }
 
    return hypre_error_flag;
 }
@@ -4129,11 +4532,12 @@ HYPRE_Int hypre_AMSFEIDestroy(void *solver)
  * cf_marker is not NULL.
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int hypre_ParCSRComputeL1NormsThreads(hypre_ParCSRMatrix *A,
-                                            HYPRE_Int           option,
-                                            HYPRE_Int           num_threads,
-                                            HYPRE_Int          *cf_marker,
-                                            HYPRE_Real        **l1_norm_ptr)
+HYPRE_Int
+hypre_ParCSRComputeL1NormsThreads(hypre_ParCSRMatrix *A,
+                                  HYPRE_Int           option,
+                                  HYPRE_Int           num_threads,
+                                  HYPRE_Int          *cf_marker,
+                                  HYPRE_Real        **l1_norm_ptr)
 {
    HYPRE_Int i, j, k;
    HYPRE_Int num_rows = hypre_ParCSRMatrixNumRows(A);
@@ -4149,7 +4553,7 @@ HYPRE_Int hypre_ParCSRComputeL1NormsThreads(hypre_ParCSRMatrix *A,
    HYPRE_Real *A_offd_data = hypre_CSRMatrixData(A_offd);
    HYPRE_Int num_cols_offd = hypre_CSRMatrixNumCols(A_offd);
 
-   HYPRE_Real diag;
+   HYPRE_Real diag = 0.0;
    HYPRE_Real *l1_norm = hypre_TAlloc(HYPRE_Real, num_rows, hypre_ParCSRMatrixMemoryLocation(A));
    HYPRE_Int ii, ns, ne, rest, size;
 
@@ -4168,18 +4572,21 @@ HYPRE_Int hypre_ParCSRComputeL1NormsThreads(hypre_ParCSRMatrix *A,
       hypre_ParCSRCommHandle *comm_handle;
 
       if (num_cols_offd)
+      {
          cf_marker_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_offd, HYPRE_MEMORY_HOST);
+      }
       num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
       if (hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends))
          int_buf_data = hypre_CTAlloc(HYPRE_Int,
-                                      hypre_ParCSRCommPkgSendMapStart(comm_pkg,  num_sends), HYPRE_MEMORY_HOST);
+                                      hypre_ParCSRCommPkgSendMapStart(comm_pkg,  num_sends),
+                                      HYPRE_MEMORY_HOST);
       index = 0;
       for (i = 0; i < num_sends; i++)
       {
          start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
          {
-            int_buf_data[index++] = cf_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+            int_buf_data[index++] = cf_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
          }
       }
       comm_handle = hypre_ParCSRCommHandleCreate(11, comm_pkg, int_buf_data,
@@ -4189,21 +4596,21 @@ HYPRE_Int hypre_ParCSRComputeL1NormsThreads(hypre_ParCSRMatrix *A,
    }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i,ii,j,k,ns,ne,rest,size,diag,cf_diag) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i,ii,j,k,ns,ne,rest,size,diag,cf_diag) HYPRE_SMP_SCHEDULE
 #endif
    for (k = 0; k < num_threads; k++)
    {
-      size = num_rows/num_threads;
-      rest = num_rows - size*num_threads;
+      size = num_rows / num_threads;
+      rest = num_rows - size * num_threads;
       if (k < rest)
       {
-         ns = k*size+k;
-         ne = (k+1)*size+k+1;
+         ns = k * size + k;
+         ne = (k + 1) * size + k + 1;
       }
       else
       {
-         ns = k*size+rest;
-         ne = (k+1)*size+rest;
+         ns = k * size + rest;
+         ne = (k + 1) * size + rest;
       }
 
       if (option == 1)
@@ -4214,28 +4621,36 @@ HYPRE_Int hypre_ParCSRComputeL1NormsThreads(hypre_ParCSRMatrix *A,
             if (cf_marker == NULL)
             {
                /* Add the l1 norm of the diag part of the ith row */
-               for (j = A_diag_I[i]; j < A_diag_I[i+1]; j++)
-                  l1_norm[i] += fabs(A_diag_data[j]);
+               for (j = A_diag_I[i]; j < A_diag_I[i + 1]; j++)
+               {
+                  l1_norm[i] += hypre_abs(A_diag_data[j]);
+               }
                /* Add the l1 norm of the offd part of the ith row */
                if (num_cols_offd)
                {
-                  for (j = A_offd_I[i]; j < A_offd_I[i+1]; j++)
-                     l1_norm[i] += fabs(A_offd_data[j]);
+                  for (j = A_offd_I[i]; j < A_offd_I[i + 1]; j++)
+                  {
+                     l1_norm[i] += hypre_abs(A_offd_data[j]);
+                  }
                }
             }
             else
             {
                cf_diag = cf_marker[i];
                /* Add the CF l1 norm of the diag part of the ith row */
-               for (j = A_diag_I[i]; j < A_diag_I[i+1]; j++)
+               for (j = A_diag_I[i]; j < A_diag_I[i + 1]; j++)
                   if (cf_diag == cf_marker[A_diag_J[j]])
-                     l1_norm[i] += fabs(A_diag_data[j]);
+                  {
+                     l1_norm[i] += hypre_abs(A_diag_data[j]);
+                  }
                /* Add the CF l1 norm of the offd part of the ith row */
                if (num_cols_offd)
                {
-                  for (j = A_offd_I[i]; j < A_offd_I[i+1]; j++)
+                  for (j = A_offd_I[i]; j < A_offd_I[i + 1]; j++)
                      if (cf_diag == cf_marker_offd[A_offd_J[j]])
-                        l1_norm[i] += fabs(A_offd_data[j]);
+                     {
+                        l1_norm[i] += hypre_abs(A_offd_data[j]);
+                     }
                }
             }
          }
@@ -4248,36 +4663,46 @@ HYPRE_Int hypre_ParCSRComputeL1NormsThreads(hypre_ParCSRMatrix *A,
             if (cf_marker == NULL)
             {
                /* Add the diagonal and the local off-thread part of the ith row */
-               for (j = A_diag_I[i]; j < A_diag_I[i+1]; j++)
+               for (j = A_diag_I[i]; j < A_diag_I[i + 1]; j++)
                {
                   ii = A_diag_J[j];
                   if (ii == i || ii < ns || ii >= ne)
-                     l1_norm[i] += fabs(A_diag_data[j]);
+                  {
+                     l1_norm[i] += hypre_abs(A_diag_data[j]);
+                  }
                }
                /* Add the l1 norm of the offd part of the ith row */
                if (num_cols_offd)
                {
-                  for (j = A_offd_I[i]; j < A_offd_I[i+1]; j++)
-                     l1_norm[i] += fabs(A_offd_data[j]);
+                  for (j = A_offd_I[i]; j < A_offd_I[i + 1]; j++)
+                  {
+                     l1_norm[i] += hypre_abs(A_offd_data[j]);
+                  }
                }
             }
             else
             {
                cf_diag = cf_marker[i];
                /* Add the diagonal and the local off-thread part of the ith row */
-               for (j = A_diag_I[i]; j < A_diag_I[i+1]; j++)
+               for (j = A_diag_I[i]; j < A_diag_I[i + 1]; j++)
                {
                   ii = A_diag_J[j];
                   if ((ii == i || ii < ns || ii >= ne) &&
                       (cf_diag == cf_marker[A_diag_J[j]]))
-                     l1_norm[i] += fabs(A_diag_data[j]);
+                  {
+                     l1_norm[i] += hypre_abs(A_diag_data[j]);
+                  }
                }
                /* Add the CF l1 norm of the offd part of the ith row */
                if (num_cols_offd)
                {
-                  for (j = A_offd_I[i]; j < A_offd_I[i+1]; j++)
+                  for (j = A_offd_I[i]; j < A_offd_I[i + 1]; j++)
+                  {
                      if (cf_diag == cf_marker_offd[A_offd_J[j]])
-                        l1_norm[i] += fabs(A_offd_data[j]);
+                     {
+                        l1_norm[i] += hypre_abs(A_offd_data[j]);
+                     }
+                  }
                }
             }
          }
@@ -4287,11 +4712,17 @@ HYPRE_Int hypre_ParCSRComputeL1NormsThreads(hypre_ParCSRMatrix *A,
          for (i = ns; i < ne; i++)
          {
             l1_norm[i] = 0.0;
-            for (j = A_diag_I[i]; j < A_diag_I[i+1]; j++)
+            for (j = A_diag_I[i]; j < A_diag_I[i + 1]; j++)
+            {
                l1_norm[i] += A_diag_data[j] * A_diag_data[j];
+            }
             if (num_cols_offd)
-               for (j = A_offd_I[i]; j < A_offd_I[i+1]; j++)
+            {
+               for (j = A_offd_I[i]; j < A_offd_I[i + 1]; j++)
+               {
                   l1_norm[i] += A_offd_data[j] * A_offd_data[j];
+               }
+            }
          }
       }
       else if (option == 4)
@@ -4302,32 +4733,39 @@ HYPRE_Int hypre_ParCSRComputeL1NormsThreads(hypre_ParCSRMatrix *A,
             if (cf_marker == NULL)
             {
                /* Add the diagonal and the local off-thread part of the ith row */
-               for (j = A_diag_I[i]; j < A_diag_I[i+1]; j++)
+               diag = 0.0;
+               for (j = A_diag_I[i]; j < A_diag_I[i + 1]; j++)
                {
                   ii = A_diag_J[j];
                   if (ii == i || ii < ns || ii >= ne)
                   {
                      if (ii == i)
                      {
-                        diag = fabs(A_diag_data[j]);
-                        l1_norm[i] += fabs(A_diag_data[j]);
+                        diag = hypre_abs(A_diag_data[j]);
+                        l1_norm[i] += hypre_abs(A_diag_data[j]);
                      }
                      else
-                        l1_norm[i] += 0.5*fabs(A_diag_data[j]);
+                     {
+                        l1_norm[i] += 0.5 * hypre_abs(A_diag_data[j]);
+                     }
                   }
                }
+
                /* Add the l1 norm of the offd part of the ith row */
                if (num_cols_offd)
                {
-                  for (j = A_offd_I[i]; j < A_offd_I[i+1]; j++)
-                     l1_norm[i] += 0.5*fabs(A_offd_data[j]);
+                  for (j = A_offd_I[i]; j < A_offd_I[i + 1]; j++)
+                  {
+                     l1_norm[i] += 0.5 * hypre_abs(A_offd_data[j]);
+                  }
                }
             }
             else
             {
                cf_diag = cf_marker[i];
                /* Add the diagonal and the local off-thread part of the ith row */
-               for (j = A_diag_I[i]; j < A_diag_I[i+1]; j++)
+               diag = 0.0;
+               for (j = A_diag_I[i]; j < A_diag_I[i + 1]; j++)
                {
                   ii = A_diag_J[j];
                   if ((ii == i || ii < ns || ii >= ne) &&
@@ -4335,35 +4773,116 @@ HYPRE_Int hypre_ParCSRComputeL1NormsThreads(hypre_ParCSRMatrix *A,
                   {
                      if (ii == i)
                      {
-                        diag = fabs(A_diag_data[j]);
-                        l1_norm[i] += fabs(A_diag_data[j]);
+                        diag = hypre_abs(A_diag_data[j]);
+                        l1_norm[i] += hypre_abs(A_diag_data[j]);
                      }
                      else
-                        l1_norm[i] += 0.5*fabs(A_diag_data[j]);
+                     {
+                        l1_norm[i] += 0.5 * hypre_abs(A_diag_data[j]);
+                     }
                   }
                }
+
                /* Add the CF l1 norm of the offd part of the ith row */
                if (num_cols_offd)
                {
-                  for (j = A_offd_I[i]; j < A_offd_I[i+1]; j++)
+                  for (j = A_offd_I[i]; j < A_offd_I[i + 1]; j++)
+                  {
                      if (cf_diag == cf_marker_offd[A_offd_J[j]])
-                        l1_norm[i] += 0.5*fabs(A_offd_data[j]);
+                     {
+                        l1_norm[i] += 0.5 * hypre_abs(A_offd_data[j]);
+                     }
+                  }
                }
             }
 
             /* Truncate according to Remark 6.2 */
-            if (l1_norm[i] <= 4.0/3.0*diag)
+            if (l1_norm[i] <= (4.0 / 3.0) * diag)
+            {
                l1_norm[i] = diag;
+            }
          }
       }
-
       else if (option == 5) /*stores diagonal of A for Jacobi using matvec, rlx 7 */
       {
          /* Set the diag element */
          for (i = ns; i < ne; i++)
          {
             l1_norm[i] =  A_diag_data[A_diag_I[i]];
-            if (l1_norm[i] == 0) l1_norm[i] = 1.0;
+            if (l1_norm[i] == 0) { l1_norm[i] = 1.0; }
+         }
+      }
+      else if (option == 6)
+      {
+         for (i = ns; i < ne; i++)
+         {
+            l1_norm[i] = 0.0;
+
+            if (cf_marker == NULL)
+            {
+               /* Add the diagonal and the local off-thread part of the ith row */
+               diag = 0.0;
+               for (j = A_diag_I[i]; j < A_diag_I[i + 1]; j++)
+               {
+                  ii = A_diag_J[j];
+                  if (ii == i || ii < ns || ii >= ne)
+                  {
+                     if (ii == i)
+                     {
+                        diag = hypre_abs(A_diag_data[j]);
+                     }
+                     else
+                     {
+                        l1_norm[i] += 0.5 * hypre_abs(A_diag_data[j]);
+                     }
+                  }
+               }
+               /* Add the l1 norm of the offd part of the ith row */
+               if (num_cols_offd)
+               {
+                  for (j = A_offd_I[i]; j < A_offd_I[i + 1]; j++)
+                  {
+                     l1_norm[i] += 0.5 * hypre_abs(A_offd_data[j]);
+                  }
+               }
+
+               l1_norm[i] = (diag + l1_norm[i] + hypre_sqrt(diag * diag + l1_norm[i] * l1_norm[i])) * 0.5;
+            }
+            else
+            {
+               cf_diag = cf_marker[i];
+               /* Add the diagonal and the local off-thread part of the ith row */
+               diag = 0.0;
+               for (j = A_diag_I[i]; j < A_diag_I[i + 1]; j++)
+               {
+                  ii = A_diag_J[j];
+                  if ((ii == i || ii < ns || ii >= ne) &&
+                      (cf_diag == cf_marker[A_diag_J[j]]))
+                  {
+                     if (ii == i)
+                     {
+                        diag = hypre_abs(A_diag_data[j]);
+                     }
+                     else
+                     {
+                        l1_norm[i] += 0.5 * hypre_abs(A_diag_data[j]);
+                     }
+                  }
+               }
+               /* Add the CF l1 norm of the offd part of the ith row */
+               if (num_cols_offd)
+               {
+                  for (j = A_offd_I[i]; j < A_offd_I[i + 1]; j++)
+                  {
+                     if (cf_diag == cf_marker_offd[A_offd_J[j]])
+                     {
+                        l1_norm[i] += 0.5 * hypre_abs(A_offd_data[j]);
+                     }
+                  }
+               }
+
+               l1_norm[i] = (diag + l1_norm[i] + hypre_sqrt(diag * diag + l1_norm[i] * l1_norm[i])) * 0.5;
+            }
          }
       }
 
@@ -4372,11 +4891,13 @@ HYPRE_Int hypre_ParCSRComputeL1NormsThreads(hypre_ParCSRMatrix *A,
          /* Handle negative definite matrices */
          for (i = ns; i < ne; i++)
             if (A_diag_data[A_diag_I[i]] < 0)
+            {
                l1_norm[i] = -l1_norm[i];
+            }
 
          for (i = ns; i < ne; i++)
-         /* if (fabs(l1_norm[i]) < DBL_EPSILON) */
-            if (fabs(l1_norm[i]) == 0.0)
+            /* if (hypre_abs(l1_norm[i]) < DBL_EPSILON) */
+            if (hypre_abs(l1_norm[i]) == 0.0)
             {
                hypre_error_in_arg(1);
                break;
diff --git a/external/hypre/src/parcsr_ls/ams.h b/external/hypre/src/parcsr_ls/ams.h
index 3f5d1f84..f03c4bbf 100644
--- a/external/hypre/src/parcsr_ls/ams.h
+++ b/external/hypre/src/parcsr_ls/ams.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -130,6 +130,17 @@ typedef struct
 #define hypre_AMSDataPoissonAlphaAMG(ams_data) ((ams_data)->B_Pi)
 #define hypre_AMSDataOwnsPoissonAlpha(ams_data) ((ams_data)->owns_A_Pi)
 
+/* Vector vertex components data */
+#define hypre_AMSDataPiXInterpolation(ams_data) ((ams_data)->Pix)
+#define hypre_AMSDataPiYInterpolation(ams_data) ((ams_data)->Piy)
+#define hypre_AMSDataPiZInterpolation(ams_data) ((ams_data)->Piz)
+#define hypre_AMSDataPoissonAlphaX(ams_data) ((ams_data)->A_Pix)
+#define hypre_AMSDataPoissonAlphaY(ams_data) ((ams_data)->A_Piy)
+#define hypre_AMSDataPoissonAlphaZ(ams_data) ((ams_data)->A_Piz)
+#define hypre_AMSDataPoissonAlphaXAMG(ams_data) ((ams_data)->B_Pix)
+#define hypre_AMSDataPoissonAlphaYAMG(ams_data) ((ams_data)->B_Piy)
+#define hypre_AMSDataPoissonAlphaZAMG(ams_data) ((ams_data)->B_Piz)
+
 /* Coordinates of the vertices */
 #define hypre_AMSDataVertexCoordinateX(ams_data) ((ams_data)->x)
 #define hypre_AMSDataVertexCoordinateY(ams_data) ((ams_data)->y)
@@ -140,6 +151,14 @@ typedef struct
 #define hypre_AMSDataEdgeConstantY(ams_data) ((ams_data)->Gy)
 #define hypre_AMSDataEdgeConstantZ(ams_data) ((ams_data)->Gz)
 
+/* Interior zero conductivity region */
+#define hypre_AMSDataInteriorNodes(ams_data) ((ams_data)->interior_nodes)
+#define hypre_AMSDataInteriorDiscreteGradient(ams_data) ((ams_data)->G0)
+#define hypre_AMSDataInteriorPoissonBeta(ams_data) ((ams_data)->A_G0)
+#define hypre_AMSDataInteriorPoissonBetaAMG(ams_data) ((ams_data)->B_G0)
+#define hypre_AMSDataInteriorProjectionFrequency(ams_data) ((ams_data)->projection_frequency)
+#define hypre_AMSDataInteriorSolveCounter(ams_data) ((ams_data)->solve_counter)
+
 /* Solver options */
 #define hypre_AMSDataMaxIter(ams_data) ((ams_data)->maxit)
 #define hypre_AMSDataTol(ams_data) ((ams_data)->tol)
@@ -157,15 +176,21 @@ typedef struct
 #define hypre_AMSDataAChebyOrder(ams_data) ((ams_data)->A_cheby_order)
 #define hypre_AMSDataAChebyFraction(ams_data) ((ams_data)->A_cheby_fraction)
 
-#define hypre_AMSDataPoissonAlphaAMGCoarsenType(ams_data) ((ams_data)->B_Pi_coarsen_type)
-#define hypre_AMSDataPoissonAlphaAMGAggLevels(ams_data) ((ams_data)->B_Pi_agg_levels)
-#define hypre_AMSDataPoissonAlphaAMGRelaxType(ams_data) ((ams_data)->B_Pi_relax_type)
-#define hypre_AMSDataPoissonAlphaAMGStrengthThreshold(ams_data) ((ams_data)->B_Pi_theta)
-
 #define hypre_AMSDataPoissonBetaAMGCoarsenType(ams_data) ((ams_data)->B_G_coarsen_type)
 #define hypre_AMSDataPoissonBetaAMGAggLevels(ams_data) ((ams_data)->B_G_agg_levels)
 #define hypre_AMSDataPoissonBetaAMGRelaxType(ams_data) ((ams_data)->B_G_relax_type)
+#define hypre_AMSDataPoissonBetaAMGCoarseRelaxType(ams_data) ((ams_data)->B_G_coarse_relax_type)
 #define hypre_AMSDataPoissonBetaAMGStrengthThreshold(ams_data) ((ams_data)->B_G_theta)
+#define hypre_AMSDataPoissonBetaAMGInterpType(ams_data) ((ams_data)->B_G_interp_type)
+#define hypre_AMSDataPoissonBetaAMGPMax(ams_data) ((ams_data)->B_G_Pmax)
+
+#define hypre_AMSDataPoissonAlphaAMGCoarsenType(ams_data) ((ams_data)->B_Pi_coarsen_type)
+#define hypre_AMSDataPoissonAlphaAMGAggLevels(ams_data) ((ams_data)->B_Pi_agg_levels)
+#define hypre_AMSDataPoissonAlphaAMGRelaxType(ams_data) ((ams_data)->B_Pi_relax_type)
+#define hypre_AMSDataPoissonAlphaAMGCoarseRelaxType(ams_data) ((ams_data)->B_Pi_coarse_relax_type)
+#define hypre_AMSDataPoissonAlphaAMGStrengthThreshold(ams_data) ((ams_data)->B_Pi_theta)
+#define hypre_AMSDataPoissonAlphaAMGInterpType(ams_data) ((ams_data)->B_Pi_interp_type)
+#define hypre_AMSDataPoissonAlphaAMGPMax(ams_data) ((ams_data)->B_Pi_Pmax)
 
 /* Temporary vectors */
 #define hypre_AMSDataTempEdgeVectorR(ams_data) ((ams_data)->r0)
@@ -174,5 +199,10 @@ typedef struct
 #define hypre_AMSDataTempVertexVectorG(ams_data) ((ams_data)->g1)
 #define hypre_AMSDataTempVecVertexVectorR(ams_data) ((ams_data)->r2)
 #define hypre_AMSDataTempVecVertexVectorG(ams_data) ((ams_data)->g2)
+#define hypre_AMSDataTempVecVertexVectorZZ(ams_data) ((ams_data)->zz)
+
+/* Output log info */
+#define hypre_AMSDataNumIterations(ams_data) ((ams_data)->num_iterations)
+#define hypre_AMSDataResidualNorm(ams_data) ((ams_data)->rel_resid_norm)
 
 #endif
diff --git a/external/hypre/src/parcsr_ls/aux_interp.c b/external/hypre/src/parcsr_ls/aux_interp.c
index 4c1a61c6..c102bcbd 100644
--- a/external/hypre/src/parcsr_ls/aux_interp.c
+++ b/external/hypre/src/parcsr_ls/aux_interp.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -19,656 +19,765 @@
    offd nodes from comm_pkg take up first chunk of CF_marker_offd, offd
    nodes from extend_comm_pkg take up the second chunk of CF_marker_offd. */
 
-
-
-HYPRE_Int hypre_alt_insert_new_nodes(hypre_ParCSRCommPkg *comm_pkg,
-                          hypre_ParCSRCommPkg *extend_comm_pkg,
-                          HYPRE_Int *IN_marker,
-                          HYPRE_Int full_off_procNodes,
-                          HYPRE_Int *OUT_marker)
+HYPRE_Int
+hypre_alt_insert_new_nodes(hypre_ParCSRCommPkg  *comm_pkg,
+                           hypre_ParCSRCommPkg  *extend_comm_pkg,
+                           HYPRE_Int            *IN_marker,
+                           HYPRE_Int             full_off_procNodes,
+                           HYPRE_Int            *OUT_marker)
 {
-  hypre_ParCSRCommHandle  *comm_handle;
-
-  HYPRE_Int i, index, shift;
-
-  HYPRE_Int num_sends, num_recvs;
-
-  HYPRE_Int *recv_vec_starts;
+   HYPRE_UNUSED_VAR(full_off_procNodes);
 
-  HYPRE_Int e_num_sends;
+   hypre_ParCSRCommHandle  *comm_handle;
 
-  HYPRE_Int *int_buf_data;
-  HYPRE_Int *e_out_marker;
+   HYPRE_Int  i, index, shift;
+   HYPRE_Int  num_sends, num_recvs;
+   HYPRE_Int *recv_vec_starts;
+   HYPRE_Int  e_num_sends;
+   HYPRE_Int *int_buf_data;
+   HYPRE_Int *e_out_marker;
 
+   num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
+   num_recvs =  hypre_ParCSRCommPkgNumRecvs(comm_pkg);
+   recv_vec_starts = hypre_ParCSRCommPkgRecvVecStarts(comm_pkg);
 
-  num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
-  num_recvs =  hypre_ParCSRCommPkgNumRecvs(comm_pkg);
-  recv_vec_starts = hypre_ParCSRCommPkgRecvVecStarts(comm_pkg);
+   e_num_sends = hypre_ParCSRCommPkgNumSends(extend_comm_pkg);
 
-  e_num_sends = hypre_ParCSRCommPkgNumSends(extend_comm_pkg);
 
+   index = hypre_max(hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                     hypre_ParCSRCommPkgSendMapStart(extend_comm_pkg, e_num_sends));
 
-  index = hypre_max(hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
-                    hypre_ParCSRCommPkgSendMapStart(extend_comm_pkg, e_num_sends));
+   int_buf_data = hypre_CTAlloc(HYPRE_Int,  index, HYPRE_MEMORY_HOST);
 
-  int_buf_data = hypre_CTAlloc(HYPRE_Int,  index, HYPRE_MEMORY_HOST);
+   /* orig commpkg data*/
+   index = 0;
 
-  /* orig commpkg data*/
-  index = 0;
-
-  HYPRE_Int begin = hypre_ParCSRCommPkgSendMapStart(comm_pkg, 0);
-  HYPRE_Int end = hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends);
+   HYPRE_Int begin = hypre_ParCSRCommPkgSendMapStart(comm_pkg, 0);
+   HYPRE_Int end = hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends);
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for HYPRE_SMP_SCHEDULE
 #endif
-  for (i = begin; i < end; ++i) {
-     int_buf_data[i - begin] =
-           IN_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, i)];
-  }
+   for (i = begin; i < end; ++i)
+   {
+      int_buf_data[i - begin] =
+         IN_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, i)];
+   }
 
-  comm_handle = hypre_ParCSRCommHandleCreate( 11, comm_pkg, int_buf_data,
-                                              OUT_marker);
+   comm_handle = hypre_ParCSRCommHandleCreate( 11, comm_pkg, int_buf_data,
+                                               OUT_marker);
 
-  hypre_ParCSRCommHandleDestroy(comm_handle);
-  comm_handle = NULL;
+   hypre_ParCSRCommHandleDestroy(comm_handle);
+   comm_handle = NULL;
 
-  /* now do the extend commpkg */
+   /* now do the extend commpkg */
 
-  /* first we need to shift our position in the OUT_marker */
-  shift = recv_vec_starts[num_recvs];
-  e_out_marker = OUT_marker + shift;
+   /* first we need to shift our position in the OUT_marker */
+   shift = recv_vec_starts[num_recvs];
+   e_out_marker = OUT_marker + shift;
 
-  index = 0;
+   index = 0;
 
-  begin = hypre_ParCSRCommPkgSendMapStart(extend_comm_pkg, 0);
-  end = hypre_ParCSRCommPkgSendMapStart(extend_comm_pkg, e_num_sends);
+   begin = hypre_ParCSRCommPkgSendMapStart(extend_comm_pkg, 0);
+   end = hypre_ParCSRCommPkgSendMapStart(extend_comm_pkg, e_num_sends);
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for HYPRE_SMP_SCHEDULE
 #endif
-  for (i = begin; i < end; ++i) {
-     int_buf_data[i - begin] =
-           IN_marker[hypre_ParCSRCommPkgSendMapElmt(extend_comm_pkg, i)];
-  }
+   for (i = begin; i < end; ++i)
+   {
+      int_buf_data[i - begin] =
+         IN_marker[hypre_ParCSRCommPkgSendMapElmt(extend_comm_pkg, i)];
+   }
 
-  comm_handle = hypre_ParCSRCommHandleCreate( 11, extend_comm_pkg, int_buf_data,
-                                              e_out_marker);
+   comm_handle = hypre_ParCSRCommHandleCreate( 11, extend_comm_pkg, int_buf_data,
+                                               e_out_marker);
 
-  hypre_ParCSRCommHandleDestroy(comm_handle);
-  comm_handle = NULL;
+   hypre_ParCSRCommHandleDestroy(comm_handle);
+   comm_handle = NULL;
 
-  hypre_TFree(int_buf_data, HYPRE_MEMORY_HOST);
+   hypre_TFree(int_buf_data, HYPRE_MEMORY_HOST);
 
-  return hypre_error_flag;
+   return hypre_error_flag;
 }
 
-HYPRE_Int hypre_big_insert_new_nodes(hypre_ParCSRCommPkg *comm_pkg,
-                          hypre_ParCSRCommPkg *extend_comm_pkg,
-                          HYPRE_Int *IN_marker,
-                          HYPRE_Int full_off_procNodes,
-                          HYPRE_BigInt offset,
-                          HYPRE_BigInt *OUT_marker)
-{
-  hypre_ParCSRCommHandle  *comm_handle;
-
-  HYPRE_Int i, index, shift;
-
-  HYPRE_Int num_sends, num_recvs;
-
-  HYPRE_Int *recv_vec_starts;
-
-  HYPRE_Int e_num_sends;
-
-  HYPRE_BigInt *int_buf_data;
-  HYPRE_BigInt *e_out_marker;
+/*--------------------------------------------------------------------------
+ * hypre_big_insert_new_nodes
+ *--------------------------------------------------------------------------*/
 
+HYPRE_Int
+hypre_big_insert_new_nodes(hypre_ParCSRCommPkg  *comm_pkg,
+                           hypre_ParCSRCommPkg  *extend_comm_pkg,
+                           HYPRE_Int            *IN_marker,
+                           HYPRE_Int             full_off_procNodes,
+                           HYPRE_BigInt          offset,
+                           HYPRE_BigInt         *OUT_marker)
+{
+   HYPRE_UNUSED_VAR(full_off_procNodes);
 
-  num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
-  num_recvs =  hypre_ParCSRCommPkgNumRecvs(comm_pkg);
-  recv_vec_starts = hypre_ParCSRCommPkgRecvVecStarts(comm_pkg);
+   hypre_ParCSRCommHandle  *comm_handle;
 
-  e_num_sends = hypre_ParCSRCommPkgNumSends(extend_comm_pkg);
+   HYPRE_Int                i, index, shift;
+   HYPRE_Int                num_sends, num_recvs;
+   HYPRE_Int               *recv_vec_starts;
+   HYPRE_Int                e_num_sends;
+   HYPRE_BigInt            *int_buf_data;
+   HYPRE_BigInt            *e_out_marker;
 
+   num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
+   num_recvs =  hypre_ParCSRCommPkgNumRecvs(comm_pkg);
+   recv_vec_starts = hypre_ParCSRCommPkgRecvVecStarts(comm_pkg);
 
-  index = hypre_max(hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
-                    hypre_ParCSRCommPkgSendMapStart(extend_comm_pkg, e_num_sends));
+   e_num_sends = hypre_ParCSRCommPkgNumSends(extend_comm_pkg);
 
-  int_buf_data = hypre_CTAlloc(HYPRE_BigInt,  index, HYPRE_MEMORY_HOST);
+   index = hypre_max(hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                     hypre_ParCSRCommPkgSendMapStart(extend_comm_pkg, e_num_sends));
+   int_buf_data = hypre_CTAlloc(HYPRE_BigInt,  index, HYPRE_MEMORY_HOST);
 
-  /* orig commpkg data*/
-  index = 0;
+   /* orig commpkg data*/
+   index = 0;
 
-  HYPRE_Int begin = hypre_ParCSRCommPkgSendMapStart(comm_pkg, 0);
-  HYPRE_Int end = hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends);
+   HYPRE_Int begin = hypre_ParCSRCommPkgSendMapStart(comm_pkg, 0);
+   HYPRE_Int end = hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends);
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for HYPRE_SMP_SCHEDULE
 #endif
-  for (i = begin; i < end; ++i) {
-     int_buf_data[i - begin] = offset +
-           (HYPRE_BigInt) IN_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, i)];
-  }
-
-  comm_handle = hypre_ParCSRCommHandleCreate( 21, comm_pkg, int_buf_data,
-                                              OUT_marker);
+   for (i = begin; i < end; ++i)
+   {
+      int_buf_data[i - begin] = offset +
+                                (HYPRE_BigInt) IN_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, i)];
+   }
 
-  hypre_ParCSRCommHandleDestroy(comm_handle);
-  comm_handle = NULL;
+   comm_handle = hypre_ParCSRCommHandleCreate(21, comm_pkg, int_buf_data, OUT_marker);
 
-  /* now do the extend commpkg */
+   hypre_ParCSRCommHandleDestroy(comm_handle);
+   comm_handle = NULL;
 
-  /* first we need to shift our position in the OUT_marker */
-  shift = recv_vec_starts[num_recvs];
-  e_out_marker = OUT_marker + shift;
+   /* now do the extend commpkg */
 
-  index = 0;
+   /* first we need to shift our position in the OUT_marker */
+   shift = recv_vec_starts[num_recvs];
+   e_out_marker = OUT_marker + shift;
 
-  begin = hypre_ParCSRCommPkgSendMapStart(extend_comm_pkg, 0);
-  end = hypre_ParCSRCommPkgSendMapStart(extend_comm_pkg, e_num_sends);
+   index = 0;
+   begin = hypre_ParCSRCommPkgSendMapStart(extend_comm_pkg, 0);
+   end   = hypre_ParCSRCommPkgSendMapStart(extend_comm_pkg, e_num_sends);
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for HYPRE_SMP_SCHEDULE
 #endif
-  for (i = begin; i < end; ++i) {
-     int_buf_data[i - begin] = offset +
-           (HYPRE_BigInt) IN_marker[hypre_ParCSRCommPkgSendMapElmt(extend_comm_pkg, i)];
-  }
+   for (i = begin; i < end; ++i)
+   {
+      int_buf_data[i - begin] = offset +
+                                (HYPRE_BigInt) IN_marker[hypre_ParCSRCommPkgSendMapElmt(extend_comm_pkg, i)];
+   }
 
-  comm_handle = hypre_ParCSRCommHandleCreate( 21, extend_comm_pkg, int_buf_data,
-                                              e_out_marker);
+   comm_handle = hypre_ParCSRCommHandleCreate( 21, extend_comm_pkg, int_buf_data,
+                                               e_out_marker);
 
-  hypre_ParCSRCommHandleDestroy(comm_handle);
-  comm_handle = NULL;
+   hypre_ParCSRCommHandleDestroy(comm_handle);
+   comm_handle = NULL;
 
-  hypre_TFree(int_buf_data, HYPRE_MEMORY_HOST);
+   hypre_TFree(int_buf_data, HYPRE_MEMORY_HOST);
 
-  return hypre_error_flag;
+   return hypre_error_flag;
 }
 
-/* sort for non-ordered arrays */
-HYPRE_Int hypre_ssort(HYPRE_BigInt *data, HYPRE_Int n)
+/*--------------------------------------------------------------------------
+ * hypre_ssort
+ *
+ * Sort for non-ordered arrays
+ *
+ * TODO (VPM): move this to utilities?
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ssort(HYPRE_BigInt *data,
+            HYPRE_Int     n)
 {
-  HYPRE_Int i,si;
-  HYPRE_Int change = 0;
+   HYPRE_Int i, si;
+   HYPRE_Int change = 0;
 
-  if(n > 0)
-    for(i = n-1; i > 0; i--){
-      si = hypre_index_of_minimum(data,i+1);
-      if(i != si)
+   if (n > 0)
+   {
+      for (i = n - 1; i > 0; i--)
       {
-         hypre_swap_int(data, i, si);
-         change = 1;
+         si = hypre_index_of_minimum(data, i + 1);
+         if (i != si)
+         {
+            hypre_swap_int(data, i, si);
+            change = 1;
+         }
       }
-    }
-  return change;
+   }
+
+   return change;
 }
 
-/* Auxilary function for hypre_ssort */
-HYPRE_Int hypre_index_of_minimum(HYPRE_BigInt *data, HYPRE_Int n)
+/*--------------------------------------------------------------------------
+ * hypre_index_of_minimum
+ *
+ * TODO (VPM): move this to utilities?
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_index_of_minimum(HYPRE_BigInt *data,
+                       HYPRE_Int     n)
 {
-  HYPRE_Int answer;
-  HYPRE_Int i;
+   HYPRE_Int answer;
+   HYPRE_Int i;
 
-  answer = 0;
-  for(i = 1; i < n; i++)
-    if(data[answer] < data[i])
-      answer = i;
+   answer = 0;
+   for (i = 1; i < n; i++)
+   {
+      if (data[answer] < data[i])
+      {
+         answer = i;
+      }
+   }
 
-  return answer;
+   return answer;
 }
 
-void hypre_swap_int(HYPRE_BigInt *data, HYPRE_Int a, HYPRE_Int b)
+/*--------------------------------------------------------------------------
+ * hypre_swap_int
+ *
+ * TODO (VPM): move this to utilities?
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_swap_int(HYPRE_BigInt *data,
+               HYPRE_Int     a,
+               HYPRE_Int     b)
 {
-  HYPRE_BigInt temp;
+   HYPRE_BigInt temp;
 
-  temp = data[a];
-  data[a] = data[b];
-  data[b] = temp;
+   temp    = data[a];
+   data[a] = data[b];
+   data[b] = temp;
 
-  return;
+   return;
 }
 
-/* Initialize CF_marker_offd, CF_marker, P_marker, P_marker_offd, tmp */
-void hypre_initialize_vecs(HYPRE_Int diag_n, HYPRE_Int offd_n, HYPRE_Int *diag_ftc, HYPRE_BigInt *offd_ftc,
-                           HYPRE_Int *diag_pm, HYPRE_Int *offd_pm, HYPRE_Int *tmp_CF)
+/*--------------------------------------------------------------------------
+ * hypre_initialize_vecs
+ *
+ * Initialize CF_marker_offd, CF_marker, P_marker, P_marker_offd, tmp
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_initialize_vecs(HYPRE_Int     diag_n,
+                      HYPRE_Int     offd_n,
+                      HYPRE_Int    *diag_ftc,
+                      HYPRE_BigInt *offd_ftc,
+                      HYPRE_Int    *diag_pm,
+                      HYPRE_Int    *offd_pm,
+                      HYPRE_Int    *tmp_CF)
 {
-  HYPRE_Int i;
+   HYPRE_Int i;
 
-  /* Quicker initialization */
-  if(offd_n < diag_n)
-  {
+   /* Quicker initialization */
+   if (offd_n < diag_n)
+   {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for HYPRE_SMP_SCHEDULE
 #endif
-    for(i = 0; i < offd_n; i++)
-    {
-      diag_ftc[i] = -1;
-      offd_ftc[i] = -1;
-      tmp_CF[i] = -1;
-      if(diag_pm != NULL)
-      {  diag_pm[i] = -1; }
-      if(offd_pm != NULL)
-      {  offd_pm[i] = -1;}
-    }
+      for (i = 0; i < offd_n; i++)
+      {
+         diag_ftc[i] = -1;
+         offd_ftc[i] = -1;
+         tmp_CF[i]   = -1;
+         if (diag_pm != NULL)
+         {
+            diag_pm[i] = -1;
+         }
+         if (offd_pm != NULL)
+         {
+            offd_pm[i] = -1;
+         }
+      }
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for HYPRE_SMP_SCHEDULE
 #endif
-    for(i = offd_n; i < diag_n; i++)
-    {
-      diag_ftc[i] = -1;
-      if(diag_pm != NULL)
-      {  diag_pm[i] = -1; }
-    }
-  }
-  else
-  {
+      for (i = offd_n; i < diag_n; i++)
+      {
+         diag_ftc[i] = -1;
+         if (diag_pm != NULL)
+         {
+            diag_pm[i] = -1;
+         }
+      }
+   }
+   else
+   {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for HYPRE_SMP_SCHEDULE
 #endif
-    for(i = 0; i < diag_n; i++)
-    {
-      diag_ftc[i] = -1;
-      offd_ftc[i] = -1;
-      tmp_CF[i] = -1;
-      if(diag_pm != NULL)
-      {  diag_pm[i] = -1;}
-      if(offd_pm != NULL)
-      {  offd_pm[i] = -1;}
-    }
+      for (i = 0; i < diag_n; i++)
+      {
+         diag_ftc[i] = -1;
+         offd_ftc[i] = -1;
+         tmp_CF[i] = -1;
+         if (diag_pm != NULL)
+         {
+            diag_pm[i] = -1;
+         }
+         if (offd_pm != NULL)
+         {
+            offd_pm[i] = -1;
+         }
+      }
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for HYPRE_SMP_SCHEDULE
 #endif
-    for(i = diag_n; i < offd_n; i++)
-    {
-      offd_ftc[i] = -1;
-      tmp_CF[i] = -1;
-      if(offd_pm != NULL)
-      {  offd_pm[i] = -1;}
-    }
-  }
-  return;
+      for (i = diag_n; i < offd_n; i++)
+      {
+         offd_ftc[i] = -1;
+         tmp_CF[i] = -1;
+         if (offd_pm != NULL)
+         {
+            offd_pm[i] = -1;
+         }
+      }
+   }
+   return;
 }
 
-/* Find nodes that are offd and are not contained in original offd
- * (neighbors of neighbors) */
-static HYPRE_Int hypre_new_offd_nodes(HYPRE_BigInt **found, HYPRE_Int num_cols_A_offd,
-       HYPRE_Int *A_ext_i, HYPRE_BigInt *A_ext_j,
-       HYPRE_Int num_cols_S_offd, HYPRE_BigInt *col_map_offd, HYPRE_BigInt col_1,
-       HYPRE_BigInt col_n, HYPRE_Int *Sop_i, HYPRE_BigInt *Sop_j,
-       HYPRE_Int *CF_marker_offd)
+/*--------------------------------------------------------------------------
+ * hypre_new_offd_nodes
+ *
+ * Find nodes that are offd and are not contained in original offd
+ * (neighbors of neighbors)
+ *--------------------------------------------------------------------------*/
+
+static HYPRE_Int
+hypre_new_offd_nodes(HYPRE_BigInt **found,
+                     HYPRE_Int      num_cols_A_offd,
+                     HYPRE_Int     *A_ext_i,
+                     HYPRE_BigInt  *A_ext_j,
+                     HYPRE_Int      num_cols_S_offd,
+                     HYPRE_BigInt  *col_map_offd,
+                     HYPRE_BigInt   col_1,
+                     HYPRE_BigInt   col_n,
+                     HYPRE_Int     *Sop_i,
+                     HYPRE_BigInt  *Sop_j,
+                     HYPRE_Int     *CF_marker_offd)
 {
+   HYPRE_UNUSED_VAR(num_cols_S_offd);
+
 #ifdef HYPRE_PROFILE
-  hypre_profile_times[HYPRE_TIMER_ID_RENUMBER_COLIDX] -= hypre_MPI_Wtime();
+   hypre_profile_times[HYPRE_TIMER_ID_RENUMBER_COLIDX] -= hypre_MPI_Wtime();
 #endif
 
-  HYPRE_BigInt big_i1, big_k1;
-  HYPRE_Int i, j, kk;
-  HYPRE_Int got_loc, loc_col;
+   HYPRE_BigInt big_i1, big_k1;
+   HYPRE_Int i, j, kk;
+   HYPRE_Int got_loc, loc_col;
 
-  /*HYPRE_Int min;*/
-  HYPRE_Int newoff = 0;
+   /*HYPRE_Int min;*/
+   HYPRE_Int newoff = 0;
 
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-  hypre_UnorderedBigIntMap col_map_offd_inverse;
-  hypre_UnorderedBigIntMapCreate(&col_map_offd_inverse, 2*num_cols_A_offd, 16*hypre_NumThreads());
-
-#pragma omp parallel for HYPRE_SMP_SCHEDULE
-  for (i = 0; i < num_cols_A_offd; i++)
-  {
-     hypre_UnorderedBigIntMapPutIfAbsent(&col_map_offd_inverse, col_map_offd[i], i);
-  }
-
-  /* Find nodes that will be added to the off diag list */
-  HYPRE_Int size_offP = A_ext_i[num_cols_A_offd];
-  hypre_UnorderedBigIntSet set;
-  hypre_UnorderedBigIntSetCreate(&set, size_offP, 16*hypre_NumThreads());
-
-#pragma omp parallel private(i,j,big_i1)
-  {
-#pragma omp for HYPRE_SMP_SCHEDULE
-    for (i = 0; i < num_cols_A_offd; i++)
-    {
-     if (CF_marker_offd[i] < 0)
-     {
-      for (j = A_ext_i[i]; j < A_ext_i[i+1]; j++)
-      {
-        big_i1 = A_ext_j[j];
-        if(big_i1 < col_1 || big_i1 >= col_n)
-        {
-          if (!hypre_UnorderedBigIntSetContains(&set, big_i1))
-          {
-            HYPRE_Int k = hypre_UnorderedBigIntMapGet(&col_map_offd_inverse, big_i1);
-            if (-1 == k)
-            {
-               hypre_UnorderedBigIntSetPut(&set, big_i1);
-            }
-            else
-            {
-               A_ext_j[j] = -k - 1;
-            }
-          }
-        }
-      }
-      for (j = Sop_i[i]; j < Sop_i[i+1]; j++)
+   hypre_UnorderedBigIntMap col_map_offd_inverse;
+   hypre_UnorderedBigIntMapCreate(&col_map_offd_inverse,
+                                  2 * num_cols_A_offd,
+                                  16 * hypre_NumThreads());
+
+   #pragma omp parallel for HYPRE_SMP_SCHEDULE
+   for (i = 0; i < num_cols_A_offd; i++)
+   {
+      hypre_UnorderedBigIntMapPutIfAbsent(&col_map_offd_inverse, col_map_offd[i], i);
+   }
+
+   /* Find nodes that will be added to the off diag list */
+   HYPRE_Int size_offP = A_ext_i[num_cols_A_offd];
+   hypre_UnorderedBigIntSet set;
+   hypre_UnorderedBigIntSetCreate(&set, size_offP, 16 * hypre_NumThreads());
+
+   #pragma omp parallel private(i,j,big_i1)
+   {
+      #pragma omp for HYPRE_SMP_SCHEDULE
+      for (i = 0; i < num_cols_A_offd; i++)
       {
-        big_i1 = Sop_j[j];
-        if(big_i1 < col_1 || big_i1 >= col_n)
-        {
-          if (!hypre_UnorderedBigIntSetContains(&set, big_i1))
-          {
-            HYPRE_Int k = hypre_UnorderedBigIntMapGet(&col_map_offd_inverse, big_i1);
-            if (-1 == k)
+         if (CF_marker_offd[i] < 0)
+         {
+            for (j = A_ext_i[i]; j < A_ext_i[i + 1]; j++)
             {
-               hypre_UnorderedBigIntSetPut(&set, big_i1);
+               big_i1 = A_ext_j[j];
+               if (big_i1 < col_1 || big_i1 >= col_n)
+               {
+                  if (!hypre_UnorderedBigIntSetContains(&set, big_i1))
+                  {
+                     HYPRE_Int k = hypre_UnorderedBigIntMapGet(&col_map_offd_inverse, big_i1);
+                     if (-1 == k)
+                     {
+                        hypre_UnorderedBigIntSetPut(&set, big_i1);
+                     }
+                     else
+                     {
+                        A_ext_j[j] = -k - 1;
+                     }
+                  }
+               }
             }
-            else
+            for (j = Sop_i[i]; j < Sop_i[i + 1]; j++)
             {
-               Sop_j[j] = -k - 1;
+               big_i1 = Sop_j[j];
+               if (big_i1 < col_1 || big_i1 >= col_n)
+               {
+                  if (!hypre_UnorderedBigIntSetContains(&set, big_i1))
+                  {
+                     HYPRE_Int k = hypre_UnorderedBigIntMapGet(&col_map_offd_inverse, big_i1);
+                     if (-1 == k)
+                     {
+                        hypre_UnorderedBigIntSetPut(&set, big_i1);
+                     }
+                     else
+                     {
+                        Sop_j[j] = -k - 1;
+                     }
+                  }
+               }
             }
-          }
-        }
-      }
-     } /* CF_marker_offd[i] < 0 */
-    } /* for each row */
-  } /* omp parallel */
+         } /* CF_marker_offd[i] < 0 */
+      } /* for each row */
+   } /* omp parallel */
 
-  hypre_UnorderedBigIntMapDestroy(&col_map_offd_inverse);
-  HYPRE_BigInt *tmp_found = hypre_UnorderedBigIntSetCopyToArray(&set, &newoff);
-  hypre_UnorderedBigIntSetDestroy(&set);
+   hypre_UnorderedBigIntMapDestroy(&col_map_offd_inverse);
+   HYPRE_BigInt *tmp_found = hypre_UnorderedBigIntSetCopyToArray(&set, &newoff);
+   hypre_UnorderedBigIntSetDestroy(&set);
 
-  /* Put found in monotone increasing order */
+   /* Put found in monotone increasing order */
 #ifdef HYPRE_PROFILE
-  hypre_profile_times[HYPRE_TIMER_ID_MERGE] -= hypre_MPI_Wtime();
+   hypre_profile_times[HYPRE_TIMER_ID_MERGE] -= hypre_MPI_Wtime();
 #endif
 
-  hypre_UnorderedBigIntMap tmp_found_inverse;
-  if (newoff > 0)
-  {
-    hypre_big_sort_and_create_inverse_map(tmp_found, newoff, &tmp_found, &tmp_found_inverse);
-  }
+   hypre_UnorderedBigIntMap tmp_found_inverse;
+   if (newoff > 0)
+   {
+      hypre_big_sort_and_create_inverse_map(tmp_found, newoff, &tmp_found, &tmp_found_inverse);
+   }
 
 #ifdef HYPRE_PROFILE
-  hypre_profile_times[HYPRE_TIMER_ID_MERGE] += hypre_MPI_Wtime();
+   hypre_profile_times[HYPRE_TIMER_ID_MERGE] += hypre_MPI_Wtime();
 #endif
 
-  /* Set column indices for Sop and A_ext such that offd nodes are
-   * negatively indexed */
-#pragma omp parallel for private(kk,big_k1,got_loc,loc_col) HYPRE_SMP_SCHEDULE
-  for(i = 0; i < num_cols_A_offd; i++)
-  {
-   if (CF_marker_offd[i] < 0)
+   /* Set column indices for Sop and A_ext such that offd nodes are
+    * negatively indexed */
+   #pragma omp parallel for private(kk,big_k1,got_loc,loc_col) HYPRE_SMP_SCHEDULE
+   for (i = 0; i < num_cols_A_offd; i++)
    {
-     for(kk = Sop_i[i]; kk < Sop_i[i+1]; kk++)
-     {
-       big_k1 = Sop_j[kk];
-       if(big_k1 > -1 && (big_k1 < col_1 || big_k1 >= col_n))
-       {
-         got_loc = hypre_UnorderedBigIntMapGet(&tmp_found_inverse, big_k1);
-         loc_col = got_loc + num_cols_A_offd;
-         Sop_j[kk] = (HYPRE_BigInt)(-loc_col - 1);
-       }
-     }
-     for (kk = A_ext_i[i]; kk < A_ext_i[i+1]; kk++)
-     {
-       big_k1 = A_ext_j[kk];
-       if(big_k1 > -1 && (big_k1 < col_1 || big_k1 >= col_n))
-       {
-         got_loc = hypre_UnorderedBigIntMapGet(&tmp_found_inverse, big_k1);
-         loc_col = got_loc + num_cols_A_offd;
-         A_ext_j[kk] = (HYPRE_BigInt)(-loc_col - 1);
-       }
-     }
+      if (CF_marker_offd[i] < 0)
+      {
+         for (kk = Sop_i[i]; kk < Sop_i[i + 1]; kk++)
+         {
+            big_k1 = Sop_j[kk];
+            if (big_k1 > -1 && (big_k1 < col_1 || big_k1 >= col_n))
+            {
+               got_loc = hypre_UnorderedBigIntMapGet(&tmp_found_inverse, big_k1);
+               loc_col = got_loc + num_cols_A_offd;
+               Sop_j[kk] = (HYPRE_BigInt)(-loc_col - 1);
+            }
+         }
+         for (kk = A_ext_i[i]; kk < A_ext_i[i + 1]; kk++)
+         {
+            big_k1 = A_ext_j[kk];
+            if (big_k1 > -1 && (big_k1 < col_1 || big_k1 >= col_n))
+            {
+               got_loc = hypre_UnorderedBigIntMapGet(&tmp_found_inverse, big_k1);
+               loc_col = got_loc + num_cols_A_offd;
+               A_ext_j[kk] = (HYPRE_BigInt)(-loc_col - 1);
+            }
+         }
+      }
+   }
+   if (newoff)
+   {
+      hypre_UnorderedBigIntMapDestroy(&tmp_found_inverse);
    }
-  }
-  if (newoff)
-  {
-    hypre_UnorderedBigIntMapDestroy(&tmp_found_inverse);
-  }
 #else /* !HYPRE_CONCURRENT_HOPSCOTCH */
-  HYPRE_Int size_offP;
+   HYPRE_Int size_offP;
 
-  HYPRE_BigInt *tmp_found;
-  HYPRE_Int min;
-  HYPRE_Int ifound;
+   HYPRE_BigInt *tmp_found;
+   HYPRE_Int min;
+   HYPRE_Int ifound;
+   HYPRE_BigInt ifound_big;
 
-  size_offP = A_ext_i[num_cols_A_offd]+Sop_i[num_cols_A_offd];
-  tmp_found = hypre_CTAlloc(HYPRE_BigInt, size_offP, HYPRE_MEMORY_HOST);
+   size_offP = A_ext_i[num_cols_A_offd] + Sop_i[num_cols_A_offd];
+   tmp_found = hypre_CTAlloc(HYPRE_BigInt, size_offP, HYPRE_MEMORY_HOST);
 
-  /* Find nodes that will be added to the off diag list */
-  for (i = 0; i < num_cols_A_offd; i++)
-  {
-   if (CF_marker_offd[i] < 0)
+   /* Find nodes that will be added to the off diag list */
+   for (i = 0; i < num_cols_A_offd; i++)
    {
-    for (j = A_ext_i[i]; j < A_ext_i[i+1]; j++)
-    {
-      big_i1 = A_ext_j[j];
-      if(big_i1 < col_1 || big_i1 >= col_n)
+      if (CF_marker_offd[i] < 0)
       {
-         ifound = hypre_BigBinarySearch(col_map_offd,big_i1,num_cols_A_offd);
-         if(ifound == -1)
+         for (j = A_ext_i[i]; j < A_ext_i[i + 1]; j++)
          {
-            tmp_found[newoff]=big_i1;
-            newoff++;
+            big_i1 = A_ext_j[j];
+            if (big_i1 < col_1 || big_i1 >= col_n)
+            {
+               ifound = hypre_BigBinarySearch(col_map_offd, big_i1, num_cols_A_offd);
+               if (ifound == -1)
+               {
+                  tmp_found[newoff] = big_i1;
+                  newoff++;
+               }
+               else
+               {
+                  A_ext_j[j] = (HYPRE_BigInt)(-ifound - 1);
+               }
+            }
          }
-         else
+         for (j = Sop_i[i]; j < Sop_i[i + 1]; j++)
          {
-            A_ext_j[j] = (HYPRE_BigInt)(-ifound-1);
+            big_i1 = Sop_j[j];
+            if (big_i1 < col_1 || big_i1 >= col_n)
+            {
+               ifound = hypre_BigBinarySearch(col_map_offd, big_i1, num_cols_A_offd);
+               if (ifound == -1)
+               {
+                  tmp_found[newoff] = big_i1;
+                  newoff++;
+               }
+               else
+               {
+                  Sop_j[j] = (HYPRE_BigInt)(-ifound - 1);
+               }
+            }
          }
       }
-    }
-    for (j = Sop_i[i]; j < Sop_i[i+1]; j++)
-    {
-      big_i1 = Sop_j[j];
-      if(big_i1 < col_1 || big_i1 >= col_n)
+   }
+   /* Put found in monotone increasing order */
+   if (newoff > 0)
+   {
+      hypre_BigQsort0(tmp_found, 0, newoff - 1);
+      ifound_big = tmp_found[0];
+      min = 1;
+      for (i = 1; i < newoff; i++)
       {
-         ifound = hypre_BigBinarySearch(col_map_offd,big_i1,num_cols_A_offd);
-         if(ifound == -1)
-         {
-            tmp_found[newoff]=big_i1;
-            newoff++;
-         }
-         else
+         if (tmp_found[i] > ifound_big)
          {
-            Sop_j[j] = (HYPRE_BigInt)(-ifound-1);
+            ifound_big = tmp_found[i];
+            tmp_found[min++] = ifound_big;
          }
       }
-    }
+      newoff = min;
    }
-  }
-  /* Put found in monotone increasing order */
-  if (newoff > 0)
-  {
-     hypre_BigQsort0(tmp_found,0,newoff-1);
-     ifound = tmp_found[0];
-     min = 1;
-     for (i=1; i < newoff; i++)
-     {
-       if (tmp_found[i] > ifound)
-       {
-          ifound = tmp_found[i];
-          tmp_found[min++] = ifound;
-       }
-     }
-     newoff = min;
-  }
-
-  /* Set column indices for Sop and A_ext such that offd nodes are
-   * negatively indexed */
-  for(i = 0; i < num_cols_A_offd; i++)
-  {
-   if (CF_marker_offd[i] < 0)
+
+   /* Set column indices for Sop and A_ext such that offd nodes are
+    * negatively indexed */
+   for (i = 0; i < num_cols_A_offd; i++)
    {
-     for(kk = Sop_i[i]; kk < Sop_i[i+1]; kk++)
-     {
-       big_k1 = Sop_j[kk];
-       if(big_k1 > -1 && (big_k1 < col_1 || big_k1 >= col_n))
-       {
-          got_loc = hypre_BigBinarySearch(tmp_found,big_k1,newoff);
-          if(got_loc > -1)
-             loc_col = got_loc + num_cols_A_offd;
-          Sop_j[kk] = (HYPRE_BigInt)(-loc_col - 1);
-       }
-     }
-     for (kk = A_ext_i[i]; kk < A_ext_i[i+1]; kk++)
-     {
-       big_k1 = A_ext_j[kk];
-       if(big_k1 > -1 && (big_k1 < col_1 || big_k1 >= col_n))
-       {
-          got_loc = hypre_BigBinarySearch(tmp_found,big_k1,newoff);
-          loc_col = got_loc + num_cols_A_offd;
-          A_ext_j[kk] = (HYPRE_BigInt)(-loc_col - 1);
-       }
-     }
+      if (CF_marker_offd[i] < 0)
+      {
+         for (kk = Sop_i[i]; kk < Sop_i[i + 1]; kk++)
+         {
+            big_k1 = Sop_j[kk];
+            if (big_k1 > -1 && (big_k1 < col_1 || big_k1 >= col_n))
+            {
+               got_loc = hypre_BigBinarySearch(tmp_found, big_k1, newoff);
+               if (got_loc > -1)
+               {
+                  loc_col = got_loc + num_cols_A_offd;
+                  Sop_j[kk] = (HYPRE_BigInt)(-loc_col - 1);
+               }
+            }
+         }
+         for (kk = A_ext_i[i]; kk < A_ext_i[i + 1]; kk++)
+         {
+            big_k1 = A_ext_j[kk];
+            if (big_k1 > -1 && (big_k1 < col_1 || big_k1 >= col_n))
+            {
+               got_loc = hypre_BigBinarySearch(tmp_found, big_k1, newoff);
+               if (got_loc > -1)
+               {
+                  loc_col = got_loc + num_cols_A_offd;
+                  A_ext_j[kk] = (HYPRE_BigInt)(-loc_col - 1);
+               }
+            }
+         }
+      }
    }
-  }
 #endif /* !HYPRE_CONCURRENT_HOPSCOTCH */
 
-  *found = tmp_found;
+   *found = tmp_found;
 
 #ifdef HYPRE_PROFILE
-  hypre_profile_times[HYPRE_TIMER_ID_RENUMBER_COLIDX] += hypre_MPI_Wtime();
+   hypre_profile_times[HYPRE_TIMER_ID_RENUMBER_COLIDX] += hypre_MPI_Wtime();
 #endif
 
-  return newoff;
+   return newoff;
 }
 
-HYPRE_Int hypre_exchange_marker(hypre_ParCSRCommPkg *comm_pkg,
-                          HYPRE_Int *IN_marker,
-                          HYPRE_Int *OUT_marker)
+/*--------------------------------------------------------------------------
+ * hypre_exchange_marker
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_exchange_marker(hypre_ParCSRCommPkg *comm_pkg,
+                      HYPRE_Int           *IN_marker,
+                      HYPRE_Int           *OUT_marker)
 {
-  HYPRE_Int num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
-  HYPRE_Int begin = hypre_ParCSRCommPkgSendMapStart(comm_pkg, 0);
-  HYPRE_Int end = hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends);
-  HYPRE_Int *int_buf_data = hypre_CTAlloc(HYPRE_Int, end, HYPRE_MEMORY_HOST);
+   HYPRE_Int               num_sends    = hypre_ParCSRCommPkgNumSends(comm_pkg);
+   HYPRE_Int               begin        = hypre_ParCSRCommPkgSendMapStart(comm_pkg, 0);
+   HYPRE_Int               end          = hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends);
+   HYPRE_Int              *int_buf_data = hypre_CTAlloc(HYPRE_Int, end, HYPRE_MEMORY_HOST);
+
+   hypre_ParCSRCommHandle *comm_handle;
+   HYPRE_Int               i;
+
 
-  HYPRE_Int i;
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for HYPRE_SMP_SCHEDULE
 #endif
-  for (i = begin; i < end; ++i) {
-     int_buf_data[i - begin] =
-           IN_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, i)];
-  }
-
-  hypre_ParCSRCommHandle *comm_handle = hypre_ParCSRCommHandleCreate( 11, comm_pkg, int_buf_data,
-                                                                      OUT_marker);
+   for (i = begin; i < end; ++i)
+   {
+      int_buf_data[i - begin] = IN_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, i)];
+   }
 
-  hypre_ParCSRCommHandleDestroy(comm_handle);
-  hypre_TFree(int_buf_data, HYPRE_MEMORY_HOST);
+   comm_handle = hypre_ParCSRCommHandleCreate(11, comm_pkg, int_buf_data, OUT_marker);
+   hypre_ParCSRCommHandleDestroy(comm_handle);
+   hypre_TFree(int_buf_data, HYPRE_MEMORY_HOST);
 
-  return hypre_error_flag;
+   return hypre_error_flag;
 }
 
-HYPRE_Int hypre_exchange_interp_data(
-    HYPRE_Int **CF_marker_offd,
-    HYPRE_Int **dof_func_offd,
-    hypre_CSRMatrix **A_ext,
-    HYPRE_Int *full_off_procNodes,
-    hypre_CSRMatrix **Sop,
-    hypre_ParCSRCommPkg **extend_comm_pkg,
-    hypre_ParCSRMatrix *A,
-    HYPRE_Int *CF_marker,
-    hypre_ParCSRMatrix *S,
-    HYPRE_Int num_functions,
-    HYPRE_Int *dof_func,
-    HYPRE_Int skip_fine_or_same_sign) // skip_fine_or_same_sign if we want to skip fine points in S and nnz with the same sign as diagonal in A
+/*--------------------------------------------------------------------------
+ * hypre_exchange_interp_data
+ *
+ * skip_fine_or_same_sign: if we want to skip fine points in S and nnz with
+ *                         the same sign as diagonal in A
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_exchange_interp_data(HYPRE_Int           **CF_marker_offd,
+                           HYPRE_Int           **dof_func_offd,
+                           hypre_CSRMatrix     **A_ext,
+                           HYPRE_Int            *full_off_procNodes,
+                           hypre_CSRMatrix     **Sop,
+                           hypre_ParCSRCommPkg **extend_comm_pkg,
+                           hypre_ParCSRMatrix   *A,
+                           HYPRE_Int            *CF_marker,
+                           hypre_ParCSRMatrix   *S,
+                           HYPRE_Int             num_functions,
+                           HYPRE_Int            *dof_func,
+                           HYPRE_Int             skip_fine_or_same_sign)
 {
 #ifdef HYPRE_PROFILE
-  hypre_profile_times[HYPRE_TIMER_ID_EXCHANGE_INTERP_DATA] -= hypre_MPI_Wtime();
+   hypre_profile_times[HYPRE_TIMER_ID_EXCHANGE_INTERP_DATA] -= hypre_MPI_Wtime();
 #endif
 
-  hypre_ParCSRCommPkg   *comm_pkg = hypre_ParCSRMatrixCommPkg(A);
-  hypre_CSRMatrix *A_diag = hypre_ParCSRMatrixDiag(A);
-  hypre_CSRMatrix *A_offd = hypre_ParCSRMatrixOffd(A);
-  HYPRE_Int              num_cols_A_offd = hypre_CSRMatrixNumCols(A_offd);
-  HYPRE_BigInt          *col_map_offd = hypre_ParCSRMatrixColMapOffd(A);
-  HYPRE_BigInt           col_1 = hypre_ParCSRMatrixFirstRowIndex(A);
-  HYPRE_Int              local_numrows = hypre_CSRMatrixNumRows(A_diag);
-  HYPRE_BigInt           col_n = col_1 + (HYPRE_BigInt)local_numrows;
-  HYPRE_BigInt          *found = NULL;
-
-  /*----------------------------------------------------------------------
-   * Get the off processors rows for A and S, associated with columns in
-   * A_offd and S_offd.
-   *---------------------------------------------------------------------*/
-  *CF_marker_offd = hypre_TAlloc(HYPRE_Int, num_cols_A_offd, HYPRE_MEMORY_HOST);
-  hypre_exchange_marker(comm_pkg, CF_marker, *CF_marker_offd);
-
-  hypre_ParCSRCommHandle *comm_handle_a_idx, *comm_handle_a_data;
-  *A_ext         = hypre_ParCSRMatrixExtractBExt_Overlap(A,A,1,&comm_handle_a_idx,&comm_handle_a_data,CF_marker,*CF_marker_offd,skip_fine_or_same_sign,skip_fine_or_same_sign);
-  HYPRE_Int *A_ext_i        = hypre_CSRMatrixI(*A_ext);
-  HYPRE_BigInt *A_ext_j        = hypre_CSRMatrixBigJ(*A_ext);
-  HYPRE_Int  A_ext_rows     = hypre_CSRMatrixNumRows(*A_ext);
-
-  hypre_ParCSRCommHandle *comm_handle_s_idx;
-  *Sop           = hypre_ParCSRMatrixExtractBExt_Overlap(S,A,0,&comm_handle_s_idx,NULL,CF_marker,*CF_marker_offd,skip_fine_or_same_sign,0);
-  HYPRE_Int *Sop_i          = hypre_CSRMatrixI(*Sop);
-  HYPRE_BigInt *Sop_j       = hypre_CSRMatrixBigJ(*Sop);
-  HYPRE_Int  Soprows        = hypre_CSRMatrixNumRows(*Sop);
-
-  HYPRE_Int *send_idx = (HYPRE_Int *)comm_handle_s_idx->send_data;
-  hypre_ParCSRCommHandleDestroy(comm_handle_s_idx);
-  hypre_TFree(send_idx, HYPRE_MEMORY_HOST);
-
-  send_idx = (HYPRE_Int *)comm_handle_a_idx->send_data;
-  hypre_ParCSRCommHandleDestroy(comm_handle_a_idx);
-  hypre_TFree(send_idx, HYPRE_MEMORY_HOST);
-
-  /* Find nodes that are neighbors of neighbors, not found in offd */
+   hypre_ParCSRCommPkg    *comm_pkg        = hypre_ParCSRMatrixCommPkg(A);
+   hypre_CSRMatrix        *A_diag          = hypre_ParCSRMatrixDiag(A);
+   hypre_CSRMatrix        *A_offd          = hypre_ParCSRMatrixOffd(A);
+   HYPRE_Int               num_cols_A_offd = hypre_CSRMatrixNumCols(A_offd);
+   HYPRE_BigInt           *col_map_offd    = hypre_ParCSRMatrixColMapOffd(A);
+   HYPRE_BigInt            col_1           = hypre_ParCSRMatrixFirstRowIndex(A);
+   HYPRE_Int               local_numrows   = hypre_CSRMatrixNumRows(A_diag);
+   HYPRE_BigInt            col_n           = col_1 + (HYPRE_BigInt) local_numrows;
+
+   HYPRE_BigInt           *found           = NULL;
+   hypre_ParCSRCommHandle *comm_handle_s_idx;
+
+   /*----------------------------------------------------------------------
+    * Get the off processors rows for A and S, associated with columns in
+    * A_offd and S_offd.
+    *---------------------------------------------------------------------*/
+   *CF_marker_offd = hypre_TAlloc(HYPRE_Int, num_cols_A_offd, HYPRE_MEMORY_HOST);
+   hypre_exchange_marker(comm_pkg, CF_marker, *CF_marker_offd);
+
+   hypre_ParCSRCommHandle *comm_handle_a_idx, *comm_handle_a_data;
+   *A_ext = hypre_ParCSRMatrixExtractBExt_Overlap(A, A, 1, &comm_handle_a_idx,
+                                                  &comm_handle_a_data,
+                                                  CF_marker, *CF_marker_offd,
+                                                  skip_fine_or_same_sign,
+                                                  skip_fine_or_same_sign);
+   HYPRE_Int    *A_ext_i    = hypre_CSRMatrixI(*A_ext);
+   HYPRE_BigInt *A_ext_j    = hypre_CSRMatrixBigJ(*A_ext);
+   HYPRE_Int     A_ext_rows = hypre_CSRMatrixNumRows(*A_ext);
+
+   *Sop = hypre_ParCSRMatrixExtractBExt_Overlap(S, A, 0, &comm_handle_s_idx, NULL, CF_marker,
+                                                *CF_marker_offd, skip_fine_or_same_sign, 0);
+
+   HYPRE_Int    *Sop_i       = hypre_CSRMatrixI(*Sop);
+   HYPRE_BigInt *Sop_j       = hypre_CSRMatrixBigJ(*Sop);
+   HYPRE_Int     Soprows     = hypre_CSRMatrixNumRows(*Sop);
+   HYPRE_Int    *send_idx    = (HYPRE_Int *) comm_handle_s_idx->send_data;
+
+   hypre_ParCSRCommHandleDestroy(comm_handle_s_idx);
+   hypre_TFree(send_idx, HYPRE_MEMORY_HOST);
+
+   send_idx = (HYPRE_Int *)comm_handle_a_idx->send_data;
+   hypre_ParCSRCommHandleDestroy(comm_handle_a_idx);
+   hypre_TFree(send_idx, HYPRE_MEMORY_HOST);
+
+   /* Find nodes that are neighbors of neighbors, not found in offd */
 #ifdef HYPRE_PROFILE
-  hypre_profile_times[HYPRE_TIMER_ID_EXCHANGE_INTERP_DATA] += hypre_MPI_Wtime();
+   hypre_profile_times[HYPRE_TIMER_ID_EXCHANGE_INTERP_DATA] += hypre_MPI_Wtime();
 #endif
-  HYPRE_Int newoff = hypre_new_offd_nodes(&found, A_ext_rows, A_ext_i, A_ext_j,
-      Soprows, col_map_offd, col_1, col_n,
-      Sop_i, Sop_j, *CF_marker_offd);
+   HYPRE_Int newoff = hypre_new_offd_nodes(&found, A_ext_rows, A_ext_i, A_ext_j,
+                                           Soprows, col_map_offd, col_1, col_n,
+                                           Sop_i, Sop_j, *CF_marker_offd);
 #ifdef HYPRE_PROFILE
-  hypre_profile_times[HYPRE_TIMER_ID_EXCHANGE_INTERP_DATA] -= hypre_MPI_Wtime();
+   hypre_profile_times[HYPRE_TIMER_ID_EXCHANGE_INTERP_DATA] -= hypre_MPI_Wtime();
 #endif
-  if(newoff >= 0)
-    *full_off_procNodes = newoff + num_cols_A_offd;
-  else
-  {
-    return hypre_error_flag;
-  }
-
-  /* Possibly add new points and new processors to the comm_pkg, all
-   * processors need new_comm_pkg */
-
-  /* AHB - create a new comm package just for extended info -
-     this will work better with the assumed partition*/
-  hypre_ParCSRFindExtendCommPkg(hypre_ParCSRMatrixComm(A),
-                                hypre_ParCSRMatrixGlobalNumCols(A),
-                                hypre_ParCSRMatrixFirstColDiag(A),
-                                hypre_CSRMatrixNumCols(A_diag),
-                                hypre_ParCSRMatrixColStarts(A),
-                                hypre_ParCSRMatrixAssumedPartition(A),
-                                newoff,
-                                found,
-                                extend_comm_pkg);
-
-  *CF_marker_offd = hypre_TReAlloc(*CF_marker_offd, HYPRE_Int, *full_off_procNodes, HYPRE_MEMORY_HOST);
-  hypre_exchange_marker(*extend_comm_pkg, CF_marker, *CF_marker_offd + A_ext_rows);
-
-  if(num_functions > 1)
-  {
-    if (*full_off_procNodes > 0)
-      *dof_func_offd = hypre_CTAlloc(HYPRE_Int, *full_off_procNodes, HYPRE_MEMORY_HOST);
-
-    hypre_alt_insert_new_nodes(comm_pkg, *extend_comm_pkg, dof_func,
-        *full_off_procNodes, *dof_func_offd);
-  }
-
-  hypre_TFree(found, HYPRE_MEMORY_HOST);
-
-  HYPRE_Real *send_data = (HYPRE_Real *)comm_handle_a_data->send_data;
-  hypre_ParCSRCommHandleDestroy(comm_handle_a_data);
-  hypre_TFree(send_data, HYPRE_MEMORY_HOST);
+   if (newoff >= 0)
+   {
+      *full_off_procNodes = newoff + num_cols_A_offd;
+   }
+   else
+   {
+      return hypre_error_flag;
+   }
+
+   /* Possibly add new points and new processors to the comm_pkg, all
+    * processors need new_comm_pkg */
+
+   /* AHB - create a new comm package just for extended info -
+      this will work better with the assumed partition*/
+   hypre_ParCSRFindExtendCommPkg(hypre_ParCSRMatrixComm(A),
+                                 hypre_ParCSRMatrixGlobalNumCols(A),
+                                 hypre_ParCSRMatrixFirstColDiag(A),
+                                 hypre_CSRMatrixNumCols(A_diag),
+                                 hypre_ParCSRMatrixColStarts(A),
+                                 hypre_ParCSRMatrixAssumedPartition(A),
+                                 newoff,
+                                 found,
+                                 extend_comm_pkg);
+
+   *CF_marker_offd = hypre_TReAlloc(*CF_marker_offd, HYPRE_Int, *full_off_procNodes,
+                                    HYPRE_MEMORY_HOST);
+   hypre_exchange_marker(*extend_comm_pkg, CF_marker, *CF_marker_offd + A_ext_rows);
+
+   if (num_functions > 1)
+   {
+      if (*full_off_procNodes > 0)
+      {
+         *dof_func_offd = hypre_CTAlloc(HYPRE_Int, *full_off_procNodes, HYPRE_MEMORY_HOST);
+      }
+
+      hypre_alt_insert_new_nodes(comm_pkg, *extend_comm_pkg, dof_func,
+                                 *full_off_procNodes, *dof_func_offd);
+   }
+
+   hypre_TFree(found, HYPRE_MEMORY_HOST);
+
+   HYPRE_Real *send_data = (HYPRE_Real *)comm_handle_a_data->send_data;
+   hypre_ParCSRCommHandleDestroy(comm_handle_a_data);
+   hypre_TFree(send_data, HYPRE_MEMORY_HOST);
 
 #ifdef HYPRE_PROFILE
-  hypre_profile_times[HYPRE_TIMER_ID_EXCHANGE_INTERP_DATA] += hypre_MPI_Wtime();
+   hypre_profile_times[HYPRE_TIMER_ID_EXCHANGE_INTERP_DATA] += hypre_MPI_Wtime();
 #endif
 
-  return hypre_error_flag;
+   return hypre_error_flag;
 }
 
-void hypre_build_interp_colmap(hypre_ParCSRMatrix *P, HYPRE_Int full_off_procNodes, HYPRE_Int *tmp_CF_marker_offd, HYPRE_BigInt *fine_to_coarse_offd)
+/*--------------------------------------------------------------------------
+ * hypre_build_interp_colmap
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_build_interp_colmap(hypre_ParCSRMatrix *P,
+                          HYPRE_Int           full_off_procNodes,
+                          HYPRE_Int          *tmp_CF_marker_offd,
+                          HYPRE_BigInt       *fine_to_coarse_offd)
 {
 #ifdef HYPRE_PROFILE
    hypre_profile_times[HYPRE_TIMER_ID_RENUMBER_COLIDX] -= hypre_MPI_Wtime();
@@ -690,7 +799,7 @@ void hypre_build_interp_colmap(hypre_ParCSRMatrix *P, HYPRE_Int full_off_procNod
    prefix_sum_workspace = hypre_TAlloc(HYPRE_Int, hypre_NumThreads() + 1, HYPRE_MEMORY_HOST);
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
    for (i = 0; i < full_off_procNodes; i++)
    {
@@ -701,7 +810,7 @@ void hypre_build_interp_colmap(hypre_ParCSRMatrix *P, HYPRE_Int full_off_procNod
     * tmp_CF_marker_offd has i marked. num_cols_P_offd is then set to the
     * total number of times P_marker is set */
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i,index) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i,index) HYPRE_SMP_SCHEDULE
 #endif
    for (i = 0; i < P_offd_size; i++)
    {
@@ -713,7 +822,7 @@ void hypre_build_interp_colmap(hypre_ParCSRMatrix *P, HYPRE_Int full_off_procNod
    }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel private(i)
+   #pragma omp parallel private(i)
 #endif
    {
       HYPRE_Int i_begin, i_end;
@@ -722,13 +831,13 @@ void hypre_build_interp_colmap(hypre_ParCSRMatrix *P, HYPRE_Int full_off_procNod
       HYPRE_Int local_num_cols_P_offd = 0;
       for (i = i_begin; i < i_end; i++)
       {
-         if (P_marker[i] == 1) local_num_cols_P_offd++;
+         if (P_marker[i] == 1) { local_num_cols_P_offd++; }
       }
 
       hypre_prefix_sum(&local_num_cols_P_offd, &num_cols_P_offd, prefix_sum_workspace);
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp master
+      #pragma omp master
 #endif
       {
          if (num_cols_P_offd)
@@ -737,24 +846,25 @@ void hypre_build_interp_colmap(hypre_ParCSRMatrix *P, HYPRE_Int full_off_procNod
          }
       }
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
 
       for (i = i_begin; i < i_end; i++)
       {
          if (P_marker[i] == 1)
          {
-           col_map_offd_P[local_num_cols_P_offd++] = fine_to_coarse_offd[i];
+            col_map_offd_P[local_num_cols_P_offd++] = fine_to_coarse_offd[i];
          }
       }
    }
 
    hypre_UnorderedBigIntMap col_map_offd_P_inverse;
-   hypre_big_sort_and_create_inverse_map(col_map_offd_P, num_cols_P_offd, &col_map_offd_P, &col_map_offd_P_inverse);
+   hypre_big_sort_and_create_inverse_map(col_map_offd_P, num_cols_P_offd, &col_map_offd_P,
+                                         &col_map_offd_P_inverse);
 
    // find old idx -> new idx map
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for
+   #pragma omp parallel for
 #endif
    for (i = 0; i < full_off_procNodes; i++)
    {
@@ -767,9 +877,9 @@ void hypre_build_interp_colmap(hypre_ParCSRMatrix *P, HYPRE_Int full_off_procNod
    }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for
+   #pragma omp parallel for
 #endif
-   for(i = 0; i < P_offd_size; i++)
+   for (i = 0; i < P_offd_size; i++)
    {
       P_offd_j[i] = P_marker[P_offd_j[i]];
    }
diff --git a/external/hypre/src/parcsr_ls/aux_interp.h b/external/hypre/src/parcsr_ls/aux_interp.h
index 99fe9cda..c2fa6ab1 100644
--- a/external/hypre/src/parcsr_ls/aux_interp.h
+++ b/external/hypre/src/parcsr_ls/aux_interp.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -11,38 +11,39 @@ extern "C" {
 
 void
 hypre_ParCSRCommExtendA(hypre_ParCSRMatrix *A, HYPRE_Int newoff, HYPRE_Int *found,
-			HYPRE_Int *p_num_recvs, HYPRE_Int **p_recv_procs,
-			HYPRE_Int **p_recv_vec_starts, HYPRE_Int *p_num_sends,
-			HYPRE_Int **p_send_procs, HYPRE_Int **p_send_map_starts,
-			HYPRE_Int **p_send_map_elmts, HYPRE_Int **p_node_add);
+                        HYPRE_Int *p_num_recvs, HYPRE_Int **p_recv_procs,
+                        HYPRE_Int **p_recv_vec_starts, HYPRE_Int *p_num_sends,
+                        HYPRE_Int **p_send_procs, HYPRE_Int **p_send_map_starts,
+                        HYPRE_Int **p_send_map_elmts, HYPRE_Int **p_node_add);
 
-HYPRE_Int alt_insert_new_nodes(hypre_ParCSRCommPkg *comm_pkg, 
-                          hypre_ParCSRCommPkg *extend_comm_pkg,
-                          HYPRE_Int *IN_marker, 
-                          HYPRE_Int full_off_procNodes,
-                          HYPRE_Int *OUT_marker);
+HYPRE_Int alt_insert_new_nodes(hypre_ParCSRCommPkg *comm_pkg,
+                               hypre_ParCSRCommPkg *extend_comm_pkg,
+                               HYPRE_Int *IN_marker,
+                               HYPRE_Int full_off_procNodes,
+                               HYPRE_Int *OUT_marker);
 
 HYPRE_Int hypre_ssort(HYPRE_BigInt *data, HYPRE_Int n);
 HYPRE_Int index_of_minimum(HYPRE_BigInt *data, HYPRE_Int n);
 void swap_int(HYPRE_BigInt *data, HYPRE_Int a, HYPRE_Int b);
-void initialize_vecs(HYPRE_Int diag_n, HYPRE_Int offd_n, HYPRE_Int *diag_ftc, HYPRE_Int *offd_ftc, 
-		     HYPRE_Int *diag_pm, HYPRE_Int *offd_pm, HYPRE_Int *tmp_CF);
+void initialize_vecs(HYPRE_Int diag_n, HYPRE_Int offd_n, HYPRE_Int *diag_ftc, HYPRE_Int *offd_ftc,
+                     HYPRE_Int *diag_pm, HYPRE_Int *offd_pm, HYPRE_Int *tmp_CF);
 
 HYPRE_Int exchange_interp_data(
-    HYPRE_Int **CF_marker_offd,
-    HYPRE_Int **dof_func_offd,
-    hypre_CSRMatrix **A_ext,
-    HYPRE_Int *full_off_procNodes,
-    hypre_CSRMatrix **Sop,
-    hypre_ParCSRCommPkg **extend_comm_pkg,
-    hypre_ParCSRMatrix *A, 
-    HYPRE_Int *CF_marker,
-    hypre_ParCSRMatrix *S,
-    HYPRE_Int num_functions,
-    HYPRE_Int *dof_func,
-    HYPRE_Int skip_fine_or_same_sign);
+   HYPRE_Int **CF_marker_offd,
+   HYPRE_Int **dof_func_offd,
+   hypre_CSRMatrix **A_ext,
+   HYPRE_Int *full_off_procNodes,
+   hypre_CSRMatrix **Sop,
+   hypre_ParCSRCommPkg **extend_comm_pkg,
+   hypre_ParCSRMatrix *A,
+   HYPRE_Int *CF_marker,
+   hypre_ParCSRMatrix *S,
+   HYPRE_Int num_functions,
+   HYPRE_Int *dof_func,
+   HYPRE_Int skip_fine_or_same_sign);
 
-void build_interp_colmap(hypre_ParCSRMatrix *P, HYPRE_Int full_off_procNodes, HYPRE_Int *tmp_CF_marker_offd, HYPRE_Int *fine_to_coarse_offd);
+void build_interp_colmap(hypre_ParCSRMatrix *P, HYPRE_Int full_off_procNodes,
+                         HYPRE_Int *tmp_CF_marker_offd, HYPRE_Int *fine_to_coarse_offd);
 
 #ifdef __cplusplus
 }
diff --git a/external/hypre/src/parcsr_ls/block_tridiag.c b/external/hypre/src/parcsr_ls/block_tridiag.c
index 1677fa0d..b8d7660e 100644
--- a/external/hypre/src/parcsr_ls/block_tridiag.c
+++ b/external/hypre/src/parcsr_ls/block_tridiag.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -21,7 +21,7 @@
  * hypre_BlockTridiagCreate
  *--------------------------------------------------------------------------*/
 
-void *hypre_BlockTridiagCreate()
+void *hypre_BlockTridiagCreate(void)
 {
    hypre_BlockTridiagData *b_data;
    b_data = hypre_CTAlloc(hypre_BlockTridiagData,  1, HYPRE_MEMORY_HOST);
@@ -114,19 +114,25 @@ HYPRE_Int hypre_BlockTridiagDestroy(void *data)
  * Routines to setup the preconditioner
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int hypre_BlockTridiagSetup(void *data, hypre_ParCSRMatrix *A,
-                            hypre_ParVector *b, hypre_ParVector *x) 
+HYPRE_Int
+hypre_BlockTridiagSetup(void               *data,
+                        hypre_ParCSRMatrix *A,
+                        hypre_ParVector    *b,
+                        hypre_ParVector    *x)
 {
-   HYPRE_Int                i, j, *index_set1, print_level, nsweeps, relax_type;
-   HYPRE_Int                nrows, nrows1, nrows2, start1, start2, *index_set2;
-   HYPRE_Int                count, ierr;
-   HYPRE_Real         threshold;
-   hypre_ParCSRMatrix **submatrices;
-   HYPRE_Solver       precon1;
-   HYPRE_Solver       precon2;
-   HYPRE_IJVector     ij_u1, ij_u2, ij_f1, ij_f2;
-   hypre_ParVector    *vector;
-   MPI_Comm           comm;
+   HYPRE_UNUSED_VAR(b);
+   HYPRE_UNUSED_VAR(x);
+
+   HYPRE_Int               i, j, *index_set1, print_level, nsweeps, relax_type;
+   HYPRE_Int               nrows, nrows1, nrows2, start1, start2, *index_set2;
+   HYPRE_Int               count, ierr;
+   HYPRE_Real              threshold;
+   hypre_ParCSRMatrix    **submatrices;
+   HYPRE_Solver            precon1;
+   HYPRE_Solver            precon2;
+   HYPRE_IJVector          ij_u1, ij_u2, ij_f1, ij_f2;
+   hypre_ParVector        *vector;
+   MPI_Comm                comm;
    hypre_BlockTridiagData *b_data = (hypre_BlockTridiagData *) data;
 
    HYPRE_ParCSRMatrixGetComm((HYPRE_ParCSRMatrix) A, &comm);
@@ -134,39 +140,41 @@ HYPRE_Int hypre_BlockTridiagSetup(void *data, hypre_ParCSRMatrix *A,
    nrows1 = index_set1[0];
    nrows  = hypre_ParCSRMatrixNumRows(A);
    nrows2 = nrows - nrows1;
-   b_data->index_set2 = hypre_CTAlloc(HYPRE_Int,  nrows2+1, HYPRE_MEMORY_HOST);
+   b_data->index_set2 = hypre_CTAlloc(HYPRE_Int,  nrows2 + 1, HYPRE_MEMORY_HOST);
    index_set2 = b_data->index_set2;
    index_set2[0] = nrows2;
    count = 1;
-   for (i = 0; i < index_set1[1]; i++) index_set2[count++] = i;
-   for (i = 1; i < nrows1; i++) 
-      for (j = index_set1[i]+1; j < index_set1[i+1]; j++) 
+   for (i = 0; i < index_set1[1]; i++) { index_set2[count++] = i; }
+   for (i = 1; i < nrows1; i++)
+      for (j = index_set1[i] + 1; j < index_set1[i + 1]; j++)
+      {
          index_set2[count++] = j;
-   for (i = index_set1[nrows1]+1; i < nrows; i++) index_set2[count++] = i;
+      }
+   for (i = index_set1[nrows1] + 1; i < nrows; i++) { index_set2[count++] = i; }
 
    submatrices = hypre_CTAlloc(hypre_ParCSRMatrix *,  4, HYPRE_MEMORY_HOST);
    hypre_ParCSRMatrixExtractSubmatrices(A, index_set1, &submatrices);
 
    nrows1 = hypre_ParCSRMatrixNumRows(submatrices[0]);
-   nrows2 = hypre_ParCSRMatrixNumRows(submatrices[3]); 
+   nrows2 = hypre_ParCSRMatrixNumRows(submatrices[3]);
    start1 = hypre_ParCSRMatrixFirstRowIndex(submatrices[0]);
    start2 = hypre_ParCSRMatrixFirstRowIndex(submatrices[3]);
-   HYPRE_IJVectorCreate(comm, start1, start1+nrows1-1, &ij_u1);
+   HYPRE_IJVectorCreate(comm, start1, start1 + nrows1 - 1, &ij_u1);
    HYPRE_IJVectorSetObjectType(ij_u1, HYPRE_PARCSR);
    ierr  = HYPRE_IJVectorInitialize(ij_u1);
    ierr += HYPRE_IJVectorAssemble(ij_u1);
    hypre_assert(!ierr);
-   HYPRE_IJVectorCreate(comm, start1, start1+nrows1-1, &ij_f1);
+   HYPRE_IJVectorCreate(comm, start1, start1 + nrows1 - 1, &ij_f1);
    HYPRE_IJVectorSetObjectType(ij_f1, HYPRE_PARCSR);
    ierr  = HYPRE_IJVectorInitialize(ij_f1);
    ierr += HYPRE_IJVectorAssemble(ij_f1);
    hypre_assert(!ierr);
-   HYPRE_IJVectorCreate(comm, start2, start2+nrows2-1, &ij_u2);
+   HYPRE_IJVectorCreate(comm, start2, start2 + nrows2 - 1, &ij_u2);
    HYPRE_IJVectorSetObjectType(ij_u2, HYPRE_PARCSR);
    ierr  = HYPRE_IJVectorInitialize(ij_u2);
    ierr += HYPRE_IJVectorAssemble(ij_u2);
    hypre_assert(!ierr);
-   HYPRE_IJVectorCreate(comm, start2, start2+nrows1-1, &ij_f2);
+   HYPRE_IJVectorCreate(comm, start2, start2 + nrows1 - 1, &ij_f2);
    HYPRE_IJVectorSetObjectType(ij_f2, HYPRE_PARCSR);
    ierr  = HYPRE_IJVectorInitialize(ij_f2);
    ierr += HYPRE_IJVectorAssemble(ij_f2);
@@ -228,16 +236,21 @@ HYPRE_Int hypre_BlockTridiagSetup(void *data, hypre_ParCSRMatrix *A,
  * Routines to solve the preconditioner
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int hypre_BlockTridiagSolve(void *data, hypre_ParCSRMatrix *A,
-                            hypre_ParVector *b, hypre_ParVector *x) 
+HYPRE_Int
+hypre_BlockTridiagSolve(void               *data,
+                        hypre_ParCSRMatrix *A,
+                        hypre_ParVector    *b,
+                        hypre_ParVector    *x)
 {
+   HYPRE_UNUSED_VAR(A);
+
    HYPRE_Int                i, ind, nrows1, nrows2, *index_set1, *index_set2;
-   HYPRE_Real         *ffv, *uuv, *f1v, *f2v, *u1v, *u2v;
-   HYPRE_ParCSRMatrix A21, A11, A22;
-   hypre_ParVector    *F1, *U1, *F2, *U2;
-   HYPRE_Solver       precon1, precon2;
-   hypre_BlockTridiagData *b_data = (hypre_BlockTridiagData *) data;
- 
+   HYPRE_Real              *ffv, *uuv, *f1v, *f2v, *u1v, *u2v;
+   HYPRE_ParCSRMatrix       A21, A11, A22;
+   hypre_ParVector         *F1, *U1, *F2, *U2;
+   HYPRE_Solver             precon1, precon2;
+   hypre_BlockTridiagData  *b_data = (hypre_BlockTridiagData *) data;
+
    index_set1 = b_data->index_set1;
    index_set2 = b_data->index_set2;
    nrows1  = index_set1[0];
@@ -259,30 +272,30 @@ HYPRE_Int hypre_BlockTridiagSolve(void *data, hypre_ParCSRMatrix *A,
    u2v = hypre_VectorData(hypre_ParVectorLocalVector(U2));
    for (i = 0; i < nrows1; i++)
    {
-      ind = index_set1[i+1];
+      ind = index_set1[i + 1];
       f1v[i] = ffv[ind];
       u1v[i] = 0.0;
    }
-   HYPRE_BoomerAMGSolve(precon1, A11, (HYPRE_ParVector) F1, 
+   HYPRE_BoomerAMGSolve(precon1, A11, (HYPRE_ParVector) F1,
                         (HYPRE_ParVector) U1);
    for (i = 0; i < nrows2; i++)
    {
-      ind = index_set2[i+1];
+      ind = index_set2[i + 1];
       f2v[i] = ffv[ind];
       u2v[i] = 0.0;
    }
-   HYPRE_ParCSRMatrixMatvec(-1.0,A21,(HYPRE_ParVector) U1,1.0,
+   HYPRE_ParCSRMatrixMatvec(-1.0, A21, (HYPRE_ParVector) U1, 1.0,
                             (HYPRE_ParVector) F2);
-   HYPRE_BoomerAMGSolve(precon2, A22, (HYPRE_ParVector) F2, 
+   HYPRE_BoomerAMGSolve(precon2, A22, (HYPRE_ParVector) F2,
                         (HYPRE_ParVector) U2);
    for (i = 0; i < nrows1; i++)
    {
-      ind = index_set1[i+1];
+      ind = index_set1[i + 1];
       uuv[ind] = u1v[i];
    }
    for (i = 0; i < nrows2; i++)
    {
-      ind = index_set2[i+1];
+      ind = index_set2[i + 1];
       uuv[ind] = u2v[i];
    }
    return (0);
@@ -294,14 +307,14 @@ HYPRE_Int hypre_BlockTridiagSolve(void *data, hypre_ParCSRMatrix *A,
 
 HYPRE_Int hypre_BlockTridiagSetIndexSet(void *data, HYPRE_Int n, HYPRE_Int *inds)
 {
-   HYPRE_Int i, ierr=0, *indices;
+   HYPRE_Int i, ierr = 0, *indices;
    hypre_BlockTridiagData *b_data = (hypre_BlockTridiagData *) data;
 
-   if (n <= 0 || inds == NULL) ierr = 1;
-   b_data->index_set1 = hypre_CTAlloc(HYPRE_Int,  n+1, HYPRE_MEMORY_HOST);
+   if (n <= 0 || inds == NULL) { ierr = 1; }
+   b_data->index_set1 = hypre_CTAlloc(HYPRE_Int,  n + 1, HYPRE_MEMORY_HOST);
    indices = b_data->index_set1;
    indices[0] = n;
-   for (i = 0; i < n; i++) indices[i+1] = inds[i];
+   for (i = 0; i < n; i++) { indices[i + 1] = inds[i]; }
    return (ierr);
 }
 
@@ -311,7 +324,7 @@ HYPRE_Int hypre_BlockTridiagSetIndexSet(void *data, HYPRE_Int n, HYPRE_Int *inds
 
 HYPRE_Int hypre_BlockTridiagSetAMGStrengthThreshold(void *data, HYPRE_Real thresh)
 {
-	hypre_BlockTridiagData *b_data = (hypre_BlockTridiagData *) data;
+   hypre_BlockTridiagData *b_data = (hypre_BlockTridiagData *) data;
    b_data->threshold = thresh;
    return (0);
 }
@@ -348,4 +361,3 @@ HYPRE_Int hypre_BlockTridiagSetPrintLevel(void *data, HYPRE_Int print_level)
    b_data->print_level = print_level;
    return (0);
 }
-
diff --git a/external/hypre/src/parcsr_ls/block_tridiag.h b/external/hypre/src/parcsr_ls/block_tridiag.h
index 6e77cfd4..3e4b7b07 100644
--- a/external/hypre/src/parcsr_ls/block_tridiag.h
+++ b/external/hypre/src/parcsr_ls/block_tridiag.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -17,8 +17,8 @@
 
 typedef struct
 {
-   HYPRE_Int    num_sweeps;  
-   HYPRE_Int    relax_type;   
+   HYPRE_Int    num_sweeps;
+   HYPRE_Int    relax_type;
    HYPRE_Int    *index_set1, *index_set2;
    HYPRE_Int    print_level;
    HYPRE_Real threshold;
@@ -32,12 +32,12 @@ typedef struct
  * functions for hypre_BlockTridiag
  *--------------------------------------------------------------------------*/
 
-void *hypre_BlockTridiagCreate();
+void *hypre_BlockTridiagCreate(void);
 HYPRE_Int  hypre_BlockTridiagDestroy(void *);
-HYPRE_Int  hypre_BlockTridiagSetup(void * , hypre_ParCSRMatrix *,
-                             hypre_ParVector *, hypre_ParVector *);
-HYPRE_Int  hypre_BlockTridiagSolve(void * , hypre_ParCSRMatrix *,
-                             hypre_ParVector *, hypre_ParVector *);
+HYPRE_Int  hypre_BlockTridiagSetup(void *, hypre_ParCSRMatrix *,
+                                   hypre_ParVector *, hypre_ParVector *);
+HYPRE_Int  hypre_BlockTridiagSolve(void *, hypre_ParCSRMatrix *,
+                                   hypre_ParVector *, hypre_ParVector *);
 HYPRE_Int  hypre_BlockTridiagSetIndexSet(void *, HYPRE_Int, HYPRE_Int *);
 HYPRE_Int  hypre_BlockTridiagSetAMGStrengthThreshold(void *, HYPRE_Real);
 HYPRE_Int  hypre_BlockTridiagSetAMGNumSweeps(void *, HYPRE_Int);
diff --git a/external/hypre/src/parcsr_ls/csr_block_matrix.h b/external/hypre/src/parcsr_ls/csr_block_matrix.h
index 3f4bbdac..c05ba0d5 100644
--- a/external/hypre/src/parcsr_ls/csr_block_matrix.h
+++ b/external/hypre/src/parcsr_ls/csr_block_matrix.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -31,15 +31,15 @@ extern "C" {
 
 typedef struct
 {
-  HYPRE_Complex    *data;
-  HYPRE_Int        *i;
-  HYPRE_Int        *j;
-  HYPRE_BigInt     *big_j;
-  HYPRE_Int         block_size;
-  HYPRE_Int         num_rows;
-  HYPRE_Int         num_cols;
-  HYPRE_Int         num_nonzeros;
-  HYPRE_Int         owns_data;
+   HYPRE_Complex    *data;
+   HYPRE_Int        *i;
+   HYPRE_Int        *j;
+   HYPRE_BigInt     *big_j;
+   HYPRE_Int         block_size;
+   HYPRE_Int         num_rows;
+   HYPRE_Int         num_cols;
+   HYPRE_Int         num_nonzeros;
+   HYPRE_Int         owns_data;
 
 } hypre_CSRBlockMatrix;
 
@@ -61,81 +61,97 @@ typedef struct
  * other functions for the CSR Block Matrix structure
  *--------------------------------------------------------------------------*/
 
-hypre_CSRBlockMatrix 
-      *hypre_CSRBlockMatrixCreate(HYPRE_Int, HYPRE_Int, HYPRE_Int, HYPRE_Int);
+hypre_CSRBlockMatrix
+*hypre_CSRBlockMatrixCreate(HYPRE_Int, HYPRE_Int, HYPRE_Int, HYPRE_Int);
 HYPRE_Int hypre_CSRBlockMatrixDestroy(hypre_CSRBlockMatrix *);
 HYPRE_Int hypre_CSRBlockMatrixInitialize(hypre_CSRBlockMatrix *);
 HYPRE_Int hypre_CSRBlockMatrixBigInitialize(hypre_CSRBlockMatrix *);
 HYPRE_Int hypre_CSRBlockMatrixSetDataOwner(hypre_CSRBlockMatrix *, HYPRE_Int);
-hypre_CSRMatrix 
-      *hypre_CSRBlockMatrixCompress(hypre_CSRBlockMatrix *);
-hypre_CSRMatrix 
-      *hypre_CSRBlockMatrixConvertToCSRMatrix(hypre_CSRBlockMatrix *);
+hypre_CSRMatrix
+*hypre_CSRBlockMatrixCompress(hypre_CSRBlockMatrix *);
+hypre_CSRMatrix
+*hypre_CSRBlockMatrixConvertToCSRMatrix(hypre_CSRBlockMatrix *);
 hypre_CSRBlockMatrix
-      *hypre_CSRBlockMatrixConvertFromCSRMatrix(hypre_CSRMatrix *, HYPRE_Int);
+*hypre_CSRBlockMatrixConvertFromCSRMatrix(hypre_CSRMatrix *, HYPRE_Int);
 HYPRE_Int hypre_CSRBlockMatrixBlockAdd(HYPRE_Complex *, HYPRE_Complex *, HYPRE_Complex*, HYPRE_Int);
 
-HYPRE_Int hypre_CSRBlockMatrixBlockMultAdd(HYPRE_Complex *, HYPRE_Complex *, HYPRE_Complex, HYPRE_Complex *, HYPRE_Int);
-HYPRE_Int hypre_CSRBlockMatrixBlockMultAddDiag(HYPRE_Complex *, HYPRE_Complex *, HYPRE_Complex, HYPRE_Complex *, HYPRE_Int);
+HYPRE_Int hypre_CSRBlockMatrixBlockMultAdd(HYPRE_Complex *, HYPRE_Complex *, HYPRE_Complex,
+                                           HYPRE_Complex *, HYPRE_Int);
+HYPRE_Int hypre_CSRBlockMatrixBlockMultAddDiag(HYPRE_Complex *, HYPRE_Complex *, HYPRE_Complex,
+                                               HYPRE_Complex *, HYPRE_Int);
 HYPRE_Int
-hypre_CSRBlockMatrixBlockMultAddDiag2(HYPRE_Complex* i1, HYPRE_Complex* i2, HYPRE_Complex beta, 
+hypre_CSRBlockMatrixBlockMultAddDiag2(HYPRE_Complex* i1, HYPRE_Complex* i2, HYPRE_Complex beta,
                                       HYPRE_Complex* o, HYPRE_Int block_size);
 HYPRE_Int
-hypre_CSRBlockMatrixBlockMultAddDiag3(HYPRE_Complex* i1, HYPRE_Complex* i2, HYPRE_Complex beta, 
+hypre_CSRBlockMatrixBlockMultAddDiag3(HYPRE_Complex* i1, HYPRE_Complex* i2, HYPRE_Complex beta,
                                       HYPRE_Complex* o, HYPRE_Int block_size);
-   
 
-HYPRE_Int hypre_CSRBlockMatrixBlockInvMult(HYPRE_Complex *, HYPRE_Complex *, HYPRE_Complex *, HYPRE_Int);
-HYPRE_Int hypre_CSRBlockMatrixBlockInvMultDiag(HYPRE_Complex *, HYPRE_Complex *, HYPRE_Complex *, HYPRE_Int);
+
+HYPRE_Int hypre_CSRBlockMatrixBlockInvMult(HYPRE_Complex *, HYPRE_Complex *, HYPRE_Complex *,
+                                           HYPRE_Int);
+HYPRE_Int hypre_CSRBlockMatrixBlockInvMultDiag(HYPRE_Complex *, HYPRE_Complex *, HYPRE_Complex *,
+                                               HYPRE_Int);
 
 HYPRE_Int
-hypre_CSRBlockMatrixBlockInvMultDiag2(HYPRE_Complex* i1, HYPRE_Complex* i2, HYPRE_Complex* o, HYPRE_Int block_size);
-   
+hypre_CSRBlockMatrixBlockInvMultDiag2(HYPRE_Complex* i1, HYPRE_Complex* i2, HYPRE_Complex* o,
+                                      HYPRE_Int block_size);
+
 HYPRE_Int
-hypre_CSRBlockMatrixBlockInvMultDiag3(HYPRE_Complex* i1, HYPRE_Complex* i2, HYPRE_Complex* o, HYPRE_Int block_size);
-   
+hypre_CSRBlockMatrixBlockInvMultDiag3(HYPRE_Complex* i1, HYPRE_Complex* i2, HYPRE_Complex* o,
+                                      HYPRE_Int block_size);
 
 
 
-HYPRE_Int hypre_CSRBlockMatrixBlockMultInv(HYPRE_Complex *, HYPRE_Complex *, HYPRE_Complex *, HYPRE_Int);
+
+HYPRE_Int hypre_CSRBlockMatrixBlockMultInv(HYPRE_Complex *, HYPRE_Complex *, HYPRE_Complex *,
+                                           HYPRE_Int);
 HYPRE_Int hypre_CSRBlockMatrixBlockTranspose(HYPRE_Complex *, HYPRE_Complex *, HYPRE_Int);
 
 HYPRE_Int hypre_CSRBlockMatrixTranspose(hypre_CSRBlockMatrix *A,
-                                  hypre_CSRBlockMatrix **AT, HYPRE_Int data);
+                                        hypre_CSRBlockMatrix **AT, HYPRE_Int data);
 
-HYPRE_Int hypre_CSRBlockMatrixBlockCopyData(HYPRE_Complex*, HYPRE_Complex*, HYPRE_Complex, HYPRE_Int);
-HYPRE_Int hypre_CSRBlockMatrixBlockCopyDataDiag(HYPRE_Complex*, HYPRE_Complex*, HYPRE_Complex, HYPRE_Int);
+HYPRE_Int hypre_CSRBlockMatrixBlockCopyData(HYPRE_Complex*, HYPRE_Complex*, HYPRE_Complex,
+                                            HYPRE_Int);
+HYPRE_Int hypre_CSRBlockMatrixBlockCopyDataDiag(HYPRE_Complex*, HYPRE_Complex*, HYPRE_Complex,
+                                                HYPRE_Int);
 
 HYPRE_Int hypre_CSRBlockMatrixBlockAddAccumulate(HYPRE_Complex*, HYPRE_Complex*, HYPRE_Int);
-HYPRE_Int hypre_CSRBlockMatrixBlockAddAccumulateDiag(HYPRE_Complex* i1, HYPRE_Complex* o, HYPRE_Int block_size);
-   
+HYPRE_Int hypre_CSRBlockMatrixBlockAddAccumulateDiag(HYPRE_Complex* i1, HYPRE_Complex* o,
+                                                     HYPRE_Int block_size);
+
 
 
 HYPRE_Int
 hypre_CSRBlockMatrixMatvec(HYPRE_Complex alpha, hypre_CSRBlockMatrix *A,
                            hypre_Vector *x, HYPRE_Complex beta, hypre_Vector *y);
-   
+
 
 HYPRE_Int
 hypre_CSRBlockMatrixMatvecT( HYPRE_Complex alpha, hypre_CSRBlockMatrix *A, hypre_Vector  *x,
                              HYPRE_Complex beta, hypre_Vector *y );
 
 HYPRE_Int
-hypre_CSRBlockMatrixBlockInvMatvec(HYPRE_Complex* mat, HYPRE_Complex* v, 
+hypre_CSRBlockMatrixBlockInvMatvec(HYPRE_Complex* mat, HYPRE_Complex* v,
                                    HYPRE_Complex* ov, HYPRE_Int block_size);
-   
-HYPRE_Int 
-hypre_CSRBlockMatrixBlockMatvec(HYPRE_Complex alpha, HYPRE_Complex* mat, HYPRE_Complex* v, HYPRE_Complex beta, 
+
+HYPRE_Int
+hypre_CSRBlockMatrixBlockMatvec(HYPRE_Complex alpha, HYPRE_Complex* mat, HYPRE_Complex* v,
+                                HYPRE_Complex beta,
                                 HYPRE_Complex* ov, HYPRE_Int block_size);
-   
-
-HYPRE_Int hypre_CSRBlockMatrixBlockNorm(HYPRE_Int norm_type, HYPRE_Complex* data, HYPRE_Real* out, HYPRE_Int block_size);
-   
-HYPRE_Int hypre_CSRBlockMatrixBlockSetScalar(HYPRE_Complex* o, HYPRE_Complex beta, HYPRE_Int block_size);
-   
-HYPRE_Int hypre_CSRBlockMatrixComputeSign(HYPRE_Complex *i1, HYPRE_Complex *o, HYPRE_Int block_size);
-HYPRE_Int hypre_CSRBlockMatrixBlockAddAccumulateDiagCheckSign(HYPRE_Complex* i1, HYPRE_Complex* o, HYPRE_Int block_size, HYPRE_Real *sign);
-HYPRE_Int hypre_CSRBlockMatrixBlockMultAddDiagCheckSign(HYPRE_Complex* i1, HYPRE_Complex* i2, HYPRE_Complex beta, HYPRE_Complex* o, HYPRE_Int block_size, HYPRE_Real *sign);
+
+
+HYPRE_Int hypre_CSRBlockMatrixBlockNorm(HYPRE_Int norm_type, HYPRE_Complex* data, HYPRE_Real* out,
+                                        HYPRE_Int block_size);
+
+HYPRE_Int hypre_CSRBlockMatrixBlockSetScalar(HYPRE_Complex* o, HYPRE_Complex beta,
+                                             HYPRE_Int block_size);
+
+HYPRE_Int hypre_CSRBlockMatrixComputeSign(HYPRE_Complex *i1, HYPRE_Complex *o,
+                                          HYPRE_Int block_size);
+HYPRE_Int hypre_CSRBlockMatrixBlockAddAccumulateDiagCheckSign(HYPRE_Complex* i1, HYPRE_Complex* o,
+                                                              HYPRE_Int block_size, HYPRE_Real *sign);
+HYPRE_Int hypre_CSRBlockMatrixBlockMultAddDiagCheckSign(HYPRE_Complex* i1, HYPRE_Complex* i2,
+                                                        HYPRE_Complex beta, HYPRE_Complex* o, HYPRE_Int block_size, HYPRE_Real *sign);
 
 #ifdef __cplusplus
 }
diff --git a/external/hypre/src/parcsr_ls/driver.c b/external/hypre/src/parcsr_ls/driver.c
index 2397320e..0a0aabbd 100644
--- a/external/hypre/src/parcsr_ls/driver.c
+++ b/external/hypre/src/parcsr_ls/driver.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -11,7 +11,7 @@
  * Test driver for unstructured matrix interfoace (parcsr storage).
  * Do `driver -help' for usage info.
  *--------------------------------------------------------------------------*/
- 
+
 HYPRE_Int
 main( HYPRE_Int   argc,
       char *argv[] )
@@ -25,9 +25,9 @@ main( HYPRE_Int   argc,
    HYPRE_Int                 solver_id;
    HYPRE_Int                 ioutdat;
    HYPRE_Int                 debug_flag;
-   HYPRE_Int                 ierr,i; 
+   HYPRE_Int                 ierr, i;
    HYPRE_Int                 max_levels = 25;
-   HYPRE_Int                 num_iterations; 
+   HYPRE_Int                 num_iterations;
    HYPRE_Real          norm;
    HYPRE_Real          final_res_norm;
 
@@ -44,7 +44,7 @@ main( HYPRE_Int   argc,
    HYPRE_Int                 global_m, global_n;
    HYPRE_Int                *partitioning;
 
-   HYPRE_Int		       time_index;
+   HYPRE_Int             time_index;
 
    /* parameters for BoomerAMG */
    HYPRE_Real   strong_threshold;
@@ -53,11 +53,11 @@ main( HYPRE_Int   argc,
    HYPRE_Int      coarsen_type = 0;
    HYPRE_Int      hybrid = 1;
    HYPRE_Int      measure_type = 0;
-   HYPRE_Int     *num_grid_sweeps;  
-   HYPRE_Int     *grid_relax_type;   
+   HYPRE_Int     *num_grid_sweeps;
+   HYPRE_Int     *grid_relax_type;
    HYPRE_Int    **grid_relax_points;
    HYPRE_Int      relax_default;
-   HYPRE_Real  *relax_weight; 
+   HYPRE_Real  *relax_weight;
    HYPRE_Real   tol = 1.0e-6;
 
    /* parameters for PILUT */
@@ -65,7 +65,7 @@ main( HYPRE_Int   argc,
    HYPRE_Int      nonzeros_to_keep = -1;
 
    /* parameters for GMRES */
-   HYPRE_Int	    k_dim;
+   HYPRE_Int       k_dim;
 
    /*-----------------------------------------------------------
     * Initialize some stuff
@@ -80,7 +80,7 @@ main( HYPRE_Int   argc,
    /*-----------------------------------------------------------
     * Set defaults
     *-----------------------------------------------------------*/
- 
+
    build_matrix_type      = 1;
    build_matrix_arg_index = argc;
    build_rhs_type = 0;
@@ -95,7 +95,7 @@ main( HYPRE_Int   argc,
    /*-----------------------------------------------------------
     * Parse command line
     *-----------------------------------------------------------*/
- 
+
    print_usage = 0;
    arg_index = 1;
 
@@ -153,59 +153,59 @@ main( HYPRE_Int   argc,
          arg_index++;
          build_rhs_type      = 2;
          build_rhs_arg_index = arg_index;
-      }      
+      }
       else if ( strcmp(argv[arg_index], "-rhsrand") == 0 )
       {
          arg_index++;
          build_rhs_type      = 3;
          build_rhs_arg_index = arg_index;
-      }    
+      }
       else if ( strcmp(argv[arg_index], "-ruge") == 0 )
       {
          arg_index++;
          coarsen_type      = 1;
-      }    
+      }
       else if ( strcmp(argv[arg_index], "-ruge2b") == 0 )
       {
          arg_index++;
          coarsen_type      = 2;
-      }    
+      }
       else if ( strcmp(argv[arg_index], "-ruge3") == 0 )
       {
          arg_index++;
          coarsen_type      = 3;
-      }    
+      }
       else if ( strcmp(argv[arg_index], "-ruge3c") == 0 )
       {
          arg_index++;
          coarsen_type      = 4;
-      }    
+      }
       else if ( strcmp(argv[arg_index], "-rugerlx") == 0 )
       {
          arg_index++;
          coarsen_type      = 5;
-      }    
+      }
       else if ( strcmp(argv[arg_index], "-falgout") == 0 )
       {
          arg_index++;
          coarsen_type      = 6;
-      }    
+      }
       else if ( strcmp(argv[arg_index], "-nohybrid") == 0 )
       {
          arg_index++;
          hybrid      = -1;
-      }    
+      }
       else if ( strcmp(argv[arg_index], "-gm") == 0 )
       {
          arg_index++;
          measure_type      = 1;
-      }    
+      }
       else if ( strcmp(argv[arg_index], "-xisone") == 0 )
       {
          arg_index++;
          build_rhs_type      = 4;
          build_rhs_arg_index = arg_index;
-      }    
+      }
       else if ( strcmp(argv[arg_index], "-rlx") == 0 )
       {
          arg_index++;
@@ -228,7 +228,7 @@ main( HYPRE_Int   argc,
 
    /* for CGNR preconditioned with Boomeramg, only relaxation scheme 2 is
       implemented, i.e. Jacobi relaxation with Matvec */
-   if (solver_id == 5) relax_default = 2;
+   if (solver_id == 5) { relax_default = 2; }
 
    /* defaults for BoomerAMG */
    strong_threshold = 0.25;
@@ -240,56 +240,58 @@ main( HYPRE_Int   argc,
    grid_relax_points = hypre_CTAlloc(HYPRE_Int *, 4, HYPRE_MEMORY_HOST);
    relax_weight = hypre_CTAlloc(HYPRE_Real, max_levels, HYPRE_MEMORY_HOST);
 
-   for (i=0; i < max_levels; i++)
-	relax_weight[i] = 0.0;
+   for (i = 0; i < max_levels; i++)
+   {
+      relax_weight[i] = 0.0;
+   }
    if (coarsen_type == 5)
    {
       /* fine grid */
       num_grid_sweeps[0] = 3;
-      grid_relax_type[0] = relax_default; 
-      grid_relax_points[0] = hypre_CTAlloc(HYPRE_Int,  4, HYPRE_MEMORY_HOST); 
+      grid_relax_type[0] = relax_default;
+      grid_relax_points[0] = hypre_CTAlloc(HYPRE_Int,  4, HYPRE_MEMORY_HOST);
       grid_relax_points[0][0] = -2;
       grid_relax_points[0][1] = -1;
       grid_relax_points[0][2] = 1;
-   
+
       /* down cycle */
       num_grid_sweeps[1] = 4;
-      grid_relax_type[1] = relax_default; 
-      grid_relax_points[1] = hypre_CTAlloc(HYPRE_Int,  4, HYPRE_MEMORY_HOST); 
+      grid_relax_type[1] = relax_default;
+      grid_relax_points[1] = hypre_CTAlloc(HYPRE_Int,  4, HYPRE_MEMORY_HOST);
       grid_relax_points[1][0] = -1;
       grid_relax_points[1][1] = 1;
       grid_relax_points[1][2] = -2;
       grid_relax_points[1][3] = -2;
-   
+
       /* up cycle */
       num_grid_sweeps[2] = 4;
-      grid_relax_type[2] = relax_default; 
-      grid_relax_points[2] = hypre_CTAlloc(HYPRE_Int,  4, HYPRE_MEMORY_HOST); 
+      grid_relax_type[2] = relax_default;
+      grid_relax_points[2] = hypre_CTAlloc(HYPRE_Int,  4, HYPRE_MEMORY_HOST);
       grid_relax_points[2][0] = -2;
       grid_relax_points[2][1] = -2;
       grid_relax_points[2][2] = 1;
       grid_relax_points[2][3] = -1;
    }
    else
-   {   
+   {
       /* fine grid */
       num_grid_sweeps[0] = 2;
-      grid_relax_type[0] = relax_default; 
-      grid_relax_points[0] = hypre_CTAlloc(HYPRE_Int,  2, HYPRE_MEMORY_HOST); 
+      grid_relax_type[0] = relax_default;
+      grid_relax_points[0] = hypre_CTAlloc(HYPRE_Int,  2, HYPRE_MEMORY_HOST);
       grid_relax_points[0][0] = 1;
       grid_relax_points[0][1] = -1;
-  
+
       /* down cycle */
       num_grid_sweeps[1] = 2;
-      grid_relax_type[1] = relax_default; 
-      grid_relax_points[1] = hypre_CTAlloc(HYPRE_Int,  2, HYPRE_MEMORY_HOST); 
+      grid_relax_type[1] = relax_default;
+      grid_relax_points[1] = hypre_CTAlloc(HYPRE_Int,  2, HYPRE_MEMORY_HOST);
       grid_relax_points[1][0] = 1;
       grid_relax_points[1][1] = -1;
-   
+
       /* up cycle */
       num_grid_sweeps[2] = 2;
-      grid_relax_type[2] = relax_default; 
-      grid_relax_points[2] = hypre_CTAlloc(HYPRE_Int,  2, HYPRE_MEMORY_HOST); 
+      grid_relax_type[2] = relax_default;
+      grid_relax_points[2] = hypre_CTAlloc(HYPRE_Int,  2, HYPRE_MEMORY_HOST);
       grid_relax_points[2][0] = -1;
       grid_relax_points[2][1] = 1;
    }
@@ -315,8 +317,10 @@ main( HYPRE_Int   argc,
       {
          arg_index++;
          relax_weight[0] = atof(argv[arg_index++]);
-         for (i=1; i < max_levels; i++)
-	   relax_weight[i] = relax_weight[0];
+         for (i = 1; i < max_levels; i++)
+         {
+            relax_weight[i] = relax_weight[0];
+         }
       }
       else if ( strcmp(argv[arg_index], "-th") == 0 )
       {
@@ -357,7 +361,7 @@ main( HYPRE_Int   argc,
    /*-----------------------------------------------------------
     * Print usage info
     *-----------------------------------------------------------*/
- 
+
    if ( (print_usage) && (myid == 0) )
    {
       hypre_printf("\n");
@@ -382,9 +386,9 @@ main( HYPRE_Int   argc,
       hypre_printf("\n");
       hypre_printf("  -solver <ID>           : solver ID\n");
       hypre_printf("       1=AMG-PCG    2=DS-PCG   \n");
-      hypre_printf("       3=AMG-GMRES  4=DS-GMRES  \n");     
-      hypre_printf("       5=AMG-CGNR   6=DS-CGNR  \n");     
-      hypre_printf("       7=PILUT-GMRES  \n");     
+      hypre_printf("       3=AMG-GMRES  4=DS-GMRES  \n");
+      hypre_printf("       5=AMG-CGNR   6=DS-CGNR  \n");
+      hypre_printf("       7=PILUT-GMRES  \n");
       hypre_printf("\n");
       hypre_printf("   -ruge                 : Ruge coarsening (local)\n");
       hypre_printf("   -ruge3                : third pass on boundary\n");
@@ -398,20 +402,20 @@ main( HYPRE_Int   argc,
       hypre_printf("  -rlx <val>             : relaxation type\n");
       hypre_printf("       0=Weighted Jacobi  \n");
       hypre_printf("       3=Hybrid Jacobi/Gauss-Seidel  \n");
-      hypre_printf("\n");  
+      hypre_printf("\n");
       hypre_printf("  -th <val>              : set AMG threshold Theta = val \n");
       hypre_printf("  -tr <val>              : set AMG interpolation truncation factor = val \n");
       hypre_printf("  -tol <val>             : set AMG convergence tolerance to val\n");
       hypre_printf("  -w  <val>              : set Jacobi relax weight = val\n");
       hypre_printf("  -k  <val>              : dimension Krylov space for GMRES\n");
-      hypre_printf("\n");  
+      hypre_printf("\n");
       hypre_printf("  -drop_tol  <val>       : set threshold for dropping in PILUT\n");
       hypre_printf("  -nonzeros_to_keep <val>: number of nonzeros in each row to keep\n");
-      hypre_printf("\n");  
+      hypre_printf("\n");
       hypre_printf("  -iout <val>            : set output flag\n");
-      hypre_printf("       0=no output    1=matrix stats\n"); 
-      hypre_printf("       2=cycle stats  3=matrix & cycle stats\n"); 
-      hypre_printf("\n");  
+      hypre_printf("       0=no output    1=matrix stats\n");
+      hypre_printf("       2=cycle stats  3=matrix & cycle stats\n");
+      hypre_printf("\n");
       hypre_printf("  -dbg <val>             : set debug flag\n");
       hypre_printf("       0=no debugging\n       1=internal timing\n       2=interpolation truncation\n       3=more detailed timing in coarsening routine\n");
       exit(1);
@@ -424,7 +428,7 @@ main( HYPRE_Int   argc,
    /*-----------------------------------------------------------
     * Print driver parameters
     *-----------------------------------------------------------*/
- 
+
    if (myid == 0)
    {
       hypre_printf("Running with these driver parameters:\n");
@@ -473,11 +477,11 @@ main( HYPRE_Int   argc,
       hypre_printf("Rhs from file not yet implemented.  Defaults to b=0\n");
       HYPRE_ParCSRMatrixGetRowPartitioning(A, &partitioning);
       HYPRE_ParCSRMatrixGetDims(A, &global_m, &global_n);
-      HYPRE_ParVectorCreate(hypre_MPI_COMM_WORLD, global_m, partitioning,&b);
+      HYPRE_ParVectorCreate(hypre_MPI_COMM_WORLD, global_m, partitioning, &b);
       HYPRE_ParVectorInitialize(b);
       HYPRE_ParVectorSetConstantValues(b, 0.0);
 
-      HYPRE_ParVectorCreate(hypre_MPI_COMM_WORLD, global_n, partitioning,&x);
+      HYPRE_ParVectorCreate(hypre_MPI_COMM_WORLD, global_n, partitioning, &x);
       HYPRE_ParVectorInitialize(x);
       HYPRE_ParVectorSetConstantValues(x, 1.0);
    }
@@ -487,50 +491,50 @@ main( HYPRE_Int   argc,
 
       HYPRE_ParCSRMatrixGetRowPartitioning(A, &partitioning);
       HYPRE_ParCSRMatrixGetDims(A, &global_m, &global_n);
-      HYPRE_ParVectorCreate(hypre_MPI_COMM_WORLD, global_n, partitioning,&x);
+      HYPRE_ParVectorCreate(hypre_MPI_COMM_WORLD, global_n, partitioning, &x);
       HYPRE_ParVectorInitialize(x);
-      HYPRE_ParVectorSetConstantValues(x, 0.0);      
+      HYPRE_ParVectorSetConstantValues(x, 0.0);
    }
    else if ( build_rhs_type == 3 )
    {
 
       HYPRE_ParCSRMatrixGetRowPartitioning(A, &partitioning);
       HYPRE_ParCSRMatrixGetDims(A, &global_m, &global_n);
-      HYPRE_ParVectorCreate(hypre_MPI_COMM_WORLD, global_m, partitioning,&b);
+      HYPRE_ParVectorCreate(hypre_MPI_COMM_WORLD, global_m, partitioning, &b);
       HYPRE_ParVectorInitialize(b);
       HYPRE_ParVectorSetRandomValues(b, 22775);
-      HYPRE_ParVectorInnerProd(b,b,&norm);
-      norm = 1.0/sqrt(norm);
-      ierr = HYPRE_ParVectorScale(norm, b);      
+      HYPRE_ParVectorInnerProd(b, b, &norm);
+      norm = 1.0 / hypre_sqrt(norm);
+      ierr = HYPRE_ParVectorScale(norm, b);
 
-      HYPRE_ParVectorCreate(hypre_MPI_COMM_WORLD, global_n, partitioning,&x);
+      HYPRE_ParVectorCreate(hypre_MPI_COMM_WORLD, global_n, partitioning, &x);
       HYPRE_ParVectorInitialize(x);
-      HYPRE_ParVectorSetConstantValues(x, 0.0);      
+      HYPRE_ParVectorSetConstantValues(x, 0.0);
    }
    else if ( build_rhs_type == 4 )
    {
 
       HYPRE_ParCSRMatrixGetRowPartitioning(A, &partitioning);
       HYPRE_ParCSRMatrixGetDims(A, &global_m, &global_n);
-      HYPRE_ParVectorCreate(hypre_MPI_COMM_WORLD, global_n, partitioning,&x);
+      HYPRE_ParVectorCreate(hypre_MPI_COMM_WORLD, global_n, partitioning, &x);
       HYPRE_ParVectorInitialize(x);
-      HYPRE_ParVectorSetConstantValues(x, 1.0);      
+      HYPRE_ParVectorSetConstantValues(x, 1.0);
 
-      HYPRE_ParVectorCreate(hypre_MPI_COMM_WORLD, global_m, partitioning,&b);
+      HYPRE_ParVectorCreate(hypre_MPI_COMM_WORLD, global_m, partitioning, &b);
       HYPRE_ParVectorInitialize(b);
-      HYPRE_ParCSRMatrixMatvec(1.0,A,x,0.0,b);
+      HYPRE_ParCSRMatrixMatvec(1.0, A, x, 0.0, b);
 
-      HYPRE_ParVectorSetConstantValues(x, 0.0);      
+      HYPRE_ParVectorSetConstantValues(x, 0.0);
    }
    else /* if ( build_rhs_type == 0 ) */
    {
       HYPRE_ParCSRMatrixGetRowPartitioning(A, &partitioning);
       HYPRE_ParCSRMatrixGetDims(A, &global_m, &global_n);
-      HYPRE_ParVectorCreate(hypre_MPI_COMM_WORLD, global_m, partitioning,&b);
+      HYPRE_ParVectorCreate(hypre_MPI_COMM_WORLD, global_m, partitioning, &b);
       HYPRE_ParVectorInitialize(b);
       HYPRE_ParVectorSetConstantValues(b, 0.0);
 
-      HYPRE_ParVectorCreate(hypre_MPI_COMM_WORLD, global_n, partitioning,&x);
+      HYPRE_ParVectorCreate(hypre_MPI_COMM_WORLD, global_n, partitioning, &x);
       HYPRE_ParVectorInitialize(x);
       HYPRE_ParVectorSetConstantValues(x, 1.0);
    }
@@ -543,8 +547,8 @@ main( HYPRE_Int   argc,
       time_index = hypre_InitializeTiming("BoomerAMG Setup");
       hypre_BeginTiming(time_index);
 
-      HYPRE_BoomerAMGCreate(&amg_solver); 
-      HYPRE_BoomerAMGSetCoarsenType(amg_solver, (hybrid*coarsen_type));
+      HYPRE_BoomerAMGCreate(&amg_solver);
+      HYPRE_BoomerAMGSetCoarsenType(amg_solver, (hybrid * coarsen_type));
       HYPRE_BoomerAMGSetMeasureType(amg_solver, measure_type);
       HYPRE_BoomerAMGSetTol(amg_solver, tol);
       HYPRE_BoomerAMGSetStrongThreshold(amg_solver, strong_threshold);
@@ -565,7 +569,7 @@ main( HYPRE_Int   argc,
       hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
       hypre_FinalizeTiming(time_index);
       hypre_ClearTiming();
- 
+
       time_index = hypre_InitializeTiming("BoomerAMG Solve");
       hypre_BeginTiming(time_index);
 
@@ -580,26 +584,26 @@ main( HYPRE_Int   argc,
    }
 
    /*-----------------------------------------------------------
-    * Solve the system using PCG 
+    * Solve the system using PCG
     *-----------------------------------------------------------*/
 
    if (solver_id == 1 || solver_id == 2)
    {
       time_index = hypre_InitializeTiming("PCG Setup");
       hypre_BeginTiming(time_index);
- 
+
       HYPRE_ParCSRPCGCreate(hypre_MPI_COMM_WORLD, &pcg_solver);
       HYPRE_ParCSRPCGSetMaxIter(pcg_solver, 500);
       HYPRE_ParCSRPCGSetTol(pcg_solver, tol);
       HYPRE_ParCSRPCGSetTwoNorm(pcg_solver, 1);
       HYPRE_ParCSRPCGSetRelChange(pcg_solver, 0);
       HYPRE_ParCSRPCGSetPrintLevel(pcg_solver, 1);
- 
+
       if (solver_id == 1)
       {
          /* use BoomerAMG as preconditioner */
-         HYPRE_BoomerAMGCreate(&pcg_precond); 
-         HYPRE_BoomerAMGSetCoarsenType(pcg_precond, (hybrid*coarsen_type));
+         HYPRE_BoomerAMGCreate(&pcg_precond);
+         HYPRE_BoomerAMGSetCoarsenType(pcg_precond, (hybrid * coarsen_type));
          HYPRE_BoomerAMGSetMeasureType(pcg_precond, measure_type);
          HYPRE_BoomerAMGSetStrongThreshold(pcg_precond, strong_threshold);
          HYPRE_BoomerAMGSetPrintLevel(pcg_precond, ioutdat);
@@ -627,28 +631,28 @@ main( HYPRE_Int   argc,
                                    HYPRE_ParCSRDiagScaleSetup,
                                    pcg_precond);
       }
- 
+
       HYPRE_ParCSRPCGSetup(pcg_solver, A, b, x);
- 
+
       hypre_EndTiming(time_index);
       hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
       hypre_FinalizeTiming(time_index);
       hypre_ClearTiming();
-   
+
       time_index = hypre_InitializeTiming("PCG Solve");
       hypre_BeginTiming(time_index);
- 
+
       HYPRE_ParCSRPCGSolve(pcg_solver, A, b, x);
- 
+
       hypre_EndTiming(time_index);
       hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
       hypre_FinalizeTiming(time_index);
       hypre_ClearTiming();
- 
+
       HYPRE_ParCSRPCGGetNumIterations(pcg_solver, &num_iterations);
       HYPRE_ParCSRPCGGetFinalRelativeResidualNorm(pcg_solver, &final_res_norm);
       HYPRE_ParCSRPCGDestroy(pcg_solver);
- 
+
       if (solver_id == 1)
       {
          HYPRE_BoomerAMGDestroy(pcg_precond);
@@ -660,30 +664,30 @@ main( HYPRE_Int   argc,
          hypre_printf("Final Relative Residual Norm = %e\n", final_res_norm);
          hypre_printf("\n");
       }
- 
+
    }
 
    /*-----------------------------------------------------------
-    * Solve the system using GMRES 
+    * Solve the system using GMRES
     *-----------------------------------------------------------*/
 
    if (solver_id == 3 || solver_id == 4 || solver_id == 7)
    {
       time_index = hypre_InitializeTiming("GMRES Setup");
       hypre_BeginTiming(time_index);
- 
+
       HYPRE_ParCSRGMRESCreate(hypre_MPI_COMM_WORLD, &pcg_solver);
       HYPRE_ParCSRGMRESSetKDim(pcg_solver, k_dim);
       HYPRE_ParCSRGMRESSetMaxIter(pcg_solver, 100);
       HYPRE_ParCSRGMRESSetTol(pcg_solver, tol);
       HYPRE_ParCSRGMRESSetLogging(pcg_solver, 1);
- 
+
       if (solver_id == 3)
       {
          /* use BoomerAMG as preconditioner */
 
-         HYPRE_BoomerAMGCreate(&pcg_precond); 
-         HYPRE_BoomerAMGSetCoarsenType(pcg_precond, (hybrid*coarsen_type));
+         HYPRE_BoomerAMGCreate(&pcg_precond);
+         HYPRE_BoomerAMGSetCoarsenType(pcg_precond, (hybrid * coarsen_type));
          HYPRE_BoomerAMGSetMeasureType(pcg_precond, measure_type);
          HYPRE_BoomerAMGSetStrongThreshold(pcg_precond, strong_threshold);
          HYPRE_BoomerAMGSetPrintLevel(pcg_precond, ioutdat);
@@ -696,9 +700,9 @@ main( HYPRE_Int   argc,
          HYPRE_BoomerAMGSetGridRelaxPoints(pcg_precond, grid_relax_points);
          HYPRE_BoomerAMGSetMaxLevels(pcg_precond, max_levels);
          HYPRE_ParCSRGMRESSetPrecond(pcg_solver,
-                                   HYPRE_BoomerAMGSolve,
-                                   HYPRE_BoomerAMGSetup,
-                                   pcg_precond);
+                                     HYPRE_BoomerAMGSolve,
+                                     HYPRE_BoomerAMGSetup,
+                                     pcg_precond);
       }
       else if (solver_id == 4)
       {
@@ -707,53 +711,54 @@ main( HYPRE_Int   argc,
          pcg_precond = NULL;
 
          HYPRE_ParCSRGMRESSetPrecond(pcg_solver,
-                                   HYPRE_ParCSRDiagScale,
-                                   HYPRE_ParCSRDiagScaleSetup,
-                                   pcg_precond);
+                                     HYPRE_ParCSRDiagScale,
+                                     HYPRE_ParCSRDiagScaleSetup,
+                                     pcg_precond);
       }
       else if (solver_id == 7)
       {
          /* use PILUT as preconditioner */
-         ierr = HYPRE_ParCSRPilutCreate( hypre_MPI_COMM_WORLD, &pcg_precond ); 
-         if (ierr) {
-	   hypre_printf("Error in ParPilutCreate\n");
+         ierr = HYPRE_ParCSRPilutCreate( hypre_MPI_COMM_WORLD, &pcg_precond );
+         if (ierr)
+         {
+            hypre_printf("Error in ParPilutCreate\n");
          }
 
          HYPRE_ParCSRGMRESSetPrecond(pcg_solver,
-                                   HYPRE_ParCSRPilutSolve,
-                                   HYPRE_ParCSRPilutSetup,
-                                   pcg_precond);
+                                     HYPRE_ParCSRPilutSolve,
+                                     HYPRE_ParCSRPilutSetup,
+                                     pcg_precond);
 
          if (drop_tol >= 0 )
             HYPRE_ParCSRPilutSetDropTolerance( pcg_precond,
-               drop_tol );
+                                               drop_tol );
 
          if (nonzeros_to_keep >= 0 )
             HYPRE_ParCSRPilutSetFactorRowSize( pcg_precond,
-               nonzeros_to_keep );
+                                               nonzeros_to_keep );
       }
- 
+
       HYPRE_ParCSRGMRESSetup(pcg_solver, A, b, x);
- 
+
       hypre_EndTiming(time_index);
       hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
       hypre_FinalizeTiming(time_index);
       hypre_ClearTiming();
-   
+
       time_index = hypre_InitializeTiming("GMRES Solve");
       hypre_BeginTiming(time_index);
- 
+
       HYPRE_ParCSRGMRESSolve(pcg_solver, A, b, x);
- 
+
       hypre_EndTiming(time_index);
       hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
       hypre_FinalizeTiming(time_index);
       hypre_ClearTiming();
- 
+
       HYPRE_ParCSRGMRESGetNumIterations(pcg_solver, &num_iterations);
-      HYPRE_ParCSRGMRESGetFinalRelativeResidualNorm(pcg_solver,&final_res_norm);
+      HYPRE_ParCSRGMRESGetFinalRelativeResidualNorm(pcg_solver, &final_res_norm);
       HYPRE_ParCSRGMRESDestroy(pcg_solver);
- 
+
       if (solver_id == 3)
       {
          HYPRE_BoomerAMGDestroy(pcg_precond);
@@ -773,24 +778,24 @@ main( HYPRE_Int   argc,
       }
    }
    /*-----------------------------------------------------------
-    * Solve the system using CGNR 
+    * Solve the system using CGNR
     *-----------------------------------------------------------*/
 
    if (solver_id == 5 || solver_id == 6)
    {
       time_index = hypre_InitializeTiming("CGNR Setup");
       hypre_BeginTiming(time_index);
- 
+
       HYPRE_ParCSRCGNRCreate(hypre_MPI_COMM_WORLD, &pcg_solver);
       HYPRE_ParCSRCGNRSetMaxIter(pcg_solver, 1000);
       HYPRE_ParCSRCGNRSetTol(pcg_solver, tol);
       HYPRE_ParCSRCGNRSetLogging(pcg_solver, 1);
- 
+
       if (solver_id == 5)
       {
          /* use BoomerAMG as preconditioner */
-         HYPRE_BoomerAMGCreate(&pcg_precond); 
-         HYPRE_BoomerAMGSetCoarsenType(pcg_precond, (hybrid*coarsen_type));
+         HYPRE_BoomerAMGCreate(&pcg_precond);
+         HYPRE_BoomerAMGSetCoarsenType(pcg_precond, (hybrid * coarsen_type));
          HYPRE_BoomerAMGSetMeasureType(pcg_precond, measure_type);
          HYPRE_BoomerAMGSetStrongThreshold(pcg_precond, strong_threshold);
          HYPRE_BoomerAMGSetPrintLevel(pcg_precond, ioutdat);
@@ -803,10 +808,10 @@ main( HYPRE_Int   argc,
          HYPRE_BoomerAMGSetGridRelaxPoints(pcg_precond, grid_relax_points);
          HYPRE_BoomerAMGSetMaxLevels(pcg_precond, max_levels);
          HYPRE_ParCSRCGNRSetPrecond(pcg_solver,
-                                   HYPRE_BoomerAMGSolve,
-                                   HYPRE_BoomerAMGSolveT,
-                                   HYPRE_BoomerAMGSetup,
-                                   pcg_precond);
+                                    HYPRE_BoomerAMGSolve,
+                                    HYPRE_BoomerAMGSolveT,
+                                    HYPRE_BoomerAMGSetup,
+                                    pcg_precond);
       }
       else if (solver_id == 6)
       {
@@ -815,33 +820,33 @@ main( HYPRE_Int   argc,
          pcg_precond = NULL;
 
          HYPRE_ParCSRCGNRSetPrecond(pcg_solver,
-                                   HYPRE_ParCSRDiagScale,
-                                   HYPRE_ParCSRDiagScale,
-                                   HYPRE_ParCSRDiagScaleSetup,
-                                   pcg_precond);
+                                    HYPRE_ParCSRDiagScale,
+                                    HYPRE_ParCSRDiagScale,
+                                    HYPRE_ParCSRDiagScaleSetup,
+                                    pcg_precond);
       }
- 
+
       HYPRE_ParCSRCGNRSetup(pcg_solver, A, b, x);
- 
+
       hypre_EndTiming(time_index);
       hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
       hypre_FinalizeTiming(time_index);
       hypre_ClearTiming();
-   
+
       time_index = hypre_InitializeTiming("CGNR Solve");
       hypre_BeginTiming(time_index);
- 
+
       HYPRE_ParCSRCGNRSolve(pcg_solver, A, b, x);
- 
+
       hypre_EndTiming(time_index);
       hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
       hypre_FinalizeTiming(time_index);
       hypre_ClearTiming();
- 
+
       HYPRE_ParCSRCGNRGetNumIterations(pcg_solver, &num_iterations);
-      HYPRE_ParCSRCGNRGetFinalRelativeResidualNorm(pcg_solver,&final_res_norm);
+      HYPRE_ParCSRCGNRGetFinalRelativeResidualNorm(pcg_solver, &final_res_norm);
       HYPRE_ParCSRCGNRDestroy(pcg_solver);
- 
+
       if (solver_id == 5)
       {
          HYPRE_BoomerAMGDestroy(pcg_precond);
@@ -921,16 +926,16 @@ BuildParFromFile( HYPRE_Int                  argc,
    /*-----------------------------------------------------------
     * Print driver parameters
     *-----------------------------------------------------------*/
- 
+
    if (myid == 0)
    {
       hypre_printf("  FromFile: %s\n", filename);
    }
 
    /*-----------------------------------------------------------
-    * Generate the matrix 
+    * Generate the matrix
     *-----------------------------------------------------------*/
- 
+
    A = HYPRE_ParCSRMatrixRead(hypre_MPI_COMM_WORLD, filename);
 
    *A_ptr = A;
@@ -969,7 +974,7 @@ BuildParLaplacian( HYPRE_Int                  argc,
    /*-----------------------------------------------------------
     * Set defaults
     *-----------------------------------------------------------*/
- 
+
    nx = 10;
    ny = 10;
    nz = 10;
@@ -1019,7 +1024,7 @@ BuildParLaplacian( HYPRE_Int                  argc,
     * Check a few things
     *-----------------------------------------------------------*/
 
-   if ((P*Q*R) != num_procs)
+   if ((P * Q * R) != num_procs)
    {
       hypre_printf("Error: Invalid number of processors or processor topology \n");
       exit(1);
@@ -1028,7 +1033,7 @@ BuildParLaplacian( HYPRE_Int                  argc,
    /*-----------------------------------------------------------
     * Print driver parameters
     *-----------------------------------------------------------*/
- 
+
    if (myid == 0)
    {
       hypre_printf("  Laplacian:\n");
@@ -1043,13 +1048,13 @@ BuildParLaplacian( HYPRE_Int                  argc,
 
    /* compute p,q,r from P,Q,R and myid */
    p = myid % P;
-   q = (( myid - p)/P) % Q;
-   r = ( myid - p - P*q)/( P*Q );
+   q = (( myid - p) / P) % Q;
+   r = ( myid - p - P * q) / ( P * Q );
 
    /*-----------------------------------------------------------
-    * Generate the matrix 
+    * Generate the matrix
     *-----------------------------------------------------------*/
- 
+
    values = hypre_CTAlloc(HYPRE_Real,  4, HYPRE_MEMORY_HOST);
 
    values[1] = -cx;
@@ -1059,19 +1064,19 @@ BuildParLaplacian( HYPRE_Int                  argc,
    values[0] = 0.0;
    if (nx > 1)
    {
-      values[0] += 2.0*cx;
+      values[0] += 2.0 * cx;
    }
    if (ny > 1)
    {
-      values[0] += 2.0*cy;
+      values[0] += 2.0 * cy;
    }
    if (nz > 1)
    {
-      values[0] += 2.0*cz;
+      values[0] += 2.0 * cz;
    }
 
-   A = (HYPRE_ParCSRMatrix) 
-	GenerateLaplacian(hypre_MPI_COMM_WORLD, nx, ny, nz, P, Q, R, p, q, r, values);
+   A = (HYPRE_ParCSRMatrix)
+       GenerateLaplacian(hypre_MPI_COMM_WORLD, nx, ny, nz, P, Q, R, p, q, r, values);
 
    hypre_TFree(values, HYPRE_MEMORY_HOST);
 
@@ -1081,7 +1086,7 @@ BuildParLaplacian( HYPRE_Int                  argc,
 }
 
 /*----------------------------------------------------------------------
- * Build standard 7-point convection-diffusion operator 
+ * Build standard 7-point convection-diffusion operator
  * Parameters given in command line.
  * Operator:
  *
@@ -1099,7 +1104,7 @@ BuildParDifConv( HYPRE_Int                  argc,
    HYPRE_Int                 P, Q, R;
    HYPRE_Real          cx, cy, cz;
    HYPRE_Real          ax, ay, az;
-   HYPRE_Real          hinx,hiny,hinz;
+   HYPRE_Real          hinx, hiny, hinz;
 
    HYPRE_ParCSRMatrix  A;
 
@@ -1117,14 +1122,14 @@ BuildParDifConv( HYPRE_Int                  argc,
    /*-----------------------------------------------------------
     * Set defaults
     *-----------------------------------------------------------*/
- 
+
    nx = 10;
    ny = 10;
    nz = 10;
 
-   hinx = 1.0/(nx+1);
-   hiny = 1.0/(ny+1);
-   hinz = 1.0/(nz+1);
+   hinx = 1.0 / (nx + 1);
+   hiny = 1.0 / (ny + 1);
+   hinz = 1.0 / (nz + 1);
 
    P  = 1;
    Q  = num_procs;
@@ -1182,7 +1187,7 @@ BuildParDifConv( HYPRE_Int                  argc,
     * Check a few things
     *-----------------------------------------------------------*/
 
-   if ((P*Q*R) != num_procs)
+   if ((P * Q * R) != num_procs)
    {
       hypre_printf("Error: Invalid number of processors or processor topology \n");
       exit(1);
@@ -1191,11 +1196,11 @@ BuildParDifConv( HYPRE_Int                  argc,
    /*-----------------------------------------------------------
     * Print driver parameters
     *-----------------------------------------------------------*/
- 
+
    if (myid == 0)
    {
       hypre_printf("  Convection-Diffusion: \n");
-      hypre_printf("    -cx Dxx - cy Dyy - cz Dzz + ax Dx + ay Dy + az Dz = f\n");  
+      hypre_printf("    -cx Dxx - cy Dyy - cz Dzz + ax Dx + ay Dy + az Dz = f\n");
       hypre_printf("    (nx, ny, nz) = (%d, %d, %d)\n", nx, ny, nz);
       hypre_printf("    (Px, Py, Pz) = (%d, %d, %d)\n", P,  Q,  R);
       hypre_printf("    (cx, cy, cz) = (%f, %f, %f)\n", cx, cy, cz);
@@ -1208,38 +1213,38 @@ BuildParDifConv( HYPRE_Int                  argc,
 
    /* compute p,q,r from P,Q,R and myid */
    p = myid % P;
-   q = (( myid - p)/P) % Q;
-   r = ( myid - p - P*q)/( P*Q );
+   q = (( myid - p) / P) % Q;
+   r = ( myid - p - P * q) / ( P * Q );
 
    /*-----------------------------------------------------------
-    * Generate the matrix 
+    * Generate the matrix
     *-----------------------------------------------------------*/
- 
+
    values = hypre_CTAlloc(HYPRE_Real,  7, HYPRE_MEMORY_HOST);
 
-   values[1] = -cx/(hinx*hinx);
-   values[2] = -cy/(hiny*hiny);
-   values[3] = -cz/(hinz*hinz);
-   values[4] = -cx/(hinx*hinx) + ax/hinx;
-   values[5] = -cy/(hiny*hiny) + ay/hiny;
-   values[6] = -cz/(hinz*hinz) + az/hinz;
+   values[1] = -cx / (hinx * hinx);
+   values[2] = -cy / (hiny * hiny);
+   values[3] = -cz / (hinz * hinz);
+   values[4] = -cx / (hinx * hinx) + ax / hinx;
+   values[5] = -cy / (hiny * hiny) + ay / hiny;
+   values[6] = -cz / (hinz * hinz) + az / hinz;
 
    values[0] = 0.0;
    if (nx > 1)
    {
-      values[0] += 2.0*cx/(hinx*hinx) - 1.0*ax/hinx;
+      values[0] += 2.0 * cx / (hinx * hinx) - 1.0 * ax / hinx;
    }
    if (ny > 1)
    {
-      values[0] += 2.0*cy/(hiny*hiny) - 1.0*ay/hiny;
+      values[0] += 2.0 * cy / (hiny * hiny) - 1.0 * ay / hiny;
    }
    if (nz > 1)
    {
-      values[0] += 2.0*cz/(hinz*hinz) - 1.0*az/hinz;
+      values[0] += 2.0 * cz / (hinz * hinz) - 1.0 * az / hinz;
    }
 
    A = (HYPRE_ParCSRMatrix) GenerateDifConv(hypre_MPI_COMM_WORLD,
-                               nx, ny, nz, P, Q, R, p, q, r, values);
+                                            nx, ny, nz, P, Q, R, p, q, r, values);
 
    hypre_TFree(values, HYPRE_MEMORY_HOST);
 
@@ -1291,15 +1296,15 @@ BuildParFromOneFile( HYPRE_Int                  argc,
    /*-----------------------------------------------------------
     * Print driver parameters
     *-----------------------------------------------------------*/
- 
+
    if (myid == 0)
    {
       hypre_printf("  FromFile: %s\n", filename);
 
       /*-----------------------------------------------------------
-       * Generate the matrix 
+       * Generate the matrix
        *-----------------------------------------------------------*/
- 
+
       A_CSR = HYPRE_CSRMatrixRead(filename);
    }
    A = HYPRE_CSRMatrixToParCSRMatrix(hypre_MPI_COMM_WORLD, A_CSR, NULL, NULL);
@@ -1312,7 +1317,7 @@ BuildParFromOneFile( HYPRE_Int                  argc,
 }
 
 /*----------------------------------------------------------------------
- * Build Rhs from one file on Proc. 0. Distributes vector across processors 
+ * Build Rhs from one file on Proc. 0. Distributes vector across processors
  * giving each about using the distribution of the matrix A.
  *----------------------------------------------------------------------*/
 
@@ -1329,7 +1334,7 @@ BuildRhsParFromOneFile( HYPRE_Int                  argc,
    HYPRE_Vector     b_CSR;
 
    HYPRE_Int                 myid;
-   HYPRE_Int 		      *partitioning;
+   HYPRE_Int            *partitioning;
 
    /*-----------------------------------------------------------
     * Initialize some stuff
@@ -1354,15 +1359,15 @@ BuildRhsParFromOneFile( HYPRE_Int                  argc,
    /*-----------------------------------------------------------
     * Print driver parameters
     *-----------------------------------------------------------*/
- 
+
    if (myid == 0)
    {
       hypre_printf("  Rhs FromFile: %s\n", filename);
 
       /*-----------------------------------------------------------
-       * Generate the matrix 
+       * Generate the matrix
        *-----------------------------------------------------------*/
- 
+
       b_CSR = HYPRE_VectorRead(filename);
    }
    HYPRE_ParCSRMatrixGetRowPartitioning(A, &partitioning);
@@ -1405,7 +1410,7 @@ BuildParLaplacian9pt( HYPRE_Int                  argc,
    /*-----------------------------------------------------------
     * Set defaults
     *-----------------------------------------------------------*/
- 
+
    nx = 10;
    ny = 10;
 
@@ -1440,7 +1445,7 @@ BuildParLaplacian9pt( HYPRE_Int                  argc,
     * Check a few things
     *-----------------------------------------------------------*/
 
-   if ((P*Q) != num_procs)
+   if ((P * Q) != num_procs)
    {
       hypre_printf("Error: Invalid number of processors or processor topology \n");
       exit(1);
@@ -1449,7 +1454,7 @@ BuildParLaplacian9pt( HYPRE_Int                  argc,
    /*-----------------------------------------------------------
     * Print driver parameters
     *-----------------------------------------------------------*/
- 
+
    if (myid == 0)
    {
       hypre_printf("  Laplacian 9pt:\n");
@@ -1463,12 +1468,12 @@ BuildParLaplacian9pt( HYPRE_Int                  argc,
 
    /* compute p,q from P,Q and myid */
    p = myid % P;
-   q = ( myid - p)/P;
+   q = ( myid - p) / P;
 
    /*-----------------------------------------------------------
-    * Generate the matrix 
+    * Generate the matrix
     *-----------------------------------------------------------*/
- 
+
    values = hypre_CTAlloc(HYPRE_Real,  2, HYPRE_MEMORY_HOST);
 
    values[1] = -1.0;
@@ -1488,7 +1493,7 @@ BuildParLaplacian9pt( HYPRE_Int                  argc,
    }
 
    A = (HYPRE_ParCSRMatrix) GenerateLaplacian9pt(hypre_MPI_COMM_WORLD,
-                                  nx, ny, P, Q, p, q, values);
+                                                 nx, ny, P, Q, p, q, values);
 
    hypre_TFree(values, HYPRE_MEMORY_HOST);
 
@@ -1497,7 +1502,7 @@ BuildParLaplacian9pt( HYPRE_Int                  argc,
    return (0);
 }
 /*----------------------------------------------------------------------
- * Build 27-point laplacian in 3D, 
+ * Build 27-point laplacian in 3D,
  * Parameters given in command line.
  *----------------------------------------------------------------------*/
 
@@ -1526,7 +1531,7 @@ BuildParLaplacian27pt( HYPRE_Int                  argc,
    /*-----------------------------------------------------------
     * Set defaults
     *-----------------------------------------------------------*/
- 
+
    nx = 10;
    ny = 10;
    nz = 10;
@@ -1565,7 +1570,7 @@ BuildParLaplacian27pt( HYPRE_Int                  argc,
     * Check a few things
     *-----------------------------------------------------------*/
 
-   if ((P*Q*R) != num_procs)
+   if ((P * Q * R) != num_procs)
    {
       hypre_printf("Error: Invalid number of processors or processor topology \n");
       exit(1);
@@ -1574,7 +1579,7 @@ BuildParLaplacian27pt( HYPRE_Int                  argc,
    /*-----------------------------------------------------------
     * Print driver parameters
     *-----------------------------------------------------------*/
- 
+
    if (myid == 0)
    {
       hypre_printf("  Laplacian_27pt:\n");
@@ -1588,24 +1593,28 @@ BuildParLaplacian27pt( HYPRE_Int                  argc,
 
    /* compute p,q,r from P,Q,R and myid */
    p = myid % P;
-   q = (( myid - p)/P) % Q;
-   r = ( myid - p - P*q)/( P*Q );
+   q = (( myid - p) / P) % Q;
+   r = ( myid - p - P * q) / ( P * Q );
 
    /*-----------------------------------------------------------
-    * Generate the matrix 
+    * Generate the matrix
     *-----------------------------------------------------------*/
- 
+
    values = hypre_CTAlloc(HYPRE_Real,  2, HYPRE_MEMORY_HOST);
 
    values[0] = 26.0;
    if (nx == 1 || ny == 1 || nz == 1)
-	values[0] = 8.0;
-   if (nx*ny == 1 || nx*nz == 1 || ny*nz == 1)
-	values[0] = 2.0;
+   {
+      values[0] = 8.0;
+   }
+   if (nx * ny == 1 || nx * nz == 1 || ny * nz == 1)
+   {
+      values[0] = 2.0;
+   }
    values[1] = -1.0;
 
    A = (HYPRE_ParCSRMatrix) GenerateLaplacian27pt(hypre_MPI_COMM_WORLD,
-                               nx, ny, nz, P, Q, R, p, q, r, values);
+                                                  nx, ny, nz, P, Q, R, p, q, r, values);
 
    hypre_TFree(values, HYPRE_MEMORY_HOST);
 
diff --git a/external/hypre/src/parcsr_ls/dsuperlu.c b/external/hypre/src/parcsr_ls/dsuperlu.c
index 535fe330..3e044aec 100644
--- a/external/hypre/src/parcsr_ls/dsuperlu.c
+++ b/external/hypre/src/parcsr_ls/dsuperlu.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -33,72 +33,135 @@ hypre_DSLUData;
 
 #endif
 */
-HYPRE_Int hypre_SLUDistSetup( HYPRE_Solver *solver, hypre_ParCSRMatrix *A, HYPRE_Int print_level)
+
+/*--------------------------------------------------------------------------
+ * hypre_SLUDistSetup
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_SLUDistSetup(HYPRE_Solver       *solver,
+                   hypre_ParCSRMatrix *A,
+                   HYPRE_Int           print_level)
 {
-      /* Par Data Structure variables */
-   HYPRE_BigInt global_num_rows = hypre_ParCSRMatrixGlobalNumRows(A);
-   MPI_Comm           comm = hypre_ParCSRMatrixComm(A);
-   hypre_CSRMatrix *A_local;
-   HYPRE_Int num_rows;
-   HYPRE_Int num_procs, my_id;
-   HYPRE_Int pcols=1, prows=1;
-   HYPRE_BigInt *big_rowptr = NULL;
-   hypre_DSLUData *dslu_data = NULL;
-
-   HYPRE_Int info = 0;
-   HYPRE_Int nrhs = 0;
+   /* Par Data Structure variables */
+   HYPRE_BigInt       global_num_rows = hypre_ParCSRMatrixGlobalNumRows(A);
+   MPI_Comm           comm            = hypre_ParCSRMatrixComm(A);
+   hypre_CSRMatrix   *A_local;
+
+   HYPRE_Int          pcols = 1;
+   HYPRE_Int          prows = 1;
+   hypre_DSLUData    *dslu_data = NULL;
+   HYPRE_Int          nrhs = 0;
+
+   HYPRE_Int          num_rows;
+   HYPRE_Int          num_procs, my_id;
+   HYPRE_Int          i;
+
+   /* SuperLU_Dist variables. Note it uses "int_t" to denote integer types */
+   hypre_int          slu_info = 0;
+   int_t             *slu_rowptr;
+   int_t             *slu_colidx;
+   hypre_double      *slu_data;
 
    hypre_MPI_Comm_size(comm, &num_procs);
    hypre_MPI_Comm_rank(comm, &my_id);
 
+   /* destroy solver if already setup */
+   //   if (solver != NULL) { hypre_SLUDistDestroy(solver); }
+   /* allocate memory for new solver */
    dslu_data = hypre_CTAlloc(hypre_DSLUData, 1, HYPRE_MEMORY_HOST);
 
    /* Merge diag and offd into one matrix (global ids) */
    A_local = hypre_MergeDiagAndOffd(A);
 
+#if defined(HYPRE_USING_GPU)
+   if (hypre_GetActualMemLocation(hypre_CSRMatrixMemoryLocation(A_local)) != hypre_MEMORY_HOST)
+   {
+      hypre_CSRMatrixMigrate(A_local, HYPRE_MEMORY_HOST);
+   }
+#endif
    num_rows = hypre_CSRMatrixNumRows(A_local);
-   /* Now convert hypre matrix to a SuperMatrix */
-#ifdef HYPRE_MIXEDINT
+
+   /* SuperLU uses int_t to denote its integer type. Hence, the conversion/checks below: */
+   if (sizeof(int_t) != sizeof(HYPRE_Int))
    {
-      HYPRE_Int *rowptr = NULL;
-      HYPRE_Int  i;
-      rowptr = hypre_CSRMatrixI(A_local);
-      big_rowptr = hypre_CTAlloc(HYPRE_BigInt, (num_rows+1), HYPRE_MEMORY_HOST);
-      for(i=0; i<(num_rows+1); i++)
+      slu_rowptr = hypre_CTAlloc(int_t, (num_rows + 1), hypre_CSRMatrixMemoryLocation(A_local));
+      for (i = 0; i < num_rows + 1; i++)
       {
-         big_rowptr[i] = (HYPRE_BigInt)rowptr[i];
+         slu_rowptr[i] = (int_t) hypre_CSRMatrixI(A_local)[i];
       }
    }
-#else
-   big_rowptr = hypre_CSRMatrixI(A_local);
-#endif
+   else
+   {
+      slu_rowptr = (int_t*) hypre_CSRMatrixI(A_local);
+   }
+
+   if (sizeof(int_t) != sizeof(HYPRE_BigInt))
+   {
+      slu_colidx = hypre_CTAlloc(int_t, hypre_CSRMatrixNumNonzeros(A_local),
+                                 hypre_CSRMatrixMemoryLocation(A_local));
+      for (i = 0; i < hypre_CSRMatrixNumNonzeros(A_local); i++)
+      {
+         slu_colidx[i] = (int_t) hypre_CSRMatrixBigJ(A_local)[i];
+      }
+   }
+   else
+   {
+      slu_colidx = (int_t*) hypre_CSRMatrixBigJ(A_local);
+   }
+
+   /* SuperLU uses dbl to denote its floating point type. Hence, the conversion/checks below: */
+   if (sizeof(hypre_double) != sizeof(HYPRE_Complex))
+   {
+      slu_data = hypre_CTAlloc(hypre_double, hypre_CSRMatrixNumNonzeros(A_local),
+                               hypre_CSRMatrixMemoryLocation(A_local));
+      for (i = 0; i < hypre_CSRMatrixNumNonzeros(A_local); i++)
+      {
+         slu_data[i] = (hypre_double) hypre_CSRMatrixData(A_local)[i];
+      }
+   }
+   else
+   {
+      slu_data = (hypre_double*) hypre_CSRMatrixData(A_local);
+   }
+
+   /* Now convert hypre matrix to a SuperMatrix */
    dCreate_CompRowLoc_Matrix_dist(
-            &(dslu_data->A_dslu),global_num_rows,global_num_rows,
-            hypre_CSRMatrixNumNonzeros(A_local),
-            num_rows,
-            hypre_ParCSRMatrixFirstRowIndex(A),
-            hypre_CSRMatrixData(A_local),
-            hypre_CSRMatrixBigJ(A_local),big_rowptr,
-            SLU_NR_loc, SLU_D, SLU_GE);
+      &(dslu_data->A_dslu),
+      (int_t) global_num_rows,
+      (int_t) global_num_rows,
+      (int_t) hypre_CSRMatrixNumNonzeros(A_local),
+      (int_t) num_rows,
+      (int_t) hypre_ParCSRMatrixFirstRowIndex(A),
+      slu_data,
+      slu_colidx,
+      slu_rowptr,
+      SLU_NR_loc, SLU_D, SLU_GE);
 
    /* DOK: SuperLU frees assigned data, so set them to null before
-    * calling hypre_CSRMatrixdestroy on A_local to avoid memory errors.
-   */
-#ifndef HYPRE_MIXEDINT
-   hypre_CSRMatrixI(A_local) = NULL;
-#endif
-   hypre_CSRMatrixData(A_local) = NULL;
-   hypre_CSRMatrixBigJ(A_local) = NULL;
+      calling hypre_CSRMatrixdestroy on A_local to avoid memory errors. */
+   if ((void*) slu_rowptr == (void*) hypre_CSRMatrixI(A_local))
+   {
+      hypre_CSRMatrixI(A_local) = NULL;
+   }
+   if ((void*) slu_colidx == (void*) hypre_CSRMatrixBigJ(A_local))
+   {
+      hypre_CSRMatrixBigJ(A_local) = NULL;
+   }
+   if ((void*) slu_data == (void*) hypre_CSRMatrixData(A_local))
+   {
+      hypre_CSRMatrixData(A_local) = NULL;
+   }
    hypre_CSRMatrixDestroy(A_local);
 
-   /*Create process grid */
-   while (prows*pcols <= num_procs) ++prows;
+   /* Create process grid */
+   while (prows * pcols <= num_procs) { ++prows; }
    --prows;
-   pcols = num_procs/prows;
-   while (prows*pcols != num_procs)
+   pcols = num_procs / prows;
+   while (prows * pcols != num_procs)
    {
       prows -= 1;
-      pcols = num_procs/prows;
+      pcols = num_procs / prows;
    }
    //hypre_printf(" prows %d pcols %d\n", prows, pcols);
 
@@ -107,7 +170,7 @@ HYPRE_Int hypre_SLUDistSetup( HYPRE_Solver *solver, hypre_ParCSRMatrix *A, HYPRE
    set_default_options_dist(&(dslu_data->dslu_options));
 
    dslu_data->dslu_options.Fact = DOFACT;
-   if (print_level == 0 || print_level == 2) dslu_data->dslu_options.PrintStat = NO;
+   if (print_level == 0 || print_level == 2) { dslu_data->dslu_options.PrintStat = NO; }
    /*dslu_data->dslu_options.IterRefine = SLU_DOUBLE;
    dslu_data->dslu_options.ColPerm = MMD_AT_PLUS_A;
    dslu_data->dslu_options.DiagPivotThresh = 1.0;
@@ -125,47 +188,119 @@ HYPRE_Int hypre_SLUDistSetup( HYPRE_Solver *solver, hypre_ParCSRMatrix *A, HYPRE
    dslu_data->berr[0] = 0.0;
 
    pdgssvx(&(dslu_data->dslu_options), &(dslu_data->A_dslu),
-      &(dslu_data->dslu_ScalePermstruct), NULL, num_rows, nrhs,
-      &(dslu_data->dslu_data_grid), &(dslu_data->dslu_data_LU),
-      &(dslu_data->dslu_solve), dslu_data->berr, &(dslu_data->dslu_data_stat), &info);
+           &(dslu_data->dslu_ScalePermstruct), NULL, num_rows, nrhs,
+           &(dslu_data->dslu_data_grid), &(dslu_data->dslu_data_LU),
+           &(dslu_data->dslu_solve), dslu_data->berr, &(dslu_data->dslu_data_stat), &slu_info);
 
    dslu_data->dslu_options.Fact = FACTORED;
    *solver = (HYPRE_Solver) dslu_data;
+
    return hypre_error_flag;
 }
 
-HYPRE_Int hypre_SLUDistSolve( void* solver, hypre_ParVector *b, hypre_ParVector *x)
+/*--------------------------------------------------------------------------
+ * hypre_SLUDistSolve
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_SLUDistSolve(void            *solver,
+                   hypre_ParVector *b,
+                   hypre_ParVector *x)
 {
-   hypre_DSLUData *dslu_data = (hypre_DSLUData *) solver;
-   HYPRE_Int info = 0;
-   HYPRE_Real *B = hypre_VectorData(hypre_ParVectorLocalVector(x));
-   HYPRE_Int size = hypre_VectorSize(hypre_ParVectorLocalVector(x));
-   HYPRE_Int nrhs = 1;
+   hypre_DSLUData  *dslu_data = (hypre_DSLUData *) solver;
+   HYPRE_Real      *x_data;
+   HYPRE_Int        size = hypre_VectorSize(hypre_ParVectorLocalVector(x));
+   HYPRE_Int        nrhs = 1;
+   HYPRE_Int        i;
 
-   hypre_ParVectorCopy(b,x);
+   hypre_int        slu_info;
+   hypre_double    *slu_data;
 
-   pdgssvx(&(dslu_data->dslu_options), &(dslu_data->A_dslu),
-      &(dslu_data->dslu_ScalePermstruct), B, size, nrhs,
-      &(dslu_data->dslu_data_grid), &(dslu_data->dslu_data_LU),
-      &(dslu_data->dslu_solve), dslu_data->berr, &(dslu_data->dslu_data_stat), &info);
+   hypre_ParVectorCopy(b, x);
+
+#if defined(HYPRE_USING_GPU)
+   hypre_ParVector *x_host = NULL;
+
+   if (hypre_GetActualMemLocation(hypre_ParVectorMemoryLocation(x)) != hypre_MEMORY_HOST)
+   {
+      x_host = hypre_ParVectorCloneDeep_v2(x, HYPRE_MEMORY_HOST);
+      x_data = hypre_VectorData(hypre_ParVectorLocalVector(x_host));
+   }
+   else
+#endif
+   {
+      x_data = hypre_VectorData(hypre_ParVectorLocalVector(x));
+   }
+
+   /* SuperLU uses sbl to denote its floating point type. Hence, the conversion/checks below: */
+   if (sizeof(hypre_double) != sizeof(HYPRE_Complex))
+   {
+      slu_data = hypre_CTAlloc(hypre_double, size, HYPRE_MEMORY_HOST);
+      for (i = 0; i < size; i++)
+      {
+         slu_data[i] = (hypre_double) x_data[i];
+      }
+   }
+   else
+   {
+      slu_data = (hypre_double*) x_data;
+   }
+
+   pdgssvx(&(dslu_data->dslu_options),
+           &(dslu_data->A_dslu),
+           &(dslu_data->dslu_ScalePermstruct),
+           slu_data,
+           (int_t) size,
+           (int_t) nrhs,
+           &(dslu_data->dslu_data_grid),
+           &(dslu_data->dslu_data_LU),
+           &(dslu_data->dslu_solve),
+           dslu_data->berr,
+           &(dslu_data->dslu_data_stat),
+           &slu_info);
+
+   /* Free memory */
+   if ((void*) slu_data != (void*) x_data)
+   {
+      hypre_TFree(slu_data, HYPRE_MEMORY_HOST);
+   }
+
+#if defined(HYPRE_USING_GPU)
+   if (x_host)
+   {
+      hypre_ParVectorCopy(x_host, x);
+      hypre_ParVectorDestroy(x_host);
+   }
+#endif
 
    return hypre_error_flag;
 }
 
-HYPRE_Int hypre_SLUDistDestroy( void* solver)
+/*--------------------------------------------------------------------------
+ * hypre_SLUDistDestroy
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_SLUDistDestroy(void* solver)
 {
    hypre_DSLUData *dslu_data = (hypre_DSLUData *) solver;
 
    PStatFree(&(dslu_data->dslu_data_stat));
    Destroy_CompRowLoc_Matrix_dist(&(dslu_data->A_dslu));
    dScalePermstructFree(&(dslu_data->dslu_ScalePermstruct));
-   dDestroy_LU(dslu_data->global_num_rows, &(dslu_data->dslu_data_grid), &(dslu_data->dslu_data_LU));
+   dDestroy_LU(dslu_data->global_num_rows,
+               &(dslu_data->dslu_data_grid),
+               &(dslu_data->dslu_data_LU));
    dLUstructFree(&(dslu_data->dslu_data_LU));
    if (dslu_data->dslu_options.SolveInitialized)
+   {
       dSolveFinalize(&(dslu_data->dslu_options), &(dslu_data->dslu_solve));
+   }
    superlu_gridexit(&(dslu_data->dslu_data_grid));
    hypre_TFree(dslu_data->berr, HYPRE_MEMORY_HOST);
    hypre_TFree(dslu_data, HYPRE_MEMORY_HOST);
+
    return hypre_error_flag;
 }
+
 #endif
diff --git a/external/hypre/src/parcsr_ls/dsuperlu.h b/external/hypre/src/parcsr_ls/dsuperlu.h
index 4f2e40c2..74781b39 100644
--- a/external/hypre/src/parcsr_ls/dsuperlu.h
+++ b/external/hypre/src/parcsr_ls/dsuperlu.h
@@ -1,28 +1,30 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
  ******************************************************************************/
- 
+
 #ifndef hypre_DSLU_DATA_HEADER
 #define hypre_DSLU_DATA_HEADER
 
 #include "superlu_ddefs.h"
+
 /*--------------------------------------------------------------------------
  * hypre_DSLUData
  *--------------------------------------------------------------------------*/
+
 typedef struct
 {
-   HYPRE_BigInt global_num_rows;
-   SuperMatrix A_dslu;
-   HYPRE_Real *berr;
-   dLUstruct_t dslu_data_LU;
-   SuperLUStat_t dslu_data_stat;
-   superlu_dist_options_t dslu_options;
-   gridinfo_t dslu_data_grid;
-   dScalePermstruct_t dslu_ScalePermstruct;
-   dSOLVEstruct_t dslu_solve;
+   HYPRE_BigInt            global_num_rows;
+   SuperMatrix             A_dslu;
+   hypre_double           *berr;
+   dLUstruct_t             dslu_data_LU;
+   SuperLUStat_t           dslu_data_stat;
+   superlu_dist_options_t  dslu_options;
+   gridinfo_t              dslu_data_grid;
+   dScalePermstruct_t      dslu_ScalePermstruct;
+   dSOLVEstruct_t          dslu_solve;
 }
 hypre_DSLUData;
 
diff --git a/external/hypre/src/parcsr_ls/gen_redcs_mat.c b/external/hypre/src/parcsr_ls/gen_redcs_mat.c
index 3218f085..a8189028 100644
--- a/external/hypre/src/parcsr_ls/gen_redcs_mat.c
+++ b/external/hypre/src/parcsr_ls/gen_redcs_mat.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -19,6 +19,7 @@ hypre_seqAMGSetup( hypre_ParAMGData *amg_data,
                    HYPRE_Int         p_level,
                    HYPRE_Int         coarse_threshold)
 {
+   HYPRE_UNUSED_VAR(coarse_threshold);
 
    /* Par Data Structure variables */
    hypre_ParCSRMatrix **Par_A_array = hypre_ParAMGDataAArray(amg_data);
@@ -57,6 +58,8 @@ hypre_seqAMGSetup( hypre_ParAMGData *amg_data,
    /* convert A at this level to sequential */
    A = Par_A_array[level];
 
+   HYPRE_MemoryLocation memory_location = hypre_ParCSRMatrixMemoryLocation(A);
+
    {
       HYPRE_Real *A_seq_data = NULL;
       HYPRE_Int *A_seq_i = NULL;
@@ -71,7 +74,7 @@ hypre_seqAMGSetup( hypre_ParAMGData *amg_data,
       HYPRE_Int *info = NULL;
       HYPRE_Int *displs = NULL;
       HYPRE_Int *displs2 = NULL;
-      HYPRE_Int i, j, size, num_nonzeros, total_nnz, cnt;
+      HYPRE_Int i, j, size, num_nonzeros, total_nnz = 0, cnt;
 
       hypre_CSRMatrix *A_diag = hypre_ParCSRMatrixDiag(A);
       hypre_CSRMatrix *A_offd = hypre_ParCSRMatrixOffd(A);
@@ -121,90 +124,98 @@ hypre_seqAMGSetup( hypre_ParAMGData *amg_data,
          info = hypre_CTAlloc(HYPRE_Int,  new_num_procs, HYPRE_MEMORY_HOST);
 
          if (redundant)
+         {
             hypre_MPI_Allgather(&num_rows, 1, HYPRE_MPI_INT, info, 1, HYPRE_MPI_INT, new_comm);
+         }
          else
+         {
             hypre_MPI_Gather(&num_rows, 1, HYPRE_MPI_INT, info, 1, HYPRE_MPI_INT, 0, new_comm);
+         }
 
          /* alloc space in seq data structure only for participating procs*/
          if (redundant || my_id == 0)
          {
             HYPRE_BoomerAMGCreate(&coarse_solver);
             HYPRE_BoomerAMGSetMaxRowSum(coarse_solver,
-                  hypre_ParAMGDataMaxRowSum(amg_data));
+                                        hypre_ParAMGDataMaxRowSum(amg_data));
             HYPRE_BoomerAMGSetStrongThreshold(coarse_solver,
-                  hypre_ParAMGDataStrongThreshold(amg_data));
+                                              hypre_ParAMGDataStrongThreshold(amg_data));
             HYPRE_BoomerAMGSetCoarsenType(coarse_solver,
-                  hypre_ParAMGDataCoarsenType(amg_data));
+                                          hypre_ParAMGDataCoarsenType(amg_data));
             HYPRE_BoomerAMGSetInterpType(coarse_solver,
-                  hypre_ParAMGDataInterpType(amg_data));
+                                         hypre_ParAMGDataInterpType(amg_data));
             HYPRE_BoomerAMGSetTruncFactor(coarse_solver,
-                  hypre_ParAMGDataTruncFactor(amg_data));
+                                          hypre_ParAMGDataTruncFactor(amg_data));
             HYPRE_BoomerAMGSetPMaxElmts(coarse_solver,
-                  hypre_ParAMGDataPMaxElmts(amg_data));
+                                        hypre_ParAMGDataPMaxElmts(amg_data));
             if (hypre_ParAMGDataUserRelaxType(amg_data) > -1)
                HYPRE_BoomerAMGSetRelaxType(coarse_solver,
-                     hypre_ParAMGDataUserRelaxType(amg_data));
+                                           hypre_ParAMGDataUserRelaxType(amg_data));
             HYPRE_BoomerAMGSetRelaxOrder(coarse_solver,
-                  hypre_ParAMGDataRelaxOrder(amg_data));
+                                         hypre_ParAMGDataRelaxOrder(amg_data));
             HYPRE_BoomerAMGSetRelaxWt(coarse_solver,
-                  hypre_ParAMGDataUserRelaxWeight(amg_data));
+                                      hypre_ParAMGDataUserRelaxWeight(amg_data));
             if (hypre_ParAMGDataUserNumSweeps(amg_data) > -1)
                HYPRE_BoomerAMGSetNumSweeps(coarse_solver,
-                     hypre_ParAMGDataUserNumSweeps(amg_data));
+                                           hypre_ParAMGDataUserNumSweeps(amg_data));
             HYPRE_BoomerAMGSetNumFunctions(coarse_solver,
-                  num_functions);
+                                           num_functions);
             HYPRE_BoomerAMGSetMaxIter(coarse_solver, 1);
             HYPRE_BoomerAMGSetTol(coarse_solver, 0);
          }
 
          /* Create CSR Matrix, will be Diag part of new matrix */
-         A_tmp_i = hypre_CTAlloc(HYPRE_Int,  num_rows+1, HYPRE_MEMORY_HOST);
+         A_tmp_i = hypre_CTAlloc(HYPRE_Int,  num_rows + 1, HYPRE_MEMORY_HOST);
 
          A_tmp_i[0] = 0;
-         for (i=1; i < num_rows+1; i++)
-            A_tmp_i[i] = A_diag_i[i]-A_diag_i[i-1]+A_offd_i[i]-A_offd_i[i-1];
+         for (i = 1; i < num_rows + 1; i++)
+         {
+            A_tmp_i[i] = A_diag_i[i] - A_diag_i[i - 1] + A_offd_i[i] - A_offd_i[i - 1];
+         }
 
-         num_nonzeros = A_offd_i[num_rows]+A_diag_i[num_rows];
+         num_nonzeros = A_offd_i[num_rows] + A_diag_i[num_rows];
 
          A_tmp_j = hypre_CTAlloc(HYPRE_Int,  num_nonzeros, HYPRE_MEMORY_HOST);
          A_tmp_data = hypre_CTAlloc(HYPRE_Real,  num_nonzeros, HYPRE_MEMORY_HOST);
 
          cnt = 0;
-         for (i=0; i < num_rows; i++)
+         for (i = 0; i < num_rows; i++)
          {
-            for (j=A_diag_i[i]; j < A_diag_i[i+1]; j++)
+            for (j = A_diag_i[i]; j < A_diag_i[i + 1]; j++)
             {
-               A_tmp_j[cnt] = A_diag_j[j]+(HYPRE_Int)first_row_index;
+               A_tmp_j[cnt] = A_diag_j[j] + (HYPRE_Int)first_row_index;
                A_tmp_data[cnt++] = A_diag_data[j];
             }
-            for (j=A_offd_i[i]; j < A_offd_i[i+1]; j++)
+            for (j = A_offd_i[i]; j < A_offd_i[i + 1]; j++)
             {
                A_tmp_j[cnt] = (HYPRE_Int)col_map_offd[A_offd_j[j]];
                A_tmp_data[cnt++] = A_offd_data[j];
             }
          }
 
-         displs = hypre_CTAlloc(HYPRE_Int,  new_num_procs+1, HYPRE_MEMORY_HOST);
+         displs = hypre_CTAlloc(HYPRE_Int,  new_num_procs + 1, HYPRE_MEMORY_HOST);
          displs[0] = 0;
-         for (i=1; i < new_num_procs+1; i++)
-            displs[i] = displs[i-1]+info[i-1];
+         for (i = 1; i < new_num_procs + 1; i++)
+         {
+            displs[i] = displs[i - 1] + info[i - 1];
+         }
          size = displs[new_num_procs];
 
          if (redundant || my_id == 0)
          {
-            A_seq_i = hypre_CTAlloc(HYPRE_Int,  size+1, HYPRE_MEMORY_DEVICE);
-            A_seq_offd_i = hypre_CTAlloc(HYPRE_Int,  size+1, HYPRE_MEMORY_DEVICE);
-            if (num_functions > 1) seq_dof_func = hypre_CTAlloc(HYPRE_Int,  size, HYPRE_MEMORY_DEVICE);
+            A_seq_i = hypre_CTAlloc(HYPRE_Int,  size + 1, memory_location);
+            A_seq_offd_i = hypre_CTAlloc(HYPRE_Int,  size + 1, memory_location);
+            if (num_functions > 1) { seq_dof_func = hypre_CTAlloc(HYPRE_Int,  size, memory_location); }
          }
 
          if (redundant)
          {
             hypre_MPI_Allgatherv ( &A_tmp_i[1], num_rows, HYPRE_MPI_INT, &A_seq_i[1], info,
-                        displs, HYPRE_MPI_INT, new_comm );
+                                   displs, HYPRE_MPI_INT, new_comm );
             if (num_functions > 1)
             {
                hypre_MPI_Allgatherv ( hypre_IntArrayData(dof_func_array[level]), num_rows, HYPRE_MPI_INT,
-                     seq_dof_func, info, displs, HYPRE_MPI_INT, new_comm );
+                                      seq_dof_func, info, displs, HYPRE_MPI_INT, new_comm );
                HYPRE_BoomerAMGSetDofFunc(coarse_solver, seq_dof_func);
             }
          }
@@ -212,64 +223,66 @@ hypre_seqAMGSetup( hypre_ParAMGData *amg_data,
          {
             if (A_seq_i)
                hypre_MPI_Gatherv ( &A_tmp_i[1], num_rows, HYPRE_MPI_INT, &A_seq_i[1], info,
-                        displs, HYPRE_MPI_INT, 0, new_comm );
+                                   displs, HYPRE_MPI_INT, 0, new_comm );
             else
                hypre_MPI_Gatherv ( &A_tmp_i[1], num_rows, HYPRE_MPI_INT, A_seq_i, info,
-                        displs, HYPRE_MPI_INT, 0, new_comm );
+                                   displs, HYPRE_MPI_INT, 0, new_comm );
             if (num_functions > 1)
             {
                hypre_MPI_Gatherv ( hypre_IntArrayData(dof_func_array[level]), num_rows, HYPRE_MPI_INT,
-                     seq_dof_func, info, displs, HYPRE_MPI_INT, 0, new_comm );
-               if (my_id == 0) HYPRE_BoomerAMGSetDofFunc(coarse_solver, seq_dof_func);
+                                   seq_dof_func, info, displs, HYPRE_MPI_INT, 0, new_comm );
+               if (my_id == 0) { HYPRE_BoomerAMGSetDofFunc(coarse_solver, seq_dof_func); }
             }
          }
 
          if (redundant || my_id == 0)
          {
-            displs2 = hypre_CTAlloc(HYPRE_Int,  new_num_procs+1, HYPRE_MEMORY_HOST);
+            displs2 = hypre_CTAlloc(HYPRE_Int,  new_num_procs + 1, HYPRE_MEMORY_HOST);
 
             A_seq_i[0] = 0;
             displs2[0] = 0;
-            for (j=1; j < displs[1]; j++)
-               A_seq_i[j] = A_seq_i[j]+A_seq_i[j-1];
-            for (i=1; i < new_num_procs; i++)
+            for (j = 1; j < displs[1]; j++)
+            {
+               A_seq_i[j] = A_seq_i[j] + A_seq_i[j - 1];
+            }
+            for (i = 1; i < new_num_procs; i++)
             {
-               for (j=displs[i]; j < displs[i+1]; j++)
+               for (j = displs[i]; j < displs[i + 1]; j++)
                {
-                  A_seq_i[j] = A_seq_i[j]+A_seq_i[j-1];
+                  A_seq_i[j] = A_seq_i[j] + A_seq_i[j - 1];
                }
             }
-            A_seq_i[size] = A_seq_i[size]+A_seq_i[size-1];
+            A_seq_i[size] = A_seq_i[size] + A_seq_i[size - 1];
             displs2[new_num_procs] = A_seq_i[size];
-            for (i=1; i < new_num_procs+1; i++)
+            for (i = 1; i < new_num_procs + 1; i++)
             {
                displs2[i] = A_seq_i[displs[i]];
-               info[i-1] = displs2[i] - displs2[i-1];
+               info[i - 1] = displs2[i] - displs2[i - 1];
             }
 
             total_nnz = displs2[new_num_procs];
-            A_seq_j = hypre_CTAlloc(HYPRE_Int,  total_nnz, HYPRE_MEMORY_DEVICE);
-            A_seq_data = hypre_CTAlloc(HYPRE_Real,  total_nnz, HYPRE_MEMORY_DEVICE);
+            A_seq_j = hypre_CTAlloc(HYPRE_Int,  total_nnz, memory_location);
+            A_seq_data = hypre_CTAlloc(HYPRE_Real,  total_nnz, memory_location);
          }
          if (redundant)
          {
             hypre_MPI_Allgatherv ( A_tmp_j, num_nonzeros, HYPRE_MPI_INT,
-                       A_seq_j, info, displs2,
-                       HYPRE_MPI_INT, new_comm );
+                                   A_seq_j, info, displs2,
+                                   HYPRE_MPI_INT, new_comm );
 
             hypre_MPI_Allgatherv ( A_tmp_data, num_nonzeros, HYPRE_MPI_REAL,
-                       A_seq_data, info, displs2,
-                       HYPRE_MPI_REAL, new_comm );
+                                   A_seq_data, info, displs2,
+                                   HYPRE_MPI_REAL, new_comm );
          }
          else
          {
             hypre_MPI_Gatherv ( A_tmp_j, num_nonzeros, HYPRE_MPI_INT,
-                       A_seq_j, info, displs2,
-                       HYPRE_MPI_INT, 0, new_comm );
+                                A_seq_j, info, displs2,
+                                HYPRE_MPI_INT, 0, new_comm );
 
             hypre_MPI_Gatherv ( A_tmp_data, num_nonzeros, HYPRE_MPI_REAL,
-                       A_seq_data, info, displs2,
-                       HYPRE_MPI_REAL, 0, new_comm );
+                                A_seq_data, info, displs2,
+                                HYPRE_MPI_REAL, 0, new_comm );
          }
 
          hypre_TFree(info, HYPRE_MEMORY_HOST);
@@ -288,9 +301,9 @@ hypre_seqAMGSetup( hypre_ParAMGData *amg_data,
             /* Create 1 proc communicator */
             seq_comm = hypre_MPI_COMM_SELF;
 
-            A_seq = hypre_ParCSRMatrixCreate(seq_comm,size,size,
-                  row_starts, row_starts,
-                  0,total_nnz,0);
+            A_seq = hypre_ParCSRMatrixCreate(seq_comm, size, size,
+                                             row_starts, row_starts,
+                                             0, total_nnz, 0);
 
             A_seq_diag = hypre_ParCSRMatrixDiag(A_seq);
             A_seq_offd = hypre_ParCSRMatrixOffd(A_seq);
@@ -305,7 +318,7 @@ hypre_seqAMGSetup( hypre_ParAMGData *amg_data,
             hypre_ParVectorInitialize(F_seq);
             hypre_ParVectorInitialize(U_seq);
 
-            hypre_BoomerAMGSetup(coarse_solver,A_seq,F_seq,U_seq);
+            hypre_BoomerAMGSetup(coarse_solver, A_seq, F_seq, U_seq);
 
             hypre_ParAMGDataCoarseSolver(amg_data) = coarse_solver;
             hypre_ParAMGDataACoarse(amg_data) = A_seq;
@@ -386,16 +399,22 @@ hypre_seqAMGCycle( hypre_ParAMGData *amg_data,
       info = hypre_CTAlloc(HYPRE_Int,  new_num_procs, HYPRE_MEMORY_HOST);
       local_info = nf;
       if (redundant)
+      {
          hypre_MPI_Allgather(&local_info, 1, HYPRE_MPI_INT, info, 1, HYPRE_MPI_INT, new_comm);
+      }
       else
+      {
          hypre_MPI_Gather(&local_info, 1, HYPRE_MPI_INT, info, 1, HYPRE_MPI_INT, 0, new_comm);
+      }
 
-      if (redundant || my_id ==0)
+      if (redundant || my_id == 0)
       {
-         displs = hypre_CTAlloc(HYPRE_Int,  new_num_procs+1, HYPRE_MEMORY_HOST);
+         displs = hypre_CTAlloc(HYPRE_Int,  new_num_procs + 1, HYPRE_MEMORY_HOST);
          displs[0] = 0;
-         for (i=1; i < new_num_procs+1; i++)
-            displs[i] = displs[i-1]+info[i-1];
+         for (i = 1; i < new_num_procs + 1; i++)
+         {
+            displs[i] = displs[i - 1] + info[i - 1];
+         }
 
          if (F_coarse)
          {
@@ -406,14 +425,14 @@ hypre_seqAMGCycle( hypre_ParAMGData *amg_data,
 
       if (redundant)
          hypre_MPI_Allgatherv ( f_data, nf, HYPRE_MPI_REAL,
-                          recv_buf, info, displs,
-                          HYPRE_MPI_REAL, new_comm );
+                                recv_buf, info, displs,
+                                HYPRE_MPI_REAL, new_comm );
       else
          hypre_MPI_Gatherv ( f_data, nf, HYPRE_MPI_REAL,
-                          recv_buf, info, displs,
-                          HYPRE_MPI_REAL, 0, new_comm );
+                             recv_buf, info, displs,
+                             HYPRE_MPI_REAL, 0, new_comm );
 
-      if (redundant || my_id ==0)
+      if (redundant || my_id == 0)
       {
          tmp_vec =  hypre_ParVectorLocalVector(U_coarse);
          recv_buf = hypre_VectorData(tmp_vec);
@@ -423,18 +442,18 @@ hypre_seqAMGCycle( hypre_ParAMGData *amg_data,
       if (redundant)
       {
          hypre_MPI_Allgatherv ( u_data, n, HYPRE_MPI_REAL,
-                       recv_buf, info, displs,
-                       HYPRE_MPI_REAL, new_comm );
+                                recv_buf, info, displs,
+                                HYPRE_MPI_REAL, new_comm );
          hypre_TFree(displs, HYPRE_MEMORY_HOST);
          hypre_TFree(info, HYPRE_MEMORY_HOST);
       }
       else
          hypre_MPI_Gatherv ( u_data, n, HYPRE_MPI_REAL,
-                       recv_buf, info, displs,
-                       HYPRE_MPI_REAL, 0, new_comm );
+                             recv_buf, info, displs,
+                             HYPRE_MPI_REAL, 0, new_comm );
 
       /* clean up */
-      if (redundant || my_id ==0)
+      if (redundant || my_id == 0)
       {
          hypre_BoomerAMGSolve(coarse_solver, A_coarse, F_coarse, U_coarse);
       }
@@ -448,39 +467,48 @@ hypre_seqAMGCycle( hypre_ParAMGData *amg_data,
 
          for (i = 0; i < n; i++)
          {
-            u_data[i] = local_data[first_index+i];
+            u_data[i] = local_data[first_index + i];
          }
       }
       else
       {
-         HYPRE_Real *local_data=NULL;
+         HYPRE_Real *local_data = NULL;
 
          if (my_id == 0)
+         {
             local_data =  hypre_VectorData(hypre_ParVectorLocalVector(U_coarse));
+         }
 
          hypre_MPI_Scatterv ( local_data, info, displs, HYPRE_MPI_REAL,
-                       u_data, n, HYPRE_MPI_REAL, 0, new_comm );
+                              u_data, n, HYPRE_MPI_REAL, 0, new_comm );
          /*if (my_id == 0)
             local_data =  hypre_VectorData(hypre_ParVectorLocalVector(F_coarse));
             hypre_MPI_Scatterv ( local_data, info, displs, HYPRE_MPI_REAL,
                        f_data, n, HYPRE_MPI_REAL, 0, new_comm );*/
-         if (my_id == 0) hypre_TFree(displs, HYPRE_MEMORY_HOST);
+         if (my_id == 0) { hypre_TFree(displs, HYPRE_MEMORY_HOST); }
          hypre_TFree(info, HYPRE_MEMORY_HOST);
       }
    }
 
-   return(Solve_err_flag);
+   return (Solve_err_flag);
 }
 
-/* generate sub communicator, which contains no idle processors */
+/*--------------------------------------------------------------------------
+ * hypre_GenerateSubComm
+ *
+ * generate sub communicator, which contains no idle processors
+ *--------------------------------------------------------------------------*/
 
-HYPRE_Int hypre_GenerateSubComm(MPI_Comm comm, HYPRE_Int participate, MPI_Comm *new_comm_ptr)
+HYPRE_Int
+hypre_GenerateSubComm(MPI_Comm   comm,
+                      HYPRE_Int  participate,
+                      MPI_Comm  *new_comm_ptr)
 {
-   MPI_Comm new_comm;
-   hypre_MPI_Group orig_group, new_group;
-   hypre_MPI_Op hypre_MPI_MERGE;
-   HYPRE_Int *info, *ranks, new_num_procs, my_info, my_id, num_procs;
-   HYPRE_Int *list_len;
+   MPI_Comm          new_comm;
+   hypre_MPI_Group   orig_group, new_group;
+   hypre_MPI_Op      hypre_MPI_MERGE;
+   HYPRE_Int        *info, *ranks, new_num_procs, my_info, my_id, num_procs;
+   HYPRE_Int        *list_len;
 
    hypre_MPI_Comm_rank(comm, &my_id);
 
@@ -499,10 +527,11 @@ HYPRE_Int hypre_GenerateSubComm(MPI_Comm comm, HYPRE_Int participate, MPI_Comm *
    {
       new_comm = hypre_MPI_COMM_NULL;
       *new_comm_ptr = new_comm;
-      return 0;
+
+      return hypre_error_flag;
    }
 
-   ranks = hypre_CTAlloc(HYPRE_Int, new_num_procs+2, HYPRE_MEMORY_HOST);
+   ranks = hypre_CTAlloc(HYPRE_Int, new_num_procs + 2, HYPRE_MEMORY_HOST);
 
    if (new_num_procs == 1)
    {
@@ -514,7 +543,7 @@ HYPRE_Int hypre_GenerateSubComm(MPI_Comm comm, HYPRE_Int participate, MPI_Comm *
    }
    else
    {
-      info = hypre_CTAlloc(HYPRE_Int, new_num_procs+2, HYPRE_MEMORY_HOST);
+      info = hypre_CTAlloc(HYPRE_Int, new_num_procs + 2, HYPRE_MEMORY_HOST);
       list_len = hypre_CTAlloc(HYPRE_Int, 1, HYPRE_MEMORY_HOST);
 
       if (participate)
@@ -551,12 +580,21 @@ HYPRE_Int hypre_GenerateSubComm(MPI_Comm comm, HYPRE_Int participate, MPI_Comm *
 
    *new_comm_ptr = new_comm;
 
-   return 0;
+   return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_merge_lists
+ *--------------------------------------------------------------------------*/
 
-void hypre_merge_lists (HYPRE_Int *list1, HYPRE_Int* list2, hypre_int *np1, hypre_MPI_Datatype *dptr)
+void
+hypre_merge_lists(HYPRE_Int          *list1,
+                  HYPRE_Int          *list2,
+                  hypre_int          *np1,
+                  hypre_MPI_Datatype *dptr)
 {
+   HYPRE_UNUSED_VAR(dptr);
+
    HYPRE_Int i, len1, len2, indx1, indx2;
 
    if (list1[0] == 0)
@@ -568,14 +606,14 @@ void hypre_merge_lists (HYPRE_Int *list1, HYPRE_Int* list2, hypre_int *np1, hypr
       list2[0] = 1;
       len1 = list1[1];
       len2 = list2[1];
-      list2[1] = len1+len2;
-      if ((hypre_int)(list2[1]) > *np1+2) // RL:???
+      list2[1] = len1 + len2;
+      if ((hypre_int)(list2[1]) > *np1 + 2) // RL:???
       {
          printf("segfault in MPI User function merge_list\n");
       }
-      indx1 = len1+1;
-      indx2 = len2+1;
-      for (i=len1+len2+1; i > 1; i--)
+      indx1 = len1 + 1;
+      indx2 = len2 + 1;
+      for (i = len1 + len2 + 1; i > 1; i--)
       {
          if (indx2 > 1 && indx1 > 1 && list1[indx1] > list2[indx2])
          {
diff --git a/external/hypre/src/parcsr_ls/headers b/external/hypre/src/parcsr_ls/headers
old mode 100644
new mode 100755
index 29309e5a..4c7a5dc7
--- a/external/hypre/src/parcsr_ls/headers
+++ b/external/hypre/src/parcsr_ls/headers
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -34,6 +34,9 @@ typedef struct { HYPRE_Int prev; HYPRE_Int next; } Link;
 cat par_amg.h             >> $INTERNAL_HEADER
 cat par_amgdd_comp_grid.h >> $INTERNAL_HEADER
 cat par_amgdd.h           >> $INTERNAL_HEADER
+cat par_fsai.h            >> $INTERNAL_HEADER
+cat ams.h                 >> $INTERNAL_HEADER
+cat par_ilu.h             >> $INTERNAL_HEADER
 cat protos.h              >> $INTERNAL_HEADER
 
 #===========================================================================
@@ -55,4 +58,3 @@ cat >> $INTERNAL_HEADER <<@
 #endif
 
 @
-
diff --git a/external/hypre/src/parcsr_ls/par_2s_interp.c b/external/hypre/src/parcsr_ls/par_2s_interp.c
index ec4f703a..05594b70 100644
--- a/external/hypre/src/parcsr_ls/par_2s_interp.c
+++ b/external/hypre/src/parcsr_ls/par_2s_interp.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -24,6 +24,10 @@ hypre_BoomerAMGBuildModPartialExtInterpHost( hypre_ParCSRMatrix  *A,
                                              HYPRE_Int            max_elmts,
                                              hypre_ParCSRMatrix **P_ptr )
 {
+   HYPRE_UNUSED_VAR(num_functions);
+   HYPRE_UNUSED_VAR(dof_func);
+   HYPRE_UNUSED_VAR(debug_flag);
+
    /* Communication Variables */
    MPI_Comm                 comm = hypre_ParCSRMatrixComm(A);
    HYPRE_MemoryLocation memory_location_P = hypre_ParCSRMatrixMemoryLocation(A);
@@ -125,14 +129,14 @@ hypre_BoomerAMGBuildModPartialExtInterpHost( hypre_ParCSRMatrix  *A,
 
    /* BEGIN */
    hypre_MPI_Comm_size(comm, &num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_rank(comm, &my_id);
 
-   if (my_id == (num_procs -1)) total_global_cpts = num_cpts_global[1];
-   if (my_id == (num_procs -1)) total_old_global_cpts = num_old_cpts_global[1];
-   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
-   hypre_MPI_Bcast(&total_old_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
-   n_Cpts = num_cpts_global[1]-num_cpts_global[0];
-   n_old_Cpts = num_old_cpts_global[1]-num_old_cpts_global[0];
+   if (my_id == (num_procs - 1)) { total_global_cpts = num_cpts_global[1]; }
+   if (my_id == (num_procs - 1)) { total_old_global_cpts = num_old_cpts_global[1]; }
+   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
+   hypre_MPI_Bcast(&total_old_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
+   n_Cpts = num_cpts_global[1] - num_cpts_global[0];
+   n_old_Cpts = num_old_cpts_global[1] - num_old_cpts_global[0];
 
    hypre_ParCSRMatrixGenerateFFFC3(A, CF_marker, num_cpts_global, S, &As_FC, &As_FF);
 
@@ -160,27 +164,27 @@ hypre_BoomerAMGBuildModPartialExtInterpHost( hypre_ParCSRMatrix  *A,
    D_w = hypre_CTAlloc(HYPRE_Real, n_new_Fpts, memory_location_P);
    cpt_array = hypre_CTAlloc(HYPRE_Int, num_threads, HYPRE_MEMORY_HOST);
    new_fpt_array = hypre_CTAlloc(HYPRE_Int, num_threads, HYPRE_MEMORY_HOST);
-   start_array = hypre_CTAlloc(HYPRE_Int, num_threads+1, HYPRE_MEMORY_HOST);
+   start_array = hypre_CTAlloc(HYPRE_Int, num_threads + 1, HYPRE_MEMORY_HOST);
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel private(i,j,start,stop,startf,stopf,startnewf,stopnewf,row,fpt)
+   #pragma omp parallel private(i,j,start,stop,startf,stopf,startnewf,stopnewf,row,fpt)
 #endif
    {
       HYPRE_Int my_thread_num = hypre_GetThreadNum();
       HYPRE_Real beta, gamma;
 
-      start = (n_fine/num_threads)*my_thread_num;
-      if (my_thread_num == num_threads-1)
+      start = (n_fine / num_threads) * my_thread_num;
+      if (my_thread_num == num_threads - 1)
       {
          stop = n_fine;
       }
       else
       {
-         stop = (n_fine/num_threads)*(my_thread_num+1);
+         stop = (n_fine / num_threads) * (my_thread_num + 1);
       }
-      start_array[my_thread_num+1] = stop;
+      start_array[my_thread_num + 1] = stop;
       row = 0;
-      for (i=start; i < stop; i++)
+      for (i = start; i < stop; i++)
       {
          if (CF_marker[i] > 0)
          {
@@ -193,14 +197,14 @@ hypre_BoomerAMGBuildModPartialExtInterpHost( hypre_ParCSRMatrix  *A,
       }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
       if (my_thread_num == 0)
       {
-         for (i=1; i < num_threads; i++)
+         for (i = 1; i < num_threads; i++)
          {
-            cpt_array[i] += cpt_array[i-1];
-            new_fpt_array[i] += new_fpt_array[i-1];
+            cpt_array[i] += cpt_array[i - 1];
+            new_fpt_array[i] += new_fpt_array[i - 1];
          }
          /*if (num_functions > 1)
          {
@@ -225,18 +229,18 @@ hypre_BoomerAMGBuildModPartialExtInterpHost( hypre_ParCSRMatrix  *A,
          }*/
       }
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
       if (my_thread_num > 0)
       {
-         startf = start - cpt_array[my_thread_num-1];
+         startf = start - cpt_array[my_thread_num - 1];
       }
       else
       {
          startf = 0;
       }
 
-      if (my_thread_num < num_threads-1)
+      if (my_thread_num < num_threads - 1)
       {
          stopf = stop - cpt_array[my_thread_num];
       }
@@ -246,22 +250,22 @@ hypre_BoomerAMGBuildModPartialExtInterpHost( hypre_ParCSRMatrix  *A,
       }
 
       /* Create D_q = D_beta */
-      for (i=startf; i < stopf; i++)
+      for (i = startf; i < stopf; i++)
       {
-         for (j=As_FC_diag_i[i]; j < As_FC_diag_i[i+1]; j++)
+         for (j = As_FC_diag_i[i]; j < As_FC_diag_i[i + 1]; j++)
          {
             D_q[i] += As_FC_diag_data[j];
          }
-         for (j=As_FC_offd_i[i]; j < As_FC_offd_i[i+1]; j++)
+         for (j = As_FC_offd_i[i]; j < As_FC_offd_i[i + 1]; j++)
          {
             D_q[i] += As_FC_offd_data[j];
          }
       }
 
       row = 0;
-      if (my_thread_num) row = new_fpt_array[my_thread_num-1];
+      if (my_thread_num) { row = new_fpt_array[my_thread_num - 1]; }
       fpt = startf;
-      for (i=start; i < stop; i++)
+      for (i = start; i < stop; i++)
       {
          if (CF_marker[i] == -2)
          {
@@ -273,10 +277,10 @@ hypre_BoomerAMGBuildModPartialExtInterpHost( hypre_ParCSRMatrix  *A,
          }
       }
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
-     if (my_thread_num == 0)
-     {
+      if (my_thread_num == 0)
+      {
          if (num_cols_A_FF_offd)
          {
             D_q_offd = hypre_CTAlloc(HYPRE_Real, num_cols_A_FF_offd, memory_location_P);
@@ -289,28 +293,29 @@ hypre_BoomerAMGBuildModPartialExtInterpHost( hypre_ParCSRMatrix  *A,
             comm_pkg = hypre_ParCSRMatrixCommPkg(As_FF);
          }
          num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
-         buf_data = hypre_CTAlloc(HYPRE_Real, hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends), memory_location_P);
+         buf_data = hypre_CTAlloc(HYPRE_Real, hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                                  memory_location_P);
          for (i = 0; i < num_sends; i++)
          {
             startc = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-            for (j = startc; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+            for (j = startc; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
             {
-               buf_data[index++] = D_q[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+               buf_data[index++] = D_q[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
             }
          }
 
          comm_handle = hypre_ParCSRCommHandleCreate( 1, comm_pkg, buf_data, D_q_offd);
          hypre_ParCSRCommHandleDestroy(comm_handle);
 
-     }
+      }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
       /* Create D_w = D_alpha + D_gamma */
       row = 0;
-      if (my_thread_num) row = new_fpt_array[my_thread_num-1];
-      for (i=start; i < stop; i++)
+      if (my_thread_num) { row = new_fpt_array[my_thread_num - 1]; }
+      for (i = start; i < stop; i++)
       {
          if (CF_marker[i] == -2)
          {
@@ -365,21 +370,21 @@ hypre_BoomerAMGBuildModPartialExtInterpHost( hypre_ParCSRMatrix  *A,
             }
             else*/
             {
-               for (j=A_diag_i[i]; j < A_diag_i[i+1]; j++)
+               for (j = A_diag_i[i]; j < A_diag_i[i + 1]; j++)
                {
                   D_w[row] += A_diag_data[j];
                }
-               for (j=A_offd_i[i]; j < A_offd_i[i+1]; j++)
+               for (j = A_offd_i[i]; j < A_offd_i[i + 1]; j++)
                {
                   D_w[row] += A_offd_data[j];
                }
-               for (j=As_FF_diag_i[row]+1; j < As_FF_diag_i[row+1]; j++)
+               for (j = As_FF_diag_i[row] + 1; j < As_FF_diag_i[row + 1]; j++)
                {
-                  if (D_q[As_FF_diag_j[j]]) D_w[row] -= As_FF_diag_data[j];
+                  if (D_q[As_FF_diag_j[j]]) { D_w[row] -= As_FF_diag_data[j]; }
                }
-               for (j=As_FF_offd_i[row]; j < As_FF_offd_i[row+1]; j++)
+               for (j = As_FF_offd_i[row]; j < As_FF_offd_i[row + 1]; j++)
                {
-                  if (D_q_offd[As_FF_offd_j[j]]) D_w[row] -= As_FF_offd_data[j];
+                  if (D_q_offd[As_FF_offd_j[j]]) { D_w[row] -= As_FF_offd_data[j]; }
                }
                D_w[row] -= D_q[new_fine_to_fine[row]];
                row++;
@@ -389,32 +394,40 @@ hypre_BoomerAMGBuildModPartialExtInterpHost( hypre_ParCSRMatrix  *A,
 
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
       startnewf = 0;
-      if (my_thread_num) startnewf = new_fpt_array[my_thread_num-1];
+      if (my_thread_num) { startnewf = new_fpt_array[my_thread_num - 1]; }
       stopnewf = new_fpt_array[my_thread_num];
-      for (i=startnewf; i<stopnewf; i++)
+      for (i = startnewf; i < stopnewf; i++)
       {
          j = As_FF_diag_i[i];
          if (D_w[i])
          {
-            beta = 1.0/D_w[i];
-            As_FF_diag_data[j] = beta*D_q[new_fine_to_fine[i]];
-            for (j=As_FF_diag_i[i]+1; j < As_FF_diag_i[i+1]; j++)
+            beta = 1.0 / D_w[i];
+            As_FF_diag_data[j] = beta * D_q[new_fine_to_fine[i]];
+            for (j = As_FF_diag_i[i] + 1; j < As_FF_diag_i[i + 1]; j++)
+            {
                As_FF_diag_data[j] *= beta;
-            for (j=As_FF_offd_i[i]; j < As_FF_offd_i[i+1]; j++)
+            }
+            for (j = As_FF_offd_i[i]; j < As_FF_offd_i[i + 1]; j++)
+            {
                As_FF_offd_data[j] *= beta;
+            }
          }
       }
-      for (i=startf; i<stopf; i++)
+      for (i = startf; i < stopf; i++)
       {
-         if (D_q[i]) gamma = -1.0/D_q[i];
-         else gamma = 0.0;
-         for (j=As_FC_diag_i[i]; j < As_FC_diag_i[i+1]; j++)
+         if (D_q[i]) { gamma = -1.0 / D_q[i]; }
+         else { gamma = 0.0; }
+         for (j = As_FC_diag_i[i]; j < As_FC_diag_i[i + 1]; j++)
+         {
             As_FC_diag_data[j] *= gamma;
-         for (j=As_FC_offd_i[i]; j < As_FC_offd_i[i+1]; j++)
+         }
+         for (j = As_FC_offd_i[i]; j < As_FC_offd_i[i + 1]; j++)
+         {
             As_FC_offd_data[j] *= gamma;
+         }
       }
 
    }   /* end parallel region */
@@ -432,8 +445,8 @@ hypre_BoomerAMGBuildModPartialExtInterpHost( hypre_ParCSRMatrix  *A,
    /*-----------------------------------------------------------------------
     *  Intialize data for P
     *-----------------------------------------------------------------------*/
-   P_diag_i    = hypre_CTAlloc(HYPRE_Int,  n_old_Cpts+1, memory_location_P);
-   P_offd_i    = hypre_CTAlloc(HYPRE_Int,  n_old_Cpts+1, memory_location_P);
+   P_diag_i    = hypre_CTAlloc(HYPRE_Int,  n_old_Cpts + 1, memory_location_P);
+   P_offd_i    = hypre_CTAlloc(HYPRE_Int,  n_old_Cpts + 1, memory_location_P);
 
    P_diag_size = n_Cpts + hypre_CSRMatrixI(W_diag)[n_new_Fpts];
    P_offd_size = hypre_CSRMatrixI(W_offd)[n_new_Fpts];
@@ -451,25 +464,29 @@ hypre_BoomerAMGBuildModPartialExtInterpHost( hypre_ParCSRMatrix  *A,
    }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel private(i,j,start,stop,startnewf,stopnewf,c_pt,row,cnt_diag,cnt_offd)
+   #pragma omp parallel private(i,j,start,stop,startnewf,stopnewf,c_pt,row,cnt_diag,cnt_offd)
 #endif
    {
       HYPRE_Int rowp;
       HYPRE_Int my_thread_num = hypre_GetThreadNum();
       start = start_array[my_thread_num];
-      stop = start_array[my_thread_num+1];
+      stop = start_array[my_thread_num + 1];
 
       if (my_thread_num > 0)
-         c_pt = cpt_array[my_thread_num-1];
+      {
+         c_pt = cpt_array[my_thread_num - 1];
+      }
       else
+      {
          c_pt = 0;
+      }
       row = 0;
-      if (my_thread_num) row = new_fpt_array[my_thread_num-1];
+      if (my_thread_num) { row = new_fpt_array[my_thread_num - 1]; }
       rowp = row;
-      if (my_thread_num > 0) rowp = row+cpt_array[my_thread_num-1];
-      cnt_diag = W_diag_i[row]+c_pt;
+      if (my_thread_num > 0) { rowp = row + cpt_array[my_thread_num - 1]; }
+      cnt_diag = W_diag_i[row] + c_pt;
       cnt_offd = W_offd_i[row];
-      for (i=start; i < stop; i++)
+      for (i = start; i < stop; i++)
       {
          if (CF_marker[i] > 0)
          {
@@ -482,12 +499,12 @@ hypre_BoomerAMGBuildModPartialExtInterpHost( hypre_ParCSRMatrix  *A,
          else if (CF_marker[i] == -2)
          {
             rowp++;
-            for (j=W_diag_i[row]; j < W_diag_i[row+1]; j++)
+            for (j = W_diag_i[row]; j < W_diag_i[row + 1]; j++)
             {
                P_diag_j[cnt_diag] = W_diag_j[j];
                P_diag_data[cnt_diag++] = W_diag_data[j];
             }
-            for (j=W_offd_i[row]; j < W_offd_i[row+1]; j++)
+            for (j = W_offd_i[row]; j < W_offd_i[row + 1]; j++)
             {
                P_offd_j[cnt_offd] = W_offd_j[j];
                P_offd_data[cnt_offd++] = W_offd_data[j];
@@ -504,13 +521,13 @@ hypre_BoomerAMGBuildModPartialExtInterpHost( hypre_ParCSRMatrix  *A,
     *-----------------------------------------------------------------------*/
 
    P = hypre_ParCSRMatrixCreate(comm,
-         total_old_global_cpts,
-         total_global_cpts,
-         num_old_cpts_global,
-         num_cpts_global,
-         num_cols_P_offd,
-         P_diag_i[n_old_Cpts],
-         P_offd_i[n_old_Cpts]);
+                                total_old_global_cpts,
+                                total_global_cpts,
+                                num_old_cpts_global,
+                                num_cpts_global,
+                                num_cols_P_offd,
+                                P_diag_i[n_old_Cpts],
+                                P_offd_i[n_old_Cpts]);
 
    P_diag = hypre_ParCSRMatrixDiag(P);
    hypre_CSRMatrixData(P_diag) = P_diag_data;
@@ -544,20 +561,20 @@ hypre_BoomerAMGBuildModPartialExtInterpHost( hypre_ParCSRMatrix  *A,
       if (num_cols_P_offd)
       {
          P_marker = hypre_CTAlloc(HYPRE_Int, num_cols_P_offd, HYPRE_MEMORY_HOST);
-         for (i=0; i < P_offd_size; i++)
+         for (i = 0; i < P_offd_size; i++)
          {
             P_marker[P_offd_j[i]] = 1;
          }
 
          new_ncols_P_offd = 0;
-         for (i=0; i < num_cols_P_offd; i++)
-            if (P_marker[i]) new_ncols_P_offd++;
+         for (i = 0; i < num_cols_P_offd; i++)
+            if (P_marker[i]) { new_ncols_P_offd++; }
 
          new_col_map_offd = hypre_CTAlloc(HYPRE_BigInt, new_ncols_P_offd, HYPRE_MEMORY_HOST);
          map = hypre_CTAlloc(HYPRE_Int, new_ncols_P_offd, HYPRE_MEMORY_HOST);
 
          index = 0;
-         for (i=0; i < num_cols_P_offd; i++)
+         for (i = 0; i < num_cols_P_offd; i++)
             if (P_marker[i])
             {
                new_col_map_offd[index] = col_map_offd_P[i];
@@ -567,12 +584,12 @@ hypre_BoomerAMGBuildModPartialExtInterpHost( hypre_ParCSRMatrix  *A,
 
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+         #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-         for (i=0; i < P_offd_size; i++)
+         for (i = 0; i < P_offd_size; i++)
          {
             P_offd_j[i] = hypre_BinarySearch(map, P_offd_j[i],
-               new_ncols_P_offd);
+                                             new_ncols_P_offd);
          }
          hypre_TFree(col_map_offd_P, HYPRE_MEMORY_HOST);
          hypre_ParCSRMatrixColMapOffd(P) = new_col_map_offd;
@@ -615,31 +632,28 @@ hypre_BoomerAMGBuildModPartialExtInterp( hypre_ParCSRMatrix  *A,
                                          HYPRE_Int            max_elmts,
                                          hypre_ParCSRMatrix **P_ptr )
 {
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    hypre_GpuProfilingPushRange("PartialExtInterp");
-#endif
-
-   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_ParCSRMatrixMemoryLocation(A) );
 
    HYPRE_Int ierr = 0;
 
-   if (exec == HYPRE_EXEC_HOST)
+#if defined(HYPRE_USING_GPU)
+   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_ParCSRMatrixMemoryLocation(A) );
+   if (exec == HYPRE_EXEC_DEVICE)
    {
-      ierr = hypre_BoomerAMGBuildModPartialExtInterpHost(A, CF_marker, S, num_cpts_global, num_old_cpts_global,
-                                                         num_functions, dof_func,
-                                                         debug_flag, trunc_factor, max_elmts, P_ptr);
+      ierr = hypre_BoomerAMGBuildModPartialExtInterpDevice(A, CF_marker, S, num_cpts_global,
+                                                           num_old_cpts_global,
+                                                           debug_flag, trunc_factor, max_elmts, P_ptr);
    }
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    else
+#endif
    {
-      ierr = hypre_BoomerAMGBuildModPartialExtInterpDevice(A, CF_marker, S, num_cpts_global, num_old_cpts_global,
-                                                           debug_flag, trunc_factor, max_elmts, P_ptr);
+      ierr = hypre_BoomerAMGBuildModPartialExtInterpHost(A, CF_marker, S, num_cpts_global,
+                                                         num_old_cpts_global,
+                                                         num_functions, dof_func,
+                                                         debug_flag, trunc_factor, max_elmts, P_ptr);
    }
-#endif
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    hypre_GpuProfilingPopRange();
-#endif
 
    return ierr;
 }
@@ -657,6 +671,8 @@ hypre_BoomerAMGBuildModPartialExtPEInterpHost( hypre_ParCSRMatrix  *A,
                                                HYPRE_Int            max_elmts,
                                                hypre_ParCSRMatrix **P_ptr)
 {
+   HYPRE_UNUSED_VAR(debug_flag);
+
    /* Communication Variables */
    MPI_Comm                 comm = hypre_ParCSRMatrixComm(A);
    HYPRE_MemoryLocation memory_location_P = hypre_ParCSRMatrixMemoryLocation(A);
@@ -758,14 +774,14 @@ hypre_BoomerAMGBuildModPartialExtPEInterpHost( hypre_ParCSRMatrix  *A,
 
    /* BEGIN */
    hypre_MPI_Comm_size(comm, &num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_rank(comm, &my_id);
 
-   if (my_id == (num_procs -1)) total_global_cpts = num_cpts_global[1];
-   if (my_id == (num_procs -1)) total_old_global_cpts = num_old_cpts_global[1];
-   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
-   hypre_MPI_Bcast(&total_old_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
-   n_Cpts = num_cpts_global[1]-num_cpts_global[0];
-   n_old_Cpts = num_old_cpts_global[1]-num_old_cpts_global[0];
+   if (my_id == (num_procs - 1)) { total_global_cpts = num_cpts_global[1]; }
+   if (my_id == (num_procs - 1)) { total_old_global_cpts = num_old_cpts_global[1]; }
+   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
+   hypre_MPI_Bcast(&total_old_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
+   n_Cpts = num_cpts_global[1] - num_cpts_global[0];
+   n_old_Cpts = num_old_cpts_global[1] - num_old_cpts_global[0];
 
    hypre_ParCSRMatrixGenerateFFFCD3(A, CF_marker, num_cpts_global, S, &As_FC, &As_FF, &D_lambda);
 
@@ -795,27 +811,27 @@ hypre_BoomerAMGBuildModPartialExtPEInterpHost( hypre_ParCSRMatrix  *A,
    D_tau = hypre_CTAlloc(HYPRE_Real, n_new_Fpts, memory_location_P);
    cpt_array = hypre_CTAlloc(HYPRE_Int, num_threads, HYPRE_MEMORY_HOST);
    new_fpt_array = hypre_CTAlloc(HYPRE_Int, num_threads, HYPRE_MEMORY_HOST);
-   start_array = hypre_CTAlloc(HYPRE_Int, num_threads+1, HYPRE_MEMORY_HOST);
+   start_array = hypre_CTAlloc(HYPRE_Int, num_threads + 1, HYPRE_MEMORY_HOST);
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel private(i,j,start,stop,startf,stopf,startnewf,stopnewf,row,fpt,index)
+   #pragma omp parallel private(i,j,start,stop,startf,stopf,startnewf,stopnewf,row,fpt,index)
 #endif
    {
       HYPRE_Int my_thread_num = hypre_GetThreadNum();
       HYPRE_Real beta, gamma;
 
-      start = (n_fine/num_threads)*my_thread_num;
-      if (my_thread_num == num_threads-1)
+      start = (n_fine / num_threads) * my_thread_num;
+      if (my_thread_num == num_threads - 1)
       {
          stop = n_fine;
       }
       else
       {
-         stop = (n_fine/num_threads)*(my_thread_num+1);
+         stop = (n_fine / num_threads) * (my_thread_num + 1);
       }
-      start_array[my_thread_num+1] = stop;
+      start_array[my_thread_num + 1] = stop;
       row = 0;
-      for (i=start; i < stop; i++)
+      for (i = start; i < stop; i++)
       {
          if (CF_marker[i] > 0)
          {
@@ -828,14 +844,14 @@ hypre_BoomerAMGBuildModPartialExtPEInterpHost( hypre_ParCSRMatrix  *A,
       }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
       if (my_thread_num == 0)
       {
-         for (i=1; i < num_threads; i++)
+         for (i = 1; i < num_threads; i++)
          {
-            cpt_array[i] += cpt_array[i-1];
-            new_fpt_array[i] += new_fpt_array[i-1];
+            cpt_array[i] += cpt_array[i - 1];
+            new_fpt_array[i] += new_fpt_array[i - 1];
          }
          if (num_functions > 1)
          {
@@ -845,13 +861,14 @@ hypre_BoomerAMGBuildModPartialExtPEInterpHost( hypre_ParCSRMatrix  *A,
             dof_func_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_A_offd, memory_location_P);
             index = 0;
             num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
-            int_buf_data = hypre_CTAlloc(HYPRE_Int, hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends), memory_location_P);
+            int_buf_data = hypre_CTAlloc(HYPRE_Int, hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                                         memory_location_P);
             for (i = 0; i < num_sends; i++)
             {
                startc = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-               for (j = startc; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+               for (j = startc; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
                {
-                  int_buf_data[index++] = dof_func[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+                  int_buf_data[index++] = dof_func[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
                }
             }
             comm_handle = hypre_ParCSRCommHandleCreate( 11, comm_pkg, int_buf_data, dof_func_offd);
@@ -860,18 +877,18 @@ hypre_BoomerAMGBuildModPartialExtPEInterpHost( hypre_ParCSRMatrix  *A,
          }
       }
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
       if (my_thread_num > 0)
       {
-         startf = start - cpt_array[my_thread_num-1];
+         startf = start - cpt_array[my_thread_num - 1];
       }
       else
       {
          startf = 0;
       }
 
-      if (my_thread_num < num_threads-1)
+      if (my_thread_num < num_threads - 1)
       {
          stopf = stop - cpt_array[my_thread_num];
       }
@@ -881,23 +898,23 @@ hypre_BoomerAMGBuildModPartialExtPEInterpHost( hypre_ParCSRMatrix  *A,
       }
 
       /* Create D_q = D_beta, D_inv = 1/(D_q+D_lambda) */
-      for (i=startf; i < stopf; i++)
+      for (i = startf; i < stopf; i++)
       {
-         for (j=As_FC_diag_i[i]; j < As_FC_diag_i[i+1]; j++)
+         for (j = As_FC_diag_i[i]; j < As_FC_diag_i[i + 1]; j++)
          {
             D_q[i] += As_FC_diag_data[j];
          }
-         for (j=As_FC_offd_i[i]; j < As_FC_offd_i[i+1]; j++)
+         for (j = As_FC_offd_i[i]; j < As_FC_offd_i[i + 1]; j++)
          {
             D_q[i] += As_FC_offd_data[j];
          }
-         if (D_q[i]+D_lambda[i]) D_inv[i] = 1.0/(D_q[i]+D_lambda[i]);
+         if (D_q[i] + D_lambda[i]) { D_inv[i] = 1.0 / (D_q[i] + D_lambda[i]); }
       }
 
       row = 0;
-      if (my_thread_num) row = new_fpt_array[my_thread_num-1];
+      if (my_thread_num) { row = new_fpt_array[my_thread_num - 1]; }
       fpt = startf;
-      for (i=start; i < stop; i++)
+      for (i = start; i < stop; i++)
       {
          if (CF_marker[i] == -2)
          {
@@ -909,10 +926,10 @@ hypre_BoomerAMGBuildModPartialExtPEInterpHost( hypre_ParCSRMatrix  *A,
          }
       }
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
-     if (my_thread_num == 0)
-     {
+      if (my_thread_num == 0)
+      {
          if (num_cols_A_FF_offd)
          {
             D_lambda_offd = hypre_CTAlloc(HYPRE_Real, num_cols_A_FF_offd, memory_location_P);
@@ -926,13 +943,14 @@ hypre_BoomerAMGBuildModPartialExtPEInterpHost( hypre_ParCSRMatrix  *A,
             comm_pkg = hypre_ParCSRMatrixCommPkg(As_FF);
          }
          num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
-         buf_data = hypre_CTAlloc(HYPRE_Real, hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends), memory_location_P);
+         buf_data = hypre_CTAlloc(HYPRE_Real, hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                                  memory_location_P);
          for (i = 0; i < num_sends; i++)
          {
             startc = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-            for (j = startc; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+            for (j = startc; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
             {
-               buf_data[index++] = D_lambda[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+               buf_data[index++] = D_lambda[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
             }
          }
 
@@ -943,45 +961,45 @@ hypre_BoomerAMGBuildModPartialExtPEInterpHost( hypre_ParCSRMatrix  *A,
          for (i = 0; i < num_sends; i++)
          {
             startc = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-            for (j = startc; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+            for (j = startc; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
             {
-               buf_data[index++] = D_inv[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+               buf_data[index++] = D_inv[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
             }
          }
 
          comm_handle = hypre_ParCSRCommHandleCreate( 1, comm_pkg, buf_data, D_inv_offd);
          hypre_ParCSRCommHandleDestroy(comm_handle);
 
-     }
+      }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
       /* Create D_tau */
       startnewf = 0;
-      if (my_thread_num) startnewf = new_fpt_array[my_thread_num-1];
+      if (my_thread_num) { startnewf = new_fpt_array[my_thread_num - 1]; }
       stopnewf = new_fpt_array[my_thread_num];
-      for (i=startnewf; i<stopnewf; i++)
+      for (i = startnewf; i < stopnewf; i++)
       {
-         for (j=As_FF_diag_i[i]+1; j < As_FF_diag_i[i+1]; j++)
+         for (j = As_FF_diag_i[i] + 1; j < As_FF_diag_i[i + 1]; j++)
          {
             index = As_FF_diag_j[j];
-            D_tau[i] += As_FF_diag_data[j]*D_lambda[index]*D_inv[index];
+            D_tau[i] += As_FF_diag_data[j] * D_lambda[index] * D_inv[index];
          }
-         for (j=As_FF_offd_i[i]; j < As_FF_offd_i[i+1]; j++)
+         for (j = As_FF_offd_i[i]; j < As_FF_offd_i[i + 1]; j++)
          {
             index = As_FF_offd_j[j];
-            D_tau[i] += As_FF_offd_data[j]*D_lambda_offd[index]*D_inv_offd[index];
+            D_tau[i] += As_FF_offd_data[j] * D_lambda_offd[index] * D_inv_offd[index];
          }
       }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
       /* Create D_w = D_alpha + D_gamma + D_tau */
       row = 0;
-      if (my_thread_num) row = new_fpt_array[my_thread_num-1];
-      for (i=start; i < stop; i++)
+      if (my_thread_num) { row = new_fpt_array[my_thread_num - 1]; }
+      for (i = start; i < stop; i++)
       {
          if (CF_marker[i] == -2)
          {
@@ -989,7 +1007,7 @@ hypre_BoomerAMGBuildModPartialExtPEInterpHost( hypre_ParCSRMatrix  *A,
             {
                HYPRE_Int jA, jC, jS;
                jC = A_diag_i[i];
-               for (j=S_diag_i[i]; j < S_diag_i[i+1]; j++)
+               for (j = S_diag_i[i]; j < S_diag_i[i + 1]; j++)
                {
                   jS = S_diag_j[j];
                   jA = A_diag_j[jC];
@@ -1000,18 +1018,22 @@ hypre_BoomerAMGBuildModPartialExtPEInterpHost( hypre_ParCSRMatrix  *A,
                         D_w[row] += A_diag_data[jC++];
                      }
                      else
+                     {
                         jC++;
+                     }
                      jA = A_diag_j[jC];
                   }
                   jC++;
                }
-               for (j=jC; j < A_diag_i[i+1]; j++)
+               for (j = jC; j < A_diag_i[i + 1]; j++)
                {
                   if (dof_func[i] == dof_func[A_diag_j[j]])
-                        D_w[row] += A_diag_data[j];
+                  {
+                     D_w[row] += A_diag_data[j];
+                  }
                }
                jC = A_offd_i[i];
-               for (j=S_offd_i[i]; j < S_offd_i[i+1]; j++)
+               for (j = S_offd_i[i]; j < S_offd_i[i + 1]; j++)
                {
                   jS = S_offd_j[j];
                   jA = A_offd_j[jC];
@@ -1022,36 +1044,40 @@ hypre_BoomerAMGBuildModPartialExtPEInterpHost( hypre_ParCSRMatrix  *A,
                         D_w[row] += A_offd_data[jC++];
                      }
                      else
+                     {
                         jC++;
+                     }
                      jA = A_offd_j[jC];
                   }
                   jC++;
                }
-               for (j=jC; j < A_offd_i[i+1]; j++)
+               for (j = jC; j < A_offd_i[i + 1]; j++)
                {
                   if (dof_func[i] == dof_func_offd[A_offd_j[j]])
-                        D_w[row] += A_offd_data[j];
+                  {
+                     D_w[row] += A_offd_data[j];
+                  }
                }
                D_w[row] += D_tau[row];
                row++;
             }
             else
             {
-               for (j=A_diag_i[i]; j < A_diag_i[i+1]; j++)
+               for (j = A_diag_i[i]; j < A_diag_i[i + 1]; j++)
                {
                   D_w[row] += A_diag_data[j];
                }
-               for (j=A_offd_i[i]; j < A_offd_i[i+1]; j++)
+               for (j = A_offd_i[i]; j < A_offd_i[i + 1]; j++)
                {
                   D_w[row] += A_offd_data[j];
                }
-               for (j=As_FF_diag_i[row]+1; j < As_FF_diag_i[row+1]; j++)
+               for (j = As_FF_diag_i[row] + 1; j < As_FF_diag_i[row + 1]; j++)
                {
-                  if (D_inv[As_FF_diag_j[j]]) D_w[row] -= As_FF_diag_data[j];
+                  if (D_inv[As_FF_diag_j[j]]) { D_w[row] -= As_FF_diag_data[j]; }
                }
-               for (j=As_FF_offd_i[row]; j < As_FF_offd_i[row+1]; j++)
+               for (j = As_FF_offd_i[row]; j < As_FF_offd_i[row + 1]; j++)
                {
-                  if (D_inv_offd[As_FF_offd_j[j]]) D_w[row] -= As_FF_offd_data[j];
+                  if (D_inv_offd[As_FF_offd_j[j]]) { D_w[row] -= As_FF_offd_data[j]; }
                }
                D_w[row] += D_tau[row] - D_q[new_fine_to_fine[row]];
                row++;
@@ -1060,32 +1086,40 @@ hypre_BoomerAMGBuildModPartialExtPEInterpHost( hypre_ParCSRMatrix  *A,
       }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
 
       startnewf = 0;
-      if (my_thread_num) startnewf = new_fpt_array[my_thread_num-1];
+      if (my_thread_num) { startnewf = new_fpt_array[my_thread_num - 1]; }
       stopnewf = new_fpt_array[my_thread_num];
-      for (i=startnewf; i<stopnewf; i++)
+      for (i = startnewf; i < stopnewf; i++)
       {
          j = As_FF_diag_i[i];
          if (D_w[i])
          {
-            beta = -1.0/D_w[i];
-            As_FF_diag_data[j] = beta*(D_q[new_fine_to_fine[i]]+D_lambda[new_fine_to_fine[i]]);
-            for (j=As_FF_diag_i[i]+1; j < As_FF_diag_i[i+1]; j++)
+            beta = -1.0 / D_w[i];
+            As_FF_diag_data[j] = beta * (D_q[new_fine_to_fine[i]] + D_lambda[new_fine_to_fine[i]]);
+            for (j = As_FF_diag_i[i] + 1; j < As_FF_diag_i[i + 1]; j++)
+            {
                As_FF_diag_data[j] *= beta;
-            for (j=As_FF_offd_i[i]; j < As_FF_offd_i[i+1]; j++)
+            }
+            for (j = As_FF_offd_i[i]; j < As_FF_offd_i[i + 1]; j++)
+            {
                As_FF_offd_data[j] *= beta;
+            }
          }
       }
-      for (i=startf; i<stopf; i++)
+      for (i = startf; i < stopf; i++)
       {
          gamma = D_inv[i];
-         for (j=As_FC_diag_i[i]; j < As_FC_diag_i[i+1]; j++)
+         for (j = As_FC_diag_i[i]; j < As_FC_diag_i[i + 1]; j++)
+         {
             As_FC_diag_data[j] *= gamma;
-         for (j=As_FC_offd_i[i]; j < As_FC_offd_i[i+1]; j++)
+         }
+         for (j = As_FC_offd_i[i]; j < As_FC_offd_i[i + 1]; j++)
+         {
             As_FC_offd_data[j] *= gamma;
+         }
       }
 
    }   /* end parallel region */
@@ -1103,8 +1137,8 @@ hypre_BoomerAMGBuildModPartialExtPEInterpHost( hypre_ParCSRMatrix  *A,
    /*-----------------------------------------------------------------------
     *  Intialize data for P
     *-----------------------------------------------------------------------*/
-   P_diag_i    = hypre_CTAlloc(HYPRE_Int,  n_old_Cpts+1, memory_location_P);
-   P_offd_i    = hypre_CTAlloc(HYPRE_Int,  n_old_Cpts+1, memory_location_P);
+   P_diag_i    = hypre_CTAlloc(HYPRE_Int,  n_old_Cpts + 1, memory_location_P);
+   P_offd_i    = hypre_CTAlloc(HYPRE_Int,  n_old_Cpts + 1, memory_location_P);
 
    P_diag_size = n_Cpts + hypre_CSRMatrixI(W_diag)[n_new_Fpts];
    P_offd_size = hypre_CSRMatrixI(W_offd)[n_new_Fpts];
@@ -1122,25 +1156,29 @@ hypre_BoomerAMGBuildModPartialExtPEInterpHost( hypre_ParCSRMatrix  *A,
    }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel private(i,j,start,stop,c_pt,row,cnt_diag,cnt_offd)
+   #pragma omp parallel private(i,j,start,stop,c_pt,row,cnt_diag,cnt_offd)
 #endif
    {
       HYPRE_Int rowp;
       HYPRE_Int my_thread_num = hypre_GetThreadNum();
       start = start_array[my_thread_num];
-      stop = start_array[my_thread_num+1];
+      stop = start_array[my_thread_num + 1];
 
       if (my_thread_num > 0)
-         c_pt = cpt_array[my_thread_num-1];
+      {
+         c_pt = cpt_array[my_thread_num - 1];
+      }
       else
+      {
          c_pt = 0;
+      }
       row = 0;
-      if (my_thread_num) row = new_fpt_array[my_thread_num-1];
+      if (my_thread_num) { row = new_fpt_array[my_thread_num - 1]; }
       rowp = row;
-      if (my_thread_num > 0) rowp = row+cpt_array[my_thread_num-1];
-      cnt_diag = W_diag_i[row]+c_pt;
+      if (my_thread_num > 0) { rowp = row + cpt_array[my_thread_num - 1]; }
+      cnt_diag = W_diag_i[row] + c_pt;
       cnt_offd = W_offd_i[row];
-      for (i=start; i < stop; i++)
+      for (i = start; i < stop; i++)
       {
          if (CF_marker[i] > 0)
          {
@@ -1153,12 +1191,12 @@ hypre_BoomerAMGBuildModPartialExtPEInterpHost( hypre_ParCSRMatrix  *A,
          else if (CF_marker[i] == -2)
          {
             rowp++;
-            for (j=W_diag_i[row]; j < W_diag_i[row+1]; j++)
+            for (j = W_diag_i[row]; j < W_diag_i[row + 1]; j++)
             {
                P_diag_j[cnt_diag] = W_diag_j[j];
                P_diag_data[cnt_diag++] = W_diag_data[j];
             }
-            for (j=W_offd_i[row]; j < W_offd_i[row+1]; j++)
+            for (j = W_offd_i[row]; j < W_offd_i[row + 1]; j++)
             {
                P_offd_j[cnt_offd] = W_offd_j[j];
                P_offd_data[cnt_offd++] = W_offd_data[j];
@@ -1175,13 +1213,13 @@ hypre_BoomerAMGBuildModPartialExtPEInterpHost( hypre_ParCSRMatrix  *A,
     *-----------------------------------------------------------------------*/
 
    P = hypre_ParCSRMatrixCreate(comm,
-         total_old_global_cpts,
-         total_global_cpts,
-         num_old_cpts_global,
-         num_cpts_global,
-         num_cols_P_offd,
-         P_diag_i[n_old_Cpts],
-         P_offd_i[n_old_Cpts]);
+                                total_old_global_cpts,
+                                total_global_cpts,
+                                num_old_cpts_global,
+                                num_cpts_global,
+                                num_cols_P_offd,
+                                P_diag_i[n_old_Cpts],
+                                P_offd_i[n_old_Cpts]);
 
    P_diag = hypre_ParCSRMatrixDiag(P);
    hypre_CSRMatrixData(P_diag) = P_diag_data;
@@ -1215,13 +1253,13 @@ hypre_BoomerAMGBuildModPartialExtPEInterpHost( hypre_ParCSRMatrix  *A,
       if (num_cols_P_offd)
       {
          P_marker = hypre_CTAlloc(HYPRE_Int, num_cols_P_offd, HYPRE_MEMORY_HOST);
-         for (i=0; i < P_offd_size; i++)
+         for (i = 0; i < P_offd_size; i++)
          {
             P_marker[P_offd_j[i]] = 1;
          }
 
          new_ncols_P_offd = 0;
-         for (i=0; i < num_cols_P_offd; i++)
+         for (i = 0; i < num_cols_P_offd; i++)
          {
             if (P_marker[i])
             {
@@ -1233,7 +1271,7 @@ hypre_BoomerAMGBuildModPartialExtPEInterpHost( hypre_ParCSRMatrix  *A,
          map = hypre_CTAlloc(HYPRE_Int, new_ncols_P_offd, HYPRE_MEMORY_HOST);
 
          index = 0;
-         for (i=0; i < num_cols_P_offd; i++)
+         for (i = 0; i < num_cols_P_offd; i++)
          {
             if (P_marker[i])
             {
@@ -1246,9 +1284,9 @@ hypre_BoomerAMGBuildModPartialExtPEInterpHost( hypre_ParCSRMatrix  *A,
 
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+         #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-         for (i=0; i < P_offd_size; i++)
+         for (i = 0; i < P_offd_size; i++)
          {
             P_offd_j[i] = hypre_BinarySearch(map, P_offd_j[i], new_ncols_P_offd);
          }
@@ -1297,31 +1335,28 @@ hypre_BoomerAMGBuildModPartialExtPEInterp( hypre_ParCSRMatrix  *A,
                                            HYPRE_Int            max_elmts,
                                            hypre_ParCSRMatrix **P_ptr )
 {
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    hypre_GpuProfilingPushRange("PartialExtPEInterp");
-#endif
-
-   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_ParCSRMatrixMemoryLocation(A) );
 
    HYPRE_Int ierr = 0;
 
-   if (exec == HYPRE_EXEC_HOST)
+#if defined(HYPRE_USING_GPU)
+   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_ParCSRMatrixMemoryLocation(A) );
+   if (exec == HYPRE_EXEC_DEVICE)
    {
-      ierr = hypre_BoomerAMGBuildModPartialExtPEInterpHost(A, CF_marker, S, num_cpts_global, num_old_cpts_global,
-                                                           num_functions, dof_func,
-                                                           debug_flag, trunc_factor, max_elmts, P_ptr);
+      ierr = hypre_BoomerAMGBuildModPartialExtPEInterpDevice(A, CF_marker, S, num_cpts_global,
+                                                             num_old_cpts_global,
+                                                             debug_flag, trunc_factor, max_elmts, P_ptr);
    }
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    else
+#endif
    {
-      ierr = hypre_BoomerAMGBuildModPartialExtPEInterpDevice(A, CF_marker, S, num_cpts_global, num_old_cpts_global,
-                                                             debug_flag, trunc_factor, max_elmts, P_ptr);
+      ierr = hypre_BoomerAMGBuildModPartialExtPEInterpHost(A, CF_marker, S, num_cpts_global,
+                                                           num_old_cpts_global,
+                                                           num_functions, dof_func,
+                                                           debug_flag, trunc_factor, max_elmts, P_ptr);
    }
-#endif
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    hypre_GpuProfilingPopRange();
-#endif
 
    return ierr;
 }
diff --git a/external/hypre/src/parcsr_ls/par_2s_interp_device.c b/external/hypre/src/parcsr_ls/par_2s_interp_device.c
index eab19cdd..a5b92556 100644
--- a/external/hypre/src/parcsr_ls/par_2s_interp_device.c
+++ b/external/hypre/src/parcsr_ls/par_2s_interp_device.c
@@ -1,24 +1,43 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
  ******************************************************************************/
 
+#include "_hypre_onedpl.hpp"
 #include "_hypre_parcsr_ls.h"
 #include "_hypre_utilities.hpp"
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-
-__global__ void hypreCUDAKernel_compute_weak_rowsums( HYPRE_Int nr_of_rows, bool has_offd, HYPRE_Int *CF_marker, HYPRE_Int *A_diag_i, HYPRE_Complex *A_diag_a, HYPRE_Int *S_diag_j, HYPRE_Int *A_offd_i, HYPRE_Complex *A_offd_a, HYPRE_Int *S_offd_j, HYPRE_Real *rs, HYPRE_Int flag );
-
-__global__ void hypreCUDAKernel_MMInterpScaleAFF( HYPRE_Int AFF_nrows, HYPRE_Int *AFF_diag_i, HYPRE_Int *AFF_diag_j, HYPRE_Complex *AFF_diag_a, HYPRE_Int *AFF_offd_i, HYPRE_Int *AFF_offd_j, HYPRE_Complex *AFF_offd_a, HYPRE_Complex *beta_diag, HYPRE_Complex *beta_offd, HYPRE_Int *F2_to_F, HYPRE_Real *rsW );
-
-__global__ void hypreCUDAKernel_compute_dlam_dtmp( HYPRE_Int nr_of_rows, HYPRE_Int *AFF_diag_i, HYPRE_Int *AFF_diag_j, HYPRE_Complex *AFF_diag_data, HYPRE_Int *AFF_offd_i, HYPRE_Complex *AFF_offd_data, HYPRE_Complex *rsFC, HYPRE_Complex *dlam, HYPRE_Complex *dtmp );
-
-__global__ void hypreCUDAKernel_MMPEInterpScaleAFF( HYPRE_Int AFF_nrows, HYPRE_Int *AFF_diag_i, HYPRE_Int *AFF_diag_j, HYPRE_Complex *AFF_diag_a, HYPRE_Int *AFF_offd_i, HYPRE_Int *AFF_offd_j, HYPRE_Complex *AFF_offd_a, HYPRE_Complex *tmp_diag, HYPRE_Complex *tmp_offd, HYPRE_Complex *lam_diag, HYPRE_Complex *lam_offd, HYPRE_Int *F2_to_F, HYPRE_Real *rsW );
-
-void hypreDevice_extendWtoP( HYPRE_Int P_nr_of_rows, HYPRE_Int W_nr_of_rows, HYPRE_Int W_nr_of_cols, HYPRE_Int *CF_marker, HYPRE_Int W_diag_nnz, HYPRE_Int *W_diag_i, HYPRE_Int *W_diag_j, HYPRE_Complex *W_diag_data, HYPRE_Int *P_diag_i, HYPRE_Int *P_diag_j, HYPRE_Complex *P_diag_data, HYPRE_Int *W_offd_i, HYPRE_Int *P_offd_i );
+#if defined(HYPRE_USING_GPU)
+
+#if defined(HYPRE_USING_SYCL)
+SYCL_EXTERNAL
+#endif
+__global__ void hypreGPUKernel_compute_weak_rowsums( hypre_DeviceItem &item, HYPRE_Int nr_of_rows,
+                                                     bool has_offd,
+                                                     HYPRE_Int *CF_marker, HYPRE_Int *A_diag_i, HYPRE_Complex *A_diag_a, HYPRE_Int *S_diag_j,
+                                                     HYPRE_Int *A_offd_i, HYPRE_Complex *A_offd_a, HYPRE_Int *S_offd_j, HYPRE_Real *rs, HYPRE_Int flag );
+
+__global__ void hypreGPUKernel_MMInterpScaleAFF( hypre_DeviceItem &item, HYPRE_Int AFF_nrows,
+                                                 HYPRE_Int *AFF_diag_i,
+                                                 HYPRE_Int *AFF_diag_j, HYPRE_Complex *AFF_diag_a, HYPRE_Int *AFF_offd_i, HYPRE_Int *AFF_offd_j,
+                                                 HYPRE_Complex *AFF_offd_a, HYPRE_Complex *beta_diag, HYPRE_Complex *beta_offd, HYPRE_Int *F2_to_F,
+                                                 HYPRE_Real *rsW );
+
+#if defined(HYPRE_USING_SYCL)
+SYCL_EXTERNAL
+#endif
+__global__ void hypreGPUKernel_compute_dlam_dtmp( hypre_DeviceItem &item, HYPRE_Int nr_of_rows,
+                                                  HYPRE_Int *AFF_diag_i,
+                                                  HYPRE_Int *AFF_diag_j, HYPRE_Complex *AFF_diag_data, HYPRE_Int *AFF_offd_i,
+                                                  HYPRE_Complex *AFF_offd_data, HYPRE_Complex *rsFC, HYPRE_Complex *dlam, HYPRE_Complex *dtmp );
+
+__global__ void hypreGPUKernel_MMPEInterpScaleAFF( hypre_DeviceItem &item, HYPRE_Int AFF_nrows,
+                                                   HYPRE_Int *AFF_diag_i,
+                                                   HYPRE_Int *AFF_diag_j, HYPRE_Complex *AFF_diag_a, HYPRE_Int *AFF_offd_i, HYPRE_Int *AFF_offd_j,
+                                                   HYPRE_Complex *AFF_offd_a, HYPRE_Complex *tmp_diag, HYPRE_Complex *tmp_offd,
+                                                   HYPRE_Complex *lam_diag, HYPRE_Complex *lam_offd, HYPRE_Int *F2_to_F, HYPRE_Real *rsW );
 
 /*--------------------------------------------------------------------------------------*/
 HYPRE_Int
@@ -32,6 +51,8 @@ hypre_BoomerAMGBuildModPartialExtInterpDevice( hypre_ParCSRMatrix  *A,
                                                HYPRE_Int            max_elmts,
                                                hypre_ParCSRMatrix **P_ptr )
 {
+   HYPRE_UNUSED_VAR(debug_flag);
+
    HYPRE_Int           A_nr_local   = hypre_ParCSRMatrixNumRows(A);
    hypre_CSRMatrix    *A_diag       = hypre_ParCSRMatrixDiag(A);
    HYPRE_Complex      *A_diag_data  = hypre_CSRMatrixData(A_diag);
@@ -40,7 +61,6 @@ hypre_BoomerAMGBuildModPartialExtInterpDevice( hypre_ParCSRMatrix  *A,
    HYPRE_Complex      *A_offd_data  = hypre_CSRMatrixData(A_offd);
    HYPRE_Int          *A_offd_i     = hypre_CSRMatrixI(A_offd);
    HYPRE_Int           A_offd_nnz   = hypre_CSRMatrixNumNonzeros(A_offd);
-   HYPRE_Int          *CF_marker_dev;
    HYPRE_Complex      *Dbeta, *Dbeta_offd, *rsWA, *rsW;
    hypre_ParCSRMatrix *As_F2F, *As_FC, *W, *P;
 
@@ -49,10 +69,6 @@ hypre_BoomerAMGBuildModPartialExtInterpDevice( hypre_ParCSRMatrix  *A,
    HYPRE_Int          *Soc_diag_j   = hypre_ParCSRMatrixSocDiagJ(S);
    HYPRE_Int          *Soc_offd_j   = hypre_ParCSRMatrixSocOffdJ(S);
 
-   CF_marker_dev = hypre_TAlloc(HYPRE_Int, A_nr_local, HYPRE_MEMORY_DEVICE);
-   hypre_TMemcpy(CF_marker_dev, CF_marker, HYPRE_Int, A_nr_local, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
-
-   //TODO use CF_marker_dev
    /* As_F2F = As_{F2, F}, As_FC = As_{F, C2} */
    hypre_ParCSRMatrixGenerateFFFC3Device(A, CF_marker, num_cpts_global, S, &As_FC, &As_F2F);
 
@@ -72,48 +88,74 @@ hypre_BoomerAMGBuildModPartialExtInterpDevice( hypre_ParCSRMatrix  *A,
       hypre_MatvecCommPkgCreate(As_F2F);
       comm_pkg = hypre_ParCSRMatrixCommPkg(As_F2F);
    }
-   Dbeta_offd = hypre_TAlloc(HYPRE_Complex, hypre_CSRMatrixNumCols(hypre_ParCSRMatrixOffd(As_F2F)), HYPRE_MEMORY_DEVICE);
+   Dbeta_offd = hypre_TAlloc(HYPRE_Complex, hypre_CSRMatrixNumCols(hypre_ParCSRMatrixOffd(As_F2F)),
+                             HYPRE_MEMORY_DEVICE);
    HYPRE_Int num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
    HYPRE_Int num_elmts_send = hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends);
    HYPRE_Complex *send_buf = hypre_TAlloc(HYPRE_Complex, num_elmts_send, HYPRE_MEMORY_DEVICE);
    hypre_ParCSRCommPkgCopySendMapElmtsToDevice(comm_pkg);
+#if defined(HYPRE_USING_SYCL)
+   hypreSycl_gather( hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg),
+                     hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg) + num_elmts_send,
+                     Dbeta,
+                     send_buf );
+#else
    HYPRE_THRUST_CALL( gather,
                       hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg),
                       hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg) + num_elmts_send,
                       Dbeta,
                       send_buf );
-   comm_handle = hypre_ParCSRCommHandleCreate_v2(1, comm_pkg, HYPRE_MEMORY_DEVICE, send_buf, HYPRE_MEMORY_DEVICE, Dbeta_offd);
+#endif
+
+#if defined(HYPRE_USING_THRUST_NOSYNC)
+   /* RL: make sure send_buf is ready before issuing GPU-GPU MPI */
+   if (hypre_GetGpuAwareMPI())
+   {
+      hypre_ForceSyncComputeStream();
+   }
+#endif
+
+   comm_handle = hypre_ParCSRCommHandleCreate_v2(1, comm_pkg, HYPRE_MEMORY_DEVICE, send_buf,
+                                                 HYPRE_MEMORY_DEVICE, Dbeta_offd);
    hypre_ParCSRCommHandleDestroy(comm_handle);
    hypre_TFree(send_buf, HYPRE_MEMORY_DEVICE);
 
    /* weak row sum and diagonal, i.e., DF2F2 + Dgamma */
    rsWA = hypre_TAlloc(HYPRE_Complex, A_nr_local, HYPRE_MEMORY_DEVICE);
 
-   dim3 bDim = hypre_GetDefaultCUDABlockDimension();
-   dim3 gDim = hypre_GetDefaultCUDAGridDimension(A_nr_local, "warp", bDim);
+   dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+   dim3 gDim = hypre_GetDefaultDeviceGridDimension(A_nr_local, "warp", bDim);
 
    /* only for rows corresponding to F2 (notice flag == -1) */
-   HYPRE_CUDA_LAUNCH( hypreCUDAKernel_compute_weak_rowsums,
-                      gDim, bDim,
-                      A_nr_local,
-                      A_offd_nnz > 0,
-                      CF_marker_dev,
-                      A_diag_i,
-                      A_diag_data,
-                      Soc_diag_j,
-                      A_offd_i,
-                      A_offd_data,
-                      Soc_offd_j,
-                      rsWA,
-                      -1 );
+   HYPRE_GPU_LAUNCH( hypreGPUKernel_compute_weak_rowsums,
+                     gDim, bDim,
+                     A_nr_local,
+                     A_offd_nnz > 0,
+                     CF_marker,
+                     A_diag_i,
+                     A_diag_data,
+                     Soc_diag_j,
+                     A_offd_i,
+                     A_offd_data,
+                     Soc_offd_j,
+                     rsWA,
+                     -1 );
 
    rsW = hypre_TAlloc(HYPRE_Complex, AF2F_nr_local, HYPRE_MEMORY_DEVICE);
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_Complex *new_end = hypreSycl_copy_if( rsWA,
+                                               rsWA + A_nr_local,
+                                               CF_marker,
+                                               rsW,
+                                               equal<HYPRE_Int>(-2) );
+#else
    HYPRE_Complex *new_end = HYPRE_THRUST_CALL( copy_if,
                                                rsWA,
                                                rsWA + A_nr_local,
-                                               CF_marker_dev,
+                                               CF_marker,
                                                rsW,
                                                equal<HYPRE_Int>(-2) );
+#endif
 
    hypre_assert(new_end - rsW == AF2F_nr_local);
 
@@ -121,20 +163,36 @@ hypre_BoomerAMGBuildModPartialExtInterpDevice( hypre_ParCSRMatrix  *A,
 
    /* map from F2 to F */
    HYPRE_Int *map_to_F = hypre_TAlloc(HYPRE_Int, A_nr_local, HYPRE_MEMORY_DEVICE);
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_ONEDPL_CALL( std::exclusive_scan,
+                      oneapi::dpl::make_transform_iterator(CF_marker,              is_negative<HYPRE_Int>()),
+                      oneapi::dpl::make_transform_iterator(CF_marker + A_nr_local, is_negative<HYPRE_Int>()),
+                      map_to_F,
+                      HYPRE_Int(0) );/* *MUST* pass init value since input and output types diff. */
+#else
    HYPRE_THRUST_CALL( exclusive_scan,
-                      thrust::make_transform_iterator(CF_marker_dev,              is_negative<HYPRE_Int>()),
-                      thrust::make_transform_iterator(CF_marker_dev + A_nr_local, is_negative<HYPRE_Int>()),
+                      thrust::make_transform_iterator(CF_marker,              is_negative<HYPRE_Int>()),
+                      thrust::make_transform_iterator(CF_marker + A_nr_local, is_negative<HYPRE_Int>()),
                       map_to_F,
                       HYPRE_Int(0) );/* *MUST* pass init value since input and output types diff. */
+#endif
 
    HYPRE_Int *map_F2_to_F = hypre_TAlloc(HYPRE_Int, AF2F_nr_local, HYPRE_MEMORY_DEVICE);
 
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_Int *tmp_end = hypreSycl_copy_if( map_to_F,
+                                           map_to_F + A_nr_local,
+                                           CF_marker,
+                                           map_F2_to_F,
+                                           equal<HYPRE_Int>(-2) );
+#else
    HYPRE_Int *tmp_end = HYPRE_THRUST_CALL( copy_if,
                                            map_to_F,
                                            map_to_F + A_nr_local,
-                                           CF_marker_dev,
+                                           CF_marker,
                                            map_F2_to_F,
                                            equal<HYPRE_Int>(-2) );
+#endif
 
    hypre_assert(tmp_end - map_F2_to_F == AF2F_nr_local);
 
@@ -142,21 +200,27 @@ hypre_BoomerAMGBuildModPartialExtInterpDevice( hypre_ParCSRMatrix  *A,
 
    /* add to rsW those in AF2F that correspond to Dbeta == 0
     * diagnoally scale As_F2F (from both sides) and replace the diagonal */
-   gDim = hypre_GetDefaultCUDAGridDimension(AF2F_nr_local, "warp", bDim);
-
-   HYPRE_CUDA_LAUNCH( hypreCUDAKernel_MMInterpScaleAFF,
-                      gDim, bDim,
-                      AF2F_nr_local,
-                      hypre_CSRMatrixI(hypre_ParCSRMatrixDiag(As_F2F)),
-                      hypre_CSRMatrixJ(hypre_ParCSRMatrixDiag(As_F2F)),
-                      hypre_CSRMatrixData(hypre_ParCSRMatrixDiag(As_F2F)),
-                      hypre_CSRMatrixI(hypre_ParCSRMatrixOffd(As_F2F)),
-                      hypre_CSRMatrixJ(hypre_ParCSRMatrixOffd(As_F2F)),
-                      hypre_CSRMatrixData(hypre_ParCSRMatrixOffd(As_F2F)),
-                      Dbeta,
-                      Dbeta_offd,
-                      map_F2_to_F,
-                      rsW );
+   gDim = hypre_GetDefaultDeviceGridDimension(AF2F_nr_local, "warp", bDim);
+
+   HYPRE_Int *As_F2F_diag_i = hypre_CSRMatrixI(hypre_ParCSRMatrixDiag(As_F2F));
+   HYPRE_Int *As_F2F_diag_j = hypre_CSRMatrixJ(hypre_ParCSRMatrixDiag(As_F2F));
+   HYPRE_Complex *As_F2F_diag_data = hypre_CSRMatrixData(hypre_ParCSRMatrixDiag(As_F2F));
+   HYPRE_Int *As_F2F_offd_i = hypre_CSRMatrixI(hypre_ParCSRMatrixOffd(As_F2F));
+   HYPRE_Int *As_F2F_offd_j = hypre_CSRMatrixJ(hypre_ParCSRMatrixOffd(As_F2F));
+   HYPRE_Complex *As_F2F_offd_data = hypre_CSRMatrixData(hypre_ParCSRMatrixOffd(As_F2F));
+   HYPRE_GPU_LAUNCH( hypreGPUKernel_MMInterpScaleAFF,
+                     gDim, bDim,
+                     AF2F_nr_local,
+                     As_F2F_diag_i,
+                     As_F2F_diag_j,
+                     As_F2F_diag_data,
+                     As_F2F_offd_i,
+                     As_F2F_offd_j,
+                     As_F2F_offd_data,
+                     Dbeta,
+                     Dbeta_offd,
+                     map_F2_to_F,
+                     rsW );
 
    hypre_TFree(Dbeta, HYPRE_MEMORY_DEVICE);
    hypre_TFree(Dbeta_offd, HYPRE_MEMORY_DEVICE);
@@ -184,17 +248,23 @@ hypre_BoomerAMGBuildModPartialExtInterpDevice( hypre_ParCSRMatrix  *A,
    P_offd_i    = hypre_TAlloc(HYPRE_Int,     P_nr_local + 1, HYPRE_MEMORY_DEVICE);
 
    HYPRE_Int *C2F2_marker = hypre_TAlloc(HYPRE_Int, P_nr_local, HYPRE_MEMORY_DEVICE);
+#if defined(HYPRE_USING_SYCL)
+   tmp_end = hypreSycl_copy_if( CF_marker,
+                                CF_marker + A_nr_local,
+                                CF_marker,
+                                C2F2_marker,
+                                out_of_range<HYPRE_Int>(-1, 0) /* -2 or 1 */ );
+#else
    tmp_end = HYPRE_THRUST_CALL( copy_if,
-                                CF_marker_dev,
-                                CF_marker_dev + A_nr_local,
-                                CF_marker_dev,
+                                CF_marker,
+                                CF_marker + A_nr_local,
+                                CF_marker,
                                 C2F2_marker,
                                 out_of_range<HYPRE_Int>(-1, 0) /* -2 or 1 */ );
+#endif
 
    hypre_assert(tmp_end - C2F2_marker == P_nr_local);
 
-   hypre_TFree(CF_marker_dev, HYPRE_MEMORY_DEVICE);
-
    hypreDevice_extendWtoP( P_nr_local,
                            AF2F_nr_local,
                            hypre_ParCSRMatrixNumCols(W),
@@ -267,6 +337,8 @@ hypre_BoomerAMGBuildModPartialExtPEInterpDevice( hypre_ParCSRMatrix  *A,
                                                  HYPRE_Int            max_elmts,
                                                  hypre_ParCSRMatrix **P_ptr )
 {
+   HYPRE_UNUSED_VAR(debug_flag);
+
    HYPRE_Int           A_nr_local   = hypre_ParCSRMatrixNumRows(A);
    hypre_CSRMatrix    *A_diag       = hypre_ParCSRMatrixDiag(A);
    HYPRE_Complex      *A_diag_data  = hypre_CSRMatrixData(A_diag);
@@ -275,7 +347,6 @@ hypre_BoomerAMGBuildModPartialExtPEInterpDevice( hypre_ParCSRMatrix  *A,
    HYPRE_Complex      *A_offd_data  = hypre_CSRMatrixData(A_offd);
    HYPRE_Int          *A_offd_i     = hypre_CSRMatrixI(A_offd);
    HYPRE_Int           A_offd_nnz   = hypre_CSRMatrixNumNonzeros(A_offd);
-   HYPRE_Int          *CF_marker_dev;
    HYPRE_Complex      *Dbeta, *rsWA, *rsW, *dlam, *dlam_offd, *dtmp, *dtmp_offd;
    hypre_ParCSRMatrix *As_F2F, *As_FF, *As_FC, *W, *P;
 
@@ -284,10 +355,6 @@ hypre_BoomerAMGBuildModPartialExtPEInterpDevice( hypre_ParCSRMatrix  *A,
    HYPRE_Int          *Soc_diag_j   = hypre_ParCSRMatrixSocDiagJ(S);
    HYPRE_Int          *Soc_offd_j   = hypre_ParCSRMatrixSocOffdJ(S);
 
-   CF_marker_dev = hypre_TAlloc(HYPRE_Int, A_nr_local, HYPRE_MEMORY_DEVICE);
-   hypre_TMemcpy(CF_marker_dev, CF_marker, HYPRE_Int, A_nr_local, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
-
-   //TODO use CF_marker_dev
    /* As_F2F = As_{F2, F}, As_FC = As_{F, C2} */
    hypre_ParCSRMatrixGenerateFFFC3Device(A, CF_marker, num_cpts_global, S, &As_FC, &As_F2F);
 
@@ -304,32 +371,39 @@ hypre_BoomerAMGBuildModPartialExtPEInterpDevice( hypre_ParCSRMatrix  *A,
 
    hypre_assert(AFC_nr_local == hypre_ParCSRMatrixNumRows(As_FF));
 
-   dim3 bDim = hypre_GetDefaultCUDABlockDimension();
-   dim3 gDim = hypre_GetDefaultCUDAGridDimension(AFC_nr_local, "warp", bDim);
+   dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+   dim3 gDim = hypre_GetDefaultDeviceGridDimension(AFC_nr_local, "warp", bDim);
 
    /* Generate D_lambda in the paper: D_beta + (row sum of AFF without diagonal elements / row_nnz) */
    /* Generate D_tmp, i.e., D_mu / D_lambda */
    dlam = hypre_TAlloc(HYPRE_Complex, AFC_nr_local, HYPRE_MEMORY_DEVICE);
    dtmp = hypre_TAlloc(HYPRE_Complex, AFC_nr_local, HYPRE_MEMORY_DEVICE);
 
-   HYPRE_CUDA_LAUNCH( hypreCUDAKernel_compute_dlam_dtmp,
-                      gDim, bDim,
-                      AFC_nr_local,
-                      hypre_CSRMatrixI(hypre_ParCSRMatrixDiag(As_FF)),
-                      hypre_CSRMatrixJ(hypre_ParCSRMatrixDiag(As_FF)),
-                      hypre_CSRMatrixData(hypre_ParCSRMatrixDiag(As_FF)),
-                      hypre_CSRMatrixI(hypre_ParCSRMatrixOffd(As_FF)),
-                      hypre_CSRMatrixData(hypre_ParCSRMatrixOffd(As_FF)),
-                      Dbeta,
-                      dlam,
-                      dtmp );
+   HYPRE_Int *As_FF_diag_i = hypre_CSRMatrixI(hypre_ParCSRMatrixDiag(As_FF));
+   HYPRE_Int *As_FF_diag_j = hypre_CSRMatrixJ(hypre_ParCSRMatrixDiag(As_FF));
+   HYPRE_Complex *As_FF_diag_data = hypre_CSRMatrixData(hypre_ParCSRMatrixDiag(As_FF));
+   HYPRE_Int *As_FF_offd_i = hypre_CSRMatrixI(hypre_ParCSRMatrixOffd(As_FF));
+   HYPRE_Complex *As_FF_offd_data = hypre_CSRMatrixData(hypre_ParCSRMatrixOffd(As_FF));
+   HYPRE_GPU_LAUNCH( hypreGPUKernel_compute_dlam_dtmp,
+                     gDim, bDim,
+                     AFC_nr_local,
+                     As_FF_diag_i,
+                     As_FF_diag_j,
+                     As_FF_diag_data,
+                     As_FF_offd_i,
+                     As_FF_offd_data,
+                     Dbeta,
+                     dlam,
+                     dtmp );
 
    hypre_ParCSRMatrixDestroy(As_FF);
    hypre_TFree(Dbeta, HYPRE_MEMORY_DEVICE);
 
    /* collect off-processor dtmp and dlam */
-   dtmp_offd = hypre_TAlloc(HYPRE_Complex, hypre_CSRMatrixNumCols(hypre_ParCSRMatrixOffd(As_F2F)), HYPRE_MEMORY_DEVICE);
-   dlam_offd = hypre_TAlloc(HYPRE_Complex, hypre_CSRMatrixNumCols(hypre_ParCSRMatrixOffd(As_F2F)), HYPRE_MEMORY_DEVICE);
+   dtmp_offd = hypre_TAlloc(HYPRE_Complex, hypre_CSRMatrixNumCols(hypre_ParCSRMatrixOffd(As_F2F)),
+                            HYPRE_MEMORY_DEVICE);
+   dlam_offd = hypre_TAlloc(HYPRE_Complex, hypre_CSRMatrixNumCols(hypre_ParCSRMatrixOffd(As_F2F)),
+                            HYPRE_MEMORY_DEVICE);
 
    hypre_ParCSRCommPkg    *comm_pkg = hypre_ParCSRMatrixCommPkg(As_F2F);
    hypre_ParCSRCommHandle *comm_handle;
@@ -343,20 +417,54 @@ hypre_BoomerAMGBuildModPartialExtPEInterpDevice( hypre_ParCSRMatrix  *A,
    HYPRE_Complex *send_buf = hypre_TAlloc(HYPRE_Complex, num_elmts_send, HYPRE_MEMORY_DEVICE);
    hypre_ParCSRCommPkgCopySendMapElmtsToDevice(comm_pkg);
 
+#if defined(HYPRE_USING_SYCL)
+   hypreSycl_gather( hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg),
+                     hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg) + num_elmts_send,
+                     dtmp,
+                     send_buf );
+#else
    HYPRE_THRUST_CALL( gather,
                       hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg),
                       hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg) + num_elmts_send,
                       dtmp,
                       send_buf );
-   comm_handle = hypre_ParCSRCommHandleCreate_v2(1, comm_pkg, HYPRE_MEMORY_DEVICE, send_buf, HYPRE_MEMORY_DEVICE, dtmp_offd);
+#endif
+
+#if defined(HYPRE_USING_THRUST_NOSYNC)
+   /* RL: make sure send_buf is ready before issuing GPU-GPU MPI */
+   if (hypre_GetGpuAwareMPI())
+   {
+      hypre_ForceSyncComputeStream();
+   }
+#endif
+
+   comm_handle = hypre_ParCSRCommHandleCreate_v2(1, comm_pkg, HYPRE_MEMORY_DEVICE, send_buf,
+                                                 HYPRE_MEMORY_DEVICE, dtmp_offd);
    hypre_ParCSRCommHandleDestroy(comm_handle);
 
+#if defined(HYPRE_USING_SYCL)
+   hypreSycl_gather( hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg),
+                     hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg) + num_elmts_send,
+                     dlam,
+                     send_buf );
+#else
    HYPRE_THRUST_CALL( gather,
                       hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg),
                       hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg) + num_elmts_send,
                       dlam,
                       send_buf );
-   comm_handle = hypre_ParCSRCommHandleCreate_v2(1, comm_pkg, HYPRE_MEMORY_DEVICE, send_buf, HYPRE_MEMORY_DEVICE, dlam_offd);
+#endif
+
+#if defined(HYPRE_USING_THRUST_NOSYNC)
+   /* RL: make sure send_buf is ready before issuing GPU-GPU MPI */
+   if (hypre_GetGpuAwareMPI())
+   {
+      hypre_ForceSyncComputeStream();
+   }
+#endif
+
+   comm_handle = hypre_ParCSRCommHandleCreate_v2(1, comm_pkg, HYPRE_MEMORY_DEVICE, send_buf,
+                                                 HYPRE_MEMORY_DEVICE, dlam_offd);
    hypre_ParCSRCommHandleDestroy(comm_handle);
 
    hypre_TFree(send_buf, HYPRE_MEMORY_DEVICE);
@@ -364,30 +472,38 @@ hypre_BoomerAMGBuildModPartialExtPEInterpDevice( hypre_ParCSRMatrix  *A,
    /* weak row sum and diagonal, i.e., DFF + Dgamma */
    rsWA = hypre_TAlloc(HYPRE_Complex, A_nr_local, HYPRE_MEMORY_DEVICE);
 
-   gDim = hypre_GetDefaultCUDAGridDimension(A_nr_local, "warp", bDim);
+   gDim = hypre_GetDefaultDeviceGridDimension(A_nr_local, "warp", bDim);
 
    /* only for rows corresponding to F2 (notice flag == -1) */
-   HYPRE_CUDA_LAUNCH( hypreCUDAKernel_compute_weak_rowsums,
-                      gDim, bDim,
-                      A_nr_local,
-                      A_offd_nnz > 0,
-                      CF_marker_dev,
-                      A_diag_i,
-                      A_diag_data,
-                      Soc_diag_j,
-                      A_offd_i,
-                      A_offd_data,
-                      Soc_offd_j,
-                      rsWA,
-                      -1 );
+   HYPRE_GPU_LAUNCH( hypreGPUKernel_compute_weak_rowsums,
+                     gDim, bDim,
+                     A_nr_local,
+                     A_offd_nnz > 0,
+                     CF_marker,
+                     A_diag_i,
+                     A_diag_data,
+                     Soc_diag_j,
+                     A_offd_i,
+                     A_offd_data,
+                     Soc_offd_j,
+                     rsWA,
+                     -1 );
 
    rsW = hypre_TAlloc(HYPRE_Complex, AF2F_nr_local, HYPRE_MEMORY_DEVICE);
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_Complex *new_end = hypreSycl_copy_if( rsWA,
+                                               rsWA + A_nr_local,
+                                               CF_marker,
+                                               rsW,
+                                               equal<HYPRE_Int>(-2) );
+#else
    HYPRE_Complex *new_end = HYPRE_THRUST_CALL( copy_if,
                                                rsWA,
                                                rsWA + A_nr_local,
-                                               CF_marker_dev,
+                                               CF_marker,
                                                rsW,
                                                equal<HYPRE_Int>(-2) );
+#endif
 
    hypre_assert(new_end - rsW == AF2F_nr_local);
 
@@ -395,19 +511,35 @@ hypre_BoomerAMGBuildModPartialExtPEInterpDevice( hypre_ParCSRMatrix  *A,
 
    /* map from F2 to F */
    HYPRE_Int *map_to_F = hypre_TAlloc(HYPRE_Int, A_nr_local, HYPRE_MEMORY_DEVICE);
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_ONEDPL_CALL( std::exclusive_scan,
+                      oneapi::dpl::make_transform_iterator(CF_marker,              is_negative<HYPRE_Int>()),
+                      oneapi::dpl::make_transform_iterator(CF_marker + A_nr_local, is_negative<HYPRE_Int>()),
+                      map_to_F,
+                      HYPRE_Int(0) ); /* *MUST* pass init value since input and output types diff. */
+#else
    HYPRE_THRUST_CALL( exclusive_scan,
-                      thrust::make_transform_iterator(CF_marker_dev,              is_negative<HYPRE_Int>()),
-                      thrust::make_transform_iterator(CF_marker_dev + A_nr_local, is_negative<HYPRE_Int>()),
+                      thrust::make_transform_iterator(CF_marker,              is_negative<HYPRE_Int>()),
+                      thrust::make_transform_iterator(CF_marker + A_nr_local, is_negative<HYPRE_Int>()),
                       map_to_F,
                       HYPRE_Int(0) ); /* *MUST* pass init value since input and output types diff. */
+#endif
    HYPRE_Int *map_F2_to_F = hypre_TAlloc(HYPRE_Int, AF2F_nr_local, HYPRE_MEMORY_DEVICE);
 
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_Int *tmp_end = hypreSycl_copy_if( map_to_F,
+                                           map_to_F + A_nr_local,
+                                           CF_marker,
+                                           map_F2_to_F,
+                                           equal<HYPRE_Int>(-2) );
+#else
    HYPRE_Int *tmp_end = HYPRE_THRUST_CALL( copy_if,
                                            map_to_F,
                                            map_to_F + A_nr_local,
-                                           CF_marker_dev,
+                                           CF_marker,
                                            map_F2_to_F,
                                            equal<HYPRE_Int>(-2) );
+#endif
 
    hypre_assert(tmp_end - map_F2_to_F == AF2F_nr_local);
 
@@ -415,23 +547,29 @@ hypre_BoomerAMGBuildModPartialExtPEInterpDevice( hypre_ParCSRMatrix  *A,
 
    /* add to rsW those in AFF that correspond to lam == 0
     * diagnoally scale As_F2F (from both sides) and replace the diagonal */
-   gDim = hypre_GetDefaultCUDAGridDimension(AF2F_nr_local, "warp", bDim);
-
-   HYPRE_CUDA_LAUNCH( hypreCUDAKernel_MMPEInterpScaleAFF,
-                      gDim, bDim,
-                      AF2F_nr_local,
-                      hypre_CSRMatrixI(hypre_ParCSRMatrixDiag(As_F2F)),
-                      hypre_CSRMatrixJ(hypre_ParCSRMatrixDiag(As_F2F)),
-                      hypre_CSRMatrixData(hypre_ParCSRMatrixDiag(As_F2F)),
-                      hypre_CSRMatrixI(hypre_ParCSRMatrixOffd(As_F2F)),
-                      hypre_CSRMatrixJ(hypre_ParCSRMatrixOffd(As_F2F)),
-                      hypre_CSRMatrixData(hypre_ParCSRMatrixOffd(As_F2F)),
-                      dtmp,
-                      dtmp_offd,
-                      dlam,
-                      dlam_offd,
-                      map_F2_to_F,
-                      rsW );
+   gDim = hypre_GetDefaultDeviceGridDimension(AF2F_nr_local, "warp", bDim);
+
+   HYPRE_Int *As_F2F_diag_i = hypre_CSRMatrixI(hypre_ParCSRMatrixDiag(As_F2F));
+   HYPRE_Int *As_F2F_diag_j = hypre_CSRMatrixJ(hypre_ParCSRMatrixDiag(As_F2F));
+   HYPRE_Complex *As_F2F_diag_data = hypre_CSRMatrixData(hypre_ParCSRMatrixDiag(As_F2F));
+   HYPRE_Int *As_F2F_offd_i = hypre_CSRMatrixI(hypre_ParCSRMatrixOffd(As_F2F));
+   HYPRE_Int *As_F2F_offd_j = hypre_CSRMatrixJ(hypre_ParCSRMatrixOffd(As_F2F));
+   HYPRE_Complex *As_F2F_offd_data = hypre_CSRMatrixData(hypre_ParCSRMatrixOffd(As_F2F));
+   HYPRE_GPU_LAUNCH( hypreGPUKernel_MMPEInterpScaleAFF,
+                     gDim, bDim,
+                     AF2F_nr_local,
+                     As_F2F_diag_i,
+                     As_F2F_diag_j,
+                     As_F2F_diag_data,
+                     As_F2F_offd_i,
+                     As_F2F_offd_j,
+                     As_F2F_offd_data,
+                     dtmp,
+                     dtmp_offd,
+                     dlam,
+                     dlam_offd,
+                     map_F2_to_F,
+                     rsW );
 
    hypre_TFree(dlam,        HYPRE_MEMORY_DEVICE);
    hypre_TFree(dlam_offd,   HYPRE_MEMORY_DEVICE);
@@ -461,17 +599,23 @@ hypre_BoomerAMGBuildModPartialExtPEInterpDevice( hypre_ParCSRMatrix  *A,
    P_offd_i    = hypre_TAlloc(HYPRE_Int,     P_nr_local + 1, HYPRE_MEMORY_DEVICE);
 
    HYPRE_Int *C2F2_marker = hypre_TAlloc(HYPRE_Int, P_nr_local, HYPRE_MEMORY_DEVICE);
+#if defined(HYPRE_USING_SYCL)
+   tmp_end = hypreSycl_copy_if( CF_marker,
+                                CF_marker + A_nr_local,
+                                CF_marker,
+                                C2F2_marker,
+                                out_of_range<HYPRE_Int>(-1, 0) /* -2 or 1 */ );
+#else
    tmp_end = HYPRE_THRUST_CALL( copy_if,
-                                CF_marker_dev,
-                                CF_marker_dev + A_nr_local,
-                                CF_marker_dev,
+                                CF_marker,
+                                CF_marker + A_nr_local,
+                                CF_marker,
                                 C2F2_marker,
                                 out_of_range<HYPRE_Int>(-1, 0) /* -2 or 1 */ );
+#endif
 
    hypre_assert(tmp_end - C2F2_marker == P_nr_local);
 
-   hypre_TFree(CF_marker_dev, HYPRE_MEMORY_DEVICE);
-
    hypreDevice_extendWtoP( P_nr_local,
                            AF2F_nr_local,
                            hypre_ParCSRMatrixNumCols(W),
@@ -534,45 +678,47 @@ hypre_BoomerAMGBuildModPartialExtPEInterpDevice( hypre_ParCSRMatrix  *A,
 
 //-----------------------------------------------------------------------
 __global__
-void hypreCUDAKernel_MMInterpScaleAFF( HYPRE_Int      AFF_nrows,
-                                       HYPRE_Int     *AFF_diag_i,
-                                       HYPRE_Int     *AFF_diag_j,
-                                       HYPRE_Complex *AFF_diag_a,
-                                       HYPRE_Int     *AFF_offd_i,
-                                       HYPRE_Int     *AFF_offd_j,
-                                       HYPRE_Complex *AFF_offd_a,
-                                       HYPRE_Complex *beta_diag,
-                                       HYPRE_Complex *beta_offd,
-                                       HYPRE_Int     *F2_to_F,
-                                       HYPRE_Real    *rsW )
+void hypreGPUKernel_MMInterpScaleAFF( hypre_DeviceItem    &item,
+                                      HYPRE_Int      AFF_nrows,
+                                      HYPRE_Int     *AFF_diag_i,
+                                      HYPRE_Int     *AFF_diag_j,
+                                      HYPRE_Complex *AFF_diag_a,
+                                      HYPRE_Int     *AFF_offd_i,
+                                      HYPRE_Int     *AFF_offd_j,
+                                      HYPRE_Complex *AFF_offd_a,
+                                      HYPRE_Complex *beta_diag,
+                                      HYPRE_Complex *beta_offd,
+                                      HYPRE_Int     *F2_to_F,
+                                      HYPRE_Real    *rsW )
 {
-   HYPRE_Int row = hypre_cuda_get_grid_warp_id<1,1>();
+   HYPRE_Int row = hypre_gpu_get_grid_warp_id<1, 1>(item);
 
    if (row >= AFF_nrows)
    {
       return;
    }
 
-   HYPRE_Int lane = hypre_cuda_get_lane_id<1>();
-   HYPRE_Int ib_diag, ie_diag;
-   HYPRE_Int rowF;
+   HYPRE_Int lane = hypre_gpu_get_lane_id<1>(item);
+   HYPRE_Int ib_diag = 0, ie_diag;
+   HYPRE_Int rowF = 0;
 
    if (lane == 0)
    {
       rowF = read_only_load(&F2_to_F[row]);
    }
-   rowF = __shfl_sync(HYPRE_WARP_FULL_MASK, rowF, 0);
+   rowF = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, rowF, 0);
 
    if (lane < 2)
    {
       ib_diag = read_only_load(AFF_diag_i + row + lane);
    }
-   ie_diag = __shfl_sync(HYPRE_WARP_FULL_MASK, ib_diag, 1);
-   ib_diag = __shfl_sync(HYPRE_WARP_FULL_MASK, ib_diag, 0);
+   ie_diag = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, ib_diag, 1);
+   ib_diag = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, ib_diag, 0);
 
    HYPRE_Complex rl = 0.0;
 
-   for (HYPRE_Int i = ib_diag + lane; __any_sync(HYPRE_WARP_FULL_MASK, i < ie_diag); i += HYPRE_WARP_SIZE)
+   for (HYPRE_Int i = ib_diag + lane; warp_any_sync(item, HYPRE_WARP_FULL_MASK, i < ie_diag);
+        i += HYPRE_WARP_SIZE)
    {
       if (i < ie_diag)
       {
@@ -602,16 +748,17 @@ void hypreCUDAKernel_MMInterpScaleAFF( HYPRE_Int      AFF_nrows,
       }
    }
 
-   HYPRE_Int ib_offd, ie_offd;
+   HYPRE_Int ib_offd = 0, ie_offd;
 
    if (lane < 2)
    {
       ib_offd = read_only_load(AFF_offd_i + row + lane);
    }
-   ie_offd = __shfl_sync(HYPRE_WARP_FULL_MASK, ib_offd, 1);
-   ib_offd = __shfl_sync(HYPRE_WARP_FULL_MASK, ib_offd, 0);
+   ie_offd = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, ib_offd, 1);
+   ib_offd = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, ib_offd, 0);
 
-   for (HYPRE_Int i = ib_offd + lane; __any_sync(HYPRE_WARP_FULL_MASK, i < ie_offd); i += HYPRE_WARP_SIZE)
+   for (HYPRE_Int i = ib_offd + lane; warp_any_sync(item, HYPRE_WARP_FULL_MASK, i < ie_offd);
+        i += HYPRE_WARP_SIZE)
    {
       if (i < ie_offd)
       {
@@ -631,7 +778,7 @@ void hypreCUDAKernel_MMInterpScaleAFF( HYPRE_Int      AFF_nrows,
       }
    }
 
-   rl = warp_reduce_sum(rl);
+   rl = warp_reduce_sum(item, rl);
 
    if (lane == 0)
    {
@@ -639,9 +786,10 @@ void hypreCUDAKernel_MMInterpScaleAFF( HYPRE_Int      AFF_nrows,
       rl = rl == 0.0 ? 0.0 : -1.0 / rl;
    }
 
-   rl = __shfl_sync(HYPRE_WARP_FULL_MASK, rl, 0);
+   rl = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, rl, 0);
 
-   for (HYPRE_Int i = ib_diag + lane; __any_sync(HYPRE_WARP_FULL_MASK, i < ie_diag); i += HYPRE_WARP_SIZE)
+   for (HYPRE_Int i = ib_diag + lane; warp_any_sync(item, HYPRE_WARP_FULL_MASK, i < ie_diag);
+        i += HYPRE_WARP_SIZE)
    {
       if (i < ie_diag)
       {
@@ -649,7 +797,8 @@ void hypreCUDAKernel_MMInterpScaleAFF( HYPRE_Int      AFF_nrows,
       }
    }
 
-   for (HYPRE_Int i = ib_offd + lane; __any_sync(HYPRE_WARP_FULL_MASK, i < ie_offd); i += HYPRE_WARP_SIZE)
+   for (HYPRE_Int i = ib_offd + lane; warp_any_sync(item, HYPRE_WARP_FULL_MASK, i < ie_offd);
+        i += HYPRE_WARP_SIZE)
    {
       if (i < ie_offd)
       {
@@ -660,47 +809,49 @@ void hypreCUDAKernel_MMInterpScaleAFF( HYPRE_Int      AFF_nrows,
 
 //-----------------------------------------------------------------------
 __global__
-void hypreCUDAKernel_MMPEInterpScaleAFF( HYPRE_Int      AFF_nrows,
-                                         HYPRE_Int     *AFF_diag_i,
-                                         HYPRE_Int     *AFF_diag_j,
-                                         HYPRE_Complex *AFF_diag_a,
-                                         HYPRE_Int     *AFF_offd_i,
-                                         HYPRE_Int     *AFF_offd_j,
-                                         HYPRE_Complex *AFF_offd_a,
-                                         HYPRE_Complex *tmp_diag,
-                                         HYPRE_Complex *tmp_offd,
-                                         HYPRE_Complex *lam_diag,
-                                         HYPRE_Complex *lam_offd,
-                                         HYPRE_Int     *F2_to_F,
-                                         HYPRE_Real    *rsW )
+void hypreGPUKernel_MMPEInterpScaleAFF( hypre_DeviceItem    &item,
+                                        HYPRE_Int      AFF_nrows,
+                                        HYPRE_Int     *AFF_diag_i,
+                                        HYPRE_Int     *AFF_diag_j,
+                                        HYPRE_Complex *AFF_diag_a,
+                                        HYPRE_Int     *AFF_offd_i,
+                                        HYPRE_Int     *AFF_offd_j,
+                                        HYPRE_Complex *AFF_offd_a,
+                                        HYPRE_Complex *tmp_diag,
+                                        HYPRE_Complex *tmp_offd,
+                                        HYPRE_Complex *lam_diag,
+                                        HYPRE_Complex *lam_offd,
+                                        HYPRE_Int     *F2_to_F,
+                                        HYPRE_Real    *rsW )
 {
-   HYPRE_Int row = hypre_cuda_get_grid_warp_id<1,1>();
+   HYPRE_Int row = hypre_gpu_get_grid_warp_id<1, 1>(item);
 
    if (row >= AFF_nrows)
    {
       return;
    }
 
-   HYPRE_Int lane = hypre_cuda_get_lane_id<1>();
-   HYPRE_Int ib_diag, ie_diag;
-   HYPRE_Int rowF;
+   HYPRE_Int lane = hypre_gpu_get_lane_id<1>(item);
+   HYPRE_Int ib_diag = 0, ie_diag;
+   HYPRE_Int rowF = 0;
 
    if (lane == 0)
    {
       rowF = read_only_load(&F2_to_F[row]);
    }
-   rowF = __shfl_sync(HYPRE_WARP_FULL_MASK, rowF, 0);
+   rowF = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, rowF, 0);
 
    if (lane < 2)
    {
       ib_diag = read_only_load(AFF_diag_i + row + lane);
    }
-   ie_diag = __shfl_sync(HYPRE_WARP_FULL_MASK, ib_diag, 1);
-   ib_diag = __shfl_sync(HYPRE_WARP_FULL_MASK, ib_diag, 0);
+   ie_diag = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, ib_diag, 1);
+   ib_diag = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, ib_diag, 0);
 
    HYPRE_Complex rl = 0.0;
 
-   for (HYPRE_Int i = ib_diag + lane; __any_sync(HYPRE_WARP_FULL_MASK, i < ie_diag); i += HYPRE_WARP_SIZE)
+   for (HYPRE_Int i = ib_diag + lane; warp_any_sync(item, HYPRE_WARP_FULL_MASK, i < ie_diag);
+        i += HYPRE_WARP_SIZE)
    {
       if (i < ie_diag)
       {
@@ -731,16 +882,17 @@ void hypreCUDAKernel_MMPEInterpScaleAFF( HYPRE_Int      AFF_nrows,
       }
    }
 
-   HYPRE_Int ib_offd, ie_offd;
+   HYPRE_Int ib_offd = 0, ie_offd;
 
    if (lane < 2)
    {
       ib_offd = read_only_load(AFF_offd_i + row + lane);
    }
-   ie_offd = __shfl_sync(HYPRE_WARP_FULL_MASK, ib_offd, 1);
-   ib_offd = __shfl_sync(HYPRE_WARP_FULL_MASK, ib_offd, 0);
+   ie_offd = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, ib_offd, 1);
+   ib_offd = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, ib_offd, 0);
 
-   for (HYPRE_Int i = ib_offd + lane; __any_sync(HYPRE_WARP_FULL_MASK, i < ie_offd); i += HYPRE_WARP_SIZE)
+   for (HYPRE_Int i = ib_offd + lane; warp_any_sync(item, HYPRE_WARP_FULL_MASK, i < ie_offd);
+        i += HYPRE_WARP_SIZE)
    {
       if (i < ie_offd)
       {
@@ -761,7 +913,7 @@ void hypreCUDAKernel_MMPEInterpScaleAFF( HYPRE_Int      AFF_nrows,
       }
    }
 
-   rl = warp_reduce_sum(rl);
+   rl = warp_reduce_sum(item, rl);
 
    if (lane == 0)
    {
@@ -769,9 +921,10 @@ void hypreCUDAKernel_MMPEInterpScaleAFF( HYPRE_Int      AFF_nrows,
       rl = rl == 0.0 ? 0.0 : -1.0 / rl;
    }
 
-   rl = __shfl_sync(HYPRE_WARP_FULL_MASK, rl, 0);
+   rl = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, rl, 0);
 
-   for (HYPRE_Int i = ib_diag + lane; __any_sync(HYPRE_WARP_FULL_MASK, i < ie_diag); i += HYPRE_WARP_SIZE)
+   for (HYPRE_Int i = ib_diag + lane; warp_any_sync(item, HYPRE_WARP_FULL_MASK, i < ie_diag);
+        i += HYPRE_WARP_SIZE)
    {
       if (i < ie_diag)
       {
@@ -779,7 +932,8 @@ void hypreCUDAKernel_MMPEInterpScaleAFF( HYPRE_Int      AFF_nrows,
       }
    }
 
-   for (HYPRE_Int i = ib_offd + lane; __any_sync(HYPRE_WARP_FULL_MASK, i < ie_offd); i += HYPRE_WARP_SIZE)
+   for (HYPRE_Int i = ib_offd + lane; warp_any_sync(item, HYPRE_WARP_FULL_MASK, i < ie_offd);
+        i += HYPRE_WARP_SIZE)
    {
       if (i < ie_offd)
       {
@@ -788,4 +942,4 @@ void hypreCUDAKernel_MMPEInterpScaleAFF( HYPRE_Int      AFF_nrows,
    }
 }
 
-#endif /* #if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP) */
+#endif /* #if defined(HYPRE_USING_GPU) */
diff --git a/external/hypre/src/parcsr_ls/par_add_cycle.c b/external/hypre/src/parcsr_ls/par_add_cycle.c
index cabf0be9..265adbbd 100644
--- a/external/hypre/src/parcsr_ls/par_add_cycle.c
+++ b/external/hypre/src/parcsr_ls/par_add_cycle.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -48,7 +48,7 @@ hypre_BoomerAMGAdditiveCycle( void              *amg_vdata)
    HYPRE_Int       n_global;
    HYPRE_Int       rlx_order;
 
- /* Local variables  */
+   /* Local variables  */
    HYPRE_Int       Solve_err_flag = 0;
    HYPRE_Int       level;
    HYPRE_Int       coarse_grid;
@@ -107,8 +107,8 @@ hypre_BoomerAMGAdditiveCycle( void              *amg_vdata)
 
    addlvl = hypre_max(additive, mult_additive);
    addlvl = hypre_max(addlvl, simple);
-   if (add_last_lvl == -1 ) add_end = num_levels-1;
-   else add_end = add_last_lvl;
+   if (add_last_lvl == -1 ) { add_end = num_levels - 1; }
+   else { add_end = add_last_lvl; }
    Solve_err_flag = 0;
 
    /*---------------------------------------------------------------------
@@ -119,7 +119,7 @@ hypre_BoomerAMGAdditiveCycle( void              *amg_vdata)
    rlx_down = grid_relax_type[1];
    rlx_up = grid_relax_type[2];
    rlx_coarse = grid_relax_type[3];
-   for (level = 0; level < num_levels-1; level++)
+   for (level = 0; level < num_levels - 1; level++)
    {
       HYPRE_ANNOTATE_MGLEVEL_BEGIN(level);
 
@@ -141,14 +141,16 @@ hypre_BoomerAMGAdditiveCycle( void              *amg_vdata)
             HYPRE_Real *A_data = hypre_CSRMatrixData(hypre_ParCSRMatrixDiag(A_array[fine_grid]));
             HYPRE_Int *A_i = hypre_CSRMatrixI(hypre_ParCSRMatrixDiag(A_array[fine_grid]));
             num_rows = hypre_CSRMatrixNumRows(hypre_ParCSRMatrixDiag(A_array[fine_grid]));
-            for (j=0; j < num_grid_sweeps[1]; j++)
+            for (j = 0; j < num_grid_sweeps[1]; j++)
             {
-             hypre_ParVectorCopy(F_array[fine_grid],Vtemp);
+               hypre_ParVectorCopy(F_array[fine_grid], Vtemp);
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+               #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-             for (i = 0; i < num_rows; i++)
-               u_data[i] = relax_weight[level]*v_data[i] / A_data[A_i[i]];
+               for (i = 0; i < num_rows; i++)
+               {
+                  u_data[i] = relax_weight[level] * v_data[i] / A_data[A_i[i]];
+               }
             }
          }
 
@@ -156,24 +158,24 @@ hypre_BoomerAMGAdditiveCycle( void              *amg_vdata)
          {
             /*hypre_BoomerAMGRelax(A_array[fine_grid],F_array[fine_grid],NULL,rlx_down,0,*/
             CF_marker = hypre_IntArrayData(CF_marker_array[fine_grid]);
-            for (j=0; j < num_grid_sweeps[1]; j++)
+            for (j = 0; j < num_grid_sweeps[1]; j++)
             {
-               hypre_BoomerAMGRelaxIF(A_array[fine_grid],F_array[fine_grid],
-                                      CF_marker, rlx_down,rlx_order,1,
+               hypre_BoomerAMGRelaxIF(A_array[fine_grid], F_array[fine_grid],
+                                      CF_marker, rlx_down, rlx_order, 1,
                                       relax_weight[fine_grid], omega[fine_grid],
                                       l1_norms[level] ? hypre_VectorData(l1_norms[level]) : NULL,
                                       U_array[fine_grid], Vtemp, Ztemp);
-               hypre_ParVectorCopy(F_array[fine_grid],Vtemp);
+               hypre_ParVectorCopy(F_array[fine_grid], Vtemp);
             }
          }
          else
          {
             num_rows = hypre_CSRMatrixNumRows(hypre_ParCSRMatrixDiag(A_array[fine_grid]));
-            for (j=0; j < num_grid_sweeps[1]; j++)
+            for (j = 0; j < num_grid_sweeps[1]; j++)
             {
-               hypre_ParVectorCopy(F_array[fine_grid],Vtemp);
+               hypre_ParVectorCopy(F_array[fine_grid], Vtemp);
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+               #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
                for (i = 0; i < num_rows; i++)
                {
@@ -185,25 +187,25 @@ hypre_BoomerAMGAdditiveCycle( void              *amg_vdata)
          alpha = -1.0;
          beta = 1.0;
          hypre_ParCSRMatrixMatvec(alpha, A_array[fine_grid], U_array[fine_grid],
-                                     beta, Vtemp);
+                                  beta, Vtemp);
 
          alpha = 1.0;
          beta = 0.0;
-         hypre_ParCSRMatrixMatvecT(alpha,R_array[fine_grid],Vtemp,
-                                      beta,F_array[coarse_grid]);
+         hypre_ParCSRMatrixMatvecT(alpha, R_array[fine_grid], Vtemp,
+                                   beta, F_array[coarse_grid]);
       }
       else /* additive version */
       {
-         hypre_ParVectorCopy(F_array[fine_grid],Vtemp);
+         hypre_ParVectorCopy(F_array[fine_grid], Vtemp);
          if (level == 0) /* compute residual */
          {
             hypre_ParVectorCopy(Vtemp, Rtilde);
-            hypre_ParVectorCopy(U_array[fine_grid],Xtilde);
+            hypre_ParVectorCopy(U_array[fine_grid], Xtilde);
          }
          alpha = 1.0;
          beta = 0.0;
-         hypre_ParCSRMatrixMatvecT(alpha,R_array[fine_grid],Vtemp,
-                                      beta,F_array[coarse_grid]);
+         hypre_ParCSRMatrixMatvecT(alpha, R_array[fine_grid], Vtemp,
+                                   beta, F_array[coarse_grid]);
       }
 
       HYPRE_ANNOTATE_MGLEVEL_END(level);
@@ -219,10 +221,12 @@ hypre_BoomerAMGAdditiveCycle( void              *amg_vdata)
          r_global = hypre_VectorData(hypre_ParVectorLocalVector(Rtilde));
          n_global = hypre_VectorSize(hypre_ParVectorLocalVector(Xtilde));
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+         #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-         for (i=0; i < n_global; i++)
-            x_global[i] += D_inv[i]*r_global[i];
+         for (i = 0; i < n_global; i++)
+         {
+            x_global[i] += D_inv[i] * r_global[i];
+         }
       }
       else
       {
@@ -235,27 +239,27 @@ hypre_BoomerAMGAdditiveCycle( void              *amg_vdata)
             hypre_ParVectorLocalVector(Tmptilde) = Tmptilde_local;
             hypre_ParVectorOwnsData(Tmptilde) = 1;
             hypre_ParCSRMatrixMatvec(1.0, Lambda, Rtilde, 0.0, Tmptilde);
-            hypre_ParVectorScale(2.0,Rtilde);
+            hypre_ParVectorScale(2.0, Rtilde);
             hypre_ParCSRMatrixMatvec(-1.0, Atilde, Tmptilde, 1.0, Rtilde);
             hypre_ParVectorDestroy(Tmptilde);
          }
          hypre_ParCSRMatrixMatvec(1.0, Lambda, Rtilde, 1.0, Xtilde);
       }
-      if (addlvl == 0) hypre_ParVectorCopy(Xtilde, U_array[0]);
+      if (addlvl == 0) { hypre_ParVectorCopy(Xtilde, U_array[0]); }
    }
-   if (add_end < num_levels -1)
+   if (add_end < num_levels - 1)
    {
-      fine_grid = num_levels -1;
-      for (j=0; j < num_grid_sweeps[3]; j++)
+      fine_grid = num_levels - 1;
+      for (j = 0; j < num_grid_sweeps[3]; j++)
          if (rlx_coarse == 18)
             hypre_ParCSRRelax(A_array[fine_grid], F_array[fine_grid],
                               1, 1,
                               l1_norms[fine_grid] ? hypre_VectorData(l1_norms[fine_grid]) : NULL,
-                              1.0, 1.0 ,0,0,0,0,
+                              1.0, 1.0, 0.0, 0.0, 0, 0.0,
                               U_array[fine_grid], Vtemp, Ztemp);
          else
-            hypre_BoomerAMGRelaxIF(A_array[fine_grid],F_array[fine_grid],
-                                   NULL, rlx_coarse,0,0,
+            hypre_BoomerAMGRelaxIF(A_array[fine_grid], F_array[fine_grid],
+                                   NULL, rlx_coarse, 0, 0,
                                    relax_weight[fine_grid], omega[fine_grid],
                                    l1_norms[fine_grid] ? hypre_VectorData(l1_norms[fine_grid]) : NULL,
                                    U_array[fine_grid], Vtemp, Ztemp);
@@ -263,29 +267,29 @@ hypre_BoomerAMGAdditiveCycle( void              *amg_vdata)
    HYPRE_ANNOTATE_MGLEVEL_END(num_levels - 1);
 
    /* up cycle */
-   for (level = num_levels-1; level > 0; level--)
+   for (level = num_levels - 1; level > 0; level--)
    {
       HYPRE_ANNOTATE_MGLEVEL_BEGIN(level);
 
       fine_grid = level - 1;
       coarse_grid = level;
 
-      if (level <= addlvl || level > add_end+1) /* multiplicative version */
+      if (level <= addlvl || level > add_end + 1) /* multiplicative version */
       {
          alpha = 1.0;
          beta = 1.0;
          hypre_ParCSRMatrixMatvec(alpha, P_array[fine_grid],
-                                     U_array[coarse_grid],
-                                     beta, U_array[fine_grid]);
+                                  U_array[coarse_grid],
+                                  beta, U_array[fine_grid]);
          if (rlx_up != 18)
          {
             /*hypre_BoomerAMGRelax(A_array[fine_grid],F_array[fine_grid],NULL,rlx_up,0,*/
             CF_marker = hypre_IntArrayData(CF_marker_array[fine_grid]);
-            for (j=0; j < num_grid_sweeps[2]; j++)
+            for (j = 0; j < num_grid_sweeps[2]; j++)
             {
-               hypre_BoomerAMGRelaxIF(A_array[fine_grid],F_array[fine_grid],
+               hypre_BoomerAMGRelaxIF(A_array[fine_grid], F_array[fine_grid],
                                       CF_marker,
-                                      rlx_up,rlx_order,2,
+                                      rlx_up, rlx_order, 2,
                                       relax_weight[fine_grid], omega[fine_grid],
                                       l1_norms[fine_grid] ? hypre_VectorData(l1_norms[fine_grid]) : NULL,
                                       U_array[fine_grid], Vtemp, Ztemp);
@@ -297,34 +301,36 @@ hypre_BoomerAMGAdditiveCycle( void              *amg_vdata)
             HYPRE_Int loc_relax_points[2];
             loc_relax_points[0] = -1;
             loc_relax_points[1] = 1;
-            for (j=0; j < num_grid_sweeps[2]; j++)
+            for (j = 0; j < num_grid_sweeps[2]; j++)
             {
-               for (i=0; i < 2; i++)
+               for (i = 0; i < 2; i++)
                {
-                   hypre_ParCSRRelax_L1_Jacobi(A_array[fine_grid],F_array[fine_grid],
-                                               CF_marker,
-                                               loc_relax_points[i],
-                                               1.0,
-                                               l1_norms[fine_grid] ? hypre_VectorData(l1_norms[fine_grid]) : NULL,
-                                               U_array[fine_grid], Vtemp);
+                  hypre_ParCSRRelax_L1_Jacobi(A_array[fine_grid], F_array[fine_grid],
+                                              CF_marker,
+                                              loc_relax_points[i],
+                                              1.0,
+                                              l1_norms[fine_grid] ? hypre_VectorData(l1_norms[fine_grid]) : NULL,
+                                              U_array[fine_grid], Vtemp);
                }
             }
          }
          else
-            for (j=0; j < num_grid_sweeps[2]; j++)
-            hypre_ParCSRRelax(A_array[fine_grid], F_array[fine_grid],
-                              1, 1,
-                              l1_norms[fine_grid] ? hypre_VectorData(l1_norms[fine_grid]) : NULL,
-                              1.0, 1.0 ,0,0,0,0,
-                              U_array[fine_grid], Vtemp, Ztemp);
+            for (j = 0; j < num_grid_sweeps[2]; j++)
+            {
+               hypre_ParCSRRelax(A_array[fine_grid], F_array[fine_grid],
+                                 1, 1,
+                                 l1_norms[fine_grid] ? hypre_VectorData(l1_norms[fine_grid]) : NULL,
+                                 1.0, 1.0, 0.0, 0.0, 0, 0.0,
+                                 U_array[fine_grid], Vtemp, Ztemp);
+            }
       }
       else /* additive version */
       {
          alpha = 1.0;
          beta = 1.0;
          hypre_ParCSRMatrixMatvec(alpha, P_array[fine_grid],
-                                     U_array[coarse_grid],
-                                     beta, U_array[fine_grid]);
+                                  U_array[coarse_grid],
+                                  beta, U_array[fine_grid]);
       }
 
       HYPRE_ANNOTATE_MGLEVEL_END(level);
@@ -332,7 +338,7 @@ hypre_BoomerAMGAdditiveCycle( void              *amg_vdata)
 
    HYPRE_ANNOTATE_FUNC_END;
 
-   return(Solve_err_flag);
+   return (Solve_err_flag);
 }
 
 
@@ -351,10 +357,10 @@ HYPRE_Int hypre_CreateLambda(void *amg_vdata)
    hypre_CSRMatrix *L_diag;
    hypre_CSRMatrix *L_offd;
    hypre_ParCSRMatrix *Atilde;
-   hypre_CSRMatrix *Atilde_diag;
-   hypre_CSRMatrix *Atilde_offd;
-   HYPRE_Real    *Atilde_diag_data;
-   HYPRE_Real    *Atilde_offd_data;
+   hypre_CSRMatrix *Atilde_diag = NULL;
+   hypre_CSRMatrix *Atilde_offd = NULL;
+   HYPRE_Real    *Atilde_diag_data = NULL;
+   HYPRE_Real    *Atilde_offd_data = NULL;
    hypre_CSRMatrix *A_tmp_diag;
    hypre_CSRMatrix *A_tmp_offd;
    hypre_ParVector *Xtilde;
@@ -364,25 +370,25 @@ HYPRE_Int hypre_CreateLambda(void *amg_vdata)
    hypre_ParCSRCommPkg *comm_pkg;
    hypre_ParCSRCommPkg *L_comm_pkg = NULL;
    hypre_ParCSRCommHandle *comm_handle;
-   HYPRE_Real    *L_diag_data;
-   HYPRE_Real    *L_offd_data;
+   HYPRE_Real    *L_diag_data = NULL;
+   HYPRE_Real    *L_offd_data = NULL;
    HYPRE_Real    *buf_data = NULL;
    HYPRE_Real    *tmp_data;
    HYPRE_Real    *x_data;
    HYPRE_Real    *r_data;
    hypre_Vector  *l1_norms;
-   HYPRE_Real    *A_tmp_diag_data;
-   HYPRE_Real    *A_tmp_offd_data;
+   HYPRE_Real    *A_tmp_diag_data = NULL;
+   HYPRE_Real    *A_tmp_offd_data = NULL;
    HYPRE_Real    *D_data = NULL;
    HYPRE_Real    *D_data_offd = NULL;
    HYPRE_Int *L_diag_i;
-   HYPRE_Int *L_diag_j;
+   HYPRE_Int *L_diag_j = NULL;
    HYPRE_Int *L_offd_i;
-   HYPRE_Int *L_offd_j;
-   HYPRE_Int *Atilde_diag_i;
-   HYPRE_Int *Atilde_diag_j;
-   HYPRE_Int *Atilde_offd_i;
-   HYPRE_Int *Atilde_offd_j;
+   HYPRE_Int *L_offd_j = NULL;
+   HYPRE_Int *Atilde_diag_i = NULL;
+   HYPRE_Int *Atilde_diag_j = NULL;
+   HYPRE_Int *Atilde_offd_i = NULL;
+   HYPRE_Int *Atilde_offd_j = NULL;
    HYPRE_Int *A_tmp_diag_i;
    HYPRE_Int *A_tmp_offd_i;
    HYPRE_Int *A_tmp_diag_j;
@@ -394,8 +400,8 @@ HYPRE_Int hypre_CreateLambda(void *amg_vdata)
    HYPRE_Int *L_send_map_elmts = NULL;
    HYPRE_Int *recv_procs;
    HYPRE_Int *send_procs;
-   HYPRE_Int *send_map_elmts;
-   HYPRE_Int *send_map_starts;
+   HYPRE_Int *send_map_elmts = NULL;
+   HYPRE_Int *send_map_starts = NULL;
    HYPRE_Int *recv_vec_starts;
    HYPRE_Int *all_send_procs = NULL;
    HYPRE_Int *all_recv_procs = NULL;
@@ -425,7 +431,7 @@ HYPRE_Int hypre_CreateLambda(void *amg_vdata)
    HYPRE_Int       max_sends, max_recvs;
    HYPRE_Int       ns;
 
- /* Local variables  */
+   /* Local variables  */
    HYPRE_Int       Solve_err_flag = 0;
    HYPRE_Int       num_nonzeros_diag;
    HYPRE_Int       num_nonzeros_offd;
@@ -453,16 +459,16 @@ HYPRE_Int hypre_CreateLambda(void *amg_vdata)
    add_rlx_wt        = hypre_ParAMGDataAddRelaxWt(amg_data);
    ns                = hypre_ParAMGDataNumGridSweeps(amg_data)[1];
 
-   hypre_MPI_Comm_size(comm,&num_procs);
+   hypre_MPI_Comm_size(comm, &num_procs);
 
    l1_norms_ptr      = hypre_ParAMGDataL1Norms(amg_data);
 
    addlvl = hypre_max(additive, mult_additive);
-   if (add_last_lvl != -1) add_end = add_last_lvl+1;
-   else add_end = num_levels;
-   num_add_lvls = add_end+1-addlvl;
+   if (add_last_lvl != -1) { add_end = add_last_lvl + 1; }
+   else { add_end = num_levels; }
+   num_add_lvls = add_end + 1 - addlvl;
 
-   level_start = hypre_CTAlloc(HYPRE_Int,  num_add_lvls+1, HYPRE_MEMORY_HOST);
+   level_start = hypre_CTAlloc(HYPRE_Int,  num_add_lvls + 1, HYPRE_MEMORY_HOST);
    send_data_L = 0;
    num_rows_L  = 0;
    num_cols_offd_L = 0;
@@ -472,7 +478,7 @@ HYPRE_Int hypre_CreateLambda(void *amg_vdata)
    cnt = 1;
    max_sends = 0;
    max_recvs = 0;
-   for (i=addlvl; i < add_end; i++)
+   for (i = addlvl; i < add_end; i++)
    {
       A_tmp = A_array[i];
       A_tmp_diag = hypre_ParCSRMatrixDiag(A_tmp);
@@ -482,7 +488,7 @@ HYPRE_Int hypre_CreateLambda(void *amg_vdata)
       num_rows_tmp = hypre_CSRMatrixNumRows(A_tmp_diag);
       num_cols_offd = hypre_CSRMatrixNumCols(A_tmp_offd);
       num_rows_L += num_rows_tmp;
-      level_start[cnt] = level_start[cnt-1] + num_rows_tmp;
+      level_start[cnt] = level_start[cnt - 1] + num_rows_tmp;
       cnt++;
       num_cols_offd_L += num_cols_offd;
       num_nonzeros_diag += A_tmp_diag_i[num_rows_tmp];
@@ -493,17 +499,19 @@ HYPRE_Int hypre_CreateLambda(void *amg_vdata)
          num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
          max_sends += num_sends;
          if (num_sends)
-            send_data_L += hypre_ParCSRCommPkgSendMapStart(comm_pkg,num_sends);
+         {
+            send_data_L += hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends);
+         }
          max_recvs += hypre_ParCSRCommPkgNumRecvs(comm_pkg);
       }
    }
-   if (max_sends >= num_procs ||max_recvs >= num_procs)
+   if (max_sends >= num_procs || max_recvs >= num_procs)
    {
-         max_sends = num_procs;
-         max_recvs = num_procs;
+      max_sends = num_procs;
+      max_recvs = num_procs;
    }
-   if (max_sends) all_send_procs = hypre_CTAlloc(HYPRE_Int,  max_sends, HYPRE_MEMORY_HOST);
-   if (max_recvs) all_recv_procs = hypre_CTAlloc(HYPRE_Int,  max_recvs, HYPRE_MEMORY_HOST);
+   if (max_sends) { all_send_procs = hypre_CTAlloc(HYPRE_Int,  max_sends, HYPRE_MEMORY_HOST); }
+   if (max_recvs) { all_recv_procs = hypre_CTAlloc(HYPRE_Int,  max_recvs, HYPRE_MEMORY_HOST); }
 
    cnt_send = 0;
    cnt_recv = 0;
@@ -511,7 +519,7 @@ HYPRE_Int hypre_CreateLambda(void *amg_vdata)
    {
       if (max_sends < num_procs && max_recvs < num_procs)
       {
-         for (i=addlvl; i < add_end; i++)
+         for (i = addlvl; i < add_end; i++)
          {
             A_tmp = A_array[i];
             comm_pkg = hypre_ParCSRMatrixCommPkg(A_tmp);
@@ -522,17 +530,21 @@ HYPRE_Int hypre_CreateLambda(void *amg_vdata)
                send_procs = hypre_ParCSRCommPkgSendProcs(comm_pkg);
                recv_procs = hypre_ParCSRCommPkgRecvProcs(comm_pkg);
                for (j = 0; j < num_sends; j++)
+               {
                   all_send_procs[cnt_send++] = send_procs[j];
+               }
                for (j = 0; j < num_recvs; j++)
+               {
                   all_recv_procs[cnt_recv++] = recv_procs[j];
+               }
             }
          }
          if (max_sends)
          {
-            hypre_qsort0(all_send_procs, 0, max_sends-1);
+            hypre_qsort0(all_send_procs, 0, max_sends - 1);
             num_sends_L = 1;
             this_proc = all_send_procs[0];
-            for (i=1; i < max_sends; i++)
+            for (i = 1; i < max_sends; i++)
             {
                if (all_send_procs[i] > this_proc)
                {
@@ -541,16 +553,18 @@ HYPRE_Int hypre_CreateLambda(void *amg_vdata)
                }
             }
             L_send_procs = hypre_CTAlloc(HYPRE_Int,  num_sends_L, HYPRE_MEMORY_HOST);
-            for (j=0; j < num_sends_L; j++)
+            for (j = 0; j < num_sends_L; j++)
+            {
                L_send_procs[j] = all_send_procs[j];
+            }
             hypre_TFree(all_send_procs, HYPRE_MEMORY_HOST);
          }
          if (max_recvs)
          {
-            hypre_qsort0(all_recv_procs, 0, max_recvs-1);
+            hypre_qsort0(all_recv_procs, 0, max_recvs - 1);
             num_recvs_L = 1;
             this_proc = all_recv_procs[0];
-            for (i=1; i < max_recvs; i++)
+            for (i = 1; i < max_recvs; i++)
             {
                if (all_recv_procs[i] > this_proc)
                {
@@ -559,15 +573,17 @@ HYPRE_Int hypre_CreateLambda(void *amg_vdata)
                }
             }
             L_recv_procs = hypre_CTAlloc(HYPRE_Int,  num_recvs_L, HYPRE_MEMORY_HOST);
-            for (j=0; j < num_recvs_L; j++)
+            for (j = 0; j < num_recvs_L; j++)
+            {
                L_recv_procs[j] = all_recv_procs[j];
+            }
             hypre_TFree(all_recv_procs, HYPRE_MEMORY_HOST);
          }
 
-         L_recv_ptr = hypre_CTAlloc(HYPRE_Int,  num_recvs_L+1, HYPRE_MEMORY_HOST);
-         L_send_ptr = hypre_CTAlloc(HYPRE_Int,  num_sends_L+1, HYPRE_MEMORY_HOST);
+         L_recv_ptr = hypre_CTAlloc(HYPRE_Int,  num_recvs_L + 1, HYPRE_MEMORY_HOST);
+         L_send_ptr = hypre_CTAlloc(HYPRE_Int,  num_sends_L + 1, HYPRE_MEMORY_HOST);
 
-         for (i=addlvl; i < add_end; i++)
+         for (i = addlvl; i < add_end; i++)
          {
             A_tmp = A_array[i];
             comm_pkg = hypre_ParCSRMatrixCommPkg(A_tmp);
@@ -587,29 +603,33 @@ HYPRE_Int hypre_CreateLambda(void *amg_vdata)
             }
             for (k = 0; k < num_sends; k++)
             {
-               this_proc = hypre_BinarySearch(L_send_procs,send_procs[k],num_sends_L);
-               L_send_ptr[this_proc+1] += send_map_starts[k+1]-send_map_starts[k];
+               this_proc = hypre_BinarySearch(L_send_procs, send_procs[k], num_sends_L);
+               L_send_ptr[this_proc + 1] += send_map_starts[k + 1] - send_map_starts[k];
             }
             for (k = 0; k < num_recvs; k++)
             {
-               this_proc = hypre_BinarySearch(L_recv_procs,recv_procs[k],num_recvs_L);
-               L_recv_ptr[this_proc+1] += recv_vec_starts[k+1]-recv_vec_starts[k];
+               this_proc = hypre_BinarySearch(L_recv_procs, recv_procs[k], num_recvs_L);
+               L_recv_ptr[this_proc + 1] += recv_vec_starts[k + 1] - recv_vec_starts[k];
             }
          }
 
          L_recv_ptr[0] = 0;
-         for (i=1; i < num_recvs_L; i++)
-            L_recv_ptr[i+1] += L_recv_ptr[i];
+         for (i = 1; i < num_recvs_L; i++)
+         {
+            L_recv_ptr[i + 1] += L_recv_ptr[i];
+         }
 
          L_send_ptr[0] = 0;
-         for (i=1; i < num_sends_L; i++)
-            L_send_ptr[i+1] += L_send_ptr[i];
+         for (i = 1; i < num_sends_L; i++)
+         {
+            L_send_ptr[i + 1] += L_send_ptr[i];
+         }
       }
       else
       {
          num_recvs_L = 0;
          num_sends_L = 0;
-         for (i=addlvl; i < add_end; i++)
+         for (i = addlvl; i < add_end; i++)
          {
             A_tmp = A_array[i];
             comm_pkg = hypre_ParCSRMatrixCommPkg(A_tmp);
@@ -625,52 +645,56 @@ HYPRE_Int hypre_CreateLambda(void *amg_vdata)
                {
                   this_proc = send_procs[j];
                   if (all_send_procs[this_proc] == 0)
+                  {
                      num_sends_L++;
-                  all_send_procs[this_proc] += send_map_starts[j+1]-send_map_starts[j];
+                  }
+                  all_send_procs[this_proc] += send_map_starts[j + 1] - send_map_starts[j];
                }
                for (j = 0; j < num_recvs; j++)
                {
                   this_proc = recv_procs[j];
                   if (all_recv_procs[this_proc] == 0)
+                  {
                      num_recvs_L++;
-                  all_recv_procs[this_proc] += recv_vec_starts[j+1]-recv_vec_starts[j];
+                  }
+                  all_recv_procs[this_proc] += recv_vec_starts[j + 1] - recv_vec_starts[j];
                }
             }
          }
          if (max_sends)
          {
             L_send_procs = hypre_CTAlloc(HYPRE_Int,  num_sends_L, HYPRE_MEMORY_HOST);
-            L_send_ptr = hypre_CTAlloc(HYPRE_Int,  num_sends_L+1, HYPRE_MEMORY_HOST);
+            L_send_ptr = hypre_CTAlloc(HYPRE_Int,  num_sends_L + 1, HYPRE_MEMORY_HOST);
             num_sends_L = 0;
-            for (j=0; j < num_procs; j++)
+            for (j = 0; j < num_procs; j++)
             {
                this_proc = all_send_procs[j];
                if (this_proc)
                {
                   L_send_procs[num_sends_L++] = j;
-                  L_send_ptr[num_sends_L] = this_proc + L_send_ptr[num_sends_L-1];
+                  L_send_ptr[num_sends_L] = this_proc + L_send_ptr[num_sends_L - 1];
                }
             }
          }
          if (max_recvs)
          {
             L_recv_procs = hypre_CTAlloc(HYPRE_Int,  num_recvs_L, HYPRE_MEMORY_HOST);
-            L_recv_ptr = hypre_CTAlloc(HYPRE_Int,  num_recvs_L+1, HYPRE_MEMORY_HOST);
+            L_recv_ptr = hypre_CTAlloc(HYPRE_Int,  num_recvs_L + 1, HYPRE_MEMORY_HOST);
             num_recvs_L = 0;
-            for (j=0; j < num_procs; j++)
+            for (j = 0; j < num_procs; j++)
             {
                this_proc = all_recv_procs[j];
                if (this_proc)
                {
                   L_recv_procs[num_recvs_L++] = j;
-                  L_recv_ptr[num_recvs_L] = this_proc + L_recv_ptr[num_recvs_L-1];
+                  L_recv_ptr[num_recvs_L] = this_proc + L_recv_ptr[num_recvs_L - 1];
                }
             }
          }
       }
    }
-   if (max_sends) hypre_TFree(all_send_procs, HYPRE_MEMORY_HOST);
-   if (max_recvs) hypre_TFree(all_recv_procs, HYPRE_MEMORY_HOST);
+   if (max_sends) { hypre_TFree(all_send_procs, HYPRE_MEMORY_HOST); }
+   if (max_recvs) { hypre_TFree(all_recv_procs, HYPRE_MEMORY_HOST); }
 
    L_diag = hypre_CSRMatrixCreate(num_rows_L, num_rows_L, num_nonzeros_diag);
    L_offd = hypre_CSRMatrixCreate(num_rows_L, num_cols_offd_L, num_nonzeros_offd);
@@ -710,7 +734,7 @@ HYPRE_Int hypre_CreateLambda(void *amg_vdata)
       Atilde_offd_i = hypre_CSRMatrixI(Atilde_offd);
    }
 
-   if (num_rows_L) D_data = hypre_CTAlloc(HYPRE_Real, num_rows_L, HYPRE_MEMORY_HOST);
+   if (num_rows_L) { D_data = hypre_CTAlloc(HYPRE_Real, num_rows_L, HYPRE_MEMORY_HOST); }
    if (send_data_L)
    {
       L_send_map_elmts = hypre_CTAlloc(HYPRE_Int,  send_data_L, HYPRE_MEMORY_HOST);
@@ -752,7 +776,7 @@ HYPRE_Int hypre_CreateLambda(void *amg_vdata)
       Atilde_diag_i[0] = 0;
       Atilde_offd_i[0] = 0;
    }
-   for (level=addlvl; level < add_end; level++)
+   for (level = addlvl; level < add_end; level++)
    {
       row_start = level_start[cnt_level];
       if (level != 0)
@@ -775,8 +799,8 @@ HYPRE_Int hypre_CreateLambda(void *amg_vdata)
       }
       cnt_level++;
 
-      start_diag = L_diag_i[cnt_row-1];
-      start_offd = L_offd_i[cnt_row-1];
+      start_diag = L_diag_i[cnt_row - 1];
+      start_offd = L_offd_i[cnt_row - 1];
       A_tmp = A_array[level];
       A_tmp_diag = hypre_ParCSRMatrixDiag(A_tmp);
       A_tmp_offd = hypre_ParCSRMatrixOffd(A_tmp);
@@ -805,11 +829,11 @@ HYPRE_Int hypre_CreateLambda(void *amg_vdata)
       }
 
       /* Compute new combined communication package */
-      for (i=0; i < num_sends; i++)
+      for (i = 0; i < num_sends; i++)
       {
-         this_proc = hypre_BinarySearch(L_send_procs,send_procs[i],num_sends_L);
+         this_proc = hypre_BinarySearch(L_send_procs, send_procs[i], num_sends_L);
          indx = L_send_ptr[this_proc];
-         for (j=send_map_starts[i]; j < send_map_starts[i+1]; j++)
+         for (j = send_map_starts[i]; j < send_map_starts[i + 1]; j++)
          {
             L_send_map_elmts[indx++] = row_start + send_map_elmts[j];
          }
@@ -819,9 +843,9 @@ HYPRE_Int hypre_CreateLambda(void *amg_vdata)
       cnt_map = 0;
       for (i = 0; i < num_recvs; i++)
       {
-         this_proc = hypre_BinarySearch(L_recv_procs,recv_procs[i],num_recvs_L);
+         this_proc = hypre_BinarySearch(L_recv_procs, recv_procs[i], num_recvs_L);
          indx = L_recv_ptr[this_proc];
-         for (j=recv_vec_starts[i]; j < recv_vec_starts[i+1]; j++)
+         for (j = recv_vec_starts[i]; j < recv_vec_starts[i + 1]; j++)
          {
             remap[cnt_map++] = indx++;
          }
@@ -831,41 +855,41 @@ HYPRE_Int hypre_CreateLambda(void *amg_vdata)
       /* Compute Lambda */
       if (add_rlx == 0)
       {
-        /*HYPRE_Real rlx_wt = relax_weight[level];*/
+         /*HYPRE_Real rlx_wt = relax_weight[level];*/
 #ifdef HYPRE_USING_OPENMP
-#pragma omp for private(i) HYPRE_SMP_SCHEDULE
+         #pragma omp for private(i) HYPRE_SMP_SCHEDULE
 #endif
-         for (i=0; i < num_rows_tmp; i++)
+         for (i = 0; i < num_rows_tmp; i++)
          {
-           D_data[i] = add_rlx_wt/A_tmp_diag_data[A_tmp_diag_i[i]];
-           L_diag_i[cnt_row+i] = start_diag + A_tmp_diag_i[i+1];
-           L_offd_i[cnt_row+i] = start_offd + A_tmp_offd_i[i+1];
+            D_data[i] = add_rlx_wt / A_tmp_diag_data[A_tmp_diag_i[i]];
+            L_diag_i[cnt_row + i] = start_diag + A_tmp_diag_i[i + 1];
+            L_offd_i[cnt_row + i] = start_offd + A_tmp_offd_i[i + 1];
          }
          if (ns > 1)
-           for (i=0; i < num_rows_tmp; i++)
-           {
-             Atilde_diag_i[cnt_row+i] = start_diag + A_tmp_diag_i[i+1];
-             Atilde_offd_i[cnt_row+i] = start_offd + A_tmp_offd_i[i+1];
-           }
+            for (i = 0; i < num_rows_tmp; i++)
+            {
+               Atilde_diag_i[cnt_row + i] = start_diag + A_tmp_diag_i[i + 1];
+               Atilde_offd_i[cnt_row + i] = start_offd + A_tmp_offd_i[i + 1];
+            }
       }
       else
       {
          l1_norms = l1_norms_ptr[level];
 #ifdef HYPRE_USING_OPENMP
-#pragma omp for private(i) HYPRE_SMP_SCHEDULE
+         #pragma omp for private(i) HYPRE_SMP_SCHEDULE
 #endif
-         for (i=0; i < num_rows_tmp; i++)
+         for (i = 0; i < num_rows_tmp; i++)
          {
             D_data[i] = 1.0 / hypre_VectorData(l1_norms)[i];
-            L_diag_i[cnt_row+i] = start_diag + A_tmp_diag_i[i+1];
-            L_offd_i[cnt_row+i] = start_offd + A_tmp_offd_i[i+1];
+            L_diag_i[cnt_row + i] = start_diag + A_tmp_diag_i[i + 1];
+            L_offd_i[cnt_row + i] = start_offd + A_tmp_offd_i[i + 1];
          }
          if (ns > 1)
          {
-            for (i=0; i < num_rows_tmp; i++)
+            for (i = 0; i < num_rows_tmp; i++)
             {
-               Atilde_diag_i[cnt_row+i] = start_diag + A_tmp_diag_i[i+1];
-               Atilde_offd_i[cnt_row+i] = start_offd + A_tmp_offd_i[i+1];
+               Atilde_diag_i[cnt_row + i] = start_diag + A_tmp_diag_i[i + 1];
+               Atilde_offd_i[cnt_row + i] = start_offd + A_tmp_offd_i[i + 1];
             }
          }
       }
@@ -873,15 +897,17 @@ HYPRE_Int hypre_CreateLambda(void *amg_vdata)
       if (num_procs > 1)
       {
          index = 0;
-         for (i=0; i < num_sends; i++)
+         for (i = 0; i < num_sends; i++)
          {
             start = send_map_starts[i];
-            for (j=start; j < send_map_starts[i+1]; j++)
-              buf_data[index++] = D_data[send_map_elmts[j]];
+            for (j = start; j < send_map_starts[i + 1]; j++)
+            {
+               buf_data[index++] = D_data[send_map_elmts[j]];
+            }
          }
 
          comm_handle = hypre_ParCSRCommHandleCreate(1, comm_pkg,
-                        buf_data, D_data_offd);
+                                                    buf_data, D_data_offd);
          hypre_ParCSRCommHandleDestroy(comm_handle);
       }
 
@@ -891,31 +917,31 @@ HYPRE_Int hypre_CreateLambda(void *amg_vdata)
          if (ns > 1)
          {
             Atilde_diag_data[A_cnt_diag] = A_tmp_diag_data[j_indx];
-            Atilde_diag_j[A_cnt_diag++] = i+row_start;
+            Atilde_diag_j[A_cnt_diag++] = i + row_start;
          }
-         L_diag_data[cnt_diag] = (2.0 - A_tmp_diag_data[j_indx]*D_data[i])*D_data[i];
-         L_diag_j[cnt_diag++] = i+row_start;
-         for (j=A_tmp_diag_i[i]+1; j < A_tmp_diag_i[i+1]; j++)
+         L_diag_data[cnt_diag] = (2.0 - A_tmp_diag_data[j_indx] * D_data[i]) * D_data[i];
+         L_diag_j[cnt_diag++] = i + row_start;
+         for (j = A_tmp_diag_i[i] + 1; j < A_tmp_diag_i[i + 1]; j++)
          {
-             j_indx = A_tmp_diag_j[j];
-             L_diag_data[cnt_diag] = (- A_tmp_diag_data[j]*D_data[j_indx])*D_data[i];
-             L_diag_j[cnt_diag++] = j_indx+row_start;
+            j_indx = A_tmp_diag_j[j];
+            L_diag_data[cnt_diag] = (- A_tmp_diag_data[j] * D_data[j_indx]) * D_data[i];
+            L_diag_j[cnt_diag++] = j_indx + row_start;
          }
-         for (j=A_tmp_offd_i[i]; j < A_tmp_offd_i[i+1]; j++)
+         for (j = A_tmp_offd_i[i]; j < A_tmp_offd_i[i + 1]; j++)
          {
-             j_indx = A_tmp_offd_j[j];
-             L_offd_data[cnt_offd] = (- A_tmp_offd_data[j]*D_data_offd[j_indx])*D_data[i];
-             L_offd_j[cnt_offd++] = remap[j_indx];
+            j_indx = A_tmp_offd_j[j];
+            L_offd_data[cnt_offd] = (- A_tmp_offd_data[j] * D_data_offd[j_indx]) * D_data[i];
+            L_offd_j[cnt_offd++] = remap[j_indx];
          }
          if (ns > 1)
          {
-            for (j=A_tmp_diag_i[i]+1; j < A_tmp_diag_i[i+1]; j++)
+            for (j = A_tmp_diag_i[i] + 1; j < A_tmp_diag_i[i + 1]; j++)
             {
                j_indx = A_tmp_diag_j[j];
                Atilde_diag_data[A_cnt_diag] = A_tmp_diag_data[j];
-               Atilde_diag_j[A_cnt_diag++] = j_indx+row_start;
+               Atilde_diag_j[A_cnt_diag++] = j_indx + row_start;
             }
-            for (j=A_tmp_offd_i[i]; j < A_tmp_offd_i[i+1]; j++)
+            for (j = A_tmp_offd_i[i]; j < A_tmp_offd_i[i + 1]; j++)
             {
                j_indx = A_tmp_offd_j[j];
                Atilde_offd_data[A_cnt_offd] = A_tmp_offd_data[j];
@@ -928,35 +954,38 @@ HYPRE_Int hypre_CreateLambda(void *amg_vdata)
 
    if (L_send_ptr)
    {
-      for (i=num_sends_L-1; i > 0; i--)
-         L_send_ptr[i] = L_send_ptr[i-1];
+      for (i = num_sends_L - 1; i > 0; i--)
+      {
+         L_send_ptr[i] = L_send_ptr[i - 1];
+      }
       L_send_ptr[0] = 0;
    }
    else
+   {
       L_send_ptr = hypre_CTAlloc(HYPRE_Int, 1, HYPRE_MEMORY_HOST);
+   }
 
    if (L_recv_ptr)
    {
-      for (i=num_recvs_L-1; i > 0; i--)
-         L_recv_ptr[i] = L_recv_ptr[i-1];
+      for (i = num_recvs_L - 1; i > 0; i--)
+      {
+         L_recv_ptr[i] = L_recv_ptr[i - 1];
+      }
       L_recv_ptr[0] = 0;
    }
    else
+   {
       L_recv_ptr = hypre_CTAlloc(HYPRE_Int, 1, HYPRE_MEMORY_HOST);
+   }
 
-   L_comm_pkg = hypre_CTAlloc(hypre_ParCSRCommPkg, 1, HYPRE_MEMORY_HOST);
-
-   hypre_ParCSRCommPkgNumRecvs(L_comm_pkg) = num_recvs_L;
-   hypre_ParCSRCommPkgNumSends(L_comm_pkg) = num_sends_L;
-   hypre_ParCSRCommPkgRecvProcs(L_comm_pkg) = L_recv_procs;
-   hypre_ParCSRCommPkgSendProcs(L_comm_pkg) = L_send_procs;
-   hypre_ParCSRCommPkgRecvVecStarts(L_comm_pkg) = L_recv_ptr;
-   hypre_ParCSRCommPkgSendMapStarts(L_comm_pkg) = L_send_ptr;
-   hypre_ParCSRCommPkgSendMapElmts(L_comm_pkg) = L_send_map_elmts;
-   hypre_ParCSRCommPkgComm(L_comm_pkg) = comm;
-
+   /* Create and fill communication package */
+   hypre_ParCSRCommPkgCreateAndFill(comm,
+                                    num_recvs_L, L_recv_procs, L_recv_ptr,
+                                    num_sends_L, L_send_procs, L_send_ptr,
+                                    L_send_map_elmts,
+                                    &L_comm_pkg);
 
-   Lambda = hypre_CTAlloc(hypre_ParCSRMatrix,  1, HYPRE_MEMORY_HOST);
+   Lambda = hypre_CTAlloc(hypre_ParCSRMatrix, 1, HYPRE_MEMORY_HOST);
    hypre_ParCSRMatrixDiag(Lambda) = L_diag;
    hypre_ParCSRMatrixOffd(Lambda) = L_offd;
    hypre_ParCSRMatrixCommPkg(Lambda) = L_comm_pkg;
@@ -965,41 +994,6 @@ HYPRE_Int hypre_CreateLambda(void *amg_vdata)
 
    if (ns > 1)
    {
-      /*hypre_ParCSRCommPkg *A_comm_pkg = NULL;
-      HYPRE_Int *A_recv_ptr = NULL;
-      HYPRE_Int *A_send_ptr = NULL;
-      HYPRE_Int *A_recv_procs = NULL;
-      HYPRE_Int *A_send_procs = NULL;
-      HYPRE_Int *A_send_map_elmts = NULL;
-
-      A_comm_pkg = hypre_CTAlloc(hypre_ParCSRCommPkg, 1, HYPRE_MEMORY_HOST);
-
-      A_recv_ptr = hypre_CTAlloc(HYPRE_Int,  num_recvs+1, HYPRE_MEMORY_HOST);
-      A_send_ptr = hypre_CTAlloc(HYPRE_Int,  num_sends+1, HYPRE_MEMORY_HOST);
-      A_recv_procs = hypre_CTAlloc(HYPRE_Int,  num_recvs_L, HYPRE_MEMORY_HOST);
-      A_send_procs = hypre_CTAlloc(HYPRE_Int,  num_sends_L, HYPRE_MEMORY_HOST);
-      A_send_map_elmts = hypre_CTAlloc(HYPRE_Int,  L_send_ptr[num_sends_L], HYPRE_MEMORY_HOST);
-
-      for (i=0; i<num_recvs_L+1; i++)
-      A_recv_ptr[i] = L_recv_ptr[i];
-      for (i=0; i<num_sends_L+1; i++)
-      A_send_ptr[i] = L_send_ptr[i];
-      for (i=0; i<num_recvs_L; i++)
-      A_recv_procs[i] = L_recv_procs[i];
-      for (i=0; i<num_sends_L; i++)
-      A_send_procs[i] = L_send_procs[i];
-      for (i=0; i < L_send_ptr[num_sends_L]; i++)
-      A_send_map_elmts[i] = L_send_map_elmts[i];
-
-      hypre_ParCSRCommPkgNumRecvs(A_comm_pkg) = num_recvs_L;
-      hypre_ParCSRCommPkgNumSends(A_comm_pkg) = num_sends_L;
-      hypre_ParCSRCommPkgRecvProcs(A_comm_pkg) = A_recv_procs;
-      hypre_ParCSRCommPkgSendProcs(A_comm_pkg) = A_send_procs;
-      hypre_ParCSRCommPkgRecvVecStarts(A_comm_pkg) = A_recv_ptr;
-      hypre_ParCSRCommPkgSendMapStarts(A_comm_pkg) = A_send_ptr;
-      hypre_ParCSRCommPkgSendMapElmts(A_comm_pkg) = A_send_map_elmts;
-      hypre_ParCSRCommPkgComm(A_comm_pkg) = comm; */
-
       Atilde = hypre_CTAlloc(hypre_ParCSRMatrix,  1, HYPRE_MEMORY_HOST);
       hypre_ParCSRMatrixDiag(Atilde) = Atilde_diag;
       hypre_ParCSRMatrixOffd(Atilde) = Atilde_offd;
@@ -1015,7 +1009,7 @@ HYPRE_Int hypre_CreateLambda(void *amg_vdata)
 
    hypre_TFree(D_data_offd, HYPRE_MEMORY_HOST);
    hypre_TFree(D_data, HYPRE_MEMORY_HOST);
-   if (num_procs > 1) hypre_TFree(buf_data, HYPRE_MEMORY_HOST);
+   if (num_procs > 1) { hypre_TFree(buf_data, HYPRE_MEMORY_HOST); }
    hypre_TFree(remap, HYPRE_MEMORY_HOST);
    hypre_TFree(buf_data, HYPRE_MEMORY_HOST);
    hypre_TFree(level_start, HYPRE_MEMORY_HOST);
@@ -1054,7 +1048,7 @@ HYPRE_Int hypre_CreateDinv(void *amg_vdata)
    HYPRE_Real      add_rlx_wt;
    HYPRE_Int       add_last_lvl, add_end;
 
- /* Local variables  */
+   /* Local variables  */
    HYPRE_Int       Solve_err_flag = 0;
 
    hypre_Vector  **l1_norms_ptr = NULL;
@@ -1076,11 +1070,11 @@ HYPRE_Int hypre_CreateDinv(void *amg_vdata)
 
    l1_norms_ptr      = hypre_ParAMGDataL1Norms(amg_data);
    /* smooth_option       = hypre_ParAMGDataSmoothOption(amg_data); */
-   if (add_last_lvl == -1 ) add_end = num_levels;
-   else add_end = add_last_lvl;
+   if (add_last_lvl == -1 ) { add_end = num_levels; }
+   else { add_end = add_last_lvl; }
 
    num_rows_L  = 0;
-   for (i=addlvl; i < add_end; i++)
+   for (i = addlvl; i < add_end; i++)
    {
       A_tmp = A_array[i];
       A_tmp_diag = hypre_ParCSRMatrixDiag(A_tmp);
@@ -1105,7 +1099,7 @@ HYPRE_Int hypre_CreateDinv(void *amg_vdata)
    D_inv = hypre_CTAlloc(HYPRE_Real,  num_rows_L, HYPRE_MEMORY_HOST);
 
    l1_start = 0;
-   for (level=addlvl; level < add_end; level++)
+   for (level = addlvl; level < add_end; level++)
    {
       if (level != 0)
       {
@@ -1136,22 +1130,22 @@ HYPRE_Int hypre_CreateDinv(void *amg_vdata)
          HYPRE_Int *A_tmp_diag_i = hypre_CSRMatrixI(A_tmp_diag);
          HYPRE_Real *A_tmp_diag_data = hypre_CSRMatrixData(A_tmp_diag);
 #ifdef HYPRE_USING_OPENMP
-#pragma omp for private(i) HYPRE_SMP_SCHEDULE
+         #pragma omp for private(i) HYPRE_SMP_SCHEDULE
 #endif
-         for (i=0; i < num_rows_tmp; i++)
+         for (i = 0; i < num_rows_tmp; i++)
          {
-            D_inv[l1_start+i] = add_rlx_wt/A_tmp_diag_data[A_tmp_diag_i[i]];
+            D_inv[l1_start + i] = add_rlx_wt / A_tmp_diag_data[A_tmp_diag_i[i]];
          }
       }
       else
       {
          l1_norms = l1_norms_ptr[level];
 #ifdef HYPRE_USING_OPENMP
-#pragma omp for private(i) HYPRE_SMP_SCHEDULE
+         #pragma omp for private(i) HYPRE_SMP_SCHEDULE
 #endif
-         for (i=0; i < num_rows_tmp; i++)
+         for (i = 0; i < num_rows_tmp; i++)
          {
-            D_inv[l1_start+i] = 1.0 / hypre_VectorData(l1_norms)[i];
+            D_inv[l1_start + i] = 1.0 / hypre_VectorData(l1_norms)[i];
          }
       }
       l1_start += num_rows_tmp;
diff --git a/external/hypre/src/parcsr_ls/par_amg.c b/external/hypre/src/parcsr_ls/par_amg.c
index 501b1c96..b10876e1 100644
--- a/external/hypre/src/parcsr_ls/par_amg.c
+++ b/external/hypre/src/parcsr_ls/par_amg.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -12,19 +12,16 @@
  *****************************************************************************/
 
 #include "_hypre_parcsr_ls.h"
-#include "par_amg.h"
-#ifdef HYPRE_USING_DSUPERLU
-#include <math.h>
-#include "superlu_ddefs.h"
-#endif
+
 /*--------------------------------------------------------------------------
  * hypre_BoomerAMGCreate
  *--------------------------------------------------------------------------*/
 
 void *
-hypre_BoomerAMGCreate()
+hypre_BoomerAMGCreate( void )
 {
    hypre_ParAMGData  *amg_data;
+   hypre_Solver      *base;
 
    /* setup params */
    HYPRE_Int    max_levels;
@@ -51,6 +48,7 @@ hypre_BoomerAMGCreate()
    HYPRE_Int    setup_type;
    HYPRE_Int    P_max_elmts;
    HYPRE_Int    num_functions;
+   HYPRE_Int    filter_functions;
    HYPRE_Int    nodal, nodal_levels, nodal_diag;
    HYPRE_Int    keep_same_sign;
    HYPRE_Int    num_paths;
@@ -104,7 +102,24 @@ hypre_BoomerAMGCreate()
    HYPRE_Int    ilu_max_row_nnz;
    HYPRE_Int    ilu_max_iter;
    HYPRE_Real   ilu_droptol;
+   HYPRE_Int    ilu_tri_solve;
+   HYPRE_Int    ilu_lower_jacobi_iters;
+   HYPRE_Int    ilu_upper_jacobi_iters;
    HYPRE_Int    ilu_reordering_type;
+   HYPRE_Int    ilu_iter_setup_type;
+   HYPRE_Int    ilu_iter_setup_option;
+   HYPRE_Int    ilu_iter_setup_max_iter;
+   HYPRE_Real   ilu_iter_setup_tolerance;
+
+   HYPRE_Int    fsai_algo_type;
+   HYPRE_Int    fsai_local_solve_type;
+   HYPRE_Int    fsai_max_steps;
+   HYPRE_Int    fsai_max_step_size;
+   HYPRE_Int    fsai_max_nnz_row;
+   HYPRE_Int    fsai_num_levels;
+   HYPRE_Real   fsai_threshold;
+   HYPRE_Int    fsai_eig_maxiter;
+   HYPRE_Real   fsai_kap_tolerance;
 
    HYPRE_Int cheby_order;
    HYPRE_Int cheby_eig_est;
@@ -126,6 +141,7 @@ hypre_BoomerAMGCreate()
    /* log info */
    HYPRE_Int    num_iterations;
    HYPRE_Int    cum_num_iterations;
+   HYPRE_Real   cum_nnz_AP;
 
    /* output params */
    HYPRE_Int    print_level;
@@ -136,6 +152,8 @@ hypre_BoomerAMGCreate()
 
    char     plot_file_name[251] = {0};
 
+   HYPRE_MemoryLocation memory_location = hypre_HandleMemoryLocation(hypre_handle());
+
    /*-----------------------------------------------------------------------
     * Setup default values for parameters
     *-----------------------------------------------------------------------*/
@@ -165,6 +183,7 @@ hypre_BoomerAMGCreate()
    agg_P_max_elmts = 0;
    agg_P12_max_elmts = 0;
    num_functions = 1;
+   filter_functions = 0;
    nodal = 0;
    nodal_levels = max_levels;
    nodal_diag = 0;
@@ -206,7 +225,34 @@ hypre_BoomerAMGCreate()
    ilu_max_row_nnz = 20;
    ilu_max_iter = 1;
    ilu_droptol = 0.01;
+   ilu_tri_solve = 1;
+   ilu_lower_jacobi_iters = 5;
+   ilu_upper_jacobi_iters = 5;
    ilu_reordering_type = 1;
+   ilu_iter_setup_type = 0;
+   ilu_iter_setup_option = 10;
+   ilu_iter_setup_max_iter = 20;
+   ilu_iter_setup_tolerance = 1.e-3;
+
+   /* FSAI smoother params */
+#if defined (HYPRE_USING_CUDA) || defined (HYPRE_USING_HIP)
+   if (hypre_GetExecPolicy1(memory_location) == HYPRE_EXEC_DEVICE)
+   {
+      fsai_algo_type = 3;
+   }
+   else
+#endif
+   {
+      fsai_algo_type = hypre_NumThreads() > 4 ? 2 : 1;
+   }
+   fsai_local_solve_type = 0;
+   fsai_max_steps = 4;
+   fsai_max_step_size = 2;
+   fsai_max_nnz_row = 8;
+   fsai_num_levels = 1;
+   fsai_threshold = 0.01;
+   fsai_eig_maxiter = 5;
+   fsai_kap_tolerance = 0.001;
 
    /* solve params */
    min_iter  = 0;
@@ -244,6 +290,7 @@ hypre_BoomerAMGCreate()
    /* log info */
    num_iterations = 0;
    cum_num_iterations = 0;
+   cum_nnz_AP = -1.0;
 
    /* output params */
    print_level = 0;
@@ -258,14 +305,15 @@ hypre_BoomerAMGCreate()
    keepT = 0;
    modu_rap = 0;
 
-#if defined(HYPRE_USING_GPU)
-   keepT           =  1;
-   modu_rap        =  1;
-   coarsen_type    =  8;
-   relax_down      = 18;
-   relax_up        = 18;
-   agg_interp_type =  7;
-#endif
+   if (hypre_GetExecPolicy1(memory_location) == HYPRE_EXEC_DEVICE)
+   {
+      keepT           =  1;
+      modu_rap        =  1;
+      coarsen_type    =  8;
+      relax_down      = 18;
+      relax_up        = 18;
+      agg_interp_type =  7;
+   }
 
    HYPRE_ANNOTATE_FUNC_BEGIN;
 
@@ -274,8 +322,15 @@ hypre_BoomerAMGCreate()
     *-----------------------------------------------------------------------*/
 
    amg_data = hypre_CTAlloc(hypre_ParAMGData, 1, HYPRE_MEMORY_HOST);
+   base     = (hypre_Solver*) amg_data;
 
-   hypre_ParAMGDataMemoryLocation(amg_data) = HYPRE_MEMORY_UNDEFINED;
+   /* Set base solver function pointers */
+   hypre_SolverSetup(base)   = (HYPRE_PtrToSolverFcn)  HYPRE_BoomerAMGSetup;
+   hypre_SolverSolve(base)   = (HYPRE_PtrToSolverFcn)  HYPRE_BoomerAMGSolve;
+   hypre_SolverDestroy(base) = (HYPRE_PtrToDestroyFcn) HYPRE_BoomerAMGDestroy;
+
+   /* memory location will be reset at the setup */
+   hypre_ParAMGDataMemoryLocation(amg_data) = memory_location;
 
    hypre_ParAMGDataPartialCycleCoarsestLevel(amg_data) = -1;
    hypre_ParAMGDataPartialCycleControl(amg_data) = -1;
@@ -306,6 +361,7 @@ hypre_BoomerAMGCreate()
    hypre_BoomerAMGSetAggPMaxElmts(amg_data, agg_P_max_elmts);
    hypre_BoomerAMGSetAggP12MaxElmts(amg_data, agg_P12_max_elmts);
    hypre_BoomerAMGSetNumFunctions(amg_data, num_functions);
+   hypre_BoomerAMGSetFilterFunctions(amg_data, filter_functions);
    hypre_BoomerAMGSetNodal(amg_data, nodal);
    hypre_BoomerAMGSetNodalLevels(amg_data, nodal_levels);
    hypre_BoomerAMGSetNodal(amg_data, nodal_diag);
@@ -341,8 +397,24 @@ hypre_BoomerAMGCreate()
    hypre_BoomerAMGSetILULevel(amg_data, ilu_lfil);
    hypre_BoomerAMGSetILUMaxRowNnz(amg_data, ilu_max_row_nnz);
    hypre_BoomerAMGSetILUDroptol(amg_data, ilu_droptol);
+   hypre_BoomerAMGSetILUTriSolve(amg_data, ilu_tri_solve);
+   hypre_BoomerAMGSetILULowerJacobiIters(amg_data, ilu_lower_jacobi_iters);
+   hypre_BoomerAMGSetILUUpperJacobiIters(amg_data, ilu_upper_jacobi_iters);
    hypre_BoomerAMGSetILUMaxIter(amg_data, ilu_max_iter);
    hypre_BoomerAMGSetILULocalReordering(amg_data, ilu_reordering_type);
+   hypre_BoomerAMGSetILUIterSetupType(amg_data, ilu_iter_setup_type);
+   hypre_BoomerAMGSetILUIterSetupOption(amg_data, ilu_iter_setup_option);
+   hypre_BoomerAMGSetILUIterSetupMaxIter(amg_data, ilu_iter_setup_max_iter);
+   hypre_BoomerAMGSetILUIterSetupTolerance(amg_data, ilu_iter_setup_tolerance);
+   hypre_BoomerAMGSetFSAIAlgoType(amg_data, fsai_algo_type);
+   hypre_BoomerAMGSetFSAILocalSolveType(amg_data, fsai_local_solve_type);
+   hypre_BoomerAMGSetFSAIMaxSteps(amg_data, fsai_max_steps);
+   hypre_BoomerAMGSetFSAIMaxStepSize(amg_data, fsai_max_step_size);
+   hypre_BoomerAMGSetFSAIMaxNnzRow(amg_data, fsai_max_nnz_row);
+   hypre_BoomerAMGSetFSAINumLevels(amg_data, fsai_num_levels);
+   hypre_BoomerAMGSetFSAIThreshold(amg_data, fsai_threshold);
+   hypre_BoomerAMGSetFSAIEigMaxIters(amg_data, fsai_eig_maxiter);
+   hypre_BoomerAMGSetFSAIKapTolerance(amg_data, fsai_kap_tolerance);
 
    hypre_BoomerAMGSetMinIter(amg_data, min_iter);
    hypre_BoomerAMGSetMaxIter(amg_data, max_iter);
@@ -435,7 +507,7 @@ hypre_BoomerAMGCreate()
    hypre_ParAMGDataCoordDim(amg_data) = 0;
    hypre_ParAMGDataCoordinates(amg_data) = NULL;
 
-  /* for fitting vectors for interp */
+   /* for fitting vectors for interp */
    hypre_BoomerAMGSetInterpVecVariant(amg_data, 0);
    hypre_BoomerAMGSetInterpVectors(amg_data, 0, NULL);
    hypre_ParAMGNumLevelsInterpVectors(amg_data) = max_levels;
@@ -458,11 +530,14 @@ hypre_BoomerAMGCreate()
    hypre_ParAMGDataNewComm(amg_data) = hypre_MPI_COMM_NULL;
 
    /* for Gaussian elimination coarse grid solve */
-   hypre_ParAMGDataGSSetup(amg_data) = 0;
-   hypre_ParAMGDataAMat(amg_data) = NULL;
-   hypre_ParAMGDataAInv(amg_data) = NULL;
-   hypre_ParAMGDataBVec(amg_data) = NULL;
-   hypre_ParAMGDataCommInfo(amg_data) = NULL;
+   hypre_ParAMGDataGSSetup(amg_data)          = 0;
+   hypre_ParAMGDataGEMemoryLocation(amg_data) = HYPRE_MEMORY_UNDEFINED;
+   hypre_ParAMGDataCommInfo(amg_data)         = NULL;
+   hypre_ParAMGDataAMat(amg_data)             = NULL;
+   hypre_ParAMGDataAWork(amg_data)            = NULL;
+   hypre_ParAMGDataAPiv(amg_data)             = NULL;
+   hypre_ParAMGDataBVec(amg_data)             = NULL;
+   hypre_ParAMGDataUVec(amg_data)             = NULL;
 
    hypre_ParAMGDataNonGalerkinTol(amg_data) = nongalerkin_tol;
    hypre_ParAMGDataNonGalTolArray(amg_data) = NULL;
@@ -481,6 +556,8 @@ hypre_BoomerAMGCreate()
    hypre_ParAMGDataIsolatedFPointsMarker(amg_data) = NULL;
    hypre_ParAMGDataNumIsolatedFPoints(amg_data) = 0;
 
+   hypre_ParAMGDataCumNnzAP(amg_data) = cum_nnz_AP;
+
 #ifdef HYPRE_USING_DSUPERLU
    hypre_ParAMGDataDSLUThreshold(amg_data) = 0;
    hypre_ParAMGDataDSLUSolver(amg_data) = NULL;
@@ -499,333 +576,352 @@ HYPRE_Int
 hypre_BoomerAMGDestroy( void *data )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
-   HYPRE_Int num_levels = hypre_ParAMGDataNumLevels(amg_data);
-   HYPRE_Int smooth_num_levels = hypre_ParAMGDataSmoothNumLevels(amg_data);
-   HYPRE_Solver *smoother = hypre_ParAMGDataSmoother(amg_data);
-   void *amg = hypre_ParAMGDataCoarseSolver(amg_data);
-   MPI_Comm new_comm = hypre_ParAMGDataNewComm(amg_data);
-   HYPRE_Int i;
-   HYPRE_Int *grid_relax_type = hypre_ParAMGDataGridRelaxType(amg_data);
 
    HYPRE_ANNOTATE_FUNC_BEGIN;
+   if (amg_data)
+   {
+      HYPRE_Int     num_levels = hypre_ParAMGDataNumLevels(amg_data);
+      HYPRE_Int     smooth_num_levels = hypre_ParAMGDataSmoothNumLevels(amg_data);
+      HYPRE_Solver *smoother = hypre_ParAMGDataSmoother(amg_data);
+      void         *amg = hypre_ParAMGDataCoarseSolver(amg_data);
+      MPI_Comm      new_comm = hypre_ParAMGDataNewComm(amg_data);
+      HYPRE_Int    *grid_relax_type = hypre_ParAMGDataGridRelaxType(amg_data);
+      HYPRE_Int     i;
+      HYPRE_MemoryLocation memory_location = hypre_ParAMGDataMemoryLocation(amg_data);
 
 #ifdef HYPRE_USING_DSUPERLU
-//   if (hypre_ParAMGDataDSLUThreshold(amg_data) > 0)
-   if (hypre_ParAMGDataDSLUSolver(amg_data) != NULL)
-   {
-      hypre_SLUDistDestroy(hypre_ParAMGDataDSLUSolver(amg_data));
-      hypre_ParAMGDataDSLUSolver(amg_data) = NULL;
-   }
+      // if (hypre_ParAMGDataDSLUThreshold(amg_data) > 0)
+      if (hypre_ParAMGDataDSLUSolver(amg_data) != NULL)
+      {
+         hypre_SLUDistDestroy(hypre_ParAMGDataDSLUSolver(amg_data));
+         hypre_ParAMGDataDSLUSolver(amg_data) = NULL;
+      }
 #endif
 
-   if (hypre_ParAMGDataMaxEigEst(amg_data))
-   {
-      hypre_TFree(hypre_ParAMGDataMaxEigEst(amg_data), HYPRE_MEMORY_HOST);
-      hypre_ParAMGDataMaxEigEst(amg_data) = NULL;
-   }
-   if (hypre_ParAMGDataMinEigEst(amg_data))
-   {
-      hypre_TFree(hypre_ParAMGDataMinEigEst(amg_data), HYPRE_MEMORY_HOST);
-      hypre_ParAMGDataMinEigEst(amg_data) = NULL;
-   }
-   if (hypre_ParAMGDataNumGridSweeps(amg_data))
-   {
-      hypre_TFree(hypre_ParAMGDataNumGridSweeps(amg_data), HYPRE_MEMORY_HOST);
-      hypre_ParAMGDataNumGridSweeps(amg_data) = NULL;
-   }
-   if (grid_relax_type)
-   {
-      HYPRE_Int num_levels = hypre_ParAMGDataNumLevels(amg_data);
-      if (grid_relax_type[1] == 15 || grid_relax_type[3] == 15 )
+      if (hypre_ParAMGDataMaxEigEst(amg_data))
+      {
+         hypre_TFree(hypre_ParAMGDataMaxEigEst(amg_data), HYPRE_MEMORY_HOST);
+         hypre_ParAMGDataMaxEigEst(amg_data) = NULL;
+      }
+      if (hypre_ParAMGDataMinEigEst(amg_data))
+      {
+         hypre_TFree(hypre_ParAMGDataMinEigEst(amg_data), HYPRE_MEMORY_HOST);
+         hypre_ParAMGDataMinEigEst(amg_data) = NULL;
+      }
+      if (hypre_ParAMGDataNumGridSweeps(amg_data))
       {
-         if (grid_relax_type[1] == 15)
-            for (i=0; i < num_levels; i++)
-               HYPRE_ParCSRPCGDestroy(smoother[i]);
-         if (grid_relax_type[3] == 15 && grid_relax_type[1] != 15)
-            HYPRE_ParCSRPCGDestroy(smoother[num_levels-1]);
-         hypre_TFree(smoother, HYPRE_MEMORY_HOST);
+         hypre_TFree(hypre_ParAMGDataNumGridSweeps(amg_data), HYPRE_MEMORY_HOST);
+         hypre_ParAMGDataNumGridSweeps(amg_data) = NULL;
       }
+      if (grid_relax_type)
+      {
+         HYPRE_Int num_levels = hypre_ParAMGDataNumLevels(amg_data);
+         if (grid_relax_type[1] == 15 || grid_relax_type[3] == 15 )
+         {
+            if (grid_relax_type[1] == 15)
+            {
+               for (i = 0; i < num_levels; i++)
+               {
+                  HYPRE_ParCSRPCGDestroy(smoother[i]);
+               }
+            }
+            if (grid_relax_type[3] == 15 && grid_relax_type[1] != 15)
+            {
+               HYPRE_ParCSRPCGDestroy(smoother[num_levels - 1]);
+            }
+            hypre_TFree(smoother, HYPRE_MEMORY_HOST);
+         }
 
-      hypre_TFree(hypre_ParAMGDataGridRelaxType(amg_data), HYPRE_MEMORY_HOST);
-      hypre_ParAMGDataGridRelaxType(amg_data) = NULL;
-   }
-   if (hypre_ParAMGDataRelaxWeight(amg_data))
-   {
-      hypre_TFree(hypre_ParAMGDataRelaxWeight(amg_data), HYPRE_MEMORY_HOST);
-      hypre_ParAMGDataRelaxWeight(amg_data) = NULL;
-   }
-   if (hypre_ParAMGDataOmega(amg_data))
-   {
-      hypre_TFree(hypre_ParAMGDataOmega(amg_data), HYPRE_MEMORY_HOST);
-      hypre_ParAMGDataOmega(amg_data) = NULL;
-   }
-   if (hypre_ParAMGDataNonGalTolArray(amg_data))
-   {
-      hypre_TFree(hypre_ParAMGDataNonGalTolArray(amg_data), HYPRE_MEMORY_HOST);
-      hypre_ParAMGDataNonGalTolArray(amg_data) = NULL;
-   }
-   if (hypre_ParAMGDataDofFunc(amg_data))
-   {
-      hypre_IntArrayDestroy(hypre_ParAMGDataDofFunc(amg_data));
-      hypre_ParAMGDataDofFunc(amg_data) = NULL;
-   }
-   for (i=1; i < num_levels; i++)
-   {
-      hypre_ParVectorDestroy(hypre_ParAMGDataFArray(amg_data)[i]);
-      hypre_ParVectorDestroy(hypre_ParAMGDataUArray(amg_data)[i]);
+         hypre_TFree(hypre_ParAMGDataGridRelaxType(amg_data), HYPRE_MEMORY_HOST);
+         hypre_ParAMGDataGridRelaxType(amg_data) = NULL;
+      }
+      if (hypre_ParAMGDataRelaxWeight(amg_data))
+      {
+         hypre_TFree(hypre_ParAMGDataRelaxWeight(amg_data), HYPRE_MEMORY_HOST);
+         hypre_ParAMGDataRelaxWeight(amg_data) = NULL;
+      }
+      if (hypre_ParAMGDataOmega(amg_data))
+      {
+         hypre_TFree(hypre_ParAMGDataOmega(amg_data), HYPRE_MEMORY_HOST);
+         hypre_ParAMGDataOmega(amg_data) = NULL;
+      }
+      if (hypre_ParAMGDataNonGalTolArray(amg_data))
+      {
+         hypre_TFree(hypre_ParAMGDataNonGalTolArray(amg_data), HYPRE_MEMORY_HOST);
+         hypre_ParAMGDataNonGalTolArray(amg_data) = NULL;
+      }
+      if (hypre_ParAMGDataDofFunc(amg_data))
+      {
+         hypre_IntArrayDestroy(hypre_ParAMGDataDofFunc(amg_data));
+         hypre_ParAMGDataDofFunc(amg_data) = NULL;
+      }
+      for (i = 1; i < num_levels; i++)
+      {
+         hypre_ParVectorDestroy(hypre_ParAMGDataFArray(amg_data)[i]);
+         hypre_ParVectorDestroy(hypre_ParAMGDataUArray(amg_data)[i]);
 
-      if (hypre_ParAMGDataAArray(amg_data)[i])
-         hypre_ParCSRMatrixDestroy(hypre_ParAMGDataAArray(amg_data)[i]);
+         if (hypre_ParAMGDataAArray(amg_data)[i])
+         {
+            hypre_ParCSRMatrixDestroy(hypre_ParAMGDataAArray(amg_data)[i]);
+         }
 
-      if (hypre_ParAMGDataPArray(amg_data)[i-1])
-         hypre_ParCSRMatrixDestroy(hypre_ParAMGDataPArray(amg_data)[i-1]);
+         if (hypre_ParAMGDataPArray(amg_data)[i - 1])
+         {
+            hypre_ParCSRMatrixDestroy(hypre_ParAMGDataPArray(amg_data)[i - 1]);
+         }
 
-      if (hypre_ParAMGDataRestriction(amg_data))
-      {
-         if (hypre_ParAMGDataRArray(amg_data)[i-1])
+         if (hypre_ParAMGDataRestriction(amg_data))
          {
-            hypre_ParCSRMatrixDestroy(hypre_ParAMGDataRArray(amg_data)[i-1]);
+            if (hypre_ParAMGDataRArray(amg_data)[i - 1])
+            {
+               hypre_ParCSRMatrixDestroy(hypre_ParAMGDataRArray(amg_data)[i - 1]);
+            }
          }
-      }
 
-      hypre_IntArrayDestroy(hypre_ParAMGDataCFMarkerArray(amg_data)[i-1]);
+         hypre_IntArrayDestroy(hypre_ParAMGDataCFMarkerArray(amg_data)[i - 1]);
 
-      /* get rid of any block structures */
-      if (hypre_ParAMGDataABlockArray(amg_data)[i])
-         hypre_ParCSRBlockMatrixDestroy(hypre_ParAMGDataABlockArray(amg_data)[i]);
+         /* get rid of any block structures */
+         if (hypre_ParAMGDataABlockArray(amg_data)[i])
+         {
+            hypre_ParCSRBlockMatrixDestroy(hypre_ParAMGDataABlockArray(amg_data)[i]);
+         }
 
-      if (hypre_ParAMGDataPBlockArray(amg_data)[i-1])
-         hypre_ParCSRBlockMatrixDestroy(hypre_ParAMGDataPBlockArray(amg_data)[i-1]);
+         if (hypre_ParAMGDataPBlockArray(amg_data)[i - 1])
+         {
+            hypre_ParCSRBlockMatrixDestroy(hypre_ParAMGDataPBlockArray(amg_data)[i - 1]);
+         }
 
-      /* RL */
-      if (hypre_ParAMGDataRestriction(amg_data))
+         /* RL */
+         if (hypre_ParAMGDataRestriction(amg_data))
+         {
+            if (hypre_ParAMGDataRBlockArray(amg_data)[i - 1])
+            {
+               hypre_ParCSRBlockMatrixDestroy(hypre_ParAMGDataRBlockArray(amg_data)[i - 1]);
+            }
+         }
+      }
+      if (hypre_ParAMGDataGridRelaxPoints(amg_data))
       {
-         if (hypre_ParAMGDataRBlockArray(amg_data)[i-1])
+         for (i = 0; i < 4; i++)
          {
-            hypre_ParCSRBlockMatrixDestroy(hypre_ParAMGDataRBlockArray(amg_data)[i-1]);
+            hypre_TFree(hypre_ParAMGDataGridRelaxPoints(amg_data)[i], HYPRE_MEMORY_HOST);
          }
+         hypre_TFree(hypre_ParAMGDataGridRelaxPoints(amg_data), HYPRE_MEMORY_HOST);
+         hypre_ParAMGDataGridRelaxPoints(amg_data) = NULL;
       }
-   }
-   if (hypre_ParAMGDataGridRelaxPoints(amg_data))
-   {
-      for (i=0; i < 4; i++)
-         hypre_TFree(hypre_ParAMGDataGridRelaxPoints(amg_data)[i], HYPRE_MEMORY_HOST);
-      hypre_TFree(hypre_ParAMGDataGridRelaxPoints(amg_data), HYPRE_MEMORY_HOST);
-      hypre_ParAMGDataGridRelaxPoints(amg_data) = NULL;
-   }
 
-   if (hypre_ParAMGDataLambda(amg_data))
-   {
       hypre_ParCSRMatrixDestroy(hypre_ParAMGDataLambda(amg_data));
-   }
 
-   if (hypre_ParAMGDataAtilde(amg_data))
-   {
-      hypre_ParCSRMatrix *Atilde = hypre_ParAMGDataAtilde(amg_data);
-      hypre_CSRMatrixDestroy(hypre_ParCSRMatrixDiag(Atilde));
-      hypre_CSRMatrixDestroy(hypre_ParCSRMatrixOffd(Atilde));
-      hypre_TFree(Atilde, HYPRE_MEMORY_HOST);
-   }
+      if (hypre_ParAMGDataAtilde(amg_data))
+      {
+         hypre_ParCSRMatrix *Atilde = hypre_ParAMGDataAtilde(amg_data);
+         hypre_CSRMatrixDestroy(hypre_ParCSRMatrixDiag(Atilde));
+         hypre_CSRMatrixDestroy(hypre_ParCSRMatrixOffd(Atilde));
+         hypre_TFree(Atilde, HYPRE_MEMORY_HOST);
+      }
 
-   if (hypre_ParAMGDataXtilde(amg_data))
       hypre_ParVectorDestroy(hypre_ParAMGDataXtilde(amg_data));
-
-   if (hypre_ParAMGDataRtilde(amg_data))
       hypre_ParVectorDestroy(hypre_ParAMGDataRtilde(amg_data));
 
-   if (hypre_ParAMGDataL1Norms(amg_data))
-   {
-      for (i = 0; i < num_levels; i++)
+      if (hypre_ParAMGDataL1Norms(amg_data))
       {
-         hypre_SeqVectorDestroy(hypre_ParAMGDataL1Norms(amg_data)[i]);
+         for (i = 0; i < num_levels; i++)
+         {
+            hypre_SeqVectorDestroy(hypre_ParAMGDataL1Norms(amg_data)[i]);
+         }
+         hypre_TFree(hypre_ParAMGDataL1Norms(amg_data), HYPRE_MEMORY_HOST);
       }
-      hypre_TFree(hypre_ParAMGDataL1Norms(amg_data), HYPRE_MEMORY_HOST);
-   }
 
-   if (hypre_ParAMGDataChebyCoefs(amg_data))
-   {
-      for (i=0; i < num_levels; i++)
-         if (hypre_ParAMGDataChebyCoefs(amg_data)[i])
-            hypre_TFree(hypre_ParAMGDataChebyCoefs(amg_data)[i], HYPRE_MEMORY_HOST);
-      hypre_TFree(hypre_ParAMGDataChebyCoefs(amg_data), HYPRE_MEMORY_HOST);
-   }
+      if (hypre_ParAMGDataChebyCoefs(amg_data))
+      {
+         for (i = 0; i < num_levels; i++)
+         {
+            if (hypre_ParAMGDataChebyCoefs(amg_data)[i])
+            {
+               hypre_TFree(hypre_ParAMGDataChebyCoefs(amg_data)[i], HYPRE_MEMORY_HOST);
+            }
+         }
+         hypre_TFree(hypre_ParAMGDataChebyCoefs(amg_data), HYPRE_MEMORY_HOST);
+      }
 
-   if (hypre_ParAMGDataChebyDS(amg_data))
-   {
-      for (i=0; i < num_levels; i++)
-         hypre_SeqVectorDestroy(hypre_ParAMGDataChebyDS(amg_data)[i]);
-      hypre_TFree(hypre_ParAMGDataChebyDS(amg_data), HYPRE_MEMORY_HOST);
-   }
+      if (hypre_ParAMGDataChebyDS(amg_data))
+      {
+         for (i = 0; i < num_levels; i++)
+         {
+            hypre_SeqVectorDestroy(hypre_ParAMGDataChebyDS(amg_data)[i]);
+         }
+         hypre_TFree(hypre_ParAMGDataChebyDS(amg_data), HYPRE_MEMORY_HOST);
+      }
 
-   if (hypre_ParAMGDataDinv(amg_data))
       hypre_TFree(hypre_ParAMGDataDinv(amg_data), HYPRE_MEMORY_HOST);
 
-   /* get rid of a fine level block matrix */
-   if (hypre_ParAMGDataABlockArray(amg_data))
-      if (hypre_ParAMGDataABlockArray(amg_data)[0])
-         hypre_ParCSRBlockMatrixDestroy(hypre_ParAMGDataABlockArray(amg_data)[0]);
-
+      /* get rid of a fine level block matrix */
+      if (hypre_ParAMGDataABlockArray(amg_data))
+      {
+         if (hypre_ParAMGDataABlockArray(amg_data)[0])
+         {
+            hypre_ParCSRBlockMatrixDestroy(hypre_ParAMGDataABlockArray(amg_data)[0]);
+         }
+      }
 
-   /* see comments in par_coarsen.c regarding special case for CF_marker */
-   if (num_levels == 1)
-   {
-      hypre_IntArrayDestroy(hypre_ParAMGDataCFMarkerArray(amg_data)[0]);
-   }
-   hypre_ParVectorDestroy(hypre_ParAMGDataVtemp(amg_data));
-   hypre_TFree(hypre_ParAMGDataFArray(amg_data), HYPRE_MEMORY_HOST);
-   hypre_TFree(hypre_ParAMGDataUArray(amg_data), HYPRE_MEMORY_HOST);
-   hypre_TFree(hypre_ParAMGDataAArray(amg_data), HYPRE_MEMORY_HOST);
-   hypre_TFree(hypre_ParAMGDataABlockArray(amg_data), HYPRE_MEMORY_HOST);
-   hypre_TFree(hypre_ParAMGDataPBlockArray(amg_data), HYPRE_MEMORY_HOST);
-   hypre_TFree(hypre_ParAMGDataPArray(amg_data), HYPRE_MEMORY_HOST);
-   hypre_TFree(hypre_ParAMGDataCFMarkerArray(amg_data), HYPRE_MEMORY_HOST);
+      /* see comments in par_coarsen.c regarding special case for CF_marker */
+      if (num_levels == 1)
+      {
+         hypre_IntArrayDestroy(hypre_ParAMGDataCFMarkerArray(amg_data)[0]);
+      }
 
-   if (hypre_ParAMGDataRtemp(amg_data))
+      hypre_ParVectorDestroy(hypre_ParAMGDataVtemp(amg_data));
+      hypre_TFree(hypre_ParAMGDataFArray(amg_data), HYPRE_MEMORY_HOST);
+      hypre_TFree(hypre_ParAMGDataUArray(amg_data), HYPRE_MEMORY_HOST);
+      hypre_TFree(hypre_ParAMGDataAArray(amg_data), HYPRE_MEMORY_HOST);
+      hypre_TFree(hypre_ParAMGDataABlockArray(amg_data), HYPRE_MEMORY_HOST);
+      hypre_TFree(hypre_ParAMGDataPBlockArray(amg_data), HYPRE_MEMORY_HOST);
+      hypre_TFree(hypre_ParAMGDataPArray(amg_data), HYPRE_MEMORY_HOST);
+      hypre_TFree(hypre_ParAMGDataCFMarkerArray(amg_data), HYPRE_MEMORY_HOST);
       hypre_ParVectorDestroy(hypre_ParAMGDataRtemp(amg_data));
-   if (hypre_ParAMGDataPtemp(amg_data))
       hypre_ParVectorDestroy(hypre_ParAMGDataPtemp(amg_data));
-   if (hypre_ParAMGDataZtemp(amg_data))
       hypre_ParVectorDestroy(hypre_ParAMGDataZtemp(amg_data));
 
-   if (hypre_ParAMGDataDofFuncArray(amg_data))
-   {
-      for (i=1; i < num_levels; i++)
-         hypre_IntArrayDestroy(hypre_ParAMGDataDofFuncArray(amg_data)[i]);
-      hypre_TFree(hypre_ParAMGDataDofFuncArray(amg_data), HYPRE_MEMORY_HOST);
-      hypre_ParAMGDataDofFuncArray(amg_data) = NULL;
-   }
-   if (hypre_ParAMGDataRestriction(amg_data))
-   {
-      hypre_TFree(hypre_ParAMGDataRBlockArray(amg_data),HYPRE_MEMORY_HOST);
-      hypre_TFree(hypre_ParAMGDataRArray(amg_data),HYPRE_MEMORY_HOST);
-      hypre_ParAMGDataRArray(amg_data) = NULL;
-   }
-   if (hypre_ParAMGDataDofPointArray(amg_data))
-   {
-      for (i=0; i < num_levels; i++)
-         hypre_TFree(hypre_ParAMGDataDofPointArray(amg_data)[i], HYPRE_MEMORY_HOST);
-      hypre_TFree(hypre_ParAMGDataDofPointArray(amg_data), HYPRE_MEMORY_HOST);
-      hypre_ParAMGDataDofPointArray(amg_data) = NULL;
-   }
-   if (hypre_ParAMGDataPointDofMapArray(amg_data))
-   {
-      for (i=0; i < num_levels; i++)
-         hypre_TFree(hypre_ParAMGDataPointDofMapArray(amg_data)[i], HYPRE_MEMORY_HOST);
-      hypre_TFree(hypre_ParAMGDataPointDofMapArray(amg_data), HYPRE_MEMORY_HOST);
-      hypre_ParAMGDataPointDofMapArray(amg_data) = NULL;
-   }
-
-   if (smooth_num_levels)
-   {
-      if (hypre_ParAMGDataSmoothType(amg_data) == 7 || hypre_ParAMGDataSmoothType(amg_data) == 17)
+      if (hypre_ParAMGDataDofFuncArray(amg_data))
       {
-         for (i=0; i < smooth_num_levels; i++)
+         for (i = 1; i < num_levels; i++)
          {
-            HYPRE_ParCSRPilutDestroy(smoother[i]);
+            hypre_IntArrayDestroy(hypre_ParAMGDataDofFuncArray(amg_data)[i]);
          }
+         hypre_TFree(hypre_ParAMGDataDofFuncArray(amg_data), HYPRE_MEMORY_HOST);
+         hypre_ParAMGDataDofFuncArray(amg_data) = NULL;
       }
-      else if (hypre_ParAMGDataSmoothType(amg_data) == 8 || hypre_ParAMGDataSmoothType(amg_data) == 18)
+      if (hypre_ParAMGDataRestriction(amg_data))
       {
-         for (i=0; i < smooth_num_levels; i++)
-         {
-            HYPRE_ParCSRParaSailsDestroy(smoother[i]);
-         }
+         hypre_TFree(hypre_ParAMGDataRBlockArray(amg_data), HYPRE_MEMORY_HOST);
+         hypre_TFree(hypre_ParAMGDataRArray(amg_data), HYPRE_MEMORY_HOST);
+         hypre_ParAMGDataRArray(amg_data) = NULL;
       }
-      else if (hypre_ParAMGDataSmoothType(amg_data) == 9 || hypre_ParAMGDataSmoothType(amg_data) == 19 )
+      if (hypre_ParAMGDataDofPointArray(amg_data))
       {
-         for (i=0; i < smooth_num_levels; i++)
+         for (i = 0; i < num_levels; i++)
          {
-            HYPRE_EuclidDestroy(smoother[i]);
+            hypre_TFree(hypre_ParAMGDataDofPointArray(amg_data)[i], HYPRE_MEMORY_HOST);
          }
+         hypre_TFree(hypre_ParAMGDataDofPointArray(amg_data), HYPRE_MEMORY_HOST);
+         hypre_ParAMGDataDofPointArray(amg_data) = NULL;
       }
-      else if (hypre_ParAMGDataSmoothType(amg_data) == 5 || hypre_ParAMGDataSmoothType(amg_data) == 15 )
+      if (hypre_ParAMGDataPointDofMapArray(amg_data))
       {
-         for (i=0; i < smooth_num_levels; i++)
+         for (i = 0; i < num_levels; i++)
          {
-            HYPRE_ILUDestroy(smoother[i]);
+            hypre_TFree(hypre_ParAMGDataPointDofMapArray(amg_data)[i], HYPRE_MEMORY_HOST);
          }
+         hypre_TFree(hypre_ParAMGDataPointDofMapArray(amg_data), HYPRE_MEMORY_HOST);
+         hypre_ParAMGDataPointDofMapArray(amg_data) = NULL;
       }
-      else if (hypre_ParAMGDataSmoothType(amg_data) == 6 || hypre_ParAMGDataSmoothType(amg_data) == 16)
+
+      if (smooth_num_levels)
       {
-         for (i=0; i < smooth_num_levels; i++)
+         if ( hypre_ParAMGDataSmoothType(amg_data) == 7 ||
+              hypre_ParAMGDataSmoothType(amg_data) == 17 )
+         {
+            for (i = 0; i < smooth_num_levels; i++)
+            {
+               HYPRE_ParCSRPilutDestroy(smoother[i]);
+            }
+         }
+         else if ( hypre_ParAMGDataSmoothType(amg_data) == 8 ||
+                   hypre_ParAMGDataSmoothType(amg_data) == 18 )
+         {
+            for (i = 0; i < smooth_num_levels; i++)
+            {
+               HYPRE_ParCSRParaSailsDestroy(smoother[i]);
+            }
+         }
+         else if ( hypre_ParAMGDataSmoothType(amg_data) == 9 ||
+                   hypre_ParAMGDataSmoothType(amg_data) == 19 )
+         {
+            for (i = 0; i < smooth_num_levels; i++)
+            {
+               HYPRE_EuclidDestroy(smoother[i]);
+            }
+         }
+         else if ( hypre_ParAMGDataSmoothType(amg_data) == 4 )
+         {
+            for (i = 0; i < smooth_num_levels; i++)
+            {
+               HYPRE_FSAIDestroy(smoother[i]);
+            }
+         }
+         else if ( hypre_ParAMGDataSmoothType(amg_data) == 5 ||
+                   hypre_ParAMGDataSmoothType(amg_data) == 15 )
+         {
+            for (i = 0; i < smooth_num_levels; i++)
+            {
+               HYPRE_ILUDestroy(smoother[i]);
+            }
+         }
+         else if ( hypre_ParAMGDataSmoothType(amg_data) == 6 ||
+                   hypre_ParAMGDataSmoothType(amg_data) == 16 )
          {
-            HYPRE_SchwarzDestroy(smoother[i]);
+            for (i = 0; i < smooth_num_levels; i++)
+            {
+               HYPRE_SchwarzDestroy(smoother[i]);
+            }
          }
+         hypre_TFree(hypre_ParAMGDataSmoother(amg_data), HYPRE_MEMORY_HOST);
       }
-      hypre_TFree(hypre_ParAMGDataSmoother(amg_data), HYPRE_MEMORY_HOST);
-   }
-   if ( hypre_ParAMGDataResidual(amg_data) ) {
-      /* jfp: was... hypre_TFree( hypre_ParAMGDataResidual(amg_data) );*/
-      hypre_ParVectorDestroy( hypre_ParAMGDataResidual(amg_data) );
+      hypre_ParVectorDestroy(hypre_ParAMGDataResidual(amg_data));
       hypre_ParAMGDataResidual(amg_data) = NULL;
-   }
 
+      if ( hypre_ParAMGInterpVecVariant(amg_data) > 0 &&
+           hypre_ParAMGNumInterpVectors(amg_data) > 0)
+      {
+         HYPRE_Int         num_vecs =  hypre_ParAMGNumInterpVectors(amg_data);
+         hypre_ParVector **sm_vecs;
+         HYPRE_Int         j, num_il;
 
-   if (hypre_ParAMGInterpVecVariant(amg_data) > 0
-         &&  hypre_ParAMGNumInterpVectors(amg_data) > 0)
-   {
-
-      HYPRE_Int j;
-      HYPRE_Int num_vecs =  hypre_ParAMGNumInterpVectors(amg_data);
-      hypre_ParVector **sm_vecs;
-      HYPRE_Int num_il;
-      num_il = hypre_min(hypre_ParAMGNumLevelsInterpVectors(amg_data),num_levels);
+         num_il = hypre_min(hypre_ParAMGNumLevelsInterpVectors(amg_data), num_levels);
 
-      /* don't destroy lev = 0 - this was user input */
-      for (i = 1; i< num_il; i++)
-      {
-         sm_vecs = hypre_ParAMGInterpVectorsArray(amg_data)[i];
-         for (j = 0; j< num_vecs; j++)
+         /* don't destroy lev = 0 - this was user input */
+         for (i = 1; i < num_il; i++)
          {
-            hypre_ParVectorDestroy(sm_vecs[j]);
+            sm_vecs = hypre_ParAMGInterpVectorsArray(amg_data)[i];
+            for (j = 0; j < num_vecs; j++)
+            {
+               hypre_ParVectorDestroy(sm_vecs[j]);
+            }
+            hypre_TFree(sm_vecs, HYPRE_MEMORY_HOST);
          }
-         hypre_TFree(sm_vecs, HYPRE_MEMORY_HOST);
+         hypre_TFree(hypre_ParAMGInterpVectorsArray(amg_data), HYPRE_MEMORY_HOST);
       }
-      hypre_TFree( hypre_ParAMGInterpVectorsArray(amg_data), HYPRE_MEMORY_HOST);
 
-   }
-
-   if (amg) hypre_BoomerAMGDestroy(amg);
-
-   if (hypre_ParAMGDataACoarse(amg_data))
+      hypre_BoomerAMGDestroy(amg);
       hypre_ParCSRMatrixDestroy(hypre_ParAMGDataACoarse(amg_data));
-
-   if (hypre_ParAMGDataUCoarse(amg_data))
       hypre_ParVectorDestroy(hypre_ParAMGDataUCoarse(amg_data));
-
-   if (hypre_ParAMGDataFCoarse(amg_data))
       hypre_ParVectorDestroy(hypre_ParAMGDataFCoarse(amg_data));
 
-   /* destroy input CF_marker data */
-   if (hypre_ParAMGDataCPointsMarker(amg_data))
-   {
-      hypre_TFree(hypre_ParAMGDataCPointsMarker(amg_data), HYPRE_MEMORY_HOST);
-   }
-   if (hypre_ParAMGDataCPointsLocalMarker(amg_data))
-   {
-      hypre_TFree(hypre_ParAMGDataCPointsLocalMarker(amg_data), HYPRE_MEMORY_HOST);
-   }
-   if (hypre_ParAMGDataFPointsMarker(amg_data))
-   {
+      /* destroy input CF_marker data */
+      hypre_TFree(hypre_ParAMGDataCPointsMarker(amg_data), memory_location);
+      hypre_TFree(hypre_ParAMGDataCPointsLocalMarker(amg_data), memory_location);
       hypre_TFree(hypre_ParAMGDataFPointsMarker(amg_data), HYPRE_MEMORY_HOST);
-   }
-   if (hypre_ParAMGDataIsolatedFPointsMarker(amg_data))
-   {
       hypre_TFree(hypre_ParAMGDataIsolatedFPointsMarker(amg_data), HYPRE_MEMORY_HOST);
-   }
-
-   if (hypre_ParAMGDataAMat(amg_data)) hypre_TFree(hypre_ParAMGDataAMat(amg_data), HYPRE_MEMORY_HOST);
-   if (hypre_ParAMGDataAInv(amg_data)) hypre_TFree(hypre_ParAMGDataAInv(amg_data), HYPRE_MEMORY_HOST);
-   if (hypre_ParAMGDataBVec(amg_data)) hypre_TFree(hypre_ParAMGDataBVec(amg_data), HYPRE_MEMORY_HOST);
-   if (hypre_ParAMGDataCommInfo(amg_data)) hypre_TFree(hypre_ParAMGDataCommInfo(amg_data), HYPRE_MEMORY_HOST);
 
-   if (new_comm != hypre_MPI_COMM_NULL)
-   {
-      hypre_MPI_Comm_free (&new_comm);
-   }
+      /* Direct solver for the coarsest level */
+#if defined(HYPRE_USING_MAGMA)
+      hypre_TFree(hypre_ParAMGDataAPiv(amg_data),  HYPRE_MEMORY_HOST);
+#else
+      hypre_TFree(hypre_ParAMGDataAPiv(amg_data),  hypre_ParAMGDataGEMemoryLocation(amg_data));
+#endif
+      hypre_TFree(hypre_ParAMGDataAMat(amg_data),  hypre_ParAMGDataGEMemoryLocation(amg_data));
+      hypre_TFree(hypre_ParAMGDataAWork(amg_data), hypre_ParAMGDataGEMemoryLocation(amg_data));
+      hypre_TFree(hypre_ParAMGDataBVec(amg_data),  hypre_ParAMGDataGEMemoryLocation(amg_data));
+      hypre_TFree(hypre_ParAMGDataUVec(amg_data),  hypre_ParAMGDataGEMemoryLocation(amg_data));
+      hypre_TFree(hypre_ParAMGDataCommInfo(amg_data), HYPRE_MEMORY_HOST);
 
-   hypre_TFree(amg_data, HYPRE_MEMORY_HOST);
+      if (new_comm != hypre_MPI_COMM_NULL)
+      {
+         hypre_MPI_Comm_free(&new_comm);
+      }
 
+      hypre_TFree(amg_data, HYPRE_MEMORY_HOST);
+   }
    HYPRE_ANNOTATE_FUNC_END;
 
    return hypre_error_flag;
@@ -900,7 +996,7 @@ hypre_BoomerAMGSetGMRESSwitchR(void *data,
 
 HYPRE_Int
 hypre_BoomerAMGSetMaxLevels( void *data,
-                          HYPRE_Int   max_levels )
+                             HYPRE_Int   max_levels )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
    HYPRE_Int old_max_levels;
@@ -927,8 +1023,10 @@ hypre_BoomerAMGSetMaxLevels( void *data,
       {
          relax_wt = hypre_ParAMGDataUserRelaxWeight(amg_data);
          relax_weight = hypre_TReAlloc(relax_weight,  HYPRE_Real,  max_levels, HYPRE_MEMORY_HOST);
-         for (i=old_max_levels; i < max_levels; i++)
+         for (i = old_max_levels; i < max_levels; i++)
+         {
             relax_weight[i] = relax_wt;
+         }
          hypre_ParAMGDataRelaxWeight(amg_data) = relax_weight;
       }
       omega = hypre_ParAMGDataOmega(amg_data);
@@ -936,8 +1034,10 @@ hypre_BoomerAMGSetMaxLevels( void *data,
       {
          outer_wt = hypre_ParAMGDataOuterWt(amg_data);
          omega = hypre_TReAlloc(omega,  HYPRE_Real,  max_levels, HYPRE_MEMORY_HOST);
-         for (i=old_max_levels; i < max_levels; i++)
+         for (i = old_max_levels; i < max_levels; i++)
+         {
             omega[i] = outer_wt;
+         }
          hypre_ParAMGDataOmega(amg_data) = omega;
       }
       nongal_tol_array = hypre_ParAMGDataNonGalTolArray(amg_data);
@@ -945,8 +1045,10 @@ hypre_BoomerAMGSetMaxLevels( void *data,
       {
          nongalerkin_tol = hypre_ParAMGDataNonGalerkinTol(amg_data);
          nongal_tol_array = hypre_TReAlloc(nongal_tol_array,  HYPRE_Real,  max_levels, HYPRE_MEMORY_HOST);
-         for (i=old_max_levels; i < max_levels; i++)
+         for (i = old_max_levels; i < max_levels; i++)
+         {
             nongal_tol_array[i] = nongalerkin_tol;
+         }
          hypre_ParAMGDataNonGalTolArray(amg_data) = nongal_tol_array;
       }
    }
@@ -974,7 +1076,7 @@ hypre_BoomerAMGGetMaxLevels( void *data,
 
 HYPRE_Int
 hypre_BoomerAMGSetMaxCoarseSize( void *data,
-                          HYPRE_Int   max_coarse_size )
+                                 HYPRE_Int   max_coarse_size )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -997,7 +1099,7 @@ hypre_BoomerAMGSetMaxCoarseSize( void *data,
 
 HYPRE_Int
 hypre_BoomerAMGGetMaxCoarseSize( void *data,
-                             HYPRE_Int *  max_coarse_size )
+                                 HYPRE_Int *  max_coarse_size )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -1014,7 +1116,7 @@ hypre_BoomerAMGGetMaxCoarseSize( void *data,
 
 HYPRE_Int
 hypre_BoomerAMGSetMinCoarseSize( void *data,
-                          HYPRE_Int   min_coarse_size )
+                                 HYPRE_Int   min_coarse_size )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -1037,7 +1139,7 @@ hypre_BoomerAMGSetMinCoarseSize( void *data,
 
 HYPRE_Int
 hypre_BoomerAMGGetMinCoarseSize( void *data,
-                             HYPRE_Int *  min_coarse_size )
+                                 HYPRE_Int *  min_coarse_size )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -1054,7 +1156,7 @@ hypre_BoomerAMGGetMinCoarseSize( void *data,
 
 HYPRE_Int
 hypre_BoomerAMGSetSeqThreshold( void *data,
-                          HYPRE_Int   seq_threshold )
+                                HYPRE_Int   seq_threshold )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -1077,7 +1179,7 @@ hypre_BoomerAMGSetSeqThreshold( void *data,
 
 HYPRE_Int
 hypre_BoomerAMGGetSeqThreshold( void *data,
-                             HYPRE_Int *  seq_threshold )
+                                HYPRE_Int *  seq_threshold )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -1094,7 +1196,7 @@ hypre_BoomerAMGGetSeqThreshold( void *data,
 
 HYPRE_Int
 hypre_BoomerAMGSetRedundant( void *data,
-                          HYPRE_Int   redundant )
+                             HYPRE_Int   redundant )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -1174,7 +1276,7 @@ hypre_BoomerAMGGetCoarsenCutFactor( void       *data,
 
 HYPRE_Int
 hypre_BoomerAMGSetStrongThreshold( void     *data,
-                                HYPRE_Real    strong_threshold )
+                                   HYPRE_Real    strong_threshold )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -1197,7 +1299,7 @@ hypre_BoomerAMGSetStrongThreshold( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGGetStrongThreshold( void     *data,
-                                HYPRE_Real *  strong_threshold )
+                                   HYPRE_Real *  strong_threshold )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -1311,7 +1413,7 @@ hypre_BoomerAMGSetSabs( void         *data,
 
 HYPRE_Int
 hypre_BoomerAMGSetMaxRowSum( void     *data,
-                          HYPRE_Real    max_row_sum )
+                             HYPRE_Real    max_row_sum )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -1334,7 +1436,7 @@ hypre_BoomerAMGSetMaxRowSum( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGGetMaxRowSum( void     *data,
-                          HYPRE_Real *  max_row_sum )
+                             HYPRE_Real *  max_row_sum )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -1351,7 +1453,7 @@ hypre_BoomerAMGGetMaxRowSum( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGSetTruncFactor( void     *data,
-                            HYPRE_Real    trunc_factor )
+                               HYPRE_Real    trunc_factor )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -1374,7 +1476,7 @@ hypre_BoomerAMGSetTruncFactor( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGGetTruncFactor( void     *data,
-                            HYPRE_Real *  trunc_factor )
+                               HYPRE_Real *  trunc_factor )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -1391,7 +1493,7 @@ hypre_BoomerAMGGetTruncFactor( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGSetPMaxElmts( void     *data,
-                            HYPRE_Int    P_max_elmts )
+                             HYPRE_Int    P_max_elmts )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -1414,7 +1516,7 @@ hypre_BoomerAMGSetPMaxElmts( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGGetPMaxElmts( void     *data,
-                            HYPRE_Int *  P_max_elmts )
+                             HYPRE_Int *  P_max_elmts )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -1431,7 +1533,7 @@ hypre_BoomerAMGGetPMaxElmts( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGSetJacobiTruncThreshold( void     *data,
-                            HYPRE_Real    jacobi_trunc_threshold )
+                                        HYPRE_Real    jacobi_trunc_threshold )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -1454,7 +1556,7 @@ hypre_BoomerAMGSetJacobiTruncThreshold( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGGetJacobiTruncThreshold( void     *data,
-                            HYPRE_Real *  jacobi_trunc_threshold )
+                                        HYPRE_Real *  jacobi_trunc_threshold )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -1511,7 +1613,7 @@ hypre_BoomerAMGGetPostInterpType( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGSetInterpType( void     *data,
-                           HYPRE_Int       interp_type )
+                              HYPRE_Int       interp_type )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -1536,7 +1638,7 @@ hypre_BoomerAMGSetInterpType( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGGetInterpType( void     *data,
-                           HYPRE_Int *     interp_type )
+                              HYPRE_Int *     interp_type )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -1553,7 +1655,7 @@ hypre_BoomerAMGGetInterpType( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGSetSepWeight( void     *data,
-                           HYPRE_Int       sep_weight )
+                             HYPRE_Int       sep_weight )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -1570,7 +1672,7 @@ hypre_BoomerAMGSetSepWeight( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGSetMinIter( void     *data,
-                        HYPRE_Int       min_iter )
+                           HYPRE_Int       min_iter )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -1587,7 +1689,7 @@ hypre_BoomerAMGSetMinIter( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGGetMinIter( void     *data,
-                        HYPRE_Int *     min_iter )
+                           HYPRE_Int *     min_iter )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -1604,7 +1706,7 @@ hypre_BoomerAMGGetMinIter( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGSetMaxIter( void     *data,
-                        HYPRE_Int     max_iter )
+                           HYPRE_Int     max_iter )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -1627,7 +1729,7 @@ hypre_BoomerAMGSetMaxIter( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGGetMaxIter( void     *data,
-                        HYPRE_Int *   max_iter )
+                           HYPRE_Int *   max_iter )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -1644,7 +1746,7 @@ hypre_BoomerAMGGetMaxIter( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGSetCoarsenType( void  *data,
-                          HYPRE_Int    coarsen_type )
+                               HYPRE_Int    coarsen_type )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -1661,7 +1763,7 @@ hypre_BoomerAMGSetCoarsenType( void  *data,
 
 HYPRE_Int
 hypre_BoomerAMGGetCoarsenType( void  *data,
-                          HYPRE_Int *  coarsen_type )
+                               HYPRE_Int *  coarsen_type )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -1678,7 +1780,7 @@ hypre_BoomerAMGGetCoarsenType( void  *data,
 
 HYPRE_Int
 hypre_BoomerAMGSetMeasureType( void  *data,
-                            HYPRE_Int    measure_type )
+                               HYPRE_Int    measure_type )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -1695,7 +1797,7 @@ hypre_BoomerAMGSetMeasureType( void  *data,
 
 HYPRE_Int
 hypre_BoomerAMGGetMeasureType( void  *data,
-                            HYPRE_Int *  measure_type )
+                               HYPRE_Int *  measure_type )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -1746,7 +1848,7 @@ hypre_BoomerAMGGetSetupType( void  *data,
 
 HYPRE_Int
 hypre_BoomerAMGSetCycleType( void  *data,
-                          HYPRE_Int    cycle_type )
+                             HYPRE_Int    cycle_type )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -1769,7 +1871,7 @@ hypre_BoomerAMGSetCycleType( void  *data,
 
 HYPRE_Int
 hypre_BoomerAMGGetCycleType( void  *data,
-                          HYPRE_Int *  cycle_type )
+                             HYPRE_Int *  cycle_type )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -1888,7 +1990,7 @@ hypre_BoomerAMGSetTol( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGGetTol( void     *data,
-                    HYPRE_Real *  tol  )
+                       HYPRE_Real *  tol  )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -1906,7 +2008,7 @@ hypre_BoomerAMGGetTol( void     *data,
 /* The "Get" function for SetNumSweeps is GetCycleNumSweeps. */
 HYPRE_Int
 hypre_BoomerAMGSetNumSweeps( void     *data,
-                              HYPRE_Int      num_sweeps )
+                             HYPRE_Int      num_sweeps )
 {
    HYPRE_Int i;
    HYPRE_Int *num_grid_sweeps;
@@ -1925,12 +2027,16 @@ hypre_BoomerAMGSetNumSweeps( void     *data,
    }
 
    if (hypre_ParAMGDataNumGridSweeps(amg_data) == NULL)
-       hypre_ParAMGDataNumGridSweeps(amg_data) = hypre_CTAlloc(HYPRE_Int, 4, HYPRE_MEMORY_HOST);
+   {
+      hypre_ParAMGDataNumGridSweeps(amg_data) = hypre_CTAlloc(HYPRE_Int, 4, HYPRE_MEMORY_HOST);
+   }
 
    num_grid_sweeps = hypre_ParAMGDataNumGridSweeps(amg_data);
 
-   for (i=0; i < 3; i++)
+   for (i = 0; i < 3; i++)
+   {
       num_grid_sweeps[i] = num_sweeps;
+   }
    num_grid_sweeps[3] = 1;
 
    hypre_ParAMGDataUserNumSweeps(amg_data) = num_sweeps;
@@ -1967,10 +2073,12 @@ hypre_BoomerAMGSetCycleNumSweeps( void     *data,
 
    if (hypre_ParAMGDataNumGridSweeps(amg_data) == NULL)
    {
-       num_grid_sweeps = hypre_CTAlloc(HYPRE_Int, 4, HYPRE_MEMORY_HOST);
-       for (i=0; i < 4; i++)
-          num_grid_sweeps[i] = 1;
-       hypre_ParAMGDataNumGridSweeps(amg_data) = num_grid_sweeps;
+      num_grid_sweeps = hypre_CTAlloc(HYPRE_Int, 4, HYPRE_MEMORY_HOST);
+      for (i = 0; i < 4; i++)
+      {
+         num_grid_sweeps[i] = 1;
+      }
+      hypre_ParAMGDataNumGridSweeps(amg_data) = num_grid_sweeps;
    }
 
    hypre_ParAMGDataNumGridSweeps(amg_data)[k] = num_sweeps;
@@ -2009,7 +2117,7 @@ hypre_BoomerAMGGetCycleNumSweeps( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGSetNumGridSweeps( void     *data,
-                              HYPRE_Int      *num_grid_sweeps )
+                                 HYPRE_Int      *num_grid_sweeps )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -2025,7 +2133,9 @@ hypre_BoomerAMGSetNumGridSweeps( void     *data,
    }
 
    if (hypre_ParAMGDataNumGridSweeps(amg_data))
+   {
       hypre_TFree(hypre_ParAMGDataNumGridSweeps(amg_data), HYPRE_MEMORY_HOST);
+   }
    hypre_ParAMGDataNumGridSweeps(amg_data) = num_grid_sweeps;
 
    return hypre_error_flag;
@@ -2033,7 +2143,7 @@ hypre_BoomerAMGSetNumGridSweeps( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGGetNumGridSweeps( void     *data,
-                              HYPRE_Int    ** num_grid_sweeps )
+                                 HYPRE_Int    ** num_grid_sweeps )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -2050,7 +2160,7 @@ hypre_BoomerAMGGetNumGridSweeps( void     *data,
 /* The "Get" function for SetRelaxType is GetCycleRelaxType. */
 HYPRE_Int
 hypre_BoomerAMGSetRelaxType( void     *data,
-                              HYPRE_Int      relax_type )
+                             HYPRE_Int      relax_type )
 {
    HYPRE_Int i;
    HYPRE_Int *grid_relax_type;
@@ -2068,11 +2178,15 @@ hypre_BoomerAMGSetRelaxType( void     *data,
    }
 
    if (hypre_ParAMGDataGridRelaxType(amg_data) == NULL)
-       hypre_ParAMGDataGridRelaxType(amg_data) = hypre_CTAlloc(HYPRE_Int, 4, HYPRE_MEMORY_HOST);
+   {
+      hypre_ParAMGDataGridRelaxType(amg_data) = hypre_CTAlloc(HYPRE_Int, 4, HYPRE_MEMORY_HOST);
+   }
    grid_relax_type = hypre_ParAMGDataGridRelaxType(amg_data);
 
-   for (i=0; i < 3; i++)
+   for (i = 0; i < 3; i++)
+   {
       grid_relax_type[i] = relax_type;
+   }
    grid_relax_type[3] = 9;
    hypre_ParAMGDataUserCoarseRelaxType(amg_data) = 9;
    hypre_ParAMGDataUserRelaxType(amg_data) = relax_type;
@@ -2108,7 +2222,7 @@ hypre_BoomerAMGSetCycleRelaxType( void     *data,
    if (hypre_ParAMGDataGridRelaxType(amg_data) == NULL)
    {
       grid_relax_type = hypre_CTAlloc(HYPRE_Int, 4, HYPRE_MEMORY_HOST);
-      for (i=0; i < 3; i++)
+      for (i = 0; i < 3; i++)
       {
          grid_relax_type[i] = 3;
       }
@@ -2188,7 +2302,7 @@ hypre_BoomerAMGGetRelaxOrder( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGSetGridRelaxType( void     *data,
-                              HYPRE_Int      *grid_relax_type )
+                                 HYPRE_Int      *grid_relax_type )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -2204,7 +2318,9 @@ hypre_BoomerAMGSetGridRelaxType( void     *data,
    }
 
    if (hypre_ParAMGDataGridRelaxType(amg_data))
+   {
       hypre_TFree(hypre_ParAMGDataGridRelaxType(amg_data), HYPRE_MEMORY_HOST);
+   }
    hypre_ParAMGDataGridRelaxType(amg_data) = grid_relax_type;
    hypre_ParAMGDataUserCoarseRelaxType(amg_data) = grid_relax_type[3];
 
@@ -2213,7 +2329,7 @@ hypre_BoomerAMGSetGridRelaxType( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGGetGridRelaxType( void     *data,
-                              HYPRE_Int    ** grid_relax_type )
+                                 HYPRE_Int    ** grid_relax_type )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -2229,7 +2345,7 @@ hypre_BoomerAMGGetGridRelaxType( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGSetGridRelaxPoints( void     *data,
-                                HYPRE_Int      **grid_relax_points )
+                                   HYPRE_Int      **grid_relax_points )
 {
    HYPRE_Int i;
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
@@ -2247,8 +2363,10 @@ hypre_BoomerAMGSetGridRelaxPoints( void     *data,
 
    if (hypre_ParAMGDataGridRelaxPoints(amg_data))
    {
-      for (i=0; i < 4; i++)
-    hypre_TFree(hypre_ParAMGDataGridRelaxPoints(amg_data)[i], HYPRE_MEMORY_HOST);
+      for (i = 0; i < 4; i++)
+      {
+         hypre_TFree(hypre_ParAMGDataGridRelaxPoints(amg_data)[i], HYPRE_MEMORY_HOST);
+      }
       hypre_TFree(hypre_ParAMGDataGridRelaxPoints(amg_data), HYPRE_MEMORY_HOST);
    }
    hypre_ParAMGDataGridRelaxPoints(amg_data) = grid_relax_points;
@@ -2258,7 +2376,7 @@ hypre_BoomerAMGSetGridRelaxPoints( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGGetGridRelaxPoints( void     *data,
-                                HYPRE_Int    *** grid_relax_points )
+                                   HYPRE_Int    *** grid_relax_points )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -2290,7 +2408,9 @@ hypre_BoomerAMGSetRelaxWeight( void     *data,
    }
 
    if (hypre_ParAMGDataRelaxWeight(amg_data))
+   {
       hypre_TFree(hypre_ParAMGDataRelaxWeight(amg_data), HYPRE_MEMORY_HOST);
+   }
    hypre_ParAMGDataRelaxWeight(amg_data) = relax_weight;
 
    return hypre_error_flag;
@@ -2327,11 +2447,15 @@ hypre_BoomerAMGSetRelaxWt( void     *data,
    }
    num_levels = hypre_ParAMGDataMaxLevels(amg_data);
    if (hypre_ParAMGDataRelaxWeight(amg_data) == NULL)
+   {
       hypre_ParAMGDataRelaxWeight(amg_data) = hypre_CTAlloc(HYPRE_Real, num_levels, HYPRE_MEMORY_HOST);
+   }
 
    relax_weight_array = hypre_ParAMGDataRelaxWeight(amg_data);
-   for (i=0; i < num_levels; i++)
+   for (i = 0; i < num_levels; i++)
+   {
       relax_weight_array[i] = relax_weight;
+   }
 
    hypre_ParAMGDataUserRelaxWeight(amg_data) = relax_weight;
 
@@ -2351,7 +2475,7 @@ hypre_BoomerAMGSetLevelRelaxWt( void    *data,
       return hypre_error_flag;
    }
    num_levels = hypre_ParAMGDataMaxLevels(amg_data);
-   if (level > num_levels-1 || level < 0)
+   if (level > num_levels - 1 || level < 0)
    {
       hypre_error_in_arg(3);
       return hypre_error_flag;
@@ -2359,8 +2483,10 @@ hypre_BoomerAMGSetLevelRelaxWt( void    *data,
    if (hypre_ParAMGDataRelaxWeight(amg_data) == NULL)
    {
       hypre_ParAMGDataRelaxWeight(amg_data) = hypre_CTAlloc(HYPRE_Real, num_levels, HYPRE_MEMORY_HOST);
-      for (i=0; i < num_levels; i++)
+      for (i = 0; i < num_levels; i++)
+      {
          hypre_ParAMGDataRelaxWeight(amg_data)[i] = 1.0;
+      }
    }
 
    hypre_ParAMGDataRelaxWeight(amg_data)[level] = relax_weight;
@@ -2381,7 +2507,7 @@ hypre_BoomerAMGGetLevelRelaxWt( void    *data,
       return hypre_error_flag;
    }
    num_levels = hypre_ParAMGDataMaxLevels(amg_data);
-   if (level > num_levels-1 || level < 0)
+   if (level > num_levels - 1 || level < 0)
    {
       hypre_error_in_arg(3);
       return hypre_error_flag;
@@ -2414,7 +2540,9 @@ hypre_BoomerAMGSetOmega( void     *data,
       return hypre_error_flag;
    }
    if (hypre_ParAMGDataOmega(amg_data))
+   {
       hypre_TFree(hypre_ParAMGDataOmega(amg_data), HYPRE_MEMORY_HOST);
+   }
    hypre_ParAMGDataOmega(amg_data) = omega;
 
    return hypre_error_flag;
@@ -2451,11 +2579,15 @@ hypre_BoomerAMGSetOuterWt( void     *data,
    }
    num_levels = hypre_ParAMGDataMaxLevels(amg_data);
    if (hypre_ParAMGDataOmega(amg_data) == NULL)
+   {
       hypre_ParAMGDataOmega(amg_data) = hypre_CTAlloc(HYPRE_Real, num_levels, HYPRE_MEMORY_HOST);
+   }
 
    omega_array = hypre_ParAMGDataOmega(amg_data);
-   for (i=0; i < num_levels; i++)
+   for (i = 0; i < num_levels; i++)
+   {
       omega_array[i] = omega;
+   }
    hypre_ParAMGDataOuterWt(amg_data) = omega;
 
    return hypre_error_flag;
@@ -2474,7 +2606,7 @@ hypre_BoomerAMGSetLevelOuterWt( void    *data,
       return hypre_error_flag;
    }
    num_levels = hypre_ParAMGDataMaxLevels(amg_data);
-   if (level > num_levels-1)
+   if (level > num_levels - 1)
    {
       hypre_error_in_arg(3);
       return hypre_error_flag;
@@ -2482,8 +2614,10 @@ hypre_BoomerAMGSetLevelOuterWt( void    *data,
    if (hypre_ParAMGDataOmega(amg_data) == NULL)
    {
       hypre_ParAMGDataOmega(amg_data) = hypre_CTAlloc(HYPRE_Real, num_levels, HYPRE_MEMORY_HOST);
-      for (i=0; i < num_levels; i++)
+      for (i = 0; i < num_levels; i++)
+      {
          hypre_ParAMGDataOmega(amg_data)[i] = 1.0;
+      }
    }
 
    hypre_ParAMGDataOmega(amg_data)[level] = omega;
@@ -2504,7 +2638,7 @@ hypre_BoomerAMGGetLevelOuterWt( void    *data,
       return hypre_error_flag;
    }
    num_levels = hypre_ParAMGDataMaxLevels(amg_data);
-   if (level > num_levels-1)
+   if (level > num_levels - 1)
    {
       hypre_error_in_arg(3);
       return hypre_error_flag;
@@ -2554,7 +2688,7 @@ hypre_BoomerAMGGetSmoothType( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGSetSmoothNumLevels( void     *data,
-                            HYPRE_Int   smooth_num_levels )
+                                   HYPRE_Int   smooth_num_levels )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -2575,7 +2709,7 @@ hypre_BoomerAMGSetSmoothNumLevels( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGGetSmoothNumLevels( void     *data,
-                            HYPRE_Int * smooth_num_levels )
+                                   HYPRE_Int * smooth_num_levels )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -2591,7 +2725,7 @@ hypre_BoomerAMGGetSmoothNumLevels( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGSetSmoothNumSweeps( void     *data,
-                            HYPRE_Int   smooth_num_sweeps )
+                                   HYPRE_Int   smooth_num_sweeps )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -2612,7 +2746,7 @@ hypre_BoomerAMGSetSmoothNumSweeps( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGGetSmoothNumSweeps( void     *data,
-                            HYPRE_Int * smooth_num_sweeps )
+                                   HYPRE_Int * smooth_num_sweeps )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -2628,7 +2762,7 @@ hypre_BoomerAMGGetSmoothNumSweeps( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGSetLogging( void     *data,
-                            HYPRE_Int       logging )
+                           HYPRE_Int       logging )
 {
    /* This function should be called before Setup.  Logging changes
       may require allocation or freeing of arrays, which is presently
@@ -2650,7 +2784,7 @@ hypre_BoomerAMGSetLogging( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGGetLogging( void     *data,
-                            HYPRE_Int     * logging )
+                           HYPRE_Int     * logging )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -2666,7 +2800,7 @@ hypre_BoomerAMGGetLogging( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGSetPrintLevel( void     *data,
-                        HYPRE_Int print_level )
+                              HYPRE_Int print_level )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -2682,7 +2816,7 @@ hypre_BoomerAMGSetPrintLevel( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGGetPrintLevel( void     *data,
-                        HYPRE_Int * print_level )
+                              HYPRE_Int * print_level )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -2698,7 +2832,7 @@ hypre_BoomerAMGGetPrintLevel( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGSetPrintFileName( void       *data,
-                               const char *print_file_name )
+                                 const char *print_file_name )
 {
    hypre_ParAMGData  *amg_data =  (hypre_ParAMGData*)data;
    if (!amg_data)
@@ -2735,7 +2869,7 @@ hypre_BoomerAMGGetPrintFileName( void       *data,
 
 HYPRE_Int
 hypre_BoomerAMGSetNumIterations( void    *data,
-                              HYPRE_Int      num_iterations )
+                                 HYPRE_Int      num_iterations )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -2751,7 +2885,7 @@ hypre_BoomerAMGSetNumIterations( void    *data,
 
 HYPRE_Int
 hypre_BoomerAMGSetDebugFlag( void     *data,
-                          HYPRE_Int       debug_flag )
+                             HYPRE_Int       debug_flag )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -2767,7 +2901,7 @@ hypre_BoomerAMGSetDebugFlag( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGGetDebugFlag( void     *data,
-                          HYPRE_Int     * debug_flag )
+                             HYPRE_Int     * debug_flag )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -2807,7 +2941,7 @@ hypre_BoomerAMGSetGSMG( void       *data,
 
 HYPRE_Int
 hypre_BoomerAMGSetNumSamples( void *data,
-                        HYPRE_Int   par )
+                              HYPRE_Int   par )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -2827,28 +2961,28 @@ HYPRE_Int
 hypre_BoomerAMGSetCGCIts( void *data,
                           HYPRE_Int  its)
 {
-  HYPRE_Int ierr = 0;
-  hypre_ParAMGData *amg_data = (hypre_ParAMGData*) data;
+   HYPRE_Int ierr = 0;
+   hypre_ParAMGData *amg_data = (hypre_ParAMGData*) data;
 
-  hypre_ParAMGDataCGCIts(amg_data) = its;
-  return (ierr);
+   hypre_ParAMGDataCGCIts(amg_data) = its;
+   return (ierr);
 }
 
 /* BM Oct 22, 2006 */
 HYPRE_Int
 hypre_BoomerAMGSetPlotGrids( void *data,
-                          HYPRE_Int plotgrids)
+                             HYPRE_Int plotgrids)
 {
-  HYPRE_Int ierr = 0;
-  hypre_ParAMGData *amg_data = (hypre_ParAMGData*) data;
+   HYPRE_Int ierr = 0;
+   hypre_ParAMGData *amg_data = (hypre_ParAMGData*) data;
 
-  hypre_ParAMGDataPlotGrids(amg_data) = plotgrids;
-  return (ierr);
+   hypre_ParAMGDataPlotGrids(amg_data) = plotgrids;
+   return (ierr);
 }
 
 HYPRE_Int
 hypre_BoomerAMGSetPlotFileName( void       *data,
-                              const char *plot_file_name )
+                                const char *plot_file_name )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
    if (!amg_data)
@@ -2856,15 +2990,19 @@ hypre_BoomerAMGSetPlotFileName( void       *data,
       hypre_error_in_arg(1);
       return hypre_error_flag;
    }
-   if ( strlen(plot_file_name)>251 )
+   if ( strlen(plot_file_name) > 251 )
    {
       hypre_error_in_arg(2);
       return hypre_error_flag;
    }
-   if (strlen(plot_file_name)==0 )
-     hypre_sprintf(hypre_ParAMGDataPlotFileName(amg_data), "%s", "AMGgrids.CF.dat");
+   if (strlen(plot_file_name) == 0 )
+   {
+      hypre_sprintf(hypre_ParAMGDataPlotFileName(amg_data), "%s", "AMGgrids.CF.dat");
+   }
    else
-     hypre_sprintf(hypre_ParAMGDataPlotFileName(amg_data), "%s", plot_file_name);
+   {
+      hypre_sprintf(hypre_ParAMGDataPlotFileName(amg_data), "%s", plot_file_name);
+   }
 
    return hypre_error_flag;
 }
@@ -2874,7 +3012,7 @@ hypre_BoomerAMGSetPlotFileName( void       *data,
 */
 HYPRE_Int
 hypre_BoomerAMGGetGridHierarchy( void       *data,
-                              HYPRE_Int *cgrid )
+                                 HYPRE_Int *cgrid )
 {
    HYPRE_Int *ibuff = NULL;
    HYPRE_Int *wbuff, *cbuff, *tmp;
@@ -2897,13 +3035,13 @@ hypre_BoomerAMGGetGridHierarchy( void       *data,
 
    block_mode = hypre_ParAMGDataBlockMode(amg_data);
 
-   if( block_mode)
+   if ( block_mode)
    {
       hypre_ParCSRBlockMatrix **A_block_array;
       A_block_array = hypre_ParAMGDataABlockArray(amg_data);
-      if(A_block_array == NULL)
+      if (A_block_array == NULL)
       {
-         hypre_error_w_msg(HYPRE_ERROR_GENERIC,"Invalid AMG data. AMG setup has not been called!!\n");
+         hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Invalid AMG data. AMG setup has not been called!!\n");
          return hypre_error_flag;
       }
 
@@ -2918,7 +3056,8 @@ hypre_BoomerAMGGetGridHierarchy( void       *data,
       {
          /* get the CF marker array on the host */
          CF_marker_array = hypre_ParAMGDataCFMarkerArray(amg_data)[level];
-         if (hypre_GetActualMemLocation(hypre_IntArrayMemoryLocation(CF_marker_array)) == hypre_MEMORY_DEVICE)
+         if (hypre_GetActualMemLocation(hypre_IntArrayMemoryLocation(CF_marker_array)) ==
+             hypre_MEMORY_DEVICE)
          {
             CF_marker_array_host = hypre_IntArrayCloneDeep_v2(CF_marker_array, HYPRE_MEMORY_HOST);
          }
@@ -2947,7 +3086,8 @@ hypre_BoomerAMGGetGridHierarchy( void       *data,
          }
 
          /* destroy copy host copy if necessary */
-         if (hypre_GetActualMemLocation(hypre_IntArrayMemoryLocation(CF_marker_array)) == hypre_MEMORY_DEVICE)
+         if (hypre_GetActualMemLocation(hypre_IntArrayMemoryLocation(CF_marker_array)) ==
+             hypre_MEMORY_DEVICE)
          {
             hypre_IntArrayDestroy(CF_marker_array_host);
          }
@@ -2957,9 +3097,9 @@ hypre_BoomerAMGGetGridHierarchy( void       *data,
    {
       hypre_ParCSRMatrix **A_array;
       A_array = hypre_ParAMGDataAArray(amg_data);
-      if(A_array == NULL)
+      if (A_array == NULL)
       {
-         hypre_error_w_msg(HYPRE_ERROR_GENERIC,"Invalid AMG data. AMG setup has not been called!!\n");
+         hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Invalid AMG data. AMG setup has not been called!!\n");
          return hypre_error_flag;
       }
 
@@ -2973,7 +3113,8 @@ hypre_BoomerAMGGetGridHierarchy( void       *data,
       {
          /* get the CF marker array on the host */
          CF_marker_array = hypre_ParAMGDataCFMarkerArray(amg_data)[level];
-         if (hypre_GetActualMemLocation(hypre_IntArrayMemoryLocation(CF_marker_array)) == hypre_MEMORY_DEVICE)
+         if (hypre_GetActualMemLocation(hypre_IntArrayMemoryLocation(CF_marker_array)) ==
+             hypre_MEMORY_DEVICE)
          {
             CF_marker_array_host = hypre_IntArrayCloneDeep_v2(CF_marker_array, HYPRE_MEMORY_HOST);
          }
@@ -3000,7 +3141,8 @@ hypre_BoomerAMGGetGridHierarchy( void       *data,
             }
          }
          /* destroy copy host copy if necessary */
-         if (hypre_GetActualMemLocation(hypre_IntArrayMemoryLocation(CF_marker_array)) == hypre_MEMORY_DEVICE)
+         if (hypre_GetActualMemLocation(hypre_IntArrayMemoryLocation(CF_marker_array)) ==
+             hypre_MEMORY_DEVICE)
          {
             hypre_IntArrayDestroy(CF_marker_array_host);
          }
@@ -3017,24 +3159,24 @@ hypre_BoomerAMGGetGridHierarchy( void       *data,
 /* BM Oct 17, 2006 */
 HYPRE_Int
 hypre_BoomerAMGSetCoordDim( void *data,
-                          HYPRE_Int coorddim)
+                            HYPRE_Int coorddim)
 {
-  HYPRE_Int ierr = 0;
-  hypre_ParAMGData *amg_data = (hypre_ParAMGData*) data;
+   HYPRE_Int ierr = 0;
+   hypre_ParAMGData *amg_data = (hypre_ParAMGData*) data;
 
-  hypre_ParAMGDataCoordDim(amg_data) = coorddim;
-  return (ierr);
+   hypre_ParAMGDataCoordDim(amg_data) = coorddim;
+   return (ierr);
 }
 
 HYPRE_Int
 hypre_BoomerAMGSetCoordinates( void *data,
-                             float *coordinates)
+                               float *coordinates)
 {
-  HYPRE_Int ierr = 0;
-  hypre_ParAMGData *amg_data = (hypre_ParAMGData*) data;
+   HYPRE_Int ierr = 0;
+   hypre_ParAMGData *amg_data = (hypre_ParAMGData*) data;
 
-  hypre_ParAMGDataCoordinates(amg_data) = coordinates;
-  return (ierr);
+   hypre_ParAMGDataCoordinates(amg_data) = coordinates;
+   return (ierr);
 }
 
 /*--------------------------------------------------------------------------
@@ -3043,7 +3185,7 @@ hypre_BoomerAMGSetCoordinates( void *data,
 
 HYPRE_Int
 hypre_BoomerAMGSetNumFunctions( void     *data,
-                            HYPRE_Int       num_functions )
+                                HYPRE_Int       num_functions )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -3062,9 +3204,13 @@ hypre_BoomerAMGSetNumFunctions( void     *data,
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_BoomerAMGGetNumFunctions
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_BoomerAMGGetNumFunctions( void     *data,
-                            HYPRE_Int     * num_functions )
+hypre_BoomerAMGGetNumFunctions( void      *data,
+                                HYPRE_Int *num_functions )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -3079,12 +3225,12 @@ hypre_BoomerAMGGetNumFunctions( void     *data,
 }
 
 /*--------------------------------------------------------------------------
- * Indicate whether to use nodal systems function
+ * hypre_BoomerAMGSetFilterFunctions
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_BoomerAMGSetNodal( void     *data,
-                          HYPRE_Int    nodal )
+hypre_BoomerAMGSetFilterFunctions( void      *data,
+                                   HYPRE_Int  filter_functions )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -3093,17 +3239,23 @@ hypre_BoomerAMGSetNodal( void     *data,
       hypre_error_in_arg(1);
       return hypre_error_flag;
    }
-   hypre_ParAMGDataNodal(amg_data) = nodal;
+   if (filter_functions < 0 || filter_functions > 1)
+   {
+      hypre_error_in_arg(2);
+      return hypre_error_flag;
+   }
+   hypre_ParAMGDataFilterFunctions(amg_data) = filter_functions;
 
    return hypre_error_flag;
 }
+
 /*--------------------------------------------------------------------------
- * Indicate number of levels for nodal coarsening
+ * hypre_BoomerAMGGetFilterFunctions
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_BoomerAMGSetNodalLevels( void     *data,
-                          HYPRE_Int    nodal_levels )
+hypre_BoomerAMGGetFilterFunctions( void      *data,
+                                   HYPRE_Int *filter_functions )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -3112,7 +3264,46 @@ hypre_BoomerAMGSetNodalLevels( void     *data,
       hypre_error_in_arg(1);
       return hypre_error_flag;
    }
-   hypre_ParAMGDataNodalLevels(amg_data) = nodal_levels;
+   *filter_functions = hypre_ParAMGDataFilterFunctions(amg_data);
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * Indicate whether to use nodal systems function
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_BoomerAMGSetNodal( void     *data,
+                         HYPRE_Int    nodal )
+{
+   hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
+
+   if (!amg_data)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+   hypre_ParAMGDataNodal(amg_data) = nodal;
+
+   return hypre_error_flag;
+}
+/*--------------------------------------------------------------------------
+ * Indicate number of levels for nodal coarsening
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_BoomerAMGSetNodalLevels( void     *data,
+                               HYPRE_Int    nodal_levels )
+{
+   hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
+
+   if (!amg_data)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+   hypre_ParAMGDataNodalLevels(amg_data) = nodal_levels;
 
    return hypre_error_flag;
 }
@@ -3124,7 +3315,7 @@ hypre_BoomerAMGSetNodalLevels( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGSetNodalDiag( void     *data,
-                          HYPRE_Int    nodal )
+                             HYPRE_Int    nodal )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -3138,7 +3329,7 @@ hypre_BoomerAMGSetNodalDiag( void     *data,
    return hypre_error_flag;
 }
 /*--------------------------------------------------------------------------
- * Indicate whether to discard same sign coefficients in S for nodal>0 
+ * Indicate whether to discard same sign coefficients in S for nodal>0
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
@@ -3187,7 +3378,7 @@ hypre_BoomerAMGSetNumPaths( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGSetAggNumLevels( void     *data,
-                            HYPRE_Int       agg_num_levels )
+                                HYPRE_Int       agg_num_levels )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -3212,7 +3403,7 @@ hypre_BoomerAMGSetAggNumLevels( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGSetAggInterpType( void     *data,
-                            HYPRE_Int       agg_interp_type )
+                                 HYPRE_Int       agg_interp_type )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -3221,7 +3412,7 @@ hypre_BoomerAMGSetAggInterpType( void     *data,
       hypre_error_in_arg(1);
       return hypre_error_flag;
    }
-   if (agg_interp_type < 0 || agg_interp_type > 7)
+   if (agg_interp_type < 0 || agg_interp_type > 9)
    {
       hypre_error_in_arg(2);
       return hypre_error_flag;
@@ -3238,7 +3429,7 @@ hypre_BoomerAMGSetAggInterpType( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGSetAggPMaxElmts( void     *data,
-                            HYPRE_Int       agg_P_max_elmts )
+                                HYPRE_Int       agg_P_max_elmts )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -3264,7 +3455,7 @@ hypre_BoomerAMGSetAggPMaxElmts( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGSetMultAddPMaxElmts( void     *data,
-                            HYPRE_Int       add_P_max_elmts )
+                                    HYPRE_Int       add_P_max_elmts )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -3289,7 +3480,7 @@ hypre_BoomerAMGSetMultAddPMaxElmts( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGSetAddRelaxType( void     *data,
-                            HYPRE_Int       add_rlx_type )
+                                HYPRE_Int       add_rlx_type )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -3309,7 +3500,7 @@ hypre_BoomerAMGSetAddRelaxType( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGSetAddRelaxWt( void     *data,
-                            HYPRE_Real       add_rlx_wt )
+                              HYPRE_Real       add_rlx_wt )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -3330,7 +3521,7 @@ hypre_BoomerAMGSetAddRelaxWt( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGSetAggP12MaxElmts( void     *data,
-                            HYPRE_Int       agg_P12_max_elmts )
+                                  HYPRE_Int       agg_P12_max_elmts )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -3355,7 +3546,7 @@ hypre_BoomerAMGSetAggP12MaxElmts( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGSetAggTruncFactor( void     *data,
-                            HYPRE_Real  agg_trunc_factor )
+                                  HYPRE_Real  agg_trunc_factor )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -3381,7 +3572,7 @@ hypre_BoomerAMGSetAggTruncFactor( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGSetMultAddTruncFactor( void     *data,
-                            HYPRE_Real      add_trunc_factor )
+                                      HYPRE_Real      add_trunc_factor )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -3407,7 +3598,7 @@ hypre_BoomerAMGSetMultAddTruncFactor( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGSetAggP12TruncFactor( void     *data,
-                            HYPRE_Real  agg_P12_trunc_factor )
+                                     HYPRE_Real  agg_P12_trunc_factor )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -3432,7 +3623,7 @@ hypre_BoomerAMGSetAggP12TruncFactor( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGSetNumCRRelaxSteps( void     *data,
-                            HYPRE_Int       num_CR_relax_steps )
+                                   HYPRE_Int       num_CR_relax_steps )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -3532,7 +3723,7 @@ hypre_BoomerAMGSetADropType( void      *data,
 
 HYPRE_Int
 hypre_BoomerAMGSetISType( void     *data,
-                            HYPRE_Int      IS_type )
+                          HYPRE_Int      IS_type )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -3557,7 +3748,7 @@ hypre_BoomerAMGSetISType( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGSetCRUseCG( void     *data,
-                            HYPRE_Int      CR_use_CG )
+                           HYPRE_Int      CR_use_CG )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -3573,7 +3764,7 @@ hypre_BoomerAMGSetCRUseCG( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGSetNumPoints( void     *data,
-                          HYPRE_Int       num_points )
+                             HYPRE_Int       num_points )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -3599,8 +3790,7 @@ hypre_BoomerAMGSetDofFunc( void                 *data,
       return hypre_error_flag;
    }
    hypre_IntArrayDestroy(hypre_ParAMGDataDofFunc(amg_data));
-   /* NOTE: size of hypre_IntArray will be set during AMG setup 
-    *       the memory location is assumed to be host */
+   /* NOTE: size and memory location of hypre_IntArray will be set during AMG setup */
    if (dof_func == NULL)
    {
       hypre_ParAMGDataDofFunc(amg_data) = NULL;
@@ -3608,7 +3798,6 @@ hypre_BoomerAMGSetDofFunc( void                 *data,
    else
    {
       hypre_ParAMGDataDofFunc(amg_data) = hypre_IntArrayCreate(-1);
-      hypre_IntArrayMemoryLocation(hypre_ParAMGDataDofFunc(amg_data)) = HYPRE_MEMORY_DEVICE;
       hypre_IntArrayData(hypre_ParAMGDataDofFunc(amg_data)) = dof_func;
    }
 
@@ -3617,7 +3806,7 @@ hypre_BoomerAMGSetDofFunc( void                 *data,
 
 HYPRE_Int
 hypre_BoomerAMGSetPointDofMap( void     *data,
-                         HYPRE_Int      *point_dof_map )
+                               HYPRE_Int      *point_dof_map )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -3634,7 +3823,7 @@ hypre_BoomerAMGSetPointDofMap( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGSetDofPoint( void     *data,
-                         HYPRE_Int      *dof_point )
+                            HYPRE_Int      *dof_point )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -3651,7 +3840,7 @@ hypre_BoomerAMGSetDofPoint( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGGetNumIterations( void     *data,
-                              HYPRE_Int      *num_iterations )
+                                 HYPRE_Int      *num_iterations )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -3699,7 +3888,7 @@ hypre_BoomerAMGGetResidual( void * data, hypre_ParVector ** resid )
 
 HYPRE_Int
 hypre_BoomerAMGGetRelResidualNorm( void     *data,
-                                     HYPRE_Real   *rel_resid_norm )
+                                   HYPRE_Real   *rel_resid_norm )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -3715,7 +3904,7 @@ hypre_BoomerAMGGetRelResidualNorm( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGSetVariant( void     *data,
-                            HYPRE_Int       variant)
+                           HYPRE_Int       variant)
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -3736,7 +3925,7 @@ hypre_BoomerAMGSetVariant( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGGetVariant( void     *data,
-                            HYPRE_Int     * variant)
+                           HYPRE_Int     * variant)
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -3752,7 +3941,7 @@ hypre_BoomerAMGGetVariant( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGSetOverlap( void     *data,
-                            HYPRE_Int       overlap)
+                           HYPRE_Int       overlap)
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -3773,7 +3962,7 @@ hypre_BoomerAMGSetOverlap( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGGetOverlap( void     *data,
-                            HYPRE_Int     * overlap)
+                           HYPRE_Int     * overlap)
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -3789,7 +3978,7 @@ hypre_BoomerAMGGetOverlap( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGSetDomainType( void     *data,
-                            HYPRE_Int       domain_type)
+                              HYPRE_Int       domain_type)
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -3810,7 +3999,7 @@ hypre_BoomerAMGSetDomainType( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGGetDomainType( void     *data,
-                            HYPRE_Int     * domain_type)
+                              HYPRE_Int     * domain_type)
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -3826,7 +4015,7 @@ hypre_BoomerAMGGetDomainType( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGSetSchwarzRlxWeight( void     *data,
-                            HYPRE_Real schwarz_rlx_weight)
+                                    HYPRE_Real schwarz_rlx_weight)
 {
    hypre_ParAMGData  *amg_data =  (hypre_ParAMGData*)data;
 
@@ -3842,7 +4031,7 @@ hypre_BoomerAMGSetSchwarzRlxWeight( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGGetSchwarzRlxWeight( void     *data,
-                            HYPRE_Real   * schwarz_rlx_weight)
+                                    HYPRE_Real   * schwarz_rlx_weight)
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -3874,7 +4063,7 @@ hypre_BoomerAMGSetSchwarzUseNonSymm( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGSetSym( void     *data,
-                            HYPRE_Int       sym)
+                       HYPRE_Int       sym)
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -3890,7 +4079,7 @@ hypre_BoomerAMGSetSym( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGSetLevel( void     *data,
-                            HYPRE_Int       level)
+                         HYPRE_Int       level)
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -3991,7 +4180,7 @@ hypre_BoomerAMGSetEuclidFile( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGSetEuLevel( void     *data,
-                            HYPRE_Int      eu_level)
+                           HYPRE_Int      eu_level)
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -4021,6 +4210,7 @@ hypre_BoomerAMGSetEuSparseA( void     *data,
    return hypre_error_flag;
 }
 
+
 HYPRE_Int
 hypre_BoomerAMGSetEuBJ( void     *data,
                         HYPRE_Int       eu_bj)
@@ -4036,9 +4226,10 @@ hypre_BoomerAMGSetEuBJ( void     *data,
 
    return hypre_error_flag;
 }
+
 HYPRE_Int
 hypre_BoomerAMGSetILUType( void     *data,
-                        HYPRE_Int       ilu_type)
+                           HYPRE_Int       ilu_type)
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -4051,9 +4242,10 @@ hypre_BoomerAMGSetILUType( void     *data,
 
    return hypre_error_flag;
 }
+
 HYPRE_Int
 hypre_BoomerAMGSetILULevel( void     *data,
-                        HYPRE_Int       ilu_lfil)
+                            HYPRE_Int       ilu_lfil)
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -4066,9 +4258,10 @@ hypre_BoomerAMGSetILULevel( void     *data,
 
    return hypre_error_flag;
 }
+
 HYPRE_Int
 hypre_BoomerAMGSetILUDroptol( void     *data,
-                        HYPRE_Real       ilu_droptol)
+                              HYPRE_Real       ilu_droptol)
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -4081,9 +4274,58 @@ hypre_BoomerAMGSetILUDroptol( void     *data,
 
    return hypre_error_flag;
 }
+
+HYPRE_Int
+hypre_BoomerAMGSetILUTriSolve( void     *data,
+                               HYPRE_Int    ilu_tri_solve)
+{
+   hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
+
+   if (!amg_data)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+   hypre_ParAMGDataILUTriSolve(amg_data) = ilu_tri_solve;
+
+   return hypre_error_flag;
+}
+
+HYPRE_Int
+hypre_BoomerAMGSetILULowerJacobiIters( void     *data,
+                                       HYPRE_Int    ilu_lower_jacobi_iters)
+{
+   hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
+
+   if (!amg_data)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+   hypre_ParAMGDataILULowerJacobiIters(amg_data) = ilu_lower_jacobi_iters;
+
+   return hypre_error_flag;
+}
+
+HYPRE_Int
+hypre_BoomerAMGSetILUUpperJacobiIters( void     *data,
+                                       HYPRE_Int    ilu_upper_jacobi_iters)
+{
+   hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
+
+   if (!amg_data)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+   hypre_ParAMGDataILUUpperJacobiIters(amg_data) = ilu_upper_jacobi_iters;
+
+   return hypre_error_flag;
+}
+
 HYPRE_Int
 hypre_BoomerAMGSetILUMaxIter( void     *data,
-                        HYPRE_Int       ilu_max_iter)
+                              HYPRE_Int       ilu_max_iter)
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -4096,9 +4338,10 @@ hypre_BoomerAMGSetILUMaxIter( void     *data,
 
    return hypre_error_flag;
 }
+
 HYPRE_Int
 hypre_BoomerAMGSetILUMaxRowNnz( void     *data,
-                        HYPRE_Int       ilu_max_row_nnz)
+                                HYPRE_Int       ilu_max_row_nnz)
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -4111,9 +4354,10 @@ hypre_BoomerAMGSetILUMaxRowNnz( void     *data,
 
    return hypre_error_flag;
 }
+
 HYPRE_Int
 hypre_BoomerAMGSetILULocalReordering( void     *data,
-                        HYPRE_Int       ilu_reordering_type)
+                                      HYPRE_Int       ilu_reordering_type)
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -4126,6 +4370,215 @@ hypre_BoomerAMGSetILULocalReordering( void     *data,
 
    return hypre_error_flag;
 }
+
+HYPRE_Int
+hypre_BoomerAMGSetILUIterSetupType( void     *data,
+                                    HYPRE_Int       ilu_iter_setup_type)
+{
+   hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
+
+   if (!amg_data)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+   hypre_ParAMGDataILUIterSetupType(amg_data) = ilu_iter_setup_type;
+
+   return hypre_error_flag;
+}
+
+HYPRE_Int
+hypre_BoomerAMGSetILUIterSetupOption( void     *data,
+                                      HYPRE_Int       ilu_iter_setup_option)
+{
+   hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
+
+   if (!amg_data)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+   hypre_ParAMGDataILUIterSetupOption(amg_data) = ilu_iter_setup_option;
+
+   return hypre_error_flag;
+}
+
+HYPRE_Int
+hypre_BoomerAMGSetILUIterSetupMaxIter( void     *data,
+                                       HYPRE_Int       ilu_iter_setup_max_iter)
+{
+   hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
+
+   if (!amg_data)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+   hypre_ParAMGDataILUIterSetupMaxIter(amg_data) = ilu_iter_setup_max_iter;
+
+   return hypre_error_flag;
+}
+
+HYPRE_Int
+hypre_BoomerAMGSetILUIterSetupTolerance( void     *data,
+                                         HYPRE_Real       ilu_iter_setup_tolerance)
+{
+   hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
+
+   if (!amg_data)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+   hypre_ParAMGDataILUIterSetupTolerance(amg_data) = ilu_iter_setup_tolerance;
+
+   return hypre_error_flag;
+}
+
+HYPRE_Int
+hypre_BoomerAMGSetFSAIAlgoType( void      *data,
+                                HYPRE_Int  fsai_algo_type)
+{
+   hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
+
+   if (!amg_data)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+   hypre_ParAMGDataFSAIAlgoType(amg_data) = fsai_algo_type;
+
+   return hypre_error_flag;
+}
+
+HYPRE_Int
+hypre_BoomerAMGSetFSAILocalSolveType( void      *data,
+                                      HYPRE_Int  fsai_local_solve_type)
+{
+   hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
+
+   if (!amg_data)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+   hypre_ParAMGDataFSAILocalSolveType(amg_data) = fsai_local_solve_type;
+
+   return hypre_error_flag;
+}
+
+HYPRE_Int
+hypre_BoomerAMGSetFSAIMaxSteps( void      *data,
+                                HYPRE_Int  fsai_max_steps)
+{
+   hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
+
+   if (!amg_data)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+   hypre_ParAMGDataFSAIMaxSteps(amg_data) = fsai_max_steps;
+
+   return hypre_error_flag;
+}
+
+HYPRE_Int
+hypre_BoomerAMGSetFSAIMaxStepSize( void      *data,
+                                   HYPRE_Int  fsai_max_step_size)
+{
+   hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
+
+   if (!amg_data)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+   hypre_ParAMGDataFSAIMaxStepSize(amg_data) = fsai_max_step_size;
+
+   return hypre_error_flag;
+}
+
+HYPRE_Int
+hypre_BoomerAMGSetFSAIMaxNnzRow( void      *data,
+                                 HYPRE_Int  fsai_max_nnz_row)
+{
+   hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
+
+   if (!amg_data)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+   hypre_ParAMGDataFSAIMaxNnzRow(amg_data) = fsai_max_nnz_row;
+
+   return hypre_error_flag;
+}
+
+HYPRE_Int
+hypre_BoomerAMGSetFSAINumLevels( void      *data,
+                                 HYPRE_Int  fsai_num_levels)
+{
+   hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
+
+   if (!amg_data)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+   hypre_ParAMGDataFSAINumLevels(amg_data) = fsai_num_levels;
+
+   return hypre_error_flag;
+}
+
+HYPRE_Int
+hypre_BoomerAMGSetFSAIThreshold( void      *data,
+                                 HYPRE_Real fsai_threshold)
+{
+   hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
+
+   if (!amg_data)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+   hypre_ParAMGDataFSAIThreshold(amg_data) = fsai_threshold;
+
+   return hypre_error_flag;
+}
+
+HYPRE_Int
+hypre_BoomerAMGSetFSAIEigMaxIters( void      *data,
+                                   HYPRE_Int  fsai_eig_max_iters)
+{
+   hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
+
+   if (!amg_data)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+   hypre_ParAMGDataFSAIEigMaxIters(amg_data) = fsai_eig_max_iters;
+
+   return hypre_error_flag;
+}
+
+HYPRE_Int
+hypre_BoomerAMGSetFSAIKapTolerance( void      *data,
+                                    HYPRE_Real fsai_kap_tolerance)
+{
+   hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
+
+   if (!amg_data)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+   hypre_ParAMGDataFSAIKapTolerance(amg_data) = fsai_kap_tolerance;
+
+   return hypre_error_flag;
+}
+
 HYPRE_Int
 hypre_BoomerAMGSetChebyOrder( void     *data,
                               HYPRE_Int       order)
@@ -4168,7 +4621,7 @@ hypre_BoomerAMGSetChebyFraction( void     *data,
 }
 HYPRE_Int
 hypre_BoomerAMGSetChebyEigEst( void     *data,
-                              HYPRE_Int     cheby_eig_est)
+                               HYPRE_Int     cheby_eig_est)
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -4188,7 +4641,7 @@ hypre_BoomerAMGSetChebyEigEst( void     *data,
 }
 HYPRE_Int
 hypre_BoomerAMGSetChebyVariant( void     *data,
-                              HYPRE_Int     cheby_variant)
+                                HYPRE_Int     cheby_variant)
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -4224,8 +4677,8 @@ hypre_BoomerAMGSetChebyScale( void     *data,
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int hypre_BoomerAMGSetInterpVectors(void *solver,
-                                    HYPRE_Int  num_vectors,
-                                    hypre_ParVector **interp_vectors)
+                                          HYPRE_Int  num_vectors,
+                                          hypre_ParVector **interp_vectors)
 
 {
    hypre_ParAMGData *amg_data = (hypre_ParAMGData*) solver;
@@ -4265,7 +4718,7 @@ HYPRE_Int hypre_BoomerAMGSetInterpVectors(void *solver,
 }*/
 
 HYPRE_Int hypre_BoomerAMGSetInterpVecVariant(void *solver,
-                                       HYPRE_Int  var)
+                                             HYPRE_Int  var)
 
 
 {
@@ -4277,9 +4730,13 @@ HYPRE_Int hypre_BoomerAMGSetInterpVecVariant(void *solver,
    }
 
    if (var < 1)
+   {
       var = 0;
+   }
    if (var > 3)
+   {
       var = 3;
+   }
 
    hypre_ParAMGInterpVecVariant(amg_data) = var;
 
@@ -4320,7 +4777,7 @@ hypre_BoomerAMGSetInterpVecAbsQTrunc( void     *data,
 }
 
 HYPRE_Int hypre_BoomerAMGSetSmoothInterpVectors(void *solver,
-                                          HYPRE_Int  smooth_interp_vectors)
+                                                HYPRE_Int  smooth_interp_vectors)
 
 {
    hypre_ParAMGData *amg_data = (hypre_ParAMGData*) solver;
@@ -4371,7 +4828,7 @@ hypre_BoomerAMGSetInterpVecFirstLevel( void     *data,
 
 HYPRE_Int
 hypre_BoomerAMGSetAdditive( void *data,
-                          HYPRE_Int   additive )
+                            HYPRE_Int   additive )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -4388,7 +4845,7 @@ hypre_BoomerAMGSetAdditive( void *data,
 
 HYPRE_Int
 hypre_BoomerAMGGetAdditive( void *data,
-                             HYPRE_Int *  additive )
+                            HYPRE_Int *  additive )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -4405,7 +4862,7 @@ hypre_BoomerAMGGetAdditive( void *data,
 
 HYPRE_Int
 hypre_BoomerAMGSetMultAdditive( void *data,
-                          HYPRE_Int   mult_additive )
+                                HYPRE_Int   mult_additive )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -4422,7 +4879,7 @@ hypre_BoomerAMGSetMultAdditive( void *data,
 
 HYPRE_Int
 hypre_BoomerAMGGetMultAdditive( void *data,
-                             HYPRE_Int *  mult_additive )
+                                HYPRE_Int *  mult_additive )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -4456,7 +4913,7 @@ hypre_BoomerAMGSetSimple( void *data,
 
 HYPRE_Int
 hypre_BoomerAMGGetSimple( void *data,
-                             HYPRE_Int *  simple )
+                          HYPRE_Int *  simple )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -4473,7 +4930,7 @@ hypre_BoomerAMGGetSimple( void *data,
 
 HYPRE_Int
 hypre_BoomerAMGSetAddLastLvl( void *data,
-                          HYPRE_Int   add_last_lvl )
+                              HYPRE_Int   add_last_lvl )
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -4490,7 +4947,7 @@ hypre_BoomerAMGSetAddLastLvl( void *data,
 
 HYPRE_Int
 hypre_BoomerAMGSetNonGalerkinTol( void   *data,
-                            HYPRE_Real nongalerkin_tol)
+                                  HYPRE_Real nongalerkin_tol)
 {
    hypre_ParAMGData *amg_data = (hypre_ParAMGData*) data;
    HYPRE_Int i, max_num_levels;
@@ -4516,16 +4973,18 @@ hypre_BoomerAMGSetNonGalerkinTol( void   *data,
    }
    hypre_ParAMGDataNonGalerkinTol(amg_data) = nongalerkin_tol;
 
-   for (i=0; i < max_num_levels; i++)
+   for (i = 0; i < max_num_levels; i++)
+   {
       nongal_tol_array[i] = nongalerkin_tol;
+   }
 
    return hypre_error_flag;
 }
 
 HYPRE_Int
 hypre_BoomerAMGSetLevelNonGalerkinTol( void   *data,
-                            HYPRE_Real   nongalerkin_tol,
-                            HYPRE_Int level)
+                                       HYPRE_Real   nongalerkin_tol,
+                                       HYPRE_Int level)
 {
    hypre_ParAMGData *amg_data = (hypre_ParAMGData*) data;
    HYPRE_Real *nongal_tol_array;
@@ -4552,7 +5011,7 @@ hypre_BoomerAMGSetLevelNonGalerkinTol( void   *data,
       hypre_ParAMGDataNonGalTolArray(amg_data) = nongal_tol_array;
    }
 
-   if (level+1 > max_num_levels)
+   if (level + 1 > max_num_levels)
    {
       hypre_error_in_arg(3);
       return hypre_error_flag;
@@ -4564,24 +5023,24 @@ hypre_BoomerAMGSetLevelNonGalerkinTol( void   *data,
 
 HYPRE_Int
 hypre_BoomerAMGSetNonGalerkTol( void   *data,
-                            HYPRE_Int   nongalerk_num_tol,
-                            HYPRE_Real *nongalerk_tol)
+                                HYPRE_Int   nongalerk_num_tol,
+                                HYPRE_Real *nongalerk_tol)
 {
-  hypre_ParAMGData *amg_data = (hypre_ParAMGData*) data;
+   hypre_ParAMGData *amg_data = (hypre_ParAMGData*) data;
 
-  hypre_ParAMGDataNonGalerkNumTol(amg_data) = nongalerk_num_tol;
-  hypre_ParAMGDataNonGalerkTol(amg_data) = nongalerk_tol;
-  return hypre_error_flag;
+   hypre_ParAMGDataNonGalerkNumTol(amg_data) = nongalerk_num_tol;
+   hypre_ParAMGDataNonGalerkTol(amg_data) = nongalerk_tol;
+   return hypre_error_flag;
 }
 
 HYPRE_Int
 hypre_BoomerAMGSetRAP2( void      *data,
                         HYPRE_Int  rap2 )
 {
-  hypre_ParAMGData *amg_data = (hypre_ParAMGData*) data;
+   hypre_ParAMGData *amg_data = (hypre_ParAMGData*) data;
 
-  hypre_ParAMGDataRAP2(amg_data) = rap2;
-  return hypre_error_flag;
+   hypre_ParAMGDataRAP2(amg_data) = rap2;
+   return hypre_error_flag;
 }
 
 
@@ -4589,31 +5048,31 @@ HYPRE_Int
 hypre_BoomerAMGSetModuleRAP2( void      *data,
                               HYPRE_Int  mod_rap2 )
 {
-  hypre_ParAMGData *amg_data = (hypre_ParAMGData*) data;
+   hypre_ParAMGData *amg_data = (hypre_ParAMGData*) data;
 
-  hypre_ParAMGDataModularizedMatMat(amg_data) = mod_rap2;
-  return hypre_error_flag;
+   hypre_ParAMGDataModularizedMatMat(amg_data) = mod_rap2;
+   return hypre_error_flag;
 }
 
 HYPRE_Int
 hypre_BoomerAMGSetKeepTranspose( void       *data,
                                  HYPRE_Int   keepTranspose)
 {
-  hypre_ParAMGData *amg_data = (hypre_ParAMGData*) data;
+   hypre_ParAMGData *amg_data = (hypre_ParAMGData*) data;
 
-  hypre_ParAMGDataKeepTranspose(amg_data) = keepTranspose;
-  return hypre_error_flag;
+   hypre_ParAMGDataKeepTranspose(amg_data) = keepTranspose;
+   return hypre_error_flag;
 }
 
 #ifdef HYPRE_USING_DSUPERLU
 HYPRE_Int
 hypre_BoomerAMGSetDSLUThreshold( void   *data,
-                            HYPRE_Int   dslu_threshold)
+                                 HYPRE_Int   dslu_threshold)
 {
-  hypre_ParAMGData *amg_data = (hypre_ParAMGData*) data;
+   hypre_ParAMGData *amg_data = (hypre_ParAMGData*) data;
 
-  hypre_ParAMGDataDSLUThreshold(amg_data) = dslu_threshold;
-  return hypre_error_flag;
+   hypre_ParAMGDataDSLUThreshold(amg_data) = dslu_threshold;
+   return hypre_error_flag;
 }
 #endif
 
@@ -4628,7 +5087,6 @@ hypre_BoomerAMGSetCPoints(void         *data,
    HYPRE_BigInt     *C_points_marker = NULL;
    HYPRE_Int        *C_points_local_marker = NULL;
    HYPRE_Int         cpt_level;
-   HYPRE_Int         i;
 
    if (!amg_data)
    {
@@ -4649,13 +5107,13 @@ hypre_BoomerAMGSetCPoints(void         *data,
       return hypre_error_flag;
    }
 
+   HYPRE_MemoryLocation memory_location = hypre_ParAMGDataMemoryLocation(amg_data);
+
    /* free data not previously destroyed */
    if (hypre_ParAMGDataCPointsLevel(amg_data))
    {
-      hypre_TFree(hypre_ParAMGDataCPointsMarker(amg_data), HYPRE_MEMORY_HOST);
-      hypre_TFree(hypre_ParAMGDataCPointsLocalMarker(amg_data), HYPRE_MEMORY_HOST);
-      hypre_ParAMGDataCPointsMarker(amg_data) = NULL;
-      hypre_ParAMGDataCPointsLocalMarker(amg_data) = NULL;
+      hypre_TFree(hypre_ParAMGDataCPointsMarker(amg_data), memory_location);
+      hypre_TFree(hypre_ParAMGDataCPointsLocalMarker(amg_data), memory_location);
    }
 
    /* set Cpoint data */
@@ -4670,14 +5128,11 @@ hypre_BoomerAMGSetCPoints(void         *data,
 
    if (cpt_level)
    {
-      C_points_marker       = hypre_CTAlloc(HYPRE_BigInt, num_cpt_coarse, HYPRE_MEMORY_HOST);
-      C_points_local_marker = hypre_CTAlloc(HYPRE_Int, num_cpt_coarse, HYPRE_MEMORY_HOST);
+      C_points_marker = hypre_CTAlloc(HYPRE_BigInt, num_cpt_coarse, memory_location);
+      C_points_local_marker = hypre_CTAlloc(HYPRE_Int, num_cpt_coarse, memory_location);
 
-      /* copy Cpoints indexes */
-      for (i = 0; i < num_cpt_coarse; i++)
-      {
-         C_points_marker[i] = cpt_coarse_index[i];
-      }
+      hypre_TMemcpy(C_points_marker, cpt_coarse_index, HYPRE_BigInt, num_cpt_coarse, memory_location,
+                    HYPRE_MEMORY_HOST);
    }
    hypre_ParAMGDataCPointsMarker(amg_data)      = C_points_marker;
    hypre_ParAMGDataCPointsLocalMarker(amg_data) = C_points_local_marker;
@@ -4756,3 +5211,36 @@ hypre_BoomerAMGSetFPoints(void         *data,
 
    return hypre_error_flag;
 }
+
+HYPRE_Int
+hypre_BoomerAMGSetCumNnzAP( void       *data,
+                            HYPRE_Real  cum_nnz_AP )
+{
+   hypre_ParAMGData *amg_data = (hypre_ParAMGData*) data;
+
+   if (!amg_data)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+   hypre_ParAMGDataCumNnzAP(amg_data) = cum_nnz_AP;
+
+   return hypre_error_flag;
+}
+
+
+HYPRE_Int
+hypre_BoomerAMGGetCumNnzAP( void       *data,
+                            HYPRE_Real *cum_nnz_AP )
+{
+   hypre_ParAMGData *amg_data = (hypre_ParAMGData*) data;
+
+   if (!amg_data)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+   *cum_nnz_AP = hypre_ParAMGDataCumNnzAP(amg_data);
+
+   return hypre_error_flag;
+}
diff --git a/external/hypre/src/parcsr_ls/par_amg.h b/external/hypre/src/parcsr_ls/par_amg.h
index e46c0e9a..715cf32c 100644
--- a/external/hypre/src/parcsr_ls/par_amg.h
+++ b/external/hypre/src/parcsr_ls/par_amg.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -18,7 +18,11 @@
 
 typedef struct
 {
-   HYPRE_MemoryLocation  memory_location;   /* memory location of matrices/vectors in AMGData */
+   /* Base solver data structure */
+   hypre_Solver   base;
+
+   /* Memory location of matrices/vectors in AMGData */
+   HYPRE_MemoryLocation  memory_location;
 
    /* setup params */
    HYPRE_Int      max_levels;
@@ -88,6 +92,7 @@ typedef struct
    hypre_ParCSRMatrix  *A;
    HYPRE_Int            num_variables;
    HYPRE_Int            num_functions;
+   HYPRE_Int            filter_functions;
    HYPRE_Int            nodal;
    HYPRE_Int            nodal_levels;
    HYPRE_Int            nodal_diag;
@@ -137,13 +142,33 @@ typedef struct
    HYPRE_Real           pi_drop_tol;
    HYPRE_Real           eu_sparse_A;
    char                *euclidfile;
+
+   /* ILU parameters */
    HYPRE_Int            ilu_lfil;
    HYPRE_Int            ilu_type;
    HYPRE_Int            ilu_max_row_nnz;
    HYPRE_Int            ilu_max_iter;
    HYPRE_Real           ilu_droptol;
+   HYPRE_Int            ilu_tri_solve;
+   HYPRE_Int            ilu_lower_jacobi_iters;
+   HYPRE_Int            ilu_upper_jacobi_iters;
    HYPRE_Int            ilu_reordering_type;
-   
+   HYPRE_Int            ilu_iter_setup_type;
+   HYPRE_Int            ilu_iter_setup_option;
+   HYPRE_Int            ilu_iter_setup_max_iter;
+   HYPRE_Real           ilu_iter_setup_tolerance;
+
+   /* FSAI parameters */
+   HYPRE_Int            fsai_algo_type;
+   HYPRE_Int            fsai_local_solve_type;
+   HYPRE_Int            fsai_max_steps;
+   HYPRE_Int            fsai_max_step_size;
+   HYPRE_Int            fsai_max_nnz_row;
+   HYPRE_Int            fsai_num_levels;
+   HYPRE_Real           fsai_threshold;
+   HYPRE_Int            fsai_eig_max_iters;
+   HYPRE_Real           fsai_kap_tolerance;
+
    HYPRE_Real          *max_eig_est;
    HYPRE_Real          *min_eig_est;
    HYPRE_Int            cheby_eig_est;
@@ -154,6 +179,8 @@ typedef struct
    hypre_Vector       **cheby_ds;
    HYPRE_Real         **cheby_coefs;
 
+   HYPRE_Real           cum_nnz_AP;
+
    /* data needed for non-Galerkin option */
    HYPRE_Int           nongalerk_num_tol;
    HYPRE_Real         *nongalerk_tol;
@@ -216,10 +243,14 @@ typedef struct
    MPI_Comm             new_comm;
 
    /* store matrix, vector and communication info for Gaussian elimination */
+   HYPRE_MemoryLocation ge_memory_location;
    HYPRE_Int   gs_setup;
-   HYPRE_Real *A_mat, *A_inv;
-   HYPRE_Real *b_vec;
    HYPRE_Int  *comm_info;
+   HYPRE_Int  *A_piv;
+   HYPRE_Real *A_mat;
+   HYPRE_Real *A_work;
+   HYPRE_Real *b_vec;
+   HYPRE_Real *u_vec;
 
    /* information for multiplication with Lambda - additive AMG */
    HYPRE_Int      additive;
@@ -256,7 +287,7 @@ typedef struct
    HYPRE_BigInt  *F_points_marker;
 
 #ifdef HYPRE_USING_DSUPERLU
- /* Parameters and data for SuperLU_Dist */
+   /* Parameters and data for SuperLU_Dist */
    HYPRE_Int dslu_threshold;
    HYPRE_Solver dslu_solver;
 #endif
@@ -268,7 +299,6 @@ typedef struct
  *--------------------------------------------------------------------------*/
 
 /* setup params */
-
 #define hypre_ParAMGDataMemoryLocation(amg_data)       ((amg_data) -> memory_location)
 #define hypre_ParAMGDataRestriction(amg_data)          ((amg_data) -> restr_par)
 #define hypre_ParAMGDataIsTriangular(amg_data)         ((amg_data) -> is_triangular)
@@ -333,8 +363,9 @@ typedef struct
 #define hypre_ParAMGDataOuterWt(amg_data) ((amg_data)->outer_wt)
 
 /* problem data parameters */
-#define  hypre_ParAMGDataNumVariables(amg_data)  ((amg_data)->num_variables)
+#define hypre_ParAMGDataNumVariables(amg_data)  ((amg_data)->num_variables)
 #define hypre_ParAMGDataNumFunctions(amg_data) ((amg_data)->num_functions)
+#define hypre_ParAMGDataFilterFunctions(amg_data) ((amg_data)->filter_functions)
 #define hypre_ParAMGDataNodal(amg_data) ((amg_data)->nodal)
 #define hypre_ParAMGDataNodalLevels(amg_data) ((amg_data)->nodal_levels)
 #define hypre_ParAMGDataNodalDiag(amg_data) ((amg_data)->nodal_diag)
@@ -383,8 +414,24 @@ typedef struct
 #define hypre_ParAMGDataILULevel(amg_data) ((amg_data)->ilu_lfil)
 #define hypre_ParAMGDataILUMaxRowNnz(amg_data) ((amg_data)->ilu_max_row_nnz)
 #define hypre_ParAMGDataILUDroptol(amg_data) ((amg_data)->ilu_droptol)
+#define hypre_ParAMGDataILUTriSolve(amg_data) ((amg_data)->ilu_tri_solve)
+#define hypre_ParAMGDataILULowerJacobiIters(amg_data) ((amg_data)->ilu_lower_jacobi_iters)
+#define hypre_ParAMGDataILUUpperJacobiIters(amg_data) ((amg_data)->ilu_upper_jacobi_iters)
 #define hypre_ParAMGDataILUMaxIter(amg_data) ((amg_data)->ilu_max_iter)
 #define hypre_ParAMGDataILULocalReordering(amg_data) ((amg_data)->ilu_reordering_type)
+#define hypre_ParAMGDataILUIterSetupType(amg_data) ((amg_data)->ilu_iter_setup_type)
+#define hypre_ParAMGDataILUIterSetupOption(amg_data) ((amg_data)->ilu_iter_setup_option)
+#define hypre_ParAMGDataILUIterSetupMaxIter(amg_data) ((amg_data)->ilu_iter_setup_max_iter)
+#define hypre_ParAMGDataILUIterSetupTolerance(amg_data) ((amg_data)->ilu_iter_setup_tolerance)
+#define hypre_ParAMGDataFSAIAlgoType(amg_data) ((amg_data)->fsai_algo_type)
+#define hypre_ParAMGDataFSAILocalSolveType(amg_data) ((amg_data)->fsai_local_solve_type)
+#define hypre_ParAMGDataFSAIMaxSteps(amg_data) ((amg_data)->fsai_max_steps)
+#define hypre_ParAMGDataFSAIMaxStepSize(amg_data) ((amg_data)->fsai_max_step_size)
+#define hypre_ParAMGDataFSAIMaxNnzRow(amg_data) ((amg_data)->fsai_max_nnz_row)
+#define hypre_ParAMGDataFSAINumLevels(amg_data) ((amg_data)->fsai_num_levels)
+#define hypre_ParAMGDataFSAIThreshold(amg_data) ((amg_data)->fsai_threshold)
+#define hypre_ParAMGDataFSAIEigMaxIters(amg_data) ((amg_data)->fsai_eig_max_iters)
+#define hypre_ParAMGDataFSAIKapTolerance(amg_data) ((amg_data)->fsai_kap_tolerance)
 
 #define hypre_ParAMGDataMaxEigEst(amg_data) ((amg_data)->max_eig_est)
 #define hypre_ParAMGDataMinEigEst(amg_data) ((amg_data)->min_eig_est)
@@ -396,6 +443,8 @@ typedef struct
 #define hypre_ParAMGDataChebyDS(amg_data) ((amg_data)->cheby_ds)
 #define hypre_ParAMGDataChebyCoefs(amg_data) ((amg_data)->cheby_coefs)
 
+#define hypre_ParAMGDataCumNnzAP(amg_data)   ((amg_data)->cum_nnz_AP)
+
 /* block */
 #define hypre_ParAMGDataABlockArray(amg_data) ((amg_data)->A_block_array)
 #define hypre_ParAMGDataPBlockArray(amg_data) ((amg_data)->P_block_array)
@@ -461,9 +510,12 @@ typedef struct
 #define hypre_ParAMGDataParticipate(amg_data) ((amg_data)->participate)
 
 #define hypre_ParAMGDataGSSetup(amg_data) ((amg_data)->gs_setup)
+#define hypre_ParAMGDataGEMemoryLocation(amg_data) ((amg_data)->ge_memory_location)
 #define hypre_ParAMGDataAMat(amg_data) ((amg_data)->A_mat)
-#define hypre_ParAMGDataAInv(amg_data) ((amg_data)->A_inv)
+#define hypre_ParAMGDataAWork(amg_data) ((amg_data)->A_work)
+#define hypre_ParAMGDataAPiv(amg_data) ((amg_data)->A_piv)
 #define hypre_ParAMGDataBVec(amg_data) ((amg_data)->b_vec)
+#define hypre_ParAMGDataUVec(amg_data) ((amg_data)->u_vec)
 #define hypre_ParAMGDataCommInfo(amg_data) ((amg_data)->comm_info)
 
 /* additive AMG parameters */
diff --git a/external/hypre/src/parcsr_ls/par_amg_setup.c b/external/hypre/src/parcsr_ls/par_amg_setup.c
index d9bbf286..544bdd66 100644
--- a/external/hypre/src/parcsr_ls/par_amg_setup.c
+++ b/external/hypre/src/parcsr_ls/par_amg_setup.c
@@ -1,27 +1,29 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
  ******************************************************************************/
 
+#include "_hypre_onedpl.hpp"
 #include "_hypre_parcsr_ls.h"
 #include "par_amg.h"
 #include "../parcsr_block_mv/par_csr_block_matrix.h"
+#include "_hypre_utilities.hpp"
 
 #define DEBUG 0
 #define PRINT_CF 0
-
 #define DEBUG_SAVE_ALL_OPS 0
+
 /*****************************************************************************
  *
  * Routine for driving the setup phase of AMG
  *
  *****************************************************************************/
 
-/*****************************************************************************
+/*--------------------------------------------------------------------------
  * hypre_BoomerAMGSetup
- *****************************************************************************/
+ *--------------------------------------------------------------------------*/
 
 HYPRE_Int
 hypre_BoomerAMGSetup( void               *amg_vdata,
@@ -29,10 +31,12 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
                       hypre_ParVector    *f,
                       hypre_ParVector    *u )
 {
-   MPI_Comm            comm = hypre_ParCSRMatrixComm(A);
-   hypre_ParAMGData   *amg_data = (hypre_ParAMGData*) amg_vdata;
+   MPI_Comm             comm = hypre_ParCSRMatrixComm(A);
+   hypre_ParAMGData    *amg_data = (hypre_ParAMGData*) amg_vdata;
+   hypre_ParCSRMatrix  *A_tilde = A;
 
    /* Data Structure variables */
+   HYPRE_Int            num_vectors;
    hypre_ParCSRMatrix **A_array;
    hypre_ParVector    **F_array;
    hypre_ParVector    **U_array;
@@ -85,10 +89,13 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
    hypre_ParCSRBlockMatrix **A_block_array, **P_block_array, **R_block_array;
 
    HYPRE_MemoryLocation memory_location = hypre_ParCSRMatrixMemoryLocation(A);
+   hypre_ParAMGDataMemoryLocation(amg_data) = memory_location;
+#if defined(HYPRE_USING_GPU)
+   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1(memory_location);
+#endif
 
    /* Local variables */
    HYPRE_Int           *CF_marker;
-   hypre_IntArray      *CF_marker_host;
    hypre_IntArray      *CFN_marker = NULL;
    hypre_IntArray      *CF2_marker = NULL;
    hypre_IntArray      *CF3_marker = NULL;
@@ -118,18 +125,18 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
    HYPRE_Int       setup_type;
    HYPRE_BigInt    fine_size;
    HYPRE_Int       offset;
-   HYPRE_Real      size;
    HYPRE_Int       not_finished_coarsening = 1;
    HYPRE_Int       coarse_threshold = hypre_ParAMGDataMaxCoarseSize(amg_data);
    HYPRE_Int       min_coarse_size = hypre_ParAMGDataMinCoarseSize(amg_data);
    HYPRE_Int       seq_threshold = hypre_ParAMGDataSeqThreshold(amg_data);
    HYPRE_Int       j, k;
-   HYPRE_Int       num_procs,my_id;
-#if !defined(HYPRE_USING_CUDA) && !defined(HYPRE_USING_HIP)
+   HYPRE_Int       num_procs, my_id;
+#if !defined(HYPRE_USING_GPU)
    HYPRE_Int       num_threads = hypre_NumThreads();
 #endif
    HYPRE_Int      *grid_relax_type = hypre_ParAMGDataGridRelaxType(amg_data);
    HYPRE_Int       num_functions = hypre_ParAMGDataNumFunctions(amg_data);
+   HYPRE_Int       filter_functions = hypre_ParAMGDataFilterFunctions(amg_data);
    HYPRE_Int       nodal = hypre_ParAMGDataNodal(amg_data);
    HYPRE_Int       nodal_levels = hypre_ParAMGDataNodalLevels(amg_data);
    HYPRE_Int       nodal_diag = hypre_ParAMGDataNodalDiag(amg_data);
@@ -138,14 +145,14 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
    HYPRE_Int       agg_interp_type = hypre_ParAMGDataAggInterpType(amg_data);
    HYPRE_Int       sep_weight = hypre_ParAMGDataSepWeight(amg_data);
    hypre_IntArray *coarse_dof_func = NULL;
-   HYPRE_BigInt   *coarse_pnts_global = NULL;
-   HYPRE_BigInt   *coarse_pnts_global1 = NULL;
+   HYPRE_BigInt    coarse_pnts_global[2];
+   HYPRE_BigInt    coarse_pnts_global1[2];
    HYPRE_Int       num_cg_sweeps;
 
    HYPRE_Real *max_eig_est = NULL;
    HYPRE_Real *min_eig_est = NULL;
 
-   HYPRE_Solver *smoother = NULL;
+   HYPRE_Solver *smoother = hypre_ParAMGDataSmoother(amg_data);
    HYPRE_Int     smooth_type = hypre_ParAMGDataSmoothType(amg_data);
    HYPRE_Int     smooth_num_levels = hypre_ParAMGDataSmoothNumLevels(amg_data);
    HYPRE_Int     sym;
@@ -162,8 +169,20 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
    HYPRE_Int     ilu_lfil;
    HYPRE_Int     ilu_max_row_nnz;
    HYPRE_Int     ilu_max_iter;
+   HYPRE_Int     ilu_tri_solve;
+   HYPRE_Int     ilu_lower_jacobi_iters;
+   HYPRE_Int     ilu_upper_jacobi_iters;
    HYPRE_Real    ilu_droptol;
    HYPRE_Int     ilu_reordering_type;
+   HYPRE_Int     fsai_algo_type;
+   HYPRE_Int     fsai_local_solve_type;
+   HYPRE_Int     fsai_max_steps;
+   HYPRE_Int     fsai_max_step_size;
+   HYPRE_Int     fsai_max_nnz_row;
+   HYPRE_Int     fsai_num_levels;
+   HYPRE_Real    fsai_threshold;
+   HYPRE_Int     fsai_eig_max_iters;
+   HYPRE_Real    fsai_kap_tolerance;
    HYPRE_Int     needZ = 0;
 
    HYPRE_Int interp_type, restri_type;
@@ -172,15 +191,15 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
 
    /*for fittting interp vectors */
    /*HYPRE_Int                smooth_interp_vectors= hypre_ParAMGSmoothInterpVectors(amg_data); */
-   HYPRE_Real         abs_q_trunc= hypre_ParAMGInterpVecAbsQTrunc(amg_data);
+   HYPRE_Real         abs_q_trunc = hypre_ParAMGInterpVecAbsQTrunc(amg_data);
    HYPRE_Int                q_max = hypre_ParAMGInterpVecQMax(amg_data);
-   HYPRE_Int                num_interp_vectors= hypre_ParAMGNumInterpVectors(amg_data);
+   HYPRE_Int                num_interp_vectors = hypre_ParAMGNumInterpVectors(amg_data);
    HYPRE_Int                num_levels_interp_vectors = hypre_ParAMGNumLevelsInterpVectors(amg_data);
    hypre_ParVector  **interp_vectors = hypre_ParAMGInterpVectors(amg_data);
-   hypre_ParVector ***interp_vectors_array= hypre_ParAMGInterpVectorsArray(amg_data);
-   HYPRE_Int                interp_vec_variant= hypre_ParAMGInterpVecVariant(amg_data);
-   HYPRE_Int                interp_refine= hypre_ParAMGInterpRefine(amg_data);
-   HYPRE_Int                interp_vec_first_level= hypre_ParAMGInterpVecFirstLevel(amg_data);
+   hypre_ParVector ***interp_vectors_array = hypre_ParAMGInterpVectorsArray(amg_data);
+   HYPRE_Int                interp_vec_variant = hypre_ParAMGInterpVecVariant(amg_data);
+   HYPRE_Int                interp_refine = hypre_ParAMGInterpRefine(amg_data);
+   HYPRE_Int                interp_vec_first_level = hypre_ParAMGInterpVecFirstLevel(amg_data);
    HYPRE_Real        *expandp_weights =  hypre_ParAMGDataExpandPWeights(amg_data);
 
    /* parameters for non-Galerkin stuff */
@@ -209,22 +228,29 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
 
    HYPRE_Int      *num_grid_sweeps = hypre_ParAMGDataNumGridSweeps(amg_data);
    HYPRE_Int       ns = num_grid_sweeps[1];
-   HYPRE_Real      wall_time;   /* for debugging instrumentation */
+   HYPRE_Real      wall_time = 0.0;   /* for debugging instrumentation */
    HYPRE_Int       add_end;
 
 #ifdef HYPRE_USING_DSUPERLU
    HYPRE_Int       dslu_threshold = hypre_ParAMGDataDSLUThreshold(amg_data);
 #endif
 
+   char            nvtx_name[1024];
+
+   HYPRE_Real cum_nnz_AP = hypre_ParAMGDataCumNnzAP(amg_data);
+
+   HYPRE_ANNOTATE_FUNC_BEGIN;
+   hypre_GpuProfilingPushRange("AMGsetup");
+   hypre_MemoryPrintUsage(comm, hypre_HandleLogLevel(hypre_handle()), "BoomerAMG setup begin", 0);
    hypre_MPI_Comm_size(comm, &num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_rank(comm, &my_id);
 
    /*A_new = hypre_CSRMatrixDeleteZeros(hypre_ParCSRMatrixDiag(A), 1.e-16);
    hypre_CSRMatrixPrint(A_new, "Atestnew"); */
    old_num_levels = hypre_ParAMGDataNumLevels(amg_data);
    max_levels = hypre_ParAMGDataMaxLevels(amg_data);
-   add_end = hypre_min(add_last_lvl, max_levels-1);
-   if (add_end == -1) add_end = max_levels-1;
+   add_end = hypre_min(add_last_lvl, max_levels - 1);
+   if (add_end == -1) { add_end = max_levels - 1; }
    amg_logging = hypre_ParAMGDataLogging(amg_data);
    amg_print_level = hypre_ParAMGDataPrintLevel(amg_data);
    coarsen_type = hypre_ParAMGDataCoarsenType(amg_data);
@@ -247,8 +273,20 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
    ilu_lfil = hypre_ParAMGDataILULevel(amg_data);
    ilu_max_row_nnz = hypre_ParAMGDataILUMaxRowNnz(amg_data);
    ilu_droptol = hypre_ParAMGDataILUDroptol(amg_data);
+   ilu_tri_solve = hypre_ParAMGDataILUTriSolve(amg_data);
+   ilu_lower_jacobi_iters = hypre_ParAMGDataILULowerJacobiIters(amg_data);
+   ilu_upper_jacobi_iters = hypre_ParAMGDataILUUpperJacobiIters(amg_data);
    ilu_max_iter = hypre_ParAMGDataILUMaxIter(amg_data);
    ilu_reordering_type = hypre_ParAMGDataILULocalReordering(amg_data);
+   fsai_algo_type = hypre_ParAMGDataFSAIAlgoType(amg_data);
+   fsai_local_solve_type = hypre_ParAMGDataFSAILocalSolveType(amg_data);
+   fsai_max_steps = hypre_ParAMGDataFSAIMaxSteps(amg_data);
+   fsai_max_step_size = hypre_ParAMGDataFSAIMaxStepSize(amg_data);
+   fsai_max_nnz_row = hypre_ParAMGDataFSAIMaxNnzRow(amg_data);
+   fsai_num_levels = hypre_ParAMGDataFSAINumLevels(amg_data);
+   fsai_threshold = hypre_ParAMGDataFSAIThreshold(amg_data);
+   fsai_eig_max_iters = hypre_ParAMGDataFSAIEigMaxIters(amg_data);
+   fsai_kap_tolerance = hypre_ParAMGDataFSAIKapTolerance(amg_data);
    interp_type = hypre_ParAMGDataInterpType(amg_data);
    restri_type = hypre_ParAMGDataRestriction(amg_data); /* RL */
    post_interp_type = hypre_ParAMGDataPostInterpType(amg_data);
@@ -264,8 +302,8 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
    hypre_ParCSRMatrixSetDNumNonzeros(A);
    hypre_ParAMGDataNumVariables(amg_data) = hypre_ParCSRMatrixNumRows(A);
 
-   if (num_procs == 1) seq_threshold = 0;
-   if (setup_type == 0) return hypre_error_flag;
+   if (num_procs == 1) { seq_threshold = 0; }
+   if (setup_type == 0) { return hypre_error_flag; }
 
    S = NULL;
 
@@ -282,6 +320,7 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
    if (dof_func && hypre_IntArraySize(dof_func) < 0)
    {
       hypre_IntArraySize(dof_func) = local_size;
+      hypre_IntArrayMemoryLocation(dof_func) = memory_location;
    }
 
    A_block_array = hypre_ParAMGDataABlockArray(amg_data);
@@ -290,7 +329,21 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
 
    grid_relax_type[3] = hypre_ParAMGDataUserCoarseRelaxType(amg_data);
 
-   HYPRE_ANNOTATE_FUNC_BEGIN;
+   /* Get the number of vector components when LHS/RHS are passed in */
+   if ((f != NULL) && (u != NULL))
+   {
+      /* Verify that the number of vectors held by f and u match */
+      if (hypre_ParVectorNumVectors(f) != hypre_ParVectorNumVectors(u))
+      {
+         hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Error: num_vectors for RHS and LHS do not match!\n");
+         return hypre_error_flag;
+      }
+      num_vectors = hypre_ParVectorNumVectors(f);
+   }
+   else
+   {
+      num_vectors = 1;
+   }
 
    /* change in definition of standard and multipass interpolation, by
       eliminating interp_type 9 and 5 and setting sep_weight instead
@@ -312,54 +365,61 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
    if (interp_vec_variant > 0 && nodal < 1)
    {
       nodal = 1;
-      hypre_error_w_msg(HYPRE_ERROR_GENERIC,"WARNING: Changing to node-based coarsening because LN of GM interpolation has been specified via HYPRE_BoomerAMGSetInterpVecVariant.\n");
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                        "WARNING: Changing to node-based coarsening because LN of GM interpolation has been specified via HYPRE_BoomerAMGSetInterpVecVariant.\n");
    }
 
-   /* Verify that settings are correct for solving systmes */
+   /* Verify that settings are correct for solving systems */
    /* If the user has specified either a block interpolation or a block relaxation then
-      we need to make sure the other has been choosen as well  - so we can be
+      we need to make sure the other has been chosen as well  - so we can be
       in "block mode" - storing only block matrices on the coarse levels*/
    /* Furthermore, if we are using systems and nodal = 0, then
       we will change nodal to 1 */
-   /* probably should disable stuff like smooth num levels at some point */
+   /* probably should disable stuff like smooth number levels at some point */
 
 
-   if (grid_relax_type[0] >= 20) /* block relaxation choosen */
+   if (grid_relax_type[0] >= 20 && grid_relax_type[0] != 30 &&
+       grid_relax_type[0] != 88 && grid_relax_type[0] != 89)
    {
-
+      /* block relaxation chosen */
       if (!((interp_type >= 20 && interp_type != 100) || interp_type == 11 || interp_type == 10 ) )
       {
          hypre_ParAMGDataInterpType(amg_data) = 20;
          interp_type = hypre_ParAMGDataInterpType(amg_data) ;
       }
 
-      for (i=1; i < 3; i++)
+      for (i = 1; i < 3; i++)
       {
          if (grid_relax_type[i] < 20)
          {
             grid_relax_type[i] = 23;
          }
-
       }
-      if (grid_relax_type[3] < 20) grid_relax_type[3] = 29;  /* GE */
+      if (grid_relax_type[3] < 20)
+      {
+         grid_relax_type[3] = 29; /* GE */
+      }
 
       block_mode = 1;
    }
 
-   if ((interp_type >= 20 && interp_type != 100) || interp_type == 11 || interp_type == 10 ) /* block interp choosen */
+   if ((interp_type >= 20 && interp_type != 100) || interp_type == 11 ||
+       interp_type == 10 ) /* block interp choosen */
    {
       if (!(nodal))
       {
          hypre_ParAMGDataNodal(amg_data) = 1;
          nodal = hypre_ParAMGDataNodal(amg_data);
       }
-      for (i=0; i < 3; i++)
+      for (i = 0; i < 3; i++)
       {
          if (grid_relax_type[i] < 20)
+         {
             grid_relax_type[i] = 23;
+         }
       }
 
-      if (grid_relax_type[3] < 20) grid_relax_type[3] = 29; /* GE */
+      if (grid_relax_type[3] < 20) { grid_relax_type[3] = 29; } /* GE */
 
       block_mode = 1;
 
@@ -389,11 +449,11 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
             A_block_array[j] = NULL;
          }
 
-         hypre_IntArrayDestroy(dof_func_array[i]);
-         dof_func_array[i] = NULL;
+         hypre_IntArrayDestroy(dof_func_array[j]);
+         dof_func_array[j] = NULL;
       }
 
-      for (j = 0; j < old_num_levels-1; j++)
+      for (j = 0; j < old_num_levels - 1; j++)
       {
          if (P_array[j])
          {
@@ -425,7 +485,7 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
       hypre_IntArrayDestroy(CF_marker_array[0]);
       CF_marker_array[0] = NULL;
 
-      for (j = 1; j < old_num_levels-1; j++)
+      for (j = 1; j < old_num_levels - 1; j++)
       {
          hypre_IntArrayDestroy(CF_marker_array[j]);
          CF_marker_array[j] = NULL;
@@ -469,9 +529,15 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
          hypre_ParAMGDataFCoarse(amg_data) = NULL;
       }
 
-      hypre_TFree(hypre_ParAMGDataAMat(amg_data), HYPRE_MEMORY_HOST);
-      hypre_TFree(hypre_ParAMGDataAInv(amg_data), HYPRE_MEMORY_HOST);
-      hypre_TFree(hypre_ParAMGDataBVec(amg_data), HYPRE_MEMORY_HOST);
+#if defined(HYPRE_USING_MAGMA)
+      hypre_TFree(hypre_ParAMGDataAPiv(amg_data),  HYPRE_MEMORY_HOST);
+#else
+      hypre_TFree(hypre_ParAMGDataAPiv(amg_data),  hypre_ParAMGDataGEMemoryLocation(amg_data));
+#endif
+      hypre_TFree(hypre_ParAMGDataAMat(amg_data),  hypre_ParAMGDataGEMemoryLocation(amg_data));
+      hypre_TFree(hypre_ParAMGDataAWork(amg_data), hypre_ParAMGDataGEMemoryLocation(amg_data));
+      hypre_TFree(hypre_ParAMGDataBVec(amg_data),  hypre_ParAMGDataGEMemoryLocation(amg_data));
+      hypre_TFree(hypre_ParAMGDataUVec(amg_data),  hypre_ParAMGDataGEMemoryLocation(amg_data));
       hypre_TFree(hypre_ParAMGDataCommInfo(amg_data), HYPRE_MEMORY_HOST);
 
       if (new_comm != hypre_MPI_COMM_NULL)
@@ -489,6 +555,24 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
       hypre_TFree(hypre_ParAMGDataMaxEigEst(amg_data), HYPRE_MEMORY_HOST);
       hypre_TFree(hypre_ParAMGDataMinEigEst(amg_data), HYPRE_MEMORY_HOST);
 
+      if (hypre_ParAMGDataChebyDS(amg_data))
+      {
+         for (i = 0; i < old_num_levels; i++)
+         {
+            hypre_SeqVectorDestroy(hypre_ParAMGDataChebyDS(amg_data)[i]);
+         }
+         hypre_TFree(hypre_ParAMGDataChebyDS(amg_data), HYPRE_MEMORY_HOST);
+      }
+
+      if (hypre_ParAMGDataChebyCoefs(amg_data))
+      {
+         for (i = 0; i < old_num_levels; i++)
+         {
+            hypre_TFree(hypre_ParAMGDataChebyCoefs(amg_data)[i], HYPRE_MEMORY_HOST);
+         }
+         hypre_TFree(hypre_ParAMGDataChebyCoefs(amg_data), HYPRE_MEMORY_HOST);
+      }
+
       if (hypre_ParAMGDataL1Norms(amg_data))
       {
          for (i = 0; i < old_num_levels; i++)
@@ -499,13 +583,14 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
       }
       if (smooth_num_levels && smoother)
       {
-         if (smooth_num_levels > old_num_levels-1)
+         if (smooth_num_levels > 1 &&
+             smooth_num_levels > old_num_levels - 1)
          {
-           smooth_num_levels = old_num_levels -1;
+            smooth_num_levels = old_num_levels - 1;
          }
          if (hypre_ParAMGDataSmoothType(amg_data) == 7)
          {
-            for (i=0; i < smooth_num_levels; i++)
+            for (i = 0; i < smooth_num_levels; i++)
             {
                if (smoother[i])
                {
@@ -516,7 +601,7 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
          }
          else if (hypre_ParAMGDataSmoothType(amg_data) == 8)
          {
-            for (i=0; i < smooth_num_levels; i++)
+            for (i = 0; i < smooth_num_levels; i++)
             {
                if (smoother[i])
                {
@@ -527,7 +612,7 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
          }
          else if (hypre_ParAMGDataSmoothType(amg_data) == 9)
          {
-            for (i=0; i < smooth_num_levels; i++)
+            for (i = 0; i < smooth_num_levels; i++)
             {
                if (smoother[i])
                {
@@ -536,9 +621,20 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
                }
             }
          }
+         else if (hypre_ParAMGDataSmoothType(amg_data) == 4)
+         {
+            for (i = 0; i < smooth_num_levels; i++)
+            {
+               if (smoother[i])
+               {
+                  HYPRE_FSAIDestroy(smoother[i]);
+                  smoother[i] = NULL;
+               }
+            }
+         }
          else if (hypre_ParAMGDataSmoothType(amg_data) == 5)
          {
-            for (i=0; i < smooth_num_levels; i++)
+            for (i = 0; i < smooth_num_levels; i++)
             {
                if (smoother[i])
                {
@@ -549,7 +645,7 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
          }
          else if (hypre_ParAMGDataSmoothType(amg_data) == 6)
          {
-            for (i=0; i < smooth_num_levels; i++)
+            for (i = 0; i < smooth_num_levels; i++)
             {
                if (smoother[i])
                {
@@ -578,11 +674,11 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
 
    if (P_array == NULL && max_levels > 1)
    {
-      P_array = hypre_CTAlloc(hypre_ParCSRMatrix*, max_levels-1, HYPRE_MEMORY_HOST);
+      P_array = hypre_CTAlloc(hypre_ParCSRMatrix*, max_levels - 1, HYPRE_MEMORY_HOST);
    }
    if (P_block_array == NULL && max_levels > 1)
    {
-      P_block_array = hypre_CTAlloc(hypre_ParCSRBlockMatrix*, max_levels-1, HYPRE_MEMORY_HOST);
+      P_block_array = hypre_CTAlloc(hypre_ParCSRBlockMatrix*, max_levels - 1, HYPRE_MEMORY_HOST);
    }
 
    /* RL: if retri_type != 0, R != P^T, allocate R matrices */
@@ -590,11 +686,11 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
    {
       if (R_array == NULL && max_levels > 1)
       {
-         R_array = hypre_CTAlloc(hypre_ParCSRMatrix*, max_levels-1, HYPRE_MEMORY_HOST);
+         R_array = hypre_CTAlloc(hypre_ParCSRMatrix*, max_levels - 1, HYPRE_MEMORY_HOST);
       }
       if (R_block_array == NULL && max_levels > 1)
       {
-         R_block_array = hypre_CTAlloc(hypre_ParCSRBlockMatrix*, max_levels-1, HYPRE_MEMORY_HOST);
+         R_block_array = hypre_CTAlloc(hypre_ParCSRBlockMatrix*, max_levels - 1, HYPRE_MEMORY_HOST);
       }
    }
 
@@ -605,16 +701,47 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
 
    if (num_C_points_coarse > 0)
    {
-      k = 0;
-      for (j = 0; j < num_C_points_coarse; j++)
+#if defined(HYPRE_USING_GPU)
+      if (exec == HYPRE_EXEC_DEVICE)
+      {
+#if defined(HYPRE_USING_SYCL)
+         HYPRE_Int *new_end =
+            hypreSycl_copy_if( C_points_marker,
+                               C_points_marker + num_C_points_coarse,
+                               C_points_marker,
+                               C_points_local_marker,
+                               in_range<HYPRE_BigInt>(first_local_row, first_local_row + local_size - 1) );
+         HYPRE_ONEDPL_CALL( std::transform,
+                            C_points_local_marker,
+                            C_points_local_marker + num_C_points_coarse,
+                            C_points_local_marker,
+         [first_local_row = first_local_row] (const auto & x) {return x - first_local_row;} );
+#else
+         HYPRE_Int *new_end =
+            HYPRE_THRUST_CALL( copy_if,
+                               thrust::make_transform_iterator(C_points_marker,                       _1 - first_local_row),
+                               thrust::make_transform_iterator(C_points_marker + num_C_points_coarse, _1 - first_local_row),
+                               C_points_marker,
+                               C_points_local_marker,
+                               in_range<HYPRE_BigInt>(first_local_row, first_local_row + local_size - 1) );
+#endif
+
+         num_C_points_coarse = new_end - C_points_local_marker;
+      }
+      else
+#endif /* defined(HYPRE_USING_GPU) */
       {
-         row = (HYPRE_Int) (C_points_marker[j] - first_local_row);
-         if ((row >= 0) && (row < local_size))
+         k = 0;
+         for (j = 0; j < num_C_points_coarse; j++)
          {
-            C_points_local_marker[k++] = row;
+            row = (HYPRE_Int) (C_points_marker[j] - first_local_row);
+            if ((row >= 0) && (row < local_size))
+            {
+               C_points_local_marker[k++] = row;
+            }
          }
+         num_C_points_coarse = k;
       }
-      num_C_points_coarse = k;
    }
 
    if (dof_func_array == NULL)
@@ -625,21 +752,32 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
    if (num_functions > 1 && dof_func == NULL)
    {
       dof_func = hypre_IntArrayCreate(local_size);
-      hypre_IntArrayInitialize(dof_func);
+      hypre_IntArrayInitialize_v2(dof_func, memory_location);
 
       offset = (HYPRE_Int) ( first_local_row % ((HYPRE_BigInt) num_functions) );
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-      hypre_BoomerAMGInitDofFuncDevice(hypre_IntArrayData(dof_func), local_size, offset, num_functions);
-#else
-      for (i = 0; i < local_size; i++)
+#if defined(HYPRE_USING_GPU)
+      if (exec == HYPRE_EXEC_DEVICE)
       {
-         hypre_IntArrayData(dof_func)[i] = (i + offset) % num_functions;
+         hypre_BoomerAMGInitDofFuncDevice(hypre_IntArrayData(dof_func), local_size, offset, num_functions);
+      }
+      else
+#endif /* defined(HYPRE_USING_GPU) */
+      {
+         for (i = 0; i < local_size; i++)
+         {
+            hypre_IntArrayData(dof_func)[i] = (i + offset) % num_functions;
+         }
       }
-#endif /* defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP) */
    }
 
-   A_array[0] = A;
+   /* Eliminate inter-variable connections among functions for preconditioning purposes */
+   if (num_functions > 1 && filter_functions)
+   {
+      hypre_ParCSRMatrixBlkFilter(A, num_functions, &A_tilde);
+   }
+
+   A_array[0] = A_tilde;
 
    /* interp vectors setup */
    if (interp_vec_variant == 1)
@@ -647,11 +785,12 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
       num_levels_interp_vectors = interp_vec_first_level + 1;
       hypre_ParAMGNumLevelsInterpVectors(amg_data) = num_levels_interp_vectors;
    }
-   if ( interp_vec_variant > 0 &&  num_interp_vectors > 0)
+   if (interp_vec_variant > 0 && num_interp_vectors > 0)
    {
-      interp_vectors_array =  hypre_CTAlloc(hypre_ParVector**, num_levels_interp_vectors, HYPRE_MEMORY_HOST);
+      interp_vectors_array =  hypre_CTAlloc(hypre_ParVector**, num_levels_interp_vectors,
+                                            HYPRE_MEMORY_HOST);
       interp_vectors_array[0] = interp_vectors;
-      hypre_ParAMGInterpVectorsArray(amg_data)= interp_vectors_array;
+      hypre_ParAMGInterpVectorsArray(amg_data) = interp_vectors_array;
    }
 
    if (block_mode)
@@ -704,6 +843,7 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
    Vtemp = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A_array[0]),
                                  hypre_ParCSRMatrixGlobalNumRows(A_array[0]),
                                  hypre_ParCSRMatrixRowStarts(A_array[0]));
+   hypre_ParVectorNumVectors(Vtemp) = num_vectors;
    hypre_ParVectorInitialize_v2(Vtemp, memory_location);
    hypre_ParAMGDataVtemp(amg_data) = Vtemp;
 
@@ -711,11 +851,13 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
     * If cheby_scale is false, only need one, otherwise need two */
    if ((smooth_num_levels > 0 && smooth_type > 9) || relax_weight[0] < 0 || omega[0] < 0 ||
        hypre_ParAMGDataSchwarzRlxWeight(amg_data) < 0 ||
-       (grid_relax_type[0] == 16 || grid_relax_type[1] == 16 || grid_relax_type[2] == 16 || grid_relax_type[3] == 16))
+       (grid_relax_type[0] == 16 || grid_relax_type[1] == 16 || grid_relax_type[2] == 16 ||
+        grid_relax_type[3] == 16))
    {
       Ptemp = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A_array[0]),
                                     hypre_ParCSRMatrixGlobalNumRows(A_array[0]),
                                     hypre_ParCSRMatrixRowStarts(A_array[0]));
+      hypre_ParVectorNumVectors(Ptemp) = num_vectors;
       hypre_ParVectorInitialize_v2(Ptemp, memory_location);
       hypre_ParAMGDataPtemp(amg_data) = Ptemp;
 
@@ -727,24 +869,27 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
          Rtemp = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A_array[0]),
                                        hypre_ParCSRMatrixGlobalNumRows(A_array[0]),
                                        hypre_ParCSRMatrixRowStarts(A_array[0]));
+         hypre_ParVectorNumVectors(Rtemp) = num_vectors;
          hypre_ParVectorInitialize_v2(Rtemp, memory_location);
          hypre_ParAMGDataRtemp(amg_data) = Rtemp;
       }
    }
 
    /* See if we need the Ztemp vector */
-   if ( (smooth_num_levels > 0 && smooth_type > 6) || relax_weight[0] < 0 || omega[0] < 0 || hypre_ParAMGDataSchwarzRlxWeight(amg_data) < 0 )
+   if ( (smooth_num_levels > 0 && smooth_type > 6) || relax_weight[0] < 0 || omega[0] < 0 ||
+        hypre_ParAMGDataSchwarzRlxWeight(amg_data) < 0 )
    {
       needZ = hypre_max(needZ, 1);
    }
 
-   if ( grid_relax_type[0] == 16 || grid_relax_type[1] == 16 || grid_relax_type[2] == 16 || grid_relax_type[3] == 16 )
+   if ( grid_relax_type[0] == 16 || grid_relax_type[1] == 16 || grid_relax_type[2] == 16 ||
+        grid_relax_type[3] == 16 )
    {
       /* Chebyshev */
       needZ = hypre_max(needZ, 1);
    }
 
-#if !defined(HYPRE_USING_CUDA) && !defined(HYPRE_USING_HIP)
+#if !defined(HYPRE_USING_GPU)
    /* GPU impl. needs Z */
    if (num_threads > 1)
 #endif
@@ -754,7 +899,8 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
       {
          if (grid_relax_type[j] ==  3 || grid_relax_type[j] ==  4 || grid_relax_type[j] ==  6 ||
              grid_relax_type[j] ==  8 || grid_relax_type[j] == 13 || grid_relax_type[j] == 14 ||
-             grid_relax_type[j] == 11 || grid_relax_type[j] == 12)
+             grid_relax_type[j] == 11 || grid_relax_type[j] == 12 || grid_relax_type[j] == 88 ||
+             grid_relax_type[j] == 89)
          {
             needZ = hypre_max(needZ, 1);
             break;
@@ -767,7 +913,7 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
       Ztemp = hypre_ParMultiVectorCreate(hypre_ParCSRMatrixComm(A_array[0]),
                                          hypre_ParCSRMatrixGlobalNumRows(A_array[0]),
                                          hypre_ParCSRMatrixRowStarts(A_array[0]),
-                                         needZ);
+                                         num_vectors);
       hypre_ParVectorInitialize_v2(Ztemp, memory_location);
       hypre_ParAMGDataZtemp(amg_data) = Ztemp;
    }
@@ -815,6 +961,9 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
    level = 0;
    HYPRE_ANNOTATE_MGLEVEL_BEGIN(level);
 
+   hypre_sprintf(nvtx_name, "%s-%d", "AMG Level", level);
+   hypre_GpuProfilingPushRange(nvtx_name);
+
    strong_threshold = hypre_ParAMGDataStrongThreshold(amg_data);
    coarsen_cut_factor = hypre_ParAMGDataCoarsenCutFactor(amg_data);
    useSabs = hypre_ParAMGDataSabs(amg_data);
@@ -827,6 +976,7 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
    agg_P_max_elmts = hypre_ParAMGDataAggPMaxElmts(amg_data);
    agg_P12_max_elmts = hypre_ParAMGDataAggP12MaxElmts(amg_data);
    jacobi_trunc_threshold = hypre_ParAMGDataJacobiTruncThreshold(amg_data);
+   smooth_num_levels = hypre_ParAMGDataSmoothNumLevels(amg_data);
    if (smooth_num_levels > level)
    {
       smoother = hypre_CTAlloc(HYPRE_Solver, smooth_num_levels, HYPRE_MEMORY_HOST);
@@ -880,12 +1030,14 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
                hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A_array[level]),
                                      hypre_ParCSRMatrixGlobalNumRows(A_array[level]),
                                      hypre_ParCSRMatrixRowStarts(A_array[level]));
+            hypre_ParVectorNumVectors(F_array[level]) = num_vectors;
             hypre_ParVectorInitialize_v2(F_array[level], memory_location);
 
             U_array[level] =
                hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A_array[level]),
                                      hypre_ParCSRMatrixGlobalNumRows(A_array[level]),
                                      hypre_ParCSRMatrixRowStarts(A_array[level]));
+            hypre_ParVectorNumVectors(U_array[level]) = num_vectors;
             hypre_ParVectorInitialize_v2(U_array[level], memory_location);
          }
       }
@@ -901,18 +1053,17 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
          dof_func_data = hypre_IntArrayData(dof_func_array[level]);
       }
 
-      if (debug_flag==1) wall_time = time_getWallclockSeconds();
-      if (debug_flag==3)
+      if (debug_flag == 1) { wall_time = time_getWallclockSeconds(); }
+      if (debug_flag == 3)
       {
-          hypre_printf("\n ===== Proc = %d     Level = %d  =====\n",
-                        my_id, level);
-          fflush(NULL);
+         hypre_printf("\n ===== Proc = %d     Level = %d  =====\n",
+                      my_id, level);
+         fflush(NULL);
       }
 
       if (max_levels == 1)
       {
          S = NULL;
-         coarse_pnts_global = NULL;
          CF_marker_array[level] = hypre_IntArrayCreate(local_size);
          hypre_IntArrayInitialize(CF_marker_array[level]);
          hypre_IntArraySetConstantValues(CF_marker_array[level], 1);
@@ -934,8 +1085,8 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
              hypre_ParAMGDataInterpType(amg_data) == 1)
          {
             hypre_BoomerAMGCreateSmoothVecs(amg_data, A_array[level],
-                  hypre_ParAMGDataNumGridSweeps(amg_data)[1],
-                  level, &SmoothVecs);
+                                            hypre_ParAMGDataNumGridSweeps(amg_data)[1],
+                                            level, &SmoothVecs);
          }
 
          /**** Get the Strength Matrix ****/
@@ -953,7 +1104,7 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
                }
                else
                {
-                  hypre_BoomerAMGCreateNodalA(A_array[level],num_functions,
+                  hypre_BoomerAMGCreateNodalA(A_array[level], num_functions,
                                               dof_func_data, hypre_abs(nodal), nodal_diag, &AN);
                }
 
@@ -1024,33 +1175,45 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
                first_local_row = hypre_ParCSRMatrixFirstRowIndex(A_array[level]);
             }
 
-            /* copy CF_marker to the host if needed */
-            if (hypre_GetActualMemLocation(hypre_IntArrayMemoryLocation(CF_marker_array[level])) == hypre_MEMORY_DEVICE)
+#if defined(HYPRE_USING_GPU)
+            HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_IntArrayMemoryLocation(
+                                                                  CF_marker_array[level]) );
+
+            if (exec == HYPRE_EXEC_DEVICE)
             {
-               CF_marker_host = hypre_IntArrayCloneDeep_v2(CF_marker_array[level], HYPRE_MEMORY_HOST);
+#if defined(HYPRE_USING_SYCL)
+               auto perm_it = oneapi::dpl::make_permutation_iterator(
+                                 hypre_IntArrayData(CF_marker_array[level]),
+                                 oneapi::dpl::make_transform_iterator( isolated_F_points_marker,
+               [first_local_row = first_local_row] (const auto & x) {return x - first_local_row;} ) );
+               hypreSycl_transform_if( perm_it,
+                                       perm_it + num_isolated_F_points,
+                                       isolated_F_points_marker,
+                                       perm_it,
+               [] (const auto & x) {return -3;},
+               in_range<HYPRE_BigInt>(first_local_row, first_local_row + local_size - 1) );
+#else
+               HYPRE_THRUST_CALL( scatter_if,
+                                  thrust::make_constant_iterator(-3),
+                                  thrust::make_constant_iterator(-3) + num_isolated_F_points,
+                                  thrust::make_transform_iterator(isolated_F_points_marker, _1 - first_local_row),
+                                  isolated_F_points_marker,
+                                  hypre_IntArrayData(CF_marker_array[level]),
+                                  in_range<HYPRE_BigInt>(first_local_row, first_local_row + local_size - 1) );
+#endif
             }
             else
+#endif
             {
-               CF_marker_host = CF_marker_array[level];
-            }
-
-            for (j = 0; j < num_isolated_F_points; j++)
-            {
-               row = (HYPRE_Int) (isolated_F_points_marker[j] - first_local_row);
-               if ((row >= 0) && (row < local_size))
+               for (j = 0; j < num_isolated_F_points; j++)
                {
-                  hypre_IntArrayData(CF_marker_host)[row] = -3; // Assumes SF_PT == -3
+                  row = (HYPRE_Int) (isolated_F_points_marker[j] - first_local_row);
+                  if ((row >= 0) && (row < local_size))
+                  {
+                     hypre_IntArrayData(CF_marker_array[level])[row] = -3; // Assumes SF_PT == -3
+                  }
                }
             }
-
-            /* copy back to device and destroy host copy */
-            if (hypre_GetActualMemLocation(hypre_IntArrayMemoryLocation(CF_marker_array[level])) == hypre_MEMORY_DEVICE)
-            {
-               hypre_IntArrayCopy(CF_marker_host, CF_marker_array[level]);
-               hypre_IntArrayDestroy(CF_marker_host);
-            }
-
-
          }
 
          /**** Do the appropriate coarsening ****/
@@ -1076,132 +1239,56 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
             else if (coarsen_type == 21 || coarsen_type == 22)
             {
 #ifdef HYPRE_MIXEDINT
-              hypre_error_w_msg(HYPRE_ERROR_GENERIC,"CGC coarsening is not available in mixedint mode!");
-              return hypre_error_flag;
+               hypre_error_w_msg(HYPRE_ERROR_GENERIC, "CGC coarsening is not available in mixedint mode!");
+               return hypre_error_flag;
 #endif
-              hypre_BoomerAMGCoarsenCGCb(S, A_array[level], measure_type, coarsen_type,
-                                         cgc_its, debug_flag, &(CF_marker_array[level]));
+               hypre_BoomerAMGCoarsenCGCb(S, A_array[level], measure_type, coarsen_type,
+                                          cgc_its, debug_flag, &(CF_marker_array[level]));
             }
             else if (coarsen_type == 98)
-              hypre_BoomerAMGCoarsenCR1(A_array[level], &(CF_marker_array[level]),
-                                        &coarse_size, num_CR_relax_steps, IS_type, 0);
+               hypre_BoomerAMGCoarsenCR1(A_array[level], &(CF_marker_array[level]),
+                                         &coarse_size, num_CR_relax_steps, IS_type, 0);
             else if (coarsen_type == 99)
             {
                hypre_BoomerAMGCreateS(A_array[level],
                                       CR_strong_th, 1,
-                                      num_functions, dof_func_data,&SCR);
+                                      num_functions, dof_func_data, &SCR);
                hypre_BoomerAMGCoarsenCR(A_array[level], &(CF_marker_array[level]),
                                         &coarse_size,
                                         num_CR_relax_steps, IS_type, 1, grid_relax_type[0],
                                         relax_weight[level], omega[level], CR_rate,
-                                        NULL,NULL,CR_use_CG,SCR);
+                                        NULL, NULL, CR_use_CG, SCR);
                hypre_ParCSRMatrixDestroy(SCR);
             }
-#if DEBUG
-            else if (coarsen_type == 999)
+            else if (coarsen_type)
             {
-               /* RL_DEBUG: read C/F splitting from files */
-               /* read from file */
+               hypre_BoomerAMGCoarsenRuge(S, A_array[level], measure_type, coarsen_type,
+                                          coarsen_cut_factor, debug_flag, &(CF_marker_array[level]));
+               /* DEBUG: SAVE CF the splitting
                HYPRE_Int my_id;
                MPI_Comm comm = hypre_ParCSRMatrixComm(A_array[level]);
                hypre_MPI_Comm_rank(comm, &my_id);
-               HYPRE_Int first_local_row = hypre_ParCSRMatrixFirstRowIndex(A_array[level]);
-               HYPRE_Int local_size = hypre_CSRMatrixNumRows(hypre_ParCSRMatrixDiag(A_array[level]));
-               char CFfile[256], line[1024];
-               hypre_sprintf(CFfile, "CF_%d.txt", level);
-               hypre_printf("myid %d: level %d, read C/F from file %s, first_row %d, local_size %d\n",
-                             my_id, level, CFfile, first_local_row, local_size);
-               FILE *fp;
-               if ((fp = fopen(CFfile, "r")) == NULL)
-               {
-                  hypre_printf("cannot open file %s\n", CFfile);
-                  exit(0);
-               }
-               HYPRE_Int i;
-               for (i=0; i<first_local_row; i++)
-               {
-                  if (fgets(line, 1024, fp) == NULL)
-                  {
-                     exit(-1);
-                  }
-                  /*HYPRE_Real tmp; fscanf(fp, "%le\n", &tmp);*/
-               }
-
-               /* copy CF_marker to the host if needed */
-               if (hypre_GetActualMemLocation(hypre_IntArrayMemoryLocation(CF_marker_array[level])) == hypre_MEMORY_DEVICE)
-               {
-                  CF_marker_host = hypre_IntArrayCloneDeep_v2(CF_marker_array[level], HYPRE_MEMORY_HOST);
-               }
-               else
-               {
-                  CF_marker_host = CF_marker_array[level];
-               }
-
+               char CFfile[256];
+               hypre_sprintf(CFfile, "hypreCF_%d.txt.%d", level, my_id);
+               FILE *fp = fopen(CFfile, "w");
                for (i=0; i<local_size; i++)
                {
-                  HYPRE_Real dj;
-                  HYPRE_Int j;
-                  if (fgets(line, 1024, fp) == NULL)
-                  {
-                     hypre_printf("CF file read error\n");
-                     exit(0);
-                  }
-                  dj = atof(line);
-                  j = (HYPRE_Int) dj;
-                  /* 1: C, 0: F*/
-                  if (j == 1)
-                  {
-                     hypre_IntArrayData(CF_marker_host)[i] = 1;
-                  } else if (j == 0)
-                  {
-                     hypre_IntArrayData(CF_marker_host)[i] = -1;
-                  }
-                  else
-                  {
-                     hypre_printf("CF Error: %d\n", j);
-                     exit(0);
+                  HYPRE_Int k = CF_marker[i];
+                  HYPRE_Real j;
+                  if (k == 1) {
+                    j = 1.0;
+                  } else if (k == -1) {
+                    j = 0.0;
+                  } else {
+                    if (k < 0) {
+                      CF_marker[i] = -1;
+                    }
+                    j = (HYPRE_Real) k;
                   }
+                  hypre_fprintf(fp, "%.18e\n", j);
                }
-                     
-               /* copy back to device and destroy host copy */
-               if (hypre_GetActualMemLocation(hypre_IntArrayMemoryLocation(CF_marker_array[level])) == hypre_MEMORY_DEVICE)
-               {
-                  hypre_IntArrayCopy(CF_marker_host, CF_marker_array[level]);
-                  hypre_IntArrayDestroy(CF_marker_host);
-               }
-
                fclose(fp);
-            }
-#endif
-            else if (coarsen_type)
-            {
-               hypre_BoomerAMGCoarsenRuge(S, A_array[level], measure_type, coarsen_type,
-                                          coarsen_cut_factor, debug_flag, &(CF_marker_array[level]));
-                  /* DEBUG: SAVE CF the splitting
-                  HYPRE_Int my_id;
-                  MPI_Comm comm = hypre_ParCSRMatrixComm(A_array[level]);
-                  hypre_MPI_Comm_rank(comm, &my_id);
-                  char CFfile[256];
-                  hypre_sprintf(CFfile, "hypreCF_%d.txt.%d", level, my_id);
-                  FILE *fp = fopen(CFfile, "w");
-                  for (i=0; i<local_size; i++)
-                  {
-                     HYPRE_Int k = CF_marker[i];
-                     HYPRE_Real j;
-                     if (k == 1) {
-                       j = 1.0;
-                     } else if (k == -1) {
-                       j = 0.0;
-                     } else {
-                       if (k < 0) {
-                         CF_marker[i] = -1;
-                       }
-                       j = (HYPRE_Real) k;
-                     }
-                     hypre_fprintf(fp, "%.18e\n", j);
-                  }
-                  fclose(fp);
-                  */
+               */
             }
             else
             {
@@ -1213,12 +1300,12 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
             {
                hypre_BoomerAMGCoarseParms(comm, local_num_vars,
                                           1, dof_func_array[level], CF_marker_array[level],
-                                          &coarse_dof_func,&coarse_pnts_global1);
+                                          &coarse_dof_func, coarse_pnts_global1);
                hypre_BoomerAMGCreate2ndS(S, CF_marker, num_paths,
                                          coarse_pnts_global1, &S2);
                if (coarsen_type == 10)
                {
-                  hypre_BoomerAMGCoarsenHMIS(S2, S2, measure_type+3, coarsen_cut_factor,
+                  hypre_BoomerAMGCoarsenHMIS(S2, S2, measure_type + 3, coarsen_cut_factor,
                                              debug_flag, &CFN_marker);
                }
                else if (coarsen_type == 8)
@@ -1282,7 +1369,9 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
                hypre_BoomerAMGCoarsenRuge(SN, SN, measure_type, coarsen_type,
                                           coarsen_cut_factor, debug_flag, &(CF_marker_array[level]));
             else
+            {
                hypre_BoomerAMGCoarsen(SN, SN, 0, debug_flag, &(CF_marker_array[level]));
+            }
          }
          else if (nodal > 0)
          {
@@ -1290,11 +1379,17 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
                hypre_BoomerAMGCoarsenFalgout(SN, SN, measure_type, coarsen_cut_factor,
                                              debug_flag, &CFN_marker);
             else if (coarsen_type == 7)
+            {
                hypre_BoomerAMGCoarsen(SN, SN, 2, debug_flag, &CFN_marker);
+            }
             else if (coarsen_type == 8)
+            {
                hypre_BoomerAMGCoarsenPMIS(SN, SN, 0, debug_flag, &CFN_marker);
+            }
             else if (coarsen_type == 9)
+            {
                hypre_BoomerAMGCoarsenPMIS(SN, SN, 2, debug_flag, &CFN_marker);
+            }
             else if (coarsen_type == 10)
                hypre_BoomerAMGCoarsenHMIS(SN, SN, measure_type, coarsen_cut_factor,
                                           debug_flag, &CFN_marker);
@@ -1309,14 +1404,14 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
                                       debug_flag, &CFN_marker);
             if (level < agg_num_levels)
             {
-               hypre_BoomerAMGCoarseParms(comm, local_num_vars/num_functions,
+               hypre_BoomerAMGCoarseParms(comm, local_num_vars / num_functions,
                                           1, dof_func_array[level], CFN_marker,
-                                          &coarse_dof_func,&coarse_pnts_global1);
+                                          &coarse_dof_func, coarse_pnts_global1);
                hypre_BoomerAMGCreate2ndS(SN, hypre_IntArrayData(CFN_marker), num_paths,
                                          coarse_pnts_global1, &S2);
                if (coarsen_type == 10)
                {
-                  hypre_BoomerAMGCoarsenHMIS(S2, S2, measure_type+3, coarsen_cut_factor,
+                  hypre_BoomerAMGCoarsenHMIS(S2, S2, measure_type + 3, coarsen_cut_factor,
                                              debug_flag, &CF2_marker);
                }
                else if (coarsen_type == 8)
@@ -1374,24 +1469,45 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
          /**************************************************/
          /*********Set the fixed index to CF_marker*********/
          /* copy CF_marker to the host if needed */
-         if (hypre_GetActualMemLocation(hypre_IntArrayMemoryLocation(CF_marker_array[level])) == hypre_MEMORY_DEVICE)
-         {
-            CF_marker_host = hypre_IntArrayCloneDeep_v2(CF_marker_array[level], HYPRE_MEMORY_HOST);
-         }
-         else
-         {
-            CF_marker_host = CF_marker_array[level];
-         }
-
          /* Set fine points (F_PT) given by the user */
-         if ((num_F_points > 0) && (level == 0))
-         {
-            for (j = 0; j < num_F_points; j++)
+         if ( (num_F_points > 0) && (level == 0) )
+         {
+#if defined(HYPRE_USING_GPU)
+            HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_IntArrayMemoryLocation(
+                                                                  CF_marker_array[level]) );
+            if (exec == HYPRE_EXEC_DEVICE)
+            {
+#if defined(HYPRE_USING_SYCL)
+               auto perm_it = oneapi::dpl::make_permutation_iterator(
+                                 hypre_IntArrayData(CF_marker_array[level]),
+                                 oneapi::dpl::make_transform_iterator( F_points_marker,
+               [first_local_row = first_local_row] (const auto & x) {return x - first_local_row;} ) );
+               hypreSycl_transform_if( perm_it,
+                                       perm_it + num_F_points,
+                                       F_points_marker,
+                                       perm_it,
+               [] (const auto & x) {return -1;},
+               in_range<HYPRE_BigInt>(first_local_row, first_local_row + local_size - 1) );
+#else
+               HYPRE_THRUST_CALL( scatter_if,
+                                  thrust::make_constant_iterator(-1),
+                                  thrust::make_constant_iterator(-1) + num_F_points,
+                                  thrust::make_transform_iterator(F_points_marker, _1 - first_local_row),
+                                  F_points_marker,
+                                  hypre_IntArrayData(CF_marker_array[level]),
+                                  in_range<HYPRE_BigInt>(first_local_row, first_local_row + local_size - 1) );
+#endif
+            }
+            else
+#endif
             {
-               row = (HYPRE_Int) (F_points_marker[j] - first_local_row);
-               if ((row >= 0) && (row < local_size))
+               for (j = 0; j < num_F_points; j++)
                {
-                  hypre_IntArrayData(CF_marker_host)[row] = -1; // Assumes F_PT == -1
+                  row = (HYPRE_Int) (F_points_marker[j] - first_local_row);
+                  if ((row >= 0) && (row < local_size))
+                  {
+                     hypre_IntArrayData(CF_marker_array[level])[row] = -1; // Assumes F_PT == -1
+                  }
                }
             }
          }
@@ -1405,59 +1521,137 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
             }
             else if (level < hypre_ParAMGDataCPointsLevel(amg_data))
             {
-               for (j = 0; j < num_C_points_coarse; j++)
-               {
-                  hypre_IntArrayData(CF_marker_host)[C_points_local_marker[j]] = 2;
-               }
+#if defined(HYPRE_USING_GPU)
+               HYPRE_MemoryLocation memory_location = hypre_IntArrayMemoryLocation(CF_marker_array[level]);
+               HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1(memory_location);
+               if (exec == HYPRE_EXEC_DEVICE)
+               {
+#if defined(HYPRE_USING_SYCL)
+                  auto perm_it = oneapi::dpl::make_permutation_iterator(hypre_IntArrayData(CF_marker_array[level]),
+                                                                        C_points_local_marker);
+                  HYPRE_ONEDPL_CALL( std::transform,
+                                     perm_it,
+                                     perm_it + num_C_points_coarse,
+                                     perm_it,
+                  [] (const auto & x) {return 2;} );
+#else
+                  HYPRE_THRUST_CALL( scatter,
+                                     thrust::make_constant_iterator(2),
+                                     thrust::make_constant_iterator(2) + num_C_points_coarse,
+                                     C_points_local_marker,
+                                     hypre_IntArrayData(CF_marker_array[level]) );
+#endif
 
-               local_coarse_size = 0;
-               k = 0;
-               for (j = 0; j < local_num_vars; j ++)
+                  if ( level + 1 < hypre_ParAMGDataCPointsLevel(amg_data) )
+                  {
+                     HYPRE_Int *tmp = hypre_TAlloc(HYPRE_Int, local_num_vars, memory_location);
+#if defined(HYPRE_USING_SYCL)
+                     HYPRE_ONEDPL_CALL( std::exclusive_scan,
+                                        oneapi::dpl::make_transform_iterator(hypre_IntArrayData(CF_marker_array[level]),
+                                                                             in_range<HYPRE_Int>(1, 2)),
+                                        oneapi::dpl::make_transform_iterator(hypre_IntArrayData(CF_marker_array[level]) + local_num_vars,
+                                                                             in_range<HYPRE_Int>(1, 2)),
+                                        tmp,
+                                        HYPRE_Int(0) );
+
+                     /* RL: total local_coarse_size is not computed. I don't think it's needed */
+                     hypreSycl_copy_if( tmp,
+                                        tmp + local_num_vars,
+                                        hypre_IntArrayData(CF_marker_array[level]),
+                                        C_points_local_marker,
+                                        equal<HYPRE_Int>(2) );
+#else
+                     HYPRE_THRUST_CALL( exclusive_scan,
+                                        thrust::make_transform_iterator(hypre_IntArrayData(CF_marker_array[level]),
+                                                                        in_range<HYPRE_Int>(1, 2)),
+                                        thrust::make_transform_iterator(hypre_IntArrayData(CF_marker_array[level]) + local_num_vars,
+                                                                        in_range<HYPRE_Int>(1, 2)),
+                                        tmp,
+                                        HYPRE_Int(0) );
+
+                     /* RL: total local_coarse_size is not computed. I don't think it's needed */
+                     HYPRE_THRUST_CALL( copy_if,
+                                        tmp,
+                                        tmp + local_num_vars,
+                                        hypre_IntArrayData(CF_marker_array[level]),
+                                        C_points_local_marker,
+                                        equal<HYPRE_Int>(2) );
+#endif
+
+                     hypre_TFree(tmp, memory_location);
+                  }
+
+#if defined(HYPRE_USING_SYCL)
+                  HYPRE_ONEDPL_CALL( std::replace,
+                                     hypre_IntArrayData(CF_marker_array[level]),
+                                     hypre_IntArrayData(CF_marker_array[level]) + local_num_vars,
+                                     2,
+                                     1 );
+#else
+                  HYPRE_THRUST_CALL( replace,
+                                     hypre_IntArrayData(CF_marker_array[level]),
+                                     hypre_IntArrayData(CF_marker_array[level]) + local_num_vars,
+                                     2,
+                                     1 );
+#endif
+               }
+               else
+#endif
                {
-                  if (hypre_IntArrayData(CF_marker_host)[j] == 1)
+                  for (j = 0; j < num_C_points_coarse; j++)
                   {
-                     local_coarse_size++;
+                     hypre_IntArrayData(CF_marker_array[level])[C_points_local_marker[j]] = 2;
                   }
-                  else if (hypre_IntArrayData(CF_marker_host)[j] == 2)
+
+                  local_coarse_size = 0;
+                  k = 0;
+                  for (j = 0; j < local_num_vars; j ++)
                   {
-                     if ((level + 1) < hypre_ParAMGDataCPointsLevel(amg_data))
+                     if (hypre_IntArrayData(CF_marker_array[level])[j] == 1)
+                     {
+                        local_coarse_size++;
+                     }
+                     else if (hypre_IntArrayData(CF_marker_array[level])[j] == 2)
                      {
-                        C_points_local_marker[k++] = local_coarse_size;
+                        if ((level + 1) < hypre_ParAMGDataCPointsLevel(amg_data))
+                        {
+                           C_points_local_marker[k++] = local_coarse_size;
+                        }
+                        local_coarse_size++;
+                        hypre_IntArrayData(CF_marker_array[level])[j] = 1;
                      }
-                     local_coarse_size++;
-                     hypre_IntArrayData(CF_marker_host)[j] = 1;
                   }
+                  // RL: so k is not used after this? update num_C_points_coarse?
                }
             }
          }
 
-         /* copy back to device and destroy host copy */
-         if (hypre_GetActualMemLocation(hypre_IntArrayMemoryLocation(CF_marker_array[level])) == hypre_MEMORY_DEVICE)
-         {
-            hypre_IntArrayCopy(CF_marker_host, CF_marker_array[level]);
-            hypre_IntArrayDestroy(CF_marker_host);
-         }
-
          /*****xxxxxxxxxxxxx changes for min_coarse_size */
          /* here we will determine the coarse grid size to be able to
             determine if it is not smaller than requested minimal size */
 
+         hypre_GpuProfilingPushRange("CheckMinSize");
+
          if (level >= agg_num_levels)
          {
             if (block_mode)
             {
                hypre_BoomerAMGCoarseParms(comm,
                                           hypre_CSRMatrixNumRows(hypre_ParCSRMatrixDiag(AN)),
-                                          1, NULL, CF_marker_array[level], NULL, &coarse_pnts_global);
+                                          1, NULL, CF_marker_array[level], NULL, coarse_pnts_global);
             }
             else
             {
                hypre_BoomerAMGCoarseParms(comm, local_num_vars,
                                           num_functions, dof_func_array[level], CF_marker_array[level],
-                                          &coarse_dof_func, &coarse_pnts_global);
+                                          &coarse_dof_func, coarse_pnts_global);
+            }
+            if (my_id == num_procs - 1)
+            {
+               coarse_size = coarse_pnts_global[1];
             }
-            if (my_id == (num_procs -1)) coarse_size = coarse_pnts_global[1];
-            hypre_MPI_Bcast(&coarse_size, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
+            hypre_MPI_Bcast(&coarse_size, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
+
             /* if no coarse-grid, stop coarsening, and set the
              * coarsest solve to be a single sweep of default smoother or smoother set by user */
             if ((coarse_size == 0) || (coarse_size == fine_size))
@@ -1469,11 +1663,11 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
                {
                   grid_relax_type[3] = grid_relax_type[0];
                   num_grid_sweeps[3] = 1;
-                  if (grid_relax_points) grid_relax_points[3][0] = 0;
+                  if (grid_relax_points) { grid_relax_points[3][0] = 0; }
                }
-               if (S) hypre_ParCSRMatrixDestroy(S);
-               if (SN) hypre_ParCSRMatrixDestroy(SN);
-               if (AN) hypre_ParCSRMatrixDestroy(AN);
+               if (S) { hypre_ParCSRMatrixDestroy(S); }
+               if (SN) { hypre_ParCSRMatrixDestroy(SN); }
+               if (AN) { hypre_ParCSRMatrixDestroy(AN); }
                //hypre_TFree(CF_marker, HYPRE_MEMORY_HOST);
                if (level > 0)
                {
@@ -1492,19 +1686,28 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
                   Sabs = NULL;
                }
 
+               if (coarse_dof_func)
+               {
+                  hypre_IntArrayDestroy(coarse_dof_func);
+                  coarse_dof_func = NULL;
+               }
+
                HYPRE_ANNOTATE_REGION_END("%s", "Coarsening");
                break;
             }
 
             if (coarse_size < min_coarse_size)
             {
-               if (S) hypre_ParCSRMatrixDestroy(S);
-               if (SN) hypre_ParCSRMatrixDestroy(SN);
-               if (AN) hypre_ParCSRMatrixDestroy(AN);
-               if (num_functions > 1) hypre_IntArrayDestroy(coarse_dof_func);
+               if (S) { hypre_ParCSRMatrixDestroy(S); }
+               if (SN) { hypre_ParCSRMatrixDestroy(SN); }
+               if (AN) { hypre_ParCSRMatrixDestroy(AN); }
+               if (num_functions > 1)
+               {
+                  hypre_IntArrayDestroy(coarse_dof_func);
+                  coarse_dof_func = NULL;
+               }
                hypre_IntArrayDestroy(CF_marker_array[level]);
                CF_marker_array[level] = NULL;
-               hypre_TFree(coarse_pnts_global, HYPRE_MEMORY_HOST);
                if (level > 0)
                {
                   hypre_ParVectorDestroy(F_array[level]);
@@ -1523,6 +1726,8 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
             }
          }
 
+         hypre_GpuProfilingPopRange();
+
          /*****xxxxxxxxxxxxx changes for min_coarse_size  end */
          HYPRE_ANNOTATE_REGION_END("%s", "Coarsening");
          HYPRE_ANNOTATE_REGION_BEGIN("%s", "Interpolation");
@@ -1563,48 +1768,68 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
                else if (agg_interp_type == 6)
                {
                   hypre_BoomerAMGBuildModExtPIInterp(A_array[level],
-                                                   CF_marker, S, coarse_pnts_global1,
-                                                   num_functions, dof_func_data,
-                                                   debug_flag,
-                                                   agg_P12_trunc_factor, agg_P12_max_elmts, &P1);
+                                                     CF_marker, S, coarse_pnts_global1,
+                                                     num_functions, dof_func_data,
+                                                     debug_flag,
+                                                     agg_P12_trunc_factor, agg_P12_max_elmts, &P1);
                }
                else if (agg_interp_type == 7)
                {
                   hypre_BoomerAMGBuildModExtPEInterp(A_array[level],
-                                                   CF_marker, S, coarse_pnts_global1,
-                                                   num_functions, dof_func_data,
-                                                   debug_flag,
-                                                   agg_P12_trunc_factor, agg_P12_max_elmts, &P1);
+                                                     CF_marker, S, coarse_pnts_global1,
+                                                     num_functions, dof_func_data,
+                                                     debug_flag,
+                                                     agg_P12_trunc_factor, agg_P12_max_elmts, &P1);
                }
 
                if (agg_interp_type == 4)
                {
-                  hypre_BoomerAMGCorrectCFMarker (CF_marker_array[level], CFN_marker);
-                  /*hypre_TFree(coarse_dof_func);
-                  coarse_dof_func = NULL;*/
+                  hypre_BoomerAMGCorrectCFMarker(CF_marker_array[level], CFN_marker);
                   hypre_IntArrayDestroy(CFN_marker);
                   CFN_marker = NULL;
                   hypre_BoomerAMGCoarseParms(comm, local_num_vars,
                                              num_functions, dof_func_array[level], CF_marker_array[level],
-                                             &coarse_dof_func,&coarse_pnts_global);
+                                             &coarse_dof_func, coarse_pnts_global);
                   hypre_BoomerAMGBuildMultipass(A_array[level],
                                                 CF_marker, S, coarse_pnts_global,
                                                 num_functions, dof_func_data, debug_flag,
                                                 agg_trunc_factor, agg_P_max_elmts, sep_weight,
                                                 &P);
                }
+               else if (agg_interp_type == 8)
+               {
+                  hypre_BoomerAMGCorrectCFMarker(CF_marker_array[level], CFN_marker);
+                  hypre_IntArrayDestroy(CFN_marker);
+                  CFN_marker = NULL;
+                  hypre_BoomerAMGCoarseParms(comm, local_num_vars,
+                                             num_functions, dof_func_array[level], CF_marker_array[level],
+                                             &coarse_dof_func, coarse_pnts_global);
+                  hypre_BoomerAMGBuildModMultipass(A_array[level],
+                                                   CF_marker, S, coarse_pnts_global,
+                                                   agg_trunc_factor, agg_P_max_elmts, 8,
+                                                   num_functions, dof_func_data, &P);
+               }
+               else if (agg_interp_type == 9)
+               {
+                  hypre_BoomerAMGCorrectCFMarker(CF_marker_array[level], CFN_marker);
+                  hypre_IntArrayDestroy(CFN_marker);
+                  CFN_marker = NULL;
+                  hypre_BoomerAMGCoarseParms(comm, local_num_vars,
+                                             num_functions, dof_func_array[level], CF_marker_array[level],
+                                             &coarse_dof_func, coarse_pnts_global);
+                  hypre_BoomerAMGBuildModMultipass(A_array[level],
+                                                   CF_marker, S, coarse_pnts_global,
+                                                   agg_trunc_factor, agg_P_max_elmts, 9,
+                                                   num_functions, dof_func_data, &P);
+               }
                else
                {
                   hypre_BoomerAMGCorrectCFMarker2 (CF_marker_array[level], (CFN_marker));
                   hypre_IntArrayDestroy(CFN_marker);
                   CFN_marker = NULL;
-                  /*hypre_TFree(coarse_dof_func);
-                  coarse_dof_func = NULL;*/
                   hypre_BoomerAMGCoarseParms(comm, local_num_vars,
                                              num_functions, dof_func_array[level], CF_marker_array[level],
-                                             &coarse_dof_func,&coarse_pnts_global);
-                  /*if (num_functions > 1 && nodal > -1 && (!block_mode) )
-                     dof_func_array[level+1] = coarse_dof_func;*/
+                                             &coarse_dof_func, coarse_pnts_global);
                   if (agg_interp_type == 1 || agg_interp_type == 6 )
                   {
                      hypre_BoomerAMGBuildPartialExtPIInterp(A_array[level],
@@ -1648,7 +1873,6 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
                                                                agg_P12_trunc_factor, agg_P12_max_elmts, &P2);
                   }
 
-
                   if (hypre_ParAMGDataModularizedMatMat(amg_data))
                   {
                      P = hypre_ParCSRMatMat(P1, P2);
@@ -1660,6 +1884,12 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
 
                   hypre_BoomerAMGInterpTruncation(P, agg_trunc_factor, agg_P_max_elmts);
 
+                  if (agg_trunc_factor != 0.0 || agg_P_max_elmts > 0 ||
+                      agg_P12_trunc_factor != 0.0 || agg_P12_max_elmts > 0)
+                  {
+                     hypre_ParCSRMatrixCompressOffdMap(P);
+                  }
+
                   hypre_MatvecCommPkgCreate(P);
                   hypre_ParCSRMatrixDestroy(P1);
                   hypre_ParCSRMatrixDestroy(P2);
@@ -1669,10 +1899,9 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
             {
                if (agg_interp_type == 4)
                {
-                  hypre_BoomerAMGCorrectCFMarker (CFN_marker, CF2_marker);
+                  hypre_BoomerAMGCorrectCFMarker(CFN_marker, CF2_marker);
                   hypre_IntArrayDestroy(CF2_marker);
                   CF2_marker = NULL;
-                  hypre_TFree(coarse_pnts_global1, HYPRE_MEMORY_HOST);
 
                   hypre_BoomerAMGCreateScalarCFS(SN, A_array[level], hypre_IntArrayData(CFN_marker),
                                                  num_functions, nodal, keep_same_sign,
@@ -1681,13 +1910,51 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
                   CFN_marker = NULL;
                   hypre_BoomerAMGCoarseParms(comm, local_num_vars,
                                              num_functions, dof_func_array[level], CF_marker_array[level],
-                                             &coarse_dof_func,&coarse_pnts_global);
+                                             &coarse_dof_func, coarse_pnts_global);
                   hypre_BoomerAMGBuildMultipass(A_array[level],
                                                 CF_marker, S, coarse_pnts_global,
                                                 num_functions, dof_func_data, debug_flag,
                                                 agg_trunc_factor, agg_P_max_elmts, sep_weight,
                                                 &P);
                }
+               else if (agg_interp_type == 8)
+               {
+                  hypre_BoomerAMGCorrectCFMarker(CFN_marker, CF2_marker);
+                  hypre_IntArrayDestroy(CF2_marker);
+                  CF2_marker = NULL;
+
+                  hypre_BoomerAMGCreateScalarCFS(SN, A_array[level], hypre_IntArrayData(CFN_marker),
+                                                 num_functions, nodal, keep_same_sign,
+                                                 &dof_func, &(CF_marker_array[level]), &S);
+                  hypre_IntArrayDestroy(CFN_marker);
+                  CFN_marker = NULL;
+                  hypre_BoomerAMGCoarseParms(comm, local_num_vars,
+                                             num_functions, dof_func_array[level], CF_marker_array[level],
+                                             &coarse_dof_func, coarse_pnts_global);
+                  hypre_BoomerAMGBuildModMultipass(A_array[level],
+                                                   CF_marker, S, coarse_pnts_global,
+                                                   agg_trunc_factor, agg_P_max_elmts, 8,
+                                                   num_functions, dof_func_data, &P);
+               }
+               else if (agg_interp_type == 9)
+               {
+                  hypre_BoomerAMGCorrectCFMarker(CFN_marker, CF2_marker);
+                  hypre_IntArrayDestroy(CF2_marker);
+                  CF2_marker = NULL;
+
+                  hypre_BoomerAMGCreateScalarCFS(SN, A_array[level], hypre_IntArrayData(CFN_marker),
+                                                 num_functions, nodal, keep_same_sign,
+                                                 &dof_func, &(CF_marker_array[level]), &S);
+                  hypre_IntArrayDestroy(CFN_marker);
+                  CFN_marker = NULL;
+                  hypre_BoomerAMGCoarseParms(comm, local_num_vars,
+                                             num_functions, dof_func_array[level], CF_marker_array[level],
+                                             &coarse_dof_func, coarse_pnts_global);
+                  hypre_BoomerAMGBuildModMultipass(A_array[level],
+                                                   CF_marker, S, coarse_pnts_global,
+                                                   agg_trunc_factor, agg_P_max_elmts, 9,
+                                                   num_functions, dof_func_data, &P);
+               }
                else
                {
                   hypre_BoomerAMGCreateScalarCFS(SN, A_array[level], hypre_IntArrayData(CFN_marker),
@@ -1721,26 +1988,26 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
                   else if (agg_interp_type == 5)
                   {
                      hypre_BoomerAMGBuildModExtInterp(A_array[level],
-                                                   hypre_IntArrayData(CF3_marker), S, coarse_pnts_global1,
-                                                   num_functions, dof_func_data,
-                                                   debug_flag,
-                                                   agg_P12_trunc_factor, agg_P12_max_elmts, &P1);
+                                                      hypre_IntArrayData(CF3_marker), S, coarse_pnts_global1,
+                                                      num_functions, dof_func_data,
+                                                      debug_flag,
+                                                      agg_P12_trunc_factor, agg_P12_max_elmts, &P1);
                   }
                   else if (agg_interp_type == 6)
                   {
                      hypre_BoomerAMGBuildModExtPIInterp(A_array[level],
-                                                   hypre_IntArrayData(CF3_marker), S, coarse_pnts_global1,
-                                                   num_functions, dof_func_data,
-                                                   debug_flag,
-                                                   agg_P12_trunc_factor, agg_P12_max_elmts, &P1);
+                                                        hypre_IntArrayData(CF3_marker), S, coarse_pnts_global1,
+                                                        num_functions, dof_func_data,
+                                                        debug_flag,
+                                                        agg_P12_trunc_factor, agg_P12_max_elmts, &P1);
                   }
                   else if (agg_interp_type == 7 )
                   {
                      hypre_BoomerAMGBuildModExtPEInterp(A_array[level],
-                                                   hypre_IntArrayData(CF3_marker), S, coarse_pnts_global1,
-                                                   num_functions, dof_func_data,
-                                                   debug_flag,
-                                                   agg_P12_trunc_factor, agg_P12_max_elmts, &P1);
+                                                        hypre_IntArrayData(CF3_marker), S, coarse_pnts_global1,
+                                                        num_functions, dof_func_data,
+                                                        debug_flag,
+                                                        agg_P12_trunc_factor, agg_P12_max_elmts, &P1);
                   }
 
                   hypre_BoomerAMGCorrectCFMarker2 (CFN_marker, CF2_marker);
@@ -1757,9 +2024,7 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
                   CFN_marker = NULL;
                   hypre_BoomerAMGCoarseParms(comm, local_num_vars,
                                              num_functions, dof_func_array[level], CF_marker_array[level],
-                                             &coarse_dof_func,&coarse_pnts_global);
-                  /*if (num_functions > 1 && nodal > -1 && (!block_mode) )
-                     dof_func_array[level+1] = coarse_dof_func;*/
+                                             &coarse_dof_func, coarse_pnts_global);
                   if (agg_interp_type == 1 || agg_interp_type == 6)
                   {
                      hypre_BoomerAMGBuildPartialExtPIInterp(A_array[level],
@@ -1787,18 +2052,18 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
                   else if (agg_interp_type == 5)
                   {
                      hypre_BoomerAMGBuildModPartialExtInterp(A_array[level],
-                                                CF_marker, S, coarse_pnts_global, coarse_pnts_global1,
-                                                num_functions, dof_func_data,
-                                                debug_flag,
-                                                agg_P12_trunc_factor, agg_P12_max_elmts, &P2);
+                                                             CF_marker, S, coarse_pnts_global, coarse_pnts_global1,
+                                                             num_functions, dof_func_data,
+                                                             debug_flag,
+                                                             agg_P12_trunc_factor, agg_P12_max_elmts, &P2);
                   }
                   else if (agg_interp_type == 7)
                   {
                      hypre_BoomerAMGBuildModPartialExtPEInterp(A_array[level],
-                                                CF_marker, S, coarse_pnts_global, coarse_pnts_global1,
-                                                num_functions, dof_func_data,
-                                                debug_flag,
-                                                agg_P12_trunc_factor, agg_P12_max_elmts, &P2);
+                                                               CF_marker, S, coarse_pnts_global, coarse_pnts_global1,
+                                                               num_functions, dof_func_data,
+                                                               debug_flag,
+                                                               agg_P12_trunc_factor, agg_P12_max_elmts, &P2);
                   }
 
                   if (hypre_ParAMGDataModularizedMatMat(amg_data))
@@ -1809,8 +2074,16 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
                   {
                      P = hypre_ParMatmul(P1, P2);
                   }
+
                   hypre_BoomerAMGInterpTruncation(P, agg_trunc_factor,
                                                   agg_P_max_elmts);
+
+                  if (agg_trunc_factor != 0.0 || agg_P_max_elmts > 0 ||
+                      agg_P12_trunc_factor != 0.0 || agg_P12_max_elmts > 0)
+                  {
+                     hypre_ParCSRMatrixCompressOffdMap(P);
+                  }
+
                   hypre_MatvecCommPkgCreate(P);
                   hypre_ParCSRMatrixDestroy(P1);
                   hypre_ParCSRMatrixDestroy(P2);
@@ -1826,33 +2099,36 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
                }
                AN = NULL;
             }
-            if (my_id == (num_procs -1)) coarse_size = coarse_pnts_global[1];
-            hypre_MPI_Bcast(&coarse_size, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
+            if (my_id == (num_procs - 1))
+            {
+               coarse_size = coarse_pnts_global[1];
+            }
+            hypre_MPI_Bcast(&coarse_size, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
          }
          else /* no aggressive coarsening */
          {
             /**** Get the coarse parameters ****/
-/* xxxxxxxxxxxxxxxxxxxxxxxxx change for min_coarse_size
-            if (block_mode )
-            {
-               hypre_BoomerAMGCoarseParms(comm,
-                                          hypre_CSRMatrixNumRows(hypre_ParCSRMatrixDiag(AN)),
-                                          1, NULL, CF_marker, NULL, &coarse_pnts_global);
-            }
-            else
-            {
-               hypre_BoomerAMGCoarseParms(comm, local_num_vars,
-                                          num_functions, dof_func_array[level], CF_marker,
-                                          &coarse_dof_func,&coarse_pnts_global);
-            }
-            if (my_id == (num_procs -1)) coarse_size = coarse_pnts_global[1];
-            hypre_MPI_Bcast(&coarse_size, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
- xxxxxxxxxxxxxxxxxxxxxxxxx change for min_coarse_size */
-            if (debug_flag==1)
+            /* xxxxxxxxxxxxxxxxxxxxxxxxx change for min_coarse_size
+                        if (block_mode )
+                        {
+                           hypre_BoomerAMGCoarseParms(comm,
+                                                      hypre_CSRMatrixNumRows(hypre_ParCSRMatrixDiag(AN)),
+                                                      1, NULL, CF_marker, NULL, coarse_pnts_global);
+                        }
+                        else
+                        {
+                           hypre_BoomerAMGCoarseParms(comm, local_num_vars,
+                                                      num_functions, dof_func_array[level], CF_marker,
+                                                      &coarse_dof_func, coarse_pnts_global);
+                        }
+                        if (my_id == (num_procs -1)) coarse_size = coarse_pnts_global[1];
+                        hypre_MPI_Bcast(&coarse_size, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
+             xxxxxxxxxxxxxxxxxxxxxxxxx change for min_coarse_size */
+            if (debug_flag == 1)
             {
                wall_time = time_getWallclockSeconds() - wall_time;
                hypre_printf("Proc = %d    Level = %d    Coarsen Time = %f\n",
-                            my_id,level, wall_time);
+                            my_id, level, wall_time);
                fflush(NULL);
             }
 
@@ -1864,10 +2140,13 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
                HYPRE_Int is_triangular = hypre_ParAMGDataIsTriangular(amg_data);
                HYPRE_Int gmres_switch = hypre_ParAMGDataGMRESSwitchR(amg_data);
                /* !!! RL: ensure that CF_marker contains -1 or 1 !!! */
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-               if (hypre_IntArrayMemoryLocation(CF_marker_array[level]) == HYPRE_MEMORY_DEVICE)
+#if defined(HYPRE_USING_GPU)
+               HYPRE_MemoryLocation memory_location = hypre_IntArrayMemoryLocation(CF_marker_array[level]);
+               HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1(memory_location);
+               if (exec == HYPRE_EXEC_DEVICE)
                {
-                  hypre_BoomerAMGCFMarkerTo1minus1Device(CF_marker, hypre_CSRMatrixNumRows(hypre_ParCSRMatrixDiag(A_array[level])));
+                  hypre_BoomerAMGCFMarkerTo1minus1Device(CF_marker,
+                                                         hypre_CSRMatrixNumRows(hypre_ParCSRMatrixDiag(A_array[level])));
                }
                else
 #endif
@@ -1919,7 +2198,7 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
                }
             }
 
-            if (debug_flag==1) wall_time = time_getWallclockSeconds();
+            if (debug_flag == 1) { wall_time = time_getWallclockSeconds(); }
 
             if (interp_type == 4)
             {
@@ -1974,16 +2253,16 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
             else if (interp_type == 17) /*Extended+i MM interpolation */
             {
                hypre_BoomerAMGBuildModExtPIInterp(A_array[level], CF_marker,
-                                             S, coarse_pnts_global,
-                                             num_functions, dof_func_data,
-                                             debug_flag, trunc_factor, P_max_elmts, &P);
+                                                  S, coarse_pnts_global,
+                                                  num_functions, dof_func_data,
+                                                  debug_flag, trunc_factor, P_max_elmts, &P);
             }
             else if (interp_type == 18) /*Extended+e MM interpolation */
             {
                hypre_BoomerAMGBuildModExtPEInterp(A_array[level], CF_marker,
-                                             S, coarse_pnts_global,
-                                             num_functions, dof_func_data,
-                                             debug_flag, trunc_factor, P_max_elmts, &P);
+                                                  S, coarse_pnts_global,
+                                                  num_functions, dof_func_data,
+                                                  debug_flag, trunc_factor, P_max_elmts, &P);
             }
 
             else if (interp_type == 7) /*Extended+i (if no common C) interpolation */
@@ -2029,197 +2308,196 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
 
                   /* convert A to a block matrix if there isn't already a block
                     matrix - there should be one already*/
-                 if (!(A_block_array[level]))
-                 {
-                    A_block_array[level] =  hypre_ParCSRBlockMatrixConvertFromParCSRMatrix(
-                             A_array[level], num_functions);
-                 }
-
-                 /* note that the current CF_marker is nodal */
-                 if (interp_type == 11)
-                 {
-                    hypre_BoomerAMGBuildBlockInterpDiag( A_block_array[level], CF_marker,
-                                                         SN,
-                                                         coarse_pnts_global, 1,
-                                                         NULL,
-                                                         debug_flag,
-                                                         trunc_factor, P_max_elmts,1,
-                                                         &P_block_array[level]);
+                  if (!(A_block_array[level]))
+                  {
+                     A_block_array[level] =  hypre_ParCSRBlockMatrixConvertFromParCSRMatrix(
+                                                A_array[level], num_functions);
+                  }
 
+                  /* note that the current CF_marker is nodal */
+                  if (interp_type == 11)
+                  {
+                     hypre_BoomerAMGBuildBlockInterpDiag( A_block_array[level], CF_marker,
+                                                          SN,
+                                                          coarse_pnts_global, 1,
+                                                          NULL,
+                                                          debug_flag,
+                                                          trunc_factor, P_max_elmts, 1,
+                                                          &P_block_array[level]);
 
-                 }
-                 else if (interp_type == 22)
-                 {
-                    hypre_BoomerAMGBuildBlockInterpRV( A_block_array[level], CF_marker,
-                                                       SN,
-                                                       coarse_pnts_global, 1,
-                                                       NULL,
-                                                       debug_flag,
-                                                       trunc_factor, P_max_elmts,
-                                                       &P_block_array[level]);
-                 }
-                 else if (interp_type == 23)
-                 {
-                    hypre_BoomerAMGBuildBlockInterpRV( A_block_array[level], CF_marker,
-                                                       SN,
-                                                       coarse_pnts_global, 1,
-                                                       NULL,
-                                                       debug_flag,
-                                                       trunc_factor, P_max_elmts,
-                                                       &P_block_array[level]);
-                 }
-                 else if (interp_type == 20)
-                 {
-                    hypre_BoomerAMGBuildBlockInterp( A_block_array[level], CF_marker,
-                                                     SN,
-                                                     coarse_pnts_global, 1,
-                                                     NULL,
-                                                     debug_flag,
-                                                     trunc_factor, P_max_elmts, 0,
-                                                     &P_block_array[level]);
 
-                 }
-                 else if (interp_type == 21)
-                 {
-                    hypre_BoomerAMGBuildBlockInterpDiag( A_block_array[level], CF_marker,
-                                                         SN,
-                                                         coarse_pnts_global, 1,
-                                                         NULL,
-                                                         debug_flag,
-                                                         trunc_factor, P_max_elmts, 0,
-                                                         &P_block_array[level]);
-                 }
-                 else if (interp_type == 24)
-                 {
-                    hypre_BoomerAMGBuildBlockDirInterp( A_block_array[level], CF_marker,
+                  }
+                  else if (interp_type == 22)
+                  {
+                     hypre_BoomerAMGBuildBlockInterpRV( A_block_array[level], CF_marker,
                                                         SN,
                                                         coarse_pnts_global, 1,
                                                         NULL,
                                                         debug_flag,
                                                         trunc_factor, P_max_elmts,
                                                         &P_block_array[level]);
-                 }
+                  }
+                  else if (interp_type == 23)
+                  {
+                     hypre_BoomerAMGBuildBlockInterpRV( A_block_array[level], CF_marker,
+                                                        SN,
+                                                        coarse_pnts_global, 1,
+                                                        NULL,
+                                                        debug_flag,
+                                                        trunc_factor, P_max_elmts,
+                                                        &P_block_array[level]);
+                  }
+                  else if (interp_type == 20)
+                  {
+                     hypre_BoomerAMGBuildBlockInterp( A_block_array[level], CF_marker,
+                                                      SN,
+                                                      coarse_pnts_global, 1,
+                                                      NULL,
+                                                      debug_flag,
+                                                      trunc_factor, P_max_elmts, 0,
+                                                      &P_block_array[level]);
 
-                 else /* interp_type ==10 */
-                 {
+                  }
+                  else if (interp_type == 21)
+                  {
+                     hypre_BoomerAMGBuildBlockInterpDiag( A_block_array[level], CF_marker,
+                                                          SN,
+                                                          coarse_pnts_global, 1,
+                                                          NULL,
+                                                          debug_flag,
+                                                          trunc_factor, P_max_elmts, 0,
+                                                          &P_block_array[level]);
+                  }
+                  else if (interp_type == 24)
+                  {
+                     hypre_BoomerAMGBuildBlockDirInterp( A_block_array[level], CF_marker,
+                                                         SN,
+                                                         coarse_pnts_global, 1,
+                                                         NULL,
+                                                         debug_flag,
+                                                         trunc_factor, P_max_elmts,
+                                                         &P_block_array[level]);
+                  }
 
-                    hypre_BoomerAMGBuildBlockInterp( A_block_array[level], CF_marker,
-                                                     SN,
-                                                     coarse_pnts_global, 1,
-                                                     NULL,
-                                                     debug_flag,
-                                                     trunc_factor, P_max_elmts, 1,
-                                                     &P_block_array[level]);
-
-                 }
-
-                 /* we need to set the global number of cols in P, as this was
-                    not done in the interp
-                    (which calls the matrix create) since we didn't
-                    have the global partition */
-                 /*  this has to be done before converting from block to non-block*/
-                 hypre_ParCSRBlockMatrixGlobalNumCols(P_block_array[level]) = coarse_size;
-
-                 /* if we don't do nodal relaxation, we need a CF_array that is
-                    not nodal - right now we don't allow this to happen though*/
-                 /*
-                   if (grid_relax_type[0] < 20  )
-                   {
-                   hypre_BoomerAMGCreateScalarCF(CFN_marker, num_functions,
-                   hypre_CSRMatrixNumRows(hypre_ParCSRMatrixDiag(AN)),
-                   &dof_func1, &CF_marker);
-
-                   dof_func_array[level+1] = dof_func1;
-                   hypre_TFree(CFN_marker, HYPRE_MEMORY_HOST);
-                   CF_marker_array[level] = CF_marker;
-                   }
-                 */
-
-                 /* clean up other things */
-                 hypre_ParCSRMatrixDestroy(AN);
-                 hypre_ParCSRMatrixDestroy(SN);
-
-              }
-              else /* not block mode - use default interp (interp_type = 0) */
-              {
-                 if (nodal > -1) /* non-systems, or systems with unknown approach interpolation*/
-                 {
-                    /* if systems, do we want to use an interp. that uses the full strength matrix?*/
-
-                    if ( (num_functions > 1) && (interp_type == 19 || interp_type == 18 || interp_type == 17 || interp_type == 16))
+                  else /* interp_type ==10 */
+                  {
+
+                     hypre_BoomerAMGBuildBlockInterp( A_block_array[level], CF_marker,
+                                                      SN,
+                                                      coarse_pnts_global, 1,
+                                                      NULL,
+                                                      debug_flag,
+                                                      trunc_factor, P_max_elmts, 1,
+                                                      &P_block_array[level]);
+
+                  }
+
+                  /* we need to set the global number of cols in P, as this was
+                     not done in the interp
+                     (which calls the matrix create) since we didn't
+                     have the global partition */
+                  /*  this has to be done before converting from block to non-block*/
+                  hypre_ParCSRBlockMatrixGlobalNumCols(P_block_array[level]) = coarse_size;
+
+                  /* if we don't do nodal relaxation, we need a CF_array that is
+                     not nodal - right now we don't allow this to happen though*/
+                  /*
+                    if (grid_relax_type[0] < 20  )
                     {
-                       /* so create a second strength matrix and build interp with with num_functions = 1 */
-                       hypre_BoomerAMGCreateS(A_array[level],
-                                              strong_threshold, max_row_sum,
-                                              1, dof_func_data,&S2);
-                       switch (interp_type)
-                       {
-
-                          case 19:
-                             dbg_flg = debug_flag;
-                             if (amg_print_level) dbg_flg = -debug_flag;
-                             hypre_BoomerAMGBuildInterp(A_array[level], CF_marker,
-                                                        S2, coarse_pnts_global, 1,
-                                                        dof_func_data,
-                                                        dbg_flg, trunc_factor, P_max_elmts, &P);
-                             break;
-
-                          case 18:
-                             hypre_BoomerAMGBuildStdInterp(A_array[level], CF_marker,
-                                                           S2, coarse_pnts_global, 1, dof_func_data,
-                                                           debug_flag, trunc_factor, P_max_elmts, 0, &P);
-
-                             break;
-
-                          case 17:
-                             hypre_BoomerAMGBuildExtPIInterp(A_array[level], CF_marker,
-                                                             S2, coarse_pnts_global, 1, dof_func_data,
-                                                             debug_flag, trunc_factor, P_max_elmts, &P);
-                             break;
-                          case 16:
-                             dbg_flg = debug_flag;
-                             if (amg_print_level) dbg_flg = -debug_flag;
-                             hypre_BoomerAMGBuildInterpModUnk(A_array[level], CF_marker,
-                                                              S2, coarse_pnts_global, num_functions, dof_func_data,
-                                                              dbg_flg, trunc_factor, P_max_elmts, &P);
-                             break;
-
-                       }
-
-
-                       hypre_ParCSRMatrixDestroy(S2);
+                    hypre_BoomerAMGCreateScalarCF(CFN_marker, num_functions,
+                    hypre_CSRMatrixNumRows(hypre_ParCSRMatrixDiag(AN)),
+                    &dof_func1, &CF_marker);
 
+                    dof_func_array[level+1] = dof_func1;
+                    hypre_TFree(CFN_marker, HYPRE_MEMORY_HOST);
+                    CF_marker_array[level] = CF_marker;
                     }
-                    else /* one function only or unknown-based interpolation- */
-                    {
-                       dbg_flg = debug_flag;
-                       if (amg_print_level) dbg_flg = -debug_flag;
+                  */
 
-                       hypre_BoomerAMGBuildInterp(A_array[level], CF_marker,
-                                                  S, coarse_pnts_global, num_functions,
-                                                  dof_func_data,
-                                                  dbg_flg, trunc_factor, P_max_elmts, &P);
+                  /* clean up other things */
+                  hypre_ParCSRMatrixDestroy(AN);
+                  hypre_ParCSRMatrixDestroy(SN);
+
+               }
+               else /* not block mode - use default interp (interp_type = 0) */
+               {
+                  if (nodal > -1) /* non-systems, or systems with unknown approach interpolation*/
+                  {
+                     /* if systems, do we want to use an interp. that uses the full strength matrix?*/
 
+                     if ( (num_functions > 1) && (interp_type == 19 || interp_type == 18 || interp_type == 17 ||
+                                                  interp_type == 16))
+                     {
+                        /* so create a second strength matrix and build interp with with num_functions = 1 */
+                        hypre_BoomerAMGCreateS(A_array[level],
+                                               strong_threshold, max_row_sum,
+                                               1, dof_func_data, &S2);
+                        switch (interp_type)
+                        {
+
+                           case 19:
+                              dbg_flg = debug_flag;
+                              if (amg_print_level) { dbg_flg = -debug_flag; }
+                              hypre_BoomerAMGBuildInterp(A_array[level], CF_marker,
+                                                         S2, coarse_pnts_global, 1,
+                                                         dof_func_data,
+                                                         dbg_flg, trunc_factor, P_max_elmts, &P);
+                              break;
+
+                           case 18:
+                              hypre_BoomerAMGBuildStdInterp(A_array[level], CF_marker,
+                                                            S2, coarse_pnts_global, 1, dof_func_data,
+                                                            debug_flag, trunc_factor, P_max_elmts, 0, &P);
+
+                              break;
+
+                           case 17:
+                              hypre_BoomerAMGBuildExtPIInterp(A_array[level], CF_marker,
+                                                              S2, coarse_pnts_global, 1, dof_func_data,
+                                                              debug_flag, trunc_factor, P_max_elmts, &P);
+                              break;
+                           case 16:
+                              dbg_flg = debug_flag;
+                              if (amg_print_level) { dbg_flg = -debug_flag; }
+                              hypre_BoomerAMGBuildInterpModUnk(A_array[level], CF_marker,
+                                                               S2, coarse_pnts_global, num_functions, dof_func_data,
+                                                               dbg_flg, trunc_factor, P_max_elmts, &P);
+                              break;
+
+                        }
+
+
+                        hypre_ParCSRMatrixDestroy(S2);
 
-                    }
-                 }
-              }
-           }
-           else
-           {
-              hypre_BoomerAMGBuildInterpGSMG(NULL, CF_marker, S,
-                                             coarse_pnts_global, num_functions, dof_func_data,
-                                             debug_flag, trunc_factor, &P);
-           }
-         } /* end of no aggressive coarsening */
+                     }
+                     else /* one function only or unknown-based interpolation- */
+                     {
+                        dbg_flg = debug_flag;
+                        if (amg_print_level) { dbg_flg = -debug_flag; }
 
-         /*dof_func_array[level+1] = NULL;
-           if (num_functions > 1 && nodal > -1 && (!block_mode) )
-            dof_func_array[level+1] = coarse_dof_func;*/
+                        hypre_BoomerAMGBuildInterp(A_array[level], CF_marker,
+                                                   S, coarse_pnts_global, num_functions,
+                                                   dof_func_data,
+                                                   dbg_flg, trunc_factor, P_max_elmts, &P);
 
-         dof_func_array[level+1] = NULL;
+
+                     }
+                  }
+               }
+            }
+            else
+            {
+               hypre_BoomerAMGBuildInterpGSMG(NULL, CF_marker, S,
+                                              coarse_pnts_global, num_functions, dof_func_data,
+                                              debug_flag, trunc_factor, &P);
+            }
+         } /* end of no aggressive coarsening */
+
+         dof_func_array[level + 1] = NULL;
          if (num_functions > 1 && nodal > -1 && (!block_mode) )
-            dof_func_array[level+1] = coarse_dof_func;
+         {
+            dof_func_array[level + 1] = coarse_dof_func;
+         }
 
          HYPRE_ANNOTATE_REGION_END("%s", "Interpolation");
       } /* end of if max_levels > 1 */
@@ -2229,20 +2507,24 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
       if ( (coarse_size == 0) || (coarse_size == fine_size) )
       {
          HYPRE_Int     *num_grid_sweeps =
-               hypre_ParAMGDataNumGridSweeps(amg_data);
+            hypre_ParAMGDataNumGridSweeps(amg_data);
          HYPRE_Int    **grid_relax_points =
-               hypre_ParAMGDataGridRelaxPoints(amg_data);
+            hypre_ParAMGDataGridRelaxPoints(amg_data);
          if (grid_relax_type[3] == 9 || grid_relax_type[3] == 99
              || grid_relax_type[3] == 19 || grid_relax_type[3] == 98)
          {
             grid_relax_type[3] = grid_relax_type[0];
             num_grid_sweeps[3] = 1;
-            if (grid_relax_points) grid_relax_points[3][0] = 0;
+            if (grid_relax_points) { grid_relax_points[3][0] = 0; }
          }
          if (S)
+         {
             hypre_ParCSRMatrixDestroy(S);
+         }
          if (P)
+         {
             hypre_ParCSRMatrixDestroy(P);
+         }
          if (level > 0)
          {
             /* note special case treatment of CF_marker is necessary
@@ -2252,15 +2534,24 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
             hypre_ParVectorDestroy(F_array[level]);
             hypre_ParVectorDestroy(U_array[level]);
          }
+         if (level + 1 < max_levels)
+         {
+            hypre_IntArrayDestroy(dof_func_array[level + 1]);
+            dof_func_array[level + 1] = NULL;
+         }
 
          break;
       }
       if (level < agg_num_levels && coarse_size < min_coarse_size)
       {
          if (S)
+         {
             hypre_ParCSRMatrixDestroy(S);
+         }
          if (P)
+         {
             hypre_ParCSRMatrixDestroy(P);
+         }
          if (level > 0)
          {
             hypre_IntArrayDestroy(CF_marker_array[level]);
@@ -2268,6 +2559,8 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
             hypre_ParVectorDestroy(F_array[level]);
             hypre_ParVectorDestroy(U_array[level]);
          }
+         hypre_IntArrayDestroy(dof_func_array[level + 1]);
+         dof_func_array[level + 1] = NULL;
          coarse_size = fine_size;
 
          break;
@@ -2304,7 +2597,7 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
                                                  num_interp_vectors,
                                                  interp_vectors_array[level],
                                                  hypre_IntArrayData(CF_marker_array[level]),
-                                                 &interp_vectors_array[level+1],
+                                                 &interp_vectors_array[level + 1],
                                                  0, num_functions);
 
          }
@@ -2326,7 +2619,7 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
                                                interp_vectors_array[level],
                                                &num_functions,
                                                dof_func_data,
-                                               &dof_func_array[level+1],
+                                               &dof_func_array[level + 1],
                                                interp_vec_variant, level,
                                                abs_q_trunc,
                                                expandp_weights,
@@ -2341,7 +2634,7 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
                                                coarse_pnts_global,
                                                &num_functions,
                                                dof_func_data,
-                                               &dof_func_array[level+1],
+                                               &dof_func_array[level + 1],
                                                hypre_IntArrayData(CF_marker_array[level]),
                                                level,
                                                expandp_weights,
@@ -2364,27 +2657,31 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
                   hypre_Vector *Vtemp_local = hypre_ParVectorLocalVector(Vtemp);
                   hypre_TFree(hypre_VectorData(Vtemp_local), memory_location);
                   hypre_VectorSize(Vtemp_local) = local_P_sz;
-                  hypre_VectorData(Vtemp_local) = hypre_CTAlloc(HYPRE_Complex, local_P_sz, memory_location);
+                  hypre_VectorData(Vtemp_local) = hypre_CTAlloc(HYPRE_Complex, local_P_sz * num_vectors,
+                                                                memory_location);
                   if (Ztemp)
                   {
                      hypre_Vector *Ztemp_local = hypre_ParVectorLocalVector(Ztemp);
                      hypre_TFree(hypre_VectorData(Ztemp_local), memory_location);
                      hypre_VectorSize(Ztemp_local) = local_P_sz;
-                     hypre_VectorData(Ztemp_local) = hypre_CTAlloc(HYPRE_Complex, local_P_sz, memory_location);
+                     hypre_VectorData(Ztemp_local) = hypre_CTAlloc(HYPRE_Complex, local_P_sz * num_vectors,
+                                                                   memory_location);
                   }
                   if (Ptemp)
                   {
                      hypre_Vector *Ptemp_local = hypre_ParVectorLocalVector(Ptemp);
                      hypre_TFree(hypre_VectorData(Ptemp_local), memory_location);
                      hypre_VectorSize(Ptemp_local) = local_P_sz;
-                     hypre_VectorData(Ptemp_local) = hypre_CTAlloc(HYPRE_Complex, local_P_sz, memory_location);
+                     hypre_VectorData(Ptemp_local) = hypre_CTAlloc(HYPRE_Complex, local_P_sz * num_vectors,
+                                                                   memory_location);
                   }
                   if (Rtemp)
                   {
                      hypre_Vector *Rtemp_local = hypre_ParVectorLocalVector(Rtemp);
                      hypre_TFree(hypre_VectorData(Rtemp_local), memory_location);
                      hypre_VectorSize(Rtemp_local) = local_P_sz;
-                     hypre_VectorData(Rtemp_local) = hypre_CTAlloc(HYPRE_Complex, local_P_sz, memory_location);
+                     hypre_VectorData(Rtemp_local) = hypre_CTAlloc(HYPRE_Complex, local_P_sz * num_vectors,
+                                                                   memory_location);
                   }
                }
                /*if (hypre_ParCSRMatrixGlobalNumRows(A_array[0]) < hypre_ParCSRMatrixGlobalNumCols(P))
@@ -2407,13 +2704,15 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
                HYPRE_Int expand_level = 0;
 
                if (level == interp_vec_first_level)
+               {
                   expand_level = 1;
+               }
 
                hypre_BoomerAMGCoarsenInterpVectors( P,
                                                     num_interp_vectors,
                                                     interp_vectors_array[level],
                                                     hypre_IntArrayData(CF_marker_array[level]),
-                                                    &interp_vectors_array[level+1],
+                                                    &interp_vectors_array[level + 1],
                                                     expand_level, num_functions);
             }
          } /* end apply variant */
@@ -2425,13 +2724,13 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
          hypre_BoomerAMGJacobiInterp( A_array[level], &P, S,
                                       num_functions, dof_func_data,
                                       hypre_IntArrayData(CF_marker_array[level]),
-                                      level, jacobi_trunc_threshold, 0.5*jacobi_trunc_threshold );
+                                      level, jacobi_trunc_threshold, 0.5 * jacobi_trunc_threshold );
       }
 
       dof_func_data = NULL;
-      if (dof_func_array[level+1])
+      if (dof_func_array[level + 1])
       {
-         dof_func_data = hypre_IntArrayData(dof_func_array[level+1]);
+         dof_func_data = hypre_IntArrayData(dof_func_array[level + 1]);
 
       }
 
@@ -2454,7 +2753,7 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
                   HYPRE_Real w_inv = 1.0 / add_rlx_wt;
                   /*HYPRE_Real w_inv = 1.0/hypre_ParAMGDataRelaxWeight(amg_data)[level];*/
                   hypre_SeqVectorInitialize_v2(d_diag, HYPRE_MEMORY_HOST);
-                  for (i=0; i < lvl_nrows; i++)
+                  for (i = 0; i < lvl_nrows; i++)
                   {
                      hypre_VectorData(d_diag)[i] = lvl_data[lvl_i[i]] * w_inv;
                   }
@@ -2493,22 +2792,24 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
                /*hypre_ParCSRMatrixDestroy(P); */
                hypre_SeqVectorDestroy(d_diag);
                /* Set NonGalerkin drop tol on each level */
-               if (level < nongalerk_num_tol) nongalerk_tol_l = nongalerk_tol[level];
-               if (nongal_tol_array) nongalerk_tol_l = nongal_tol_array[level];
+               if (level < nongalerk_num_tol) { nongalerk_tol_l = nongalerk_tol[level]; }
+               if (nongal_tol_array) { nongalerk_tol_l = nongal_tol_array[level]; }
                if (nongalerk_tol_l > 0.0)
                {
                   /* Build Non-Galerkin Coarse Grid */
                   hypre_ParCSRMatrix *Q = NULL;
                   hypre_BoomerAMGBuildNonGalerkinCoarseOperator(&A_H, Q,
-                    0.333*strong_threshold, max_row_sum, num_functions,
-                    dof_func_data, hypre_IntArrayData(CF_marker_array[level]),
-                    /* nongalerk_tol, sym_collapse, lump_percent, beta );*/
-                      nongalerk_tol_l,      1,            0.5,    1.0 );
+                                                                0.333 * strong_threshold, max_row_sum, num_functions,
+                                                                dof_func_data, hypre_IntArrayData(CF_marker_array[level]),
+                                                                /* nongalerk_tol, sym_collapse, lump_percent, beta );*/
+                                                                nongalerk_tol_l,      1,            0.5,    1.0 );
 
                   hypre_ParCSRMatrixColStarts(P_array[level])[0] = hypre_ParCSRMatrixRowStarts(A_H)[0];
                   hypre_ParCSRMatrixColStarts(P_array[level])[1] = hypre_ParCSRMatrixRowStarts(A_H)[1];
                   if (!hypre_ParCSRMatrixCommPkg(A_H))
+                  {
                      hypre_MatvecCommPkgCreate(A_H);
+                  }
                }
                hypre_ParCSRMatrixDestroy(Q);
             }
@@ -2519,8 +2820,10 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
                hypre_ParCSRMatrix *Ptmp = NULL;
                /* Set NonGalerkin drop tol on each level */
                if (level < nongalerk_num_tol)
-                   nongalerk_tol_l = nongalerk_tol[level];
-               if (nongal_tol_array) nongalerk_tol_l = nongal_tol_array[level];
+               {
+                  nongalerk_tol_l = nongalerk_tol[level];
+               }
+               if (nongal_tol_array) { nongalerk_tol_l = nongal_tol_array[level]; }
 
                if (nongalerk_tol_l > 0.0)
                {
@@ -2543,10 +2846,10 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
 
                   /* Build Non-Galerkin Coarse Grid */
                   hypre_BoomerAMGBuildNonGalerkinCoarseOperator(&A_H, Q,
-                    0.333*strong_threshold, max_row_sum, num_functions,
-                    dof_func_data, hypre_IntArrayData(CF_marker_array[level]),
-                    /* nongalerk_tol, sym_collapse, lump_percent, beta );*/
-                      nongalerk_tol_l,      1,            0.5,    1.0 );
+                                                                0.333 * strong_threshold, max_row_sum, num_functions,
+                                                                dof_func_data, hypre_IntArrayData(CF_marker_array[level]),
+                                                                /* nongalerk_tol, sym_collapse, lump_percent, beta );*/
+                                                                nongalerk_tol_l,      1,            0.5,    1.0 );
 
                   if (!hypre_ParCSRMatrixCommPkg(A_H))
                   {
@@ -2587,7 +2890,7 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
                   }
                   else
                   {
-                     hypre_BoomerAMGBuildCoarseOperatorKT(P, A_array[level] , P,
+                     hypre_BoomerAMGBuildCoarseOperatorKT(P, A_array[level], P,
                                                           keepTranspose, &A_H);
                   }
                }
@@ -2608,11 +2911,11 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
                   Ptmp = NULL;
                   if (hypre_ParAMGDataModularizedMatMat(amg_data))
                   {
-                     Ptmp = hypre_ParCSRMatMat(C,Pnew);
+                     Ptmp = hypre_ParCSRMatMat(C, Pnew);
                   }
                   else
                   {
-                     Ptmp = hypre_ParMatmul(C,Pnew);
+                     Ptmp = hypre_ParMatmul(C, Pnew);
                   }
                   if (ns_tmp < ns)
                   {
@@ -2628,7 +2931,7 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
 
             if (add_P_max_elmts || add_trunc_factor)
             {
-               hypre_BoomerAMGTruncandBuild(P_array[level], add_trunc_factor,add_P_max_elmts);
+               hypre_BoomerAMGTruncandBuild(P_array[level], add_trunc_factor, add_P_max_elmts);
             }
             /*else
                 hypre_MatvecCommPkgCreate(P_array[level]);  */
@@ -2653,11 +2956,11 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
 
       hypre_TFree(SmoothVecs, HYPRE_MEMORY_HOST);
 
-      if (debug_flag==1)
+      if (debug_flag == 1)
       {
          wall_time = time_getWallclockSeconds() - wall_time;
          hypre_printf("Proc = %d    Level = %d    Build Interp Time = %f\n",
-                     my_id,level, wall_time);
+                      my_id, level, wall_time);
          fflush(NULL);
       }
 
@@ -2666,7 +2969,7 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
        *--------------------------------------------------------------*/
 
       HYPRE_ANNOTATE_REGION_BEGIN("%s", "RAP");
-      if (debug_flag==1) wall_time = time_getWallclockSeconds();
+      if (debug_flag == 1) { wall_time = time_getWallclockSeconds(); }
 
       if (block_mode)
       {
@@ -2676,7 +2979,7 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
 
          hypre_ParCSRBlockMatrixSetNumNonzeros(A_H_block);
          hypre_ParCSRBlockMatrixSetDNumNonzeros(A_H_block);
-         A_block_array[level+1] = A_H_block;
+         A_block_array[level + 1] = A_H_block;
       }
       else if (mult_addlvl == -1 || level < mult_addlvl || level > add_end)
       {
@@ -2696,19 +2999,19 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
             hypre_ParCSRMatrix *Q = NULL;
             if (hypre_ParAMGDataModularizedMatMat(amg_data))
             {
-               Q = hypre_ParCSRMatMat(A_array[level],P_array[level]);
-               A_H = hypre_ParCSRTMatMatKT(P_array[level],Q,keepTranspose);
+               Q = hypre_ParCSRMatMat(A_array[level], P_array[level]);
+               A_H = hypre_ParCSRTMatMatKT(P_array[level], Q, keepTranspose);
             }
             else
             {
-               Q = hypre_ParMatmul(A_array[level],P_array[level]);
-               A_H = hypre_ParTMatmul(P_array[level],Q);
+               Q = hypre_ParMatmul(A_array[level], P_array[level]);
+               A_H = hypre_ParTMatmul(P_array[level], Q);
             }
-            if (num_procs > 1) hypre_MatvecCommPkgCreate(A_H);
+            if (num_procs > 1) { hypre_MatvecCommPkgCreate(A_H); }
 
             /* Build Non-Galerkin Coarse Grid */
             hypre_BoomerAMGBuildNonGalerkinCoarseOperator(&A_H, Q,
-                                                          0.333*strong_threshold, max_row_sum, num_functions,
+                                                          0.333 * strong_threshold, max_row_sum, num_functions,
                                                           dof_func_data, hypre_IntArrayData(CF_marker_array[level]),
                                                           /* nongalerk_tol, sym_collapse, lump_percent, beta );*/
                                                           nongalerk_tol_l,      1,            0.5,    1.0 );
@@ -2741,16 +3044,6 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
             }
             /* Delete AP */
             hypre_ParCSRMatrixDestroy(AP);
-
-#if DEBUG_SAVE_ALL_OPS
-            if (level == 0)
-            {
-               hypre_ParCSRMatrixPrintIJ(A_array[0], 1, 1, "A_0.mtx");
-            }
-            char file[256];
-            hypre_sprintf(file, "A_%d.mtx", level+1);
-            hypre_ParCSRMatrixPrintIJ(A_H, 1, 1, file);
-#endif
          }
          else if (rap2)
          {
@@ -2763,8 +3056,8 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
             }
             else
             {
-               Q = hypre_ParMatmul(A_array[level],P_array[level]);
-               A_H = hypre_ParTMatmul(P_array[level],Q);
+               Q = hypre_ParMatmul(A_array[level], P_array[level]);
+               A_H = hypre_ParTMatmul(P_array[level], Q);
             }
             if (num_procs > 1)
             {
@@ -2783,11 +3076,11 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
             }
             else
             {
-               hypre_BoomerAMGBuildCoarseOperatorKT(P_array[level], A_array[level] ,
+               hypre_BoomerAMGBuildCoarseOperatorKT(P_array[level], A_array[level],
                                                     P_array[level], keepTranspose, &A_H);
             }
 
-            if (Pnew && ns==1)
+            if (Pnew && ns == 1)
             {
                hypre_ParCSRMatrixDestroy(P);
                P_array[level] = Pnew;
@@ -2795,18 +3088,34 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
          }
       }
 
+#if DEBUG_SAVE_ALL_OPS
+      if (level == 0)
+      {
+         hypre_ParCSRMatrixPrintIJ(A_array[0], 0, 0, "A_00.IJ.out");
+      }
+      char file[256];
+      hypre_sprintf(file, "A_%02d.IJ.out", level + 1);
+      hypre_ParCSRMatrixPrintIJ(A_H, 0, 0, file);
+
+      hypre_sprintf(file, "P_%02d.IJ.out", level);
+      hypre_ParCSRMatrixPrintIJ(P_array[level], 0, 0, file);
+#endif
+
       HYPRE_ANNOTATE_REGION_END("%s", "RAP");
-      if (debug_flag==1)
+      if (debug_flag == 1)
       {
          wall_time = time_getWallclockSeconds() - wall_time;
          hypre_printf("Proc = %d    Level = %d    Build Coarse Operator Time = %f\n",
-                       my_id,level, wall_time);
+                      my_id, level, wall_time);
          fflush(NULL);
       }
 
       HYPRE_ANNOTATE_MGLEVEL_END(level);
+      hypre_GpuProfilingPopRange();
       ++level;
       HYPRE_ANNOTATE_MGLEVEL_BEGIN(level);
+      hypre_sprintf(nvtx_name, "%s-%d", "AMG Level", level);
+      hypre_GpuProfilingPushRange(nvtx_name);
 
       if (!block_mode)
       {
@@ -2827,50 +3136,56 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
          A_array[level] = A_H;
       }
 
-      size = ((HYPRE_Real) fine_size )*.75;
-      if (coarsen_type > 0 && coarse_size >= (HYPRE_BigInt) size)
+#if defined(HYPRE_USING_GPU)
+      if (exec == HYPRE_EXEC_HOST)
+#endif
       {
-         coarsen_type = 0;
+         HYPRE_Real size = ((HYPRE_Real)fine_size) * .75;
+         if (coarsen_type > 0 && coarse_size >= (HYPRE_BigInt)size)
+         {
+            coarsen_type = 0;
+         }
       }
 
       {
          HYPRE_Int max_thresh = hypre_max(coarse_threshold, seq_threshold);
-#ifdef HYPRE_USING_DSUPERLU
+#if defined(HYPRE_USING_DSUPERLU)
          max_thresh = hypre_max(max_thresh, dslu_threshold);
 #endif
-         if ( (level == max_levels-1) || (coarse_size <= (HYPRE_BigInt) max_thresh) )
+         if ( (level == max_levels - 1) || (coarse_size <= (HYPRE_BigInt) max_thresh) )
          {
             not_finished_coarsening = 0;
          }
       }
    }  /* end of coarsening loop: while (not_finished_coarsening) */
-   HYPRE_ANNOTATE_REGION_BEGIN("%s", "Coarse solve");
 
-   /* free memory */
-   hypre_TFree(coarse_pnts_global, HYPRE_MEMORY_HOST);
-   hypre_TFree(coarse_pnts_global1, HYPRE_MEMORY_HOST);
+   HYPRE_ANNOTATE_REGION_BEGIN("%s", "Coarse solve");
 
    /* redundant coarse grid solve */
    if ((seq_threshold >= coarse_threshold) &&
        (coarse_size > (HYPRE_BigInt) coarse_threshold) &&
-       (level != max_levels-1))
+       (level != max_levels - 1))
    {
       hypre_seqAMGSetup(amg_data, level, coarse_threshold);
    }
-#ifdef HYPRE_USING_DSUPERLU
+#if defined(HYPRE_USING_DSUPERLU)
    else if ((dslu_threshold >= coarse_threshold) &&
             (coarse_size > (HYPRE_BigInt)coarse_threshold) &&
-            (level != max_levels-1))
+            (level != max_levels - 1))
    {
       HYPRE_Solver dslu_solver;
       hypre_SLUDistSetup(&dslu_solver, A_array[level], amg_print_level);
       hypre_ParAMGDataDSLUSolver(amg_data) = dslu_solver;
    }
 #endif
-   else if (grid_relax_type[3] == 9  ||
-            grid_relax_type[3] == 99 ||
-            grid_relax_type[3] == 199 ) /*use of Gaussian elimination on coarsest level */
+   else if (grid_relax_type[3] == 9   ||
+            grid_relax_type[3] == 19  ||
+            grid_relax_type[3] == 98  ||
+            grid_relax_type[3] == 99  ||
+            grid_relax_type[3] == 198 ||
+            grid_relax_type[3] == 199)
    {
+      /* Gaussian elimination on the coarsest level */
       if (coarse_size <= coarse_threshold)
       {
          hypre_GaussElimSetup(amg_data, level, grid_relax_type[3]);
@@ -2880,15 +3195,9 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
          grid_relax_type[3] = grid_relax_type[1];
       }
    }
-   else if (grid_relax_type[3] == 19 || grid_relax_type[3] == 98)  /*use of Gaussian elimination on coarsest level */
-   {
-      if (coarse_size > coarse_threshold)
-      {
-         grid_relax_type[3] = grid_relax_type[1];
-      }
-   }
    HYPRE_ANNOTATE_REGION_END("%s", "Coarse solve");
    HYPRE_ANNOTATE_MGLEVEL_END(level);
+   hypre_GpuProfilingPopRange();
 
    if (level > 0)
    {
@@ -2915,12 +3224,14 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
             hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A_array[level]),
                                   hypre_ParCSRMatrixGlobalNumRows(A_array[level]),
                                   hypre_ParCSRMatrixRowStarts(A_array[level]));
+         hypre_ParVectorNumVectors(F_array[level]) = num_vectors;
          hypre_ParVectorInitialize_v2(F_array[level], memory_location);
 
          U_array[level] =
             hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A_array[level]),
                                   hypre_ParCSRMatrixGlobalNumRows(A_array[level]),
                                   hypre_ParCSRMatrixRowStarts(A_array[level]));
+         hypre_ParVectorNumVectors(U_array[level]) = num_vectors;
          hypre_ParVectorInitialize_v2(U_array[level], memory_location);
       }
    }
@@ -2930,9 +3241,9 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
     * for levels 1 through coarsest, into amg_data data structure
     *-----------------------------------------------------------------------*/
 
-   num_levels = level+1;
+   num_levels = level + 1;
    hypre_ParAMGDataNumLevels(amg_data) = num_levels;
-   if (hypre_ParAMGDataSmoothNumLevels(amg_data) > num_levels-1)
+   if (hypre_ParAMGDataSmoothNumLevels(amg_data) > num_levels - 1)
    {
       hypre_ParAMGDataSmoothNumLevels(amg_data) = num_levels;
    }
@@ -2942,12 +3253,18 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
     * Setup of special smoothers when needed
     *-----------------------------------------------------------------------*/
 
+   hypre_GpuProfilingPushRange("Relaxation");
    if (addlvl > -1 ||
        grid_relax_type[1] ==  7 || grid_relax_type[2] ==  7 || grid_relax_type[3] ==  7 ||
        grid_relax_type[1] ==  8 || grid_relax_type[2] ==  8 || grid_relax_type[3] ==  8 ||
+       grid_relax_type[1] == 11 || grid_relax_type[2] == 11 || grid_relax_type[3] == 11 ||
+       grid_relax_type[1] == 12 || grid_relax_type[2] == 12 || grid_relax_type[3] == 12 ||
        grid_relax_type[1] == 13 || grid_relax_type[2] == 13 || grid_relax_type[3] == 13 ||
        grid_relax_type[1] == 14 || grid_relax_type[2] == 14 || grid_relax_type[3] == 14 ||
-       grid_relax_type[1] == 18 || grid_relax_type[2] == 18 || grid_relax_type[3] == 18)
+       grid_relax_type[1] == 18 || grid_relax_type[2] == 18 || grid_relax_type[3] == 18 ||
+       grid_relax_type[1] == 30 || grid_relax_type[2] == 30 || grid_relax_type[3] == 30 ||
+       grid_relax_type[1] == 88 || grid_relax_type[2] == 88 || grid_relax_type[3] == 88 ||
+       grid_relax_type[1] == 89 || grid_relax_type[2] == 89 || grid_relax_type[3] == 89)
    {
       l1_norms = hypre_CTAlloc(hypre_Vector*, num_levels, HYPRE_MEMORY_HOST);
       hypre_ParAMGDataL1Norms(amg_data) = l1_norms;
@@ -2986,10 +3303,17 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
 
       HYPRE_ANNOTATE_MGLEVEL_BEGIN(j);
       HYPRE_ANNOTATE_REGION_BEGIN("%s", "Relaxation");
+      hypre_sprintf(nvtx_name, "%s-%d", "AMG Level", level);
+      hypre_GpuProfilingPushRange(nvtx_name);
 
-      if (j < num_levels-1 &&
-          (grid_relax_type[1] == 8 || grid_relax_type[1] == 13 || grid_relax_type[1] == 14 ||
-           grid_relax_type[2] == 8 || grid_relax_type[2] == 13 || grid_relax_type[2] == 14))
+      hypre_sprintf(nvtx_name, "%s-%d", "Relaxation", j);
+      hypre_GpuProfilingPushRange(nvtx_name);
+
+      if (j < num_levels - 1 &&
+          (grid_relax_type[1] == 8  || grid_relax_type[1] == 89 ||
+           grid_relax_type[1] == 13 || grid_relax_type[1] == 14 ||
+           grid_relax_type[2] == 8  || grid_relax_type[2] == 89 ||
+           grid_relax_type[2] == 13 || grid_relax_type[2] == 14))
       {
          if (relax_order)
          {
@@ -3000,13 +3324,46 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
             hypre_ParCSRComputeL1Norms(A_array[j], 4, NULL, &l1_norm_data);
          }
       }
-      else if (j == num_levels-1 &&
-               (grid_relax_type[3] == 8 || grid_relax_type[3] == 13 || grid_relax_type[3] == 14))
+      else if (j == num_levels - 1 &&
+               (grid_relax_type[3] == 8  || grid_relax_type[3] == 89 ||
+                grid_relax_type[3] == 13 || grid_relax_type[3] == 14))
       {
          hypre_ParCSRComputeL1Norms(A_array[j], 4, NULL, &l1_norm_data);
       }
 
-      if (j < num_levels-1 && (grid_relax_type[1] == 18 || grid_relax_type[2] == 18))
+      if (j < num_levels - 1 && (grid_relax_type[1] == 30 || grid_relax_type[2] == 30))
+      {
+         if (relax_order)
+         {
+            hypre_ParCSRComputeL1Norms(A_array[j], 3, hypre_IntArrayData(CF_marker_array[j]), &l1_norm_data);
+         }
+         else
+         {
+            hypre_ParCSRComputeL1Norms(A_array[j], 3, NULL, &l1_norm_data);
+         }
+      }
+      else if (j == num_levels - 1 && grid_relax_type[3] == 30)
+      {
+         hypre_ParCSRComputeL1Norms(A_array[j], 3, NULL, &l1_norm_data);
+      }
+
+      if (j < num_levels - 1 && (grid_relax_type[1] == 88 || grid_relax_type[2] == 88 ))
+      {
+         if (relax_order)
+         {
+            hypre_ParCSRComputeL1Norms(A_array[j], 6, hypre_IntArrayData(CF_marker_array[j]), &l1_norm_data);
+         }
+         else
+         {
+            hypre_ParCSRComputeL1Norms(A_array[j], 6, NULL, &l1_norm_data);
+         }
+      }
+      else if (j == num_levels - 1 && (grid_relax_type[3] == 88))
+      {
+         hypre_ParCSRComputeL1Norms(A_array[j], 6, NULL, &l1_norm_data);
+      }
+
+      if (j < num_levels - 1 && (grid_relax_type[1] == 18 || grid_relax_type[2] == 18))
       {
          if (relax_order)
          {
@@ -3017,7 +3374,7 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
             hypre_ParCSRComputeL1Norms(A_array[j], 1, NULL, &l1_norm_data);
          }
       }
-      else if (j == num_levels-1 && grid_relax_type[3] == 18)
+      else if (j == num_levels - 1 && grid_relax_type[3] == 18)
       {
          hypre_ParCSRComputeL1Norms(A_array[j], 1, NULL, &l1_norm_data);
       }
@@ -3031,9 +3388,11 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
 
       HYPRE_ANNOTATE_REGION_END("%s", "Relaxation");
       HYPRE_ANNOTATE_MGLEVEL_END(j);
+      hypre_GpuProfilingPopRange();
+      hypre_GpuProfilingPopRange();
    }
 
-   for (j = addlvl; j < hypre_min(add_end+1, num_levels) ; j++)
+   for (j = addlvl; j < hypre_min(add_end + 1, num_levels) ; j++)
    {
       if (add_rlx == 18 )
       {
@@ -3041,6 +3400,11 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
 
          HYPRE_ANNOTATE_MGLEVEL_BEGIN(j);
          HYPRE_ANNOTATE_REGION_BEGIN("%s", "Relaxation");
+         hypre_sprintf(nvtx_name, "%s-%d", "AMG Level", level);
+         hypre_GpuProfilingPushRange(nvtx_name);
+
+         hypre_sprintf(nvtx_name, "%s-%d", "Relaxation", j);
+         hypre_GpuProfilingPushRange(nvtx_name);
 
          hypre_ParCSRComputeL1Norms(A_array[j], 1, NULL, &l1_norm_data);
 
@@ -3050,44 +3414,56 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
 
          HYPRE_ANNOTATE_REGION_END("%s", "Relaxation");
          HYPRE_ANNOTATE_MGLEVEL_END(j);
+         hypre_GpuProfilingPopRange();
+         hypre_GpuProfilingPopRange();
       }
    }
 
-   for (j = add_end+1; j < num_levels; j++)
+   for (j = add_end + 1; j < num_levels; j++)
    {
       HYPRE_Real *l1_norm_data = NULL;
 
       HYPRE_ANNOTATE_MGLEVEL_BEGIN(j);
       HYPRE_ANNOTATE_REGION_BEGIN("%s", "Relaxation");
+      hypre_sprintf(nvtx_name, "%s-%d", "AMG Level", level);
+      hypre_GpuProfilingPushRange(nvtx_name);
+
+      hypre_sprintf(nvtx_name, "%s-%d", "Relaxation", j);
+      hypre_GpuProfilingPushRange(nvtx_name);
 
-      if (j < num_levels-1 && (grid_relax_type[1] == 8 || grid_relax_type[1] == 13 || grid_relax_type[1] == 14 ||
-                               grid_relax_type[2] == 8 || grid_relax_type[2] == 13 || grid_relax_type[2] == 14))
+
+      if (j < num_levels - 1 &&
+          (grid_relax_type[1] == 8 || grid_relax_type[1] == 13 || grid_relax_type[1] == 14 ||
+           grid_relax_type[2] == 8 || grid_relax_type[2] == 13 || grid_relax_type[2] == 14))
       {
          if (relax_order)
          {
-            hypre_ParCSRComputeL1Norms(A_array[j], 4, hypre_IntArrayData(CF_marker_array[j]), &l1_norm_data);
+            hypre_ParCSRComputeL1Norms(A_array[j], 4, hypre_IntArrayData(CF_marker_array[j]),
+                                       &l1_norm_data);
          }
          else
          {
             hypre_ParCSRComputeL1Norms(A_array[j], 4, NULL, &l1_norm_data);
          }
       }
-      else if ((grid_relax_type[3] == 8 || grid_relax_type[3] == 13 || grid_relax_type[3] == 14) && j == num_levels-1)
+      else if ((grid_relax_type[3] == 8 || grid_relax_type[3] == 13 || grid_relax_type[3] == 14) &&
+               j == num_levels - 1)
       {
          hypre_ParCSRComputeL1Norms(A_array[j], 4, NULL, &l1_norm_data);
       }
-      if ((grid_relax_type[1] == 18 || grid_relax_type[2] == 18) && j < num_levels-1)
+      if ((grid_relax_type[1] == 18 || grid_relax_type[2] == 18) && j < num_levels - 1)
       {
          if (relax_order)
          {
-            hypre_ParCSRComputeL1Norms(A_array[j], 1, hypre_IntArrayData(CF_marker_array[j]), &l1_norm_data);
+            hypre_ParCSRComputeL1Norms(A_array[j], 1, hypre_IntArrayData(CF_marker_array[j]),
+                                       &l1_norm_data);
          }
          else
          {
             hypre_ParCSRComputeL1Norms(A_array[j], 1, NULL, &l1_norm_data);
          }
       }
-      else if (grid_relax_type[3] == 18 && j == num_levels-1)
+      else if (grid_relax_type[3] == 18 && j == num_levels - 1)
       {
          hypre_ParCSRComputeL1Norms(A_array[j], 1, NULL, &l1_norm_data);
       }
@@ -3101,14 +3477,28 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
 
       HYPRE_ANNOTATE_REGION_END("%s", "Relaxation");
       HYPRE_ANNOTATE_MGLEVEL_END(j);
+      hypre_GpuProfilingPopRange();
+      hypre_GpuProfilingPopRange();
    }
 
    for (j = 0; j < num_levels; j++)
    {
       HYPRE_ANNOTATE_MGLEVEL_BEGIN(j);
       HYPRE_ANNOTATE_REGION_BEGIN("%s", "Relaxation");
+      hypre_sprintf(nvtx_name, "%s-%d", "AMG Level", level);
+      hypre_GpuProfilingPushRange(nvtx_name);
+
+      hypre_sprintf(nvtx_name, "%s-%d", "Relaxation", j);
+      hypre_GpuProfilingPushRange(nvtx_name);
+
+      if ( grid_relax_type[1]  == 7 || grid_relax_type[2] == 7   ||
+           (grid_relax_type[3] == 7 && j == (num_levels - 1))    ||
+
+           grid_relax_type[1]  == 11 || grid_relax_type[2] == 11 ||
+           (grid_relax_type[3] == 11 && j == (num_levels - 1))   ||
 
-      if (grid_relax_type[1] == 7 || grid_relax_type[2] == 7 || (grid_relax_type[3] == 7 && j == (num_levels-1)))
+           grid_relax_type[1]  == 12 || grid_relax_type[2] == 12 ||
+           (grid_relax_type[3] == 12 && j == (num_levels - 1)) )
       {
          HYPRE_Real *l1_norm_data = NULL;
 
@@ -3118,7 +3508,8 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
          hypre_VectorData(l1_norms[j]) = l1_norm_data;
          hypre_SeqVectorInitialize_v2(l1_norms[j], hypre_ParCSRMatrixMemoryLocation(A_array[j]));
       }
-      else if (grid_relax_type[1] == 16 || grid_relax_type[2] == 16 || (grid_relax_type[3] == 16 && j== (num_levels-1)))
+      else if (grid_relax_type[1] == 16 || grid_relax_type[2] == 16 ||
+               (grid_relax_type[3] == 16 && j == (num_levels - 1)))
       {
          HYPRE_Int scale = hypre_ParAMGDataChebyScale(amg_data);
          /* If the full array is being considered, create the relevant temp vectors */
@@ -3141,7 +3532,7 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
          max_eig_est[j] = max_eig;
          min_eig_est[j] = min_eig;
 
-         cheby_ds[j]                             = hypre_SeqVectorCreate(hypre_ParCSRMatrixNumRows(A_array[j]));
+         cheby_ds[j] = hypre_SeqVectorCreate(hypre_ParCSRMatrixNumRows(A_array[j]));
          hypre_VectorVectorStride(cheby_ds[j])   = hypre_ParCSRMatrixNumRows(A_array[j]);
          hypre_VectorIndexStride(cheby_ds[j])    = 1;
          hypre_VectorMemoryLocation(cheby_ds[j]) = hypre_ParCSRMatrixMemoryLocation(A_array[j]);
@@ -3157,7 +3548,7 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
                                        &hypre_VectorData(cheby_ds[j]));
          cheby_coefs[j] = coefs;
       }
-      else if (grid_relax_type[1] == 15 || (grid_relax_type[3] == 15 && j == (num_levels-1))  )
+      else if (grid_relax_type[1] == 15 || (grid_relax_type[3] == 15 && j == (num_levels - 1))  )
       {
 
          HYPRE_ParCSRPCGCreate(comm, &smoother[j]);
@@ -3173,23 +3564,35 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
                               (HYPRE_ParCSRMatrix) A_array[j],
                               (HYPRE_ParVector) F_array[j],
                               (HYPRE_ParVector) U_array[j]);
-
-
       }
+
       if (relax_weight[j] == 0.0)
       {
          hypre_ParCSRMatrixScaledNorm(A_array[j], &relax_weight[j]);
          if (relax_weight[j] != 0.0)
-            relax_weight[j] = 4.0/3.0/relax_weight[j];
+         {
+            relax_weight[j] = 4.0 / 3.0 / relax_weight[j];
+         }
          else
-            hypre_error_w_msg(HYPRE_ERROR_GENERIC," Warning ! Matrix norm is zero !!!");
+         {
+            hypre_error_w_msg(HYPRE_ERROR_GENERIC, " Warning ! Matrix norm is zero !!!");
+         }
       }
+
       if ((smooth_type == 6 || smooth_type == 16) && smooth_num_levels > j)
       {
+         /* Sanity check */
+         if (num_vectors > 1)
+         {
+            hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                              "Schwarz smoothing doesn't support multicomponent vectors");
+            return hypre_error_flag;
+         }
+
          schwarz_relax_wt = hypre_ParAMGDataSchwarzRlxWeight(amg_data);
 
          HYPRE_SchwarzCreate(&smoother[j]);
-         HYPRE_SchwarzSetNumFunctions(smoother[j],num_functions);
+         HYPRE_SchwarzSetNumFunctions(smoother[j], num_functions);
          HYPRE_SchwarzSetVariant(smoother[j],
                                  hypre_ParAMGDataVariant(amg_data));
          HYPRE_SchwarzSetOverlap(smoother[j],
@@ -3199,7 +3602,9 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
          HYPRE_SchwarzSetNonSymm(smoother[j],
                                  hypre_ParAMGDataSchwarzUseNonSymm(amg_data));
          if (schwarz_relax_wt > 0)
-            HYPRE_SchwarzSetRelaxWeight(smoother[j],schwarz_relax_wt);
+         {
+            HYPRE_SchwarzSetRelaxWeight(smoother[j], schwarz_relax_wt);
+         }
          HYPRE_SchwarzSetup(smoother[j],
                             (HYPRE_ParCSRMatrix) A_array[j],
                             (HYPRE_ParVector) f,
@@ -3221,35 +3626,100 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
       }
       else if ((smooth_type == 9 || smooth_type == 19) && smooth_num_levels > j)
       {
+         /* Sanity checks */
 #ifdef HYPRE_MIXEDINT
-         hypre_error_w_msg(HYPRE_ERROR_GENERIC,"Euclid smoothing is not available in mixedint mode!");
+         hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                           "Euclid smoothing is not available in mixedint mode!");
          return hypre_error_flag;
 #endif
+
+         if (num_vectors > 1)
+         {
+            hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                              "Euclid smoothing doesn't support multicomponent vectors");
+            return hypre_error_flag;
+         }
+
          HYPRE_EuclidCreate(comm, &smoother[j]);
          if (euclidfile)
-            HYPRE_EuclidSetParamsFromFile(smoother[j],euclidfile);
-         HYPRE_EuclidSetLevel(smoother[j],eu_level);
+         {
+            HYPRE_EuclidSetParamsFromFile(smoother[j], euclidfile);
+         }
+         HYPRE_EuclidSetLevel(smoother[j], eu_level);
          if (eu_bj)
-            HYPRE_EuclidSetBJ(smoother[j],eu_bj);
+         {
+            HYPRE_EuclidSetBJ(smoother[j], eu_bj);
+         }
          if (eu_sparse_A)
-            HYPRE_EuclidSetSparseA(smoother[j],eu_sparse_A);
+         {
+            HYPRE_EuclidSetSparseA(smoother[j], eu_sparse_A);
+         }
          HYPRE_EuclidSetup(smoother[j],
                            (HYPRE_ParCSRMatrix) A_array[j],
                            (HYPRE_ParVector) F_array[j],
                            (HYPRE_ParVector) U_array[j]);
       }
+      else if ((smooth_type == 4 || smooth_type == 14) && smooth_num_levels > j)
+      {
+         /* Sanity check */
+         if (num_vectors > 1)
+         {
+            hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                              "FSAI smoothing doesn't support multicomponent vectors");
+            return hypre_error_flag;
+         }
+
+         HYPRE_FSAICreate(&smoother[j]);
+         HYPRE_FSAISetAlgoType(smoother[j], fsai_algo_type);
+         HYPRE_FSAISetLocalSolveType(smoother[j], fsai_local_solve_type);
+         HYPRE_FSAISetMaxSteps(smoother[j], fsai_max_steps);
+         HYPRE_FSAISetMaxStepSize(smoother[j], fsai_max_step_size);
+         HYPRE_FSAISetMaxNnzRow(smoother[j], fsai_max_nnz_row);
+         HYPRE_FSAISetNumLevels(smoother[j], fsai_num_levels);
+         HYPRE_FSAISetThreshold(smoother[j], fsai_threshold);
+         HYPRE_FSAISetKapTolerance(smoother[j], fsai_kap_tolerance);
+         HYPRE_FSAISetTolerance(smoother[j], 0.0);
+         HYPRE_FSAISetOmega(smoother[j], relax_weight[level]);
+         HYPRE_FSAISetEigMaxIters(smoother[j], fsai_eig_max_iters);
+         HYPRE_FSAISetPrintLevel(smoother[j], (amg_print_level >= 1) ? 1 : 0);
+
+         HYPRE_FSAISetup(smoother[j],
+                         (HYPRE_ParCSRMatrix) A_array[j],
+                         (HYPRE_ParVector) F_array[j],
+                         (HYPRE_ParVector) U_array[j]);
+
+#if DEBUG_SAVE_ALL_OPS
+         {
+            char filename[256];
+            hypre_sprintf(filename, "G_%02d.IJ.out", j);
+            hypre_ParCSRMatrixPrintIJ(hypre_ParFSAIDataGmat((hypre_ParFSAIData*) smoother[j]),
+                                      0, 0, filename);
+         }
+#endif
+      }
       else if ((smooth_type == 5 || smooth_type == 15) && smooth_num_levels > j)
       {
-         HYPRE_ILUCreate( &smoother[j]);
-         HYPRE_ILUSetType( smoother[j], ilu_type);
+         /* Sanity check */
+         if (num_vectors > 1)
+         {
+            hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                              "ILU smoothing doesn't support multicomponent vectors");
+            return hypre_error_flag;
+         }
+
+         HYPRE_ILUCreate(&smoother[j]);
+         HYPRE_ILUSetType(smoother[j], ilu_type);
          HYPRE_ILUSetLocalReordering( smoother[j], ilu_reordering_type);
          HYPRE_ILUSetMaxIter(smoother[j], ilu_max_iter);
+         HYPRE_ILUSetTriSolve(smoother[j], ilu_tri_solve);
+         HYPRE_ILUSetLowerJacobiIters(smoother[j], ilu_lower_jacobi_iters);
+         HYPRE_ILUSetUpperJacobiIters(smoother[j], ilu_upper_jacobi_iters);
          HYPRE_ILUSetTol(smoother[j], 0.);
          HYPRE_ILUSetDropThreshold(smoother[j], ilu_droptol);
          HYPRE_ILUSetLogging(smoother[j], 0);
          HYPRE_ILUSetPrintLevel(smoother[j], 0);
          HYPRE_ILUSetLevelOfFill(smoother[j], ilu_lfil);
-         HYPRE_ILUSetMaxNnzPerRow(smoother[j],ilu_max_row_nnz);
+         HYPRE_ILUSetMaxNnzPerRow(smoother[j], ilu_max_row_nnz);
          HYPRE_ILUSetup(smoother[j],
                         (HYPRE_ParCSRMatrix) A_array[j],
                         (HYPRE_ParVector) F_array[j],
@@ -3257,14 +3727,24 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
       }
       else if ((smooth_type == 8 || smooth_type == 18) && smooth_num_levels > j)
       {
+         /* Sanity checks */
 #ifdef HYPRE_MIXEDINT
-         hypre_error_w_msg(HYPRE_ERROR_GENERIC,"ParaSails smoothing is not available in mixedint mode!");
+         hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                           "ParaSails smoothing is not available in mixedint mode!");
          return hypre_error_flag;
 #endif
+
+         if (num_vectors > 1)
+         {
+            hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                              "ParaSails smoothing doesn't support multicomponent vectors");
+            return hypre_error_flag;
+         }
+
          HYPRE_ParCSRParaSailsCreate(comm, &smoother[j]);
-         HYPRE_ParCSRParaSailsSetParams(smoother[j],thresh,nlevel);
-         HYPRE_ParCSRParaSailsSetFilter(smoother[j],filter);
-         HYPRE_ParCSRParaSailsSetSym(smoother[j],sym);
+         HYPRE_ParCSRParaSailsSetParams(smoother[j], thresh, nlevel);
+         HYPRE_ParCSRParaSailsSetFilter(smoother[j], filter);
+         HYPRE_ParCSRParaSailsSetSym(smoother[j], sym);
          HYPRE_ParCSRParaSailsSetup(smoother[j],
                                     (HYPRE_ParCSRMatrix) A_array[j],
                                     (HYPRE_ParVector) F_array[j],
@@ -3272,21 +3752,32 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
       }
       else if ((smooth_type == 7 || smooth_type == 17) && smooth_num_levels > j)
       {
+         /* Sanity checks */
 #ifdef HYPRE_MIXEDINT
-         hypre_error_w_msg(HYPRE_ERROR_GENERIC,"pilut smoothing is not available in mixedint mode!");
+         hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                           "Pilut smoothing is not available in mixedint mode!");
          return hypre_error_flag;
 #endif
+
+         if (num_vectors > 1)
+         {
+            hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                              "Pilut smoothing doesn't support multicomponent vectors");
+            return hypre_error_flag;
+         }
+
          HYPRE_ParCSRPilutCreate(comm, &smoother[j]);
          HYPRE_ParCSRPilutSetup(smoother[j],
                                 (HYPRE_ParCSRMatrix) A_array[j],
                                 (HYPRE_ParVector) F_array[j],
                                 (HYPRE_ParVector) U_array[j]);
-         HYPRE_ParCSRPilutSetDropTolerance(smoother[j],drop_tol);
-         HYPRE_ParCSRPilutSetFactorRowSize(smoother[j],max_nz_per_row);
+         HYPRE_ParCSRPilutSetDropTolerance(smoother[j], drop_tol);
+         HYPRE_ParCSRPilutSetFactorRowSize(smoother[j], max_nz_per_row);
       }
-      else if ( (j < num_levels-1) || ((j == num_levels-1) &&
-                (grid_relax_type[3] !=  9 && grid_relax_type[3] != 99  &&
-                 grid_relax_type[3] != 19 && grid_relax_type[3] != 98) && coarse_size > 9) )
+      else if ( (j < num_levels - 1) ||
+                ((j == num_levels - 1) &&
+                 (grid_relax_type[3] !=  9 && grid_relax_type[3] != 99  &&
+                  grid_relax_type[3] != 19 && grid_relax_type[3] != 98) && coarse_size > 9) )
       {
          if (relax_weight[j] < 0)
          {
@@ -3302,7 +3793,10 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
 
       HYPRE_ANNOTATE_REGION_END("%s", "Relaxation");
       HYPRE_ANNOTATE_MGLEVEL_END(j);
+      hypre_GpuProfilingPopRange();
+      hypre_GpuProfilingPopRange();
    } /* end of levels loop */
+   hypre_GpuProfilingPopRange(); /* Relaxation */
 
    if (amg_logging > 1)
    {
@@ -3327,17 +3821,35 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
       hypre_CreateLambda(amg_data);
    }
 
+   if (cum_nnz_AP > 0.0)
+   {
+      cum_nnz_AP = hypre_ParCSRMatrixDNumNonzeros(A_array[0]);
+      for (j = 0; j < num_levels - 1; j++)
+      {
+         hypre_ParCSRMatrixSetDNumNonzeros(P_array[j]);
+         cum_nnz_AP += hypre_ParCSRMatrixDNumNonzeros(P_array[j]);
+         cum_nnz_AP += hypre_ParCSRMatrixDNumNonzeros(A_array[j + 1]);
+      }
+      hypre_ParAMGDataCumNnzAP(amg_data) = cum_nnz_AP;
+   }
+
    /*-----------------------------------------------------------------------
     * Print some stuff
     *-----------------------------------------------------------------------*/
 
    if (amg_print_level == 1 || amg_print_level == 3)
    {
-      hypre_BoomerAMGSetupStats(amg_data,A);
+      hypre_BoomerAMGSetupStats(amg_data, A);
    }
 
-   /* print out CF info to plot grids in matlab (see 'tools/AMGgrids.m') */
+   /* Destroy filtered matrix */
+   if (A_tilde != A)
+   {
+      hypre_ParCSRMatrixDestroy(A_tilde);
+      A_array[0] = A;
+   }
 
+   /* Print out CF info to plot grids in matlab (see 'tools/AMGgrids.m') */
    if (hypre_ParAMGDataPlotGrids(amg_data))
    {
       HYPRE_Int *CF, *CFc, *itemp;
@@ -3346,7 +3858,7 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
       HYPRE_Int coorddim = hypre_ParAMGDataCoordDim (amg_data);
       float *coordinates = hypre_ParAMGDataCoordinates (amg_data);
 
-      if (!coordinates) coorddim=0;
+      if (!coordinates) { coorddim = 0; }
 
       if (block_mode)
       {
@@ -3377,7 +3889,8 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
 
          /* copy CF_marker to the host if needed */
          hypre_IntArray *CF_marker_host;
-         if (hypre_GetActualMemLocation(hypre_IntArrayMemoryLocation(CF_marker_array[level])) == hypre_MEMORY_DEVICE)
+         if (hypre_GetActualMemLocation(hypre_IntArrayMemoryLocation(CF_marker_array[level])) ==
+             hypre_MEMORY_DEVICE)
          {
             CF_marker_host = hypre_IntArrayCloneDeep_v2(CF_marker_array[level], HYPRE_MEMORY_HOST);
          }
@@ -3399,7 +3912,8 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
          }
 
          /* copy back to device and destroy host copy */
-         if (hypre_GetActualMemLocation(hypre_IntArrayMemoryLocation(CF_marker_array[level])) == hypre_MEMORY_DEVICE)
+         if (hypre_GetActualMemLocation(hypre_IntArrayMemoryLocation(CF_marker_array[level])) ==
+             hypre_MEMORY_DEVICE)
          {
             hypre_IntArrayCopy(CF_marker_host, CF_marker_array[level]);
             hypre_IntArrayDestroy(CF_marker_host);
@@ -3413,14 +3927,14 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
       {
          local_size = hypre_CSRMatrixNumRows(hypre_ParCSRMatrixDiag(A));
       }
-      hypre_sprintf (filename,"%s.%05d",hypre_ParAMGDataPlotFileName (amg_data),my_id);
+      hypre_sprintf (filename, "%s.%05d", hypre_ParAMGDataPlotFileName (amg_data), my_id);
       fp = fopen(filename, "w");
 
       for (i = 0; i < local_size; i++)
       {
          for (j = 0; j < coorddim; j++)
          {
-            hypre_fprintf (fp,"% f ",coordinates[coorddim*i+j]);
+            hypre_fprintf (fp, "% f ", (HYPRE_Real) coordinates[coorddim * i + j]);
          }
          hypre_fprintf(fp, "%d\n", CF[i]);
       }
@@ -3432,99 +3946,101 @@ hypre_BoomerAMGSetup( void               *amg_vdata,
 
    /* print out matrices on all levels  */
 #if DEBUG
-{
-   char  filename[256];
-
-   if (block_mode)
    {
-      hypre_ParCSRMatrix *temp_A;
+      char  filename[256];
 
-      for (level = 0; level < num_levels; level++)
+      if (block_mode)
       {
-         hypre_sprintf(filename, "BoomerAMG.out.A_blk.%02d.ij", level);
-         temp_A =  hypre_ParCSRBlockMatrixConvertToParCSRMatrix(
-            A_block_array[level]);
-         hypre_ParCSRMatrixPrintIJ(temp_A, 0, 0, filename);
-         hypre_ParCSRMatrixDestroy(temp_A);
-      }
+         hypre_ParCSRMatrix *temp_A;
+
+         for (level = 0; level < num_levels; level++)
+         {
+            hypre_sprintf(filename, "BoomerAMG.out.A_blk.%02d.ij", level);
+            temp_A =  hypre_ParCSRBlockMatrixConvertToParCSRMatrix(
+                         A_block_array[level]);
+            hypre_ParCSRMatrixPrintIJ(temp_A, 0, 0, filename);
+            hypre_ParCSRMatrixDestroy(temp_A);
+         }
 
-   }
-   else
-   {
-      for (level = 0; level < num_levels; level++)
-      {
-         hypre_sprintf(filename, "BoomerAMG.out.A.%02d.ij", level);
-         hypre_ParCSRMatrixPrintIJ(A_array[level], 0, 0, filename);
       }
-      for (level = 0; level < (num_levels-1); level++)
+      else
       {
-         hypre_sprintf(filename, "BoomerAMG.out.P.%02d.ij", level);
-         hypre_ParCSRMatrixPrintIJ(P_array[level], 0, 0, filename);
+         for (level = 0; level < num_levels; level++)
+         {
+            hypre_sprintf(filename, "BoomerAMG.out.A.%02d.ij", level);
+            hypre_ParCSRMatrixPrintIJ(A_array[level], 0, 0, filename);
+         }
+         for (level = 0; level < (num_levels - 1); level++)
+         {
+            hypre_sprintf(filename, "BoomerAMG.out.P.%02d.ij", level);
+            hypre_ParCSRMatrixPrintIJ(P_array[level], 0, 0, filename);
+         }
       }
    }
-}
 #endif
 
-/* run compatible relaxation on all levels and print results */
+   /* run compatible relaxation on all levels and print results */
 #if 0
-{
-   hypre_ParVector *u_vec, *f_vec;
-   HYPRE_Real      *u, rho0, rho1, rho;
-   HYPRE_Int              n;
-
-   for (level = 0; level < (num_levels-1); level++)
    {
-      u_vec = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A_array[level]),
-                                    hypre_ParCSRMatrixGlobalNumRows(A_array[level]),
-                                    hypre_ParCSRMatrixRowStarts(A_array[level]));
-      hypre_ParVectorInitialize(u_vec);
-      f_vec = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A_array[level]),
-                                    hypre_ParCSRMatrixGlobalNumRows(A_array[level]),
-                                    hypre_ParCSRMatrixRowStarts(A_array[level]));
-      hypre_ParVectorInitialize(f_vec);
-
-      hypre_ParVectorSetRandomValues(u_vec, 99);
-      hypre_ParVectorSetConstantValues(f_vec, 0.0);
+      hypre_ParVector *u_vec, *f_vec;
+      HYPRE_Real      *u, rho0, rho1, rho;
+      HYPRE_Int              n;
 
-      /* set C-pt values to zero */
-      n = hypre_VectorSize(hypre_ParVectorLocalVector(u_vec));
-      u = hypre_VectorData(hypre_ParVectorLocalVector(u_vec));
-      for (i = 0; i < n; i++)
+      for (level = 0; level < (num_levels - 1); level++)
       {
-         if (CF_marker_array[level][i] == 1)
+         u_vec = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A_array[level]),
+                                       hypre_ParCSRMatrixGlobalNumRows(A_array[level]),
+                                       hypre_ParCSRMatrixRowStarts(A_array[level]));
+         hypre_ParVectorInitialize(u_vec);
+         f_vec = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A_array[level]),
+                                       hypre_ParCSRMatrixGlobalNumRows(A_array[level]),
+                                       hypre_ParCSRMatrixRowStarts(A_array[level]));
+         hypre_ParVectorInitialize(f_vec);
+
+         hypre_ParVectorSetRandomValues(u_vec, 99);
+         hypre_ParVectorSetConstantValues(f_vec, 0.0);
+
+         /* set C-pt values to zero */
+         n = hypre_VectorSize(hypre_ParVectorLocalVector(u_vec));
+         u = hypre_VectorData(hypre_ParVectorLocalVector(u_vec));
+         for (i = 0; i < n; i++)
          {
-            u[i] = 0.0;
+            if (CF_marker_array[level][i] == 1)
+            {
+               u[i] = 0.0;
+            }
          }
-      }
 
-      rho1 = hypre_ParVectorInnerProd(u_vec, u_vec);
-      for (i = 0; i < 5; i++)
-      {
-         rho0 = rho1;
-         hypre_BoomerAMGRelax(A_array[level], f_vec, CF_marker_array[level],
-                              grid_relax_type[0], -1,
-                              relax_weight[level], omega[level], l1_norms[level],
-                              u_vec, Vtemp, Ztemp);
-         rho1 = hypre_ParVectorInnerProd(u_vec,u_vec);
-         rho = sqrt(rho1/rho0);
-         if (rho < 0.01)
+         rho1 = hypre_ParVectorInnerProd(u_vec, u_vec);
+         for (i = 0; i < 5; i++)
          {
-            break;
+            rho0 = rho1;
+            hypre_BoomerAMGRelax(A_array[level], f_vec, CF_marker_array[level],
+                                 grid_relax_type[0], -1,
+                                 relax_weight[level], omega[level], l1_norms[level],
+                                 u_vec, Vtemp, Ztemp);
+            rho1 = hypre_ParVectorInnerProd(u_vec, u_vec);
+            rho = hypre_sqrt(rho1 / rho0);
+            if (rho < 0.01)
+            {
+               break;
+            }
          }
-      }
 
-      hypre_ParVectorDestroy(u_vec);
-      hypre_ParVectorDestroy(f_vec);
+         hypre_ParVectorDestroy(u_vec);
+         hypre_ParVectorDestroy(f_vec);
 
-      if (my_id == 0)
-      {
-         hypre_printf("level = %d, rhocr = %f\n", level, rho);
+         if (my_id == 0)
+         {
+            hypre_printf("level = %d, rhocr = %f\n", level, rho);
+         }
       }
    }
-}
 #endif
 
+   hypre_MemoryPrintUsage(comm, hypre_HandleLogLevel(hypre_handle()), "BoomerAMG setup end", 0);
+   hypre_GpuProfilingPopRange();
    HYPRE_ANNOTATE_FUNC_END;
 
-   return(hypre_error_flag);
+   return (hypre_error_flag);
 }
diff --git a/external/hypre/src/parcsr_ls/par_amg_solve.c b/external/hypre/src/parcsr_ls/par_amg_solve.c
index 99c732f1..2ac04b30 100644
--- a/external/hypre/src/parcsr_ls/par_amg_solve.c
+++ b/external/hypre/src/parcsr_ls/par_amg_solve.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -20,26 +20,26 @@
 
 HYPRE_Int
 hypre_BoomerAMGSolve( void               *amg_vdata,
-                   hypre_ParCSRMatrix *A,
-                   hypre_ParVector    *f,
-                   hypre_ParVector    *u         )
+                      hypre_ParCSRMatrix *A,
+                      hypre_ParVector    *f,
+                      hypre_ParVector    *u         )
 {
-   MPI_Comm            comm = hypre_ParCSRMatrixComm(A);
-
-   hypre_ParAMGData   *amg_data = (hypre_ParAMGData*) amg_vdata;
+   MPI_Comm             comm = hypre_ParCSRMatrixComm(A);
+   hypre_ParAMGData    *amg_data = (hypre_ParAMGData*) amg_vdata;
 
    /* Data Structure variables */
-
-   HYPRE_Int      amg_print_level;
-   HYPRE_Int      amg_logging;
-   HYPRE_Int      cycle_count;
-   HYPRE_Int      num_levels;
-   /* HYPRE_Int      num_unknowns; */
-   HYPRE_Int    converge_type;
-   HYPRE_Real   tol;
-
-   HYPRE_Int block_mode;
-
+   HYPRE_Int            amg_print_level;
+   HYPRE_Int            amg_logging;
+   HYPRE_Int            cycle_count;
+   HYPRE_Int            num_levels;
+   HYPRE_Int            converge_type;
+   HYPRE_Int            block_mode;
+   HYPRE_Int            additive;
+   HYPRE_Int            mult_additive;
+   HYPRE_Int            simple;
+   HYPRE_Int            min_iter;
+   HYPRE_Int            max_iter;
+   HYPRE_Real           tol;
 
    hypre_ParCSRMatrix **A_array;
    hypre_ParVector    **F_array;
@@ -47,48 +47,45 @@ hypre_BoomerAMGSolve( void               *amg_vdata,
 
    hypre_ParCSRBlockMatrix **A_block_array;
 
-
    /*  Local variables  */
-
-   HYPRE_Int      j;
-   HYPRE_Int      Solve_err_flag;
-   HYPRE_Int      min_iter;
-   HYPRE_Int      max_iter;
-   HYPRE_Int      num_procs, my_id;
-   HYPRE_Int      additive;
-   HYPRE_Int      mult_additive;
-   HYPRE_Int      simple;
-
-   HYPRE_Real   alpha = 1.0;
-   HYPRE_Real   beta = -1.0;
-   HYPRE_Real   cycle_op_count;
-   HYPRE_Real   total_coeffs;
-   HYPRE_Real   total_variables;
-   HYPRE_Real  *num_coeffs;
-   HYPRE_Real  *num_variables;
-   HYPRE_Real   cycle_cmplxty = 0.0;
-   HYPRE_Real   operat_cmplxty;
-   HYPRE_Real   grid_cmplxty;
-   HYPRE_Real   conv_factor = 0.0;
-   HYPRE_Real   resid_nrm = 1.0;
-   HYPRE_Real   resid_nrm_init = 0.0;
-   HYPRE_Real   relative_resid;
-   HYPRE_Real   rhs_norm = 0.0;
-   HYPRE_Real   old_resid;
-   HYPRE_Real   ieee_check = 0.;
-
-   hypre_ParVector  *Vtemp;
-   hypre_ParVector  *Residual;
+   HYPRE_Int           j;
+   HYPRE_Int           Solve_err_flag;
+   HYPRE_Int           num_procs, my_id;
+   HYPRE_Int           num_vectors;
+   HYPRE_Real          alpha = 1.0;
+   HYPRE_Real          beta = -1.0;
+   HYPRE_Real          cycle_op_count;
+   HYPRE_Real          total_coeffs;
+   HYPRE_Real          total_variables;
+   HYPRE_Real         *num_coeffs;
+   HYPRE_Real         *num_variables;
+   HYPRE_Real          cycle_cmplxty = 0.0;
+   HYPRE_Real          operat_cmplxty;
+   HYPRE_Real          grid_cmplxty;
+   HYPRE_Real          conv_factor = 0.0;
+   HYPRE_Real          resid_nrm = 1.0;
+   HYPRE_Real          resid_nrm_init = 0.0;
+   HYPRE_Real          relative_resid;
+   HYPRE_Real          rhs_norm = 0.0;
+   HYPRE_Real          old_resid;
+   HYPRE_Real          ieee_check = 0.;
+
+   hypre_ParVector    *Vtemp;
+   hypre_ParVector    *Rtemp;
+   hypre_ParVector    *Ptemp;
+   hypre_ParVector    *Ztemp;
+   hypre_ParVector    *Residual = NULL;
 
    HYPRE_ANNOTATE_FUNC_BEGIN;
    hypre_MPI_Comm_size(comm, &num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_rank(comm, &my_id);
 
    amg_print_level  = hypre_ParAMGDataPrintLevel(amg_data);
    amg_logging      = hypre_ParAMGDataLogging(amg_data);
-   if ( amg_logging > 1 )
+   if (amg_logging > 1)
+   {
       Residual = hypre_ParAMGDataResidual(amg_data);
-   /* num_unknowns  = hypre_ParAMGDataNumUnknowns(amg_data); */
+   }
    num_levels       = hypre_ParAMGDataNumLevels(amg_data);
    A_array          = hypre_ParAMGDataAArray(amg_data);
    F_array          = hypre_ParAMGDataFArray(amg_data);
@@ -101,23 +98,40 @@ hypre_BoomerAMGSolve( void               *amg_vdata,
    additive         = hypre_ParAMGDataAdditive(amg_data);
    simple           = hypre_ParAMGDataSimple(amg_data);
    mult_additive    = hypre_ParAMGDataMultAdditive(amg_data);
+   block_mode       = hypre_ParAMGDataBlockMode(amg_data);
+   A_block_array    = hypre_ParAMGDataABlockArray(amg_data);
+   Vtemp            = hypre_ParAMGDataVtemp(amg_data);
+   Rtemp            = hypre_ParAMGDataRtemp(amg_data);
+   Ptemp            = hypre_ParAMGDataPtemp(amg_data);
+   Ztemp            = hypre_ParAMGDataZtemp(amg_data);
+   num_vectors      = hypre_ParVectorNumVectors(f);
 
    A_array[0] = A;
    F_array[0] = f;
    U_array[0] = u;
 
-   block_mode = hypre_ParAMGDataBlockMode(amg_data);
-
-   A_block_array = hypre_ParAMGDataABlockArray(amg_data);
-
+   /* Verify that the number of vectors held by f and u match */
+   if (hypre_ParVectorNumVectors(f) !=
+       hypre_ParVectorNumVectors(u))
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Error: num_vectors for RHS and LHS do not match!\n");
+      return hypre_error_flag;
+   }
 
-   /*   Vtemp = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A_array[0]),
-        hypre_ParCSRMatrixGlobalNumRows(A_array[0]),
-        hypre_ParCSRMatrixRowStarts(A_array[0]));
-        hypre_ParVectorInitialize(Vtemp);
-        hypre_ParAMGDataVtemp(amg_data) = Vtemp;
-        */
-   Vtemp = hypre_ParAMGDataVtemp(amg_data);
+   /* Update work vectors */
+   hypre_ParVectorResize(Vtemp, num_vectors);
+   hypre_ParVectorResize(Rtemp, num_vectors);
+   hypre_ParVectorResize(Ptemp, num_vectors);
+   hypre_ParVectorResize(Ztemp, num_vectors);
+   if (amg_logging > 1)
+   {
+      hypre_ParVectorResize(Residual, num_vectors);
+   }
+   for (j = 1; j < num_levels; j++)
+   {
+      hypre_ParVectorResize(F_array[j], num_vectors);
+      hypre_ParVectorResize(U_array[j], num_vectors);
+   }
 
    /*-----------------------------------------------------------------------
     *    Write the solver parameters
@@ -145,8 +159,9 @@ hypre_BoomerAMGSolve( void               *amg_vdata,
     *-----------------------------------------------------------------------*/
 
    if (my_id == 0 && amg_print_level > 1 && tol > 0.)
+   {
       hypre_printf("\n\nAMG SOLUTION INFO:\n");
-
+   }
 
    /*-----------------------------------------------------------------------
     *    Compute initial fine-grid residual and print
@@ -156,12 +171,12 @@ hypre_BoomerAMGSolve( void               *amg_vdata,
    {
       if ( amg_logging > 1 )
       {
-         hypre_ParVectorCopy(F_array[0], Residual );
+         hypre_ParVectorCopy(F_array[0], Residual);
          if (tol > 0)
          {
-            hypre_ParCSRMatrixMatvec(alpha, A_array[0], U_array[0], beta, Residual );
+            hypre_ParCSRMatrixMatvec(alpha, A_array[0], U_array[0], beta, Residual);
          }
-         resid_nrm = sqrt(hypre_ParVectorInnerProd( Residual, Residual ));
+         resid_nrm = hypre_sqrt(hypre_ParVectorInnerProd( Residual, Residual ));
       }
       else
       {
@@ -170,14 +185,14 @@ hypre_BoomerAMGSolve( void               *amg_vdata,
          {
             hypre_ParCSRMatrixMatvec(alpha, A_array[0], U_array[0], beta, Vtemp);
          }
-         resid_nrm = sqrt(hypre_ParVectorInnerProd(Vtemp, Vtemp));
+         resid_nrm = hypre_sqrt(hypre_ParVectorInnerProd(Vtemp, Vtemp));
       }
 
-      /* Since it is does not diminish performance, attempt to return an error flag
+      /* Since it does not diminish performance, attempt to return an error flag
          and notify users when they supply bad input. */
       if (resid_nrm != 0.)
       {
-         ieee_check = resid_nrm/resid_nrm; /* INF -> NaN conversion */
+         ieee_check = resid_nrm / resid_nrm; /* INF -> NaN conversion */
       }
 
       if (ieee_check != ieee_check)
@@ -205,7 +220,7 @@ hypre_BoomerAMGSolve( void               *amg_vdata,
 
       if (0 == converge_type)
       {
-         rhs_norm = sqrt(hypre_ParVectorInnerProd(f, f));
+         rhs_norm = hypre_sqrt(hypre_ParVectorInnerProd(f, f));
          if (rhs_norm)
          {
             relative_resid = resid_nrm_init / rhs_norm;
@@ -232,7 +247,7 @@ hypre_BoomerAMGSolve( void               *amg_vdata,
       hypre_printf("               residual        factor       residual\n");
       hypre_printf("               --------        ------       --------\n");
       hypre_printf("    Initial    %e                 %e\n", resid_nrm_init,
-            relative_resid);
+                   relative_resid);
    }
 
    /*-----------------------------------------------------------------------
@@ -251,6 +266,9 @@ hypre_BoomerAMGSolve( void               *amg_vdata,
       }
       else
       {
+         /* RL TODO: for now, force u's all-zero flag to be FALSE */
+         hypre_ParVectorAllZeros(u) = 0;
+
          hypre_BoomerAMGAdditiveCycle(amg_data);
       }
 
@@ -262,15 +280,17 @@ hypre_BoomerAMGSolve( void               *amg_vdata,
       {
          old_resid = resid_nrm;
 
-         if ( amg_logging > 1 )
+         if (amg_logging > 1)
          {
-            hypre_ParCSRMatrixMatvecOutOfPlace(alpha, A_array[0], U_array[0], beta, F_array[0], Residual );
-            resid_nrm = sqrt(hypre_ParVectorInnerProd( Residual, Residual ));
+            hypre_ParCSRMatrixMatvecOutOfPlace(alpha, A_array[0], U_array[0], beta, F_array[0],
+                                               Residual);
+            resid_nrm = hypre_sqrt(hypre_ParVectorInnerProd(Residual, Residual));
          }
          else
          {
-            hypre_ParCSRMatrixMatvecOutOfPlace(alpha, A_array[0], U_array[0], beta, F_array[0], Vtemp);
-            resid_nrm = sqrt(hypre_ParVectorInnerProd(Vtemp, Vtemp));
+            hypre_ParCSRMatrixMatvecOutOfPlace(alpha, A_array[0], U_array[0], beta, F_array[0],
+                                               Vtemp);
+            resid_nrm = hypre_sqrt(hypre_ParVectorInnerProd(Vtemp, Vtemp));
          }
 
          if (old_resid)
@@ -311,7 +331,7 @@ hypre_BoomerAMGSolve( void               *amg_vdata,
       if (my_id == 0 && amg_print_level > 1)
       {
          hypre_printf("    Cycle %2d   %e    %f     %e \n", cycle_count,
-               resid_nrm, conv_factor, relative_resid);
+                      resid_nrm, conv_factor, relative_resid);
       }
    }
 
@@ -326,9 +346,13 @@ hypre_BoomerAMGSolve( void               *amg_vdata,
     *-----------------------------------------------------------------------*/
 
    if (cycle_count > 0 && resid_nrm_init)
-      conv_factor = pow((resid_nrm/resid_nrm_init),(1.0/(HYPRE_Real) cycle_count));
+   {
+      conv_factor = hypre_pow((resid_nrm / resid_nrm_init), (1.0 / (HYPRE_Real) cycle_count));
+   }
    else
+   {
       conv_factor = 1.;
+   }
 
    if (amg_print_level > 1)
    {
@@ -358,7 +382,7 @@ hypre_BoomerAMGSolve( void               *amg_vdata,
       }
 
 
-      for (j=0;j<hypre_ParAMGDataNumLevels(amg_data);j++)
+      for (j = 0; j < hypre_ParAMGDataNumLevels(amg_data); j++)
       {
          total_coeffs += num_coeffs[j];
          total_variables += num_variables[j];
@@ -367,7 +391,9 @@ hypre_BoomerAMGSolve( void               *amg_vdata,
       cycle_op_count = hypre_ParAMGDataCycleOpCount(amg_data);
 
       if (num_variables[0])
+      {
          grid_cmplxty = total_variables / num_variables[0];
+      }
       if (num_coeffs[0])
       {
          operat_cmplxty = total_coeffs / num_coeffs[0];
@@ -380,13 +406,13 @@ hypre_BoomerAMGSolve( void               *amg_vdata,
          {
             hypre_printf("\n\n==============================================");
             hypre_printf("\n NOTE: Convergence tolerance was not achieved\n");
-            hypre_printf("      within the allowed %d V-cycles\n",max_iter);
+            hypre_printf("      within the allowed %d V-cycles\n", max_iter);
             hypre_printf("==============================================");
          }
-         hypre_printf("\n\n Average Convergence Factor = %f",conv_factor);
-         hypre_printf("\n\n     Complexity:    grid = %f\n",grid_cmplxty);
-         hypre_printf("                operator = %f\n",operat_cmplxty);
-         hypre_printf("                   cycle = %f\n\n\n\n",cycle_cmplxty);
+         hypre_printf("\n\n Average Convergence Factor = %f", conv_factor);
+         hypre_printf("\n\n     Complexity:    grid = %f\n", grid_cmplxty);
+         hypre_printf("                operator = %f\n", operat_cmplxty);
+         hypre_printf("                   cycle = %f\n\n\n\n", cycle_cmplxty);
       }
 
       hypre_TFree(num_coeffs, HYPRE_MEMORY_HOST);
diff --git a/external/hypre/src/parcsr_ls/par_amg_solveT.c b/external/hypre/src/parcsr_ls/par_amg_solveT.c
index bc55bf24..e0df8686 100644
--- a/external/hypre/src/parcsr_ls/par_amg_solveT.c
+++ b/external/hypre/src/parcsr_ls/par_amg_solveT.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -20,12 +20,12 @@
 
 HYPRE_Int
 hypre_BoomerAMGSolveT( void               *amg_vdata,
-                   hypre_ParCSRMatrix *A,
-                   hypre_ParVector    *f,
-                   hypre_ParVector    *u         )
+                       hypre_ParCSRMatrix *A,
+                       hypre_ParVector    *f,
+                       hypre_ParVector    *u         )
 {
 
-   MPI_Comm 	      comm = hypre_ParCSRMatrixComm(A);
+   MPI_Comm          comm = hypre_ParCSRMatrixComm(A);
 
    hypre_ParAMGData   *amg_data = (hypre_ParAMGData*) amg_vdata;
 
@@ -72,12 +72,14 @@ hypre_BoomerAMGSolveT( void               *amg_vdata,
    hypre_ParVector  *Residual;
 
    hypre_MPI_Comm_size(comm, &num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_rank(comm, &my_id);
 
    amg_print_level = hypre_ParAMGDataPrintLevel(amg_data);
    amg_logging   = hypre_ParAMGDataLogging(amg_data);
-   if ( amg_logging>1 )
+   if ( amg_logging > 1 )
+   {
       Residual = hypre_ParAMGDataResidual(amg_data);
+   }
    /* num_unknowns  = hypre_ParAMGDataNumUnknowns(amg_data); */
    num_levels    = hypre_ParAMGDataNumLevels(amg_data);
    A_array       = hypre_ParAMGDataAArray(amg_data);
@@ -99,12 +101,12 @@ hypre_BoomerAMGSolveT( void               *amg_vdata,
 
    HYPRE_ANNOTATE_FUNC_BEGIN;
 
-/*   Vtemp = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A_array[0]),
-                                 hypre_ParCSRMatrixGlobalNumRows(A_array[0]),
-                                 hypre_ParCSRMatrixRowStarts(A_array[0]));
-   hypre_ParVectorInitialize(Vtemp);
-   hypre_ParAMGDataVtemp(amg_data) = Vtemp;
-*/
+   /*   Vtemp = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A_array[0]),
+                                    hypre_ParCSRMatrixGlobalNumRows(A_array[0]),
+                                    hypre_ParCSRMatrixRowStarts(A_array[0]));
+      hypre_ParVectorInitialize(Vtemp);
+      hypre_ParAMGDataVtemp(amg_data) = Vtemp;
+   */
    Vtemp = hypre_ParAMGDataVtemp(amg_data);
    for (j = 1; j < num_levels; j++)
    {
@@ -118,7 +120,9 @@ hypre_BoomerAMGSolveT( void               *amg_vdata,
 
 
    if (my_id == 0 && amg_print_level > 1)
+   {
       hypre_BoomerAMGWriteSolverParams(amg_data);
+   }
 
 
 
@@ -150,33 +154,35 @@ hypre_BoomerAMGSolveT( void               *amg_vdata,
     *    Compute initial fine-grid residual and print to logfile
     *-----------------------------------------------------------------------*/
 
-   if ( amg_logging > 1 ) {
+   if ( amg_logging > 1 )
+   {
       hypre_ParVectorCopy(F_array[0], Residual );
       hypre_ParCSRMatrixMatvecT(alpha, A_array[0], U_array[0], beta, Residual );
-      resid_nrm = sqrt(hypre_ParVectorInnerProd( Residual, Residual ));
+      resid_nrm = hypre_sqrt(hypre_ParVectorInnerProd( Residual, Residual ));
    }
-   else {
+   else
+   {
       hypre_ParVectorCopy(F_array[0], Vtemp);
       hypre_ParCSRMatrixMatvecT(alpha, A_array[0], U_array[0], beta, Vtemp);
-      resid_nrm = sqrt(hypre_ParVectorInnerProd(Vtemp, Vtemp));
+      resid_nrm = hypre_sqrt(hypre_ParVectorInnerProd(Vtemp, Vtemp));
    }
 
 
    resid_nrm_init = resid_nrm;
-   rhs_norm = sqrt(hypre_ParVectorInnerProd(f, f));
+   rhs_norm = hypre_sqrt(hypre_ParVectorInnerProd(f, f));
    relative_resid = 9999;
    if (rhs_norm)
    {
       relative_resid = resid_nrm_init / rhs_norm;
    }
 
-   if (my_id ==0 && (amg_print_level > 1))
+   if (my_id == 0 && (amg_print_level > 1))
    {
       hypre_printf("                                            relative\n");
       hypre_printf("               residual        factor       residual\n");
       hypre_printf("               --------        ------       --------\n");
-      hypre_printf("    Initial    %e                 %e\n",resid_nrm_init,
-              relative_resid);
+      hypre_printf("    Initial    %e                 %e\n", resid_nrm_init,
+                   relative_resid);
    }
 
    /*-----------------------------------------------------------------------
@@ -198,15 +204,17 @@ hypre_BoomerAMGSolveT( void               *amg_vdata,
        *    Compute  fine-grid residual and residual norm
        *----------------------------------------------------------------*/
 
-      if ( amg_logging > 1 ) {
+      if ( amg_logging > 1 )
+      {
          hypre_ParVectorCopy(F_array[0], Residual );
          hypre_ParCSRMatrixMatvecT(alpha, A_array[0], U_array[0], beta, Residual );
-         resid_nrm = sqrt(hypre_ParVectorInnerProd( Residual, Residual ));
+         resid_nrm = hypre_sqrt(hypre_ParVectorInnerProd( Residual, Residual ));
       }
-      else {
+      else
+      {
          hypre_ParVectorCopy(F_array[0], Vtemp);
          hypre_ParCSRMatrixMatvecT(alpha, A_array[0], U_array[0], beta, Vtemp);
-         resid_nrm = sqrt(hypre_ParVectorInnerProd(Vtemp, Vtemp));
+         resid_nrm = hypre_sqrt(hypre_ParVectorInnerProd(Vtemp, Vtemp));
       }
 
       conv_factor = resid_nrm / old_resid;
@@ -226,20 +234,20 @@ hypre_BoomerAMGSolveT( void               *amg_vdata,
       if (my_id == 0 && (amg_print_level > 1))
       {
          hypre_printf("    Cycle %2d   %e    %f     %e \n", cycle_count,
-                 resid_nrm, conv_factor, relative_resid);
+                      resid_nrm, conv_factor, relative_resid);
       }
    }
 
-   if (cycle_count == max_iter) Solve_err_flag = 1;
+   if (cycle_count == max_iter) { Solve_err_flag = 1; }
 
    /*-----------------------------------------------------------------------
     *    Compute closing statistics
     *-----------------------------------------------------------------------*/
 
-   conv_factor = pow((resid_nrm/resid_nrm_init),(1.0/((HYPRE_Real) cycle_count)));
+   conv_factor = hypre_pow((resid_nrm / resid_nrm_init), (1.0 / ((HYPRE_Real) cycle_count)));
 
 
-   for (j=0;j<hypre_ParAMGDataNumLevels(amg_data);j++)
+   for (j = 0; j < hypre_ParAMGDataNumLevels(amg_data); j++)
    {
       total_coeffs += num_coeffs[j];
       total_variables += num_variables[j];
@@ -248,7 +256,9 @@ hypre_BoomerAMGSolveT( void               *amg_vdata,
    cycle_op_count = hypre_ParAMGDataCycleOpCount(amg_data);
 
    if (num_variables[0])
+   {
       grid_cmplxty = ((HYPRE_Real) total_variables) / ((HYPRE_Real) num_variables[0]);
+   }
    if (num_coeffs[0])
    {
       operat_cmplxty = total_coeffs / num_coeffs[0];
@@ -261,13 +271,13 @@ hypre_BoomerAMGSolveT( void               *amg_vdata,
       {
          hypre_printf("\n\n==============================================");
          hypre_printf("\n NOTE: Convergence tolerance was not achieved\n");
-         hypre_printf("      within the allowed %d V-cycles\n",max_iter);
+         hypre_printf("      within the allowed %d V-cycles\n", max_iter);
          hypre_printf("==============================================");
       }
-      hypre_printf("\n\n Average Convergence Factor = %f",conv_factor);
-      hypre_printf("\n\n     Complexity:    grid = %f\n",grid_cmplxty);
-      hypre_printf("                operator = %f\n",operat_cmplxty);
-      hypre_printf("                   cycle = %f\n\n",cycle_cmplxty);
+      hypre_printf("\n\n Average Convergence Factor = %f", conv_factor);
+      hypre_printf("\n\n     Complexity:    grid = %f\n", grid_cmplxty);
+      hypre_printf("                operator = %f\n", operat_cmplxty);
+      hypre_printf("                   cycle = %f\n\n", cycle_cmplxty);
    }
 
    /*----------------------------------------------------------
@@ -284,7 +294,7 @@ hypre_BoomerAMGSolveT( void               *amg_vdata,
 
    HYPRE_ANNOTATE_FUNC_END;
 
-   return(Solve_err_flag);
+   return (Solve_err_flag);
 }
 
 /******************************************************************************
@@ -299,8 +309,8 @@ hypre_BoomerAMGSolveT( void               *amg_vdata,
 
 HYPRE_Int
 hypre_BoomerAMGCycleT( void              *amg_vdata,
-                   hypre_ParVector  **F_array,
-                   hypre_ParVector  **U_array   )
+                       hypre_ParVector  **F_array,
+                       hypre_ParVector  **U_array   )
 {
    hypre_ParAMGData *amg_data = (hypre_ParAMGData*) amg_vdata;
 
@@ -340,8 +350,8 @@ hypre_BoomerAMGCycleT( void              *amg_vdata,
    HYPRE_Int       Not_Finished;
    HYPRE_Int       num_sweep;
    HYPRE_Int       relax_type;
-   HYPRE_Int       relax_points;
-   HYPRE_Real   *relax_weight;
+   HYPRE_Int       relax_points = 0;
+   HYPRE_Real     *relax_weight;
 
    HYPRE_Int       old_version = 0;
 
@@ -383,13 +393,15 @@ hypre_BoomerAMGCycleT( void              *amg_vdata,
 
    Solve_err_flag = 0;
 
-   if (grid_relax_points) old_version = 1;
+   if (grid_relax_points) { old_version = 1; }
 
    num_coeffs = hypre_CTAlloc(HYPRE_Real,  num_levels, HYPRE_MEMORY_HOST);
    num_coeffs[0]    = hypre_ParCSRMatrixDNumNonzeros(A_array[0]);
 
    for (j = 1; j < num_levels; j++)
+   {
       num_coeffs[j] = hypre_ParCSRMatrixDNumNonzeros(A_array[j]);
+   }
 
    /*---------------------------------------------------------------------
     *    Initialize cycling control counter
@@ -429,7 +441,11 @@ hypre_BoomerAMGCycleT( void              *amg_vdata,
    {
       num_sweep = num_grid_sweeps[cycle_param];
       relax_type = grid_relax_type[cycle_param];
-      if (relax_type != 7 && relax_type != 9) relax_type = 7;
+      if (relax_type != 7 && relax_type != 9)
+      {
+         relax_type = 7;
+      }
+
       /*------------------------------------------------------------------
        * Do the relaxation num_sweep times
        *-----------------------------------------------------------------*/
@@ -444,27 +460,29 @@ hypre_BoomerAMGCycleT( void              *amg_vdata,
          else
          {
             if (old_version)
+            {
                relax_points = grid_relax_points[cycle_param][j];
+            }
          }
 
          /*-----------------------------------------------
           * VERY sloppy approximation to cycle complexity
           *-----------------------------------------------*/
 
-         if (old_version && level < num_levels -1)
+         if (old_version && level < num_levels - 1)
          {
             switch (relax_points)
             {
                case 1:
-               cycle_op_count += num_coeffs[level+1];
-               break;
+                  cycle_op_count += num_coeffs[level + 1];
+                  break;
 
                case -1:
-               cycle_op_count += (num_coeffs[level]-num_coeffs[level+1]);
-               break;
+                  cycle_op_count += (num_coeffs[level] - num_coeffs[level + 1]);
+                  break;
             }
          }
-	 else
+         else
          {
             cycle_op_count += num_coeffs[level];
          }
@@ -497,7 +515,7 @@ hypre_BoomerAMGCycleT( void              *amg_vdata,
             HYPRE_ANNOTATE_MGLEVEL_END(level);
             HYPRE_ANNOTATE_FUNC_END;
 
-            return(Solve_err_flag);
+            return (Solve_err_flag);
          }
       }
 
@@ -508,7 +526,7 @@ hypre_BoomerAMGCycleT( void              *amg_vdata,
 
       --lev_counter[level];
 
-      if (lev_counter[level] >= 0 && level != num_levels-1)
+      if (lev_counter[level] >= 0 && level != num_levels - 1)
       {
 
          /*---------------------------------------------------------------
@@ -523,24 +541,24 @@ hypre_BoomerAMGCycleT( void              *amg_vdata,
 
          hypre_ParVectorSetConstantValues(U_array[coarse_grid], 0.0);
 
-         hypre_ParVectorCopy(F_array[fine_grid],Vtemp);
+         hypre_ParVectorCopy(F_array[fine_grid], Vtemp);
          alpha = -1.0;
          beta = 1.0;
          hypre_ParCSRMatrixMatvecT(alpha, A_array[fine_grid], U_array[fine_grid],
-                         beta, Vtemp);
+                                   beta, Vtemp);
 
          alpha = 1.0;
          beta = 0.0;
 
-         hypre_ParCSRMatrixMatvecT(alpha,P_array[fine_grid],Vtemp,
-                          beta,F_array[coarse_grid]);
+         hypre_ParCSRMatrixMatvecT(alpha, P_array[fine_grid], Vtemp,
+                                   beta, F_array[coarse_grid]);
 
          HYPRE_ANNOTATE_MGLEVEL_END(level);
 
          ++level;
-         lev_counter[level] = hypre_max(lev_counter[level],cycle_type);
+         lev_counter[level] = hypre_max(lev_counter[level], cycle_type);
          cycle_param = 1;
-         if (level == num_levels-1) cycle_param = 3;
+         if (level == num_levels - 1) { cycle_param = 3; }
 
          HYPRE_ANNOTATE_MGLEVEL_BEGIN(level);
       }
@@ -561,13 +579,13 @@ hypre_BoomerAMGCycleT( void              *amg_vdata,
          beta = 1.0;
 
          hypre_ParCSRMatrixMatvec(alpha, R_array[fine_grid], U_array[coarse_grid],
-                         beta, U_array[fine_grid]);
+                                  beta, U_array[fine_grid]);
 
          HYPRE_ANNOTATE_MGLEVEL_END(level);
 
          --level;
          cycle_param = 2;
-         if (level == 0) cycle_param = 0;
+         if (level == 0) { cycle_param = 0; }
 
          HYPRE_ANNOTATE_MGLEVEL_BEGIN(level);
       }
@@ -585,7 +603,7 @@ hypre_BoomerAMGCycleT( void              *amg_vdata,
 
    HYPRE_ANNOTATE_FUNC_END;
 
-   return(Solve_err_flag);
+   return (Solve_err_flag);
 }
 
 /******************************************************************************
@@ -598,15 +616,19 @@ hypre_BoomerAMGCycleT( void              *amg_vdata,
  * hypre_BoomerAMGRelaxT
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int  hypre_BoomerAMGRelaxT( hypre_ParCSRMatrix *A,
-                        hypre_ParVector    *f,
-                        HYPRE_Int                *cf_marker,
-                        HYPRE_Int                 relax_type,
-                        HYPRE_Int                 relax_points,
-                        HYPRE_Real          relax_weight,
-                        hypre_ParVector    *u,
-                        hypre_ParVector    *Vtemp )
+HYPRE_Int
+hypre_BoomerAMGRelaxT( hypre_ParCSRMatrix *A,
+                       hypre_ParVector    *f,
+                       HYPRE_Int          *cf_marker,
+                       HYPRE_Int           relax_type,
+                       HYPRE_Int           relax_points,
+                       HYPRE_Real          relax_weight,
+                       hypre_ParVector    *u,
+                       hypre_ParVector    *Vtemp )
 {
+   HYPRE_UNUSED_VAR(cf_marker);
+   HYPRE_UNUSED_VAR(relax_points);
+
    hypre_CSRMatrix *A_diag = hypre_ParCSRMatrixDiag(A);
    HYPRE_Real      *A_diag_data  = hypre_CSRMatrixData(A_diag);
    HYPRE_Int       *A_diag_i     = hypre_CSRMatrixI(A_diag);
@@ -622,12 +644,12 @@ HYPRE_Int  hypre_BoomerAMGRelaxT( hypre_ParCSRMatrix *A,
    HYPRE_Real     *Vtemp_data = hypre_VectorData(Vtemp_local);
 
    hypre_CSRMatrix *A_CSR;
-   HYPRE_Int	   *A_CSR_i;
-   HYPRE_Int	   *A_CSR_j;
-   HYPRE_Real	   *A_CSR_data;
+   HYPRE_Int      *A_CSR_i;
+   HYPRE_Int      *A_CSR_j;
+   HYPRE_Real     *A_CSR_data;
 
    hypre_Vector    *f_vector;
-   HYPRE_Real	   *f_vector_data;
+   HYPRE_Real     *f_vector_data;
 
    HYPRE_Int        i;
    HYPRE_Int        jj;
@@ -657,26 +679,26 @@ HYPRE_Int  hypre_BoomerAMGRelaxT( hypre_ParCSRMatrix *A,
           * Copy f into temporary vector.
           *-----------------------------------------------------------------*/
 
-         hypre_ParVectorCopy(f,Vtemp);
+         hypre_ParVectorCopy(f, Vtemp);
 
          /*-----------------------------------------------------------------
           * Perform MatvecT Vtemp=f-A^Tu
           *-----------------------------------------------------------------*/
 
-            hypre_ParCSRMatrixMatvecT(-1.0,A, u, 1.0, Vtemp);
-            for (i = 0; i < n; i++)
-            {
+         hypre_ParCSRMatrixMatvecT(-1.0, A, u, 1.0, Vtemp);
+         for (i = 0; i < n; i++)
+         {
 
-               /*-----------------------------------------------------------
-                * If diagonal is nonzero, relax point i; otherwise, skip it.
-                *-----------------------------------------------------------*/
+            /*-----------------------------------------------------------
+             * If diagonal is nonzero, relax point i; otherwise, skip it.
+             *-----------------------------------------------------------*/
 
-               if (A_diag_data[A_diag_i[i]] != zero)
-               {
-                  u_data[i] += relax_weight * Vtemp_data[i]
-				/ A_diag_data[A_diag_i[i]];
-               }
+            if (A_diag_data[A_diag_i[i]] != zero)
+            {
+               u_data[i] += relax_weight * Vtemp_data[i]
+                            / A_diag_data[A_diag_i[i]];
             }
+         }
       }
       break;
 
@@ -689,16 +711,16 @@ HYPRE_Int  hypre_BoomerAMGRelaxT( hypre_ParCSRMatrix *A,
           *  Generate CSR matrix from ParCSRMatrix A
           *-----------------------------------------------------------------*/
 
-	 if (n)
-	 {
-	    A_CSR = hypre_ParCSRMatrixToCSRMatrixAll(A);
-	    f_vector = hypre_ParVectorToVectorAll(f);
- 	    A_CSR_i = hypre_CSRMatrixI(A_CSR);
- 	    A_CSR_j = hypre_CSRMatrixJ(A_CSR);
- 	    A_CSR_data = hypre_CSRMatrixData(A_CSR);
-   	    f_vector_data = hypre_VectorData(f_vector);
+         A_CSR = hypre_ParCSRMatrixToCSRMatrixAll(A);
+         f_vector = hypre_ParVectorToVectorAll(f);
+         if (n)
+         {
+            A_CSR_i = hypre_CSRMatrixI(A_CSR);
+            A_CSR_j = hypre_CSRMatrixJ(A_CSR);
+            A_CSR_data = hypre_CSRMatrixData(A_CSR);
+            f_vector_data = hypre_VectorData(f_vector);
 
-            A_mat = hypre_CTAlloc(HYPRE_Real,  n_global*n_global, HYPRE_MEMORY_HOST);
+            A_mat = hypre_CTAlloc(HYPRE_Real,  n_global * n_global, HYPRE_MEMORY_HOST);
             b_vec = hypre_CTAlloc(HYPRE_Real,  n_global, HYPRE_MEMORY_HOST);
 
             /*---------------------------------------------------------------
@@ -707,10 +729,10 @@ HYPRE_Int  hypre_BoomerAMGRelaxT( hypre_ParCSRMatrix *A,
 
             for (i = 0; i < n_global; i++)
             {
-               for (jj = A_CSR_i[i]; jj < A_CSR_i[i+1]; jj++)
+               for (jj = A_CSR_i[i]; jj < A_CSR_i[i + 1]; jj++)
                {
                   column = A_CSR_j[jj];
-                  A_mat[column*n_global+i] = A_CSR_data[jj];
+                  A_mat[column * n_global + i] = A_CSR_data[jj];
                }
                b_vec[i] = f_vector_data[i];
             }
@@ -719,10 +741,10 @@ HYPRE_Int  hypre_BoomerAMGRelaxT( hypre_ParCSRMatrix *A,
 
             for (i = 0; i < n; i++)
             {
-               u_data[i] = b_vec[first_index+i];
+               u_data[i] = b_vec[first_index + i];
             }
 
-	    hypre_TFree(A_mat, HYPRE_MEMORY_HOST);
+            hypre_TFree(A_mat, HYPRE_MEMORY_HOST);
             hypre_TFree(b_vec, HYPRE_MEMORY_HOST);
             hypre_CSRMatrixDestroy(A_CSR);
             A_CSR = NULL;
@@ -736,5 +758,5 @@ HYPRE_Int  hypre_BoomerAMGRelaxT( hypre_ParCSRMatrix *A,
 
    HYPRE_ANNOTATE_FUNC_END;
 
-   return(relax_error);
+   return (relax_error);
 }
diff --git a/external/hypre/src/parcsr_ls/par_amgdd.c b/external/hypre/src/parcsr_ls/par_amgdd.c
index 2ddf87e3..80b67c24 100644
--- a/external/hypre/src/parcsr_ls/par_amgdd.c
+++ b/external/hypre/src/parcsr_ls/par_amgdd.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -18,7 +18,7 @@
  *--------------------------------------------------------------------------*/
 
 void *
-hypre_BoomerAMGDDCreate()
+hypre_BoomerAMGDDCreate( void )
 {
    hypre_ParAMGDDData  *amgdd_data = hypre_CTAlloc(hypre_ParAMGDDData, 1, HYPRE_MEMORY_HOST);
 
@@ -360,7 +360,7 @@ hypre_BoomerAMGDDGetNumGhostLayers( void      *data,
 
 HYPRE_Int
 hypre_BoomerAMGDDSetUserFACRelaxation( void *data,
-   HYPRE_Int (*userFACRelaxation)( void *amgdd_vdata , HYPRE_Int level, HYPRE_Int cycle_param ))
+                                       HYPRE_Int (*userFACRelaxation)( void *amgdd_vdata, HYPRE_Int level, HYPRE_Int cycle_param ))
 {
    hypre_ParAMGDDData  *amgdd_data = (hypre_ParAMGDDData*) data;
 
diff --git a/external/hypre/src/parcsr_ls/par_amgdd.h b/external/hypre/src/parcsr_ls/par_amgdd.h
index 45896f9b..e37ff59b 100644
--- a/external/hypre/src/parcsr_ls/par_amgdd.h
+++ b/external/hypre/src/parcsr_ls/par_amgdd.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -30,7 +30,8 @@ typedef struct
    hypre_AMGDDCommPkg       *amgdd_comm_pkg;
    hypre_ParVector          *Ztemp;
 
-   HYPRE_Int       (*amgddUserFACRelaxation)( void *amgdd_vdata, HYPRE_Int level, HYPRE_Int cycle_param );
+   HYPRE_Int       (*amgddUserFACRelaxation)( void *amgdd_vdata, HYPRE_Int level,
+                                              HYPRE_Int cycle_param );
 } hypre_ParAMGDDData;
 
 /*--------------------------------------------------------------------------
diff --git a/external/hypre/src/parcsr_ls/par_amgdd_comp_grid.c b/external/hypre/src/parcsr_ls/par_amgdd_comp_grid.c
index bbd41359..81217e5e 100644
--- a/external/hypre/src/parcsr_ls/par_amgdd_comp_grid.c
+++ b/external/hypre/src/parcsr_ls/par_amgdd_comp_grid.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -51,7 +51,7 @@ hypre_AMGDDCompGridLocalIndexBinarySearch( hypre_AMGDDCompGrid *compGrid,
    return -1;
 }
 
-hypre_AMGDDCompGridMatrix* hypre_AMGDDCompGridMatrixCreate()
+hypre_AMGDDCompGridMatrix* hypre_AMGDDCompGridMatrixCreate( void )
 {
    hypre_AMGDDCompGridMatrix *matrix = hypre_CTAlloc(hypre_AMGDDCompGridMatrix, 1, HYPRE_MEMORY_HOST);
 
@@ -81,12 +81,21 @@ hypre_AMGDDCompGridMatrixDestroy( hypre_AMGDDCompGridMatrix *matrix )
       }
       else if (hypre_AMGDDCompGridMatrixOwnsOffdColIndices(matrix))
       {
+         HYPRE_MemoryLocation memory_location = hypre_CSRMatrixMemoryLocation(
+                                                   hypre_AMGDDCompGridMatrixOwnedOffd(matrix));
+
          if (hypre_CSRMatrixJ(hypre_AMGDDCompGridMatrixOwnedOffd(matrix)))
          {
-            hypre_TFree(hypre_CSRMatrixJ(hypre_AMGDDCompGridMatrixOwnedOffd(matrix)),
-                  hypre_CSRMatrixMemoryLocation(hypre_AMGDDCompGridMatrixOwnedOffd(matrix)));
+            hypre_TFree(hypre_CSRMatrixJ(hypre_AMGDDCompGridMatrixOwnedOffd(matrix)), memory_location);
          }
 
+#if defined(HYPRE_USING_CUSPARSE) || defined(HYPRE_USING_ROCSPARSE) || defined(HYPRE_USING_ONEMKLSPARSE)
+         hypre_TFree(hypre_CSRMatrixSortedData(hypre_AMGDDCompGridMatrixOwnedOffd(matrix)), memory_location);
+         hypre_TFree(hypre_CSRMatrixSortedJ(hypre_AMGDDCompGridMatrixOwnedOffd(matrix)), memory_location);
+         hypre_CsrsvDataDestroy(hypre_CSRMatrixCsrsvData(hypre_AMGDDCompGridMatrixOwnedOffd(matrix)));
+         hypre_GpuMatDataDestroy(hypre_CSRMatrixGPUMatData(hypre_AMGDDCompGridMatrixOwnedOffd(matrix)));
+#endif
+
          hypre_TFree(hypre_AMGDDCompGridMatrixOwnedOffd(matrix), HYPRE_MEMORY_HOST);
       }
 
@@ -138,20 +147,20 @@ hypre_AMGDDCompGridMatrixSetupRealMatvec( hypre_AMGDDCompGridMatrix *A )
    {
       A_rri[i] = A_real_real_nnz;
       A_rgi[i] = A_real_ghost_nnz;
-      for (j = A_i[i]; j < A_i[i+1]; j++)
+      for (j = A_i[i]; j < A_i[i + 1]; j++)
       {
          col_ind = A_j[j];
          if (col_ind < num_real)
          {
-             A_rrj[A_real_real_nnz]    = col_ind;
-             A_rrdata[A_real_real_nnz] = A_data[j];
-             A_real_real_nnz++;
+            A_rrj[A_real_real_nnz]    = col_ind;
+            A_rrdata[A_real_real_nnz] = A_data[j];
+            A_real_real_nnz++;
          }
          else
          {
-             A_rgj[A_real_ghost_nnz]    = col_ind;
-             A_rgdata[A_real_ghost_nnz] = A_data[j];
-             A_real_ghost_nnz++;
+            A_rgj[A_real_ghost_nnz]    = col_ind;
+            A_rgdata[A_real_ghost_nnz] = A_data[j];
+            A_real_ghost_nnz++;
          }
       }
    }
@@ -241,7 +250,7 @@ hypre_AMGDDCompGridRealMatvec( HYPRE_Complex alpha,
    return hypre_error_flag;
 }
 
-hypre_AMGDDCompGridVector *hypre_AMGDDCompGridVectorCreate()
+hypre_AMGDDCompGridVector *hypre_AMGDDCompGridVectorCreate( void )
 {
    hypre_AMGDDCompGridVector *vector = hypre_CTAlloc(hypre_AMGDDCompGridVector, 1, HYPRE_MEMORY_HOST);
 
@@ -479,7 +488,7 @@ hypre_AMGDDCompGridVectorRealCopy( hypre_AMGDDCompGridVector *x,
    return hypre_error_flag;
 }
 
-hypre_AMGDDCompGrid *hypre_AMGDDCompGridCreate ()
+hypre_AMGDDCompGrid *hypre_AMGDDCompGridCreate ( void )
 {
    hypre_AMGDDCompGrid      *compGrid;
 
@@ -614,20 +623,23 @@ hypre_AMGDDCompGridInitialize( hypre_ParAMGDDData *amgdd_data,
    hypre_AMGDDCompGridLevel(compGrid)                = level;
    hypre_AMGDDCompGridFirstGlobalIndex(compGrid)     = hypre_ParVectorFirstIndex(F_array[level]);
    hypre_AMGDDCompGridLastGlobalIndex(compGrid)      = hypre_ParVectorLastIndex(F_array[level]);
-   hypre_AMGDDCompGridNumOwnedNodes(compGrid)        = hypre_VectorSize(hypre_ParVectorLocalVector(F_array[level]));
+   hypre_AMGDDCompGridNumOwnedNodes(compGrid)        = hypre_VectorSize(hypre_ParVectorLocalVector(
+                                                                           F_array[level]));
    hypre_AMGDDCompGridNumNonOwnedNodes(compGrid)     = hypre_CSRMatrixNumCols(A_offd_original);
    hypre_AMGDDCompGridNumMissingColIndices(compGrid) = 0;
-   hypre_AMGDDCompGridMemoryLocation(compGrid)       = hypre_ParCSRMatrixMemoryLocation(A_array[level]);
+   hypre_AMGDDCompGridMemoryLocation(compGrid)       = hypre_ParCSRMatrixMemoryLocation(
+                                                          A_array[level]);
    memory_location = hypre_AMGDDCompGridMemoryLocation(compGrid);
    num_owned_nodes = hypre_AMGDDCompGridNumOwnedNodes(compGrid);
 
    // !!! Check on how good a guess this is for eventual size of the nononwed dofs and nnz
    max_nonowned = 2 * (padding + hypre_ParAMGDDDataNumGhostLayers(amgdd_data)) *
-                      hypre_CSRMatrixNumCols(A_offd_original);
+                  hypre_CSRMatrixNumCols(A_offd_original);
    avg_nnz_per_row = 0;
    if (hypre_CSRMatrixNumRows(A_diag_original))
    {
-      avg_nnz_per_row = (HYPRE_Int) (hypre_CSRMatrixNumNonzeros(A_diag_original) / hypre_CSRMatrixNumRows(A_diag_original));
+      avg_nnz_per_row = (HYPRE_Int) (hypre_CSRMatrixNumNonzeros(A_diag_original) / hypre_CSRMatrixNumRows(
+                                        A_diag_original));
    }
    max_nonowned_diag_nnz = max_nonowned * avg_nnz_per_row;
    max_nonowned_offd_nnz = hypre_CSRMatrixNumNonzeros(A_offd_original);
@@ -658,7 +670,8 @@ hypre_AMGDDCompGridInitialize( hypre_ParAMGDDData *amgdd_data,
 
       // Use original rowptr and data from P, but need to use new col indices (init to global index, then setup local indices later)
       P_offd_original = hypre_ParCSRMatrixOffd(P_array[level] );
-      hypre_AMGDDCompGridMatrixOwnedOffd(P) = hypre_CSRMatrixCreate(hypre_CSRMatrixNumRows(P_offd_original),
+      hypre_AMGDDCompGridMatrixOwnedOffd(P) = hypre_CSRMatrixCreate(hypre_CSRMatrixNumRows(
+                                                                       P_offd_original),
                                                                     hypre_CSRMatrixNumCols(P_offd_original),
                                                                     hypre_CSRMatrixNumNonzeros(P_offd_original));
       hypre_CSRMatrixI(hypre_AMGDDCompGridMatrixOwnedOffd(P))    = hypre_CSRMatrixI(P_offd_original);
@@ -670,7 +683,8 @@ hypre_AMGDDCompGridInitialize( hypre_ParAMGDDData *amgdd_data,
       // Initialize P owned offd col ind to their global indices
       for (i = 0; i < hypre_CSRMatrixNumNonzeros(hypre_AMGDDCompGridMatrixOwnedOffd(P)); i++)
       {
-         hypre_CSRMatrixJ(hypre_AMGDDCompGridMatrixOwnedOffd(P))[i] = hypre_ParCSRMatrixColMapOffd(P_array[level])[ hypre_CSRMatrixJ(P_offd_original)[i] ];
+         hypre_CSRMatrixJ(hypre_AMGDDCompGridMatrixOwnedOffd(P))[i] = hypre_ParCSRMatrixColMapOffd(
+                                                                         P_array[level])[ hypre_CSRMatrixJ(P_offd_original)[i] ];
       }
 
       hypre_AMGDDCompGridMatrixOwnsOwnedMatrices(P) = 0;
@@ -684,7 +698,8 @@ hypre_AMGDDCompGridInitialize( hypre_ParAMGDDData *amgdd_data,
 
          // Use original rowptr and data from R, but need to use new col indices (init to global index, then setup local indices later)
          R_offd_original = hypre_ParCSRMatrixOffd(R_array[level]);
-         hypre_AMGDDCompGridMatrixOwnedOffd(R) = hypre_CSRMatrixCreate(hypre_CSRMatrixNumRows(R_offd_original),
+         hypre_AMGDDCompGridMatrixOwnedOffd(R) = hypre_CSRMatrixCreate(hypre_CSRMatrixNumRows(
+                                                                          R_offd_original),
                                                                        hypre_CSRMatrixNumCols(R_offd_original),
                                                                        hypre_CSRMatrixNumNonzeros(R_offd_original));
          hypre_CSRMatrixI(hypre_AMGDDCompGridMatrixOwnedOffd(R))    = hypre_CSRMatrixI(R_offd_original);
@@ -696,7 +711,8 @@ hypre_AMGDDCompGridInitialize( hypre_ParAMGDDData *amgdd_data,
          // Initialize R owned offd col ind to their global indices
          for (i = 0; i < hypre_CSRMatrixNumNonzeros(hypre_AMGDDCompGridMatrixOwnedOffd(R)); i++)
          {
-            hypre_CSRMatrixJ(hypre_AMGDDCompGridMatrixOwnedOffd(R))[i] = hypre_ParCSRMatrixColMapOffd(R_array[level])[ hypre_CSRMatrixJ(R_offd_original)[i] ];
+            hypre_CSRMatrixJ(hypre_AMGDDCompGridMatrixOwnedOffd(R))[i] = hypre_ParCSRMatrixColMapOffd(
+                                                                            R_array[level])[ hypre_CSRMatrixJ(R_offd_original)[i] ];
          }
 
          hypre_AMGDDCompGridMatrixOwnsOwnedMatrices(R) = 0;
@@ -706,24 +722,32 @@ hypre_AMGDDCompGridInitialize( hypre_ParAMGDDData *amgdd_data,
    }
 
    // Allocate some extra arrays used during AMG-DD setup
-   hypre_AMGDDCompGridNonOwnedGlobalIndices(compGrid) = hypre_CTAlloc(HYPRE_Int, max_nonowned, memory_location);
-   hypre_AMGDDCompGridNonOwnedRealMarker(compGrid)    = hypre_CTAlloc(HYPRE_Int, max_nonowned, memory_location);
-   hypre_AMGDDCompGridNonOwnedSort(compGrid)          = hypre_CTAlloc(HYPRE_Int, max_nonowned, memory_location);
-   hypre_AMGDDCompGridNonOwnedInvSort(compGrid)       = hypre_CTAlloc(HYPRE_Int, max_nonowned, memory_location);
+   hypre_AMGDDCompGridNonOwnedGlobalIndices(compGrid) = hypre_CTAlloc(HYPRE_Int, max_nonowned,
+                                                                      memory_location);
+   hypre_AMGDDCompGridNonOwnedRealMarker(compGrid)    = hypre_CTAlloc(HYPRE_Int, max_nonowned,
+                                                                      memory_location);
+   hypre_AMGDDCompGridNonOwnedSort(compGrid)          = hypre_CTAlloc(HYPRE_Int, max_nonowned,
+                                                                      memory_location);
+   hypre_AMGDDCompGridNonOwnedInvSort(compGrid)       = hypre_CTAlloc(HYPRE_Int, max_nonowned,
+                                                                      memory_location);
 
    // Initialize nonowned global indices, real marker, and the sort and invsort arrays
    for (i = 0; i < hypre_CSRMatrixNumCols(A_offd_original); i++)
    {
-      hypre_AMGDDCompGridNonOwnedGlobalIndices(compGrid)[i] = hypre_ParCSRMatrixColMapOffd(A_array[level])[i];
+      hypre_AMGDDCompGridNonOwnedGlobalIndices(compGrid)[i] = hypre_ParCSRMatrixColMapOffd(
+                                                                 A_array[level])[i];
       hypre_AMGDDCompGridNonOwnedSort(compGrid)[i]          = i;
       hypre_AMGDDCompGridNonOwnedInvSort(compGrid)[i]       = i;
-      hypre_AMGDDCompGridNonOwnedRealMarker(compGrid)[i]    = 1; // NOTE: Assume that padding is at least 1, i.e. first layer of points are real
+      hypre_AMGDDCompGridNonOwnedRealMarker(compGrid)[i]    =
+         1; // NOTE: Assume that padding is at least 1, i.e. first layer of points are real
    }
 
    if (level != hypre_ParAMGDataNumLevels(amg_data) - 1)
    {
-      hypre_AMGDDCompGridNonOwnedCoarseIndices(compGrid) = hypre_CTAlloc(HYPRE_Int, max_nonowned, memory_location);
-      hypre_AMGDDCompGridOwnedCoarseIndices(compGrid)    = hypre_CTAlloc(HYPRE_Int, num_owned_nodes, memory_location);
+      hypre_AMGDDCompGridNonOwnedCoarseIndices(compGrid) = hypre_CTAlloc(HYPRE_Int, max_nonowned,
+                                                                         memory_location);
+      hypre_AMGDDCompGridOwnedCoarseIndices(compGrid)    = hypre_CTAlloc(HYPRE_Int, num_owned_nodes,
+                                                                         memory_location);
 
       // Setup the owned coarse indices
       if ( CF_marker_array )
@@ -784,37 +808,42 @@ HYPRE_Int hypre_AMGDDCompGridSetupRelax( hypre_ParAMGDDData *amgdd_data )
    }
    else
    {
-      hypre_error_w_msg(HYPRE_ERROR_GENERIC,"WARNING: unknown AMGDD FAC relaxation type. Defaulting to CFL1 Jacobi.\n");
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                        "WARNING: unknown AMGDD FAC relaxation type. Defaulting to CFL1 Jacobi.\n");
       hypre_ParAMGDDDataUserFACRelaxation(amgdd_data) = hypre_BoomerAMGDD_FAC_CFL1Jacobi;
       hypre_ParAMGDDDataFACRelaxType(amgdd_data) = 3;
    }
 
    if (hypre_ParAMGDDDataFACRelaxType(amgdd_data) == 3)
    {
-      for (level = hypre_ParAMGDDDataStartLevel(amgdd_data); level < hypre_ParAMGDataNumLevels(amg_data); level++)
+      for (level = hypre_ParAMGDDDataStartLevel(amgdd_data); level < hypre_ParAMGDataNumLevels(amg_data);
+           level++)
       {
          compGrid = hypre_ParAMGDDDataCompGrid(amgdd_data)[level];
 
          // Calculate l1_norms
-         total_num_nodes = hypre_AMGDDCompGridNumOwnedNodes(compGrid) + hypre_AMGDDCompGridNumNonOwnedNodes(compGrid);
-         hypre_AMGDDCompGridL1Norms(compGrid) = hypre_CTAlloc(HYPRE_Real, total_num_nodes, hypre_AMGDDCompGridMemoryLocation(compGrid));
+         total_num_nodes = hypre_AMGDDCompGridNumOwnedNodes(compGrid) + hypre_AMGDDCompGridNumNonOwnedNodes(
+                              compGrid);
+         hypre_AMGDDCompGridL1Norms(compGrid) = hypre_CTAlloc(HYPRE_Real, total_num_nodes,
+                                                              hypre_AMGDDCompGridMemoryLocation(compGrid));
          diag = hypre_AMGDDCompGridMatrixOwnedDiag(hypre_AMGDDCompGridA(compGrid));
          offd = hypre_AMGDDCompGridMatrixOwnedOffd(hypre_AMGDDCompGridA(compGrid));
          for (i = 0; i < hypre_AMGDDCompGridNumOwnedNodes(compGrid); i++)
          {
             cf_diag = hypre_AMGDDCompGridCFMarkerArray(compGrid)[i];
-            for (j = hypre_CSRMatrixI(diag)[i]; j < hypre_CSRMatrixI(diag)[i+1]; j++)
+            for (j = hypre_CSRMatrixI(diag)[i]; j < hypre_CSRMatrixI(diag)[i + 1]; j++)
             {
                if (hypre_AMGDDCompGridCFMarkerArray(compGrid)[ hypre_CSRMatrixJ(diag)[j] ] == cf_diag)
                {
-                  hypre_AMGDDCompGridL1Norms(compGrid)[i] += fabs(hypre_CSRMatrixData(diag)[j]);
+                  hypre_AMGDDCompGridL1Norms(compGrid)[i] += hypre_cabs(hypre_CSRMatrixData(diag)[j]);
                }
             }
-            for (j = hypre_CSRMatrixI(offd)[i]; j < hypre_CSRMatrixI(offd)[i+1]; j++)
+            for (j = hypre_CSRMatrixI(offd)[i]; j < hypre_CSRMatrixI(offd)[i + 1]; j++)
             {
-               if (hypre_AMGDDCompGridCFMarkerArray(compGrid)[ hypre_CSRMatrixJ(offd)[j] + hypre_AMGDDCompGridNumOwnedNodes(compGrid) ] == cf_diag)
+               if (hypre_AMGDDCompGridCFMarkerArray(compGrid)[ hypre_CSRMatrixJ(offd)[j] +
+                                                                                         hypre_AMGDDCompGridNumOwnedNodes(compGrid) ] == cf_diag)
                {
-                  hypre_AMGDDCompGridL1Norms(compGrid)[i] += fabs(hypre_CSRMatrixData(offd)[j]);
+                  hypre_AMGDDCompGridL1Norms(compGrid)[i] += hypre_cabs(hypre_CSRMatrixData(offd)[j]);
                }
             }
          }
@@ -823,19 +852,23 @@ HYPRE_Int hypre_AMGDDCompGridSetupRelax( hypre_ParAMGDDData *amgdd_data )
          offd = hypre_AMGDDCompGridMatrixNonOwnedOffd(hypre_AMGDDCompGridA(compGrid));
          for (i = 0; i < hypre_AMGDDCompGridNumNonOwnedNodes(compGrid); i++)
          {
-            cf_diag = hypre_AMGDDCompGridCFMarkerArray(compGrid)[i + hypre_AMGDDCompGridNumOwnedNodes(compGrid)];
-            for (j = hypre_CSRMatrixI(diag)[i]; j < hypre_CSRMatrixI(diag)[i+1]; j++)
+            cf_diag = hypre_AMGDDCompGridCFMarkerArray(compGrid)[i + hypre_AMGDDCompGridNumOwnedNodes(
+                                                                    compGrid)];
+            for (j = hypre_CSRMatrixI(diag)[i]; j < hypre_CSRMatrixI(diag)[i + 1]; j++)
             {
-               if (hypre_AMGDDCompGridCFMarkerArray(compGrid)[ hypre_CSRMatrixJ(diag)[j] + hypre_AMGDDCompGridNumOwnedNodes(compGrid) ] == cf_diag)
+               if (hypre_AMGDDCompGridCFMarkerArray(compGrid)[ hypre_CSRMatrixJ(diag)[j] +
+                                                                                         hypre_AMGDDCompGridNumOwnedNodes(compGrid) ] == cf_diag)
                {
-                  hypre_AMGDDCompGridL1Norms(compGrid)[i + hypre_AMGDDCompGridNumOwnedNodes(compGrid)] += fabs(hypre_CSRMatrixData(diag)[j]);
+                  hypre_AMGDDCompGridL1Norms(compGrid)[i + hypre_AMGDDCompGridNumOwnedNodes(compGrid)] += hypre_cabs(
+                                                                                                             hypre_CSRMatrixData(diag)[j]);
                }
             }
-            for (j = hypre_CSRMatrixI(offd)[i]; j < hypre_CSRMatrixI(offd)[i+1]; j++)
+            for (j = hypre_CSRMatrixI(offd)[i]; j < hypre_CSRMatrixI(offd)[i + 1]; j++)
             {
                if (hypre_AMGDDCompGridCFMarkerArray(compGrid)[ hypre_CSRMatrixJ(offd)[j]] == cf_diag)
                {
-                  hypre_AMGDDCompGridL1Norms(compGrid)[i + hypre_AMGDDCompGridNumOwnedNodes(compGrid)] += fabs(hypre_CSRMatrixData(offd)[j]);
+                  hypre_AMGDDCompGridL1Norms(compGrid)[i + hypre_AMGDDCompGridNumOwnedNodes(compGrid)] += hypre_cabs(
+                                                                                                             hypre_CSRMatrixData(offd)[j]);
                }
             }
          }
@@ -875,27 +908,27 @@ HYPRE_Int hypre_AMGDDCompGridFinalize( hypre_ParAMGDDData *amgdd_data )
    hypre_CSRMatrix      *P_offd;
 
    HYPRE_Int             P_diag_nnz;
-   HYPRE_Int            *new_P_diag_rowPtr;
-   HYPRE_Int            *new_P_diag_colInd;
+   HYPRE_Int            *new_P_diag_rowPtr = NULL;
+   HYPRE_Int            *new_P_diag_colInd = NULL;
    HYPRE_Complex        *new_P_diag_data;
 
    HYPRE_Int             P_offd_nnz;
-   HYPRE_Int            *new_P_offd_rowPtr;
-   HYPRE_Int            *new_P_offd_colInd;
+   HYPRE_Int            *new_P_offd_rowPtr = NULL;
+   HYPRE_Int            *new_P_offd_colInd = NULL;
    HYPRE_Complex        *new_P_offd_data;
 
-   hypre_CSRMatrix      *R_diag;
-   hypre_CSRMatrix      *R_offd;
+   hypre_CSRMatrix      *R_diag = NULL;
+   hypre_CSRMatrix      *R_offd = NULL;
 
    HYPRE_Int             R_diag_nnz;
-   HYPRE_Int            *new_R_diag_rowPtr;
-   HYPRE_Int            *new_R_diag_colInd;
-   HYPRE_Complex        *new_R_diag_data;
+   HYPRE_Int            *new_R_diag_rowPtr = NULL;
+   HYPRE_Int            *new_R_diag_colInd = NULL;
+   HYPRE_Complex        *new_R_diag_data   = NULL;
 
    HYPRE_Int             R_offd_nnz;
-   HYPRE_Int            *new_R_offd_rowPtr;
-   HYPRE_Int            *new_R_offd_colInd;
-   HYPRE_Complex        *new_R_offd_data;
+   HYPRE_Int            *new_R_offd_rowPtr = NULL;
+   HYPRE_Int            *new_R_offd_colInd = NULL;
+   HYPRE_Complex        *new_R_offd_data   = NULL;
 
    HYPRE_Int             A_diag_cnt;
    HYPRE_Int             A_offd_cnt;
@@ -964,7 +997,8 @@ HYPRE_Int hypre_AMGDDCompGridFinalize( hypre_ParAMGDDData *amgdd_data )
                   if (hypre_AMGDDCommPkgSendFlag(amgddCommPkg)[outer_level][proc][level][i] >= num_owned)
                   {
                      hypre_AMGDDCommPkgSendFlag(amgddCommPkg)[outer_level][proc][level][new_num_send_nodes++] =
-                        new_indices[ hypre_AMGDDCommPkgSendFlag(amgddCommPkg)[outer_level][proc][level][i] - num_owned ] + num_owned;
+                        new_indices[ hypre_AMGDDCommPkgSendFlag(amgddCommPkg)[outer_level][proc][level][i] - num_owned ] +
+                        num_owned;
                   }
                   else if (hypre_AMGDDCommPkgSendFlag(amgddCommPkg)[outer_level][proc][level][i] >= 0)
                   {
@@ -993,8 +1027,9 @@ HYPRE_Int hypre_AMGDDCompGridFinalize( hypre_ParAMGDDData *amgdd_data )
       }
 
       // Setup CF marker array
-      hypre_AMGDDCompGridCFMarkerArray(compGrid[level]) = hypre_CTAlloc(HYPRE_Int, num_owned + num_nonowned, memory_location);
-      if (level != num_levels-1)
+      hypre_AMGDDCompGridCFMarkerArray(compGrid[level]) = hypre_CTAlloc(HYPRE_Int,
+                                                                        num_owned + num_nonowned, memory_location);
+      if (level != num_levels - 1)
       {
          // Setup CF marker array
          for (i = 0; i < num_owned; i++)
@@ -1033,45 +1068,45 @@ HYPRE_Int hypre_AMGDDCompGridFinalize( hypre_ParAMGDDData *amgdd_data )
       A_offd = hypre_AMGDDCompGridMatrixNonOwnedOffd(hypre_AMGDDCompGridA(compGrid[level]));
 
       A_diag_nnz        = hypre_CSRMatrixI(A_diag)[num_nonowned];
-      new_A_diag_rowPtr = hypre_CTAlloc(HYPRE_Int, num_nonowned+1, memory_location);
+      new_A_diag_rowPtr = hypre_CTAlloc(HYPRE_Int, num_nonowned + 1, memory_location);
       new_A_diag_colInd = hypre_CTAlloc(HYPRE_Int, A_diag_nnz, memory_location);
       new_A_diag_data   = hypre_CTAlloc(HYPRE_Complex, A_diag_nnz, memory_location);
 
       A_offd_nnz        = hypre_CSRMatrixI(A_offd)[num_nonowned];
-      new_A_offd_rowPtr = hypre_CTAlloc(HYPRE_Int, num_nonowned+1, memory_location);
+      new_A_offd_rowPtr = hypre_CTAlloc(HYPRE_Int, num_nonowned + 1, memory_location);
       new_A_offd_colInd = hypre_CTAlloc(HYPRE_Int, A_offd_nnz, memory_location);
       new_A_offd_data   = hypre_CTAlloc(HYPRE_Complex, A_offd_nnz, memory_location);
 
       A_real_real_nnz = 0;
       A_real_ghost_nnz = 0;
 
-      if (level != num_levels-1 && num_nonowned)
+      if (level != num_levels - 1 && num_nonowned)
       {
          P_diag = hypre_AMGDDCompGridMatrixNonOwnedDiag(hypre_AMGDDCompGridP(compGrid[level]));
          P_offd = hypre_AMGDDCompGridMatrixNonOwnedOffd(hypre_AMGDDCompGridP(compGrid[level]));
 
          P_diag_nnz = hypre_CSRMatrixI(P_diag)[num_nonowned];
-         new_P_diag_rowPtr = hypre_CTAlloc(HYPRE_Int, num_nonowned+1, memory_location);
+         new_P_diag_rowPtr = hypre_CTAlloc(HYPRE_Int, num_nonowned + 1, memory_location);
          new_P_diag_colInd = hypre_CTAlloc(HYPRE_Int, P_diag_nnz, memory_location);
          new_P_diag_data = hypre_CTAlloc(HYPRE_Complex, P_diag_nnz, memory_location);
 
          P_offd_nnz = hypre_CSRMatrixI(P_offd)[num_nonowned];
-         new_P_offd_rowPtr = hypre_CTAlloc(HYPRE_Int, num_nonowned+1, memory_location);
+         new_P_offd_rowPtr = hypre_CTAlloc(HYPRE_Int, num_nonowned + 1, memory_location);
          new_P_offd_colInd = hypre_CTAlloc(HYPRE_Int, P_offd_nnz, memory_location);
          new_P_offd_data = hypre_CTAlloc(HYPRE_Complex, P_offd_nnz, memory_location);
       }
       if (hypre_ParAMGDataRestriction(amg_data) && level != 0 && num_nonowned)
       {
-         R_diag = hypre_AMGDDCompGridMatrixNonOwnedDiag(hypre_AMGDDCompGridR(compGrid[level-1]));
-         R_offd = hypre_AMGDDCompGridMatrixNonOwnedOffd(hypre_AMGDDCompGridR(compGrid[level-1]));
+         R_diag = hypre_AMGDDCompGridMatrixNonOwnedDiag(hypre_AMGDDCompGridR(compGrid[level - 1]));
+         R_offd = hypre_AMGDDCompGridMatrixNonOwnedOffd(hypre_AMGDDCompGridR(compGrid[level - 1]));
 
          R_diag_nnz = hypre_CSRMatrixI(R_diag)[num_nonowned];
-         new_R_diag_rowPtr = hypre_CTAlloc(HYPRE_Int, num_nonowned+1, memory_location);
+         new_R_diag_rowPtr = hypre_CTAlloc(HYPRE_Int, num_nonowned + 1, memory_location);
          new_R_diag_colInd = hypre_CTAlloc(HYPRE_Int, R_diag_nnz, memory_location);
          new_R_diag_data = hypre_CTAlloc(HYPRE_Complex, R_diag_nnz, memory_location);
 
          R_offd_nnz = hypre_CSRMatrixI(R_offd)[num_nonowned];
-         new_R_offd_rowPtr = hypre_CTAlloc(HYPRE_Int, num_nonowned+1, memory_location);
+         new_R_offd_rowPtr = hypre_CTAlloc(HYPRE_Int, num_nonowned + 1, memory_location);
          new_R_offd_colInd = hypre_CTAlloc(HYPRE_Int, R_offd_nnz, memory_location);
          new_R_offd_data = hypre_CTAlloc(HYPRE_Complex, R_offd_nnz, memory_location);
       }
@@ -1089,7 +1124,7 @@ HYPRE_Int hypre_AMGDDCompGridFinalize( hypre_ParAMGDDData *amgdd_data )
          if (hypre_AMGDDCompGridNonOwnedRealMarker(compGrid[level])[i])
          {
             new_A_diag_rowPtr[node_cnt] = A_diag_cnt;
-            for (j = hypre_CSRMatrixI(A_diag)[i]; j < hypre_CSRMatrixI(A_diag)[i+1]; j++)
+            for (j = hypre_CSRMatrixI(A_diag)[i]; j < hypre_CSRMatrixI(A_diag)[i + 1]; j++)
             {
                if (hypre_CSRMatrixJ(A_diag)[j] >= 0)
                {
@@ -1099,16 +1134,16 @@ HYPRE_Int hypre_AMGDDCompGridFinalize( hypre_ParAMGDDData *amgdd_data )
                   A_diag_cnt++;
                   if (new_col_ind < num_nonowned_real_nodes)
                   {
-                      A_real_real_nnz++;
+                     A_real_real_nnz++;
                   }
                   else
                   {
-                      A_real_ghost_nnz++;
+                     A_real_ghost_nnz++;
                   }
                }
             }
             new_A_offd_rowPtr[node_cnt] = A_offd_cnt;
-            for (j = hypre_CSRMatrixI(A_offd)[i]; j < hypre_CSRMatrixI(A_offd)[i+1]; j++)
+            for (j = hypre_CSRMatrixI(A_offd)[i]; j < hypre_CSRMatrixI(A_offd)[i + 1]; j++)
             {
                if (hypre_CSRMatrixJ(A_offd)[j] >= 0)
                {
@@ -1118,10 +1153,10 @@ HYPRE_Int hypre_AMGDDCompGridFinalize( hypre_ParAMGDDData *amgdd_data )
                }
             }
 
-            if (level != num_levels-1)
+            if (level != num_levels - 1)
             {
                new_P_diag_rowPtr[node_cnt] = P_diag_cnt;
-               for (j = hypre_CSRMatrixI(P_diag)[i]; j < hypre_CSRMatrixI(P_diag)[i+1]; j++)
+               for (j = hypre_CSRMatrixI(P_diag)[i]; j < hypre_CSRMatrixI(P_diag)[i + 1]; j++)
                {
                   if (hypre_CSRMatrixJ(P_diag)[j] >= 0)
                   {
@@ -1131,7 +1166,7 @@ HYPRE_Int hypre_AMGDDCompGridFinalize( hypre_ParAMGDDData *amgdd_data )
                   }
                }
                new_P_offd_rowPtr[node_cnt] = P_offd_cnt;
-               for (j = hypre_CSRMatrixI(P_offd)[i]; j < hypre_CSRMatrixI(P_offd)[i+1]; j++)
+               for (j = hypre_CSRMatrixI(P_offd)[i]; j < hypre_CSRMatrixI(P_offd)[i + 1]; j++)
                {
                   if (hypre_CSRMatrixJ(P_offd)[j] >= 0)
                   {
@@ -1144,7 +1179,7 @@ HYPRE_Int hypre_AMGDDCompGridFinalize( hypre_ParAMGDDData *amgdd_data )
             if (hypre_ParAMGDataRestriction(amg_data) && level != 0)
             {
                new_R_diag_rowPtr[node_cnt] = R_diag_cnt;
-               for (j = hypre_CSRMatrixI(R_diag)[i]; j < hypre_CSRMatrixI(R_diag)[i+1]; j++)
+               for (j = hypre_CSRMatrixI(R_diag)[i]; j < hypre_CSRMatrixI(R_diag)[i + 1]; j++)
                {
                   if (hypre_CSRMatrixJ(R_diag)[j] >= 0)
                   {
@@ -1154,7 +1189,7 @@ HYPRE_Int hypre_AMGDDCompGridFinalize( hypre_ParAMGDDData *amgdd_data )
                   }
                }
                new_R_offd_rowPtr[node_cnt] = R_offd_cnt;
-               for (j = hypre_CSRMatrixI(R_offd)[i]; j < hypre_CSRMatrixI(R_offd)[i+1]; j++)
+               for (j = hypre_CSRMatrixI(R_offd)[i]; j < hypre_CSRMatrixI(R_offd)[i + 1]; j++)
                {
                   if (hypre_CSRMatrixJ(R_offd)[j] >= 0)
                   {
@@ -1173,7 +1208,7 @@ HYPRE_Int hypre_AMGDDCompGridFinalize( hypre_ParAMGDDData *amgdd_data )
          if (!hypre_AMGDDCompGridNonOwnedRealMarker(compGrid[level])[i])
          {
             new_A_diag_rowPtr[node_cnt] = A_diag_cnt;
-            for (j = hypre_CSRMatrixI(A_diag)[i]; j < hypre_CSRMatrixI(A_diag)[i+1]; j++)
+            for (j = hypre_CSRMatrixI(A_diag)[i]; j < hypre_CSRMatrixI(A_diag)[i + 1]; j++)
             {
                if (hypre_CSRMatrixJ(A_diag)[j] >= 0)
                {
@@ -1183,7 +1218,7 @@ HYPRE_Int hypre_AMGDDCompGridFinalize( hypre_ParAMGDDData *amgdd_data )
                }
             }
             new_A_offd_rowPtr[node_cnt] = A_offd_cnt;
-            for (j = hypre_CSRMatrixI(A_offd)[i]; j < hypre_CSRMatrixI(A_offd)[i+1]; j++)
+            for (j = hypre_CSRMatrixI(A_offd)[i]; j < hypre_CSRMatrixI(A_offd)[i + 1]; j++)
             {
                if (hypre_CSRMatrixJ(A_offd)[j] >= 0)
                {
@@ -1193,10 +1228,10 @@ HYPRE_Int hypre_AMGDDCompGridFinalize( hypre_ParAMGDDData *amgdd_data )
                }
             }
 
-            if (level != num_levels-1)
+            if (level != num_levels - 1)
             {
                new_P_diag_rowPtr[node_cnt] = P_diag_cnt;
-               for (j = hypre_CSRMatrixI(P_diag)[i]; j < hypre_CSRMatrixI(P_diag)[i+1]; j++)
+               for (j = hypre_CSRMatrixI(P_diag)[i]; j < hypre_CSRMatrixI(P_diag)[i + 1]; j++)
                {
                   if (hypre_CSRMatrixJ(P_diag)[j] >= 0)
                   {
@@ -1206,7 +1241,7 @@ HYPRE_Int hypre_AMGDDCompGridFinalize( hypre_ParAMGDDData *amgdd_data )
                   }
                }
                new_P_offd_rowPtr[node_cnt] = P_offd_cnt;
-               for (j = hypre_CSRMatrixI(P_offd)[i]; j < hypre_CSRMatrixI(P_offd)[i+1]; j++)
+               for (j = hypre_CSRMatrixI(P_offd)[i]; j < hypre_CSRMatrixI(P_offd)[i + 1]; j++)
                {
                   if (hypre_CSRMatrixJ(P_offd)[j] >= 0)
                   {
@@ -1219,7 +1254,7 @@ HYPRE_Int hypre_AMGDDCompGridFinalize( hypre_ParAMGDDData *amgdd_data )
             if (hypre_ParAMGDataRestriction(amg_data) && level != 0)
             {
                new_R_diag_rowPtr[node_cnt] = R_diag_cnt;
-               for (j = hypre_CSRMatrixI(R_diag)[i]; j < hypre_CSRMatrixI(R_diag)[i+1]; j++)
+               for (j = hypre_CSRMatrixI(R_diag)[i]; j < hypre_CSRMatrixI(R_diag)[i + 1]; j++)
                {
                   if (hypre_CSRMatrixJ(R_diag)[j] >= 0)
                   {
@@ -1229,7 +1264,7 @@ HYPRE_Int hypre_AMGDDCompGridFinalize( hypre_ParAMGDDData *amgdd_data )
                   }
                }
                new_R_offd_rowPtr[node_cnt] = R_offd_cnt;
-               for (j = hypre_CSRMatrixI(R_offd)[i]; j < hypre_CSRMatrixI(R_offd)[i+1]; j++)
+               for (j = hypre_CSRMatrixI(R_offd)[i]; j < hypre_CSRMatrixI(R_offd)[i + 1]; j++)
                {
                   if (hypre_CSRMatrixJ(R_offd)[j] >= 0)
                   {
@@ -1246,11 +1281,13 @@ HYPRE_Int hypre_AMGDDCompGridFinalize( hypre_ParAMGDDData *amgdd_data )
       new_A_offd_rowPtr[num_nonowned] = A_offd_cnt;
 
       // Create these matrices, but don't initialize (will be allocated later if necessary)
-      hypre_AMGDDCompGridMatrixRealReal(hypre_AMGDDCompGridA(compGrid[level])) = hypre_CSRMatrixCreate(num_nonowned_real_nodes, num_nonowned_real_nodes, A_real_real_nnz);
-      hypre_AMGDDCompGridMatrixRealGhost(hypre_AMGDDCompGridA(compGrid[level])) = hypre_CSRMatrixCreate(num_nonowned_real_nodes, num_nonowned, A_real_ghost_nnz);
+      hypre_AMGDDCompGridMatrixRealReal(hypre_AMGDDCompGridA(compGrid[level])) = hypre_CSRMatrixCreate(
+                                                                                    num_nonowned_real_nodes, num_nonowned_real_nodes, A_real_real_nnz);
+      hypre_AMGDDCompGridMatrixRealGhost(hypre_AMGDDCompGridA(compGrid[level])) = hypre_CSRMatrixCreate(
+                                                                                     num_nonowned_real_nodes, num_nonowned, A_real_ghost_nnz);
 
 
-      if (level != num_levels-1 && num_nonowned)
+      if (level != num_levels - 1 && num_nonowned)
       {
          new_P_diag_rowPtr[num_nonowned] = P_diag_cnt;
          new_P_offd_rowPtr[num_nonowned] = P_offd_cnt;
@@ -1262,28 +1299,33 @@ HYPRE_Int hypre_AMGDDCompGridFinalize( hypre_ParAMGDDData *amgdd_data )
       }
 
       // Fix up P col indices on finer level
-      if (level != start_level && hypre_AMGDDCompGridNumNonOwnedNodes(compGrid[level-1]))
+      if (level != start_level && hypre_AMGDDCompGridNumNonOwnedNodes(compGrid[level - 1]))
       {
-         P_diag = hypre_AMGDDCompGridMatrixNonOwnedDiag(hypre_AMGDDCompGridP(compGrid[level-1]));
-         P_offd = hypre_AMGDDCompGridMatrixOwnedOffd(hypre_AMGDDCompGridP(compGrid[level-1]));
+         P_diag = hypre_AMGDDCompGridMatrixNonOwnedDiag(hypre_AMGDDCompGridP(compGrid[level - 1]));
+         P_offd = hypre_AMGDDCompGridMatrixOwnedOffd(hypre_AMGDDCompGridP(compGrid[level - 1]));
 
-         for (i = 0; i < hypre_CSRMatrixI(P_diag)[ hypre_AMGDDCompGridNumNonOwnedNodes(compGrid[level-1]) ]; i++)
+         for (i = 0;
+              i < hypre_CSRMatrixI(P_diag)[ hypre_AMGDDCompGridNumNonOwnedNodes(compGrid[level - 1]) ];
+              i++)
          {
             hypre_CSRMatrixJ(P_diag)[i] = new_indices[ hypre_CSRMatrixJ(P_diag)[i] ];
          }
          // Also fix up owned offd col indices
-         for (i = 0; i < hypre_CSRMatrixI(P_offd)[ hypre_AMGDDCompGridNumOwnedNodes(compGrid[level-1]) ]; i++)
+         for (i = 0; i < hypre_CSRMatrixI(P_offd)[ hypre_AMGDDCompGridNumOwnedNodes(compGrid[level - 1]) ];
+              i++)
          {
             hypre_CSRMatrixJ(P_offd)[i] = new_indices[ hypre_CSRMatrixJ(P_offd)[i] ];
          }
       }
       // Fix up R col indices on this level
-      if (hypre_ParAMGDataRestriction(amg_data) && level != num_levels-1 && num_nonowned)
+      if (hypre_ParAMGDataRestriction(amg_data) && level != num_levels - 1 && num_nonowned)
       {
          R_diag = hypre_AMGDDCompGridMatrixNonOwnedDiag(hypre_AMGDDCompGridR(compGrid[level]));
          R_offd = hypre_AMGDDCompGridMatrixOwnedOffd(hypre_AMGDDCompGridR(compGrid[level]));
 
-         for (i = 0; i < hypre_CSRMatrixI(R_diag)[ hypre_AMGDDCompGridNumNonOwnedNodes(compGrid[level+1]) ]; i++)
+         for (i = 0;
+              i < hypre_CSRMatrixI(R_diag)[ hypre_AMGDDCompGridNumNonOwnedNodes(compGrid[level + 1]) ];
+              i++)
          {
             if (hypre_CSRMatrixJ(R_diag)[i] >= 0)
             {
@@ -1291,7 +1333,8 @@ HYPRE_Int hypre_AMGDDCompGridFinalize( hypre_ParAMGDDData *amgdd_data )
             }
          }
          // Also fix up owned offd col indices
-         for (i = 0; i < hypre_CSRMatrixI(R_offd)[ hypre_AMGDDCompGridNumOwnedNodes(compGrid[level+1]) ]; i++)
+         for (i = 0; i < hypre_CSRMatrixI(R_offd)[ hypre_AMGDDCompGridNumOwnedNodes(compGrid[level + 1]) ];
+              i++)
          {
             if (hypre_CSRMatrixJ(R_offd)[i] >= 0)
             {
@@ -1323,7 +1366,7 @@ HYPRE_Int hypre_AMGDDCompGridFinalize( hypre_ParAMGDDData *amgdd_data )
       hypre_CSRMatrixNumCols(A_offd) = hypre_AMGDDCompGridNumOwnedNodes(compGrid[level]);
       hypre_CSRMatrixNumNonzeros(A_offd) = hypre_CSRMatrixI(A_offd)[num_nonowned];
 
-      if (level != num_levels-1 && num_nonowned)
+      if (level != num_levels - 1 && num_nonowned)
       {
          P_diag = hypre_AMGDDCompGridMatrixNonOwnedDiag(hypre_AMGDDCompGridP(compGrid[level]));
          P_offd = hypre_AMGDDCompGridMatrixNonOwnedOffd(hypre_AMGDDCompGridP(compGrid[level]));
@@ -1336,7 +1379,7 @@ HYPRE_Int hypre_AMGDDCompGridFinalize( hypre_ParAMGDDData *amgdd_data )
          hypre_CSRMatrixData(P_diag) = new_P_diag_data;
          hypre_CSRMatrixNumRows(P_diag) = num_nonowned;
          hypre_CSRMatrixNumRownnz(P_diag) = num_nonowned;
-         hypre_CSRMatrixNumCols(P_diag) = hypre_AMGDDCompGridNumNonOwnedNodes(compGrid[level+1]);
+         hypre_CSRMatrixNumCols(P_diag) = hypre_AMGDDCompGridNumNonOwnedNodes(compGrid[level + 1]);
          hypre_CSRMatrixNumNonzeros(P_diag) = hypre_CSRMatrixI(P_diag)[num_nonowned];
 
          hypre_TFree(hypre_CSRMatrixI(P_offd), memory_location);
@@ -1347,15 +1390,16 @@ HYPRE_Int hypre_AMGDDCompGridFinalize( hypre_ParAMGDDData *amgdd_data )
          hypre_CSRMatrixData(P_offd) = new_P_offd_data;
          hypre_CSRMatrixNumRows(P_offd) = num_nonowned;
          hypre_CSRMatrixNumRownnz(P_offd) = num_nonowned;
-         hypre_CSRMatrixNumCols(P_offd) = hypre_AMGDDCompGridNumOwnedNodes(compGrid[level+1]);
+         hypre_CSRMatrixNumCols(P_offd) = hypre_AMGDDCompGridNumOwnedNodes(compGrid[level + 1]);
          hypre_CSRMatrixNumNonzeros(P_offd) = hypre_CSRMatrixI(P_offd)[num_nonowned];
 
-         hypre_CSRMatrixNumCols(hypre_AMGDDCompGridMatrixOwnedOffd(hypre_AMGDDCompGridP(compGrid[level]))) = hypre_AMGDDCompGridNumNonOwnedNodes(compGrid[level+1]);
+         hypre_CSRMatrixNumCols(hypre_AMGDDCompGridMatrixOwnedOffd(hypre_AMGDDCompGridP(
+                                                                      compGrid[level]))) = hypre_AMGDDCompGridNumNonOwnedNodes(compGrid[level + 1]);
       }
       if (hypre_ParAMGDataRestriction(amg_data) && level != 0 && num_nonowned)
       {
-         R_diag = hypre_AMGDDCompGridMatrixNonOwnedDiag(hypre_AMGDDCompGridR(compGrid[level-1]));
-         R_offd = hypre_AMGDDCompGridMatrixNonOwnedOffd(hypre_AMGDDCompGridR(compGrid[level-1]));
+         R_diag = hypre_AMGDDCompGridMatrixNonOwnedDiag(hypre_AMGDDCompGridR(compGrid[level - 1]));
+         R_offd = hypre_AMGDDCompGridMatrixNonOwnedOffd(hypre_AMGDDCompGridR(compGrid[level - 1]));
 
          hypre_TFree(hypre_CSRMatrixI(R_diag), memory_location);
          hypre_TFree(hypre_CSRMatrixJ(R_diag), memory_location);
@@ -1365,7 +1409,7 @@ HYPRE_Int hypre_AMGDDCompGridFinalize( hypre_ParAMGDDData *amgdd_data )
          hypre_CSRMatrixData(R_diag) = new_R_diag_data;
          hypre_CSRMatrixNumRows(R_diag) = num_nonowned;
          hypre_CSRMatrixNumRownnz(R_diag) = num_nonowned;
-         hypre_CSRMatrixNumCols(R_diag) = hypre_AMGDDCompGridNumNonOwnedNodes(compGrid[level-1]);
+         hypre_CSRMatrixNumCols(R_diag) = hypre_AMGDDCompGridNumNonOwnedNodes(compGrid[level - 1]);
          hypre_CSRMatrixNumNonzeros(R_diag) = hypre_CSRMatrixI(R_diag)[num_nonowned];
 
          hypre_TFree(hypre_CSRMatrixI(R_offd), memory_location);
@@ -1376,37 +1420,45 @@ HYPRE_Int hypre_AMGDDCompGridFinalize( hypre_ParAMGDDData *amgdd_data )
          hypre_CSRMatrixData(R_offd) = new_R_offd_data;
          hypre_CSRMatrixNumRows(R_offd) = num_nonowned;
          hypre_CSRMatrixNumRownnz(R_offd) = num_nonowned;
-         hypre_CSRMatrixNumCols(R_offd) = hypre_AMGDDCompGridNumOwnedNodes(compGrid[level-1]);
+         hypre_CSRMatrixNumCols(R_offd) = hypre_AMGDDCompGridNumOwnedNodes(compGrid[level - 1]);
          hypre_CSRMatrixNumNonzeros(R_offd) = hypre_CSRMatrixI(R_offd)[num_nonowned];
 
-         hypre_CSRMatrixNumCols(hypre_AMGDDCompGridMatrixOwnedOffd(hypre_AMGDDCompGridR(compGrid[level-1]))) = hypre_AMGDDCompGridNumNonOwnedNodes(compGrid[level-1]);
+         hypre_CSRMatrixNumCols(hypre_AMGDDCompGridMatrixOwnedOffd(hypre_AMGDDCompGridR(
+                                                                      compGrid[level - 1]))) = hypre_AMGDDCompGridNumNonOwnedNodes(compGrid[level - 1]);
       }
 
       // Setup comp grid vectors
       hypre_AMGDDCompGridU(compGrid[level]) = hypre_AMGDDCompGridVectorCreate();
-      hypre_AMGDDCompGridVectorOwned(hypre_AMGDDCompGridU(compGrid[level])) = hypre_ParVectorLocalVector( hypre_ParAMGDataUArray(amg_data)[level] );
+      hypre_AMGDDCompGridVectorOwned(hypre_AMGDDCompGridU(compGrid[level])) = hypre_ParVectorLocalVector(
+                                                                                 hypre_ParAMGDataUArray(amg_data)[level] );
       hypre_AMGDDCompGridVectorOwnsOwnedVector(hypre_AMGDDCompGridU(compGrid[level])) = 0;
       hypre_AMGDDCompGridVectorNumReal(hypre_AMGDDCompGridU(compGrid[level])) = num_nonowned_real_nodes;
-      hypre_AMGDDCompGridVectorNonOwned(hypre_AMGDDCompGridU(compGrid[level])) = hypre_SeqVectorCreate(num_nonowned);
+      hypre_AMGDDCompGridVectorNonOwned(hypre_AMGDDCompGridU(compGrid[level])) = hypre_SeqVectorCreate(
+                                                                                    num_nonowned);
       hypre_SeqVectorInitialize(hypre_AMGDDCompGridVectorNonOwned(hypre_AMGDDCompGridU(compGrid[level])));
 
       hypre_AMGDDCompGridF(compGrid[level]) = hypre_AMGDDCompGridVectorCreate();
-      hypre_AMGDDCompGridVectorOwned(hypre_AMGDDCompGridF(compGrid[level])) = hypre_ParVectorLocalVector( hypre_ParAMGDataFArray(amg_data)[level] );
+      hypre_AMGDDCompGridVectorOwned(hypre_AMGDDCompGridF(compGrid[level])) = hypre_ParVectorLocalVector(
+                                                                                 hypre_ParAMGDataFArray(amg_data)[level] );
       hypre_AMGDDCompGridVectorOwnsOwnedVector(hypre_AMGDDCompGridF(compGrid[level])) = 0;
       hypre_AMGDDCompGridVectorNumReal(hypre_AMGDDCompGridF(compGrid[level])) = num_nonowned_real_nodes;
-      hypre_AMGDDCompGridVectorNonOwned(hypre_AMGDDCompGridF(compGrid[level])) = hypre_SeqVectorCreate(num_nonowned);
+      hypre_AMGDDCompGridVectorNonOwned(hypre_AMGDDCompGridF(compGrid[level])) = hypre_SeqVectorCreate(
+                                                                                    num_nonowned);
       hypre_SeqVectorInitialize(hypre_AMGDDCompGridVectorNonOwned(hypre_AMGDDCompGridF(compGrid[level])));
 
       hypre_AMGDDCompGridTemp(compGrid[level]) = hypre_AMGDDCompGridVectorCreate();
-      hypre_AMGDDCompGridVectorInitialize(hypre_AMGDDCompGridTemp(compGrid[level]), num_owned, num_nonowned, num_nonowned_real_nodes);
+      hypre_AMGDDCompGridVectorInitialize(hypre_AMGDDCompGridTemp(compGrid[level]), num_owned,
+                                          num_nonowned, num_nonowned_real_nodes);
 
       if (level < num_levels)
       {
          hypre_AMGDDCompGridS(compGrid[level]) = hypre_AMGDDCompGridVectorCreate();
-         hypre_AMGDDCompGridVectorInitialize(hypre_AMGDDCompGridS(compGrid[level]), num_owned, num_nonowned, num_nonowned_real_nodes);
+         hypre_AMGDDCompGridVectorInitialize(hypre_AMGDDCompGridS(compGrid[level]), num_owned, num_nonowned,
+                                             num_nonowned_real_nodes);
 
          hypre_AMGDDCompGridT(compGrid[level]) = hypre_AMGDDCompGridVectorCreate();
-         hypre_AMGDDCompGridVectorInitialize(hypre_AMGDDCompGridT(compGrid[level]), num_owned, num_nonowned, num_nonowned_real_nodes);
+         hypre_AMGDDCompGridVectorInitialize(hypre_AMGDDCompGridT(compGrid[level]), num_owned, num_nonowned,
+                                             num_nonowned_real_nodes);
       }
 
       // Free up arrays we no longer need
@@ -1446,7 +1498,7 @@ HYPRE_Int hypre_AMGDDCompGridFinalize( hypre_ParAMGDDData *amgdd_data )
    // Setup R = P^T if R not specified
    if (!hypre_ParAMGDataRestriction(amg_data))
    {
-      for (level = start_level; level < num_levels-1; level++)
+      for (level = start_level; level < num_levels - 1; level++)
       {
          // !!! TODO: if BoomerAMG explicitly stores R = P^T, use those matrices in
          hypre_AMGDDCompGridR(compGrid[level]) = hypre_AMGDDCompGridMatrixCreate();
@@ -1456,7 +1508,8 @@ HYPRE_Int hypre_AMGDDCompGridFinalize( hypre_ParAMGDDData *amgdd_data )
 
          if (hypre_AMGDDCompGridNumNonOwnedNodes(compGrid[level]))
          {
-            hypre_CSRMatrixTranspose(hypre_AMGDDCompGridMatrixNonOwnedOffd(hypre_AMGDDCompGridP(compGrid[level])),
+            hypre_CSRMatrixTranspose(hypre_AMGDDCompGridMatrixNonOwnedOffd(hypre_AMGDDCompGridP(
+                                                                              compGrid[level])),
                                      &hypre_AMGDDCompGridMatrixOwnedOffd(hypre_AMGDDCompGridR(compGrid[level])), 1);
          }
 
@@ -1465,7 +1518,8 @@ HYPRE_Int hypre_AMGDDCompGridFinalize( hypre_ParAMGDDData *amgdd_data )
 
          if (hypre_AMGDDCompGridNumNonOwnedNodes(compGrid[level]))
          {
-            hypre_CSRMatrixTranspose(hypre_AMGDDCompGridMatrixNonOwnedDiag(hypre_AMGDDCompGridP(compGrid[level])),
+            hypre_CSRMatrixTranspose(hypre_AMGDDCompGridMatrixNonOwnedDiag(hypre_AMGDDCompGridP(
+                                                                              compGrid[level])),
                                      &hypre_AMGDDCompGridMatrixNonOwnedDiag(hypre_AMGDDCompGridR(compGrid[level])), 1);
          }
       }
@@ -1483,15 +1537,19 @@ HYPRE_Int hypre_AMGDDCompGridFinalize( hypre_ParAMGDDData *amgdd_data )
             hypre_AMGDDCommPkgSendBufferSize(amgddCommPkg)[outer_level][new_num_send_procs] = 0;
             for (level = outer_level; level < num_levels; level++)
             {
-               hypre_AMGDDCommPkgSendBufferSize(amgddCommPkg)[outer_level][new_num_send_procs] += hypre_AMGDDCommPkgNumSendNodes(amgddCommPkg)[outer_level][proc][level];
+               hypre_AMGDDCommPkgSendBufferSize(amgddCommPkg)[outer_level][new_num_send_procs] +=
+                  hypre_AMGDDCommPkgNumSendNodes(amgddCommPkg)[outer_level][proc][level];
             }
             if (hypre_AMGDDCommPkgSendBufferSize(amgddCommPkg)[outer_level][new_num_send_procs])
             {
-               hypre_AMGDDCommPkgSendProcs(amgddCommPkg)[outer_level][new_num_send_procs] = hypre_AMGDDCommPkgSendProcs(amgddCommPkg)[outer_level][proc];
+               hypre_AMGDDCommPkgSendProcs(amgddCommPkg)[outer_level][new_num_send_procs] =
+                  hypre_AMGDDCommPkgSendProcs(amgddCommPkg)[outer_level][proc];
                for (level = outer_level; level < num_levels; level++)
                {
-                  hypre_AMGDDCommPkgNumSendNodes(amgddCommPkg)[outer_level][new_num_send_procs][level] = hypre_AMGDDCommPkgNumSendNodes(amgddCommPkg)[outer_level][proc][level];
-                  hypre_AMGDDCommPkgSendFlag(amgddCommPkg)[outer_level][new_num_send_procs][level] = hypre_AMGDDCommPkgSendFlag(amgddCommPkg)[outer_level][proc][level];
+                  hypre_AMGDDCommPkgNumSendNodes(amgddCommPkg)[outer_level][new_num_send_procs][level] =
+                     hypre_AMGDDCommPkgNumSendNodes(amgddCommPkg)[outer_level][proc][level];
+                  hypre_AMGDDCommPkgSendFlag(amgddCommPkg)[outer_level][new_num_send_procs][level] =
+                     hypre_AMGDDCommPkgSendFlag(amgddCommPkg)[outer_level][proc][level];
                }
                new_num_send_procs++;
             }
@@ -1513,15 +1571,19 @@ HYPRE_Int hypre_AMGDDCompGridFinalize( hypre_ParAMGDDData *amgdd_data )
             hypre_AMGDDCommPkgRecvBufferSize(amgddCommPkg)[outer_level][new_num_recv_procs] = 0;
             for (level = outer_level; level < num_levels; level++)
             {
-               hypre_AMGDDCommPkgRecvBufferSize(amgddCommPkg)[outer_level][new_num_recv_procs] += hypre_AMGDDCommPkgNumRecvNodes(amgddCommPkg)[outer_level][proc][level];
+               hypre_AMGDDCommPkgRecvBufferSize(amgddCommPkg)[outer_level][new_num_recv_procs] +=
+                  hypre_AMGDDCommPkgNumRecvNodes(amgddCommPkg)[outer_level][proc][level];
             }
             if (hypre_AMGDDCommPkgRecvBufferSize(amgddCommPkg)[outer_level][new_num_recv_procs])
             {
-               hypre_AMGDDCommPkgRecvProcs(amgddCommPkg)[outer_level][new_num_recv_procs] = hypre_AMGDDCommPkgRecvProcs(amgddCommPkg)[outer_level][proc];
+               hypre_AMGDDCommPkgRecvProcs(amgddCommPkg)[outer_level][new_num_recv_procs] =
+                  hypre_AMGDDCommPkgRecvProcs(amgddCommPkg)[outer_level][proc];
                for (level = outer_level; level < num_levels; level++)
                {
-                  hypre_AMGDDCommPkgNumRecvNodes(amgddCommPkg)[outer_level][new_num_recv_procs][level] = hypre_AMGDDCommPkgNumRecvNodes(amgddCommPkg)[outer_level][proc][level];
-                  hypre_AMGDDCommPkgRecvMap(amgddCommPkg)[outer_level][new_num_recv_procs][level] = hypre_AMGDDCommPkgRecvMap(amgddCommPkg)[outer_level][proc][level];
+                  hypre_AMGDDCommPkgNumRecvNodes(amgddCommPkg)[outer_level][new_num_recv_procs][level] =
+                     hypre_AMGDDCommPkgNumRecvNodes(amgddCommPkg)[outer_level][proc][level];
+                  hypre_AMGDDCommPkgRecvMap(amgddCommPkg)[outer_level][new_num_recv_procs][level] =
+                     hypre_AMGDDCommPkgRecvMap(amgddCommPkg)[outer_level][proc][level];
                }
                new_num_recv_procs++;
             }
@@ -1552,19 +1614,28 @@ hypre_AMGDDCompGridResize( hypre_AMGDDCompGrid *compGrid,
    hypre_CSRMatrix     *nonowned_offd;
    HYPRE_Int            old_size = hypre_AMGDDCompGridNumNonOwnedNodes(compGrid);
 
-   hypre_AMGDDCompGridNonOwnedGlobalIndices(compGrid) = hypre_TReAlloc_v2(hypre_AMGDDCompGridNonOwnedGlobalIndices(compGrid), HYPRE_Int, old_size, HYPRE_Int, new_size, memory_location);
-   hypre_AMGDDCompGridNonOwnedRealMarker(compGrid) = hypre_TReAlloc_v2(hypre_AMGDDCompGridNonOwnedRealMarker(compGrid), HYPRE_Int, old_size, HYPRE_Int, new_size, memory_location);
-   hypre_AMGDDCompGridNonOwnedSort(compGrid) = hypre_TReAlloc_v2(hypre_AMGDDCompGridNonOwnedSort(compGrid), HYPRE_Int, old_size, HYPRE_Int, new_size, memory_location);
-   hypre_AMGDDCompGridNonOwnedInvSort(compGrid) = hypre_TReAlloc_v2(hypre_AMGDDCompGridNonOwnedInvSort(compGrid), HYPRE_Int, old_size, HYPRE_Int, new_size, memory_location);
+   hypre_AMGDDCompGridNonOwnedGlobalIndices(compGrid) = hypre_TReAlloc_v2(
+                                                           hypre_AMGDDCompGridNonOwnedGlobalIndices(compGrid), HYPRE_Int, old_size, HYPRE_Int, new_size,
+                                                           memory_location);
+   hypre_AMGDDCompGridNonOwnedRealMarker(compGrid) = hypre_TReAlloc_v2(
+                                                        hypre_AMGDDCompGridNonOwnedRealMarker(compGrid), HYPRE_Int, old_size, HYPRE_Int, new_size,
+                                                        memory_location);
+   hypre_AMGDDCompGridNonOwnedSort(compGrid) = hypre_TReAlloc_v2(hypre_AMGDDCompGridNonOwnedSort(
+                                                                    compGrid), HYPRE_Int, old_size, HYPRE_Int, new_size, memory_location);
+   hypre_AMGDDCompGridNonOwnedInvSort(compGrid) = hypre_TReAlloc_v2(hypre_AMGDDCompGridNonOwnedInvSort(
+                                                                       compGrid), HYPRE_Int, old_size, HYPRE_Int, new_size, memory_location);
 
    nonowned_diag = hypre_AMGDDCompGridMatrixNonOwnedDiag(hypre_AMGDDCompGridA(compGrid));
    nonowned_offd = hypre_AMGDDCompGridMatrixNonOwnedOffd(hypre_AMGDDCompGridA(compGrid));
    hypre_CSRMatrixResize(nonowned_diag, new_size, new_size, hypre_CSRMatrixNumNonzeros(nonowned_diag));
-   hypre_CSRMatrixResize(nonowned_offd, new_size, hypre_CSRMatrixNumCols(nonowned_offd), hypre_CSRMatrixNumNonzeros(nonowned_offd));
+   hypre_CSRMatrixResize(nonowned_offd, new_size, hypre_CSRMatrixNumCols(nonowned_offd),
+                         hypre_CSRMatrixNumNonzeros(nonowned_offd));
 
    if (need_coarse_info)
    {
-      hypre_AMGDDCompGridNonOwnedCoarseIndices(compGrid) = hypre_TReAlloc_v2(hypre_AMGDDCompGridNonOwnedCoarseIndices(compGrid), HYPRE_Int, old_size, HYPRE_Int, new_size, memory_location);
+      hypre_AMGDDCompGridNonOwnedCoarseIndices(compGrid) = hypre_TReAlloc_v2(
+                                                              hypre_AMGDDCompGridNonOwnedCoarseIndices(compGrid), HYPRE_Int, old_size, HYPRE_Int, new_size,
+                                                              memory_location);
    }
 
    return hypre_error_flag;
@@ -1588,11 +1659,11 @@ hypre_AMGDDCompGridSetupLocalIndices( hypre_AMGDDCompGrid **compGrid,
    hypre_CSRMatrix             *nonowned_offd = hypre_AMGDDCompGridMatrixNonOwnedOffd(A);
 
    // On current_level, need to deal with A_tmp_info
-   HYPRE_Int     row = hypre_CSRMatrixNumCols(owned_offd)+1;
+   HYPRE_Int     row = hypre_CSRMatrixNumCols(owned_offd) + 1;
    HYPRE_Int     diag_rowptr = hypre_CSRMatrixI(nonowned_diag)[ hypre_CSRMatrixNumCols(owned_offd) ];
    HYPRE_Int     offd_rowptr = hypre_CSRMatrixI(nonowned_offd)[ hypre_CSRMatrixNumCols(owned_offd) ];
 
-   HYPRE_Int     level,proc, i, j, cnt;
+   HYPRE_Int     level, proc, i, j, cnt;
    HYPRE_Int     global_index, local_index, coarse_index;
    HYPRE_Int     remaining_dofs;
    HYPRE_Int     row_size;
@@ -1615,7 +1686,7 @@ hypre_AMGDDCompGridSetupLocalIndices( hypre_AMGDDCompGrid **compGrid,
             // Incoming is a global index (could be owned or nonowned)
             if (incoming_index < 0)
             {
-               incoming_index = -(incoming_index+1);
+               incoming_index = -(incoming_index + 1);
                // See whether global index is owned on this proc (if so, can directly setup appropriate local index)
                if ( incoming_index >= hypre_AMGDDCompGridFirstGlobalIndex(compGrid[current_level]) &&
                     incoming_index <= hypre_AMGDDCompGridLastGlobalIndex(compGrid[current_level] ))
@@ -1626,9 +1697,10 @@ hypre_AMGDDCompGridSetupLocalIndices( hypre_AMGDDCompGrid **compGrid,
                      hypre_CSRMatrixResize(nonowned_offd,
                                            hypre_CSRMatrixNumRows(nonowned_offd),
                                            hypre_CSRMatrixNumCols(nonowned_offd),
-                                           ceil(1.5*hypre_CSRMatrixNumNonzeros(nonowned_offd)));
+                                           (HYPRE_Int)hypre_ceil(1.5 * hypre_CSRMatrixNumNonzeros(nonowned_offd)));
                   }
-                  hypre_CSRMatrixJ(nonowned_offd)[offd_rowptr++] = incoming_index - hypre_AMGDDCompGridFirstGlobalIndex(compGrid[current_level]);
+                  hypre_CSRMatrixJ(nonowned_offd)[offd_rowptr++] = incoming_index -
+                                                                   hypre_AMGDDCompGridFirstGlobalIndex(compGrid[current_level]);
                }
                else
                {
@@ -1640,13 +1712,17 @@ hypre_AMGDDCompGridSetupLocalIndices( hypre_AMGDDCompGrid **compGrid,
                                           HYPRE_Int,
                                           hypre_CSRMatrixNumNonzeros(nonowned_diag),
                                           HYPRE_Int,
-                                          ceil(1.5*hypre_CSRMatrixNumNonzeros(nonowned_diag)),
+                                          (HYPRE_Int)hypre_ceil(1.5 * hypre_CSRMatrixNumNonzeros(nonowned_diag)),
                                           hypre_AMGDDCompGridMemoryLocation(compGrid[current_level]));
-                     hypre_CSRMatrixResize(nonowned_diag, hypre_CSRMatrixNumRows(nonowned_diag), hypre_CSRMatrixNumCols(nonowned_diag), ceil(1.5*hypre_CSRMatrixNumNonzeros(nonowned_diag)));
+                     hypre_CSRMatrixResize(nonowned_diag, hypre_CSRMatrixNumRows(nonowned_diag),
+                                           hypre_CSRMatrixNumCols(nonowned_diag),
+                                           (HYPRE_Int)hypre_ceil(1.5 * hypre_CSRMatrixNumNonzeros(nonowned_diag)));
                   }
                   // If we dof not found in comp grid, then mark this as a missing connection
-                  hypre_AMGDDCompGridNonOwnedDiagMissingColIndices(compGrid[current_level])[ hypre_AMGDDCompGridNumMissingColIndices(compGrid[current_level])++ ] = diag_rowptr;
-                  hypre_CSRMatrixJ(nonowned_diag)[diag_rowptr++] = -(incoming_index+1);
+                  hypre_AMGDDCompGridNonOwnedDiagMissingColIndices(
+                     compGrid[current_level])[ hypre_AMGDDCompGridNumMissingColIndices(compGrid[current_level])++ ] =
+                        diag_rowptr;
+                  hypre_CSRMatrixJ(nonowned_diag)[diag_rowptr++] = -(incoming_index + 1);
                }
             }
             // Incoming is an index to dofs within the buffer (by construction, nonowned)
@@ -1660,20 +1736,21 @@ hypre_AMGDDCompGridSetupLocalIndices( hypre_AMGDDCompGrid **compGrid,
                                        HYPRE_Int,
                                        hypre_CSRMatrixNumNonzeros(nonowned_diag),
                                        HYPRE_Int,
-                                       ceil(1.5*hypre_CSRMatrixNumNonzeros(nonowned_diag)),
+                                       (HYPRE_Int)hypre_ceil(1.5 * hypre_CSRMatrixNumNonzeros(nonowned_diag)),
                                        hypre_AMGDDCompGridMemoryLocation(compGrid[current_level]));
 
                   hypre_CSRMatrixResize(nonowned_diag,
                                         hypre_CSRMatrixNumRows(nonowned_diag),
                                         hypre_CSRMatrixNumCols(nonowned_diag),
-                                        ceil(1.5*hypre_CSRMatrixNumNonzeros(nonowned_diag)));
+                                        (HYPRE_Int)hypre_ceil(1.5 * hypre_CSRMatrixNumNonzeros(nonowned_diag)));
                }
                local_index = recv_map[current_level][proc][current_level][ incoming_index ];
                if (local_index < 0)
                {
                   local_index = -(local_index + 1);
                }
-               hypre_CSRMatrixJ(nonowned_diag)[diag_rowptr++] = local_index - hypre_AMGDDCompGridNumOwnedNodes(compGrid[current_level]);
+               hypre_CSRMatrixJ(nonowned_diag)[diag_rowptr++] = local_index - hypre_AMGDDCompGridNumOwnedNodes(
+                                                                   compGrid[current_level]);
             }
          }
 
@@ -1702,20 +1779,21 @@ hypre_AMGDDCompGridSetupLocalIndices( hypre_AMGDDCompGrid **compGrid,
          {
             j = hypre_AMGDDCompGridNonOwnedDiagMissingColIndices(compGrid[level])[i];
             global_index = hypre_CSRMatrixJ(nonowned_diag)[ j ];
-            global_index = -(global_index+1);
+            global_index = -(global_index + 1);
             local_index = hypre_AMGDDCompGridLocalIndexBinarySearch(compGrid[level], global_index);
             // If we dof not found in comp grid, then mark this as a missing connection
             if (local_index == -1)
             {
-               local_index = -(global_index+1);
-               hypre_AMGDDCompGridNonOwnedDiagMissingColIndices(compGrid[level])[ hypre_AMGDDCompGridNumMissingColIndices(compGrid[level])++ ] = j;
+               local_index = -(global_index + 1);
+               hypre_AMGDDCompGridNonOwnedDiagMissingColIndices(
+                  compGrid[level])[ hypre_AMGDDCompGridNumMissingColIndices(compGrid[level])++ ] = j;
             }
             hypre_CSRMatrixJ(nonowned_diag)[ j ] = local_index;
          }
       }
 
       // if we are not on the coarsest level
-      if (level != num_levels-1)
+      if (level != num_levels - 1)
       {
          // loop over indices of non-owned nodes on this level
          // No guarantee that previous ghost dofs converted to real dofs have coarse local indices setup...
@@ -1730,8 +1808,8 @@ hypre_AMGDDCompGridSetupLocalIndices( hypre_AMGDDCompGrid **compGrid,
             // setup coarse local index if necessary
             if (coarse_index < -1 && is_real)
             {
-               coarse_index = -(coarse_index+2); // Map back to regular global index
-               local_index = hypre_AMGDDCompGridLocalIndexBinarySearch(compGrid[level+1], coarse_index);
+               coarse_index = -(coarse_index + 2); // Map back to regular global index
+               local_index = hypre_AMGDDCompGridLocalIndexBinarySearch(compGrid[level + 1], coarse_index);
                hypre_AMGDDCompGridNonOwnedCoarseIndices(compGrid[level])[i] = local_index;
             }
          }
@@ -1754,14 +1832,16 @@ HYPRE_Int hypre_AMGDDCompGridSetupLocalIndicesP( hypre_ParAMGDDData *amgdd_data
    HYPRE_Int              i, level;
    HYPRE_Int              local_index;
 
-   for (level = start_level; level < num_levels-1; level++)
+   for (level = start_level; level < num_levels - 1; level++)
    {
       // Setup owned offd col indices
       owned_offd = hypre_AMGDDCompGridMatrixOwnedOffd(hypre_AMGDDCompGridP(compGrid[level]));
 
-      for (i = 0; i < hypre_CSRMatrixI(owned_offd)[hypre_AMGDDCompGridNumOwnedNodes(compGrid[level])]; i++)
+      for (i = 0; i < hypre_CSRMatrixI(owned_offd)[hypre_AMGDDCompGridNumOwnedNodes(compGrid[level])];
+           i++)
       {
-         local_index = hypre_AMGDDCompGridLocalIndexBinarySearch(compGrid[level+1], hypre_CSRMatrixJ(owned_offd)[i]);
+         local_index = hypre_AMGDDCompGridLocalIndexBinarySearch(compGrid[level + 1],
+                                                                 hypre_CSRMatrixJ(owned_offd)[i]);
          if (local_index == -1)
          {
             hypre_CSRMatrixJ(owned_offd)[i] = -(hypre_CSRMatrixJ(owned_offd)[i] + 1);
@@ -1775,30 +1855,34 @@ HYPRE_Int hypre_AMGDDCompGridSetupLocalIndicesP( hypre_ParAMGDDData *amgdd_data
       // Setup nonowned diag col indices
       nonowned_diag = hypre_AMGDDCompGridMatrixNonOwnedDiag(hypre_AMGDDCompGridP(compGrid[level]));
 
-      for (i = 0; i < hypre_CSRMatrixI(nonowned_diag)[hypre_AMGDDCompGridNumNonOwnedNodes(compGrid[level])]; i++)
+      for (i = 0;
+           i < hypre_CSRMatrixI(nonowned_diag)[hypre_AMGDDCompGridNumNonOwnedNodes(compGrid[level])]; i++)
       {
-         local_index = hypre_AMGDDCompGridLocalIndexBinarySearch(compGrid[level+1], hypre_CSRMatrixJ(nonowned_diag)[i]);
+         local_index = hypre_AMGDDCompGridLocalIndexBinarySearch(compGrid[level + 1],
+                                                                 hypre_CSRMatrixJ(nonowned_diag)[i]);
          if (local_index == -1)
          {
             hypre_CSRMatrixJ(nonowned_diag)[i] = -(hypre_CSRMatrixJ(nonowned_diag)[i] + 1);
          }
          else
          {
-             hypre_CSRMatrixJ(nonowned_diag)[i] = local_index;
+            hypre_CSRMatrixJ(nonowned_diag)[i] = local_index;
          }
       }
    }
 
    if (hypre_ParAMGDataRestriction(amg_data))
    {
-      for (level = start_level; level < num_levels-1; level++)
+      for (level = start_level; level < num_levels - 1; level++)
       {
          // Setup owned offd col indices
          owned_offd = hypre_AMGDDCompGridMatrixOwnedOffd(hypre_AMGDDCompGridR(compGrid[level]));
 
-         for (i = 0; i < hypre_CSRMatrixI(owned_offd)[hypre_AMGDDCompGridNumOwnedNodes(compGrid[level+1])]; i++)
+         for (i = 0; i < hypre_CSRMatrixI(owned_offd)[hypre_AMGDDCompGridNumOwnedNodes(compGrid[level + 1])];
+              i++)
          {
-            local_index = hypre_AMGDDCompGridLocalIndexBinarySearch(compGrid[level], hypre_CSRMatrixJ(owned_offd)[i]);
+            local_index = hypre_AMGDDCompGridLocalIndexBinarySearch(compGrid[level],
+                                                                    hypre_CSRMatrixJ(owned_offd)[i]);
             if (local_index == -1)
             {
                hypre_CSRMatrixJ(owned_offd)[i] = -(hypre_CSRMatrixJ(owned_offd)[i] + 1);
@@ -1812,9 +1896,11 @@ HYPRE_Int hypre_AMGDDCompGridSetupLocalIndicesP( hypre_ParAMGDDData *amgdd_data
          // Setup nonowned diag col indices
          nonowned_diag = hypre_AMGDDCompGridMatrixNonOwnedDiag(hypre_AMGDDCompGridR(compGrid[level]));
 
-         for (i = 0; i < hypre_CSRMatrixI(nonowned_diag)[hypre_AMGDDCompGridNumNonOwnedNodes(compGrid[level+1])]; i++)
+         for (i = 0;
+              i < hypre_CSRMatrixI(nonowned_diag)[hypre_AMGDDCompGridNumNonOwnedNodes(compGrid[level + 1])]; i++)
          {
-            local_index = hypre_AMGDDCompGridLocalIndexBinarySearch(compGrid[level], hypre_CSRMatrixJ(nonowned_diag)[i]);
+            local_index = hypre_AMGDDCompGridLocalIndexBinarySearch(compGrid[level],
+                                                                    hypre_CSRMatrixJ(nonowned_diag)[i]);
             if (local_index == -1)
             {
                hypre_CSRMatrixJ(nonowned_diag)[i] = -(hypre_CSRMatrixJ(nonowned_diag)[i] + 1);
@@ -1838,17 +1924,28 @@ hypre_AMGDDCommPkg* hypre_AMGDDCommPkgCreate(HYPRE_Int num_levels)
 
    hypre_AMGDDCommPkgNumLevels(amgddCommPkg) = num_levels;
 
-   hypre_AMGDDCommPkgNumSendProcs(amgddCommPkg)   = hypre_CTAlloc(HYPRE_Int,     num_levels, HYPRE_MEMORY_HOST);
-   hypre_AMGDDCommPkgNumRecvProcs(amgddCommPkg)   = hypre_CTAlloc(HYPRE_Int,     num_levels, HYPRE_MEMORY_HOST);
-   hypre_AMGDDCommPkgSendProcs(amgddCommPkg)      = hypre_CTAlloc(HYPRE_Int *,   num_levels, HYPRE_MEMORY_HOST);
-   hypre_AMGDDCommPkgRecvProcs(amgddCommPkg)      = hypre_CTAlloc(HYPRE_Int *,   num_levels, HYPRE_MEMORY_HOST);
-   hypre_AMGDDCommPkgSendBufferSize(amgddCommPkg) = hypre_CTAlloc(HYPRE_Int *,   num_levels, HYPRE_MEMORY_HOST);
-   hypre_AMGDDCommPkgRecvBufferSize(amgddCommPkg) = hypre_CTAlloc(HYPRE_Int *,   num_levels, HYPRE_MEMORY_HOST);
-   hypre_AMGDDCommPkgNumSendNodes(amgddCommPkg)   = hypre_CTAlloc(HYPRE_Int **,  num_levels, HYPRE_MEMORY_HOST);
-   hypre_AMGDDCommPkgNumRecvNodes(amgddCommPkg)   = hypre_CTAlloc(HYPRE_Int **,  num_levels, HYPRE_MEMORY_HOST);
-   hypre_AMGDDCommPkgSendFlag(amgddCommPkg)       = hypre_CTAlloc(HYPRE_Int ***, num_levels, HYPRE_MEMORY_HOST);
-   hypre_AMGDDCommPkgRecvMap(amgddCommPkg)        = hypre_CTAlloc(HYPRE_Int ***, num_levels, HYPRE_MEMORY_HOST);
-   hypre_AMGDDCommPkgRecvRedMarker(amgddCommPkg)  = hypre_CTAlloc(HYPRE_Int ***, num_levels, HYPRE_MEMORY_HOST);
+   hypre_AMGDDCommPkgNumSendProcs(amgddCommPkg)   = hypre_CTAlloc(HYPRE_Int,     num_levels,
+                                                                  HYPRE_MEMORY_HOST);
+   hypre_AMGDDCommPkgNumRecvProcs(amgddCommPkg)   = hypre_CTAlloc(HYPRE_Int,     num_levels,
+                                                                  HYPRE_MEMORY_HOST);
+   hypre_AMGDDCommPkgSendProcs(amgddCommPkg)      = hypre_CTAlloc(HYPRE_Int *,   num_levels,
+                                                                  HYPRE_MEMORY_HOST);
+   hypre_AMGDDCommPkgRecvProcs(amgddCommPkg)      = hypre_CTAlloc(HYPRE_Int *,   num_levels,
+                                                                  HYPRE_MEMORY_HOST);
+   hypre_AMGDDCommPkgSendBufferSize(amgddCommPkg) = hypre_CTAlloc(HYPRE_Int *,   num_levels,
+                                                                  HYPRE_MEMORY_HOST);
+   hypre_AMGDDCommPkgRecvBufferSize(amgddCommPkg) = hypre_CTAlloc(HYPRE_Int *,   num_levels,
+                                                                  HYPRE_MEMORY_HOST);
+   hypre_AMGDDCommPkgNumSendNodes(amgddCommPkg)   = hypre_CTAlloc(HYPRE_Int **,  num_levels,
+                                                                  HYPRE_MEMORY_HOST);
+   hypre_AMGDDCommPkgNumRecvNodes(amgddCommPkg)   = hypre_CTAlloc(HYPRE_Int **,  num_levels,
+                                                                  HYPRE_MEMORY_HOST);
+   hypre_AMGDDCommPkgSendFlag(amgddCommPkg)       = hypre_CTAlloc(HYPRE_Int ***, num_levels,
+                                                                  HYPRE_MEMORY_HOST);
+   hypre_AMGDDCommPkgRecvMap(amgddCommPkg)        = hypre_CTAlloc(HYPRE_Int ***, num_levels,
+                                                                  HYPRE_MEMORY_HOST);
+   hypre_AMGDDCommPkgRecvRedMarker(amgddCommPkg)  = hypre_CTAlloc(HYPRE_Int ***, num_levels,
+                                                                  HYPRE_MEMORY_HOST);
 
    return amgddCommPkg;
 }
diff --git a/external/hypre/src/parcsr_ls/par_amgdd_comp_grid.h b/external/hypre/src/parcsr_ls/par_amgdd_comp_grid.h
index 81d9c4df..29898cb1 100644
--- a/external/hypre/src/parcsr_ls/par_amgdd_comp_grid.h
+++ b/external/hypre/src/parcsr_ls/par_amgdd_comp_grid.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -29,7 +29,8 @@ typedef struct
    HYPRE_Int        ***num_recv_nodes; // number of nodes to recv on each composite level
 
    HYPRE_Int       ****send_flag; // flags which nodes to send after composite grid is built
-   HYPRE_Int       ****recv_map; // mapping from recv buffer to appropriate local indices on each comp grid
+   HYPRE_Int
+   ****recv_map; // mapping from recv buffer to appropriate local indices on each comp grid
    HYPRE_Int       ****recv_red_marker; // marker indicating a redundant recv
 
 } hypre_AMGDDCommPkg;
@@ -59,7 +60,8 @@ typedef struct
 {
    hypre_CSRMatrix      *owned_diag; // Domain: owned domain of mat. Range: owned range of mat.
    hypre_CSRMatrix      *owned_offd; // Domain: nonowned domain of mat. Range: owned range of mat.
-   hypre_CSRMatrix      *nonowned_diag; // Domain: nonowned domain of mat. Range: nonowned range of mat.
+   hypre_CSRMatrix
+   *nonowned_diag; // Domain: nonowned domain of mat. Range: nonowned range of mat.
    hypre_CSRMatrix      *nonowned_offd; // Domain: owned domain of mat. Range: nonowned range of mat.
 
    hypre_CSRMatrix      *real_real;  // Domain: nonowned real. Range: nonowned real.
@@ -115,8 +117,8 @@ typedef struct
    HYPRE_Int             level;
    HYPRE_MemoryLocation  memory_location;   /* memory location of matrices/vectors */
 
-   HYPRE_Int             first_global_index;
-   HYPRE_Int             last_global_index;
+   HYPRE_BigInt          first_global_index;
+   HYPRE_BigInt          last_global_index;
    HYPRE_Int             num_owned_nodes;
    HYPRE_Int             num_nonowned_nodes;
    HYPRE_Int             num_nonowned_real_nodes;
diff --git a/external/hypre/src/parcsr_ls/par_amgdd_fac_cycle.c b/external/hypre/src/parcsr_ls/par_amgdd_fac_cycle.c
index 4c34477b..a1c3d6f5 100644
--- a/external/hypre/src/parcsr_ls/par_amgdd_fac_cycle.c
+++ b/external/hypre/src/parcsr_ls/par_amgdd_fac_cycle.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -24,7 +24,8 @@ hypre_BoomerAMGDD_FAC( void *amgdd_vdata, HYPRE_Int first_iteration )
    }
    else
    {
-      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "WARNING: unknown AMG-DD FAC cycle type. Defaulting to 1 (V-cycle).\n");
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                        "WARNING: unknown AMG-DD FAC cycle type. Defaulting to 1 (V-cycle).\n");
       hypre_ParAMGDDDataFACCycleType(amgdd_data) = 1;
       hypre_BoomerAMGDD_FAC_Cycle(amgdd_vdata, start_level, 1, first_iteration);
    }
@@ -51,23 +52,23 @@ hypre_BoomerAMGDD_FAC_Cycle( void      *amgdd_vdata,
    // Restrict the residual at all fine points (real and ghost) and set residual at coarse points not under the fine grid
    if (num_levels > 1)
    {
-      hypre_BoomerAMGDD_FAC_Restrict(compGrid[level], compGrid[level+1], first_iteration);
+      hypre_BoomerAMGDD_FAC_Restrict(compGrid[level], compGrid[level + 1], first_iteration);
       hypre_AMGDDCompGridVectorSetConstantValues(hypre_AMGDDCompGridS(compGrid[level]), 0.0);
       hypre_AMGDDCompGridVectorSetConstantValues(hypre_AMGDDCompGridT(compGrid[level]), 0.0);
 
       //  Either solve on the coarse level or recurse
-      if (level+1 == num_levels-1)
+      if (level + 1 == num_levels - 1)
       {
-         hypre_BoomerAMGDD_FAC_Relax(amgdd_vdata, num_levels-1, 3);
+         hypre_BoomerAMGDD_FAC_Relax(amgdd_vdata, num_levels - 1, 3);
       }
       else for (i = 0; i < cycle_type; i++)
-      {
-         hypre_BoomerAMGDD_FAC_Cycle(amgdd_vdata, level+1, cycle_type, first_iteration);
-         first_iteration = 0;
-      }
+         {
+            hypre_BoomerAMGDD_FAC_Cycle(amgdd_vdata, level + 1, cycle_type, first_iteration);
+            first_iteration = 0;
+         }
 
       // Interpolate up and relax
-      hypre_BoomerAMGDD_FAC_Interpolate(compGrid[level], compGrid[level+1]);
+      hypre_BoomerAMGDD_FAC_Interpolate(compGrid[level], compGrid[level + 1]);
    }
 
    hypre_BoomerAMGDD_FAC_Relax(amgdd_vdata, level, 2);
@@ -76,8 +77,8 @@ hypre_BoomerAMGDD_FAC_Cycle( void      *amgdd_vdata,
 }
 
 HYPRE_Int
- hypre_BoomerAMGDD_FAC_FCycle( void     *amgdd_vdata,
-                               HYPRE_Int first_iteration )
+hypre_BoomerAMGDD_FAC_FCycle( void     *amgdd_vdata,
+                              HYPRE_Int first_iteration )
 {
    hypre_ParAMGDDData    *amgdd_data = (hypre_ParAMGDDData*) amgdd_vdata;
    hypre_ParAMGData      *amg_data   = hypre_ParAMGDDDataAMG(amgdd_data);
@@ -91,20 +92,20 @@ HYPRE_Int
    {
       for (level = hypre_ParAMGDDDataStartLevel(amgdd_data); level < num_levels - 1; level++)
       {
-         hypre_BoomerAMGDD_FAC_Restrict(compGrid[level], compGrid[level+1], 0);
+         hypre_BoomerAMGDD_FAC_Restrict(compGrid[level], compGrid[level + 1], 0);
          hypre_AMGDDCompGridVectorSetConstantValues(hypre_AMGDDCompGridS(compGrid[level]), 0.0);
          hypre_AMGDDCompGridVectorSetConstantValues(hypre_AMGDDCompGridT(compGrid[level]), 0.0);
       }
    }
 
    //  ... solve on coarsest level ...
-   hypre_BoomerAMGDD_FAC_Relax(amgdd_vdata, num_levels-1, 3);
+   hypre_BoomerAMGDD_FAC_Relax(amgdd_vdata, num_levels - 1, 3);
 
    // ... and work back up to the finest
    for (level = num_levels - 2; level > -1; level--)
    {
       // Interpolate up and relax
-      hypre_BoomerAMGDD_FAC_Interpolate(compGrid[level], compGrid[level+1]);
+      hypre_BoomerAMGDD_FAC_Interpolate(compGrid[level], compGrid[level + 1]);
 
       // V-cycle
       hypre_BoomerAMGDD_FAC_Cycle(amgdd_vdata, level, 1, 0);
@@ -118,7 +119,7 @@ hypre_BoomerAMGDD_FAC_Interpolate( hypre_AMGDDCompGrid *compGrid_f,
                                    hypre_AMGDDCompGrid *compGrid_c )
 {
    hypre_AMGDDCompGridMatvec(1.0, hypre_AMGDDCompGridP(compGrid_f),
-                                  hypre_AMGDDCompGridU(compGrid_c),
+                             hypre_AMGDDCompGridU(compGrid_c),
                              1.0, hypre_AMGDDCompGridU(compGrid_f));
    return hypre_error_flag;
 }
@@ -132,31 +133,32 @@ hypre_BoomerAMGDD_FAC_Restrict( hypre_AMGDDCompGrid *compGrid_f,
    if (!first_iteration)
    {
       hypre_AMGDDCompGridMatvec(-1.0, hypre_AMGDDCompGridA(compGrid_c),
-                                      hypre_AMGDDCompGridU(compGrid_c),
-                                 1.0, hypre_AMGDDCompGridF(compGrid_c));
+                                hypre_AMGDDCompGridU(compGrid_c),
+                                1.0, hypre_AMGDDCompGridF(compGrid_c));
    }
 
    // Get update: s_l <- A_lt_l + s_l
    hypre_AMGDDCompGridMatvec(1.0, hypre_AMGDDCompGridA(compGrid_f),
-                                  hypre_AMGDDCompGridT(compGrid_f),
+                             hypre_AMGDDCompGridT(compGrid_f),
                              1.0, hypre_AMGDDCompGridS(compGrid_f));
 
    // If we need to preserve the updates on the next level
    if (hypre_AMGDDCompGridS(compGrid_c))
    {
       hypre_AMGDDCompGridMatvec(1.0, hypre_AMGDDCompGridR(compGrid_f),
-                                     hypre_AMGDDCompGridS(compGrid_f),
+                                hypre_AMGDDCompGridS(compGrid_f),
                                 0.0, hypre_AMGDDCompGridS(compGrid_c));
 
       // Subtract restricted update from recalculated residual: f_{l+1} <- f_{l+1} - s_{l+1}
-      hypre_AMGDDCompGridVectorAxpy(-1.0, hypre_AMGDDCompGridS(compGrid_c), hypre_AMGDDCompGridF(compGrid_c));
+      hypre_AMGDDCompGridVectorAxpy(-1.0, hypre_AMGDDCompGridS(compGrid_c),
+                                    hypre_AMGDDCompGridF(compGrid_c));
    }
    else
    {
       // Restrict and subtract update from recalculated residual: f_{l+1} <- f_{l+1} - P_l^Ts_l
       hypre_AMGDDCompGridMatvec(-1.0, hypre_AMGDDCompGridR(compGrid_f),
-                                      hypre_AMGDDCompGridS(compGrid_f),
-                                 1.0, hypre_AMGDDCompGridF(compGrid_c));
+                                hypre_AMGDDCompGridS(compGrid_f),
+                                1.0, hypre_AMGDDCompGridF(compGrid_c));
    }
 
    // Zero out initial guess on coarse grid
@@ -215,7 +217,9 @@ hypre_BoomerAMGDD_FAC_Jacobi( void      *amgdd_vdata,
                               HYPRE_Int  level,
                               HYPRE_Int  cycle_param )
 {
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+   HYPRE_UNUSED_VAR(cycle_param);
+
+#if defined(HYPRE_USING_GPU)
    hypre_ParAMGDDData      *amgdd_data      = (hypre_ParAMGDDData*) amgdd_vdata;
    hypre_AMGDDCompGrid     *compGrid        = hypre_ParAMGDDDataCompGrid(amgdd_data)[level];
    HYPRE_MemoryLocation     memory_location = hypre_AMGDDCompGridMemoryLocation(compGrid);
@@ -262,9 +266,9 @@ hypre_BoomerAMGDD_FAC_JacobiHost( void      *amgdd_vdata,
       diag = hypre_AMGDDCompGridMatrixOwnedDiag(A);
       for (i = 0; i < hypre_AMGDDCompGridNumOwnedNodes(compGrid); i++)
       {
-         for (j = hypre_CSRMatrixI(diag)[i]; j < hypre_CSRMatrixI(diag)[i+1]; j++)
+         for (j = hypre_CSRMatrixI(diag)[i]; j < hypre_CSRMatrixI(diag)[i + 1]; j++)
          {
-            // hypre_AMGDDCompGridL1Norms(compGrid)[i] += fabs(hypre_CSRMatrixData(diag)[j]);
+            // hypre_AMGDDCompGridL1Norms(compGrid)[i] += hypre_abs(hypre_CSRMatrixData(diag)[j]);
             if (hypre_CSRMatrixJ(diag)[j] == i)
             {
                hypre_AMGDDCompGridL1Norms(compGrid)[i] = hypre_CSRMatrixData(diag)[j];
@@ -275,12 +279,13 @@ hypre_BoomerAMGDD_FAC_JacobiHost( void      *amgdd_vdata,
       diag = hypre_AMGDDCompGridMatrixNonOwnedDiag(A);
       for (i = 0; i < hypre_AMGDDCompGridNumNonOwnedRealNodes(compGrid); i++)
       {
-         for (j = hypre_CSRMatrixI(diag)[i]; j < hypre_CSRMatrixI(diag)[i+1]; j++)
+         for (j = hypre_CSRMatrixI(diag)[i]; j < hypre_CSRMatrixI(diag)[i + 1]; j++)
          {
-            // hypre_AMGDDCompGridL1Norms(compGrid)[i + hypre_AMGDDCompGridNumOwnedNodes(compGrid)] += fabs(hypre_CSRMatrixData(diag)[j]);
+            // hypre_AMGDDCompGridL1Norms(compGrid)[i + hypre_AMGDDCompGridNumOwnedNodes(compGrid)] += hypre_abs(hypre_CSRMatrixData(diag)[j]);
             if (hypre_CSRMatrixJ(diag)[j] == i)
             {
-               hypre_AMGDDCompGridL1Norms(compGrid)[i + hypre_AMGDDCompGridNumOwnedNodes(compGrid)] = hypre_CSRMatrixData(diag)[j];
+               hypre_AMGDDCompGridL1Norms(compGrid)[i + hypre_AMGDDCompGridNumOwnedNodes(
+                                                       compGrid)] = hypre_CSRMatrixData(diag)[j];
             }
          }
       }
@@ -321,6 +326,8 @@ hypre_BoomerAMGDD_FAC_GaussSeidel( void      *amgdd_vdata,
                                    HYPRE_Int  level,
                                    HYPRE_Int  cycle_param )
 {
+   HYPRE_UNUSED_VAR(cycle_param);
+
    hypre_ParAMGDDData    *amgdd_data = (hypre_ParAMGDDData*) amgdd_vdata;
    hypre_AMGDDCompGrid   *compGrid   = hypre_ParAMGDDDataCompGrid(amgdd_data)[level];
 
@@ -348,7 +355,7 @@ hypre_BoomerAMGDD_FAC_GaussSeidel( void      *amgdd_vdata,
       diagonal = 0.0;
 
       // Loop over diag entries
-      for (j = hypre_CSRMatrixI(owned_diag)[i]; j < hypre_CSRMatrixI(owned_diag)[i+1]; j++)
+      for (j = hypre_CSRMatrixI(owned_diag)[i]; j < hypre_CSRMatrixI(owned_diag)[i + 1]; j++)
       {
          if (hypre_CSRMatrixJ(owned_diag)[j] == i)
          {
@@ -356,20 +363,23 @@ hypre_BoomerAMGDD_FAC_GaussSeidel( void      *amgdd_vdata,
          }
          else
          {
-            u_owned_data[i] -= hypre_CSRMatrixData(owned_diag)[j] * u_owned_data[ hypre_CSRMatrixJ(owned_diag)[j] ];
+            u_owned_data[i] -= hypre_CSRMatrixData(owned_diag)[j] * u_owned_data[ hypre_CSRMatrixJ(
+                                                                                     owned_diag)[j] ];
          }
       }
 
       // Loop over offd entries
-      for (j = hypre_CSRMatrixI(owned_offd)[i]; j < hypre_CSRMatrixI(owned_offd)[i+1]; j++)
+      for (j = hypre_CSRMatrixI(owned_offd)[i]; j < hypre_CSRMatrixI(owned_offd)[i + 1]; j++)
       {
-         u_owned_data[i] -= hypre_CSRMatrixData(owned_offd)[j] * u_nonowned_data[ hypre_CSRMatrixJ(owned_offd)[j] ];
+         u_owned_data[i] -= hypre_CSRMatrixData(owned_offd)[j] * u_nonowned_data[ hypre_CSRMatrixJ(
+                                                                                     owned_offd)[j] ];
       }
 
       // Divide by diagonal
       if (diagonal == 0.0)
       {
-         hypre_error_w_msg(HYPRE_ERROR_GENERIC,"WARNING: Divide by zero diagonal in hypre_BoomerAMGDD_FAC_GaussSeidel().\n");
+         hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                           "WARNING: Divide by zero diagonal in hypre_BoomerAMGDD_FAC_GaussSeidel().\n");
       }
       u_owned_data[i] /= diagonal;
    }
@@ -382,7 +392,7 @@ hypre_BoomerAMGDD_FAC_GaussSeidel( void      *amgdd_vdata,
       diagonal = 0.0;
 
       // Loop over diag entries
-      for (j = hypre_CSRMatrixI(nonowned_diag)[i]; j < hypre_CSRMatrixI(nonowned_diag)[i+1]; j++)
+      for (j = hypre_CSRMatrixI(nonowned_diag)[i]; j < hypre_CSRMatrixI(nonowned_diag)[i + 1]; j++)
       {
          if (hypre_CSRMatrixJ(nonowned_diag)[j] == i)
          {
@@ -390,20 +400,23 @@ hypre_BoomerAMGDD_FAC_GaussSeidel( void      *amgdd_vdata,
          }
          else
          {
-            u_nonowned_data[i] -= hypre_CSRMatrixData(nonowned_diag)[j] * u_nonowned_data[ hypre_CSRMatrixJ(nonowned_diag)[j] ];
+            u_nonowned_data[i] -= hypre_CSRMatrixData(nonowned_diag)[j] * u_nonowned_data[ hypre_CSRMatrixJ(
+                                                                                              nonowned_diag)[j] ];
          }
       }
 
       // Loop over offd entries
-      for (j = hypre_CSRMatrixI(nonowned_offd)[i]; j < hypre_CSRMatrixI(nonowned_offd)[i+1]; j++)
+      for (j = hypre_CSRMatrixI(nonowned_offd)[i]; j < hypre_CSRMatrixI(nonowned_offd)[i + 1]; j++)
       {
-         u_nonowned_data[i] -= hypre_CSRMatrixData(nonowned_offd)[j] * u_owned_data[ hypre_CSRMatrixJ(nonowned_offd)[j] ];
+         u_nonowned_data[i] -= hypre_CSRMatrixData(nonowned_offd)[j] * u_owned_data[ hypre_CSRMatrixJ(
+                                                                                        nonowned_offd)[j] ];
       }
 
       // Divide by diagonal
       if (diagonal == 0.0)
       {
-         hypre_error_w_msg(HYPRE_ERROR_GENERIC,"WARNING: Divide by zero diagonal in hypre_BoomerAMGDD_FAC_GaussSeidel().\n");
+         hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                           "WARNING: Divide by zero diagonal in hypre_BoomerAMGDD_FAC_GaussSeidel().\n");
       }
       u_nonowned_data[i] /= diagonal;
    }
@@ -416,6 +429,8 @@ hypre_BoomerAMGDD_FAC_OrderedGaussSeidel( void       *amgdd_vdata,
                                           HYPRE_Int   level,
                                           HYPRE_Int   cycle_param )
 {
+   HYPRE_UNUSED_VAR(cycle_param);
+
    hypre_ParAMGDDData         *amgdd_data = (hypre_ParAMGDDData*) amgdd_vdata;
    hypre_AMGDDCompGrid        *compGrid   = hypre_ParAMGDDDataCompGrid(amgdd_data)[level];
 
@@ -431,7 +446,8 @@ hypre_BoomerAMGDD_FAC_OrderedGaussSeidel( void       *amgdd_vdata,
       hypre_AMGDDCompGridOwnedRelaxOrdering(compGrid) = hypre_CTAlloc(HYPRE_Int,
                                                                       hypre_AMGDDCompGridNumOwnedNodes(compGrid),
                                                                       hypre_AMGDDCompGridMemoryLocation(compGrid));
-      hypre_topo_sort(hypre_CSRMatrixI(hypre_AMGDDCompGridMatrixOwnedDiag(hypre_AMGDDCompGridA(compGrid))),
+      hypre_topo_sort(hypre_CSRMatrixI(hypre_AMGDDCompGridMatrixOwnedDiag(hypre_AMGDDCompGridA(
+                                                                             compGrid))),
                       hypre_CSRMatrixJ(hypre_AMGDDCompGridMatrixOwnedDiag(hypre_AMGDDCompGridA(compGrid))),
                       hypre_CSRMatrixData(hypre_AMGDDCompGridMatrixOwnedDiag(hypre_AMGDDCompGridA(compGrid))),
                       hypre_AMGDDCompGridOwnedRelaxOrdering(compGrid),
@@ -443,7 +459,8 @@ hypre_BoomerAMGDD_FAC_OrderedGaussSeidel( void       *amgdd_vdata,
       hypre_AMGDDCompGridNonOwnedRelaxOrdering(compGrid) = hypre_CTAlloc(HYPRE_Int,
                                                                          hypre_AMGDDCompGridNumNonOwnedNodes(compGrid),
                                                                          hypre_AMGDDCompGridMemoryLocation(compGrid));
-      hypre_topo_sort(hypre_CSRMatrixI(hypre_AMGDDCompGridMatrixNonOwnedDiag(hypre_AMGDDCompGridA(compGrid))),
+      hypre_topo_sort(hypre_CSRMatrixI(hypre_AMGDDCompGridMatrixNonOwnedDiag(hypre_AMGDDCompGridA(
+                                                                                compGrid))),
                       hypre_CSRMatrixJ(hypre_AMGDDCompGridMatrixNonOwnedDiag(hypre_AMGDDCompGridA(compGrid))),
                       hypre_CSRMatrixData(hypre_AMGDDCompGridMatrixNonOwnedDiag(hypre_AMGDDCompGridA(compGrid))),
                       hypre_AMGDDCompGridNonOwnedRelaxOrdering(compGrid),
@@ -461,7 +478,8 @@ hypre_BoomerAMGDD_FAC_OrderedGaussSeidel( void       *amgdd_vdata,
    hypre_CSRMatrix *nonowned_offd   = hypre_AMGDDCompGridMatrixNonOwnedOffd(A);
 
    // Do Gauss-Seidel relaxation on the nonowned real nodes
-   for (unordered_i = 0; unordered_i < hypre_AMGDDCompGridNumNonOwnedRealNodes(compGrid); unordered_i++)
+   for (unordered_i = 0; unordered_i < hypre_AMGDDCompGridNumNonOwnedRealNodes(compGrid);
+        unordered_i++)
    {
       i = hypre_AMGDDCompGridNonOwnedRelaxOrdering(compGrid)[unordered_i];
 
@@ -470,7 +488,7 @@ hypre_BoomerAMGDD_FAC_OrderedGaussSeidel( void       *amgdd_vdata,
       diagonal = 0.0;
 
       // Loop over diag entries
-      for (j = hypre_CSRMatrixI(nonowned_diag)[i]; j < hypre_CSRMatrixI(nonowned_diag)[i+1]; j++)
+      for (j = hypre_CSRMatrixI(nonowned_diag)[i]; j < hypre_CSRMatrixI(nonowned_diag)[i + 1]; j++)
       {
          if (hypre_CSRMatrixJ(nonowned_diag)[j] == i)
          {
@@ -478,20 +496,23 @@ hypre_BoomerAMGDD_FAC_OrderedGaussSeidel( void       *amgdd_vdata,
          }
          else
          {
-            u_nonowned_data[i] -= hypre_CSRMatrixData(nonowned_diag)[j] * u_nonowned_data[ hypre_CSRMatrixJ(nonowned_diag)[j] ];
+            u_nonowned_data[i] -= hypre_CSRMatrixData(nonowned_diag)[j] * u_nonowned_data[ hypre_CSRMatrixJ(
+                                                                                              nonowned_diag)[j] ];
          }
       }
 
       // Loop over offd entries
-      for (j = hypre_CSRMatrixI(nonowned_offd)[i]; j < hypre_CSRMatrixI(nonowned_offd)[i+1]; j++)
+      for (j = hypre_CSRMatrixI(nonowned_offd)[i]; j < hypre_CSRMatrixI(nonowned_offd)[i + 1]; j++)
       {
-         u_nonowned_data[i] -= hypre_CSRMatrixData(nonowned_offd)[j] * u_owned_data[ hypre_CSRMatrixJ(nonowned_offd)[j] ];
+         u_nonowned_data[i] -= hypre_CSRMatrixData(nonowned_offd)[j] * u_owned_data[ hypre_CSRMatrixJ(
+                                                                                        nonowned_offd)[j] ];
       }
 
       // Divide by diagonal
       if (diagonal == 0.0)
       {
-          hypre_error_w_msg(HYPRE_ERROR_GENERIC,"WARNING: Divide by zero diagonal in hypre_BoomerAMGDD_FAC_OrderedGaussSeidel().\n");
+         hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                           "WARNING: Divide by zero diagonal in hypre_BoomerAMGDD_FAC_OrderedGaussSeidel().\n");
       }
       u_nonowned_data[i] /= diagonal;
    }
@@ -506,7 +527,7 @@ hypre_BoomerAMGDD_FAC_OrderedGaussSeidel( void       *amgdd_vdata,
       diagonal = 0.0;
 
       // Loop over diag entries
-      for (j = hypre_CSRMatrixI(owned_diag)[i]; j < hypre_CSRMatrixI(owned_diag)[i+1]; j++)
+      for (j = hypre_CSRMatrixI(owned_diag)[i]; j < hypre_CSRMatrixI(owned_diag)[i + 1]; j++)
       {
          if (hypre_CSRMatrixJ(owned_diag)[j] == i)
          {
@@ -514,20 +535,23 @@ hypre_BoomerAMGDD_FAC_OrderedGaussSeidel( void       *amgdd_vdata,
          }
          else
          {
-            u_owned_data[i] -= hypre_CSRMatrixData(owned_diag)[j] * u_owned_data[ hypre_CSRMatrixJ(owned_diag)[j] ];
+            u_owned_data[i] -= hypre_CSRMatrixData(owned_diag)[j] * u_owned_data[ hypre_CSRMatrixJ(
+                                                                                     owned_diag)[j] ];
          }
       }
 
       // Loop over offd entries
-      for (j = hypre_CSRMatrixI(owned_offd)[i]; j < hypre_CSRMatrixI(owned_offd)[i+1]; j++)
+      for (j = hypre_CSRMatrixI(owned_offd)[i]; j < hypre_CSRMatrixI(owned_offd)[i + 1]; j++)
       {
-         u_owned_data[i] -= hypre_CSRMatrixData(owned_offd)[j] * u_nonowned_data[ hypre_CSRMatrixJ(owned_offd)[j] ];
+         u_owned_data[i] -= hypre_CSRMatrixData(owned_offd)[j] * u_nonowned_data[ hypre_CSRMatrixJ(
+                                                                                     owned_offd)[j] ];
       }
 
       // Divide by diagonal
       if (diagonal == 0.0)
       {
-         hypre_error_w_msg(HYPRE_ERROR_GENERIC,"WARNING: Divide by zero diagonal in hypre_BoomerAMGDD_FAC_OrderedGaussSeidel().\n");
+         hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                           "WARNING: Divide by zero diagonal in hypre_BoomerAMGDD_FAC_OrderedGaussSeidel().\n");
       }
       u_owned_data[i] /= diagonal;
    }
@@ -540,7 +564,7 @@ hypre_BoomerAMGDD_FAC_CFL1Jacobi( void      *amgdd_vdata,
                                   HYPRE_Int  level,
                                   HYPRE_Int  cycle_param )
 {
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
    hypre_ParAMGDDData      *amgdd_data      = (hypre_ParAMGDDData*) amgdd_vdata;
    hypre_AMGDDCompGrid     *compGrid        = hypre_ParAMGDDDataCompGrid(amgdd_data)[level];
    HYPRE_MemoryLocation     memory_location = hypre_AMGDDCompGridMemoryLocation(compGrid);
@@ -595,15 +619,23 @@ hypre_BoomerAMGDD_FAC_CFL1JacobiHost( void      *amgdd_vdata,
    hypre_AMGDDCompGrid  *compGrid     = hypre_ParAMGDDDataCompGrid(amgdd_data)[level];
    HYPRE_Real            relax_weight = hypre_ParAMGDDDataFACRelaxWeight(amgdd_data);
 
-   hypre_CSRMatrix      *owned_diag    = hypre_AMGDDCompGridMatrixOwnedDiag(hypre_AMGDDCompGridA(compGrid));
-   hypre_CSRMatrix      *owned_offd    = hypre_AMGDDCompGridMatrixOwnedOffd(hypre_AMGDDCompGridA(compGrid));
-   hypre_CSRMatrix      *nonowned_diag = hypre_AMGDDCompGridMatrixNonOwnedDiag(hypre_AMGDDCompGridA(compGrid));
-   hypre_CSRMatrix      *nonowned_offd = hypre_AMGDDCompGridMatrixNonOwnedOffd(hypre_AMGDDCompGridA(compGrid));
-
-   HYPRE_Complex        *owned_u       = hypre_VectorData(hypre_AMGDDCompGridVectorOwned(hypre_AMGDDCompGridU(compGrid)));
-   HYPRE_Complex        *nonowned_u    = hypre_VectorData(hypre_AMGDDCompGridVectorNonOwned(hypre_AMGDDCompGridU(compGrid)));
-   HYPRE_Complex        *owned_f       = hypre_VectorData(hypre_AMGDDCompGridVectorOwned(hypre_AMGDDCompGridF(compGrid)));
-   HYPRE_Complex        *nonowned_f    = hypre_VectorData(hypre_AMGDDCompGridVectorNonOwned(hypre_AMGDDCompGridF(compGrid)));
+   hypre_CSRMatrix      *owned_diag    = hypre_AMGDDCompGridMatrixOwnedDiag(hypre_AMGDDCompGridA(
+                                                                               compGrid));
+   hypre_CSRMatrix      *owned_offd    = hypre_AMGDDCompGridMatrixOwnedOffd(hypre_AMGDDCompGridA(
+                                                                               compGrid));
+   hypre_CSRMatrix      *nonowned_diag = hypre_AMGDDCompGridMatrixNonOwnedDiag(hypre_AMGDDCompGridA(
+                                                                                  compGrid));
+   hypre_CSRMatrix      *nonowned_offd = hypre_AMGDDCompGridMatrixNonOwnedOffd(hypre_AMGDDCompGridA(
+                                                                                  compGrid));
+
+   HYPRE_Complex        *owned_u       = hypre_VectorData(hypre_AMGDDCompGridVectorOwned(
+                                                             hypre_AMGDDCompGridU(compGrid)));
+   HYPRE_Complex        *nonowned_u    = hypre_VectorData(hypre_AMGDDCompGridVectorNonOwned(
+                                                             hypre_AMGDDCompGridU(compGrid)));
+   HYPRE_Complex        *owned_f       = hypre_VectorData(hypre_AMGDDCompGridVectorOwned(
+                                                             hypre_AMGDDCompGridF(compGrid)));
+   HYPRE_Complex        *nonowned_f    = hypre_VectorData(hypre_AMGDDCompGridVectorNonOwned(
+                                                             hypre_AMGDDCompGridF(compGrid)));
 
    HYPRE_Real           *l1_norms      = hypre_AMGDDCompGridL1Norms(compGrid);
    HYPRE_Int            *cf_marker     = hypre_AMGDDCompGridCFMarkerArray(compGrid);
@@ -614,9 +646,9 @@ hypre_BoomerAMGDD_FAC_CFL1JacobiHost( void      *amgdd_vdata,
    HYPRE_Int             i, j;
    HYPRE_Real            res;
 
-  /*-----------------------------------------------------------------
-   * Create and initialize Temp2 vector if not done before.
-   *-----------------------------------------------------------------*/
+   /*-----------------------------------------------------------------
+    * Create and initialize Temp2 vector if not done before.
+    *-----------------------------------------------------------------*/
 
    if (!hypre_AMGDDCompGridTemp2(compGrid))
    {
@@ -627,14 +659,15 @@ hypre_BoomerAMGDD_FAC_CFL1JacobiHost( void      *amgdd_vdata,
                                           hypre_AMGDDCompGridNumNonOwnedRealNodes(compGrid));
    }
    owned_tmp    = hypre_VectorData(hypre_AMGDDCompGridVectorOwned(hypre_AMGDDCompGridTemp2(compGrid)));
-   nonowned_tmp = hypre_VectorData(hypre_AMGDDCompGridVectorNonOwned(hypre_AMGDDCompGridTemp2(compGrid)));
+   nonowned_tmp = hypre_VectorData(hypre_AMGDDCompGridVectorNonOwned(hypre_AMGDDCompGridTemp2(
+                                                                        compGrid)));
 
-  /*-----------------------------------------------------------------
-   * Copy current approximation into temporary vector.
-   *-----------------------------------------------------------------*/
+   /*-----------------------------------------------------------------
+    * Copy current approximation into temporary vector.
+    *-----------------------------------------------------------------*/
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
    for (i = 0; i < hypre_AMGDDCompGridNumOwnedNodes(compGrid); i++)
    {
@@ -642,7 +675,7 @@ hypre_BoomerAMGDD_FAC_CFL1JacobiHost( void      *amgdd_vdata,
    }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
    for (i = 0; i < hypre_AMGDDCompGridNumNonOwnedNodes(compGrid); i++)
    {
@@ -654,22 +687,22 @@ hypre_BoomerAMGDD_FAC_CFL1JacobiHost( void      *amgdd_vdata,
    *-----------------------------------------------------------------*/
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i,j,res) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i,j,res) HYPRE_SMP_SCHEDULE
 #endif
    for (i = 0; i < hypre_AMGDDCompGridNumOwnedNodes(compGrid); i++)
    {
       if (cf_marker[i] == relax_set)
       {
          res = owned_f[i];
-         for (j = hypre_CSRMatrixI(owned_diag)[i]; j < hypre_CSRMatrixI(owned_diag)[i+1]; j++)
+         for (j = hypre_CSRMatrixI(owned_diag)[i]; j < hypre_CSRMatrixI(owned_diag)[i + 1]; j++)
          {
             res -= hypre_CSRMatrixData(owned_diag)[j] * owned_tmp[ hypre_CSRMatrixJ(owned_diag)[j] ];
          }
-         for (j = hypre_CSRMatrixI(owned_offd)[i]; j < hypre_CSRMatrixI(owned_offd)[i+1]; j++)
+         for (j = hypre_CSRMatrixI(owned_offd)[i]; j < hypre_CSRMatrixI(owned_offd)[i + 1]; j++)
          {
             res -= hypre_CSRMatrixData(owned_offd)[j] * nonowned_tmp[ hypre_CSRMatrixJ(owned_offd)[j] ];
          }
-         owned_u[i] += (relax_weight * res)/l1_norms[i];
+         owned_u[i] += (relax_weight * res) / l1_norms[i];
       }
    }
    for (i = 0; i < hypre_AMGDDCompGridNumNonOwnedRealNodes(compGrid); i++)
@@ -677,15 +710,15 @@ hypre_BoomerAMGDD_FAC_CFL1JacobiHost( void      *amgdd_vdata,
       if (cf_marker[i + hypre_AMGDDCompGridNumOwnedNodes(compGrid)] == relax_set)
       {
          res = nonowned_f[i];
-         for (j = hypre_CSRMatrixI(nonowned_diag)[i]; j < hypre_CSRMatrixI(nonowned_diag)[i+1]; j++)
+         for (j = hypre_CSRMatrixI(nonowned_diag)[i]; j < hypre_CSRMatrixI(nonowned_diag)[i + 1]; j++)
          {
             res -= hypre_CSRMatrixData(nonowned_diag)[j] * nonowned_tmp[ hypre_CSRMatrixJ(nonowned_diag)[j] ];
          }
-         for (j = hypre_CSRMatrixI(nonowned_offd)[i]; j < hypre_CSRMatrixI(nonowned_offd)[i+1]; j++)
+         for (j = hypre_CSRMatrixI(nonowned_offd)[i]; j < hypre_CSRMatrixI(nonowned_offd)[i + 1]; j++)
          {
             res -= hypre_CSRMatrixData(nonowned_offd)[j] * owned_tmp[ hypre_CSRMatrixJ(nonowned_offd)[j] ];
          }
-         nonowned_u[i] += (relax_weight * res)/l1_norms[i + hypre_AMGDDCompGridNumOwnedNodes(compGrid)];
+         nonowned_u[i] += (relax_weight * res) / l1_norms[i + hypre_AMGDDCompGridNumOwnedNodes(compGrid)];
       }
    }
 
diff --git a/external/hypre/src/parcsr_ls/par_amgdd_fac_cycle_device.c b/external/hypre/src/parcsr_ls/par_amgdd_fac_cycle_device.c
index 1217720e..58f352eb 100644
--- a/external/hypre/src/parcsr_ls/par_amgdd_fac_cycle_device.c
+++ b/external/hypre/src/parcsr_ls/par_amgdd_fac_cycle_device.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -8,7 +8,7 @@
 #include "_hypre_parcsr_ls.h"
 #include "_hypre_utilities.hpp"
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
 
 HYPRE_Int
 hypre_BoomerAMGDD_FAC_JacobiDevice( void     *amgdd_vdata,
@@ -39,9 +39,9 @@ hypre_BoomerAMGDD_FAC_JacobiDevice( void     *amgdd_vdata,
 
       for (i = 0; i < hypre_AMGDDCompGridNumOwnedNodes(compGrid); i++)
       {
-         for (j = hypre_CSRMatrixI(diag)[i]; j < hypre_CSRMatrixI(diag)[i+1]; j++)
+         for (j = hypre_CSRMatrixI(diag)[i]; j < hypre_CSRMatrixI(diag)[i + 1]; j++)
          {
-            // hypre_AMGDDCompGridL1Norms(compGrid)[i] += fabs(hypre_CSRMatrixData(diag)[j]);
+            // hypre_AMGDDCompGridL1Norms(compGrid)[i] += hypre_abs(hypre_CSRMatrixData(diag)[j]);
             if (hypre_CSRMatrixJ(diag)[j] == i)
             {
                hypre_AMGDDCompGridL1Norms(compGrid)[i] = hypre_CSRMatrixData(diag)[j];
@@ -52,12 +52,13 @@ hypre_BoomerAMGDD_FAC_JacobiDevice( void     *amgdd_vdata,
       diag = hypre_AMGDDCompGridMatrixNonOwnedDiag(A);
       for (i = 0; i < hypre_AMGDDCompGridNumNonOwnedRealNodes(compGrid); i++)
       {
-         for (j = hypre_CSRMatrixI(diag)[i]; j < hypre_CSRMatrixI(diag)[i+1]; j++)
+         for (j = hypre_CSRMatrixI(diag)[i]; j < hypre_CSRMatrixI(diag)[i + 1]; j++)
          {
-            // hypre_AMGDDCompGridL1Norms(compGrid)[i + hypre_AMGDDCompGridNumOwnedNodes(compGrid)] += fabs(hypre_CSRMatrixData(diag)[j]);
+            // hypre_AMGDDCompGridL1Norms(compGrid)[i + hypre_AMGDDCompGridNumOwnedNodes(compGrid)] += hypre_abs(hypre_CSRMatrixData(diag)[j]);
             if (hypre_CSRMatrixJ(diag)[j] == i)
             {
-               hypre_AMGDDCompGridL1Norms(compGrid)[i + hypre_AMGDDCompGridNumOwnedNodes(compGrid)] = hypre_CSRMatrixData(diag)[j];
+               hypre_AMGDDCompGridL1Norms(compGrid)[i + hypre_AMGDDCompGridNumOwnedNodes(
+                                                       compGrid)] = hypre_CSRMatrixData(diag)[j];
             }
          }
       }
@@ -98,8 +99,10 @@ hypre_BoomerAMGDD_FAC_CFL1JacobiDevice( void      *amgdd_vdata,
    hypre_ParAMGDDData    *amgdd_data      = (hypre_ParAMGDDData*) amgdd_vdata;
    hypre_AMGDDCompGrid   *compGrid        = hypre_ParAMGDDDataCompGrid(amgdd_data)[level];
    HYPRE_Real             relax_weight    = hypre_ParAMGDDDataFACRelaxWeight(amgdd_data);
-   hypre_Vector          *owned_u         = hypre_AMGDDCompGridVectorOwned(hypre_AMGDDCompGridU(compGrid));
-   hypre_Vector          *nonowned_u      = hypre_AMGDDCompGridVectorNonOwned(hypre_AMGDDCompGridU(compGrid));
+   hypre_Vector          *owned_u         = hypre_AMGDDCompGridVectorOwned(hypre_AMGDDCompGridU(
+                                                                              compGrid));
+   hypre_Vector          *nonowned_u      = hypre_AMGDDCompGridVectorNonOwned(hypre_AMGDDCompGridU(
+                                                                                 compGrid));
    HYPRE_Int              num_owned       = hypre_AMGDDCompGridNumOwnedNodes(compGrid);
    HYPRE_Int              num_nonowned    = hypre_AMGDDCompGridNumNonOwnedNodes(compGrid);
    HYPRE_Int              num_nonowned_r  = hypre_AMGDDCompGridNumNonOwnedRealNodes(compGrid);
@@ -146,4 +149,4 @@ hypre_BoomerAMGDD_FAC_CFL1JacobiDevice( void      *amgdd_vdata,
    return hypre_error_flag;
 }
 
-#endif // defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#endif // defined(HYPRE_USING_GPU)
diff --git a/external/hypre/src/parcsr_ls/par_amgdd_helpers.c b/external/hypre/src/parcsr_ls/par_amgdd_helpers.c
index 75b71ffa..26645f35 100644
--- a/external/hypre/src/parcsr_ls/par_amgdd_helpers.c
+++ b/external/hypre/src/parcsr_ls/par_amgdd_helpers.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -20,7 +20,8 @@ hypre_BoomerAMGDD_LocalToGlobalIndex( hypre_AMGDDCompGrid *compGrid,
    {
       local_index = -(local_index + 1);
    }
-   else if (local_index >= hypre_AMGDDCompGridNumOwnedNodes(compGrid) + hypre_AMGDDCompGridNumNonOwnedNodes(compGrid))
+   else if (local_index >= hypre_AMGDDCompGridNumOwnedNodes(compGrid) +
+            hypre_AMGDDCompGridNumNonOwnedNodes(compGrid))
    {
       local_index -= hypre_AMGDDCompGridNumOwnedNodes(compGrid) +
                      hypre_AMGDDCompGridNumNonOwnedNodes(compGrid);
@@ -32,7 +33,8 @@ hypre_BoomerAMGDD_LocalToGlobalIndex( hypre_AMGDDCompGrid *compGrid,
    }
    else
    {
-      return hypre_AMGDDCompGridNonOwnedGlobalIndices(compGrid)[local_index - hypre_AMGDDCompGridNumOwnedNodes(compGrid)];
+      return hypre_AMGDDCompGridNonOwnedGlobalIndices(compGrid)[local_index -
+                                                                            hypre_AMGDDCompGridNumOwnedNodes(compGrid)];
    }
 }
 
@@ -46,8 +48,8 @@ hypre_BoomerAMGDD_GetDofRecvProc( HYPRE_Int neighbor_local_index,
    HYPRE_Int i;
    for (i = 0; i < hypre_ParCSRCommPkgNumRecvs(commPkg); i++)
    {
-      if (neighbor_local_index >= hypre_ParCSRCommPkgRecvVecStart(commPkg,i) &&
-          neighbor_local_index < hypre_ParCSRCommPkgRecvVecStart(commPkg,i+1))
+      if (neighbor_local_index >= hypre_ParCSRCommPkgRecvVecStart(commPkg, i) &&
+          neighbor_local_index < hypre_ParCSRCommPkgRecvVecStart(commPkg, i + 1))
       {
          /* recv_proc = hypre_ParCSRCommPkgRecvProc(commPkg,i); */
          recv_proc = i;
@@ -72,7 +74,7 @@ hypre_BoomerAMGDD_RecursivelyFindNeighborNodes( HYPRE_Int            dof_index,
    HYPRE_Int         i;
 
    // Look at diag neighbors
-   for (i = hypre_CSRMatrixI(diag)[dof_index]; i < hypre_CSRMatrixI(diag)[dof_index+1]; i++)
+   for (i = hypre_CSRMatrixI(diag)[dof_index]; i < hypre_CSRMatrixI(diag)[dof_index + 1]; i++)
    {
       // Get the index of the neighbor
       neighbor_index = hypre_CSRMatrixJ(diag)[i];
@@ -86,13 +88,14 @@ hypre_BoomerAMGDD_RecursivelyFindNeighborNodes( HYPRE_Int            dof_index,
          add_flag[neighbor_index] = distance;
          if (distance - 1 > 0)
          {
-            hypre_BoomerAMGDD_RecursivelyFindNeighborNodes(neighbor_index, distance-1, A, add_flag, add_flag_requests);
+            hypre_BoomerAMGDD_RecursivelyFindNeighborNodes(neighbor_index, distance - 1, A, add_flag,
+                                                           add_flag_requests);
          }
       }
    }
 
    // Look at offd neighbors
-   for (i = hypre_CSRMatrixI(offd)[dof_index]; i < hypre_CSRMatrixI(offd)[dof_index+1]; i++)
+   for (i = hypre_CSRMatrixI(offd)[dof_index]; i < hypre_CSRMatrixI(offd)[dof_index + 1]; i++)
    {
       neighbor_index = hypre_CSRMatrixJ(offd)[i];
 
@@ -130,7 +133,8 @@ hypre_BoomerAMGDD_AddToSendAndRequestDofs( hypre_ParCSRMatrix     *A,
    {
       if (add_flag[i])
       {
-         idx = hypre_UnorderedIntMapGet(send_dof_maps[send_proc], i); // Recall: key = local owned dof idx, data = idx into sendflag array
+         idx = hypre_UnorderedIntMapGet(send_dof_maps[send_proc],
+                                        i); // Recall: key = local owned dof idx, data = idx into sendflag array
          if (idx == -1)
          {
             idx = hypre_AMGDDCommPkgNumSendNodes(compGridCommPkg)[level][send_proc][level]++;
@@ -138,9 +142,11 @@ hypre_BoomerAMGDD_AddToSendAndRequestDofs( hypre_ParCSRMatrix     *A,
             if (idx == send_dof_capacities[send_proc])
             {
                send_dof_capacities[send_proc] *= 2;
-               hypre_AMGDDCommPkgSendFlag(compGridCommPkg)[level][send_proc][level] = hypre_TReAlloc(hypre_AMGDDCommPkgSendFlag(compGridCommPkg)[level][send_proc][level],
-                     HYPRE_Int, send_dof_capacities[send_proc], HYPRE_MEMORY_HOST);
-               distances[send_proc] = hypre_TReAlloc(distances[send_proc], HYPRE_Int, send_dof_capacities[send_proc], HYPRE_MEMORY_HOST);
+               hypre_AMGDDCommPkgSendFlag(compGridCommPkg)[level][send_proc][level] = hypre_TReAlloc(
+                                                                                         hypre_AMGDDCommPkgSendFlag(compGridCommPkg)[level][send_proc][level],
+                                                                                         HYPRE_Int, send_dof_capacities[send_proc], HYPRE_MEMORY_HOST);
+               distances[send_proc] = hypre_TReAlloc(distances[send_proc], HYPRE_Int,
+                                                     send_dof_capacities[send_proc], HYPRE_MEMORY_HOST);
             }
             hypre_AMGDDCommPkgSendFlag(compGridCommPkg)[level][send_proc][level][idx] = i;
             distances[send_proc][idx] = add_flag[i];
@@ -163,7 +169,8 @@ hypre_BoomerAMGDD_AddToSendAndRequestDofs( hypre_ParCSRMatrix     *A,
       if (add_flag_requests[i])
       {
          recv_proc = hypre_BoomerAMGDD_GetDofRecvProc(i, A);
-         if (hypre_AMGDDCommPkgRecvProcs(compGridCommPkg)[level][recv_proc] != hypre_AMGDDCommPkgSendProcs(compGridCommPkg)[level][send_proc])
+         if (hypre_AMGDDCommPkgRecvProcs(compGridCommPkg)[level][recv_proc] != hypre_AMGDDCommPkgSendProcs(
+                compGridCommPkg)[level][send_proc])
          {
             num_req_dofs[recv_proc][send_proc]++;
          }
@@ -175,13 +182,16 @@ hypre_BoomerAMGDD_AddToSendAndRequestDofs( hypre_ParCSRMatrix     *A,
       {
          if (req_dofs[i][send_proc])
          {
-            req_dofs[i][send_proc] = hypre_TReAlloc(req_dofs[i][send_proc], HYPRE_Int, num_req_dofs[i][send_proc], HYPRE_MEMORY_HOST);
-            req_dof_dist[i][send_proc] = hypre_TReAlloc(req_dof_dist[i][send_proc], HYPRE_Int, num_req_dofs[i][send_proc], HYPRE_MEMORY_HOST);
+            req_dofs[i][send_proc] = hypre_TReAlloc(req_dofs[i][send_proc], HYPRE_Int,
+                                                    num_req_dofs[i][send_proc], HYPRE_MEMORY_HOST);
+            req_dof_dist[i][send_proc] = hypre_TReAlloc(req_dof_dist[i][send_proc], HYPRE_Int,
+                                                        num_req_dofs[i][send_proc], HYPRE_MEMORY_HOST);
          }
          else
          {
             req_dofs[i][send_proc] = hypre_CTAlloc(HYPRE_Int, num_req_dofs[i][send_proc], HYPRE_MEMORY_HOST);
-            req_dof_dist[i][send_proc] = hypre_CTAlloc(HYPRE_Int, num_req_dofs[i][send_proc], HYPRE_MEMORY_HOST);
+            req_dof_dist[i][send_proc] = hypre_CTAlloc(HYPRE_Int, num_req_dofs[i][send_proc],
+                                                       HYPRE_MEMORY_HOST);
          }
       }
    }
@@ -192,7 +202,8 @@ hypre_BoomerAMGDD_AddToSendAndRequestDofs( hypre_ParCSRMatrix     *A,
       {
          neighbor_global_index = hypre_ParCSRMatrixColMapOffd(A)[i];
          recv_proc = hypre_BoomerAMGDD_GetDofRecvProc(i, A);
-         if (hypre_AMGDDCommPkgRecvProcs(compGridCommPkg)[level][recv_proc] != hypre_AMGDDCommPkgSendProcs(compGridCommPkg)[level][send_proc])
+         if (hypre_AMGDDCommPkgRecvProcs(compGridCommPkg)[level][recv_proc] != hypre_AMGDDCommPkgSendProcs(
+                compGridCommPkg)[level][send_proc])
          {
             req_dofs[recv_proc][send_proc][ req_cnt[recv_proc] ] = neighbor_global_index;
             req_dof_dist[recv_proc][send_proc][ req_cnt[recv_proc] ] = add_flag_requests[i];
@@ -239,13 +250,17 @@ hypre_BoomerAMGDD_FindNeighborProcessors( hypre_ParCSRMatrix      *A,
    HYPRE_Int ***req_dof_dist = hypre_CTAlloc(HYPRE_Int**, csr_num_recvs, HYPRE_MEMORY_HOST);
    for (i = 0; i < csr_num_recvs; i++)
    {
-      num_req_dofs[i] = hypre_CTAlloc(HYPRE_Int, hypre_AMGDDCommPkgNumSendProcs(compGridCommPkg)[level], HYPRE_MEMORY_HOST);
-      req_dofs[i] = hypre_CTAlloc(HYPRE_Int*, hypre_AMGDDCommPkgNumSendProcs(compGridCommPkg)[level], HYPRE_MEMORY_HOST);
-      req_dof_dist[i] = hypre_CTAlloc(HYPRE_Int*, hypre_AMGDDCommPkgNumSendProcs(compGridCommPkg)[level], HYPRE_MEMORY_HOST);
+      num_req_dofs[i] = hypre_CTAlloc(HYPRE_Int, hypre_AMGDDCommPkgNumSendProcs(compGridCommPkg)[level],
+                                      HYPRE_MEMORY_HOST);
+      req_dofs[i] = hypre_CTAlloc(HYPRE_Int*, hypre_AMGDDCommPkgNumSendProcs(compGridCommPkg)[level],
+                                  HYPRE_MEMORY_HOST);
+      req_dof_dist[i] = hypre_CTAlloc(HYPRE_Int*, hypre_AMGDDCommPkgNumSendProcs(compGridCommPkg)[level],
+                                      HYPRE_MEMORY_HOST);
    }
 
    HYPRE_Int *add_flag = hypre_CTAlloc(HYPRE_Int, hypre_ParCSRMatrixNumRows(A), HYPRE_MEMORY_HOST);
-   HYPRE_Int *add_flag_requests = hypre_CTAlloc(HYPRE_Int, hypre_CSRMatrixNumCols(hypre_ParCSRMatrixOffd(A)), HYPRE_MEMORY_HOST);
+   HYPRE_Int *add_flag_requests = hypre_CTAlloc(HYPRE_Int,
+                                                hypre_CSRMatrixNumCols(hypre_ParCSRMatrixOffd(A)), HYPRE_MEMORY_HOST);
 
    // Recursively search through the operator stencil to find longer distance neighboring dofs
    // Loop over longdistance send procs
@@ -265,17 +280,19 @@ hypre_BoomerAMGDD_FindNeighborProcessors( hypre_ParCSRMatrix      *A,
          {
             HYPRE_Int idx = starting_dofs[i][j];
             HYPRE_Int send_dof = hypre_AMGDDCommPkgSendFlag(compGridCommPkg)[level][i][level][idx];
-            hypre_BoomerAMGDD_RecursivelyFindNeighborNodes(send_dof, distances[i][idx]-1, A, add_flag, add_flag_requests);
+            hypre_BoomerAMGDD_RecursivelyFindNeighborNodes(send_dof, distances[i][idx] - 1, A, add_flag,
+                                                           add_flag_requests);
          }
          num_starting_dofs[i] = 0;
          hypre_TFree(starting_dofs[i], HYPRE_MEMORY_HOST);
          starting_dofs[i] = NULL;
          // Update the send flag and request dofs
          hypre_BoomerAMGDD_AddToSendAndRequestDofs(A, add_flag, add_flag_requests, level, i, compGridCommPkg,
-               distances, send_dof_maps, send_dof_capacities, csr_num_recvs, num_req_dofs, req_dofs, req_dof_dist);
+                                                   distances, send_dof_maps, send_dof_capacities, csr_num_recvs, num_req_dofs, req_dofs, req_dof_dist);
          // Reset add flags
          hypre_Memset(add_flag, 0, sizeof(HYPRE_Int)*hypre_ParCSRMatrixNumRows(A), HYPRE_MEMORY_HOST);
-         hypre_Memset(add_flag_requests, 0, sizeof(HYPRE_Int)*hypre_CSRMatrixNumCols(hypre_ParCSRMatrixOffd(A)), HYPRE_MEMORY_HOST);
+         hypre_Memset(add_flag_requests, 0,
+                      sizeof(HYPRE_Int)*hypre_CSRMatrixNumCols(hypre_ParCSRMatrixOffd(A)), HYPRE_MEMORY_HOST);
       }
    }
    hypre_TFree(add_flag, HYPRE_MEMORY_HOST);
@@ -288,16 +305,24 @@ hypre_BoomerAMGDD_FindNeighborProcessors( hypre_ParCSRMatrix      *A,
    //////////////////////////////////////////////////
 
    // Get the sizes
-   hypre_MPI_Request *requests = hypre_CTAlloc(hypre_MPI_Request, hypre_AMGDDCommPkgNumSendProcs(compGridCommPkg)[level] + hypre_AMGDDCommPkgNumRecvProcs(compGridCommPkg)[level], HYPRE_MEMORY_HOST);
-   hypre_MPI_Status *statuses = hypre_CTAlloc(hypre_MPI_Status, hypre_AMGDDCommPkgNumSendProcs(compGridCommPkg)[level] + hypre_AMGDDCommPkgNumRecvProcs(compGridCommPkg)[level], HYPRE_MEMORY_HOST);
+   hypre_MPI_Request *requests = hypre_CTAlloc(hypre_MPI_Request,
+                                               hypre_AMGDDCommPkgNumSendProcs(compGridCommPkg)[level] + hypre_AMGDDCommPkgNumRecvProcs(
+                                                  compGridCommPkg)[level], HYPRE_MEMORY_HOST);
+   hypre_MPI_Status *statuses = hypre_CTAlloc(hypre_MPI_Status,
+                                              hypre_AMGDDCommPkgNumSendProcs(compGridCommPkg)[level] + hypre_AMGDDCommPkgNumRecvProcs(
+                                                 compGridCommPkg)[level], HYPRE_MEMORY_HOST);
    HYPRE_Int request_cnt = 0;
 
-   HYPRE_Int *recv_sizes = hypre_CTAlloc(HYPRE_Int, hypre_AMGDDCommPkgNumRecvProcs(compGridCommPkg)[level], HYPRE_MEMORY_HOST);
+   HYPRE_Int *recv_sizes = hypre_CTAlloc(HYPRE_Int,
+                                         hypre_AMGDDCommPkgNumRecvProcs(compGridCommPkg)[level], HYPRE_MEMORY_HOST);
    for (i = 0; i < hypre_AMGDDCommPkgNumRecvProcs(compGridCommPkg)[level]; i++)
    {
-      hypre_MPI_Irecv(&(recv_sizes[i]), 1, HYPRE_MPI_INT, hypre_AMGDDCommPkgRecvProcs(compGridCommPkg)[level][i], 6, hypre_MPI_COMM_WORLD, &(requests[request_cnt++]));
+      hypre_MPI_Irecv(&(recv_sizes[i]), 1, HYPRE_MPI_INT,
+                      hypre_AMGDDCommPkgRecvProcs(compGridCommPkg)[level][i], 6, hypre_MPI_COMM_WORLD,
+                      &(requests[request_cnt++]));
    }
-   HYPRE_Int *send_sizes = hypre_CTAlloc(HYPRE_Int, hypre_AMGDDCommPkgNumSendProcs(compGridCommPkg)[level], HYPRE_MEMORY_HOST);
+   HYPRE_Int *send_sizes = hypre_CTAlloc(HYPRE_Int,
+                                         hypre_AMGDDCommPkgNumSendProcs(compGridCommPkg)[level], HYPRE_MEMORY_HOST);
    for (i = 0; i < hypre_AMGDDCommPkgNumSendProcs(compGridCommPkg)[level]; i++)
    {
       for (j = 0; j < csr_num_recvs; j++)
@@ -307,26 +332,37 @@ hypre_BoomerAMGDD_FindNeighborProcessors( hypre_ParCSRMatrix      *A,
             send_sizes[i]++;
          }
       }
-      hypre_MPI_Isend(&(send_sizes[i]), 1, HYPRE_MPI_INT, hypre_AMGDDCommPkgSendProcs(compGridCommPkg)[level][i], 6, hypre_MPI_COMM_WORLD, &(requests[request_cnt++]));
+      hypre_MPI_Isend(&(send_sizes[i]), 1, HYPRE_MPI_INT,
+                      hypre_AMGDDCommPkgSendProcs(compGridCommPkg)[level][i], 6, hypre_MPI_COMM_WORLD,
+                      &(requests[request_cnt++]));
    }
 
    // Wait
-   hypre_MPI_Waitall(hypre_AMGDDCommPkgNumSendProcs(compGridCommPkg)[level] + hypre_AMGDDCommPkgNumRecvProcs(compGridCommPkg)[level], requests, statuses);
+   hypre_MPI_Waitall(hypre_AMGDDCommPkgNumSendProcs(compGridCommPkg)[level] +
+                     hypre_AMGDDCommPkgNumRecvProcs(compGridCommPkg)[level], requests, statuses);
    hypre_TFree(requests, HYPRE_MEMORY_HOST);
    hypre_TFree(statuses, HYPRE_MEMORY_HOST);
-   requests = hypre_CTAlloc(hypre_MPI_Request, hypre_AMGDDCommPkgNumSendProcs(compGridCommPkg)[level] + hypre_AMGDDCommPkgNumRecvProcs(compGridCommPkg)[level], HYPRE_MEMORY_HOST);
-   statuses = hypre_CTAlloc(hypre_MPI_Status, hypre_AMGDDCommPkgNumSendProcs(compGridCommPkg)[level] + hypre_AMGDDCommPkgNumRecvProcs(compGridCommPkg)[level], HYPRE_MEMORY_HOST);
+   requests = hypre_CTAlloc(hypre_MPI_Request,
+                            hypre_AMGDDCommPkgNumSendProcs(compGridCommPkg)[level] + hypre_AMGDDCommPkgNumRecvProcs(
+                               compGridCommPkg)[level], HYPRE_MEMORY_HOST);
+   statuses = hypre_CTAlloc(hypre_MPI_Status,
+                            hypre_AMGDDCommPkgNumSendProcs(compGridCommPkg)[level] + hypre_AMGDDCommPkgNumRecvProcs(
+                               compGridCommPkg)[level], HYPRE_MEMORY_HOST);
    request_cnt = 0;
 
    // Allocate and post the recvs
-   HYPRE_Int **recv_buffers = hypre_CTAlloc(HYPRE_Int*, hypre_AMGDDCommPkgNumRecvProcs(compGridCommPkg)[level], HYPRE_MEMORY_HOST);
+   HYPRE_Int **recv_buffers = hypre_CTAlloc(HYPRE_Int*,
+                                            hypre_AMGDDCommPkgNumRecvProcs(compGridCommPkg)[level], HYPRE_MEMORY_HOST);
    for (i = 0; i < hypre_AMGDDCommPkgNumRecvProcs(compGridCommPkg)[level]; i++)
    {
       recv_buffers[i] = hypre_CTAlloc(HYPRE_Int, recv_sizes[i], HYPRE_MEMORY_HOST);
-      hypre_MPI_Irecv(recv_buffers[i], recv_sizes[i], HYPRE_MPI_INT, hypre_AMGDDCommPkgRecvProcs(compGridCommPkg)[level][i], 7, hypre_MPI_COMM_WORLD, &(requests[request_cnt++]));
+      hypre_MPI_Irecv(recv_buffers[i], recv_sizes[i], HYPRE_MPI_INT,
+                      hypre_AMGDDCommPkgRecvProcs(compGridCommPkg)[level][i], 7, hypre_MPI_COMM_WORLD,
+                      &(requests[request_cnt++]));
    }
    // Setup and send the send buffers
-   HYPRE_Int **send_buffers = hypre_CTAlloc(HYPRE_Int*, hypre_AMGDDCommPkgNumSendProcs(compGridCommPkg)[level], HYPRE_MEMORY_HOST);
+   HYPRE_Int **send_buffers = hypre_CTAlloc(HYPRE_Int*,
+                                            hypre_AMGDDCommPkgNumSendProcs(compGridCommPkg)[level], HYPRE_MEMORY_HOST);
    for (i = 0; i < hypre_AMGDDCommPkgNumSendProcs(compGridCommPkg)[level]; i++)
    {
       send_buffers[i] = hypre_CTAlloc(HYPRE_Int, send_sizes[i], HYPRE_MEMORY_HOST);
@@ -339,11 +375,14 @@ hypre_BoomerAMGDD_FindNeighborProcessors( hypre_ParCSRMatrix      *A,
          }
 
       }
-      hypre_MPI_Isend(send_buffers[i], send_sizes[i], HYPRE_MPI_INT, hypre_AMGDDCommPkgSendProcs(compGridCommPkg)[level][i], 7, hypre_MPI_COMM_WORLD, &(requests[request_cnt++]));
+      hypre_MPI_Isend(send_buffers[i], send_sizes[i], HYPRE_MPI_INT,
+                      hypre_AMGDDCommPkgSendProcs(compGridCommPkg)[level][i], 7, hypre_MPI_COMM_WORLD,
+                      &(requests[request_cnt++]));
    }
 
    // Wait
-   hypre_MPI_Waitall(hypre_AMGDDCommPkgNumSendProcs(compGridCommPkg)[level] + hypre_AMGDDCommPkgNumRecvProcs(compGridCommPkg)[level], requests, statuses);
+   hypre_MPI_Waitall(hypre_AMGDDCommPkgNumSendProcs(compGridCommPkg)[level] +
+                     hypre_AMGDDCommPkgNumRecvProcs(compGridCommPkg)[level], requests, statuses);
    hypre_TFree(requests, HYPRE_MEMORY_HOST);
    hypre_TFree(statuses, HYPRE_MEMORY_HOST);
 
@@ -370,9 +409,11 @@ hypre_BoomerAMGDD_FindNeighborProcessors( hypre_ParCSRMatrix      *A,
             if (hypre_AMGDDCommPkgNumRecvProcs(compGridCommPkg)[level] == recv_proc_capacity)
             {
                recv_proc_capacity *= 2;
-               hypre_AMGDDCommPkgRecvProcs(compGridCommPkg)[level] = hypre_TReAlloc(hypre_AMGDDCommPkgRecvProcs(compGridCommPkg)[level], HYPRE_Int, recv_proc_capacity, HYPRE_MEMORY_HOST);
+               hypre_AMGDDCommPkgRecvProcs(compGridCommPkg)[level] = hypre_TReAlloc(hypre_AMGDDCommPkgRecvProcs(
+                                                                                       compGridCommPkg)[level], HYPRE_Int, recv_proc_capacity, HYPRE_MEMORY_HOST);
             }
-            hypre_AMGDDCommPkgRecvProcs(compGridCommPkg)[level][ hypre_AMGDDCommPkgNumRecvProcs(compGridCommPkg)[level]++ ] = recv_buffers[i][j];
+            hypre_AMGDDCommPkgRecvProcs(compGridCommPkg)[level][ hypre_AMGDDCommPkgNumRecvProcs(
+                                                                    compGridCommPkg)[level]++ ] = recv_buffers[i][j];
          }
       }
    }
@@ -407,7 +448,8 @@ hypre_BoomerAMGDD_FindNeighborProcessors( hypre_ParCSRMatrix      *A,
    request_cnt = 0;
    for (i = 0; i < csr_num_sends; i++)
    {
-      hypre_MPI_Irecv(&(recv_sizes[i]), 1, HYPRE_MPI_INT, hypre_ParCSRCommPkgSendProc(commPkg,i), 4, hypre_MPI_COMM_WORLD, &(requests[request_cnt++]));
+      hypre_MPI_Irecv(&(recv_sizes[i]), 1, HYPRE_MPI_INT, hypre_ParCSRCommPkgSendProc(commPkg, i), 4,
+                      hypre_MPI_COMM_WORLD, &(requests[request_cnt++]));
    }
    for (i = 0; i < csr_num_recvs; i++)
    {
@@ -416,10 +458,11 @@ hypre_BoomerAMGDD_FindNeighborProcessors( hypre_ParCSRMatrix      *A,
       {
          if (num_req_dofs[i][j])
          {
-            send_sizes[i] += 2 + 2*num_req_dofs[i][j];
+            send_sizes[i] += 2 + 2 * num_req_dofs[i][j];
          }
       }
-      hypre_MPI_Isend(&(send_sizes[i]), 1, HYPRE_MPI_INT, hypre_ParCSRCommPkgRecvProc(commPkg,i), 4, hypre_MPI_COMM_WORLD, &(requests[request_cnt++]));
+      hypre_MPI_Isend(&(send_sizes[i]), 1, HYPRE_MPI_INT, hypre_ParCSRCommPkgRecvProc(commPkg, i), 4,
+                      hypre_MPI_COMM_WORLD, &(requests[request_cnt++]));
    }
 
    // Wait on the recv sizes, then free and re-allocate the requests and statuses
@@ -435,7 +478,8 @@ hypre_BoomerAMGDD_FindNeighborProcessors( hypre_ParCSRMatrix      *A,
    for (i = 0; i < csr_num_sends; i++)
    {
       recv_buffers[i] = hypre_CTAlloc(HYPRE_Int, recv_sizes[i], HYPRE_MEMORY_HOST);
-      hypre_MPI_Irecv(recv_buffers[i], recv_sizes[i], HYPRE_MPI_INT, hypre_ParCSRCommPkgSendProc(commPkg,i), 5, hypre_MPI_COMM_WORLD, &(requests[request_cnt++]));
+      hypre_MPI_Irecv(recv_buffers[i], recv_sizes[i], HYPRE_MPI_INT, hypre_ParCSRCommPkgSendProc(commPkg,
+                                                                                                 i), 5, hypre_MPI_COMM_WORLD, &(requests[request_cnt++]));
    }
 
    // Setup the send buffer and post the sends
@@ -458,7 +502,8 @@ hypre_BoomerAMGDD_FindNeighborProcessors( hypre_ParCSRMatrix      *A,
             }
          }
       }
-      hypre_MPI_Isend(send_buffers[i], send_sizes[i], HYPRE_MPI_INT, hypre_ParCSRCommPkgRecvProc(commPkg,i), 5, hypre_MPI_COMM_WORLD, &(requests[request_cnt++]));
+      hypre_MPI_Isend(send_buffers[i], send_sizes[i], HYPRE_MPI_INT, hypre_ParCSRCommPkgRecvProc(commPkg,
+                                                                                                 i), 5, hypre_MPI_COMM_WORLD, &(requests[request_cnt++]));
    }
    // Free the req dof info
    for (i = 0; i < csr_num_recvs; i++)
@@ -515,24 +560,35 @@ hypre_BoomerAMGDD_FindNeighborProcessors( hypre_ParCSRMatrix      *A,
             if (p_idx == send_proc_capacity)
             {
                send_proc_capacity *= 2;
-               hypre_AMGDDCommPkgSendProcs(compGridCommPkg)[level] = hypre_TReAlloc(hypre_AMGDDCommPkgSendProcs(compGridCommPkg)[level], HYPRE_Int, send_proc_capacity, HYPRE_MEMORY_HOST);
-               hypre_AMGDDCommPkgSendFlag(compGridCommPkg)[level] = hypre_TReAlloc(hypre_AMGDDCommPkgSendFlag(compGridCommPkg)[level], HYPRE_Int**, send_proc_capacity, HYPRE_MEMORY_HOST);
-               hypre_AMGDDCommPkgNumSendNodes(compGridCommPkg)[level] = hypre_TReAlloc(hypre_AMGDDCommPkgNumSendNodes(compGridCommPkg)[level], HYPRE_Int*, send_proc_capacity, HYPRE_MEMORY_HOST);
+               hypre_AMGDDCommPkgSendProcs(compGridCommPkg)[level] = hypre_TReAlloc(hypre_AMGDDCommPkgSendProcs(
+                                                                                       compGridCommPkg)[level], HYPRE_Int, send_proc_capacity, HYPRE_MEMORY_HOST);
+               hypre_AMGDDCommPkgSendFlag(compGridCommPkg)[level] = hypre_TReAlloc(hypre_AMGDDCommPkgSendFlag(
+                                                                                      compGridCommPkg)[level], HYPRE_Int**, send_proc_capacity, HYPRE_MEMORY_HOST);
+               hypre_AMGDDCommPkgNumSendNodes(compGridCommPkg)[level] = hypre_TReAlloc(
+                                                                           hypre_AMGDDCommPkgNumSendNodes(compGridCommPkg)[level], HYPRE_Int*, send_proc_capacity,
+                                                                           HYPRE_MEMORY_HOST);
                starting_dofs = hypre_TReAlloc(starting_dofs, HYPRE_Int*, send_proc_capacity, HYPRE_MEMORY_HOST);
-               num_starting_dofs = hypre_TReAlloc(num_starting_dofs, HYPRE_Int, send_proc_capacity, HYPRE_MEMORY_HOST);
-               send_dof_capacities = hypre_TReAlloc(send_dof_capacities, HYPRE_Int, send_proc_capacity, HYPRE_MEMORY_HOST);
-               distances = hypre_TReAlloc(distances , HYPRE_Int*, send_proc_capacity, HYPRE_MEMORY_HOST);
-               send_dof_maps = hypre_TReAlloc(send_dof_maps, hypre_UnorderedIntMap*, send_proc_capacity, HYPRE_MEMORY_HOST);
+               num_starting_dofs = hypre_TReAlloc(num_starting_dofs, HYPRE_Int, send_proc_capacity,
+                                                  HYPRE_MEMORY_HOST);
+               send_dof_capacities = hypre_TReAlloc(send_dof_capacities, HYPRE_Int, send_proc_capacity,
+                                                    HYPRE_MEMORY_HOST);
+               distances = hypre_TReAlloc(distances, HYPRE_Int*, send_proc_capacity, HYPRE_MEMORY_HOST);
+               send_dof_maps = hypre_TReAlloc(send_dof_maps, hypre_UnorderedIntMap*, send_proc_capacity,
+                                              HYPRE_MEMORY_HOST);
             }
             hypre_AMGDDCommPkgNumSendProcs(compGridCommPkg)[level]++;
             hypre_AMGDDCommPkgSendProcs(compGridCommPkg)[level][p_idx] = proc_id;
-            hypre_AMGDDCommPkgSendFlag(compGridCommPkg)[level][p_idx] = hypre_CTAlloc(HYPRE_Int*, hypre_AMGDDCommPkgNumLevels(compGridCommPkg), HYPRE_MEMORY_HOST);
-            hypre_AMGDDCommPkgNumSendNodes(compGridCommPkg)[level][p_idx] = hypre_CTAlloc(HYPRE_Int, hypre_AMGDDCommPkgNumLevels(compGridCommPkg), HYPRE_MEMORY_HOST);
+            hypre_AMGDDCommPkgSendFlag(compGridCommPkg)[level][p_idx] = hypre_CTAlloc(HYPRE_Int*,
+                                                                                      hypre_AMGDDCommPkgNumLevels(compGridCommPkg), HYPRE_MEMORY_HOST);
+            hypre_AMGDDCommPkgNumSendNodes(compGridCommPkg)[level][p_idx] = hypre_CTAlloc(HYPRE_Int,
+                                                                                          hypre_AMGDDCommPkgNumLevels(compGridCommPkg), HYPRE_MEMORY_HOST);
             send_dof_capacities[p_idx] = num_requested_dofs;
-            hypre_AMGDDCommPkgSendFlag(compGridCommPkg)[level][p_idx][level] = hypre_CTAlloc(HYPRE_Int, send_dof_capacities[p_idx], HYPRE_MEMORY_HOST);
+            hypre_AMGDDCommPkgSendFlag(compGridCommPkg)[level][p_idx][level] = hypre_CTAlloc(HYPRE_Int,
+                                                                                             send_dof_capacities[p_idx], HYPRE_MEMORY_HOST);
             distances[p_idx] = hypre_CTAlloc(HYPRE_Int, send_dof_capacities[p_idx], HYPRE_MEMORY_HOST);
             send_dof_maps[p_idx] = hypre_CTAlloc(hypre_UnorderedIntMap, 1, HYPRE_MEMORY_HOST);
-            hypre_UnorderedIntMapCreate(send_dof_maps[p_idx], 2*max_distance*num_requested_dofs, 16*hypre_NumThreads()); // !!! Is this a "safe" upper bound on map size?
+            hypre_UnorderedIntMapCreate(send_dof_maps[p_idx], 2 * max_distance * num_requested_dofs,
+                                        16 * hypre_NumThreads()); // !!! Is this a "safe" upper bound on map size?
             starting_dofs[p_idx] = hypre_CTAlloc(HYPRE_Int, num_requested_dofs, HYPRE_MEMORY_HOST);
             num_starting_dofs[p_idx] = 0;
          }
@@ -540,7 +596,8 @@ hypre_BoomerAMGDD_FindNeighborProcessors( hypre_ParCSRMatrix      *A,
          {
             if (starting_dofs[p_idx])
             {
-               starting_dofs[p_idx] = hypre_TReAlloc(starting_dofs[p_idx], HYPRE_Int, num_starting_dofs[p_idx] + num_requested_dofs, HYPRE_MEMORY_HOST);
+               starting_dofs[p_idx] = hypre_TReAlloc(starting_dofs[p_idx], HYPRE_Int,
+                                                     num_starting_dofs[p_idx] + num_requested_dofs, HYPRE_MEMORY_HOST);
             }
             else
             {
@@ -570,9 +627,11 @@ hypre_BoomerAMGDD_FindNeighborProcessors( hypre_ParCSRMatrix      *A,
                if (d_idx == send_dof_capacities[p_idx])
                {
                   send_dof_capacities[p_idx] *= 2;
-                  hypre_AMGDDCommPkgSendFlag(compGridCommPkg)[level][p_idx][level] = hypre_TReAlloc(hypre_AMGDDCommPkgSendFlag(compGridCommPkg)[level][p_idx][level],
-                        HYPRE_Int, send_dof_capacities[p_idx], HYPRE_MEMORY_HOST);
-                  distances[p_idx] = hypre_TReAlloc(distances[p_idx], HYPRE_Int, send_dof_capacities[p_idx], HYPRE_MEMORY_HOST);
+                  hypre_AMGDDCommPkgSendFlag(compGridCommPkg)[level][p_idx][level] = hypre_TReAlloc(
+                                                                                        hypre_AMGDDCommPkgSendFlag(compGridCommPkg)[level][p_idx][level],
+                                                                                        HYPRE_Int, send_dof_capacities[p_idx], HYPRE_MEMORY_HOST);
+                  distances[p_idx] = hypre_TReAlloc(distances[p_idx], HYPRE_Int, send_dof_capacities[p_idx],
+                                                    HYPRE_MEMORY_HOST);
                }
                hypre_AMGDDCommPkgNumSendNodes(compGridCommPkg)[level][p_idx][level]++;
                hypre_AMGDDCommPkgSendFlag(compGridCommPkg)[level][p_idx][level][d_idx] = req_dof_local_index;
@@ -643,36 +702,43 @@ hypre_BoomerAMGDD_SetupNearestProcessorNeighbors( hypre_ParCSRMatrix *A,
    {
       // Initialize send info (send procs, send dofs, starting dofs, distances, map for lookups in send dofs)
       hypre_AMGDDCommPkgNumSendProcs(compGridCommPkg)[level] = csr_num_sends;
-      HYPRE_Int send_proc_capacity = 2*csr_num_sends;
-      hypre_AMGDDCommPkgSendProcs(compGridCommPkg)[level] = hypre_CTAlloc(HYPRE_Int, send_proc_capacity, HYPRE_MEMORY_HOST);
-      hypre_AMGDDCommPkgNumSendNodes(compGridCommPkg)[level] = hypre_CTAlloc(HYPRE_Int*, send_proc_capacity, HYPRE_MEMORY_HOST);
-      hypre_AMGDDCommPkgSendFlag(compGridCommPkg)[level] = hypre_CTAlloc(HYPRE_Int**, send_proc_capacity, HYPRE_MEMORY_HOST);
+      HYPRE_Int send_proc_capacity = 2 * csr_num_sends;
+      hypre_AMGDDCommPkgSendProcs(compGridCommPkg)[level] = hypre_CTAlloc(HYPRE_Int, send_proc_capacity,
+                                                                          HYPRE_MEMORY_HOST);
+      hypre_AMGDDCommPkgNumSendNodes(compGridCommPkg)[level] = hypre_CTAlloc(HYPRE_Int*,
+                                                                             send_proc_capacity, HYPRE_MEMORY_HOST);
+      hypre_AMGDDCommPkgSendFlag(compGridCommPkg)[level] = hypre_CTAlloc(HYPRE_Int**, send_proc_capacity,
+                                                                         HYPRE_MEMORY_HOST);
       HYPRE_Int *num_starting_dofs = hypre_CTAlloc(HYPRE_Int, send_proc_capacity, HYPRE_MEMORY_HOST);
       HYPRE_Int *send_dof_capacities = hypre_CTAlloc(HYPRE_Int, send_proc_capacity, HYPRE_MEMORY_HOST);
       HYPRE_Int **starting_dofs = hypre_CTAlloc(HYPRE_Int*, send_proc_capacity, HYPRE_MEMORY_HOST);
       HYPRE_Int **distances = hypre_CTAlloc(HYPRE_Int*, send_proc_capacity, HYPRE_MEMORY_HOST);
-      hypre_UnorderedIntMap **send_dof_maps = hypre_CTAlloc(hypre_UnorderedIntMap*, send_proc_capacity, HYPRE_MEMORY_HOST);
+      hypre_UnorderedIntMap **send_dof_maps = hypre_CTAlloc(hypre_UnorderedIntMap*, send_proc_capacity,
+                                                            HYPRE_MEMORY_HOST);
       for (i = 0; i < csr_num_sends; i++)
       {
-         hypre_AMGDDCommPkgSendProcs(compGridCommPkg)[level][i] = hypre_ParCSRCommPkgSendProc(commPkg,i);
-         start = hypre_ParCSRCommPkgSendMapStart(commPkg,i);
-         finish = hypre_ParCSRCommPkgSendMapStart(commPkg,i+1);
+         hypre_AMGDDCommPkgSendProcs(compGridCommPkg)[level][i] = hypre_ParCSRCommPkgSendProc(commPkg, i);
+         start = hypre_ParCSRCommPkgSendMapStart(commPkg, i);
+         finish = hypre_ParCSRCommPkgSendMapStart(commPkg, i + 1);
          HYPRE_Int num_send_dofs = finish - start;
-         send_dof_capacities[i] = max_distance*num_send_dofs;
+         send_dof_capacities[i] = max_distance * num_send_dofs;
          num_starting_dofs[i] = num_send_dofs;
-         hypre_AMGDDCommPkgNumSendNodes(compGridCommPkg)[level][i] = hypre_CTAlloc(HYPRE_Int, num_levels, HYPRE_MEMORY_HOST);
+         hypre_AMGDDCommPkgNumSendNodes(compGridCommPkg)[level][i] = hypre_CTAlloc(HYPRE_Int, num_levels,
+                                                                                   HYPRE_MEMORY_HOST);
          hypre_AMGDDCommPkgNumSendNodes(compGridCommPkg)[level][i][level] = num_send_dofs;
-         hypre_AMGDDCommPkgSendFlag(compGridCommPkg)[level][i] = hypre_CTAlloc(HYPRE_Int*, num_levels, HYPRE_MEMORY_HOST);
-         hypre_AMGDDCommPkgSendFlag(compGridCommPkg)[level][i][level] = hypre_CTAlloc(HYPRE_Int, send_dof_capacities[i], HYPRE_MEMORY_HOST);
+         hypre_AMGDDCommPkgSendFlag(compGridCommPkg)[level][i] = hypre_CTAlloc(HYPRE_Int*, num_levels,
+                                                                               HYPRE_MEMORY_HOST);
+         hypre_AMGDDCommPkgSendFlag(compGridCommPkg)[level][i][level] = hypre_CTAlloc(HYPRE_Int,
+                                                                                      send_dof_capacities[i], HYPRE_MEMORY_HOST);
          starting_dofs[i] = hypre_CTAlloc(HYPRE_Int, num_send_dofs, HYPRE_MEMORY_HOST);
          distances[i] = hypre_CTAlloc(HYPRE_Int, send_dof_capacities[i], HYPRE_MEMORY_HOST);
          send_dof_maps[i] = hypre_CTAlloc(hypre_UnorderedIntMap, 1, HYPRE_MEMORY_HOST);
          hypre_UnorderedIntMapCreate(send_dof_maps[i],
-                                  2*max_distance*num_send_dofs, // !!! Is this a "safe" upper bound on the map size?
-                                  16*hypre_NumThreads());
+                                     2 * max_distance * num_send_dofs, // !!! Is this a "safe" upper bound on the map size?
+                                     16 * hypre_NumThreads());
          for (j = start; j < finish; j++)
          {
-            HYPRE_Int send_dof = hypre_ParCSRCommPkgSendMapElmt(commPkg,j);
+            HYPRE_Int send_dof = hypre_ParCSRCommPkgSendMapElmt(commPkg, j);
             hypre_AMGDDCommPkgSendFlag(compGridCommPkg)[level][i][level][j - start] = send_dof;
             starting_dofs[i][j - start] = j - start;
             distances[i][j - start] = max_distance;
@@ -682,11 +748,12 @@ hypre_BoomerAMGDD_SetupNearestProcessorNeighbors( hypre_ParCSRMatrix *A,
 
       //Initialize the recv_procs
       hypre_AMGDDCommPkgNumRecvProcs(compGridCommPkg)[level] = csr_num_recvs;
-      HYPRE_Int recv_proc_capacity = 2*csr_num_recvs;
-      hypre_AMGDDCommPkgRecvProcs(compGridCommPkg)[level] = hypre_CTAlloc(HYPRE_Int, recv_proc_capacity, HYPRE_MEMORY_HOST);
+      HYPRE_Int recv_proc_capacity = 2 * csr_num_recvs;
+      hypre_AMGDDCommPkgRecvProcs(compGridCommPkg)[level] = hypre_CTAlloc(HYPRE_Int, recv_proc_capacity,
+                                                                          HYPRE_MEMORY_HOST);
       for (i = 0; i < csr_num_recvs; i++)
       {
-         hypre_AMGDDCommPkgRecvProcs(compGridCommPkg)[level][i] = hypre_ParCSRCommPkgRecvProc(commPkg,i);
+         hypre_AMGDDCommPkgRecvProcs(compGridCommPkg)[level][i] = hypre_ParCSRCommPkgRecvProc(commPkg, i);
       }
 
       // Iteratively communicate with longer and longer distance neighbors to grow the communication stencils
@@ -709,15 +776,18 @@ hypre_BoomerAMGDD_SetupNearestProcessorNeighbors( hypre_ParCSRMatrix *A,
          HYPRE_Int num_orig_sends = 0;
          if (i < csr_num_sends)
          {
-            num_orig_sends = hypre_ParCSRCommPkgSendMapStart(commPkg,i+1) - hypre_ParCSRCommPkgSendMapStart(commPkg,i);
+            num_orig_sends = hypre_ParCSRCommPkgSendMapStart(commPkg,
+                                                             i + 1) - hypre_ParCSRCommPkgSendMapStart(commPkg, i);
          }
-         hypre_qsort0(hypre_AMGDDCommPkgSendFlag(compGridCommPkg)[level][i][level], num_orig_sends, hypre_AMGDDCommPkgNumSendNodes(compGridCommPkg)[level][i][level] - 1);
+         hypre_qsort0(hypre_AMGDDCommPkgSendFlag(compGridCommPkg)[level][i][level], num_orig_sends,
+                      hypre_AMGDDCommPkgNumSendNodes(compGridCommPkg)[level][i][level] - 1);
 
          for (j = num_orig_sends; j < hypre_AMGDDCommPkgNumSendNodes(compGridCommPkg)[level][i][level]; j++)
          {
             if (distances[i][j] <= num_ghost_layers)
             {
-               hypre_AMGDDCommPkgSendFlag(compGridCommPkg)[level][i][level][j] = -(hypre_AMGDDCommPkgSendFlag(compGridCommPkg)[level][i][level][j] + 1 );
+               hypre_AMGDDCommPkgSendFlag(compGridCommPkg)[level][i][level][j] = -(hypre_AMGDDCommPkgSendFlag(
+                                                                                      compGridCommPkg)[level][i][level][j] + 1 );
             }
          }
       }
@@ -763,7 +833,8 @@ hypre_BoomerAMGDD_UnpackRecvBuffer( hypre_ParAMGDDData *amgdd_data,
    hypre_ParAMGData        *amg_data        = hypre_ParAMGDDDataAMG(amgdd_data);
    hypre_AMGDDCompGrid    **compGrid        = hypre_ParAMGDDDataCompGrid(amgdd_data);
    hypre_AMGDDCommPkg      *compGridCommPkg = hypre_ParAMGDDDataCommPkg(amgdd_data);
-   hypre_ParCSRCommPkg     *commPkg         = hypre_ParCSRMatrixCommPkg(hypre_ParAMGDataAArray(amg_data)[current_level]);
+   hypre_ParCSRCommPkg     *commPkg         = hypre_ParCSRMatrixCommPkg(hypre_ParAMGDataAArray(
+                                                                           amg_data)[current_level]);
 
    HYPRE_Int                num_levels      = hypre_ParAMGDataNumLevels(amg_data);
    HYPRE_Int            ****recv_map        = hypre_AMGDDCommPkgRecvMap(compGridCommPkg);
@@ -802,34 +873,44 @@ hypre_BoomerAMGDD_UnpackRecvBuffer( hypre_ParAMGDDData *amgdd_data,
    HYPRE_Int start_extra_dofs = hypre_AMGDDCompGridNumNonOwnedNodes(compGrid[current_level]);
    if (num_recv_nodes[current_level][buffer_number][current_level] + start_extra_dofs > max_nonowned)
    {
-      HYPRE_Int new_size = ceil(1.5*max_nonowned);
+      HYPRE_Int new_size = (HYPRE_Int)hypre_ceil(1.5 * max_nonowned);
       if (new_size < num_recv_nodes[current_level][buffer_number][current_level] + start_extra_dofs)
+      {
          new_size = num_recv_nodes[current_level][buffer_number][current_level] + start_extra_dofs;
-      hypre_AMGDDCompGridResize(compGrid[current_level], new_size, current_level != num_levels-1); // !!! Is there a better way to manage memory? !!!
+      }
+      hypre_AMGDDCompGridResize(compGrid[current_level], new_size,
+                                current_level != num_levels - 1); // !!! Is there a better way to manage memory? !!!
    }
 
    // Get the original number of recv dofs in the ParCSRCommPkg (if this proc was recv'd from in original)
    HYPRE_Int num_original_recv_dofs = 0;
    if (commPkg)
       if (buffer_number < hypre_ParCSRCommPkgNumRecvs(commPkg))
-         num_original_recv_dofs = hypre_ParCSRCommPkgRecvVecStart(commPkg, buffer_number+1) - hypre_ParCSRCommPkgRecvVecStart(commPkg, buffer_number);
+      {
+         num_original_recv_dofs = hypre_ParCSRCommPkgRecvVecStart(commPkg,
+                                                                  buffer_number + 1) - hypre_ParCSRCommPkgRecvVecStart(commPkg, buffer_number);
+      }
 
    // Skip over original commPkg recv dofs !!! Optimization: can avoid sending GIDs here
-   HYPRE_Int remaining_dofs = num_recv_nodes[current_level][buffer_number][current_level] - num_original_recv_dofs;
+   HYPRE_Int remaining_dofs = num_recv_nodes[current_level][buffer_number][current_level] -
+                              num_original_recv_dofs;
    cnt += num_original_recv_dofs;
 
    // Setup the recv map on current level
-   recv_map[current_level][buffer_number][current_level] = hypre_CTAlloc(HYPRE_Int, num_recv_nodes[current_level][buffer_number][current_level], HYPRE_MEMORY_HOST);
+   recv_map[current_level][buffer_number][current_level] = hypre_CTAlloc(HYPRE_Int,
+                                                                         num_recv_nodes[current_level][buffer_number][current_level], HYPRE_MEMORY_HOST);
    for (i = 0; i < num_original_recv_dofs; i++)
    {
-      recv_map[current_level][buffer_number][current_level][i] = i + hypre_ParCSRCommPkgRecvVecStart(commPkg, buffer_number) + hypre_AMGDDCompGridNumOwnedNodes(compGrid[current_level]);
+      recv_map[current_level][buffer_number][current_level][i] = i + hypre_ParCSRCommPkgRecvVecStart(
+                                                                    commPkg, buffer_number) + hypre_AMGDDCompGridNumOwnedNodes(compGrid[current_level]);
    }
 
    // Unpack global indices and setup sort and invsort
    hypre_AMGDDCompGridNumNonOwnedNodes(compGrid[current_level]) += remaining_dofs;
    HYPRE_Int *sort_map = hypre_AMGDDCompGridNonOwnedSort(compGrid[current_level]);
    HYPRE_Int *inv_sort_map = hypre_AMGDDCompGridNonOwnedInvSort(compGrid[current_level]);
-   HYPRE_Int *new_inv_sort_map = hypre_CTAlloc(HYPRE_Int, hypre_CSRMatrixNumRows(nonowned_diag), hypre_AMGDDCompGridMemoryLocation(compGrid[current_level]));
+   HYPRE_Int *new_inv_sort_map = hypre_CTAlloc(HYPRE_Int, hypre_CSRMatrixNumRows(nonowned_diag),
+                                               hypre_AMGDDCompGridMemoryLocation(compGrid[current_level]));
    HYPRE_Int sort_cnt = 0;
    HYPRE_Int compGrid_cnt = 0;
    HYPRE_Int incoming_cnt = 0;
@@ -837,7 +918,8 @@ hypre_BoomerAMGDD_UnpackRecvBuffer( hypre_ParAMGDDData *amgdd_data,
    {
       // !!! Optimization: don't have to do these assignments every time... probably doesn't save much (i.e. only update incoming_global_index when necessary, etc.)
       HYPRE_Int incoming_global_index = recv_buffer[cnt];
-      HYPRE_Int compGrid_global_index = hypre_AMGDDCompGridNonOwnedGlobalIndices(compGrid[current_level])[ inv_sort_map[compGrid_cnt] ];
+      HYPRE_Int compGrid_global_index = hypre_AMGDDCompGridNonOwnedGlobalIndices(
+                                           compGrid[current_level])[ inv_sort_map[compGrid_cnt] ];
 
       HYPRE_Int incoming_is_real = 1;
       if (incoming_global_index < 0)
@@ -849,13 +931,21 @@ hypre_BoomerAMGDD_UnpackRecvBuffer( hypre_ParAMGDDData *amgdd_data,
       if (incoming_global_index < compGrid_global_index)
       {
          // Set global index and real marker for incoming extra dof
-         hypre_AMGDDCompGridNonOwnedGlobalIndices(compGrid[current_level])[ incoming_cnt + start_extra_dofs ] = incoming_global_index;
-         hypre_AMGDDCompGridNonOwnedRealMarker(compGrid[current_level])[ incoming_cnt + start_extra_dofs ] = incoming_is_real;
+         hypre_AMGDDCompGridNonOwnedGlobalIndices(compGrid[current_level])[ incoming_cnt + start_extra_dofs ]
+            = incoming_global_index;
+         hypre_AMGDDCompGridNonOwnedRealMarker(compGrid[current_level])[ incoming_cnt + start_extra_dofs ] =
+            incoming_is_real;
 
          if (incoming_is_real)
-            recv_map[current_level][buffer_number][current_level][incoming_cnt + num_original_recv_dofs] = incoming_cnt + start_extra_dofs + hypre_AMGDDCompGridNumOwnedNodes(compGrid[current_level]);
+         {
+            recv_map[current_level][buffer_number][current_level][incoming_cnt + num_original_recv_dofs] =
+               incoming_cnt + start_extra_dofs + hypre_AMGDDCompGridNumOwnedNodes(compGrid[current_level]);
+         }
          else
-            recv_map[current_level][buffer_number][current_level][incoming_cnt + num_original_recv_dofs] = -(incoming_cnt + start_extra_dofs + hypre_AMGDDCompGridNumOwnedNodes(compGrid[current_level]) + 1);
+         {
+            recv_map[current_level][buffer_number][current_level][incoming_cnt + num_original_recv_dofs] = -
+                                                                                                           (incoming_cnt + start_extra_dofs + hypre_AMGDDCompGridNumOwnedNodes(compGrid[current_level]) + 1);
+         }
 
          sort_map[ incoming_cnt + start_extra_dofs ] = sort_cnt;
          new_inv_sort_map[sort_cnt] = incoming_cnt + start_extra_dofs;
@@ -881,13 +971,21 @@ hypre_BoomerAMGDD_UnpackRecvBuffer( hypre_ParAMGDDData *amgdd_data,
          incoming_is_real = 0;
       }
 
-      hypre_AMGDDCompGridNonOwnedGlobalIndices(compGrid[current_level])[ incoming_cnt + start_extra_dofs ] = incoming_global_index;
-      hypre_AMGDDCompGridNonOwnedRealMarker(compGrid[current_level])[ incoming_cnt + start_extra_dofs ] = incoming_is_real;
+      hypre_AMGDDCompGridNonOwnedGlobalIndices(compGrid[current_level])[ incoming_cnt + start_extra_dofs ]
+         = incoming_global_index;
+      hypre_AMGDDCompGridNonOwnedRealMarker(compGrid[current_level])[ incoming_cnt + start_extra_dofs ] =
+         incoming_is_real;
 
       if (incoming_is_real)
-         recv_map[current_level][buffer_number][current_level][incoming_cnt + num_original_recv_dofs] = incoming_cnt + start_extra_dofs + hypre_AMGDDCompGridNumOwnedNodes(compGrid[current_level]);
+      {
+         recv_map[current_level][buffer_number][current_level][incoming_cnt + num_original_recv_dofs] =
+            incoming_cnt + start_extra_dofs + hypre_AMGDDCompGridNumOwnedNodes(compGrid[current_level]);
+      }
       else
-         recv_map[current_level][buffer_number][current_level][incoming_cnt + num_original_recv_dofs] = -(incoming_cnt + start_extra_dofs + hypre_AMGDDCompGridNumOwnedNodes(compGrid[current_level]) + 1);
+      {
+         recv_map[current_level][buffer_number][current_level][incoming_cnt + num_original_recv_dofs] = -
+                                                                                                        (incoming_cnt + start_extra_dofs + hypre_AMGDDCompGridNumOwnedNodes(compGrid[current_level]) + 1);
+      }
 
       sort_map[ incoming_cnt + start_extra_dofs ] = sort_cnt;
       new_inv_sort_map[sort_cnt] = incoming_cnt + start_extra_dofs;
@@ -908,19 +1006,21 @@ hypre_BoomerAMGDD_UnpackRecvBuffer( hypre_ParAMGDDData *amgdd_data,
 
    // Unpack coarse global indices (need these for original commPkg recvs as well).
    // NOTE: store global indices for now, will be adjusted to local indices during SetupLocalIndices
-   if (current_level != num_levels-1)
+   if (current_level != num_levels - 1)
    {
       for (i = 0; i < num_original_recv_dofs; i++)
       {
          HYPRE_Int coarse_index = recv_buffer[cnt++];
-         if (coarse_index != -1) coarse_index = -(coarse_index+2); // Marking coarse indices that need setup by negative mapping
-         hypre_AMGDDCompGridNonOwnedCoarseIndices(compGrid[current_level])[i + hypre_ParCSRCommPkgRecvVecStart(commPkg, buffer_number)] = coarse_index;
+         if (coarse_index != -1) { coarse_index = -(coarse_index + 2); } // Marking coarse indices that need setup by negative mapping
+         hypre_AMGDDCompGridNonOwnedCoarseIndices(compGrid[current_level])[i +
+                                                                           hypre_ParCSRCommPkgRecvVecStart(commPkg, buffer_number)] = coarse_index;
       }
       for (i = 0; i < remaining_dofs; i++)
       {
          HYPRE_Int coarse_index = recv_buffer[cnt++];
-         if (coarse_index != -1) coarse_index = -(coarse_index+2); // Marking coarse indices that need setup by negative mapping
-         hypre_AMGDDCompGridNonOwnedCoarseIndices(compGrid[current_level])[i + start_extra_dofs] = coarse_index;
+         if (coarse_index != -1) { coarse_index = -(coarse_index + 2); } // Marking coarse indices that need setup by negative mapping
+         hypre_AMGDDCompGridNonOwnedCoarseIndices(compGrid[current_level])[i + start_extra_dofs] =
+            coarse_index;
       }
    }
 
@@ -931,8 +1031,10 @@ hypre_BoomerAMGDD_UnpackRecvBuffer( hypre_ParAMGDDData *amgdd_data,
    // Setup col indices for original commPkg dofs
    for (i = 0; i < num_original_recv_dofs; i++)
    {
-      HYPRE_Int diag_rowptr = hypre_CSRMatrixI(nonowned_diag)[ hypre_ParCSRCommPkgRecvVecStart(commPkg, buffer_number) + i ];
-      HYPRE_Int offd_rowptr = hypre_CSRMatrixI(nonowned_offd)[ hypre_ParCSRCommPkgRecvVecStart(commPkg, buffer_number) + i ];
+      HYPRE_Int diag_rowptr = hypre_CSRMatrixI(nonowned_diag)[ hypre_ParCSRCommPkgRecvVecStart(commPkg,
+                                                                                               buffer_number) + i ];
+      HYPRE_Int offd_rowptr = hypre_CSRMatrixI(nonowned_offd)[ hypre_ParCSRCommPkgRecvVecStart(commPkg,
+                                                                                               buffer_number) + i ];
 
       HYPRE_Int row_size = recv_buffer[ i + row_sizes_start ];
       for (j = 0; j < row_size; j++)
@@ -942,25 +1044,39 @@ hypre_BoomerAMGDD_UnpackRecvBuffer( hypre_ParAMGDDData *amgdd_data,
          // Incoming is a global index (could be owned or nonowned)
          if (incoming_index < 0)
          {
-            incoming_index = -(incoming_index+1);
+            incoming_index = -(incoming_index + 1);
             // See whether global index is owned on this proc (if so, can directly setup appropriate local index)
-            if (incoming_index >= hypre_AMGDDCompGridFirstGlobalIndex(compGrid[current_level]) && incoming_index <= hypre_AMGDDCompGridLastGlobalIndex(compGrid[current_level]))
+            if (incoming_index >= hypre_AMGDDCompGridFirstGlobalIndex(compGrid[current_level]) &&
+                incoming_index <= hypre_AMGDDCompGridLastGlobalIndex(compGrid[current_level]))
             {
                // Add to offd
                if (offd_rowptr >= hypre_CSRMatrixNumNonzeros(nonowned_offd))
-                  hypre_CSRMatrixResize(nonowned_offd, hypre_CSRMatrixNumRows(nonowned_offd), hypre_CSRMatrixNumCols(nonowned_offd), ceil(1.5*hypre_CSRMatrixNumNonzeros(nonowned_offd) + 1));
-               hypre_CSRMatrixJ(nonowned_offd)[offd_rowptr++] = incoming_index - hypre_AMGDDCompGridFirstGlobalIndex(compGrid[current_level]);
+               {
+                  hypre_CSRMatrixResize(nonowned_offd, hypre_CSRMatrixNumRows(nonowned_offd),
+                                        hypre_CSRMatrixNumCols(nonowned_offd),
+                                        (HYPRE_Int)hypre_ceil(1.5 * hypre_CSRMatrixNumNonzeros(nonowned_offd) + 1));
+               }
+               hypre_CSRMatrixJ(nonowned_offd)[offd_rowptr++] = incoming_index -
+                                                                hypre_AMGDDCompGridFirstGlobalIndex(compGrid[current_level]);
             }
             else
             {
                // Add to diag (global index, not in buffer, so we store global index and get a local index during SetupLocalIndices)
                if (diag_rowptr >= hypre_CSRMatrixNumNonzeros(nonowned_diag))
                {
-                  hypre_AMGDDCompGridNonOwnedDiagMissingColIndices(compGrid[current_level]) = hypre_TReAlloc_v2(hypre_AMGDDCompGridNonOwnedDiagMissingColIndices(compGrid[current_level]), HYPRE_Int, hypre_CSRMatrixNumNonzeros(nonowned_diag), HYPRE_Int, ceil(1.5*hypre_CSRMatrixNumNonzeros(nonowned_diag) + 1), hypre_AMGDDCompGridMemoryLocation(compGrid[current_level]));
-                  hypre_CSRMatrixResize(nonowned_diag, hypre_CSRMatrixNumRows(nonowned_diag), hypre_CSRMatrixNumCols(nonowned_diag), ceil(1.5*hypre_CSRMatrixNumNonzeros(nonowned_diag) + 1));
+                  hypre_AMGDDCompGridNonOwnedDiagMissingColIndices(compGrid[current_level]) = hypre_TReAlloc_v2(
+                                                                                                 hypre_AMGDDCompGridNonOwnedDiagMissingColIndices(compGrid[current_level]), HYPRE_Int,
+                                                                                                 hypre_CSRMatrixNumNonzeros(nonowned_diag), HYPRE_Int,
+                                                                                                 (HYPRE_Int)hypre_ceil(1.5 * hypre_CSRMatrixNumNonzeros(nonowned_diag) + 1),
+                                                                                                 hypre_AMGDDCompGridMemoryLocation(compGrid[current_level]));
+                  hypre_CSRMatrixResize(nonowned_diag, hypre_CSRMatrixNumRows(nonowned_diag),
+                                        hypre_CSRMatrixNumCols(nonowned_diag),
+                                        (HYPRE_Int)hypre_ceil(1.5 * hypre_CSRMatrixNumNonzeros(nonowned_diag) + 1));
                }
-               hypre_AMGDDCompGridNonOwnedDiagMissingColIndices(compGrid[current_level])[ hypre_AMGDDCompGridNumMissingColIndices(compGrid[current_level])++ ] = diag_rowptr;
-               hypre_CSRMatrixJ(nonowned_diag)[diag_rowptr++] = -(incoming_index+1);
+               hypre_AMGDDCompGridNonOwnedDiagMissingColIndices(
+                  compGrid[current_level])[ hypre_AMGDDCompGridNumMissingColIndices(compGrid[current_level])++ ] =
+                     diag_rowptr;
+               hypre_CSRMatrixJ(nonowned_diag)[diag_rowptr++] = -(incoming_index + 1);
             }
          }
          // Incoming is an index to dofs within the buffer (by construction, nonowned)
@@ -969,36 +1085,51 @@ hypre_BoomerAMGDD_UnpackRecvBuffer( hypre_ParAMGDDData *amgdd_data,
             // Add to diag (index is within buffer, so we can directly go to local index)
             if (diag_rowptr >= hypre_CSRMatrixNumNonzeros(nonowned_diag))
             {
-               hypre_AMGDDCompGridNonOwnedDiagMissingColIndices(compGrid[current_level]) = hypre_TReAlloc_v2(hypre_AMGDDCompGridNonOwnedDiagMissingColIndices(compGrid[current_level]), HYPRE_Int, hypre_CSRMatrixNumNonzeros(nonowned_diag), HYPRE_Int, ceil(1.5*hypre_CSRMatrixNumNonzeros(nonowned_diag) + 1), hypre_AMGDDCompGridMemoryLocation(compGrid[current_level]));
-               hypre_CSRMatrixResize(nonowned_diag, hypre_CSRMatrixNumRows(nonowned_diag), hypre_CSRMatrixNumCols(nonowned_diag), ceil(1.5*hypre_CSRMatrixNumNonzeros(nonowned_diag) + 1));
+               hypre_AMGDDCompGridNonOwnedDiagMissingColIndices(compGrid[current_level]) = hypre_TReAlloc_v2(
+                                                                                              hypre_AMGDDCompGridNonOwnedDiagMissingColIndices(compGrid[current_level]), HYPRE_Int,
+                                                                                              hypre_CSRMatrixNumNonzeros(nonowned_diag), HYPRE_Int,
+                                                                                              (HYPRE_Int)hypre_ceil(1.5 * hypre_CSRMatrixNumNonzeros(nonowned_diag) + 1),
+                                                                                              hypre_AMGDDCompGridMemoryLocation(compGrid[current_level]));
+               hypre_CSRMatrixResize(nonowned_diag, hypre_CSRMatrixNumRows(nonowned_diag),
+                                     hypre_CSRMatrixNumCols(nonowned_diag),
+                                     (HYPRE_Int)hypre_ceil(1.5 * hypre_CSRMatrixNumNonzeros(nonowned_diag) + 1));
             }
             if (incoming_index < num_original_recv_dofs)
-               hypre_CSRMatrixJ(nonowned_diag)[diag_rowptr++] = incoming_index + hypre_ParCSRCommPkgRecvVecStart(commPkg, buffer_number);
+            {
+               hypre_CSRMatrixJ(nonowned_diag)[diag_rowptr++] = incoming_index + hypre_ParCSRCommPkgRecvVecStart(
+                                                                   commPkg, buffer_number);
+            }
             else
             {
-               hypre_CSRMatrixJ(nonowned_diag)[diag_rowptr++] = incoming_index - num_original_recv_dofs + start_extra_dofs;
+               hypre_CSRMatrixJ(nonowned_diag)[diag_rowptr++] = incoming_index - num_original_recv_dofs +
+                                                                start_extra_dofs;
             }
          }
       }
 
       // Update row pointers
-      hypre_CSRMatrixI(nonowned_diag)[ hypre_ParCSRCommPkgRecvVecStart(commPkg, buffer_number) + i + 1 ] = diag_rowptr;
-      hypre_CSRMatrixI(nonowned_offd)[ hypre_ParCSRCommPkgRecvVecStart(commPkg, buffer_number) + i + 1 ] = offd_rowptr;
+      hypre_CSRMatrixI(nonowned_diag)[ hypre_ParCSRCommPkgRecvVecStart(commPkg,
+                                                                       buffer_number) + i + 1 ] = diag_rowptr;
+      hypre_CSRMatrixI(nonowned_offd)[ hypre_ParCSRCommPkgRecvVecStart(commPkg,
+                                                                       buffer_number) + i + 1 ] = offd_rowptr;
    }
 
    // Temporary storage for extra comp grid dofs on this level (will be setup after all recv's during SetupLocalIndices)
    // A_tmp_info[buffer_number] = [ size, [row], size, [row], ... ]
    HYPRE_Int A_tmp_info_size = 1 + remaining_dofs;
 
-   for (i = num_original_recv_dofs; i < num_recv_nodes[current_level][buffer_number][current_level]; i++)
+   for (i = num_original_recv_dofs; i < num_recv_nodes[current_level][buffer_number][current_level];
+        i++)
    {
       HYPRE_Int row_size = recv_buffer[ i + row_sizes_start ];
       A_tmp_info_size += row_size;
    }
-   A_tmp_info[buffer_number] = hypre_CTAlloc(HYPRE_Int, A_tmp_info_size, hypre_AMGDDCompGridMemoryLocation(compGrid[current_level]));
+   A_tmp_info[buffer_number] = hypre_CTAlloc(HYPRE_Int, A_tmp_info_size,
+                                             hypre_AMGDDCompGridMemoryLocation(compGrid[current_level]));
    HYPRE_Int A_tmp_info_cnt = 0;
    A_tmp_info[buffer_number][A_tmp_info_cnt++] = remaining_dofs;
-   for (i = num_original_recv_dofs; i < num_recv_nodes[current_level][buffer_number][current_level]; i++)
+   for (i = num_original_recv_dofs; i < num_recv_nodes[current_level][buffer_number][current_level];
+        i++)
    {
       HYPRE_Int row_size = recv_buffer[ i + row_sizes_start ];
       A_tmp_info[buffer_number][A_tmp_info_cnt++] = row_size;
@@ -1012,7 +1143,7 @@ hypre_BoomerAMGDD_UnpackRecvBuffer( hypre_ParAMGDDData *amgdd_data,
    // loop over coarser psi levels
    ////////////////////////////////////////////////////////////////////
 
-   for (level = current_level+1; level < current_level + num_psi_levels; level++)
+   for (level = current_level + 1; level < current_level + num_psi_levels; level++)
    {
       // get the number of nodes on this level
       num_recv_nodes[current_level][buffer_number][level] = recv_buffer[cnt++];
@@ -1031,27 +1162,35 @@ hypre_BoomerAMGDD_UnpackRecvBuffer( hypre_ParAMGDDData *amgdd_data,
       add_node_cnt = 0;
 
       // NOTE: Don't free incoming_dest because we set that as recv_map and use it outside this function
-      HYPRE_Int *incoming_dest = hypre_CTAlloc(HYPRE_Int, num_recv_nodes[current_level][buffer_number][level], HYPRE_MEMORY_HOST);
-      recv_red_marker[current_level][buffer_number][level] = hypre_CTAlloc(HYPRE_Int, num_recv_nodes[current_level][buffer_number][level], HYPRE_MEMORY_HOST);
+      HYPRE_Int *incoming_dest = hypre_CTAlloc(HYPRE_Int,
+                                               num_recv_nodes[current_level][buffer_number][level], HYPRE_MEMORY_HOST);
+      recv_red_marker[current_level][buffer_number][level] = hypre_CTAlloc(HYPRE_Int,
+                                                                           num_recv_nodes[current_level][buffer_number][level], HYPRE_MEMORY_HOST);
 
       // if necessary, reallocate more space for compGrid
-      if (num_recv_nodes[current_level][buffer_number][level] + num_nonowned > hypre_CSRMatrixNumRows(nonowned_diag))
+      if (num_recv_nodes[current_level][buffer_number][level] + num_nonowned > hypre_CSRMatrixNumRows(
+             nonowned_diag))
       {
-         HYPRE_Int new_size = ceil(1.5*hypre_CSRMatrixNumRows(nonowned_diag));
+         HYPRE_Int new_size = (HYPRE_Int)hypre_ceil(1.5 * hypre_CSRMatrixNumRows(nonowned_diag));
          if (new_size < num_recv_nodes[current_level][buffer_number][level] + num_nonowned)
+         {
             new_size = num_recv_nodes[current_level][buffer_number][level] + num_nonowned;
-         hypre_AMGDDCompGridResize(compGrid[level], new_size, level != num_levels-1); // !!! Is there a better way to manage memory? !!!
+         }
+         hypre_AMGDDCompGridResize(compGrid[level], new_size,
+                                   level != num_levels - 1); // !!! Is there a better way to manage memory? !!!
       }
 
       sort_map = hypre_AMGDDCompGridNonOwnedSort(compGrid[level]);
       inv_sort_map = hypre_AMGDDCompGridNonOwnedInvSort(compGrid[level]);
-      new_inv_sort_map = hypre_CTAlloc(HYPRE_Int, hypre_CSRMatrixNumRows(nonowned_diag), hypre_AMGDDCompGridMemoryLocation(compGrid[level]));
+      new_inv_sort_map = hypre_CTAlloc(HYPRE_Int, hypre_CSRMatrixNumRows(nonowned_diag),
+                                       hypre_AMGDDCompGridMemoryLocation(compGrid[level]));
       sort_cnt = 0;
       compGrid_cnt = 0;
       incoming_cnt = 0;
       HYPRE_Int dest = num_nonowned;
 
-      while (incoming_cnt < num_recv_nodes[current_level][buffer_number][level] && compGrid_cnt < num_nonowned)
+      while (incoming_cnt < num_recv_nodes[current_level][buffer_number][level] &&
+             compGrid_cnt < num_nonowned)
       {
          HYPRE_Int incoming_global_index = recv_buffer[cnt];
          HYPRE_Int incoming_is_real = 1;
@@ -1062,29 +1201,41 @@ hypre_BoomerAMGDD_UnpackRecvBuffer( hypre_ParAMGDDData *amgdd_data,
          }
 
          // If incoming is owned, go on to the next
-         if (incoming_global_index >= hypre_AMGDDCompGridFirstGlobalIndex(compGrid[level]) && incoming_global_index <= hypre_AMGDDCompGridLastGlobalIndex(compGrid[level]))
+         if (incoming_global_index >= hypre_AMGDDCompGridFirstGlobalIndex(compGrid[level]) &&
+             incoming_global_index <= hypre_AMGDDCompGridLastGlobalIndex(compGrid[level]))
          {
             recv_red_marker[current_level][buffer_number][level][incoming_cnt] = 1;
             if (incoming_is_real)
-               incoming_dest[incoming_cnt] = incoming_global_index - hypre_AMGDDCompGridFirstGlobalIndex(compGrid[level]); // Save location info for use below
+            {
+               incoming_dest[incoming_cnt] = incoming_global_index - hypre_AMGDDCompGridFirstGlobalIndex(
+                                                compGrid[level]);   // Save location info for use below
+            }
             else
-               incoming_dest[incoming_cnt] = -(incoming_global_index - hypre_AMGDDCompGridFirstGlobalIndex(compGrid[level]) + 1); // Save location info for use below
+            {
+               incoming_dest[incoming_cnt] = -(incoming_global_index - hypre_AMGDDCompGridFirstGlobalIndex(
+                                                  compGrid[level]) + 1);   // Save location info for use below
+            }
             incoming_cnt++;
             cnt++;
          }
          // Otherwise, merge
          else
          {
-            HYPRE_Int compGrid_global_index = hypre_AMGDDCompGridNonOwnedGlobalIndices(compGrid[level])[ inv_sort_map[compGrid_cnt] ];
+            HYPRE_Int compGrid_global_index = hypre_AMGDDCompGridNonOwnedGlobalIndices(
+                                                 compGrid[level])[ inv_sort_map[compGrid_cnt] ];
 
             if (incoming_global_index < compGrid_global_index)
             {
                sort_map[dest] = sort_cnt;
                new_inv_sort_map[sort_cnt] = dest;
                if (incoming_is_real)
+               {
                   incoming_dest[incoming_cnt] = dest + hypre_AMGDDCompGridNumOwnedNodes(compGrid[level]);
+               }
                else
+               {
                   incoming_dest[incoming_cnt] = -(dest + hypre_AMGDDCompGridNumOwnedNodes(compGrid[level]) + 1);
+               }
                sort_cnt++;
                incoming_cnt++;
                dest++;
@@ -1100,10 +1251,12 @@ hypre_BoomerAMGDD_UnpackRecvBuffer( hypre_ParAMGDDData *amgdd_data,
             }
             else
             {
-               if (incoming_is_real && !hypre_AMGDDCompGridNonOwnedRealMarker(compGrid[level])[ inv_sort_map[compGrid_cnt] ])
+               if (incoming_is_real &&
+                   !hypre_AMGDDCompGridNonOwnedRealMarker(compGrid[level])[ inv_sort_map[compGrid_cnt] ])
                {
                   hypre_AMGDDCompGridNonOwnedRealMarker(compGrid[level])[ inv_sort_map[compGrid_cnt] ] = 1;
-                  incoming_dest[incoming_cnt] = inv_sort_map[compGrid_cnt] + hypre_AMGDDCompGridNumOwnedNodes(compGrid[level]); // Incoming real dof received to existing ghost location
+                  incoming_dest[incoming_cnt] = inv_sort_map[compGrid_cnt] + hypre_AMGDDCompGridNumOwnedNodes(
+                                                   compGrid[level]); // Incoming real dof received to existing ghost location
                   incoming_cnt++;
                   cnt++;
                }
@@ -1111,9 +1264,15 @@ hypre_BoomerAMGDD_UnpackRecvBuffer( hypre_ParAMGDDData *amgdd_data,
                {
                   recv_red_marker[current_level][buffer_number][level][incoming_cnt] = 1;
                   if (incoming_is_real)
-                     incoming_dest[incoming_cnt] = inv_sort_map[compGrid_cnt] + hypre_AMGDDCompGridNumOwnedNodes(compGrid[level]); // Save location info for use below
+                  {
+                     incoming_dest[incoming_cnt] = inv_sort_map[compGrid_cnt] + hypre_AMGDDCompGridNumOwnedNodes(
+                                                      compGrid[level]);   // Save location info for use below
+                  }
                   else
-                     incoming_dest[incoming_cnt] = -(inv_sort_map[compGrid_cnt] + hypre_AMGDDCompGridNumOwnedNodes(compGrid[level]) + 1); // Save location info for use below
+                  {
+                     incoming_dest[incoming_cnt] = -(inv_sort_map[compGrid_cnt] + hypre_AMGDDCompGridNumOwnedNodes(
+                                                        compGrid[level]) + 1);   // Save location info for use below
+                  }
                   incoming_cnt++;
                   cnt++;
                }
@@ -1131,13 +1290,20 @@ hypre_BoomerAMGDD_UnpackRecvBuffer( hypre_ParAMGDDData *amgdd_data,
          }
 
          // If incoming is owned, go on to the next
-         if (incoming_global_index >= hypre_AMGDDCompGridFirstGlobalIndex(compGrid[level]) && incoming_global_index <= hypre_AMGDDCompGridLastGlobalIndex(compGrid[level]))
+         if (incoming_global_index >= hypre_AMGDDCompGridFirstGlobalIndex(compGrid[level]) &&
+             incoming_global_index <= hypre_AMGDDCompGridLastGlobalIndex(compGrid[level]))
          {
             recv_red_marker[current_level][buffer_number][level][incoming_cnt] = 1;
             if (incoming_is_real)
-               incoming_dest[incoming_cnt] = incoming_global_index - hypre_AMGDDCompGridFirstGlobalIndex(compGrid[level]); // Save location info for use below
+            {
+               incoming_dest[incoming_cnt] = incoming_global_index - hypre_AMGDDCompGridFirstGlobalIndex(
+                                                compGrid[level]);   // Save location info for use below
+            }
             else
-               incoming_dest[incoming_cnt] = -(incoming_global_index - hypre_AMGDDCompGridFirstGlobalIndex(compGrid[level]) + 1); // Save location info for use below
+            {
+               incoming_dest[incoming_cnt] = -(incoming_global_index - hypre_AMGDDCompGridFirstGlobalIndex(
+                                                  compGrid[level]) + 1);   // Save location info for use below
+            }
             incoming_cnt++;
             cnt++;
          }
@@ -1146,9 +1312,13 @@ hypre_BoomerAMGDD_UnpackRecvBuffer( hypre_ParAMGDDData *amgdd_data,
             sort_map[dest] = sort_cnt;
             new_inv_sort_map[sort_cnt] = dest;
             if (incoming_is_real)
+            {
                incoming_dest[incoming_cnt] = dest + hypre_AMGDDCompGridNumOwnedNodes(compGrid[level]);
+            }
             else
+            {
                incoming_dest[incoming_cnt] = -(dest + hypre_AMGDDCompGridNumOwnedNodes(compGrid[level]) + 1);
+            }
             sort_cnt++;
             incoming_cnt++;
             dest++;
@@ -1180,7 +1350,7 @@ hypre_BoomerAMGDD_UnpackRecvBuffer( hypre_ParAMGDDData *amgdd_data,
          if (!recv_red_marker[current_level][buffer_number][level][i])
          {
             dest = incoming_dest[i];
-            if (dest < 0) dest = -(dest+1);
+            if (dest < 0) { dest = -(dest + 1); }
             dest -= hypre_AMGDDCompGridNumOwnedNodes(compGrid[level]);
             HYPRE_Int global_index = recv_buffer[cnt];
             if (global_index < 0)
@@ -1188,22 +1358,22 @@ hypre_BoomerAMGDD_UnpackRecvBuffer( hypre_ParAMGDDData *amgdd_data,
                global_index = -(global_index + 1);
                hypre_AMGDDCompGridNonOwnedRealMarker(compGrid[level])[ dest ] = 0;
             }
-            else hypre_AMGDDCompGridNonOwnedRealMarker(compGrid[level])[ dest ] = 1;
+            else { hypre_AMGDDCompGridNonOwnedRealMarker(compGrid[level])[ dest ] = 1; }
             hypre_AMGDDCompGridNonOwnedGlobalIndices(compGrid[level])[ dest ] = global_index;
          }
          cnt++;
       }
-      if (level != num_levels-1)
+      if (level != num_levels - 1)
       {
          for (i = 0; i < num_recv_nodes[current_level][buffer_number][level]; i++)
          {
             if (!recv_red_marker[current_level][buffer_number][level][i])
             {
                dest = incoming_dest[i];
-               if (dest < 0) dest = -(dest+1);
+               if (dest < 0) { dest = -(dest + 1); }
                dest -= hypre_AMGDDCompGridNumOwnedNodes(compGrid[level]);
                HYPRE_Int coarse_index = recv_buffer[cnt];
-               if (coarse_index != -1) coarse_index = -(coarse_index+2); // Marking coarse indices that need setup by negative mapping
+               if (coarse_index != -1) { coarse_index = -(coarse_index + 2); } // Marking coarse indices that need setup by negative mapping
                hypre_AMGDDCompGridNonOwnedCoarseIndices(compGrid[level])[ dest ] = coarse_index;
             }
             cnt++;
@@ -1219,7 +1389,7 @@ hypre_BoomerAMGDD_UnpackRecvBuffer( hypre_ParAMGDDData *amgdd_data,
 
          // !!! Optimization: (probably small gain) right now, I disregard incoming info for real overwriting ghost (internal buf connectivity could be used to avoid a few binary searches later)
          dest = incoming_dest[i];
-         if (dest < 0) dest = -(dest+1);
+         if (dest < 0) { dest = -(dest + 1); }
          dest -= hypre_AMGDDCompGridNumOwnedNodes(compGrid[level]);
 
          if (dest >= num_nonowned)
@@ -1231,39 +1401,56 @@ hypre_BoomerAMGDD_UnpackRecvBuffer( hypre_ParAMGDDData *amgdd_data,
                // Incoming is a global index (could be owned or nonowned)
                if (incoming_index < 0)
                {
-                  incoming_index = -(incoming_index+1);
+                  incoming_index = -(incoming_index + 1);
                   // See whether global index is owned on this proc (if so, can directly setup appropriate local index)
-                  if (incoming_index >= hypre_AMGDDCompGridFirstGlobalIndex(compGrid[level]) && incoming_index <= hypre_AMGDDCompGridLastGlobalIndex(compGrid[level]))
+                  if (incoming_index >= hypre_AMGDDCompGridFirstGlobalIndex(compGrid[level]) &&
+                      incoming_index <= hypre_AMGDDCompGridLastGlobalIndex(compGrid[level]))
                   {
                      // Add to offd
                      if (offd_rowptr >= hypre_CSRMatrixNumNonzeros(nonowned_offd))
-                        hypre_CSRMatrixResize(nonowned_offd, hypre_CSRMatrixNumRows(nonowned_offd), hypre_CSRMatrixNumCols(nonowned_offd), ceil(1.5*hypre_CSRMatrixNumNonzeros(nonowned_offd) + 1));
-                     hypre_CSRMatrixJ(nonowned_offd)[offd_rowptr++] = incoming_index - hypre_AMGDDCompGridFirstGlobalIndex(compGrid[level]);
+                     {
+                        hypre_CSRMatrixResize(nonowned_offd, hypre_CSRMatrixNumRows(nonowned_offd),
+                                              hypre_CSRMatrixNumCols(nonowned_offd),
+                                              (HYPRE_Int)hypre_ceil(1.5 * hypre_CSRMatrixNumNonzeros(nonowned_offd) + 1));
+                     }
+                     hypre_CSRMatrixJ(nonowned_offd)[offd_rowptr++] = incoming_index -
+                                                                      hypre_AMGDDCompGridFirstGlobalIndex(compGrid[level]);
                   }
                   else
                   {
                      // Add to diag (global index, not in buffer, so we store global index and get a local index during SetupLocalIndices)
                      if (diag_rowptr >= hypre_CSRMatrixNumNonzeros(nonowned_diag))
                      {
-                        hypre_AMGDDCompGridNonOwnedDiagMissingColIndices(compGrid[level]) = hypre_TReAlloc_v2(hypre_AMGDDCompGridNonOwnedDiagMissingColIndices(compGrid[level]), HYPRE_Int, hypre_CSRMatrixNumNonzeros(nonowned_diag), HYPRE_Int, ceil(1.5*hypre_CSRMatrixNumNonzeros(nonowned_diag) + 1), hypre_AMGDDCompGridMemoryLocation(compGrid[level]));
-                        hypre_CSRMatrixResize(nonowned_diag, hypre_CSRMatrixNumRows(nonowned_diag), hypre_CSRMatrixNumCols(nonowned_diag), ceil(1.5*hypre_CSRMatrixNumNonzeros(nonowned_diag) + 1));
+                        hypre_AMGDDCompGridNonOwnedDiagMissingColIndices(compGrid[level]) = hypre_TReAlloc_v2(
+                                                                                               hypre_AMGDDCompGridNonOwnedDiagMissingColIndices(compGrid[level]), HYPRE_Int,
+                                                                                               hypre_CSRMatrixNumNonzeros(nonowned_diag), HYPRE_Int,
+                                                                                               (HYPRE_Int)hypre_ceil(1.5 * hypre_CSRMatrixNumNonzeros(nonowned_diag) + 1),
+                                                                                               hypre_AMGDDCompGridMemoryLocation(compGrid[level]));
+                        hypre_CSRMatrixResize(nonowned_diag, hypre_CSRMatrixNumRows(nonowned_diag),
+                                              hypre_CSRMatrixNumCols(nonowned_diag),
+                                              (HYPRE_Int)hypre_ceil(1.5 * hypre_CSRMatrixNumNonzeros(nonowned_diag) + 1));
                      }
-                     hypre_AMGDDCompGridNonOwnedDiagMissingColIndices(compGrid[level])[ hypre_AMGDDCompGridNumMissingColIndices(compGrid[level])++ ] = diag_rowptr;
-                     hypre_CSRMatrixJ(nonowned_diag)[diag_rowptr++] = -(incoming_index+1);
+                     hypre_AMGDDCompGridNonOwnedDiagMissingColIndices(
+                        compGrid[level])[ hypre_AMGDDCompGridNumMissingColIndices(compGrid[level])++ ] = diag_rowptr;
+                     hypre_CSRMatrixJ(nonowned_diag)[diag_rowptr++] = -(incoming_index + 1);
                   }
                }
                // Incoming is an index to dofs within the buffer (could be owned or nonowned)
                else
                {
                   HYPRE_Int local_index = incoming_dest[ incoming_index ];
-                  if (local_index < 0) local_index = -(local_index + 1);
+                  if (local_index < 0) { local_index = -(local_index + 1); }
 
                   // Check whether dof is owned or nonowned
                   if (local_index < hypre_AMGDDCompGridNumOwnedNodes(compGrid[level]))
                   {
                      // Add to offd
                      if (offd_rowptr >= hypre_CSRMatrixNumNonzeros(nonowned_offd))
-                        hypre_CSRMatrixResize(nonowned_offd, hypre_CSRMatrixNumRows(nonowned_offd), hypre_CSRMatrixNumCols(nonowned_offd), ceil(1.5*hypre_CSRMatrixNumNonzeros(nonowned_offd) + 1));
+                     {
+                        hypre_CSRMatrixResize(nonowned_offd, hypre_CSRMatrixNumRows(nonowned_offd),
+                                              hypre_CSRMatrixNumCols(nonowned_offd),
+                                              (HYPRE_Int)hypre_ceil(1.5 * hypre_CSRMatrixNumNonzeros(nonowned_offd) + 1));
+                     }
                      hypre_CSRMatrixJ(nonowned_offd)[offd_rowptr++] = local_index;
                   }
                   else
@@ -1271,10 +1458,17 @@ hypre_BoomerAMGDD_UnpackRecvBuffer( hypre_ParAMGDDData *amgdd_data,
                      // Add to diag (index is within buffer, so we can directly go to local index)
                      if (diag_rowptr >= hypre_CSRMatrixNumNonzeros(nonowned_diag))
                      {
-                        hypre_AMGDDCompGridNonOwnedDiagMissingColIndices(compGrid[level]) = hypre_TReAlloc_v2(hypre_AMGDDCompGridNonOwnedDiagMissingColIndices(compGrid[level]), HYPRE_Int, hypre_CSRMatrixNumNonzeros(nonowned_diag), HYPRE_Int, ceil(1.5*hypre_CSRMatrixNumNonzeros(nonowned_diag) + 1), hypre_AMGDDCompGridMemoryLocation(compGrid[level]));
-                        hypre_CSRMatrixResize(nonowned_diag, hypre_CSRMatrixNumRows(nonowned_diag), hypre_CSRMatrixNumCols(nonowned_diag), ceil(1.5*hypre_CSRMatrixNumNonzeros(nonowned_diag) + 1));
+                        hypre_AMGDDCompGridNonOwnedDiagMissingColIndices(compGrid[level]) = hypre_TReAlloc_v2(
+                                                                                               hypre_AMGDDCompGridNonOwnedDiagMissingColIndices(compGrid[level]), HYPRE_Int,
+                                                                                               hypre_CSRMatrixNumNonzeros(nonowned_diag), HYPRE_Int,
+                                                                                               (HYPRE_Int)hypre_ceil(1.5 * hypre_CSRMatrixNumNonzeros(nonowned_diag) + 1),
+                                                                                               hypre_AMGDDCompGridMemoryLocation(compGrid[level]));
+                        hypre_CSRMatrixResize(nonowned_diag, hypre_CSRMatrixNumRows(nonowned_diag),
+                                              hypre_CSRMatrixNumCols(nonowned_diag),
+                                              (HYPRE_Int)hypre_ceil(1.5 * hypre_CSRMatrixNumNonzeros(nonowned_diag) + 1));
                      }
-                     hypre_CSRMatrixJ(nonowned_diag)[diag_rowptr++] = local_index - hypre_AMGDDCompGridNumOwnedNodes(compGrid[level]);
+                     hypre_CSRMatrixJ(nonowned_diag)[diag_rowptr++] = local_index - hypre_AMGDDCompGridNumOwnedNodes(
+                                                                         compGrid[level]);
                   }
                }
             }
@@ -1304,11 +1498,12 @@ hypre_BoomerAMGDD_PackColInd( HYPRE_Int           *send_flag,
 {
    HYPRE_Int i, j, send_elmt, add_flag_index;
    HYPRE_Int cnt = starting_cnt;
-   HYPRE_Int total_num_nodes = hypre_AMGDDCompGridNumOwnedNodes(compGrid) + hypre_AMGDDCompGridNumNonOwnedNodes(compGrid);
+   HYPRE_Int total_num_nodes = hypre_AMGDDCompGridNumOwnedNodes(compGrid) +
+                               hypre_AMGDDCompGridNumNonOwnedNodes(compGrid);
    for (i = 0; i < num_send_nodes; i++)
    {
       send_elmt = send_flag[i];
-      if (send_elmt < 0) send_elmt = -(send_elmt + 1);
+      if (send_elmt < 0) { send_elmt = -(send_elmt + 1); }
 
       // Owned point
       if (send_elmt < hypre_AMGDDCompGridNumOwnedNodes(compGrid))
@@ -1316,7 +1511,7 @@ hypre_BoomerAMGDD_PackColInd( HYPRE_Int           *send_flag,
          hypre_CSRMatrix *diag = hypre_AMGDDCompGridMatrixOwnedDiag(hypre_AMGDDCompGridA(compGrid));
          hypre_CSRMatrix *offd = hypre_AMGDDCompGridMatrixOwnedOffd(hypre_AMGDDCompGridA(compGrid));
          // Get diag connections
-         for (j = hypre_CSRMatrixI(diag)[send_elmt]; j < hypre_CSRMatrixI(diag)[send_elmt+1]; j++)
+         for (j = hypre_CSRMatrixI(diag)[send_elmt]; j < hypre_CSRMatrixI(diag)[send_elmt + 1]; j++)
          {
             add_flag_index = hypre_CSRMatrixJ(diag)[j];
             if (add_flag[add_flag_index] > 0)
@@ -1325,11 +1520,12 @@ hypre_BoomerAMGDD_PackColInd( HYPRE_Int           *send_flag,
             }
             else
             {
-               send_buffer[cnt++] = -(add_flag_index + hypre_AMGDDCompGridFirstGlobalIndex(compGrid) + 1); // -(GID + 1)
+               send_buffer[cnt++] = -(add_flag_index + hypre_AMGDDCompGridFirstGlobalIndex(
+                                         compGrid) + 1); // -(GID + 1)
             }
          }
          // Get offd connections
-         for (j = hypre_CSRMatrixI(offd)[send_elmt]; j < hypre_CSRMatrixI(offd)[send_elmt+1]; j++)
+         for (j = hypre_CSRMatrixI(offd)[send_elmt]; j < hypre_CSRMatrixI(offd)[send_elmt + 1]; j++)
          {
             add_flag_index = hypre_CSRMatrixJ(offd)[j] + hypre_AMGDDCompGridNumOwnedNodes(compGrid);
             if (add_flag[add_flag_index] > 0)
@@ -1338,7 +1534,8 @@ hypre_BoomerAMGDD_PackColInd( HYPRE_Int           *send_flag,
             }
             else
             {
-               send_buffer[cnt++] = -(hypre_AMGDDCompGridNonOwnedGlobalIndices(compGrid)[ hypre_CSRMatrixJ(offd)[j] ] + 1); // -(GID + 1)
+               send_buffer[cnt++] = -(hypre_AMGDDCompGridNonOwnedGlobalIndices(compGrid)[ hypre_CSRMatrixJ(
+                                                                                             offd)[j] ] + 1); // -(GID + 1)
             }
          }
       }
@@ -1349,7 +1546,8 @@ hypre_BoomerAMGDD_PackColInd( HYPRE_Int           *send_flag,
          hypre_CSRMatrix *diag = hypre_AMGDDCompGridMatrixNonOwnedDiag(hypre_AMGDDCompGridA(compGrid));
          hypre_CSRMatrix *offd = hypre_AMGDDCompGridMatrixNonOwnedOffd(hypre_AMGDDCompGridA(compGrid));
          // Get diag connections
-         for (j = hypre_CSRMatrixI(diag)[nonowned_index]; j < hypre_CSRMatrixI(diag)[nonowned_index+1]; j++)
+         for (j = hypre_CSRMatrixI(diag)[nonowned_index]; j < hypre_CSRMatrixI(diag)[nonowned_index + 1];
+              j++)
          {
             if (hypre_CSRMatrixJ(diag)[j] >= 0)
             {
@@ -1360,7 +1558,8 @@ hypre_BoomerAMGDD_PackColInd( HYPRE_Int           *send_flag,
                }
                else
                {
-                  send_buffer[cnt++] = -(hypre_AMGDDCompGridNonOwnedGlobalIndices(compGrid)[ hypre_CSRMatrixJ(diag)[j] ] + 1); // -(GID + 1)
+                  send_buffer[cnt++] = -(hypre_AMGDDCompGridNonOwnedGlobalIndices(compGrid)[ hypre_CSRMatrixJ(
+                                                                                                diag)[j] ] + 1); // -(GID + 1)
                }
             }
             else
@@ -1369,7 +1568,8 @@ hypre_BoomerAMGDD_PackColInd( HYPRE_Int           *send_flag,
             }
          }
          // Get offd connections
-         for (j = hypre_CSRMatrixI(offd)[nonowned_index]; j < hypre_CSRMatrixI(offd)[nonowned_index+1]; j++)
+         for (j = hypre_CSRMatrixI(offd)[nonowned_index]; j < hypre_CSRMatrixI(offd)[nonowned_index + 1];
+              j++)
          {
             add_flag_index = hypre_CSRMatrixJ(offd)[j];
             if (add_flag[add_flag_index] > 0)
@@ -1378,11 +1578,12 @@ hypre_BoomerAMGDD_PackColInd( HYPRE_Int           *send_flag,
             }
             else
             {
-               send_buffer[cnt++] = -(add_flag_index + hypre_AMGDDCompGridFirstGlobalIndex(compGrid) + 1); // -(GID + 1)
+               send_buffer[cnt++] = -(add_flag_index + hypre_AMGDDCompGridFirstGlobalIndex(
+                                         compGrid) + 1); // -(GID + 1)
             }
          }
       }
-      else send_flag[i] = send_elmt - total_num_nodes;
+      else { send_flag[i] = send_elmt - total_num_nodes; }
    }
 
    return cnt;
@@ -1450,8 +1651,9 @@ hypre_BoomerAMGDD_AddFlagToSendFlag( hypre_AMGDDCompGrid *compGrid,
                                      HYPRE_Int           *num_send_nodes,
                                      HYPRE_Int            num_ghost_layers )
 {
-   HYPRE_Int i,cnt,add_flag_index;
-   HYPRE_Int total_num_nodes = hypre_AMGDDCompGridNumOwnedNodes(compGrid) + hypre_AMGDDCompGridNumNonOwnedNodes(compGrid);
+   HYPRE_Int i, cnt, add_flag_index;
+   HYPRE_Int total_num_nodes = hypre_AMGDDCompGridNumOwnedNodes(compGrid) +
+                               hypre_AMGDDCompGridNumNonOwnedNodes(compGrid);
    for (i = 0; i < total_num_nodes; i++)
    {
       if (add_flag[i] > 0)
@@ -1467,7 +1669,8 @@ hypre_BoomerAMGDD_AddFlagToSendFlag( hypre_AMGDDCompGrid *compGrid,
    // First the nonowned indices coming before the owned block
    if (hypre_AMGDDCompGridNumNonOwnedNodes(compGrid))
    {
-      while (hypre_AMGDDCompGridNonOwnedGlobalIndices(compGrid)[inv_sort_map[i]] < hypre_AMGDDCompGridFirstGlobalIndex(compGrid))
+      while (hypre_AMGDDCompGridNonOwnedGlobalIndices(compGrid)[inv_sort_map[i]] <
+             hypre_AMGDDCompGridFirstGlobalIndex(compGrid))
       {
          add_flag_index = i + hypre_AMGDDCompGridNumOwnedNodes(compGrid);
          if (add_flag[add_flag_index] > num_ghost_layers)
@@ -1481,11 +1684,12 @@ hypre_BoomerAMGDD_AddFlagToSendFlag( hypre_AMGDDCompGrid *compGrid,
             cnt++;
          }
          i++;
-         if (i == hypre_AMGDDCompGridNumNonOwnedNodes(compGrid)) break;
+         if (i == hypre_AMGDDCompGridNumNonOwnedNodes(compGrid)) { break; }
       }
    }
    // Then the owned block
-   for (add_flag_index = 0; add_flag_index < hypre_AMGDDCompGridNumOwnedNodes(compGrid); add_flag_index++)
+   for (add_flag_index = 0; add_flag_index < hypre_AMGDDCompGridNumOwnedNodes(compGrid);
+        add_flag_index++)
    {
       if (add_flag[add_flag_index] > num_ghost_layers)
       {
@@ -1494,7 +1698,7 @@ hypre_BoomerAMGDD_AddFlagToSendFlag( hypre_AMGDDCompGrid *compGrid,
       }
       else if (add_flag[add_flag_index] > 0)
       {
-         send_flag[cnt] = -(add_flag_index+1);
+         send_flag[cnt] = -(add_flag_index + 1);
          cnt++;
       }
    }
@@ -1532,7 +1736,8 @@ hypre_BoomerAMGDD_SubtractLists( hypre_AMGDDCompGrid *compGrid,
    while (current_cnt < (*current_list_length) && prev_cnt < prev_list_length)
    {
       // Get the global indices
-      HYPRE_Int current_global_index = hypre_BoomerAMGDD_LocalToGlobalIndex(compGrid, current_list[current_cnt]);
+      HYPRE_Int current_global_index = hypre_BoomerAMGDD_LocalToGlobalIndex(compGrid,
+                                                                            current_list[current_cnt]);
       HYPRE_Int prev_global_index = hypre_BoomerAMGDD_LocalToGlobalIndex(compGrid, prev_list[prev_cnt]);
 
       // Do the merge
@@ -1553,10 +1758,16 @@ hypre_BoomerAMGDD_SubtractLists( hypre_AMGDDCompGrid *compGrid,
          {
             // This is the case of real dof sent to overwrite ghost.
             // Current list is a positive local index here. Map beyond the range of total dofs to mark.
-            if (current_list[current_cnt] < hypre_AMGDDCompGridNumOwnedNodes(compGrid) + hypre_AMGDDCompGridNumNonOwnedNodes(compGrid))
-               current_list[new_cnt] = current_list[current_cnt] + hypre_AMGDDCompGridNumOwnedNodes(compGrid) + hypre_AMGDDCompGridNumNonOwnedNodes(compGrid);
+            if (current_list[current_cnt] < hypre_AMGDDCompGridNumOwnedNodes(compGrid) +
+                hypre_AMGDDCompGridNumNonOwnedNodes(compGrid))
+            {
+               current_list[new_cnt] = current_list[current_cnt] + hypre_AMGDDCompGridNumOwnedNodes(
+                                          compGrid) + hypre_AMGDDCompGridNumNonOwnedNodes(compGrid);
+            }
             else
+            {
                current_list[new_cnt] = current_list[current_cnt];
+            }
             new_cnt++;
             current_cnt++;
             prev_cnt++;
@@ -1591,10 +1802,12 @@ hypre_BoomerAMGDD_RemoveRedundancy( hypre_ParAMGData      *amg_data,
 {
    HYPRE_Int current_send_proc = hypre_AMGDDCommPkgSendProcs(compGridCommPkg)[current_level][proc];
    HYPRE_Int prev_proc, prev_level;
-   for (prev_level = current_level+1; prev_level <= level; prev_level++)
+   for (prev_level = current_level + 1; prev_level <= level; prev_level++)
    {
-      hypre_ParCSRCommPkg *original_commPkg = hypre_ParCSRMatrixCommPkg(hypre_ParAMGDataAArray(amg_data)[prev_level]);
-      for (prev_proc = 0; prev_proc < hypre_AMGDDCommPkgNumSendProcs(compGridCommPkg)[prev_level]; prev_proc++)
+      hypre_ParCSRCommPkg *original_commPkg = hypre_ParCSRMatrixCommPkg(hypre_ParAMGDataAArray(
+                                                                           amg_data)[prev_level]);
+      for (prev_proc = 0; prev_proc < hypre_AMGDDCommPkgNumSendProcs(compGridCommPkg)[prev_level];
+           prev_proc++)
       {
          if (hypre_AMGDDCommPkgSendProcs(compGridCommPkg)[prev_level][prev_proc] == current_send_proc)
          {
@@ -1602,64 +1815,71 @@ hypre_BoomerAMGDD_RemoveRedundancy( hypre_ParAMGData      *amg_data,
             if (prev_level == level)
             {
                HYPRE_Int original_proc;
-               for (original_proc = 0; original_proc < hypre_ParCSRCommPkgNumSends(original_commPkg); original_proc++)
+               for (original_proc = 0; original_proc < hypre_ParCSRCommPkgNumSends(original_commPkg);
+                    original_proc++)
                {
                   if (hypre_ParCSRCommPkgSendProc(original_commPkg, original_proc) == current_send_proc)
                   {
-                     prev_list_end = hypre_ParCSRCommPkgSendMapStart(original_commPkg, original_proc+1) - hypre_ParCSRCommPkgSendMapStart(original_commPkg, original_proc);
+                     prev_list_end = hypre_ParCSRCommPkgSendMapStart(original_commPkg,
+                                                                     original_proc + 1) - hypre_ParCSRCommPkgSendMapStart(original_commPkg, original_proc);
                      break;
                   }
                }
             }
 
             hypre_BoomerAMGDD_SubtractLists(compGrid[level],
-               send_flag[current_level][proc][level],
-               &(num_send_nodes[current_level][proc][level]),
-               send_flag[prev_level][prev_proc][level],
-               prev_list_end);
+                                            send_flag[current_level][proc][level],
+                                            &(num_send_nodes[current_level][proc][level]),
+                                            send_flag[prev_level][prev_proc][level],
+                                            prev_list_end);
 
             if (num_send_nodes[prev_level][prev_proc][level] - prev_list_end > 0)
             {
                hypre_BoomerAMGDD_SubtractLists(compGrid[level],
-                  send_flag[current_level][proc][level],
-                  &(num_send_nodes[current_level][proc][level]),
-                  &(send_flag[prev_level][prev_proc][level][prev_list_end]),
-                  num_send_nodes[prev_level][prev_proc][level] - prev_list_end);
+                                               send_flag[current_level][proc][level],
+                                               &(num_send_nodes[current_level][proc][level]),
+                                               &(send_flag[prev_level][prev_proc][level][prev_list_end]),
+                                               num_send_nodes[prev_level][prev_proc][level] - prev_list_end);
             }
          }
       }
 
-      for (prev_proc = 0; prev_proc < hypre_AMGDDCommPkgNumRecvProcs(compGridCommPkg)[prev_level]; prev_proc++)
+      for (prev_proc = 0; prev_proc < hypre_AMGDDCommPkgNumRecvProcs(compGridCommPkg)[prev_level];
+           prev_proc++)
       {
          if (hypre_AMGDDCommPkgRecvProcs(compGridCommPkg)[prev_level][prev_proc] == current_send_proc)
          {
-            HYPRE_Int prev_list_end = hypre_AMGDDCommPkgNumRecvNodes(compGridCommPkg)[prev_level][prev_proc][level];
+            HYPRE_Int prev_list_end = hypre_AMGDDCommPkgNumRecvNodes(
+                                         compGridCommPkg)[prev_level][prev_proc][level];
             if (prev_level == level)
             {
                HYPRE_Int original_proc;
-               for (original_proc = 0; original_proc < hypre_ParCSRCommPkgNumRecvs(original_commPkg); original_proc++)
+               for (original_proc = 0; original_proc < hypre_ParCSRCommPkgNumRecvs(original_commPkg);
+                    original_proc++)
                {
                   if (hypre_ParCSRCommPkgRecvProc(original_commPkg, original_proc) == current_send_proc)
                   {
-                     prev_list_end = hypre_ParCSRCommPkgRecvVecStart(original_commPkg, original_proc+1) - hypre_ParCSRCommPkgRecvVecStart(original_commPkg, original_proc);
+                     prev_list_end = hypre_ParCSRCommPkgRecvVecStart(original_commPkg,
+                                                                     original_proc + 1) - hypre_ParCSRCommPkgRecvVecStart(original_commPkg, original_proc);
                      break;
                   }
                }
             }
 
             hypre_BoomerAMGDD_SubtractLists(compGrid[level],
-               send_flag[current_level][proc][level],
-               &(num_send_nodes[current_level][proc][level]),
-               hypre_AMGDDCommPkgRecvMap(compGridCommPkg)[prev_level][prev_proc][level],
-               prev_list_end);
+                                            send_flag[current_level][proc][level],
+                                            &(num_send_nodes[current_level][proc][level]),
+                                            hypre_AMGDDCommPkgRecvMap(compGridCommPkg)[prev_level][prev_proc][level],
+                                            prev_list_end);
 
-            if (hypre_AMGDDCommPkgNumRecvNodes(compGridCommPkg)[prev_level][prev_proc][level] - prev_list_end > 0)
+            if (hypre_AMGDDCommPkgNumRecvNodes(compGridCommPkg)[prev_level][prev_proc][level] - prev_list_end >
+                0)
             {
                hypre_BoomerAMGDD_SubtractLists(compGrid[level],
-                  send_flag[current_level][proc][level],
-                  &(num_send_nodes[current_level][proc][level]),
-                  &(hypre_AMGDDCommPkgRecvMap(compGridCommPkg)[prev_level][prev_proc][level][prev_list_end]),
-                  hypre_AMGDDCommPkgNumRecvNodes(compGridCommPkg)[prev_level][prev_proc][level] - prev_list_end);
+                                               send_flag[current_level][proc][level],
+                                               &(num_send_nodes[current_level][proc][level]),
+                                               &(hypre_AMGDDCommPkgRecvMap(compGridCommPkg)[prev_level][prev_proc][level][prev_list_end]),
+                                               hypre_AMGDDCommPkgNumRecvNodes(compGridCommPkg)[prev_level][prev_proc][level] - prev_list_end);
             }
          }
       }
@@ -1675,7 +1895,7 @@ hypre_BoomerAMGDD_RecursivelyBuildPsiComposite( HYPRE_Int            node,
                                                 HYPRE_Int           *add_flag,
                                                 HYPRE_Int            use_sort)
 {
-   HYPRE_Int i,index,sort_index;
+   HYPRE_Int i, index, sort_index;
    HYPRE_Int error_code = 0;
 
    HYPRE_Int *sort_map = hypre_AMGDDCompGridNonOwnedSort(compGrid);
@@ -1698,7 +1918,7 @@ hypre_BoomerAMGDD_RecursivelyBuildPsiComposite( HYPRE_Int            node,
    }
 
    // Look at neighbors in diag
-   for (i = hypre_CSRMatrixI(diag)[node]; i < hypre_CSRMatrixI(diag)[node+1]; i++)
+   for (i = hypre_CSRMatrixI(diag)[node]; i < hypre_CSRMatrixI(diag)[node + 1]; i++)
    {
       // Get the index of the neighbor
       index = hypre_CSRMatrixJ(diag)[i];
@@ -1710,8 +1930,8 @@ hypre_BoomerAMGDD_RecursivelyBuildPsiComposite( HYPRE_Int            node,
          }
          else
          {
-            if (use_sort) sort_index = sort_map[index] + hypre_AMGDDCompGridNumOwnedNodes(compGrid);
-            else sort_index = index + hypre_AMGDDCompGridNumOwnedNodes(compGrid);
+            if (use_sort) { sort_index = sort_map[index] + hypre_AMGDDCompGridNumOwnedNodes(compGrid); }
+            else { sort_index = index + hypre_AMGDDCompGridNumOwnedNodes(compGrid); }
             index += hypre_AMGDDCompGridNumOwnedNodes(compGrid);
          }
 
@@ -1720,18 +1940,19 @@ hypre_BoomerAMGDD_RecursivelyBuildPsiComposite( HYPRE_Int            node,
          {
             add_flag[sort_index] = m;
             // Recursively call to find distance m-1 neighbors of index
-            if (m-1 > 0) error_code = hypre_BoomerAMGDD_RecursivelyBuildPsiComposite(index, m-1, compGrid, add_flag, use_sort);
+            if (m - 1 > 0) { error_code = hypre_BoomerAMGDD_RecursivelyBuildPsiComposite(index, m - 1, compGrid, add_flag, use_sort); }
          }
       }
       else
       {
          error_code = 1;
-         hypre_error_w_msg(HYPRE_ERROR_GENERIC,"WARNING: Negative col index encountered during hypre_BoomerAMGDD_RecursivelyBuildPsiComposite().\n");
+         hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                           "WARNING: Negative col index encountered during hypre_BoomerAMGDD_RecursivelyBuildPsiComposite().\n");
       }
    }
 
    // Look at neighbors in offd
-   for (i = hypre_CSRMatrixI(offd)[node]; i < hypre_CSRMatrixI(offd)[node+1]; i++)
+   for (i = hypre_CSRMatrixI(offd)[node]; i < hypre_CSRMatrixI(offd)[node + 1]; i++)
    {
       // Get the index of the neighbor
       index = hypre_CSRMatrixJ(offd)[i];
@@ -1743,8 +1964,8 @@ hypre_BoomerAMGDD_RecursivelyBuildPsiComposite( HYPRE_Int            node,
          }
          else
          {
-            if (use_sort) sort_index = sort_map[index] + hypre_AMGDDCompGridNumOwnedNodes(compGrid);
-            else sort_index = index + hypre_AMGDDCompGridNumOwnedNodes(compGrid);
+            if (use_sort) { sort_index = sort_map[index] + hypre_AMGDDCompGridNumOwnedNodes(compGrid); }
+            else { sort_index = index + hypre_AMGDDCompGridNumOwnedNodes(compGrid); }
             index += hypre_AMGDDCompGridNumOwnedNodes(compGrid);
          }
 
@@ -1753,13 +1974,14 @@ hypre_BoomerAMGDD_RecursivelyBuildPsiComposite( HYPRE_Int            node,
          {
             add_flag[sort_index] = m;
             // Recursively call to find distance m-1 neighbors of index
-            if (m-1 > 0) error_code = hypre_BoomerAMGDD_RecursivelyBuildPsiComposite(index, m-1, compGrid, add_flag, use_sort);
+            if (m - 1 > 0) { error_code = hypre_BoomerAMGDD_RecursivelyBuildPsiComposite(index, m - 1, compGrid, add_flag, use_sort); }
          }
       }
       else
       {
          error_code = 1;
-         hypre_error_w_msg(HYPRE_ERROR_GENERIC,"WARNING: Negative col index encountered during hypre_BoomerAMGDD_RecursivelyBuildPsiComposite().\n");
+         hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                           "WARNING: Negative col index encountered during hypre_BoomerAMGDD_RecursivelyBuildPsiComposite().\n");
       }
    }
 
@@ -1812,13 +2034,13 @@ hypre_BoomerAMGDD_PackSendBuffer( hypre_ParAMGDDData *amgdd_data,
    add_flag[current_level] = hypre_CTAlloc(HYPRE_Int, total_num_nodes, memory_location);
 
    send_buffer_size[current_level][proc] += 2;
-   if (current_level != num_levels-1)
+   if (current_level != num_levels - 1)
    {
-      send_buffer_size[current_level][proc] += 3*num_send_nodes[current_level][proc][current_level];
+      send_buffer_size[current_level][proc] += 3 * num_send_nodes[current_level][proc][current_level];
    }
    else
    {
-      send_buffer_size[current_level][proc] += 2*num_send_nodes[current_level][proc][current_level];
+      send_buffer_size[current_level][proc] += 2 * num_send_nodes[current_level][proc][current_level];
    }
 
    for (i = 0; i < num_send_nodes[current_level][proc][current_level]; i++)
@@ -1832,31 +2054,33 @@ hypre_BoomerAMGDD_PackSendBuffer( hypre_ParAMGDDData *amgdd_data,
 
       diag = hypre_AMGDDCompGridMatrixOwnedDiag(hypre_AMGDDCompGridA(compGrid[current_level]));
       offd = hypre_AMGDDCompGridMatrixOwnedOffd(hypre_AMGDDCompGridA(compGrid[current_level]));
-      send_buffer_size[current_level][proc] += hypre_CSRMatrixI(diag)[send_elmt+1] - hypre_CSRMatrixI(diag)[send_elmt];
-      send_buffer_size[current_level][proc] += hypre_CSRMatrixI(offd)[send_elmt+1] - hypre_CSRMatrixI(offd)[send_elmt];
+      send_buffer_size[current_level][proc] += hypre_CSRMatrixI(diag)[send_elmt + 1] - hypre_CSRMatrixI(
+                                                  diag)[send_elmt];
+      send_buffer_size[current_level][proc] += hypre_CSRMatrixI(offd)[send_elmt + 1] - hypre_CSRMatrixI(
+                                                  offd)[send_elmt];
    }
 
    // Add the nodes listed by the coarse grid counterparts if applicable
    // Note that the compGridCommPkg is set up to list all nodes within the padding plus ghost layers
-   if (current_level != num_levels-1)
+   if (current_level != num_levels - 1)
    {
-      total_num_nodes = hypre_AMGDDCompGridNumOwnedNodes(compGrid[current_level+1]) +
-                        hypre_AMGDDCompGridNumNonOwnedNodes(compGrid[current_level+1]);
-      memory_location = hypre_AMGDDCompGridMemoryLocation(compGrid[current_level+1]);
-      add_flag[current_level+1] = hypre_CTAlloc(HYPRE_Int, total_num_nodes, memory_location);
+      total_num_nodes = hypre_AMGDDCompGridNumOwnedNodes(compGrid[current_level + 1]) +
+                        hypre_AMGDDCompGridNumNonOwnedNodes(compGrid[current_level + 1]);
+      memory_location = hypre_AMGDDCompGridMemoryLocation(compGrid[current_level + 1]);
+      add_flag[current_level + 1] = hypre_CTAlloc(HYPRE_Int, total_num_nodes, memory_location);
 
       total_num_nodes  = hypre_AMGDDCompGridNumOwnedNodes(compGrid[current_level]) +
                          hypre_AMGDDCompGridNumNonOwnedNodes(compGrid[current_level]);
       hypre_BoomerAMGDD_MarkCoarse(send_flag[current_level][proc][current_level],
-                                   add_flag[current_level+1],
+                                   add_flag[current_level + 1],
                                    hypre_AMGDDCompGridOwnedCoarseIndices(compGrid[current_level]),
                                    hypre_AMGDDCompGridNonOwnedCoarseIndices(compGrid[current_level]),
-                                   hypre_AMGDDCompGridNonOwnedSort(compGrid[current_level+1]),
+                                   hypre_AMGDDCompGridNonOwnedSort(compGrid[current_level + 1]),
                                    hypre_AMGDDCompGridNumOwnedNodes(compGrid[current_level]),
                                    total_num_nodes,
-                                   hypre_AMGDDCompGridNumOwnedNodes(compGrid[current_level+1]),
+                                   hypre_AMGDDCompGridNumOwnedNodes(compGrid[current_level + 1]),
                                    num_send_nodes[current_level][proc][current_level],
-                                   padding[current_level+1] + num_ghost_layers + 1,
+                                   padding[current_level + 1] + num_ghost_layers + 1,
                                    1,
                                    &nodes_to_add);
    }
@@ -1875,12 +2099,12 @@ hypre_BoomerAMGDD_PackSendBuffer( hypre_ParAMGDDData *amgdd_data,
          nodes_to_add = 0;
 
          // if we need coarse info, allocate space for the add flag on the next level
-         if (level != num_levels-1)
+         if (level != num_levels - 1)
          {
-            total_num_nodes = hypre_AMGDDCompGridNumOwnedNodes(compGrid[level+1]) +
-                              hypre_AMGDDCompGridNumNonOwnedNodes(compGrid[level+1]);
-            memory_location = hypre_AMGDDCompGridMemoryLocation(compGrid[current_level+1]);
-            add_flag[level+1] = hypre_CTAlloc(HYPRE_Int, total_num_nodes, memory_location);
+            total_num_nodes = hypre_AMGDDCompGridNumOwnedNodes(compGrid[level + 1]) +
+                              hypre_AMGDDCompGridNumNonOwnedNodes(compGrid[level + 1]);
+            memory_location = hypre_AMGDDCompGridMemoryLocation(compGrid[current_level + 1]);
+            add_flag[level + 1] = hypre_CTAlloc(HYPRE_Int, total_num_nodes, memory_location);
          }
 
          // Expand by the padding on this level and add coarse grid counterparts if applicable
@@ -1910,9 +2134,9 @@ hypre_BoomerAMGDD_PackSendBuffer( hypre_ParAMGDDData *amgdd_data,
          }
 
          send_flag[current_level][proc][level] = hypre_BoomerAMGDD_AddFlagToSendFlag(compGrid[level],
-                                                   add_flag[level],
-                                                   &(num_send_nodes[current_level][proc][level]),
-                                                   num_ghost_layers);
+                                                                                     add_flag[level],
+                                                                                     &(num_send_nodes[current_level][proc][level]),
+                                                                                     num_ghost_layers);
 
          // Compare with previous send/recvs to eliminate redundant info
          hypre_BoomerAMGDD_RemoveRedundancy(amg_data,
@@ -1925,20 +2149,20 @@ hypre_BoomerAMGDD_PackSendBuffer( hypre_ParAMGDDData *amgdd_data,
                                             level);
 
          // Mark the points to start from on the next level
-         if (level != num_levels-1)
+         if (level != num_levels - 1)
          {
             total_num_nodes = hypre_AMGDDCompGridNumOwnedNodes(compGrid[level]) +
                               hypre_AMGDDCompGridNumNonOwnedNodes(compGrid[level]);
             hypre_BoomerAMGDD_MarkCoarse(send_flag[current_level][proc][level],
-                                         add_flag[level+1],
+                                         add_flag[level + 1],
                                          hypre_AMGDDCompGridOwnedCoarseIndices(compGrid[level]),
                                          hypre_AMGDDCompGridNonOwnedCoarseIndices(compGrid[level]),
-                                         hypre_AMGDDCompGridNonOwnedSort(compGrid[level+1]),
+                                         hypre_AMGDDCompGridNonOwnedSort(compGrid[level + 1]),
                                          hypre_AMGDDCompGridNumOwnedNodes(compGrid[level]),
                                          total_num_nodes,
-                                         hypre_AMGDDCompGridNumOwnedNodes(compGrid[level+1]),
+                                         hypre_AMGDDCompGridNumOwnedNodes(compGrid[level + 1]),
                                          num_send_nodes[current_level][proc][level],
-                                         padding[level+1] + num_ghost_layers + 1,
+                                         padding[level + 1] + num_ghost_layers + 1,
                                          1,
                                          &nodes_to_add);
          }
@@ -1947,15 +2171,15 @@ hypre_BoomerAMGDD_PackSendBuffer( hypre_ParAMGDDData *amgdd_data,
          total_num_nodes = hypre_AMGDDCompGridNumOwnedNodes(compGrid[level]) +
                            hypre_AMGDDCompGridNumNonOwnedNodes(compGrid[level]);
 
-         hypre_Memset(add_flag[level], 0, sizeof(HYPRE_Int)*total_num_nodes, HYPRE_MEMORY_HOST);
+         hypre_Memset(add_flag[level], 0, sizeof(HYPRE_Int)*total_num_nodes, memory_location);
          (*send_flag_buffer_size) += num_send_nodes[current_level][proc][level];
-         if (level != num_levels-1)
+         if (level != num_levels - 1)
          {
-            send_buffer_size[current_level][proc] += 3*num_send_nodes[current_level][proc][level];
+            send_buffer_size[current_level][proc] += 3 * num_send_nodes[current_level][proc][level];
          }
          else
          {
-            send_buffer_size[current_level][proc] += 2*num_send_nodes[current_level][proc][level];
+            send_buffer_size[current_level][proc] += 2 * num_send_nodes[current_level][proc][level];
          }
 
          for (i = 0; i < num_send_nodes[current_level][proc][level]; i++)
@@ -1971,21 +2195,27 @@ hypre_BoomerAMGDD_PackSendBuffer( hypre_ParAMGDDData *amgdd_data,
                add_flag[level][send_elmt] = i + 1;
                diag = hypre_AMGDDCompGridMatrixOwnedDiag(hypre_AMGDDCompGridA(compGrid[level]));
                offd = hypre_AMGDDCompGridMatrixOwnedOffd(hypre_AMGDDCompGridA(compGrid[level]));
-               send_buffer_size[current_level][proc] += hypre_CSRMatrixI(diag)[send_elmt+1] - hypre_CSRMatrixI(diag)[send_elmt];
-               send_buffer_size[current_level][proc] += hypre_CSRMatrixI(offd)[send_elmt+1] - hypre_CSRMatrixI(offd)[send_elmt];
+               send_buffer_size[current_level][proc] += hypre_CSRMatrixI(diag)[send_elmt + 1] - hypre_CSRMatrixI(
+                                                           diag)[send_elmt];
+               send_buffer_size[current_level][proc] += hypre_CSRMatrixI(offd)[send_elmt + 1] - hypre_CSRMatrixI(
+                                                           offd)[send_elmt];
             }
-            else if (send_elmt < hypre_AMGDDCompGridNumOwnedNodes(compGrid[level]) + hypre_AMGDDCompGridNumNonOwnedNodes(compGrid[level]))
+            else if (send_elmt < hypre_AMGDDCompGridNumOwnedNodes(compGrid[level]) +
+                     hypre_AMGDDCompGridNumNonOwnedNodes(compGrid[level]))
             {
                add_flag[level][send_elmt] = i + 1;
                send_elmt -= hypre_AMGDDCompGridNumOwnedNodes(compGrid[level]);
                diag = hypre_AMGDDCompGridMatrixNonOwnedDiag(hypre_AMGDDCompGridA(compGrid[level]));
                offd = hypre_AMGDDCompGridMatrixNonOwnedOffd(hypre_AMGDDCompGridA(compGrid[level]));
-               send_buffer_size[current_level][proc] += hypre_CSRMatrixI(diag)[send_elmt+1] - hypre_CSRMatrixI(diag)[send_elmt];
-               send_buffer_size[current_level][proc] += hypre_CSRMatrixI(offd)[send_elmt+1] - hypre_CSRMatrixI(offd)[send_elmt];
+               send_buffer_size[current_level][proc] += hypre_CSRMatrixI(diag)[send_elmt + 1] - hypre_CSRMatrixI(
+                                                           diag)[send_elmt];
+               send_buffer_size[current_level][proc] += hypre_CSRMatrixI(offd)[send_elmt + 1] - hypre_CSRMatrixI(
+                                                           offd)[send_elmt];
             }
             else
             {
-               send_elmt -= hypre_AMGDDCompGridNumOwnedNodes(compGrid[level]) + hypre_AMGDDCompGridNumNonOwnedNodes(compGrid[level]);
+               send_elmt -= hypre_AMGDDCompGridNumOwnedNodes(compGrid[level]) +
+                            hypre_AMGDDCompGridNumNonOwnedNodes(compGrid[level]);
                add_flag[level][send_elmt] = i + 1;
             }
          }
@@ -2025,7 +2255,8 @@ hypre_BoomerAMGDD_PackSendBuffer( hypre_ParAMGDDData *amgdd_data,
             }
             else
             {
-               send_buffer[cnt++] = -(hypre_AMGDDCompGridNonOwnedGlobalIndices(compGrid[level])[ send_elmt - hypre_AMGDDCompGridNumOwnedNodes(compGrid[level]) ] + 1);
+               send_buffer[cnt++] = -(hypre_AMGDDCompGridNonOwnedGlobalIndices(compGrid[level])[ send_elmt -
+                                                                                                 hypre_AMGDDCompGridNumOwnedNodes(compGrid[level]) ] + 1);
             }
          }
          else
@@ -2041,13 +2272,14 @@ hypre_BoomerAMGDD_PackSendBuffer( hypre_ParAMGDDData *amgdd_data,
             }
             else
             {
-               send_buffer[cnt++] = hypre_AMGDDCompGridNonOwnedGlobalIndices(compGrid[level])[send_elmt - hypre_AMGDDCompGridNumOwnedNodes(compGrid[level])];
+               send_buffer[cnt++] = hypre_AMGDDCompGridNonOwnedGlobalIndices(compGrid[level])[send_elmt -
+                                                                                              hypre_AMGDDCompGridNumOwnedNodes(compGrid[level])];
             }
          }
       }
 
       // if not on last level, copy coarse gobal indices
-      if (level != num_levels-1)
+      if (level != num_levels - 1)
       {
          for (i = 0; i < num_send_nodes[current_level][proc][level]; i++)
          {
@@ -2065,7 +2297,8 @@ hypre_BoomerAMGDD_PackSendBuffer( hypre_ParAMGDDData *amgdd_data,
             {
                if (hypre_AMGDDCompGridOwnedCoarseIndices(compGrid[level])[ send_elmt ] >= 0)
                {
-                  send_buffer[cnt++] = hypre_AMGDDCompGridOwnedCoarseIndices(compGrid[level])[send_elmt] + hypre_AMGDDCompGridFirstGlobalIndex(compGrid[level+1]);
+                  send_buffer[cnt++] = hypre_AMGDDCompGridOwnedCoarseIndices(compGrid[level])[send_elmt] +
+                                       hypre_AMGDDCompGridFirstGlobalIndex(compGrid[level + 1]);
                }
                else
                {
@@ -2079,7 +2312,8 @@ hypre_BoomerAMGDD_PackSendBuffer( hypre_ParAMGDDData *amgdd_data,
 
                if (nonowned_coarse_index >= 0)
                {
-                  send_buffer[cnt++] = hypre_AMGDDCompGridNonOwnedGlobalIndices(compGrid[level+1])[ nonowned_coarse_index ];
+                  send_buffer[cnt++] = hypre_AMGDDCompGridNonOwnedGlobalIndices(compGrid[level
+                                                                                         + 1])[ nonowned_coarse_index ];
                }
                else if (nonowned_coarse_index == -1)
                {
@@ -2106,7 +2340,7 @@ hypre_BoomerAMGDD_PackSendBuffer( hypre_ParAMGDDData *amgdd_data,
             diag = hypre_AMGDDCompGridMatrixOwnedDiag(hypre_AMGDDCompGridA(compGrid[level]));
             offd = hypre_AMGDDCompGridMatrixOwnedOffd(hypre_AMGDDCompGridA(compGrid[level]));
             row_length = hypre_CSRMatrixI(diag)[send_elmt + 1] - hypre_CSRMatrixI(diag)[send_elmt]
-                       + hypre_CSRMatrixI(offd)[send_elmt + 1] - hypre_CSRMatrixI(offd)[send_elmt];
+                         + hypre_CSRMatrixI(offd)[send_elmt + 1] - hypre_CSRMatrixI(offd)[send_elmt];
          }
          else if (send_elmt < total_num_nodes)
          {
@@ -2114,7 +2348,7 @@ hypre_BoomerAMGDD_PackSendBuffer( hypre_ParAMGDDData *amgdd_data,
             diag = hypre_AMGDDCompGridMatrixNonOwnedDiag(hypre_AMGDDCompGridA(compGrid[level]));
             offd = hypre_AMGDDCompGridMatrixNonOwnedOffd(hypre_AMGDDCompGridA(compGrid[level]));
             row_length = hypre_CSRMatrixI(diag)[nonowned_index + 1] - hypre_CSRMatrixI(diag)[nonowned_index]
-                       + hypre_CSRMatrixI(offd)[nonowned_index + 1] - hypre_CSRMatrixI(offd)[nonowned_index];
+                         + hypre_CSRMatrixI(offd)[nonowned_index + 1] - hypre_CSRMatrixI(offd)[nonowned_index];
          }
          else
          {
@@ -2159,7 +2393,7 @@ hypre_BoomerAMGDD_PackRecvMapSendBuffer( HYPRE_Int   *recv_map_send_buffer,
 
    cnt = 0;
    *recv_buffer_size = 0;
-   for (level = current_level+1; level < num_levels; level++)
+   for (level = current_level + 1; level < num_levels; level++)
    {
       // if there were nodes in psiComposite on this level
       if (recv_red_marker[level])
@@ -2175,7 +2409,7 @@ hypre_BoomerAMGDD_PackRecvMapSendBuffer( HYPRE_Int   *recv_map_send_buffer,
          }
       }
       // otherwise record that there were zero nodes on this level
-      else recv_map_send_buffer[cnt++] = 0;
+      else { recv_map_send_buffer[cnt++] = 0; }
    }
 
    return hypre_error_flag;
@@ -2190,11 +2424,13 @@ hypre_BoomerAMGDD_UnpackSendFlagBuffer( hypre_AMGDDCompGrid **compGrid,
                                         HYPRE_Int             current_level,
                                         HYPRE_Int             num_levels )
 {
+   HYPRE_UNUSED_VAR(compGrid);
+
    HYPRE_Int level, i, cnt, num_nodes;
 
    cnt = 0;
    *send_buffer_size = 0;
-   for (level = current_level+1; level < num_levels; level++)
+   for (level = current_level + 1; level < num_levels; level++)
    {
       num_nodes = send_flag_buffer[cnt++];
       num_send_nodes[level] = 0;
@@ -2208,7 +2444,8 @@ hypre_BoomerAMGDD_UnpackSendFlagBuffer( hypre_AMGDDCompGrid **compGrid,
          }
       }
 
-      send_flag[level] = hypre_TReAlloc(send_flag[level], HYPRE_Int, num_send_nodes[level], HYPRE_MEMORY_HOST);
+      send_flag[level] = hypre_TReAlloc(send_flag[level], HYPRE_Int, num_send_nodes[level],
+                                        HYPRE_MEMORY_HOST);
    }
 
    return hypre_error_flag;
@@ -2230,41 +2467,67 @@ hypre_BoomerAMGDD_CommunicateRemainingMatrixInfo( hypre_ParAMGDDData* amgdd_data
    HYPRE_Int *R_row_cnt = hypre_CTAlloc(HYPRE_Int, num_levels, HYPRE_MEMORY_HOST);
    HYPRE_Int *A_row_cnt = hypre_CTAlloc(HYPRE_Int, num_levels, HYPRE_MEMORY_HOST);
 
-   HYPRE_Int outer_level,proc,level,i,j;
+   HYPRE_Int outer_level, proc, level, i, j;
 
-   for (outer_level = num_levels-1; outer_level >= amgdd_start_level; outer_level--)
+   for (outer_level = num_levels - 1; outer_level >= amgdd_start_level; outer_level--)
    {
 
       // Initialize nonowned matrices for P (and R)
-      if (outer_level != num_levels-1)
+      if (outer_level != num_levels - 1)
       {
-         hypre_CSRMatrix *P_diag_original = hypre_ParCSRMatrixDiag(hypre_ParAMGDataPArray(amg_data)[outer_level]);
-         hypre_CSRMatrix *P_offd_original = hypre_ParCSRMatrixOffd(hypre_ParAMGDataPArray(amg_data)[outer_level]);
+         hypre_CSRMatrix *P_diag_original = hypre_ParCSRMatrixDiag(hypre_ParAMGDataPArray(
+                                                                      amg_data)[outer_level]);
+         hypre_CSRMatrix *P_offd_original = hypre_ParCSRMatrixOffd(hypre_ParAMGDataPArray(
+                                                                      amg_data)[outer_level]);
          HYPRE_Int ave_nnz_per_row = 1;
          if (hypre_ParAMGDataPMaxElmts(amg_data))
+         {
             ave_nnz_per_row = hypre_ParAMGDataPMaxElmts(amg_data);
+         }
          else if (hypre_CSRMatrixNumRows(P_diag_original))
-            ave_nnz_per_row = (HYPRE_Int) (hypre_CSRMatrixNumNonzeros(P_diag_original) / hypre_CSRMatrixNumRows(P_diag_original));
-         HYPRE_Int max_nonowned_diag_nnz = hypre_AMGDDCompGridNumNonOwnedNodes(compGrid[outer_level]) * ave_nnz_per_row;
+         {
+            ave_nnz_per_row = (HYPRE_Int) (hypre_CSRMatrixNumNonzeros(P_diag_original) / hypre_CSRMatrixNumRows(
+                                              P_diag_original));
+         }
+         HYPRE_Int max_nonowned_diag_nnz = hypre_AMGDDCompGridNumNonOwnedNodes(
+                                              compGrid[outer_level]) * ave_nnz_per_row;
          HYPRE_Int max_nonowned_offd_nnz = hypre_CSRMatrixNumNonzeros(P_offd_original);
-         hypre_AMGDDCompGridMatrixNonOwnedDiag(hypre_AMGDDCompGridP(compGrid[outer_level])) = hypre_CSRMatrixCreate(hypre_AMGDDCompGridNumNonOwnedNodes(compGrid[outer_level]), hypre_AMGDDCompGridNumNonOwnedNodes(compGrid[outer_level+1]), max_nonowned_diag_nnz);
-         hypre_CSRMatrixInitialize(hypre_AMGDDCompGridMatrixNonOwnedDiag(hypre_AMGDDCompGridP(compGrid[outer_level])));
-         hypre_AMGDDCompGridMatrixNonOwnedOffd(hypre_AMGDDCompGridP(compGrid[outer_level])) = hypre_CSRMatrixCreate(hypre_AMGDDCompGridNumNonOwnedNodes(compGrid[outer_level]), hypre_AMGDDCompGridNumOwnedNodes(compGrid[outer_level+1]), max_nonowned_offd_nnz);
-         hypre_CSRMatrixInitialize(hypre_AMGDDCompGridMatrixNonOwnedOffd(hypre_AMGDDCompGridP(compGrid[outer_level])));
+         hypre_AMGDDCompGridMatrixNonOwnedDiag(hypre_AMGDDCompGridP(compGrid[outer_level])) =
+            hypre_CSRMatrixCreate(hypre_AMGDDCompGridNumNonOwnedNodes(compGrid[outer_level]),
+                                  hypre_AMGDDCompGridNumNonOwnedNodes(compGrid[outer_level + 1]), max_nonowned_diag_nnz);
+         hypre_CSRMatrixInitialize(hypre_AMGDDCompGridMatrixNonOwnedDiag(hypre_AMGDDCompGridP(
+                                                                            compGrid[outer_level])));
+         hypre_AMGDDCompGridMatrixNonOwnedOffd(hypre_AMGDDCompGridP(compGrid[outer_level])) =
+            hypre_CSRMatrixCreate(hypre_AMGDDCompGridNumNonOwnedNodes(compGrid[outer_level]),
+                                  hypre_AMGDDCompGridNumOwnedNodes(compGrid[outer_level + 1]), max_nonowned_offd_nnz);
+         hypre_CSRMatrixInitialize(hypre_AMGDDCompGridMatrixNonOwnedOffd(hypre_AMGDDCompGridP(
+                                                                            compGrid[outer_level])));
       }
       if (hypre_ParAMGDataRestriction(amg_data) && outer_level != 0)
       {
-         hypre_CSRMatrix *R_diag_original = hypre_ParCSRMatrixDiag(hypre_ParAMGDataPArray(amg_data)[outer_level-1]);
-         hypre_CSRMatrix *R_offd_original = hypre_ParCSRMatrixOffd(hypre_ParAMGDataPArray(amg_data)[outer_level-1]);
+         hypre_CSRMatrix *R_diag_original = hypre_ParCSRMatrixDiag(hypre_ParAMGDataPArray(
+                                                                      amg_data)[outer_level - 1]);
+         hypre_CSRMatrix *R_offd_original = hypre_ParCSRMatrixOffd(hypre_ParAMGDataPArray(
+                                                                      amg_data)[outer_level - 1]);
          HYPRE_Int ave_nnz_per_row = 1;
          if (hypre_CSRMatrixNumRows(R_diag_original))
-            ave_nnz_per_row = (HYPRE_Int) (hypre_CSRMatrixNumNonzeros(R_diag_original) / hypre_CSRMatrixNumRows(R_diag_original));
-         HYPRE_Int max_nonowned_diag_nnz = hypre_AMGDDCompGridNumNonOwnedNodes(compGrid[outer_level]) * ave_nnz_per_row;
+         {
+            ave_nnz_per_row = (HYPRE_Int) (hypre_CSRMatrixNumNonzeros(R_diag_original) / hypre_CSRMatrixNumRows(
+                                              R_diag_original));
+         }
+         HYPRE_Int max_nonowned_diag_nnz = hypre_AMGDDCompGridNumNonOwnedNodes(
+                                              compGrid[outer_level]) * ave_nnz_per_row;
          HYPRE_Int max_nonowned_offd_nnz = hypre_CSRMatrixNumNonzeros(R_offd_original);
-         hypre_AMGDDCompGridMatrixNonOwnedDiag(hypre_AMGDDCompGridR(compGrid[outer_level-1])) = hypre_CSRMatrixCreate(hypre_AMGDDCompGridNumNonOwnedNodes(compGrid[outer_level]), hypre_AMGDDCompGridNumNonOwnedNodes(compGrid[outer_level-1]), max_nonowned_diag_nnz);
-         hypre_CSRMatrixInitialize(hypre_AMGDDCompGridMatrixNonOwnedDiag(hypre_AMGDDCompGridR(compGrid[outer_level-1])));
-         hypre_AMGDDCompGridMatrixNonOwnedOffd(hypre_AMGDDCompGridR(compGrid[outer_level-1])) = hypre_CSRMatrixCreate(hypre_AMGDDCompGridNumNonOwnedNodes(compGrid[outer_level]), hypre_AMGDDCompGridNumOwnedNodes(compGrid[outer_level-1]), max_nonowned_offd_nnz);
-         hypre_CSRMatrixInitialize(hypre_AMGDDCompGridMatrixNonOwnedOffd(hypre_AMGDDCompGridR(compGrid[outer_level-1])));
+         hypre_AMGDDCompGridMatrixNonOwnedDiag(hypre_AMGDDCompGridR(compGrid[outer_level - 1])) =
+            hypre_CSRMatrixCreate(hypre_AMGDDCompGridNumNonOwnedNodes(compGrid[outer_level]),
+                                  hypre_AMGDDCompGridNumNonOwnedNodes(compGrid[outer_level - 1]), max_nonowned_diag_nnz);
+         hypre_CSRMatrixInitialize(hypre_AMGDDCompGridMatrixNonOwnedDiag(hypre_AMGDDCompGridR(
+                                                                            compGrid[outer_level - 1])));
+         hypre_AMGDDCompGridMatrixNonOwnedOffd(hypre_AMGDDCompGridR(compGrid[outer_level - 1])) =
+            hypre_CSRMatrixCreate(hypre_AMGDDCompGridNumNonOwnedNodes(compGrid[outer_level]),
+                                  hypre_AMGDDCompGridNumOwnedNodes(compGrid[outer_level - 1]), max_nonowned_offd_nnz);
+         hypre_CSRMatrixInitialize(hypre_AMGDDCompGridMatrixNonOwnedOffd(hypre_AMGDDCompGridR(
+                                                                            compGrid[outer_level - 1])));
       }
 
       // Get send/recv info from the comp grid comm pkg
@@ -2279,7 +2542,7 @@ hypre_BoomerAMGDD_CommunicateRemainingMatrixInfo( hypre_ParAMGDDData* amgdd_data
          // Get the buffer sizes
          ////////////////////////////////////
 
-         HYPRE_Int *send_sizes = hypre_CTAlloc(HYPRE_Int, 2*num_send_procs, HYPRE_MEMORY_HOST);
+         HYPRE_Int *send_sizes = hypre_CTAlloc(HYPRE_Int, 2 * num_send_procs, HYPRE_MEMORY_HOST);
          for (proc = 0; proc < num_send_procs; proc++)
          {
             for (level = outer_level; level < num_levels; level++)
@@ -2291,28 +2554,28 @@ hypre_BoomerAMGDD_CommunicateRemainingMatrixInfo( hypre_ParAMGDDData* amgdd_data
                for (i = 0; i < hypre_AMGDDCommPkgNumSendNodes(compGridCommPkg)[outer_level][proc][level]; i++)
                {
                   idx = hypre_AMGDDCommPkgSendFlag(compGridCommPkg)[outer_level][proc][level][i];
-                  if (idx < 0) idx = -(idx + 1);
+                  if (idx < 0) { idx = -(idx + 1); }
 
                   // Owned diag and offd
                   if (idx < hypre_AMGDDCompGridNumOwnedNodes(compGrid[level]))
                   {
                      diag = hypre_AMGDDCompGridMatrixOwnedDiag(hypre_AMGDDCompGridA(compGrid[level]));
                      offd = hypre_AMGDDCompGridMatrixOwnedOffd(hypre_AMGDDCompGridA(compGrid[level]));
-                     A_row_size = hypre_CSRMatrixI(diag)[idx+1] - hypre_CSRMatrixI(diag)[idx]
-                                + hypre_CSRMatrixI(offd)[idx+1] - hypre_CSRMatrixI(offd)[idx];
-                     if (level != num_levels-1)
+                     A_row_size = hypre_CSRMatrixI(diag)[idx + 1] - hypre_CSRMatrixI(diag)[idx]
+                                  + hypre_CSRMatrixI(offd)[idx + 1] - hypre_CSRMatrixI(offd)[idx];
+                     if (level != num_levels - 1)
                      {
                         diag = hypre_AMGDDCompGridMatrixOwnedDiag(hypre_AMGDDCompGridP(compGrid[level]));
                         offd = hypre_AMGDDCompGridMatrixOwnedOffd(hypre_AMGDDCompGridP(compGrid[level]));
-                        P_row_size = hypre_CSRMatrixI(diag)[idx+1] - hypre_CSRMatrixI(diag)[idx]
-                                   + hypre_CSRMatrixI(offd)[idx+1] - hypre_CSRMatrixI(offd)[idx];
+                        P_row_size = hypre_CSRMatrixI(diag)[idx + 1] - hypre_CSRMatrixI(diag)[idx]
+                                     + hypre_CSRMatrixI(offd)[idx + 1] - hypre_CSRMatrixI(offd)[idx];
                      }
                      if (hypre_ParAMGDataRestriction(amg_data) && level != 0)
                      {
-                        diag = hypre_AMGDDCompGridMatrixOwnedDiag(hypre_AMGDDCompGridR(compGrid[level-1]));
-                        offd = hypre_AMGDDCompGridMatrixOwnedOffd(hypre_AMGDDCompGridR(compGrid[level-1]));
-                        R_row_size = hypre_CSRMatrixI(diag)[idx+1] - hypre_CSRMatrixI(diag)[idx]
-                                   + hypre_CSRMatrixI(offd)[idx+1] - hypre_CSRMatrixI(offd)[idx];
+                        diag = hypre_AMGDDCompGridMatrixOwnedDiag(hypre_AMGDDCompGridR(compGrid[level - 1]));
+                        offd = hypre_AMGDDCompGridMatrixOwnedOffd(hypre_AMGDDCompGridR(compGrid[level - 1]));
+                        R_row_size = hypre_CSRMatrixI(diag)[idx + 1] - hypre_CSRMatrixI(diag)[idx]
+                                     + hypre_CSRMatrixI(offd)[idx + 1] - hypre_CSRMatrixI(offd)[idx];
                      }
                   }
                   // Nonowned diag and offd
@@ -2322,49 +2585,56 @@ hypre_BoomerAMGDD_CommunicateRemainingMatrixInfo( hypre_ParAMGDDData* amgdd_data
                      // Count diag and offd
                      diag = hypre_AMGDDCompGridMatrixNonOwnedDiag(hypre_AMGDDCompGridA(compGrid[level]));
                      offd = hypre_AMGDDCompGridMatrixNonOwnedOffd(hypre_AMGDDCompGridA(compGrid[level]));
-                     A_row_size = hypre_CSRMatrixI(diag)[idx+1] - hypre_CSRMatrixI(diag)[idx]
-                                + hypre_CSRMatrixI(offd)[idx+1] - hypre_CSRMatrixI(offd)[idx];
-                     if (level != num_levels-1)
+                     A_row_size = hypre_CSRMatrixI(diag)[idx + 1] - hypre_CSRMatrixI(diag)[idx]
+                                  + hypre_CSRMatrixI(offd)[idx + 1] - hypre_CSRMatrixI(offd)[idx];
+                     if (level != num_levels - 1)
                      {
                         diag = hypre_AMGDDCompGridMatrixNonOwnedDiag(hypre_AMGDDCompGridP(compGrid[level]));
                         offd = hypre_AMGDDCompGridMatrixNonOwnedOffd(hypre_AMGDDCompGridP(compGrid[level]));
-                        P_row_size = hypre_CSRMatrixI(diag)[idx+1] - hypre_CSRMatrixI(diag)[idx]
-                                   + hypre_CSRMatrixI(offd)[idx+1] - hypre_CSRMatrixI(offd)[idx];
+                        P_row_size = hypre_CSRMatrixI(diag)[idx + 1] - hypre_CSRMatrixI(diag)[idx]
+                                     + hypre_CSRMatrixI(offd)[idx + 1] - hypre_CSRMatrixI(offd)[idx];
                      }
                      if (hypre_ParAMGDataRestriction(amg_data) && level != 0)
                      {
-                        diag = hypre_AMGDDCompGridMatrixNonOwnedDiag(hypre_AMGDDCompGridR(compGrid[level-1]));
-                        offd = hypre_AMGDDCompGridMatrixNonOwnedOffd(hypre_AMGDDCompGridR(compGrid[level-1]));
-                        R_row_size = hypre_CSRMatrixI(diag)[idx+1] - hypre_CSRMatrixI(diag)[idx]
-                                   + hypre_CSRMatrixI(offd)[idx+1] - hypre_CSRMatrixI(offd)[idx];
+                        diag = hypre_AMGDDCompGridMatrixNonOwnedDiag(hypre_AMGDDCompGridR(compGrid[level - 1]));
+                        offd = hypre_AMGDDCompGridMatrixNonOwnedOffd(hypre_AMGDDCompGridR(compGrid[level - 1]));
+                        R_row_size = hypre_CSRMatrixI(diag)[idx + 1] - hypre_CSRMatrixI(diag)[idx]
+                                     + hypre_CSRMatrixI(offd)[idx + 1] - hypre_CSRMatrixI(offd)[idx];
                      }
                   }
 
-                  send_sizes[2*proc] += A_row_size + P_row_size + R_row_size;
-                  send_sizes[2*proc+1] += A_row_size + P_row_size + R_row_size;
+                  send_sizes[2 * proc] += A_row_size + P_row_size + R_row_size;
+                  send_sizes[2 * proc + 1] += A_row_size + P_row_size + R_row_size;
                }
-               if (level != num_levels-1) send_sizes[2*proc] += hypre_AMGDDCommPkgNumSendNodes(compGridCommPkg)[outer_level][proc][level];
-               if (hypre_ParAMGDataRestriction(amg_data) && level != 0) send_sizes[2*proc] += hypre_AMGDDCommPkgNumSendNodes(compGridCommPkg)[outer_level][proc][level];
+               if (level != num_levels - 1) { send_sizes[2 * proc] += hypre_AMGDDCommPkgNumSendNodes(compGridCommPkg)[outer_level][proc][level]; }
+               if (hypre_ParAMGDataRestriction(amg_data) && level != 0) { send_sizes[2 * proc] += hypre_AMGDDCommPkgNumSendNodes(compGridCommPkg)[outer_level][proc][level]; }
             }
          }
 
 
          HYPRE_Int **int_recv_buffers = hypre_CTAlloc(HYPRE_Int*, num_recv_procs, HYPRE_MEMORY_HOST);
-         HYPRE_Complex **complex_recv_buffers = hypre_CTAlloc(HYPRE_Complex*, num_recv_procs, HYPRE_MEMORY_HOST);
+         HYPRE_Complex **complex_recv_buffers = hypre_CTAlloc(HYPRE_Complex*, num_recv_procs,
+                                                              HYPRE_MEMORY_HOST);
 
          // Communicate buffer sizes
-         hypre_MPI_Request *size_requests = hypre_CTAlloc(hypre_MPI_Request, num_send_procs + num_recv_procs, HYPRE_MEMORY_HOST);
+         hypre_MPI_Request *size_requests = hypre_CTAlloc(hypre_MPI_Request, num_send_procs + num_recv_procs,
+                                                          HYPRE_MEMORY_HOST);
          HYPRE_Int request_cnt = 0;
-         hypre_MPI_Status *size_statuses = hypre_CTAlloc(hypre_MPI_Status, num_send_procs + num_recv_procs, HYPRE_MEMORY_HOST);
-         HYPRE_Int *recv_sizes = hypre_CTAlloc(HYPRE_Int, 2*num_recv_procs, HYPRE_MEMORY_HOST);
+         hypre_MPI_Status *size_statuses = hypre_CTAlloc(hypre_MPI_Status, num_send_procs + num_recv_procs,
+                                                         HYPRE_MEMORY_HOST);
+         HYPRE_Int *recv_sizes = hypre_CTAlloc(HYPRE_Int, 2 * num_recv_procs, HYPRE_MEMORY_HOST);
 
          for (proc = 0; proc < num_recv_procs; proc++)
          {
-            hypre_MPI_Irecv(&(recv_sizes[2*proc]), 2, HYPRE_MPI_INT, recv_procs[proc], 1, hypre_MPI_COMM_WORLD, &(size_requests[request_cnt++]));
+            hypre_MPI_Irecv(&(recv_sizes[2 * proc]), 2, HYPRE_MPI_INT, recv_procs[proc], 1,
+                            hypre_MPI_COMM_WORLD,
+                            &(size_requests[request_cnt++]));
          }
          for (proc = 0; proc < num_send_procs; proc++)
          {
-            hypre_MPI_Isend(&(send_sizes[2*proc]), 2, HYPRE_MPI_INT, send_procs[proc], 1, hypre_MPI_COMM_WORLD, &(size_requests[request_cnt++]));
+            hypre_MPI_Isend(&(send_sizes[2 * proc]), 2, HYPRE_MPI_INT, send_procs[proc], 1,
+                            hypre_MPI_COMM_WORLD,
+                            &(size_requests[request_cnt++]));
          }
 
          ////////////////////////////////////
@@ -2377,15 +2647,19 @@ hypre_BoomerAMGDD_CommunicateRemainingMatrixInfo( hypre_ParAMGDDData* amgdd_data
          // complex_send_buffer = [ [level] , [level] , ... , [level] ]
          // level = [ [A_data] , [P_data], ( [R_data] ) ]
 
-         hypre_MPI_Request *buf_requests = hypre_CTAlloc(hypre_MPI_Request, 2*(num_send_procs + num_recv_procs), HYPRE_MEMORY_HOST);
+         hypre_MPI_Request *buf_requests = hypre_CTAlloc(hypre_MPI_Request,
+                                                         2 * (num_send_procs + num_recv_procs), HYPRE_MEMORY_HOST);
          request_cnt = 0;
-         hypre_MPI_Status *buf_statuses = hypre_CTAlloc(hypre_MPI_Status, 2*(num_send_procs + num_recv_procs), HYPRE_MEMORY_HOST);
+         hypre_MPI_Status *buf_statuses = hypre_CTAlloc(hypre_MPI_Status,
+                                                        2 * (num_send_procs + num_recv_procs), HYPRE_MEMORY_HOST);
          HYPRE_Int **int_send_buffers = hypre_CTAlloc(HYPRE_Int*, num_send_procs, HYPRE_MEMORY_HOST);
-         HYPRE_Complex **complex_send_buffers = hypre_CTAlloc(HYPRE_Complex*, num_send_procs, HYPRE_MEMORY_HOST);
+         HYPRE_Complex **complex_send_buffers = hypre_CTAlloc(HYPRE_Complex*, num_send_procs,
+                                                              HYPRE_MEMORY_HOST);
          for (proc = 0; proc < num_send_procs; proc++)
          {
-            int_send_buffers[proc] = hypre_CTAlloc(HYPRE_Int, send_sizes[2*proc], HYPRE_MEMORY_HOST);
-            complex_send_buffers[proc] = hypre_CTAlloc(HYPRE_Complex, send_sizes[2*proc+1], HYPRE_MEMORY_HOST);
+            int_send_buffers[proc] = hypre_CTAlloc(HYPRE_Int, send_sizes[2 * proc], HYPRE_MEMORY_HOST);
+            complex_send_buffers[proc] = hypre_CTAlloc(HYPRE_Complex, send_sizes[2 * proc + 1],
+                                                       HYPRE_MEMORY_HOST);
 
             HYPRE_Int int_cnt = 0;
             HYPRE_Int complex_cnt = 0;
@@ -2395,21 +2669,23 @@ hypre_BoomerAMGDD_CommunicateRemainingMatrixInfo( hypre_ParAMGDDData* amgdd_data
                for (i = 0; i < hypre_AMGDDCommPkgNumSendNodes(compGridCommPkg)[outer_level][proc][level]; i++)
                {
                   HYPRE_Int idx = hypre_AMGDDCommPkgSendFlag(compGridCommPkg)[outer_level][proc][level][i];
-                  if (idx < 0) idx = -(idx + 1);
+                  if (idx < 0) { idx = -(idx + 1); }
 
                   // Owned diag and offd
                   if (idx < hypre_AMGDDCompGridNumOwnedNodes(compGrid[level]))
                   {
                      diag = hypre_AMGDDCompGridMatrixOwnedDiag(hypre_AMGDDCompGridA(compGrid[level]));
                      offd = hypre_AMGDDCompGridMatrixOwnedOffd(hypre_AMGDDCompGridA(compGrid[level]));
-                     for (j = hypre_CSRMatrixI(diag)[idx]; j < hypre_CSRMatrixI(diag)[idx+1]; j++)
+                     for (j = hypre_CSRMatrixI(diag)[idx]; j < hypre_CSRMatrixI(diag)[idx + 1]; j++)
                      {
-                        int_send_buffers[proc][int_cnt++] = hypre_CSRMatrixJ(diag)[j] + hypre_AMGDDCompGridFirstGlobalIndex(compGrid[level]);
+                        int_send_buffers[proc][int_cnt++] = hypre_CSRMatrixJ(diag)[j] + hypre_AMGDDCompGridFirstGlobalIndex(
+                                                               compGrid[level]);
                         complex_send_buffers[proc][complex_cnt++] = hypre_CSRMatrixData(diag)[j];
                      }
-                     for (j = hypre_CSRMatrixI(offd)[idx]; j < hypre_CSRMatrixI(offd)[idx+1]; j++)
+                     for (j = hypre_CSRMatrixI(offd)[idx]; j < hypre_CSRMatrixI(offd)[idx + 1]; j++)
                      {
-                        int_send_buffers[proc][int_cnt++] = hypre_AMGDDCompGridNonOwnedGlobalIndices(compGrid[level])[ hypre_CSRMatrixJ(offd)[j] ];
+                        int_send_buffers[proc][int_cnt++] = hypre_AMGDDCompGridNonOwnedGlobalIndices(
+                                                               compGrid[level])[ hypre_CSRMatrixJ(offd)[j] ];
                         complex_send_buffers[proc][complex_cnt++] = hypre_CSRMatrixData(offd)[j];
                      }
                   }
@@ -2420,40 +2696,42 @@ hypre_BoomerAMGDD_CommunicateRemainingMatrixInfo( hypre_ParAMGDDData* amgdd_data
 
                      diag = hypre_AMGDDCompGridMatrixNonOwnedDiag(hypre_AMGDDCompGridA(compGrid[level]));
                      offd = hypre_AMGDDCompGridMatrixNonOwnedOffd(hypre_AMGDDCompGridA(compGrid[level]));
-                     for (j = hypre_CSRMatrixI(diag)[idx]; j < hypre_CSRMatrixI(diag)[idx+1]; j++)
+                     for (j = hypre_CSRMatrixI(diag)[idx]; j < hypre_CSRMatrixI(diag)[idx + 1]; j++)
                      {
-                        if (hypre_CSRMatrixJ(diag)[j] < 0) int_send_buffers[proc][int_cnt++] = -(hypre_CSRMatrixJ(diag)[j]+1);
-                        else int_send_buffers[proc][int_cnt++] = hypre_AMGDDCompGridNonOwnedGlobalIndices(compGrid[level])[ hypre_CSRMatrixJ(diag)[j] ];
+                        if (hypre_CSRMatrixJ(diag)[j] < 0) { int_send_buffers[proc][int_cnt++] = -(hypre_CSRMatrixJ(diag)[j] + 1); }
+                        else { int_send_buffers[proc][int_cnt++] = hypre_AMGDDCompGridNonOwnedGlobalIndices(compGrid[level])[ hypre_CSRMatrixJ(diag)[j] ]; }
                         complex_send_buffers[proc][complex_cnt++] = hypre_CSRMatrixData(diag)[j];
                      }
-                     for (j = hypre_CSRMatrixI(offd)[idx]; j < hypre_CSRMatrixI(offd)[idx+1]; j++)
+                     for (j = hypre_CSRMatrixI(offd)[idx]; j < hypre_CSRMatrixI(offd)[idx + 1]; j++)
                      {
-                        int_send_buffers[proc][int_cnt++] = hypre_CSRMatrixJ(offd)[j] + hypre_AMGDDCompGridFirstGlobalIndex(compGrid[level]);
+                        int_send_buffers[proc][int_cnt++] = hypre_CSRMatrixJ(offd)[j] + hypre_AMGDDCompGridFirstGlobalIndex(
+                                                               compGrid[level]);
                         complex_send_buffers[proc][complex_cnt++] = hypre_CSRMatrixData(offd)[j];
                      }
                   }
                }
                // Pack P
-               if (level != num_levels-1)
+               if (level != num_levels - 1)
                {
                   for (i = 0; i < hypre_AMGDDCommPkgNumSendNodes(compGridCommPkg)[outer_level][proc][level]; i++)
                   {
                      HYPRE_Int idx = hypre_AMGDDCommPkgSendFlag(compGridCommPkg)[outer_level][proc][level][i];
-                     if (idx < 0) idx = -(idx + 1);
+                     if (idx < 0) { idx = -(idx + 1); }
 
                      // Owned diag and offd
                      if (idx < hypre_AMGDDCompGridNumOwnedNodes(compGrid[level]))
                      {
                         diag = hypre_AMGDDCompGridMatrixOwnedDiag(hypre_AMGDDCompGridP(compGrid[level]));
                         offd = hypre_AMGDDCompGridMatrixOwnedOffd(hypre_AMGDDCompGridP(compGrid[level]));
-                        int_send_buffers[proc][int_cnt++] = hypre_CSRMatrixI(diag)[idx+1] - hypre_CSRMatrixI(diag)[idx]
-                                                          + hypre_CSRMatrixI(offd)[idx+1] - hypre_CSRMatrixI(offd)[idx];
-                        for (j = hypre_CSRMatrixI(diag)[idx]; j < hypre_CSRMatrixI(diag)[idx+1]; j++)
+                        int_send_buffers[proc][int_cnt++] = hypre_CSRMatrixI(diag)[idx + 1] - hypre_CSRMatrixI(diag)[idx]
+                                                            + hypre_CSRMatrixI(offd)[idx + 1] - hypre_CSRMatrixI(offd)[idx];
+                        for (j = hypre_CSRMatrixI(diag)[idx]; j < hypre_CSRMatrixI(diag)[idx + 1]; j++)
                         {
-                           int_send_buffers[proc][int_cnt++] = hypre_CSRMatrixJ(diag)[j] + hypre_AMGDDCompGridFirstGlobalIndex(compGrid[level+1]);
+                           int_send_buffers[proc][int_cnt++] = hypre_CSRMatrixJ(diag)[j] + hypre_AMGDDCompGridFirstGlobalIndex(
+                                                                  compGrid[level + 1]);
                            complex_send_buffers[proc][complex_cnt++] = hypre_CSRMatrixData(diag)[j];
                         }
-                        for (j = hypre_CSRMatrixI(offd)[idx]; j < hypre_CSRMatrixI(offd)[idx+1]; j++)
+                        for (j = hypre_CSRMatrixI(offd)[idx]; j < hypre_CSRMatrixI(offd)[idx + 1]; j++)
                         {
                            int_send_buffers[proc][int_cnt++] = hypre_CSRMatrixJ(offd)[j];
                            complex_send_buffers[proc][complex_cnt++] = hypre_CSRMatrixData(offd)[j];
@@ -2465,16 +2743,17 @@ hypre_BoomerAMGDD_CommunicateRemainingMatrixInfo( hypre_ParAMGDDData* amgdd_data
                         idx -= hypre_AMGDDCompGridNumOwnedNodes(compGrid[level]);
                         diag = hypre_AMGDDCompGridMatrixNonOwnedDiag(hypre_AMGDDCompGridP(compGrid[level]));
                         offd = hypre_AMGDDCompGridMatrixNonOwnedOffd(hypre_AMGDDCompGridP(compGrid[level]));
-                        int_send_buffers[proc][int_cnt++] = hypre_CSRMatrixI(diag)[idx+1] - hypre_CSRMatrixI(diag)[idx]
-                                                          + hypre_CSRMatrixI(offd)[idx+1] - hypre_CSRMatrixI(offd)[idx];
-                        for (j = hypre_CSRMatrixI(diag)[idx]; j < hypre_CSRMatrixI(diag)[idx+1]; j++)
+                        int_send_buffers[proc][int_cnt++] = hypre_CSRMatrixI(diag)[idx + 1] - hypre_CSRMatrixI(diag)[idx]
+                                                            + hypre_CSRMatrixI(offd)[idx + 1] - hypre_CSRMatrixI(offd)[idx];
+                        for (j = hypre_CSRMatrixI(diag)[idx]; j < hypre_CSRMatrixI(diag)[idx + 1]; j++)
                         {
                            int_send_buffers[proc][int_cnt++] = hypre_CSRMatrixJ(diag)[j];
                            complex_send_buffers[proc][complex_cnt++] = hypre_CSRMatrixData(diag)[j];
                         }
-                        for (j = hypre_CSRMatrixI(offd)[idx]; j < hypre_CSRMatrixI(offd)[idx+1]; j++)
+                        for (j = hypre_CSRMatrixI(offd)[idx]; j < hypre_CSRMatrixI(offd)[idx + 1]; j++)
                         {
-                           int_send_buffers[proc][int_cnt++] = hypre_CSRMatrixJ(offd)[j] + hypre_AMGDDCompGridFirstGlobalIndex(compGrid[level+1]);
+                           int_send_buffers[proc][int_cnt++] = hypre_CSRMatrixJ(offd)[j] + hypre_AMGDDCompGridFirstGlobalIndex(
+                                                                  compGrid[level + 1]);
                            complex_send_buffers[proc][complex_cnt++] = hypre_CSRMatrixData(offd)[j];
                         }
                      }
@@ -2486,21 +2765,22 @@ hypre_BoomerAMGDD_CommunicateRemainingMatrixInfo( hypre_ParAMGDDData* amgdd_data
                   for (i = 0; i < hypre_AMGDDCommPkgNumSendNodes(compGridCommPkg)[outer_level][proc][level]; i++)
                   {
                      HYPRE_Int idx = hypre_AMGDDCommPkgSendFlag(compGridCommPkg)[outer_level][proc][level][i];
-                     if (idx < 0) idx = -(idx + 1);
+                     if (idx < 0) { idx = -(idx + 1); }
 
                      // Owned diag and offd
                      if (idx < hypre_AMGDDCompGridNumOwnedNodes(compGrid[level]))
                      {
-                        diag = hypre_AMGDDCompGridMatrixOwnedDiag(hypre_AMGDDCompGridR(compGrid[level-1]));
-                        offd = hypre_AMGDDCompGridMatrixOwnedOffd(hypre_AMGDDCompGridR(compGrid[level-1]));
-                        int_send_buffers[proc][int_cnt++] = hypre_CSRMatrixI(diag)[idx+1] - hypre_CSRMatrixI(diag)[idx]
-                                                          + hypre_CSRMatrixI(offd)[idx+1] - hypre_CSRMatrixI(offd)[idx];
-                        for (j = hypre_CSRMatrixI(diag)[idx]; j < hypre_CSRMatrixI(diag)[idx+1]; j++)
+                        diag = hypre_AMGDDCompGridMatrixOwnedDiag(hypre_AMGDDCompGridR(compGrid[level - 1]));
+                        offd = hypre_AMGDDCompGridMatrixOwnedOffd(hypre_AMGDDCompGridR(compGrid[level - 1]));
+                        int_send_buffers[proc][int_cnt++] = hypre_CSRMatrixI(diag)[idx + 1] - hypre_CSRMatrixI(diag)[idx]
+                                                            + hypre_CSRMatrixI(offd)[idx + 1] - hypre_CSRMatrixI(offd)[idx];
+                        for (j = hypre_CSRMatrixI(diag)[idx]; j < hypre_CSRMatrixI(diag)[idx + 1]; j++)
                         {
-                           int_send_buffers[proc][int_cnt++] = hypre_CSRMatrixJ(diag)[j] + hypre_AMGDDCompGridFirstGlobalIndex(compGrid[level-1]);
+                           int_send_buffers[proc][int_cnt++] = hypre_CSRMatrixJ(diag)[j] + hypre_AMGDDCompGridFirstGlobalIndex(
+                                                                  compGrid[level - 1]);
                            complex_send_buffers[proc][complex_cnt++] = hypre_CSRMatrixData(diag)[j];
                         }
-                        for (j = hypre_CSRMatrixI(offd)[idx]; j < hypre_CSRMatrixI(offd)[idx+1]; j++)
+                        for (j = hypre_CSRMatrixI(offd)[idx]; j < hypre_CSRMatrixI(offd)[idx + 1]; j++)
                         {
                            int_send_buffers[proc][int_cnt++] = hypre_CSRMatrixJ(offd)[j];
                            complex_send_buffers[proc][complex_cnt++] = hypre_CSRMatrixData(offd)[j];
@@ -2510,18 +2790,19 @@ hypre_BoomerAMGDD_CommunicateRemainingMatrixInfo( hypre_ParAMGDDData* amgdd_data
                      else
                      {
                         idx -= hypre_AMGDDCompGridNumOwnedNodes(compGrid[level]);
-                        diag = hypre_AMGDDCompGridMatrixNonOwnedDiag(hypre_AMGDDCompGridR(compGrid[level-1]));
-                        offd = hypre_AMGDDCompGridMatrixNonOwnedOffd(hypre_AMGDDCompGridR(compGrid[level-1]));
-                        int_send_buffers[proc][int_cnt++] = hypre_CSRMatrixI(diag)[idx+1] - hypre_CSRMatrixI(diag)[idx]
-                                                          + hypre_CSRMatrixI(offd)[idx+1] - hypre_CSRMatrixI(offd)[idx];
-                        for (j = hypre_CSRMatrixI(diag)[idx]; j < hypre_CSRMatrixI(diag)[idx+1]; j++)
+                        diag = hypre_AMGDDCompGridMatrixNonOwnedDiag(hypre_AMGDDCompGridR(compGrid[level - 1]));
+                        offd = hypre_AMGDDCompGridMatrixNonOwnedOffd(hypre_AMGDDCompGridR(compGrid[level - 1]));
+                        int_send_buffers[proc][int_cnt++] = hypre_CSRMatrixI(diag)[idx + 1] - hypre_CSRMatrixI(diag)[idx]
+                                                            + hypre_CSRMatrixI(offd)[idx + 1] - hypre_CSRMatrixI(offd)[idx];
+                        for (j = hypre_CSRMatrixI(diag)[idx]; j < hypre_CSRMatrixI(diag)[idx + 1]; j++)
                         {
                            int_send_buffers[proc][int_cnt++] = hypre_CSRMatrixJ(diag)[j];
                            complex_send_buffers[proc][complex_cnt++] = hypre_CSRMatrixData(diag)[j];
                         }
-                        for (j = hypre_CSRMatrixI(offd)[idx]; j < hypre_CSRMatrixI(offd)[idx+1]; j++)
+                        for (j = hypre_CSRMatrixI(offd)[idx]; j < hypre_CSRMatrixI(offd)[idx + 1]; j++)
                         {
-                           int_send_buffers[proc][int_cnt++] = hypre_CSRMatrixJ(offd)[j] + hypre_AMGDDCompGridFirstGlobalIndex(compGrid[level-1]);
+                           int_send_buffers[proc][int_cnt++] = hypre_CSRMatrixJ(offd)[j] + hypre_AMGDDCompGridFirstGlobalIndex(
+                                                                  compGrid[level - 1]);
                            complex_send_buffers[proc][complex_cnt++] = hypre_CSRMatrixData(offd)[j];
                         }
                      }
@@ -2536,8 +2817,10 @@ hypre_BoomerAMGDD_CommunicateRemainingMatrixInfo( hypre_ParAMGDDData* amgdd_data
 
          for (proc = 0; proc < num_send_procs; proc++)
          {
-            hypre_MPI_Isend(int_send_buffers[proc], send_sizes[2*proc], HYPRE_MPI_INT, send_procs[proc], 2, hypre_MPI_COMM_WORLD, &(buf_requests[request_cnt++]));
-            hypre_MPI_Isend(complex_send_buffers[proc], send_sizes[2*proc+1], HYPRE_MPI_COMPLEX, send_procs[proc], 3, hypre_MPI_COMM_WORLD, &(buf_requests[request_cnt++]));
+            hypre_MPI_Isend(int_send_buffers[proc], send_sizes[2 * proc], HYPRE_MPI_INT, send_procs[proc], 2,
+                            hypre_MPI_COMM_WORLD, &(buf_requests[request_cnt++]));
+            hypre_MPI_Isend(complex_send_buffers[proc], send_sizes[2 * proc + 1], HYPRE_MPI_COMPLEX,
+                            send_procs[proc], 3, hypre_MPI_COMM_WORLD, &(buf_requests[request_cnt++]));
          }
 
          // Wait on buffer sizes
@@ -2546,17 +2829,20 @@ hypre_BoomerAMGDD_CommunicateRemainingMatrixInfo( hypre_ParAMGDDData* amgdd_data
          // Allocate and post recvs
          for (proc = 0; proc < num_recv_procs; proc++)
          {
-            int_recv_buffers[proc] = hypre_CTAlloc(HYPRE_Int, recv_sizes[2*proc], HYPRE_MEMORY_HOST);
-            complex_recv_buffers[proc] = hypre_CTAlloc(HYPRE_Complex, recv_sizes[2*proc+1], HYPRE_MEMORY_HOST);
-            hypre_MPI_Irecv(int_recv_buffers[proc], recv_sizes[2*proc], HYPRE_MPI_INT, recv_procs[proc], 2, hypre_MPI_COMM_WORLD, &(buf_requests[request_cnt++]));
-            hypre_MPI_Irecv(complex_recv_buffers[proc], recv_sizes[2*proc+1], HYPRE_MPI_COMPLEX, recv_procs[proc], 3, hypre_MPI_COMM_WORLD, &(buf_requests[request_cnt++]));
+            int_recv_buffers[proc] = hypre_CTAlloc(HYPRE_Int, recv_sizes[2 * proc], HYPRE_MEMORY_HOST);
+            complex_recv_buffers[proc] = hypre_CTAlloc(HYPRE_Complex, recv_sizes[2 * proc + 1],
+                                                       HYPRE_MEMORY_HOST);
+            hypre_MPI_Irecv(int_recv_buffers[proc], recv_sizes[2 * proc], HYPRE_MPI_INT, recv_procs[proc], 2,
+                            hypre_MPI_COMM_WORLD, &(buf_requests[request_cnt++]));
+            hypre_MPI_Irecv(complex_recv_buffers[proc], recv_sizes[2 * proc + 1], HYPRE_MPI_COMPLEX,
+                            recv_procs[proc], 3, hypre_MPI_COMM_WORLD, &(buf_requests[request_cnt++]));
          }
 
          // Wait on buffers
-         hypre_MPI_Waitall( 2*(num_send_procs + num_recv_procs), buf_requests, buf_statuses );
+         hypre_MPI_Waitall( 2 * (num_send_procs + num_recv_procs), buf_requests, buf_statuses );
 
-         for (proc = 0; proc < num_send_procs; proc++) hypre_TFree(int_send_buffers[proc], HYPRE_MEMORY_HOST);
-         for (proc = 0; proc < num_send_procs; proc++) hypre_TFree(complex_send_buffers[proc], HYPRE_MEMORY_HOST);
+         for (proc = 0; proc < num_send_procs; proc++) { hypre_TFree(int_send_buffers[proc], HYPRE_MEMORY_HOST); }
+         for (proc = 0; proc < num_send_procs; proc++) { hypre_TFree(complex_send_buffers[proc], HYPRE_MEMORY_HOST); }
          hypre_TFree(int_send_buffers, HYPRE_MEMORY_HOST);
          hypre_TFree(complex_send_buffers, HYPRE_MEMORY_HOST);
          hypre_TFree(size_requests, HYPRE_MEMORY_HOST);
@@ -2565,28 +2851,34 @@ hypre_BoomerAMGDD_CommunicateRemainingMatrixInfo( hypre_ParAMGDDData* amgdd_data
          hypre_TFree(buf_statuses, HYPRE_MEMORY_HOST);
 
          // P_tmp_info[buffer_number] = [ size, [row], size, [row], ... ]
-         HYPRE_Int **P_tmp_info_int;
-         HYPRE_Complex **P_tmp_info_complex;
+         HYPRE_Int **P_tmp_info_int = NULL;
+         HYPRE_Complex **P_tmp_info_complex = NULL;
          HYPRE_Int P_tmp_info_size = 0;
          HYPRE_Int P_tmp_info_cnt = 0;
-         if (outer_level != num_levels-1)
+         if (outer_level != num_levels - 1)
          {
             for (proc = 0; proc < num_recv_procs; proc++)
+            {
                P_tmp_info_size += hypre_AMGDDCommPkgNumRecvNodes(compGridCommPkg)[outer_level][proc][outer_level];
-            P_tmp_info_size -= hypre_CSRMatrixNumCols(hypre_AMGDDCompGridMatrixOwnedOffd(hypre_AMGDDCompGridA(compGrid[outer_level])));
+            }
+            P_tmp_info_size -= hypre_CSRMatrixNumCols(hypre_AMGDDCompGridMatrixOwnedOffd(hypre_AMGDDCompGridA(
+                                                                                            compGrid[outer_level])));
             P_tmp_info_int = hypre_CTAlloc(HYPRE_Int*, P_tmp_info_size, HYPRE_MEMORY_HOST);
             P_tmp_info_complex = hypre_CTAlloc(HYPRE_Complex*, P_tmp_info_size, HYPRE_MEMORY_HOST);
          }
          // R_tmp_info[buffer_number] = [ size, [row], size, [row], ... ]
-         HYPRE_Int **R_tmp_info_int;
-         HYPRE_Complex **R_tmp_info_complex;
+         HYPRE_Int **R_tmp_info_int = NULL;
+         HYPRE_Complex **R_tmp_info_complex = NULL;
          HYPRE_Int R_tmp_info_size = 0;
          HYPRE_Int R_tmp_info_cnt = 0;
          if (hypre_ParAMGDataRestriction(amg_data) && outer_level != 0)
          {
             for (proc = 0; proc < num_recv_procs; proc++)
+            {
                R_tmp_info_size += hypre_AMGDDCommPkgNumRecvNodes(compGridCommPkg)[outer_level][proc][outer_level];
-            R_tmp_info_size -= hypre_CSRMatrixNumCols(hypre_AMGDDCompGridMatrixOwnedOffd(hypre_AMGDDCompGridA(compGrid[outer_level])));
+            }
+            R_tmp_info_size -= hypre_CSRMatrixNumCols(hypre_AMGDDCompGridMatrixOwnedOffd(hypre_AMGDDCompGridA(
+                                                                                            compGrid[outer_level])));
             R_tmp_info_int = hypre_CTAlloc(HYPRE_Int*, R_tmp_info_size, HYPRE_MEMORY_HOST);
             R_tmp_info_complex = hypre_CTAlloc(HYPRE_Complex*, R_tmp_info_size, HYPRE_MEMORY_HOST);
          }
@@ -2606,7 +2898,7 @@ hypre_BoomerAMGDD_CommunicateRemainingMatrixInfo( hypre_ParAMGDDData* amgdd_data
                {
                   HYPRE_Int idx = hypre_AMGDDCommPkgRecvMap(compGridCommPkg)[outer_level][proc][level][i];
 
-                  if (idx < 0) idx = -(idx + 1);
+                  if (idx < 0) { idx = -(idx + 1); }
 
                   // !!! Optimization: I send (and setup) A info twice for ghosts overwritten as real
                   // Unpack A data
@@ -2615,12 +2907,14 @@ hypre_BoomerAMGDD_CommunicateRemainingMatrixInfo( hypre_ParAMGDDData* amgdd_data
                   HYPRE_Int diag_rowptr = hypre_CSRMatrixI(diag)[idx];
                   HYPRE_Int offd_rowptr = hypre_CSRMatrixI(offd)[idx];
 
-                  while (diag_rowptr < hypre_CSRMatrixI(diag)[idx+1] || offd_rowptr < hypre_CSRMatrixI(offd)[idx+1])
+                  while (diag_rowptr < hypre_CSRMatrixI(diag)[idx + 1] ||
+                         offd_rowptr < hypre_CSRMatrixI(offd)[idx + 1])
                   {
                      HYPRE_Int incoming_index = int_recv_buffers[proc][int_cnt++];
 
                      // See whether global index is owned
-                     if (incoming_index >= hypre_AMGDDCompGridFirstGlobalIndex(compGrid[level]) && incoming_index <= hypre_AMGDDCompGridLastGlobalIndex(compGrid[level]))
+                     if (incoming_index >= hypre_AMGDDCompGridFirstGlobalIndex(compGrid[level]) &&
+                         incoming_index <= hypre_AMGDDCompGridLastGlobalIndex(compGrid[level]))
                      {
                         // Don't overwrite data if already accounted for (ordering can change and screw things up)
                         if (level == outer_level || idx == A_row_cnt[level])
@@ -2647,13 +2941,13 @@ hypre_BoomerAMGDD_CommunicateRemainingMatrixInfo( hypre_ParAMGDDData* amgdd_data
                         }
                      }
                   }
-                  if (level != outer_level && idx == A_row_cnt[level]) A_row_cnt[level]++;
+                  if (level != outer_level && idx == A_row_cnt[level]) { A_row_cnt[level]++; }
                }
 
-               if (level == outer_level) A_row_cnt[level] += hypre_AMGDDCommPkgNumRecvNodes(compGridCommPkg)[outer_level][proc][level];
+               if (level == outer_level) { A_row_cnt[level] += hypre_AMGDDCommPkgNumRecvNodes(compGridCommPkg)[outer_level][proc][level]; }
 
                // Unpack P data and col indices
-               if (level != num_levels-1)
+               if (level != num_levels - 1)
                {
                   diag = hypre_AMGDDCompGridMatrixNonOwnedDiag(hypre_AMGDDCompGridP(compGrid[level]));
                   offd = hypre_AMGDDCompGridMatrixNonOwnedOffd(hypre_AMGDDCompGridP(compGrid[level]));
@@ -2661,7 +2955,7 @@ hypre_BoomerAMGDD_CommunicateRemainingMatrixInfo( hypre_ParAMGDDData* amgdd_data
                   for (i = 0; i < hypre_AMGDDCommPkgNumRecvNodes(compGridCommPkg)[outer_level][proc][level]; i++)
                   {
                      HYPRE_Int idx = hypre_AMGDDCommPkgRecvMap(compGridCommPkg)[outer_level][proc][level][i];
-                     if (idx < 0) idx = -(idx + 1);
+                     if (idx < 0) { idx = -(idx + 1); }
 
                      // Setup orig commPkg recv dofs
                      if (idx == P_row_cnt[level])
@@ -2676,25 +2970,33 @@ hypre_BoomerAMGDD_CommunicateRemainingMatrixInfo( hypre_ParAMGDDData* amgdd_data
                            HYPRE_Int incoming_index = int_recv_buffers[proc][int_cnt++];
 
                            // See whether global index is owned
-                           if (incoming_index >= hypre_AMGDDCompGridFirstGlobalIndex(compGrid[level+1]) && incoming_index <= hypre_AMGDDCompGridLastGlobalIndex(compGrid[level+1]))
+                           if (incoming_index >= hypre_AMGDDCompGridFirstGlobalIndex(compGrid[level + 1]) &&
+                               incoming_index <= hypre_AMGDDCompGridLastGlobalIndex(compGrid[level + 1]))
                            {
                               if (offd_rowptr >= hypre_CSRMatrixNumNonzeros(offd))
-                                 hypre_CSRMatrixResize(offd, hypre_CSRMatrixNumRows(offd), hypre_CSRMatrixNumCols(offd), ceil(1.5*hypre_CSRMatrixNumNonzeros(offd) + 1));
-                              hypre_CSRMatrixJ(offd)[offd_rowptr] = incoming_index - hypre_AMGDDCompGridFirstGlobalIndex(compGrid[level+1]);
+                              {
+                                 hypre_CSRMatrixResize(offd, hypre_CSRMatrixNumRows(offd), hypre_CSRMatrixNumCols(offd),
+                                                       (HYPRE_Int)hypre_ceil(1.5 * hypre_CSRMatrixNumNonzeros(offd) + 1));
+                              }
+                              hypre_CSRMatrixJ(offd)[offd_rowptr] = incoming_index - hypre_AMGDDCompGridFirstGlobalIndex(
+                                                                       compGrid[level + 1]);
                               hypre_CSRMatrixData(offd)[offd_rowptr] = complex_recv_buffers[proc][complex_cnt++];
                               offd_rowptr++;
                            }
                            else
                            {
                               if (diag_rowptr >= hypre_CSRMatrixNumNonzeros(diag))
-                                 hypre_CSRMatrixResize(diag, hypre_CSRMatrixNumRows(diag), hypre_CSRMatrixNumCols(diag), ceil(1.5*hypre_CSRMatrixNumNonzeros(diag) + 1));
+                              {
+                                 hypre_CSRMatrixResize(diag, hypre_CSRMatrixNumRows(diag), hypre_CSRMatrixNumCols(diag),
+                                                       (HYPRE_Int)hypre_ceil(1.5 * hypre_CSRMatrixNumNonzeros(diag) + 1));
+                              }
                               hypre_CSRMatrixJ(diag)[diag_rowptr] = incoming_index;
                               hypre_CSRMatrixData(diag)[diag_rowptr] = complex_recv_buffers[proc][complex_cnt++];
                               diag_rowptr++;
                            }
                         }
-                        hypre_CSRMatrixI(diag)[idx+1] = diag_rowptr;
-                        hypre_CSRMatrixI(offd)[idx+1] = offd_rowptr;
+                        hypre_CSRMatrixI(diag)[idx + 1] = diag_rowptr;
+                        hypre_CSRMatrixI(offd)[idx + 1] = offd_rowptr;
 
                         P_row_cnt[level]++;
                      }
@@ -2702,12 +3004,12 @@ hypre_BoomerAMGDD_CommunicateRemainingMatrixInfo( hypre_ParAMGDDData* amgdd_data
                      else if (level == outer_level)
                      {
                         HYPRE_Int row_size = int_recv_buffers[proc][int_cnt++];
-                        P_tmp_info_int[P_tmp_info_cnt] = hypre_CTAlloc(HYPRE_Int, row_size+1, HYPRE_MEMORY_HOST);
+                        P_tmp_info_int[P_tmp_info_cnt] = hypre_CTAlloc(HYPRE_Int, row_size + 1, HYPRE_MEMORY_HOST);
                         P_tmp_info_complex[P_tmp_info_cnt] = hypre_CTAlloc(HYPRE_Complex, row_size, HYPRE_MEMORY_HOST);
                         P_tmp_info_int[P_tmp_info_cnt][0] = row_size;
                         for (j = 0; j < row_size; j++)
                         {
-                           P_tmp_info_int[P_tmp_info_cnt][j+1] = int_recv_buffers[proc][int_cnt++];
+                           P_tmp_info_int[P_tmp_info_cnt][j + 1] = int_recv_buffers[proc][int_cnt++];
                            P_tmp_info_complex[P_tmp_info_cnt][j] = complex_recv_buffers[proc][complex_cnt++];
                         }
                         P_tmp_info_cnt++;
@@ -2727,16 +3029,16 @@ hypre_BoomerAMGDD_CommunicateRemainingMatrixInfo( hypre_ParAMGDDData* amgdd_data
                // Unpack R data and col indices
                if (hypre_ParAMGDataRestriction(amg_data) && level != 0)
                {
-                  diag = hypre_AMGDDCompGridMatrixNonOwnedDiag(hypre_AMGDDCompGridR(compGrid[level-1]));
-                  offd = hypre_AMGDDCompGridMatrixNonOwnedOffd(hypre_AMGDDCompGridR(compGrid[level-1]));
+                  diag = hypre_AMGDDCompGridMatrixNonOwnedDiag(hypre_AMGDDCompGridR(compGrid[level - 1]));
+                  offd = hypre_AMGDDCompGridMatrixNonOwnedOffd(hypre_AMGDDCompGridR(compGrid[level - 1]));
 
                   for (i = 0; i < hypre_AMGDDCommPkgNumRecvNodes(compGridCommPkg)[outer_level][proc][level]; i++)
                   {
                      HYPRE_Int idx = hypre_AMGDDCommPkgRecvMap(compGridCommPkg)[outer_level][proc][level][i];
-                     if (idx < 0) idx = -(idx + 1);
+                     if (idx < 0) { idx = -(idx + 1); }
 
                      // Setup orig commPkg recv dofs
-                     if (idx == R_row_cnt[level-1])
+                     if (idx == R_row_cnt[level - 1])
                      {
                         HYPRE_Int row_size = int_recv_buffers[proc][int_cnt++];
 
@@ -2748,38 +3050,46 @@ hypre_BoomerAMGDD_CommunicateRemainingMatrixInfo( hypre_ParAMGDDData* amgdd_data
                            HYPRE_Int incoming_index = int_recv_buffers[proc][int_cnt++];
 
                            // See whether global index is owned
-                           if (incoming_index >= hypre_AMGDDCompGridFirstGlobalIndex(compGrid[level-1]) && incoming_index <= hypre_AMGDDCompGridLastGlobalIndex(compGrid[level-1]))
+                           if (incoming_index >= hypre_AMGDDCompGridFirstGlobalIndex(compGrid[level - 1]) &&
+                               incoming_index <= hypre_AMGDDCompGridLastGlobalIndex(compGrid[level - 1]))
                            {
                               if (offd_rowptr >= hypre_CSRMatrixNumNonzeros(offd))
-                                 hypre_CSRMatrixResize(offd, hypre_CSRMatrixNumRows(offd), hypre_CSRMatrixNumCols(offd), ceil(1.5*hypre_CSRMatrixNumNonzeros(offd) + 1));
-                              hypre_CSRMatrixJ(offd)[offd_rowptr] = incoming_index - hypre_AMGDDCompGridFirstGlobalIndex(compGrid[level-1]);
+                              {
+                                 hypre_CSRMatrixResize(offd, hypre_CSRMatrixNumRows(offd), hypre_CSRMatrixNumCols(offd),
+                                                       (HYPRE_Int)hypre_ceil(1.5 * hypre_CSRMatrixNumNonzeros(offd) + 1));
+                              }
+                              hypre_CSRMatrixJ(offd)[offd_rowptr] = incoming_index - hypre_AMGDDCompGridFirstGlobalIndex(
+                                                                       compGrid[level - 1]);
                               hypre_CSRMatrixData(offd)[offd_rowptr] = complex_recv_buffers[proc][complex_cnt++];
                               offd_rowptr++;
                            }
                            else
                            {
                               if (diag_rowptr >= hypre_CSRMatrixNumNonzeros(diag))
-                                 hypre_CSRMatrixResize(diag, hypre_CSRMatrixNumRows(diag), hypre_CSRMatrixNumCols(diag), ceil(1.5*hypre_CSRMatrixNumNonzeros(diag) + 1));
+                              {
+                                 hypre_CSRMatrixResize(diag, hypre_CSRMatrixNumRows(diag), hypre_CSRMatrixNumCols(diag),
+                                                       (HYPRE_Int)hypre_ceil(1.5 * hypre_CSRMatrixNumNonzeros(diag) + 1));
+                              }
                               hypre_CSRMatrixJ(diag)[diag_rowptr] = incoming_index;
                               hypre_CSRMatrixData(diag)[diag_rowptr] = complex_recv_buffers[proc][complex_cnt++];
                               diag_rowptr++;
                            }
                         }
-                        hypre_CSRMatrixI(diag)[idx+1] = diag_rowptr;
-                        hypre_CSRMatrixI(offd)[idx+1] = offd_rowptr;
+                        hypre_CSRMatrixI(diag)[idx + 1] = diag_rowptr;
+                        hypre_CSRMatrixI(offd)[idx + 1] = offd_rowptr;
 
-                        R_row_cnt[level-1]++;
+                        R_row_cnt[level - 1]++;
                      }
                      // Store info for later setup on current outer level
                      else if (level == outer_level)
                      {
                         HYPRE_Int row_size = int_recv_buffers[proc][int_cnt++];
-                        R_tmp_info_int[R_tmp_info_cnt] = hypre_CTAlloc(HYPRE_Int, row_size+1, HYPRE_MEMORY_HOST);
+                        R_tmp_info_int[R_tmp_info_cnt] = hypre_CTAlloc(HYPRE_Int, row_size + 1, HYPRE_MEMORY_HOST);
                         R_tmp_info_complex[R_tmp_info_cnt] = hypre_CTAlloc(HYPRE_Complex, row_size, HYPRE_MEMORY_HOST);
                         R_tmp_info_int[R_tmp_info_cnt][0] = row_size;
                         for (j = 0; j < row_size; j++)
                         {
-                           R_tmp_info_int[R_tmp_info_cnt][j+1] = int_recv_buffers[proc][int_cnt++];
+                           R_tmp_info_int[R_tmp_info_cnt][j + 1] = int_recv_buffers[proc][int_cnt++];
                            R_tmp_info_complex[R_tmp_info_cnt][j] = complex_recv_buffers[proc][complex_cnt++];
                         }
                         R_tmp_info_cnt++;
@@ -2800,7 +3110,7 @@ hypre_BoomerAMGDD_CommunicateRemainingMatrixInfo( hypre_ParAMGDDData* amgdd_data
          }
 
          // Setup temporary info for P on current level
-         if (outer_level != num_levels-1)
+         if (outer_level != num_levels - 1)
          {
             diag = hypre_AMGDDCompGridMatrixNonOwnedDiag(hypre_AMGDDCompGridP(compGrid[outer_level]));
             offd = hypre_AMGDDCompGridMatrixNonOwnedOffd(hypre_AMGDDCompGridP(compGrid[outer_level]));
@@ -2815,29 +3125,37 @@ hypre_BoomerAMGDD_CommunicateRemainingMatrixInfo( hypre_ParAMGDDData* amgdd_data
                   HYPRE_Int row_size = P_tmp_info_int[i][0];
                   for (j = 0; j < row_size; j++)
                   {
-                     HYPRE_Int incoming_index = P_tmp_info_int[i][j+1];
+                     HYPRE_Int incoming_index = P_tmp_info_int[i][j + 1];
 
                      // See whether global index is owned
-                     if (incoming_index >= hypre_AMGDDCompGridFirstGlobalIndex(compGrid[outer_level+1]) && incoming_index <= hypre_AMGDDCompGridLastGlobalIndex(compGrid[outer_level+1]))
+                     if (incoming_index >= hypre_AMGDDCompGridFirstGlobalIndex(compGrid[outer_level + 1]) &&
+                         incoming_index <= hypre_AMGDDCompGridLastGlobalIndex(compGrid[outer_level + 1]))
                      {
                         if (offd_rowptr >= hypre_CSRMatrixNumNonzeros(offd))
-                           hypre_CSRMatrixResize(offd, hypre_CSRMatrixNumRows(offd), hypre_CSRMatrixNumCols(offd), ceil(1.5*hypre_CSRMatrixNumNonzeros(offd) + 1));
-                        hypre_CSRMatrixJ(offd)[offd_rowptr] = incoming_index - hypre_AMGDDCompGridFirstGlobalIndex(compGrid[outer_level+1]);
+                        {
+                           hypre_CSRMatrixResize(offd, hypre_CSRMatrixNumRows(offd), hypre_CSRMatrixNumCols(offd),
+                                                 (HYPRE_Int)hypre_ceil(1.5 * hypre_CSRMatrixNumNonzeros(offd) + 1));
+                        }
+                        hypre_CSRMatrixJ(offd)[offd_rowptr] = incoming_index - hypre_AMGDDCompGridFirstGlobalIndex(
+                                                                 compGrid[outer_level + 1]);
                         hypre_CSRMatrixData(offd)[offd_rowptr] = P_tmp_info_complex[i][j];
                         offd_rowptr++;
                      }
                      else
                      {
                         if (diag_rowptr >= hypre_CSRMatrixNumNonzeros(diag))
-                           hypre_CSRMatrixResize(diag, hypre_CSRMatrixNumRows(diag), hypre_CSRMatrixNumCols(diag), ceil(1.5*hypre_CSRMatrixNumNonzeros(diag) + 1));
+                        {
+                           hypre_CSRMatrixResize(diag, hypre_CSRMatrixNumRows(diag), hypre_CSRMatrixNumCols(diag),
+                                                 (HYPRE_Int)hypre_ceil(1.5 * hypre_CSRMatrixNumNonzeros(diag) + 1));
+                        }
                         hypre_CSRMatrixJ(diag)[diag_rowptr] = incoming_index;
                         hypre_CSRMatrixData(diag)[diag_rowptr] = P_tmp_info_complex[i][j];
                         diag_rowptr++;
                      }
 
                   }
-                  hypre_CSRMatrixI(diag)[P_row_cnt[outer_level]+1] = diag_rowptr;
-                  hypre_CSRMatrixI(offd)[P_row_cnt[outer_level]+1] = offd_rowptr;
+                  hypre_CSRMatrixI(diag)[P_row_cnt[outer_level] + 1] = diag_rowptr;
+                  hypre_CSRMatrixI(offd)[P_row_cnt[outer_level] + 1] = offd_rowptr;
                   P_row_cnt[outer_level]++;
 
                   hypre_TFree(P_tmp_info_int[i], HYPRE_MEMORY_HOST);
@@ -2851,11 +3169,11 @@ hypre_BoomerAMGDD_CommunicateRemainingMatrixInfo( hypre_ParAMGDDData* amgdd_data
          // Setup temporary info for R on current level
          if (hypre_ParAMGDataRestriction(amg_data) && outer_level != 0)
          {
-            diag = hypre_AMGDDCompGridMatrixNonOwnedDiag(hypre_AMGDDCompGridR(compGrid[outer_level-1]));
-            offd = hypre_AMGDDCompGridMatrixNonOwnedOffd(hypre_AMGDDCompGridR(compGrid[outer_level-1]));
+            diag = hypre_AMGDDCompGridMatrixNonOwnedDiag(hypre_AMGDDCompGridR(compGrid[outer_level - 1]));
+            offd = hypre_AMGDDCompGridMatrixNonOwnedOffd(hypre_AMGDDCompGridR(compGrid[outer_level - 1]));
 
-            HYPRE_Int diag_rowptr = hypre_CSRMatrixI(diag)[ R_row_cnt[outer_level-1] ];
-            HYPRE_Int offd_rowptr = hypre_CSRMatrixI(offd)[ R_row_cnt[outer_level-1] ];
+            HYPRE_Int diag_rowptr = hypre_CSRMatrixI(diag)[ R_row_cnt[outer_level - 1] ];
+            HYPRE_Int offd_rowptr = hypre_CSRMatrixI(offd)[ R_row_cnt[outer_level - 1] ];
 
             for (i = 0; i < R_tmp_info_size; i++)
             {
@@ -2864,30 +3182,38 @@ hypre_BoomerAMGDD_CommunicateRemainingMatrixInfo( hypre_ParAMGDDData* amgdd_data
                   HYPRE_Int row_size = R_tmp_info_int[i][0];
                   for (j = 0; j < row_size; j++)
                   {
-                     HYPRE_Int incoming_index = R_tmp_info_int[i][j+1];
+                     HYPRE_Int incoming_index = R_tmp_info_int[i][j + 1];
 
                      // See whether global index is owned
-                     if (incoming_index >= hypre_AMGDDCompGridFirstGlobalIndex(compGrid[outer_level-1]) && incoming_index <= hypre_AMGDDCompGridLastGlobalIndex(compGrid[outer_level-1]))
+                     if (incoming_index >= hypre_AMGDDCompGridFirstGlobalIndex(compGrid[outer_level - 1]) &&
+                         incoming_index <= hypre_AMGDDCompGridLastGlobalIndex(compGrid[outer_level - 1]))
                      {
                         if (offd_rowptr >= hypre_CSRMatrixNumNonzeros(offd))
-                           hypre_CSRMatrixResize(offd, hypre_CSRMatrixNumRows(offd), hypre_CSRMatrixNumCols(offd), ceil(1.5*hypre_CSRMatrixNumNonzeros(offd) + 1));
-                        hypre_CSRMatrixJ(offd)[offd_rowptr] = incoming_index - hypre_AMGDDCompGridFirstGlobalIndex(compGrid[outer_level-1]);
+                        {
+                           hypre_CSRMatrixResize(offd, hypre_CSRMatrixNumRows(offd), hypre_CSRMatrixNumCols(offd),
+                                                 (HYPRE_Int)hypre_ceil(1.5 * hypre_CSRMatrixNumNonzeros(offd) + 1));
+                        }
+                        hypre_CSRMatrixJ(offd)[offd_rowptr] = incoming_index - hypre_AMGDDCompGridFirstGlobalIndex(
+                                                                 compGrid[outer_level - 1]);
                         hypre_CSRMatrixData(offd)[offd_rowptr] = R_tmp_info_complex[i][j];
                         offd_rowptr++;
                      }
                      else
                      {
                         if (diag_rowptr >= hypre_CSRMatrixNumNonzeros(diag))
-                           hypre_CSRMatrixResize(diag, hypre_CSRMatrixNumRows(diag), hypre_CSRMatrixNumCols(diag), ceil(1.5*hypre_CSRMatrixNumNonzeros(diag) + 1));
+                        {
+                           hypre_CSRMatrixResize(diag, hypre_CSRMatrixNumRows(diag), hypre_CSRMatrixNumCols(diag),
+                                                 (HYPRE_Int)hypre_ceil(1.5 * hypre_CSRMatrixNumNonzeros(diag) + 1));
+                        }
                         hypre_CSRMatrixJ(diag)[diag_rowptr] = incoming_index;
                         hypre_CSRMatrixData(diag)[diag_rowptr] = R_tmp_info_complex[i][j];
                         diag_rowptr++;
                      }
 
                   }
-                  hypre_CSRMatrixI(diag)[R_row_cnt[outer_level-1]+1] = diag_rowptr;
-                  hypre_CSRMatrixI(offd)[R_row_cnt[outer_level-1]+1] = offd_rowptr;
-                  R_row_cnt[outer_level-1]++;
+                  hypre_CSRMatrixI(diag)[R_row_cnt[outer_level - 1] + 1] = diag_rowptr;
+                  hypre_CSRMatrixI(offd)[R_row_cnt[outer_level - 1] + 1] = offd_rowptr;
+                  R_row_cnt[outer_level - 1]++;
 
                   hypre_TFree(R_tmp_info_int[i], HYPRE_MEMORY_HOST);
                   hypre_TFree(R_tmp_info_complex[i], HYPRE_MEMORY_HOST);
@@ -2899,8 +3225,8 @@ hypre_BoomerAMGDD_CommunicateRemainingMatrixInfo( hypre_ParAMGDDData* amgdd_data
          }
 
          // Clean up memory
-         for (proc = 0; proc < num_recv_procs; proc++) hypre_TFree(int_recv_buffers[proc], HYPRE_MEMORY_HOST);
-         for (proc = 0; proc < num_recv_procs; proc++) hypre_TFree(complex_recv_buffers[proc], HYPRE_MEMORY_HOST);
+         for (proc = 0; proc < num_recv_procs; proc++) { hypre_TFree(int_recv_buffers[proc], HYPRE_MEMORY_HOST); }
+         for (proc = 0; proc < num_recv_procs; proc++) { hypre_TFree(complex_recv_buffers[proc], HYPRE_MEMORY_HOST); }
          hypre_TFree(int_recv_buffers, HYPRE_MEMORY_HOST);
          hypre_TFree(complex_recv_buffers, HYPRE_MEMORY_HOST);
          hypre_TFree(send_sizes, HYPRE_MEMORY_HOST);
@@ -2935,7 +3261,7 @@ hypre_BoomerAMGDD_FixUpRecvMaps( hypre_AMGDDCompGrid **compGrid,
    // Get rid of redundant recvs and index from beginning of nonowned (instead of owned)
    if (compGridCommPkg)
    {
-     recv_red_marker = hypre_AMGDDCommPkgRecvRedMarker(compGridCommPkg);
+      recv_red_marker = hypre_AMGDDCommPkgRecvRedMarker(compGridCommPkg);
 
       for (level = start_level; level < num_levels; level++)
       {
@@ -2972,14 +3298,16 @@ hypre_BoomerAMGDD_FixUpRecvMaps( hypre_AMGDDCompGrid **compGrid,
                         {
                            map_val -= hypre_AMGDDCompGridNumOwnedNodes(compGrid[inner_level]);
                         }
-                        hypre_AMGDDCommPkgRecvMap(compGridCommPkg)[level][proc][inner_level][ hypre_AMGDDCommPkgNumRecvNodes(compGridCommPkg)[level][proc][inner_level]++ ] = map_val;
+                        hypre_AMGDDCommPkgRecvMap(
+                           compGridCommPkg)[level][proc][inner_level][ hypre_AMGDDCommPkgNumRecvNodes(
+                                                                          compGridCommPkg)[level][proc][inner_level]++ ] = map_val;
                      }
                   }
                   hypre_AMGDDCommPkgRecvMap(compGridCommPkg)[level][proc][inner_level] =
-                      hypre_TReAlloc(hypre_AMGDDCommPkgRecvMap(compGridCommPkg)[level][proc][inner_level],
-                                     HYPRE_Int,
-                                     hypre_AMGDDCommPkgNumRecvNodes(compGridCommPkg)[level][proc][inner_level],
-                                     HYPRE_MEMORY_HOST);
+                     hypre_TReAlloc(hypre_AMGDDCommPkgRecvMap(compGridCommPkg)[level][proc][inner_level],
+                                    HYPRE_Int,
+                                    hypre_AMGDDCommPkgNumRecvNodes(compGridCommPkg)[level][proc][inner_level],
+                                    HYPRE_MEMORY_HOST);
                }
             }
          }
diff --git a/external/hypre/src/parcsr_ls/par_amgdd_setup.c b/external/hypre/src/parcsr_ls/par_amgdd_setup.c
index 6c9ccc43..a8440738 100644
--- a/external/hypre/src/parcsr_ls/par_amgdd_setup.c
+++ b/external/hypre/src/parcsr_ls/par_amgdd_setup.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -24,7 +24,7 @@ hypre_BoomerAMGDDSetup( void               *amgdd_vdata,
                         hypre_ParVector    *b,
                         hypre_ParVector    *x )
 {
-   MPI_Comm 	           comm;
+   MPI_Comm               comm;
    hypre_ParAMGDDData     *amgdd_data = (hypre_ParAMGDDData*) amgdd_vdata;
    hypre_ParAMGData       *amg_data   = hypre_ParAMGDDDataAMG(amgdd_data);
 
@@ -49,12 +49,12 @@ hypre_BoomerAMGDDSetup( void               *amgdd_vdata,
    HYPRE_Int           ****send_flag;
    HYPRE_Int           ****recv_map;
    HYPRE_Int           ****recv_red_marker;
-   HYPRE_Int             **send_buffer;
-   HYPRE_Int             **recv_buffer;
-   HYPRE_Int             **send_flag_buffer;
-   HYPRE_Int             **recv_map_send_buffer;
-   HYPRE_Int              *send_flag_buffer_size;
-   HYPRE_Int              *recv_map_send_buffer_size;
+   HYPRE_Int             **send_buffer               = NULL;
+   HYPRE_Int             **recv_buffer               = NULL;
+   HYPRE_Int             **send_flag_buffer          = NULL;
+   HYPRE_Int             **recv_map_send_buffer      = NULL;
+   HYPRE_Int              *send_flag_buffer_size     = NULL;
+   HYPRE_Int              *recv_map_send_buffer_size = NULL;
 
    HYPRE_Int               num_procs;
    HYPRE_Int               num_send_procs;
@@ -63,6 +63,13 @@ hypre_BoomerAMGDDSetup( void               *amgdd_vdata,
    HYPRE_Int               num_requests;
    HYPRE_Int               request_counter;
 
+   /* Sanity check */
+   if (hypre_ParVectorNumVectors(b) > 1)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "BoomerAMGDD doesn't support multicomponent vectors");
+      return hypre_error_flag;
+   }
+
    // If the underlying AMG data structure has not yet been set up, call BoomerAMGSetup()
    if (!hypre_ParAMGDataAArray(amg_data))
    {
@@ -184,7 +191,8 @@ hypre_BoomerAMGDDSetup( void               *amgdd_vdata,
          // Post the receives for the buffer size
          for (i = 0; i < num_recv_procs; i++)
          {
-            hypre_MPI_Irecv(&(recv_buffer_size[level][i]), 1, HYPRE_MPI_INT, hypre_AMGDDCommPkgRecvProcs(compGridCommPkg)[level][i], 0, comm, &(requests[request_counter++]));
+            hypre_MPI_Irecv(&(recv_buffer_size[level][i]), 1, HYPRE_MPI_INT,
+                            hypre_AMGDDCommPkgRecvProcs(compGridCommPkg)[level][i], 0, comm, &(requests[request_counter++]));
          }
       }
 
@@ -198,13 +206,15 @@ hypre_BoomerAMGDDSetup( void               *amgdd_vdata,
          // Pack send buffers
          for (i = 0; i < num_send_procs; i++)
          {
-            send_buffer[i] = hypre_BoomerAMGDD_PackSendBuffer(amgdd_data, i, level, padding, &(send_flag_buffer_size[i]));
+            send_buffer[i] = hypre_BoomerAMGDD_PackSendBuffer(amgdd_data, i, level, padding,
+                                                              &(send_flag_buffer_size[i]));
          }
 
          // Send the buffer sizes
          for (i = 0; i < num_send_procs; i++)
          {
-            hypre_MPI_Isend(&(send_buffer_size[level][i]), 1, HYPRE_MPI_INT, hypre_AMGDDCommPkgSendProcs(compGridCommPkg)[level][i], 0, comm, &(requests[request_counter++]));
+            hypre_MPI_Isend(&(send_buffer_size[level][i]), 1, HYPRE_MPI_INT,
+                            hypre_AMGDDCommPkgSendProcs(compGridCommPkg)[level][i], 0, comm, &(requests[request_counter++]));
          }
       }
 
@@ -216,12 +226,14 @@ hypre_BoomerAMGDDSetup( void               *amgdd_vdata,
       for (i = 0; i < num_recv_procs; i++)
       {
          recv_buffer[i] = hypre_CTAlloc(HYPRE_Int, recv_buffer_size[level][i], HYPRE_MEMORY_HOST);
-         hypre_MPI_Irecv(recv_buffer[i], recv_buffer_size[level][i], HYPRE_MPI_INT, hypre_AMGDDCommPkgRecvProcs(compGridCommPkg)[level][i], 1, comm, &(requests[request_counter++]));
+         hypre_MPI_Irecv(recv_buffer[i], recv_buffer_size[level][i], HYPRE_MPI_INT,
+                         hypre_AMGDDCommPkgRecvProcs(compGridCommPkg)[level][i], 1, comm, &(requests[request_counter++]));
       }
 
       for (i = 0; i < num_send_procs; i++)
       {
-         hypre_MPI_Isend(send_buffer[i], send_buffer_size[level][i], HYPRE_MPI_INT, hypre_AMGDDCommPkgSendProcs(compGridCommPkg)[level][i], 1, comm, &(requests[request_counter++]));
+         hypre_MPI_Isend(send_buffer[i], send_buffer_size[level][i], HYPRE_MPI_INT,
+                         hypre_AMGDDCommPkgSendProcs(compGridCommPkg)[level][i], 1, comm, &(requests[request_counter++]));
       }
 
       // Wait for buffers to be received
@@ -236,14 +248,17 @@ hypre_BoomerAMGDDSetup( void               *amgdd_vdata,
          recv_red_marker[level][i] = hypre_CTAlloc(HYPRE_Int*, num_levels, HYPRE_MEMORY_HOST);
          num_recv_nodes[level][i] = hypre_CTAlloc(HYPRE_Int, num_levels, HYPRE_MEMORY_HOST);
 
-         hypre_BoomerAMGDD_UnpackRecvBuffer(amgdd_data, recv_buffer[i], A_tmp_info, &(recv_map_send_buffer_size[i]), nodes_added_on_level, level, i);
+         hypre_BoomerAMGDD_UnpackRecvBuffer(amgdd_data, recv_buffer[i], A_tmp_info,
+                                            &(recv_map_send_buffer_size[i]), nodes_added_on_level, level, i);
 
          recv_map_send_buffer[i] = hypre_CTAlloc(HYPRE_Int, recv_map_send_buffer_size[i], HYPRE_MEMORY_HOST);
-         hypre_BoomerAMGDD_PackRecvMapSendBuffer(recv_map_send_buffer[i], recv_red_marker[level][i], num_recv_nodes[level][i], &(recv_buffer_size[level][i]), level, num_levels);
+         hypre_BoomerAMGDD_PackRecvMapSendBuffer(recv_map_send_buffer[i], recv_red_marker[level][i],
+                                                 num_recv_nodes[level][i], &(recv_buffer_size[level][i]), level, num_levels);
       }
 
       //////////// Setup local indices for the composite grid ////////////
-      hypre_AMGDDCompGridSetupLocalIndices(compGrid, nodes_added_on_level, recv_map, num_recv_procs, A_tmp_info, level, num_levels);
+      hypre_AMGDDCompGridSetupLocalIndices(compGrid, nodes_added_on_level, recv_map, num_recv_procs,
+                                           A_tmp_info, level, num_levels);
       for (j = level; j < num_levels; j++)
       {
          nodes_added_on_level[j] = 0;
@@ -254,13 +269,15 @@ hypre_BoomerAMGDDSetup( void               *amgdd_vdata,
       for (i = 0; i < num_send_procs; i++)
       {
          send_flag_buffer[i] = hypre_CTAlloc(HYPRE_Int, send_flag_buffer_size[i], HYPRE_MEMORY_HOST);
-         hypre_MPI_Irecv(send_flag_buffer[i], send_flag_buffer_size[i], HYPRE_MPI_INT, hypre_AMGDDCommPkgSendProcs(compGridCommPkg)[level][i], 2, comm, &(requests[request_counter++]));
+         hypre_MPI_Irecv(send_flag_buffer[i], send_flag_buffer_size[i], HYPRE_MPI_INT,
+                         hypre_AMGDDCommPkgSendProcs(compGridCommPkg)[level][i], 2, comm, &(requests[request_counter++]));
       }
 
       // send the recv_map_send_buffer's
       for (i = 0; i < num_recv_procs; i++)
       {
-         hypre_MPI_Isend(recv_map_send_buffer[i], recv_map_send_buffer_size[i], HYPRE_MPI_INT, hypre_AMGDDCommPkgRecvProcs(compGridCommPkg)[level][i], 2, comm, &(requests[request_counter++]));
+         hypre_MPI_Isend(recv_map_send_buffer[i], recv_map_send_buffer_size[i], HYPRE_MPI_INT,
+                         hypre_AMGDDCommPkgRecvProcs(compGridCommPkg)[level][i], 2, comm, &(requests[request_counter++]));
       }
 
       // wait for maps to be received
@@ -269,7 +286,8 @@ hypre_BoomerAMGDDSetup( void               *amgdd_vdata,
       // unpack and setup the send flag arrays
       for (i = 0; i < num_send_procs; i++)
       {
-         hypre_BoomerAMGDD_UnpackSendFlagBuffer(compGrid, send_flag_buffer[i], send_flag[level][i], num_send_nodes[level][i], &(send_buffer_size[level][i]), level, num_levels);
+         hypre_BoomerAMGDD_UnpackSendFlagBuffer(compGrid, send_flag_buffer[i], send_flag[level][i],
+                                                num_send_nodes[level][i], &(send_buffer_size[level][i]), level, num_levels);
       }
 
       // clean up memory for this level
diff --git a/external/hypre/src/parcsr_ls/par_amgdd_solve.c b/external/hypre/src/parcsr_ls/par_amgdd_solve.c
index 8e8f4dd4..cb5c5d09 100644
--- a/external/hypre/src/parcsr_ls/par_amgdd_solve.c
+++ b/external/hypre/src/parcsr_ls/par_amgdd_solve.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -21,7 +21,7 @@ hypre_BoomerAMGDDSolve( void               *amgdd_vdata,
    hypre_ParCSRMatrix  **P_array;
    hypre_ParVector     **F_array;
    hypre_ParVector     **U_array;
-   hypre_ParVector      *res;
+   hypre_ParVector      *res = NULL;
    hypre_ParVector      *Vtemp;
    hypre_ParVector      *Ztemp;
 
@@ -37,9 +37,9 @@ hypre_BoomerAMGDDSolve( void               *amgdd_vdata,
    HYPRE_Int             amg_print_level;
    HYPRE_Int             amg_logging;
    HYPRE_Real            tol;
-   HYPRE_Real            resid_nrm;
-   HYPRE_Real            resid_nrm_init;
-   HYPRE_Real            rhs_norm;
+   HYPRE_Real            resid_nrm = 0.0;
+   HYPRE_Real            resid_nrm_init = 1.0;
+   HYPRE_Real            rhs_norm = 1.0;
    HYPRE_Real            old_resid;
    HYPRE_Real            relative_resid;
    HYPRE_Real            conv_factor;
@@ -98,8 +98,9 @@ hypre_BoomerAMGDDSolve( void               *amgdd_vdata,
    U_array[0] = u;
    if (A != A_array[0])
    {
-      hypre_error_w_msg(HYPRE_ERROR_GENERIC,"WARNING: calling hypre_BoomerAMGDDSolve with different matrix than what was used for initial setup. "
-            "Non-owned parts of fine-grid matrix and fine-grid communication patterns may be incorrect.\n");
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                        "WARNING: calling hypre_BoomerAMGDDSolve with different matrix than what was used for initial setup. "
+                        "Non-owned parts of fine-grid matrix and fine-grid communication patterns may be incorrect.\n");
       hypre_AMGDDCompGridMatrixOwnedDiag(hypre_AMGDDCompGridA(compGrids[0])) = hypre_ParCSRMatrixDiag(A);
       hypre_AMGDDCompGridMatrixOwnedOffd(hypre_AMGDDCompGridA(compGrids[0])) = hypre_ParCSRMatrixOffd(A);
    }
@@ -122,7 +123,7 @@ hypre_BoomerAMGDDSolve( void               *amgdd_vdata,
          {
             hypre_ParCSRMatrixMatvec(alpha, A_array[0], U_array[0], beta, res);
          }
-         resid_nrm = sqrt(hypre_ParVectorInnerProd(res, res));
+         resid_nrm = hypre_sqrt(hypre_ParVectorInnerProd(res, res));
       }
       else
       {
@@ -131,14 +132,14 @@ hypre_BoomerAMGDDSolve( void               *amgdd_vdata,
          {
             hypre_ParCSRMatrixMatvec(alpha, A_array[0], U_array[0], beta, Vtemp);
          }
-         resid_nrm = sqrt(hypre_ParVectorInnerProd(Vtemp, Vtemp));
+         resid_nrm = hypre_sqrt(hypre_ParVectorInnerProd(Vtemp, Vtemp));
       }
 
-      /* Since it is does not diminish performance, attempt to return an error flag
+      /* Since it does not diminish performance, attempt to return an error flag
          and notify users when they supply bad input. */
       if (resid_nrm != 0.)
       {
-         ieee_check = resid_nrm/resid_nrm; /* INF -> NaN conversion */
+         ieee_check = resid_nrm / resid_nrm; /* INF -> NaN conversion */
       }
 
       if (ieee_check != ieee_check)
@@ -165,7 +166,7 @@ hypre_BoomerAMGDDSolve( void               *amgdd_vdata,
 
       if (0 == converge_type)
       {
-         rhs_norm = sqrt(hypre_ParVectorInnerProd(f, f));
+         rhs_norm = hypre_sqrt(hypre_ParVectorInnerProd(f, f));
          if (rhs_norm)
          {
             relative_resid = resid_nrm_init / rhs_norm;
@@ -192,7 +193,7 @@ hypre_BoomerAMGDDSolve( void               *amgdd_vdata,
       hypre_printf("               residual        factor       residual\n");
       hypre_printf("               --------        ------       --------\n");
       hypre_printf("    Initial    %e                 %e\n",
-                                   resid_nrm_init, relative_resid);
+                   resid_nrm_init, relative_resid);
    }
 
    /*-----------------------------------------------------------------------
@@ -256,9 +257,9 @@ hypre_BoomerAMGDDSolve( void               *amgdd_vdata,
       if (amgdd_start_level > 0)
       {
          // Interpolate
-         hypre_ParCSRMatrixMatvec(1.0, P_array[amgdd_start_level-1],
+         hypre_ParCSRMatrixMatvec(1.0, P_array[amgdd_start_level - 1],
                                   U_array[amgdd_start_level], 1.0,
-                                  U_array[amgdd_start_level-1]);
+                                  U_array[amgdd_start_level - 1]);
          // V-cycle back to finest grid
          hypre_ParAMGDataPartialCycleCoarsestLevel(amg_data) = amgdd_start_level - 1;
          hypre_ParAMGDataPartialCycleControl(amg_data) = 1;
@@ -285,13 +286,13 @@ hypre_BoomerAMGDDSolve( void               *amgdd_vdata,
          {
             hypre_ParCSRMatrixMatvecOutOfPlace(alpha, A_array[0], U_array[0], beta,
                                                F_array[0], res);
-            resid_nrm = sqrt(hypre_ParVectorInnerProd(res, res));
+            resid_nrm = hypre_sqrt(hypre_ParVectorInnerProd(res, res));
          }
          else
          {
             hypre_ParCSRMatrixMatvecOutOfPlace(alpha, A_array[0], U_array[0], beta,
                                                F_array[0], Vtemp);
-            resid_nrm = sqrt(hypre_ParVectorInnerProd(Vtemp, Vtemp));
+            resid_nrm = hypre_sqrt(hypre_ParVectorInnerProd(Vtemp, Vtemp));
          }
 
          if (old_resid)
@@ -339,7 +340,7 @@ hypre_BoomerAMGDDSolve( void               *amgdd_vdata,
       {
          hypre_printf("\n\n==============================================");
          hypre_printf("\n NOTE: Convergence tolerance was not achieved\n");
-         hypre_printf("      within the allowed %d V-cycles\n",max_iter);
+         hypre_printf("      within the allowed %d V-cycles\n", max_iter);
          hypre_printf("==============================================");
       }
 
@@ -384,7 +385,7 @@ hypre_BoomerAMGDD_ResidualCommunication( hypre_ParAMGDDData *amgdd_data )
    HYPRE_Int              send_buffer_size, recv_buffer_size;
 
    HYPRE_Int              num_levels, amgdd_start_level;
-   HYPRE_Int              level,i;
+   HYPRE_Int              level, i;
 
    // Get info from amg
    num_levels        = hypre_ParAMGDataNumLevels(amg_data);
@@ -396,15 +397,15 @@ hypre_BoomerAMGDD_ResidualCommunication( hypre_ParAMGDDData *amgdd_data )
    F_array           = hypre_ParAMGDataFArray(amg_data);
 
    // Restrict residual down to all levels
-   for (level = amgdd_start_level; level < num_levels-1; level++)
+   for (level = amgdd_start_level; level < num_levels - 1; level++)
    {
       if (hypre_ParAMGDataRestriction(amg_data))
       {
-         hypre_ParCSRMatrixMatvec(1.0, R_array[level], F_array[level], 0.0, F_array[level+1]);
+         hypre_ParCSRMatrixMatvec(1.0, R_array[level], F_array[level], 0.0, F_array[level + 1]);
       }
       else
       {
-         hypre_ParCSRMatrixMatvecT(1.0, R_array[level], F_array[level], 0.0, F_array[level+1]);
+         hypre_ParCSRMatrixMatvecT(1.0, R_array[level], F_array[level], 0.0, F_array[level + 1]);
       }
    }
 
@@ -435,14 +436,16 @@ hypre_BoomerAMGDD_ResidualCommunication( hypre_ParAMGDDData *amgdd_data )
             {
                recv_buffer_size = hypre_AMGDDCommPkgRecvBufferSize(compGridCommPkg)[level][i];
                recv_buffers[i] = hypre_CTAlloc(HYPRE_Complex, recv_buffer_size, HYPRE_MEMORY_HOST);
-               hypre_MPI_Irecv(recv_buffers[i], recv_buffer_size, HYPRE_MPI_COMPLEX, hypre_AMGDDCommPkgRecvProcs(compGridCommPkg)[level][i], 3, comm, &requests[request_counter++]);
+               hypre_MPI_Irecv(recv_buffers[i], recv_buffer_size, HYPRE_MPI_COMPLEX,
+                               hypre_AMGDDCommPkgRecvProcs(compGridCommPkg)[level][i], 3, comm, &requests[request_counter++]);
             }
 
             for (i = 0; i < num_sends; i++)
             {
                send_buffer_size = hypre_AMGDDCommPkgSendBufferSize(compGridCommPkg)[level][i];
                send_buffers[i] = hypre_BoomerAMGDD_PackResidualBuffer(compGrid, compGridCommPkg, level, i);
-               hypre_MPI_Isend(send_buffers[i], send_buffer_size, HYPRE_MPI_COMPLEX, hypre_AMGDDCommPkgSendProcs(compGridCommPkg)[level][i], 3, comm, &requests[request_counter++]);
+               hypre_MPI_Isend(send_buffers[i], send_buffer_size, HYPRE_MPI_COMPLEX,
+                               hypre_AMGDDCommPkgSendProcs(compGridCommPkg)[level][i], 3, comm, &requests[request_counter++]);
             }
 
             // wait for buffers to be received
@@ -486,7 +489,8 @@ hypre_BoomerAMGDD_PackResidualBuffer( hypre_AMGDDCompGrid **compGrid,
    HYPRE_Int       send_elmt;
    HYPRE_Int       cnt = 0;
 
-   buffer = hypre_CTAlloc(HYPRE_Complex, hypre_AMGDDCommPkgSendBufferSize(compGridCommPkg)[current_level][proc], HYPRE_MEMORY_HOST);
+   buffer = hypre_CTAlloc(HYPRE_Complex,
+                          hypre_AMGDDCommPkgSendBufferSize(compGridCommPkg)[current_level][proc], HYPRE_MEMORY_HOST);
    for (level = current_level; level < hypre_AMGDDCommPkgNumLevels(compGridCommPkg); level++)
    {
       for (i = 0; i < hypre_AMGDDCommPkgNumSendNodes(compGridCommPkg)[current_level][proc][level]; i++)
@@ -494,12 +498,14 @@ hypre_BoomerAMGDD_PackResidualBuffer( hypre_AMGDDCompGrid **compGrid,
          send_elmt = hypre_AMGDDCommPkgSendFlag(compGridCommPkg)[current_level][proc][level][i];
          if (send_elmt < hypre_AMGDDCompGridNumOwnedNodes(compGrid[level]))
          {
-            buffer[cnt++] = hypre_VectorData(hypre_AMGDDCompGridVectorOwned(hypre_AMGDDCompGridF(compGrid[level])))[send_elmt];
+            buffer[cnt++] = hypre_VectorData(hypre_AMGDDCompGridVectorOwned(hypre_AMGDDCompGridF(
+                                                                               compGrid[level])))[send_elmt];
          }
          else
          {
             send_elmt -= hypre_AMGDDCompGridNumOwnedNodes(compGrid[level]);
-            buffer[cnt++] = hypre_VectorData(hypre_AMGDDCompGridVectorNonOwned(hypre_AMGDDCompGridF(compGrid[level])))[send_elmt];
+            buffer[cnt++] = hypre_VectorData(hypre_AMGDDCompGridVectorNonOwned(hypre_AMGDDCompGridF(
+                                                                                  compGrid[level])))[send_elmt];
          }
       }
    }
@@ -523,7 +529,8 @@ hypre_BoomerAMGDD_UnpackResidualBuffer( HYPRE_Complex        *buffer,
       for (i = 0; i < hypre_AMGDDCommPkgNumRecvNodes(compGridCommPkg)[current_level][proc][level]; i++)
       {
          recv_elmt = hypre_AMGDDCommPkgRecvMap(compGridCommPkg)[current_level][proc][level][i];
-         hypre_VectorData(hypre_AMGDDCompGridVectorNonOwned(hypre_AMGDDCompGridF(compGrid[level])))[recv_elmt] = buffer[cnt++];
+         hypre_VectorData(hypre_AMGDDCompGridVectorNonOwned(hypre_AMGDDCompGridF(
+                                                               compGrid[level])))[recv_elmt] = buffer[cnt++];
       }
    }
 
diff --git a/external/hypre/src/parcsr_ls/par_cg_relax_wt.c b/external/hypre/src/parcsr_ls/par_cg_relax_wt.c
index ba9d56d4..07e7dece 100644
--- a/external/hypre/src/parcsr_ls/par_cg_relax_wt.c
+++ b/external/hypre/src/parcsr_ls/par_cg_relax_wt.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -15,7 +15,7 @@
 #include "par_amg.h"
 
 /*--------------------------------------------------------------------------
- * hypre_BoomerAMGCycle
+ * hypre_BoomerAMGCGRelaxWt
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
@@ -27,7 +27,7 @@ hypre_BoomerAMGCGRelaxWt( void       *amg_vdata,
    hypre_ParAMGData *amg_data = (hypre_ParAMGData*) amg_vdata;
 
    MPI_Comm comm;
-   HYPRE_Solver *smoother;
+   HYPRE_Solver *smoother = NULL;
    /* Data Structure variables */
 
    /* hypre_ParCSRMatrix **A_array = hypre_ParAMGDataAArray(amg_data); */
@@ -35,14 +35,14 @@ hypre_BoomerAMGCGRelaxWt( void       *amg_vdata,
    hypre_ParCSRMatrix *A = hypre_ParAMGDataAArray(amg_data)[level];
    /* hypre_ParVector    **F_array = hypre_ParAMGDataFArray(amg_data); */
    /* hypre_ParVector    **U_array = hypre_ParAMGDataUArray(amg_data); */
-   hypre_ParVector    *Utemp;
+   hypre_ParVector    *Utemp = NULL;
    hypre_ParVector    *Vtemp;
    hypre_ParVector    *Ptemp;
    hypre_ParVector    *Rtemp;
    hypre_ParVector    *Ztemp;
    hypre_ParVector    *Qtemp = NULL;
 
-   HYPRE_Int    *CF_marker = hypre_IntArrayData(hypre_ParAMGDataCFMarkerArray(amg_data)[level]);
+   HYPRE_Int    *CF_marker;
    HYPRE_Real   *Ptemp_data;
    HYPRE_Real   *Ztemp_data;
 
@@ -87,15 +87,15 @@ hypre_BoomerAMGCGRelaxWt( void       *amg_vdata,
    HYPRE_Real   *S_vec;
 #endif
 
-#if !defined(HYPRE_USING_CUDA) && !defined(HYPRE_USING_HIP)
+#if !defined(HYPRE_USING_GPU)
    HYPRE_Int num_threads = hypre_NumThreads();
 #endif
 
    /* Acquire data and allocate storage */
 
-   tridiag  = hypre_CTAlloc(HYPRE_Real,  num_cg_sweeps+1, HYPRE_MEMORY_HOST);
-   trioffd  = hypre_CTAlloc(HYPRE_Real,  num_cg_sweeps+1, HYPRE_MEMORY_HOST);
-   for (i=0; i < num_cg_sweeps+1; i++)
+   tridiag  = hypre_CTAlloc(HYPRE_Real,  num_cg_sweeps + 1, HYPRE_MEMORY_HOST);
+   trioffd  = hypre_CTAlloc(HYPRE_Real,  num_cg_sweeps + 1, HYPRE_MEMORY_HOST);
+   for (i = 0; i < num_cg_sweeps + 1; i++)
    {
       tridiag[i] = 0;
       trioffd[i] = 0;
@@ -119,25 +119,29 @@ hypre_BoomerAMGCGRelaxWt( void       *amg_vdata,
    hypre_ParVectorInitialize(Ztemp);
 
    if (hypre_ParAMGDataL1Norms(amg_data) != NULL)
+   {
       l1_norms = hypre_ParAMGDataL1Norms(amg_data)[level];
+   }
 
-#if !defined(HYPRE_USING_CUDA) && !defined(HYPRE_USING_HIP)
+#if !defined(HYPRE_USING_GPU)
    if (num_threads > 1)
 #endif
    {
       needQ = 1;
    }
 
-   grid_relax_type     = hypre_ParAMGDataGridRelaxType(amg_data);
-   smooth_type         = hypre_ParAMGDataSmoothType(amg_data);
-   smooth_num_levels   = hypre_ParAMGDataSmoothNumLevels(amg_data);
+   grid_relax_type   = hypre_ParAMGDataGridRelaxType(amg_data);
+   smooth_type       = hypre_ParAMGDataSmoothType(amg_data);
+   smooth_num_levels = hypre_ParAMGDataSmoothNumLevels(amg_data);
+   CF_marker         = (hypre_ParAMGDataCFMarkerArray(amg_data)[level] != NULL) ?
+                       hypre_IntArrayData(hypre_ParAMGDataCFMarkerArray(amg_data)[level]) : NULL;
 
    /* Initialize */
 
    Solve_err_flag = 0;
 
    comm = hypre_ParCSRMatrixComm(A);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_rank(comm, &my_id);
 
    if (smooth_num_levels > level)
    {
@@ -146,8 +150,8 @@ hypre_BoomerAMGCGRelaxWt( void       *amg_vdata,
       if (smooth_type > 6 && smooth_type < 10)
       {
          Utemp = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A),
-                                 hypre_ParCSRMatrixGlobalNumRows(A),
-                                 hypre_ParCSRMatrixRowStarts(A));
+                                       hypre_ParCSRMatrixGlobalNumRows(A),
+                                       hypre_ParCSRMatrixRowStarts(A));
          hypre_ParVectorInitialize(Utemp);
       }
    }
@@ -200,43 +204,50 @@ hypre_BoomerAMGCGRelaxWt( void       *amg_vdata,
    for (jj = 0; jj < num_cg_sweeps; jj++)
    {
       hypre_ParVectorSetConstantValues(Ztemp, 0.0);
+
       for (j = 0; j < num_sweeps; j++)
       {
-         if (smooth_option > 6)
+         if (smooth_num_levels > level)
          {
-
-            hypre_ParVectorCopy(Rtemp,Vtemp);
-            alpha = -1.0;
-            beta = 1.0;
-            hypre_ParCSRMatrixMatvec(alpha, A,
-                                Ztemp, beta, Vtemp);
-            if (smooth_option == 8)
-               HYPRE_ParCSRParaSailsSolve(smoother[level],
-                              (HYPRE_ParCSRMatrix) A,
-                              (HYPRE_ParVector) Vtemp,
-                              (HYPRE_ParVector) Utemp);
-            else if (smooth_option == 7)
+            if (smooth_option > 6)
             {
-               HYPRE_ParCSRPilutSolve(smoother[level],
-                              (HYPRE_ParCSRMatrix) A,
-                              (HYPRE_ParVector) Vtemp,
-                              (HYPRE_ParVector) Utemp);
-              hypre_ParVectorAxpy(1.0,Utemp,Ztemp);
+               hypre_ParVectorCopy(Rtemp, Vtemp);
+               alpha = -1.0;
+               beta = 1.0;
+               hypre_ParCSRMatrixMatvec(alpha, A,
+                                        Ztemp, beta, Vtemp);
+               if (smooth_option == 8)
+               {
+                  HYPRE_ParCSRParaSailsSolve(smoother[level],
+                                             (HYPRE_ParCSRMatrix) A,
+                                             (HYPRE_ParVector) Vtemp,
+                                             (HYPRE_ParVector) Utemp);
+               }
+               else if (smooth_option == 7)
+               {
+                  HYPRE_ParCSRPilutSolve(smoother[level],
+                                         (HYPRE_ParCSRMatrix) A,
+                                         (HYPRE_ParVector) Vtemp,
+                                         (HYPRE_ParVector) Utemp);
+                  hypre_ParVectorAxpy(1.0, Utemp, Ztemp);
+               }
+               else if (smooth_option == 9)
+               {
+                  HYPRE_EuclidSolve(smoother[level],
+                                    (HYPRE_ParCSRMatrix) A,
+                                    (HYPRE_ParVector) Vtemp,
+                                    (HYPRE_ParVector) Utemp);
+                  hypre_ParVectorAxpy(1.0, Utemp, Ztemp);
+               }
             }
-            else if (smooth_option == 9)
+            else if (smooth_option == 6)
             {
-               HYPRE_EuclidSolve(smoother[level],
-                              (HYPRE_ParCSRMatrix) A,
-                              (HYPRE_ParVector) Vtemp,
-                              (HYPRE_ParVector) Utemp);
-               hypre_ParVectorAxpy(1.0,Utemp,Ztemp);
+               HYPRE_SchwarzSolve(smoother[level],
+                                  (HYPRE_ParCSRMatrix) A,
+                                  (HYPRE_ParVector) Rtemp,
+                                  (HYPRE_ParVector) Ztemp);
             }
          }
-         else if (smooth_option == 6)
-            HYPRE_SchwarzSolve(smoother[level],
-                              (HYPRE_ParCSRMatrix) A,
-                              (HYPRE_ParVector) Rtemp,
-                              (HYPRE_ParVector) Ztemp);
          else
          {
             Solve_err_flag = hypre_BoomerAMGRelax(A,
@@ -257,47 +268,50 @@ hypre_BoomerAMGCGRelaxWt( void       *amg_vdata,
             hypre_ParVectorDestroy(Ptemp);
             hypre_TFree(tridiag, HYPRE_MEMORY_HOST);
             hypre_TFree(trioffd, HYPRE_MEMORY_HOST);
-            return(Solve_err_flag);
+            return (Solve_err_flag);
          }
       }
+
       gammaold = gamma;
-      gamma = hypre_ParVectorInnerProd(Rtemp,Ztemp);
+      gamma = hypre_ParVectorInnerProd(Rtemp, Ztemp);
       if (jj == 0)
       {
-         hypre_ParVectorCopy(Ztemp,Ptemp);
+         hypre_ParVectorCopy(Ztemp, Ptemp);
          beta = 1.0;
       }
       else
       {
-         beta = gamma/gammaold;
-         for (i=0; i < local_size; i++)
-            Ptemp_data[i] = Ztemp_data[i] + beta*Ptemp_data[i];
+         beta = gamma / gammaold;
+         for (i = 0; i < local_size; i++)
+         {
+            Ptemp_data[i] = Ztemp_data[i] + beta * Ptemp_data[i];
+         }
       }
-      hypre_ParCSRMatrixMatvec(1.0,A,Ptemp,0.0,Vtemp);
-      alpha = gamma /hypre_ParVectorInnerProd(Ptemp,Vtemp);
-      alphinv = 1.0/alpha;
-      tridiag[jj+1] = alphinv;
+      hypre_ParCSRMatrixMatvec(1.0, A, Ptemp, 0.0, Vtemp);
+      alpha = gamma / (hypre_ParVectorInnerProd(Ptemp, Vtemp) + HYPRE_REAL_MIN);
+      alphinv = 1.0 / (alpha + HYPRE_REAL_MIN);
+      tridiag[jj + 1] = alphinv;
       tridiag[jj] *= beta;
       tridiag[jj] += alphinv;
-      trioffd[jj] *= sqrt(beta);
-      trioffd[jj+1] = -alphinv;
-      row_sum = fabs(tridiag[jj]) + fabs(trioffd[jj]);
-      if (row_sum > max_row_sum) max_row_sum = row_sum;
+      trioffd[jj] *= hypre_sqrt(beta);
+      trioffd[jj + 1] = -alphinv;
+      row_sum = hypre_abs(tridiag[jj]) + hypre_abs(trioffd[jj]);
+      if (row_sum > max_row_sum) { max_row_sum = row_sum; }
       if (jj > 0)
       {
-         row_sum = fabs(tridiag[jj-1]) + fabs(trioffd[jj-1])
-            + fabs(trioffd[jj]);
-         if (row_sum > max_row_sum) max_row_sum = row_sum;
+         row_sum = hypre_abs(tridiag[jj - 1]) + hypre_abs(trioffd[jj - 1])
+                   + hypre_abs(trioffd[jj]);
+         if (row_sum > max_row_sum) { max_row_sum = row_sum; }
          /* lambda_min_old = lambda_min; */
          lambda_max_old = lambda_max;
          rlx_wt_old = rlx_wt;
-         hypre_Bisection(jj+1, tridiag, trioffd, lambda_max_old,
-               max_row_sum, 1.e-3, jj+1, &lambda_max);
-         rlx_wt = 1.0/lambda_max;
+         hypre_Bisection(jj + 1, tridiag, trioffd, lambda_max_old,
+                         max_row_sum, 1.e-3, jj + 1, &lambda_max);
+         rlx_wt = 1.0 / lambda_max;
          /* hypre_Bisection(jj+1, tridiag, trioffd, 0.0, lambda_min_old,
             1.e-3, 1, &lambda_min);
          rlx_wt = 2.0/(lambda_min+lambda_max); */
-         if (fabs(rlx_wt-rlx_wt_old) < 1.e-3 )
+         if (hypre_abs(rlx_wt - rlx_wt_old) < 1.e-3 )
          {
             /* if (my_id == 0) hypre_printf (" cg sweeps : %d\n", (jj+1)); */
             break;
@@ -309,19 +323,19 @@ hypre_BoomerAMGCGRelaxWt( void       *amg_vdata,
          lambda_max = tridiag[0];
       }
 
-      hypre_ParVectorAxpy(-alpha,Vtemp,Rtemp);
+      hypre_ParVectorAxpy(-alpha, Vtemp, Rtemp);
    }
    /*if (my_id == 0)
      hypre_printf (" lambda-min: %f  lambda-max: %f\n", lambda_min, lambda_max);
 
-   rlx_wt = fabs(tridiag[0])+fabs(trioffd[1]);
+   rlx_wt = hypre_abs(tridiag[0])+hypre_abs(trioffd[1]);
 
    for (i=1; i < num_cg_sweeps-1; i++)
    {
-      row_sum = fabs(tridiag[i]) + fabs(trioffd[i]) + fabs(trioffd[i+1]);
+      row_sum = hypre_abs(tridiag[i]) + hypre_abs(trioffd[i]) + hypre_abs(trioffd[i+1]);
       if (row_sum > rlx_wt) rlx_wt = row_sum;
    }
-   row_sum = fabs(tridiag[num_cg_sweeps-1]) + fabs(trioffd[num_cg_sweeps-1]);
+   row_sum = hypre_abs(tridiag[num_cg_sweeps-1]) + hypre_abs(trioffd[num_cg_sweeps-1]);
    if (row_sum > rlx_wt) rlx_wt = row_sum;
 
    hypre_Bisection(num_cg_sweeps, tridiag, trioffd, 0.0, rlx_wt, 1.e-3, 1,
@@ -352,7 +366,7 @@ hypre_BoomerAMGCGRelaxWt( void       *amg_vdata,
 
    *rlx_wt_ptr = rlx_wt;
 
-   return(Solve_err_flag);
+   return (Solve_err_flag);
 }
 
 /*--------------------------------------------------------------------------
@@ -371,29 +385,33 @@ hypre_Bisection(HYPRE_Int n, HYPRE_Real *diag, HYPRE_Real *offd,
    HYPRE_Int i;
    HYPRE_Real p0, p1, p2;
 
-   while (fabs(y-z) > tol*(fabs(y) + fabs(z)))
+   while (hypre_abs(y - z) > tol * (hypre_abs(y) + hypre_abs(z)))
    {
-      x = (y+z)/2;
+      x = (y + z) / 2;
 
       sign_change = 0;
       p0 = 1;
       p1 = diag[0] - x;
-      if (p0*p1 <= 0) sign_change++;
-      for (i=1; i < n; i++)
+      if (p0 * p1 <= 0) { sign_change++; }
+      for (i = 1; i < n; i++)
       {
-         p2 = (diag[i] - x)*p1 - offd[i]*offd[i]*p0;
+         p2 = (diag[i] - x) * p1 - offd[i] * offd[i] * p0;
          p0 = p1;
          p1 = p2;
-         if (p0*p1 <= 0) sign_change++;
+         if (p0 * p1 <= 0) { sign_change++; }
       }
 
       if (sign_change >= k)
+      {
          z = x;
+      }
       else
+      {
          y = x;
+      }
    }
 
-   eigen_value = (y+z)/2;
+   eigen_value = (y + z) / 2;
    *ev_ptr = eigen_value;
 
    return ierr;
diff --git a/external/hypre/src/parcsr_ls/par_cgc_coarsen.c b/external/hypre/src/parcsr_ls/par_cgc_coarsen.c
index dfa2f6a1..b4a59737 100644
--- a/external/hypre/src/parcsr_ls/par_cgc_coarsen.c
+++ b/external/hypre/src/parcsr_ls/par_cgc_coarsen.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -14,6 +14,7 @@
 
 #include "_hypre_parcsr_ls.h"
 #include "../HYPRE.h" /* BM Aug 15, 2006 */
+#include "_hypre_IJ_mv.h"
 
 #define C_PT 1
 #define F_PT -1
@@ -37,7 +38,7 @@ hypre_BoomerAMGCoarsenCGCb( hypre_ParCSRMatrix    *S,
                             hypre_IntArray             **CF_marker_ptr)
 {
 #ifdef HYPRE_MIXEDINT
-   hypre_error_w_msg(HYPRE_ERROR_GENERIC,"CGC coarsening is not enabled in mixedint mode!");
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "CGC coarsening is not enabled in mixedint mode!");
    return hypre_error_flag;
 #endif
 
@@ -53,7 +54,7 @@ hypre_BoomerAMGCoarsenCGCb( hypre_ParCSRMatrix    *S,
    HYPRE_Int              num_variables = hypre_CSRMatrixNumRows(S_diag);
    HYPRE_Int              num_cols_offd = hypre_CSRMatrixNumCols(S_offd);
 
-   hypre_CSRMatrix *S_ext;
+   hypre_CSRMatrix       *S_ext = NULL;
    HYPRE_Int             *S_ext_i;
    HYPRE_BigInt          *S_ext_j;
 
@@ -62,14 +63,14 @@ hypre_BoomerAMGCoarsenCGCb( hypre_ParCSRMatrix    *S,
    HYPRE_Int             *ST_j;
 
    HYPRE_Int             *CF_marker;
-   HYPRE_Int             *CF_marker_offd=NULL;
+   HYPRE_Int             *CF_marker_offd = NULL;
    HYPRE_Int              ci_tilde = -1;
    HYPRE_Int              ci_tilde_mark = -1;
 
    HYPRE_Int             *measure_array;
    HYPRE_Int             *measure_array_master;
    HYPRE_Int             *graph_array;
-   HYPRE_Int             *int_buf_data=NULL;
+   HYPRE_Int             *int_buf_data = NULL;
    /*HYPRE_Int           *ci_array=NULL;*/
 
    HYPRE_Int              i, j, k, l, jS;
@@ -92,11 +93,11 @@ hypre_BoomerAMGCoarsenCGCb( hypre_ParCSRMatrix    *S,
    HYPRE_Int              nabor, nabor_two;
 
    HYPRE_Int              use_commpkg_A = 0;
-   HYPRE_Real             wall_time;
+   HYPRE_Real             wall_time = 0.0;
 
-   HYPRE_Int              measure_max; /* BM Aug 30, 2006: maximal measure, needed for CGC */
+   HYPRE_Int              measure_max = 0; /* BM Aug 30, 2006: maximal measure, needed for CGC */
 
-   if (coarsen_type < 0) coarsen_type = -coarsen_type;
+   if (coarsen_type < 0) { coarsen_type = -coarsen_type; }
 
    /*-------------------------------------------------------
     * Initialize the C/F marker, LoL_head, LoL_tail  arrays
@@ -127,10 +128,10 @@ hypre_BoomerAMGCoarsenCGCb( hypre_ParCSRMatrix    *S,
     * to "unaccounted-for" dependence.
     *----------------------------------------------------------------*/
 
-   if (debug_flag == 3) wall_time = time_getWallclockSeconds();
+   if (debug_flag == 3) { wall_time = time_getWallclockSeconds(); }
 
-   hypre_MPI_Comm_size(comm,&num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_size(comm, &num_procs);
+   hypre_MPI_Comm_rank(comm, &my_id);
 
    if (!comm_pkg)
    {
@@ -151,7 +152,7 @@ hypre_BoomerAMGCoarsenCGCb( hypre_ParCSRMatrix    *S,
    jS = S_i[num_variables];
 
    ST = hypre_CSRMatrixCreate(num_variables, num_variables, jS);
-   ST_i = hypre_CTAlloc(HYPRE_Int, num_variables+1, HYPRE_MEMORY_HOST);
+   ST_i = hypre_CTAlloc(HYPRE_Int, num_variables + 1, HYPRE_MEMORY_HOST);
    ST_j = hypre_CTAlloc(HYPRE_Int, jS, HYPRE_MEMORY_HOST);
    hypre_CSRMatrixI(ST) = ST_i;
    hypre_CSRMatrixJ(ST) = ST_j;
@@ -161,20 +162,22 @@ hypre_BoomerAMGCoarsenCGCb( hypre_ParCSRMatrix    *S,
     * generate transpose of S, ST
     *----------------------------------------------------------*/
 
-   for (i=0; i <= num_variables; i++)
+   for (i = 0; i <= num_variables; i++)
+   {
       ST_i[i] = 0;
+   }
 
-   for (i=0; i < jS; i++)
+   for (i = 0; i < jS; i++)
    {
-      ST_i[S_j[i]+1]++;
+      ST_i[S_j[i] + 1]++;
    }
-   for (i=0; i < num_variables; i++)
+   for (i = 0; i < num_variables; i++)
    {
-      ST_i[i+1] += ST_i[i];
+      ST_i[i + 1] += ST_i[i];
    }
-   for (i=0; i < num_variables; i++)
+   for (i = 0; i < num_variables; i++)
    {
-      for (j=S_i[i]; j < S_i[i+1]; j++)
+      for (j = S_i[i]; j < S_i[i + 1]; j++)
       {
          index = S_j[j];
          ST_j[ST_i[index]] = i;
@@ -183,7 +186,7 @@ hypre_BoomerAMGCoarsenCGCb( hypre_ParCSRMatrix    *S,
    }
    for (i = num_variables; i > 0; i--)
    {
-      ST_i[i] = ST_i[i-1];
+      ST_i[i] = ST_i[i - 1];
    }
    ST_i[0] = 0;
 
@@ -202,16 +205,20 @@ hypre_BoomerAMGCoarsenCGCb( hypre_ParCSRMatrix    *S,
 
    for (i = 0; i < num_variables; i++)
    {
-      measure_array_master[i] = ST_i[i+1]-ST_i[i];
+      measure_array_master[i] = ST_i[i + 1] - ST_i[i];
    }
 
    if ((measure_type || (coarsen_type != 1 && coarsen_type != 11))
-         && num_procs > 1)
+       && num_procs > 1)
    {
       if (use_commpkg_A)
-         S_ext      = hypre_ParCSRMatrixExtractBExt(S,A,0);
+      {
+         S_ext      = hypre_ParCSRMatrixExtractBExt(S, A, 0);
+      }
       else
-         S_ext      = hypre_ParCSRMatrixExtractBExt(S,S,0);
+      {
+         S_ext      = hypre_ParCSRMatrixExtractBExt(S, S, 0);
+      }
       S_ext_i    = hypre_CSRMatrixI(S_ext);
       S_ext_j    = hypre_CSRMatrixBigJ(S_ext);
       num_nonzeros = S_ext_i[num_cols_offd];
@@ -220,11 +227,13 @@ hypre_BoomerAMGCoarsenCGCb( hypre_ParCSRMatrix    *S,
         col_n = col_0+num_variables;*/
       if (measure_type)
       {
-         for (i=0; i < num_nonzeros; i++)
+         for (i = 0; i < num_nonzeros; i++)
          {
             index = (HYPRE_Int)(S_ext_j[i] - first_col);
             if (index > -1 && index < num_variables)
+            {
                measure_array_master[index]++;
+            }
          }
       }
    }
@@ -233,7 +242,7 @@ hypre_BoomerAMGCoarsenCGCb( hypre_ParCSRMatrix    *S,
     * Loop until all points are either fine or coarse.
     *---------------------------------------------------*/
 
-   if (debug_flag == 3) wall_time = time_getWallclockSeconds();
+   if (debug_flag == 3) { wall_time = time_getWallclockSeconds(); }
 
    /* first coarsening phase */
 
@@ -254,8 +263,8 @@ hypre_BoomerAMGCoarsenCGCb( hypre_ParCSRMatrix    *S,
    num_left = 0;
    for (j = 0; j < num_variables; j++)
    {
-      if ((S_i[j+1]-S_i[j])== 0 &&
-            (S_offd_i[j+1]-S_offd_i[j]) == 0)
+      if ((S_i[j + 1] - S_i[j]) == 0 &&
+          (S_offd_i[j + 1] - S_offd_i[j]) == 0)
       {
          CF_marker[j] = SF_PT;
          measure_array_master[j] = 0;
@@ -267,12 +276,13 @@ hypre_BoomerAMGCoarsenCGCb( hypre_ParCSRMatrix    *S,
       }
    }
 
-   if (coarsen_type==22) {
+   if (coarsen_type == 22)
+   {
       /* BM Sep 8, 2006: allow_emptygrids only if the following holds for all points j:
          (a) the point has no strong connections at all, OR
          (b) the point has a strong connection across a boundary */
-      for (j=0;j<num_variables;j++)
-         if (S_i[j+1]>S_i[j] && S_offd_i[j+1] == S_offd_i[j]) {coarsen_type=21;break;}
+      for (j = 0; j < num_variables; j++)
+         if (S_i[j + 1] > S_i[j] && S_offd_i[j + 1] == S_offd_i[j]) {coarsen_type = 21; break;}
    }
 
    for (l = 1; l <= cgc_its; l++)
@@ -280,9 +290,10 @@ hypre_BoomerAMGCoarsenCGCb( hypre_ParCSRMatrix    *S,
       LoL_head = NULL;
       LoL_tail = NULL;
       num_left = 0;  /* compute num_left before each RS coarsening loop */
-      hypre_TMemcpy(measure_array, measure_array_master, HYPRE_Int, num_variables, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
-      memset (lists,0,sizeof(HYPRE_Int)*num_variables);
-      memset (where,0,sizeof(HYPRE_Int)*num_variables);
+      hypre_TMemcpy(measure_array, measure_array_master, HYPRE_Int, num_variables, HYPRE_MEMORY_HOST,
+                    HYPRE_MEMORY_HOST);
+      memset (lists, 0, sizeof(HYPRE_Int)*num_variables);
+      memset (where, 0, sizeof(HYPRE_Int)*num_variables);
 
       for (j = 0; j < num_variables; j++)
       {
@@ -300,9 +311,9 @@ hypre_BoomerAMGCoarsenCGCb( hypre_ParCSRMatrix    *S,
                                            in each CGC iteration.                    BM Aug 30, 2006 */
 
             {
-               if (measure < 0) hypre_error_w_msg(HYPRE_ERROR_GENERIC,"negative measure!\n");
+               if (measure < 0) { hypre_error_w_msg(HYPRE_ERROR_GENERIC, "negative measure!\n"); }
                /* CF_marker[j] = f_pnt; */
-               for (k = S_i[j]; k < S_i[j+1]; k++)
+               for (k = S_i[j]; k < S_i[j + 1]; k++)
                {
                   nabor = S_j[k];
                   /* if (CF_marker[nabor] != SF_PT)  */
@@ -314,12 +325,12 @@ hypre_BoomerAMGCoarsenCGCb( hypre_ParCSRMatrix    *S,
                         new_meas = measure_array[nabor];
                         if (new_meas > 0)
                            hypre_remove_point(&LoL_head, &LoL_tail, new_meas,
-                                 nabor, lists, where);
-                        else num_left++; /* BM Aug 29, 2006 */
+                                              nabor, lists, where);
+                        else { num_left++; } /* BM Aug 29, 2006 */
 
                         new_meas = ++(measure_array[nabor]);
                         hypre_enter_on_lists(&LoL_head, &LoL_tail, new_meas,
-                              nabor, lists, where);
+                                             nabor, lists, where);
                      }
                      else
                      {
@@ -333,11 +344,13 @@ hypre_BoomerAMGCoarsenCGCb( hypre_ParCSRMatrix    *S,
       }
 
       /* BM Aug 30, 2006: first iteration: determine maximal weight */
-      if (num_left && l==1) measure_max = measure_array[LoL_head->head];
+      if (num_left && l == 1) { measure_max = measure_array[LoL_head->head]; }
       /* BM Aug 30, 2006: break CGC iteration if no suitable
          starting point is available any more */
-      if (!num_left || measure_array[LoL_head->head]<measure_max) {
-         while (LoL_head) {
+      if (!num_left || measure_array[LoL_head->head] < measure_max)
+      {
+         while (LoL_head)
+         {
             hypre_LinkList list_ptr = LoL_head;
             LoL_head = LoL_head->next_elt;
             hypre_dispose_elt (list_ptr);
@@ -379,42 +392,42 @@ hypre_BoomerAMGCoarsenCGCb( hypre_ParCSRMatrix    *S,
 
          hypre_remove_point(&LoL_head, &LoL_tail, measure, index, lists, where);
 
-         for (j = ST_i[index]; j < ST_i[index+1]; j++)
+         for (j = ST_i[index]; j < ST_i[index + 1]; j++)
          {
             nabor = ST_j[j];
             /*          if (CF_marker[nabor] == UNDECIDED) */
-            if (measure_array[nabor]>0) /* undecided point */
+            if (measure_array[nabor] > 0) /* undecided point */
             {
                /* CF_marker[nabor] = F_PT; */ /* BM Aug 18, 2006 */
                measure = measure_array[nabor];
-               measure_array[nabor]=0;
+               measure_array[nabor] = 0;
 
                hypre_remove_point(&LoL_head, &LoL_tail, measure, nabor, lists, where);
                --num_left;
 
-               for (k = S_i[nabor]; k < S_i[nabor+1]; k++)
+               for (k = S_i[nabor]; k < S_i[nabor + 1]; k++)
                {
                   nabor_two = S_j[k];
                   /* if (CF_marker[nabor_two] == UNDECIDED) */
-                  if (measure_array[nabor_two]>0) /* undecided point */
+                  if (measure_array[nabor_two] > 0) /* undecided point */
                   {
                      measure = measure_array[nabor_two];
                      hypre_remove_point(&LoL_head, &LoL_tail, measure,
-                           nabor_two, lists, where);
+                                        nabor_two, lists, where);
 
                      new_meas = ++(measure_array[nabor_two]);
 
                      hypre_enter_on_lists(&LoL_head, &LoL_tail, new_meas,
-                           nabor_two, lists, where);
+                                          nabor_two, lists, where);
                   }
                }
             }
          }
-         for (j = S_i[index]; j < S_i[index+1]; j++)
+         for (j = S_i[index]; j < S_i[index + 1]; j++)
          {
             nabor = S_j[j];
             /*          if (CF_marker[nabor] == UNDECIDED) */
-            if (measure_array[nabor]>0) /* undecided point */
+            if (measure_array[nabor] > 0) /* undecided point */
             {
                measure = measure_array[nabor];
 
@@ -424,33 +437,33 @@ hypre_BoomerAMGCoarsenCGCb( hypre_ParCSRMatrix    *S,
 
                if (measure > 0)
                   hypre_enter_on_lists(&LoL_head, &LoL_tail, measure, nabor,
-                        lists, where);
+                                       lists, where);
                else
                {
                   /* CF_marker[nabor] = F_PT; */ /* BM Aug 18, 2006 */
                   --num_left;
 
-                  for (k = S_i[nabor]; k < S_i[nabor+1]; k++)
+                  for (k = S_i[nabor]; k < S_i[nabor + 1]; k++)
                   {
                      nabor_two = S_j[k];
                      /* if (CF_marker[nabor_two] == UNDECIDED) */
-                     if (measure_array[nabor_two]>0)
+                     if (measure_array[nabor_two] > 0)
                      {
                         new_meas = measure_array[nabor_two];
                         hypre_remove_point(&LoL_head, &LoL_tail, new_meas,
-                              nabor_two, lists, where);
+                                           nabor_two, lists, where);
 
                         new_meas = ++(measure_array[nabor_two]);
 
                         hypre_enter_on_lists(&LoL_head, &LoL_tail, new_meas,
-                              nabor_two, lists, where);
+                                             nabor_two, lists, where);
                      }
                   }
                }
             }
          }
       }
-      if (LoL_head) hypre_error_w_msg (HYPRE_ERROR_GENERIC,"Linked list not empty!\n"); /*head: %d\n",LoL_head->head);*/
+      if (LoL_head) { hypre_error_w_msg (HYPRE_ERROR_GENERIC, "Linked list not empty!\n"); } /*head: %d\n",LoL_head->head);*/
    }
    l--; /* BM Aug 15, 2006 */
 
@@ -462,34 +475,38 @@ hypre_BoomerAMGCoarsenCGCb( hypre_ParCSRMatrix    *S,
    {
       wall_time = time_getWallclockSeconds() - wall_time;
       hypre_printf("Proc = %d    Coarsen 1st pass = %f\n",
-            my_id, wall_time);
+                   my_id, wall_time);
    }
 
    hypre_TFree(lists, HYPRE_MEMORY_HOST);
    hypre_TFree(where, HYPRE_MEMORY_HOST);
 
-   if (num_procs>1) {
-      if (debug_flag == 3)  wall_time = time_getWallclockSeconds();
-      hypre_BoomerAMGCoarsenCGC (S,l,coarsen_type,CF_marker);
+   if (num_procs > 1)
+   {
+      if (debug_flag == 3) { wall_time = time_getWallclockSeconds(); }
+      hypre_BoomerAMGCoarsenCGC (S, l, coarsen_type, CF_marker);
 
-      if (debug_flag == 3)  {
+      if (debug_flag == 3)
+      {
          wall_time = time_getWallclockSeconds() - wall_time;
          hypre_printf("Proc = %d    Coarsen CGC = %f\n",
-               my_id, wall_time);
+                      my_id, wall_time);
       }
    }
-   else {
+   else
+   {
       /* the first candiate coarse grid is the coarse grid */
-      for (j=0;j<num_variables;j++) {
-         if (CF_marker[j]==1) CF_marker[j]=C_PT;
-         else CF_marker[j]=F_PT;
+      for (j = 0; j < num_variables; j++)
+      {
+         if (CF_marker[j] == 1) { CF_marker[j] = C_PT; }
+         else { CF_marker[j] = F_PT; }
       }
    }
 
    /* BM May 19, 2006:
       Set all undecided points to be fine grid points. */
-   for (j=0;j<num_variables;j++)
-      if (!CF_marker[j]) CF_marker[j]=F_PT;
+   for (j = 0; j < num_variables; j++)
+      if (!CF_marker[j]) { CF_marker[j] = F_PT; }
 
    /*---------------------------------------------------
     * Initialize the graph array
@@ -502,26 +519,28 @@ hypre_BoomerAMGCoarsenCGCb( hypre_ParCSRMatrix    *S,
       graph_array[i] = -1;
    }
 
-   if (debug_flag == 3) wall_time = time_getWallclockSeconds();
+   if (debug_flag == 3) { wall_time = time_getWallclockSeconds(); }
 
-   for (i=0; i < num_variables; i++)
+   for (i = 0; i < num_variables; i++)
    {
-      if (ci_tilde_mark != i) ci_tilde = -1;
+      if (ci_tilde_mark != i) { ci_tilde = -1; }
       if (CF_marker[i] == -1)
       {
-         for (ji = S_i[i]; ji < S_i[i+1]; ji++)
+         for (ji = S_i[i]; ji < S_i[i + 1]; ji++)
          {
             j = S_j[ji];
             if (CF_marker[j] > 0)
+            {
                graph_array[j] = i;
+            }
          }
-         for (ji = S_i[i]; ji < S_i[i+1]; ji++)
+         for (ji = S_i[i]; ji < S_i[i + 1]; ji++)
          {
             j = S_j[ji];
             if (CF_marker[j] == -1)
             {
                set_empty = 1;
-               for (jj = S_i[j]; jj < S_i[j+1]; jj++)
+               for (jj = S_i[j]; jj < S_i[j + 1]; jj++)
                {
                   index = S_j[jj];
                   if (graph_array[index] == i)
@@ -562,7 +581,7 @@ hypre_BoomerAMGCoarsenCGCb( hypre_ParCSRMatrix    *S,
    {
       wall_time = time_getWallclockSeconds() - wall_time;
       hypre_printf("Proc = %d    Coarsen 2nd pass = %f\n",
-            my_id, wall_time);
+                   my_id, wall_time);
    }
 
    /* third pass, check boundary fine points for coarse neighbors */
@@ -571,34 +590,34 @@ hypre_BoomerAMGCoarsenCGCb( hypre_ParCSRMatrix    *S,
     * Exchange boundary data for CF_marker
     *------------------------------------------------*/
 
-   if (debug_flag == 3) wall_time = time_getWallclockSeconds();
+   if (debug_flag == 3) { wall_time = time_getWallclockSeconds(); }
 
    CF_marker_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_offd, HYPRE_MEMORY_HOST);
    int_buf_data = hypre_CTAlloc(HYPRE_Int,  hypre_ParCSRCommPkgSendMapStart(comm_pkg,
-            num_sends), HYPRE_MEMORY_HOST);
+                                                                            num_sends), HYPRE_MEMORY_HOST);
 
    index = 0;
    for (i = 0; i < num_sends; i++)
    {
       start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
          int_buf_data[index++]
-            = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+            = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
    }
 
    if (num_procs > 1)
    {
       comm_handle = hypre_ParCSRCommHandleCreate(11, comm_pkg, int_buf_data,
-            CF_marker_offd);
+                                                 CF_marker_offd);
 
       hypre_ParCSRCommHandleDestroy(comm_handle);
    }
-   hypre_AmgCGCBoundaryFix (S,CF_marker,CF_marker_offd);
+   hypre_AmgCGCBoundaryFix (S, CF_marker, CF_marker_offd);
    if (debug_flag == 3)
    {
       wall_time = time_getWallclockSeconds() - wall_time;
       hypre_printf("Proc = %d    CGC boundary fix = %f\n",
-            my_id, wall_time);
+                   my_id, wall_time);
    }
 
    /*---------------------------------------------------
@@ -607,30 +626,33 @@ hypre_BoomerAMGCoarsenCGCb( hypre_ParCSRMatrix    *S,
 
    /*if (coarsen_type != 1)
      { */
-   if (CF_marker_offd) hypre_TFree(CF_marker_offd, HYPRE_MEMORY_HOST);  /* BM Aug 21, 2006 */
-   if (int_buf_data) hypre_TFree(int_buf_data, HYPRE_MEMORY_HOST); /* BM Aug 21, 2006 */
+   if (CF_marker_offd) { hypre_TFree(CF_marker_offd, HYPRE_MEMORY_HOST); }  /* BM Aug 21, 2006 */
+   if (int_buf_data) { hypre_TFree(int_buf_data, HYPRE_MEMORY_HOST); } /* BM Aug 21, 2006 */
    /*if (ci_array) hypre_TFree(ci_array);*/ /* BM Aug 21, 2006 */
    /*} */
    hypre_TFree(graph_array, HYPRE_MEMORY_HOST);
    if ((measure_type || (coarsen_type != 1 && coarsen_type != 11))
-         && num_procs > 1)
+       && num_procs > 1)
+   {
       hypre_CSRMatrixDestroy(S_ext);
+   }
 
    return hypre_error_flag;
 }
 
 /* begin Bram added */
 
-HYPRE_Int hypre_BoomerAMGCoarsenCGC (hypre_ParCSRMatrix    *S,HYPRE_Int numberofgrids,HYPRE_Int coarsen_type,HYPRE_Int *CF_marker)
- /* CGC algorithm
-  * ====================================================================================================
-  * coupling : the strong couplings
-  * numberofgrids : the number of grids
-  * coarsen_type : the coarsening type
-  * gridpartition : the grid partition
-  * =====================================================================================================*/
+HYPRE_Int hypre_BoomerAMGCoarsenCGC (hypre_ParCSRMatrix    *S, HYPRE_Int numberofgrids,
+                                     HYPRE_Int coarsen_type, HYPRE_Int *CF_marker)
+/* CGC algorithm
+ * ====================================================================================================
+ * coupling : the strong couplings
+ * numberofgrids : the number of grids
+ * coarsen_type : the coarsening type
+ * gridpartition : the grid partition
+ * =====================================================================================================*/
 {
-   HYPRE_Int j,/*p,*/mpisize,mpirank,/*rstart,rend,*/choice,*coarse;
+   HYPRE_Int j,/*p,*/mpisize, mpirank,/*rstart,rend,*/choice, *coarse;
    HYPRE_Int *vertexrange = NULL;
    HYPRE_Int *vertexrange_all = NULL;
    HYPRE_Int *CF_marker_offd = NULL;
@@ -645,33 +667,36 @@ HYPRE_Int hypre_BoomerAMGCoarsenCGC (hypre_ParCSRMatrix    *S,HYPRE_Int numberof
    hypre_CSRMatrix *Gseq;
    MPI_Comm comm = hypre_ParCSRMatrixComm(S);
 
-   hypre_MPI_Comm_size (comm,&mpisize);
-   hypre_MPI_Comm_rank (comm,&mpirank);
+   hypre_MPI_Comm_size (comm, &mpisize);
+   hypre_MPI_Comm_rank (comm, &mpirank);
 
 #if 0
-   if (!mpirank) {
+   if (!mpirank)
+   {
       wall_time = time_getWallclockSeconds();
       hypre_printf ("Starting CGC preparation\n");
    }
 #endif
-   hypre_AmgCGCPrepare (S,numberofgrids,CF_marker,&CF_marker_offd,coarsen_type,&vertexrange);
+   hypre_AmgCGCPrepare (S, numberofgrids, CF_marker, &CF_marker_offd, coarsen_type, &vertexrange);
 #if 0 /* debugging */
-   if (!mpirank) {
+   if (!mpirank)
+   {
       wall_time = time_getWallclockSeconds() - wall_time;
-      hypre_printf ("Finished CGC preparation, wall_time = %f s\n",wall_time);
+      hypre_printf ("Finished CGC preparation, wall_time = %f s\n", wall_time);
       wall_time = time_getWallclockSeconds();
       hypre_printf ("Starting CGC matrix assembly\n");
    }
 #endif
-   hypre_AmgCGCGraphAssemble (S,vertexrange,CF_marker,CF_marker_offd,coarsen_type,&ijG);
+   hypre_AmgCGCGraphAssemble (S, vertexrange, CF_marker, CF_marker_offd, coarsen_type, &ijG);
 #if 0
-   HYPRE_IJMatrixPrint (ijG,"graph.txt");
+   HYPRE_IJMatrixPrint (ijG, "graph.txt");
 #endif
-   HYPRE_IJMatrixGetObject (ijG,(void**)&G);
+   HYPRE_IJMatrixGetObject (ijG, (void**)&G);
 #if 0 /* debugging */
-   if (!mpirank) {
+   if (!mpirank)
+   {
       wall_time = time_getWallclockSeconds() - wall_time;
-      hypre_printf ("Finished CGC matrix assembly, wall_time = %f s\n",wall_time);
+      hypre_printf ("Finished CGC matrix assembly, wall_time = %f s\n", wall_time);
       wall_time = time_getWallclockSeconds();
       hypre_printf ("Starting CGC matrix communication\n");
    }
@@ -679,70 +704,86 @@ HYPRE_Int hypre_BoomerAMGCoarsenCGC (hypre_ParCSRMatrix    *S,HYPRE_Int numberof
    {
       /* classical CGC does not really make sense with an assumed partition, but
          anyway, here it is: */
-      HYPRE_Int nlocal = vertexrange[1]-vertexrange[0];
-      vertexrange_all = hypre_CTAlloc(HYPRE_Int, mpisize+1, HYPRE_MEMORY_HOST);
-      hypre_MPI_Allgather (&nlocal,1,HYPRE_MPI_INT,vertexrange_all+1,1,HYPRE_MPI_INT,comm);
-      vertexrange_all[0]=0;
-      for (j=2;j<=mpisize;j++) vertexrange_all[j]+=vertexrange_all[j-1];
+      HYPRE_Int nlocal = vertexrange[1] - vertexrange[0];
+      vertexrange_all = hypre_CTAlloc(HYPRE_Int, mpisize + 1, HYPRE_MEMORY_HOST);
+      hypre_MPI_Allgather (&nlocal, 1, HYPRE_MPI_INT, vertexrange_all + 1, 1, HYPRE_MPI_INT, comm);
+      vertexrange_all[0] = 0;
+      for (j = 2; j <= mpisize; j++) { vertexrange_all[j] += vertexrange_all[j - 1]; }
    }
-   Gseq = hypre_ParCSRMatrixToCSRMatrixAll (G);
+   Gseq = hypre_ParCSRMatrixToCSRMatrixAll(G);
 #if 0 /* debugging */
-   if (!mpirank) {
+   if (!mpirank)
+   {
       wall_time = time_getWallclockSeconds() - wall_time;
-      hypre_printf ("Finished CGC matrix communication, wall_time = %f s\n",wall_time);
+      hypre_printf ("Finished CGC matrix communication, wall_time = %f s\n", wall_time);
    }
 #endif
 
-   if (Gseq) { /* BM Aug 31, 2006: Gseq==NULL if G has no local rows */
+   if (Gseq)   /* BM Aug 31, 2006: Gseq==NULL if G has no local rows */
+   {
 #if 0 /* debugging */
-      if (!mpirank) {
+      if (!mpirank)
+      {
          wall_time = time_getWallclockSeconds();
          hypre_printf ("Starting CGC election\n");
       }
 #endif
-      hypre_AmgCGCChoose (Gseq,vertexrange_all,mpisize,&coarse);
+      hypre_AmgCGCChoose (Gseq, vertexrange_all, mpisize, &coarse);
 #if 0 /* debugging */
-      if (!mpirank) {
+      if (!mpirank)
+      {
          wall_time = time_getWallclockSeconds() - wall_time;
-         hypre_printf ("Finished CGC election, wall_time = %f s\n",wall_time);
+         hypre_printf ("Finished CGC election, wall_time = %f s\n", wall_time);
       }
 #endif
 
 #if 0 /* debugging */
-      if (!mpirank) {
-         for (j=0;j<mpisize;j++)
-            hypre_printf ("Processor %d, choice = %d of range %d - %d\n",j,coarse[j],vertexrange_all[j]+1,vertexrange_all[j+1]);
+      if (!mpirank)
+      {
+         for (j = 0; j < mpisize; j++)
+         {
+            hypre_printf ("Processor %d, choice = %d of range %d - %d\n", j, coarse[j], vertexrange_all[j] + 1,
+                          vertexrange_all[j + 1]);
+         }
       }
       fflush(stdout);
 #endif
 #if 0 /* debugging */
-      if (!mpirank) {
+      if (!mpirank)
+      {
          wall_time = time_getWallclockSeconds();
          hypre_printf ("Starting CGC CF assignment\n");
       }
 #endif
       choice = coarse[mpirank];
-      for (j=0;j<num_variables;j++) {
-         if (CF_marker[j]==choice)
+      for (j = 0; j < num_variables; j++)
+      {
+         if (CF_marker[j] == choice)
+         {
             CF_marker[j] = C_PT;
+         }
          else
+         {
             CF_marker[j] = F_PT;
+         }
       }
 
       hypre_CSRMatrixDestroy (Gseq);
       hypre_TFree(coarse, HYPRE_MEMORY_HOST);
    }
    else
-      for (j=0;j<num_variables;j++) CF_marker[j] = F_PT;
+      for (j = 0; j < num_variables; j++) { CF_marker[j] = F_PT; }
 #if 0
-   if (!mpirank) {
+   if (!mpirank)
+   {
       wall_time = time_getWallclockSeconds() - wall_time;
-      hypre_printf ("Finished CGC CF assignment, wall_time = %f s\n",wall_time);
+      hypre_printf ("Finished CGC CF assignment, wall_time = %f s\n", wall_time);
    }
 #endif
 
 #if 0 /* debugging */
-   if (!mpirank) {
+   if (!mpirank)
+   {
       wall_time = time_getWallclockSeconds();
       hypre_printf ("Starting CGC cleanup\n");
    }
@@ -752,15 +793,17 @@ HYPRE_Int hypre_BoomerAMGCoarsenCGC (hypre_ParCSRMatrix    *S,HYPRE_Int numberof
    hypre_TFree(vertexrange_all, HYPRE_MEMORY_HOST);
    hypre_TFree(CF_marker_offd, HYPRE_MEMORY_HOST);
 #if 0
-   if (!mpirank) {
+   if (!mpirank)
+   {
       wall_time = time_getWallclockSeconds() - wall_time;
-      hypre_printf ("Finished CGC cleanup, wall_time = %f s\n",wall_time);
+      hypre_printf ("Finished CGC cleanup, wall_time = %f s\n", wall_time);
    }
 #endif
    return hypre_error_flag;
 }
 
-HYPRE_Int hypre_AmgCGCPrepare (hypre_ParCSRMatrix *S,HYPRE_Int nlocal,HYPRE_Int *CF_marker,HYPRE_Int **CF_marker_offd,HYPRE_Int coarsen_type,HYPRE_Int **vrange)
+HYPRE_Int hypre_AmgCGCPrepare (hypre_ParCSRMatrix *S, HYPRE_Int nlocal, HYPRE_Int *CF_marker,
+                               HYPRE_Int **CF_marker_offd, HYPRE_Int coarsen_type, HYPRE_Int **vrange)
 /* assemble a graph representing the connections between the grids
  * ================================================================================================
  * S : the strength matrix
@@ -770,13 +813,13 @@ HYPRE_Int hypre_AmgCGCPrepare (hypre_ParCSRMatrix *S,HYPRE_Int nlocal,HYPRE_Int
  * vrange : the ranges of the vertices representing coarse grids
  * ================================================================================================*/
 {
-   HYPRE_Int mpisize,mpirank;
+   HYPRE_Int mpisize, mpirank;
    HYPRE_Int num_sends;
-   HYPRE_Int *vertexrange=NULL;
+   HYPRE_Int *vertexrange = NULL;
    HYPRE_Int vstart/*,vend*/;
    HYPRE_Int *int_buf_data;
    HYPRE_Int start;
-   HYPRE_Int i,ii,j;
+   HYPRE_Int i, ii, j;
    HYPRE_Int num_variables = hypre_CSRMatrixNumRows (hypre_ParCSRMatrixDiag(S));
    HYPRE_Int num_cols_offd = hypre_CSRMatrixNumCols (hypre_ParCSRMatrixOffd (S));
 
@@ -787,16 +830,17 @@ HYPRE_Int hypre_AmgCGCPrepare (hypre_ParCSRMatrix *S,HYPRE_Int nlocal,HYPRE_Int
    hypre_ParCSRCommHandle *comm_handle;
 
 
-   hypre_MPI_Comm_size (comm,&mpisize);
-   hypre_MPI_Comm_rank (comm,&mpirank);
+   hypre_MPI_Comm_size (comm, &mpisize);
+   hypre_MPI_Comm_rank (comm, &mpirank);
 
-   if (!comm_pkg) {
+   if (!comm_pkg)
+   {
       hypre_MatvecCommPkgCreate (S);
       comm_pkg = hypre_ParCSRMatrixCommPkg (S);
    }
    num_sends = hypre_ParCSRCommPkgNumSends (comm_pkg);
 
-   if (coarsen_type % 2 == 0) nlocal++; /* even coarsen_type means allow_emptygrids */
+   if (coarsen_type % 2 == 0) { nlocal++; } /* even coarsen_type means allow_emptygrids */
    {
       HYPRE_Int scan_recv;
 
@@ -811,16 +855,23 @@ HYPRE_Int hypre_AmgCGCPrepare (hypre_ParCSRMatrix *S,HYPRE_Int nlocal,HYPRE_Int
    }
 
    /* Note: vstart uses 0-based indexing, while CF_marker uses 1-based indexing */
-   if (coarsen_type % 2 == 1) { /* see above */
-      for (i=0;i<num_variables;i++)
-         if (CF_marker[i]>0)
-            CF_marker[i]+=vstart;
+   if (coarsen_type % 2 == 1)   /* see above */
+   {
+      for (i = 0; i < num_variables; i++)
+         if (CF_marker[i] > 0)
+         {
+            CF_marker[i] += vstart;
+         }
    }
-   else {
+   else
+   {
       /*      hypre_printf ("processor %d: empty grid allowed\n",mpirank);  */
-      for (i=0;i<num_variables;i++) {
-         if (CF_marker[i]>0)
-            CF_marker[i]+=vstart+1; /* add one because vertexrange[mpirank]+1 denotes the empty grid.
+      for (i = 0; i < num_variables; i++)
+      {
+         if (CF_marker[i] > 0)
+         {
+            CF_marker[i] += vstart + 1;
+         } /* add one because vertexrange[mpirank]+1 denotes the empty grid.
                                        Hence, vertexrange[mpirank]+2 is the first coarse grid denoted in
                                        global indices, ... */
       }
@@ -828,39 +879,55 @@ HYPRE_Int hypre_AmgCGCPrepare (hypre_ParCSRMatrix *S,HYPRE_Int nlocal,HYPRE_Int
 
    /* exchange data */
    *CF_marker_offd = hypre_CTAlloc(HYPRE_Int, num_cols_offd, HYPRE_MEMORY_HOST);
-   int_buf_data = hypre_CTAlloc(HYPRE_Int, hypre_ParCSRCommPkgSendMapStart (comm_pkg, num_sends), HYPRE_MEMORY_HOST);
+   int_buf_data = hypre_CTAlloc(HYPRE_Int, hypre_ParCSRCommPkgSendMapStart (comm_pkg, num_sends),
+                                HYPRE_MEMORY_HOST);
 
-   for (i=0,ii=0;i<num_sends;i++) {
-      start = hypre_ParCSRCommPkgSendMapStart (comm_pkg,i);
-      for (j=start;j<hypre_ParCSRCommPkgSendMapStart (comm_pkg,i+1);j++)
-         int_buf_data [ii++] = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+   for (i = 0, ii = 0; i < num_sends; i++)
+   {
+      start = hypre_ParCSRCommPkgSendMapStart (comm_pkg, i);
+      for (j = start; j < hypre_ParCSRCommPkgSendMapStart (comm_pkg, i + 1); j++)
+      {
+         int_buf_data [ii++] = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
+      }
    }
 
-   if (mpisize>1) {
-      comm_handle = hypre_ParCSRCommHandleCreate (11,comm_pkg,int_buf_data,*CF_marker_offd);
+   if (mpisize > 1)
+   {
+      comm_handle = hypre_ParCSRCommHandleCreate (11, comm_pkg, int_buf_data, *CF_marker_offd);
       hypre_ParCSRCommHandleDestroy (comm_handle);
    }
    hypre_TFree(int_buf_data, HYPRE_MEMORY_HOST);
-   *vrange=vertexrange;
+   *vrange = vertexrange;
    return hypre_error_flag;
 }
 
 #define tag_pointrange 301
 #define tag_vertexrange 302
 
-HYPRE_Int hypre_AmgCGCGraphAssemble (hypre_ParCSRMatrix *S,HYPRE_Int *vertexrange,HYPRE_Int *CF_marker,HYPRE_Int *CF_marker_offd,HYPRE_Int coarsen_type,
-      HYPRE_IJMatrix *ijG)
-/* assemble a graph representing the connections between the grids
- * ================================================================================================
+/*--------------------------------------------------------------------------
+ * hypre_AmgCGCGraphAssemble
+ *
+ * Assemble a graph representing the connections between the grids
+ *
  * S : the strength matrix
  * vertexrange : the parallel layout of the candidate coarse grid vertices
  * CF_marker, CF_marker_offd : the coarse/fine markers
  * coarsen_type : the coarsening type
  * ijG : the created graph
- * ================================================================================================*/
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_AmgCGCGraphAssemble(hypre_ParCSRMatrix *S,
+                          HYPRE_Int          *vertexrange,
+                          HYPRE_Int          *CF_marker,
+                          HYPRE_Int          *CF_marker_offd,
+                          HYPRE_Int           coarsen_type,
+                          HYPRE_IJMatrix     *ijG)
 {
-   HYPRE_Int i,/* ii,ip,*/ j,jj,m,n,p;
-   HYPRE_Int mpisize,mpirank;
+   HYPRE_UNUSED_VAR(coarsen_type);
+
+   HYPRE_Int i,/* ii,ip,*/ j, jj, m, n, p;
+   HYPRE_Int mpisize, mpirank;
 
    MPI_Comm comm = hypre_ParCSRMatrixComm(S);
    /*   hypre_MPI_Status status; */
@@ -876,166 +943,191 @@ HYPRE_Int hypre_AmgCGCGraphAssemble (hypre_ParCSRMatrix *S,HYPRE_Int *vertexrang
    HYPRE_Int num_cols_offd = hypre_CSRMatrixNumCols (S_offd);
    HYPRE_BigInt *col_map_offd = hypre_ParCSRMatrixColMapOffd (S);
    HYPRE_BigInt *pointrange;
-   HYPRE_Int *pointrange_nonlocal,*pointrange_strong=NULL;
-   HYPRE_Int vertexrange_start,vertexrange_end;
-   HYPRE_Int *vertexrange_strong= NULL;
+   HYPRE_Int *pointrange_nonlocal, *pointrange_strong = NULL;
+   HYPRE_Int vertexrange_start, vertexrange_end;
+   HYPRE_Int *vertexrange_strong = NULL;
    HYPRE_Int *vertexrange_nonlocal;
-   HYPRE_Int num_recvs,num_recvs_strong;
-   HYPRE_Int *recv_procs,*recv_procs_strong=NULL;
-   HYPRE_Int /* *zeros,*rownz,*/*rownz_diag,*rownz_offd;
+   HYPRE_Int num_recvs, num_recvs_strong;
+   HYPRE_Int *recv_procs, *recv_procs_strong = NULL;
+   HYPRE_Int /* *zeros,*rownz,*/*rownz_diag, *rownz_offd;
    HYPRE_Int nz;
    HYPRE_Int nlocal;
    //HYPRE_Int one=1;
 
    hypre_ParCSRCommPkg    *comm_pkg    = hypre_ParCSRMatrixCommPkg (S);
 
-   hypre_MPI_Comm_size (comm,&mpisize);
-   hypre_MPI_Comm_rank (comm,&mpirank);
-
-   HYPRE_BigInt *big_m_n = hypre_TAlloc(HYPRE_BigInt, 2, HYPRE_MEMORY_DEVICE);
-   HYPRE_Real *weight = hypre_TAlloc(HYPRE_Real, 1, HYPRE_MEMORY_DEVICE);
+   hypre_MPI_Comm_size (comm, &mpisize);
+   hypre_MPI_Comm_rank (comm, &mpirank);
 
    /* determine neighbor processors */
    num_recvs = hypre_ParCSRCommPkgNumRecvs (comm_pkg);
    recv_procs = hypre_ParCSRCommPkgRecvProcs (comm_pkg);
    pointrange = hypre_ParCSRMatrixRowStarts (S);
-   pointrange_nonlocal = hypre_CTAlloc(HYPRE_Int,  2*num_recvs, HYPRE_MEMORY_HOST);
-   vertexrange_nonlocal = hypre_CTAlloc(HYPRE_Int,  2*num_recvs, HYPRE_MEMORY_HOST);
+   pointrange_nonlocal = hypre_CTAlloc(HYPRE_Int,  2 * num_recvs, HYPRE_MEMORY_HOST);
+   vertexrange_nonlocal = hypre_CTAlloc(HYPRE_Int,  2 * num_recvs, HYPRE_MEMORY_HOST);
    {
       HYPRE_Int num_sends  =  hypre_ParCSRCommPkgNumSends (comm_pkg);
       HYPRE_Int *send_procs =  hypre_ParCSRCommPkgSendProcs (comm_pkg);
-      HYPRE_Int *int_buf_data   = hypre_CTAlloc(HYPRE_Int, 4*num_sends, HYPRE_MEMORY_HOST);
-      HYPRE_Int *int_buf_data2  = int_buf_data + 2*num_sends;
-      hypre_MPI_Request *sendrequest,*recvrequest;
-      HYPRE_Int pointrange_start,pointrange_end;
+      HYPRE_Int *int_buf_data   = hypre_CTAlloc(HYPRE_Int, 4 * num_sends, HYPRE_MEMORY_HOST);
+      HYPRE_Int *int_buf_data2  = int_buf_data + 2 * num_sends;
+      hypre_MPI_Request *sendrequest, *recvrequest;
+      HYPRE_Int pointrange_start, pointrange_end;
 
       nlocal = vertexrange[1] - vertexrange[0];
       pointrange_start = pointrange[0];
       pointrange_end   = pointrange[1];
       vertexrange_start = vertexrange[0];
       vertexrange_end   = vertexrange[1];
-      sendrequest = hypre_CTAlloc(hypre_MPI_Request, 2*(num_sends+num_recvs), HYPRE_MEMORY_HOST);
-      recvrequest = sendrequest+2*num_sends;
+      sendrequest = hypre_CTAlloc(hypre_MPI_Request, 2 * (num_sends + num_recvs), HYPRE_MEMORY_HOST);
+      recvrequest = sendrequest + 2 * num_sends;
 
-      for (i=0;i<num_recvs;i++) {
-         hypre_MPI_Irecv (pointrange_nonlocal+2*i,2,HYPRE_MPI_INT,recv_procs[i],tag_pointrange,comm,&recvrequest[2*i]);
-         hypre_MPI_Irecv (vertexrange_nonlocal+2*i,2,HYPRE_MPI_INT,recv_procs[i],tag_vertexrange,comm,&recvrequest[2*i+1]);
+      for (i = 0; i < num_recvs; i++)
+      {
+         hypre_MPI_Irecv (pointrange_nonlocal + 2 * i, 2, HYPRE_MPI_INT, recv_procs[i], tag_pointrange, comm,
+                          &recvrequest[2 * i]);
+         hypre_MPI_Irecv (vertexrange_nonlocal + 2 * i, 2, HYPRE_MPI_INT, recv_procs[i], tag_vertexrange,
+                          comm,
+                          &recvrequest[2 * i + 1]);
       }
-      for (i=0;i<num_sends;i++) {
-         int_buf_data[2*i] = pointrange_start;
-         int_buf_data[2*i+1] = pointrange_end;
-         int_buf_data2[2*i] = vertexrange_start;
-         int_buf_data2[2*i+1] = vertexrange_end;
-         hypre_MPI_Isend (int_buf_data+2*i,2,HYPRE_MPI_INT,send_procs[i],tag_pointrange,comm,&sendrequest[2*i]);
-         hypre_MPI_Isend (int_buf_data2+2*i,2,HYPRE_MPI_INT,send_procs[i],tag_vertexrange,comm,&sendrequest[2*i+1]);
+      for (i = 0; i < num_sends; i++)
+      {
+         int_buf_data[2 * i] = pointrange_start;
+         int_buf_data[2 * i + 1] = pointrange_end;
+         int_buf_data2[2 * i] = vertexrange_start;
+         int_buf_data2[2 * i + 1] = vertexrange_end;
+         hypre_MPI_Isend (int_buf_data + 2 * i, 2, HYPRE_MPI_INT, send_procs[i], tag_pointrange, comm,
+                          &sendrequest[2 * i]);
+         hypre_MPI_Isend (int_buf_data2 + 2 * i, 2, HYPRE_MPI_INT, send_procs[i], tag_vertexrange, comm,
+                          &sendrequest[2 * i + 1]);
       }
-      hypre_MPI_Waitall (2*(num_sends+num_recvs),sendrequest,hypre_MPI_STATUSES_IGNORE);
+      hypre_MPI_Waitall (2 * (num_sends + num_recvs), sendrequest, hypre_MPI_STATUSES_IGNORE);
       hypre_TFree(int_buf_data, HYPRE_MEMORY_HOST);
       hypre_TFree(sendrequest, HYPRE_MEMORY_HOST);
    }
    /* now we have the array recv_procs. However, it may contain too many entries as it is
       inherited from A. We now have to determine the subset which contains only the
       strongly connected neighbors */
-   if (num_cols_offd) {
+   if (num_cols_offd)
+   {
       S_offd_j = hypre_CSRMatrixJ(S_offd);
 
       recv_procs_strong = hypre_CTAlloc(HYPRE_Int, num_recvs, HYPRE_MEMORY_HOST);
-      memset (recv_procs_strong,0,num_recvs*sizeof(HYPRE_Int));
+      memset (recv_procs_strong, 0, num_recvs * sizeof(HYPRE_Int));
       /* don't forget to shorten the pointrange and vertexrange arrays accordingly */
-      pointrange_strong = hypre_CTAlloc(HYPRE_Int, 2*num_recvs, HYPRE_MEMORY_HOST);
-      memset (pointrange_strong,0,2*num_recvs*sizeof(HYPRE_Int));
-      vertexrange_strong = hypre_CTAlloc(HYPRE_Int, 2*num_recvs, HYPRE_MEMORY_HOST);
-      memset (vertexrange_strong,0,2*num_recvs*sizeof(HYPRE_Int));
+      pointrange_strong = hypre_CTAlloc(HYPRE_Int, 2 * num_recvs, HYPRE_MEMORY_HOST);
+      memset (pointrange_strong, 0, 2 * num_recvs * sizeof(HYPRE_Int));
+      vertexrange_strong = hypre_CTAlloc(HYPRE_Int, 2 * num_recvs, HYPRE_MEMORY_HOST);
+      memset (vertexrange_strong, 0, 2 * num_recvs * sizeof(HYPRE_Int));
 
-      for (i=0;i<num_variables;i++)
-         for (j=S_offd_i[i];j<S_offd_i[i+1];j++) {
+      for (i = 0; i < num_variables; i++)
+         for (j = S_offd_i[i]; j < S_offd_i[i + 1]; j++)
+         {
             jj = col_map_offd[S_offd_j[j]];
-            for (p=0;p<num_recvs;p++) /* S_offd_j is NOT sorted! */
-               if (jj >= pointrange_nonlocal[2*p] && jj < pointrange_nonlocal[2*p+1]) break;
+            for (p = 0; p < num_recvs; p++) /* S_offd_j is NOT sorted! */
+               if (jj >= pointrange_nonlocal[2 * p] && jj < pointrange_nonlocal[2 * p + 1]) { break; }
 #if 0
-            hypre_printf ("Processor %d, remote point %d on processor %d\n",mpirank,jj,recv_procs[p]);
+            hypre_printf ("Processor %d, remote point %d on processor %d\n", mpirank, jj, recv_procs[p]);
 #endif
-            recv_procs_strong [p]=1;
+            recv_procs_strong [p] = 1;
          }
 
-      for (p=0,num_recvs_strong=0;p<num_recvs;p++) {
-         if (recv_procs_strong[p]) {
-            recv_procs_strong[num_recvs_strong]=recv_procs[p];
-            pointrange_strong[2*num_recvs_strong] = pointrange_nonlocal[2*p];
-            pointrange_strong[2*num_recvs_strong+1] = pointrange_nonlocal[2*p+1];
-            vertexrange_strong[2*num_recvs_strong] = vertexrange_nonlocal[2*p];
-            vertexrange_strong[2*num_recvs_strong+1] = vertexrange_nonlocal[2*p+1];
+      for (p = 0, num_recvs_strong = 0; p < num_recvs; p++)
+      {
+         if (recv_procs_strong[p])
+         {
+            recv_procs_strong[num_recvs_strong] = recv_procs[p];
+            pointrange_strong[2 * num_recvs_strong] = pointrange_nonlocal[2 * p];
+            pointrange_strong[2 * num_recvs_strong + 1] = pointrange_nonlocal[2 * p + 1];
+            vertexrange_strong[2 * num_recvs_strong] = vertexrange_nonlocal[2 * p];
+            vertexrange_strong[2 * num_recvs_strong + 1] = vertexrange_nonlocal[2 * p + 1];
             num_recvs_strong++;
          }
       }
    }
-   else num_recvs_strong=0;
+   else { num_recvs_strong = 0; }
 
    hypre_TFree(pointrange_nonlocal, HYPRE_MEMORY_HOST);
    hypre_TFree(vertexrange_nonlocal, HYPRE_MEMORY_HOST);
 
-   rownz_diag = hypre_CTAlloc(HYPRE_Int, 2*nlocal, HYPRE_MEMORY_HOST);
+   rownz_diag = hypre_CTAlloc(HYPRE_Int, 2 * nlocal, HYPRE_MEMORY_HOST);
    rownz_offd = rownz_diag + nlocal;
-   for (p=0,nz=0;p<num_recvs_strong;p++) {
-      nz += vertexrange_strong[2*p+1]-vertexrange_strong[2*p];
+   for (p = 0, nz = 0; p < num_recvs_strong; p++)
+   {
+      nz += vertexrange_strong[2 * p + 1] - vertexrange_strong[2 * p];
    }
-   for (m=0;m<nlocal;m++) {
-      rownz_diag[m]=nlocal-1;
-      rownz_offd[m]=nz;
+   for (m = 0; m < nlocal; m++)
+   {
+      rownz_diag[m] = nlocal - 1;
+      rownz_offd[m] = nz;
    }
 
-
-
-   HYPRE_IJMatrixCreate(comm, vertexrange_start, vertexrange_end-1, vertexrange_start, vertexrange_end-1, &ijmatrix);
+   HYPRE_IJMatrixCreate(comm, vertexrange_start, vertexrange_end - 1, vertexrange_start,
+                        vertexrange_end - 1, &ijmatrix);
    HYPRE_IJMatrixSetObjectType(ijmatrix, HYPRE_PARCSR);
    HYPRE_IJMatrixSetDiagOffdSizes (ijmatrix, rownz_diag, rownz_offd);
    HYPRE_IJMatrixInitialize(ijmatrix);
    hypre_TFree(rownz_diag, HYPRE_MEMORY_HOST);
 
+   HYPRE_MemoryLocation memory_location = hypre_IJMatrixMemoryLocation(ijmatrix);
+   HYPRE_BigInt *big_m_n = hypre_TAlloc(HYPRE_BigInt, 2, memory_location);
+   HYPRE_Real *weight = hypre_TAlloc(HYPRE_Real, 1, memory_location);
+
    /* initialize graph */
    weight[0] = -1;
-   for (m=vertexrange_start;m<vertexrange_end;m++) {
+   for (m = vertexrange_start; m < vertexrange_end; m++)
+   {
       big_m_n[0] = (HYPRE_BigInt) m;
-      for (p=0;p<num_recvs_strong;p++) {
-         for (n=vertexrange_strong[2*p];n<vertexrange_strong[2*p+1];n++) {
+      for (p = 0; p < num_recvs_strong; p++)
+      {
+         for (n = vertexrange_strong[2 * p]; n < vertexrange_strong[2 * p + 1]; n++)
+         {
             big_m_n[1] = (HYPRE_BigInt) n;
             HYPRE_IJMatrixAddToValues (ijmatrix, 1, NULL, &big_m_n[0], &big_m_n[1], &weight[0]);
             /*#if 0
               if (ierr) hypre_printf ("Processor %d: error %d while initializing graphs at (%d, %d)\n",mpirank,ierr,m,n);
-#endif*/
+            #endif*/
          }
       }
    }
 
    /* weight graph */
-   for (i=0;i<num_variables;i++) {
+   for (i = 0; i < num_variables; i++)
+   {
 
-      for (j=S_offd_i[i];j<S_offd_i[i+1];j++) {
+      for (j = S_offd_i[i]; j < S_offd_i[i + 1]; j++)
+      {
          jj = S_offd_j[j]; /* jj is not a global index!!! */
          /* determine processor */
-         for (p=0;p<num_recvs_strong;p++)
-            if (col_map_offd[jj] >= pointrange_strong[2*p] && col_map_offd[jj] < pointrange_strong[2*p+1]) break;
+         for (p = 0; p < num_recvs_strong; p++)
+            if (col_map_offd[jj] >= pointrange_strong[2 * p] &&
+                col_map_offd[jj] < pointrange_strong[2 * p + 1]) { break; }
          /*ip=recv_procs_strong[p];*/
          /* loop over all coarse grids constructed on this processor domain */
-         for (m=vertexrange_start;m<vertexrange_end;m++) {
+         for (m = vertexrange_start; m < vertexrange_end; m++)
+         {
             big_m_n[0] = (HYPRE_BigInt) m;
             /* loop over all coarse grids constructed on neighbor processor domain */
-            for (n=vertexrange_strong[2*p];n<vertexrange_strong[2*p+1];n++) {
+            for (n = vertexrange_strong[2 * p]; n < vertexrange_strong[2 * p + 1]; n++)
+            {
                big_m_n[1] = (HYPRE_BigInt) n;
                /* coarse grid counting inside gridpartition->local/gridpartition->nonlocal starts with one
                   while counting inside range starts with zero */
-               if (CF_marker[i]-1==m && CF_marker_offd[jj]-1==n)
+               if (CF_marker[i] - 1 == m && CF_marker_offd[jj] - 1 == n)
                   /* C-C-coupling */
+               {
                   weight[0] = -1;
-               else if ( (CF_marker[i]-1==m && (CF_marker_offd[jj]==0 || CF_marker_offd[jj]-1!=n) )
-                     || ( (CF_marker[i]==0 || CF_marker[i]-1!=m) && CF_marker_offd[jj]-1==n ) )
+               }
+               else if ( (CF_marker[i] - 1 == m && (CF_marker_offd[jj] == 0 || CF_marker_offd[jj] - 1 != n) )
+                         || ( (CF_marker[i] == 0 || CF_marker[i] - 1 != m) && CF_marker_offd[jj] - 1 == n ) )
                   /* C-F-coupling */
+               {
                   weight[0] = 0;
-               else weight[0] = -8; /* F-F-coupling */
+               }
+               else { weight[0] = -8; } /* F-F-coupling */
                HYPRE_IJMatrixAddToValues (ijmatrix, 1, NULL, &big_m_n[0], &big_m_n[1], &weight[0]);
                /*#if 0
                  if (ierr) hypre_printf ("Processor %d: error %d while adding %lf to entry (%d, %d)\n",mpirank,ierr,weight,m,n);
-#endif*/
+               #endif*/
             }
          }
       }
@@ -1048,8 +1140,8 @@ HYPRE_Int hypre_AmgCGCGraphAssemble (hypre_ParCSRMatrix *S,HYPRE_Int *vertexrang
    hypre_TFree(pointrange_strong, HYPRE_MEMORY_HOST);
    hypre_TFree(vertexrange_strong, HYPRE_MEMORY_HOST);
 
-   hypre_TFree(big_m_n, HYPRE_MEMORY_DEVICE);
-   hypre_TFree(weight, HYPRE_MEMORY_DEVICE);
+   hypre_TFree(big_m_n, memory_location);
+   hypre_TFree(weight, memory_location);
 
    /*} */
 
@@ -1057,17 +1149,18 @@ HYPRE_Int hypre_AmgCGCGraphAssemble (hypre_ParCSRMatrix *S,HYPRE_Int *vertexrang
    return hypre_error_flag;
 }
 
-HYPRE_Int hypre_AmgCGCChoose (hypre_CSRMatrix *G,HYPRE_Int *vertexrange,HYPRE_Int mpisize,HYPRE_Int **coarse)
-  /* chooses one grid for every processor
-   * ============================================================
-   * G : the connectivity graph
-   * map : the parallel layout
-   * mpisize : number of procs
-   * coarse : the chosen coarse grids
-   * ===========================================================*/
+HYPRE_Int hypre_AmgCGCChoose (hypre_CSRMatrix *G, HYPRE_Int *vertexrange, HYPRE_Int mpisize,
+                              HYPRE_Int **coarse)
+/* chooses one grid for every processor
+ * ============================================================
+ * G : the connectivity graph
+ * map : the parallel layout
+ * mpisize : number of procs
+ * coarse : the chosen coarse grids
+ * ===========================================================*/
 {
-   HYPRE_Int i,j,jj,p,choice,*processor;
-   HYPRE_Int measure,new_measure;
+   HYPRE_Int i, j, jj, p, choice, *processor;
+   HYPRE_Int measure, new_measure;
 
    /*   MPI_Comm comm = hypre_ParCSRMatrixComm(G); */
 
@@ -1078,19 +1171,19 @@ HYPRE_Int hypre_AmgCGCChoose (hypre_CSRMatrix *G,HYPRE_Int *vertexrange,HYPRE_In
    HYPRE_Real max;
    HYPRE_Int *G_i = hypre_CSRMatrixI(G);
    HYPRE_Int *G_j = hypre_CSRMatrixJ(G);
-   hypre_CSRMatrix *H,*HT;
-   HYPRE_Int *H_i,*H_j,*HT_i,*HT_j;
-   HYPRE_Int jG,jH;
+   hypre_CSRMatrix *H, *HT;
+   HYPRE_Int *H_i, *H_j, *HT_i, *HT_j;
+   HYPRE_Int jG, jH;
    HYPRE_Int num_vertices = hypre_CSRMatrixNumRows (G);
    HYPRE_Int *measure_array;
-   HYPRE_Int *lists,*where;
+   HYPRE_Int *lists, *where;
 
    hypre_LinkList LoL_head = NULL;
    hypre_LinkList LoL_tail = NULL;
 
    processor = hypre_CTAlloc(HYPRE_Int, num_vertices, HYPRE_MEMORY_HOST);
    *coarse = hypre_CTAlloc(HYPRE_Int, mpisize, HYPRE_MEMORY_HOST);
-   memset (*coarse,0,sizeof(HYPRE_Int)*mpisize);
+   memset (*coarse, 0, sizeof(HYPRE_Int)*mpisize);
 
    measure_array = hypre_CTAlloc(HYPRE_Int, num_vertices, HYPRE_MEMORY_HOST);
    lists = hypre_CTAlloc(HYPRE_Int, num_vertices, HYPRE_MEMORY_HOST);
@@ -1103,42 +1196,49 @@ HYPRE_Int hypre_AmgCGCChoose (hypre_CSRMatrix *G,HYPRE_Int *vertexrange,HYPRE_In
     ******************************************************************/
 
    jG  = G_i[num_vertices];
-   H   = hypre_CSRMatrixCreate (num_vertices,num_vertices,jG);
-   H_i = hypre_CTAlloc(HYPRE_Int, num_vertices+1, HYPRE_MEMORY_HOST);
+   H   = hypre_CSRMatrixCreate (num_vertices, num_vertices, jG);
+   H_i = hypre_CTAlloc(HYPRE_Int, num_vertices + 1, HYPRE_MEMORY_HOST);
    H_j = hypre_CTAlloc(HYPRE_Int, jG, HYPRE_MEMORY_HOST);
    hypre_CSRMatrixI(H) = H_i;
    hypre_CSRMatrixJ(H) = H_j;
    hypre_CSRMatrixMemoryLocation(H) = HYPRE_MEMORY_HOST;
 
-   for (i=0,p=0;i<num_vertices;i++) {
-      while (vertexrange[p+1]<=i) p++;
-      processor[i]=p;
+   for (i = 0, p = 0; i < num_vertices; i++)
+   {
+      while (vertexrange[p + 1] <= i) { p++; }
+      processor[i] = p;
    }
 
-   H_i[0]=0;
-   for (i=0,jj=0;i<num_vertices;i++) {
+   H_i[0] = 0;
+   for (i = 0, jj = 0; i < num_vertices; i++)
+   {
 #if 0
-      hypre_printf ("neighbors of grid %d:",i);
+      hypre_printf ("neighbors of grid %d:", i);
 #endif
-      H_i[i+1]=H_i[i];
-      for (j=G_i[i],choice=-1,max=0;j<G_i[i+1];j++) {
+      H_i[i + 1] = H_i[i];
+      for (j = G_i[i], choice = -1, max = 0; j < G_i[i + 1]; j++)
+      {
 #if 0
-         if (G_data[j]>=0.0)
-            hypre_printf ("G[%d,%d]=0. G_j(j)=%d, G_data(j)=%f.\n",i,G_j[j],j,G_data[j]);
+         if (G_data[j] >= 0.0)
+         {
+            hypre_printf ("G[%d,%d]=0. G_j(j)=%d, G_data(j)=%f.\n", i, G_j[j], j, G_data[j]);
+         }
 #endif
          /* G_data is always negative, so this test is sufficient */
-         if (choice==-1 || G_data[j]>max) {
+         if (choice == -1 || G_data[j] > max)
+         {
             choice = G_j[j];
             max = G_data[j];
          }
-         if (j==G_i[i+1]-1 || processor[G_j[j+1]] > processor[choice]) {
+         if (j == G_i[i + 1] - 1 || processor[G_j[j + 1]] > processor[choice])
+         {
             /* we are done for this processor boundary */
-            H_j[jj++]=choice;
-            H_i[i+1]++;
+            H_j[jj++] = choice;
+            H_i[i + 1]++;
 #if 0
-            hypre_printf (" %d",choice);
+            hypre_printf (" %d", choice);
 #endif
-            choice = -1; max=0;
+            choice = -1; max = 0;
          }
       }
 #if 0
@@ -1151,30 +1251,37 @@ HYPRE_Int hypre_AmgCGCChoose (hypre_CSRMatrix *G,HYPRE_Int *vertexrange,HYPRE_In
     ******************************************************************/
 
    jH = H_i[num_vertices];
-   HT = hypre_CSRMatrixCreate (num_vertices,num_vertices,jH);
-   HT_i = hypre_CTAlloc(HYPRE_Int, num_vertices+1, HYPRE_MEMORY_HOST);
+   HT = hypre_CSRMatrixCreate (num_vertices, num_vertices, jH);
+   HT_i = hypre_CTAlloc(HYPRE_Int, num_vertices + 1, HYPRE_MEMORY_HOST);
    HT_j = hypre_CTAlloc(HYPRE_Int, jH, HYPRE_MEMORY_HOST);
    hypre_CSRMatrixI(HT) = HT_i;
    hypre_CSRMatrixJ(HT) = HT_j;
    hypre_CSRMatrixMemoryLocation(HT) = HYPRE_MEMORY_HOST;
 
-   for (i=0; i <= num_vertices; i++)
+   for (i = 0; i <= num_vertices; i++)
+   {
       HT_i[i] = 0;
-   for (i=0; i < jH; i++) {
-      HT_i[H_j[i]+1]++;
    }
-   for (i=0; i < num_vertices; i++) {
-      HT_i[i+1] += HT_i[i];
+   for (i = 0; i < jH; i++)
+   {
+      HT_i[H_j[i] + 1]++;
+   }
+   for (i = 0; i < num_vertices; i++)
+   {
+      HT_i[i + 1] += HT_i[i];
    }
-   for (i=0; i < num_vertices; i++) {
-      for (j=H_i[i]; j < H_i[i+1]; j++) {
+   for (i = 0; i < num_vertices; i++)
+   {
+      for (j = H_i[i]; j < H_i[i + 1]; j++)
+      {
          HYPRE_Int myindex = H_j[j];
          HT_j[HT_i[myindex]] = i;
          HT_i[myindex]++;
       }
    }
-   for (i = num_vertices; i > 0; i--) {
-      HT_i[i] = HT_i[i-1];
+   for (i = num_vertices; i > 0; i--)
+   {
+      HT_i[i] = HT_i[i - 1];
    }
    HT_i[0] = 0;
 
@@ -1182,72 +1289,82 @@ HYPRE_Int hypre_AmgCGCChoose (hypre_CSRMatrix *G,HYPRE_Int *vertexrange,HYPRE_In
     * set initial vertex weights
     *****************************************************************/
 
-   for (i=0;i<num_vertices;i++) {
-      measure_array[i] = H_i[i+1] - H_i[i] + HT_i[i+1] - HT_i[i];
-      hypre_enter_on_lists (&LoL_head,&LoL_tail,measure_array[i],i,lists,where);
+   for (i = 0; i < num_vertices; i++)
+   {
+      measure_array[i] = H_i[i + 1] - H_i[i] + HT_i[i + 1] - HT_i[i];
+      hypre_enter_on_lists (&LoL_head, &LoL_tail, measure_array[i], i, lists, where);
    }
 
    /******************************************************************
     * apply CGC iteration
     ******************************************************************/
 
-   while (LoL_head && measure_array[LoL_head->head]) {
+   while (LoL_head && measure_array[LoL_head->head])
+   {
 
 
       choice = LoL_head->head;
       measure = measure_array[choice];
 #if 0
-      hypre_printf ("Choice: %d, measure %d, processor %d\n",choice, measure,processor[choice]);
+      hypre_printf ("Choice: %d, measure %d, processor %d\n", choice, measure, processor[choice]);
       fflush(stdout);
 #endif
 
-      (*coarse)[processor[choice]] = choice+1;  /* add one because coarsegrid indexing starts with 1, not 0 */
+      (*coarse)[processor[choice]] = choice
+                                     + 1; /* add one because coarsegrid indexing starts with 1, not 0 */
       /* new maximal weight */
-      new_measure = measure+1;
-      for (i=vertexrange[processor[choice]];i<vertexrange[processor[choice]+1];i++) {
+      new_measure = measure + 1;
+      for (i = vertexrange[processor[choice]]; i < vertexrange[processor[choice] + 1]; i++)
+      {
          /* set weights for all remaining vertices on this processor to zero */
          measure = measure_array[i];
-         hypre_remove_point (&LoL_head,&LoL_tail,measure,i,lists,where);
-         measure_array[i]=0;
+         hypre_remove_point (&LoL_head, &LoL_tail, measure, i, lists, where);
+         measure_array[i] = 0;
       }
-      for (j=H_i[choice];j<H_i[choice+1];j++){
+      for (j = H_i[choice]; j < H_i[choice + 1]; j++)
+      {
          jj = H_j[j];
          /* if no vertex is chosen on this proc, set weights of all heavily coupled vertices to max1 */
-         if (!(*coarse)[processor[jj]]) {
+         if (!(*coarse)[processor[jj]])
+         {
             measure = measure_array[jj];
-            hypre_remove_point (&LoL_head,&LoL_tail,measure,jj,lists,where);
-            hypre_enter_on_lists (&LoL_head,&LoL_tail,new_measure,jj,lists,where);
-            measure_array[jj]=new_measure;
+            hypre_remove_point (&LoL_head, &LoL_tail, measure, jj, lists, where);
+            hypre_enter_on_lists (&LoL_head, &LoL_tail, new_measure, jj, lists, where);
+            measure_array[jj] = new_measure;
          }
       }
-      for (j=HT_i[choice];j<HT_i[choice+1];j++) {
+      for (j = HT_i[choice]; j < HT_i[choice + 1]; j++)
+      {
          jj = HT_j[j];
          /* if no vertex is chosen on this proc, set weights of all heavily coupled vertices to max1 */
-         if (!(*coarse)[processor[jj]]) {
+         if (!(*coarse)[processor[jj]])
+         {
             measure = measure_array[jj];
-            hypre_remove_point (&LoL_head,&LoL_tail,measure,jj,lists,where);
-            hypre_enter_on_lists (&LoL_head,&LoL_tail,new_measure,jj,lists,where);
-            measure_array[jj]=new_measure;
+            hypre_remove_point (&LoL_head, &LoL_tail, measure, jj, lists, where);
+            hypre_enter_on_lists (&LoL_head, &LoL_tail, new_measure, jj, lists, where);
+            measure_array[jj] = new_measure;
          }
       }
    }
 
    /* remove remaining list elements, if they exist. They all should have measure 0 */
-   while (LoL_head) {
+   while (LoL_head)
+   {
       i = LoL_head->head;
       measure = measure_array[i];
 #if 0
-      hypre_assert (measure==0);
+      hypre_assert (measure == 0);
 #endif
-      hypre_remove_point (&LoL_head,&LoL_tail,measure,i,lists,where);
+      hypre_remove_point (&LoL_head, &LoL_tail, measure, i, lists, where);
    }
 
 
-   for (p=0;p<mpisize;p++)
+   for (p = 0; p < mpisize; p++)
       /* if the algorithm has not determined a coarse vertex for this proc, simply take the last one
          Do not take the first one, it might by empty! */
-      if (!(*coarse)[p]) {
-         (*coarse)[p] = vertexrange[p+1];
+      if (!(*coarse)[p])
+      {
+         (*coarse)[p] = vertexrange[p + 1];
          /*       hypre_printf ("choice for processor %d: %d\n",p,range[p]+1); */
       }
 
@@ -1267,15 +1384,16 @@ HYPRE_Int hypre_AmgCGCChoose (hypre_CSRMatrix *G,HYPRE_Int *vertexrange,HYPRE_In
    return hypre_error_flag;
 }
 
-HYPRE_Int hypre_AmgCGCBoundaryFix (hypre_ParCSRMatrix *S,HYPRE_Int *CF_marker,HYPRE_Int *CF_marker_offd)
-  /* Checks whether an interpolation is possible for a fine grid point with strong couplings.
-   * Required after CGC coarsening
-   * ========================================================================================
-   * S : the strength matrix
-   * CF_marker, CF_marker_offd : the coarse/fine markers
-   * ========================================================================================*/
+HYPRE_Int hypre_AmgCGCBoundaryFix (hypre_ParCSRMatrix *S, HYPRE_Int *CF_marker,
+                                   HYPRE_Int *CF_marker_offd)
+/* Checks whether an interpolation is possible for a fine grid point with strong couplings.
+ * Required after CGC coarsening
+ * ========================================================================================
+ * S : the strength matrix
+ * CF_marker, CF_marker_offd : the coarse/fine markers
+ * ========================================================================================*/
 {
-   HYPRE_Int mpirank,i,j,has_c_pt;
+   HYPRE_Int mpirank, i, j, has_c_pt;
    hypre_CSRMatrix *S_diag = hypre_ParCSRMatrixDiag (S);
    hypre_CSRMatrix *S_offd = hypre_ParCSRMatrixOffd (S);
    HYPRE_Int *S_i = hypre_CSRMatrixI(S_diag);
@@ -1284,36 +1402,38 @@ HYPRE_Int hypre_AmgCGCBoundaryFix (hypre_ParCSRMatrix *S,HYPRE_Int *CF_marker,HY
    HYPRE_Int *S_offd_j = NULL;
    HYPRE_Int num_variables = hypre_CSRMatrixNumRows (S_diag);
    HYPRE_Int num_cols_offd = hypre_CSRMatrixNumCols (S_offd);
-   HYPRE_Int added_cpts=0;
+   //HYPRE_Int added_cpts = 0;
    MPI_Comm comm = hypre_ParCSRMatrixComm(S);
 
-   hypre_MPI_Comm_rank (comm,&mpirank);
-   if (num_cols_offd) {
+   hypre_MPI_Comm_rank (comm, &mpirank);
+   if (num_cols_offd)
+   {
       S_offd_j = hypre_CSRMatrixJ(S_offd);
    }
 
-   for (i=0;i<num_variables;i++) {
-      if (S_offd_i[i]==S_offd_i[i+1] || CF_marker[i] == C_PT) continue;
-      has_c_pt=0;
+   for (i = 0; i < num_variables; i++)
+   {
+      if (S_offd_i[i] == S_offd_i[i + 1] || CF_marker[i] == C_PT) { continue; }
+      has_c_pt = 0;
 
       /* fine grid point with strong connections across the boundary */
-      for (j=S_i[i];j<S_i[i+1];j++)
-         if (CF_marker[S_j[j]] == C_PT) {has_c_pt=1; break;}
-      if (has_c_pt) continue;
+      for (j = S_i[i]; j < S_i[i + 1]; j++)
+         if (CF_marker[S_j[j]] == C_PT) {has_c_pt = 1; break;}
+      if (has_c_pt) { continue; }
 
-      for (j=S_offd_i[i];j<S_offd_i[i+1];j++)
-         if (CF_marker_offd[S_offd_j[j]] == C_PT) {has_c_pt=1; break;}
-      if (has_c_pt) continue;
+      for (j = S_offd_i[i]; j < S_offd_i[i + 1]; j++)
+         if (CF_marker_offd[S_offd_j[j]] == C_PT) {has_c_pt = 1; break;}
+      if (has_c_pt) { continue; }
 
       /* all points i is strongly coupled to are fine: make i C_PT */
       CF_marker[i] = C_PT;
 #if 0
-      hypre_printf ("Processor %d: added point %d in hypre_AmgCGCBoundaryFix\n",mpirank,i);
-#endif
+      hypre_printf ("Processor %d: added point %d in hypre_AmgCGCBoundaryFix\n", mpirank, i);
       added_cpts++;
+#endif
    }
 #if 0
-   if (added_cpts)  hypre_printf ("Processor %d: added %d points in hypre_AmgCGCBoundaryFix\n",mpirank,added_cpts);
+   if (added_cpts) { hypre_printf ("Processor %d: added %d points in hypre_AmgCGCBoundaryFix\n", mpirank, added_cpts); }
    fflush(stdout);
 #endif
    return hypre_error_flag;
diff --git a/external/hypre/src/parcsr_ls/par_cheby.c b/external/hypre/src/parcsr_ls/par_cheby.c
index 7b493bfa..b2e0c209 100644
--- a/external/hypre/src/parcsr_ls/par_cheby.c
+++ b/external/hypre/src/parcsr_ls/par_cheby.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -68,7 +68,7 @@ hypre_ParCSRRelax_Cheby_Setup(hypre_ParCSRMatrix *A,         /* matrix to relax
    hypre_CSRMatrix *A_diag       = hypre_ParCSRMatrixDiag(A);
    HYPRE_Real       theta, delta;
    HYPRE_Real       den;
-   HYPRE_Real       upper_bound = 0.0, lower_bound = 0.0;
+   HYPRE_Real       upper_bound, lower_bound;
    HYPRE_Int        num_rows     = hypre_CSRMatrixNumRows(A_diag);
    HYPRE_Real      *coefs        = NULL;
    HYPRE_Int        cheby_order;
@@ -85,61 +85,70 @@ hypre_ParCSRRelax_Cheby_Setup(hypre_ParCSRMatrix *A,         /* matrix to relax
       order = 1;
    }
 
-   coefs = hypre_CTAlloc(HYPRE_Real, order+1, HYPRE_MEMORY_HOST);
+   coefs = hypre_CTAlloc(HYPRE_Real, order + 1, HYPRE_MEMORY_HOST);
    /* we are using the order of p(A) */
    cheby_order = order - 1;
 
-   if (min_eig >= 0.0)
+   if (max_eig <= 0.0)
+   {
+      upper_bound = min_eig * 1.1;
+      lower_bound = max_eig - (max_eig - upper_bound) * fraction;
+   }
+   else
    {
       /* make sure we are large enough - Adams et al. 2003 */
       upper_bound = max_eig * 1.1;
       /* lower_bound = max_eig/fraction; */
       lower_bound = (upper_bound - min_eig) * fraction + min_eig;
    }
-   else if (max_eig <= 0.0)
-   {
-      upper_bound = min_eig * 1.1;
-      lower_bound = max_eig - (max_eig - upper_bound) * fraction;
-   }
 
    /* theta and delta */
-   theta = (upper_bound + lower_bound)/2;
-   delta = (upper_bound - lower_bound)/2;
+   theta = (upper_bound + lower_bound) / 2;
+   delta = (upper_bound - lower_bound) / 2;
 
    if (variant == 1)
    {
-      switch ( cheby_order ) /* these are the corresponding cheby polynomials: u = u_o + s(A)r_0  - so order is
-                                one less that  resid poly: r(t) = 1 - t*s(t) */
+      switch (cheby_order) /* these are the corresponding cheby polynomials: u = u_o + s(A)r_0  - so order is
+                               one less that  resid poly: r(t) = 1 - t*s(t) */
       {
          case 0:
-            coefs[0] = 1.0/theta;
+            coefs[0] = 1.0 / theta;
 
             break;
 
          case 1:  /* (del - t + 2*th)/(th^2 + del*th) */
-            den = (theta*theta + delta*theta);
+            den = (theta * theta + delta * theta);
 
-            coefs[0] = (delta + 2*theta)/den;
-            coefs[1] = -1.0/den;
+            coefs[0] = (delta + 2 * theta) / den;
+            coefs[1] = -1.0 / den;
 
             break;
 
          case 2:  /* (4*del*th - del^2 - t*(2*del + 6*th) + 2*t^2 + 6*th^2)/(2*del*th^2 - del^2*th - del^3 + 2*th^3)*/
-            den = 2*delta*theta*theta - delta*delta*theta - pow(delta,3) + 2*pow(theta,3);
+            den = 2 * delta * theta * theta - delta * delta * theta -
+                  hypre_pow(delta, 3) + 2 * hypre_pow(theta, 3);
 
-            coefs[0] = (4*delta*theta - pow(delta,2) +  6*pow(theta,2))/den;
-            coefs[1] = -(2*delta + 6*theta)/den;
-            coefs[2] =  2/den;
+            coefs[0] = (4 * delta * theta - hypre_pow(delta, 2) + 6 * hypre_pow(theta, 2)) / den;
+            coefs[1] = -(2 * delta + 6 * theta) / den;
+            coefs[2] =  2 / den;
 
             break;
 
          case 3: /* -(6*del^2*th - 12*del*th^2 - t^2*(4*del + 16*th) + t*(12*del*th - 3*del^2 + 24*th^2) + 3*del^3 + 4*t^3 - 16*th^3)/(4*del*th^3 - 3*del^2*th^2 - 3*del^3*th + 4*th^4)*/
-            den = - (4*delta*pow(theta,3) - 3*pow(delta,2)*pow(theta,2) - 3*pow(delta,3)*theta + 4*pow(theta,4) );
-
-            coefs[0] = (6*pow(delta,2)*theta - 12*delta*pow(theta,2) + 3*pow(delta,3) - 16*pow(theta,3)   )/den;
-            coefs[1] = (12*delta*theta - 3*pow(delta,2) + 24*pow(theta,2))/den;
-            coefs[2] =  -( 4*delta + 16*theta)/den;
-            coefs[3] = 4/den;
+            den = - 4 * delta * hypre_pow(theta, 3) +
+                  3 * hypre_pow(delta, 2) * hypre_pow(theta, 2) +
+                  3 * hypre_pow(delta, 3) * theta -
+                  4 * hypre_pow(theta, 4);
+
+            coefs[0] = (6 * hypre_pow(delta, 2) * theta -
+                        12 * delta * hypre_pow(theta, 2) +
+                        3 * hypre_pow(delta, 3) -
+                        16 * hypre_pow(theta, 3) ) / den;
+            coefs[1] = (12 * delta * theta -
+                        3 * hypre_pow(delta, 2) +
+                        24 * hypre_pow(theta, 2)) / den;
+            coefs[2] =  -( 4 * delta + 16 * theta) / den;
+            coefs[3] = 4 / den;
 
             break;
       }
@@ -148,37 +157,37 @@ hypre_ParCSRRelax_Cheby_Setup(hypre_ParCSRMatrix *A,         /* matrix to relax
    else /* standard chebyshev */
    {
 
-      switch ( cheby_order ) /* these are the corresponding cheby polynomials: u = u_o + s(A)r_0  - so order is
-                                one less thatn resid poly: r(t) = 1 - t*s(t) */
+      switch (cheby_order) /* these are the corresponding cheby polynomials: u = u_o + s(A)r_0  - so order is
+                              one less thatn resid poly: r(t) = 1 - t*s(t) */
       {
          case 0:
-            coefs[0] = 1.0/theta;
+            coefs[0] = 1.0 / theta;
             break;
 
          case 1:  /* (  2*t - 4*th)/(del^2 - 2*th^2) */
-            den = delta*delta - 2*theta*theta;
+            den = delta * delta - 2 * theta * theta;
 
-            coefs[0] = -4*theta/den;
-            coefs[1] = 2/den;
+            coefs[0] = -4 * theta / den;
+            coefs[1] = 2 / den;
 
             break;
 
          case 2: /* (3*del^2 - 4*t^2 + 12*t*th - 12*th^2)/(3*del^2*th - 4*th^3)*/
-            den = 3*(delta*delta)*theta - 4*(theta*theta*theta);
+            den = 3 * (delta * delta) * theta - 4 * (theta * theta * theta);
 
-            coefs[0] = (3*delta*delta - 12 *theta*theta)/den;
-            coefs[1] = 12*theta/den;
-            coefs[2] = -4/den;
+            coefs[0] = (3 * delta * delta - 12 * theta * theta) / den;
+            coefs[1] = 12 * theta / den;
+            coefs[2] = -4 / den;
 
             break;
 
          case 3: /*(t*(8*del^2 - 48*th^2) - 16*del^2*th + 32*t^2*th - 8*t^3 + 32*th^3)/(del^4 - 8*del^2*th^2 + 8*th^4)*/
-            den = pow(delta,4) - 8*delta*delta*theta*theta + 8*pow(theta,4);
+            den = hypre_pow(delta, 4) - 8 * delta * delta * theta * theta + 8 * hypre_pow(theta, 4);
 
-            coefs[0] = (32*pow(theta,3)- 16*delta*delta*theta)/den;
-            coefs[1] = (8*delta*delta - 48*theta*theta)/den;
-            coefs[2] = 32*theta/den;
-            coefs[3] = -8/den;
+            coefs[0] = (32 * hypre_pow(theta, 3) - 16 * delta * delta * theta) / den;
+            coefs[1] = (8 * delta * delta - 48 * theta * theta) / den;
+            coefs[2] = 32 * theta / den;
+            coefs[3] = -8 / den;
 
             break;
       }
@@ -187,7 +196,7 @@ hypre_ParCSRRelax_Cheby_Setup(hypre_ParCSRMatrix *A,         /* matrix to relax
 
    if (scale)
    {
-      /*grab 1/sqrt(abs(diagonal)) */
+      /*grab 1/hypre_sqrt(abs(diagonal)) */
       ds_data = hypre_CTAlloc(HYPRE_Real, num_rows, hypre_ParCSRMatrixMemoryLocation(A));
       hypre_CSRMatrixExtractDiagonal(hypre_ParCSRMatrixDiag(A), ds_data, 4);
    } /* end of scaling code */
@@ -226,6 +235,8 @@ hypre_ParCSRRelax_Cheby_SolveHost(hypre_ParCSRMatrix *A, /* matrix to relax with
                                   hypre_ParVector    *orig_u_vec, /*another temp vector */
                                   hypre_ParVector    *tmp_vec) /*a potential temp vector */
 {
+   HYPRE_UNUSED_VAR(variant);
+
    hypre_CSRMatrix *A_diag = hypre_ParCSRMatrixDiag(A);
    HYPRE_Real *u_data = hypre_VectorData(hypre_ParVectorLocalVector(u));
    HYPRE_Real *f_data = hypre_VectorData(hypre_ParVectorLocalVector(f));
@@ -247,12 +258,16 @@ hypre_ParCSRRelax_Cheby_SolveHost(hypre_ParCSRMatrix *A, /* matrix to relax with
    /* u = u + p(A)r */
 
    if (order > 4)
+   {
       order = 4;
+   }
    if (order < 1)
+   {
       order = 1;
+   }
 
    /* we are using the order of p(A) */
-   cheby_order = order -1;
+   cheby_order = order - 1;
 
    hypre_assert(hypre_VectorSize(hypre_ParVectorLocalVector(orig_u_vec)) >= num_rows);
    orig_u = hypre_VectorData(hypre_ParVectorLocalVector(orig_u_vec));
@@ -275,7 +290,7 @@ hypre_ParCSRRelax_Cheby_SolveHost(hypre_ParCSRMatrix *A, /* matrix to relax with
          mult = coefs[i];
          /* u = mult * r + v */
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(j) HYPRE_SMP_SCHEDULE
+         #pragma omp parallel for private(j) HYPRE_SMP_SCHEDULE
 #endif
          for ( j = 0; j < num_rows; j++ )
          {
@@ -285,7 +300,7 @@ hypre_ParCSRRelax_Cheby_SolveHost(hypre_ParCSRMatrix *A, /* matrix to relax with
 
       /* u = o + u */
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
       for ( i = 0; i < num_rows; i++ )
       {
@@ -295,16 +310,16 @@ hypre_ParCSRRelax_Cheby_SolveHost(hypre_ParCSRMatrix *A, /* matrix to relax with
    else /* scaling! */
    {
 
-      /*grab 1/sqrt(diagonal) */
+      /*grab 1/hypre_sqrt(diagonal) */
       tmp_data = hypre_VectorData(hypre_ParVectorLocalVector(tmp_vec));
 
-    /* get ds_data and get scaled residual: r = D^(-1/2)f -
-       * D^(-1/2)A*u */
+      /* get ds_data and get scaled residual: r = D^(-1/2)f -
+         * D^(-1/2)A*u */
 
       hypre_ParCSRMatrixMatvec(-1.0, A, u, 0.0, tmp_vec);
       /* r = ds .* (f + tmp) */
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(j) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(j) HYPRE_SMP_SCHEDULE
 #endif
       for ( j = 0; j < num_rows; j++ )
       {
@@ -316,7 +331,7 @@ hypre_ParCSRRelax_Cheby_SolveHost(hypre_ParCSRMatrix *A, /* matrix to relax with
 
       /* o = u;  u = r * coef */
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(j) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(j) HYPRE_SMP_SCHEDULE
 #endif
       for ( j = 0; j < num_rows; j++ )
       {
@@ -331,7 +346,7 @@ hypre_ParCSRRelax_Cheby_SolveHost(hypre_ParCSRMatrix *A, /* matrix to relax with
          /* v = D^(-1/2)AD^(-1/2)u */
          /* tmp = ds .* u */
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(j) HYPRE_SMP_SCHEDULE
+         #pragma omp parallel for private(j) HYPRE_SMP_SCHEDULE
 #endif
          for ( j = 0; j < num_rows; j++ )
          {
@@ -344,11 +359,11 @@ hypre_ParCSRRelax_Cheby_SolveHost(hypre_ParCSRMatrix *A, /* matrix to relax with
 
          /* u = coef * r + ds .* v */
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(j) HYPRE_SMP_SCHEDULE
+         #pragma omp parallel for private(j) HYPRE_SMP_SCHEDULE
 #endif
          for ( j = 0; j < num_rows; j++ )
          {
-            u_data[j] = mult * r_data[j] + ds_data[j]*v_data[j];
+            u_data[j] = mult * r_data[j] + ds_data[j] * v_data[j];
          }
 
       } /* end of cheby_order loop */
@@ -357,11 +372,11 @@ hypre_ParCSRRelax_Cheby_SolveHost(hypre_ParCSRMatrix *A, /* matrix to relax with
 
       /* u = orig_u + ds .* u */
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(j) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(j) HYPRE_SMP_SCHEDULE
 #endif
       for ( j = 0; j < num_rows; j++ )
       {
-         u_data[j] = orig_u[j] + ds_data[j]*u_data[j];
+         u_data[j] = orig_u[j] + ds_data[j] * u_data[j];
       }
 
    }/* end of scaling code */
@@ -401,25 +416,31 @@ hypre_ParCSRRelax_Cheby_Solve(hypre_ParCSRMatrix *A, /* matrix to relax with */
                               hypre_ParVector    *orig_u_vec, /*another temp vector */
                               hypre_ParVector    *tmp_vec) /*another temp vector */
 {
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    hypre_GpuProfilingPushRange("ParCSRRelaxChebySolve");
-#endif
-   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1(hypre_ParCSRMatrixMemoryLocation(A));
    HYPRE_Int             ierr = 0;
 
-   if (exec == HYPRE_EXEC_HOST)
+   /* Sanity check */
+   if (hypre_ParVectorNumVectors(f) > 1)
    {
-      ierr = hypre_ParCSRRelax_Cheby_SolveHost(A, f, ds_data, coefs, order, scale, variant, u, v, r, orig_u_vec, tmp_vec);
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                        "Requested relaxation type doesn't support multicomponent vectors");
+      return hypre_error_flag;
    }
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-   else
+
+#if defined(HYPRE_USING_GPU)
+   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1(hypre_ParCSRMatrixMemoryLocation(A));
+   if (exec == HYPRE_EXEC_DEVICE)
    {
-      ierr = hypre_ParCSRRelax_Cheby_SolveDevice(A, f, ds_data, coefs, order, scale, variant, u, v, r, orig_u_vec, tmp_vec);
+      ierr = hypre_ParCSRRelax_Cheby_SolveDevice(A, f, ds_data, coefs, order, scale, variant, u, v, r,
+                                                 orig_u_vec, tmp_vec);
    }
+   else
 #endif
+   {
+      ierr = hypre_ParCSRRelax_Cheby_SolveHost(A, f, ds_data, coefs, order, scale, variant, u, v, r,
+                                               orig_u_vec, tmp_vec);
+   }
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    hypre_GpuProfilingPopRange();
-#endif
    return ierr;
 }
diff --git a/external/hypre/src/parcsr_ls/par_cheby_device.c b/external/hypre/src/parcsr_ls/par_cheby_device.c
index 18ccdb4c..8208b143 100644
--- a/external/hypre/src/parcsr_ls/par_cheby_device.c
+++ b/external/hypre/src/parcsr_ls/par_cheby_device.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -11,13 +11,18 @@
  *
  *****************************************************************************/
 
+#include "_hypre_onedpl.hpp"
 #include "_hypre_parcsr_ls.h"
 #include "_hypre_parcsr_mv.h"
 #include "float.h"
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
 #include "_hypre_utilities.hpp"
 
+#if defined(HYPRE_USING_SYCL)
+namespace thrust = std;
+#endif
+
 /**
  * @brief waxpyz
  *
@@ -33,7 +38,7 @@ struct waxpyz
    const T scale;
    waxpyz(T _scale) : scale(_scale) {}
 
-   __host__ __device__ void operator()(Tuple t)
+   __host__ __device__ void operator()(Tuple t) const
    {
       thrust::get<0>(t) = scale * thrust::get<1>(t) + thrust::get<2>(t) * thrust::get<3>(t);
    }
@@ -50,7 +55,7 @@ template <typename T>
 struct wxypz
 {
    typedef thrust::tuple<T &, T, T, T> Tuple;
-   __host__ __device__ void            operator()(Tuple t)
+   __host__ __device__ void            operator()(Tuple t) const
    {
       thrust::get<0>(t) = thrust::get<1>(t) * (thrust::get<2>(t) + thrust::get<3>(t));
    }
@@ -72,7 +77,7 @@ struct save_and_scale
 
    save_and_scale(T _scale) : scale(_scale) {}
 
-   __host__ __device__ void operator()(Tuple t)
+   __host__ __device__ void operator()(Tuple t) const
    {
       thrust::get<0>(t) = thrust::get<1>(t);
       thrust::get<1>(t) = thrust::get<2>(t) * scale;
@@ -91,7 +96,7 @@ struct xpyz
 {
    typedef thrust::tuple<T &, T, T> Tuple;
 
-   __host__ __device__ void operator()(Tuple t)
+   __host__ __device__ void operator()(Tuple t) const
    {
       thrust::get<0>(t) = thrust::get<1>(t) + thrust::get<2>(t) * thrust::get<0>(t);
    }
@@ -125,6 +130,8 @@ hypre_ParCSRRelax_Cheby_SolveDevice(hypre_ParCSRMatrix *A, /* matrix to relax wi
                                     hypre_ParVector    *orig_u_vec, /*another temp vector */
                                     hypre_ParVector    *tmp_vec)       /*a potential temp vector */
 {
+   HYPRE_UNUSED_VAR(variant);
+
    hypre_CSRMatrix *A_diag = hypre_ParCSRMatrixDiag(A);
    HYPRE_Real      *u_data = hypre_VectorData(hypre_ParVectorLocalVector(u));
    HYPRE_Real      *f_data = hypre_VectorData(hypre_ParVectorLocalVector(f));
@@ -143,8 +150,8 @@ hypre_ParCSRRelax_Cheby_SolveDevice(hypre_ParCSRMatrix *A, /* matrix to relax wi
 
    /* u = u + p(A)r */
 
-   if (order > 4) order = 4;
-   if (order < 1) order = 1;
+   if (order > 4) { order = 4; }
+   if (order < 1) { order = 1; }
 
    /* we are using the order of p(A) */
    cheby_order = order - 1;
@@ -159,28 +166,38 @@ hypre_ParCSRRelax_Cheby_SolveDevice(hypre_ParCSRMatrix *A, /* matrix to relax wi
       hypre_ParCSRMatrixMatvec(-1.0, A, u, 1.0, r);
 
       /* o = u; u = r .* coef */
+#if defined(HYPRE_USING_SYCL)
+      HYPRE_ONEDPL_CALL(
+         std::for_each,
+         oneapi::dpl::make_zip_iterator(orig_u, u_data, r_data),
+         oneapi::dpl::make_zip_iterator(orig_u + num_rows, u_data + num_rows,
+                                        r_data + num_rows),
+         save_and_scale<HYPRE_Real>(coefs[cheby_order]));
+#else
       HYPRE_THRUST_CALL(
-          for_each,
-          thrust::make_zip_iterator(thrust::make_tuple(orig_u, u_data, r_data)),
-          thrust::make_zip_iterator(thrust::make_tuple(orig_u + num_rows, u_data + num_rows, r_data + num_rows)),
-          save_and_scale<HYPRE_Real>(coefs[cheby_order]));
+         for_each,
+         thrust::make_zip_iterator(thrust::make_tuple(orig_u, u_data, r_data)),
+         thrust::make_zip_iterator(thrust::make_tuple(orig_u + num_rows, u_data + num_rows,
+                                                      r_data + num_rows)),
+         save_and_scale<HYPRE_Real>(coefs[cheby_order]));
+#endif
 
       for (i = cheby_order - 1; i >= 0; i--)
       {
          hypre_ParCSRMatrixMatvec(1.0, A, u, 0.0, v);
          mult = coefs[i];
-         /* u = mult * r + v */
 
-         HYPRE_THRUST_CALL( transform, r_data, r_data + num_rows, v_data, u_data, mult * _1 + _2 );
+         /* u = mult * r + v */
+         hypreDevice_ComplexAxpyn( r_data, num_rows, v_data, u_data, mult );
       }
 
       /* u = o + u */
-      HYPRE_THRUST_CALL(transform, orig_u, orig_u + num_rows, u_data, u_data, _1 + _2);
+      hypreDevice_ComplexAxpyn( orig_u, num_rows, u_data, u_data, 1.0);
    }
    else /* scaling! */
    {
 
-      /*grab 1/sqrt(diagonal) */
+      /*grab 1/hypre_sqrt(diagonal) */
 
       tmp_data = hypre_VectorData(hypre_ParVectorLocalVector(tmp_vec));
 
@@ -192,26 +209,45 @@ hypre_ParCSRRelax_Cheby_SolveDevice(hypre_ParCSRMatrix *A, /* matrix to relax wi
 
       /* TODO: It might be possible to merge this and the next call to:
        * r[j] = ds_data[j] * (f_data[j] + tmp_data[j]); o[j] = u[j]; u[j] = r[j] * coef */
+#if defined(HYPRE_USING_SYCL)
+      HYPRE_ONEDPL_CALL(std::for_each,
+                        oneapi::dpl::make_zip_iterator(r_data, ds_data, f_data, tmp_data),
+                        oneapi::dpl::make_zip_iterator(r_data, ds_data, f_data, tmp_data) + num_rows,
+                        wxypz<HYPRE_Real>());
+#else
       HYPRE_THRUST_CALL(for_each,
                         thrust::make_zip_iterator(thrust::make_tuple(r_data, ds_data, f_data, tmp_data)),
                         thrust::make_zip_iterator(thrust::make_tuple(r_data, ds_data, f_data, tmp_data)) + num_rows,
                         wxypz<HYPRE_Real>());
+#endif
 
       /* save original u, then start
          the iteration by multiplying r by the cheby coef.*/
 
       /* o = u;  u = r * coef */
+#if defined(HYPRE_USING_SYCL)
+      HYPRE_ONEDPL_CALL(std::for_each,
+                        oneapi::dpl::make_zip_iterator(orig_u, u_data, r_data),
+                        oneapi::dpl::make_zip_iterator(orig_u, u_data, r_data) + num_rows,
+                        save_and_scale<HYPRE_Real>(coefs[cheby_order]));
+#else
       HYPRE_THRUST_CALL(for_each,
                         thrust::make_zip_iterator(thrust::make_tuple(orig_u, u_data, r_data)),
                         thrust::make_zip_iterator(thrust::make_tuple(orig_u, u_data, r_data)) + num_rows,
                         save_and_scale<HYPRE_Real>(coefs[cheby_order]));
+#endif
 
       /* now do the other coefficients */
       for (i = cheby_order - 1; i >= 0; i--)
       {
          /* v = D^(-1/2)AD^(-1/2)u */
          /* tmp = ds .* u */
+#if defined(HYPRE_USING_SYCL)
+         HYPRE_ONEDPL_CALL( std::transform, ds_data, ds_data + num_rows, u_data, tmp_data,
+                            std::multiplies<HYPRE_Real>() );
+#else
          HYPRE_THRUST_CALL( transform, ds_data, ds_data + num_rows, u_data, tmp_data, _1 * _2 );
+#endif
 
          hypre_ParCSRMatrixMatvec(1.0, A, tmp_vec, 0.0, v);
 
@@ -219,20 +255,36 @@ hypre_ParCSRRelax_Cheby_SolveDevice(hypre_ParCSRMatrix *A, /* matrix to relax wi
          mult = coefs[i];
 
          /* u = coef * r + ds .* v */
+#if defined(HYPRE_USING_SYCL)
+         HYPRE_ONEDPL_CALL(std::for_each,
+                           oneapi::dpl::make_zip_iterator(u_data, r_data, ds_data, v_data),
+                           oneapi::dpl::make_zip_iterator(u_data, r_data, ds_data, v_data) + num_rows,
+                           waxpyz<HYPRE_Real>(mult));
+#else
          HYPRE_THRUST_CALL(for_each,
                            thrust::make_zip_iterator(thrust::make_tuple(u_data, r_data, ds_data, v_data)),
                            thrust::make_zip_iterator(thrust::make_tuple(u_data, r_data, ds_data, v_data)) + num_rows,
                            waxpyz<HYPRE_Real>(mult));
+#endif
       } /* end of cheby_order loop */
 
       /* now we have to scale u_data before adding it to u_orig*/
 
       /* u = orig_u + ds .* u */
+#if defined(HYPRE_USING_SYCL)
+      HYPRE_ONEDPL_CALL(
+         std::for_each,
+         oneapi::dpl::make_zip_iterator(u_data, orig_u, ds_data),
+         oneapi::dpl::make_zip_iterator(u_data + num_rows, orig_u + num_rows, ds_data + num_rows),
+         xpyz<HYPRE_Real>());
+#else
       HYPRE_THRUST_CALL(
-          for_each,
-          thrust::make_zip_iterator(thrust::make_tuple(u_data, orig_u, ds_data)),
-          thrust::make_zip_iterator(thrust::make_tuple(u_data + num_rows, orig_u + num_rows, ds_data + num_rows)),
-          xpyz<HYPRE_Real>());
+         for_each,
+         thrust::make_zip_iterator(thrust::make_tuple(u_data, orig_u, ds_data)),
+         thrust::make_zip_iterator(thrust::make_tuple(u_data + num_rows, orig_u + num_rows,
+                                                      ds_data + num_rows)),
+         xpyz<HYPRE_Real>());
+#endif
 
 
    } /* end of scaling code */
diff --git a/external/hypre/src/parcsr_ls/par_coarse_parms.c b/external/hypre/src/parcsr_ls/par_coarse_parms.c
index d3d974a0..22b5f2dc 100644
--- a/external/hypre/src/parcsr_ls/par_coarse_parms.c
+++ b/external/hypre/src/parcsr_ls/par_coarse_parms.c
@@ -1,23 +1,12 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
  ******************************************************************************/
 
-/******************************************************************************
- *
- *****************************************************************************/
-
-/* following should be in a header file */
-
-
 #include "_hypre_parcsr_ls.h"
 
-
-
-/*==========================================================================*/
-/*==========================================================================*/
 /**
   Generates global coarse_size and dof_func for next coarser level
 
@@ -46,37 +35,32 @@
   marker array for coarse points
   @param coarse_dof_func_ptr [OUT]
   pointer to array which contains the function numbers for local coarse points
-  @param coarse_pnts_global_ptr [OUT]
+  @param coarse_pnts_global [OUT]
   pointer to array which contains the number of the first coarse point on each  processor and the total number of coarse points in its last element
 
   @see */
 /*--------------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_BoomerAMGCoarseParmsHost(MPI_Comm          comm,
-                               HYPRE_Int         local_num_variables,
-                               HYPRE_Int         num_functions,
-                               hypre_IntArray   *dof_func,
-                               hypre_IntArray   *CF_marker,
-                               hypre_IntArray  **coarse_dof_func_ptr,
-                               HYPRE_BigInt    **coarse_pnts_global_ptr) 
+hypre_BoomerAMGCoarseParmsHost(MPI_Comm         comm,
+                               HYPRE_Int        local_num_variables,
+                               HYPRE_Int        num_functions,
+                               hypre_IntArray  *dof_func,
+                               hypre_IntArray  *CF_marker,
+                               hypre_IntArray **coarse_dof_func_ptr,
+                               HYPRE_BigInt    *coarse_pnts_global)
 {
 #ifdef HYPRE_PROFILE
    hypre_profile_times[HYPRE_TIMER_ID_COARSE_PARAMS] -= hypre_MPI_Wtime();
 #endif
 
-   HYPRE_Int      i;
-   HYPRE_Int      num_procs;
-   HYPRE_BigInt   local_coarse_size = 0;
-
-   HYPRE_Int     *coarse_dof_func;
-   HYPRE_BigInt  *coarse_pnts_global;
+   HYPRE_Int     i;
+   HYPRE_BigInt  local_coarse_size = 0;
+   HYPRE_Int    *coarse_dof_func;
 
    /*--------------------------------------------------------------
     *----------------------------------------------------------------*/
 
-   hypre_MPI_Comm_size(comm,&num_procs);
-
    for (i = 0; i < local_num_variables; i++)
    {
       if (hypre_IntArrayData(CF_marker)[i] == 1)
@@ -84,6 +68,7 @@ hypre_BoomerAMGCoarseParmsHost(MPI_Comm          comm,
          local_coarse_size++;
       }
    }
+
    if (num_functions > 1)
    {
       *coarse_dof_func_ptr = hypre_IntArrayCreate(local_coarse_size);
@@ -102,8 +87,6 @@ hypre_BoomerAMGCoarseParmsHost(MPI_Comm          comm,
 
    {
       HYPRE_BigInt scan_recv;
-
-      coarse_pnts_global = hypre_CTAlloc(HYPRE_BigInt, 2, HYPRE_MEMORY_HOST);
       hypre_MPI_Scan(&local_coarse_size, &scan_recv, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
 
       /* first point in my range */
@@ -113,12 +96,6 @@ hypre_BoomerAMGCoarseParmsHost(MPI_Comm          comm,
       coarse_pnts_global[1] = scan_recv;
    }
 
-   if (*coarse_pnts_global_ptr)
-   {
-      hypre_TFree(*coarse_pnts_global_ptr, HYPRE_MEMORY_HOST);
-   }
-   *coarse_pnts_global_ptr = coarse_pnts_global;
-
 #ifdef HYPRE_PROFILE
    hypre_profile_times[HYPRE_TIMER_ID_COARSE_PARAMS] += hypre_MPI_Wtime();
 #endif
@@ -127,34 +104,36 @@ hypre_BoomerAMGCoarseParmsHost(MPI_Comm          comm,
 }
 
 HYPRE_Int
-hypre_BoomerAMGCoarseParms(MPI_Comm          comm,
-                           HYPRE_Int         local_num_variables,
-                           HYPRE_Int         num_functions,
-                           hypre_IntArray   *dof_func,
-                           hypre_IntArray   *CF_marker,
-                           hypre_IntArray  **coarse_dof_func_ptr,
-                           HYPRE_BigInt    **coarse_pnts_global_ptr) 
+hypre_BoomerAMGCoarseParms(MPI_Comm         comm,
+                           HYPRE_Int        local_num_variables,
+                           HYPRE_Int        num_functions,
+                           hypre_IntArray  *dof_func,
+                           hypre_IntArray  *CF_marker,
+                           hypre_IntArray **coarse_dof_func_ptr,
+                           HYPRE_BigInt    *coarse_pnts_global)
 {
-   HYPRE_Int ierr = 0;
+#if defined(HYPRE_USING_GPU)
+   HYPRE_ExecutionPolicy exec;
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1(hypre_IntArrayMemoryLocation(CF_marker));
    if (num_functions > 1)
    {
-      exec = hypre_GetExecPolicy2(hypre_IntArrayMemoryLocation(CF_marker), hypre_IntArrayMemoryLocation(dof_func));
+      exec = hypre_GetExecPolicy2(hypre_IntArrayMemoryLocation(CF_marker),
+                                  hypre_IntArrayMemoryLocation(dof_func));
+   }
+   else
+   {
+      exec = hypre_GetExecPolicy1(hypre_IntArrayMemoryLocation(CF_marker));
    }
 
    if (exec == HYPRE_EXEC_DEVICE)
    {
-      ierr = hypre_BoomerAMGCoarseParmsDevice(comm, local_num_variables, num_functions, dof_func, 
-                                              CF_marker, coarse_dof_func_ptr, coarse_pnts_global_ptr);
+      return hypre_BoomerAMGCoarseParmsDevice(comm, local_num_variables, num_functions, dof_func,
+                                              CF_marker, coarse_dof_func_ptr, coarse_pnts_global);
    }
    else
 #endif
    {
-      ierr = hypre_BoomerAMGCoarseParmsHost(comm, local_num_variables, num_functions, dof_func, 
-                                            CF_marker, coarse_dof_func_ptr, coarse_pnts_global_ptr);
+      return hypre_BoomerAMGCoarseParmsHost(comm, local_num_variables, num_functions, dof_func,
+                                            CF_marker, coarse_dof_func_ptr, coarse_pnts_global);
    }
-
-   return ierr;
 }
diff --git a/external/hypre/src/parcsr_ls/par_coarse_parms_device.c b/external/hypre/src/parcsr_ls/par_coarse_parms_device.c
index 863e6454..b6e86387 100644
--- a/external/hypre/src/parcsr_ls/par_coarse_parms_device.c
+++ b/external/hypre/src/parcsr_ls/par_coarse_parms_device.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -11,15 +11,12 @@
 
 /* following should be in a header file */
 
-
+#include "_hypre_onedpl.hpp"
 #include "_hypre_parcsr_ls.h"
 #include "_hypre_utilities.hpp"
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-
+#if defined(HYPRE_USING_GPU)
 
-/*==========================================================================*/
-/*==========================================================================*/
 /**
   Generates global coarse_size and dof_func for next coarser level
 
@@ -37,7 +34,7 @@
   _hypre_parcsr_ls.h
 
   @return Error code.
-  
+
   @param comm [IN]
   MPI Communicator
   @param local_num_variables [IN]
@@ -45,12 +42,12 @@
   @param dof_func [IN]
   array that contains the function numbers for all local points
   @param CF_marker [IN]
-  marker array for coarse points 
+  marker array for coarse points
   @param coarse_dof_func_ptr [OUT]
   pointer to array which contains the function numbers for local coarse points
-  @param coarse_pnts_global_ptr [OUT]
+  @param coarse_pnts_global [OUT]
   pointer to array which contains the number of the first coarse point on each  processor and the total number of coarse points in its last element
-  
+
   @see */
 /*--------------------------------------------------------------------------*/
 
@@ -61,57 +58,62 @@ hypre_BoomerAMGCoarseParmsDevice(MPI_Comm          comm,
                                  hypre_IntArray   *dof_func,
                                  hypre_IntArray   *CF_marker,
                                  hypre_IntArray  **coarse_dof_func_ptr,
-                                 HYPRE_BigInt    **coarse_pnts_global_ptr) 
+                                 HYPRE_BigInt     *coarse_pnts_global)
 {
 #ifdef HYPRE_PROFILE
    hypre_profile_times[HYPRE_TIMER_ID_COARSE_PARAMS] -= hypre_MPI_Wtime();
 #endif
 
    HYPRE_Int      ierr = 0;
-   HYPRE_Int	   num_procs;
    HYPRE_BigInt   local_coarse_size = 0;
 
-   HYPRE_BigInt  *coarse_pnts_global;
-
-
    /*--------------------------------------------------------------
     *----------------------------------------------------------------*/
 
-   hypre_MPI_Comm_size(comm,&num_procs);
-
+#if defined(HYPRE_USING_SYCL)
+   local_coarse_size = HYPRE_ONEDPL_CALL( std::count_if,
+                                          hypre_IntArrayData(CF_marker),
+                                          hypre_IntArrayData(CF_marker) + local_num_variables,
+                                          equal<HYPRE_Int>(1) );
+#else
    local_coarse_size = HYPRE_THRUST_CALL( count_if,
                                           hypre_IntArrayData(CF_marker),
                                           hypre_IntArrayData(CF_marker) + local_num_variables,
                                           equal<HYPRE_Int>(1) );
+#endif
 
    if (num_functions > 1)
    {
       *coarse_dof_func_ptr = hypre_IntArrayCreate(local_coarse_size);
       hypre_IntArrayInitialize_v2(*coarse_dof_func_ptr, HYPRE_MEMORY_DEVICE);
 
+#if defined(HYPRE_USING_SYCL)
+      hypreSycl_copy_if( hypre_IntArrayData(dof_func),
+                         hypre_IntArrayData(dof_func) + local_num_variables,
+                         hypre_IntArrayData(CF_marker),
+                         hypre_IntArrayData(*coarse_dof_func_ptr),
+                         equal<HYPRE_Int>(1) );
+#else
       HYPRE_THRUST_CALL( copy_if,
                          hypre_IntArrayData(dof_func),
                          hypre_IntArrayData(dof_func) + local_num_variables,
                          hypre_IntArrayData(CF_marker),
                          hypre_IntArrayData(*coarse_dof_func_ptr),
                          equal<HYPRE_Int>(1) );
+#endif
    }
 
-
    {
       HYPRE_BigInt scan_recv;
-      
-      coarse_pnts_global = hypre_CTAlloc(HYPRE_BigInt, 2, HYPRE_MEMORY_HOST);
       hypre_MPI_Scan(&local_coarse_size, &scan_recv, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
-      /* first point in my range */ 
+
+      /* first point in my range */
       coarse_pnts_global[0] = scan_recv - local_coarse_size;
+
       /* first point in next proc's range */
       coarse_pnts_global[1] = scan_recv;
-
    }
 
-   *coarse_pnts_global_ptr = coarse_pnts_global;
-
 #ifdef HYPRE_PROFILE
    hypre_profile_times[HYPRE_TIMER_ID_COARSE_PARAMS] += hypre_MPI_Wtime();
 #endif
@@ -120,24 +122,37 @@ hypre_BoomerAMGCoarseParmsDevice(MPI_Comm          comm,
 }
 
 HYPRE_Int
-hypre_BoomerAMGInitDofFuncDevice( HYPRE_Int *dof_func, 
-                                  HYPRE_Int  local_size, 
+hypre_BoomerAMGInitDofFuncDevice( HYPRE_Int *dof_func,
+                                  HYPRE_Int  local_size,
                                   HYPRE_Int  offset,
                                   HYPRE_Int  num_functions )
 {
+#if defined(HYPRE_USING_SYCL)
+   hypreSycl_sequence(dof_func,
+                      dof_func + local_size,
+                      offset);
+
+   HYPRE_ONEDPL_CALL( std::transform,
+                      dof_func,
+                      dof_func + local_size,
+                      dof_func,
+                      modulo<HYPRE_Int>(num_functions) );
+#else
    HYPRE_THRUST_CALL( sequence,
                       dof_func,
                       dof_func + local_size,
                       offset,
                       1 );
+
    HYPRE_THRUST_CALL( transform,
                       dof_func,
                       dof_func + local_size,
                       dof_func,
                       modulo<HYPRE_Int>(num_functions) );
+#endif
 
    return hypre_error_flag;
 }
 
-#endif // #if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#endif // #if defined(HYPRE_USING_GPU)
 
diff --git a/external/hypre/src/parcsr_ls/par_coarsen.c b/external/hypre/src/parcsr_ls/par_coarsen.c
index 414a2f8b..1f131432 100644
--- a/external/hypre/src/parcsr_ls/par_coarsen.c
+++ b/external/hypre/src/parcsr_ls/par_coarsen.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -96,9 +96,9 @@ hypre_BoomerAMGCoarsen( hypre_ParCSRMatrix    *S,
                         HYPRE_Int              debug_flag,
                         hypre_IntArray       **CF_marker_ptr)
 {
-   MPI_Comm                comm            = hypre_ParCSRMatrixComm(S);
-   hypre_ParCSRCommPkg    *comm_pkg        = hypre_ParCSRMatrixCommPkg(S);
-   hypre_ParCSRCommHandle *comm_handle;
+   MPI_Comm                comm        = hypre_ParCSRMatrixComm(S);
+   hypre_ParCSRCommPkg    *comm_pkg    = hypre_ParCSRMatrixCommPkg(S);
+   hypre_ParCSRCommHandle *comm_handle = NULL;
 
    hypre_CSRMatrix    *S_diag          = hypre_ParCSRMatrixDiag(S);
    HYPRE_Int          *S_diag_i        = hypre_CSRMatrixI(S_diag);
@@ -106,13 +106,13 @@ hypre_BoomerAMGCoarsen( hypre_ParCSRMatrix    *S,
 
    hypre_CSRMatrix    *S_offd          = hypre_ParCSRMatrixOffd(S);
    HYPRE_Int          *S_offd_i        = hypre_CSRMatrixI(S_offd);
-   HYPRE_Int          *S_offd_j = NULL;
+   HYPRE_Int          *S_offd_j        = NULL;
 
    HYPRE_BigInt       *col_map_offd    = hypre_ParCSRMatrixColMapOffd(S);
    HYPRE_Int           num_variables   = hypre_CSRMatrixNumRows(S_diag);
-   HYPRE_BigInt        col_1 = hypre_ParCSRMatrixFirstColDiag(S);
-   HYPRE_BigInt        col_n = col_1 + (HYPRE_BigInt)hypre_CSRMatrixNumCols(S_diag);
-   HYPRE_Int           num_cols_offd = 0;
+   HYPRE_BigInt        col_1           = hypre_ParCSRMatrixFirstColDiag(S);
+   HYPRE_BigInt        col_n           = col_1 + (HYPRE_BigInt)hypre_CSRMatrixNumCols(S_diag);
+   HYPRE_Int           num_cols_offd   = 0;
 
    hypre_CSRMatrix    *S_ext;
    HYPRE_Int          *S_ext_i = NULL;
@@ -139,7 +139,7 @@ hypre_BoomerAMGCoarsen( hypre_ParCSRMatrix    *S,
    HYPRE_Int           use_commpkg_A = 0;
    HYPRE_Int           break_var = 1;
 
-   HYPRE_Real       wall_time;
+   HYPRE_Real       wall_time = 0.0;
    HYPRE_Int        iter = 0;
    HYPRE_BigInt     big_k;
 
@@ -164,9 +164,9 @@ hypre_BoomerAMGCoarsen( hypre_ParCSRMatrix    *S,
     *----------------------------------------------------------------*/
 
    S_ext = NULL;
-   if (debug_flag == 3) wall_time = time_getWallclockSeconds();
-   hypre_MPI_Comm_size(comm,&num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   if (debug_flag == 3) { wall_time = time_getWallclockSeconds(); }
+   hypre_MPI_Comm_size(comm, &num_procs);
+   hypre_MPI_Comm_rank(comm, &my_id);
 
    if (!comm_pkg)
    {
@@ -183,9 +183,9 @@ hypre_BoomerAMGCoarsen( hypre_ParCSRMatrix    *S,
    num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
 
    int_buf_data = hypre_CTAlloc(HYPRE_Int,  hypre_ParCSRCommPkgSendMapStart(comm_pkg,
-            num_sends), HYPRE_MEMORY_HOST);
+                                                                            num_sends), HYPRE_MEMORY_HOST);
    buf_data = hypre_CTAlloc(HYPRE_Real,  hypre_ParCSRCommPkgSendMapStart(comm_pkg,
-            num_sends), HYPRE_MEMORY_HOST);
+                                                                         num_sends), HYPRE_MEMORY_HOST);
 
    num_cols_offd = hypre_CSRMatrixNumCols(S_offd);
 
@@ -206,43 +206,52 @@ hypre_BoomerAMGCoarsen( hypre_ParCSRMatrix    *S,
     * between 0 and 1.
     *----------------------------------------------------------*/
 
-   measure_array = hypre_CTAlloc(HYPRE_Real,  num_variables+num_cols_offd, HYPRE_MEMORY_HOST);
+   measure_array = hypre_CTAlloc(HYPRE_Real,  num_variables + num_cols_offd, HYPRE_MEMORY_HOST);
 
-   for (i=0; i < S_offd_i[num_variables]; i++)
+   for (i = 0; i < S_offd_i[num_variables]; i++)
    {
       measure_array[num_variables + S_offd_j[i]] += 1.0;
    }
+
    if (num_procs > 1)
+   {
       comm_handle = hypre_ParCSRCommHandleCreate(2, comm_pkg,
-            &measure_array[num_variables], buf_data);
+                                                 &measure_array[num_variables], buf_data);
+   }
 
-   for (i=0; i < S_diag_i[num_variables]; i++)
+   for (i = 0; i < S_diag_i[num_variables]; i++)
    {
       measure_array[S_diag_j[i]] += 1.0;
    }
 
    if (num_procs > 1)
+   {
       hypre_ParCSRCommHandleDestroy(comm_handle);
+   }
 
    index = 0;
-   for (i=0; i < num_sends; i++)
+   for (i = 0; i < num_sends; i++)
    {
       start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-      for (j=start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
-         measure_array[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)]
-            += buf_data[index++];
+      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
+         measure_array[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)]
+         += buf_data[index++];
    }
 
-   for (i=num_variables; i < num_variables+num_cols_offd; i++)
+   for (i = num_variables; i < num_variables + num_cols_offd; i++)
    {
       measure_array[i] = 0;
    }
 
    /* this augments the measures */
    if (CF_init == 2)
+   {
       hypre_BoomerAMGIndepSetInit(S, measure_array, 1);
+   }
    else
+   {
       hypre_BoomerAMGIndepSetInit(S, measure_array, 0);
+   }
 
    /*---------------------------------------------------
     * Initialize the graph array
@@ -252,14 +261,20 @@ hypre_BoomerAMGCoarsen( hypre_ParCSRMatrix    *S,
 
    graph_array = hypre_CTAlloc(HYPRE_Int,  num_variables, HYPRE_MEMORY_HOST);
    if (num_cols_offd)
+   {
       graph_array_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_offd, HYPRE_MEMORY_HOST);
+   }
    else
+   {
       graph_array_offd = NULL;
+   }
 
    /* initialize measure array and graph array */
 
    for (ig = 0; ig < num_cols_offd; ig++)
+   {
       graph_array_offd[ig] = ig;
+   }
 
    /*---------------------------------------------------
     * Initialize the C/F marker array
@@ -284,14 +299,14 @@ hypre_BoomerAMGCoarsen( hypre_ParCSRMatrix    *S,
       {
          if ( CF_marker[i] != SF_PT )
          {
-            if ( (S_offd_i[i+1] - S_offd_i[i]) > 0 ||
+            if ( (S_offd_i[i + 1] - S_offd_i[i]) > 0 ||
                  (CF_marker[i] == F_PT) )
             {
                CF_marker[i] = 0;
             }
             if ( CF_marker[i] == Z_PT)
             {
-               if ( (S_diag_i[i+1] - S_diag_i[i]) > 0 ||
+               if ( (S_diag_i[i + 1] - S_diag_i[i]) > 0 ||
                     (measure_array[i] >= 1.0) )
                {
                   CF_marker[i] = 0;
@@ -321,7 +336,7 @@ hypre_BoomerAMGCoarsen( hypre_ParCSRMatrix    *S,
          if ( CF_marker[i] != SF_PT )
          {
             CF_marker[i] = 0;
-            nnzrow = (S_diag_i[i+1] - S_diag_i[i]) + (S_offd_i[i+1] - S_offd_i[i]);
+            nnzrow = (S_diag_i[i + 1] - S_diag_i[i]) + (S_offd_i[i + 1] - S_offd_i[i]);
             if (nnzrow == 0)
             {
                CF_marker[i] = SF_PT;
@@ -340,11 +355,17 @@ hypre_BoomerAMGCoarsen( hypre_ParCSRMatrix    *S,
    }
    graph_size = cnt;
    if (num_cols_offd)
+   {
       CF_marker_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_offd, HYPRE_MEMORY_HOST);
+   }
    else
+   {
       CF_marker_offd = NULL;
-   for (i=0; i < num_cols_offd; i++)
+   }
+   for (i = 0; i < num_cols_offd; i++)
+   {
       CF_marker_offd[i] = 0;
+   }
 
    /*---------------------------------------------------
     * Loop until all points are either fine or coarse.
@@ -353,9 +374,13 @@ hypre_BoomerAMGCoarsen( hypre_ParCSRMatrix    *S,
    if (num_procs > 1)
    {
       if (use_commpkg_A)
-         S_ext      = hypre_ParCSRMatrixExtractBExt(S,A,0);
+      {
+         S_ext      = hypre_ParCSRMatrixExtractBExt(S, A, 0);
+      }
       else
-         S_ext      = hypre_ParCSRMatrixExtractBExt(S,S,0);
+      {
+         S_ext      = hypre_ParCSRMatrixExtractBExt(S, S, 0);
+      }
       S_ext_i    = hypre_CSRMatrixI(S_ext);
       S_ext_j    = hypre_CSRMatrixBigJ(S_ext);
    }
@@ -363,9 +388,9 @@ hypre_BoomerAMGCoarsen( hypre_ParCSRMatrix    *S,
    /*  compress S_ext  and convert column numbers*/
 
    index = 0;
-   for (i=0; i < num_cols_offd; i++)
+   for (i = 0; i < num_cols_offd; i++)
    {
-      for (j=S_ext_i[i]; j < S_ext_i[i+1]; j++)
+      for (j = S_ext_i[i]; j < S_ext_i[i + 1]; j++)
       {
          big_k = S_ext_j[j];
          if (big_k >= col_1 && big_k < col_n)
@@ -374,21 +399,23 @@ hypre_BoomerAMGCoarsen( hypre_ParCSRMatrix    *S,
          }
          else
          {
-            kc = hypre_BigBinarySearch(col_map_offd,big_k,num_cols_offd);
-            if (kc > -1) S_ext_j[index++] = (HYPRE_BigInt)(-kc-1);
+            kc = hypre_BigBinarySearch(col_map_offd, big_k, num_cols_offd);
+            if (kc > -1) { S_ext_j[index++] = (HYPRE_BigInt)(-kc - 1); }
          }
       }
       S_ext_i[i] = index;
    }
    for (i = num_cols_offd; i > 0; i--)
-      S_ext_i[i] = S_ext_i[i-1];
-   if (num_procs > 1) S_ext_i[0] = 0;
+   {
+      S_ext_i[i] = S_ext_i[i - 1];
+   }
+   if (num_procs > 1) { S_ext_i[0] = 0; }
 
    if (debug_flag == 3)
    {
       wall_time = time_getWallclockSeconds() - wall_time;
       hypre_printf("Proc = %d    Initialize CLJP phase = %f\n",
-            my_id, wall_time);
+                   my_id, wall_time);
    }
 
    while (1)
@@ -399,18 +426,20 @@ hypre_BoomerAMGCoarsen( hypre_ParCSRMatrix    *S,
 
       if (num_procs > 1)
          comm_handle = hypre_ParCSRCommHandleCreate(2, comm_pkg,
-               &measure_array[num_variables], buf_data);
+                                                    &measure_array[num_variables], buf_data);
 
       if (num_procs > 1)
+      {
          hypre_ParCSRCommHandleDestroy(comm_handle);
+      }
 
       index = 0;
-      for (i=0; i < num_sends; i++)
+      for (i = 0; i < num_sends; i++)
       {
          start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-         for (j=start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
-            measure_array[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)]
-               += buf_data[index++];
+         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
+            measure_array[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)]
+            += buf_data[index++];
       }
 
       /*------------------------------------------------
@@ -429,14 +458,14 @@ hypre_BoomerAMGCoarsen( hypre_ParCSRMatrix    *S,
                CF_marker[i] = F_PT;
 
                /* make sure all dependencies have been accounted for */
-               for (jS = S_diag_i[i]; jS < S_diag_i[i+1]; jS++)
+               for (jS = S_diag_i[i]; jS < S_diag_i[i + 1]; jS++)
                {
                   if (S_diag_j[jS] > -1)
                   {
                      CF_marker[i] = 0;
                   }
                }
-               for (jS = S_offd_i[i]; jS < S_offd_i[i+1]; jS++)
+               for (jS = S_offd_i[i]; jS < S_offd_i[i + 1]; jS++)
                {
                   if (S_offd_j[jS] > -1)
                   {
@@ -461,15 +490,15 @@ hypre_BoomerAMGCoarsen( hypre_ParCSRMatrix    *S,
        * Exchange boundary data, i.i. get measures
        *------------------------------------------------*/
 
-      if (debug_flag == 3) wall_time = time_getWallclockSeconds();
+      if (debug_flag == 3) { wall_time = time_getWallclockSeconds(); }
 
       index = 0;
       for (i = 0; i < num_sends; i++)
       {
          start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
          {
-            jrow = hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j);
+            jrow = hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j);
             buf_data[index++] = measure_array[jrow];
          }
       }
@@ -477,7 +506,7 @@ hypre_BoomerAMGCoarsen( hypre_ParCSRMatrix    *S,
       if (num_procs > 1)
       {
          comm_handle = hypre_ParCSRCommHandleCreate(1, comm_pkg, buf_data,
-               &measure_array[num_variables]);
+                                                    &measure_array[num_variables]);
 
          hypre_ParCSRCommHandleDestroy(comm_handle);
 
@@ -522,10 +551,12 @@ hypre_BoomerAMGCoarsen( hypre_ParCSRMatrix    *S,
        *------------------------------------------------*/
 
       big_graph_size = (HYPRE_BigInt) graph_size;
-      hypre_MPI_Allreduce(&big_graph_size,&global_graph_size,1,HYPRE_MPI_BIG_INT,hypre_MPI_SUM,comm);
+      hypre_MPI_Allreduce(&big_graph_size, &global_graph_size, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
 
       if (global_graph_size == 0)
+      {
          break;
+      }
 
       /*------------------------------------------------
        * Pick an independent set of points with
@@ -534,13 +565,13 @@ hypre_BoomerAMGCoarsen( hypre_ParCSRMatrix    *S,
       if (iter || (CF_init != 1))
       {
          hypre_BoomerAMGIndepSet(S, measure_array, graph_array,
-               graph_size,
-               graph_array_offd, graph_offd_size,
-               CF_marker, CF_marker_offd);
+                                 graph_size,
+                                 graph_array_offd, graph_offd_size,
+                                 CF_marker, CF_marker_offd);
          if (num_procs > 1)
          {
             comm_handle = hypre_ParCSRCommHandleCreate(12, comm_pkg,
-                  CF_marker_offd, int_buf_data);
+                                                       CF_marker_offd, int_buf_data);
 
             hypre_ParCSRCommHandleDestroy(comm_handle);
          }
@@ -549,8 +580,9 @@ hypre_BoomerAMGCoarsen( hypre_ParCSRMatrix    *S,
          for (i = 0; i < num_sends; i++)
          {
             start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-            for (j=start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg,i+1);j++)            {
-               elmt = hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j);
+            for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
+            {
+               elmt = hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j);
                if (!int_buf_data[index++] && CF_marker[elmt] > 0)
                {
                   CF_marker[elmt] = 0;
@@ -569,9 +601,9 @@ hypre_BoomerAMGCoarsen( hypre_ParCSRMatrix    *S,
       for (i = 0; i < num_sends; i++)
       {
          start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
          {
-            elmt = hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j);
+            elmt = hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j);
             int_buf_data[index++] = CF_marker[elmt];
          }
       }
@@ -579,7 +611,7 @@ hypre_BoomerAMGCoarsen( hypre_ParCSRMatrix    *S,
       if (num_procs > 1)
       {
          comm_handle = hypre_ParCSRCommHandleCreate(11, comm_pkg, int_buf_data,
-               CF_marker_offd);
+                                                    CF_marker_offd);
 
          hypre_ParCSRCommHandleDestroy(comm_handle);
       }
@@ -601,18 +633,18 @@ hypre_BoomerAMGCoarsen( hypre_ParCSRMatrix    *S,
       {
          wall_time = time_getWallclockSeconds() - wall_time;
          hypre_printf("Proc = %d  iter %d  comm. and subgraph update = %f\n",
-               my_id, iter, wall_time);
+                      my_id, iter, wall_time);
       }
       /*------------------------------------------------
        * Set C_pts and apply heuristics.
        *------------------------------------------------*/
 
-      for (i=num_variables; i < num_variables+num_cols_offd; i++)
+      for (i = num_variables; i < num_variables + num_cols_offd; i++)
       {
          measure_array[i] = 0;
       }
 
-      if (debug_flag == 3) wall_time = time_getWallclockSeconds();
+      if (debug_flag == 3) { wall_time = time_getWallclockSeconds(); }
       for (ig = 0; ig < graph_size; ig++)
       {
          i = graph_array[ig];
@@ -627,14 +659,14 @@ hypre_BoomerAMGCoarsen( hypre_ParCSRMatrix    *S,
             /* set to be a C-pt */
             CF_marker[i] = C_PT;
 
-            for (jS = S_diag_i[i]; jS < S_diag_i[i+1]; jS++)
+            for (jS = S_diag_i[i]; jS < S_diag_i[i + 1]; jS++)
             {
                j = S_diag_j[jS];
                if (j > -1)
                {
 
                   /* "remove" edge from S */
-                  S_diag_j[jS] = -S_diag_j[jS]-1;
+                  S_diag_j[jS] = -S_diag_j[jS] - 1;
 
                   /* decrement measures of unmarked neighbors */
                   if (!CF_marker[j])
@@ -643,19 +675,19 @@ hypre_BoomerAMGCoarsen( hypre_ParCSRMatrix    *S,
                   }
                }
             }
-            for (jS = S_offd_i[i]; jS < S_offd_i[i+1]; jS++)
+            for (jS = S_offd_i[i]; jS < S_offd_i[i + 1]; jS++)
             {
                j = S_offd_j[jS];
                if (j > -1)
                {
 
                   /* "remove" edge from S */
-                  S_offd_j[jS] = -S_offd_j[jS]-1;
+                  S_offd_j[jS] = -S_offd_j[jS] - 1;
 
                   /* decrement measures of unmarked neighbors */
                   if (!CF_marker_offd[j])
                   {
-                     measure_array[j+num_variables]--;
+                     measure_array[j + num_variables]--;
                   }
                }
             }
@@ -663,17 +695,17 @@ hypre_BoomerAMGCoarsen( hypre_ParCSRMatrix    *S,
          else
          {
             /* marked dependencies */
-            for (jS = S_diag_i[i]; jS < S_diag_i[i+1]; jS++)
+            for (jS = S_diag_i[i]; jS < S_diag_i[i + 1]; jS++)
             {
                j = S_diag_j[jS];
-               if (j < 0) j = -j-1;
+               if (j < 0) { j = -j - 1; }
 
                if (CF_marker[j] > 0)
                {
                   if (S_diag_j[jS] > -1)
                   {
                      /* "remove" edge from S */
-                     S_diag_j[jS] = -S_diag_j[jS]-1;
+                     S_diag_j[jS] = -S_diag_j[jS] - 1;
                   }
 
                   /* IMPORTANT: consider all dependencies */
@@ -685,21 +717,21 @@ hypre_BoomerAMGCoarsen( hypre_ParCSRMatrix    *S,
                   if (S_diag_j[jS] > -1)
                   {
                      /* "remove" edge from S */
-                     S_diag_j[jS] = -S_diag_j[jS]-1;
+                     S_diag_j[jS] = -S_diag_j[jS] - 1;
                   }
                }
             }
-            for (jS = S_offd_i[i]; jS < S_offd_i[i+1]; jS++)
+            for (jS = S_offd_i[i]; jS < S_offd_i[i + 1]; jS++)
             {
                j = S_offd_j[jS];
-               if (j < 0) j = -j-1;
+               if (j < 0) { j = -j - 1; }
 
                if (CF_marker_offd[j] > 0)
                {
                   if (S_offd_j[jS] > -1)
                   {
                      /* "remove" edge from S */
-                     S_offd_j[jS] = -S_offd_j[jS]-1;
+                     S_offd_j[jS] = -S_offd_j[jS] - 1;
                   }
 
                   /* IMPORTANT: consider all dependencies */
@@ -711,29 +743,29 @@ hypre_BoomerAMGCoarsen( hypre_ParCSRMatrix    *S,
                   if (S_offd_j[jS] > -1)
                   {
                      /* "remove" edge from S */
-                     S_offd_j[jS] = -S_offd_j[jS]-1;
+                     S_offd_j[jS] = -S_offd_j[jS] - 1;
                   }
                }
             }
 
             /* unmarked dependencies */
-            for (jS = S_diag_i[i]; jS < S_diag_i[i+1]; jS++)
+            for (jS = S_diag_i[i]; jS < S_diag_i[i + 1]; jS++)
             {
                if (S_diag_j[jS] > -1)
                {
                   j = S_diag_j[jS];
                   break_var = 1;
                   /* check for common C-pt */
-                  for (kS = S_diag_i[j]; kS < S_diag_i[j+1]; kS++)
+                  for (kS = S_diag_i[j]; kS < S_diag_i[j + 1]; kS++)
                   {
                      k = S_diag_j[kS];
-                     if (k < 0) k = -k-1;
+                     if (k < 0) { k = -k - 1; }
 
                      /* IMPORTANT: consider all dependencies */
                      if (CF_marker[k] == COMMON_C_PT)
                      {
                         /* "remove" edge from S and update measure*/
-                        S_diag_j[jS] = -S_diag_j[jS]-1;
+                        S_diag_j[jS] = -S_diag_j[jS] - 1;
                         measure_array[j]--;
                         break_var = 0;
                         break;
@@ -741,16 +773,16 @@ hypre_BoomerAMGCoarsen( hypre_ParCSRMatrix    *S,
                   }
                   if (break_var)
                   {
-                     for (kS = S_offd_i[j]; kS < S_offd_i[j+1]; kS++)
+                     for (kS = S_offd_i[j]; kS < S_offd_i[j + 1]; kS++)
                      {
                         k = S_offd_j[kS];
-                        if (k < 0) k = -k-1;
+                        if (k < 0) { k = -k - 1; }
 
                         /* IMPORTANT: consider all dependencies */
                         if ( CF_marker_offd[k] == COMMON_C_PT)
                         {
                            /* "remove" edge from S and update measure*/
-                           S_diag_j[jS] = -S_diag_j[jS]-1;
+                           S_diag_j[jS] = -S_diag_j[jS] - 1;
                            measure_array[j]--;
                            break;
                         }
@@ -758,14 +790,14 @@ hypre_BoomerAMGCoarsen( hypre_ParCSRMatrix    *S,
                   }
                }
             }
-            for (jS = S_offd_i[i]; jS < S_offd_i[i+1]; jS++)
+            for (jS = S_offd_i[i]; jS < S_offd_i[i + 1]; jS++)
             {
                if (S_offd_j[jS] > -1)
                {
                   j = S_offd_j[jS];
 
                   /* check for common C-pt */
-                  for (kS = S_ext_i[j]; kS < S_ext_i[j+1]; kS++)
+                  for (kS = S_ext_i[j]; kS < S_ext_i[j + 1]; kS++)
                   {
                      k = (HYPRE_Int)S_ext_j[kS];
                      if (k >= 0)
@@ -774,19 +806,19 @@ hypre_BoomerAMGCoarsen( hypre_ParCSRMatrix    *S,
                         if (CF_marker[k] == COMMON_C_PT)
                         {
                            /* "remove" edge from S and update measure*/
-                           S_offd_j[jS] = -S_offd_j[jS]-1;
-                           measure_array[j+num_variables]--;
+                           S_offd_j[jS] = -S_offd_j[jS] - 1;
+                           measure_array[j + num_variables]--;
                            break;
                         }
                      }
                      else
                      {
-                        kc = -k-1;
+                        kc = -k - 1;
                         if (kc > -1 && CF_marker_offd[kc] == COMMON_C_PT)
                         {
                            /* "remove" edge from S and update measure*/
-                           S_offd_j[jS] = -S_offd_j[jS]-1;
-                           measure_array[j+num_variables]--;
+                           S_offd_j[jS] = -S_offd_j[jS] - 1;
+                           measure_array[j + num_variables]--;
                            break;
                         }
                      }
@@ -796,20 +828,20 @@ hypre_BoomerAMGCoarsen( hypre_ParCSRMatrix    *S,
          }
 
          /* reset CF_marker */
-         for (jS = S_diag_i[i]; jS < S_diag_i[i+1]; jS++)
+         for (jS = S_diag_i[i]; jS < S_diag_i[i + 1]; jS++)
          {
             j = S_diag_j[jS];
-            if (j < 0) j = -j-1;
+            if (j < 0) { j = -j - 1; }
 
             if (CF_marker[j] == COMMON_C_PT)
             {
                CF_marker[j] = C_PT;
             }
          }
-         for (jS = S_offd_i[i]; jS < S_offd_i[i+1]; jS++)
+         for (jS = S_offd_i[i]; jS < S_offd_i[i + 1]; jS++)
          {
             j = S_offd_j[jS];
-            if (j < 0) j = -j-1;
+            if (j < 0) { j = -j - 1; }
 
             if (CF_marker_offd[j] == COMMON_C_PT)
             {
@@ -821,7 +853,7 @@ hypre_BoomerAMGCoarsen( hypre_ParCSRMatrix    *S,
       {
          wall_time = time_getWallclockSeconds() - wall_time;
          hypre_printf("Proc = %d    CLJP phase = %f graph_size = %d nc_offd = %d\n",
-               my_id, wall_time, graph_size, num_cols_offd);
+                      my_id, wall_time, graph_size, num_cols_offd);
       }
    }
 
@@ -830,26 +862,30 @@ hypre_BoomerAMGCoarsen( hypre_ParCSRMatrix    *S,
     *---------------------------------------------------*/
 
    /* Reset S_matrix */
-   for (i=0; i < S_diag_i[num_variables]; i++)
+   for (i = 0; i < S_diag_i[num_variables]; i++)
    {
       if (S_diag_j[i] < 0)
-         S_diag_j[i] = -S_diag_j[i]-1;
+      {
+         S_diag_j[i] = -S_diag_j[i] - 1;
+      }
    }
-   for (i=0; i < S_offd_i[num_variables]; i++)
+   for (i = 0; i < S_offd_i[num_variables]; i++)
    {
       if (S_offd_j[i] < 0)
-         S_offd_j[i] = -S_offd_j[i]-1;
+      {
+         S_offd_j[i] = -S_offd_j[i] - 1;
+      }
    }
    /*for (i=0; i < num_variables; i++)
      if (CF_marker[i] == SF_PT) CF_marker[i] = F_PT;*/
 
    hypre_TFree(measure_array, HYPRE_MEMORY_HOST);
    hypre_TFree(graph_array, HYPRE_MEMORY_HOST);
-   if (num_cols_offd) hypre_TFree(graph_array_offd, HYPRE_MEMORY_HOST);
+   if (num_cols_offd) { hypre_TFree(graph_array_offd, HYPRE_MEMORY_HOST); }
    hypre_TFree(buf_data, HYPRE_MEMORY_HOST);
    hypre_TFree(int_buf_data, HYPRE_MEMORY_HOST);
    hypre_TFree(CF_marker_offd, HYPRE_MEMORY_HOST);
-   if (num_procs > 1) hypre_CSRMatrixDestroy(S_ext);
+   if (num_procs > 1) { hypre_CSRMatrixDestroy(S_ext); }
 
    return hypre_error_flag;
 }
@@ -946,7 +982,7 @@ hypre_BoomerAMGCoarsenRuge( hypre_ParCSRMatrix    *S,
    HYPRE_Int        use_commpkg_A = 0;
    HYPRE_Int        break_var = 0;
    HYPRE_Int        f_pnt = F_PT;
-   HYPRE_Real       wall_time;
+   HYPRE_Real       wall_time = 0.0;
 
    if (coarsen_type < 0)
    {
@@ -990,13 +1026,13 @@ hypre_BoomerAMGCoarsenRuge( hypre_ParCSRMatrix    *S,
     * to "unaccounted-for" dependence.
     *----------------------------------------------------------------*/
 
-   if (debug_flag == 3) wall_time = time_getWallclockSeconds();
+   if (debug_flag == 3) { wall_time = time_getWallclockSeconds(); }
 
    first_col = hypre_ParCSRMatrixFirstColDiag(S);
-   col_0 = first_col-1;
-   col_n = col_0+(HYPRE_BigInt)num_variables;
-   hypre_MPI_Comm_size(comm,&num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   col_0 = first_col - 1;
+   col_n = col_0 + (HYPRE_BigInt)num_variables;
+   hypre_MPI_Comm_size(comm, &num_procs);
+   hypre_MPI_Comm_rank(comm, &my_id);
 
    if (!comm_pkg)
    {
@@ -1021,7 +1057,7 @@ hypre_BoomerAMGCoarsenRuge( hypre_ParCSRMatrix    *S,
 
    ST = hypre_CSRMatrixCreate(num_variables, num_variables, jS);
    hypre_CSRMatrixMemoryLocation(ST) = HYPRE_MEMORY_HOST;
-   ST_i = hypre_CTAlloc(HYPRE_Int, num_variables+1, HYPRE_MEMORY_HOST);
+   ST_i = hypre_CTAlloc(HYPRE_Int, num_variables + 1, HYPRE_MEMORY_HOST);
    ST_j = hypre_CTAlloc(HYPRE_Int, jS, HYPRE_MEMORY_HOST);
    hypre_CSRMatrixI(ST) = ST_i;
    hypre_CSRMatrixJ(ST) = ST_j;
@@ -1030,21 +1066,21 @@ hypre_BoomerAMGCoarsenRuge( hypre_ParCSRMatrix    *S,
     * generate transpose of S, ST
     *----------------------------------------------------------*/
 
-   for (i=0; i <= num_variables; i++)
+   for (i = 0; i <= num_variables; i++)
    {
       ST_i[i] = 0;
    }
-   for (i=0; i < jS; i++)
+   for (i = 0; i < jS; i++)
    {
-      ST_i[S_j[i]+1]++;
+      ST_i[S_j[i] + 1]++;
    }
-   for (i=0; i < num_variables; i++)
+   for (i = 0; i < num_variables; i++)
    {
-      ST_i[i+1] += ST_i[i];
+      ST_i[i + 1] += ST_i[i];
    }
-   for (i=0; i < num_variables; i++)
+   for (i = 0; i < num_variables; i++)
    {
-      for (j=S_i[i]; j < S_i[i+1]; j++)
+      for (j = S_i[i]; j < S_i[i + 1]; j++)
       {
          index = S_j[j];
          ST_j[ST_i[index]] = i;
@@ -1053,7 +1089,7 @@ hypre_BoomerAMGCoarsenRuge( hypre_ParCSRMatrix    *S,
    }
    for (i = num_variables; i > 0; i--)
    {
-      ST_i[i] = ST_i[i-1];
+      ST_i[i] = ST_i[i - 1];
    }
    ST_i[0] = 0;
 
@@ -1071,7 +1107,7 @@ hypre_BoomerAMGCoarsenRuge( hypre_ParCSRMatrix    *S,
 
    for (i = 0; i < num_variables; i++)
    {
-      measure_array[i] = ST_i[i+1]-ST_i[i];
+      measure_array[i] = ST_i[i + 1] - ST_i[i];
    }
 
    /* special case for Falgout coarsening */
@@ -1089,9 +1125,13 @@ hypre_BoomerAMGCoarsenRuge( hypre_ParCSRMatrix    *S,
    if ((meas_type || (coarsen_type != 1 && coarsen_type != 11)) && num_procs > 1)
    {
       if (use_commpkg_A)
-         S_ext      = hypre_ParCSRMatrixExtractBExt(S,A,0);
+      {
+         S_ext      = hypre_ParCSRMatrixExtractBExt(S, A, 0);
+      }
       else
-         S_ext      = hypre_ParCSRMatrixExtractBExt(S,S,0);
+      {
+         S_ext      = hypre_ParCSRMatrixExtractBExt(S, S, 0);
+      }
       S_ext_i    = hypre_CSRMatrixI(S_ext);
       S_ext_j    = hypre_CSRMatrixBigJ(S_ext);
       HYPRE_Int num_nonzeros = S_ext_i[num_cols_offd];
@@ -1100,11 +1140,13 @@ hypre_BoomerAMGCoarsenRuge( hypre_ParCSRMatrix    *S,
         col_n = col_0+num_variables; */
       if (meas_type)
       {
-         for (i=0; i < num_nonzeros; i++)
+         for (i = 0; i < num_nonzeros; i++)
          {
             index = (HYPRE_Int)(S_ext_j[i] - first_col);
             if (index > -1 && index < num_variables)
+            {
                measure_array[index]++;
+            }
          }
       }
    }
@@ -1113,7 +1155,7 @@ hypre_BoomerAMGCoarsenRuge( hypre_ParCSRMatrix    *S,
     * Loop until all points are either fine or coarse.
     *---------------------------------------------------*/
 
-   if (debug_flag == 3) wall_time = time_getWallclockSeconds();
+   if (debug_flag == 3) { wall_time = time_getWallclockSeconds(); }
 
    /* first coarsening phase */
 
@@ -1127,7 +1169,7 @@ hypre_BoomerAMGCoarsenRuge( hypre_ParCSRMatrix    *S,
    if (*CF_marker_ptr == NULL)
    {
       *CF_marker_ptr = hypre_IntArrayCreate(num_variables);
-      hypre_IntArrayInitialize(*CF_marker_ptr);
+      hypre_IntArrayInitialize_v2(*CF_marker_ptr, HYPRE_MEMORY_HOST);
    }
    CF_marker = hypre_IntArrayData(*CF_marker_ptr);
 
@@ -1136,7 +1178,7 @@ hypre_BoomerAMGCoarsenRuge( hypre_ParCSRMatrix    *S,
    {
       if (CF_marker[j] == 0)
       {
-         nnzrow = (S_i[j+1] - S_i[j]) + (S_offd_i[j+1] - S_offd_i[j]);
+         nnzrow = (S_i[j + 1] - S_i[j]) + (S_offd_i[j + 1] - S_offd_i[j]);
          if (nnzrow == 0)
          {
             CF_marker[j] = SF_PT;
@@ -1161,11 +1203,11 @@ hypre_BoomerAMGCoarsenRuge( hypre_ParCSRMatrix    *S,
    /* Set dense rows as SF_PT */
    if ((cut_factor > 0) && (global_num_rows > 0))
    {
-      avg_nnzrow = num_nonzeros/global_num_rows;
-      cut = cut_factor*avg_nnzrow;
+      avg_nnzrow = num_nonzeros / global_num_rows;
+      cut = cut_factor * avg_nnzrow;
       for (j = 0; j < num_variables; j++)
       {
-         nnzrow = (A_i[j+1] - A_i[j]) + (A_offd_i[j+1] - A_offd_i[j]);
+         nnzrow = (A_i[j + 1] - A_i[j]) + (A_offd_i[j + 1] - A_offd_i[j]);
          if (nnzrow > cut)
          {
             if (CF_marker[j] == UNDECIDED)
@@ -1190,11 +1232,11 @@ hypre_BoomerAMGCoarsenRuge( hypre_ParCSRMatrix    *S,
          {
             if (measure < 0)
             {
-               hypre_error_w_msg(HYPRE_ERROR_GENERIC,"negative measure!\n");
+               hypre_error_w_msg(HYPRE_ERROR_GENERIC, "negative measure!\n");
             }
 
             CF_marker[j] = f_pnt;
-            for (k = S_i[j]; k < S_i[j+1]; k++)
+            for (k = S_i[j]; k < S_i[j + 1]; k++)
             {
                nabor = S_j[k];
                if (CF_marker[nabor] != SF_PT && CF_marker[nabor] != SC_PT)
@@ -1205,12 +1247,12 @@ hypre_BoomerAMGCoarsenRuge( hypre_ParCSRMatrix    *S,
                      if (new_meas > 0)
                      {
                         hypre_remove_point(&LoL_head, &LoL_tail, new_meas,
-                              nabor, lists, where);
+                                           nabor, lists, where);
                      }
 
                      new_meas = ++(measure_array[nabor]);
                      hypre_enter_on_lists(&LoL_head, &LoL_tail, new_meas,
-                           nabor, lists, where);
+                                          nabor, lists, where);
                   }
                   else
                   {
@@ -1254,7 +1296,7 @@ hypre_BoomerAMGCoarsenRuge( hypre_ParCSRMatrix    *S,
 
       hypre_remove_point(&LoL_head, &LoL_tail, measure, index, lists, where);
 
-      for (j = ST_i[index]; j < ST_i[index+1]; j++)
+      for (j = ST_i[index]; j < ST_i[index + 1]; j++)
       {
          nabor = ST_j[j];
          if (CF_marker[nabor] == UNDECIDED)
@@ -1265,24 +1307,24 @@ hypre_BoomerAMGCoarsenRuge( hypre_ParCSRMatrix    *S,
             hypre_remove_point(&LoL_head, &LoL_tail, measure, nabor, lists, where);
             --num_left;
 
-            for (k = S_i[nabor]; k < S_i[nabor+1]; k++)
+            for (k = S_i[nabor]; k < S_i[nabor + 1]; k++)
             {
                nabor_two = S_j[k];
                if (CF_marker[nabor_two] == UNDECIDED)
                {
                   measure = measure_array[nabor_two];
                   hypre_remove_point(&LoL_head, &LoL_tail, measure,
-                        nabor_two, lists, where);
+                                     nabor_two, lists, where);
 
                   new_meas = ++(measure_array[nabor_two]);
 
                   hypre_enter_on_lists(&LoL_head, &LoL_tail, new_meas,
-                        nabor_two, lists, where);
+                                       nabor_two, lists, where);
                }
             }
          }
       }
-      for (j = S_i[index]; j < S_i[index+1]; j++)
+      for (j = S_i[index]; j < S_i[index + 1]; j++)
       {
          nabor = S_j[j];
          if (CF_marker[nabor] == UNDECIDED)
@@ -1296,26 +1338,26 @@ hypre_BoomerAMGCoarsenRuge( hypre_ParCSRMatrix    *S,
             if (measure > 0)
             {
                hypre_enter_on_lists(&LoL_head, &LoL_tail, measure, nabor,
-                     lists, where);
+                                    lists, where);
             }
             else
             {
                CF_marker[nabor] = F_PT;
                --num_left;
 
-               for (k = S_i[nabor]; k < S_i[nabor+1]; k++)
+               for (k = S_i[nabor]; k < S_i[nabor + 1]; k++)
                {
                   nabor_two = S_j[k];
                   if (CF_marker[nabor_two] == UNDECIDED)
                   {
                      new_meas = measure_array[nabor_two];
                      hypre_remove_point(&LoL_head, &LoL_tail, new_meas,
-                           nabor_two, lists, where);
+                                        nabor_two, lists, where);
 
                      new_meas = ++(measure_array[nabor_two]);
 
                      hypre_enter_on_lists(&LoL_head, &LoL_tail, new_meas,
-                           nabor_two, lists, where);
+                                          nabor_two, lists, where);
                   }
                }
             }
@@ -1330,7 +1372,7 @@ hypre_BoomerAMGCoarsenRuge( hypre_ParCSRMatrix    *S,
    {
       wall_time = time_getWallclockSeconds() - wall_time;
       hypre_printf("Proc = %d    Coarsen 1st pass = %f\n",
-            my_id, wall_time);
+                   my_id, wall_time);
    }
 
    hypre_TFree(lists, HYPRE_MEMORY_HOST);
@@ -1338,7 +1380,7 @@ hypre_BoomerAMGCoarsenRuge( hypre_ParCSRMatrix    *S,
    hypre_TFree(LoL_head, HYPRE_MEMORY_HOST);
    hypre_TFree(LoL_tail, HYPRE_MEMORY_HOST);
 
-   for (i=0; i < num_variables; i++)
+   for (i = 0; i < num_variables; i++)
    {
       if (CF_marker[i] == SC_PT)
       {
@@ -1370,7 +1412,7 @@ hypre_BoomerAMGCoarsenRuge( hypre_ParCSRMatrix    *S,
       graph_array[i] = -1;
    }
 
-   if (debug_flag == 3) wall_time = time_getWallclockSeconds();
+   if (debug_flag == 3) { wall_time = time_getWallclockSeconds(); }
 
    if (coarsen_type == 2)
    {
@@ -1380,56 +1422,62 @@ hypre_BoomerAMGCoarsenRuge( hypre_ParCSRMatrix    *S,
 
       CF_marker_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_offd, HYPRE_MEMORY_HOST);
       int_buf_data = hypre_CTAlloc(HYPRE_Int,  hypre_ParCSRCommPkgSendMapStart(comm_pkg,
-               num_sends), HYPRE_MEMORY_HOST);
+                                                                               num_sends), HYPRE_MEMORY_HOST);
 
       index = 0;
       for (i = 0; i < num_sends; i++)
       {
          start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
          {
-            int_buf_data[index++] = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+            int_buf_data[index++] = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
          }
       }
 
       if (num_procs > 1)
       {
          comm_handle = hypre_ParCSRCommHandleCreate(11, comm_pkg, int_buf_data,
-               CF_marker_offd);
+                                                    CF_marker_offd);
 
          hypre_ParCSRCommHandleDestroy(comm_handle);
       }
 
       ci_array = hypre_CTAlloc(HYPRE_Int, num_cols_offd, HYPRE_MEMORY_HOST);
-      for (i=0; i < num_cols_offd; i++)
+      for (i = 0; i < num_cols_offd; i++)
+      {
          ci_array[i] = -1;
+      }
 
-      for (i=0; i < num_variables; i++)
+      for (i = 0; i < num_variables; i++)
       {
-         if (ci_tilde_mark != i) ci_tilde = -1;
-         if (ci_tilde_offd_mark != i) ci_tilde_offd = -1;
+         if (ci_tilde_mark != i) { ci_tilde = -1; }
+         if (ci_tilde_offd_mark != i) { ci_tilde_offd = -1; }
          if (CF_marker[i] == -1)
          {
             break_var = 1;
-            for (ji = S_i[i]; ji < S_i[i+1]; ji++)
+            for (ji = S_i[i]; ji < S_i[i + 1]; ji++)
             {
                j = S_j[ji];
                if (CF_marker[j] > 0)
+               {
                   graph_array[j] = i;
+               }
             }
-            for (ji = S_offd_i[i]; ji < S_offd_i[i+1]; ji++)
+            for (ji = S_offd_i[i]; ji < S_offd_i[i + 1]; ji++)
             {
                j = S_offd_j[ji];
                if (CF_marker_offd[j] > 0)
+               {
                   ci_array[j] = i;
+               }
             }
-            for (ji = S_i[i]; ji < S_i[i+1]; ji++)
+            for (ji = S_i[i]; ji < S_i[i + 1]; ji++)
             {
                j = S_j[ji];
                if (CF_marker[j] == -1)
                {
                   set_empty = 1;
-                  for (jj = S_i[j]; jj < S_i[j+1]; jj++)
+                  for (jj = S_i[j]; jj < S_i[j + 1]; jj++)
                   {
                      index = S_j[jj];
                      if (graph_array[index] == i)
@@ -1440,7 +1488,7 @@ hypre_BoomerAMGCoarsenRuge( hypre_ParCSRMatrix    *S,
                   }
                   if (set_empty)
                   {
-                     for (jj = S_offd_i[j]; jj < S_offd_i[j+1]; jj++)
+                     for (jj = S_offd_i[j]; jj < S_offd_i[j + 1]; jj++)
                      {
                         index = S_offd_j[jj];
                         if (ci_array[index] == i)
@@ -1484,18 +1532,18 @@ hypre_BoomerAMGCoarsenRuge( hypre_ParCSRMatrix    *S,
             }
             if (break_var)
             {
-               for (ji = S_offd_i[i]; ji < S_offd_i[i+1]; ji++)
+               for (ji = S_offd_i[i]; ji < S_offd_i[i + 1]; ji++)
                {
                   j = S_offd_j[ji];
                   if (CF_marker_offd[j] == -1)
                   {
                      set_empty = 1;
-                     for (jj = S_ext_i[j]; jj < S_ext_i[j+1]; jj++)
+                     for (jj = S_ext_i[j]; jj < S_ext_i[j + 1]; jj++)
                      {
                         big_k = S_ext_j[jj];
                         if (big_k > col_0 && big_k < col_n) /* index interior */
                         {
-                           if (graph_array[(HYPRE_Int)(big_k-first_col)] == i)
+                           if (graph_array[(HYPRE_Int)(big_k - first_col)] == i)
                            {
                               set_empty = 0;
                               break;
@@ -1503,7 +1551,7 @@ hypre_BoomerAMGCoarsenRuge( hypre_ParCSRMatrix    *S,
                         }
                         else
                         {
-                           jk = hypre_BigBinarySearch(col_map_offd,big_k,num_cols_offd);
+                           jk = hypre_BigBinarySearch(col_map_offd, big_k, num_cols_offd);
                            if (jk != -1)
                            {
                               if (ci_array[jk] == i)
@@ -1550,24 +1598,26 @@ hypre_BoomerAMGCoarsenRuge( hypre_ParCSRMatrix    *S,
    }
    else
    {
-      for (i=0; i < num_variables; i++)
+      for (i = 0; i < num_variables; i++)
       {
-         if (ci_tilde_mark != i) ci_tilde = -1;
+         if (ci_tilde_mark != i) { ci_tilde = -1; }
          if (CF_marker[i] == -1)
          {
-            for (ji = S_i[i]; ji < S_i[i+1]; ji++)
+            for (ji = S_i[i]; ji < S_i[i + 1]; ji++)
             {
                j = S_j[ji];
                if (CF_marker[j] > 0)
+               {
                   graph_array[j] = i;
+               }
             }
-            for (ji = S_i[i]; ji < S_i[i+1]; ji++)
+            for (ji = S_i[i]; ji < S_i[i + 1]; ji++)
             {
                j = S_j[ji];
                if (CF_marker[j] == -1)
                {
                   set_empty = 1;
-                  for (jj = S_i[j]; jj < S_i[j+1]; jj++)
+                  for (jj = S_i[j]; jj < S_i[j + 1]; jj++)
                   {
                      index = S_j[jj];
                      if (graph_array[index] == i)
@@ -1609,18 +1659,18 @@ hypre_BoomerAMGCoarsenRuge( hypre_ParCSRMatrix    *S,
    {
       wall_time = time_getWallclockSeconds() - wall_time;
       hypre_printf("Proc = %d    Coarsen 2nd pass = %f\n",
-            my_id, wall_time);
+                   my_id, wall_time);
    }
 
    /* third pass, check boundary fine points for coarse neighbors */
 
    if (coarsen_type == 3 || coarsen_type == 4)
    {
-      if (debug_flag == 3) wall_time = time_getWallclockSeconds();
+      if (debug_flag == 3) { wall_time = time_getWallclockSeconds(); }
 
       CF_marker_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_offd, HYPRE_MEMORY_HOST);
       int_buf_data = hypre_CTAlloc(HYPRE_Int,  hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
-            HYPRE_MEMORY_HOST);
+                                   HYPRE_MEMORY_HOST);
 
       /*------------------------------------------------
        * Exchange boundary data for CF_marker
@@ -1630,51 +1680,59 @@ hypre_BoomerAMGCoarsenRuge( hypre_ParCSRMatrix    *S,
       for (i = 0; i < num_sends; i++)
       {
          start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
             int_buf_data[index++]
-               = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+               = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
       }
 
       if (num_procs > 1)
       {
          comm_handle = hypre_ParCSRCommHandleCreate(11, comm_pkg, int_buf_data,
-               CF_marker_offd);
+                                                    CF_marker_offd);
 
          hypre_ParCSRCommHandleDestroy(comm_handle);
       }
 
       ci_array = hypre_CTAlloc(HYPRE_Int, num_cols_offd, HYPRE_MEMORY_HOST);
-      for (i=0; i < num_cols_offd; i++)
+      for (i = 0; i < num_cols_offd; i++)
+      {
          ci_array[i] = -1;
+      }
    }
 
    if (coarsen_type > 1 && coarsen_type < 5)
    {
-      for (i=0; i < num_variables; i++)
+      for (i = 0; i < num_variables; i++)
+      {
          graph_array[i] = -1;
-      for (i=0; i < num_cols_offd; i++)
+      }
+      for (i = 0; i < num_cols_offd; i++)
       {
-         if (ci_tilde_mark != i) ci_tilde = -1;
-         if (ci_tilde_offd_mark != i) ci_tilde_offd = -1;
+         if (ci_tilde_mark != i) { ci_tilde = -1; }
+         if (ci_tilde_offd_mark != i) { ci_tilde_offd = -1; }
          if (CF_marker_offd[i] == -1)
          {
-            for (ji = S_ext_i[i]; ji < S_ext_i[i+1]; ji++)
+            for (ji = S_ext_i[i]; ji < S_ext_i[i + 1]; ji++)
             {
                big_k = S_ext_j[ji];
                if (big_k > col_0 && big_k < col_n)
                {
                   j = (HYPRE_Int)(big_k - first_col);
                   if (CF_marker[j] > 0)
+                  {
                      graph_array[j] = i;
+                  }
                }
                else
                {
-                  jj = hypre_BigBinarySearch(col_map_offd,big_k,num_cols_offd);
+                  jj = hypre_BigBinarySearch(col_map_offd, big_k, num_cols_offd);
                   if (jj != -1 && CF_marker_offd[jj] > 0)
+                  {
                      ci_array[jj] = i;
+                  }
                }
             }
-            for (ji = S_ext_i[i]; ji < S_ext_i[i+1]; ji++)
+            for (ji = S_ext_i[i]; ji < S_ext_i[i + 1]; ji++)
             {
                big_k = S_ext_j[ji];
                if (big_k > col_0 && big_k < col_n)
@@ -1683,7 +1741,7 @@ hypre_BoomerAMGCoarsenRuge( hypre_ParCSRMatrix    *S,
                   if ( CF_marker[j] == -1)
                   {
                      set_empty = 1;
-                     for (jj = S_i[j]; jj < S_i[j+1]; jj++)
+                     for (jj = S_i[j]; jj < S_i[j + 1]; jj++)
                      {
                         index = S_j[jj];
                         if (graph_array[index] == i)
@@ -1692,7 +1750,7 @@ hypre_BoomerAMGCoarsenRuge( hypre_ParCSRMatrix    *S,
                            break;
                         }
                      }
-                     for (jj = S_offd_i[j]; jj < S_offd_i[j+1]; jj++)
+                     for (jj = S_offd_i[j]; jj < S_offd_i[j + 1]; jj++)
                      {
                         index = S_offd_j[jj];
                         if (ci_array[index] == i)
@@ -1733,16 +1791,16 @@ hypre_BoomerAMGCoarsenRuge( hypre_ParCSRMatrix    *S,
                }
                else
                {
-                  jm = hypre_BigBinarySearch(col_map_offd,big_k,num_cols_offd);
+                  jm = hypre_BigBinarySearch(col_map_offd, big_k, num_cols_offd);
                   if (jm != -1 && CF_marker_offd[jm] == -1)
                   {
                      set_empty = 1;
-                     for (jj = S_ext_i[jm]; jj < S_ext_i[jm+1]; jj++)
+                     for (jj = S_ext_i[jm]; jj < S_ext_i[jm + 1]; jj++)
                      {
                         big_k = S_ext_j[jj];
                         if (big_k > col_0 && big_k < col_n)
                         {
-                           if (graph_array[(HYPRE_Int)(big_k-first_col)] == i)
+                           if (graph_array[(HYPRE_Int)(big_k - first_col)] == i)
                            {
                               set_empty = 0;
                               break;
@@ -1750,7 +1808,7 @@ hypre_BoomerAMGCoarsenRuge( hypre_ParCSRMatrix    *S,
                         }
                         else
                         {
-                           jk = hypre_BigBinarySearch(col_map_offd,big_k,num_cols_offd);
+                           jk = hypre_BigBinarySearch(col_map_offd, big_k, num_cols_offd);
                            if (jk != -1)
                            {
                               if (ci_array[jk] == i)
@@ -1800,7 +1858,7 @@ hypre_BoomerAMGCoarsenRuge( hypre_ParCSRMatrix    *S,
       if (num_procs > 1)
       {
          comm_handle = hypre_ParCSRCommHandleCreate(12, comm_pkg, CF_marker_offd,
-               int_buf_data);
+                                                    int_buf_data);
 
          hypre_ParCSRCommHandleDestroy(comm_handle);
       }
@@ -1814,15 +1872,15 @@ hypre_BoomerAMGCoarsenRuge( hypre_ParCSRMatrix    *S,
          for (i = 0; i < num_sends; i++)
          {
             start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-            if (hypre_ParCSRCommPkgSendProc(comm_pkg,i) > my_id)
+            if (hypre_ParCSRCommPkgSendProc(comm_pkg, i) > my_id)
             {
-               for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
-                  CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)] =
+               for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
+                  CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)] =
                      int_buf_data[index++];
             }
             else
             {
-               index += hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1) - start;
+               index += hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1) - start;
             }
          }
       }
@@ -1831,19 +1889,21 @@ hypre_BoomerAMGCoarsenRuge( hypre_ParCSRMatrix    *S,
          for (i = 0; i < num_sends; i++)
          {
             start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-            if (hypre_ParCSRCommPkgSendProc(comm_pkg,i) > my_id)
+            if (hypre_ParCSRCommPkgSendProc(comm_pkg, i) > my_id)
             {
-               for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+               for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
                {
-                  elmt = hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j);
+                  elmt = hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j);
                   if (CF_marker[elmt] != 1)
+                  {
                      CF_marker[elmt] = int_buf_data[index];
+                  }
                   index++;
                }
             }
             else
             {
-               index += hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1) - start;
+               index += hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1) - start;
             }
          }
       }
@@ -1852,13 +1912,13 @@ hypre_BoomerAMGCoarsenRuge( hypre_ParCSRMatrix    *S,
          wall_time = time_getWallclockSeconds() - wall_time;
          if (coarsen_type == 4)
             hypre_printf("Proc = %d    Coarsen 3rd pass = %f\n",
-                  my_id, wall_time);
+                         my_id, wall_time);
          if (coarsen_type == 3)
             hypre_printf("Proc = %d    Coarsen 3rd pass = %f\n",
-                  my_id, wall_time);
+                         my_id, wall_time);
          if (coarsen_type == 2)
             hypre_printf("Proc = %d    Coarsen 2nd pass = %f\n",
-                  my_id, wall_time);
+                         my_id, wall_time);
       }
    }
    if (coarsen_type == 5)
@@ -1867,64 +1927,72 @@ hypre_BoomerAMGCoarsenRuge( hypre_ParCSRMatrix    *S,
        * Exchange boundary data for CF_marker
        *------------------------------------------------*/
 
-      if (debug_flag == 3) wall_time = time_getWallclockSeconds();
+      if (debug_flag == 3) { wall_time = time_getWallclockSeconds(); }
 
       CF_marker_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_offd, HYPRE_MEMORY_HOST);
       int_buf_data = hypre_CTAlloc(HYPRE_Int,  hypre_ParCSRCommPkgSendMapStart(comm_pkg,
-               num_sends), HYPRE_MEMORY_HOST);
+                                                                               num_sends), HYPRE_MEMORY_HOST);
 
       index = 0;
       for (i = 0; i < num_sends; i++)
       {
          start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
             int_buf_data[index++]
-               = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+               = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
       }
 
       if (num_procs > 1)
       {
          comm_handle = hypre_ParCSRCommHandleCreate(11, comm_pkg, int_buf_data,
-               CF_marker_offd);
+                                                    CF_marker_offd);
 
          hypre_ParCSRCommHandleDestroy(comm_handle);
       }
 
       ci_array = hypre_CTAlloc(HYPRE_Int, num_cols_offd, HYPRE_MEMORY_HOST);
-      for (i=0; i < num_cols_offd; i++)
+      for (i = 0; i < num_cols_offd; i++)
+      {
          ci_array[i] = -1;
-      for (i=0; i < num_variables; i++)
+      }
+      for (i = 0; i < num_variables; i++)
+      {
          graph_array[i] = -1;
+      }
 
-      for (i=0; i < num_variables; i++)
+      for (i = 0; i < num_variables; i++)
       {
-         if (CF_marker[i] == -1 && (S_offd_i[i+1]-S_offd_i[i]) > 0)
+         if (CF_marker[i] == -1 && (S_offd_i[i + 1] - S_offd_i[i]) > 0)
          {
             break_var = 1;
-            for (ji = S_i[i]; ji < S_i[i+1]; ji++)
+            for (ji = S_i[i]; ji < S_i[i + 1]; ji++)
             {
                j = S_j[ji];
                if (CF_marker[j] > 0)
+               {
                   graph_array[j] = i;
+               }
             }
-            for (ji = S_offd_i[i]; ji < S_offd_i[i+1]; ji++)
+            for (ji = S_offd_i[i]; ji < S_offd_i[i + 1]; ji++)
             {
                j = S_offd_j[ji];
                if (CF_marker_offd[j] > 0)
+               {
                   ci_array[j] = i;
+               }
             }
-            for (ji = S_offd_i[i]; ji < S_offd_i[i+1]; ji++)
+            for (ji = S_offd_i[i]; ji < S_offd_i[i + 1]; ji++)
             {
                j = S_offd_j[ji];
                if (CF_marker_offd[j] == -1)
                {
                   set_empty = 1;
-                  for (jj = S_ext_i[j]; jj < S_ext_i[j+1]; jj++)
+                  for (jj = S_ext_i[j]; jj < S_ext_i[j + 1]; jj++)
                   {
                      big_k = S_ext_j[jj];
                      if (big_k > col_0 && big_k < col_n) /* index interior */
                      {
-                        if (graph_array[(HYPRE_Int)(big_k-first_col)] == i)
+                        if (graph_array[(HYPRE_Int)(big_k - first_col)] == i)
                         {
                            set_empty = 0;
                            break;
@@ -1932,7 +2000,7 @@ hypre_BoomerAMGCoarsenRuge( hypre_ParCSRMatrix    *S,
                      }
                      else
                      {
-                        jk = hypre_BigBinarySearch(col_map_offd,big_k,num_cols_offd);
+                        jk = hypre_BigBinarySearch(col_map_offd, big_k, num_cols_offd);
                         if (jk != -1)
                         {
                            if (ci_array[jk] == i)
@@ -1966,10 +2034,10 @@ hypre_BoomerAMGCoarsenRuge( hypre_ParCSRMatrix    *S,
       {
          wall_time = time_getWallclockSeconds() - wall_time;
          hypre_printf("Proc = %d    Coarsen special points = %f\n",
-               my_id, wall_time);
+                      my_id, wall_time);
       }
-
    }
+
    /*---------------------------------------------------
     * Clean up and return
     *---------------------------------------------------*/
@@ -2021,7 +2089,7 @@ hypre_BoomerAMGCoarsenFalgout( hypre_ParCSRMatrix  *S,
 #define COMMON_C_PT  2
 #define Z_PT -2
 
-      /* begin HANS added */
+/* begin HANS added */
 /**************************************************************
  *
  *      Modified Independent Set Coarsening routine
@@ -2040,19 +2108,19 @@ hypre_BoomerAMGCoarsenPMISHost( hypre_ParCSRMatrix    *S,
    hypre_profile_times[HYPRE_TIMER_ID_PMIS] -= hypre_MPI_Wtime();
 #endif
 
-   MPI_Comm                  comm            = hypre_ParCSRMatrixComm(S);
-   hypre_ParCSRCommPkg      *comm_pkg        = hypre_ParCSRMatrixCommPkg(S);
-   hypre_ParCSRCommHandle   *comm_handle;
+   MPI_Comm                  comm          = hypre_ParCSRMatrixComm(S);
+   hypre_ParCSRCommPkg      *comm_pkg      = hypre_ParCSRMatrixCommPkg(S);
+   hypre_ParCSRCommHandle   *comm_handle   = NULL;
 
-   hypre_CSRMatrix          *S_diag          = hypre_ParCSRMatrixDiag(S);
-   HYPRE_Int                *S_diag_i        = hypre_CSRMatrixI(S_diag);
-   HYPRE_Int                *S_diag_j        = hypre_CSRMatrixJ(S_diag);
+   hypre_CSRMatrix          *S_diag        = hypre_ParCSRMatrixDiag(S);
+   HYPRE_Int                *S_diag_i      = hypre_CSRMatrixI(S_diag);
+   HYPRE_Int                *S_diag_j      = hypre_CSRMatrixJ(S_diag);
 
-   hypre_CSRMatrix          *S_offd          = hypre_ParCSRMatrixOffd(S);
-   HYPRE_Int                *S_offd_i        = hypre_CSRMatrixI(S_offd);
-   HYPRE_Int                *S_offd_j;
+   hypre_CSRMatrix          *S_offd        = hypre_ParCSRMatrixOffd(S);
+   HYPRE_Int                *S_offd_i      = hypre_CSRMatrixI(S_offd);
+   HYPRE_Int                *S_offd_j      = NULL;
 
-   HYPRE_Int                 num_variables   = hypre_CSRMatrixNumRows(S_diag);
+   HYPRE_Int                 num_variables = hypre_CSRMatrixNumRows(S_diag);
    HYPRE_Int                 num_cols_offd = 0;
 
    /* hypre_CSRMatrix       *S_ext;
@@ -2093,10 +2161,10 @@ hypre_BoomerAMGCoarsenPMISHost( hypre_ParCSRMatrix    *S,
 
    /*******************************************************************************
      BEFORE THE INDEPENDENT SET COARSENING LOOP:
-measure_array: calculate the measures, and communicate them
-(this array contains measures for both local and external nodes)
-CF_marker, CF_marker_offd: initialize CF_marker
-(separate arrays for local and external; 0=unassigned, negative=F point, positive=C point)
+   measure_array: calculate the measures, and communicate them
+   (this array contains measures for both local and external nodes)
+   CF_marker, CF_marker_offd: initialize CF_marker
+   (separate arrays for local and external; 0=unassigned, negative=F point, positive=C point)
     ******************************************************************************/
 
    /*--------------------------------------------------------------
@@ -2135,8 +2203,10 @@ CF_marker, CF_marker_offd: initialize CF_marker
 
    num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
 
-   int_buf_data = hypre_CTAlloc(HYPRE_Int,  hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends), HYPRE_MEMORY_HOST);
-   buf_data     = hypre_CTAlloc(HYPRE_Real, hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends), HYPRE_MEMORY_HOST);
+   int_buf_data = hypre_CTAlloc(HYPRE_Int,  hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                                HYPRE_MEMORY_HOST);
+   buf_data     = hypre_CTAlloc(HYPRE_Real, hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                                HYPRE_MEMORY_HOST);
 
    num_cols_offd = hypre_CSRMatrixNumCols(S_offd);
 
@@ -2162,16 +2232,17 @@ CF_marker, CF_marker_offd: initialize CF_marker
 
    /* first calculate the local part of the sums for the external nodes */
 #ifdef HYPRE_USING_OPENMP
-   HYPRE_Int *measure_array_temp = hypre_CTAlloc(HYPRE_Int,  num_variables + num_cols_offd, HYPRE_MEMORY_HOST);
+   HYPRE_Int *measure_array_temp = hypre_CTAlloc(HYPRE_Int,  num_variables + num_cols_offd,
+                                                 HYPRE_MEMORY_HOST);
 
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
    for (i = 0; i < S_offd_i[num_variables]; i++)
    {
-#pragma omp atomic
+      #pragma omp atomic
       measure_array_temp[num_variables + S_offd_j[i]]++;
    }
 
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
    for (i = 0; i < num_cols_offd; i++)
    {
       measure_array[i + num_variables] = measure_array_temp[i + num_variables];
@@ -2191,14 +2262,14 @@ CF_marker, CF_marker_offd: initialize CF_marker
 
    /* calculate the local part for the local nodes */
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
    for (i = 0; i < S_diag_i[num_variables]; i++)
    {
-#pragma omp atomic
+      #pragma omp atomic
       measure_array_temp[S_diag_j[i]]++;
    }
 
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
    for (i = 0; i < num_variables; i++)
    {
       measure_array[i] = measure_array_temp[i];
@@ -2223,9 +2294,9 @@ CF_marker, CF_marker_offd: initialize CF_marker
    for (i = 0; i < num_sends; i++)
    {
       start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
       {
-         measure_array[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)] += buf_data[index++];
+         measure_array[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)] += buf_data[index++];
       }
    }
 
@@ -2284,15 +2355,15 @@ CF_marker, CF_marker_offd: initialize CF_marker
       cnt = 0;
       for (i = 0; i < num_variables; i++)
       {
-         if ( CF_marker[i] != SF_PT )
+         if (CF_marker[i] != SF_PT)
          {
-            if ( S_offd_i[i+1] - S_offd_i[i] > 0 || CF_marker[i] == -1 )
+            if (S_offd_i[i + 1] - S_offd_i[i] > 0 || CF_marker[i] == -1)
             {
                CF_marker[i] = 0;
             }
-            if ( CF_marker[i] == Z_PT)
+            if (CF_marker[i] == Z_PT)
             {
-               if ( measure_array[i] >= 1.0 || S_diag_i[i+1] - S_diag_i[i] > 0 )
+               if (measure_array[i] >= 1.0 || S_diag_i[i + 1] - S_diag_i[i] > 0)
                {
                   CF_marker[i] = 0;
                   graph_array[cnt++] = i;
@@ -2319,7 +2390,7 @@ CF_marker, CF_marker_offd: initialize CF_marker
       for (i = 0; i < num_variables; i++)
       {
          CF_marker[i] = 0;
-         nnzrow = (S_diag_i[i+1] - S_diag_i[i]) + (S_offd_i[i+1] - S_offd_i[i]);
+         nnzrow = (S_diag_i[i + 1] - S_diag_i[i]) + (S_offd_i[i + 1] - S_offd_i[i]);
          if (nnzrow == 0)
          {
             CF_marker[i] = SF_PT; /* an isolated fine grid */
@@ -2361,9 +2432,9 @@ CF_marker, CF_marker_offd: initialize CF_marker
    for (i = 0; i < num_sends; i++)
    {
       start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
       {
-         jrow = hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j);
+         jrow = hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j);
          buf_data[index++] = measure_array[jrow];
       }
    }
@@ -2400,7 +2471,7 @@ CF_marker, CF_marker_offd: initialize CF_marker
       big_graph_size = (HYPRE_BigInt) graph_size;
 
       /* stop the coarsening if nothing left to be coarsened */
-      hypre_MPI_Allreduce(&big_graph_size, &global_graph_size, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM,comm);
+      hypre_MPI_Allreduce(&big_graph_size, &global_graph_size, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
 
       /* if (my_id == 0) { hypre_printf("graph size %b\n", global_graph_size); } */
 
@@ -2428,7 +2499,7 @@ CF_marker, CF_marker_offd: initialize CF_marker
             */
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(ig, i) HYPRE_SMP_SCHEDULE
+         #pragma omp parallel for private(ig, i) HYPRE_SMP_SCHEDULE
 #endif
          for (ig = 0; ig < graph_size; ig++)
          {
@@ -2440,12 +2511,12 @@ CF_marker, CF_marker_offd: initialize CF_marker
          }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(ig, i) HYPRE_SMP_SCHEDULE
+         #pragma omp parallel for private(ig, i) HYPRE_SMP_SCHEDULE
 #endif
          for (ig = 0; ig < graph_offd_size; ig++)
          {
             i = graph_array_offd[ig];
-            if (measure_array[i+num_variables] > 1)
+            if (measure_array[i + num_variables] > 1)
             {
                CF_marker_offd[i] = 1;
             }
@@ -2455,7 +2526,7 @@ CF_marker, CF_marker_offd: initialize CF_marker
           * Remove nodes from the initial independent set
           *-------------------------------------------------------*/
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(ig, i, jS, j, jj) HYPRE_SMP_SCHEDULE
+         #pragma omp parallel for private(ig, i, jS, j, jj) HYPRE_SMP_SCHEDULE
 #endif
          for (ig = 0; ig < graph_size; ig++)
          {
@@ -2464,7 +2535,7 @@ CF_marker, CF_marker_offd: initialize CF_marker
             if (measure_array[i] > 1)
             {
                /* for each local neighbor j of i */
-               for (jS = S_diag_i[i]; jS < S_diag_i[i+1]; jS++)
+               for (jS = S_diag_i[i]; jS < S_diag_i[i + 1]; jS++)
                {
                   j = S_diag_j[jS];
                   if (measure_array[j] > 1)
@@ -2481,7 +2552,7 @@ CF_marker, CF_marker_offd: initialize CF_marker
                }
 
                /* for each offd neighbor j of i */
-               for (jS = S_offd_i[i]; jS < S_offd_i[i+1]; jS++)
+               for (jS = S_offd_i[i]; jS < S_offd_i[i + 1]; jS++)
                {
                   jj = S_offd_j[jS];
                   j = num_variables + jj;
@@ -2513,9 +2584,9 @@ CF_marker, CF_marker_offd: initialize CF_marker
          for (i = 0; i < num_sends; i++)
          {
             start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-            for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+            for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
             {
-               elmt = hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j);
+               elmt = hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j);
                if (!int_buf_data[index] && CF_marker[elmt] > 0)
                {
                   CF_marker[elmt] = 0;
@@ -2541,7 +2612,7 @@ CF_marker, CF_marker_offd: initialize CF_marker
        * Set C-pts and F-pts.
        *------------------------------------------------*/
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(ig, i, jS, j) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(ig, i, jS, j) HYPRE_SMP_SCHEDULE
 #endif
       for (ig = 0; ig < graph_size; ig++)
       {
@@ -2555,7 +2626,7 @@ CF_marker, CF_marker_offd: initialize CF_marker
 
          if (measure_array[i] < 1)
          {
-            CF_marker[i]= F_PT;
+            CF_marker[i] = F_PT;
          }
 
          /*---------------------------------------------
@@ -2576,7 +2647,7 @@ CF_marker, CF_marker_offd: initialize CF_marker
          else
          {
             /* first the local part */
-            for (jS = S_diag_i[i]; jS < S_diag_i[i+1]; jS++)
+            for (jS = S_diag_i[i]; jS < S_diag_i[i + 1]; jS++)
             {
                /* j is the column number, or the local number of the point influencing i */
                j = S_diag_j[jS];
@@ -2586,7 +2657,7 @@ CF_marker, CF_marker_offd: initialize CF_marker
                }
             }
             /* now the external part */
-            for (jS = S_offd_i[i]; jS < S_offd_i[i+1]; jS++)
+            for (jS = S_offd_i[i]; jS < S_offd_i[i + 1]; jS++)
             {
                j = S_offd_j[jS];
                if (CF_marker_offd[j] > 0) /* j is a C-point */
@@ -2607,9 +2678,9 @@ CF_marker, CF_marker_offd: initialize CF_marker
       for (i = 0; i < num_sends; i++)
       {
          start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
          {
-            int_buf_data[index++] = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+            int_buf_data[index++] = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
          }
       }
 
@@ -2624,10 +2695,10 @@ CF_marker, CF_marker_offd: initialize CF_marker
        *------------------------------------------------*/
 
       /*HYPRE_Int prefix_sum_workspace[2*(hypre_NumThreads() + 1)];*/
-      prefix_sum_workspace = hypre_TAlloc(HYPRE_Int, 2*(hypre_NumThreads() + 1), HYPRE_MEMORY_HOST);
+      prefix_sum_workspace = hypre_TAlloc(HYPRE_Int, 2 * (hypre_NumThreads() + 1), HYPRE_MEMORY_HOST);
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel private(ig,i)
+      #pragma omp parallel private(ig,i)
 #endif
       {
          HYPRE_Int private_graph_size_cnt = 0;
@@ -2669,7 +2740,8 @@ CF_marker, CF_marker_offd: initialize CF_marker
             }
          }
 
-         hypre_prefix_sum_pair(&private_graph_size_cnt, &graph_size, &private_graph_offd_size_cnt, &graph_offd_size, prefix_sum_workspace);
+         hypre_prefix_sum_pair(&private_graph_size_cnt, &graph_size, &private_graph_offd_size_cnt,
+                               &graph_offd_size, prefix_sum_workspace);
 
          for (ig = ig_begin; ig < ig_end; ig++)
          {
@@ -2747,32 +2819,32 @@ hypre_BoomerAMGCoarsenPMIS( hypre_ParCSRMatrix    *S,
                             HYPRE_Int              debug_flag,
                             hypre_IntArray       **CF_marker_ptr)
 {
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    hypre_GpuProfilingPushRange("PMIS");
-#endif
-
-   HYPRE_Int ierr = 0;
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
    HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_ParCSRMatrixMemoryLocation(A) );
 
    if (exec == HYPRE_EXEC_DEVICE)
    {
-      ierr = hypre_BoomerAMGCoarsenPMISDevice( S, A, CF_init, debug_flag, CF_marker_ptr );
+      hypre_BoomerAMGCoarsenPMISDevice(S, A, CF_init, debug_flag, CF_marker_ptr);
    }
    else
 #endif
    {
-      ierr = hypre_BoomerAMGCoarsenPMISHost( S, A, CF_init, debug_flag, CF_marker_ptr );
+      hypre_BoomerAMGCoarsenPMISHost(S, A, CF_init, debug_flag, CF_marker_ptr);
    }
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    hypre_GpuProfilingPopRange();
-#endif
 
-   return ierr;
+   return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_BoomerAMGCoarsenHMIS
+ *
+ * Ruge coarsening followed by CLJP coarsening
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_BoomerAMGCoarsenHMIS( hypre_ParCSRMatrix    *S,
                             hypre_ParCSRMatrix    *A,
@@ -2781,16 +2853,62 @@ hypre_BoomerAMGCoarsenHMIS( hypre_ParCSRMatrix    *S,
                             HYPRE_Int              debug_flag,
                             hypre_IntArray       **CF_marker_ptr)
 {
-   HYPRE_Int              ierr = 0;
+   hypre_ParCSRMatrix    *h_A, *h_S;
+   hypre_IntArray        *CF_marker = NULL;
+   HYPRE_MemoryLocation   CF_memory_location;
 
-   /*-------------------------------------------------------
-    * Perform Ruge coarsening followed by CLJP coarsening
-    *-------------------------------------------------------*/
+   /* Clone matrices on the host if needed */
+   h_S = hypre_GetActualMemLocation(hypre_ParCSRMatrixMemoryLocation(S)) == hypre_MEMORY_DEVICE ?
+         hypre_ParCSRMatrixClone_v2(S, 0, HYPRE_MEMORY_HOST) : S;
 
-   ierr += hypre_BoomerAMGCoarsenRuge (S, A, measure_type, 10, cut_factor,
-                                       debug_flag, CF_marker_ptr);
+   h_A = hypre_GetActualMemLocation(hypre_ParCSRMatrixMemoryLocation(A)) == hypre_MEMORY_DEVICE ?
+         hypre_ParCSRMatrixClone_v2(A, 0, HYPRE_MEMORY_HOST) : A;
+
+   /* Clone/Create CF_marker on the host if needed */
+   if (*CF_marker_ptr)
+   {
+      CF_memory_location = hypre_IntArrayMemoryLocation(*CF_marker_ptr);
+      CF_marker = hypre_GetActualMemLocation(CF_memory_location) == hypre_MEMORY_DEVICE ?
+                  hypre_IntArrayCloneDeep_v2(*CF_marker_ptr, HYPRE_MEMORY_HOST) : *CF_marker_ptr;
+   }
+   else
+   {
+      CF_memory_location = HYPRE_MEMORY_HOST;
+      CF_marker = hypre_IntArrayCreate(hypre_ParCSRMatrixNumRows(A));
+      hypre_IntArrayInitialize_v2(CF_marker, CF_memory_location);
+   }
 
-   ierr += hypre_BoomerAMGCoarsenPMISHost (S, A, 1, debug_flag, CF_marker_ptr);
+   /* Perform Ruge coarsening on the host */
+   hypre_BoomerAMGCoarsenRuge(h_S, h_A, measure_type, 10, cut_factor, debug_flag, &CF_marker);
 
-   return (ierr);
+   /* Free cloned matrices on the host */
+   if (h_S != S) { hypre_ParCSRMatrixDestroy(h_S); }
+   if (h_A != A) { hypre_ParCSRMatrixDestroy(h_A); }
+
+   /* Move CF_marker to device if needed */
+#if defined(HYPRE_USING_GPU)
+   if (hypre_GetExecPolicy1(hypre_ParCSRMatrixMemoryLocation(A)) == HYPRE_EXEC_DEVICE)
+   {
+      if (*CF_marker_ptr && (*CF_marker_ptr != CF_marker))
+      {
+         hypre_IntArrayCopy(CF_marker, *CF_marker_ptr);
+         hypre_IntArrayDestroy(CF_marker);
+         CF_marker = NULL;
+      }
+      else if (*CF_marker_ptr == NULL)
+      {
+         *CF_marker_ptr = hypre_IntArrayCloneDeep_v2(CF_marker, HYPRE_MEMORY_DEVICE);
+         hypre_IntArrayDestroy(CF_marker);
+      }
+   }
+   else
+#endif
+   {
+      *CF_marker_ptr = CF_marker;
+   }
+
+   /* Perform PMIS coarsening on the host or device */
+   hypre_BoomerAMGCoarsenPMIS(S, A, 1, debug_flag, CF_marker_ptr);
+
+   return hypre_error_flag;
 }
diff --git a/external/hypre/src/parcsr_ls/par_coarsen_device.c b/external/hypre/src/parcsr_ls/par_coarsen_device.c
index 38764b61..daadfb79 100644
--- a/external/hypre/src/parcsr_ls/par_coarsen_device.c
+++ b/external/hypre/src/parcsr_ls/par_coarsen_device.c
@@ -1,10 +1,11 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
  ******************************************************************************/
 
+#include "_hypre_onedpl.hpp"
 #include "_hypre_parcsr_ls.h"
 #include "_hypre_utilities.hpp"
 
@@ -14,11 +15,16 @@
 #define COMMON_C_PT  2
 #define Z_PT -2
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
 
-HYPRE_Int hypre_PMISCoarseningInitDevice( hypre_ParCSRMatrix *S, hypre_ParCSRCommPkg *comm_pkg, HYPRE_Int CF_init, HYPRE_Real *measure_diag, HYPRE_Real *measure_offd, HYPRE_Real *real_send_buf, HYPRE_Int *graph_diag_size, HYPRE_Int *graph_diag, HYPRE_Int *CF_marker_diag);
+HYPRE_Int hypre_PMISCoarseningInitDevice( hypre_ParCSRMatrix *S, hypre_ParCSRCommPkg *comm_pkg,
+                                          HYPRE_Int CF_init, HYPRE_Real *measure_diag, HYPRE_Real *measure_offd, HYPRE_Real *real_send_buf,
+                                          HYPRE_Int *graph_diag_size, HYPRE_Int *graph_diag, HYPRE_Int *CF_marker_diag);
 
-HYPRE_Int hypre_PMISCoarseningUpdateCFDevice( hypre_ParCSRMatrix *S, HYPRE_Real *measure_diag, HYPRE_Real *measure_offd, HYPRE_Int graph_diag_size, HYPRE_Int *graph_diag, HYPRE_Int *CF_marker_diag, HYPRE_Int *CF_marker_offd, hypre_ParCSRCommPkg *comm_pkg, HYPRE_Real *real_send_buf, HYPRE_Int *int_send_buf);
+HYPRE_Int hypre_PMISCoarseningUpdateCFDevice( hypre_ParCSRMatrix *S, HYPRE_Real *measure_diag,
+                                              HYPRE_Real *measure_offd, HYPRE_Int graph_diag_size, HYPRE_Int *graph_diag,
+                                              HYPRE_Int *CF_marker_diag, HYPRE_Int *CF_marker_offd, hypre_ParCSRCommPkg *comm_pkg,
+                                              HYPRE_Real *real_send_buf, HYPRE_Int *int_send_buf);
 
 HYPRE_Int
 hypre_BoomerAMGCoarsenPMISDevice( hypre_ParCSRMatrix    *S,
@@ -27,6 +33,9 @@ hypre_BoomerAMGCoarsenPMISDevice( hypre_ParCSRMatrix    *S,
                                   HYPRE_Int              debug_flag,
                                   hypre_IntArray       **CF_marker_ptr )
 {
+   HYPRE_UNUSED_VAR(debug_flag);
+   HYPRE_UNUSED_VAR(CF_init);
+
    MPI_Comm                  comm            = hypre_ParCSRMatrixComm(S);
    hypre_ParCSRCommPkg      *comm_pkg        = hypre_ParCSRMatrixCommPkg(S);
    hypre_ParCSRCommHandle   *comm_handle;
@@ -115,11 +124,13 @@ hypre_BoomerAMGCoarsenPMISDevice( hypre_ParCSRMatrix    *S,
       aug_rand = hypre_HandleUseGpuRand(hypre_handle()) ? 1 : 2;
    }
 
-   hypre_GetGlobalMeasureDevice(S, comm_pkg, CF_init, aug_rand, measure_diag, measure_offd, (HYPRE_Real *) send_buf);
+   hypre_GetGlobalMeasureDevice(S, comm_pkg, CF_init, aug_rand, measure_diag, measure_offd,
+                                (HYPRE_Real *) send_buf);
 
    /* initialize CF marker, graph arrays and measure_diag, measure_offd is sync'ed
     * Note: CF_marker_offd is not sync'ed */
-   hypre_PMISCoarseningInitDevice(S, comm_pkg, CF_init, measure_diag, measure_offd, (HYPRE_Real *) send_buf,
+   hypre_PMISCoarseningInitDevice(S, comm_pkg, CF_init, measure_diag, measure_offd,
+                                  (HYPRE_Real *) send_buf,
                                   &graph_diag_size, graph_diag, CF_marker_diag);
 
    while (1)
@@ -146,12 +157,28 @@ hypre_BoomerAMGCoarsenPMISDevice( hypre_ParCSRMatrix    *S,
                                        CF_marker_diag, CF_marker_offd, comm_pkg, (HYPRE_Int *) send_buf);
 
          /* sync CF_marker_offd: so it has correct 1/0 now */
+#if defined(HYPRE_USING_SYCL)
+         hypreSycl_gather( hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg),
+                           hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg) +
+                           hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                           CF_marker_diag,
+                           (HYPRE_Int *) send_buf );
+#else
          HYPRE_THRUST_CALL( gather,
                             hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg),
                             hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg) +
                             hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
                             CF_marker_diag,
                             (HYPRE_Int *) send_buf );
+#endif
+
+#if defined(HYPRE_USING_THRUST_NOSYNC)
+         /* RL: make sure send_buf is ready before issuing GPU-GPU MPI */
+         if (hypre_GetGpuAwareMPI())
+         {
+            hypre_ForceSyncComputeStream();
+         }
+#endif
 
          comm_handle = hypre_ParCSRCommHandleCreate_v2(11, comm_pkg,
                                                        HYPRE_MEMORY_DEVICE, (HYPRE_Int *) send_buf,
@@ -170,6 +197,17 @@ hypre_BoomerAMGCoarsenPMISDevice( hypre_ParCSRMatrix    *S,
                                          (HYPRE_Int *)send_buf);
 
       /* Update graph_diag. Remove the nodes with CF_marker_diag != 0 */
+#if defined(HYPRE_USING_SYCL)
+      hypreSycl_gather( graph_diag,
+                        graph_diag + graph_diag_size,
+                        CF_marker_diag,
+                        diag_iwork );
+
+      HYPRE_Int *new_end = hypreSycl_remove_if( graph_diag,
+                                                graph_diag + graph_diag_size,
+                                                diag_iwork,
+      [] (const auto & x) {return x;} );
+#else
       HYPRE_THRUST_CALL( gather,
                          graph_diag,
                          graph_diag + graph_diag_size,
@@ -181,6 +219,7 @@ hypre_BoomerAMGCoarsenPMISDevice( hypre_ParCSRMatrix    *S,
                                               graph_diag + graph_diag_size,
                                               diag_iwork,
                                               thrust::identity<HYPRE_Int>() );
+#endif
 
       graph_diag_size = new_end - graph_diag;
    }
@@ -212,6 +251,8 @@ hypre_GetGlobalMeasureDevice( hypre_ParCSRMatrix  *S,
                               HYPRE_Real          *measure_offd,
                               HYPRE_Real          *real_send_buf )
 {
+   HYPRE_UNUSED_VAR(CF_init);
+
    hypre_ParCSRCommHandle   *comm_handle;
    HYPRE_Int                 num_sends       = hypre_ParCSRCommPkgNumSends(comm_pkg);
    hypre_CSRMatrix          *S_diag          = hypre_ParCSRMatrixDiag(S);
@@ -221,6 +262,12 @@ hypre_GetGlobalMeasureDevice( hypre_ParCSRMatrix  *S,
    /* compute local column nnz of the offd part */
    hypre_CSRMatrixColNNzRealDevice(S_offd, measure_offd);
 
+   if (hypre_GetGpuAwareMPI())
+   {
+      /* RL: make sure measure_offd is ready before issuing GPU-GPU MPI */
+      hypre_ForceSyncComputeStream();
+   }
+
    /* send local column nnz of the offd part to neighbors */
    comm_handle = hypre_ParCSRCommHandleCreate_v2(2, comm_pkg, HYPRE_MEMORY_DEVICE, measure_offd,
                                                  HYPRE_MEMORY_DEVICE, real_send_buf);
@@ -250,15 +297,16 @@ hypre_GetGlobalMeasureDevice( hypre_ParCSRMatrix  *S,
 }
 
 __global__ void
-hypreCUDAKernel_PMISCoarseningInit(HYPRE_Int   nrows,
-                                   HYPRE_Int   CF_init,
-                                   HYPRE_Int  *S_diag_i,
-                                   HYPRE_Int  *S_offd_i,
-                                   HYPRE_Real *measure_diag,
-                                   HYPRE_Int  *CF_marker_diag)
+hypreGPUKernel_PMISCoarseningInit(hypre_DeviceItem &item,
+                                  HYPRE_Int   nrows,
+                                  HYPRE_Int   CF_init,
+                                  HYPRE_Int  *S_diag_i,
+                                  HYPRE_Int  *S_offd_i,
+                                  HYPRE_Real *measure_diag,
+                                  HYPRE_Int  *CF_marker_diag)
 {
    /* global_thread_id */
-   const HYPRE_Int i = hypre_cuda_get_grid_thread_id<1,1>();
+   const HYPRE_Int i = hypre_gpu_get_grid_thread_id<1, 1>(item);
 
    if (i >= nrows)
    {
@@ -269,13 +317,37 @@ hypreCUDAKernel_PMISCoarseningInit(HYPRE_Int   nrows,
 
    if (CF_init == 1)
    {
-      // TODO
-      hypre_device_assert(0);
+      CF_marker_i = read_only_load(&CF_marker_diag[i]);
+
+      if (CF_marker_i != SF_PT)
+      {
+         if (read_only_load(&S_offd_i[i + 1]) - read_only_load(&S_offd_i[i]) > 0 ||
+             CF_marker_i == F_PT)
+         {
+            CF_marker_i = 0;
+         }
+         if (CF_marker_i == Z_PT)
+         {
+            if (measure_diag[i] > 1.0 ||
+                read_only_load(&S_diag_i[i + 1]) - read_only_load(&S_diag_i[i]))
+            {
+               CF_marker_i = 0;
+            }
+            else
+            {
+               CF_marker_i = SF_PT;
+            }
+         }
+      }
+      else
+      {
+         measure_diag[i] = 0.0;
+      }
    }
    else
    {
-      if ( read_only_load(&S_diag_i[i+1]) - read_only_load(&S_diag_i[i]) == 0 &&
-           read_only_load(&S_offd_i[i+1]) - read_only_load(&S_offd_i[i]) == 0 )
+      if ( read_only_load(&S_diag_i[i + 1]) - read_only_load(&S_diag_i[i]) == 0 &&
+           read_only_load(&S_offd_i[i + 1]) - read_only_load(&S_offd_i[i]) == 0 )
       {
          CF_marker_i = (CF_init == 3 || CF_init == 4) ? C_PT : SF_PT;
          measure_diag[i] = 0.0;
@@ -316,24 +388,39 @@ hypre_PMISCoarseningInitDevice( hypre_ParCSRMatrix  *S,               /* in */
    HYPRE_Int        num_rows_diag = hypre_CSRMatrixNumRows(S_diag);
    HYPRE_Int        num_sends     = hypre_ParCSRCommPkgNumSends(comm_pkg);
 
-   dim3 bDim, gDim;
-   bDim = hypre_GetDefaultCUDABlockDimension();
-   gDim = hypre_GetDefaultCUDAGridDimension(num_rows_diag, "thread", bDim);
+   dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+   dim3 gDim = hypre_GetDefaultDeviceGridDimension(num_rows_diag, "thread", bDim);
 
    hypre_ParCSRCommHandle *comm_handle;
    HYPRE_Int *new_end;
 
    /* init CF_marker_diag and measure_diag: remove some special nodes */
-   HYPRE_CUDA_LAUNCH( hypreCUDAKernel_PMISCoarseningInit, gDim, bDim,
-                      num_rows_diag, CF_init, S_diag_i, S_offd_i, measure_diag, CF_marker_diag );
+   HYPRE_GPU_LAUNCH( hypreGPUKernel_PMISCoarseningInit, gDim, bDim,
+                     num_rows_diag, CF_init, S_diag_i, S_offd_i, measure_diag, CF_marker_diag );
 
    /* communicate for measure_offd */
+#if defined(HYPRE_USING_SYCL)
+   hypreSycl_gather( hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg),
+                     hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg) +
+                     hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                     measure_diag,
+                     real_send_buf );
+#else
    HYPRE_THRUST_CALL(gather,
                      hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg),
                      hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg) +
                      hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
                      measure_diag,
                      real_send_buf);
+#endif
+
+#if defined(HYPRE_USING_THRUST_NOSYNC)
+   /* RL: make sure real_send_buf is ready before issuing GPU-GPU MPI */
+   if (hypre_GetGpuAwareMPI())
+   {
+      hypre_ForceSyncComputeStream();
+   }
+#endif
 
    comm_handle = hypre_ParCSRCommHandleCreate_v2(1, comm_pkg,
                                                  HYPRE_MEMORY_DEVICE, real_send_buf,
@@ -342,13 +429,21 @@ hypre_PMISCoarseningInitDevice( hypre_ParCSRMatrix  *S,               /* in */
    hypre_ParCSRCommHandleDestroy(comm_handle);
 
    /* graph_diag consists points with CF_marker_diag == 0 */
-   new_end =
-   HYPRE_THRUST_CALL(remove_copy_if,
-                     thrust::make_counting_iterator(0),
-                     thrust::make_counting_iterator(num_rows_diag),
-                     CF_marker_diag,
-                     graph_diag,
-                     thrust::identity<HYPRE_Int>());
+#if defined(HYPRE_USING_SYCL)
+   oneapi::dpl::counting_iterator<HYPRE_Int> count(0);
+   new_end = hypreSycl_remove_copy_if( count,
+                                       count + num_rows_diag,
+                                       CF_marker_diag,
+                                       graph_diag,
+   [] (const auto & x) {return x;} );
+#else
+   new_end = HYPRE_THRUST_CALL( remove_copy_if,
+                                thrust::make_counting_iterator(0),
+                                thrust::make_counting_iterator(num_rows_diag),
+                                CF_marker_diag,
+                                graph_diag,
+                                thrust::identity<HYPRE_Int>());
+#endif
 
    *graph_diag_size = new_end - graph_diag;
 
@@ -356,25 +451,26 @@ hypre_PMISCoarseningInitDevice( hypre_ParCSRMatrix  *S,               /* in */
 }
 
 __global__ void
-hypreCUDAKernel_PMISCoarseningUpdateCF(HYPRE_Int   graph_diag_size,
-                                       HYPRE_Int  *graph_diag,
-                                       HYPRE_Int  *S_diag_i,
-                                       HYPRE_Int  *S_diag_j,
-                                       HYPRE_Int  *S_offd_i,
-                                       HYPRE_Int  *S_offd_j,
-                                       HYPRE_Real *measure_diag,
-                                       HYPRE_Int  *CF_marker_diag,
-                                       HYPRE_Int  *CF_marker_offd)
+hypreGPUKernel_PMISCoarseningUpdateCF(hypre_DeviceItem &item,
+                                      HYPRE_Int   graph_diag_size,
+                                      HYPRE_Int  *graph_diag,
+                                      HYPRE_Int  *S_diag_i,
+                                      HYPRE_Int  *S_diag_j,
+                                      HYPRE_Int  *S_offd_i,
+                                      HYPRE_Int  *S_offd_j,
+                                      HYPRE_Real *measure_diag,
+                                      HYPRE_Int  *CF_marker_diag,
+                                      HYPRE_Int  *CF_marker_offd)
 {
-   HYPRE_Int warp_id = hypre_cuda_get_grid_warp_id<1,1>();
+   HYPRE_Int warp_id = hypre_gpu_get_grid_warp_id<1, 1>(item);
 
    if (warp_id >= graph_diag_size)
    {
       return;
    }
 
-   HYPRE_Int lane = hypre_cuda_get_lane_id<1>();
-   HYPRE_Int row, i, marker_row, row_start, row_end;
+   HYPRE_Int lane = hypre_gpu_get_lane_id<1>(item);
+   HYPRE_Int row = 0, i = 0, marker_row, row_start, row_end;
 
    if (lane < 2)
    {
@@ -382,7 +478,7 @@ hypreCUDAKernel_PMISCoarseningUpdateCF(HYPRE_Int   graph_diag_size,
       i = read_only_load(CF_marker_diag + row);
    }
 
-   marker_row = __shfl_sync(HYPRE_WARP_FULL_MASK, i, 0);
+   marker_row = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, i, 0);
 
    if (marker_row > 0)
    {
@@ -404,7 +500,7 @@ hypreCUDAKernel_PMISCoarseningUpdateCF(HYPRE_Int   graph_diag_size,
        * Now treat the case where this node is not in the
        * independent set: loop over
        * all the points j that influence equation 'row'; if
-       * any j is a C point, then make row an F point and 
+       * any j is a C point, then make row an F point and
        * clear the measure
        *-------------------------------------------------*/
       if (lane < 2)
@@ -412,8 +508,8 @@ hypreCUDAKernel_PMISCoarseningUpdateCF(HYPRE_Int   graph_diag_size,
          i = read_only_load(S_diag_i + row + lane);
       }
 
-      row_start = __shfl_sync(HYPRE_WARP_FULL_MASK, i, 0);
-      row_end   = __shfl_sync(HYPRE_WARP_FULL_MASK, i, 1);
+      row_start = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, i, 0);
+      row_end   = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, i, 1);
 
       for (i = row_start + lane; i < row_end; i += HYPRE_WARP_SIZE)
       {
@@ -428,7 +524,7 @@ hypreCUDAKernel_PMISCoarseningUpdateCF(HYPRE_Int   graph_diag_size,
          }
       }
 
-      marker_row = warp_allreduce_min(marker_row);
+      marker_row = warp_allreduce_min(item, marker_row);
 
       if (marker_row == 0)
       {
@@ -437,8 +533,8 @@ hypreCUDAKernel_PMISCoarseningUpdateCF(HYPRE_Int   graph_diag_size,
             i = read_only_load(S_offd_i + row + lane);
          }
 
-         row_start = __shfl_sync(HYPRE_WARP_FULL_MASK, i, 0);
-         row_end   = __shfl_sync(HYPRE_WARP_FULL_MASK, i, 1);
+         row_start = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, i, 0);
+         row_end   = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, i, 1);
 
          for (i = row_start + lane; i < row_end; i += HYPRE_WARP_SIZE)
          {
@@ -452,7 +548,7 @@ hypreCUDAKernel_PMISCoarseningUpdateCF(HYPRE_Int   graph_diag_size,
             }
          }
 
-         marker_row = warp_reduce_min(marker_row);
+         marker_row = warp_reduce_min(item, marker_row);
       }
 
       if (lane == 0 && marker_row == -1)
@@ -475,6 +571,8 @@ hypre_PMISCoarseningUpdateCFDevice( hypre_ParCSRMatrix  *S,               /* in
                                     HYPRE_Real          *real_send_buf,
                                     HYPRE_Int           *int_send_buf )
 {
+   HYPRE_UNUSED_VAR(int_send_buf);
+
    hypre_CSRMatrix *S_diag    = hypre_ParCSRMatrixDiag(S);
    HYPRE_Int       *S_diag_i  = hypre_CSRMatrixI(S_diag);
    HYPRE_Int       *S_diag_j  = hypre_CSRMatrixJ(S_diag);
@@ -483,31 +581,46 @@ hypre_PMISCoarseningUpdateCFDevice( hypre_ParCSRMatrix  *S,               /* in
    HYPRE_Int       *S_offd_j  = hypre_CSRMatrixJ(S_offd);
    HYPRE_Int        num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
 
-   dim3 bDim, gDim;
-   bDim = hypre_GetDefaultCUDABlockDimension();
-   gDim = hypre_GetDefaultCUDAGridDimension(graph_diag_size, "warp", bDim);
-
-   HYPRE_CUDA_LAUNCH( hypreCUDAKernel_PMISCoarseningUpdateCF,
-                      gDim, bDim,
-                      graph_diag_size,
-                      graph_diag,
-                      S_diag_i,
-                      S_diag_j,
-                      S_offd_i,
-                      S_offd_j,
-                      measure_diag,
-                      CF_marker_diag,
-                      CF_marker_offd );
+   dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+   dim3 gDim = hypre_GetDefaultDeviceGridDimension(graph_diag_size, "warp", bDim);
+
+   HYPRE_GPU_LAUNCH( hypreGPUKernel_PMISCoarseningUpdateCF,
+                     gDim, bDim,
+                     graph_diag_size,
+                     graph_diag,
+                     S_diag_i,
+                     S_diag_j,
+                     S_offd_i,
+                     S_offd_j,
+                     measure_diag,
+                     CF_marker_diag,
+                     CF_marker_offd );
 
    hypre_ParCSRCommHandle *comm_handle;
 
    /* communicate for measure_offd */
+#if defined(HYPRE_USING_SYCL)
+   hypreSycl_gather( hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg),
+                     hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg) +
+                     hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                     measure_diag,
+                     real_send_buf );
+#else
    HYPRE_THRUST_CALL(gather,
                      hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg),
                      hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg) +
                      hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
                      measure_diag,
                      real_send_buf);
+#endif
+
+#if defined(HYPRE_USING_THRUST_NOSYNC)
+   /* RL: make sure real_send_buf is ready before issuing GPU-GPU MPI */
+   if (hypre_GetGpuAwareMPI())
+   {
+      hypre_ForceSyncComputeStream();
+   }
+#endif
 
    comm_handle = hypre_ParCSRCommHandleCreate_v2(1, comm_pkg,
                                                  HYPRE_MEMORY_DEVICE, real_send_buf,
@@ -519,11 +632,19 @@ hypre_PMISCoarseningUpdateCFDevice( hypre_ParCSRMatrix  *S,               /* in
    /* now communicate CF_marker to CF_marker_offd, to make
       sure that new external F points are known on this processor */
    HYPRE_THRUST_CALL(gather,
-                  hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg),
-                  hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg) +
-                  hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
-                  CF_marker_diag,
-                  int_send_buf);
+                     hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg),
+                     hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg) +
+                     hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                     CF_marker_diag,
+                     int_send_buf);
+
+#if defined(HYPRE_USING_THRUST_NOSYNC)
+   /* RL: make sure int_send_buf is ready before issuing GPU-GPU MPI */
+   if (hypre_GetGpuAwareMPI())
+   {
+      hypre_ForceSyncComputeStream();
+   }
+#endif
 
    comm_handle = hypre_ParCSRCommHandleCreate_v2(11, comm_pkg,
                                                  HYPRE_MEMORY_DEVICE, int_send_buf,
@@ -535,5 +656,4 @@ hypre_PMISCoarseningUpdateCFDevice( hypre_ParCSRMatrix  *S,               /* in
    return hypre_error_flag;
 }
 
-#endif // #if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-
+#endif // #if defined(HYPRE_USING_GPU)
diff --git a/external/hypre/src/parcsr_ls/par_coordinates.c b/external/hypre/src/parcsr_ls/par_coordinates.c
index e81c701d..f4896b75 100644
--- a/external/hypre/src/parcsr_ls/par_coordinates.c
+++ b/external/hypre/src/parcsr_ls/par_coordinates.c
@@ -1,29 +1,31 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
  ******************************************************************************/
 
 #include "_hypre_parcsr_ls.h"
- 
+
 /*--------------------------------------------------------------------------
- * GenerateCoordinates
+ * hypre_GenerateCoordinates
  *--------------------------------------------------------------------------*/
 
 float *
-GenerateCoordinates( MPI_Comm comm,
-		     HYPRE_BigInt      nx,
-		     HYPRE_BigInt      ny,
-		     HYPRE_BigInt      nz, 
-		     HYPRE_Int      P,
-		     HYPRE_Int      Q,
-		     HYPRE_Int      R,
-		     HYPRE_Int      p,
-		     HYPRE_Int      q,
-		     HYPRE_Int      r,
-		     HYPRE_Int      coorddim)
+hypre_GenerateCoordinates( MPI_Comm       comm,
+                           HYPRE_BigInt   nx,
+                           HYPRE_BigInt   ny,
+                           HYPRE_BigInt   nz,
+                           HYPRE_Int      P,
+                           HYPRE_Int      Q,
+                           HYPRE_Int      R,
+                           HYPRE_Int      p,
+                           HYPRE_Int      q,
+                           HYPRE_Int      r,
+                           HYPRE_Int      coorddim)
 {
+   HYPRE_UNUSED_VAR(comm);
+
    HYPRE_BigInt ix, iy, iz;
    HYPRE_Int cnt;
 
@@ -34,41 +36,43 @@ GenerateCoordinates( MPI_Comm comm,
    HYPRE_BigInt *ny_part;
    HYPRE_BigInt *nz_part;
 
-   float *coord=NULL;
+   float *coord = NULL;
 
-   if (coorddim<1 || coorddim>3) {
-     return NULL;
+   if (coorddim < 1 || coorddim > 3)
+   {
+      return NULL;
    }
 
-   hypre_GeneratePartitioning(nx,P,&nx_part);
-   hypre_GeneratePartitioning(ny,Q,&ny_part);
-   hypre_GeneratePartitioning(nz,R,&nz_part);
+   hypre_GeneratePartitioning(nx, P, &nx_part);
+   hypre_GeneratePartitioning(ny, Q, &ny_part);
+   hypre_GeneratePartitioning(nz, R, &nz_part);
 
-   nx_local = (HYPRE_Int)(nx_part[p+1] - nx_part[p]);
-   ny_local = (HYPRE_Int)(ny_part[q+1] - ny_part[q]);
-   nz_local = (HYPRE_Int)(nz_part[r+1] - nz_part[r]);
+   nx_local = (HYPRE_Int)(nx_part[p + 1] - nx_part[p]);
+   ny_local = (HYPRE_Int)(ny_part[q + 1] - ny_part[q]);
+   nz_local = (HYPRE_Int)(nz_part[r + 1] - nz_part[r]);
+
+   local_num_rows = nx_local * ny_local * nz_local;
+
+   coord = hypre_CTAlloc(float,  coorddim * local_num_rows, HYPRE_MEMORY_HOST);
 
-   local_num_rows = nx_local*ny_local*nz_local;
- 
-   coord = hypre_CTAlloc(float,  coorddim*local_num_rows, HYPRE_MEMORY_HOST);
-     
    cnt = 0;
-   for (iz = nz_part[r]; iz < nz_part[r+1]; iz++)
+   for (iz = nz_part[r]; iz < nz_part[r + 1]; iz++)
    {
-     for (iy = ny_part[q];  iy < ny_part[q+1]; iy++)
-     {
-       for (ix = nx_part[p]; ix < nx_part[p+1]; ix++)
-       {	
-	 /* set coordinates BM Oct 17, 2006 */
-	 if (coord) {
-	   if (nx>1) coord[cnt++] = ix;
-	   if (ny>1) coord[cnt++] = iy;
-	   if (nz>1) coord[cnt++] = iz;
-	 }
-       }
-     }
+      for (iy = ny_part[q];  iy < ny_part[q + 1]; iy++)
+      {
+         for (ix = nx_part[p]; ix < nx_part[p + 1]; ix++)
+         {
+            /* set coordinates BM Oct 17, 2006 */
+            if (coord)
+            {
+               if (nx > 1) { coord[cnt++] = ix; }
+               if (ny > 1) { coord[cnt++] = iy; }
+               if (nz > 1) { coord[cnt++] = iz; }
+            }
+         }
+      }
    }
-   
+
    hypre_TFree(nx_part, HYPRE_MEMORY_HOST);
    hypre_TFree(ny_part, HYPRE_MEMORY_HOST);
    hypre_TFree(nz_part, HYPRE_MEMORY_HOST);
diff --git a/external/hypre/src/parcsr_ls/par_cr.c b/external/hypre/src/parcsr_ls/par_cr.c
index d9fe5234..9d038d36 100644
--- a/external/hypre/src/parcsr_ls/par_cr.c
+++ b/external/hypre/src/parcsr_ls/par_cr.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -30,6 +30,9 @@ hypre_BoomerAMGCoarsenCR1( hypre_ParCSRMatrix    *A,
                            HYPRE_Int              IS_type,
                            HYPRE_Int              CRaddCpoints)
 {
+   HYPRE_UNUSED_VAR(num_CR_relax_steps);
+   HYPRE_UNUSED_VAR(IS_type);
+
    HYPRE_Int i;
    /* HYPRE_Real theta_global;*/
    hypre_CSRMatrix *A_diag = hypre_ParCSRMatrixDiag(A);
@@ -41,7 +44,8 @@ hypre_BoomerAMGCoarsenCR1( hypre_ParCSRMatrix    *A,
    HYPRE_Int       *CF_marker;
    HYPRE_Int        coarse_size;
 
-   if(CRaddCpoints == 0){
+   if (CRaddCpoints == 0)
+   {
       *CF_marker_ptr = hypre_IntArrayCreate(num_variables);
       hypre_IntArrayInitialize(*CF_marker_ptr);
       hypre_IntArraySetConstantValues(*CF_marker_ptr, fpt);
@@ -50,14 +54,16 @@ hypre_BoomerAMGCoarsenCR1( hypre_ParCSRMatrix    *A,
 
    /* Run the CR routine */
 
-   hypre_fprintf(stdout,"\n... Building CF using CR ...\n\n");
+   hypre_fprintf(stdout, "\n... Building CF using CR ...\n\n");
    hypre_cr(A_i, A_j, A_data, num_variables, CF_marker,
-            RelaxScheme1, omega1, theta_global1,mu1);
+            RelaxScheme1, omega1, theta_global1, mu1);
 
-   hypre_fprintf(stdout,"\n... Done \n\n");
+   hypre_fprintf(stdout, "\n... Done \n\n");
    coarse_size = 0;
-   for ( i =0 ;i < num_variables;i++){
-      if ( CF_marker[i] == cpt){
+   for ( i = 0 ; i < num_variables; i++)
+   {
+      if ( CF_marker[i] == cpt)
+      {
          coarse_size++;
       }
    }
@@ -70,68 +76,87 @@ hypre_BoomerAMGCoarsenCR1( hypre_ParCSRMatrix    *A,
 HYPRE_Int hypre_cr(HYPRE_Int *A_i, HYPRE_Int *A_j, HYPRE_Real *A_data, HYPRE_Int n, HYPRE_Int *cf,
                    HYPRE_Int rlx, HYPRE_Real omega, HYPRE_Real tg, HYPRE_Int mu)
 {
-   HYPRE_Int i,nstages=0;
-   HYPRE_Real rho,rho0,rho1,*e0,*e1;
-   HYPRE_Real nc= 0.0;
+   HYPRE_Int i, nstages = 0;
+   HYPRE_Real rho, rho0, rho1, *e0, *e1;
+   HYPRE_Real nc = 0.0;
 
-   e0=hypre_CTAlloc(HYPRE_Real, n, HYPRE_MEMORY_HOST);
-   e1=hypre_CTAlloc(HYPRE_Real, n, HYPRE_MEMORY_HOST);
+   e0 = hypre_CTAlloc(HYPRE_Real, n, HYPRE_MEMORY_HOST);
+   e1 = hypre_CTAlloc(HYPRE_Real, n, HYPRE_MEMORY_HOST);
 
-   hypre_fprintf(stdout,"Stage  \t rho \t alpha \n");
-   hypre_fprintf(stdout,"-----------------------\n");
+   hypre_fprintf(stdout, "Stage  \t rho \t alpha \n");
+   hypre_fprintf(stdout, "-----------------------\n");
 
    for (i = 0; i < n; i++)
-      e1[i] = 1.0e0+.1*hypre_RandI();
+   {
+      e1[i] = 1.0e0 + .1 * hypre_RandI();
+   }
 
    /* stages */
-   while(1){
-      if (nstages > 0){
-         for (i=0;i<n;i++){
-            if(cf[i] == cpt){
+   while (1)
+   {
+      if (nstages > 0)
+      {
+         for (i = 0; i < n; i++)
+         {
+            if (cf[i] == cpt)
+            {
                e0[i] = 0.0e0;
                e1[i] = 0.0e0;
             }
          }
       }
 
-      switch(rlx){
+      switch (rlx)
+      {
          case fptOmegaJac:
-            for (i=0;i<mu;i++)
-               hypre_fptjaccr(cf,A_i,A_j,A_data,n,e0,omega,e1);
+            for (i = 0; i < mu; i++)
+            {
+               hypre_fptjaccr(cf, A_i, A_j, A_data, n, e0, omega, e1);
+            }
             break;
          case fptgs:
-            for (i=0;i<mu;i++)
-               hypre_fptgscr(cf,A_i,A_j,A_data,n,e0,e1);
+            for (i = 0; i < mu; i++)
+            {
+               hypre_fptgscr(cf, A_i, A_j, A_data, n, e0, e1);
+            }
             break;
       }
 
-      rho=0.0e0; rho0=0.0e0; rho1=0.0e0;
-      for(i=0;i<n;i++){
-         rho0 += pow(e0[i],2);
-         rho1 += pow(e1[i],2);
+      rho = 0.0e0; rho0 = 0.0e0; rho1 = 0.0e0;
+      for (i = 0; i < n; i++)
+      {
+         rho0 += hypre_pow(e0[i], 2);
+         rho1 += hypre_pow(e1[i], 2);
       }
-      rho = sqrt(rho1)/sqrt(rho0);
+      rho = hypre_sqrt(rho1) / hypre_sqrt(rho0);
 
-      if (rho > tg){
-         hypre_formu(cf,n,e1,A_i,rho);
-         hypre_IndepSetGreedy(A_i,A_j,n,cf);
+      if (rho > tg)
+      {
+         hypre_formu(cf, n, e1, A_i, rho);
+         hypre_IndepSetGreedy(A_i, A_j, n, cf);
 
-         hypre_fprintf(stdout,"  %d \t%2.3f  \t%2.3f \n",
-                       nstages,rho,nc/n);
+         hypre_fprintf(stdout, "  %d \t%2.3f  \t%2.3f \n",
+                       nstages, rho, nc / n);
          /* update for next sweep */
          nc = 0.0e0;
-         for (i=0;i<n;i++){
+         for (i = 0; i < n; i++)
+         {
             if (cf[i] ==  cpt)
-               nc+=1.0e0;
-            else if (cf[i] ==  fpt){
-               e0[i] = 1.0e0+.1*hypre_RandI();
-               e1[i] = 1.0e0+.1*hypre_RandI();
+            {
+               nc += 1.0e0;
+            }
+            else if (cf[i] ==  fpt)
+            {
+               e0[i] = 1.0e0 + .1 * hypre_RandI();
+               e1[i] = 1.0e0 + .1 * hypre_RandI();
             }
          }
          nstages += 1;
-      } else {
-         hypre_fprintf(stdout,"  %d \t%2.3f  \t%2.3f \n",
-                       nstages,rho,nc/n);
+      }
+      else
+      {
+         hypre_fprintf(stdout, "  %d \t%2.3f  \t%2.3f \n",
+                       nstages, rho, nc / n);
          break;
       }
    }
@@ -143,14 +168,18 @@ HYPRE_Int hypre_cr(HYPRE_Int *A_i, HYPRE_Int *A_j, HYPRE_Real *A_data, HYPRE_Int
 }
 
 /* take an ind. set over the candidates*/
-HYPRE_Int hypre_GraphAdd( Link *list, HYPRE_Int *head, HYPRE_Int *tail, HYPRE_Int index, HYPRE_Int istack )
+HYPRE_Int hypre_GraphAdd( Link *list, HYPRE_Int *head, HYPRE_Int *tail, HYPRE_Int index,
+                          HYPRE_Int istack )
 {
    HYPRE_Int prev = tail[-istack];
 
    list[index].prev = prev;
-   if (prev < 0){
+   if (prev < 0)
+   {
       head[-istack] = index;
-   } else {
+   }
+   else
+   {
       list[prev].next = index;
    }
    list[index].next = -istack;
@@ -164,14 +193,20 @@ HYPRE_Int hypre_GraphRemove( Link *list, HYPRE_Int *head, HYPRE_Int *tail, HYPRE
    HYPRE_Int prev = list[index].prev;
    HYPRE_Int next = list[index].next;
 
-   if (prev < 0){
+   if (prev < 0)
+   {
       head[prev] = next;
-   } else {
+   }
+   else
+   {
       list[prev].next = next;
    }
-   if (next < 0){
+   if (next < 0)
+   {
       tail[next] = prev;
-   } else {
+   }
+   else
+   {
       list[next].prev = prev;
    }
 
@@ -196,44 +231,56 @@ HYPRE_Int hypre_IndepSetGreedy(HYPRE_Int *A_i, HYPRE_Int *A_j, HYPRE_Int n, HYPR
     * Note: only cands are put into graph */
 
    istack = 0;
-   for (i = 0; i < n; i++){
-      if (cf[i] == cand){
+   for (i = 0; i < n; i++)
+   {
+      if (cf[i] == cand)
+      {
          ma[i] = 1;
-         for (ji = A_i[i]+1; ji < A_i[i+1]; ji++){
+         for (ji = A_i[i] + 1; ji < A_i[i + 1]; ji++)
+         {
             jj = A_j[ji];
-            if (cf[jj] != cpt){
+            if (cf[jj] != cpt)
+            {
                ma[i]++;
             }
          }
-         if (ma[i] > istack){
+         if (ma[i] > istack)
+         {
             istack = (HYPRE_Int) ma[i];
          }
       }
-      else if (cf[i] == cpt){
+      else if (cf[i] == cpt)
+      {
          ma[i] = -1;
-      } else {
+      }
+      else
+      {
          ma[i] = 0;
       }
    }
-   stack_size = 2*istack;
+   stack_size = 2 * istack;
 
    /* initialize graph */
    head_mem = hypre_CTAlloc(HYPRE_Int,  stack_size, HYPRE_MEMORY_HOST); head = head_mem + stack_size;
    tail_mem = hypre_CTAlloc(HYPRE_Int,  stack_size, HYPRE_MEMORY_HOST); tail = tail_mem + stack_size;
    list = hypre_CTAlloc(Link,  n, HYPRE_MEMORY_HOST);
 
-   for (i = -1; i >= -stack_size; i--){
+   for (i = -1; i >= -stack_size; i--)
+   {
       head[i] = i;
       tail[i] = i;
    }
-   for (i = 0; i < n; i++){
-      if (ma[i] > 0){
+   for (i = 0; i < n; i++)
+   {
+      if (ma[i] > 0)
+      {
          hypre_GraphAdd(list, head, tail, i, (HYPRE_Int) ma[i]);
       }
    }
 
    /* Loop until all points are either F or C */
-   while (istack > 0){
+   while (istack > 0)
+   {
       /* i w/ max measure at head of stacks */
       i = head[-istack];
 
@@ -245,12 +292,15 @@ HYPRE_Int hypre_IndepSetGreedy(HYPRE_Int *A_i, HYPRE_Int *A_j, HYPRE_Int n, HYPR
       hypre_GraphRemove(list, head, tail, i);
 
       /* update nbs and nbs-of-nbs */
-      for (ji = A_i[i]+1; ji < A_i[i+1]; ji++){
+      for (ji = A_i[i] + 1; ji < A_i[i + 1]; ji++)
+      {
          jj = A_j[ji];
          /* if not "decided" C or F */
-         if (ma[jj] > -1){
+         if (ma[jj] > -1)
+         {
             /* if a candidate, remove jj from graph */
-            if (ma[jj] > 0){
+            if (ma[jj] > 0)
+            {
                hypre_GraphRemove(list, head, tail, jj);
             }
 
@@ -258,17 +308,20 @@ HYPRE_Int hypre_IndepSetGreedy(HYPRE_Int *A_i, HYPRE_Int *A_j, HYPRE_Int n, HYPR
             cf[jj] = fpt;
             ma[jj] = -1;
 
-            for (jl = A_i[jj]+1; jl < A_i[jj+1]; jl++){
+            for (jl = A_i[jj] + 1; jl < A_i[jj + 1]; jl++)
+            {
                index = A_j[jl];
                /* if a candidate, increase ma */
-               if (ma[index] > 0){
+               if (ma[index] > 0)
+               {
                   ma[index]++;
 
                   /* move index in graph */
                   hypre_GraphRemove(list, head, tail, index);
                   hypre_GraphAdd(list, head, tail, index,
                                  (HYPRE_Int) ma[index]);
-                  if (ma[index] > istack){
+                  if (ma[index] > istack)
+                  {
                      istack = (HYPRE_Int) ma[index];
                   }
                }
@@ -276,9 +329,11 @@ HYPRE_Int hypre_IndepSetGreedy(HYPRE_Int *A_i, HYPRE_Int *A_j, HYPRE_Int n, HYPR
          }
       }
       /* reset istack to point to biggest non-empty stack */
-      for ( ; istack > 0; istack--){
+      for ( ; istack > 0; istack--)
+      {
          /* if non-negative, break */
-         if (head[-istack] > -1){
+         if (head[-istack] > -1)
+         {
             break;
          }
       }
@@ -310,44 +365,56 @@ HYPRE_Int hypre_IndepSetGreedyS(HYPRE_Int *A_i, HYPRE_Int *A_j, HYPRE_Int n, HYP
     * Note: only cands are put into graph */
 
    istack = 0;
-   for (i = 0; i < n; i++){
-      if (cf[i] == cand){
+   for (i = 0; i < n; i++)
+   {
+      if (cf[i] == cand)
+      {
          ma[i] = 1;
-         for (ji = A_i[i]; ji < A_i[i+1]; ji++){
+         for (ji = A_i[i]; ji < A_i[i + 1]; ji++)
+         {
             jj = A_j[ji];
-            if (cf[jj] != cpt){
+            if (cf[jj] != cpt)
+            {
                ma[i]++;
             }
          }
-         if (ma[i] > istack){
+         if (ma[i] > istack)
+         {
             istack = (HYPRE_Int) ma[i];
          }
       }
-      else if (cf[i] == cpt){
+      else if (cf[i] == cpt)
+      {
          ma[i] = -1;
-      } else {
+      }
+      else
+      {
          ma[i] = 0;
       }
    }
-   stack_size = 2*istack;
+   stack_size = 2 * istack;
 
    /* initialize graph */
    head_mem = hypre_CTAlloc(HYPRE_Int,  stack_size, HYPRE_MEMORY_HOST); head = head_mem + stack_size;
    tail_mem = hypre_CTAlloc(HYPRE_Int,  stack_size, HYPRE_MEMORY_HOST); tail = tail_mem + stack_size;
    list = hypre_CTAlloc(Link,  n, HYPRE_MEMORY_HOST);
 
-   for (i = -1; i >= -stack_size; i--){
+   for (i = -1; i >= -stack_size; i--)
+   {
       head[i] = i;
       tail[i] = i;
    }
-   for (i = 0; i < n; i++){
-      if (ma[i] > 0){
+   for (i = 0; i < n; i++)
+   {
+      if (ma[i] > 0)
+      {
          hypre_GraphAdd(list, head, tail, i, (HYPRE_Int) ma[i]);
       }
    }
 
    /* Loop until all points are either F or C */
-   while (istack > 0){
+   while (istack > 0)
+   {
       /* i w/ max measure at head of stacks */
       i = head[-istack];
 
@@ -359,12 +426,15 @@ HYPRE_Int hypre_IndepSetGreedyS(HYPRE_Int *A_i, HYPRE_Int *A_j, HYPRE_Int n, HYP
       hypre_GraphRemove(list, head, tail, i);
 
       /* update nbs and nbs-of-nbs */
-      for (ji = A_i[i]; ji < A_i[i+1]; ji++){
+      for (ji = A_i[i]; ji < A_i[i + 1]; ji++)
+      {
          jj = A_j[ji];
          /* if not "decided" C or F */
-         if (ma[jj] > -1){
+         if (ma[jj] > -1)
+         {
             /* if a candidate, remove jj from graph */
-            if (ma[jj] > 0){
+            if (ma[jj] > 0)
+            {
                hypre_GraphRemove(list, head, tail, jj);
             }
 
@@ -372,17 +442,20 @@ HYPRE_Int hypre_IndepSetGreedyS(HYPRE_Int *A_i, HYPRE_Int *A_j, HYPRE_Int n, HYP
             cf[jj] = fpt;
             ma[jj] = -1;
 
-            for (jl = A_i[jj]; jl < A_i[jj+1]; jl++){
+            for (jl = A_i[jj]; jl < A_i[jj + 1]; jl++)
+            {
                index = A_j[jl];
                /* if a candidate, increase ma */
-               if (ma[index] > 0){
+               if (ma[index] > 0)
+               {
                   ma[index]++;
 
                   /* move index in graph */
                   hypre_GraphRemove(list, head, tail, index);
                   hypre_GraphAdd(list, head, tail, index,
                                  (HYPRE_Int) ma[index]);
-                  if (ma[index] > istack){
+                  if (ma[index] > istack)
+                  {
                      istack = (HYPRE_Int) ma[index];
                   }
                }
@@ -390,9 +463,11 @@ HYPRE_Int hypre_IndepSetGreedyS(HYPRE_Int *A_i, HYPRE_Int *A_j, HYPRE_Int n, HYP
          }
       }
       /* reset istack to point to biggest non-empty stack */
-      for ( ; istack > 0; istack--){
+      for ( ; istack > 0; istack--)
+      {
          /* if non-negative, break */
-         if (head[-istack] > -1){
+         if (head[-istack] > -1)
+         {
             break;
          }
       }
@@ -413,20 +488,26 @@ HYPRE_Int hypre_fptjaccr(HYPRE_Int *cf, HYPRE_Int *A_i, HYPRE_Int *A_j, HYPRE_Re
    HYPRE_Int i, j;
    HYPRE_Real res;
 
-   for (i=0;i<n;i++)
+   for (i = 0; i < n; i++)
       if (cf[i] == fpt)
+      {
          e0[i] = e1[i];
+      }
 
-   for (i=0;i<n;i++){
+   for (i = 0; i < n; i++)
+   {
       res = 0.0e0;
-      if (cf[i] == fpt){
-         for (j=A_i[i]+1;j<A_i[i+1];j++){
-            if (cf[A_j[j]] == fpt){
-               res -= (A_data[j]*e0[A_j[j]]);
+      if (cf[i] == fpt)
+      {
+         for (j = A_i[i] + 1; j < A_i[i + 1]; j++)
+         {
+            if (cf[A_j[j]] == fpt)
+            {
+               res -= (A_data[j] * e0[A_j[j]]);
             }
          }
-         e1[i] *= (1.0-omega);
-         e1[i] += omega*res/A_data[A_i[i]];
+         e1[i] *= (1.0 - omega);
+         e1[i] += omega * res / A_data[A_i[i]];
       }
    }
    return hypre_error_flag;
@@ -434,44 +515,57 @@ HYPRE_Int hypre_fptjaccr(HYPRE_Int *cf, HYPRE_Int *A_i, HYPRE_Int *A_j, HYPRE_Re
 
 
 /* f point GS cr */
-HYPRE_Int hypre_fptgscr(HYPRE_Int *cf, HYPRE_Int *A_i, HYPRE_Int *A_j, HYPRE_Real *A_data, HYPRE_Int n,
+HYPRE_Int hypre_fptgscr(HYPRE_Int *cf, HYPRE_Int *A_i, HYPRE_Int *A_j, HYPRE_Real *A_data,
+                        HYPRE_Int n,
                         HYPRE_Real *e0, HYPRE_Real *e1)
 {
    HYPRE_Int i, j;
    HYPRE_Real res;
 
-   for (i=0;i<n;i++)
+   for (i = 0; i < n; i++)
       if (cf[i] == fpt)
+      {
          e0[i] = e1[i];
+      }
 
-   for (i=0;i<n;i++){
-      if (cf[i] == fpt){
+   for (i = 0; i < n; i++)
+   {
+      if (cf[i] == fpt)
+      {
          res = 0.0e0;
-         for ( j = A_i[i]+1; j < A_i[i+1]; j++){
-            if (cf[A_j[j]] == fpt){
-               res -= (A_data[j]*e1[A_j[j]]);
+         for ( j = A_i[i] + 1; j < A_i[i + 1]; j++)
+         {
+            if (cf[A_j[j]] == fpt)
+            {
+               res -= (A_data[j] * e1[A_j[j]]);
             }
          }
-         e1[i] = res/A_data[A_i[i]];
+         e1[i] = res / A_data[A_i[i]];
       }
    }
    return hypre_error_flag;
 }
 
 /* form the candidate set U */
-HYPRE_Int hypre_formu(HYPRE_Int *cf,HYPRE_Int n, HYPRE_Real *e1, HYPRE_Int *A_i, HYPRE_Real rho){
+HYPRE_Int hypre_formu(HYPRE_Int *cf, HYPRE_Int n, HYPRE_Real *e1, HYPRE_Int *A_i, HYPRE_Real rho)
+{
    HYPRE_Int i;
-   HYPRE_Real candmeas=0.0e0, max=0.0e0;
-   HYPRE_Real thresh=1-rho;
+   HYPRE_Real candmeas = 0.0e0, max = 0.0e0;
+   HYPRE_Real thresh = 1 - rho;
 
-   for(i=0;i<n;i++)
-      if(fabs(e1[i]) > max)
-         max = fabs(e1[i]);
+   for (i = 0; i < n; i++)
+      if (hypre_abs(e1[i]) > max)
+      {
+         max = hypre_abs(e1[i]);
+      }
 
-   for (i=0;i<n;i++){
-      if (cf[i] == fpt){
-         candmeas = pow(fabs(e1[i]),1.0)/max;
-         if (candmeas > thresh && A_i[i+1]-A_i[i] > 1){
+   for (i = 0; i < n; i++)
+   {
+      if (cf[i] == fpt)
+      {
+         candmeas = hypre_pow(hypre_abs(e1[i]), 1.0) / max;
+         if (candmeas > thresh && A_i[i + 1] - A_i[i] > 1)
+         {
             cf[i] = cand;
          }
       }
@@ -500,16 +594,16 @@ hypre_BoomerAMGIndepRS( hypre_ParCSRMatrix    *S,
                         HYPRE_Int              debug_flag,
                         HYPRE_Int             *CF_marker)
 {
-   MPI_Comm         comm          = hypre_ParCSRMatrixComm(S);
-   hypre_ParCSRCommPkg   *comm_pkg      = hypre_ParCSRMatrixCommPkg(S);
-   hypre_CSRMatrix *S_diag        = hypre_ParCSRMatrixDiag(S);
-   hypre_CSRMatrix *S_offd        = hypre_ParCSRMatrixOffd(S);
-   HYPRE_Int       *S_i           = hypre_CSRMatrixI(S_diag);
-   HYPRE_Int       *S_j           = hypre_CSRMatrixJ(S_diag);
-   HYPRE_Int       *S_offd_i      = hypre_CSRMatrixI(S_offd);
-   HYPRE_Int       *S_offd_j;
-   HYPRE_Int        num_variables = hypre_CSRMatrixNumRows(S_diag);
-   HYPRE_Int        num_cols_offd = hypre_CSRMatrixNumCols(S_offd);
+   MPI_Comm             comm          = hypre_ParCSRMatrixComm(S);
+   hypre_ParCSRCommPkg *comm_pkg      = hypre_ParCSRMatrixCommPkg(S);
+   hypre_CSRMatrix     *S_diag        = hypre_ParCSRMatrixDiag(S);
+   hypre_CSRMatrix     *S_offd        = hypre_ParCSRMatrixOffd(S);
+   HYPRE_Int           *S_i           = hypre_CSRMatrixI(S_diag);
+   HYPRE_Int           *S_j           = hypre_CSRMatrixJ(S_diag);
+   HYPRE_Int           *S_offd_i      = hypre_CSRMatrixI(S_offd);
+   HYPRE_Int           *S_offd_j      = NULL;
+   HYPRE_Int            num_variables = hypre_CSRMatrixNumRows(S_diag);
+   HYPRE_Int            num_cols_offd = hypre_CSRMatrixNumCols(S_offd);
 
    hypre_ParCSRCommHandle *comm_handle;
    hypre_CSRMatrix *ST;
@@ -566,10 +660,10 @@ hypre_BoomerAMGIndepRS( hypre_ParCSRMatrix    *S,
     * to "unaccounted-for" dependence.
     *----------------------------------------------------------------*/
 
-   if (debug_flag == 3) wall_time = time_getWallclockSeconds();
+   if (debug_flag == 3) { wall_time = time_getWallclockSeconds(); }
 
-   hypre_MPI_Comm_size(comm,&num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_size(comm, &num_procs);
+   hypre_MPI_Comm_rank(comm, &my_id);
 
    if (!comm_pkg)
    {
@@ -585,12 +679,12 @@ hypre_BoomerAMGIndepRS( hypre_ParCSRMatrix    *S,
 
    num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
 
-   if (num_cols_offd) S_offd_j = hypre_CSRMatrixJ(S_offd);
+   if (num_cols_offd) { S_offd_j = hypre_CSRMatrixJ(S_offd); }
 
    jS = S_i[num_variables];
 
    ST = hypre_CSRMatrixCreate(num_variables, num_variables, jS);
-   ST_i = hypre_CTAlloc(HYPRE_Int, num_variables+1, HYPRE_MEMORY_HOST);
+   ST_i = hypre_CTAlloc(HYPRE_Int, num_variables + 1, HYPRE_MEMORY_HOST);
    ST_j = hypre_CTAlloc(HYPRE_Int, jS, HYPRE_MEMORY_HOST);
    hypre_CSRMatrixI(ST) = ST_i;
    hypre_CSRMatrixJ(ST) = ST_j;
@@ -599,20 +693,22 @@ hypre_BoomerAMGIndepRS( hypre_ParCSRMatrix    *S,
     * generate transpose of S, ST
     *----------------------------------------------------------*/
 
-   for (i=0; i <= num_variables; i++)
+   for (i = 0; i <= num_variables; i++)
+   {
       ST_i[i] = 0;
+   }
 
-   for (i=0; i < jS; i++)
+   for (i = 0; i < jS; i++)
    {
-      ST_i[S_j[i]+1]++;
+      ST_i[S_j[i] + 1]++;
    }
-   for (i=0; i < num_variables; i++)
+   for (i = 0; i < num_variables; i++)
    {
-      ST_i[i+1] += ST_i[i];
+      ST_i[i + 1] += ST_i[i];
    }
-   for (i=0; i < num_variables; i++)
+   for (i = 0; i < num_variables; i++)
    {
-      for (j=S_i[i]; j < S_i[i+1]; j++)
+      for (j = S_i[i]; j < S_i[i + 1]; j++)
       {
          index = S_j[j];
          ST_j[ST_i[index]] = i;
@@ -621,7 +717,7 @@ hypre_BoomerAMGIndepRS( hypre_ParCSRMatrix    *S,
    }
    for (i = num_variables; i > 0; i--)
    {
-      ST_i[i] = ST_i[i-1];
+      ST_i[i] = ST_i[i - 1];
    }
    ST_i[0] = 0;
 
@@ -638,16 +734,20 @@ hypre_BoomerAMGIndepRS( hypre_ParCSRMatrix    *S,
    if (measure_type == 0)
    {
       measure_array = hypre_CTAlloc(HYPRE_Int,  num_variables, HYPRE_MEMORY_HOST);
-      for (i=0; i < num_variables; i++)
+      for (i = 0; i < num_variables; i++)
+      {
          measure_array[i] = 0;
-      for (i=0; i < num_variables; i++)
+      }
+      for (i = 0; i < num_variables; i++)
       {
          if (CF_marker[i] < 1)
          {
-            for (j = S_i[i]; j < S_i[i+1]; j++)
+            for (j = S_i[i]; j < S_i[i + 1]; j++)
             {
                if (CF_marker[S_j[j]] < 1)
+               {
                   measure_array[S_j[j]]++;
+               }
             }
          }
       }
@@ -658,25 +758,31 @@ hypre_BoomerAMGIndepRS( hypre_ParCSRMatrix    *S,
 
       /* now the off-diagonal part of CF_marker */
       if (num_cols_offd)
+      {
          CF_marker_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_offd, HYPRE_MEMORY_HOST);
+      }
       else
+      {
          CF_marker_offd = NULL;
+      }
 
-      for (i=0; i < num_cols_offd; i++)
+      for (i = 0; i < num_cols_offd; i++)
+      {
          CF_marker_offd[i] = 0;
+      }
 
       /*------------------------------------------------
        * Communicate the CF_marker values to the external nodes
        *------------------------------------------------*/
       int_buf_data = hypre_CTAlloc(HYPRE_Int, hypre_ParCSRCommPkgSendMapStart(comm_pkg,
-                                                   num_sends), HYPRE_MEMORY_HOST);
+                                                                              num_sends), HYPRE_MEMORY_HOST);
       index = 0;
       for (i = 0; i < num_sends; i++)
       {
          start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
          {
-            jrow = hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j);
+            jrow = hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j);
             int_buf_data[index++] = CF_marker[jrow];
          }
       }
@@ -688,23 +794,29 @@ hypre_BoomerAMGIndepRS( hypre_ParCSRMatrix    *S,
          hypre_ParCSRCommHandleDestroy(comm_handle);
       }
 
-      measure_array = hypre_CTAlloc(HYPRE_Int,  num_variables+num_cols_offd, HYPRE_MEMORY_HOST);
-      for (i=0; i < num_variables+num_cols_offd; i++)
+      measure_array = hypre_CTAlloc(HYPRE_Int,  num_variables + num_cols_offd, HYPRE_MEMORY_HOST);
+      for (i = 0; i < num_variables + num_cols_offd; i++)
+      {
          measure_array[i] = 0;
+      }
 
-      for (i=0; i < num_variables; i++)
+      for (i = 0; i < num_variables; i++)
       {
          if (CF_marker[i] < 1)
          {
-            for (j = S_i[i]; j < S_i[i+1]; j++)
+            for (j = S_i[i]; j < S_i[i + 1]; j++)
             {
                if (CF_marker[S_j[j]] < 1)
+               {
                   measure_array[S_j[j]]++;
+               }
             }
-            for (j = S_offd_i[i]; j < S_offd_i[i+1]; j++)
+            for (j = S_offd_i[i]; j < S_offd_i[i + 1]; j++)
             {
                if (CF_marker_offd[S_offd_j[j]] < 1)
+               {
                   measure_array[num_variables + S_offd_j[j]]++;
+               }
             }
          }
       }
@@ -716,16 +828,18 @@ hypre_BoomerAMGIndepRS( hypre_ParCSRMatrix    *S,
 
       /* finish the communication */
       if (num_procs > 1)
+      {
          hypre_ParCSRCommHandleDestroy(comm_handle);
+      }
 
       /* now add the externally calculated part of the local nodes to the local nodes */
       index = 0;
-      for (i=0; i < num_sends; i++)
+      for (i = 0; i < num_sends; i++)
       {
          start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-         for (j=start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
-            measure_array[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)]
-               += int_buf_data[index++];
+         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
+            measure_array[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)]
+            += int_buf_data[index++];
       }
       hypre_TFree(int_buf_data, HYPRE_MEMORY_HOST);
    }
@@ -737,7 +851,7 @@ hypre_BoomerAMGIndepRS( hypre_ParCSRMatrix    *S,
       {
          if (CF_marker[i] == 0)
          {
-            if ((S_offd_i[i+1]-S_offd_i[i]) == 0)
+            if ((S_offd_i[i + 1] - S_offd_i[i]) == 0)
             {
                num_left++;
             }
@@ -748,9 +862,13 @@ hypre_BoomerAMGIndepRS( hypre_ParCSRMatrix    *S,
             }
          }
          else if (CF_marker[i] < 0)
+         {
             measure_array[i] = 0;
+         }
          else
+         {
             measure_array[i] = -1;
+         }
       }
    }
    else
@@ -762,9 +880,13 @@ hypre_BoomerAMGIndepRS( hypre_ParCSRMatrix    *S,
             num_left++;
          }
          else if (CF_marker[i] < 0)
+         {
             measure_array[i] = 0;
+         }
          else
+         {
             measure_array[i] = -1;
+         }
       }
    }
 
@@ -772,7 +894,7 @@ hypre_BoomerAMGIndepRS( hypre_ParCSRMatrix    *S,
     * Loop until all points are either fine or coarse.
     *---------------------------------------------------*/
 
-   if (debug_flag == 3) wall_time = time_getWallclockSeconds();
+   if (debug_flag == 3) { wall_time = time_getWallclockSeconds(); }
 
    /* first coarsening phase */
 
@@ -793,9 +915,9 @@ hypre_BoomerAMGIndepRS( hypre_ParCSRMatrix    *S,
          }
          else
          {
-            if (measure < 0) hypre_printf("negative measure!\n");
+            if (measure < 0) { hypre_printf("negative measure!\n"); }
             CF_marker[j] = f_pnt;
-            for (k = S_i[j]; k < S_i[j+1]; k++)
+            for (k = S_i[j]; k < S_i[j + 1]; k++)
             {
                nabor = S_j[k];
                if (CF_marker[nabor] != SF_PT && CF_marker[nabor] < 1)
@@ -853,7 +975,7 @@ hypre_BoomerAMGIndepRS( hypre_ParCSRMatrix    *S,
 
       hypre_remove_point(&LoL_head, &LoL_tail, measure, index, lists, where);
 
-      for (j = ST_i[index]; j < ST_i[index+1]; j++)
+      for (j = ST_i[index]; j < ST_i[index + 1]; j++)
       {
          nabor = ST_j[j];
          if (CF_marker[nabor] == UNDECIDED)
@@ -864,7 +986,7 @@ hypre_BoomerAMGIndepRS( hypre_ParCSRMatrix    *S,
             hypre_remove_point(&LoL_head, &LoL_tail, measure, nabor, lists, where);
             --num_left;
 
-            for (k = S_i[nabor]+1; k < S_i[nabor+1]; k++)
+            for (k = S_i[nabor] + 1; k < S_i[nabor + 1]; k++)
             {
                nabor_two = S_j[k];
                if (CF_marker[nabor_two] == UNDECIDED)
@@ -881,7 +1003,7 @@ hypre_BoomerAMGIndepRS( hypre_ParCSRMatrix    *S,
             }
          }
       }
-      for (j = S_i[index]; j < S_i[index+1]; j++)
+      for (j = S_i[index]; j < S_i[index + 1]; j++)
       {
          nabor = S_j[j];
          if (CF_marker[nabor] == UNDECIDED)
@@ -900,7 +1022,7 @@ hypre_BoomerAMGIndepRS( hypre_ParCSRMatrix    *S,
                CF_marker[nabor] = F_PT;
                --num_left;
 
-               for (k = S_i[nabor]+1; k < S_i[nabor+1]; k++)
+               for (k = S_i[nabor] + 1; k < S_i[nabor + 1]; k++)
                {
                   nabor_two = S_j[k];
                   if (CF_marker[nabor_two] == UNDECIDED)
@@ -932,8 +1054,8 @@ hypre_BoomerAMGIndepRS( hypre_ParCSRMatrix    *S,
 
    if (measure_type == 2)
    {
-      for (i=0; i < num_variables; i++)
-         if (CF_marker[i] == 2) CF_marker[i] = 0;
+      for (i = 0; i < num_variables; i++)
+         if (CF_marker[i] == 2) { CF_marker[i] = 0; }
    }
 
    hypre_TFree(lists, HYPRE_MEMORY_HOST);
@@ -955,16 +1077,16 @@ hypre_BoomerAMGIndepRSa( hypre_ParCSRMatrix    *S,
                          HYPRE_Int                    debug_flag,
                          HYPRE_Int                   *CF_marker)
 {
-   MPI_Comm         comm          = hypre_ParCSRMatrixComm(S);
-   hypre_ParCSRCommPkg   *comm_pkg      = hypre_ParCSRMatrixCommPkg(S);
-   hypre_CSRMatrix *S_diag        = hypre_ParCSRMatrixDiag(S);
-   hypre_CSRMatrix *S_offd        = hypre_ParCSRMatrixOffd(S);
-   HYPRE_Int       *S_i           = hypre_CSRMatrixI(S_diag);
-   HYPRE_Int       *S_j           = hypre_CSRMatrixJ(S_diag);
-   HYPRE_Int       *S_offd_i      = hypre_CSRMatrixI(S_offd);
-   HYPRE_Int       *S_offd_j;
-   HYPRE_Int        num_variables = hypre_CSRMatrixNumRows(S_diag);
-   HYPRE_Int        num_cols_offd = hypre_CSRMatrixNumCols(S_offd);
+   MPI_Comm             comm          = hypre_ParCSRMatrixComm(S);
+   hypre_ParCSRCommPkg *comm_pkg      = hypre_ParCSRMatrixCommPkg(S);
+   hypre_CSRMatrix     *S_diag        = hypre_ParCSRMatrixDiag(S);
+   hypre_CSRMatrix     *S_offd        = hypre_ParCSRMatrixOffd(S);
+   HYPRE_Int           *S_i           = hypre_CSRMatrixI(S_diag);
+   HYPRE_Int           *S_j           = hypre_CSRMatrixJ(S_diag);
+   HYPRE_Int           *S_offd_i      = hypre_CSRMatrixI(S_offd);
+   HYPRE_Int           *S_offd_j      = NULL;
+   HYPRE_Int            num_variables = hypre_CSRMatrixNumRows(S_diag);
+   HYPRE_Int            num_cols_offd = hypre_CSRMatrixNumCols(S_offd);
 
    hypre_ParCSRCommHandle *comm_handle;
    hypre_CSRMatrix *ST;
@@ -1021,10 +1143,10 @@ hypre_BoomerAMGIndepRSa( hypre_ParCSRMatrix    *S,
     * to "unaccounted-for" dependence.
     *----------------------------------------------------------------*/
 
-   if (debug_flag == 3) wall_time = time_getWallclockSeconds();
+   if (debug_flag == 3) { wall_time = time_getWallclockSeconds(); }
 
-   hypre_MPI_Comm_size(comm,&num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_size(comm, &num_procs);
+   hypre_MPI_Comm_rank(comm, &my_id);
 
    if (!comm_pkg)
    {
@@ -1040,12 +1162,12 @@ hypre_BoomerAMGIndepRSa( hypre_ParCSRMatrix    *S,
 
    num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
 
-   if (num_cols_offd) S_offd_j = hypre_CSRMatrixJ(S_offd);
+   if (num_cols_offd) { S_offd_j = hypre_CSRMatrixJ(S_offd); }
 
    jS = S_i[num_variables];
 
    ST = hypre_CSRMatrixCreate(num_variables, num_variables, jS);
-   ST_i = hypre_CTAlloc(HYPRE_Int, num_variables+1, HYPRE_MEMORY_HOST);
+   ST_i = hypre_CTAlloc(HYPRE_Int, num_variables + 1, HYPRE_MEMORY_HOST);
    ST_j = hypre_CTAlloc(HYPRE_Int, jS, HYPRE_MEMORY_HOST);
    hypre_CSRMatrixI(ST) = ST_i;
    hypre_CSRMatrixJ(ST) = ST_j;
@@ -1054,20 +1176,22 @@ hypre_BoomerAMGIndepRSa( hypre_ParCSRMatrix    *S,
     * generate transpose of S, ST
     *----------------------------------------------------------*/
 
-   for (i=0; i <= num_variables; i++)
+   for (i = 0; i <= num_variables; i++)
+   {
       ST_i[i] = 0;
+   }
 
-   for (i=0; i < jS; i++)
+   for (i = 0; i < jS; i++)
    {
-      ST_i[S_j[i]+1]++;
+      ST_i[S_j[i] + 1]++;
    }
-   for (i=0; i < num_variables; i++)
+   for (i = 0; i < num_variables; i++)
    {
-      ST_i[i+1] += ST_i[i];
+      ST_i[i + 1] += ST_i[i];
    }
-   for (i=0; i < num_variables; i++)
+   for (i = 0; i < num_variables; i++)
    {
-      for (j=S_i[i]; j < S_i[i+1]; j++)
+      for (j = S_i[i]; j < S_i[i + 1]; j++)
       {
          index = S_j[j];
          ST_j[ST_i[index]] = i;
@@ -1076,7 +1200,7 @@ hypre_BoomerAMGIndepRSa( hypre_ParCSRMatrix    *S,
    }
    for (i = num_variables; i > 0; i--)
    {
-      ST_i[i] = ST_i[i-1];
+      ST_i[i] = ST_i[i - 1];
    }
    ST_i[0] = 0;
 
@@ -1093,16 +1217,20 @@ hypre_BoomerAMGIndepRSa( hypre_ParCSRMatrix    *S,
    if (measure_type == 0)
    {
       measure_array = hypre_CTAlloc(HYPRE_Int,  num_variables, HYPRE_MEMORY_HOST);
-      for (i=0; i < num_variables; i++)
+      for (i = 0; i < num_variables; i++)
+      {
          measure_array[i] = 0;
-      for (i=0; i < num_variables; i++)
+      }
+      for (i = 0; i < num_variables; i++)
       {
          if (CF_marker[i] < 1)
          {
-            for (j = S_i[i]+1; j < S_i[i+1]; j++)
+            for (j = S_i[i] + 1; j < S_i[i + 1]; j++)
             {
                if (CF_marker[S_j[j]] < 1)
+               {
                   measure_array[S_j[j]]++;
+               }
             }
          }
       }
@@ -1113,12 +1241,18 @@ hypre_BoomerAMGIndepRSa( hypre_ParCSRMatrix    *S,
 
       /* now the off-diagonal part of CF_marker */
       if (num_cols_offd)
+      {
          CF_marker_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_offd, HYPRE_MEMORY_HOST);
+      }
       else
+      {
          CF_marker_offd = NULL;
+      }
 
-      for (i=0; i < num_cols_offd; i++)
+      for (i = 0; i < num_cols_offd; i++)
+      {
          CF_marker_offd[i] = 0;
+      }
 
       /*------------------------------------------------
        * Communicate the CF_marker values to the external nodes
@@ -1129,9 +1263,9 @@ hypre_BoomerAMGIndepRSa( hypre_ParCSRMatrix    *S,
       for (i = 0; i < num_sends; i++)
       {
          start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
          {
-            jrow = hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j);
+            jrow = hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j);
             int_buf_data[index++] = CF_marker[jrow];
          }
       }
@@ -1143,23 +1277,29 @@ hypre_BoomerAMGIndepRSa( hypre_ParCSRMatrix    *S,
          hypre_ParCSRCommHandleDestroy(comm_handle);
       }
 
-      measure_array = hypre_CTAlloc(HYPRE_Int,  num_variables+num_cols_offd, HYPRE_MEMORY_HOST);
-      for (i=0; i < num_variables+num_cols_offd; i++)
+      measure_array = hypre_CTAlloc(HYPRE_Int,  num_variables + num_cols_offd, HYPRE_MEMORY_HOST);
+      for (i = 0; i < num_variables + num_cols_offd; i++)
+      {
          measure_array[i] = 0;
+      }
 
-      for (i=0; i < num_variables; i++)
+      for (i = 0; i < num_variables; i++)
       {
          if (CF_marker[i] < 1)
          {
-            for (j = S_i[i]+1; j < S_i[i+1]; j++)
+            for (j = S_i[i] + 1; j < S_i[i + 1]; j++)
             {
                if (CF_marker[S_j[j]] < 1)
+               {
                   measure_array[S_j[j]]++;
+               }
             }
-            for (j = S_offd_i[i]; j < S_offd_i[i+1]; j++)
+            for (j = S_offd_i[i]; j < S_offd_i[i + 1]; j++)
             {
                if (CF_marker_offd[S_offd_j[j]] < 1)
+               {
                   measure_array[num_variables + S_offd_j[j]]++;
+               }
             }
          }
       }
@@ -1171,16 +1311,18 @@ hypre_BoomerAMGIndepRSa( hypre_ParCSRMatrix    *S,
 
       /* finish the communication */
       if (num_procs > 1)
+      {
          hypre_ParCSRCommHandleDestroy(comm_handle);
+      }
 
       /* now add the externally calculated part of the local nodes to the local nodes */
       index = 0;
-      for (i=0; i < num_sends; i++)
+      for (i = 0; i < num_sends; i++)
       {
          start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-         for (j=start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
-            measure_array[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)]
-               += int_buf_data[index++];
+         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
+            measure_array[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)]
+            += int_buf_data[index++];
       }
       hypre_TFree(int_buf_data, HYPRE_MEMORY_HOST);
    }
@@ -1192,7 +1334,7 @@ hypre_BoomerAMGIndepRSa( hypre_ParCSRMatrix    *S,
       {
          if (CF_marker[i] == 0)
          {
-            if ((S_offd_i[i+1]-S_offd_i[i]) == 0)
+            if ((S_offd_i[i + 1] - S_offd_i[i]) == 0)
             {
                num_left++;
             }
@@ -1203,9 +1345,13 @@ hypre_BoomerAMGIndepRSa( hypre_ParCSRMatrix    *S,
             }
          }
          else if (CF_marker[i] < 0)
+         {
             measure_array[i] = 0;
+         }
          else
+         {
             measure_array[i] = -1;
+         }
       }
    }
    else
@@ -1217,9 +1363,13 @@ hypre_BoomerAMGIndepRSa( hypre_ParCSRMatrix    *S,
             num_left++;
          }
          else if (CF_marker[i] < 0)
+         {
             measure_array[i] = 0;
+         }
          else
+         {
             measure_array[i] = -1;
+         }
       }
    }
 
@@ -1227,7 +1377,7 @@ hypre_BoomerAMGIndepRSa( hypre_ParCSRMatrix    *S,
     * Loop until all points are either fine or coarse.
     *---------------------------------------------------*/
 
-   if (debug_flag == 3) wall_time = time_getWallclockSeconds();
+   if (debug_flag == 3) { wall_time = time_getWallclockSeconds(); }
 
    /* first coarsening phase */
 
@@ -1248,9 +1398,9 @@ hypre_BoomerAMGIndepRSa( hypre_ParCSRMatrix    *S,
          }
          else
          {
-            if (measure < 0) hypre_printf("negative measure!\n");
+            if (measure < 0) { hypre_printf("negative measure!\n"); }
             CF_marker[j] = f_pnt;
-            for (k = S_i[j]+1; k < S_i[j+1]; k++)
+            for (k = S_i[j] + 1; k < S_i[j + 1]; k++)
             {
                nabor = S_j[k];
                if (CF_marker[nabor] != SF_PT && CF_marker[nabor] < 1)
@@ -1308,7 +1458,7 @@ hypre_BoomerAMGIndepRSa( hypre_ParCSRMatrix    *S,
 
       hypre_remove_point(&LoL_head, &LoL_tail, measure, index, lists, where);
 
-      for (j = ST_i[index]+1; j < ST_i[index+1]; j++)
+      for (j = ST_i[index] + 1; j < ST_i[index + 1]; j++)
       {
          nabor = ST_j[j];
          if (CF_marker[nabor] == UNDECIDED)
@@ -1319,7 +1469,7 @@ hypre_BoomerAMGIndepRSa( hypre_ParCSRMatrix    *S,
             hypre_remove_point(&LoL_head, &LoL_tail, measure, nabor, lists, where);
             --num_left;
 
-            for (k = S_i[nabor]+1; k < S_i[nabor+1]; k++)
+            for (k = S_i[nabor] + 1; k < S_i[nabor + 1]; k++)
             {
                nabor_two = S_j[k];
                if (CF_marker[nabor_two] == UNDECIDED)
@@ -1336,7 +1486,7 @@ hypre_BoomerAMGIndepRSa( hypre_ParCSRMatrix    *S,
             }
          }
       }
-      for (j = S_i[index]+1; j < S_i[index+1]; j++)
+      for (j = S_i[index] + 1; j < S_i[index + 1]; j++)
       {
          nabor = S_j[j];
          if (CF_marker[nabor] == UNDECIDED)
@@ -1355,7 +1505,7 @@ hypre_BoomerAMGIndepRSa( hypre_ParCSRMatrix    *S,
                CF_marker[nabor] = F_PT;
                --num_left;
 
-               for (k = S_i[nabor]+1; k < S_i[nabor+1]; k++)
+               for (k = S_i[nabor] + 1; k < S_i[nabor + 1]; k++)
                {
                   nabor_two = S_j[k];
                   if (CF_marker[nabor_two] == UNDECIDED)
@@ -1387,8 +1537,8 @@ hypre_BoomerAMGIndepRSa( hypre_ParCSRMatrix    *S,
 
    if (measure_type == 2)
    {
-      for (i=0; i < num_variables; i++)
-         if (CF_marker[i] == 2) CF_marker[i] = 0;
+      for (i = 0; i < num_variables; i++)
+         if (CF_marker[i] == 2) { CF_marker[i] = 0; }
    }
 
    hypre_TFree(lists, HYPRE_MEMORY_HOST);
@@ -1402,48 +1552,54 @@ hypre_BoomerAMGIndepRSa( hypre_ParCSRMatrix    *S,
 
 HYPRE_Int
 hypre_BoomerAMGIndepHMIS( hypre_ParCSRMatrix    *S,
-                          HYPRE_Int                    measure_type,
-                          HYPRE_Int                    debug_flag,
-                          HYPRE_Int                   *CF_marker)
+                          HYPRE_Int              measure_type,
+                          HYPRE_Int              debug_flag,
+                          HYPRE_Int             *CF_marker)
 {
-   HYPRE_Int                num_procs;
-   MPI_Comm comm = hypre_ParCSRMatrixComm(S);
+   HYPRE_UNUSED_VAR(measure_type);
+
+   HYPRE_Int    num_procs;
+   MPI_Comm     comm = hypre_ParCSRMatrixComm(S);
+
+   hypre_MPI_Comm_size(comm, &num_procs);
 
-   hypre_MPI_Comm_size(comm,&num_procs);
    /*-------------------------------------------------------
     * Perform Ruge coarsening followed by CLJP coarsening
     *-------------------------------------------------------*/
 
-   hypre_BoomerAMGIndepRS (S, 2, debug_flag,
-                           CF_marker);
+   hypre_BoomerAMGIndepRS(S, 2, debug_flag, CF_marker);
 
    if (num_procs > 1)
-      hypre_BoomerAMGIndepPMIS (S, 0, debug_flag,
-                                CF_marker);
+   {
+      hypre_BoomerAMGIndepPMIS(S, 0, debug_flag, CF_marker);
+   }
 
    return hypre_error_flag;
 }
 
 HYPRE_Int
 hypre_BoomerAMGIndepHMISa( hypre_ParCSRMatrix    *S,
-                           HYPRE_Int                    measure_type,
-                           HYPRE_Int                    debug_flag,
-                           HYPRE_Int                   *CF_marker)
+                           HYPRE_Int              measure_type,
+                           HYPRE_Int              debug_flag,
+                           HYPRE_Int             *CF_marker)
 {
-   HYPRE_Int                num_procs;
-   MPI_Comm comm = hypre_ParCSRMatrixComm(S);
+   HYPRE_UNUSED_VAR(measure_type);
+
+   HYPRE_Int    num_procs;
+   MPI_Comm     comm = hypre_ParCSRMatrixComm(S);
+
+   hypre_MPI_Comm_size(comm, &num_procs);
 
-   hypre_MPI_Comm_size(comm,&num_procs);
    /*-------------------------------------------------------
     * Perform Ruge coarsening followed by CLJP coarsening
     *-------------------------------------------------------*/
 
-   hypre_BoomerAMGIndepRSa (S, 2, debug_flag,
-                            CF_marker);
+   hypre_BoomerAMGIndepRSa(S, 2, debug_flag, CF_marker);
 
    if (num_procs > 1)
-      hypre_BoomerAMGIndepPMISa (S, 0, debug_flag,
-                                 CF_marker);
+   {
+      hypre_BoomerAMGIndepPMISa(S, 0, debug_flag, CF_marker);
+   }
 
    return hypre_error_flag;
 }
@@ -1470,20 +1626,20 @@ hypre_BoomerAMGIndepPMIS( hypre_ParCSRMatrix    *S,
                           HYPRE_Int              debug_flag,
                           HYPRE_Int             *CF_marker)
 {
-   MPI_Comm            comm            = hypre_ParCSRMatrixComm(S);
-   hypre_ParCSRCommPkg      *comm_pkg        = hypre_ParCSRMatrixCommPkg(S);
-   hypre_ParCSRCommHandle   *comm_handle;
+   MPI_Comm                comm          = hypre_ParCSRMatrixComm(S);
+   hypre_ParCSRCommPkg    *comm_pkg      = hypre_ParCSRMatrixCommPkg(S);
+   hypre_ParCSRCommHandle *comm_handle;
 
-   hypre_CSRMatrix    *S_diag          = hypre_ParCSRMatrixDiag(S);
-   HYPRE_Int          *S_diag_i        = hypre_CSRMatrixI(S_diag);
-   HYPRE_Int          *S_diag_j        = hypre_CSRMatrixJ(S_diag);
+   hypre_CSRMatrix        *S_diag        = hypre_ParCSRMatrixDiag(S);
+   HYPRE_Int              *S_diag_i      = hypre_CSRMatrixI(S_diag);
+   HYPRE_Int              *S_diag_j      = hypre_CSRMatrixJ(S_diag);
 
-   hypre_CSRMatrix    *S_offd          = hypre_ParCSRMatrixOffd(S);
-   HYPRE_Int          *S_offd_i        = hypre_CSRMatrixI(S_offd);
-   HYPRE_Int          *S_offd_j;
+   hypre_CSRMatrix        *S_offd        = hypre_ParCSRMatrixOffd(S);
+   HYPRE_Int              *S_offd_i      = hypre_CSRMatrixI(S_offd);
+   HYPRE_Int              *S_offd_j      = NULL;
 
-   HYPRE_Int           num_variables   = hypre_CSRMatrixNumRows(S_diag);
-   HYPRE_Int           num_cols_offd = 0;
+   HYPRE_Int               num_variables = hypre_CSRMatrixNumRows(S_diag);
+   HYPRE_Int               num_cols_offd = 0;
 
    HYPRE_Int           num_sends = 0;
    HYPRE_Int          *int_buf_data;
@@ -1503,7 +1659,6 @@ hypre_BoomerAMGIndepPMIS( hypre_ParCSRMatrix    *S,
 
 
    HYPRE_Real       wall_time;
-   HYPRE_Int   iter = 0;
 
 
 
@@ -1536,9 +1691,9 @@ hypre_BoomerAMGIndepPMIS( hypre_ParCSRMatrix    *S,
     *----------------------------------------------------------------*/
 
    /*S_ext = NULL; */
-   if (debug_flag == 3) wall_time = time_getWallclockSeconds();
-   hypre_MPI_Comm_size(comm,&num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   if (debug_flag == 3) { wall_time = time_getWallclockSeconds(); }
+   hypre_MPI_Comm_size(comm, &num_procs);
+   hypre_MPI_Comm_rank(comm, &my_id);
 
    if (!comm_pkg)
    {
@@ -1554,9 +1709,9 @@ hypre_BoomerAMGIndepPMIS( hypre_ParCSRMatrix    *S,
    num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
 
    int_buf_data = hypre_CTAlloc(HYPRE_Int,  hypre_ParCSRCommPkgSendMapStart(comm_pkg,
-                                                         num_sends), HYPRE_MEMORY_HOST);
+                                                                            num_sends), HYPRE_MEMORY_HOST);
    buf_data = hypre_CTAlloc(HYPRE_Real,  hypre_ParCSRCommPkgSendMapStart(comm_pkg,
-                                                     num_sends), HYPRE_MEMORY_HOST);
+                                                                         num_sends), HYPRE_MEMORY_HOST);
 
    num_cols_offd = hypre_CSRMatrixNumCols(S_offd);
 
@@ -1569,12 +1724,18 @@ hypre_BoomerAMGIndepPMIS( hypre_ParCSRMatrix    *S,
 
    /* now the off-diagonal part of CF_marker */
    if (num_cols_offd)
+   {
       CF_marker_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_offd, HYPRE_MEMORY_HOST);
+   }
    else
+   {
       CF_marker_offd = NULL;
+   }
 
-   for (i=0; i < num_cols_offd; i++)
+   for (i = 0; i < num_cols_offd; i++)
+   {
       CF_marker_offd[i] = 0;
+   }
 
    /*------------------------------------------------
     * Communicate the CF_marker values to the external nodes
@@ -1583,9 +1744,9 @@ hypre_BoomerAMGIndepPMIS( hypre_ParCSRMatrix    *S,
    for (i = 0; i < num_sends; i++)
    {
       start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
       {
-         jrow = hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j);
+         jrow = hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j);
          int_buf_data[index++] = CF_marker[jrow];
       }
    }
@@ -1609,24 +1770,30 @@ hypre_BoomerAMGIndepPMIS( hypre_ParCSRMatrix    *S,
     * between 0 and 1.
     *----------------------------------------------------------*/
 
-   measure_array = hypre_CTAlloc(HYPRE_Real,  num_variables+num_cols_offd, HYPRE_MEMORY_HOST);
-   for (i=0; i < num_variables+num_cols_offd; i++)
+   measure_array = hypre_CTAlloc(HYPRE_Real,  num_variables + num_cols_offd, HYPRE_MEMORY_HOST);
+   for (i = 0; i < num_variables + num_cols_offd; i++)
+   {
       measure_array[i] = 0;
+   }
 
    /* calculate the local part for the local nodes */
-   for (i=0; i < num_variables; i++)
+   for (i = 0; i < num_variables; i++)
    {
       if (CF_marker[i] < 1)
       {
-         for (j = S_diag_i[i]; j < S_diag_i[i+1]; j++)
+         for (j = S_diag_i[i]; j < S_diag_i[i + 1]; j++)
          {
             if (CF_marker[S_diag_j[j]] < 1)
+            {
                measure_array[S_diag_j[j]] += 1.0;
+            }
          }
-         for (j = S_offd_i[i]; j < S_offd_i[i+1]; j++)
+         for (j = S_offd_i[i]; j < S_offd_i[i + 1]; j++)
          {
             if (CF_marker_offd[S_offd_j[j]] < 1)
+            {
                measure_array[num_variables + S_offd_j[j]] += 1.0;
+            }
          }
       }
    }
@@ -1638,20 +1805,22 @@ hypre_BoomerAMGIndepPMIS( hypre_ParCSRMatrix    *S,
 
    /* finish the communication */
    if (num_procs > 1)
+   {
       hypre_ParCSRCommHandleDestroy(comm_handle);
+   }
 
    /* now add the externally calculated part of the local nodes to the local nodes */
    index = 0;
-   for (i=0; i < num_sends; i++)
+   for (i = 0; i < num_sends; i++)
    {
       start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-      for (j=start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
-         measure_array[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)]
-            += buf_data[index++];
+      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
+         measure_array[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)]
+         += buf_data[index++];
    }
 
    /* set the measures of the external nodes to zero */
-   for (i=num_variables; i < num_variables+num_cols_offd; i++)
+   for (i = num_variables; i < num_variables + num_cols_offd; i++)
    {
       measure_array[i] = 0;
    }
@@ -1659,7 +1828,7 @@ hypre_BoomerAMGIndepPMIS( hypre_ParCSRMatrix    *S,
    /* this augments the measures with a random number between 0 and 1 */
    /* (only for the local part) */
    /* this augments the measures */
-   i = 2747+my_id;
+   i = 2747 + my_id;
    hypre_SeedRand(i);
    for (i = 0; i < num_variables; i++)
    {
@@ -1672,29 +1841,37 @@ hypre_BoomerAMGIndepPMIS( hypre_ParCSRMatrix    *S,
 
    /* first the off-diagonal part of the graph array */
    if (num_cols_offd)
+   {
       graph_array_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_offd, HYPRE_MEMORY_HOST);
+   }
    else
+   {
       graph_array_offd = NULL;
+   }
 
    for (ig = 0; ig < num_cols_offd; ig++)
+   {
       graph_array_offd[ig] = ig;
+   }
 
    graph_offd_size = num_cols_offd;
 
    /* now the local part of the graph array, and the local CF_marker array */
    graph_array = hypre_CTAlloc(HYPRE_Int,  num_variables, HYPRE_MEMORY_HOST);
 
-   if (CF_init==1)
+   if (CF_init == 1)
    {
       cnt = 0;
-      for (i=0; i < num_variables; i++)
+      for (i = 0; i < num_variables; i++)
       {
-         if ( (S_offd_i[i+1]-S_offd_i[i]) > 0 || CF_marker[i] == -1)
+         if ( (S_offd_i[i + 1] - S_offd_i[i]) > 0 || CF_marker[i] == -1)
          {
             CF_marker[i] = 0;
          }
          if (CF_marker[i] == SF_PT)
+         {
             measure_array[i] = 0;
+         }
          else if ( CF_marker[i] < 1)
          {
             if (measure_array[i] >= 1.0 )
@@ -1709,20 +1886,26 @@ hypre_BoomerAMGIndepPMIS( hypre_ParCSRMatrix    *S,
             }
          }
          else
+         {
             measure_array[i] = 0;
+         }
       }
    }
    else
    {
       cnt = 0;
-      for (i=0; i < num_variables; i++)
+      for (i = 0; i < num_variables; i++)
       {
          if (CF_marker[i] == 0)
          {
             if ( measure_array[i] >= 1.0 )
+            {
                graph_array[cnt++] = i;
+            }
             else
+            {
                CF_marker[i] = F_PT;
+            }
          }
          else
          {
@@ -1740,9 +1923,9 @@ hypre_BoomerAMGIndepPMIS( hypre_ParCSRMatrix    *S,
    for (i = 0; i < num_sends; i++)
    {
       start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
       {
-         jrow = hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j);
+         jrow = hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j);
          buf_data[index++] = measure_array[jrow];
       }
    }
@@ -1776,10 +1959,12 @@ hypre_BoomerAMGIndepPMIS( hypre_ParCSRMatrix    *S,
 
       HYPRE_BigInt big_graph_size = (HYPRE_BigInt) graph_size;
       /* stop the coarsening if nothing left to be coarsened */
-      hypre_MPI_Allreduce(&big_graph_size,&global_graph_size,1,HYPRE_MPI_BIG_INT,hypre_MPI_SUM,comm);
+      hypre_MPI_Allreduce(&big_graph_size, &global_graph_size, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
 
       if (global_graph_size == 0)
+      {
          break;
+      }
 
       /*     hypre_printf("\n");
              hypre_printf("*** MIS iteration %d\n",iter);
@@ -1801,13 +1986,17 @@ hypre_BoomerAMGIndepPMIS( hypre_ParCSRMatrix    *S,
          {
             i = graph_array[ig];
             if (measure_array[i] > 1)
+            {
                CF_marker[i] = 1;
+            }
          }
          for (ig = 0; ig < graph_offd_size; ig++)
          {
             i = graph_array_offd[ig];
-            if (measure_array[i+num_variables] > 1)
+            if (measure_array[i + num_variables] > 1)
+            {
                CF_marker_offd[i] = 1;
+            }
          }
          /*-------------------------------------------------------
           * Remove nodes from the initial independent set
@@ -1818,29 +2007,37 @@ hypre_BoomerAMGIndepPMIS( hypre_ParCSRMatrix    *S,
             i = graph_array[ig];
             if (measure_array[i] > 1)
             {
-               for (jS = S_diag_i[i]; jS < S_diag_i[i+1]; jS++)
+               for (jS = S_diag_i[i]; jS < S_diag_i[i + 1]; jS++)
                {
                   j = S_diag_j[jS];
 
                   if (measure_array[j] > 1)
                   {
                      if (measure_array[i] > measure_array[j])
+                     {
                         CF_marker[j] = 0;
+                     }
                      else if (measure_array[j] > measure_array[i])
+                     {
                         CF_marker[i] = 0;
+                     }
                   }
                }
-               for (jS = S_offd_i[i]; jS < S_offd_i[i+1]; jS++)
+               for (jS = S_offd_i[i]; jS < S_offd_i[i + 1]; jS++)
                {
                   jj = S_offd_j[jS];
-                  j = num_variables+jj;
+                  j = num_variables + jj;
 
                   if (measure_array[j] > 1)
                   {
                      if (measure_array[i] > measure_array[j])
+                     {
                         CF_marker_offd[jj] = 0;
+                     }
                      else if (measure_array[j] > measure_array[i])
+                     {
                         CF_marker[i] = 0;
+                     }
                   }
                }
             }
@@ -1863,9 +2060,9 @@ hypre_BoomerAMGIndepPMIS( hypre_ParCSRMatrix    *S,
          for (i = 0; i < num_sends; i++)
          {
             start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-            for (j=start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+            for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
             {
-               elmt = hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j);
+               elmt = hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j);
                if (!int_buf_data[index] && CF_marker[elmt] > 0)
                {
                   CF_marker[elmt] = 0;
@@ -1887,12 +2084,15 @@ hypre_BoomerAMGIndepPMIS( hypre_ParCSRMatrix    *S,
          }
       }
 
+#if 0 /* debugging */
       iter++;
+#endif
       /*------------------------------------------------
        * Set C-pts and F-pts.
        *------------------------------------------------*/
 
-      for (ig = 0; ig < graph_size; ig++) {
+      for (ig = 0; ig < graph_size; ig++)
+      {
          i = graph_array[ig];
 
          /*---------------------------------------------
@@ -1928,17 +2128,21 @@ hypre_BoomerAMGIndepPMIS( hypre_ParCSRMatrix    *S,
          {
 
             /* first the local part */
-            for (jS = S_diag_i[i]; jS < S_diag_i[i+1]; jS++) {
+            for (jS = S_diag_i[i]; jS < S_diag_i[i + 1]; jS++)
+            {
                /* j is the column number, or the local number of the point influencing i */
                j = S_diag_j[jS];
-               if (CF_marker[j] > 0){ /* j is a C-point */
+               if (CF_marker[j] > 0)  /* j is a C-point */
+               {
                   CF_marker[i] = F_PT;
                }
             }
             /* now the external part */
-            for (jS = S_offd_i[i]; jS < S_offd_i[i+1]; jS++) {
+            for (jS = S_offd_i[i]; jS < S_offd_i[i + 1]; jS++)
+            {
                j = S_offd_j[jS];
-               if (CF_marker_offd[j] > 0){ /* j is a C-point */
+               if (CF_marker_offd[j] > 0)  /* j is a C-point */
+               {
                   CF_marker[i] = F_PT;
                }
             }
@@ -1958,9 +2162,9 @@ hypre_BoomerAMGIndepPMIS( hypre_ParCSRMatrix    *S,
       for (i = 0; i < num_sends; i++)
       {
          start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
             int_buf_data[index++]
-               = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+               = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
       }
 
       if (num_procs > 1)
@@ -1975,10 +2179,11 @@ hypre_BoomerAMGIndepPMIS( hypre_ParCSRMatrix    *S,
        * Update subgraph
        *------------------------------------------------*/
 
-      for (ig = 0; ig < graph_size; ig++) {
+      for (ig = 0; ig < graph_size; ig++)
+      {
          i = graph_array[ig];
 
-         if (CF_marker[i]!=0) /* C or F point */
+         if (CF_marker[i] != 0) /* C or F point */
          {
             /* the independent set subroutine needs measure 0 for
                removed nodes */
@@ -1990,14 +2195,15 @@ hypre_BoomerAMGIndepPMIS( hypre_ParCSRMatrix    *S,
             ig--;
          }
       }
-      for (ig = 0; ig < graph_offd_size; ig++) {
+      for (ig = 0; ig < graph_offd_size; ig++)
+      {
          i = graph_array_offd[ig];
 
-         if (CF_marker_offd[i]!=0) /* C or F point */
+         if (CF_marker_offd[i] != 0) /* C or F point */
          {
             /* the independent set subroutine needs measure 0 for
                removed nodes */
-            measure_array[i+num_variables] = 0;
+            measure_array[i + num_variables] = 0;
             /* take point out of the subgraph */
             graph_offd_size--;
             graph_array_offd[ig] = graph_array_offd[graph_offd_size];
@@ -2025,7 +2231,7 @@ hypre_BoomerAMGIndepPMIS( hypre_ParCSRMatrix    *S,
 
    hypre_TFree(measure_array, HYPRE_MEMORY_HOST);
    hypre_TFree(graph_array, HYPRE_MEMORY_HOST);
-   if (num_cols_offd) hypre_TFree(graph_array_offd, HYPRE_MEMORY_HOST);
+   if (num_cols_offd) { hypre_TFree(graph_array_offd, HYPRE_MEMORY_HOST); }
    hypre_TFree(buf_data, HYPRE_MEMORY_HOST);
    hypre_TFree(int_buf_data, HYPRE_MEMORY_HOST);
    hypre_TFree(CF_marker_offd, HYPRE_MEMORY_HOST);
@@ -2038,20 +2244,20 @@ hypre_BoomerAMGIndepPMISa( hypre_ParCSRMatrix    *S,
                            HYPRE_Int              debug_flag,
                            HYPRE_Int             *CF_marker)
 {
-   MPI_Comm            comm            = hypre_ParCSRMatrixComm(S);
-   hypre_ParCSRCommPkg      *comm_pkg        = hypre_ParCSRMatrixCommPkg(S);
-   hypre_ParCSRCommHandle   *comm_handle;
+   MPI_Comm                comm          = hypre_ParCSRMatrixComm(S);
+   hypre_ParCSRCommPkg    *comm_pkg      = hypre_ParCSRMatrixCommPkg(S);
+   hypre_ParCSRCommHandle *comm_handle;
 
-   hypre_CSRMatrix    *S_diag          = hypre_ParCSRMatrixDiag(S);
-   HYPRE_Int          *S_diag_i        = hypre_CSRMatrixI(S_diag);
-   HYPRE_Int          *S_diag_j        = hypre_CSRMatrixJ(S_diag);
+   hypre_CSRMatrix        *S_diag        = hypre_ParCSRMatrixDiag(S);
+   HYPRE_Int              *S_diag_i      = hypre_CSRMatrixI(S_diag);
+   HYPRE_Int              *S_diag_j      = hypre_CSRMatrixJ(S_diag);
 
-   hypre_CSRMatrix    *S_offd          = hypre_ParCSRMatrixOffd(S);
-   HYPRE_Int          *S_offd_i        = hypre_CSRMatrixI(S_offd);
-   HYPRE_Int          *S_offd_j;
+   hypre_CSRMatrix        *S_offd        = hypre_ParCSRMatrixOffd(S);
+   HYPRE_Int              *S_offd_i      = hypre_CSRMatrixI(S_offd);
+   HYPRE_Int              *S_offd_j      = NULL;
 
-   HYPRE_Int           num_variables   = hypre_CSRMatrixNumRows(S_diag);
-   HYPRE_Int           num_cols_offd = 0;
+   HYPRE_Int               num_variables = hypre_CSRMatrixNumRows(S_diag);
+   HYPRE_Int               num_cols_offd = 0;
 
    HYPRE_Int           num_sends = 0;
    HYPRE_Int          *int_buf_data;
@@ -2071,7 +2277,6 @@ hypre_BoomerAMGIndepPMISa( hypre_ParCSRMatrix    *S,
 
 
    HYPRE_Real       wall_time;
-   HYPRE_Int   iter = 0;
 
 
 
@@ -2104,9 +2309,9 @@ hypre_BoomerAMGIndepPMISa( hypre_ParCSRMatrix    *S,
     *----------------------------------------------------------------*/
 
    /*S_ext = NULL; */
-   if (debug_flag == 3) wall_time = time_getWallclockSeconds();
-   hypre_MPI_Comm_size(comm,&num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   if (debug_flag == 3) { wall_time = time_getWallclockSeconds(); }
+   hypre_MPI_Comm_size(comm, &num_procs);
+   hypre_MPI_Comm_rank(comm, &my_id);
 
    if (!comm_pkg)
    {
@@ -2123,9 +2328,9 @@ hypre_BoomerAMGIndepPMISa( hypre_ParCSRMatrix    *S,
    num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
 
    int_buf_data = hypre_CTAlloc(HYPRE_Int,  hypre_ParCSRCommPkgSendMapStart(comm_pkg,
-                                                            num_sends), HYPRE_MEMORY_HOST);
+                                                                            num_sends), HYPRE_MEMORY_HOST);
    buf_data = hypre_CTAlloc(HYPRE_Real,  hypre_ParCSRCommPkgSendMapStart(comm_pkg,
-                                                          num_sends), HYPRE_MEMORY_HOST);
+                                                                         num_sends), HYPRE_MEMORY_HOST);
 
    num_cols_offd = hypre_CSRMatrixNumCols(S_offd);
 
@@ -2138,12 +2343,18 @@ hypre_BoomerAMGIndepPMISa( hypre_ParCSRMatrix    *S,
 
    /* now the off-diagonal part of CF_marker */
    if (num_cols_offd)
+   {
       CF_marker_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_offd, HYPRE_MEMORY_HOST);
+   }
    else
+   {
       CF_marker_offd = NULL;
+   }
 
-   for (i=0; i < num_cols_offd; i++)
+   for (i = 0; i < num_cols_offd; i++)
+   {
       CF_marker_offd[i] = 0;
+   }
 
    /*------------------------------------------------
     * Communicate the CF_marker values to the external nodes
@@ -2152,9 +2363,9 @@ hypre_BoomerAMGIndepPMISa( hypre_ParCSRMatrix    *S,
    for (i = 0; i < num_sends; i++)
    {
       start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
       {
-         jrow = hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j);
+         jrow = hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j);
          int_buf_data[index++] = CF_marker[jrow];
       }
    }
@@ -2178,24 +2389,30 @@ hypre_BoomerAMGIndepPMISa( hypre_ParCSRMatrix    *S,
     * between 0 and 1.
     *----------------------------------------------------------*/
 
-   measure_array = hypre_CTAlloc(HYPRE_Real,  num_variables+num_cols_offd, HYPRE_MEMORY_HOST);
-   for (i=0; i < num_variables+num_cols_offd; i++)
+   measure_array = hypre_CTAlloc(HYPRE_Real,  num_variables + num_cols_offd, HYPRE_MEMORY_HOST);
+   for (i = 0; i < num_variables + num_cols_offd; i++)
+   {
       measure_array[i] = 0;
+   }
 
    /* calculate the local part for the local nodes */
-   for (i=0; i < num_variables; i++)
+   for (i = 0; i < num_variables; i++)
    {
       if (CF_marker[i] < 1)
       {
-         for (j = S_diag_i[i]+1; j < S_diag_i[i+1]; j++)
+         for (j = S_diag_i[i] + 1; j < S_diag_i[i + 1]; j++)
          {
             if (CF_marker[S_diag_j[j]] < 1)
+            {
                measure_array[S_diag_j[j]] += 1.0;
+            }
          }
-         for (j = S_offd_i[i]; j < S_offd_i[i+1]; j++)
+         for (j = S_offd_i[i]; j < S_offd_i[i + 1]; j++)
          {
             if (CF_marker_offd[S_offd_j[j]] < 1)
+            {
                measure_array[num_variables + S_offd_j[j]] += 1.0;
+            }
          }
       }
    }
@@ -2207,20 +2424,22 @@ hypre_BoomerAMGIndepPMISa( hypre_ParCSRMatrix    *S,
 
    /* finish the communication */
    if (num_procs > 1)
+   {
       hypre_ParCSRCommHandleDestroy(comm_handle);
+   }
 
    /* now add the externally calculated part of the local nodes to the local nodes */
    index = 0;
-   for (i=0; i < num_sends; i++)
+   for (i = 0; i < num_sends; i++)
    {
       start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-      for (j=start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
-         measure_array[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)]
-            += buf_data[index++];
+      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
+         measure_array[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)]
+         += buf_data[index++];
    }
 
    /* set the measures of the external nodes to zero */
-   for (i=num_variables; i < num_variables+num_cols_offd; i++)
+   for (i = num_variables; i < num_variables + num_cols_offd; i++)
    {
       measure_array[i] = 0;
    }
@@ -2228,7 +2447,7 @@ hypre_BoomerAMGIndepPMISa( hypre_ParCSRMatrix    *S,
    /* this augments the measures with a random number between 0 and 1 */
    /* (only for the local part) */
    /* this augments the measures */
-   i = 2747+my_id;
+   i = 2747 + my_id;
    hypre_SeedRand(i);
    for (i = 0; i < num_variables; i++)
    {
@@ -2241,29 +2460,37 @@ hypre_BoomerAMGIndepPMISa( hypre_ParCSRMatrix    *S,
 
    /* first the off-diagonal part of the graph array */
    if (num_cols_offd)
+   {
       graph_array_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_offd, HYPRE_MEMORY_HOST);
+   }
    else
+   {
       graph_array_offd = NULL;
+   }
 
    for (ig = 0; ig < num_cols_offd; ig++)
+   {
       graph_array_offd[ig] = ig;
+   }
 
    graph_offd_size = num_cols_offd;
 
    /* now the local part of the graph array, and the local CF_marker array */
    graph_array = hypre_CTAlloc(HYPRE_Int,  num_variables, HYPRE_MEMORY_HOST);
 
-   if (CF_init==1)
+   if (CF_init == 1)
    {
       cnt = 0;
-      for (i=0; i < num_variables; i++)
+      for (i = 0; i < num_variables; i++)
       {
-         if ( (S_offd_i[i+1]-S_offd_i[i]) > 0 || CF_marker[i] == -1)
+         if ( (S_offd_i[i + 1] - S_offd_i[i]) > 0 || CF_marker[i] == -1)
          {
             CF_marker[i] = 0;
          }
          if (CF_marker[i] == SF_PT)
+         {
             measure_array[i] = 0;
+         }
          else if ( CF_marker[i] < 1)
          {
             if (measure_array[i] >= 1.0 )
@@ -2278,20 +2505,24 @@ hypre_BoomerAMGIndepPMISa( hypre_ParCSRMatrix    *S,
             }
          }
          else
+         {
             measure_array[i] = 0;
+         }
       }
    }
    else
    {
       cnt = 0;
-      for (i=0; i < num_variables; i++)
+      for (i = 0; i < num_variables; i++)
       {
          if (CF_marker[i] == 0 && measure_array[i] >= 1.0 )
          {
             graph_array[cnt++] = i;
          }
          else
+         {
             measure_array[i] = 0;
+         }
       }
    }
    graph_size = cnt;
@@ -2304,9 +2535,9 @@ hypre_BoomerAMGIndepPMISa( hypre_ParCSRMatrix    *S,
    for (i = 0; i < num_sends; i++)
    {
       start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
       {
-         jrow = hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j);
+         jrow = hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j);
          buf_data[index++] = measure_array[jrow];
       }
    }
@@ -2340,10 +2571,12 @@ hypre_BoomerAMGIndepPMISa( hypre_ParCSRMatrix    *S,
 
       HYPRE_BigInt big_graph_size = (HYPRE_BigInt) graph_size;
       /* stop the coarsening if nothing left to be coarsened */
-      hypre_MPI_Allreduce(&big_graph_size,&global_graph_size,1,HYPRE_MPI_INT,hypre_MPI_SUM,comm);
+      hypre_MPI_Allreduce(&big_graph_size, &global_graph_size, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
 
       if (global_graph_size == 0)
+      {
          break;
+      }
 
       /*     hypre_printf("\n");
              hypre_printf("*** MIS iteration %d\n",iter);
@@ -2365,13 +2598,17 @@ hypre_BoomerAMGIndepPMISa( hypre_ParCSRMatrix    *S,
          {
             i = graph_array[ig];
             if (measure_array[i] > 1)
+            {
                CF_marker[i] = 1;
+            }
          }
          for (ig = 0; ig < graph_offd_size; ig++)
          {
             i = graph_array_offd[ig];
-            if (measure_array[i+num_variables] > 1)
+            if (measure_array[i + num_variables] > 1)
+            {
                CF_marker_offd[i] = 1;
+            }
          }
          /*-------------------------------------------------------
           * Remove nodes from the initial independent set
@@ -2382,29 +2619,37 @@ hypre_BoomerAMGIndepPMISa( hypre_ParCSRMatrix    *S,
             i = graph_array[ig];
             if (measure_array[i] > 1)
             {
-               for (jS = S_diag_i[i]+1; jS < S_diag_i[i+1]; jS++)
+               for (jS = S_diag_i[i] + 1; jS < S_diag_i[i + 1]; jS++)
                {
                   j = S_diag_j[jS];
 
                   if (measure_array[j] > 1)
                   {
                      if (measure_array[i] > measure_array[j])
+                     {
                         CF_marker[j] = 0;
+                     }
                      else if (measure_array[j] > measure_array[i])
+                     {
                         CF_marker[i] = 0;
+                     }
                   }
                }
-               for (jS = S_offd_i[i]; jS < S_offd_i[i+1]; jS++)
+               for (jS = S_offd_i[i]; jS < S_offd_i[i + 1]; jS++)
                {
                   jj = S_offd_j[jS];
-                  j = num_variables+jj;
+                  j = num_variables + jj;
 
                   if (measure_array[j] > 1)
                   {
                      if (measure_array[i] > measure_array[j])
+                     {
                         CF_marker_offd[jj] = 0;
+                     }
                      else if (measure_array[j] > measure_array[i])
+                     {
                         CF_marker[i] = 0;
+                     }
                   }
                }
             }
@@ -2427,9 +2672,9 @@ hypre_BoomerAMGIndepPMISa( hypre_ParCSRMatrix    *S,
          for (i = 0; i < num_sends; i++)
          {
             start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-            for (j=start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+            for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
             {
-               elmt = hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j);
+               elmt = hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j);
                if (!int_buf_data[index] && CF_marker[elmt] > 0)
                {
                   CF_marker[elmt] = 0;
@@ -2451,12 +2696,15 @@ hypre_BoomerAMGIndepPMISa( hypre_ParCSRMatrix    *S,
          }
       }
 
+#if 0 /* debugging */
       iter++;
+#endif
       /*------------------------------------------------
        * Set C-pts and F-pts.
        *------------------------------------------------*/
 
-      for (ig = 0; ig < graph_size; ig++) {
+      for (ig = 0; ig < graph_size; ig++)
+      {
          i = graph_array[ig];
 
          /*---------------------------------------------
@@ -2481,17 +2729,21 @@ hypre_BoomerAMGIndepPMISa( hypre_ParCSRMatrix    *S,
          {
 
             /* first the local part */
-            for (jS = S_diag_i[i]+1; jS < S_diag_i[i+1]; jS++) {
+            for (jS = S_diag_i[i] + 1; jS < S_diag_i[i + 1]; jS++)
+            {
                /* j is the column number, or the local number of the point influencing i */
                j = S_diag_j[jS];
-               if (CF_marker[j] > 0){ /* j is a C-point */
+               if (CF_marker[j] > 0)  /* j is a C-point */
+               {
                   CF_marker[i] = F_PT;
                }
             }
             /* now the external part */
-            for (jS = S_offd_i[i]; jS < S_offd_i[i+1]; jS++) {
+            for (jS = S_offd_i[i]; jS < S_offd_i[i + 1]; jS++)
+            {
                j = S_offd_j[jS];
-               if (CF_marker_offd[j] > 0){ /* j is a C-point */
+               if (CF_marker_offd[j] > 0)  /* j is a C-point */
+               {
                   CF_marker[i] = F_PT;
                }
             }
@@ -2511,9 +2763,9 @@ hypre_BoomerAMGIndepPMISa( hypre_ParCSRMatrix    *S,
       for (i = 0; i < num_sends; i++)
       {
          start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
             int_buf_data[index++]
-               = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+               = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
       }
 
       if (num_procs > 1)
@@ -2528,10 +2780,11 @@ hypre_BoomerAMGIndepPMISa( hypre_ParCSRMatrix    *S,
        * Update subgraph
        *------------------------------------------------*/
 
-      for (ig = 0; ig < graph_size; ig++) {
+      for (ig = 0; ig < graph_size; ig++)
+      {
          i = graph_array[ig];
 
-         if (CF_marker[i]!=0) /* C or F point */
+         if (CF_marker[i] != 0) /* C or F point */
          {
             /* the independent set subroutine needs measure 0 for
                removed nodes */
@@ -2543,14 +2796,15 @@ hypre_BoomerAMGIndepPMISa( hypre_ParCSRMatrix    *S,
             ig--;
          }
       }
-      for (ig = 0; ig < graph_offd_size; ig++) {
+      for (ig = 0; ig < graph_offd_size; ig++)
+      {
          i = graph_array_offd[ig];
 
-         if (CF_marker_offd[i]!=0) /* C or F point */
+         if (CF_marker_offd[i] != 0) /* C or F point */
          {
             /* the independent set subroutine needs measure 0 for
                removed nodes */
-            measure_array[i+num_variables] = 0;
+            measure_array[i + num_variables] = 0;
             /* take point out of the subgraph */
             graph_offd_size--;
             graph_array_offd[ig] = graph_array_offd[graph_offd_size];
@@ -2578,7 +2832,7 @@ hypre_BoomerAMGIndepPMISa( hypre_ParCSRMatrix    *S,
 
    hypre_TFree(measure_array, HYPRE_MEMORY_HOST);
    hypre_TFree(graph_array, HYPRE_MEMORY_HOST);
-   if (num_cols_offd) hypre_TFree(graph_array_offd, HYPRE_MEMORY_HOST);
+   if (num_cols_offd) { hypre_TFree(graph_array_offd, HYPRE_MEMORY_HOST); }
    hypre_TFree(buf_data, HYPRE_MEMORY_HOST);
    hypre_TFree(int_buf_data, HYPRE_MEMORY_HOST);
    hypre_TFree(CF_marker_offd, HYPRE_MEMORY_HOST);
@@ -2628,27 +2882,27 @@ hypre_BoomerAMGCoarsenCR( hypre_ParCSRMatrix    *A,
    HYPRE_Int       *CF_marker;
    /*HYPRE_Int             *CFN_marker;*/
    HYPRE_BigInt     coarse_size;
-   HYPRE_Int        i,j, jj, j2, nstages=0;
+   HYPRE_Int        i, j, jj, j2, nstages = 0;
    HYPRE_Int        num_procs, my_id, num_threads;
-   HYPRE_Int        num_nodes = num_variables/num_functions;
+   HYPRE_Int        num_nodes = num_variables / num_functions;
    HYPRE_Real       rho = 1.0;
    HYPRE_Real       gamma = 0.0;
-   HYPRE_Real       rho0,rho1,*e0,*e1, *sum = NULL;
+   HYPRE_Real       rho0, rho1, *e0, *e1, *sum = NULL;
    HYPRE_Real       rho_old, relrho;
    HYPRE_Real       *e2;
    HYPRE_Real       alpha, beta, gammaold;
    HYPRE_Int        num_coarse;
    HYPRE_BigInt     global_num_variables, global_nc = 0;
-   HYPRE_Real candmeas=0.0e0, local_max=0.0e0, global_max = 0;
+   HYPRE_Real candmeas = 0.0e0, local_max = 0.0e0, global_max = 0;
    /*HYPRE_Real thresh=1-rho;*/
-   HYPRE_Real thresh=0.5;
+   HYPRE_Real thresh = 0.5;
 
    hypre_ParVector    *Relax_temp = NULL;
 
 
 
-   hypre_MPI_Comm_size(comm,&num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_size(comm, &num_procs);
+   hypre_MPI_Comm_rank(comm, &my_id);
 
    num_threads = hypre_NumThreads();
 
@@ -2656,13 +2910,13 @@ hypre_BoomerAMGCoarsenCR( hypre_ParCSRMatrix    *A,
    global_num_variables = hypre_ParCSRMatrixGlobalNumRows(A);
    /*if(CRaddCpoints == 0)
      {*/
-   if(num_functions == 1)
+   if (num_functions == 1)
    {
       *CF_marker_ptr = hypre_IntArrayCreate(num_variables);
    }
    else
    {
-      num_nodes = num_variables/num_functions;
+      num_nodes = num_variables / num_functions;
       sum = hypre_CTAlloc(HYPRE_Real,  num_nodes, HYPRE_MEMORY_HOST);
       *CF_marker_ptr = hypre_IntArrayCreate(num_nodes);
    }
@@ -2685,37 +2939,37 @@ hypre_BoomerAMGCoarsenCR( hypre_ParCSRMatrix    *A,
 
    /* Run the CR routine */
 
-   if (my_id == 0) hypre_fprintf(stdout,"\n... Building CF using CR ...\n\n");
+   if (my_id == 0) { hypre_fprintf(stdout, "\n... Building CF using CR ...\n\n"); }
    /*cr(A_i, A_j, A_data, num_variables, CF_marker,
      RelaxScheme1, omega1, theta_global1,mu1);*/
 
-/* main cr routine */
-/*HYPRE_Int cr(HYPRE_Int *A_i, HYPRE_Int *A_j, HYPRE_Real *A_data, HYPRE_Int n, HYPRE_Int *cf,
-  HYPRE_Int rlx, HYPRE_Real omega, HYPRE_Real tg, HYPRE_Int mu)*/
+   /* main cr routine */
+   /*HYPRE_Int cr(HYPRE_Int *A_i, HYPRE_Int *A_j, HYPRE_Real *A_data, HYPRE_Int n, HYPRE_Int *cf,
+     HYPRE_Int rlx, HYPRE_Real omega, HYPRE_Real tg, HYPRE_Int mu)*/
 
-   e0_vec = hypre_ParVectorCreate(comm,global_num_rows,row_starts);
+   e0_vec = hypre_ParVectorCreate(comm, global_num_rows, row_starts);
    hypre_ParVectorInitialize(e0_vec);
-   e1_vec = hypre_ParVectorCreate(comm,global_num_rows,row_starts);
+   e1_vec = hypre_ParVectorCreate(comm, global_num_rows, row_starts);
    hypre_ParVectorInitialize(e1_vec);
-   e2_vec = hypre_ParVectorCreate(comm,global_num_rows,row_starts);
+   e2_vec = hypre_ParVectorCreate(comm, global_num_rows, row_starts);
    hypre_ParVectorInitialize(e2_vec);
-   Vtemp = hypre_ParVectorCreate(comm,global_num_rows,row_starts);
+   Vtemp = hypre_ParVectorCreate(comm, global_num_rows, row_starts);
    hypre_ParVectorInitialize(Vtemp);
    Vtemp_data = hypre_VectorData(hypre_ParVectorLocalVector(Vtemp));
-   Ptemp = hypre_ParVectorCreate(comm,global_num_rows,row_starts);
+   Ptemp = hypre_ParVectorCreate(comm, global_num_rows, row_starts);
    hypre_ParVectorInitialize(Ptemp);
    Ptemp_data = hypre_VectorData(hypre_ParVectorLocalVector(Ptemp));
-   Qtemp = hypre_ParVectorCreate(comm,global_num_rows,row_starts);
+   Qtemp = hypre_ParVectorCreate(comm, global_num_rows, row_starts);
    hypre_ParVectorInitialize(Qtemp);
-   Ztemp = hypre_ParVectorCreate(comm,global_num_rows,row_starts);
+   Ztemp = hypre_ParVectorCreate(comm, global_num_rows, row_starts);
    hypre_ParVectorInitialize(Ztemp);
    Ztemp_data = hypre_VectorData(hypre_ParVectorLocalVector(Ztemp));
-   Rtemp = hypre_ParVectorCreate(comm,global_num_rows,row_starts);
+   Rtemp = hypre_ParVectorCreate(comm, global_num_rows, row_starts);
    hypre_ParVectorInitialize(Rtemp);
 
    if (num_threads > 1)
    {
-      Relax_temp = hypre_ParVectorCreate(comm,global_num_rows,row_starts);
+      Relax_temp = hypre_ParVectorCreate(comm, global_num_rows, row_starts);
       hypre_ParVectorInitialize(Relax_temp);
    }
 
@@ -2725,25 +2979,27 @@ hypre_BoomerAMGCoarsenCR( hypre_ParCSRMatrix    *A,
 
    if (my_id == 0)
    {
-      hypre_fprintf(stdout,"Stage  \t rho \t alpha \n");
-      hypre_fprintf(stdout,"-----------------------\n");
+      hypre_fprintf(stdout, "Stage  \t rho \t alpha \n");
+      hypre_fprintf(stdout, "-----------------------\n");
    }
 
    for (i = 0; i < num_variables; i++)
+   {
       e1[i] = 1.0e0;
+   }
    /*e1[i] = 1.0e0+.1*hypre_RandI();*/
 
    /* stages */
-   while(1)
+   while (1)
    {
       if (nstages > 0)
       {
          if (num_functions == 1)
          {
-            for (i=0;i<num_variables;i++)
+            for (i = 0; i < num_variables; i++)
             {
                Vtemp_data[i] = 0.0e0;
-               if(CF_marker[i] == cpt)
+               if (CF_marker[i] == cpt)
                {
                   e0[i] = 0.0e0;
                   e1[i] = 0.0e0;
@@ -2753,11 +3009,11 @@ hypre_BoomerAMGCoarsenCR( hypre_ParCSRMatrix    *A,
          else
          {
             jj = 0;
-            for (i=0;i<num_nodes;i++)
+            for (i = 0; i < num_nodes; i++)
             {
-               for (j=0; j < num_functions; j++)
+               for (j = 0; j < num_functions; j++)
                {
-                  if(CF_marker[i] == cpt)
+                  if (CF_marker[i] == cpt)
                   {
                      e0[jj] = 0.0e0;
                      e1[jj] = 0.0e0;
@@ -2783,14 +3039,14 @@ hypre_BoomerAMGCoarsenCR( hypre_ParCSRMatrix    *A,
 
       if (smoother)
       {
-         for (i=0;i<num_CR_relax_steps;i++)
+         for (i = 0; i < num_CR_relax_steps; i++)
          {
             jj = 0;
-            for (j=0; j < num_nodes; j++)
+            for (j = 0; j < num_nodes; j++)
             {
                for (j2 = 0; j2 < num_functions; j2++)
                {
-                  if (CF_marker[j] == fpt) e0[jj] = e1[jj];
+                  if (CF_marker[j] == fpt) { e0[jj] = e1[jj]; }
                   jj++;
                }
             }
@@ -2804,46 +3060,46 @@ hypre_BoomerAMGCoarsenCR( hypre_ParCSRMatrix    *A,
          rho_old = 1;
          relrho = 1.;
          i = 0;
-         while (rho >= 0.1*theta && (i < num_CR_relax_steps || relrho >= 0.1))
+         while (rho >= 0.1 * theta && (i < num_CR_relax_steps || relrho >= 0.1))
             /*for (i=0;i<num_CR_relax_steps;i++)*/
          {
-            for (j=0; j < num_variables; j++)
-               if (CF_marker[j] == fpt) e0[j] = e1[j];
+            for (j = 0; j < num_variables; j++)
+               if (CF_marker[j] == fpt) { e0[j] = e1[j]; }
             hypre_BoomerAMGRelax(A, Vtemp, CF_marker,
                                  rlx_type, fpt,
                                  relax_weight, omega, NULL,
                                  e1_vec, e0_vec,
                                  Relax_temp);
             /*if (i==num_CR_relax_steps-1) */
-            if (i==1)
+            if (i == 1)
             {
-               for (j=0; j < num_variables; j++)
-                  if (CF_marker[j] == fpt) e2[j] = e1[j];
+               for (j = 0; j < num_variables; j++)
+                  if (CF_marker[j] == fpt) { e2[j] = e1[j]; }
             }
-            rho0 = hypre_ParVectorInnerProd(e0_vec,e0_vec);
-            rho1 = hypre_ParVectorInnerProd(e1_vec,e1_vec);
+            rho0 = hypre_ParVectorInnerProd(e0_vec, e0_vec);
+            rho1 = hypre_ParVectorInnerProd(e1_vec, e1_vec);
             rho_old = rho;
-            rho = sqrt(rho1)/sqrt(rho0);
-            relrho = fabs(rho-rho_old)/rho;
+            rho = hypre_sqrt(rho1) / hypre_sqrt(rho0);
+            relrho = hypre_abs(rho - rho_old) / rho;
             i++;
          }
       }
       /*rho=0.0e0; rho0=0.0e0; rho1=0.0e0;*/
       /*for(i=0;i<num_variables;i++){
-        rho0 += pow(e0[i],2);
-        rho1 += pow(e1[i],2);
+        rho0 += hypre_pow(e0[i],2);
+        rho1 += hypre_pow(e1[i],2);
         }*/
 
       /*rho0 = hypre_ParVectorInnerProd(e0_vec,e0_vec);
         rho1 = hypre_ParVectorInnerProd(e1_vec,e1_vec);
-        rho = sqrt(rho1)/sqrt(rho0);*/
-      for (j=0; j < num_variables; j++)
-         if (CF_marker[j] == fpt) e1[j] = e2[j];
+        rho = hypre_sqrt(rho1)/hypre_sqrt(rho0);*/
+      for (j = 0; j < num_variables; j++)
+         if (CF_marker[j] == fpt) { e1[j] = e2[j]; }
       if (rho > theta)
       {
          if (useCG)
          {
-            for (i=0;i<num_variables;i++)
+            for (i = 0; i < num_variables; i++)
             {
                if (CF_marker[i] ==  fpt)
                {
@@ -2853,123 +3109,153 @@ hypre_BoomerAMGCoarsenCR( hypre_ParCSRMatrix    *A,
                }
             }
 
-            hypre_ParVectorSetConstantValues(Rtemp,0);
-            rho1 = hypre_ParVectorInnerProd(e1_vec,e1_vec);
+            hypre_ParVectorSetConstantValues(Rtemp, 0);
+            rho1 = hypre_ParVectorInnerProd(e1_vec, e1_vec);
             rho0 = rho1;
-            i=0;
-            while (rho1/rho0 > 1.e-2 && i < num_CR_relax_steps)
+            i = 0;
+            while (rho1 / rho0 > 1.e-2 && i < num_CR_relax_steps)
             {
-               if (i==0)
-                  hypre_ParCSRMatrixMatvec_FF(-1.0,A,e0_vec,0.0,Rtemp,CF_marker,fpt);
+               if (i == 0)
+               {
+                  hypre_ParCSRMatrixMatvec_FF(-1.0, A, e0_vec, 0.0, Rtemp, CF_marker, fpt);
+               }
                /*hypre_BoomerAMGRelax(A, Rtemp, CF_marker, rlx_type, fpt,
                  relax_weight, omega, NULL, Ztemp, Vtemp);*/
-               HYPRE_ParCSRDiagScale(NULL,(HYPRE_ParCSRMatrix) A, (HYPRE_ParVector) Rtemp,
+               HYPRE_ParCSRDiagScale(NULL, (HYPRE_ParCSRMatrix) A, (HYPRE_ParVector) Rtemp,
                                      (HYPRE_ParVector) Ztemp);
                gammaold = gamma;
-               gamma = hypre_ParVectorInnerProd(Rtemp,Ztemp);
-               if (i==0)
+               gamma = hypre_ParVectorInnerProd(Rtemp, Ztemp);
+               if (i == 0)
                {
-                  hypre_ParVectorCopy(Ztemp,Ptemp);
+                  hypre_ParVectorCopy(Ztemp, Ptemp);
                   beta = 1.0;
                }
                else
                {
-                  beta = gamma/gammaold;
-                  for (j=0; j < num_variables; j++)
+                  beta = gamma / gammaold;
+                  for (j = 0; j < num_variables; j++)
                      if (CF_marker[j] == fpt)
-                        Ptemp_data[j] = Ztemp_data[j]+beta*Ptemp_data[j];
+                     {
+                        Ptemp_data[j] = Ztemp_data[j] + beta * Ptemp_data[j];
+                     }
                }
-               hypre_ParCSRMatrixMatvec_FF(1.0,A,Ptemp,0.0,Qtemp,CF_marker,fpt);
-               alpha = gamma/hypre_ParVectorInnerProd(Ptemp,Qtemp);
-               hypre_ParVectorAxpy(-alpha,Qtemp,Rtemp);
-               for (j=0; j < num_variables; j++)
-                  if (CF_marker[j] == fpt) e0[j] = e1[j];
-               hypre_ParVectorAxpy(-alpha,Ptemp,e1_vec);
-               rho1 = hypre_ParVectorInnerProd(e1_vec,e1_vec);
+               hypre_ParCSRMatrixMatvec_FF(1.0, A, Ptemp, 0.0, Qtemp, CF_marker, fpt);
+               alpha = gamma / hypre_ParVectorInnerProd(Ptemp, Qtemp);
+               hypre_ParVectorAxpy(-alpha, Qtemp, Rtemp);
+               for (j = 0; j < num_variables; j++)
+                  if (CF_marker[j] == fpt) { e0[j] = e1[j]; }
+               hypre_ParVectorAxpy(-alpha, Ptemp, e1_vec);
+               rho1 = hypre_ParVectorInnerProd(e1_vec, e1_vec);
                i++;
             }
          }
          /*formu(CF_marker,num_variables,e1,A_i,rho);*/
          if (nstages)
-            thresh=0.5;
+         {
+            thresh = 0.5;
+         }
          else
+         {
             thresh = 0.3;
-         for (i=1; i < num_CR_relax_steps; i++)
+         }
+         for (i = 1; i < num_CR_relax_steps; i++)
+         {
             thresh *= 0.3;
+         }
          /*thresh=0.1;*/
 
          if (num_functions == 1)
             /*if(CRaddCpoints == 0)*/
          {
             local_max = 0.0;
-            for(i=0;i<num_variables;i++)
-               if(fabs(e1[i]) > local_max)
-                  local_max = fabs(e1[i]);
+            for (i = 0; i < num_variables; i++)
+               if (hypre_abs(e1[i]) > local_max)
+               {
+                  local_max = hypre_abs(e1[i]);
+               }
          }
          else
          {
             jj = 0;
             local_max = 0.0;
-            for(i=0;i<num_nodes;i++)
+            for (i = 0; i < num_nodes; i++)
             {
                /*CF_marker[jj] = CFN_marker[i];*/
-               sum[i] = fabs(e1[jj++]);
-               for (j=1; j < num_functions; j++)
+               sum[i] = hypre_abs(e1[jj++]);
+               for (j = 1; j < num_functions; j++)
                {
                   /*CF_marker[jj] = CFN_marker[i];*/
-                  sum[i] += fabs(e1[jj++]);
+                  sum[i] += hypre_abs(e1[jj++]);
                }
-               if(sum[i] > local_max)
+               if (sum[i] > local_max)
+               {
                   local_max = sum[i];
+               }
             }
          }
 
-         hypre_MPI_Allreduce(&local_max,&global_max,1,HYPRE_MPI_REAL,hypre_MPI_MAX,comm);
+         hypre_MPI_Allreduce(&local_max, &global_max, 1, HYPRE_MPI_REAL, hypre_MPI_MAX, comm);
          if (num_functions == 1)
             /*if(CRaddCpoints == 0)*/
          {
-            for (i=0;i<num_variables;i++)
+            for (i = 0; i < num_variables; i++)
             {
                if (CF_marker[i] == fpt)
                {
-                  candmeas = pow(fabs(e1[i]),1.0)/global_max;
+                  candmeas = hypre_pow(hypre_abs(e1[i]), 1.0) / global_max;
                   if (candmeas > thresh &&
-                      (A_i[i+1]-A_i[i]+A_offd_i[i+1]-A_offd_i[i]) > 1)
+                      (A_i[i + 1] - A_i[i] + A_offd_i[i + 1] - A_offd_i[i]) > 1)
                   {
                      CF_marker[i] = cand;
                   }
                }
             }
             if (IS_type == 1)
-               hypre_BoomerAMGIndepHMIS(S,0,0,CF_marker);
+            {
+               hypre_BoomerAMGIndepHMIS(S, 0, 0, CF_marker);
+            }
             else if (IS_type == 7)
-               hypre_BoomerAMGIndepHMISa(A,0,0,CF_marker);
+            {
+               hypre_BoomerAMGIndepHMISa(A, 0, 0, CF_marker);
+            }
             else if (IS_type == 2)
-               hypre_BoomerAMGIndepPMISa(A,0,0,CF_marker);
+            {
+               hypre_BoomerAMGIndepPMISa(A, 0, 0, CF_marker);
+            }
             else if (IS_type == 5)
-               hypre_BoomerAMGIndepPMIS(S,0,0,CF_marker);
+            {
+               hypre_BoomerAMGIndepPMIS(S, 0, 0, CF_marker);
+            }
             else if (IS_type == 3)
-               hypre_IndepSetGreedy(A_i,A_j,num_variables,CF_marker);
+            {
+               hypre_IndepSetGreedy(A_i, A_j, num_variables, CF_marker);
+            }
             else if (IS_type == 6)
-               hypre_IndepSetGreedyS(S_i,S_j,num_variables,CF_marker);
+            {
+               hypre_IndepSetGreedyS(S_i, S_j, num_variables, CF_marker);
+            }
             else if (IS_type == 4)
-               hypre_BoomerAMGIndepRS(S,1,0,CF_marker);
+            {
+               hypre_BoomerAMGIndepRS(S, 1, 0, CF_marker);
+            }
             else
-               hypre_BoomerAMGIndepRSa(A,1,0,CF_marker);
+            {
+               hypre_BoomerAMGIndepRSa(A, 1, 0, CF_marker);
+            }
          }
          else
          {
             AN_i = hypre_CSRMatrixI(hypre_ParCSRMatrixDiag(AN));
             AN_offd_i     = hypre_CSRMatrixI(hypre_ParCSRMatrixOffd(AN));
 
-            for (i=0;i<num_nodes;i++)
+            for (i = 0; i < num_nodes; i++)
             {
                /*if (CFN_marker[i] == fpt)*/
                if (CF_marker[i] == fpt)
                {
-                  candmeas = sum[i]/global_max;
+                  candmeas = sum[i] / global_max;
                   if (candmeas > thresh &&
-                      (AN_i[i+1]-AN_i[i]+AN_offd_i[i+1]-AN_offd_i[i]) > 1)
+                      (AN_i[i + 1] - AN_i[i] + AN_offd_i[i + 1] - AN_offd_i[i]) > 1)
                   {
                      /*CFN_marker[i] = cand; */
                      CF_marker[i] = cand;
@@ -2977,45 +3263,53 @@ hypre_BoomerAMGCoarsenCR( hypre_ParCSRMatrix    *A,
                }
             }
             if (IS_type == 1)
-               hypre_BoomerAMGIndepHMIS(AN,0,0,CF_marker);
+            {
+               hypre_BoomerAMGIndepHMIS(AN, 0, 0, CF_marker);
+            }
             /*hypre_BoomerAMGIndepHMIS(AN,0,0,CFN_marker);*/
             else if (IS_type == 2)
-               hypre_BoomerAMGIndepPMIS(AN,0,0,CF_marker);
+            {
+               hypre_BoomerAMGIndepPMIS(AN, 0, 0, CF_marker);
+            }
             /*hypre_BoomerAMGIndepPMIS(AN,0,0,CFN_marker);*/
             else if (IS_type == 3)
             {
                hypre_IndepSetGreedy(hypre_CSRMatrixI(hypre_ParCSRMatrixDiag(AN)),
                                     hypre_CSRMatrixJ(hypre_ParCSRMatrixDiag(AN)),
-                                    num_nodes,CF_marker);
+                                    num_nodes, CF_marker);
                /*num_nodes,CFN_marker);*/
             }
             else
-               hypre_BoomerAMGIndepRS(AN,1,0,CF_marker);
+            {
+               hypre_BoomerAMGIndepRS(AN, 1, 0, CF_marker);
+            }
             /*hypre_BoomerAMGIndepRS(AN,1,0,CFN_marker);*/
          }
 
-         if (my_id == 0) hypre_fprintf(stdout,"  %d \t%2.3f  \t%2.3f \n",
-                                       nstages,rho,(HYPRE_Real)global_nc/(HYPRE_Real)global_num_variables);
+         if (my_id == 0) hypre_fprintf(stdout, "  %d \t%2.3f  \t%2.3f \n",
+                                          nstages, rho, (HYPRE_Real)global_nc / (HYPRE_Real)global_num_variables);
          /* update for next sweep */
          num_coarse = 0;
          if (num_functions == 1)
             /*if(CRaddCpoints == 0)*/
          {
-            for (i=0;i<num_variables;i++)
+            for (i = 0; i < num_variables; i++)
             {
                if (CF_marker[i] ==  cpt)
+               {
                   num_coarse++;
+               }
                else if (CF_marker[i] ==  fpt)
                {
-                  e0[i] = 1.0e0+.1*hypre_RandI();
-                  e1[i] = 1.0e0+.1*hypre_RandI();
+                  e0[i] = 1.0e0 + .1 * hypre_RandI();
+                  e1[i] = 1.0e0 + .1 * hypre_RandI();
                }
             }
          }
          else
          {
             jj = 0;
-            for (i=0;i<num_nodes;i++)
+            for (i = 0; i < num_nodes; i++)
             {
                /*if (CFN_marker[i] ==  cpt) */
                if (CF_marker[i] ==  cpt)
@@ -3028,7 +3322,7 @@ hypre_BoomerAMGCoarsenCR( hypre_ParCSRMatrix    *A,
                /*else if (CFN_marker[i] ==  fpt)*/
                else if (CF_marker[i] ==  fpt)
                {
-                  for (j=0; j < num_functions; j++)
+                  for (j = 0; j < num_functions; j++)
                   {
                      /*CF_marker[jj] = CFN_marker[i];
                        e0[jj] = 1.0e0+.1*hypre_RandI();
@@ -3045,12 +3339,12 @@ hypre_BoomerAMGCoarsenCR( hypre_ParCSRMatrix    *A,
             }
          }
          nstages += 1;
-         hypre_MPI_Allreduce(&num_coarse,&global_nc,1,HYPRE_MPI_INT,hypre_MPI_MAX,comm);
+         hypre_MPI_Allreduce(&num_coarse, &global_nc, 1, HYPRE_MPI_INT, hypre_MPI_MAX, comm);
       }
       else
       {
-         if (my_id == 0) hypre_fprintf(stdout,"  %d \t%2.3f  \t%2.3f \n",
-                                       nstages,rho,(HYPRE_Real)global_nc/(HYPRE_Real)global_num_variables);
+         if (my_id == 0) hypre_fprintf(stdout, "  %d \t%2.3f  \t%2.3f \n",
+                                          nstages, rho, (HYPRE_Real)global_nc / (HYPRE_Real)global_num_variables);
          break;
       }
    }
@@ -3064,14 +3358,18 @@ hypre_BoomerAMGCoarsenCR( hypre_ParCSRMatrix    *A,
    hypre_ParVectorDestroy(Ztemp);
 
    if (num_threads > 1)
+   {
       hypre_ParVectorDestroy(Relax_temp);
+   }
 
 
 
-   if (my_id == 0) hypre_fprintf(stdout,"\n... Done \n\n");
+   if (my_id == 0) { hypre_fprintf(stdout, "\n... Done \n\n"); }
    coarse_size = 0;
-   for ( i =0 ;i < num_variables;i++){
-      if ( CF_marker[i] == cpt){
+   for ( i = 0 ; i < num_variables; i++)
+   {
+      if ( CF_marker[i] == cpt)
+      {
          coarse_size++;
       }
    }
diff --git a/external/hypre/src/parcsr_ls/par_cycle.c b/external/hypre/src/parcsr_ls/par_cycle.c
index 1d2f7a25..ee4b1147 100644
--- a/external/hypre/src/parcsr_ls/par_cycle.c
+++ b/external/hypre/src/parcsr_ls/par_cycle.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -32,7 +32,7 @@ hypre_BoomerAMGCycle( void              *amg_vdata,
    hypre_ParCSRMatrix      **A_array;
    hypre_ParCSRMatrix      **P_array;
    hypre_ParCSRMatrix      **R_array;
-   hypre_ParVector          *Utemp;
+   hypre_ParVector          *Utemp = NULL;
    hypre_ParVector          *Vtemp;
    hypre_ParVector          *Rtemp;
    hypre_ParVector          *Ptemp;
@@ -43,8 +43,8 @@ hypre_BoomerAMGCycle( void              *amg_vdata,
    hypre_ParCSRBlockMatrix **P_block_array;
    hypre_ParCSRBlockMatrix **R_block_array;
 
-   HYPRE_Real      *Ztemp_data;
-   HYPRE_Real      *Ptemp_data;
+   HYPRE_Real      *Ztemp_data = NULL;
+   HYPRE_Real      *Ptemp_data = NULL;
    hypre_IntArray **CF_marker_array;
    HYPRE_Int       *CF_marker;
    /*
@@ -77,7 +77,7 @@ hypre_BoomerAMGCycle( void              *amg_vdata,
    HYPRE_Int       num_sweep;
    HYPRE_Int       cg_num_sweep = 1;
    HYPRE_Int       relax_type;
-   HYPRE_Int       relax_points;
+   HYPRE_Int       relax_points = 0;
    HYPRE_Int       relax_order;
    HYPRE_Int       relax_local;
    HYPRE_Int       old_version = 0;
@@ -85,7 +85,7 @@ hypre_BoomerAMGCycle( void              *amg_vdata,
    HYPRE_Real     *omega;
    HYPRE_Real      alfa, beta, gammaold;
    HYPRE_Real      gamma = 1.0;
-   HYPRE_Int       local_size;
+   HYPRE_Int       local_size = 0;
    /*   HYPRE_Int      *smooth_option; */
    HYPRE_Int       smooth_type;
    HYPRE_Int       smooth_num_levels;
@@ -101,12 +101,15 @@ hypre_BoomerAMGCycle( void              *amg_vdata,
    HYPRE_Int       partial_cycle_control;
    MPI_Comm        comm;
 
+   char            nvtx_name[1024];
+
 #if 0
    HYPRE_Real   *D_mat;
    HYPRE_Real   *S_vec;
 #endif
 
    HYPRE_ANNOTATE_FUNC_BEGIN;
+   hypre_GpuProfilingPushRange("AMGCycle");
 
    /* Acquire data and allocate storage */
    A_array           = hypre_ParAMGDataAArray(amg_data);
@@ -184,7 +187,7 @@ hypre_BoomerAMGCycle( void              *amg_vdata,
          num_coeffs[j] = hypre_ParCSRMatrixDNumNonzeros(A_array[j]);
       }
    }
-   
+
    /*---------------------------------------------------------------------
     *    Initialize cycling control counter
     *
@@ -226,19 +229,18 @@ hypre_BoomerAMGCycle( void              *amg_vdata,
 
    if (smooth_num_levels > 0)
    {
-      if (smooth_type == 7 || smooth_type == 8
-          || smooth_type == 17 || smooth_type == 18
-          || smooth_type == 9 || smooth_type == 19)
+      if (smooth_type == 7  || smooth_type == 8  || smooth_type == 9 ||
+          smooth_type == 17 || smooth_type == 18 || smooth_type == 19)
       {
          HYPRE_Int actual_local_size = hypre_ParVectorActualLocalSize(Vtemp);
-         Utemp = hypre_ParVectorCreate(comm,hypre_ParVectorGlobalSize(Vtemp),
+         Utemp = hypre_ParVectorCreate(comm, hypre_ParVectorGlobalSize(Vtemp),
                                        hypre_ParVectorPartitioning(Vtemp));
-         local_size
-            = hypre_VectorSize(hypre_ParVectorLocalVector(Vtemp));
+         local_size = hypre_VectorSize(hypre_ParVectorLocalVector(Vtemp));
          if (local_size < actual_local_size)
          {
-            hypre_VectorData(hypre_ParVectorLocalVector(Utemp)) =
-            hypre_CTAlloc(HYPRE_Complex,  actual_local_size, HYPRE_MEMORY_HOST);
+            hypre_VectorData(hypre_ParVectorLocalVector(Utemp)) = hypre_CTAlloc(HYPRE_Complex,
+                                                                                actual_local_size,
+                                                                                HYPRE_MEMORY_HOST);
             hypre_ParVectorActualLocalSize(Utemp) = actual_local_size;
          }
          else
@@ -279,12 +281,14 @@ hypre_BoomerAMGCycle( void              *amg_vdata,
     *--------------------------------------------------------------------*/
 
    HYPRE_ANNOTATE_MGLEVEL_BEGIN(level);
+   hypre_sprintf(nvtx_name, "%s-%d", "AMG Level", level);
+   hypre_GpuProfilingPushRange(nvtx_name);
    while (Not_Finished)
    {
       if (num_levels > 1)
       {
          local_size = hypre_VectorSize(hypre_ParVectorLocalVector(F_array[level]));
-         hypre_VectorSize(hypre_ParVectorLocalVector(Vtemp)) = local_size;
+         hypre_ParVectorSetLocalSize(Vtemp, local_size);
 
          if (smooth_num_levels <= level)
          {
@@ -295,12 +299,13 @@ hypre_BoomerAMGCycle( void              *amg_vdata,
          }
          else if (smooth_type > 9)
          {
-            hypre_VectorSize(hypre_ParVectorLocalVector(Ztemp)) = local_size;
-            hypre_VectorSize(hypre_ParVectorLocalVector(Rtemp)) = local_size;
-            hypre_VectorSize(hypre_ParVectorLocalVector(Ptemp)) = local_size;
+            hypre_ParVectorSetLocalSize(Ztemp, local_size);
+            hypre_ParVectorSetLocalSize(Rtemp, local_size);
+            hypre_ParVectorSetLocalSize(Ptemp, local_size);
+
             Ztemp_data = hypre_VectorData(hypre_ParVectorLocalVector(Ztemp));
             Ptemp_data = hypre_VectorData(hypre_ParVectorLocalVector(Ptemp));
-            hypre_ParVectorSetConstantValues(Ztemp,0);
+            hypre_ParVectorSetConstantValues(Ztemp, 0.0);
             alpha = -1.0;
             beta = 1.0;
 
@@ -357,15 +362,19 @@ hypre_BoomerAMGCycle( void              *amg_vdata,
       if (cycle_param == 3 && seq_cg)
       {
          HYPRE_ANNOTATE_REGION_BEGIN("%s", "Coarse solve");
+         hypre_GpuProfilingPushRange("Coarse solve");
          hypre_seqAMGCycle(amg_data, level, F_array, U_array);
          HYPRE_ANNOTATE_REGION_END("%s", "Coarse solve");
+         hypre_GpuProfilingPopRange();
       }
 #ifdef HYPRE_USING_DSUPERLU
       else if (cycle_param == 3 && hypre_ParAMGDataDSLUSolver(amg_data) != NULL)
       {
          HYPRE_ANNOTATE_REGION_BEGIN("%s", "Coarse solve");
+         hypre_GpuProfilingPushRange("Coarse solve");
          hypre_SLUDistSolve(hypre_ParAMGDataDSLUSolver(amg_data), Aux_F, Aux_U);
          HYPRE_ANNOTATE_REGION_END("%s", "Coarse solve");
+         hypre_GpuProfilingPopRange();
       }
 #endif
       else
@@ -374,11 +383,13 @@ hypre_BoomerAMGCycle( void              *amg_vdata,
          * Do the relaxation num_sweep times
          *-----------------------------------------------------------------*/
          HYPRE_ANNOTATE_REGION_BEGIN("%s", "Relaxation");
+         hypre_GpuProfilingPushRange("Relaxation");
+
          for (jj = 0; jj < cg_num_sweep; jj++)
          {
             if (smooth_num_levels > level && smooth_type > 9)
             {
-               hypre_ParVectorSetConstantValues(Aux_U, 0);
+               hypre_ParVectorSetConstantValues(Aux_U, 0.0);
             }
 
             for (j = 0; j < num_sweep; j++)
@@ -386,7 +397,7 @@ hypre_BoomerAMGCycle( void              *amg_vdata,
                if (num_levels == 1 && max_levels > 1)
                {
                   relax_points = 0;
-                  relax_local = 0;
+                  relax_local  = 0;
                }
                else
                {
@@ -405,11 +416,11 @@ hypre_BoomerAMGCycle( void              *amg_vdata,
                   switch (relax_points)
                   {
                      case 1:
-                        cycle_op_count += num_coeffs[level+1];
+                        cycle_op_count += num_coeffs[level + 1];
                         break;
 
                      case -1:
-                        cycle_op_count += (num_coeffs[level]-num_coeffs[level+1]);
+                        cycle_op_count += (num_coeffs[level] - num_coeffs[level + 1]);
                         break;
                   }
                }
@@ -421,29 +432,30 @@ hypre_BoomerAMGCycle( void              *amg_vdata,
                /*-----------------------------------------------
                   Choose Smoother
                 -----------------------------------------------*/
-               if ( smooth_num_levels > level && (smooth_type ==  7 || smooth_type ==  8 ||
-                                                  smooth_type ==  9 || smooth_type == 19 ||
-                                                  smooth_type == 17 || smooth_type == 18) )
+               if ( (smooth_num_levels > level) &&
+                    (smooth_type == 7  || smooth_type == 8  || smooth_type == 9 ||
+                     smooth_type == 17 || smooth_type == 18 || smooth_type == 19) )
                {
-                  hypre_VectorSize(hypre_ParVectorLocalVector(Utemp)) = local_size;
+                  hypre_ParVectorSetLocalSize(Utemp, local_size);
+
                   alpha = -1.0;
                   beta = 1.0;
                   hypre_ParCSRMatrixMatvecOutOfPlace(alpha, A_array[level],
                                                      U_array[level], beta, Aux_F, Vtemp);
-                  if (smooth_type == 8 || smooth_type == 18)
-                  {
-                     HYPRE_ParCSRParaSailsSolve(smoother[level],
-                                                (HYPRE_ParCSRMatrix) A_array[level],
-                                                (HYPRE_ParVector) Vtemp,
-                                                (HYPRE_ParVector) Utemp);
-                  }
-                  else if (smooth_type == 7 || smooth_type == 17)
+                  if (smooth_type == 7 || smooth_type == 17)
                   {
                      HYPRE_ParCSRPilutSolve(smoother[level],
                                             (HYPRE_ParCSRMatrix) A_array[level],
                                             (HYPRE_ParVector) Vtemp,
                                             (HYPRE_ParVector) Utemp);
                   }
+                  else if (smooth_type == 8 || smooth_type == 18)
+                  {
+                     HYPRE_ParCSRParaSailsSolve(smoother[level],
+                                                (HYPRE_ParCSRMatrix) A_array[level],
+                                                (HYPRE_ParVector) Vtemp,
+                                                (HYPRE_ParVector) Utemp);
+                  }
                   else if (smooth_type == 9 || smooth_type == 19)
                   {
                      HYPRE_EuclidSolve(smoother[level],
@@ -451,7 +463,16 @@ hypre_BoomerAMGCycle( void              *amg_vdata,
                                        (HYPRE_ParVector) Vtemp,
                                        (HYPRE_ParVector) Utemp);
                   }
-                  hypre_ParVectorAxpy(relax_weight[level],Utemp,Aux_U);
+                  hypre_ParVectorAxpy(relax_weight[level], Utemp, Aux_U);
+               }
+               else if ( smooth_num_levels > level && (smooth_type == 4) )
+               {
+                  HYPRE_FSAISetZeroGuess(smoother[level], cycle_param - 2);
+                  HYPRE_FSAISetMaxIterations(smoother[level], num_grid_sweeps[cycle_param]);
+                  HYPRE_FSAISolve(smoother[level],
+                                  (HYPRE_ParCSRMatrix) A_array[level],
+                                  (HYPRE_ParVector) Aux_F,
+                                  (HYPRE_ParVector) Aux_U);
                }
                else if ( smooth_num_levels > level && (smooth_type == 5 || smooth_type == 15) )
                {
@@ -467,7 +488,12 @@ hypre_BoomerAMGCycle( void              *amg_vdata,
                                      (HYPRE_ParVector) Aux_F,
                                      (HYPRE_ParVector) Aux_U);
                }
-               else if (relax_type == 9 || relax_type == 99 || relax_type == 199)
+               else if (relax_type == 9   ||
+                        relax_type == 19  ||
+                        relax_type == 98  ||
+                        relax_type == 99  ||
+                        relax_type == 198 ||
+                        relax_type == 199)
                {
                   /* Gaussian elimination */
                   hypre_GaussElimSolve(amg_data, level, relax_type);
@@ -501,7 +527,8 @@ hypre_BoomerAMGCycle( void              *amg_vdata,
                   }
                }
                else if (relax_type == 16)
-               { /* scaled Chebyshev */
+               {
+                  /* scaled Chebyshev */
                   HYPRE_Int scale = hypre_ParAMGDataChebyScale(amg_data);
                   HYPRE_Int variant = hypre_ParAMGDataChebyVariant(amg_data);
                   hypre_ParCSRRelax_Cheby_Solve(A_array[level], Aux_F,
@@ -514,7 +541,7 @@ hypre_BoomerAMGCycle( void              *amg_vdata,
                   if (level == num_levels - 1)
                   {
                      /* if we are on the coarsest level, the cf_marker will be null
-                        and we just do one sweep regular jacobi */
+                        and we just do one sweep regular Jacobi */
                      hypre_assert(cycle_param == 3);
                      hypre_BoomerAMGRelax(A_array[level], Aux_F, CF_marker, 0, 0, relax_weight[level],
                                           0.0, NULL, Aux_U, Vtemp, NULL);
@@ -577,34 +604,40 @@ hypre_BoomerAMGCycle( void              *amg_vdata,
                   HYPRE_ANNOTATE_REGION_END("%s", "Relaxation");
                   HYPRE_ANNOTATE_MGLEVEL_END(level);
                   HYPRE_ANNOTATE_FUNC_END;
-
-                  return(Solve_err_flag);
+                  hypre_GpuProfilingPopRange();
+                  hypre_GpuProfilingPopRange();
+                  hypre_GpuProfilingPopRange();
+                  return (Solve_err_flag);
                }
-            }
-            if  (smooth_num_levels > level && smooth_type > 9)
+            } /* for (j = 0; j < num_sweep; j++) */
+
+            if (smooth_num_levels > level && smooth_type > 9)
             {
                gammaold = gamma;
-               gamma = hypre_ParVectorInnerProd(Rtemp,Ztemp);
+               gamma = hypre_ParVectorInnerProd(Rtemp, Ztemp);
                if (jj == 0)
                {
-                  hypre_ParVectorCopy(Ztemp,Ptemp);
+                  hypre_ParVectorCopy(Ztemp, Ptemp);
                }
                else
                {
-                  beta = gamma/gammaold;
-                  for (i=0; i < local_size; i++)
+                  beta = gamma / gammaold;
+                  /* TODO (VPM): Use a ParVector routine to do the following */
+                  for (i = 0; i < local_size; i++)
                   {
-                     Ptemp_data[i] = Ztemp_data[i] + beta*Ptemp_data[i];
+                     Ptemp_data[i] = Ztemp_data[i] + beta * Ptemp_data[i];
                   }
                }
 
-               hypre_ParCSRMatrixMatvec(1.0,A_array[level],Ptemp,0.0,Vtemp);
-               alfa = gamma /hypre_ParVectorInnerProd(Ptemp,Vtemp);
-               hypre_ParVectorAxpy(alfa,Ptemp,U_array[level]);
-               hypre_ParVectorAxpy(-alfa,Vtemp,Rtemp);
+               hypre_ParCSRMatrixMatvec(1.0, A_array[level], Ptemp, 0.0, Vtemp);
+               alfa = gamma / hypre_ParVectorInnerProd(Ptemp, Vtemp);
+               hypre_ParVectorAxpy(alfa, Ptemp, U_array[level]);
+               hypre_ParVectorAxpy(-alfa, Vtemp, Rtemp);
             }
-         }
+         } /* for (jj = 0; jj < cg_num_sweep; jj++) */
+
          HYPRE_ANNOTATE_REGION_END("%s", "Relaxation");
+         hypre_GpuProfilingPopRange();
       }
 
       /*------------------------------------------------------------------
@@ -614,7 +647,7 @@ hypre_BoomerAMGCycle( void              *amg_vdata,
       --lev_counter[level];
 
       //if ( level != num_levels-1 && lev_counter[level] >= 0 )
-      if (lev_counter[level] >= 0 && level != num_levels-1)
+      if (lev_counter[level] >= 0 && level != num_levels - 1)
       {
          /*---------------------------------------------------------------
           * Visit coarser level next.
@@ -626,15 +659,16 @@ hypre_BoomerAMGCycle( void              *amg_vdata,
          fine_grid = level;
          coarse_grid = level + 1;
 
-         hypre_ParVectorSetConstantValues(U_array[coarse_grid], 0.0);
+         hypre_ParVectorSetZeros(U_array[coarse_grid]);
 
          alpha = -1.0;
          beta = 1.0;
 
          HYPRE_ANNOTATE_REGION_BEGIN("%s", "Residual");
+         hypre_GpuProfilingPushRange("Residual");
          if (block_mode)
          {
-            hypre_ParVectorCopy(F_array[fine_grid],Vtemp);
+            hypre_ParVectorCopy(F_array[fine_grid], Vtemp);
             hypre_ParCSRBlockMatrixMatvec(alpha, A_block_array[fine_grid], U_array[fine_grid],
                                           beta, Vtemp);
          }
@@ -645,11 +679,13 @@ hypre_BoomerAMGCycle( void              *amg_vdata,
                                                beta, F_array[fine_grid], Vtemp);
          }
          HYPRE_ANNOTATE_REGION_END("%s", "Residual");
+         hypre_GpuProfilingPopRange();
 
          alpha = 1.0;
          beta = 0.0;
 
          HYPRE_ANNOTATE_REGION_BEGIN("%s", "Restriction");
+         hypre_GpuProfilingPushRange("Restriction");
          if (block_mode)
          {
             hypre_ParCSRBlockMatrixMatvecT(alpha, R_block_array[fine_grid], Vtemp,
@@ -671,11 +707,13 @@ hypre_BoomerAMGCycle( void              *amg_vdata,
          }
          HYPRE_ANNOTATE_REGION_END("%s", "Restriction");
          HYPRE_ANNOTATE_MGLEVEL_END(level);
+         hypre_GpuProfilingPopRange();
+         hypre_GpuProfilingPopRange();
 
          ++level;
          lev_counter[level] = hypre_max(lev_counter[level], cycle_type);
          cycle_param = 1;
-         if (level == num_levels-1)
+         if (level == num_levels - 1)
          {
             cycle_param = 3;
          }
@@ -683,8 +721,9 @@ hypre_BoomerAMGCycle( void              *amg_vdata,
          {
             Not_Finished = 0;
          }
-
          HYPRE_ANNOTATE_MGLEVEL_BEGIN(level);
+         hypre_sprintf(nvtx_name, "%s-%d", "AMG Level", level);
+         hypre_GpuProfilingPushRange(nvtx_name);
       }
       else if (level != 0)
       {
@@ -699,6 +738,7 @@ hypre_BoomerAMGCycle( void              *amg_vdata,
          beta = 1.0;
 
          HYPRE_ANNOTATE_REGION_BEGIN("%s", "Interpolation");
+         hypre_GpuProfilingPushRange("Interpolation");
          if (block_mode)
          {
             hypre_ParCSRBlockMatrixMatvec(alpha, P_block_array[fine_grid],
@@ -713,8 +753,13 @@ hypre_BoomerAMGCycle( void              *amg_vdata,
                                      beta, U_array[fine_grid]);
             /* printf("Proc %d: level %d, n %d, Interpolation done\n", my_id, level, local_size); */
          }
+
+         hypre_ParVectorAllZeros(U_array[fine_grid]) = 0;
+
          HYPRE_ANNOTATE_REGION_END("%s", "Interpolation");
          HYPRE_ANNOTATE_MGLEVEL_END(level);
+         hypre_GpuProfilingPopRange();
+         hypre_GpuProfilingPopRange();
 
          --level;
          cycle_param = 2;
@@ -725,6 +770,8 @@ hypre_BoomerAMGCycle( void              *amg_vdata,
          }
 
          HYPRE_ANNOTATE_MGLEVEL_BEGIN(level);
+         hypre_sprintf(nvtx_name, "%s-%d", "AMG Level", level);
+         hypre_GpuProfilingPushRange(nvtx_name);
       }
       else
       {
@@ -733,6 +780,7 @@ hypre_BoomerAMGCycle( void              *amg_vdata,
    } /* main loop: while (Not_Finished) */
 
    HYPRE_ANNOTATE_MGLEVEL_END(level);
+   hypre_GpuProfilingPopRange();
 
    hypre_ParAMGDataCycleOpCount(amg_data) = cycle_op_count;
 
@@ -749,6 +797,7 @@ hypre_BoomerAMGCycle( void              *amg_vdata,
    }
 
    HYPRE_ANNOTATE_FUNC_END;
+   hypre_GpuProfilingPopRange();
 
-   return(Solve_err_flag);
+   return (Solve_err_flag);
 }
diff --git a/external/hypre/src/parcsr_ls/par_difconv.c b/external/hypre/src/parcsr_ls/par_difconv.c
index f702be6f..cede6127 100644
--- a/external/hypre/src/parcsr_ls/par_difconv.c
+++ b/external/hypre/src/parcsr_ls/par_difconv.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -37,14 +37,14 @@ GenerateDifConv( MPI_Comm comm,
    HYPRE_BigInt *big_offd_j = NULL;
    HYPRE_Real *offd_data = NULL;
 
-   HYPRE_BigInt *global_part;
+   HYPRE_BigInt global_part[2];
    HYPRE_BigInt ix, iy, iz;
    HYPRE_Int ip, iq, ir;
    HYPRE_Int cnt, o_cnt;
    HYPRE_Int local_num_rows;
    HYPRE_BigInt *col_map_offd = NULL;
    HYPRE_Int row_index;
-   HYPRE_Int i,j;
+   HYPRE_Int i, j;
 
    HYPRE_Int nx_local, ny_local, nz_local;
    HYPRE_Int num_cols_offd;
@@ -57,60 +57,61 @@ GenerateDifConv( MPI_Comm comm,
    HYPRE_Int num_procs;
    HYPRE_Int P_busy, Q_busy, R_busy;
 
-   hypre_MPI_Comm_size(comm,&num_procs);
+   hypre_MPI_Comm_size(comm, &num_procs);
 
-   grid_size = nx*ny*nz;
+   grid_size = nx * ny * nz;
 
-   hypre_GeneratePartitioning(nx,P,&nx_part);
-   hypre_GeneratePartitioning(ny,Q,&ny_part);
-   hypre_GeneratePartitioning(nz,R,&nz_part);
+   hypre_GeneratePartitioning(nx, P, &nx_part);
+   hypre_GeneratePartitioning(ny, Q, &ny_part);
+   hypre_GeneratePartitioning(nz, R, &nz_part);
 
-   nx_local = (HYPRE_Int)(nx_part[p+1] - nx_part[p]);
-   ny_local = (HYPRE_Int)(ny_part[q+1] - ny_part[q]);
-   nz_local = (HYPRE_Int)(nz_part[r+1] - nz_part[r]);
+   nx_local = (HYPRE_Int)(nx_part[p + 1] - nx_part[p]);
+   ny_local = (HYPRE_Int)(ny_part[q + 1] - ny_part[q]);
+   nz_local = (HYPRE_Int)(nz_part[r + 1] - nz_part[r]);
 
-   local_num_rows = nx_local*ny_local*nz_local;
+   local_num_rows = nx_local * ny_local * nz_local;
 
    ip = p;
    iq = q;
    ir = r;
 
-   global_part = hypre_CTAlloc(HYPRE_BigInt,2,HYPRE_MEMORY_HOST);
-   global_part[0] = nz_part[ir]*nx*ny+(ny_part[iq]*nx+nx_part[ip]*ny_local)*nz_local;
+   global_part[0] = nz_part[ir] * nx * ny + (ny_part[iq] * nx + nx_part[ip] * ny_local) * nz_local;
    global_part[1] = global_part[0] + (HYPRE_BigInt)local_num_rows;
 
-   diag_i = hypre_CTAlloc(HYPRE_Int, local_num_rows+1, HYPRE_MEMORY_HOST);
-   offd_i = hypre_CTAlloc(HYPRE_Int, local_num_rows+1, HYPRE_MEMORY_HOST);
+   diag_i = hypre_CTAlloc(HYPRE_Int, local_num_rows + 1, HYPRE_MEMORY_HOST);
+   offd_i = hypre_CTAlloc(HYPRE_Int, local_num_rows + 1, HYPRE_MEMORY_HOST);
 
-   P_busy = hypre_min(nx,P);
-   Q_busy = hypre_min(ny,Q);
-   R_busy = hypre_min(nz,R);
+   P_busy = hypre_min(nx, P);
+   Q_busy = hypre_min(ny, Q);
+   R_busy = hypre_min(nz, R);
 
    num_cols_offd = 0;
-   if (p) num_cols_offd += ny_local*nz_local;
-   if (p < P_busy-1) num_cols_offd += ny_local*nz_local;
-   if (q) num_cols_offd += nx_local*nz_local;
-   if (q < Q_busy-1) num_cols_offd += nx_local*nz_local;
-   if (r) num_cols_offd += nx_local*ny_local;
-   if (r < R_busy-1) num_cols_offd += nx_local*ny_local;
+   if (p) { num_cols_offd += ny_local * nz_local; }
+   if (p < P_busy - 1) { num_cols_offd += ny_local * nz_local; }
+   if (q) { num_cols_offd += nx_local * nz_local; }
+   if (q < Q_busy - 1) { num_cols_offd += nx_local * nz_local; }
+   if (r) { num_cols_offd += nx_local * ny_local; }
+   if (r < R_busy - 1) { num_cols_offd += nx_local * ny_local; }
 
-   if (!local_num_rows) num_cols_offd = 0;
+   if (!local_num_rows) { num_cols_offd = 0; }
 
    cnt = 1;
    o_cnt = 1;
    diag_i[0] = 0;
    offd_i[0] = 0;
-   for (iz = nz_part[ir]; iz < nz_part[ir+1]; iz++)
+   for (iz = nz_part[ir]; iz < nz_part[ir + 1]; iz++)
    {
-      for (iy = ny_part[iq];  iy < ny_part[iq+1]; iy++)
+      for (iy = ny_part[iq];  iy < ny_part[iq + 1]; iy++)
       {
-         for (ix = nx_part[ip]; ix < nx_part[ip+1]; ix++)
+         for (ix = nx_part[ip]; ix < nx_part[ip + 1]; ix++)
          {
-            diag_i[cnt] = diag_i[cnt-1];
-            offd_i[o_cnt] = offd_i[o_cnt-1];
+            diag_i[cnt] = diag_i[cnt - 1];
+            offd_i[o_cnt] = offd_i[o_cnt - 1];
             diag_i[cnt]++;
             if (iz > nz_part[ir])
+            {
                diag_i[cnt]++;
+            }
             else
             {
                if (iz)
@@ -119,7 +120,9 @@ GenerateDifConv( MPI_Comm comm,
                }
             }
             if (iy > ny_part[iq])
+            {
                diag_i[cnt]++;
+            }
             else
             {
                if (iy)
@@ -128,7 +131,9 @@ GenerateDifConv( MPI_Comm comm,
                }
             }
             if (ix > nx_part[ip])
+            {
                diag_i[cnt]++;
+            }
             else
             {
                if (ix)
@@ -136,29 +141,35 @@ GenerateDifConv( MPI_Comm comm,
                   offd_i[o_cnt]++;
                }
             }
-            if (ix+1 < nx_part[ip+1])
+            if (ix + 1 < nx_part[ip + 1])
+            {
                diag_i[cnt]++;
+            }
             else
             {
-               if (ix+1 < nx)
+               if (ix + 1 < nx)
                {
                   offd_i[o_cnt]++;
                }
             }
-            if (iy+1 < ny_part[iq+1])
+            if (iy + 1 < ny_part[iq + 1])
+            {
                diag_i[cnt]++;
+            }
             else
             {
-               if (iy+1 < ny)
+               if (iy + 1 < ny)
                {
                   offd_i[o_cnt]++;
                }
             }
-            if (iz+1 < nz_part[ir+1])
+            if (iz + 1 < nz_part[ir + 1])
+            {
                diag_i[cnt]++;
+            }
             else
             {
-               if (iz+1 < nz)
+               if (iz + 1 < nz)
                {
                   offd_i[o_cnt]++;
                }
@@ -182,94 +193,94 @@ GenerateDifConv( MPI_Comm comm,
    row_index = 0;
    cnt = 0;
    o_cnt = 0;
-   for (iz = nz_part[ir]; iz < nz_part[ir+1]; iz++)
+   for (iz = nz_part[ir]; iz < nz_part[ir + 1]; iz++)
    {
-      for (iy = ny_part[iq];  iy < ny_part[iq+1]; iy++)
+      for (iy = ny_part[iq];  iy < ny_part[iq + 1]; iy++)
       {
-         for (ix = nx_part[ip]; ix < nx_part[ip+1]; ix++)
+         for (ix = nx_part[ip]; ix < nx_part[ip + 1]; ix++)
          {
             diag_j[cnt] = row_index;
             diag_data[cnt++] = value[0];
             if (iz > nz_part[ir])
             {
-               diag_j[cnt] = row_index-nx_local*ny_local;
+               diag_j[cnt] = row_index - nx_local * ny_local;
                diag_data[cnt++] = value[3];
             }
             else
             {
                if (iz)
                {
-                  big_offd_j[o_cnt] = hypre_map(ix,iy,iz-1,ip,iq,ir-1,nx,ny,
+                  big_offd_j[o_cnt] = hypre_map(ix, iy, iz - 1, ip, iq, ir - 1, nx, ny,
                                                 nx_part, ny_part, nz_part);
                   offd_data[o_cnt++] = value[3];
                }
             }
             if (iy > ny_part[iq])
             {
-               diag_j[cnt] = row_index-nx_local;
+               diag_j[cnt] = row_index - nx_local;
                diag_data[cnt++] = value[2];
             }
             else
             {
                if (iy)
                {
-                  big_offd_j[o_cnt] = hypre_map(ix,iy-1,iz,ip,iq-1,ir,nx,ny,
+                  big_offd_j[o_cnt] = hypre_map(ix, iy - 1, iz, ip, iq - 1, ir, nx, ny,
                                                 nx_part, ny_part, nz_part);
                   offd_data[o_cnt++] = value[2];
                }
             }
             if (ix > nx_part[ip])
             {
-               diag_j[cnt] = row_index-1;
+               diag_j[cnt] = row_index - 1;
                diag_data[cnt++] = value[1];
             }
             else
             {
                if (ix)
                {
-                  big_offd_j[o_cnt] = hypre_map(ix-1,iy,iz,ip-1,iq,ir,nx,ny,
+                  big_offd_j[o_cnt] = hypre_map(ix - 1, iy, iz, ip - 1, iq, ir, nx, ny,
                                                 nx_part, ny_part, nz_part);
                   offd_data[o_cnt++] = value[1];
                }
             }
-            if (ix+1 < nx_part[ip+1])
+            if (ix + 1 < nx_part[ip + 1])
             {
-               diag_j[cnt] = row_index+1;
+               diag_j[cnt] = row_index + 1;
                diag_data[cnt++] = value[4];
             }
             else
             {
-               if (ix+1 < nx)
+               if (ix + 1 < nx)
                {
-                  big_offd_j[o_cnt] = hypre_map(ix+1,iy,iz,ip+1,iq,ir,nx,ny,
+                  big_offd_j[o_cnt] = hypre_map(ix + 1, iy, iz, ip + 1, iq, ir, nx, ny,
                                                 nx_part, ny_part, nz_part);
                   offd_data[o_cnt++] = value[4];
                }
             }
-            if (iy+1 < ny_part[iq+1])
+            if (iy + 1 < ny_part[iq + 1])
             {
-               diag_j[cnt] = row_index+nx_local;
+               diag_j[cnt] = row_index + nx_local;
                diag_data[cnt++] = value[5];
             }
             else
             {
-               if (iy+1 < ny)
+               if (iy + 1 < ny)
                {
-                  big_offd_j[o_cnt] = hypre_map(ix,iy+1,iz,ip,iq+1,ir,nx,ny,
+                  big_offd_j[o_cnt] = hypre_map(ix, iy + 1, iz, ip, iq + 1, ir, nx, ny,
                                                 nx_part, ny_part, nz_part);
                   offd_data[o_cnt++] = value[5];
                }
             }
-            if (iz+1 < nz_part[ir+1])
+            if (iz + 1 < nz_part[ir + 1])
             {
-               diag_j[cnt] = row_index+nx_local*ny_local;
+               diag_j[cnt] = row_index + nx_local * ny_local;
                diag_data[cnt++] = value[6];
             }
             else
             {
-               if (iz+1 < nz)
+               if (iz + 1 < nz)
                {
-                  big_offd_j[o_cnt] = hypre_map(ix,iy,iz+1,ip,iq,ir+1,nx,ny,
+                  big_offd_j[o_cnt] = hypre_map(ix, iy, iz + 1, ip, iq, ir + 1, nx, ny,
                                                 nx_part, ny_part, nz_part);
                   offd_data[o_cnt++] = value[6];
                }
@@ -282,13 +293,15 @@ GenerateDifConv( MPI_Comm comm,
    if (num_cols_offd)
    {
       col_map_offd = hypre_CTAlloc(HYPRE_BigInt, num_cols_offd, HYPRE_MEMORY_HOST);
-      for (i=0; i < num_cols_offd; i++)
+      for (i = 0; i < num_cols_offd; i++)
+      {
          col_map_offd[i] = big_offd_j[i];
+      }
 
-      hypre_BigQsort0(col_map_offd, 0, num_cols_offd-1);
+      hypre_BigQsort0(col_map_offd, 0, num_cols_offd - 1);
 
-      for (i=0; i < num_cols_offd; i++)
-         for (j=0; j < num_cols_offd; j++)
+      for (i = 0; i < num_cols_offd; i++)
+         for (j = 0; j < num_cols_offd; j++)
             if (big_offd_j[i] == col_map_offd[j])
             {
                offd_j[i] = j;
@@ -325,7 +338,6 @@ GenerateDifConv( MPI_Comm comm,
    hypre_TFree(ny_part, HYPRE_MEMORY_HOST);
    hypre_TFree(nz_part, HYPRE_MEMORY_HOST);
    hypre_TFree(big_offd_j, HYPRE_MEMORY_HOST);
-   hypre_TFree(global_part, HYPRE_MEMORY_HOST);
 
    return (HYPRE_ParCSRMatrix) A;
 }
diff --git a/external/hypre/src/parcsr_ls/par_fsai.c b/external/hypre/src/parcsr_ls/par_fsai.c
new file mode 100644
index 00000000..3b6a3c41
--- /dev/null
+++ b/external/hypre/src/parcsr_ls/par_fsai.c
@@ -0,0 +1,798 @@
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ *******************************************************************************/
+
+#include "_hypre_parcsr_ls.h"
+#include "par_fsai.h"
+
+/******************************************************************************
+ * HYPRE_FSAICreate
+ ******************************************************************************/
+
+void *
+hypre_FSAICreate( void )
+{
+   hypre_ParFSAIData    *fsai_data;
+
+   /* setup params */
+   HYPRE_Int            algo_type;
+   HYPRE_Int            local_solve_type;
+   HYPRE_Int            max_steps;
+   HYPRE_Int            max_step_size;
+   HYPRE_Int            max_nnz_row;
+   HYPRE_Int            num_levels;
+   HYPRE_Real           kap_tolerance;
+
+   /* solver params */
+   HYPRE_Int            eig_max_iters;
+   HYPRE_Int            max_iterations;
+   HYPRE_Int            num_iterations;
+   HYPRE_Real           tolerance;
+   HYPRE_Real           omega;
+
+   /* log info */
+   HYPRE_Int            logging;
+
+   /* output params */
+   HYPRE_Int            print_level;
+
+   /*-----------------------------------------------------------------------
+    * Setup default values for parameters
+    *-----------------------------------------------------------------------*/
+   fsai_data = hypre_CTAlloc(hypre_ParFSAIData, 1, HYPRE_MEMORY_HOST);
+
+   /* setup params */
+   local_solve_type = 0;
+   max_steps = 3;
+   max_step_size = 5;
+   max_nnz_row = max_steps * max_step_size;
+   num_levels = 2;
+   kap_tolerance = 1.0e-3;
+
+   /* parameters that depend on the execution policy */
+#if defined (HYPRE_USING_CUDA) || defined (HYPRE_USING_HIP)
+   HYPRE_MemoryLocation memory_location = hypre_HandleMemoryLocation(hypre_handle());
+
+   if (hypre_GetExecPolicy1(memory_location) == HYPRE_EXEC_DEVICE)
+   {
+      algo_type = 3;
+   }
+   else
+#endif
+   {
+      algo_type = hypre_NumThreads() > 4 ? 2 : 1;
+   }
+
+   /* solver params */
+   eig_max_iters = 0;
+   max_iterations = 20;
+   tolerance = 1.0e-6;
+   omega = 1.0;
+
+   /* log info */
+   logging = 0;
+   num_iterations = 0;
+
+   /* output params */
+   print_level = 0;
+
+   HYPRE_ANNOTATE_FUNC_BEGIN;
+
+   /*-----------------------------------------------------------------------
+    * Create the hypre_ParFSAIData structure and return
+    *-----------------------------------------------------------------------*/
+
+   hypre_ParFSAIDataGmat(fsai_data)      = NULL;
+   hypre_ParFSAIDataGTmat(fsai_data)     = NULL;
+   hypre_ParFSAIDataRWork(fsai_data)     = NULL;
+   hypre_ParFSAIDataZWork(fsai_data)     = NULL;
+   hypre_ParFSAIDataZeroGuess(fsai_data) = 0;
+
+   hypre_FSAISetAlgoType(fsai_data, algo_type);
+   hypre_FSAISetLocalSolveType(fsai_data, local_solve_type);
+   hypre_FSAISetMaxSteps(fsai_data, max_steps);
+   hypre_FSAISetMaxStepSize(fsai_data, max_step_size);
+   hypre_FSAISetMaxNnzRow(fsai_data, max_nnz_row);
+   hypre_FSAISetNumLevels(fsai_data, num_levels);
+   hypre_FSAISetKapTolerance(fsai_data, kap_tolerance);
+
+   hypre_FSAISetMaxIterations(fsai_data, max_iterations);
+   hypre_FSAISetEigMaxIters(fsai_data, eig_max_iters);
+   hypre_FSAISetTolerance(fsai_data, tolerance);
+   hypre_FSAISetOmega(fsai_data, omega);
+
+   hypre_FSAISetLogging(fsai_data, logging);
+   hypre_FSAISetNumIterations(fsai_data, num_iterations);
+
+   hypre_FSAISetPrintLevel(fsai_data, print_level);
+
+   HYPRE_ANNOTATE_FUNC_END;
+
+   return (void *) fsai_data;
+}
+
+/******************************************************************************
+ * HYPRE_FSAIDestroy
+ ******************************************************************************/
+
+HYPRE_Int
+hypre_FSAIDestroy( void *data )
+{
+   hypre_ParFSAIData *fsai_data = (hypre_ParFSAIData*)data;
+
+   HYPRE_ANNOTATE_FUNC_BEGIN;
+
+   if (fsai_data)
+   {
+      if (hypre_ParFSAIDataGmat(fsai_data))
+      {
+         hypre_ParCSRMatrixDestroy(hypre_ParFSAIDataGmat(fsai_data));
+      }
+
+      if (hypre_ParFSAIDataGTmat(fsai_data))
+      {
+         hypre_ParCSRMatrixDestroy(hypre_ParFSAIDataGTmat(fsai_data));
+      }
+
+      hypre_ParVectorDestroy(hypre_ParFSAIDataRWork(fsai_data));
+      hypre_ParVectorDestroy(hypre_ParFSAIDataZWork(fsai_data));
+
+      hypre_TFree(fsai_data, HYPRE_MEMORY_HOST);
+   }
+
+   HYPRE_ANNOTATE_FUNC_END;
+
+   return hypre_error_flag;
+}
+
+/******************************************************************************
+ * Routines to SET the setup phase parameters
+ ******************************************************************************/
+
+HYPRE_Int
+hypre_FSAISetAlgoType( void      *data,
+                       HYPRE_Int  algo_type )
+{
+   hypre_ParFSAIData  *fsai_data = (hypre_ParFSAIData*) data;
+
+   if (!fsai_data)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   if (algo_type < 0)
+   {
+      hypre_error_in_arg(2);
+      return hypre_error_flag;
+   }
+
+   hypre_ParFSAIDataAlgoType(fsai_data) = algo_type;
+
+   return hypre_error_flag;
+}
+
+HYPRE_Int
+hypre_FSAISetLocalSolveType( void      *data,
+                             HYPRE_Int  local_solve_type )
+{
+   hypre_ParFSAIData  *fsai_data = (hypre_ParFSAIData*) data;
+
+   if (!fsai_data)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   if (local_solve_type < 0 || local_solve_type > 2)
+   {
+      hypre_error_in_arg(2);
+      return hypre_error_flag;
+   }
+
+   hypre_ParFSAIDataLocalSolveType(fsai_data) = local_solve_type;
+
+   return hypre_error_flag;
+}
+
+HYPRE_Int
+hypre_FSAISetMaxSteps( void      *data,
+                       HYPRE_Int  max_steps )
+{
+   hypre_ParFSAIData  *fsai_data = (hypre_ParFSAIData*) data;
+
+   if (!fsai_data)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   if (max_steps < 0)
+   {
+      hypre_error_in_arg(2);
+      return hypre_error_flag;
+   }
+
+   hypre_ParFSAIDataMaxSteps(fsai_data) = max_steps;
+
+   return hypre_error_flag;
+}
+
+HYPRE_Int
+hypre_FSAISetMaxStepSize( void      *data,
+                          HYPRE_Int  max_step_size )
+{
+   hypre_ParFSAIData  *fsai_data = (hypre_ParFSAIData*) data;
+
+   if (!fsai_data)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   if (max_step_size < 0)
+   {
+      hypre_error_in_arg(2);
+      return hypre_error_flag;
+   }
+
+   hypre_ParFSAIDataMaxStepSize(fsai_data) = max_step_size;
+
+   return hypre_error_flag;
+}
+
+HYPRE_Int
+hypre_FSAISetMaxNnzRow( void      *data,
+                        HYPRE_Int  max_nnz_row )
+{
+   hypre_ParFSAIData  *fsai_data = (hypre_ParFSAIData*) data;
+
+   if (!fsai_data)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   if (max_nnz_row < 0)
+   {
+      hypre_error_in_arg(2);
+      return hypre_error_flag;
+   }
+
+   hypre_ParFSAIDataMaxNnzRow(fsai_data) = max_nnz_row;
+
+   return hypre_error_flag;
+}
+
+HYPRE_Int
+hypre_FSAISetNumLevels( void      *data,
+                        HYPRE_Int  num_levels )
+{
+   hypre_ParFSAIData  *fsai_data = (hypre_ParFSAIData*) data;
+
+   if (!fsai_data)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   if (num_levels < 1)
+   {
+      hypre_error_in_arg(2);
+      return hypre_error_flag;
+   }
+
+   hypre_ParFSAIDataNumLevels(fsai_data) = num_levels;
+
+   return hypre_error_flag;
+}
+
+HYPRE_Int
+hypre_FSAISetThreshold( void       *data,
+                        HYPRE_Real  threshold )
+{
+   hypre_ParFSAIData  *fsai_data = (hypre_ParFSAIData*) data;
+
+   if (!fsai_data)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   if (threshold < 0)
+   {
+      hypre_error_in_arg(2);
+      return hypre_error_flag;
+   }
+
+   hypre_ParFSAIDataThreshold(fsai_data) = threshold;
+
+   return hypre_error_flag;
+}
+
+HYPRE_Int
+hypre_FSAISetKapTolerance( void       *data,
+                           HYPRE_Real  kap_tolerance )
+{
+   hypre_ParFSAIData  *fsai_data = (hypre_ParFSAIData*) data;
+
+   if (!fsai_data)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   if (kap_tolerance < 0)
+   {
+      hypre_error_in_arg(2);
+      return hypre_error_flag;
+   }
+
+   hypre_ParFSAIDataKapTolerance(fsai_data) = kap_tolerance;
+
+   return hypre_error_flag;
+}
+
+HYPRE_Int
+hypre_FSAISetMaxIterations( void      *data,
+                            HYPRE_Int  max_iterations )
+{
+   hypre_ParFSAIData  *fsai_data = (hypre_ParFSAIData*) data;
+
+   if (!fsai_data)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   if (max_iterations < 0)
+   {
+      hypre_error_in_arg(2);
+      return hypre_error_flag;
+   }
+
+   hypre_ParFSAIDataMaxIterations(fsai_data) = max_iterations;
+
+   return hypre_error_flag;
+}
+
+HYPRE_Int
+hypre_FSAISetEigMaxIters( void      *data,
+                          HYPRE_Int  eig_max_iters )
+{
+   hypre_ParFSAIData  *fsai_data = (hypre_ParFSAIData*) data;
+
+   if (!fsai_data)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   if (eig_max_iters < 0)
+   {
+      hypre_error_in_arg(2);
+      return hypre_error_flag;
+   }
+
+   hypre_ParFSAIDataEigMaxIters(fsai_data) = eig_max_iters;
+
+   return hypre_error_flag;
+}
+
+HYPRE_Int
+hypre_FSAISetZeroGuess( void     *data,
+                        HYPRE_Int zero_guess )
+{
+   hypre_ParFSAIData  *fsai_data = (hypre_ParFSAIData*) data;
+
+   if (!fsai_data)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   if (zero_guess != 0)
+   {
+      hypre_ParFSAIDataZeroGuess(fsai_data) = 1;
+   }
+   else
+   {
+      hypre_ParFSAIDataZeroGuess(fsai_data) = 0;
+   }
+
+   return hypre_error_flag;
+}
+
+HYPRE_Int
+hypre_FSAISetTolerance( void       *data,
+                        HYPRE_Real  tolerance )
+{
+   hypre_ParFSAIData  *fsai_data = (hypre_ParFSAIData*) data;
+
+   if (!fsai_data)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   if (tolerance < 0)
+   {
+      hypre_error_in_arg(2);
+      return hypre_error_flag;
+   }
+
+   hypre_ParFSAIDataTolerance(fsai_data) = tolerance;
+
+   return hypre_error_flag;
+}
+
+HYPRE_Int
+hypre_FSAISetOmega( void       *data,
+                    HYPRE_Real  omega )
+{
+   hypre_ParFSAIData  *fsai_data = (hypre_ParFSAIData*) data;
+
+   if (!fsai_data)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   if (omega < 0)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Negative omega not allowed!");
+      return hypre_error_flag;
+   }
+
+   hypre_ParFSAIDataOmega(fsai_data) = omega;
+
+   return hypre_error_flag;
+}
+
+HYPRE_Int
+hypre_FSAISetLogging( void      *data,
+                      HYPRE_Int  logging )
+{
+   hypre_ParFSAIData  *fsai_data = (hypre_ParFSAIData*) data;
+
+   if (!fsai_data)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   if (logging < 0)
+   {
+      hypre_error_in_arg(2);
+      return hypre_error_flag;
+   }
+
+   hypre_ParFSAIDataLogging(fsai_data) = logging;
+
+   return hypre_error_flag;
+}
+
+HYPRE_Int
+hypre_FSAISetNumIterations( void      *data,
+                            HYPRE_Int  num_iterations )
+{
+   hypre_ParFSAIData  *fsai_data = (hypre_ParFSAIData*) data;
+
+   if (!fsai_data)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   if (num_iterations < 0)
+   {
+      hypre_error_in_arg(2);
+      return hypre_error_flag;
+   }
+
+   hypre_ParFSAIDataNumIterations(fsai_data) = num_iterations;
+
+   return hypre_error_flag;
+}
+
+HYPRE_Int
+hypre_FSAISetPrintLevel( void      *data,
+                         HYPRE_Int  print_level )
+{
+   hypre_ParFSAIData  *fsai_data = (hypre_ParFSAIData*) data;
+
+   if (!fsai_data)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   if (print_level < 0)
+   {
+      hypre_error_in_arg(2);
+      return hypre_error_flag;
+   }
+
+   hypre_ParFSAIDataPrintLevel(fsai_data) = print_level;
+
+   return hypre_error_flag;
+}
+
+/******************************************************************************
+ * Routines to GET the setup phase parameters
+ ******************************************************************************/
+
+HYPRE_Int
+hypre_FSAIGetAlgoType( void      *data,
+                       HYPRE_Int *algo_type )
+{
+   hypre_ParFSAIData  *fsai_data = (hypre_ParFSAIData*) data;
+
+   if (!fsai_data)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   *algo_type = hypre_ParFSAIDataAlgoType(fsai_data);
+
+   return hypre_error_flag;
+}
+
+HYPRE_Int
+hypre_FSAIGetLocalSolveType( void      *data,
+                             HYPRE_Int *local_solve_type )
+{
+   hypre_ParFSAIData  *fsai_data = (hypre_ParFSAIData*) data;
+
+   if (!fsai_data)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   *local_solve_type = hypre_ParFSAIDataLocalSolveType(fsai_data);
+
+   return hypre_error_flag;
+}
+
+HYPRE_Int
+hypre_FSAIGetMaxSteps( void      *data,
+                       HYPRE_Int *algo_type )
+{
+   hypre_ParFSAIData  *fsai_data = (hypre_ParFSAIData*) data;
+
+   if (!fsai_data)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   *algo_type = hypre_ParFSAIDataMaxSteps(fsai_data);
+
+   return hypre_error_flag;
+}
+
+HYPRE_Int
+hypre_FSAIGetMaxStepSize( void      *data,
+                          HYPRE_Int *max_step_size )
+{
+   hypre_ParFSAIData  *fsai_data = (hypre_ParFSAIData*) data;
+
+   if (!fsai_data)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   *max_step_size = hypre_ParFSAIDataMaxStepSize(fsai_data);
+
+   return hypre_error_flag;
+}
+
+HYPRE_Int
+hypre_FSAIGetMaxNnzRow( void      *data,
+                        HYPRE_Int *max_nnz_row )
+{
+   hypre_ParFSAIData  *fsai_data = (hypre_ParFSAIData*) data;
+
+   if (!fsai_data)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   *max_nnz_row = hypre_ParFSAIDataMaxNnzRow(fsai_data);
+
+   return hypre_error_flag;
+}
+
+HYPRE_Int
+hypre_FSAIGetNumLevels( void      *data,
+                        HYPRE_Int *num_levels )
+{
+   hypre_ParFSAIData  *fsai_data = (hypre_ParFSAIData*) data;
+
+   if (!fsai_data)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   *num_levels = hypre_ParFSAIDataNumLevels(fsai_data);
+
+   return hypre_error_flag;
+}
+
+HYPRE_Int
+hypre_FSAIGetThreshold( void       *data,
+                        HYPRE_Real *threshold )
+{
+   hypre_ParFSAIData  *fsai_data = (hypre_ParFSAIData*) data;
+
+   if (!fsai_data)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   *threshold = hypre_ParFSAIDataThreshold(fsai_data);
+
+   return hypre_error_flag;
+}
+
+HYPRE_Int
+hypre_FSAIGetKapTolerance( void       *data,
+                           HYPRE_Real *kap_tolerance )
+{
+   hypre_ParFSAIData  *fsai_data = (hypre_ParFSAIData*) data;
+
+   if (!fsai_data)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   *kap_tolerance = hypre_ParFSAIDataKapTolerance(fsai_data);
+
+   return hypre_error_flag;
+}
+
+HYPRE_Int
+hypre_FSAIGetMaxIterations( void      *data,
+                            HYPRE_Int *max_iterations )
+{
+   hypre_ParFSAIData  *fsai_data = (hypre_ParFSAIData*) data;
+
+   if (!fsai_data)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   *max_iterations = hypre_ParFSAIDataMaxIterations(fsai_data);
+
+   return hypre_error_flag;
+}
+
+HYPRE_Int
+hypre_FSAIGetEigMaxIters( void      *data,
+                          HYPRE_Int *eig_max_iters )
+{
+   hypre_ParFSAIData  *fsai_data = (hypre_ParFSAIData*) data;
+
+   if (!fsai_data)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   *eig_max_iters = hypre_ParFSAIDataEigMaxIters(fsai_data);
+
+   return hypre_error_flag;
+}
+
+HYPRE_Int
+hypre_FSAIGetZeroGuess( void      *data,
+                        HYPRE_Int *zero_guess )
+{
+   hypre_ParFSAIData  *fsai_data = (hypre_ParFSAIData*) data;
+
+   if (!fsai_data)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   *zero_guess = hypre_ParFSAIDataZeroGuess(fsai_data);
+
+   return hypre_error_flag;
+}
+
+HYPRE_Int
+hypre_FSAIGetTolerance( void       *data,
+                        HYPRE_Real *tolerance )
+{
+   hypre_ParFSAIData  *fsai_data = (hypre_ParFSAIData*) data;
+
+   if (!fsai_data)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   *tolerance = hypre_ParFSAIDataTolerance(fsai_data);
+
+   return hypre_error_flag;
+}
+
+HYPRE_Int
+hypre_FSAIGetOmega( void       *data,
+                    HYPRE_Real *omega )
+{
+   hypre_ParFSAIData  *fsai_data = (hypre_ParFSAIData*) data;
+
+   if (!fsai_data)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   *omega = hypre_ParFSAIDataOmega(fsai_data);
+
+   return hypre_error_flag;
+}
+
+HYPRE_Int
+hypre_FSAIGetLogging( void      *data,
+                      HYPRE_Int *logging )
+{
+   hypre_ParFSAIData  *fsai_data = (hypre_ParFSAIData*) data;
+
+   if (!fsai_data)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   *logging = hypre_ParFSAIDataLogging(fsai_data);
+
+   return hypre_error_flag;
+}
+
+HYPRE_Int
+hypre_FSAIGetNumIterations( void      *data,
+                            HYPRE_Int *num_iterations )
+{
+   hypre_ParFSAIData  *fsai_data = (hypre_ParFSAIData*) data;
+
+   if (!fsai_data)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   *num_iterations = hypre_ParFSAIDataNumIterations(fsai_data);
+
+   return hypre_error_flag;
+}
+
+HYPRE_Int
+hypre_FSAIGetPrintLevel( void      *data,
+                         HYPRE_Int *print_level )
+{
+   hypre_ParFSAIData  *fsai_data = (hypre_ParFSAIData*) data;
+
+   if (!fsai_data)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   *print_level = hypre_ParFSAIDataPrintLevel(fsai_data);
+
+   return hypre_error_flag;
+}
diff --git a/external/hypre/src/parcsr_ls/par_fsai.h b/external/hypre/src/parcsr_ls/par_fsai.h
new file mode 100644
index 00000000..9bbe7073
--- /dev/null
+++ b/external/hypre/src/parcsr_ls/par_fsai.h
@@ -0,0 +1,88 @@
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+#ifndef hypre_ParFSAI_DATA_HEADER
+#define hypre_ParFSAI_DATA_HEADER
+
+//#define DEBUG_FSAI
+
+/*--------------------------------------------------------------------------
+ * hypre_ParFSAIData
+ *--------------------------------------------------------------------------*/
+
+typedef struct hypre_ParFSAIData_struct
+{
+   /* FSAI Setup input data */
+   HYPRE_Int             algo_type;        /* FSAI algorithm type */
+   HYPRE_Int             local_solve_type; /* Local linear solver type */
+   HYPRE_Int             max_steps;        /* Max. iterations run per row */
+   HYPRE_Int             max_step_size;    /* Max. number of nonzeros added to a row of G per step */
+   HYPRE_Int             max_nnz_row;      /* Max. number of nonzeros per row of G */
+   HYPRE_Int             num_levels;       /* Number of levels for computing the candidate pattern */
+   HYPRE_Real            threshold;        /* Filtering threshold for the candidate pattern */
+   HYPRE_Real            kap_tolerance;    /* Min. amount of change between two steps */
+
+   /* FSAI Setup data */
+   HYPRE_Real            density;          /* Density of matrix G wrt. A */
+   hypre_ParCSRMatrix   *Gmat;             /* Matrix holding FSAI factor. M^(-1) = G'G */
+   hypre_ParCSRMatrix   *GTmat;            /* Matrix holding the transpose of the FSAI factor */
+
+   /* Solver data */
+   HYPRE_Int             zero_guess;       /* Flag indicating x0 = 0 */
+   HYPRE_Int             eig_max_iters;    /* Iters for computing max. eigenvalue of G^T*G*A */
+   HYPRE_Int             max_iterations;   /* Maximum iterations run for the solver */
+   HYPRE_Int             num_iterations;   /* Number of iterations the solver ran */
+   HYPRE_Real            omega;            /* Step size for Preconditioned Richardson Solver */
+   HYPRE_Real            tolerance;        /* Tolerance for the solver */
+   HYPRE_Real            rel_resnorm;      /* available if logging > 1 */
+
+   /* Work data */
+   hypre_ParVector      *r_work;           /* work vector used to compute the residual */
+   hypre_ParVector      *z_work;           /* work vector used for applying FSAI */
+
+   /* Log info data */
+   HYPRE_Int             logging;
+   HYPRE_Int             print_level;
+} hypre_ParFSAIData;
+
+/*--------------------------------------------------------------------------
+ *  Accessor functions for the hypre_ParFSAIData structure
+ *--------------------------------------------------------------------------*/
+
+/* FSAI Setup input data */
+#define hypre_ParFSAIDataAlgoType(fsai_data)                ((fsai_data) -> algo_type)
+#define hypre_ParFSAIDataLocalSolveType(fsai_data)          ((fsai_data) -> local_solve_type)
+#define hypre_ParFSAIDataMaxSteps(fsai_data)                ((fsai_data) -> max_steps)
+#define hypre_ParFSAIDataMaxStepSize(fsai_data)             ((fsai_data) -> max_step_size)
+#define hypre_ParFSAIDataMaxNnzRow(fsai_data)               ((fsai_data) -> max_nnz_row)
+#define hypre_ParFSAIDataNumLevels(fsai_data)               ((fsai_data) -> num_levels)
+#define hypre_ParFSAIDataThreshold(fsai_data)               ((fsai_data) -> threshold)
+#define hypre_ParFSAIDataKapTolerance(fsai_data)            ((fsai_data) -> kap_tolerance)
+
+/* FSAI Setup data */
+#define hypre_ParFSAIDataGmat(fsai_data)                    ((fsai_data) -> Gmat)
+#define hypre_ParFSAIDataGTmat(fsai_data)                   ((fsai_data) -> GTmat)
+#define hypre_ParFSAIDataDensity(fsai_data)                 ((fsai_data) -> density)
+
+/* Solver problem data */
+#define hypre_ParFSAIDataZeroGuess(fsai_data)               ((fsai_data) -> zero_guess)
+#define hypre_ParFSAIDataEigMaxIters(fsai_data)             ((fsai_data) -> eig_max_iters)
+#define hypre_ParFSAIDataMaxIterations(fsai_data)           ((fsai_data) -> max_iterations)
+#define hypre_ParFSAIDataNumIterations(fsai_data)           ((fsai_data) -> num_iterations)
+#define hypre_ParFSAIDataOmega(fsai_data)                   ((fsai_data) -> omega)
+#define hypre_ParFSAIDataRelResNorm(fsai_data)              ((fsai_data) -> rel_resnorm)
+#define hypre_ParFSAIDataTolerance(fsai_data)               ((fsai_data) -> tolerance)
+
+/* Work data */
+#define hypre_ParFSAIDataRWork(fsai_data)                   ((fsai_data) -> r_work)
+#define hypre_ParFSAIDataZWork(fsai_data)                   ((fsai_data) -> z_work)
+
+/* Log info data */
+#define hypre_ParFSAIDataLogging(fsai_data)                 ((fsai_data) -> logging)
+#define hypre_ParFSAIDataPrintLevel(fsai_data)              ((fsai_data) -> print_level)
+
+#endif
diff --git a/external/hypre/src/parcsr_ls/par_fsai_device.c b/external/hypre/src/parcsr_ls/par_fsai_device.c
new file mode 100644
index 00000000..581d85c0
--- /dev/null
+++ b/external/hypre/src/parcsr_ls/par_fsai_device.c
@@ -0,0 +1,1338 @@
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+#include "_hypre_parcsr_ls.h"
+#include "_hypre_utilities.hpp"
+#include "par_fsai.h"
+
+#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+
+#define mat_(l, k, i, j) mat_data[l * (l * k + i) + j]
+#define rhs_(l, i, j)    rhs_data[l * i + j]
+#define sol_(l, i, j)    sol_data[l * i + j]
+#define ls_(i, j)        ls_data[batch_dim * j + i]
+
+#define HYPRE_THRUST_ZIP3(A, B, C) thrust::make_zip_iterator(thrust::make_tuple(A, B, C))
+
+/*--------------------------------------------------------------------------
+ * hypreGPUKernel_BatchedGaussJordanSolve
+ *--------------------------------------------------------------------------*/
+
+__global__ void
+__launch_bounds__(1024, 1)
+hypreGPUKernel_BatchedGaussJordanSolve( hypre_DeviceItem  &item,
+                                        HYPRE_Int          batch_num_items,
+                                        HYPRE_Int          batch_dim,
+                                        HYPRE_Complex     *mat_data,
+                                        HYPRE_Complex     *rhs_data,
+                                        HYPRE_Complex     *sol_data )
+{
+   extern __shared__ void* shmem[];
+
+   HYPRE_Complex    *ls_data = (HYPRE_Complex*) shmem;
+   HYPRE_Complex    *coef    = (HYPRE_Complex*) (ls_data + batch_dim * (batch_dim + 1));
+   HYPRE_Int        *pos     = (HYPRE_Int*) (coef + 2);
+
+   HYPRE_Int         tidx    = threadIdx.x;
+   HYPRE_Int         tidy    = threadIdx.y;
+   HYPRE_Int         btid    = blockIdx.y * gridDim.x + blockIdx.x;
+
+   HYPRE_Int         i, k;
+   HYPRE_Int         posA;
+   HYPRE_Complex     coefA, coefB;
+   HYPRE_Complex    *ptrA;
+
+   if (btid < batch_num_items)
+   {
+      /* Shift to LS belonging to the current batch ID (btid) */
+      mat_data += btid * batch_dim * batch_dim;
+      rhs_data += btid * batch_dim;
+      sol_data += btid * batch_dim;
+
+      /* Copy matrix into shared memory */
+      if (tidy < batch_dim)
+      {
+         ls_(tidx, tidy) = mat_data[tidy * batch_dim + tidx];
+      }
+
+      /* Copy RHS into shared memory */
+      if (tidy == batch_dim)
+      {
+         ls_(tidx, tidy) = rhs_data[tidx];
+      }
+
+      /* Perform elimination */
+      for (k = 0; k < batch_dim; k++)
+      {
+         /* Pivot computation */
+         __syncthreads();
+         if ((tidx < 2) && (tidy == 0))
+         {
+            i = k + 1 + tidx;
+            posA  = k;
+            ptrA  = &ls_(i, k);
+            coefA = fabs(ls_(k, k));
+
+#pragma unroll 1
+            for (; i < batch_dim; i += 2)
+            {
+               coefB = fabs(*ptrA);
+               if (coefA < coefB)
+               {
+                  coefA = coefB;
+                  posA  = i;
+               }
+               ptrA += 2;
+            }
+            pos[tidx]  = posA;
+            coef[tidx] = coefA;
+         }
+
+         /* Swap row coefficients */
+         __syncthreads();
+         if ((tidx == k) && (tidy >= k))
+         {
+            posA = (coef[1] > coef[0]) ? pos[1] : pos[0];
+
+            coefA = ls_(posA, tidy);
+            ls_(posA, tidy) = ls_(tidx, tidy);
+            ls_(tidx, tidy) = coefA;
+         }
+
+         /* Row scaling */
+         __syncthreads();
+         if ((tidx == k) && (tidy > k))
+         {
+            ls_(tidx, tidy) = ls_(tidx, tidy) * (1.0 / ls_(tidx, k));
+         }
+
+         /* Row elimination */
+         __syncthreads();
+         if ((tidx != k) && (tidy > k))
+         {
+            ls_(tidx, tidy) -= ls_(tidx, k) * ls_(k, tidy);
+         }
+      }
+
+      __syncthreads();
+      if (tidy == batch_dim)
+      {
+         sol_data[tidx] = ls_(tidx, batch_dim);
+      }
+   }
+}
+
+/*--------------------------------------------------------------------
+ * hypreGPUKernel_FSAIExtractSubSystems
+ *
+ * Output:
+ *   1) mat_data: dense matrix coefficients.
+ *   2) rhs_data: right hand side coefficients.
+ *   3) G_r: number of nonzero coefficients per row of the matrix G.
+ *
+ * TODO:
+ *   1) Minimize intra-warp divergence.
+ *--------------------------------------------------------------------*/
+
+__global__ void
+hypreGPUKernel_FSAIExtractSubSystems( hypre_DeviceItem &item,
+                                      HYPRE_Int         num_rows,
+                                      HYPRE_Int        *A_i,
+                                      HYPRE_Int        *A_j,
+                                      HYPRE_Complex    *A_a,
+                                      HYPRE_Int        *P_i,
+                                      HYPRE_Int        *P_e,
+                                      HYPRE_Int        *P_j,
+                                      HYPRE_Int         batch_dim,
+                                      HYPRE_Complex    *mat_data,
+                                      HYPRE_Complex    *rhs_data,
+                                      HYPRE_Int        *G_r )
+{
+   HYPRE_Int      lane = hypre_gpu_get_lane_id<1>(item);
+   HYPRE_Int      i, j, jj, k;
+   HYPRE_Int      pj, qj;
+   HYPRE_Int      pk, qk;
+   HYPRE_Int      A_col, P_col;
+   HYPRE_Complex  val;
+   hypre_mask     bitmask;
+
+   /* Grid-stride loop over matrix rows */
+   for (i = hypre_gpu_get_grid_warp_id<1, 1>(item);
+        i < num_rows;
+        i += hypre_gpu_get_grid_num_warps<1, 1>(item))
+   {
+      /* Set identity matrix */
+      for (j = lane; j < batch_dim; j += HYPRE_WARP_SIZE)
+      {
+         mat_(batch_dim, i, j, j) = 1.0;
+      }
+
+      if (lane == 0)
+      {
+         pj = read_only_load(P_i + i);
+         qj = read_only_load(P_e + i);
+      }
+      qj = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, qj, 0, HYPRE_WARP_SIZE);
+      pj = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, pj, 0, HYPRE_WARP_SIZE);
+
+      if (lane < 2)
+      {
+         pk = read_only_load(A_i + i + lane);
+      }
+      qk = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, pk, 1, HYPRE_WARP_SIZE);
+      pk = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, pk, 0, HYPRE_WARP_SIZE);
+
+      /* Set right hand side vector */
+      for (j = pj; j < qj; j++)
+      {
+         if (lane == 0)
+         {
+            P_col = read_only_load(P_j + j);
+         }
+         P_col = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, P_col, 0, HYPRE_WARP_SIZE);
+
+         for (k = pk + lane;
+              warp_any_sync(item, HYPRE_WARP_FULL_MASK, k < qk);
+              k += HYPRE_WARP_SIZE)
+         {
+            if (k < qk)
+            {
+               A_col = read_only_load(A_j + k);
+            }
+            else
+            {
+               A_col = -1;
+            }
+
+            bitmask = hypre_ballot_sync(item, HYPRE_WARP_FULL_MASK, A_col == P_col);
+            if (bitmask > 0)
+            {
+               if (lane == (hypre_ffs(bitmask) - 1))
+               {
+                  rhs_(batch_dim, i, j - pj) = - read_only_load(A_a + k);
+               }
+               break;
+            }
+         }
+      }
+
+      /* Loop over requested rows */
+      for (j = pj; j < qj; j++)
+      {
+         if (lane < 2)
+         {
+            pk = read_only_load(A_i + P_j[j] + lane);
+         }
+         qk = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, pk, 1, HYPRE_WARP_SIZE);
+         pk = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, pk, 0, HYPRE_WARP_SIZE);
+
+         /* Visit only the lower triangular part */
+         for (jj = pj; jj <= j; jj++)
+         {
+            if (lane == 0)
+            {
+               P_col = read_only_load(P_j + jj);
+            }
+            P_col = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, P_col, 0, HYPRE_WARP_SIZE);
+
+            for (k = pk + lane;
+                 warp_any_sync(item, HYPRE_WARP_FULL_MASK, k < qk);
+                 k += HYPRE_WARP_SIZE)
+            {
+               if (k < qk)
+               {
+                  A_col = read_only_load(A_j + k);
+               }
+               else
+               {
+                  A_col = -1;
+               }
+
+               bitmask = hypre_ballot_sync(item, HYPRE_WARP_FULL_MASK, A_col == P_col);
+               if (bitmask > 0)
+               {
+                  if (lane == (hypre_ffs(bitmask) - 1))
+                  {
+                     val = read_only_load(A_a + k);
+                     mat_(batch_dim, i, j - pj, jj - pj) = val;
+                     mat_(batch_dim, i, jj - pj, j - pj) = val;
+                  }
+                  break;
+               }
+            }
+         }
+      }
+
+      /* Set number of nonzero coefficients per row of G */
+      if (lane == 0)
+      {
+         G_r[i] = qj - pj + 1;
+      }
+   } /* Grid-stride loop over matrix rows */
+}
+
+/*--------------------------------------------------------------------
+ * hypreGPUKernel_FSAIScaling
+ *
+ * TODO: unroll inner loop
+ *       Use fma?
+ *--------------------------------------------------------------------*/
+
+__global__ void
+hypreGPUKernel_FSAIScaling( hypre_DeviceItem &item,
+                            HYPRE_Int         num_rows,
+                            HYPRE_Int         batch_dim,
+                            HYPRE_Complex    *sol_data,
+                            HYPRE_Complex    *rhs_data,
+                            HYPRE_Complex    *scaling,
+                            HYPRE_Int        *info )
+{
+   HYPRE_Int      i, j;
+   HYPRE_Complex  val;
+
+   /* Grid-stride loop over matrix rows */
+   for (i = hypre_gpu_get_grid_thread_id<1, 1>(item);
+        i < num_rows;
+        i += hypre_gpu_get_grid_num_threads<1, 1>(item))
+   {
+      val = scaling[i];
+      for (j = 0; j < batch_dim; j++)
+      {
+         val += sol_(batch_dim, i, j) * rhs_(batch_dim, i, j);
+      }
+
+      if (val > 0)
+      {
+         scaling[i] = 1.0 / sqrt(val);
+      }
+      else
+      {
+         scaling[i] = 1.0 / sqrt(scaling[i]);
+         info[i] = 1;
+      }
+   }
+}
+
+/*--------------------------------------------------------------------
+ * hypreGPUKernel_FSAIGatherEntries
+ *
+ * Output:
+ *   1) G_j: column indices of G_diag
+ *   2) G_a: coefficients of G_diag
+ *
+ * TODO:
+ *   1) Use a (sub-)warp per row of G
+ *--------------------------------------------------------------------*/
+
+__global__ void
+hypreGPUKernel_FSAIGatherEntries( hypre_DeviceItem &item,
+                                  HYPRE_Int         num_rows,
+                                  HYPRE_Int         batch_dim,
+                                  HYPRE_Complex    *sol_data,
+                                  HYPRE_Complex    *scaling,
+                                  HYPRE_Int        *K_i,
+                                  HYPRE_Int        *K_e,
+                                  HYPRE_Int        *K_j,
+                                  HYPRE_Int        *G_i,
+                                  HYPRE_Int        *G_j,
+                                  HYPRE_Complex    *G_a )
+{
+   HYPRE_Int      i, j;
+   HYPRE_Int      cnt, il;
+   HYPRE_Int      col;
+   HYPRE_Complex  val;
+
+   /* Grid-stride loop over matrix rows */
+   for (i = hypre_gpu_get_grid_thread_id<1, 1>(item);
+        i < num_rows;
+        i += hypre_gpu_get_grid_num_threads<1, 1>(item))
+   {
+      /* Set scaling factor */
+      val = scaling[i];
+
+      /* Set diagonal coefficient */
+      cnt = G_i[i];
+      G_j[cnt] = i;
+      G_a[cnt] = val;
+      cnt++;
+
+      /* Set off-diagonal coefficients */
+      il = 0;
+      for (j = K_i[i]; j < K_e[i]; j++)
+      {
+         col = K_j[j];
+
+         G_j[cnt + il] = col;
+         G_a[cnt + il] = sol_(batch_dim, i, il) * val;
+         il++;
+      }
+   }
+}
+
+/*--------------------------------------------------------------------
+ * hypreGPUKernel_FSAITruncateCandidateOrdered
+ *
+ * Truncates the candidate pattern matrix (K). This function extracts
+ * lower triangular portion of the matrix up to the largest
+ * "max_nonzeros_row" coefficients in absolute value.
+ *
+ * Assumptions:
+ *    1) columns are ordered with descreasing absolute coef. values
+ *    2) max_nonzeros_row < warp_size.
+ *
+ * TODO:
+ *    1) Perform truncation with COO matrix
+ *    2) Use less than one warp per row when possible
+ *--------------------------------------------------------------------*/
+
+__global__ void
+hypreGPUKernel_FSAITruncateCandidateOrdered( hypre_DeviceItem &item,
+                                             HYPRE_Int         max_nonzeros_row,
+                                             HYPRE_Int         num_rows,
+                                             HYPRE_Int        *K_i,
+                                             HYPRE_Int        *K_j,
+                                             HYPRE_Complex    *K_a )
+{
+   HYPRE_Int      lane = hypre_gpu_get_lane_id<1>(item);
+   HYPRE_Int      p = 0;
+   HYPRE_Int      q = 0;
+   HYPRE_Int      i, j, k, kk, cnt;
+   HYPRE_Int      col;
+   hypre_mask     bitmask;
+   HYPRE_Complex  val;
+   HYPRE_Int      max_lane;
+   HYPRE_Int      max_idx;
+   HYPRE_Complex  max_val;
+   HYPRE_Complex  warp_max_val;
+
+   /* Grid-stride loop over matrix rows */
+   for (i = hypre_gpu_get_grid_warp_id<1, 1>(item);
+        i < num_rows;
+        i += hypre_gpu_get_grid_num_warps<1, 1>(item))
+   {
+      if (lane < 2)
+      {
+         p = read_only_load(K_i + i + lane);
+      }
+      q = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 1, HYPRE_WARP_SIZE);
+      p = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 0, HYPRE_WARP_SIZE);
+
+      k = 0;
+      while (k < max_nonzeros_row)
+      {
+         /* Initialize variables */
+         j = p + k + lane;
+         max_val = 0.0;
+         max_idx = -1;
+
+         /* Find maximum val/col pair in each lane */
+         if (j < q)
+         {
+            if (K_j[j] < i)
+            {
+               max_val = abs(K_a[j]);
+               max_idx = j;
+            }
+         }
+
+         for (j += HYPRE_WARP_SIZE; j < q; j += HYPRE_WARP_SIZE)
+         {
+            if (K_j[j] < i)
+            {
+               val = abs(K_a[j]);
+               if (val > max_val)
+               {
+                  max_val = val;
+                  max_idx = j;
+               }
+            }
+         }
+
+         /* Find maximum coefficient in absolute value in the warp */
+         warp_max_val = warp_allreduce_max(item, max_val);
+
+         /* Reorder col/val entries associated with warp_max_val */
+         bitmask = hypre_ballot_sync(item, HYPRE_WARP_FULL_MASK, warp_max_val == max_val);
+         if (warp_max_val > 0.0)
+         {
+            cnt = min(hypre_popc(bitmask), max_nonzeros_row - k);
+
+            for (kk = 0; kk < cnt; kk++)
+            {
+               /* warp_sync(item); */
+               max_lane = hypre_ffs(bitmask) - 1;
+               if (lane == max_lane)
+               {
+                  col = K_j[p + k + kk];
+                  val = K_a[p + k + kk];
+
+                  K_j[p + k + kk] = K_j[max_idx];
+                  K_a[p + k + kk] = max_val;
+
+                  K_j[max_idx] = col;
+                  K_a[max_idx] = val;
+               }
+
+               /* Update bitmask */
+               bitmask = hypre_mask_flip_at(bitmask, max_lane);
+            }
+
+            /* Update number of nonzeros per row */
+            k += cnt;
+         }
+         else
+         {
+            break;
+         }
+      }
+
+      /* Exclude remaining columns */
+      for (j = p + k + lane; j < q; j += HYPRE_WARP_SIZE)
+      {
+         K_j[j] = -1;
+      }
+   }
+}
+
+/*--------------------------------------------------------------------
+ * hypreGPUKernel_FSAITruncateCandidateUnordered
+ *
+ * Truncates the candidate pattern matrix (K). This function extracts
+ * lower triangular portion of the matrix up to the largest
+ * "max_nonzeros_row" coefficients in absolute value.
+ *
+ * Assumptions:
+ *    1) max_nonzeros_row < warp_size.
+ *
+ * TODO:
+ *    1) Use less than one warp per row when possible
+ *--------------------------------------------------------------------*/
+
+__global__ void
+hypreGPUKernel_FSAITruncateCandidateUnordered( hypre_DeviceItem &item,
+                                               HYPRE_Int         max_nonzeros_row,
+                                               HYPRE_Int         num_rows,
+                                               HYPRE_Int        *K_i,
+                                               HYPRE_Int        *K_e,
+                                               HYPRE_Int        *K_j,
+                                               HYPRE_Complex    *K_a )
+{
+   HYPRE_Int      lane = hypre_gpu_get_lane_id<1>(item);
+   HYPRE_Int      p = 0;
+   HYPRE_Int      q = 0;
+   HYPRE_Int      ee, e, i, j, k, kk, cnt;
+   hypre_mask     bitmask;
+   HYPRE_Complex  val;
+   HYPRE_Int      max_lane;
+   HYPRE_Int      max_idx;
+   HYPRE_Int      max_col;
+   HYPRE_Int      colK;
+   HYPRE_Complex  valK;
+   HYPRE_Complex  max_val;
+   HYPRE_Complex  warp_max_val;
+
+   /* Grid-stride loop over matrix rows */
+   for (i = hypre_gpu_get_grid_warp_id<1, 1>(item);
+        i < num_rows;
+        i += hypre_gpu_get_grid_num_warps<1, 1>(item))
+   {
+      if (lane < 2)
+      {
+         p = read_only_load(K_i + i + lane);
+      }
+      q = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 1, HYPRE_WARP_SIZE);
+      p = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 0, HYPRE_WARP_SIZE);
+
+      k = 0;
+      while (k < max_nonzeros_row)
+      {
+         /* Initialize variables */
+         j = p + k + lane;
+         max_val = 0.0;
+         max_idx = -1;
+
+         /* Find maximum val/col pair in each lane */
+         if (j < q)
+         {
+            if (K_j[j] < i)
+            {
+               max_val = abs(K_a[j]);
+               max_idx = j;
+            }
+         }
+
+         for (j += HYPRE_WARP_SIZE; j < q; j += HYPRE_WARP_SIZE)
+         {
+            if (K_j[j] < i)
+            {
+               val = abs(K_a[j]);
+               if (val > max_val)
+               {
+                  max_val = val;
+                  max_idx = j;
+               }
+            }
+         }
+
+         /* Find maximum coefficient in absolute value in the warp */
+         warp_max_val = warp_allreduce_max(item, max_val);
+
+         /* Reorder col/val entries associated with warp_max_val */
+         bitmask = hypre_ballot_sync(item, HYPRE_WARP_FULL_MASK, warp_max_val == max_val);
+         if (warp_max_val > 0.0)
+         {
+            cnt = min(hypre_popc(bitmask), max_nonzeros_row - k);
+
+            for (kk = 0; kk < cnt; kk++)
+            {
+               /* warp_sync(item); */
+               max_lane = hypre_ffs(bitmask) - 1;
+               if (lane == max_lane)
+               {
+                  colK = K_j[p + k + kk];
+                  valK = K_a[p + k + kk];
+                  max_col = K_j[max_idx];
+
+                  if (k + kk == 0)
+                  {
+                     K_j[p] = max_col;
+                     K_a[p] = max_val;
+
+                     K_j[max_idx] = colK;
+                     K_a[max_idx] = valK;
+                  }
+                  else
+                  {
+                     if (max_col > K_j[p + k + kk - 1])
+                     {
+                        /* Insert from the right */
+                        K_j[p + k + kk] = max_col;
+                        K_a[p + k + kk] = max_val;
+
+                        K_j[max_idx] = colK;
+                        K_a[max_idx] = valK;
+                     }
+                     else if (max_col < K_j[p])
+                     {
+                        /* Insert from the left */
+                        for (ee = k + kk; ee > 0; ee--)
+                        {
+                           K_j[p + ee] = K_j[p + ee - 1];
+                           K_a[p + ee] = K_a[p + ee - 1];
+                        }
+
+                        K_j[p] = max_col;
+                        K_a[p] = max_val;
+
+                        if (max_idx > p + k + kk)
+                        {
+                           K_j[max_idx] = colK;
+                           K_a[max_idx] = valK;
+                        }
+                     }
+                     else
+                     {
+                        /* Insert in the middle */
+                        for (e = k + kk - 1; e >= 0; e--)
+                        {
+                           if (K_j[p + e] < max_col)
+                           {
+                              for (ee = k + kk - 1; ee > e; ee--)
+                              {
+                                 K_j[p + ee + 1] = K_j[p + ee];
+                                 K_a[p + ee + 1] = K_a[p + ee];
+                              }
+
+                              K_j[p + e + 1] = max_col;
+                              K_a[p + e + 1] = max_val;
+
+                              if (max_idx > p + k + kk)
+                              {
+                                 K_j[max_idx] = colK;
+                                 K_a[max_idx] = valK;
+                              }
+
+                              break;
+                           }
+                        }
+                     }
+                  }
+               }
+
+               /* Update bitmask */
+               bitmask = hypre_mask_flip_at(bitmask, max_lane);
+            }
+
+            /* Update number of nonzeros per row */
+            k += cnt;
+         }
+         else
+         {
+            break;
+         }
+      }
+
+      /* Set pointer to the end of this row */
+      if (lane == 0)
+      {
+         K_e[i] = p + k;
+      }
+   }
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_BatchedGaussJordanSolveDevice
+ *
+ * Solve dense linear systems with less than 32 unknowns via Gauss-Jordan
+ * elimination.
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_BatchedGaussJordanSolveDevice( HYPRE_Int       batch_num_items,
+                                     HYPRE_Int       batch_dim,
+                                     HYPRE_Complex  *mat_data,
+                                     HYPRE_Complex  *rhs_data,
+                                     HYPRE_Complex  *sol_data )
+{
+   if (batch_dim > 31)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                        "Error: cannot solve for local systems larger than 31.");
+      return hypre_error_flag;
+   }
+
+   /* Assign one linear system per thread block*/
+   dim3       bDim = hypre_dim3(batch_dim, batch_dim + 1, 1);
+   dim3       gDim = hypre_dim3(batch_num_items, 1, 1);
+   HYPRE_Int  shared_mem_size = (sizeof(HYPRE_Complex) * ((batch_dim + 1) * batch_dim + 2) +
+                                 sizeof(HYPRE_Int) * 2);
+
+   HYPRE_GPU_LAUNCH2(hypreGPUKernel_BatchedGaussJordanSolve, gDim, bDim, shared_mem_size,
+                     batch_num_items, batch_dim, mat_data, rhs_data, sol_data);
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_FSAIExtractSubSystemsDevice
+ *
+ * TODO (VPM): This could be a hypre_CSRMatrix routine
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_FSAIExtractSubSystemsDevice( HYPRE_Int       num_rows,
+                                   HYPRE_Int      *A_i,
+                                   HYPRE_Int      *A_j,
+                                   HYPRE_Complex  *A_a,
+                                   HYPRE_Int      *P_i,
+                                   HYPRE_Int      *P_e,
+                                   HYPRE_Int      *P_j,
+                                   HYPRE_Int       batch_dim,
+                                   HYPRE_Complex  *mat_data,
+                                   HYPRE_Complex  *rhs_data,
+                                   HYPRE_Int      *G_r )
+{
+   /* trivial case */
+   if (num_rows <= 0)
+   {
+      return hypre_error_flag;
+   }
+
+   dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+   dim3 gDim = hypre_GetDefaultDeviceGridDimension(num_rows, "warp", bDim);
+
+   HYPRE_GPU_LAUNCH( hypreGPUKernel_FSAIExtractSubSystems, gDim, bDim, num_rows,
+                     A_i, A_j, A_a, P_i, P_e, P_j, batch_dim, mat_data, rhs_data, G_r );
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_FSAIScalingDevice
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_FSAIScalingDevice( HYPRE_Int       num_rows,
+                         HYPRE_Int       batch_dim,
+                         HYPRE_Complex  *sol_data,
+                         HYPRE_Complex  *rhs_data,
+                         HYPRE_Complex  *scaling,
+                         HYPRE_Int      *info )
+{
+   /* trivial case */
+   if (num_rows <= 0)
+   {
+      return hypre_error_flag;
+   }
+
+   dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+   dim3 gDim = hypre_GetDefaultDeviceGridDimension(num_rows, "thread", bDim);
+
+   HYPRE_GPU_LAUNCH( hypreGPUKernel_FSAIScaling, gDim, bDim,
+                     num_rows, batch_dim, sol_data, rhs_data, scaling, info );
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_FSAIGatherEntriesDevice
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_FSAIGatherEntriesDevice( HYPRE_Int       num_rows,
+                               HYPRE_Int       batch_dim,
+                               HYPRE_Complex  *sol_data,
+                               HYPRE_Complex  *scaling,
+                               HYPRE_Int      *K_i,
+                               HYPRE_Int      *K_e,
+                               HYPRE_Int      *K_j,
+                               HYPRE_Int      *G_i,
+                               HYPRE_Int      *G_j,
+                               HYPRE_Complex  *G_a )
+{
+   /* trivial case */
+   if (num_rows <= 0)
+   {
+      return hypre_error_flag;
+   }
+
+   dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+   dim3 gDim = hypre_GetDefaultDeviceGridDimension(num_rows, "thread", bDim);
+
+   HYPRE_GPU_LAUNCH( hypreGPUKernel_FSAIGatherEntries, gDim, bDim,
+                     num_rows, batch_dim, sol_data, scaling, K_i, K_e, K_j, G_i, G_j, G_a );
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_FSAITruncateCandidateDevice
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_FSAITruncateCandidateDevice( hypre_CSRMatrix *matrix,
+                                   HYPRE_Int      **matrix_e,
+                                   HYPRE_Int        max_nonzeros_row )
+{
+   HYPRE_Int      num_rows  = hypre_CSRMatrixNumRows(matrix);
+   HYPRE_Int     *mat_i     = hypre_CSRMatrixI(matrix);
+   HYPRE_Int     *mat_j     = hypre_CSRMatrixJ(matrix);
+   HYPRE_Complex *mat_a     = hypre_CSRMatrixData(matrix);
+
+   HYPRE_Int     *mat_e;
+
+   /* Sanity check */
+   if (num_rows <= 0)
+   {
+      *matrix_e = NULL;
+      return hypre_error_flag;
+   }
+
+   /*-----------------------------------------------------
+    * Keep only the largest coefficients in absolute value
+    *-----------------------------------------------------*/
+
+   /* Allocate memory for row indices array */
+   hypre_GpuProfilingPushRange("Storage1");
+   mat_e = hypre_TAlloc(HYPRE_Int, num_rows, HYPRE_MEMORY_DEVICE);
+   hypre_GpuProfilingPopRange();
+
+   /* Mark unwanted entries with -1 */
+   dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+   dim3 gDim = hypre_GetDefaultDeviceGridDimension(num_rows, "warp", bDim);
+
+   hypre_GpuProfilingPushRange("TruncCand");
+   HYPRE_GPU_LAUNCH(hypreGPUKernel_FSAITruncateCandidateUnordered, gDim, bDim,
+                    max_nonzeros_row, num_rows, mat_i, mat_e, mat_j, mat_a );
+   hypre_GpuProfilingPopRange();
+
+   *matrix_e = mat_e;
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_FSAISetupStaticPowerDevice
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_FSAISetupStaticPowerDevice( void               *fsai_vdata,
+                                  hypre_ParCSRMatrix *A,
+                                  hypre_ParVector    *f,
+                                  hypre_ParVector    *u )
+{
+   HYPRE_UNUSED_VAR(f);
+   HYPRE_UNUSED_VAR(u);
+
+   hypre_ParFSAIData      *fsai_data        = (hypre_ParFSAIData*) fsai_vdata;
+   hypre_ParCSRMatrix     *G                = hypre_ParFSAIDataGmat(fsai_data);
+   hypre_CSRMatrix        *G_diag           = hypre_ParCSRMatrixDiag(G);
+   HYPRE_Int               local_solve_type = hypre_ParFSAIDataLocalSolveType(fsai_data);
+   HYPRE_Int               max_nnz_row      = hypre_ParFSAIDataMaxNnzRow(fsai_data);
+   HYPRE_Int               num_levels       = hypre_ParFSAIDataNumLevels(fsai_data);
+   HYPRE_Real              threshold        = hypre_ParFSAIDataThreshold(fsai_data);
+
+   hypre_CSRMatrix        *A_diag           = hypre_ParCSRMatrixDiag(A);
+   HYPRE_Int               num_rows         = hypre_CSRMatrixNumRows(A_diag);
+   HYPRE_Int               block_size       = max_nnz_row * max_nnz_row;
+   HYPRE_Int               num_nonzeros_G;
+
+   HYPRE_Complex         **sol_aop = NULL;
+   HYPRE_Complex         **mat_aop = NULL;
+
+   hypre_ParCSRMatrix     *Atilde;
+   hypre_ParCSRMatrix     *B;
+   hypre_ParCSRMatrix     *Ktilde;
+   hypre_CSRMatrix        *K_diag;
+   HYPRE_Int              *K_e = NULL;
+   HYPRE_Int               i;
+
+   /* Local linear solve data */
+#if defined (HYPRE_USING_MAGMA)
+   magma_queue_t          queue     = hypre_HandleMagmaQueue(hypre_handle());
+#endif
+
+#if defined (HYPRE_USING_CUSOLVER) || defined (HYPRE_USING_ROCSOLVER)
+   vendorSolverHandle_t   vs_handle = hypre_HandleVendorSolverHandle(hypre_handle());
+#endif
+
+   /* TODO: Move to fsai_data? */
+   HYPRE_Complex          *scaling;
+   HYPRE_Int              *info;
+   HYPRE_Int              *h_info;
+
+   /* Error code array for FSAI */
+   info   = hypre_CTAlloc(HYPRE_Int, num_rows, HYPRE_MEMORY_DEVICE);
+   h_info = hypre_TAlloc(HYPRE_Int, num_rows, HYPRE_MEMORY_HOST);
+
+   /*-----------------------------------------------------
+    *  Sanity checks
+    *-----------------------------------------------------*/
+
+   /* Check local linear solve algorithm */
+   if (local_solve_type == 1)
+   {
+#if !(defined (HYPRE_USING_CUSOLVER) || defined(HYPRE_USING_ROCSOLVER))
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                        "local_solve_type == 1 requires cuSOLVER (CUDA) or rocSOLVER (HIP)\n");
+      return hypre_error_flag;
+#endif
+   }
+   else if (local_solve_type == 2)
+   {
+#if !defined (HYPRE_USING_MAGMA)
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "local_solve_type == 2 requires MAGMA\n");
+      return hypre_error_flag;
+#endif
+   }
+   else if (local_solve_type == 0)
+   {
+      if (max_nnz_row > 31)
+      {
+         hypre_ParFSAIDataMaxNnzRow(fsai_data) = max_nnz_row = 31;
+      }
+   }
+   else
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Unknown local linear solve type!\n");
+      return hypre_error_flag;
+   }
+
+   /*-----------------------------------------------------
+    *  Compute candidate pattern
+    *-----------------------------------------------------*/
+
+   hypre_GpuProfilingPushRange("CandPat");
+
+   /* Compute filtered version of A */
+   Atilde = hypre_ParCSRMatrixClone(A, 1);
+
+   /* Pre-filter to reduce SpGEMM cost */
+   if (num_levels > 1)
+   {
+      hypre_ParCSRMatrixDropSmallEntriesDevice(Atilde, threshold, 2);
+   }
+
+   /* TODO: Check if Atilde is diagonal */
+
+   /* Compute power pattern */
+   switch (num_levels)
+   {
+      case 1:
+         Ktilde = Atilde;
+         break;
+
+      case 2:
+         Ktilde = hypre_ParCSRMatMatDevice(Atilde, Atilde);
+         break;
+
+      case 3:
+         /* First pass */
+         B = hypre_ParCSRMatMatDevice(Atilde, Atilde);
+
+         /* Second pass */
+         Ktilde = hypre_ParCSRMatMatDevice(Atilde, B);
+         hypre_ParCSRMatrixDestroy(B);
+         break;
+
+      case 4:
+         /* First pass */
+         B = hypre_ParCSRMatMatDevice(Atilde, Atilde);
+         hypre_ParCSRMatrixDropSmallEntriesDevice(B, threshold, 2);
+
+         /* Second pass */
+         Ktilde = hypre_ParCSRMatMatDevice(B, B);
+         hypre_ParCSRMatrixDestroy(B);
+         break;
+
+      default:
+         Ktilde = hypre_ParCSRMatrixClone(Atilde, 1);
+         for (i = 1; i < num_levels; i++)
+         {
+            /* Compute temporary matrix */
+            B = hypre_ParCSRMatMatDevice(Atilde, Ktilde);
+
+            /* Update resulting matrix */
+            hypre_ParCSRMatrixDestroy(Ktilde);
+            Ktilde = hypre_ParCSRMatrixClone(B, 1);
+         }
+   }
+
+   hypre_GpuProfilingPopRange();
+
+   /*-----------------------------------------------------
+    *  Filter candidate pattern
+    *-----------------------------------------------------*/
+
+   hypre_GpuProfilingPushRange("FilterPat");
+
+#if defined (DEBUG_FSAI)
+   {
+      hypre_ParCSRMatrixPrintIJ(Ktilde, 0, 0, "FSAI.out.H.ij");
+   }
+#endif
+
+   /* Set pattern matrix diagonal matrix */
+   K_diag = hypre_ParCSRMatrixDiag(Ktilde);
+
+   /* Filter candidate pattern */
+   hypre_FSAITruncateCandidateDevice(K_diag, &K_e, max_nnz_row);
+
+#if defined (DEBUG_FSAI)
+   {
+      hypre_ParCSRMatrixPrintIJ(Ktilde, 0, 0, "FSAI.out.K.ij");
+   }
+#endif
+
+   hypre_GpuProfilingPopRange();
+
+   /*-----------------------------------------------------
+    *  Preprocess input matrix
+    *-----------------------------------------------------*/
+
+   hypre_GpuProfilingPushRange("PreProcessA");
+
+   /* TODO: implement faster diagonal extraction (use "i == A_j[A_i[i]]")*/
+   scaling = hypre_TAlloc(HYPRE_Complex, num_rows, HYPRE_MEMORY_DEVICE);
+   hypre_CSRMatrixExtractDiagonalDevice(A_diag, scaling, 0);
+
+   hypre_GpuProfilingPopRange();
+
+   /*-----------------------------------------------------
+    *  Extract local linear systems
+    *-----------------------------------------------------*/
+
+   /* Allocate storage */
+   hypre_GpuProfilingPushRange("Storage1");
+   HYPRE_Complex  *mat_data = hypre_CTAlloc(HYPRE_Complex,
+                                            block_size * num_rows,
+                                            HYPRE_MEMORY_DEVICE);
+   HYPRE_Complex  *rhs_data = hypre_CTAlloc(HYPRE_Complex, max_nnz_row * num_rows,
+                                            HYPRE_MEMORY_DEVICE);
+   HYPRE_Complex  *sol_data = hypre_CTAlloc(HYPRE_Complex, max_nnz_row * num_rows,
+                                            HYPRE_MEMORY_DEVICE);
+   hypre_GpuProfilingPopRange();
+
+   /* Gather dense linear subsystems */
+   hypre_GpuProfilingPushRange("ExtractLS");
+   hypre_FSAIExtractSubSystemsDevice(num_rows,
+                                     hypre_CSRMatrixI(A_diag),
+                                     hypre_CSRMatrixJ(A_diag),
+                                     hypre_CSRMatrixData(A_diag),
+                                     hypre_CSRMatrixI(K_diag),
+                                     K_e,
+                                     hypre_CSRMatrixJ(K_diag),
+                                     max_nnz_row,
+                                     mat_data,
+                                     rhs_data,
+                                     hypre_CSRMatrixI(G_diag) + 1);
+   hypre_GpuProfilingPopRange();
+
+   /* Copy rhs to solution vector */
+   hypre_GpuProfilingPushRange("CopyRHS");
+   hypre_TMemcpy(sol_data, rhs_data, HYPRE_Complex, max_nnz_row * num_rows,
+                 HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+   hypre_GpuProfilingPopRange();
+
+   /* Build array of pointers */
+   if (local_solve_type != 0)
+   {
+      hypre_GpuProfilingPushRange("Storage2");
+      sol_aop = hypre_TAlloc(HYPRE_Complex *, num_rows, HYPRE_MEMORY_DEVICE);
+      mat_aop = hypre_TAlloc(HYPRE_Complex *, num_rows, HYPRE_MEMORY_DEVICE);
+      hypre_GpuProfilingPopRange();
+
+      hypre_GpuProfilingPushRange("FormAOP");
+      hypreDevice_ComplexArrayToArrayOfPtrs(num_rows, block_size, mat_data, mat_aop);
+      hypreDevice_ComplexArrayToArrayOfPtrs(num_rows, max_nnz_row, sol_data, sol_aop);
+      hypre_GpuProfilingPopRange();
+   }
+
+   /*-----------------------------------------------------
+    *  Solve local linear systems
+    *-----------------------------------------------------*/
+
+   hypre_GpuProfilingPushRange("BatchedSolve");
+   if (num_rows)
+   {
+      hypre_GpuProfilingPushRange("Factorization");
+
+      if (local_solve_type == 1)
+      {
+#if defined (HYPRE_USING_CUSOLVER)
+         HYPRE_CUSOLVER_CALL(cusolverDnDpotrfBatched(vs_handle,
+                                                     CUBLAS_FILL_MODE_LOWER,
+                                                     max_nnz_row,
+                                                     mat_aop,
+                                                     max_nnz_row,
+                                                     info,
+                                                     num_rows));
+
+#elif defined (HYPRE_USING_ROCSOLVER)
+         HYPRE_ROCSOLVER_CALL(rocsolver_dpotrf_batched(vs_handle,
+                                                       rocblas_fill_lower,
+                                                       max_nnz_row,
+                                                       mat_aop,
+                                                       max_nnz_row,
+                                                       info,
+                                                       num_rows));
+#endif
+      }
+      else if (local_solve_type == 2)
+      {
+#if defined (HYPRE_USING_MAGMA)
+         HYPRE_MAGMA_CALL(magma_dpotrf_batched(MagmaLower,
+                                               max_nnz_row,
+                                               mat_aop,
+                                               max_nnz_row,
+                                               info,
+                                               num_rows,
+                                               queue));
+#endif
+      }
+      hypre_GpuProfilingPopRange(); /* Factorization */
+
+#if defined (HYPRE_DEBUG)
+      hypre_TMemcpy(h_info, info, HYPRE_Int, num_rows,
+                    HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
+      for (HYPRE_Int k = 0; k < num_rows; k++)
+      {
+         if (h_info[k] != 0)
+         {
+            hypre_printf("Cholesky factorization failed at system #%d, subrow %d\n",
+                         k, h_info[k]);
+         }
+      }
+#endif
+
+      hypre_GpuProfilingPushRange("Solve");
+
+      if (local_solve_type == 0)
+      {
+         hypre_BatchedGaussJordanSolveDevice(num_rows, max_nnz_row, mat_data, rhs_data, sol_data);
+      }
+      else if (local_solve_type == 1)
+      {
+#if defined (HYPRE_USING_CUSOLVER)
+         HYPRE_CUSOLVER_CALL(cusolverDnDpotrsBatched(vs_handle,
+                                                     CUBLAS_FILL_MODE_LOWER,
+                                                     max_nnz_row,
+                                                     1,
+                                                     mat_aop,
+                                                     max_nnz_row,
+                                                     sol_aop,
+                                                     max_nnz_row,
+                                                     info,
+                                                     num_rows));
+#elif defined (HYPRE_USING_ROCSOLVER)
+         HYPRE_ROCSOLVER_CALL(rocsolver_dpotrs_batched(vs_handle,
+                                                       rocblas_fill_lower,
+                                                       max_nnz_row,
+                                                       1,
+                                                       mat_aop,
+                                                       max_nnz_row,
+                                                       sol_aop,
+                                                       max_nnz_row,
+                                                       num_rows));
+#endif
+      }
+      else if (local_solve_type == 2)
+      {
+#if defined (HYPRE_USING_MAGMA)
+         HYPRE_MAGMA_CALL(magma_dpotrs_batched(MagmaLower,
+                                               max_nnz_row,
+                                               1,
+                                               mat_aop,
+                                               max_nnz_row,
+                                               sol_aop,
+                                               max_nnz_row,
+                                               num_rows,
+                                               queue));
+#endif
+      }
+      hypre_GpuProfilingPopRange(); /* Solve */
+
+#if defined (HYPRE_DEBUG)
+      hypre_TMemcpy(h_info, info, HYPRE_Int, num_rows,
+                    HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
+      for (HYPRE_Int k = 0; k < num_rows; k++)
+      {
+         if (h_info[k] != 0)
+         {
+            hypre_printf("Cholesky solution failed at system #%d with code %d\n",
+                         k, h_info[k]);
+         }
+      }
+#endif
+   }
+   hypre_GpuProfilingPopRange(); /* BatchedSolve */
+
+   /*-----------------------------------------------------
+    *  Finalize construction of the triangular factor
+    *-----------------------------------------------------*/
+
+   hypre_GpuProfilingPushRange("BuildFSAI");
+
+   /* Update scaling factor */
+   hypre_FSAIScalingDevice(num_rows, max_nnz_row, sol_data, rhs_data, scaling, info);
+
+   /* Compute the row pointer G_i */
+   hypreDevice_IntegerInclusiveScan(num_rows + 1, hypre_CSRMatrixI(G_diag));
+
+   /* Get the actual number of nonzero coefficients of G_diag */
+   hypre_TMemcpy(&num_nonzeros_G, hypre_CSRMatrixI(G_diag) + num_rows,
+                 HYPRE_Int, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
+
+   /* Update the nonzero count of matrix G */
+   hypre_CSRMatrixNumNonzeros(G_diag) = num_nonzeros_G;
+
+   /* Set column indices and coefficients of G */
+   hypre_FSAIGatherEntriesDevice(num_rows,
+                                 max_nnz_row,
+                                 sol_data,
+                                 scaling,
+                                 hypre_CSRMatrixI(K_diag),
+                                 K_e,
+                                 hypre_CSRMatrixJ(K_diag),
+                                 hypre_CSRMatrixI(G_diag),
+                                 hypre_CSRMatrixJ(G_diag),
+                                 hypre_CSRMatrixData(G_diag));
+
+   hypre_GpuProfilingPopRange();
+   /* TODO: Reallocate memory for G_j/G_a? */
+
+   /*-----------------------------------------------------
+    *  Free memory
+    *-----------------------------------------------------*/
+
+   hypre_ParCSRMatrixDestroy(Ktilde);
+   if (num_levels > 1)
+   {
+      hypre_ParCSRMatrixDestroy(Atilde);
+   }
+
+   /* TODO: can we free some of these earlier? */
+   hypre_TFree(K_e, HYPRE_MEMORY_DEVICE);
+   hypre_TFree(rhs_data, HYPRE_MEMORY_DEVICE);
+   hypre_TFree(sol_data, HYPRE_MEMORY_DEVICE);
+   hypre_TFree(mat_data, HYPRE_MEMORY_DEVICE);
+   hypre_TFree(sol_aop, HYPRE_MEMORY_DEVICE);
+   hypre_TFree(mat_aop, HYPRE_MEMORY_DEVICE);
+   hypre_TFree(scaling, HYPRE_MEMORY_DEVICE);
+   hypre_TFree(info, HYPRE_MEMORY_DEVICE);
+   hypre_TFree(h_info, HYPRE_MEMORY_HOST);
+
+   return hypre_error_flag;
+}
+
+#endif /* if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP) */
+#if defined(HYPRE_USING_GPU)
+
+/*--------------------------------------------------------------------------
+ * hypre_FSAISetupDevice
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_FSAISetupDevice( void               *fsai_vdata,
+                       hypre_ParCSRMatrix *A,
+                       hypre_ParVector    *f,
+                       hypre_ParVector    *u )
+{
+   hypre_ParFSAIData       *fsai_data     = (hypre_ParFSAIData*) fsai_vdata;
+   HYPRE_Int                algo_type     = hypre_ParFSAIDataAlgoType(fsai_data);
+   hypre_ParCSRMatrix      *G             = hypre_ParFSAIDataGmat(fsai_data);
+   hypre_ParCSRMatrix      *h_A;
+
+   hypre_GpuProfilingPushRange("FSAISetup");
+
+   if (algo_type == 1 || algo_type == 2)
+   {
+      /* Initialize matrix G on host */
+      hypre_ParCSRMatrixInitialize_v2(G, HYPRE_MEMORY_HOST);
+
+      /* Clone input matrix on host */
+      h_A = hypre_ParCSRMatrixClone_v2(A, 1, HYPRE_MEMORY_HOST);
+
+      /* Compute FSAI factor on host */
+      switch (algo_type)
+      {
+         case 2:
+            hypre_FSAISetupOMPDyn(fsai_vdata, h_A, f, u);
+            break;
+
+         default:
+            hypre_FSAISetupNative(fsai_vdata, h_A, f, u);
+            break;
+      }
+
+      /* Move FSAI factor G to device */
+      hypre_ParCSRMatrixMigrate(G, HYPRE_MEMORY_DEVICE);
+
+      /* Destroy temporary data on host */
+      HYPRE_ParCSRMatrixDestroy(h_A);
+   }
+   else
+   {
+#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+      /* Initialize matrix G on device */
+      hypre_ParCSRMatrixInitialize_v2(G, HYPRE_MEMORY_DEVICE);
+
+      if (algo_type == 3)
+      {
+         hypre_FSAISetupStaticPowerDevice(fsai_vdata, A, f, u);
+      }
+#else
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Device FSAI not implemented for SYCL!\n");
+#endif
+   }
+
+   hypre_GpuProfilingPopRange();
+
+   return hypre_error_flag;
+}
+
+#endif /* if defined(HYPRE_USING_GPU) */
diff --git a/external/hypre/src/parcsr_ls/par_fsai_setup.c b/external/hypre/src/parcsr_ls/par_fsai_setup.c
new file mode 100644
index 00000000..f58df3e7
--- /dev/null
+++ b/external/hypre/src/parcsr_ls/par_fsai_setup.c
@@ -0,0 +1,1357 @@
+/******************************************************************************
+ *  Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ *  HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ *  SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+#include "_hypre_parcsr_ls.h"
+#include "_hypre_blas.h"
+#include "_hypre_lapack.h"
+
+/*****************************************************************************
+ *
+ * Routine for driving the setup phase of FSAI
+ *
+ ******************************************************************************/
+
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixExtractDenseMat
+ *
+ * Extract A[P, P] into a dense matrix.
+ *
+ * Parameters:
+ * - A:       The hypre_CSRMatrix whose submatrix will be extracted.
+ * - A_sub:   A patt_size^2 - sized array to hold the lower triangular of
+ *            the symmetric submatrix A[P, P].
+ * - pattern: A patt_size - sized array to hold the wanted rows/cols.
+ * - marker:  A work array of length equal to the number of columns in A.
+ *            All values should be -1.
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_CSRMatrixExtractDenseMat( hypre_CSRMatrix *A,
+                                hypre_Vector    *A_sub,
+                                HYPRE_Int       *pattern,
+                                HYPRE_Int        patt_size,
+                                HYPRE_Int       *marker )
+{
+   HYPRE_Int     *A_i = hypre_CSRMatrixI(A);
+   HYPRE_Int     *A_j = hypre_CSRMatrixJ(A);
+   HYPRE_Complex *A_a = hypre_CSRMatrixData(A);
+   HYPRE_Complex *A_sub_data = hypre_VectorData(A_sub);
+
+   /* Local variables */
+   HYPRE_Int      cc, i, ii, j;
+
+   // TODO: Do we need to reinitialize all entries?
+   for (i = 0; i < hypre_VectorSize(A_sub); i++)
+   {
+      A_sub_data[i] = 0.0;
+   }
+
+   for (i = 0; i < patt_size; i++)
+   {
+      ii = pattern[i];
+      for (j = A_i[ii]; j < A_i[ii + 1]; j++)
+      {
+         if ((A_j[j] <= ii) &&
+             (cc = marker[A_j[j]]) >= 0)
+         {
+            A_sub_data[cc * patt_size + i] = A_a[j];
+         }
+      }
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixExtractDenseRow
+ *
+ * Extract the dense subrow from a matrix (A[i, P])
+ *
+ * Parameters:
+ * - A:         The hypre_CSRMatrix whose subrow will be extracted.
+ * - A_subrow:  The extracted subrow of A[i, P].
+ * - marker:    A work array of length equal to the number of row in A.
+ *              Assumed to be set to all -1.
+ * - row_num:   which row index of A we want to extract data from.
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_CSRMatrixExtractDenseRow( hypre_CSRMatrix *A,
+                                hypre_Vector    *A_subrow,
+                                HYPRE_Int       *marker,
+                                HYPRE_Int        row_num )
+{
+   HYPRE_Int      *A_i = hypre_CSRMatrixI(A);
+   HYPRE_Int      *A_j = hypre_CSRMatrixJ(A);
+   HYPRE_Complex  *A_a = hypre_CSRMatrixData(A);
+   HYPRE_Complex  *sub_row_data = hypre_VectorData(A_subrow);
+
+   /* Local variables */
+   HYPRE_Int       j, cc;
+
+   for (j = 0; j < hypre_VectorSize(A_subrow); j++)
+   {
+      sub_row_data[j] = 0.0;
+   }
+
+   for (j = A_i[row_num]; j < A_i[row_num + 1]; j++)
+   {
+      if ((cc = marker[A_j[j]]) >= 0)
+      {
+         sub_row_data[cc] = A_a[j];
+      }
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_FindKapGrad
+ *
+ * Finding the Kaporin Gradient contribution (psi) of a given row.
+ *
+ * Parameters:
+ *  - A:            CSR matrix diagonal of A.
+ *  - kap_grad:     Array holding the kaporin gradient.
+ *                  This will we modified.
+ *  - kg_pos:       Array of the nonzero column indices of kap_grad.
+ *                  To be modified.
+ *  - G_temp:       Work array of G for row i.
+ *  - pattern:      Array of column indices of the nonzeros of G_temp.
+ *  - patt_size:    Number of column indices of the nonzeros of G_temp.
+ *  - max_row_size: To ensure we don't overfill kap_grad.
+ *  - row_num:      Which row of G we are working on.
+ *  - marker:       Array of length equal to the number of rows in A.
+ *                  Assumed to all be set to -1.
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_FindKapGrad( hypre_CSRMatrix  *A_diag,
+                   hypre_Vector     *kap_grad,
+                   HYPRE_Int        *kg_pos,
+                   hypre_Vector     *G_temp,
+                   HYPRE_Int        *pattern,
+                   HYPRE_Int         patt_size,
+                   HYPRE_Int         max_row_size,
+                   HYPRE_Int         row_num,
+                   HYPRE_Int        *kg_marker )
+{
+   HYPRE_UNUSED_VAR(max_row_size);
+
+   HYPRE_Int      *A_i = hypre_CSRMatrixI(A_diag);
+   HYPRE_Int      *A_j = hypre_CSRMatrixJ(A_diag);
+   HYPRE_Complex  *A_a = hypre_CSRMatrixData(A_diag);
+   HYPRE_Complex  *G_temp_data   = hypre_VectorData(G_temp);
+   HYPRE_Complex  *kap_grad_data = hypre_VectorData(kap_grad);
+
+   /* Local Variables */
+   HYPRE_Int       i, ii, j, k, count, col;
+
+   count = 0;
+
+   /* Compute A[row_num, 0:(row_num-1)]*G_temp[i,i] */
+   for (j = A_i[row_num]; j < A_i[row_num + 1]; j++)
+   {
+      col = A_j[j];
+      if (col < row_num)
+      {
+         if (kg_marker[col] > -1)
+         {
+            /* Add A[row_num, col] to the tentative pattern */
+            kg_marker[col] = count + 1;
+            kg_pos[count] = col;
+            kap_grad_data[count] = A_a[j];
+            count++;
+         }
+      }
+   }
+
+   /* Compute A[0:(row_num-1), P]*G_temp[P, i] */
+   for (i = 0; i < patt_size; i++)
+   {
+      ii = pattern[i];
+      for (j = A_i[ii]; j < A_i[ii + 1]; j++)
+      {
+         col = A_j[j];
+         if (col < row_num)
+         {
+            k = kg_marker[col];
+            if (k == 0)
+            {
+               /* New entry in the tentative pattern */
+               kg_marker[col] = count + 1;
+               kg_pos[count] = col;
+               kap_grad_data[count] = G_temp_data[i] * A_a[j];
+               count++;
+            }
+            else if (k > 0)
+            {
+               /* Already existing entry in the tentative pattern */
+               kap_grad_data[k - 1] += G_temp_data[i] * A_a[j];
+            }
+         }
+      }
+   }
+
+   /* Update number of nonzero coefficients held in kap_grad */
+   hypre_VectorSize(kap_grad) = count;
+
+   /* Update to absolute values */
+   for (i = 0; i < count; i++)
+   {
+      kap_grad_data[i] = hypre_cabs(kap_grad_data[i]);
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_swap2_ci
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_swap2_ci( HYPRE_Complex  *v,
+                HYPRE_Int      *w,
+                HYPRE_Int       i,
+                HYPRE_Int       j )
+{
+   HYPRE_Complex  temp;
+   HYPRE_Int      temp2;
+
+   temp = v[i];
+   v[i] = v[j];
+   v[j] = temp;
+   temp2 = w[i];
+   w[i] = w[j];
+   w[j] = temp2;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_qsort2_ci
+ *
+ * Quick Sort (largest to smallest) for complex arrays.
+ * Sort on real portion of v (HYPRE_Complex), move w.
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_qsort2_ci( HYPRE_Complex  *v,
+                 HYPRE_Int      *w,
+                 HYPRE_Int      left,
+                 HYPRE_Int      right )
+{
+   HYPRE_Int i, last;
+
+   if (left >= right)
+   {
+      return;
+   }
+
+   hypre_swap2_ci(v, w, left, (left + right) / 2);
+   last = left;
+   for (i = left + 1; i <= right; i++)
+   {
+      if (hypre_creal(v[i]) > hypre_creal(v[left]))
+      {
+         hypre_swap2_ci(v, w, ++last, i);
+      }
+   }
+
+   hypre_swap2_ci(v, w, left, last);
+   hypre_qsort2_ci(v, w, left, last - 1);
+   hypre_qsort2_ci(v, w, last + 1, right);
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_PartialSelectSortCI
+ *--------------------------------------------------------------------------*/
+HYPRE_Int
+hypre_PartialSelectSortCI( HYPRE_Complex  *v,
+                           HYPRE_Int      *w,
+                           HYPRE_Int       size,
+                           HYPRE_Int       nentries )
+{
+   HYPRE_Int  i, k, pos;
+
+   for (k = 0; k < nentries; k++)
+   {
+      /* Find largest kth entry */
+      pos = k;
+      for (i = k + 1; i < size; i++)
+      {
+         if (hypre_creal(v[i]) > hypre_creal(v[pos]))
+         {
+            pos = i;
+         }
+      }
+
+      /* Move entry to beggining of the array */
+      hypre_swap2_ci(v, w, k, pos);
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_AddToPattern
+ *
+ * Take the largest elements from the kaporin gradient and add their
+ * locations to pattern.
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_AddToPattern( hypre_Vector *kap_grad,
+                    HYPRE_Int    *kg_pos,
+                    HYPRE_Int    *pattern,
+                    HYPRE_Int    *patt_size,
+                    HYPRE_Int    *kg_marker,
+                    HYPRE_Int     max_step_size )
+{
+   HYPRE_Int       kap_grad_size = hypre_VectorSize(kap_grad);
+   HYPRE_Complex  *kap_grad_data = hypre_VectorData(kap_grad);
+
+   HYPRE_Int       i, nentries;
+
+   /* Number of entries that can be added */
+   nentries = hypre_min(kap_grad_size, max_step_size);
+
+   /* Reorder candidates according to larger weights */
+   //hypre_qsort2_ci(kap_grad_data, &kg_pos, 0, kap_grad_size-1);
+   hypre_PartialSelectSortCI(kap_grad_data, kg_pos, kap_grad_size, nentries);
+
+   /* Update pattern with new entries */
+   for (i = 0; i < nentries; i++)
+   {
+      pattern[*patt_size + i] = kg_pos[i];
+   }
+   *patt_size += nentries;
+
+   /* Put pattern in ascending order */
+   hypre_qsort0(pattern, 0, (*patt_size) - 1);
+
+   /* Reset marked entries that are added to pattern */
+   for (i = 0; i < nentries; i++)
+   {
+      kg_marker[kg_pos[i]] = -1;
+   }
+   for (i = nentries; i < kap_grad_size; i++)
+   {
+      kg_marker[kg_pos[i]] = 0;
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_DenseSPDSystemSolve
+ *
+ * Solve the dense SPD linear system with LAPACK:
+ *
+ *    mat*lhs = -rhs
+ *
+ * Note: the contents of A change to its Cholesky factor.
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_DenseSPDSystemSolve( hypre_Vector *mat,
+                           hypre_Vector *rhs,
+                           hypre_Vector *lhs )
+{
+   HYPRE_Int      size = hypre_VectorSize(rhs);
+   HYPRE_Complex *mat_data = hypre_VectorData(mat);
+   HYPRE_Complex *rhs_data = hypre_VectorData(rhs);
+   HYPRE_Complex *lhs_data = hypre_VectorData(lhs);
+
+   /* Local variables */
+   HYPRE_Int      num_rhs = 1;
+   char           uplo = 'L';
+   char           msg[512];
+   HYPRE_Int      i, info;
+
+   /* Copy RHS into LHS */
+   for (i = 0; i < size; i++)
+   {
+      lhs_data[i] = -rhs_data[i];
+   }
+
+   /* Compute Cholesky factor */
+   hypre_dpotrf(&uplo, &size, mat_data, &size, &info);
+   if (info)
+   {
+      hypre_sprintf(msg, "Error: dpotrf failed with code %d\n", info);
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, msg);
+      return hypre_error_flag;
+   }
+
+   /* Solve dense linear system */
+   hypre_dpotrs(&uplo, &size, &num_rhs, mat_data, &size, lhs_data, &size, &info);
+   if (info)
+   {
+      hypre_sprintf(msg, "Error: dpotrs failed with code %d\n", info);
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, msg);
+      return hypre_error_flag;
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_FSAISetupNative
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_FSAISetupNative( void               *fsai_vdata,
+                       hypre_ParCSRMatrix *A,
+                       hypre_ParVector    *f,
+                       hypre_ParVector    *u )
+{
+   HYPRE_UNUSED_VAR(f);
+   HYPRE_UNUSED_VAR(u);
+
+   /* Data structure variables */
+   hypre_ParFSAIData      *fsai_data        = (hypre_ParFSAIData*) fsai_vdata;
+   HYPRE_Real              kap_tolerance    = hypre_ParFSAIDataKapTolerance(fsai_data);
+   HYPRE_Int               max_steps        = hypre_ParFSAIDataMaxSteps(fsai_data);
+   HYPRE_Int               max_step_size    = hypre_ParFSAIDataMaxStepSize(fsai_data);
+
+   /* CSRMatrix A_diag variables */
+   hypre_CSRMatrix        *A_diag           = hypre_ParCSRMatrixDiag(A);
+   HYPRE_Int              *A_i              = hypre_CSRMatrixI(A_diag);
+   HYPRE_Complex          *A_a              = hypre_CSRMatrixData(A_diag);
+   HYPRE_Int               num_rows_diag_A  = hypre_CSRMatrixNumRows(A_diag);
+
+   /* Matrix G variables */
+   hypre_ParCSRMatrix     *G = hypre_ParFSAIDataGmat(fsai_data);
+   hypre_CSRMatrix        *G_diag;
+   HYPRE_Int              *G_i;
+   HYPRE_Int              *G_j;
+   HYPRE_Complex          *G_a;
+   HYPRE_Int               max_nnzrow_diag_G;   /* Max. number of nonzeros per row in G_diag */
+
+   /* Local variables */
+   char                    msg[512];    /* Warning message */
+   HYPRE_Int              *twspace;     /* shared work space for omp threads */
+
+   /* Initalize some variables */
+   max_nnzrow_diag_G = max_steps * max_step_size + 1;
+
+   G_diag = hypre_ParCSRMatrixDiag(G);
+   G_a = hypre_CSRMatrixData(G_diag);
+   G_i = hypre_CSRMatrixI(G_diag);
+   G_j = hypre_CSRMatrixJ(G_diag);
+
+   /* Allocate shared work space array for OpenMP threads */
+   twspace = hypre_CTAlloc(HYPRE_Int, hypre_NumThreads() + 1, HYPRE_MEMORY_HOST);
+
+   /**********************************************************************
+   * Start of Adaptive FSAI algorithm
+   ***********************************************************************/
+
+   /* Cycle through each of the local rows */
+   HYPRE_ANNOTATE_REGION_BEGIN("%s", "MainLoop");
+#ifdef HYPRE_USING_OPENMP
+   #pragma omp parallel
+#endif
+   {
+      hypre_Vector   *G_temp;        /* Vector holding the values of G[i,:] */
+      hypre_Vector   *A_sub;         /* Vector holding the dense submatrix A[P, P] */
+      hypre_Vector   *A_subrow;      /* Vector holding A[i, P] */
+      hypre_Vector   *kap_grad;      /* Vector holding the Kaporin gradient values */
+      HYPRE_Int      *kg_pos;        /* Indices of nonzero entries of kap_grad */
+      HYPRE_Int      *kg_marker;     /* Marker array with nonzeros pointing to kg_pos */
+      HYPRE_Int      *marker;        /* Marker array with nonzeros pointing to P */
+      HYPRE_Int      *pattern;       /* Array holding column indices of G[i,:] */
+      HYPRE_Int       patt_size;     /* Number of entries in current pattern */
+      HYPRE_Int       patt_size_old; /* Number of entries in previous pattern */
+      HYPRE_Int       ii;            /* Thread identifier */
+      HYPRE_Int       num_threads;   /* Number of active threads */
+      HYPRE_Int       ns, ne;        /* Initial and last row indices */
+      HYPRE_Int       i, j, k, iloc; /* Loop variables */
+      HYPRE_Complex   old_psi;       /* GAG' before k-th interation of aFSAI */
+      HYPRE_Complex   new_psi;       /* GAG' after k-th interation of aFSAI */
+      HYPRE_Complex   row_scale;     /* Scaling factor for G_temp */
+      HYPRE_Complex  *G_temp_data;
+      HYPRE_Complex  *A_subrow_data;
+
+      HYPRE_Int       num_rows_Gloc;
+      HYPRE_Int       num_nnzs_Gloc;
+      HYPRE_Int      *Gloc_i;
+      HYPRE_Int      *Gloc_j;
+      HYPRE_Complex  *Gloc_a;
+
+      /* Allocate and initialize local vector variables */
+      G_temp    = hypre_SeqVectorCreate(max_nnzrow_diag_G);
+      A_subrow  = hypre_SeqVectorCreate(max_nnzrow_diag_G);
+      kap_grad  = hypre_SeqVectorCreate(num_rows_diag_A);
+      A_sub     = hypre_SeqVectorCreate(max_nnzrow_diag_G * max_nnzrow_diag_G);
+      pattern   = hypre_CTAlloc(HYPRE_Int, max_nnzrow_diag_G, HYPRE_MEMORY_HOST);
+      kg_pos    = hypre_CTAlloc(HYPRE_Int, num_rows_diag_A, HYPRE_MEMORY_HOST);
+      kg_marker = hypre_CTAlloc(HYPRE_Int, num_rows_diag_A, HYPRE_MEMORY_HOST);
+      marker    = hypre_TAlloc(HYPRE_Int, num_rows_diag_A, HYPRE_MEMORY_HOST);
+
+      hypre_SeqVectorInitialize_v2(G_temp, HYPRE_MEMORY_HOST);
+      hypre_SeqVectorInitialize_v2(A_subrow, HYPRE_MEMORY_HOST);
+      hypre_SeqVectorInitialize_v2(kap_grad, HYPRE_MEMORY_HOST);
+      hypre_SeqVectorInitialize_v2(A_sub, HYPRE_MEMORY_HOST);
+      hypre_Memset(marker, -1, num_rows_diag_A * sizeof(HYPRE_Int), HYPRE_MEMORY_HOST);
+
+      /* Setting data variables for vectors */
+      G_temp_data   = hypre_VectorData(G_temp);
+      A_subrow_data = hypre_VectorData(A_subrow);
+
+      ii = hypre_GetThreadNum();
+      num_threads = hypre_NumActiveThreads();
+      hypre_partition1D(num_rows_diag_A, num_threads, ii, &ns, &ne);
+
+      num_rows_Gloc = ne - ns;
+      if (num_threads == 1)
+      {
+         Gloc_i = G_i;
+         Gloc_j = G_j;
+         Gloc_a = G_a;
+      }
+      else
+      {
+         num_nnzs_Gloc = num_rows_Gloc * max_nnzrow_diag_G;
+
+         Gloc_i = hypre_CTAlloc(HYPRE_Int, num_rows_Gloc + 1, HYPRE_MEMORY_HOST);
+         Gloc_j = hypre_CTAlloc(HYPRE_Int, num_nnzs_Gloc, HYPRE_MEMORY_HOST);
+         Gloc_a = hypre_CTAlloc(HYPRE_Complex, num_nnzs_Gloc, HYPRE_MEMORY_HOST);
+      }
+
+      for (i = ns; i < ne; i++)
+      {
+         patt_size = 0;
+
+         /* Set old_psi up front so we don't have to compute GAG' twice in the inner for-loop */
+         new_psi = old_psi = A_a[A_i[i]];
+
+         /* Cycle through each iteration for that row */
+         for (k = 0; k < max_steps; k++)
+         {
+            /* Compute Kaporin Gradient */
+            hypre_FindKapGrad(A_diag, kap_grad, kg_pos, G_temp, pattern,
+                              patt_size, max_nnzrow_diag_G, i, kg_marker);
+
+            /* Find max_step_size largest values of the kaporin gradient,
+               find their column indices, and add it to pattern */
+            patt_size_old = patt_size;
+            hypre_AddToPattern(kap_grad, kg_pos, pattern, &patt_size,
+                               kg_marker, max_step_size);
+
+            /* Update sizes */
+            hypre_VectorSize(A_sub)    = patt_size * patt_size;
+            hypre_VectorSize(A_subrow) = patt_size;
+            hypre_VectorSize(G_temp)   = patt_size;
+
+            if (patt_size == patt_size_old)
+            {
+               new_psi = old_psi;
+               break;
+            }
+            else
+            {
+               /* Gather A[P, P] and -A[i, P] */
+               for (j = 0; j < patt_size; j++)
+               {
+                  marker[pattern[j]] = j;
+               }
+               hypre_CSRMatrixExtractDenseMat(A_diag, A_sub, pattern, patt_size, marker);
+               hypre_CSRMatrixExtractDenseRow(A_diag, A_subrow, marker, i);
+
+               /* Solve A[P, P] G[i, P]' = -A[i, P] */
+               hypre_DenseSPDSystemSolve(A_sub, A_subrow, G_temp);
+
+               /* Determine psi_{k+1} = G_temp[i] * A[P, P] * G_temp[i]' */
+               new_psi = A_a[A_i[i]];
+               for (j = 0; j < patt_size; j++)
+               {
+                  new_psi += G_temp_data[j] * A_subrow_data[j];
+               }
+
+               /* Check psi reduction */
+               if (hypre_cabs(new_psi - old_psi) < hypre_creal(kap_tolerance * old_psi))
+               {
+                  break;
+               }
+               else
+               {
+                  old_psi = new_psi;
+               }
+            }
+         }
+
+         /* Reset marker for building dense linear system */
+         for (j = 0; j < patt_size; j++)
+         {
+            marker[pattern[j]] = -1;
+         }
+
+         /* Compute scaling factor */
+         if (hypre_creal(new_psi) > 0 && hypre_cimag(new_psi) == 0)
+         {
+            row_scale = 1.0 / hypre_csqrt(new_psi);
+         }
+         else
+         {
+            hypre_sprintf(msg, "Warning: complex scaling factor found in row %d\n", i);
+            hypre_error_w_msg(HYPRE_ERROR_GENERIC, msg);
+
+            row_scale = 1.0 / hypre_cabs(A_a[A_i[i]]);
+            hypre_VectorSize(G_temp) = patt_size = 0;
+         }
+
+         /* Pass values of G_temp into G */
+         iloc = i - ns;
+         Gloc_j[Gloc_i[iloc]] = i;
+         Gloc_a[Gloc_i[iloc]] = row_scale;
+         for (k = 0; k < patt_size; k++)
+         {
+            j = Gloc_i[iloc] + k + 1;
+            Gloc_j[j] = pattern[k];
+            Gloc_a[j] = row_scale * G_temp_data[k];
+            kg_marker[pattern[k]] = 0;
+         }
+         Gloc_i[iloc + 1] = Gloc_i[iloc] + k + 1;
+      }
+
+      /* Copy data to shared memory */
+      twspace[ii + 1] = Gloc_i[num_rows_Gloc] - Gloc_i[0];
+#ifdef HYPRE_USING_OPENMP
+      #pragma omp barrier
+      #pragma omp single
+#endif
+      {
+         for (i = 0; i < num_threads; i++)
+         {
+            twspace[i + 1] += twspace[i];
+         }
+      }
+
+      if (num_threads > 1)
+      {
+         /* Correct row pointer G_i */
+         G_i[ns] = twspace[ii];
+         for (i = ns; i < ne; i++)
+         {
+            iloc = i - ns;
+            G_i[i + 1] = G_i[i] + Gloc_i[iloc + 1] - Gloc_i[iloc];
+         }
+
+         /* Move G_j and G_a */
+         for (i = ns; i < ne; i++)
+         {
+            for (j = G_i[i]; j < G_i[i + 1]; j++)
+            {
+               G_j[j] = Gloc_j[j - G_i[ns]];
+               G_a[j] = Gloc_a[j - G_i[ns]];
+            }
+         }
+
+         hypre_TFree(Gloc_i, HYPRE_MEMORY_HOST);
+         hypre_TFree(Gloc_j, HYPRE_MEMORY_HOST);
+         hypre_TFree(Gloc_a, HYPRE_MEMORY_HOST);
+      }
+
+      /* Free memory */
+      hypre_SeqVectorDestroy(G_temp);
+      hypre_SeqVectorDestroy(A_subrow);
+      hypre_SeqVectorDestroy(kap_grad);
+      hypre_SeqVectorDestroy(A_sub);
+      hypre_TFree(kg_pos, HYPRE_MEMORY_HOST);
+      hypre_TFree(pattern, HYPRE_MEMORY_HOST);
+      hypre_TFree(marker, HYPRE_MEMORY_HOST);
+      hypre_TFree(kg_marker, HYPRE_MEMORY_HOST);
+   } /* end openmp region */
+   HYPRE_ANNOTATE_REGION_END("%s", "MainLoop");
+
+   /* Free memory */
+   hypre_TFree(twspace, HYPRE_MEMORY_HOST);
+
+   /* Update local number of nonzeros of G */
+   hypre_CSRMatrixNumNonzeros(G_diag) = G_i[num_rows_diag_A];
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_FSAISetupOMPDyn
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_FSAISetupOMPDyn( void               *fsai_vdata,
+                       hypre_ParCSRMatrix *A,
+                       hypre_ParVector    *f,
+                       hypre_ParVector    *u )
+{
+   HYPRE_UNUSED_VAR(f);
+   HYPRE_UNUSED_VAR(u);
+
+   /* Data structure variables */
+   hypre_ParFSAIData      *fsai_data        = (hypre_ParFSAIData*) fsai_vdata;
+   HYPRE_Real              kap_tolerance    = hypre_ParFSAIDataKapTolerance(fsai_data);
+   HYPRE_Int               max_steps        = hypre_ParFSAIDataMaxSteps(fsai_data);
+   HYPRE_Int               max_step_size    = hypre_ParFSAIDataMaxStepSize(fsai_data);
+
+   /* CSRMatrix A_diag variables */
+   hypre_CSRMatrix        *A_diag           = hypre_ParCSRMatrixDiag(A);
+   HYPRE_Int              *A_i              = hypre_CSRMatrixI(A_diag);
+   HYPRE_Complex          *A_a              = hypre_CSRMatrixData(A_diag);
+   HYPRE_Int               num_rows_diag_A  = hypre_CSRMatrixNumRows(A_diag);
+
+   /* Matrix G variables */
+   hypre_ParCSRMatrix     *G = hypre_ParFSAIDataGmat(fsai_data);
+   hypre_CSRMatrix        *G_diag;
+   HYPRE_Int              *G_i;
+   HYPRE_Int              *G_j;
+   HYPRE_Complex          *G_a;
+   HYPRE_Int              *G_nnzcnt;          /* Array holding number of nonzeros of row G[i,:] */
+   HYPRE_Int               max_nnzrow_diag_G; /* Max. number of nonzeros per row in G_diag */
+
+   /* Local variables */
+   HYPRE_Int               i, j, jj;
+   char                    msg[512];    /* Warning message */
+   HYPRE_Complex          *twspace;     /* shared work space for omp threads */
+
+   /* Initalize some variables */
+   max_nnzrow_diag_G = max_steps * max_step_size + 1;
+
+   G_diag = hypre_ParCSRMatrixDiag(G);
+   G_a = hypre_CSRMatrixData(G_diag);
+   G_i = hypre_CSRMatrixI(G_diag);
+   G_j = hypre_CSRMatrixJ(G_diag);
+   G_nnzcnt = hypre_CTAlloc(HYPRE_Int, num_rows_diag_A, HYPRE_MEMORY_HOST);
+
+   /* Allocate shared work space array for OpenMP threads */
+   twspace = hypre_CTAlloc(HYPRE_Complex, hypre_NumThreads() + 1, HYPRE_MEMORY_HOST);
+
+   /**********************************************************************
+   * Start of Adaptive FSAI algorithm
+   ***********************************************************************/
+
+   /* Cycle through each of the local rows */
+   HYPRE_ANNOTATE_REGION_BEGIN("%s", "MainLoop");
+#ifdef HYPRE_USING_OPENMP
+   #pragma omp parallel
+#endif
+   {
+      hypre_Vector   *G_temp;        /* Vector holding the values of G[i,:] */
+      hypre_Vector   *A_sub;         /* Vector holding the dense submatrix A[P, P] */
+      hypre_Vector   *A_subrow;      /* Vector holding A[i, P] */
+      hypre_Vector   *kap_grad;      /* Vector holding the Kaporin gradient values */
+      HYPRE_Int      *kg_pos;        /* Indices of nonzero entries of kap_grad */
+      HYPRE_Int      *kg_marker;     /* Marker array with nonzeros pointing to kg_pos */
+      HYPRE_Int      *marker;        /* Marker array with nonzeros pointing to P */
+      HYPRE_Int      *pattern;       /* Array holding column indices of G[i,:] */
+      HYPRE_Int       patt_size;     /* Number of entries in current pattern */
+      HYPRE_Int       patt_size_old; /* Number of entries in previous pattern */
+      HYPRE_Int       i, j, k;       /* Loop variables */
+      HYPRE_Complex   old_psi;       /* GAG' before k-th interation of aFSAI */
+      HYPRE_Complex   new_psi;       /* GAG' after k-th interation of aFSAI */
+      HYPRE_Complex   row_scale;     /* Scaling factor for G_temp */
+      HYPRE_Complex  *G_temp_data;
+      HYPRE_Complex  *A_subrow_data;
+
+      /* Allocate and initialize local vector variables */
+      G_temp    = hypre_SeqVectorCreate(max_nnzrow_diag_G);
+      A_subrow  = hypre_SeqVectorCreate(max_nnzrow_diag_G);
+      kap_grad  = hypre_SeqVectorCreate(num_rows_diag_A);
+      A_sub     = hypre_SeqVectorCreate(max_nnzrow_diag_G * max_nnzrow_diag_G);
+      pattern   = hypre_CTAlloc(HYPRE_Int, max_nnzrow_diag_G, HYPRE_MEMORY_HOST);
+      kg_pos    = hypre_CTAlloc(HYPRE_Int, num_rows_diag_A, HYPRE_MEMORY_HOST);
+      kg_marker = hypre_CTAlloc(HYPRE_Int, num_rows_diag_A, HYPRE_MEMORY_HOST);
+      marker    = hypre_TAlloc(HYPRE_Int, num_rows_diag_A, HYPRE_MEMORY_HOST);
+
+      hypre_SeqVectorInitialize_v2(G_temp, HYPRE_MEMORY_HOST);
+      hypre_SeqVectorInitialize_v2(A_subrow, HYPRE_MEMORY_HOST);
+      hypre_SeqVectorInitialize_v2(kap_grad, HYPRE_MEMORY_HOST);
+      hypre_SeqVectorInitialize_v2(A_sub, HYPRE_MEMORY_HOST);
+      hypre_Memset(marker, -1, num_rows_diag_A * sizeof(HYPRE_Int), HYPRE_MEMORY_HOST);
+
+      /* Setting data variables for vectors */
+      G_temp_data   = hypre_VectorData(G_temp);
+      A_subrow_data = hypre_VectorData(A_subrow);
+
+#ifdef HYPRE_USING_OPENMP
+      #pragma omp for schedule(dynamic)
+#endif
+      for (i = 0; i < num_rows_diag_A; i++)
+      {
+         patt_size = 0;
+
+         /* Set old_psi up front so we don't have to compute GAG' twice in the inner for-loop */
+         new_psi = old_psi = A_a[A_i[i]];
+
+         /* Cycle through each iteration for that row */
+         for (k = 0; k < max_steps; k++)
+         {
+            /* Compute Kaporin Gradient */
+            hypre_FindKapGrad(A_diag, kap_grad, kg_pos, G_temp, pattern,
+                              patt_size, max_nnzrow_diag_G, i, kg_marker);
+
+            /* Find max_step_size largest values of the kaporin gradient,
+               find their column indices, and add it to pattern */
+            patt_size_old = patt_size;
+            hypre_AddToPattern(kap_grad, kg_pos, pattern, &patt_size,
+                               kg_marker, max_step_size);
+
+            /* Update sizes */
+            hypre_VectorSize(A_sub)    = patt_size * patt_size;
+            hypre_VectorSize(A_subrow) = patt_size;
+            hypre_VectorSize(G_temp)   = patt_size;
+
+            if (patt_size == patt_size_old)
+            {
+               new_psi = old_psi;
+               break;
+            }
+            else
+            {
+               /* Gather A[P, P] and -A[i, P] */
+               for (j = 0; j < patt_size; j++)
+               {
+                  marker[pattern[j]] = j;
+               }
+               hypre_CSRMatrixExtractDenseMat(A_diag, A_sub, pattern, patt_size, marker);
+               hypre_CSRMatrixExtractDenseRow(A_diag, A_subrow, marker, i);
+
+               /* Solve A[P, P] G[i, P]' = -A[i, P] */
+               hypre_DenseSPDSystemSolve(A_sub, A_subrow, G_temp);
+
+               /* Determine psi_{k+1} = G_temp[i] * A[P, P] * G_temp[i]' */
+               new_psi = A_a[A_i[i]];
+               for (j = 0; j < patt_size; j++)
+               {
+                  new_psi += G_temp_data[j] * A_subrow_data[j];
+               }
+
+               /* Check psi reduction */
+               if (hypre_cabs(new_psi - old_psi) < hypre_creal(kap_tolerance * old_psi))
+               {
+                  break;
+               }
+               else
+               {
+                  old_psi = new_psi;
+               }
+            }
+         }
+
+         /* Reset marker for building dense linear system */
+         for (j = 0; j < patt_size; j++)
+         {
+            marker[pattern[j]] = -1;
+         }
+
+         /* Compute scaling factor */
+         if (hypre_creal(new_psi) > 0 && hypre_cimag(new_psi) == 0)
+         {
+            row_scale = 1.0 / hypre_csqrt(new_psi);
+         }
+         else
+         {
+            hypre_sprintf(msg, "Warning: complex scaling factor found in row %d\n", i);
+            hypre_error_w_msg(HYPRE_ERROR_GENERIC, msg);
+
+            row_scale = 1.0 / hypre_cabs(A_a[A_i[i]]);
+            hypre_VectorSize(G_temp) = patt_size = 0;
+         }
+
+         /* Pass values of G_temp into G */
+         j = i * max_nnzrow_diag_G;
+         G_j[j] = i;
+         G_a[j] = row_scale;
+         j++;
+         for (k = 0; k < patt_size; k++)
+         {
+            G_j[j] = pattern[k];
+            G_a[j++] = row_scale * G_temp_data[k];
+            kg_marker[pattern[k]] = 0;
+         }
+         G_nnzcnt[i] = patt_size + 1;
+      } /* omp for schedule(dynamic) */
+
+      /* Free memory */
+      hypre_SeqVectorDestroy(G_temp);
+      hypre_SeqVectorDestroy(A_subrow);
+      hypre_SeqVectorDestroy(kap_grad);
+      hypre_SeqVectorDestroy(A_sub);
+      hypre_TFree(kg_pos, HYPRE_MEMORY_HOST);
+      hypre_TFree(pattern, HYPRE_MEMORY_HOST);
+      hypre_TFree(marker, HYPRE_MEMORY_HOST);
+      hypre_TFree(kg_marker, HYPRE_MEMORY_HOST);
+   } /* end openmp region */
+   HYPRE_ANNOTATE_REGION_END("%s", "MainLoop");
+
+   /* Reorder array */
+   G_i[0] = 0;
+   for (i = 0; i < num_rows_diag_A; i++)
+   {
+      G_i[i + 1] = G_i[i] + G_nnzcnt[i];
+      jj = i * max_nnzrow_diag_G;
+      for (j = G_i[i]; j < G_i[i + 1]; j++)
+      {
+         G_j[j] = G_j[jj];
+         G_a[j] = G_a[jj++];
+      }
+   }
+
+   /* Free memory */
+   hypre_TFree(twspace, HYPRE_MEMORY_HOST);
+   hypre_TFree(G_nnzcnt, HYPRE_MEMORY_HOST);
+
+   /* Update local number of nonzeros of G */
+   hypre_CSRMatrixNumNonzeros(G_diag) = G_i[num_rows_diag_A];
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_FSAISetup
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_FSAISetup( void               *fsai_vdata,
+                 hypre_ParCSRMatrix *A,
+                 hypre_ParVector    *f,
+                 hypre_ParVector    *u )
+{
+   hypre_ParFSAIData       *fsai_data     = (hypre_ParFSAIData*) fsai_vdata;
+   HYPRE_Int                max_steps     = hypre_ParFSAIDataMaxSteps(fsai_data);
+   HYPRE_Int                max_step_size = hypre_ParFSAIDataMaxStepSize(fsai_data);
+   HYPRE_Int                max_nnz_row   = hypre_ParFSAIDataMaxNnzRow(fsai_data);
+   HYPRE_Int                algo_type     = hypre_ParFSAIDataAlgoType(fsai_data);
+   HYPRE_Int                print_level   = hypre_ParFSAIDataPrintLevel(fsai_data);
+   HYPRE_Int                eig_max_iters = hypre_ParFSAIDataEigMaxIters(fsai_data);
+
+   /* ParCSRMatrix A variables */
+   MPI_Comm                 comm          = hypre_ParCSRMatrixComm(A);
+   HYPRE_BigInt             num_rows_A    = hypre_ParCSRMatrixGlobalNumRows(A);
+   HYPRE_BigInt             num_cols_A    = hypre_ParCSRMatrixGlobalNumCols(A);
+   HYPRE_BigInt            *row_starts_A  = hypre_ParCSRMatrixRowStarts(A);
+   HYPRE_BigInt            *col_starts_A  = hypre_ParCSRMatrixColStarts(A);
+
+   /* CSRMatrix A_diag variables */
+   hypre_CSRMatrix         *A_diag           = hypre_ParCSRMatrixDiag(A);
+   HYPRE_Int                num_rows_diag_A  = hypre_CSRMatrixNumRows(A_diag);
+
+   /* Work vectors */
+   hypre_ParVector         *r_work;
+   hypre_ParVector         *z_work;
+
+   /* G variables */
+   hypre_ParCSRMatrix      *G;
+   HYPRE_Int                max_nnzrow_diag_G;   /* Max. number of nonzeros per row in G_diag */
+   HYPRE_Int                max_nonzeros_diag_G; /* Max. number of nonzeros in G_diag */
+
+   /* Sanity check */
+   if (f && hypre_ParVectorNumVectors(f) > 1)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "FSAI doesn't support multicomponent vectors");
+      return hypre_error_flag;
+   }
+
+   HYPRE_ANNOTATE_FUNC_BEGIN;
+
+   /* Create and initialize work vectors used in the solve phase */
+   r_work = hypre_ParVectorCreate(comm, num_rows_A, row_starts_A);
+   z_work = hypre_ParVectorCreate(comm, num_rows_A, row_starts_A);
+
+   hypre_ParVectorInitialize(r_work);
+   hypre_ParVectorInitialize(z_work);
+
+   hypre_ParFSAIDataRWork(fsai_data) = r_work;
+   hypre_ParFSAIDataZWork(fsai_data) = z_work;
+
+   /* Create the matrix G */
+   if (algo_type == 1 || algo_type == 2)
+   {
+      max_nnzrow_diag_G = max_steps * max_step_size + 1;
+   }
+   else
+   {
+      max_nnzrow_diag_G = max_nnz_row + 1;
+   }
+   max_nonzeros_diag_G = num_rows_diag_A * max_nnzrow_diag_G;
+   G = hypre_ParCSRMatrixCreate(comm, num_rows_A, num_cols_A,
+                                row_starts_A, col_starts_A,
+                                0, max_nonzeros_diag_G, 0);
+   hypre_ParFSAIDataGmat(fsai_data) = G;
+
+   /* Initialize and compute lower triangular factor G */
+#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+   HYPRE_MemoryLocation  memloc_A = hypre_ParCSRMatrixMemoryLocation(A);
+   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1(memloc_A);
+
+   if (exec == HYPRE_EXEC_DEVICE)
+   {
+      hypre_FSAISetupDevice(fsai_vdata, A, f, u);
+   }
+   else
+#endif
+   {
+      /* Initialize matrix */
+      hypre_ParCSRMatrixInitialize(G);
+
+      switch (algo_type)
+      {
+         case 1:
+            // TODO: Change name to hypre_FSAISetupAdaptive
+            hypre_FSAISetupNative(fsai_vdata, A, f, u);
+            break;
+
+         case 2:
+            // TODO: Change name to hypre_FSAISetupAdaptiveOMPDynamic
+            hypre_FSAISetupOMPDyn(fsai_vdata, A, f, u);
+            break;
+
+         default:
+            hypre_FSAISetupNative(fsai_vdata, A, f, u);
+            break;
+      }
+   }
+
+   /* Compute G^T */
+   G  = hypre_ParFSAIDataGmat(fsai_data);
+   hypre_ParCSRMatrixTranspose(G, &hypre_ParFSAIDataGTmat(fsai_data), 1);
+
+   /* Update omega if requested */
+   if (eig_max_iters)
+   {
+      hypre_FSAIComputeOmega(fsai_vdata, A);
+   }
+
+   /* Print setup info */
+   if (print_level == 1)
+   {
+      hypre_FSAIPrintStats(fsai_data, A);
+   }
+   else if (print_level > 2)
+   {
+      char filename[] = "FSAI.out.G.ij";
+      hypre_ParCSRMatrixPrintIJ(G, 0, 0, filename);
+   }
+
+#if defined (DEBUG_FSAI)
+#if !defined (HYPRE_USING_GPU) ||
+   (defined (HYPRE_USING_GPU) && defined (HYPRE_USING_UNIFIED_MEMORY))
+   hypre_FSAIDumpLocalLSDense(fsai_vdata, "fsai_dense_ls.out", A);
+#endif
+#endif
+
+   HYPRE_ANNOTATE_FUNC_END;
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_FSAIPrintStats
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_FSAIPrintStats( void *fsai_vdata,
+                      hypre_ParCSRMatrix *A )
+{
+   /* Data structure variables */
+   hypre_ParFSAIData      *fsai_data        = (hypre_ParFSAIData*) fsai_vdata;
+   HYPRE_Int               algo_type        = hypre_ParFSAIDataAlgoType(fsai_data);
+   HYPRE_Int               local_solve_type = hypre_ParFSAIDataLocalSolveType(fsai_data);
+   HYPRE_Real              kap_tolerance    = hypre_ParFSAIDataKapTolerance(fsai_data);
+   HYPRE_Int               max_steps        = hypre_ParFSAIDataMaxSteps(fsai_data);
+   HYPRE_Int               max_step_size    = hypre_ParFSAIDataMaxStepSize(fsai_data);
+   HYPRE_Int               max_nnz_row      = hypre_ParFSAIDataMaxNnzRow(fsai_data);
+   HYPRE_Int               num_levels       = hypre_ParFSAIDataNumLevels(fsai_data);
+   HYPRE_Real              threshold        = hypre_ParFSAIDataThreshold(fsai_data);
+   HYPRE_Int               eig_max_iters    = hypre_ParFSAIDataEigMaxIters(fsai_data);
+   HYPRE_Real              density;
+
+   hypre_ParCSRMatrix     *G = hypre_ParFSAIDataGmat(fsai_data);
+
+   /* Local variables */
+   HYPRE_Int               nprocs;
+   HYPRE_Int               my_id;
+
+   hypre_MPI_Comm_size(hypre_ParCSRMatrixComm(A), &nprocs);
+   hypre_MPI_Comm_rank(hypre_ParCSRMatrixComm(A), &my_id);
+
+   /* Compute density */
+   hypre_ParCSRMatrixSetDNumNonzeros(G);
+   hypre_ParCSRMatrixSetDNumNonzeros(A);
+   density = hypre_ParCSRMatrixDNumNonzeros(G) /
+             hypre_ParCSRMatrixDNumNonzeros(A);
+   hypre_ParFSAIDataDensity(fsai_data) = density;
+
+   if (!my_id)
+   {
+      hypre_printf("*************************\n");
+      hypre_printf("* HYPRE FSAI Setup Info *\n");
+      hypre_printf("*************************\n\n");
+
+      hypre_printf("+---------------------------+\n");
+      hypre_printf("| No. MPI tasks:     %6d |\n", nprocs);
+      hypre_printf("| No. threads:       %6d |\n", hypre_NumThreads());
+      hypre_printf("| Algorithm type:    %6d |\n", algo_type);
+      hypre_printf("| Local solve type:  %6d |\n", local_solve_type);
+      if (algo_type == 1 || algo_type == 2)
+      {
+         hypre_printf("| Max no. steps:     %6d |\n", max_steps);
+         hypre_printf("| Max step size:     %6d |\n", max_step_size);
+         hypre_printf("| Kap grad tol:    %8.1e |\n", kap_tolerance);
+      }
+      else
+      {
+         hypre_printf("| Max nnz. row:      %6d |\n", max_nnz_row);
+         hypre_printf("| Number of levels:  %6d |\n", num_levels);
+         hypre_printf("| Threshold:       %8.1e |\n", threshold);
+      }
+      hypre_printf("| Prec. density:   %8.3f |\n", density);
+      hypre_printf("| Eig max iters:     %6d |\n", eig_max_iters);
+      hypre_printf("| Omega factor:    %8.3f |\n", hypre_ParFSAIDataOmega(fsai_data));
+      hypre_printf("+---------------------------+\n");
+
+      hypre_printf("\n\n");
+   }
+
+   return hypre_error_flag;
+}
+
+/*****************************************************************************
+ * hypre_FSAIComputeOmega
+ *
+ * Approximates the relaxation factor omega with 1/eigmax(G^T*G*A), where the
+ * maximum eigenvalue is computed with a fixed number of iterations via the
+ * power method.
+ ******************************************************************************/
+
+HYPRE_Int
+hypre_FSAIComputeOmega( void               *fsai_vdata,
+                        hypre_ParCSRMatrix *A )
+{
+   hypre_ParFSAIData    *fsai_data       = (hypre_ParFSAIData*) fsai_vdata;
+   hypre_ParCSRMatrix   *G               = hypre_ParFSAIDataGmat(fsai_data);
+   hypre_ParCSRMatrix   *GT              = hypre_ParFSAIDataGTmat(fsai_data);
+   hypre_ParVector      *r_work          = hypre_ParFSAIDataRWork(fsai_data);
+   hypre_ParVector      *z_work          = hypre_ParFSAIDataZWork(fsai_data);
+   HYPRE_Int             eig_max_iters   = hypre_ParFSAIDataEigMaxIters(fsai_data);
+   HYPRE_MemoryLocation  memory_location = hypre_ParCSRMatrixMemoryLocation(A);
+
+   hypre_ParVector      *eigvec;
+   hypre_ParVector      *eigvec_old;
+
+   HYPRE_Int             i;
+   HYPRE_Real            norm, invnorm, lambda, omega;
+
+   eigvec_old = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A),
+                                      hypre_ParCSRMatrixGlobalNumRows(A),
+                                      hypre_ParCSRMatrixRowStarts(A));
+   eigvec = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A),
+                                  hypre_ParCSRMatrixGlobalNumRows(A),
+                                  hypre_ParCSRMatrixRowStarts(A));
+   hypre_ParVectorInitialize_v2(eigvec, memory_location);
+   hypre_ParVectorInitialize_v2(eigvec_old, memory_location);
+
+#if defined(HYPRE_USING_GPU)
+   /* Make random number generation faster on GPUs */
+   if (hypre_GetExecPolicy1(memory_location) == HYPRE_EXEC_DEVICE)
+   {
+      hypre_Vector  *eigvec_local = hypre_ParVectorLocalVector(eigvec);
+      HYPRE_Complex *eigvec_data  = hypre_VectorData(eigvec_local);
+      HYPRE_Int      eigvec_size  = hypre_VectorSize(eigvec_local);
+
+      hypre_CurandUniform(eigvec_size, eigvec_data, 0, 0, 0, 0);
+   }
+   else
+#endif
+   {
+      hypre_ParVectorSetRandomValues(eigvec, 256);
+   }
+
+   /* Power method iteration */
+   for (i = 0; i < eig_max_iters; i++)
+   {
+      norm = hypre_ParVectorInnerProd(eigvec, eigvec);
+      invnorm = 1.0 / hypre_sqrt(norm);
+      hypre_ParVectorScale(invnorm, eigvec);
+
+      if (i == (eig_max_iters - 1))
+      {
+         hypre_ParVectorCopy(eigvec, eigvec_old);
+      }
+
+      /* eigvec = GT * G * A * eigvec */
+      hypre_ParCSRMatrixMatvec(1.0, A,  eigvec, 0.0, r_work);
+      hypre_ParCSRMatrixMatvec(1.0, G,  r_work, 0.0, z_work);
+      hypre_ParCSRMatrixMatvec(1.0, GT, z_work, 0.0, eigvec);
+   }
+   norm = hypre_ParVectorInnerProd(eigvec, eigvec_old);
+   lambda = hypre_sqrt(norm);
+
+   /* Check lambda */
+   if (lambda < HYPRE_REAL_EPSILON)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Found small lambda. Reseting it to one!");
+      lambda = 1.0;
+   }
+
+   /* Free memory */
+   hypre_ParVectorDestroy(eigvec_old);
+   hypre_ParVectorDestroy(eigvec);
+
+   /* Update omega */
+   omega = 1.0 / lambda;
+   hypre_FSAISetOmega(fsai_vdata, omega);
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_FSAIDumpLocalLSDense
+ *
+ * Dump local linear systems to file. Matrices are written in dense format.
+ * This functions serves for debugging.
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_FSAIDumpLocalLSDense( void               *fsai_vdata,
+                            const char         *filename,
+                            hypre_ParCSRMatrix *A )
+{
+   hypre_ParFSAIData      *fsai_data = (hypre_ParFSAIData*) fsai_vdata;
+
+   /* Data structure variables */
+   MPI_Comm                comm = hypre_ParCSRMatrixComm(A);
+   HYPRE_Int               max_steps = hypre_ParFSAIDataMaxSteps(fsai_data);
+   HYPRE_Int               max_step_size = hypre_ParFSAIDataMaxStepSize(fsai_data);
+   hypre_ParCSRMatrix     *G = hypre_ParFSAIDataGmat(fsai_data);
+   hypre_CSRMatrix        *G_diag = hypre_ParCSRMatrixDiag(G);
+   HYPRE_Int              *G_i = hypre_CSRMatrixI(G_diag);
+   HYPRE_Int              *G_j = hypre_CSRMatrixJ(G_diag);
+   HYPRE_Int               num_rows_diag_G = hypre_CSRMatrixNumRows(G_diag);
+
+   /* CSRMatrix A_diag variables */
+   hypre_CSRMatrix        *A_diag           = hypre_ParCSRMatrixDiag(A);
+   HYPRE_Int              *A_i              = hypre_CSRMatrixI(A_diag);
+   HYPRE_Int              *A_j              = hypre_CSRMatrixJ(A_diag);
+   HYPRE_Complex          *A_a              = hypre_CSRMatrixData(A_diag);
+
+   FILE                   *fp;
+   char                    new_filename[1024];
+   HYPRE_Int               myid;
+   HYPRE_Int               i, j, k, m, n;
+   HYPRE_Int               ii, jj;
+   HYPRE_Int               nnz, col, index;
+   HYPRE_Int              *indices;
+   HYPRE_Int              *marker;
+   HYPRE_Real             *data;
+   HYPRE_Int               data_size;
+   HYPRE_Real              density;
+   HYPRE_Int               width = 20; //6
+   HYPRE_Int               prec  = 16; //2
+
+   hypre_MPI_Comm_rank(comm, &myid);
+   hypre_sprintf(new_filename, "%s.%05d", filename, myid);
+   if ((fp = fopen(new_filename, "w")) == NULL)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Error: can't open output file %s\n");
+      return hypre_error_flag;
+   }
+
+   /* Allocate memory */
+   data_size = (max_steps * max_step_size) *
+               (max_steps * max_step_size + 1);
+   indices = hypre_CTAlloc(HYPRE_Int, data_size, HYPRE_MEMORY_HOST);
+   data    = hypre_CTAlloc(HYPRE_Real, data_size, HYPRE_MEMORY_HOST);
+   marker  = hypre_TAlloc(HYPRE_Int, num_rows_diag_G, HYPRE_MEMORY_HOST);
+   hypre_Memset(marker, -1, num_rows_diag_G * sizeof(HYPRE_Int), HYPRE_MEMORY_HOST);
+
+   /* Write header info */
+   hypre_fprintf(fp, "num_linear_sys = %d\n", num_rows_diag_G);
+   hypre_fprintf(fp, "max_data_size = %d\n", data_size);
+   hypre_fprintf(fp, "max_num_steps = %d\n", hypre_ParFSAIDataMaxSteps(fsai_data));
+   hypre_fprintf(fp, "max_step_size = %d\n", hypre_ParFSAIDataMaxStepSize(fsai_data));
+   hypre_fprintf(fp, "max_step_size = %g\n", hypre_ParFSAIDataKapTolerance(fsai_data));
+   hypre_fprintf(fp, "algo_type = %d\n\n", hypre_ParFSAIDataAlgoType(fsai_data));
+
+   /* Write local full linear systems */
+   for (i = 0; i < num_rows_diag_G; i++)
+   {
+      /* Build marker array */
+      n = G_i[i + 1] - G_i[i] - 1;
+      m = n + 1;
+      for (j = (G_i[i] + 1); j < G_i[i + 1]; j++)
+      {
+         marker[G_j[j]] = j - G_i[i] - 1;
+      }
+
+      /* Gather matrix coefficients */
+      nnz = 0;
+      for (j = (G_i[i] + 1); j < G_i[i + 1]; j++)
+      {
+         for (k = A_i[G_j[j]]; k < A_i[G_j[j] + 1]; k++)
+         {
+            if ((col = marker[A_j[k]]) >= 0)
+            {
+               /* Add A(i,j) entry */
+               index = (j - G_i[i] - 1) * n + col;
+               data[index] = A_a[k];
+               indices[nnz] = index;
+               nnz++;
+            }
+         }
+      }
+      density = (n > 0) ? (HYPRE_Real) nnz / (n * n) : 0.0;
+
+      /* Gather RHS coefficients */
+      for (j = A_i[i]; j < A_i[i + 1]; j++)
+      {
+         if ((col = marker[A_j[j]]) >= 0)
+         {
+            index = (m - 1) * n + col;
+            data[index] = A_a[j];
+            indices[nnz] = index;
+            nnz++;
+         }
+      }
+
+      /* Write coefficients to file */
+      hypre_fprintf(fp, "id = %d, (m, n) = (%d, %d), rho = %.3f\n", i, m, n, density);
+      for (ii = 0; ii < n; ii++)
+      {
+         for (jj = 0; jj < n; jj++)
+         {
+            hypre_fprintf(fp, "%*.*f ", width, prec, data[ii * n + jj]);
+         }
+         hypre_fprintf(fp, "\n");
+      }
+      for (jj = 0; jj < n; jj++)
+      {
+         hypre_fprintf(fp, "%*.*f ", width, prec, data[ii * n + jj]);
+      }
+      hypre_fprintf(fp, "\n");
+
+
+      /* Reset work arrays */
+      for (j = (G_i[i] + 1); j < G_i[i + 1]; j++)
+      {
+         marker[G_j[j]] = -1;
+      }
+
+      for (k = 0; k < nnz; k++)
+      {
+         data[indices[k]] = 0.0;
+      }
+   }
+
+   /* Close stream */
+   fclose(fp);
+
+   /* Free memory */
+   hypre_TFree(indices, HYPRE_MEMORY_HOST);
+   hypre_TFree(marker, HYPRE_MEMORY_HOST);
+   hypre_TFree(data, HYPRE_MEMORY_HOST);
+
+   return hypre_error_flag;
+}
diff --git a/external/hypre/src/parcsr_ls/par_fsai_solve.c b/external/hypre/src/parcsr_ls/par_fsai_solve.c
new file mode 100644
index 00000000..b5824f14
--- /dev/null
+++ b/external/hypre/src/parcsr_ls/par_fsai_solve.c
@@ -0,0 +1,179 @@
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ *******************************************************************************/
+
+/******************************************************************************
+ *
+ * FSAI solve routine
+ *
+ ******************************************************************************/
+
+#include "_hypre_parcsr_ls.h"
+
+/*--------------------------------------------------------------------
+ * hypre_FSAISolve
+ *--------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_FSAISolve( void               *fsai_vdata,
+                 hypre_ParCSRMatrix *A,
+                 hypre_ParVector    *b,
+                 hypre_ParVector    *x )
+{
+   MPI_Comm             comm = hypre_ParCSRMatrixComm(A);
+   hypre_ParFSAIData   *fsai_data   = (hypre_ParFSAIData*) fsai_vdata;
+
+   /* Data structure variables */
+   hypre_ParVector     *r_work      = hypre_ParFSAIDataRWork(fsai_data);
+   HYPRE_Real           tol         = hypre_ParFSAIDataTolerance(fsai_data);
+   HYPRE_Int            zero_guess  = hypre_ParFSAIDataZeroGuess(fsai_data);
+   HYPRE_Int            max_iter    = hypre_ParFSAIDataMaxIterations(fsai_data);
+   HYPRE_Int            print_level = hypre_ParFSAIDataPrintLevel(fsai_data);
+   HYPRE_Int            logging     = hypre_ParFSAIDataLogging(fsai_data);
+
+   /* Local variables */
+   HYPRE_Int            iter, my_id;
+   HYPRE_Real           old_resnorm, resnorm = 0.0, rel_resnorm;
+   HYPRE_Complex        one = 1.0;
+   HYPRE_Complex        neg_one = -1.0;
+   HYPRE_Complex        zero = 0.0;
+
+   /* Sanity check */
+   if (hypre_ParVectorNumVectors(b) > 1)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "FSAI doesn't support multicomponent vectors");
+      return hypre_error_flag;
+   }
+
+   HYPRE_ANNOTATE_FUNC_BEGIN;
+   hypre_GpuProfilingPushRange("FSAISolve");
+
+   hypre_MPI_Comm_rank(comm, &my_id);
+
+   /*-----------------------------------------------------------------
+    * Preconditioned Richardson - Main solver loop
+    * x(k+1) = x(k) + omega * (G^T*G) * (b - A*x(k))
+    * ----------------------------------------------------------------*/
+
+   if (my_id == 0 && print_level > 1)
+   {
+      hypre_printf("\n\n FSAI SOLVER SOLUTION INFO:\n");
+   }
+
+   iter        = 0;
+   rel_resnorm = resnorm = 1.0;
+
+   if (my_id == 0 && print_level > 1)
+   {
+      hypre_printf("                new         relative\n");
+      hypre_printf("    iter #      res norm    res norm\n");
+      hypre_printf("    --------    --------    --------\n");
+   }
+
+   if (max_iter > 0)
+   {
+      /* First iteration */
+      if (zero_guess)
+      {
+         /* Compute: x(k+1) = omega*G^T*G*b */
+         hypre_FSAIApply(fsai_vdata, zero, b, x);
+      }
+      else
+      {
+         /* Compute: x(k+1) = x(k) + omega*G^T*G*(b - A*x(k)) */
+         hypre_ParCSRMatrixMatvecOutOfPlace(neg_one, A, x, one, b, r_work);
+         hypre_FSAIApply(fsai_vdata, one, r_work, x);
+      }
+
+      /* Update iteration count */
+      iter++;
+   }
+   else
+   {
+      hypre_ParVectorCopy(b, x);
+   }
+
+   /* Apply remaining iterations */
+   for (; iter < max_iter; iter++)
+   {
+      /* Update residual */
+      hypre_ParCSRMatrixMatvecOutOfPlace(neg_one, A, x, one, b, r_work);
+
+      if (tol > 0.0)
+      {
+         old_resnorm = resnorm;
+         resnorm = hypre_ParVectorInnerProd(r_work, r_work);
+
+         /* Compute rel_resnorm */
+         rel_resnorm = resnorm / old_resnorm;
+
+         if (my_id == 0 && print_level > 1)
+         {
+            hypre_printf("    %e          %e          %e\n", iter, resnorm, rel_resnorm);
+         }
+
+         /* Exit if convergence tolerance has been achieved */
+         if (rel_resnorm >= tol)
+         {
+            break;
+         }
+      }
+
+      /* Compute: x(k+1) = x(k) + omega*inv(M)*r */
+      hypre_FSAIApply(fsai_vdata, one, r_work, x);
+   }
+
+   if (logging > 1)
+   {
+      hypre_ParFSAIDataNumIterations(fsai_data) = iter;
+      hypre_ParFSAIDataRelResNorm(fsai_data)    = rel_resnorm;
+   }
+   else
+   {
+      hypre_ParFSAIDataNumIterations(fsai_data) = 0;
+      hypre_ParFSAIDataRelResNorm(fsai_data)    = 0.0;
+   }
+
+   hypre_GpuProfilingPopRange();
+   HYPRE_ANNOTATE_FUNC_END;
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------
+ * hypre_FSAIApply
+ *
+ * Computes x(k+1) = alpha*x(k) + omega*G^T*G*b
+ *--------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_FSAIApply( void               *fsai_vdata,
+                 HYPRE_Complex       alpha,
+                 hypre_ParVector    *b,
+                 hypre_ParVector    *x )
+{
+   hypre_ParFSAIData   *fsai_data = (hypre_ParFSAIData*) fsai_vdata;
+
+   /* Data structure variables */
+   hypre_ParCSRMatrix  *G         = hypre_ParFSAIDataGmat(fsai_data);
+   hypre_ParCSRMatrix  *GT        = hypre_ParFSAIDataGTmat(fsai_data);
+   hypre_ParVector     *z_work    = hypre_ParFSAIDataZWork(fsai_data);
+   HYPRE_Real           omega     = hypre_ParFSAIDataOmega(fsai_data);
+
+   HYPRE_Complex        one  = 1.0;
+   HYPRE_Complex        zero = 0.0;
+
+   HYPRE_ANNOTATE_FUNC_BEGIN;
+   hypre_GpuProfilingPushRange("FSAIApply");
+
+   hypre_ParCSRMatrixMatvec(one, G, b, zero, z_work);
+   hypre_ParCSRMatrixMatvec(omega, GT, z_work, alpha, x);
+
+   hypre_GpuProfilingPopRange();
+   HYPRE_ANNOTATE_FUNC_END;
+
+   return hypre_error_flag;
+}
diff --git a/external/hypre/src/parcsr_ls/par_gauss_elim.c b/external/hypre/src/parcsr_ls/par_gauss_elim.c
index fa6f58ac..c3a9ec6e 100644
--- a/external/hypre/src/parcsr_ls/par_gauss_elim.c
+++ b/external/hypre/src/parcsr_ls/par_gauss_elim.c
@@ -1,195 +1,443 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
  ******************************************************************************/
 
 #include "_hypre_parcsr_ls.h"
-#include "Common.h"
 #include "_hypre_blas.h"
 #include "_hypre_lapack.h"
 
-/*-------------------------------------------------------------------------
+/*--------------------------------------------------------------------------
+ * hypre_GaussElimSetup
  *
- *                      Gaussian Elimination
+ * Gaussian elimination setup routine.
  *
- *------------------------------------------------------------------------ */
-
-HYPRE_Int hypre_GaussElimSetup (hypre_ParAMGData *amg_data, HYPRE_Int level, HYPRE_Int relax_type)
+ * Solver options for which local matrices/vectors are formed via MPI
+ * collectives on a sub-communicator defined with active ranks:
+ *
+ *   - 9: hypre's internal Gaussian elimination on the host.
+ *   - 99: LU factorization with pivoting.
+ *   - 199: explicit (dense) inverse A_inv = U^{-1}*L^{-1}.
+ *
+ * Solver options for which local matrices/vectors are formed via
+ * hypre_DataExchangeList:
+ *
+ *   - 19: hypre's internal Gaussian elimination on the host.
+ *   - 98: LU factorization with pivoting.
+ *   - 198: explicit (dense) inverse A_inv = U^{-1}*L^{-1}.
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_GaussElimSetup(hypre_ParAMGData *amg_data,
+                     HYPRE_Int         level,
+                     HYPRE_Int         solver_type)
 {
-#ifdef HYPRE_PROFILE
-   hypre_profile_times[HYPRE_TIMER_ID_GS_ELIM_SETUP] -= hypre_MPI_Wtime();
-#endif
-
    /* Par Data Structure variables */
-   hypre_ParCSRMatrix *A      = hypre_ParAMGDataAArray(amg_data)[level];
-   hypre_CSRMatrix    *A_diag = hypre_ParCSRMatrixDiag(A);
-   hypre_CSRMatrix    *A_offd = hypre_ParCSRMatrixOffd(A);
+   hypre_ParCSRMatrix   *A               = hypre_ParAMGDataAArray(amg_data)[level];
+   MPI_Comm              comm            = hypre_ParCSRMatrixComm(A);
+   HYPRE_Int             num_rows        = hypre_ParCSRMatrixNumRows(A);
+   HYPRE_Int             global_num_rows = (HYPRE_Int) hypre_ParCSRMatrixGlobalNumRows(A);
+   HYPRE_BigInt          first_row_index = hypre_ParCSRMatrixFirstRowIndex(A);
+   HYPRE_BigInt         *col_map_offd    = hypre_ParCSRMatrixColMapOffd(A);
+   hypre_CSRMatrix      *A_diag          = hypre_ParCSRMatrixDiag(A);
+   hypre_CSRMatrix      *A_offd          = hypre_ParCSRMatrixOffd(A);
+   HYPRE_MemoryLocation  memory_location = hypre_ParCSRMatrixMemoryLocation(A);
+
+   /* Local matrices */
+   hypre_CSRMatrix      *A_diag_host;
+   hypre_CSRMatrix      *A_offd_host;
+   hypre_CSRMatrix      *A_CSR;
+   HYPRE_Int            *A_CSR_i;
+   HYPRE_Int            *A_CSR_j;
+   HYPRE_Complex        *A_CSR_data;
+   HYPRE_Int            *A_diag_i;
+   HYPRE_Int            *A_offd_i;
+   HYPRE_Int            *A_diag_j;
+   HYPRE_Int            *A_offd_j;
+   HYPRE_Complex        *A_diag_data;
+   HYPRE_Complex        *A_offd_data;
+
+   HYPRE_Complex        *A_mat_local;
+   HYPRE_Int            *comm_info, *info, *displs;
+   HYPRE_Int            *mat_info, *mat_displs;
+   HYPRE_Int             new_num_procs, A_mat_local_size;
+
+   /* Local variables */
+   MPI_Comm              new_comm;
+   HYPRE_Int             global_size = global_num_rows * global_num_rows;
+   HYPRE_Real           *A_mat       = NULL;
+   HYPRE_Real           *AT_mat      = NULL;
+   HYPRE_Int            *A_piv       = NULL;
+   HYPRE_MemoryLocation  ge_memory_location;
+   HYPRE_Int             i, jj, col;
+   HYPRE_Int             ierr = 0;
+
+   /*-----------------------------------------------------------------
+    *  Sanity checks
+    *-----------------------------------------------------------------*/
+
+   /* Check for relaxation type */
+   if (solver_type != 9  && solver_type != 99 && solver_type != 199 &&
+       solver_type != 19 && solver_type != 98 && solver_type != 198)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Unsupported solver type!");
+      return hypre_error_flag;
+   }
 
-   HYPRE_Int num_rows = hypre_CSRMatrixNumRows(A_diag);
-   HYPRE_Int global_num_rows = (HYPRE_Int) hypre_ParCSRMatrixGlobalNumRows(A);
-   MPI_Comm comm = hypre_ParCSRMatrixComm(A);
-   MPI_Comm new_comm;
+   /*-----------------------------------------------------------------
+    *  Determine mem. location of the GE lin. system and allocate data
+    *-----------------------------------------------------------------*/
 
-   /* Generate sub communicator: processes that have nonzero num_rows */
-   hypre_GenerateSubComm(comm, num_rows, &new_comm);
+   if (solver_type == 9 || solver_type == 19)
+   {
+      ge_memory_location = HYPRE_MEMORY_HOST;
+   }
+   else
+   {
+      /* Fallback to host execution when dependency libraries are not met (cuSOLVER/MAGMA) */
+#if defined(HYPRE_USING_CUDA) && !defined(HYPRE_USING_CUSOLVER) && !defined(HYPRE_USING_MAGMA) ||\
+    (defined(HYPRE_USING_HIP) && !defined(HYPRE_USING_MAGMA))
+      ge_memory_location = HYPRE_MEMORY_HOST;
+#else
+      ge_memory_location = memory_location;
+#endif
+   }
+   hypre_ParAMGDataGEMemoryLocation(amg_data) = ge_memory_location;
 
+   /* Allocate dense linear system data */
    if (num_rows)
    {
-      hypre_CSRMatrix *A_diag_host, *A_offd_host;
-      if (hypre_GetActualMemLocation(hypre_CSRMatrixMemoryLocation(A_diag)) != hypre_MEMORY_HOST)
+      hypre_ParAMGDataAMat(amg_data)  = hypre_CTAlloc(HYPRE_Real,
+                                                      global_size,
+                                                      ge_memory_location);
+      hypre_ParAMGDataAWork(amg_data) = hypre_CTAlloc(HYPRE_Real,
+                                                      global_size,
+                                                      ge_memory_location);
+      hypre_ParAMGDataBVec(amg_data)  = hypre_CTAlloc(HYPRE_Real,
+                                                      global_num_rows,
+                                                      ge_memory_location);
+
+      /* solver types 198 and 199 need a work space for the solution vector */
+      if (solver_type == 198 || solver_type == 199)
       {
-         A_diag_host = hypre_CSRMatrixClone_v2(A_diag, 1, HYPRE_MEMORY_HOST);
+         hypre_ParAMGDataUVec(amg_data) = hypre_CTAlloc(HYPRE_Real,
+                                                        global_num_rows,
+                                                        ge_memory_location);
       }
-      else
-      {
-         A_diag_host = A_diag;
-      }
-      if (hypre_GetActualMemLocation(hypre_CSRMatrixMemoryLocation(A_offd)) != hypre_MEMORY_HOST)
+
+      /* solver types other than 9 and 19 need an array for storing pivots */
+      if (solver_type != 9 && solver_type != 19)
       {
-         A_offd_host = hypre_CSRMatrixClone_v2(A_offd, 1, HYPRE_MEMORY_HOST);
+#if defined(HYPRE_USING_MAGMA)
+         /* MAGMA's getrf/getrs expect Apiv to be on the host */
+         hypre_ParAMGDataAPiv(amg_data) = hypre_CTAlloc(HYPRE_Int,
+                                                        global_num_rows,
+                                                        HYPRE_MEMORY_HOST);
+#else
+         hypre_ParAMGDataAPiv(amg_data) = hypre_CTAlloc(HYPRE_Int,
+                                                        global_num_rows,
+                                                        ge_memory_location);
+#endif
       }
-      else
+      A_piv = hypre_ParAMGDataAPiv(amg_data);
+   }
+
+   /*-----------------------------------------------------------------
+    *  Gaussian elimination setup
+    *-----------------------------------------------------------------*/
+
+#ifdef HYPRE_PROFILE
+   hypre_profile_times[HYPRE_TIMER_ID_GS_ELIM_SETUP] -= hypre_MPI_Wtime();
+#endif
+
+   HYPRE_ANNOTATE_FUNC_BEGIN;
+   hypre_GpuProfilingPushRange("GESetup");
+
+   if (solver_type == 9 || solver_type == 99 || solver_type == 199)
+   {
+      /* Generate sub communicator - processes that have nonzero num_rows */
+      hypre_GenerateSubComm(comm, num_rows, &new_comm);
+      hypre_ParAMGDataNewComm(amg_data) = new_comm;
+
+      if (num_rows)
       {
-         A_offd_host = A_offd;
-      }
+         hypre_MPI_Comm_size(new_comm, &new_num_procs);
+
+         A_diag_host = (hypre_GetActualMemLocation(memory_location) == hypre_MEMORY_DEVICE) ?
+                       hypre_CSRMatrixClone_v2(A_diag, 1, HYPRE_MEMORY_HOST) : A_diag;
+         A_offd_host = (hypre_GetActualMemLocation(memory_location) == hypre_MEMORY_DEVICE) ?
+                       hypre_CSRMatrixClone_v2(A_offd, 1, HYPRE_MEMORY_HOST) : A_offd;
+         A_diag_i    = hypre_CSRMatrixI(A_diag_host);
+         A_offd_i    = hypre_CSRMatrixI(A_offd_host);
+         A_diag_j    = hypre_CSRMatrixJ(A_diag_host);
+         A_offd_j    = hypre_CSRMatrixJ(A_offd_host);
+         A_diag_data = hypre_CSRMatrixData(A_diag_host);
+         A_offd_data = hypre_CSRMatrixData(A_offd_host);
+         comm_info   = hypre_CTAlloc(HYPRE_Int, 2 * new_num_procs + 1, HYPRE_MEMORY_HOST);
+         mat_info    = hypre_CTAlloc(HYPRE_Int, new_num_procs, HYPRE_MEMORY_HOST);
+         mat_displs  = hypre_CTAlloc(HYPRE_Int, new_num_procs + 1, HYPRE_MEMORY_HOST);
+         info        = &comm_info[0];
+         displs      = &comm_info[new_num_procs];
+
+         hypre_ParAMGDataCommInfo(amg_data) = comm_info;
+         hypre_MPI_Allgather(&num_rows, 1, HYPRE_MPI_INT, info, 1, HYPRE_MPI_INT, new_comm);
+
+         displs[0] = 0;
+         mat_displs[0] = 0;
+         for (i = 0; i < new_num_procs; i++)
+         {
+            displs[i + 1] = displs[i] + info[i];
+            mat_displs[i + 1] = global_num_rows * displs[i + 1];
+            mat_info[i] = global_num_rows * info[i];
+         }
 
-      HYPRE_BigInt *col_map_offd = hypre_ParCSRMatrixColMapOffd(A);
-      HYPRE_Int  *A_diag_i    = hypre_CSRMatrixI(A_diag_host);
-      HYPRE_Int  *A_offd_i    = hypre_CSRMatrixI(A_offd_host);
-      HYPRE_Int  *A_diag_j    = hypre_CSRMatrixJ(A_diag_host);
-      HYPRE_Int  *A_offd_j    = hypre_CSRMatrixJ(A_offd_host);
-      HYPRE_Real *A_diag_data = hypre_CSRMatrixData(A_diag_host);
-      HYPRE_Real *A_offd_data = hypre_CSRMatrixData(A_offd_host);
+         A_mat_local_size = global_num_rows * num_rows;
+         A_mat_local = hypre_CTAlloc(HYPRE_Real, A_mat_local_size, HYPRE_MEMORY_HOST);
+         A_mat = (hypre_GetActualMemLocation(ge_memory_location) == hypre_MEMORY_DEVICE) ?
+                 hypre_CTAlloc(HYPRE_Real, global_size, HYPRE_MEMORY_HOST) :
+                 hypre_ParAMGDataAMat(amg_data);
 
-      HYPRE_Real *A_mat, *A_mat_local;
-      HYPRE_Int *comm_info, *info, *displs;
-      HYPRE_Int *mat_info, *mat_displs;
-      HYPRE_Int new_num_procs, A_mat_local_size, i, jj, column;
-      HYPRE_BigInt first_row_index = hypre_ParCSRMatrixFirstRowIndex(A);
+         /*---------------------------------------------------------------
+          *  Load local matrix into A_mat_local.
+          *---------------------------------------------------------------*/
 
-      hypre_MPI_Comm_size(new_comm, &new_num_procs);
+         for (i = 0; i < num_rows; i++)
+         {
+            for (jj = A_diag_i[i]; jj < A_diag_i[i + 1]; jj++)
+            {
+               /* using row major */
+               col = A_diag_j[jj] + first_row_index;
+               A_mat_local[i * global_num_rows + col] = A_diag_data[jj];
+            }
 
-      comm_info  = hypre_CTAlloc(HYPRE_Int, 2*new_num_procs+1, HYPRE_MEMORY_HOST);
-      mat_info   = hypre_CTAlloc(HYPRE_Int, new_num_procs,     HYPRE_MEMORY_HOST);
-      mat_displs = hypre_CTAlloc(HYPRE_Int, new_num_procs+1,   HYPRE_MEMORY_HOST);
-      info = &comm_info[0];
-      displs = &comm_info[new_num_procs];
+            for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
+            {
+               /* using row major */
+               col = col_map_offd[A_offd_j[jj]];
+               A_mat_local[i * global_num_rows + col] = A_offd_data[jj];
+            }
+         }
 
-      hypre_MPI_Allgather(&num_rows, 1, HYPRE_MPI_INT, info, 1, HYPRE_MPI_INT, new_comm);
+         hypre_MPI_Allgatherv(A_mat_local, A_mat_local_size, HYPRE_MPI_REAL, A_mat, mat_info,
+                              mat_displs, HYPRE_MPI_REAL, new_comm);
 
-      displs[0] = 0;
-      mat_displs[0] = 0;
-      for (i = 0; i < new_num_procs; i++)
-      {
-         displs[i+1] = displs[i] + info[i];
-         mat_displs[i+1] = global_num_rows * displs[i+1];
-         mat_info[i] = global_num_rows * info[i];
-      }
+         /* Set dense matrix - We store it in row-major format when using hypre's internal
+            Gaussian Elimination or in column-major format if using LAPACK solvers */
+         if (solver_type != 9 && solver_type != 19)
+         {
+            AT_mat = (hypre_GetActualMemLocation(ge_memory_location) == hypre_MEMORY_DEVICE) ?
+                     hypre_CTAlloc(HYPRE_Real, global_size, HYPRE_MEMORY_HOST) :
+                     hypre_ParAMGDataAWork(amg_data);
 
-      hypre_ParAMGDataBVec(amg_data) = hypre_CTAlloc(HYPRE_Real, global_num_rows, HYPRE_MEMORY_HOST);
+            /* Compute A transpose, i.e., store A in column-major format */
+            for (i = 0; i < global_num_rows; i++)
+            {
+               for (jj = 0; jj < global_num_rows; jj++)
+               {
+                  AT_mat[i * global_num_rows + jj] = A_mat[i + jj * global_num_rows];
+               }
+            }
+
+            if (hypre_ParAMGDataAWork(amg_data) != AT_mat)
+            {
+               /* Copy A^T to destination variable */
+               hypre_TMemcpy(hypre_ParAMGDataAMat(amg_data), AT_mat, HYPRE_Real, global_size,
+                             ge_memory_location, HYPRE_MEMORY_HOST);
+               hypre_TFree(AT_mat, HYPRE_MEMORY_HOST);
+            }
+            else
+            {
+               /* Swap pointers */
+               hypre_ParAMGDataAWork(amg_data) = hypre_ParAMGDataAMat(amg_data);
+               hypre_ParAMGDataAMat(amg_data) = AT_mat;
+            }
+         }
 
-      A_mat_local_size = global_num_rows * num_rows;
-      A_mat_local = hypre_CTAlloc(HYPRE_Real, A_mat_local_size,                HYPRE_MEMORY_HOST);
-      A_mat       = hypre_CTAlloc(HYPRE_Real, global_num_rows*global_num_rows, HYPRE_MEMORY_HOST);
+         hypre_TFree(mat_info,    HYPRE_MEMORY_HOST);
+         hypre_TFree(mat_displs,  HYPRE_MEMORY_HOST);
+         hypre_TFree(A_mat_local, HYPRE_MEMORY_HOST);
 
-      /* load local matrix into A_mat_local */
-      for (i = 0; i < num_rows; i++)
-      {
-         for (jj = A_diag_i[i]; jj < A_diag_i[i+1]; jj++)
+         if (hypre_GetActualMemLocation(ge_memory_location) == hypre_MEMORY_DEVICE)
          {
-             /* need col major */
-             column = A_diag_j[jj]+first_row_index;
-             A_mat_local[i*global_num_rows + column] = A_diag_data[jj];
+            hypre_TFree(A_mat, HYPRE_MEMORY_HOST);
          }
-         for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+
+         if (A_diag_host != A_diag)
          {
-             /* need col major */
-             column = col_map_offd[A_offd_j[jj]];
-             A_mat_local[i*global_num_rows + column] = A_offd_data[jj];
+            hypre_CSRMatrixDestroy(A_diag_host);
+         }
+
+         if (A_offd_host != A_offd)
+         {
+            hypre_CSRMatrixDestroy(A_offd_host);
          }
       }
+      else
+      {
+         /* Skip setup if this rank has no rows. */
+         hypre_ParAMGDataGSSetup(amg_data) = 1;
+
+         /* Finalize profiling */
+         hypre_GpuProfilingPopRange();
+         HYPRE_ANNOTATE_FUNC_END;
 
-      hypre_MPI_Allgatherv(A_mat_local, A_mat_local_size, HYPRE_MPI_REAL, A_mat, mat_info,
-                           mat_displs, HYPRE_MPI_REAL, new_comm);
+         return hypre_error_flag;
+      }
+   }
+   else /* if (solver_type == 19 || solver_type = 98 || solver_type == 198) */
+   {
+      /* Generate CSR matrix from ParCSRMatrix A */
+      A_CSR = hypre_ParCSRMatrixToCSRMatrixAll_v2(A, HYPRE_MEMORY_HOST);
 
-      if (relax_type == 99)
+      if (num_rows)
       {
-         HYPRE_Real *AT_mat = hypre_CTAlloc(HYPRE_Real, global_num_rows*global_num_rows, HYPRE_MEMORY_HOST);
+         A_CSR_i    = hypre_CSRMatrixI(A_CSR);
+         A_CSR_j    = hypre_CSRMatrixJ(A_CSR);
+         A_CSR_data = hypre_CSRMatrixData(A_CSR);
+
+         /*---------------------------------------------------------------
+          *  Load CSR matrix into A_mat.
+          *---------------------------------------------------------------*/
+
+         /* Allocate memory */
+         A_mat = (hypre_GetActualMemLocation(ge_memory_location) == hypre_MEMORY_DEVICE) ?
+                 hypre_CTAlloc(HYPRE_Real, global_size, HYPRE_MEMORY_HOST) :
+                 hypre_ParAMGDataAMat(amg_data);
+
+         /* TODO (VPM): Add OpenMP support */
          for (i = 0; i < global_num_rows; i++)
          {
-            for (jj = 0; jj < global_num_rows; jj++)
+            for (jj = A_CSR_i[i]; jj < A_CSR_i[i + 1]; jj++)
             {
-               AT_mat[i*global_num_rows + jj] = A_mat[i + jj*global_num_rows];
+               /* need col major */
+               col = A_CSR_j[jj];
+               A_mat[i + global_num_rows * col] = (HYPRE_Real) A_CSR_data[jj];
             }
          }
-         hypre_ParAMGDataAMat(amg_data) = AT_mat;
-         hypre_TFree(A_mat, HYPRE_MEMORY_HOST);
+
+         if (hypre_ParAMGDataAMat(amg_data) != A_mat)
+         {
+            hypre_TMemcpy(hypre_ParAMGDataAMat(amg_data), A_mat, HYPRE_Real, global_size,
+                          ge_memory_location, HYPRE_MEMORY_HOST);
+            hypre_TFree(A_mat, HYPRE_MEMORY_HOST);
+         }
       }
-      else if (relax_type == 9)
+      else
       {
-         hypre_ParAMGDataAMat(amg_data) = A_mat;
+         /* Free memory */
+         hypre_CSRMatrixDestroy(A_CSR);
+
+         /* Skip setup if this rank has no rows. */
+         hypre_ParAMGDataGSSetup(amg_data) = 1;
+
+         /* Finalize profiling */
+         hypre_GpuProfilingPopRange();
+         HYPRE_ANNOTATE_FUNC_END;
+
+         return hypre_error_flag;
       }
-      else if (relax_type == 199)
+
+      /* Free memory */
+      hypre_CSRMatrixDestroy(A_CSR);
+   }
+
+   /* Exit if no rows in this rank */
+   if (!num_rows)
+   {
+      hypre_ParAMGDataGSSetup(amg_data) = 1;
+
+      /* Finalize profiling */
+      hypre_GpuProfilingPopRange();
+      HYPRE_ANNOTATE_FUNC_END;
+
+      return hypre_error_flag;
+   }
+
+   /*-----------------------------------------------------------------
+    *  Factorization phase
+    *-----------------------------------------------------------------*/
+
+#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1(ge_memory_location);
+
+   if (exec == HYPRE_EXEC_DEVICE)
+   {
+      hypre_GaussElimSetupDevice(amg_data, level, solver_type);
+   }
+   else
+#endif
+   {
+      if (solver_type != 9 && solver_type != 19)
       {
-         HYPRE_Real *AT_mat = hypre_TAlloc(HYPRE_Real, global_num_rows*global_num_rows, HYPRE_MEMORY_HOST);
-         HYPRE_Real *Ainv   = hypre_TAlloc(HYPRE_Real, num_rows*global_num_rows,        HYPRE_MEMORY_HOST);
-         for (i = 0; i < global_num_rows; i++)
+         /* Perform factorization */
+         hypre_dgetrf(&global_num_rows, &global_num_rows,
+                      hypre_ParAMGDataAMat(amg_data),
+                      &global_num_rows, A_piv, &ierr);
+         if (ierr != 0)
          {
-            for (jj = 0; jj < global_num_rows; jj++)
-            {
-               AT_mat[i*global_num_rows + jj] = A_mat[i + jj*global_num_rows];
-            }
+            hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Problem with dgetrf!");
+
+            /* Finalize profiling */
+            hypre_GpuProfilingPopRange();
+            HYPRE_ANNOTATE_FUNC_END;
+
+            return hypre_error_flag;
          }
-         HYPRE_Int *ipiv, info, query = -1, lwork;
-         HYPRE_Real lwork_opt, *work;
-         ipiv = hypre_TAlloc(HYPRE_Int, global_num_rows, HYPRE_MEMORY_HOST);
-         hypre_dgetrf(&global_num_rows, &global_num_rows, AT_mat, &global_num_rows, ipiv, &info);
-         hypre_assert(info == 0);
-         hypre_dgetri(&global_num_rows, AT_mat, &global_num_rows, ipiv, &lwork_opt, &query, &info);
-         hypre_assert(info == 0);
-         lwork = lwork_opt;
-         work = hypre_TAlloc(HYPRE_Real, lwork, HYPRE_MEMORY_HOST);
-         hypre_dgetri(&global_num_rows, AT_mat, &global_num_rows, ipiv, work, &lwork, &info);
-         hypre_assert(info == 0);
 
-         for (i = 0; i < global_num_rows; i++)
+         /* Compute explicit inverse */
+         if (solver_type == 198 || solver_type == 199)
          {
-            for (jj = 0; jj < num_rows; jj++)
+            HYPRE_Int     query = -1, lwork;
+            HYPRE_Real    lwork_opt;
+            HYPRE_Real   *work;
+
+            /* Compute buffer size */
+            hypre_dgetri(&global_num_rows, hypre_ParAMGDataAMat(amg_data),
+                         &global_num_rows, A_piv, &lwork_opt, &query, &ierr);
+            if (ierr != 0)
             {
-               Ainv[i*num_rows+jj] = AT_mat[i*global_num_rows+jj+first_row_index];
-            }
-         }
+               hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Problem with dgetri (query)!");
 
-         hypre_TFree(ipiv,   HYPRE_MEMORY_HOST);
-         hypre_TFree(A_mat,  HYPRE_MEMORY_HOST);
-         hypre_TFree(AT_mat, HYPRE_MEMORY_HOST);
-         hypre_TFree(work,   HYPRE_MEMORY_HOST);
+               /* Finalize profiling */
+               hypre_GpuProfilingPopRange();
+               HYPRE_ANNOTATE_FUNC_END;
 
-         hypre_ParAMGDataAInv(amg_data) = Ainv;
-      }
+               return hypre_error_flag;
+            }
 
-      hypre_ParAMGDataCommInfo(amg_data) = comm_info;
-      hypre_ParAMGDataNewComm(amg_data)  = new_comm;
+            /* Allocate work space */
+            lwork = (HYPRE_Int) lwork_opt;
+            work = hypre_TAlloc(HYPRE_Real, lwork, HYPRE_MEMORY_HOST);
 
-      hypre_TFree(mat_info,    HYPRE_MEMORY_HOST);
-      hypre_TFree(mat_displs,  HYPRE_MEMORY_HOST);
-      hypre_TFree(A_mat_local, HYPRE_MEMORY_HOST);
+            /* Compute dense inverse */
+            hypre_dgetri(&global_num_rows, hypre_ParAMGDataAMat(amg_data),
+                         &global_num_rows, A_piv, work, &lwork, &ierr);
+            if (ierr != 0)
+            {
+               hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Problem with dgetri!");
 
-      if (A_diag_host != A_diag)
-      {
-         hypre_CSRMatrixDestroy(A_diag_host);
-      }
+               /* Finalize profiling */
+               hypre_GpuProfilingPopRange();
+               HYPRE_ANNOTATE_FUNC_END;
 
-      if (A_offd_host != A_offd)
-      {
-         hypre_CSRMatrixDestroy(A_offd_host);
+               return hypre_error_flag;
+            }
+            hypre_TFree(work, HYPRE_MEMORY_HOST);
+         }
       }
    }
 
+   /*-----------------------------------------------------------------
+    *  Finalize
+    *-----------------------------------------------------------------*/
+
    hypre_ParAMGDataGSSetup(amg_data) = 1;
 
+   /* Finalize profiling */
+   hypre_GpuProfilingPopRange();
+   HYPRE_ANNOTATE_FUNC_END;
 #ifdef HYPRE_PROFILE
    hypre_profile_times[HYPRE_TIMER_ID_GS_ELIM_SETUP] += hypre_MPI_Wtime();
 #endif
@@ -197,233 +445,253 @@ HYPRE_Int hypre_GaussElimSetup (hypre_ParAMGData *amg_data, HYPRE_Int level, HYP
    return hypre_error_flag;
 }
 
-/* relax_type = 9, 99, 199, see par_relax.c for 19 and 98 */
-HYPRE_Int hypre_GaussElimSolve (hypre_ParAMGData *amg_data, HYPRE_Int level, HYPRE_Int relax_type)
+/*--------------------------------------------------------------------------
+ * hypre_GaussElimSolve
+ *
+ * Gaussian elimination solve. See hypre_GaussElimSetup for comments.
+ *
+ * TODO (VPM): remove (u/f)_data_h. Communicate device buffers instead.
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_GaussElimSolve(hypre_ParAMGData *amg_data,
+                     HYPRE_Int         level,
+                     HYPRE_Int         solver_type)
 {
+   hypre_ParCSRMatrix   *A                  = hypre_ParAMGDataAArray(amg_data)[level];
+   HYPRE_Int             first_row_index    = (HYPRE_Int) hypre_ParCSRMatrixFirstRowIndex(A);
+   HYPRE_Int             global_num_rows    = (HYPRE_Int) hypre_ParCSRMatrixGlobalNumRows(A);
+   HYPRE_Int             num_rows           = hypre_ParCSRMatrixNumRows(A);
+   HYPRE_MemoryLocation  memory_location    = hypre_ParCSRMatrixMemoryLocation(A);
+   HYPRE_MemoryLocation  ge_memory_location = hypre_ParAMGDataGEMemoryLocation(amg_data);
+
+   HYPRE_Real           *b_vec              = hypre_ParAMGDataBVec(amg_data);
+   hypre_ParVector      *f                  = hypre_ParAMGDataFArray(amg_data)[level];
+   HYPRE_Real           *f_data             = hypre_VectorData(hypre_ParVectorLocalVector(f));
+   HYPRE_Real           *f_data_h           = NULL;
+   HYPRE_Real           *b_data_h           = NULL;
+   hypre_Vector         *f_all              = NULL;
+
+   hypre_ParVector      *u                  = hypre_ParAMGDataUArray(amg_data)[level];
+   HYPRE_Real           *u_data             = hypre_VectorData(hypre_ParVectorLocalVector(u));
+   HYPRE_Real           *u_data_h           = NULL;
+   HYPRE_Real           *u_vec              = hypre_ParAMGDataUVec(amg_data);
+
+   /* Coarse solver data */
+   HYPRE_Int            *A_piv              = hypre_ParAMGDataAPiv(amg_data);
+   HYPRE_Real           *A_mat              = hypre_ParAMGDataAMat(amg_data);
+   HYPRE_Real           *A_work             = hypre_ParAMGDataAWork(amg_data);
+
+   /* Constants */
+   HYPRE_Int             one_i              = 1;
+   HYPRE_Real            one                = 1.0;
+   HYPRE_Real            zero               = 0.0;
+
+   /* Local variables */
+   MPI_Comm              new_comm           = hypre_ParAMGDataNewComm(amg_data);
+   HYPRE_Int            *comm_info          = hypre_ParAMGDataCommInfo(amg_data);
+   HYPRE_Int             global_size        = global_num_rows * global_num_rows;
+   HYPRE_Int             ierr               = 0;
+   HYPRE_Int            *displs, *info;
+   HYPRE_Int             new_num_procs;
+
 #ifdef HYPRE_PROFILE
    hypre_profile_times[HYPRE_TIMER_ID_GS_ELIM_SOLVE] -= hypre_MPI_Wtime();
 #endif
+   HYPRE_ANNOTATE_FUNC_BEGIN;
+   hypre_GpuProfilingPushRange("GESolve");
 
-   hypre_ParCSRMatrix *A = hypre_ParAMGDataAArray(amg_data)[level];
-   hypre_CSRMatrix *A_diag = hypre_ParCSRMatrixDiag(A);
-   HYPRE_Int n = hypre_CSRMatrixNumRows(A_diag);
-   HYPRE_Int error_flag = 0;
+   /*-----------------------------------------------------------------
+    *  Sanity checks
+    *-----------------------------------------------------------------*/
 
+   /* Call setup if not done before */
    if (hypre_ParAMGDataGSSetup(amg_data) == 0)
    {
-      hypre_GaussElimSetup(amg_data, level, relax_type);
+      hypre_GaussElimSetup(amg_data, level, solver_type);
    }
 
-   if (n)
+   /* Check for relaxation type */
+   if (solver_type != 9  && solver_type != 99 && solver_type != 199 &&
+       solver_type != 19 && solver_type != 98 && solver_type != 198)
    {
-      MPI_Comm new_comm = hypre_ParAMGDataNewComm(amg_data);
-      hypre_ParVector *f = hypre_ParAMGDataFArray(amg_data)[level];
-      hypre_ParVector *u = hypre_ParAMGDataUArray(amg_data)[level];
-      HYPRE_Real *b_vec  = hypre_ParAMGDataBVec(amg_data);
-      HYPRE_Real *f_data = hypre_VectorData(hypre_ParVectorLocalVector(f));
-      HYPRE_Real *u_data = hypre_VectorData(hypre_ParVectorLocalVector(u));
-      HYPRE_Int *comm_info = hypre_ParAMGDataCommInfo(amg_data);
-      HYPRE_Int *displs, *info;
-      HYPRE_Int n_global = (HYPRE_Int) hypre_ParCSRMatrixGlobalNumRows(A);
-      HYPRE_Int new_num_procs;
-      HYPRE_Int first_row_index = (HYPRE_Int) hypre_ParCSRMatrixFirstRowIndex(A);
-      HYPRE_Int one_i = 1;
-
-      hypre_MPI_Comm_size(new_comm, &new_num_procs);
-      info = &comm_info[0];
-      displs = &comm_info[new_num_procs];
-
-      HYPRE_Real *f_data_host, *u_data_host;
-
-      if (hypre_GetActualMemLocation(hypre_ParVectorMemoryLocation(f)) != hypre_MEMORY_HOST)
-      {
-         f_data_host = hypre_TAlloc(HYPRE_Real, n, HYPRE_MEMORY_HOST);
-
-         hypre_TMemcpy(f_data_host, f_data, HYPRE_Real, n, HYPRE_MEMORY_HOST, hypre_ParVectorMemoryLocation(f));
-      }
-      else
-      {
-         f_data_host = f_data;
-      }
-
-      if (hypre_GetActualMemLocation(hypre_ParVectorMemoryLocation(u)) != hypre_MEMORY_HOST)
-      {
-         u_data_host = hypre_TAlloc(HYPRE_Real, n, HYPRE_MEMORY_HOST);
-      }
-      else
-      {
-         u_data_host = u_data;
-      }
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Unsupported solver type!");
+      return hypre_error_flag;
+   }
 
-      hypre_MPI_Allgatherv (f_data_host, n, HYPRE_MPI_REAL, b_vec, info,
-                            displs, HYPRE_MPI_REAL, new_comm);
+   /* Check if we need to allocate a work space for setting the values of uvec/bvec */
+   if (hypre_GetActualMemLocation(ge_memory_location) != hypre_MEMORY_HOST)
+   {
+      b_data_h = hypre_TAlloc(HYPRE_Real, global_num_rows, HYPRE_MEMORY_HOST);
+      u_data_h = hypre_TAlloc(HYPRE_Real, global_num_rows, HYPRE_MEMORY_HOST);
+   }
+   else
+   {
+      b_data_h = b_vec;
+      u_data_h = u_vec;
+   }
 
-      if (f_data_host != f_data)
-      {
-         hypre_TFree(f_data_host, HYPRE_MEMORY_HOST);
-      }
+   /*-----------------------------------------------------------------
+    *  Gather RHS phase
+    *-----------------------------------------------------------------*/
 
-      if (relax_type == 9 || relax_type == 99)
+   if (solver_type == 9 || solver_type == 99 || solver_type == 199)
+   {
+      /* Exit if no rows in this rank */
+      if (!num_rows)
       {
-         HYPRE_Real *A_mat = hypre_ParAMGDataAMat(amg_data);
-         HYPRE_Real *A_tmp;
-         HYPRE_Int   i, my_info;
-
-         A_tmp = hypre_CTAlloc(HYPRE_Real, n_global*n_global, HYPRE_MEMORY_HOST);
-         for (i = 0; i < n_global*n_global; i++)
+         if (u_data_h != u_vec)
          {
-            A_tmp[i] = A_mat[i];
+            hypre_TFree(u_data_h, HYPRE_MEMORY_HOST);
          }
-
-         if (relax_type == 9)
+         if (b_data_h != b_vec)
          {
-            hypre_gselim(A_tmp, b_vec, n_global, error_flag);
+            hypre_TFree(b_data_h, HYPRE_MEMORY_HOST);
          }
-         else if (relax_type == 99) /* use pivoting */
-         {
-            HYPRE_Int *piv = hypre_CTAlloc(HYPRE_Int, n_global, HYPRE_MEMORY_HOST);
 
-            /* write over A with LU */
-            hypre_dgetrf(&n_global, &n_global, A_tmp, &n_global, piv, &my_info);
+         /* Finalize profiling */
+         hypre_GpuProfilingPopRange();
+         HYPRE_ANNOTATE_FUNC_END;
 
-            /* now b_vec = inv(A)*b_vec */
-            hypre_dgetrs("N", &n_global, &one_i, A_tmp, &n_global, piv, b_vec, &n_global, &my_info);
-
-            hypre_TFree(piv, HYPRE_MEMORY_HOST);
-         }
+         return hypre_error_flag;
+      }
 
-         for (i = 0; i < n; i++)
-         {
-            u_data_host[i] = b_vec[first_row_index+i];
-         }
+      hypre_MPI_Comm_size(new_comm, &new_num_procs);
+      info   = &comm_info[0];
+      displs = &comm_info[new_num_procs];
 
-         hypre_TFree(A_tmp, HYPRE_MEMORY_HOST);
+      if (hypre_GetActualMemLocation(hypre_ParVectorMemoryLocation(f)) != hypre_MEMORY_HOST)
+      {
+         f_data_h = hypre_TAlloc(HYPRE_Real, num_rows, HYPRE_MEMORY_HOST);
+         hypre_TMemcpy(f_data_h, f_data, HYPRE_Real, num_rows, HYPRE_MEMORY_HOST,
+                       hypre_ParVectorMemoryLocation(f));
       }
-      else if (relax_type == 199)
+      else
       {
-         HYPRE_Real *Ainv = hypre_ParAMGDataAInv(amg_data);
-
-         char cN = 'N';
-         HYPRE_Real one = 1.0, zero = 0.0;
-         hypre_dgemv(&cN, &n, &n_global, &one, Ainv, &n, b_vec, &one_i, &zero, u_data_host, &one_i);
+         f_data_h = f_data;
       }
 
-      if (u_data_host != u_data)
+      /* TODO (VPM): Add GPU-aware MPI support to buffers */
+      hypre_MPI_Allgatherv(f_data_h, num_rows, HYPRE_MPI_REAL, b_data_h,
+                           info, displs, HYPRE_MPI_REAL, new_comm);
+
+      if (f_data_h != f_data)
       {
-         hypre_TMemcpy(u_data, u_data_host, HYPRE_Real, n, hypre_ParVectorMemoryLocation(u), HYPRE_MEMORY_HOST);
-         hypre_TFree(u_data_host, HYPRE_MEMORY_HOST);
+         hypre_TFree(f_data_h, HYPRE_MEMORY_HOST);
       }
    }
-
-   if (error_flag)
+   else /* if (solver_type == 19 || solver_type == 98 || solver_type == 198) */
    {
-      hypre_error(HYPRE_ERROR_GENERIC);
+      f_all = hypre_ParVectorToVectorAll_v2(f, HYPRE_MEMORY_HOST);
    }
 
-#ifdef HYPRE_PROFILE
-   hypre_profile_times[HYPRE_TIMER_ID_GS_ELIM_SOLVE] += hypre_MPI_Wtime();
-#endif
-
-   return hypre_error_flag;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+   /* Complete the computation of bvec and free work space if needed */
+   if (f_all)
+   {
+      hypre_TMemcpy(b_vec, hypre_VectorData(f_all), HYPRE_Real, global_num_rows,
+                    ge_memory_location, HYPRE_MEMORY_HOST);
+   }
+   else
+   {
+      if (b_data_h != b_vec)
+      {
+         hypre_TMemcpy(b_vec, b_data_h, HYPRE_Real, global_num_rows,
+                       ge_memory_location, HYPRE_MEMORY_HOST);
+         hypre_TFree(b_data_h, HYPRE_MEMORY_HOST);
+      }
+   }
 
+   /* Exit if no rows in this rank */
+   if (!num_rows)
+   {
+      if (u_data_h != u_vec)
+      {
+         hypre_TFree(u_data_h, HYPRE_MEMORY_HOST);
+      }
+      if (b_data_h != b_vec)
+      {
+         hypre_TFree(b_data_h, HYPRE_MEMORY_HOST);
+      }
 
+      /* Finalize profiling */
+      hypre_GpuProfilingPopRange();
+      HYPRE_ANNOTATE_FUNC_END;
 
+      return hypre_error_flag;
+   }
 
-#if 0
-#include "HYPRE_config.h"
-#ifndef HYPRE_SEQUENTIAL
-#define HYPRE_SEQUENTIAL
-#endif
-#include "_hypre_utilities.h"
-#include "_hypre_blas.h"
+   /*-----------------------------------------------------------------
+    *  Gaussian elimination solve
+    *-----------------------------------------------------------------*/
 
 #if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+   HYPRE_ExecutionPolicy  exec = hypre_GetExecPolicy1(ge_memory_location);
 
-#define BLOCK_SIZE 512
-
-__global__ void
-hypreCUDAKernel_dgemv(HYPRE_Int   m,
-                      HYPRE_Int   n,
-                      HYPRE_Int   lda,
-                      HYPRE_Real *a,
-                      HYPRE_Real *x,
-                      HYPRE_Real *y)
-{
-   __shared__ HYPRE_Real sh_x[BLOCK_SIZE];
-
-   HYPRE_Int row = hypre_cuda_get_grid_thread_id<1,1>();
-   HYPRE_Int tid = hypre_cuda_get_thread_id<1>();
-
-   HYPRE_Real y_row = 0.0;
-
-   for (HYPRE_Int k = 0; k < n; k += BLOCK_SIZE)
+   if (exec == HYPRE_EXEC_DEVICE)
+   {
+      hypre_GaussElimSolveDevice(amg_data, level, solver_type);
+   }
+   else
+#endif
    {
-      if (k + tid < n)
+      if (solver_type == 9 || solver_type == 19)
       {
-         sh_x[tid] = read_only_load(&x[k+tid]);
-      }
+         /* Copy matrix to work space */
+         hypre_TMemcpy(A_work, A_mat, HYPRE_Real, global_size,
+                       HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
 
-      __syncthreads();
+         /* Run hypre's internal gaussian elimination */
+         hypre_gselim(A_work, b_vec, global_num_rows, ierr);
+         if (ierr != 0)
+         {
+            hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Problem with hypre_gselim!");
+         }
 
-      if (row < m)
+         hypre_TMemcpy(u_data, b_data_h + first_row_index, HYPRE_Real, num_rows,
+                       memory_location, HYPRE_MEMORY_HOST);
+      }
+      else if (solver_type == 98 || solver_type == 99)
       {
-#pragma unroll
-         for (HYPRE_Int j = 0; j < BLOCK_SIZE; j++)
+         /* Run LAPACK's triangular solver */
+         hypre_dgetrs("N", &global_num_rows, &one_i, A_mat,
+                      &global_num_rows, A_piv, b_vec,
+                      &global_num_rows, &ierr);
+         if (ierr != 0)
          {
-            const HYPRE_Int col = k + j;
-            if (col < n)
-            {
-               y_row += a[row + col*lda] * sh_x[j];
-            }
+            hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Problem with hypre_dgetrs!");
          }
+
+         hypre_TMemcpy(u_data, b_data_h + first_row_index, HYPRE_Real, num_rows,
+                       memory_location, HYPRE_MEMORY_HOST);
       }
+      else /* if (solver_type == 198 || solver_type == 199) */
+      {
+         hypre_dgemv("N", &global_num_rows, &global_num_rows, &one,
+                     A_mat, &global_num_rows, b_vec, &one_i, &zero,
+                     u_data_h, &one_i);
 
-      __syncthreads();
+         hypre_TMemcpy(u_data, u_data_h + first_row_index, HYPRE_Real, num_rows,
+                       memory_location, HYPRE_MEMORY_HOST);
+      }
    }
 
-   if (row < m)
+   /* Free memory - TODO (VPM): do we need to create and destroy f_all at every solve call? */
+   hypre_SeqVectorDestroy(f_all);
+   if (u_data_h != u_vec)
    {
-      y[row] = y_row;
+      hypre_TFree(u_data_h, HYPRE_MEMORY_HOST);
+   }
+   if (b_data_h != b_vec)
+   {
+      hypre_TFree(b_data_h, HYPRE_MEMORY_HOST);
    }
-}
-
-HYPRE_Int hypre_dgemv_device(HYPRE_Int m, HYPRE_Int n, HYPRE_Int lda, HYPRE_Real *a, HYPRE_Real *x, HYPRE_Real *y)
-{
-   dim3 bDim(BLOCK_SIZE, 1, 1);
-   dim3 gDim = hypre_GetDefaultCUDAGridDimension(m, "thread", bDim);
 
-   HYPRE_CUDA_LAUNCH( hypreCUDAKernel_dgemv, gDim, bDim, m, n, lda, a, x, y );
+   /* Finalize profiling */
+   hypre_GpuProfilingPopRange();
+   HYPRE_ANNOTATE_FUNC_END;
+#ifdef HYPRE_PROFILE
+   hypre_profile_times[HYPRE_TIMER_ID_GS_ELIM_SOLVE] += hypre_MPI_Wtime();
+#endif
 
    return hypre_error_flag;
 }
-
-#endif // defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-#endif
diff --git a/external/hypre/src/parcsr_ls/par_ge_device.c b/external/hypre/src/parcsr_ls/par_ge_device.c
new file mode 100644
index 00000000..9527a2d3
--- /dev/null
+++ b/external/hypre/src/parcsr_ls/par_ge_device.c
@@ -0,0 +1,356 @@
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+#include "_hypre_parcsr_ls.h"
+#include "_hypre_utilities.hpp"
+
+#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+
+/*--------------------------------------------------------------------------
+ * hypre_GaussElimSetupDevice
+ *
+ * Gaussian elimination setup routine on the device. This uses MAGMA by
+ * default or any of the vendor math libraries (cuBLAS, rocSOLVER) when
+ * MAGMA is not available.
+ *
+ * See hypre_GaussElimSetup for more info.
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_GaussElimSetupDevice(hypre_ParAMGData *amg_data,
+                           HYPRE_Int         level,
+                           HYPRE_Int         solver_type)
+{
+   /* Input data */
+   hypre_ParCSRMatrix  *par_A           = hypre_ParAMGDataAArray(amg_data)[level];
+   HYPRE_Int            global_num_rows = (HYPRE_Int) hypre_ParCSRMatrixGlobalNumRows(par_A);
+   HYPRE_Int            num_rows        = hypre_ParCSRMatrixNumRows(par_A);
+   HYPRE_Int           *A_piv           = hypre_ParAMGDataAPiv(amg_data);
+   HYPRE_Real          *A_mat           = hypre_ParAMGDataAMat(amg_data);
+   HYPRE_Real          *A_work          = hypre_ParAMGDataAWork(amg_data);
+   HYPRE_Int            global_size     = global_num_rows * global_num_rows;
+
+   /* Local variables */
+   HYPRE_Int            buffer_size     = 0;
+   HYPRE_Int            ierr            = 0;
+   HYPRE_Int           *d_ierr          = NULL;
+   char                 msg[1024];
+
+   /* Sanity checks */
+   if (!num_rows || !global_size)
+   {
+      return hypre_error_flag;
+   }
+
+   if (global_size < 0)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Detected overflow!");
+      return hypre_error_flag;
+   }
+
+   /*-----------------------------------------------------------------
+    *  Compute the factorization A = L*U
+    *-----------------------------------------------------------------*/
+
+#if defined(HYPRE_USING_MAGMA)
+   HYPRE_MAGMA_CALL(hypre_magma_getrf_nat(global_num_rows,
+                                          global_num_rows,
+                                          A_mat,
+                                          global_num_rows,
+                                          A_piv,
+                                          &ierr));
+
+#elif defined(HYPRE_USING_CUSOLVER)
+   /* Allocate space for device error code */
+   d_ierr = hypre_CTAlloc(HYPRE_Int, 1, HYPRE_MEMORY_DEVICE);
+
+   /* Compute buffer size */
+   HYPRE_CUSOLVER_CALL(hypre_cusolver_dngetrf_bs(hypre_HandleVendorSolverHandle(hypre_handle()),
+                                                 global_num_rows,
+                                                 global_num_rows,
+                                                 A_mat,
+                                                 global_num_rows,
+                                                 &buffer_size));
+
+   /* We use A_work as workspace */
+   if (buffer_size > global_size)
+   {
+      A_work = hypre_TReAlloc_v2(A_work, HYPRE_Real, global_size, HYPRE_Real, buffer_size,
+                                 HYPRE_MEMORY_DEVICE);
+      hypre_ParAMGDataAWork(amg_data) = A_work;
+   }
+
+   /* Factorize */
+   HYPRE_CUSOLVER_CALL(hypre_cusolver_dngetrf(hypre_HandleVendorSolverHandle(hypre_handle()),
+                                              global_num_rows,
+                                              global_num_rows,
+                                              A_mat,
+                                              global_num_rows,
+                                              A_work,
+                                              A_piv,
+                                              d_ierr));
+
+   /* Move error code to host */
+   hypre_TMemcpy(&ierr, d_ierr, HYPRE_Int, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
+
+#elif defined(HYPRE_USING_ROCSOLVER)
+
+   /**************
+    * TODO (VPM) *
+    **************/
+   HYPRE_UNUSED_VAR(A_piv);
+   HYPRE_UNUSED_VAR(A_mat);
+   HYPRE_UNUSED_VAR(A_work);
+   HYPRE_UNUSED_VAR(buffer_size);
+
+#else
+   /* Silence declared but never referenced warnings */
+   (A_piv  += 0);
+   (A_mat  += 0);
+   (A_work += 0);
+   (buffer_size *= 1);
+
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                     "Missing dependency library for running gaussian elimination!");
+#endif
+
+   /* Free memory */
+   hypre_TFree(d_ierr, HYPRE_MEMORY_DEVICE);
+
+   if (ierr < 0)
+   {
+      hypre_sprintf(msg, "Problem with getrf's %d-th input argument", -ierr);
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, msg);
+      return hypre_error_flag;
+   }
+   else if (ierr > 0)
+   {
+      hypre_sprintf(msg, "Found that U(%d, %d) = 0", ierr, ierr);
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, msg);
+      return hypre_error_flag;
+   }
+
+   /*-----------------------------------------------------------------
+    *  Compute the explicit inverse: A^{-1} = inv(A)
+    *-----------------------------------------------------------------*/
+
+   if (solver_type == 198 || solver_type == 199)
+   {
+#if defined(HYPRE_USING_MAGMA)
+      /* Determine workspace size */
+      buffer_size = global_num_rows * hypre_magma_getri_nb(global_num_rows);
+
+      /* We use A_work as workspace */
+      if (buffer_size > global_size)
+      {
+         A_work = hypre_TReAlloc_v2(A_work, HYPRE_Real, global_size, HYPRE_Real, buffer_size,
+                                    HYPRE_MEMORY_DEVICE);
+         hypre_ParAMGDataAWork(amg_data) = A_work;
+      }
+
+      HYPRE_MAGMA_CALL(hypre_magma_getri_gpu(global_num_rows,
+                                             A_mat,
+                                             global_num_rows,
+                                             A_piv,
+                                             A_work,
+                                             buffer_size,
+                                             &ierr));
+
+#elif defined(HYPRE_USING_CUSOLVER)
+      /* Allocate space for device error code */
+      d_ierr = hypre_CTAlloc(HYPRE_Int, 1, HYPRE_MEMORY_DEVICE);
+
+      /* Create identity dense matrix */
+      hypre_Memset((void*) A_work, 0,
+                   (size_t) global_size * sizeof(HYPRE_Real),
+                   HYPRE_MEMORY_DEVICE);
+      HYPRE_THRUST_CALL(for_each,
+                        thrust::make_counting_iterator(0),
+                        thrust::make_counting_iterator(global_num_rows),
+                        hypreFunctor_DenseMatrixIdentity(global_num_rows, A_work));
+
+      /* Compute inverse */
+      HYPRE_CUSOLVER_CALL(hypre_cusolver_dngetrs(hypre_HandleVendorSolverHandle(hypre_handle()),
+                                                 CUBLAS_OP_N,
+                                                 global_num_rows,
+                                                 global_num_rows,
+                                                 A_mat,
+                                                 global_num_rows,
+                                                 A_piv,
+                                                 A_work,
+                                                 global_num_rows,
+                                                 d_ierr));
+
+      /* Store the inverse in A_mat */
+      hypre_TMemcpy(A_mat, A_work, HYPRE_Real, global_size,
+                    HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+
+      /* Free memory */
+      hypre_TFree(d_ierr, HYPRE_MEMORY_DEVICE);
+
+#elif defined(HYPRE_USING_ROCSOLVER)
+
+      /**************
+       * TODO (VPM) *
+       **************/
+
+#else
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                        "Missing dependency library for running gaussian elimination!");
+#endif
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_GaussElimSolveDevice
+ *
+ * Gaussian elimination solve routine on the device.
+ *
+ * See hypre_GaussElimSolve and hypre_GaussElimSetupDevice for more info.
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_GaussElimSolveDevice(hypre_ParAMGData *amg_data,
+                           HYPRE_Int         level,
+                           HYPRE_Int         solver_type)
+{
+   /* Input variables */
+   hypre_ParCSRMatrix   *A                  = hypre_ParAMGDataAArray(amg_data)[level];
+   HYPRE_Int             global_num_rows    = (HYPRE_Int) hypre_ParCSRMatrixGlobalNumRows(A);
+   HYPRE_Int             first_row_index    = (HYPRE_Int) hypre_ParCSRMatrixFirstRowIndex(A);
+   HYPRE_Int             num_rows           = hypre_ParCSRMatrixNumRows(A);
+   HYPRE_MemoryLocation  memory_location    = hypre_ParCSRMatrixMemoryLocation(A);
+   HYPRE_MemoryLocation  ge_memory_location = hypre_ParAMGDataGEMemoryLocation(amg_data);
+
+   hypre_ParVector      *par_u              = hypre_ParAMGDataUArray(amg_data)[level];
+   HYPRE_Real           *u_data             = hypre_VectorData(hypre_ParVectorLocalVector(par_u));
+
+   HYPRE_Real           *b_vec              = hypre_ParAMGDataBVec(amg_data);
+   HYPRE_Real           *u_vec              = hypre_ParAMGDataUVec(amg_data);
+   HYPRE_Real           *A_mat              = hypre_ParAMGDataAMat(amg_data);
+   HYPRE_Int            *A_piv              = hypre_ParAMGDataAPiv(amg_data);
+
+   /* Local variables */
+   HYPRE_Real           *work;
+   HYPRE_Int            *d_ierr = NULL;
+   HYPRE_Int             ierr   = 0;
+   HYPRE_Int             i_one  = 1;
+   HYPRE_Complex         d_one  = 1.0;
+   HYPRE_Complex         zero   = 0.0;
+   char                  msg[1024];
+
+   /* Sanity check */
+   if (!num_rows || !global_num_rows)
+   {
+      return hypre_error_flag;
+   }
+
+#if defined(HYPRE_USING_MAGMA)
+   if (solver_type == 98 || solver_type == 99)
+   {
+      HYPRE_MAGMA_CALL(hypre_magma_getrs_gpu(MagmaNoTrans,
+                                             global_num_rows,
+                                             i_one,
+                                             A_mat,
+                                             global_num_rows,
+                                             A_piv,
+                                             b_vec,
+                                             global_num_rows,
+                                             &ierr));
+   }
+   else if (solver_type == 198 || solver_type == 199)
+   {
+      HYPRE_MAGMA_VCALL(hypre_magma_gemv(MagmaNoTrans,
+                                         global_num_rows,
+                                         global_num_rows,
+                                         d_one,
+                                         A_mat,
+                                         global_num_rows,
+                                         b_vec,
+                                         i_one,
+                                         zero,
+                                         u_vec,
+                                         i_one,
+                                         hypre_HandleMagmaQueue(hypre_handle())));
+   }
+
+#elif defined(HYPRE_USING_CUSOLVER) && defined(HYPRE_USING_CUBLAS)
+   if (solver_type == 98 || solver_type == 99)
+   {
+      d_ierr = hypre_CTAlloc(HYPRE_Int, 1, HYPRE_MEMORY_DEVICE);
+      HYPRE_CUSOLVER_CALL(hypre_cusolver_dngetrs(hypre_HandleVendorSolverHandle(hypre_handle()),
+                                                 CUBLAS_OP_N,
+                                                 global_num_rows,
+                                                 d_one,
+                                                 A_mat,
+                                                 global_num_rows,
+                                                 A_piv,
+                                                 b_vec,
+                                                 global_num_rows,
+                                                 d_ierr));
+      hypre_TMemcpy(&ierr, d_ierr, HYPRE_Int, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
+   }
+   else if (solver_type == 198 || solver_type == 199)
+   {
+      HYPRE_CUBLAS_CALL(hypre_cublas_gemv(hypre_HandleCublasHandle(hypre_handle()),
+                                          CUBLAS_OP_N,
+                                          global_num_rows,
+                                          global_num_rows,
+                                          &d_one,
+                                          A_mat,
+                                          global_num_rows,
+                                          b_vec,
+                                          i_one,
+                                          &zero,
+                                          u_vec,
+                                          i_one));
+   }
+#elif defined(HYPRE_USING_ROCSOLVER)
+
+   /**************
+    * TODO (VPM) *
+    **************/
+   HYPRE_UNUSED_VAR(A_piv);
+   HYPRE_UNUSED_VAR(A_mat);
+   HYPRE_UNUSED_VAR(i_one);
+   HYPRE_UNUSED_VAR(d_one);
+   HYPRE_UNUSED_VAR(zero);
+
+#else
+   /* Silence declared but never referenced warnings */
+   (A_mat += 0);
+   (A_piv += 0);
+   (i_one *= 1);
+   (d_one *= 1.0);
+   (zero  *= zero);
+
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                     "Missing dependency library for running gaussian elimination!");
+#endif
+
+   /* Check error code */
+   if (ierr < 0)
+   {
+      hypre_sprintf(msg, "Problem with getrs' %d-th input argument", -ierr);
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, msg);
+      return hypre_error_flag;
+   }
+
+   /* Copy solution vector to proper variable */
+   work = (solver_type == 198 || solver_type == 199) ? u_vec : b_vec;
+   hypre_TMemcpy(u_data, work + first_row_index, HYPRE_Complex, num_rows,
+                 memory_location, ge_memory_location);
+
+   /* Free memory */
+   hypre_TFree(d_ierr, HYPRE_MEMORY_DEVICE);
+
+   return hypre_error_flag;
+}
+
+#endif /* if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP) */
diff --git a/external/hypre/src/parcsr_ls/par_gsmg.c b/external/hypre/src/parcsr_ls/par_gsmg.c
index 18e77e9a..1c40dc14 100644
--- a/external/hypre/src/parcsr_ls/par_gsmg.c
+++ b/external/hypre/src/parcsr_ls/par_gsmg.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -28,20 +28,24 @@
 
 static HYPRE_Real mydnrm2(HYPRE_Int n, HYPRE_Real *x)
 {
-    HYPRE_Real temp = 0.;
-    HYPRE_Int i;
+   HYPRE_Real temp = 0.;
+   HYPRE_Int i;
 
-    for (i=0; i<n; i++)
-        temp = temp + x[i]*x[i];
-    return sqrt(temp);
+   for (i = 0; i < n; i++)
+   {
+      temp = temp + x[i] * x[i];
+   }
+   return hypre_sqrt(temp);
 }
 
 static void mydscal(HYPRE_Int n, HYPRE_Real a, HYPRE_Real *x)
 {
-    HYPRE_Int i;
+   HYPRE_Int i;
 
-    for (i=0; i<n; i++)
-        x[i] = a * x[i];
+   for (i = 0; i < n; i++)
+   {
+      x[i] = a * x[i];
+   }
 }
 
 /*--------------------------------------------------------------------------
@@ -52,8 +56,8 @@ static void mydscal(HYPRE_Int n, HYPRE_Real a, HYPRE_Real *x)
 
 HYPRE_Int
 hypre_ParCSRMatrixFillSmooth(HYPRE_Int nsamples, HYPRE_Real *samples,
-  hypre_ParCSRMatrix *S, hypre_ParCSRMatrix *A,
-  HYPRE_Int num_functions, HYPRE_Int *dof_func)
+                             hypre_ParCSRMatrix *S, hypre_ParCSRMatrix *A,
+                             HYPRE_Int num_functions, HYPRE_Int *dof_func)
 {
    hypre_ParCSRCommPkg     *comm_pkg = hypre_ParCSRMatrixCommPkg(A);
    hypre_ParCSRCommHandle  *comm_handle;
@@ -74,7 +78,7 @@ hypre_ParCSRMatrixFillSmooth(HYPRE_Int nsamples, HYPRE_Real *samples,
    HYPRE_Int i, j, k, ii, index, start;
    HYPRE_Int num_cols_offd;
    HYPRE_Int num_sends;
-   HYPRE_Int *dof_func_offd;
+   HYPRE_Int *dof_func_offd = NULL;
    HYPRE_Int *int_buf_data;
    HYPRE_Real temp;
    HYPRE_Real *p;
@@ -87,18 +91,18 @@ hypre_ParCSRMatrixFillSmooth(HYPRE_Int nsamples, HYPRE_Real *samples,
 #endif
 
    /* normalize each sample vector and divide by number of samples */
-   for (k=0; k<nsamples; k++)
+   for (k = 0; k < nsamples; k++)
    {
-       nm = mydnrm2(n, samples+k*n);
-       nm = 1./nm/nsamples;
-       mydscal(n, nm, samples+k*n);
+      nm = mydnrm2(n, samples + k * n);
+      nm = 1. / nm / nsamples;
+      mydscal(n, nm, samples + k * n);
    }
 
    num_cols_offd = hypre_CSRMatrixNumCols(S_offd);
    num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
    buf_data = hypre_CTAlloc(HYPRE_Real, hypre_ParCSRCommPkgSendMapStart(comm_pkg,
-                                                num_sends), HYPRE_MEMORY_HOST);
-   p_offd = hypre_CTAlloc(HYPRE_Real,  nsamples*num_cols_offd, HYPRE_MEMORY_HOST);
+                                                                        num_sends), HYPRE_MEMORY_HOST);
+   p_offd = hypre_CTAlloc(HYPRE_Real,  nsamples * num_cols_offd, HYPRE_MEMORY_HOST);
    p_ptr = p_offd;
 
    p = samples;
@@ -108,17 +112,17 @@ hypre_ParCSRMatrixFillSmooth(HYPRE_Int nsamples, HYPRE_Real *samples,
       for (i = 0; i < num_sends; i++)
       {
          start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-         for (j=start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
-                buf_data[index++]
-                 = p[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
+            buf_data[index++]
+               = p[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
       }
 
       comm_handle = hypre_ParCSRCommHandleCreate( 1, comm_pkg, buf_data,
-        p_offd);
+                                                  p_offd);
 
       hypre_ParCSRCommHandleDestroy(comm_handle);
-      p = p+n;
-      p_offd = p_offd+num_cols_offd;
+      p = p + n;
+      p_offd = p_offd + num_cols_offd;
    }
 
    hypre_TFree(buf_data, HYPRE_MEMORY_HOST);
@@ -127,18 +131,18 @@ hypre_ParCSRMatrixFillSmooth(HYPRE_Int nsamples, HYPRE_Real *samples,
    {
       dof_func_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_offd, HYPRE_MEMORY_HOST);
       int_buf_data = hypre_CTAlloc(HYPRE_Int, hypre_ParCSRCommPkgSendMapStart(comm_pkg,
-                                                num_sends), HYPRE_MEMORY_HOST);
+                                                                              num_sends), HYPRE_MEMORY_HOST);
       index = 0;
       for (i = 0; i < num_sends; i++)
       {
          start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-         for (j=start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
-                int_buf_data[index++]
-                 = dof_func[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
+            int_buf_data[index++]
+               = dof_func[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
       }
 
       comm_handle = hypre_ParCSRCommHandleCreate( 11, comm_pkg, int_buf_data,
-        dof_func_offd);
+                                                  dof_func_offd);
 
       hypre_ParCSRCommHandleDestroy(comm_handle);
       hypre_TFree(int_buf_data, HYPRE_MEMORY_HOST);
@@ -146,98 +150,100 @@ hypre_ParCSRMatrixFillSmooth(HYPRE_Int nsamples, HYPRE_Real *samples,
 
    for (i = 0; i < n; i++)
    {
-       for (j = S_diag_i[i]+1; j < S_diag_i[i+1]; j++)
-       {
-           ii = S_diag_j[j];
-
-           /* only interpolate between like functions */
-           if (num_functions > 1 && dof_func[i] != dof_func[ii])
-           {
-               S_diag_data[j] = 0.;
-               continue;
-           }
-
-           /* explicit zeros */
-           if (A_diag_data[j] == 0.)
-           {
-               S_diag_data[j] = 0.;
-               continue;
-           }
-
-           temp = 0.;
-           p = samples;
-           for (k=0; k<nsamples; k++)
-           {
-               temp = temp + ABS(p[i] - p[ii]);
-               p = p + n;
-           }
-
-           /* explicit zeros in matrix may cause this */
-           if (temp == 0.)
-           {
-               S_diag_data[j] = 0.;
-               continue;
-           }
-
-           temp = 1./temp; /* reciprocal */
+      for (j = S_diag_i[i] + 1; j < S_diag_i[i + 1]; j++)
+      {
+         ii = S_diag_j[j];
+
+         /* only interpolate between like functions */
+         if (num_functions > 1 && dof_func[i] != dof_func[ii])
+         {
+            S_diag_data[j] = 0.;
+            continue;
+         }
+
+         /* explicit zeros */
+         if (A_diag_data[j] == 0.)
+         {
+            S_diag_data[j] = 0.;
+            continue;
+         }
+
+         temp = 0.;
+         p = samples;
+         for (k = 0; k < nsamples; k++)
+         {
+            temp = temp + ABS(p[i] - p[ii]);
+            p = p + n;
+         }
+
+         /* explicit zeros in matrix may cause this */
+         if (temp == 0.)
+         {
+            S_diag_data[j] = 0.;
+            continue;
+         }
+
+         temp = 1. / temp; /* reciprocal */
 #if 0
-           my = hypre_min(my,temp);
-           mx = hypre_max(mx,temp);
+         my = hypre_min(my, temp);
+         mx = hypre_max(mx, temp);
 #endif
-           S_diag_data[j] = temp;
-       }
-
-       for (j = S_offd_i[i]; j < S_offd_i[i+1]; j++)
-       {
-           ii = S_offd_j[j];
-
-           /* only interpolate between like functions */
-           if (num_functions > 1 && dof_func[i] != dof_func_offd[ii])
-           {
-               S_offd_data[j] = 0.;
-               continue;
-           }
-
-           /* explicit zeros */
-           if (A_offd_data[j] == 0.)
-           {
-               S_offd_data[j] = 0.;
-               continue;
-           }
-
-           temp = 0.;
-           p = samples;
-           p_offd = p_ptr;
-           for (k=0; k<nsamples; k++)
-           {
-               temp = temp + ABS(p[i] - p_offd[ii]);
-               p = p + n;
-               p_offd = p_offd + num_cols_offd;
-           }
-
-           /* explicit zeros in matrix may cause this */
-           if (temp == 0.)
-           {
-               S_offd_data[j] = 0.;
-               continue;
-           }
-
-           temp = 1./temp; /* reciprocal */
+         S_diag_data[j] = temp;
+      }
+
+      for (j = S_offd_i[i]; j < S_offd_i[i + 1]; j++)
+      {
+         ii = S_offd_j[j];
+
+         /* only interpolate between like functions */
+         if (num_functions > 1 && dof_func[i] != dof_func_offd[ii])
+         {
+            S_offd_data[j] = 0.;
+            continue;
+         }
+
+         /* explicit zeros */
+         if (A_offd_data[j] == 0.)
+         {
+            S_offd_data[j] = 0.;
+            continue;
+         }
+
+         temp = 0.;
+         p = samples;
+         p_offd = p_ptr;
+         for (k = 0; k < nsamples; k++)
+         {
+            temp = temp + ABS(p[i] - p_offd[ii]);
+            p = p + n;
+            p_offd = p_offd + num_cols_offd;
+         }
+
+         /* explicit zeros in matrix may cause this */
+         if (temp == 0.)
+         {
+            S_offd_data[j] = 0.;
+            continue;
+         }
+
+         temp = 1. / temp; /* reciprocal */
 #if 0
-           my = hypre_min(my,temp);
-           mx = hypre_max(mx,temp);
+         my = hypre_min(my, temp);
+         mx = hypre_max(mx, temp);
 #endif
-           S_offd_data[j] = temp;
-       }
+         S_offd_data[j] = temp;
+      }
    }
 
 #if 0
-      hypre_printf("MIN, MAX: %f %f\n", my, mx);
+   hypre_printf("MIN, MAX: %f %f\n", my, mx);
 #endif
 
    hypre_TFree(p_ptr, HYPRE_MEMORY_HOST);
    if (num_functions > 1)
+   {
       hypre_TFree(dof_func_offd, HYPRE_MEMORY_HOST);
+   }
 
    return 0;
 }
@@ -262,16 +268,22 @@ hypre_ParCSRMatrixChooseThresh(hypre_ParCSRMatrix *S)
    HYPRE_Real mx, minimax = 1.e+10;
    HYPRE_Real minmin;
 
-   for (i=0; i<n; i++)
+   for (i = 0; i < n; i++)
    {
       mx = 0.;
-      for (j=S_diag_i[i]; j<S_diag_i[i+1]; j++)
+      for (j = S_diag_i[i]; j < S_diag_i[i + 1]; j++)
+      {
          mx = hypre_max(mx, S_diag_data[j]);
-      for (j=S_offd_i[i]; j<S_offd_i[i+1]; j++)
+      }
+      for (j = S_offd_i[i]; j < S_offd_i[i + 1]; j++)
+      {
          mx = hypre_max(mx, S_offd_data[j]);
+      }
 
       if (mx != 0.)
+      {
          minimax = hypre_min(minimax, mx);
+      }
    }
 
    hypre_MPI_Allreduce(&minimax, &minmin, 1, HYPRE_MPI_REAL, hypre_MPI_MIN, comm);
@@ -312,12 +324,14 @@ hypre_ParCSRMatrixThreshold(hypre_ParCSRMatrix *A, HYPRE_Real thresh)
 
    /* first count the number of nonzeros we will need */
    count = 0;
-   for (i=0; i<num_nonzeros_diag; i++)
-       if (A_diag_data[i] >= thresh)
-           count++;
+   for (i = 0; i < num_nonzeros_diag; i++)
+      if (A_diag_data[i] >= thresh)
+      {
+         count++;
+      }
 
    /* allocate vectors */
-   S_diag_i = hypre_CTAlloc(HYPRE_Int,  n+1, HYPRE_MEMORY_HOST);
+   S_diag_i = hypre_CTAlloc(HYPRE_Int,  n + 1, HYPRE_MEMORY_HOST);
    S_diag_j = hypre_CTAlloc(HYPRE_Int,  count, HYPRE_MEMORY_HOST);
    S_diag_data = hypre_CTAlloc(HYPRE_Real,  count, HYPRE_MEMORY_HOST);
 
@@ -325,7 +339,7 @@ hypre_ParCSRMatrixThreshold(hypre_ParCSRMatrix *A, HYPRE_Real thresh)
    for (i = 0; i < n; i++)
    {
       S_diag_i[i] = jS;
-      for (jA = A_diag_i[i]; jA < A_diag_i[i+1]; jA++)
+      for (jA = A_diag_i[i]; jA < A_diag_i[i + 1]; jA++)
       {
          if (A_diag_data[jA] >= thresh)
          {
@@ -354,12 +368,14 @@ hypre_ParCSRMatrixThreshold(hypre_ParCSRMatrix *A, HYPRE_Real thresh)
 
    /* first count the number of nonzeros we will need */
    count = 0;
-   for (i=0; i<num_nonzeros_offd; i++)
-       if (A_offd_data[i] >= thresh)
-           count++;
+   for (i = 0; i < num_nonzeros_offd; i++)
+      if (A_offd_data[i] >= thresh)
+      {
+         count++;
+      }
 
    /* allocate vectors */
-   S_offd_i = hypre_CTAlloc(HYPRE_Int,  n+1, HYPRE_MEMORY_HOST);
+   S_offd_i = hypre_CTAlloc(HYPRE_Int,  n + 1, HYPRE_MEMORY_HOST);
    S_offd_j = hypre_CTAlloc(HYPRE_Int,  count, HYPRE_MEMORY_HOST);
    S_offd_data = hypre_CTAlloc(HYPRE_Real,  count, HYPRE_MEMORY_HOST);
 
@@ -367,7 +383,7 @@ hypre_ParCSRMatrixThreshold(hypre_ParCSRMatrix *A, HYPRE_Real thresh)
    for (i = 0; i < n; i++)
    {
       S_offd_i[i] = jS;
-      for (jA = A_offd_i[i]; jA < A_offd_i[i+1]; jA++)
+      for (jA = A_offd_i[i]; jA < A_offd_i[i + 1]; jA++)
       {
          if (A_offd_data[jA] >= thresh)
          {
@@ -400,10 +416,10 @@ hypre_ParCSRMatrixThreshold(hypre_ParCSRMatrix *A, HYPRE_Real thresh)
 
 HYPRE_Int
 hypre_BoomerAMGCreateSmoothVecs(void         *data,
-                       hypre_ParCSRMatrix    *A,
-                       HYPRE_Int                    num_sweeps,
-                       HYPRE_Int                    level,
-                       HYPRE_Real           **SmoothVecs_p)
+                                hypre_ParCSRMatrix    *A,
+                                HYPRE_Int                    num_sweeps,
+                                HYPRE_Int                    level,
+                                HYPRE_Real           **SmoothVecs_p)
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
@@ -432,7 +448,7 @@ hypre_BoomerAMGCreateSmoothVecs(void         *data,
    HYPRE_Int smooth_type;
    HYPRE_Int smooth_option = 0;
    HYPRE_Int smooth_num_levels;
-   HYPRE_Solver *smoother;
+   HYPRE_Solver *smoother = NULL;
 
    HYPRE_Int debug_flag = hypre_ParAMGDataDebugFlag(amg_data);
    HYPRE_Int num_threads;
@@ -448,7 +464,7 @@ hypre_BoomerAMGCreateSmoothVecs(void         *data,
 
    if (debug_flag >= 1)
       hypre_printf("Creating smooth dirs, %d sweeps, %d samples\n", num_sweeps,
-            nsamples);
+                   nsamples);
 
    smooth_type = hypre_ParAMGDataSmoothType(amg_data);
    smooth_num_levels = hypre_ParAMGDataSmoothNumLevels(amg_data);
@@ -467,14 +483,18 @@ hypre_BoomerAMGCreateSmoothVecs(void         *data,
    Zero = hypre_ParVectorCreate(comm, n, starts);
    hypre_ParVectorInitialize(Zero);
    datax = hypre_VectorData(hypre_ParVectorLocalVector(Zero));
-   for (i=0; i<n_local; i++)
+   for (i = 0; i < n_local; i++)
+   {
       datax[i] = 0.;
+   }
 
    Temp = hypre_ParVectorCreate(comm, n, starts);
    hypre_ParVectorInitialize(Temp);
    datax = hypre_VectorData(hypre_ParVectorLocalVector(Temp));
-   for (i=0; i<n_local; i++)
+   for (i = 0; i < n_local; i++)
+   {
       datax[i] = 0.;
+   }
 
    U = hypre_ParVectorCreate(comm, n, starts);
    hypre_ParVectorInitialize(U);
@@ -487,44 +507,50 @@ hypre_BoomerAMGCreateSmoothVecs(void         *data,
    }
 
    /* allocate space for the vectors */
-   bp = hypre_CTAlloc(HYPRE_Real,  nsamples*n_local, HYPRE_MEMORY_HOST);
+   bp = hypre_CTAlloc(HYPRE_Real,  nsamples * n_local, HYPRE_MEMORY_HOST);
    p = bp;
 
    /* generate random vectors */
-   for (sample=0; sample<nsamples; sample++)
+   for (sample = 0; sample < nsamples; sample++)
    {
-      for (i=0; i<n_local; i++)
+      for (i = 0; i < n_local; i++)
+      {
          datax[i] = hypre_Rand() - .5;
+      }
 
-      for (i=0; i<num_sweeps; i++)
+      for (i = 0; i < num_sweeps; i++)
       {
-         if (smooth_option == 6)
+         if ((smooth_num_levels > level) && (smooth_option == 6))
          {
             HYPRE_SchwarzSolve(smoother[level],
-                  (HYPRE_ParCSRMatrix) A,
-                  (HYPRE_ParVector) Zero,
-                  (HYPRE_ParVector) U);
+                               (HYPRE_ParCSRMatrix) A,
+                               (HYPRE_ParVector) Zero,
+                               (HYPRE_ParVector) U);
          }
          else
          {
             ret = hypre_BoomerAMGRelax(A, Zero, NULL /*CFmarker*/,
-                  rlx_type , 0 /*rel pts*/, 1.0 /*weight*/,
-                  1.0 /*omega*/, NULL, U, Temp,
-                  Qtemp);
+                                       rlx_type, 0 /*rel pts*/, 1.0 /*weight*/,
+                                       1.0 /*omega*/, NULL, U, Temp,
+                                       Qtemp);
             hypre_assert(ret == 0);
          }
       }
 
       /* copy out the solution */
-      for (i=0; i<n_local; i++)
+      for (i = 0; i < n_local; i++)
+      {
          *p++ = datax[i];
+      }
    }
 
    hypre_ParVectorDestroy(Zero);
    hypre_ParVectorDestroy(Temp);
    hypre_ParVectorDestroy(U);
    if (num_threads > 1)
+   {
       hypre_ParVectorDestroy(Qtemp);
+   }
 
    *SmoothVecs_p = bp;
 
@@ -539,12 +565,12 @@ hypre_BoomerAMGCreateSmoothVecs(void         *data,
 
 HYPRE_Int
 hypre_BoomerAMGCreateSmoothDirs(void         *data,
-                       hypre_ParCSRMatrix    *A,
-                       HYPRE_Real            *SmoothVecs,
-                       HYPRE_Real             thresh,
-                       HYPRE_Int                    num_functions,
-                       HYPRE_Int                   *dof_func,
-                       hypre_ParCSRMatrix   **S_ptr)
+                                hypre_ParCSRMatrix    *A,
+                                HYPRE_Real            *SmoothVecs,
+                                HYPRE_Real             thresh,
+                                HYPRE_Int                    num_functions,
+                                HYPRE_Int                   *dof_func,
+                                hypre_ParCSRMatrix   **S_ptr)
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
    hypre_ParCSRMatrix *S;
@@ -555,15 +581,17 @@ hypre_BoomerAMGCreateSmoothDirs(void         *data,
 
    /* Traverse S and fill in differences */
    hypre_ParCSRMatrixFillSmooth(
-       hypre_ParAMGDataNumSamples(amg_data), SmoothVecs,
-       S, A, num_functions, dof_func);
+      hypre_ParAMGDataNumSamples(amg_data), SmoothVecs,
+      S, A, num_functions, dof_func);
 
    minimax = hypre_ParCSRMatrixChooseThresh(S);
    if (debug_flag >= 1)
+   {
       hypre_printf("Minimax chosen: %f\n", minimax);
+   }
 
    /* Threshold and compress */
-   hypre_ParCSRMatrixThreshold(S, thresh*minimax);
+   hypre_ParCSRMatrixThreshold(S, thresh * minimax);
 
    *S_ptr = S;
 
@@ -591,13 +619,15 @@ hypre_BoomerAMGNormalizeVecs(HYPRE_Int n, HYPRE_Int num, HYPRE_Real *V)
    HYPRE_Real nrm;
 
    /* change first vector to the constant vector */
-   for (i=0; i<n; i++)
+   for (i = 0; i < n; i++)
+   {
       V[i] = 1.0;
+   }
 
-   for (j=0; j<num; j++)
+   for (j = 0; j < num; j++)
    {
-       nrm = mydnrm2(n, &V[j*n]);
-       mydscal(n, 1./nrm, &V[j*n]);
+      nrm = mydnrm2(n, &V[j * n]);
+      mydscal(n, 1. / nrm, &V[j * n]);
    }
 
    return 0;
@@ -623,7 +653,7 @@ hypre_BoomerAMGNormalizeVecs(HYPRE_Int n, HYPRE_Int num, HYPRE_Real *V)
  *--------------------------------------------------------------------------*/
 HYPRE_Int
 hypre_BoomerAMGFitVectors(HYPRE_Int ip, HYPRE_Int n, HYPRE_Int num, const HYPRE_Real *V,
-  HYPRE_Int nc, const HYPRE_Int *ind, HYPRE_Real *val)
+                          HYPRE_Int nc, const HYPRE_Int *ind, HYPRE_Real *val)
 {
    HYPRE_Real *a, *b;
    HYPRE_Real *ap;
@@ -633,48 +663,56 @@ hypre_BoomerAMGFitVectors(HYPRE_Int ip, HYPRE_Int n, HYPRE_Int num, const HYPRE_
    HYPRE_Int    info;
    HYPRE_Int  temp;
 
-/*
-   hypre_printf("Fit: row %d, n %d num %d, nc = %d ", ip, n, num, nc);
-   for (i=0; i<nc; i++)
-      hypre_printf("%d ", ind[i]);
-   hypre_printf("\n");
-*/
+   /*
+      hypre_printf("Fit: row %d, n %d num %d, nc = %d ", ip, n, num, nc);
+      for (i=0; i<nc; i++)
+         hypre_printf("%d ", ind[i]);
+      hypre_printf("\n");
+   */
 
    if (nc == 0)
+   {
       return 0;
+   }
 
-   work_size = 2000*64;
+   work_size = 2000 * 64;
    work = hypre_CTAlloc(HYPRE_Real,  work_size, HYPRE_MEMORY_HOST);
 
-   a = hypre_CTAlloc(HYPRE_Real,  num*nc, HYPRE_MEMORY_HOST);
+   a = hypre_CTAlloc(HYPRE_Real,  num * nc, HYPRE_MEMORY_HOST);
    ap = a;
 
-   for (j=0; j<nc; j++)
+   for (j = 0; j < nc; j++)
    {
-      for (i=0; i<num; i++)
+      for (i = 0; i < num; i++)
       {
-          *ap = V[i*n+ind[j]];
-	  ap++;
+         *ap = V[i * n + ind[j]];
+         ap++;
       }
    }
 
    temp = MAX(nc, num);
    b = hypre_CTAlloc(HYPRE_Real,  temp, HYPRE_MEMORY_HOST);
-   for (i=0; i<num; i++)
-      b[i] = V[i*n+ip];
+   for (i = 0; i < num; i++)
+   {
+      b[i] = V[i * n + ip];
+   }
 
    {
-   char trans = 'N';
-   HYPRE_Int  one   = 1;
-   hypre_dgels(&trans, &num, &nc, &one, a, &num,
-      b, &temp, work, &work_size, &info);
+      char trans = 'N';
+      HYPRE_Int  one   = 1;
+      hypre_dgels(&trans, &num, &nc, &one, a, &num,
+                  b, &temp, work, &work_size, &info);
 
-   if (info != 0)
-      hypre_error_w_msg(HYPRE_ERROR_GENERIC,"par_gsmg: dgels returned %d\n");
+      if (info != 0)
+      {
+         hypre_error_w_msg(HYPRE_ERROR_GENERIC, "par_gsmg: dgels returned %d\n");
+      }
 
-   /* copy solution into output vector */
-   for (j=0; j<nc; j++)
-      val[j] = b[j];
+      /* copy solution into output vector */
+      for (j = 0; j < nc; j++)
+      {
+         val[j] = b[j];
+      }
    }
 
    hypre_TFree(b, HYPRE_MEMORY_HOST);
@@ -693,43 +731,44 @@ hypre_BoomerAMGFitVectors(HYPRE_Int ip, HYPRE_Int n, HYPRE_Int num, const HYPRE_
 
 HYPRE_Int
 hypre_BoomerAMGBuildInterpLS( hypre_ParCSRMatrix   *A,
-                         HYPRE_Int                  *CF_marker,
-                         hypre_ParCSRMatrix   *S,
-                         HYPRE_BigInt            *num_cpts_global,
-                         HYPRE_Int                   num_functions,
-                         HYPRE_Int                  *dof_func,
-                         HYPRE_Int                   debug_flag,
-                         HYPRE_Real            trunc_factor,
-                         HYPRE_Int                   num_smooth,
-                         HYPRE_Real           *SmoothVecs,
-                         hypre_ParCSRMatrix  **P_ptr)
+                              HYPRE_Int            *CF_marker,
+                              hypre_ParCSRMatrix   *S,
+                              HYPRE_BigInt         *num_cpts_global,
+                              HYPRE_Int             num_functions,
+                              HYPRE_Int            *dof_func,
+                              HYPRE_Int             debug_flag,
+                              HYPRE_Real            trunc_factor,
+                              HYPRE_Int             num_smooth,
+                              HYPRE_Real           *SmoothVecs,
+                              hypre_ParCSRMatrix  **P_ptr)
 {
+   HYPRE_UNUSED_VAR(A);
 
-   MPI_Comm 	      comm = hypre_ParCSRMatrixComm(S);
+   MPI_Comm          comm = hypre_ParCSRMatrixComm(S);
    hypre_ParCSRCommPkg     *comm_pkg = hypre_ParCSRMatrixCommPkg(S);
    hypre_ParCSRCommHandle  *comm_handle;
 
    hypre_CSRMatrix *S_diag = hypre_ParCSRMatrixDiag(S);
-/* HYPRE_Real      *S_diag_data = hypre_CSRMatrixData(S_diag); */
+   /* HYPRE_Real      *S_diag_data = hypre_CSRMatrixData(S_diag); */
    HYPRE_Int             *S_diag_i = hypre_CSRMatrixI(S_diag);
    HYPRE_Int             *S_diag_j = hypre_CSRMatrixJ(S_diag);
 
    hypre_CSRMatrix *S_offd = hypre_ParCSRMatrixOffd(S);
-/* HYPRE_Real      *S_offd_data = hypre_CSRMatrixData(S_offd);
-   HYPRE_Int             *S_offd_i = hypre_CSRMatrixI(S_offd);
-   HYPRE_Int             *S_offd_j = hypre_CSRMatrixJ(S_offd); */
+   /* HYPRE_Real      *S_offd_data = hypre_CSRMatrixData(S_offd);
+      HYPRE_Int             *S_offd_i = hypre_CSRMatrixI(S_offd);
+      HYPRE_Int             *S_offd_j = hypre_CSRMatrixJ(S_offd); */
 
    HYPRE_Int              num_cols_S_offd = hypre_CSRMatrixNumCols(S_offd);
-/* HYPRE_Int             *col_map_offd = hypre_ParCSRMatrixColMapOffd(S); */
+   /* HYPRE_Int             *col_map_offd = hypre_ParCSRMatrixColMapOffd(S); */
 
    hypre_ParCSRMatrix *P;
-   HYPRE_BigInt	      *col_map_offd_P;
-   HYPRE_Int	      *tmp_map_offd = NULL;
+   HYPRE_BigInt         *col_map_offd_P;
+   HYPRE_Int         *tmp_map_offd = NULL;
 
    HYPRE_Int             *CF_marker_offd;
    HYPRE_Int             *dof_func_offd = NULL;
 
-   hypre_CSRMatrix *S_ext;
+   hypre_CSRMatrix *S_ext = NULL;
 
    //HYPRE_Real      *S_ext_data;
    //HYPRE_Int       *S_ext_i;
@@ -749,12 +788,12 @@ hypre_BoomerAMGBuildInterpLS( hypre_ParCSRMatrix   *A,
    HYPRE_Int        P_offd_size;
 
    HYPRE_Int             *P_marker;
-/* HYPRE_Int             *P_marker_offd; */
+   /* HYPRE_Int             *P_marker_offd; */
 
-   HYPRE_Int              jj_counter,jj_counter_offd;
+   HYPRE_Int              jj_counter, jj_counter_offd;
    HYPRE_Int             *jj_count, *jj_count_offd;
-/* HYPRE_Int              jj_begin_row,jj_begin_row_offd;
-   HYPRE_Int              jj_end_row,jj_end_row_offd; */
+   /* HYPRE_Int              jj_begin_row,jj_begin_row_offd;
+      HYPRE_Int              jj_end_row,jj_end_row_offd; */
 
    HYPRE_Int              start_indexing = 0; /* start indexing for P_data at 0 */
 
@@ -768,8 +807,8 @@ hypre_BoomerAMGBuildInterpLS( hypre_ParCSRMatrix   *A,
    HYPRE_Int        num_cols_P_offd;
    //HYPRE_BigInt     my_first_cpt;
 
-   HYPRE_Int              i,i1;
-   HYPRE_Int              j,jl,jj;
+   HYPRE_Int              i, i1;
+   HYPRE_Int              j, jl, jj;
    HYPRE_Int              start;
 
    HYPRE_Real       one  = 1.0;
@@ -786,7 +825,7 @@ hypre_BoomerAMGBuildInterpLS( hypre_ParCSRMatrix   *A,
    HYPRE_Real       wall_time;  /* for debugging instrumentation  */
 
    hypre_MPI_Comm_size(comm, &num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_rank(comm, &my_id);
    num_threads = hypre_NumThreads();
    //my_first_cpt = num_cpts_global[my_id];
    total_global_cpts = num_cpts_global[num_procs];
@@ -795,33 +834,35 @@ hypre_BoomerAMGBuildInterpLS( hypre_ParCSRMatrix   *A,
     * Get the CF_marker data for the off-processor columns
     *-------------------------------------------------------------------*/
 
-   if (debug_flag==4) wall_time = time_getWallclockSeconds();
+   if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
 
    CF_marker_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_S_offd, HYPRE_MEMORY_HOST);
    if (num_functions > 1 && num_cols_S_offd)
-	dof_func_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_S_offd, HYPRE_MEMORY_HOST);
+   {
+      dof_func_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_S_offd, HYPRE_MEMORY_HOST);
+   }
 
    if (!comm_pkg)
    {
       hypre_MatvecCommPkgCreate(S);
-	comm_pkg = hypre_ParCSRMatrixCommPkg(S);
+      comm_pkg = hypre_ParCSRMatrixCommPkg(S);
    }
 
    num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
    int_buf_data = hypre_CTAlloc(HYPRE_Int,  hypre_ParCSRCommPkgSendMapStart(comm_pkg,
-						num_sends), HYPRE_MEMORY_HOST);
+                                                                            num_sends), HYPRE_MEMORY_HOST);
 
    index = 0;
    for (i = 0; i < num_sends; i++)
    {
-	start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-	for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
-		int_buf_data[index++]
-		 = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+      start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
+      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
+         int_buf_data[index++]
+            = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
    }
 
    comm_handle = hypre_ParCSRCommHandleCreate( 11, comm_pkg, int_buf_data,
-	CF_marker_offd);
+                                               CF_marker_offd);
 
    hypre_ParCSRCommHandleDestroy(comm_handle);
    if (num_functions > 1)
@@ -829,25 +870,25 @@ hypre_BoomerAMGBuildInterpLS( hypre_ParCSRMatrix   *A,
       index = 0;
       for (i = 0; i < num_sends; i++)
       {
-	 start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-	 for (j=start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
-		int_buf_data[index++]
-		 = dof_func[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+         start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
+         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
+            int_buf_data[index++]
+               = dof_func[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
       }
 
       comm_handle = hypre_ParCSRCommHandleCreate( 11, comm_pkg, int_buf_data,
-	dof_func_offd);
+                                                  dof_func_offd);
 
       hypre_ParCSRCommHandleDestroy(comm_handle);
    }
 
    hypre_TFree(int_buf_data, HYPRE_MEMORY_HOST);
 
-   if (debug_flag==4)
+   if (debug_flag == 4)
    {
       wall_time = time_getWallclockSeconds() - wall_time;
       hypre_printf("Proc = %d     Interp: Comm 1 CF_marker =    %f\n",
-                    my_id, wall_time);
+                   my_id, wall_time);
       fflush(NULL);
    }
 
@@ -855,21 +896,21 @@ hypre_BoomerAMGBuildInterpLS( hypre_ParCSRMatrix   *A,
     * Get the ghost rows of S
     *---------------------------------------------------------------------*/
 
-   if (debug_flag==4) wall_time = time_getWallclockSeconds();
+   if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
 
    if (num_procs > 1)
    {
-      S_ext      = hypre_ParCSRMatrixExtractBExt(S,S,1);
+      S_ext      = hypre_ParCSRMatrixExtractBExt(S, S, 1);
       //S_ext_i    = hypre_CSRMatrixI(S_ext);
       //S_ext_j    = hypre_CSRMatrixBigJ(S_ext);
       //S_ext_data = hypre_CSRMatrixData(S_ext);
    }
 
-   if (debug_flag==4)
+   if (debug_flag == 4)
    {
       wall_time = time_getWallclockSeconds() - wall_time;
       hypre_printf("Proc = %d  Interp: Comm 2   Get S_ext =  %f\n",
-                    my_id, wall_time);
+                   my_id, wall_time);
       fflush(NULL);
    }
 
@@ -887,9 +928,9 @@ hypre_BoomerAMGBuildInterpLS( hypre_ParCSRMatrix   *A,
 
    fine_to_coarse = hypre_CTAlloc(HYPRE_Int,  n_fine, HYPRE_MEMORY_HOST);
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-   for (i = 0; i < n_fine; i++) fine_to_coarse[i] = -1;
+   for (i = 0; i < n_fine; i++) { fine_to_coarse[i] = -1; }
 
    jj_counter = start_indexing;
    jj_counter_offd = start_indexing;
@@ -898,80 +939,80 @@ hypre_BoomerAMGBuildInterpLS( hypre_ParCSRMatrix   *A,
     *  Loop over fine grid.
     *-----------------------------------------------------------------------*/
 
-/* RDF: this looks a little tricky, but doable */
+   /* RDF: this looks a little tricky, but doable */
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i,j,i1,jj,ns,ne,size,rest) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i,j,i1,jj,ns,ne,size,rest) HYPRE_SMP_SCHEDULE
 #endif
    for (j = 0; j < num_threads; j++)
    {
-     size = n_fine/num_threads;
-     rest = n_fine - size*num_threads;
-     if (j < rest)
-     {
-        ns = j*size+j;
-        ne = (j+1)*size+j+1;
-     }
-     else
-     {
-        ns = j*size+rest;
-        ne = (j+1)*size+rest;
-     }
-     for (i = ns; i < ne; i++)
-     {
-
-      /*--------------------------------------------------------------------
-       *  If i is a C-point, interpolation is the identity. Also set up
-       *  mapping vector.
-       *--------------------------------------------------------------------*/
-
-      if (CF_marker[i] >= 0)
+      size = n_fine / num_threads;
+      rest = n_fine - size * num_threads;
+      if (j < rest)
       {
-         jj_count[j]++;
-         fine_to_coarse[i] = coarse_counter[j];
-         coarse_counter[j]++;
+         ns = j * size + j;
+         ne = (j + 1) * size + j + 1;
       }
-
-      /*--------------------------------------------------------------------
-       *  If i is an F-point, interpolation is from the C-points that
-       *  strongly influence i.
-       *--------------------------------------------------------------------*/
-
       else
       {
-         for (jj = S_diag_i[i]; jj < S_diag_i[i+1]; jj++)
+         ns = j * size + rest;
+         ne = (j + 1) * size + rest;
+      }
+      for (i = ns; i < ne; i++)
+      {
+
+         /*--------------------------------------------------------------------
+          *  If i is a C-point, interpolation is the identity. Also set up
+          *  mapping vector.
+          *--------------------------------------------------------------------*/
+
+         if (CF_marker[i] >= 0)
          {
-            i1 = S_diag_j[jj];
-            if (CF_marker[i1] >= 0)
-            {
-               jj_count[j]++;
-            }
+            jj_count[j]++;
+            fine_to_coarse[i] = coarse_counter[j];
+            coarse_counter[j]++;
          }
 
-         if (num_procs > 1)
+         /*--------------------------------------------------------------------
+          *  If i is an F-point, interpolation is from the C-points that
+          *  strongly influence i.
+          *--------------------------------------------------------------------*/
+
+         else
          {
-            /* removed */
+            for (jj = S_diag_i[i]; jj < S_diag_i[i + 1]; jj++)
+            {
+               i1 = S_diag_j[jj];
+               if (CF_marker[i1] >= 0)
+               {
+                  jj_count[j]++;
+               }
+            }
+
+            if (num_procs > 1)
+            {
+               /* removed */
+            }
          }
       }
-    }
    }
 
    /*-----------------------------------------------------------------------
     *  Allocate  arrays.
     *-----------------------------------------------------------------------*/
 
-   for (i=0; i < num_threads-1; i++)
+   for (i = 0; i < num_threads - 1; i++)
    {
-      coarse_counter[i+1] += coarse_counter[i];
-      jj_count[i+1] += jj_count[i];
-      jj_count_offd[i+1] += jj_count_offd[i];
+      coarse_counter[i + 1] += coarse_counter[i];
+      jj_count[i + 1] += jj_count[i];
+      jj_count_offd[i + 1] += jj_count_offd[i];
    }
-   i = num_threads-1;
+   i = num_threads - 1;
    jj_counter = jj_count[i];
    jj_counter_offd = jj_count_offd[i];
 
    P_diag_size = jj_counter;
 
-   P_diag_i    = hypre_CTAlloc(HYPRE_Int,  n_fine+1, HYPRE_MEMORY_HOST);
+   P_diag_i    = hypre_CTAlloc(HYPRE_Int,  n_fine + 1, HYPRE_MEMORY_HOST);
    P_diag_j    = hypre_CTAlloc(HYPRE_Int,  P_diag_size, HYPRE_MEMORY_HOST);
    P_diag_data = hypre_CTAlloc(HYPRE_Real,  P_diag_size, HYPRE_MEMORY_HOST);
 
@@ -980,7 +1021,7 @@ hypre_BoomerAMGBuildInterpLS( hypre_ParCSRMatrix   *A,
 
    P_offd_size = jj_counter_offd;
 
-   P_offd_i    = hypre_CTAlloc(HYPRE_Int,  n_fine+1, HYPRE_MEMORY_HOST);
+   P_offd_i    = hypre_CTAlloc(HYPRE_Int,  n_fine + 1, HYPRE_MEMORY_HOST);
    P_offd_j    = hypre_CTAlloc(HYPRE_Int,  P_offd_size, HYPRE_MEMORY_HOST);
    P_offd_data = hypre_CTAlloc(HYPRE_Real,  P_offd_size, HYPRE_MEMORY_HOST);
 
@@ -991,11 +1032,11 @@ hypre_BoomerAMGBuildInterpLS( hypre_ParCSRMatrix   *A,
    jj_counter = start_indexing;
    jj_counter_offd = start_indexing;
 
-   if (debug_flag==4)
+   if (debug_flag == 4)
    {
       wall_time = time_getWallclockSeconds() - wall_time;
       hypre_printf("Proc = %d     Interp: Internal work 1 =     %f\n",
-                    my_id, wall_time);
+                   my_id, wall_time);
       fflush(NULL);
    }
 
@@ -1003,45 +1044,47 @@ hypre_BoomerAMGBuildInterpLS( hypre_ParCSRMatrix   *A,
     *  Send and receive fine_to_coarse info.
     *-----------------------------------------------------------------------*/
 
-   if (debug_flag==4) wall_time = time_getWallclockSeconds();
+   if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
 
    /*fine_to_coarse_offd = hypre_CTAlloc(HYPRE_BigInt, num_cols_S_offd, HYPRE_MEMORY_HOST);
    big_buf_data = hypre_CTAlloc(HYPRE_BigInt, hypre_ParCSRCommPkgSendMapStart(comm_pkg,
-						num_sends), HYPRE_MEMORY_HOST);*/
+                  num_sends), HYPRE_MEMORY_HOST);*/
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i,j,ns,ne,size,rest,coarse_shift) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i,j,ns,ne,size,rest,coarse_shift) HYPRE_SMP_SCHEDULE
 #endif
    for (j = 0; j < num_threads; j++)
    {
-     coarse_shift = 0;
-     if (j > 0) coarse_shift = coarse_counter[j-1];
-     size = n_fine/num_threads;
-     rest = n_fine - size*num_threads;
-     if (j < rest)
-     {
-        ns = j*size+j;
-        ne = (j+1)*size+j+1;
-     }
-     else
-     {
-        ns = j*size+rest;
-        ne = (j+1)*size+rest;
-     }
-     for (i = ns; i < ne; i++)
-	fine_to_coarse[i] += coarse_shift;
+      coarse_shift = 0;
+      if (j > 0) { coarse_shift = coarse_counter[j - 1]; }
+      size = n_fine / num_threads;
+      rest = n_fine - size * num_threads;
+      if (j < rest)
+      {
+         ns = j * size + j;
+         ne = (j + 1) * size + j + 1;
+      }
+      else
+      {
+         ns = j * size + rest;
+         ne = (j + 1) * size + rest;
+      }
+      for (i = ns; i < ne; i++)
+      {
+         fine_to_coarse[i] += coarse_shift;
+      }
    }
    /*index = 0;
    for (i = 0; i < num_sends; i++)
    {
-	start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-	for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
-		big_buf_data[index++]
-		 = my_first_cpt+(HYPRE_BigInt)fine_to_coarse[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+   start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
+   for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+      big_buf_data[index++]
+       = my_first_cpt+(HYPRE_BigInt)fine_to_coarse[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
    }
 
    comm_handle = hypre_ParCSRCommHandleCreate( 21, comm_pkg, big_buf_data,
-	fine_to_coarse_offd);
+   fine_to_coarse_offd);
 
    hypre_ParCSRCommHandleDestroy(comm_handle);
 
@@ -1060,80 +1103,80 @@ hypre_BoomerAMGBuildInterpLS( hypre_ParCSRMatrix   *A,
     *-----------------------------------------------------------------------*/
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i,j,jl,i1,jj,ns,ne,size,rest,P_marker,jj_counter,jj_counter_offd) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i,j,jl,i1,jj,ns,ne,size,rest,P_marker,jj_counter,jj_counter_offd) HYPRE_SMP_SCHEDULE
 #endif
    for (jl = 0; jl < num_threads; jl++)
    {
-     size = n_fine/num_threads;
-     rest = n_fine - size*num_threads;
-     if (jl < rest)
-     {
-        ns = jl*size+jl;
-        ne = (jl+1)*size+jl+1;
-     }
-     else
-     {
-        ns = jl*size+rest;
-        ne = (jl+1)*size+rest;
-     }
-     jj_counter = 0;
-     if (jl > 0) jj_counter = jj_count[jl-1];
-     jj_counter_offd = 0;
-     if (jl > 0) jj_counter_offd = jj_count_offd[jl-1];
-
-     for (i = ns; i < ne; i++)
-     {
-
-      /*--------------------------------------------------------------------
-       *  If i is a c-point, interpolation is the identity.
-       *--------------------------------------------------------------------*/
-
-      if (CF_marker[i] >= 0)
+      size = n_fine / num_threads;
+      rest = n_fine - size * num_threads;
+      if (jl < rest)
       {
-         P_diag_i[i] = jj_counter;
-         P_diag_j[jj_counter]    = fine_to_coarse[i];
-         P_diag_data[jj_counter] = one;
-         jj_counter++;
+         ns = jl * size + jl;
+         ne = (jl + 1) * size + jl + 1;
       }
-
-      /*--------------------------------------------------------------------
-       *  If i is an F-point, build interpolation.
-       *--------------------------------------------------------------------*/
-
       else
       {
-         HYPRE_Int kk;
-         HYPRE_Int indices[1000]; /* kludge */
+         ns = jl * size + rest;
+         ne = (jl + 1) * size + rest;
+      }
+      jj_counter = 0;
+      if (jl > 0) { jj_counter = jj_count[jl - 1]; }
+      jj_counter_offd = 0;
+      if (jl > 0) { jj_counter_offd = jj_count_offd[jl - 1]; }
+
+      for (i = ns; i < ne; i++)
+      {
+
+         /*--------------------------------------------------------------------
+          *  If i is a c-point, interpolation is the identity.
+          *--------------------------------------------------------------------*/
+
+         if (CF_marker[i] >= 0)
+         {
+            P_diag_i[i] = jj_counter;
+            P_diag_j[jj_counter]    = fine_to_coarse[i];
+            P_diag_data[jj_counter] = one;
+            jj_counter++;
+         }
 
-         /* Diagonal part of P */
-         P_diag_i[i] = jj_counter;
+         /*--------------------------------------------------------------------
+          *  If i is an F-point, build interpolation.
+          *--------------------------------------------------------------------*/
 
-         kk = 0;
-         for (jj = S_diag_i[i]; jj < S_diag_i[i+1]; jj++)
+         else
          {
-            i1 = S_diag_j[jj];
+            HYPRE_Int kk;
+            HYPRE_Int indices[1000]; /* kludge */
 
-            /*--------------------------------------------------------------
-             * If neighbor i1 is a C-point, set column number in P_diag_j
-             * and initialize interpolation weight to zero.
-             *--------------------------------------------------------------*/
+            /* Diagonal part of P */
+            P_diag_i[i] = jj_counter;
 
-            if (CF_marker[i1] >= 0)
+            kk = 0;
+            for (jj = S_diag_i[i]; jj < S_diag_i[i + 1]; jj++)
             {
-               P_diag_j[jj_counter]    = fine_to_coarse[i1];
-               jj_counter++;
-               indices[kk] = i1;
-               kk++;
+               i1 = S_diag_j[jj];
+
+               /*--------------------------------------------------------------
+                * If neighbor i1 is a C-point, set column number in P_diag_j
+                * and initialize interpolation weight to zero.
+                *--------------------------------------------------------------*/
+
+               if (CF_marker[i1] >= 0)
+               {
+                  P_diag_j[jj_counter]    = fine_to_coarse[i1];
+                  jj_counter++;
+                  indices[kk] = i1;
+                  kk++;
+               }
             }
-         }
 
-         hypre_BoomerAMGFitVectors(i, n_fine, num_smooth, SmoothVecs,
-            kk, indices, &P_diag_data[P_diag_i[i]]);
+            hypre_BoomerAMGFitVectors(i, n_fine, num_smooth, SmoothVecs,
+                                      kk, indices, &P_diag_data[P_diag_i[i]]);
 
-         /* Off-Diagonal part of P */
-         /* undone */
+            /* Off-Diagonal part of P */
+            /* undone */
+         }
       }
-     }
    }
    P_diag_i[i] = jj_counter; /* check that this is in right place for threads */
 
@@ -1177,47 +1220,51 @@ hypre_BoomerAMGBuildInterpLS( hypre_ParCSRMatrix   *A,
       P_marker = hypre_CTAlloc(HYPRE_Int,  P_offd_size, HYPRE_MEMORY_HOST);
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-      for (i=0; i < P_offd_size; i++)
-	 P_marker[i] = P_offd_j[i];
+      for (i = 0; i < P_offd_size; i++)
+      {
+         P_marker[i] = P_offd_j[i];
+      }
 
-      hypre_qsort0(P_marker, 0, P_offd_size-1);
+      hypre_qsort0(P_marker, 0, P_offd_size - 1);
 
       num_cols_P_offd = 1;
       index = P_marker[0];
-      for (i=1; i < P_offd_size; i++)
+      for (i = 1; i < P_offd_size; i++)
       {
-	if (P_marker[i] > index)
-	{
- 	  index = P_marker[i];
- 	  P_marker[num_cols_P_offd++] = index;
-  	}
+         if (P_marker[i] > index)
+         {
+            index = P_marker[i];
+            P_marker[num_cols_P_offd++] = index;
+         }
       }
 
       col_map_offd_P = hypre_CTAlloc(HYPRE_BigInt, num_cols_P_offd, HYPRE_MEMORY_HOST);
       tmp_map_offd = hypre_CTAlloc(HYPRE_Int, num_cols_P_offd, HYPRE_MEMORY_HOST);
 
-      for (i=0; i < num_cols_P_offd; i++)
+      for (i = 0; i < num_cols_P_offd; i++)
+      {
          tmp_map_offd[i] = P_marker[i];
+      }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-      for (i=0; i < P_offd_size; i++)
-	P_offd_j[i] = hypre_BinarySearch(tmp_map_offd,
-					 P_offd_j[i],
-					 num_cols_P_offd);
+      for (i = 0; i < P_offd_size; i++)
+         P_offd_j[i] = hypre_BinarySearch(tmp_map_offd,
+                                          P_offd_j[i],
+                                          num_cols_P_offd);
       hypre_TFree(P_marker, HYPRE_MEMORY_HOST);
    }
 
    if (num_cols_P_offd)
    {
-   	hypre_ParCSRMatrixColMapOffd(P) = col_map_offd_P;
-        hypre_CSRMatrixNumCols(P_offd) = num_cols_P_offd;
+      hypre_ParCSRMatrixColMapOffd(P) = col_map_offd_P;
+      hypre_CSRMatrixNumCols(P_offd) = num_cols_P_offd;
    }
 
-   hypre_GetCommPkgRTFromCommPkgA(P,S,fine_to_coarse, tmp_map_offd);
+   hypre_GetCommPkgRTFromCommPkgA(P, S, fine_to_coarse, tmp_map_offd);
 
    *P_ptr = P;
 
@@ -1229,12 +1276,11 @@ hypre_BoomerAMGBuildInterpLS( hypre_ParCSRMatrix   *A,
    hypre_TFree(coarse_counter, HYPRE_MEMORY_HOST);
    hypre_TFree(jj_count, HYPRE_MEMORY_HOST);
    hypre_TFree(jj_count_offd, HYPRE_MEMORY_HOST);
+   hypre_CSRMatrixDestroy(S_ext);
 
-   if (num_procs > 1) hypre_CSRMatrixDestroy(S_ext);
-
-   return(0);
-
+   return hypre_error_flag;
 }
+
 /*---------------------------------------------------------------------------
  * hypre_BoomerAMGBuildInterpGSMG
  *
@@ -1244,17 +1290,18 @@ hypre_BoomerAMGBuildInterpLS( hypre_ParCSRMatrix   *A,
 
 HYPRE_Int
 hypre_BoomerAMGBuildInterpGSMG( hypre_ParCSRMatrix   *A,
-                         HYPRE_Int                  *CF_marker,
-                         hypre_ParCSRMatrix   *S,
-                         HYPRE_BigInt               *num_cpts_global,
-                         HYPRE_Int                   num_functions,
-                         HYPRE_Int                  *dof_func,
-                         HYPRE_Int                   debug_flag,
-                         HYPRE_Real            trunc_factor,
-                         hypre_ParCSRMatrix  **P_ptr)
+                                HYPRE_Int            *CF_marker,
+                                hypre_ParCSRMatrix   *S,
+                                HYPRE_BigInt         *num_cpts_global,
+                                HYPRE_Int             num_functions,
+                                HYPRE_Int            *dof_func,
+                                HYPRE_Int             debug_flag,
+                                HYPRE_Real            trunc_factor,
+                                hypre_ParCSRMatrix  **P_ptr)
 {
+   HYPRE_UNUSED_VAR(A);
 
-   MPI_Comm 	      comm = hypre_ParCSRMatrixComm(S);
+   MPI_Comm          comm = hypre_ParCSRMatrixComm(S);
    hypre_ParCSRCommPkg     *comm_pkg = hypre_ParCSRMatrixCommPkg(S);
    hypre_ParCSRCommHandle  *comm_handle;
 
@@ -1273,16 +1320,16 @@ hypre_BoomerAMGBuildInterpGSMG( hypre_ParCSRMatrix   *A,
    HYPRE_Int       *tmp_map_offd = NULL;
 
    hypre_ParCSRMatrix *P;
-   HYPRE_BigInt	   *col_map_offd_P;
+   HYPRE_BigInt      *col_map_offd_P;
 
    HYPRE_Int             *CF_marker_offd;
    HYPRE_Int             *dof_func_offd = NULL;
 
-   hypre_CSRMatrix *S_ext;
+   hypre_CSRMatrix *S_ext = NULL;
 
-   HYPRE_Real      *S_ext_data;
-   HYPRE_Int             *S_ext_i;
-   HYPRE_BigInt    *S_ext_j;
+   HYPRE_Real      *S_ext_data = NULL;
+   HYPRE_Int             *S_ext_i = NULL;
+   HYPRE_BigInt    *S_ext_j = NULL;
 
    hypre_CSRMatrix    *P_diag;
    hypre_CSRMatrix    *P_offd;
@@ -1298,10 +1345,10 @@ hypre_BoomerAMGBuildInterpGSMG( hypre_ParCSRMatrix   *A,
 
    HYPRE_Int             *P_marker, *P_marker_offd;
 
-   HYPRE_Int              jj_counter,jj_counter_offd;
+   HYPRE_Int              jj_counter, jj_counter_offd;
    HYPRE_Int             *jj_count, *jj_count_offd;
-   HYPRE_Int              jj_begin_row,jj_begin_row_offd;
-   HYPRE_Int              jj_end_row,jj_end_row_offd;
+   HYPRE_Int              jj_begin_row, jj_begin_row_offd;
+   HYPRE_Int              jj_end_row, jj_end_row_offd;
 
    HYPRE_Int              start_indexing = 0; /* start indexing for P_data at 0 */
 
@@ -1317,8 +1364,8 @@ hypre_BoomerAMGBuildInterpGSMG( hypre_ParCSRMatrix   *A,
    //HYPRE_BigInt     my_first_cpt;
 
    HYPRE_BigInt     big_i2;
-   HYPRE_Int              i,i1,i2;
-   HYPRE_Int              j,jl,jj,jj1;
+   HYPRE_Int              i, i1, i2;
+   HYPRE_Int              j, jl, jj, jj1;
    HYPRE_Int              start;
    HYPRE_Int              c_num;
 
@@ -1343,7 +1390,7 @@ hypre_BoomerAMGBuildInterpGSMG( hypre_ParCSRMatrix   *A,
    HYPRE_Real       wall_time;  /* for debugging instrumentation  */
 
    hypre_MPI_Comm_size(comm, &num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_rank(comm, &my_id);
    num_threads = hypre_NumThreads();
 
    //my_first_cpt = num_cpts_global[0];
@@ -1356,33 +1403,35 @@ hypre_BoomerAMGBuildInterpGSMG( hypre_ParCSRMatrix   *A,
     * Get the CF_marker data for the off-processor columns
     *-------------------------------------------------------------------*/
 
-   if (debug_flag==4) wall_time = time_getWallclockSeconds();
+   if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
 
    CF_marker_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_S_offd, HYPRE_MEMORY_HOST);
    if (num_functions > 1 && num_cols_S_offd)
-	dof_func_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_S_offd, HYPRE_MEMORY_HOST);
+   {
+      dof_func_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_S_offd, HYPRE_MEMORY_HOST);
+   }
 
    if (!comm_pkg)
    {
-	hypre_MatvecCommPkgCreate(S);
-	comm_pkg = hypre_ParCSRMatrixCommPkg(S);
+      hypre_MatvecCommPkgCreate(S);
+      comm_pkg = hypre_ParCSRMatrixCommPkg(S);
    }
 
    num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
    int_buf_data = hypre_CTAlloc(HYPRE_Int,  hypre_ParCSRCommPkgSendMapStart(comm_pkg,
-						num_sends), HYPRE_MEMORY_HOST);
+                                                                            num_sends), HYPRE_MEMORY_HOST);
 
    index = 0;
    for (i = 0; i < num_sends; i++)
    {
-	start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-	for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
-		int_buf_data[index++]
-		 = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+      start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
+      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
+         int_buf_data[index++]
+            = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
    }
 
    comm_handle = hypre_ParCSRCommHandleCreate( 11, comm_pkg, int_buf_data,
-	CF_marker_offd);
+                                               CF_marker_offd);
 
    hypre_ParCSRCommHandleDestroy(comm_handle);
    if (num_functions > 1)
@@ -1390,23 +1439,23 @@ hypre_BoomerAMGBuildInterpGSMG( hypre_ParCSRMatrix   *A,
       index = 0;
       for (i = 0; i < num_sends; i++)
       {
-	 start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-	 for (j=start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
-		int_buf_data[index++]
-		 = dof_func[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+         start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
+         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
+            int_buf_data[index++]
+               = dof_func[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
       }
 
       comm_handle = hypre_ParCSRCommHandleCreate( 11, comm_pkg, int_buf_data,
-	dof_func_offd);
+                                                  dof_func_offd);
 
       hypre_ParCSRCommHandleDestroy(comm_handle);
    }
 
-   if (debug_flag==4)
+   if (debug_flag == 4)
    {
       wall_time = time_getWallclockSeconds() - wall_time;
       hypre_printf("Proc = %d     Interp: Comm 1 CF_marker =    %f\n",
-                    my_id, wall_time);
+                   my_id, wall_time);
       fflush(NULL);
    }
 
@@ -1414,21 +1463,21 @@ hypre_BoomerAMGBuildInterpGSMG( hypre_ParCSRMatrix   *A,
     * Get the ghost rows of S
     *---------------------------------------------------------------------*/
 
-   if (debug_flag==4) wall_time = time_getWallclockSeconds();
+   if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
 
    if (num_procs > 1)
    {
-      S_ext      = hypre_ParCSRMatrixExtractBExt(S,S,1);
+      S_ext      = hypre_ParCSRMatrixExtractBExt(S, S, 1);
       S_ext_i    = hypre_CSRMatrixI(S_ext);
       S_ext_j    = hypre_CSRMatrixBigJ(S_ext);
       S_ext_data = hypre_CSRMatrixData(S_ext);
    }
 
-   if (debug_flag==4)
+   if (debug_flag == 4)
    {
       wall_time = time_getWallclockSeconds() - wall_time;
       hypre_printf("Proc = %d  Interp: Comm 2   Get S_ext =  %f\n",
-                    my_id, wall_time);
+                   my_id, wall_time);
       fflush(NULL);
    }
 
@@ -1446,9 +1495,9 @@ hypre_BoomerAMGBuildInterpGSMG( hypre_ParCSRMatrix   *A,
 
    fine_to_coarse = hypre_CTAlloc(HYPRE_Int,  n_fine, HYPRE_MEMORY_HOST);
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-   for (i = 0; i < n_fine; i++) fine_to_coarse[i] = -1;
+   for (i = 0; i < n_fine; i++) { fine_to_coarse[i] = -1; }
 
    jj_counter = start_indexing;
    jj_counter_offd = start_indexing;
@@ -1457,87 +1506,87 @@ hypre_BoomerAMGBuildInterpGSMG( hypre_ParCSRMatrix   *A,
     *  Loop over fine grid.
     *-----------------------------------------------------------------------*/
 
-/* RDF: this looks a little tricky, but doable */
+   /* RDF: this looks a little tricky, but doable */
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i,j,i1,jj,ns,ne,size,rest) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i,j,i1,jj,ns,ne,size,rest) HYPRE_SMP_SCHEDULE
 #endif
    for (j = 0; j < num_threads; j++)
    {
-     size = n_fine/num_threads;
-     rest = n_fine - size*num_threads;
-     if (j < rest)
-     {
-        ns = j*size+j;
-        ne = (j+1)*size+j+1;
-     }
-     else
-     {
-        ns = j*size+rest;
-        ne = (j+1)*size+rest;
-     }
-     for (i = ns; i < ne; i++)
-     {
-
-      /*--------------------------------------------------------------------
-       *  If i is a C-point, interpolation is the identity. Also set up
-       *  mapping vector.
-       *--------------------------------------------------------------------*/
-
-      if (CF_marker[i] >= 0)
+      size = n_fine / num_threads;
+      rest = n_fine - size * num_threads;
+      if (j < rest)
       {
-         jj_count[j]++;
-         fine_to_coarse[i] = coarse_counter[j];
-         coarse_counter[j]++;
+         ns = j * size + j;
+         ne = (j + 1) * size + j + 1;
       }
-
-      /*--------------------------------------------------------------------
-       *  If i is an F-point, interpolation is from the C-points that
-       *  strongly influence i.
-       *--------------------------------------------------------------------*/
-
       else
       {
-         for (jj = S_diag_i[i]; jj < S_diag_i[i+1]; jj++)
+         ns = j * size + rest;
+         ne = (j + 1) * size + rest;
+      }
+      for (i = ns; i < ne; i++)
+      {
+
+         /*--------------------------------------------------------------------
+          *  If i is a C-point, interpolation is the identity. Also set up
+          *  mapping vector.
+          *--------------------------------------------------------------------*/
+
+         if (CF_marker[i] >= 0)
          {
-            i1 = S_diag_j[jj];
-            if (CF_marker[i1] >= 0)
-            {
-               jj_count[j]++;
-            }
+            jj_count[j]++;
+            fine_to_coarse[i] = coarse_counter[j];
+            coarse_counter[j]++;
          }
 
-         if (num_procs > 1)
+         /*--------------------------------------------------------------------
+          *  If i is an F-point, interpolation is from the C-points that
+          *  strongly influence i.
+          *--------------------------------------------------------------------*/
+
+         else
          {
-            for (jj = S_offd_i[i]; jj < S_offd_i[i+1]; jj++)
+            for (jj = S_diag_i[i]; jj < S_diag_i[i + 1]; jj++)
             {
-               i1 = S_offd_j[jj];
-               if (CF_marker_offd[i1] >= 0)
+               i1 = S_diag_j[jj];
+               if (CF_marker[i1] >= 0)
                {
-                  jj_count_offd[j]++;
+                  jj_count[j]++;
+               }
+            }
+
+            if (num_procs > 1)
+            {
+               for (jj = S_offd_i[i]; jj < S_offd_i[i + 1]; jj++)
+               {
+                  i1 = S_offd_j[jj];
+                  if (CF_marker_offd[i1] >= 0)
+                  {
+                     jj_count_offd[j]++;
+                  }
                }
             }
          }
       }
-    }
    }
 
    /*-----------------------------------------------------------------------
     *  Allocate  arrays.
     *-----------------------------------------------------------------------*/
 
-   for (i=0; i < num_threads-1; i++)
+   for (i = 0; i < num_threads - 1; i++)
    {
-      coarse_counter[i+1] += coarse_counter[i];
-      jj_count[i+1] += jj_count[i];
-      jj_count_offd[i+1] += jj_count_offd[i];
+      coarse_counter[i + 1] += coarse_counter[i];
+      jj_count[i + 1] += jj_count[i];
+      jj_count_offd[i + 1] += jj_count_offd[i];
    }
-   i = num_threads-1;
+   i = num_threads - 1;
    jj_counter = jj_count[i];
    jj_counter_offd = jj_count_offd[i];
 
    P_diag_size = jj_counter;
 
-   P_diag_i    = hypre_CTAlloc(HYPRE_Int,  n_fine+1, HYPRE_MEMORY_HOST);
+   P_diag_i    = hypre_CTAlloc(HYPRE_Int,  n_fine + 1, HYPRE_MEMORY_HOST);
    P_diag_j    = hypre_CTAlloc(HYPRE_Int,  P_diag_size, HYPRE_MEMORY_HOST);
    P_diag_data = hypre_CTAlloc(HYPRE_Real,  P_diag_size, HYPRE_MEMORY_HOST);
 
@@ -1546,7 +1595,7 @@ hypre_BoomerAMGBuildInterpGSMG( hypre_ParCSRMatrix   *A,
 
    P_offd_size = jj_counter_offd;
 
-   P_offd_i    = hypre_CTAlloc(HYPRE_Int,  n_fine+1, HYPRE_MEMORY_HOST);
+   P_offd_i    = hypre_CTAlloc(HYPRE_Int,  n_fine + 1, HYPRE_MEMORY_HOST);
    P_offd_j    = hypre_CTAlloc(HYPRE_Int,  P_offd_size, HYPRE_MEMORY_HOST);
    P_offd_data = hypre_CTAlloc(HYPRE_Real,  P_offd_size, HYPRE_MEMORY_HOST);
 
@@ -1557,11 +1606,11 @@ hypre_BoomerAMGBuildInterpGSMG( hypre_ParCSRMatrix   *A,
    jj_counter = start_indexing;
    jj_counter_offd = start_indexing;
 
-   if (debug_flag==4)
+   if (debug_flag == 4)
    {
       wall_time = time_getWallclockSeconds() - wall_time;
       hypre_printf("Proc = %d     Interp: Internal work 1 =     %f\n",
-                    my_id, wall_time);
+                   my_id, wall_time);
       fflush(NULL);
    }
 
@@ -1569,343 +1618,232 @@ hypre_BoomerAMGBuildInterpGSMG( hypre_ParCSRMatrix   *A,
     *  Send and receive fine_to_coarse info.
     *-----------------------------------------------------------------------*/
 
-   if (debug_flag==4) wall_time = time_getWallclockSeconds();
+   if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
 
    /*-----------------------------------------------------------------------
     *  Loop over fine grid points.
     *-----------------------------------------------------------------------*/
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i,j,jl,i1,i2,jj,jj1,ns,ne,size,rest,sum,distribute,P_marker,P_marker_offd,strong_f_marker,jj_counter,jj_counter_offd,c_num,jj_begin_row,jj_end_row,jj_begin_row_offd,jj_end_row_offd) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i,j,jl,i1,i2,jj,jj1,ns,ne,size,rest,sum,distribute,P_marker,P_marker_offd,strong_f_marker,jj_counter,jj_counter_offd,c_num,jj_begin_row,jj_end_row,jj_begin_row_offd,jj_end_row_offd) HYPRE_SMP_SCHEDULE
 #endif
    for (jl = 0; jl < num_threads; jl++)
    {
-     size = n_fine/num_threads;
-     rest = n_fine - size*num_threads;
-     if (jl < rest)
-     {
-        ns = jl*size+jl;
-        ne = (jl+1)*size+jl+1;
-     }
-     else
-     {
-        ns = jl*size+rest;
-        ne = (jl+1)*size+rest;
-     }
-     jj_counter = 0;
-     if (jl > 0) jj_counter = jj_count[jl-1];
-     jj_counter_offd = 0;
-     if (jl > 0) jj_counter_offd = jj_count_offd[jl-1];
-
-     P_marker = hypre_CTAlloc(HYPRE_Int,  n_fine, HYPRE_MEMORY_HOST);
-     P_marker_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_S_offd, HYPRE_MEMORY_HOST);
-
-     for (i = 0; i < n_fine; i++)
-     {
-        P_marker[i] = -1;
-     }
-     for (i = 0; i < num_cols_S_offd; i++)
-     {
-        P_marker_offd[i] = -1;
-     }
-     strong_f_marker = -2;
-
-     for (i = ns; i < ne; i++)
-     {
-
-      /*--------------------------------------------------------------------
-       *  If i is a c-point, interpolation is the identity.
-       *--------------------------------------------------------------------*/
-
-      if (CF_marker[i] >= 0)
+      size = n_fine / num_threads;
+      rest = n_fine - size * num_threads;
+      if (jl < rest)
       {
-         P_diag_i[i] = jj_counter;
-         P_diag_j[jj_counter]    = fine_to_coarse[i];
-         P_diag_data[jj_counter] = one;
-         jj_counter++;
+         ns = jl * size + jl;
+         ne = (jl + 1) * size + jl + 1;
       }
-
-      /*--------------------------------------------------------------------
-       *  If i is an F-point, build interpolation.
-       *--------------------------------------------------------------------*/
-
       else
       {
-         /* Diagonal part of P */
-         P_diag_i[i] = jj_counter;
-         jj_begin_row = jj_counter;
+         ns = jl * size + rest;
+         ne = (jl + 1) * size + rest;
+      }
+      jj_counter = 0;
+      if (jl > 0) { jj_counter = jj_count[jl - 1]; }
+      jj_counter_offd = 0;
+      if (jl > 0) { jj_counter_offd = jj_count_offd[jl - 1]; }
 
-         for (jj = S_diag_i[i]; jj < S_diag_i[i+1]; jj++)
-         {
-            i1 = S_diag_j[jj];
+      P_marker = hypre_CTAlloc(HYPRE_Int,  n_fine, HYPRE_MEMORY_HOST);
+      P_marker_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_S_offd, HYPRE_MEMORY_HOST);
 
-            /*--------------------------------------------------------------
-             * If neighbor i1 is a C-point, set column number in P_diag_j
-             * and initialize interpolation weight to zero.
-             *--------------------------------------------------------------*/
+      for (i = 0; i < n_fine; i++)
+      {
+         P_marker[i] = -1;
+      }
+      for (i = 0; i < num_cols_S_offd; i++)
+      {
+         P_marker_offd[i] = -1;
+      }
+      strong_f_marker = -2;
 
-            if (CF_marker[i1] >= 0)
-            {
-               P_marker[i1] = jj_counter;
-               P_diag_j[jj_counter]    = fine_to_coarse[i1];
-               P_diag_data[jj_counter] = zero;
-               jj_counter++;
-            }
+      for (i = ns; i < ne; i++)
+      {
 
-            /*--------------------------------------------------------------
-             * If neighbor i1 is an F-point, mark it as a strong F-point
-             * whose connection needs to be distributed.
-             *--------------------------------------------------------------*/
+         /*--------------------------------------------------------------------
+          *  If i is a c-point, interpolation is the identity.
+          *--------------------------------------------------------------------*/
 
-            else
-            {
-               P_marker[i1] = strong_f_marker;
-            }
+         if (CF_marker[i] >= 0)
+         {
+            P_diag_i[i] = jj_counter;
+            P_diag_j[jj_counter]    = fine_to_coarse[i];
+            P_diag_data[jj_counter] = one;
+            jj_counter++;
          }
-         jj_end_row = jj_counter;
 
-         /* Off-Diagonal part of P */
-         P_offd_i[i] = jj_counter_offd;
-         jj_begin_row_offd = jj_counter_offd;
+         /*--------------------------------------------------------------------
+          *  If i is an F-point, build interpolation.
+          *--------------------------------------------------------------------*/
 
-
-         if (num_procs > 1)
+         else
          {
-            for (jj = S_offd_i[i]; jj < S_offd_i[i+1]; jj++)
+            /* Diagonal part of P */
+            P_diag_i[i] = jj_counter;
+            jj_begin_row = jj_counter;
+
+            for (jj = S_diag_i[i]; jj < S_diag_i[i + 1]; jj++)
             {
-               i1 = S_offd_j[jj];
+               i1 = S_diag_j[jj];
 
-               /*-----------------------------------------------------------
-                * If neighbor i1 is a C-point, set column number in P_offd_j
+               /*--------------------------------------------------------------
+                * If neighbor i1 is a C-point, set column number in P_diag_j
                 * and initialize interpolation weight to zero.
-                *-----------------------------------------------------------*/
+                *--------------------------------------------------------------*/
 
-               if (CF_marker_offd[i1] >= 0)
+               if (CF_marker[i1] >= 0)
                {
-                  P_marker_offd[i1] = jj_counter_offd;
-		  P_offd_j[jj_counter_offd]  = i1;
-                  P_offd_data[jj_counter_offd] = zero;
-                  jj_counter_offd++;
+                  P_marker[i1] = jj_counter;
+                  P_diag_j[jj_counter]    = fine_to_coarse[i1];
+                  P_diag_data[jj_counter] = zero;
+                  jj_counter++;
                }
 
-               /*-----------------------------------------------------------
+               /*--------------------------------------------------------------
                 * If neighbor i1 is an F-point, mark it as a strong F-point
                 * whose connection needs to be distributed.
-                *-----------------------------------------------------------*/
+                *--------------------------------------------------------------*/
 
                else
                {
-                  P_marker_offd[i1] = strong_f_marker;
+                  P_marker[i1] = strong_f_marker;
                }
             }
-         }
+            jj_end_row = jj_counter;
 
-         jj_end_row_offd = jj_counter_offd;
+            /* Off-Diagonal part of P */
+            P_offd_i[i] = jj_counter_offd;
+            jj_begin_row_offd = jj_counter_offd;
 
-         /* Loop over ith row of S.  First, the diagonal part of S */
-
-         for (jj = S_diag_i[i]; jj < S_diag_i[i+1]; jj++)
-         {
-            i1 = S_diag_j[jj];
 
-            /*--------------------------------------------------------------
-             * Case 1: neighbor i1 is a C-point and strongly influences i,
-             * accumulate a_{i,i1} into the interpolation weight.
-             *--------------------------------------------------------------*/
-
-            if (P_marker[i1] >= jj_begin_row)
-            {
-               P_diag_data[P_marker[i1]] += S_diag_data[jj];
-            }
-
-            /*--------------------------------------------------------------
-             * Case 2: neighbor i1 is an F-point and strongly influences i,
-             * distribute a_{i,i1} to C-points that strongly infuence i.
-             * Note: currently no distribution to the diagonal in this case.
-             *--------------------------------------------------------------*/
-
-            else if (P_marker[i1] == strong_f_marker)
+            if (num_procs > 1)
             {
-               sum = zero;
-
-               /*-----------------------------------------------------------
-                * Loop over row of S for point i1 and calculate the sum
-                * of the connections to c-points that strongly influence i.
-                *-----------------------------------------------------------*/
-
-               /* Diagonal block part of row i1 */
-               for (jj1 = S_diag_i[i1]; jj1 < S_diag_i[i1+1]; jj1++)
+               for (jj = S_offd_i[i]; jj < S_offd_i[i + 1]; jj++)
                {
-                  i2 = S_diag_j[jj1];
-                  if (P_marker[i2] >= jj_begin_row)
-                     sum += S_diag_data[jj1];
-               }
+                  i1 = S_offd_j[jj];
 
-               /* Off-Diagonal block part of row i1 */
-               if (num_procs > 1)
-               {
-                  for (jj1 = S_offd_i[i1]; jj1 < S_offd_i[i1+1]; jj1++)
+                  /*-----------------------------------------------------------
+                   * If neighbor i1 is a C-point, set column number in P_offd_j
+                   * and initialize interpolation weight to zero.
+                   *-----------------------------------------------------------*/
+
+                  if (CF_marker_offd[i1] >= 0)
                   {
-                     i2 = S_offd_j[jj1];
-                     if (P_marker_offd[i2] >= jj_begin_row_offd)
-                        sum += S_offd_data[jj1];
+                     P_marker_offd[i1] = jj_counter_offd;
+                     P_offd_j[jj_counter_offd]  = i1;
+                     P_offd_data[jj_counter_offd] = zero;
+                     jj_counter_offd++;
                   }
-               }
-
-               if (sum != 0)
-	       {
-	       distribute = S_diag_data[jj] / sum;
 
-               /*-----------------------------------------------------------
-                * Loop over row of S for point i1 and do the distribution.
-                *-----------------------------------------------------------*/
+                  /*-----------------------------------------------------------
+                   * If neighbor i1 is an F-point, mark it as a strong F-point
+                   * whose connection needs to be distributed.
+                   *-----------------------------------------------------------*/
 
-               /* Diagonal block part of row i1 */
-               for (jj1 = S_diag_i[i1]; jj1 < S_diag_i[i1+1]; jj1++)
-               {
-                  i2 = S_diag_j[jj1];
-                  if (P_marker[i2] >= jj_begin_row)
-                     P_diag_data[P_marker[i2]]
-                                  += distribute * S_diag_data[jj1];
-               }
-
-               /* Off-Diagonal block part of row i1 */
-               if (num_procs > 1)
-               {
-                  for (jj1 = S_offd_i[i1]; jj1 < S_offd_i[i1+1]; jj1++)
+                  else
                   {
-                     i2 = S_offd_j[jj1];
-                     if (P_marker_offd[i2] >= jj_begin_row_offd)
-                        P_offd_data[P_marker_offd[i2]]
-                                  += distribute * S_offd_data[jj1];
+                     P_marker_offd[i1] = strong_f_marker;
                   }
                }
-               }
-               else
-               {
-                  /* do nothing */
-               }
             }
 
-            /*--------------------------------------------------------------
-             * Case 3: neighbor i1 weakly influences i, accumulate a_{i,i1}
-             * into the diagonal.
-             *--------------------------------------------------------------*/
-
-            else
-            {
-               /* do nothing */
-            }
-
-         }
-
+            jj_end_row_offd = jj_counter_offd;
 
-          /*----------------------------------------------------------------
-           * Still looping over ith row of S. Next, loop over the
-           * off-diagonal part of S
-           *---------------------------------------------------------------*/
+            /* Loop over ith row of S.  First, the diagonal part of S */
 
-         if (num_procs > 1)
-         {
-            for (jj = S_offd_i[i]; jj < S_offd_i[i+1]; jj++)
+            for (jj = S_diag_i[i]; jj < S_diag_i[i + 1]; jj++)
             {
-               i1 = S_offd_j[jj];
+               i1 = S_diag_j[jj];
 
-            /*--------------------------------------------------------------
-             * Case 1: neighbor i1 is a C-point and strongly influences i,
-             * accumulate a_{i,i1} into the interpolation weight.
-             *--------------------------------------------------------------*/
+               /*--------------------------------------------------------------
+                * Case 1: neighbor i1 is a C-point and strongly influences i,
+                * accumulate a_{i,i1} into the interpolation weight.
+                *--------------------------------------------------------------*/
 
-               if (P_marker_offd[i1] >= jj_begin_row_offd)
+               if (P_marker[i1] >= jj_begin_row)
                {
-                  P_offd_data[P_marker_offd[i1]] += S_offd_data[jj];
+                  P_diag_data[P_marker[i1]] += S_diag_data[jj];
                }
 
-               /*------------------------------------------------------------
+               /*--------------------------------------------------------------
                 * Case 2: neighbor i1 is an F-point and strongly influences i,
                 * distribute a_{i,i1} to C-points that strongly infuence i.
                 * Note: currently no distribution to the diagonal in this case.
-                *-----------------------------------------------------------*/
+                *--------------------------------------------------------------*/
 
-               else if (P_marker_offd[i1] == strong_f_marker)
+               else if (P_marker[i1] == strong_f_marker)
                {
                   sum = zero;
 
-               /*---------------------------------------------------------
-                * Loop over row of S_ext for point i1 and calculate the sum
-                * of the connections to c-points that strongly influence i.
-                *---------------------------------------------------------*/
-
-                  /* find row number */
-                  c_num = S_offd_j[jj];
+                  /*-----------------------------------------------------------
+                   * Loop over row of S for point i1 and calculate the sum
+                   * of the connections to c-points that strongly influence i.
+                   *-----------------------------------------------------------*/
 
-                  for (jj1 = S_ext_i[c_num]; jj1 < S_ext_i[c_num+1]; jj1++)
+                  /* Diagonal block part of row i1 */
+                  for (jj1 = S_diag_i[i1]; jj1 < S_diag_i[i1 + 1]; jj1++)
                   {
-                     big_i2 = S_ext_j[jj1];
-
-                     if (big_i2 >= col_1 && big_i2 < col_n)
+                     i2 = S_diag_j[jj1];
+                     if (P_marker[i2] >= jj_begin_row)
                      {
-                        /* in the diagonal block */
-                        if (P_marker[(HYPRE_Int)(big_i2-col_1)] >= jj_begin_row)
-                           sum += S_ext_data[jj1];
+                        sum += S_diag_data[jj1];
                      }
-                     else
+                  }
+
+                  /* Off-Diagonal block part of row i1 */
+                  if (num_procs > 1)
+                  {
+                     for (jj1 = S_offd_i[i1]; jj1 < S_offd_i[i1 + 1]; jj1++)
                      {
-                        /* in the off_diagonal block  */
-                        j = hypre_BigBinarySearch(col_map_offd,big_i2,num_cols_S_offd);
-                        if (j != -1)
+                        i2 = S_offd_j[jj1];
+                        if (P_marker_offd[i2] >= jj_begin_row_offd)
                         {
-                          if (P_marker_offd[j] >= jj_begin_row_offd)
-			      sum += S_ext_data[jj1];
+                           sum += S_offd_data[jj1];
                         }
-
                      }
-
                   }
 
                   if (sum != 0)
-		  {
-		  distribute = S_offd_data[jj] / sum;
-                  /*---------------------------------------------------------
-                   * Loop over row of S_ext for point i1 and do
-                   * the distribution.
-                   *--------------------------------------------------------*/
-
-                  /* Diagonal block part of row i1 */
-
-                  for (jj1 = S_ext_i[c_num]; jj1 < S_ext_i[c_num+1]; jj1++)
                   {
-                     big_i2 = S_ext_j[jj1];
+                     distribute = S_diag_data[jj] / sum;
+
+                     /*-----------------------------------------------------------
+                      * Loop over row of S for point i1 and do the distribution.
+                      *-----------------------------------------------------------*/
 
-                     if (big_i2 >= col_1 && big_i2 < col_n) /* in the diagonal block */
+                     /* Diagonal block part of row i1 */
+                     for (jj1 = S_diag_i[i1]; jj1 < S_diag_i[i1 + 1]; jj1++)
                      {
-                        if (P_marker[(HYPRE_Int)(big_i2-col_1)] >= jj_begin_row)
-                           P_diag_data[P_marker[(HYPRE_Int)(big_i2-col_1)]]
-                                     += distribute * S_ext_data[jj1];
+                        i2 = S_diag_j[jj1];
+                        if (P_marker[i2] >= jj_begin_row)
+                           P_diag_data[P_marker[i2]]
+                           += distribute * S_diag_data[jj1];
                      }
-                     else
+
+                     /* Off-Diagonal block part of row i1 */
+                     if (num_procs > 1)
                      {
-                        /* check to see if it is in the off_diagonal block  */
-                        j = hypre_BigBinarySearch(col_map_offd,big_i2,num_cols_S_offd);
-                        if (j != -1)
+                        for (jj1 = S_offd_i[i1]; jj1 < S_offd_i[i1 + 1]; jj1++)
                         {
-                           if (P_marker_offd[j] >= jj_begin_row_offd)
-                                  P_offd_data[P_marker_offd[j]]
-                                     += distribute * S_ext_data[jj1];
+                           i2 = S_offd_j[jj1];
+                           if (P_marker_offd[i2] >= jj_begin_row_offd)
+                              P_offd_data[P_marker_offd[i2]]
+                              += distribute * S_offd_data[jj1];
                         }
                      }
                   }
-                  }
-		  else
+                  else
                   {
                      /* do nothing */
                   }
                }
 
-               /*-----------------------------------------------------------
+               /*--------------------------------------------------------------
                 * Case 3: neighbor i1 weakly influences i, accumulate a_{i,i1}
                 * into the diagonal.
-                *-----------------------------------------------------------*/
+                *--------------------------------------------------------------*/
 
                else
                {
@@ -1913,31 +1851,158 @@ hypre_BoomerAMGBuildInterpGSMG( hypre_ParCSRMatrix   *A,
                }
 
             }
-         }
 
-        /*-----------------------------------------------------------------
-          * Set interpolation weight by dividing by the diagonal.
-          *-----------------------------------------------------------------*/
 
-         sum = 0.;
-         for (jj = jj_begin_row; jj < jj_end_row; jj++)
-            sum += P_diag_data[jj];
-         for (jj = jj_begin_row_offd; jj < jj_end_row_offd; jj++)
-            sum += P_offd_data[jj];
+            /*----------------------------------------------------------------
+             * Still looping over ith row of S. Next, loop over the
+             * off-diagonal part of S
+             *---------------------------------------------------------------*/
 
-         for (jj = jj_begin_row; jj < jj_end_row; jj++)
-            P_diag_data[jj] /= sum;
-         for (jj = jj_begin_row_offd; jj < jj_end_row_offd; jj++)
-            P_offd_data[jj] /= sum;
+            if (num_procs > 1)
+            {
+               for (jj = S_offd_i[i]; jj < S_offd_i[i + 1]; jj++)
+               {
+                  i1 = S_offd_j[jj];
 
-      }
+                  /*--------------------------------------------------------------
+                   * Case 1: neighbor i1 is a C-point and strongly influences i,
+                   * accumulate a_{i,i1} into the interpolation weight.
+                   *--------------------------------------------------------------*/
+
+                  if (P_marker_offd[i1] >= jj_begin_row_offd)
+                  {
+                     P_offd_data[P_marker_offd[i1]] += S_offd_data[jj];
+                  }
+
+                  /*------------------------------------------------------------
+                   * Case 2: neighbor i1 is an F-point and strongly influences i,
+                   * distribute a_{i,i1} to C-points that strongly infuence i.
+                   * Note: currently no distribution to the diagonal in this case.
+                   *-----------------------------------------------------------*/
+
+                  else if (P_marker_offd[i1] == strong_f_marker)
+                  {
+                     sum = zero;
+
+                     /*---------------------------------------------------------
+                      * Loop over row of S_ext for point i1 and calculate the sum
+                      * of the connections to c-points that strongly influence i.
+                      *---------------------------------------------------------*/
+
+                     /* find row number */
+                     c_num = S_offd_j[jj];
+
+                     for (jj1 = S_ext_i[c_num]; jj1 < S_ext_i[c_num + 1]; jj1++)
+                     {
+                        big_i2 = S_ext_j[jj1];
+
+                        if (big_i2 >= col_1 && big_i2 < col_n)
+                        {
+                           /* in the diagonal block */
+                           if (P_marker[(HYPRE_Int)(big_i2 - col_1)] >= jj_begin_row)
+                           {
+                              sum += S_ext_data[jj1];
+                           }
+                        }
+                        else
+                        {
+                           /* in the off_diagonal block  */
+                           j = hypre_BigBinarySearch(col_map_offd, big_i2, num_cols_S_offd);
+                           if (j != -1)
+                           {
+                              if (P_marker_offd[j] >= jj_begin_row_offd)
+                              {
+                                 sum += S_ext_data[jj1];
+                              }
+                           }
+
+                        }
+
+                     }
+
+                     if (sum != 0)
+                     {
+                        distribute = S_offd_data[jj] / sum;
+                        /*---------------------------------------------------------
+                         * Loop over row of S_ext for point i1 and do
+                         * the distribution.
+                         *--------------------------------------------------------*/
+
+                        /* Diagonal block part of row i1 */
+
+                        for (jj1 = S_ext_i[c_num]; jj1 < S_ext_i[c_num + 1]; jj1++)
+                        {
+                           big_i2 = S_ext_j[jj1];
+
+                           if (big_i2 >= col_1 && big_i2 < col_n) /* in the diagonal block */
+                           {
+                              if (P_marker[(HYPRE_Int)(big_i2 - col_1)] >= jj_begin_row)
+                                 P_diag_data[P_marker[(HYPRE_Int)(big_i2 - col_1)]]
+                                 += distribute * S_ext_data[jj1];
+                           }
+                           else
+                           {
+                              /* check to see if it is in the off_diagonal block  */
+                              j = hypre_BigBinarySearch(col_map_offd, big_i2, num_cols_S_offd);
+                              if (j != -1)
+                              {
+                                 if (P_marker_offd[j] >= jj_begin_row_offd)
+                                    P_offd_data[P_marker_offd[j]]
+                                    += distribute * S_ext_data[jj1];
+                              }
+                           }
+                        }
+                     }
+                     else
+                     {
+                        /* do nothing */
+                     }
+                  }
+
+                  /*-----------------------------------------------------------
+                   * Case 3: neighbor i1 weakly influences i, accumulate a_{i,i1}
+                   * into the diagonal.
+                   *-----------------------------------------------------------*/
+
+                  else
+                  {
+                     /* do nothing */
+                  }
+
+               }
+            }
+
+            /*-----------------------------------------------------------------
+              * Set interpolation weight by dividing by the diagonal.
+              *-----------------------------------------------------------------*/
+
+            sum = 0.;
+            for (jj = jj_begin_row; jj < jj_end_row; jj++)
+            {
+               sum += P_diag_data[jj];
+            }
+            for (jj = jj_begin_row_offd; jj < jj_end_row_offd; jj++)
+            {
+               sum += P_offd_data[jj];
+            }
 
-      strong_f_marker--;
+            for (jj = jj_begin_row; jj < jj_end_row; jj++)
+            {
+               P_diag_data[jj] /= sum;
+            }
+            for (jj = jj_begin_row_offd; jj < jj_end_row_offd; jj++)
+            {
+               P_offd_data[jj] /= sum;
+            }
 
-      P_offd_i[i+1] = jj_counter_offd;
-     }
-     hypre_TFree(P_marker, HYPRE_MEMORY_HOST);
-     hypre_TFree(P_marker_offd, HYPRE_MEMORY_HOST);
+         }
+
+         strong_f_marker--;
+
+         P_offd_i[i + 1] = jj_counter_offd;
+      }
+      hypre_TFree(P_marker, HYPRE_MEMORY_HOST);
+      hypre_TFree(P_marker_offd, HYPRE_MEMORY_HOST);
    }
 
    P = hypre_ParCSRMatrixCreate(comm,
@@ -1980,47 +2045,51 @@ hypre_BoomerAMGBuildInterpGSMG( hypre_ParCSRMatrix   *A,
       P_marker = hypre_CTAlloc(HYPRE_Int,  P_offd_size, HYPRE_MEMORY_HOST);
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-      for (i=0; i < P_offd_size; i++)
-	 P_marker[i] = P_offd_j[i];
+      for (i = 0; i < P_offd_size; i++)
+      {
+         P_marker[i] = P_offd_j[i];
+      }
 
-      hypre_qsort0(P_marker, 0, P_offd_size-1);
+      hypre_qsort0(P_marker, 0, P_offd_size - 1);
 
       num_cols_P_offd = 1;
       index = P_marker[0];
-      for (i=1; i < P_offd_size; i++)
+      for (i = 1; i < P_offd_size; i++)
       {
-	if (P_marker[i] > index)
-	{
- 	  index = P_marker[i];
- 	  P_marker[num_cols_P_offd++] = index;
-  	}
+         if (P_marker[i] > index)
+         {
+            index = P_marker[i];
+            P_marker[num_cols_P_offd++] = index;
+         }
       }
 
       col_map_offd_P = hypre_CTAlloc(HYPRE_BigInt, num_cols_P_offd, HYPRE_MEMORY_HOST);
       tmp_map_offd = hypre_CTAlloc(HYPRE_Int, num_cols_P_offd, HYPRE_MEMORY_HOST);
 
-      for (i=0; i < num_cols_P_offd; i++)
+      for (i = 0; i < num_cols_P_offd; i++)
+      {
          tmp_map_offd[i] = P_marker[i];
+      }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-      for (i=0; i < P_offd_size; i++)
-	P_offd_j[i] = hypre_BinarySearch(tmp_map_offd,
-					 P_offd_j[i],
-					 num_cols_P_offd);
+      for (i = 0; i < P_offd_size; i++)
+         P_offd_j[i] = hypre_BinarySearch(tmp_map_offd,
+                                          P_offd_j[i],
+                                          num_cols_P_offd);
       hypre_TFree(P_marker, HYPRE_MEMORY_HOST);
    }
 
    if (num_cols_P_offd)
    {
-   	hypre_ParCSRMatrixColMapOffd(P) = col_map_offd_P;
-        hypre_CSRMatrixNumCols(P_offd) = num_cols_P_offd;
+      hypre_ParCSRMatrixColMapOffd(P) = col_map_offd_P;
+      hypre_CSRMatrixNumCols(P_offd) = num_cols_P_offd;
    }
 
-   hypre_GetCommPkgRTFromCommPkgA(P,S,fine_to_coarse, tmp_map_offd);
+   hypre_GetCommPkgRTFromCommPkgA(P, S, fine_to_coarse, tmp_map_offd);
 
    *P_ptr = P;
 
@@ -2032,9 +2101,7 @@ hypre_BoomerAMGBuildInterpGSMG( hypre_ParCSRMatrix   *A,
    hypre_TFree(coarse_counter, HYPRE_MEMORY_HOST);
    hypre_TFree(jj_count, HYPRE_MEMORY_HOST);
    hypre_TFree(jj_count_offd, HYPRE_MEMORY_HOST);
+   hypre_CSRMatrixDestroy(S_ext);
 
-   if (num_procs > 1) hypre_CSRMatrixDestroy(S_ext);
-
-   return(0);
-
+   return hypre_error_flag;
 }
diff --git a/external/hypre/src/parcsr_ls/par_ilu.c b/external/hypre/src/parcsr_ls/par_ilu.c
index 51038b98..bd88027d 100644
--- a/external/hypre/src/parcsr_ls/par_ilu.c
+++ b/external/hypre/src/parcsr_ls/par_ilu.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -12,510 +12,406 @@
  *****************************************************************************/
 
 #include "_hypre_parcsr_ls.h"
-#include "_hypre_utilities.hpp"
-#include "par_ilu.h"
 
-/* Create */
+/*--------------------------------------------------------------------------
+ * hypre_ILUCreate
+ *--------------------------------------------------------------------------*/
+
 void *
-hypre_ILUCreate()
+hypre_ILUCreate( void )
 {
-   hypre_ParILUData                       *ilu_data;
-
-   ilu_data                               = hypre_CTAlloc(hypre_ParILUData,  1, HYPRE_MEMORY_HOST);
-
-#ifdef HYPRE_USING_CUDA
-   hypre_ParILUDataMatLMatrixDescription(ilu_data) = NULL;
-   hypre_ParILUDataMatUMatrixDescription(ilu_data) = NULL;
-   hypre_ParILUDataMatBLILUSolveInfo(ilu_data) = NULL;
-   hypre_ParILUDataMatBUILUSolveInfo(ilu_data) = NULL;
-   hypre_ParILUDataMatSLILUSolveInfo(ilu_data) = NULL;
-   hypre_ParILUDataMatSUILUSolveInfo(ilu_data) = NULL;
-   hypre_ParILUDataILUSolveBuffer(ilu_data) = NULL;
-   hypre_ParILUDataILUSolvePolicy(ilu_data) = CUSPARSE_SOLVE_POLICY_USE_LEVEL;
-   hypre_ParILUDataAperm(ilu_data) = NULL;
-   hypre_ParILUDataMatBILUDevice(ilu_data) = NULL;
-   hypre_ParILUDataMatSILUDevice(ilu_data) = NULL;
-   hypre_ParILUDataMatEDevice(ilu_data) = NULL;
-   hypre_ParILUDataMatFDevice(ilu_data) = NULL;
-   hypre_ParILUDataR(ilu_data) = NULL;
-   hypre_ParILUDataP(ilu_data) = NULL;
-   hypre_ParILUDataFTempUpper(ilu_data) = NULL;
-   hypre_ParILUDataUTempLower(ilu_data) = NULL;
-   hypre_ParILUDataMatAFakeDiagonal(ilu_data) = NULL;
+   hypre_ParILUData  *ilu_data;
+   hypre_Solver      *base;
+
+   ilu_data = hypre_CTAlloc(hypre_ParILUData, 1, HYPRE_MEMORY_HOST);
+   base     = (hypre_Solver*) ilu_data;
+
+   /* Set base solver function pointers */
+   hypre_SolverSetup(base)   = (HYPRE_PtrToSolverFcn)  HYPRE_ILUSetup;
+   hypre_SolverSolve(base)   = (HYPRE_PtrToSolverFcn)  HYPRE_ILUSolve;
+   hypre_SolverDestroy(base) = (HYPRE_PtrToDestroyFcn) HYPRE_ILUDestroy;
+
+#if defined(HYPRE_USING_GPU)
+   hypre_ParILUDataAperm(ilu_data)                        = NULL;
+   hypre_ParILUDataMatBILUDevice(ilu_data)                = NULL;
+   hypre_ParILUDataMatSILUDevice(ilu_data)                = NULL;
+   hypre_ParILUDataMatEDevice(ilu_data)                   = NULL;
+   hypre_ParILUDataMatFDevice(ilu_data)                   = NULL;
+   hypre_ParILUDataR(ilu_data)                            = NULL;
+   hypre_ParILUDataP(ilu_data)                            = NULL;
+   hypre_ParILUDataFTempUpper(ilu_data)                   = NULL;
+   hypre_ParILUDataUTempLower(ilu_data)                   = NULL;
+   hypre_ParILUDataADiagDiag(ilu_data)                    = NULL;
+   hypre_ParILUDataSDiagDiag(ilu_data)                    = NULL;
 #endif
 
    /* general data */
-   hypre_ParILUDataGlobalSolver(ilu_data) = 0;
-   hypre_ParILUDataMatA(ilu_data) = NULL;
-   hypre_ParILUDataMatL(ilu_data) = NULL;
-   hypre_ParILUDataMatD(ilu_data) = NULL;
-   hypre_ParILUDataMatU(ilu_data) = NULL;
-   hypre_ParILUDataMatS(ilu_data) = NULL;
-   hypre_ParILUDataSchurSolver(ilu_data) = NULL;
-   hypre_ParILUDataSchurPrecond(ilu_data) = NULL;
-   hypre_ParILUDataRhs(ilu_data) = NULL;
-   hypre_ParILUDataX(ilu_data) = NULL;
-
-   hypre_ParILUDataDroptol(ilu_data) = hypre_TAlloc(HYPRE_Real,3,HYPRE_MEMORY_HOST);
-   hypre_ParILUDataDroptol(ilu_data)[0] = 1.0e-02;/* droptol for B */
-   hypre_ParILUDataDroptol(ilu_data)[1] = 1.0e-02;/* droptol for E and F */
-   hypre_ParILUDataDroptol(ilu_data)[2] = 1.0e-02;/* droptol for S */
-   hypre_ParILUDataLfil(ilu_data) = 0;
-   hypre_ParILUDataMaxRowNnz(ilu_data) = 1000;
-   hypre_ParILUDataCFMarkerArray(ilu_data) = NULL;
-   hypre_ParILUDataPerm(ilu_data) = NULL;
-   hypre_ParILUDataQPerm(ilu_data) = NULL;
-   hypre_ParILUDataTolDDPQ(ilu_data) = 1.0e-01;
-
-   hypre_ParILUDataF(ilu_data) = NULL;
-   hypre_ParILUDataU(ilu_data) = NULL;
-   hypre_ParILUDataFTemp(ilu_data) = NULL;
-   hypre_ParILUDataUTemp(ilu_data) = NULL;
-   hypre_ParILUDataXTemp(ilu_data) = NULL;
-   hypre_ParILUDataYTemp(ilu_data) = NULL;
-   hypre_ParILUDataUExt(ilu_data) = NULL;
-   hypre_ParILUDataFExt(ilu_data) = NULL;
-   hypre_ParILUDataResidual(ilu_data) = NULL;
-   hypre_ParILUDataRelResNorms(ilu_data) = NULL;
-
-   hypre_ParILUDataNumIterations(ilu_data) = 0;
-
-   hypre_ParILUDataMaxIter(ilu_data) = 20;
-   hypre_ParILUDataTol(ilu_data) = 1.0e-7;
-
-   hypre_ParILUDataLogging(ilu_data) = 0;
-   hypre_ParILUDataPrintLevel(ilu_data) = 0;
-
-   hypre_ParILUDataL1Norms(ilu_data) = NULL;
-
-   hypre_ParILUDataOperatorComplexity(ilu_data) = 0.;
-
-   hypre_ParILUDataIluType(ilu_data) = 0;
-   hypre_ParILUDataNLU(ilu_data) = 0;
-   hypre_ParILUDataNI(ilu_data) = 0;
-   hypre_ParILUDataUEnd(ilu_data) = NULL;
+   hypre_ParILUDataGlobalSolver(ilu_data)                 = 0;
+   hypre_ParILUDataMatA(ilu_data)                         = NULL;
+   hypre_ParILUDataMatL(ilu_data)                         = NULL;
+   hypre_ParILUDataMatD(ilu_data)                         = NULL;
+   hypre_ParILUDataMatU(ilu_data)                         = NULL;
+   hypre_ParILUDataMatS(ilu_data)                         = NULL;
+   hypre_ParILUDataSchurSolver(ilu_data)                  = NULL;
+   hypre_ParILUDataSchurPrecond(ilu_data)                 = NULL;
+   hypre_ParILUDataRhs(ilu_data)                          = NULL;
+   hypre_ParILUDataX(ilu_data)                            = NULL;
+
+   /* TODO (VPM): Transform this into a stack array */
+   hypre_ParILUDataDroptol(ilu_data) = hypre_TAlloc(HYPRE_Real, 3, HYPRE_MEMORY_HOST);
+   hypre_ParILUDataDroptol(ilu_data)[0]                   = 1.0e-02; /* droptol for B */
+   hypre_ParILUDataDroptol(ilu_data)[1]                   = 1.0e-02; /* droptol for E and F */
+   hypre_ParILUDataDroptol(ilu_data)[2]                   = 1.0e-02; /* droptol for S */
+   hypre_ParILUDataLfil(ilu_data)                         = 0;
+   hypre_ParILUDataMaxRowNnz(ilu_data)                    = 1000;
+   hypre_ParILUDataCFMarkerArray(ilu_data)                = NULL;
+   hypre_ParILUDataPerm(ilu_data)                         = NULL;
+   hypre_ParILUDataQPerm(ilu_data)                        = NULL;
+   hypre_ParILUDataTolDDPQ(ilu_data)                      = 1.0e-01;
+   hypre_ParILUDataF(ilu_data)                            = NULL;
+   hypre_ParILUDataU(ilu_data)                            = NULL;
+   hypre_ParILUDataFTemp(ilu_data)                        = NULL;
+   hypre_ParILUDataUTemp(ilu_data)                        = NULL;
+   hypre_ParILUDataXTemp(ilu_data)                        = NULL;
+   hypre_ParILUDataYTemp(ilu_data)                        = NULL;
+   hypre_ParILUDataZTemp(ilu_data)                        = NULL;
+   hypre_ParILUDataUExt(ilu_data)                         = NULL;
+   hypre_ParILUDataFExt(ilu_data)                         = NULL;
+   hypre_ParILUDataResidual(ilu_data)                     = NULL;
+   hypre_ParILUDataRelResNorms(ilu_data)                  = NULL;
+   hypre_ParILUDataNumIterations(ilu_data)                = 0;
+   hypre_ParILUDataMaxIter(ilu_data)                      = 20;
+   hypre_ParILUDataTriSolve(ilu_data)                     = 1;
+   hypre_ParILUDataLowerJacobiIters(ilu_data)             = 5;
+   hypre_ParILUDataUpperJacobiIters(ilu_data)             = 5;
+   hypre_ParILUDataTol(ilu_data)                          = 1.0e-7;
+   hypre_ParILUDataLogging(ilu_data)                      = 0;
+   hypre_ParILUDataPrintLevel(ilu_data)                   = 0;
+   hypre_ParILUDataL1Norms(ilu_data)                      = NULL;
+   hypre_ParILUDataOperatorComplexity(ilu_data)           = 0.;
+   hypre_ParILUDataIluType(ilu_data)                      = 0;
+   hypre_ParILUDataNLU(ilu_data)                          = 0;
+   hypre_ParILUDataNI(ilu_data)                           = 0;
+   hypre_ParILUDataUEnd(ilu_data)                         = NULL;
+
+   /* Iterative setup variables */
+   hypre_ParILUDataIterativeSetupType(ilu_data)           = 0;
+   hypre_ParILUDataIterativeSetupOption(ilu_data)         = 0;
+   hypre_ParILUDataIterativeSetupMaxIter(ilu_data)        = 100;
+   hypre_ParILUDataIterativeSetupNumIter(ilu_data)        = 0;
+   hypre_ParILUDataIterativeSetupTolerance(ilu_data)      = 1.e-6;
+   hypre_ParILUDataIterativeSetupHistory(ilu_data)        = NULL;
 
    /* reordering_type default to use local RCM */
-   hypre_ParILUDataReorderingType(ilu_data) = 1;
+   hypre_ParILUDataReorderingType(ilu_data)               = 1;
 
    /* see hypre_ILUSetType for more default values */
-   hypre_ParILUDataTestOption(ilu_data) = 0;
-
-   /* -> GENERAL-SLOTS */
-   hypre_ParILUDataSchurSolverLogging(ilu_data) = 0;
-   hypre_ParILUDataSchurSolverPrintLevel(ilu_data) = 0;
-
-   /* -> SCHUR-GMRES */
-   hypre_ParILUDataSchurGMRESKDim(ilu_data) = 5;
-   hypre_ParILUDataSchurGMRESMaxIter(ilu_data) = 5;
-   hypre_ParILUDataSchurGMRESTol(ilu_data) = 0.0;
-   hypre_ParILUDataSchurGMRESAbsoluteTol(ilu_data) = 0.0;
-   hypre_ParILUDataSchurGMRESRelChange(ilu_data) = 0;
-
-   /* schur precond data */
-   hypre_ParILUDataSchurPrecondIluType(ilu_data) = 0;
-   hypre_ParILUDataSchurPrecondIluLfil(ilu_data) = 0;
-   hypre_ParILUDataSchurPrecondIluMaxRowNnz(ilu_data) = 100;
-   hypre_ParILUDataSchurPrecondIluDroptol(ilu_data) = NULL;/* this is not the default option, set it only when switched to */
-   hypre_ParILUDataSchurPrecondPrintLevel(ilu_data) = 0;
-   hypre_ParILUDataSchurPrecondMaxIter(ilu_data) = 1;
-   hypre_ParILUDataSchurPrecondTol(ilu_data) = 0.0;
-
-   /* -> SCHUR-NSH */
-   hypre_ParILUDataSchurNSHSolveMaxIter(ilu_data) = 5;
-   hypre_ParILUDataSchurNSHSolveTol(ilu_data) = 0.0;
-   hypre_ParILUDataSchurNSHDroptol(ilu_data) = NULL;/* this is not the default option, set it only when switched to */
-
-   hypre_ParILUDataSchurNSHMaxNumIter(ilu_data) = 2;
-   hypre_ParILUDataSchurNSHMaxRowNnz(ilu_data) = 1000;
-   hypre_ParILUDataSchurNSHTol(ilu_data) = 1e-09;
-
-   hypre_ParILUDataSchurMRMaxIter(ilu_data) = 2;
-   hypre_ParILUDataSchurMRColVersion(ilu_data) = 0;
-   hypre_ParILUDataSchurMRMaxRowNnz(ilu_data) = 200;
-   hypre_ParILUDataSchurMRTol(ilu_data) = 1e-09;
-
-   return (void *)                        ilu_data;
+   hypre_ParILUDataTestOption(ilu_data)                   = 0;
+
+   /* -> General slots */
+   hypre_ParILUDataSchurSolverLogging(ilu_data)           = 0;
+   hypre_ParILUDataSchurSolverPrintLevel(ilu_data)        = 0;
+
+   /* -> Schur-GMRES */
+   hypre_ParILUDataSchurGMRESKDim(ilu_data)               = 5;
+   hypre_ParILUDataSchurGMRESMaxIter(ilu_data)            = 5;
+   hypre_ParILUDataSchurGMRESTol(ilu_data)                = 0.0;
+   hypre_ParILUDataSchurGMRESAbsoluteTol(ilu_data)        = 0.0;
+   hypre_ParILUDataSchurGMRESRelChange(ilu_data)          = 0;
+
+   /* -> Schur precond data */
+   hypre_ParILUDataSchurPrecondIluType(ilu_data)          = 0;
+   hypre_ParILUDataSchurPrecondIluLfil(ilu_data)          = 0;
+   hypre_ParILUDataSchurPrecondIluMaxRowNnz(ilu_data)     = 100;
+   hypre_ParILUDataSchurPrecondIluDroptol(ilu_data)       = NULL;
+   hypre_ParILUDataSchurPrecondPrintLevel(ilu_data)       = 0;
+   hypre_ParILUDataSchurPrecondMaxIter(ilu_data)          = 1;
+   hypre_ParILUDataSchurPrecondTriSolve(ilu_data)         = 1;
+   hypre_ParILUDataSchurPrecondLowerJacobiIters(ilu_data) = 5;
+   hypre_ParILUDataSchurPrecondUpperJacobiIters(ilu_data) = 5;
+   hypre_ParILUDataSchurPrecondTol(ilu_data)              = 0.0;
+
+   /* -> Schur-NSH */
+   hypre_ParILUDataSchurNSHSolveMaxIter(ilu_data)         = 5;
+   hypre_ParILUDataSchurNSHSolveTol(ilu_data)             = 0.0;
+   hypre_ParILUDataSchurNSHDroptol(ilu_data)              = NULL;
+   hypre_ParILUDataSchurNSHMaxNumIter(ilu_data)           = 2;
+   hypre_ParILUDataSchurNSHMaxRowNnz(ilu_data)            = 1000;
+   hypre_ParILUDataSchurNSHTol(ilu_data)                  = 1e-09;
+   hypre_ParILUDataSchurMRMaxIter(ilu_data)               = 2;
+   hypre_ParILUDataSchurMRColVersion(ilu_data)            = 0;
+   hypre_ParILUDataSchurMRMaxRowNnz(ilu_data)             = 200;
+   hypre_ParILUDataSchurMRTol(ilu_data)                   = 1e-09;
+
+   return ilu_data;
 }
 
 /*--------------------------------------------------------------------------
+ * hypre_ILUDestroy
  *--------------------------------------------------------------------------*/
-/* Destroy */
+
 HYPRE_Int
 hypre_ILUDestroy( void *data )
 {
-   hypre_ParILUData * ilu_data = (hypre_ParILUData*) data;
+   hypre_ParILUData      *ilu_data = (hypre_ParILUData*) data;
+   HYPRE_MemoryLocation   memory_location;
 
-#ifdef HYPRE_USING_CUDA
-   if(hypre_ParILUDataILUSolveBuffer(ilu_data))
-   {
-      hypre_TFree(hypre_ParILUDataILUSolveBuffer(ilu_data), HYPRE_MEMORY_DEVICE);
-      hypre_ParILUDataILUSolveBuffer(ilu_data) = NULL;
-   }
-   if(hypre_ParILUDataMatLMatrixDescription(ilu_data))
-   {
-      HYPRE_CUSPARSE_CALL( (cusparseDestroyMatDescr(hypre_ParILUDataMatLMatrixDescription(ilu_data))) );
-      hypre_ParILUDataMatLMatrixDescription(ilu_data) = NULL;
-   }
-   if(hypre_ParILUDataMatUMatrixDescription(ilu_data))
-   {
-      HYPRE_CUSPARSE_CALL( (cusparseDestroyMatDescr(hypre_ParILUDataMatUMatrixDescription(ilu_data))) );
-      hypre_ParILUDataMatUMatrixDescription(ilu_data) = NULL;
-   }
-   if(hypre_ParILUDataMatALILUSolveInfo(ilu_data))
-   {
-      HYPRE_CUSPARSE_CALL( (cusparseDestroyCsrsv2Info(hypre_ParILUDataMatALILUSolveInfo(ilu_data))) );
-      hypre_ParILUDataMatALILUSolveInfo(ilu_data) = NULL;
-   }
-   if(hypre_ParILUDataMatAUILUSolveInfo(ilu_data))
-   {
-      HYPRE_CUSPARSE_CALL( (cusparseDestroyCsrsv2Info(hypre_ParILUDataMatAUILUSolveInfo(ilu_data))) );
-      hypre_ParILUDataMatAUILUSolveInfo(ilu_data) = NULL;
-   }
-   if(hypre_ParILUDataMatBLILUSolveInfo(ilu_data))
-   {
-      HYPRE_CUSPARSE_CALL( (cusparseDestroyCsrsv2Info(hypre_ParILUDataMatBLILUSolveInfo(ilu_data))) );
-      hypre_ParILUDataMatBLILUSolveInfo(ilu_data) = NULL;
-   }
-   if(hypre_ParILUDataMatBUILUSolveInfo(ilu_data))
-   {
-      HYPRE_CUSPARSE_CALL( (cusparseDestroyCsrsv2Info(hypre_ParILUDataMatBUILUSolveInfo(ilu_data))) );
-      hypre_ParILUDataMatBUILUSolveInfo(ilu_data) = NULL;
-   }
-   if(hypre_ParILUDataMatSLILUSolveInfo(ilu_data))
-   {
-      HYPRE_CUSPARSE_CALL( (cusparseDestroyCsrsv2Info(hypre_ParILUDataMatSLILUSolveInfo(ilu_data))) );
-      hypre_ParILUDataMatSLILUSolveInfo(ilu_data) = NULL;
-   }
-   if(hypre_ParILUDataMatSUILUSolveInfo(ilu_data))
-   {
-      HYPRE_CUSPARSE_CALL( (cusparseDestroyCsrsv2Info(hypre_ParILUDataMatSUILUSolveInfo(ilu_data))) );
-      hypre_ParILUDataMatSUILUSolveInfo(ilu_data) = NULL;
-   }
-   if(hypre_ParILUDataMatAILUDevice(ilu_data))
+   if (ilu_data)
    {
+      /* Get memory location from L factor */
+      if (hypre_ParILUDataMatL(ilu_data))
+      {
+         memory_location = hypre_ParCSRMatrixMemoryLocation(hypre_ParILUDataMatL(ilu_data));
+      }
+      else
+      {
+         /* Use default memory location */
+         HYPRE_GetMemoryLocation(&memory_location);
+      }
+
+      /* GPU additional data */
+#if defined(HYPRE_USING_GPU)
+      hypre_ParCSRMatrixDestroy( hypre_ParILUDataAperm(ilu_data) );
+      hypre_ParCSRMatrixDestroy( hypre_ParILUDataR(ilu_data) );
+      hypre_ParCSRMatrixDestroy( hypre_ParILUDataP(ilu_data) );
+
       hypre_CSRMatrixDestroy( hypre_ParILUDataMatAILUDevice(ilu_data) );
-      hypre_ParILUDataMatAILUDevice(ilu_data) = NULL;
-   }
-   if(hypre_ParILUDataMatBILUDevice(ilu_data))
-   {
       hypre_CSRMatrixDestroy( hypre_ParILUDataMatBILUDevice(ilu_data) );
-      hypre_ParILUDataMatBILUDevice(ilu_data) = NULL;
-   }
-   if(hypre_ParILUDataMatSILUDevice(ilu_data))
-   {
       hypre_CSRMatrixDestroy( hypre_ParILUDataMatSILUDevice(ilu_data) );
-      hypre_ParILUDataMatSILUDevice(ilu_data) = NULL;
-   }
-   if(hypre_ParILUDataMatEDevice(ilu_data))
-   {
       hypre_CSRMatrixDestroy( hypre_ParILUDataMatEDevice(ilu_data) );
-      hypre_ParILUDataMatEDevice(ilu_data) = NULL;
-   }
-   if(hypre_ParILUDataMatFDevice(ilu_data))
-   {
       hypre_CSRMatrixDestroy( hypre_ParILUDataMatFDevice(ilu_data) );
-      hypre_ParILUDataMatFDevice(ilu_data) = NULL;
-   }
-   if(hypre_ParILUDataAperm(ilu_data))
-   {
-      hypre_ParCSRMatrixDestroy( hypre_ParILUDataAperm(ilu_data) );
-      hypre_ParILUDataAperm(ilu_data) = NULL;
-   }
-   if(hypre_ParILUDataR(ilu_data))
-   {
-      hypre_ParCSRMatrixDestroy( hypre_ParILUDataR(ilu_data) );
-      hypre_ParILUDataR(ilu_data) = NULL;
-   }
-   if(hypre_ParILUDataP(ilu_data))
-   {
-      hypre_ParCSRMatrixDestroy( hypre_ParILUDataP(ilu_data) );
-      hypre_ParILUDataP(ilu_data) = NULL;
-   }
-   if(hypre_ParILUDataFTempUpper(ilu_data))
-   {
       hypre_SeqVectorDestroy( hypre_ParILUDataFTempUpper(ilu_data) );
-      hypre_ParILUDataFTempUpper(ilu_data) = NULL;
-   }
-   if(hypre_ParILUDataUTempLower(ilu_data))
-   {
       hypre_SeqVectorDestroy( hypre_ParILUDataUTempLower(ilu_data) );
-      hypre_ParILUDataUTempLower(ilu_data) = NULL;
-   }
-   if(hypre_ParILUDataMatAFakeDiagonal(ilu_data))
-   {
-      hypre_TFree( hypre_ParILUDataMatAFakeDiagonal(ilu_data), HYPRE_MEMORY_DEVICE);
-      hypre_ParILUDataMatAFakeDiagonal(ilu_data) = NULL;
-   }
+      hypre_SeqVectorDestroy( hypre_ParILUDataADiagDiag(ilu_data) );
+      hypre_SeqVectorDestroy( hypre_ParILUDataSDiagDiag(ilu_data) );
 #endif
 
-   /* final residual vector */
-   if(hypre_ParILUDataResidual(ilu_data))
-   {
+      /* final residual vector */
       hypre_ParVectorDestroy( hypre_ParILUDataResidual(ilu_data) );
-      hypre_ParILUDataResidual(ilu_data) = NULL;
-   }
-   if(hypre_ParILUDataRelResNorms(ilu_data))
-   {
-      hypre_TFree( hypre_ParILUDataRelResNorms(ilu_data) , HYPRE_MEMORY_HOST);
-      hypre_ParILUDataRelResNorms(ilu_data) = NULL;
-   }
-   /* temp vectors for solve phase */
-   if(hypre_ParILUDataUTemp(ilu_data))
-   {
+      hypre_TFree( hypre_ParILUDataRelResNorms(ilu_data), HYPRE_MEMORY_HOST );
+
+      /* temp vectors for solve phase */
       hypre_ParVectorDestroy( hypre_ParILUDataUTemp(ilu_data) );
-      hypre_ParILUDataUTemp(ilu_data) = NULL;
-   }
-   if(hypre_ParILUDataFTemp(ilu_data))
-   {
       hypre_ParVectorDestroy( hypre_ParILUDataFTemp(ilu_data) );
-      hypre_ParILUDataFTemp(ilu_data) = NULL;
-   }
-   if(hypre_ParILUDataXTemp(ilu_data))
-   {
       hypre_ParVectorDestroy( hypre_ParILUDataXTemp(ilu_data) );
-      hypre_ParILUDataXTemp(ilu_data) = NULL;
-   }
-   if(hypre_ParILUDataYTemp(ilu_data))
-   {
       hypre_ParVectorDestroy( hypre_ParILUDataYTemp(ilu_data) );
-      hypre_ParILUDataYTemp(ilu_data) = NULL;
-   }
-   if(hypre_ParILUDataUExt(ilu_data))
-   {
-      hypre_TFree(hypre_ParILUDataUExt(ilu_data), HYPRE_MEMORY_HOST);
-      hypre_ParILUDataUExt(ilu_data) = NULL;
-   }
-   if(hypre_ParILUDataFExt(ilu_data))
-   {
-      hypre_TFree(hypre_ParILUDataFExt(ilu_data), HYPRE_MEMORY_HOST);
-      hypre_ParILUDataFExt(ilu_data) = NULL;
-   }
-   if(hypre_ParILUDataRhs(ilu_data))
-   {
+      hypre_ParVectorDestroy( hypre_ParILUDataZTemp(ilu_data) );
       hypre_ParVectorDestroy( hypre_ParILUDataRhs(ilu_data) );
-      hypre_ParILUDataRhs(ilu_data) = NULL;
-   }
-   if(hypre_ParILUDataX(ilu_data))
-   {
       hypre_ParVectorDestroy( hypre_ParILUDataX(ilu_data) );
-      hypre_ParILUDataX(ilu_data) = NULL;
-   }
-   /* l1_norms */
-   if(hypre_ParILUDataL1Norms(ilu_data))
-   {
-      hypre_TFree(hypre_ParILUDataL1Norms(ilu_data), HYPRE_MEMORY_HOST);
-      hypre_ParILUDataL1Norms(ilu_data) = NULL;
-   }
+      hypre_TFree( hypre_ParILUDataUExt(ilu_data), HYPRE_MEMORY_HOST );
+      hypre_TFree( hypre_ParILUDataFExt(ilu_data), HYPRE_MEMORY_HOST );
 
-   /* u_end */
-   if(hypre_ParILUDataUEnd(ilu_data))
-   {
-      hypre_TFree(hypre_ParILUDataUEnd(ilu_data), HYPRE_MEMORY_HOST);
-      hypre_ParILUDataUEnd(ilu_data) = NULL;
-   }
+      /* l1_norms */
+      hypre_TFree( hypre_ParILUDataL1Norms(ilu_data), HYPRE_MEMORY_HOST );
 
-   /* Factors */
-   if(hypre_ParILUDataMatL(ilu_data))
-   {
-      hypre_ParCSRMatrixDestroy(hypre_ParILUDataMatL(ilu_data));
-      hypre_ParILUDataMatL(ilu_data) = NULL;
-   }
-   if(hypre_ParILUDataMatU(ilu_data))
-   {
-      hypre_ParCSRMatrixDestroy(hypre_ParILUDataMatU(ilu_data));
-      hypre_ParILUDataMatU(ilu_data) = NULL;
-   }
-   if(hypre_ParILUDataMatD(ilu_data))
-   {
-      hypre_TFree(hypre_ParILUDataMatD(ilu_data), HYPRE_MEMORY_DEVICE);
-      hypre_ParILUDataMatD(ilu_data) = NULL;
-   }
-   if(hypre_ParILUDataMatLModified(ilu_data))
-   {
-      hypre_ParCSRMatrixDestroy(hypre_ParILUDataMatLModified(ilu_data));
-      hypre_ParILUDataMatLModified(ilu_data) = NULL;
-   }
-   if(hypre_ParILUDataMatUModified(ilu_data))
-   {
-      hypre_ParCSRMatrixDestroy(hypre_ParILUDataMatUModified(ilu_data));
-      hypre_ParILUDataMatUModified(ilu_data) = NULL;
-   }
-   if(hypre_ParILUDataMatDModified(ilu_data))
-   {
-      hypre_TFree(hypre_ParILUDataMatDModified(ilu_data), HYPRE_MEMORY_DEVICE);
-      hypre_ParILUDataMatDModified(ilu_data) = NULL;
-   }
-   if(hypre_ParILUDataMatS(ilu_data))
-   {
-      hypre_ParCSRMatrixDestroy(hypre_ParILUDataMatS(ilu_data));
-      hypre_ParILUDataMatS(ilu_data) = NULL;
-   }
-   if(hypre_ParILUDataSchurSolver(ilu_data))
-   {
-      switch(hypre_ParILUDataIluType(ilu_data)){
-      case 10: case 11: case 40: case 41: case 50:
-         HYPRE_ParCSRGMRESDestroy(hypre_ParILUDataSchurSolver(ilu_data)); //GMRES for Schur
-         break;
-      case 20: case 21:
-         hypre_NSHDestroy(hypre_ParILUDataSchurSolver(ilu_data));//NSH for Schur
-         break;
-      default:
-         break;
-      }
-      hypre_ParILUDataSchurSolver(ilu_data) = NULL;
-   }
-   if(hypre_ParILUDataSchurPrecond(ilu_data))
-   {
-      switch(hypre_ParILUDataIluType(ilu_data)){
-      case 10: case 11: case 40: case 41:
-#ifdef HYPRE_USING_CUDA
-         if(hypre_ParILUDataIluType(ilu_data) != 10 && hypre_ParILUDataIluType(ilu_data) != 11)
+      /* u_end */
+      hypre_TFree( hypre_ParILUDataUEnd(ilu_data), HYPRE_MEMORY_HOST );
+
+      /* Factors */
+      hypre_ParCSRMatrixDestroy( hypre_ParILUDataMatS(ilu_data) );
+      hypre_ParCSRMatrixDestroy( hypre_ParILUDataMatL(ilu_data) );
+      hypre_ParCSRMatrixDestroy( hypre_ParILUDataMatU(ilu_data) );
+      hypre_ParCSRMatrixDestroy( hypre_ParILUDataMatLModified(ilu_data) );
+      hypre_ParCSRMatrixDestroy( hypre_ParILUDataMatUModified(ilu_data) );
+      hypre_TFree( hypre_ParILUDataMatD(ilu_data), memory_location );
+      hypre_TFree( hypre_ParILUDataMatDModified(ilu_data), memory_location );
+
+      if (hypre_ParILUDataSchurSolver(ilu_data))
+      {
+         switch (hypre_ParILUDataIluType(ilu_data))
          {
-#endif
-            HYPRE_ILUDestroy(hypre_ParILUDataSchurPrecond(ilu_data)); //ILU as precond for Schur
-#ifdef HYPRE_USING_CUDA
+            case 10: case 11: case 40: case 41: case 50:
+               /* GMRES for Schur */
+               HYPRE_ParCSRGMRESDestroy(hypre_ParILUDataSchurSolver(ilu_data));
+               break;
+
+            case 20: case 21:
+               /* NSH for Schur */
+               hypre_NSHDestroy(hypre_ParILUDataSchurSolver(ilu_data));
+               break;
+
+            default:
+               break;
          }
+      }
+
+      /* ILU as precond for Schur */
+      if ( hypre_ParILUDataSchurPrecond(ilu_data)  &&
+#if defined(HYPRE_USING_GPU)
+           hypre_ParILUDataIluType(ilu_data) != 10 &&
+           hypre_ParILUDataIluType(ilu_data) != 11 &&
 #endif
-         break;
-      default:
-         break;
-        }
-      hypre_ParILUDataSchurPrecond(ilu_data) = NULL;
-   }
-   /* CF marker array */
-   if(hypre_ParILUDataCFMarkerArray(ilu_data))
-   {
-      hypre_TFree(hypre_ParILUDataCFMarkerArray(ilu_data), HYPRE_MEMORY_HOST);
-      hypre_ParILUDataCFMarkerArray(ilu_data) = NULL;
-   }
-   /* permutation array */
-   if(hypre_ParILUDataPerm(ilu_data))
-   {
-      hypre_TFree(hypre_ParILUDataPerm(ilu_data), HYPRE_MEMORY_DEVICE);
-      hypre_ParILUDataPerm(ilu_data) = NULL;
-   }
-   if(hypre_ParILUDataQPerm(ilu_data))
-   {
-      hypre_TFree(hypre_ParILUDataQPerm(ilu_data), HYPRE_MEMORY_DEVICE);
-      hypre_ParILUDataQPerm(ilu_data) = NULL;
-   }
-   /* droptol array */
-   if(hypre_ParILUDataDroptol(ilu_data))
-   {
-      hypre_TFree(hypre_ParILUDataDroptol(ilu_data), HYPRE_MEMORY_HOST);
-      hypre_ParILUDataDroptol(ilu_data) = NULL;
-   }
-   if(hypre_ParILUDataSchurPrecondIluDroptol(ilu_data))
-   {
-      hypre_TFree(hypre_ParILUDataSchurPrecondIluDroptol(ilu_data), HYPRE_MEMORY_HOST);
-      hypre_ParILUDataSchurPrecondIluDroptol(ilu_data) = NULL;
-   }
-   if(hypre_ParILUDataSchurNSHDroptol(ilu_data))
-   {
-      hypre_TFree(hypre_ParILUDataSchurNSHDroptol(ilu_data), HYPRE_MEMORY_HOST);
-      hypre_ParILUDataSchurNSHDroptol(ilu_data) = NULL;
+           (hypre_ParILUDataIluType(ilu_data) == 10 ||
+            hypre_ParILUDataIluType(ilu_data) == 11 ||
+            hypre_ParILUDataIluType(ilu_data) == 40 ||
+            hypre_ParILUDataIluType(ilu_data) == 41) )
+      {
+         HYPRE_ILUDestroy( hypre_ParILUDataSchurPrecond(ilu_data) );
+      }
+
+      /* CF marker array */
+      hypre_TFree( hypre_ParILUDataCFMarkerArray(ilu_data), HYPRE_MEMORY_HOST );
+
+      /* permutation array */
+      hypre_TFree( hypre_ParILUDataPerm(ilu_data), memory_location );
+      hypre_TFree( hypre_ParILUDataQPerm(ilu_data), memory_location );
+
+      /* Iterative ILU data */
+      hypre_TFree( hypre_ParILUDataIterativeSetupHistory(ilu_data), HYPRE_MEMORY_HOST );
+
+      /* droptol array - TODO (VPM): remove this after changing to static array */
+      hypre_TFree( hypre_ParILUDataDroptol(ilu_data), HYPRE_MEMORY_HOST );
+      hypre_TFree( hypre_ParILUDataSchurPrecondIluDroptol(ilu_data), HYPRE_MEMORY_HOST );
+      hypre_TFree( hypre_ParILUDataSchurNSHDroptol(ilu_data), HYPRE_MEMORY_HOST );
    }
-   /* ilu data */
+
+   /* ILU data */
    hypre_TFree(ilu_data, HYPRE_MEMORY_HOST);
 
    return hypre_error_flag;
 }
+
 /*--------------------------------------------------------------------------
+ * hypre_ILUSetLevelOfFill
+ *
+ * Set fill level for ILUK
  *--------------------------------------------------------------------------*/
-/* set fill level (for ilu(k)) */
+
 HYPRE_Int
-hypre_ILUSetLevelOfFill( void *ilu_vdata, HYPRE_Int lfil )
+hypre_ILUSetLevelOfFill( void      *ilu_vdata,
+                         HYPRE_Int  lfil )
 {
    hypre_ParILUData *ilu_data = (hypre_ParILUData*) ilu_vdata;
+
    hypre_ParILUDataLfil(ilu_data) = lfil;
+
    return hypre_error_flag;
 }
-/* set max non-zeros per row in factors (for ilut) */
+
+/*--------------------------------------------------------------------------
+ * hypre_ILUSetMaxNnzPerRow
+ *
+ * Set max non-zeros per row in factors for ILUT
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_ILUSetMaxNnzPerRow( void *ilu_vdata, HYPRE_Int nzmax )
+hypre_ILUSetMaxNnzPerRow( void      *ilu_vdata,
+                          HYPRE_Int  nzmax )
 {
    hypre_ParILUData *ilu_data = (hypre_ParILUData*) ilu_vdata;
+
    hypre_ParILUDataMaxRowNnz(ilu_data) = nzmax;
+
    return hypre_error_flag;
 }
-/* set threshold for dropping in LU factors (for ilut) */
+
+/*--------------------------------------------------------------------------
+ * hypre_ILUSetDropThreshold
+ *
+ * Set threshold for dropping in LU factors for ILUT
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_ILUSetDropThreshold( void *ilu_vdata, HYPRE_Real threshold )
+hypre_ILUSetDropThreshold( void       *ilu_vdata,
+                           HYPRE_Real  threshold )
 {
    hypre_ParILUData   *ilu_data = (hypre_ParILUData*) ilu_vdata;
-   if(!(hypre_ParILUDataDroptol(ilu_data)))
+
+   if (!(hypre_ParILUDataDroptol(ilu_data)))
    {
       hypre_ParILUDataDroptol(ilu_data) = hypre_TAlloc(HYPRE_Real, 3, HYPRE_MEMORY_HOST);
    }
    hypre_ParILUDataDroptol(ilu_data)[0] = threshold;
    hypre_ParILUDataDroptol(ilu_data)[1] = threshold;
    hypre_ParILUDataDroptol(ilu_data)[2] = threshold;
+
    return hypre_error_flag;
 }
-/* set array of threshold for dropping in LU factors (for ilut) */
+
+/*--------------------------------------------------------------------------
+ * hypre_ILUSetDropThresholdArray
+ *
+ * Set array of threshold for dropping in LU factors for ILUT
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_ILUSetDropThresholdArray( void *ilu_vdata, HYPRE_Real *threshold )
+hypre_ILUSetDropThresholdArray( void       *ilu_vdata,
+                                HYPRE_Real *threshold )
 {
    hypre_ParILUData   *ilu_data = (hypre_ParILUData*) ilu_vdata;
-   if(!(hypre_ParILUDataDroptol(ilu_data)))
+
+   if (!(hypre_ParILUDataDroptol(ilu_data)))
    {
       hypre_ParILUDataDroptol(ilu_data) = hypre_TAlloc(HYPRE_Real, 3, HYPRE_MEMORY_HOST);
    }
-   hypre_TMemcpy( hypre_ParILUDataDroptol(ilu_data), threshold, HYPRE_Real, 3, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
+
+   hypre_ParILUDataDroptol(ilu_data)[0] = threshold[0];
+   hypre_ParILUDataDroptol(ilu_data)[1] = threshold[1];
+   hypre_ParILUDataDroptol(ilu_data)[2] = threshold[2];
+
    return hypre_error_flag;
 }
-/* set ILU factorization type */
+
+/*--------------------------------------------------------------------------
+ * hypre_ILUSetType
+ *
+ * Set ILU factorization type
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_ILUSetType( void *ilu_vdata, HYPRE_Int ilu_type )
+hypre_ILUSetType( void      *ilu_vdata,
+                  HYPRE_Int  ilu_type )
 {
    hypre_ParILUData *ilu_data = (hypre_ParILUData*) ilu_vdata;
 
-   /* destroy schur solver and/or preconditioner if already have one */
-   if(hypre_ParILUDataSchurSolver(ilu_data))
+   /* Destroy schur solver and/or preconditioner if already have one */
+   if (hypre_ParILUDataSchurSolver(ilu_data))
    {
-      switch(hypre_ParILUDataIluType(ilu_data)){
-      case 10: case 11: case 40: case 41: case 50:
-         HYPRE_ParCSRGMRESDestroy(hypre_ParILUDataSchurSolver(ilu_data)); //GMRES for Schur
-         break;
-      case 20: case 21:
-         hypre_NSHDestroy(hypre_ParILUDataSchurSolver(ilu_data));//NSH for Schur
-         break;
-      default:
-         break;
+      switch (hypre_ParILUDataIluType(ilu_data))
+      {
+         case 10: case 11: case 40: case 41: case 50:
+            //GMRES for Schur
+            HYPRE_ParCSRGMRESDestroy(hypre_ParILUDataSchurSolver(ilu_data));
+            break;
+
+         case 20: case 21:
+            //  NSH for Schur
+            hypre_NSHDestroy(hypre_ParILUDataSchurSolver(ilu_data));
+            break;
+
+         default:
+            break;
       }
       hypre_ParILUDataSchurSolver(ilu_data) = NULL;
    }
-   if(hypre_ParILUDataSchurPrecond(ilu_data))
-   {
-      switch(hypre_ParILUDataIluType(ilu_data)){
-      case 10: case 11: case 40: case 41:
-#ifdef HYPRE_USING_CUDA
-         if(hypre_ParILUDataIluType(ilu_data) != 10 && hypre_ParILUDataIluType(ilu_data) != 11)
-         {
-#endif
-            HYPRE_ILUDestroy(hypre_ParILUDataSchurPrecond(ilu_data)); //ILU as precond for Schur
-#ifdef HYPRE_USING_CUDA
-         }
+
+   /* ILU as precond for Schur */
+   if ( hypre_ParILUDataSchurPrecond(ilu_data)    &&
+#if defined(HYPRE_USING_GPU)
+        (hypre_ParILUDataIluType(ilu_data) != 10  &&
+         hypre_ParILUDataIluType(ilu_data) != 11) &&
 #endif
-         break;
-      default:
-         break;
-        }
+        (hypre_ParILUDataIluType(ilu_data) == 10  ||
+         hypre_ParILUDataIluType(ilu_data) == 11  ||
+         hypre_ParILUDataIluType(ilu_data) == 40  ||
+         hypre_ParILUDataIluType(ilu_data) == 41) )
+   {
+      HYPRE_ILUDestroy(hypre_ParILUDataSchurPrecond(ilu_data));
       hypre_ParILUDataSchurPrecond(ilu_data) = NULL;
    }
 
    hypre_ParILUDataIluType(ilu_data) = ilu_type;
+
    /* reset default value, not a large cost
     * assume we won't change back from
     */
-   switch(ilu_type)
+   switch (ilu_type)
    {
       /* NSH type */
       case 20: case 21:
       {
          /* only set value when user has not assiged value before */
-         if(!(hypre_ParILUDataSchurNSHDroptol(ilu_data)))
+         if (!(hypre_ParILUDataSchurNSHDroptol(ilu_data)))
          {
             hypre_ParILUDataSchurNSHDroptol(ilu_data) = hypre_TAlloc(HYPRE_Real, 2, HYPRE_MEMORY_HOST);
             hypre_ParILUDataSchurNSHDroptol(ilu_data)[0] = 1e-02;
@@ -523,11 +419,12 @@ hypre_ILUSetType( void *ilu_vdata, HYPRE_Int ilu_type )
          }
          break;
       }
+
       case 10: case 11: case 40: case 41: case 50:
       {
          /* Set value of droptol for solving Schur system (if not set by user) */
          /* NOTE: This is currently not exposed to users */
-         if(!(hypre_ParILUDataSchurPrecondIluDroptol(ilu_data)))
+         if (!(hypre_ParILUDataSchurPrecondIluDroptol(ilu_data)))
          {
             hypre_ParILUDataSchurPrecondIluDroptol(ilu_data) = hypre_TAlloc(HYPRE_Real, 3, HYPRE_MEMORY_HOST);
             hypre_ParILUDataSchurPrecondIluDroptol(ilu_data)[0] = 1e-02;
@@ -536,66 +433,275 @@ hypre_ILUSetType( void *ilu_vdata, HYPRE_Int ilu_type )
          }
          break;
       }
+
       default:
          break;
    }
 
    return hypre_error_flag;
 }
-/* Set max number of iterations for ILU solver */
+
+/*--------------------------------------------------------------------------
+ * hypre_ILUSetMaxIter
+ *
+ * Set max number of iterations for ILU solver
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_ILUSetMaxIter( void *ilu_vdata, HYPRE_Int max_iter )
+hypre_ILUSetMaxIter( void      *ilu_vdata,
+                     HYPRE_Int  max_iter )
 {
-   hypre_ParILUData   *ilu_data = (hypre_ParILUData*) ilu_vdata;
+   hypre_ParILUData *ilu_data = (hypre_ParILUData*) ilu_vdata;
+
    hypre_ParILUDataMaxIter(ilu_data) = max_iter;
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_ILUSetIterativeSetupType
+ *
+ * Set iterative ILU setup algorithm
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ILUSetIterativeSetupType( void      *ilu_vdata,
+                                HYPRE_Int  iter_setup_type)
+{
+   hypre_ParILUData *ilu_data = (hypre_ParILUData*) ilu_vdata;
+
+   hypre_ParILUDataIterativeSetupType(ilu_data) = iter_setup_type;
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_ILUSetIterativeSetupOption
+ *
+ * Set iterative ILU compute option
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ILUSetIterativeSetupOption( void      *ilu_vdata,
+                                  HYPRE_Int  iter_setup_option)
+{
+   hypre_ParILUData *ilu_data = (hypre_ParILUData*) ilu_vdata;
+
+   /* Compute residuals when using the stopping criteria, if not chosen by the user */
+   iter_setup_option |= ((iter_setup_option & 0x02) && !(iter_setup_option & 0x0C)) ? 0x08 : 0;
+
+   /* Compute residuals when asking for conv. history, if not chosen by the user */
+   iter_setup_option |= ((iter_setup_option & 0x10) && !(iter_setup_option & 0x08)) ? 0x08 : 0;
+
+   /* Zero out first bit of option (turn off rocSPARSE logging) */
+   iter_setup_option &= ~0x01;
+
+   /* Set internal iter_setup_option */
+   hypre_ParILUDataIterativeSetupOption(ilu_data) = iter_setup_option;
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_ILUSetIterativeSetupMaxIter
+ *
+ * Set maximum number of iterations for iterative ILU setup
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ILUSetIterativeSetupMaxIter( void      *ilu_vdata,
+                                   HYPRE_Int  iter_setup_max_iter)
+{
+   hypre_ParILUData *ilu_data = (hypre_ParILUData*) ilu_vdata;
+
+   hypre_ParILUDataIterativeSetupMaxIter(ilu_data) = iter_setup_max_iter;
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_ILUSetIterativeSetupTolerance
+ *
+ * Set dropping tolerance for iterative ILU setup
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ILUSetIterativeSetupTolerance( void       *ilu_vdata,
+                                     HYPRE_Real  iter_setup_tolerance)
+{
+   hypre_ParILUData *ilu_data = (hypre_ParILUData*) ilu_vdata;
+
+   hypre_ParILUDataIterativeSetupTolerance(ilu_data) = iter_setup_tolerance;
+
    return hypre_error_flag;
 }
-/* Set convergence tolerance for ILU solver */
+
+/*--------------------------------------------------------------------------
+ * hypre_ILUGetIterativeSetupHistory
+ *
+ * Get array of corrections and/or residual norms computed during ILU's
+ * iterative setup algorithm.
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_ILUSetTol( void *ilu_vdata, HYPRE_Real tol )
+hypre_ILUGetIterativeSetupHistory( void           *ilu_vdata,
+                                   HYPRE_Complex **iter_setup_history)
+{
+   hypre_ParILUData *ilu_data = (hypre_ParILUData*) ilu_vdata;
+
+   *iter_setup_history = hypre_ParILUDataIterativeSetupHistory(ilu_data);
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_ILUSetTriSolve
+ *
+ * Set ILU triangular solver type
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ILUSetTriSolve( void      *ilu_vdata,
+                      HYPRE_Int  tri_solve )
 {
    hypre_ParILUData   *ilu_data = (hypre_ParILUData*) ilu_vdata;
+
+   hypre_ParILUDataTriSolve(ilu_data) = tri_solve;
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_ILUSetLowerJacobiIters
+ *
+ * Set Lower Jacobi iterations for iterative triangular solver
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ILUSetLowerJacobiIters( void     *ilu_vdata,
+                              HYPRE_Int lower_jacobi_iters )
+{
+   hypre_ParILUData   *ilu_data = (hypre_ParILUData*) ilu_vdata;
+
+   hypre_ParILUDataLowerJacobiIters(ilu_data) = lower_jacobi_iters;
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_ILUSetUpperJacobiIters
+ *
+ * Set Upper Jacobi iterations for iterative triangular solver
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ILUSetUpperJacobiIters( void      *ilu_vdata,
+                              HYPRE_Int  upper_jacobi_iters )
+{
+   hypre_ParILUData   *ilu_data = (hypre_ParILUData*) ilu_vdata;
+
+   hypre_ParILUDataUpperJacobiIters(ilu_data) = upper_jacobi_iters;
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_ILUSetTol
+ *
+ * Set convergence tolerance for ILU solver
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ILUSetTol( void       *ilu_vdata,
+                 HYPRE_Real  tol )
+{
+   hypre_ParILUData   *ilu_data = (hypre_ParILUData*) ilu_vdata;
+
    hypre_ParILUDataTol(ilu_data) = tol;
+
    return hypre_error_flag;
 }
-/* Set print level for ilu solver */
+
+/*--------------------------------------------------------------------------
+ * hypre_ILUSetPrintLevel
+ *
+ * Set print level for ILU solver
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_ILUSetPrintLevel( void *ilu_vdata, HYPRE_Int print_level )
+hypre_ILUSetPrintLevel( void      *ilu_vdata,
+                        HYPRE_Int  print_level )
 {
    hypre_ParILUData   *ilu_data = (hypre_ParILUData*) ilu_vdata;
+
    hypre_ParILUDataPrintLevel(ilu_data) = print_level;
+
    return hypre_error_flag;
 }
-/* Set print level for ilu solver */
+
+/*--------------------------------------------------------------------------
+ * hypre_ILUSetLogging
+ *
+ * Set print level for ilu solver
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_ILUSetLogging( void *ilu_vdata, HYPRE_Int logging )
+hypre_ILUSetLogging( void      *ilu_vdata,
+                     HYPRE_Int  logging )
 {
    hypre_ParILUData   *ilu_data = (hypre_ParILUData*) ilu_vdata;
+
    hypre_ParILUDataLogging(ilu_data) = logging;
+
    return hypre_error_flag;
 }
-/* Set type of reordering for local matrix */
+
+/*--------------------------------------------------------------------------
+ * hypre_ILUSetLocalReordering
+ *
+ * Set type of reordering for local matrix
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_ILUSetLocalReordering( void *ilu_vdata, HYPRE_Int ordering_type )
+hypre_ILUSetLocalReordering( void      *ilu_vdata,
+                             HYPRE_Int  ordering_type )
 {
    hypre_ParILUData   *ilu_data = (hypre_ParILUData*) ilu_vdata;
+
    hypre_ParILUDataReorderingType(ilu_data) = ordering_type;
+
    return hypre_error_flag;
 }
 
-/* Set KDim (for GMRES) for Solver of Schur System */
+/*--------------------------------------------------------------------------
+ * hypre_ILUSetSchurSolverKDIM
+ *
+ * Set KDim (for GMRES) for Solver of Schur System
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_ILUSetSchurSolverKDIM( void *ilu_vdata, HYPRE_Int ss_kDim )
+hypre_ILUSetSchurSolverKDIM( void      *ilu_vdata,
+                             HYPRE_Int  ss_kDim )
 {
    hypre_ParILUData   *ilu_data = (hypre_ParILUData*) ilu_vdata;
+
    hypre_ParILUDataSchurGMRESKDim(ilu_data) = ss_kDim;
+
    return hypre_error_flag;
 }
-/* Set max iteration for Solver of Schur System */
+
+/*--------------------------------------------------------------------------
+ * hypre_ILUSetSchurSolverMaxIter
+ *
+ * Set max iteration for Solver of Schur System
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_ILUSetSchurSolverMaxIter( void *ilu_vdata, HYPRE_Int ss_max_iter )
+hypre_ILUSetSchurSolverMaxIter( void      *ilu_vdata,
+                                HYPRE_Int  ss_max_iter )
 {
    hypre_ParILUData   *ilu_data = (hypre_ParILUData*) ilu_vdata;
+
    /* for the GMRES solve, the max iter is same as kdim by default */
    hypre_ParILUDataSchurGMRESKDim(ilu_data) = ss_max_iter;
    hypre_ParILUDataSchurGMRESMaxIter(ilu_data) = ss_max_iter;
@@ -605,156 +711,349 @@ hypre_ILUSetSchurSolverMaxIter( void *ilu_vdata, HYPRE_Int ss_max_iter )
 
    return hypre_error_flag;
 }
-/* Set convergence tolerance for Solver of Schur System */
+
+/*--------------------------------------------------------------------------
+ * hypre_ILUSetSchurSolverTol
+ *
+ * Set convergence tolerance for Solver of Schur System
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_ILUSetSchurSolverTol( void *ilu_vdata, HYPRE_Real ss_tol )
+hypre_ILUSetSchurSolverTol( void       *ilu_vdata,
+                            HYPRE_Real  ss_tol )
 {
    hypre_ParILUData   *ilu_data = (hypre_ParILUData*) ilu_vdata;
+
    hypre_ParILUDataSchurGMRESTol(ilu_data) = ss_tol;
+
    return hypre_error_flag;
 }
-/* Set absolute tolerance for Solver of Schur System */
+
+/*--------------------------------------------------------------------------
+ * hypre_ILUSetSchurSolverAbsoluteTol
+ *
+ * Set absolute tolerance for Solver of Schur System
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_ILUSetSchurSolverAbsoluteTol( void *ilu_vdata, HYPRE_Real ss_absolute_tol )
+hypre_ILUSetSchurSolverAbsoluteTol( void       *ilu_vdata,
+                                    HYPRE_Real  ss_absolute_tol )
 {
    hypre_ParILUData   *ilu_data = (hypre_ParILUData*) ilu_vdata;
+
    hypre_ParILUDataSchurGMRESAbsoluteTol(ilu_data) = ss_absolute_tol;
+
    return hypre_error_flag;
 }
-/* Set logging for Solver of Schur System */
+
+/*--------------------------------------------------------------------------
+ * hypre_ILUSetSchurSolverLogging
+ *
+ * Set logging for Solver of Schur System
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_ILUSetSchurSolverLogging( void *ilu_vdata, HYPRE_Int ss_logging )
+hypre_ILUSetSchurSolverLogging( void      *ilu_vdata,
+                                HYPRE_Int  ss_logging )
 {
    hypre_ParILUData   *ilu_data = (hypre_ParILUData*) ilu_vdata;
+
    hypre_ParILUDataSchurSolverLogging(ilu_data) = ss_logging;
+
    return hypre_error_flag;
 }
-/* Set print level for Solver of Schur System */
+
+/*--------------------------------------------------------------------------
+ * hypre_ILUSetSchurSolverPrintLevel
+ *
+ * Set print level for Solver of Schur System
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_ILUSetSchurSolverPrintLevel( void *ilu_vdata, HYPRE_Int ss_print_level )
+hypre_ILUSetSchurSolverPrintLevel( void      *ilu_vdata,
+                                   HYPRE_Int  ss_print_level )
 {
    hypre_ParILUData   *ilu_data = (hypre_ParILUData*) ilu_vdata;
+
    hypre_ParILUDataSchurSolverPrintLevel(ilu_data) = ss_print_level;
+
    return hypre_error_flag;
 }
-/* Set rel change (for GMRES) for Solver of Schur System */
+
+/*--------------------------------------------------------------------------
+ * hypre_ILUSetSchurSolverRelChange
+ *
+ * Set rel change (for GMRES) for Solver of Schur System
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_ILUSetSchurSolverRelChange( void *ilu_vdata, HYPRE_Int ss_rel_change )
 {
    hypre_ParILUData   *ilu_data = (hypre_ParILUData*) ilu_vdata;
+
    hypre_ParILUDataSchurGMRESRelChange(ilu_data) = ss_rel_change;
+
    return hypre_error_flag;
 }
-/* Set ILU type for Precond of Schur System */
+
+/*--------------------------------------------------------------------------
+ * hypre_ILUSetSchurPrecondILUType
+ *
+ * Set ILU type for Precond of Schur System
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_ILUSetSchurPrecondILUType( void *ilu_vdata, HYPRE_Int sp_ilu_type )
 {
    hypre_ParILUData   *ilu_data = (hypre_ParILUData*) ilu_vdata;
+
    hypre_ParILUDataSchurPrecondIluType(ilu_data) = sp_ilu_type;
+
    return hypre_error_flag;
 }
-/* Set ILU level of fill for Precond of Schur System */
+
+/*--------------------------------------------------------------------------
+ * hypre_ILUSetSchurPrecondILULevelOfFill
+ *
+ * Set ILU level of fill for Precond of Schur System
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_ILUSetSchurPrecondILULevelOfFill( void *ilu_vdata, HYPRE_Int sp_ilu_lfil )
 {
    hypre_ParILUData   *ilu_data = (hypre_ParILUData*) ilu_vdata;
+
    hypre_ParILUDataSchurPrecondIluLfil(ilu_data) = sp_ilu_lfil;
+
    return hypre_error_flag;
 }
-/* Set ILU max nonzeros per row for Precond of Schur System */
+
+/*--------------------------------------------------------------------------
+ * hypre_ILUSetSchurPrecondILUMaxNnzPerRow
+ *
+ * Set ILU max nonzeros per row for Precond of Schur System
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_ILUSetSchurPrecondILUMaxNnzPerRow( void *ilu_vdata, HYPRE_Int sp_ilu_max_row_nnz )
+hypre_ILUSetSchurPrecondILUMaxNnzPerRow( void      *ilu_vdata,
+                                         HYPRE_Int  sp_ilu_max_row_nnz )
 {
    hypre_ParILUData   *ilu_data = (hypre_ParILUData*) ilu_vdata;
+
    hypre_ParILUDataSchurPrecondIluMaxRowNnz(ilu_data) = sp_ilu_max_row_nnz;
+
    return hypre_error_flag;
 }
-/* Set ILU drop threshold for ILUT for Precond of Schur System
- * We don't want to influence the original ILU, so create new array if not own data
- */
+
+/*--------------------------------------------------------------------------
+ * hypre_ILUSetSchurPrecondILUDropThreshold
+ *
+ * Set ILU drop threshold for ILUT for Precond of Schur System
+ * We don't want to influence the original ILU, so create new array if
+ * not own data
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_ILUSetSchurPrecondILUDropThreshold( void *ilu_vdata, HYPRE_Real sp_ilu_droptol )
+hypre_ILUSetSchurPrecondILUDropThreshold( void       *ilu_vdata,
+                                          HYPRE_Real  sp_ilu_droptol )
 {
    hypre_ParILUData   *ilu_data = (hypre_ParILUData*) ilu_vdata;
-   if(!(hypre_ParILUDataSchurPrecondIluDroptol(ilu_data)))
+
+   if (!(hypre_ParILUDataSchurPrecondIluDroptol(ilu_data)))
    {
       hypre_ParILUDataSchurPrecondIluDroptol(ilu_data) = hypre_TAlloc(HYPRE_Real, 3, HYPRE_MEMORY_HOST);
    }
    hypre_ParILUDataSchurPrecondIluDroptol(ilu_data)[0]   = sp_ilu_droptol;
    hypre_ParILUDataSchurPrecondIluDroptol(ilu_data)[1]   = sp_ilu_droptol;
    hypre_ParILUDataSchurPrecondIluDroptol(ilu_data)[2]   = sp_ilu_droptol;
+
    return hypre_error_flag;
 }
-/* Set array of ILU drop threshold for ILUT for Precond of Schur System */
+
+/*--------------------------------------------------------------------------
+ * hypre_ILUSetSchurPrecondILUDropThresholdArray
+ *
+ * Set array of ILU drop threshold for ILUT for Precond of Schur System
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_ILUSetSchurPrecondILUDropThresholdArray( void *ilu_vdata, HYPRE_Real *sp_ilu_droptol )
+hypre_ILUSetSchurPrecondILUDropThresholdArray( void       *ilu_vdata,
+                                               HYPRE_Real *sp_ilu_droptol )
 {
    hypre_ParILUData   *ilu_data = (hypre_ParILUData*) ilu_vdata;
-   if(!(hypre_ParILUDataSchurPrecondIluDroptol(ilu_data)))
+   if (!(hypre_ParILUDataSchurPrecondIluDroptol(ilu_data)))
    {
       hypre_ParILUDataSchurPrecondIluDroptol(ilu_data) = hypre_TAlloc(HYPRE_Real, 3, HYPRE_MEMORY_HOST);
    }
-   hypre_TMemcpy( hypre_ParILUDataSchurPrecondIluDroptol(ilu_data), sp_ilu_droptol, HYPRE_Real, 3, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
+
+   hypre_ParILUDataSchurPrecondIluDroptol(ilu_data)[0] = sp_ilu_droptol[0];
+   hypre_ParILUDataSchurPrecondIluDroptol(ilu_data)[1] = sp_ilu_droptol[1];
+   hypre_ParILUDataSchurPrecondIluDroptol(ilu_data)[2] = sp_ilu_droptol[2];
+
    return hypre_error_flag;
 }
-/* Set print level for Precond of Schur System */
+
+/*--------------------------------------------------------------------------
+ * hypre_ILUSetSchurPrecondPrintLevel
+ *
+ * Set print level for Precond of Schur System
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_ILUSetSchurPrecondPrintLevel( void *ilu_vdata, HYPRE_Int sp_print_level )
+hypre_ILUSetSchurPrecondPrintLevel( void      *ilu_vdata,
+                                    HYPRE_Int  sp_print_level )
 {
    hypre_ParILUData   *ilu_data = (hypre_ParILUData*) ilu_vdata;
+
    hypre_ParILUDataSchurPrecondPrintLevel(ilu_data) = sp_print_level;
+
    return hypre_error_flag;
 }
-/* Set max number of iterations for Precond of Schur System */
+
+/*--------------------------------------------------------------------------
+ * hypre_ILUSetSchurPrecondMaxIter
+ *
+ * Set max number of iterations for Precond of Schur System
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_ILUSetSchurPrecondMaxIter( void *ilu_vdata, HYPRE_Int sp_max_iter )
+hypre_ILUSetSchurPrecondMaxIter( void      *ilu_vdata,
+                                 HYPRE_Int  sp_max_iter )
 {
    hypre_ParILUData   *ilu_data = (hypre_ParILUData*) ilu_vdata;
+
    hypre_ParILUDataSchurPrecondMaxIter(ilu_data) = sp_max_iter;
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_ILUSetSchurPrecondTriSolve
+ *
+ * Set triangular solver type for Precond of Schur System
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ILUSetSchurPrecondTriSolve( void      *ilu_vdata,
+                                  HYPRE_Int  sp_tri_solve )
+{
+   hypre_ParILUData   *ilu_data = (hypre_ParILUData*) ilu_vdata;
+
+   hypre_ParILUDataSchurPrecondTriSolve(ilu_data) = sp_tri_solve;
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_ILUSetSchurPrecondLowerJacobiIters
+ *
+ * Set Lower Jacobi iterations for Precond of Schur System
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ILUSetSchurPrecondLowerJacobiIters( void      *ilu_vdata,
+                                          HYPRE_Int  sp_lower_jacobi_iters )
+{
+   hypre_ParILUData   *ilu_data = (hypre_ParILUData*) ilu_vdata;
+
+   hypre_ParILUDataSchurPrecondLowerJacobiIters(ilu_data) = sp_lower_jacobi_iters;
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_ILUSetSchurPrecondUpperJacobiIters
+ *
+ * Set Upper Jacobi iterations for Precond of Schur System
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ILUSetSchurPrecondUpperJacobiIters( void      *ilu_vdata,
+                                          HYPRE_Int  sp_upper_jacobi_iters )
+{
+   hypre_ParILUData   *ilu_data = (hypre_ParILUData*) ilu_vdata;
+
+   hypre_ParILUDataSchurPrecondUpperJacobiIters(ilu_data) = sp_upper_jacobi_iters;
+
    return hypre_error_flag;
 }
-/* Set onvergence tolerance for Precond of Schur System */
+
+/*--------------------------------------------------------------------------
+ * hypre_ILUSetSchurPrecondTol
+ *
+ * Set convergence tolerance for Precond of Schur System
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_ILUSetSchurPrecondTol( void *ilu_vdata, HYPRE_Int sp_tol )
+hypre_ILUSetSchurPrecondTol( void      *ilu_vdata,
+                             HYPRE_Int  sp_tol )
 {
    hypre_ParILUData   *ilu_data = (hypre_ParILUData*) ilu_vdata;
+
    hypre_ParILUDataSchurPrecondTol(ilu_data) = sp_tol;
+
    return hypre_error_flag;
 }
-/* Set tolorance for dropping in NSH for Schur System
- * We don't want to influence the original ILU, so create new array if not own data
- */
+
+/*--------------------------------------------------------------------------
+ * hypre_ILUSetSchurNSHDropThreshold
+ *
+ * Set tolorance for dropping in NSH for Schur System
+ * We don't want to influence the original ILU, so create new array if
+ * not own data
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_ILUSetSchurNSHDropThreshold( void *ilu_vdata, HYPRE_Real threshold)
+hypre_ILUSetSchurNSHDropThreshold( void       *ilu_vdata,
+                                   HYPRE_Real  threshold )
 {
    hypre_ParILUData   *ilu_data = (hypre_ParILUData*) ilu_vdata;
-   if(!(hypre_ParILUDataSchurNSHDroptol(ilu_data)))
+
+   if (!(hypre_ParILUDataSchurNSHDroptol(ilu_data)))
    {
       hypre_ParILUDataSchurNSHDroptol(ilu_data) = hypre_TAlloc(HYPRE_Real, 2, HYPRE_MEMORY_HOST);
    }
-   hypre_ParILUDataSchurNSHDroptol(ilu_data)[0]           = threshold;
-   hypre_ParILUDataSchurNSHDroptol(ilu_data)[1]           = threshold;
+
+   hypre_ParILUDataSchurNSHDroptol(ilu_data)[0] = threshold;
+   hypre_ParILUDataSchurNSHDroptol(ilu_data)[1] = threshold;
+
    return hypre_error_flag;
 }
-/* Set tolorance array for NSH for Schur System
+
+/*--------------------------------------------------------------------------
+ * hypre_ILUSetSchurNSHDropThresholdArray
+ *
+ * Set tolorance array for NSH for Schur System
  *    - threshold[0] : threshold for Minimal Residual iteration (initial guess for NSH).
- *    - threshold[1] : threshold for Newton–Schulz–Hotelling iteration.
-*/
+ *    - threshold[1] : threshold for Newton-Schulz-Hotelling iteration.
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_ILUSetSchurNSHDropThresholdArray( void *ilu_vdata, HYPRE_Real *threshold)
+hypre_ILUSetSchurNSHDropThresholdArray( void       *ilu_vdata,
+                                        HYPRE_Real *threshold )
 {
    hypre_ParILUData   *ilu_data = (hypre_ParILUData*) ilu_vdata;
-   if(!(hypre_ParILUDataSchurNSHDroptol(ilu_data)))
+
+   if (!(hypre_ParILUDataSchurNSHDroptol(ilu_data)))
    {
       hypre_ParILUDataSchurNSHDroptol(ilu_data) = hypre_TAlloc(HYPRE_Real, 2, HYPRE_MEMORY_HOST);
    }
-   hypre_TMemcpy( hypre_ParILUDataSchurNSHDroptol(ilu_data), threshold, HYPRE_Real, 2, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
+
+   hypre_ParILUDataSchurNSHDroptol(ilu_data)[0] = threshold[0];
+   hypre_ParILUDataSchurNSHDroptol(ilu_data)[1] = threshold[1];
+
    return hypre_error_flag;
 }
 
-/* Get number of iterations for ILU solver */
+/*--------------------------------------------------------------------------
+ * hypre_ILUGetNumIterations
+ *
+ * Get number of iterations for ILU solver
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_ILUGetNumIterations( void *ilu_vdata, HYPRE_Int *num_iterations )
+hypre_ILUGetNumIterations( void      *ilu_vdata,
+                           HYPRE_Int *num_iterations )
 {
    hypre_ParILUData  *ilu_data = (hypre_ParILUData*) ilu_vdata;
 
@@ -763,13 +1062,21 @@ hypre_ILUGetNumIterations( void *ilu_vdata, HYPRE_Int *num_iterations )
       hypre_error_in_arg(1);
       return hypre_error_flag;
    }
+
    *num_iterations = hypre_ParILUDataNumIterations(ilu_data);
 
    return hypre_error_flag;
 }
-/* Get residual norms for ILU solver */
+
+/*--------------------------------------------------------------------------
+ * hypre_ILUGetFinalRelativeResidualNorm
+ *
+ * Get residual norms for ILU solver
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_ILUGetFinalRelativeResidualNorm( void *ilu_vdata, HYPRE_Real *res_norm )
+hypre_ILUGetFinalRelativeResidualNorm( void       *ilu_vdata,
+                                       HYPRE_Real *res_norm )
 {
    hypre_ParILUData  *ilu_data = (hypre_ParILUData*) ilu_vdata;
 
@@ -778,145 +1085,175 @@ hypre_ILUGetFinalRelativeResidualNorm( void *ilu_vdata, HYPRE_Real *res_norm )
       hypre_error_in_arg(1);
       return hypre_error_flag;
    }
+
    *res_norm = hypre_ParILUDataFinalRelResidualNorm(ilu_data);
 
    return hypre_error_flag;
 }
-/*
- * Quicksort of the elements in a from low to high.
- * The elements in b are permuted according to the sorted a.
- * The elements in iw are permuted reverse according to the sorted a as it's index
- *   ie, iw[a1] and iw[a2] will be switched if a1 and a2 are switched
- * lo and hi are the extents of the region of the array a, that is to be sorted.
-*/
-/*
-HYPRE_Int
-hypre_quickSortIR (HYPRE_Int *a, HYPRE_Real *b, HYPRE_Int *iw, const HYPRE_Int lo, const HYPRE_Int hi)
-{
-   HYPRE_Int i=lo, j=hi;
-   HYPRE_Int v;
-   HYPRE_Int mid = (lo+hi)>>1;
-   HYPRE_Int x=ceil(a[mid]);
-   HYPRE_Real q;
-   //  partition
-   do
-   {
-      while (a[i]<x) i++;
-      while (a[j]>x) j--;
-      if (i<=j)
-      {
-          v=a[i]; a[i]=a[j]; a[j]=v;
-          q=b[i]; b[i]=b[j]; b[j]=q;
-          v=iw[a[i]];iw[a[i]]=iw[a[j]];iw[a[j]]=v;
-          i++; j--;
-      }
-   } while (i<=j);
-   //  recursion
-   if (lo<j) hypre_quickSortIR(a, b, iw, lo, j);
-   if (i<hi) hypre_quickSortIR(a, b, iw, i, hi);
 
-   return hypre_error_flag;
-}
-*/
-/* Print solver params */
+/*--------------------------------------------------------------------------
+ * hypre_ILUWriteSolverParams
+ *
+ * Print solver params
+ *
+ * TODO (VPM): check runtime switch to decide whether running on host or device
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_ILUWriteSolverParams(void *ilu_vdata)
 {
    hypre_ParILUData  *ilu_data = (hypre_ParILUData*) ilu_vdata;
+
    hypre_printf("ILU Setup parameters: \n");
    hypre_printf("ILU factorization type: %d : ", hypre_ParILUDataIluType(ilu_data));
-   switch(hypre_ParILUDataIluType(ilu_data)){
+   switch (hypre_ParILUDataIluType(ilu_data))
+   {
       case 0:
-#ifdef HYPRE_USING_CUDA
-            if( hypre_ParILUDataLfil(ilu_data) == 0 )
-            {
-               hypre_printf("Block Jacobi with GPU-accelerated ILU0 \n");
-               hypre_printf("Operator Complexity (Fill factor) = %f \n", hypre_ParILUDataOperatorComplexity(ilu_data));
-            }
-            else
-            {
-#endif
-               hypre_printf("Block Jacobi with ILU(%d) \n", hypre_ParILUDataLfil(ilu_data));
-               hypre_printf("Operator Complexity (Fill factor) = %f \n", hypre_ParILUDataOperatorComplexity(ilu_data));
-#ifdef HYPRE_USING_CUDA
-            }
+#if defined(HYPRE_USING_GPU)
+         if ( hypre_ParILUDataLfil(ilu_data) == 0 )
+         {
+            hypre_printf("Block Jacobi with GPU-accelerated ILU0 \n");
+            hypre_printf("Operator Complexity (Fill factor) = %f \n",
+                         hypre_ParILUDataOperatorComplexity(ilu_data));
+         }
+         else
 #endif
+         {
+            hypre_printf("Block Jacobi with ILU(%d) \n", hypre_ParILUDataLfil(ilu_data));
+            hypre_printf("Operator Complexity (Fill factor) = %f \n",
+                         hypre_ParILUDataOperatorComplexity(ilu_data));
+         }
          break;
+
       case 1:
-            hypre_printf("Block Jacobi with ILUT \n");
-            hypre_printf("drop tolerance for B = %e, E&F = %e, S = %e \n", hypre_ParILUDataDroptol(ilu_data)[0],hypre_ParILUDataDroptol(ilu_data)[1],hypre_ParILUDataDroptol(ilu_data)[2]);
-            hypre_printf("Max nnz per row = %d \n", hypre_ParILUDataMaxRowNnz(ilu_data));
-            hypre_printf("Operator Complexity (Fill factor) = %f \n", hypre_ParILUDataOperatorComplexity(ilu_data));
+         hypre_printf("Block Jacobi with ILUT \n");
+         hypre_printf("drop tolerance for B = %e, E&F = %e, S = %e \n",
+                      hypre_ParILUDataDroptol(ilu_data)[0],
+                      hypre_ParILUDataDroptol(ilu_data)[1],
+                      hypre_ParILUDataDroptol(ilu_data)[2]);
+         hypre_printf("Max nnz per row = %d \n", hypre_ParILUDataMaxRowNnz(ilu_data));
+         hypre_printf("Operator Complexity (Fill factor) = %f \n",
+                      hypre_ParILUDataOperatorComplexity(ilu_data));
          break;
+
       case 10:
-#ifdef HYPRE_USING_CUDA
-            if( hypre_ParILUDataLfil(ilu_data) == 0 )
-            {
-               hypre_printf("ILU-GMRES with GPU-accelerated ILU0 \n");
-               hypre_printf("Operator Complexity (Fill factor) = %f \n", hypre_ParILUDataOperatorComplexity(ilu_data));
-            }
-            else
-            {
-#endif
-               hypre_printf("ILU-GMRES with ILU(%d) \n", hypre_ParILUDataLfil(ilu_data));
-               hypre_printf("Operator Complexity (Fill factor) = %f \n", hypre_ParILUDataOperatorComplexity(ilu_data));
-#ifdef HYPRE_USING_CUDA
-            }
+#if defined(HYPRE_USING_GPU)
+         if ( hypre_ParILUDataLfil(ilu_data) == 0 )
+         {
+            hypre_printf("ILU-GMRES with GPU-accelerated ILU0 \n");
+            hypre_printf("Operator Complexity (Fill factor) = %f \n",
+                         hypre_ParILUDataOperatorComplexity(ilu_data));
+         }
+         else
 #endif
+         {
+            hypre_printf("ILU-GMRES with ILU(%d) \n", hypre_ParILUDataLfil(ilu_data));
+            hypre_printf("Operator Complexity (Fill factor) = %f \n",
+                         hypre_ParILUDataOperatorComplexity(ilu_data));
+         }
          break;
+
       case 11:
          hypre_printf("ILU-GMRES with ILUT \n");
-         hypre_printf("drop tolerance for B = %e, E&F = %e, S = %e \n", hypre_ParILUDataDroptol(ilu_data)[0],hypre_ParILUDataDroptol(ilu_data)[1],hypre_ParILUDataDroptol(ilu_data)[2]);
+         hypre_printf("drop tolerance for B = %e, E&F = %e, S = %e \n",
+                      hypre_ParILUDataDroptol(ilu_data)[0],
+                      hypre_ParILUDataDroptol(ilu_data)[1],
+                      hypre_ParILUDataDroptol(ilu_data)[2]);
          hypre_printf("Max nnz per row = %d \n", hypre_ParILUDataMaxRowNnz(ilu_data));
-         hypre_printf("Operator Complexity (Fill factor) = %f \n", hypre_ParILUDataOperatorComplexity(ilu_data));
+         hypre_printf("Operator Complexity (Fill factor) = %f \n",
+                      hypre_ParILUDataOperatorComplexity(ilu_data));
          break;
+
       case 20:
          hypre_printf("Newton-Schulz-Hotelling with ILU(%d) \n", hypre_ParILUDataLfil(ilu_data));
-         hypre_printf("Operator Complexity (Fill factor) = %f \n", hypre_ParILUDataOperatorComplexity(ilu_data));
+         hypre_printf("Operator Complexity (Fill factor) = %f \n",
+                      hypre_ParILUDataOperatorComplexity(ilu_data));
          break;
+
       case 21:
          hypre_printf("Newton-Schulz-Hotelling with ILUT \n");
-         hypre_printf("drop tolerance for B = %e, E&F = %e, S = %e \n", hypre_ParILUDataDroptol(ilu_data)[0],hypre_ParILUDataDroptol(ilu_data)[1],hypre_ParILUDataDroptol(ilu_data)[2]);
+         hypre_printf("drop tolerance for B = %e, E&F = %e, S = %e \n",
+                      hypre_ParILUDataDroptol(ilu_data)[0],
+                      hypre_ParILUDataDroptol(ilu_data)[1],
+                      hypre_ParILUDataDroptol(ilu_data)[2]);
          hypre_printf("Max nnz per row = %d \n", hypre_ParILUDataMaxRowNnz(ilu_data));
-         hypre_printf("Operator Complexity (Fill factor) = %f \n", hypre_ParILUDataOperatorComplexity(ilu_data));
+         hypre_printf("Operator Complexity (Fill factor) = %f \n",
+                      hypre_ParILUDataOperatorComplexity(ilu_data));
          break;
+
       case 30:
          hypre_printf("RAS with ILU(%d) \n", hypre_ParILUDataLfil(ilu_data));
-         hypre_printf("Operator Complexity (Fill factor) = %f \n", hypre_ParILUDataOperatorComplexity(ilu_data));
+         hypre_printf("Operator Complexity (Fill factor) = %f \n",
+                      hypre_ParILUDataOperatorComplexity(ilu_data));
          break;
+
       case 31:
          hypre_printf("RAS with ILUT \n");
-         hypre_printf("drop tolerance for B = %e, E&F = %e, S = %e \n", hypre_ParILUDataDroptol(ilu_data)[0],hypre_ParILUDataDroptol(ilu_data)[1],hypre_ParILUDataDroptol(ilu_data)[2]);
+         hypre_printf("drop tolerance for B = %e, E&F = %e, S = %e \n",
+                      hypre_ParILUDataDroptol(ilu_data)[0],
+                      hypre_ParILUDataDroptol(ilu_data)[1],
+                      hypre_ParILUDataDroptol(ilu_data)[2]);
          hypre_printf("Max nnz per row = %d \n", hypre_ParILUDataMaxRowNnz(ilu_data));
-         hypre_printf("Operator Complexity (Fill factor) = %f \n", hypre_ParILUDataOperatorComplexity(ilu_data));
+         hypre_printf("Operator Complexity (Fill factor) = %f \n",
+                      hypre_ParILUDataOperatorComplexity(ilu_data));
          break;
+
       case 40:
          hypre_printf("ddPQ-ILU-GMRES with ILU(%d) \n", hypre_ParILUDataLfil(ilu_data));
-         hypre_printf("Operator Complexity (Fill factor) = %f \n", hypre_ParILUDataOperatorComplexity(ilu_data));
+         hypre_printf("Operator Complexity (Fill factor) = %f \n",
+                      hypre_ParILUDataOperatorComplexity(ilu_data));
          break;
+
       case 41:
          hypre_printf("ddPQ-ILU-GMRES with ILUT \n");
-         hypre_printf("drop tolerance for B = %e, E&F = %e, S = %e \n", hypre_ParILUDataDroptol(ilu_data)[0],hypre_ParILUDataDroptol(ilu_data)[1],hypre_ParILUDataDroptol(ilu_data)[2]);
+         hypre_printf("drop tolerance for B = %e, E&F = %e, S = %e \n",
+                      hypre_ParILUDataDroptol(ilu_data)[0],
+                      hypre_ParILUDataDroptol(ilu_data)[1],
+                      hypre_ParILUDataDroptol(ilu_data)[2]);
          hypre_printf("Max nnz per row = %d \n", hypre_ParILUDataMaxRowNnz(ilu_data));
-         hypre_printf("Operator Complexity (Fill factor) = %f \n", hypre_ParILUDataOperatorComplexity(ilu_data));
+         hypre_printf("Operator Complexity (Fill factor) = %f \n",
+                      hypre_ParILUDataOperatorComplexity(ilu_data));
          break;
+
       case 50:
          hypre_printf("RAP-Modified-ILU with ILU(%d) \n", hypre_ParILUDataLfil(ilu_data));
-         hypre_printf("Operator Complexity (Fill factor) = %f \n", hypre_ParILUDataOperatorComplexity(ilu_data));
+         hypre_printf("Operator Complexity (Fill factor) = %f \n",
+                      hypre_ParILUDataOperatorComplexity(ilu_data));
+         break;
+
+      default:
+         hypre_printf("Unknown type \n");
          break;
-      default: hypre_printf("Unknown type \n");
-               break;
    }
 
    hypre_printf("\n ILU Solver Parameters: \n");
    hypre_printf("Max number of iterations: %d\n", hypre_ParILUDataMaxIter(ilu_data));
-   hypre_printf("Stopping tolerance: %e\n", hypre_ParILUDataTol(ilu_data));
+   if (hypre_ParILUDataTriSolve(ilu_data))
+   {
+      hypre_printf("  Triangular solver type: exact (1)\n");
+   }
+   else
+   {
+      hypre_printf("  Triangular solver type: iterative (0)\n");
+      hypre_printf(" Lower Jacobi Iterations: %d\n", hypre_ParILUDataLowerJacobiIters(ilu_data));
+      hypre_printf(" Upper Jacobi Iterations: %d\n", hypre_ParILUDataUpperJacobiIters(ilu_data));
+   }
+   hypre_printf("      Stopping tolerance: %e\n", hypre_ParILUDataTol(ilu_data));
 
    return hypre_error_flag;
 }
 
-/* helper functions */
-/*
+/******************************************************************************
+ *
+ * ILU helper functions
+ *
+ * TODO (VPM): move these to a new "par_ilu_utils.c" file
+ *
+ *****************************************************************************/
+
+/*--------------------------------------------------------------------------
+ * hypre_ILUMinHeapAddI
+ *
  * Add an element to the heap
  * I means HYPRE_Int
  * R means HYPRE_Real
@@ -929,21 +1266,23 @@ hypre_ILUWriteSolverParams(void *ilu_vdata)
  *    and add the length of heap by one before call this function.
  * the reason is that we don't want to change something outside the
  *    heap, so left it to the user
- */
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_ILUMinHeapAddI(HYPRE_Int *heap, HYPRE_Int len)
 {
    /* parent, left, right */
    HYPRE_Int p;
-   len--;/* now len is the current index */
-   while(len > 0)
+
+   len--; /* now len is the current index */
+   while (len > 0)
    {
       /* get the parent index */
-      p = (len-1)/2;
-      if(heap[p] > heap[len])
+      p = (len - 1) / 2;
+      if (heap[p] > heap[len])
       {
          /* this is smaller */
-         hypre_swap(heap,p,len);
+         hypre_swap(heap, p, len);
          len = p;
       }
       else
@@ -954,22 +1293,28 @@ hypre_ILUMinHeapAddI(HYPRE_Int *heap, HYPRE_Int len)
    return hypre_error_flag;
 }
 
-/* see hypre_ILUMinHeapAddI for detail instructions */
+/*--------------------------------------------------------------------------
+ * hypre_ILUMinHeapAddIIIi
+ *
+ * See hypre_ILUMinHeapAddI for detail instructions
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_ILUMinHeapAddIIIi(HYPRE_Int *heap, HYPRE_Int *I1, HYPRE_Int *Ii1, HYPRE_Int len)
 {
    /* parent, left, right */
    HYPRE_Int p;
-   len--;/* now len is the current index */
-   while(len > 0)
+
+   len--; /* now len is the current index */
+   while (len > 0)
    {
       /* get the parent index */
-      p = (len-1)/2;
-      if(heap[p] > heap[len])
+      p = (len - 1) / 2;
+      if (heap[p] > heap[len])
       {
          /* this is smaller */
-         hypre_swap(Ii1,heap[p],heap[len]);
-         hypre_swap2i(heap,I1,p,len);
+         hypre_swap(Ii1, heap[p], heap[len]);
+         hypre_swap2i(heap, I1, p, len);
          len = p;
       }
       else
@@ -980,48 +1325,28 @@ hypre_ILUMinHeapAddIIIi(HYPRE_Int *heap, HYPRE_Int *I1, HYPRE_Int *Ii1, HYPRE_In
    return hypre_error_flag;
 }
 
-/* see hypre_ILUMinHeapAddI for detail instructions */
+/*--------------------------------------------------------------------------
+ * hypre_ILUMinHeapAddIRIi
+ *
+ * see hypre_ILUMinHeapAddI for detail instructions
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_ILUMinHeapAddIRIi(HYPRE_Int *heap, HYPRE_Real *I1, HYPRE_Int *Ii1, HYPRE_Int len)
 {
    /* parent, left, right */
    HYPRE_Int p;
-   len--;/* now len is the current index */
-   while(len > 0)
-   {
-      /* get the parent index */
-      p = (len-1)/2;
-      if(heap[p] > heap[len])
-      {
-         /* this is smaller */
-         hypre_swap(Ii1,heap[p],heap[len]);
-         hypre_swap2(heap,I1,p,len);
-         len = p;
-      }
-      else
-      {
-         break;
-      }
-   }
-   return hypre_error_flag;
-}
 
-/* see hypre_ILUMinHeapAddI for detail instructions */
-HYPRE_Int
-hypre_ILUMaxHeapAddRabsIIi(HYPRE_Real *heap, HYPRE_Int *I1, HYPRE_Int *Ii1, HYPRE_Int len)
-{
-   /* parent, left, right */
-   HYPRE_Int p;
-   len--;/* now len is the current index */
-   while(len > 0)
+   len--; /* now len is the current index */
+   while (len > 0)
    {
       /* get the parent index */
-      p = (len-1)/2;
-      if(hypre_abs(heap[p]) < hypre_abs(heap[len]))
+      p = (len - 1) / 2;
+      if (heap[p] > heap[len])
       {
          /* this is smaller */
-         hypre_swap(Ii1,heap[p],heap[len]);
-         hypre_swap2(I1,heap,p,len);
+         hypre_swap(Ii1, heap[p], heap[len]);
+         hypre_swap2(heap, I1, p, len);
          len = p;
       }
       else
@@ -1032,21 +1357,26 @@ hypre_ILUMaxHeapAddRabsIIi(HYPRE_Real *heap, HYPRE_Int *I1, HYPRE_Int *Ii1, HYPR
    return hypre_error_flag;
 }
 
-/* see hypre_ILUMinHeapAddI for detail instructions */
+/*--------------------------------------------------------------------------
+ * hypre_ILUMaxrHeapAddRabsI
+ *
+ * See hypre_ILUMinHeapAddI for detail instructions
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_ILUMaxrHeapAddRabsI(HYPRE_Real *heap, HYPRE_Int *I1, HYPRE_Int len)
 {
    /* parent, left, right */
    HYPRE_Int p;
    len--;/* now len is the current index */
-   while(len > 0)
+   while (len > 0)
    {
       /* get the parent index */
-      p = (len-1)/2;
-      if(hypre_abs(heap[-p]) < hypre_abs(heap[-len]))
+      p = (len - 1) / 2;
+      if (hypre_abs(heap[-p]) < hypre_abs(heap[-len]))
       {
          /* this is smaller */
-         hypre_swap2(I1,heap,-p,-len);
+         hypre_swap2(I1, heap, -p, -len);
          len = p;
       }
       else
@@ -1057,7 +1387,9 @@ hypre_ILUMaxrHeapAddRabsI(HYPRE_Real *heap, HYPRE_Int *I1, HYPRE_Int len)
    return hypre_error_flag;
 }
 
-/*
+/*--------------------------------------------------------------------------
+ * hypre_ILUMinHeapRemoveI
+ *
  * Swap the first element with the last element of the heap,
  *    reduce size by one, and maintain the heap structure
  * I means HYPRE_Int
@@ -1067,95 +1399,77 @@ hypre_ILUMaxrHeapAddRabsI(HYPRE_Real *heap, HYPRE_Int *I1, HYPRE_Int len)
  * Ii and Ri means orderd by value of heap, like iw for ILU
  * heap: aray of that heap
  * len: current length of the heap
- * WARNING: Remember to change the len youself
- */
+ * WARNING: Remember to change the len yourself
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_ILUMinHeapRemoveI(HYPRE_Int *heap, HYPRE_Int len)
 {
    /* parent, left, right */
-   HYPRE_Int p,l,r;
-   len--;/* now len is the max index */
-   /* swap the first element to last */
-   hypre_swap(heap,0,len);
-   p = 0;
-   l = 1;
-   /* while I'm still in the heap */
-   while(l < len)
-   {
-      r = 2*p+2;
-      /* two childs, pick the smaller one */
-      l = r >= len || heap[l]<heap[r] ? l : r;
-      if(heap[l]<heap[p])
-      {
-         hypre_swap(heap,l,p);
-         p = l;
-         l = 2*p+1;
-      }
-      else
-      {
-         break;
-      }
-   }
-   return hypre_error_flag;
-}
+   HYPRE_Int p, l, r;
+
+   len--; /* now len is the max index */
 
-/* see hypre_ILUMinHeapRemoveI for detail instructions */
-HYPRE_Int
-hypre_ILUMinHeapRemoveIIIi(HYPRE_Int *heap, HYPRE_Int *I1, HYPRE_Int *Ii1, HYPRE_Int len)
-{
-   /* parent, left, right */
-   HYPRE_Int p,l,r;
-   len--;/* now len is the max index */
    /* swap the first element to last */
-   hypre_swap(Ii1,heap[0],heap[len]);
-   hypre_swap2i(heap,I1,0,len);
+   hypre_swap(heap, 0, len);
    p = 0;
    l = 1;
+
    /* while I'm still in the heap */
-   while(l < len)
+   while (l < len)
    {
-      r = 2*p+2;
+      r = 2 * p + 2;
+
       /* two childs, pick the smaller one */
-      l = r >= len || heap[l]<heap[r] ? l : r;
-      if(heap[l]<heap[p])
+      l = r >= len || heap[l] < heap[r] ? l : r;
+      if (heap[l] < heap[p])
       {
-         hypre_swap(Ii1,heap[p],heap[l]);
-         hypre_swap2i(heap,I1,l,p);
+         hypre_swap(heap, l, p);
          p = l;
-         l = 2*p+1;
+         l = 2 * p + 1;
       }
       else
       {
          break;
       }
    }
+
    return hypre_error_flag;
 }
 
-/* see hypre_ILUMinHeapRemoveI for detail instructions */
+/*--------------------------------------------------------------------------
+ * hypre_ILUMinHeapRemoveIIIi
+ *
+ * See hypre_ILUMinHeapRemoveI for detail instructions
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_ILUMinHeapRemoveIRIi(HYPRE_Int *heap, HYPRE_Real *I1, HYPRE_Int *Ii1, HYPRE_Int len)
+hypre_ILUMinHeapRemoveIIIi(HYPRE_Int *heap, HYPRE_Int *I1, HYPRE_Int *Ii1, HYPRE_Int len)
 {
    /* parent, left, right */
-   HYPRE_Int p,l,r;
+   HYPRE_Int p, l, r;
+
    len--;/* now len is the max index */
+
    /* swap the first element to last */
-   hypre_swap(Ii1,heap[0],heap[len]);
-   hypre_swap2(heap,I1,0,len);
+   hypre_swap(Ii1, heap[0], heap[len]);
+   hypre_swap2i(heap, I1, 0, len);
    p = 0;
    l = 1;
+
    /* while I'm still in the heap */
-   while(l < len)
+   while (l < len)
    {
-      r = 2*p+2;
+      r = 2 * p + 2;
+
       /* two childs, pick the smaller one */
-      l = r >= len || heap[l]<heap[r] ? l : r;
-      if(heap[l]<heap[p])
+      l = r >= len || heap[l] < heap[r] ? l : r;
+      if (heap[l] < heap[p])
       {
-         hypre_swap(Ii1,heap[p],heap[l]);
-         hypre_swap2(heap,I1,l,p);
+         hypre_swap(Ii1, heap[p], heap[l]);
+         hypre_swap2i(heap, I1, l, p);
          p = l;
-         l = 2*p+1;
+         l = 2 * p + 1;
       }
       else
       {
@@ -1165,61 +1479,80 @@ hypre_ILUMinHeapRemoveIRIi(HYPRE_Int *heap, HYPRE_Real *I1, HYPRE_Int *Ii1, HYPR
    return hypre_error_flag;
 }
 
-/* see hypre_ILUMinHeapRemoveI for detail instructions */
+/*--------------------------------------------------------------------------
+ * hypre_ILUMinHeapRemoveIRIi
+ *
+ * See hypre_ILUMinHeapRemoveI for detail instructions
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_ILUMaxHeapRemoveRabsIIi(HYPRE_Real *heap, HYPRE_Int *I1, HYPRE_Int *Ii1, HYPRE_Int len)
+hypre_ILUMinHeapRemoveIRIi(HYPRE_Int *heap, HYPRE_Real *I1, HYPRE_Int *Ii1, HYPRE_Int len)
 {
    /* parent, left, right */
-   HYPRE_Int p,l,r;
+   HYPRE_Int p, l, r;
+
    len--;/* now len is the max index */
+
    /* swap the first element to last */
-   hypre_swap(Ii1,heap[0],heap[len]);
-   hypre_swap2(I1,heap,0,len);
+   hypre_swap(Ii1, heap[0], heap[len]);
+   hypre_swap2(heap, I1, 0, len);
    p = 0;
    l = 1;
+
    /* while I'm still in the heap */
-   while(l < len)
+   while (l < len)
    {
-      r = 2*p+2;
+      r = 2 * p + 2;
+
       /* two childs, pick the smaller one */
-      l = r >= len || hypre_abs(heap[l])>hypre_abs(heap[r]) ? l : r;
-      if(hypre_abs(heap[l])>hypre_abs(heap[p]))
+      l = r >= len || heap[l] < heap[r] ? l : r;
+      if (heap[l] < heap[p])
       {
-         hypre_swap(Ii1,heap[p],heap[l]);
-         hypre_swap2(I1,heap,l,p);
+         hypre_swap(Ii1, heap[p], heap[l]);
+         hypre_swap2(heap, I1, l, p);
          p = l;
-         l = 2*p+1;
+         l = 2 * p + 1;
       }
       else
       {
          break;
       }
    }
+
    return hypre_error_flag;
 }
 
-/* see hypre_ILUMinHeapRemoveI for detail instructions */
+/*--------------------------------------------------------------------------
+ * hypre_ILUMaxrHeapRemoveRabsI
+ *
+ * See hypre_ILUMinHeapRemoveI for detail instructions
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_ILUMaxrHeapRemoveRabsI(HYPRE_Real *heap, HYPRE_Int *I1, HYPRE_Int len)
 {
    /* parent, left, right */
-   HYPRE_Int p,l,r;
+   HYPRE_Int p, l, r;
+
    len--;/* now len is the max index */
+
    /* swap the first element to last */
-   hypre_swap2(I1,heap,0,-len);
+   hypre_swap2(I1, heap, 0, -len);
    p = 0;
    l = 1;
+
    /* while I'm still in the heap */
-   while(l < len)
+   while (l < len)
    {
-      r = 2*p+2;
+      r = 2 * p + 2;
+
       /* two childs, pick the smaller one */
-      l = r >= len || hypre_abs(heap[-l])>hypre_abs(heap[-r]) ? l : r;
-      if(hypre_abs(heap[-l])>hypre_abs(heap[-p]))
+      l = r >= len || hypre_abs(heap[-l]) > hypre_abs(heap[-r]) ? l : r;
+      if (hypre_abs(heap[-l]) > hypre_abs(heap[-p]))
       {
-         hypre_swap2(I1,heap,-l,-p);
+         hypre_swap2(I1, heap, -l, -p);
          p = l;
-         l = 2*p+1;
+         l = 2 * p + 1;
       }
       else
       {
@@ -1229,41 +1562,56 @@ hypre_ILUMaxrHeapRemoveRabsI(HYPRE_Real *heap, HYPRE_Int *I1, HYPRE_Int len)
    return hypre_error_flag;
 }
 
-/* Split based on quick sort algorithm (avoid sorting the entire array)
+/*--------------------------------------------------------------------------
+ * hypre_ILUMaxQSplitRabsI
+ *
+ * Split based on quick sort algorithm (avoid sorting the entire array)
  * find the largest k elements out of original array
- * array: input array for compare
- * I: integer array bind with array
+ *
+ * arrayR: input array for compare
+ * arrayI: integer array bind with array
  * k: largest k elements
  * len: length of the array
- */
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_ILUMaxQSplitRabsI(HYPRE_Real *array, HYPRE_Int *I, HYPRE_Int left, HYPRE_Int bound, HYPRE_Int right)
+hypre_ILUMaxQSplitRabsI(HYPRE_Real *arrayR,
+                        HYPRE_Int  *arrayI,
+                        HYPRE_Int   left,
+                        HYPRE_Int   bound,
+                        HYPRE_Int   right)
 {
    HYPRE_Int i, last;
+
    if (left >= right)
    {
       return hypre_error_flag;
    }
-   hypre_swap2(I,array,left,(left+right)/2);
+
+   hypre_swap2(arrayI, arrayR, left, (left + right) / 2);
    last = left;
-   for(i = left + 1 ; i <= right ; i ++)
+   for (i = left + 1 ; i <= right ; i ++)
    {
-      if(hypre_abs(array[i]) > hypre_abs(array[left]))
+      if (hypre_abs(arrayR[i]) > hypre_abs(arrayR[left]))
       {
-         hypre_swap2(I,array,++last,i);
+         hypre_swap2(arrayI, arrayR, ++last, i);
       }
    }
-   hypre_swap2(I,array,left,last);
-   hypre_ILUMaxQSplitRabsI(array,I,left,bound,last-1);
-   if(bound > last)
+
+   hypre_swap2(arrayI, arrayR, left, last);
+   hypre_ILUMaxQSplitRabsI(arrayR, arrayI, left, bound, last - 1);
+   if (bound > last)
    {
-       hypre_ILUMaxQSplitRabsI(array,I,last+1,bound,right);
+      hypre_ILUMaxQSplitRabsI(arrayR, arrayI, last + 1, bound, right);
    }
 
    return hypre_error_flag;
 }
 
-/* Helper function to search max value from a row
+/*--------------------------------------------------------------------------
+ * hypre_ILUMaxRabs
+ *
+ * Helper function to search max value from a row
  * array: the array we work on
  * start: the start of the search range
  * end: the end of the search range
@@ -1274,24 +1622,34 @@ hypre_ILUMaxQSplitRabsI(HYPRE_Real *array, HYPRE_Int *I, HYPRE_Int left, HYPRE_I
  * index: return the index of that value, could be NULL which means not return
  * l1_norm: return the l1_norm of the array, could be NULL which means no return
  * nnz: return the number of nonzeros inside this array, could be NULL which means no return
- */
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_ILUMaxRabs(HYPRE_Real *array_data, HYPRE_Int *array_j, HYPRE_Int start, HYPRE_Int end, HYPRE_Int nLU, HYPRE_Int *rperm, HYPRE_Real *value, HYPRE_Int *index, HYPRE_Real *l1_norm, HYPRE_Int *nnz)
+hypre_ILUMaxRabs(HYPRE_Real  *array_data,
+                 HYPRE_Int   *array_j,
+                 HYPRE_Int    start,
+                 HYPRE_Int    end,
+                 HYPRE_Int    nLU,
+                 HYPRE_Int   *rperm,
+                 HYPRE_Real  *value,
+                 HYPRE_Int   *index,
+                 HYPRE_Real  *l1_norm,
+                 HYPRE_Int   *nnz)
 {
-   HYPRE_Int i, idx, col;
-   HYPRE_Real val, max_value, norm, nz;
+   HYPRE_Int i, idx, col, nz;
+   HYPRE_Real val, max_value, norm;
 
    nz = 0;
    norm = 0.0;
    max_value = -1.0;
    idx = -1;
-   if(rperm)
+   if (rperm)
    {
       /* apply rperm and nLU */
-      for(i = start ; i < end ; i ++)
+      for (i = start ; i < end ; i ++)
       {
          col = rperm[array_j[i]];
-         if(col > nLU)
+         if (col > nLU)
          {
             /* this old column is in new external part */
             continue;
@@ -1299,7 +1657,7 @@ hypre_ILUMaxRabs(HYPRE_Real *array_data, HYPRE_Int *array_j, HYPRE_Int start, HY
          nz ++;
          val = hypre_abs(array_data[i]);
          norm += val;
-         if(max_value < val)
+         if (max_value < val)
          {
             max_value = val;
             idx = i;
@@ -1309,11 +1667,11 @@ hypre_ILUMaxRabs(HYPRE_Real *array_data, HYPRE_Int *array_j, HYPRE_Int start, HY
    else
    {
       /* basic search */
-      for(i = start ; i < end ; i ++)
+      for (i = start ; i < end ; i ++)
       {
          val = hypre_abs(array_data[i]);
          norm += val;
-         if(max_value < val)
+         if (max_value < val)
          {
             max_value = val;
             idx = i;
@@ -1323,15 +1681,15 @@ hypre_ILUMaxRabs(HYPRE_Real *array_data, HYPRE_Int *array_j, HYPRE_Int start, HY
    }
 
    *value = max_value;
-   if(index)
+   if (index)
    {
       *index = idx;
    }
-   if(l1_norm)
+   if (l1_norm)
    {
       *l1_norm = norm;
    }
-   if(nnz)
+   if (nnz)
    {
       *nnz = nz;
    }
@@ -1339,7 +1697,10 @@ hypre_ILUMaxRabs(HYPRE_Real *array_data, HYPRE_Int *array_j, HYPRE_Int start, HY
    return hypre_error_flag;
 }
 
-/* Pre selection for ddPQ, this is the basic version considering row sparsity
+/*--------------------------------------------------------------------------
+ * hypre_ILUGetPermddPQPre
+ *
+ * Pre selection for ddPQ, this is the basic version considering row sparsity
  * n: size of matrix
  * nLU: size we consider ddPQ reorder, only first nLU*nLU block is considered
  * A_diag_i/j/data: information of A
@@ -1348,33 +1709,48 @@ hypre_ILUMaxRabs(HYPRE_Real *array_data, HYPRE_Int *array_j, HYPRE_Int start, HY
  * *rperm: current column order
  * *pperm_pre: output ddPQ pre row roder
  * *qperm_pre: output ddPQ pre column order
- */
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_ILUGetPermddPQPre(HYPRE_Int n, HYPRE_Int nLU, HYPRE_Int *A_diag_i, HYPRE_Int *A_diag_j, HYPRE_Real *A_diag_data, HYPRE_Real tol, HYPRE_Int *perm, HYPRE_Int *rperm,
-                        HYPRE_Int *pperm_pre, HYPRE_Int *qperm_pre, HYPRE_Int *nB)
+hypre_ILUGetPermddPQPre(HYPRE_Int   n,
+                        HYPRE_Int   nLU,
+                        HYPRE_Int  *A_diag_i,
+                        HYPRE_Int  *A_diag_j,
+                        HYPRE_Real *A_diag_data,
+                        HYPRE_Real  tol,
+                        HYPRE_Int  *perm,
+                        HYPRE_Int  *rperm,
+                        HYPRE_Int  *pperm_pre,
+                        HYPRE_Int  *qperm_pre,
+                        HYPRE_Int  *nB)
 {
+   HYPRE_UNUSED_VAR(n);
+
    HYPRE_Int   i, ii, nB_pre, k1, k2;
    HYPRE_Real  gtol, max_value, norm;
 
    HYPRE_Int   *jcol, *jnnz;
    HYPRE_Real  *weight;
 
-   weight      = hypre_TAlloc(HYPRE_Real, nLU + 1, HYPRE_MEMORY_HOST);
-   jcol        = hypre_TAlloc(HYPRE_Int, nLU + 1, HYPRE_MEMORY_HOST);
-   jnnz        = hypre_TAlloc(HYPRE_Int, nLU + 1, HYPRE_MEMORY_HOST);
+   weight = hypre_TAlloc(HYPRE_Real, nLU + 1, HYPRE_MEMORY_HOST);
+   jcol   = hypre_TAlloc(HYPRE_Int, nLU + 1, HYPRE_MEMORY_HOST);
+   jnnz   = hypre_TAlloc(HYPRE_Int, nLU + 1, HYPRE_MEMORY_HOST);
+
+   max_value = -1.0;
 
-   max_value   = -1.0;
    /* first need to build gtol */
-   for( ii = 0 ; ii < nLU ; ii ++)
+   for (ii = 0; ii < nLU; ii++)
    {
       /* find real row */
       i = perm[ii];
       k1 = A_diag_i[i];
-      k2 = A_diag_i[i+1];
+      k2 = A_diag_i[i + 1];
+
       /* find max|a| of that row and its index */
-      hypre_ILUMaxRabs(A_diag_data, A_diag_j, k1, k2, nLU, rperm, weight + ii, jcol + ii, &norm, jnnz + ii);
+      hypre_ILUMaxRabs(A_diag_data, A_diag_j, k1, k2, nLU, rperm,
+                       weight + ii, jcol + ii, &norm, jnnz + ii);
       weight[ii] /= norm;
-      if(weight[ii] > max_value)
+      if (weight[ii] > max_value)
       {
          max_value = weight[ii];
       }
@@ -1384,10 +1760,10 @@ hypre_ILUGetPermddPQPre(HYPRE_Int n, HYPRE_Int nLU, HYPRE_Int *A_diag_i, HYPRE_I
 
    /* second loop to pre select B */
    nB_pre = 0;
-   for( ii = 0 ; ii < nLU ; ii ++)
+   for ( ii = 0 ; ii < nLU ; ii ++)
    {
       /* keep this row */
-      if(weight[ii] > gtol)
+      if (weight[ii] > gtol)
       {
          weight[nB_pre] /= (HYPRE_Real)(jnnz[ii]);
          pperm_pre[nB_pre] = perm[ii];
@@ -1398,7 +1774,7 @@ hypre_ILUGetPermddPQPre(HYPRE_Int n, HYPRE_Int nLU, HYPRE_Int *A_diag_i, HYPRE_I
    *nB = nB_pre;
 
    /* sort from small to large */
-   hypre_qsort3(weight, pperm_pre, qperm_pre, 0, nB_pre-1);
+   hypre_qsort3(weight, pperm_pre, qperm_pre, 0, nB_pre - 1);
 
    hypre_TFree(weight, HYPRE_MEMORY_HOST);
    hypre_TFree(jcol, HYPRE_MEMORY_HOST);
@@ -1407,47 +1783,60 @@ hypre_ILUGetPermddPQPre(HYPRE_Int n, HYPRE_Int nLU, HYPRE_Int *A_diag_i, HYPRE_I
    return hypre_error_flag;
 }
 
-/* Get ddPQ version perm array for ParCSR
- * Greedy matching selection
- * ddPQ is a two-side permutation for diagonal dominance
- * A: the input matrix
- * pperm: row permutation
- * qperm: col permutation
- * nB: the size of B block
- * nI: number of interial nodes
- * tol: the dropping tolorance for ddPQ
- * reordering_type: Type of reordering for the interior nodes.
+/*--------------------------------------------------------------------------
+ * hypre_ILUGetPermddPQ
+ *
+ * Get ddPQ version perm array for ParCSR matrices. ddPQ is a two-side
+ * permutation for diagonal dominance. Greedy matching selection
+ *
+ * Parameters:
+ *   A: the input matrix
+ *   pperm: row permutation (lives at memory_location_A)
+ *   qperm: col permutation (lives at memory_location_A)
+ *   nB: the size of B block
+ *   nI: number of interial nodes
+ *   tol: the dropping tolorance for ddPQ
+ *   reordering_type: Type of reordering for the interior nodes.
+ *
  * Currently only supports RCM reordering. Set to 0 for no reordering.
- */
+ *
+ * TODO (VPM): Change permutation arrays types to hypre_IntArray
+ *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_ILUGetPermddPQ(hypre_ParCSRMatrix *A, HYPRE_Int **io_pperm, HYPRE_Int **io_qperm, HYPRE_Real tol, HYPRE_Int *nB, HYPRE_Int *nI, HYPRE_Int reordering_type)
+hypre_ILUGetPermddPQ(hypre_ParCSRMatrix   *A,
+                     HYPRE_Int           **io_pperm,
+                     HYPRE_Int           **io_qperm,
+                     HYPRE_Real            tol,
+                     HYPRE_Int            *nB,
+                     HYPRE_Int            *nI,
+                     HYPRE_Int             reordering_type)
 {
-   HYPRE_Int         i, nB_pre, irow, jcol, nLU;
-   HYPRE_Int         *pperm, *qperm;
-   HYPRE_Int         *rpperm, *rqperm, *pperm_pre, *qperm_pre;
-
    /* data objects for A */
-   hypre_CSRMatrix   *A_diag = hypre_ParCSRMatrixDiag(A);
-   HYPRE_Int         *A_diag_i = hypre_CSRMatrixI(A_diag);
-   HYPRE_Int         *A_diag_j = hypre_CSRMatrixJ(A_diag);
-   HYPRE_Real        *A_diag_data = hypre_CSRMatrixData(A_diag);
-
-   /* problem size */
-   HYPRE_Int         n = hypre_CSRMatrixNumRows(A_diag);
-
-   /* 1: Setup and create memory
-    */
-
-   pperm             = NULL;
-   qperm             = hypre_TAlloc(HYPRE_Int, n, HYPRE_MEMORY_DEVICE);
-   rpperm            = hypre_TAlloc(HYPRE_Int, n, HYPRE_MEMORY_HOST);
-   rqperm            = hypre_TAlloc(HYPRE_Int, n, HYPRE_MEMORY_HOST);
+   hypre_CSRMatrix       *A_diag          = hypre_ParCSRMatrixDiag(A);
+   HYPRE_Int              n               = hypre_CSRMatrixNumRows(A_diag);
+   HYPRE_MemoryLocation   memory_location = hypre_CSRMatrixMemoryLocation(A_diag);
+
+   hypre_CSRMatrix       *h_A_diag;
+   HYPRE_Int             *A_diag_i;
+   HYPRE_Int             *A_diag_j;
+   HYPRE_Complex         *A_diag_data;
+
+   /* Local variables */
+   HYPRE_Int              i, nB_pre, irow, jcol, nLU;
+   HYPRE_Int             *pperm, *qperm;
+   HYPRE_Int             *new_pperm, *new_qperm;
+   HYPRE_Int             *rpperm, *rqperm, *pperm_pre, *qperm_pre;
+   HYPRE_MemoryLocation   memory_location_perm;
+
+   /* 1: Setup and create memory */
+   pperm  = NULL;
+   qperm  = hypre_TAlloc(HYPRE_Int, n, HYPRE_MEMORY_HOST);
+   rpperm = hypre_TAlloc(HYPRE_Int, n, HYPRE_MEMORY_HOST);
+   rqperm = hypre_TAlloc(HYPRE_Int, n, HYPRE_MEMORY_HOST);
 
-   /* 2: Find interior nodes first
-    */
-   hypre_ILUGetInteriorExteriorPerm( A, &pperm, &nLU, 0);
-   *nI = nLU;
+   /* 2: Find interior nodes first */
+   hypre_ILUGetInteriorExteriorPerm(A, HYPRE_MEMORY_HOST, &pperm, &nLU, 0);
 
    /* 3: Pre selection on interial nodes
     * this pre selection puts external nodes to the last
@@ -1457,7 +1846,7 @@ hypre_ILUGetPermddPQ(hypre_ParCSRMatrix *A, HYPRE_Int **io_pperm, HYPRE_Int **io
    /* build reverse permutation array
     * rperm[old] = new
     */
-   for(i = 0 ; i < n ; i ++)
+   for (i = 0 ; i < n ; i ++)
    {
       rpperm[pperm[i]] = i;
    }
@@ -1466,32 +1855,40 @@ hypre_ILUGetPermddPQ(hypre_ParCSRMatrix *A, HYPRE_Int **io_pperm, HYPRE_Int **io
    pperm_pre = hypre_TAlloc(HYPRE_Int, nLU, HYPRE_MEMORY_HOST);
    qperm_pre = hypre_TAlloc(HYPRE_Int, nLU, HYPRE_MEMORY_HOST);
 
+   /* Set/Move A_diag to host memory */
+   h_A_diag = (hypre_GetActualMemLocation(memory_location) == hypre_MEMORY_DEVICE) ?
+              hypre_CSRMatrixClone_v2(A_diag, 1, HYPRE_MEMORY_HOST) : A_diag;
+   A_diag_i = hypre_CSRMatrixI(h_A_diag);
+   A_diag_j = hypre_CSRMatrixJ(h_A_diag);
+   A_diag_data = hypre_CSRMatrixData(h_A_diag);
+
    /* pre selection */
-   hypre_ILUGetPermddPQPre(n, nLU, A_diag_i, A_diag_j, A_diag_data, tol, pperm, rpperm, pperm_pre, qperm_pre, &nB_pre);
+   hypre_ILUGetPermddPQPre(n, nLU, A_diag_i, A_diag_j, A_diag_data, tol,
+                           pperm, rpperm, pperm_pre, qperm_pre, &nB_pre);
 
    /* 4: Build B block
     * Greedy selection
     */
 
    /* rperm[old] = new */
-   for(i = 0 ; i < nLU ; i ++)
+   for (i = 0 ; i < nLU ; i ++)
    {
       rpperm[pperm[i]] = -1;
    }
 
-   hypre_TMemcpy( rqperm, rpperm, HYPRE_Int, n, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
-   hypre_TMemcpy( qperm, pperm, HYPRE_Int, n, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
+   hypre_TMemcpy(rqperm, rpperm, HYPRE_Int, n, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
+   hypre_TMemcpy(qperm, pperm, HYPRE_Int, n, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
 
    /* we sort from small to large, so we need to go from back to start
     * we only need nB_pre to start the loop, after that we could use it for size of B
     */
-   for(i = nB_pre-1, nB_pre = 0 ; i >=0 ; i --)
+   for (i = nB_pre - 1, nB_pre = 0 ; i >= 0 ; i --)
    {
       irow = pperm_pre[i];
       jcol = qperm_pre[i];
 
       /* this col is not yet taken */
-      if(rqperm[jcol] < 0)
+      if (rqperm[jcol] < 0)
       {
          rpperm[irow] = nB_pre;
          rqperm[jcol] = nB_pre;
@@ -1505,504 +1902,263 @@ hypre_ILUGetPermddPQ(hypre_ParCSRMatrix *A, HYPRE_Int **io_pperm, HYPRE_Int **io
     * those still mapped to a new index means not yet covered
     */
    nLU = nB_pre;
-   for(i = 0 ; i < n ; i ++)
+   for (i = 0 ; i < n ; i ++)
    {
-      if(rpperm[i] < 0)
+      if (rpperm[i] < 0)
       {
          pperm[nB_pre++] = i;
       }
    }
    nB_pre = nLU;
-   for(i = 0 ; i < n ; i ++)
+   for (i = 0 ; i < n ; i ++)
    {
-      if(rqperm[i] < 0)
+      if (rqperm[i] < 0)
       {
          qperm[nB_pre++] = i;
       }
    }
 
-   /* Finishing up and free
-    */
+   /* Apply RCM reordering */
+   if (reordering_type != 0)
+   {
+      hypre_ILULocalRCM(h_A_diag, 0, nLU, &pperm, &qperm, 0);
+      memory_location_perm = memory_location;
+   }
+   else
+   {
+      memory_location_perm = HYPRE_MEMORY_HOST;
+   }
 
-   switch(reordering_type)
+   /* Move to device memory if needed */
+   if (memory_location_perm != memory_location)
    {
-      case 0:
-         /* no RCM in this case */
-         break;
-      case 1:
-         /* RCM */
-         hypre_ILULocalRCM( hypre_ParCSRMatrixDiag(A), 0, nLU, &pperm, &qperm, 0);
-         break;
-      default:
-         /* RCM */
-         hypre_ILULocalRCM( hypre_ParCSRMatrixDiag(A), 0, nLU, &pperm, &qperm, 0);
-         break;
+      new_pperm = hypre_TAlloc(HYPRE_Int, n, memory_location);
+      new_qperm = hypre_TAlloc(HYPRE_Int, n, memory_location);
+
+      hypre_TMemcpy(new_pperm, pperm, HYPRE_Int, n,
+                    memory_location, memory_location_perm);
+      hypre_TMemcpy(new_qperm, qperm, HYPRE_Int, n,
+                    memory_location, memory_location_perm);
+
+      hypre_TFree(pperm, memory_location_perm);
+      hypre_TFree(qperm, memory_location_perm);
+
+      pperm = new_pperm;
+      qperm = new_qperm;
    }
 
+   /* Output pointers */
+   *nI = nLU;
    *nB = nLU;
    *io_pperm = pperm;
    *io_qperm = qperm;
 
-   hypre_TFree( rpperm, HYPRE_MEMORY_HOST);
-   hypre_TFree( rqperm, HYPRE_MEMORY_HOST);
-   hypre_TFree( pperm_pre, HYPRE_MEMORY_HOST);
-   hypre_TFree( qperm_pre, HYPRE_MEMORY_HOST);
+   /* Free memory */
+   if (h_A_diag != A_diag)
+   {
+      hypre_CSRMatrixDestroy(h_A_diag);
+   }
+   hypre_TFree(rpperm, HYPRE_MEMORY_HOST);
+   hypre_TFree(rqperm, HYPRE_MEMORY_HOST);
+   hypre_TFree(pperm_pre, HYPRE_MEMORY_HOST);
+   hypre_TFree(qperm_pre, HYPRE_MEMORY_HOST);
+
    return hypre_error_flag;
 }
 
-/*
+/*--------------------------------------------------------------------------
+ * hypre_ILUGetInteriorExteriorPerm
+ *
  * Get perm array from parcsr matrix based on diag and offdiag matrix
  * Just simply loop through the rows of offd of A, check for nonzero rows
  * Put interior nodes at the beginning
- * A: parcsr matrix
- * perm: permutation array
- * nLU: number of interial nodes
- * reordering_type: Type of (additional) reordering for the interior nodes.
+ *
+ * Parameters:
+ *   A: parcsr matrix
+ *   perm: permutation array
+ *   nLU: number of interial nodes
+ *   reordering_type: Type of (additional) reordering for the interior nodes.
+ *
  * Currently only supports RCM reordering. Set to 0 for no reordering.
- */
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_ILUGetInteriorExteriorPerm(hypre_ParCSRMatrix *A, HYPRE_Int **perm, HYPRE_Int *nLU, HYPRE_Int reordering_type)
+hypre_ILUGetInteriorExteriorPerm(hypre_ParCSRMatrix   *A,
+                                 HYPRE_MemoryLocation  memory_location,
+                                 HYPRE_Int           **perm,
+                                 HYPRE_Int            *nLU,
+                                 HYPRE_Int             reordering_type)
 {
    /* get basic information of A */
-   HYPRE_Int            n = hypre_ParCSRMatrixNumRows(A);
-   HYPRE_Int            i, j, first, last, start, end;
-   HYPRE_Int            num_sends, send_map_start, send_map_end, col;
-   hypre_CSRMatrix      *A_offd;
-   HYPRE_Int            *A_offd_i;
-   A_offd               = hypre_ParCSRMatrixOffd(A);
-   A_offd_i             = hypre_CSRMatrixI(A_offd);
-   first                = 0;
-   last                 = n - 1;
-   HYPRE_Int            *temp_perm = hypre_TAlloc(HYPRE_Int, n, HYPRE_MEMORY_DEVICE);
-   HYPRE_Int            *marker = hypre_CTAlloc(HYPRE_Int, n, HYPRE_MEMORY_HOST);
-
-   /* first get col nonzero from com_pkg */
-   /* get comm_pkg, craete one if we not yet have one */
-   hypre_ParCSRCommPkg  *comm_pkg = hypre_ParCSRMatrixCommPkg(A);
+   HYPRE_Int              n        = hypre_ParCSRMatrixNumRows(A);
+   hypre_CSRMatrix       *A_diag   = hypre_ParCSRMatrixDiag(A);
+   hypre_CSRMatrix       *A_offd   = hypre_ParCSRMatrixOffd(A);
+   hypre_ParCSRCommPkg   *comm_pkg = hypre_ParCSRMatrixCommPkg(A);
+   HYPRE_MemoryLocation   A_memory_location = hypre_ParCSRMatrixMemoryLocation(A);
+
+   HYPRE_Int             *A_offd_i;
+   HYPRE_Int              i, j, first, last, start, end;
+   HYPRE_Int              num_sends, send_map_start, send_map_end, col;
+
+   /* Local arrays */
+   HYPRE_Int             *tperm   = hypre_TAlloc(HYPRE_Int, n, memory_location);
+   HYPRE_Int             *h_tperm = hypre_CTAlloc(HYPRE_Int, n, HYPRE_MEMORY_HOST);
+   HYPRE_Int             *marker  = hypre_CTAlloc(HYPRE_Int, n, HYPRE_MEMORY_HOST);
+
+   /* Get comm_pkg, create one if not present */
    if (!comm_pkg)
    {
       hypre_MatvecCommPkgCreate(A);
       comm_pkg = hypre_ParCSRMatrixCommPkg(A);
    }
 
-   /* now directly take adavantage of comm_pkg */
+   /* Set A_offd_i on the host */
+   if (hypre_GetActualMemLocation(A_memory_location) == hypre_MEMORY_DEVICE)
+   {
+      /* Move A_offd_i to host */
+      A_offd_i = hypre_CTAlloc(HYPRE_Int, n + 1, HYPRE_MEMORY_HOST);
+      hypre_TMemcpy(A_offd_i,  hypre_CSRMatrixI(A_offd), HYPRE_Int, n + 1,
+                    HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
+   }
+   else
+   {
+      A_offd_i = hypre_CSRMatrixI(A_offd);
+   }
+
+   /* Set initial interior/exterior pointers */
+   first = 0;
+   last  = n - 1;
+
+   /* now directly take advantage of comm_pkg */
    num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
-   for( i = 0 ; i < num_sends ; i ++ )
+   for (i = 0; i < num_sends; i++)
    {
-      send_map_start = hypre_ParCSRCommPkgSendMapStart(comm_pkg,i);
-      send_map_end = hypre_ParCSRCommPkgSendMapStart(comm_pkg,i+1);
-      for ( j = send_map_start ; j < send_map_end ; j ++)
+      send_map_start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
+      send_map_end   = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1);
+      for (j = send_map_start; j < send_map_end; j++)
       {
          col = hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j);
-         if(marker[col] == 0)
+         if (marker[col] == 0)
          {
-            temp_perm[last--] = col;
+            h_tperm[last--] = col;
             marker[col] = -1;
          }
       }
    }
 
    /* now deal with the row */
-   for( i = 0 ; i < n ; i ++)
+   for (i = 0; i < n; i++)
    {
-      if(marker[i] == 0)
+      if (marker[i] == 0)
       {
          start = A_offd_i[i];
-         end = A_offd_i[i+1];
-         if(start == end)
+         end = A_offd_i[i + 1];
+         if (start == end)
          {
-            temp_perm[first++] = i;
+            h_tperm[first++] = i;
          }
          else
          {
-            temp_perm[last--] = i;
+            h_tperm[last--] = i;
          }
       }
    }
-   switch(reordering_type)
-   {
-      case 0:
-         /* no RCM in this case */
-         break;
-      case 1:
-         /* RCM */
-         hypre_ILULocalRCM( hypre_ParCSRMatrixDiag(A), 0, first, &temp_perm, &temp_perm, 1);
-         break;
-      default:
-         /* RCM */
-         hypre_ILULocalRCM( hypre_ParCSRMatrixDiag(A), 0, first, &temp_perm, &temp_perm, 1);
-         break;
-   }
 
-   /* set out values */
-   *nLU = first;
-   if((*perm) != NULL) hypre_TFree(*perm,HYPRE_MEMORY_DEVICE);
-   *perm = temp_perm;
-
-   hypre_TFree(marker, HYPRE_MEMORY_HOST);
-   return hypre_error_flag;
-}
+   if (reordering_type != 0)
+   {
+      /* Apply RCM. Note: h_tperm lives at A_memory_location at output */
+      hypre_ILULocalRCM(A_diag, 0, first, &h_tperm, &h_tperm, 1);
 
-/*
- * Get the (local) ordering of the diag (local) matrix (no permutation). This is the permutation used for the block-jacobi case
- * A: parcsr matrix
- * perm: permutation array
- * nLU: number of interior nodes
- * reordering_type: Type of (additional) reordering for the nodes.
- * Currently only supports RCM reordering. Set to 0 for no reordering.
- */
-HYPRE_Int
-hypre_ILUGetLocalPerm(hypre_ParCSRMatrix *A, HYPRE_Int **perm, HYPRE_Int *nLU, HYPRE_Int reordering_type)
-{
-   /* get basic information of A */
-   HYPRE_Int            n = hypre_ParCSRMatrixNumRows(A);
-   HYPRE_Int            i;
-   HYPRE_Int            *temp_perm = hypre_TAlloc(HYPRE_Int, n, HYPRE_MEMORY_DEVICE);
+      /* Move permutation vector to final memory location */
+      hypre_TMemcpy(tperm, h_tperm, HYPRE_Int, n, memory_location, A_memory_location);
 
-   /* set perm array */
-   for( i = 0 ; i < n ; i ++ )
-   {
-      temp_perm[i] = i;
+      /* Free memory */
+      hypre_TFree(h_tperm, A_memory_location);
    }
-   switch(reordering_type)
+   else
    {
-      case 0:
-         /* no RCM in this case */
-         break;
-      case 1:
-         /* RCM */
-         hypre_ILULocalRCM( hypre_ParCSRMatrixDiag(A), 0, n, &temp_perm, &temp_perm, 1);
-         break;
-      default:
-         /* RCM */
-         hypre_ILULocalRCM( hypre_ParCSRMatrixDiag(A), 0, n, &temp_perm, &temp_perm, 1);
-         break;
-   }
-   *nLU = n;
-   if((*perm) != NULL) hypre_TFree(*perm,HYPRE_MEMORY_DEVICE);
-   *perm = temp_perm;
-
-   return hypre_error_flag;
-}
-
-#if 0
-/* Build the expanded matrix for RAS-1
- * A: input ParCSR matrix
- * E_i, E_j, E_data: information for external matrix
- * rperm: reverse permutation to build real index, rperm[old] = new
- *
- * NOTE: Modified to avoid communicating BigInt arrays - DOK
- */
-HYPRE_Int
-hypre_ILUBuildRASExternalMatrix(hypre_ParCSRMatrix *A, HYPRE_Int *rperm, HYPRE_Int **E_i, HYPRE_Int **E_j, HYPRE_Real **E_data)
-{
-   HYPRE_Int                i, i1, i2, j, jj, k, row, k1, k2, k3, lend, leno, col, l1, l2;
-   HYPRE_BigInt    big_col;
-
-   /* data objects for communication */
-   MPI_Comm                 comm = hypre_ParCSRMatrixComm(A);
-   hypre_ParCSRCommPkg      *comm_pkg;
-   hypre_ParCSRCommPkg      *comm_pkg_tmp;
-   hypre_ParCSRCommHandle   *comm_handle_count;
-   hypre_ParCSRCommHandle   *comm_handle_marker;
-   hypre_ParCSRCommHandle   *comm_handle_j;
-   hypre_ParCSRCommHandle   *comm_handle_data;
-   HYPRE_BigInt                *col_starts;
-   HYPRE_Int                total_rows;
-   HYPRE_Int                num_sends;
-   HYPRE_Int                num_recvs;
-   HYPRE_Int                begin, end;
-   HYPRE_Int                my_id,num_procs,proc_id;
-
-   /* data objects for buffers in communication */
-   HYPRE_Int                *send_map;
-   HYPRE_Int                *send_count = NULL,*send_disp = NULL;
-   HYPRE_Int                *send_count_offd = NULL;
-   HYPRE_Int                *recv_count = NULL,*recv_disp = NULL,*recv_marker = NULL;
-   HYPRE_Int                *send_buf_int = NULL;
-   HYPRE_Int                *recv_buf_int = NULL;
-   HYPRE_Real               *send_buf_real = NULL, *recv_buf_real = NULL;
-   HYPRE_Int                *send_disp_comm = NULL, *recv_disp_comm = NULL;
-
-   /* data objects for A */
-   hypre_CSRMatrix          *A_diag = hypre_ParCSRMatrixDiag(A);
-   hypre_CSRMatrix          *A_offd = hypre_ParCSRMatrixOffd(A);
-   HYPRE_BigInt             *A_col_starts = hypre_ParCSRMatrixColStarts(A);
-   HYPRE_BigInt             *A_offd_colmap = hypre_ParCSRMatrixColMapOffd(A);
-   HYPRE_Real               *A_diag_data = hypre_CSRMatrixData(A_diag);
-   HYPRE_Int                *A_diag_i = hypre_CSRMatrixI(A_diag);
-   HYPRE_Int                *A_diag_j = hypre_CSRMatrixJ(A_diag);
-   HYPRE_Int                *A_offd_i = hypre_CSRMatrixI(A_offd);
-   HYPRE_Int                *A_offd_j = hypre_CSRMatrixJ(A_offd);
-   HYPRE_Real               *A_offd_data = hypre_CSRMatrixData(A_offd);
-
-   /* size */
-   HYPRE_Int                n = hypre_CSRMatrixNumCols(A_diag);
-   HYPRE_Int                m = hypre_CSRMatrixNumCols(A_offd);
-
-   /* 1: setup part
-    * allocate memory and setup working array
-    */
+      /* Move permutation vector to final memory location */
+      hypre_TMemcpy(tperm, h_tperm, HYPRE_Int, n, memory_location, HYPRE_MEMORY_HOST);
 
-   /* MPI stuff */
-   hypre_MPI_Comm_size(comm, &num_procs);
-   hypre_MPI_Comm_rank(comm, &my_id);
-
-   /* now check communication package */
-   comm_pkg = hypre_ParCSRMatrixCommPkg(A);
-   /* create if not yet built */
-   if(!comm_pkg)
-   {
-      hypre_MatvecCommPkgCreate(A);
-      comm_pkg = hypre_ParCSRMatrixCommPkg(A);
+      /* Free memory */
+      hypre_TFree(h_tperm, HYPRE_MEMORY_HOST);
    }
 
-   /* get communication information */
-   send_map          = hypre_ParCSRCommPkgSendMapElmts(comm_pkg);
-   num_sends         = hypre_ParCSRCommPkgNumSends(comm_pkg);
-   send_disp_comm    = hypre_TAlloc(HYPRE_Int, num_sends + 1, HYPRE_MEMORY_HOST);
-   begin             = hypre_ParCSRCommPkgSendMapStart(comm_pkg,0);
-   end               = hypre_ParCSRCommPkgSendMapStart(comm_pkg,num_sends);
-   total_rows        = end - begin;
-   num_recvs         = hypre_ParCSRCommPkgNumRecvs(comm_pkg);
-   recv_disp_comm    = hypre_TAlloc(HYPRE_Int, num_recvs + 1, HYPRE_MEMORY_HOST);
-
-   /* create buffers */
-   send_count        = hypre_TAlloc(HYPRE_Int, total_rows, HYPRE_MEMORY_HOST);
-   send_disp         = hypre_TAlloc(HYPRE_Int, total_rows + 1, HYPRE_MEMORY_HOST);
-   send_count_offd   = hypre_CTAlloc(HYPRE_Int, total_rows, HYPRE_MEMORY_HOST);
-   recv_count        = hypre_TAlloc(HYPRE_Int, m, HYPRE_MEMORY_HOST);
-   recv_marker       = hypre_TAlloc(HYPRE_Int, m, HYPRE_MEMORY_HOST);
-   recv_disp         = hypre_TAlloc(HYPRE_Int, m + 1, HYPRE_MEMORY_HOST);
-
-   /* 2: communication part 1 to get amount of send and recv */
-
-   /* first we need to know the global start */
-   col_starts        = hypre_TAlloc(HYPRE_BigInt, num_procs + 1, HYPRE_MEMORY_HOST);
-   hypre_MPI_Allgather(A_col_starts+1,1,HYPRE_MPI_BIG_INT,col_starts+1,1,HYPRE_MPI_BIG_INT,comm);
-   col_starts[0]     = 0;
-
-   send_disp[0]      = 0;
-   send_disp_comm[0] = 0;
-   /* now loop to know how many to send per row */
-   for( i = 0 ; i < num_sends ; i ++ )
+   /* Free memory */
+   hypre_TFree(marker, HYPRE_MEMORY_HOST);
+   if (A_offd_i != hypre_CSRMatrixI(A_offd))
    {
-      /* update disp for comm package */
-      send_disp_comm[i+1] = send_disp_comm[i];
-      /* get the proc we are sending to */
-      proc_id = hypre_ParCSRCommPkgSendProc(comm_pkg,i);
-      /* set start end of this proc */
-      l1 = hypre_ParCSRCommPkgSendMapStart(comm_pkg,i);
-      l2 = hypre_ParCSRCommPkgSendMapStart(comm_pkg,i + 1);
-      /* loop through rows we need to send */
-      for( j = l1 ; j < l2 ; j ++ )
-      {
-         /* reset length */
-         leno = lend = 0;
-         /* we need to send out this row */
-         row = hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j);
-
-         /* check how many we need to send from diagonal first */
-         k1 = A_diag_i[row], k2 = A_diag_i[row+1];
-         for( k = k1 ; k < k2 ; k ++ )
-         {
-            col = A_diag_j[k];
-            if(hypre_BinarySearch(send_map+l1,col,l2-l1) >=0 )
-            {
-               lend++;
-            }
-         }
-
-         /* check how many we need to send from offdiagonal */
-         k1 = A_offd_i[row], k2 = A_offd_i[row+1];
-         for( k = k1 ; k < k2 ; k ++ )
-         {
-            /* get real column number of this offdiagonal column */
-            big_col = A_offd_colmap[A_offd_j[k]];
-            if(big_col >= col_starts[proc_id] && big_col < col_starts[proc_id+1])
-            {
-               /* this column is in diagonal range of proc_id
-                * everything in diagonal range need to be in the factorization
-                */
-               leno++;
-            }
-         }
-         send_count_offd[j]   = leno;
-         send_count[j]        = leno + lend;
-         send_disp[j+1]       = send_disp[j] + send_count[j];
-         send_disp_comm[i+1] += send_count[j];
-      }
+      hypre_TFree(A_offd_i, HYPRE_MEMORY_HOST);
    }
 
-   /* 3: new communication to know how many we need to receive for each external row
-    * main communication, 11 is integer
-    */
-   comm_handle_count    = hypre_ParCSRCommHandleCreate(11, comm_pkg, send_count, recv_count);
-   comm_handle_marker   = hypre_ParCSRCommHandleCreate(11, comm_pkg, send_count_offd, recv_marker);
-   hypre_ParCSRCommHandleDestroy(comm_handle_count);
-   hypre_ParCSRCommHandleDestroy(comm_handle_marker);
-
-   recv_disp[0] = 0;
-   recv_disp_comm[0] = 0;
-   /* now build the recv disp array */
-   for(i = 0 ; i < num_recvs ; i ++)
+   /* Set output values */
+   if ((*perm) != NULL)
    {
-      recv_disp_comm[i+1] = recv_disp_comm[i];
-      k1 = hypre_ParCSRCommPkgRecvVecStart( comm_pkg, i );
-      k2 = hypre_ParCSRCommPkgRecvVecStart( comm_pkg, i + 1 );
-      for(j = k1 ; j < k2 ; j ++)
-      {
-         recv_disp[j+1] = recv_disp[j] + recv_count[j];
-         recv_disp_comm[i+1] += recv_count[j];
-      }
+      hypre_TFree(*perm, memory_location);
    }
+   *perm = tperm;
+   *nLU = first;
 
-   /* 4: ready to start real communication
-    * now we know how many we need to send out, create send/recv buffers
-    */
-   send_buf_int   = hypre_TAlloc(HYPRE_Int, send_disp[total_rows], HYPRE_MEMORY_HOST);
-   send_buf_real  = hypre_TAlloc(HYPRE_Real, send_disp[total_rows], HYPRE_MEMORY_HOST);
-   recv_buf_int   = hypre_TAlloc(HYPRE_Int, recv_disp[m], HYPRE_MEMORY_HOST);
-   recv_buf_real  = hypre_TAlloc(HYPRE_Real, recv_disp[m], HYPRE_MEMORY_HOST);
+   return hypre_error_flag;
+}
 
-   /* fill send buffer */
-   for( i = 0 ; i < num_sends ; i ++ )
-   {
-      /* get the proc we are sending to */
-      proc_id = hypre_ParCSRCommPkgSendProc(comm_pkg,i);
-      /* set start end of this proc */
-      l1 = hypre_ParCSRCommPkgSendMapStart(comm_pkg,i);
-      l2 = hypre_ParCSRCommPkgSendMapStart(comm_pkg,i + 1);
-      /* loop through rows we need to apply communication */
-      for( j = l1 ; j < l2 ; j ++ )
-      {
-         /* reset length
-          * one remark here, the diagonal we send becomes
-          *    off diagonal part for reciver
-          */
-         leno = send_disp[j];
-         lend = leno + send_count_offd[j];
-         /* we need to send out this row */
-         row = hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j);
-
-         /* fill diagonal first */
-         k1 = A_diag_i[row], k2 = A_diag_i[row+1];
-         for( k = k1 ; k < k2 ; k ++ )
-         {
-            col = A_diag_j[k];
-            if(hypre_BinarySearch(send_map+l1,col,l2-l1) >=0)
-            {
-               send_buf_real[lend] = A_diag_data[k];
-               /* the diag part becomes offd for recv part, so update index
-                * set up to global index
-                * set it to be negative
-                */
-               send_buf_int[lend++] = col;// + col_starts[my_id];
-            }
-         }
+/*--------------------------------------------------------------------------
+ * hypre_ILUGetLocalPerm
+ *
+ * Get the (local) ordering of the diag (local) matrix (no permutation).
+ * This is the permutation used for the block-jacobi case.
+ *
+ * Parameters:
+ *   A: parcsr matrix
+ *   perm: permutation array
+ *   nLU: number of interior nodes
+ *   reordering_type: Type of (additional) reordering for the nodes.
+ *
+ * Currently only supports RCM reordering. Set to 0 for no reordering.
+ *--------------------------------------------------------------------------*/
 
-         /* fill offdiagonal */
-         k1 = A_offd_i[row], k2 = A_offd_i[row+1];
-         for( k = k1 ; k < k2 ; k ++ )
-         {
-            /* get real column number of this offdiagonal column */
-            big_col = A_offd_colmap[A_offd_j[k]];
-            if(big_col >= col_starts[proc_id] && big_col < col_starts[proc_id+1])
-            {
-               /* this column is in diagonal range of proc_id
-                * everything in diagonal range need to be in the factorization
-                */
-               send_buf_real[leno] = A_offd_data[k];
-               /* the offd part becomes diagonal for recv part, so update index */
-               send_buf_int[leno++] = (HYPRE_Int)(big_col - col_starts[proc_id]);
-            }
-         }
-      }
-   }
+HYPRE_Int
+hypre_ILUGetLocalPerm(hypre_ParCSRMatrix  *A,
+                      HYPRE_Int          **perm_ptr,
+                      HYPRE_Int           *nLU,
+                      HYPRE_Int            reordering_type)
+{
+   /* get basic information of A */
+   HYPRE_Int             num_rows = hypre_ParCSRMatrixNumRows(A);
+   hypre_CSRMatrix      *A_diag = hypre_ParCSRMatrixDiag(A);
 
-   /* now build new comm_pkg for this communication */
-   comm_pkg_tmp = hypre_CTAlloc(hypre_ParCSRCommPkg, 1, HYPRE_MEMORY_HOST);
-   hypre_ParCSRCommPkgComm         (comm_pkg_tmp) = comm;
-   hypre_ParCSRCommPkgNumSends     (comm_pkg_tmp) = num_sends;
-   hypre_ParCSRCommPkgSendProcs    (comm_pkg_tmp) = hypre_ParCSRCommPkgSendProcs(comm_pkg);
-   hypre_ParCSRCommPkgSendMapStarts(comm_pkg_tmp) = send_disp_comm;
-   hypre_ParCSRCommPkgNumRecvs     (comm_pkg_tmp) = num_recvs;
-   hypre_ParCSRCommPkgRecvProcs    (comm_pkg_tmp) = hypre_ParCSRCommPkgRecvProcs(comm_pkg);
-   hypre_ParCSRCommPkgRecvVecStarts(comm_pkg_tmp) = recv_disp_comm;
-
-   /* communication */
-   comm_handle_j = hypre_ParCSRCommHandleCreate(11, comm_pkg_tmp, send_buf_int, recv_buf_int);
-   comm_handle_data = hypre_ParCSRCommHandleCreate(1, comm_pkg_tmp, send_buf_real, recv_buf_real);
-   hypre_ParCSRCommHandleDestroy(comm_handle_j);
-   hypre_ParCSRCommHandleDestroy(comm_handle_data);
-
-   /* Update the index to be real index */
-   /* Dealing with diagonal part */
-   for(i = 0 ; i < m ; i++ )
-   {
-      k1 = recv_disp[i];
-      k2 = recv_disp[i] + recv_marker[i];
-      k3 = recv_disp[i+1];
-      for(j = k1 ; j < k2 ; j ++ )
-      {
-         recv_buf_int[j] = rperm[recv_buf_int[j]];
-      }
-   }
+   /* Local variables */
+   HYPRE_Int            *perm = NULL;
 
-   /* Dealing with off-diagonal part */
-   for(i = 0 ; i < num_recvs ; i ++)
+   /* Compute local RCM ordering on the host */
+   if (reordering_type != 0)
    {
-      proc_id = hypre_ParCSRCommPkgRecvProc( comm_pkg_tmp, i);
-      i1 = hypre_ParCSRCommPkgRecvVecStart( comm_pkg_tmp, i );
-      i2 = hypre_ParCSRCommPkgRecvVecStart( comm_pkg_tmp, i + 1 );
-      for(j = i1 ; j < i2 ; j++)
-      {
-         k1 = recv_disp[j] + recv_marker[j];
-         k2 = recv_disp[j+1];
-
-         for(jj = k1 ; jj < k2 ; jj++)
-         {
-            /* Correct index to get actual global index */
-            big_col = recv_buf_int[jj] + col_starts[proc_id];
-            recv_buf_int[jj] = hypre_BigBinarySearch( A_offd_colmap, big_col, m) + n;
-         }
-      }
+      hypre_ILULocalRCM(A_diag, 0, num_rows, &perm, &perm, 1);
    }
 
-   /* Assign data */
-   *E_i     = recv_disp;
-   *E_j     = recv_buf_int;
-   *E_data  = recv_buf_real;
-
-   /* 5: finish and free
-    */
-
-   hypre_TFree(send_disp_comm, HYPRE_MEMORY_HOST);
-   hypre_TFree(recv_disp_comm, HYPRE_MEMORY_HOST);
-   hypre_TFree(comm_pkg_tmp, HYPRE_MEMORY_HOST);
-   hypre_TFree(col_starts, HYPRE_MEMORY_HOST);
-   hypre_TFree(send_count, HYPRE_MEMORY_HOST);
-   hypre_TFree(send_disp, HYPRE_MEMORY_HOST);
-   hypre_TFree(send_count_offd, HYPRE_MEMORY_HOST);
-   hypre_TFree(recv_count, HYPRE_MEMORY_HOST);
-   hypre_TFree(send_buf_int, HYPRE_MEMORY_HOST);
-   hypre_TFree(send_buf_real, HYPRE_MEMORY_HOST);
-   hypre_TFree(recv_marker, HYPRE_MEMORY_HOST);
+   /* Set output pointers */
+   *nLU = num_rows;
+   *perm_ptr = perm;
 
    return hypre_error_flag;
 }
-#else
-/* Build the expanded matrix for RAS-1
+
+/*--------------------------------------------------------------------------
+ * hypre_ILUBuildRASExternalMatrix
+ *
+ * Build the expanded matrix for RAS-1
  * A: input ParCSR matrix
  * E_i, E_j, E_data: information for external matrix
  * rperm: reverse permutation to build real index, rperm[old] = new
- */
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_ILUBuildRASExternalMatrix(hypre_ParCSRMatrix *A, HYPRE_Int *rperm, HYPRE_Int **E_i, HYPRE_Int **E_j, HYPRE_Real **E_data)
+hypre_ILUBuildRASExternalMatrix(hypre_ParCSRMatrix  *A,
+                                HYPRE_Int           *rperm,
+                                HYPRE_Int          **E_i,
+                                HYPRE_Int          **E_j,
+                                HYPRE_Real         **E_data)
 {
-   HYPRE_Int                i, j, idx;
-   HYPRE_BigInt   big_col;
-
    /* data objects for communication */
    MPI_Comm                 comm = hypre_ParCSRMatrixComm(A);
    HYPRE_Int                my_id;
@@ -2010,8 +2166,8 @@ hypre_ILUBuildRASExternalMatrix(hypre_ParCSRMatrix *A, HYPRE_Int *rperm, HYPRE_I
    /* data objects for A */
    hypre_CSRMatrix          *A_diag = hypre_ParCSRMatrixDiag(A);
    hypre_CSRMatrix          *A_offd = hypre_ParCSRMatrixOffd(A);
-   HYPRE_BigInt   *A_col_starts = hypre_ParCSRMatrixColStarts(A);
-   HYPRE_BigInt   *A_offd_colmap = hypre_ParCSRMatrixColMapOffd(A);
+   HYPRE_BigInt             *A_col_starts = hypre_ParCSRMatrixColStarts(A);
+   HYPRE_BigInt             *A_offd_colmap = hypre_ParCSRMatrixColMapOffd(A);
    HYPRE_Int                *A_diag_i = hypre_CSRMatrixI(A_diag);
    HYPRE_Int                *A_offd_i = hypre_CSRMatrixI(A_offd);
 
@@ -2021,24 +2177,27 @@ hypre_ILUBuildRASExternalMatrix(hypre_ParCSRMatrix *A, HYPRE_Int *rperm, HYPRE_I
    // # up to local offd cols, no need to be HYPRE_BigInt
    HYPRE_Int                *A_ext_i = NULL;
    // Return global index, HYPRE_BigInt required
-   HYPRE_BigInt   *A_ext_j = NULL;
+   HYPRE_BigInt             *A_ext_j = NULL;
    HYPRE_Real               *A_ext_data = NULL;
 
    /* data objects for output */
-   HYPRE_Int                E_nnz;
+   HYPRE_Int                 E_nnz;
    HYPRE_Int                *E_ext_i = NULL;
    // Local index, no need to use HYPRE_BigInt
    HYPRE_Int                *E_ext_j = NULL;
    HYPRE_Real               *E_ext_data = NULL;
 
    //guess non-zeros for E before start
-   HYPRE_Int                E_init_alloc;
+   HYPRE_Int                 E_init_alloc;
 
    /* size */
-   HYPRE_Int                n = hypre_CSRMatrixNumCols(A_diag);
-   HYPRE_Int                m = hypre_CSRMatrixNumCols(A_offd);
-   HYPRE_Int                A_diag_nnz = A_diag_i[n];
-   HYPRE_Int                A_offd_nnz = A_offd_i[n];
+   HYPRE_Int                 n = hypre_CSRMatrixNumCols(A_diag);
+   HYPRE_Int                 m = hypre_CSRMatrixNumCols(A_offd);
+   HYPRE_Int                 A_diag_nnz = A_diag_i[n];
+   HYPRE_Int                 A_offd_nnz = A_offd_i[n];
+
+   HYPRE_Int                 i, j, idx;
+   HYPRE_BigInt              big_col;
 
    /* 1: Set up phase and get external rows
     * Use the HYPRE build-in function
@@ -2064,12 +2223,13 @@ hypre_ILUBuildRASExternalMatrix(hypre_ParCSRMatrix *A, HYPRE_Int *rperm, HYPRE_I
    A_ext_data           = hypre_CSRMatrixData(A_ext);
 
    /* guess memory we need to allocate to E_j */
-   E_init_alloc =  hypre_max( (HYPRE_Int) ( A_diag_nnz / (HYPRE_Real) n / (HYPRE_Real) n * (HYPRE_Real) m * (HYPRE_Real) m + A_offd_nnz), 1);
+   E_init_alloc =  hypre_max( (HYPRE_Int) ( A_diag_nnz / (HYPRE_Real) n / (HYPRE_Real) n *
+                                            (HYPRE_Real) m * (HYPRE_Real) m + A_offd_nnz), 1);
 
    /* Initial guess */
-   E_ext_i     = hypre_TAlloc(HYPRE_Int, m + 1 , HYPRE_MEMORY_HOST);
-   E_ext_j     = hypre_TAlloc(HYPRE_Int, E_init_alloc , HYPRE_MEMORY_HOST);
-   E_ext_data  = hypre_TAlloc(HYPRE_Real, E_init_alloc , HYPRE_MEMORY_HOST);
+   E_ext_i     = hypre_TAlloc(HYPRE_Int, m + 1, HYPRE_MEMORY_HOST);
+   E_ext_j     = hypre_TAlloc(HYPRE_Int, E_init_alloc, HYPRE_MEMORY_HOST);
+   E_ext_data  = hypre_TAlloc(HYPRE_Real, E_init_alloc, HYPRE_MEMORY_HOST);
 
    /* 2: Discard unecessary cols
     * Search A_ext_j, discard those cols not belong to current proc
@@ -2079,14 +2239,14 @@ hypre_ILUBuildRASExternalMatrix(hypre_ParCSRMatrix *A, HYPRE_Int *rperm, HYPRE_I
    E_nnz       = 0;
    E_ext_i[0]  = 0;
 
-   for( i = 0 ;  i < m ; i ++)
+   for ( i = 0 ;  i < m ; i ++)
    {
       E_ext_i[i] = E_nnz;
-      for( j = A_ext_i[i] ; j < A_ext_i[i+1] ; j ++)
+      for ( j = A_ext_i[i] ; j < A_ext_i[i + 1] ; j ++)
       {
          big_col = A_ext_j[j];
          /* First check if that belongs to the diagonal part */
-         if( big_col >= A_col_starts[0] && big_col < A_col_starts[1] )
+         if ( big_col >= A_col_starts[0] && big_col < A_col_starts[1] )
          {
             /* this is a diagonal entry, rperm (map old to new) and shift it */
 
@@ -2101,7 +2261,7 @@ hypre_ILUBuildRASExternalMatrix(hypre_ParCSRMatrix *A, HYPRE_Int *rperm, HYPRE_I
          {
             /* Search, result is not HYPRE_BigInt */
             E_ext_j[E_nnz] = hypre_BigBinarySearch( A_offd_colmap, big_col, m);
-            if( E_ext_j[E_nnz] >= 0)
+            if ( E_ext_j[E_nnz] >= 0)
             {
                /* this is an offdiagonal entry */
                E_ext_j[E_nnz]      = E_ext_j[E_nnz] + n;
@@ -2114,13 +2274,15 @@ hypre_ILUBuildRASExternalMatrix(hypre_ParCSRMatrix *A, HYPRE_Int *rperm, HYPRE_I
             }
          }
          /* capacity check, allocate new memory when full */
-         if(E_nnz >= E_init_alloc)
+         if (E_nnz >= E_init_alloc)
          {
             HYPRE_Int tmp;
             tmp = E_init_alloc;
-            E_init_alloc   = E_init_alloc * EXPAND_FACT + 1;
-            E_ext_j        = hypre_TReAlloc_v2(E_ext_j, HYPRE_Int, tmp, HYPRE_Int, E_init_alloc, HYPRE_MEMORY_HOST);
-            E_ext_data     = hypre_TReAlloc_v2(E_ext_data, HYPRE_Real, tmp, HYPRE_Real, E_init_alloc, HYPRE_MEMORY_HOST);
+            E_init_alloc   = (HYPRE_Int)(E_init_alloc * EXPAND_FACT + 1);
+            E_ext_j        = hypre_TReAlloc_v2(E_ext_j, HYPRE_Int, tmp, HYPRE_Int,
+                                               E_init_alloc, HYPRE_MEMORY_HOST);
+            E_ext_data     = hypre_TReAlloc_v2(E_ext_data, HYPRE_Real, tmp, HYPRE_Real,
+                                               E_init_alloc, HYPRE_MEMORY_HOST);
          }
       }
    }
@@ -2137,53 +2299,127 @@ hypre_ILUBuildRASExternalMatrix(hypre_ParCSRMatrix *A, HYPRE_Int *rperm, HYPRE_I
    hypre_CSRMatrixDestroy(A_ext);
 
    return hypre_error_flag;
-
 }
-#endif
 
-/* This function sort offdiagonal map as well as J array for offdiagonal part
- * A: The input CSR matrix
- */
+/*--------------------------------------------------------------------------
+ * hypre_ILUSortOffdColmap
+ *
+ * This function sort offdiagonal map as well as J array for offdiagonal part
+ * A: The input CSR matrix.
+ *
+ * TODO (VPM): This work should be done via hypre_ParCSRMatrixPermute. This
+ * function needs to be implemented.
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_ILUSortOffdColmap(hypre_ParCSRMatrix *A)
 {
-   HYPRE_Int i;
-   hypre_CSRMatrix *A_offd    = hypre_ParCSRMatrixOffd(A);
-   HYPRE_Int *A_offd_j        = hypre_CSRMatrixJ(A_offd);
-   HYPRE_BigInt *A_offd_colmap   = hypre_ParCSRMatrixColMapOffd(A);
-   HYPRE_Int len              = hypre_CSRMatrixNumCols(A_offd);
-   HYPRE_Int nnz              = hypre_CSRMatrixNumNonzeros(A_offd);
-   HYPRE_Int *perm            = hypre_TAlloc(HYPRE_Int,len,HYPRE_MEMORY_HOST);
-   HYPRE_Int *rperm           = hypre_TAlloc(HYPRE_Int,len,HYPRE_MEMORY_HOST);
-
-   for(i = 0 ; i < len ; i ++)
+   hypre_CSRMatrix      *A_offd          = hypre_ParCSRMatrixOffd(A);
+   HYPRE_Int            *A_offd_j        = hypre_CSRMatrixJ(A_offd);
+   HYPRE_Int             A_offd_nnz      = hypre_CSRMatrixNumNonzeros(A_offd);
+   HYPRE_Int             A_offd_num_cols = hypre_CSRMatrixNumCols(A_offd);
+   HYPRE_MemoryLocation  memory_location = hypre_CSRMatrixMemoryLocation(A_offd);
+   HYPRE_BigInt         *col_map_offd    = hypre_ParCSRMatrixColMapOffd(A);
+
+   HYPRE_Int            *h_A_offd_j;
+
+   HYPRE_Int            *perm  = hypre_TAlloc(HYPRE_Int, A_offd_num_cols, HYPRE_MEMORY_HOST);
+   HYPRE_Int            *rperm = hypre_TAlloc(HYPRE_Int, A_offd_num_cols, HYPRE_MEMORY_HOST);
+   HYPRE_Int             i;
+
+   /* Set/Move A_offd_j on the host */
+   if (hypre_GetActualMemLocation(memory_location) == hypre_MEMORY_DEVICE)
+   {
+      h_A_offd_j = hypre_TAlloc(HYPRE_Int, A_offd_nnz, HYPRE_MEMORY_HOST);
+      hypre_TMemcpy(h_A_offd_j, A_offd_j, HYPRE_Int, A_offd_nnz,
+                    HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
+   }
+   else
+   {
+      h_A_offd_j = A_offd_j;
+   }
+
+   for (i = 0; i < A_offd_num_cols; i++)
    {
       perm[i] = i;
    }
 
-   hypre_BigQsort2i(A_offd_colmap,perm,0,len-1);
+   hypre_BigQsort2i(col_map_offd, perm, 0, A_offd_num_cols - 1);
 
-   for(i = 0 ; i < len ; i ++)
+   for (i = 0; i < A_offd_num_cols; i++)
    {
       rperm[perm[i]] = i;
    }
 
-   for(i = 0 ; i < nnz ; i ++)
+   for (i = 0; i < A_offd_nnz; i++)
+   {
+      h_A_offd_j[i] = rperm[h_A_offd_j[i]];
+   }
+
+   if (h_A_offd_j != A_offd_j)
+   {
+      hypre_TMemcpy(A_offd_j, h_A_offd_j, HYPRE_Int, A_offd_nnz,
+                    HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
+      hypre_TFree(h_A_offd_j, HYPRE_MEMORY_HOST);
+   }
+
+   /* Free memory */
+   hypre_TFree(perm, HYPRE_MEMORY_HOST);
+   hypre_TFree(rperm, HYPRE_MEMORY_HOST);
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_ILULocalRCMBuildFinalPerm
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ILULocalRCMBuildFinalPerm(HYPRE_Int   start,
+                                HYPRE_Int   end,
+                                HYPRE_Int  *G_perm,
+                                HYPRE_Int  *perm,
+                                HYPRE_Int  *qperm,
+                                HYPRE_Int **permp,
+                                HYPRE_Int **qpermp)
+{
+   /* update to new index */
+   HYPRE_Int i = 0;
+   HYPRE_Int num_nodes = end - start;
+   HYPRE_Int *perm_temp = hypre_TAlloc(HYPRE_Int, num_nodes, HYPRE_MEMORY_HOST);
+
+   for ( i = 0 ; i < num_nodes ; i ++)
+   {
+      perm_temp[i] = perm[i + start];
+   }
+   for ( i = 0 ; i < num_nodes ; i ++)
+   {
+      perm[i + start] = perm_temp[G_perm[i]];
+   }
+   if (perm != qperm)
    {
-      A_offd_j[i] = rperm[A_offd_j[i]];
+      for ( i = 0 ; i < num_nodes ; i ++)
+      {
+         perm_temp[i] = qperm[i + start];
+      }
+      for ( i = 0 ; i < num_nodes ; i ++)
+      {
+         qperm[i + start] = perm_temp[G_perm[i]];
+      }
    }
 
-   hypre_TFree(perm,HYPRE_MEMORY_HOST);
-   hypre_TFree(rperm,HYPRE_MEMORY_HOST);
+   *permp   = perm;
+   *qpermp  = qperm;
+
+   hypre_TFree(perm_temp, HYPRE_MEMORY_HOST);
 
    return hypre_error_flag;
 }
 
 /*--------------------------------------------------------------------------
  * hypre_ILULocalRCM
- *--------------------------------------------------------------------------*/
-
-/* This function computes the RCM ordering of a sub matrix of
+ *
+ * This function computes the RCM ordering of a sub matrix of
  * sparse matrix B = A(perm,perm)
  * For nonsymmetrix problem, is the RCM ordering of B + B'
  * A: The input CSR matrix
@@ -2192,257 +2428,295 @@ hypre_ILUSortOffdColmap(hypre_ParCSRMatrix *A)
  * permp:      pointer to the row permutation array such that B = A(perm, perm)
  *             point to NULL if you want to work directly on A
  *             on return, permp will point to the new permutation where
- *             in [start, end) the matrix will reordered
+ *             in [start, end) the matrix will reordered. if *permp is not NULL,
+ *             we assume that it lives on the host memory at input. At output,
+ *             it lives in the same memory location as A.
  * qpermp:     pointer to the col permutation array such that B = A(perm, perm)
  *             point to NULL or equal to permp if you want symmetric order
  *             on return, qpermp will point to the new permutation where
- *             in [start, end) the matrix will reordered
+ *             in [start, end) the matrix will reordered. if *qpermp is not NULL,
+ *             we assume that it lives on the host memory at input. At output,
+ *             it lives in the same memory location as A.
  * sym:        set to nonzero to work on A only(symmetric), otherwise A + A'.
  *             WARNING: if you use non-symmetric reordering, that is,
  *             different row and col reordering, the resulting A might be non-symmetric.
  *             Be careful if you are using non-symmetric reordering
- */
+ *
+ * TODO (VPM): Implement RCM computation on the device.
+ *             Use IntArray for perm.
+ *             Move this function and internal RCM calls to parcsr_mv.
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_ILULocalRCM( hypre_CSRMatrix *A, HYPRE_Int start, HYPRE_Int end,
-                     HYPRE_Int **permp, HYPRE_Int **qpermp, HYPRE_Int sym)
+hypre_ILULocalRCM(hypre_CSRMatrix *A,
+                  HYPRE_Int        start,
+                  HYPRE_Int        end,
+                  HYPRE_Int      **permp,
+                  HYPRE_Int      **qpermp,
+                  HYPRE_Int        sym)
 {
-   HYPRE_Int               i, j, row, col, r1, r2;
-
-   HYPRE_Int               num_nodes      = end - start;
-   HYPRE_Int               n              = hypre_CSRMatrixNumRows(A);
-   HYPRE_Int               ncol           = hypre_CSRMatrixNumCols(A);
-   HYPRE_Int               *A_i           = hypre_CSRMatrixI(A);
-   HYPRE_Int               *A_j           = hypre_CSRMatrixJ(A);
-   hypre_CSRMatrix         *GT            = NULL;
-   hypre_CSRMatrix         *GGT           = NULL;
-   //    HYPRE_Int               *AAT_i         = NULL;
-   //    HYPRE_Int               *AAT_j         = NULL;
-   HYPRE_Int               A_nnz          = hypre_CSRMatrixNumNonzeros(A);
-   hypre_CSRMatrix         *G             = NULL;
-   HYPRE_Int               *G_i           = NULL;
-   HYPRE_Int               *G_j           = NULL;
-   HYPRE_Real              *G_data           = NULL;
-   HYPRE_Int               *G_perm        = NULL;
-   HYPRE_Int               G_nnz;
-   HYPRE_Int               G_capacity;
-   HYPRE_Int               *perm_temp     = NULL;
-   HYPRE_Int               *perm          = *permp;
-   HYPRE_Int               *qperm         = *qpermp;
-   HYPRE_Int               *rqperm        = NULL;
+   /* Input variables */
+   HYPRE_Int               num_nodes       = end - start;
+   HYPRE_Int               n               = hypre_CSRMatrixNumRows(A);
+   HYPRE_Int               ncol            = hypre_CSRMatrixNumCols(A);
+   HYPRE_MemoryLocation    memory_location = hypre_CSRMatrixMemoryLocation(A);
+   HYPRE_Int               A_nnz           = hypre_CSRMatrixNumNonzeros(A);
+   HYPRE_Int              *A_i;
+   HYPRE_Int              *A_j;
+
+   /* Local variables */
+   hypre_CSRMatrix         *GT        = NULL;
+   hypre_CSRMatrix         *GGT       = NULL;
+   hypre_CSRMatrix         *G         = NULL;
+   HYPRE_Int               *G_i       = NULL;
+   HYPRE_Int               *G_j       = NULL;
+   HYPRE_Int               *G_perm    = NULL;
+   HYPRE_Int               *perm_temp = NULL;
+   HYPRE_Int               *rqperm    = NULL;
+   HYPRE_Int               *d_perm    = NULL;
+   HYPRE_Int               *d_qperm   = NULL;
+   HYPRE_Int               *perm      = *permp;
+   HYPRE_Int               *qperm     = *qpermp;
+
+   HYPRE_Int                perm_is_qperm;
+   HYPRE_Int                i, j, row, col, r1, r2;
+   HYPRE_Int                G_nnz, G_capacity;
+
+   /* Set flag for computing row and column permutations (true) or only row permutation (false) */
+   perm_is_qperm = (perm == qperm) ? 1 : 0;
 
    /* 1: Preprosessing
     * Check error in input, set some parameters
     */
-   if(num_nodes <= 0)
+   if (num_nodes <= 0)
    {
       /* don't do this if we are too small */
       return hypre_error_flag;
    }
-   if(n!=ncol || end > n || start < 0)
+
+   if (n != ncol || end > n || start < 0)
    {
       /* don't do this if the input has error */
       hypre_printf("Error input, abort RCM\n");
       return hypre_error_flag;
    }
-   if(!perm)
+
+   HYPRE_ANNOTATE_FUNC_BEGIN;
+   hypre_GpuProfilingPushRange("ILULocalRCM");
+
+   /* create permutation array if we don't have one yet */
+   if (!perm)
    {
-      /* create permutation array if we don't have one yet */
-      perm = hypre_TAlloc( HYPRE_Int, n, HYPRE_MEMORY_DEVICE);
-      for(i = 0 ; i < n ; i ++)
+      perm = hypre_TAlloc(HYPRE_Int, n, HYPRE_MEMORY_HOST);
+      for (i = 0; i < n; i++)
       {
          perm[i] = i;
       }
    }
-   if(!qperm)
+
+   /* Check for symmetric reordering, then point qperm to row reordering */
+   if (!qperm)
    {
-      /* symmetric reordering, just point it to row reordering */
       qperm = perm;
    }
+
+   /* Compute reverse qperm ordering */
    rqperm = hypre_TAlloc(HYPRE_Int, n, HYPRE_MEMORY_HOST);
-   for(i = 0 ; i < n ; i ++)
+   for (i = 0; i < n; i++)
    {
       rqperm[qperm[i]] = i;
    }
+
+   /* Set/Move A_i and A_j to host */
+   if (hypre_GetActualMemLocation(memory_location) == hypre_MEMORY_DEVICE)
+   {
+      A_i = hypre_TAlloc(HYPRE_Int, n + 1, HYPRE_MEMORY_HOST);
+      A_j = hypre_TAlloc(HYPRE_Int, A_nnz, HYPRE_MEMORY_HOST);
+
+      hypre_TMemcpy(A_i, hypre_CSRMatrixI(A), HYPRE_Int, n + 1,
+                    HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
+      hypre_TMemcpy(A_j, hypre_CSRMatrixJ(A), HYPRE_Int, A_nnz,
+                    HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
+   }
+   else
+   {
+      A_i = hypre_CSRMatrixI(A);
+      A_j = hypre_CSRMatrixJ(A);
+   }
+
    /* 2: Build Graph
     * Build Graph for RCM ordering
     */
-   G = hypre_CSRMatrixCreate(num_nodes, num_nodes, 0);
-   hypre_CSRMatrixInitialize(G);
-   hypre_CSRMatrixSetDataOwner(G, 1);
-   G_i = hypre_CSRMatrixI(G);
-   if(sym)
-   {
-      /* Directly use A */
-      G_nnz = 0;
-      G_capacity = hypre_max(A_nnz * n * n / num_nodes / num_nodes - num_nodes, 1);
-      G_j = hypre_TAlloc(HYPRE_Int, G_capacity, HYPRE_MEMORY_DEVICE);
-      for(i = 0 ; i < num_nodes ; i ++)
+   G_nnz = 0;
+   G_capacity = hypre_max((A_nnz * n * n / num_nodes / num_nodes) - num_nodes, 1);
+   G_i = hypre_TAlloc(HYPRE_Int, num_nodes + 1, HYPRE_MEMORY_HOST);
+   G_j = hypre_TAlloc(HYPRE_Int, G_capacity, HYPRE_MEMORY_HOST);
+
+   /* TODO (VPM): Extend hypre_CSRMatrixPermute to replace the block below */
+   for (i = 0; i < num_nodes; i++)
+   {
+      G_i[i] = G_nnz;
+      row = perm[i + start];
+      r1 = A_i[row];
+      r2 = A_i[row + 1];
+      for (j = r1; j < r2; j ++)
       {
-         G_i[i] = G_nnz;
-         row = perm[i + start];
-         r1 = A_i[row];
-         r2 = A_i[row+1];
-         for(j = r1 ; j < r2 ; j ++)
+         col = rqperm[A_j[j]];
+         if (col != row && col >= start && col < end)
          {
-            col = rqperm[A_j[j]];
-            if(col != row && col >= start && col < end)
+            /* this is an entry in G */
+            G_j[G_nnz++] = col - start;
+            if (G_nnz >= G_capacity)
             {
-               /* this is an entry in G */
-               G_j[G_nnz++] = col - start;
-               if(G_nnz >= G_capacity)
-               {
-                  HYPRE_Int tmp = G_capacity;
-                  G_capacity = G_capacity * EXPAND_FACT + 1;
-                  G_j = hypre_TReAlloc_v2(G_j, HYPRE_Int, tmp, HYPRE_Int, G_capacity, HYPRE_MEMORY_DEVICE);
-               }
+               HYPRE_Int tmp = G_capacity;
+               G_capacity = (HYPRE_Int) (G_capacity * EXPAND_FACT + 1);
+               G_j = hypre_TReAlloc_v2(G_j, HYPRE_Int, tmp, HYPRE_Int,
+                                       G_capacity, HYPRE_MEMORY_HOST);
             }
          }
       }
-      G_i[num_nodes] = G_nnz;
-      if(G_nnz == 0)
-      {
-         //G has only diagonal, no need to do any kind of RCM
-         hypre_TFree(G_j, HYPRE_MEMORY_DEVICE);
-         hypre_TFree(rqperm, HYPRE_MEMORY_HOST);
-         *permp   = perm;
-         *qpermp  = qperm;
-         hypre_CSRMatrixDestroy(G);
-         return hypre_error_flag;
-      }
-      hypre_CSRMatrixJ(G) = G_j;
-      hypre_CSRMatrixNumNonzeros(G) = G_nnz;
    }
-   else
+   G_i[num_nodes] = G_nnz;
+
+   /* Free memory */
+   if (A_i != hypre_CSRMatrixI(A))
    {
-      /* Use A + A' */
-      G_nnz = 0;
-      G_capacity = hypre_max(A_nnz * n * n / num_nodes / num_nodes - num_nodes, 1);
-      G_j = hypre_TAlloc(HYPRE_Int, G_capacity, HYPRE_MEMORY_DEVICE);
-      for(i = 0 ; i < num_nodes ; i ++)
-      {
-         G_i[i] = G_nnz;
-         row = perm[i + start];
-         r1 = A_i[row];
-         r2 = A_i[row+1];
-         for(j = r1 ; j < r2 ; j ++)
-         {
-            col = rqperm[A_j[j]];
-            if(col != row && col >= start && col < end)
-            {
-               /* this is an entry in G */
-               G_j[G_nnz++] = col - start;
-               if(G_nnz >= G_capacity)
-               {
-                  HYPRE_Int tmp = G_capacity;
-                  G_capacity = G_capacity * EXPAND_FACT + 1;
-                  G_j = hypre_TReAlloc_v2(G_j, HYPRE_Int, tmp, HYPRE_Int, G_capacity, HYPRE_MEMORY_DEVICE);
-               }
-            }
-         }
-      }
-      G_i[num_nodes] = G_nnz;
-      if(G_nnz == 0)
+      hypre_TFree(A_i, HYPRE_MEMORY_HOST);
+   }
+   if (A_j != hypre_CSRMatrixJ(A))
+   {
+      hypre_TFree(A_j, HYPRE_MEMORY_HOST);
+   }
+
+   /* Create matrix G on the host */
+   G = hypre_CSRMatrixCreate(num_nodes, num_nodes, G_nnz);
+   hypre_CSRMatrixMemoryLocation(G) = HYPRE_MEMORY_HOST;
+   hypre_CSRMatrixI(G) = G_i;
+   hypre_CSRMatrixJ(G) = G_j;
+
+   /* Check if G is not empty (no need to do any kind of RCM) */
+   if (G_nnz > 0)
+   {
+      /* Sum G with G' if G is nonsymmetric */
+      if (!sym)
       {
-         //G has only diagonal, no need to do any kind of RCM
-         hypre_TFree(G_j, HYPRE_MEMORY_DEVICE);
-         hypre_TFree(rqperm, HYPRE_MEMORY_HOST);
-         *permp   = perm;
-         *qpermp  = qperm;
+         hypre_CSRMatrixData(G) = hypre_CTAlloc(HYPRE_Complex, G_nnz, HYPRE_MEMORY_HOST);
+         hypre_CSRMatrixTranspose(G, &GT, 1);
+         GGT = hypre_CSRMatrixAdd(1.0, G, 1.0, GT);
          hypre_CSRMatrixDestroy(G);
-         return hypre_error_flag;
+         hypre_CSRMatrixDestroy(GT);
+         G = GGT;
+         GGT = NULL;
       }
-      hypre_CSRMatrixJ(G) = G_j;
-      G_data = hypre_CTAlloc(HYPRE_Real, G_nnz, HYPRE_MEMORY_DEVICE);
-      hypre_CSRMatrixData(G) = G_data;
-      hypre_CSRMatrixNumNonzeros(G) = G_nnz;
-
-      /* now sum G with G' */
-      hypre_CSRMatrixTranspose(G, &GT, 1);
-      GGT = hypre_CSRMatrixAdd(1.0, G, 1.0, GT);
-      hypre_CSRMatrixDestroy(G);
-      hypre_CSRMatrixDestroy(GT);
-      G = GGT;
-      GGT = NULL;
-   }
 
-   /* 3: Build Graph
-    * Build RCM
-    */
-   /* no need to be shared, but perm should be shared */
-   G_perm = hypre_TAlloc(HYPRE_Int, num_nodes, HYPRE_MEMORY_HOST);
-   hypre_ILULocalRCMOrder( G, G_perm);
+      /* 3: Build RCM on the host */
+      G_perm = hypre_TAlloc(HYPRE_Int, num_nodes, HYPRE_MEMORY_HOST);
+      hypre_ILULocalRCMOrder(G, G_perm);
 
-   /* 4: Post processing
-    * Free, set value, return
-    */
+      /* 4: Post processing
+       * Free, set value, return
+       */
 
-   /* update to new index */
-   perm_temp = hypre_TAlloc(HYPRE_Int, num_nodes, HYPRE_MEMORY_HOST);
-   for( i = 0 ; i < num_nodes ; i ++)
-   {
-      perm_temp[i] = perm[i + start];
-   }
-   for( i = 0 ; i < num_nodes ; i ++)
-   {
-      perm[i+start] = perm_temp[G_perm[i]];
+      /* update to new index */
+      perm_temp = hypre_TAlloc(HYPRE_Int, num_nodes, HYPRE_MEMORY_HOST);
+      hypre_TMemcpy(perm_temp, &perm[start], HYPRE_Int, num_nodes,
+                    HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
+      for (i = 0; i < num_nodes; i++)
+      {
+         perm[i + start] = perm_temp[G_perm[i]];
+      }
+
+      if (!perm_is_qperm)
+      {
+         hypre_TMemcpy(perm_temp, &qperm[start], HYPRE_Int, num_nodes,
+                       HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
+         for (i = 0; i < num_nodes; i++)
+         {
+            qperm[i + start] = perm_temp[G_perm[i]];
+         }
+      }
    }
-   if(perm != qperm)
+
+   /* Move to device memory if needed */
+   if (memory_location == HYPRE_MEMORY_DEVICE)
    {
-      for( i = 0 ; i < num_nodes ; i ++)
+      d_perm = hypre_TAlloc(HYPRE_Int, n, HYPRE_MEMORY_DEVICE);
+      hypre_TMemcpy(d_perm, perm, HYPRE_Int, n,
+                    HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
+      hypre_TFree(perm, HYPRE_MEMORY_HOST);
+
+      perm = d_perm;
+      if (perm_is_qperm)
       {
-         perm_temp[i] = qperm[i + start];
+         qperm = d_perm;
       }
-      for( i = 0 ; i < num_nodes ; i ++)
+      else
       {
-         qperm[i+start] = perm_temp[G_perm[i]];
+         d_qperm = hypre_TAlloc(HYPRE_Int, n, HYPRE_MEMORY_DEVICE);
+         hypre_TMemcpy(d_qperm, qperm, HYPRE_Int, n,
+                       HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
+         hypre_TFree(qperm, HYPRE_MEMORY_HOST);
+
+         qperm = d_qperm;
       }
    }
-   *permp   = perm;
-   *qpermp  = qperm;
-   hypre_CSRMatrixDestroy(G);
 
+   /* Set output pointers */
+   *permp  = perm;
+   *qpermp = qperm;
+
+   /* Free memory */
+   hypre_CSRMatrixDestroy(G);
    hypre_TFree(G_perm, HYPRE_MEMORY_HOST);
    hypre_TFree(perm_temp, HYPRE_MEMORY_HOST);
    hypre_TFree(rqperm, HYPRE_MEMORY_HOST);
 
+   hypre_GpuProfilingPopRange();
+   HYPRE_ANNOTATE_FUNC_END;
+
    return hypre_error_flag;
 }
 
 /*--------------------------------------------------------------------------
  * hypre_ILULocalRCMMindegree
+ *
+ * This function finds the unvisited node with the minimum degree
  *--------------------------------------------------------------------------*/
 
-/* This function finds the unvisited node with the minimum degree
- */
 HYPRE_Int
-hypre_ILULocalRCMMindegree(HYPRE_Int n, HYPRE_Int *degree, HYPRE_Int *marker, HYPRE_Int *rootp)
+hypre_ILULocalRCMMindegree(HYPRE_Int  n,
+                           HYPRE_Int *degree,
+                           HYPRE_Int *marker,
+                           HYPRE_Int *rootp)
 {
-    HYPRE_Int i;
-    HYPRE_Int min_degree = n+1;
-    HYPRE_Int root = 0;
-    for(i = 0 ; i < n ; i ++)
-    {
-        if(marker[i] < 0)
-        {
-            if(degree[i] < min_degree)
-            {
-                root = i;
-                min_degree = degree[i];
-            }
-        }
-    }
-    *rootp = root;
-    return 0;
+   HYPRE_Int i;
+   HYPRE_Int min_degree = n + 1;
+   HYPRE_Int root = 0;
+
+   for (i = 0 ; i < n ; i ++)
+   {
+      if (marker[i] < 0)
+      {
+         if (degree[i] < min_degree)
+         {
+            root = i;
+            min_degree = degree[i];
+         }
+      }
+   }
+   *rootp = root;
+   return 0;
 }
 
 /*--------------------------------------------------------------------------
  * hypre_ILULocalRCMOrder
- *--------------------------------------------------------------------------*/
-
-/* This function actually does the RCM ordering of a symmetric csr matrix (entire)
+ *
+ * This function actually does the RCM ordering of a symmetric CSR matrix (entire)
  * A: the csr matrix, A_data is not needed
  * perm: the permutation array, space should be allocated outside
- */
+ * This is pure host code.
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_ILULocalRCMOrder( hypre_CSRMatrix *A, HYPRE_Int *perm)
 {
@@ -2455,15 +2729,15 @@ hypre_ILULocalRCMOrder( hypre_CSRMatrix *A, HYPRE_Int *perm)
    /* get the degree for each node */
    degree = hypre_TAlloc(HYPRE_Int, n, HYPRE_MEMORY_HOST);
    marker = hypre_TAlloc(HYPRE_Int, n, HYPRE_MEMORY_HOST);
-   for(i = 0 ; i < n ; i ++)
+   for (i = 0 ; i < n ; i ++)
    {
-      degree[i] = A_i[i+1] - A_i[i];
+      degree[i] = A_i[i + 1] - A_i[i];
       marker[i] = -1;
    }
 
    /* start RCM loop */
    current_num = 0;
-   while(current_num < n)
+   while (current_num < n)
    {
       hypre_ILULocalRCMMindegree( n, degree, marker, &root);
       /* This is a new connect component */
@@ -2473,21 +2747,22 @@ hypre_ILULocalRCMOrder( hypre_CSRMatrix *A, HYPRE_Int *perm)
       hypre_ILULocalRCMNumbering(A, root, marker, perm, &current_num);
    }
 
-   /* free */
+   /* Free */
    hypre_TFree(degree, HYPRE_MEMORY_HOST);
    hypre_TFree(marker, HYPRE_MEMORY_HOST);
+
    return hypre_error_flag;
 }
 
 /*--------------------------------------------------------------------------
  * hypre_ILULocalRCMFindPPNode
+ *
+ * This function find a pseudo-peripheral node start from root
+ *   A: the csr matrix, A_data is not needed
+ *   rootp: pointer to the root, on return will be a end of the pseudo-peripheral
+ *   marker: the marker array for unvisited node
  *--------------------------------------------------------------------------*/
 
-/* This function find a pseudo-peripheral node start from root
- * A: the csr matrix, A_data is not needed
- * rootp: pointer to the root, on return will be a end of the pseudo-peripheral
- * marker: the marker array for unvisited node
- */
 HYPRE_Int
 hypre_ILULocalRCMFindPPNode( hypre_CSRMatrix *A, HYPRE_Int *rootp, HYPRE_Int *marker)
 {
@@ -2495,27 +2770,28 @@ hypre_ILULocalRCMFindPPNode( hypre_CSRMatrix *A, HYPRE_Int *rootp, HYPRE_Int *ma
 
    HYPRE_Int      root           = *rootp;
    HYPRE_Int      n              = hypre_CSRMatrixNumRows(A);
-   HYPRE_Int      *A_i           = hypre_CSRMatrixI(A);
+   HYPRE_Int     *A_i            = hypre_CSRMatrixI(A);
+
    /* at most n levels */
-   HYPRE_Int      *level_i       = hypre_TAlloc(HYPRE_Int, n+1, HYPRE_MEMORY_HOST);
-   HYPRE_Int      *level_j       = hypre_TAlloc(HYPRE_Int, n, HYPRE_MEMORY_HOST);
+   HYPRE_Int     *level_i        = hypre_TAlloc(HYPRE_Int, n + 1, HYPRE_MEMORY_HOST);
+   HYPRE_Int     *level_j        = hypre_TAlloc(HYPRE_Int, n, HYPRE_MEMORY_HOST);
 
    /* build initial level structure from root */
-   hypre_ILULocalRCMBuildLevel( A, root, marker, level_i, level_j, &newnlev);
+   hypre_ILULocalRCMBuildLevel(A, root, marker, level_i, level_j, &newnlev);
 
-   nlev  = newnlev - 1;
-   while(nlev < newnlev)
+   nlev = newnlev - 1;
+   while (nlev < newnlev)
    {
       nlev = newnlev;
-      r1 =  level_i[nlev-1];
+      r1 =  level_i[nlev - 1];
       r2 =  level_i[nlev];
       min_degree = n;
-      for(i = r1 ; i < r2 ; i ++)
+      for (i = r1 ; i < r2 ; i ++)
       {
          /* select the last level, pick min-degree node */
          row = level_j[i];
-         lev_degree = A_i[row+1] - A_i[row];
-         if(min_degree > lev_degree)
+         lev_degree = A_i[row + 1] - A_i[row];
+         if (min_degree > lev_degree)
          {
             min_degree = lev_degree;
             root = row;
@@ -2524,28 +2800,31 @@ hypre_ILULocalRCMFindPPNode( hypre_CSRMatrix *A, HYPRE_Int *rootp, HYPRE_Int *ma
       hypre_ILULocalRCMBuildLevel( A, root, marker, level_i, level_j, &newnlev);
    }
 
+   /* Set output pointers */
    *rootp = root;
-   /* free */
+
+   /* Free */
    hypre_TFree(level_i, HYPRE_MEMORY_HOST);
    hypre_TFree(level_j, HYPRE_MEMORY_HOST);
+
    return hypre_error_flag;
 }
 
 /*--------------------------------------------------------------------------
  * hypre_ILULocalRCMBuildLevel
+ *
+ * This function build level structure start from root
+ *   A: the csr matrix, A_data is not needed
+ *   root: pointer to the root
+ *   marker: the marker array for unvisited node
+ *   level_i: points to the start/end of position on level_j, similar to CSR Matrix
+ *   level_j: store node number on each level
+ *   nlevp: return the number of level on this level structure
  *--------------------------------------------------------------------------*/
 
-/* This function build level structure start from root
- * A: the csr matrix, A_data is not needed
- * root: pointer to the root
- * marker: the marker array for unvisited node
- * level_i: points to the start/end of position on level_j, similar to CSR Matrix
- * level_j: store node number on each level
- * nlevp: return the number of level on this level structure
- */
 HYPRE_Int
 hypre_ILULocalRCMBuildLevel(hypre_CSRMatrix *A, HYPRE_Int root, HYPRE_Int *marker,
-                              HYPRE_Int *level_i, HYPRE_Int *level_j, HYPRE_Int *nlevp)
+                            HYPRE_Int *level_i, HYPRE_Int *level_j, HYPRE_Int *nlevp)
 {
    HYPRE_Int      i, j, l1, l2, l_current, r1, r2, rowi, rowj, nlev;
    HYPRE_Int      *A_i = hypre_CSRMatrixI(A);
@@ -2560,21 +2839,21 @@ hypre_ILULocalRCMBuildLevel(hypre_CSRMatrix *A, HYPRE_Int root, HYPRE_Int *marke
    l2 = 1;
    l_current = l2;
 
-   //explore nbhds of all nodes in current level
-   while(l2 > l1)
+   /* Explore nbhds of all nodes in current level */
+   while (l2 > l1)
    {
       level_i[nlev++] = l2;
       /* loop through last level */
-      for(i = l1 ; i < l2 ; i ++)
+      for (i = l1 ; i < l2 ; i ++)
       {
          /* the node to explore */
          rowi = level_j[i];
          r1 = A_i[rowi];
          r2 = A_i[rowi + 1];
-         for(j = r1 ; j < r2 ; j ++)
+         for (j = r1 ; j < r2 ; j ++)
          {
             rowj = A_j[j];
-            if( marker[rowj] < 0 )
+            if ( marker[rowj] < 0 )
             {
                /* Aha, an unmarked row */
                marker[rowj] = 0;
@@ -2585,11 +2864,12 @@ hypre_ILULocalRCMBuildLevel(hypre_CSRMatrix *A, HYPRE_Int root, HYPRE_Int *marke
       l1 = l2;
       l2 = l_current;
    }
+
    /* after this we always have a "ghost" last level */
    nlev --;
 
    /* reset marker */
-   for(i = 0 ; i < l2 ; i ++)
+   for (i = 0 ; i < l2 ; i ++)
    {
       marker[level_j[i]] = -1;
    }
@@ -2601,1038 +2881,528 @@ hypre_ILULocalRCMBuildLevel(hypre_CSRMatrix *A, HYPRE_Int root, HYPRE_Int *marke
 
 /*--------------------------------------------------------------------------
  * hypre_ILULocalRCMNumbering
+ *
+ * This function generate numbering for a connect component
+ *   A: the csr matrix, A_data is not needed
+ *   root: pointer to the root
+ *   marker: the marker array for unvisited node
+ *   perm: permutation array
+ *   current_nump: number of nodes already have a perm value
  *--------------------------------------------------------------------------*/
 
-/* This function generate numbering for a connect component
- * A: the csr matrix, A_data is not needed
- * root: pointer to the root
- * marker: the marker array for unvisited node
- * perm: permutation array
- * current_nump: number of nodes already have a perm value
- */
-
 HYPRE_Int
-hypre_ILULocalRCMNumbering(hypre_CSRMatrix *A, HYPRE_Int root, HYPRE_Int *marker, HYPRE_Int *perm, HYPRE_Int *current_nump)
+hypre_ILULocalRCMNumbering(hypre_CSRMatrix *A, HYPRE_Int root, HYPRE_Int *marker, HYPRE_Int *perm,
+                           HYPRE_Int *current_nump)
 {
-    HYPRE_Int        i, j, l1, l2, r1, r2, rowi, rowj, row_start, row_end;
-    HYPRE_Int        *A_i        = hypre_CSRMatrixI(A);
-    HYPRE_Int        *A_j        = hypre_CSRMatrixJ(A);
-    HYPRE_Int        current_num = *current_nump;
-
-
-    marker[root]        = 0;
-    l1                  = current_num;
-    perm[current_num++] = root;
-    l2                  = current_num;
-
-    while(l2 > l1)
-    {
-       /* loop through all nodes is current level */
-       for(i = l1 ; i < l2 ; i ++)
-       {
-          rowi = perm[i];
-          r1 = A_i[rowi];
-          r2 = A_i[rowi+1];
-          row_start = current_num;
-          for(j = r1 ; j < r2 ; j ++)
-          {
-             rowj = A_j[j];
-             if(marker[rowj] < 0)
-             {
-                /* save the degree in marker and add it to perm */
-                marker[rowj] = A_i[rowj+1] - A_i[rowj];
-                perm[current_num++] = rowj;
-             }
-          }
-          row_end = current_num;
-          hypre_ILULocalRCMQsort(perm, row_start, row_end-1, marker);
-       }
-       l1 = l2;
-       l2 = current_num;
-    }
-
-    //reverse
-    hypre_ILULocalRCMReverse(perm, *current_nump, current_num-1);
-    *current_nump = current_num;
-    return hypre_error_flag;
+   HYPRE_Int        i, j, l1, l2, r1, r2, rowi, rowj, row_start, row_end;
+   HYPRE_Int        *A_i        = hypre_CSRMatrixI(A);
+   HYPRE_Int        *A_j        = hypre_CSRMatrixJ(A);
+   HYPRE_Int        current_num = *current_nump;
+
+
+   marker[root]        = 0;
+   l1                  = current_num;
+   perm[current_num++] = root;
+   l2                  = current_num;
+
+   while (l2 > l1)
+   {
+      /* loop through all nodes is current level */
+      for (i = l1 ; i < l2 ; i ++)
+      {
+         rowi = perm[i];
+         r1 = A_i[rowi];
+         r2 = A_i[rowi + 1];
+         row_start = current_num;
+         for (j = r1 ; j < r2 ; j ++)
+         {
+            rowj = A_j[j];
+            if (marker[rowj] < 0)
+            {
+               /* save the degree in marker and add it to perm */
+               marker[rowj] = A_i[rowj + 1] - A_i[rowj];
+               perm[current_num++] = rowj;
+            }
+         }
+         row_end = current_num;
+         hypre_ILULocalRCMQsort(perm, row_start, row_end - 1, marker);
+      }
+      l1 = l2;
+      l2 = current_num;
+   }
+
+   //reverse
+   hypre_ILULocalRCMReverse(perm, *current_nump, current_num - 1);
+   *current_nump = current_num;
+   return hypre_error_flag;
 }
 
 /*--------------------------------------------------------------------------
  * hypre_ILULocalRCMQsort
- *--------------------------------------------------------------------------*/
-
-/* This qsort is very specialized, not worth to put into utilities
+ *
+ * This qsort is very specialized, not worth to put into utilities
  * Sort a part of array perm based on degree value (ascend)
  * That is, if degree[perm[i]] < degree[perm[j]], we should have i < j
- * perm: the perm array
- * start: start in perm
- * end: end in perm
- * degree: degree array
- */
+ *   perm: the perm array
+ *   start: start in perm
+ *   end: end in perm
+ *   degree: degree array
+ *--------------------------------------------------------------------------*/
 
 HYPRE_Int
 hypre_ILULocalRCMQsort(HYPRE_Int *perm, HYPRE_Int start, HYPRE_Int end, HYPRE_Int *degree)
 {
+   HYPRE_Int i, mid;
+   if (start >= end)
+   {
+      return hypre_error_flag;
+   }
+
+   hypre_swap(perm, start, (start + end) / 2);
+   mid = start;
+
+   /* Loop to split */
+   for (i = start + 1 ; i <= end ; i ++)
+   {
+      if (degree[perm[i]] < degree[perm[start]])
+      {
+         hypre_swap(perm, ++mid, i);
+      }
+   }
+   hypre_swap(perm, start, mid);
+   hypre_ILULocalRCMQsort(perm, mid + 1, end, degree);
+   hypre_ILULocalRCMQsort(perm, start, mid - 1, degree);
 
-    HYPRE_Int i, mid;
-    if(start >= end)
-    {
-        return hypre_error_flag;
-    }
-
-    hypre_swap(perm, start, (start + end) / 2);
-    mid = start;
-    //loop to split
-    for(i = start + 1 ; i <= end ; i ++)
-    {
-        if(degree[perm[i]] < degree[perm[start]])
-        {
-            hypre_swap(perm, ++mid, i);
-        }
-    }
-    hypre_swap(perm, start, mid);
-    hypre_ILULocalRCMQsort(perm, mid+1, end, degree);
-    hypre_ILULocalRCMQsort(perm, start, mid-1, degree);
-    return hypre_error_flag;
+   return hypre_error_flag;
 }
 
 /*--------------------------------------------------------------------------
  * hypre_ILULocalRCMReverse
- *--------------------------------------------------------------------------*/
-
-/* Last step in RCM, reverse it
+ *
+ * Last step in RCM, reverse it
  * perm: perm array
  * srart: start position
  * end: end position
- */
+ *--------------------------------------------------------------------------*/
 
 HYPRE_Int
 hypre_ILULocalRCMReverse(HYPRE_Int *perm, HYPRE_Int start, HYPRE_Int end)
 {
-    HYPRE_Int     i, j;
-    HYPRE_Int     mid = (start + end + 1) / 2;
+   HYPRE_Int     i, j;
+   HYPRE_Int     mid = (start + end + 1) / 2;
 
-    for(i = start, j = end ; i < mid ; i ++, j--)
-    {
-        hypre_swap(perm, i, j);
-    }
+   for (i = start, j = end ; i < mid ; i ++, j--)
+   {
+      hypre_swap(perm, i, j);
+   }
    return hypre_error_flag;
 }
 
-#ifdef HYPRE_USING_CUDA
+/* TODO (VPM): Change this block to another file? */
+#if defined(HYPRE_USING_GPU)
 
 /*--------------------------------------------------------------------------
- * hypre_ParILUCusparseSchurGMRESDummySetup
+ * hypre_ParILUSchurGMRESDummySolveDevice
+ *
+ * Unit GMRES preconditioner, just copy data from one slot to another
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_ParILUCusparseSchurGMRESDummySetup(void *a, void *b, void *c, void *d)
+hypre_ParILUSchurGMRESDummySolveDevice( void             *ilu_vdata,
+                                        void             *ilu_vdata2,
+                                        hypre_ParVector  *f,
+                                        hypre_ParVector  *u )
 {
-   /* Null GMRES setup, does nothing */
-   return 0;
-}
-
-/*--------------------------------------------------------------------------
- * hypre_ParILUCusparseSchurGMRESDummySolve
- *--------------------------------------------------------------------------*/
+   HYPRE_UNUSED_VAR(ilu_vdata);
+   HYPRE_UNUSED_VAR(ilu_vdata2);
 
-HYPRE_Int
-hypre_ParILUCusparseSchurGMRESDummySolve( void               *ilu_vdata,
-                  void               *ilu_vdata2,
-                  hypre_ParVector    *f,
-                  hypre_ParVector    *u )
-{
-   /* Unit GMRES preconditioner, just copy data from one slot to another */
-   hypre_ParILUData *ilu_data                = (hypre_ParILUData*) ilu_vdata;
-   hypre_ParCSRMatrix *A                     = hypre_ParILUDataMatS(ilu_data);
-   hypre_CSRMatrix         *A_diag           = hypre_ParCSRMatrixDiag(A);
-   HYPRE_Int               n_local           = hypre_CSRMatrixNumRows(A_diag);
+   hypre_ParILUData    *ilu_data = (hypre_ParILUData*) ilu_vdata;
+   hypre_ParCSRMatrix  *S        = hypre_ParILUDataMatS(ilu_data);
+   HYPRE_Int            n_local  = hypre_ParCSRMatrixNumRows(S);
 
-   hypre_Vector            *u_local          = hypre_ParVectorLocalVector(u);
-   HYPRE_Real              *u_data           = hypre_VectorData(u_local);
+   hypre_Vector        *u_local = hypre_ParVectorLocalVector(u);
+   HYPRE_Complex       *u_data  = hypre_VectorData(u_local);
 
-   hypre_Vector            *f_local          = hypre_ParVectorLocalVector(f);
-   HYPRE_Real              *f_data           = hypre_VectorData(f_local);
+   hypre_Vector        *f_local = hypre_ParVectorLocalVector(f);
+   HYPRE_Complex       *f_data  = hypre_VectorData(f_local);
 
-   cudaDeviceSynchronize();
    hypre_TMemcpy(u_data, f_data, HYPRE_Real, n_local, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
 
    return hypre_error_flag;
 }
 
 /*--------------------------------------------------------------------------
- * hypre_ParILUCusparseSchurGMRESCommInfo
+ * hypre_ParILUSchurGMRESCommInfoDevice
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_ParILUCusparseSchurGMRESCommInfo( void *ilu_vdata, HYPRE_Int *my_id, HYPRE_Int *num_procs)
+hypre_ParILUSchurGMRESCommInfoDevice(void       *ilu_vdata,
+                                     HYPRE_Int  *my_id,
+                                     HYPRE_Int  *num_procs)
 {
    /* get comm info from ilu_data */
-   hypre_ParILUData *ilu_data = (hypre_ParILUData*) ilu_vdata;
-   hypre_ParCSRMatrix *A = hypre_ParILUDataMatS(ilu_data);
-   MPI_Comm comm = hypre_ParCSRMatrixComm ( A );
-   hypre_MPI_Comm_size(comm,num_procs);
-   hypre_MPI_Comm_rank(comm,my_id);
-   return 0;
-}
-
-/*--------------------------------------------------------------------------
- * hypre_ParILUCusparseSchurGMRESMatvecCreate
- *--------------------------------------------------------------------------*/
-
-void *
-hypre_ParILUCusparseSchurGMRESMatvecCreate( void   *ilu_vdata,
-                             void   *x )
-{
-   /* Null matvec create */
-   void *matvec_data;
-   matvec_data = NULL;
-   return ( matvec_data );
-}
-
-/*--------------------------------------------------------------------------
- * hypre_ParILUCusparseSchurGMRESMatvec
- *--------------------------------------------------------------------------*/
-
-HYPRE_Int
-hypre_ParILUCusparseSchurGMRESMatvec( void   *matvec_data,
-                       HYPRE_Complex  alpha,
-                       void   *ilu_vdata,
-                       void   *x,
-                       HYPRE_Complex  beta,
-                       void   *y           )
-{
-   /* Slightly different, for this new matvec, the diagonal of the original matrix
-    * is the LU factorization. Thus, the matvec is done in an different way
-    * |IS_1 E_12 E_13|
-    * |E_21 IS_2 E_23| = S
-    * |E_31 E_32 IS_3|
-    *
-    * |IS_1          |
-    * |     IS_2     | = M
-    * |          IS_3|
-    *
-    * Solve Sy = g is just M^{-1}S = M^{-1}g
-    *
-    * |      I       IS_1^{-1}E_12 IS_1^{-1}E_13|
-    * |IS_2^{-1}E_21       I       IS_2^{-1}E_23| = M^{-1}S
-    * |IS_3^{-1}E_31 IS_3^{-1}E_32       I      |
-    *
-    * */
-
-   /* get matrix information first */
-   hypre_ParILUData *ilu_data                   = (hypre_ParILUData*) ilu_vdata;
-   hypre_ParCSRMatrix *A                        = hypre_ParILUDataMatS(ilu_data);
-
-   /* fist step, apply matvec on empty diagonal slot */
-   hypre_CSRMatrix   *A_diag                    = hypre_ParCSRMatrixDiag(A);
-   HYPRE_Int         *A_diag_i                  = hypre_CSRMatrixI(A_diag);
-   HYPRE_Int         *A_diag_j                  = hypre_CSRMatrixJ(A_diag);
-   HYPRE_Real        *A_diag_data               = hypre_CSRMatrixData(A_diag);
-   HYPRE_Int         A_diag_n                   = hypre_CSRMatrixNumRows(A_diag);
-   HYPRE_Int         A_diag_nnz                 = A_diag_i[A_diag_n];
-   HYPRE_Int         *A_diag_fake_i             = hypre_ParILUDataMatAFakeDiagonal(ilu_data);
-
-   cusparseMatDescr_t      matL_des             = hypre_ParILUDataMatLMatrixDescription(ilu_data);
-   cusparseMatDescr_t      matU_des             = hypre_ParILUDataMatUMatrixDescription(ilu_data);
-   void                    *ilu_solve_buffer    = hypre_ParILUDataILUSolveBuffer(ilu_data);//device memory
-   cusparseSolvePolicy_t   ilu_solve_policy     = hypre_ParILUDataILUSolvePolicy(ilu_data);
-   csrsv2Info_t            matSL_info           = hypre_ParILUDataMatSLILUSolveInfo(ilu_data);
-   csrsv2Info_t            matSU_info           = hypre_ParILUDataMatSUILUSolveInfo(ilu_data);
-
-   HYPRE_Int               isDoublePrecision    = sizeof(HYPRE_Complex) == sizeof(hypre_double);
-   HYPRE_Int               isSinglePrecision    = sizeof(HYPRE_Complex) == sizeof(hypre_double) / 2;
-
-   hypre_assert(isDoublePrecision || isSinglePrecision);
-
-   hypre_ParVector         *xtemp               = hypre_ParILUDataXTemp(ilu_data);
-   hypre_Vector            *xtemp_local         = hypre_ParVectorLocalVector(xtemp);
-   HYPRE_Real              *xtemp_data          = hypre_VectorData(xtemp_local);
-   hypre_ParVector         *ytemp               = hypre_ParILUDataYTemp(ilu_data);
-   hypre_Vector            *ytemp_local         = hypre_ParVectorLocalVector(ytemp);
-   HYPRE_Real              *ytemp_data          = hypre_VectorData(ytemp_local);
-   HYPRE_Real              zero                 = 0.0;
-   HYPRE_Real              one                  = 1.0;
-
-   cusparseHandle_t handle = hypre_HandleCusparseHandle(hypre_handle());
-
-   /* Matvec with
-    *         |  O  E_12 E_13|
-    * alpha * |E_21   O  E_23|
-    *         |E_31 E_32   O |
-    * store in xtemp
-    */
-   hypre_CSRMatrixI(A_diag)                     = A_diag_fake_i;
-   hypre_ParCSRMatrixMatvec( alpha, (hypre_ParCSRMatrix *) A, (hypre_ParVector *) x, zero, xtemp );
-   hypre_CSRMatrixI(A_diag)                     = A_diag_i;
-
-   /* Compute U^{-1}*L^{-1}*(A_offd * x)
-    * Or in another word, matvec with
-    *         |      O       IS_1^{-1}E_12 IS_1^{-1}E_13|
-    * alpha * |IS_2^{-1}E_21       O       IS_2^{-1}E_23|
-    *         |IS_3^{-1}E_31 IS_3^{-1}E_32       O      |
-    * store in xtemp
-    */
-   if( A_diag_n > 0 )
-   {
-      if(isDoublePrecision)
-      {
-         /* L solve - Forward solve */
-         HYPRE_CUSPARSE_CALL(cusparseDcsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                   A_diag_n, A_diag_nnz, (hypre_double *) &one, matL_des,
-                                                   (hypre_double *) A_diag_data, A_diag_i, A_diag_j, matSL_info,
-                                                   (hypre_double *) xtemp_data, (hypre_double *) ytemp_data, ilu_solve_policy, ilu_solve_buffer));
-
-         /* U solve - Backward substitution */
-         HYPRE_CUSPARSE_CALL(cusparseDcsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                   A_diag_n, A_diag_nnz, (hypre_double *) &one, matU_des,
-                                                   (hypre_double *) A_diag_data, A_diag_i, A_diag_j, matSU_info,
-                                                   (hypre_double *) ytemp_data, (hypre_double *) xtemp_data, ilu_solve_policy, ilu_solve_buffer));
-      }
-      else if(isSinglePrecision)
-      {
-         /* L solve - Forward solve */
-         HYPRE_CUSPARSE_CALL(cusparseScsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                   A_diag_n, A_diag_nnz, (float *) &one, matL_des,
-                                                   (float *) A_diag_data, A_diag_i, A_diag_j, matSL_info,
-                                                   (float *) xtemp_data, (float *) ytemp_data, ilu_solve_policy, ilu_solve_buffer));
-
-         /* U solve - Backward substitution */
-         HYPRE_CUSPARSE_CALL(cusparseScsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                   A_diag_n, A_diag_nnz, (float *) &one, matU_des,
-                                                   (float *) A_diag_data, A_diag_i, A_diag_j, matSU_info,
-                                                   (float *) ytemp_data, (float *) xtemp_data, ilu_solve_policy, ilu_solve_buffer));
-      }
-   }
+   hypre_ParILUData     *ilu_data = (hypre_ParILUData*) ilu_vdata;
+   hypre_ParCSRMatrix   *S        = hypre_ParILUDataMatS(ilu_data);
+   MPI_Comm              comm     = hypre_ParCSRMatrixComm(S);
 
-   /* now add the original x onto it */
-   hypre_ParVectorAxpy( alpha, (hypre_ParVector *) x, (hypre_ParVector *) xtemp);
-
-   /* finall, add that into y and get final result */
-   hypre_ParVectorScale( beta, (hypre_ParVector *) y );
-   hypre_ParVectorAxpy( one, xtemp, (hypre_ParVector *) y);
+   hypre_MPI_Comm_size(comm, num_procs);
+   hypre_MPI_Comm_rank(comm, my_id);
 
    return hypre_error_flag;
 }
 
 /*--------------------------------------------------------------------------
- * hypre_ParILUCusparseSchurGMRESMatvecDestroy
+ * hypre_ParILURAPSchurGMRESSolveDevice
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_ParILUCusparseSchurGMRESMatvecDestroy( void *matvec_data )
+hypre_ParILURAPSchurGMRESSolveDevice( void               *ilu_vdata,
+                                      void               *ilu_vdata2,
+                                      hypre_ParVector    *par_f,
+                                      hypre_ParVector    *par_u )
 {
-   return hypre_error_flag;
-}
+   HYPRE_UNUSED_VAR(ilu_vdata);
+   HYPRE_UNUSED_VAR(ilu_vdata2);
 
-/*--------------------------------------------------------------------------
- * hypre_ParILUCusparseSchurGMRESDummySetup
- *--------------------------------------------------------------------------*/
+   hypre_ParILUData        *ilu_data  = (hypre_ParILUData*) ilu_vdata;
+   hypre_ParCSRMatrix      *S         = hypre_ParILUDataMatS(ilu_data);
+   hypre_CSRMatrix         *SLU       = hypre_ParCSRMatrixDiag(S);
 
-HYPRE_Int
-hypre_ParILURAPSchurGMRESDummySetup(void *a, void *b, void *c, void *d)
-{
-   /* Null GMRES setup, does nothing */
-   return 0;
-}
+   hypre_ParVector         *par_rhs   = hypre_ParILUDataRhs(ilu_data);
+   hypre_Vector            *rhs       = hypre_ParVectorLocalVector(par_rhs);
+   hypre_Vector            *f         = hypre_ParVectorLocalVector(par_f);
+   hypre_Vector            *u         = hypre_ParVectorLocalVector(par_u);
 
-/*--------------------------------------------------------------------------
- * hypre_ParILUCusparseSchurGMRESDummySolve
- *--------------------------------------------------------------------------*/
+   /* L solve */
+   hypre_CSRMatrixTriLowerUpperSolveDevice('L', 1, SLU, NULL, f, rhs);
 
-HYPRE_Int
-hypre_ParILURAPSchurGMRESSolve( void               *ilu_vdata,
-                  void               *ilu_vdata2,
-                  hypre_ParVector    *f,
-                  hypre_ParVector    *u )
-{
-   /* Unit GMRES preconditioner, just copy data from one slot to another */
-   hypre_ParILUData        *ilu_data            = (hypre_ParILUData*) ilu_vdata;
-   //hypre_ParCSRMatrix      *Aperm               = hypre_ParILUDataAperm(ilu_data);
-
-   cusparseHandle_t        handle               = hypre_HandleCusparseHandle(hypre_handle());
-   cusparseMatDescr_t      matL_des             = hypre_ParILUDataMatLMatrixDescription(ilu_data);
-   cusparseMatDescr_t      matU_des             = hypre_ParILUDataMatUMatrixDescription(ilu_data);
-   void                    *ilu_solve_buffer    = hypre_ParILUDataILUSolveBuffer(ilu_data);//device memory
-   cusparseSolvePolicy_t   ilu_solve_policy     = hypre_ParILUDataILUSolvePolicy(ilu_data);
-
-   HYPRE_Int               isDoublePrecision    = sizeof(HYPRE_Complex) == sizeof(hypre_double);
-   HYPRE_Int               isSinglePrecision    = sizeof(HYPRE_Complex) == sizeof(hypre_double) / 2;
-
-   hypre_assert(isDoublePrecision || isSinglePrecision);
-
-   hypre_ParCSRMatrix      *S                   = hypre_ParILUDataMatS(ilu_data);
-   hypre_CSRMatrix         *SLU                 = hypre_ParCSRMatrixDiag(S);
-   HYPRE_Int               *SLU_i               = hypre_CSRMatrixI(SLU);
-   HYPRE_Int               *SLU_j               = hypre_CSRMatrixJ(SLU);
-   HYPRE_Real              *SLU_data            = hypre_CSRMatrixData(SLU);
-   HYPRE_Int               SLU_nnz              = hypre_CSRMatrixNumNonzeros(SLU);
-
-   csrsv2Info_t            matSL_info           = hypre_ParILUDataMatSLILUSolveInfo(ilu_data);
-   csrsv2Info_t            matSU_info           = hypre_ParILUDataMatSUILUSolveInfo(ilu_data);
-
-   //HYPRE_Int               n                    = hypre_CSRMatrixNumRows(hypre_ParCSRMatrixDiag(Aperm));
-   HYPRE_Int               m                    = hypre_CSRMatrixNumRows(SLU);
-   //HYPRE_Int               nLU                  = n - m;
-
-   hypre_ParVector         *f_vec               = (hypre_ParVector *) f;
-   hypre_Vector            *f_local             = hypre_ParVectorLocalVector(f_vec);
-   HYPRE_Real              *f_data              = hypre_VectorData(f_local);
-   hypre_ParVector         *u_vec               = (hypre_ParVector *) u;
-   hypre_Vector            *u_local             = hypre_ParVectorLocalVector(u_vec);
-   HYPRE_Real              *u_data              = hypre_VectorData(u_local);
-   hypre_ParVector         *rhs                 = hypre_ParILUDataRhs(ilu_data);
-   hypre_Vector            *rhs_local           = hypre_ParVectorLocalVector(rhs);
-   HYPRE_Real              *rhs_data            = hypre_VectorData(rhs_local);
-
-   //HYPRE_Real zero = 0.0;
-   HYPRE_Real one = 1.0;
-   //HYPRE_Real mone = -1.0;
-
-   if(m > 0)
-   {
-      if(isDoublePrecision)
-      {
-         /* L solve */
-         HYPRE_CUSPARSE_CALL(cusparseDcsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                   m, SLU_nnz, (hypre_double *) &one, matL_des,
-                                                   (hypre_double *) SLU_data, SLU_i, SLU_j, matSL_info,
-                                                   (hypre_double *) f_data, (hypre_double *) rhs_data, ilu_solve_policy, ilu_solve_buffer));
-         /* U solve */
-         HYPRE_CUSPARSE_CALL(cusparseDcsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                   m, SLU_nnz, (hypre_double *) &one, matU_des,
-                                                   (hypre_double *) SLU_data, SLU_i, SLU_j, matSU_info,
-                                                   (hypre_double *) rhs_data, (hypre_double *) u_data, ilu_solve_policy, ilu_solve_buffer));
-      }
-      else if(isSinglePrecision)
-      {
-         /* L solve */
-         HYPRE_CUSPARSE_CALL(cusparseScsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                   m, SLU_nnz, (float *) &one, matL_des,
-                                                   (float *) SLU_data, SLU_i, SLU_j, matSL_info,
-                                                   (float *) f_data, (float *) rhs_data, ilu_solve_policy, ilu_solve_buffer));
-         /* U solve */
-         HYPRE_CUSPARSE_CALL(cusparseScsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                   m, SLU_nnz, (float *) &one, matU_des,
-                                                   (float *) SLU_data, SLU_i, SLU_j, matSU_info,
-                                                   (float *) rhs_data, (float *) u_data, ilu_solve_policy, ilu_solve_buffer));
-      }
-   }
+   /* U solve */
+   hypre_CSRMatrixTriLowerUpperSolveDevice('U', 0, SLU, NULL, rhs, u);
 
    return hypre_error_flag;
 }
 
 /*--------------------------------------------------------------------------
- * hypre_ParILUCusparseSchurGMRESMatvecCreate
- *--------------------------------------------------------------------------*/
-
-void *
-hypre_ParILURAPSchurGMRESMatvecCreate( void   *ilu_vdata,
-                             void   *x )
-{
-   /* Null matvec create */
-   void *matvec_data;
-   matvec_data = NULL;
-   return ( matvec_data );
-}
-
-/*--------------------------------------------------------------------------
- * hypre_ParILUCusparseSchurGMRESMatvec
+ * hypre_ParILURAPSchurGMRESMatvecDevice
+ *
+ * Compute y = alpha * S * x + beta * y
+ *
+ * TODO (VPM): Unify this function with hypre_ParILURAPSchurGMRESMatvecHost
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_ParILURAPSchurGMRESMatvec( void   *matvec_data,
-                       HYPRE_Complex  alpha,
-                       void   *ilu_vdata,
-                       void   *x,
-                       HYPRE_Complex  beta,
-                       void   *y           )
+hypre_ParILURAPSchurGMRESMatvecDevice( void           *matvec_data,
+                                       HYPRE_Complex   alpha,
+                                       void           *ilu_vdata,
+                                       void           *x,
+                                       HYPRE_Complex   beta,
+                                       void           *y )
 {
-   /* Compute y = alpha * S * x + beta * y
-    * */
-
-   /* get matrix information first */
-   hypre_ParILUData        *ilu_data            = (hypre_ParILUData*) ilu_vdata;
-
-   HYPRE_Int               test_opt             = hypre_ParILUDataTestOption(ilu_data);
-
-   switch(test_opt)
+   HYPRE_UNUSED_VAR(matvec_data);
+
+   /* Get matrix information first */
+   hypre_ParILUData       *ilu_data    = (hypre_ParILUData*) ilu_vdata;
+   HYPRE_Int               test_opt    = hypre_ParILUDataTestOption(ilu_data);
+   hypre_ParCSRMatrix     *Aperm       = hypre_ParILUDataAperm(ilu_data);
+   HYPRE_Int               n           = hypre_CSRMatrixNumRows(hypre_ParCSRMatrixDiag(Aperm));
+   hypre_CSRMatrix        *EiU         = hypre_ParILUDataMatEDevice(ilu_data);
+   hypre_CSRMatrix        *iLF         = hypre_ParILUDataMatFDevice(ilu_data);
+   hypre_CSRMatrix        *BLU         = hypre_ParILUDataMatBILUDevice(ilu_data);
+   hypre_CSRMatrix        *C           = hypre_ParILUDataMatSILUDevice(ilu_data);
+
+   hypre_ParVector        *x_vec       = (hypre_ParVector *) x;
+   hypre_Vector           *x_local     = hypre_ParVectorLocalVector(x_vec);
+   HYPRE_Real             *x_data      = hypre_VectorData(x_local);
+   hypre_ParVector        *xtemp       = hypre_ParILUDataUTemp(ilu_data);
+   hypre_Vector           *xtemp_local = hypre_ParVectorLocalVector(xtemp);
+   HYPRE_Real             *xtemp_data  = hypre_VectorData(xtemp_local);
+
+   hypre_ParVector        *y_vec       = (hypre_ParVector *) y;
+   hypre_Vector           *y_local     = hypre_ParVectorLocalVector(y_vec);
+   hypre_ParVector        *ytemp       = hypre_ParILUDataYTemp(ilu_data);
+   hypre_Vector           *ytemp_local = hypre_ParVectorLocalVector(ytemp);
+   HYPRE_Real             *ytemp_data  = hypre_VectorData(ytemp_local);
+
+   HYPRE_Int               nLU;
+   HYPRE_Int               m;
+   hypre_Vector           *xtemp_upper;
+   hypre_Vector           *xtemp_lower;
+   hypre_Vector           *ytemp_upper;
+   hypre_Vector           *ytemp_lower;
+
+   switch (test_opt)
    {
       case 1:
-      {
          /* S = R * A * P */
-         hypre_ParCSRMatrix      *Aperm               = hypre_ParILUDataAperm(ilu_data);
-
-         cusparseHandle_t        handle               = hypre_HandleCusparseHandle(hypre_handle());
-         cusparseMatDescr_t      matL_des             = hypre_ParILUDataMatLMatrixDescription(ilu_data);
-         cusparseMatDescr_t      matU_des             = hypre_ParILUDataMatUMatrixDescription(ilu_data);
-         void                    *ilu_solve_buffer    = hypre_ParILUDataILUSolveBuffer(ilu_data);//device memory
-         cusparseSolvePolicy_t   ilu_solve_policy     = hypre_ParILUDataILUSolvePolicy(ilu_data);
-
-         HYPRE_Int               isDoublePrecision    = sizeof(HYPRE_Complex) == sizeof(hypre_double);
-         HYPRE_Int               isSinglePrecision    = sizeof(HYPRE_Complex) == sizeof(hypre_double) / 2;
-
-         hypre_assert(isDoublePrecision || isSinglePrecision);
-
-         hypre_CSRMatrix         *EiU                 = hypre_ParILUDataMatEDevice(ilu_data);
-         hypre_CSRMatrix         *iLF                 = hypre_ParILUDataMatFDevice(ilu_data);
-         hypre_CSRMatrix         *BLU                 = hypre_ParILUDataMatBILUDevice(ilu_data);
-         HYPRE_Int               *BLU_i               = hypre_CSRMatrixI(BLU);
-         HYPRE_Int               *BLU_j               = hypre_CSRMatrixJ(BLU);
-         HYPRE_Real              *BLU_data            = hypre_CSRMatrixData(BLU);
-         HYPRE_Int               BLU_nnz              = hypre_CSRMatrixNumNonzeros(BLU);
-
-         csrsv2Info_t            matBL_info           = hypre_ParILUDataMatBLILUSolveInfo(ilu_data);
-         csrsv2Info_t            matBU_info           = hypre_ParILUDataMatBUILUSolveInfo(ilu_data);
-
-         HYPRE_Int               n                    = hypre_CSRMatrixNumRows(hypre_ParCSRMatrixDiag(Aperm));
-         HYPRE_Int               nLU                  = hypre_CSRMatrixNumRows(BLU);
-         HYPRE_Int               m                    = n - nLU;
-
-         hypre_ParVector         *x_vec               = (hypre_ParVector *) x;
-         hypre_Vector            *x_local             = hypre_ParVectorLocalVector(x_vec);
-         HYPRE_Real              *x_data              = hypre_VectorData(x_local);
-         hypre_ParVector         *y_vec               = (hypre_ParVector *) y;
-         hypre_Vector            *y_local             = hypre_ParVectorLocalVector(y_vec);
-         //HYPRE_Real              *y_data              = hypre_VectorData(y_local);
-         hypre_ParVector         *xtemp               = hypre_ParILUDataUTemp(ilu_data);
-         hypre_Vector            *xtemp_local         = hypre_ParVectorLocalVector(xtemp);
-         HYPRE_Real              *xtemp_data          = hypre_VectorData(xtemp_local);
-         hypre_ParVector         *ytemp               = hypre_ParILUDataYTemp(ilu_data);
-         hypre_Vector            *ytemp_local         = hypre_ParVectorLocalVector(ytemp);
-         HYPRE_Real              *ytemp_data          = hypre_VectorData(ytemp_local);
-
-         hypre_Vector *xtemp_upper           = hypre_SeqVectorCreate(nLU);
-         hypre_Vector *ytemp_upper           = hypre_SeqVectorCreate(nLU);
-         hypre_Vector *xtemp_lower           = hypre_SeqVectorCreate(m);
-         hypre_VectorOwnsData(xtemp_upper)   = 0;
-         hypre_VectorOwnsData(ytemp_upper)   = 0;
-         hypre_VectorOwnsData(xtemp_lower)   = 0;
-         hypre_VectorData(xtemp_upper)       = xtemp_data;
-         hypre_VectorData(ytemp_upper)       = ytemp_data;
-         hypre_VectorData(xtemp_lower)       = xtemp_data+nLU;
+         nLU                               = hypre_CSRMatrixNumRows(BLU);
+         m                                 = n - nLU;
+         xtemp_upper                       = hypre_SeqVectorCreate(nLU);
+         ytemp_upper                       = hypre_SeqVectorCreate(nLU);
+         xtemp_lower                       = hypre_SeqVectorCreate(m);
+         hypre_VectorOwnsData(xtemp_upper) = 0;
+         hypre_VectorOwnsData(ytemp_upper) = 0;
+         hypre_VectorOwnsData(xtemp_lower) = 0;
+         hypre_VectorData(xtemp_upper)     = xtemp_data;
+         hypre_VectorData(ytemp_upper)     = ytemp_data;
+         hypre_VectorData(xtemp_lower)     = xtemp_data + nLU;
+
          hypre_SeqVectorInitialize(xtemp_upper);
          hypre_SeqVectorInitialize(ytemp_upper);
          hypre_SeqVectorInitialize(xtemp_lower);
 
-         HYPRE_Real zero = 0.0;
-         HYPRE_Real one = 1.0;
-         HYPRE_Real mone = -1.0;
-
          /* first step, compute P*x put in y */
          /* -Fx */
-         hypre_CSRMatrixMatvec(mone, iLF, x_local, zero, ytemp_upper);
+         hypre_CSRMatrixMatvec(-1.0, iLF, x_local, 0.0, ytemp_upper);
+
          /* -L^{-1}Fx */
-         if(isDoublePrecision)
-         {
-            /* L solve */
-            HYPRE_CUSPARSE_CALL(cusparseDcsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                      nLU, BLU_nnz, (hypre_double *) &one, matL_des,
-                                                      (hypre_double *) BLU_data, BLU_i, BLU_j, matBL_info,
-                                                      (hypre_double *) ytemp_data, (hypre_double *) xtemp_data, ilu_solve_policy, ilu_solve_buffer));
-         }
-         else if(isSinglePrecision)
-         {
-            /* L solve */
-            HYPRE_CUSPARSE_CALL(cusparseScsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                      nLU, BLU_nnz, (float *) &one, matL_des,
-                                                      (float *) BLU_data, BLU_i, BLU_j, matBL_info,
-                                                      (float *) ytemp_data, (float *) xtemp_data, ilu_solve_policy, ilu_solve_buffer));
-         }
+         /* L solve */
+         hypre_CSRMatrixTriLowerUpperSolveDevice('L', 1, BLU, NULL, ytemp_local, xtemp_local);
+
          /* -U{-1}L^{-1}Fx */
-         if(isDoublePrecision)
-         {
-            /* U solve */
-            HYPRE_CUSPARSE_CALL(cusparseDcsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                      nLU, BLU_nnz, (hypre_double *) &one, matU_des,
-                                                      (hypre_double *) BLU_data, BLU_i, BLU_j, matBU_info,
-                                                      (hypre_double *) xtemp_data, (hypre_double *) ytemp_data, ilu_solve_policy, ilu_solve_buffer));
-         }
-         else if(isSinglePrecision)
-         {
-            /* U solve */
-            HYPRE_CUSPARSE_CALL(cusparseScsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                      nLU, BLU_nnz, (float *) &one, matU_des,
-                                                      (float *) BLU_data, BLU_i, BLU_j, matBU_info,
-                                                      (float *) xtemp_data, (float *) ytemp_data, ilu_solve_policy, ilu_solve_buffer));
-         }
+         /* U solve */
+         hypre_CSRMatrixTriLowerUpperSolveDevice('U', 0, BLU, NULL, xtemp_local, ytemp_local);
+
          /* now copy data to y_lower */
-         hypre_TMemcpy( ytemp_data + nLU, x_data, HYPRE_Real, m, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+         hypre_TMemcpy(ytemp_data + nLU, x_data, HYPRE_Real, m,
+                       HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
 
          /* second step, compute A*P*x store in xtemp */
-         hypre_ParCSRMatrixMatvec( one, Aperm, ytemp, zero, xtemp);
+         hypre_ParCSRMatrixMatvec(1.0, Aperm, ytemp, 0.0, xtemp);
 
          /* third step, compute R*A*P*x */
          /* solve L^{-1} */
-         if(isDoublePrecision)
-         {
-            /* L solve */
-            HYPRE_CUSPARSE_CALL(cusparseDcsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                      nLU, BLU_nnz, (hypre_double *) &one, matL_des,
-                                                      (hypre_double *) BLU_data, BLU_i, BLU_j, matBL_info,
-                                                      (hypre_double *) xtemp_data, (hypre_double *) ytemp_data, ilu_solve_policy, ilu_solve_buffer));
-         }
-         else if(isSinglePrecision)
-         {
-            /* L solve */
-            HYPRE_CUSPARSE_CALL(cusparseScsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                      nLU, BLU_nnz, (float *) &one, matL_des,
-                                                      (float *) BLU_data, BLU_i, BLU_j, matBL_info,
-                                                      (float *) xtemp_data, (float *) ytemp_data, ilu_solve_policy, ilu_solve_buffer));
-         }
-         /* U^{-1}L^{-1} */
-         if(isDoublePrecision)
-         {
-            /* U solve */
-            HYPRE_CUSPARSE_CALL(cusparseDcsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                      nLU, BLU_nnz, (hypre_double *) &one, matU_des,
-                                                      (hypre_double *) BLU_data, BLU_i, BLU_j, matBU_info,
-                                                      (hypre_double *) ytemp_data, (hypre_double *) xtemp_data, ilu_solve_policy, ilu_solve_buffer));
-         }
-         else if(isSinglePrecision)
-         {
-            /* U solve */
-            HYPRE_CUSPARSE_CALL(cusparseScsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                      nLU, BLU_nnz, (float *) &one, matU_des,
-                                                      (float *) BLU_data, BLU_i, BLU_j, matBU_info,
-                                                      (float *) ytemp_data, (float *) xtemp_data, ilu_solve_policy, ilu_solve_buffer));
-         }
-         /* -EU^{-1}L^{-1} */
-         hypre_CSRMatrixMatvec(mone * alpha, EiU, xtemp_upper, beta, y_local);
-         /* I*lower-EU^{-1}L^{-1}*upper */
-         hypre_SeqVectorAxpy(alpha, xtemp_lower, y_local);
-
-         /* over */
-         hypre_SeqVectorDestroy(xtemp_upper);
-         hypre_SeqVectorDestroy(ytemp_upper);
-         hypre_SeqVectorDestroy(xtemp_lower);
-      }
-      break;
-      case 2:
-      {
-         /* S = C - EU^{-1} * L^{-1}F */
-
-         //hypre_ParCSRMatrix      *Aperm               = hypre_ParILUDataAperm(ilu_data);
-
-         //cusparseHandle_t        handle               = hypre_HandleCusparseHandle(hypre_handle());
-         //cusparseMatDescr_t      matL_des             = hypre_ParILUDataMatLMatrixDescription(ilu_data);
-         //cusparseMatDescr_t      matU_des             = hypre_ParILUDataMatUMatrixDescription(ilu_data);
-         //void                    *ilu_solve_buffer    = hypre_ParILUDataILUSolveBuffer(ilu_data);//device memory
-         //cusparseSolvePolicy_t   ilu_solve_policy     = hypre_ParILUDataILUSolvePolicy(ilu_data);
+         /* L solve */
+         hypre_CSRMatrixTriLowerUpperSolveDevice('L', 1, BLU, NULL, xtemp_local, ytemp_local);
 
-         //HYPRE_Int               isDoublePrecision    = sizeof(HYPRE_Complex) == sizeof(hypre_double);
-         //HYPRE_Int               isSinglePrecision    = sizeof(HYPRE_Complex) == sizeof(hypre_double) / 2;
+         /* U^{-1}L^{-1} */
+         /* U solve */
+         hypre_CSRMatrixTriLowerUpperSolveDevice('U', 0, BLU, NULL, ytemp_local, xtemp_local);
 
-         //hypre_assert(isDoublePrecision || isSinglePrecision);
+         /* -EU^{-1}L^{-1} */
+         hypre_CSRMatrixMatvec(-alpha, EiU, xtemp_upper, beta, y_local);
 
-         hypre_CSRMatrix         *EiU                 = hypre_ParILUDataMatEDevice(ilu_data);
-         hypre_CSRMatrix         *iLF                 = hypre_ParILUDataMatFDevice(ilu_data);
-         hypre_CSRMatrix         *C                   = hypre_ParILUDataMatSILUDevice(ilu_data);
+         /* I*lower-EU^{-1}L^{-1}*upper */
+         hypre_SeqVectorAxpy(alpha, xtemp_lower, y_local);
 
-         //HYPRE_Int               n                    = hypre_CSRMatrixNumRows(hypre_ParCSRMatrixDiag(Aperm));
-         HYPRE_Int               nLU                  = hypre_CSRMatrixNumRows(C);
-         //HYPRE_Int               m                    = n - nLU;
+         hypre_SeqVectorDestroy(xtemp_upper);
+         hypre_SeqVectorDestroy(ytemp_upper);
+         hypre_SeqVectorDestroy(xtemp_lower);
+         break;
 
-         hypre_ParVector         *x_vec               = (hypre_ParVector *) x;
-         hypre_Vector            *x_local             = hypre_ParVectorLocalVector(x_vec);
-         //HYPRE_Real              *x_data              = hypre_VectorData(x_local);
-         hypre_ParVector         *y_vec               = (hypre_ParVector *) y;
-         hypre_Vector            *y_local             = hypre_ParVectorLocalVector(y_vec);
-         //HYPRE_Real              *y_data              = hypre_VectorData(y_local);
-         hypre_ParVector         *xtemp               = hypre_ParILUDataUTemp(ilu_data);
-         hypre_Vector            *xtemp_local         = hypre_ParVectorLocalVector(xtemp);
-         HYPRE_Real              *xtemp_data          = hypre_VectorData(xtemp_local);
+      case 2:
+         /* S = C - EU^{-1} * L^{-1}F */
+         nLU                               = hypre_CSRMatrixNumRows(C);
+         xtemp_upper                       = hypre_SeqVectorCreate(nLU);
+         hypre_VectorOwnsData(xtemp_upper) = 0;
+         hypre_VectorData(xtemp_upper)     = xtemp_data;
 
-         hypre_Vector *xtemp_upper           = hypre_SeqVectorCreate(nLU);
-         hypre_VectorOwnsData(xtemp_upper)   = 0;
-         hypre_VectorData(xtemp_upper)       = xtemp_data;
          hypre_SeqVectorInitialize(xtemp_upper);
 
-         HYPRE_Real zero = 0.0;
-         HYPRE_Real one = 1.0;
-         HYPRE_Real mone = -1.0;
-
          /* first step, compute EB^{-1}F*x put in y */
          /* -L^{-1}Fx */
-         hypre_CSRMatrixMatvec(mone, iLF, x_local, zero, xtemp_upper);
+         hypre_CSRMatrixMatvec(-1.0, iLF, x_local, 0.0, xtemp_upper);
+
          /* - alpha EU^{-1}L^{-1}Fx + beta * y */
-         hypre_CSRMatrixMatvec( alpha, EiU, xtemp_upper, beta, y_local);
-         /* alpha * C - alpha EU^{-1}L^{-1}Fx + beta y */
-         hypre_CSRMatrixMatvec( alpha, C, x_local, one, y_local);
+         hypre_CSRMatrixMatvec(alpha, EiU, xtemp_upper, beta, y_local);
 
-         /* over */
+         /* alpha * C - alpha EU^{-1}L^{-1}Fx + beta y */
+         hypre_CSRMatrixMatvec(alpha, C, x_local, 1.0, y_local);
          hypre_SeqVectorDestroy(xtemp_upper);
-      }
-      break;
+         break;
+
       case 3:
-      {
          /* S = C - EU^{-1} * L^{-1}F */
-
-         //hypre_ParCSRMatrix      *Aperm               = hypre_ParILUDataAperm(ilu_data);
-
-         cusparseHandle_t        handle               = hypre_HandleCusparseHandle(hypre_handle());
-         cusparseMatDescr_t      matL_des             = hypre_ParILUDataMatLMatrixDescription(ilu_data);
-         cusparseMatDescr_t      matU_des             = hypre_ParILUDataMatUMatrixDescription(ilu_data);
-         void                    *ilu_solve_buffer    = hypre_ParILUDataILUSolveBuffer(ilu_data);//device memory
-         cusparseSolvePolicy_t   ilu_solve_policy     = hypre_ParILUDataILUSolvePolicy(ilu_data);
-
-         HYPRE_Int               isDoublePrecision    = sizeof(HYPRE_Complex) == sizeof(hypre_double);
-         HYPRE_Int               isSinglePrecision    = sizeof(HYPRE_Complex) == sizeof(hypre_double) / 2;
-
-         hypre_assert(isDoublePrecision || isSinglePrecision);
-
-         hypre_CSRMatrix         *EiU                 = hypre_ParILUDataMatEDevice(ilu_data);
-         hypre_CSRMatrix         *iLF                 = hypre_ParILUDataMatFDevice(ilu_data);
-         hypre_CSRMatrix         *C                   = hypre_ParILUDataMatSILUDevice(ilu_data);
-         hypre_CSRMatrix         *BLU                 = hypre_ParILUDataMatBILUDevice(ilu_data);
-         HYPRE_Int               *BLU_i               = hypre_CSRMatrixI(BLU);
-         HYPRE_Int               *BLU_j               = hypre_CSRMatrixJ(BLU);
-         HYPRE_Real              *BLU_data            = hypre_CSRMatrixData(BLU);
-         HYPRE_Int               BLU_nnz              = hypre_CSRMatrixNumNonzeros(BLU);
-
-         csrsv2Info_t            matBL_info           = hypre_ParILUDataMatBLILUSolveInfo(ilu_data);
-         csrsv2Info_t            matBU_info           = hypre_ParILUDataMatBUILUSolveInfo(ilu_data);
-
-         //HYPRE_Int               n                    = hypre_CSRMatrixNumRows(hypre_ParCSRMatrixDiag(Aperm));
-         HYPRE_Int               nLU                  = hypre_CSRMatrixNumRows(C);
-         //HYPRE_Int               m                    = n - nLU;
-
-         hypre_ParVector         *x_vec               = (hypre_ParVector *) x;
-         hypre_Vector            *x_local             = hypre_ParVectorLocalVector(x_vec);
-         //HYPRE_Real              *x_data              = hypre_VectorData(x_local);
-         hypre_ParVector         *y_vec               = (hypre_ParVector *) y;
-         hypre_Vector            *y_local             = hypre_ParVectorLocalVector(y_vec);
-         //HYPRE_Real              *y_data              = hypre_VectorData(y_local);
-         hypre_ParVector         *xtemp               = hypre_ParILUDataUTemp(ilu_data);
-         hypre_Vector            *xtemp_local         = hypre_ParVectorLocalVector(xtemp);
-         HYPRE_Real              *xtemp_data          = hypre_VectorData(xtemp_local);
-         hypre_ParVector         *ytemp               = hypre_ParILUDataYTemp(ilu_data);
-         hypre_Vector            *ytemp_local         = hypre_ParVectorLocalVector(ytemp);
-         HYPRE_Real              *ytemp_data          = hypre_VectorData(ytemp_local);
-
-         hypre_Vector *xtemp_upper           = hypre_SeqVectorCreate(nLU);
-         hypre_VectorOwnsData(xtemp_upper)   = 0;
-         hypre_VectorData(xtemp_upper)       = xtemp_data;
+         nLU                               = hypre_CSRMatrixNumRows(C);
+         xtemp_upper                       = hypre_SeqVectorCreate(nLU);
+         hypre_VectorOwnsData(xtemp_upper) = 0;
+         hypre_VectorData(xtemp_upper)     = xtemp_data;
          hypre_SeqVectorInitialize(xtemp_upper);
 
-         HYPRE_Real zero = 0.0;
-         HYPRE_Real one = 1.0;
-         HYPRE_Real mone = -1.0;
-
          /* first step, compute EB^{-1}F*x put in y */
          /* -Fx */
-         hypre_CSRMatrixMatvec(mone, iLF, x_local, zero, xtemp_upper);
+         hypre_CSRMatrixMatvec(-1.0, iLF, x_local, 0.0, xtemp_upper);
+
          /* -L^{-1}Fx */
-         if(isDoublePrecision)
-         {
-            /* L solve */
-            HYPRE_CUSPARSE_CALL(cusparseDcsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                      nLU, BLU_nnz, (hypre_double *) &one, matL_des,
-                                                      (hypre_double *) BLU_data, BLU_i, BLU_j, matBL_info,
-                                                      (hypre_double *) xtemp_data, (hypre_double *) ytemp_data, ilu_solve_policy, ilu_solve_buffer));
-         }
-         else if(isSinglePrecision)
-         {
-            /* L solve */
-            HYPRE_CUSPARSE_CALL(cusparseScsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                      nLU, BLU_nnz, (float *) &one, matL_des,
-                                                      (float *) BLU_data, BLU_i, BLU_j, matBL_info,
-                                                      (float *) xtemp_data, (float *) ytemp_data, ilu_solve_policy, ilu_solve_buffer));
-         }
+         /* L solve */
+         hypre_CSRMatrixTriLowerUpperSolveDevice('L', 1, BLU, NULL, xtemp_local, ytemp_local);
+
          /* -U^{-1}L^{-1}Fx */
-         if(isDoublePrecision)
-         {
-            /* U solve */
-            HYPRE_CUSPARSE_CALL(cusparseDcsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                      nLU, BLU_nnz, (hypre_double *) &one, matU_des,
-                                                      (hypre_double *) BLU_data, BLU_i, BLU_j, matBU_info,
-                                                      (hypre_double *) ytemp_data, (hypre_double *) xtemp_data, ilu_solve_policy, ilu_solve_buffer));
-         }
-         else if(isSinglePrecision)
-         {
-            /* U solve */
-            HYPRE_CUSPARSE_CALL(cusparseScsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                      nLU, BLU_nnz, (float *) &one, matU_des,
-                                                      (float *) BLU_data, BLU_i, BLU_j, matBU_info,
-                                                      (float *) ytemp_data, (float *) xtemp_data, ilu_solve_policy, ilu_solve_buffer));
-         }
+         /* U solve */
+         hypre_CSRMatrixTriLowerUpperSolveDevice('U', 0, BLU, NULL, ytemp_local, xtemp_local);
+
          /* - alpha EU^{-1}L^{-1}Fx + beta * y */
-         hypre_CSRMatrixMatvec( alpha, EiU, xtemp_upper, beta, y_local);
-         /* alpha * C - alpha EU^{-1}L^{-1}Fx + beta y */
-         hypre_CSRMatrixMatvec( alpha, C, x_local, one, y_local);
+         hypre_CSRMatrixMatvec(alpha, EiU, xtemp_upper, beta, y_local);
 
-         /* over */
+         /* alpha * C - alpha EU^{-1}L^{-1}Fx + beta y */
+         hypre_CSRMatrixMatvec(alpha, C, x_local, 1.0, y_local);
          hypre_SeqVectorDestroy(xtemp_upper);
-      }
-      break;
-      case 0: default:
-      {
+         break;
+
+   case 0: default:
          /* S = R * A * P */
+         nLU                               = hypre_CSRMatrixNumRows(BLU);
+         m                                 = n - nLU;
+         xtemp_upper                       = hypre_SeqVectorCreate(nLU);
+         ytemp_upper                       = hypre_SeqVectorCreate(nLU);
+         ytemp_lower                       = hypre_SeqVectorCreate(m);
+         hypre_VectorOwnsData(xtemp_upper) = 0;
+         hypre_VectorOwnsData(ytemp_upper) = 0;
+         hypre_VectorOwnsData(ytemp_lower) = 0;
+         hypre_VectorData(xtemp_upper)     = xtemp_data;
+         hypre_VectorData(ytemp_upper)     = ytemp_data;
+         hypre_VectorData(ytemp_lower)     = ytemp_data + nLU;
 
-         hypre_ParCSRMatrix      *Aperm               = hypre_ParILUDataAperm(ilu_data);
-
-         cusparseHandle_t        handle               = hypre_HandleCusparseHandle(hypre_handle());
-         cusparseMatDescr_t      matL_des             = hypre_ParILUDataMatLMatrixDescription(ilu_data);
-         cusparseMatDescr_t      matU_des             = hypre_ParILUDataMatUMatrixDescription(ilu_data);
-         void                    *ilu_solve_buffer    = hypre_ParILUDataILUSolveBuffer(ilu_data);//device memory
-         cusparseSolvePolicy_t   ilu_solve_policy     = hypre_ParILUDataILUSolvePolicy(ilu_data);
-
-         HYPRE_Int               isDoublePrecision    = sizeof(HYPRE_Complex) == sizeof(hypre_double);
-         HYPRE_Int               isSinglePrecision    = sizeof(HYPRE_Complex) == sizeof(hypre_double) / 2;
-
-         hypre_assert(isDoublePrecision || isSinglePrecision);
-
-         hypre_CSRMatrix         *EiU                 = hypre_ParILUDataMatEDevice(ilu_data);
-         hypre_CSRMatrix         *iLF                 = hypre_ParILUDataMatFDevice(ilu_data);
-         hypre_CSRMatrix         *BLU                 = hypre_ParILUDataMatBILUDevice(ilu_data);
-         HYPRE_Int               *BLU_i               = hypre_CSRMatrixI(BLU);
-         HYPRE_Int               *BLU_j               = hypre_CSRMatrixJ(BLU);
-         HYPRE_Real              *BLU_data            = hypre_CSRMatrixData(BLU);
-         HYPRE_Int               BLU_nnz              = hypre_CSRMatrixNumNonzeros(BLU);
-
-         csrsv2Info_t            matBL_info           = hypre_ParILUDataMatBLILUSolveInfo(ilu_data);
-         csrsv2Info_t            matBU_info           = hypre_ParILUDataMatBUILUSolveInfo(ilu_data);
-
-         HYPRE_Int               n                    = hypre_CSRMatrixNumRows(hypre_ParCSRMatrixDiag(Aperm));
-         HYPRE_Int               nLU                  = hypre_CSRMatrixNumRows(BLU);
-         HYPRE_Int               m                    = n - nLU;
-
-         hypre_ParVector         *x_vec               = (hypre_ParVector *) x;
-         hypre_Vector            *x_local             = hypre_ParVectorLocalVector(x_vec);
-         HYPRE_Real              *x_data              = hypre_VectorData(x_local);
-         hypre_ParVector         *y_vec               = (hypre_ParVector *) y;
-         hypre_Vector            *y_local             = hypre_ParVectorLocalVector(y_vec);
-         //HYPRE_Real              *y_data              = hypre_VectorData(y_local);
-         hypre_ParVector         *xtemp               = hypre_ParILUDataUTemp(ilu_data);
-         hypre_Vector            *xtemp_local         = hypre_ParVectorLocalVector(xtemp);
-         HYPRE_Real              *xtemp_data          = hypre_VectorData(xtemp_local);
-         hypre_ParVector         *ytemp               = hypre_ParILUDataYTemp(ilu_data);
-         hypre_Vector            *ytemp_local         = hypre_ParVectorLocalVector(ytemp);
-         HYPRE_Real              *ytemp_data          = hypre_VectorData(ytemp_local);
-
-         hypre_Vector *xtemp_upper           = hypre_SeqVectorCreate(nLU);
-         hypre_Vector *ytemp_upper           = hypre_SeqVectorCreate(nLU);
-         hypre_Vector *ytemp_lower           = hypre_SeqVectorCreate(m);
-         hypre_VectorOwnsData(xtemp_upper)   = 0;
-         hypre_VectorOwnsData(ytemp_upper)   = 0;
-         hypre_VectorOwnsData(ytemp_lower)   = 0;
-         hypre_VectorData(xtemp_upper)       = xtemp_data;
-         hypre_VectorData(ytemp_upper)       = ytemp_data;
-         hypre_VectorData(ytemp_lower)       = ytemp_data+nLU;
          hypre_SeqVectorInitialize(xtemp_upper);
          hypre_SeqVectorInitialize(ytemp_upper);
          hypre_SeqVectorInitialize(ytemp_lower);
 
-         HYPRE_Real zero = 0.0;
-         HYPRE_Real one = 1.0;
-         HYPRE_Real mone = -1.0;
-
          /* first step, compute P*x put in y */
          /* -L^{-1}Fx */
-         hypre_CSRMatrixMatvec(mone, iLF, x_local, zero, xtemp_upper);
+         hypre_CSRMatrixMatvec(-1.0, iLF, x_local, 0.0, xtemp_upper);
 
          /* -U{-1}L^{-1}Fx */
-         if(nLU > 0)
-         {
-            if(isDoublePrecision)
-            {
-               /* U solve */
-               HYPRE_CUSPARSE_CALL(cusparseDcsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                         nLU, BLU_nnz, (hypre_double *) &one, matU_des,
-                                                         (hypre_double *) BLU_data, BLU_i, BLU_j, matBU_info,
-                                                         (hypre_double *) xtemp_data, (hypre_double *) ytemp_data, ilu_solve_policy, ilu_solve_buffer));
-            }
-            else if(isSinglePrecision)
-            {
-               /* U solve */
-               HYPRE_CUSPARSE_CALL(cusparseScsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                         nLU, BLU_nnz, (float *) &one, matU_des,
-                                                         (float *) BLU_data, BLU_i, BLU_j, matBU_info,
-                                                         (float *) xtemp_data, (float *) ytemp_data, ilu_solve_policy, ilu_solve_buffer));
-            }
-         }
+         /* U solve */
+         hypre_CSRMatrixTriLowerUpperSolveDevice('U', 0, BLU, NULL, xtemp_local, ytemp_local);
+
          /* now copy data to y_lower */
-         hypre_TMemcpy( ytemp_data + nLU, x_data, HYPRE_Real, m, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+         hypre_TMemcpy(ytemp_data + nLU, x_data, HYPRE_Real, m,
+                       HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
 
          /* second step, compute A*P*x store in xtemp */
-         hypre_ParCSRMatrixMatvec( one, Aperm, ytemp, zero, xtemp);
+         hypre_ParCSRMatrixMatvec(1.0, Aperm, ytemp, 0.0, xtemp);
 
          /* third step, compute R*A*P*x */
          /* copy partial data in */
-         hypre_TMemcpy( ytemp_data+nLU, xtemp_data + nLU, HYPRE_Real, m, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+         hypre_TMemcpy(ytemp_data + nLU, xtemp_data + nLU, HYPRE_Real, m,
+                       HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
 
          /* solve L^{-1} */
-         if(nLU > 0)
-         {
-            if(isDoublePrecision)
-            {
-               /* L solve */
-               HYPRE_CUSPARSE_CALL(cusparseDcsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                         nLU, BLU_nnz, (hypre_double *) &one, matL_des,
-                                                         (hypre_double *) BLU_data, BLU_i, BLU_j, matBL_info,
-                                                         (hypre_double *) xtemp_data, (hypre_double *) ytemp_data, ilu_solve_policy, ilu_solve_buffer));
-            }
-            else if(isSinglePrecision)
-            {
-               /* L solve */
-               HYPRE_CUSPARSE_CALL(cusparseScsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                         nLU, BLU_nnz, (float *) &one, matL_des,
-                                                         (float *) BLU_data, BLU_i, BLU_j, matBL_info,
-                                                         (float *) xtemp_data, (float *) ytemp_data, ilu_solve_policy, ilu_solve_buffer));
-            }
-         }
+         /* L solve */
+         hypre_CSRMatrixTriLowerUpperSolveDevice('L', 1, BLU, NULL, xtemp_local, ytemp_local);
+
          /* -EU^{-1}L^{-1} */
-         hypre_CSRMatrixMatvec(mone * alpha, EiU, ytemp_upper, beta, y_local);
+         hypre_CSRMatrixMatvec(-alpha, EiU, ytemp_upper, beta, y_local);
          hypre_SeqVectorAxpy(alpha, ytemp_lower, y_local);
 
          /* over */
          hypre_SeqVectorDestroy(xtemp_upper);
          hypre_SeqVectorDestroy(ytemp_upper);
          hypre_SeqVectorDestroy(ytemp_lower);
-      }
-      break;
-   }
+         break;
+   } /* switch (test_opt) */
 
    return hypre_error_flag;
 }
 
-/*--------------------------------------------------------------------------
- * hypre_ParILUCusparseSchurGMRESMatvecDestroy
- *--------------------------------------------------------------------------*/
-
-HYPRE_Int
-hypre_ParILURAPSchurGMRESMatvecDestroy( void *matvec_data )
-{
-   return 0;
-}
-
-#else
-
-HYPRE_Int
-hypre_ParILURAPSchurGMRESDummySetupH(void *a, void *b, void *c, void *d)
-{
-   /* Null GMRES setup, does nothing */
-   return 0;
-}
+#endif /* if defined(HYPRE_USING_GPU) */
 
 /*--------------------------------------------------------------------------
- * hypre_ParILUCusparseSchurGMRESDummySolve
+ * hypre_ParILURAPSchurGMRESSolveHost
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_ParILURAPSchurGMRESSolveH( void               *ilu_vdata,
-                  void               *ilu_vdata2,
-                  hypre_ParVector    *f,
-                  hypre_ParVector    *u )
+hypre_ParILURAPSchurGMRESSolveHost( void               *ilu_vdata,
+                                    void               *ilu_vdata2,
+                                    hypre_ParVector    *f,
+                                    hypre_ParVector    *u )
 {
-   /* Unit GMRES preconditioner, just copy data from one slot to another */
-   hypre_ParILUData        *ilu_data            = (hypre_ParILUData*) ilu_vdata;
-
-   HYPRE_Int               i, j, k1, k2, col;
-
-   hypre_ParCSRMatrix      *L                   = hypre_ParILUDataMatLModified(ilu_data);
-   hypre_CSRMatrix         *L_diag              = hypre_ParCSRMatrixDiag(L);
-   HYPRE_Int               *L_diag_i            = hypre_CSRMatrixI(L_diag);
-   HYPRE_Int               *L_diag_j            = hypre_CSRMatrixJ(L_diag);
-   HYPRE_Real              *L_diag_data         = hypre_CSRMatrixData(L_diag);
-   HYPRE_Real              *D                   = hypre_ParILUDataMatDModified(ilu_data);
-   hypre_ParCSRMatrix      *U                   = hypre_ParILUDataMatUModified(ilu_data);
-   hypre_CSRMatrix         *U_diag              = hypre_ParCSRMatrixDiag(U);
-   HYPRE_Int               *U_diag_i            = hypre_CSRMatrixI(U_diag);
-   HYPRE_Int               *U_diag_j            = hypre_CSRMatrixJ(U_diag);
-   HYPRE_Real              *U_diag_data         = hypre_CSRMatrixData(U_diag);
-
-   HYPRE_Int               n                    = hypre_CSRMatrixNumRows(hypre_ParCSRMatrixDiag(L));
-   HYPRE_Int               nLU                  = hypre_ParILUDataNLU(ilu_data);
-   HYPRE_Int               m                    = n - nLU;
-
-   hypre_Vector            *f_local             = hypre_ParVectorLocalVector(f);
-   HYPRE_Real              *f_data              = hypre_VectorData(f_local);
-   hypre_Vector            *u_local             = hypre_ParVectorLocalVector(u);
-   HYPRE_Real              *u_data              = hypre_VectorData(u_local);
-
-   hypre_ParVector         *utemp               = hypre_ParILUDataUTemp(ilu_data);
-   hypre_Vector            *utemp_local         = hypre_ParVectorLocalVector(utemp);
-   HYPRE_Real              *utemp_data          = hypre_VectorData(utemp_local);
-
-   HYPRE_Int               *u_end               = hypre_ParILUDataUEnd(ilu_data);
+   HYPRE_UNUSED_VAR(ilu_vdata2);
+
+   hypre_ParILUData        *ilu_data     = (hypre_ParILUData*) ilu_vdata;
+   hypre_ParCSRMatrix      *L            = hypre_ParILUDataMatLModified(ilu_data);
+   hypre_CSRMatrix         *L_diag       = hypre_ParCSRMatrixDiag(L);
+   HYPRE_Int               *L_diag_i     = hypre_CSRMatrixI(L_diag);
+   HYPRE_Int               *L_diag_j     = hypre_CSRMatrixJ(L_diag);
+   HYPRE_Real              *L_diag_data  = hypre_CSRMatrixData(L_diag);
+
+   HYPRE_Real              *D            = hypre_ParILUDataMatDModified(ilu_data);
+
+   hypre_ParCSRMatrix      *U            = hypre_ParILUDataMatUModified(ilu_data);
+   hypre_CSRMatrix         *U_diag       = hypre_ParCSRMatrixDiag(U);
+   HYPRE_Int               *U_diag_i     = hypre_CSRMatrixI(U_diag);
+   HYPRE_Int               *U_diag_j     = hypre_CSRMatrixJ(U_diag);
+   HYPRE_Real              *U_diag_data  = hypre_CSRMatrixData(U_diag);
+
+   HYPRE_Int               n             = hypre_CSRMatrixNumRows(L_diag);
+   HYPRE_Int               nLU           = hypre_ParILUDataNLU(ilu_data);
+   HYPRE_Int               m             = n - nLU;
+
+   hypre_Vector            *f_local      = hypre_ParVectorLocalVector(f);
+   HYPRE_Real              *f_data       = hypre_VectorData(f_local);
+   hypre_Vector            *u_local      = hypre_ParVectorLocalVector(u);
+   HYPRE_Real              *u_data       = hypre_VectorData(u_local);
+   hypre_ParVector         *utemp        = hypre_ParILUDataUTemp(ilu_data);
+   hypre_Vector            *utemp_local  = hypre_ParVectorLocalVector(utemp);
+   HYPRE_Real              *utemp_data   = hypre_VectorData(utemp_local);
+   HYPRE_Int               *u_end        = hypre_ParILUDataUEnd(ilu_data);
+
+   HYPRE_Int                i, j, k1, k2, col;
 
    /* permuted L solve */
-   for(i = 0 ; i < m ; i ++)
+   for (i = 0 ; i < m ; i ++)
    {
       utemp_data[i] = f_data[i];
-      k1 = u_end[i+nLU] ; k2 = L_diag_i[i+nLU+1];
-      for(j = k1 ; j < k2 ; j ++)
+      k1 = u_end[i + nLU] ; k2 = L_diag_i[i + nLU + 1];
+      for (j = k1 ; j < k2 ; j ++)
       {
          col = L_diag_j[j];
-         utemp_data[i] -= L_diag_data[j] * utemp_data[col-nLU];
+         utemp_data[i] -= L_diag_data[j] * utemp_data[col - nLU];
       }
    }
 
    /* U solve */
-   for(i = m-1 ; i >= 0 ; i --)
+   for (i = m - 1 ; i >= 0 ; i --)
    {
       u_data[i] = utemp_data[i];
-      k1 = U_diag_i[i+nLU] ; k2 = U_diag_i[i+1+nLU];
-      for(j = k1 ; j < k2 ; j ++)
+      k1 = U_diag_i[i + nLU] ; k2 = U_diag_i[i + 1 + nLU];
+      for (j = k1 ; j < k2 ; j ++)
       {
          col = U_diag_j[j];
-         u_data[i] -= U_diag_data[j] * u_data[col-nLU];
+         u_data[i] -= U_diag_data[j] * u_data[col - nLU];
       }
       u_data[i] *= D[i];
    }
 
-
    return hypre_error_flag;
 }
 
 /*--------------------------------------------------------------------------
- * hypre_ParILUCusparseSchurGMRESCommInfo
+ * hypre_ParILURAPSchurGMRESCommInfoHost
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_ParILURAPSchurGMRESCommInfoH( void *ilu_vdata, HYPRE_Int *my_id, HYPRE_Int *num_procs)
+hypre_ParILURAPSchurGMRESCommInfoHost(void      *ilu_vdata,
+                                      HYPRE_Int *my_id,
+                                      HYPRE_Int *num_procs)
 {
    /* get comm info from ilu_data */
-   hypre_ParILUData *ilu_data = (hypre_ParILUData*) ilu_vdata;
-   hypre_ParCSRMatrix *A = hypre_ParILUDataMatA(ilu_data);
-   MPI_Comm comm = hypre_ParCSRMatrixComm ( A );
-   hypre_MPI_Comm_size(comm,num_procs);
-   hypre_MPI_Comm_rank(comm,my_id);
-   return 0;
-}
+   hypre_ParILUData    *ilu_data = (hypre_ParILUData*) ilu_vdata;
+   hypre_ParCSRMatrix  *A        = hypre_ParILUDataMatA(ilu_data);
+   MPI_Comm             comm     = hypre_ParCSRMatrixComm(A);
 
-/*--------------------------------------------------------------------------
- * hypre_ParILUCusparseSchurGMRESMatvecCreate
- *--------------------------------------------------------------------------*/
+   hypre_MPI_Comm_size(comm, num_procs);
+   hypre_MPI_Comm_rank(comm, my_id);
 
-void *
-hypre_ParILURAPSchurGMRESMatvecCreateH( void   *ilu_vdata,
-                             void   *x )
-{
-   /* Null matvec create */
-   void *matvec_data;
-   matvec_data = NULL;
-   return ( matvec_data );
+   return hypre_error_flag;
 }
 
 /*--------------------------------------------------------------------------
- * hypre_ParILUCusparseSchurGMRESMatvec
+ * hypre_ParILURAPSchurGMRESMatvecHost
+ *
+ * Compute y = alpha * S * x + beta * y
+ *
+ * TODO (VPM): Unify this function with hypre_ParILURAPSchurGMRESMatvecDevice
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_ParILURAPSchurGMRESMatvecH( void   *matvec_data,
-                       HYPRE_Complex  alpha,
-                       void   *ilu_vdata,
-                       void   *x,
-                       HYPRE_Complex  beta,
-                       void   *y           )
+hypre_ParILURAPSchurGMRESMatvecHost( void          *matvec_data,
+                                     HYPRE_Complex  alpha,
+                                     void          *ilu_vdata,
+                                     void          *x,
+                                     HYPRE_Complex  beta,
+                                     void          *y )
 {
-   /* Compute y = alpha * S * x + beta * y
-    * */
-   HYPRE_Int               i, j, k1, k2, col;
-   HYPRE_Real              one = 1.0;
-   HYPRE_Real              zero = 0.0;
+   HYPRE_UNUSED_VAR(matvec_data);
 
    /* get matrix information first */
    hypre_ParILUData        *ilu_data            = (hypre_ParILUData*) ilu_vdata;
@@ -3665,17 +3435,21 @@ hypre_ParILURAPSchurGMRESMatvecH( void   *matvec_data,
    hypre_Vector            *y_local             = hypre_ParVectorLocalVector(y_vec);
    HYPRE_Real              *y_data              = hypre_VectorData(y_local);
 
-   hypre_ParVector   *utemp       = hypre_ParILUDataUTemp(ilu_data);
-   hypre_Vector      *utemp_local = hypre_ParVectorLocalVector(utemp);
-   HYPRE_Real        *utemp_data  = hypre_VectorData(utemp_local);
+   hypre_ParVector         *utemp               = hypre_ParILUDataUTemp(ilu_data);
+   hypre_Vector            *utemp_local         = hypre_ParVectorLocalVector(utemp);
+   HYPRE_Real              *utemp_data          = hypre_VectorData(utemp_local);
+
+   hypre_ParVector         *ftemp               = hypre_ParILUDataFTemp(ilu_data);
+   hypre_Vector            *ftemp_local         = hypre_ParVectorLocalVector(ftemp);
+   HYPRE_Real              *ftemp_data          = hypre_VectorData(ftemp_local);
 
-   hypre_ParVector   *ftemp       = hypre_ParILUDataFTemp(ilu_data);
-   hypre_Vector      *ftemp_local = hypre_ParVectorLocalVector(ftemp);
-   HYPRE_Real        *ftemp_data  = hypre_VectorData(ftemp_local);
+   hypre_ParVector         *ytemp               = hypre_ParILUDataYTemp(ilu_data);
+   hypre_Vector            *ytemp_local         = hypre_ParVectorLocalVector(ytemp);
+   HYPRE_Real              *ytemp_data          = hypre_VectorData(ytemp_local);
 
-   hypre_ParVector   *ytemp       = hypre_ParILUDataYTemp(ilu_data);
-   hypre_Vector      *ytemp_local = hypre_ParVectorLocalVector(ytemp);
-   HYPRE_Real        *ytemp_data  = hypre_VectorData(ytemp_local);
+   HYPRE_Int               i, j, k1, k2, col;
+   HYPRE_Real              one  = 1.0;
+   HYPRE_Real              zero = 0.0;
 
    /* S = R * A * P */
    /* matvec */
@@ -3684,22 +3458,22 @@ hypre_ParILURAPSchurGMRESMatvecH( void   *matvec_data,
     *     [  I          ]
     */
    /* matvec */
-   for(i = 0 ; i < nLU ; i ++)
+   for (i = 0 ; i < nLU ; i ++)
    {
       ytemp_data[i] = 0.0;
-      k1 = u_end[i] ; k2 = mU_diag_i[i+1];
-      for(j = k1 ; j < k2 ; j ++)
+      k1 = u_end[i] ; k2 = mU_diag_i[i + 1];
+      for (j = k1 ; j < k2 ; j ++)
       {
          col = mU_diag_j[j];
-         ytemp_data[i] -= alpha * mU_diag_data[j] * x_data[col-nLU];
+         ytemp_data[i] -= alpha * mU_diag_data[j] * x_data[col - nLU];
       }
    }
    /* U solve */
-   for(i = nLU-1 ; i >= 0 ; i --)
+   for (i = nLU - 1 ; i >= 0 ; i --)
    {
       ftemp_data[perm[i]] = ytemp_data[i];
       k1 = mU_diag_i[i] ; k2 = u_end[i];
-      for(j = k1 ; j < k2 ; j ++)
+      for (j = k1 ; j < k2 ; j ++)
       {
          col = mU_diag_j[j];
          ftemp_data[perm[i]] -= mU_diag_data[j] * ftemp_data[perm[col]];
@@ -3708,9 +3482,9 @@ hypre_ParILURAPSchurGMRESMatvecH( void   *matvec_data,
    }
 
    /* update with I */
-   for(i = nLU ; i < n ; i ++)
+   for (i = nLU ; i < n ; i ++)
    {
-      ftemp_data[perm[i]] = alpha * x_data[i-nLU];
+      ftemp_data[perm[i]] = alpha * x_data[i - nLU];
    }
 
    /* apply alpha*A*P*x */
@@ -3719,11 +3493,11 @@ hypre_ParILURAPSchurGMRESMatvecH( void   *matvec_data,
    // R = [-L21 L\inv, I]
 
    /* first is L solve */
-   for(i = 0 ; i < nLU ; i ++)
+   for (i = 0 ; i < nLU ; i ++)
    {
       ytemp_data[i] = utemp_data[perm[i]];
-      k1 = mL_diag_i[i] ; k2 = mL_diag_i[i+1];
-      for(j = k1 ; j < k2 ; j ++)
+      k1 = mL_diag_i[i] ; k2 = mL_diag_i[i + 1];
+      for (j = k1 ; j < k2 ; j ++)
       {
          col = mL_diag_j[j];
          ytemp_data[i] -= mL_diag_data[j] * ytemp_data[col];
@@ -3731,11 +3505,11 @@ hypre_ParILURAPSchurGMRESMatvecH( void   *matvec_data,
    }
 
    /* apply -W * utemp on this, and take care of the I part */
-   for(i = nLU ; i < n ; i ++)
+   for (i = nLU ; i < n ; i ++)
    {
       y_data[i - nLU] = beta * y_data[i - nLU] + utemp_data[perm[i]];
       k1 = mL_diag_i[i] ; k2 = u_end[i];
-      for(j = k1 ; j < k2 ; j ++)
+      for (j = k1 ; j < k2 ; j ++)
       {
          col = mL_diag_j[j];
          y_data[i - nLU] -= mL_diag_data[j] * ytemp_data[col];
@@ -3745,23 +3519,19 @@ hypre_ParILURAPSchurGMRESMatvecH( void   *matvec_data,
    return hypre_error_flag;
 }
 
+/******************************************************************************
+ *
+ * NSH create and solve and help functions.
+ *
+ * TODO (VPM): Move NSH code to separate files?
+ *****************************************************************************/
+
 /*--------------------------------------------------------------------------
- * hypre_ParILUCusparseSchurGMRESMatvecDestroy
+ * hypre_NSHCreate
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int
-hypre_ParILURAPSchurGMRESMatvecDestroyH( void *matvec_data )
-{
-   return 0;
-}
-
-#endif
-
-/* NSH create and solve and help functions */
-
-/* Create */
 void *
-hypre_NSHCreate()
+hypre_NSHCreate( void )
 {
    hypre_ParNSHData  *nsh_data;
 
@@ -3783,7 +3553,7 @@ hypre_NSHCreate()
    hypre_ParNSHDataMaxIter(nsh_data)               = 5;
 
    hypre_ParNSHDataOperatorComplexity(nsh_data)    = 0.0;
-   hypre_ParNSHDataDroptol(nsh_data)               = hypre_TAlloc(HYPRE_Real,2,HYPRE_MEMORY_HOST);
+   hypre_ParNSHDataDroptol(nsh_data)               = hypre_TAlloc(HYPRE_Real, 2, HYPRE_MEMORY_HOST);
    hypre_ParNSHDataOwnDroptolData(nsh_data)        = 1;
    hypre_ParNSHDataDroptol(nsh_data)[0]            = 1.0e-02;/* droptol for MR */
    hypre_ParNSHDataDroptol(nsh_data)[1]            = 1.0e-02;/* droptol for NSH */
@@ -3804,59 +3574,44 @@ hypre_NSHCreate()
    return (void *) nsh_data;
 }
 
-/* Destroy */
+/*--------------------------------------------------------------------------
+ * hypre_NSHDestroy
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_NSHDestroy( void *data )
 {
    hypre_ParNSHData * nsh_data = (hypre_ParNSHData*) data;
 
    /* residual */
-   if(hypre_ParNSHDataResidual(nsh_data))
-   {
-      hypre_ParVectorDestroy( hypre_ParNSHDataResidual(nsh_data) );
-      hypre_ParNSHDataResidual(nsh_data) = NULL;
-   }
+   hypre_ParVectorDestroy( hypre_ParNSHDataResidual(nsh_data) );
+   hypre_ParNSHDataResidual(nsh_data) = NULL;
 
    /* residual norms */
-   if(hypre_ParNSHDataRelResNorms(nsh_data))
-   {
-      hypre_TFree( hypre_ParNSHDataRelResNorms(nsh_data), HYPRE_MEMORY_HOST );
-      hypre_ParNSHDataRelResNorms(nsh_data) = NULL;
-   }
+   hypre_TFree( hypre_ParNSHDataRelResNorms(nsh_data), HYPRE_MEMORY_HOST );
+   hypre_ParNSHDataRelResNorms(nsh_data) = NULL;
 
    /* l1 norms */
-   if(hypre_ParNSHDataL1Norms(nsh_data))
-   {
-      hypre_TFree( hypre_ParNSHDataL1Norms(nsh_data), HYPRE_MEMORY_HOST );
-      hypre_ParNSHDataL1Norms(nsh_data) = NULL;
-   }
+   hypre_TFree( hypre_ParNSHDataL1Norms(nsh_data), HYPRE_MEMORY_HOST );
+   hypre_ParNSHDataL1Norms(nsh_data) = NULL;
 
    /* temp arrays */
-   if(hypre_ParNSHDataUTemp(nsh_data))
-   {
-      hypre_ParVectorDestroy( hypre_ParNSHDataUTemp(nsh_data) );
-      hypre_ParNSHDataUTemp(nsh_data) = NULL;
-   }
-   if(hypre_ParNSHDataFTemp(nsh_data))
-   {
-      hypre_ParVectorDestroy( hypre_ParNSHDataFTemp(nsh_data) );
-      hypre_ParNSHDataFTemp(nsh_data) = NULL;
-   }
+   hypre_ParVectorDestroy( hypre_ParNSHDataUTemp(nsh_data) );
+   hypre_ParVectorDestroy( hypre_ParNSHDataFTemp(nsh_data) );
+   hypre_ParNSHDataUTemp(nsh_data) = NULL;
+   hypre_ParNSHDataFTemp(nsh_data) = NULL;
 
    /* approx inverse matrix */
-   if(hypre_ParNSHDataMatM(nsh_data))
-   {
-      hypre_ParCSRMatrixDestroy( hypre_ParNSHDataMatM(nsh_data) );
-      hypre_ParNSHDataMatM(nsh_data) = NULL;
-   }
+   hypre_ParCSRMatrixDestroy( hypre_ParNSHDataMatM(nsh_data) );
+   hypre_ParNSHDataMatM(nsh_data) = NULL;
 
    /* droptol array */
-  if(hypre_ParNSHDataOwnDroptolData(nsh_data))
-  {
-     hypre_TFree(hypre_ParNSHDataDroptol(nsh_data), HYPRE_MEMORY_HOST);
-     hypre_ParNSHDataOwnDroptolData(nsh_data) = 0;
-     hypre_ParNSHDataDroptol(nsh_data) = NULL;
-  }
+   if (hypre_ParNSHDataOwnDroptolData(nsh_data))
+   {
+      hypre_TFree(hypre_ParNSHDataDroptol(nsh_data), HYPRE_MEMORY_HOST);
+      hypre_ParNSHDataOwnDroptolData(nsh_data) = 0;
+      hypre_ParNSHDataDroptol(nsh_data) = NULL;
+   }
 
    /* nsh data */
    hypre_TFree(nsh_data, HYPRE_MEMORY_HOST);
@@ -3864,27 +3619,36 @@ hypre_NSHDestroy( void *data )
    return hypre_error_flag;
 }
 
-/* Print solver params */
+/*--------------------------------------------------------------------------
+ * hypre_NSHWriteSolverParams
+ *
+ * Print solver params
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_NSHWriteSolverParams(void *nsh_vdata)
+hypre_NSHWriteSolverParams( void *nsh_vdata )
 {
    hypre_ParNSHData  *nsh_data = (hypre_ParNSHData*) nsh_vdata;
-   hypre_printf("Newton–Schulz–Hotelling Setup parameters: \n");
+   hypre_printf("Newton-Schulz-Hotelling Setup parameters: \n");
    hypre_printf("NSH max iterations = %d \n", hypre_ParNSHDataNSHMaxIter(nsh_data));
    hypre_printf("NSH drop tolerance = %e \n", hypre_ParNSHDataDroptol(nsh_data)[1]);
    hypre_printf("NSH max nnz per row = %d \n", hypre_ParNSHDataNSHMaxRowNnz(nsh_data));
    hypre_printf("MR max iterations = %d \n", hypre_ParNSHDataMRMaxIter(nsh_data));
    hypre_printf("MR drop tolerance = %e \n", hypre_ParNSHDataDroptol(nsh_data)[0]);
    hypre_printf("MR max nnz per row = %d \n", hypre_ParNSHDataMRMaxRowNnz(nsh_data));
-   hypre_printf("Operator Complexity (Fill factor) = %f \n", hypre_ParNSHDataOperatorComplexity(nsh_data));
-   hypre_printf("\n Newton–Schulz–Hotelling Solver Parameters: \n");
+   hypre_printf("Operator Complexity (Fill factor) = %f \n",
+                hypre_ParNSHDataOperatorComplexity(nsh_data));
+   hypre_printf("\n Newton-Schulz-Hotelling Solver Parameters: \n");
    hypre_printf("Max number of iterations: %d\n", hypre_ParNSHDataMaxIter(nsh_data));
    hypre_printf("Stopping tolerance: %e\n", hypre_ParNSHDataTol(nsh_data));
 
    return hypre_error_flag;
 }
 
-/* set print level */
+/*--------------------------------------------------------------------------
+ * hypre_NSHSetPrintLevel
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_NSHSetPrintLevel( void *nsh_vdata, HYPRE_Int print_level )
 {
@@ -3892,7 +3656,11 @@ hypre_NSHSetPrintLevel( void *nsh_vdata, HYPRE_Int print_level )
    hypre_ParNSHDataPrintLevel(nsh_data) = print_level;
    return hypre_error_flag;
 }
-/* set logging level */
+
+/*--------------------------------------------------------------------------
+ * hypre_NSHSetLogging
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_NSHSetLogging( void *nsh_vdata, HYPRE_Int logging )
 {
@@ -3900,7 +3668,11 @@ hypre_NSHSetLogging( void *nsh_vdata, HYPRE_Int logging )
    hypre_ParNSHDataLogging(nsh_data) = logging;
    return hypre_error_flag;
 }
-/* set max iteration */
+
+/*--------------------------------------------------------------------------
+ * hypre_NSHSetMaxIter
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_NSHSetMaxIter( void *nsh_vdata, HYPRE_Int max_iter )
 {
@@ -3908,7 +3680,11 @@ hypre_NSHSetMaxIter( void *nsh_vdata, HYPRE_Int max_iter )
    hypre_ParNSHDataMaxIter(nsh_data) = max_iter;
    return hypre_error_flag;
 }
-/* set solver iteration tol */
+
+/*--------------------------------------------------------------------------
+ * hypre_NSHSetTol
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_NSHSetTol( void *nsh_vdata, HYPRE_Real tol )
 {
@@ -3916,7 +3692,11 @@ hypre_NSHSetTol( void *nsh_vdata, HYPRE_Real tol )
    hypre_ParNSHDataTol(nsh_data) = tol;
    return hypre_error_flag;
 }
-/* set global solver */
+
+/*--------------------------------------------------------------------------
+ * hypre_NSHSetGlobalSolver
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_NSHSetGlobalSolver( void *nsh_vdata, HYPRE_Int global_solver )
 {
@@ -3924,7 +3704,11 @@ hypre_NSHSetGlobalSolver( void *nsh_vdata, HYPRE_Int global_solver )
    hypre_ParNSHDataGlobalSolver(nsh_data) = global_solver;
    return hypre_error_flag;
 }
-/* set all droptols */
+
+/*--------------------------------------------------------------------------
+ * hypre_NSHSetDropThreshold
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_NSHSetDropThreshold( void *nsh_vdata, HYPRE_Real droptol )
 {
@@ -3933,20 +3717,28 @@ hypre_NSHSetDropThreshold( void *nsh_vdata, HYPRE_Real droptol )
    hypre_ParNSHDataDroptol(nsh_data)[1] = droptol;
    return hypre_error_flag;
 }
-/* set array of droptols */
+
+/*--------------------------------------------------------------------------
+ * hypre_NSHSetDropThresholdArray
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_NSHSetDropThresholdArray( void *nsh_vdata, HYPRE_Real *droptol )
 {
    hypre_ParNSHData   *nsh_data = (hypre_ParNSHData*) nsh_vdata;
-   if(hypre_ParNSHDataOwnDroptolData(nsh_data))
+   if (hypre_ParNSHDataOwnDroptolData(nsh_data))
    {
-      hypre_TFree(hypre_ParNSHDataDroptol(nsh_data),HYPRE_MEMORY_HOST);
+      hypre_TFree(hypre_ParNSHDataDroptol(nsh_data), HYPRE_MEMORY_HOST);
       hypre_ParNSHDataOwnDroptolData(nsh_data) = 0;
    }
    hypre_ParNSHDataDroptol(nsh_data) = droptol;
    return hypre_error_flag;
 }
-/* set MR max iter */
+
+/*--------------------------------------------------------------------------
+ * hypre_NSHSetMRMaxIter
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_NSHSetMRMaxIter( void *nsh_vdata, HYPRE_Int mr_max_iter )
 {
@@ -3954,7 +3746,11 @@ hypre_NSHSetMRMaxIter( void *nsh_vdata, HYPRE_Int mr_max_iter )
    hypre_ParNSHDataMRMaxIter(nsh_data) = mr_max_iter;
    return hypre_error_flag;
 }
-/* set MR tol */
+
+/*--------------------------------------------------------------------------
+ * hypre_NSHSetMRTol
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_NSHSetMRTol( void *nsh_vdata, HYPRE_Real mr_tol )
 {
@@ -3962,7 +3758,11 @@ hypre_NSHSetMRTol( void *nsh_vdata, HYPRE_Real mr_tol )
    hypre_ParNSHDataMRTol(nsh_data) = mr_tol;
    return hypre_error_flag;
 }
-/* set MR max nonzeros of a row */
+
+/*--------------------------------------------------------------------------
+ * hypre_NSHSetMRMaxRowNnz
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_NSHSetMRMaxRowNnz( void *nsh_vdata, HYPRE_Int mr_max_row_nnz )
 {
@@ -3970,7 +3770,13 @@ hypre_NSHSetMRMaxRowNnz( void *nsh_vdata, HYPRE_Int mr_max_row_nnz )
    hypre_ParNSHDataMRMaxRowNnz(nsh_data) = mr_max_row_nnz;
    return hypre_error_flag;
 }
-/* set MR version, column version or global version */
+
+/*--------------------------------------------------------------------------
+ * hypre_NSHSetColVersion
+ *
+ * set MR version, column version or global version
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_NSHSetColVersion( void *nsh_vdata, HYPRE_Int mr_col_version )
 {
@@ -3978,7 +3784,11 @@ hypre_NSHSetColVersion( void *nsh_vdata, HYPRE_Int mr_col_version )
    hypre_ParNSHDataMRColVersion(nsh_data) = mr_col_version;
    return hypre_error_flag;
 }
-/* set NSH max iter */
+
+/*--------------------------------------------------------------------------
+ * hypre_NSHSetNSHMaxIter
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_NSHSetNSHMaxIter( void *nsh_vdata, HYPRE_Int nsh_max_iter )
 {
@@ -3986,7 +3796,11 @@ hypre_NSHSetNSHMaxIter( void *nsh_vdata, HYPRE_Int nsh_max_iter )
    hypre_ParNSHDataNSHMaxIter(nsh_data) = nsh_max_iter;
    return hypre_error_flag;
 }
-/* set NSH tol */
+
+/*--------------------------------------------------------------------------
+ * hypre_NSHSetNSHTol
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_NSHSetNSHTol( void *nsh_vdata, HYPRE_Real nsh_tol )
 {
@@ -3994,7 +3808,13 @@ hypre_NSHSetNSHTol( void *nsh_vdata, HYPRE_Real nsh_tol )
    hypre_ParNSHDataNSHTol(nsh_data) = nsh_tol;
    return hypre_error_flag;
 }
-/* set NSH max nonzeros of a row */
+
+/*--------------------------------------------------------------------------
+ * hypre_NSHSetNSHMaxRowNnz
+ *
+ * Set NSH max nonzeros of a row
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_NSHSetNSHMaxRowNnz( void *nsh_vdata, HYPRE_Int nsh_max_row_nnz )
 {
@@ -4003,32 +3823,44 @@ hypre_NSHSetNSHMaxRowNnz( void *nsh_vdata, HYPRE_Int nsh_max_row_nnz )
    return hypre_error_flag;
 }
 
-
-/* Compute the F norm of CSR matrix
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixNormFro
+ *
+ * Compute the F norm of CSR matrix
  * A: the target CSR matrix
  * norm_io: output
- */
+ *
+ * TODO (VPM): Move this function to seq_mv
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_CSRMatrixNormFro(hypre_CSRMatrix *A, HYPRE_Real *norm_io)
 {
    HYPRE_Real norm = 0.0;
    HYPRE_Real *data = hypre_CSRMatrixData(A);
-   HYPRE_Int i,k;
+   HYPRE_Int i, k;
    k = hypre_CSRMatrixNumNonzeros(A);
+
    /* main loop */
-   for(i = 0 ; i < k ; i ++)
+   for (i = 0 ; i < k ; i ++)
    {
       norm += data[i] * data[i];
    }
-   *norm_io = sqrt(norm);
-   return hypre_error_flag;
+   *norm_io = hypre_sqrt(norm);
 
+   return hypre_error_flag;
 }
 
-/* Compute the norm of I-A where I is identity matrix and A is a CSR matrix
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixResNormFro
+ *
+ * Compute the norm of I-A where I is identity matrix and A is a CSR matrix
  * A: the target CSR matrix
  * norm_io: the output
- */
+ *
+ * TODO (VPM): Move this function to seq_mv
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_CSRMatrixResNormFro(hypre_CSRMatrix *A, HYPRE_Real *norm_io)
 {
@@ -4040,14 +3872,14 @@ hypre_CSRMatrixResNormFro(hypre_CSRMatrix *A, HYPRE_Real *norm_io)
 
    n = hypre_CSRMatrixNumRows(A);
    /* main loop to sum up data */
-   for(i = 0 ; i < n ; i ++)
+   for (i = 0 ; i < n ; i ++)
    {
       k1 = idx[i];
-      k2 = idx[i+1];
+      k2 = idx[i + 1];
       /* check if we have diagonal in A */
-      if(k2 > k1)
+      if (k2 > k1)
       {
-         if(cols[k1] == i)
+         if (cols[k1] == i)
          {
             /* reduce 1 on diagonal */
             value = data[k1] - 1.0;
@@ -4066,18 +3898,25 @@ hypre_CSRMatrixResNormFro(hypre_CSRMatrix *A, HYPRE_Real *norm_io)
          norm += 1.0;
       }
       /* and the rest of the code */
-      for(j = k1 + 1 ; j < k2 ; j ++)
+      for (j = k1 + 1 ; j < k2 ; j ++)
       {
          norm += data[j] * data[j];
       }
    }
-   *norm_io = sqrt(norm);
+   *norm_io = hypre_sqrt(norm);
    return hypre_error_flag;
 }
 
-/* Compute the F norm of ParCSR matrix
+
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixNormFro
+ *
+ * Compute the F norm of ParCSR matrix
  * A: the target CSR matrix
- */
+ *
+ * TODO (VPM): Move this function to parcsr_mv
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_ParCSRMatrixNormFro(hypre_ParCSRMatrix *A, HYPRE_Real *norm_io)
 {
@@ -4094,20 +3933,26 @@ hypre_ParCSRMatrixNormFro(hypre_ParCSRMatrix *A, HYPRE_Real *norm_io)
 
    /* square and sum them */
    local_norm *= local_norm;
-   local_norm += global_norm*global_norm;
+   local_norm += global_norm * global_norm;
 
    /* do communication to get global total sum */
    hypre_MPI_Allreduce(&local_norm, &global_norm, 1, HYPRE_MPI_REAL, hypre_MPI_SUM, comm);
 
-   *norm_io = sqrt(global_norm);
-   return hypre_error_flag;
+   *norm_io = hypre_sqrt(global_norm);
 
+   return hypre_error_flag;
 }
 
-/* Compute the F norm of ParCSR matrix
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixResNormFro
+ *
+ * Compute the F norm of ParCSR matrix
  * Norm of I-A
  * A: the target CSR matrix
- */
+ *
+ * TODO (VPM): Move this function to parcsr_mv
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_ParCSRMatrixResNormFro(hypre_ParCSRMatrix *A, HYPRE_Real *norm_io)
 {
@@ -4120,25 +3965,31 @@ hypre_ParCSRMatrixResNormFro(hypre_ParCSRMatrix *A, HYPRE_Real *norm_io)
 
    /* compute I-A for diagonal */
    hypre_CSRMatrixResNormFro(A_diag, &local_norm);
+
    /* use global_norm to store offd for now */
    hypre_CSRMatrixNormFro(A_offd, &global_norm);
 
    /* square and sum them */
    local_norm *= local_norm;
-   local_norm += global_norm*global_norm;
+   local_norm += global_norm * global_norm;
 
    /* do communication to get global total sum */
    hypre_MPI_Allreduce(&local_norm, &global_norm, 1, HYPRE_MPI_REAL, hypre_MPI_SUM, comm);
 
-   *norm_io = sqrt(global_norm);
+   *norm_io = hypre_sqrt(global_norm);
    return hypre_error_flag;
-
 }
 
-/* Compute the trace of CSR matrix
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixTrace
+ *
+ * Compute the trace of CSR matrix
  * A: the target CSR matrix
  * trace_io: the output trace
- */
+ *
+ * TODO (VPM): Move this function to seq_mv
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_CSRMatrixTrace(hypre_CSRMatrix *A, HYPRE_Real *trace_io)
 {
@@ -4146,13 +3997,14 @@ hypre_CSRMatrixTrace(hypre_CSRMatrix *A, HYPRE_Real *trace_io)
    HYPRE_Int   *idx = hypre_CSRMatrixI(A);
    HYPRE_Int   *cols = hypre_CSRMatrixJ(A);
    HYPRE_Real  *data = hypre_CSRMatrixData(A);
-   HYPRE_Int i,k1,k2,n;
+   HYPRE_Int i, k1, k2, n;
+
    n = hypre_CSRMatrixNumRows(A);
-   for(i = 0 ; i < n ; i ++)
+   for (i = 0 ; i < n ; i ++)
    {
       k1 = idx[i];
-      k2 = idx[i+1];
-      if(cols[k1] == i && k2 > k1)
+      k2 = idx[i + 1];
+      if (cols[k1] == i && k2 > k1)
       {
          /* only add when diagonal is nonzero */
          trace += data[k1];
@@ -4160,16 +4012,22 @@ hypre_CSRMatrixTrace(hypre_CSRMatrix *A, HYPRE_Real *trace_io)
    }
 
    *trace_io = trace;
-   return hypre_error_flag;
 
+   return hypre_error_flag;
 }
 
-/* Apply dropping to CSR matrix
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixDropInplace
+ *
+ * Apply dropping to CSR matrix
  * A: the target CSR matrix
  * droptol: all entries have smaller absolute value than this will be dropped
  * max_row_nnz: max nonzeros allowed for each row, only largest max_row_nnz kept
  * we NEVER drop diagonal entry if exists
- */
+ *
+ * TODO (VPM): Move this function to seq_mv
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_CSRMatrixDropInplace(hypre_CSRMatrix *A, HYPRE_Real droptol, HYPRE_Int max_row_nnz)
 {
@@ -4184,6 +4042,7 @@ hypre_CSRMatrixDropInplace(hypre_CSRMatrix *A, HYPRE_Real droptol, HYPRE_Int max
    HYPRE_Int      *A_j = hypre_CSRMatrixJ(A);
    HYPRE_Real     *A_data = hypre_CSRMatrixData(A);
    HYPRE_Real     nnzA = hypre_CSRMatrixNumNonzeros(A);
+   HYPRE_MemoryLocation memory_location = hypre_CSRMatrixMemoryLocation(A);
 
    /* new data */
    HYPRE_Int      *new_i;
@@ -4195,43 +4054,43 @@ hypre_CSRMatrixDropInplace(hypre_CSRMatrix *A, HYPRE_Real droptol, HYPRE_Int max
    HYPRE_Int      ctrA;
 
    /* setup */
-   capacity = nnzA*0.3+1;
+   capacity = (HYPRE_Int)(nnzA * 0.3 + 1);
    ctrA = 0;
-   new_i = hypre_TAlloc(HYPRE_Int, n+1, HYPRE_MEMORY_DEVICE);
-   new_j = hypre_TAlloc(HYPRE_Int, capacity, HYPRE_MEMORY_DEVICE);
-   new_data = hypre_TAlloc(HYPRE_Real, capacity, HYPRE_MEMORY_DEVICE);
+   new_i = hypre_TAlloc(HYPRE_Int, n + 1, memory_location);
+   new_j = hypre_TAlloc(HYPRE_Int, capacity, memory_location);
+   new_data = hypre_TAlloc(HYPRE_Real, capacity, memory_location);
 
-   idx = hypre_TAlloc(HYPRE_Int, m, HYPRE_MEMORY_DEVICE);
-   data = hypre_TAlloc(HYPRE_Real, m, HYPRE_MEMORY_DEVICE);
+   idx = hypre_TAlloc(HYPRE_Int, m, memory_location);
+   data = hypre_TAlloc(HYPRE_Real, m, memory_location);
 
    /* start of main loop */
    new_i[0] = 0;
-   for(i = 0 ; i < n ; i ++)
+   for (i = 0 ; i < n ; i ++)
    {
       len = 0;
       k1 = A_i[i];
-      k2 = A_i[i+1];
+      k2 = A_i[i + 1];
       /* compute droptol for current row */
       norm = 0.0;
-      for(j = k1 ; j < k2 ; j ++)
+      for (j = k1 ; j < k2 ; j ++)
       {
          norm += hypre_abs(A_data[j]);
       }
-      if(k2 > k1)
+      if (k2 > k1)
       {
          norm /= (HYPRE_Real)(k2 - k1);
       }
       itol = droptol * norm;
       /* we don't want to drop the diagonal entry, so use an if statement here */
-      if(A_j[k1] == i)
+      if (A_j[k1] == i)
       {
          /* we have diagonal entry, skip it */
          idx[len] = A_j[k1];
          data[len++] = A_data[k1];
-         for(j = k1 + 1 ; j < k2 ; j ++)
+         for (j = k1 + 1 ; j < k2 ; j ++)
          {
             value = A_data[j];
-            if(hypre_abs(value) < itol)
+            if (hypre_abs(value) < itol)
             {
                /* skip small element */
                continue;
@@ -4241,10 +4100,10 @@ hypre_CSRMatrixDropInplace(hypre_CSRMatrix *A, HYPRE_Real droptol, HYPRE_Int max
          }
 
          /* now apply drop on length */
-         if(len > max_row_nnz)
+         if (len > max_row_nnz)
          {
             drop_len = max_row_nnz;
-            hypre_ILUMaxQSplitRabsI( data + 1, idx + 1, 0, drop_len - 1 , len - 2);
+            hypre_ILUMaxQSplitRabsI( data + 1, idx + 1, 0, drop_len - 1, len - 2);
          }
          else
          {
@@ -4252,25 +4111,28 @@ hypre_CSRMatrixDropInplace(hypre_CSRMatrix *A, HYPRE_Real droptol, HYPRE_Int max
             drop_len = len;
          }
          /* copy data */
-         while(ctrA + drop_len > capacity)
+         while (ctrA + drop_len > capacity)
          {
             HYPRE_Int tmp = capacity;
-            capacity = capacity * EXPAND_FACT + 1;
-            new_j = hypre_TReAlloc_v2(new_j, HYPRE_Int, tmp, HYPRE_Int, capacity, HYPRE_MEMORY_DEVICE);
-            new_data = hypre_TReAlloc_v2(new_data, HYPRE_Real, tmp, HYPRE_Real, capacity, HYPRE_MEMORY_DEVICE);
+            capacity = (HYPRE_Int)(capacity * EXPAND_FACT + 1);
+            new_j = hypre_TReAlloc_v2(new_j, HYPRE_Int, tmp,
+                                      HYPRE_Int, capacity, memory_location);
+            new_data = hypre_TReAlloc_v2(new_data, HYPRE_Real, tmp,
+                                         HYPRE_Real, capacity, memory_location);
          }
-         hypre_TMemcpy( new_j + ctrA, idx,HYPRE_Int, drop_len, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
-         hypre_TMemcpy( new_data + ctrA, data,HYPRE_Real, drop_len, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+         hypre_TMemcpy(new_j + ctrA, idx, HYPRE_Int, drop_len, memory_location, memory_location);
+         hypre_TMemcpy(new_data + ctrA, data, HYPRE_Real, drop_len, memory_location,
+                       memory_location);
          ctrA += drop_len;
-         new_i[i+1] = ctrA;
+         new_i[i + 1] = ctrA;
       }
       else
       {
          /* we don't have diagonal entry */
-         for(j = k1 ; j < k2 ; j ++)
+         for (j = k1 ; j < k2 ; j ++)
          {
             value = A_data[j];
-            if(hypre_abs(value)<itol)
+            if (hypre_abs(value) < itol)
             {
                /* skip small element */
                continue;
@@ -4280,7 +4142,7 @@ hypre_CSRMatrixDropInplace(hypre_CSRMatrix *A, HYPRE_Real droptol, HYPRE_Int max
          }
 
          /* now apply drop on length */
-         if(len > max_row_nnz)
+         if (len > max_row_nnz)
          {
             drop_len = max_row_nnz;
             hypre_ILUMaxQSplitRabsI( data, idx, 0, drop_len, len - 1);
@@ -4292,25 +4154,28 @@ hypre_CSRMatrixDropInplace(hypre_CSRMatrix *A, HYPRE_Real droptol, HYPRE_Int max
          }
 
          /* copy data */
-         while(ctrA + drop_len > capacity)
+         while (ctrA + drop_len > capacity)
          {
             HYPRE_Int tmp = capacity;
-            capacity = capacity * EXPAND_FACT + 1;
-            new_j = hypre_TReAlloc_v2(new_j, HYPRE_Int, tmp, HYPRE_Int, capacity, HYPRE_MEMORY_DEVICE);
-            new_data = hypre_TReAlloc_v2(new_data, HYPRE_Real, tmp, HYPRE_Real, capacity, HYPRE_MEMORY_DEVICE);
+            capacity = (HYPRE_Int)(capacity * EXPAND_FACT + 1);
+            new_j = hypre_TReAlloc_v2(new_j, HYPRE_Int, tmp,
+                                      HYPRE_Int, capacity, memory_location);
+            new_data = hypre_TReAlloc_v2(new_data, HYPRE_Real, tmp,
+                                         HYPRE_Real, capacity, memory_location);
          }
-         hypre_TMemcpy( new_j + ctrA, idx,HYPRE_Int, drop_len, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
-         hypre_TMemcpy( new_data + ctrA, data,HYPRE_Real, drop_len, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+         hypre_TMemcpy(new_j + ctrA, idx, HYPRE_Int, drop_len, memory_location, memory_location);
+         hypre_TMemcpy(new_data + ctrA, data, HYPRE_Real, drop_len, memory_location,
+                       memory_location);
          ctrA += drop_len;
-         new_i[i+1] = ctrA;
+         new_i[i + 1] = ctrA;
       }
    }/* end of main loop */
    /* destory data if A own them */
-   if(hypre_CSRMatrixOwnsData(A))
+   if (hypre_CSRMatrixOwnsData(A))
    {
-      hypre_TFree(A_i, HYPRE_MEMORY_DEVICE);
-      hypre_TFree(A_j, HYPRE_MEMORY_DEVICE);
-      hypre_TFree(A_data, HYPRE_MEMORY_DEVICE);
+      hypre_TFree(A_i, memory_location);
+      hypre_TFree(A_j, memory_location);
+      hypre_TFree(A_data, memory_location);
    }
 
    hypre_CSRMatrixI(A) = new_i;
@@ -4319,13 +4184,16 @@ hypre_CSRMatrixDropInplace(hypre_CSRMatrix *A, HYPRE_Real droptol, HYPRE_Int max
    hypre_CSRMatrixNumNonzeros(A) = ctrA;
    hypre_CSRMatrixOwnsData(A) = 1;
 
-   hypre_TFree(idx, HYPRE_MEMORY_DEVICE);
-   hypre_TFree(data, HYPRE_MEMORY_DEVICE);
+   hypre_TFree(idx, memory_location);
+   hypre_TFree(data, memory_location);
 
    return hypre_error_flag;
 }
 
-/* Compute the inverse with MR of original CSR matrix
+/*--------------------------------------------------------------------------
+ * hypre_ILUCSRMatrixInverseSelfPrecondMRGlobal
+ *
+ * Compute the inverse with MR of original CSR matrix
  * Global(not by each column) and out place version
  * A: the input matrix
  * M: the output matrix
@@ -4335,23 +4203,27 @@ hypre_CSRMatrixDropInplace(hypre_CSRMatrix *A, HYPRE_Real droptol, HYPRE_Int max
  * max_row_nnz: max number of nonzeros per row
  * max_iter: max number of iterations
  * print_level: the print level of this algorithm
- */
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_ILUCSRMatrixInverseSelfPrecondMRGlobal(hypre_CSRMatrix *matA, hypre_CSRMatrix **M, HYPRE_Real droptol,
-                                               HYPRE_Real tol, HYPRE_Real eps_tol, HYPRE_Int max_row_nnz, HYPRE_Int max_iter,
-                                               HYPRE_Int print_level )
+hypre_ILUCSRMatrixInverseSelfPrecondMRGlobal(hypre_CSRMatrix  *matA,
+                                             hypre_CSRMatrix **M,
+                                             HYPRE_Real        droptol,
+                                             HYPRE_Real        tol,
+                                             HYPRE_Real        eps_tol,
+                                             HYPRE_Int         max_row_nnz,
+                                             HYPRE_Int         max_iter,
+                                             HYPRE_Int         print_level)
 {
-   HYPRE_Int         i, k1, k2;
-   HYPRE_Real        value, trace1, trace2, alpha, r_norm;
-
-   /* martix A */
+   /* matrix A */
    HYPRE_Int         *A_i = hypre_CSRMatrixI(matA);
    HYPRE_Int         *A_j = hypre_CSRMatrixJ(matA);
    HYPRE_Real        *A_data = hypre_CSRMatrixData(matA);
+   HYPRE_MemoryLocation memory_location = hypre_CSRMatrixMemoryLocation(matA);
 
    /* complexity */
    HYPRE_Real        nnzA = hypre_CSRMatrixNumNonzeros(matA);
-   HYPRE_Real        nnzM;
+   HYPRE_Real        nnzM = 1.0;
 
    /* inverse matrix */
    hypre_CSRMatrix   *inM = *M;
@@ -4373,40 +4245,42 @@ hypre_ILUCSRMatrixInverseSelfPrecondMRGlobal(hypre_CSRMatrix *matA, hypre_CSRMat
    hypre_CSRMatrix   *matC;
    hypre_CSRMatrix   *matW;
 
-   HYPRE_Real        time_s, time_e;
+   HYPRE_Real        time_s = 0.0, time_e;
+   HYPRE_Int         i, k1, k2;
+   HYPRE_Real        value, trace1, trace2, alpha, r_norm = 0.0;
 
    HYPRE_Int         n = hypre_CSRMatrixNumRows(matA);
 
    /* create initial guess and matrix I */
-   matM = hypre_CSRMatrixCreate(n,n,n);
-   M_i = hypre_TAlloc(HYPRE_Int, n+1, HYPRE_MEMORY_DEVICE);
-   M_j = hypre_TAlloc(HYPRE_Int, n, HYPRE_MEMORY_DEVICE);
-   M_data = hypre_TAlloc(HYPRE_Real, n, HYPRE_MEMORY_DEVICE);
+   matM = hypre_CSRMatrixCreate(n, n, n);
+   M_i = hypre_TAlloc(HYPRE_Int, n + 1, memory_location);
+   M_j = hypre_TAlloc(HYPRE_Int, n, memory_location);
+   M_data = hypre_TAlloc(HYPRE_Real, n, memory_location);
 
-   matI = hypre_CSRMatrixCreate(n,n,n);
-   I_i = hypre_TAlloc(HYPRE_Int, n+1, HYPRE_MEMORY_DEVICE);
-   I_j = hypre_TAlloc(HYPRE_Int, n, HYPRE_MEMORY_DEVICE);
-   I_data = hypre_TAlloc(HYPRE_Real, n, HYPRE_MEMORY_DEVICE);
+   matI = hypre_CSRMatrixCreate(n, n, n);
+   I_i = hypre_TAlloc(HYPRE_Int, n + 1, memory_location);
+   I_j = hypre_TAlloc(HYPRE_Int, n, memory_location);
+   I_data = hypre_TAlloc(HYPRE_Real, n, memory_location);
 
    /* now loop to create initial guess */
    M_i[0] = 0;
    I_i[0] = 0;
-   for(i = 0 ; i < n ; i ++)
+   for (i = 0 ; i < n ; i ++)
    {
-      M_i[i+1] = i+1;
+      M_i[i + 1] = i + 1;
       M_j[i] = i;
       k1 = A_i[i];
-      k2 = A_i[i+1];
-      if(k2 > k1)
+      k2 = A_i[i + 1];
+      if (k2 > k1)
       {
-         if(A_j[k1] == i)
+         if (A_j[k1] == i)
          {
             value = A_data[k1];
-            if(hypre_abs(value) < MAT_TOL)
+            if (hypre_abs(value) < MAT_TOL)
             {
                value = 1.0;
             }
-            M_data[i] = 1.0/value;
+            M_data[i] = 1.0 / value;
          }
          else
          {
@@ -4417,7 +4291,7 @@ hypre_ILUCSRMatrixInverseSelfPrecondMRGlobal(hypre_CSRMatrix *matA, hypre_CSRMat
       {
          M_data[i] = 1.0;
       }
-      I_i[i+1] = i+1;
+      I_i[i + 1] = i + 1;
       I_j[i] = i;
       I_data[i] = 1.0;
    }
@@ -4433,18 +4307,18 @@ hypre_ILUCSRMatrixInverseSelfPrecondMRGlobal(hypre_CSRMatrix *matA, hypre_CSRMat
    hypre_CSRMatrixOwnsData(matI) = 1;
 
    /* now start the main loop */
-   if(print_level > 1)
+   if (print_level > 1)
    {
       /* time the iteration */
       time_s = hypre_MPI_Wtime();
    }
 
    /* main loop */
-   for(i = 0 ; i < max_iter ; i ++)
+   for (i = 0 ; i < max_iter ; i ++)
    {
       nnzM = hypre_CSRMatrixNumNonzeros(matM);
       /* R = I - AM */
-      matR_temp = hypre_CSRMatrixMultiply(matA,matM);
+      matR_temp = hypre_CSRMatrixMultiply(matA, matM);
 
       hypre_CSRMatrixScale(matR_temp, -1.0);
 
@@ -4453,7 +4327,7 @@ hypre_ILUCSRMatrixInverseSelfPrecondMRGlobal(hypre_CSRMatrix *matA, hypre_CSRMat
 
       /* r_norm */
       hypre_CSRMatrixNormFro(matR, &r_norm);
-      if(r_norm < tol)
+      if (r_norm < tol)
       {
          break;
       }
@@ -4467,15 +4341,15 @@ hypre_ILUCSRMatrixInverseSelfPrecondMRGlobal(hypre_CSRMatrix *matA, hypre_CSRMat
       matC = hypre_CSRMatrixMultiply(matA, matZ);
 
       /* W = R' * C */
-      hypre_CSRMatrixTranspose(matR,&matR_temp,1);
-      matW = hypre_CSRMatrixMultiply(matR_temp,matC);
+      hypre_CSRMatrixTranspose(matR, &matR_temp, 1);
+      matW = hypre_CSRMatrixMultiply(matR_temp, matC);
 
       /* trace and alpha */
       hypre_CSRMatrixTrace(matW, &trace1);
       hypre_CSRMatrixNormFro(matC, &trace2);
       trace2 *= trace2;
 
-      if(hypre_abs(trace2) < eps_tol)
+      if (hypre_abs(trace2) < eps_tol)
       {
          break;
       }
@@ -4494,32 +4368,34 @@ hypre_ILUCSRMatrixInverseSelfPrecondMRGlobal(hypre_CSRMatrix *matA, hypre_CSRMat
       hypre_CSRMatrixDestroy(matW);
       hypre_CSRMatrixDestroy(matC);
       hypre_CSRMatrixDestroy(matR_temp);
-
-   }/* end of main loop i for compute inverse matrix */
+   } /* end of main loop i for compute inverse matrix */
 
    /* time if we need to print */
-   if(print_level > 1)
+   if (print_level > 1)
    {
       time_e = hypre_MPI_Wtime();
-      if(i == 0)
+      if (i == 0)
       {
          i = 1;
       }
-      hypre_printf("matrix size %5d\nfinal norm at loop %5d is %16.12f, time per iteration is %16.12f, complexity is %16.12f out of maximum %16.12f\n",n,i,r_norm, (time_e-time_s)/i, nnzM/nnzA, n/nnzA*n);
+      hypre_printf("matrix size %5d\nfinal norm at loop %5d is %16.12f, time per iteration is %16.12f, complexity is %16.12f out of maximum %16.12f\n",
+                   n, i, r_norm, (time_e - time_s) / i, nnzM / nnzA, n / nnzA * n);
    }
 
    hypre_CSRMatrixDestroy(matI);
-   if(inM)
+   if (inM)
    {
       hypre_CSRMatrixDestroy(inM);
    }
    *M = matM;
 
    return hypre_error_flag;
-
 }
 
-/* Compute inverse with NSH method
+/*--------------------------------------------------------------------------
+ * hypre_ILUParCSRInverseNSH
+ *
+ * Compute inverse with NSH method
  * Use MR to get local initial guess
  * A: input matrix
  * M: output matrix
@@ -4532,39 +4408,49 @@ hypre_ILUCSRMatrixInverseSelfPrecondMRGlobal(hypre_CSRMatrix *matA, hypre_CSRMat
  * mr_max_iter: max number of iterations for MR
  * nsh_max_iter: max number of iterations for NSH
  * mr_col_version: column version of global version
- */
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_ILUParCSRInverseNSH(hypre_ParCSRMatrix *A, hypre_ParCSRMatrix **M, HYPRE_Real *droptol, HYPRE_Real mr_tol,
-                            HYPRE_Real nsh_tol, HYPRE_Real eps_tol, HYPRE_Int mr_max_row_nnz, HYPRE_Int nsh_max_row_nnz,
-                            HYPRE_Int mr_max_iter, HYPRE_Int nsh_max_iter, HYPRE_Int mr_col_version,
-                            HYPRE_Int print_level)
+hypre_ILUParCSRInverseNSH(hypre_ParCSRMatrix  *A,
+                          hypre_ParCSRMatrix **M,
+                          HYPRE_Real          *droptol,
+                          HYPRE_Real           mr_tol,
+                          HYPRE_Real           nsh_tol,
+                          HYPRE_Real           eps_tol,
+                          HYPRE_Int            mr_max_row_nnz,
+                          HYPRE_Int            nsh_max_row_nnz,
+                          HYPRE_Int            mr_max_iter,
+                          HYPRE_Int            nsh_max_iter,
+                          HYPRE_Int            mr_col_version,
+                          HYPRE_Int            print_level)
 {
-   HYPRE_Int               i;
+   HYPRE_UNUSED_VAR(nsh_max_row_nnz);
 
    /* data slots for matrices */
    hypre_ParCSRMatrix      *matM = NULL;
    hypre_ParCSRMatrix      *inM = *M;
-   hypre_ParCSRMatrix      *AM,*MAM;
+   hypre_ParCSRMatrix      *AM, *MAM;
    HYPRE_Real              norm, s_norm;
    MPI_Comm                comm = hypre_ParCSRMatrixComm(A);
    HYPRE_Int               myid;
-
+   HYPRE_MemoryLocation    memory_location = hypre_ParCSRMatrixMemoryLocation(A);
 
    hypre_CSRMatrix         *A_diag = hypre_ParCSRMatrixDiag(A);
    hypre_CSRMatrix         *M_diag = NULL;
    hypre_CSRMatrix         *M_offd;
    HYPRE_Int               *M_offd_i;
 
-   HYPRE_Real              time_s, time_e;
+   HYPRE_Real              time_s = 0.0, time_e;
 
    HYPRE_Int               n = hypre_CSRMatrixNumRows(A_diag);
+   HYPRE_Int               i;
 
    /* setup */
    hypre_MPI_Comm_rank(comm, &myid);
 
-   M_offd_i = hypre_CTAlloc(HYPRE_Int, n+1, HYPRE_MEMORY_DEVICE);
+   M_offd_i = hypre_CTAlloc(HYPRE_Int, n + 1, memory_location);
 
-   if(mr_col_version)
+   if (mr_col_version)
    {
       hypre_printf("Column version is not yet support, switch to global version\n");
    }
@@ -4574,17 +4460,18 @@ hypre_ILUParCSRInverseNSH(hypre_ParCSRMatrix *A, hypre_ParCSRMatrix **M, HYPRE_R
     * we want same number for MR and NSH to let user set them eaiser
     * but we don't want a too dense MR initial guess
     */
-   hypre_ILUCSRMatrixInverseSelfPrecondMRGlobal(A_diag, &M_diag, droptol[0] * 10.0, mr_tol, eps_tol, mr_max_row_nnz, mr_max_iter, print_level );
+   hypre_ILUCSRMatrixInverseSelfPrecondMRGlobal(A_diag, &M_diag, droptol[0] * 10.0, mr_tol, eps_tol,
+                                                mr_max_row_nnz, mr_max_iter, print_level );
 
    /* create parCSR matM */
    matM = hypre_ParCSRMatrixCreate( comm,
-         hypre_ParCSRMatrixGlobalNumRows(A),
-         hypre_ParCSRMatrixGlobalNumRows(A),
-         hypre_ParCSRMatrixRowStarts(A),
-         hypre_ParCSRMatrixColStarts(A),
-         0,
-         hypre_CSRMatrixNumNonzeros(M_diag),
-         0 );
+                                    hypre_ParCSRMatrixGlobalNumRows(A),
+                                    hypre_ParCSRMatrixGlobalNumRows(A),
+                                    hypre_ParCSRMatrixRowStarts(A),
+                                    hypre_ParCSRMatrixColStarts(A),
+                                    0,
+                                    hypre_CSRMatrixNumNonzeros(M_diag),
+                                    0 );
 
    hypre_CSRMatrixDestroy(hypre_ParCSRMatrixDiag(matM));
    hypre_ParCSRMatrixDiag(matM) = M_diag;
@@ -4602,21 +4489,21 @@ hypre_ILUParCSRInverseNSH(hypre_ParCSRMatrix *A, hypre_ParCSRMatrix **M, HYPRE_R
    hypre_ParCSRMatrixResNormFro(AM, &norm);
    s_norm = norm;
    hypre_ParCSRMatrixDestroy(AM);
-   if(print_level > 1)
+   if (print_level > 1)
    {
-      if(myid == 0)
+      if (myid == 0)
       {
          hypre_printf("before NSH the norm is %16.12f\n", norm);
       }
       time_s = hypre_MPI_Wtime();
    }
 
-   for(i = 0 ; i < nsh_max_iter ; i ++)
+   for (i = 0 ; i < nsh_max_iter ; i ++)
    {
       /* compute XjAXj */
       AM = hypre_ParMatmul(A, matM);
       hypre_ParCSRMatrixResNormFro(AM, &norm);
-      if(norm < nsh_tol)
+      if (norm < nsh_tol)
       {
          break;
       }
@@ -4639,30 +4526,31 @@ hypre_ILUParCSRInverseNSH(hypre_ParCSRMatrix *A, hypre_ParCSRMatrix **M, HYPRE_R
       hypre_ParCSRMatrixDestroy(MAM);
    }
 
-   if(print_level > 1)
+   if (print_level > 1)
    {
       time_e = hypre_MPI_Wtime();
       /* at this point of time, norm has to be already computed */
-      if(i == 0)
+      if (i == 0)
       {
          i = 1;
       }
-      if(myid == 0)
+      if (myid == 0)
       {
-         hypre_printf("after %5d NSH iterations the norm is %16.12f, time per iteration is %16.12f\n", i, norm, (time_e-time_s)/i);
+         hypre_printf("after %5d NSH iterations the norm is %16.12f, time per iteration is %16.12f\n", i,
+                      norm, (time_e - time_s) / i);
       }
    }
 
-   if(s_norm < norm)
+   if (s_norm < norm)
    {
       /* the residual norm increase after NSH iteration, need to let user know */
-      if(myid == 0)
+      if (myid == 0)
       {
          hypre_printf("Warning: NSH divergence, probably bad approximate invese matrix.\n");
       }
    }
 
-   if(inM)
+   if (inM)
    {
       hypre_ParCSRMatrixDestroy(inM);
    }
diff --git a/external/hypre/src/parcsr_ls/par_ilu.h b/external/hypre/src/parcsr_ls/par_ilu.h
index b72dc0bf..f4a599ca 100644
--- a/external/hypre/src/parcsr_ls/par_ilu.h
+++ b/external/hypre/src/parcsr_ls/par_ilu.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -11,38 +11,14 @@
 /*--------------------------------------------------------------------------
  * hypre_ParILUData
  *--------------------------------------------------------------------------*/
+
 typedef struct hypre_ParILUData_struct
 {
-#ifdef HYPRE_USING_CUDA
-   /* Data slots for cusparse-based ilu0 */
-   cusparseMatDescr_t      matL_des;//lower tri with ones on diagonal
-   cusparseMatDescr_t      matU_des;//upper tri
-   csrsv2Info_t            matAL_info;//ILU info for L of A block (used in A-smoothing)
-   csrsv2Info_t            matAU_info;//ILU info for U of A block
-   csrsv2Info_t            matBL_info;//ILU info for L of B block
-   csrsv2Info_t            matBU_info;//ILU info for U of B block
-   csrsv2Info_t            matSL_info;//ILU info for L of S block
-   csrsv2Info_t            matSU_info;//ILU info for U of S block
-   cusparseSolvePolicy_t   ilu_solve_policy;//Use/Don't use level
-   void                    *ilu_solve_buffer;//working array on device memory
+   /* Base solver data structure */
+   hypre_Solver          base;
 
-   /* on GPU, we have to form E and F explicitly, since we don't have much control to it
-    *
-    */
-   hypre_CSRMatrix         *matALU_d;//the matrix holding ILU of A (for A-smoothing)
-   hypre_CSRMatrix         *matBLU_d;//the matrix holding ILU of B
-   hypre_CSRMatrix         *matSLU_d;//the matrix holding ILU of S
-   hypre_CSRMatrix         *matE_d;
-   hypre_CSRMatrix         *matF_d;
-   hypre_ParCSRMatrix      *Aperm;
-   hypre_ParCSRMatrix      *R;
-   hypre_ParCSRMatrix      *P;
-   hypre_Vector            *Ftemp_upper;
-   hypre_Vector            *Utemp_lower;
-   HYPRE_Int               *A_diag_fake;//fake diagonal, used to pretend that the diagonal matrix is empty
-#endif
-   //general data
-   HYPRE_Int            global_solver;
+   /* General data */
+   HYPRE_Int             global_solver;
    hypre_ParCSRMatrix   *matA;
    hypre_ParCSRMatrix   *matL;
    HYPRE_Real           *matD;
@@ -51,105 +27,119 @@ typedef struct hypre_ParILUData_struct
    HYPRE_Real           *matmD;
    hypre_ParCSRMatrix   *matmU;
    hypre_ParCSRMatrix   *matS;
-   HYPRE_Real           *droptol;/* should be an array of 3 element, for B, (E and F), S respectively */
-   HYPRE_Int            lfil;
-   HYPRE_Int            maxRowNnz;
+   HYPRE_Real           *droptol; /* Array of 3 elements, for B, (E and F), S respectively */
+   HYPRE_Int             lfil;
+   HYPRE_Int             maxRowNnz;
    HYPRE_Int            *CF_marker_array;
    HYPRE_Int            *perm;
    HYPRE_Int            *qperm;
-   HYPRE_Real           tol_ddPQ;
+   HYPRE_Real            tol_ddPQ;
    hypre_ParVector      *F;
    hypre_ParVector      *U;
    hypre_ParVector      *residual;
    HYPRE_Real           *rel_res_norms;
-   HYPRE_Int            num_iterations;
+   HYPRE_Int             num_iterations;
    HYPRE_Real           *l1_norms;
-   HYPRE_Real           final_rel_residual_norm;
-   HYPRE_Real           tol;
-   HYPRE_Real           operator_complexity;
-
-   HYPRE_Int            logging;
-   HYPRE_Int            print_level;
-   HYPRE_Int            max_iter;
-
-   HYPRE_Int            ilu_type;
-   HYPRE_Int            nLU;
-   HYPRE_Int            nI;
-
-   /* used when schur block is formed */
-   HYPRE_Int            *u_end;
+   HYPRE_Real            final_rel_residual_norm;
+   HYPRE_Real            tol;
+   HYPRE_Real            operator_complexity;
+   HYPRE_Int             logging;
+   HYPRE_Int             print_level;
+   HYPRE_Int             max_iter;
+   HYPRE_Int             tri_solve;
+   HYPRE_Int             lower_jacobi_iters;
+   HYPRE_Int             upper_jacobi_iters;
+   HYPRE_Int             ilu_type;
+   HYPRE_Int             nLU;
+   HYPRE_Int             nI;
+   HYPRE_Int            *u_end; /* used when schur block is formed */
+
+   /* Iterative ILU parameters */
+   HYPRE_Int             iter_setup_type;
+   HYPRE_Int             iter_setup_option;
+   HYPRE_Int             setup_max_iter;
+   HYPRE_Int             setup_num_iter;
+   HYPRE_Real            setup_tolerance;
+   HYPRE_Complex        *setup_history;
 
    /* temp vectors for solve phase */
    hypre_ParVector      *Utemp;
    hypre_ParVector      *Ftemp;
    hypre_ParVector      *Xtemp;
    hypre_ParVector      *Ytemp;
+   hypre_ParVector      *Ztemp;
    HYPRE_Real           *uext;
    HYPRE_Real           *fext;
 
+   /* On GPU, we have to form E and F explicitly, since we don't have much control to it */
+#if defined(HYPRE_USING_GPU)
+   hypre_CSRMatrix      *matALU_d; /* Matrix holding ILU of A (for A-smoothing) */
+   hypre_CSRMatrix      *matBLU_d; /* Matrix holding ILU of B */
+   hypre_CSRMatrix      *matSLU_d; /* Matrix holding ILU of S */
+   hypre_CSRMatrix      *matE_d;
+   hypre_CSRMatrix      *matF_d;
+   hypre_ParCSRMatrix   *Aperm;
+   hypre_ParCSRMatrix   *R;
+   hypre_ParCSRMatrix   *P;
+   hypre_Vector         *Ftemp_upper;
+   hypre_Vector         *Utemp_lower;
+   hypre_Vector         *Adiag_diag;
+   hypre_Vector         *Sdiag_diag;
+#endif
+
    /* data structure sor solving Schur System */
-   HYPRE_Solver         schur_solver;
-   HYPRE_Solver         schur_precond;
+   HYPRE_Solver          schur_solver;
+   HYPRE_Solver          schur_precond;
    hypre_ParVector      *rhs;
    hypre_ParVector      *x;
 
-   /* schur solver data */
-
-   /* -> GENERAL-SLOTS */
-   HYPRE_Int            ss_logging;
-   HYPRE_Int            ss_print_level;
-
-   /* -> SCHUR-GMRES */
-   HYPRE_Int            ss_kDim;/* max number of iterations for GMRES */
-   HYPRE_Int            ss_max_iter;/* max number of iterations for GMRES solve */
-   HYPRE_Real           ss_tol;/* stop iteration tol for GMRES */
-   HYPRE_Real           ss_absolute_tol;/* absolute tol for GMRES or tol for NSH solve */
-   HYPRE_Int            ss_rel_change;
-
-   /* -> SCHUR-NSH */
-   HYPRE_Int            ss_nsh_setup_max_iter;/* number of iterations for NSH inverse */
-   HYPRE_Int            ss_nsh_solve_max_iter;/* max number of iterations for NSH solve */
-   HYPRE_Real           ss_nsh_setup_tol;/* stop iteration tol for NSH inverse */
-   HYPRE_Real           ss_nsh_solve_tol;/* absolute tol for NSH solve */
-   HYPRE_Int            ss_nsh_max_row_nnz;/* max rows of nonzeros for NSH */
-   HYPRE_Int            ss_nsh_mr_col_version;/* MR column version setting in NSH */
-   HYPRE_Int            ss_nsh_mr_max_row_nnz;/* max rows for MR  */
-   HYPRE_Real           *ss_nsh_droptol;/* droptol array for NSH */
-   HYPRE_Int            ss_nsh_mr_max_iter;/* max MR iteration */
-   HYPRE_Real           ss_nsh_mr_tol;
-
-   /* schur precond data */
-   HYPRE_Int            sp_ilu_type;/* ilu type is use ILU */
-   HYPRE_Int            sp_ilu_lfil;/* level of fill in for ILUK */
-   HYPRE_Int            sp_ilu_max_row_nnz;/* max rows for ILUT  */
+   /* Schur solver data */
+   HYPRE_Int             ss_logging;
+   HYPRE_Int             ss_print_level;
+
+   /* Schur-GMRES */
+   HYPRE_Int             ss_kDim;               /* max number of iterations for GMRES */
+   HYPRE_Int             ss_max_iter;           /* max number of iterations for GMRES solve */
+   HYPRE_Real            ss_tol;                /* stop iteration tol for GMRES */
+   HYPRE_Real            ss_absolute_tol;       /* absolute tol for GMRES or tol for NSH solve */
+   HYPRE_Int             ss_rel_change;
+
+   /* Schur-NSH */
+   HYPRE_Int             ss_nsh_setup_max_iter; /* number of iterations for NSH inverse */
+   HYPRE_Int             ss_nsh_solve_max_iter; /* max number of iterations for NSH solve */
+   HYPRE_Real            ss_nsh_setup_tol;      /* stop iteration tol for NSH inverse */
+   HYPRE_Real            ss_nsh_solve_tol;      /* absolute tol for NSH solve */
+   HYPRE_Int             ss_nsh_max_row_nnz;    /* max rows of nonzeros for NSH */
+   HYPRE_Int             ss_nsh_mr_col_version; /* MR column version setting in NSH */
+   HYPRE_Int             ss_nsh_mr_max_row_nnz; /* max rows for MR  */
+   HYPRE_Real           *ss_nsh_droptol;        /* droptol array for NSH */
+   HYPRE_Int             ss_nsh_mr_max_iter;    /* max MR iteration */
+   HYPRE_Real            ss_nsh_mr_tol;
+
+   /* Schur precond data */
+   HYPRE_Int             sp_ilu_type;           /* ilu type is use ILU */
+   HYPRE_Int             sp_ilu_lfil;           /* level of fill in for ILUK */
+   HYPRE_Int             sp_ilu_max_row_nnz;    /* max rows for ILUT  */
    /* droptol for ILUT or MR
     * ILUT: [0], [1], [2] B, E&F, S respectively
     * NSH: [0] for MR, [1] for NSH
     */
-   HYPRE_Real           *sp_ilu_droptol;/* droptol array for ILUT */
-   HYPRE_Int            sp_print_level;
-   HYPRE_Int            sp_max_iter;/* max precond iter or max MR iteration */
-   HYPRE_Real           sp_tol;
+   HYPRE_Real           *sp_ilu_droptol;        /* droptol array for ILUT */
+   HYPRE_Int             sp_print_level;
+   HYPRE_Int             sp_max_iter;           /* max precond iter or max MR iteration */
+   HYPRE_Int             sp_tri_solve;
+   HYPRE_Int             sp_lower_jacobi_iters;
+   HYPRE_Int             sp_upper_jacobi_iters;
+   HYPRE_Real            sp_tol;
+   HYPRE_Int             test_opt; /* TODO (VPM): change this to something more descriptive*/
 
-   HYPRE_Int            test_opt;
    /* local reordering */
-   HYPRE_Int            reordering_type;
-
+   HYPRE_Int             reordering_type;
 } hypre_ParILUData;
 
 #define hypre_ParILUDataTestOption(ilu_data)                   ((ilu_data) -> test_opt)
 
-#ifdef HYPRE_USING_CUDA
-#define hypre_ParILUDataMatLMatrixDescription(ilu_data)        ((ilu_data) -> matL_des)
-#define hypre_ParILUDataMatUMatrixDescription(ilu_data)        ((ilu_data) -> matU_des)
-#define hypre_ParILUDataMatALILUSolveInfo(ilu_data)            ((ilu_data) -> matAL_info)
-#define hypre_ParILUDataMatAUILUSolveInfo(ilu_data)            ((ilu_data) -> matAU_info)
-#define hypre_ParILUDataMatBLILUSolveInfo(ilu_data)            ((ilu_data) -> matBL_info)
-#define hypre_ParILUDataMatBUILUSolveInfo(ilu_data)            ((ilu_data) -> matBU_info)
-#define hypre_ParILUDataMatSLILUSolveInfo(ilu_data)            ((ilu_data) -> matSL_info)
-#define hypre_ParILUDataMatSUILUSolveInfo(ilu_data)            ((ilu_data) -> matSU_info)
-#define hypre_ParILUDataILUSolveBuffer(ilu_data)               ((ilu_data) -> ilu_solve_buffer)
-#define hypre_ParILUDataILUSolvePolicy(ilu_data)               ((ilu_data) -> ilu_solve_policy)
+#if defined(HYPRE_USING_GPU)
 #define hypre_ParILUDataMatAILUDevice(ilu_data)                ((ilu_data) -> matALU_d)
 #define hypre_ParILUDataMatBILUDevice(ilu_data)                ((ilu_data) -> matBLU_d)
 #define hypre_ParILUDataMatSILUDevice(ilu_data)                ((ilu_data) -> matSLU_d)
@@ -160,7 +150,8 @@ typedef struct hypre_ParILUData_struct
 #define hypre_ParILUDataP(ilu_data)                            ((ilu_data) -> P)
 #define hypre_ParILUDataFTempUpper(ilu_data)                   ((ilu_data) -> Ftemp_upper)
 #define hypre_ParILUDataUTempLower(ilu_data)                   ((ilu_data) -> Utemp_lower)
-#define hypre_ParILUDataMatAFakeDiagonal(ilu_data)             ((ilu_data) -> A_diag_fake)
+#define hypre_ParILUDataADiagDiag(ilu_data)                    ((ilu_data) -> Adiag_diag)
+#define hypre_ParILUDataSDiagDiag(ilu_data)                    ((ilu_data) -> Sdiag_diag)
 #endif
 
 #define hypre_ParILUDataGlobalSolver(ilu_data)                 ((ilu_data) -> global_solver)
@@ -192,14 +183,18 @@ typedef struct hypre_ParILUData_struct
 #define hypre_ParILUDataLogging(ilu_data)                      ((ilu_data) -> logging)
 #define hypre_ParILUDataPrintLevel(ilu_data)                   ((ilu_data) -> print_level)
 #define hypre_ParILUDataMaxIter(ilu_data)                      ((ilu_data) -> max_iter)
+#define hypre_ParILUDataTriSolve(ilu_data)                     ((ilu_data) -> tri_solve)
+#define hypre_ParILUDataLowerJacobiIters(ilu_data)             ((ilu_data) -> lower_jacobi_iters)
+#define hypre_ParILUDataUpperJacobiIters(ilu_data)             ((ilu_data) -> upper_jacobi_iters)
 #define hypre_ParILUDataIluType(ilu_data)                      ((ilu_data) -> ilu_type)
 #define hypre_ParILUDataNLU(ilu_data)                          ((ilu_data) -> nLU)
 #define hypre_ParILUDataNI(ilu_data)                           ((ilu_data) -> nI)
 #define hypre_ParILUDataUEnd(ilu_data)                         ((ilu_data) -> u_end)
-#define hypre_ParILUDataXTemp(ilu_data)                        ((ilu_data) -> Xtemp)
-#define hypre_ParILUDataYTemp(ilu_data)                        ((ilu_data) -> Ytemp)
 #define hypre_ParILUDataUTemp(ilu_data)                        ((ilu_data) -> Utemp)
 #define hypre_ParILUDataFTemp(ilu_data)                        ((ilu_data) -> Ftemp)
+#define hypre_ParILUDataXTemp(ilu_data)                        ((ilu_data) -> Xtemp)
+#define hypre_ParILUDataYTemp(ilu_data)                        ((ilu_data) -> Ytemp)
+#define hypre_ParILUDataZTemp(ilu_data)                        ((ilu_data) -> Ztemp)
 #define hypre_ParILUDataUExt(ilu_data)                         ((ilu_data) -> uext)
 #define hypre_ParILUDataFExt(ilu_data)                         ((ilu_data) -> fext)
 #define hypre_ParILUDataSchurSolver(ilu_data)                  ((ilu_data) -> schur_solver)
@@ -207,6 +202,18 @@ typedef struct hypre_ParILUData_struct
 #define hypre_ParILUDataRhs(ilu_data)                          ((ilu_data) -> rhs)
 #define hypre_ParILUDataX(ilu_data)                            ((ilu_data) -> x)
 #define hypre_ParILUDataReorderingType(ilu_data)               ((ilu_data) -> reordering_type)
+
+/* Iterative ILU setup */
+#define hypre_ParILUDataIterativeSetupType(ilu_data)           ((ilu_data) -> iter_setup_type)
+#define hypre_ParILUDataIterativeSetupOption(ilu_data)         ((ilu_data) -> iter_setup_option)
+#define hypre_ParILUDataIterativeSetupMaxIter(ilu_data)        ((ilu_data) -> setup_max_iter)
+#define hypre_ParILUDataIterativeSetupNumIter(ilu_data)        ((ilu_data) -> setup_num_iter)
+#define hypre_ParILUDataIterativeSetupTolerance(ilu_data)      ((ilu_data) -> setup_tolerance)
+#define hypre_ParILUDataIterativeSetupHistory(ilu_data)        ((ilu_data) -> setup_history)
+#define hypre_ParILUDataIterSetupCorrectionNorm(ilu_data,i)    ((ilu_data) -> setup_history[i])
+#define hypre_ParILUDataIterSetupResidualNorm(ilu_data,i)      (((ilu_data) -> setup_history + \
+                                                                 (ilu_data) -> setup_num_iter)[i])
+
 /* Schur System */
 #define hypre_ParILUDataSchurGMRESKDim(ilu_data)               ((ilu_data) -> ss_kDim)
 #define hypre_ParILUDataSchurGMRESMaxIter(ilu_data)            ((ilu_data) -> ss_max_iter)
@@ -219,6 +226,9 @@ typedef struct hypre_ParILUData_struct
 #define hypre_ParILUDataSchurPrecondIluDroptol(ilu_data)       ((ilu_data) -> sp_ilu_droptol)
 #define hypre_ParILUDataSchurPrecondPrintLevel(ilu_data)       ((ilu_data) -> sp_print_level)
 #define hypre_ParILUDataSchurPrecondMaxIter(ilu_data)          ((ilu_data) -> sp_max_iter)
+#define hypre_ParILUDataSchurPrecondTriSolve(ilu_data)         ((ilu_data) -> sp_tri_solve)
+#define hypre_ParILUDataSchurPrecondLowerJacobiIters(ilu_data) ((ilu_data) -> sp_lower_jacobi_iters)
+#define hypre_ParILUDataSchurPrecondUpperJacobiIters(ilu_data) ((ilu_data) -> sp_upper_jacobi_iters)
 #define hypre_ParILUDataSchurPrecondTol(ilu_data)              ((ilu_data) -> sp_tol)
 
 #define hypre_ParILUDataSchurNSHMaxNumIter(ilu_data)           ((ilu_data) -> ss_nsh_setup_max_iter)
@@ -235,65 +245,57 @@ typedef struct hypre_ParILUData_struct
 #define hypre_ParILUDataSchurSolverLogging(ilu_data)           ((ilu_data) -> ss_logging)
 #define hypre_ParILUDataSchurSolverPrintLevel(ilu_data)        ((ilu_data) -> ss_print_level)
 
-#define FMRK  -1
-#define CMRK  1
-#define UMRK  0
+#define FMRK   -1
+#define CMRK    1
+#define UMRK    0
 #define S_CMRK  2
 
 #define FPT(i, bsize) (((i) % (bsize)) == FMRK)
 #define CPT(i, bsize) (((i) % (bsize)) == CMRK)
 
-#define MAT_TOL 1e-14
+#define MAT_TOL     1e-14
 #define EXPAND_FACT 1.3
 
-
-
-
-
 /* NSH data structure */
 
 typedef struct hypre_ParNSHData_struct
 {
    /* solver information */
-   HYPRE_Int             global_solver;
+   HYPRE_Int              global_solver;
    hypre_ParCSRMatrix    *matA;
    hypre_ParCSRMatrix    *matM;
    hypre_ParVector       *F;
    hypre_ParVector       *U;
    hypre_ParVector       *residual;
    HYPRE_Real            *rel_res_norms;
-   HYPRE_Int             num_iterations;
+   HYPRE_Int              num_iterations;
    HYPRE_Real            *l1_norms;
-   HYPRE_Real            final_rel_residual_norm;
-   HYPRE_Real            tol;
-   HYPRE_Real            operator_complexity;
-
-   HYPRE_Int             logging;
-   HYPRE_Int             print_level;
-   HYPRE_Int             max_iter;
+   HYPRE_Real             final_rel_residual_norm;
+   HYPRE_Real             tol;
+   HYPRE_Real             operator_complexity;
+   HYPRE_Int              logging;
+   HYPRE_Int              print_level;
+   HYPRE_Int              max_iter;
 
    /* common data slots */
-   /* droptol[0]: droptol for MR
-    * droptol[1]: droptol for NSH
-    */
-   HYPRE_Real            *droptol;
-   HYPRE_Int             own_droptol_data;
+   HYPRE_Real            *droptol; /* 2 drop torelances for {MR, NSH}*/
+   HYPRE_Int              own_droptol_data;
 
    /* temp vectors for solve phase */
    hypre_ParVector       *Utemp;
    hypre_ParVector       *Ftemp;
 
    /* data slots for local MR */
-   HYPRE_Int             mr_max_iter;
-   HYPRE_Real            mr_tol;
-   HYPRE_Int             mr_max_row_nnz;
-   HYPRE_Int             mr_col_version;/* global version or column version MR */
+   HYPRE_Int              mr_max_iter;
+   HYPRE_Real             mr_tol;
+   HYPRE_Int              mr_max_row_nnz;
+   HYPRE_Int              mr_col_version; /* global version or column version MR */
 
    /* data slots for global NSH */
-   HYPRE_Int             nsh_max_iter;
-   HYPRE_Real            nsh_tol;
-   HYPRE_Int             nsh_max_row_nnz;
-}hypre_ParNSHData;
+   HYPRE_Int              nsh_max_iter;
+   HYPRE_Real             nsh_tol;
+   HYPRE_Int              nsh_max_row_nnz;
+} hypre_ParNSHData;
 
 #define hypre_ParNSHDataGlobalSolver(nsh_data)           ((nsh_data) -> global_solver)
 #define hypre_ParNSHDataMatA(nsh_data)                   ((nsh_data) -> matA)
@@ -322,36 +324,4 @@ typedef struct hypre_ParNSHData_struct
 #define hypre_ParNSHDataNSHTol(nsh_data)                 ((nsh_data) -> nsh_tol)
 #define hypre_ParNSHDataNSHMaxRowNnz(nsh_data)           ((nsh_data) -> nsh_max_row_nnz)
 
-#define DIVIDE_TOL 1e-32
-
-#ifdef HYPRE_USING_CUDA
-HYPRE_Int hypre_ILUSolveCusparseLU(hypre_ParCSRMatrix *A, cusparseMatDescr_t matL_des, cusparseMatDescr_t matU_des, csrsv2Info_t matL_info, csrsv2Info_t matU_info, hypre_CSRMatrix *matLU_d, cusparseSolvePolicy_t ilu_solve_policy, void *ilu_solve_buffer, hypre_ParVector *f,  hypre_ParVector *u, HYPRE_Int *perm, HYPRE_Int n, hypre_ParVector *ftemp, hypre_ParVector *utemp);
-HYPRE_Int hypre_ILUSolveCusparseSchurGMRES(hypre_ParCSRMatrix *A, hypre_ParVector *f, hypre_ParVector *u, HYPRE_Int *perm, HYPRE_Int nLU, hypre_ParCSRMatrix *S, hypre_ParVector *ftemp, hypre_ParVector *utemp, HYPRE_Solver schur_solver, HYPRE_Solver schur_precond, hypre_ParVector *rhs, hypre_ParVector *x, HYPRE_Int *u_end, cusparseMatDescr_t matL_des, cusparseMatDescr_t matU_des, csrsv2Info_t matBL_info, csrsv2Info_t matBU_info, csrsv2Info_t matSL_info, csrsv2Info_t matSU_info, hypre_CSRMatrix *matBLU_d, hypre_CSRMatrix *matE_d, hypre_CSRMatrix *matF_d, cusparseSolvePolicy_t ilu_solve_policy, void *ilu_solve_buffer);
-HYPRE_Int hypre_ILUSolveRAPGMRES(hypre_ParCSRMatrix *A, hypre_ParVector *f, hypre_ParVector *u, HYPRE_Int *perm, HYPRE_Int nLU, hypre_ParCSRMatrix *S, hypre_ParVector *ftemp, hypre_ParVector *utemp, hypre_ParVector *xtemp, hypre_ParVector *ytemp, HYPRE_Solver schur_solver, HYPRE_Solver schur_precond, hypre_ParVector *rhs, hypre_ParVector *x, HYPRE_Int *u_end, cusparseMatDescr_t matL_des, cusparseMatDescr_t matU_des, csrsv2Info_t matAL_info, csrsv2Info_t matAU_info, csrsv2Info_t matBL_info, csrsv2Info_t matBU_info, csrsv2Info_t matSL_info, csrsv2Info_t matSU_info, hypre_ParCSRMatrix *Aperm, hypre_CSRMatrix *matALU_d, hypre_CSRMatrix *matBLU_d, hypre_CSRMatrix *matE_d, hypre_CSRMatrix *matF_d, cusparseSolvePolicy_t ilu_solve_policy, void *ilu_solve_buffer, HYPRE_Int test_opt);
-HYPRE_Int hypre_ParILUCusparseExtractDiagonalCSR(hypre_ParCSRMatrix *A, HYPRE_Int *perm, HYPRE_Int *rqperm, hypre_CSRMatrix **A_diagp);
-HYPRE_Int hypre_ParILUCusparseILUExtractEBFC(hypre_CSRMatrix *A_diag, HYPRE_Int nLU, hypre_CSRMatrix **Bp, hypre_CSRMatrix **Cp, hypre_CSRMatrix **Ep, hypre_CSRMatrix **Fp);
-HYPRE_Int HYPRE_ILUSetupCusparseCSRILU0(hypre_CSRMatrix *A, cusparseSolvePolicy_t ilu_solve_policy);
-HYPRE_Int HYPRE_ILUSetupCusparseCSRILU0SetupSolve(hypre_CSRMatrix *A, cusparseMatDescr_t matL_des, cusparseMatDescr_t matU_des, cusparseSolvePolicy_t ilu_solve_policy, csrsv2Info_t *matL_infop, csrsv2Info_t *matU_infop, HYPRE_Int *buffer_sizep, void **bufferp);
-HYPRE_Int hypre_ILUSetupILU0Device(hypre_ParCSRMatrix *A, HYPRE_Int *perm, HYPRE_Int *qperm, HYPRE_Int n, HYPRE_Int nLU, cusparseMatDescr_t matL_des, cusparseMatDescr_t matU_des, cusparseSolvePolicy_t ilu_solve_policy, void **bufferp, csrsv2Info_t *matBL_infop, csrsv2Info_t *matBU_infop, csrsv2Info_t *matSL_infop, csrsv2Info_t *matSU_infop, hypre_CSRMatrix **BLUptr, hypre_ParCSRMatrix **matSptr, hypre_CSRMatrix **Eptr, hypre_CSRMatrix **Fptr, HYPRE_Int **A_fake_diag_ip);
-HYPRE_Int hypre_ILUSetupILUKDevice(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *perm, HYPRE_Int *qperm, HYPRE_Int n, HYPRE_Int nLU, cusparseMatDescr_t matL_des, cusparseMatDescr_t matU_des, cusparseSolvePolicy_t ilu_solve_policy, void **bufferp, csrsv2Info_t *matBL_infop, csrsv2Info_t *matBU_infop, csrsv2Info_t *matSL_infop, csrsv2Info_t *matSU_infop, hypre_CSRMatrix **BLUptr, hypre_ParCSRMatrix **matSptr, hypre_CSRMatrix **Eptr, hypre_CSRMatrix **Fptr, HYPRE_Int **A_fake_diag_ip);
-HYPRE_Int hypre_ILUSetupILUTDevice(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol, HYPRE_Int *perm, HYPRE_Int *qperm, HYPRE_Int n, HYPRE_Int nLU, cusparseMatDescr_t matL_des, cusparseMatDescr_t matU_des, cusparseSolvePolicy_t ilu_solve_policy, void **bufferp, csrsv2Info_t *matBL_infop, csrsv2Info_t *matBU_infop, csrsv2Info_t *matSL_infop, csrsv2Info_t *matSU_infop, hypre_CSRMatrix **BLUptr, hypre_ParCSRMatrix **matSptr, hypre_CSRMatrix **Eptr, hypre_CSRMatrix **Fptr, HYPRE_Int **A_fake_diag_ip);
-HYPRE_Int hypre_ParILURAPReorder(hypre_ParCSRMatrix *A, HYPRE_Int *perm, HYPRE_Int *rqperm, hypre_ParCSRMatrix **A_pq);
-HYPRE_Int hypre_ILUSetupLDUtoCusparse(hypre_ParCSRMatrix *L, HYPRE_Real *D, hypre_ParCSRMatrix *U, hypre_ParCSRMatrix **LDUp);
-HYPRE_Int hypre_ParILURAPBuildRP(hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *BLUm, hypre_ParCSRMatrix* E, hypre_ParCSRMatrix *F, cusparseMatDescr_t matL_des, cusparseMatDescr_t matU_des, hypre_ParCSRMatrix **Rp, hypre_ParCSRMatrix **Pp);
-HYPRE_Int hypre_ILUSetupRAPMILU0(hypre_ParCSRMatrix *A, hypre_ParCSRMatrix **ALUp, HYPRE_Int modified);
-HYPRE_Int hypre_ILUSetupRAPILU0Device(hypre_ParCSRMatrix *A, HYPRE_Int *perm, HYPRE_Int n, HYPRE_Int nLU, cusparseMatDescr_t matL_des, cusparseMatDescr_t matU_des, cusparseSolvePolicy_t ilu_solve_policy, void **bufferp, csrsv2Info_t *matAL_infop, csrsv2Info_t *matAU_infop, csrsv2Info_t *matBL_infop, csrsv2Info_t *matBU_infop, csrsv2Info_t *matSL_infop, csrsv2Info_t *matSU_infop, hypre_ParCSRMatrix **Apermptr, hypre_ParCSRMatrix **matSptr, hypre_CSRMatrix **ALUptr, hypre_CSRMatrix **BLUptr, hypre_CSRMatrix **CLUptr, hypre_CSRMatrix **Eptr, hypre_CSRMatrix **Fptr, HYPRE_Int test_opt);
-HYPRE_Int hypre_ParILUCusparseSchurGMRESDummySetup(void *a, void *b, void *c, void *d);
-HYPRE_Int hypre_ParILUCusparseSchurGMRESDummySolve(void *ilu_vdata, void *ilu_vdata2, hypre_ParVector *f, hypre_ParVector *u);
-HYPRE_Int hypre_ParILUCusparseSchurGMRESCommInfo(void *ilu_vdata, HYPRE_Int *my_id, HYPRE_Int *num_procs);
-void *hypre_ParILUCusparseSchurGMRESMatvecCreate(void *ilu_vdata, void *x);
-HYPRE_Int hypre_ParILUCusparseSchurGMRESMatvec(void *matvec_data, HYPRE_Complex alpha, void *ilu_vdata, void *x, HYPRE_Complex beta, void *y);
-HYPRE_Int hypre_ParILUCusparseSchurGMRESMatvecDestroy(void *matvec_data );
-HYPRE_Int hypre_ParILURAPSchurGMRESDummySetup(void *a, void *b, void *c, void *d);
-HYPRE_Int hypre_ParILURAPSchurGMRESSolve(void *ilu_vdata, void *ilu_vdata2, hypre_ParVector *f, hypre_ParVector *u);
-void *hypre_ParILURAPSchurGMRESMatvecCreate(void *ilu_vdata, void *x);
-HYPRE_Int hypre_ParILURAPSchurGMRESMatvec(void *matvec_data, HYPRE_Complex alpha, void *ilu_vdata, void *x, HYPRE_Complex beta, void *y);
-HYPRE_Int hypre_ParILURAPSchurGMRESMatvecDestroy(void *matvec_data );
-#endif
-
 #endif /* #ifndef hypre_ParILU_DATA_HEADER */
-
diff --git a/external/hypre/src/parcsr_ls/par_ilu_setup.c b/external/hypre/src/parcsr_ls/par_ilu_setup.c
index 4a62d38a..0742fb82 100644
--- a/external/hypre/src/parcsr_ls/par_ilu_setup.c
+++ b/external/hypre/src/parcsr_ls/par_ilu_setup.c
@@ -1,67 +1,59 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
  ******************************************************************************/
+
 #include "_hypre_parcsr_ls.h"
-#include "_hypre_utilities.hpp"
-#include "par_ilu.h"
-#include "seq_mv.hpp"
 
-/* Setup ILU data */
+/*--------------------------------------------------------------------------
+ * hypre_ILUSetup
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_ILUSetup( void               *ilu_vdata,
                 hypre_ParCSRMatrix *A,
                 hypre_ParVector    *f,
                 hypre_ParVector    *u )
 {
-   MPI_Comm             comm                 = hypre_ParCSRMatrixComm(A);
+   MPI_Comm              comm                = hypre_ParCSRMatrixComm(A);
+   HYPRE_MemoryLocation  memory_location     = hypre_ParCSRMatrixMemoryLocation(A);
    hypre_ParILUData     *ilu_data            = (hypre_ParILUData*) ilu_vdata;
    hypre_ParILUData     *schur_precond_ilu;
    hypre_ParNSHData     *schur_solver_nsh;
 
-   HYPRE_Int            i;
-   // HYPRE_Int            num_threads;
-   // HYPRE_Int            debug_flag           = 0;
-
-   /* pointers to ilu data */
-   HYPRE_Int            logging              = hypre_ParILUDataLogging(ilu_data);
-   HYPRE_Int            print_level          = hypre_ParILUDataPrintLevel(ilu_data);
-   HYPRE_Int            ilu_type             = hypre_ParILUDataIluType(ilu_data);
-   HYPRE_Int            nLU                  = hypre_ParILUDataNLU(ilu_data);
-   HYPRE_Int            nI                   = hypre_ParILUDataNI(ilu_data);
-   HYPRE_Int            fill_level           = hypre_ParILUDataLfil(ilu_data);
-   HYPRE_Int            max_row_elmts        = hypre_ParILUDataMaxRowNnz(ilu_data);
+   /* Pointers to ilu data */
+   HYPRE_Int             logging             = hypre_ParILUDataLogging(ilu_data);
+   HYPRE_Int             print_level         = hypre_ParILUDataPrintLevel(ilu_data);
+   HYPRE_Int             ilu_type            = hypre_ParILUDataIluType(ilu_data);
+   HYPRE_Int             nLU                 = hypre_ParILUDataNLU(ilu_data);
+   HYPRE_Int             nI                  = hypre_ParILUDataNI(ilu_data);
+   HYPRE_Int             fill_level          = hypre_ParILUDataLfil(ilu_data);
+   HYPRE_Int             max_row_elmts       = hypre_ParILUDataMaxRowNnz(ilu_data);
    HYPRE_Real           *droptol             = hypre_ParILUDataDroptol(ilu_data);
    HYPRE_Int            *CF_marker_array     = hypre_ParILUDataCFMarkerArray(ilu_data);
    HYPRE_Int            *perm                = hypre_ParILUDataPerm(ilu_data);
    HYPRE_Int            *qperm               = hypre_ParILUDataQPerm(ilu_data);
-   HYPRE_Real           tol_ddPQ             = hypre_ParILUDataTolDDPQ(ilu_data);
-
-#ifdef HYPRE_USING_CUDA
-   /* pointers to cusparse data, note that they are not NULL only when needed */
-   cusparseMatDescr_t      matL_des          = hypre_ParILUDataMatLMatrixDescription(ilu_data);
-   cusparseMatDescr_t      matU_des          = hypre_ParILUDataMatUMatrixDescription(ilu_data);
-   void                    *ilu_solve_buffer = hypre_ParILUDataILUSolveBuffer(ilu_data);//device memory
-   cusparseSolvePolicy_t   ilu_solve_policy  = hypre_ParILUDataILUSolvePolicy(ilu_data);
-   hypre_ParCSRMatrix      *Aperm            = hypre_ParILUDataAperm(ilu_data);
-   hypre_ParCSRMatrix      *R                = hypre_ParILUDataR(ilu_data);
-   hypre_ParCSRMatrix      *P                = hypre_ParILUDataP(ilu_data);
-   hypre_CSRMatrix         *matALU_d         = hypre_ParILUDataMatAILUDevice(ilu_data);
-   hypre_CSRMatrix         *matBLU_d         = hypre_ParILUDataMatBILUDevice(ilu_data);
-   hypre_CSRMatrix         *matSLU_d         = hypre_ParILUDataMatSILUDevice(ilu_data);
-   hypre_CSRMatrix         *matE_d           = hypre_ParILUDataMatEDevice(ilu_data);
-   hypre_CSRMatrix         *matF_d           = hypre_ParILUDataMatFDevice(ilu_data);
-   csrsv2Info_t            matAL_info        = hypre_ParILUDataMatALILUSolveInfo(ilu_data);
-   csrsv2Info_t            matAU_info        = hypre_ParILUDataMatAUILUSolveInfo(ilu_data);
-   csrsv2Info_t            matBL_info        = hypre_ParILUDataMatBLILUSolveInfo(ilu_data);
-   csrsv2Info_t            matBU_info        = hypre_ParILUDataMatBUILUSolveInfo(ilu_data);
-   csrsv2Info_t            matSL_info        = hypre_ParILUDataMatSLILUSolveInfo(ilu_data);
-   csrsv2Info_t            matSU_info        = hypre_ParILUDataMatSUILUSolveInfo(ilu_data);
-   HYPRE_Int               *A_diag_fake      = hypre_ParILUDataMatAFakeDiagonal(ilu_data);
-   hypre_Vector            *Ftemp_upper      = NULL;
-   hypre_Vector            *Utemp_lower      = NULL;
+   HYPRE_Real            tol_ddPQ            = hypre_ParILUDataTolDDPQ(ilu_data);
+
+   /* Pointers to device data, note that they are not NULL only when needed */
+#if defined(HYPRE_USING_GPU)
+#if defined(HYPRE_USING_UNIFIED_MEMORY)
+   HYPRE_Int             test_opt            = hypre_ParILUDataTestOption(ilu_data);
+#endif
+   hypre_ParCSRMatrix   *Aperm               = hypre_ParILUDataAperm(ilu_data);
+   hypre_ParCSRMatrix   *R                   = hypre_ParILUDataR(ilu_data);
+   hypre_ParCSRMatrix   *P                   = hypre_ParILUDataP(ilu_data);
+   hypre_CSRMatrix      *matALU_d            = hypre_ParILUDataMatAILUDevice(ilu_data);
+   hypre_CSRMatrix      *matBLU_d            = hypre_ParILUDataMatBILUDevice(ilu_data);
+   hypre_CSRMatrix      *matSLU_d            = hypre_ParILUDataMatSILUDevice(ilu_data);
+   hypre_CSRMatrix      *matE_d              = hypre_ParILUDataMatEDevice(ilu_data);
+   hypre_CSRMatrix      *matF_d              = hypre_ParILUDataMatFDevice(ilu_data);
+   hypre_Vector         *Ftemp_upper         = NULL;
+   hypre_Vector         *Utemp_lower         = NULL;
+   hypre_Vector         *Adiag_diag          = NULL;
+   hypre_Vector         *Sdiag_diag          = NULL;
 #endif
 
    hypre_ParCSRMatrix   *matA                = hypre_ParILUDataMatA(ilu_data);
@@ -72,596 +64,604 @@ hypre_ILUSetup( void               *ilu_vdata,
    HYPRE_Real           *matmD               = hypre_ParILUDataMatDModified(ilu_data);
    hypre_ParCSRMatrix   *matmU               = hypre_ParILUDataMatUModified(ilu_data);
    hypre_ParCSRMatrix   *matS                = hypre_ParILUDataMatS(ilu_data);
-//   hypre_ParCSRMatrix   *matM                = NULL;
-//   HYPRE_Int            nnzG;/* g stands for global */
-   HYPRE_Real           nnzS;/* total nnz in S */
-   HYPRE_Int            nnzS_offd;
-   HYPRE_Int            size_C/* total size of coarse grid */;
-
-   HYPRE_Int            n                    = hypre_CSRMatrixNumRows(hypre_ParCSRMatrixDiag(A));
-   //   HYPRE_Int            m;/* m = n-LU */
-   /* reordering option */
-   HYPRE_Int            reordering_type = hypre_ParILUDataReorderingType(ilu_data);
-   HYPRE_Int            num_procs,  my_id;
+   HYPRE_Int             n                   = hypre_CSRMatrixNumRows(hypre_ParCSRMatrixDiag(A));
+   HYPRE_Int             reordering_type     = hypre_ParILUDataReorderingType(ilu_data);
+   HYPRE_Real            nnzS;  /* Total nnz in S */
+   HYPRE_Real            nnzS_offd_local;
+   HYPRE_Real            nnzS_offd;
+   HYPRE_Int             size_C /* Total size of coarse grid */;
 
    hypre_ParVector      *Utemp               = NULL;
    hypre_ParVector      *Ftemp               = NULL;
    hypre_ParVector      *Xtemp               = NULL;
    hypre_ParVector      *Ytemp               = NULL;
+   hypre_ParVector      *Ztemp               = NULL;
    HYPRE_Real           *uext                = NULL;
    HYPRE_Real           *fext                = NULL;
    hypre_ParVector      *rhs                 = NULL;
    hypre_ParVector      *x                   = NULL;
+
+   /* TODO (VPM): Change F_array and U_array variable names */
    hypre_ParVector      *F_array             = hypre_ParILUDataF(ilu_data);
    hypre_ParVector      *U_array             = hypre_ParILUDataU(ilu_data);
    hypre_ParVector      *residual            = hypre_ParILUDataResidual(ilu_data);
    HYPRE_Real           *rel_res_norms       = hypre_ParILUDataRelResNorms(ilu_data);
 
    /* might need for Schur Complement */
-   HYPRE_Int            *u_end               = NULL;
-   HYPRE_Solver         schur_solver         = NULL;
-   HYPRE_Solver         schur_precond        = NULL;
-   HYPRE_Solver         schur_precond_gotten = NULL;
+   HYPRE_Int            *u_end                = NULL;
+   HYPRE_Solver          schur_solver         = NULL;
+   HYPRE_Solver          schur_precond        = NULL;
+   HYPRE_Solver          schur_precond_gotten = NULL;
+
+   /* Whether or not to use exact (direct) triangular solves */
+   HYPRE_Int             tri_solve            = hypre_ParILUDataTriSolve(ilu_data);
 
    /* help to build external */
    hypre_ParCSRCommPkg  *comm_pkg;
-   HYPRE_Int            buffer_size;
-   HYPRE_Int            send_size;
-   HYPRE_Int            recv_size;
-#ifdef HYPRE_USING_CUDA
-   HYPRE_Int            test_opt;
-#endif
-   /* ----- begin -----*/
-   HYPRE_ANNOTATE_FUNC_BEGIN;
-
-   //num_threads = hypre_NumThreads();
+   HYPRE_Int             buffer_size;
+   HYPRE_Int             num_sends;
+   HYPRE_Int             send_size;
+   HYPRE_Int             recv_size;
+   HYPRE_Int             num_procs, my_id;
 
-   hypre_MPI_Comm_size(comm,&num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+#if defined (HYPRE_USING_GPU)
+   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1(hypre_ParCSRMatrixMemoryLocation(A));
 
-#ifdef HYPRE_USING_CUDA
-   /* create cuda and cusparse information when needed */
-   /* Use most of them from global information */
-   /* set matrix L descripter, L is a lower triangular matrix with unit diagonal entries */
-   if (!matL_des)
-   {
-      HYPRE_CUSPARSE_CALL(cusparseCreateMatDescr(&(hypre_ParILUDataMatLMatrixDescription(ilu_data))));
-      matL_des = hypre_ParILUDataMatLMatrixDescription(ilu_data);
-      HYPRE_CUSPARSE_CALL(cusparseSetMatIndexBase(matL_des, CUSPARSE_INDEX_BASE_ZERO));
-      HYPRE_CUSPARSE_CALL(cusparseSetMatType(matL_des, CUSPARSE_MATRIX_TYPE_GENERAL));
-      HYPRE_CUSPARSE_CALL(cusparseSetMatFillMode(matL_des, CUSPARSE_FILL_MODE_LOWER));
-      HYPRE_CUSPARSE_CALL(cusparseSetMatDiagType(matL_des, CUSPARSE_DIAG_TYPE_UNIT));
-   }
-   /* set matrix U descripter, U is a upper triangular matrix with non-unit diagonal entries */
-   if (!matU_des)
-   {
-      HYPRE_CUSPARSE_CALL(cusparseCreateMatDescr(&(hypre_ParILUDataMatUMatrixDescription(ilu_data))));
-      matU_des = hypre_ParILUDataMatUMatrixDescription(ilu_data);
-      HYPRE_CUSPARSE_CALL(cusparseSetMatIndexBase(matU_des, CUSPARSE_INDEX_BASE_ZERO));
-      HYPRE_CUSPARSE_CALL(cusparseSetMatType(matU_des, CUSPARSE_MATRIX_TYPE_GENERAL));
-      HYPRE_CUSPARSE_CALL(cusparseSetMatFillMode(matU_des, CUSPARSE_FILL_MODE_UPPER));
-      HYPRE_CUSPARSE_CALL(cusparseSetMatDiagType(matU_des, CUSPARSE_DIAG_TYPE_NON_UNIT));
-   }
-   if (!matAL_info)
-   {
-      HYPRE_CUSPARSE_CALL( (cusparseDestroyCsrsv2Info(hypre_ParILUDataMatALILUSolveInfo(ilu_data))) );
-      matAL_info = NULL;
-   }
-   if (!matAU_info)
-   {
-      HYPRE_CUSPARSE_CALL( (cusparseDestroyCsrsv2Info(hypre_ParILUDataMatAUILUSolveInfo(ilu_data))) );
-      matAU_info = NULL;
-   }
-   if (!matBL_info)
-   {
-      HYPRE_CUSPARSE_CALL( (cusparseDestroyCsrsv2Info(hypre_ParILUDataMatBLILUSolveInfo(ilu_data))) );
-      matBL_info = NULL;
-   }
-   if (!matBU_info)
-   {
-      HYPRE_CUSPARSE_CALL( (cusparseDestroyCsrsv2Info(hypre_ParILUDataMatBUILUSolveInfo(ilu_data))) );
-      matBU_info = NULL;
-   }
-   if (!matSL_info)
-   {
-      HYPRE_CUSPARSE_CALL( (cusparseDestroyCsrsv2Info(hypre_ParILUDataMatSLILUSolveInfo(ilu_data))) );
-      matSL_info = NULL;
-   }
-   if (!matSU_info)
-   {
-      HYPRE_CUSPARSE_CALL( (cusparseDestroyCsrsv2Info(hypre_ParILUDataMatSUILUSolveInfo(ilu_data))) );
-      matSU_info = NULL;
-   }
-   if (ilu_solve_buffer)
-   {
-      hypre_TFree(ilu_solve_buffer, HYPRE_MEMORY_DEVICE);
-      ilu_solve_buffer = NULL;
-   }
-   if (matALU_d)
-   {
-      hypre_CSRMatrixDestroy( matALU_d );
-      matALU_d = NULL;
-   }
-   if (matSLU_d)
+   /* TODO (VPM): Placeholder check to avoid -Wunused-variable warning. Remove this! */
+   if (exec != HYPRE_EXEC_DEVICE && exec != HYPRE_EXEC_HOST)
    {
-      hypre_CSRMatrixDestroy( matSLU_d );
-      matSLU_d = NULL;
-   }
-   if (matBLU_d)
-   {
-      hypre_CSRMatrixDestroy( matBLU_d );
-      matBLU_d = NULL;
-   }
-   if (matE_d)
-   {
-      hypre_CSRMatrixDestroy( matE_d );
-      matE_d = NULL;
-   }
-   if (matF_d)
-   {
-      hypre_CSRMatrixDestroy( matF_d );
-      matF_d = NULL;
-   }
-   if (Aperm)
-   {
-      hypre_ParCSRMatrixDestroy( Aperm );
-      Aperm = NULL;
-   }
-   if (R)
-   {
-      hypre_ParCSRMatrixDestroy( R );
-      R = NULL;
-   }
-   if (P)
-   {
-      hypre_ParCSRMatrixDestroy( P );
-      P = NULL;
-   }
-   if (hypre_ParILUDataXTemp(ilu_data))
-   {
-      hypre_ParVectorDestroy(hypre_ParILUDataXTemp(ilu_data));
-      hypre_ParILUDataXTemp(ilu_data) = NULL;
-   }
-   if (hypre_ParILUDataYTemp(ilu_data))
-   {
-      hypre_ParVectorDestroy(hypre_ParILUDataYTemp(ilu_data));
-      hypre_ParILUDataYTemp(ilu_data) = NULL;
-   }
-   if (hypre_ParILUDataFTempUpper(ilu_data))
-   {
-      hypre_SeqVectorDestroy(hypre_ParILUDataFTempUpper(ilu_data));
-      hypre_ParILUDataFTempUpper(ilu_data) = NULL;
-   }
-   if (hypre_ParILUDataUTempLower(ilu_data))
-   {
-      hypre_SeqVectorDestroy(hypre_ParILUDataUTempLower(ilu_data));
-      hypre_ParILUDataUTempLower(ilu_data) = NULL;
-   }
-   if (hypre_ParILUDataMatAFakeDiagonal(ilu_data))
-   {
-      hypre_TFree(hypre_ParILUDataMatAFakeDiagonal(ilu_data), HYPRE_MEMORY_DEVICE);
-      hypre_ParILUDataMatAFakeDiagonal(ilu_data) = NULL;
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Need to run either on host or device!");
+      return hypre_error_flag;
    }
 #endif
 
-   /* Free Previously allocated data, if any not destroyed */
-   if (matL)
-   {
-      hypre_ParCSRMatrixDestroy(matL);
-      matL = NULL;
-   }
-   if (matU)
-   {
-      hypre_ParCSRMatrixDestroy(matU);
-      matU = NULL;
-   }
-   if (matmL)
-   {
-       hypre_ParCSRMatrixDestroy(matmL);
-       matmL = NULL;
-   }
-   if (matmU)
-   {
-      hypre_ParCSRMatrixDestroy(matmU);
-      matmU = NULL;
-   }
-   if (matS)
+   /* Sanity checks */
+#if defined(HYPRE_USING_CUDA) && !defined(HYPRE_USING_CUSPARSE)
    {
-      hypre_ParCSRMatrixDestroy(matS);
-      matS = NULL;
-   }
-   if (matD)
-   {
-      hypre_TFree(matD, HYPRE_MEMORY_DEVICE);
-      matD = NULL;
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "ILU CUDA build requires cuSPARSE!");
+      return hypre_error_flag;
    }
-   if (matmD)
+#elif defined(HYPRE_USING_HIP) && !defined(HYPRE_USING_ROCSPARSE)
    {
-      hypre_TFree(matmD, HYPRE_MEMORY_DEVICE);
-      matmD = NULL;
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "ILU HIP build requires rocSPARSE!");
+      return hypre_error_flag;
    }
-   if (CF_marker_array)
+#elif defined(HYPRE_USING_SYCL) && !defined(HYPRE_USING_ONEMKLSPARSE)
    {
-      hypre_TFree(CF_marker_array, HYPRE_MEMORY_HOST);
-      CF_marker_array = NULL;
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "ILU SYCL build requires oneMKLSparse!");
+      return hypre_error_flag;
    }
+#endif
+
+   /* ----- begin -----*/
+   HYPRE_ANNOTATE_FUNC_BEGIN;
+   hypre_GpuProfilingPushRange("hypre_ILUSetup");
+
+   hypre_MPI_Comm_size(comm, &num_procs);
+   hypre_MPI_Comm_rank(comm, &my_id);
+
+#if defined(HYPRE_USING_GPU)
+   hypre_CSRMatrixDestroy(matALU_d); matALU_d = NULL;
+   hypre_CSRMatrixDestroy(matSLU_d); matSLU_d = NULL;
+   hypre_CSRMatrixDestroy(matBLU_d); matBLU_d = NULL;
+   hypre_CSRMatrixDestroy(matE_d);   matE_d   = NULL;
+   hypre_CSRMatrixDestroy(matF_d);   matF_d   = NULL;
+   hypre_ParCSRMatrixDestroy(Aperm); Aperm    = NULL;
+   hypre_ParCSRMatrixDestroy(R);     R        = NULL;
+   hypre_ParCSRMatrixDestroy(P);     P        = NULL;
+
+   hypre_SeqVectorDestroy(hypre_ParILUDataFTempUpper(ilu_data));
+   hypre_SeqVectorDestroy(hypre_ParILUDataUTempLower(ilu_data));
+   hypre_ParVectorDestroy(hypre_ParILUDataXTemp(ilu_data));
+   hypre_ParVectorDestroy(hypre_ParILUDataYTemp(ilu_data));
+   hypre_ParVectorDestroy(hypre_ParILUDataZTemp(ilu_data));
+   hypre_SeqVectorDestroy(hypre_ParILUDataADiagDiag(ilu_data));
+   hypre_SeqVectorDestroy(hypre_ParILUDataSDiagDiag(ilu_data));
+
+   hypre_ParILUDataFTempUpper(ilu_data) = NULL;
+   hypre_ParILUDataUTempLower(ilu_data) = NULL;
+   hypre_ParILUDataXTemp(ilu_data)      = NULL;
+   hypre_ParILUDataYTemp(ilu_data)      = NULL;
+   hypre_ParILUDataZTemp(ilu_data)      = NULL;
+   hypre_ParILUDataADiagDiag(ilu_data)  = NULL;
+   hypre_ParILUDataSDiagDiag(ilu_data)  = NULL;
+#endif
 
+   /* Free previously allocated data, if any not destroyed */
+   hypre_ParCSRMatrixDestroy(matL);  matL  = NULL;
+   hypre_ParCSRMatrixDestroy(matU);  matU  = NULL;
+   hypre_ParCSRMatrixDestroy(matmL); matmL = NULL;
+   hypre_ParCSRMatrixDestroy(matmU); matmU = NULL;
+   hypre_ParCSRMatrixDestroy(matS);  matS  = NULL;
+
+   hypre_TFree(matD, HYPRE_MEMORY_DEVICE);
+   hypre_TFree(matmD, HYPRE_MEMORY_DEVICE);
+   hypre_TFree(CF_marker_array, HYPRE_MEMORY_HOST);
 
    /* clear old l1_norm data, if created */
-   if (hypre_ParILUDataL1Norms(ilu_data))
-   {
-      hypre_TFree(hypre_ParILUDataL1Norms(ilu_data), HYPRE_MEMORY_HOST);
-      hypre_ParILUDataL1Norms(ilu_data) = NULL;
-   }
+   hypre_TFree(hypre_ParILUDataL1Norms(ilu_data), HYPRE_MEMORY_HOST);
 
    /* setup temporary storage
     * first check is they've already here
     */
-   if (hypre_ParILUDataUTemp(ilu_data))
-   {
-      hypre_ParVectorDestroy(hypre_ParILUDataUTemp(ilu_data));
-      hypre_ParILUDataUTemp(ilu_data) = NULL;
-   }
-   if (hypre_ParILUDataFTemp(ilu_data))
-   {
-      hypre_ParVectorDestroy(hypre_ParILUDataFTemp(ilu_data));
-      hypre_ParILUDataFTemp(ilu_data) = NULL;
-   }
-   if (hypre_ParILUDataUExt(ilu_data))
-   {
-      hypre_TFree(hypre_ParILUDataUExt(ilu_data), HYPRE_MEMORY_HOST);
-      hypre_ParILUDataUExt(ilu_data) = NULL;
-   }
-   if ( hypre_ParILUDataFExt(ilu_data))
-   {
-      hypre_TFree(hypre_ParILUDataFExt(ilu_data), HYPRE_MEMORY_HOST);
-      hypre_ParILUDataFExt(ilu_data) = NULL;
-   }
-   if ( hypre_ParILUDataUEnd(ilu_data))
-   {
-      hypre_TFree(hypre_ParILUDataUEnd(ilu_data), HYPRE_MEMORY_HOST);
-      hypre_ParILUDataUEnd(ilu_data) = NULL;
-   }
-   if (hypre_ParILUDataRhs(ilu_data))
-   {
-      hypre_ParVectorDestroy(hypre_ParILUDataRhs(ilu_data));
-      hypre_ParILUDataRhs(ilu_data) = NULL;
-   }
-   if (hypre_ParILUDataX(ilu_data))
-   {
-      hypre_ParVectorDestroy(hypre_ParILUDataX(ilu_data));
-      hypre_ParILUDataX(ilu_data) = NULL;
-   }
-   if (hypre_ParILUDataResidual(ilu_data))
-   {
-      hypre_ParVectorDestroy(hypre_ParILUDataResidual(ilu_data));
-      hypre_ParILUDataResidual(ilu_data) = NULL;
-   }
-   if (hypre_ParILUDataRelResNorms(ilu_data))
-   {
-      hypre_TFree(hypre_ParILUDataRelResNorms(ilu_data), HYPRE_MEMORY_HOST);
-      hypre_ParILUDataRelResNorms(ilu_data) = NULL;
-   }
+   hypre_ParVectorDestroy(hypre_ParILUDataUTemp(ilu_data));
+   hypre_ParVectorDestroy(hypre_ParILUDataFTemp(ilu_data));
+   hypre_ParVectorDestroy(hypre_ParILUDataRhs(ilu_data));
+   hypre_ParVectorDestroy(hypre_ParILUDataX(ilu_data));
+   hypre_ParVectorDestroy(hypre_ParILUDataResidual(ilu_data));
+   hypre_TFree(hypre_ParILUDataUExt(ilu_data), HYPRE_MEMORY_HOST);
+   hypre_TFree(hypre_ParILUDataFExt(ilu_data), HYPRE_MEMORY_HOST);
+   hypre_TFree(hypre_ParILUDataUEnd(ilu_data), HYPRE_MEMORY_HOST);
+   hypre_TFree(hypre_ParILUDataRelResNorms(ilu_data), HYPRE_MEMORY_HOST);
+
+   hypre_ParILUDataUTemp(ilu_data) = NULL;
+   hypre_ParILUDataFTemp(ilu_data) = NULL;
+   hypre_ParILUDataRhs(ilu_data) = NULL;
+   hypre_ParILUDataX(ilu_data) = NULL;
+   hypre_ParILUDataResidual(ilu_data) = NULL;
+
    if (hypre_ParILUDataSchurSolver(ilu_data))
    {
-      switch(ilu_type){
+      switch (ilu_type)
+      {
          case 10: case 11: case 40: case 41: case 50:
             HYPRE_ParCSRGMRESDestroy(hypre_ParILUDataSchurSolver(ilu_data)); //GMRES for Schur
             break;
+
          case 20: case 21:
             hypre_NSHDestroy(hypre_ParILUDataSchurSolver(ilu_data)); //NSH for Schur
             break;
+
          default:
             break;
       }
       (hypre_ParILUDataSchurSolver(ilu_data)) = NULL;
    }
-   if (hypre_ParILUDataSchurPrecond(ilu_data))
-   {
-      switch(ilu_type){
-         case 10: case 11: case 40: case 41:
-#ifdef HYPRE_USING_CUDA
-         if (hypre_ParILUDataIluType(ilu_data) != 10 &&
-            hypre_ParILUDataIluType(ilu_data) != 11)
-         {
-#endif
-            HYPRE_ILUDestroy(hypre_ParILUDataSchurPrecond(ilu_data)); //ILU as precond for Schur
-#ifdef HYPRE_USING_CUDA
-         }
+
+   /* ILU as precond for Schur */
+   if ( hypre_ParILUDataSchurPrecond(ilu_data)  &&
+#if defined(HYPRE_USING_GPU)
+        hypre_ParILUDataIluType(ilu_data) != 10 &&
+        hypre_ParILUDataIluType(ilu_data) != 11 &&
 #endif
-            break;
-         default:
-            break;
-      }
-      (hypre_ParILUDataSchurPrecond(ilu_data)) = NULL;
+        (hypre_ParILUDataIluType(ilu_data) == 10 ||
+         hypre_ParILUDataIluType(ilu_data) == 11 ||
+         hypre_ParILUDataIluType(ilu_data) == 40 ||
+         hypre_ParILUDataIluType(ilu_data) == 41) )
+   {
+      HYPRE_ILUDestroy(hypre_ParILUDataSchurPrecond(ilu_data));
+      hypre_ParILUDataSchurPrecond(ilu_data) = NULL;
    }
-   /* start to create working vectors */
+
+   /* Create work vectors */
    Utemp = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A),
-         hypre_ParCSRMatrixGlobalNumRows(A),
-         hypre_ParCSRMatrixRowStarts(A));
+                                 hypre_ParCSRMatrixGlobalNumRows(A),
+                                 hypre_ParCSRMatrixRowStarts(A));
    hypre_ParVectorInitialize(Utemp);
    hypre_ParILUDataUTemp(ilu_data) = Utemp;
 
    Ftemp = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A),
-         hypre_ParCSRMatrixGlobalNumRows(A),
-         hypre_ParCSRMatrixRowStarts(A));
+                                 hypre_ParCSRMatrixGlobalNumRows(A),
+                                 hypre_ParCSRMatrixRowStarts(A));
    hypre_ParVectorInitialize(Ftemp);
    hypre_ParILUDataFTemp(ilu_data) = Ftemp;
+
    /* set matrix, solution and rhs pointers */
-   matA = A;
+   matA    = A;
    F_array = f;
    U_array = u;
 
-   // create perm arary if necessary
-   if (perm == NULL)
+   /* Create perm array if necessary */
+   if (!perm)
    {
-      switch(ilu_type)
+      switch (ilu_type)
       {
-         case 10: case 11: case 20: case 21: case 30: case 31: case 50:/* symmetric */
-            hypre_ILUGetInteriorExteriorPerm(matA, &perm, &nLU, reordering_type);
+         case 10: case 11: case 20: case 21: case 30: case 31: case 50:
+            /* symmetric */
+            hypre_ILUGetInteriorExteriorPerm(matA, memory_location, &perm, &nLU, reordering_type);
             break;
-         case 40: case 41:/* ddPQ */
+
+         case 40: case 41:
+            /* ddPQ */
             hypre_ILUGetPermddPQ(matA, &perm, &qperm, tol_ddPQ, &nLU, &nI, reordering_type);
             break;
+
          case 0: case 1:
-            hypre_ILUGetLocalPerm(matA, &perm, &nLU, reordering_type);
-            break;
          default:
+            /* RCM or none */
             hypre_ILUGetLocalPerm(matA, &perm, &nLU, reordering_type);
             break;
       }
    }
-   //   m = n - nLU;
-   /* factorization */
-   switch(ilu_type)
+
+   /* Factorization */
+   switch (ilu_type)
    {
-      case 0:
-#ifdef HYPRE_USING_CUDA
-               /* only apply the setup of ILU0 with cusparse */
-               if (fill_level == 0)
-               {
-                  hypre_ILUSetupILU0Device(matA, perm, perm, n, n, matL_des, matU_des, ilu_solve_policy, &ilu_solve_buffer,
-                                                         &matBL_info, &matBU_info, &matSL_info, &matSU_info, &matBLU_d, &matS,
-                                                         &matE_d, &matF_d, &A_diag_fake);//BJ + cusparse_ilu0()
-               }
-               else
-               {
-                  hypre_ILUSetupILUKDevice(matA, fill_level, perm, perm, n, n, matL_des, matU_des, ilu_solve_policy, &ilu_solve_buffer,
-                                                         &matBL_info, &matBU_info, &matSL_info, &matSU_info, &matBLU_d, &matS,
-                                                         &matE_d, &matF_d, &A_diag_fake);//BJ + hypre_iluk(), setup the device solve
-               }
-#else
-               hypre_ILUSetupILUK(matA, fill_level, perm, perm, n, n, &matL, &matD, &matU, &matS, &u_end); //BJ + hypre_iluk()
-#endif
-               break;
-      case 1:
-#ifdef HYPRE_USING_CUDA
-               hypre_ILUSetupILUTDevice(matA, max_row_elmts, droptol, perm, perm, n, n, matL_des, matU_des, ilu_solve_policy, &ilu_solve_buffer,
-                                                         &matBL_info, &matBU_info, &matSL_info, &matSU_info, &matBLU_d, &matS,
-                                                         &matE_d, &matF_d, &A_diag_fake);//BJ + hypre_ilut(), setup the device solve
-#else
-               hypre_ILUSetupILUT(matA, max_row_elmts, droptol, perm, perm, n, n, &matL, &matD, &matU, &matS, &u_end); //BJ + hypre_ilut()
-#endif
-               break;
-      case 10:
-#ifdef HYPRE_USING_CUDA
-               if (fill_level == 0)
-               {
-                  /* Only support ILU0 */
-                  hypre_ILUSetupILU0Device(matA, perm, perm, n, nLU, matL_des, matU_des, ilu_solve_policy, &ilu_solve_buffer,
-                                                         &matBL_info, &matBU_info, &matSL_info, &matSU_info, &matBLU_d, &matS,
-                                                         &matE_d, &matF_d, &A_diag_fake);//BJ + cusparse_ilu0()
-               }
-               else
-               {
-                  hypre_ILUSetupILUKDevice(matA, fill_level, perm, perm, n, nLU, matL_des, matU_des, ilu_solve_policy, &ilu_solve_buffer,
-                                                         &matBL_info, &matBU_info, &matSL_info, &matSU_info, &matBLU_d, &matS,
-                                                         &matE_d, &matF_d, &A_diag_fake);//BJ + cusparse_ilu0()
-               }
-#else
-               hypre_ILUSetupILUK(matA, fill_level, perm, perm, nLU, nLU, &matL, &matD, &matU, &matS, &u_end); //GMRES + hypre_iluk()
+      case 0: /* BJ + hypre_iluk() */
+#if defined(HYPRE_USING_GPU)
+         if (exec == HYPRE_EXEC_DEVICE)
+         {
+            hypre_ILUSetupDevice(ilu_data, matA, perm, perm, n, n,
+                                 &matBLU_d, &matS, &matE_d, &matF_d);
+         }
+         else
 #endif
-               break;
-      case 11:
-#ifdef HYPRE_USING_CUDA
-               hypre_ILUSetupILUTDevice(matA, max_row_elmts, droptol, perm, perm, n, nLU, matL_des, matU_des, ilu_solve_policy, &ilu_solve_buffer,
-                                                         &matBL_info, &matBU_info, &matSL_info, &matSU_info, &matBLU_d, &matS,
-                                                         &matE_d, &matF_d, &A_diag_fake);//BJ + cusparse_ilu0()
-#else
-               hypre_ILUSetupILUT(matA, max_row_elmts, droptol, perm, perm, nLU, nLU, &matL, &matD, &matU, &matS, &u_end); //GMRES + hypre_ilut()
+         {
+            hypre_ILUSetupILUK(matA, fill_level, perm, perm, n, n,
+                               &matL, &matD, &matU, &matS, &u_end);
+         }
+         break;
+
+      case 1: /* BJ + hypre_ilut() */
+#if defined(HYPRE_USING_GPU)
+         if (exec == HYPRE_EXEC_DEVICE)
+         {
+            hypre_ILUSetupDevice(ilu_data, matA, perm, perm, n, n,
+                                 &matBLU_d, &matS, &matE_d, &matF_d);
+         }
+         else
 #endif
-               break;
-      case 20: hypre_ILUSetupILUK(matA, fill_level, perm, perm, nLU, nLU, &matL, &matD, &matU, &matS, &u_end); //Newton Schulz Hotelling + hypre_iluk()
-               break;
-      case 21: hypre_ILUSetupILUT(matA, max_row_elmts, droptol, perm, perm, nLU, nLU, &matL, &matD, &matU, &matS, &u_end); //Newton Schulz Hotelling + hypre_ilut()
-               break;
-      case 30: hypre_ILUSetupILUKRAS(matA, fill_level, perm, nLU, &matL, &matD, &matU); //RAS + hypre_iluk()
-               break;
-      case 31: hypre_ILUSetupILUTRAS(matA, max_row_elmts, droptol, perm, nLU, &matL, &matD, &matU); //RAS + hypre_ilut()
-               break;
-      case 40: hypre_ILUSetupILUK(matA, fill_level, perm, qperm, nLU, nI, &matL, &matD, &matU, &matS, &u_end); //ddPQ + GMRES + hypre_iluk()
-               break;
-      case 41: hypre_ILUSetupILUT(matA, max_row_elmts, droptol, perm, qperm, nLU, nI, &matL, &matD, &matU, &matS, &u_end); //ddPQ + GMRES + hypre_ilut()
-               break;
-      case 50:
-#ifdef HYPRE_USING_CUDA
-               test_opt = hypre_ParILUDataTestOption(ilu_data);
-               hypre_ILUSetupRAPILU0Device(matA, perm, n, nLU, matL_des, matU_des, ilu_solve_policy,
-                              &ilu_solve_buffer, &matAL_info, &matAU_info, &matBL_info, &matBU_info, &matSL_info, &matSU_info,
-                              &Aperm, &matS, &matALU_d, &matBLU_d, &matSLU_d, &matE_d, &matF_d, test_opt); //RAP + hypre_modified_ilu0
-#else
-               hypre_ILUSetupRAPILU0(matA, perm, n, nLU, &matL, &matD, &matU, &matmL, &matmD, &matmU, &u_end); //RAP + hypre_modified_ilu0
+         {
+            hypre_ILUSetupILUT(matA, max_row_elmts, droptol, perm, perm, n, n,
+                               &matL, &matD, &matU, &matS, &u_end);
+         }
+         break;
+
+      case 10: /* GMRES + hypre_iluk() */
+#if defined(HYPRE_USING_GPU)
+         if (exec == HYPRE_EXEC_DEVICE)
+         {
+            hypre_ILUSetupDevice(ilu_data, matA, perm, perm, n, nLU,
+                                 &matBLU_d, &matS, &matE_d, &matF_d);
+         }
+         else
 #endif
-               break;
-      default:
-#ifdef HYPRE_USING_CUDA
-               hypre_ILUSetupILU0Device(matA, perm, perm, n, n, matL_des, matU_des, ilu_solve_policy, &ilu_solve_buffer,
-                                                      &matBL_info, &matBU_info, &matSL_info, &matSU_info, &matBLU_d, &matS,
-                                                      &matE_d, &matF_d, &A_diag_fake);//BJ + cusparse_ilu0()
-#else
-               hypre_ILUSetupILU0(matA, perm, perm, n, n, &matL, &matD, &matU, &matS, &u_end);//BJ + hypre_ilu0()
+         {
+            hypre_ILUSetupILUK(matA, fill_level, perm, perm, nLU, nLU,
+                               &matL, &matD, &matU, &matS, &u_end);
+         }
+         break;
+
+      case 11: /* GMRES + hypre_ilut() */
+#if defined(HYPRE_USING_GPU)
+         if (exec == HYPRE_EXEC_DEVICE)
+         {
+            hypre_ILUSetupDevice(ilu_data, matA, perm, perm, n, nLU,
+                                 &matBLU_d, &matS, &matE_d, &matF_d);
+         }
+         else
 #endif
-               break;
-   }
-   /* setup Schur solver */
-   switch(ilu_type)
-   {
-      case 10: case 11:
-         if (matS)
          {
-#ifdef HYPRE_USING_CUDA
-            /* create working vectors */
+            hypre_ILUSetupILUT(matA, max_row_elmts, droptol, perm, perm, nLU, nLU,
+                               &matL, &matD, &matU, &matS, &u_end);
+         }
+         break;
 
-            Xtemp = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(matS),
-                                   hypre_ParCSRMatrixGlobalNumRows(matS),
-                                   hypre_ParCSRMatrixRowStarts(matS));
-            hypre_ParVectorInitialize(Xtemp);
+      case 20: /* Newton Schulz Hotelling + hypre_iluk() */
+#if defined(HYPRE_USING_GPU) && !defined(HYPRE_USING_UNIFIED_MEMORY)
+         if (exec == HYPRE_EXEC_DEVICE)
+         {
+            hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                              "NSH+ILUK setup on device runs requires unified memory!");
+            return hypre_error_flag;
+         }
+#endif
 
-            Ytemp = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(matS),
-                                   hypre_ParCSRMatrixGlobalNumRows(matS),
-                                   hypre_ParCSRMatrixRowStarts(matS));
-            hypre_ParVectorInitialize(Ytemp);
+         hypre_ILUSetupILUK(matA, fill_level, perm, perm, nLU, nLU,
+                            &matL, &matD, &matU, &matS, &u_end);
+         break;
 
-            Ftemp_upper = hypre_SeqVectorCreate(nLU);
-            hypre_VectorOwnsData(Ftemp_upper)   = 0;
-            hypre_VectorData(Ftemp_upper)       = hypre_VectorData(hypre_ParVectorLocalVector(Ftemp));
-            hypre_SeqVectorInitialize(Ftemp_upper);
+      case 21: /* Newton Schulz Hotelling + hypre_ilut() */
+#if defined(HYPRE_USING_GPU) && !defined(HYPRE_USING_UNIFIED_MEMORY)
+         if (exec == HYPRE_EXEC_DEVICE)
+         {
+            hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                              "NSH+ILUT setup on device runs requires unified memory!");
+            return hypre_error_flag;
+         }
+#endif
 
-            Utemp_lower = hypre_SeqVectorCreate(n - nLU);
-            hypre_VectorOwnsData(Utemp_lower)   = 0;
-            hypre_VectorData(Utemp_lower)       = hypre_VectorData(hypre_ParVectorLocalVector(Utemp)) + nLU;
-            hypre_SeqVectorInitialize(Utemp_lower);
+         hypre_ILUSetupILUT(matA, max_row_elmts, droptol, perm, perm, nLU, nLU,
+                            &matL, &matD, &matU, &matS, &u_end);
+         break;
 
-            /* create GMRES */
-//            HYPRE_ParCSRGMRESCreate(comm, &schur_solver);
+      case 30: /* RAS + hypre_iluk() */
+#if defined(HYPRE_USING_GPU) && !defined(HYPRE_USING_UNIFIED_MEMORY)
+         if (exec == HYPRE_EXEC_DEVICE)
+         {
+            hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                              "RAS+ILUK setup on device runs requires unified memory!");
+            return hypre_error_flag;
+         }
+#endif
 
-            hypre_GMRESFunctions * gmres_functions;
+         hypre_ILUSetupILUKRAS(matA, fill_level, perm, nLU,
+                               &matL, &matD, &matU);
+         break;
 
-            gmres_functions =
-               hypre_GMRESFunctionsCreate(
-                  hypre_CAlloc,
-                  hypre_ParKrylovFree,
-                  hypre_ParILUCusparseSchurGMRESCommInfo, //parCSR A -> ilu_data
-                  hypre_ParKrylovCreateVector,
-                  hypre_ParKrylovCreateVectorArray,
-                  hypre_ParKrylovDestroyVector,
-                  hypre_ParILUCusparseSchurGMRESMatvecCreate, //parCSR A -- inactive
-                  hypre_ParILUCusparseSchurGMRESMatvec, //parCSR A -> ilu_data
-                  hypre_ParILUCusparseSchurGMRESMatvecDestroy, //parCSR A -- inactive
-                  hypre_ParKrylovInnerProd,
-                  hypre_ParKrylovCopyVector,
-                  hypre_ParKrylovClearVector,
-                  hypre_ParKrylovScaleVector,
-                  hypre_ParKrylovAxpy,
-                  hypre_ParKrylovIdentitySetup, //parCSR A -- inactive
-                  hypre_ParKrylovIdentity ); //parCSR A -- inactive
-            schur_solver = ( (HYPRE_Solver) hypre_GMRESCreate( gmres_functions ) );
+      case 31: /* RAS + hypre_ilut() */
+#if defined(HYPRE_USING_GPU) && !defined(HYPRE_USING_UNIFIED_MEMORY)
+         if (exec == HYPRE_EXEC_DEVICE)
+         {
+            hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                              "RAS+ILUT setup on device runs requires unified memory!");
+            return hypre_error_flag;
+         }
+#endif
 
-            /* setup GMRES parameters */
-            HYPRE_GMRESSetKDim            (schur_solver, hypre_ParILUDataSchurGMRESKDim(ilu_data));
-            HYPRE_GMRESSetMaxIter         (schur_solver, hypre_ParILUDataSchurGMRESMaxIter(ilu_data));/* we don't need that many solves */
-            HYPRE_GMRESSetTol             (schur_solver, hypre_ParILUDataSchurGMRESTol(ilu_data));
-            HYPRE_GMRESSetAbsoluteTol     (schur_solver, hypre_ParILUDataSchurGMRESAbsoluteTol(ilu_data));
-            HYPRE_GMRESSetLogging         (schur_solver, hypre_ParILUDataSchurSolverLogging(ilu_data));
-            HYPRE_GMRESSetPrintLevel      (schur_solver, hypre_ParILUDataSchurSolverPrintLevel(ilu_data));/* set to zero now, don't print */
-            HYPRE_GMRESSetRelChange       (schur_solver, hypre_ParILUDataSchurGMRESRelChange(ilu_data));
+         hypre_ILUSetupILUTRAS(matA, max_row_elmts, droptol,
+                               perm, nLU, &matL, &matD, &matU);
+         break;
 
-            /* setup preconditioner parameters */
-            /* create Unit precond */
-            schur_precond = (HYPRE_Solver) ilu_vdata;
-            /* add preconditioner to solver */
-            HYPRE_GMRESSetPrecond(schur_solver,
-                     (HYPRE_PtrToSolverFcn) hypre_ParILUCusparseSchurGMRESDummySolve,
-                     (HYPRE_PtrToSolverFcn) hypre_ParILUCusparseSchurGMRESDummySetup,
-                                          schur_precond);
-            HYPRE_GMRESGetPrecond(schur_solver, &schur_precond_gotten);
-            if (schur_precond_gotten != (schur_precond))
-            {
-               hypre_printf("Schur complement got bad precond\n");
-               return(-1);
-            }
+      case 40: /* ddPQ + GMRES + hypre_iluk() */
+#if defined(HYPRE_USING_GPU) && !defined(HYPRE_USING_UNIFIED_MEMORY)
+         if (exec == HYPRE_EXEC_DEVICE)
+         {
+            hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                              "ddPQ+GMRES+ILUK setup on device runs requires unified memory!");
+            return hypre_error_flag;
+         }
+#endif
 
-            /* need to create working vector rhs and x for Schur System */
-            rhs = hypre_ParVectorCreate(comm,
-                                    hypre_ParCSRMatrixGlobalNumRows(matS),
-                                    hypre_ParCSRMatrixRowStarts(matS));
-            hypre_ParVectorInitialize(rhs);
-            x = hypre_ParVectorCreate(comm,
-                                    hypre_ParCSRMatrixGlobalNumRows(matS),
-                                    hypre_ParCSRMatrixRowStarts(matS));
-            hypre_ParVectorInitialize(x);
+         hypre_ILUSetupILUK(matA, fill_level, perm, qperm, nLU, nI,
+                            &matL, &matD, &matU, &matS, &u_end);
+         break;
 
-            /* setup solver */
-            HYPRE_GMRESSetup(schur_solver,(HYPRE_Matrix)ilu_vdata,(HYPRE_Vector)rhs,(HYPRE_Vector)x);
+      case 41: /* ddPQ + GMRES + hypre_ilut() */
+#if defined(HYPRE_USING_GPU) && !defined(HYPRE_USING_UNIFIED_MEMORY)
+         if (exec == HYPRE_EXEC_DEVICE)
+         {
+            hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                              "ddPQ+GMRES+ILUT setup on device runs requires unified memory!");
+            return hypre_error_flag;
+         }
+#endif
 
-            /* solve for right-hand-side consists of only 1 */
-            hypre_Vector      *rhs_local = hypre_ParVectorLocalVector(rhs);
-            //HYPRE_Real        *Xtemp_data  = hypre_VectorData(Xtemp_local);
-            hypre_SeqVectorSetConstantValues(rhs_local, 1.0);
+         hypre_ILUSetupILUT(matA, max_row_elmts, droptol, perm, qperm, nLU, nI,
+                            &matL, &matD, &matU, &matS, &u_end);
+         break;
 
-            /* update ilu_data */
-            hypre_ParILUDataSchurSolver   (ilu_data) = schur_solver;
-            hypre_ParILUDataSchurPrecond  (ilu_data) = schur_precond;
-            hypre_ParILUDataRhs           (ilu_data) = rhs;
-            hypre_ParILUDataX             (ilu_data) = x;
+      case 50: /* RAP + hypre_modified_ilu0 */
+#if defined(HYPRE_USING_GPU)
+         if (exec == HYPRE_EXEC_DEVICE)
+         {
+#if !defined(HYPRE_USING_UNIFIED_MEMORY)
+            hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                              "GMRES+ILU0-RAP setup on device runs requires unified memory!");
+            return hypre_error_flag;
 #else
-            /* setup GMRES parameters */
-            HYPRE_ParCSRGMRESCreate(comm, &schur_solver);
+            hypre_ILUSetupRAPILU0Device(matA, perm, n, nLU,
+                                        &Aperm, &matS, &matALU_d, &matBLU_d,
+                                        &matSLU_d, &matE_d, &matF_d, test_opt);
+#endif
+         }
+         else
+#endif
+         {
+            hypre_ILUSetupRAPILU0(matA, perm, n, nLU, &matL, &matD, &matU,
+                                  &matmL, &matmD, &matmU, &u_end);
+         }
+         break;
 
-            HYPRE_GMRESSetKDim            (schur_solver, hypre_ParILUDataSchurGMRESKDim(ilu_data));
-            HYPRE_GMRESSetMaxIter         (schur_solver, hypre_ParILUDataSchurGMRESMaxIter(ilu_data));/* we don't need that many solves */
-            HYPRE_GMRESSetTol             (schur_solver, hypre_ParILUDataSchurGMRESTol(ilu_data));
-            HYPRE_GMRESSetAbsoluteTol     (schur_solver, hypre_ParILUDataSchurGMRESAbsoluteTol(ilu_data));
-            HYPRE_GMRESSetLogging         (schur_solver, hypre_ParILUDataSchurSolverLogging(ilu_data));
-            HYPRE_GMRESSetPrintLevel      (schur_solver, hypre_ParILUDataSchurSolverPrintLevel(ilu_data));/* set to zero now, don't print */
-            HYPRE_GMRESSetRelChange       (schur_solver, hypre_ParILUDataSchurGMRESRelChange(ilu_data));
+      default: /* BJ + device_ilu0() */
+#if defined(HYPRE_USING_GPU)
+         if (exec == HYPRE_EXEC_DEVICE)
+         {
+            hypre_ILUSetupDevice(ilu_data, matA, perm, perm, n, n,
+                                 &matBLU_d, &matS, &matE_d, &matF_d);
+         }
+         else
+#endif
+         {
+            hypre_ILUSetupILU0(matA, perm, perm, n, n, &matL,
+                               &matD, &matU, &matS, &u_end);
+         }
+         break;
+   }
 
-            /* setup preconditioner parameters */
-            /* create precond, the default is ILU0 */
-            HYPRE_ILUCreate               (&schur_precond);
-            HYPRE_ILUSetType              (schur_precond, hypre_ParILUDataSchurPrecondIluType(ilu_data));
-            HYPRE_ILUSetLevelOfFill       (schur_precond, hypre_ParILUDataSchurPrecondIluLfil(ilu_data));
-            HYPRE_ILUSetMaxNnzPerRow      (schur_precond, hypre_ParILUDataSchurPrecondIluMaxRowNnz(ilu_data));
-            HYPRE_ILUSetDropThresholdArray(schur_precond, hypre_ParILUDataSchurPrecondIluDroptol(ilu_data));
-            HYPRE_ILUSetPrintLevel        (schur_precond, hypre_ParILUDataSchurPrecondPrintLevel(ilu_data));
-            HYPRE_ILUSetMaxIter           (schur_precond, hypre_ParILUDataSchurPrecondMaxIter(ilu_data));
-            HYPRE_ILUSetTol               (schur_precond, hypre_ParILUDataSchurPrecondTol(ilu_data));
+   /* Create additional temporary vector for iterative triangular solve */
+   if (!tri_solve)
+   {
+      Ztemp = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A),
+                                    hypre_ParCSRMatrixGlobalNumRows(A),
+                                    hypre_ParCSRMatrixRowStarts(A));
+      hypre_ParVectorInitialize(Ztemp);
+   }
 
-            /* add preconditioner to solver */
-            HYPRE_GMRESSetPrecond(schur_solver,
-                     (HYPRE_PtrToSolverFcn) HYPRE_ILUSolve,
-                     (HYPRE_PtrToSolverFcn) HYPRE_ILUSetup,
-                                          schur_precond);
-            HYPRE_GMRESGetPrecond(schur_solver, &schur_precond_gotten);
-            if (schur_precond_gotten != (schur_precond))
+   /* setup Schur solver - TODO (VPM): merge host and device paths below */
+   switch (ilu_type)
+   {
+      case 0: case 1:
+      default:
+         break;
+
+      case 10: case 11:
+         if (matS)
+         {
+            /* Create work vectors */
+#if defined(HYPRE_USING_GPU)
+            if (exec == HYPRE_EXEC_DEVICE)
             {
-               hypre_printf("Schur complement got bad precond\n");
-               HYPRE_ANNOTATE_FUNC_END;
+               Xtemp = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(matS),
+                                             hypre_ParCSRMatrixGlobalNumRows(matS),
+                                             hypre_ParCSRMatrixRowStarts(matS));
+               hypre_ParVectorInitialize(Xtemp);
+
+               Ytemp = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(matS),
+                                             hypre_ParCSRMatrixGlobalNumRows(matS),
+                                             hypre_ParCSRMatrixRowStarts(matS));
+               hypre_ParVectorInitialize(Ytemp);
+
+               Ftemp_upper = hypre_SeqVectorCreate(nLU);
+               hypre_VectorOwnsData(Ftemp_upper)   = 0;
+               hypre_VectorData(Ftemp_upper)       = hypre_VectorData(
+                                                        hypre_ParVectorLocalVector(Ftemp));
+               hypre_SeqVectorInitialize(Ftemp_upper);
+
+               Utemp_lower = hypre_SeqVectorCreate(n - nLU);
+               hypre_VectorOwnsData(Utemp_lower)   = 0;
+               hypre_VectorData(Utemp_lower)       = hypre_VectorData(
+                                                        hypre_ParVectorLocalVector(Utemp)) + nLU;
+               hypre_SeqVectorInitialize(Utemp_lower);
+
+               /* create GMRES */
+               //            HYPRE_ParCSRGMRESCreate(comm, &schur_solver);
+
+               hypre_GMRESFunctions * gmres_functions;
+
+               gmres_functions =
+                  hypre_GMRESFunctionsCreate(
+                     hypre_ParKrylovCAlloc,
+                     hypre_ParKrylovFree,
+                     hypre_ParILUSchurGMRESCommInfoDevice, //parCSR A -> ilu_data
+                     hypre_ParKrylovCreateVector,
+                     hypre_ParKrylovCreateVectorArray,
+                     hypre_ParKrylovDestroyVector,
+                     hypre_ParKrylovMatvecCreate, //parCSR A -- inactive
+                     ((tri_solve == 1) ?
+                      hypre_ParILUSchurGMRESMatvecDevice :
+                      hypre_ParILUSchurGMRESMatvecJacIterDevice), //parCSR A -> ilu_data
+                     hypre_ParKrylovMatvecDestroy, //parCSR A -- inactive
+                     hypre_ParKrylovInnerProd,
+                     hypre_ParKrylovCopyVector,
+                     hypre_ParKrylovClearVector,
+                     hypre_ParKrylovScaleVector,
+                     hypre_ParKrylovAxpy,
+                     hypre_ParKrylovIdentitySetup, //parCSR A -- inactive
+                     hypre_ParKrylovIdentity ); //parCSR A -- inactive
+               schur_solver = ( (HYPRE_Solver) hypre_GMRESCreate( gmres_functions ) );
+
+               /* setup GMRES parameters */
+               HYPRE_GMRESSetKDim            (schur_solver, hypre_ParILUDataSchurGMRESKDim(ilu_data));
+               HYPRE_GMRESSetMaxIter         (schur_solver,
+                                              hypre_ParILUDataSchurGMRESMaxIter(ilu_data));/* we don't need that many solves */
+               HYPRE_GMRESSetTol             (schur_solver, hypre_ParILUDataSchurGMRESTol(ilu_data));
+               HYPRE_GMRESSetAbsoluteTol     (schur_solver, hypre_ParILUDataSchurGMRESAbsoluteTol(ilu_data));
+               HYPRE_GMRESSetLogging         (schur_solver, hypre_ParILUDataSchurSolverLogging(ilu_data));
+               HYPRE_GMRESSetPrintLevel      (schur_solver,
+                                              hypre_ParILUDataSchurSolverPrintLevel(ilu_data));/* set to zero now, don't print */
+               HYPRE_GMRESSetRelChange       (schur_solver, hypre_ParILUDataSchurGMRESRelChange(ilu_data));
+
+               /* setup preconditioner parameters */
+               /* create Unit precond */
+               schur_precond = (HYPRE_Solver) ilu_vdata;
+
+               /* add preconditioner to solver */
+               HYPRE_GMRESSetPrecond(schur_solver,
+                                     (HYPRE_PtrToSolverFcn) hypre_ParILUSchurGMRESDummySolveDevice,
+                                     (HYPRE_PtrToSolverFcn) hypre_ParKrylovIdentitySetup,
+                                     schur_precond);
+
+               HYPRE_GMRESGetPrecond(schur_solver, &schur_precond_gotten);
+               if (schur_precond_gotten != (schur_precond))
+               {
+                  hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Schur complement got bad precond!");
+                  hypre_GpuProfilingPopRange();
+                  HYPRE_ANNOTATE_FUNC_END;
 
-               return(-1);
-            }
+                  return hypre_error_flag;
+               }
 
-            /* need to create working vector rhs and x for Schur System */
-            rhs = hypre_ParVectorCreate(comm,
-                                    hypre_ParCSRMatrixGlobalNumRows(matS),
-                                    hypre_ParCSRMatrixRowStarts(matS));
-            hypre_ParVectorInitialize(rhs);
-            x = hypre_ParVectorCreate(comm,
-                                    hypre_ParCSRMatrixGlobalNumRows(matS),
-                                    hypre_ParCSRMatrixRowStarts(matS));
-            hypre_ParVectorInitialize(x);
+               /* need to create working vector rhs and x for Schur System */
+               rhs = hypre_ParVectorCreate(comm,
+                                           hypre_ParCSRMatrixGlobalNumRows(matS),
+                                           hypre_ParCSRMatrixRowStarts(matS));
+               hypre_ParVectorInitialize(rhs);
+               x = hypre_ParVectorCreate(comm,
+                                         hypre_ParCSRMatrixGlobalNumRows(matS),
+                                         hypre_ParCSRMatrixRowStarts(matS));
+               hypre_ParVectorInitialize(x);
+
+               /* setup solver */
+               HYPRE_GMRESSetup(schur_solver,
+                                (HYPRE_Matrix) ilu_vdata,
+                                (HYPRE_Vector) rhs,
+                                (HYPRE_Vector) x);
+
+               /* solve for right-hand-side consists of only 1 */
+               hypre_Vector      *rhs_local = hypre_ParVectorLocalVector(rhs);
+               //HYPRE_Real        *Xtemp_data  = hypre_VectorData(Xtemp_local);
+               hypre_SeqVectorSetConstantValues(rhs_local, 1.0);
+
+               /* update ilu_data */
+               hypre_ParILUDataSchurSolver   (ilu_data) = schur_solver;
+               hypre_ParILUDataSchurPrecond  (ilu_data) = schur_precond;
+               hypre_ParILUDataRhs           (ilu_data) = rhs;
+               hypre_ParILUDataX             (ilu_data) = x;
+            }
+            else
+#endif
+            {
+               /* setup GMRES parameters */
+               HYPRE_ParCSRGMRESCreate(comm, &schur_solver);
+
+               HYPRE_GMRESSetKDim            (schur_solver, hypre_ParILUDataSchurGMRESKDim(ilu_data));
+               HYPRE_GMRESSetMaxIter         (schur_solver,
+                                              hypre_ParILUDataSchurGMRESMaxIter(ilu_data));/* we don't need that many solves */
+               HYPRE_GMRESSetTol             (schur_solver, hypre_ParILUDataSchurGMRESTol(ilu_data));
+               HYPRE_GMRESSetAbsoluteTol     (schur_solver, hypre_ParILUDataSchurGMRESAbsoluteTol(ilu_data));
+               HYPRE_GMRESSetLogging         (schur_solver, hypre_ParILUDataSchurSolverLogging(ilu_data));
+               HYPRE_GMRESSetPrintLevel      (schur_solver,
+                                              hypre_ParILUDataSchurSolverPrintLevel(ilu_data));/* set to zero now, don't print */
+               HYPRE_GMRESSetRelChange       (schur_solver, hypre_ParILUDataSchurGMRESRelChange(ilu_data));
+
+               /* setup preconditioner parameters */
+               /* create precond, the default is ILU0 */
+               HYPRE_ILUCreate               (&schur_precond);
+               HYPRE_ILUSetType              (schur_precond, hypre_ParILUDataSchurPrecondIluType(ilu_data));
+               HYPRE_ILUSetLevelOfFill       (schur_precond, hypre_ParILUDataSchurPrecondIluLfil(ilu_data));
+               HYPRE_ILUSetMaxNnzPerRow      (schur_precond, hypre_ParILUDataSchurPrecondIluMaxRowNnz(ilu_data));
+               HYPRE_ILUSetDropThresholdArray(schur_precond, hypre_ParILUDataSchurPrecondIluDroptol(ilu_data));
+               HYPRE_ILUSetPrintLevel        (schur_precond, hypre_ParILUDataSchurPrecondPrintLevel(ilu_data));
+               HYPRE_ILUSetTriSolve          (schur_precond, hypre_ParILUDataSchurPrecondTriSolve(ilu_data));
+               HYPRE_ILUSetMaxIter           (schur_precond, hypre_ParILUDataSchurPrecondMaxIter(ilu_data));
+               HYPRE_ILUSetLowerJacobiIters  (schur_precond,
+                                              hypre_ParILUDataSchurPrecondLowerJacobiIters(ilu_data));
+               HYPRE_ILUSetUpperJacobiIters  (schur_precond,
+                                              hypre_ParILUDataSchurPrecondUpperJacobiIters(ilu_data));
+               HYPRE_ILUSetTol               (schur_precond, hypre_ParILUDataSchurPrecondTol(ilu_data));
+
+               /* add preconditioner to solver */
+               HYPRE_GMRESSetPrecond(schur_solver,
+                                     (HYPRE_PtrToSolverFcn) HYPRE_ILUSolve,
+                                     (HYPRE_PtrToSolverFcn) HYPRE_ILUSetup,
+                                     schur_precond);
+
+               HYPRE_GMRESGetPrecond(schur_solver, &schur_precond_gotten);
+               if (schur_precond_gotten != (schur_precond))
+               {
+                  hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Schur complement got bad precond!");
+                  hypre_GpuProfilingPopRange();
+                  HYPRE_ANNOTATE_FUNC_END;
 
-            /* setup solver */
-            HYPRE_GMRESSetup(schur_solver,(HYPRE_Matrix)matS,(HYPRE_Vector)rhs,(HYPRE_Vector)x);
+                  return hypre_error_flag;
+               }
 
-            /* update ilu_data */
-            hypre_ParILUDataSchurSolver   (ilu_data) = schur_solver;
-            hypre_ParILUDataSchurPrecond  (ilu_data) = schur_precond;
-            hypre_ParILUDataRhs           (ilu_data) = rhs;
-            hypre_ParILUDataX             (ilu_data) = x;
-#endif
+               /* need to create working vector rhs and x for Schur System */
+               rhs = hypre_ParVectorCreate(comm,
+                                           hypre_ParCSRMatrixGlobalNumRows(matS),
+                                           hypre_ParCSRMatrixRowStarts(matS));
+               hypre_ParVectorInitialize(rhs);
+               x = hypre_ParVectorCreate(comm,
+                                         hypre_ParCSRMatrixGlobalNumRows(matS),
+                                         hypre_ParCSRMatrixRowStarts(matS));
+               hypre_ParVectorInitialize(x);
+
+               /* setup solver */
+               HYPRE_GMRESSetup(schur_solver,
+                                (HYPRE_Matrix) matS,
+                                (HYPRE_Vector) rhs,
+                                (HYPRE_Vector) x);
+
+               /* update ilu_data */
+               hypre_ParILUDataSchurSolver   (ilu_data) = schur_solver;
+               hypre_ParILUDataSchurPrecond  (ilu_data) = schur_precond;
+               hypre_ParILUDataRhs           (ilu_data) = rhs;
+               hypre_ParILUDataX             (ilu_data) = x;
+            }
          }
          break;
+
       case 20: case 21:
          if (matS)
          {
@@ -686,39 +686,46 @@ hypre_ILUSetup( void               *ilu_vdata,
 
             /* need to create working vector rhs and x for Schur System */
             rhs = hypre_ParVectorCreate(comm,
-                  hypre_ParCSRMatrixGlobalNumRows(matS),
-                  hypre_ParCSRMatrixRowStarts(matS));
+                                        hypre_ParCSRMatrixGlobalNumRows(matS),
+                                        hypre_ParCSRMatrixRowStarts(matS));
             hypre_ParVectorInitialize(rhs);
             x = hypre_ParVectorCreate(comm,
-                  hypre_ParCSRMatrixGlobalNumRows(matS),
-                  hypre_ParCSRMatrixRowStarts(matS));
+                                      hypre_ParCSRMatrixGlobalNumRows(matS),
+                                      hypre_ParCSRMatrixRowStarts(matS));
             hypre_ParVectorInitialize(x);
 
             /* setup solver */
-            hypre_NSHSetup(schur_solver,matS,rhs,x);
+            hypre_NSHSetup(schur_solver, matS, rhs, x);
 
             hypre_ParILUDataSchurSolver(ilu_data) = schur_solver;
             hypre_ParILUDataRhs        (ilu_data) = rhs;
             hypre_ParILUDataX          (ilu_data) = x;
          }
          break;
+
       case 30 : case 31:
          /* now check communication package */
          comm_pkg = hypre_ParCSRMatrixCommPkg(matA);
+
          /* create if not yet built */
          if (!comm_pkg)
          {
             hypre_MatvecCommPkgCreate(matA);
             comm_pkg = hypre_ParCSRMatrixCommPkg(matA);
          }
+
          /* create uext and fext */
-         send_size =  hypre_ParCSRCommPkgSendMapStart(comm_pkg,hypre_ParCSRCommPkgNumSends(comm_pkg))
-            - hypre_ParCSRCommPkgSendMapStart(comm_pkg,0);
+         num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
+         send_size = hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends) -
+                     hypre_ParCSRCommPkgSendMapStart(comm_pkg, 0);
          recv_size = hypre_CSRMatrixNumCols(hypre_ParCSRMatrixOffd(matA));
          buffer_size = send_size > recv_size ? send_size : recv_size;
-         fext = hypre_TAlloc(HYPRE_Real,buffer_size,HYPRE_MEMORY_HOST);
-         uext = hypre_TAlloc(HYPRE_Real,buffer_size,HYPRE_MEMORY_HOST);
+
+         /* TODO (VPM): Check these memory locations */
+         fext = hypre_TAlloc(HYPRE_Real, buffer_size, HYPRE_MEMORY_HOST);
+         uext = hypre_TAlloc(HYPRE_Real, buffer_size, HYPRE_MEMORY_HOST);
          break;
+
       case 40: case 41:
          if (matS)
          {
@@ -726,11 +733,13 @@ hypre_ILUSetup( void               *ilu_vdata,
             HYPRE_ParCSRGMRESCreate(comm, &schur_solver);
 
             HYPRE_GMRESSetKDim            (schur_solver, hypre_ParILUDataSchurGMRESKDim(ilu_data));
-            HYPRE_GMRESSetMaxIter         (schur_solver, hypre_ParILUDataSchurGMRESMaxIter(ilu_data));/* we don't need that many solves */
+            HYPRE_GMRESSetMaxIter         (schur_solver,
+                                           hypre_ParILUDataSchurGMRESMaxIter(ilu_data));/* we don't need that many solves */
             HYPRE_GMRESSetTol             (schur_solver, hypre_ParILUDataSchurGMRESTol(ilu_data));
             HYPRE_GMRESSetAbsoluteTol     (schur_solver, hypre_ParILUDataSchurGMRESAbsoluteTol(ilu_data));
             HYPRE_GMRESSetLogging         (schur_solver, hypre_ParILUDataSchurSolverLogging(ilu_data));
-            HYPRE_GMRESSetPrintLevel      (schur_solver, hypre_ParILUDataSchurSolverPrintLevel(ilu_data));/* set to zero now, don't print */
+            HYPRE_GMRESSetPrintLevel      (schur_solver,
+                                           hypre_ParILUDataSchurSolverPrintLevel(ilu_data));/* set to zero now, don't print */
             HYPRE_GMRESSetRelChange       (schur_solver, hypre_ParILUDataSchurGMRESRelChange(ilu_data));
 
             /* setup preconditioner parameters */
@@ -742,32 +751,44 @@ hypre_ILUSetup( void               *ilu_vdata,
             HYPRE_ILUSetDropThresholdArray(schur_precond, hypre_ParILUDataSchurPrecondIluDroptol(ilu_data));
             HYPRE_ILUSetPrintLevel        (schur_precond, hypre_ParILUDataSchurPrecondPrintLevel(ilu_data));
             HYPRE_ILUSetMaxIter           (schur_precond, hypre_ParILUDataSchurPrecondMaxIter(ilu_data));
+            HYPRE_ILUSetTriSolve          (schur_precond, hypre_ParILUDataSchurPrecondTriSolve(ilu_data));
+            HYPRE_ILUSetLowerJacobiIters  (schur_precond,
+                                           hypre_ParILUDataSchurPrecondLowerJacobiIters(ilu_data));
+            HYPRE_ILUSetUpperJacobiIters  (schur_precond,
+                                           hypre_ParILUDataSchurPrecondUpperJacobiIters(ilu_data));
             HYPRE_ILUSetTol               (schur_precond, hypre_ParILUDataSchurPrecondTol(ilu_data));
 
             /* add preconditioner to solver */
             HYPRE_GMRESSetPrecond(schur_solver,
-                     (HYPRE_PtrToSolverFcn) HYPRE_ILUSolve,
-                     (HYPRE_PtrToSolverFcn) HYPRE_ILUSetup,
-                                          schur_precond);
+                                  (HYPRE_PtrToSolverFcn) HYPRE_ILUSolve,
+                                  (HYPRE_PtrToSolverFcn) HYPRE_ILUSetup,
+                                  schur_precond);
+
             HYPRE_GMRESGetPrecond(schur_solver, &schur_precond_gotten);
             if (schur_precond_gotten != (schur_precond))
             {
-               hypre_printf("Schur complement got bad precond\n");
-               return(-1);
+               hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Schur complement got bad precond!");
+               hypre_GpuProfilingPopRange();
+               HYPRE_ANNOTATE_FUNC_END;
+
+               return hypre_error_flag;
             }
 
             /* need to create working vector rhs and x for Schur System */
             rhs = hypre_ParVectorCreate(comm,
-                                    hypre_ParCSRMatrixGlobalNumRows(matS),
-                                    hypre_ParCSRMatrixRowStarts(matS));
+                                        hypre_ParCSRMatrixGlobalNumRows(matS),
+                                        hypre_ParCSRMatrixRowStarts(matS));
             hypre_ParVectorInitialize(rhs);
             x = hypre_ParVectorCreate(comm,
-                                    hypre_ParCSRMatrixGlobalNumRows(matS),
-                                    hypre_ParCSRMatrixRowStarts(matS));
+                                      hypre_ParCSRMatrixGlobalNumRows(matS),
+                                      hypre_ParCSRMatrixRowStarts(matS));
             hypre_ParVectorInitialize(x);
 
             /* setup solver */
-            HYPRE_GMRESSetup(schur_solver,(HYPRE_Matrix)matS,(HYPRE_Vector)rhs,(HYPRE_Vector)x);
+            HYPRE_GMRESSetup(schur_solver,
+                             (HYPRE_Matrix) matS,
+                             (HYPRE_Vector) rhs,
+                             (HYPRE_Vector) x);
 
             /* update ilu_data */
             hypre_ParILUDataSchurSolver   (ilu_data) = schur_solver;
@@ -776,48 +797,48 @@ hypre_ILUSetup( void               *ilu_vdata,
             hypre_ParILUDataX             (ilu_data) = x;
          }
          break;
+
       case 50:
-      {
-#ifdef HYPRE_USING_CUDA
-         if (matS)
+#if defined(HYPRE_USING_GPU)
+         if (matS && exec == HYPRE_EXEC_DEVICE)
          {
-            /* create working vectors */
             Xtemp = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(matA),
-                                   hypre_ParCSRMatrixGlobalNumRows(matA),
-                                   hypre_ParCSRMatrixRowStarts(matA));
+                                          hypre_ParCSRMatrixGlobalNumRows(matA),
+                                          hypre_ParCSRMatrixRowStarts(matA));
             hypre_ParVectorInitialize(Xtemp);
 
             Ytemp = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(matA),
-                                   hypre_ParCSRMatrixGlobalNumRows(matA),
-                                   hypre_ParCSRMatrixRowStarts(matA));
+                                          hypre_ParCSRMatrixGlobalNumRows(matA),
+                                          hypre_ParCSRMatrixRowStarts(matA));
             hypre_ParVectorInitialize(Ytemp);
 
             Ftemp_upper = hypre_SeqVectorCreate(nLU);
-            hypre_VectorOwnsData(Ftemp_upper)   = 0;
-            hypre_VectorData(Ftemp_upper)       = hypre_VectorData(hypre_ParVectorLocalVector(Ftemp));
+            hypre_VectorOwnsData(Ftemp_upper) = 0;
+            hypre_VectorData(Ftemp_upper) = hypre_VectorData(hypre_ParVectorLocalVector(Ftemp));
             hypre_SeqVectorInitialize(Ftemp_upper);
 
             Utemp_lower = hypre_SeqVectorCreate(n - nLU);
-            hypre_VectorOwnsData(Utemp_lower)   = 0;
-            hypre_VectorData(Utemp_lower)       = hypre_VectorData(hypre_ParVectorLocalVector(Utemp)) + nLU;
+            hypre_VectorOwnsData(Utemp_lower) = 0;
+            hypre_VectorData(Utemp_lower) = nLU +
+                                            hypre_VectorData(hypre_ParVectorLocalVector(Utemp));
             hypre_SeqVectorInitialize(Utemp_lower);
 
             /* create GMRES */
-//            HYPRE_ParCSRGMRESCreate(comm, &schur_solver);
+            //            HYPRE_ParCSRGMRESCreate(comm, &schur_solver);
 
             hypre_GMRESFunctions * gmres_functions;
 
             gmres_functions =
                hypre_GMRESFunctionsCreate(
-                  hypre_CAlloc,
+                  hypre_ParKrylovCAlloc,
                   hypre_ParKrylovFree,
-                  hypre_ParILUCusparseSchurGMRESCommInfo, //parCSR A -> ilu_data
+                  hypre_ParILUSchurGMRESCommInfoDevice, //parCSR A -> ilu_data
                   hypre_ParKrylovCreateVector,
                   hypre_ParKrylovCreateVectorArray,
                   hypre_ParKrylovDestroyVector,
-                  hypre_ParILURAPSchurGMRESMatvecCreate, //parCSR A -- inactive
-                  hypre_ParILURAPSchurGMRESMatvec, //parCSR A -> ilu_data
-                  hypre_ParILURAPSchurGMRESMatvecDestroy, //parCSR A -- inactive
+                  hypre_ParKrylovMatvecCreate, //parCSR A -- inactive
+                  hypre_ParILURAPSchurGMRESMatvecDevice, //parCSR A -> ilu_data
+                  hypre_ParKrylovMatvecDestroy, //parCSR A -- inactive
                   hypre_ParKrylovInnerProd,
                   hypre_ParKrylovCopyVector,
                   hypre_ParKrylovClearVector,
@@ -825,117 +846,123 @@ hypre_ILUSetup( void               *ilu_vdata,
                   hypre_ParKrylovAxpy,
                   hypre_ParKrylovIdentitySetup, //parCSR A -- inactive
                   hypre_ParKrylovIdentity ); //parCSR A -- inactive
-            schur_solver = ( (HYPRE_Solver) hypre_GMRESCreate( gmres_functions ) );
+            schur_solver = (HYPRE_Solver) hypre_GMRESCreate(gmres_functions);
 
             /* setup GMRES parameters */
             /* at least should apply 1 solve */
             if (hypre_ParILUDataSchurGMRESKDim(ilu_data) == 0)
             {
-               hypre_ParILUDataSchurGMRESKDim(ilu_data) ++;
+               hypre_ParILUDataSchurGMRESKDim(ilu_data)++;
             }
             HYPRE_GMRESSetKDim            (schur_solver, hypre_ParILUDataSchurGMRESKDim(ilu_data));
-            HYPRE_GMRESSetMaxIter         (schur_solver, hypre_ParILUDataSchurGMRESMaxIter(ilu_data));/* we don't need that many solves */
+            HYPRE_GMRESSetMaxIter         (schur_solver,
+                                           hypre_ParILUDataSchurGMRESMaxIter(ilu_data));/* we don't need that many solves */
             HYPRE_GMRESSetTol             (schur_solver, hypre_ParILUDataSchurGMRESTol(ilu_data));
             HYPRE_GMRESSetAbsoluteTol     (schur_solver, hypre_ParILUDataSchurGMRESAbsoluteTol(ilu_data));
             HYPRE_GMRESSetLogging         (schur_solver, hypre_ParILUDataSchurSolverLogging(ilu_data));
-            HYPRE_GMRESSetPrintLevel      (schur_solver, hypre_ParILUDataSchurSolverPrintLevel(ilu_data));/* set to zero now, don't print */
+            HYPRE_GMRESSetPrintLevel      (schur_solver,
+                                           hypre_ParILUDataSchurSolverPrintLevel(ilu_data));/* set to zero now, don't print */
             HYPRE_GMRESSetRelChange       (schur_solver, hypre_ParILUDataSchurGMRESRelChange(ilu_data));
 
             /* setup preconditioner parameters */
             /* create Schur precond */
             schur_precond = (HYPRE_Solver) ilu_vdata;
+
             /* add preconditioner to solver */
             HYPRE_GMRESSetPrecond(schur_solver,
-                     (HYPRE_PtrToSolverFcn) hypre_ParILURAPSchurGMRESSolve,
-                     //(HYPRE_PtrToSolverFcn) hypre_ParILUCusparseSchurGMRESDummySolve,
-                     (HYPRE_PtrToSolverFcn) hypre_ParILURAPSchurGMRESDummySetup,
-                                          schur_precond);
+                                  (HYPRE_PtrToSolverFcn) hypre_ParILURAPSchurGMRESSolveDevice,
+                                  (HYPRE_PtrToSolverFcn) hypre_ParKrylovIdentitySetup,
+                                  schur_precond);
             HYPRE_GMRESGetPrecond(schur_solver, &schur_precond_gotten);
+
             if (schur_precond_gotten != (schur_precond))
             {
-               hypre_printf("Schur complement got bad precond\n");
-               return(-1);
+               hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Schur complement got bad precond!");
+               hypre_GpuProfilingPopRange();
+               HYPRE_ANNOTATE_FUNC_END;
+
+               return hypre_error_flag;
             }
 
             /* need to create working vector rhs and x for Schur System */
             rhs = hypre_ParVectorCreate(comm,
-                                    hypre_ParCSRMatrixGlobalNumRows(matS),
-                                    hypre_ParCSRMatrixRowStarts(matS));
+                                        hypre_ParCSRMatrixGlobalNumRows(matS),
+                                        hypre_ParCSRMatrixRowStarts(matS));
             hypre_ParVectorInitialize(rhs);
             x = hypre_ParVectorCreate(comm,
-                                    hypre_ParCSRMatrixGlobalNumRows(matS),
-                                    hypre_ParCSRMatrixRowStarts(matS));
+                                      hypre_ParCSRMatrixGlobalNumRows(matS),
+                                      hypre_ParCSRMatrixRowStarts(matS));
             hypre_ParVectorInitialize(x);
 
             /* setup solver */
-            HYPRE_GMRESSetup(schur_solver,(HYPRE_Matrix)ilu_vdata,(HYPRE_Vector)rhs,(HYPRE_Vector)x);
+            HYPRE_GMRESSetup(schur_solver,
+                             (HYPRE_Matrix) ilu_vdata,
+                             (HYPRE_Vector) rhs,
+                             (HYPRE_Vector) x);
 
             /* solve for right-hand-side consists of only 1 */
             //hypre_Vector      *rhs_local = hypre_ParVectorLocalVector(rhs);
             //HYPRE_Real        *Xtemp_data  = hypre_VectorData(Xtemp_local);
             //hypre_SeqVectorSetConstantValues(rhs_local, 1.0);
 
-            /* update ilu_data */
-            hypre_ParILUDataSchurSolver   (ilu_data) = schur_solver;
-            hypre_ParILUDataSchurPrecond  (ilu_data) = schur_precond;
-            hypre_ParILUDataRhs           (ilu_data) = rhs;
-            hypre_ParILUDataX             (ilu_data) = x;
+            /* Update ilu_data */
+            hypre_ParILUDataSchurSolver(ilu_data)  = schur_solver;
+            hypre_ParILUDataSchurPrecond(ilu_data) = schur_precond;
+            hypre_ParILUDataRhs(ilu_data)          = rhs;
+            hypre_ParILUDataX(ilu_data)            = x;
          }
-#else
-         /* need to create working vector rhs and x for Schur System */
-         HYPRE_Int      m = n - nLU;
-         HYPRE_BigInt   S_total_rows, S_row_starts[2];
-         HYPRE_BigInt   big_m = (HYPRE_BigInt)m;
-         hypre_MPI_Allreduce( &big_m, &S_total_rows, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
-
-         if ( S_total_rows > 0 )
+         else
+#endif
          {
-            /* create working vectors */
-            Xtemp = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(matA),
-                                      hypre_ParCSRMatrixGlobalNumRows(matA),
-                                      hypre_ParCSRMatrixRowStarts(matA));
-            hypre_ParVectorInitialize(Xtemp);
+            /* Need to create working vector rhs and x for Schur System */
+            HYPRE_Int      m = n - nLU;
+            HYPRE_BigInt   global_start, S_total_rows, S_row_starts[2];
+            HYPRE_BigInt   big_m = (HYPRE_BigInt) m;
 
-            Ytemp = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(matA),
-                                      hypre_ParCSRMatrixGlobalNumRows(matA),
-                                      hypre_ParCSRMatrixRowStarts(matA));
-            hypre_ParVectorInitialize(Ytemp);
+            hypre_MPI_Allreduce(&big_m, &S_total_rows, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
 
-            /* only do so when we hae the Schur Complement */
+            if (S_total_rows > 0)
             {
-               HYPRE_BigInt global_start;
-               hypre_MPI_Scan( &big_m, &global_start, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
-               S_row_starts[0] = global_start - m;
+               Xtemp = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(matA),
+                                             hypre_ParCSRMatrixGlobalNumRows(matA),
+                                             hypre_ParCSRMatrixRowStarts(matA));
+               hypre_ParVectorInitialize(Xtemp);
+
+               Ytemp = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(matA),
+                                             hypre_ParCSRMatrixGlobalNumRows(matA),
+                                             hypre_ParCSRMatrixRowStarts(matA));
+               hypre_ParVectorInitialize(Ytemp);
+
+               hypre_MPI_Scan(&big_m, &global_start, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
+               S_row_starts[0] = global_start - big_m;
                S_row_starts[1] = global_start;
-            }
 
-            rhs = hypre_ParVectorCreate(comm,
-                                    S_total_rows,
-                                    S_row_starts);
-            hypre_ParVectorInitialize(rhs);
+               rhs = hypre_ParVectorCreate(comm,
+                                           S_total_rows,
+                                           S_row_starts);
+               hypre_ParVectorInitialize(rhs);
 
-            x = hypre_ParVectorCreate(comm,
-                                    S_total_rows,
-                                    S_row_starts);
-            hypre_ParVectorInitialize(x);
+               x = hypre_ParVectorCreate(comm,
+                                         S_total_rows,
+                                         S_row_starts);
+               hypre_ParVectorInitialize(x);
 
-            /* add when necessary */
-            /* create GMRES */
-//            HYPRE_ParCSRGMRESCreate(comm, &schur_solver);
+               /* create GMRES */
+               //            HYPRE_ParCSRGMRESCreate(comm, &schur_solver);
 
-            hypre_GMRESFunctions * gmres_functions;
+               hypre_GMRESFunctions * gmres_functions;
 
-            gmres_functions =
+               gmres_functions =
                   hypre_GMRESFunctionsCreate(
-                     hypre_CAlloc,
+                     hypre_ParKrylovCAlloc,
                      hypre_ParKrylovFree,
-                     hypre_ParILURAPSchurGMRESCommInfoH, //parCSR A -> ilu_data
+                     hypre_ParILURAPSchurGMRESCommInfoHost, //parCSR A -> ilu_data
                      hypre_ParKrylovCreateVector,
                      hypre_ParKrylovCreateVectorArray,
                      hypre_ParKrylovDestroyVector,
-                     hypre_ParILURAPSchurGMRESMatvecCreateH, //parCSR A -- inactive
-                     hypre_ParILURAPSchurGMRESMatvecH, //parCSR A -> ilu_data
-                     hypre_ParILURAPSchurGMRESMatvecDestroyH, //parCSR A -- inactive
+                     hypre_ParKrylovMatvecCreate, //parCSR A -- inactive
+                     hypre_ParILURAPSchurGMRESMatvecHost, //parCSR A -> ilu_data
+                     hypre_ParKrylovMatvecDestroy, //parCSR A -- inactive
                      hypre_ParKrylovInnerProd,
                      hypre_ParKrylovCopyVector,
                      hypre_ParKrylovClearVector,
@@ -943,112 +970,116 @@ hypre_ILUSetup( void               *ilu_vdata,
                      hypre_ParKrylovAxpy,
                      hypre_ParKrylovIdentitySetup, //parCSR A -- inactive
                      hypre_ParKrylovIdentity ); //parCSR A -- inactive
-            schur_solver = ( (HYPRE_Solver) hypre_GMRESCreate( gmres_functions ) );
+               schur_solver = (HYPRE_Solver) hypre_GMRESCreate(gmres_functions);
 
-            /* setup GMRES parameters */
-            /* at least should apply 1 solve */
-            if (hypre_ParILUDataSchurGMRESKDim(ilu_data) == 0)
-            {
-               hypre_ParILUDataSchurGMRESKDim(ilu_data) ++;
-            }
-            HYPRE_GMRESSetKDim            (schur_solver, hypre_ParILUDataSchurGMRESKDim(ilu_data));
-            HYPRE_GMRESSetMaxIter         (schur_solver, hypre_ParILUDataSchurGMRESMaxIter(ilu_data));/* we don't need that many solves */
-            HYPRE_GMRESSetTol             (schur_solver, hypre_ParILUDataSchurGMRESTol(ilu_data));
-            HYPRE_GMRESSetAbsoluteTol     (schur_solver, hypre_ParILUDataSchurGMRESAbsoluteTol(ilu_data));
-            HYPRE_GMRESSetLogging         (schur_solver, hypre_ParILUDataSchurSolverLogging(ilu_data));
-            HYPRE_GMRESSetPrintLevel      (schur_solver, hypre_ParILUDataSchurSolverPrintLevel(ilu_data));/* set to zero now, don't print */
-            HYPRE_GMRESSetRelChange       (schur_solver, hypre_ParILUDataSchurGMRESRelChange(ilu_data));
+               /* setup GMRES parameters */
+               /* at least should apply 1 solve */
+               if (hypre_ParILUDataSchurGMRESKDim(ilu_data) == 0)
+               {
+                  hypre_ParILUDataSchurGMRESKDim(ilu_data)++;
+               }
+               HYPRE_GMRESSetKDim            (schur_solver, hypre_ParILUDataSchurGMRESKDim(ilu_data));
+               HYPRE_GMRESSetMaxIter         (schur_solver,
+                                              hypre_ParILUDataSchurGMRESMaxIter(ilu_data));/* we don't need that many solves */
+               HYPRE_GMRESSetTol             (schur_solver, hypre_ParILUDataSchurGMRESTol(ilu_data));
+               HYPRE_GMRESSetAbsoluteTol     (schur_solver, hypre_ParILUDataSchurGMRESAbsoluteTol(ilu_data));
+               HYPRE_GMRESSetLogging         (schur_solver, hypre_ParILUDataSchurSolverLogging(ilu_data));
+               HYPRE_GMRESSetPrintLevel      (schur_solver,
+                                              hypre_ParILUDataSchurSolverPrintLevel(ilu_data));/* set to zero now, don't print */
+               HYPRE_GMRESSetRelChange       (schur_solver, hypre_ParILUDataSchurGMRESRelChange(ilu_data));
+
+               /* setup preconditioner parameters */
+               /* create Schur precond */
+               schur_precond = (HYPRE_Solver) ilu_vdata;
+
+               /* add preconditioner to solver */
+               HYPRE_GMRESSetPrecond(schur_solver,
+                                     (HYPRE_PtrToSolverFcn) hypre_ParILURAPSchurGMRESSolveHost,
+                                     (HYPRE_PtrToSolverFcn) hypre_ParKrylovIdentitySetup,
+                                     schur_precond);
+               HYPRE_GMRESGetPrecond(schur_solver, &schur_precond_gotten);
+               if (schur_precond_gotten != (schur_precond))
+               {
+                  hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Schur complement got bad precond!");
+                  hypre_GpuProfilingPopRange();
+                  HYPRE_ANNOTATE_FUNC_END;
 
-            /* setup preconditioner parameters */
-            /* create Schur precond */
-            schur_precond = (HYPRE_Solver) ilu_vdata;
-            /* add preconditioner to solver */
-            HYPRE_GMRESSetPrecond(schur_solver,
-                     (HYPRE_PtrToSolverFcn) hypre_ParILURAPSchurGMRESSolveH,
-                     //(HYPRE_PtrToSolverFcn) hypre_ParILUCusparseSchurGMRESDummySolve,
-                     (HYPRE_PtrToSolverFcn) hypre_ParILURAPSchurGMRESDummySetupH,
-                                          schur_precond);
-            HYPRE_GMRESGetPrecond(schur_solver, &schur_precond_gotten);
-            if (schur_precond_gotten != (schur_precond))
-            {
-               hypre_printf("Schur complement got bad precond\n");
-               return(-1);
-            }
+                  return hypre_error_flag;
+               }
 
-            /* setup solver */
-            HYPRE_GMRESSetup(schur_solver,(HYPRE_Matrix)ilu_vdata,(HYPRE_Vector)rhs,(HYPRE_Vector)x);
+               /* setup solver */
+               HYPRE_GMRESSetup(schur_solver,
+                                (HYPRE_Matrix) ilu_vdata,
+                                (HYPRE_Vector) rhs,
+                                (HYPRE_Vector) x);
 
-            /* solve for right-hand-side consists of only 1 */
-            //hypre_Vector      *rhs_local = hypre_ParVectorLocalVector(rhs);
-            //HYPRE_Real        *Xtemp_data  = hypre_VectorData(Xtemp_local);
-            //hypre_SeqVectorSetConstantValues(rhs_local, 1.0);
-         }
-         /* update ilu_data */
-         hypre_ParILUDataSchurSolver   (ilu_data) = schur_solver;
-         hypre_ParILUDataSchurPrecond  (ilu_data) = schur_precond;
-         hypre_ParILUDataRhs           (ilu_data) = rhs;
-         hypre_ParILUDataX             (ilu_data) = x;
+               /* solve for right-hand-side consists of only 1 */
+               //hypre_Vector      *rhs_local = hypre_ParVectorLocalVector(rhs);
+               //HYPRE_Real        *Xtemp_data  = hypre_VectorData(Xtemp_local);
+               //hypre_SeqVectorSetConstantValues(rhs_local, 1.0);
+            } /* if (S_total_rows > 0) */
 
-#endif
-         break;
-      }
-      default:
+            /* Update ilu_data */
+            hypre_ParILUDataSchurSolver(ilu_data)  = schur_solver;
+            hypre_ParILUDataSchurPrecond(ilu_data) = schur_precond;
+            hypre_ParILUDataRhs(ilu_data)          = rhs;
+            hypre_ParILUDataX(ilu_data)            = x;
+         }
          break;
    }
+
    /* set pointers to ilu data */
-#ifdef HYPRE_USING_CUDA
-   /* set cusparse pointers */
-   //hypre_ParILUDataILUSolveBuffer(ilu_data)  = ilu_solve_buffer;
-   hypre_ParILUDataMatAILUDevice(ilu_data)      = matALU_d;
-   hypre_ParILUDataMatBILUDevice(ilu_data)      = matBLU_d;
-   hypre_ParILUDataMatSILUDevice(ilu_data)      = matSLU_d;
-   hypre_ParILUDataMatEDevice(ilu_data)         = matE_d;
-   hypre_ParILUDataMatFDevice(ilu_data)         = matF_d;
-   hypre_ParILUDataILUSolveBuffer(ilu_data)     = ilu_solve_buffer;
-   hypre_ParILUDataMatALILUSolveInfo(ilu_data)  = matAL_info;
-   hypre_ParILUDataMatAUILUSolveInfo(ilu_data)  = matAU_info;
-   hypre_ParILUDataMatBLILUSolveInfo(ilu_data)  = matBL_info;
-   hypre_ParILUDataMatBUILUSolveInfo(ilu_data)  = matBU_info;
-   hypre_ParILUDataMatSLILUSolveInfo(ilu_data)  = matSL_info;
-   hypre_ParILUDataMatSUILUSolveInfo(ilu_data)  = matSU_info;
-   hypre_ParILUDataAperm(ilu_data)              = Aperm;
-   hypre_ParILUDataR(ilu_data)                  = R;
-   hypre_ParILUDataP(ilu_data)                  = P;
-   hypre_ParILUDataFTempUpper(ilu_data)         = Ftemp_upper;
-   hypre_ParILUDataUTempLower(ilu_data)         = Utemp_lower;
-   hypre_ParILUDataMatAFakeDiagonal(ilu_data)   = A_diag_fake;
+   /* set device data pointers */
+#if defined(HYPRE_USING_GPU)
+   hypre_ParILUDataMatAILUDevice(ilu_data) = matALU_d;
+   hypre_ParILUDataMatBILUDevice(ilu_data) = matBLU_d;
+   hypre_ParILUDataMatSILUDevice(ilu_data) = matSLU_d;
+   hypre_ParILUDataMatEDevice(ilu_data)    = matE_d;
+   hypre_ParILUDataMatFDevice(ilu_data)    = matF_d;
+   hypre_ParILUDataAperm(ilu_data)         = Aperm;
+   hypre_ParILUDataR(ilu_data)             = R;
+   hypre_ParILUDataP(ilu_data)             = P;
+   hypre_ParILUDataFTempUpper(ilu_data)    = Ftemp_upper;
+   hypre_ParILUDataUTempLower(ilu_data)    = Utemp_lower;
+   hypre_ParILUDataADiagDiag(ilu_data)     = Adiag_diag;
+   hypre_ParILUDataSDiagDiag(ilu_data)     = Sdiag_diag;
 #endif
-   hypre_ParILUDataMatA(ilu_data)               = matA;
-   hypre_ParILUDataXTemp(ilu_data)              = Xtemp;
-   hypre_ParILUDataYTemp(ilu_data)              = Ytemp;
-   hypre_ParILUDataF(ilu_data)                  = F_array;
-   hypre_ParILUDataU(ilu_data)                  = U_array;
-   hypre_ParILUDataMatL(ilu_data)               = matL;
-   hypre_ParILUDataMatD(ilu_data)               = matD;
-   hypre_ParILUDataMatU(ilu_data)               = matU;
-   hypre_ParILUDataMatLModified(ilu_data)       = matmL;
-   hypre_ParILUDataMatDModified(ilu_data)       = matmD;
-   hypre_ParILUDataMatUModified(ilu_data)       = matmU;
-   hypre_ParILUDataMatS(ilu_data)               = matS;
-   hypre_ParILUDataCFMarkerArray(ilu_data)      = CF_marker_array;
-   hypre_ParILUDataPerm(ilu_data)               = perm;
-   hypre_ParILUDataQPerm(ilu_data)              = qperm;
-   hypre_ParILUDataNLU(ilu_data)                = nLU;
-   hypre_ParILUDataNI(ilu_data)                 = nI;
-   hypre_ParILUDataUEnd(ilu_data)               = u_end;
-   hypre_ParILUDataUExt(ilu_data)               = uext;
-   hypre_ParILUDataFExt(ilu_data)               = fext;
+
+   /* Set pointers to ilu data */
+   hypre_ParILUDataMatA(ilu_data)          = matA;
+   hypre_ParILUDataXTemp(ilu_data)         = Xtemp;
+   hypre_ParILUDataYTemp(ilu_data)         = Ytemp;
+   hypre_ParILUDataZTemp(ilu_data)         = Ztemp;
+   hypre_ParILUDataF(ilu_data)             = F_array;
+   hypre_ParILUDataU(ilu_data)             = U_array;
+   hypre_ParILUDataMatL(ilu_data)          = matL;
+   hypre_ParILUDataMatD(ilu_data)          = matD;
+   hypre_ParILUDataMatU(ilu_data)          = matU;
+   hypre_ParILUDataMatLModified(ilu_data)  = matmL;
+   hypre_ParILUDataMatDModified(ilu_data)  = matmD;
+   hypre_ParILUDataMatUModified(ilu_data)  = matmU;
+   hypre_ParILUDataMatS(ilu_data)          = matS;
+   hypre_ParILUDataCFMarkerArray(ilu_data) = CF_marker_array;
+   hypre_ParILUDataPerm(ilu_data)          = perm;
+   hypre_ParILUDataQPerm(ilu_data)         = qperm;
+   hypre_ParILUDataNLU(ilu_data)           = nLU;
+   hypre_ParILUDataNI(ilu_data)            = nI;
+   hypre_ParILUDataUEnd(ilu_data)          = u_end;
+   hypre_ParILUDataUExt(ilu_data)          = uext;
+   hypre_ParILUDataFExt(ilu_data)          = fext;
 
    /* compute operator complexity */
    hypre_ParCSRMatrixSetDNumNonzeros(matA);
    nnzS = 0.0;
+
    /* size_C is the size of global coarse grid, upper left part */
    size_C = hypre_ParCSRMatrixGlobalNumRows(matA);
-   /* switch to compute complexity */
 
-#ifdef HYPRE_USING_CUDA
+   /* switch to compute complexity */
+#if defined(HYPRE_USING_GPU)
    HYPRE_Int nnzBEF = 0;
-   HYPRE_Int nnzG;/* Global nnz */
+   HYPRE_Int nnzG; /* Global nnz */
+
    if (ilu_type == 0 && fill_level == 0)
    {
       /* The nnz is for sure 1.0 in this case */
@@ -1077,7 +1108,7 @@ hypre_ILUSetup( void               *ilu_vdata,
          /* if we have Schur system need to reduce it from size_C */
       }
       hypre_ParILUDataOperatorComplexity(ilu_data) =  ((HYPRE_Real)nnzG + nnzS) /
-                                           hypre_ParCSRMatrixDNumNonzeros(matA);
+                                                      hypre_ParCSRMatrixDNumNonzeros(matA);
    }
    else if (ilu_type == 50)
    {
@@ -1105,125 +1136,171 @@ hypre_ILUSetup( void               *ilu_vdata,
          /* if we have Schur system need to reduce it from size_C */
       }
       hypre_ParILUDataOperatorComplexity(ilu_data) =  ((HYPRE_Real)nnzG + nnzS) /
-                                           hypre_ParCSRMatrixDNumNonzeros(matA);
+                                                      hypre_ParCSRMatrixDNumNonzeros(matA);
    }
    else
-   {
 #endif
+   {
       if (matS)
       {
          hypre_ParCSRMatrixSetDNumNonzeros(matS);
          nnzS = hypre_ParCSRMatrixDNumNonzeros(matS);
-         /* if we have Schur system need to reduce it from size_C */
+
+         /* If we have Schur system need to reduce it from size_C */
          size_C -= hypre_ParCSRMatrixGlobalNumRows(matS);
-         switch(ilu_type)
+         switch (ilu_type)
          {
             case 10: case 11: case 40: case 41: case 50:
-               /* now we need to compute the preconditioner */
+               /* Now we need to compute the preconditioner */
                schur_precond_ilu = (hypre_ParILUData*) (hypre_ParILUDataSchurPrecond(ilu_data));
+
                /* borrow i for local nnz of S */
-               i = hypre_CSRMatrixNumNonzeros(hypre_ParCSRMatrixOffd(matS));
-               hypre_MPI_Allreduce(&i, &nnzS_offd, 1, HYPRE_MPI_INT, hypre_MPI_SUM, comm);
-               nnzS = nnzS * hypre_ParILUDataOperatorComplexity(schur_precond_ilu) +nnzS_offd;
+               nnzS_offd_local = hypre_CSRMatrixNumNonzeros(hypre_ParCSRMatrixOffd(matS));
+               hypre_MPI_Allreduce(&nnzS_offd_local, &nnzS_offd, 1, HYPRE_MPI_REAL,
+                                   hypre_MPI_SUM, comm);
+               nnzS = nnzS * hypre_ParILUDataOperatorComplexity(schur_precond_ilu) + nnzS_offd;
                break;
+
             case 20: case 21:
                schur_solver_nsh = (hypre_ParNSHData*) hypre_ParILUDataSchurSolver(ilu_data);
-               nnzS = nnzS * (hypre_ParNSHDataOperatorComplexity(schur_solver_nsh));
+               nnzS *= hypre_ParNSHDataOperatorComplexity(schur_solver_nsh);
                break;
+
             default:
                break;
          }
       }
 
-      hypre_ParILUDataOperatorComplexity(ilu_data) =  ((HYPRE_Real)size_C + nnzS +
-                                          hypre_ParCSRMatrixDNumNonzeros(matL) +
-                                          hypre_ParCSRMatrixDNumNonzeros(matU))/
-                                          hypre_ParCSRMatrixDNumNonzeros(matA);
-#ifdef HYPRE_USING_CUDA
+      hypre_ParILUDataOperatorComplexity(ilu_data) = ((HYPRE_Real)size_C + nnzS +
+                                                      hypre_ParCSRMatrixDNumNonzeros(matL) +
+                                                      hypre_ParCSRMatrixDNumNonzeros(matU)) /
+                                                     hypre_ParCSRMatrixDNumNonzeros(matA);
    }
-#endif
+
+   /* TODO (VPM): Move ILU statistics printout to its own function */
    if ((my_id == 0) && (print_level > 0))
    {
-      hypre_printf("ILU SETUP: operator complexity = %f  \n", hypre_ParILUDataOperatorComplexity(ilu_data));
+      hypre_printf("ILU SETUP: operator complexity = %f  \n",
+                   hypre_ParILUDataOperatorComplexity(ilu_data));
+      if (hypre_ParILUDataTriSolve(ilu_data))
+      {
+         hypre_printf("ILU SOLVE: using direct triangular solves\n",
+                      hypre_ParILUDataOperatorComplexity(ilu_data));
+      }
+      else
+      {
+         hypre_printf("ILU SOLVE: using iterative triangular solves\n",
+                      hypre_ParILUDataOperatorComplexity(ilu_data));
+      }
+
+#if defined (HYPRE_USING_ROCSPARSE)
+      HYPRE_Int i;
+
+      if (hypre_ParILUDataIterativeSetupType(ilu_data))
+      {
+         hypre_printf("ILU: iterative setup type = %d\n",
+                      hypre_ParILUDataIterativeSetupType(ilu_data));
+         hypre_printf("ILU: iterative setup option = %d\n",
+                      hypre_ParILUDataIterativeSetupOption(ilu_data));
+         if (hypre_ParILUDataIterativeSetupOption(ilu_data) & 0x2)
+         {
+            /* This path enables termination based on stopping tolerance */
+            hypre_printf("ILU: iterative setup tolerance = %g\n",
+                         hypre_ParILUDataIterativeSetupTolerance(ilu_data));
+         }
+         else
+         {
+            /* This path enables termination based on number of iterations */
+            hypre_printf("ILU: iterative setup max. iters = %d\n",
+                         hypre_ParILUDataIterativeSetupMaxIter(ilu_data));
+         }
+
+         /* TODO (VPM): Add min, max, avg statistics across ranks */
+         hypre_printf("ILU: iterative setup num. iters at rank 0 = %d\n",
+                      hypre_ParILUDataIterativeSetupNumIter(ilu_data));
+
+         /* Show convergence history */
+         if (hypre_ParILUDataIterativeSetupOption(ilu_data) & 0x10)
+         {
+            hypre_printf("ILU: iterative setup convergence history at rank 0:\n");
+            hypre_printf("%8s", "iter");
+            if (hypre_ParILUDataIterativeSetupOption(ilu_data) & 0x08)
+            {
+               hypre_printf(" %14s %14s", "residual", "rate");
+            }
+            if (hypre_ParILUDataIterativeSetupOption(ilu_data) & 0x04)
+            {
+               hypre_printf(" %14s %14s", "correction", "rate");
+            }
+            hypre_printf("\n");
+            printf("%8d", 0);
+            if (hypre_ParILUDataIterativeSetupOption(ilu_data) & 0x08)
+            {
+               hypre_printf(" %14.5e %14.5e",
+                            hypre_ParILUDataIterSetupResidualNorm(ilu_data, 0), 1.0);
+            }
+            if (hypre_ParILUDataIterativeSetupOption(ilu_data) & 0x04)
+            {
+               hypre_printf(" %14.5e %14.5e",
+                            hypre_ParILUDataIterSetupCorrectionNorm(ilu_data, 0), 1.0);
+            }
+            hypre_printf("\n");
+
+            for (i = 1; i < hypre_ParILUDataIterativeSetupNumIter(ilu_data); i++)
+            {
+               printf("%8d", i);
+               if (hypre_ParILUDataIterativeSetupOption(ilu_data) & 0x08)
+               {
+                  hypre_printf(" %14.5e %14.5e",
+                               hypre_ParILUDataIterSetupResidualNorm(ilu_data, i),
+                               hypre_ParILUDataIterSetupResidualNorm(ilu_data, i) /
+                               hypre_ParILUDataIterSetupResidualNorm(ilu_data, i - 1));
+               }
+               if (hypre_ParILUDataIterativeSetupOption(ilu_data) & 0x04)
+               {
+                  hypre_printf(" %14.5e %14.5e",
+                               hypre_ParILUDataIterSetupCorrectionNorm(ilu_data, i),
+                               hypre_ParILUDataIterSetupCorrectionNorm(ilu_data, i) /
+                               hypre_ParILUDataIterSetupCorrectionNorm(ilu_data, i - 1));
+               }
+               hypre_printf("\n");
+            }
+         }
+      }
+#endif
    }
 
-   if ( logging > 1 ) {
+   if (logging > 1)
+   {
       residual =
          hypre_ParVectorCreate(hypre_ParCSRMatrixComm(matA),
-               hypre_ParCSRMatrixGlobalNumRows(matA),
-               hypre_ParCSRMatrixRowStarts(matA) );
+                               hypre_ParCSRMatrixGlobalNumRows(matA),
+                               hypre_ParCSRMatrixRowStarts(matA) );
       hypre_ParVectorInitialize(residual);
       hypre_ParILUDataResidual(ilu_data) = residual;
    }
-   else{
+   else
+   {
       hypre_ParILUDataResidual(ilu_data) = NULL;
    }
-   rel_res_norms = hypre_CTAlloc(HYPRE_Real, hypre_ParILUDataMaxIter(ilu_data), HYPRE_MEMORY_HOST);
+   rel_res_norms = hypre_CTAlloc(HYPRE_Real,
+                                 hypre_ParILUDataMaxIter(ilu_data),
+                                 HYPRE_MEMORY_HOST);
    hypre_ParILUDataRelResNorms(ilu_data) = rel_res_norms;
-   HYPRE_ANNOTATE_FUNC_END;
-
-   return hypre_error_flag;
-}
-
-#ifdef HYPRE_USING_CUDA
-
-/* Extract submatrix from diagonal part of A into a new CSRMatrix without sort rows
- * WARNING: We don't put diagonal to the first entry of each row since this function is now for cuSparse only
- * A = input matrix
- * perm = permutation array indicating ordering of rows. Perm could come from a
- *    CF_marker array or a reordering routine.
- * rqperm = reverse permutation array indicating ordering of columns
- * A_diagp = pointer to the output diagonal matrix.
- */
-HYPRE_Int
-hypre_ParILUCusparseExtractDiagonalCSR( hypre_ParCSRMatrix *A,
-                                        HYPRE_Int          *perm,
-                                        HYPRE_Int          *rqperm,
-                                        hypre_CSRMatrix   **A_diagp )
-{
-   /* Get necessary slots */
-   hypre_CSRMatrix     *A_diag         = hypre_ParCSRMatrixDiag(A);
-   HYPRE_Int           *A_diag_i       = hypre_CSRMatrixI(A_diag);
-   HYPRE_Int           *A_diag_j       = hypre_CSRMatrixJ(A_diag);
-   HYPRE_Real          *A_diag_data    = hypre_CSRMatrixData(A_diag);
-   HYPRE_Int            n              = hypre_CSRMatrixNumRows(A_diag);
-   HYPRE_Int            nnz_A_diag     = A_diag_i[n];
-
-   HYPRE_Int            i, j, current_idx;
-
-   /* No schur complement makes everything easy :) */
-   hypre_CSRMatrix  *B              = NULL;
-   B                                = hypre_CSRMatrixCreate(n, n, nnz_A_diag);
-   hypre_CSRMatrixInitialize(B);
-   HYPRE_Int        *B_i            = hypre_CSRMatrixI(B);
-   HYPRE_Int        *B_j            = hypre_CSRMatrixJ(B);
-   HYPRE_Real       *B_data         = hypre_CSRMatrixData(B);
-
-   /* Copy everything in with permutation */
-   current_idx = 0;
-   for ( i = 0; i < n; i++ )
-   {
-      B_i[i] = current_idx;
-      for (j = A_diag_i[perm[i]] ; j < A_diag_i[perm[i]+1] ; j ++)
-      {
-         B_j[current_idx] = rqperm[A_diag_j[j]];
-         B_data[current_idx++] = A_diag_data[j];
-      }
-   }
-   B_i[n] = current_idx;
 
-   hypre_assert(current_idx == nnz_A_diag);
-   *A_diagp = B;
+   hypre_GpuProfilingPopRange();
+   HYPRE_ANNOTATE_FUNC_END;
 
    return hypre_error_flag;
 }
 
-/* Extract submatrix from diagonal part of A into a
- * | B F |
- * | E C |
- * Struct in order to do ILU with cusparse.
- * WARNING: Cusparse requires each row been sorted by column
- *          This function only works when rows are sorted!.
+/*--------------------------------------------------------------------------
+ * hypre_ParILUExtractEBFC
+ *
+ * Extract submatrix from diagonal part of A into
+ *    | B F |
+ *    | E C |
+ *
  * A = input matrix
  * perm = permutation array indicating ordering of rows. Perm could come from a
  *    CF_marker array or a reordering routine.
@@ -1232,71 +1309,63 @@ hypre_ParILUCusparseExtractDiagonalCSR( hypre_ParCSRMatrix *A,
  * Cp = pointer to the output C matrix.
  * Ep = pointer to the output E matrix.
  * Fp = pointer to the output F matrix.
- */
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_ParILUCusparseILUExtractEBFC(hypre_CSRMatrix *A_diag, HYPRE_Int nLU, hypre_CSRMatrix **Bp, hypre_CSRMatrix **Cp, hypre_CSRMatrix **Ep, hypre_CSRMatrix **Fp)
+hypre_ParILUExtractEBFC(hypre_CSRMatrix   *A_diag,
+                        HYPRE_Int          nLU,
+                        hypre_CSRMatrix  **Bp,
+                        hypre_CSRMatrix  **Cp,
+                        hypre_CSRMatrix  **Ep,
+                        hypre_CSRMatrix  **Fp)
 {
    /* Get necessary slots */
-   HYPRE_Int           *A_diag_i       = hypre_CSRMatrixI(A_diag);
-   HYPRE_Int           *A_diag_j       = hypre_CSRMatrixJ(A_diag);
-   HYPRE_Real          *A_diag_data    = hypre_CSRMatrixData(A_diag);
-   HYPRE_Int            n              = hypre_CSRMatrixNumRows(A_diag);
-   HYPRE_Int            nnz_A_diag     = A_diag_i[n];
-
+   HYPRE_Int            n                = hypre_CSRMatrixNumRows(A_diag);
+   HYPRE_Int            nnz_A_diag       = hypre_CSRMatrixNumNonzeros(A_diag);
+   HYPRE_MemoryLocation memory_location  = hypre_CSRMatrixMemoryLocation(A_diag);
+
+   hypre_CSRMatrix     *B = NULL;
+   hypre_CSRMatrix     *C = NULL;
+   hypre_CSRMatrix     *E = NULL;
+   hypre_CSRMatrix     *F = NULL;
    HYPRE_Int            i, j, row, col;
 
    hypre_assert(nLU >= 0 && nLU <= n);
 
    if (nLU == n)
    {
-      /* No schur complement makes everything easy :) */
-      hypre_CSRMatrix  *B              = NULL;
-      hypre_CSRMatrix  *C              = NULL;
-      hypre_CSRMatrix  *E              = NULL;
-      hypre_CSRMatrix  *F              = NULL;
-      B                                = hypre_CSRMatrixCreate(n, n, nnz_A_diag);
-      hypre_CSRMatrixInitialize(B);
+      /* No Schur complement */
+      B = hypre_CSRMatrixCreate(n, n, nnz_A_diag);
+      C = hypre_CSRMatrixCreate(0, 0, 0);
+      E = hypre_CSRMatrixCreate(0, 0, 0);
+      F = hypre_CSRMatrixCreate(0, 0, 0);
+
+      hypre_CSRMatrixInitialize_v2(B, 0, memory_location);
+      hypre_CSRMatrixInitialize_v2(C, 0, memory_location);
+      hypre_CSRMatrixInitialize_v2(E, 0, memory_location);
+      hypre_CSRMatrixInitialize_v2(F, 0, memory_location);
+
       hypre_CSRMatrixCopy(A_diag, B, 1);
-      C                                = hypre_CSRMatrixCreate(0, 0, 0);
-      hypre_CSRMatrixInitialize(C);
-      E                                = hypre_CSRMatrixCreate(0, 0, 0);
-      hypre_CSRMatrixInitialize(E);
-      F                                = hypre_CSRMatrixCreate(0, 0, 0);
-      hypre_CSRMatrixInitialize(F);
-      *Bp = B;
-      *Cp = C;
-      *Ep = E;
-      *Fp = F;
-   }
-   else if (nLU ==0)
-   {
-      /* All schur complement also makes everything easy :) */
-      hypre_CSRMatrix  *B              = NULL;
-      hypre_CSRMatrix  *C              = NULL;
-      hypre_CSRMatrix  *E              = NULL;
-      hypre_CSRMatrix  *F              = NULL;
-      C                                = hypre_CSRMatrixCreate(n, n, nnz_A_diag);
-      hypre_CSRMatrixInitialize(C);
+   }
+   else if (nLU == 0)
+   {
+      /* All Schur complement */
+      C = hypre_CSRMatrixCreate(n, n, nnz_A_diag);
+      B = hypre_CSRMatrixCreate(0, 0, 0);
+      E = hypre_CSRMatrixCreate(0, 0, 0);
+      F = hypre_CSRMatrixCreate(0, 0, 0);
+
+      hypre_CSRMatrixInitialize_v2(C, 0, memory_location);
+      hypre_CSRMatrixInitialize_v2(B, 0, memory_location);
+      hypre_CSRMatrixInitialize_v2(E, 0, memory_location);
+      hypre_CSRMatrixInitialize_v2(F, 0, memory_location);
+
       hypre_CSRMatrixCopy(A_diag, C, 1);
-      B                                = hypre_CSRMatrixCreate(0, 0, 0);
-      hypre_CSRMatrixInitialize(B);
-      E                                = hypre_CSRMatrixCreate(0, 0, 0);
-      hypre_CSRMatrixInitialize(E);
-      F                                = hypre_CSRMatrixCreate(0, 0, 0);
-      hypre_CSRMatrixInitialize(F);
-      *Bp = B;
-      *Cp = C;
-      *Ep = E;
-      *Fp = F;
    }
    else
    {
-      /* Has schur complement :( */
-      HYPRE_Int         m              = n - nLU;
-      hypre_CSRMatrix  *B              = NULL;
-      hypre_CSRMatrix  *C              = NULL;
-      hypre_CSRMatrix  *E              = NULL;
-      hypre_CSRMatrix  *F              = NULL;
+      /* Has schur complement */
+      HYPRE_Int         m = n - nLU;
       HYPRE_Int         capacity_B;
       HYPRE_Int         capacity_E;
       HYPRE_Int         capacity_F;
@@ -1306,60 +1375,75 @@ hypre_ParILUCusparseILUExtractEBFC(hypre_CSRMatrix *A_diag, HYPRE_Int nLU, hypre
       HYPRE_Int         ctrE;
       HYPRE_Int         ctrF;
 
-      HYPRE_Int        *B_i            = NULL;
-      HYPRE_Int        *C_i            = NULL;
-      HYPRE_Int        *E_i            = NULL;
-      HYPRE_Int        *F_i            = NULL;
-      HYPRE_Int        *B_j            = NULL;
-      HYPRE_Int        *C_j            = NULL;
-      HYPRE_Int        *E_j            = NULL;
-      HYPRE_Int        *F_j            = NULL;
-      HYPRE_Real       *B_data         = NULL;
-      HYPRE_Real       *C_data         = NULL;
-      HYPRE_Real       *E_data         = NULL;
-      HYPRE_Real       *F_data         = NULL;
+      HYPRE_Int        *B_i    = NULL;
+      HYPRE_Int        *C_i    = NULL;
+      HYPRE_Int        *E_i    = NULL;
+      HYPRE_Int        *F_i    = NULL;
+      HYPRE_Int        *B_j    = NULL;
+      HYPRE_Int        *C_j    = NULL;
+      HYPRE_Int        *E_j    = NULL;
+      HYPRE_Int        *F_j    = NULL;
+      HYPRE_Complex    *B_data = NULL;
+      HYPRE_Complex    *C_data = NULL;
+      HYPRE_Complex    *E_data = NULL;
+      HYPRE_Complex    *F_data = NULL;
+
+      hypre_CSRMatrix  *h_A_diag;
+      HYPRE_Int        *A_diag_i;
+      HYPRE_Int        *A_diag_j;
+      HYPRE_Complex    *A_diag_data;
+
+      /* Create/Get host pointer for A_diag */
+      h_A_diag = (hypre_GetActualMemLocation(memory_location) == hypre_MEMORY_DEVICE) ?
+                 hypre_CSRMatrixClone_v2(A_diag, 1, HYPRE_MEMORY_HOST) : A_diag;
+      A_diag_i = hypre_CSRMatrixI(h_A_diag);
+      A_diag_j = hypre_CSRMatrixJ(h_A_diag);
+      A_diag_data = hypre_CSRMatrixData(h_A_diag);
+
+      /* Estimate # of nonzeros */
+      capacity_B = (HYPRE_Int) (nLU + hypre_ceil(nnz_A_diag * 1.0 * nLU / n * nLU / n));
+      capacity_C = (HYPRE_Int) (m + hypre_ceil(nnz_A_diag * 1.0 * m / n * m / n));
+      capacity_E = (HYPRE_Int) (hypre_min(m, nLU) + hypre_ceil(nnz_A_diag * 1.0 * nLU / n * m / n));
+      capacity_F = capacity_E;
 
       /* Create CSRMatrices */
-      B                                = hypre_CSRMatrixCreate(nLU, nLU, 0);
-      hypre_CSRMatrixInitialize(B);
-      C                                = hypre_CSRMatrixCreate(m, m, 0);
-      hypre_CSRMatrixInitialize(C);
-      E                                = hypre_CSRMatrixCreate(m, nLU, 0);
-      hypre_CSRMatrixInitialize(E);
-      F                                = hypre_CSRMatrixCreate(nLU, m, 0);
-      hypre_CSRMatrixInitialize(F);
+      B = hypre_CSRMatrixCreate(nLU, nLU, capacity_B);
+      C = hypre_CSRMatrixCreate(m, m, capacity_C);
+      E = hypre_CSRMatrixCreate(m, nLU, capacity_E);
+      F = hypre_CSRMatrixCreate(nLU, m, capacity_F);
 
-      /* Estimate # of nonzeros */
-      capacity_B                       = nLU + ceil(nnz_A_diag * 1.0 * nLU / n * nLU / n);
-      capacity_C                       = m + ceil(nnz_A_diag * 1.0 * m / n * m / n);
-      capacity_E                       = hypre_min(m, nLU) + ceil(nnz_A_diag * 1.0 * nLU / n * m / n);
-      capacity_F                       = capacity_E;
-
-      /* Allocate memory */
-      B_i                              = hypre_CSRMatrixI(B);
-      B_j                              = hypre_CTAlloc(HYPRE_Int, capacity_B, HYPRE_MEMORY_DEVICE);
-      B_data                           = hypre_CTAlloc(HYPRE_Real, capacity_B, HYPRE_MEMORY_DEVICE);
-      C_i                              = hypre_CSRMatrixI(C);
-      C_j                              = hypre_CTAlloc(HYPRE_Int, capacity_C, HYPRE_MEMORY_DEVICE);
-      C_data                           = hypre_CTAlloc(HYPRE_Real, capacity_C, HYPRE_MEMORY_DEVICE);
-      E_i                              = hypre_CSRMatrixI(E);
-      E_j                              = hypre_CTAlloc(HYPRE_Int, capacity_E, HYPRE_MEMORY_DEVICE);
-      E_data                           = hypre_CTAlloc(HYPRE_Real, capacity_E, HYPRE_MEMORY_DEVICE);
-      F_i                              = hypre_CSRMatrixI(F);
-      F_j                              = hypre_CTAlloc(HYPRE_Int, capacity_F, HYPRE_MEMORY_DEVICE);
-      F_data                           = hypre_CTAlloc(HYPRE_Real, capacity_F, HYPRE_MEMORY_DEVICE);
-      ctrB                             = 0;
-      ctrC                             = 0;
-      ctrE                             = 0;
-      ctrF                             = 0;
+      /* Initialize matrices on the host */
+      hypre_CSRMatrixInitialize_v2(B, 0, HYPRE_MEMORY_HOST);
+      hypre_CSRMatrixInitialize_v2(C, 0, HYPRE_MEMORY_HOST);
+      hypre_CSRMatrixInitialize_v2(E, 0, HYPRE_MEMORY_HOST);
+      hypre_CSRMatrixInitialize_v2(F, 0, HYPRE_MEMORY_HOST);
+
+      /* Access pointers */
+      B_i    = hypre_CSRMatrixI(B);
+      B_j    = hypre_CSRMatrixJ(B);
+      B_data = hypre_CSRMatrixData(B);
+
+      C_i    = hypre_CSRMatrixI(C);
+      C_j    = hypre_CSRMatrixJ(C);
+      C_data = hypre_CSRMatrixData(C);
+
+      E_i    = hypre_CSRMatrixI(E);
+      E_j    = hypre_CSRMatrixJ(E);
+      E_data = hypre_CSRMatrixData(E);
+
+      F_i    = hypre_CSRMatrixI(F);
+      F_j    = hypre_CSRMatrixJ(F);
+      F_data = hypre_CSRMatrixData(F);
+
+      ctrB = ctrC = ctrE = ctrF = 0;
 
       /* Loop to copy data */
       /* B and F first */
       for (i = 0; i < nLU; i++)
       {
-         B_i[i]   = ctrB;
-         F_i[i]   = ctrF;
-         for (j = A_diag_i[i]; j < A_diag_i[i+1]; j++)
+         B_i[i] = ctrB;
+         F_i[i] = ctrF;
+         for (j = A_diag_i[i]; j < A_diag_i[i + 1]; j++)
          {
             col = A_diag_j[j];
             if (col >= nLU)
@@ -1373,24 +1457,28 @@ hypre_ParILUCusparseILUExtractEBFC(hypre_CSRMatrix *A_diag, HYPRE_Int nLU, hypre
             {
                HYPRE_Int tmp;
                tmp = capacity_B;
-               capacity_B = capacity_B * EXPAND_FACT + 1;
-               B_j = hypre_TReAlloc_v2(B_j, HYPRE_Int, tmp, HYPRE_Int, capacity_B, HYPRE_MEMORY_DEVICE);
-               B_data = hypre_TReAlloc_v2(B_data, HYPRE_Real, tmp, HYPRE_Real, capacity_B, HYPRE_MEMORY_DEVICE);
+               capacity_B = (HYPRE_Int)(capacity_B * EXPAND_FACT + 1);
+               B_j = hypre_TReAlloc_v2(B_j, HYPRE_Int, tmp, HYPRE_Int,
+                                       capacity_B, HYPRE_MEMORY_HOST);
+               B_data = hypre_TReAlloc_v2(B_data, HYPRE_Complex, tmp, HYPRE_Complex,
+                                          capacity_B, HYPRE_MEMORY_HOST);
             }
          }
-         for (; j < A_diag_i[i+1]; j++)
+         for (; j < A_diag_i[i + 1]; j++)
          {
-            col = A_diag_j[j];
-            col = col - nLU;
+            col = A_diag_j[j] - nLU;
+            hypre_assert(col >= 0);
             F_j[ctrF] = col;
             F_data[ctrF++] = A_diag_data[j];
             if (ctrF >= capacity_F)
             {
                HYPRE_Int tmp;
                tmp = capacity_F;
-               capacity_F = capacity_F * EXPAND_FACT + 1;
-               F_j = hypre_TReAlloc_v2(F_j, HYPRE_Int, tmp, HYPRE_Int, capacity_F, HYPRE_MEMORY_DEVICE);
-               F_data = hypre_TReAlloc_v2(F_data, HYPRE_Real, tmp, HYPRE_Real, capacity_F, HYPRE_MEMORY_DEVICE);
+               capacity_F = (HYPRE_Int)(capacity_F * EXPAND_FACT + 1);
+               F_j = hypre_TReAlloc_v2(F_j, HYPRE_Int, tmp, HYPRE_Int,
+                                       capacity_F, HYPRE_MEMORY_HOST);
+               F_data = hypre_TReAlloc_v2(F_data, HYPRE_Complex, tmp, HYPRE_Complex,
+                                          capacity_F, HYPRE_MEMORY_HOST);
             }
          }
       }
@@ -1403,7 +1491,7 @@ hypre_ParILUCusparseILUExtractEBFC(hypre_CSRMatrix *A_diag, HYPRE_Int nLU, hypre
          row = i - nLU;
          E_i[row] = ctrE;
          C_i[row] = ctrC;
-         for (j = A_diag_i[i]; j < A_diag_i[i+1]; j++)
+         for (j = A_diag_i[i]; j < A_diag_i[i + 1]; j++)
          {
             col = A_diag_j[j];
             if (col >= nLU)
@@ -1417,1870 +1505,382 @@ hypre_ParILUCusparseILUExtractEBFC(hypre_CSRMatrix *A_diag, HYPRE_Int nLU, hypre
             {
                HYPRE_Int tmp;
                tmp = capacity_E;
-               capacity_E = capacity_E * EXPAND_FACT + 1;
-               E_j = hypre_TReAlloc_v2(E_j, HYPRE_Int, tmp, HYPRE_Int, capacity_E, HYPRE_MEMORY_DEVICE);
-               E_data = hypre_TReAlloc_v2(E_data, HYPRE_Real, tmp, HYPRE_Real, capacity_E, HYPRE_MEMORY_DEVICE);
+               capacity_E = (HYPRE_Int)(capacity_E * EXPAND_FACT + 1);
+               E_j = hypre_TReAlloc_v2(E_j, HYPRE_Int, tmp, HYPRE_Int,
+                                       capacity_E, HYPRE_MEMORY_HOST);
+               E_data = hypre_TReAlloc_v2(E_data, HYPRE_Complex, tmp, HYPRE_Complex,
+                                          capacity_E, HYPRE_MEMORY_HOST);
             }
          }
-         for (; j < A_diag_i[i+1]; j++)
+         for (; j < A_diag_i[i + 1]; j++)
          {
-            col = A_diag_j[j];
-            col = col - nLU;
+            col = A_diag_j[j] - nLU;
+            hypre_assert(col >= 0);
             C_j[ctrC] = col;
             C_data[ctrC++] = A_diag_data[j];
             if (ctrC >= capacity_C)
             {
                HYPRE_Int tmp;
                tmp = capacity_C;
-               capacity_C = capacity_C * EXPAND_FACT + 1;
-               C_j = hypre_TReAlloc_v2(C_j, HYPRE_Int, tmp, HYPRE_Int, capacity_C, HYPRE_MEMORY_DEVICE);
-               C_data = hypre_TReAlloc_v2(C_data, HYPRE_Real, tmp, HYPRE_Real, capacity_C, HYPRE_MEMORY_DEVICE);
+               capacity_C = (HYPRE_Int)(capacity_C * EXPAND_FACT + 1);
+               C_j = hypre_TReAlloc_v2(C_j, HYPRE_Int, tmp, HYPRE_Int,
+                                       capacity_C, HYPRE_MEMORY_HOST);
+               C_data = hypre_TReAlloc_v2(C_data, HYPRE_Complex, tmp, HYPRE_Complex,
+                                          capacity_C, HYPRE_MEMORY_HOST);
             }
          }
       }
       E_i[m] = ctrE;
       C_i[m] = ctrC;
 
-      hypre_assert((ctrB+ctrC+ctrE+ctrF) == nnz_A_diag);
+      hypre_assert((ctrB + ctrC + ctrE + ctrF) == nnz_A_diag);
 
-      /* Create CSRMatrices */
-      hypre_CSRMatrixJ(B)              = B_j;
-      hypre_CSRMatrixData(B)           = B_data;
-      hypre_CSRMatrixNumNonzeros(B)    = ctrB;
-      hypre_CSRMatrixSetDataOwner(B, 1);
-      *Bp                              = B;
-
-      hypre_CSRMatrixJ(C)              = C_j;
-      hypre_CSRMatrixData(C)           = C_data;
-      hypre_CSRMatrixNumNonzeros(C)    = ctrC;
-      hypre_CSRMatrixSetDataOwner(C, 1);
-      *Cp                              = C;
-
-      hypre_CSRMatrixJ(E)              = E_j;
-      hypre_CSRMatrixData(E)           = E_data;
-      hypre_CSRMatrixNumNonzeros(E)    = ctrE;
-      hypre_CSRMatrixSetDataOwner(E, 1);
-      *Ep                              = E;
-
-      hypre_CSRMatrixJ(F)              = F_j;
-      hypre_CSRMatrixData(F)           = F_data;
-      hypre_CSRMatrixNumNonzeros(F)    = ctrF;
-      hypre_CSRMatrixSetDataOwner(F, 1);
-      *Fp                              = F;
-   }
-
-   return hypre_error_flag;
-}
+      /* Update pointers */
+      hypre_CSRMatrixJ(B)           = B_j;
+      hypre_CSRMatrixData(B)        = B_data;
+      hypre_CSRMatrixNumNonzeros(B) = ctrB;
 
-/* Wrapper for ILU0 with cusparse on a matrix, csr sort was done in this function */
-HYPRE_Int
-HYPRE_ILUSetupCusparseCSRILU0(hypre_CSRMatrix *A, cusparseSolvePolicy_t ilu_solve_policy)
-{
+      hypre_CSRMatrixJ(C)           = C_j;
+      hypre_CSRMatrixData(C)        = C_data;
+      hypre_CSRMatrixNumNonzeros(C) = ctrC;
 
-   /* data objects for A */
-   HYPRE_Int               n                    = hypre_CSRMatrixNumRows(A);
-   HYPRE_Int               m                    = hypre_CSRMatrixNumCols(A);
+      hypre_CSRMatrixJ(E)           = E_j;
+      hypre_CSRMatrixData(E)        = E_data;
+      hypre_CSRMatrixNumNonzeros(E) = ctrE;
 
-   hypre_assert(n == m);
+      hypre_CSRMatrixJ(F)           = F_j;
+      hypre_CSRMatrixData(F)        = F_data;
+      hypre_CSRMatrixNumNonzeros(F) = ctrF;
 
-   HYPRE_Real              *A_data              = hypre_CSRMatrixData(A);
-   HYPRE_Int               *A_i                 = hypre_CSRMatrixI(A);
-   HYPRE_Int               *A_j                 = hypre_CSRMatrixJ(A);
-   HYPRE_Int               nnz_A                = hypre_CSRMatrixNumNonzeros(A);
+      /* Migrate to final memory location */
+      hypre_CSRMatrixMigrate(B, memory_location);
+      hypre_CSRMatrixMigrate(C, memory_location);
+      hypre_CSRMatrixMigrate(E, memory_location);
+      hypre_CSRMatrixMigrate(F, memory_location);
 
-   /* pointers to cusparse data */
-   csrilu02Info_t          matA_info            = NULL;
-
-   /* variables and working arrays used during the ilu */
-   HYPRE_Int               zero_pivot;
-   HYPRE_Int               matA_buffersize;
-   void                    *matA_buffer         = NULL;
-
-   HYPRE_Int               isDoublePrecision    = sizeof(HYPRE_Complex) == sizeof(hypre_double);
-   HYPRE_Int               isSinglePrecision    = sizeof(HYPRE_Complex) == sizeof(hypre_double) / 2;
-
-   cusparseHandle_t handle = hypre_HandleCusparseHandle(hypre_handle());
-   cusparseMatDescr_t descr = hypre_CSRMatrixGPUMatDescr(A);
-
-   hypre_assert(isDoublePrecision || isSinglePrecision);
-
-   /* 1. Sort columns inside each row first, we can't assume that's sorted */
-   hypre_SortCSRCusparse(n, m, nnz_A, descr, A_i, A_j, A_data);
-
-   /* 2. Create info for ilu setup and solve */
-   HYPRE_CUSPARSE_CALL(cusparseCreateCsrilu02Info(&matA_info));
-
-   /* 3. Get working array size */
-   if (isDoublePrecision)
-   {
-      HYPRE_CUSPARSE_CALL(cusparseDcsrilu02_bufferSize(handle, n, nnz_A, descr,
-                                                         (hypre_double *) A_data, A_i, A_j,
-                                                         matA_info, &matA_buffersize));
-   }
-   else if (isSinglePrecision)
-   {
-      HYPRE_CUSPARSE_CALL(cusparseScsrilu02_bufferSize(handle, n, nnz_A, descr,
-                                                         (float *) A_data, A_i, A_j,
-                                                         matA_info, &matA_buffersize));
-   }
-   /* 4. Create working array, since they won't be visited by host, allocate on device */
-   matA_buffer                                  = hypre_MAlloc(matA_buffersize, HYPRE_MEMORY_DEVICE);
-
-   /* 5. Now perform the analysis */
-   /* 5-1. Analysis */
-   if (isDoublePrecision)
-   {
-      HYPRE_CUSPARSE_CALL(cusparseDcsrilu02_analysis(handle, n, nnz_A, descr,
-                                                      (hypre_double *) A_data, A_i, A_j,
-                                                      matA_info, ilu_solve_policy, matA_buffer));
-   }
-   else if (isSinglePrecision)
-   {
-      HYPRE_CUSPARSE_CALL(cusparseScsrilu02_analysis(handle, n, nnz_A, descr,
-                                                      (float *) A_data, A_i, A_j,
-                                                      matA_info, ilu_solve_policy, matA_buffer));
-   }
-   /* 5-2. Check for zero pivot */
-   HYPRE_CUSPARSE_CALL(cusparseXcsrilu02_zeroPivot(handle, matA_info, &zero_pivot));
-
-   /* 6. Apply the factorization */
-   if (isDoublePrecision)
-   {
-      HYPRE_CUSPARSE_CALL(cusparseDcsrilu02(handle, n, nnz_A, descr,
-                                             (hypre_double *) A_data, A_i, A_j,
-                                             matA_info, ilu_solve_policy, matA_buffer));
-   }
-   else if (isSinglePrecision)
-   {
-      HYPRE_CUSPARSE_CALL(cusparseScsrilu02(handle, n, nnz_A, descr,
-                                             (float *) A_data, A_i, A_j,
-                                             matA_info, ilu_solve_policy, matA_buffer));
-   }
-
-   /* Check for zero pivot */
-   HYPRE_CUSPARSE_CALL(cusparseXcsrilu02_zeroPivot(handle, matA_info, &zero_pivot));
-
-   /* Done with factorization, finishing up */
-   hypre_TFree(matA_buffer, HYPRE_MEMORY_DEVICE);
-   HYPRE_CUSPARSE_CALL(cusparseDestroyCsrilu02Info(matA_info));
-
-   return hypre_error_flag;
-}
-
-/* Wrapper for ILU0 solve analysis phase with cusparse on a matrix */
-HYPRE_Int
-HYPRE_ILUSetupCusparseCSRILU0SetupSolve(hypre_CSRMatrix *A, cusparseMatDescr_t matL_des, cusparseMatDescr_t matU_des,
-                              cusparseSolvePolicy_t ilu_solve_policy, csrsv2Info_t *matL_infop, csrsv2Info_t *matU_infop,
-                              HYPRE_Int *buffer_sizep, void **bufferp)
-{
-   if (!A)
-   {
-      /* return if A is NULL */
-      *matL_infop    = NULL;
-      *matU_infop    = NULL;
-      *buffer_sizep  = 0;
-      *bufferp       = NULL;
-      return hypre_error_flag;
-   }
-
-   /* data objects for A */
-   HYPRE_Int               n                    = hypre_CSRMatrixNumRows(A);
-   HYPRE_Int               m                    = hypre_CSRMatrixNumCols(A);
-
-   hypre_assert(n == m);
-
-   if (n == 0)
-   {
-      /* return if A is 0 by 0 */
-      *matL_infop    = NULL;
-      *matU_infop    = NULL;
-      *buffer_sizep  = 0;
-      *bufferp       = NULL;
-      return hypre_error_flag;
-   }
-
-   HYPRE_Real              *A_data              = hypre_CSRMatrixData(A);
-   HYPRE_Int               *A_i                 = hypre_CSRMatrixI(A);
-   HYPRE_Int               *A_j                 = hypre_CSRMatrixJ(A);
-   HYPRE_Int               nnz_A                = A_i[n];
-
-   /* pointers to cusparse data */
-   csrsv2Info_t            matL_info            = *matL_infop;
-   csrsv2Info_t            matU_info            = *matU_infop;
-
-   /* clear data if already exists */
-   if (matL_info)
-   {
-      HYPRE_CUSPARSE_CALL( cusparseDestroyCsrsv2Info(matL_info) );
-      matL_info = NULL;
-   }
-   if (matU_info)
-   {
-      HYPRE_CUSPARSE_CALL( cusparseDestroyCsrsv2Info(matU_info) );
-      matU_info = NULL;
-   }
-
-   /* variables and working arrays used during the ilu */
-   HYPRE_Int               matL_buffersize;
-   HYPRE_Int               matU_buffersize;
-   HYPRE_Int               solve_buffersize;
-   HYPRE_Int               solve_oldbuffersize  = *buffer_sizep;
-   void                    *solve_buffer        = *bufferp;
-
-   HYPRE_Int               isDoublePrecision    = sizeof(HYPRE_Complex) == sizeof(hypre_double);
-   HYPRE_Int               isSinglePrecision    = sizeof(HYPRE_Complex) == sizeof(hypre_double) / 2;
-
-   hypre_assert(isDoublePrecision || isSinglePrecision);
-
-   cusparseHandle_t handle = hypre_HandleCusparseHandle(hypre_handle());
-
-   /* 1. Create info for ilu setup and solve */
-   HYPRE_CUSPARSE_CALL(cusparseCreateCsrsv2Info(&(matL_info)));
-   HYPRE_CUSPARSE_CALL(cusparseCreateCsrsv2Info(&(matU_info)));
-
-   /* 2. Get working array size */
-   if (isDoublePrecision)
-   {
-
-      HYPRE_CUSPARSE_CALL(cusparseDcsrsv2_bufferSize(handle, CUSPARSE_OPERATION_NON_TRANSPOSE, n, nnz_A,
-                                                      matL_des, (hypre_double *) A_data, A_i, A_j,
-                                                      matL_info, &matL_buffersize));
-
-      HYPRE_CUSPARSE_CALL(cusparseDcsrsv2_bufferSize(handle, CUSPARSE_OPERATION_NON_TRANSPOSE, n, nnz_A,
-                                                      matU_des, (hypre_double *) A_data, A_i, A_j,
-                                                      matU_info, &matU_buffersize));
-   }
-   else if (isSinglePrecision)
-   {
-
-      HYPRE_CUSPARSE_CALL(cusparseScsrsv2_bufferSize(handle, CUSPARSE_OPERATION_NON_TRANSPOSE, n, nnz_A,
-                                                      matL_des, (float *) A_data, A_i, A_j,
-                                                      matL_info, &matL_buffersize));
-
-      HYPRE_CUSPARSE_CALL(cusparseScsrsv2_bufferSize(handle, CUSPARSE_OPERATION_NON_TRANSPOSE, n, nnz_A,
-                                                      matU_des, (float *) A_data, A_i, A_j,
-                                                      matU_info, &matU_buffersize));
-   }
-   solve_buffersize = hypre_max( matL_buffersize, matU_buffersize );
-   /* 3. Create working array, since they won't be visited by host, allocate on device */
-   if (solve_buffersize > solve_oldbuffersize)
-   {
-      if (solve_buffer)
-      {
-         solve_buffer                           = hypre_ReAlloc_v2(solve_buffer, solve_oldbuffersize, solve_buffersize, HYPRE_MEMORY_DEVICE);
-      }
-      else
-      {
-         solve_buffer                           = hypre_MAlloc(solve_buffersize, HYPRE_MEMORY_DEVICE);
-      }
-   }
-
-   /* 4. Now perform the analysis */
-   if (isDoublePrecision)
-   {
-
-      HYPRE_CUSPARSE_CALL(cusparseDcsrsv2_analysis(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                      n, nnz_A, matL_des,
-                                                      (hypre_double *) A_data, A_i, A_j,
-                                                      matL_info, ilu_solve_policy, solve_buffer));
-
-      HYPRE_CUSPARSE_CALL(cusparseDcsrsv2_analysis(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                      n, nnz_A, matU_des,
-                                                      (hypre_double *) A_data, A_i, A_j,
-                                                      matU_info, ilu_solve_policy, solve_buffer));
-   }
-   else if (isSinglePrecision)
-   {
-
-      HYPRE_CUSPARSE_CALL(cusparseScsrsv2_analysis(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                      n, nnz_A, matL_des,
-                                                      (float *) A_data, A_i, A_j,
-                                                      matL_info, ilu_solve_policy, solve_buffer));
-
-      HYPRE_CUSPARSE_CALL(cusparseScsrsv2_analysis(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                      n, nnz_A, matU_des,
-                                                      (float *) A_data, A_i, A_j,
-                                                      matU_info, ilu_solve_policy, solve_buffer));
-   }
-
-   /* Done with analysis, finishing up */
-   /* Set return value */
-   *matL_infop    = matL_info;
-   *matU_infop    = matU_info;
-   *buffer_sizep  = solve_buffersize;
-   *bufferp       = solve_buffer;
-
-   return hypre_error_flag;
-}
-
-/* ILU(0) (GPU)
- * A = input matrix
- * perm = permutation array indicating ordering of rows. Perm could come from a
- *    CF_marker array or a reordering routine.
- * qperm = permutation array indicating ordering of columns
- * nI = number of interial unknowns
- * nLU = size of incomplete factorization, nLU should obey nLU <= nI.
- *    Schur complement is formed if nLU < n
- * Lptr, Dptr, Uptr, Sptr = L, D, U, S factors. Note that with CUDA, Dptr and Uptr are unused
- * xtempp, ytempp = helper vector used in 2-level solve.
- * A_fake_diagp = fake diagonal for matvec
- * will form global Schur Matrix if nLU < n
- */
-HYPRE_Int
-hypre_ILUSetupILU0Device(hypre_ParCSRMatrix *A, HYPRE_Int *perm, HYPRE_Int *qperm, HYPRE_Int n, HYPRE_Int nLU,
-                           cusparseMatDescr_t matL_des, cusparseMatDescr_t matU_des, cusparseSolvePolicy_t ilu_solve_policy,
-                           void **bufferp, csrsv2Info_t *matBL_infop, csrsv2Info_t *matBU_infop,
-                           csrsv2Info_t *matSL_infop, csrsv2Info_t *matSU_infop,
-                           hypre_CSRMatrix **BLUptr, hypre_ParCSRMatrix **matSptr, hypre_CSRMatrix **Eptr, hypre_CSRMatrix **Fptr,
-                           HYPRE_Int **A_fake_diag_ip)
-{
-   /* GPU-accelerated ILU0 with cusparse */
-   HYPRE_Int               i, j, k1, k2, k3, col;
-
-   /* communication stuffs for S */
-   MPI_Comm                comm                 = hypre_ParCSRMatrixComm(A);
-
-   HYPRE_Int               my_id, num_procs;
-   hypre_MPI_Comm_size(comm,&num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
-
-   hypre_ParCSRCommPkg     *comm_pkg;
-   hypre_ParCSRCommHandle  *comm_handle;
-   HYPRE_Int               num_sends, begin, end;
-   HYPRE_BigInt            *send_buf            = NULL;
-   HYPRE_Int               *rperm               = NULL;
-   HYPRE_Int               *rqperm              = NULL;
-
-   hypre_ParCSRMatrix      *matS                = NULL;
-   hypre_CSRMatrix         *A_diag              = NULL;
-   HYPRE_Int               *A_fake_diag_i       = NULL;
-   hypre_CSRMatrix         *A_offd              = NULL;
-   HYPRE_Int               *A_offd_i            = NULL;
-   HYPRE_Int               *A_offd_j            = NULL;
-   HYPRE_Real              *A_offd_data         = NULL;
-   hypre_CSRMatrix         *SLU                 = NULL;
-   /* pointers to cusparse data */
-   csrsv2Info_t            matBL_info           = NULL;
-   csrsv2Info_t            matBU_info           = NULL;
-   csrsv2Info_t            matSL_info           = NULL;
-   csrsv2Info_t            matSU_info           = NULL;
-
-   HYPRE_Int               buffer_size          = 0;
-   void                    *buffer              = NULL;
-
-   /* variables for matS */
-   HYPRE_Int               m                    = n - nLU;
-   HYPRE_Int               nI                   = nLU;//use default
-   HYPRE_Int               e                    = 0;
-   HYPRE_Int               m_e                  = m;
-   HYPRE_BigInt            total_rows;
-   HYPRE_BigInt            col_starts[2];
-   HYPRE_Int               *S_diag_i            = NULL;
-   HYPRE_Int               S_diag_nnz;
-   hypre_CSRMatrix         *S_offd              = NULL;
-   HYPRE_Int               *S_offd_i            = NULL;
-   HYPRE_Int               *S_offd_j            = NULL;
-   HYPRE_Real              *S_offd_data         = NULL;
-   HYPRE_BigInt            *S_offd_colmap       = NULL;
-   HYPRE_Int               S_offd_nnz;
-   HYPRE_Int               S_offd_ncols;
-
-   /* set data slots */
-   A_offd                                       = hypre_ParCSRMatrixOffd(A);
-   A_offd_i                                     = hypre_CSRMatrixI(A_offd);
-   A_offd_j                                     = hypre_CSRMatrixJ(A_offd);
-   A_offd_data                                  = hypre_CSRMatrixData(A_offd);
-
-   /* unfortunately we need to build the reverse permutation array */
-   rperm                                        = hypre_CTAlloc(HYPRE_Int, n, HYPRE_MEMORY_HOST);
-   rqperm                                       = hypre_CTAlloc(HYPRE_Int, n, HYPRE_MEMORY_HOST);
-   for (i = 0; i < n; i++)
-   {
-      rperm[perm[i]] = i;
-      rqperm[qperm[i]] = i;
-   }
-
-   /* Only call ILU when we really have a matrix on this processor */
-   if (n > 0)
-   {
-      /* Copy diagonal matrix into a new place with permutation
-       * That is, A_diag = A_diag(perm,qperm);
-       */
-      hypre_ParILUCusparseExtractDiagonalCSR(A, perm, rqperm, &A_diag);
-
-      /* Apply ILU factorization to the entile A_diag */
-      HYPRE_ILUSetupCusparseCSRILU0(A_diag, ilu_solve_policy);
-
-      /* | L \ U (B) L^{-1}F  |
-       * | EU^{-1}   L \ U (S)|
-       * Extract submatrix L_B U_B, L_S U_S, EU_B^{-1}, L_B^{-1}F
-       * Note that in this function after ILU, all rows are sorted
-       * in a way different than HYPRE. Diagonal is not listed in the front
-       */
-      hypre_ParILUCusparseILUExtractEBFC(A_diag, nLU, BLUptr, &SLU, Eptr, Fptr);
-   }
-   else
-   {
-      *BLUptr = NULL;
-      *Eptr = NULL;
-      *Fptr = NULL;
-      SLU = NULL;
-   }
-
-   /* create B */
-   /* only analyse when nacessary */
-   if ( nLU > 0 )
-   {
-      /* Analysis of BILU */
-      HYPRE_ILUSetupCusparseCSRILU0SetupSolve(*BLUptr, matL_des, matU_des,
-                                 ilu_solve_policy, &matBL_info, &matBU_info,
-                                 &buffer_size, &buffer);
-   }
-
-   HYPRE_BigInt big_m = (HYPRE_BigInt)m;
-   hypre_MPI_Allreduce(&big_m, &total_rows, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
-   /* only form when total_rows > 0 */
-   if ( total_rows > 0 )
-   {
-      /* now create S */
-      /* need to get new column start */
-      {
-         HYPRE_BigInt global_start;
-         hypre_MPI_Scan( &big_m, &global_start, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
-         col_starts[0] = global_start - m;
-         col_starts[1] = global_start;
-      }
-
-      A_fake_diag_i = hypre_CTAlloc(HYPRE_Int, m + 1, HYPRE_MEMORY_DEVICE);
-      if (SLU)
-      {
-         /* Analysis of SILU */
-         HYPRE_ILUSetupCusparseCSRILU0SetupSolve(SLU, matL_des, matU_des,
-                                       ilu_solve_policy, &matSL_info, &matSU_info,
-                                       &buffer_size, &buffer);
-      }
-      else
-      {
-         SLU = hypre_CSRMatrixCreate(0,0,0);
-         hypre_CSRMatrixInitialize(SLU);
-      }
-      S_diag_i = hypre_CSRMatrixI(SLU);
-      S_diag_nnz = S_diag_i[m];
-      /* Build ParCSRMatrix matS
-       * For example when np == 3 the new matrix takes the following form
-       * |IS_1 E_12 E_13|
-       * |E_21 IS_2 E_22| = S
-       * |E_31 E_32 IS_3|
-       * In which IS_i is the cusparse ILU factorization of S_i in one matrix
-       * */
-
-      /* We did nothing to A_offd, so all the data kept, just reorder them
-       * The create function takes comm, global num rows/cols,
-       *    row/col start, num cols offd, nnz diag, nnz offd
-       */
-      S_offd_nnz = hypre_CSRMatrixNumNonzeros(A_offd);
-      S_offd_ncols = hypre_CSRMatrixNumCols(A_offd);
-
-      matS = hypre_ParCSRMatrixCreate( comm,
-                           total_rows,
-                           total_rows,
-                           col_starts,
-                           col_starts,
-                           S_offd_ncols,
-                           S_diag_nnz,
-                           S_offd_nnz);
-
-      /* first put diagonal data in */
-      hypre_CSRMatrixDestroy(hypre_ParCSRMatrixDiag(matS));
-      hypre_ParCSRMatrixDiag(matS) = SLU;
-
-      /* now start to construct offdiag of S */
-      S_offd = hypre_ParCSRMatrixOffd(matS);
-      S_offd_i = hypre_TAlloc(HYPRE_Int, m+1, HYPRE_MEMORY_DEVICE);
-      S_offd_j = hypre_TAlloc(HYPRE_Int, S_offd_nnz, HYPRE_MEMORY_DEVICE);
-      S_offd_data = hypre_TAlloc(HYPRE_Real, S_offd_nnz, HYPRE_MEMORY_DEVICE);
-      S_offd_colmap = hypre_CTAlloc(HYPRE_BigInt, S_offd_ncols, HYPRE_MEMORY_HOST);
-
-      /* simply use a loop to copy data from A_offd */
-      S_offd_i[0] = 0;
-      k3 = 0;
-      for (i = 1; i <= e; i++)
-      {
-         S_offd_i[i] = k3;
-      }
-      for (i = 0; i < m_e; i++)
-      {
-         col = perm[i + nI];
-         k1 = A_offd_i[col];
-         k2 = A_offd_i[col+1];
-         for (j = k1; j < k2; j++)
-         {
-            S_offd_j[k3] = A_offd_j[j];
-            S_offd_data[k3++] = A_offd_data[j];
-         }
-         S_offd_i[i+1+e] = k3;
-      }
-
-      /* give I, J, DATA to S_offd */
-      hypre_CSRMatrixI(S_offd) = S_offd_i;
-      hypre_CSRMatrixJ(S_offd) = S_offd_j;
-      hypre_CSRMatrixData(S_offd) = S_offd_data;
-
-      /* now we need to update S_offd_colmap */
-      comm_pkg = hypre_ParCSRMatrixCommPkg(A);
-      /* setup comm_pkg if not yet built */
-      if (!comm_pkg)
-      {
-         hypre_MatvecCommPkgCreate(A);
-         comm_pkg = hypre_ParCSRMatrixCommPkg(A);
-      }
-      /* get total num of send */
-      num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
-      begin = hypre_ParCSRCommPkgSendMapStart(comm_pkg,0);
-      end = hypre_ParCSRCommPkgSendMapStart(comm_pkg,num_sends);
-      send_buf = hypre_TAlloc(HYPRE_BigInt, end - begin, HYPRE_MEMORY_HOST);
-      /* copy new index into send_buf */
-      for (i = begin; i < end; i++)
-      {
-         send_buf[i-begin] = rperm[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,i)] - nLU + col_starts[0];
-      }
-
-      /* main communication */
-      comm_handle = hypre_ParCSRCommHandleCreate(21, comm_pkg, send_buf, S_offd_colmap);
-      hypre_ParCSRCommHandleDestroy(comm_handle);
-
-      /* setup index */
-      hypre_ParCSRMatrixColMapOffd(matS) = S_offd_colmap;
-
-      hypre_ILUSortOffdColmap(matS);
-
-      /* free */
-      hypre_TFree(send_buf, HYPRE_MEMORY_HOST);
-   } /* end of forming S */
-
-   *matSptr       = matS;
-   *bufferp       = buffer;
-   *matBL_infop   = matBL_info;
-   *matBU_infop   = matBU_info;
-   *matSL_infop   = matSL_info;
-   *matSU_infop   = matSU_info;
-   *A_fake_diag_ip= A_fake_diag_i;
-
-   /* Destroy the bridge after acrossing the river */
-   hypre_CSRMatrixDestroy(A_diag);
-   hypre_TFree(rperm, HYPRE_MEMORY_HOST);
-   hypre_TFree(rqperm, HYPRE_MEMORY_HOST);
-
-   return hypre_error_flag;
-}
-
-HYPRE_Int
-hypre_ILUSetupILUKDevice(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *perm, HYPRE_Int *qperm, HYPRE_Int n, HYPRE_Int nLU,
-                           cusparseMatDescr_t matL_des, cusparseMatDescr_t matU_des, cusparseSolvePolicy_t ilu_solve_policy,
-                           void **bufferp, csrsv2Info_t *matBL_infop, csrsv2Info_t *matBU_infop,
-                           csrsv2Info_t *matSL_infop, csrsv2Info_t *matSU_infop,
-                           hypre_CSRMatrix **BLUptr, hypre_ParCSRMatrix **matSptr, hypre_CSRMatrix **Eptr, hypre_CSRMatrix **Fptr,
-                           HYPRE_Int **A_fake_diag_ip)
-{
-   /* GPU-accelerated ILU0 with cusparse */
-   HYPRE_Int               i, j, k1, k2, k3, col;
-
-   /* communication stuffs for S */
-   MPI_Comm                comm                 = hypre_ParCSRMatrixComm(A);
-
-   HYPRE_Int               my_id, num_procs;
-   hypre_MPI_Comm_size(comm,&num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
-
-   hypre_ParCSRCommPkg     *comm_pkg;
-   hypre_ParCSRCommHandle  *comm_handle;
-   HYPRE_Int               num_sends, begin, end;
-   HYPRE_BigInt            *send_buf            = NULL;
-   HYPRE_Int               *rperm               = NULL;
-   HYPRE_Int               *rqperm              = NULL;
-
-   hypre_ParCSRMatrix      *Apq                 = NULL;
-   hypre_ParCSRMatrix      *ALU                 = NULL;
-
-   hypre_ParCSRMatrix      *matS                = NULL;
-   hypre_CSRMatrix         *A_diag              = NULL;
-   HYPRE_Int               *A_fake_diag_i       = NULL;
-   hypre_CSRMatrix         *A_offd              = NULL;
-   HYPRE_Int               *A_offd_i            = NULL;
-   HYPRE_Int               *A_offd_j            = NULL;
-   HYPRE_Real              *A_offd_data         = NULL;
-   hypre_CSRMatrix         *SLU                 = NULL;
-   /* pointers to cusparse data */
-   csrsv2Info_t            matBL_info           = NULL;
-   csrsv2Info_t            matBU_info           = NULL;
-   csrsv2Info_t            matSL_info           = NULL;
-   csrsv2Info_t            matSU_info           = NULL;
-
-   HYPRE_Int               buffer_size          = 0;
-   void                    *buffer              = NULL;
-
-   /* variables for matS */
-   HYPRE_Int               m                    = n - nLU;
-   HYPRE_Int               nI                   = nLU;//use default
-   HYPRE_Int               e                    = 0;
-   HYPRE_Int               m_e                  = m;
-   HYPRE_BigInt            total_rows;
-   HYPRE_BigInt            col_starts[2];
-   HYPRE_Int               *S_diag_i            = NULL;
-   HYPRE_Int               S_diag_nnz;
-   hypre_CSRMatrix         *S_offd              = NULL;
-   HYPRE_Int               *S_offd_i            = NULL;
-   HYPRE_Int               *S_offd_j            = NULL;
-   HYPRE_Real              *S_offd_data         = NULL;
-   HYPRE_BigInt            *S_offd_colmap       = NULL;
-   HYPRE_Int               S_offd_nnz;
-   HYPRE_Int               S_offd_ncols;
-
-   /* set data slots */
-   A_offd                                       = hypre_ParCSRMatrixOffd(A);
-   A_offd_i                                     = hypre_CSRMatrixI(A_offd);
-   A_offd_j                                     = hypre_CSRMatrixJ(A_offd);
-   A_offd_data                                  = hypre_CSRMatrixData(A_offd);
-
-   hypre_ParCSRMatrix      *parL = NULL;
-   hypre_ParCSRMatrix      *parU = NULL;
-   hypre_ParCSRMatrix      *parS = NULL;
-   HYPRE_Real              *parD = NULL;
-   HYPRE_Int               *uend = NULL;
-
-   /* unfortunately we need to build the reverse permutation array */
-   rperm                                        = hypre_CTAlloc(HYPRE_Int, n, HYPRE_MEMORY_HOST);
-   rqperm                                       = hypre_CTAlloc(HYPRE_Int, n, HYPRE_MEMORY_HOST);
-   for (i = 0; i < n; i++)
-   {
-      rperm[perm[i]] = i;
-      rqperm[qperm[i]] = i;
-   }
-
-   /* Only call ILU when we really have a matrix on this processor */
-   if (n > 0)
-   {
-      /* Copy diagonal matrix into a new place with permutation
-       * That is, A_diag = A_diag(perm,qperm);
-       */
-      hypre_ParILURAPReorder( A, perm, rqperm, &Apq);
-
-      /* Apply ILU factorization to the entile A_diag */
-      hypre_ILUSetupILUK(Apq, lfil, NULL, NULL, n, n, &parL, &parD, &parU, &parS, &uend);
-
-      if (uend)
-      {
-         hypre_TFree(uend, HYPRE_MEMORY_HOST);
-      }
-
-      if (parS)
-      {
-         hypre_ParCSRMatrixDestroy(parS);
-      }
-
-      /* | L \ U (B) L^{-1}F  |
-       * | EU^{-1}   L \ U (S)|
-       * Extract submatrix L_B U_B, L_S U_S, EU_B^{-1}, L_B^{-1}F
-       * Note that in this function after ILU, all rows are sorted
-       * in a way different than HYPRE. Diagonal is not listed in the front
-       */
-      hypre_ILUSetupLDUtoCusparse( parL, parD, parU, &ALU);
-
-      if (parL)
-      {
-         hypre_ParCSRMatrixDestroy(parL);
-      }
-      if (parD)
-      {
-         hypre_TFree(parD, HYPRE_MEMORY_DEVICE);
-      }
-      if (parU)
-      {
-         hypre_ParCSRMatrixDestroy(parU);
-      }
-
-      A_diag = hypre_ParCSRMatrixDiag(ALU);
-
-      hypre_ParILUCusparseILUExtractEBFC(A_diag, nLU, BLUptr, &SLU, Eptr, Fptr);
-
-      if (Apq)
-      {
-         hypre_ParCSRMatrixDestroy(Apq);
-      }
-
-   }
-   else
-   {
-      *BLUptr = NULL;
-      *Eptr = NULL;
-      *Fptr = NULL;
-      SLU = NULL;
-   }
-
-   /* create B */
-   /* only analyse when nacessary */
-   if ( nLU > 0 )
-   {
-      /* Analysis of BILU */
-      HYPRE_ILUSetupCusparseCSRILU0SetupSolve(*BLUptr, matL_des, matU_des,
-                                 ilu_solve_policy, &matBL_info, &matBU_info,
-                                 &buffer_size, &buffer);
-   }
-
-   HYPRE_BigInt big_m = (HYPRE_BigInt)m;
-   hypre_MPI_Allreduce(&big_m, &total_rows, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
-   /* only form when total_rows > 0 */
-   if ( total_rows > 0 )
-   {
-      /* now create S */
-      /* need to get new column start */
-      {
-         HYPRE_BigInt global_start;
-         hypre_MPI_Scan( &big_m, &global_start, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
-         col_starts[0] = global_start - m;
-         col_starts[1] = global_start;
-      }
-
-      A_fake_diag_i = hypre_CTAlloc(HYPRE_Int, m + 1, HYPRE_MEMORY_DEVICE);
-      if (SLU)
-      {
-         /* Analysis of SILU */
-         HYPRE_ILUSetupCusparseCSRILU0SetupSolve(SLU, matL_des, matU_des,
-                                       ilu_solve_policy, &matSL_info, &matSU_info,
-                                       &buffer_size, &buffer);
-      }
-      else
-      {
-         SLU = hypre_CSRMatrixCreate(0,0,0);
-         hypre_CSRMatrixInitialize(SLU);
-      }
-      S_diag_i = hypre_CSRMatrixI(SLU);
-      S_diag_nnz = S_diag_i[m];
-      /* Build ParCSRMatrix matS
-       * For example when np == 3 the new matrix takes the following form
-       * |IS_1 E_12 E_13|
-       * |E_21 IS_2 E_22| = S
-       * |E_31 E_32 IS_3|
-       * In which IS_i is the cusparse ILU factorization of S_i in one matrix
-       * */
-
-      /* We did nothing to A_offd, so all the data kept, just reorder them
-       * The create function takes comm, global num rows/cols,
-       *    row/col start, num cols offd, nnz diag, nnz offd
-       */
-      S_offd_nnz = hypre_CSRMatrixNumNonzeros(A_offd);
-      S_offd_ncols = hypre_CSRMatrixNumCols(A_offd);
-
-      matS = hypre_ParCSRMatrixCreate( comm,
-                           total_rows,
-                           total_rows,
-                           col_starts,
-                           col_starts,
-                           S_offd_ncols,
-                           S_diag_nnz,
-                           S_offd_nnz);
-
-      /* first put diagonal data in */
-      hypre_CSRMatrixDestroy(hypre_ParCSRMatrixDiag(matS));
-      hypre_ParCSRMatrixDiag(matS) = SLU;
-
-      /* now start to construct offdiag of S */
-      S_offd = hypre_ParCSRMatrixOffd(matS);
-      S_offd_i = hypre_TAlloc(HYPRE_Int, m+1, HYPRE_MEMORY_DEVICE);
-      S_offd_j = hypre_TAlloc(HYPRE_Int, S_offd_nnz, HYPRE_MEMORY_DEVICE);
-      S_offd_data = hypre_TAlloc(HYPRE_Real, S_offd_nnz, HYPRE_MEMORY_DEVICE);
-      S_offd_colmap = hypre_CTAlloc(HYPRE_BigInt, S_offd_ncols, HYPRE_MEMORY_HOST);
-
-      /* simply use a loop to copy data from A_offd */
-      S_offd_i[0] = 0;
-      k3 = 0;
-      for (i = 1; i <= e; i++)
-      {
-         S_offd_i[i] = k3;
-      }
-      for (i = 0; i < m_e; i++)
-      {
-         col = perm[i + nI];
-         k1 = A_offd_i[col];
-         k2 = A_offd_i[col+1];
-         for (j = k1; j < k2; j++)
-         {
-            S_offd_j[k3] = A_offd_j[j];
-            S_offd_data[k3++] = A_offd_data[j];
-         }
-         S_offd_i[i+1+e] = k3;
-      }
-
-      /* give I, J, DATA to S_offd */
-      hypre_CSRMatrixI(S_offd) = S_offd_i;
-      hypre_CSRMatrixJ(S_offd) = S_offd_j;
-      hypre_CSRMatrixData(S_offd) = S_offd_data;
-
-      /* now we need to update S_offd_colmap */
-      comm_pkg = hypre_ParCSRMatrixCommPkg(A);
-      /* setup comm_pkg if not yet built */
-      if (!comm_pkg)
-      {
-         hypre_MatvecCommPkgCreate(A);
-         comm_pkg = hypre_ParCSRMatrixCommPkg(A);
-      }
-      /* get total num of send */
-      num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
-      begin = hypre_ParCSRCommPkgSendMapStart(comm_pkg,0);
-      end = hypre_ParCSRCommPkgSendMapStart(comm_pkg,num_sends);
-      send_buf = hypre_TAlloc(HYPRE_BigInt, end - begin, HYPRE_MEMORY_HOST);
-      /* copy new index into send_buf */
-      for (i = begin; i < end; i++)
-      {
-         send_buf[i-begin] = rperm[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,i)] - nLU + col_starts[0];
-      }
-
-      /* main communication */
-      comm_handle = hypre_ParCSRCommHandleCreate(21, comm_pkg, send_buf, S_offd_colmap);
-      hypre_ParCSRCommHandleDestroy(comm_handle);
-
-      /* setup index */
-      hypre_ParCSRMatrixColMapOffd(matS) = S_offd_colmap;
-
-      hypre_ILUSortOffdColmap(matS);
-
-      /* free */
-      hypre_TFree(send_buf, HYPRE_MEMORY_HOST);
-   } /* end of forming S */
-
-   *matSptr       = matS;
-   *bufferp       = buffer;
-   *matBL_infop   = matBL_info;
-   *matBU_infop   = matBU_info;
-   *matSL_infop   = matSL_info;
-   *matSU_infop   = matSU_info;
-   *A_fake_diag_ip= A_fake_diag_i;
-
-   /* Destroy the bridge after acrossing the river */
-   hypre_CSRMatrixDestroy(A_diag);
-   hypre_TFree(rperm, HYPRE_MEMORY_HOST);
-   hypre_TFree(rqperm, HYPRE_MEMORY_HOST);
-
-   return hypre_error_flag;
-}
-
-
-HYPRE_Int
-hypre_ILUSetupILUTDevice(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol, HYPRE_Int *perm, HYPRE_Int *qperm, HYPRE_Int n, HYPRE_Int nLU,
-                           cusparseMatDescr_t matL_des, cusparseMatDescr_t matU_des, cusparseSolvePolicy_t ilu_solve_policy,
-                           void **bufferp, csrsv2Info_t *matBL_infop, csrsv2Info_t *matBU_infop,
-                           csrsv2Info_t *matSL_infop, csrsv2Info_t *matSU_infop,
-                           hypre_CSRMatrix **BLUptr, hypre_ParCSRMatrix **matSptr, hypre_CSRMatrix **Eptr, hypre_CSRMatrix **Fptr,
-                           HYPRE_Int **A_fake_diag_ip)
-{
-   /* GPU-accelerated ILU0 with cusparse */
-   HYPRE_Int               i, j, k1, k2, k3, col;
-
-   /* communication stuffs for S */
-   MPI_Comm                comm                 = hypre_ParCSRMatrixComm(A);
-
-   HYPRE_Int               my_id, num_procs;
-   hypre_MPI_Comm_size(comm,&num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
-
-   hypre_ParCSRCommPkg     *comm_pkg;
-   hypre_ParCSRCommHandle  *comm_handle;
-   HYPRE_Int               num_sends, begin, end;
-   HYPRE_BigInt            *send_buf            = NULL;
-   HYPRE_Int               *rperm               = NULL;
-   HYPRE_Int               *rqperm              = NULL;
-
-   hypre_ParCSRMatrix      *Apq                 = NULL;
-   hypre_ParCSRMatrix      *ALU                 = NULL;
-
-   hypre_ParCSRMatrix      *matS                = NULL;
-   hypre_CSRMatrix         *A_diag              = NULL;
-   HYPRE_Int               *A_fake_diag_i       = NULL;
-   hypre_CSRMatrix         *A_offd              = NULL;
-   HYPRE_Int               *A_offd_i            = NULL;
-   HYPRE_Int               *A_offd_j            = NULL;
-   HYPRE_Real              *A_offd_data         = NULL;
-   hypre_CSRMatrix         *SLU                 = NULL;
-   /* pointers to cusparse data */
-   csrsv2Info_t            matBL_info           = NULL;
-   csrsv2Info_t            matBU_info           = NULL;
-   csrsv2Info_t            matSL_info           = NULL;
-   csrsv2Info_t            matSU_info           = NULL;
-
-   HYPRE_Int               buffer_size          = 0;
-   void                    *buffer              = NULL;
-
-   /* variables for matS */
-   HYPRE_Int               m                    = n - nLU;
-   HYPRE_Int               nI                   = nLU;//use default
-   HYPRE_Int               e                    = 0;
-   HYPRE_Int               m_e                  = m;
-   HYPRE_BigInt            total_rows;
-   HYPRE_BigInt            col_starts[2];
-   HYPRE_Int               *S_diag_i            = NULL;
-   HYPRE_Int               S_diag_nnz;
-   hypre_CSRMatrix         *S_offd              = NULL;
-   HYPRE_Int               *S_offd_i            = NULL;
-   HYPRE_Int               *S_offd_j            = NULL;
-   HYPRE_Real              *S_offd_data         = NULL;
-   HYPRE_BigInt            *S_offd_colmap       = NULL;
-   HYPRE_Int               S_offd_nnz;
-   HYPRE_Int               S_offd_ncols;
-
-   /* set data slots */
-   A_offd                                       = hypre_ParCSRMatrixOffd(A);
-   A_offd_i                                     = hypre_CSRMatrixI(A_offd);
-   A_offd_j                                     = hypre_CSRMatrixJ(A_offd);
-   A_offd_data                                  = hypre_CSRMatrixData(A_offd);
-
-   hypre_ParCSRMatrix      *parL = NULL;
-   hypre_ParCSRMatrix      *parU = NULL;
-   hypre_ParCSRMatrix      *parS = NULL;
-   HYPRE_Real              *parD = NULL;
-   HYPRE_Int               *uend = NULL;
-
-   /* unfortunately we need to build the reverse permutation array */
-   rperm                                        = hypre_CTAlloc(HYPRE_Int, n, HYPRE_MEMORY_HOST);
-   rqperm                                       = hypre_CTAlloc(HYPRE_Int, n, HYPRE_MEMORY_HOST);
-   for (i = 0; i < n; i++)
-   {
-      rperm[perm[i]] = i;
-      rqperm[qperm[i]] = i;
-   }
-
-   /* Only call ILU when we really have a matrix on this processor */
-   if (n > 0)
-   {
-      /* Copy diagonal matrix into a new place with permutation
-       * That is, A_diag = A_diag(perm,qperm);
-       */
-      hypre_ParILURAPReorder( A, perm, rqperm, &Apq);
-
-      /* Apply ILU factorization to the entile A_diag */
-      hypre_ILUSetupILUT(Apq, lfil, tol, NULL, NULL, n, n, &parL, &parD, &parU, &parS, &uend);
-
-      if (uend)
-      {
-         hypre_TFree(uend, HYPRE_MEMORY_HOST);
-      }
-
-      if (parS)
-      {
-         hypre_ParCSRMatrixDestroy(parS);
-      }
-
-      /* | L \ U (B) L^{-1}F  |
-       * | EU^{-1}   L \ U (S)|
-       * Extract submatrix L_B U_B, L_S U_S, EU_B^{-1}, L_B^{-1}F
-       * Note that in this function after ILU, all rows are sorted
-       * in a way different than HYPRE. Diagonal is not listed in the front
-       */
-      hypre_ILUSetupLDUtoCusparse( parL, parD, parU, &ALU);
-
-      if (parL)
-      {
-         hypre_ParCSRMatrixDestroy(parL);
-      }
-      if (parD)
-      {
-         hypre_TFree(parD, HYPRE_MEMORY_DEVICE);
-      }
-      if (parU)
-      {
-         hypre_ParCSRMatrixDestroy(parU);
-      }
-
-      A_diag = hypre_ParCSRMatrixDiag(ALU);
-
-      hypre_ParILUCusparseILUExtractEBFC(A_diag, nLU, BLUptr, &SLU, Eptr, Fptr);
-
-      if (Apq)
-      {
-         hypre_ParCSRMatrixDestroy(Apq);
-      }
-
-   }
-   else
-   {
-      *BLUptr = NULL;
-      *Eptr = NULL;
-      *Fptr = NULL;
-      SLU = NULL;
-   }
-
-   /* create B */
-   /* only analyse when nacessary */
-   if ( nLU > 0 )
-   {
-      /* Analysis of BILU */
-      HYPRE_ILUSetupCusparseCSRILU0SetupSolve(*BLUptr, matL_des, matU_des,
-                                 ilu_solve_policy, &matBL_info, &matBU_info,
-                                 &buffer_size, &buffer);
-   }
-
-   HYPRE_BigInt big_m = (HYPRE_BigInt)m;
-   hypre_MPI_Allreduce(&big_m, &total_rows, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
-   /* only form when total_rows > 0 */
-   if ( total_rows > 0 )
-   {
-      /* now create S */
-      /* need to get new column start */
-      {
-         HYPRE_BigInt global_start;
-         hypre_MPI_Scan( &big_m, &global_start, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
-         col_starts[0] = global_start - m;
-         col_starts[1] = global_start;
-      }
-
-      A_fake_diag_i = hypre_CTAlloc(HYPRE_Int, m + 1, HYPRE_MEMORY_DEVICE);
-      if (SLU)
-      {
-         /* Analysis of SILU */
-         HYPRE_ILUSetupCusparseCSRILU0SetupSolve(SLU, matL_des, matU_des,
-                                       ilu_solve_policy, &matSL_info, &matSU_info,
-                                       &buffer_size, &buffer);
-      }
-      else
-      {
-         SLU = hypre_CSRMatrixCreate(0,0,0);
-         hypre_CSRMatrixInitialize(SLU);
-      }
-      S_diag_i = hypre_CSRMatrixI(SLU);
-      S_diag_nnz = S_diag_i[m];
-      /* Build ParCSRMatrix matS
-       * For example when np == 3 the new matrix takes the following form
-       * |IS_1 E_12 E_13|
-       * |E_21 IS_2 E_22| = S
-       * |E_31 E_32 IS_3|
-       * In which IS_i is the cusparse ILU factorization of S_i in one matrix
-       * */
-
-      /* We did nothing to A_offd, so all the data kept, just reorder them
-       * The create function takes comm, global num rows/cols,
-       *    row/col start, num cols offd, nnz diag, nnz offd
-       */
-      S_offd_nnz = hypre_CSRMatrixNumNonzeros(A_offd);
-      S_offd_ncols = hypre_CSRMatrixNumCols(A_offd);
-
-      matS = hypre_ParCSRMatrixCreate( comm,
-                           total_rows,
-                           total_rows,
-                           col_starts,
-                           col_starts,
-                           S_offd_ncols,
-                           S_diag_nnz,
-                           S_offd_nnz);
-
-      /* first put diagonal data in */
-      hypre_CSRMatrixDestroy(hypre_ParCSRMatrixDiag(matS));
-      hypre_ParCSRMatrixDiag(matS) = SLU;
-
-      /* now start to construct offdiag of S */
-      S_offd = hypre_ParCSRMatrixOffd(matS);
-      S_offd_i = hypre_TAlloc(HYPRE_Int, m+1, HYPRE_MEMORY_DEVICE);
-      S_offd_j = hypre_TAlloc(HYPRE_Int, S_offd_nnz, HYPRE_MEMORY_DEVICE);
-      S_offd_data = hypre_TAlloc(HYPRE_Real, S_offd_nnz, HYPRE_MEMORY_DEVICE);
-      S_offd_colmap = hypre_CTAlloc(HYPRE_BigInt, S_offd_ncols, HYPRE_MEMORY_HOST);
-
-      /* simply use a loop to copy data from A_offd */
-      S_offd_i[0] = 0;
-      k3 = 0;
-      for (i = 1; i <= e; i++)
-      {
-         S_offd_i[i] = k3;
-      }
-      for (i = 0; i < m_e; i++)
-      {
-         col = perm[i + nI];
-         k1 = A_offd_i[col];
-         k2 = A_offd_i[col+1];
-         for (j = k1; j < k2; j++)
-         {
-            S_offd_j[k3] = A_offd_j[j];
-            S_offd_data[k3++] = A_offd_data[j];
-         }
-         S_offd_i[i+1+e] = k3;
-      }
-
-      /* give I, J, DATA to S_offd */
-      hypre_CSRMatrixI(S_offd) = S_offd_i;
-      hypre_CSRMatrixJ(S_offd) = S_offd_j;
-      hypre_CSRMatrixData(S_offd) = S_offd_data;
-
-      /* now we need to update S_offd_colmap */
-      comm_pkg = hypre_ParCSRMatrixCommPkg(A);
-      /* setup comm_pkg if not yet built */
-      if (!comm_pkg)
+      /* Free memory */
+      if (h_A_diag != A_diag)
       {
-         hypre_MatvecCommPkgCreate(A);
-         comm_pkg = hypre_ParCSRMatrixCommPkg(A);
+         hypre_CSRMatrixDestroy(h_A_diag);
       }
-      /* get total num of send */
-      num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
-      begin = hypre_ParCSRCommPkgSendMapStart(comm_pkg,0);
-      end = hypre_ParCSRCommPkgSendMapStart(comm_pkg,num_sends);
-      send_buf = hypre_TAlloc(HYPRE_BigInt, end - begin, HYPRE_MEMORY_HOST);
-      /* copy new index into send_buf */
-      for (i = begin; i < end; i++)
-      {
-         send_buf[i-begin] = rperm[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,i)] - nLU + col_starts[0];
-      }
-
-      /* main communication */
-      comm_handle = hypre_ParCSRCommHandleCreate(21, comm_pkg, send_buf, S_offd_colmap);
-      hypre_ParCSRCommHandleDestroy(comm_handle);
-
-      /* setup index */
-      hypre_ParCSRMatrixColMapOffd(matS) = S_offd_colmap;
-
-      hypre_ILUSortOffdColmap(matS);
-
-      /* free */
-      hypre_TFree(send_buf, HYPRE_MEMORY_HOST);
-   } /* end of forming S */
-
-   *matSptr       = matS;
-   *bufferp       = buffer;
-   *matBL_infop   = matBL_info;
-   *matBU_infop   = matBU_info;
-   *matSL_infop   = matSL_info;
-   *matSU_infop   = matSU_info;
-   *A_fake_diag_ip= A_fake_diag_i;
+   }
 
-   /* Destroy the bridge after acrossing the river */
-   hypre_CSRMatrixDestroy(A_diag);
-   hypre_TFree(rperm, HYPRE_MEMORY_HOST);
-   hypre_TFree(rqperm, HYPRE_MEMORY_HOST);
+   /* Set output pointers */
+   *Bp = B;
+   *Cp = C;
+   *Ep = E;
+   *Fp = F;
 
    return hypre_error_flag;
 }
 
-/* Reorder matrix A based on local permutation (combine local permutation into global permutation)
+/*--------------------------------------------------------------------------
+ * hypre_ParILURAPReorder
+ *
+ * Reorder matrix A based on local permutation, i.e., combine local
+ * permutation into global permutation)
+ *
  * WARNING: We don't put diagonal to the first entry of each row
+ *
  * A = input matrix
- * perm = permutation array indicating ordering of rows. Perm could come from a
- *    CF_marker array or a reordering routine.
+ * perm = permutation array indicating ordering of rows.
+ *        Perm could come from a CF_marker array or a reordering routine.
  * rqperm = reverse permutation array indicating ordering of columns
  * A_pq = pointer to the output par CSR matrix.
- */
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_ParILURAPReorder(hypre_ParCSRMatrix *A, HYPRE_Int *perm, HYPRE_Int *rqperm, hypre_ParCSRMatrix **A_pq)
+hypre_ParILURAPReorder(hypre_ParCSRMatrix  *A,
+                       HYPRE_Int           *perm,
+                       HYPRE_Int           *rqperm,
+                       hypre_ParCSRMatrix **A_pq)
 {
    /* Get necessary slots */
-   hypre_CSRMatrix     *A_diag         = hypre_ParCSRMatrixDiag(A);
-   //HYPRE_Int           *A_diag_i       = hypre_CSRMatrixI(A_diag);
-   //HYPRE_Int           *A_diag_j       = hypre_CSRMatrixJ(A_diag);
-   //HYPRE_Real          *A_diag_data    = hypre_CSRMatrixData(A_diag);
-   HYPRE_Int            n              = hypre_CSRMatrixNumRows(A_diag);
-   //HYPRE_Int            nnz_A_diag     = A_diag_i[n];
-
-   //HYPRE_Int            i, j, current_idx;
+   MPI_Comm             comm            = hypre_ParCSRMatrixComm(A);
+   hypre_CSRMatrix     *A_diag          = hypre_ParCSRMatrixDiag(A);
+   HYPRE_Int            n               = hypre_CSRMatrixNumRows(A_diag);
+   HYPRE_MemoryLocation memory_location = hypre_ParCSRMatrixMemoryLocation(A);
+
+   /* Permutation matrices */
+   hypre_ParCSRMatrix  *P, *Q, *PAQ, *PA;
+   hypre_CSRMatrix     *P_diag, *Q_diag;
+   HYPRE_Int           *P_diag_i, *P_diag_j, *Q_diag_i, *Q_diag_j;
+   HYPRE_Complex       *P_diag_data, *Q_diag_data;
+   HYPRE_Int           *h_perm, *h_rqperm;
+
+   /* Local variables */
    HYPRE_Int            i;
 
-   /* MPI */
-   MPI_Comm             comm                 = hypre_ParCSRMatrixComm(A);
-   HYPRE_Int            num_procs,  my_id;
+   /* Trivial case */
+   if (!perm && !rqperm)
+   {
+      *A_pq = hypre_ParCSRMatrixClone(A, 1);
 
-   hypre_MPI_Comm_size(comm,&num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+      return hypre_error_flag;
+   }
+   else if (!perm && rqperm)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_ARG, "(!perm && rqperm) should not be possible!");
+   }
+   else if (perm && !rqperm)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_ARG, "(perm && !rqperm) should not be possible!");
+   }
 
    /* Create permutation matrices P = I(perm,:) and Q(rqperm,:), such that Apq = PAQ */
-   hypre_ParCSRMatrix *P, *Q, *PAQ, *PA;
-
-   hypre_CSRMatrix *P_diag, *Q_diag;
-   hypre_CSRMatrix *P_offd, *Q_offd;
-
-   P = hypre_ParCSRMatrixCreate( comm,
-                           hypre_ParCSRMatrixGlobalNumRows(A),
-                           hypre_ParCSRMatrixGlobalNumRows(A),
-                           hypre_ParCSRMatrixRowStarts(A),
-                           hypre_ParCSRMatrixColStarts(A),
-                           0,
-                           n,
-                           0);
-
-   Q = hypre_ParCSRMatrixCreate( comm,
-                           hypre_ParCSRMatrixGlobalNumRows(A),
-                           hypre_ParCSRMatrixGlobalNumRows(A),
-                           hypre_ParCSRMatrixRowStarts(A),
-                           hypre_ParCSRMatrixColStarts(A),
-                           0,
-                           n,
-                           0);
-
-   P_diag = hypre_ParCSRMatrixDiag(P);
-   Q_diag = hypre_ParCSRMatrixDiag(Q);
-   P_offd = hypre_ParCSRMatrixOffd(P);
-   Q_offd = hypre_ParCSRMatrixOffd(Q);
-
-   HYPRE_Int   *P_diag_i, *P_diag_j, *Q_diag_i, *Q_diag_j;
-   HYPRE_Real  *P_diag_data, *Q_diag_data;
-   HYPRE_Int   *P_offd_i, *Q_offd_i;
-
-   P_diag_i = hypre_TAlloc(HYPRE_Int, n+1, HYPRE_MEMORY_DEVICE);
-   P_diag_j = hypre_TAlloc(HYPRE_Int, n, HYPRE_MEMORY_DEVICE);
-   P_diag_data = hypre_TAlloc(HYPRE_Real, n, HYPRE_MEMORY_DEVICE);
-
-   Q_diag_i = hypre_TAlloc(HYPRE_Int, n+1, HYPRE_MEMORY_DEVICE);
-   Q_diag_j = hypre_TAlloc(HYPRE_Int, n, HYPRE_MEMORY_DEVICE);
-   Q_diag_data = hypre_TAlloc(HYPRE_Real, n, HYPRE_MEMORY_DEVICE);
-
-   /* fill data, openmp should be availiable here */
+   P = hypre_ParCSRMatrixCreate(comm,
+                                hypre_ParCSRMatrixGlobalNumRows(A),
+                                hypre_ParCSRMatrixGlobalNumRows(A),
+                                hypre_ParCSRMatrixRowStarts(A),
+                                hypre_ParCSRMatrixColStarts(A),
+                                0,
+                                n,
+                                0);
+
+   Q = hypre_ParCSRMatrixCreate(comm,
+                                hypre_ParCSRMatrixGlobalNumRows(A),
+                                hypre_ParCSRMatrixGlobalNumRows(A),
+                                hypre_ParCSRMatrixRowStarts(A),
+                                hypre_ParCSRMatrixColStarts(A),
+                                0,
+                                n,
+                                0);
+
+   hypre_ParCSRMatrixInitialize_v2(P, HYPRE_MEMORY_HOST);
+   hypre_ParCSRMatrixInitialize_v2(Q, HYPRE_MEMORY_HOST);
+
+   P_diag      = hypre_ParCSRMatrixDiag(P);
+   Q_diag      = hypre_ParCSRMatrixDiag(Q);
+
+   P_diag_i    = hypre_CSRMatrixI(P_diag);
+   P_diag_j    = hypre_CSRMatrixJ(P_diag);
+   P_diag_data = hypre_CSRMatrixData(P_diag);
+
+   Q_diag_i    = hypre_CSRMatrixI(Q_diag);
+   Q_diag_j    = hypre_CSRMatrixJ(Q_diag);
+   Q_diag_data = hypre_CSRMatrixData(Q_diag);
+
+   /* Set/Move permutation vectors on host */
+   if (hypre_GetActualMemLocation(memory_location) == hypre_MEMORY_DEVICE)
+   {
+      h_perm   = hypre_TAlloc(HYPRE_Int, n, HYPRE_MEMORY_HOST);
+      h_rqperm = hypre_TAlloc(HYPRE_Int, n, HYPRE_MEMORY_HOST);
+
+      hypre_TMemcpy(h_perm,   perm,   HYPRE_Int, n, HYPRE_MEMORY_HOST, memory_location);
+      hypre_TMemcpy(h_rqperm, rqperm, HYPRE_Int, n, HYPRE_MEMORY_HOST, memory_location);
+   }
+   else
+   {
+      h_perm   = perm;
+      h_rqperm = rqperm;
+   }
+
+   /* Fill data */
+#if defined(HYPRE_USING_OPENMP)
+   #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+#endif
    for (i = 0; i < n; i++)
    {
       P_diag_i[i] = i;
-      P_diag_j[i] = perm[i];
+      P_diag_j[i] = h_perm[i];
       P_diag_data[i] = 1.0;
 
       Q_diag_i[i] = i;
-      Q_diag_j[i] = rqperm[i];
+      Q_diag_j[i] = h_rqperm[i];
       Q_diag_data[i] = 1.0;
-
    }
    P_diag_i[n] = n;
    Q_diag_i[n] = n;
 
-   /* give I, J, DATA */
-   hypre_CSRMatrixI(P_diag) = P_diag_i;
-   hypre_CSRMatrixJ(P_diag) = P_diag_j;
-   hypre_CSRMatrixData(P_diag) = P_diag_data;
-
-   hypre_CSRMatrixI(Q_diag) = Q_diag_i;
-   hypre_CSRMatrixJ(Q_diag) = Q_diag_j;
-   hypre_CSRMatrixData(Q_diag) = Q_diag_data;
-
-   P_offd_i = hypre_CTAlloc(HYPRE_Int, n+1, HYPRE_MEMORY_DEVICE);
-   Q_offd_i = hypre_CTAlloc(HYPRE_Int, n+1, HYPRE_MEMORY_DEVICE);
-
-   hypre_CSRMatrixI(P_offd) = P_offd_i;
-   hypre_CSRMatrixI(Q_offd) = Q_offd_i;
+   /* Move to final memory location */
+   hypre_ParCSRMatrixMigrate(P, memory_location);
+   hypre_ParCSRMatrixMigrate(Q, memory_location);
 
    /* Update A */
-   PA = hypre_ParCSRMatMat(P, A);
+   PA  = hypre_ParCSRMatMat(P, A);
    PAQ = hypre_ParCSRMatMat(PA, Q);
    //PAQ = hypre_ParCSRMatrixRAPKT(P, A, Q, 0);
 
    /* free and return */
    hypre_ParCSRMatrixDestroy(P);
    hypre_ParCSRMatrixDestroy(Q);
-
-   *A_pq = PAQ;
-
-   return hypre_error_flag;
-}
-
-/* Convert the L, D, U style to the cusparse style
- * Assume the diagonal of L and U are the ilu factorization, directly combine them
- */
-HYPRE_Int
-hypre_ParILURAPBuildRP(hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *BLUm, hypre_ParCSRMatrix* E, hypre_ParCSRMatrix *F,
-                        cusparseMatDescr_t matL_des, cusparseMatDescr_t matU_des, hypre_ParCSRMatrix **Rp, hypre_ParCSRMatrix **Pp)
-{
-   /* declare variables */
-   HYPRE_Int            j, row, col;
-   HYPRE_Real           val;
-   hypre_ParCSRMatrix   *R, *P;
-   hypre_CSRMatrix      *R_diag, *P_diag;
-
-   hypre_CSRMatrix      *BLUm_diag           = hypre_ParCSRMatrixDiag(BLUm);
-   HYPRE_Int            *BLUm_diag_i         = hypre_CSRMatrixI(BLUm_diag);
-   HYPRE_Int            *BLUm_diag_j         = hypre_CSRMatrixJ(BLUm_diag);
-   HYPRE_Real           *BLUm_diag_data      = hypre_CSRMatrixData(BLUm_diag);
-
-   hypre_CSRMatrix      *E_diag              = hypre_ParCSRMatrixDiag(E);
-   HYPRE_Int            *E_diag_i            = hypre_CSRMatrixI(E_diag);
-   HYPRE_Int            *E_diag_j            = hypre_CSRMatrixJ(E_diag);
-   HYPRE_Real           *E_diag_data         = hypre_CSRMatrixData(E_diag);
-   hypre_CSRMatrix      *F_diag              = hypre_ParCSRMatrixDiag(F);
-   HYPRE_Int            *F_diag_i            = hypre_CSRMatrixI(F_diag);
-   HYPRE_Int            *F_diag_j            = hypre_CSRMatrixJ(F_diag);
-   HYPRE_Real           *F_diag_data         = hypre_CSRMatrixData(F_diag);
-
-   HYPRE_Int            n                    = hypre_CSRMatrixNumRows(F_diag);
-   HYPRE_Int            m                    = hypre_CSRMatrixNumCols(F_diag);
-
-   HYPRE_Int            nnz_BLUm             = BLUm_diag_i[n];
-
-   /* MPI */
-   MPI_Comm             comm                 = hypre_ParCSRMatrixComm(A);
-   HYPRE_Int            num_procs,  my_id;
-
-   hypre_MPI_Comm_size(comm,&num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
-
-   /* cusparse */
-   HYPRE_Int               isDoublePrecision    = sizeof(HYPRE_Complex) == sizeof(hypre_double);
-   HYPRE_Int               isSinglePrecision    = sizeof(HYPRE_Complex) == sizeof(hypre_double) / 2;
-
-   hypre_assert(isDoublePrecision || isSinglePrecision);
-
-   cusparseHandle_t handle = hypre_HandleCusparseHandle(hypre_handle());
-
-   /* compute P = -UB\(LB\F)
-    * op(A) * op(X) = \alpha op(B)
-    * first iLF = LB\F -> LB*iLF = F
-    */
-
-   HYPRE_Int               algo = 0;
-   HYPRE_Real              alpha = 1.0;
-   HYPRE_Real              *rhs;
-   cusparseSolvePolicy_t   policy = CUSPARSE_SOLVE_POLICY_NO_LEVEL;
-   size_t                  buffer_size, buffer_size_old;
-   void                    *buffer;
-   csrsm2Info_t            malL_info = NULL;
-   HYPRE_CUSPARSE_CALL(cusparseCreateCsrsm2Info(&malL_info));
-
-   rhs = hypre_CTAlloc(HYPRE_Real, m * n, HYPRE_MEMORY_DEVICE);
-
-   /* fill data, note that rhs is in Fortan style (col first)
-    * oprating by col is slow, but
-    */
-   for (row = 0; row < n; row++)
-   {
-      for (j = F_diag_i[row]; j < F_diag_i[row+1]; j++)
-      {
-         col = F_diag_j[j];
-         *(rhs + col*n + row) = F_diag_data[j];
-      }
-   }
-
-   /* check buffer size and create buffer */
-
-   if (isDoublePrecision)
-   {
-      HYPRE_CUSPARSE_CALL(cusparseDcsrsm2_bufferSizeExt( handle, algo, CUSPARSE_OPERATION_NON_TRANSPOSE, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                         n, m, nnz_BLUm, (hypre_double *)&alpha, matL_des, (hypre_double *)BLUm_diag_data, BLUm_diag_i, BLUm_diag_j, (hypre_double *)rhs, n, malL_info, policy, &buffer_size));
-   }
-   else if (isSinglePrecision)
-   {
-      HYPRE_CUSPARSE_CALL(cusparseScsrsm2_bufferSizeExt( handle, algo, CUSPARSE_OPERATION_NON_TRANSPOSE, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                         n, m, nnz_BLUm, (float *)&alpha, matL_des, (float *)BLUm_diag_data, BLUm_diag_i, BLUm_diag_j, (float *)rhs, n, malL_info, policy, &buffer_size));
-   }
-
-   buffer = hypre_MAlloc(buffer_size, HYPRE_MEMORY_DEVICE);
-
-   /* analysis */
-
-   if (isDoublePrecision)
-   {
-      HYPRE_CUSPARSE_CALL(cusparseDcsrsm2_analysis( handle, algo, CUSPARSE_OPERATION_NON_TRANSPOSE, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                         n, m, nnz_BLUm, (hypre_double *)&alpha, matL_des, (hypre_double *)BLUm_diag_data, BLUm_diag_i, BLUm_diag_j, (hypre_double *)rhs, n, malL_info, policy, buffer));
-   }
-   else if (isSinglePrecision)
-   {
-      HYPRE_CUSPARSE_CALL(cusparseScsrsm2_analysis( handle, algo, CUSPARSE_OPERATION_NON_TRANSPOSE, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                         n, m, nnz_BLUm, (float *)&alpha, matL_des, (float *)BLUm_diag_data, BLUm_diag_i, BLUm_diag_j, (float *)rhs, n, malL_info, policy, buffer));
-   }
-
-   /* solve phase */
-   if (isDoublePrecision)
-   {
-      HYPRE_CUSPARSE_CALL(cusparseDcsrsm2_solve( handle, algo, CUSPARSE_OPERATION_NON_TRANSPOSE, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                         n, m, nnz_BLUm, (hypre_double *)&alpha, matL_des, (hypre_double *)BLUm_diag_data, BLUm_diag_i, BLUm_diag_j, (hypre_double *)rhs, n, malL_info, policy, buffer));
-   }
-   else if (isSinglePrecision)
-   {
-      HYPRE_CUSPARSE_CALL(cusparseScsrsm2_solve( handle, algo, CUSPARSE_OPERATION_NON_TRANSPOSE, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                         n, m, nnz_BLUm, (float *)&alpha, matL_des, (float *)BLUm_diag_data, BLUm_diag_i, BLUm_diag_j, (float *)rhs, n, malL_info, policy, buffer));
-   }
-   /* now P = -UB\(LB\F) -> UB*P = -(LB\F)
-    */
-   alpha = -1.0;
-   csrsm2Info_t            malU_info = NULL;
-   HYPRE_CUSPARSE_CALL(cusparseCreateCsrsm2Info(&malU_info));
-
-   buffer_size_old = buffer_size;
-
-   /* check buffer size and create buffer */
-
-   if (isDoublePrecision)
-   {
-      HYPRE_CUSPARSE_CALL(cusparseDcsrsm2_bufferSizeExt( handle, algo, CUSPARSE_OPERATION_NON_TRANSPOSE, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                         n, m, nnz_BLUm, (hypre_double *)&alpha, matU_des, (hypre_double *)BLUm_diag_data, BLUm_diag_i, BLUm_diag_j, (hypre_double *)rhs, n, malU_info, policy, &buffer_size));
-   }
-   else if (isSinglePrecision)
-   {
-      HYPRE_CUSPARSE_CALL(cusparseScsrsm2_bufferSizeExt( handle, algo, CUSPARSE_OPERATION_NON_TRANSPOSE, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                         n, m, nnz_BLUm, (float *)&alpha, matU_des, (float *)BLUm_diag_data, BLUm_diag_i, BLUm_diag_j, (float *)rhs, n, malU_info, policy, &buffer_size));
-   }
-
-   if (buffer_size > buffer_size_old)
-   {
-      buffer = hypre_ReAlloc_v2(buffer, buffer_size_old, buffer_size, HYPRE_MEMORY_DEVICE);
-      buffer_size_old = buffer_size;
-   }
-
-   /* analysis */
-
-   if (isDoublePrecision)
-   {
-      HYPRE_CUSPARSE_CALL(cusparseDcsrsm2_analysis( handle, algo, CUSPARSE_OPERATION_NON_TRANSPOSE, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                         n, m, nnz_BLUm, (hypre_double *)&alpha, matU_des, (hypre_double *)BLUm_diag_data, BLUm_diag_i, BLUm_diag_j, (hypre_double *)rhs, n, malU_info, policy, buffer));
-   }
-   else if (isSinglePrecision)
-   {
-      HYPRE_CUSPARSE_CALL(cusparseScsrsm2_analysis( handle, algo, CUSPARSE_OPERATION_NON_TRANSPOSE, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                         n, m, nnz_BLUm, (float *)&alpha, matU_des, (float *)BLUm_diag_data, BLUm_diag_i, BLUm_diag_j, (float *)rhs, n, malU_info, policy, buffer));
-   }
-
-   /* solve phase */
-   if (isDoublePrecision)
-   {
-      HYPRE_CUSPARSE_CALL(cusparseDcsrsm2_solve( handle, algo, CUSPARSE_OPERATION_NON_TRANSPOSE, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                         n, m, nnz_BLUm, (hypre_double *)&alpha, matU_des, (hypre_double *)BLUm_diag_data, BLUm_diag_i, BLUm_diag_j, (hypre_double *)rhs, n, malU_info, policy, buffer));
-   }
-   else if (isSinglePrecision)
-   {
-      HYPRE_CUSPARSE_CALL(cusparseScsrsm2_solve( handle, algo, CUSPARSE_OPERATION_NON_TRANSPOSE, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                         n, m, nnz_BLUm, (float *)&alpha, matU_des, (float *)BLUm_diag_data, BLUm_diag_i, BLUm_diag_j, (float *)rhs, n, malU_info, policy, buffer));
-   }
-   /* wait till GPU done to copy data */
-   cudaDeviceSynchronize();
-   /* now form P, (n + m) * m */
-   HYPRE_Real           drop_tol = 1e-06;
-   HYPRE_Int            ctrP = 0;
-   HYPRE_Int            *P_diag_i;
-   HYPRE_Int            *P_offd_i;
-   HYPRE_Int            *P_diag_j;
-   HYPRE_Real           *P_diag_data;
-
-   HYPRE_Int             capacity_P = nnz_BLUm + m;
-
-   P_diag_i       = hypre_TAlloc(HYPRE_Int, n+m+1, HYPRE_MEMORY_DEVICE);
-   P_offd_i       = hypre_CTAlloc(HYPRE_Int, n+m+1, HYPRE_MEMORY_DEVICE);
-   P_diag_j       = hypre_TAlloc(HYPRE_Int, capacity_P, HYPRE_MEMORY_DEVICE);
-   P_diag_data    = hypre_TAlloc(HYPRE_Real, capacity_P, HYPRE_MEMORY_DEVICE);
-
-   for (row = 0; row < n; row++)
-   {
-      P_diag_i[row] = ctrP;
-      for (col = 0; col < m; col++)
-      {
-         val = *(rhs + col*n + row);
-         if (hypre_abs(val) > drop_tol)
-         {
-            if (ctrP >= capacity_P)
-            {
-               HYPRE_Int tmp;
-               tmp = capacity_P;
-               capacity_P = capacity_P * EXPAND_FACT;
-               P_diag_j       = hypre_TReAlloc_v2(P_diag_j, HYPRE_Int, tmp, HYPRE_Int, capacity_P, HYPRE_MEMORY_DEVICE);
-               P_diag_data    = hypre_TReAlloc_v2(P_diag_data, HYPRE_Real, tmp, HYPRE_Real, capacity_P, HYPRE_MEMORY_DEVICE);
-            }
-            P_diag_j[ctrP] = col;
-            P_diag_data[ctrP++] = val;
-         }
-      }
-   }
-
-   if (ctrP + m >= capacity_P)
-   {
-      HYPRE_Int tmp;
-      tmp = capacity_P;
-      capacity_P = ctrP + m;
-      P_diag_j       = hypre_TReAlloc_v2(P_diag_j, HYPRE_Int, tmp, HYPRE_Int, capacity_P, HYPRE_MEMORY_DEVICE);
-      P_diag_data    = hypre_TReAlloc_v2(P_diag_data, HYPRE_Real, tmp, HYPRE_Real, capacity_P, HYPRE_MEMORY_DEVICE);
-   }
-
-   for (row = 0; row < m; row++)
-   {
-      P_diag_i[row+n] = ctrP;
-      P_diag_j[ctrP] = row;
-      P_diag_data[ctrP++] = 1.0;
-   }
-
-   P_diag_i[m+n] = ctrP;
-
-   /* now start to form R = - (E / UB ) / LB
-    * first EiUB = E / UB -> UB'*EiUB'=E'
-    */
-   alpha = 1.0;
-   csrsm2Info_t            malU_info2 = NULL;
-   HYPRE_CUSPARSE_CALL(cusparseCreateCsrsm2Info(&malU_info2));
-
-   /* fill data, note that rhs is in Fortan style (col first)
-    * oprating by col is slow, but
-    */
-
-   hypre_TFree(rhs, HYPRE_MEMORY_DEVICE);
-   rhs = hypre_CTAlloc(HYPRE_Real, m * n, HYPRE_MEMORY_DEVICE);
-
-   for (row = 0; row < m; row++)
-   {
-      for (j = E_diag_i[row]; j < E_diag_i[row+1]; j++)
-      {
-         col = E_diag_j[j];
-         *(rhs + col*m + row) = E_diag_data[j];
-      }
-   }
-
-   /* check buffer size and create buffer */
-
-   if (isDoublePrecision)
-   {
-      HYPRE_CUSPARSE_CALL(cusparseDcsrsm2_bufferSizeExt( handle, algo, CUSPARSE_OPERATION_TRANSPOSE, CUSPARSE_OPERATION_TRANSPOSE,
-                                                         n, m, nnz_BLUm, (hypre_double *)&alpha, matU_des, (hypre_double *)BLUm_diag_data, BLUm_diag_i, BLUm_diag_j, (hypre_double *)rhs, m, malU_info2, policy, &buffer_size));
-   }
-   else if (isSinglePrecision)
-   {
-      HYPRE_CUSPARSE_CALL(cusparseScsrsm2_bufferSizeExt( handle, algo, CUSPARSE_OPERATION_TRANSPOSE, CUSPARSE_OPERATION_TRANSPOSE,
-                                                         n, m, nnz_BLUm, (float *)&alpha, matU_des, (float *)BLUm_diag_data, BLUm_diag_i, BLUm_diag_j, (float *)rhs, m, malU_info2, policy, &buffer_size));
-   }
-
-   if (buffer_size > buffer_size_old)
-   {
-      buffer = hypre_ReAlloc_v2(buffer, buffer_size_old, buffer_size, HYPRE_MEMORY_DEVICE);
-      buffer_size_old = buffer_size;
-   }
-
-   /* analysis */
-
-   if (isDoublePrecision)
-   {
-      HYPRE_CUSPARSE_CALL(cusparseDcsrsm2_analysis( handle, algo, CUSPARSE_OPERATION_TRANSPOSE, CUSPARSE_OPERATION_TRANSPOSE,
-                                                         n, m, nnz_BLUm, (hypre_double *)&alpha, matU_des, (hypre_double *)BLUm_diag_data, BLUm_diag_i, BLUm_diag_j, (hypre_double *)rhs, m, malU_info2, policy, buffer));
-   }
-   else if (isSinglePrecision)
-   {
-      HYPRE_CUSPARSE_CALL(cusparseScsrsm2_analysis( handle, algo, CUSPARSE_OPERATION_TRANSPOSE, CUSPARSE_OPERATION_TRANSPOSE,
-                                                      n, m, nnz_BLUm, (float *)&alpha, matU_des, (float *)BLUm_diag_data, BLUm_diag_i, BLUm_diag_j, (float *)rhs, m, malU_info2, policy, buffer));
-   }
-
-   /* solve phase */
-   if (isDoublePrecision)
-   {
-      HYPRE_CUSPARSE_CALL(cusparseDcsrsm2_solve( handle, algo, CUSPARSE_OPERATION_TRANSPOSE, CUSPARSE_OPERATION_TRANSPOSE,
-                                                         n, m, nnz_BLUm, (hypre_double *)&alpha, matU_des, (hypre_double *)BLUm_diag_data, BLUm_diag_i, BLUm_diag_j, (hypre_double *)rhs, m, malU_info2, policy, buffer));
-   }
-   else if (isSinglePrecision)
-   {
-      HYPRE_CUSPARSE_CALL(cusparseScsrsm2_solve( handle, algo, CUSPARSE_OPERATION_TRANSPOSE, CUSPARSE_OPERATION_TRANSPOSE,
-                                                         n, m, nnz_BLUm, (float *)&alpha, matU_des, (float *)BLUm_diag_data, BLUm_diag_i, BLUm_diag_j, (float *)rhs, m, malU_info2, policy, buffer));
-   }
-
-   /* R = - (EiUB ) / LB -> LB'R' = -EiUB'
-    */
-   alpha = -1.0;
-   csrsm2Info_t            malL_info2 = NULL;
-   HYPRE_CUSPARSE_CALL(cusparseCreateCsrsm2Info(&malL_info2));
-
-   /* check buffer size and create buffer */
-
-   if (isDoublePrecision)
-   {
-      HYPRE_CUSPARSE_CALL(cusparseDcsrsm2_bufferSizeExt( handle, algo, CUSPARSE_OPERATION_TRANSPOSE, CUSPARSE_OPERATION_TRANSPOSE,
-                                                         n, m, nnz_BLUm, (hypre_double *)&alpha, matL_des, (hypre_double *)BLUm_diag_data, BLUm_diag_i, BLUm_diag_j, (hypre_double *)rhs, m, malL_info2, policy, &buffer_size));
-   }
-   else if (isSinglePrecision)
-   {
-      HYPRE_CUSPARSE_CALL(cusparseScsrsm2_bufferSizeExt( handle, algo, CUSPARSE_OPERATION_TRANSPOSE, CUSPARSE_OPERATION_TRANSPOSE,
-                                                         n, m, nnz_BLUm, (float *)&alpha, matL_des, (float *)BLUm_diag_data, BLUm_diag_i, BLUm_diag_j, (float *)rhs, m, malL_info2, policy, &buffer_size));
-   }
-
-   if (buffer_size > buffer_size_old)
-   {
-      buffer = hypre_ReAlloc_v2(buffer, buffer_size_old, buffer_size, HYPRE_MEMORY_DEVICE);
-      buffer_size_old = buffer_size;
-   }
-
-   /* analysis */
-
-   if (isDoublePrecision)
-   {
-      HYPRE_CUSPARSE_CALL(cusparseDcsrsm2_analysis( handle, algo, CUSPARSE_OPERATION_TRANSPOSE, CUSPARSE_OPERATION_TRANSPOSE,
-                                                         n, m, nnz_BLUm, (hypre_double *)&alpha, matL_des, (hypre_double *)BLUm_diag_data, BLUm_diag_i, BLUm_diag_j, (hypre_double *)rhs, m, malL_info2, policy, buffer));
-   }
-   else if (isSinglePrecision)
-   {
-      HYPRE_CUSPARSE_CALL(cusparseScsrsm2_analysis( handle, algo, CUSPARSE_OPERATION_TRANSPOSE, CUSPARSE_OPERATION_TRANSPOSE,
-                                                      n, m, nnz_BLUm, (float *)&alpha, matL_des, (float *)BLUm_diag_data, BLUm_diag_i, BLUm_diag_j, (float *)rhs, m, malL_info2, policy, buffer));
-   }
-
-   /* solve phase */
-   if (isDoublePrecision)
-   {
-      HYPRE_CUSPARSE_CALL(cusparseDcsrsm2_solve( handle, algo, CUSPARSE_OPERATION_TRANSPOSE, CUSPARSE_OPERATION_TRANSPOSE,
-                                                         n, m, nnz_BLUm, (hypre_double *)&alpha, matL_des, (hypre_double *)BLUm_diag_data, BLUm_diag_i, BLUm_diag_j, (hypre_double *)rhs, m, malL_info2, policy, buffer));
-   }
-   else if (isSinglePrecision)
+   hypre_ParCSRMatrixDestroy(PA);
+   if (h_perm != perm)
    {
-      HYPRE_CUSPARSE_CALL(cusparseScsrsm2_solve( handle, algo, CUSPARSE_OPERATION_TRANSPOSE, CUSPARSE_OPERATION_TRANSPOSE,
-                                                         n, m, nnz_BLUm, (float *)&alpha, matL_des, (float *)BLUm_diag_data, BLUm_diag_i, BLUm_diag_j, (float *)rhs, m, malL_info2, policy, buffer));
+      hypre_TFree(h_perm, HYPRE_MEMORY_HOST);
    }
-   cudaDeviceSynchronize();
-   /* now form R, m * (n + m) */
-   HYPRE_Int            ctrR = 0;
-   HYPRE_Int            *R_diag_i;
-   HYPRE_Int            *R_offd_i;
-   HYPRE_Int            *R_diag_j;
-   HYPRE_Real           *R_diag_data;
-
-   HYPRE_Int       capacity_R = nnz_BLUm + m;
-   R_diag_i       = hypre_TAlloc(HYPRE_Int, m+1, HYPRE_MEMORY_DEVICE);
-   R_offd_i       = hypre_CTAlloc(HYPRE_Int, m+1, HYPRE_MEMORY_DEVICE);
-   R_diag_j       = hypre_TAlloc(HYPRE_Int, capacity_R, HYPRE_MEMORY_DEVICE);
-   R_diag_data    = hypre_TAlloc(HYPRE_Real, capacity_R, HYPRE_MEMORY_DEVICE);
-
-   for (row = 0; row < m; row++)
+   if (h_rqperm != rqperm)
    {
-      R_diag_i[row] = ctrR;
-      for (col = 0; col < n; col++)
-      {
-         val = *(rhs + col*m + row);
-         if (hypre_abs(val) > drop_tol)
-         {
-            if (ctrR >= capacity_R)
-            {
-               HYPRE_Int tmp;
-               tmp = capacity_R;
-               capacity_R = capacity_R * EXPAND_FACT;
-               R_diag_j       = hypre_TReAlloc_v2(R_diag_j, HYPRE_Int, tmp, HYPRE_Int, capacity_R, HYPRE_MEMORY_DEVICE);
-               R_diag_data    = hypre_TReAlloc_v2(R_diag_data, HYPRE_Real, tmp, HYPRE_Real, capacity_R, HYPRE_MEMORY_DEVICE);
-            }
-            R_diag_j[ctrR] = col;
-            R_diag_data[ctrR++] = val;
-         }
-      }
-      if (ctrR >= capacity_R)
-      {
-         HYPRE_Int tmp;
-         tmp = capacity_R;
-         capacity_R = capacity_R * EXPAND_FACT;
-         R_diag_j       = hypre_TReAlloc_v2(R_diag_j, HYPRE_Int, tmp, HYPRE_Int, capacity_R, HYPRE_MEMORY_DEVICE);
-         R_diag_data    = hypre_TReAlloc_v2(R_diag_data, HYPRE_Real, tmp, HYPRE_Real, capacity_R, HYPRE_MEMORY_DEVICE);
-      }
-      R_diag_j[ctrR] = n + row;
-      R_diag_data[ctrR++] = 1.0;
+      hypre_TFree(h_rqperm, HYPRE_MEMORY_HOST);
    }
 
-   R_diag_i[m] = ctrR;
-
-   hypre_TFree(buffer, HYPRE_MEMORY_DEVICE);
-
-   /* create ParCSR matrices */
-
-   R = hypre_ParCSRMatrixCreate( hypre_ParCSRMatrixComm(A),
-                        hypre_ParCSRMatrixGlobalNumRows(E),
-                        hypre_ParCSRMatrixGlobalNumCols(A),
-                        hypre_ParCSRMatrixRowStarts(E),
-                        hypre_ParCSRMatrixColStarts(A),
-                        0,
-                        ctrR,
-                        0);
-
-   P = hypre_ParCSRMatrixCreate( hypre_ParCSRMatrixComm(A),
-                        hypre_ParCSRMatrixGlobalNumRows(A),
-                        hypre_ParCSRMatrixGlobalNumCols(F),
-                        hypre_ParCSRMatrixRowStarts(A),
-                        hypre_ParCSRMatrixColStarts(F),
-                        0,
-                        ctrP,
-                        0);
-
-   /* Assign value to diagonal data */
-
-   R_diag = hypre_ParCSRMatrixDiag(R);
-   hypre_CSRMatrixI(R_diag) = R_diag_i;
-   hypre_CSRMatrixJ(R_diag) = R_diag_j;
-   hypre_CSRMatrixData(R_diag) = R_diag_data;
-   hypre_CSRMatrixSetDataOwner(R_diag, 1);
-
-   P_diag = hypre_ParCSRMatrixDiag(P);
-   hypre_CSRMatrixI(P_diag) = P_diag_i;
-   hypre_CSRMatrixJ(P_diag) = P_diag_j;
-   hypre_CSRMatrixData(P_diag) = P_diag_data;
-   hypre_CSRMatrixSetDataOwner(P_diag, 1);
-
-   /* Assign value to off diagonal data */
-
-   R_diag = hypre_ParCSRMatrixOffd(R);
-   hypre_CSRMatrixI(R_diag) = R_offd_i;
-   P_diag = hypre_ParCSRMatrixOffd(P);
-   hypre_CSRMatrixI(P_diag) = P_offd_i;
-
-   *Rp = R;
-   *Pp = P;
-
-   HYPRE_CUSPARSE_CALL(cusparseDestroyCsrsm2Info(malL_info));
-   HYPRE_CUSPARSE_CALL(cusparseDestroyCsrsm2Info(malU_info));
-   HYPRE_CUSPARSE_CALL(cusparseDestroyCsrsm2Info(malL_info2));
-   HYPRE_CUSPARSE_CALL(cusparseDestroyCsrsm2Info(malU_info2));
+   *A_pq = PAQ;
 
    return hypre_error_flag;
 }
 
-/* Convert the L, D, U style to the cusparse style
+/*--------------------------------------------------------------------------
+ * hypre_ILUSetupLDUtoCusparse
+ *
+ * Convert the L, D, U style to the cusparse style
  * Assume the diagonal of L and U are the ilu factorization, directly combine them
- */
+ *
+ * TODO (VPM): Check this function's name
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_ILUSetupLDUtoCusparse(hypre_ParCSRMatrix *L, HYPRE_Real *D, hypre_ParCSRMatrix *U, hypre_ParCSRMatrix **LDUp)
+hypre_ILUSetupLDUtoCusparse(hypre_ParCSRMatrix  *L,
+                            HYPRE_Real          *D,
+                            hypre_ParCSRMatrix  *U,
+                            hypre_ParCSRMatrix **LDUp)
 {
-   /* data slots */
-   HYPRE_Int            i, j, pos;
-
-   hypre_CSRMatrix      *L_diag        = hypre_ParCSRMatrixDiag(L);
-   hypre_CSRMatrix      *U_diag        = hypre_ParCSRMatrixDiag(U);
-   HYPRE_Int            *L_diag_i      = hypre_CSRMatrixI(L_diag);
-   HYPRE_Int            *L_diag_j      = hypre_CSRMatrixJ(L_diag);
-   HYPRE_Real           *L_diag_data   = hypre_CSRMatrixData(L_diag);
-   HYPRE_Int            *U_diag_i      = hypre_CSRMatrixI(U_diag);
-   HYPRE_Int            *U_diag_j      = hypre_CSRMatrixJ(U_diag);
-   HYPRE_Real           *U_diag_data   = hypre_CSRMatrixData(U_diag);
-   HYPRE_Int            n              = hypre_ParCSRMatrixNumRows(L);
-   HYPRE_Int            nnz_L          = L_diag_i[n];
-   HYPRE_Int            nnz_U          = U_diag_i[n];
-   HYPRE_Int            nnz_LDU        = n + nnz_L + nnz_U;
+   MPI_Comm              comm     = hypre_ParCSRMatrixComm(L);
+   hypre_CSRMatrix      *L_diag   = hypre_ParCSRMatrixDiag(L);
+   hypre_CSRMatrix      *U_diag   = hypre_ParCSRMatrixDiag(U);
+   HYPRE_Int            *L_diag_i = hypre_CSRMatrixI(L_diag);
+   HYPRE_Int            *L_diag_j = hypre_CSRMatrixJ(L_diag);
+   HYPRE_Real           *L_diag_a = hypre_CSRMatrixData(L_diag);
+   HYPRE_Int            *U_diag_i = hypre_CSRMatrixI(U_diag);
+   HYPRE_Int            *U_diag_j = hypre_CSRMatrixJ(U_diag);
+   HYPRE_Real           *U_diag_a = hypre_CSRMatrixData(U_diag);
+   HYPRE_Int             n        = hypre_ParCSRMatrixNumRows(L);
+   HYPRE_Int             nnz_L    = L_diag_i[n];
+   HYPRE_Int             nnz_U    = U_diag_i[n];
+   HYPRE_Int             nnz_LDU  = n + nnz_L + nnz_U;
 
    hypre_ParCSRMatrix   *LDU;
    hypre_CSRMatrix      *LDU_diag;
    HYPRE_Int            *LDU_diag_i;
    HYPRE_Int            *LDU_diag_j;
-   HYPRE_Real           *LDU_diag_data;
-
-   /* MPI */
-   MPI_Comm             comm                 = hypre_ParCSRMatrixComm(L);
-   HYPRE_Int            num_procs,  my_id;
-
-   hypre_MPI_Comm_size(comm,&num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
-
-
-   /* cuda data slot */
-
-   /* create matrix */
-
-   LDU = hypre_ParCSRMatrixCreate(  comm,
-                                    hypre_ParCSRMatrixGlobalNumRows(L),
-                                    hypre_ParCSRMatrixGlobalNumRows(L),
-                                    hypre_ParCSRMatrixRowStarts(L),
-                                    hypre_ParCSRMatrixColStarts(L),
-                                    0,
-                                    nnz_LDU,
-                                    0);
-
+   HYPRE_Real           *LDU_diag_a;
+
+   HYPRE_Int             i, j, pos;
+
+   /* Create matrix */
+   LDU = hypre_ParCSRMatrixCreate(comm,
+                                  hypre_ParCSRMatrixGlobalNumRows(L),
+                                  hypre_ParCSRMatrixGlobalNumRows(L),
+                                  hypre_ParCSRMatrixRowStarts(L),
+                                  hypre_ParCSRMatrixColStarts(L),
+                                  0,
+                                  nnz_LDU,
+                                  0);
+   hypre_ParCSRMatrixInitialize_v2(LDU, HYPRE_MEMORY_HOST);
    LDU_diag = hypre_ParCSRMatrixDiag(LDU);
-   LDU_diag_i = hypre_TAlloc(HYPRE_Int, n+1, HYPRE_MEMORY_DEVICE);
-   LDU_diag_j = hypre_TAlloc(HYPRE_Int, nnz_LDU, HYPRE_MEMORY_DEVICE);
-   LDU_diag_data = hypre_TAlloc(HYPRE_Real, nnz_LDU, HYPRE_MEMORY_DEVICE);
+   LDU_diag_i = hypre_CSRMatrixI(LDU_diag);
+   LDU_diag_j = hypre_CSRMatrixJ(LDU_diag);
+   LDU_diag_a = hypre_CSRMatrixData(LDU_diag);
 
    pos = 0;
-
-   for (i = 1; i <= n; i++)
+   for (i = 0; i < n; i++)
    {
-      LDU_diag_i[i-1] = pos;
-      for (j = L_diag_i[i-1]; j < L_diag_i[i]; j++)
+      LDU_diag_i[i] = pos;
+      for (j = L_diag_i[i]; j < L_diag_i[i + 1]; j++)
       {
-         LDU_diag_j[pos] = L_diag_j[j];
-         LDU_diag_data[pos++] = L_diag_data[j];
+         LDU_diag_j[pos]   = L_diag_j[j];
+         LDU_diag_a[pos++] = L_diag_a[j];
       }
-      LDU_diag_j[pos] = i-1;
-      LDU_diag_data[pos++] = 1.0/D[i-1];
-      for (j = U_diag_i[i-1]; j < U_diag_i[i]; j++)
+      LDU_diag_j[pos]   = i;
+      LDU_diag_a[pos++] = 1.0 / D[i];
+      for (j = U_diag_i[i]; j < U_diag_i[i + 1]; j++)
       {
-         LDU_diag_j[pos] = U_diag_j[j];
-         LDU_diag_data[pos++] = U_diag_data[j];
+         LDU_diag_j[pos]   = U_diag_j[j];
+         LDU_diag_a[pos++] = U_diag_a[j];
       }
    }
    LDU_diag_i[n] = pos;
 
-   hypre_CSRMatrixI(LDU_diag)    = LDU_diag_i;
-   hypre_CSRMatrixJ(LDU_diag)    = LDU_diag_j;
-   hypre_CSRMatrixData(LDU_diag) = LDU_diag_data;
+   /* Migrate to device (abstract memory space) */
+   hypre_ParCSRMatrixMigrate(LDU, HYPRE_MEMORY_DEVICE);
 
-   /* now sort */
-   hypre_CSRMatrixSortRow(LDU_diag);
-   hypre_ParCSRMatrixDiag(LDU) = LDU_diag;
+#if defined(HYPRE_USING_GPU)
+   hypre_CSRMatrixSortRow(hypre_ParCSRMatrixDiag(LDU));
+#endif
 
    *LDUp = LDU;
 
    return hypre_error_flag;
 }
 
-/* Apply the (modified) ILU factorization to the diagonal block of A only.
+/*--------------------------------------------------------------------------
+ * hypre_ILUSetupRAPMILU0
+ *
+ * Apply the (modified) ILU factorization to the diagonal block of A only.
+ *
  * A: matrix
  * ALUp: pointer to the result, factorization stroed on the diagonal
  * modified: set to 0 to use classical ILU0
- */
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_ILUSetupRAPMILU0(hypre_ParCSRMatrix *A, hypre_ParCSRMatrix **ALUp, HYPRE_Int modified)
+hypre_ILUSetupRAPMILU0(hypre_ParCSRMatrix  *A,
+                       hypre_ParCSRMatrix **ALUp,
+                       HYPRE_Int            modified)
 {
-   HYPRE_Int            n              = hypre_CSRMatrixNumRows(hypre_ParCSRMatrixDiag(A));
+   HYPRE_Int             n = hypre_CSRMatrixNumRows(hypre_ParCSRMatrixDiag(A));
+
    /* Get necessary slots */
    hypre_ParCSRMatrix   *L, *U, *S, *ALU;
    HYPRE_Real           *D;
    HYPRE_Int            *u_end;
 
-   /* u_end is the end position of the upper triangular part (if we need E and F implicitly), not used here */
-   hypre_ILUSetupMILU0( A, NULL, NULL, n, n, &L, &D, &U, &S, &u_end, modified);
+   /* u_end is the end position of the upper triangular part
+     (if we need E and F implicitly), not used here */
+   hypre_ILUSetupMILU0(A, NULL, NULL, n, n, &L, &D, &U, &S, &u_end, modified);
    hypre_TFree(u_end, HYPRE_MEMORY_HOST);
 
+   /* TODO (VPM): Change this function's name */
    hypre_ILUSetupLDUtoCusparse(L, D, U, &ALU);
 
-   if (L)
-   {
-      hypre_ParCSRMatrixDestroy(L);
-   }
-   if (D)
-   {
-      hypre_TFree(D, HYPRE_MEMORY_DEVICE);
-   }
-   if (U)
-   {
-      hypre_ParCSRMatrixDestroy(U);
-   }
+   /* Free memory */
+   hypre_ParCSRMatrixDestroy(L);
+   hypre_TFree(D, hypre_ParCSRMatrixMemoryLocation(A));
+   hypre_ParCSRMatrixDestroy(U);
 
    *ALUp = ALU;
 
    return hypre_error_flag;
 }
 
-/* Modified ILU(0) with RAP like solve
+/*--------------------------------------------------------------------------
+ * hypre_ILUSetupRAPILU0Device
+ *
+ * Modified ILU(0) with RAP like solve
  * A = input matrix
- * Not explicitly forming the matrix, the previous version was abondoned
- */
+ *
+ * TODO (VPM): Move this function to par_setup_device.c?
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_ILUSetupRAPILU0Device(hypre_ParCSRMatrix *A, HYPRE_Int *perm, HYPRE_Int n, HYPRE_Int nLU,
-                           cusparseMatDescr_t matL_des, cusparseMatDescr_t matU_des, cusparseSolvePolicy_t ilu_solve_policy,
-                           void **bufferp, csrsv2Info_t *matAL_infop, csrsv2Info_t *matAU_infop,
-                           csrsv2Info_t *matBL_infop, csrsv2Info_t *matBU_infop,
-                           csrsv2Info_t *matSL_infop, csrsv2Info_t *matSU_infop,
-                           hypre_ParCSRMatrix **Apermptr, hypre_ParCSRMatrix **matSptr, hypre_CSRMatrix **ALUptr, hypre_CSRMatrix **BLUptr, hypre_CSRMatrix **CLUptr,
-                           hypre_CSRMatrix **Eptr, hypre_CSRMatrix **Fptr, HYPRE_Int test_opt)
+hypre_ILUSetupRAPILU0Device(hypre_ParCSRMatrix  *A,
+                            HYPRE_Int           *perm,
+                            HYPRE_Int            n,
+                            HYPRE_Int            nLU,
+                            hypre_ParCSRMatrix **Apermptr,
+                            hypre_ParCSRMatrix **matSptr,
+                            hypre_CSRMatrix    **ALUptr,
+                            hypre_CSRMatrix    **BLUptr,
+                            hypre_CSRMatrix    **CLUptr,
+                            hypre_CSRMatrix    **Eptr,
+                            hypre_CSRMatrix    **Fptr,
+                            HYPRE_Int            test_opt)
 {
-
-   /* params */
-   MPI_Comm             comm           = hypre_ParCSRMatrixComm(A);
-   HYPRE_Int            *rperm         = NULL;
-
-   csrsv2Info_t         matAL_info     = NULL;
-   csrsv2Info_t         matAU_info     = NULL;
-   csrsv2Info_t         matBL_info     = NULL;
-   csrsv2Info_t         matBU_info     = NULL;
-   csrsv2Info_t         matSL_info     = NULL;
-   csrsv2Info_t         matSU_info     = NULL;
-
-   HYPRE_Int            buffer_size    = 0;
-   void                 *buffer        = NULL;
-
-   //hypre_CSRMatrix      *A_diag        = hypre_ParCSRMatrixDiag(A);
-   HYPRE_Int            m              = n - nLU;
-
-   //printf("Size of local Schur: %d\n",m);
-
+   MPI_Comm             comm          = hypre_ParCSRMatrixComm(A);
+   HYPRE_Int           *rperm         = NULL;
+   HYPRE_Int            m             = n - nLU;
    HYPRE_Int            i;
-
-   /* MPI */
    HYPRE_Int            num_procs,  my_id;
-   hypre_MPI_Comm_size(comm,&num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
 
    /* Matrix Structure */
    hypre_ParCSRMatrix   *Apq, *ALU, *ALUm, *S;
    hypre_CSRMatrix      *Amd, *Ad, *SLU, *Apq_diag;
 
-   rperm                               = hypre_CTAlloc(HYPRE_Int, n, HYPRE_MEMORY_HOST);
+   hypre_MPI_Comm_size(comm, &num_procs);
+   hypre_MPI_Comm_rank(comm, &my_id);
+
+   rperm = hypre_CTAlloc(HYPRE_Int, n, HYPRE_MEMORY_HOST);
 
-   for(i = 0; i < n; i++)
+   for (i = 0; i < n; i++)
    {
       rperm[perm[i]] = i;
    }
@@ -3300,200 +1900,216 @@ hypre_ILUSetupRAPILU0Device(hypre_ParCSRMatrix *A, HYPRE_Int *perm, HYPRE_Int n,
 
    /* get modified and extract LU factorization */
    Amd = hypre_ParCSRMatrixDiag(ALUm);
-   Ad = hypre_ParCSRMatrixDiag(ALU);
-   switch(test_opt)
+   Ad  = hypre_ParCSRMatrixDiag(ALU);
+   switch (test_opt)
    {
       case 1:
-         {
-            /* RAP where we save E and F */
-            Apq_diag = hypre_ParCSRMatrixDiag(Apq);
-            hypre_CSRMatrixSortRow(Apq_diag);
-            hypre_ParILUCusparseILUExtractEBFC(Apq_diag, nLU, &dB, &dS, Eptr, Fptr);
-            /* get modified ILU of B */
-            hypre_ParILUCusparseILUExtractEBFC(Amd, nLU, BLUptr, &SLU, &dE, &dF);
-            hypre_CSRMatrixDestroy(dB);
-            hypre_CSRMatrixDestroy(dS);
-            hypre_CSRMatrixDestroy(dE);
-            hypre_CSRMatrixDestroy(dF);
-         }
+      {
+         /* RAP where we save E and F */
+         Apq_diag = hypre_ParCSRMatrixDiag(Apq);
+#if defined(HYPRE_USING_GPU)
+         hypre_CSRMatrixSortRow(Apq_diag);
+#endif
+         hypre_ParILUExtractEBFC(Apq_diag, nLU, &dB, &dS, Eptr, Fptr);
+
+         /* get modified ILU of B */
+         hypre_ParILUExtractEBFC(Amd, nLU, BLUptr, &SLU, &dE, &dF);
+         hypre_CSRMatrixDestroy(dB);
+         hypre_CSRMatrixDestroy(dS);
+         hypre_CSRMatrixDestroy(dE);
+         hypre_CSRMatrixDestroy(dF);
+
          break;
+      }
+
       case 2:
-         {
-            /* C-EB^{-1}F where we save EU^{-1}, L^{-1}F as sparse matrices */
-            Apq_diag = hypre_ParCSRMatrixDiag(Apq);
-            hypre_CSRMatrixSortRow(Apq_diag);
-            hypre_ParILUCusparseILUExtractEBFC(Apq_diag, nLU, &dB, CLUptr, &dE, &dF);
-            /* get modified ILU of B */
-            hypre_ParILUCusparseILUExtractEBFC(Amd, nLU, BLUptr, &SLU, Eptr, Fptr);
-            hypre_CSRMatrixDestroy(dB);
-            hypre_CSRMatrixDestroy(dE);
-            hypre_CSRMatrixDestroy(dF);
-         }
+      {
+         /* C-EB^{-1}F where we save EU^{-1}, L^{-1}F as sparse matrices */
+         Apq_diag = hypre_ParCSRMatrixDiag(Apq);
+#if defined(HYPRE_USING_GPU)
+         hypre_CSRMatrixSortRow(Apq_diag);
+#endif
+         hypre_ParILUExtractEBFC(Apq_diag, nLU, &dB, CLUptr, &dE, &dF);
+
+         /* get modified ILU of B */
+         hypre_ParILUExtractEBFC(Amd, nLU, BLUptr, &SLU, Eptr, Fptr);
+         hypre_CSRMatrixDestroy(dB);
+         hypre_CSRMatrixDestroy(dE);
+         hypre_CSRMatrixDestroy(dF);
+
          break;
+      }
+
       case 3:
-         {
-            /* C-EB^{-1}F where we save E and F */
-            Apq_diag = hypre_ParCSRMatrixDiag(Apq);
-            hypre_CSRMatrixSortRow(Apq_diag);
-            hypre_ParILUCusparseILUExtractEBFC(Apq_diag, nLU, &dB, CLUptr, Eptr, Fptr);
-            /* get modified ILU of B */
-            hypre_ParILUCusparseILUExtractEBFC(Amd, nLU, BLUptr, &SLU, &dE, &dF);
-            hypre_CSRMatrixDestroy(dB);
-            hypre_CSRMatrixDestroy(dE);
-            hypre_CSRMatrixDestroy(dF);
-         }
+      {
+         /* C-EB^{-1}F where we save E and F */
+         Apq_diag = hypre_ParCSRMatrixDiag(Apq);
+#if defined(HYPRE_USING_GPU)
+         hypre_CSRMatrixSortRow(Apq_diag);
+#endif
+         hypre_ParILUExtractEBFC(Apq_diag, nLU, &dB, CLUptr, Eptr, Fptr);
+
+         /* get modified ILU of B */
+         hypre_ParILUExtractEBFC(Amd, nLU, BLUptr, &SLU, &dE, &dF);
+         hypre_CSRMatrixDestroy(dB);
+         hypre_CSRMatrixDestroy(dE);
+         hypre_CSRMatrixDestroy(dF);
+
          break;
+      }
+
       case 4:
-         {
-            /* RAP where we save EU^{-1}, L^{-1}F as sparse matrices */
-            hypre_ParILUCusparseILUExtractEBFC(Ad, nLU, BLUptr, &SLU, Eptr, Fptr);
-         }
+      {
+         /* RAP where we save EU^{-1}, L^{-1}F as sparse matrices */
+         hypre_ParILUExtractEBFC(Ad, nLU, BLUptr, &SLU, Eptr, Fptr);
+
          break;
-      case 0: default:
-         {
-            /* RAP where we save EU^{-1}, L^{-1}F as sparse matrices */
-            hypre_ParILUCusparseILUExtractEBFC(Amd, nLU, BLUptr, &SLU, Eptr, Fptr);
-         }
+      }
+
+      case 0:
+      default:
+      {
+         /* RAP where we save EU^{-1}, L^{-1}F as sparse matrices */
+         hypre_ParILUExtractEBFC(Amd, nLU, BLUptr, &SLU, Eptr, Fptr);
+
          break;
+      }
    }
 
    *ALUptr = hypre_ParCSRMatrixDiag(ALU);
-   /* Analysis of BILU */
-   HYPRE_ILUSetupCusparseCSRILU0SetupSolve(*ALUptr, matL_des, matU_des,
-                           ilu_solve_policy, &matAL_info, &matAU_info,
-                           &buffer_size, &buffer);
-
-   /* Analysis of BILU */
-   HYPRE_ILUSetupCusparseCSRILU0SetupSolve(*BLUptr, matL_des, matU_des,
-                           ilu_solve_policy, &matBL_info, &matBU_info,
-                           &buffer_size, &buffer);
 
-   /* Analysis of SILU */
-   HYPRE_ILUSetupCusparseCSRILU0SetupSolve(SLU, matL_des, matU_des,
-                           ilu_solve_policy, &matSL_info, &matSU_info,
-                           &buffer_size, &buffer);
+   hypre_ParCSRMatrixDiag(ALU) = NULL; /* not a good practice to manipulate parcsr's csr */
+   hypre_ParCSRMatrixDestroy(ALU);
+   hypre_ParCSRMatrixDestroy(ALUm);
 
    /* start forming parCSR matrix S */
 
-   HYPRE_BigInt   S_total_rows, *S_row_starts;
+   HYPRE_BigInt   S_total_rows, S_row_starts[2];
    HYPRE_BigInt   big_m = (HYPRE_BigInt)m;
-   hypre_MPI_Allreduce( &big_m, &S_total_rows, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
+   hypre_MPI_Allreduce(&big_m, &S_total_rows, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
 
-   if (S_total_rows>0)
+   if (S_total_rows > 0)
    {
       {
          HYPRE_BigInt global_start;
-         S_row_starts = hypre_CTAlloc(HYPRE_BigInt,2,HYPRE_MEMORY_HOST);
-         hypre_MPI_Scan( &big_m, &global_start, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
-         S_row_starts[0] = global_start - m;
+         hypre_MPI_Scan(&big_m, &global_start, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
+         S_row_starts[0] = global_start - big_m;
          S_row_starts[1] = global_start;
       }
 
-      S_row_starts = hypre_CTAlloc(HYPRE_BigInt, 2, HYPRE_MEMORY_HOST);
-      S_row_starts[1] = S_total_rows;
-      S_row_starts[0] = S_total_rows - m;
-      hypre_MPI_Allreduce(&m, &S_total_rows, 1, HYPRE_MPI_INT, hypre_MPI_SUM, comm);
       S = hypre_ParCSRMatrixCreate( hypre_ParCSRMatrixComm(A),
-                           S_total_rows,
-                           S_total_rows,
-                           S_row_starts,
-                           S_row_starts,
-                           0,
-                           0,
-                           0);
-
-      /* memroy leak here */
-      hypre_ParCSRMatrixDiag(S) = SLU;
+                                    S_total_rows,
+                                    S_total_rows,
+                                    S_row_starts,
+                                    S_row_starts,
+                                    0,
+                                    0,
+                                    0);
 
-      /* free memory */
-      hypre_TFree(S_row_starts, HYPRE_MEMORY_HOST);
+      hypre_CSRMatrixDestroy(hypre_ParCSRMatrixDiag(S));
+      hypre_ParCSRMatrixDiag(S) = SLU;
+   }
+   else
+   {
+      S = NULL;
+      hypre_CSRMatrixDestroy(SLU);
    }
 
-   *matSptr       = S;
-   *Apermptr      = Apq;
-   *bufferp       = buffer;
-   *matAL_infop   = matAL_info;
-   *matAU_infop   = matAU_info;
-   *matBL_infop   = matBL_info;
-   *matBU_infop   = matBU_info;
-   *matSL_infop   = matSL_info;
-   *matSU_infop   = matSU_info;
+   *matSptr  = S;
+   *Apermptr = Apq;
+
+   hypre_TFree(rperm, HYPRE_MEMORY_HOST);
 
    return hypre_error_flag;
 }
 
-#endif
-
-/* Modified ILU(0) with RAP like solve
+/*--------------------------------------------------------------------------
+ * hypre_ILUSetupRAPILU0
+ *
+ * Modified ILU(0) with RAP like solve
+ *
  * A = input matrix
  * Not explicitly forming the matrix
- */
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_ILUSetupRAPILU0(hypre_ParCSRMatrix *A, HYPRE_Int *perm, HYPRE_Int n, HYPRE_Int nLU,
-                           hypre_ParCSRMatrix **Lptr, HYPRE_Real **Dptr, hypre_ParCSRMatrix **Uptr,
-                           hypre_ParCSRMatrix **mLptr, HYPRE_Real **mDptr, hypre_ParCSRMatrix **mUptr, HYPRE_Int **u_end)
+hypre_ILUSetupRAPILU0(hypre_ParCSRMatrix  *A,
+                      HYPRE_Int           *perm,
+                      HYPRE_Int            n,
+                      HYPRE_Int            nLU,
+                      hypre_ParCSRMatrix **Lptr,
+                      HYPRE_Real         **Dptr,
+                      hypre_ParCSRMatrix **Uptr,
+                      hypre_ParCSRMatrix **mLptr,
+                      HYPRE_Real         **mDptr,
+                      hypre_ParCSRMatrix **mUptr,
+                      HYPRE_Int          **u_end)
 {
-   HYPRE_Int            i;
    hypre_ParCSRMatrix   *S_temp = NULL;
    HYPRE_Int            *u_temp = NULL;
 
-   /* standard ILU0 factorization */
+   HYPRE_Int            *u_end_array;
+
+   hypre_CSRMatrix      *L_diag, *U_diag;
+   HYPRE_Int            *L_diag_i, *U_diag_i;
+   HYPRE_Int            *L_diag_j, *U_diag_j;
+   HYPRE_Complex        *L_diag_data, *U_diag_data;
+
+   hypre_CSRMatrix      *mL_diag, *mU_diag;
+   HYPRE_Int            *mL_diag_i, *mU_diag_i;
+   HYPRE_Int            *mL_diag_j, *mU_diag_j;
+   HYPRE_Complex        *mL_diag_data, *mU_diag_data;
+
+   HYPRE_Int            i;
+
+   /* Standard ILU0 factorization */
    hypre_ILUSetupMILU0(A, perm, perm, n, n, Lptr, Dptr, Uptr, &S_temp, &u_temp, 0);
-   if (S_temp)
-   {
-      hypre_ParCSRMatrixDestroy(S_temp);
-   }
-   if (u_temp)
-   {
-      hypre_Free( u_temp, HYPRE_MEMORY_HOST);
-   }
-   /* modified ILU0 factorization */
-   hypre_ILUSetupMILU0(A, perm, perm, n, n, mLptr, mDptr, mUptr, &S_temp, &u_temp, 1);
-   if (S_temp)
-   {
-      hypre_ParCSRMatrixDestroy(S_temp);
-   }
-   if (u_temp)
-   {
-      hypre_Free( u_temp, HYPRE_MEMORY_HOST);
-   }
 
-   /* pointer to the start location */
-   HYPRE_Int *u_end_array;
-   u_end_array = hypre_TAlloc(HYPRE_Int, n, HYPRE_MEMORY_HOST);
+   /* Free memory */
+   hypre_ParCSRMatrixDestroy(S_temp);
+   hypre_TFree(u_temp, HYPRE_MEMORY_HOST);
 
-   hypre_CSRMatrix   *U_diag = hypre_ParCSRMatrixDiag(*Uptr);
-   HYPRE_Int         *U_diag_i = hypre_CSRMatrixI(U_diag);
-   HYPRE_Int         *U_diag_j = hypre_CSRMatrixJ(U_diag);
-   HYPRE_Real        *U_diag_data = hypre_CSRMatrixData(U_diag);
-   hypre_CSRMatrix   *mU_diag = hypre_ParCSRMatrixDiag(*mUptr);
-   HYPRE_Int         *mU_diag_i = hypre_CSRMatrixI(mU_diag);
-   HYPRE_Int         *mU_diag_j = hypre_CSRMatrixJ(mU_diag);
-   HYPRE_Real        *mU_diag_data = hypre_CSRMatrixData(mU_diag);
+   /* Modified ILU0 factorization */
+   hypre_ILUSetupMILU0(A, perm, perm, n, n, mLptr, mDptr, mUptr, &S_temp, &u_temp, 1);
 
-   // first sort the Upper part U
+   /* Free memory */
+   hypre_ParCSRMatrixDestroy(S_temp);
+   hypre_TFree(u_temp, HYPRE_MEMORY_HOST);
+
+   /* Pointer to the start location */
+   u_end_array  = hypre_TAlloc(HYPRE_Int, n, HYPRE_MEMORY_HOST);
+   U_diag       = hypre_ParCSRMatrixDiag(*Uptr);
+   U_diag_i     = hypre_CSRMatrixI(U_diag);
+   U_diag_j     = hypre_CSRMatrixJ(U_diag);
+   U_diag_data  = hypre_CSRMatrixData(U_diag);
+   mU_diag      = hypre_ParCSRMatrixDiag(*mUptr);
+   mU_diag_i    = hypre_CSRMatrixI(mU_diag);
+   mU_diag_j    = hypre_CSRMatrixJ(mU_diag);
+   mU_diag_data = hypre_CSRMatrixData(mU_diag);
+
+   /* first sort the Upper part U */
    for (i = 0; i < nLU; i++)
    {
-      hypre_qsort1(U_diag_j,U_diag_data,U_diag_i[i],U_diag_i[i+1]-1);
-      hypre_qsort1(mU_diag_j,mU_diag_data,mU_diag_i[i],mU_diag_i[i+1]-1);
-      hypre_BinarySearch2(U_diag_j,nLU,U_diag_i[i],U_diag_i[i+1]-1,u_end_array + i);
+      hypre_qsort1(U_diag_j, U_diag_data, U_diag_i[i], U_diag_i[i + 1] - 1);
+      hypre_qsort1(mU_diag_j, mU_diag_data, mU_diag_i[i], mU_diag_i[i + 1] - 1);
+      hypre_BinarySearch2(U_diag_j, nLU, U_diag_i[i], U_diag_i[i + 1] - 1, u_end_array + i);
    }
 
-   hypre_CSRMatrix   *L_diag = hypre_ParCSRMatrixDiag(*Lptr);
-   HYPRE_Int         *L_diag_i = hypre_CSRMatrixI(L_diag);
-   HYPRE_Int         *L_diag_j = hypre_CSRMatrixJ(L_diag);
-   HYPRE_Real        *L_diag_data = hypre_CSRMatrixData(L_diag);
-   hypre_CSRMatrix   *mL_diag = hypre_ParCSRMatrixDiag(*mLptr);
-   HYPRE_Int         *mL_diag_i = hypre_CSRMatrixI(mL_diag);
-   HYPRE_Int         *mL_diag_j = hypre_CSRMatrixJ(mL_diag);
-   HYPRE_Real        *mL_diag_data = hypre_CSRMatrixData(mL_diag);
+   L_diag       = hypre_ParCSRMatrixDiag(*Lptr);
+   L_diag_i     = hypre_CSRMatrixI(L_diag);
+   L_diag_j     = hypre_CSRMatrixJ(L_diag);
+   L_diag_data  = hypre_CSRMatrixData(L_diag);
+   mL_diag      = hypre_ParCSRMatrixDiag(*mLptr);
+   mL_diag_i    = hypre_CSRMatrixI(mL_diag);
+   mL_diag_j    = hypre_CSRMatrixJ(mL_diag);
+   mL_diag_data = hypre_CSRMatrixData(mL_diag);
 
-   // now sort the Lower part L
+   /* now sort the Lower part L */
    for (i = nLU; i < n; i++)
    {
-      hypre_qsort1(L_diag_j,L_diag_data,L_diag_i[i],L_diag_i[i+1]-1);
-      hypre_qsort1(mL_diag_j,mL_diag_data,mL_diag_i[i],mL_diag_i[i+1]-1);
-      hypre_BinarySearch2(L_diag_j, nLU, L_diag_i[i], L_diag_i[i+1]-1, u_end_array + i);
+      hypre_qsort1(L_diag_j, L_diag_data, L_diag_i[i], L_diag_i[i + 1] - 1);
+      hypre_qsort1(mL_diag_j, mL_diag_data, mL_diag_i[i], mL_diag_i[i + 1] - 1);
+      hypre_BinarySearch2(L_diag_j, nLU, L_diag_i[i], L_diag_i[i + 1] - 1, u_end_array + i);
    }
 
    *u_end = u_end_array;
@@ -3501,54 +2117,85 @@ hypre_ILUSetupRAPILU0(hypre_ParCSRMatrix *A, HYPRE_Int *perm, HYPRE_Int n, HYPRE
    return hypre_error_flag;
 }
 
-/* ILU(0)
+/*--------------------------------------------------------------------------
+ * hypre_ILUSetupILU0
+ *
+ * Setup ILU(0)
+ *
  * A = input matrix
- * perm = permutation array indicating ordering of rows. Perm could come from a
- *    CF_marker array or a reordering routine. When set to NULL, indentity permutation is used.
- * qperm = permutation array indicating ordering of columns. When set to NULL, indentity permutation is used.
+ * perm = permutation array indicating ordering of rows.
+ *        Perm could come from a CF_marker array or a reordering routine.
+ *         When set to NULL, identity permutation is used.
+ * qperm = permutation array indicating ordering of columns.
+ *         When set to NULL, identity permutation is used.
  * nI = number of interial unknowns
  * nLU = size of incomplete factorization, nLU should obey nLU <= nI.
- *    Schur complement is formed if nLU < n
+ *       Schur complement is formed if nLU < n
  * Lptr, Dptr, Uptr, Sptr = L, D, U, S factors.
  * will form global Schur Matrix if nLU < n
- */
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_ILUSetupILU0(hypre_ParCSRMatrix *A, HYPRE_Int *perm, HYPRE_Int *qperm, HYPRE_Int nLU, HYPRE_Int nI,
-      hypre_ParCSRMatrix **Lptr, HYPRE_Real** Dptr, hypre_ParCSRMatrix **Uptr, hypre_ParCSRMatrix **Sptr, HYPRE_Int **u_end)
+hypre_ILUSetupILU0(hypre_ParCSRMatrix  *A,
+                   HYPRE_Int           *perm,
+                   HYPRE_Int           *qperm,
+                   HYPRE_Int            nLU,
+                   HYPRE_Int            nI,
+                   hypre_ParCSRMatrix **Lptr,
+                   HYPRE_Real         **Dptr,
+                   hypre_ParCSRMatrix **Uptr,
+                   hypre_ParCSRMatrix **Sptr,
+                   HYPRE_Int          **u_end)
 {
-   return hypre_ILUSetupMILU0( A, perm, qperm, nLU, nI, Lptr, Dptr, Uptr, Sptr, u_end, 0);
+   return hypre_ILUSetupMILU0(A, perm, qperm, nLU, nI, Lptr, Dptr, Uptr, Sptr, u_end, 0);
 }
 
-/* (modified) ILU(0)
+/*--------------------------------------------------------------------------
+ * hypre_ILUSetupILU0
+ *
+ * Setup modified ILU(0)
+ *
  * A = input matrix
- * perm = permutation array indicating ordering of rows. Perm could come from a
- *    CF_marker array or a reordering routine. When set to NULL, indentity permutation is used.
- * qperm = permutation array indicating ordering of columns When set to NULL, identity permutation is used.
+ * perm = permutation array indicating ordering of rows.
+ *        Perm could come from a CF_marker array or a reordering routine.
+ *        When set to NULL, indentity permutation is used.
+ * qperm = permutation array indicating ordering of columns.
+ *         When set to NULL, identity permutation is used.
  * nI = number of interior unknowns
  * nLU = size of incomplete factorization, nLU should obey nLU <= nI.
- *    Schur complement is formed if nLU < n
+ *       Schur complement is formed if nLU < n
  * Lptr, Dptr, Uptr, Sptr = L, D, U, S factors.
  * modified set to 0 to use classical ILU
  * will form global Schur Matrix if nLU < n
- */
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_ILUSetupMILU0(hypre_ParCSRMatrix *A, HYPRE_Int *permp, HYPRE_Int *qpermp, HYPRE_Int nLU, HYPRE_Int nI,
-      hypre_ParCSRMatrix **Lptr, HYPRE_Real** Dptr, hypre_ParCSRMatrix **Uptr, hypre_ParCSRMatrix **Sptr, HYPRE_Int **u_end,
-      HYPRE_Int modified)
+hypre_ILUSetupMILU0(hypre_ParCSRMatrix  *A,
+                    HYPRE_Int           *permp,
+                    HYPRE_Int           *qpermp,
+                    HYPRE_Int            nLU,
+                    HYPRE_Int            nI,
+                    hypre_ParCSRMatrix **Lptr,
+                    HYPRE_Real         **Dptr,
+                    hypre_ParCSRMatrix **Uptr,
+                    hypre_ParCSRMatrix **Sptr,
+                    HYPRE_Int          **u_end,
+                    HYPRE_Int            modified)
 {
-   HYPRE_Int                i, ii, j, k, k1, k2, k3, ctrU, ctrL, ctrS, lenl, lenu, jpiv, col, jpos;
+   HYPRE_Int                i, ii, j, k, k1, k2, k3, ctrU, ctrL, ctrS;
+   HYPRE_Int                lenl, lenu, jpiv, col, jpos;
    HYPRE_Int                *iw, *iL, *iU;
    HYPRE_Real               dd, t, dpiv, lxu, *wU, *wL;
    HYPRE_Real               drop;
 
    /* communication stuffs for S */
-   MPI_Comm                 comm             = hypre_ParCSRMatrixComm(A);
-   HYPRE_Int                S_offd_nnz, S_offd_ncols;
+   MPI_Comm                  comm = hypre_ParCSRMatrixComm(A);
+   HYPRE_Int                 S_offd_nnz, S_offd_ncols;
    hypre_ParCSRCommPkg      *comm_pkg;
    hypre_ParCSRCommHandle   *comm_handle;
-   HYPRE_Int                num_sends, begin, end;
-   HYPRE_BigInt                *send_buf        = NULL;
-   HYPRE_Int                num_procs, my_id;
+   HYPRE_Int                 num_sends, begin, end;
+   HYPRE_BigInt             *send_buf        = NULL;
+   HYPRE_Int                 num_procs, my_id;
 
    /* data objects for A */
    hypre_CSRMatrix          *A_diag          = hypre_ParCSRMatrixDiag(A);
@@ -3559,6 +2206,7 @@ hypre_ILUSetupMILU0(hypre_ParCSRMatrix *A, HYPRE_Int *permp, HYPRE_Int *qpermp,
    HYPRE_Real               *A_offd_data     = hypre_CSRMatrixData(A_offd);
    HYPRE_Int                *A_offd_i        = hypre_CSRMatrixI(A_offd);
    HYPRE_Int                *A_offd_j        = hypre_CSRMatrixJ(A_offd);
+   HYPRE_MemoryLocation      memory_location = hypre_ParCSRMatrixMemoryLocation(A);
 
    /* size of problem and schur system */
    HYPRE_Int                n                = hypre_CSRMatrixNumRows(A_diag);
@@ -3609,9 +2257,10 @@ hypre_ILUSetupMILU0(hypre_ParCSRMatrix *A, HYPRE_Int *permp, HYPRE_Int *qpermp,
    /* start setup
     * get communication stuffs first
     */
-   hypre_MPI_Comm_size(comm,&num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_size(comm, &num_procs);
+   hypre_MPI_Comm_rank(comm, &my_id);
    comm_pkg = hypre_ParCSRMatrixCommPkg(A);
+
    /* setup if not yet built */
    if (!comm_pkg)
    {
@@ -3622,11 +2271,11 @@ hypre_ILUSetupMILU0(hypre_ParCSRMatrix *A, HYPRE_Int *permp, HYPRE_Int *qpermp,
    /* check for correctness */
    if (nLU < 0 || nLU > n)
    {
-      hypre_error_w_msg(HYPRE_ERROR_ARG,"WARNING: nLU out of range.\n");
+      hypre_error_w_msg(HYPRE_ERROR_ARG, "WARNING: nLU out of range.\n");
    }
    if (e < 0)
    {
-      hypre_error_w_msg(HYPRE_ERROR_ARG,"WARNING: nLU should not exceed nI.\n");
+      hypre_error_w_msg(HYPRE_ERROR_ARG, "WARNING: nLU should not exceed nI.\n");
    }
 
    /* Allocate memory for u_end array */
@@ -3635,27 +2284,27 @@ hypre_ILUSetupMILU0(hypre_ParCSRMatrix *A, HYPRE_Int *permp, HYPRE_Int *qpermp,
    /* Allocate memory for L,D,U,S factors */
    if (n > 0)
    {
-      initial_alloc  = nLU + ceil((nnz_A / 2.0)*nLU/n);
-      capacity_S     = m + ceil((nnz_A / 2.0)*m/n);
+      initial_alloc  = (HYPRE_Int)(nLU + hypre_ceil((nnz_A / 2.0) * nLU / n));
+      capacity_S     = (HYPRE_Int)(m + hypre_ceil((nnz_A / 2.0) * m / n));
    }
    capacity_L     = initial_alloc;
    capacity_U     = initial_alloc;
 
-   D_data         = hypre_TAlloc(HYPRE_Real, n, HYPRE_MEMORY_DEVICE);
-   L_diag_i       = hypre_TAlloc(HYPRE_Int, n+1, HYPRE_MEMORY_DEVICE);
-   L_diag_j       = hypre_TAlloc(HYPRE_Int, capacity_L, HYPRE_MEMORY_DEVICE);
-   L_diag_data    = hypre_TAlloc(HYPRE_Real, capacity_L, HYPRE_MEMORY_DEVICE);
-   U_diag_i       = hypre_TAlloc(HYPRE_Int, n+1, HYPRE_MEMORY_DEVICE);
-   U_diag_j       = hypre_TAlloc(HYPRE_Int, capacity_U, HYPRE_MEMORY_DEVICE);
-   U_diag_data    = hypre_TAlloc(HYPRE_Real, capacity_U, HYPRE_MEMORY_DEVICE);
-   S_diag_i       = hypre_TAlloc(HYPRE_Int, m+1, HYPRE_MEMORY_DEVICE);
-   S_diag_j       = hypre_TAlloc(HYPRE_Int, capacity_S, HYPRE_MEMORY_DEVICE);
-   S_diag_data    = hypre_TAlloc(HYPRE_Real, capacity_S, HYPRE_MEMORY_DEVICE);
+   D_data         = hypre_TAlloc(HYPRE_Real, n, memory_location);
+   L_diag_i       = hypre_TAlloc(HYPRE_Int, n + 1, memory_location);
+   L_diag_j       = hypre_TAlloc(HYPRE_Int, capacity_L, memory_location);
+   L_diag_data    = hypre_TAlloc(HYPRE_Real, capacity_L, memory_location);
+   U_diag_i       = hypre_TAlloc(HYPRE_Int, n + 1, memory_location);
+   U_diag_j       = hypre_TAlloc(HYPRE_Int, capacity_U, memory_location);
+   U_diag_data    = hypre_TAlloc(HYPRE_Real, capacity_U, memory_location);
+   S_diag_i       = hypre_TAlloc(HYPRE_Int, m + 1, memory_location);
+   S_diag_j       = hypre_TAlloc(HYPRE_Int, capacity_S, memory_location);
+   S_diag_data    = hypre_TAlloc(HYPRE_Real, capacity_S, memory_location);
 
    /* allocate working arrays */
-   iw             = hypre_TAlloc(HYPRE_Int, 3*n, HYPRE_MEMORY_HOST);
-   iL             = iw+n;
-   rperm          = iw + 2*n;
+   iw             = hypre_TAlloc(HYPRE_Int, 3 * n, HYPRE_MEMORY_HOST);
+   iL             = iw + n;
+   rperm          = iw + 2 * n;
    wL             = hypre_TAlloc(HYPRE_Real, n, HYPRE_MEMORY_HOST);
 
    ctrU        = ctrL        = ctrS        = 0;
@@ -3674,7 +2323,7 @@ hypre_ILUSetupMILU0(hypre_ParCSRMatrix *A, HYPRE_Int *permp, HYPRE_Int *qpermp,
 
    if (!permp)
    {
-      perm = hypre_TAlloc(HYPRE_Int, n, HYPRE_MEMORY_DEVICE);
+      perm = hypre_TAlloc(HYPRE_Int, n, memory_location);
       for (i = 0; i < n; i++)
       {
          perm[i] = i;
@@ -3687,7 +2336,7 @@ hypre_ILUSetupMILU0(hypre_ParCSRMatrix *A, HYPRE_Int *permp, HYPRE_Int *qpermp,
 
    if (!qpermp)
    {
-      qperm = hypre_TAlloc(HYPRE_Int, n, HYPRE_MEMORY_DEVICE);
+      qperm = hypre_TAlloc(HYPRE_Int, n, memory_location);
       for (i = 0; i < n; i++)
       {
          qperm[i] = i;
@@ -3709,14 +2358,14 @@ hypre_ILUSetupMILU0(hypre_ParCSRMatrix *A, HYPRE_Int *permp, HYPRE_Int *qpermp,
       // get row i
       i = perm[ii];
       // get extents of row i
-      k1=A_diag_i[i];
-      k2=A_diag_i[i+1];
+      k1 = A_diag_i[i];
+      k2 = A_diag_i[i + 1];
       // track the drop
       drop = 0.0;
 
       /*-------------------- unpack L & U-parts of row of A in arrays w */
-      iU = iL+ii;
-      wU = wL+ii;
+      iU = iL + ii;
+      wU = wL + ii;
       /*--------------------  diagonal entry */
       dd = 0.0;
       lenl  = lenu = 0;
@@ -3740,7 +2389,7 @@ hypre_ILUSetupMILU0(hypre_ParCSRMatrix *A, HYPRE_Int *permp, HYPRE_Int *qpermp,
          }
          else
          {
-            dd=t;
+            dd = t;
          }
       }
 
@@ -3752,7 +2401,7 @@ hypre_ILUSetupMILU0(hypre_ParCSRMatrix *A, HYPRE_Int *permp, HYPRE_Int *qpermp,
        *  entering the elimination loop.
        *-----------------------------------------------------------------------*/
       //      hypre_quickSortIR(iL, wL, iw, 0, (lenl-1));
-      hypre_qsort3ir(iL, wL, iw, 0, (lenl-1));
+      hypre_qsort3ir(iL, wL, iw, 0, (lenl - 1));
       for (j = 0; j < lenl; j++)
       {
          jpiv = iL[j];
@@ -3764,7 +2413,7 @@ hypre_ILUSetupMILU0(hypre_ParCSRMatrix *A, HYPRE_Int *permp, HYPRE_Int *qpermp,
          /* zero out element - reset pivot */
          iw[jpiv] = -1;
          /* combine current row and pivot row */
-         for (k = U_diag_i[jpiv]; k < U_diag_i[jpiv+1]; k++)
+         for (k = U_diag_i[jpiv]; k < U_diag_i[jpiv + 1]; k++)
          {
             col = U_diag_j[k];
             jpos = iw[col];
@@ -3812,54 +2461,54 @@ hypre_ILUSetupMILU0(hypre_ParCSRMatrix *A, HYPRE_Int *permp, HYPRE_Int *qpermp,
       /* Check that memory is sufficient */
       if (lenl > 0)
       {
-         while ((ctrL+lenl) > capacity_L)
+         while ((ctrL + lenl) > capacity_L)
          {
             HYPRE_Int tmp = capacity_L;
-            capacity_L = capacity_L * EXPAND_FACT + 1;
-            L_diag_j = hypre_TReAlloc_v2(L_diag_j, HYPRE_Int, tmp, HYPRE_Int, capacity_L, HYPRE_MEMORY_DEVICE);
-            L_diag_data = hypre_TReAlloc_v2(L_diag_data, HYPRE_Real, tmp, HYPRE_Real, capacity_L, HYPRE_MEMORY_DEVICE);
+            capacity_L = (HYPRE_Int)(capacity_L * EXPAND_FACT + 1);
+            L_diag_j = hypre_TReAlloc_v2(L_diag_j, HYPRE_Int, tmp, HYPRE_Int,
+                                         capacity_L, memory_location);
+            L_diag_data = hypre_TReAlloc_v2(L_diag_data, HYPRE_Real, tmp, HYPRE_Real,
+                                            capacity_L, memory_location);
          }
-         //hypre_TMemcpy(&(L_diag_j)[ctrL], iL, HYPRE_Int, lenl, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
-         //hypre_TMemcpy(&(L_diag_data)[ctrL], wL, HYPRE_Real, lenl, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
          hypre_TMemcpy(&L_diag_j[ctrL], iL, HYPRE_Int, lenl,
-                       HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
+                       memory_location, HYPRE_MEMORY_HOST);
          hypre_TMemcpy(&L_diag_data[ctrL], wL, HYPRE_Real, lenl,
-                       HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
+                       memory_location, HYPRE_MEMORY_HOST);
       }
-      L_diag_i[ii+1] = (ctrL+=lenl);
+      L_diag_i[ii + 1] = (ctrL += lenl);
 
       /* diagonal part (we store the inverse) */
-      if (fabs(dd) < MAT_TOL)
+      if (hypre_abs(dd) < MAT_TOL)
       {
          dd = 1.0e-6;
       }
-      D_data[ii] = 1./dd;
+      D_data[ii] = 1. / dd;
 
       /* U part */
       /* Check that memory is sufficient */
       if (lenu > 0)
       {
-         while ((ctrU+lenu) > capacity_U)
+         while ((ctrU + lenu) > capacity_U)
          {
             HYPRE_Int tmp = capacity_U;
-            capacity_U = capacity_U * EXPAND_FACT + 1;
-            U_diag_j = hypre_TReAlloc_v2(U_diag_j, HYPRE_Int, tmp, HYPRE_Int, capacity_U, HYPRE_MEMORY_DEVICE);
-            U_diag_data = hypre_TReAlloc_v2(U_diag_data, HYPRE_Real, tmp, HYPRE_Real, capacity_U, HYPRE_MEMORY_DEVICE);
+            capacity_U = (HYPRE_Int)(capacity_U * EXPAND_FACT + 1);
+            U_diag_j = hypre_TReAlloc_v2(U_diag_j, HYPRE_Int, tmp, HYPRE_Int,
+                                         capacity_U, memory_location);
+            U_diag_data = hypre_TReAlloc_v2(U_diag_data, HYPRE_Real, tmp, HYPRE_Real,
+                                            capacity_U, memory_location);
          }
-         //hypre_TMemcpy(&(U_diag_j)[ctrU], iU, HYPRE_Int, lenu, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
-         //hypre_TMemcpy(&(U_diag_data)[ctrU], wU, HYPRE_Real, lenu, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
          hypre_TMemcpy(&U_diag_j[ctrU], iU, HYPRE_Int, lenu,
-                       HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
+                       memory_location, HYPRE_MEMORY_HOST);
          hypre_TMemcpy(&U_diag_data[ctrU], wU, HYPRE_Real, lenu,
-                       HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
+                       memory_location, HYPRE_MEMORY_HOST);
       }
-      U_diag_i[ii+1] = (ctrU+=lenu);
+      U_diag_i[ii + 1] = (ctrU += lenu);
 
       /* check and build u_end array */
       if (m > 0)
       {
-         hypre_qsort1(U_diag_j,U_diag_data,U_diag_i[ii],U_diag_i[ii+1]-1);
-         hypre_BinarySearch2(U_diag_j,nLU,U_diag_i[ii],U_diag_i[ii+1]-1,u_end_array + ii);
+         hypre_qsort1(U_diag_j, U_diag_data, U_diag_i[ii], U_diag_i[ii + 1] - 1);
+         hypre_BinarySearch2(U_diag_j, nLU, U_diag_i[ii], U_diag_i[ii + 1] - 1, u_end_array + ii);
       }
       else
       {
@@ -3875,13 +2524,13 @@ hypre_ILUSetupMILU0(hypre_ParCSRMatrix *A, HYPRE_Int *permp, HYPRE_Int *qpermp,
       // get row i
       i = perm[ii];
       // get extents of row i
-      k1=A_diag_i[i];
-      k2=A_diag_i[i+1];
+      k1 = A_diag_i[i];
+      k2 = A_diag_i[i + 1];
       drop = 0.0;
 
       /*-------------------- unpack L & U-parts of row of A in arrays w */
-      iU = iL+nLU + 1;
-      wU = wL+nLU + 1;
+      iU = iL + nLU + 1;
+      wU = wL + nLU + 1;
       /*--------------------  diagonal entry */
       dd = 0.0;
       lenl  = lenu = 0;
@@ -3905,7 +2554,7 @@ hypre_ILUSetupMILU0(hypre_ParCSRMatrix *A, HYPRE_Int *permp, HYPRE_Int *qpermp,
          }
          else
          {
-            dd=t;
+            dd = t;
          }
       }
 
@@ -3917,7 +2566,7 @@ hypre_ILUSetupMILU0(hypre_ParCSRMatrix *A, HYPRE_Int *permp, HYPRE_Int *qpermp,
        *  entering the elimination loop.
        *-----------------------------------------------------------------------*/
       //      hypre_quickSortIR(iL, wL, iw, 0, (lenl-1));
-      hypre_qsort3ir(iL, wL, iw, 0, (lenl-1));
+      hypre_qsort3ir(iL, wL, iw, 0, (lenl - 1));
       for (j = 0; j < lenl; j++)
       {
          jpiv = iL[j];
@@ -3929,7 +2578,7 @@ hypre_ILUSetupMILU0(hypre_ParCSRMatrix *A, HYPRE_Int *permp, HYPRE_Int *qpermp,
          /* zero out element - reset pivot */
          iw[jpiv] = -1;
          /* combine current row and pivot row */
-         for (k = U_diag_i[jpiv]; k < U_diag_i[jpiv+1]; k++)
+         for (k = U_diag_i[jpiv]; k < U_diag_i[jpiv + 1]; k++)
          {
             col = U_diag_j[k];
             jpos = iw[col];
@@ -3975,48 +2624,50 @@ hypre_ILUSetupMILU0(hypre_ParCSRMatrix *A, HYPRE_Int *permp, HYPRE_Int *qpermp,
       /* Check that memory is sufficient */
       if (lenl > 0)
       {
-         while ((ctrL+lenl) > capacity_L)
+         while ((ctrL + lenl) > capacity_L)
          {
             HYPRE_Int tmp = capacity_L;
-            capacity_L = capacity_L * EXPAND_FACT + 1;
-            L_diag_j = hypre_TReAlloc_v2(L_diag_j, HYPRE_Int, tmp, HYPRE_Int, capacity_L, HYPRE_MEMORY_DEVICE);
-            L_diag_data = hypre_TReAlloc_v2(L_diag_data, HYPRE_Real, tmp, HYPRE_Real, capacity_L, HYPRE_MEMORY_DEVICE);
+            capacity_L = (HYPRE_Int)(capacity_L * EXPAND_FACT + 1);
+            L_diag_j = hypre_TReAlloc_v2(L_diag_j, HYPRE_Int, tmp, HYPRE_Int,
+                                         capacity_L, memory_location);
+            L_diag_data = hypre_TReAlloc_v2(L_diag_data, HYPRE_Real, tmp, HYPRE_Real,
+                                            capacity_L, memory_location);
          }
-         //hypre_TMemcpy(&(L_diag_j)[ctrL], iL, HYPRE_Int, lenl, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
-         //hypre_TMemcpy(&(L_diag_data)[ctrL], wL, HYPRE_Real, lenl, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
          hypre_TMemcpy(&L_diag_j[ctrL], iL, HYPRE_Int, lenl,
-                       HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
+                       memory_location, HYPRE_MEMORY_HOST);
          hypre_TMemcpy(&L_diag_data[ctrL], wL, HYPRE_Real, lenl,
-                       HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
+                       memory_location, HYPRE_MEMORY_HOST);
       }
-      L_diag_i[ii+1] = (ctrL+=lenl);
+      L_diag_i[ii + 1] = (ctrL += lenl);
 
       /* S part */
       /* Check that memory is sufficient */
-      while ((ctrS+lenu+1) > capacity_S)
+      while ((ctrS + lenu + 1) > capacity_S)
       {
          HYPRE_Int tmp = capacity_S;
-         capacity_S = capacity_S * EXPAND_FACT + 1;
-         S_diag_j = hypre_TReAlloc_v2(S_diag_j, HYPRE_Int, tmp, HYPRE_Int, capacity_S, HYPRE_MEMORY_DEVICE);
-         S_diag_data = hypre_TReAlloc_v2(S_diag_data, HYPRE_Real, tmp, HYPRE_Real, capacity_S, HYPRE_MEMORY_DEVICE);
+         capacity_S = (HYPRE_Int)(capacity_S * EXPAND_FACT + 1);
+         S_diag_j = hypre_TReAlloc_v2(S_diag_j, HYPRE_Int, tmp, HYPRE_Int,
+                                      capacity_S, memory_location);
+         S_diag_data = hypre_TReAlloc_v2(S_diag_data, HYPRE_Real, tmp, HYPRE_Real,
+                                         capacity_S, memory_location);
       }
       /* remember S in under a new index system! */
       S_diag_j[ctrS] = ii - nLU;
       S_diag_data[ctrS] = dd;
       for (j = 0; j < lenu; j++)
       {
-         S_diag_j[ctrS+1+j] = iU[j] - nLU;
+         S_diag_j[ctrS + 1 + j] = iU[j] - nLU;
       }
-      //hypre_TMemcpy(S_diag_data+ctrS+1, wU, HYPRE_Real, lenu, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
-      hypre_TMemcpy(S_diag_data+ctrS+1, wU, HYPRE_Real, lenu,
-                    HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
-      S_diag_i[ii-nLU+1] = ctrS+=(lenu+1);
+      //hypre_TMemcpy(S_diag_data+ctrS+1, wU, HYPRE_Real, lenu, memory_location, HYPRE_MEMORY_HOST);
+      hypre_TMemcpy(S_diag_data + ctrS + 1, wU, HYPRE_Real, lenu,
+                    memory_location, HYPRE_MEMORY_HOST);
+      S_diag_i[ii - nLU + 1] = ctrS += (lenu + 1);
    }
    /* Assemble LDUS matrices */
    /* zero out unfactored rows for U and D */
    for (k = nLU; k < n; k++)
    {
-      U_diag_i[k+1] = ctrU;
+      U_diag_i[k + 1] = ctrU;
       D_data[k] = 1.;
    }
 
@@ -4025,14 +2676,15 @@ hypre_ILUSetupMILU0(hypre_ParCSRMatrix *A, HYPRE_Int *permp, HYPRE_Int *qpermp,
     */
    HYPRE_BigInt big_m = (HYPRE_BigInt)m;
    hypre_MPI_Allreduce(&big_m, &total_rows, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
+
    /* only form when total_rows > 0 */
-   if ( total_rows > 0 )
+   if (total_rows > 0)
    {
       /* now create S */
       /* need to get new column start */
       {
          HYPRE_BigInt global_start;
-         hypre_MPI_Scan( &big_m, &global_start, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
+         hypre_MPI_Scan(&big_m, &global_start, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
          col_starts[0] = global_start - m;
          col_starts[1] = global_start;
       }
@@ -4045,13 +2697,13 @@ hypre_ILUSetupMILU0(hypre_ParCSRMatrix *A, HYPRE_Int *permp, HYPRE_Int *qpermp,
       S_offd_ncols = hypre_CSRMatrixNumCols(A_offd);
 
       matS = hypre_ParCSRMatrixCreate( comm,
-            total_rows,
-            total_rows,
-            col_starts,
-            col_starts,
-            S_offd_ncols,
-            ctrS,
-            S_offd_nnz);
+                                       total_rows,
+                                       total_rows,
+                                       col_starts,
+                                       col_starts,
+                                       S_offd_ncols,
+                                       ctrS,
+                                       S_offd_nnz);
 
       /* first put diagonal data in */
       S_diag = hypre_ParCSRMatrixDiag(matS);
@@ -4062,9 +2714,9 @@ hypre_ILUSetupMILU0(hypre_ParCSRMatrix *A, HYPRE_Int *permp, HYPRE_Int *qpermp,
 
       /* now start to construct offdiag of S */
       S_offd = hypre_ParCSRMatrixOffd(matS);
-      S_offd_i = hypre_TAlloc(HYPRE_Int, m+1, HYPRE_MEMORY_DEVICE);
-      S_offd_j = hypre_TAlloc(HYPRE_Int, S_offd_nnz, HYPRE_MEMORY_DEVICE);
-      S_offd_data = hypre_TAlloc(HYPRE_Real, S_offd_nnz, HYPRE_MEMORY_DEVICE);
+      S_offd_i = hypre_TAlloc(HYPRE_Int, m + 1, memory_location);
+      S_offd_j = hypre_TAlloc(HYPRE_Int, S_offd_nnz, memory_location);
+      S_offd_data = hypre_TAlloc(HYPRE_Real, S_offd_nnz, memory_location);
       S_offd_colmap = hypre_CTAlloc(HYPRE_BigInt, S_offd_ncols, HYPRE_MEMORY_HOST);
 
       /* simply use a loop to copy data from A_offd */
@@ -4078,13 +2730,13 @@ hypre_ILUSetupMILU0(hypre_ParCSRMatrix *A, HYPRE_Int *permp, HYPRE_Int *qpermp,
       {
          col = perm[i + nI];
          k1 = A_offd_i[col];
-         k2 = A_offd_i[col+1];
+         k2 = A_offd_i[col + 1];
          for (j = k1; j < k2; j++)
          {
             S_offd_j[k3] = A_offd_j[j];
             S_offd_data[k3++] = A_offd_data[j];
          }
-         S_offd_i[i+1+e] = k3;
+         S_offd_i[i + 1 + e] = k3;
       }
 
       /* give I, J, DATA to S_offd */
@@ -4096,13 +2748,14 @@ hypre_ILUSetupMILU0(hypre_ParCSRMatrix *A, HYPRE_Int *permp, HYPRE_Int *qpermp,
 
       /* get total num of send */
       num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
-      begin = hypre_ParCSRCommPkgSendMapStart(comm_pkg,0);
-      end = hypre_ParCSRCommPkgSendMapStart(comm_pkg,num_sends);
+      begin = hypre_ParCSRCommPkgSendMapStart(comm_pkg, 0);
+      end = hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends);
       send_buf = hypre_TAlloc(HYPRE_BigInt, end - begin, HYPRE_MEMORY_HOST);
       /* copy new index into send_buf */
       for (i = begin; i < end; i++)
       {
-         send_buf[i-begin] = rperm[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,i)] - nLU + col_starts[0];
+         send_buf[i - begin] = rperm[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, i)] -
+                               nLU + col_starts[0];
       }
       /* main communication */
       comm_handle = hypre_ParCSRCommHandleCreate(21, comm_pkg, send_buf, S_offd_colmap);
@@ -4120,13 +2773,13 @@ hypre_ILUSetupMILU0(hypre_ParCSRMatrix *A, HYPRE_Int *permp, HYPRE_Int *qpermp,
    /* create S finished */
 
    matL = hypre_ParCSRMatrixCreate( comm,
-         hypre_ParCSRMatrixGlobalNumRows(A),
-         hypre_ParCSRMatrixGlobalNumRows(A),
-         hypre_ParCSRMatrixRowStarts(A),
-         hypre_ParCSRMatrixColStarts(A),
-         0,
-         ctrL,
-         0 );
+                                    hypre_ParCSRMatrixGlobalNumRows(A),
+                                    hypre_ParCSRMatrixGlobalNumRows(A),
+                                    hypre_ParCSRMatrixRowStarts(A),
+                                    hypre_ParCSRMatrixColStarts(A),
+                                    0,
+                                    ctrL,
+                                    0 );
 
    L_diag = hypre_ParCSRMatrixDiag(matL);
    hypre_CSRMatrixI(L_diag) = L_diag_i;
@@ -4138,8 +2791,8 @@ hypre_ILUSetupMILU0(hypre_ParCSRMatrix *A, HYPRE_Int *permp, HYPRE_Int *qpermp,
    else
    {
       /* we've allocated some memory, so free if not used */
-      hypre_TFree(L_diag_j,HYPRE_MEMORY_DEVICE);
-      hypre_TFree(L_diag_data,HYPRE_MEMORY_DEVICE);
+      hypre_TFree(L_diag_j, memory_location);
+      hypre_TFree(L_diag_data, memory_location);
    }
    /* store (global) total number of nonzeros */
    local_nnz = (HYPRE_Real) ctrL;
@@ -4147,13 +2800,13 @@ hypre_ILUSetupMILU0(hypre_ParCSRMatrix *A, HYPRE_Int *permp, HYPRE_Int *qpermp,
    hypre_ParCSRMatrixDNumNonzeros(matL) = total_nnz;
 
    matU = hypre_ParCSRMatrixCreate( comm,
-         hypre_ParCSRMatrixGlobalNumRows(A),
-         hypre_ParCSRMatrixGlobalNumRows(A),
-         hypre_ParCSRMatrixRowStarts(A),
-         hypre_ParCSRMatrixColStarts(A),
-         0,
-         ctrU,
-         0 );
+                                    hypre_ParCSRMatrixGlobalNumRows(A),
+                                    hypre_ParCSRMatrixGlobalNumRows(A),
+                                    hypre_ParCSRMatrixRowStarts(A),
+                                    hypre_ParCSRMatrixColStarts(A),
+                                    0,
+                                    ctrU,
+                                    0 );
 
    U_diag = hypre_ParCSRMatrixDiag(matU);
    hypre_CSRMatrixI(U_diag) = U_diag_i;
@@ -4165,29 +2818,29 @@ hypre_ILUSetupMILU0(hypre_ParCSRMatrix *A, HYPRE_Int *permp, HYPRE_Int *qpermp,
    else
    {
       /* we've allocated some memory, so free if not used */
-      hypre_TFree(U_diag_j,HYPRE_MEMORY_DEVICE);
-      hypre_TFree(U_diag_data,HYPRE_MEMORY_DEVICE);
+      hypre_TFree(U_diag_j, memory_location);
+      hypre_TFree(U_diag_data, memory_location);
    }
    /* store (global) total number of nonzeros */
    local_nnz = (HYPRE_Real) ctrU;
    hypre_MPI_Allreduce(&local_nnz, &total_nnz, 1, HYPRE_MPI_REAL, hypre_MPI_SUM, comm);
    hypre_ParCSRMatrixDNumNonzeros(matU) = total_nnz;
    /* free memory */
-   hypre_TFree(wL,HYPRE_MEMORY_HOST);
-   hypre_TFree(iw,HYPRE_MEMORY_HOST);
+   hypre_TFree(wL, HYPRE_MEMORY_HOST);
+   hypre_TFree(iw, HYPRE_MEMORY_HOST);
    if (!matS)
    {
       /* we allocate some memory for S, need to free if unused */
-      hypre_TFree(S_diag_i,HYPRE_MEMORY_DEVICE);
+      hypre_TFree(S_diag_i, memory_location);
    }
 
    if (!permp)
    {
-      hypre_TFree(perm, HYPRE_MEMORY_DEVICE);
+      hypre_TFree(perm, memory_location);
    }
    if (!qpermp)
    {
-      hypre_TFree(qperm, HYPRE_MEMORY_DEVICE);
+      hypre_TFree(qperm, memory_location);
    }
 
    /* set matrix pointers */
@@ -4200,21 +2853,39 @@ hypre_ILUSetupMILU0(hypre_ParCSRMatrix *A, HYPRE_Int *permp, HYPRE_Int *qpermp,
    return hypre_error_flag;
 }
 
-/* ILU(k) symbolic factorization
+/*--------------------------------------------------------------------------
+ * hypre_ILUSetupILUKSymbolic
+ *
+ * Setup ILU(k) symbolic factorization
+ *
  * n = total rows of input
  * lfil = level of fill-in, the k in ILU(k)
- * perm = permutation array indicating ordering of factorization. Perm could come from a
+ * perm = permutation array indicating ordering of factorization.
  * rperm = reverse permutation array, used here to avoid duplicate memory allocation
  * iw = working array, used here to avoid duplicate memory allocation
  * nLU = size of computed LDU factorization.
  * A/L/U/S_diag_i = the I slot of A, L, U and S
  * A/L/U/S_diag_j = the J slot of A, L, U and S
- * will form global Schur Matrix if nLU < n
- */
+ *
+ * Will form global Schur Matrix if nLU < n
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_ILUSetupILUKSymbolic(HYPRE_Int n, HYPRE_Int *A_diag_i, HYPRE_Int *A_diag_j, HYPRE_Int lfil, HYPRE_Int *perm,
-      HYPRE_Int *rperm,   HYPRE_Int *iw,   HYPRE_Int nLU, HYPRE_Int *L_diag_i, HYPRE_Int *U_diag_i,
-      HYPRE_Int *S_diag_i, HYPRE_Int **L_diag_j, HYPRE_Int **U_diag_j, HYPRE_Int **S_diag_j, HYPRE_Int **u_end)
+hypre_ILUSetupILUKSymbolic(HYPRE_Int   n,
+                           HYPRE_Int  *A_diag_i,
+                           HYPRE_Int  *A_diag_j,
+                           HYPRE_Int   lfil,
+                           HYPRE_Int  *perm,
+                           HYPRE_Int  *rperm,
+                           HYPRE_Int  *iw,
+                           HYPRE_Int   nLU,
+                           HYPRE_Int  *L_diag_i,
+                           HYPRE_Int  *U_diag_i,
+                           HYPRE_Int  *S_diag_i,
+                           HYPRE_Int **L_diag_j,
+                           HYPRE_Int **U_diag_j,
+                           HYPRE_Int **S_diag_j,
+                           HYPRE_Int **u_end)
 {
    /*
     * 1: Setup and create buffers
@@ -4240,31 +2911,35 @@ hypre_ILUSetupILUKSymbolic(HYPRE_Int n, HYPRE_Int *A_diag_i, HYPRE_Int *A_diag_j
    HYPRE_Int         ctrS;
    HYPRE_Int         capacity_L;
    HYPRE_Int         capacity_U;
-   HYPRE_Int         capacity_S;
+   HYPRE_Int         capacity_S = 0;
    HYPRE_Int         initial_alloc = 0;
    HYPRE_Int         nnz_A;
+   HYPRE_MemoryLocation memory_location;
+
+   /* Get default memory location */
+   HYPRE_GetMemoryLocation(&memory_location);
 
    /* set iL and iLev to right place in iw array */
    iL                = iw + n;
-   iLev              = iw + 2*n;
+   iLev              = iw + 2 * n;
 
    /* setup initial memory used */
    nnz_A             = A_diag_i[n];
    if (n > 0)
    {
-      initial_alloc     = nLU + ceil((nnz_A / 2.0) * nLU / n);
+      initial_alloc     = (HYPRE_Int)(nLU + hypre_ceil((nnz_A / 2.0) * nLU / n));
    }
    capacity_L        = initial_alloc;
    capacity_U        = initial_alloc;
 
    /* allocate other memory for L and U struct */
-   temp_L_diag_j     = hypre_CTAlloc(HYPRE_Int, capacity_L, HYPRE_MEMORY_DEVICE);
-   temp_U_diag_j     = hypre_CTAlloc(HYPRE_Int, capacity_U, HYPRE_MEMORY_DEVICE);
+   temp_L_diag_j     = hypre_CTAlloc(HYPRE_Int, capacity_L, memory_location);
+   temp_U_diag_j     = hypre_CTAlloc(HYPRE_Int, capacity_U, memory_location);
 
    if (m > 0)
    {
-      capacity_S     = m + ceil(nnz_A / 2.0 * m / n);
-      temp_S_diag_j  = hypre_CTAlloc(HYPRE_Int, capacity_S, HYPRE_MEMORY_DEVICE);
+      capacity_S     = (HYPRE_Int)(m + hypre_ceil(nnz_A / 2.0 * m / n));
+      temp_S_diag_j  = hypre_CTAlloc(HYPRE_Int, capacity_S, memory_location);
    }
 
    u_end_array       = hypre_TAlloc(HYPRE_Int, nLU, HYPRE_MEMORY_HOST);
@@ -4287,7 +2962,7 @@ hypre_ILUSetupILUKSymbolic(HYPRE_Int n, HYPRE_Int *A_diag_i, HYPRE_Int *A_diag_j
       lenl = 0;
       lenh = 0;/* this is the current length of heap */
       lenu = ii;
-      lena = A_diag_i[i+1];
+      lena = A_diag_i[i + 1];
       /* put those already inside original pattern, and set their level to 0 */
       for (j = A_diag_i[i]; j < lena; j++)
       {
@@ -4303,7 +2978,7 @@ hypre_ILUSetupILUKSymbolic(HYPRE_Int n, HYPRE_Int *A_diag_i, HYPRE_Int *A_diag_j
             iLev[lenh] = 0;
             iw[col] = lenh++;
             /*now miantian a heap structure*/
-            hypre_ILUMinHeapAddIIIi(iL,iLev,iw,lenh);
+            hypre_ILUMinHeapAddIIIi(iL, iLev, iw, lenh);
          }
          else if (col > ii)
          {
@@ -4328,18 +3003,18 @@ hypre_ILUSetupILUKSymbolic(HYPRE_Int n, HYPRE_Int *A_diag_i, HYPRE_Int *A_diag_j
          /*
           * we now need to maintain the heap structure
           */
-         hypre_ILUMinHeapRemoveIIIi(iL,iLev,iw,lenh);
+         hypre_ILUMinHeapRemoveIIIi(iL, iLev, iw, lenh);
          lenh--;
          /* copy to the end of array */
          lenl++;
          /* reset iw for that, not using anymore */
-         iw[k]=-1;
-         hypre_swap2i(iL,iLev,ii-lenl,lenh);
+         iw[k] = -1;
+         hypre_swap2i(iL, iLev, ii - lenl, lenh);
          /*
           * now the elimination on current row could start.
           * eliminate row k (new index) from current row
           */
-         ku = U_diag_i[k+1];
+         ku = U_diag_i[k + 1];
          for (j = U_diag_i[k]; j < ku; j++)
          {
             col = temp_U_diag_j[j];
@@ -4366,7 +3041,7 @@ hypre_ILUSetupILUKSymbolic(HYPRE_Int n, HYPRE_Int *A_diag_i, HYPRE_Int *A_diag_j
                   /*swap it with the element right after the heap*/
 
                   /* maintain the heap */
-                  hypre_ILUMinHeapAddIIIi(iL,iLev,iw,lenh);
+                  hypre_ILUMinHeapAddIIIi(iL, iLev, iw, lenh);
                }
                else if (col > ii)
                {
@@ -4383,46 +3058,48 @@ hypre_ILUSetupILUKSymbolic(HYPRE_Int n, HYPRE_Int *A_diag_i, HYPRE_Int *A_diag_j
       }/* end of while loop for iith row */
 
       /* now update everything, indices, levels and so */
-      L_diag_i[ii+1] = L_diag_i[ii] + lenl;
+      L_diag_i[ii + 1] = L_diag_i[ii] + lenl;
       if (lenl > 0)
       {
          /* check if memory is enough */
          while (ctrL + lenl > capacity_L)
          {
             HYPRE_Int tmp = capacity_L;
-            capacity_L = capacity_L * EXPAND_FACT + 1;
-            temp_L_diag_j = hypre_TReAlloc_v2(temp_L_diag_j, HYPRE_Int, tmp, HYPRE_Int, capacity_L, HYPRE_MEMORY_DEVICE);
+            capacity_L = (HYPRE_Int)(capacity_L * EXPAND_FACT + 1);
+            temp_L_diag_j = hypre_TReAlloc_v2(temp_L_diag_j, HYPRE_Int, tmp, HYPRE_Int, capacity_L,
+                                              memory_location);
          }
          /* now copy L data, reverse order */
          for (j = 0; j < lenl; j++)
          {
-            temp_L_diag_j[ctrL+j] = iL[ii-j-1];
+            temp_L_diag_j[ctrL + j] = iL[ii - j - 1];
          }
          ctrL += lenl;
       }
       k = lenu - ii;
-      U_diag_i[ii+1] = U_diag_i[ii] + k;
+      U_diag_i[ii + 1] = U_diag_i[ii] + k;
       if (k > 0)
       {
          /* check if memory is enough */
          while (ctrU + k > capacity_U)
          {
             HYPRE_Int tmp = capacity_U;
-            capacity_U = capacity_U * EXPAND_FACT + 1;
-            temp_U_diag_j = hypre_TReAlloc_v2(temp_U_diag_j, HYPRE_Int, tmp, HYPRE_Int, capacity_U, HYPRE_MEMORY_DEVICE);
+            capacity_U = (HYPRE_Int)(capacity_U * EXPAND_FACT + 1);
+            temp_U_diag_j = hypre_TReAlloc_v2(temp_U_diag_j, HYPRE_Int, tmp, HYPRE_Int, capacity_U,
+                                              memory_location);
             u_levels = hypre_TReAlloc_v2(u_levels, HYPRE_Int, tmp, HYPRE_Int, capacity_U, HYPRE_MEMORY_HOST);
          }
-         //hypre_TMemcpy(temp_U_diag_j+ctrU,iL+ii,HYPRE_Int,k,HYPRE_MEMORY_DEVICE,HYPRE_MEMORY_HOST);
-         hypre_TMemcpy(temp_U_diag_j+ctrU, iL+ii, HYPRE_Int, k,
-                       HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
-         hypre_TMemcpy(u_levels+ctrU, iLev+ii, HYPRE_Int, k,
+         //hypre_TMemcpy(temp_U_diag_j+ctrU,iL+ii,HYPRE_Int,k,memory_location,HYPRE_MEMORY_HOST);
+         hypre_TMemcpy(temp_U_diag_j + ctrU, iL + ii, HYPRE_Int, k,
+                       memory_location, HYPRE_MEMORY_HOST);
+         hypre_TMemcpy(u_levels + ctrU, iLev + ii, HYPRE_Int, k,
                        HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
          ctrU += k;
       }
       if (m > 0)
       {
-         hypre_qsort2i(temp_U_diag_j,u_levels,U_diag_i[ii],U_diag_i[ii+1]-1);
-         hypre_BinarySearch2(temp_U_diag_j,nLU,U_diag_i[ii],U_diag_i[ii+1]-1,u_end_array + ii);
+         hypre_qsort2i(temp_U_diag_j, u_levels, U_diag_i[ii], U_diag_i[ii + 1] - 1);
+         hypre_BinarySearch2(temp_U_diag_j, nLU, U_diag_i[ii], U_diag_i[ii + 1] - 1, u_end_array + ii);
       }
       else
       {
@@ -4431,7 +3108,7 @@ hypre_ILUSetupILUKSymbolic(HYPRE_Int n, HYPRE_Int *A_diag_i, HYPRE_Int *A_diag_j
       }
 
       /* reset iw */
-      for(j = ii; j < lenu; j++)
+      for (j = ii; j < lenu; j++)
       {
          iw[iL[j]] = -1;
       }
@@ -4445,7 +3122,7 @@ hypre_ILUSetupILUKSymbolic(HYPRE_Int n, HYPRE_Int *A_diag_i, HYPRE_Int *A_diag_j
       lenl = 0;
       lenh = 0;/* this is the current length of heap */
       lenu = nLU;/* now this stores S, start from nLU */
-      lena = A_diag_i[i+1];
+      lena = A_diag_i[i + 1];
       /* put those already inside original pattern, and set their level to 0 */
       for (j = A_diag_i[i]; j < lena; j++)
       {
@@ -4461,7 +3138,7 @@ hypre_ILUSetupILUKSymbolic(HYPRE_Int n, HYPRE_Int *A_diag_i, HYPRE_Int *A_diag_j
             iLev[lenh] = 0;
             iw[col] = lenh++;
             /*now miantian a heap structure*/
-            hypre_ILUMinHeapAddIIIi(iL,iLev,iw,lenh);
+            hypre_ILUMinHeapAddIIIi(iL, iLev, iw, lenh);
          }
          else if (col != ii) /* we for sure to add ii, avoid duplicate */
          {
@@ -4486,18 +3163,18 @@ hypre_ILUSetupILUKSymbolic(HYPRE_Int n, HYPRE_Int *A_diag_i, HYPRE_Int *A_diag_j
          /*
           * we now need to maintain the heap structure
           */
-         hypre_ILUMinHeapRemoveIIIi(iL,iLev,iw,lenh);
+         hypre_ILUMinHeapRemoveIIIi(iL, iLev, iw, lenh);
          lenh--;
          /* copy to the end of array */
          lenl++;
          /* reset iw for that, not using anymore */
-         iw[k]=-1;
-         hypre_swap2i(iL,iLev,nLU-lenl,lenh);
+         iw[k] = -1;
+         hypre_swap2i(iL, iLev, nLU - lenl, lenh);
          /*
           * now the elimination on current row could start.
           * eliminate row k (new index) from current row
           */
-         ku = U_diag_i[k+1];
+         ku = U_diag_i[k + 1];
          for (j = U_diag_i[k]; j < ku; j++)
          {
             col = temp_U_diag_j[j];
@@ -4524,7 +3201,7 @@ hypre_ILUSetupILUKSymbolic(HYPRE_Int n, HYPRE_Int *A_diag_i, HYPRE_Int *A_diag_j
                   /*swap it with the element right after the heap*/
 
                   /* maintain the heap */
-                  hypre_ILUMinHeapAddIIIi(iL,iLev,iw,lenh);
+                  hypre_ILUMinHeapAddIIIi(iL, iLev, iw, lenh);
                }
                else if (col != ii)
                {
@@ -4542,20 +3219,21 @@ hypre_ILUSetupILUKSymbolic(HYPRE_Int n, HYPRE_Int *A_diag_i, HYPRE_Int *A_diag_j
       }/* end of while loop for iith row */
 
       /* now update everything, indices, levels and so */
-      L_diag_i[ii+1] = L_diag_i[ii] + lenl;
+      L_diag_i[ii + 1] = L_diag_i[ii] + lenl;
       if (lenl > 0)
       {
          /* check if memory is enough */
          while (ctrL + lenl > capacity_L)
          {
             HYPRE_Int tmp = capacity_L;
-            capacity_L = capacity_L * EXPAND_FACT + 1;
-            temp_L_diag_j = hypre_TReAlloc_v2(temp_L_diag_j, HYPRE_Int, tmp, HYPRE_Int, capacity_L, HYPRE_MEMORY_DEVICE);
+            capacity_L = (HYPRE_Int)(capacity_L * EXPAND_FACT + 1);
+            temp_L_diag_j = hypre_TReAlloc_v2(temp_L_diag_j, HYPRE_Int, tmp, HYPRE_Int,
+                                              capacity_L, memory_location);
          }
          /* now copy L data, reverse order */
-         for (j = 0; j < lenl; j ++)
+         for (j = 0; j < lenl; j++)
          {
-            temp_L_diag_j[ctrL+j] = iL[nLU-j-1];
+            temp_L_diag_j[ctrL + j] = iL[nLU - j - 1];
          }
          ctrL += lenl;
       }
@@ -4564,15 +3242,16 @@ hypre_ILUSetupILUKSymbolic(HYPRE_Int n, HYPRE_Int *A_diag_i, HYPRE_Int *A_diag_j
       while (ctrS + k > capacity_S)
       {
          HYPRE_Int tmp = capacity_S;
-         capacity_S = capacity_S * EXPAND_FACT + 1;
-         temp_S_diag_j = hypre_TReAlloc_v2(temp_S_diag_j, HYPRE_Int, tmp, HYPRE_Int, capacity_S, HYPRE_MEMORY_DEVICE);
+         capacity_S = (HYPRE_Int)(capacity_S * EXPAND_FACT + 1);
+         temp_S_diag_j = hypre_TReAlloc_v2(temp_S_diag_j, HYPRE_Int, tmp, HYPRE_Int, capacity_S,
+                                           memory_location);
       }
       temp_S_diag_j[ctrS] = ii;/* must have diagonal */
-      //hypre_TMemcpy(temp_S_diag_j+ctrS+1,iL+nLU,HYPRE_Int,k-1,HYPRE_MEMORY_DEVICE,HYPRE_MEMORY_HOST);
-      hypre_TMemcpy(temp_S_diag_j+ctrS+1, iL+nLU, HYPRE_Int, k-1,
-                    HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
+      //hypre_TMemcpy(temp_S_diag_j+ctrS+1,iL+nLU,HYPRE_Int,k-1,memory_location,HYPRE_MEMORY_HOST);
+      hypre_TMemcpy(temp_S_diag_j + ctrS + 1, iL + nLU, HYPRE_Int, k - 1,
+                    memory_location, HYPRE_MEMORY_HOST);
       ctrS += k;
-      S_diag_i[ii-nLU+1] = ctrS;
+      S_diag_i[ii - nLU + 1] = ctrS;
 
       /* reset iw */
       for (j = nLU; j < lenu; j++)
@@ -4587,12 +3266,12 @@ hypre_ILUSetupILUKSymbolic(HYPRE_Int n, HYPRE_Int *A_diag_i, HYPRE_Int *A_diag_j
     */
    for (k = nLU; k < n; k++)
    {
-      U_diag_i[k+1] = U_diag_i[nLU];
+      U_diag_i[k + 1] = U_diag_i[nLU];
    }
    /*
     * 4: Finishing up and free memory
     */
-   hypre_TFree(u_levels,HYPRE_MEMORY_HOST);
+   hypre_TFree(u_levels, HYPRE_MEMORY_HOST);
 
    *L_diag_j = temp_L_diag_j;
    *U_diag_j = temp_U_diag_j;
@@ -4602,20 +3281,34 @@ hypre_ILUSetupILUKSymbolic(HYPRE_Int n, HYPRE_Int *A_diag_i, HYPRE_Int *A_diag_j
    return hypre_error_flag;
 }
 
-/* ILU(k)
+/*--------------------------------------------------------------------------
+ * hypre_ILUSetupILUK
+ *
+ * Setup ILU(k) numeric factorization
+ *
  * A: input matrix
  * lfil: level of fill-in, the k in ILU(k)
- * permp: permutation array indicating ordering of factorization. Perm could come from a
- *    CF_marker: array or a reordering routine.
+ * permp: permutation array indicating ordering of factorization.
+ *        Perm could come from a CF_marker array or a reordering routine.
  * qpermp: column permutation array.
  * nLU: size of computed LDU factorization.
  * nI: number of interial unknowns, nI should obey nI >= nLU
  * Lptr, Dptr, Uptr: L, D, U factors.
- * Sprt: Schur Complement, if no Schur Complement is needed it will be set to NULL
- */
+ * Sprt: Schur Complement, if no Schur Complement, it will be set to NULL
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_ILUSetupILUK(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *permp, HYPRE_Int *qpermp, HYPRE_Int nLU, HYPRE_Int nI,
-      hypre_ParCSRMatrix **Lptr, HYPRE_Real** Dptr, hypre_ParCSRMatrix **Uptr, hypre_ParCSRMatrix **Sptr, HYPRE_Int **u_end)
+hypre_ILUSetupILUK(hypre_ParCSRMatrix  *A,
+                   HYPRE_Int            lfil,
+                   HYPRE_Int           *permp,
+                   HYPRE_Int           *qpermp,
+                   HYPRE_Int            nLU,
+                   HYPRE_Int            nI,
+                   hypre_ParCSRMatrix **Lptr,
+                   HYPRE_Real         **Dptr,
+                   hypre_ParCSRMatrix **Uptr,
+                   hypre_ParCSRMatrix **Sptr,
+                   HYPRE_Int          **u_end)
 {
    /*
     * 1: Setup and create buffers
@@ -4633,11 +3326,12 @@ hypre_ILUSetupILUK(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *permp, HYPR
    {
       return hypre_ILUSetupILU0( A, permp, qpermp, nLU, nI, Lptr, Dptr, Uptr, Sptr, u_end);
    }
+
    HYPRE_Real              local_nnz, total_nnz;
    HYPRE_Int               i, ii, j, k, k1, k2, k3, kl, ku, jpiv, col, icol;
    HYPRE_Int               *iw;
    MPI_Comm                comm = hypre_ParCSRMatrixComm(A);
-   HYPRE_Int            num_procs,  my_id;
+   HYPRE_Int               num_procs,  my_id;
 
    /* data objects for A */
    hypre_CSRMatrix         *A_diag        = hypre_ParCSRMatrixDiag(A);
@@ -4648,6 +3342,7 @@ hypre_ILUSetupILUK(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *permp, HYPR
    HYPRE_Real              *A_offd_data   = hypre_CSRMatrixData(A_offd);
    HYPRE_Int               *A_offd_i      = hypre_CSRMatrixI(A_offd);
    HYPRE_Int               *A_offd_j      = hypre_CSRMatrixJ(A_offd);
+   HYPRE_MemoryLocation     memory_location = hypre_ParCSRMatrixMemoryLocation(A);
 
    /* data objects for L, D, U */
    hypre_ParCSRMatrix      *matL;
@@ -4697,25 +3392,25 @@ hypre_ILUSetupILUK(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *permp, HYPR
    n =  hypre_CSRMatrixNumRows(A_diag);
    if (nLU < 0 || nLU > n)
    {
-      hypre_error_w_msg(HYPRE_ERROR_ARG,"WARNING: nLU out of range.\n");
+      hypre_error_w_msg(HYPRE_ERROR_ARG, "WARNING: nLU out of range.\n");
    }
    m = n - nLU;
    e = nI - nLU;
    m_e = n - nI;
    if (e < 0)
    {
-      hypre_error_w_msg(HYPRE_ERROR_ARG,"WARNING: nLU should not exceed nI.\n");
+      hypre_error_w_msg(HYPRE_ERROR_ARG, "WARNING: nLU should not exceed nI.\n");
    }
 
    /* Init I array anyway. S's might be freed later */
-   D_data = hypre_CTAlloc(HYPRE_Real, n, HYPRE_MEMORY_DEVICE);
-   L_diag_i = hypre_CTAlloc(HYPRE_Int, (n+1), HYPRE_MEMORY_DEVICE);
-   U_diag_i = hypre_CTAlloc(HYPRE_Int, (n+1), HYPRE_MEMORY_DEVICE);
-   S_diag_i = hypre_CTAlloc(HYPRE_Int, (m+1), HYPRE_MEMORY_DEVICE);
+   D_data = hypre_CTAlloc(HYPRE_Real, n, memory_location);
+   L_diag_i = hypre_CTAlloc(HYPRE_Int, (n + 1), memory_location);
+   U_diag_i = hypre_CTAlloc(HYPRE_Int, (n + 1), memory_location);
+   S_diag_i = hypre_CTAlloc(HYPRE_Int, (m + 1), memory_location);
 
    /* set Comm_Pkg if not yet built */
-   hypre_MPI_Comm_size(comm,&num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_size(comm, &num_procs);
+   hypre_MPI_Comm_rank(comm, &my_id);
    comm_pkg = hypre_ParCSRMatrixCommPkg(A);
    if (!comm_pkg)
    {
@@ -4728,8 +3423,8 @@ hypre_ILUSetupILUK(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *permp, HYPR
     * setup iw and rperm first
     */
    /* allocate work arrays */
-   iw = hypre_CTAlloc(HYPRE_Int, 4*n, HYPRE_MEMORY_HOST);
-   rperm = iw + 3*n;
+   iw = hypre_CTAlloc(HYPRE_Int, 4 * n, HYPRE_MEMORY_HOST);
+   rperm = iw + 3 * n;
    L_diag_i[0] = U_diag_i[0] = S_diag_i[0] = 0;
    /* get reverse permutation (rperm).
     * rperm holds the reordered indexes.
@@ -4737,7 +3432,7 @@ hypre_ILUSetupILUK(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *permp, HYPR
 
    if (!permp)
    {
-      perm = hypre_TAlloc(HYPRE_Int, n, HYPRE_MEMORY_DEVICE);
+      perm = hypre_TAlloc(HYPRE_Int, n, memory_location);
       for (i = 0; i < n; i++)
       {
          perm[i] = i;
@@ -4750,7 +3445,7 @@ hypre_ILUSetupILUK(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *permp, HYPR
 
    if (!qpermp)
    {
-      qperm = hypre_TAlloc(HYPRE_Int, n, HYPRE_MEMORY_DEVICE);
+      qperm = hypre_TAlloc(HYPRE_Int, n, memory_location);
       for (i = 0; i < n; i++)
       {
          qperm[i] = i;
@@ -4768,7 +3463,7 @@ hypre_ILUSetupILUK(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *permp, HYPR
 
    /* do symbolic factorization */
    hypre_ILUSetupILUKSymbolic(n, A_diag_i, A_diag_j, lfil, perm, rperm, iw,
-         nLU, L_diag_i, U_diag_i, S_diag_i, &L_diag_j, &U_diag_j, &S_diag_j, u_end);
+                              nLU, L_diag_i, U_diag_i, S_diag_i, &L_diag_j, &U_diag_j, &S_diag_j, u_end);
 
    /*
     * after this, we have our I,J for L, U and S ready, and L sorted
@@ -4777,15 +3472,15 @@ hypre_ILUSetupILUK(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *permp, HYPR
     */
    if (L_diag_i[n])
    {
-      L_diag_data = hypre_CTAlloc(HYPRE_Real, L_diag_i[n], HYPRE_MEMORY_DEVICE);
+      L_diag_data = hypre_CTAlloc(HYPRE_Real, L_diag_i[n], memory_location);
    }
    if (U_diag_i[n])
    {
-      U_diag_data = hypre_CTAlloc(HYPRE_Real, U_diag_i[n], HYPRE_MEMORY_DEVICE);
+      U_diag_data = hypre_CTAlloc(HYPRE_Real, U_diag_i[n], memory_location);
    }
    if (S_diag_i[m])
    {
-      S_diag_data = hypre_CTAlloc(HYPRE_Real, S_diag_i[m], HYPRE_MEMORY_DEVICE);
+      S_diag_data = hypre_CTAlloc(HYPRE_Real, S_diag_i[m], memory_location);
    }
 
    /*
@@ -4797,10 +3492,10 @@ hypre_ILUSetupILUK(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *permp, HYPR
    {
       // get row i
       i = perm[ii];
-      kl = L_diag_i[ii+1];
-      ku = U_diag_i[ii+1];
+      kl = L_diag_i[ii + 1];
+      ku = U_diag_i[ii + 1];
       k1 = A_diag_i[i];
-      k2 = A_diag_i[i+1];
+      k2 = A_diag_i[i + 1];
       /* set up working arrays */
       for (j = L_diag_i[ii]; j < kl; j++)
       {
@@ -4839,7 +3534,7 @@ hypre_ILUSetupILUK(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *permp, HYPR
       {
          jpiv = L_diag_j[j];
          L_diag_data[j] *= D_data[jpiv];
-         ku = U_diag_i[jpiv+1];
+         ku = U_diag_i[jpiv + 1];
 
          for (k = U_diag_i[jpiv]; k < ku; k++)
          {
@@ -4853,22 +3548,22 @@ hypre_ILUSetupILUK(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *permp, HYPR
             if (col < ii)
             {
                /* L part */
-               L_diag_data[icol] -= L_diag_data[j]*U_diag_data[k];
+               L_diag_data[icol] -= L_diag_data[j] * U_diag_data[k];
             }
             else if (col == ii)
             {
                /* diag part */
-               D_data[icol] -= L_diag_data[j]*U_diag_data[k];
+               D_data[icol] -= L_diag_data[j] * U_diag_data[k];
             }
             else
             {
                /* U part */
-               U_diag_data[icol] -= L_diag_data[j]*U_diag_data[k];
+               U_diag_data[icol] -= L_diag_data[j] * U_diag_data[k];
             }
          }
       }
       /* reset working array */
-      ku = U_diag_i[ii+1];
+      ku = U_diag_i[ii + 1];
       for (j = L_diag_i[ii]; j < kl; j++)
       {
          col = L_diag_j[j];
@@ -4882,11 +3577,11 @@ hypre_ILUSetupILUK(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *permp, HYPR
       }
 
       /* diagonal part (we store the inverse) */
-      if (fabs(D_data[ii]) < MAT_TOL)
+      if (hypre_abs(D_data[ii]) < MAT_TOL)
       {
-         D_data[ii] = 1e-06;
+         D_data[ii] = 1.0e-06;
       }
-      D_data[ii] = 1./ D_data[ii];
+      D_data[ii] = 1. / D_data[ii];
    }
 
    /* Now lower part for Schur complement */
@@ -4894,10 +3589,10 @@ hypre_ILUSetupILUK(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *permp, HYPR
    {
       // get row i
       i = perm[ii];
-      kl = L_diag_i[ii+1];
-      ku = S_diag_i[ii - nLU +1];
+      kl = L_diag_i[ii + 1];
+      ku = S_diag_i[ii - nLU + 1];
       k1 = A_diag_i[i];
-      k2 = A_diag_i[i+1];
+      k2 = A_diag_i[i + 1];
       /* set up working arrays */
       for (j = L_diag_i[ii]; j < kl; j++)
       {
@@ -4930,7 +3625,7 @@ hypre_ILUSetupILUK(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *permp, HYPR
       {
          jpiv = L_diag_j[j];
          L_diag_data[j] *= D_data[jpiv];
-         ku = U_diag_i[jpiv+1];
+         ku = U_diag_i[jpiv + 1];
          for (k = U_diag_i[jpiv]; k < ku; k++)
          {
             col = U_diag_j[k];
@@ -4943,12 +3638,12 @@ hypre_ILUSetupILUK(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *permp, HYPR
             if (col < nLU)
             {
                /* L part */
-               L_diag_data[icol] -= L_diag_data[j]*U_diag_data[k];
+               L_diag_data[icol] -= L_diag_data[j] * U_diag_data[k];
             }
             else
             {
                /* S part */
-               S_diag_data[icol] -= L_diag_data[j]*U_diag_data[k];
+               S_diag_data[icol] -= L_diag_data[j] * U_diag_data[k];
             }
          }
       }
@@ -4958,13 +3653,13 @@ hypre_ILUSetupILUK(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *permp, HYPR
          col = L_diag_j[j];
          iw[col] = -1;
       }
-      ku = S_diag_i[ii-nLU+1];
-      for (j = S_diag_i[ii-nLU]; j < ku; j++)
+      ku = S_diag_i[ii - nLU + 1];
+      for (j = S_diag_i[ii - nLU]; j < ku; j++)
       {
          col = S_diag_j[j];
          iw[col] = -1;
          /* remember to update index, S is smaller! */
-         S_diag_j[j]-=nLU;
+         S_diag_j[j] -= nLU;
       }
    }
 
@@ -4984,7 +3679,7 @@ hypre_ILUSetupILUK(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *permp, HYPR
       /* need to get new column start */
       {
          HYPRE_BigInt global_start;
-         hypre_MPI_Scan( &big_m, &global_start, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
+         hypre_MPI_Scan(&big_m, &global_start, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
          col_starts[0] = global_start - m;
          col_starts[1] = global_start;
       }
@@ -4997,13 +3692,13 @@ hypre_ILUSetupILUK(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *permp, HYPR
       S_offd_ncols = hypre_CSRMatrixNumCols(A_offd);
 
       matS = hypre_ParCSRMatrixCreate( comm,
-            total_rows,
-            total_rows,
-            col_starts,
-            col_starts,
-            S_offd_ncols,
-            S_diag_i[m],
-            S_offd_nnz);
+                                       total_rows,
+                                       total_rows,
+                                       col_starts,
+                                       col_starts,
+                                       S_offd_ncols,
+                                       S_diag_i[m],
+                                       S_offd_nnz);
 
       /* first put diagonal data in */
       S_diag = hypre_ParCSRMatrixDiag(matS);
@@ -5014,9 +3709,9 @@ hypre_ILUSetupILUK(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *permp, HYPR
 
       /* now start to construct offdiag of S */
       S_offd = hypre_ParCSRMatrixOffd(matS);
-      S_offd_i = hypre_TAlloc(HYPRE_Int, m+1, HYPRE_MEMORY_DEVICE);
-      S_offd_j = hypre_TAlloc(HYPRE_Int, S_offd_nnz, HYPRE_MEMORY_DEVICE);
-      S_offd_data = hypre_TAlloc(HYPRE_Real, S_offd_nnz, HYPRE_MEMORY_DEVICE);
+      S_offd_i = hypre_TAlloc(HYPRE_Int, m + 1, memory_location);
+      S_offd_j = hypre_TAlloc(HYPRE_Int, S_offd_nnz, memory_location);
+      S_offd_data = hypre_TAlloc(HYPRE_Real, S_offd_nnz, memory_location);
       S_offd_colmap = hypre_CTAlloc(HYPRE_BigInt, S_offd_ncols, HYPRE_MEMORY_HOST);
 
       /* simply use a loop to copy data from A_offd */
@@ -5024,19 +3719,19 @@ hypre_ILUSetupILUK(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *permp, HYPR
       k3 = 0;
       for (i = 1; i <= e; i++)
       {
-         S_offd_i[i+1] = k3;
+         S_offd_i[i + 1] = k3;
       }
       for (i = 0; i < m_e; i++)
       {
          col = perm[i + nI];
          k1 = A_offd_i[col];
-         k2 = A_offd_i[col+1];
+         k2 = A_offd_i[col + 1];
          for (j = k1; j < k2; j++)
          {
             S_offd_j[k3] = A_offd_j[j];
             S_offd_data[k3++] = A_offd_data[j];
          }
-         S_offd_i[i+e+1] = k3;
+         S_offd_i[i + e + 1] = k3;
       }
 
       /* give I, J, DATA to S_offd */
@@ -5048,13 +3743,14 @@ hypre_ILUSetupILUK(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *permp, HYPR
 
       /* get total num of send */
       HYPRE_Int num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
-      HYPRE_Int begin = hypre_ParCSRCommPkgSendMapStart(comm_pkg,0);
-      HYPRE_Int end = hypre_ParCSRCommPkgSendMapStart(comm_pkg,num_sends);
+      HYPRE_Int begin = hypre_ParCSRCommPkgSendMapStart(comm_pkg, 0);
+      HYPRE_Int end = hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends);
       send_buf = hypre_TAlloc(HYPRE_BigInt, end - begin, HYPRE_MEMORY_HOST);
+
       /* copy new index into send_buf */
       for (i = begin; i < end; i++)
       {
-         send_buf[i-begin] = rperm[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,i)] - nLU + col_starts[0];
+         send_buf[i - begin] = rperm[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, i)] - nLU + col_starts[0];
       }
 
       /* main communication */
@@ -5078,17 +3774,17 @@ hypre_ILUSetupILUK(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *permp, HYPR
    }
 
    matL = hypre_ParCSRMatrixCreate( comm,
-         hypre_ParCSRMatrixGlobalNumRows(A),
-         hypre_ParCSRMatrixGlobalNumRows(A),
-         hypre_ParCSRMatrixRowStarts(A),
-         hypre_ParCSRMatrixColStarts(A),
-         0 /* num_cols_offd */,
-         L_diag_i[n],
-         0 /* num_nonzeros_offd */);
+                                    hypre_ParCSRMatrixGlobalNumRows(A),
+                                    hypre_ParCSRMatrixGlobalNumRows(A),
+                                    hypre_ParCSRMatrixRowStarts(A),
+                                    hypre_ParCSRMatrixColStarts(A),
+                                    0 /* num_cols_offd */,
+                                    L_diag_i[n],
+                                    0 /* num_nonzeros_offd */);
 
    L_diag = hypre_ParCSRMatrixDiag(matL);
    hypre_CSRMatrixI(L_diag) = L_diag_i;
-   if (L_diag_i[n]>0)
+   if (L_diag_i[n] > 0)
    {
       hypre_CSRMatrixData(L_diag) = L_diag_data;
       hypre_CSRMatrixJ(L_diag) = L_diag_j;
@@ -5096,7 +3792,7 @@ hypre_ILUSetupILUK(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *permp, HYPR
    else
    {
       /* we allocated some initial length, so free them */
-      hypre_TFree(L_diag_j, HYPRE_MEMORY_DEVICE);
+      hypre_TFree(L_diag_j, memory_location);
    }
    /* store (global) total number of nonzeros */
    local_nnz = (HYPRE_Real) (L_diag_i[n]);
@@ -5104,17 +3800,17 @@ hypre_ILUSetupILUK(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *permp, HYPR
    hypre_ParCSRMatrixDNumNonzeros(matL) = total_nnz;
 
    matU = hypre_ParCSRMatrixCreate( comm,
-         hypre_ParCSRMatrixGlobalNumRows(A),
-         hypre_ParCSRMatrixGlobalNumRows(A),
-         hypre_ParCSRMatrixRowStarts(A),
-         hypre_ParCSRMatrixColStarts(A),
-         0,
-         U_diag_i[n],
-         0 );
+                                    hypre_ParCSRMatrixGlobalNumRows(A),
+                                    hypre_ParCSRMatrixGlobalNumRows(A),
+                                    hypre_ParCSRMatrixRowStarts(A),
+                                    hypre_ParCSRMatrixColStarts(A),
+                                    0,
+                                    U_diag_i[n],
+                                    0 );
 
    U_diag = hypre_ParCSRMatrixDiag(matU);
    hypre_CSRMatrixI(U_diag) = U_diag_i;
-   if (U_diag_i[n]>0)
+   if (U_diag_i[n] > 0)
    {
       hypre_CSRMatrixData(U_diag) = U_diag_data;
       hypre_CSRMatrixJ(U_diag) = U_diag_j;
@@ -5122,7 +3818,7 @@ hypre_ILUSetupILUK(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *permp, HYPR
    else
    {
       /* we allocated some initial length, so free them */
-      hypre_TFree(U_diag_j, HYPRE_MEMORY_DEVICE);
+      hypre_TFree(U_diag_j, memory_location);
    }
    /* store (global) total number of nonzeros */
    local_nnz = (HYPRE_Real) (U_diag_i[n]);
@@ -5130,21 +3826,21 @@ hypre_ILUSetupILUK(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *permp, HYPR
    hypre_ParCSRMatrixDNumNonzeros(matU) = total_nnz;
 
    /* free */
-   hypre_TFree(iw,HYPRE_MEMORY_HOST);
+   hypre_TFree(iw, HYPRE_MEMORY_HOST);
    if (!matS)
    {
       /* we allocate some memory for S, need to free if unused */
-      hypre_TFree(S_diag_i,HYPRE_MEMORY_DEVICE);
+      hypre_TFree(S_diag_i, memory_location);
    }
 
    if (!permp)
    {
-      hypre_TFree(perm, HYPRE_MEMORY_DEVICE);
+      hypre_TFree(perm, memory_location);
    }
 
    if (!qpermp)
    {
-      hypre_TFree(qperm, HYPRE_MEMORY_DEVICE);
+      hypre_TFree(qperm, memory_location);
    }
 
    /* set matrix pointers */
@@ -5156,28 +3852,43 @@ hypre_ILUSetupILUK(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *permp, HYPR
    return hypre_error_flag;
 }
 
-/* ILUT
+/*--------------------------------------------------------------------------
+ * hypre_ILUSetupILUT
+ *
+ * Setup ILU(t) numeric factorization
+ *
  * A: input matrix
  * lfil: maximum nnz per row in L and U
  * tol: droptol array in ILUT
  *    tol[0]: matrix B
  *    tol[1]: matrix E and F
  *    tol[2]: matrix S
- * perm: permutation array indicating ordering of factorization. Perm could come from a
- *    CF_marker: array or a reordering routine.
+ * perm: permutation array indicating ordering of factorization.
+ *       Perm could come from a CF_marker array or a reordering routine.
  * qperm: permutation array for column
- * nLU: size of computed LDU factorization. If nLU < n, Schur compelemnt will be formed
+ * nLU: size of computed LDU factorization.
+ *      If nLU < n, Schur complement will be formed
  * nI: number of interial unknowns. nLU should obey nLU <= nI.
  * Lptr, Dptr, Uptr: L, D, U factors.
  * Sptr: Schur complement
  *
  * Keep the largest lfil entries that is greater than some tol relative
  *    to the input tol and the norm of that row in both L and U
- */
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_ILUSetupILUT(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
-      HYPRE_Int *permp, HYPRE_Int *qpermp, HYPRE_Int nLU, HYPRE_Int nI, hypre_ParCSRMatrix **Lptr,
-      HYPRE_Real** Dptr, hypre_ParCSRMatrix **Uptr, hypre_ParCSRMatrix **Sptr, HYPRE_Int **u_end)
+hypre_ILUSetupILUT(hypre_ParCSRMatrix  *A,
+                   HYPRE_Int            lfil,
+                   HYPRE_Real          *tol,
+                   HYPRE_Int           *permp,
+                   HYPRE_Int           *qpermp,
+                   HYPRE_Int            nLU,
+                   HYPRE_Int            nI,
+                   hypre_ParCSRMatrix **Lptr,
+                   HYPRE_Real         **Dptr,
+                   hypre_ParCSRMatrix **Uptr,
+                   hypre_ParCSRMatrix **Sptr,
+                   HYPRE_Int          **u_end)
 {
    /*
     * 1: Setup and create buffers
@@ -5190,9 +3901,10 @@ hypre_ILUSetupILUT(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
     * iL = working array store the active col number
     */
    HYPRE_Real               local_nnz, total_nnz;
-   HYPRE_Int                i, ii, j, k, k1, k2, k3, kl, ku, col, icol, lenl, lenu, lenhu, lenhlr, lenhll, jpos, jrow;
+   HYPRE_Int                i, ii, j, k, k1, k2, k3, kl, ku, col, icol, lenl, lenu, lenhu, lenhlr,
+                            lenhll, jpos, jrow;
    HYPRE_Real               inorm, itolb, itolef, itols, dpiv, lxu;
-   HYPRE_Int                *iw,*iL;
+   HYPRE_Int                *iw, *iL;
    HYPRE_Real               *w;
 
    /* memory management */
@@ -5202,7 +3914,7 @@ hypre_ILUSetupILUT(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
    HYPRE_Int                capacity_L;
    HYPRE_Int                capacity_U;
    HYPRE_Int                ctrS;
-   HYPRE_Int                capacity_S;
+   HYPRE_Int                capacity_S = 0;
    HYPRE_Int                nnz_A;
 
    /* communication stuffs for S */
@@ -5225,6 +3937,7 @@ hypre_ILUSetupILUT(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
    HYPRE_Int                *A_offd_i        = hypre_CSRMatrixI(A_offd);
    HYPRE_Int                *A_offd_j        = hypre_CSRMatrixJ(A_offd);
    HYPRE_Real               *A_offd_data     = hypre_CSRMatrixData(A_offd);
+   HYPRE_MemoryLocation      memory_location = hypre_ParCSRMatrixMemoryLocation(A);
 
    /* data objects for L, D, U */
    hypre_ParCSRMatrix       *matL;
@@ -5248,9 +3961,9 @@ hypre_ILUSetupILUT(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
    HYPRE_Int                *S_diag_j        = NULL;
    HYPRE_Int                *S_offd_i        = NULL;
    HYPRE_Int                *S_offd_j        = NULL;
-   HYPRE_BigInt                *S_offd_colmap   = NULL;
+   HYPRE_BigInt             *S_offd_colmap   = NULL;
    HYPRE_Real               *S_offd_data;
-   HYPRE_BigInt                *send_buf        = NULL;
+   HYPRE_BigInt             *send_buf        = NULL;
    HYPRE_Int                *u_end_array;
 
    /* reverse permutation */
@@ -5273,14 +3986,14 @@ hypre_ILUSetupILUT(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
    n = hypre_CSRMatrixNumRows(A_diag);
    if (nLU < 0 || nLU > n)
    {
-      hypre_error_w_msg(HYPRE_ERROR_ARG,"WARNING: nLU out of range.\n");
+      hypre_error_w_msg(HYPRE_ERROR_ARG, "WARNING: nLU out of range.\n");
    }
    m = n - nLU;
    e = nI - nLU;
    m_e = n - nI;
    if (e < 0)
    {
-      hypre_error_w_msg(HYPRE_ERROR_ARG,"WARNING: nLU should not exceed nI.\n");
+      hypre_error_w_msg(HYPRE_ERROR_ARG, "WARNING: nLU should not exceed nI.\n");
    }
 
    u_end_array = hypre_TAlloc(HYPRE_Int, nLU, HYPRE_MEMORY_HOST);
@@ -5288,8 +4001,8 @@ hypre_ILUSetupILUT(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
    /* start set up
     * setup communication stuffs first
     */
-   hypre_MPI_Comm_size(comm,&num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_size(comm, &num_procs);
+   hypre_MPI_Comm_rank(comm, &my_id);
    comm_pkg = hypre_ParCSRMatrixCommPkg(A);
    /* create if not yet built */
    if (!comm_pkg)
@@ -5302,37 +4015,39 @@ hypre_ILUSetupILUT(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
    nnz_A = A_diag_i[nLU];
    if (n > 0)
    {
-      initial_alloc = hypre_min(nLU + ceil((nnz_A / 2.0) * nLU / n), nLU * lfil);
+      initial_alloc = (HYPRE_Int)(hypre_min(nLU + hypre_ceil((nnz_A / 2.0) * nLU / n),
+                                            nLU * lfil));
    }
    capacity_L = initial_alloc;
    capacity_U = initial_alloc;
 
-   D_data = hypre_CTAlloc(HYPRE_Real, n, HYPRE_MEMORY_DEVICE);
-   L_diag_i = hypre_CTAlloc(HYPRE_Int, (n+1), HYPRE_MEMORY_DEVICE);
-   U_diag_i = hypre_CTAlloc(HYPRE_Int, (n+1), HYPRE_MEMORY_DEVICE);
+   D_data = hypre_CTAlloc(HYPRE_Real, n, memory_location);
+   L_diag_i = hypre_CTAlloc(HYPRE_Int, (n + 1), memory_location);
+   U_diag_i = hypre_CTAlloc(HYPRE_Int, (n + 1), memory_location);
 
-   L_diag_j = hypre_CTAlloc(HYPRE_Int, capacity_L, HYPRE_MEMORY_DEVICE);
-   U_diag_j = hypre_CTAlloc(HYPRE_Int, capacity_U, HYPRE_MEMORY_DEVICE);
-   L_diag_data = hypre_CTAlloc(HYPRE_Real, capacity_L, HYPRE_MEMORY_DEVICE);
-   U_diag_data = hypre_CTAlloc(HYPRE_Real, capacity_U, HYPRE_MEMORY_DEVICE);
+   L_diag_j = hypre_CTAlloc(HYPRE_Int, capacity_L, memory_location);
+   U_diag_j = hypre_CTAlloc(HYPRE_Int, capacity_U, memory_location);
+   L_diag_data = hypre_CTAlloc(HYPRE_Real, capacity_L, memory_location);
+   U_diag_data = hypre_CTAlloc(HYPRE_Real, capacity_U, memory_location);
 
    ctrL = ctrU = 0;
 
    ctrS = 0;
-   S_diag_i = hypre_CTAlloc(HYPRE_Int, (m + 1), HYPRE_MEMORY_DEVICE);
+   S_diag_i = hypre_CTAlloc(HYPRE_Int, (m + 1), memory_location);
    S_diag_i[0] = 0;
+
    /* only setup S part when n > nLU */
    if (m > 0)
    {
-      capacity_S = hypre_min(m + ceil((nnz_A / 2.0) * m / n), m * lfil);
-      S_diag_j = hypre_CTAlloc(HYPRE_Int, capacity_S, HYPRE_MEMORY_DEVICE);
-      S_diag_data = hypre_CTAlloc(HYPRE_Real, capacity_S, HYPRE_MEMORY_DEVICE);
+      capacity_S = (HYPRE_Int)(hypre_min(m + hypre_ceil((nnz_A / 2.0) * m / n), m * lfil));
+      S_diag_j = hypre_CTAlloc(HYPRE_Int, capacity_S, memory_location);
+      S_diag_data = hypre_CTAlloc(HYPRE_Real, capacity_S, memory_location);
    }
 
    /* setting up working array */
-   iw = hypre_CTAlloc(HYPRE_Int,3*n,HYPRE_MEMORY_HOST);
+   iw = hypre_CTAlloc(HYPRE_Int, 3 * n, HYPRE_MEMORY_HOST);
    iL = iw + n;
-   w = hypre_CTAlloc(HYPRE_Real,n,HYPRE_MEMORY_HOST);
+   w = hypre_CTAlloc(HYPRE_Real, n, HYPRE_MEMORY_HOST);
    for (i = 0; i < n; i++)
    {
       iw[i] = -1;
@@ -5343,11 +4058,11 @@ hypre_ILUSetupILUT(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
     * rperm[old] -> new
     * perm[new]  -> old
     */
-   rperm = iw + 2*n;
+   rperm = iw + 2 * n;
 
    if (!permp)
    {
-      perm = hypre_TAlloc(HYPRE_Int, n, HYPRE_MEMORY_DEVICE);
+      perm = hypre_TAlloc(HYPRE_Int, n, memory_location);
       for (i = 0; i < n; i++)
       {
          perm[i] = i;
@@ -5360,7 +4075,7 @@ hypre_ILUSetupILUT(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
 
    if (!qpermp)
    {
-      qperm = hypre_TAlloc(HYPRE_Int, n, HYPRE_MEMORY_DEVICE);
+      qperm = hypre_TAlloc(HYPRE_Int, n, memory_location);
       for (i = 0; i < n; i++)
       {
          qperm[i] = i;
@@ -5388,19 +4103,19 @@ hypre_ILUSetupILUT(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
       /* get real row with perm */
       i = perm[ii];
       k1 = A_diag_i[i];
-      k2 = A_diag_i[i+1];
-      kl = ii-1;
+      k2 = A_diag_i[i + 1];
+      kl = ii - 1;
       /* reset row norm of ith row */
       inorm = .0;
       for (j = k1; j < k2; j++)
       {
-         inorm += fabs(A_diag_data[j]);
+         inorm += hypre_abs(A_diag_data[j]);
       }
       if (inorm == .0)
       {
-         hypre_error_w_msg(HYPRE_ERROR_ARG,"WARNING: ILUT with zero row.\n");
+         hypre_error_w_msg(HYPRE_ERROR_ARG, "WARNING: ILUT with zero row.\n");
       }
-      inorm /= (HYPRE_Real)(k2-k1);
+      inorm /= (HYPRE_Real)(k2 - k1);
       /* set the scaled tol for that row */
       itolb = tol[0] * inorm;
       itolef = tol[1] * inorm;
@@ -5421,7 +4136,7 @@ hypre_ILUSetupILUT(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
             w[lenhll] = A_diag_data[j];
             iw[col] = lenhll++;
             /* add to heap, by col number */
-            hypre_ILUMinHeapAddIRIi(iL,w,iw,lenhll);
+            hypre_ILUMinHeapAddIRIi(iL, w, iw, lenhll);
          }
          else if (col == ii)
          {
@@ -5451,7 +4166,7 @@ hypre_ILUSetupILUT(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
          dpiv = w[0] * D_data[jrow];
          w[0] = dpiv;
          /* now remove it from the top of the heap */
-         hypre_ILUMinHeapRemoveIRIi(iL,w,iw,lenhll);
+         hypre_ILUMinHeapRemoveIRIi(iL, w, iw, lenhll);
          lenhll--;
          /*
           * reset the drop part to -1
@@ -5460,19 +4175,19 @@ hypre_ILUSetupILUT(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
          iw[jrow] = -1;
          /* need to keep this one, move to the end of the heap */
          /* no longer need to maintain iw */
-         hypre_swap2(iL,w,lenhll,kl-lenhlr);
+         hypre_swap2(iL, w, lenhll, kl - lenhlr);
          lenhlr++;
-         hypre_ILUMaxrHeapAddRabsI(w+kl,iL+kl,lenhlr);
+         hypre_ILUMaxrHeapAddRabsI(w + kl, iL + kl, lenhlr);
          /* loop for elimination */
-         ku = U_diag_i[jrow+1];
+         ku = U_diag_i[jrow + 1];
          for (j = U_diag_i[jrow]; j < ku; j++)
          {
             col = U_diag_j[j];
             icol = iw[col];
-            lxu = - dpiv*U_diag_data[j];
+            lxu = - dpiv * U_diag_data[j];
             /* we don't want to fill small number to empty place */
             if ((icol == -1) &&
-                ((col < nLU && fabs(lxu) < itolb) || (col >= nLU && fabs(lxu) < itolef)))
+                ((col < nLU && hypre_abs(lxu) < itolb) || (col >= nLU && hypre_abs(lxu) < itolef)))
             {
                continue;
             }
@@ -5489,7 +4204,7 @@ hypre_ILUSetupILUT(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
                   w[lenhll] = lxu;
                   iw[col] = lenhll++;
                   /* add to heap, by col number */
-                  hypre_ILUMinHeapAddIRIi(iL,w,iw,lenhll);
+                  hypre_ILUMinHeapAddIRIi(iL, w, iw, lenhll);
                }
                else if (col == ii)
                {
@@ -5515,11 +4230,11 @@ hypre_ILUSetupILUT(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
          }
       }/* while loop for the elimination of current row */
 
-      if (fabs(w[ii]) < MAT_TOL)
+      if (hypre_abs(w[ii]) < MAT_TOL)
       {
-         w[ii]=1e-06;
+         w[ii] = 1.0e-06;
       }
-      D_data[ii] = 1./w[ii];
+      D_data[ii] = 1. / w[ii];
       iw[ii] = -1;
 
       /*
@@ -5528,24 +4243,27 @@ hypre_ILUSetupILUT(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
        */
 
       lenl = lenhlr < lfil ? lenhlr : lfil;
-      L_diag_i[ii+1] = L_diag_i[ii] + lenl;
+      L_diag_i[ii + 1] = L_diag_i[ii] + lenl;
       if (lenl > 0)
       {
          /* test if memory is enough */
          while (ctrL + lenl > capacity_L)
          {
             HYPRE_Int tmp = capacity_L;
-            capacity_L = capacity_L * EXPAND_FACT + 1;
-            L_diag_j = hypre_TReAlloc_v2(L_diag_j, HYPRE_Int, tmp, HYPRE_Int, capacity_L, HYPRE_MEMORY_DEVICE);
-            L_diag_data = hypre_TReAlloc_v2(L_diag_data, HYPRE_Real, tmp, HYPRE_Real, capacity_L, HYPRE_MEMORY_DEVICE);
+            capacity_L = (HYPRE_Int)(capacity_L * EXPAND_FACT + 1);
+            L_diag_j = hypre_TReAlloc_v2(L_diag_j, HYPRE_Int, tmp, HYPRE_Int,
+                                         capacity_L, memory_location);
+            L_diag_data = hypre_TReAlloc_v2(L_diag_data, HYPRE_Real, tmp, HYPRE_Real,
+                                            capacity_L, memory_location);
          }
          ctrL += lenl;
+
          /* copy large data in */
          for (j = L_diag_i[ii]; j < ctrL; j++)
          {
             L_diag_j[j] = iL[kl];
             L_diag_data[j] = w[kl];
-            hypre_ILUMaxrHeapRemoveRabsI(w+kl,iL+kl,lenhlr);
+            hypre_ILUMaxrHeapRemoveRabsI(w + kl, iL + kl, lenhlr);
             lenhlr--;
          }
       }
@@ -5553,7 +4271,7 @@ hypre_ILUSetupILUT(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
        * now reset working array
        * L part already reset when move out of heap, only U part
        */
-      ku = lenu+ii;
+      ku = lenu + ii;
       for (j = ii + 1; j <= ku; j++)
       {
          iw[iL[j]] = -1;
@@ -5569,25 +4287,27 @@ hypre_ILUSetupILUT(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
          /* need to sort the first small(hopefully) part of it */
          lenhu = lfil;
          /* quick split, only sort the first small part of the array */
-         hypre_ILUMaxQSplitRabsI(w,iL,ii+1,ii+lenhu,ii+lenu);
+         hypre_ILUMaxQSplitRabsI(w, iL, ii + 1, ii + lenhu, ii + lenu);
       }
 
-      U_diag_i[ii+1] = U_diag_i[ii] + lenhu;
+      U_diag_i[ii + 1] = U_diag_i[ii] + lenhu;
       if (lenhu > 0)
       {
          /* test if memory is enough */
          while (ctrU + lenhu > capacity_U)
          {
             HYPRE_Int tmp = capacity_U;
-            capacity_U = capacity_U * EXPAND_FACT + 1;
-            U_diag_j = hypre_TReAlloc_v2(U_diag_j, HYPRE_Int, tmp, HYPRE_Int, capacity_U, HYPRE_MEMORY_DEVICE);
-            U_diag_data = hypre_TReAlloc_v2(U_diag_data, HYPRE_Real, tmp, HYPRE_Real, capacity_U, HYPRE_MEMORY_DEVICE);
+            capacity_U = (HYPRE_Int)(capacity_U * EXPAND_FACT + 1);
+            U_diag_j = hypre_TReAlloc_v2(U_diag_j, HYPRE_Int, tmp, HYPRE_Int,
+                                         capacity_U, memory_location);
+            U_diag_data = hypre_TReAlloc_v2(U_diag_data, HYPRE_Real, tmp, HYPRE_Real,
+                                            capacity_U, memory_location);
          }
          ctrU += lenhu;
          /* copy large data in */
          for (j = U_diag_i[ii]; j < ctrU; j++)
          {
-            jpos = ii+1+j-U_diag_i[ii];
+            jpos = ii + 1 + j - U_diag_i[ii];
             U_diag_j[j] = iL[jpos];
             U_diag_data[j] = w[jpos];
          }
@@ -5595,8 +4315,8 @@ hypre_ILUSetupILUT(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
       /* check and build u_end array */
       if (m > 0)
       {
-         hypre_qsort1(U_diag_j,U_diag_data,U_diag_i[ii],U_diag_i[ii+1]-1);
-         hypre_BinarySearch2(U_diag_j,nLU,U_diag_i[ii],U_diag_i[ii+1]-1,u_end_array + ii);
+         hypre_qsort1(U_diag_j, U_diag_data, U_diag_i[ii], U_diag_i[ii + 1] - 1);
+         hypre_BinarySearch2(U_diag_j, nLU, U_diag_i[ii], U_diag_i[ii + 1] - 1, u_end_array + ii);
       }
       else
       {
@@ -5612,19 +4332,19 @@ hypre_ILUSetupILUT(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
       /* get real row with perm */
       i = perm[ii];
       k1 = A_diag_i[i];
-      k2 = A_diag_i[i+1];
-      kl = nLU-1;
+      k2 = A_diag_i[i + 1];
+      kl = nLU - 1;
       /* reset row norm of ith row */
       inorm = .0;
       for (j = k1; j < k2; j++)
       {
-         inorm += fabs(A_diag_data[j]);
+         inorm += hypre_abs(A_diag_data[j]);
       }
       if (inorm == .0)
       {
-         hypre_error_w_msg(HYPRE_ERROR_ARG,"WARNING: ILUT with zero row.\n");
+         hypre_error_w_msg(HYPRE_ERROR_ARG, "WARNING: ILUT with zero row.\n");
       }
-      inorm /= (HYPRE_Real)(k2-k1);
+      inorm /= (HYPRE_Real)(k2 - k1);
       /* set the scaled tol for that row */
       itols = tol[2] * inorm;
       itolef = tol[1] * inorm;
@@ -5643,7 +4363,7 @@ hypre_ILUSetupILUT(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
             w[lenhll] = A_diag_data[j];
             iw[col] = lenhll++;
             /* add to heap, by col number */
-            hypre_ILUMinHeapAddIRIi(iL,w,iw,lenhll);
+            hypre_ILUMinHeapAddIRIi(iL, w, iw, lenhll);
          }
          else if (col == ii)
          {
@@ -5676,7 +4396,7 @@ hypre_ILUSetupILUT(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
          dpiv = w[0] * D_data[jrow];
          w[0] = dpiv;
          /* now remove it from the top of the heap */
-         hypre_ILUMinHeapRemoveIRIi(iL,w,iw,lenhll);
+         hypre_ILUMinHeapRemoveIRIi(iL, w, iw, lenhll);
          lenhll--;
          /*
           * reset the drop part to -1
@@ -5685,19 +4405,20 @@ hypre_ILUSetupILUT(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
          iw[jrow] = -1;
          /* need to keep this one, move to the end of the heap */
          /* no longer need to maintain iw */
-         hypre_swap2(iL,w,lenhll,kl-lenhlr);
+         hypre_swap2(iL, w, lenhll, kl - lenhlr);
          lenhlr++;
-         hypre_ILUMaxrHeapAddRabsI(w+kl,iL+kl,lenhlr);
+         hypre_ILUMaxrHeapAddRabsI(w + kl, iL + kl, lenhlr);
          /* loop for elimination */
-         ku = U_diag_i[jrow+1];
+         ku = U_diag_i[jrow + 1];
          for (j = U_diag_i[jrow]; j < ku; j++)
          {
             col = U_diag_j[j];
             icol = iw[col];
-            lxu = - dpiv*U_diag_data[j];
+            lxu = - dpiv * U_diag_data[j];
             /* we don't want to fill small number to empty place */
             if ((icol == -1) &&
-                ((col < nLU && fabs(lxu) < itolef) || ( col >= nLU && fabs(lxu) < itols )))
+                ((col < nLU  && hypre_abs(lxu) < itolef) ||
+                 (col >= nLU && hypre_abs(lxu) < itols )))
             {
                continue;
             }
@@ -5714,7 +4435,7 @@ hypre_ILUSetupILUT(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
                   w[lenhll] = lxu;
                   iw[col] = lenhll++;
                   /* add to heap, by col number */
-                  hypre_ILUMinHeapAddIRIi(iL,w,iw,lenhll);
+                  hypre_ILUMinHeapAddIRIi(iL, w, iw, lenhll);
                }
                else if (col == ii)
                {
@@ -5749,24 +4470,27 @@ hypre_ILUSetupILUT(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
        */
 
       lenl = lenhlr < lfil ? lenhlr : lfil;
-      L_diag_i[ii+1] = L_diag_i[ii] + lenl;
+      L_diag_i[ii + 1] = L_diag_i[ii] + lenl;
       if (lenl > 0)
       {
          /* test if memory is enough */
          while (ctrL + lenl > capacity_L)
          {
             HYPRE_Int tmp = capacity_L;
-            capacity_L = capacity_L * EXPAND_FACT + 1;
-            L_diag_j = hypre_TReAlloc_v2(L_diag_j, HYPRE_Int, tmp, HYPRE_Int, capacity_L, HYPRE_MEMORY_DEVICE);
-            L_diag_data = hypre_TReAlloc_v2(L_diag_data, HYPRE_Real, tmp, HYPRE_Real, capacity_L, HYPRE_MEMORY_DEVICE);
+            capacity_L = (HYPRE_Int)(capacity_L * EXPAND_FACT + 1);
+            L_diag_j = hypre_TReAlloc_v2(L_diag_j, HYPRE_Int, tmp, HYPRE_Int,
+                                         capacity_L, memory_location);
+            L_diag_data = hypre_TReAlloc_v2(L_diag_data, HYPRE_Real, tmp, HYPRE_Real,
+                                            capacity_L, memory_location);
          }
          ctrL += lenl;
+
          /* copy large data in */
-         for (j = L_diag_i[ii]; j < ctrL; j ++)
+         for (j = L_diag_i[ii]; j < ctrL; j++)
          {
             L_diag_j[j] = iL[kl];
             L_diag_data[j] = w[kl];
-            hypre_ILUMaxrHeapRemoveRabsI(w+kl,iL+kl,lenhlr);
+            hypre_ILUMaxrHeapRemoveRabsI(w + kl, iL + kl, lenhlr);
             lenhlr--;
          }
       }
@@ -5774,7 +4498,7 @@ hypre_ILUSetupILUT(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
        * now reset working array
        * L part already reset when move out of heap, only S part
        */
-      ku = lenu+nLU;
+      ku = lenu + nLU;
       for (j = nLU; j <= ku; j++)
       {
          iw[iL[j]] = -1;
@@ -5784,27 +4508,29 @@ hypre_ILUSetupILUT(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
       //lenhu = lenu < lfil ? lenu : lfil;
       lenhu = lenu;
       /* quick split, only sort the first small part of the array */
-      hypre_ILUMaxQSplitRabsI(w,iL,nLU+1,nLU+lenhu,nLU+lenu);
+      hypre_ILUMaxQSplitRabsI(w, iL, nLU + 1, nLU + lenhu, nLU + lenu);
       /* we have diagonal in S anyway */
       /* test if memory is enough */
       while (ctrS + lenhu + 1 > capacity_S)
       {
          HYPRE_Int tmp = capacity_S;
-         capacity_S = capacity_S * EXPAND_FACT + 1;
-         S_diag_j = hypre_TReAlloc_v2(S_diag_j, HYPRE_Int, tmp, HYPRE_Int, capacity_S, HYPRE_MEMORY_DEVICE);
-         S_diag_data = hypre_TReAlloc_v2(S_diag_data, HYPRE_Real, tmp, HYPRE_Real, capacity_S, HYPRE_MEMORY_DEVICE);
+         capacity_S = (HYPRE_Int)(capacity_S * EXPAND_FACT + 1);
+         S_diag_j = hypre_TReAlloc_v2(S_diag_j, HYPRE_Int, tmp,
+                                      HYPRE_Int, capacity_S, memory_location);
+         S_diag_data = hypre_TReAlloc_v2(S_diag_data, HYPRE_Real, tmp,
+                                         HYPRE_Real, capacity_S, memory_location);
       }
 
-      ctrS += (lenhu+1);
-      S_diag_i[ii-nLU+1] = ctrS;
+      ctrS += (lenhu + 1);
+      S_diag_i[ii - nLU + 1] = ctrS;
 
       /* copy large data in, diagonal first */
-      S_diag_j[S_diag_i[ii-nLU]] = iL[nLU]-nLU;
-      S_diag_data[S_diag_i[ii-nLU]] = w[nLU];
-      for (j = S_diag_i[ii-nLU] + 1; j < ctrS; j++)
+      S_diag_j[S_diag_i[ii - nLU]] = iL[nLU] - nLU;
+      S_diag_data[S_diag_i[ii - nLU]] = w[nLU];
+      for (j = S_diag_i[ii - nLU] + 1; j < ctrS; j++)
       {
-         jpos = nLU+j-S_diag_i[ii-nLU];
-         S_diag_j[j] = iL[jpos]-nLU;
+         jpos = nLU + j - S_diag_i[ii - nLU];
+         S_diag_j[j] = iL[jpos] - nLU;
          S_diag_data[j] = w[jpos];
       }
    }/* end of ii loop from nLU to n-1 */
@@ -5818,6 +4544,7 @@ hypre_ILUSetupILUT(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
     */
    HYPRE_BigInt big_m = (HYPRE_BigInt)m;
    hypre_MPI_Allreduce(&big_m, &total_rows, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
+
    /* only form when total_rows > 0 */
    if ( total_rows > 0 )
    {
@@ -5825,7 +4552,7 @@ hypre_ILUSetupILUT(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
       /* need to get new column start */
       {
          HYPRE_BigInt global_start;
-         hypre_MPI_Scan( &big_m, &global_start, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
+         hypre_MPI_Scan(&big_m, &global_start, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
          col_starts[0] = global_start - m;
          col_starts[1] = global_start;
       }
@@ -5837,13 +4564,13 @@ hypre_ILUSetupILUT(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
       S_offd_ncols = hypre_CSRMatrixNumCols(A_offd);
 
       matS = hypre_ParCSRMatrixCreate( comm,
-            total_rows,
-            total_rows,
-            col_starts,
-            col_starts,
-            S_offd_ncols,
-            S_diag_i[m],
-            S_offd_nnz);
+                                       total_rows,
+                                       total_rows,
+                                       col_starts,
+                                       col_starts,
+                                       S_offd_ncols,
+                                       S_diag_i[m],
+                                       S_offd_nnz);
 
       /* first put diagonal data in */
       S_diag = hypre_ParCSRMatrixDiag(matS);
@@ -5854,9 +4581,9 @@ hypre_ILUSetupILUT(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
 
       /* now start to construct offdiag of S */
       S_offd = hypre_ParCSRMatrixOffd(matS);
-      S_offd_i = hypre_TAlloc(HYPRE_Int, m+1, HYPRE_MEMORY_DEVICE);
-      S_offd_j = hypre_TAlloc(HYPRE_Int, S_offd_nnz, HYPRE_MEMORY_DEVICE);
-      S_offd_data = hypre_TAlloc(HYPRE_Real, S_offd_nnz, HYPRE_MEMORY_DEVICE);
+      S_offd_i = hypre_TAlloc(HYPRE_Int, m + 1, memory_location);
+      S_offd_j = hypre_TAlloc(HYPRE_Int, S_offd_nnz, memory_location);
+      S_offd_data = hypre_TAlloc(HYPRE_Real, S_offd_nnz, memory_location);
       S_offd_colmap = hypre_CTAlloc(HYPRE_BigInt, S_offd_ncols, HYPRE_MEMORY_HOST);
 
       /* simply use a loop to copy data from A_offd */
@@ -5870,13 +4597,13 @@ hypre_ILUSetupILUT(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
       {
          col = perm[i + nI];
          k1 = A_offd_i[col];
-         k2 = A_offd_i[col+1];
+         k2 = A_offd_i[col + 1];
          for (j = k1; j < k2; j++)
          {
             S_offd_j[k3] = A_offd_j[j];
             S_offd_data[k3++] = A_offd_data[j];
          }
-         S_offd_i[i+e+1] = k3;
+         S_offd_i[i + e + 1] = k3;
       }
 
       /* give I, J, DATA to S_offd */
@@ -5888,13 +4615,13 @@ hypre_ILUSetupILUT(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
 
       /* get total num of send */
       num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
-      begin = hypre_ParCSRCommPkgSendMapStart(comm_pkg,0);
-      end = hypre_ParCSRCommPkgSendMapStart(comm_pkg,num_sends);
+      begin = hypre_ParCSRCommPkgSendMapStart(comm_pkg, 0);
+      end = hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends);
       send_buf = hypre_TAlloc(HYPRE_BigInt, end - begin, HYPRE_MEMORY_HOST);
       /* copy new index into send_buf */
       for (i = begin; i < end; i++)
       {
-         send_buf[i-begin] = rperm[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,i)] - nLU + col_starts[0];
+         send_buf[i - begin] = rperm[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, i)] - nLU + col_starts[0];
       }
 
       /* main communication */
@@ -5915,19 +4642,21 @@ hypre_ILUSetupILUT(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
    for (k = nLU; k < n; k++)
    {
       /* set U after nLU to be 0, and diag to be one */
-      U_diag_i[k+1] = U_diag_i[nLU];
+      U_diag_i[k + 1] = U_diag_i[nLU];
       D_data[k] = 1.;
    }
 
    /* create parcsr matrix */
    matL = hypre_ParCSRMatrixCreate( comm,
-         hypre_ParCSRMatrixGlobalNumRows(A),
-         hypre_ParCSRMatrixGlobalNumRows(A),
-         hypre_ParCSRMatrixRowStarts(A),
-         hypre_ParCSRMatrixColStarts(A),
-         0,
-         L_diag_i[n],
-         0 );
+                                    hypre_ParCSRMatrixGlobalNumRows(A),
+                                    hypre_ParCSRMatrixGlobalNumRows(A),
+                                    hypre_ParCSRMatrixRowStarts(A),
+                                    hypre_ParCSRMatrixColStarts(A),
+                                    0,
+                                    L_diag_i[n],
+                                    0 );
+   hypre_CSRMatrixMemoryLocation(hypre_ParCSRMatrixDiag(matL)) = memory_location;
+   hypre_CSRMatrixMemoryLocation(hypre_ParCSRMatrixOffd(matL)) = memory_location;
 
    L_diag = hypre_ParCSRMatrixDiag(matL);
    hypre_CSRMatrixI(L_diag) = L_diag_i;
@@ -5939,8 +4668,8 @@ hypre_ILUSetupILUT(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
    else
    {
       /* we initialized some anyway, so remove if unused */
-      hypre_TFree(L_diag_j,HYPRE_MEMORY_DEVICE);
-      hypre_TFree(L_diag_data,HYPRE_MEMORY_DEVICE);
+      hypre_TFree(L_diag_j, memory_location);
+      hypre_TFree(L_diag_data, memory_location);
    }
    /* store (global) total number of nonzeros */
    local_nnz = (HYPRE_Real) (L_diag_i[n]);
@@ -5948,13 +4677,15 @@ hypre_ILUSetupILUT(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
    hypre_ParCSRMatrixDNumNonzeros(matL) = total_nnz;
 
    matU = hypre_ParCSRMatrixCreate( comm,
-         hypre_ParCSRMatrixGlobalNumRows(A),
-         hypre_ParCSRMatrixGlobalNumRows(A),
-         hypre_ParCSRMatrixRowStarts(A),
-         hypre_ParCSRMatrixColStarts(A),
-         0,
-         U_diag_i[n],
-         0 );
+                                    hypre_ParCSRMatrixGlobalNumRows(A),
+                                    hypre_ParCSRMatrixGlobalNumRows(A),
+                                    hypre_ParCSRMatrixRowStarts(A),
+                                    hypre_ParCSRMatrixColStarts(A),
+                                    0,
+                                    U_diag_i[n],
+                                    0 );
+   hypre_CSRMatrixMemoryLocation(hypre_ParCSRMatrixDiag(matU)) = memory_location;
+   hypre_CSRMatrixMemoryLocation(hypre_ParCSRMatrixOffd(matU)) = memory_location;
 
    U_diag = hypre_ParCSRMatrixDiag(matU);
    hypre_CSRMatrixI(U_diag) = U_diag_i;
@@ -5966,8 +4697,8 @@ hypre_ILUSetupILUT(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
    else
    {
       /* we initialized some anyway, so remove if unused */
-      hypre_TFree(U_diag_j,HYPRE_MEMORY_DEVICE);
-      hypre_TFree(U_diag_data,HYPRE_MEMORY_DEVICE);
+      hypre_TFree(U_diag_j, memory_location);
+      hypre_TFree(U_diag_data, memory_location);
    }
    /* store (global) total number of nonzeros */
    local_nnz = (HYPRE_Real) (U_diag_i[n]);
@@ -5975,22 +4706,22 @@ hypre_ILUSetupILUT(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
    hypre_ParCSRMatrixDNumNonzeros(matU) = total_nnz;
 
    /* free working array */
-   hypre_TFree(iw,HYPRE_MEMORY_HOST);
-   hypre_TFree(w,HYPRE_MEMORY_HOST);
+   hypre_TFree(iw, HYPRE_MEMORY_HOST);
+   hypre_TFree(w, HYPRE_MEMORY_HOST);
 
    if (!matS)
    {
-      hypre_TFree(S_diag_i,HYPRE_MEMORY_DEVICE);
+      hypre_TFree(S_diag_i, memory_location);
    }
 
    if (!permp)
    {
-      hypre_TFree(perm, HYPRE_MEMORY_DEVICE);
+      hypre_TFree(perm, memory_location);
    }
 
    if (!qpermp)
    {
-      hypre_TFree(qperm, HYPRE_MEMORY_DEVICE);
+      hypre_TFree(qperm, memory_location);
    }
 
    /* set matrix pointers */
@@ -6003,9 +4734,10 @@ hypre_ILUSetupILUT(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_NSHSetup
+ *--------------------------------------------------------------------------*/
 
-/* NSH setup */
-/* Setup NSH data */
 HYPRE_Int
 hypre_NSHSetup( void               *nsh_vdata,
                 hypre_ParCSRMatrix *A,
@@ -6015,20 +4747,11 @@ hypre_NSHSetup( void               *nsh_vdata,
    MPI_Comm             comm              = hypre_ParCSRMatrixComm(A);
    hypre_ParNSHData     *nsh_data         = (hypre_ParNSHData*) nsh_vdata;
 
-   //   HYPRE_Int            i;
-   // HYPRE_Int            num_threads;
-   // HYPRE_Int            debug_flag = 0;
-
-   /* pointers to NSH data */
-   HYPRE_Int            logging           = hypre_ParNSHDataLogging(nsh_data);
-   HYPRE_Int            print_level       = hypre_ParNSHDataPrintLevel(nsh_data);
-
+   /* Pointers to NSH data */
+   HYPRE_Int             logging          = hypre_ParNSHDataLogging(nsh_data);
+   HYPRE_Int             print_level      = hypre_ParNSHDataPrintLevel(nsh_data);
    hypre_ParCSRMatrix   *matA             = hypre_ParNSHDataMatA(nsh_data);
    hypre_ParCSRMatrix   *matM             = hypre_ParNSHDataMatM(nsh_data);
-
-   //   HYPRE_Int            n                 = hypre_CSRMatrixNumRows(hypre_ParCSRMatrixDiag(A));
-   HYPRE_Int            num_procs,  my_id;
-
    hypre_ParVector      *Utemp;
    hypre_ParVector      *Ftemp;
    hypre_ParVector      *F_array          = hypre_ParNSHDataF(nsh_data);
@@ -6036,140 +4759,122 @@ hypre_NSHSetup( void               *nsh_vdata,
    hypre_ParVector      *residual         = hypre_ParNSHDataResidual(nsh_data);
    HYPRE_Real           *rel_res_norms    = hypre_ParNSHDataRelResNorms(nsh_data);
 
-   /* solver setting */
+   /* Solver setting */
    HYPRE_Real           *droptol          = hypre_ParNSHDataDroptol(nsh_data);
-   HYPRE_Real           mr_tol            = hypre_ParNSHDataMRTol(nsh_data);
-   HYPRE_Int            mr_max_row_nnz    = hypre_ParNSHDataMRMaxRowNnz(nsh_data);
-   HYPRE_Int            mr_max_iter       = hypre_ParNSHDataMRMaxIter(nsh_data);
-   HYPRE_Int            mr_col_version    = hypre_ParNSHDataMRColVersion(nsh_data);
-   HYPRE_Real           nsh_tol           = hypre_ParNSHDataNSHTol(nsh_data);
-   HYPRE_Int            nsh_max_row_nnz   = hypre_ParNSHDataNSHMaxRowNnz(nsh_data);
-   HYPRE_Int            nsh_max_iter      = hypre_ParNSHDataNSHMaxIter(nsh_data);
-
-   /* ----- begin -----*/
-
-   //num_threads = hypre_NumThreads();
+   HYPRE_Real            mr_tol           = hypre_ParNSHDataMRTol(nsh_data);
+   HYPRE_Int             mr_max_row_nnz   = hypre_ParNSHDataMRMaxRowNnz(nsh_data);
+   HYPRE_Int             mr_max_iter      = hypre_ParNSHDataMRMaxIter(nsh_data);
+   HYPRE_Int             mr_col_version   = hypre_ParNSHDataMRColVersion(nsh_data);
+   HYPRE_Real            nsh_tol          = hypre_ParNSHDataNSHTol(nsh_data);
+   HYPRE_Int             nsh_max_row_nnz  = hypre_ParNSHDataNSHMaxRowNnz(nsh_data);
+   HYPRE_Int             nsh_max_iter     = hypre_ParNSHDataNSHMaxIter(nsh_data);
+   HYPRE_Int             num_procs,  my_id;
 
-   hypre_MPI_Comm_size(comm,&num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_size(comm, &num_procs);
+   hypre_MPI_Comm_rank(comm, &my_id);
 
    /* Free Previously allocated data, if any not destroyed */
-   if (matM)
-   {
-      hypre_TFree(matM, HYPRE_MEMORY_HOST);
-      matM = NULL;
-   }
-
-   /* clear old l1_norm data, if created */
-   if (hypre_ParNSHDataL1Norms(nsh_data))
-   {
-      hypre_TFree(hypre_ParNSHDataL1Norms(nsh_data), HYPRE_MEMORY_HOST);
-      hypre_ParNSHDataL1Norms(nsh_data) = NULL;
-   }
-
-   /* setup temporary storage
-    * first check is they've already here
-    */
-   if (hypre_ParNSHDataUTemp(nsh_data))
-   {
-      hypre_ParVectorDestroy(hypre_ParNSHDataUTemp(nsh_data));
-      hypre_ParNSHDataUTemp(nsh_data) = NULL;
-   }
-   if (hypre_ParNSHDataFTemp(nsh_data))
-   {
-      hypre_ParVectorDestroy(hypre_ParNSHDataFTemp(nsh_data));
-      hypre_ParNSHDataFTemp(nsh_data) = NULL;
-   }
-   if (hypre_ParNSHDataResidual(nsh_data))
-   {
-      hypre_ParVectorDestroy(hypre_ParNSHDataResidual(nsh_data));
-      hypre_ParNSHDataResidual(nsh_data) = NULL;
-   }
-   if (hypre_ParNSHDataRelResNorms(nsh_data))
-   {
-      hypre_TFree(hypre_ParNSHDataRelResNorms(nsh_data), HYPRE_MEMORY_HOST);
-      hypre_ParNSHDataRelResNorms(nsh_data) = NULL;
-   }
+   hypre_TFree(matM, HYPRE_MEMORY_HOST);
+   hypre_TFree(hypre_ParNSHDataL1Norms(nsh_data), HYPRE_MEMORY_HOST);
+   hypre_ParVectorDestroy(hypre_ParNSHDataUTemp(nsh_data));
+   hypre_ParVectorDestroy(hypre_ParNSHDataFTemp(nsh_data));
+   hypre_ParVectorDestroy(hypre_ParNSHDataResidual(nsh_data));
+   hypre_TFree(hypre_ParNSHDataRelResNorms(nsh_data), HYPRE_MEMORY_HOST);
+
+   matM = NULL;
+   hypre_ParNSHDataL1Norms(nsh_data)     = NULL;
+   hypre_ParNSHDataUTemp(nsh_data)       = NULL;
+   hypre_ParNSHDataFTemp(nsh_data)       = NULL;
+   hypre_ParNSHDataResidual(nsh_data)    = NULL;
+   hypre_ParNSHDataRelResNorms(nsh_data) = NULL;
 
    /* start to create working vectors */
    Utemp = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A),
-         hypre_ParCSRMatrixGlobalNumRows(A),
-         hypre_ParCSRMatrixRowStarts(A));
+                                 hypre_ParCSRMatrixGlobalNumRows(A),
+                                 hypre_ParCSRMatrixRowStarts(A));
    hypre_ParVectorInitialize(Utemp);
    hypre_ParNSHDataUTemp(nsh_data) = Utemp;
 
    Ftemp = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A),
-         hypre_ParCSRMatrixGlobalNumRows(A),
-         hypre_ParCSRMatrixRowStarts(A));
+                                 hypre_ParCSRMatrixGlobalNumRows(A),
+                                 hypre_ParCSRMatrixRowStarts(A));
    hypre_ParVectorInitialize(Ftemp);
    hypre_ParNSHDataFTemp(nsh_data) = Ftemp;
-   /* set matrix, solution and rhs pointers */
+
+   /* Set matrix, solution and rhs pointers */
    matA = A;
    F_array = f;
    U_array = u;
 
    /* NSH compute approximate inverse, see par_ilu.c */
-   hypre_ILUParCSRInverseNSH(matA, &matM, droptol, mr_tol, nsh_tol, DIVIDE_TOL, mr_max_row_nnz,
-         nsh_max_row_nnz, mr_max_iter, nsh_max_iter, mr_col_version, print_level);
+   hypre_ILUParCSRInverseNSH(matA, &matM, droptol, mr_tol, nsh_tol, HYPRE_REAL_MIN,
+                             mr_max_row_nnz, nsh_max_row_nnz, mr_max_iter, nsh_max_iter,
+                             mr_col_version, print_level);
 
-   /* set pointers to NSH data */
+   /* Set pointers to NSH data */
    hypre_ParNSHDataMatA(nsh_data) = matA;
-   hypre_ParNSHDataF(nsh_data) = F_array;
-   hypre_ParNSHDataU(nsh_data) = U_array;
+   hypre_ParNSHDataF(nsh_data)    = F_array;
+   hypre_ParNSHDataU(nsh_data)    = U_array;
    hypre_ParNSHDataMatM(nsh_data) = matM;
 
-   /* compute operator complexity */
+   /* Compute operator complexity */
    hypre_ParCSRMatrixSetDNumNonzeros(matA);
    hypre_ParCSRMatrixSetDNumNonzeros(matM);
-   /* compute complexity */
-   hypre_ParNSHDataOperatorComplexity(nsh_data) =  hypre_ParCSRMatrixDNumNonzeros(matM)/hypre_ParCSRMatrixDNumNonzeros(matA);
-   if (my_id == 0)
+
+   /* Compute complexity */
+   hypre_ParNSHDataOperatorComplexity(nsh_data) = hypre_ParCSRMatrixDNumNonzeros(matM) /
+                                                  hypre_ParCSRMatrixDNumNonzeros(matA);
+   if (my_id == 0 && print_level > 0)
    {
-      hypre_printf("NSH SETUP: operator complexity = %f  \n", hypre_ParNSHDataOperatorComplexity(nsh_data));
+      hypre_printf("NSH SETUP: operator complexity = %f  \n",
+                   hypre_ParNSHDataOperatorComplexity(nsh_data));
    }
 
-   if ( logging > 1 ) {
-      residual =
-         hypre_ParVectorCreate(hypre_ParCSRMatrixComm(matA),
-               hypre_ParCSRMatrixGlobalNumRows(matA),
-               hypre_ParCSRMatrixRowStarts(matA) );
+   if (logging > 1)
+   {
+      residual = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(matA),
+                                       hypre_ParCSRMatrixGlobalNumRows(matA),
+                                       hypre_ParCSRMatrixRowStarts(matA));
       hypre_ParVectorInitialize(residual);
-      hypre_ParNSHDataResidual(nsh_data)= residual;
+      hypre_ParNSHDataResidual(nsh_data) = residual;
    }
-   else{
+   else
+   {
       hypre_ParNSHDataResidual(nsh_data) = NULL;
    }
-   rel_res_norms = hypre_CTAlloc(HYPRE_Real, hypre_ParNSHDataMaxIter(nsh_data), HYPRE_MEMORY_HOST);
+
+   rel_res_norms = hypre_CTAlloc(HYPRE_Real, hypre_ParNSHDataMaxIter(nsh_data),
+                                 HYPRE_MEMORY_HOST);
    hypre_ParNSHDataRelResNorms(nsh_data) = rel_res_norms;
 
    return hypre_error_flag;
 }
 
-
-/* ILU(0) for RAS, has some external rows
+/*--------------------------------------------------------------------------
+ * hypre_ILUSetupILU0RAS
+ *
+ * ILU(0) for RAS, has some external rows
+ *
  * A = input matrix
- * perm = permutation array indicating ordering of factorization. Perm could come from a
- *    CF_marker array or a reordering routine.
+ * perm = permutation array indicating ordering of factorization.
+ *        Perm could come from a CF_marker array or a reordering routine.
  * nLU = size of computed LDU factorization.
  * Lptr, Dptr, Uptr, Sptr = L, D, U, S factors.
  * will form global Schur Matrix if nLU < n
- */
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_ILUSetupILU0RAS(hypre_ParCSRMatrix *A, HYPRE_Int *perm, HYPRE_Int nLU,
-      hypre_ParCSRMatrix **Lptr, HYPRE_Real** Dptr, hypre_ParCSRMatrix **Uptr)
+hypre_ILUSetupILU0RAS(hypre_ParCSRMatrix  *A,
+                      HYPRE_Int           *perm,
+                      HYPRE_Int            nLU,
+                      hypre_ParCSRMatrix **Lptr,
+                      HYPRE_Real         **Dptr,
+                      hypre_ParCSRMatrix **Uptr)
 {
-   HYPRE_Int                i, ii, j, k, k1, k2, ctrU, ctrL, lenl, lenu, jpiv, col, jpos;
-   HYPRE_Int                *iw, *iL, *iU;
-   HYPRE_Real               dd, t, dpiv, lxu, *wU, *wL;
-
    /* communication stuffs for S */
    MPI_Comm                 comm          = hypre_ParCSRMatrixComm(A);
    HYPRE_Int                num_procs;
-   //   HYPRE_Int                S_offd_nnz, S_offd_ncols;
    hypre_ParCSRCommPkg      *comm_pkg;
-   //   hypre_ParCSRCommHandle   *comm_handle;
-   //   HYPRE_Int                num_sends, begin, end;
-   //   HYPRE_Int                *send_buf     = NULL;
 
    /* data objects for A */
    hypre_CSRMatrix          *A_diag       = hypre_ParCSRMatrixDiag(A);
@@ -6180,10 +4885,10 @@ hypre_ILUSetupILU0RAS(hypre_ParCSRMatrix *A, HYPRE_Int *perm, HYPRE_Int nLU,
    HYPRE_Real               *A_offd_data  = hypre_CSRMatrixData(A_offd);
    HYPRE_Int                *A_offd_i     = hypre_CSRMatrixI(A_offd);
    HYPRE_Int                *A_offd_j     = hypre_CSRMatrixJ(A_offd);
+   HYPRE_MemoryLocation      memory_location = hypre_ParCSRMatrixMemoryLocation(A);
 
    /* size of problem and external matrix */
    HYPRE_Int                n             =  hypre_CSRMatrixNumRows(A_diag);
-   //   HYPRE_Int                m             = n - nLU;
    HYPRE_Int                ext           = hypre_CSRMatrixNumCols(A_offd);
    HYPRE_Int                total_rows    = n + ext;
    HYPRE_BigInt             col_starts[2];
@@ -6216,15 +4921,21 @@ hypre_ILUSetupILU0RAS(hypre_ParCSRMatrix *A, HYPRE_Int *perm, HYPRE_Int nLU,
 
    /* reverse permutation array */
    HYPRE_Int                *rperm;
+
    /* the original permutation array */
    HYPRE_Int                *perm_old;
 
+   HYPRE_Int                i, ii, j, k, k1, k2, ctrU, ctrL, lenl, lenu, jpiv, col, jpos;
+   HYPRE_Int                *iw, *iL, *iU;
+   HYPRE_Real               dd, t, dpiv, lxu, *wU, *wL;
+
    /* start setup
     * get communication stuffs first
     */
-   hypre_MPI_Comm_size(comm,&num_procs);
+   hypre_MPI_Comm_size(comm, &num_procs);
    comm_pkg = hypre_ParCSRMatrixCommPkg(A);
-   /* setup if not yet built */
+
+   /* Setup if not yet built */
    if (!comm_pkg)
    {
       hypre_MatvecCommPkgCreate(A);
@@ -6234,34 +4945,35 @@ hypre_ILUSetupILU0RAS(hypre_ParCSRMatrix *A, HYPRE_Int *perm, HYPRE_Int nLU,
    /* check for correctness */
    if (nLU < 0 || nLU > n)
    {
-      hypre_error_w_msg(HYPRE_ERROR_ARG,"WARNING: nLU out of range.\n");
+      hypre_error_w_msg(HYPRE_ERROR_ARG, "WARNING: nLU out of range.\n");
    }
 
    /* Allocate memory for L,D,U,S factors */
    if (n > 0)
    {
-      initial_alloc = (n + ext) + ceil((nnz_A / 2.0)*total_rows/n);
+      initial_alloc = (HYPRE_Int)((n + ext) + hypre_ceil((nnz_A / 2.0) * total_rows / n));
    }
    capacity_L = initial_alloc;
    capacity_U = initial_alloc;
 
-   D_data      = hypre_TAlloc(HYPRE_Real, total_rows, HYPRE_MEMORY_DEVICE);
-   L_diag_i    = hypre_TAlloc(HYPRE_Int, total_rows+1, HYPRE_MEMORY_DEVICE);
-   L_diag_j    = hypre_TAlloc(HYPRE_Int, capacity_L, HYPRE_MEMORY_DEVICE);
-   L_diag_data = hypre_TAlloc(HYPRE_Real, capacity_L, HYPRE_MEMORY_DEVICE);
-   U_diag_i    = hypre_TAlloc(HYPRE_Int, total_rows+1, HYPRE_MEMORY_DEVICE);
-   U_diag_j    = hypre_TAlloc(HYPRE_Int, capacity_U, HYPRE_MEMORY_DEVICE);
-   U_diag_data = hypre_TAlloc(HYPRE_Real, capacity_U, HYPRE_MEMORY_DEVICE);
+   D_data      = hypre_TAlloc(HYPRE_Real, total_rows, memory_location);
+   L_diag_i    = hypre_TAlloc(HYPRE_Int, total_rows + 1, memory_location);
+   L_diag_j    = hypre_TAlloc(HYPRE_Int, capacity_L, memory_location);
+   L_diag_data = hypre_TAlloc(HYPRE_Real, capacity_L, memory_location);
+   U_diag_i    = hypre_TAlloc(HYPRE_Int, total_rows + 1, memory_location);
+   U_diag_j    = hypre_TAlloc(HYPRE_Int, capacity_U, memory_location);
+   U_diag_data = hypre_TAlloc(HYPRE_Real, capacity_U, memory_location);
 
    /* allocate working arrays */
-   iw          = hypre_TAlloc(HYPRE_Int, 4*total_rows, HYPRE_MEMORY_HOST);
-   iL          = iw+total_rows;
+   iw          = hypre_TAlloc(HYPRE_Int, 4 * total_rows, HYPRE_MEMORY_HOST);
+   iL          = iw + total_rows;
    rperm       = iw + 2 * total_rows;
    perm_old    = perm;
    perm        = iw + 3 * total_rows;
    wL          = hypre_TAlloc(HYPRE_Real, total_rows, HYPRE_MEMORY_HOST);
    ctrU = ctrL = 0;
    L_diag_i[0] = U_diag_i[0] = 0;
+
    /* set marker array iw to -1 */
    for (i = 0; i < total_rows; i++)
    {
@@ -6297,12 +5009,12 @@ hypre_ILUSetupILU0RAS(hypre_ParCSRMatrix *A, HYPRE_Int *perm, HYPRE_Int nLU,
       // get row i
       i = perm[ii];
       // get extents of row i
-      k1=A_diag_i[i];
-      k2=A_diag_i[i+1];
+      k1 = A_diag_i[i];
+      k2 = A_diag_i[i + 1];
 
       /*-------------------- unpack L & U-parts of row of A in arrays w */
-      iU = iL+ii;
-      wU = wL+ii;
+      iU = iL + ii;
+      wU = wL + ii;
       /*--------------------  diagonal entry */
       dd = 0.0;
       lenl  = lenu = 0;
@@ -6326,7 +5038,7 @@ hypre_ILUSetupILU0RAS(hypre_ParCSRMatrix *A, HYPRE_Int *perm, HYPRE_Int nLU,
          }
          else
          {
-            dd=t;
+            dd = t;
          }
       }
 
@@ -6338,7 +5050,7 @@ hypre_ILUSetupILU0RAS(hypre_ParCSRMatrix *A, HYPRE_Int *perm, HYPRE_Int nLU,
        *  entering the elimination loop.
        *-----------------------------------------------------------------------*/
       //      hypre_quickSortIR(iL, wL, iw, 0, (lenl-1));
-      hypre_qsort3ir(iL, wL, iw, 0, (lenl-1));
+      hypre_qsort3ir(iL, wL, iw, 0, (lenl - 1));
       for (j = 0; j < lenl; j++)
       {
          jpiv = iL[j];
@@ -6350,7 +5062,7 @@ hypre_ILUSetupILU0RAS(hypre_ParCSRMatrix *A, HYPRE_Int *perm, HYPRE_Int nLU,
          /* zero out element - reset pivot */
          iw[jpiv] = -1;
          /* combine current row and pivot row */
-         for (k = U_diag_i[jpiv]; k < U_diag_i[jpiv+1]; k++)
+         for (k = U_diag_i[jpiv]; k < U_diag_i[jpiv + 1]; k++)
          {
             col = U_diag_j[k];
             jpos = iw[col];
@@ -6389,44 +5101,40 @@ hypre_ILUSetupILU0RAS(hypre_ParCSRMatrix *A, HYPRE_Int *perm, HYPRE_Int nLU,
       /* Update LDU factors */
       /* L part */
       /* Check that memory is sufficient */
-      while ((ctrL+lenl) > capacity_L)
+      while ((ctrL + lenl) > capacity_L)
       {
          HYPRE_Int tmp = capacity_L;
-         capacity_L = capacity_L * EXPAND_FACT + 1;
-         L_diag_j = hypre_TReAlloc_v2(L_diag_j, HYPRE_Int, tmp, HYPRE_Int, capacity_L, HYPRE_MEMORY_DEVICE);
-         L_diag_data = hypre_TReAlloc_v2(L_diag_data, HYPRE_Real, tmp, HYPRE_Real, capacity_L, HYPRE_MEMORY_DEVICE);
-      }
-      //hypre_TMemcpy(&(L_diag_j)[ctrL], iL, HYPRE_Int, lenl, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
-      //hypre_TMemcpy(&(L_diag_data)[ctrL], wL, HYPRE_Real, lenl, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
-      hypre_TMemcpy(&(L_diag_j)[ctrL], iL, HYPRE_Int, lenl,
-                    HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
-      hypre_TMemcpy(&(L_diag_data)[ctrL], wL, HYPRE_Real, lenl,
-                    HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
-      L_diag_i[ii+1] = (ctrL+=lenl);
+         capacity_L = (HYPRE_Int)(capacity_L * EXPAND_FACT + 1);
+         L_diag_j = hypre_TReAlloc_v2(L_diag_j, HYPRE_Int, tmp,
+                                      HYPRE_Int, capacity_L, memory_location);
+         L_diag_data = hypre_TReAlloc_v2(L_diag_data, HYPRE_Real, tmp,
+                                         HYPRE_Real, capacity_L, memory_location);
+      }
+      hypre_TMemcpy(&(L_diag_j)[ctrL], iL, HYPRE_Int, lenl, memory_location, HYPRE_MEMORY_HOST);
+      hypre_TMemcpy(&(L_diag_data)[ctrL], wL, HYPRE_Real, lenl, memory_location, HYPRE_MEMORY_HOST);
+      L_diag_i[ii + 1] = (ctrL += lenl);
 
       /* diagonal part (we store the inverse) */
-      if (fabs(dd) < MAT_TOL)
+      if (hypre_abs(dd) < MAT_TOL)
       {
          dd = 1.0e-6;
       }
-      D_data[ii] = 1./dd;
+      D_data[ii] = 1. / dd;
 
       /* U part */
       /* Check that memory is sufficient */
-      while ((ctrU+lenu) > capacity_U)
+      while ((ctrU + lenu) > capacity_U)
       {
          HYPRE_Int tmp = capacity_U;
-         capacity_U = capacity_U * EXPAND_FACT + 1;
-         U_diag_j = hypre_TReAlloc_v2(U_diag_j, HYPRE_Int, tmp, HYPRE_Int, capacity_U, HYPRE_MEMORY_DEVICE);
-         U_diag_data = hypre_TReAlloc_v2(U_diag_data, HYPRE_Real, tmp, HYPRE_Real, capacity_U, HYPRE_MEMORY_DEVICE);
+         capacity_U = (HYPRE_Int)(capacity_U * EXPAND_FACT + 1);
+         U_diag_j = hypre_TReAlloc_v2(U_diag_j, HYPRE_Int, tmp,
+                                      HYPRE_Int, capacity_U, memory_location);
+         U_diag_data = hypre_TReAlloc_v2(U_diag_data, HYPRE_Real, tmp,
+                                         HYPRE_Real, capacity_U, memory_location);
       }
-      //hypre_TMemcpy(&(U_diag_j)[ctrU], iU, HYPRE_Int, lenu, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
-      //hypre_TMemcpy(&(U_diag_data)[ctrU], wU, HYPRE_Real, lenu, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
-      hypre_TMemcpy(&(U_diag_j)[ctrU], iU, HYPRE_Int, lenu,
-                    HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
-      hypre_TMemcpy(&(U_diag_data)[ctrU], wU, HYPRE_Real, lenu,
-                    HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
-      U_diag_i[ii+1] = (ctrU+=lenu);
+      hypre_TMemcpy(&(U_diag_j)[ctrU], iU, HYPRE_Int, lenu, memory_location, HYPRE_MEMORY_HOST);
+      hypre_TMemcpy(&(U_diag_data)[ctrU], wU, HYPRE_Real, lenu, memory_location, HYPRE_MEMORY_HOST);
+      U_diag_i[ii + 1] = (ctrU += lenu);
    }
 
    /*---------  Begin Factorization in lower part  ----
@@ -6437,12 +5145,12 @@ hypre_ILUSetupILU0RAS(hypre_ParCSRMatrix *A, HYPRE_Int *perm, HYPRE_Int nLU,
       // get row i
       i = perm[ii];
       // get extents of row i
-      k1=A_diag_i[i];
-      k2=A_diag_i[i+1];
+      k1 = A_diag_i[i];
+      k2 = A_diag_i[i + 1];
 
       /*-------------------- unpack L & U-parts of row of A in arrays w */
-      iU = iL+ii;
-      wU = wL+ii;
+      iU = iL + ii;
+      wU = wL + ii;
       /*--------------------  diagonal entry */
       dd = 0.0;
       lenl  = lenu = 0;
@@ -6466,13 +5174,13 @@ hypre_ILUSetupILU0RAS(hypre_ParCSRMatrix *A, HYPRE_Int *perm, HYPRE_Int nLU,
          }
          else
          {
-            dd=t;
+            dd = t;
          }
       }
 
       /*------------------ sjcan offd*/
-      k1=A_offd_i[i];
-      k2=A_offd_i[i+1];
+      k1 = A_offd_i[i];
+      k2 = A_offd_i[i + 1];
       for (j = k1; j < k2; j++)
       {
          /* add offd to U part, all offd are U for this part */
@@ -6491,7 +5199,7 @@ hypre_ILUSetupILU0RAS(hypre_ParCSRMatrix *A, HYPRE_Int *perm, HYPRE_Int nLU,
        *  entering the elimination loop.
        *-----------------------------------------------------------------------*/
       //      hypre_quickSortIR(iL, wL, iw, 0, (lenl-1));
-      hypre_qsort3ir(iL, wL, iw, 0, (lenl-1));
+      hypre_qsort3ir(iL, wL, iw, 0, (lenl - 1));
       for (j = 0; j < lenl; j++)
       {
          jpiv = iL[j];
@@ -6503,7 +5211,7 @@ hypre_ILUSetupILU0RAS(hypre_ParCSRMatrix *A, HYPRE_Int *perm, HYPRE_Int nLU,
          /* zero out element - reset pivot */
          iw[jpiv] = -1;
          /* combine current row and pivot row */
-         for (k = U_diag_i[jpiv]; k < U_diag_i[jpiv+1]; k++)
+         for (k = U_diag_i[jpiv]; k < U_diag_i[jpiv + 1]; k++)
          {
             col = U_diag_j[k];
             jpos = iw[col];
@@ -6542,44 +5250,40 @@ hypre_ILUSetupILU0RAS(hypre_ParCSRMatrix *A, HYPRE_Int *perm, HYPRE_Int nLU,
       /* Update LDU factors */
       /* L part */
       /* Check that memory is sufficient */
-      while ((ctrL+lenl) > capacity_L)
+      while ((ctrL + lenl) > capacity_L)
       {
          HYPRE_Int tmp = capacity_L;
-         capacity_L = capacity_L * EXPAND_FACT + 1;
-         L_diag_j = hypre_TReAlloc_v2(L_diag_j, HYPRE_Int, tmp, HYPRE_Int, capacity_L, HYPRE_MEMORY_DEVICE);
-         L_diag_data = hypre_TReAlloc_v2(L_diag_data, HYPRE_Real, tmp, HYPRE_Real, capacity_L, HYPRE_MEMORY_DEVICE);
-      }
-      //hypre_TMemcpy(&(L_diag_j)[ctrL], iL, HYPRE_Int, lenl, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
-      //hypre_TMemcpy(&(L_diag_data)[ctrL], wL, HYPRE_Real, lenl, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
-      hypre_TMemcpy(&(L_diag_j)[ctrL], iL, HYPRE_Int, lenl,
-                    HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
-      hypre_TMemcpy(&(L_diag_data)[ctrL], wL, HYPRE_Real, lenl,
-                    HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
-      L_diag_i[ii+1] = (ctrL+=lenl);
+         capacity_L = (HYPRE_Int)(capacity_L * EXPAND_FACT + 1);
+         L_diag_j = hypre_TReAlloc_v2(L_diag_j, HYPRE_Int, tmp,
+                                      HYPRE_Int, capacity_L, memory_location);
+         L_diag_data = hypre_TReAlloc_v2(L_diag_data, HYPRE_Real, tmp,
+                                         HYPRE_Real, capacity_L, memory_location);
+      }
+      hypre_TMemcpy(&(L_diag_j)[ctrL], iL, HYPRE_Int, lenl, memory_location, HYPRE_MEMORY_HOST);
+      hypre_TMemcpy(&(L_diag_data)[ctrL], wL, HYPRE_Real, lenl, memory_location, HYPRE_MEMORY_HOST);
+      L_diag_i[ii + 1] = (ctrL += lenl);
 
       /* diagonal part (we store the inverse) */
-      if (fabs(dd) < MAT_TOL)
+      if (hypre_abs(dd) < MAT_TOL)
       {
          dd = 1.0e-6;
       }
-      D_data[ii] = 1./dd;
+      D_data[ii] = 1. / dd;
 
       /* U part */
       /* Check that memory is sufficient */
-      while ((ctrU+lenu) > capacity_U)
+      while ((ctrU + lenu) > capacity_U)
       {
          HYPRE_Int tmp = capacity_U;
-         capacity_U = capacity_U * EXPAND_FACT + 1;
-         U_diag_j = hypre_TReAlloc_v2(U_diag_j, HYPRE_Int, tmp, HYPRE_Int, capacity_U, HYPRE_MEMORY_DEVICE);
-         U_diag_data = hypre_TReAlloc_v2(U_diag_data, HYPRE_Real, tmp, HYPRE_Real, capacity_U, HYPRE_MEMORY_DEVICE);
+         capacity_U = (HYPRE_Int)(capacity_U * EXPAND_FACT + 1);
+         U_diag_j = hypre_TReAlloc_v2(U_diag_j, HYPRE_Int, tmp,
+                                      HYPRE_Int, capacity_U, memory_location);
+         U_diag_data = hypre_TReAlloc_v2(U_diag_data, HYPRE_Real, tmp,
+                                         HYPRE_Real, capacity_U, memory_location);
       }
-      //hypre_TMemcpy(&(U_diag_j)[ctrU], iU, HYPRE_Int, lenu, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
-      //hypre_TMemcpy(&(U_diag_data)[ctrU], wU, HYPRE_Real, lenu, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
-      hypre_TMemcpy(&(U_diag_j)[ctrU], iU, HYPRE_Int, lenu,
-                    HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
-      hypre_TMemcpy(&(U_diag_data)[ctrU], wU, HYPRE_Real, lenu,
-                    HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
-      U_diag_i[ii+1] = (ctrU+=lenu);
+      hypre_TMemcpy(&(U_diag_j)[ctrU], iU, HYPRE_Int, lenu, memory_location, HYPRE_MEMORY_HOST);
+      hypre_TMemcpy(&(U_diag_data)[ctrU], wU, HYPRE_Real, lenu, memory_location, HYPRE_MEMORY_HOST);
+      U_diag_i[ii + 1] = (ctrU += lenu);
    }
 
    /*---------  Begin Factorization in external part  ----
@@ -6588,14 +5292,14 @@ hypre_ILUSetupILU0RAS(hypre_ParCSRMatrix *A, HYPRE_Int *perm, HYPRE_Int nLU,
    for (ii = n ; ii < total_rows ; ii++)
    {
       // get row i
-      i = ii-n;
+      i = ii - n;
       // get extents of row i
-      k1=E_i[i];
-      k2=E_i[i+1];
+      k1 = E_i[i];
+      k2 = E_i[i + 1];
 
       /*-------------------- unpack L & U-parts of row of A in arrays w */
-      iU = iL+ii;
-      wU = wL+ii;
+      iU = iL + ii;
+      wU = wL + ii;
       /*--------------------  diagonal entry */
       dd = 0.0;
       lenl  = lenu = 0;
@@ -6619,7 +5323,7 @@ hypre_ILUSetupILU0RAS(hypre_ParCSRMatrix *A, HYPRE_Int *perm, HYPRE_Int nLU,
          }
          else
          {
-            dd=t;
+            dd = t;
          }
       }
 
@@ -6631,7 +5335,7 @@ hypre_ILUSetupILU0RAS(hypre_ParCSRMatrix *A, HYPRE_Int *perm, HYPRE_Int nLU,
        *  entering the elimination loop.
        *-----------------------------------------------------------------------*/
       //      hypre_quickSortIR(iL, wL, iw, 0, (lenl-1));
-      hypre_qsort3ir(iL, wL, iw, 0, (lenl-1));
+      hypre_qsort3ir(iL, wL, iw, 0, (lenl - 1));
       for (j = 0; j < lenl; j++)
       {
          jpiv = iL[j];
@@ -6643,7 +5347,7 @@ hypre_ILUSetupILU0RAS(hypre_ParCSRMatrix *A, HYPRE_Int *perm, HYPRE_Int nLU,
          /* zero out element - reset pivot */
          iw[jpiv] = -1;
          /* combine current row and pivot row */
-         for (k = U_diag_i[jpiv]; k < U_diag_i[jpiv+1]; k++)
+         for (k = U_diag_i[jpiv]; k < U_diag_i[jpiv + 1]; k++)
          {
             col = U_diag_j[k];
             jpos = iw[col];
@@ -6682,44 +5386,40 @@ hypre_ILUSetupILU0RAS(hypre_ParCSRMatrix *A, HYPRE_Int *perm, HYPRE_Int nLU,
       /* Update LDU factors */
       /* L part */
       /* Check that memory is sufficient */
-      while ((ctrL+lenl) > capacity_L)
+      while ((ctrL + lenl) > capacity_L)
       {
          HYPRE_Int tmp = capacity_L;
-         capacity_L = capacity_L * EXPAND_FACT + 1;
-         L_diag_j = hypre_TReAlloc_v2(L_diag_j, HYPRE_Int, tmp, HYPRE_Int, capacity_L, HYPRE_MEMORY_DEVICE);
-         L_diag_data = hypre_TReAlloc_v2(L_diag_data, HYPRE_Real, tmp, HYPRE_Real, capacity_L, HYPRE_MEMORY_DEVICE);
-      }
-      //hypre_TMemcpy(&(L_diag_j)[ctrL], iL, HYPRE_Int, lenl, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
-      //hypre_TMemcpy(&(L_diag_data)[ctrL], wL, HYPRE_Real, lenl, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
-      hypre_TMemcpy(&(L_diag_j)[ctrL], iL, HYPRE_Int, lenl,
-                    HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
-      hypre_TMemcpy(&(L_diag_data)[ctrL], wL, HYPRE_Real, lenl,
-                    HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
-      L_diag_i[ii+1] = (ctrL+=lenl);
+         capacity_L = (HYPRE_Int)(capacity_L * EXPAND_FACT + 1);
+         L_diag_j = hypre_TReAlloc_v2(L_diag_j, HYPRE_Int, tmp,
+                                      HYPRE_Int, capacity_L, memory_location);
+         L_diag_data = hypre_TReAlloc_v2(L_diag_data, HYPRE_Real, tmp,
+                                         HYPRE_Real, capacity_L, memory_location);
+      }
+      hypre_TMemcpy(&(L_diag_j)[ctrL], iL, HYPRE_Int, lenl, memory_location, HYPRE_MEMORY_HOST);
+      hypre_TMemcpy(&(L_diag_data)[ctrL], wL, HYPRE_Real, lenl, memory_location, HYPRE_MEMORY_HOST);
+      L_diag_i[ii + 1] = (ctrL += lenl);
 
       /* diagonal part (we store the inverse) */
-      if (fabs(dd) < MAT_TOL)
+      if (hypre_abs(dd) < MAT_TOL)
       {
          dd = 1.0e-6;
       }
-      D_data[ii] = 1./dd;
+      D_data[ii] = 1. / dd;
 
       /* U part */
       /* Check that memory is sufficient */
-      while ((ctrU+lenu) > capacity_U)
+      while ((ctrU + lenu) > capacity_U)
       {
          HYPRE_Int tmp = capacity_U;
-         capacity_U = capacity_U * EXPAND_FACT + 1;
-         U_diag_j = hypre_TReAlloc_v2(U_diag_j, HYPRE_Int, tmp, HYPRE_Int, capacity_U, HYPRE_MEMORY_DEVICE);
-         U_diag_data = hypre_TReAlloc_v2(U_diag_data, HYPRE_Real, tmp, HYPRE_Real, capacity_U, HYPRE_MEMORY_DEVICE);
+         capacity_U = (HYPRE_Int)(capacity_U * EXPAND_FACT + 1);
+         U_diag_j = hypre_TReAlloc_v2(U_diag_j, HYPRE_Int, tmp,
+                                      HYPRE_Int, capacity_U, memory_location);
+         U_diag_data = hypre_TReAlloc_v2(U_diag_data, HYPRE_Real, tmp,
+                                         HYPRE_Real, capacity_U, memory_location);
       }
-      //hypre_TMemcpy(&(U_diag_j)[ctrU], iU, HYPRE_Int, lenu, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
-      //hypre_TMemcpy(&(U_diag_data)[ctrU], wU, HYPRE_Real, lenu, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
-      hypre_TMemcpy(&(U_diag_j)[ctrU], iU, HYPRE_Int, lenu,
-                    HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
-      hypre_TMemcpy(&(U_diag_data)[ctrU], wU, HYPRE_Real, lenu,
-                    HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
-      U_diag_i[ii+1] = (ctrU+=lenu);
+      hypre_TMemcpy(&(U_diag_j)[ctrU], iU, HYPRE_Int, lenu, memory_location, HYPRE_MEMORY_HOST);
+      hypre_TMemcpy(&(U_diag_data)[ctrU], wU, HYPRE_Real, lenu, memory_location, HYPRE_MEMORY_HOST);
+      U_diag_i[ii + 1] = (ctrU += lenu);
    }
 
    HYPRE_BigInt big_total_rows = (HYPRE_BigInt)total_rows;
@@ -6728,19 +5428,19 @@ hypre_ILUSetupILU0RAS(hypre_ParCSRMatrix *A, HYPRE_Int *perm, HYPRE_Int nLU,
    /* need to get new column start */
    {
       HYPRE_BigInt global_start;
-      hypre_MPI_Scan( &big_total_rows, &global_start, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
+      hypre_MPI_Scan(&big_total_rows, &global_start, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
       col_starts[0] = global_start - total_rows;
       col_starts[1] = global_start;
    }
 
    matL = hypre_ParCSRMatrixCreate( comm,
-         global_num_rows,
-         global_num_rows,
-         col_starts,
-         col_starts,
-         0,
-         ctrL,
-         0 );
+                                    global_num_rows,
+                                    global_num_rows,
+                                    col_starts,
+                                    col_starts,
+                                    0,
+                                    ctrL,
+                                    0 );
 
    L_diag = hypre_ParCSRMatrixDiag(matL);
    hypre_CSRMatrixI(L_diag) = L_diag_i;
@@ -6752,8 +5452,8 @@ hypre_ILUSetupILU0RAS(hypre_ParCSRMatrix *A, HYPRE_Int *perm, HYPRE_Int nLU,
    else
    {
       /* we've allocated some memory, so free if not used */
-      hypre_TFree(L_diag_j,HYPRE_MEMORY_DEVICE);
-      hypre_TFree(L_diag_data,HYPRE_MEMORY_DEVICE);
+      hypre_TFree(L_diag_j, memory_location);
+      hypre_TFree(L_diag_data, memory_location);
    }
    /* store (global) total number of nonzeros */
    local_nnz = (HYPRE_Real) ctrL;
@@ -6761,13 +5461,13 @@ hypre_ILUSetupILU0RAS(hypre_ParCSRMatrix *A, HYPRE_Int *perm, HYPRE_Int nLU,
    hypre_ParCSRMatrixDNumNonzeros(matL) = total_nnz;
 
    matU = hypre_ParCSRMatrixCreate( comm,
-         global_num_rows,
-         global_num_rows,
-         col_starts,
-         col_starts,
-         0,
-         ctrU,
-         0 );
+                                    global_num_rows,
+                                    global_num_rows,
+                                    col_starts,
+                                    col_starts,
+                                    0,
+                                    ctrU,
+                                    0 );
 
    U_diag = hypre_ParCSRMatrixDiag(matU);
    hypre_CSRMatrixI(U_diag) = U_diag_i;
@@ -6779,16 +5479,16 @@ hypre_ILUSetupILU0RAS(hypre_ParCSRMatrix *A, HYPRE_Int *perm, HYPRE_Int nLU,
    else
    {
       /* we've allocated some memory, so free if not used */
-      hypre_TFree(U_diag_j,HYPRE_MEMORY_DEVICE);
-      hypre_TFree(U_diag_data,HYPRE_MEMORY_DEVICE);
+      hypre_TFree(U_diag_j, memory_location);
+      hypre_TFree(U_diag_data, memory_location);
    }
    /* store (global) total number of nonzeros */
    local_nnz = (HYPRE_Real) ctrU;
    hypre_MPI_Allreduce(&local_nnz, &total_nnz, 1, HYPRE_MPI_REAL, hypre_MPI_SUM, comm);
    hypre_ParCSRMatrixDNumNonzeros(matU) = total_nnz;
    /* free memory */
-   hypre_TFree(wL,HYPRE_MEMORY_HOST);
-   hypre_TFree(iw,HYPRE_MEMORY_HOST);
+   hypre_TFree(wL, HYPRE_MEMORY_HOST);
+   hypre_TFree(iw, HYPRE_MEMORY_HOST);
 
    /* free external data */
    if (E_i)
@@ -6809,26 +5509,41 @@ hypre_ILUSetupILU0RAS(hypre_ParCSRMatrix *A, HYPRE_Int *perm, HYPRE_Int nLU,
    return hypre_error_flag;
 }
 
-
-
-/* ILU(k) symbolic factorization for RAS
+/*--------------------------------------------------------------------------
+ * hypre_ILUSetupILUKRASSymbolic
+ *
+ * ILU(k) symbolic factorization for RAS
+ *
  * n = total rows of input
  * lfil = level of fill-in, the k in ILU(k)
- * perm = permutation array indicating ordering of factorization. Perm could come from a
+ * perm = permutation array indicating ordering of factorization.
  * rperm = reverse permutation array, used here to avoid duplicate memory allocation
  * iw = working array, used here to avoid duplicate memory allocation
  * nLU = size of computed LDU factorization.
  * A/L/U/E_i = the I slot of A, L, U and E
  * A/L/U/E_j = the J slot of A, L, U and E
- * will form global Schur Matrix if nLU < n
- */
+ *
+ * Will form global Schur Matrix if nLU < n
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_ILUSetupILUKRASSymbolic(HYPRE_Int n, HYPRE_Int *A_diag_i, HYPRE_Int *A_diag_j, HYPRE_Int *A_offd_i, HYPRE_Int *A_offd_j,
-                              HYPRE_Int *E_i, HYPRE_Int *E_j, HYPRE_Int ext,
-                              HYPRE_Int lfil, HYPRE_Int *perm,
-                              HYPRE_Int *rperm,   HYPRE_Int *iw,   HYPRE_Int nLU,
-                              HYPRE_Int *L_diag_i, HYPRE_Int *U_diag_i,
-                              HYPRE_Int **L_diag_j, HYPRE_Int **U_diag_j)
+hypre_ILUSetupILUKRASSymbolic(HYPRE_Int   n,
+                              HYPRE_Int  *A_diag_i,
+                              HYPRE_Int  *A_diag_j,
+                              HYPRE_Int  *A_offd_i,
+                              HYPRE_Int  *A_offd_j,
+                              HYPRE_Int  *E_i,
+                              HYPRE_Int  *E_j,
+                              HYPRE_Int   ext,
+                              HYPRE_Int   lfil,
+                              HYPRE_Int  *perm,
+                              HYPRE_Int  *rperm,
+                              HYPRE_Int  *iw,
+                              HYPRE_Int   nLU,
+                              HYPRE_Int  *L_diag_i,
+                              HYPRE_Int  *U_diag_i,
+                              HYPRE_Int **L_diag_j,
+                              HYPRE_Int **U_diag_j)
 {
    /*
     * 1: Setup and create buffers
@@ -6855,23 +5570,27 @@ hypre_ILUSetupILUKRASSymbolic(HYPRE_Int n, HYPRE_Int *A_diag_i, HYPRE_Int *A_dia
    HYPRE_Int      capacity_U;
    HYPRE_Int      initial_alloc = 0;
    HYPRE_Int      nnz_A;
+   HYPRE_MemoryLocation memory_location;
+
+   /* Get default memory location */
+   HYPRE_GetMemoryLocation(&memory_location);
 
    /* set iL and iLev to right place in iw array */
    iL             = iw + total_rows;
-   iLev           = iw + 2*total_rows;
+   iLev           = iw + 2 * total_rows;
 
    /* setup initial memory used */
    nnz_A          = A_diag_i[n];
    if (n > 0)
    {
-      initial_alloc  = (n + ext) + ceil((nnz_A / 2.0) * total_rows / n);
+      initial_alloc  = (HYPRE_Int)((n + ext) + hypre_ceil((nnz_A / 2.0) * total_rows / n));
    }
    capacity_L     = initial_alloc;
    capacity_U     = initial_alloc;
 
    /* allocate other memory for L and U struct */
-   temp_L_diag_j  = hypre_CTAlloc(HYPRE_Int, capacity_L, HYPRE_MEMORY_DEVICE);
-   temp_U_diag_j  = hypre_CTAlloc(HYPRE_Int, capacity_U, HYPRE_MEMORY_DEVICE);
+   temp_L_diag_j  = hypre_CTAlloc(HYPRE_Int, capacity_L, memory_location);
+   temp_U_diag_j  = hypre_CTAlloc(HYPRE_Int, capacity_U, memory_location);
 
    u_levels       = hypre_CTAlloc(HYPRE_Int, capacity_U, HYPRE_MEMORY_HOST);
    ctrL = ctrU = 0;
@@ -6892,7 +5611,7 @@ hypre_ILUSetupILUKRASSymbolic(HYPRE_Int n, HYPRE_Int *A_diag_i, HYPRE_Int *A_dia
       lenl = 0;
       lenh = 0;/* this is the current length of heap */
       lenu = ii;
-      lena = A_diag_i[i+1];
+      lena = A_diag_i[i + 1];
       /* put those already inside original pattern, and set their level to 0 */
       for (j = A_diag_i[i]; j < lena; j++)
       {
@@ -6908,7 +5627,7 @@ hypre_ILUSetupILUKRASSymbolic(HYPRE_Int n, HYPRE_Int *A_diag_i, HYPRE_Int *A_dia
             iLev[lenh] = 0;
             iw[col] = lenh++;
             /*now miantian a heap structure*/
-            hypre_ILUMinHeapAddIIIi(iL,iLev,iw,lenh);
+            hypre_ILUMinHeapAddIIIi(iL, iLev, iw, lenh);
          }
          else if (col > ii)
          {
@@ -6933,18 +5652,18 @@ hypre_ILUSetupILUKRASSymbolic(HYPRE_Int n, HYPRE_Int *A_diag_i, HYPRE_Int *A_dia
          /*
           * we now need to maintain the heap structure
           */
-         hypre_ILUMinHeapRemoveIIIi(iL,iLev,iw,lenh);
+         hypre_ILUMinHeapRemoveIIIi(iL, iLev, iw, lenh);
          lenh--;
          /* copy to the end of array */
          lenl++;
          /* reset iw for that, not using anymore */
-         iw[k]=-1;
-         hypre_swap2i(iL,iLev,ii-lenl,lenh);
+         iw[k] = -1;
+         hypre_swap2i(iL, iLev, ii - lenl, lenh);
          /*
           * now the elimination on current row could start.
           * eliminate row k (new index) from current row
           */
-         ku = U_diag_i[k+1];
+         ku = U_diag_i[k + 1];
          for (j = U_diag_i[k]; j < ku; j++)
          {
             col = temp_U_diag_j[j];
@@ -6971,7 +5690,7 @@ hypre_ILUSetupILUKRASSymbolic(HYPRE_Int n, HYPRE_Int *A_diag_i, HYPRE_Int *A_dia
                   /*swap it with the element right after the heap*/
 
                   /* maintain the heap */
-                  hypre_ILUMinHeapAddIIIi(iL,iLev,iw,lenh);
+                  hypre_ILUMinHeapAddIIIi(iL, iLev, iw, lenh);
                }
                else if (col > ii)
                {
@@ -6988,39 +5707,41 @@ hypre_ILUSetupILUKRASSymbolic(HYPRE_Int n, HYPRE_Int *A_diag_i, HYPRE_Int *A_dia
       }/* end of while loop for iith row */
 
       /* now update everything, indices, levels and so */
-      L_diag_i[ii+1] = L_diag_i[ii] + lenl;
+      L_diag_i[ii + 1] = L_diag_i[ii] + lenl;
       if (lenl > 0)
       {
          /* check if memory is enough */
          while (ctrL + lenl > capacity_L)
          {
             HYPRE_Int tmp = capacity_L;
-            capacity_L = capacity_L * EXPAND_FACT + 1;
-            temp_L_diag_j = hypre_TReAlloc_v2(temp_L_diag_j, HYPRE_Int, tmp, HYPRE_Int, capacity_L, HYPRE_MEMORY_DEVICE);
+            capacity_L = (HYPRE_Int)(capacity_L * EXPAND_FACT + 1);
+            temp_L_diag_j = hypre_TReAlloc_v2(temp_L_diag_j, HYPRE_Int, tmp, HYPRE_Int, capacity_L,
+                                              memory_location);
          }
          /* now copy L data, reverse order */
          for (j = 0; j < lenl; j++)
          {
-            temp_L_diag_j[ctrL+j] = iL[ii-j-1];
+            temp_L_diag_j[ctrL + j] = iL[ii - j - 1];
          }
          ctrL += lenl;
       }
       k = lenu - ii;
-      U_diag_i[ii+1] = U_diag_i[ii] + k;
+      U_diag_i[ii + 1] = U_diag_i[ii] + k;
       if (k > 0)
       {
          /* check if memory is enough */
          while (ctrU + k > capacity_U)
          {
             HYPRE_Int tmp = capacity_U;
-            capacity_U = capacity_U * EXPAND_FACT + 1;
-            temp_U_diag_j = hypre_TReAlloc_v2(temp_U_diag_j, HYPRE_Int, tmp, HYPRE_Int, capacity_U, HYPRE_MEMORY_DEVICE);
+            capacity_U = (HYPRE_Int)(capacity_U * EXPAND_FACT + 1);
+            temp_U_diag_j = hypre_TReAlloc_v2(temp_U_diag_j, HYPRE_Int, tmp, HYPRE_Int, capacity_U,
+                                              memory_location);
             u_levels = hypre_TReAlloc_v2(u_levels, HYPRE_Int, tmp, HYPRE_Int, capacity_U, HYPRE_MEMORY_HOST);
          }
-         //hypre_TMemcpy(temp_U_diag_j+ctrU,iL+ii,HYPRE_Int,k,HYPRE_MEMORY_DEVICE,HYPRE_MEMORY_HOST);
-         hypre_TMemcpy(temp_U_diag_j+ctrU, iL+ii, HYPRE_Int, k,
-                       HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
-         hypre_TMemcpy(u_levels+ctrU, iLev+ii, HYPRE_Int, k,
+         //hypre_TMemcpy(temp_U_diag_j+ctrU,iL+ii,HYPRE_Int,k,memory_location,HYPRE_MEMORY_HOST);
+         hypre_TMemcpy(temp_U_diag_j + ctrU, iL + ii, HYPRE_Int, k,
+                       memory_location, HYPRE_MEMORY_HOST);
+         hypre_TMemcpy(u_levels + ctrU, iLev + ii, HYPRE_Int, k,
                        HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
          ctrU += k;
       }
@@ -7042,7 +5763,7 @@ hypre_ILUSetupILUKRASSymbolic(HYPRE_Int n, HYPRE_Int *A_diag_i, HYPRE_Int *A_dia
       lenl = 0;
       lenh = 0;/* this is the current length of heap */
       lenu = ii;
-      lena = A_diag_i[i+1];
+      lena = A_diag_i[i + 1];
       /* put those already inside original pattern, and set their level to 0 */
       for (j = A_diag_i[i]; j < lena; j++)
       {
@@ -7058,7 +5779,7 @@ hypre_ILUSetupILUKRASSymbolic(HYPRE_Int n, HYPRE_Int *A_diag_i, HYPRE_Int *A_dia
             iLev[lenh] = 0;
             iw[col] = lenh++;
             /*now miantian a heap structure*/
-            hypre_ILUMinHeapAddIIIi(iL,iLev,iw,lenh);
+            hypre_ILUMinHeapAddIIIi(iL, iLev, iw, lenh);
          }
          else if (col > ii)
          {
@@ -7070,7 +5791,7 @@ hypre_ILUSetupILUKRASSymbolic(HYPRE_Int n, HYPRE_Int *A_diag_i, HYPRE_Int *A_dia
       }/* end of j loop for adding pattern in original matrix */
 
       /* put those already inside offd pattern in, and set their level to 0 */
-      lena = A_offd_i[i+1];
+      lena = A_offd_i[i + 1];
       for (j = A_offd_i[i]; j < lena; j++)
       {
          /* the offd cols are in order */
@@ -7095,18 +5816,18 @@ hypre_ILUSetupILUKRASSymbolic(HYPRE_Int n, HYPRE_Int *A_diag_i, HYPRE_Int *A_dia
          /*
           * we now need to maintain the heap structure
           */
-         hypre_ILUMinHeapRemoveIIIi(iL,iLev,iw,lenh);
+         hypre_ILUMinHeapRemoveIIIi(iL, iLev, iw, lenh);
          lenh--;
          /* copy to the end of array */
          lenl++;
          /* reset iw for that, not using anymore */
-         iw[k]=-1;
-         hypre_swap2i(iL,iLev,ii-lenl,lenh);
+         iw[k] = -1;
+         hypre_swap2i(iL, iLev, ii - lenl, lenh);
          /*
           * now the elimination on current row could start.
           * eliminate row k (new index) from current row
           */
-         ku = U_diag_i[k+1];
+         ku = U_diag_i[k + 1];
          for (j = U_diag_i[k]; j < ku; j++)
          {
             col = temp_U_diag_j[j];
@@ -7133,7 +5854,7 @@ hypre_ILUSetupILUKRASSymbolic(HYPRE_Int n, HYPRE_Int *A_diag_i, HYPRE_Int *A_dia
                   /*swap it with the element right after the heap*/
 
                   /* maintain the heap */
-                  hypre_ILUMinHeapAddIIIi(iL,iLev,iw,lenh);
+                  hypre_ILUMinHeapAddIIIi(iL, iLev, iw, lenh);
                }
                else if (col > ii)
                {
@@ -7150,40 +5871,39 @@ hypre_ILUSetupILUKRASSymbolic(HYPRE_Int n, HYPRE_Int *A_diag_i, HYPRE_Int *A_dia
       }/* end of while loop for iith row */
 
       /* now update everything, indices, levels and so */
-      L_diag_i[ii+1] = L_diag_i[ii] + lenl;
+      L_diag_i[ii + 1] = L_diag_i[ii] + lenl;
       if (lenl > 0)
       {
          /* check if memory is enough */
          while (ctrL + lenl > capacity_L)
          {
             HYPRE_Int tmp = capacity_L;
-            capacity_L = capacity_L * EXPAND_FACT + 1;
-            temp_L_diag_j = hypre_TReAlloc_v2(temp_L_diag_j, HYPRE_Int, tmp, HYPRE_Int, capacity_L, HYPRE_MEMORY_DEVICE);
+            capacity_L = (HYPRE_Int)(capacity_L * EXPAND_FACT + 1);
+            temp_L_diag_j = hypre_TReAlloc_v2(temp_L_diag_j, HYPRE_Int, tmp, HYPRE_Int, capacity_L,
+                                              memory_location);
          }
          /* now copy L data, reverse order */
          for (j = 0; j < lenl; j++)
          {
-            temp_L_diag_j[ctrL+j] = iL[ii-j-1];
+            temp_L_diag_j[ctrL + j] = iL[ii - j - 1];
          }
          ctrL += lenl;
       }
       k = lenu - ii;
-      U_diag_i[ii+1] = U_diag_i[ii] + k;
+      U_diag_i[ii + 1] = U_diag_i[ii] + k;
       if (k > 0)
       {
          /* check if memory is enough */
          while (ctrU + k > capacity_U)
          {
             HYPRE_Int tmp = capacity_U;
-            capacity_U = capacity_U * EXPAND_FACT + 1;
-            temp_U_diag_j = hypre_TReAlloc_v2(temp_U_diag_j, HYPRE_Int, tmp, HYPRE_Int, capacity_U, HYPRE_MEMORY_DEVICE);
+            capacity_U = (HYPRE_Int)(capacity_U * EXPAND_FACT + 1);
+            temp_U_diag_j = hypre_TReAlloc_v2(temp_U_diag_j, HYPRE_Int, tmp, HYPRE_Int, capacity_U,
+                                              memory_location);
             u_levels = hypre_TReAlloc_v2(u_levels, HYPRE_Int, tmp, HYPRE_Int, capacity_U, HYPRE_MEMORY_HOST);
          }
-         //hypre_TMemcpy(temp_U_diag_j+ctrU,iL+ii,HYPRE_Int,k,HYPRE_MEMORY_DEVICE,HYPRE_MEMORY_HOST);
-         hypre_TMemcpy(temp_U_diag_j+ctrU, iL+ii, HYPRE_Int, k,
-                       HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
-         hypre_TMemcpy(u_levels+ctrU, iLev+ii, HYPRE_Int, k,
-                       HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
+         hypre_TMemcpy(temp_U_diag_j + ctrU, iL + ii, HYPRE_Int, k, memory_location, HYPRE_MEMORY_HOST);
+         hypre_TMemcpy(u_levels + ctrU, iLev + ii, HYPRE_Int, k, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
          ctrU += k;
       }
 
@@ -7195,13 +5915,13 @@ hypre_ILUSetupILUKRASSymbolic(HYPRE_Int n, HYPRE_Int *A_diag_i, HYPRE_Int *A_dia
    } /* end of main loop ii from nLU to n */
 
    /* external part matrix */
-   for (ii = n ; ii < total_rows ; ii ++)
+   for (ii = n; ii < total_rows; ii++)
    {
       i = ii - n;
       lenl = 0;
       lenh = 0;/* this is the current length of heap */
       lenu = ii;
-      lena = E_i[i+1];
+      lena = E_i[i + 1];
       /* put those already inside original pattern, and set their level to 0 */
       for (j = E_i[i]; j < lena; j++)
       {
@@ -7217,7 +5937,7 @@ hypre_ILUSetupILUKRASSymbolic(HYPRE_Int n, HYPRE_Int *A_diag_i, HYPRE_Int *A_dia
             iLev[lenh] = 0;
             iw[col] = lenh++;
             /*now miantian a heap structure*/
-            hypre_ILUMinHeapAddIIIi(iL,iLev,iw,lenh);
+            hypre_ILUMinHeapAddIIIi(iL, iLev, iw, lenh);
          }
          else if (col > ii)
          {
@@ -7242,18 +5962,18 @@ hypre_ILUSetupILUKRASSymbolic(HYPRE_Int n, HYPRE_Int *A_diag_i, HYPRE_Int *A_dia
          /*
           * we now need to maintain the heap structure
           */
-         hypre_ILUMinHeapRemoveIIIi(iL,iLev,iw,lenh);
+         hypre_ILUMinHeapRemoveIIIi(iL, iLev, iw, lenh);
          lenh--;
          /* copy to the end of array */
          lenl++;
          /* reset iw for that, not using anymore */
-         iw[k]=-1;
-         hypre_swap2i(iL,iLev,ii-lenl,lenh);
+         iw[k] = -1;
+         hypre_swap2i(iL, iLev, ii - lenl, lenh);
          /*
           * now the elimination on current row could start.
           * eliminate row k (new index) from current row
           */
-         ku = U_diag_i[k+1];
+         ku = U_diag_i[k + 1];
          for (j = U_diag_i[k]; j < ku; j++)
          {
             col = temp_U_diag_j[j];
@@ -7280,7 +6000,7 @@ hypre_ILUSetupILUKRASSymbolic(HYPRE_Int n, HYPRE_Int *A_diag_i, HYPRE_Int *A_dia
                   /*swap it with the element right after the heap*/
 
                   /* maintain the heap */
-                  hypre_ILUMinHeapAddIIIi(iL,iLev,iw,lenh);
+                  hypre_ILUMinHeapAddIIIi(iL, iLev, iw, lenh);
                }
                else if (col > ii)
                {
@@ -7297,40 +6017,39 @@ hypre_ILUSetupILUKRASSymbolic(HYPRE_Int n, HYPRE_Int *A_diag_i, HYPRE_Int *A_dia
       }/* end of while loop for iith row */
 
       /* now update everything, indices, levels and so */
-      L_diag_i[ii+1] = L_diag_i[ii] + lenl;
+      L_diag_i[ii + 1] = L_diag_i[ii] + lenl;
       if (lenl > 0)
       {
          /* check if memory is enough */
          while (ctrL + lenl > capacity_L)
          {
             HYPRE_Int tmp = capacity_L;
-            capacity_L = capacity_L * EXPAND_FACT + 1;
-            temp_L_diag_j = hypre_TReAlloc_v2(temp_L_diag_j, HYPRE_Int, tmp, HYPRE_Int, capacity_L, HYPRE_MEMORY_DEVICE);
+            capacity_L = (HYPRE_Int)(capacity_L * EXPAND_FACT + 1);
+            temp_L_diag_j = hypre_TReAlloc_v2(temp_L_diag_j, HYPRE_Int, tmp, HYPRE_Int, capacity_L,
+                                              memory_location);
          }
          /* now copy L data, reverse order */
          for (j = 0; j < lenl; j++)
          {
-            temp_L_diag_j[ctrL+j] = iL[ii-j-1];
+            temp_L_diag_j[ctrL + j] = iL[ii - j - 1];
          }
          ctrL += lenl;
       }
       k = lenu - ii;
-      U_diag_i[ii+1] = U_diag_i[ii] + k;
+      U_diag_i[ii + 1] = U_diag_i[ii] + k;
       if (k > 0)
       {
          /* check if memory is enough */
          while (ctrU + k > capacity_U)
          {
             HYPRE_Int tmp = capacity_U;
-            capacity_U = capacity_U * EXPAND_FACT + 1;
-            temp_U_diag_j = hypre_TReAlloc_v2(temp_U_diag_j, HYPRE_Int, tmp, HYPRE_Int, capacity_U, HYPRE_MEMORY_DEVICE);
+            capacity_U = (HYPRE_Int)(capacity_U * EXPAND_FACT + 1);
+            temp_U_diag_j = hypre_TReAlloc_v2(temp_U_diag_j, HYPRE_Int, tmp, HYPRE_Int, capacity_U,
+                                              memory_location);
             u_levels = hypre_TReAlloc_v2(u_levels, HYPRE_Int, tmp, HYPRE_Int, capacity_U, HYPRE_MEMORY_HOST);
          }
-         //hypre_TMemcpy(temp_U_diag_j+ctrU,iL+ii,HYPRE_Int,k,HYPRE_MEMORY_DEVICE,HYPRE_MEMORY_HOST);
-         hypre_TMemcpy(temp_U_diag_j+ctrU, iL+ii, HYPRE_Int, k,
-                       HYPRE_MEMORY_HOST,HYPRE_MEMORY_HOST);
-         hypre_TMemcpy(u_levels+ctrU, iLev+ii, HYPRE_Int, k,
-                       HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
+         hypre_TMemcpy(temp_U_diag_j + ctrU, iL + ii, HYPRE_Int, k, memory_location, HYPRE_MEMORY_HOST);
+         hypre_TMemcpy(u_levels + ctrU, iLev + ii, HYPRE_Int, k, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
          ctrU += k;
       }
 
@@ -7345,7 +6064,7 @@ hypre_ILUSetupILUKRASSymbolic(HYPRE_Int n, HYPRE_Int *A_diag_i, HYPRE_Int *A_dia
    /*
     * 3: Finishing up and free memory
     */
-   hypre_TFree(u_levels,HYPRE_MEMORY_HOST);
+   hypre_TFree(u_levels, HYPRE_MEMORY_HOST);
 
    *L_diag_j = temp_L_diag_j;
    *U_diag_j = temp_U_diag_j;
@@ -7353,17 +6072,27 @@ hypre_ILUSetupILUKRASSymbolic(HYPRE_Int n, HYPRE_Int *A_diag_i, HYPRE_Int *A_dia
    return hypre_error_flag;
 }
 
-/* ILU(k) for RAS
+/*--------------------------------------------------------------------------
+ * hypre_ILUSetupILUKRAS
+ *
+ * ILU(k) numeric factorization for RAS
+ *
  * A: input matrix
  * lfil: level of fill-in, the k in ILU(k)
- * perm: permutation array indicating ordering of factorization. Perm could come from a
- * CF_marker: array or a reordering routine.
+ * perm: permutation array indicating ordering of factorization.
+ *       Perm could come from a CF_marker array or a reordering routine.
  * nLU: size of computed LDU factorization.
  * Lptr, Dptr, Uptr: L, D, U factors.
- */
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_ILUSetupILUKRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *perm, HYPRE_Int nLU,
-      hypre_ParCSRMatrix **Lptr, HYPRE_Real** Dptr, hypre_ParCSRMatrix **Uptr)
+hypre_ILUSetupILUKRAS(hypre_ParCSRMatrix  *A,
+                      HYPRE_Int            lfil,
+                      HYPRE_Int           *perm,
+                      HYPRE_Int            nLU,
+                      hypre_ParCSRMatrix **Lptr,
+                      HYPRE_Real         **Dptr,
+                      hypre_ParCSRMatrix **Uptr)
 {
    /*
     * 1: Setup and create buffers
@@ -7379,8 +6108,9 @@ hypre_ILUSetupILUKRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *perm, HY
    /* call ILU0 if lfil is 0 */
    if (lfil == 0)
    {
-      return hypre_ILUSetupILU0RAS(A,perm,nLU,Lptr,Dptr,Uptr);
+      return hypre_ILUSetupILU0RAS(A, perm, nLU, Lptr, Dptr, Uptr);
    }
+
    HYPRE_Int               i, ii, j, k, k1, k2, kl, ku, jpiv, col, icol;
    HYPRE_Int               *iw;
    MPI_Comm                comm           = hypre_ParCSRMatrixComm(A);
@@ -7395,6 +6125,7 @@ hypre_ILUSetupILUKRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *perm, HY
    HYPRE_Real              *A_offd_data   = hypre_CSRMatrixData(A_offd);
    HYPRE_Int               *A_offd_i      = hypre_CSRMatrixI(A_offd);
    HYPRE_Int               *A_offd_j      = hypre_CSRMatrixJ(A_offd);
+   HYPRE_MemoryLocation     memory_location = hypre_ParCSRMatrixMemoryLocation(A);
 
    /* data objects for L, D, U */
    hypre_ParCSRMatrix      *matL;
@@ -7411,7 +6142,6 @@ hypre_ILUSetupILUKRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *perm, HY
 
    /* size of problem and external matrix */
    HYPRE_Int               n              = hypre_CSRMatrixNumRows(A_diag);
-   //   HYPRE_Int               m              = n - nLU;
    HYPRE_Int               ext            = hypre_CSRMatrixNumCols(A_offd);
    HYPRE_Int               total_rows     = n + ext;
    HYPRE_BigInt            global_num_rows;
@@ -7426,8 +6156,6 @@ hypre_ILUSetupILUKRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *perm, HY
    /* communication */
    hypre_ParCSRCommPkg     *comm_pkg;
    hypre_MPI_Comm_size(comm, &num_procs);
-   //   hypre_ParCSRCommHandle  *comm_handle;
-   //   HYPRE_Int               *send_buf      = NULL;
 
    /* reverse permutation array */
    HYPRE_Int               *rperm;
@@ -7439,13 +6167,13 @@ hypre_ILUSetupILUKRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *perm, HY
    n =  hypre_CSRMatrixNumRows(A_diag);
    if (nLU < 0 || nLU > n)
    {
-      hypre_error_w_msg(HYPRE_ERROR_ARG,"WARNING: nLU out of range.\n");
+      hypre_error_w_msg(HYPRE_ERROR_ARG, "WARNING: nLU out of range.\n");
    }
 
    /* Init I array anyway. S's might be freed later */
-   D_data   = hypre_CTAlloc(HYPRE_Real, total_rows, HYPRE_MEMORY_DEVICE);
-   L_diag_i = hypre_CTAlloc(HYPRE_Int, (total_rows+1), HYPRE_MEMORY_DEVICE);
-   U_diag_i = hypre_CTAlloc(HYPRE_Int, (total_rows+1), HYPRE_MEMORY_DEVICE);
+   D_data   = hypre_CTAlloc(HYPRE_Real, total_rows, memory_location);
+   L_diag_i = hypre_CTAlloc(HYPRE_Int, (total_rows + 1), memory_location);
+   U_diag_i = hypre_CTAlloc(HYPRE_Int, (total_rows + 1), memory_location);
 
    /* set Comm_Pkg if not yet built */
    comm_pkg = hypre_ParCSRMatrixCommPkg(A);
@@ -7460,10 +6188,10 @@ hypre_ILUSetupILUKRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *perm, HY
     * setup iw and rperm first
     */
    /* allocate work arrays */
-   iw          = hypre_CTAlloc(HYPRE_Int, 5*total_rows, HYPRE_MEMORY_HOST);
-   rperm       = iw + 3*total_rows;
+   iw          = hypre_CTAlloc(HYPRE_Int, 5 * total_rows, HYPRE_MEMORY_HOST);
+   rperm       = iw + 3 * total_rows;
    perm_old    = perm;
-   perm        = iw + 4*total_rows;
+   perm        = iw + 4 * total_rows;
    L_diag_i[0] = U_diag_i[0] = 0;
    /* get reverse permutation (rperm).
     * rperm holds the reordered indexes.
@@ -7482,10 +6210,11 @@ hypre_ILUSetupILUKRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *perm, HY
    }
 
    /* get external rows */
-   hypre_ILUBuildRASExternalMatrix(A,rperm,&E_i,&E_j,&E_data);
+   hypre_ILUBuildRASExternalMatrix(A, rperm, &E_i, &E_j, &E_data);
    /* do symbolic factorization */
-   hypre_ILUSetupILUKRASSymbolic(n, A_diag_i, A_diag_j, A_offd_i, A_offd_j, E_i, E_j, ext, lfil, perm, rperm, iw,
-         nLU, L_diag_i, U_diag_i, &L_diag_j, &U_diag_j);
+   hypre_ILUSetupILUKRASSymbolic(n, A_diag_i, A_diag_j, A_offd_i, A_offd_j, E_i, E_j, ext, lfil, perm,
+                                 rperm, iw,
+                                 nLU, L_diag_i, U_diag_i, &L_diag_j, &U_diag_j);
 
    /*
     * after this, we have our I,J for L, U and S ready, and L sorted
@@ -7494,11 +6223,11 @@ hypre_ILUSetupILUKRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *perm, HY
     */
    if (L_diag_i[total_rows])
    {
-      L_diag_data = hypre_CTAlloc(HYPRE_Real, L_diag_i[total_rows], HYPRE_MEMORY_DEVICE);
+      L_diag_data = hypre_CTAlloc(HYPRE_Real, L_diag_i[total_rows], memory_location);
    }
    if (U_diag_i[total_rows])
    {
-      U_diag_data = hypre_CTAlloc(HYPRE_Real, U_diag_i[total_rows], HYPRE_MEMORY_DEVICE);
+      U_diag_data = hypre_CTAlloc(HYPRE_Real, U_diag_i[total_rows], memory_location);
    }
 
    /*
@@ -7510,10 +6239,10 @@ hypre_ILUSetupILUKRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *perm, HY
    {
       // get row i
       i = perm[ii];
-      kl = L_diag_i[ii+1];
-      ku = U_diag_i[ii+1];
+      kl = L_diag_i[ii + 1];
+      ku = U_diag_i[ii + 1];
       k1 = A_diag_i[i];
-      k2 = A_diag_i[i+1];
+      k2 = A_diag_i[i + 1];
       /* set up working arrays */
       for (j = L_diag_i[ii]; j < kl; j++)
       {
@@ -7552,7 +6281,7 @@ hypre_ILUSetupILUKRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *perm, HY
       {
          jpiv = L_diag_j[j];
          L_diag_data[j] *= D_data[jpiv];
-         ku = U_diag_i[jpiv+1];
+         ku = U_diag_i[jpiv + 1];
 
          for (k = U_diag_i[jpiv]; k < ku; k++)
          {
@@ -7566,22 +6295,22 @@ hypre_ILUSetupILUKRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *perm, HY
             if (col < ii)
             {
                /* L part */
-               L_diag_data[icol] -= L_diag_data[j]*U_diag_data[k];
+               L_diag_data[icol] -= L_diag_data[j] * U_diag_data[k];
             }
             else if (col == ii)
             {
                /* diag part */
-               D_data[icol] -= L_diag_data[j]*U_diag_data[k];
+               D_data[icol] -= L_diag_data[j] * U_diag_data[k];
             }
             else
             {
                /* U part */
-               U_diag_data[icol] -= L_diag_data[j]*U_diag_data[k];
+               U_diag_data[icol] -= L_diag_data[j] * U_diag_data[k];
             }
          }
       }
       /* reset working array */
-      ku = U_diag_i[ii+1];
+      ku = U_diag_i[ii + 1];
       for (j = L_diag_i[ii]; j < kl; j++)
       {
          col = L_diag_j[j];
@@ -7595,11 +6324,11 @@ hypre_ILUSetupILUKRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *perm, HY
       }
 
       /* diagonal part (we store the inverse) */
-      if (fabs(D_data[ii]) < MAT_TOL)
+      if (hypre_abs(D_data[ii]) < MAT_TOL)
       {
-         D_data[ii] = 1e-06;
+         D_data[ii] = 1.0e-06;
       }
-      D_data[ii] = 1./ D_data[ii];
+      D_data[ii] = 1. / D_data[ii];
 
    }/* end of loop for upper part */
 
@@ -7608,8 +6337,8 @@ hypre_ILUSetupILUKRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *perm, HY
    {
       // get row i
       i = perm[ii];
-      kl = L_diag_i[ii+1];
-      ku = U_diag_i[ii+1];
+      kl = L_diag_i[ii + 1];
+      ku = U_diag_i[ii + 1];
       /* set up working arrays */
       for (j = L_diag_i[ii]; j < kl; j++)
       {
@@ -7625,7 +6354,7 @@ hypre_ILUSetupILUKRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *perm, HY
       }
       /* copy data from A into L, D and U */
       k1 = A_diag_i[i];
-      k2 = A_diag_i[i+1];
+      k2 = A_diag_i[i + 1];
       for (j = k1; j < k2; j++)
       {
          /* compute everything in new index */
@@ -7647,7 +6376,7 @@ hypre_ILUSetupILUKRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *perm, HY
       }
       /* copy data from A_offd into L, D and U */
       k1 = A_offd_i[i];
-      k2 = A_offd_i[i+1];
+      k2 = A_offd_i[i + 1];
       for (j = k1; j < k2; j++)
       {
          /* compute everything in new index */
@@ -7660,7 +6389,7 @@ hypre_ILUSetupILUKRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *perm, HY
       {
          jpiv = L_diag_j[j];
          L_diag_data[j] *= D_data[jpiv];
-         ku = U_diag_i[jpiv+1];
+         ku = U_diag_i[jpiv + 1];
 
          for (k = U_diag_i[jpiv]; k < ku; k++)
          {
@@ -7674,22 +6403,22 @@ hypre_ILUSetupILUKRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *perm, HY
             if (col < ii)
             {
                /* L part */
-               L_diag_data[icol] -= L_diag_data[j]*U_diag_data[k];
+               L_diag_data[icol] -= L_diag_data[j] * U_diag_data[k];
             }
             else if (col == ii)
             {
                /* diag part */
-               D_data[icol] -= L_diag_data[j]*U_diag_data[k];
+               D_data[icol] -= L_diag_data[j] * U_diag_data[k];
             }
             else
             {
                /* U part */
-               U_diag_data[icol] -= L_diag_data[j]*U_diag_data[k];
+               U_diag_data[icol] -= L_diag_data[j] * U_diag_data[k];
             }
          }
       }
       /* reset working array */
-      ku = U_diag_i[ii+1];
+      ku = U_diag_i[ii + 1];
       for (j = L_diag_i[ii]; j < kl; j++)
       {
          col = L_diag_j[j];
@@ -7703,11 +6432,11 @@ hypre_ILUSetupILUKRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *perm, HY
       }
 
       /* diagonal part (we store the inverse) */
-      if (fabs(D_data[ii]) < MAT_TOL)
+      if (hypre_abs(D_data[ii]) < MAT_TOL)
       {
-         D_data[ii] = 1e-06;
+         D_data[ii] = 1.0e-06;
       }
-      D_data[ii] = 1./ D_data[ii];
+      D_data[ii] = 1. / D_data[ii];
 
    }/* end of loop for lower part */
 
@@ -7716,10 +6445,10 @@ hypre_ILUSetupILUKRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *perm, HY
    {
       // get row i
       i = ii - n;
-      kl = L_diag_i[ii+1];
-      ku = U_diag_i[ii+1];
+      kl = L_diag_i[ii + 1];
+      ku = U_diag_i[ii + 1];
       k1 = E_i[i];
-      k2 = E_i[i+1];
+      k2 = E_i[i + 1];
       /* set up working arrays */
       for (j = L_diag_i[ii]; j < kl; j++)
       {
@@ -7758,7 +6487,7 @@ hypre_ILUSetupILUKRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *perm, HY
       {
          jpiv = L_diag_j[j];
          L_diag_data[j] *= D_data[jpiv];
-         ku = U_diag_i[jpiv+1];
+         ku = U_diag_i[jpiv + 1];
 
          for (k = U_diag_i[jpiv]; k < ku; k++)
          {
@@ -7772,22 +6501,22 @@ hypre_ILUSetupILUKRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *perm, HY
             if (col < ii)
             {
                /* L part */
-               L_diag_data[icol] -= L_diag_data[j]*U_diag_data[k];
+               L_diag_data[icol] -= L_diag_data[j] * U_diag_data[k];
             }
             else if (col == ii)
             {
                /* diag part */
-               D_data[icol] -= L_diag_data[j]*U_diag_data[k];
+               D_data[icol] -= L_diag_data[j] * U_diag_data[k];
             }
             else
             {
                /* U part */
-               U_diag_data[icol] -= L_diag_data[j]*U_diag_data[k];
+               U_diag_data[icol] -= L_diag_data[j] * U_diag_data[k];
             }
          }
       }
       /* reset working array */
-      ku = U_diag_i[ii+1];
+      ku = U_diag_i[ii + 1];
       for (j = L_diag_i[ii]; j < kl; j++)
       {
          col = L_diag_j[j];
@@ -7801,11 +6530,11 @@ hypre_ILUSetupILUKRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *perm, HY
       }
 
       /* diagonal part (we store the inverse) */
-      if (fabs(D_data[ii]) < MAT_TOL)
+      if (hypre_abs(D_data[ii]) < MAT_TOL)
       {
-         D_data[ii] = 1e-06;
+         D_data[ii] = 1.0e-06;
       }
-      D_data[ii] = 1./ D_data[ii];
+      D_data[ii] = 1. / D_data[ii];
 
    }/* end of loop for external loop */
 
@@ -7813,27 +6542,28 @@ hypre_ILUSetupILUKRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *perm, HY
     * 4: Finishing up and free
     */
    HYPRE_BigInt big_total_rows = (HYPRE_BigInt)total_rows;
-   hypre_MPI_Allreduce( &big_total_rows, &global_num_rows, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
+   hypre_MPI_Allreduce(&big_total_rows, &global_num_rows, 1, HYPRE_MPI_BIG_INT,
+                       hypre_MPI_SUM, comm);
    /* need to get new column start */
    {
       HYPRE_BigInt global_start;
-      hypre_MPI_Scan( &big_total_rows, &global_start, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
+      hypre_MPI_Scan(&big_total_rows, &global_start, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
       col_starts[0] = global_start - total_rows;
       col_starts[1] = global_start;
    }
    /* Assemble LDU matrices */
    matL = hypre_ParCSRMatrixCreate( comm,
-         global_num_rows,
-         global_num_rows,
-         col_starts,
-         col_starts,
-         0 /* num_cols_offd */,
-         L_diag_i[total_rows],
-         0 /* num_nonzeros_offd */);
+                                    global_num_rows,
+                                    global_num_rows,
+                                    col_starts,
+                                    col_starts,
+                                    0 /* num_cols_offd */,
+                                    L_diag_i[total_rows],
+                                    0 /* num_nonzeros_offd */);
 
    L_diag = hypre_ParCSRMatrixDiag(matL);
    hypre_CSRMatrixI(L_diag) = L_diag_i;
-   if (L_diag_i[total_rows]>0)
+   if (L_diag_i[total_rows] > 0)
    {
       hypre_CSRMatrixData(L_diag) = L_diag_data;
       hypre_CSRMatrixJ(L_diag) = L_diag_j;
@@ -7841,7 +6571,7 @@ hypre_ILUSetupILUKRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *perm, HY
    else
    {
       /* we allocated some initial length, so free them */
-      hypre_TFree(L_diag_j, HYPRE_MEMORY_DEVICE);
+      hypre_TFree(L_diag_j, memory_location);
    }
    /* store (global) total number of nonzeros */
    local_nnz = (HYPRE_Real) (L_diag_i[total_rows]);
@@ -7849,17 +6579,17 @@ hypre_ILUSetupILUKRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *perm, HY
    hypre_ParCSRMatrixDNumNonzeros(matL) = total_nnz;
 
    matU = hypre_ParCSRMatrixCreate( comm,
-         global_num_rows,
-         global_num_rows,
-         col_starts,
-         col_starts,
-         0,
-         U_diag_i[total_rows],
-         0 );
+                                    global_num_rows,
+                                    global_num_rows,
+                                    col_starts,
+                                    col_starts,
+                                    0,
+                                    U_diag_i[total_rows],
+                                    0 );
 
    U_diag = hypre_ParCSRMatrixDiag(matU);
    hypre_CSRMatrixI(U_diag) = U_diag_i;
-   if (U_diag_i[n]>0)
+   if (U_diag_i[n] > 0)
    {
       hypre_CSRMatrixData(U_diag) = U_diag_data;
       hypre_CSRMatrixJ(U_diag) = U_diag_j;
@@ -7867,7 +6597,7 @@ hypre_ILUSetupILUKRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *perm, HY
    else
    {
       /* we allocated some initial length, so free them */
-      hypre_TFree(U_diag_j, HYPRE_MEMORY_DEVICE);
+      hypre_TFree(U_diag_j, memory_location);
    }
    /* store (global) total number of nonzeros */
    local_nnz = (HYPRE_Real) (U_diag_i[total_rows]);
@@ -7875,7 +6605,7 @@ hypre_ILUSetupILUKRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *perm, HY
    hypre_ParCSRMatrixDNumNonzeros(matU) = total_nnz;
 
    /* free */
-   hypre_TFree(iw,HYPRE_MEMORY_HOST);
+   hypre_TFree(iw, HYPRE_MEMORY_HOST);
 
    /* free external data */
    if (E_i)
@@ -7896,26 +6626,36 @@ hypre_ILUSetupILUKRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *perm, HY
    return hypre_error_flag;
 }
 
-/* ILUT for RAS
+/*--------------------------------------------------------------------------
+ * hypre_ILUSetupILUTRAS
+ *
+ * ILUT for RAS
+ *
  * A: input matrix
  * lfil: level of fill-in, the k in ILU(k)
  * tol: droptol array in ILUT
  *    tol[0]: matrix B
  *    tol[1]: matrix E and F
  *    tol[2]: matrix S
- * perm: permutation array indicating ordering of factorization. Perm could come from a
- * CF_marker: array or a reordering routine.
+ * perm: permutation array indicating ordering of factorization.
+ *       Perm could come from a CF_marker: array or a reordering routine.
  * nLU: size of computed LDU factorization. If nLU < n, Schur compelemnt will be formed
  * Lptr, Dptr, Uptr: L, D, U factors.
  * Sptr: Schur complement
  *
  * Keep the largest lfil entries that is greater than some tol relative
  *    to the input tol and the norm of that row in both L and U
- */
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_ILUSetupILUTRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
-      HYPRE_Int *perm, HYPRE_Int nLU, hypre_ParCSRMatrix **Lptr,
-      HYPRE_Real** Dptr, hypre_ParCSRMatrix **Uptr)
+hypre_ILUSetupILUTRAS(hypre_ParCSRMatrix  *A,
+                      HYPRE_Int            lfil,
+                      HYPRE_Real          *tol,
+                      HYPRE_Int           *perm,
+                      HYPRE_Int            nLU,
+                      hypre_ParCSRMatrix **Lptr,
+                      HYPRE_Real         **Dptr,
+                      hypre_ParCSRMatrix **Uptr)
 {
    /*
     * 1: Setup and create buffers
@@ -7928,9 +6668,10 @@ hypre_ILUSetupILUTRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
     * iL = working array store the active col number
     */
    HYPRE_Real               local_nnz, total_nnz;
-   HYPRE_Int                i, ii, j, k1, k2, k12, k22, kl, ku, col, icol, lenl, lenu, lenhu, lenhlr, lenhll, jpos, jrow;
+   HYPRE_Int                i, ii, j, k1, k2, k12, k22, kl, ku, col, icol, lenl, lenu, lenhu, lenhlr,
+                            lenhll, jpos, jrow;
    HYPRE_Real               inorm, itolb, itolef, dpiv, lxu;
-   HYPRE_Int                *iw,*iL;
+   HYPRE_Int                *iw, *iL;
    HYPRE_Real               *w;
 
    /* memory management */
@@ -7945,10 +6686,7 @@ hypre_ILUSetupILUTRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
    MPI_Comm                 comm          = hypre_ParCSRMatrixComm(A);
    HYPRE_Int                num_procs;
    hypre_ParCSRCommPkg      *comm_pkg;
-   //   hypre_ParCSRCommHandle   *comm_handle;
    HYPRE_BigInt             col_starts[2];
-   //   HYPRE_Int                num_sends;
-   //   HYPRE_Int                begin, end;
 
    /* data objects for A */
    hypre_CSRMatrix          *A_diag       = hypre_ParCSRMatrixDiag(A);
@@ -7959,6 +6697,7 @@ hypre_ILUSetupILUTRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
    HYPRE_Int                *A_offd_i     = hypre_CSRMatrixI(A_offd);
    HYPRE_Int                *A_offd_j     = hypre_CSRMatrixJ(A_offd);
    HYPRE_Real               *A_offd_data  = hypre_CSRMatrixData(A_offd);
+   HYPRE_MemoryLocation      memory_location = hypre_ParCSRMatrixMemoryLocation(A);
 
    /* data objects for L, D, U */
    hypre_ParCSRMatrix       *matL;
@@ -7975,7 +6714,6 @@ hypre_ILUSetupILUTRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
 
    /* size of problem and external matrix */
    HYPRE_Int                n             = hypre_CSRMatrixNumRows(A_diag);
-   //   HYPRE_Int                m             = n - nLU;
    HYPRE_Int                ext           = hypre_CSRMatrixNumCols(A_offd);
    HYPRE_Int                total_rows    = n + ext;
    HYPRE_BigInt              global_num_rows;
@@ -7996,7 +6734,7 @@ hypre_ILUSetupILUTRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
    n = hypre_CSRMatrixNumRows(A_diag);
    if (nLU < 0 || nLU > n)
    {
-      hypre_error_w_msg(HYPRE_ERROR_ARG,"WARNING: nLU out of range.\n");
+      hypre_error_w_msg(HYPRE_ERROR_ARG, "WARNING: nLU out of range.\n");
    }
 
    /* start set up
@@ -8015,26 +6753,26 @@ hypre_ILUSetupILUTRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
    nnz_A = A_diag_i[nLU];
    if (n > 0)
    {
-      initial_alloc = nLU + ceil(nnz_A / 2.0);
+      initial_alloc = (HYPRE_Int)(nLU + hypre_ceil((HYPRE_Real)(nnz_A / 2.0)));
    }
    capacity_L = initial_alloc;
    capacity_U = initial_alloc;
 
-   D_data = hypre_CTAlloc(HYPRE_Real, total_rows, HYPRE_MEMORY_DEVICE);
-   L_diag_i = hypre_CTAlloc(HYPRE_Int, (total_rows+1), HYPRE_MEMORY_DEVICE);
-   U_diag_i = hypre_CTAlloc(HYPRE_Int, (total_rows+1), HYPRE_MEMORY_DEVICE);
+   D_data = hypre_CTAlloc(HYPRE_Real, total_rows, memory_location);
+   L_diag_i = hypre_CTAlloc(HYPRE_Int, (total_rows + 1), memory_location);
+   U_diag_i = hypre_CTAlloc(HYPRE_Int, (total_rows + 1), memory_location);
 
-   L_diag_j = hypre_CTAlloc(HYPRE_Int, capacity_L, HYPRE_MEMORY_DEVICE);
-   U_diag_j = hypre_CTAlloc(HYPRE_Int, capacity_U, HYPRE_MEMORY_DEVICE);
-   L_diag_data = hypre_CTAlloc(HYPRE_Real, capacity_L, HYPRE_MEMORY_DEVICE);
-   U_diag_data = hypre_CTAlloc(HYPRE_Real, capacity_U, HYPRE_MEMORY_DEVICE);
+   L_diag_j = hypre_CTAlloc(HYPRE_Int, capacity_L, memory_location);
+   U_diag_j = hypre_CTAlloc(HYPRE_Int, capacity_U, memory_location);
+   L_diag_data = hypre_CTAlloc(HYPRE_Real, capacity_L, memory_location);
+   U_diag_data = hypre_CTAlloc(HYPRE_Real, capacity_U, memory_location);
 
    ctrL = ctrU = 0;
 
    /* setting up working array */
-   iw = hypre_CTAlloc(HYPRE_Int,4*total_rows,HYPRE_MEMORY_HOST);
+   iw = hypre_CTAlloc(HYPRE_Int, 4 * total_rows, HYPRE_MEMORY_HOST);
    iL = iw + total_rows;
-   w = hypre_CTAlloc(HYPRE_Real,total_rows,HYPRE_MEMORY_HOST);
+   w = hypre_CTAlloc(HYPRE_Real, total_rows, HYPRE_MEMORY_HOST);
    for (i = 0; i < total_rows; i++)
    {
       iw[i] = -1;
@@ -8045,9 +6783,9 @@ hypre_ILUSetupILUTRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
     * rperm[old] -> new
     * perm[new]  -> old
     */
-   rperm = iw + 2*total_rows;
+   rperm = iw + 2 * total_rows;
    perm_old = perm;
-   perm = iw + 3*total_rows;
+   perm = iw + 3 * total_rows;
    for (i = 0; i < n; i++)
    {
       perm[i] = perm_old[i];
@@ -8061,7 +6799,7 @@ hypre_ILUSetupILUTRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
       rperm[perm[i]] = i;
    }
    /* get external matrix */
-   hypre_ILUBuildRASExternalMatrix(A,rperm,&E_i,&E_j,&E_data);
+   hypre_ILUBuildRASExternalMatrix(A, rperm, &E_i, &E_j, &E_data);
 
    /*
     * 2: Main loop of elimination
@@ -8076,19 +6814,19 @@ hypre_ILUSetupILUTRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
       /* get real row with perm */
       i = perm[ii];
       k1 = A_diag_i[i];
-      k2 = A_diag_i[i+1];
-      kl = ii-1;
+      k2 = A_diag_i[i + 1];
+      kl = ii - 1;
       /* reset row norm of ith row */
       inorm = .0;
       for (j = k1; j < k2; j++)
       {
-         inorm += fabs(A_diag_data[j]);
+         inorm += hypre_abs(A_diag_data[j]);
       }
       if (inorm == .0)
       {
-         hypre_error_w_msg(HYPRE_ERROR_ARG,"WARNING: ILUT with zero row.\n");
+         hypre_error_w_msg(HYPRE_ERROR_ARG, "WARNING: ILUT with zero row.\n");
       }
-      inorm /= (HYPRE_Real)(k2-k1);
+      inorm /= (HYPRE_Real)(k2 - k1);
       /* set the scaled tol for that row */
       itolb = tol[0] * inorm;
       itolef = tol[1] * inorm;
@@ -8109,7 +6847,7 @@ hypre_ILUSetupILUTRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
             w[lenhll] = A_diag_data[j];
             iw[col] = lenhll++;
             /* add to heap, by col number */
-            hypre_ILUMinHeapAddIRIi(iL,w,iw,lenhll);
+            hypre_ILUMinHeapAddIRIi(iL, w, iw, lenhll);
          }
          else if (col == ii)
          {
@@ -8139,31 +6877,36 @@ hypre_ILUSetupILUTRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
          dpiv = w[0] * D_data[jrow];
          w[0] = dpiv;
          /* now remove it from the top of the heap */
-         hypre_ILUMinHeapRemoveIRIi(iL,w,iw,lenhll);
+         hypre_ILUMinHeapRemoveIRIi(iL, w, iw, lenhll);
          lenhll--;
          /*
           * reset the drop part to -1
           * we don't need this iw anymore
           */
          iw[jrow] = -1;
+
          /* need to keep this one, move to the end of the heap */
          /* no longer need to maintain iw */
-         hypre_swap2(iL,w,lenhll,kl-lenhlr);
+         hypre_swap2(iL, w, lenhll, kl - lenhlr);
          lenhlr++;
-         hypre_ILUMaxrHeapAddRabsI(w+kl,iL+kl,lenhlr);
+         hypre_ILUMaxrHeapAddRabsI(w + kl, iL + kl, lenhlr);
+
          /* loop for elimination */
-         ku = U_diag_i[jrow+1];
+         ku = U_diag_i[jrow + 1];
          for (j = U_diag_i[jrow]; j < ku; j++)
          {
-            col = U_diag_j[j];
+            col  = U_diag_j[j];
             icol = iw[col];
-            lxu = - dpiv*U_diag_data[j];
+            lxu  = - dpiv * U_diag_data[j];
+
             /* we don't want to fill small number to empty place */
             if ((icol == -1) &&
-                ((col < nLU && fabs(lxu) < itolb) || (col >= nLU && fabs(lxu) < itolef)))
+                ((col <  nLU && hypre_abs(lxu) < itolb) ||
+                 (col >= nLU && hypre_abs(lxu) < itolef)))
             {
                continue;
             }
+
             if (icol == -1)
             {
                if (col < ii)
@@ -8177,7 +6920,7 @@ hypre_ILUSetupILUTRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
                   w[lenhll] = lxu;
                   iw[col] = lenhll++;
                   /* add to heap, by col number */
-                  hypre_ILUMinHeapAddIRIi(iL,w,iw,lenhll);
+                  hypre_ILUMinHeapAddIRIi(iL, w, iw, lenhll);
                }
                else if (col == ii)
                {
@@ -8203,11 +6946,11 @@ hypre_ILUSetupILUTRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
          }
       }/* while loop for the elimination of current row */
 
-      if (fabs(w[ii]) < MAT_TOL)
+      if (hypre_abs(w[ii]) < MAT_TOL)
       {
-         w[ii]=1e-06;
+         w[ii] = 1.0e-06;
       }
-      D_data[ii] = 1./w[ii];
+      D_data[ii] = 1. / w[ii];
       iw[ii] = -1;
 
       /*
@@ -8216,16 +6959,19 @@ hypre_ILUSetupILUTRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
        */
 
       lenl = lenhlr < lfil ? lenhlr : lfil;
-      L_diag_i[ii+1] = L_diag_i[ii] + lenl;
+      L_diag_i[ii + 1] = L_diag_i[ii] + lenl;
       if (lenl > 0)
       {
          /* test if memory is enough */
          while (ctrL + lenl > capacity_L)
          {
             HYPRE_Int tmp = capacity_L;
-            capacity_L = capacity_L * EXPAND_FACT + 1;
-            L_diag_j = hypre_TReAlloc_v2(L_diag_j, HYPRE_Int, tmp, HYPRE_Int, capacity_L, HYPRE_MEMORY_DEVICE);
-            L_diag_data = hypre_TReAlloc_v2(L_diag_data, HYPRE_Real, tmp, HYPRE_Real, capacity_L, HYPRE_MEMORY_DEVICE);
+
+            capacity_L = (HYPRE_Int)(capacity_L * EXPAND_FACT + 1);
+            L_diag_j = hypre_TReAlloc_v2(L_diag_j, HYPRE_Int, tmp,
+                                         HYPRE_Int, capacity_L, memory_location);
+            L_diag_data = hypre_TReAlloc_v2(L_diag_data, HYPRE_Real, tmp,
+                                            HYPRE_Real, capacity_L, memory_location);
          }
          ctrL += lenl;
          /* copy large data in */
@@ -8233,7 +6979,7 @@ hypre_ILUSetupILUTRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
          {
             L_diag_j[j] = iL[kl];
             L_diag_data[j] = w[kl];
-            hypre_ILUMaxrHeapRemoveRabsI(w+kl,iL+kl,lenhlr);
+            hypre_ILUMaxrHeapRemoveRabsI(w + kl, iL + kl, lenhlr);
             lenhlr--;
          }
       }
@@ -8241,7 +6987,7 @@ hypre_ILUSetupILUTRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
        * now reset working array
        * L part already reset when move out of heap, only U part
        */
-      ku = lenu+ii;
+      ku = lenu + ii;
       for (j = ii + 1; j <= ku; j++)
       {
          iw[iL[j]] = -1;
@@ -8257,25 +7003,27 @@ hypre_ILUSetupILUTRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
          /* need to sort the first small(hopefully) part of it */
          lenhu = lfil;
          /* quick split, only sort the first small part of the array */
-         hypre_ILUMaxQSplitRabsI(w,iL,ii+1,ii+lenhu,ii+lenu);
+         hypre_ILUMaxQSplitRabsI(w, iL, ii + 1, ii + lenhu, ii + lenu);
       }
 
-      U_diag_i[ii+1] = U_diag_i[ii] + lenhu;
+      U_diag_i[ii + 1] = U_diag_i[ii] + lenhu;
       if (lenhu > 0)
       {
          /* test if memory is enough */
          while (ctrU + lenhu > capacity_U)
          {
             HYPRE_Int tmp = capacity_U;
-            capacity_U = capacity_U * EXPAND_FACT + 1;
-            U_diag_j = hypre_TReAlloc_v2(U_diag_j, HYPRE_Int, tmp, HYPRE_Int, capacity_U, HYPRE_MEMORY_DEVICE);
-            U_diag_data = hypre_TReAlloc_v2(U_diag_data, HYPRE_Real, tmp, HYPRE_Real, capacity_U, HYPRE_MEMORY_DEVICE);
+            capacity_U = (HYPRE_Int)(capacity_U * EXPAND_FACT + 1);
+            U_diag_j = hypre_TReAlloc_v2(U_diag_j, HYPRE_Int, tmp,
+                                         HYPRE_Int, capacity_U, memory_location);
+            U_diag_data = hypre_TReAlloc_v2(U_diag_data, HYPRE_Real, tmp,
+                                            HYPRE_Real, capacity_U, memory_location);
          }
          ctrU += lenhu;
          /* copy large data in */
          for (j = U_diag_i[ii]; j < ctrU; j++)
          {
-            jpos = ii+1+j-U_diag_i[ii];
+            jpos = ii + 1 + j - U_diag_i[ii];
             U_diag_j[j] = iL[jpos];
             U_diag_data[j] = w[jpos];
          }
@@ -8288,25 +7036,25 @@ hypre_ILUSetupILUTRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
       /* get real row with perm */
       i = perm[ii];
       k1 = A_diag_i[i];
-      k2 = A_diag_i[i+1];
+      k2 = A_diag_i[i + 1];
       k12 = A_offd_i[i];
-      k22 = A_offd_i[i+1];
-      kl = ii-1;
+      k22 = A_offd_i[i + 1];
+      kl = ii - 1;
       /* reset row norm of ith row */
       inorm = .0;
       for (j = k1; j < k2; j++)
       {
-         inorm += fabs(A_diag_data[j]);
+         inorm += hypre_abs(A_diag_data[j]);
       }
       for (j = k12; j < k22; j++)
       {
-         inorm += fabs(A_offd_data[j]);
+         inorm += hypre_abs(A_offd_data[j]);
       }
       if (inorm == .0)
       {
-         hypre_error_w_msg(HYPRE_ERROR_ARG,"WARNING: ILUT with zero row.\n");
+         hypre_error_w_msg(HYPRE_ERROR_ARG, "WARNING: ILUT with zero row.\n");
       }
-      inorm /= (HYPRE_Real)(k2+k22-k1-k12);
+      inorm /= (HYPRE_Real)(k2 + k22 - k1 - k12);
       /* set the scaled tol for that row */
       itolb = tol[0] * inorm;
       itolef = tol[1] * inorm;
@@ -8327,7 +7075,7 @@ hypre_ILUSetupILUTRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
             w[lenhll] = A_diag_data[j];
             iw[col] = lenhll++;
             /* add to heap, by col number */
-            hypre_ILUMinHeapAddIRIi(iL,w,iw,lenhll);
+            hypre_ILUMinHeapAddIRIi(iL, w, iw, lenhll);
          }
          else if (col == ii)
          {
@@ -8369,7 +7117,7 @@ hypre_ILUSetupILUTRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
          dpiv = w[0] * D_data[jrow];
          w[0] = dpiv;
          /* now remove it from the top of the heap */
-         hypre_ILUMinHeapRemoveIRIi(iL,w,iw,lenhll);
+         hypre_ILUMinHeapRemoveIRIi(iL, w, iw, lenhll);
          lenhll--;
          /*
           * reset the drop part to -1
@@ -8378,19 +7126,19 @@ hypre_ILUSetupILUTRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
          iw[jrow] = -1;
          /* need to keep this one, move to the end of the heap */
          /* no longer need to maintain iw */
-         hypre_swap2(iL,w,lenhll,kl-lenhlr);
+         hypre_swap2(iL, w, lenhll, kl - lenhlr);
          lenhlr++;
-         hypre_ILUMaxrHeapAddRabsI(w+kl,iL+kl,lenhlr);
+         hypre_ILUMaxrHeapAddRabsI(w + kl, iL + kl, lenhlr);
          /* loop for elimination */
-         ku = U_diag_i[jrow+1];
+         ku = U_diag_i[jrow + 1];
          for (j = U_diag_i[jrow]; j < ku; j++)
          {
             col = U_diag_j[j];
             icol = iw[col];
-            lxu = - dpiv*U_diag_data[j];
+            lxu = - dpiv * U_diag_data[j];
             /* we don't want to fill small number to empty place */
             if ((icol == -1) &&
-                ((col < nLU && fabs(lxu) < itolb) || (col >= nLU && fabs(lxu) < itolef)))
+                ((col < nLU && hypre_abs(lxu) < itolb) || (col >= nLU && hypre_abs(lxu) < itolef)))
             {
                continue;
             }
@@ -8407,7 +7155,7 @@ hypre_ILUSetupILUTRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
                   w[lenhll] = lxu;
                   iw[col] = lenhll++;
                   /* add to heap, by col number */
-                  hypre_ILUMinHeapAddIRIi(iL,w,iw,lenhll);
+                  hypre_ILUMinHeapAddIRIi(iL, w, iw, lenhll);
                }
                else if (col == ii)
                {
@@ -8433,11 +7181,11 @@ hypre_ILUSetupILUTRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
          }
       }/* while loop for the elimination of current row */
 
-      if (fabs(w[ii]) < MAT_TOL)
+      if (hypre_abs(w[ii]) < MAT_TOL)
       {
-         w[ii]=1e-06;
+         w[ii] = 1.0e-06;
       }
-      D_data[ii] = 1./w[ii];
+      D_data[ii] = 1. / w[ii];
       iw[ii] = -1;
 
       /*
@@ -8446,16 +7194,18 @@ hypre_ILUSetupILUTRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
        */
 
       lenl = lenhlr < lfil ? lenhlr : lfil;
-      L_diag_i[ii+1] = L_diag_i[ii] + lenl;
+      L_diag_i[ii + 1] = L_diag_i[ii] + lenl;
       if (lenl > 0)
       {
          /* test if memory is enough */
          while (ctrL + lenl > capacity_L)
          {
             HYPRE_Int tmp = capacity_L;
-            capacity_L = capacity_L * EXPAND_FACT + 1;
-            L_diag_j = hypre_TReAlloc_v2(L_diag_j, HYPRE_Int, tmp, HYPRE_Int, capacity_L, HYPRE_MEMORY_DEVICE);
-            L_diag_data = hypre_TReAlloc_v2(L_diag_data, HYPRE_Real, tmp, HYPRE_Real, capacity_L, HYPRE_MEMORY_DEVICE);
+            capacity_L = (HYPRE_Int)(capacity_L * EXPAND_FACT + 1);
+            L_diag_j = hypre_TReAlloc_v2(L_diag_j, HYPRE_Int, tmp,
+                                         HYPRE_Int, capacity_L, memory_location);
+            L_diag_data = hypre_TReAlloc_v2(L_diag_data, HYPRE_Real, tmp,
+                                            HYPRE_Real, capacity_L, memory_location);
          }
          ctrL += lenl;
          /* copy large data in */
@@ -8463,7 +7213,7 @@ hypre_ILUSetupILUTRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
          {
             L_diag_j[j] = iL[kl];
             L_diag_data[j] = w[kl];
-            hypre_ILUMaxrHeapRemoveRabsI(w+kl,iL+kl,lenhlr);
+            hypre_ILUMaxrHeapRemoveRabsI(w + kl, iL + kl, lenhlr);
             lenhlr--;
          }
       }
@@ -8471,7 +7221,7 @@ hypre_ILUSetupILUTRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
        * now reset working array
        * L part already reset when move out of heap, only U part
        */
-      ku = lenu+ii;
+      ku = lenu + ii;
       for (j = ii + 1; j <= ku; j++)
       {
          iw[iL[j]] = -1;
@@ -8487,25 +7237,27 @@ hypre_ILUSetupILUTRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
          /* need to sort the first small(hopefully) part of it */
          lenhu = lfil;
          /* quick split, only sort the first small part of the array */
-         hypre_ILUMaxQSplitRabsI(w,iL,ii+1,ii+lenhu,ii+lenu);
+         hypre_ILUMaxQSplitRabsI(w, iL, ii + 1, ii + lenhu, ii + lenu);
       }
 
-      U_diag_i[ii+1] = U_diag_i[ii] + lenhu;
+      U_diag_i[ii + 1] = U_diag_i[ii] + lenhu;
       if (lenhu > 0)
       {
          /* test if memory is enough */
          while (ctrU + lenhu > capacity_U)
          {
             HYPRE_Int tmp = capacity_U;
-            capacity_U = capacity_U * EXPAND_FACT + 1;
-            U_diag_j = hypre_TReAlloc_v2(U_diag_j, HYPRE_Int, tmp, HYPRE_Int, capacity_U, HYPRE_MEMORY_DEVICE);
-            U_diag_data = hypre_TReAlloc_v2(U_diag_data, HYPRE_Real, tmp, HYPRE_Real, capacity_U, HYPRE_MEMORY_DEVICE);
+            capacity_U = (HYPRE_Int)(capacity_U * EXPAND_FACT + 1);
+            U_diag_j = hypre_TReAlloc_v2(U_diag_j, HYPRE_Int, tmp,
+                                         HYPRE_Int, capacity_U, memory_location);
+            U_diag_data = hypre_TReAlloc_v2(U_diag_data, HYPRE_Real, tmp,
+                                            HYPRE_Real, capacity_U, memory_location);
          }
          ctrU += lenhu;
          /* copy large data in */
          for (j = U_diag_i[ii]; j < ctrU; j++)
          {
-            jpos = ii+1+j-U_diag_i[ii];
+            jpos = ii + 1 + j - U_diag_i[ii];
             U_diag_j[j] = iL[jpos];
             U_diag_data[j] = w[jpos];
          }
@@ -8517,21 +7269,21 @@ hypre_ILUSetupILUTRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
    for (ii = n; ii < total_rows; ii++)
    {
       /* get real row with perm */
-      i = ii-n;
+      i = ii - n;
       k1 = E_i[i];
-      k2 = E_i[i+1];
-      kl = ii-1;
+      k2 = E_i[i + 1];
+      kl = ii - 1;
       /* reset row norm of ith row */
       inorm = .0;
       for (j = k1; j < k2; j++)
       {
-         inorm += fabs(E_data[j]);
+         inorm += hypre_abs(E_data[j]);
       }
       if (inorm == .0)
       {
-         hypre_error_w_msg(HYPRE_ERROR_ARG,"WARNING: ILUT with zero row.\n");
+         hypre_error_w_msg(HYPRE_ERROR_ARG, "WARNING: ILUT with zero row.\n");
       }
-      inorm /= (HYPRE_Real)(k2-k1);
+      inorm /= (HYPRE_Real)(k2 - k1);
       /* set the scaled tol for that row */
       itolb = tol[0] * inorm;
       itolef = tol[1] * inorm;
@@ -8552,7 +7304,7 @@ hypre_ILUSetupILUTRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
             w[lenhll] = E_data[j];
             iw[col] = lenhll++;
             /* add to heap, by col number */
-            hypre_ILUMinHeapAddIRIi(iL,w,iw,lenhll);
+            hypre_ILUMinHeapAddIRIi(iL, w, iw, lenhll);
          }
          else if (col == ii)
          {
@@ -8582,7 +7334,7 @@ hypre_ILUSetupILUTRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
          dpiv = w[0] * D_data[jrow];
          w[0] = dpiv;
          /* now remove it from the top of the heap */
-         hypre_ILUMinHeapRemoveIRIi(iL,w,iw,lenhll);
+         hypre_ILUMinHeapRemoveIRIi(iL, w, iw, lenhll);
          lenhll--;
          /*
           * reset the drop part to -1
@@ -8591,19 +7343,19 @@ hypre_ILUSetupILUTRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
          iw[jrow] = -1;
          /* need to keep this one, move to the end of the heap */
          /* no longer need to maintain iw */
-         hypre_swap2(iL,w,lenhll,kl-lenhlr);
+         hypre_swap2(iL, w, lenhll, kl - lenhlr);
          lenhlr++;
-         hypre_ILUMaxrHeapAddRabsI(w+kl,iL+kl,lenhlr);
+         hypre_ILUMaxrHeapAddRabsI(w + kl, iL + kl, lenhlr);
          /* loop for elimination */
-         ku = U_diag_i[jrow+1];
+         ku = U_diag_i[jrow + 1];
          for (j = U_diag_i[jrow]; j < ku; j++)
          {
             col = U_diag_j[j];
             icol = iw[col];
-            lxu = - dpiv*U_diag_data[j];
+            lxu = - dpiv * U_diag_data[j];
             /* we don't want to fill small number to empty place */
             if ((icol == -1) &&
-                ((col < nLU && fabs(lxu) < itolb) || (col >= nLU && fabs(lxu) < itolef)))
+                ((col < nLU && hypre_abs(lxu) < itolb) || (col >= nLU && hypre_abs(lxu) < itolef)))
             {
                continue;
             }
@@ -8620,7 +7372,7 @@ hypre_ILUSetupILUTRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
                   w[lenhll] = lxu;
                   iw[col] = lenhll++;
                   /* add to heap, by col number */
-                  hypre_ILUMinHeapAddIRIi(iL,w,iw,lenhll);
+                  hypre_ILUMinHeapAddIRIi(iL, w, iw, lenhll);
                }
                else if (col == ii)
                {
@@ -8646,11 +7398,11 @@ hypre_ILUSetupILUTRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
          }
       }/* while loop for the elimination of current row */
 
-      if (fabs(w[ii]) < MAT_TOL)
+      if (hypre_abs(w[ii]) < MAT_TOL)
       {
-         w[ii]=1e-06;
+         w[ii] = 1.0e-06;
       }
-      D_data[ii] = 1./w[ii];
+      D_data[ii] = 1. / w[ii];
       iw[ii] = -1;
 
       /*
@@ -8659,16 +7411,18 @@ hypre_ILUSetupILUTRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
        */
 
       lenl = lenhlr < lfil ? lenhlr : lfil;
-      L_diag_i[ii+1] = L_diag_i[ii] + lenl;
+      L_diag_i[ii + 1] = L_diag_i[ii] + lenl;
       if (lenl > 0)
       {
          /* test if memory is enough */
          while (ctrL + lenl > capacity_L)
          {
             HYPRE_Int tmp = capacity_L;
-            capacity_L = capacity_L * EXPAND_FACT + 1;
-            L_diag_j = hypre_TReAlloc_v2(L_diag_j, HYPRE_Int, tmp, HYPRE_Int, capacity_L, HYPRE_MEMORY_DEVICE);
-            L_diag_data = hypre_TReAlloc_v2(L_diag_data, HYPRE_Real, tmp, HYPRE_Real, capacity_L, HYPRE_MEMORY_DEVICE);
+            capacity_L = (HYPRE_Int)(capacity_L * EXPAND_FACT + 1);
+            L_diag_j = hypre_TReAlloc_v2(L_diag_j, HYPRE_Int, tmp,
+                                         HYPRE_Int, capacity_L, memory_location);
+            L_diag_data = hypre_TReAlloc_v2(L_diag_data, HYPRE_Real, tmp,
+                                            HYPRE_Real, capacity_L, memory_location);
          }
          ctrL += lenl;
          /* copy large data in */
@@ -8676,7 +7430,7 @@ hypre_ILUSetupILUTRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
          {
             L_diag_j[j] = iL[kl];
             L_diag_data[j] = w[kl];
-            hypre_ILUMaxrHeapRemoveRabsI(w+kl,iL+kl,lenhlr);
+            hypre_ILUMaxrHeapRemoveRabsI(w + kl, iL + kl, lenhlr);
             lenhlr--;
          }
       }
@@ -8684,7 +7438,7 @@ hypre_ILUSetupILUTRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
        * now reset working array
        * L part already reset when move out of heap, only U part
        */
-      ku = lenu+ii;
+      ku = lenu + ii;
       for (j = ii + 1; j <= ku; j++)
       {
          iw[iL[j]] = -1;
@@ -8700,25 +7454,27 @@ hypre_ILUSetupILUTRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
          /* need to sort the first small(hopefully) part of it */
          lenhu = lfil;
          /* quick split, only sort the first small part of the array */
-         hypre_ILUMaxQSplitRabsI(w,iL,ii+1,ii+lenhu,ii+lenu);
+         hypre_ILUMaxQSplitRabsI(w, iL, ii + 1, ii + lenhu, ii + lenu);
       }
 
-      U_diag_i[ii+1] = U_diag_i[ii] + lenhu;
+      U_diag_i[ii + 1] = U_diag_i[ii] + lenhu;
       if (lenhu > 0)
       {
          /* test if memory is enough */
          while (ctrU + lenhu > capacity_U)
          {
             HYPRE_Int tmp = capacity_U;
-            capacity_U = capacity_U * EXPAND_FACT + 1;
-            U_diag_j = hypre_TReAlloc_v2(U_diag_j, HYPRE_Int, tmp, HYPRE_Int, capacity_U, HYPRE_MEMORY_DEVICE);
-            U_diag_data = hypre_TReAlloc_v2(U_diag_data, HYPRE_Real, tmp, HYPRE_Real, capacity_U, HYPRE_MEMORY_DEVICE);
+            capacity_U = (HYPRE_Int)(capacity_U * EXPAND_FACT + 1);
+            U_diag_j = hypre_TReAlloc_v2(U_diag_j, HYPRE_Int, tmp,
+                                         HYPRE_Int, capacity_U, memory_location);
+            U_diag_data = hypre_TReAlloc_v2(U_diag_data, HYPRE_Real, tmp,
+                                            HYPRE_Real, capacity_U, memory_location);
          }
          ctrU += lenhu;
          /* copy large data in */
          for (j = U_diag_i[ii]; j < ctrU; j++)
          {
-            jpos = ii+1+j-U_diag_i[ii];
+            jpos = ii + 1 + j - U_diag_i[ii];
             U_diag_j[j] = iL[jpos];
             U_diag_data[j] = w[jpos];
          }
@@ -8729,24 +7485,25 @@ hypre_ILUSetupILUTRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
     * 3: Finishing up and free
     */
    HYPRE_BigInt big_total_rows = (HYPRE_BigInt)total_rows;
-   hypre_MPI_Allreduce( &big_total_rows, &global_num_rows, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
+   hypre_MPI_Allreduce(&big_total_rows, &global_num_rows, 1, HYPRE_MPI_BIG_INT,
+                       hypre_MPI_SUM, comm);
    /* need to get new column start */
    {
       HYPRE_BigInt global_start;
-      hypre_MPI_Scan( &big_total_rows, &global_start, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
+      hypre_MPI_Scan(&big_total_rows, &global_start, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
       col_starts[0] = global_start - total_rows;
       col_starts[1] = global_start;
    }
 
    /* create parcsr matrix */
    matL = hypre_ParCSRMatrixCreate( comm,
-         global_num_rows,
-         global_num_rows,
-         col_starts,
-         col_starts,
-         0,
-         L_diag_i[total_rows],
-         0 );
+                                    global_num_rows,
+                                    global_num_rows,
+                                    col_starts,
+                                    col_starts,
+                                    0,
+                                    L_diag_i[total_rows],
+                                    0 );
 
    L_diag = hypre_ParCSRMatrixDiag(matL);
    hypre_CSRMatrixI(L_diag) = L_diag_i;
@@ -8758,8 +7515,8 @@ hypre_ILUSetupILUTRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
    else
    {
       /* we initialized some anyway, so remove if unused */
-      hypre_TFree(L_diag_j,HYPRE_MEMORY_DEVICE);
-      hypre_TFree(L_diag_data,HYPRE_MEMORY_DEVICE);
+      hypre_TFree(L_diag_j, memory_location);
+      hypre_TFree(L_diag_data, memory_location);
    }
    /* store (global) total number of nonzeros */
    local_nnz = (HYPRE_Real) (L_diag_i[total_rows]);
@@ -8767,13 +7524,13 @@ hypre_ILUSetupILUTRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
    hypre_ParCSRMatrixDNumNonzeros(matL) = total_nnz;
 
    matU = hypre_ParCSRMatrixCreate( comm,
-         global_num_rows,
-         global_num_rows,
-         col_starts,
-         col_starts,
-         0,
-         U_diag_i[total_rows],
-         0 );
+                                    global_num_rows,
+                                    global_num_rows,
+                                    col_starts,
+                                    col_starts,
+                                    0,
+                                    U_diag_i[total_rows],
+                                    0 );
 
    U_diag = hypre_ParCSRMatrixDiag(matU);
    hypre_CSRMatrixI(U_diag) = U_diag_i;
@@ -8785,8 +7542,8 @@ hypre_ILUSetupILUTRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
    else
    {
       /* we initialized some anyway, so remove if unused */
-      hypre_TFree(U_diag_j,HYPRE_MEMORY_DEVICE);
-      hypre_TFree(U_diag_data,HYPRE_MEMORY_DEVICE);
+      hypre_TFree(U_diag_j, memory_location);
+      hypre_TFree(U_diag_data, memory_location);
    }
    /* store (global) total number of nonzeros */
    local_nnz = (HYPRE_Real) (U_diag_i[total_rows]);
@@ -8794,8 +7551,8 @@ hypre_ILUSetupILUTRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
    hypre_ParCSRMatrixDNumNonzeros(matU) = total_nnz;
 
    /* free working array */
-   hypre_TFree(iw,HYPRE_MEMORY_HOST);
-   hypre_TFree(w,HYPRE_MEMORY_HOST);
+   hypre_TFree(iw, HYPRE_MEMORY_HOST);
+   hypre_TFree(w, HYPRE_MEMORY_HOST);
 
    /* free external data */
    if (E_i)
diff --git a/external/hypre/src/parcsr_ls/par_ilu_setup_device.c b/external/hypre/src/parcsr_ls/par_ilu_setup_device.c
new file mode 100644
index 00000000..f626b67c
--- /dev/null
+++ b/external/hypre/src/parcsr_ls/par_ilu_setup_device.c
@@ -0,0 +1,605 @@
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+#include "_hypre_parcsr_ls.h"
+#include "_hypre_utilities.hpp"
+
+#if defined(HYPRE_USING_GPU)
+
+/*--------------------------------------------------------------------------
+ * hypre_ILUSetupDevice
+ *
+ * ILU(0), ILUK, ILUT setup on the device
+ *
+ * Arguments:
+ *    A = input matrix
+ *    perm_data  = permutation array indicating ordering of rows.
+ *                 Could come from a CF_marker array or a reordering routine.
+ *    qperm_data = permutation array indicating ordering of columns
+ *    nI  = number of internal unknowns
+ *    nLU = size of incomplete factorization, nLU should obey nLU <= nI.
+ *          Schur complement is formed if nLU < n
+ *
+ * This function will form the global Schur Matrix if nLU < n
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ILUSetupDevice(hypre_ParILUData       *ilu_data,
+                     hypre_ParCSRMatrix     *A,
+                     HYPRE_Int              *perm_data,
+                     HYPRE_Int              *qperm_data,
+                     HYPRE_Int               n,
+                     HYPRE_Int               nLU,
+                     hypre_CSRMatrix       **BLUptr,
+                     hypre_ParCSRMatrix    **matSptr,
+                     hypre_CSRMatrix       **Eptr,
+                     hypre_CSRMatrix       **Fptr)
+{
+   /* Input ILU data */
+   HYPRE_Int                ilu_type            = hypre_ParILUDataIluType(ilu_data);
+   HYPRE_Int                fill_level          = hypre_ParILUDataLfil(ilu_data);
+   HYPRE_Int                max_row_nnz         = hypre_ParILUDataMaxRowNnz(ilu_data);
+   HYPRE_Real              *droptol             = hypre_ParILUDataDroptol(ilu_data);
+   HYPRE_Int                iter_setup_type     = hypre_ParILUDataIterativeSetupType(ilu_data);
+   HYPRE_Int                iter_setup_option   = hypre_ParILUDataIterativeSetupOption(ilu_data);
+   HYPRE_Int                iter_setup_max_iter = hypre_ParILUDataIterativeSetupMaxIter(ilu_data);
+   HYPRE_Complex            iter_setup_tol      = hypre_ParILUDataIterativeSetupTolerance(ilu_data);
+
+   /* Input matrix data */
+   MPI_Comm                 comm                = hypre_ParCSRMatrixComm(A);
+   HYPRE_MemoryLocation     memory_location     = hypre_ParCSRMatrixMemoryLocation(A);
+   hypre_ParCSRMatrix      *matS                = NULL;
+   hypre_CSRMatrix         *A_diag              = NULL;
+   hypre_CSRMatrix         *A_offd              = hypre_ParCSRMatrixOffd(A);
+   hypre_CSRMatrix         *h_A_offd            = NULL;
+   HYPRE_Int               *A_offd_i            = NULL;
+   HYPRE_Int               *A_offd_j            = NULL;
+   HYPRE_Real              *A_offd_data         = NULL;
+   hypre_CSRMatrix         *SLU                 = NULL;
+
+   /* Permutation arrays */
+   HYPRE_Int               *rperm_data          = NULL;
+   HYPRE_Int               *rqperm_data         = NULL;
+   hypre_IntArray          *perm                = NULL;
+   hypre_IntArray          *rperm               = NULL;
+   hypre_IntArray          *qperm               = NULL;
+   hypre_IntArray          *rqperm              = NULL;
+   hypre_IntArray          *h_perm              = NULL;
+   hypre_IntArray          *h_rperm             = NULL;
+
+   /* Variables for matS */
+   HYPRE_Int                m                   = n - nLU;
+   HYPRE_Int                nI                  = nLU; //use default
+   HYPRE_Int                e                   = 0;
+   HYPRE_Int                m_e                 = m;
+   HYPRE_Int               *S_diag_i            = NULL;
+   hypre_CSRMatrix         *S_offd              = NULL;
+   HYPRE_Int               *S_offd_i            = NULL;
+   HYPRE_Int               *S_offd_j            = NULL;
+   HYPRE_Real              *S_offd_data         = NULL;
+   HYPRE_BigInt            *S_offd_colmap       = NULL;
+   HYPRE_Int                S_offd_nnz;
+   HYPRE_Int                S_offd_ncols;
+   HYPRE_Int                S_diag_nnz;
+
+   hypre_ParCSRMatrix      *Apq                 = NULL;
+   hypre_ParCSRMatrix      *ALU                 = NULL;
+   hypre_ParCSRMatrix      *parL                = NULL;
+   hypre_ParCSRMatrix      *parU                = NULL;
+   hypre_ParCSRMatrix      *parS                = NULL;
+   HYPRE_Real              *parD                = NULL;
+   HYPRE_Int               *uend                = NULL;
+
+   /* Local variables */
+   HYPRE_BigInt            *send_buf            = NULL;
+   hypre_ParCSRCommPkg     *comm_pkg;
+   hypre_ParCSRCommHandle  *comm_handle;
+   HYPRE_Int                num_sends, begin, end;
+   HYPRE_BigInt             total_rows, col_starts[2];
+   HYPRE_Int                i, j, k1, k2, k3, col;
+   HYPRE_Int                my_id, num_procs;
+
+   hypre_MPI_Comm_size(comm, &num_procs);
+   hypre_MPI_Comm_rank(comm, &my_id);
+
+   /* Sanity checks */
+#if !defined(HYPRE_USING_UNIFIED_MEMORY)
+   if (ilu_type == 0 && fill_level)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                        "ILUK setup on device runs requires unified memory!");
+      return hypre_error_flag;
+   }
+   else if (ilu_type == 10 && fill_level)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                        "GMRES+ILUK setup on device runs requires unified memory!");
+      return hypre_error_flag;
+   }
+#endif
+
+   /* Build the inverse permutation arrays */
+   if (perm_data && qperm_data)
+   {
+      /* Create arrays */
+      perm   = hypre_IntArrayCreate(n);
+      qperm  = hypre_IntArrayCreate(n);
+
+      /* Set existing data */
+      hypre_IntArrayData(perm)  = perm_data;
+      hypre_IntArrayData(qperm) = qperm_data;
+
+      /* Initialize arrays */
+      hypre_IntArrayInitialize_v2(perm, memory_location);
+      hypre_IntArrayInitialize_v2(qperm, memory_location);
+
+      /* Compute inverse permutation arrays */
+      hypre_IntArrayInverseMapping(perm, &rperm);
+      hypre_IntArrayInverseMapping(qperm, &rqperm);
+
+      rqperm_data = hypre_IntArrayData(rqperm);
+   }
+
+   /* Only call ILU when we really have a matrix on this processor */
+   if (n > 0)
+   {
+      /*
+       * Apply ILU factorization to the entire A_diag
+       *
+       * | L \ U (B) L^{-1}F  |
+       * | EU^{-1}   L \ U (S)|
+       *
+       * Extract submatrix L_B U_B, L_S U_S, EU_B^{-1}, L_B^{-1}F
+       * Note that in this function after ILU, all rows are sorted
+       * in a way different than HYPRE. Diagonal is not listed in the front
+       */
+
+#if !defined(HYPRE_USING_SYCL)
+      if ((fill_level == 0) && !(ilu_type % 10))
+      {
+         /* Copy diagonal matrix into a new place with permutation
+          * That is, A_diag = A_diag(perm,qperm); */
+         hypre_CSRMatrixPermute(hypre_ParCSRMatrixDiag(A), perm_data, rqperm_data, &A_diag);
+
+         /* Compute ILU0 on the device */
+         if (iter_setup_type)
+         {
+            hypre_ILUSetupIterativeILU0Device(A_diag, iter_setup_type, iter_setup_option,
+                                              iter_setup_max_iter, iter_setup_tol,
+                                              &hypre_ParILUDataIterativeSetupNumIter(ilu_data),
+                                              &hypre_ParILUDataIterativeSetupHistory(ilu_data));
+         }
+         else
+         {
+            hypre_CSRMatrixILU0(A_diag);
+         }
+
+         hypre_ParILUExtractEBFC(A_diag, nLU, BLUptr, &SLU, Eptr, Fptr);
+         hypre_CSRMatrixDestroy(A_diag);
+      }
+      else
+#endif
+      {
+         hypre_ParILURAPReorder(A, perm_data, rqperm_data, &Apq);
+#if defined(HYPRE_USING_SYCL)
+         /* WM: note - ILU0 is not yet available in oneMKL sparse */
+         if (fill_level == 0 && !(ilu_type % 10))
+         {
+            hypre_ILUSetupILU0(Apq, NULL, NULL, n, n, &parL, &parD, &parU, &parS, &uend);
+         }
+#endif
+         if (fill_level != 0 && !(ilu_type % 10))
+         {
+            hypre_ILUSetupILUK(Apq, fill_level, NULL, NULL, n, n, &parL, &parD, &parU, &parS, &uend);
+         }
+         else if ((ilu_type % 10) == 1)
+         {
+            hypre_ParCSRMatrixMigrate(Apq, HYPRE_MEMORY_HOST);
+            hypre_ILUSetupILUT(Apq, max_row_nnz, droptol, NULL, NULL, n, n,
+                               &parL, &parD, &parU, &parS, &uend);
+         }
+
+         hypre_ParCSRMatrixDestroy(Apq);
+         hypre_TFree(uend, HYPRE_MEMORY_HOST);
+         hypre_ParCSRMatrixDestroy(parS);
+
+         hypre_ILUSetupLDUtoCusparse(parL, parD, parU, &ALU);
+         if ((ilu_type % 10) == 1)
+         {
+            hypre_TFree(parD, HYPRE_MEMORY_HOST);
+         }
+         else
+         {
+            hypre_TFree(parD, HYPRE_MEMORY_DEVICE);
+         }
+         hypre_ParCSRMatrixDestroy(parL);
+         hypre_ParCSRMatrixDestroy(parU);
+
+         hypre_ParILUExtractEBFC(hypre_ParCSRMatrixDiag(ALU), nLU,
+                                 BLUptr, &SLU, Eptr, Fptr);
+         hypre_ParCSRMatrixDestroy(ALU);
+      }
+   }
+   else
+   {
+      *BLUptr = NULL;
+      *Eptr = NULL;
+      *Fptr = NULL;
+      SLU = NULL;
+   }
+
+   /* Compute total rows in Schur block */
+   HYPRE_BigInt big_m = (HYPRE_BigInt) m;
+   hypre_MPI_Allreduce(&big_m, &total_rows, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
+
+   /* only form when total_rows > 0 */
+   if (total_rows > 0)
+   {
+      /* now create S - need to get new column start */
+      {
+         HYPRE_BigInt global_start;
+         hypre_MPI_Scan(&big_m, &global_start, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
+         col_starts[0] = global_start - m;
+         col_starts[1] = global_start;
+      }
+
+      if (!SLU)
+      {
+         SLU = hypre_CSRMatrixCreate(0, 0, 0);
+         hypre_CSRMatrixInitialize(SLU);
+      }
+
+      S_diag_i = hypre_CSRMatrixI(SLU);
+      hypre_TMemcpy(&S_diag_nnz, S_diag_i + m, HYPRE_Int, 1,
+                    HYPRE_MEMORY_HOST, hypre_CSRMatrixMemoryLocation(SLU));
+
+      /* Build ParCSRMatrix matS
+       * For example when np == 3 the new matrix takes the following form
+       * |IS_1 E_12 E_13|
+       * |E_21 IS_2 E_22| = S
+       * |E_31 E_32 IS_3|
+       * In which IS_i is the cusparse ILU factorization of S_i in one matrix
+       * */
+
+      /* We did nothing to A_offd, so all the data kept, just reorder them
+       * The create function takes comm, global num rows/cols,
+       *    row/col start, num cols offd, nnz diag, nnz offd
+       */
+      S_offd_nnz = hypre_CSRMatrixNumNonzeros(A_offd);
+      S_offd_ncols = hypre_CSRMatrixNumCols(A_offd);
+
+      matS = hypre_ParCSRMatrixCreate(comm,
+                                      total_rows,
+                                      total_rows,
+                                      col_starts,
+                                      col_starts,
+                                      S_offd_ncols,
+                                      S_diag_nnz,
+                                      S_offd_nnz);
+
+      /* first put diagonal data in */
+      hypre_CSRMatrixDestroy(hypre_ParCSRMatrixDiag(matS));
+      hypre_ParCSRMatrixDiag(matS) = SLU;
+
+      /* now start to construct offdiag of S */
+      S_offd = hypre_ParCSRMatrixOffd(matS);
+      hypre_CSRMatrixInitialize_v2(S_offd, 0, HYPRE_MEMORY_HOST);
+      S_offd_i = hypre_CSRMatrixI(S_offd);
+      S_offd_j = hypre_CSRMatrixJ(S_offd);
+      S_offd_data = hypre_CSRMatrixData(S_offd);
+      S_offd_colmap = hypre_CTAlloc(HYPRE_BigInt, S_offd_ncols, HYPRE_MEMORY_HOST);
+
+      /* Set/Move A_offd to host */
+      h_A_offd = (hypre_GetActualMemLocation(memory_location) == hypre_MEMORY_DEVICE) ?
+                 hypre_CSRMatrixClone_v2(A_offd, 1, HYPRE_MEMORY_HOST) : A_offd;
+      A_offd_i    = hypre_CSRMatrixI(h_A_offd);
+      A_offd_j    = hypre_CSRMatrixJ(h_A_offd);
+      A_offd_data = hypre_CSRMatrixData(h_A_offd);
+
+      /* Clone permutation arrays on the host */
+      if (rperm && perm)
+      {
+         h_perm  = hypre_IntArrayCloneDeep_v2(perm, HYPRE_MEMORY_HOST);
+         h_rperm = hypre_IntArrayCloneDeep_v2(rperm, HYPRE_MEMORY_HOST);
+
+         perm_data  = hypre_IntArrayData(h_perm);
+         rperm_data = hypre_IntArrayData(h_rperm);
+      }
+
+      /* simply use a loop to copy data from A_offd */
+      S_offd_i[0] = 0;
+      k3 = 0;
+      for (i = 1; i <= e; i++)
+      {
+         S_offd_i[i] = k3;
+      }
+      for (i = 0; i < m_e; i++)
+      {
+         col = (perm_data) ? perm_data[i + nI] : i + nI;
+         k1 = A_offd_i[col];
+         k2 = A_offd_i[col + 1];
+         for (j = k1; j < k2; j++)
+         {
+            S_offd_j[k3] = A_offd_j[j];
+            S_offd_data[k3++] = A_offd_data[j];
+         }
+         S_offd_i[i + 1 + e] = k3;
+      }
+
+      /* give I, J, DATA to S_offd */
+      hypre_CSRMatrixI(S_offd) = S_offd_i;
+      hypre_CSRMatrixJ(S_offd) = S_offd_j;
+      hypre_CSRMatrixData(S_offd) = S_offd_data;
+
+      /* now we need to update S_offd_colmap */
+      comm_pkg = hypre_ParCSRMatrixCommPkg(A);
+
+      /* setup comm_pkg if not yet built */
+      if (!comm_pkg)
+      {
+         hypre_MatvecCommPkgCreate(A);
+         comm_pkg = hypre_ParCSRMatrixCommPkg(A);
+      }
+
+      /* get total num of send */
+      num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
+      begin = hypre_ParCSRCommPkgSendMapStart(comm_pkg, 0);
+      end = hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends);
+      send_buf = hypre_TAlloc(HYPRE_BigInt, end - begin, HYPRE_MEMORY_HOST);
+
+      /* copy new index into send_buf */
+      for (i = 0; i < (end - begin); i++)
+      {
+         send_buf[i] = (rperm_data) ?
+                       rperm_data[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, i + begin)] -
+                       nLU + col_starts[0] :
+                       hypre_ParCSRCommPkgSendMapElmt(comm_pkg, i + begin) -
+                       nLU + col_starts[0];
+      }
+
+      /* main communication */
+      comm_handle = hypre_ParCSRCommHandleCreate(21, comm_pkg, send_buf, S_offd_colmap);
+      hypre_ParCSRCommHandleDestroy(comm_handle);
+
+      /* setup index */
+      hypre_ParCSRMatrixColMapOffd(matS) = S_offd_colmap;
+
+      hypre_ILUSortOffdColmap(matS);
+
+      /* Move S_offd to final memory location */
+      hypre_CSRMatrixMigrate(S_offd, memory_location);
+
+      /* Free memory */
+      hypre_TFree(send_buf, HYPRE_MEMORY_HOST);
+      if (h_A_offd != A_offd)
+      {
+         hypre_CSRMatrixDestroy(h_A_offd);
+      }
+   } /* end of forming S */
+   else
+   {
+      hypre_CSRMatrixDestroy(SLU);
+   }
+
+   /* Set output pointer */
+   *matSptr = matS;
+
+   /* Do not free perm_data/qperm_data */
+   if (perm)
+   {
+      hypre_IntArrayData(perm)  = NULL;
+   }
+   if (qperm)
+   {
+      hypre_IntArrayData(qperm) = NULL;
+   }
+
+   /* Free memory */
+   hypre_IntArrayDestroy(perm);
+   hypre_IntArrayDestroy(qperm);
+   hypre_IntArrayDestroy(rperm);
+   hypre_IntArrayDestroy(rqperm);
+   hypre_IntArrayDestroy(h_perm);
+   hypre_IntArrayDestroy(h_rperm);
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_ILUSetupIterativeILU0Device
+ *
+ * This function computes an ILU0 iteratively with rocSPARSE.
+ *
+ * Input arguments:
+ *   A - input matrix
+ *   type - algorithm for computing iterative ILU0
+ *   option - internal flags used by rocSPARSE
+ *   max_iter - max. number of iterations
+ *   tolerance - stopping criteria in iterative algorithm
+ *
+ * Output arguments:
+ *   num_iter_ptr - number of iterations
+ *   history_ptr - list of corrections and residual values for each iteration
+ *                 (computed only when the 5th bit of option is active)
+ *
+ * Note: This function requires rocSPARSE 2.4.0 at least.
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ILUSetupIterativeILU0Device(hypre_CSRMatrix  *A,
+                                  HYPRE_Int         type,
+                                  HYPRE_Int         option,
+                                  HYPRE_Int         max_iter,
+                                  HYPRE_Real        tolerance,
+                                  HYPRE_Int        *num_iter_ptr,
+                                  HYPRE_Real      **history_ptr)
+{
+#if defined (HYPRE_USING_ROCSPARSE) && (ROCSPARSE_VERSION >= 200400)
+   /* Input matrix data */
+   HYPRE_Int                 num_rows      = hypre_CSRMatrixNumRows(A);
+   HYPRE_Int                 num_cols      = hypre_CSRMatrixNumCols(A);
+   HYPRE_Int                 num_nonzeros  = hypre_CSRMatrixNumNonzeros(A);
+   HYPRE_Int                *A_i           = hypre_CSRMatrixI(A);
+   HYPRE_Int                *A_j           = hypre_CSRMatrixJ(A);
+   HYPRE_Complex            *A_data        = hypre_CSRMatrixData(A);
+   HYPRE_Complex            *A_data_new;
+
+   /* Vendor math sparse libraries data */
+   void                     *buffer        = NULL;
+   rocsparse_index_base      idx_base      = rocsparse_index_base_zero;
+   rocsparse_handle          handle        = hypre_HandleCusparseHandle(hypre_handle());
+   rocsparse_datatype        data_type;
+   size_t                    buffer_size;
+   HYPRE_Int                 history_size;
+
+   HYPRE_ANNOTATE_FUNC_BEGIN;
+   hypre_GpuProfilingPushRange("CSRMatrixITILU0");
+
+   /* Set default output */
+   *num_iter_ptr = 0;
+
+   /*-------------------------------------------------------------------------------------
+    * 0. Sanity checks
+    *-------------------------------------------------------------------------------------*/
+
+   if (num_rows != num_cols)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Not a square matrix!");
+      return hypre_error_flag;
+   }
+
+#if defined(HYPRE_COMPLEX)
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Complex data type is not supported!");
+   return hypre_error_flag;
+
+#elif defined(HYPRE_LONG_DOUBLE)
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Long-double type is not supported!");
+   return hypre_error_flag;
+
+#elif defined(HYPRE_SINGLE)
+   data_type = rocsparse_datatype_f32_r;
+
+#else
+   data_type = rocsparse_datatype_f64_r;
+#endif
+
+   /*-------------------------------------------------------------------------------------
+    * 1. Sort columns belonging to each row, then copy result to new matrix
+    *-------------------------------------------------------------------------------------*/
+
+   hypre_CSRMatrixSortRow(A);
+
+   /* TODO (VPM): make use of a non-zero initial guess if available. */
+   A_data_new = hypre_CTAlloc(HYPRE_Complex, num_nonzeros, HYPRE_MEMORY_DEVICE);
+
+   /*-------------------------------------------------------------------------------------
+    * 2. Get work array size
+    *-------------------------------------------------------------------------------------*/
+
+   HYPRE_ROCSPARSE_CALL(rocsparse_csritilu0_buffer_size(handle,
+                                                        (rocsparse_itilu0_alg) type,
+                                                        (rocsparse_int) option,
+                                                        (rocsparse_int) max_iter,
+                                                        (rocsparse_int) num_rows,
+                                                        (rocsparse_int) num_nonzeros,
+                                                        (const rocsparse_int*) A_i,
+                                                        (const rocsparse_int*) A_j,
+                                                        idx_base,
+                                                        data_type,
+                                                        &buffer_size));
+
+   /*-------------------------------------------------------------------------------------
+    * 3. Create work array on the device
+    *-------------------------------------------------------------------------------------*/
+
+   buffer = hypre_TAlloc(char, buffer_size, HYPRE_MEMORY_DEVICE);
+
+   /*-------------------------------------------------------------------------------------
+    * 4. Perform the analysis (pre-processing)
+    *-------------------------------------------------------------------------------------*/
+
+   hypre_GpuProfilingPushRange("Analysis");
+   HYPRE_ROCSPARSE_CALL(rocsparse_csritilu0_preprocess(handle,
+                                                       (rocsparse_itilu0_alg) type,
+                                                       (rocsparse_int) option,
+                                                       (rocsparse_int) max_iter,
+                                                       (rocsparse_int) num_rows,
+                                                       (rocsparse_int) num_nonzeros,
+                                                       (const rocsparse_int*) A_i,
+                                                       (const rocsparse_int*) A_j,
+                                                       idx_base,
+                                                       data_type,
+                                                       buffer_size,
+                                                       buffer));
+   hypre_GpuProfilingPopRange();
+
+   /*-------------------------------------------------------------------------------------
+    * 5. Compute the numerical factorization iteratively
+    *-------------------------------------------------------------------------------------*/
+
+   *num_iter_ptr = max_iter;
+   hypre_GpuProfilingPushRange("Factorization");
+   HYPRE_ROCSPARSE_CALL(hypre_rocsparse_csritilu0_compute(handle,
+                                                          (rocsparse_itilu0_alg) type,
+                                                          (rocsparse_int) option,
+                                                          (rocsparse_int*) num_iter_ptr,
+                                                          tolerance,
+                                                          (rocsparse_int) num_rows,
+                                                          (rocsparse_int) num_nonzeros,
+                                                          (const rocsparse_int*) A_i,
+                                                          (const rocsparse_int*) A_j,
+                                                          (const HYPRE_Complex*) A_data,
+                                                          A_data_new,
+                                                          idx_base,
+                                                          buffer_size,
+                                                          buffer));
+   hypre_GpuProfilingPopRange();
+   hypre_CSRMatrixData(A) = A_data_new;
+   hypre_TFree(A_data, HYPRE_MEMORY_DEVICE);
+
+   /*-------------------------------------------------------------------------------------
+    * 6. Compute history if requested
+    *-------------------------------------------------------------------------------------*/
+
+   if (option & rocsparse_itilu0_option_convergence_history)
+   {
+      history_size = (*num_iter_ptr) * 2;
+      *history_ptr = hypre_TAlloc(HYPRE_Complex, history_size, HYPRE_MEMORY_HOST);
+
+      HYPRE_ROCSPARSE_CALL(hypre_rocsparse_csritilu0_history(handle,
+                                                             (rocsparse_itilu0_alg) type,
+                                                             (rocsparse_int*) num_iter_ptr,
+                                                             *history_ptr,
+                                                             buffer_size,
+                                                             buffer));
+   }
+
+   /*-------------------------------------------------------------------------------------
+    * 7. Free memory
+    *-------------------------------------------------------------------------------------*/
+
+   /* Free buffer */
+   hypre_TFree(buffer, HYPRE_MEMORY_DEVICE);
+
+   hypre_GpuProfilingPopRange();
+   HYPRE_ANNOTATE_FUNC_END;
+#else
+   HYPRE_UNUSED_VAR(A);
+   HYPRE_UNUSED_VAR(type);
+   HYPRE_UNUSED_VAR(option);
+   HYPRE_UNUSED_VAR(max_iter);
+   HYPRE_UNUSED_VAR(tolerance);
+   HYPRE_UNUSED_VAR(num_iter_ptr);
+   HYPRE_UNUSED_VAR(history_ptr);
+
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Iterative ILU0 requires rocSPARSE 2.4.0 at least!");
+#endif
+
+   return hypre_error_flag;
+}
+
+#endif /* defined(HYPRE_USING_GPU) */
diff --git a/external/hypre/src/parcsr_ls/par_ilu_solve.c b/external/hypre/src/parcsr_ls/par_ilu_solve.c
index 3c3530d9..45b113fc 100644
--- a/external/hypre/src/parcsr_ls/par_ilu_solve.c
+++ b/external/hypre/src/parcsr_ls/par_ilu_solve.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -13,109 +13,107 @@
 
 #include "_hypre_parcsr_ls.h"
 #include "_hypre_utilities.hpp"
-#include "par_ilu.h"
 
 /*--------------------------------------------------------------------
  * hypre_ILUSolve
+ *
+ * TODO (VPM): Change variable names of F_array and U_array
  *--------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_ILUSolve( void               *ilu_vdata,
                 hypre_ParCSRMatrix *A,
                 hypre_ParVector    *f,
                 hypre_ParVector    *u )
 {
-   MPI_Comm             comm           = hypre_ParCSRMatrixComm(A);
-   //   HYPRE_Int            i;
-
-   hypre_ParILUData     *ilu_data      = (hypre_ParILUData*) ilu_vdata;
-
-#ifdef HYPRE_USING_CUDA
-   /* pointers to cusparse data, note that they are not NULL only when needed */
-   cusparseMatDescr_t      matL_des          = hypre_ParILUDataMatLMatrixDescription(ilu_data);
-   cusparseMatDescr_t      matU_des          = hypre_ParILUDataMatUMatrixDescription(ilu_data);
-   void                    *ilu_solve_buffer = hypre_ParILUDataILUSolveBuffer(ilu_data);//device memory
-   cusparseSolvePolicy_t   ilu_solve_policy  = hypre_ParILUDataILUSolvePolicy(ilu_data);
-   hypre_CSRMatrix         *matALU_d         = hypre_ParILUDataMatAILUDevice(ilu_data);
-   hypre_CSRMatrix         *matBLU_d         = hypre_ParILUDataMatBILUDevice(ilu_data);
-   //hypre_CSRMatrix         *matSLU_d         = hypre_ParILUDataMatSILUDevice(ilu_data);
-   hypre_CSRMatrix         *matE_d           = hypre_ParILUDataMatEDevice(ilu_data);
-   hypre_CSRMatrix         *matF_d           = hypre_ParILUDataMatFDevice(ilu_data);
-   csrsv2Info_t            matAL_info        = hypre_ParILUDataMatALILUSolveInfo(ilu_data);
-   csrsv2Info_t            matAU_info        = hypre_ParILUDataMatAUILUSolveInfo(ilu_data);
-   csrsv2Info_t            matBL_info        = hypre_ParILUDataMatBLILUSolveInfo(ilu_data);
-   csrsv2Info_t            matBU_info        = hypre_ParILUDataMatBUILUSolveInfo(ilu_data);
-   csrsv2Info_t            matSL_info        = hypre_ParILUDataMatSLILUSolveInfo(ilu_data);
-   csrsv2Info_t            matSU_info        = hypre_ParILUDataMatSUILUSolveInfo(ilu_data);
-   hypre_ParCSRMatrix      *Aperm            = hypre_ParILUDataAperm(ilu_data);
-   //hypre_ParCSRMatrix      *R                = hypre_ParILUDataR(ilu_data);
-   //hypre_ParCSRMatrix      *P                = hypre_ParILUDataP(ilu_data);
+   MPI_Comm              comm               = hypre_ParCSRMatrixComm(A);
+   hypre_ParILUData     *ilu_data           = (hypre_ParILUData*) ilu_vdata;
+
+   /* Matrices */
+   hypre_ParCSRMatrix   *matmL              = hypre_ParILUDataMatLModified(ilu_data);
+   hypre_ParCSRMatrix   *matmU              = hypre_ParILUDataMatUModified(ilu_data);
+   hypre_ParCSRMatrix   *matA               = hypre_ParILUDataMatA(ilu_data);
+   hypre_ParCSRMatrix   *matL               = hypre_ParILUDataMatL(ilu_data);
+   hypre_ParCSRMatrix   *matU               = hypre_ParILUDataMatU(ilu_data);
+   hypre_ParCSRMatrix   *matS               = hypre_ParILUDataMatS(ilu_data);
+   HYPRE_Real           *matD               = hypre_ParILUDataMatD(ilu_data);
+   HYPRE_Real           *matmD              = hypre_ParILUDataMatDModified(ilu_data);
+
+   /* Vectors */
+   HYPRE_Int             ilu_type           = hypre_ParILUDataIluType(ilu_data);
+   HYPRE_Int            *perm               = hypre_ParILUDataPerm(ilu_data);
+   HYPRE_Int            *qperm              = hypre_ParILUDataQPerm(ilu_data);
+   hypre_ParVector      *F_array            = hypre_ParILUDataF(ilu_data);
+   hypre_ParVector      *U_array            = hypre_ParILUDataU(ilu_data);
+
+   /* Device data */
+#if defined(HYPRE_USING_GPU)
+   hypre_CSRMatrix      *matALU_d           = hypre_ParILUDataMatAILUDevice(ilu_data);
+   hypre_CSRMatrix      *matBLU_d           = hypre_ParILUDataMatBILUDevice(ilu_data);
+   hypre_CSRMatrix      *matE_d             = hypre_ParILUDataMatEDevice(ilu_data);
+   hypre_CSRMatrix      *matF_d             = hypre_ParILUDataMatFDevice(ilu_data);
+   hypre_ParCSRMatrix   *Aperm              = hypre_ParILUDataAperm(ilu_data);
+   hypre_Vector         *Adiag_diag         = hypre_ParILUDataADiagDiag(ilu_data);
+   hypre_Vector         *Sdiag_diag         = hypre_ParILUDataSDiagDiag(ilu_data);
+   hypre_ParVector      *Ztemp              = hypre_ParILUDataZTemp(ilu_data);
+   HYPRE_Int             test_opt           = hypre_ParILUDataTestOption(ilu_data);
 #endif
 
-   /* get matrices */
-   HYPRE_Int            ilu_type       = hypre_ParILUDataIluType(ilu_data);
-   HYPRE_Int            *perm          = hypre_ParILUDataPerm(ilu_data);
-   HYPRE_Int            *qperm         = hypre_ParILUDataQPerm(ilu_data);
-   hypre_ParCSRMatrix   *matA          = hypre_ParILUDataMatA(ilu_data);
-   hypre_ParCSRMatrix   *matL          = hypre_ParILUDataMatL(ilu_data);
-   HYPRE_Real           *matD          = hypre_ParILUDataMatD(ilu_data);
-   hypre_ParCSRMatrix   *matU          = hypre_ParILUDataMatU(ilu_data);
-#ifndef HYPRE_USING_CUDA
-   hypre_ParCSRMatrix   *matmL         = hypre_ParILUDataMatLModified(ilu_data);
-   HYPRE_Real           *matmD         = hypre_ParILUDataMatDModified(ilu_data);
-   hypre_ParCSRMatrix   *matmU         = hypre_ParILUDataMatUModified(ilu_data);
-#endif
-   hypre_ParCSRMatrix   *matS          = hypre_ParILUDataMatS(ilu_data);
-
-   HYPRE_Int            iter, num_procs,  my_id;
-
-   hypre_ParVector      *F_array       = hypre_ParILUDataF(ilu_data);
-   hypre_ParVector      *U_array       = hypre_ParILUDataU(ilu_data);
-
-   /* get settings */
-   HYPRE_Real           tol            = hypre_ParILUDataTol(ilu_data);
-   HYPRE_Int            logging        = hypre_ParILUDataLogging(ilu_data);
-   HYPRE_Int            print_level    = hypre_ParILUDataPrintLevel(ilu_data);
-   HYPRE_Int            max_iter       = hypre_ParILUDataMaxIter(ilu_data);
-   HYPRE_Real           *norms         = hypre_ParILUDataRelResNorms(ilu_data);
-   hypre_ParVector      *Ftemp         = hypre_ParILUDataFTemp(ilu_data);
-   hypre_ParVector      *Utemp         = hypre_ParILUDataUTemp(ilu_data);
-   hypre_ParVector      *Xtemp         = hypre_ParILUDataXTemp(ilu_data);
-   hypre_ParVector      *Ytemp         = hypre_ParILUDataYTemp(ilu_data);
-   HYPRE_Real           *fext          = hypre_ParILUDataFExt(ilu_data);
-   HYPRE_Real           *uext          = hypre_ParILUDataUExt(ilu_data);
-   hypre_ParVector      *residual;
-
-   HYPRE_Real           alpha          = -1;
-   HYPRE_Real           beta           = 1;
-   HYPRE_Real           conv_factor    = 0.0;
-   HYPRE_Real           resnorm        = 1.0;
-   HYPRE_Real           init_resnorm   = 0.0;
-   HYPRE_Real           rel_resnorm;
-   HYPRE_Real           rhs_norm       = 0.0;
-   HYPRE_Real           old_resnorm;
-   HYPRE_Real           ieee_check     = 0.0;
-   HYPRE_Real           operat_cmplxty = hypre_ParILUDataOperatorComplexity(ilu_data);
-
-   HYPRE_Int            Solve_err_flag;
-#ifdef HYPRE_USING_CUDA   
-   HYPRE_Int            test_opt;
-#endif
+   /* Solver settings */
+   HYPRE_Real            tol                = hypre_ParILUDataTol(ilu_data);
+   HYPRE_Int             logging            = hypre_ParILUDataLogging(ilu_data);
+   HYPRE_Int             print_level        = hypre_ParILUDataPrintLevel(ilu_data);
+   HYPRE_Int             max_iter           = hypre_ParILUDataMaxIter(ilu_data);
+   HYPRE_Int             tri_solve          = hypre_ParILUDataTriSolve(ilu_data);
+   HYPRE_Int             lower_jacobi_iters = hypre_ParILUDataLowerJacobiIters(ilu_data);
+   HYPRE_Int             upper_jacobi_iters = hypre_ParILUDataUpperJacobiIters(ilu_data);
+   HYPRE_Real           *norms              = hypre_ParILUDataRelResNorms(ilu_data);
+   hypre_ParVector      *Ftemp              = hypre_ParILUDataFTemp(ilu_data);
+   hypre_ParVector      *Utemp              = hypre_ParILUDataUTemp(ilu_data);
+   hypre_ParVector      *Xtemp              = hypre_ParILUDataXTemp(ilu_data);
+   hypre_ParVector      *Ytemp              = hypre_ParILUDataYTemp(ilu_data);
+   HYPRE_Real           *fext               = hypre_ParILUDataFExt(ilu_data);
+   HYPRE_Real           *uext               = hypre_ParILUDataUExt(ilu_data);
+   hypre_ParVector      *residual           = NULL;
+   HYPRE_Real            alpha              = -1.0;
+   HYPRE_Real            beta               = 1.0;
+   HYPRE_Real            conv_factor        = 0.0;
+   HYPRE_Real            resnorm            = 1.0;
+   HYPRE_Real            init_resnorm       = 0.0;
+   HYPRE_Real            rel_resnorm;
+   HYPRE_Real            rhs_norm           = 0.0;
+   HYPRE_Real            old_resnorm;
+   HYPRE_Real            ieee_check         = 0.0;
+   HYPRE_Real            operat_cmplxty     = hypre_ParILUDataOperatorComplexity(ilu_data);
+   HYPRE_Int             Solve_err_flag;
+   HYPRE_Int             iter, num_procs, my_id;
 
    /* problem size */
-   HYPRE_Int            n              = hypre_CSRMatrixNumRows(hypre_ParCSRMatrixDiag(A));
-   HYPRE_Int            nLU            = hypre_ParILUDataNLU(ilu_data);
-   HYPRE_Int            *u_end         = hypre_ParILUDataUEnd(ilu_data);
+   HYPRE_Int             n                  = hypre_ParCSRMatrixNumRows(A);
+   HYPRE_Int             nLU                = hypre_ParILUDataNLU(ilu_data);
+   HYPRE_Int            *u_end              = hypre_ParILUDataUEnd(ilu_data);
 
    /* Schur system solve */
-   HYPRE_Solver         schur_solver   = hypre_ParILUDataSchurSolver(ilu_data);
-   HYPRE_Solver         schur_precond  = hypre_ParILUDataSchurPrecond(ilu_data);
-   hypre_ParVector      *rhs           = hypre_ParILUDataRhs(ilu_data);
-   hypre_ParVector      *x             = hypre_ParILUDataX(ilu_data);
+   HYPRE_Solver          schur_solver       = hypre_ParILUDataSchurSolver(ilu_data);
+   HYPRE_Solver          schur_precond      = hypre_ParILUDataSchurPrecond(ilu_data);
+   hypre_ParVector      *rhs                = hypre_ParILUDataRhs(ilu_data);
+   hypre_ParVector      *x                  = hypre_ParILUDataX(ilu_data);
+
+#if defined(HYPRE_USING_GPU)
+   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy2( hypre_ParCSRMatrixMemoryLocation(A),
+                                                      hypre_ParVectorMemoryLocation(f) );
+
+   /* VPM: Placeholder check to avoid -Wunused-variable warning. TODO: remove this */
+   if (exec != HYPRE_EXEC_DEVICE && exec != HYPRE_EXEC_HOST)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Need to run either on host or device!");
+      return hypre_error_flag;
+   }
+#endif
 
-   /* begin */
    HYPRE_ANNOTATE_FUNC_BEGIN;
 
-   if(logging > 1)
+   if (logging > 1)
    {
       residual = hypre_ParILUDataResidual(ilu_data);
    }
@@ -123,11 +121,12 @@ hypre_ILUSolve( void               *ilu_vdata,
    hypre_ParILUDataNumIterations(ilu_data) = 0;
 
    hypre_MPI_Comm_size(comm, &num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_rank(comm, &my_id);
 
    /*-----------------------------------------------------------------------
     *    Write the solver parameters
     *-----------------------------------------------------------------------*/
+
    if (my_id == 0 && print_level > 1)
    {
       hypre_ILUWriteSolverParams(ilu_data);
@@ -138,6 +137,7 @@ hypre_ILUSolve( void               *ilu_vdata,
     *-----------------------------------------------------------------------*/
 
    Solve_err_flag = 0;
+
    /*-----------------------------------------------------------------------
     *     write some initial info
     *-----------------------------------------------------------------------*/
@@ -147,20 +147,20 @@ hypre_ILUSolve( void               *ilu_vdata,
       hypre_printf("\n\n ILU SOLVER SOLUTION INFO:\n");
    }
 
-
    /*-----------------------------------------------------------------------
     *    Compute initial residual and print
     *-----------------------------------------------------------------------*/
+
    if (print_level > 1 || logging > 1 || tol > 0.)
    {
-      if ( logging > 1 )
+      if (logging > 1)
       {
-         hypre_ParVectorCopy(f, residual );
+         hypre_ParVectorCopy(f, residual);
          if (tol > 0.0)
          {
-            hypre_ParCSRMatrixMatvec(alpha, A, u, beta, residual );
+            hypre_ParCSRMatrixMatvec(alpha, A, u, beta, residual);
          }
-         resnorm = sqrt(hypre_ParVectorInnerProd( residual, residual ));
+         resnorm = hypre_sqrt(hypre_ParVectorInnerProd(residual, residual));
       }
       else
       {
@@ -169,14 +169,14 @@ hypre_ILUSolve( void               *ilu_vdata,
          {
             hypre_ParCSRMatrixMatvec(alpha, A, u, beta, Ftemp);
          }
-         resnorm = sqrt(hypre_ParVectorInnerProd(Ftemp, Ftemp));
+         resnorm = hypre_sqrt(hypre_ParVectorInnerProd(Ftemp, Ftemp));
       }
 
-      /* Since it is does not diminish performance, attempt to return an error flag
+      /* Since it does not diminish performance, attempt to return an error flag
          and notify users when they supply bad input. */
       if (resnorm != 0.)
       {
-         ieee_check = resnorm/resnorm; /* INF -> NaN conversion */
+         ieee_check = resnorm / resnorm; /* INF -> NaN conversion */
       }
       if (ieee_check != ieee_check)
       {
@@ -199,7 +199,7 @@ hypre_ILUSolve( void               *ilu_vdata,
       }
 
       init_resnorm = resnorm;
-      rhs_norm = sqrt(hypre_ParVectorInnerProd(f, f));
+      rhs_norm = hypre_sqrt(hypre_ParVectorInnerProd(f, f));
       if (rhs_norm > HYPRE_REAL_EPSILON)
       {
          rel_resnorm = init_resnorm / rhs_norm;
@@ -208,7 +208,7 @@ hypre_ILUSolve( void               *ilu_vdata,
       {
          /* rhs is zero, return a zero solution */
          hypre_ParVectorSetConstantValues(U_array, 0.0);
-         if(logging > 0)
+         if (logging > 0)
          {
             rel_resnorm = 0.0;
             hypre_ParILUDataFinalRelResidualNorm(ilu_data) = rel_resnorm;
@@ -228,75 +228,156 @@ hypre_ILUSolve( void               *ilu_vdata,
       hypre_printf("                                            relative\n");
       hypre_printf("               residual        factor       residual\n");
       hypre_printf("               --------        ------       --------\n");
-      hypre_printf("    Initial    %e                 %e\n",init_resnorm,
-            rel_resnorm);
+      hypre_printf("    Initial    %e                 %e\n", init_resnorm,
+                   rel_resnorm);
    }
 
-   matA = A;
+   matA    = A;
    U_array = u;
    F_array = f;
 
    /************** Main Solver Loop - always do 1 iteration ************/
    iter = 0;
 
-   while ((rel_resnorm >= tol || iter < 1)
-         && iter < max_iter)
+   while ((rel_resnorm >= tol || iter < 1) &&
+          (iter < max_iter))
    {
+      /* Do one solve on LU*e = r */
+      switch (ilu_type)
+      {
+      case 0: case 1: default:
+            /* TODO (VPM): Encapsulate host and device functions into a single one */
+#if defined(HYPRE_USING_GPU)
+            if (exec == HYPRE_EXEC_DEVICE)
+            {
+               /* Apply GPU-accelerated LU solve - BJ-ILU0 */
+               if (tri_solve == 1)
+               {
+                  hypre_ILUSolveLUDevice(matA, matBLU_d, F_array, U_array, perm, Utemp, Ftemp);
+               }
+               else
+               {
+                  hypre_ILUSolveLUIterDevice(matA, matBLU_d, F_array, U_array, perm,
+                                             Utemp, Ftemp, Ztemp, &Adiag_diag,
+                                             lower_jacobi_iters, upper_jacobi_iters);
 
-      /* Do one solve on LUe=r */
-      switch(ilu_type){
-         case 0: case 1:
-#ifdef HYPRE_USING_CUDA
-            /* Apply GPU-accelerated LU solve */
-            hypre_ILUSolveCusparseLU(matA, matL_des, matU_des, matBL_info, matBU_info, matBLU_d, ilu_solve_policy,
-                                    ilu_solve_buffer, F_array, U_array, perm, n, Utemp, Ftemp);//BJ-cusparse
-#else
-            hypre_ILUSolveLU(matA, F_array, U_array, perm, n, matL, matD, matU, Utemp, Ftemp); //BJ
+                  /* Assign this now, in case it was set in method above */
+                  hypre_ParILUDataADiagDiag(ilu_data) = Adiag_diag;
+               }
+            }
+            else
 #endif
+            {
+               /* BJ - hypre_ilu */
+               if (tri_solve == 1)
+               {
+                  hypre_ILUSolveLU(matA, F_array, U_array, perm, n,
+                                   matL, matD, matU, Utemp, Ftemp);
+               }
+               else
+               {
+                  hypre_ILUSolveLUIter(matA, F_array, U_array, perm, n,
+                                       matL, matD, matU, Utemp, Ftemp,
+                                       lower_jacobi_iters, upper_jacobi_iters);
+               }
+            }
             break;
+
          case 10: case 11:
-#ifdef HYPRE_USING_CUDA
-            /* Apply GPU-accelerated LU solve */
-            hypre_ILUSolveCusparseSchurGMRES(matA, F_array, U_array, perm, nLU, matS, Utemp, Ftemp, schur_solver, schur_precond, rhs, x, u_end,
-                                          matL_des, matU_des, matBL_info, matBU_info, matSL_info, matSU_info,
-                                          matBLU_d, matE_d, matF_d, ilu_solve_policy, ilu_solve_buffer);//GMRES-cusparse
-#else
-            hypre_ILUSolveSchurGMRES(matA, F_array, U_array, perm, perm, nLU, matL, matD, matU, matS,
-                           Utemp, Ftemp, schur_solver, schur_precond, rhs, x, u_end); //GMRES
+#if defined(HYPRE_USING_GPU)
+            if (exec == HYPRE_EXEC_DEVICE)
+            {
+               /* Apply GPU-accelerated GMRES-ILU solve */
+               if (tri_solve == 1)
+               {
+                  hypre_ILUSolveSchurGMRESDevice(matA, F_array, U_array, perm, nLU, matS,
+                                                 Utemp, Ftemp, schur_solver, schur_precond,
+                                                 rhs, x, u_end, matBLU_d, matE_d, matF_d);
+               }
+               else
+               {
+                  hypre_ILUSolveSchurGMRESJacIterDevice(matA, F_array, U_array, perm, nLU, matS,
+                                                        Utemp, Ftemp, schur_solver, schur_precond,
+                                                        rhs, x, u_end, matBLU_d, matE_d, matF_d,
+                                                        Ztemp, &Adiag_diag, &Sdiag_diag,
+                                                        lower_jacobi_iters, upper_jacobi_iters);
+
+                  /* Assign this now, in case it was set in method above */
+                  hypre_ParILUDataADiagDiag(ilu_data) = Adiag_diag;
+                  hypre_ParILUDataSDiagDiag(ilu_data) = Sdiag_diag;
+               }
+            }
+            else
 #endif
+            {
+               hypre_ILUSolveSchurGMRES(matA, F_array, U_array, perm, perm, nLU,
+                                        matL, matD, matU, matS, Utemp, Ftemp,
+                                        schur_solver, schur_precond, rhs, x, u_end);
+            }
             break;
+
          case 20: case 21:
+#if defined(HYPRE_USING_GPU) && !defined(HYPRE_USING_UNIFIED_MEMORY)
+            if (exec == HYPRE_EXEC_DEVICE)
+            {
+               hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                                 "NSH+ILU solve on device runs requires unified memory!");
+               return hypre_error_flag;
+            }
+#endif
+            /* NSH+ILU */
             hypre_ILUSolveSchurNSH(matA, F_array, U_array, perm, nLU, matL, matD, matU, matS,
-                  Utemp, Ftemp, schur_solver, rhs, x, u_end); //MR+NSH
+                                   Utemp, Ftemp, schur_solver, rhs, x, u_end);
             break;
+
          case 30: case 31:
-            hypre_ILUSolveLURAS(matA, F_array, U_array, perm, matL, matD, matU, Utemp, Utemp, fext, uext); //RAS
+#if defined(HYPRE_USING_GPU) && !defined(HYPRE_USING_UNIFIED_MEMORY)
+            if (exec == HYPRE_EXEC_DEVICE)
+            {
+               hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                                 "RAS+ILU solve on device runs requires unified memory!");
+               return hypre_error_flag;
+            }
+#endif
+            /* RAS */
+            hypre_ILUSolveLURAS(matA, F_array, U_array, perm, matL, matD, matU,
+                                Utemp, Utemp, fext, uext);
             break;
+
          case 40: case 41:
-            hypre_ILUSolveSchurGMRES(matA, F_array, U_array, perm, qperm, nLU, matL, matD, matU, matS,
-                  Utemp, Ftemp, schur_solver, schur_precond, rhs, x, u_end); //GMRES
-            break;
-         case 50:
-#ifdef HYPRE_USING_CUDA
-            test_opt = hypre_ParILUDataTestOption(ilu_data);
-            hypre_ILUSolveRAPGMRES(matA, F_array, U_array, perm, nLU, matS, Utemp, Ftemp, Xtemp, Ytemp, schur_solver, schur_precond, rhs, x, u_end,
-                                 matL_des, matU_des, matAL_info, matAU_info, matBL_info, matBU_info, matSL_info, matSU_info,
-                                 Aperm, matALU_d, matBLU_d, matE_d, matF_d, ilu_solve_policy, ilu_solve_buffer, test_opt);//GMRES-RAP
-#else
-            hypre_ILUSolveRAPGMRESHOST(matA, F_array, U_array, perm, nLU, matL, matD, matU, matmL, matmD, matmU, Utemp, Ftemp, Xtemp, Ytemp,
-                  schur_solver, schur_precond, rhs, x, u_end);//GMRES-RAP
+#if defined(HYPRE_USING_GPU) && !defined(HYPRE_USING_UNIFIED_MEMORY)
+            if (exec == HYPRE_EXEC_DEVICE)
+            {
+               hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                                 "ddPQ+GMRES+ILU solve on device runs requires unified memory!");
+               return hypre_error_flag;
+            }
 #endif
+
+            /* ddPQ + GMRES + hypre_ilu[k,t]() */
+            hypre_ILUSolveSchurGMRES(matA, F_array, U_array, perm, qperm, nLU,
+                                     matL, matD, matU, matS, Utemp, Ftemp,
+                                     schur_solver, schur_precond, rhs, x, u_end);
             break;
-         default:
-#ifdef HYPRE_USING_CUDA
-         /* Apply GPU-accelerated LU solve */
-            hypre_ILUSolveCusparseLU(matA, matL_des, matU_des, matBL_info, matBU_info, matBLU_d, ilu_solve_policy,
-                                    ilu_solve_buffer, F_array, U_array, perm, n, Utemp, Ftemp);//BJ-cusparse
-#else
-            hypre_ILUSolveLU(matA, F_array, U_array, perm, n, matL, matD, matU, Utemp, Ftemp); //BJ
+
+         case 50:
+            /* GMRES-RAP */
+#if defined(HYPRE_USING_GPU)
+            if (exec == HYPRE_EXEC_DEVICE)
+            {
+               hypre_ILUSolveRAPGMRESDevice(matA, F_array, U_array, perm, nLU, matS, Utemp, Ftemp,
+                                            Xtemp, Ytemp, schur_solver, schur_precond, rhs, x,
+                                            u_end, Aperm, matALU_d, matBLU_d, matE_d, matF_d,
+                                            test_opt);
+            }
+            else
 #endif
+            {
+               hypre_ILUSolveRAPGMRESHost(matA, F_array, U_array, perm, nLU, matL, matD, matU,
+                                          matmL, matmD, matmU, Utemp, Ftemp, Xtemp, Ytemp,
+                                          schur_solver, schur_precond, rhs, x, u_end);
+            }
             break;
-
       }
 
       /*---------------------------------------------------------------
@@ -307,19 +388,28 @@ hypre_ILUSolve( void               *ilu_vdata,
       {
          old_resnorm = resnorm;
 
-         if ( logging > 1 ) {
+         if (logging > 1)
+         {
             hypre_ParVectorCopy(F_array, residual);
-            hypre_ParCSRMatrixMatvec(alpha, matA, U_array, beta, residual );
-            resnorm = sqrt(hypre_ParVectorInnerProd( residual, residual ));
+            hypre_ParCSRMatrixMatvec(alpha, matA, U_array, beta, residual);
+            resnorm = hypre_sqrt(hypre_ParVectorInnerProd(residual, residual));
          }
-         else {
+         else
+         {
             hypre_ParVectorCopy(F_array, Ftemp);
             hypre_ParCSRMatrixMatvec(alpha, matA, U_array, beta, Ftemp);
-            resnorm = sqrt(hypre_ParVectorInnerProd(Ftemp, Ftemp));
+            resnorm = hypre_sqrt(hypre_ParVectorInnerProd(Ftemp, Ftemp));
+         }
+
+         if (old_resnorm)
+         {
+            conv_factor = resnorm / old_resnorm;
+         }
+         else
+         {
+            conv_factor = resnorm;
          }
 
-         if (old_resnorm) conv_factor = resnorm / old_resnorm;
-         else conv_factor = resnorm;
          if (rhs_norm > HYPRE_REAL_EPSILON)
          {
             rel_resnorm = resnorm / rhs_norm;
@@ -339,7 +429,7 @@ hypre_ILUSolve( void               *ilu_vdata,
       if (my_id == 0 && print_level > 1)
       {
          hypre_printf("    ILUSolve %2d   %e    %f     %e \n", iter,
-               resnorm, conv_factor, rel_resnorm);
+                      resnorm, conv_factor, rel_resnorm);
       }
    }
 
@@ -357,7 +447,7 @@ hypre_ILUSolve( void               *ilu_vdata,
 
    if (iter > 0 && init_resnorm)
    {
-      conv_factor = pow((resnorm/init_resnorm),(1.0/(HYPRE_Real) iter));
+      conv_factor = hypre_pow((resnorm / init_resnorm), (1.0 / (HYPRE_Real) iter));
    }
    else
    {
@@ -373,11 +463,11 @@ hypre_ILUSolve( void               *ilu_vdata,
          {
             hypre_printf("\n\n==============================================");
             hypre_printf("\n NOTE: Convergence tolerance was not achieved\n");
-            hypre_printf("      within the allowed %d iterations\n",max_iter);
+            hypre_printf("      within the allowed %d iterations\n", max_iter);
             hypre_printf("==============================================");
          }
-         hypre_printf("\n\n Average Convergence Factor = %f \n",conv_factor);
-         hypre_printf("                operator = %f\n",operat_cmplxty);
+         hypre_printf("\n\n Average Convergence Factor = %f \n", conv_factor);
+         hypre_printf("                operator = %f\n", operat_cmplxty);
       }
    }
 
@@ -386,78 +476,81 @@ hypre_ILUSolve( void               *ilu_vdata,
    return hypre_error_flag;
 }
 
-/* Schur Complement solve with GMRES on schur complement
- * ParCSRMatrix S is already built in ilu data sturcture, here directly use S
- * L, D and U factors only have local scope (no off-diagonal processor terms)
- * so apart from the residual calculation (which uses A), the solves with the
- * L and U factors are local.
+/*--------------------------------------------------------------------
+ * hypre_ILUSolveSchurGMRES
+ *
+ * Schur Complement solve with GMRES on schur complement
+ *
+ * ParCSRMatrix S is already built in ilu data sturcture, here directly
+ * use S, L, D and U factors only have local scope (no off-diag terms)
+ * so apart from the residual calculation (which uses A), the solves
+ * with the L and U factors are local.
+ *
  * S is the global Schur complement
  * schur_solver is a GMRES solver
  * schur_precond is the ILU preconditioner for GMRES
  * rhs and x are helper vector for solving Schur system
-*/
+ *--------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_ILUSolveSchurGMRES(hypre_ParCSRMatrix *A, hypre_ParVector    *f,
-                  hypre_ParVector    *u, HYPRE_Int *perm, HYPRE_Int *qperm,
-                  HYPRE_Int nLU, hypre_ParCSRMatrix *L,
-                  HYPRE_Real* D, hypre_ParCSRMatrix *U,
-                  hypre_ParCSRMatrix *S,
-                  hypre_ParVector *ftemp, hypre_ParVector *utemp,
-                  HYPRE_Solver schur_solver, HYPRE_Solver schur_precond,
-                  hypre_ParVector *rhs, hypre_ParVector *x, HYPRE_Int *u_end)
+hypre_ILUSolveSchurGMRES(hypre_ParCSRMatrix *A,
+                         hypre_ParVector    *f,
+                         hypre_ParVector    *u,
+                         HYPRE_Int          *perm,
+                         HYPRE_Int          *qperm,
+                         HYPRE_Int           nLU,
+                         hypre_ParCSRMatrix *L,
+                         HYPRE_Real         *D,
+                         hypre_ParCSRMatrix *U,
+                         hypre_ParCSRMatrix *S,
+                         hypre_ParVector    *ftemp,
+                         hypre_ParVector    *utemp,
+                         HYPRE_Solver        schur_solver,
+                         HYPRE_Solver        schur_precond,
+                         hypre_ParVector    *rhs,
+                         hypre_ParVector    *x,
+                         HYPRE_Int          *u_end)
 {
-   /* data objects for communication */
-   //   MPI_Comm          comm = hypre_ParCSRMatrixComm(A);
+   HYPRE_UNUSED_VAR(schur_precond);
 
-   /* data objects for L and U */
-   hypre_CSRMatrix   *L_diag = hypre_ParCSRMatrixDiag(L);
+   /* Data objects for L and U */
+   hypre_CSRMatrix   *L_diag      = hypre_ParCSRMatrixDiag(L);
    HYPRE_Real        *L_diag_data = hypre_CSRMatrixData(L_diag);
-   HYPRE_Int         *L_diag_i = hypre_CSRMatrixI(L_diag);
-   HYPRE_Int         *L_diag_j = hypre_CSRMatrixJ(L_diag);
-   hypre_CSRMatrix   *U_diag = hypre_ParCSRMatrixDiag(U);
+   HYPRE_Int         *L_diag_i    = hypre_CSRMatrixI(L_diag);
+   HYPRE_Int         *L_diag_j    = hypre_CSRMatrixJ(L_diag);
+   hypre_CSRMatrix   *U_diag      = hypre_ParCSRMatrixDiag(U);
    HYPRE_Real        *U_diag_data = hypre_CSRMatrixData(U_diag);
-   HYPRE_Int         *U_diag_i = hypre_CSRMatrixI(U_diag);
-   HYPRE_Int         *U_diag_j = hypre_CSRMatrixJ(U_diag);
+   HYPRE_Int         *U_diag_i    = hypre_CSRMatrixI(U_diag);
+   HYPRE_Int         *U_diag_j    = hypre_CSRMatrixJ(U_diag);
+
+   /* Vectors */
    hypre_Vector      *utemp_local = hypre_ParVectorLocalVector(utemp);
    HYPRE_Real        *utemp_data  = hypre_VectorData(utemp_local);
    hypre_Vector      *ftemp_local = hypre_ParVectorLocalVector(ftemp);
    HYPRE_Real        *ftemp_data  = hypre_VectorData(ftemp_local);
+   HYPRE_Real         alpha       = -1.0;
+   HYPRE_Real         beta        = 1.0;
+   HYPRE_Int          i, j, k1, k2, col;
 
-   HYPRE_Real        alpha;
-   HYPRE_Real        beta;
-   HYPRE_Int         i, j, k1, k2, col;
-
-   /* problem size */
-   HYPRE_Int         n = hypre_CSRMatrixNumRows(L_diag);
-   //   HYPRE_Int         m = n - nLU;
-
-   /* other data objects for computation */
-   //   hypre_Vector      *f_local;
-   //   HYPRE_Real        *f_data;
+   /* Problem size */
+   HYPRE_Int          n           = hypre_CSRMatrixNumRows(L_diag);
    hypre_Vector      *rhs_local;
    HYPRE_Real        *rhs_data;
    hypre_Vector      *x_local;
    HYPRE_Real        *x_data;
 
-   /* begin */
-   beta = 1.0;
-   alpha = -1.0;
-
-   /* compute residual */
+   /* Compute residual */
    hypre_ParCSRMatrixMatvecOutOfPlace(alpha, A, u, beta, f, ftemp);
 
    /* 1st need to solve LBi*xi = fi
     * L solve, solve xi put in u_temp upper
     */
-   //   f_local = hypre_ParVectorLocalVector(f);
-   //   f_data = hypre_VectorData(f_local);
    /* now update with L to solve */
-   for(i = 0 ; i < nLU ; i ++)
+   for (i = 0 ; i < nLU ; i ++)
    {
       utemp_data[qperm[i]] = ftemp_data[perm[i]];
-      k1 = L_diag_i[i] ; k2 = L_diag_i[i+1];
-      for(j = k1 ; j < k2 ; j ++)
+      k1 = L_diag_i[i] ; k2 = L_diag_i[i + 1];
+      for (j = k1 ; j < k2 ; j ++)
       {
          utemp_data[qperm[i]] -= L_diag_data[j] * utemp_data[qperm[L_diag_j[j]]];
       }
@@ -466,10 +559,10 @@ hypre_ILUSolveSchurGMRES(hypre_ParCSRMatrix *A, hypre_ParVector    *f,
    /* 2nd need to compute g'i = gi - Ei*UBi^-1*xi
     * now put g'i into the f_temp lower
     */
-   for(i = nLU ; i < n ; i ++)
+   for (i = nLU ; i < n ; i ++)
    {
-      k1 = L_diag_i[i] ; k2 = L_diag_i[i+1];
-      for(j = k1 ; j < k2 ; j ++)
+      k1 = L_diag_i[i] ; k2 = L_diag_i[i + 1];
+      for (j = k1 ; j < k2 ; j ++)
       {
          col = L_diag_j[j];
          ftemp_data[perm[i]] -= L_diag_data[j] * utemp_data[qperm[col]];
@@ -481,10 +574,11 @@ hypre_ILUSolveSchurGMRES(hypre_ParCSRMatrix *A, hypre_ParVector    *f,
     * solve y put in u_temp lower
     * only solve whe S is not NULL
     */
-   if(S)
+   if (S)
    {
       /*initialize solution to zero for residual equation */
       hypre_ParVectorSetConstantValues(x, 0.0);
+
       /* setup vectors for solve */
       rhs_local   = hypre_ParVectorLocalVector(rhs);
       rhs_data    = hypre_VectorData(rhs_local);
@@ -492,18 +586,18 @@ hypre_ILUSolveSchurGMRES(hypre_ParCSRMatrix *A, hypre_ParVector    *f,
       x_data      = hypre_VectorData(x_local);
 
       /* set rhs value */
-      for(i = nLU ; i < n ; i ++)
+      for (i = nLU ; i < n ; i ++)
       {
-         rhs_data[i-nLU] = ftemp_data[perm[i]];
+         rhs_data[i - nLU] = ftemp_data[perm[i]];
       }
 
       /* solve */
-      HYPRE_GMRESSolve(schur_solver,(HYPRE_Matrix)S,(HYPRE_Vector)rhs,(HYPRE_Vector)x);
+      HYPRE_GMRESSolve(schur_solver, (HYPRE_Matrix)S, (HYPRE_Vector)rhs, (HYPRE_Vector)x);
 
       /* copy value back to original */
-      for(i = nLU ; i < n ; i ++)
+      for (i = nLU ; i < n ; i ++)
       {
-         utemp_data[qperm[i]] = x_data[i-nLU];
+         utemp_data[qperm[i]] = x_data[i - nLU];
       }
    }
 
@@ -512,19 +606,19 @@ hypre_ILUSolveSchurGMRES(hypre_ParCSRMatrix *A, hypre_ParVector    *f,
     * only do this computation when nLU < n
     * U is unsorted, search is expensive when unnecessary
     */
-   if(nLU < n)
+   if (nLU < n)
    {
-      for(i = 0 ; i < nLU ; i ++)
+      for (i = 0 ; i < nLU ; i ++)
       {
          ftemp_data[perm[i]] = utemp_data[qperm[i]];
-         k1 = u_end[i] ; k2 = U_diag_i[i+1];
-         for(j = k1 ; j < k2 ; j ++)
+         k1 = u_end[i] ; k2 = U_diag_i[i + 1];
+         for (j = k1 ; j < k2 ; j ++)
          {
             col = U_diag_j[j];
             ftemp_data[perm[i]] -= U_diag_data[j] * utemp_data[qperm[col]];
          }
       }
-      for(i = 0 ; i < nLU ; i ++)
+      for (i = 0 ; i < nLU ; i ++)
       {
          utemp_data[qperm[i]] = ftemp_data[perm[i]];
       }
@@ -532,10 +626,10 @@ hypre_ILUSolveSchurGMRES(hypre_ParCSRMatrix *A, hypre_ParVector    *f,
 
    /* 5th need to solve UBi*ui = zi */
    /* put result in u_temp upper */
-   for(i = nLU-1 ; i >= 0 ; i --)
+   for (i = nLU - 1 ; i >= 0 ; i --)
    {
       k1 = U_diag_i[i] ; k2 = u_end[i];
-      for(j = k1 ; j < k2 ; j ++)
+      for (j = k1 ; j < k2 ; j ++)
       {
          col = U_diag_j[j];
          utemp_data[qperm[i]] -= U_diag_data[j] * utemp_data[qperm[col]];
@@ -545,80 +639,82 @@ hypre_ILUSolveSchurGMRES(hypre_ParCSRMatrix *A, hypre_ParVector    *f,
 
    /* done, now everything are in u_temp, update solution */
    hypre_ParVectorAxpy(beta, utemp, u);
+
    return hypre_error_flag;
 }
 
-/* Newton-Schulz-Hotelling solve
+/*--------------------------------------------------------------------
+ * hypre_ILUSolveSchurNSH
+ *
+ * Newton-Schulz-Hotelling solve
+ *
  * ParCSRMatrix S is already built in ilu data sturcture
+ *
  * S here is the INVERSE of Schur Complement
- * L, D and U factors only have local scope (no off-diagonal processor terms)
- * so apart from the residual calculation (which uses A), the solves with the
- * L and U factors are local.
+ * L, D and U factors only have local scope (no off-diag terms)
+ *  so apart from the residual calculation (which uses A), the solves
+ *  with the L and U factors are local.
  * S is the inverse global Schur complement
  * rhs and x are helper vector for solving Schur system
-*/
+ *--------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_ILUSolveSchurNSH(hypre_ParCSRMatrix *A, hypre_ParVector    *f,
-                  hypre_ParVector    *u, HYPRE_Int *perm,
-                  HYPRE_Int nLU, hypre_ParCSRMatrix *L,
-                  HYPRE_Real* D, hypre_ParCSRMatrix *U,
-                  hypre_ParCSRMatrix *S,
-                  hypre_ParVector *ftemp, hypre_ParVector *utemp,
-                  HYPRE_Solver schur_solver,
-                  hypre_ParVector *rhs, hypre_ParVector *x, HYPRE_Int *u_end)
+hypre_ILUSolveSchurNSH(hypre_ParCSRMatrix *A,
+                       hypre_ParVector    *f,
+                       hypre_ParVector    *u,
+                       HYPRE_Int          *perm,
+                       HYPRE_Int           nLU,
+                       hypre_ParCSRMatrix *L,
+                       HYPRE_Real         *D,
+                       hypre_ParCSRMatrix *U,
+                       hypre_ParCSRMatrix *S,
+                       hypre_ParVector    *ftemp,
+                       hypre_ParVector    *utemp,
+                       HYPRE_Solver        schur_solver,
+                       hypre_ParVector    *rhs,
+                       hypre_ParVector    *x,
+                       HYPRE_Int          *u_end)
 {
-   /* data objects for communication */
-   //   MPI_Comm          comm = hypre_ParCSRMatrixComm(A);
-
    /* data objects for L and U */
-   hypre_CSRMatrix   *L_diag = hypre_ParCSRMatrixDiag(L);
+   hypre_CSRMatrix   *L_diag      = hypre_ParCSRMatrixDiag(L);
    HYPRE_Real        *L_diag_data = hypre_CSRMatrixData(L_diag);
-   HYPRE_Int         *L_diag_i = hypre_CSRMatrixI(L_diag);
-   HYPRE_Int         *L_diag_j = hypre_CSRMatrixJ(L_diag);
-   hypre_CSRMatrix   *U_diag = hypre_ParCSRMatrixDiag(U);
+   HYPRE_Int         *L_diag_i    = hypre_CSRMatrixI(L_diag);
+   HYPRE_Int         *L_diag_j    = hypre_CSRMatrixJ(L_diag);
+   hypre_CSRMatrix   *U_diag      = hypre_ParCSRMatrixDiag(U);
    HYPRE_Real        *U_diag_data = hypre_CSRMatrixData(U_diag);
-   HYPRE_Int         *U_diag_i = hypre_CSRMatrixI(U_diag);
-   HYPRE_Int         *U_diag_j = hypre_CSRMatrixJ(U_diag);
+   HYPRE_Int         *U_diag_i    = hypre_CSRMatrixI(U_diag);
+   HYPRE_Int         *U_diag_j    = hypre_CSRMatrixJ(U_diag);
+
+   /* Vectors */
    hypre_Vector      *utemp_local = hypre_ParVectorLocalVector(utemp);
    HYPRE_Real        *utemp_data  = hypre_VectorData(utemp_local);
    hypre_Vector      *ftemp_local = hypre_ParVectorLocalVector(ftemp);
    HYPRE_Real        *ftemp_data  = hypre_VectorData(ftemp_local);
-
-   HYPRE_Real        alpha;
-   HYPRE_Real        beta;
-   HYPRE_Int         i, j, k1, k2, col;
+   HYPRE_Real         alpha       = -1.0;
+   HYPRE_Real         beta        = 1.0;
+   HYPRE_Int          i, j, k1, k2, col;
 
    /* problem size */
    HYPRE_Int         n = hypre_CSRMatrixNumRows(L_diag);
-   //   HYPRE_Int         m = n - nLU;
 
    /* other data objects for computation */
-   //   hypre_Vector      *f_local;
-   //   HYPRE_Real        *f_data;
    hypre_Vector      *rhs_local;
    HYPRE_Real        *rhs_data;
    hypre_Vector      *x_local;
    HYPRE_Real        *x_data;
 
-   /* begin */
-   beta = 1.0;
-   alpha = -1.0;
-
    /* compute residual */
    hypre_ParCSRMatrixMatvecOutOfPlace(alpha, A, u, beta, f, ftemp);
 
    /* 1st need to solve LBi*xi = fi
     * L solve, solve xi put in u_temp upper
     */
-   //   f_local = hypre_ParVectorLocalVector(f);
-   //   f_data = hypre_VectorData(f_local);
    /* now update with L to solve */
-   for(i = 0 ; i < nLU ; i ++)
+   for (i = 0 ; i < nLU ; i ++)
    {
       utemp_data[perm[i]] = ftemp_data[perm[i]];
-      k1 = L_diag_i[i] ; k2 = L_diag_i[i+1];
-      for(j = k1 ; j < k2 ; j ++)
+      k1 = L_diag_i[i] ; k2 = L_diag_i[i + 1];
+      for (j = k1 ; j < k2 ; j ++)
       {
          utemp_data[perm[i]] -= L_diag_data[j] * utemp_data[perm[L_diag_j[j]]];
       }
@@ -627,10 +723,10 @@ hypre_ILUSolveSchurNSH(hypre_ParCSRMatrix *A, hypre_ParVector    *f,
    /* 2nd need to compute g'i = gi - Ei*UBi^-1*xi
     * now put g'i into the f_temp lower
     */
-   for(i = nLU ; i < n ; i ++)
+   for (i = nLU ; i < n ; i ++)
    {
-      k1 = L_diag_i[i] ; k2 = L_diag_i[i+1];
-      for(j = k1 ; j < k2 ; j ++)
+      k1 = L_diag_i[i] ; k2 = L_diag_i[i + 1];
+      for (j = k1 ; j < k2 ; j ++)
       {
          col = L_diag_j[j];
          ftemp_data[perm[i]] -= L_diag_data[j] * utemp_data[perm[col]];
@@ -642,31 +738,32 @@ hypre_ILUSolveSchurNSH(hypre_ParCSRMatrix *A, hypre_ParVector    *f,
     * solve y put in u_temp lower
     * only solve when S is not NULL
     */
-   if(S)
+   if (S)
    {
-      /*initialize solution to zero for residual equation */
+      /* Initialize solution to zero for residual equation */
       hypre_ParVectorSetConstantValues(x, 0.0);
-      /* setup vectors for solve */
-      rhs_local   = hypre_ParVectorLocalVector(rhs);
-      rhs_data    = hypre_VectorData(rhs_local);
-      x_local     = hypre_ParVectorLocalVector(x);
-      x_data      = hypre_VectorData(x_local);
+
+      /* Setup vectors for solve */
+      rhs_local = hypre_ParVectorLocalVector(rhs);
+      rhs_data  = hypre_VectorData(rhs_local);
+      x_local   = hypre_ParVectorLocalVector(x);
+      x_data    = hypre_VectorData(x_local);
 
       /* set rhs value */
-      for(i = nLU ; i < n ; i ++)
+      for (i = nLU ; i < n ; i ++)
       {
-         rhs_data[i-nLU] = ftemp_data[perm[i]];
+         rhs_data[i - nLU] = ftemp_data[perm[i]];
       }
 
       /* Solve Schur system with approx inverse
        * x = S*rhs
        */
-      hypre_NSHSolve(schur_solver,S,rhs,x);
+      hypre_NSHSolve(schur_solver, S, rhs, x);
 
       /* copy value back to original */
-      for(i = nLU ; i < n ; i ++)
+      for (i = nLU ; i < n ; i ++)
       {
-         utemp_data[perm[i]] = x_data[i-nLU];
+         utemp_data[perm[i]] = x_data[i - nLU];
       }
    }
 
@@ -675,19 +772,19 @@ hypre_ILUSolveSchurNSH(hypre_ParCSRMatrix *A, hypre_ParVector    *f,
     * only do this computation when nLU < n
     * U is unsorted, search is expensive when unnecessary
     */
-   if(nLU < n)
+   if (nLU < n)
    {
-      for(i = 0 ; i < nLU ; i ++)
+      for (i = 0 ; i < nLU ; i ++)
       {
          ftemp_data[perm[i]] = utemp_data[perm[i]];
-         k1 = u_end[i] ; k2 = U_diag_i[i+1];
-         for(j = k1 ; j < k2 ; j ++)
+         k1 = u_end[i] ; k2 = U_diag_i[i + 1];
+         for (j = k1 ; j < k2 ; j ++)
          {
             col = U_diag_j[j];
             ftemp_data[perm[i]] -= U_diag_data[j] * utemp_data[perm[col]];
          }
       }
-      for(i = 0 ; i < nLU ; i ++)
+      for (i = 0 ; i < nLU ; i ++)
       {
          utemp_data[perm[i]] = ftemp_data[perm[i]];
       }
@@ -695,10 +792,10 @@ hypre_ILUSolveSchurNSH(hypre_ParCSRMatrix *A, hypre_ParVector    *f,
 
    /* 5th need to solve UBi*ui = zi */
    /* put result in u_temp upper */
-   for(i = nLU-1 ; i >= 0 ; i --)
+   for (i = nLU - 1 ; i >= 0 ; i --)
    {
       k1 = U_diag_i[i] ; k2 = u_end[i];
-      for(j = k1 ; j < k2 ; j ++)
+      for (j = k1 ; j < k2 ; j ++)
       {
          col = U_diag_j[j];
          utemp_data[perm[i]] -= U_diag_data[j] * utemp_data[perm[col]];
@@ -706,48 +803,58 @@ hypre_ILUSolveSchurNSH(hypre_ParCSRMatrix *A, hypre_ParVector    *f,
       utemp_data[perm[i]] *= D[i];
    }
 
-   /* done, now everything are in u_temp, update solution */
+   /* Done, now everything are in u_temp, update solution */
    hypre_ParVectorAxpy(beta, utemp, u);
 
    return hypre_error_flag;
 }
 
-/* Incomplete LU solve
- * L, D and U factors only have local scope (no off-diagonal processor terms)
- * so apart from the residual calculation (which uses A), the solves with the
- * L and U factors are local.
-*/
+/*--------------------------------------------------------------------
+ * hypre_ILUSolveLU
+ *
+ * Incomplete LU solve
+ *
+ * L, D and U factors only have local scope (no off-diagterms)
+ *  so apart from the residual calculation (which uses A),
+ *  the solves with the L and U factors are local.
+ *
+ * Note: perm contains the permutation of indexes corresponding to
+ * user-prescribed reordering strategy. In the block Jacobi case, perm
+ * may be NULL if no reordering is done (for performance, (perm == NULL)
+ * assumes identity mapping of indexes). Hence we need to check the local
+ * solves for this case and avoid segfaults. - DOK
+ *--------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_ILUSolveLU(hypre_ParCSRMatrix *A, hypre_ParVector    *f,
-                  hypre_ParVector    *u, HYPRE_Int *perm,
-                  HYPRE_Int nLU, hypre_ParCSRMatrix *L,
-                  HYPRE_Real* D, hypre_ParCSRMatrix *U,
-                  hypre_ParVector *ftemp, hypre_ParVector *utemp)
+hypre_ILUSolveLU(hypre_ParCSRMatrix *A,
+                 hypre_ParVector    *f,
+                 hypre_ParVector    *u,
+                 HYPRE_Int          *perm,
+                 HYPRE_Int           nLU,
+                 hypre_ParCSRMatrix *L,
+                 HYPRE_Real         *D,
+                 hypre_ParCSRMatrix *U,
+                 hypre_ParVector    *ftemp,
+                 hypre_ParVector    *utemp)
 {
-   hypre_CSRMatrix *L_diag = hypre_ParCSRMatrixDiag(L);
+   /* data objects for L and U */
+   hypre_CSRMatrix *L_diag      = hypre_ParCSRMatrixDiag(L);
    HYPRE_Real      *L_diag_data = hypre_CSRMatrixData(L_diag);
-   HYPRE_Int       *L_diag_i = hypre_CSRMatrixI(L_diag);
-   HYPRE_Int       *L_diag_j = hypre_CSRMatrixJ(L_diag);
-
-   hypre_CSRMatrix *U_diag = hypre_ParCSRMatrixDiag(U);
+   HYPRE_Int       *L_diag_i    = hypre_CSRMatrixI(L_diag);
+   HYPRE_Int       *L_diag_j    = hypre_CSRMatrixJ(L_diag);
+   hypre_CSRMatrix *U_diag      = hypre_ParCSRMatrixDiag(U);
    HYPRE_Real      *U_diag_data = hypre_CSRMatrixData(U_diag);
-   HYPRE_Int       *U_diag_i = hypre_CSRMatrixI(U_diag);
-   HYPRE_Int       *U_diag_j = hypre_CSRMatrixJ(U_diag);
+   HYPRE_Int       *U_diag_i    = hypre_CSRMatrixI(U_diag);
+   HYPRE_Int       *U_diag_j    = hypre_CSRMatrixJ(U_diag);
 
+   /* Vectors */
    hypre_Vector    *utemp_local = hypre_ParVectorLocalVector(utemp);
    HYPRE_Real      *utemp_data  = hypre_VectorData(utemp_local);
-
    hypre_Vector    *ftemp_local = hypre_ParVectorLocalVector(ftemp);
    HYPRE_Real      *ftemp_data  = hypre_VectorData(ftemp_local);
-
-   HYPRE_Real      alpha;
-   HYPRE_Real      beta;
-   HYPRE_Int       i, j, k1, k2;
-
-   /* begin */
-   alpha = -1.0;
-   beta = 1.0;
+   HYPRE_Real       alpha       = -1.0;
+   HYPRE_Real       beta        = 1.0;
+   HYPRE_Int        i, j, k1, k2;
 
    /* Initialize Utemp to zero.
     * This is necessary for correctness, when we use optimized
@@ -759,97 +866,309 @@ hypre_ILUSolveLU(hypre_ParCSRMatrix *A, hypre_ParVector    *f,
 
    /* L solve - Forward solve */
    /* copy rhs to account for diagonal of L (which is identity) */
-   for( i = 0; i < nLU; i++ )
+   if (perm)
    {
-      utemp_data[perm[i]] = ftemp_data[perm[i]];
+      for (i = 0; i < nLU; i++)
+      {
+         utemp_data[perm[i]] = ftemp_data[perm[i]];
+      }
    }
-   /* update with remaining (off-diagonal) entries of L */
-   for( i = 0; i < nLU; i++ )
+   else
    {
-      k1 = L_diag_i[i] ; k2 = L_diag_i[i+1];
-      for(j=k1; j <k2; j++)
+      for (i = 0; i < nLU; i++)
       {
-         utemp_data[perm[i]] -= L_diag_data[j] * utemp_data[perm[L_diag_j[j]]];
+         utemp_data[i] = ftemp_data[i];
+      }
+   }
+
+   /* Update with remaining (off-diagonal) entries of L */
+   if (perm)
+   {
+      for ( i = 0; i < nLU; i++ )
+      {
+         k1 = L_diag_i[i] ; k2 = L_diag_i[i + 1];
+         for (j = k1; j < k2; j++)
+         {
+            utemp_data[perm[i]] -= L_diag_data[j] * utemp_data[perm[L_diag_j[j]]];
+         }
+      }
+   }
+   else
+   {
+      for ( i = 0; i < nLU; i++ )
+      {
+         k1 = L_diag_i[i] ; k2 = L_diag_i[i + 1];
+         for (j = k1; j < k2; j++)
+         {
+            utemp_data[i] -= L_diag_data[j] * utemp_data[L_diag_j[j]];
+         }
       }
    }
    /*-------------------- U solve - Backward substitution */
-   for( i = nLU-1; i >= 0; i-- )
+   if (perm)
    {
-      /* first update with the remaining (off-diagonal) entries of U */
-      k1 = U_diag_i[i] ; k2 = U_diag_i[i+1];
-      for(j=k1; j <k2; j++)
+      for ( i = nLU - 1; i >= 0; i-- )
       {
-         utemp_data[perm[i]] -= U_diag_data[j] * utemp_data[perm[U_diag_j[j]]];
+         /* first update with the remaining (off-diagonal) entries of U */
+         k1 = U_diag_i[i] ; k2 = U_diag_i[i + 1];
+         for (j = k1; j < k2; j++)
+         {
+            utemp_data[perm[i]] -= U_diag_data[j] * utemp_data[perm[U_diag_j[j]]];
+         }
+
+         /* diagonal scaling (contribution from D. Note: D is stored as its inverse) */
+         utemp_data[perm[i]] *= D[i];
       }
-      /* diagonal scaling (contribution from D. Note: D is stored as its inverse) */
-      utemp_data[perm[i]] *= D[i];
    }
+   else
+   {
+      for ( i = nLU - 1; i >= 0; i-- )
+      {
+         /* first update with the remaining (off-diagonal) entries of U */
+         k1 = U_diag_i[i] ; k2 = U_diag_i[i + 1];
+         for (j = k1; j < k2; j++)
+         {
+            utemp_data[i] -= U_diag_data[j] * utemp_data[U_diag_j[j]];
+         }
 
+         /* diagonal scaling (contribution from D. Note: D is stored as its inverse) */
+         utemp_data[i] *= D[i];
+      }
+   }
    /* Update solution */
    hypre_ParVectorAxpy(beta, utemp, u);
 
-
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------
+ * hypre_ILUSolveLUIter
+ *
+ * Iterative incomplete LU solve
+ *
+ * L, D and U factors only have local scope (no off-diag terms)
+ *  so apart from the residual calculation (which uses A), the solves
+ *  with the L and U factors are local.
+ *
+ * Note: perm contains the permutation of indexes corresponding to
+ * user-prescribed reordering strategy. In the block Jacobi case, perm
+ * may be NULL if no reordering is done (for performance, (perm == NULL)
+ * assumes identity mapping of indexes). Hence we need to check the local
+ * solves for this case and avoid segfaults. - DOK
+ *--------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ILUSolveLUIter(hypre_ParCSRMatrix *A,
+                     hypre_ParVector    *f,
+                     hypre_ParVector    *u,
+                     HYPRE_Int          *perm,
+                     HYPRE_Int           nLU,
+                     hypre_ParCSRMatrix *L,
+                     HYPRE_Real         *D,
+                     hypre_ParCSRMatrix *U,
+                     hypre_ParVector    *ftemp,
+                     hypre_ParVector    *utemp,
+                     HYPRE_Int           lower_jacobi_iters,
+                     HYPRE_Int           upper_jacobi_iters)
+{
+   /* Data objects for L and U */
+   hypre_CSRMatrix *L_diag      = hypre_ParCSRMatrixDiag(L);
+   HYPRE_Real      *L_diag_data = hypre_CSRMatrixData(L_diag);
+   HYPRE_Int       *L_diag_i    = hypre_CSRMatrixI(L_diag);
+   HYPRE_Int       *L_diag_j    = hypre_CSRMatrixJ(L_diag);
+   hypre_CSRMatrix *U_diag      = hypre_ParCSRMatrixDiag(U);
+   HYPRE_Real      *U_diag_data = hypre_CSRMatrixData(U_diag);
+   HYPRE_Int       *U_diag_i    = hypre_CSRMatrixI(U_diag);
+   HYPRE_Int       *U_diag_j    = hypre_CSRMatrixJ(U_diag);
+
+   /* Vectors */
+   hypre_Vector    *utemp_local = hypre_ParVectorLocalVector(utemp);
+   HYPRE_Real      *utemp_data  = hypre_VectorData(utemp_local);
+   hypre_Vector    *ftemp_local = hypre_ParVectorLocalVector(ftemp);
+   HYPRE_Real      *ftemp_data  = hypre_VectorData(ftemp_local);
+
+   /* Local variables */
+   HYPRE_Real       alpha       = -1.0;
+   HYPRE_Real       beta        = 1.0;
+   HYPRE_Real       sum;
+   HYPRE_Int        i, j, k1, k2, kk;
+
+   /* Initialize Utemp to zero.
+    * This is necessary for correctness, when we use optimized
+    * vector operations in the case where sizeof(L, D or U) < sizeof(A)
+    */
+   //hypre_ParVectorSetConstantValues( utemp, 0.);
+   /* compute residual */
+   hypre_ParCSRMatrixMatvecOutOfPlace(alpha, A, u, beta, f, ftemp);
+
+   /* L solve - Forward solve */
+   /* copy rhs to account for diagonal of L (which is identity) */
+
+   /* Initialize iteration to 0 */
+   if (perm)
+   {
+      for ( i = 0; i < nLU; i++ )
+      {
+         utemp_data[perm[i]] = 0.0;
+      }
+   }
+   else
+   {
+      for ( i = 0; i < nLU; i++ )
+      {
+         utemp_data[i] = 0.0;
+      }
+   }
+   /* Jacobi iteration loop */
+   for ( kk = 0; kk < lower_jacobi_iters; kk++ )
+   {
+      /* u^{k+1} = f - Lu^k */
+
+      /* Do a SpMV with L and save the results in xtemp */
+      if (perm)
+      {
+         for ( i = nLU - 1; i >= 0; i-- )
+         {
+            sum = 0.0;
+            k1 = L_diag_i[i] ; k2 = L_diag_i[i + 1];
+            for (j = k1; j < k2; j++)
+            {
+               sum += L_diag_data[j] * utemp_data[perm[L_diag_j[j]]];
+            }
+            utemp_data[perm[i]] = ftemp_data[perm[i]] - sum;
+         }
+      }
+      else
+      {
+         for ( i = nLU - 1; i >= 0; i-- )
+         {
+            sum = 0.0;
+            k1 = L_diag_i[i] ; k2 = L_diag_i[i + 1];
+            for (j = k1; j < k2; j++)
+            {
+               sum += L_diag_data[j] * utemp_data[L_diag_j[j]];
+            }
+            utemp_data[i] = ftemp_data[i] - sum;
+         }
+      }
+   } /* end jacobi loop */
+
+   /* Initialize iteration to 0 */
+   if (perm)
+   {
+      for ( i = 0; i < nLU; i++ )
+      {
+         ftemp_data[perm[i]] = 0.0;
+      }
+   }
+   else
+   {
+      for ( i = 0; i < nLU; i++ )
+      {
+         ftemp_data[i] = 0.0;
+      }
+   }
+
+   /* Jacobi iteration loop */
+   for ( kk = 0; kk < upper_jacobi_iters; kk++ )
+   {
+      /* u^{k+1} = f - Uu^k */
+
+      /* Do a SpMV with U and save the results in xtemp */
+      if (perm)
+      {
+         for ( i = 0; i < nLU; ++i )
+         {
+            sum = 0.0;
+            k1 = U_diag_i[i] ; k2 = U_diag_i[i + 1];
+            for (j = k1; j < k2; j++)
+            {
+               sum += U_diag_data[j] * ftemp_data[perm[U_diag_j[j]]];
+            }
+            ftemp_data[perm[i]] = D[i] * (utemp_data[perm[i]] - sum);
+         }
+      }
+      else
+      {
+         for ( i = 0; i < nLU; ++i )
+         {
+            sum = 0.0;
+            k1 = U_diag_i[i] ; k2 = U_diag_i[i + 1];
+            for (j = k1; j < k2; j++)
+            {
+               sum += U_diag_data[j] * ftemp_data[U_diag_j[j]];
+            }
+            ftemp_data[i] = D[i] * (utemp_data[i] - sum);
+         }
+      }
+   } /* end jacobi loop */
+
+   /* Update solution */
+   hypre_ParVectorAxpy(beta, ftemp, u);
+
+   return hypre_error_flag;
+}
 
-/* Incomplete LU solve RAS
- * L, D and U factors only have local scope (no off-diagonal processor terms)
- * so apart from the residual calculation (which uses A), the solves with the
- * L and U factors are local.
+/*--------------------------------------------------------------------
+ * hypre_ILUSolveLURAS
+ *
+ * Incomplete LU solve RAS
+ *
+ * L, D and U factors only have local scope (no off-diag terms)
+ *  so apart from the residual calculation (which uses A), the solves
+ *  with the L and U factors are local.
  * fext and uext are tempory arrays for external data
-*/
+ *--------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_ILUSolveLURAS(hypre_ParCSRMatrix *A, hypre_ParVector    *f,
-                  hypre_ParVector    *u, HYPRE_Int *perm,
-                  hypre_ParCSRMatrix *L,
-                  HYPRE_Real* D, hypre_ParCSRMatrix *U,
-                  hypre_ParVector *ftemp, hypre_ParVector *utemp,
-                  HYPRE_Real *fext, HYPRE_Real *uext)
+hypre_ILUSolveLURAS(hypre_ParCSRMatrix *A,
+                    hypre_ParVector    *f,
+                    hypre_ParVector    *u,
+                    HYPRE_Int          *perm,
+                    hypre_ParCSRMatrix *L,
+                    HYPRE_Real         *D,
+                    hypre_ParCSRMatrix *U,
+                    hypre_ParVector    *ftemp,
+                    hypre_ParVector    *utemp,
+                    HYPRE_Real         *fext,
+                    HYPRE_Real         *uext)
 {
-
+   /* Parallel info */
    hypre_ParCSRCommPkg        *comm_pkg;
    hypre_ParCSRCommHandle     *comm_handle;
-   HYPRE_Int                  num_sends, begin, end;
+   HYPRE_Int                   num_sends, begin, end;
 
-   hypre_CSRMatrix            *L_diag = hypre_ParCSRMatrixDiag(L);
-   HYPRE_Real                 *L_diag_data = hypre_CSRMatrixData(L_diag);
-   HYPRE_Int                  *L_diag_i = hypre_CSRMatrixI(L_diag);
-   HYPRE_Int                  *L_diag_j = hypre_CSRMatrixJ(L_diag);
 
-   hypre_CSRMatrix            *U_diag = hypre_ParCSRMatrixDiag(U);
+   /* Data objects for L and U */
+   hypre_CSRMatrix            *L_diag      = hypre_ParCSRMatrixDiag(L);
+   HYPRE_Real                 *L_diag_data = hypre_CSRMatrixData(L_diag);
+   HYPRE_Int                  *L_diag_i    = hypre_CSRMatrixI(L_diag);
+   HYPRE_Int                  *L_diag_j    = hypre_CSRMatrixJ(L_diag);
+   hypre_CSRMatrix            *U_diag      = hypre_ParCSRMatrixDiag(U);
    HYPRE_Real                 *U_diag_data = hypre_CSRMatrixData(U_diag);
-   HYPRE_Int                  *U_diag_i = hypre_CSRMatrixI(U_diag);
-   HYPRE_Int                  *U_diag_j = hypre_CSRMatrixJ(U_diag);
-
-   HYPRE_Int                  n = hypre_CSRMatrixNumCols(hypre_ParCSRMatrixDiag(A));
-   HYPRE_Int                  m = hypre_CSRMatrixNumCols(hypre_ParCSRMatrixOffd(A));
-   //   HYPRE_Int                  buffer_size;
-   HYPRE_Int                  n_total = m + n;
-
-   HYPRE_Int                  idx;
-   HYPRE_Int                  jcol;
-   HYPRE_Int                  col;
+   HYPRE_Int                  *U_diag_i    = hypre_CSRMatrixI(U_diag);
+   HYPRE_Int                  *U_diag_j    = hypre_CSRMatrixJ(U_diag);
 
+   /* Vectors */
+   HYPRE_Int                   n           = hypre_CSRMatrixNumCols(hypre_ParCSRMatrixDiag(A));
+   HYPRE_Int                   m           = hypre_CSRMatrixNumCols(hypre_ParCSRMatrixOffd(A));
+   HYPRE_Int                   n_total     = m + n;
    hypre_Vector               *utemp_local = hypre_ParVectorLocalVector(utemp);
    HYPRE_Real                 *utemp_data  = hypre_VectorData(utemp_local);
-
    hypre_Vector               *ftemp_local = hypre_ParVectorLocalVector(ftemp);
    HYPRE_Real                 *ftemp_data  = hypre_VectorData(ftemp_local);
 
-   HYPRE_Real                 alpha;
-   HYPRE_Real                 beta;
-   HYPRE_Int                  i, j, k1, k2;
-
-   /* begin */
-   alpha = -1.0;
-   beta = 1.0;
+   /* Local variables */
+   HYPRE_Int                   idx, jcol, col;
+   HYPRE_Int                   i, j, k1, k2;
+   HYPRE_Real                  alpha = -1.0;
+   HYPRE_Real                  beta  = 1.0;
 
    /* prepare for communication */
    comm_pkg = hypre_ParCSRMatrixCommPkg(A);
+
    /* setup if not yet built */
-   if(!comm_pkg)
+   if (!comm_pkg)
    {
       hypre_MatvecCommPkgCreate(A);
       comm_pkg = hypre_ParCSRMatrixCommPkg(A);
@@ -867,18 +1186,18 @@ hypre_ILUSolveLURAS(hypre_ParCSRMatrix *A, hypre_ParVector    *f,
 
    /* get total num of send */
    num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
-   begin = hypre_ParCSRCommPkgSendMapStart(comm_pkg,0);
-   end = hypre_ParCSRCommPkgSendMapStart(comm_pkg,num_sends);
+   begin     = hypre_ParCSRCommPkgSendMapStart(comm_pkg, 0);
+   end       = hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends);
 
    /* copy new index into send_buf */
-   for(i = begin ; i < end ; i ++)
+   for (i = begin ; i < end ; i ++)
    {
       /* all we need is just send out data, we don't need to worry about the
        *    permutation of offd part, actually we don't need to worry about
        *    permutation at all
        * borrow uext as send buffer .
        */
-      uext[i-begin] = ftemp_data[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,i)];
+      uext[i - begin] = ftemp_data[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, i)];
    }
 
    /* main communication */
@@ -886,17 +1205,17 @@ hypre_ILUSolveLURAS(hypre_ParCSRMatrix *A, hypre_ParVector    *f,
    hypre_ParCSRCommHandleDestroy(comm_handle);
 
    /* L solve - Forward solve */
-   for( i = 0 ; i < n_total ; i ++)
+   for ( i = 0 ; i < n_total ; i ++)
    {
-      k1 = L_diag_i[i] ; k2 = L_diag_i[i+1];
-      if( i < n )
+      k1 = L_diag_i[i] ; k2 = L_diag_i[i + 1];
+      if ( i < n )
       {
          /* diag part */
          utemp_data[perm[i]] = ftemp_data[perm[i]];
-         for(j=k1; j <k2; j++)
+         for (j = k1; j < k2; j++)
          {
             col = L_diag_j[j];
-            if( col < n )
+            if ( col < n )
             {
                utemp_data[perm[i]] -= L_diag_data[j] * utemp_data[perm[col]];
             }
@@ -912,10 +1231,10 @@ hypre_ILUSolveLURAS(hypre_ParCSRMatrix *A, hypre_ParVector    *f,
          /* offd part */
          idx = i - n;
          uext[idx] = fext[idx];
-         for(j=k1; j <k2; j++)
+         for (j = k1; j < k2; j++)
          {
             col = L_diag_j[j];
-            if(col < n)
+            if (col < n)
             {
                uext[idx] -= L_diag_data[j] * utemp_data[perm[col]];
             }
@@ -929,17 +1248,17 @@ hypre_ILUSolveLURAS(hypre_ParCSRMatrix *A, hypre_ParVector    *f,
    }
 
    /*-------------------- U solve - Backward substitution */
-   for( i = n_total-1; i >= 0; i-- )
+   for ( i = n_total - 1; i >= 0; i-- )
    {
       /* first update with the remaining (off-diagonal) entries of U */
-      k1 = U_diag_i[i] ; k2 = U_diag_i[i+1];
-      if( i < n )
+      k1 = U_diag_i[i] ; k2 = U_diag_i[i + 1];
+      if ( i < n )
       {
          /* diag part */
-         for(j=k1; j <k2; j++)
+         for (j = k1; j < k2; j++)
          {
             col = U_diag_j[j];
-            if( col < n )
+            if ( col < n )
             {
                utemp_data[perm[i]] -= U_diag_data[j] * utemp_data[perm[col]];
             }
@@ -956,10 +1275,10 @@ hypre_ILUSolveLURAS(hypre_ParCSRMatrix *A, hypre_ParVector    *f,
       {
          /* 2nd part of offd */
          idx = i - n;
-         for(j=k1; j <k2; j++)
+         for (j = k1; j < k2; j++)
          {
             col = U_diag_j[j];
-            if( col < n )
+            if ( col < n )
             {
                uext[idx] -= U_diag_data[j] * utemp_data[perm[col]];
             }
@@ -972,995 +1291,113 @@ hypre_ILUSolveLURAS(hypre_ParCSRMatrix *A, hypre_ParVector    *f,
          /* diagonal scaling (contribution from D. Note: D is stored as its inverse) */
          uext[idx] *= D[i];
       }
-
    }
+
    /* Update solution */
    hypre_ParVectorAxpy(beta, utemp, u);
 
    return hypre_error_flag;
 }
 
-#ifdef HYPRE_USING_CUDA
-
-/* Permutation function (for GPU version, can just call thrust)
- * option 00: perm integer array
- * option 01: rperm integer array
- * option 10: perm real array
- * option 11: rperm real array
- * */
-HYPRE_Int
-hypre_ILUSeqVectorPerm(void *vectori, void *vectoro, HYPRE_Int size, HYPRE_Int *perm, HYPRE_Int option)
-{
-   cudaDeviceSynchronize();
-   HYPRE_Int i;
-   switch(option)
-   {
-      case 00:
-      {
-         HYPRE_Int *ivectori     = (HYPRE_Int *) vectori;
-         HYPRE_Int *ivectoro     = (HYPRE_Int *) vectoro;
-         for(i = 0 ; i < size ; i ++)
-         {
-            ivectoro[i] = ivectori[perm[i]];
-         }
-         break;
-      }
-      case 01:
-      {
-         HYPRE_Int *ivectori     = (HYPRE_Int *) vectori;
-         HYPRE_Int *ivectoro     = (HYPRE_Int *) vectoro;
-         for(i = 0 ; i < size ; i ++)
-         {
-            ivectoro[perm[i]] = ivectori[i];
-         }
-         break;
-      }
-      case 10:
-      {
-         HYPRE_Real *dvectori     = (HYPRE_Real *) vectori;
-         HYPRE_Real *dvectoro     = (HYPRE_Real *) vectoro;
-         for(i = 0 ; i < size ; i ++)
-         {
-            dvectoro[i] = dvectori[perm[i]];
-         }
-         break;
-      }
-      case 11:
-      {
-         HYPRE_Real *dvectori     = (HYPRE_Real *) vectori;
-         HYPRE_Real *dvectoro     = (HYPRE_Real *) vectoro;
-         for(i = 0 ; i < size ; i ++)
-         {
-            dvectoro[perm[i]] = dvectori[i];
-         }
-         break;
-      }
-      default:
-      {
-         printf("Error option in ILUSeqVectorPerm");
-         hypre_assert(1==0);
-      }
-   }
-   return hypre_error_flag;
-}
-
-/* Incomplete LU solve (GPU)
- * L, D and U factors only have local scope (no off-diagonal processor terms)
- * so apart from the residual calculation (which uses A), the solves with the
- * L and U factors are local.
-*/
-
-HYPRE_Int
-hypre_ILUSolveCusparseLU(hypre_ParCSRMatrix *A, cusparseMatDescr_t matL_des, cusparseMatDescr_t matU_des,
-                  csrsv2Info_t matL_info, csrsv2Info_t matU_info, hypre_CSRMatrix *matLU_d,
-                  cusparseSolvePolicy_t ilu_solve_policy, void *ilu_solve_buffer,
-                  hypre_ParVector *f,  hypre_ParVector *u, HYPRE_Int *perm,
-                  HYPRE_Int n, hypre_ParVector *ftemp, hypre_ParVector *utemp)
-{
-
-   /* Only solve when we have stuffs to be solved */
-   if(n == 0)
-   {
-      return hypre_error_flag;
-   }
-
-   /* ILU data */
-   HYPRE_Real              *LU_data             = hypre_CSRMatrixData(matLU_d);
-   HYPRE_Int               *LU_i                = hypre_CSRMatrixI(matLU_d);
-   HYPRE_Int               *LU_j                = hypre_CSRMatrixJ(matLU_d);
-   HYPRE_Int               nnz                  = LU_i[n];
-
-   hypre_Vector            *utemp_local         = hypre_ParVectorLocalVector(utemp);
-   HYPRE_Real              *utemp_data          = hypre_VectorData(utemp_local);
-
-   hypre_Vector            *ftemp_local         = hypre_ParVectorLocalVector(ftemp);
-   HYPRE_Real              *ftemp_data          = hypre_VectorData(ftemp_local);
-
-   HYPRE_Real              alpha;
-   HYPRE_Real              beta;
-   //HYPRE_Int               i, j, k1, k2;
-
-   HYPRE_Int               isDoublePrecision    = sizeof(HYPRE_Complex) == sizeof(hypre_double);
-   HYPRE_Int               isSinglePrecision    = sizeof(HYPRE_Complex) == sizeof(hypre_double) / 2;
-
-   hypre_assert(isDoublePrecision || isSinglePrecision);
-
-   /* begin */
-   alpha = -1.0;
-   beta = 1.0;
-
-   cusparseHandle_t handle = hypre_HandleCusparseHandle(hypre_handle());
-
-   /* Initialize Utemp to zero.
-    * This is necessary for correctness, when we use optimized
-    * vector operations in the case where sizeof(L, D or U) < sizeof(A)
-   */
-   //hypre_ParVectorSetConstantValues( utemp, 0.);
-   /* compute residual */
-   hypre_ParCSRMatrixMatvecOutOfPlace(alpha, A, u, beta, f, ftemp);
-
-   /* apply permutation */
-   HYPRE_THRUST_CALL(gather, perm, perm + n, ftemp_data, utemp_data);
-
-   if(isDoublePrecision)
-   {
-      /* L solve - Forward solve */
-      HYPRE_CUSPARSE_CALL(cusparseDcsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                n, nnz, (hypre_double *) &beta, matL_des,
-                                                (hypre_double *) LU_data, LU_i, LU_j, matL_info,
-                                                (hypre_double *) utemp_data, (hypre_double *) ftemp_data, ilu_solve_policy, ilu_solve_buffer));
-
-      /* U solve - Backward substitution */
-      HYPRE_CUSPARSE_CALL(cusparseDcsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                n, nnz, (hypre_double *) &beta, matU_des,
-                                                (hypre_double *) LU_data, LU_i, LU_j, matU_info,
-                                                (hypre_double *) ftemp_data, (hypre_double *) utemp_data, ilu_solve_policy, ilu_solve_buffer));
-   }
-   else if(isSinglePrecision)
-   {
-      /* L solve - Forward solve */
-      HYPRE_CUSPARSE_CALL(cusparseScsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                n, nnz, (float *) &beta, matL_des,
-                                                (float *) LU_data, LU_i, LU_j, matL_info,
-                                                (float *) utemp_data, (float *) ftemp_data, ilu_solve_policy, ilu_solve_buffer));
-
-      /* U solve - Backward substitution */
-      HYPRE_CUSPARSE_CALL(cusparseScsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                n, nnz, (float *) &beta, matU_des,
-                                                (float *) LU_data, LU_i, LU_j, matU_info,
-                                                (float *) ftemp_data, (float *) utemp_data, ilu_solve_policy, ilu_solve_buffer));
-   }
-
-   /* apply reverse permutation */
-   HYPRE_THRUST_CALL(scatter,utemp_data, utemp_data + n, perm, ftemp_data);
-   /* Update solution */
-   hypre_ParVectorAxpy(beta, ftemp, u);
-
-
-   return hypre_error_flag;
-}
-
-/* Schur Complement solve with GMRES on schur complement
- * ParCSRMatrix S is already built in ilu data sturcture, here directly use S
- * L, D and U factors only have local scope (no off-diagonal processor terms)
- * so apart from the residual calculation (which uses A), the solves with the
- * L and U factors are local.
+/*--------------------------------------------------------------------
+ * hypre_ILUSolveRAPGMRESHost
+ *
+ * Solve with GMRES on schur complement, RAP style.
+ *
+ * ParCSRMatrix S is already built in ilu data sturcture, here directly
+ * use S, L, D and U factors only have local scope (no off-diag terms)
+ * so apart from the residual calculation (which uses A), the solves
+ * with the L and U factors are local.
+ *
  * S is the global Schur complement
  * schur_solver is a GMRES solver
  * schur_precond is the ILU preconditioner for GMRES
  * rhs and x are helper vector for solving Schur system
-*/
+ *--------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_ILUSolveCusparseSchurGMRES(hypre_ParCSRMatrix *A, hypre_ParVector *f,
-                                 hypre_ParVector *u, HYPRE_Int *perm,
-                                 HYPRE_Int nLU, hypre_ParCSRMatrix *S,
-                                 hypre_ParVector *ftemp, hypre_ParVector *utemp,
-                                 HYPRE_Solver schur_solver, HYPRE_Solver schur_precond,
-                                 hypre_ParVector *rhs, hypre_ParVector *x, HYPRE_Int *u_end,
-                                 cusparseMatDescr_t matL_des, cusparseMatDescr_t matU_des,
-                                 csrsv2Info_t matBL_info, csrsv2Info_t matBU_info, csrsv2Info_t matSL_info, csrsv2Info_t matSU_info,
-                                 hypre_CSRMatrix *matBLU_d, hypre_CSRMatrix *matE_d, hypre_CSRMatrix *matF_d,
-                                 cusparseSolvePolicy_t ilu_solve_policy, void *ilu_solve_buffer)
+hypre_ILUSolveRAPGMRESHost(hypre_ParCSRMatrix *A,
+                           hypre_ParVector    *f,
+                           hypre_ParVector    *u,
+                           HYPRE_Int          *perm,
+                           HYPRE_Int           nLU,
+                           hypre_ParCSRMatrix *L,
+                           HYPRE_Real         *D,
+                           hypre_ParCSRMatrix *U,
+                           hypre_ParCSRMatrix *mL,
+                           HYPRE_Real         *mD,
+                           hypre_ParCSRMatrix *mU,
+                           hypre_ParVector    *ftemp,
+                           hypre_ParVector    *utemp,
+                           hypre_ParVector    *xtemp,
+                           hypre_ParVector    *ytemp,
+                           HYPRE_Solver        schur_solver,
+                           HYPRE_Solver        schur_precond,
+                           hypre_ParVector    *rhs,
+                           hypre_ParVector    *x,
+                           HYPRE_Int          *u_end)
 {
-   /* If we don't have S block, just do one L solve and one U solve */
-   if(!S)
-   {
-      /* Just call BJ cusparse and return */
-      return hypre_ILUSolveCusparseLU(A, matL_des, matU_des, matBL_info, matBU_info, matBLU_d, ilu_solve_policy,
-                                       ilu_solve_buffer, f, u, perm, nLU, ftemp, utemp);
-   }
+   /* data objects for L and U */
+   hypre_CSRMatrix   *L_diag       = hypre_ParCSRMatrixDiag(L);
+   HYPRE_Real        *L_diag_data  = hypre_CSRMatrixData(L_diag);
+   HYPRE_Int         *L_diag_i     = hypre_CSRMatrixI(L_diag);
+   HYPRE_Int         *L_diag_j     = hypre_CSRMatrixJ(L_diag);
 
-   /* data objects for communication */
-//   MPI_Comm          comm = hypre_ParCSRMatrixComm(A);
+   hypre_CSRMatrix   *U_diag       = hypre_ParCSRMatrixDiag(U);
+   HYPRE_Real        *U_diag_data  = hypre_CSRMatrixData(U_diag);
+   HYPRE_Int         *U_diag_i     = hypre_CSRMatrixI(U_diag);
+   HYPRE_Int         *U_diag_j     = hypre_CSRMatrixJ(U_diag);
 
-   /* data objects for temp vector */
-   hypre_Vector      *utemp_local = hypre_ParVectorLocalVector(utemp);
-   HYPRE_Real        *utemp_data  = hypre_VectorData(utemp_local);
-   hypre_Vector      *ftemp_local = hypre_ParVectorLocalVector(ftemp);
-   HYPRE_Real        *ftemp_data  = hypre_VectorData(ftemp_local);
-   hypre_Vector      *rhs_local   = hypre_ParVectorLocalVector(rhs);
-   HYPRE_Real        *rhs_data    = hypre_VectorData(rhs_local);
-   hypre_Vector      *x_local     = hypre_ParVectorLocalVector(x);
-   HYPRE_Real        *x_data      = hypre_VectorData(x_local);
+   hypre_CSRMatrix   *mL_diag      = hypre_ParCSRMatrixDiag(mL);
+   HYPRE_Real        *mL_diag_data = hypre_CSRMatrixData(mL_diag);
+   HYPRE_Int         *mL_diag_i    = hypre_CSRMatrixI(mL_diag);
+   HYPRE_Int         *mL_diag_j    = hypre_CSRMatrixJ(mL_diag);
 
-   HYPRE_Real        alpha;
-   HYPRE_Real        beta;
-   //HYPRE_Real        gamma;
-   //HYPRE_Int         i, j, k1, k2, col;
+   hypre_CSRMatrix   *mU_diag      = hypre_ParCSRMatrixDiag(mU);
+   HYPRE_Real        *mU_diag_data = hypre_CSRMatrixData(mU_diag);
+   HYPRE_Int         *mU_diag_i    = hypre_CSRMatrixI(mU_diag);
+   HYPRE_Int         *mU_diag_j    = hypre_CSRMatrixJ(mU_diag);
+
+   /* Vectors */
+   hypre_Vector      *utemp_local  = hypre_ParVectorLocalVector(utemp);
+   HYPRE_Real        *utemp_data   = hypre_VectorData(utemp_local);
+   hypre_Vector      *ftemp_local  = hypre_ParVectorLocalVector(ftemp);
+   HYPRE_Real        *ftemp_data   = hypre_VectorData(ftemp_local);
+   hypre_Vector      *xtemp_local  = NULL;
+   HYPRE_Real        *xtemp_data   = NULL;
+   hypre_Vector      *ytemp_local  = NULL;
+   HYPRE_Real        *ytemp_data   = NULL;
+
+   HYPRE_Real         alpha = -1.0;
+   HYPRE_Real         beta  = 1.0;
+   HYPRE_Int          i, j, k1, k2, col;
 
    /* problem size */
-   HYPRE_Int         *BLU_i      = NULL;
-   HYPRE_Int         *BLU_j      = NULL;
-   HYPRE_Real        *BLU_data   = NULL;
-   HYPRE_Int         BLU_nnz     = 0;
-   hypre_CSRMatrix   *matSLU_d   = hypre_ParCSRMatrixDiag(S);
-   HYPRE_Int         *SLU_i      = hypre_CSRMatrixI(matSLU_d);
-   HYPRE_Int         *SLU_j      = hypre_CSRMatrixJ(matSLU_d);
-   HYPRE_Real        *SLU_data   = hypre_CSRMatrixData(matSLU_d);
-   HYPRE_Int         m           = hypre_CSRMatrixNumRows(matSLU_d);
-   HYPRE_Int         n           = nLU + m;
-   HYPRE_Int         SLU_nnz     = SLU_i[m];
-
-   hypre_Vector *ftemp_upper           = hypre_SeqVectorCreate(nLU);
-   hypre_Vector *utemp_lower           = hypre_SeqVectorCreate(m);
-   hypre_VectorOwnsData(ftemp_upper)   = 0;
-   hypre_VectorOwnsData(utemp_lower)   = 0;
-   hypre_VectorData(ftemp_upper)       = ftemp_data;
-   hypre_VectorData(utemp_lower)       = utemp_data + nLU;
-   hypre_SeqVectorInitialize(ftemp_upper);
-   hypre_SeqVectorInitialize(utemp_lower);
-
-   if( nLU > 0)
-   {
-      BLU_i                      = hypre_CSRMatrixI(matBLU_d);
-      BLU_j                      = hypre_CSRMatrixJ(matBLU_d);
-      BLU_data                   = hypre_CSRMatrixData(matBLU_d);
-      BLU_nnz                    = BLU_i[nLU];
-   }
-
-   /* begin */
-   beta = 1.0;
-   alpha = -1.0;
-   //gamma = 0.0;
-
-   HYPRE_Int               isDoublePrecision    = sizeof(HYPRE_Complex) == sizeof(hypre_double);
-   HYPRE_Int               isSinglePrecision    = sizeof(HYPRE_Complex) == sizeof(hypre_double) / 2;
-
-   hypre_assert(isDoublePrecision || isSinglePrecision);
-
-   cusparseHandle_t handle = hypre_HandleCusparseHandle(hypre_handle());
-
-   /* compute residual */
-   hypre_ParCSRMatrixMatvecOutOfPlace(alpha, A, u, beta, f, ftemp);
-
-   /* 1st need to solve LBi*xi = fi
-    * L solve, solve xi put in u_temp upper
-    */
-
-   /* apply permutation before we can start our solve */
-   HYPRE_THRUST_CALL(gather, perm, perm + n, ftemp_data, utemp_data);
-
-   if(nLU > 0)
-   {
-
-      /* This solve won't touch data in utemp, thus, gi is still in utemp_lower */
-      if(isDoublePrecision)
-      {
-         /* L solve - Forward solve */
-         HYPRE_CUSPARSE_CALL(cusparseDcsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                   nLU, BLU_nnz, (hypre_double *) &beta, matL_des,
-                                                   (hypre_double *) BLU_data, BLU_i, BLU_j, matBL_info,
-                                                   (hypre_double *) utemp_data, (hypre_double *) ftemp_data, ilu_solve_policy, ilu_solve_buffer));
-      }
-      else if(isSinglePrecision)
-      {
-         /* L solve - Forward solve */
-         HYPRE_CUSPARSE_CALL(cusparseScsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                   nLU, BLU_nnz, (float *) &beta, matL_des,
-                                                   (float *) BLU_data, BLU_i, BLU_j, matBL_info,
-                                                   (float *) utemp_data, (float *) ftemp_data, ilu_solve_policy, ilu_solve_buffer));
-      }
-
-      /* 2nd need to compute g'i = gi - Ei*UBi^{-1}*xi
-       * Ei*UBi^{-1} is exactly the matE_d here
-       * Now:  LBi^{-1}f_i is in ftemp_upper
-       *       gi' is in utemp_lower
-       */
-
-      hypre_CSRMatrixMatvec(alpha, matE_d, ftemp_upper, beta, utemp_lower);
-
-   }
-
-   /* 3rd need to solve global Schur Complement M^{-1}Sy = M^{-1}g'
-    * for now only solve the local system
-    * solve y put in u_temp lower
-    * only solve whe S is not NULL
-    */
-
-   /* setup vectors for solve
-    * rhs = M^{-1}g'
-    */
-
-   if(m > 0)
-   {
-      if(isDoublePrecision)
-      {
-         /* L solve */
-         HYPRE_CUSPARSE_CALL(cusparseDcsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                   m, SLU_nnz, (hypre_double *) &beta, matL_des,
-                                                   (hypre_double *) SLU_data, SLU_i, SLU_j, matSL_info,
-                                                   (hypre_double *) utemp_data + nLU, (hypre_double *) ftemp_data + nLU, ilu_solve_policy, ilu_solve_buffer));
-
-         /* U solve */
-         HYPRE_CUSPARSE_CALL(cusparseDcsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                   m, SLU_nnz, (hypre_double *) &beta, matU_des,
-                                                   (hypre_double *) SLU_data, SLU_i, SLU_j, matSU_info,
-                                                   (hypre_double *) ftemp_data + nLU, (hypre_double *) rhs_data, ilu_solve_policy, ilu_solve_buffer));
-      }
-      else if(isSinglePrecision)
-      {
-         /* L solve */
-         HYPRE_CUSPARSE_CALL(cusparseScsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                   m, SLU_nnz, (float *) &beta, matL_des,
-                                                   (float *) SLU_data, SLU_i, SLU_j, matSL_info,
-                                                   (float *) utemp_data + nLU, (float *) ftemp_data + nLU, ilu_solve_policy, ilu_solve_buffer));
-
-         /* U solve */
-         HYPRE_CUSPARSE_CALL(cusparseScsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                   m, SLU_nnz, (float *) &beta, matU_des,
-                                                   (float *) SLU_data, SLU_i, SLU_j, matSU_info,
-                                                   (float *) ftemp_data + nLU, (float *) rhs_data, ilu_solve_policy, ilu_solve_buffer));
-      }
-   }
-
-
-   /* solve */
-   /* with tricky initial guess */
-   //hypre_Vector *tv = hypre_ParVectorLocalVector(x);
-   //HYPRE_Real *tz = hypre_VectorData(tv);
-   HYPRE_GMRESSolve(schur_solver,(HYPRE_Matrix)schur_precond,(HYPRE_Vector)rhs,(HYPRE_Vector)x);
-   /* 4th need to compute zi = xi - LBi^-1*yi
-    * put zi in f_temp upper
-    * only do this computation when nLU < n
-    * U is unsorted, search is expensive when unnecessary
-    */
-
-   if(nLU > 0)
-   {
-      hypre_CSRMatrixMatvec(alpha, matF_d, x_local, beta, ftemp_upper);
-
-      /* 5th need to solve UBi*ui = zi */
-      /* put result in u_temp upper */
-
-      if(isDoublePrecision)
-      {
-         /* U solve - Forward solve */
-         HYPRE_CUSPARSE_CALL(cusparseDcsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                   nLU, BLU_nnz, (hypre_double *) &beta, matU_des,
-                                                   (hypre_double *) BLU_data, BLU_i, BLU_j, matBU_info,
-                                                   (hypre_double *) ftemp_data, (hypre_double *) utemp_data, ilu_solve_policy, ilu_solve_buffer));
-      }
-      else if(isSinglePrecision)
-      {
-         /* U solve - Forward solve */
-         HYPRE_CUSPARSE_CALL(cusparseScsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                   nLU, BLU_nnz, (float *) &beta, matU_des,
-                                                   (float *) BLU_data, BLU_i, BLU_j, matBU_info,
-                                                   (float *) ftemp_data, (float *) utemp_data, ilu_solve_policy, ilu_solve_buffer));
-      }
-   }
+   HYPRE_Int          n = hypre_CSRMatrixNumRows(L_diag);
+   HYPRE_Int          m = n - nLU;
 
-   /* copy lower part solution into u_temp as well */
-   hypre_TMemcpy(utemp_data + nLU, x_data, HYPRE_Real, m, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
-
-   /* perm back */
-   HYPRE_THRUST_CALL(scatter,utemp_data, utemp_data + n, perm, ftemp_data);
-
-   /* done, now everything are in u_temp, update solution */
-   hypre_ParVectorAxpy(beta, ftemp, u);
-
-   hypre_SeqVectorDestroy(ftemp_upper);
-   hypre_SeqVectorDestroy(utemp_lower);
-
-   return hypre_error_flag;
-}
-
-/* Schur Complement solve with GMRES on schur complement, RAP style
- * ParCSRMatrix S is already built in ilu data sturcture, here directly use S
- * L, D and U factors only have local scope (no off-diagonal processor terms)
- * so apart from the residual calculation (which uses A), the solves with the
- * L and U factors are local.
- * S is the global Schur complement
- * schur_solver is a GMRES solver
- * schur_precond is the ILU preconditioner for GMRES
- * rhs and x are helper vector for solving Schur system
-*/
-
-HYPRE_Int
-hypre_ILUSolveRAPGMRES(hypre_ParCSRMatrix *A, hypre_ParVector *f,
-                                 hypre_ParVector *u, HYPRE_Int *perm,
-                                 HYPRE_Int nLU, hypre_ParCSRMatrix *S,
-                                 hypre_ParVector *ftemp, hypre_ParVector *utemp, hypre_ParVector *xtemp, hypre_ParVector *ytemp,
-                                 HYPRE_Solver schur_solver, HYPRE_Solver schur_precond,
-                                 hypre_ParVector *rhs, hypre_ParVector *x, HYPRE_Int *u_end,
-                                 cusparseMatDescr_t matL_des, cusparseMatDescr_t matU_des,
-                                 csrsv2Info_t matAL_info, csrsv2Info_t matAU_info,
-                                 csrsv2Info_t matBL_info, csrsv2Info_t matBU_info,
-                                 csrsv2Info_t matSL_info, csrsv2Info_t matSU_info,
-                                 hypre_ParCSRMatrix *Aperm, hypre_CSRMatrix *matALU_d, hypre_CSRMatrix *matBLU_d, hypre_CSRMatrix *matE_d, hypre_CSRMatrix *matF_d,
-                                 cusparseSolvePolicy_t ilu_solve_policy, void *ilu_solve_buffer, HYPRE_Int test_opt)
-{
-   /* data objects for communication */
-//   MPI_Comm          comm = hypre_ParCSRMatrixComm(A);
-
-   /* data objects for temp vector */
-   hypre_Vector      *utemp_local = hypre_ParVectorLocalVector(utemp);
-   HYPRE_Real        *utemp_data  = hypre_VectorData(utemp_local);
-   hypre_Vector      *ftemp_local = hypre_ParVectorLocalVector(ftemp);
-   HYPRE_Real        *ftemp_data  = hypre_VectorData(ftemp_local);
-   hypre_Vector      *xtemp_local = hypre_ParVectorLocalVector(xtemp);
-   HYPRE_Real        *xtemp_data  = hypre_VectorData(xtemp_local);
-   //hypre_Vector      *ytemp_local = hypre_ParVectorLocalVector(ytemp);
-   //HYPRE_Real        *ytemp_data  = hypre_VectorData(ytemp_local);
-   hypre_Vector      *rhs_local   = hypre_ParVectorLocalVector(rhs);
-   HYPRE_Real        *rhs_data    = hypre_VectorData(rhs_local);
-   hypre_Vector      *x_local     = hypre_ParVectorLocalVector(x);
-   HYPRE_Real        *x_data      = hypre_VectorData(x_local);
-
-   //HYPRE_Int         i, j, k1, k2, col;
-
-   /* problem size */
-   HYPRE_Int         *ALU_i      = hypre_CSRMatrixI(matALU_d);
-   HYPRE_Int         *ALU_j      = hypre_CSRMatrixJ(matALU_d);
-   HYPRE_Real        *ALU_data   = hypre_CSRMatrixData(matALU_d);
-   HYPRE_Int         *BLU_i      = hypre_CSRMatrixI(matBLU_d);
-   HYPRE_Int         *BLU_j      = hypre_CSRMatrixJ(matBLU_d);
-   HYPRE_Real        *BLU_data   = hypre_CSRMatrixData(matBLU_d);
-   HYPRE_Int          BLU_nnz    = BLU_i[nLU];
-   hypre_CSRMatrix   *matSLU_d   = hypre_ParCSRMatrixDiag(S);
-   HYPRE_Int         *SLU_i      = hypre_CSRMatrixI(matSLU_d);
-   HYPRE_Int         *SLU_j      = hypre_CSRMatrixJ(matSLU_d);
-   HYPRE_Real        *SLU_data   = hypre_CSRMatrixData(matSLU_d);
-   HYPRE_Int         m           = hypre_CSRMatrixNumRows(matSLU_d);
-   HYPRE_Int         n           = nLU + m;
-   HYPRE_Int         SLU_nnz     = SLU_i[m];
-   HYPRE_Int         ALU_nnz     = ALU_i[n];
-
-   hypre_Vector *ftemp_upper           = hypre_SeqVectorCreate(nLU);
-   hypre_Vector *utemp_lower           = hypre_SeqVectorCreate(m);
-   hypre_VectorOwnsData(ftemp_upper)   = 0;
-   hypre_VectorOwnsData(utemp_lower)   = 0;
-   hypre_VectorData(ftemp_upper)       = ftemp_data;
-   hypre_VectorData(utemp_lower)       = utemp_data + nLU;
-   hypre_SeqVectorInitialize(ftemp_upper);
-   hypre_SeqVectorInitialize(utemp_lower);
-
-   /* begin */
-   HYPRE_Real one = 1.0;
-   HYPRE_Real mone = -1.0;
-   HYPRE_Real zero = 0.0;
-
-   HYPRE_Int               isDoublePrecision    = sizeof(HYPRE_Complex) == sizeof(hypre_double);
-   HYPRE_Int               isSinglePrecision    = sizeof(HYPRE_Complex) == sizeof(hypre_double) / 2;
-
-   hypre_assert(isDoublePrecision || isSinglePrecision);
-
-   cusparseHandle_t handle = hypre_HandleCusparseHandle(hypre_handle());
-
-   switch(test_opt)
-   {
-      case 1: case 3:
-      {
-         /* E and F */
-         /* compute residual */
-         hypre_ParCSRMatrixMatvecOutOfPlace(mone, A, u, one, f, utemp);
-
-         /* apply permutation before we can start our solve
-          * Au=f -> (PAQ)Q'u=Pf
-          */
-         HYPRE_THRUST_CALL(gather, perm, perm + n, utemp_data, ftemp_data);
-
-         /* A-smoothing
-          * x = [UA\(LA\(P*f_u))] fill to xtemp
-          */
-         if(n > 0)
-         {
-            if(isDoublePrecision)
-            {
-               /* L solve - Forward solve */
-               HYPRE_CUSPARSE_CALL(cusparseDcsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                         n, ALU_nnz, (hypre_double *) &one, matL_des,
-                                                         (hypre_double *) ALU_data, ALU_i, ALU_j, matAL_info,
-                                                         (hypre_double *) ftemp_data, (hypre_double *) utemp_data, ilu_solve_policy, ilu_solve_buffer));
-               /* U solve - Forward solve */
-               HYPRE_CUSPARSE_CALL(cusparseDcsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                         n, ALU_nnz, (hypre_double *) &one, matU_des,
-                                                         (hypre_double *) ALU_data, ALU_i, ALU_j, matAU_info,
-                                                         (hypre_double *) utemp_data, (hypre_double *) xtemp_data, ilu_solve_policy, ilu_solve_buffer));
-            }
-            else if(isSinglePrecision)
-            {
-               /* L solve - Forward solve */
-               HYPRE_CUSPARSE_CALL(cusparseScsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                         n, ALU_nnz, (float *) &one, matL_des,
-                                                         (float *) ALU_data, ALU_i, ALU_j, matAL_info,
-                                                         (float *) ftemp_data, (float *) utemp_data, ilu_solve_policy, ilu_solve_buffer));
-               /* U solve - Forward solve */
-               HYPRE_CUSPARSE_CALL(cusparseScsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                         n, ALU_nnz, (float *) &one, matU_des,
-                                                         (float *) ALU_data, ALU_i, ALU_j, matAU_info,
-                                                         (float *) utemp_data, (float *) xtemp_data, ilu_solve_policy, ilu_solve_buffer));
-            }
-         }
-         /* residual, we should not touch xtemp for now
-          * r = R*(f-PAQx)
-          */
-         hypre_ParCSRMatrixMatvec(mone, Aperm, xtemp, one, ftemp);
-         /* with R is complex */
-         /* copy partial data in */
-         hypre_TMemcpy( rhs_data, ftemp_data + nLU, HYPRE_Real, m, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
-
-         /* solve L^{-1} */
-         if(nLU > 0)
-         {
-            if(isDoublePrecision)
-            {
-               /* L solve */
-               HYPRE_CUSPARSE_CALL(cusparseDcsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                         nLU, BLU_nnz, (hypre_double *) &one, matL_des,
-                                                         (hypre_double *) BLU_data, BLU_i, BLU_j, matBL_info,
-                                                         (hypre_double *) ftemp_data, (hypre_double *) utemp_data, ilu_solve_policy, ilu_solve_buffer));
-            }
-            else if(isSinglePrecision)
-            {
-               /* L solve */
-               HYPRE_CUSPARSE_CALL(cusparseScsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                         nLU, BLU_nnz, (float *) &one, matL_des,
-                                                         (float *) BLU_data, BLU_i, BLU_j, matBL_info,
-                                                         (float *) ftemp_data, (float *) utemp_data, ilu_solve_policy, ilu_solve_buffer));
-            }
-            /* -U^{-1}L^{-1} */
-            if(isDoublePrecision)
-            {
-               /* U solve */
-               HYPRE_CUSPARSE_CALL(cusparseDcsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                         nLU, BLU_nnz, (hypre_double *) &one, matU_des,
-                                                         (hypre_double *) BLU_data, BLU_i, BLU_j, matBU_info,
-                                                         (hypre_double *) utemp_data, (hypre_double *) ftemp_data, ilu_solve_policy, ilu_solve_buffer));
-            }
-            else if(isSinglePrecision)
-            {
-               /* U solve */
-               HYPRE_CUSPARSE_CALL(cusparseScsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                         nLU, BLU_nnz, (float *) &one, matU_des,
-                                                         (float *) BLU_data, BLU_i, BLU_j, matBU_info,
-                                                         (float *) utemp_data, (float *) ftemp_data, ilu_solve_policy, ilu_solve_buffer));
-            }
-         }
-         /* -EU^{-1}L^{-1} */
-         hypre_CSRMatrixMatvec(mone, matE_d, ftemp_upper, one, rhs_local);
-
-
-         /* now solve S
-          */
-         if(S)
-         {
-            /* if we have a schur complement */
-            hypre_ParVectorSetConstantValues(x, 0.0);
-            HYPRE_GMRESSolve(schur_solver,(HYPRE_Matrix)schur_precond,(HYPRE_Vector)rhs,(HYPRE_Vector)x);
-
-            /* u = xtemp + P*x */
-            /* -Fx */
-            hypre_CSRMatrixMatvec(mone, matF_d, x_local, zero, ftemp_upper);
-            /* -L^{-1}Fx */
-            if(nLU > 0)
-            {
-               if(isDoublePrecision)
-               {
-                  /* L solve */
-                  HYPRE_CUSPARSE_CALL(cusparseDcsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                            nLU, BLU_nnz, (hypre_double *) &one, matL_des,
-                                                            (hypre_double *) BLU_data, BLU_i, BLU_j, matBL_info,
-                                                            (hypre_double *) ftemp_data, (hypre_double *) utemp_data, ilu_solve_policy, ilu_solve_buffer));
-               }
-               else if(isSinglePrecision)
-               {
-                  /* L solve */
-                  HYPRE_CUSPARSE_CALL(cusparseScsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                            nLU, BLU_nnz, (float *) &one, matL_des,
-                                                            (float *) BLU_data, BLU_i, BLU_j, matBL_info,
-                                                            (float *) ftemp_data, (float *) utemp_data, ilu_solve_policy, ilu_solve_buffer));
-               }
-               /* -U{-1}L^{-1}Fx */
-               if(isDoublePrecision)
-               {
-                  /* U solve */
-                  HYPRE_CUSPARSE_CALL(cusparseDcsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                            nLU, BLU_nnz, (hypre_double *) &one, matU_des,
-                                                            (hypre_double *) BLU_data, BLU_i, BLU_j, matBU_info,
-                                                            (hypre_double *) utemp_data, (hypre_double *) ftemp_data, ilu_solve_policy, ilu_solve_buffer));
-               }
-               else if(isSinglePrecision)
-               {
-                  /* U solve */
-                  HYPRE_CUSPARSE_CALL(cusparseScsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                            nLU, BLU_nnz, (float *) &one, matU_des,
-                                                            (float *) BLU_data, BLU_i, BLU_j, matBU_info,
-                                                            (float *) utemp_data, (float *) ftemp_data, ilu_solve_policy, ilu_solve_buffer));
-               }
-            }
-            /* now copy data to y_lower */
-            hypre_TMemcpy( ftemp_data + nLU, x_data, HYPRE_Real, m, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
-
-            /* correction to the residual */
-            hypre_ParVectorAxpy(one, ftemp, xtemp);
-
-         }
-         else
-         {
-            /* otherwise just apply triangular solves */
-            if(m > 0)
-            {
-               if(isDoublePrecision)
-               {
-                  /* L solve - Forward solve */
-                  HYPRE_CUSPARSE_CALL(cusparseDcsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                            m, SLU_nnz, (hypre_double *) &one, matL_des,
-                                                            (hypre_double *) SLU_data, SLU_i, SLU_j, matSL_info,
-                                                            (hypre_double *) rhs_data, (hypre_double *) x_data, ilu_solve_policy, ilu_solve_buffer));
-               }
-               else if(isSinglePrecision)
-               {
-                  /* L solve - Forward solve */
-                  HYPRE_CUSPARSE_CALL(cusparseScsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                            m, SLU_nnz, (float *) &one, matL_des,
-                                                            (float *) SLU_data, SLU_i, SLU_j, matSL_info,
-                                                            (float *) rhs_data, (float *) x_data, ilu_solve_policy, ilu_solve_buffer));
-               }
-               if(isDoublePrecision)
-               {
-                  /* U solve - Forward solve */
-                  HYPRE_CUSPARSE_CALL(cusparseDcsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                            m, SLU_nnz, (hypre_double *) &one, matU_des,
-                                                            (hypre_double *) SLU_data, SLU_i, SLU_j, matSU_info,
-                                                            (hypre_double *) x_data, (hypre_double *) rhs_data, ilu_solve_policy, ilu_solve_buffer));
-               }
-               else if(isSinglePrecision)
-               {
-                  /* U solve - Forward solve */
-                  HYPRE_CUSPARSE_CALL(cusparseScsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                            m, SLU_nnz, (float *) &one, matU_des,
-                                                            (float *) SLU_data, SLU_i, SLU_j, matSU_info,
-                                                            (float *) x_data, (float *) rhs_data, ilu_solve_policy, ilu_solve_buffer));
-               }
-            }
-
-            /* u = xtemp + P*x */
-            /* -Fx */
-            hypre_CSRMatrixMatvec(mone, matF_d, rhs_local, zero, ftemp_upper);
-            /* -L^{-1}Fx */
-            if(nLU > 0)
-            {
-               if(isDoublePrecision)
-               {
-                  /* L solve */
-                  HYPRE_CUSPARSE_CALL(cusparseDcsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                            nLU, BLU_nnz, (hypre_double *) &one, matL_des,
-                                                            (hypre_double *) BLU_data, BLU_i, BLU_j, matBL_info,
-                                                            (hypre_double *) ftemp_data, (hypre_double *) utemp_data, ilu_solve_policy, ilu_solve_buffer));
-               }
-               else if(isSinglePrecision)
-               {
-                  /* L solve */
-                  HYPRE_CUSPARSE_CALL(cusparseScsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                            nLU, BLU_nnz, (float *) &one, matL_des,
-                                                            (float *) BLU_data, BLU_i, BLU_j, matBL_info,
-                                                            (float *) ftemp_data, (float *) utemp_data, ilu_solve_policy, ilu_solve_buffer));
-               }
-               /* -U{-1}L^{-1}Fx */
-               if(isDoublePrecision)
-               {
-                  /* U solve */
-                  HYPRE_CUSPARSE_CALL(cusparseDcsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                            nLU, BLU_nnz, (hypre_double *) &one, matU_des,
-                                                            (hypre_double *) BLU_data, BLU_i, BLU_j, matBU_info,
-                                                            (hypre_double *) utemp_data, (hypre_double *) ftemp_data, ilu_solve_policy, ilu_solve_buffer));
-               }
-               else if(isSinglePrecision)
-               {
-                  /* U solve */
-                  HYPRE_CUSPARSE_CALL(cusparseScsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                            nLU, BLU_nnz, (float *) &one, matU_des,
-                                                            (float *) BLU_data, BLU_i, BLU_j, matBU_info,
-                                                            (float *) utemp_data, (float *) ftemp_data, ilu_solve_policy, ilu_solve_buffer));
-               }
-            }
-            /* now copy data to y_lower */
-            hypre_TMemcpy( ftemp_data + nLU, rhs_data, HYPRE_Real, m, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
-
-            hypre_ParVectorAxpy(one, ftemp, xtemp);
-
-         }
-
-         /* perm back */
-         HYPRE_THRUST_CALL(scatter,xtemp_data, xtemp_data + n, perm, ftemp_data);
-
-         /* done, now everything are in u_temp, update solution */
-         hypre_ParVectorAxpy(one, ftemp, u);
-      }
-      break;
-      case 0: case 2: default:
-      {
-         /* EU^{-1} and L^{-1}F */
-         /* compute residual */
-         hypre_ParCSRMatrixMatvecOutOfPlace(mone, A, u, one, f, ftemp);
-         /* apply permutation before we can start our solve
-          * Au=f -> (PAQ)Q'u=Pf
-          */
-         HYPRE_THRUST_CALL(gather, perm, perm + n, ftemp_data, utemp_data);
-
-         /* A-smoothing
-          * x = [UA\(LA\(P*f_u))] fill to xtemp
-          */
-         if(n > 0)
-         {
-            if(isDoublePrecision)
-            {
-               /* L solve - Forward solve */
-               HYPRE_CUSPARSE_CALL(cusparseDcsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                         n, ALU_nnz, (hypre_double *) &one, matL_des,
-                                                         (hypre_double *) ALU_data, ALU_i, ALU_j, matAL_info,
-                                                         (hypre_double *) utemp_data, (hypre_double *) ftemp_data, ilu_solve_policy, ilu_solve_buffer));
-               /* U solve - Forward solve */
-               HYPRE_CUSPARSE_CALL(cusparseDcsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                         n, ALU_nnz, (hypre_double *) &one, matU_des,
-                                                         (hypre_double *) ALU_data, ALU_i, ALU_j, matAU_info,
-                                                         (hypre_double *) ftemp_data, (hypre_double *) xtemp_data, ilu_solve_policy, ilu_solve_buffer));
-            }
-            else if(isSinglePrecision)
-            {
-               /* L solve - Forward solve */
-               HYPRE_CUSPARSE_CALL(cusparseScsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                         n, ALU_nnz, (float *) &one, matL_des,
-                                                         (float *) ALU_data, ALU_i, ALU_j, matAL_info,
-                                                         (float *) utemp_data, (float *) ftemp_data, ilu_solve_policy, ilu_solve_buffer));
-               /* U solve - Forward solve */
-               HYPRE_CUSPARSE_CALL(cusparseScsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                         n, ALU_nnz, (float *) &one, matU_des,
-                                                         (float *) ALU_data, ALU_i, ALU_j, matAU_info,
-                                                         (float *) ftemp_data, (float *) xtemp_data, ilu_solve_policy, ilu_solve_buffer));
-            }
-         }
-         /* residual, we should not touch xtemp for now
-          * r = R*(f-PAQx)
-          */
-         hypre_ParCSRMatrixMatvec(mone, Aperm, xtemp, one, utemp);
-         /* with R is complex */
-         /* copy partial data in */
-         hypre_TMemcpy( rhs_data, utemp_data + nLU, HYPRE_Real, m, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
-
-         /* solve L^{-1} */
-         if(nLU > 0)
-         {
-            if(isDoublePrecision)
-            {
-               /* L solve */
-               HYPRE_CUSPARSE_CALL(cusparseDcsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                         nLU, BLU_nnz, (hypre_double *) &one, matL_des,
-                                                         (hypre_double *) BLU_data, BLU_i, BLU_j, matBL_info,
-                                                         (hypre_double *) utemp_data, (hypre_double *) ftemp_data, ilu_solve_policy, ilu_solve_buffer));
-            }
-            else if(isSinglePrecision)
-            {
-               /* L solve */
-               HYPRE_CUSPARSE_CALL(cusparseScsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                         nLU, BLU_nnz, (float *) &one, matL_des,
-                                                         (float *) BLU_data, BLU_i, BLU_j, matBL_info,
-                                                         (float *) utemp_data, (float *) ftemp_data, ilu_solve_policy, ilu_solve_buffer));
-            }
-         }
-         /* -EU^{-1}L^{-1} */
-         hypre_CSRMatrixMatvec(mone, matE_d, ftemp_upper, one, rhs_local);
-
-
-         /* now solve S
-          */
-         if(S)
-         {
-            /* if we have a schur complement */
-            hypre_ParVectorSetConstantValues(x, 0.0);
-            HYPRE_GMRESSolve(schur_solver,(HYPRE_Matrix)schur_precond,(HYPRE_Vector)rhs,(HYPRE_Vector)x);
-
-            /* u = xtemp + P*x */
-            /* -L^{-1}Fx */
-            hypre_CSRMatrixMatvec(mone, matF_d, x_local, zero, ftemp_upper);
-            /* -U{-1}L^{-1}Fx */
-            if(nLU > 0)
-            {
-               if(isDoublePrecision)
-               {
-                  /* U solve */
-                  HYPRE_CUSPARSE_CALL(cusparseDcsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                            nLU, BLU_nnz, (hypre_double *) &one, matU_des,
-                                                            (hypre_double *) BLU_data, BLU_i, BLU_j, matBU_info,
-                                                            (hypre_double *) ftemp_data, (hypre_double *) utemp_data, ilu_solve_policy, ilu_solve_buffer));
-               }
-               else if(isSinglePrecision)
-               {
-                  /* U solve */
-                  HYPRE_CUSPARSE_CALL(cusparseScsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                            nLU, BLU_nnz, (float *) &one, matU_des,
-                                                            (float *) BLU_data, BLU_i, BLU_j, matBU_info,
-                                                            (float *) ftemp_data, (float *) utemp_data, ilu_solve_policy, ilu_solve_buffer));
-               }
-            }
-            /* now copy data to y_lower */
-            hypre_TMemcpy( utemp_data + nLU, x_data, HYPRE_Real, m, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
-
-            hypre_ParVectorAxpy(one, utemp, xtemp);
-
-         }
-         else
-         {
-            /* otherwise just apply triangular solves */
-            if(m > 0)
-            {
-               if(isDoublePrecision)
-               {
-                  /* L solve - Forward solve */
-                  HYPRE_CUSPARSE_CALL(cusparseDcsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                            m, SLU_nnz, (hypre_double *) &one, matL_des,
-                                                            (hypre_double *) SLU_data, SLU_i, SLU_j, matSL_info,
-                                                            (hypre_double *) rhs_data, (hypre_double *) x_data, ilu_solve_policy, ilu_solve_buffer));
-               }
-               else if(isSinglePrecision)
-               {
-                  /* L solve - Forward solve */
-                  HYPRE_CUSPARSE_CALL(cusparseScsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                            m, SLU_nnz, (float *) &one, matL_des,
-                                                            (float *) SLU_data, SLU_i, SLU_j, matSL_info,
-                                                            (float *) rhs_data, (float *) x_data, ilu_solve_policy, ilu_solve_buffer));
-               }
-               if(isDoublePrecision)
-               {
-                  /* U solve - Forward solve */
-                  HYPRE_CUSPARSE_CALL(cusparseDcsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                            m, SLU_nnz, (hypre_double *) &one, matU_des,
-                                                            (hypre_double *) SLU_data, SLU_i, SLU_j, matSU_info,
-                                                            (hypre_double *) x_data, (hypre_double *) rhs_data, ilu_solve_policy, ilu_solve_buffer));
-               }
-               else if(isSinglePrecision)
-               {
-                  /* U solve - Forward solve */
-                  HYPRE_CUSPARSE_CALL(cusparseScsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                            m, SLU_nnz, (float *) &one, matU_des,
-                                                            (float *) SLU_data, SLU_i, SLU_j, matSU_info,
-                                                            (float *) x_data, (float *) rhs_data, ilu_solve_policy, ilu_solve_buffer));
-               }
-            }
-            /* u = xtemp + P*x */
-            /* -L^{-1}Fx */
-            hypre_CSRMatrixMatvec(mone, matF_d, rhs_local, zero, ftemp_upper);
-            /* -U{-1}L^{-1}Fx */
-            if(nLU > 0)
-            {
-               if(isDoublePrecision)
-               {
-                  /* U solve */
-                  HYPRE_CUSPARSE_CALL(cusparseDcsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                            nLU, BLU_nnz, (hypre_double *) &one, matU_des,
-                                                            (hypre_double *) BLU_data, BLU_i, BLU_j, matBU_info,
-                                                            (hypre_double *) ftemp_data, (hypre_double *) utemp_data, ilu_solve_policy, ilu_solve_buffer));
-               }
-               else if(isSinglePrecision)
-               {
-                  /* U solve */
-                  HYPRE_CUSPARSE_CALL(cusparseScsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                            nLU, BLU_nnz, (float *) &one, matU_des,
-                                                            (float *) BLU_data, BLU_i, BLU_j, matBU_info,
-                                                            (float *) ftemp_data, (float *) utemp_data, ilu_solve_policy, ilu_solve_buffer));
-               }
-            }
-            /* now copy data to y_lower */
-            hypre_TMemcpy( utemp_data + nLU, rhs_data, HYPRE_Real, m, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
-
-            hypre_ParVectorAxpy(one, utemp, xtemp);
-
-         }
-
-         /* perm back */
-         HYPRE_THRUST_CALL(scatter,xtemp_data, xtemp_data + n, perm, ftemp_data);
-
-         /* done, now everything are in u_temp, update solution */
-         hypre_ParVectorAxpy(one, ftemp, u);
-      }
-      break;
-   }
-
-   return hypre_error_flag;
-}
-
-#endif
-
-HYPRE_Int
-hypre_ILUSolveRAPGMRESHOST(hypre_ParCSRMatrix *A, hypre_ParVector *f, hypre_ParVector *u, HYPRE_Int *perm,
-                           HYPRE_Int nLU, hypre_ParCSRMatrix *L, HYPRE_Real *D, hypre_ParCSRMatrix *U,
-                           hypre_ParCSRMatrix *mL, HYPRE_Real *mD, hypre_ParCSRMatrix *mU,
-                           hypre_ParVector *ftemp, hypre_ParVector *utemp,
-                           hypre_ParVector *xtemp, hypre_ParVector *ytemp,
-                           HYPRE_Solver schur_solver, HYPRE_Solver schur_precond,
-                           hypre_ParVector *rhs, hypre_ParVector *x, HYPRE_Int *u_end)
-{
-//#pragma omp parallel
-//        printf("threads %d\n",omp_get_num_threads());
-   /* data objects for communication */
-//   MPI_Comm          comm = hypre_ParCSRMatrixComm(A);
-
-   /* data objects for L and U */
-   hypre_CSRMatrix   *L_diag = hypre_ParCSRMatrixDiag(L);
-   HYPRE_Real        *L_diag_data = hypre_CSRMatrixData(L_diag);
-   HYPRE_Int         *L_diag_i = hypre_CSRMatrixI(L_diag);
-   HYPRE_Int         *L_diag_j = hypre_CSRMatrixJ(L_diag);
-   hypre_CSRMatrix   *U_diag = hypre_ParCSRMatrixDiag(U);
-   HYPRE_Real        *U_diag_data = hypre_CSRMatrixData(U_diag);
-   HYPRE_Int         *U_diag_i = hypre_CSRMatrixI(U_diag);
-   HYPRE_Int         *U_diag_j = hypre_CSRMatrixJ(U_diag);
-
-   hypre_CSRMatrix   *mL_diag = hypre_ParCSRMatrixDiag(mL);
-   HYPRE_Real        *mL_diag_data = hypre_CSRMatrixData(mL_diag);
-   HYPRE_Int         *mL_diag_i = hypre_CSRMatrixI(mL_diag);
-   HYPRE_Int         *mL_diag_j = hypre_CSRMatrixJ(mL_diag);
-   hypre_CSRMatrix   *mU_diag = hypre_ParCSRMatrixDiag(mU);
-   HYPRE_Real        *mU_diag_data = hypre_CSRMatrixData(mU_diag);
-   HYPRE_Int         *mU_diag_i = hypre_CSRMatrixI(mU_diag);
-   HYPRE_Int         *mU_diag_j = hypre_CSRMatrixJ(mU_diag);
+   /* other data objects for computation */
+   hypre_Vector      *rhs_local;
+   HYPRE_Real        *rhs_data;
+   hypre_Vector      *x_local = NULL;
+   HYPRE_Real        *x_data  = NULL;
 
-   hypre_Vector      *utemp_local = hypre_ParVectorLocalVector(utemp);
-   HYPRE_Real        *utemp_data  = hypre_VectorData(utemp_local);
-   hypre_Vector      *ftemp_local = hypre_ParVectorLocalVector(ftemp);
-   HYPRE_Real        *ftemp_data  = hypre_VectorData(ftemp_local);
-   hypre_Vector      *xtemp_local = NULL;
-   HYPRE_Real        *xtemp_data  = NULL;
-   hypre_Vector      *ytemp_local = NULL;
-   HYPRE_Real        *ytemp_data  = NULL;
-   if(xtemp)
+   /* xtemp might be null when we have no Schur complement */
+   if (xtemp)
    {
-      /* xtemp might be null when we have no Schur complement */
       xtemp_local = hypre_ParVectorLocalVector(xtemp);
       xtemp_data  = hypre_VectorData(xtemp_local);
       ytemp_local = hypre_ParVectorLocalVector(ytemp);
       ytemp_data  = hypre_VectorData(ytemp_local);
    }
 
-   HYPRE_Real        alpha;
-   HYPRE_Real        beta;
-   HYPRE_Int         i, j, k1, k2, col;
-
-   /* problem size */
-   HYPRE_Int         n = hypre_CSRMatrixNumRows(L_diag);
-   HYPRE_Int         m = n - nLU;
-
-   /* other data objects for computation */
-   //hypre_Vector      *f_local;
-   //HYPRE_Real        *f_data;
-   hypre_Vector      *rhs_local;
-   HYPRE_Real        *rhs_data;
-   hypre_Vector      *x_local;
-   HYPRE_Real        *x_data;
-
-   /* begin */
-   beta = 1.0;
-   alpha = -1.0;
-
-   if(m > 0)
+   /* Setup vectors for solve */
+   if (m > 0)
    {
-      /* setup vectors for solve */
       rhs_local   = hypre_ParVectorLocalVector(rhs);
       rhs_data    = hypre_VectorData(rhs_local);
       x_local     = hypre_ParVectorLocalVector(x);
       x_data      = hypre_VectorData(x_local);
-
    }
 
    /* only support RAP with partial factorized W and Z */
@@ -1970,26 +1407,26 @@ hypre_ILUSolveRAPGMRESHOST(hypre_ParCSRMatrix *A, hypre_ParVector *f, hypre_ParV
 
    /* A-smoothing f_temp = [UA \ LA \ (f_temp[perm])] */
    /* permuted L solve */
-   for(i = 0 ; i < n ; i ++)
+   for (i = 0 ; i < n ; i ++)
    {
       utemp_data[i] = ftemp_data[perm[i]];
-      k1 = L_diag_i[i] ; k2 = L_diag_i[i+1];
-      for(j = k1 ; j < k2 ; j ++)
+      k1 = L_diag_i[i] ; k2 = L_diag_i[i + 1];
+      for (j = k1 ; j < k2 ; j ++)
       {
          col = L_diag_j[j];
          utemp_data[i] -= L_diag_data[j] * utemp_data[col];
       }
    }
 
-   if(!xtemp)
+   if (!xtemp)
    {
       /* in this case, we don't have a Schur complement */
       /* U solve */
-      for(i = n-1 ; i >= 0 ; i --)
+      for (i = n - 1 ; i >= 0 ; i --)
       {
          ftemp_data[perm[i]] = utemp_data[i];
-         k1 = U_diag_i[i] ; k2 = U_diag_i[i+1];
-         for(j = k1 ; j < k2 ; j ++)
+         k1 = U_diag_i[i] ; k2 = U_diag_i[i + 1];
+         for (j = k1 ; j < k2 ; j ++)
          {
             col = U_diag_j[j];
             ftemp_data[perm[i]] -= U_diag_data[j] * ftemp_data[perm[col]];
@@ -2003,11 +1440,11 @@ hypre_ILUSolveRAPGMRESHOST(hypre_ParCSRMatrix *A, hypre_ParVector *f, hypre_ParV
    }
 
    /* U solve */
-   for(i = n-1 ; i >= 0 ; i --)
+   for (i = n - 1 ; i >= 0 ; i --)
    {
       xtemp_data[perm[i]] = utemp_data[i];
-      k1 = U_diag_i[i] ; k2 = U_diag_i[i+1];
-      for(j = k1 ; j < k2 ; j ++)
+      k1 = U_diag_i[i] ; k2 = U_diag_i[i + 1];
+      for (j = k1 ; j < k2 ; j ++)
       {
          col = U_diag_j[j];
          xtemp_data[perm[i]] -= U_diag_data[j] * xtemp_data[perm[col]];
@@ -2023,14 +1460,14 @@ hypre_ILUSolveRAPGMRESHOST(hypre_ParCSRMatrix *A, hypre_ParVector *f, hypre_ParV
    hypre_ParCSRMatrixMatvecOutOfPlace(alpha, A, xtemp, beta, ftemp, utemp);
 
    // R = [-L21 L\inv, I]
-   if( m > 0)
+   if (m > 0)
    {
       /* first is L solve */
-      for(i = 0 ; i < nLU ; i ++)
+      for (i = 0 ; i < nLU ; i ++)
       {
          ytemp_data[i] = utemp_data[perm[i]];
-         k1 = mL_diag_i[i] ; k2 = mL_diag_i[i+1];
-         for(j = k1 ; j < k2 ; j ++)
+         k1 = mL_diag_i[i] ; k2 = mL_diag_i[i + 1];
+         for (j = k1 ; j < k2 ; j ++)
          {
             col = mL_diag_j[j];
             ytemp_data[i] -= mL_diag_data[j] * ytemp_data[col];
@@ -2038,11 +1475,11 @@ hypre_ILUSolveRAPGMRESHOST(hypre_ParCSRMatrix *A, hypre_ParVector *f, hypre_ParV
       }
 
       /* apply -W * ytemp on this, and take care of the I part */
-      for(i = nLU ; i < n ; i ++)
+      for (i = nLU ; i < n ; i ++)
       {
          rhs_data[i - nLU] = utemp_data[perm[i]];
          k1 = mL_diag_i[i] ; k2 = u_end[i];
-         for(j = k1 ; j < k2 ; j ++)
+         for (j = k1 ; j < k2 ; j ++)
          {
             col = mL_diag_j[j];
             rhs_data[i - nLU] -= mL_diag_data[j] * ytemp_data[col];
@@ -2052,9 +1489,12 @@ hypre_ILUSolveRAPGMRESHOST(hypre_ParCSRMatrix *A, hypre_ParVector *f, hypre_ParV
 
    /* now the rhs is ready */
    hypre_SeqVectorSetConstantValues(x_local, 0.0);
-   HYPRE_GMRESSolve(schur_solver,(HYPRE_Matrix)schur_precond,(HYPRE_Vector)rhs,(HYPRE_Vector)x);
+   HYPRE_GMRESSolve(schur_solver,
+                    (HYPRE_Matrix) schur_precond,
+                    (HYPRE_Vector) rhs,
+                    (HYPRE_Vector) x);
 
-   if(m > 0)
+   if (m > 0)
    {
       /*
       for(i = 0 ; i < m ; i ++)
@@ -2089,22 +1529,22 @@ hypre_ILUSolveRAPGMRESHOST(hypre_ParCSRMatrix *A, hypre_ParVector *f, hypre_ParV
        *     [  I          ]
        */
       /* matvec */
-      for(i = 0 ; i < nLU ; i ++)
+      for (i = 0 ; i < nLU ; i ++)
       {
          ytemp_data[i] = 0.0;
-         k1 = u_end[i] ; k2 = mU_diag_i[i+1];
-         for(j = k1 ; j < k2 ; j ++)
+         k1 = u_end[i] ; k2 = mU_diag_i[i + 1];
+         for (j = k1 ; j < k2 ; j ++)
          {
             col = mU_diag_j[j];
-            ytemp_data[i] -= mU_diag_data[j] * x_data[col-nLU];
+            ytemp_data[i] -= mU_diag_data[j] * x_data[col - nLU];
          }
       }
       /* U solve */
-      for(i = nLU-1 ; i >= 0 ; i --)
+      for (i = nLU - 1 ; i >= 0 ; i --)
       {
          ftemp_data[perm[i]] = ytemp_data[i];
          k1 = mU_diag_i[i] ; k2 = u_end[i];
-         for(j = k1 ; j < k2 ; j ++)
+         for (j = k1 ; j < k2 ; j ++)
          {
             col = mU_diag_j[j];
             ftemp_data[perm[i]] -= mU_diag_data[j] * ftemp_data[perm[col]];
@@ -2113,9 +1553,9 @@ hypre_ILUSolveRAPGMRESHOST(hypre_ParCSRMatrix *A, hypre_ParVector *f, hypre_ParV
       }
 
       /* update with I */
-      for(i = nLU ; i < n ; i ++)
+      for (i = nLU ; i < n ; i ++)
       {
-         ftemp_data[perm[i]] = x_data[i-nLU];
+         ftemp_data[perm[i]] = x_data[i - nLU];
       }
       hypre_ParVectorAxpy(beta, ftemp, u);
    }
@@ -2125,59 +1565,53 @@ hypre_ILUSolveRAPGMRESHOST(hypre_ParCSRMatrix *A, hypre_ParVector *f, hypre_ParV
    return hypre_error_flag;
 }
 
-/* solve functions for NSH */
+/******************************************************************************
+ *
+ * NSH functions.
+ *
+ *****************************************************************************/
 
 /*--------------------------------------------------------------------
  * hypre_NSHSolve
  *--------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_NSHSolve( void               *nsh_vdata,
-                  hypre_ParCSRMatrix *A,
-                  hypre_ParVector    *f,
-                  hypre_ParVector    *u )
+                hypre_ParCSRMatrix *A,
+                hypre_ParVector    *f,
+                hypre_ParVector    *u )
 {
-   MPI_Comm             comm = hypre_ParCSRMatrixComm(A);
-   //   HYPRE_Int            i;
-
-   hypre_ParNSHData     *nsh_data = (hypre_ParNSHData*) nsh_vdata;
-
-   /* get matrices */
-   hypre_ParCSRMatrix   *matA = hypre_ParNSHDataMatA(nsh_data);
-   hypre_ParCSRMatrix   *matM = hypre_ParNSHDataMatM(nsh_data);
-
-   HYPRE_Int            iter, num_procs,  my_id;
-
-   hypre_ParVector      *F_array = hypre_ParNSHDataF(nsh_data);
-   hypre_ParVector      *U_array = hypre_ParNSHDataU(nsh_data);
-
-   /* get settings */
-   HYPRE_Real           tol = hypre_ParNSHDataTol(nsh_data);
-   HYPRE_Int            logging = hypre_ParNSHDataLogging(nsh_data);
-   HYPRE_Int            print_level = hypre_ParNSHDataPrintLevel(nsh_data);
-   HYPRE_Int            max_iter = hypre_ParNSHDataMaxIter(nsh_data);
-   HYPRE_Real           *norms = hypre_ParNSHDataRelResNorms(nsh_data);
-   hypre_ParVector      *Ftemp = hypre_ParNSHDataFTemp(nsh_data);
-   hypre_ParVector      *Utemp = hypre_ParNSHDataUTemp(nsh_data);
-   hypre_ParVector      *residual;
-
-   HYPRE_Real           alpha = -1.0;
-   HYPRE_Real           beta = 1.0;
-   HYPRE_Real           conv_factor = 0.0;
-   HYPRE_Real           resnorm = 1.0;
-   HYPRE_Real           init_resnorm = 0.0;
-   HYPRE_Real           rel_resnorm;
-   HYPRE_Real           rhs_norm = 0.0;
-   HYPRE_Real           old_resnorm;
-   HYPRE_Real           ieee_check = 0.;
-   HYPRE_Real           operat_cmplxty = hypre_ParNSHDataOperatorComplexity(nsh_data);
-
-   HYPRE_Int            Solve_err_flag;
-
-   /* problem size */
-   //   HYPRE_Int            n = hypre_CSRMatrixNumRows(hypre_ParCSRMatrixDiag(A));
-
-   /* begin */
-   if(logging > 1)
+   MPI_Comm              comm           = hypre_ParCSRMatrixComm(A);
+   hypre_ParNSHData     *nsh_data       = (hypre_ParNSHData*) nsh_vdata;
+   hypre_ParCSRMatrix   *matA           = hypre_ParNSHDataMatA(nsh_data);
+   hypre_ParCSRMatrix   *matM           = hypre_ParNSHDataMatM(nsh_data);
+   hypre_ParVector      *F_array        = hypre_ParNSHDataF(nsh_data);
+   hypre_ParVector      *U_array        = hypre_ParNSHDataU(nsh_data);
+
+   HYPRE_Real            tol            = hypre_ParNSHDataTol(nsh_data);
+   HYPRE_Int             logging        = hypre_ParNSHDataLogging(nsh_data);
+   HYPRE_Int             print_level    = hypre_ParNSHDataPrintLevel(nsh_data);
+   HYPRE_Int             max_iter       = hypre_ParNSHDataMaxIter(nsh_data);
+   HYPRE_Real           *norms          = hypre_ParNSHDataRelResNorms(nsh_data);
+   hypre_ParVector      *Ftemp          = hypre_ParNSHDataFTemp(nsh_data);
+   hypre_ParVector      *Utemp          = hypre_ParNSHDataUTemp(nsh_data);
+   hypre_ParVector      *residual       = NULL;
+
+   HYPRE_Real            alpha          = -1.0;
+   HYPRE_Real            beta           = 1.0;
+   HYPRE_Real            conv_factor    = 0.0;
+   HYPRE_Real            resnorm        = 1.0;
+   HYPRE_Real            init_resnorm   = 0.0;
+   HYPRE_Real            rel_resnorm;
+   HYPRE_Real            rhs_norm       = 0.0;
+   HYPRE_Real            old_resnorm;
+   HYPRE_Real            ieee_check     = 0.0;
+   HYPRE_Real            operat_cmplxty = hypre_ParNSHDataOperatorComplexity(nsh_data);
+
+   HYPRE_Int             iter, num_procs,  my_id;
+   HYPRE_Int             Solve_err_flag;
+
+   if (logging > 1)
    {
       residual = hypre_ParNSHDataResidual(nsh_data);
    }
@@ -2185,7 +1619,7 @@ hypre_NSHSolve( void               *nsh_vdata,
    hypre_ParNSHDataNumIterations(nsh_data) = 0;
 
    hypre_MPI_Comm_size(comm, &num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_rank(comm, &my_id);
 
    /*-----------------------------------------------------------------------
     *    Write the solver parameters
@@ -2206,7 +1640,7 @@ hypre_NSHSolve( void               *nsh_vdata,
 
    if (my_id == 0 && print_level > 1 && tol > 0.)
    {
-      hypre_printf("\n\n Newton–Schulz–Hotelling SOLVER SOLUTION INFO:\n");
+      hypre_printf("\n\n Newton-Schulz-Hotelling SOLVER SOLUTION INFO:\n");
    }
 
 
@@ -2215,14 +1649,14 @@ hypre_NSHSolve( void               *nsh_vdata,
     *-----------------------------------------------------------------------*/
    if (print_level > 1 || logging > 1 || tol > 0.)
    {
-      if ( logging > 1 )
+      if (logging > 1)
       {
-         hypre_ParVectorCopy(f, residual );
+         hypre_ParVectorCopy(f, residual);
          if (tol > 0.0)
          {
-            hypre_ParCSRMatrixMatvec(alpha, A, u, beta, residual );
+            hypre_ParCSRMatrixMatvec(alpha, A, u, beta, residual);
          }
-         resnorm = sqrt(hypre_ParVectorInnerProd( residual, residual ));
+         resnorm = hypre_sqrt(hypre_ParVectorInnerProd(residual, residual));
       }
       else
       {
@@ -2231,14 +1665,14 @@ hypre_NSHSolve( void               *nsh_vdata,
          {
             hypre_ParCSRMatrixMatvec(alpha, A, u, beta, Ftemp);
          }
-         resnorm = sqrt(hypre_ParVectorInnerProd(Ftemp, Ftemp));
+         resnorm = hypre_sqrt(hypre_ParVectorInnerProd(Ftemp, Ftemp));
       }
 
-      /* Since it is does not diminish performance, attempt to return an error flag
+      /* Since it does not diminish performance, attempt to return an error flag
          and notify users when they supply bad input. */
       if (resnorm != 0.)
       {
-         ieee_check = resnorm/resnorm; /* INF -> NaN conversion */
+         ieee_check = resnorm / resnorm; /* INF -> NaN conversion */
       }
       if (ieee_check != ieee_check)
       {
@@ -2259,7 +1693,7 @@ hypre_NSHSolve( void               *nsh_vdata,
       }
 
       init_resnorm = resnorm;
-      rhs_norm = sqrt(hypre_ParVectorInnerProd(f, f));
+      rhs_norm = hypre_sqrt(hypre_ParVectorInnerProd(f, f));
       if (rhs_norm > HYPRE_REAL_EPSILON)
       {
          rel_resnorm = init_resnorm / rhs_norm;
@@ -2268,7 +1702,7 @@ hypre_NSHSolve( void               *nsh_vdata,
       {
          /* rhs is zero, return a zero solution */
          hypre_ParVectorSetConstantValues(U_array, 0.0);
-         if(logging > 0)
+         if (logging > 0)
          {
             rel_resnorm = 0.0;
             hypre_ParNSHDataFinalRelResidualNorm(nsh_data) = rel_resnorm;
@@ -2286,8 +1720,8 @@ hypre_NSHSolve( void               *nsh_vdata,
       hypre_printf("                                            relative\n");
       hypre_printf("               residual        factor       residual\n");
       hypre_printf("               --------        ------       --------\n");
-      hypre_printf("    Initial    %e                 %e\n",init_resnorm,
-            rel_resnorm);
+      hypre_printf("    Initial    %e                 %e\n", init_resnorm,
+                   rel_resnorm);
    }
 
    matA = A;
@@ -2297,10 +1731,8 @@ hypre_NSHSolve( void               *nsh_vdata,
    /************** Main Solver Loop - always do 1 iteration ************/
    iter = 0;
 
-   while ((rel_resnorm >= tol || iter < 1)
-         && iter < max_iter)
+   while ((rel_resnorm >= tol || iter < 1) && iter < max_iter)
    {
-
       /* Do one solve on e = Mr */
       hypre_NSHSolveInverse(matA, f, u, matM, Utemp, Ftemp);
 
@@ -2312,19 +1744,21 @@ hypre_NSHSolve( void               *nsh_vdata,
       {
          old_resnorm = resnorm;
 
-         if ( logging > 1 ) {
+         if (logging > 1)
+         {
             hypre_ParVectorCopy(F_array, residual);
             hypre_ParCSRMatrixMatvec(alpha, matA, U_array, beta, residual );
-            resnorm = sqrt(hypre_ParVectorInnerProd( residual, residual ));
+            resnorm = hypre_sqrt(hypre_ParVectorInnerProd( residual, residual ));
          }
-         else {
+         else
+         {
             hypre_ParVectorCopy(F_array, Ftemp);
             hypre_ParCSRMatrixMatvec(alpha, matA, U_array, beta, Ftemp);
-            resnorm = sqrt(hypre_ParVectorInnerProd(Ftemp, Ftemp));
+            resnorm = hypre_sqrt(hypre_ParVectorInnerProd(Ftemp, Ftemp));
          }
 
-         if (old_resnorm) conv_factor = resnorm / old_resnorm;
-         else conv_factor = resnorm;
+         if (old_resnorm) { conv_factor = resnorm / old_resnorm; }
+         else { conv_factor = resnorm; }
          if (rhs_norm > HYPRE_REAL_EPSILON)
          {
             rel_resnorm = resnorm / rhs_norm;
@@ -2344,7 +1778,7 @@ hypre_NSHSolve( void               *nsh_vdata,
       if (my_id == 0 && print_level > 1)
       {
          hypre_printf("    NSHSolve %2d   %e    %f     %e \n", iter,
-               resnorm, conv_factor, rel_resnorm);
+                      resnorm, conv_factor, rel_resnorm);
       }
    }
 
@@ -2362,7 +1796,7 @@ hypre_NSHSolve( void               *nsh_vdata,
 
    if (iter > 0 && init_resnorm)
    {
-      conv_factor = pow((resnorm/init_resnorm),(1.0/(HYPRE_Real) iter));
+      conv_factor = hypre_pow((resnorm / init_resnorm), (1.0 / (HYPRE_Real) iter));
    }
    else
    {
@@ -2378,40 +1812,49 @@ hypre_NSHSolve( void               *nsh_vdata,
          {
             hypre_printf("\n\n==============================================");
             hypre_printf("\n NOTE: Convergence tolerance was not achieved\n");
-            hypre_printf("      within the allowed %d iterations\n",max_iter);
+            hypre_printf("      within the allowed %d iterations\n", max_iter);
             hypre_printf("==============================================");
          }
-         hypre_printf("\n\n Average Convergence Factor = %f \n",conv_factor);
-         hypre_printf("                operator = %f\n",operat_cmplxty);
+         hypre_printf("\n\n Average Convergence Factor = %f \n", conv_factor);
+         hypre_printf("                operator = %f\n", operat_cmplxty);
       }
    }
+
    return hypre_error_flag;
 }
 
-/* NSH solve
+/*--------------------------------------------------------------------
+ * hypre_NSHSolveInverse
+ *
  * Simply a matvec on residual with approximate inverse
+ *
  * A: original matrix
  * f: rhs
  * u: solution
  * M: approximate inverse
  * ftemp, utemp: working vectors
-*/
+ *--------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_NSHSolveInverse(hypre_ParCSRMatrix *A, hypre_ParVector *f,
-                        hypre_ParVector *u, hypre_ParCSRMatrix *M,
-                        hypre_ParVector *ftemp, hypre_ParVector *utemp)
+hypre_NSHSolveInverse(hypre_ParCSRMatrix *A,
+                      hypre_ParVector    *f,
+                      hypre_ParVector    *u,
+                      hypre_ParCSRMatrix *M,
+                      hypre_ParVector    *ftemp,
+                      hypre_ParVector    *utemp)
 {
-   HYPRE_Real      alpha;
-   HYPRE_Real      beta;
+   HYPRE_Real  alpha = -1.0;
+   HYPRE_Real  beta  = 1.0;
+   HYPRE_Real  zero  = 0.0;
 
-   /* begin */
-   alpha = -1.0;
-   beta = 1.0;
-   /* r = f-Au */
+   /* r = f - Au */
    hypre_ParCSRMatrixMatvecOutOfPlace(alpha, A, u, beta, f, ftemp);
+
    /* e = Mr */
-   hypre_ParCSRMatrixMatvec(1.0, M, ftemp, 0.0, utemp);
+   hypre_ParCSRMatrixMatvec(beta, M, ftemp, zero, utemp);
+
    /* u = u + e */
    hypre_ParVectorAxpy(beta, utemp, u);
+
    return hypre_error_flag;
 }
diff --git a/external/hypre/src/parcsr_ls/par_ilu_solve_device.c b/external/hypre/src/parcsr_ls/par_ilu_solve_device.c
new file mode 100644
index 00000000..685f6e3b
--- /dev/null
+++ b/external/hypre/src/parcsr_ls/par_ilu_solve_device.c
@@ -0,0 +1,1226 @@
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+#include "_hypre_onedpl.hpp"
+#include "_hypre_parcsr_ls.h"
+#include "_hypre_utilities.hpp"
+
+#if defined(HYPRE_USING_GPU)
+
+/*--------------------------------------------------------------------------
+ * hypre_ILUSolveLUDevice
+ *
+ * Incomplete LU solve (GPU)
+ *
+ * L, D and U factors only have local scope (no off-diagonal processor terms)
+ * so apart from the residual calculation (which uses A), the solves with the
+ * L and U factors are local.
+ *
+ * TODO (VPM): Merge this function with hypre_ILUSolveLUIterDevice
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ILUSolveLUDevice(hypre_ParCSRMatrix  *A,
+                       hypre_CSRMatrix     *matLU_d,
+                       hypre_ParVector     *f,
+                       hypre_ParVector     *u,
+                       HYPRE_Int           *perm,
+                       hypre_ParVector     *ftemp,
+                       hypre_ParVector     *utemp)
+{
+   HYPRE_Int            num_rows      = hypre_ParCSRMatrixNumRows(A);
+
+   hypre_Vector        *utemp_local   = hypre_ParVectorLocalVector(utemp);
+   HYPRE_Complex       *utemp_data    = hypre_VectorData(utemp_local);
+   hypre_Vector        *ftemp_local   = hypre_ParVectorLocalVector(ftemp);
+   HYPRE_Complex       *ftemp_data    = hypre_VectorData(ftemp_local);
+
+   HYPRE_Complex        alpha = -1.0;
+   HYPRE_Complex        beta  = 1.0;
+
+   /* Sanity check */
+   if (num_rows == 0)
+   {
+      return hypre_error_flag;
+   }
+
+   HYPRE_ANNOTATE_FUNC_BEGIN;
+   hypre_GpuProfilingPushRange("ILUSolve");
+
+   /* Compute residual */
+   hypre_ParCSRMatrixMatvecOutOfPlace(alpha, A, u, beta, f, ftemp);
+
+   /* Apply permutation */
+   if (perm)
+   {
+#if defined(HYPRE_USING_SYCL)
+      hypreSycl_gather(perm, perm + num_rows, ftemp_data, utemp_data);
+#else
+      HYPRE_THRUST_CALL(gather, perm, perm + num_rows, ftemp_data, utemp_data);
+#endif
+   }
+   else
+   {
+      hypre_TMemcpy(utemp_data, ftemp_data, HYPRE_Complex, num_rows,
+                    HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+   }
+
+   /* L solve - Forward solve */
+   hypre_CSRMatrixTriLowerUpperSolveDevice('L', 1, matLU_d, NULL, utemp_local, ftemp_local);
+
+   /* U solve - Backward substitution */
+   hypre_CSRMatrixTriLowerUpperSolveDevice('U', 0, matLU_d, NULL, ftemp_local, utemp_local);
+
+   /* Apply reverse permutation */
+   if (perm)
+   {
+#if defined(HYPRE_USING_SYCL)
+      hypreSycl_scatter(utemp_data, utemp_data + num_rows, perm, ftemp_data);
+#else
+      HYPRE_THRUST_CALL(scatter, utemp_data, utemp_data + num_rows, perm, ftemp_data);
+#endif
+   }
+   else
+   {
+      hypre_TMemcpy(ftemp_data, utemp_data, HYPRE_Complex, num_rows,
+                    HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+   }
+
+   /* Update solution */
+   hypre_ParVectorAxpy(beta, ftemp, u);
+
+   hypre_GpuProfilingPopRange();
+   HYPRE_ANNOTATE_FUNC_END;
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_ILUApplyLowerJacIterDevice
+ *
+ * Incomplete L solve (Forward) of u^{k+1} = L^{-1}u^k on the GPU using the
+ * Jacobi iterative approach.
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ILUApplyLowerJacIterDevice(hypre_CSRMatrix *A,
+                                 hypre_Vector    *input,
+                                 hypre_Vector    *work,
+                                 hypre_Vector    *output,
+                                 HYPRE_Int        lower_jacobi_iters)
+{
+   HYPRE_Complex   *input_data  = hypre_VectorData(input);
+   HYPRE_Complex   *work_data   = hypre_VectorData(work);
+   HYPRE_Complex   *output_data = hypre_VectorData(output);
+   HYPRE_Int        num_rows    = hypre_CSRMatrixNumRows(A);
+
+   HYPRE_Int        kk = 0;
+
+   /* Since the initial guess to the jacobi iteration is 0, the result of
+      the first L SpMV is 0, so no need to compute.
+      However, we still need to compute the transformation */
+   hypreDevice_ComplexAxpyn(work_data, num_rows, input_data, output_data, 0.0);
+
+   /* Do the remaining iterations */
+   for (kk = 1; kk < lower_jacobi_iters; kk++)
+   {
+      /* Apply SpMV */
+      hypre_CSRMatrixSpMVDevice(0, 1.0, A, output, 0.0, work, -2);
+
+      /* Transform */
+      hypreDevice_ComplexAxpyn(work_data, num_rows, input_data, output_data, -1.0);
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_ILUApplyUpperJacIterDevice
+ *
+ * Incomplete U solve (Backward) of u^{k+1} = U^{-1}u^k on the GPU using the
+ * Jacobi iterative approach.
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ILUApplyUpperJacIterDevice(hypre_CSRMatrix *A,
+                                 hypre_Vector    *input,
+                                 hypre_Vector    *work,
+                                 hypre_Vector    *output,
+                                 hypre_Vector    *diag,
+                                 HYPRE_Int        upper_jacobi_iters)
+{
+   HYPRE_Complex   *output_data    = hypre_VectorData(output);
+   HYPRE_Complex   *work_data      = hypre_VectorData(work);
+   HYPRE_Complex   *input_data     = hypre_VectorData(input);
+   HYPRE_Complex   *diag_data      = hypre_VectorData(diag);
+   HYPRE_Int        num_rows       = hypre_CSRMatrixNumRows(A);
+
+   HYPRE_Int        kk = 0;
+
+   /* Since the initial guess to the jacobi iteration is 0,
+      the result of the first U SpMV is 0, so no need to compute.
+      However, we still need to compute the transformation */
+   hypreDevice_zeqxmydd(num_rows, input_data, 0.0, work_data, output_data, diag_data);
+
+   /* Do the remaining iterations */
+   for (kk = 1; kk < upper_jacobi_iters; kk++)
+   {
+      /* apply SpMV */
+      hypre_CSRMatrixSpMVDevice(0, 1.0, A, output, 0.0, work, 2);
+
+      /* transform */
+      hypreDevice_zeqxmydd(num_rows, input_data, -1.0, work_data, output_data, diag_data);
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_ILUApplyLowerUpperJacIterDevice
+ *
+ * Incomplete LU solve of u^{k+1} = U^{-1} L^{-1} u^k on the GPU using the
+ * Jacobi iterative approach.
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ILUApplyLowerUpperJacIterDevice(hypre_CSRMatrix *A,
+                                      hypre_Vector    *work1,
+                                      hypre_Vector    *work2,
+                                      hypre_Vector    *inout,
+                                      hypre_Vector    *diag,
+                                      HYPRE_Int        lower_jacobi_iters,
+                                      HYPRE_Int        upper_jacobi_iters)
+{
+   /* Apply the iterative solve to L */
+   hypre_ILUApplyLowerJacIterDevice(A, inout, work1, work2, lower_jacobi_iters);
+
+   /* Apply the iterative solve to U */
+   hypre_ILUApplyUpperJacIterDevice(A, work2, work1, inout, diag, upper_jacobi_iters);
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_ILUSolveLUIterDevice
+ *
+ * Incomplete LU solve using jacobi iterations on GPU.
+ * L, D and U factors only have local scope (no off-diagonal processor terms).
+ *
+ * TODO (VPM): Merge this function with hypre_ILUSolveLUDevice
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ILUSolveLUIterDevice(hypre_ParCSRMatrix *A,
+                           hypre_CSRMatrix    *matLU,
+                           hypre_ParVector    *f,
+                           hypre_ParVector    *u,
+                           HYPRE_Int          *perm,
+                           hypre_ParVector    *ftemp,
+                           hypre_ParVector    *utemp,
+                           hypre_ParVector    *xtemp,
+                           hypre_Vector      **diag_ptr,
+                           HYPRE_Int           lower_jacobi_iters,
+                           HYPRE_Int           upper_jacobi_iters)
+{
+   HYPRE_Int        num_rows    = hypre_ParCSRMatrixNumRows(A);
+
+   hypre_Vector    *diag        = *diag_ptr;
+   hypre_Vector    *xtemp_local = hypre_ParVectorLocalVector(xtemp);
+   hypre_Vector    *utemp_local = hypre_ParVectorLocalVector(utemp);
+   HYPRE_Complex   *utemp_data  = hypre_VectorData(utemp_local);
+   hypre_Vector    *ftemp_local = hypre_ParVectorLocalVector(ftemp);
+   HYPRE_Complex   *ftemp_data  = hypre_VectorData(ftemp_local);
+
+   HYPRE_Complex    alpha = -1.0;
+   HYPRE_Complex    beta  = 1.0;
+
+   /* Sanity check */
+   if (num_rows == 0)
+   {
+      return hypre_error_flag;
+   }
+
+   HYPRE_ANNOTATE_FUNC_BEGIN;
+   hypre_GpuProfilingPushRange("ILUSolveLUIter");
+
+   /* Grab the main diagonal from the diagonal block. Only do this once */
+   if (!diag)
+   {
+      /* Storage for the diagonal */
+      diag = hypre_SeqVectorCreate(num_rows);
+      hypre_SeqVectorInitialize(diag);
+
+      /* extract with device kernel */
+      hypre_CSRMatrixExtractDiagonalDevice(matLU, hypre_VectorData(diag), 2);
+
+      /* Save output pointer */
+      *diag_ptr = diag;
+   }
+
+   /* Compute residual */
+   hypre_ParCSRMatrixMatvecOutOfPlace(alpha, A, u, beta, f, ftemp);
+
+   /* Apply permutation */
+   if (perm)
+   {
+#if defined(HYPRE_USING_SYCL)
+      hypreSycl_gather(perm, perm + num_rows, ftemp_data, utemp_data);
+#else
+      HYPRE_THRUST_CALL(gather, perm, perm + num_rows, ftemp_data, utemp_data);
+#endif
+   }
+   else
+   {
+      hypre_TMemcpy(utemp_data, ftemp_data, HYPRE_Complex, num_rows,
+                    HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+   }
+
+   /* Apply the iterative solve to L and U */
+   hypre_ILUApplyLowerUpperJacIterDevice(matLU, ftemp_local, xtemp_local, utemp_local,
+                                         diag, lower_jacobi_iters, upper_jacobi_iters);
+
+   /* Apply reverse permutation */
+   if (perm)
+   {
+#if defined(HYPRE_USING_SYCL)
+      hypreSycl_scatter(utemp_data, utemp_data + num_rows, perm, ftemp_data);
+#else
+      HYPRE_THRUST_CALL(scatter, utemp_data, utemp_data + num_rows, perm, ftemp_data);
+#endif
+   }
+   else
+   {
+      hypre_TMemcpy(ftemp_data, utemp_data, HYPRE_Complex, num_rows,
+                    HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+   }
+
+   /* Update solution */
+   hypre_ParVectorAxpy(beta, ftemp, u);
+
+   hypre_GpuProfilingPopRange();
+   HYPRE_ANNOTATE_FUNC_END;
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_ParILUSchurGMRESMatvecDevice
+ *
+ * Slightly different, for this new matvec, the diagonal of the original
+ * matrix is the LU factorization. Thus, the matvec is done in an different way
+ *
+ * |IS_1 E_12 E_13|
+ * |E_21 IS_2 E_23| = S
+ * |E_31 E_32 IS_3|
+ *
+ * |IS_1          |
+ * |     IS_2     | = M
+ * |          IS_3|
+ *
+ * Solve Sy = g is just M^{-1}S = M^{-1}g
+ *
+ * |      I       IS_1^{-1}E_12 IS_1^{-1}E_13|
+ * |IS_2^{-1}E_21       I       IS_2^{-1}E_23| = M^{-1}S
+ * |IS_3^{-1}E_31 IS_3^{-1}E_32       I      |
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ParILUSchurGMRESMatvecDevice(void          *matvec_data,
+                                   HYPRE_Complex  alpha,
+                                   void          *ilu_vdata,
+                                   void          *x,
+                                   HYPRE_Complex  beta,
+                                   void          *y)
+{
+   HYPRE_UNUSED_VAR(matvec_data);
+
+   /* Get matrix information first */
+   hypre_ParILUData    *ilu_data       = (hypre_ParILUData*) ilu_vdata;
+   hypre_ParCSRMatrix  *S              = hypre_ParILUDataMatS(ilu_data);
+   hypre_CSRMatrix     *S_diag         = hypre_ParCSRMatrixDiag(S);
+
+   /* Fist step, apply matvec on empty diagonal slot */
+   HYPRE_Int            num_rows       = hypre_CSRMatrixNumRows(S_diag);
+   HYPRE_Int            num_nonzeros   = hypre_CSRMatrixNumNonzeros(S_diag);
+
+   hypre_ParVector     *xtemp          = hypre_ParILUDataXTemp(ilu_data);
+   hypre_ParVector     *ytemp          = hypre_ParILUDataYTemp(ilu_data);
+   hypre_Vector        *xtemp_local    = hypre_ParVectorLocalVector(xtemp);
+   hypre_Vector        *ytemp_local    = hypre_ParVectorLocalVector(ytemp);
+
+   /* Local variables */
+   HYPRE_Complex        zero           = 0.0;
+   HYPRE_Complex        one            = 1.0;
+
+   /* Matvec with
+    *         |  O  E_12 E_13|
+    * alpha * |E_21   O  E_23|
+    *         |E_31 E_32   O |
+    * store in xtemp
+    */
+
+   /* RL: temp. set S_diag's nnz = 0 to skip the matvec
+      (based on the assumption in seq_mv/csr_matvec impl.) */
+   hypre_CSRMatrixNumRows(S_diag)     = 0;
+   hypre_CSRMatrixNumNonzeros(S_diag) = 0;
+   hypre_ParCSRMatrixMatvec(alpha, (hypre_ParCSRMatrix *) S, (hypre_ParVector *) x, zero, xtemp);
+   hypre_CSRMatrixNumRows(S_diag)     = num_rows;
+   hypre_CSRMatrixNumNonzeros(S_diag) = num_nonzeros;
+
+   /* Compute U^{-1}*L^{-1}*(S_offd * x)
+    * Or in other words, matvec with
+    *         |      O       IS_1^{-1}E_12 IS_1^{-1}E_13|
+    * alpha * |IS_2^{-1}E_21       O       IS_2^{-1}E_23|
+    *         |IS_3^{-1}E_31 IS_3^{-1}E_32       O      |
+    * store in xtemp
+    */
+
+   /* L solve - Forward solve */
+   hypre_CSRMatrixTriLowerUpperSolveDevice('L', 1, S_diag, NULL, xtemp_local, ytemp_local);
+
+   /* U solve - Backward substitution */
+   hypre_CSRMatrixTriLowerUpperSolveDevice('U', 0, S_diag, NULL, ytemp_local, xtemp_local);
+
+   /* xtemp = xtemp + alpha*x */
+   hypre_ParVectorAxpy(alpha, (hypre_ParVector *) x, xtemp);
+
+   /* y = xtemp + beta*y */
+   hypre_ParVectorAxpyz(one, xtemp, beta, (hypre_ParVector *) y, (hypre_ParVector *) y);
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_ILUSolveSchurGMRESDevice
+ *
+ * Schur Complement solve with GMRES on schur complement
+ *
+ * ParCSRMatrix S is already built in ilu data sturcture, here directly use
+ *  S, L, D and U factors only have local scope (no off-diag terms) so apart
+ *  from the residual calculation (which uses A), the solves with the L and U
+ *  factors are local.
+ * S is the global Schur complement
+ * schur_solver is a GMRES solver
+ * schur_precond is the ILU preconditioner for GMRES
+ * rhs and x are helper vectors for solving the Schur system
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ILUSolveSchurGMRESDevice(hypre_ParCSRMatrix  *A,
+                               hypre_ParVector     *f,
+                               hypre_ParVector     *u,
+                               HYPRE_Int           *perm,
+                               HYPRE_Int            nLU,
+                               hypre_ParCSRMatrix  *S,
+                               hypre_ParVector     *ftemp,
+                               hypre_ParVector     *utemp,
+                               HYPRE_Solver         schur_solver,
+                               HYPRE_Solver         schur_precond,
+                               hypre_ParVector     *rhs,
+                               hypre_ParVector     *x,
+                               HYPRE_Int           *u_end,
+                               hypre_CSRMatrix     *matBLU_d,
+                               hypre_CSRMatrix     *matE_d,
+                               hypre_CSRMatrix     *matF_d)
+{
+   HYPRE_UNUSED_VAR(u_end);
+
+   /* If we don't have S block, just do one L solve and one U solve */
+   if (!S)
+   {
+      return hypre_ILUSolveLUDevice(A, matBLU_d, f, u, perm, ftemp, utemp);
+   }
+
+   /* Data objects for temp vector */
+   hypre_Vector      *utemp_local      = hypre_ParVectorLocalVector(utemp);
+   HYPRE_Real        *utemp_data       = hypre_VectorData(utemp_local);
+   hypre_Vector      *ftemp_local      = hypre_ParVectorLocalVector(ftemp);
+   HYPRE_Real        *ftemp_data       = hypre_VectorData(ftemp_local);
+   hypre_Vector      *rhs_local        = hypre_ParVectorLocalVector(rhs);
+   hypre_Vector      *x_local          = hypre_ParVectorLocalVector(x);
+   HYPRE_Real        *x_data           = hypre_VectorData(x_local);
+
+   /* Problem size */
+   hypre_CSRMatrix   *matSLU_d         = hypre_ParCSRMatrixDiag(S);
+   HYPRE_Int          m                = hypre_CSRMatrixNumRows(matSLU_d);
+   HYPRE_Int          n                = nLU + m;
+
+   /* Local variables */
+   HYPRE_Real         alpha            = -1.0;
+   HYPRE_Real         beta             = 1.0;
+   hypre_Vector      *ftemp_upper;
+   hypre_Vector      *utemp_lower;
+
+   /* Temporary vectors */
+   ftemp_upper = hypre_SeqVectorCreate(nLU);
+   utemp_lower = hypre_SeqVectorCreate(m);
+   hypre_VectorOwnsData(ftemp_upper) = 0;
+   hypre_VectorOwnsData(utemp_lower) = 0;
+   hypre_VectorData(ftemp_upper) = ftemp_data;
+   hypre_VectorData(utemp_lower) = utemp_data + nLU;
+   hypre_SeqVectorInitialize(ftemp_upper);
+   hypre_SeqVectorInitialize(utemp_lower);
+
+   /* Compute residual */
+   hypre_ParCSRMatrixMatvecOutOfPlace(alpha, A, u, beta, f, ftemp);
+
+   /* 1st need to solve LBi*xi = fi
+    * L solve, solve xi put in u_temp upper
+    */
+
+   /* Apply permutation before we can start our solve */
+   if (perm)
+   {
+#if defined(HYPRE_USING_SYCL)
+      hypreSycl_gather(perm, perm + n, ftemp_data, utemp_data);
+#else
+      HYPRE_THRUST_CALL(gather, perm, perm + n, ftemp_data, utemp_data);
+#endif
+   }
+   else
+   {
+      hypre_TMemcpy(utemp_data, ftemp_data, HYPRE_Complex, n,
+                    HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+   }
+
+   /* This solve won't touch data in utemp, thus, gi is still in utemp_lower */
+   /* L solve - Forward solve */
+   hypre_CSRMatrixTriLowerUpperSolveDevice('L', 1, matBLU_d, NULL, utemp_local, ftemp_local);
+
+   /* 2nd need to compute g'i = gi - Ei*UBi^{-1}*xi
+    * Ei*UBi^{-1} is exactly the matE_d here
+    * Now:  LBi^{-1}f_i is in ftemp_upper
+    *       gi' is in utemp_lower
+    */
+   hypre_CSRMatrixMatvec(alpha, matE_d, ftemp_upper, beta, utemp_lower);
+
+   /* 3rd need to solve global Schur Complement M^{-1}Sy = M^{-1}g'
+    * for now only solve the local system
+    * solve y put in u_temp lower
+    * only solve whe S is not NULL
+    */
+
+   /* Setup vectors for solve
+    * rhs = M^{-1}g'
+    */
+
+   /* L solve */
+   hypre_CSRMatrixTriLowerUpperSolveDevice_core('L', 1, matSLU_d, NULL, utemp_local,
+                                                nLU, ftemp_local, nLU);
+
+   /* U solve */
+   hypre_CSRMatrixTriLowerUpperSolveDevice_core('U', 0, matSLU_d, NULL, ftemp_local,
+                                                nLU, rhs_local, 0);
+
+   /* Solve with tricky initial guess */
+   HYPRE_GMRESSolve(schur_solver,
+                    (HYPRE_Matrix) schur_precond,
+                    (HYPRE_Vector) rhs,
+                    (HYPRE_Vector) x);
+
+   /* 4th need to compute zi = xi - LBi^-1*yi
+    * put zi in f_temp upper
+    * only do this computation when nLU < n
+    * U is unsorted, search is expensive when unnecessary
+    */
+   hypre_CSRMatrixMatvec(alpha, matF_d, x_local, beta, ftemp_upper);
+
+   /* 5th need to solve UBi*ui = zi */
+   /* put result in u_temp upper */
+   /* U solve - Forward solve */
+   hypre_CSRMatrixTriLowerUpperSolveDevice('U', 0, matBLU_d, NULL, ftemp_local, utemp_local);
+
+   /* Copy lower part solution into u_temp as well */
+   hypre_TMemcpy(utemp_data + nLU, x_data, HYPRE_Real, m,
+                 HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+
+   /* Perm back */
+   if (perm)
+   {
+#if defined(HYPRE_USING_SYCL)
+      hypreSycl_scatter(utemp_data, utemp_data + n, perm, ftemp_data);
+#else
+      HYPRE_THRUST_CALL(scatter, utemp_data, utemp_data + n, perm, ftemp_data);
+#endif
+   }
+   else
+   {
+      hypre_TMemcpy(ftemp_data, utemp_data, HYPRE_Complex, n,
+                    HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+   }
+
+   /* Done, now everything are in u_temp, update solution */
+   hypre_ParVectorAxpy(beta, ftemp, u);
+
+   /* Free memory */
+   hypre_SeqVectorDestroy(ftemp_upper);
+   hypre_SeqVectorDestroy(utemp_lower);
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_ILUSolveSchurGMRESJacIterDevice
+ *
+ * Schur Complement solve with GMRES.
+ *
+ * ParCSRMatrix S is already built in the ilu data structure. S, L, D and U
+ *  factors only have local scope (no off-diag terms). So apart from the
+ *  residual calculation (which uses A), the solves with the L and U factors
+ *  are local.
+ * S: the global Schur complement
+ * schur_solver: GMRES solver
+ * schur_precond: ILU preconditioner for GMRES
+ * rhs and x are helper vectors for solving the Schur system
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ILUSolveSchurGMRESJacIterDevice(hypre_ParCSRMatrix *A,
+                                      hypre_ParVector    *f,
+                                      hypre_ParVector    *u,
+                                      HYPRE_Int          *perm,
+                                      HYPRE_Int           nLU,
+                                      hypre_ParCSRMatrix *S,
+                                      hypre_ParVector    *ftemp,
+                                      hypre_ParVector    *utemp,
+                                      HYPRE_Solver        schur_solver,
+                                      HYPRE_Solver        schur_precond,
+                                      hypre_ParVector    *rhs,
+                                      hypre_ParVector    *x,
+                                      HYPRE_Int          *u_end,
+                                      hypre_CSRMatrix    *matBLU_d,
+                                      hypre_CSRMatrix    *matE_d,
+                                      hypre_CSRMatrix    *matF_d,
+                                      hypre_ParVector    *ztemp,
+                                      hypre_Vector      **Adiag_diag,
+                                      hypre_Vector      **Sdiag_diag,
+                                      HYPRE_Int           lower_jacobi_iters,
+                                      HYPRE_Int           upper_jacobi_iters)
+{
+   HYPRE_UNUSED_VAR(u_end);
+
+   /* If we don't have S block, just do one L solve and one U solve */
+   if (!S)
+   {
+      return hypre_ILUSolveLUIterDevice(A, matBLU_d, f, u, perm,
+                                        ftemp, utemp, ztemp, Adiag_diag,
+                                        lower_jacobi_iters, upper_jacobi_iters);
+   }
+
+   /* Data objects for work vectors */
+   hypre_Vector      *utemp_local = hypre_ParVectorLocalVector(utemp);
+   hypre_Vector      *ftemp_local = hypre_ParVectorLocalVector(ftemp);
+   hypre_Vector      *ztemp_local = hypre_ParVectorLocalVector(ztemp);
+   hypre_Vector      *rhs_local   = hypre_ParVectorLocalVector(rhs);
+   hypre_Vector      *x_local     = hypre_ParVectorLocalVector(x);
+
+   HYPRE_Complex     *utemp_data  = hypre_VectorData(utemp_local);
+   HYPRE_Complex     *ftemp_data  = hypre_VectorData(ftemp_local);
+   HYPRE_Complex     *x_data      = hypre_VectorData(x_local);
+
+   /* Problem size */
+   hypre_CSRMatrix   *matSLU_d    = hypre_ParCSRMatrixDiag(S);
+   HYPRE_Int          m           = hypre_CSRMatrixNumRows(matSLU_d);
+   HYPRE_Int          n           = nLU + m;
+
+   /* Local variables */
+   HYPRE_Complex      alpha = -1.0;
+   HYPRE_Complex      beta  = 1.0;
+   hypre_Vector      *ftemp_upper;
+   hypre_Vector      *utemp_lower;
+   hypre_Vector      *ftemp_shift;
+   hypre_Vector      *utemp_shift;
+
+   /* Set work vectors */
+   ftemp_upper = hypre_SeqVectorCreate(nLU);
+   utemp_lower = hypre_SeqVectorCreate(m);
+   ftemp_shift = hypre_SeqVectorCreate(m);
+   utemp_shift = hypre_SeqVectorCreate(m);
+
+   hypre_VectorOwnsData(ftemp_upper) = 0;
+   hypre_VectorOwnsData(utemp_lower) = 0;
+   hypre_VectorOwnsData(ftemp_shift) = 0;
+   hypre_VectorOwnsData(utemp_shift) = 0;
+
+   hypre_VectorData(ftemp_upper) = ftemp_data;
+   hypre_VectorData(utemp_lower) = utemp_data + nLU;
+   hypre_VectorData(ftemp_shift) = ftemp_data + nLU;
+   hypre_VectorData(utemp_shift) = utemp_data + nLU;
+
+   hypre_SeqVectorInitialize(ftemp_upper);
+   hypre_SeqVectorInitialize(utemp_lower);
+   hypre_SeqVectorInitialize(ftemp_shift);
+   hypre_SeqVectorInitialize(utemp_shift);
+
+   /* Grab the main diagonal from the diagonal block. Only do this once */
+   if (!(*Adiag_diag))
+   {
+      /* Storage for the diagonal */
+      *Adiag_diag = hypre_SeqVectorCreate(n);
+      hypre_SeqVectorInitialize(*Adiag_diag);
+
+      /* Extract with device kernel */
+      hypre_CSRMatrixExtractDiagonalDevice(matBLU_d, hypre_VectorData(*Adiag_diag), 2);
+   }
+
+   /* Compute residual */
+   hypre_ParCSRMatrixMatvecOutOfPlace(alpha, A, u, beta, f, ftemp);
+
+   /* 1st need to solve LBi*xi = fi
+    * L solve, solve xi put in u_temp upper
+    */
+
+   /* Apply permutation before we can start our solve */
+   if (perm)
+   {
+#if defined(HYPRE_USING_SYCL)
+      hypreSycl_gather(perm, perm + n, ftemp_data, utemp_data);
+#else
+      HYPRE_THRUST_CALL(gather, perm, perm + n, ftemp_data, utemp_data);
+#endif
+   }
+   else
+   {
+      hypre_TMemcpy(utemp_data, ftemp_data, HYPRE_Complex, n,
+                    HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+   }
+
+   if (nLU > 0)
+   {
+      /* Apply the iterative solve to L */
+      hypre_ILUApplyLowerJacIterDevice(matBLU_d, utemp_local, ztemp_local,
+                                       ftemp_local, lower_jacobi_iters);
+
+      /* 2nd need to compute g'i = gi - Ei*UBi^{-1}*xi
+       * Ei*UBi^{-1} is exactly the matE_d here
+       * Now:  LBi^{-1}f_i is in ftemp_upper
+       *       gi' is in utemp_lower
+       */
+      hypre_CSRMatrixMatvec(alpha, matE_d, ftemp_upper, beta, utemp_lower);
+   }
+
+   /* 3rd need to solve global Schur Complement M^{-1}Sy = M^{-1}g'
+    * for now only solve the local system
+    * solve y put in u_temp lower
+    * only solve whe S is not NULL
+    */
+
+   /* Setup vectors for solve
+    * rhs = M^{-1}g'
+    */
+   if (m > 0)
+   {
+      /* Grab the main diagonal from the diagonal block. Only do this once */
+      if (!(*Sdiag_diag))
+      {
+         /* Storage for the diagonal */
+         *Sdiag_diag = hypre_SeqVectorCreate(m);
+         hypre_SeqVectorInitialize(*Sdiag_diag);
+
+         /* Extract with device kernel */
+         hypre_CSRMatrixExtractDiagonalDevice(matSLU_d, hypre_VectorData(*Sdiag_diag), 2);
+      }
+
+      /* Apply the iterative solve to L */
+      hypre_ILUApplyLowerJacIterDevice(matSLU_d, utemp_shift, rhs_local,
+                                       ftemp_shift, lower_jacobi_iters);
+
+      /* Apply the iterative solve to U */
+      hypre_ILUApplyUpperJacIterDevice(matSLU_d, ftemp_shift, utemp_shift,
+                                       rhs_local, *Sdiag_diag, upper_jacobi_iters);
+   }
+
+   /* Solve with tricky initial guess */
+   HYPRE_GMRESSolve(schur_solver,
+                    (HYPRE_Matrix) schur_precond,
+                    (HYPRE_Vector) rhs,
+                    (HYPRE_Vector) x);
+
+   /* 4th need to compute zi = xi - LBi^-1*yi
+    * put zi in f_temp upper
+    * only do this computation when nLU < n
+    * U is unsorted, search is expensive when unnecessary
+    */
+   if (nLU > 0)
+   {
+      hypre_CSRMatrixMatvec(alpha, matF_d, x_local, beta, ftemp_upper);
+
+      /* 5th need to solve UBi*ui = zi */
+      /* put result in u_temp upper */
+
+      /* Apply the iterative solve to U */
+      hypre_ILUApplyUpperJacIterDevice(matBLU_d, ftemp_local, ztemp_local,
+                                       utemp_local, *Adiag_diag, upper_jacobi_iters);
+   }
+
+   /* Copy lower part solution into u_temp as well */
+   hypre_TMemcpy(utemp_data + nLU, x_data, HYPRE_Real, m,
+                 HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+
+   /* Perm back */
+   if (perm)
+   {
+#if defined(HYPRE_USING_SYCL)
+      hypreSycl_scatter(utemp_data, utemp_data + n, perm, ftemp_data);
+#else
+      HYPRE_THRUST_CALL(scatter, utemp_data, utemp_data + n, perm, ftemp_data);
+#endif
+   }
+   else
+   {
+      hypre_TMemcpy(ftemp_data, utemp_data, HYPRE_Complex, n,
+                    HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+   }
+
+   /* Update solution */
+   hypre_ParVectorAxpy(beta, ftemp, u);
+
+   /* Free memory */
+   hypre_SeqVectorDestroy(ftemp_shift);
+   hypre_SeqVectorDestroy(utemp_shift);
+   hypre_SeqVectorDestroy(ftemp_upper);
+   hypre_SeqVectorDestroy(utemp_lower);
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_ParILUSchurGMRESMatvecJacIterDevice
+ *
+ * Slightly different, for this new matvec, the diagonal of the original matrix
+ * is the LU factorization. Thus, the matvec is done in an different way
+ *
+ * |IS_1 E_12 E_13|
+ * |E_21 IS_2 E_23| = S
+ * |E_31 E_32 IS_3|
+ *
+ * |IS_1          |
+ * |     IS_2     | = M
+ * |          IS_3|
+ *
+ * Solve Sy = g is just M^{-1}S = M^{-1}g
+ *
+ * |      I       IS_1^{-1}E_12 IS_1^{-1}E_13|
+ * |IS_2^{-1}E_21       I       IS_2^{-1}E_23| = M^{-1}S
+ * |IS_3^{-1}E_31 IS_3^{-1}E_32       I      |
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ParILUSchurGMRESMatvecJacIterDevice(void          *matvec_data,
+                                          HYPRE_Complex  alpha,
+                                          void          *ilu_vdata,
+                                          void          *x,
+                                          HYPRE_Complex  beta,
+                                          void          *y)
+{
+   HYPRE_UNUSED_VAR(matvec_data);
+
+   /* get matrix information first */
+   hypre_ParILUData    *ilu_data           = (hypre_ParILUData*) ilu_vdata;
+   hypre_ParCSRMatrix  *S                  = hypre_ParILUDataMatS(ilu_data);
+   hypre_Vector        *Sdiag_diag         = hypre_ParILUDataSDiagDiag(ilu_data);
+   HYPRE_Int            lower_jacobi_iters = hypre_ParILUDataLowerJacobiIters(ilu_data);
+   HYPRE_Int            upper_jacobi_iters = hypre_ParILUDataUpperJacobiIters(ilu_data);
+
+   /* fist step, apply matvec on empty diagonal slot */
+   hypre_CSRMatrix     *S_diag            = hypre_ParCSRMatrixDiag(S);
+   HYPRE_Int            S_diag_n          = hypre_CSRMatrixNumRows(S_diag);
+   HYPRE_Int            S_diag_nnz        = hypre_CSRMatrixNumNonzeros(S_diag);
+
+   hypre_ParVector     *xtemp             = hypre_ParILUDataXTemp(ilu_data);
+   hypre_Vector        *xtemp_local       = hypre_ParVectorLocalVector(xtemp);
+   hypre_ParVector     *ytemp             = hypre_ParILUDataYTemp(ilu_data);
+   hypre_Vector        *ytemp_local       = hypre_ParVectorLocalVector(ytemp);
+   hypre_ParVector     *ztemp             = hypre_ParILUDataZTemp(ilu_data);
+   hypre_Vector        *ztemp_local       = hypre_ParVectorLocalVector(ztemp);
+   HYPRE_Real           zero              = 0.0;
+   HYPRE_Real           one               = 1.0;
+
+   /* Matvec with
+    *         |  O  E_12 E_13|
+    * alpha * |E_21   O  E_23|
+    *         |E_31 E_32   O |
+    * store in xtemp
+    */
+
+   /* RL: temp. set S_diag's nnz = 0 to skip the matvec
+      (based on the assumption in seq_mv/csr_matvec impl.) */
+   hypre_CSRMatrixNumRows(S_diag)     = 0;
+   hypre_CSRMatrixNumNonzeros(S_diag) = 0;
+   hypre_ParCSRMatrixMatvec(alpha, (hypre_ParCSRMatrix *) S, (hypre_ParVector *) x, zero, xtemp);
+   hypre_CSRMatrixNumRows(S_diag)     = S_diag_n;
+   hypre_CSRMatrixNumNonzeros(S_diag) = S_diag_nnz;
+
+   /* Grab the main diagonal from the diagonal block. Only do this once */
+   if (!Sdiag_diag)
+   {
+      /* Storage for the diagonal */
+      Sdiag_diag = hypre_SeqVectorCreate(S_diag_n);
+      hypre_SeqVectorInitialize(Sdiag_diag);
+
+      /* Extract with device kernel */
+      hypre_CSRMatrixExtractDiagonalDevice(S_diag, hypre_VectorData(Sdiag_diag), 2);
+
+      /* Save Schur diagonal */
+      hypre_ParILUDataSDiagDiag(ilu_data) = Sdiag_diag;
+   }
+
+   /* Compute U^{-1}*L^{-1}*(A_offd * x)
+    * Or in another words, matvec with
+    *         |      O       IS_1^{-1}E_12 IS_1^{-1}E_13|
+    * alpha * |IS_2^{-1}E_21       O       IS_2^{-1}E_23|
+    *         |IS_3^{-1}E_31 IS_3^{-1}E_32       O      |
+    * store in xtemp
+    */
+   if (S_diag_n)
+   {
+      /* apply the iterative solve to L and U */
+      hypre_ILUApplyLowerUpperJacIterDevice(S_diag, ytemp_local, ztemp_local,
+                                            xtemp_local, Sdiag_diag,
+                                            lower_jacobi_iters, upper_jacobi_iters);
+   }
+
+   /* now add the original x onto it */
+   hypre_ParVectorAxpy(alpha, (hypre_ParVector *) x, xtemp);
+
+   /* y = xtemp + beta*y */
+   hypre_ParVectorAxpyz(one, xtemp, beta, (hypre_ParVector *) y, (hypre_ParVector *) y);
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------
+ * hypre_ILUSolveRAPGMRESDevice
+ *
+ * Device solve with GMRES on schur complement, RAP style.
+ *
+ * See hypre_ILUSolveRAPGMRESHost for more comments
+ *--------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ILUSolveRAPGMRESDevice(hypre_ParCSRMatrix   *A,
+                             hypre_ParVector      *f,
+                             hypre_ParVector      *u,
+                             HYPRE_Int            *perm,
+                             HYPRE_Int             nLU,
+                             hypre_ParCSRMatrix   *S,
+                             hypre_ParVector      *ftemp,
+                             hypre_ParVector      *utemp,
+                             hypre_ParVector      *xtemp,
+                             hypre_ParVector      *ytemp,
+                             HYPRE_Solver          schur_solver,
+                             HYPRE_Solver          schur_precond,
+                             hypre_ParVector      *rhs,
+                             hypre_ParVector      *x,
+                             HYPRE_Int            *u_end,
+                             hypre_ParCSRMatrix   *Aperm,
+                             hypre_CSRMatrix      *matALU_d,
+                             hypre_CSRMatrix      *matBLU_d,
+                             hypre_CSRMatrix      *matE_d,
+                             hypre_CSRMatrix      *matF_d,
+                             HYPRE_Int             test_opt)
+{
+   HYPRE_UNUSED_VAR(ytemp);
+   HYPRE_UNUSED_VAR(u_end);
+
+   /* If we don't have S block, just do one L/U solve */
+   if (!S)
+   {
+      return hypre_ILUSolveLUDevice(A, matBLU_d, f, u, perm, ftemp, utemp);
+   }
+
+   /* data objects for vectors */
+   hypre_Vector      *utemp_local = hypre_ParVectorLocalVector(utemp);
+   hypre_Vector      *ftemp_local = hypre_ParVectorLocalVector(ftemp);
+   hypre_Vector      *xtemp_local = hypre_ParVectorLocalVector(xtemp);
+   hypre_Vector      *rhs_local   = hypre_ParVectorLocalVector(rhs);
+   hypre_Vector      *x_local     = hypre_ParVectorLocalVector(x);
+
+   HYPRE_Complex     *utemp_data  = hypre_VectorData(utemp_local);
+   HYPRE_Complex     *ftemp_data  = hypre_VectorData(ftemp_local);
+   HYPRE_Complex     *xtemp_data  = hypre_VectorData(xtemp_local);
+   HYPRE_Complex     *rhs_data    = hypre_VectorData(rhs_local);
+   HYPRE_Complex     *x_data      = hypre_VectorData(x_local);
+
+   hypre_CSRMatrix   *matSLU_d    = hypre_ParCSRMatrixDiag(S);
+   HYPRE_Int          m           = hypre_CSRMatrixNumRows(matSLU_d);
+   HYPRE_Int          n           = nLU + m;
+   HYPRE_Real         one         = 1.0;
+   HYPRE_Real         mone        = -1.0;
+   HYPRE_Real         zero        = 0.0;
+
+   /* Temporary vectors */
+   hypre_Vector      *ftemp_upper;
+   hypre_Vector      *utemp_lower;
+
+   /* Create temporary vectors */
+   ftemp_upper = hypre_SeqVectorCreate(nLU);
+   utemp_lower = hypre_SeqVectorCreate(m);
+
+   hypre_VectorOwnsData(ftemp_upper) = 0;
+   hypre_VectorOwnsData(utemp_lower) = 0;
+   hypre_VectorData(ftemp_upper)     = ftemp_data;
+   hypre_VectorData(utemp_lower)     = utemp_data + nLU;
+
+   hypre_SeqVectorInitialize(ftemp_upper);
+   hypre_SeqVectorInitialize(utemp_lower);
+
+   switch (test_opt)
+   {
+      case 1: case 3:
+      {
+         /* E and F */
+         /* compute residual */
+         hypre_ParCSRMatrixMatvecOutOfPlace(mone, A, u, one, f, utemp);
+
+         /* apply permutation before we can start our solve
+          * Au=f -> (PAQ)Q'u=Pf
+          */
+         if (perm)
+         {
+#if defined(HYPRE_USING_SYCL)
+            hypreSycl_gather(perm, perm + n, utemp_data, ftemp_data);
+#else
+            HYPRE_THRUST_CALL(gather, perm, perm + n, utemp_data, ftemp_data);
+#endif
+         }
+         else
+         {
+            hypre_TMemcpy(ftemp_data, utemp_data, HYPRE_Complex, n,
+                          HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+         }
+
+         /* A-smoothing
+          * x = [UA\(LA\(P*f_u))] fill to xtemp
+          */
+
+         /* L solve - Forward solve */
+         hypre_CSRMatrixTriLowerUpperSolveDevice('L', 1, matALU_d, NULL,
+                                                 ftemp_local, utemp_local);
+
+         /* U solve - Backward solve */
+         hypre_CSRMatrixTriLowerUpperSolveDevice('U', 0, matALU_d, NULL,
+                                                 utemp_local, xtemp_local);
+
+         /* residual, we should not touch xtemp for now
+          * r = R*(f-PAQx)
+          */
+         hypre_ParCSRMatrixMatvec(mone, Aperm, xtemp, one, ftemp);
+
+         /* with R is complex */
+         /* copy partial data in */
+         hypre_TMemcpy(rhs_data, ftemp_data + nLU, HYPRE_Real, m,
+                       HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+
+         /* solve L^{-1} */
+         hypre_CSRMatrixTriLowerUpperSolveDevice('L', 1, matBLU_d, NULL,
+                                                 ftemp_local, utemp_local);
+
+         /* -U^{-1}L^{-1} */
+         hypre_CSRMatrixTriLowerUpperSolveDevice('U', 0, matBLU_d, NULL,
+                                                 utemp_local, ftemp_local);
+
+         /* -EU^{-1}L^{-1} */
+         hypre_CSRMatrixMatvec(mone, matE_d, ftemp_upper, one, rhs_local);
+
+         /* Solve S */
+         if (S)
+         {
+            /* if we have a schur complement */
+            hypre_ParVectorSetConstantValues(x, 0.0);
+            HYPRE_GMRESSolve(schur_solver,
+                             (HYPRE_Matrix) schur_precond,
+                             (HYPRE_Vector) rhs,
+                             (HYPRE_Vector) x);
+
+            /* u = xtemp + P*x */
+            /* -Fx */
+            hypre_CSRMatrixMatvec(mone, matF_d, x_local, zero, ftemp_upper);
+
+            /* -L^{-1}Fx */
+            hypre_CSRMatrixTriLowerUpperSolveDevice('L', 1, matBLU_d, NULL,
+                                                    ftemp_local, utemp_local);
+
+            /* -U{-1}L^{-1}Fx */
+            hypre_CSRMatrixTriLowerUpperSolveDevice('U', 0, matBLU_d, NULL,
+                                                    utemp_local, ftemp_local);
+
+            /* now copy data to y_lower */
+            hypre_TMemcpy(ftemp_data + nLU, x_data, HYPRE_Real, m,
+                          HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+         }
+         else
+         {
+            /* otherwise just apply triangular solves */
+            /* L solve - Forward solve */
+            hypre_CSRMatrixTriLowerUpperSolveDevice('L', 1, matSLU_d, NULL, rhs_local, x_local);
+
+            /* U solve - Backward solve */
+            hypre_CSRMatrixTriLowerUpperSolveDevice('U', 0, matSLU_d, NULL, x_local, rhs_local);
+
+            /* u = xtemp + P*x */
+            /* -Fx */
+            hypre_CSRMatrixMatvec(mone, matF_d, rhs_local, zero, ftemp_upper);
+
+            /* -L^{-1}Fx */
+            hypre_CSRMatrixTriLowerUpperSolveDevice('L', 1, matBLU_d, NULL,
+                                                    ftemp_local, utemp_local);
+
+            /* -U{-1}L^{-1}Fx */
+            hypre_CSRMatrixTriLowerUpperSolveDevice('U', 0, matBLU_d, NULL,
+                                                    utemp_local, ftemp_local);
+
+            /* now copy data to y_lower */
+            hypre_TMemcpy(ftemp_data + nLU, rhs_data, HYPRE_Real, m,
+                          HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+         }
+
+         /* correction to the residual */
+         hypre_ParVectorAxpy(one, ftemp, xtemp);
+
+         /* perm back */
+         if (perm)
+         {
+#if defined(HYPRE_USING_SYCL)
+            hypreSycl_scatter(xtemp_data, xtemp_data + n, perm, ftemp_data);
+#else
+            HYPRE_THRUST_CALL(scatter, xtemp_data, xtemp_data + n, perm, ftemp_data);
+#endif
+         }
+         else
+         {
+            hypre_TMemcpy(ftemp_data, xtemp_data, HYPRE_Complex, n,
+                          HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+         }
+      }
+      break;
+
+   case 0: case 2: default:
+      {
+         /* EU^{-1} and L^{-1}F */
+         /* compute residual */
+         hypre_ParCSRMatrixMatvecOutOfPlace(mone, A, u, one, f, ftemp);
+
+         /* apply permutation before we can start our solve
+          * Au=f -> (PAQ)Q'u=Pf
+          */
+         if (perm)
+         {
+#if defined(HYPRE_USING_SYCL)
+            hypreSycl_gather(perm, perm + n, ftemp_data, utemp_data);
+#else
+            HYPRE_THRUST_CALL(gather, perm, perm + n, ftemp_data, utemp_data);
+#endif
+         }
+         else
+         {
+            hypre_TMemcpy(utemp_data, ftemp_data, HYPRE_Complex, n,
+                          HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+         }
+
+         /* A-smoothing
+          * x = [UA\(LA\(P*f_u))] fill to xtemp
+          */
+
+         /* L solve - Forward solve */
+         hypre_CSRMatrixTriLowerUpperSolveDevice('L', 1, matALU_d, NULL,
+                                                 utemp_local, ftemp_local);
+
+         /* U solve - Backward solve */
+         hypre_CSRMatrixTriLowerUpperSolveDevice('U', 0, matALU_d, NULL,
+                                                 ftemp_local, xtemp_local);
+
+         /* residual, we should not touch xtemp for now
+          * r = R*(f-PAQx)
+          */
+         hypre_ParCSRMatrixMatvec(mone, Aperm, xtemp, one, utemp);
+
+         /* with R is complex */
+         /* copy partial data in */
+         hypre_TMemcpy(rhs_data, utemp_data + nLU, HYPRE_Real, m,
+                       HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+
+         /* solve L^{-1} */
+         hypre_CSRMatrixTriLowerUpperSolveDevice('L', 1, matBLU_d, NULL,
+                                                 utemp_local, ftemp_local);
+
+         /* -EU^{-1}L^{-1} */
+         hypre_CSRMatrixMatvec(mone, matE_d, ftemp_upper, one, rhs_local);
+
+         /* Solve S */
+         if (S)
+         {
+            /* if we have a schur complement */
+            hypre_ParVectorSetConstantValues(x, 0.0);
+            HYPRE_GMRESSolve(schur_solver,
+                             (HYPRE_Matrix) schur_precond,
+                             (HYPRE_Vector) rhs,
+                             (HYPRE_Vector) x);
+
+            /* u = xtemp + P*x */
+            /* -L^{-1}Fx */
+            hypre_CSRMatrixMatvec(mone, matF_d, x_local, zero, ftemp_upper);
+
+            /* -U{-1}L^{-1}Fx */
+            hypre_CSRMatrixTriLowerUpperSolveDevice('U', 0, matBLU_d, NULL,
+                                                    ftemp_local, utemp_local);
+
+            /* now copy data to y_lower */
+            hypre_TMemcpy(utemp_data + nLU, x_data, HYPRE_Real, m,
+                          HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+         }
+         else
+         {
+            /* otherwise just apply triangular solves */
+            hypre_CSRMatrixTriLowerUpperSolveDevice('L', 1, matSLU_d, NULL, rhs_local, x_local);
+            hypre_CSRMatrixTriLowerUpperSolveDevice('U', 0, matSLU_d, NULL, x_local, rhs_local);
+
+            /* u = xtemp + P*x */
+            /* -L^{-1}Fx */
+            hypre_CSRMatrixMatvec(mone, matF_d, rhs_local, zero, ftemp_upper);
+
+            /* -U{-1}L^{-1}Fx */
+            hypre_CSRMatrixTriLowerUpperSolveDevice('U', 0, matBLU_d, NULL,
+                                                    ftemp_local, utemp_local);
+
+            /* now copy data to y_lower */
+            hypre_TMemcpy(utemp_data + nLU, rhs_data, HYPRE_Real, m,
+                          HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+         }
+
+         /* Update xtemp */
+         hypre_ParVectorAxpy(one, utemp, xtemp);
+
+         /* perm back */
+         if (perm)
+         {
+#if defined(HYPRE_USING_SYCL)
+            hypreSycl_scatter(xtemp_data, xtemp_data + n, perm, ftemp_data);
+#else
+            HYPRE_THRUST_CALL(scatter, xtemp_data, xtemp_data + n, perm, ftemp_data);
+#endif
+         }
+         else
+         {
+            hypre_TMemcpy(ftemp_data, xtemp_data, HYPRE_Complex, n,
+                          HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+         }
+      }
+      break;
+   }
+
+   /* Done, now everything are in u_temp, update solution */
+   hypre_ParVectorAxpy(one, ftemp, u);
+
+   /* Destroy temporary vectors */
+   hypre_SeqVectorDestroy(ftemp_upper);
+   hypre_SeqVectorDestroy(utemp_lower);
+
+   return hypre_error_flag;
+}
+
+#endif /* defined(HYPRE_USING_GPU) */
diff --git a/external/hypre/src/parcsr_ls/par_indepset.c b/external/hypre/src/parcsr_ls/par_indepset.c
index ea442dc6..e595caad 100644
--- a/external/hypre/src/parcsr_ls/par_indepset.c
+++ b/external/hypre/src/parcsr_ls/par_indepset.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -41,7 +41,7 @@ hypre_BoomerAMGIndepSetInit( hypre_ParCSRMatrix *S,
    HYPRE_Int        i, my_id;
    HYPRE_Int        ierr = 0;
 
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_rank(comm, &my_id);
    i = 2747 + my_id;
    if (seq_rand)
    {
@@ -142,7 +142,7 @@ hypre_BoomerAMGIndepSet( hypre_ParCSRMatrix *S,
    for (ig = 0; ig < graph_array_offd_size; ig++)
    {
       i = graph_array_offd[ig];
-      if (measure_array[i+local_num_vars] > 1)
+      if (measure_array[i + local_num_vars] > 1)
       {
          IS_marker_offd[i] = 1;
       }
@@ -157,12 +157,12 @@ hypre_BoomerAMGIndepSet( hypre_ParCSRMatrix *S,
       i = graph_array[ig];
       if (measure_array[i] > 1)
       {
-         for (jS = S_diag_i[i]; jS < S_diag_i[i+1]; jS++)
+         for (jS = S_diag_i[i]; jS < S_diag_i[i + 1]; jS++)
          {
             j = S_diag_j[jS];
             if (j < 0)
             {
-               j = -j-1;
+               j = -j - 1;
             }
 
             /* only consider valid graph edges */
@@ -179,14 +179,14 @@ hypre_BoomerAMGIndepSet( hypre_ParCSRMatrix *S,
                }
             }
          }
-         for (jS = S_offd_i[i]; jS < S_offd_i[i+1]; jS++)
+         for (jS = S_offd_i[i]; jS < S_offd_i[i + 1]; jS++)
          {
             jj = S_offd_j[jS];
             if (jj < 0)
             {
-               jj = -jj-1;
+               jj = -jj - 1;
             }
-            j = local_num_vars+jj;
+            j = local_num_vars + jj;
 
             /* only consider valid graph edges */
             /* if ( (measure_array[j] > 1) && (S_offd_data[jS]) ) */
diff --git a/external/hypre/src/parcsr_ls/par_indepset_device.c b/external/hypre/src/parcsr_ls/par_indepset_device.c
index d031b693..f02ce157 100644
--- a/external/hypre/src/parcsr_ls/par_indepset_device.c
+++ b/external/hypre/src/parcsr_ls/par_indepset_device.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -12,31 +12,32 @@
 #include "_hypre_parcsr_ls.h"
 #include "_hypre_utilities.hpp"
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
 __global__ void
-hypreCUDAKernel_IndepSetMain(HYPRE_Int   graph_diag_size,
-                             HYPRE_Int  *graph_diag,
-                             HYPRE_Real *measure_diag,
-                             HYPRE_Real *measure_offd,
-                             HYPRE_Int  *S_diag_i,
-                             HYPRE_Int  *S_diag_j,
-                             HYPRE_Int  *S_offd_i,
-                             HYPRE_Int  *S_offd_j,
-                             HYPRE_Int  *IS_marker_diag,
-                             HYPRE_Int  *IS_marker_offd,
-                             HYPRE_Int   IS_offd_temp_mark)
+hypreGPUKernel_IndepSetMain(hypre_DeviceItem &item,
+                            HYPRE_Int   graph_diag_size,
+                            HYPRE_Int  *graph_diag,
+                            HYPRE_Real *measure_diag,
+                            HYPRE_Real *measure_offd,
+                            HYPRE_Int  *S_diag_i,
+                            HYPRE_Int  *S_diag_j,
+                            HYPRE_Int  *S_offd_i,
+                            HYPRE_Int  *S_offd_j,
+                            HYPRE_Int  *IS_marker_diag,
+                            HYPRE_Int  *IS_marker_offd,
+                            HYPRE_Int   IS_offd_temp_mark)
 {
-   HYPRE_Int warp_id = hypre_cuda_get_grid_warp_id<1,1>();
+   HYPRE_Int warp_id = hypre_gpu_get_grid_warp_id<1, 1>(item);
 
    if (warp_id >= graph_diag_size)
    {
       return;
    }
 
-   HYPRE_Int lane = hypre_cuda_get_lane_id<1>();
+   HYPRE_Int lane = hypre_gpu_get_lane_id<1>(item);
    HYPRE_Int row, row_start, row_end;
-   HYPRE_Int i, j;
-   HYPRE_Real t, measure_row;
+   HYPRE_Int i = 0, j;
+   HYPRE_Real t = 0.0, measure_row;
    HYPRE_Int marker_row = 1;
 
    if (lane < 2)
@@ -45,15 +46,15 @@ hypreCUDAKernel_IndepSetMain(HYPRE_Int   graph_diag_size,
       i   = read_only_load(S_diag_i + row + lane);
    }
 
-   row_start = __shfl_sync(HYPRE_WARP_FULL_MASK, i, 0);
-   row_end   = __shfl_sync(HYPRE_WARP_FULL_MASK, i, 1);
+   row_start = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, i, 0);
+   row_end   = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, i, 1);
 
    if (lane == 0)
    {
       t = read_only_load(measure_diag + row);
    }
 
-   measure_row = __shfl_sync(HYPRE_WARP_FULL_MASK, t, 0);
+   measure_row = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, t, 0);
 
    for (i = row_start + lane; i < row_end; i += HYPRE_WARP_SIZE)
    {
@@ -77,8 +78,8 @@ hypreCUDAKernel_IndepSetMain(HYPRE_Int   graph_diag_size,
       i = read_only_load(S_offd_i + row + lane);
    }
 
-   row_start = __shfl_sync(HYPRE_WARP_FULL_MASK, i, 0);
-   row_end   = __shfl_sync(HYPRE_WARP_FULL_MASK, i, 1);
+   row_start = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, i, 0);
+   row_end   = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, i, 1);
 
    for (i = row_start + lane; i < row_end; i += HYPRE_WARP_SIZE)
    {
@@ -97,7 +98,7 @@ hypreCUDAKernel_IndepSetMain(HYPRE_Int   graph_diag_size,
       }
    }
 
-   marker_row = warp_reduce_min(marker_row);
+   marker_row = warp_reduce_min(item, marker_row);
 
    if (lane == 0 && marker_row == 0)
    {
@@ -106,13 +107,14 @@ hypreCUDAKernel_IndepSetMain(HYPRE_Int   graph_diag_size,
 }
 
 __global__ void
-hypreCUDAKernel_IndepSetFixMarker(HYPRE_Int  *IS_marker_diag,
-                                  HYPRE_Int   num_elmts_send,
-                                  HYPRE_Int  *send_map_elmts,
-                                  HYPRE_Int  *int_send_buf,
-                                  HYPRE_Int   IS_offd_temp_mark)
+hypreGPUKernel_IndepSetFixMarker(hypre_DeviceItem &item,
+                                 HYPRE_Int  *IS_marker_diag,
+                                 HYPRE_Int   num_elmts_send,
+                                 HYPRE_Int  *send_map_elmts,
+                                 HYPRE_Int  *int_send_buf,
+                                 HYPRE_Int   IS_offd_temp_mark)
 {
-   HYPRE_Int thread_id = hypre_cuda_get_grid_thread_id<1,1>();
+   HYPRE_Int thread_id = hypre_gpu_get_grid_thread_id<1, 1>(item);
 
    if (thread_id >= num_elmts_send)
    {
@@ -156,39 +158,44 @@ hypre_BoomerAMGIndepSetDevice( hypre_ParCSRMatrix  *S,
    HYPRE_Int  num_elmts_send = hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends);
    HYPRE_Int *send_map_elmts = hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg);
 
-   dim3 bDim, gDim;
    hypre_ParCSRCommHandle *comm_handle;
 
    /*------------------------------------------------------------------
     * Initialize IS_marker by putting all nodes in the IS (marked by 1)
     *------------------------------------------------------------------*/
-   hypreDevice_ScatterConstant(IS_marker_diag, graph_diag_size, graph_diag, 1);
+   hypreDevice_ScatterConstant(IS_marker_diag, graph_diag_size, graph_diag, (HYPRE_Int) 1);
 
    /*-------------------------------------------------------
     * Remove nodes from the initial independent set
     *-------------------------------------------------------*/
-   bDim = hypre_GetDefaultCUDABlockDimension();
-   gDim = hypre_GetDefaultCUDAGridDimension(graph_diag_size, "warp", bDim);
+   dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+   dim3 gDim = hypre_GetDefaultDeviceGridDimension(graph_diag_size, "warp", bDim);
 
-   HYPRE_CUDA_LAUNCH( hypreCUDAKernel_IndepSetMain, gDim, bDim,
-                      graph_diag_size, graph_diag, measure_diag, measure_offd,
-                      S_diag_i, S_diag_j, S_offd_i, S_offd_j,
-                      IS_marker_diag, IS_marker_offd, IS_offd_temp_mark );
+   HYPRE_GPU_LAUNCH( hypreGPUKernel_IndepSetMain, gDim, bDim,
+                     graph_diag_size, graph_diag, measure_diag, measure_offd,
+                     S_diag_i, S_diag_j, S_offd_i, S_offd_j,
+                     IS_marker_diag, IS_marker_offd, IS_offd_temp_mark );
 
    /*--------------------------------------------------------------------
     * Exchange boundary data for IS_marker: send external IS to internal
     *-------------------------------------------------------------------*/
+   /* RL: make sure IS_marker_offd is ready before issuing GPU-GPU MPI */
+   if (hypre_GetGpuAwareMPI())
+   {
+      hypre_ForceSyncComputeStream();
+   }
+
    comm_handle = hypre_ParCSRCommHandleCreate_v2(12, comm_pkg,
                                                  HYPRE_MEMORY_DEVICE, IS_marker_offd,
                                                  HYPRE_MEMORY_DEVICE, int_send_buf);
    hypre_ParCSRCommHandleDestroy(comm_handle);
 
    /* adjust IS_marker_diag from the received */
-   gDim = hypre_GetDefaultCUDAGridDimension(num_elmts_send, "thread", bDim);
+   gDim = hypre_GetDefaultDeviceGridDimension(num_elmts_send, "thread", bDim);
 
-   HYPRE_CUDA_LAUNCH( hypreCUDAKernel_IndepSetFixMarker, gDim, bDim,
-                      IS_marker_diag, num_elmts_send, send_map_elmts,
-                      int_send_buf, IS_offd_temp_mark );
+   HYPRE_GPU_LAUNCH( hypreGPUKernel_IndepSetFixMarker, gDim, bDim,
+                     IS_marker_diag, num_elmts_send, send_map_elmts,
+                     int_send_buf, IS_offd_temp_mark );
 
    /* Note that IS_marker_offd is not sync'ed (communicated) here */
 
@@ -196,8 +203,8 @@ hypre_BoomerAMGIndepSetDevice( hypre_ParCSRMatrix  *S,
 }
 
 /* Augments measures by some random value between 0 and 1
- * aug_rand: 1: GPU CURAND/ROCRAND; 11: GPU SEQ CURAND/ROCRAND
- *           2: CPU RAND;           12: CPU SEQ RAND
+ * aug_rand: 1: GPU RAND; 11: GPU SEQ RAND
+ *           2: CPU RAND; 12: CPU SEQ RAND
  */
 HYPRE_Int
 hypre_BoomerAMGIndepSetInitDevice( hypre_ParCSRMatrix *S,
@@ -229,7 +236,8 @@ hypre_BoomerAMGIndepSetInitDevice( hypre_ParCSRMatrix *S,
       HYPRE_Real  *urand_global = hypre_TAlloc(HYPRE_Real, n_global, HYPRE_MEMORY_DEVICE);
       // To make sure all rank generate the same sequence
       hypre_CurandUniform(n_global, urand_global, 0, 0, 1, 0);
-      hypre_TMemcpy(urand, urand_global + n_first, HYPRE_Real, num_rows_diag, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+      hypre_TMemcpy(urand, urand_global + n_first, HYPRE_Real, num_rows_diag, HYPRE_MEMORY_DEVICE,
+                    HYPRE_MEMORY_DEVICE);
       hypre_TFree(urand_global, HYPRE_MEMORY_DEVICE);
    }
    else
@@ -238,13 +246,11 @@ hypre_BoomerAMGIndepSetInitDevice( hypre_ParCSRMatrix *S,
       hypre_CurandUniform(num_rows_diag, urand, 0, 0, 0, 0);
    }
 
-   thrust::plus<HYPRE_Real> op;
-   HYPRE_THRUST_CALL(transform, measure_array, measure_array + num_rows_diag,
-                     urand, measure_array, op);
+   hypreDevice_ComplexAxpyn(measure_array, num_rows_diag, urand, measure_array, 1.0);
 
    hypre_TFree(urand, HYPRE_MEMORY_DEVICE);
 
    return hypre_error_flag;
 }
 
-#endif // #if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#endif // #if defined(HYPRE_USING_GPU)
diff --git a/external/hypre/src/parcsr_ls/par_interp.c b/external/hypre/src/parcsr_ls/par_interp.c
index 5dc827ac..09e2fc59 100644
--- a/external/hypre/src/parcsr_ls/par_interp.c
+++ b/external/hypre/src/parcsr_ls/par_interp.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -12,21 +12,23 @@
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_BoomerAMGBuildInterp( hypre_ParCSRMatrix   *A,
-                         HYPRE_Int               *CF_marker,
-                         hypre_ParCSRMatrix      *S,
-                         HYPRE_BigInt            *num_cpts_global,
-                         HYPRE_Int                num_functions,
-                         HYPRE_Int               *dof_func,
-                         HYPRE_Int                debug_flag,
-                         HYPRE_Real               trunc_factor,
-                         HYPRE_Int                max_elmts,
-                         hypre_ParCSRMatrix     **P_ptr)
+hypre_BoomerAMGBuildInterp( hypre_ParCSRMatrix      *A,
+                            HYPRE_Int               *CF_marker,
+                            hypre_ParCSRMatrix      *S,
+                            HYPRE_BigInt            *num_cpts_global,
+                            HYPRE_Int                num_functions,
+                            HYPRE_Int               *dof_func,
+                            HYPRE_Int                debug_flag,
+                            HYPRE_Real               trunc_factor,
+                            HYPRE_Int                max_elmts,
+                            hypre_ParCSRMatrix     **P_ptr)
 {
-   MPI_Comm           comm = hypre_ParCSRMatrixComm(A);
+   MPI_Comm                 comm = hypre_ParCSRMatrixComm(A);
    hypre_ParCSRCommPkg     *comm_pkg = hypre_ParCSRMatrixCommPkg(A);
    hypre_ParCSRCommHandle  *comm_handle;
 
+   HYPRE_MemoryLocation memory_location_P = hypre_ParCSRMatrixMemoryLocation(A);
+
    hypre_CSRMatrix   *A_diag = hypre_ParCSRMatrixDiag(A);
    HYPRE_Real        *A_diag_data = hypre_CSRMatrixData(A_diag);
    HYPRE_Int         *A_diag_i = hypre_CSRMatrixI(A_diag);
@@ -54,7 +56,7 @@ hypre_BoomerAMGBuildInterp( hypre_ParCSRMatrix   *A,
    HYPRE_Int         *CF_marker_offd = NULL;
    HYPRE_Int         *dof_func_offd = NULL;
 
-   hypre_CSRMatrix   *A_ext;
+   hypre_CSRMatrix   *A_ext = NULL;
 
    HYPRE_Real        *A_ext_data = NULL;
    HYPRE_Int         *A_ext_i = NULL;
@@ -74,10 +76,10 @@ hypre_BoomerAMGBuildInterp( hypre_ParCSRMatrix   *A,
 
    HYPRE_Int         *P_marker, *P_marker_offd;
 
-   HYPRE_Int          jj_counter,jj_counter_offd;
+   HYPRE_Int          jj_counter, jj_counter_offd;
    HYPRE_Int         *jj_count, *jj_count_offd;
-   HYPRE_Int          jj_begin_row,jj_begin_row_offd;
-   HYPRE_Int          jj_end_row,jj_end_row_offd;
+   HYPRE_Int          jj_begin_row, jj_begin_row_offd;
+   HYPRE_Int          jj_end_row, jj_end_row_offd;
 
    HYPRE_Int          start_indexing = 0; /* start indexing for P_data at 0 */
 
@@ -93,8 +95,8 @@ hypre_BoomerAMGBuildInterp( hypre_ParCSRMatrix   *A,
    //HYPRE_BigInt       my_first_cpt;
    HYPRE_Int          num_cols_P_offd;
 
-   HYPRE_Int          i,i1,i2;
-   HYPRE_Int          j,jl,jj,jj1;
+   HYPRE_Int          i, i1, i2;
+   HYPRE_Int          j, jl, jj, jj1;
    HYPRE_Int          kc;
    HYPRE_BigInt       big_k;
    HYPRE_Int          start;
@@ -121,15 +123,15 @@ hypre_BoomerAMGBuildInterp( hypre_ParCSRMatrix   *A,
    HYPRE_Int local_numrows = hypre_CSRMatrixNumRows(A_diag);
    HYPRE_BigInt col_n = col_1 + (HYPRE_BigInt)local_numrows;
 
-   HYPRE_Real       wall_time;  /* for debugging instrumentation  */
+   HYPRE_Real       wall_time = 0.0;  /* for debugging instrumentation  */
 
    hypre_MPI_Comm_size(comm, &num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_rank(comm, &my_id);
    num_threads = hypre_NumThreads();
 
    //my_first_cpt = num_cpts_global[0];
-   if (my_id == (num_procs -1)) total_global_cpts = num_cpts_global[1];
-   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
+   if (my_id == (num_procs - 1)) { total_global_cpts = num_cpts_global[1]; }
+   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
 
    /*-------------------------------------------------------------------
     * Get the CF_marker data for the off-processor columns
@@ -141,9 +143,9 @@ hypre_BoomerAMGBuildInterp( hypre_ParCSRMatrix   *A,
       print_level = 1;
    }
 
-   if (debug_flag==4) wall_time = time_getWallclockSeconds();
+   if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
 
-   if (num_cols_A_offd) CF_marker_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_A_offd, HYPRE_MEMORY_HOST);
+   if (num_cols_A_offd) { CF_marker_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_A_offd, HYPRE_MEMORY_HOST); }
    if (num_functions > 1 && num_cols_A_offd)
    {
       dof_func_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_A_offd, HYPRE_MEMORY_HOST);
@@ -163,9 +165,9 @@ hypre_BoomerAMGBuildInterp( hypre_ParCSRMatrix   *A,
    for (i = 0; i < num_sends; i++)
    {
       start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
       {
-         int_buf_data[index++] = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+         int_buf_data[index++] = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
       }
    }
 
@@ -178,8 +180,10 @@ hypre_BoomerAMGBuildInterp( hypre_ParCSRMatrix   *A,
       for (i = 0; i < num_sends; i++)
       {
          start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-         for (j=start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
-            int_buf_data[index++] = dof_func[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
+         {
+            int_buf_data[index++] = dof_func[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
+         }
       }
 
       comm_handle = hypre_ParCSRCommHandleCreate( 11, comm_pkg, int_buf_data, dof_func_offd);
@@ -187,11 +191,11 @@ hypre_BoomerAMGBuildInterp( hypre_ParCSRMatrix   *A,
       hypre_ParCSRCommHandleDestroy(comm_handle);
    }
 
-   if (debug_flag==4)
+   if (debug_flag == 4)
    {
       wall_time = time_getWallclockSeconds() - wall_time;
       hypre_printf("Proc = %d     Interp: Comm 1 CF_marker =    %f\n",
-            my_id, wall_time);
+                   my_id, wall_time);
       fflush(NULL);
    }
 
@@ -199,20 +203,20 @@ hypre_BoomerAMGBuildInterp( hypre_ParCSRMatrix   *A,
     * Get the ghost rows of A
     *---------------------------------------------------------------------*/
 
-   if (debug_flag==4) wall_time = time_getWallclockSeconds();
+   if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
 
    if (num_procs > 1)
    {
-      A_ext      = hypre_ParCSRMatrixExtractBExt(A,A,1);
+      A_ext      = hypre_ParCSRMatrixExtractBExt(A, A, 1);
       A_ext_i    = hypre_CSRMatrixI(A_ext);
       A_ext_j    = hypre_CSRMatrixBigJ(A_ext);
       A_ext_data = hypre_CSRMatrixData(A_ext);
    }
 
    index = 0;
-   for (i=0; i < num_cols_A_offd; i++)
+   for (i = 0; i < num_cols_A_offd; i++)
    {
-      for (j=A_ext_i[i]; j < A_ext_i[i+1]; j++)
+      for (j = A_ext_i[i]; j < A_ext_i[i + 1]; j++)
       {
          big_k = A_ext_j[j];
          if (big_k >= col_1 && big_k < col_n)
@@ -222,10 +226,10 @@ hypre_BoomerAMGBuildInterp( hypre_ParCSRMatrix   *A,
          }
          else
          {
-            kc = hypre_BigBinarySearch(col_map_offd,big_k,num_cols_A_offd);
+            kc = hypre_BigBinarySearch(col_map_offd, big_k, num_cols_A_offd);
             if (kc > -1)
             {
-               A_ext_j[index] = (HYPRE_BigInt)(-kc-1);
+               A_ext_j[index] = (HYPRE_BigInt)(-kc - 1);
                A_ext_data[index++] = A_ext_data[j];
             }
          }
@@ -233,14 +237,16 @@ hypre_BoomerAMGBuildInterp( hypre_ParCSRMatrix   *A,
       A_ext_i[i] = index;
    }
    for (i = num_cols_A_offd; i > 0; i--)
-      A_ext_i[i] = A_ext_i[i-1];
-   if (num_procs > 1) A_ext_i[0] = 0;
+   {
+      A_ext_i[i] = A_ext_i[i - 1];
+   }
+   if (num_procs > 1) { A_ext_i[0] = 0; }
 
-   if (debug_flag==4)
+   if (debug_flag == 4)
    {
       wall_time = time_getWallclockSeconds() - wall_time;
       hypre_printf("Proc = %d  Interp: Comm 2   Get A_ext =  %f\n",
-            my_id, wall_time);
+                   my_id, wall_time);
       fflush(NULL);
    }
 
@@ -259,9 +265,9 @@ hypre_BoomerAMGBuildInterp( hypre_ParCSRMatrix   *A,
 
    fine_to_coarse = hypre_CTAlloc(HYPRE_Int,  n_fine, HYPRE_MEMORY_HOST);
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-   for (i = 0; i < n_fine; i++) fine_to_coarse[i] = -1;
+   for (i = 0; i < n_fine; i++) { fine_to_coarse[i] = -1; }
 
    jj_counter = start_indexing;
    jj_counter_offd = start_indexing;
@@ -272,21 +278,21 @@ hypre_BoomerAMGBuildInterp( hypre_ParCSRMatrix   *A,
 
    /* RDF: this looks a little tricky, but doable */
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i,j,i1,jj,ns,ne,size,rest) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i,j,i1,jj,ns,ne,size,rest) HYPRE_SMP_SCHEDULE
 #endif
    for (j = 0; j < num_threads; j++)
    {
-      size = n_fine/num_threads;
-      rest = n_fine - size*num_threads;
+      size = n_fine / num_threads;
+      rest = n_fine - size * num_threads;
       if (j < rest)
       {
-         ns = j*size+j;
-         ne = (j+1)*size+j+1;
+         ns = j * size + j;
+         ne = (j + 1) * size + j + 1;
       }
       else
       {
-         ns = j*size+rest;
-         ne = (j+1)*size+rest;
+         ns = j * size + rest;
+         ne = (j + 1) * size + rest;
       }
       for (i = ns; i < ne; i++)
       {
@@ -310,7 +316,7 @@ hypre_BoomerAMGBuildInterp( hypre_ParCSRMatrix   *A,
 
          else
          {
-            for (jj = S_diag_i[i]; jj < S_diag_i[i+1]; jj++)
+            for (jj = S_diag_i[i]; jj < S_diag_i[i + 1]; jj++)
             {
                i1 = S_diag_j[jj];
                if (CF_marker[i1] >= 0)
@@ -321,7 +327,7 @@ hypre_BoomerAMGBuildInterp( hypre_ParCSRMatrix   *A,
 
             if (num_procs > 1)
             {
-               for (jj = S_offd_i[i]; jj < S_offd_i[i+1]; jj++)
+               for (jj = S_offd_i[i]; jj < S_offd_i[i + 1]; jj++)
                {
                   i1 = S_offd_j[jj];
                   if (CF_marker_offd[i1] >= 0)
@@ -338,30 +344,30 @@ hypre_BoomerAMGBuildInterp( hypre_ParCSRMatrix   *A,
     *  Allocate  arrays.
     *-----------------------------------------------------------------------*/
 
-   for (i=0; i < num_threads-1; i++)
+   for (i = 0; i < num_threads - 1; i++)
    {
-      coarse_counter[i+1] += coarse_counter[i];
-      jj_count[i+1] += jj_count[i];
-      jj_count_offd[i+1] += jj_count_offd[i];
+      coarse_counter[i + 1] += coarse_counter[i];
+      jj_count[i + 1] += jj_count[i];
+      jj_count_offd[i + 1] += jj_count_offd[i];
    }
-   i = num_threads-1;
+   i = num_threads - 1;
    jj_counter = jj_count[i];
    jj_counter_offd = jj_count_offd[i];
 
    P_diag_size = jj_counter;
 
-   P_diag_i    = hypre_CTAlloc(HYPRE_Int,  n_fine+1,    HYPRE_MEMORY_DEVICE);
-   P_diag_j    = hypre_CTAlloc(HYPRE_Int,  P_diag_size, HYPRE_MEMORY_DEVICE);
-   P_diag_data = hypre_CTAlloc(HYPRE_Real, P_diag_size, HYPRE_MEMORY_DEVICE);
+   P_diag_i    = hypre_CTAlloc(HYPRE_Int,  n_fine + 1,  memory_location_P);
+   P_diag_j    = hypre_CTAlloc(HYPRE_Int,  P_diag_size, memory_location_P);
+   P_diag_data = hypre_CTAlloc(HYPRE_Real, P_diag_size, memory_location_P);
 
    P_diag_i[n_fine] = jj_counter;
 
 
    P_offd_size = jj_counter_offd;
 
-   P_offd_i    = hypre_CTAlloc(HYPRE_Int,  n_fine+1,    HYPRE_MEMORY_DEVICE);
-   P_offd_j    = hypre_CTAlloc(HYPRE_Int,  P_offd_size, HYPRE_MEMORY_DEVICE);
-   P_offd_data = hypre_CTAlloc(HYPRE_Real, P_offd_size, HYPRE_MEMORY_DEVICE);
+   P_offd_i    = hypre_CTAlloc(HYPRE_Int,  n_fine + 1,  memory_location_P);
+   P_offd_j    = hypre_CTAlloc(HYPRE_Int,  P_offd_size, memory_location_P);
+   P_offd_data = hypre_CTAlloc(HYPRE_Real, P_offd_size, memory_location_P);
 
    /*-----------------------------------------------------------------------
     *  Intialize some stuff.
@@ -370,11 +376,11 @@ hypre_BoomerAMGBuildInterp( hypre_ParCSRMatrix   *A,
    jj_counter = start_indexing;
    jj_counter_offd = start_indexing;
 
-   if (debug_flag==4)
+   if (debug_flag == 4)
    {
       wall_time = time_getWallclockSeconds() - wall_time;
       hypre_printf("Proc = %d     Interp: Internal work 1 =     %f\n",
-            my_id, wall_time);
+                   my_id, wall_time);
       fflush(NULL);
    }
 
@@ -382,28 +388,28 @@ hypre_BoomerAMGBuildInterp( hypre_ParCSRMatrix   *A,
     *  Send and receive fine_to_coarse info.
     *-----------------------------------------------------------------------*/
 
-   if (debug_flag==4) wall_time = time_getWallclockSeconds();
+   if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
 
    //fine_to_coarse_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_A_offd, HYPRE_MEMORY_HOST);
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i,j,ns,ne,size,rest,coarse_shift) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i,j,ns,ne,size,rest,coarse_shift) HYPRE_SMP_SCHEDULE
 #endif
    for (j = 0; j < num_threads; j++)
    {
       coarse_shift = 0;
-      if (j > 0) coarse_shift = coarse_counter[j-1];
-      size = n_fine/num_threads;
-      rest = n_fine - size*num_threads;
+      if (j > 0) { coarse_shift = coarse_counter[j - 1]; }
+      size = n_fine / num_threads;
+      rest = n_fine - size * num_threads;
       if (j < rest)
       {
-         ns = j*size+j;
-         ne = (j+1)*size+j+1;
+         ns = j * size + j;
+         ne = (j + 1) * size + j + 1;
       }
       else
       {
-         ns = j*size+rest;
-         ne = (j+1)*size+rest;
+         ns = j * size + rest;
+         ne = (j + 1) * size + rest;
       }
       for (i = ns; i < ne; i++)
       {
@@ -432,44 +438,48 @@ hypre_BoomerAMGBuildInterp( hypre_ParCSRMatrix   *A,
      fflush(NULL);
      }*/
 
-   if (debug_flag==4) wall_time = time_getWallclockSeconds();
+   if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
 
    /*#ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
-#endif
-for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt; */
+   #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+   #endif
+   for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt; */
 
    /*-----------------------------------------------------------------------
     *  Loop over fine grid points.
     *-----------------------------------------------------------------------*/
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i,j,jl,i1,i2,jj,jj1,ns,ne,size,rest,sum,diagonal,distribute,P_marker,P_marker_offd,strong_f_marker,jj_counter,jj_counter_offd,sgn,c_num,jj_begin_row,jj_end_row,jj_begin_row_offd,jj_end_row_offd) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i,j,jl,i1,i2,jj,jj1,ns,ne,size,rest,sum,diagonal,distribute,P_marker,P_marker_offd,strong_f_marker,jj_counter,jj_counter_offd,sgn,c_num,jj_begin_row,jj_end_row,jj_begin_row_offd,jj_end_row_offd) HYPRE_SMP_SCHEDULE
 #endif
    for (jl = 0; jl < num_threads; jl++)
    {
-      size = n_fine/num_threads;
-      rest = n_fine - size*num_threads;
+      size = n_fine / num_threads;
+      rest = n_fine - size * num_threads;
       if (jl < rest)
       {
-         ns = jl*size+jl;
-         ne = (jl+1)*size+jl+1;
+         ns = jl * size + jl;
+         ne = (jl + 1) * size + jl + 1;
       }
       else
       {
-         ns = jl*size+rest;
-         ne = (jl+1)*size+rest;
+         ns = jl * size + rest;
+         ne = (jl + 1) * size + rest;
       }
       jj_counter = 0;
-      if (jl > 0) jj_counter = jj_count[jl-1];
+      if (jl > 0) { jj_counter = jj_count[jl - 1]; }
       jj_counter_offd = 0;
-      if (jl > 0) jj_counter_offd = jj_count_offd[jl-1];
+      if (jl > 0) { jj_counter_offd = jj_count_offd[jl - 1]; }
 
       P_marker = hypre_CTAlloc(HYPRE_Int,  n_fine, HYPRE_MEMORY_HOST);
       if (num_cols_A_offd)
+      {
          P_marker_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_A_offd, HYPRE_MEMORY_HOST);
+      }
       else
+      {
          P_marker_offd = NULL;
+      }
 
       for (i = 0; i < n_fine; i++)
       {
@@ -506,7 +516,7 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt; */
             P_diag_i[i] = jj_counter;
             jj_begin_row = jj_counter;
 
-            for (jj = S_diag_i[i]; jj < S_diag_i[i+1]; jj++)
+            for (jj = S_diag_i[i]; jj < S_diag_i[i + 1]; jj++)
             {
                i1 = S_diag_j[jj];
 
@@ -542,7 +552,7 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt; */
 
             if (num_procs > 1)
             {
-               for (jj = S_offd_i[i]; jj < S_offd_i[i+1]; jj++)
+               for (jj = S_offd_i[i]; jj < S_offd_i[i + 1]; jj++)
                {
                   i1 = S_offd_j[jj];
 
@@ -579,7 +589,7 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt; */
 
             /* Loop over ith row of A.  First, the diagonal part of A */
 
-            for (jj = A_diag_i[i]+1; jj < A_diag_i[i+1]; jj++)
+            for (jj = A_diag_i[i] + 1; jj < A_diag_i[i + 1]; jj++)
             {
                i1 = A_diag_j[jj];
 
@@ -608,13 +618,13 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt; */
                    * of the connections to c-points that strongly influence i.
                    *-----------------------------------------------------------*/
                   sgn = 1;
-                  if (A_diag_data[A_diag_i[i1]] < 0) sgn = -1;
+                  if (A_diag_data[A_diag_i[i1]] < 0) { sgn = -1; }
                   /* Diagonal block part of row i1 */
-                  for (jj1 = A_diag_i[i1]; jj1 < A_diag_i[i1+1]; jj1++)
+                  for (jj1 = A_diag_i[i1]; jj1 < A_diag_i[i1 + 1]; jj1++)
                   {
                      i2 = A_diag_j[jj1];
                      if (P_marker[i2] >= jj_begin_row &&
-                           (sgn*A_diag_data[jj1]) < 0)
+                         (sgn * A_diag_data[jj1]) < 0)
                      {
                         sum += A_diag_data[jj1];
                      }
@@ -623,11 +633,11 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt; */
                   /* Off-Diagonal block part of row i1 */
                   if (num_procs > 1)
                   {
-                     for (jj1 = A_offd_i[i1]; jj1 < A_offd_i[i1+1]; jj1++)
+                     for (jj1 = A_offd_i[i1]; jj1 < A_offd_i[i1 + 1]; jj1++)
                      {
                         i2 = A_offd_j[jj1];
                         if (P_marker_offd[i2] >= jj_begin_row_offd
-                              && (sgn*A_offd_data[jj1]) < 0)
+                            && (sgn * A_offd_data[jj1]) < 0)
                         {
                            sum += A_offd_data[jj1];
                         }
@@ -643,28 +653,28 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt; */
                       *-----------------------------------------------------------*/
 
                      /* Diagonal block part of row i1 */
-                     for (jj1 = A_diag_i[i1]; jj1 < A_diag_i[i1+1]; jj1++)
+                     for (jj1 = A_diag_i[i1]; jj1 < A_diag_i[i1 + 1]; jj1++)
                      {
                         i2 = A_diag_j[jj1];
                         if (P_marker[i2] >= jj_begin_row
-                              && (sgn*A_diag_data[jj1]) < 0)
+                            && (sgn * A_diag_data[jj1]) < 0)
                         {
                            P_diag_data[P_marker[i2]]
-                              += distribute * A_diag_data[jj1];
+                           += distribute * A_diag_data[jj1];
                         }
                      }
 
                      /* Off-Diagonal block part of row i1 */
                      if (num_procs > 1)
                      {
-                        for (jj1 = A_offd_i[i1]; jj1 < A_offd_i[i1+1]; jj1++)
+                        for (jj1 = A_offd_i[i1]; jj1 < A_offd_i[i1 + 1]; jj1++)
                         {
                            i2 = A_offd_j[jj1];
                            if (P_marker_offd[i2] >= jj_begin_row_offd
-                                 && (sgn*A_offd_data[jj1]) < 0)
+                               && (sgn * A_offd_data[jj1]) < 0)
                            {
                               P_offd_data[P_marker_offd[i2]]
-                                 += distribute * A_offd_data[jj1];
+                              += distribute * A_offd_data[jj1];
                            }
                         }
                      }
@@ -701,7 +711,7 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt; */
 
             if (num_procs > 1)
             {
-               for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+               for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
                {
                   i1 = A_offd_j[jj];
 
@@ -734,8 +744,8 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt; */
                      c_num = A_offd_j[jj];
 
                      sgn = 1;
-                     if (A_ext_data[A_ext_i[c_num]] < 0) sgn = -1;
-                     for (jj1 = A_ext_i[c_num]; jj1 < A_ext_i[c_num+1]; jj1++)
+                     if (A_ext_data[A_ext_i[c_num]] < 0) { sgn = -1; }
+                     for (jj1 = A_ext_i[c_num]; jj1 < A_ext_i[c_num + 1]; jj1++)
                      {
                         i2 = (HYPRE_Int)A_ext_j[jj1];
 
@@ -743,7 +753,7 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt; */
                         {
                            /* in the diagonal block */
                            if (P_marker[i2] >= jj_begin_row
-                                 && (sgn*A_ext_data[jj1]) < 0)
+                               && (sgn * A_ext_data[jj1]) < 0)
                            {
                               sum += A_ext_data[jj1];
                            }
@@ -751,8 +761,8 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt; */
                         else
                         {
                            /* in the off_diagonal block  */
-                           if (P_marker_offd[-i2-1] >= jj_begin_row_offd
-                                 && (sgn*A_ext_data[jj1]) < 0)
+                           if (P_marker_offd[-i2 - 1] >= jj_begin_row_offd
+                               && (sgn * A_ext_data[jj1]) < 0)
                            {
                               sum += A_ext_data[jj1];
                            }
@@ -771,26 +781,26 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt; */
 
                         /* Diagonal block part of row i1 */
 
-                        for (jj1 = A_ext_i[c_num]; jj1 < A_ext_i[c_num+1]; jj1++)
+                        for (jj1 = A_ext_i[c_num]; jj1 < A_ext_i[c_num + 1]; jj1++)
                         {
                            i2 = (HYPRE_Int)A_ext_j[jj1];
 
                            if (i2 > -1) /* in the diagonal block */
                            {
                               if (P_marker[i2] >= jj_begin_row
-                                    && (sgn*A_ext_data[jj1]) < 0)
+                                  && (sgn * A_ext_data[jj1]) < 0)
                               {
                                  P_diag_data[P_marker[i2]]
-                                    += distribute * A_ext_data[jj1];
+                                 += distribute * A_ext_data[jj1];
                               }
                            }
                            else
                            {
                               /* in the off_diagonal block  */
-                              if (P_marker_offd[-i2-1] >= jj_begin_row_offd
-                                    && (sgn*A_ext_data[jj1]) < 0)
-                                 P_offd_data[P_marker_offd[-i2-1]]
-                                    += distribute * A_ext_data[jj1];
+                              if (P_marker_offd[-i2 - 1] >= jj_begin_row_offd
+                                  && (sgn * A_ext_data[jj1]) < 0)
+                                 P_offd_data[P_marker_offd[-i2 - 1]]
+                                 += distribute * A_ext_data[jj1];
                            }
                         }
                      }
@@ -827,7 +837,7 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt; */
             {
                if (print_level)
                {
-                  hypre_printf(" Warning! zero diagonal! Proc id %d row %d\n", my_id,i);
+                  hypre_printf(" Warning! zero diagonal! Proc id %d row %d\n", my_id, i);
                }
                for (jj = jj_begin_row; jj < jj_end_row; jj++)
                {
@@ -854,20 +864,20 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt; */
 
          strong_f_marker--;
 
-         P_offd_i[i+1] = jj_counter_offd;
+         P_offd_i[i + 1] = jj_counter_offd;
       }
       hypre_TFree(P_marker, HYPRE_MEMORY_HOST);
       hypre_TFree(P_marker_offd, HYPRE_MEMORY_HOST);
    }
 
    P = hypre_ParCSRMatrixCreate(comm,
-         hypre_ParCSRMatrixGlobalNumRows(A),
-         total_global_cpts,
-         hypre_ParCSRMatrixColStarts(A),
-         num_cpts_global,
-         0,
-         P_diag_i[n_fine],
-         P_offd_i[n_fine]);
+                                hypre_ParCSRMatrixGlobalNumRows(A),
+                                total_global_cpts,
+                                hypre_ParCSRMatrixColStarts(A),
+                                num_cpts_global,
+                                0,
+                                P_diag_i[n_fine],
+                                P_offd_i[n_fine]);
 
    P_diag = hypre_ParCSRMatrixDiag(P);
    hypre_CSRMatrixData(P_diag) = P_diag_data;
@@ -899,15 +909,15 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt; */
       P_marker = hypre_CTAlloc(HYPRE_Int,  num_cols_A_offd, HYPRE_MEMORY_HOST);
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-      for (i=0; i < num_cols_A_offd; i++)
+      for (i = 0; i < num_cols_A_offd; i++)
       {
          P_marker[i] = 0;
       }
 
       num_cols_P_offd = 0;
-      for (i=0; i < P_offd_size; i++)
+      for (i = 0; i < P_offd_size; i++)
       {
          index = P_offd_j[i];
          if (!P_marker[index])
@@ -921,25 +931,25 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt; */
       tmp_map_offd = hypre_CTAlloc(HYPRE_Int, num_cols_P_offd, HYPRE_MEMORY_HOST);
 
       index = 0;
-      for (i=0; i < num_cols_P_offd; i++)
+      for (i = 0; i < num_cols_P_offd; i++)
       {
-         while (P_marker[index]==0) index++;
+         while (P_marker[index] == 0) { index++; }
          tmp_map_offd[i] = index++;
       }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-      for (i=0; i < P_offd_size; i++)
+      for (i = 0; i < P_offd_size; i++)
          P_offd_j[i] = hypre_BinarySearch(tmp_map_offd,
-               P_offd_j[i],
-               num_cols_P_offd);
+                                          P_offd_j[i],
+                                          num_cols_P_offd);
       hypre_TFree(P_marker, HYPRE_MEMORY_HOST);
    }
 
-   for (i=0; i < n_fine; i++)
+   for (i = 0; i < n_fine; i++)
    {
-      if (CF_marker[i] == -3) CF_marker[i] = -1;
+      if (CF_marker[i] == -3) { CF_marker[i] = -1; }
    }
 
    if (num_cols_P_offd)
@@ -948,8 +958,7 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt; */
       hypre_CSRMatrixNumCols(P_offd) = num_cols_P_offd;
    }
 
-   hypre_GetCommPkgRTFromCommPkgA(P,A, fine_to_coarse, tmp_map_offd);
-
+   hypre_GetCommPkgRTFromCommPkgA(P, A, fine_to_coarse, tmp_map_offd);
 
    *P_ptr = P;
 
@@ -962,13 +971,11 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt; */
    hypre_TFree(coarse_counter, HYPRE_MEMORY_HOST);
    hypre_TFree(jj_count, HYPRE_MEMORY_HOST);
    hypre_TFree(jj_count_offd, HYPRE_MEMORY_HOST);
-
-   if (num_procs > 1) hypre_CSRMatrixDestroy(A_ext);
+   hypre_CSRMatrixDestroy(A_ext);
 
    return hypre_error_flag;
 }
 
-
 /*---------------------------------------------------------------------------
  * hypre_BoomerAMGBuildInterpHE
  * interpolation routine for hyperbolic PDEs
@@ -1019,7 +1026,7 @@ hypre_BoomerAMGBuildInterpHE( hypre_ParCSRMatrix   *A,
    HYPRE_Int          *CF_marker_offd = NULL;
    HYPRE_Int          *dof_func_offd = NULL;
 
-   hypre_CSRMatrix *A_ext;
+   hypre_CSRMatrix *A_ext = NULL;
 
    HYPRE_Real      *A_ext_data = NULL;
    HYPRE_Int       *A_ext_i = NULL;
@@ -1039,10 +1046,10 @@ hypre_BoomerAMGBuildInterpHE( hypre_ParCSRMatrix   *A,
 
    HYPRE_Int       *P_marker, *P_marker_offd;
 
-   HYPRE_Int        jj_counter,jj_counter_offd;
+   HYPRE_Int        jj_counter, jj_counter_offd;
    HYPRE_Int       *jj_count, *jj_count_offd;
-   HYPRE_Int        jj_begin_row,jj_begin_row_offd;
-   HYPRE_Int        jj_end_row,jj_end_row_offd;
+   HYPRE_Int        jj_begin_row, jj_begin_row_offd;
+   HYPRE_Int        jj_end_row, jj_end_row_offd;
 
    HYPRE_Int        start_indexing = 0; /* start indexing for P_data at 0 */
 
@@ -1056,8 +1063,8 @@ hypre_BoomerAMGBuildInterpHE( hypre_ParCSRMatrix   *A,
    //HYPRE_BigInt     my_first_cpt;
    HYPRE_Int        num_cols_P_offd;
 
-   HYPRE_Int        i,i1,i2;
-   HYPRE_Int        j,jl,jj,jj1;
+   HYPRE_Int        i, i1, i2;
+   HYPRE_Int        j, jl, jj, jj1;
    HYPRE_Int        kc;
    HYPRE_BigInt     big_k;
    HYPRE_Int        start;
@@ -1083,26 +1090,28 @@ hypre_BoomerAMGBuildInterpHE( hypre_ParCSRMatrix   *A,
    HYPRE_Int local_numrows = hypre_CSRMatrixNumRows(A_diag);
    HYPRE_BigInt col_n = col_1 + local_numrows;
 
-   HYPRE_Real       wall_time;  /* for debugging instrumentation  */
+   HYPRE_Real       wall_time = 0.0;  /* for debugging instrumentation  */
 
    hypre_MPI_Comm_size(comm, &num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_rank(comm, &my_id);
    num_threads = hypre_NumThreads();
 
 
    //my_first_cpt = num_cpts_global[0];
-   if (my_id == (num_procs -1)) total_global_cpts = num_cpts_global[1];
-   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
+   if (my_id == (num_procs - 1)) { total_global_cpts = num_cpts_global[1]; }
+   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
 
    /*-------------------------------------------------------------------
     * Get the CF_marker data for the off-processor columns
     *-------------------------------------------------------------------*/
 
-   if (debug_flag==4) wall_time = time_getWallclockSeconds();
+   if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
 
-   if (num_cols_A_offd) CF_marker_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_A_offd, HYPRE_MEMORY_HOST);
+   if (num_cols_A_offd) { CF_marker_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_A_offd, HYPRE_MEMORY_HOST); }
    if (num_functions > 1 && num_cols_A_offd)
+   {
       dof_func_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_A_offd, HYPRE_MEMORY_HOST);
+   }
 
    if (!comm_pkg)
    {
@@ -1118,9 +1127,9 @@ hypre_BoomerAMGBuildInterpHE( hypre_ParCSRMatrix   *A,
    for (i = 0; i < num_sends; i++)
    {
       start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
          int_buf_data[index++]
-            = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+            = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
    }
 
    comm_handle = hypre_ParCSRCommHandleCreate( 11, comm_pkg, int_buf_data, CF_marker_offd);
@@ -1132,9 +1141,9 @@ hypre_BoomerAMGBuildInterpHE( hypre_ParCSRMatrix   *A,
       for (i = 0; i < num_sends; i++)
       {
          start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-         for (j=start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
             int_buf_data[index++]
-               = dof_func[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+               = dof_func[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
       }
 
       comm_handle = hypre_ParCSRCommHandleCreate( 11, comm_pkg, int_buf_data, dof_func_offd);
@@ -1142,11 +1151,11 @@ hypre_BoomerAMGBuildInterpHE( hypre_ParCSRMatrix   *A,
       hypre_ParCSRCommHandleDestroy(comm_handle);
    }
 
-   if (debug_flag==4)
+   if (debug_flag == 4)
    {
       wall_time = time_getWallclockSeconds() - wall_time;
       hypre_printf("Proc = %d     Interp: Comm 1 CF_marker =    %f\n",
-            my_id, wall_time);
+                   my_id, wall_time);
       fflush(NULL);
    }
 
@@ -1154,20 +1163,20 @@ hypre_BoomerAMGBuildInterpHE( hypre_ParCSRMatrix   *A,
     * Get the ghost rows of A
     *---------------------------------------------------------------------*/
 
-   if (debug_flag==4) wall_time = time_getWallclockSeconds();
+   if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
 
    if (num_procs > 1)
    {
-      A_ext      = hypre_ParCSRMatrixExtractBExt(A,A,1);
+      A_ext      = hypre_ParCSRMatrixExtractBExt(A, A, 1);
       A_ext_i    = hypre_CSRMatrixI(A_ext);
       A_ext_j    = hypre_CSRMatrixBigJ(A_ext);
       A_ext_data = hypre_CSRMatrixData(A_ext);
    }
 
    index = 0;
-   for (i=0; i < num_cols_A_offd; i++)
+   for (i = 0; i < num_cols_A_offd; i++)
    {
-      for (j=A_ext_i[i]; j < A_ext_i[i+1]; j++)
+      for (j = A_ext_i[i]; j < A_ext_i[i + 1]; j++)
       {
          big_k = A_ext_j[j];
          if (big_k >= col_1 && big_k < col_n)
@@ -1177,10 +1186,10 @@ hypre_BoomerAMGBuildInterpHE( hypre_ParCSRMatrix   *A,
          }
          else
          {
-            kc = hypre_BigBinarySearch(col_map_offd,big_k,num_cols_A_offd);
+            kc = hypre_BigBinarySearch(col_map_offd, big_k, num_cols_A_offd);
             if (kc > -1)
             {
-               A_ext_j[index] = (HYPRE_BigInt)(-kc-1);
+               A_ext_j[index] = (HYPRE_BigInt)(-kc - 1);
                A_ext_data[index++] = A_ext_data[j];
             }
          }
@@ -1188,14 +1197,16 @@ hypre_BoomerAMGBuildInterpHE( hypre_ParCSRMatrix   *A,
       A_ext_i[i] = index;
    }
    for (i = num_cols_A_offd; i > 0; i--)
-      A_ext_i[i] = A_ext_i[i-1];
-   if (num_procs > 1) A_ext_i[0] = 0;
+   {
+      A_ext_i[i] = A_ext_i[i - 1];
+   }
+   if (num_procs > 1) { A_ext_i[0] = 0; }
 
-   if (debug_flag==4)
+   if (debug_flag == 4)
    {
       wall_time = time_getWallclockSeconds() - wall_time;
       hypre_printf("Proc = %d  Interp: Comm 2   Get A_ext =  %f\n",
-            my_id, wall_time);
+                   my_id, wall_time);
       fflush(NULL);
    }
 
@@ -1213,9 +1224,9 @@ hypre_BoomerAMGBuildInterpHE( hypre_ParCSRMatrix   *A,
 
    fine_to_coarse = hypre_CTAlloc(HYPRE_Int,  n_fine, HYPRE_MEMORY_HOST);
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-   for (i = 0; i < n_fine; i++) fine_to_coarse[i] = -1;
+   for (i = 0; i < n_fine; i++) { fine_to_coarse[i] = -1; }
 
    jj_counter = start_indexing;
    jj_counter_offd = start_indexing;
@@ -1226,21 +1237,21 @@ hypre_BoomerAMGBuildInterpHE( hypre_ParCSRMatrix   *A,
 
    /* RDF: this looks a little tricky, but doable */
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i,j,i1,jj,ns,ne,size,rest) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i,j,i1,jj,ns,ne,size,rest) HYPRE_SMP_SCHEDULE
 #endif
    for (j = 0; j < num_threads; j++)
    {
-      size = n_fine/num_threads;
-      rest = n_fine - size*num_threads;
+      size = n_fine / num_threads;
+      rest = n_fine - size * num_threads;
       if (j < rest)
       {
-         ns = j*size+j;
-         ne = (j+1)*size+j+1;
+         ns = j * size + j;
+         ne = (j + 1) * size + j + 1;
       }
       else
       {
-         ns = j*size+rest;
-         ne = (j+1)*size+rest;
+         ns = j * size + rest;
+         ne = (j + 1) * size + rest;
       }
       for (i = ns; i < ne; i++)
       {
@@ -1264,7 +1275,7 @@ hypre_BoomerAMGBuildInterpHE( hypre_ParCSRMatrix   *A,
 
          else
          {
-            for (jj = S_diag_i[i]; jj < S_diag_i[i+1]; jj++)
+            for (jj = S_diag_i[i]; jj < S_diag_i[i + 1]; jj++)
             {
                i1 = S_diag_j[jj];
                if (CF_marker[i1] >= 0)
@@ -1275,7 +1286,7 @@ hypre_BoomerAMGBuildInterpHE( hypre_ParCSRMatrix   *A,
 
             if (num_procs > 1)
             {
-               for (jj = S_offd_i[i]; jj < S_offd_i[i+1]; jj++)
+               for (jj = S_offd_i[i]; jj < S_offd_i[i + 1]; jj++)
                {
                   i1 = S_offd_j[jj];
                   if (CF_marker_offd[i1] >= 0)
@@ -1292,19 +1303,19 @@ hypre_BoomerAMGBuildInterpHE( hypre_ParCSRMatrix   *A,
     *  Allocate  arrays.
     *-----------------------------------------------------------------------*/
 
-   for (i=0; i < num_threads-1; i++)
+   for (i = 0; i < num_threads - 1; i++)
    {
-      coarse_counter[i+1] += coarse_counter[i];
-      jj_count[i+1] += jj_count[i];
-      jj_count_offd[i+1] += jj_count_offd[i];
+      coarse_counter[i + 1] += coarse_counter[i];
+      jj_count[i + 1] += jj_count[i];
+      jj_count_offd[i + 1] += jj_count_offd[i];
    }
-   i = num_threads-1;
+   i = num_threads - 1;
    jj_counter = jj_count[i];
    jj_counter_offd = jj_count_offd[i];
 
    P_diag_size = jj_counter;
 
-   P_diag_i    = hypre_CTAlloc(HYPRE_Int,  n_fine+1, HYPRE_MEMORY_HOST);
+   P_diag_i    = hypre_CTAlloc(HYPRE_Int,  n_fine + 1, HYPRE_MEMORY_HOST);
    P_diag_j    = hypre_CTAlloc(HYPRE_Int,  P_diag_size, HYPRE_MEMORY_HOST);
    P_diag_data = hypre_CTAlloc(HYPRE_Real,  P_diag_size, HYPRE_MEMORY_HOST);
 
@@ -1313,7 +1324,7 @@ hypre_BoomerAMGBuildInterpHE( hypre_ParCSRMatrix   *A,
 
    P_offd_size = jj_counter_offd;
 
-   P_offd_i    = hypre_CTAlloc(HYPRE_Int,  n_fine+1, HYPRE_MEMORY_HOST);
+   P_offd_i    = hypre_CTAlloc(HYPRE_Int,  n_fine + 1, HYPRE_MEMORY_HOST);
    P_offd_j    = hypre_CTAlloc(HYPRE_Int,  P_offd_size, HYPRE_MEMORY_HOST);
    P_offd_data = hypre_CTAlloc(HYPRE_Real,  P_offd_size, HYPRE_MEMORY_HOST);
 
@@ -1324,11 +1335,11 @@ hypre_BoomerAMGBuildInterpHE( hypre_ParCSRMatrix   *A,
    jj_counter = start_indexing;
    jj_counter_offd = start_indexing;
 
-   if (debug_flag==4)
+   if (debug_flag == 4)
    {
       wall_time = time_getWallclockSeconds() - wall_time;
       hypre_printf("Proc = %d     Interp: Internal work 1 =     %f\n",
-            my_id, wall_time);
+                   my_id, wall_time);
       fflush(NULL);
    }
 
@@ -1336,31 +1347,33 @@ hypre_BoomerAMGBuildInterpHE( hypre_ParCSRMatrix   *A,
     *  Send and receive fine_to_coarse info.
     *-----------------------------------------------------------------------*/
 
-   if (debug_flag==4) wall_time = time_getWallclockSeconds();
+   if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
 
    //fine_to_coarse_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_A_offd, HYPRE_MEMORY_HOST);
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i,j,ns,ne,size,rest,coarse_shift) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i,j,ns,ne,size,rest,coarse_shift) HYPRE_SMP_SCHEDULE
 #endif
    for (j = 0; j < num_threads; j++)
    {
       coarse_shift = 0;
-      if (j > 0) coarse_shift = coarse_counter[j-1];
-      size = n_fine/num_threads;
-      rest = n_fine - size*num_threads;
+      if (j > 0) { coarse_shift = coarse_counter[j - 1]; }
+      size = n_fine / num_threads;
+      rest = n_fine - size * num_threads;
       if (j < rest)
       {
-         ns = j*size+j;
-         ne = (j+1)*size+j+1;
+         ns = j * size + j;
+         ne = (j + 1) * size + j + 1;
       }
       else
       {
-         ns = j*size+rest;
-         ne = (j+1)*size+rest;
+         ns = j * size + rest;
+         ne = (j + 1) * size + rest;
       }
       for (i = ns; i < ne; i++)
+      {
          fine_to_coarse[i] += coarse_shift;
+      }
    }
    /*index = 0;
      for (i = 0; i < num_sends; i++)
@@ -1384,44 +1397,48 @@ hypre_BoomerAMGBuildInterpHE( hypre_ParCSRMatrix   *A,
      fflush(NULL);
      }*/
 
-   if (debug_flag==4) wall_time = time_getWallclockSeconds();
+   if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
 
    /*#ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
-#endif
-for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;*/
+   #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+   #endif
+   for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;*/
 
    /*-----------------------------------------------------------------------
     *  Loop over fine grid points.
     *-----------------------------------------------------------------------*/
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i,j,jl,i1,i2,jj,jj1,ns,ne,size,rest,sum,diagonal,distribute,P_marker,P_marker_offd,jj_counter,jj_counter_offd,sgn,c_num,jj_begin_row,jj_end_row,jj_begin_row_offd,jj_end_row_offd) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i,j,jl,i1,i2,jj,jj1,ns,ne,size,rest,sum,diagonal,distribute,P_marker,P_marker_offd,jj_counter,jj_counter_offd,sgn,c_num,jj_begin_row,jj_end_row,jj_begin_row_offd,jj_end_row_offd) HYPRE_SMP_SCHEDULE
 #endif
    for (jl = 0; jl < num_threads; jl++)
    {
-      size = n_fine/num_threads;
-      rest = n_fine - size*num_threads;
+      size = n_fine / num_threads;
+      rest = n_fine - size * num_threads;
       if (jl < rest)
       {
-         ns = jl*size+jl;
-         ne = (jl+1)*size+jl+1;
+         ns = jl * size + jl;
+         ne = (jl + 1) * size + jl + 1;
       }
       else
       {
-         ns = jl*size+rest;
-         ne = (jl+1)*size+rest;
+         ns = jl * size + rest;
+         ne = (jl + 1) * size + rest;
       }
       jj_counter = 0;
-      if (jl > 0) jj_counter = jj_count[jl-1];
+      if (jl > 0) { jj_counter = jj_count[jl - 1]; }
       jj_counter_offd = 0;
-      if (jl > 0) jj_counter_offd = jj_count_offd[jl-1];
+      if (jl > 0) { jj_counter_offd = jj_count_offd[jl - 1]; }
 
       P_marker = hypre_CTAlloc(HYPRE_Int,  n_fine, HYPRE_MEMORY_HOST);
       if (num_cols_A_offd)
+      {
          P_marker_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_A_offd, HYPRE_MEMORY_HOST);
+      }
       else
+      {
          P_marker_offd = NULL;
+      }
 
       for (i = 0; i < n_fine; i++)
       {
@@ -1457,7 +1474,7 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;*/
             P_diag_i[i] = jj_counter;
             jj_begin_row = jj_counter;
 
-            for (jj = S_diag_i[i]; jj < S_diag_i[i+1]; jj++)
+            for (jj = S_diag_i[i]; jj < S_diag_i[i + 1]; jj++)
             {
                i1 = S_diag_j[jj];
 
@@ -1484,7 +1501,7 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;*/
 
             if (num_procs > 1)
             {
-               for (jj = S_offd_i[i]; jj < S_offd_i[i+1]; jj++)
+               for (jj = S_offd_i[i]; jj < S_offd_i[i + 1]; jj++)
                {
                   i1 = S_offd_j[jj];
 
@@ -1510,7 +1527,7 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;*/
 
             /* Loop over ith row of A.  First, the diagonal part of A */
 
-            for (jj = A_diag_i[i]+1; jj < A_diag_i[i+1]; jj++)
+            for (jj = A_diag_i[i] + 1; jj < A_diag_i[i + 1]; jj++)
             {
                i1 = A_diag_j[jj];
 
@@ -1539,13 +1556,13 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;*/
                    * of the connections to c-points that strongly influence i.
                    *-----------------------------------------------------------*/
                   sgn = 1;
-                  if (A_diag_data[A_diag_i[i1]] < 0) sgn = -1;
+                  if (A_diag_data[A_diag_i[i1]] < 0) { sgn = -1; }
                   /* Diagonal block part of row i1 */
-                  for (jj1 = A_diag_i[i1]; jj1 < A_diag_i[i1+1]; jj1++)
+                  for (jj1 = A_diag_i[i1]; jj1 < A_diag_i[i1 + 1]; jj1++)
                   {
                      i2 = A_diag_j[jj1];
                      if (P_marker[i2] >= jj_begin_row &&
-                           (sgn*A_diag_data[jj1]) < 0)
+                         (sgn * A_diag_data[jj1]) < 0)
                      {
                         sum += A_diag_data[jj1];
                      }
@@ -1554,11 +1571,11 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;*/
                   /* Off-Diagonal block part of row i1 */
                   if (num_procs > 1)
                   {
-                     for (jj1 = A_offd_i[i1]; jj1 < A_offd_i[i1+1]; jj1++)
+                     for (jj1 = A_offd_i[i1]; jj1 < A_offd_i[i1 + 1]; jj1++)
                      {
                         i2 = A_offd_j[jj1];
                         if (P_marker_offd[i2] >= jj_begin_row_offd
-                              && (sgn*A_offd_data[jj1]) < 0)
+                            && (sgn * A_offd_data[jj1]) < 0)
                         {
                            sum += A_offd_data[jj1];
                         }
@@ -1574,28 +1591,28 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;*/
                       *-----------------------------------------------------------*/
 
                      /* Diagonal block part of row i1 */
-                     for (jj1 = A_diag_i[i1]; jj1 < A_diag_i[i1+1]; jj1++)
+                     for (jj1 = A_diag_i[i1]; jj1 < A_diag_i[i1 + 1]; jj1++)
                      {
                         i2 = A_diag_j[jj1];
                         if (P_marker[i2] >= jj_begin_row
-                              && (sgn*A_diag_data[jj1]) < 0)
+                            && (sgn * A_diag_data[jj1]) < 0)
                         {
                            P_diag_data[P_marker[i2]]
-                              += distribute * A_diag_data[jj1];
+                           += distribute * A_diag_data[jj1];
                         }
                      }
 
                      /* Off-Diagonal block part of row i1 */
                      if (num_procs > 1)
                      {
-                        for (jj1 = A_offd_i[i1]; jj1 < A_offd_i[i1+1]; jj1++)
+                        for (jj1 = A_offd_i[i1]; jj1 < A_offd_i[i1 + 1]; jj1++)
                         {
                            i2 = A_offd_j[jj1];
                            if (P_marker_offd[i2] >= jj_begin_row_offd
-                                 && (sgn*A_offd_data[jj1]) < 0)
+                               && (sgn * A_offd_data[jj1]) < 0)
                            {
                               P_offd_data[P_marker_offd[i2]]
-                                 += distribute * A_offd_data[jj1];
+                              += distribute * A_offd_data[jj1];
                            }
                         }
                      }
@@ -1603,7 +1620,9 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;*/
                   else
                   {
                      if (num_functions == 1 || dof_func[i] == dof_func[i1])
+                     {
                         diagonal += A_diag_data[jj];
+                     }
                   }
                }
 
@@ -1617,7 +1636,7 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;*/
 
             if (num_procs > 1)
             {
-               for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+               for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
                {
                   i1 = A_offd_j[jj];
 
@@ -1650,8 +1669,8 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;*/
                      c_num = A_offd_j[jj];
 
                      sgn = 1;
-                     if (A_ext_data[A_ext_i[c_num]] < 0) sgn = -1;
-                     for (jj1 = A_ext_i[c_num]; jj1 < A_ext_i[c_num+1]; jj1++)
+                     if (A_ext_data[A_ext_i[c_num]] < 0) { sgn = -1; }
+                     for (jj1 = A_ext_i[c_num]; jj1 < A_ext_i[c_num + 1]; jj1++)
                      {
                         i2 = (HYPRE_Int)A_ext_j[jj1];
 
@@ -1659,7 +1678,7 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;*/
                         {
                            /* in the diagonal block */
                            if (P_marker[i2] >= jj_begin_row
-                                 && (sgn*A_ext_data[jj1]) < 0)
+                               && (sgn * A_ext_data[jj1]) < 0)
                            {
                               sum += A_ext_data[jj1];
                            }
@@ -1667,8 +1686,8 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;*/
                         else
                         {
                            /* in the off_diagonal block  */
-                           if (P_marker_offd[-i2-1] >= jj_begin_row_offd
-                                 && (sgn*A_ext_data[jj1]) < 0)
+                           if (P_marker_offd[-i2 - 1] >= jj_begin_row_offd
+                               && (sgn * A_ext_data[jj1]) < 0)
                            {
                               sum += A_ext_data[jj1];
                            }
@@ -1686,33 +1705,35 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;*/
                          *--------------------------------------------------------*/
 
                         /* Diagonal block part of row i1 */
-                        for (jj1 = A_ext_i[c_num]; jj1 < A_ext_i[c_num+1]; jj1++)
+                        for (jj1 = A_ext_i[c_num]; jj1 < A_ext_i[c_num + 1]; jj1++)
                         {
                            i2 = (HYPRE_Int)A_ext_j[jj1];
 
                            if (i2 > -1) /* in the diagonal block */
                            {
                               if (P_marker[i2] >= jj_begin_row
-                                    && (sgn*A_ext_data[jj1]) < 0)
+                                  && (sgn * A_ext_data[jj1]) < 0)
                               {
                                  P_diag_data[P_marker[i2]]
-                                    += distribute * A_ext_data[jj1];
+                                 += distribute * A_ext_data[jj1];
                               }
                            }
                            else
                            {
                               /* in the off_diagonal block  */
-                              if (P_marker_offd[-i2-1] >= jj_begin_row_offd
-                                    && (sgn*A_ext_data[jj1]) < 0)
-                                 P_offd_data[P_marker_offd[-i2-1]]
-                                    += distribute * A_ext_data[jj1];
+                              if (P_marker_offd[-i2 - 1] >= jj_begin_row_offd
+                                  && (sgn * A_ext_data[jj1]) < 0)
+                                 P_offd_data[P_marker_offd[-i2 - 1]]
+                                 += distribute * A_ext_data[jj1];
                            }
                         }
                      }
                      else
                      {
                         if (num_functions == 1 || dof_func[i] == dof_func_offd[i1])
+                        {
                            diagonal += A_offd_data[jj];
+                        }
                      }
                   }
                }
@@ -1733,20 +1754,20 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;*/
             }
          }
 
-         P_offd_i[i+1] = jj_counter_offd;
+         P_offd_i[i + 1] = jj_counter_offd;
       }
       hypre_TFree(P_marker, HYPRE_MEMORY_HOST);
       hypre_TFree(P_marker_offd, HYPRE_MEMORY_HOST);
    }
 
    P = hypre_ParCSRMatrixCreate(comm,
-         hypre_ParCSRMatrixGlobalNumRows(A),
-         total_global_cpts,
-         hypre_ParCSRMatrixColStarts(A),
-         num_cpts_global,
-         0,
-         P_diag_i[n_fine],
-         P_offd_i[n_fine]);
+                                hypre_ParCSRMatrixGlobalNumRows(A),
+                                total_global_cpts,
+                                hypre_ParCSRMatrixColStarts(A),
+                                num_cpts_global,
+                                0,
+                                P_diag_i[n_fine],
+                                P_offd_i[n_fine]);
 
 
    P_diag = hypre_ParCSRMatrixDiag(P);
@@ -1779,13 +1800,15 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;*/
       P_marker = hypre_CTAlloc(HYPRE_Int, num_cols_A_offd, HYPRE_MEMORY_HOST);
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-      for (i=0; i < num_cols_A_offd; i++)
+      for (i = 0; i < num_cols_A_offd; i++)
+      {
          P_marker[i] = 0;
+      }
 
       num_cols_P_offd = 0;
-      for (i=0; i < P_offd_size; i++)
+      for (i = 0; i < P_offd_size; i++)
       {
          index = P_offd_j[i];
          if (!P_marker[index])
@@ -1799,24 +1822,24 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;*/
       tmp_map_offd = hypre_CTAlloc(HYPRE_Int, num_cols_P_offd, HYPRE_MEMORY_HOST);
 
       index = 0;
-      for (i=0; i < num_cols_P_offd; i++)
+      for (i = 0; i < num_cols_P_offd; i++)
       {
-         while (P_marker[index]==0) index++;
+         while (P_marker[index] == 0) { index++; }
          tmp_map_offd[i] = index++;
       }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-      for (i=0; i < P_offd_size; i++)
+      for (i = 0; i < P_offd_size; i++)
          P_offd_j[i] = hypre_BinarySearch(tmp_map_offd,
-               P_offd_j[i],
-               num_cols_P_offd);
+                                          P_offd_j[i],
+                                          num_cols_P_offd);
       hypre_TFree(P_marker, HYPRE_MEMORY_HOST);
    }
 
-   for (i=0; i < n_fine; i++)
-      if (CF_marker[i] == -3) CF_marker[i] = -1;
+   for (i = 0; i < n_fine; i++)
+      if (CF_marker[i] == -3) { CF_marker[i] = -1; }
 
    if (num_cols_P_offd)
    {
@@ -1824,7 +1847,7 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;*/
       hypre_CSRMatrixNumCols(P_offd) = num_cols_P_offd;
    }
 
-   hypre_GetCommPkgRTFromCommPkgA(P,A,fine_to_coarse, tmp_map_offd);
+   hypre_GetCommPkgRTFromCommPkgA(P, A, fine_to_coarse, tmp_map_offd);
 
    *P_ptr = P;
 
@@ -1836,11 +1859,7 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;*/
    hypre_TFree(coarse_counter, HYPRE_MEMORY_HOST);
    hypre_TFree(jj_count, HYPRE_MEMORY_HOST);
    hypre_TFree(jj_count_offd, HYPRE_MEMORY_HOST);
-
-   if (num_procs > 1)
-   {
-      hypre_CSRMatrixDestroy(A_ext);
-   }
+   hypre_CSRMatrixDestroy(A_ext);
 
    return hypre_error_flag;
 }
@@ -1862,11 +1881,12 @@ hypre_BoomerAMGBuildDirInterpHost( hypre_ParCSRMatrix   *A,
                                    HYPRE_Int             max_elmts,
                                    hypre_ParCSRMatrix  **P_ptr)
 {
-
-   MPI_Comm      comm = hypre_ParCSRMatrixComm(A);
+   MPI_Comm                 comm = hypre_ParCSRMatrixComm(A);
    hypre_ParCSRCommPkg     *comm_pkg = hypre_ParCSRMatrixCommPkg(A);
    hypre_ParCSRCommHandle  *comm_handle;
 
+   HYPRE_MemoryLocation memory_location_P = hypre_ParCSRMatrixMemoryLocation(A);
+
    hypre_CSRMatrix *A_diag = hypre_ParCSRMatrixDiag(A);
    HYPRE_Real      *A_diag_data = hypre_CSRMatrixData(A_diag);
    HYPRE_Int       *A_diag_i = hypre_CSRMatrixI(A_diag);
@@ -1905,10 +1925,10 @@ hypre_BoomerAMGBuildDirInterpHost( hypre_ParCSRMatrix   *A,
 
    HYPRE_Int        P_diag_size, P_offd_size;
 
-   HYPRE_Int        jj_counter,jj_counter_offd;
+   HYPRE_Int        jj_counter, jj_counter_offd;
    HYPRE_Int       *jj_count, *jj_count_offd;
-   HYPRE_Int        jj_begin_row,jj_begin_row_offd;
-   HYPRE_Int        jj_end_row,jj_end_row_offd;
+   HYPRE_Int        jj_begin_row, jj_begin_row_offd;
+   HYPRE_Int        jj_end_row, jj_end_row_offd;
 
    HYPRE_Int        start_indexing = 0; /* start indexing for P_data at 0 */
 
@@ -1921,8 +1941,8 @@ hypre_BoomerAMGBuildDirInterpHost( hypre_ParCSRMatrix   *A,
    HYPRE_Int        num_cols_P_offd;
    //HYPRE_BigInt     my_first_cpt;
 
-   HYPRE_Int        i,i1;
-   HYPRE_Int        j,jl,jj;
+   HYPRE_Int        i, i1;
+   HYPRE_Int        j, jl, jj;
    HYPRE_Int        start;
 
    HYPRE_Real       diagonal;
@@ -1945,22 +1965,24 @@ hypre_BoomerAMGBuildDirInterpHost( hypre_ParCSRMatrix   *A,
    HYPRE_Real       wall_time;  /* for debugging instrumentation  */
 
    hypre_MPI_Comm_size(comm, &num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_rank(comm, &my_id);
    num_threads = hypre_NumThreads();
 
    //my_first_cpt = num_cpts_global[0];
-   if (my_id == (num_procs -1)) total_global_cpts = num_cpts_global[1];
-   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
+   if (my_id == (num_procs - 1)) { total_global_cpts = num_cpts_global[1]; }
+   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
 
    /*-------------------------------------------------------------------
     * Get the CF_marker data for the off-processor columns
     *-------------------------------------------------------------------*/
 
-   if (debug_flag==4) wall_time = time_getWallclockSeconds();
+   if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
 
-   if (num_cols_A_offd) CF_marker_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_A_offd, HYPRE_MEMORY_HOST);
+   if (num_cols_A_offd) { CF_marker_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_A_offd, HYPRE_MEMORY_HOST); }
    if (num_functions > 1 && num_cols_A_offd)
+   {
       dof_func_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_A_offd, HYPRE_MEMORY_HOST);
+   }
 
    if (!comm_pkg)
    {
@@ -1970,19 +1992,19 @@ hypre_BoomerAMGBuildDirInterpHost( hypre_ParCSRMatrix   *A,
 
    num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
    int_buf_data = hypre_CTAlloc(HYPRE_Int,  hypre_ParCSRCommPkgSendMapStart(comm_pkg,
-            num_sends), HYPRE_MEMORY_HOST);
+                                                                            num_sends), HYPRE_MEMORY_HOST);
 
    index = 0;
    for (i = 0; i < num_sends; i++)
    {
       start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
          int_buf_data[index++]
-            = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+            = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
    }
 
    comm_handle = hypre_ParCSRCommHandleCreate( 11, comm_pkg, int_buf_data,
-         CF_marker_offd);
+                                               CF_marker_offd);
 
    hypre_ParCSRCommHandleDestroy(comm_handle);
    if (num_functions > 1)
@@ -1991,22 +2013,22 @@ hypre_BoomerAMGBuildDirInterpHost( hypre_ParCSRMatrix   *A,
       for (i = 0; i < num_sends; i++)
       {
          start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-         for (j=start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
             int_buf_data[index++]
-               = dof_func[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+               = dof_func[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
       }
 
       comm_handle = hypre_ParCSRCommHandleCreate( 11, comm_pkg, int_buf_data,
-            dof_func_offd);
+                                                  dof_func_offd);
 
       hypre_ParCSRCommHandleDestroy(comm_handle);
    }
 
-   if (debug_flag==4)
+   if (debug_flag == 4)
    {
       wall_time = time_getWallclockSeconds() - wall_time;
       hypre_printf("Proc = %d     Interp: Comm 1 CF_marker =    %f\n",
-            my_id, wall_time);
+                   my_id, wall_time);
       fflush(NULL);
    }
 
@@ -2024,9 +2046,9 @@ hypre_BoomerAMGBuildDirInterpHost( hypre_ParCSRMatrix   *A,
 
    fine_to_coarse = hypre_CTAlloc(HYPRE_Int,  n_fine, HYPRE_MEMORY_HOST);
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-   for (i = 0; i < n_fine; i++) fine_to_coarse[i] = -1;
+   for (i = 0; i < n_fine; i++) { fine_to_coarse[i] = -1; }
 
    jj_counter = start_indexing;
    jj_counter_offd = start_indexing;
@@ -2037,21 +2059,21 @@ hypre_BoomerAMGBuildDirInterpHost( hypre_ParCSRMatrix   *A,
 
    /* RDF: this looks a little tricky, but doable */
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i,j,i1,jj,ns,ne,size,rest) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i,j,i1,jj,ns,ne,size,rest) HYPRE_SMP_SCHEDULE
 #endif
    for (j = 0; j < num_threads; j++)
    {
-      size = n_fine/num_threads;
-      rest = n_fine - size*num_threads;
+      size = n_fine / num_threads;
+      rest = n_fine - size * num_threads;
       if (j < rest)
       {
-         ns = j*size+j;
-         ne = (j+1)*size+j+1;
+         ns = j * size + j;
+         ne = (j + 1) * size + j + 1;
       }
       else
       {
-         ns = j*size+rest;
-         ne = (j+1)*size+rest;
+         ns = j * size + rest;
+         ne = (j + 1) * size + rest;
       }
       for (i = ns; i < ne; i++)
       {
@@ -2075,7 +2097,7 @@ hypre_BoomerAMGBuildDirInterpHost( hypre_ParCSRMatrix   *A,
 
          else
          {
-            for (jj = S_diag_i[i]; jj < S_diag_i[i+1]; jj++)
+            for (jj = S_diag_i[i]; jj < S_diag_i[i + 1]; jj++)
             {
                i1 = S_diag_j[jj];
                if (CF_marker[i1] > 0)
@@ -2086,7 +2108,7 @@ hypre_BoomerAMGBuildDirInterpHost( hypre_ParCSRMatrix   *A,
 
             if (num_procs > 1)
             {
-               for (jj = S_offd_i[i]; jj < S_offd_i[i+1]; jj++)
+               for (jj = S_offd_i[i]; jj < S_offd_i[i + 1]; jj++)
                {
                   i1 = S_offd_j[jj];
                   if (CF_marker_offd[i1] > 0)
@@ -2103,30 +2125,30 @@ hypre_BoomerAMGBuildDirInterpHost( hypre_ParCSRMatrix   *A,
     *  Allocate  arrays.
     *-----------------------------------------------------------------------*/
 
-   for (i=0; i < num_threads-1; i++)
+   for (i = 0; i < num_threads - 1; i++)
    {
-      coarse_counter[i+1] += coarse_counter[i];
-      jj_count[i+1] += jj_count[i];
-      jj_count_offd[i+1] += jj_count_offd[i];
+      coarse_counter[i + 1] += coarse_counter[i];
+      jj_count[i + 1] += jj_count[i];
+      jj_count_offd[i + 1] += jj_count_offd[i];
    }
-   i = num_threads-1;
+   i = num_threads - 1;
    jj_counter = jj_count[i];
    jj_counter_offd = jj_count_offd[i];
 
    P_diag_size = jj_counter;
 
-   P_diag_i    = hypre_CTAlloc(HYPRE_Int,  n_fine+1,    HYPRE_MEMORY_DEVICE);
-   P_diag_j    = hypre_CTAlloc(HYPRE_Int,  P_diag_size, HYPRE_MEMORY_DEVICE);
-   P_diag_data = hypre_CTAlloc(HYPRE_Real, P_diag_size, HYPRE_MEMORY_DEVICE);
+   P_diag_i    = hypre_CTAlloc(HYPRE_Int,  n_fine + 1,  memory_location_P);
+   P_diag_j    = hypre_CTAlloc(HYPRE_Int,  P_diag_size, memory_location_P);
+   P_diag_data = hypre_CTAlloc(HYPRE_Real, P_diag_size, memory_location_P);
 
    P_diag_i[n_fine] = jj_counter;
 
 
    P_offd_size = jj_counter_offd;
 
-   P_offd_i    = hypre_CTAlloc(HYPRE_Int,  n_fine+1,    HYPRE_MEMORY_DEVICE);
-   P_offd_j    = hypre_CTAlloc(HYPRE_Int,  P_offd_size, HYPRE_MEMORY_DEVICE);
-   P_offd_data = hypre_CTAlloc(HYPRE_Real, P_offd_size, HYPRE_MEMORY_DEVICE);
+   P_offd_i    = hypre_CTAlloc(HYPRE_Int,  n_fine + 1,  memory_location_P);
+   P_offd_j    = hypre_CTAlloc(HYPRE_Int,  P_offd_size, memory_location_P);
+   P_offd_data = hypre_CTAlloc(HYPRE_Real, P_offd_size, memory_location_P);
 
    /*-----------------------------------------------------------------------
     *  Intialize some stuff.
@@ -2135,11 +2157,11 @@ hypre_BoomerAMGBuildDirInterpHost( hypre_ParCSRMatrix   *A,
    jj_counter = start_indexing;
    jj_counter_offd = start_indexing;
 
-   if (debug_flag==4)
+   if (debug_flag == 4)
    {
       wall_time = time_getWallclockSeconds() - wall_time;
       hypre_printf("Proc = %d     Interp: Internal work 1 =     %f\n",
-            my_id, wall_time);
+                   my_id, wall_time);
       fflush(NULL);
    }
 
@@ -2147,28 +2169,28 @@ hypre_BoomerAMGBuildDirInterpHost( hypre_ParCSRMatrix   *A,
     *  Send and receive fine_to_coarse info.
     *-----------------------------------------------------------------------*/
 
-   if (debug_flag==4) wall_time = time_getWallclockSeconds();
+   if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
 
    //fine_to_coarse_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_A_offd, HYPRE_MEMORY_HOST);
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i,j,ns,ne,size,rest,coarse_shift) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i,j,ns,ne,size,rest,coarse_shift) HYPRE_SMP_SCHEDULE
 #endif
    for (j = 0; j < num_threads; j++)
    {
       coarse_shift = 0;
-      if (j > 0) coarse_shift = coarse_counter[j-1];
-      size = n_fine/num_threads;
-      rest = n_fine - size*num_threads;
+      if (j > 0) { coarse_shift = coarse_counter[j - 1]; }
+      size = n_fine / num_threads;
+      rest = n_fine - size * num_threads;
       if (j < rest)
       {
-         ns = j*size+j;
-         ne = (j+1)*size+j+1;
+         ns = j * size + j;
+         ne = (j + 1) * size + j + 1;
       }
       else
       {
-         ns = j*size+rest;
-         ne = (j+1)*size+rest;
+         ns = j * size + rest;
+         ne = (j + 1) * size + rest;
       }
       for (i = ns; i < ne; i++)
       {
@@ -2197,46 +2219,52 @@ hypre_BoomerAMGBuildDirInterpHost( hypre_ParCSRMatrix   *A,
      fflush(NULL);
      }*/
 
-   if (debug_flag==4) wall_time = time_getWallclockSeconds();
+   if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
 
    /*#ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
-#endif
-for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;*/
+   #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+   #endif
+   for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;*/
 
    /*-----------------------------------------------------------------------
     *  Loop over fine grid points.
     *-----------------------------------------------------------------------*/
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i,j,jl,i1,jj,ns,ne,size,rest,diagonal,jj_counter,jj_counter_offd,jj_begin_row,jj_end_row,jj_begin_row_offd,jj_end_row_offd,sum_P_pos,sum_P_neg,sum_N_pos,sum_N_neg,alfa,beta) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i,j,jl,i1,jj,ns,ne,size,rest,diagonal,jj_counter,jj_counter_offd,jj_begin_row,jj_end_row,jj_begin_row_offd,jj_end_row_offd,sum_P_pos,sum_P_neg,sum_N_pos,sum_N_neg,alfa,beta) HYPRE_SMP_SCHEDULE
 #endif
    for (jl = 0; jl < num_threads; jl++)
    {
       HYPRE_Int       *P_marker, *P_marker_offd;
 
-      size = n_fine/num_threads;
-      rest = n_fine - size*num_threads;
+      alfa = 1.0;
+      beta = 1.0;
+      size = n_fine / num_threads;
+      rest = n_fine - size * num_threads;
       if (jl < rest)
       {
-         ns = jl*size+jl;
-         ne = (jl+1)*size+jl+1;
+         ns = jl * size + jl;
+         ne = (jl + 1) * size + jl + 1;
       }
       else
       {
-         ns = jl*size+rest;
-         ne = (jl+1)*size+rest;
+         ns = jl * size + rest;
+         ne = (jl + 1) * size + rest;
       }
       jj_counter = 0;
-      if (jl > 0) jj_counter = jj_count[jl-1];
+      if (jl > 0) { jj_counter = jj_count[jl - 1]; }
       jj_counter_offd = 0;
-      if (jl > 0) jj_counter_offd = jj_count_offd[jl-1];
+      if (jl > 0) { jj_counter_offd = jj_count_offd[jl - 1]; }
 
       P_marker = hypre_CTAlloc(HYPRE_Int,  n_fine, HYPRE_MEMORY_HOST);
       if (num_cols_A_offd)
+      {
          P_marker_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_A_offd, HYPRE_MEMORY_HOST);
+      }
       else
+      {
          P_marker_offd = NULL;
+      }
 
       for (i = 0; i < n_fine; i++)
       {
@@ -2272,7 +2300,7 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;*/
             P_diag_i[i] = jj_counter;
             jj_begin_row = jj_counter;
 
-            for (jj = S_diag_i[i]; jj < S_diag_i[i+1]; jj++)
+            for (jj = S_diag_i[i]; jj < S_diag_i[i + 1]; jj++)
             {
                i1 = S_diag_j[jj];
 
@@ -2299,7 +2327,7 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;*/
 
             if (num_procs > 1)
             {
-               for (jj = S_offd_i[i]; jj < S_offd_i[i+1]; jj++)
+               for (jj = S_offd_i[i]; jj < S_offd_i[i + 1]; jj++)
                {
                   i1 = S_offd_j[jj];
 
@@ -2329,15 +2357,19 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;*/
             sum_P_pos = 0;
             sum_P_neg = 0;
 
-            for (jj = A_diag_i[i]+1; jj < A_diag_i[i+1]; jj++)
+            for (jj = A_diag_i[i] + 1; jj < A_diag_i[i + 1]; jj++)
             {
                i1 = A_diag_j[jj];
                if (num_functions == 1 || dof_func[i1] == dof_func[i])
                {
                   if (A_diag_data[jj] > 0)
+                  {
                      sum_N_pos += A_diag_data[jj];
+                  }
                   else
+                  {
                      sum_N_neg += A_diag_data[jj];
+                  }
                }
                /*--------------------------------------------------------------
                 * Case 1: neighbor i1 is a C-point and strongly influences i,
@@ -2348,9 +2380,13 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;*/
                {
                   P_diag_data[P_marker[i1]] += A_diag_data[jj];
                   if (A_diag_data[jj] > 0)
+                  {
                      sum_P_pos += A_diag_data[jj];
+                  }
                   else
+                  {
                      sum_P_neg += A_diag_data[jj];
+                  }
                }
             }
 
@@ -2361,15 +2397,19 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;*/
 
             if (num_procs > 1)
             {
-               for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+               for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
                {
                   i1 = A_offd_j[jj];
                   if (num_functions == 1 || dof_func_offd[i1] == dof_func[i])
                   {
                      if (A_offd_data[jj] > 0)
+                     {
                         sum_N_pos += A_offd_data[jj];
+                     }
                      else
+                     {
                         sum_N_neg += A_offd_data[jj];
+                     }
                   }
 
                   /*--------------------------------------------------------------
@@ -2381,15 +2421,19 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;*/
                   {
                      P_offd_data[P_marker_offd[i1]] += A_offd_data[jj];
                      if (A_offd_data[jj] > 0)
+                     {
                         sum_P_pos += A_offd_data[jj];
+                     }
                      else
+                     {
                         sum_P_neg += A_offd_data[jj];
+                     }
                   }
 
                }
             }
-            if (sum_P_neg) alfa = sum_N_neg/sum_P_neg/diagonal;
-            if (sum_P_pos) beta = sum_N_pos/sum_P_pos/diagonal;
+            if (sum_P_neg) { alfa = sum_N_neg / sum_P_neg / diagonal; }
+            if (sum_P_pos) { beta = sum_N_pos / sum_P_pos / diagonal; }
 
             /*-----------------------------------------------------------------
              * Set interpolation weight by dividing by the diagonal.
@@ -2397,36 +2441,44 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;*/
 
             for (jj = jj_begin_row; jj < jj_end_row; jj++)
             {
-               if (P_diag_data[jj]> 0)
+               if (P_diag_data[jj] > 0)
+               {
                   P_diag_data[jj] *= -beta;
+               }
                else
+               {
                   P_diag_data[jj] *= -alfa;
+               }
             }
 
             for (jj = jj_begin_row_offd; jj < jj_end_row_offd; jj++)
             {
-               if (P_offd_data[jj]> 0)
+               if (P_offd_data[jj] > 0)
+               {
                   P_offd_data[jj] *= -beta;
+               }
                else
+               {
                   P_offd_data[jj] *= -alfa;
+               }
             }
 
          }
 
-         P_offd_i[i+1] = jj_counter_offd;
+         P_offd_i[i + 1] = jj_counter_offd;
       }
       hypre_TFree(P_marker, HYPRE_MEMORY_HOST);
       hypre_TFree(P_marker_offd, HYPRE_MEMORY_HOST);
    }
 
    P = hypre_ParCSRMatrixCreate(comm,
-         hypre_ParCSRMatrixGlobalNumRows(A),
-         total_global_cpts,
-         hypre_ParCSRMatrixColStarts(A),
-         num_cpts_global,
-         0,
-         P_diag_i[n_fine],
-         P_offd_i[n_fine]);
+                                hypre_ParCSRMatrixGlobalNumRows(A),
+                                total_global_cpts,
+                                hypre_ParCSRMatrixColStarts(A),
+                                num_cpts_global,
+                                0,
+                                P_diag_i[n_fine],
+                                P_offd_i[n_fine]);
 
 
    P_diag = hypre_ParCSRMatrixDiag(P);
@@ -2459,13 +2511,15 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;*/
       HYPRE_Int *P_marker = hypre_CTAlloc(HYPRE_Int,  num_cols_A_offd, HYPRE_MEMORY_HOST);
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-      for (i=0; i < num_cols_A_offd; i++)
+      for (i = 0; i < num_cols_A_offd; i++)
+      {
          P_marker[i] = 0;
+      }
 
       num_cols_P_offd = 0;
-      for (i=0; i < P_offd_size; i++)
+      for (i = 0; i < P_offd_size; i++)
       {
          index = P_offd_j[i];
          if (!P_marker[index])
@@ -2479,26 +2533,26 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;*/
       tmp_map_offd = hypre_CTAlloc(HYPRE_Int, num_cols_P_offd, HYPRE_MEMORY_HOST);
 
       index = 0;
-      for (i=0; i < num_cols_P_offd; i++)
+      for (i = 0; i < num_cols_P_offd; i++)
       {
-         while (P_marker[index]==0) index++;
+         while (P_marker[index] == 0) { index++; }
          tmp_map_offd[i] = index++;
       }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-      for (i=0; i < P_offd_size; i++)
+      for (i = 0; i < P_offd_size; i++)
       {
          P_offd_j[i] = hypre_BinarySearch(tmp_map_offd,
-               P_offd_j[i],
-               num_cols_P_offd);
+                                          P_offd_j[i],
+                                          num_cols_P_offd);
       }
       hypre_TFree(P_marker, HYPRE_MEMORY_HOST);
    }
 
-   for (i=0; i < n_fine; i++)
-      if (CF_marker[i] == -3) CF_marker[i] = -1;
+   for (i = 0; i < n_fine; i++)
+      if (CF_marker[i] == -3) { CF_marker[i] = -1; }
 
    if (num_cols_P_offd)
    {
@@ -2535,33 +2589,29 @@ hypre_BoomerAMGBuildDirInterp( hypre_ParCSRMatrix   *A,
                                HYPRE_Int             interp_type,
                                hypre_ParCSRMatrix  **P_ptr)
 {
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-   hypre_GpuProfilingPushRange("DirInterp");
-#endif
+   HYPRE_UNUSED_VAR(interp_type);
 
-   HYPRE_Int ierr = 0;
+   hypre_GpuProfilingPushRange("DirInterp");
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
    HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_ParCSRMatrixMemoryLocation(A) );
 
    if (exec == HYPRE_EXEC_DEVICE)
    {
-      ierr = hypre_BoomerAMGBuildDirInterpDevice(A,CF_marker,S,num_cpts_global,num_functions,dof_func,
-                                                 debug_flag,trunc_factor,max_elmts,
-                                                 interp_type, P_ptr);
+      hypre_BoomerAMGBuildDirInterpDevice(A, CF_marker, S, num_cpts_global, num_functions,
+                                          dof_func, debug_flag, trunc_factor, max_elmts,
+                                          interp_type, P_ptr);
    }
    else
 #endif
    {
-      ierr = hypre_BoomerAMGBuildDirInterpHost(A,CF_marker,S,num_cpts_global,num_functions,dof_func,
-                                               debug_flag,trunc_factor,max_elmts, P_ptr);
+      hypre_BoomerAMGBuildDirInterpHost(A, CF_marker, S, num_cpts_global, num_functions,
+                                        dof_func, debug_flag, trunc_factor, max_elmts, P_ptr);
    }
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    hypre_GpuProfilingPopRange();
-#endif
 
-   return ierr;
+   return hypre_error_flag;
 }
 
 /*------------------------------------------------
@@ -2575,10 +2625,10 @@ hypre_BoomerAMGInterpTruncation( hypre_ParCSRMatrix *P,
 {
    if (trunc_factor <= 0.0 && max_elmts == 0)
    {
-      return 0;
+      return hypre_error_flag;
    }
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
    HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_ParCSRMatrixMemoryLocation(P) );
 
    if (exec == HYPRE_EXEC_DEVICE)
@@ -2639,12 +2689,12 @@ hypre_BoomerAMGBuildInterpModUnk( hypre_ParCSRMatrix   *A,
 
    hypre_ParCSRMatrix *P;
    HYPRE_BigInt       *col_map_offd_P;
-   HYPRE_Int          *tmp_map_offd;
+   HYPRE_Int          *tmp_map_offd = NULL;
 
    HYPRE_Int          *CF_marker_offd = NULL;
    HYPRE_Int          *dof_func_offd = NULL;
 
-   hypre_CSRMatrix *A_ext;
+   hypre_CSRMatrix *A_ext = NULL;
 
    HYPRE_Real      *A_ext_data = NULL;
    HYPRE_Int       *A_ext_i = NULL;
@@ -2664,10 +2714,10 @@ hypre_BoomerAMGBuildInterpModUnk( hypre_ParCSRMatrix   *A,
 
    HYPRE_Int       *P_marker, *P_marker_offd;
 
-   HYPRE_Int        jj_counter,jj_counter_offd;
+   HYPRE_Int        jj_counter, jj_counter_offd;
    HYPRE_Int       *jj_count, *jj_count_offd;
-   HYPRE_Int        jj_begin_row,jj_begin_row_offd;
-   HYPRE_Int        jj_end_row,jj_end_row_offd;
+   HYPRE_Int        jj_begin_row, jj_begin_row_offd;
+   HYPRE_Int        jj_end_row, jj_end_row_offd;
 
    HYPRE_Int        start_indexing = 0; /* start indexing for P_data at 0 */
 
@@ -2683,8 +2733,8 @@ hypre_BoomerAMGBuildInterpModUnk( hypre_ParCSRMatrix   *A,
    HYPRE_Int        num_cols_P_offd;
    //HYPRE_BigInt     my_first_cpt;
 
-   HYPRE_Int        i,i1,i2;
-   HYPRE_Int        j,jl,jj,jj1;
+   HYPRE_Int        i, i1, i2;
+   HYPRE_Int        j, jl, jj, jj1;
    HYPRE_Int        kc;
    HYPRE_BigInt     big_k;
    HYPRE_Int        start;
@@ -2711,16 +2761,16 @@ hypre_BoomerAMGBuildInterpModUnk( hypre_ParCSRMatrix   *A,
    HYPRE_Int local_numrows = hypre_CSRMatrixNumRows(A_diag);
    HYPRE_BigInt col_n = col_1 + local_numrows;
 
-   HYPRE_Real       wall_time;  /* for debugging instrumentation  */
+   HYPRE_Real       wall_time = 0.0;  /* for debugging instrumentation  */
 
    hypre_MPI_Comm_size(comm, &num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_rank(comm, &my_id);
    num_threads = hypre_NumThreads();
 
 
    //my_first_cpt = num_cpts_global[0];
-   if (my_id == (num_procs -1)) total_global_cpts = num_cpts_global[1];
-   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
+   if (my_id == (num_procs - 1)) { total_global_cpts = num_cpts_global[1]; }
+   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
 
    /*-------------------------------------------------------------------
     * Get the CF_marker data for the off-processor columns
@@ -2732,11 +2782,13 @@ hypre_BoomerAMGBuildInterpModUnk( hypre_ParCSRMatrix   *A,
       print_level = 1;
    }
 
-   if (debug_flag==4) wall_time = time_getWallclockSeconds();
+   if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
 
-   if (num_cols_A_offd) CF_marker_offd = hypre_CTAlloc(HYPRE_Int, num_cols_A_offd, HYPRE_MEMORY_HOST);
+   if (num_cols_A_offd) { CF_marker_offd = hypre_CTAlloc(HYPRE_Int, num_cols_A_offd, HYPRE_MEMORY_HOST); }
    if (num_functions > 1 && num_cols_A_offd)
+   {
       dof_func_offd = hypre_CTAlloc(HYPRE_Int, num_cols_A_offd, HYPRE_MEMORY_HOST);
+   }
 
    if (!comm_pkg)
    {
@@ -2746,19 +2798,19 @@ hypre_BoomerAMGBuildInterpModUnk( hypre_ParCSRMatrix   *A,
 
    num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
    int_buf_data = hypre_CTAlloc(HYPRE_Int,  hypre_ParCSRCommPkgSendMapStart(comm_pkg,
-            num_sends), HYPRE_MEMORY_HOST);
+                                                                            num_sends), HYPRE_MEMORY_HOST);
 
    index = 0;
    for (i = 0; i < num_sends; i++)
    {
       start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
          int_buf_data[index++]
-            = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+            = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
    }
 
    comm_handle = hypre_ParCSRCommHandleCreate( 11, comm_pkg, int_buf_data,
-         CF_marker_offd);
+                                               CF_marker_offd);
 
    hypre_ParCSRCommHandleDestroy(comm_handle);
    if (num_functions > 1)
@@ -2767,22 +2819,22 @@ hypre_BoomerAMGBuildInterpModUnk( hypre_ParCSRMatrix   *A,
       for (i = 0; i < num_sends; i++)
       {
          start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-         for (j=start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
             int_buf_data[index++]
-               = dof_func[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+               = dof_func[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
       }
 
       comm_handle = hypre_ParCSRCommHandleCreate( 11, comm_pkg, int_buf_data,
-            dof_func_offd);
+                                                  dof_func_offd);
 
       hypre_ParCSRCommHandleDestroy(comm_handle);
    }
 
-   if (debug_flag==4)
+   if (debug_flag == 4)
    {
       wall_time = time_getWallclockSeconds() - wall_time;
       hypre_printf("Proc = %d     Interp: Comm 1 CF_marker =    %f\n",
-            my_id, wall_time);
+                   my_id, wall_time);
       fflush(NULL);
    }
 
@@ -2790,20 +2842,20 @@ hypre_BoomerAMGBuildInterpModUnk( hypre_ParCSRMatrix   *A,
     * Get the ghost rows of A
     *---------------------------------------------------------------------*/
 
-   if (debug_flag==4) wall_time = time_getWallclockSeconds();
+   if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
 
    if (num_procs > 1)
    {
-      A_ext      = hypre_ParCSRMatrixExtractBExt(A,A,1);
+      A_ext      = hypre_ParCSRMatrixExtractBExt(A, A, 1);
       A_ext_i    = hypre_CSRMatrixI(A_ext);
       A_ext_j    = hypre_CSRMatrixBigJ(A_ext);
       A_ext_data = hypre_CSRMatrixData(A_ext);
    }
 
    index = 0;
-   for (i=0; i < num_cols_A_offd; i++)
+   for (i = 0; i < num_cols_A_offd; i++)
    {
-      for (j=A_ext_i[i]; j < A_ext_i[i+1]; j++)
+      for (j = A_ext_i[i]; j < A_ext_i[i + 1]; j++)
       {
          big_k = A_ext_j[j];
          if (big_k >= col_1 && big_k < col_n)
@@ -2813,10 +2865,10 @@ hypre_BoomerAMGBuildInterpModUnk( hypre_ParCSRMatrix   *A,
          }
          else
          {
-            kc = hypre_BigBinarySearch(col_map_offd,big_k,num_cols_A_offd);
+            kc = hypre_BigBinarySearch(col_map_offd, big_k, num_cols_A_offd);
             if (kc > -1)
             {
-               A_ext_j[index] = (HYPRE_BigInt)(-kc-1);
+               A_ext_j[index] = (HYPRE_BigInt)(-kc - 1);
                A_ext_data[index++] = A_ext_data[j];
             }
          }
@@ -2824,14 +2876,16 @@ hypre_BoomerAMGBuildInterpModUnk( hypre_ParCSRMatrix   *A,
       A_ext_i[i] = index;
    }
    for (i = num_cols_A_offd; i > 0; i--)
-      A_ext_i[i] = A_ext_i[i-1];
-   if (num_procs > 1) A_ext_i[0] = 0;
+   {
+      A_ext_i[i] = A_ext_i[i - 1];
+   }
+   if (num_procs > 1) { A_ext_i[0] = 0; }
 
-   if (debug_flag==4)
+   if (debug_flag == 4)
    {
       wall_time = time_getWallclockSeconds() - wall_time;
       hypre_printf("Proc = %d  Interp: Comm 2   Get A_ext =  %f\n",
-            my_id, wall_time);
+                   my_id, wall_time);
       fflush(NULL);
    }
 
@@ -2850,9 +2904,9 @@ hypre_BoomerAMGBuildInterpModUnk( hypre_ParCSRMatrix   *A,
 
    fine_to_coarse = hypre_CTAlloc(HYPRE_Int,  n_fine, HYPRE_MEMORY_HOST);
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-   for (i = 0; i < n_fine; i++) fine_to_coarse[i] = -1;
+   for (i = 0; i < n_fine; i++) { fine_to_coarse[i] = -1; }
 
    jj_counter = start_indexing;
    jj_counter_offd = start_indexing;
@@ -2863,21 +2917,21 @@ hypre_BoomerAMGBuildInterpModUnk( hypre_ParCSRMatrix   *A,
 
    /* RDF: this looks a little tricky, but doable */
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i,j,i1,jj,ns,ne,size,rest) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i,j,i1,jj,ns,ne,size,rest) HYPRE_SMP_SCHEDULE
 #endif
    for (j = 0; j < num_threads; j++)
    {
-      size = n_fine/num_threads;
-      rest = n_fine - size*num_threads;
+      size = n_fine / num_threads;
+      rest = n_fine - size * num_threads;
       if (j < rest)
       {
-         ns = j*size+j;
-         ne = (j+1)*size+j+1;
+         ns = j * size + j;
+         ne = (j + 1) * size + j + 1;
       }
       else
       {
-         ns = j*size+rest;
-         ne = (j+1)*size+rest;
+         ns = j * size + rest;
+         ne = (j + 1) * size + rest;
       }
       for (i = ns; i < ne; i++)
       {
@@ -2901,7 +2955,7 @@ hypre_BoomerAMGBuildInterpModUnk( hypre_ParCSRMatrix   *A,
 
          else
          {
-            for (jj = S_diag_i[i]; jj < S_diag_i[i+1]; jj++)
+            for (jj = S_diag_i[i]; jj < S_diag_i[i + 1]; jj++)
             {
                i1 = S_diag_j[jj];
                if (CF_marker[i1] >= 0)
@@ -2912,7 +2966,7 @@ hypre_BoomerAMGBuildInterpModUnk( hypre_ParCSRMatrix   *A,
 
             if (num_procs > 1)
             {
-               for (jj = S_offd_i[i]; jj < S_offd_i[i+1]; jj++)
+               for (jj = S_offd_i[i]; jj < S_offd_i[i + 1]; jj++)
                {
                   i1 = S_offd_j[jj];
                   if (CF_marker_offd[i1] >= 0)
@@ -2929,19 +2983,19 @@ hypre_BoomerAMGBuildInterpModUnk( hypre_ParCSRMatrix   *A,
     *  Allocate  arrays.
     *-----------------------------------------------------------------------*/
 
-   for (i=0; i < num_threads-1; i++)
+   for (i = 0; i < num_threads - 1; i++)
    {
-      coarse_counter[i+1] += coarse_counter[i];
-      jj_count[i+1] += jj_count[i];
-      jj_count_offd[i+1] += jj_count_offd[i];
+      coarse_counter[i + 1] += coarse_counter[i];
+      jj_count[i + 1] += jj_count[i];
+      jj_count_offd[i + 1] += jj_count_offd[i];
    }
-   i = num_threads-1;
+   i = num_threads - 1;
    jj_counter = jj_count[i];
    jj_counter_offd = jj_count_offd[i];
 
    P_diag_size = jj_counter;
 
-   P_diag_i    = hypre_CTAlloc(HYPRE_Int,  n_fine+1, HYPRE_MEMORY_HOST);
+   P_diag_i    = hypre_CTAlloc(HYPRE_Int,  n_fine + 1, HYPRE_MEMORY_HOST);
    P_diag_j    = hypre_CTAlloc(HYPRE_Int,  P_diag_size, HYPRE_MEMORY_HOST);
    P_diag_data = hypre_CTAlloc(HYPRE_Real,  P_diag_size, HYPRE_MEMORY_HOST);
 
@@ -2949,7 +3003,7 @@ hypre_BoomerAMGBuildInterpModUnk( hypre_ParCSRMatrix   *A,
 
    P_offd_size = jj_counter_offd;
 
-   P_offd_i    = hypre_CTAlloc(HYPRE_Int,  n_fine+1, HYPRE_MEMORY_HOST);
+   P_offd_i    = hypre_CTAlloc(HYPRE_Int,  n_fine + 1, HYPRE_MEMORY_HOST);
    P_offd_j    = hypre_CTAlloc(HYPRE_Int,  P_offd_size, HYPRE_MEMORY_HOST);
    P_offd_data = hypre_CTAlloc(HYPRE_Real,  P_offd_size, HYPRE_MEMORY_HOST);
 
@@ -2960,11 +3014,11 @@ hypre_BoomerAMGBuildInterpModUnk( hypre_ParCSRMatrix   *A,
    jj_counter = start_indexing;
    jj_counter_offd = start_indexing;
 
-   if (debug_flag==4)
+   if (debug_flag == 4)
    {
       wall_time = time_getWallclockSeconds() - wall_time;
       hypre_printf("Proc = %d     Interp: Internal work 1 =     %f\n",
-            my_id, wall_time);
+                   my_id, wall_time);
       fflush(NULL);
    }
 
@@ -2972,31 +3026,33 @@ hypre_BoomerAMGBuildInterpModUnk( hypre_ParCSRMatrix   *A,
     *  Send and receive fine_to_coarse info.
     *-----------------------------------------------------------------------*/
 
-   if (debug_flag==4) wall_time = time_getWallclockSeconds();
+   if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
 
    //fine_to_coarse_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_A_offd, HYPRE_MEMORY_HOST);
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i,j,ns,ne,size,rest,coarse_shift) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i,j,ns,ne,size,rest,coarse_shift) HYPRE_SMP_SCHEDULE
 #endif
    for (j = 0; j < num_threads; j++)
    {
       coarse_shift = 0;
-      if (j > 0) coarse_shift = coarse_counter[j-1];
-      size = n_fine/num_threads;
-      rest = n_fine - size*num_threads;
+      if (j > 0) { coarse_shift = coarse_counter[j - 1]; }
+      size = n_fine / num_threads;
+      rest = n_fine - size * num_threads;
       if (j < rest)
       {
-         ns = j*size+j;
-         ne = (j+1)*size+j+1;
+         ns = j * size + j;
+         ne = (j + 1) * size + j + 1;
       }
       else
       {
-         ns = j*size+rest;
-         ne = (j+1)*size+rest;
+         ns = j * size + rest;
+         ne = (j + 1) * size + rest;
       }
       for (i = ns; i < ne; i++)
+      {
          fine_to_coarse[i] += coarse_shift;
+      }
    }
    /*index = 0;
      for (i = 0; i < num_sends; i++)
@@ -3020,44 +3076,48 @@ hypre_BoomerAMGBuildInterpModUnk( hypre_ParCSRMatrix   *A,
      fflush(NULL);
      }*/
 
-   if (debug_flag==4) wall_time = time_getWallclockSeconds();
+   if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
 
    /*#ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
-#endif
-for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;*/
+   #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+   #endif
+   for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;*/
 
    /*-----------------------------------------------------------------------
     *  Loop over fine grid points.
     *-----------------------------------------------------------------------*/
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i,j,jl,i1,i2,jj,jj1,ns,ne,size,rest,sum,diagonal,distribute,P_marker,P_marker_offd,strong_f_marker,jj_counter,jj_counter_offd,sgn,c_num,jj_begin_row,jj_end_row,jj_begin_row_offd,jj_end_row_offd) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i,j,jl,i1,i2,jj,jj1,ns,ne,size,rest,sum,diagonal,distribute,P_marker,P_marker_offd,strong_f_marker,jj_counter,jj_counter_offd,sgn,c_num,jj_begin_row,jj_end_row,jj_begin_row_offd,jj_end_row_offd) HYPRE_SMP_SCHEDULE
 #endif
    for (jl = 0; jl < num_threads; jl++)
    {
-      size = n_fine/num_threads;
-      rest = n_fine - size*num_threads;
+      size = n_fine / num_threads;
+      rest = n_fine - size * num_threads;
       if (jl < rest)
       {
-         ns = jl*size+jl;
-         ne = (jl+1)*size+jl+1;
+         ns = jl * size + jl;
+         ne = (jl + 1) * size + jl + 1;
       }
       else
       {
-         ns = jl*size+rest;
-         ne = (jl+1)*size+rest;
+         ns = jl * size + rest;
+         ne = (jl + 1) * size + rest;
       }
       jj_counter = 0;
-      if (jl > 0) jj_counter = jj_count[jl-1];
+      if (jl > 0) { jj_counter = jj_count[jl - 1]; }
       jj_counter_offd = 0;
-      if (jl > 0) jj_counter_offd = jj_count_offd[jl-1];
+      if (jl > 0) { jj_counter_offd = jj_count_offd[jl - 1]; }
 
       P_marker = hypre_CTAlloc(HYPRE_Int,  n_fine, HYPRE_MEMORY_HOST);
       if (num_cols_A_offd)
+      {
          P_marker_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_A_offd, HYPRE_MEMORY_HOST);
+      }
       else
+      {
          P_marker_offd = NULL;
+      }
 
       for (i = 0; i < n_fine; i++)
       {
@@ -3094,7 +3154,7 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;*/
             P_diag_i[i] = jj_counter;
             jj_begin_row = jj_counter;
 
-            for (jj = S_diag_i[i]; jj < S_diag_i[i+1]; jj++)
+            for (jj = S_diag_i[i]; jj < S_diag_i[i + 1]; jj++)
             {
                i1 = S_diag_j[jj];
 
@@ -3130,7 +3190,7 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;*/
 
             if (num_procs > 1)
             {
-               for (jj = S_offd_i[i]; jj < S_offd_i[i+1]; jj++)
+               for (jj = S_offd_i[i]; jj < S_offd_i[i + 1]; jj++)
                {
                   i1 = S_offd_j[jj];
 
@@ -3167,7 +3227,7 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;*/
 
             /* Loop over ith row of A.  First, the diagonal part of A */
 
-            for (jj = A_diag_i[i]+1; jj < A_diag_i[i+1]; jj++)
+            for (jj = A_diag_i[i] + 1; jj < A_diag_i[i + 1]; jj++)
             {
                i1 = A_diag_j[jj];
 
@@ -3199,16 +3259,16 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;*/
                    * of the connections to c-points that strongly influence i.
                    *-----------------------------------------------------------*/
                   sgn = 1;
-                  if (A_diag_data[A_diag_i[i1]] < 0) sgn = -1;
+                  if (A_diag_data[A_diag_i[i1]] < 0) { sgn = -1; }
                   /* Diagonal block part of row i1 */
-                  for (jj1 = A_diag_i[i1]; jj1 < A_diag_i[i1+1]; jj1++)
+                  for (jj1 = A_diag_i[i1]; jj1 < A_diag_i[i1 + 1]; jj1++)
                   {
                      i2 = A_diag_j[jj1];
                      if (num_functions == 1 || dof_func[i1] == dof_func[i2])
                      {
 
                         if (P_marker[i2] >= jj_begin_row &&
-                              (sgn*A_diag_data[jj1]) < 0 )
+                            (sgn * A_diag_data[jj1]) < 0 )
                         {
                            sum += A_diag_data[jj1];
                         }
@@ -3219,13 +3279,13 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;*/
                   /* Off-Diagonal block part of row i1 */
                   if (num_procs > 1)
                   {
-                     for (jj1 = A_offd_i[i1]; jj1 < A_offd_i[i1+1]; jj1++)
+                     for (jj1 = A_offd_i[i1]; jj1 < A_offd_i[i1 + 1]; jj1++)
                      {
                         i2 = A_offd_j[jj1];
                         if (num_functions == 1 || dof_func[i1] == dof_func[i2])
                         {
                            if (P_marker_offd[i2] >= jj_begin_row_offd
-                                 && (sgn*A_offd_data[jj1]) < 0)
+                               && (sgn * A_offd_data[jj1]) < 0)
                            {
                               sum += A_offd_data[jj1];
                            }
@@ -3242,16 +3302,16 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;*/
                       *-----------------------------------------------------------*/
 
                      /* Diagonal block part of row i1 */
-                     for (jj1 = A_diag_i[i1]; jj1 < A_diag_i[i1+1]; jj1++)
+                     for (jj1 = A_diag_i[i1]; jj1 < A_diag_i[i1 + 1]; jj1++)
                      {
                         i2 = A_diag_j[jj1];
                         if (num_functions == 1 || dof_func[i1] == dof_func[i2])
                         {
                            if (P_marker[i2] >= jj_begin_row
-                                 && (sgn*A_diag_data[jj1]) < 0)
+                               && (sgn * A_diag_data[jj1]) < 0)
                            {
                               P_diag_data[P_marker[i2]]
-                                 += distribute * A_diag_data[jj1];
+                              += distribute * A_diag_data[jj1];
                            }
                         }
 
@@ -3260,16 +3320,16 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;*/
                      /* Off-Diagonal block part of row i1 */
                      if (num_procs > 1)
                      {
-                        for (jj1 = A_offd_i[i1]; jj1 < A_offd_i[i1+1]; jj1++)
+                        for (jj1 = A_offd_i[i1]; jj1 < A_offd_i[i1 + 1]; jj1++)
                         {
                            i2 = A_offd_j[jj1];
                            if (num_functions == 1 || dof_func[i1] == dof_func[i2])
                            {
                               if (P_marker_offd[i2] >= jj_begin_row_offd
-                                    && (sgn*A_offd_data[jj1]) < 0)
+                                  && (sgn * A_offd_data[jj1]) < 0)
                               {
                                  P_offd_data[P_marker_offd[i2]]
-                                    += distribute * A_offd_data[jj1];
+                                 += distribute * A_offd_data[jj1];
                               }
                            }
                         }
@@ -3279,7 +3339,9 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;*/
                   else /* sum = 0 - only add to diag if the same function type */
                   {
                      if (num_functions == 1 || dof_func[i] == dof_func[i1])
+                     {
                         diagonal += A_diag_data[jj];
+                     }
                   }
                }
 
@@ -3291,7 +3353,9 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;*/
                else if (CF_marker[i1] != -3)
                {
                   if (num_functions == 1 || dof_func[i] == dof_func[i1])
+                  {
                      diagonal += A_diag_data[jj];
+                  }
                }
 
             }
@@ -3304,7 +3368,7 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;*/
 
             if (num_procs > 1)
             {
-               for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+               for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
                {
                   i1 = A_offd_j[jj];
 
@@ -3340,8 +3404,8 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;*/
                      c_num = A_offd_j[jj];
 
                      sgn = 1;
-                     if (A_ext_data[A_ext_i[c_num]] < 0) sgn = -1;
-                     for (jj1 = A_ext_i[c_num]; jj1 < A_ext_i[c_num+1]; jj1++)
+                     if (A_ext_data[A_ext_i[c_num]] < 0) { sgn = -1; }
+                     for (jj1 = A_ext_i[c_num]; jj1 < A_ext_i[c_num + 1]; jj1++)
                      {
                         i2 = (HYPRE_Int)A_ext_j[jj1];
                         if (num_functions == 1 || dof_func[i1] == dof_func[i2])
@@ -3350,7 +3414,7 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;*/
                            {
                               /* in the diagonal block */
                               if (P_marker[i2] >= jj_begin_row
-                                    && (sgn*A_ext_data[jj1]) < 0)
+                                  && (sgn * A_ext_data[jj1]) < 0)
                               {
                                  sum += A_ext_data[jj1];
                               }
@@ -3358,8 +3422,8 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;*/
                            else
                            {
                               /* in the off_diagonal block  */
-                              if (P_marker_offd[-i2-1] >= jj_begin_row_offd
-                                    && (sgn*A_ext_data[jj1]) < 0)
+                              if (P_marker_offd[-i2 - 1] >= jj_begin_row_offd
+                                  && (sgn * A_ext_data[jj1]) < 0)
                               {
                                  sum += A_ext_data[jj1];
                               }
@@ -3377,7 +3441,7 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;*/
 
                         /* Diagonal block part of row i1 */
 
-                        for (jj1 = A_ext_i[c_num]; jj1 < A_ext_i[c_num+1]; jj1++)
+                        for (jj1 = A_ext_i[c_num]; jj1 < A_ext_i[c_num + 1]; jj1++)
                         {
                            i2 = (HYPRE_Int)A_ext_j[jj1];
                            if (num_functions == 1 || dof_func[i1] == dof_func[i2])
@@ -3385,19 +3449,19 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;*/
                               if (i2 > -1) /* in the diagonal block */
                               {
                                  if (P_marker[i2] >= jj_begin_row
-                                       && (sgn*A_ext_data[jj1]) < 0)
+                                     && (sgn * A_ext_data[jj1]) < 0)
                                  {
                                     P_diag_data[P_marker[i2]]
-                                       += distribute * A_ext_data[jj1];
+                                    += distribute * A_ext_data[jj1];
                                  }
                               }
                               else
                               {
                                  /* in the off_diagonal block  */
-                                 if (P_marker_offd[-i2-1] >= jj_begin_row_offd
-                                       && (sgn*A_ext_data[jj1]) < 0)
-                                    P_offd_data[P_marker_offd[-i2-1]]
-                                       += distribute * A_ext_data[jj1];
+                                 if (P_marker_offd[-i2 - 1] >= jj_begin_row_offd
+                                     && (sgn * A_ext_data[jj1]) < 0)
+                                    P_offd_data[P_marker_offd[-i2 - 1]]
+                                    += distribute * A_ext_data[jj1];
                               }
                            }
                         }
@@ -3405,7 +3469,9 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;*/
                      else /* sum = 0 */
                      {
                         if (num_functions == 1 || dof_func[i] == dof_func_offd[i1])
+                        {
                            diagonal += A_offd_data[jj];
+                        }
                      }
                   }
 
@@ -3417,7 +3483,9 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;*/
                   else if (CF_marker_offd[i1] != -3)
                   {
                      if (num_functions == 1 || dof_func[i] == dof_func_offd[i1])
+                     {
                         diagonal += A_offd_data[jj];
+                     }
                   }
 
                }
@@ -3430,7 +3498,9 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;*/
             if (diagonal == 0.0)
             {
                if (print_level)
-                  hypre_printf(" Warning! zero diagonal! Proc id %d row %d\n", my_id,i);
+               {
+                  hypre_printf(" Warning! zero diagonal! Proc id %d row %d\n", my_id, i);
+               }
                for (jj = jj_begin_row; jj < jj_end_row; jj++)
                {
                   P_diag_data[jj] = 0.0;
@@ -3455,20 +3525,20 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;*/
 
          strong_f_marker--;
 
-         P_offd_i[i+1] = jj_counter_offd;
+         P_offd_i[i + 1] = jj_counter_offd;
       }
       hypre_TFree(P_marker, HYPRE_MEMORY_HOST);
       hypre_TFree(P_marker_offd, HYPRE_MEMORY_HOST);
    }
 
    P = hypre_ParCSRMatrixCreate(comm,
-         hypre_ParCSRMatrixGlobalNumRows(A),
-         total_global_cpts,
-         hypre_ParCSRMatrixColStarts(A),
-         num_cpts_global,
-         0,
-         P_diag_i[n_fine],
-         P_offd_i[n_fine]);
+                                hypre_ParCSRMatrixGlobalNumRows(A),
+                                total_global_cpts,
+                                hypre_ParCSRMatrixColStarts(A),
+                                num_cpts_global,
+                                0,
+                                P_diag_i[n_fine],
+                                P_offd_i[n_fine]);
 
    P_diag = hypre_ParCSRMatrixDiag(P);
    hypre_CSRMatrixData(P_diag) = P_diag_data;
@@ -3500,13 +3570,15 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;*/
       P_marker = hypre_CTAlloc(HYPRE_Int,  num_cols_A_offd, HYPRE_MEMORY_HOST);
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-      for (i=0; i < num_cols_A_offd; i++)
+      for (i = 0; i < num_cols_A_offd; i++)
+      {
          P_marker[i] = 0;
+      }
 
       num_cols_P_offd = 0;
-      for (i=0; i < P_offd_size; i++)
+      for (i = 0; i < P_offd_size; i++)
       {
          index = P_offd_j[i];
          if (!P_marker[index])
@@ -3520,24 +3592,24 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;*/
       tmp_map_offd = hypre_CTAlloc(HYPRE_Int, num_cols_P_offd, HYPRE_MEMORY_HOST);
 
       index = 0;
-      for (i=0; i < num_cols_P_offd; i++)
+      for (i = 0; i < num_cols_P_offd; i++)
       {
-         while (P_marker[index]==0) index++;
+         while (P_marker[index] == 0) { index++; }
          tmp_map_offd[i] = index++;
       }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-      for (i=0; i < P_offd_size; i++)
+      for (i = 0; i < P_offd_size; i++)
          P_offd_j[i] = hypre_BinarySearch(tmp_map_offd,
-               P_offd_j[i],
-               num_cols_P_offd);
+                                          P_offd_j[i],
+                                          num_cols_P_offd);
       hypre_TFree(P_marker, HYPRE_MEMORY_HOST);
    }
 
-   for (i=0; i < n_fine; i++)
-      if (CF_marker[i] == -3) CF_marker[i] = -1;
+   for (i = 0; i < n_fine; i++)
+      if (CF_marker[i] == -3) { CF_marker[i] = -1; }
 
    if (num_cols_P_offd)
    {
@@ -3558,11 +3630,9 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;*/
    hypre_TFree(coarse_counter, HYPRE_MEMORY_HOST);
    hypre_TFree(jj_count, HYPRE_MEMORY_HOST);
    hypre_TFree(jj_count_offd, HYPRE_MEMORY_HOST);
-
-   if (num_procs > 1) hypre_CSRMatrixDestroy(A_ext);
+   hypre_CSRMatrixDestroy(A_ext);
 
    return hypre_error_flag;
-
 }
 
 /*---------------------------------------------------------------------------
@@ -3571,8 +3641,8 @@ for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;*/
 
 HYPRE_Int
 hypre_BoomerAMGTruncandBuild( hypre_ParCSRMatrix   *P,
-                         HYPRE_Real                trunc_factor,
-                         HYPRE_Int                 max_elmts)
+                              HYPRE_Real                trunc_factor,
+                              HYPRE_Int                 max_elmts)
 {
    hypre_CSRMatrix *P_offd = hypre_ParCSRMatrixOffd(P);
    hypre_ParCSRCommPkg   *commpkg_P = hypre_ParCSRMatrixCommPkg(P);
@@ -3585,7 +3655,7 @@ hypre_BoomerAMGTruncandBuild( hypre_ParCSRMatrix   *P,
    HYPRE_BigInt          *new_col_map_offd;
    HYPRE_Int             *tmp_map_offd = NULL;
 
-   HYPRE_Int              P_offd_size=0, new_num_cols_offd;
+   HYPRE_Int              P_offd_size = 0, new_num_cols_offd;
 
    HYPRE_Int             *P_marker;
 
@@ -3609,11 +3679,13 @@ hypre_BoomerAMGTruncandBuild( hypre_ParCSRMatrix   *P,
       P_marker = hypre_CTAlloc(HYPRE_Int,  num_cols_offd, HYPRE_MEMORY_HOST);
 
       /*#define HYPRE_SMP_PRIVATE i
-#include "../utilities/hypre_smp_forloop.h"*/
-      for (i=0; i < num_cols_offd; i++)
+      #include "../utilities/hypre_smp_forloop.h"*/
+      for (i = 0; i < num_cols_offd; i++)
+      {
          P_marker[i] = 0;
+      }
 
-      for (i=0; i < P_offd_size; i++)
+      for (i = 0; i < P_offd_size; i++)
       {
          index = P_offd_j[i];
          if (!P_marker[index])
@@ -3627,30 +3699,30 @@ hypre_BoomerAMGTruncandBuild( hypre_ParCSRMatrix   *P,
       new_col_map_offd = hypre_CTAlloc(HYPRE_BigInt, new_num_cols_offd, HYPRE_MEMORY_HOST);
 
       index = 0;
-      for (i=0; i < new_num_cols_offd; i++)
+      for (i = 0; i < new_num_cols_offd; i++)
       {
-         while (P_marker[index]==0) index++;
+         while (P_marker[index] == 0) { index++; }
          tmp_map_offd[i] = index++;
       }
 
       /*#define HYPRE_SMP_PRIVATE i
-#include "../utilities/hypre_smp_forloop.h"*/
-      for (i=0; i < P_offd_size; i++)
+      #include "../utilities/hypre_smp_forloop.h"*/
+      for (i = 0; i < P_offd_size; i++)
          P_offd_j[i] = hypre_BinarySearch(tmp_map_offd,
-               P_offd_j[i],
-               new_num_cols_offd);
+                                          P_offd_j[i],
+                                          new_num_cols_offd);
    }
 
    index = 0;
    for (i = 0; i < new_num_cols_offd; i++)
    {
-      while (P_marker[index] == 0) index++;
+      while (P_marker[index] == 0) { index++; }
 
       new_col_map_offd[i] = col_map_offd[index];
       index++;
    }
 
-   if (P_offd_size) hypre_TFree(P_marker, HYPRE_MEMORY_HOST);
+   if (P_offd_size) { hypre_TFree(P_marker, HYPRE_MEMORY_HOST); }
 
    if (new_num_cols_offd)
    {
@@ -3660,7 +3732,7 @@ hypre_BoomerAMGTruncandBuild( hypre_ParCSRMatrix   *P,
       hypre_CSRMatrixNumCols(P_offd) = new_num_cols_offd;
    }
 
-   if (commpkg_P != NULL) hypre_MatvecCommPkgDestroy(commpkg_P);
+   if (commpkg_P != NULL) { hypre_MatvecCommPkgDestroy(commpkg_P); }
    hypre_MatvecCommPkgCreate(P);
 
    return hypre_error_flag;
@@ -3708,7 +3780,7 @@ hypre_ParCSRMatrix *hypre_CreateC( hypre_ParCSRMatrix  *A,
    HYPRE_Real  w_local = w;
 
    C = hypre_ParCSRMatrixCreate(comm, global_num_rows, global_num_rows, row_starts,
-         row_starts, num_cols_offd, A_diag_i[num_rows], A_offd_i[num_rows]);
+                                row_starts, num_cols_offd, A_diag_i[num_rows], A_offd_i[num_rows]);
 
    hypre_ParCSRMatrixInitialize(C);
 
@@ -3733,29 +3805,33 @@ hypre_ParCSRMatrix *hypre_CreateC( hypre_ParCSRMatrix  *A,
    for (i = 0; i < num_rows; i++)
    {
       index = A_diag_i[i];
-      invdiag = -w/A_diag_data[index];
-      C_diag_data[index] = 1.0-w;
+      invdiag = -w / A_diag_data[index];
+      C_diag_data[index] = 1.0 - w;
       C_diag_j[index] = A_diag_j[index];
       if (w == 0)
       {
-         w_local = fabs(A_diag_data[index]);
-         for (j = index+1; j < A_diag_i[i+1]; j++)
-            w_local += fabs(A_diag_data[j]);
-         for (j = A_offd_i[i]; j < A_offd_i[i+1]; j++)
-            w_local += fabs(A_offd_data[j]);
-         invdiag = -1/w_local;
-         C_diag_data[index] = 1.0-A_diag_data[index]/w_local;
+         w_local = hypre_abs(A_diag_data[index]);
+         for (j = index + 1; j < A_diag_i[i + 1]; j++)
+         {
+            w_local += hypre_abs(A_diag_data[j]);
+         }
+         for (j = A_offd_i[i]; j < A_offd_i[i + 1]; j++)
+         {
+            w_local += hypre_abs(A_offd_data[j]);
+         }
+         invdiag = -1 / w_local;
+         C_diag_data[index] = 1.0 - A_diag_data[index] / w_local;
       }
       C_diag_i[i] = index;
       C_offd_i[i] = A_offd_i[i];
-      for (j = index+1; j < A_diag_i[i+1]; j++)
+      for (j = index + 1; j < A_diag_i[i + 1]; j++)
       {
-         C_diag_data[j] = A_diag_data[j]*invdiag;
+         C_diag_data[j] = A_diag_data[j] * invdiag;
          C_diag_j[j] = A_diag_j[j];
       }
-      for (j = A_offd_i[i]; j < A_offd_i[i+1]; j++)
+      for (j = A_offd_i[i]; j < A_offd_i[i + 1]; j++)
       {
-         C_offd_data[j] = A_offd_data[j]*invdiag;
+         C_offd_data[j] = A_offd_data[j] * invdiag;
          C_offd_j[j] = A_offd_j[j];
       }
    }
@@ -3776,10 +3852,14 @@ hypre_BoomerAMGBuildInterpOnePntHost( hypre_ParCSRMatrix  *A,
                                       HYPRE_Int            debug_flag,
                                       hypre_ParCSRMatrix **P_ptr)
 {
+   HYPRE_UNUSED_VAR(debug_flag);
+
    MPI_Comm                 comm     = hypre_ParCSRMatrixComm(A);
    hypre_ParCSRCommPkg     *comm_pkg = hypre_ParCSRMatrixCommPkg(A);
    hypre_ParCSRCommHandle  *comm_handle;
 
+   HYPRE_MemoryLocation memory_location_P = hypre_ParCSRMatrixMemoryLocation(A);
+
    hypre_CSRMatrix         *A_diag      = hypre_ParCSRMatrixDiag(A);
    HYPRE_Real              *A_diag_data = hypre_CSRMatrixData(A_diag);
    HYPRE_Int               *A_diag_i    = hypre_CSRMatrixI(A_diag);
@@ -3844,11 +3924,11 @@ hypre_BoomerAMGBuildInterpOnePntHost( hypre_ParCSRMatrix  *A,
    HYPRE_Real          max_abs_aij, vv;
 
    hypre_MPI_Comm_size(comm, &num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_rank(comm, &my_id);
 
    my_first_cpt = num_cpts_global[0];
-   if (my_id == (num_procs -1)) total_global_cpts = num_cpts_global[1];
-   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
+   if (my_id == (num_procs - 1)) { total_global_cpts = num_cpts_global[1]; }
+   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
 
    /*-------------------------------------------------------------------
     * Get the CF_marker data for the off-processor columns
@@ -3856,12 +3936,12 @@ hypre_BoomerAMGBuildInterpOnePntHost( hypre_ParCSRMatrix  *A,
    /* CF marker for the off-diag columns */
    if (num_cols_A_offd)
    {
-      CF_marker_offd = hypre_CTAlloc(HYPRE_Int, num_cols_A_offd,HYPRE_MEMORY_HOST);
+      CF_marker_offd = hypre_CTAlloc(HYPRE_Int, num_cols_A_offd, HYPRE_MEMORY_HOST);
    }
    /* function type indicator for the off-diag columns */
    if (num_functions > 1 && num_cols_A_offd)
    {
-      dof_func_offd = hypre_CTAlloc(HYPRE_Int, num_cols_A_offd,HYPRE_MEMORY_HOST);
+      dof_func_offd = hypre_CTAlloc(HYPRE_Int, num_cols_A_offd, HYPRE_MEMORY_HOST);
    }
    /* if CommPkg of A is not present, create it */
    if (!comm_pkg)
@@ -3873,7 +3953,8 @@ hypre_BoomerAMGBuildInterpOnePntHost( hypre_ParCSRMatrix  *A,
    num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
    /* send buffer, of size send_map_starts[num_sends]),
     * i.e., number of entries to send */
-   int_buf_data = hypre_CTAlloc(HYPRE_Int, hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),HYPRE_MEMORY_HOST);
+   int_buf_data = hypre_CTAlloc(HYPRE_Int, hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                                HYPRE_MEMORY_HOST);
 
    /* copy CF markers of elements to send to buffer
     * RL: why copy them with two for loops? Why not just loop through all in one */
@@ -3883,10 +3964,10 @@ hypre_BoomerAMGBuildInterpOnePntHost( hypre_ParCSRMatrix  *A,
       /* start pos of elements sent to send_proc[i] */
       start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
       /* loop through all elems to send_proc[i] */
-      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
       {
          /* CF marker of send_map_elemts[j] */
-         int_buf_data[index++] = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+         int_buf_data[index++] = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
       }
    }
    /* create a handle to start communication. 11: for integer */
@@ -3901,16 +3982,16 @@ hypre_BoomerAMGBuildInterpOnePntHost( hypre_ParCSRMatrix  *A,
       for (i = 0; i < num_sends; i++)
       {
          start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
          {
-            int_buf_data[index++] = dof_func[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+            int_buf_data[index++] = dof_func[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
          }
       }
       comm_handle = hypre_ParCSRCommHandleCreate(11, comm_pkg, int_buf_data, dof_func_offd);
       hypre_ParCSRCommHandleDestroy(comm_handle);
    }
 
-   hypre_TFree(int_buf_data,HYPRE_MEMORY_HOST);
+   hypre_TFree(int_buf_data, HYPRE_MEMORY_HOST);
    /*-----------------------------------------------------------------------
     *  First Pass: Determine size of P and fill in fine_to_coarse mapping,
     *  and find the most strongly influencing C-pt for each F-pt
@@ -3918,13 +3999,13 @@ hypre_BoomerAMGBuildInterpOnePntHost( hypre_ParCSRMatrix  *A,
    /* nnz in diag and offd parts */
    cnt_diag = 0;
    cnt_offd = 0;
-   max_abs_cij       = hypre_CTAlloc(HYPRE_Int, n_fine,HYPRE_MEMORY_HOST);
-   max_abs_diag_offd = hypre_CTAlloc(char, n_fine,HYPRE_MEMORY_HOST);
-   fine_to_coarse    = hypre_CTAlloc(HYPRE_Int, n_fine,HYPRE_MEMORY_HOST);
+   max_abs_cij       = hypre_CTAlloc(HYPRE_Int, n_fine, HYPRE_MEMORY_HOST);
+   max_abs_diag_offd = hypre_CTAlloc(char, n_fine, HYPRE_MEMORY_HOST);
+   fine_to_coarse    = hypre_CTAlloc(HYPRE_Int, n_fine, HYPRE_MEMORY_HOST);
 
    /* markers initialized as zeros */
-   marker_diag = hypre_CTAlloc(HYPRE_Int, n_fine,HYPRE_MEMORY_HOST);
-   marker_offd = hypre_CTAlloc(HYPRE_Int, num_cols_A_offd,HYPRE_MEMORY_HOST);
+   marker_diag = hypre_CTAlloc(HYPRE_Int, n_fine, HYPRE_MEMORY_HOST);
+   marker_offd = hypre_CTAlloc(HYPRE_Int, num_cols_A_offd, HYPRE_MEMORY_HOST);
 
    for (i = 0; i < n_fine; i++)
    {
@@ -3943,18 +4024,18 @@ hypre_BoomerAMGBuildInterpOnePntHost( hypre_ParCSRMatrix  *A,
       /* mark all the strong connections: in S */
       HYPRE_Int MARK = i + 1;
       /* loop through row i of S, diag part  */
-      for (j = S_diag_i[i]; j < S_diag_i[i+1]; j++)
+      for (j = S_diag_i[i]; j < S_diag_i[i + 1]; j++)
       {
          marker_diag[S_diag_j[j]] = MARK;
       }
       /* loop through row i of S, offd part  */
       if (num_procs > 1)
       {
-          for (j = S_offd_i[i]; j < S_offd_i[i+1]; j++)
-          {
-             j1 = S_offd_j[j];
-             marker_offd[j1] = MARK;
-          }
+         for (j = S_offd_i[i]; j < S_offd_i[i + 1]; j++)
+         {
+            j1 = S_offd_j[j];
+            marker_offd[j1] = MARK;
+         }
       }
 
       fine_to_coarse[i] = -1;
@@ -3967,10 +4048,10 @@ hypre_BoomerAMGBuildInterpOnePntHost( hypre_ParCSRMatrix  *A,
       /* max abs val */
       max_abs_aij = -1.0;
       /* loop through row i of A, diag part  */
-      for (j = A_diag_i[i]; j < A_diag_i[i+1]; j++)
+      for (j = A_diag_i[i]; j < A_diag_i[i + 1]; j++)
       {
          i1 = A_diag_j[j];
-         vv = fabs(A_diag_data[j]);
+         vv = hypre_abs(A_diag_data[j]);
 #if 0
          /* !!! this is a hack just for code verification purpose !!!
             it basically says:
@@ -4004,10 +4085,10 @@ hypre_BoomerAMGBuildInterpOnePntHost( hypre_ParCSRMatrix  *A,
       /* offd part */
       if (num_procs > 1)
       {
-         for (j = A_offd_i[i]; j < A_offd_i[i+1]; j++)
+         for (j = A_offd_i[i]; j < A_offd_i[i + 1]; j++)
          {
             i1 = A_offd_j[j];
-            vv = fabs(A_offd_data[j]);
+            vv = hypre_abs(A_offd_data[j]);
             if (CF_marker_offd[i1] >= 0 && marker_offd[i1] == MARK && vv > max_abs_aij)
             {
                /* mark it as an 'o' */
@@ -4034,15 +4115,15 @@ hypre_BoomerAMGBuildInterpOnePntHost( hypre_ParCSRMatrix  *A,
    nnz_offd = cnt_offd;
 
    /*------------- allocate arrays */
-   P_diag_i    = hypre_CTAlloc(HYPRE_Int,  n_fine+1,HYPRE_MEMORY_DEVICE);
-   P_diag_j    = hypre_CTAlloc(HYPRE_Int,  nnz_diag,HYPRE_MEMORY_DEVICE);
-   P_diag_data = hypre_CTAlloc(HYPRE_Real, nnz_diag,HYPRE_MEMORY_DEVICE);
+   P_diag_i    = hypre_CTAlloc(HYPRE_Int,  n_fine + 1, memory_location_P);
+   P_diag_j    = hypre_CTAlloc(HYPRE_Int,  nnz_diag, memory_location_P);
+   P_diag_data = hypre_CTAlloc(HYPRE_Real, nnz_diag, memory_location_P);
 
    /* not in ``if num_procs > 1'',
     * allocation needed even for empty CSR */
-   P_offd_i    = hypre_CTAlloc(HYPRE_Int,  n_fine+1,HYPRE_MEMORY_DEVICE);
-   P_offd_j    = hypre_CTAlloc(HYPRE_Int,  nnz_offd,HYPRE_MEMORY_DEVICE);
-   P_offd_data = hypre_CTAlloc(HYPRE_Real, nnz_offd,HYPRE_MEMORY_DEVICE);
+   P_offd_i    = hypre_CTAlloc(HYPRE_Int,  n_fine + 1, memory_location_P);
+   P_offd_j    = hypre_CTAlloc(HYPRE_Int,  nnz_offd, memory_location_P);
+   P_offd_data = hypre_CTAlloc(HYPRE_Real, nnz_offd, memory_location_P);
 
    /* redundant */
    P_diag_i[0] = 0;
@@ -4055,16 +4136,17 @@ hypre_BoomerAMGBuildInterpOnePntHost( hypre_ParCSRMatrix  *A,
    /*-----------------------------------------------------------------------
     *  Send and receive fine_to_coarse info.
     *-----------------------------------------------------------------------*/
-   fine_to_coarse_offd = hypre_CTAlloc(HYPRE_BigInt, num_cols_A_offd,HYPRE_MEMORY_HOST);
-   big_int_buf_data = hypre_CTAlloc(HYPRE_BigInt, hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),HYPRE_MEMORY_HOST);
+   fine_to_coarse_offd = hypre_CTAlloc(HYPRE_BigInt, num_cols_A_offd, HYPRE_MEMORY_HOST);
+   big_int_buf_data = hypre_CTAlloc(HYPRE_BigInt, hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                                    HYPRE_MEMORY_HOST);
    index = 0;
    for (i = 0; i < num_sends; i++)
    {
       start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
       {
          big_int_buf_data[index++] = my_first_cpt
-               +(HYPRE_BigInt)fine_to_coarse[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+                                     + (HYPRE_BigInt)fine_to_coarse[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
       }
    }
    comm_handle = hypre_ParCSRCommHandleCreate(21, comm_pkg, big_int_buf_data, fine_to_coarse_offd);
@@ -4106,8 +4188,8 @@ hypre_BoomerAMGBuildInterpOnePntHost( hypre_ParCSRMatrix  *A,
          }
       }
 
-      P_diag_i[i+1] = cnt_diag;
-      P_offd_i[i+1] = cnt_offd;
+      P_diag_i[i + 1] = cnt_diag;
+      P_offd_i[i + 1] = cnt_offd;
    }
 
    hypre_assert(cnt_diag == nnz_diag);
@@ -4133,8 +4215,8 @@ hypre_BoomerAMGBuildInterpOnePntHost( hypre_ParCSRMatrix  *A,
 
    /* col_map_offd_P: the col indices of the offd of P
     * we first keep them be the offd-idx of A */
-   col_map_offd_P = hypre_CTAlloc(HYPRE_BigInt, num_cols_offd_P,HYPRE_MEMORY_HOST);
-   tmp_map_offd = hypre_CTAlloc(HYPRE_Int, num_cols_offd_P,HYPRE_MEMORY_HOST);
+   col_map_offd_P = hypre_CTAlloc(HYPRE_BigInt, num_cols_offd_P, HYPRE_MEMORY_HOST);
+   tmp_map_offd = hypre_CTAlloc(HYPRE_Int, num_cols_offd_P, HYPRE_MEMORY_HOST);
    for (i = 0, i1 = 0; i < num_cols_A_offd; i++)
    {
       if (marker_offd[i] == 1)
@@ -4189,16 +4271,16 @@ hypre_BoomerAMGBuildInterpOnePntHost( hypre_ParCSRMatrix  *A,
    *P_ptr = P;
 
    /* free workspace */
-   hypre_TFree(CF_marker_offd,HYPRE_MEMORY_HOST);
-   hypre_TFree(dof_func_offd,HYPRE_MEMORY_HOST);
-   hypre_TFree(tmp_map_offd,HYPRE_MEMORY_HOST);
-   hypre_TFree(big_int_buf_data,HYPRE_MEMORY_HOST);
-   hypre_TFree(fine_to_coarse,HYPRE_MEMORY_HOST);
-   hypre_TFree(fine_to_coarse_offd,HYPRE_MEMORY_HOST);
-   hypre_TFree(marker_diag,HYPRE_MEMORY_HOST);
-   hypre_TFree(marker_offd,HYPRE_MEMORY_HOST);
-   hypre_TFree(max_abs_cij,HYPRE_MEMORY_HOST);
-   hypre_TFree(max_abs_diag_offd,HYPRE_MEMORY_HOST);
+   hypre_TFree(CF_marker_offd, HYPRE_MEMORY_HOST);
+   hypre_TFree(dof_func_offd, HYPRE_MEMORY_HOST);
+   hypre_TFree(tmp_map_offd, HYPRE_MEMORY_HOST);
+   hypre_TFree(big_int_buf_data, HYPRE_MEMORY_HOST);
+   hypre_TFree(fine_to_coarse, HYPRE_MEMORY_HOST);
+   hypre_TFree(fine_to_coarse_offd, HYPRE_MEMORY_HOST);
+   hypre_TFree(marker_diag, HYPRE_MEMORY_HOST);
+   hypre_TFree(marker_offd, HYPRE_MEMORY_HOST);
+   hypre_TFree(max_abs_cij, HYPRE_MEMORY_HOST);
+   hypre_TFree(max_abs_diag_offd, HYPRE_MEMORY_HOST);
 
    return hypre_error_flag;
 }
@@ -4213,30 +4295,26 @@ hypre_BoomerAMGBuildInterpOnePnt( hypre_ParCSRMatrix  *A,
                                   HYPRE_Int            debug_flag,
                                   hypre_ParCSRMatrix **P_ptr)
 {
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    hypre_GpuProfilingPushRange("OnePntInterp");
-#endif
 
    HYPRE_Int ierr = 0;
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
    HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_ParCSRMatrixMemoryLocation(A) );
 
    if (exec == HYPRE_EXEC_DEVICE)
    {
-      ierr = hypre_BoomerAMGBuildInterpOnePntDevice(A,CF_marker,S,num_cpts_global,num_functions,
-                                                   dof_func,debug_flag,P_ptr);
+      ierr = hypre_BoomerAMGBuildInterpOnePntDevice(A, CF_marker, S, num_cpts_global, num_functions,
+                                                    dof_func, debug_flag, P_ptr);
    }
    else
 #endif
    {
-      ierr = hypre_BoomerAMGBuildInterpOnePntHost(A,CF_marker,S,num_cpts_global,num_functions,
-                                                   dof_func,debug_flag,P_ptr);
+      ierr = hypre_BoomerAMGBuildInterpOnePntHost(A, CF_marker, S, num_cpts_global, num_functions,
+                                                  dof_func, debug_flag, P_ptr);
    }
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    hypre_GpuProfilingPopRange();
-#endif
 
    return ierr;
 }
diff --git a/external/hypre/src/parcsr_ls/par_interp_device.c b/external/hypre/src/parcsr_ls/par_interp_device.c
index 714f8466..c6634142 100644
--- a/external/hypre/src/parcsr_ls/par_interp_device.c
+++ b/external/hypre/src/parcsr_ls/par_interp_device.c
@@ -1,23 +1,48 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
  ******************************************************************************/
 
+#include "_hypre_onedpl.hpp"
 #include "_hypre_parcsr_ls.h"
 #include "_hypre_utilities.hpp"
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-
-__global__ void hypre_BoomerAMGBuildDirInterp_getnnz( HYPRE_Int nr_of_rows, HYPRE_Int *S_diag_i, HYPRE_Int *S_diag_j, HYPRE_Int *S_offd_i, HYPRE_Int *S_offd_j, HYPRE_Int *CF_marker, HYPRE_Int *CF_marker_offd, HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int *dof_func_offd, HYPRE_Int *P_diag_i, HYPRE_Int *P_offd_i);
-
-__global__ void hypre_BoomerAMGBuildDirInterp_getcoef( HYPRE_Int nr_of_rows, HYPRE_Int *A_diag_i, HYPRE_Int *A_diag_j, HYPRE_Real *A_diag_data, HYPRE_Int *A_offd_i, HYPRE_Int *A_offd_j, HYPRE_Real *A_offd_data, HYPRE_Int *Soc_diag_j, HYPRE_Int *Soc_offd_j, HYPRE_Int *CF_marker, HYPRE_Int *CF_marker_offd, HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int *dof_func_offd, HYPRE_Int *P_diag_i, HYPRE_Int *P_diag_j, HYPRE_Real *P_diag_data, HYPRE_Int *P_offd_i, HYPRE_Int *P_offd_j, HYPRE_Real *P_offd_data, HYPRE_Int *fine_to_coarse );
-
-__global__ void hypre_BoomerAMGBuildDirInterp_getcoef_v2( HYPRE_Int nr_of_rows, HYPRE_Int *A_diag_i, HYPRE_Int *A_diag_j, HYPRE_Real *A_diag_data, HYPRE_Int *A_offd_i, HYPRE_Int *A_offd_j, HYPRE_Real *A_offd_data, HYPRE_Int *Soc_diag_j, HYPRE_Int *Soc_offd_j, HYPRE_Int *CF_marker, HYPRE_Int *CF_marker_offd, HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int *dof_func_offd, HYPRE_Int *P_diag_i, HYPRE_Int *P_diag_j, HYPRE_Real *P_diag_data, HYPRE_Int *P_offd_i, HYPRE_Int *P_offd_j, HYPRE_Real *P_offd_data, HYPRE_Int *fine_to_coarse );
+#if defined(HYPRE_USING_GPU)
+
+/* TODO (VPM): Rename to hypreGPUKernel_. Also, do we need these prototypes? */
+
+__global__ void hypre_BoomerAMGBuildDirInterp_getnnz( hypre_DeviceItem &item, HYPRE_Int nr_of_rows,
+                                                      HYPRE_Int *S_diag_i,
+                                                      HYPRE_Int *S_diag_j, HYPRE_Int *S_offd_i, HYPRE_Int *S_offd_j, HYPRE_Int *CF_marker,
+                                                      HYPRE_Int *CF_marker_offd, HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int *dof_func_offd,
+                                                      HYPRE_Int *P_diag_i, HYPRE_Int *P_offd_i);
+
+__global__ void hypre_BoomerAMGBuildDirInterp_getcoef( hypre_DeviceItem &item, HYPRE_Int nr_of_rows,
+                                                       HYPRE_Int *A_diag_i,
+                                                       HYPRE_Int *A_diag_j, HYPRE_Real *A_diag_data, HYPRE_Int *A_offd_i, HYPRE_Int *A_offd_j,
+                                                       HYPRE_Real *A_offd_data, HYPRE_Int *Soc_diag_j, HYPRE_Int *Soc_offd_j, HYPRE_Int *CF_marker,
+                                                       HYPRE_Int *CF_marker_offd, HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int *dof_func_offd,
+                                                       HYPRE_Int *P_diag_i, HYPRE_Int *P_diag_j, HYPRE_Real *P_diag_data, HYPRE_Int *P_offd_i,
+                                                       HYPRE_Int *P_offd_j, HYPRE_Real *P_offd_data, HYPRE_Int *fine_to_coarse );
+
+__global__ void hypre_BoomerAMGBuildDirInterp_getcoef_v2( hypre_DeviceItem &item,
+                                                          HYPRE_Int nr_of_rows,
+                                                          HYPRE_Int *A_diag_i,
+                                                          HYPRE_Int *A_diag_j, HYPRE_Real *A_diag_data, HYPRE_Int *A_offd_i, HYPRE_Int *A_offd_j,
+                                                          HYPRE_Real *A_offd_data, HYPRE_Int *Soc_diag_j, HYPRE_Int *Soc_offd_j, HYPRE_Int *CF_marker,
+                                                          HYPRE_Int *CF_marker_offd, HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int *dof_func_offd,
+                                                          HYPRE_Int *P_diag_i, HYPRE_Int *P_diag_j, HYPRE_Real *P_diag_data, HYPRE_Int *P_offd_i,
+                                                          HYPRE_Int *P_offd_j, HYPRE_Real *P_offd_data, HYPRE_Int *fine_to_coarse );
 
 __global__ void
-hypre_BoomerAMGBuildInterpOnePnt_getnnz( HYPRE_Int nr_of_rows, HYPRE_Int *A_diag_i, HYPRE_Int *A_strong_diag_j, HYPRE_Complex *A_diag_a, HYPRE_Int *A_offd_i, HYPRE_Int *A_strong_offd_j, HYPRE_Complex *A_offd_a, HYPRE_Int *CF_marker, HYPRE_Int *CF_marker_offd, HYPRE_Int *diag_compress_marker, HYPRE_Int *offd_compress_marker, HYPRE_Int *P_diag_i, HYPRE_Int *P_diag_j, HYPRE_Int *P_offd_i, HYPRE_Int *P_offd_j);
+hypre_BoomerAMGBuildInterpOnePnt_getnnz( hypre_DeviceItem &item, HYPRE_Int nr_of_rows,
+                                         HYPRE_Int *A_diag_i,
+                                         HYPRE_Int *A_strong_diag_j, HYPRE_Complex *A_diag_a, HYPRE_Int *A_offd_i,
+                                         HYPRE_Int *A_strong_offd_j, HYPRE_Complex *A_offd_a, HYPRE_Int *CF_marker,
+                                         HYPRE_Int *CF_marker_offd, HYPRE_Int *diag_compress_marker, HYPRE_Int *offd_compress_marker,
+                                         HYPRE_Int *P_diag_i, HYPRE_Int *P_diag_j, HYPRE_Int *P_offd_i, HYPRE_Int *P_offd_j);
 
 /*---------------------------------------------------------------------------
  * hypre_BoomerAMGBuildDirInterp
@@ -50,7 +75,6 @@ hypre_BoomerAMGBuildDirInterpDevice( hypre_ParCSRMatrix   *A,
    HYPRE_Int       *A_offd_i    = hypre_CSRMatrixI(A_offd);
    HYPRE_Int       *A_offd_j    = hypre_CSRMatrixJ(A_offd);
    HYPRE_Int        num_cols_A_offd = hypre_CSRMatrixNumCols(A_offd);
-   //   HYPRE_BigInt   *col_map_offd_A = hypre_ParCSRMatrixColMapOffd(A);
 
    HYPRE_Int        n_fine = hypre_CSRMatrixNumRows(A_diag);
 
@@ -64,13 +88,13 @@ hypre_BoomerAMGBuildDirInterpDevice( hypre_ParCSRMatrix   *A,
    HYPRE_Int       *S_offd_i = hypre_CSRMatrixI(S_offd);
    HYPRE_Int       *S_offd_j = hypre_CSRMatrixJ(S_offd);
 
-   hypre_ParCSRMatrix *P;
-   HYPRE_Int          *tmp_map_offd_h = NULL;
+   HYPRE_Int       *Soc_diag_j = hypre_ParCSRMatrixSocDiagJ(S);
+   HYPRE_Int       *Soc_offd_j = hypre_ParCSRMatrixSocOffdJ(S);
 
    HYPRE_Int       *CF_marker_offd = NULL;
    HYPRE_Int       *dof_func_offd = NULL;
-   HYPRE_Int       *dof_func_dev = NULL;
 
+   hypre_ParCSRMatrix *P;
    hypre_CSRMatrix *P_diag;
    hypre_CSRMatrix *P_offd;
    HYPRE_Real      *P_diag_data;
@@ -84,15 +108,10 @@ hypre_BoomerAMGBuildDirInterpDevice( hypre_ParCSRMatrix   *A,
    HYPRE_Int       *fine_to_coarse_d;
    HYPRE_Int       *fine_to_coarse_h;
    HYPRE_BigInt     total_global_cpts;
-   HYPRE_Int        num_cols_P_offd = 0;
 
-   HYPRE_Int        i;
-   HYPRE_Int        j;
-   HYPRE_Int        start;
    HYPRE_Int        my_id;
    HYPRE_Int        num_procs;
    HYPRE_Int        num_sends;
-   HYPRE_Int        index;
    HYPRE_Int       *int_buf_data;
 
    HYPRE_Real       wall_time;  /* for debugging instrumentation  */
@@ -100,13 +119,13 @@ hypre_BoomerAMGBuildDirInterpDevice( hypre_ParCSRMatrix   *A,
    HYPRE_MemoryLocation memory_location = hypre_ParCSRMatrixMemoryLocation(A);
 
    hypre_MPI_Comm_size(comm, &num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_rank(comm, &my_id);
 
-   if (my_id == (num_procs -1))
+   if (my_id == (num_procs - 1))
    {
       total_global_cpts = num_cpts_global[1];
    }
-   hypre_MPI_Bcast( &total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
+   hypre_MPI_Bcast( &total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
 
    if (!comm_pkg)
    {
@@ -125,13 +144,31 @@ hypre_BoomerAMGBuildDirInterpDevice( hypre_ParCSRMatrix   *A,
    }
 
    num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
-   int_buf_data = hypre_TAlloc(HYPRE_Int, hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends), HYPRE_MEMORY_DEVICE);
+   int_buf_data = hypre_TAlloc(HYPRE_Int, hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                               HYPRE_MEMORY_DEVICE);
    hypre_ParCSRCommPkgCopySendMapElmtsToDevice(comm_pkg);
+#if defined(HYPRE_USING_SYCL)
+   hypreSycl_gather( hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg),
+                     hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg) + hypre_ParCSRCommPkgSendMapStart(comm_pkg,
+                                                                                                       num_sends),
+                     CF_marker,
+                     int_buf_data );
+#else
    HYPRE_THRUST_CALL( gather,
                       hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg),
-                      hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg) + hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                      hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg) + hypre_ParCSRCommPkgSendMapStart(comm_pkg,
+                            num_sends),
                       CF_marker,
                       int_buf_data );
+#endif
+
+#if defined(HYPRE_USING_THRUST_NOSYNC)
+   /* RL: make sure int_buf_data is ready before issuing GPU-GPU MPI */
+   if (hypre_GetGpuAwareMPI())
+   {
+      hypre_ForceSyncComputeStream();
+   }
+#endif
 
    comm_handle = hypre_ParCSRCommHandleCreate_v2(11, comm_pkg, HYPRE_MEMORY_DEVICE, int_buf_data,
                                                  HYPRE_MEMORY_DEVICE, CF_marker_offd);
@@ -145,21 +182,32 @@ hypre_BoomerAMGBuildDirInterpDevice( hypre_ParCSRMatrix   *A,
          dof_func_offd = hypre_TAlloc(HYPRE_Int, num_cols_A_offd, HYPRE_MEMORY_DEVICE);
       }
 
-      index = 0;
-      for (i = 0; i < num_sends; i++)
+#if defined(HYPRE_USING_SYCL)
+      hypreSycl_gather( hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg),
+                        hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg) + hypre_ParCSRCommPkgSendMapStart(comm_pkg,
+                                                                                                          num_sends),
+                        dof_func,
+                        int_buf_data );
+#else
+      HYPRE_THRUST_CALL( gather,
+                         hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg),
+                         hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg) + hypre_ParCSRCommPkgSendMapStart(comm_pkg,
+                               num_sends),
+                         dof_func,
+                         int_buf_data );
+#endif
+
+#if defined(HYPRE_USING_THRUST_NOSYNC)
+      /* RL: make sure int_buf_data is ready before issuing GPU-GPU MPI */
+      if (hypre_GetGpuAwareMPI())
       {
-         start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-         for (j=start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
-         {
-            int_buf_data[index++] = dof_func[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
-         }
+         hypre_ForceSyncComputeStream();
       }
-      comm_handle = hypre_ParCSRCommHandleCreate_v2(11, comm_pkg, HYPRE_MEMORY_HOST, int_buf_data,
+#endif
+
+      comm_handle = hypre_ParCSRCommHandleCreate_v2(11, comm_pkg, HYPRE_MEMORY_DEVICE, int_buf_data,
                                                     HYPRE_MEMORY_DEVICE, dof_func_offd);
       hypre_ParCSRCommHandleDestroy(comm_handle);
-
-      dof_func_dev = hypre_TAlloc(HYPRE_Int, n_fine, HYPRE_MEMORY_DEVICE);
-      hypre_TMemcpy(dof_func_dev, dof_func, HYPRE_Int, n_fine, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
    }
 
    if (debug_flag == 4)
@@ -172,29 +220,40 @@ hypre_BoomerAMGBuildDirInterpDevice( hypre_ParCSRMatrix   *A,
    /* 3. Figure out the size of the interpolation matrix, P, i.e., compute P_diag_i and P_offd_i */
    /*    Also, compute fine_to_coarse array: When i is a coarse point, fine_to_coarse[i] will hold a  */
    /*    corresponding coarse point index in the range 0..n_coarse-1 */
-   P_diag_i = hypre_TAlloc(HYPRE_Int, n_fine+1, memory_location);
-   P_offd_i = hypre_TAlloc(HYPRE_Int, n_fine+1, memory_location);
+   P_diag_i = hypre_TAlloc(HYPRE_Int, n_fine + 1, memory_location);
+   P_offd_i = hypre_TAlloc(HYPRE_Int, n_fine + 1, memory_location);
 
-   dim3 bDim = hypre_GetDefaultCUDABlockDimension();
-   dim3 gDim = hypre_GetDefaultCUDAGridDimension(n_fine, "warp", bDim);
+   dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+   dim3 gDim = hypre_GetDefaultDeviceGridDimension(n_fine, "warp", bDim);
 
-   HYPRE_CUDA_LAUNCH( hypre_BoomerAMGBuildDirInterp_getnnz, gDim, bDim,
-                      n_fine, S_diag_i, S_diag_j, S_offd_i, S_offd_j,
-                      CF_marker, CF_marker_offd, num_functions,
-                      dof_func_dev, dof_func_offd, P_diag_i, P_offd_i);
+   HYPRE_GPU_LAUNCH( hypre_BoomerAMGBuildDirInterp_getnnz, gDim, bDim,
+                     n_fine, S_diag_i, S_diag_j, S_offd_i, S_offd_j,
+                     CF_marker, CF_marker_offd, num_functions,
+                     dof_func, dof_func_offd, P_diag_i, P_offd_i);
 
    /* The scans will transform P_diag_i and P_offd_i to the CSR I-vectors */
-   hypreDevice_IntegerExclusiveScan(n_fine+1, P_diag_i);
-   hypreDevice_IntegerExclusiveScan(n_fine+1, P_offd_i);
+   hypre_Memset(P_diag_i + n_fine, 0, sizeof(HYPRE_Int), HYPRE_MEMORY_DEVICE);
+   hypre_Memset(P_offd_i + n_fine, 0, sizeof(HYPRE_Int), HYPRE_MEMORY_DEVICE);
+
+   hypreDevice_IntegerExclusiveScan(n_fine + 1, P_diag_i);
+   hypreDevice_IntegerExclusiveScan(n_fine + 1, P_offd_i);
 
    fine_to_coarse_d = hypre_TAlloc(HYPRE_Int, n_fine, HYPRE_MEMORY_DEVICE);
    /* The scan will make fine_to_coarse[i] for i a coarse point hold a
     * coarse point index in the range from 0 to n_coarse-1 */
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_ONEDPL_CALL( std::exclusive_scan,
+                      oneapi::dpl::make_transform_iterator(CF_marker,          is_nonnegative<HYPRE_Int>()),
+                      oneapi::dpl::make_transform_iterator(CF_marker + n_fine, is_nonnegative<HYPRE_Int>()),
+                      fine_to_coarse_d,
+                      HYPRE_Int(0) ); /* *MUST* pass init value since input and output types diff. */
+#else
    HYPRE_THRUST_CALL( exclusive_scan,
                       thrust::make_transform_iterator(CF_marker,          is_nonnegative<HYPRE_Int>()),
                       thrust::make_transform_iterator(CF_marker + n_fine, is_nonnegative<HYPRE_Int>()),
                       fine_to_coarse_d,
                       HYPRE_Int(0) ); /* *MUST* pass init value since input and output types diff. */
+#endif
 
    /* 4. Compute the CSR arrays P_diag_j, P_diag_data, P_offd_j, and P_offd_data */
    /*    P_diag_i and P_offd_i are now known, first allocate the remaining CSR arrays of P */
@@ -209,29 +268,29 @@ hypre_BoomerAMGBuildDirInterpDevice( hypre_ParCSRMatrix   *A,
 
    if (interp_type == 3)
    {
-      HYPRE_CUDA_LAUNCH( hypre_BoomerAMGBuildDirInterp_getcoef, gDim, bDim,
-                         n_fine, A_diag_i, A_diag_j, A_diag_data,
-                         A_offd_i, A_offd_j, A_offd_data,
-                         hypre_ParCSRMatrixSocDiagJ(S),
-                         hypre_ParCSRMatrixSocOffdJ(S),
-                         CF_marker, CF_marker_offd,
-                         num_functions, dof_func_dev, dof_func_offd,
-                         P_diag_i, P_diag_j, P_diag_data,
-                         P_offd_i, P_offd_j, P_offd_data,
-                         fine_to_coarse_d );
+      HYPRE_GPU_LAUNCH( hypre_BoomerAMGBuildDirInterp_getcoef, gDim, bDim,
+                        n_fine, A_diag_i, A_diag_j, A_diag_data,
+                        A_offd_i, A_offd_j, A_offd_data,
+                        Soc_diag_j,
+                        Soc_offd_j,
+                        CF_marker, CF_marker_offd,
+                        num_functions, dof_func, dof_func_offd,
+                        P_diag_i, P_diag_j, P_diag_data,
+                        P_offd_i, P_offd_j, P_offd_data,
+                        fine_to_coarse_d );
    }
    else
    {
-      HYPRE_CUDA_LAUNCH( hypre_BoomerAMGBuildDirInterp_getcoef_v2, gDim, bDim,
-                         n_fine, A_diag_i, A_diag_j, A_diag_data,
-                         A_offd_i, A_offd_j, A_offd_data,
-                         hypre_ParCSRMatrixSocDiagJ(S),
-                         hypre_ParCSRMatrixSocOffdJ(S),
-                         CF_marker, CF_marker_offd,
-                         num_functions, dof_func_dev, dof_func_offd,
-                         P_diag_i, P_diag_j, P_diag_data,
-                         P_offd_i, P_offd_j, P_offd_data,
-                         fine_to_coarse_d );
+      HYPRE_GPU_LAUNCH( hypre_BoomerAMGBuildDirInterp_getcoef_v2, gDim, bDim,
+                        n_fine, A_diag_i, A_diag_j, A_diag_data,
+                        A_offd_i, A_offd_j, A_offd_data,
+                        Soc_diag_j,
+                        Soc_offd_j,
+                        CF_marker, CF_marker_offd,
+                        num_functions, dof_func, dof_func_offd,
+                        P_diag_i, P_diag_j, P_diag_data,
+                        P_offd_i, P_offd_j, P_offd_data,
+                        fine_to_coarse_d );
    }
 
    /* !!!! Free them here */
@@ -240,7 +299,11 @@ hypre_BoomerAMGBuildDirInterpDevice( hypre_ParCSRMatrix   *A,
    hypre_TFree(hypre_ParCSRMatrixSocOffdJ(S), HYPRE_MEMORY_DEVICE);
    */
 
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_ONEDPL_CALL(std::replace, CF_marker, CF_marker + n_fine, -3, -1);
+#else
    HYPRE_THRUST_CALL(replace, CF_marker, CF_marker + n_fine, -3, -1);
+#endif
 
    /* 5. Construct the result as a ParCSRMatrix. At this point, P's column indices */
    /*    are defined with A's enumeration of columns */
@@ -250,7 +313,7 @@ hypre_BoomerAMGBuildDirInterpDevice( hypre_ParCSRMatrix   *A,
                                 total_global_cpts,
                                 hypre_ParCSRMatrixColStarts(A),
                                 num_cpts_global,
-                                0,
+                                num_cols_A_offd,
                                 P_diag_size,
                                 P_offd_size);
 
@@ -273,63 +336,21 @@ hypre_BoomerAMGBuildDirInterpDevice( hypre_ParCSRMatrix   *A,
    if (trunc_factor != 0.0 || max_elmts > 0)
    {
       hypre_BoomerAMGInterpTruncationDevice(P, trunc_factor, max_elmts);
-
-      P_offd_i    = hypre_CSRMatrixI(P_offd);
-      P_offd_j    = hypre_CSRMatrixJ(P_offd);
-      P_offd_size = hypre_CSRMatrixNumNonzeros(P_offd);
-      /* hypre_TMemcpy(&P_offd_size, &P_offd_i[n_fine], HYPRE_Int, 1, HYPRE_MEMORY_HOST, memory_location); */
    }
 
    /* 7. Translate P_offd's column indices from the values inherited from A_offd to a 0,1,2,3,... enumeration, */
    /*    and construct the col_map array that translates these into the global 0..c-1 enumeration */
-   if (P_offd_size)
-   {
-      /* Array P_marker has length equal to the number of A's offd columns+1, and will */
-      /* store a translation code from A_offd's local column numbers to P_offd's local column numbers */
-      /* Example: if A_offd has 6 columns, locally 0,1,..,5, and points 1 and 4 are coarse points, then
-         P_marker=[0,1,0,0,1,0,0], */
-
-      /* First,  set P_marker[i] to 1 if A's column i is also present in P, otherwise P_marker[i] is 0 */
-      HYPRE_Int *P_marker = hypre_TAlloc(HYPRE_Int, num_cols_A_offd, HYPRE_MEMORY_DEVICE);
-      HYPRE_Int *P_colids = hypre_TAlloc(HYPRE_Int, hypre_max(P_offd_size, num_cols_A_offd), HYPRE_MEMORY_DEVICE);
-
-      hypre_TMemcpy(P_colids, P_offd_j, HYPRE_Int, P_offd_size, HYPRE_MEMORY_DEVICE, memory_location);
-      /* sort and unique */
-      HYPRE_THRUST_CALL(sort, P_colids, P_colids + P_offd_size);
-      HYPRE_Int *new_end = HYPRE_THRUST_CALL(unique, P_colids, P_colids + P_offd_size);
-
-      num_cols_P_offd = new_end - P_colids;
-
-      HYPRE_THRUST_CALL(fill_n, P_marker, num_cols_A_offd, 0);
-      hypreDevice_ScatterConstant(P_marker, num_cols_P_offd, P_colids, 1);
-
-      /* Because P's columns correspond to P_marker[i]=1 (and =0 otherwise), the scan below will return  */
-      /* an enumeration of P's columns 0,1,... at the corresponding locations in P_marker. */
-      /* P_marker[num_cols_A_offd] will contain num_cols_P_offd, so sum reduction above could  */
-      /* have been replaced by reading the last element of P_marker. */
-      HYPRE_THRUST_CALL(exclusive_scan, P_marker, P_marker + num_cols_A_offd, P_colids);
-      /* Example: P_marker becomes [0,0,1,1,1,2] so that P_marker[1]=0, P_marker[4]=1  */
-
-      /* Do the re-enumeration, P_offd_j are mapped, using P_marker as map  */
-      HYPRE_THRUST_CALL(gather, P_offd_j, P_offd_j + P_offd_size, P_colids, P_offd_j);
-
-      /* Create and define array tmp_map_offd. This array is the inverse of the P_marker mapping, */
-      /* Example: num_cols_P_offd=2, tmp_map_offd[0] = 1, tmp_map_offd[1]=4  */
-      /* P_colids is large enough to hold */
-      new_end = HYPRE_THRUST_CALL(copy_if,
-                                  thrust::make_counting_iterator(0),
-                                  thrust::make_counting_iterator(num_cols_A_offd),
-                                  P_marker,
-                                  P_colids,
-                                  thrust::identity<HYPRE_Int>());
-      hypre_assert(new_end - P_colids == num_cols_P_offd);
-
-      tmp_map_offd_h = hypre_TAlloc(HYPRE_Int, num_cols_P_offd, HYPRE_MEMORY_HOST);
-      hypre_TMemcpy(tmp_map_offd_h, P_colids, HYPRE_Int, num_cols_P_offd, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
-
-      hypre_TFree(P_colids, HYPRE_MEMORY_DEVICE);
-      hypre_TFree(P_marker, HYPRE_MEMORY_DEVICE);
-   }
+
+   /* Array P_marker has length equal to the number of A's offd columns+1, and will */
+   /* store a translation code from A_offd's local column numbers to P_offd's local column numbers */
+   HYPRE_Int *P_colids;
+   HYPRE_Int *P_colids_h = NULL;
+
+   hypre_CSRMatrixCompressColumnsDevice(P_offd, NULL, &P_colids, NULL);
+   P_colids_h = hypre_TAlloc(HYPRE_Int, hypre_CSRMatrixNumCols(P_offd), HYPRE_MEMORY_HOST);
+   hypre_TMemcpy(P_colids_h, P_colids, HYPRE_Int, hypre_CSRMatrixNumCols(P_offd),
+                 HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
+   hypre_TFree(P_colids, HYPRE_MEMORY_DEVICE);
 
    /* 8. P_offd_j now has a 0,1,2,3... local column index enumeration. */
    /*    tmp_map_offd contains the index mapping from P's offd local columns to A's offd local columns.*/
@@ -337,30 +358,31 @@ hypre_BoomerAMGBuildDirInterpDevice( hypre_ParCSRMatrix   *A,
    /*    comm_pkg in P, and perhaps more members of P ??? */
 
    fine_to_coarse_h = hypre_TAlloc(HYPRE_Int, n_fine, HYPRE_MEMORY_HOST);
-   hypre_TMemcpy(fine_to_coarse_h, fine_to_coarse_d, HYPRE_Int, n_fine, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
+   hypre_TMemcpy(fine_to_coarse_h, fine_to_coarse_d, HYPRE_Int, n_fine, HYPRE_MEMORY_HOST,
+                 HYPRE_MEMORY_DEVICE);
 
-   hypre_ParCSRMatrixColMapOffd(P) = hypre_CTAlloc(HYPRE_BigInt, num_cols_P_offd, HYPRE_MEMORY_HOST);
-   hypre_CSRMatrixNumCols(P_offd)  = num_cols_P_offd;
+   hypre_ParCSRMatrixColMapOffd(P) = hypre_CTAlloc(HYPRE_BigInt, hypre_CSRMatrixNumCols(P_offd),
+                                                   HYPRE_MEMORY_HOST);
 
-   hypre_GetCommPkgRTFromCommPkgA(P, A, fine_to_coarse_h, tmp_map_offd_h);
+   hypre_GetCommPkgRTFromCommPkgA(P, A, fine_to_coarse_h, P_colids_h);
 
    *P_ptr = P;
 
    hypre_TFree(CF_marker_offd,   HYPRE_MEMORY_DEVICE);
    hypre_TFree(dof_func_offd,    HYPRE_MEMORY_DEVICE);
-   hypre_TFree(dof_func_dev,     HYPRE_MEMORY_DEVICE);
    hypre_TFree(int_buf_data,     HYPRE_MEMORY_DEVICE);
    hypre_TFree(fine_to_coarse_d, HYPRE_MEMORY_DEVICE);
    hypre_TFree(fine_to_coarse_h, HYPRE_MEMORY_HOST);
-   hypre_TFree(tmp_map_offd_h,   HYPRE_MEMORY_HOST);
+   hypre_TFree(P_colids_h,       HYPRE_MEMORY_HOST);
 
    return hypre_error_flag;
 }
 
 
 /*-----------------------------------------------------------------------*/
- __global__ void
-hypre_BoomerAMGBuildDirInterp_getnnz( HYPRE_Int  nr_of_rows,
+__global__ void
+hypre_BoomerAMGBuildDirInterp_getnnz( hypre_DeviceItem &item,
+                                      HYPRE_Int  nr_of_rows,
                                       HYPRE_Int *S_diag_i,
                                       HYPRE_Int *S_diag_j,
                                       HYPRE_Int *S_offd_i,
@@ -397,22 +419,22 @@ hypre_BoomerAMGBuildDirInterp_getnnz( HYPRE_Int  nr_of_rows,
     */
    /*-----------------------------------------------------------------------*/
 
-   HYPRE_Int i = hypre_cuda_get_grid_warp_id<1,1>();
+   HYPRE_Int i = hypre_gpu_get_grid_warp_id<1, 1>(item);
 
    if (i >= nr_of_rows)
    {
       return;
    }
 
-   HYPRE_Int p, q, dof_func_i;
+   HYPRE_Int p = 0, q = 0, dof_func_i = 0;
    HYPRE_Int jPd = 0, jPo = 0;
-   HYPRE_Int lane = hypre_cuda_get_lane_id<1>();
+   HYPRE_Int lane = hypre_gpu_get_lane_id<1>(item);
 
    if (lane == 0)
    {
       p = read_only_load(CF_marker + i);
    }
-   p = __shfl_sync(HYPRE_WARP_FULL_MASK, p, 0);
+   p = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 0);
 
    /*--------------------------------------------------------------------
     *  If i is a C-point, interpolation is the identity.
@@ -437,7 +459,7 @@ hypre_BoomerAMGBuildDirInterp_getnnz( HYPRE_Int  nr_of_rows,
       {
          dof_func_i = read_only_load(&dof_func[i]);
       }
-      dof_func_i = __shfl_sync(HYPRE_WARP_FULL_MASK, dof_func_i, 0);
+      dof_func_i = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, dof_func_i, 0);
    }
 
    /* diag part */
@@ -445,43 +467,45 @@ hypre_BoomerAMGBuildDirInterp_getnnz( HYPRE_Int  nr_of_rows,
    {
       p = read_only_load(S_diag_i + i + lane);
    }
-   q = __shfl_sync(HYPRE_WARP_FULL_MASK, p, 1);
-   p = __shfl_sync(HYPRE_WARP_FULL_MASK, p, 0);
+   q = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 1);
+   p = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 0);
 
-   for (HYPRE_Int j = p + lane; __any_sync(HYPRE_WARP_FULL_MASK, j < q); j += HYPRE_WARP_SIZE)
+   for (HYPRE_Int j = p + lane; warp_any_sync(item, HYPRE_WARP_FULL_MASK, j < q); j += HYPRE_WARP_SIZE)
    {
       if (j < q)
       {
          const HYPRE_Int col = read_only_load(&S_diag_j[j]);
-         if ( read_only_load(&CF_marker[col]) > 0 && (num_functions == 1 || read_only_load(&dof_func[col]) == dof_func_i) )
+         if ( read_only_load(&CF_marker[col]) > 0 && (num_functions == 1 ||
+                                                      read_only_load(&dof_func[col]) == dof_func_i) )
          {
             jPd++;
          }
       }
    }
-   jPd = warp_reduce_sum(jPd);
+   jPd = warp_reduce_sum(item, jPd);
 
    /* offd part */
    if (lane < 2)
    {
       p = read_only_load(S_offd_i + i + lane);
    }
-   q = __shfl_sync(HYPRE_WARP_FULL_MASK, p, 1);
-   p = __shfl_sync(HYPRE_WARP_FULL_MASK, p, 0);
+   q = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 1);
+   p = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 0);
 
-   for (HYPRE_Int j = p + lane; __any_sync(HYPRE_WARP_FULL_MASK, j < q); j += HYPRE_WARP_SIZE)
+   for (HYPRE_Int j = p + lane; warp_any_sync(item, HYPRE_WARP_FULL_MASK, j < q); j += HYPRE_WARP_SIZE)
    {
       if (j < q)
       {
          const HYPRE_Int tmp = read_only_load(&S_offd_j[j]);
          const HYPRE_Int col = tmp;
-         if ( read_only_load(&CF_marker_offd[col]) > 0 && (num_functions == 1 || read_only_load(&dof_func_offd[col]) == dof_func_i) )
+         if ( read_only_load(&CF_marker_offd[col]) > 0 && (num_functions == 1 ||
+                                                           read_only_load(&dof_func_offd[col]) == dof_func_i) )
          {
             jPo++;
          }
       }
    }
-   jPo = warp_reduce_sum(jPo);
+   jPo = warp_reduce_sum(item, jPo);
 
    if (lane == 0)
    {
@@ -492,8 +516,9 @@ hypre_BoomerAMGBuildDirInterp_getnnz( HYPRE_Int  nr_of_rows,
 
 /*-----------------------------------------------------------------------*
  *-----------------------------------------------------------------------*/
- __global__ void
-hypre_BoomerAMGBuildDirInterp_getcoef( HYPRE_Int   nr_of_rows,
+__global__ void
+hypre_BoomerAMGBuildDirInterp_getcoef( hypre_DeviceItem &item,
+                                       HYPRE_Int   nr_of_rows,
                                        HYPRE_Int  *A_diag_i,
                                        HYPRE_Int  *A_diag_j,
                                        HYPRE_Real *A_diag_data,
@@ -537,22 +562,22 @@ hypre_BoomerAMGBuildDirInterp_getcoef( HYPRE_Int   nr_of_rows,
    */
    /*-----------------------------------------------------------------------*/
 
-   HYPRE_Int i = hypre_cuda_get_grid_warp_id<1,1>();
+   HYPRE_Int i = hypre_gpu_get_grid_warp_id<1, 1>(item);
 
    if (i >= nr_of_rows)
    {
       return;
    }
 
-   HYPRE_Int lane = hypre_cuda_get_lane_id<1>();
+   HYPRE_Int lane = hypre_gpu_get_lane_id<1>(item);
 
-   HYPRE_Int k, dof_func_i;
+   HYPRE_Int k = 0, dof_func_i = 0;
 
    if (lane == 0)
    {
       k = read_only_load(CF_marker + i);
    }
-   k = __shfl_sync(HYPRE_WARP_FULL_MASK, k, 0);
+   k = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, k, 0);
 
    /*--------------------------------------------------------------------
     *  If i is a C-point, interpolation is the identity.
@@ -578,25 +603,26 @@ hypre_BoomerAMGBuildDirInterp_getcoef( HYPRE_Int   nr_of_rows,
       {
          dof_func_i = read_only_load(&dof_func[i]);
       }
-      dof_func_i = __shfl_sync(HYPRE_WARP_FULL_MASK, dof_func_i, 0);
+      dof_func_i = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, dof_func_i, 0);
    }
 
    HYPRE_Real diagonal = 0.0, sum_N_pos = 0.0, sum_N_neg = 0.0, sum_P_pos = 0.0, sum_P_neg = 0.0;
 
    /* diag part */
-   HYPRE_Int p_diag_A, q_diag_A, p_diag_P, q_diag_P;
+   HYPRE_Int p_diag_A = 0, q_diag_A, p_diag_P = 0, q_diag_P;
    if (lane < 2)
    {
       p_diag_A = read_only_load(A_diag_i + i + lane);
       p_diag_P = read_only_load(P_diag_i + i + lane);
    }
-   q_diag_A = __shfl_sync(HYPRE_WARP_FULL_MASK, p_diag_A, 1);
-   p_diag_A = __shfl_sync(HYPRE_WARP_FULL_MASK, p_diag_A, 0);
-   q_diag_P = __shfl_sync(HYPRE_WARP_FULL_MASK, p_diag_P, 1);
-   p_diag_P = __shfl_sync(HYPRE_WARP_FULL_MASK, p_diag_P, 0);
+   q_diag_A = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_diag_A, 1);
+   p_diag_A = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_diag_A, 0);
+   q_diag_P = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_diag_P, 1);
+   p_diag_P = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_diag_P, 0);
 
    k = p_diag_P;
-   for (HYPRE_Int j = p_diag_A + lane; __any_sync(HYPRE_WARP_FULL_MASK, j < q_diag_A); j += HYPRE_WARP_SIZE)
+   for (HYPRE_Int j = p_diag_A + lane; warp_any_sync(item, HYPRE_WARP_FULL_MASK, j < q_diag_A);
+        j += HYPRE_WARP_SIZE)
    {
       HYPRE_Int col, sum, pos;
       HYPRE_Int is_SC = 0; /* if is a Strong-C */
@@ -639,7 +665,7 @@ hypre_BoomerAMGBuildDirInterp_getcoef( HYPRE_Int   nr_of_rows,
          }
       }
 
-      pos = warp_prefix_sum(lane, is_SC, sum);
+      pos = warp_prefix_sum(item, lane, is_SC, sum);
 
       if (is_SC)
       {
@@ -652,19 +678,20 @@ hypre_BoomerAMGBuildDirInterp_getcoef( HYPRE_Int   nr_of_rows,
    hypre_device_assert(k == q_diag_P);
 
    /* offd part */
-   HYPRE_Int p_offd_A, q_offd_A, p_offd_P, q_offd_P;
+   HYPRE_Int p_offd_A = 0, q_offd_A, p_offd_P = 0, q_offd_P;
    if (lane < 2)
    {
       p_offd_A = read_only_load(A_offd_i + i + lane);
       p_offd_P = read_only_load(P_offd_i + i + lane);
    }
-   q_offd_A = __shfl_sync(HYPRE_WARP_FULL_MASK, p_offd_A, 1);
-   p_offd_A = __shfl_sync(HYPRE_WARP_FULL_MASK, p_offd_A, 0);
-   q_offd_P = __shfl_sync(HYPRE_WARP_FULL_MASK, p_offd_P, 1);
-   p_offd_P = __shfl_sync(HYPRE_WARP_FULL_MASK, p_offd_P, 0);
+   q_offd_A = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_offd_A, 1);
+   p_offd_A = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_offd_A, 0);
+   q_offd_P = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_offd_P, 1);
+   p_offd_P = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_offd_P, 0);
 
    k = p_offd_P;
-   for (HYPRE_Int j = p_offd_A + lane; __any_sync(HYPRE_WARP_FULL_MASK, j < q_offd_A); j += HYPRE_WARP_SIZE)
+   for (HYPRE_Int j = p_offd_A + lane; warp_any_sync(item, HYPRE_WARP_FULL_MASK, j < q_offd_A);
+        j += HYPRE_WARP_SIZE)
    {
       HYPRE_Int col, sum, pos;
       HYPRE_Int is_SC = 0; /* if is a Strong-C */
@@ -703,7 +730,7 @@ hypre_BoomerAMGBuildDirInterp_getcoef( HYPRE_Int   nr_of_rows,
          }
       }
 
-      pos = warp_prefix_sum(lane, is_SC, sum);
+      pos = warp_prefix_sum(item, lane, is_SC, sum);
 
       if (is_SC)
       {
@@ -715,11 +742,11 @@ hypre_BoomerAMGBuildDirInterp_getcoef( HYPRE_Int   nr_of_rows,
 
    hypre_device_assert(k == q_offd_P);
 
-   diagonal  = warp_allreduce_sum(diagonal);
-   sum_N_pos = warp_allreduce_sum(sum_N_pos);
-   sum_N_neg = warp_allreduce_sum(sum_N_neg);
-   sum_P_pos = warp_allreduce_sum(sum_P_pos);
-   sum_P_neg = warp_allreduce_sum(sum_P_neg);
+   diagonal  = warp_allreduce_sum(item, diagonal);
+   sum_N_pos = warp_allreduce_sum(item, sum_N_pos);
+   sum_N_neg = warp_allreduce_sum(item, sum_N_neg);
+   sum_P_pos = warp_allreduce_sum(item, sum_P_pos);
+   sum_P_neg = warp_allreduce_sum(item, sum_P_neg);
 
    HYPRE_Complex alfa = 1.0, beta = 1.0;
 
@@ -733,7 +760,8 @@ hypre_BoomerAMGBuildDirInterp_getcoef( HYPRE_Int   nr_of_rows,
       beta = sum_N_pos / (sum_P_pos * diagonal);
    }
 
-   for (HYPRE_Int j = p_diag_P + lane; __any_sync(HYPRE_WARP_FULL_MASK, j < q_diag_P); j += HYPRE_WARP_SIZE)
+   for (HYPRE_Int j = p_diag_P + lane; warp_any_sync(item, HYPRE_WARP_FULL_MASK, j < q_diag_P);
+        j += HYPRE_WARP_SIZE)
    {
       /* if (P_diag_data[j] > 0.0)
             P_diag_data[j] *= -beta;
@@ -741,11 +769,12 @@ hypre_BoomerAMGBuildDirInterp_getcoef( HYPRE_Int   nr_of_rows,
             P_diag_data[j] *= -alfa; */
       if (j < q_diag_P)
       {
-         P_diag_data[j] *= (P_diag_data[j] > 0.0) * (alfa-beta) - alfa;
+         P_diag_data[j] *= (P_diag_data[j] > 0.0) * (alfa - beta) - alfa;
       }
    }
 
-   for (HYPRE_Int j = p_offd_P + lane; __any_sync(HYPRE_WARP_FULL_MASK, j < q_offd_P); j += HYPRE_WARP_SIZE)
+   for (HYPRE_Int j = p_offd_P + lane; warp_any_sync(item, HYPRE_WARP_FULL_MASK, j < q_offd_P);
+        j += HYPRE_WARP_SIZE)
    {
       /* if (P_offd_data[indp]> 0)
             P_offd_data[indp] *= -beta;
@@ -753,15 +782,16 @@ hypre_BoomerAMGBuildDirInterp_getcoef( HYPRE_Int   nr_of_rows,
             P_offd_data[indp] *= -alfa; */
       if (j < q_offd_P)
       {
-         P_offd_data[j] *= (P_offd_data[j] > 0.0) * (alfa-beta) - alfa;
+         P_offd_data[j] *= (P_offd_data[j] > 0.0) * (alfa - beta) - alfa;
       }
    }
 }
 
 /*-----------------------------------------------------------------------*
  *-----------------------------------------------------------------------*/
- __global__ void
-hypre_BoomerAMGBuildDirInterp_getcoef_v2( HYPRE_Int   nr_of_rows,
+__global__ void
+hypre_BoomerAMGBuildDirInterp_getcoef_v2( hypre_DeviceItem &item,
+                                          HYPRE_Int   nr_of_rows,
                                           HYPRE_Int  *A_diag_i,
                                           HYPRE_Int  *A_diag_j,
                                           HYPRE_Real *A_diag_data,
@@ -805,22 +835,22 @@ hypre_BoomerAMGBuildDirInterp_getcoef_v2( HYPRE_Int   nr_of_rows,
    */
    /*-----------------------------------------------------------------------*/
 
-   HYPRE_Int i = hypre_cuda_get_grid_warp_id<1,1>();
+   HYPRE_Int i = hypre_gpu_get_grid_warp_id<1, 1>(item);
 
    if (i >= nr_of_rows)
    {
       return;
    }
 
-   HYPRE_Int lane = hypre_cuda_get_lane_id<1>();
+   HYPRE_Int lane = hypre_gpu_get_lane_id<1>(item);
 
-   HYPRE_Int k, dof_func_i;
+   HYPRE_Int k = 0, dof_func_i = 0;
 
    if (lane == 0)
    {
       k = read_only_load(CF_marker + i);
    }
-   k = __shfl_sync(HYPRE_WARP_FULL_MASK, k, 0);
+   k = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, k, 0);
 
    /*--------------------------------------------------------------------
     *  If i is a C-point, interpolation is the identity.
@@ -846,25 +876,26 @@ hypre_BoomerAMGBuildDirInterp_getcoef_v2( HYPRE_Int   nr_of_rows,
       {
          dof_func_i = read_only_load(&dof_func[i]);
       }
-      dof_func_i = __shfl_sync(HYPRE_WARP_FULL_MASK, dof_func_i, 0);
+      dof_func_i = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, dof_func_i, 0);
    }
 
    HYPRE_Real diagonal = 0.0, sum_F = 0.0;
 
    /* diag part */
-   HYPRE_Int p_diag_A, q_diag_A, p_diag_P, q_diag_P;
+   HYPRE_Int p_diag_A = 0, q_diag_A, p_diag_P = 0, q_diag_P;
    if (lane < 2)
    {
       p_diag_A = read_only_load(A_diag_i + i + lane);
       p_diag_P = read_only_load(P_diag_i + i + lane);
    }
-   q_diag_A = __shfl_sync(HYPRE_WARP_FULL_MASK, p_diag_A, 1);
-   p_diag_A = __shfl_sync(HYPRE_WARP_FULL_MASK, p_diag_A, 0);
-   q_diag_P = __shfl_sync(HYPRE_WARP_FULL_MASK, p_diag_P, 1);
-   p_diag_P = __shfl_sync(HYPRE_WARP_FULL_MASK, p_diag_P, 0);
+   q_diag_A = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_diag_A, 1);
+   p_diag_A = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_diag_A, 0);
+   q_diag_P = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_diag_P, 1);
+   p_diag_P = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_diag_P, 0);
 
    k = p_diag_P;
-   for (HYPRE_Int j = p_diag_A + lane; __any_sync(HYPRE_WARP_FULL_MASK, j < q_diag_A); j += HYPRE_WARP_SIZE)
+   for (HYPRE_Int j = p_diag_A + lane; warp_any_sync(item, HYPRE_WARP_FULL_MASK, j < q_diag_A);
+        j += HYPRE_WARP_SIZE)
    {
       HYPRE_Int col, sum, pos;
       HYPRE_Int is_SC = 0; /* if is a Strong-C */
@@ -899,7 +930,7 @@ hypre_BoomerAMGBuildDirInterp_getcoef_v2( HYPRE_Int   nr_of_rows,
          }
       }
 
-      pos = warp_prefix_sum(lane, is_SC, sum);
+      pos = warp_prefix_sum(item, lane, is_SC, sum);
 
       if (is_SC)
       {
@@ -912,19 +943,20 @@ hypre_BoomerAMGBuildDirInterp_getcoef_v2( HYPRE_Int   nr_of_rows,
    hypre_device_assert(k == q_diag_P);
 
    /* offd part */
-   HYPRE_Int p_offd_A, q_offd_A, p_offd_P, q_offd_P;
+   HYPRE_Int p_offd_A = 0, q_offd_A, p_offd_P = 0, q_offd_P;
    if (lane < 2)
    {
       p_offd_A = read_only_load(A_offd_i + i + lane);
       p_offd_P = read_only_load(P_offd_i + i + lane);
    }
-   q_offd_A = __shfl_sync(HYPRE_WARP_FULL_MASK, p_offd_A, 1);
-   p_offd_A = __shfl_sync(HYPRE_WARP_FULL_MASK, p_offd_A, 0);
-   q_offd_P = __shfl_sync(HYPRE_WARP_FULL_MASK, p_offd_P, 1);
-   p_offd_P = __shfl_sync(HYPRE_WARP_FULL_MASK, p_offd_P, 0);
+   q_offd_A = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_offd_A, 1);
+   p_offd_A = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_offd_A, 0);
+   q_offd_P = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_offd_P, 1);
+   p_offd_P = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_offd_P, 0);
 
    k = p_offd_P;
-   for (HYPRE_Int j = p_offd_A + lane; __any_sync(HYPRE_WARP_FULL_MASK, j < q_offd_A); j += HYPRE_WARP_SIZE)
+   for (HYPRE_Int j = p_offd_A + lane; warp_any_sync(item, HYPRE_WARP_FULL_MASK, j < q_offd_A);
+        j += HYPRE_WARP_SIZE)
    {
       HYPRE_Int col, sum, pos;
       HYPRE_Int is_SC = 0; /* if is a Strong-C */
@@ -955,7 +987,7 @@ hypre_BoomerAMGBuildDirInterp_getcoef_v2( HYPRE_Int   nr_of_rows,
          }
       }
 
-      pos = warp_prefix_sum(lane, is_SC, sum);
+      pos = warp_prefix_sum(item, lane, is_SC, sum);
 
       if (is_SC)
       {
@@ -967,12 +999,13 @@ hypre_BoomerAMGBuildDirInterp_getcoef_v2( HYPRE_Int   nr_of_rows,
 
    hypre_device_assert(k == q_offd_P);
 
-   diagonal  = warp_allreduce_sum(diagonal);
-   sum_F     = warp_allreduce_sum(sum_F);
+   diagonal  = warp_allreduce_sum(item, diagonal);
+   sum_F     = warp_allreduce_sum(item, sum_F);
 
    HYPRE_Complex beta = sum_F / (q_diag_P - p_diag_P + q_offd_P - p_offd_P);
 
-   for (HYPRE_Int j = p_diag_P + lane; __any_sync(HYPRE_WARP_FULL_MASK, j < q_diag_P); j += HYPRE_WARP_SIZE)
+   for (HYPRE_Int j = p_diag_P + lane; warp_any_sync(item, HYPRE_WARP_FULL_MASK, j < q_diag_P);
+        j += HYPRE_WARP_SIZE)
    {
       /* if (P_diag_data[j] > 0.0)
             P_diag_data[j] *= -beta;
@@ -984,7 +1017,8 @@ hypre_BoomerAMGBuildDirInterp_getcoef_v2( HYPRE_Int   nr_of_rows,
       }
    }
 
-   for (HYPRE_Int j = p_offd_P + lane; __any_sync(HYPRE_WARP_FULL_MASK, j < q_offd_P); j += HYPRE_WARP_SIZE)
+   for (HYPRE_Int j = p_offd_P + lane; warp_any_sync(item, HYPRE_WARP_FULL_MASK, j < q_offd_P);
+        j += HYPRE_WARP_SIZE)
    {
       /* if (P_offd_data[indp]> 0)
             P_offd_data[indp] *= -beta;
@@ -1007,6 +1041,11 @@ hypre_BoomerAMGBuildInterpOnePntDevice( hypre_ParCSRMatrix  *A,
                                         HYPRE_Int            debug_flag,
                                         hypre_ParCSRMatrix **P_ptr)
 {
+   HYPRE_UNUSED_VAR(num_cpts_global);
+   HYPRE_UNUSED_VAR(num_functions);
+   HYPRE_UNUSED_VAR(dof_func);
+   HYPRE_UNUSED_VAR(debug_flag);
+
    MPI_Comm                 comm     = hypre_ParCSRMatrixComm(A);
    hypre_ParCSRCommPkg     *comm_pkg = hypre_ParCSRMatrixCommPkg(A);
    hypre_ParCSRCommHandle  *comm_handle;
@@ -1063,19 +1102,27 @@ hypre_BoomerAMGBuildInterpOnePntDevice( hypre_ParCSRMatrix  *A,
    HYPRE_Int          *offd_compress_marker;
 
    hypre_MPI_Comm_size(comm, &num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_rank(comm, &my_id);
 
    my_first_cpt = num_cpts_global[0];
-   if (my_id == (num_procs -1)) total_global_cpts = num_cpts_global[1];
-   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
+   if (my_id == (num_procs - 1)) { total_global_cpts = num_cpts_global[1]; }
+   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
 
    /* fine to coarse mapping */
    fine_to_coarse = hypre_TAlloc(HYPRE_Int, n_fine, HYPRE_MEMORY_DEVICE);
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_ONEDPL_CALL( std::exclusive_scan,
+                      oneapi::dpl::make_transform_iterator(CF_marker,          is_nonnegative<HYPRE_Int>()),
+                      oneapi::dpl::make_transform_iterator(CF_marker + n_fine, is_nonnegative<HYPRE_Int>()),
+                      fine_to_coarse,
+                      HYPRE_Int(0) ); /* *MUST* pass init value since input and output types diff. */
+#else
    HYPRE_THRUST_CALL( exclusive_scan,
                       thrust::make_transform_iterator(CF_marker,          is_nonnegative<HYPRE_Int>()),
                       thrust::make_transform_iterator(CF_marker + n_fine, is_nonnegative<HYPRE_Int>()),
                       fine_to_coarse,
                       HYPRE_Int(0) ); /* *MUST* pass init value since input and output types diff. */
+#endif
 
    /*-------------------------------------------------------------------
     * Get the CF_marker data for the off-processor columns
@@ -1094,17 +1141,36 @@ hypre_BoomerAMGBuildInterpOnePntDevice( hypre_ParCSRMatrix  *A,
    num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
    /* send buffer, of size send_map_starts[num_sends]),
     * i.e., number of entries to send */
-   int_buf_data = hypre_CTAlloc(HYPRE_Int, hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends), HYPRE_MEMORY_DEVICE);
+   int_buf_data = hypre_CTAlloc(HYPRE_Int, hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                                HYPRE_MEMORY_DEVICE);
 
    /* copy CF markers of elements to send to buffer */
+#if defined(HYPRE_USING_SYCL)
+   hypreSycl_gather( hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg),
+                     hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg) +
+                     hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                     CF_marker,
+                     int_buf_data );
+#else
    HYPRE_THRUST_CALL( gather,
                       hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg),
                       hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg) +
                       hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
                       CF_marker,
                       int_buf_data );
+#endif
+
+#if defined(HYPRE_USING_THRUST_NOSYNC)
+   /* RL: make sure int_buf_data is ready before issuing GPU-GPU MPI */
+   if (hypre_GetGpuAwareMPI())
+   {
+      hypre_ForceSyncComputeStream();
+   }
+#endif
+
    /* create a handle to start communication. 11: for integer */
-   comm_handle = hypre_ParCSRCommHandleCreate_v2(11, comm_pkg, HYPRE_MEMORY_DEVICE, int_buf_data, HYPRE_MEMORY_DEVICE, CF_marker_offd);
+   comm_handle = hypre_ParCSRCommHandleCreate_v2(11, comm_pkg, HYPRE_MEMORY_DEVICE, int_buf_data,
+                                                 HYPRE_MEMORY_DEVICE, CF_marker_offd);
    /* destroy the handle to finish communication */
    hypre_ParCSRCommHandleDestroy(comm_handle);
    hypre_TFree(int_buf_data, HYPRE_MEMORY_DEVICE);
@@ -1114,8 +1180,8 @@ hypre_BoomerAMGBuildInterpOnePntDevice( hypre_ParCSRMatrix  *A,
     *  and find the most strongly influencing C-pt for each F-pt
     *-----------------------------------------------------------------------*/
 
-   P_diag_i = hypre_CTAlloc(HYPRE_Int, n_fine+1, HYPRE_MEMORY_DEVICE);
-   P_offd_i = hypre_CTAlloc(HYPRE_Int, n_fine+1, HYPRE_MEMORY_DEVICE);
+   P_diag_i = hypre_CTAlloc(HYPRE_Int, n_fine + 1, HYPRE_MEMORY_DEVICE);
+   P_offd_i = hypre_CTAlloc(HYPRE_Int, n_fine + 1, HYPRE_MEMORY_DEVICE);
 
    diag_compress_marker = hypre_CTAlloc(HYPRE_Int, n_fine, HYPRE_MEMORY_DEVICE);
    offd_compress_marker = hypre_CTAlloc(HYPRE_Int, n_fine, HYPRE_MEMORY_DEVICE);
@@ -1124,19 +1190,32 @@ hypre_BoomerAMGBuildInterpOnePntDevice( hypre_ParCSRMatrix  *A,
    P_diag_j_temp = hypre_CTAlloc(HYPRE_Int, n_fine, HYPRE_MEMORY_DEVICE);
    P_offd_j_temp = hypre_CTAlloc(HYPRE_Int, n_fine, HYPRE_MEMORY_DEVICE);
 
-   dim3 bDim = hypre_GetDefaultCUDABlockDimension();
-   dim3 gDim = hypre_GetDefaultCUDAGridDimension(n_fine, "warp", bDim);
+   dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+   dim3 gDim = hypre_GetDefaultDeviceGridDimension(n_fine, "warp", bDim);
 
-   HYPRE_CUDA_LAUNCH( hypre_BoomerAMGBuildInterpOnePnt_getnnz, gDim, bDim,
-                      n_fine, A_diag_i, A_strong_diag_j, A_diag_a, A_offd_i, A_strong_offd_j,
-                      A_offd_a, CF_marker, CF_marker_offd, diag_compress_marker,
-                      offd_compress_marker, P_diag_i, P_diag_j_temp, P_offd_i, P_offd_j_temp);
+   HYPRE_GPU_LAUNCH( hypre_BoomerAMGBuildInterpOnePnt_getnnz, gDim, bDim,
+                     n_fine, A_diag_i, A_strong_diag_j, A_diag_a, A_offd_i, A_strong_offd_j,
+                     A_offd_a, CF_marker, CF_marker_offd, diag_compress_marker,
+                     offd_compress_marker, P_diag_i, P_diag_j_temp, P_offd_i, P_offd_j_temp);
 
    /*-----------------------------------------------------------------------
     *  Send and receive fine_to_coarse info.
     *-----------------------------------------------------------------------*/
-   fine_to_coarse_offd = hypre_CTAlloc(HYPRE_BigInt, num_cols_A_offd,HYPRE_MEMORY_DEVICE);
-   big_int_buf_data = hypre_CTAlloc(HYPRE_BigInt, hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends), HYPRE_MEMORY_DEVICE);
+   fine_to_coarse_offd = hypre_CTAlloc(HYPRE_BigInt, num_cols_A_offd, HYPRE_MEMORY_DEVICE);
+   big_int_buf_data = hypre_CTAlloc(HYPRE_BigInt, hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                                    HYPRE_MEMORY_DEVICE);
+#if defined(HYPRE_USING_SYCL)
+   hypreSycl_gather( hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg),
+                     hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg) +
+                     hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                     fine_to_coarse,
+                     big_int_buf_data );
+   HYPRE_ONEDPL_CALL( std::transform,
+                      big_int_buf_data,
+                      big_int_buf_data + hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                      big_int_buf_data,
+   [my_first_cpt = my_first_cpt] (const auto & x) { return x + my_first_cpt; } );
+#else
    HYPRE_THRUST_CALL( gather,
                       hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg),
                       hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg) +
@@ -1149,7 +1228,18 @@ hypre_BoomerAMGBuildInterpOnePntDevice( hypre_ParCSRMatrix  *A,
                       thrust::make_constant_iterator(my_first_cpt),
                       big_int_buf_data,
                       thrust::plus<HYPRE_BigInt>() );
-   comm_handle = hypre_ParCSRCommHandleCreate_v2(21, comm_pkg, HYPRE_MEMORY_DEVICE, big_int_buf_data, HYPRE_MEMORY_DEVICE, fine_to_coarse_offd);
+#endif
+
+#if defined(HYPRE_USING_THRUST_NOSYNC)
+   /* RL: make sure big_int_buf_data is ready before issuing GPU-GPU MPI */
+   if (hypre_GetGpuAwareMPI())
+   {
+      hypre_ForceSyncComputeStream();
+   }
+#endif
+
+   comm_handle = hypre_ParCSRCommHandleCreate_v2(21, comm_pkg, HYPRE_MEMORY_DEVICE, big_int_buf_data,
+                                                 HYPRE_MEMORY_DEVICE, fine_to_coarse_offd);
    hypre_ParCSRCommHandleDestroy(comm_handle);
    hypre_TFree(big_int_buf_data, HYPRE_MEMORY_DEVICE);
 
@@ -1158,8 +1248,8 @@ hypre_BoomerAMGBuildInterpOnePntDevice( hypre_ParCSRMatrix  *A,
     *-----------------------------------------------------------------------*/
 
    /* scan P_diag_i (which has number of nonzeros in each row) to get row indices */
-   hypreDevice_IntegerExclusiveScan(n_fine+1, P_diag_i);
-   hypreDevice_IntegerExclusiveScan(n_fine+1, P_offd_i);
+   hypreDevice_IntegerExclusiveScan(n_fine + 1, P_diag_i);
+   hypreDevice_IntegerExclusiveScan(n_fine + 1, P_offd_i);
 
    /* get the number of nonzeros and allocate column index and data arrays */
    hypre_TMemcpy(&nnz_diag, &P_diag_i[n_fine], HYPRE_Int, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
@@ -1173,19 +1263,31 @@ hypre_BoomerAMGBuildInterpOnePntDevice( hypre_ParCSRMatrix  *A,
    P_offd_data = hypre_TAlloc(HYPRE_Real, nnz_offd, HYPRE_MEMORY_DEVICE);
 
    /* set data values to 1.0 */
-   HYPRE_THRUST_CALL( fill_n,
-                      P_diag_data,
-                      nnz_diag,
-                      1.0 );
-   HYPRE_THRUST_CALL( fill_n,
-                      P_offd_data,
-                      nnz_offd,
-                      1.0 );
+   hypreDevice_ComplexFilln( P_diag_data, nnz_diag, 1.0 );
+   hypreDevice_ComplexFilln( P_offd_data, nnz_offd, 1.0 );
 
    /* compress temporary column indices */
    P_diag_j_temp_compressed = hypre_TAlloc(HYPRE_Int, nnz_diag, HYPRE_MEMORY_DEVICE);
    P_offd_j_temp_compressed = hypre_TAlloc(HYPRE_Int, nnz_offd, HYPRE_MEMORY_DEVICE);
 
+#if defined(HYPRE_USING_SYCL)
+   hypreSycl_copy_if( P_diag_j_temp,
+                      P_diag_j_temp + n_fine,
+                      diag_compress_marker,
+                      P_diag_j_temp_compressed,
+                      equal<HYPRE_Int>(1) );
+   hypreSycl_copy_if( P_offd_j_temp,
+                      P_offd_j_temp + n_fine,
+                      offd_compress_marker,
+                      P_offd_j_temp_compressed,
+                      equal<HYPRE_Int>(1) );
+
+   /* map the diag column indices */
+   hypreSycl_gather( P_diag_j_temp_compressed,
+                     P_diag_j_temp_compressed + nnz_diag,
+                     fine_to_coarse,
+                     P_diag_j );
+#else
    HYPRE_THRUST_CALL( copy_if,
                       P_diag_j_temp,
                       P_diag_j_temp + n_fine,
@@ -1205,36 +1307,69 @@ hypre_BoomerAMGBuildInterpOnePntDevice( hypre_ParCSRMatrix  *A,
                       P_diag_j_temp_compressed + nnz_diag,
                       fine_to_coarse,
                       P_diag_j );
+#endif
+
+   hypre_TFree(P_diag_j_temp_compressed, HYPRE_MEMORY_DEVICE);
 
    /* mark the offd indices for P as a subset of offd indices of A */
    HYPRE_Int *mark_P_offd_idx = hypre_CTAlloc(HYPRE_Int, num_cols_A_offd, HYPRE_MEMORY_DEVICE);
    // note that scatter is usually not safe if the same index appears more than once in the map,
    // but here we are just scattering constant values, so this is safe
+#if defined(HYPRE_USING_SYCL)
+   auto perm_iter = oneapi::dpl::make_permutation_iterator(mark_P_offd_idx, P_offd_j_temp_compressed);
+   HYPRE_ONEDPL_CALL( std::transform,
+                      perm_iter,
+                      perm_iter + nnz_offd,
+                      perm_iter,
+   [] (const auto & x) { return 1; } );
+   num_cols_P_offd = HYPRE_ONEDPL_CALL(std::reduce, mark_P_offd_idx,
+                                       mark_P_offd_idx + num_cols_A_offd);
+#else
    HYPRE_THRUST_CALL( scatter,
                       thrust::make_constant_iterator(1),
                       thrust::make_constant_iterator(1) + nnz_offd,
                       P_offd_j_temp_compressed,
                       mark_P_offd_idx );
    num_cols_P_offd = HYPRE_THRUST_CALL(reduce, mark_P_offd_idx, mark_P_offd_idx + num_cols_A_offd);
+#endif
 
    /* get a mapping from P offd indices to A offd indices */
    /* offd_map_P_to_A[ P offd idx ] = A offd idx */
    HYPRE_Int *offd_map_P_to_A = hypre_CTAlloc(HYPRE_Int, num_cols_P_offd, HYPRE_MEMORY_DEVICE);
+#if defined(HYPRE_USING_SYCL)
+   oneapi::dpl::counting_iterator<HYPRE_Int> count(0);
+   hypreSycl_copy_if( count,
+                      count + num_cols_A_offd,
+                      mark_P_offd_idx,
+                      offd_map_P_to_A,
+                      equal<HYPRE_Int>(1) );
+#else
    HYPRE_THRUST_CALL( copy_if,
                       thrust::make_counting_iterator(0),
                       thrust::make_counting_iterator(num_cols_A_offd),
                       mark_P_offd_idx,
                       offd_map_P_to_A,
                       equal<HYPRE_Int>(1) );
+#endif
    hypre_TFree(mark_P_offd_idx, HYPRE_MEMORY_DEVICE);
 
    /* also get an inverse mapping from A offd indices to P offd indices */
    /* offd_map_A_to_P[ A offd idx ] = -1 if not a P idx, else P offd idx */
    HYPRE_Int *offd_map_A_to_P = hypre_TAlloc(HYPRE_Int, num_cols_A_offd, HYPRE_MEMORY_DEVICE);
-   HYPRE_THRUST_CALL( fill_n,
-                      offd_map_A_to_P,
-                      num_cols_A_offd,
-                      -1 );
+   hypreDevice_IntFilln( offd_map_A_to_P, num_cols_A_offd, -1 );
+
+#if defined(HYPRE_USING_SYCL)
+   hypreSycl_scatter( count,
+                      count + num_cols_P_offd,
+                      offd_map_P_to_A,
+                      offd_map_A_to_P );
+
+   /* use inverse mapping above to map P_offd_j */
+   hypreSycl_gather( P_offd_j_temp_compressed,
+                     P_offd_j_temp_compressed + nnz_offd,
+                     offd_map_A_to_P,
+                     P_offd_j );
+#else
    HYPRE_THRUST_CALL( scatter,
                       thrust::make_counting_iterator(0),
                       thrust::make_counting_iterator(num_cols_P_offd),
@@ -1247,18 +1382,27 @@ hypre_BoomerAMGBuildInterpOnePntDevice( hypre_ParCSRMatrix  *A,
                       P_offd_j_temp_compressed + nnz_offd,
                       offd_map_A_to_P,
                       P_offd_j );
+#endif
    hypre_TFree(P_offd_j_temp_compressed, HYPRE_MEMORY_DEVICE);
    hypre_TFree(offd_map_A_to_P, HYPRE_MEMORY_DEVICE);
 
    /* setup col_map_offd for P */
    col_map_offd_P_device = hypre_CTAlloc(HYPRE_BigInt, num_cols_P_offd, HYPRE_MEMORY_DEVICE);
    col_map_offd_P = hypre_CTAlloc(HYPRE_BigInt, num_cols_P_offd, HYPRE_MEMORY_HOST);
+#if defined(HYPRE_USING_SYCL)
+   hypreSycl_gather( offd_map_P_to_A,
+                     offd_map_P_to_A + num_cols_P_offd,
+                     fine_to_coarse_offd,
+                     col_map_offd_P_device);
+#else
    HYPRE_THRUST_CALL( gather,
                       offd_map_P_to_A,
                       offd_map_P_to_A + num_cols_P_offd,
                       fine_to_coarse_offd,
                       col_map_offd_P_device);
-   hypre_TMemcpy(col_map_offd_P, col_map_offd_P_device, HYPRE_BigInt, num_cols_P_offd, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
+#endif
+   hypre_TMemcpy(col_map_offd_P, col_map_offd_P_device, HYPRE_BigInt, num_cols_P_offd,
+                 HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
    hypre_TFree(offd_map_P_to_A, HYPRE_MEMORY_DEVICE);
    hypre_TFree(col_map_offd_P_device, HYPRE_MEMORY_DEVICE);
 
@@ -1293,13 +1437,18 @@ hypre_BoomerAMGBuildInterpOnePntDevice( hypre_ParCSRMatrix  *A,
    hypre_TFree(CF_marker_offd, HYPRE_MEMORY_DEVICE);
    hypre_TFree(fine_to_coarse, HYPRE_MEMORY_DEVICE);
    hypre_TFree(fine_to_coarse_offd, HYPRE_MEMORY_DEVICE);
+   hypre_TFree(diag_compress_marker, HYPRE_MEMORY_DEVICE);
+   hypre_TFree(offd_compress_marker, HYPRE_MEMORY_DEVICE);
+   hypre_TFree(P_diag_j_temp, HYPRE_MEMORY_DEVICE);
+   hypre_TFree(P_offd_j_temp, HYPRE_MEMORY_DEVICE);
 
    return hypre_error_flag;
 }
 
 /*-----------------------------------------------------------------------*/
 __global__ void
-hypre_BoomerAMGBuildInterpOnePnt_getnnz( HYPRE_Int      nr_of_rows,
+hypre_BoomerAMGBuildInterpOnePnt_getnnz( hypre_DeviceItem    &item,
+                                         HYPRE_Int      nr_of_rows,
                                          HYPRE_Int     *A_diag_i,
                                          HYPRE_Int     *A_strong_diag_j,
                                          HYPRE_Complex *A_diag_a,
@@ -1339,16 +1488,16 @@ hypre_BoomerAMGBuildInterpOnePnt_getnnz( HYPRE_Int      nr_of_rows,
     */
    /*-----------------------------------------------------------------------*/
 
-   HYPRE_Int i = hypre_cuda_get_grid_warp_id<1,1>();
+   HYPRE_Int i = hypre_gpu_get_grid_warp_id<1, 1>(item);
 
    if (i >= nr_of_rows)
    {
       return;
    }
 
-   HYPRE_Int p, q;
+   HYPRE_Int p = 0, q;
    HYPRE_Int max_j_diag = -1, max_j_offd = -1;
-   HYPRE_Int lane = hypre_cuda_get_lane_id<1>();
+   HYPRE_Int lane = hypre_gpu_get_lane_id<1>(item);
    HYPRE_Real max_diag = -1.0, max_offd = -1.0;
    HYPRE_Real warp_max_diag = -1.0, warp_max_offd = -1.0;
 
@@ -1356,7 +1505,7 @@ hypre_BoomerAMGBuildInterpOnePnt_getnnz( HYPRE_Int      nr_of_rows,
    {
       p = read_only_load(CF_marker + i);
    }
-   p = __shfl_sync(HYPRE_WARP_FULL_MASK, p, 0);
+   p = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 0);
 
    /*--------------------------------------------------------------------
     *  If i is a C-point, interpolation is the identity.
@@ -1382,8 +1531,8 @@ hypre_BoomerAMGBuildInterpOnePnt_getnnz( HYPRE_Int      nr_of_rows,
    {
       p = read_only_load(A_diag_i + i + lane);
    }
-   q = __shfl_sync(HYPRE_WARP_FULL_MASK, p, 1);
-   p = __shfl_sync(HYPRE_WARP_FULL_MASK, p, 0);
+   q = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 1);
+   p = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 0);
 
    for (HYPRE_Int j = p + lane; j < q; j += HYPRE_WARP_SIZE)
    {
@@ -1391,7 +1540,7 @@ hypre_BoomerAMGBuildInterpOnePnt_getnnz( HYPRE_Int      nr_of_rows,
       const HYPRE_Int col = read_only_load(&A_strong_diag_j[j]);
       if (col >= 0)
       {
-         const HYPRE_Complex val = fabs( read_only_load(&A_diag_a[j]) );
+         const HYPRE_Complex val = hypre_abs( read_only_load(&A_diag_a[j]) );
          if ( read_only_load(&CF_marker[col]) > 0 && val > max_diag )
          {
             max_diag = val;
@@ -1399,15 +1548,15 @@ hypre_BoomerAMGBuildInterpOnePnt_getnnz( HYPRE_Int      nr_of_rows,
          }
       }
    }
-   warp_max_diag = warp_allreduce_max(max_diag);
+   warp_max_diag = warp_allreduce_max(item, max_diag);
 
    /* offd part */
    if (lane < 2)
    {
       p = read_only_load(A_offd_i + i + lane);
    }
-   q = __shfl_sync(HYPRE_WARP_FULL_MASK, p, 1);
-   p = __shfl_sync(HYPRE_WARP_FULL_MASK, p, 0);
+   q = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 1);
+   p = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 0);
 
    for (HYPRE_Int j = p + lane; j < q; j += HYPRE_WARP_SIZE)
    {
@@ -1415,7 +1564,7 @@ hypre_BoomerAMGBuildInterpOnePnt_getnnz( HYPRE_Int      nr_of_rows,
       /* column indices are negative for weak connections */
       if (col >= 0)
       {
-         const HYPRE_Complex val = fabs( read_only_load(&A_offd_a[j]) );
+         const HYPRE_Complex val = hypre_abs( read_only_load(&A_offd_a[j]) );
          if ( read_only_load(&CF_marker_offd[col]) > 0 && val > max_offd )
          {
             max_offd = val;
@@ -1423,7 +1572,7 @@ hypre_BoomerAMGBuildInterpOnePnt_getnnz( HYPRE_Int      nr_of_rows,
          }
       }
    }
-   warp_max_offd = warp_allreduce_max(max_offd);
+   warp_max_offd = warp_allreduce_max(item, max_offd);
 
    /*--------------------------------------------------------------------
     *  If no max found, then there is no strongly connected C-point,
@@ -1445,7 +1594,7 @@ hypre_BoomerAMGBuildInterpOnePnt_getnnz( HYPRE_Int      nr_of_rows,
       {
          max_j_offd = -1;
       }
-      max_j_offd = warp_reduce_max(max_j_offd);
+      max_j_offd = warp_reduce_max(item, max_j_offd);
       if (lane == 0)
       {
          P_offd_i[i] = 1;
@@ -1459,7 +1608,7 @@ hypre_BoomerAMGBuildInterpOnePnt_getnnz( HYPRE_Int      nr_of_rows,
       {
          max_j_diag = -1;
       }
-      max_j_diag = warp_reduce_max(max_j_diag);
+      max_j_diag = warp_reduce_max(item, max_j_diag);
       if (lane == 0)
       {
          P_diag_i[i] = 1;
@@ -1469,5 +1618,4 @@ hypre_BoomerAMGBuildInterpOnePnt_getnnz( HYPRE_Int      nr_of_rows,
    }
 }
 
-
-#endif // defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#endif // defined(HYPRE_USING_GPU)
diff --git a/external/hypre/src/parcsr_ls/par_interp_trunc_device.c b/external/hypre/src/parcsr_ls/par_interp_trunc_device.c
index 30fc5147..a5516c51 100644
--- a/external/hypre/src/parcsr_ls/par_interp_trunc_device.c
+++ b/external/hypre/src/parcsr_ls/par_interp_trunc_device.c
@@ -1,61 +1,549 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
  ******************************************************************************/
 
+#include "_hypre_onedpl.hpp"
 #include "_hypre_parcsr_ls.h"
 #include "_hypre_utilities.hpp"
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
 
+#define HYPRE_INTERPTRUNC_ALGORITHM_SWITCH 8
+
+/* special case for max_elmts = 0, i.e. no max_elmts limit */
 __global__ void
-hypreCUDAKernel_InterpTruncation( HYPRE_Int   nrows,
-                                  HYPRE_Real  trunc_factor,
-                                  HYPRE_Int   max_elmts,
-                                  HYPRE_Int  *P_i,
-                                  HYPRE_Int  *P_j,
-                                  HYPRE_Real *P_a)
+hypreGPUKernel_InterpTruncationPass0_v1( hypre_DeviceItem &item,
+                                         HYPRE_Int   nrows,
+                                         HYPRE_Real  trunc_factor,
+                                         HYPRE_Int  *P_diag_i,
+                                         HYPRE_Int  *P_diag_j,
+                                         HYPRE_Real *P_diag_a,
+                                         HYPRE_Int  *P_offd_i,
+                                         HYPRE_Int  *P_offd_j,
+                                         HYPRE_Real *P_offd_a,
+                                         HYPRE_Int  *P_diag_i_new,
+                                         HYPRE_Int  *P_offd_i_new )
 {
    HYPRE_Real row_max = 0.0, row_sum = 0.0, row_scal = 0.0;
-   HYPRE_Int row = hypre_cuda_get_grid_warp_id<1,1>();
+
+   HYPRE_Int row = hypre_gpu_get_grid_warp_id<1, 1>(item);
 
    if (row >= nrows)
    {
       return;
    }
 
-   HYPRE_Int lane = hypre_cuda_get_lane_id<1>(), p, q;
+   HYPRE_Int lane = hypre_gpu_get_lane_id<1>(item);
+   HYPRE_Int p_diag = 0, q_diag = 0, p_offd = 0, q_offd = 0;
 
-   /* 1. compute row max, rowsum */
    if (lane < 2)
    {
-      p = read_only_load(P_i + row + lane);
+      p_diag = read_only_load(P_diag_i + row + lane);
+      p_offd = read_only_load(P_offd_i + row + lane);
    }
-   q = __shfl_sync(HYPRE_WARP_FULL_MASK, p, 1);
-   p = __shfl_sync(HYPRE_WARP_FULL_MASK, p, 0);
+   q_diag = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_diag, 1);
+   p_diag = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_diag, 0);
+   q_offd = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_offd, 1);
+   p_offd = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_offd, 0);
 
-   for (HYPRE_Int i = p + lane; __any_sync(HYPRE_WARP_FULL_MASK, i < q); i += HYPRE_WARP_SIZE)
+   /* 1. compute row rowsum, rowmax */
+   for (HYPRE_Int i = p_diag + lane; i < q_diag; i += HYPRE_WARP_SIZE)
    {
-      if (i < q)
+      HYPRE_Real v = P_diag_a[i];
+      row_sum += v;
+      row_max = hypre_max(row_max, hypre_abs(v));
+   }
+
+   for (HYPRE_Int i = p_offd + lane; i < q_offd; i += HYPRE_WARP_SIZE)
+   {
+      HYPRE_Real v = P_offd_a[i];
+      row_sum += v;
+      row_max = hypre_max(row_max, hypre_abs(v));
+   }
+
+   row_max = warp_allreduce_max(item, row_max) * trunc_factor;
+   row_sum = warp_allreduce_sum(item, row_sum);
+
+   HYPRE_Int cnt_diag = 0, cnt_offd = 0;
+
+   /* 2. move wanted entries to the front and row scal */
+   for (HYPRE_Int i = p_diag + lane; warp_any_sync(item, HYPRE_WARP_FULL_MASK, i < q_diag);
+        i += HYPRE_WARP_SIZE)
+   {
+      HYPRE_Real v = 0.0;
+      HYPRE_Int j = -1;
+
+      if (i < q_diag)
+      {
+         v = P_diag_a[i];
+
+         if (hypre_abs(v) >= row_max)
+         {
+            j = P_diag_j[i];
+            row_scal += v;
+         }
+      }
+
+      HYPRE_Int sum, pos;
+      pos = warp_prefix_sum(item, lane, (HYPRE_Int) (j != -1), sum);
+
+      if (j != -1)
       {
-         HYPRE_Real v = read_only_load(&P_a[i]);
-         row_max = hypre_max(row_max, fabs(v));
-         row_sum += v;
+         P_diag_a[p_diag + cnt_diag + pos] = v;
+         P_diag_j[p_diag + cnt_diag + pos] = j;
       }
+
+      cnt_diag += sum;
    }
 
-   row_max = warp_allreduce_max(row_max) * trunc_factor;
-   row_sum = warp_allreduce_sum(row_sum);
+   for (HYPRE_Int i = p_offd + lane; warp_any_sync(item, HYPRE_WARP_FULL_MASK, i < q_offd);
+        i += HYPRE_WARP_SIZE)
+   {
+      HYPRE_Real v = 0.0;
+      HYPRE_Int j = -1;
+
+      if (i < q_offd)
+      {
+         v = P_offd_a[i];
+
+         if (hypre_abs(v) >= row_max)
+         {
+            j = P_offd_j[i];
+            row_scal += v;
+         }
+      }
+
+      HYPRE_Int sum, pos;
+      pos = warp_prefix_sum(item, lane, (HYPRE_Int) (j != -1), sum);
+
+      if (j != -1)
+      {
+         P_offd_a[p_offd + cnt_offd + pos] = v;
+         P_offd_j[p_offd + cnt_offd + pos] = j;
+      }
+
+      cnt_offd += sum;
+   }
+
+   row_scal = warp_allreduce_sum(item, row_scal);
+
+   if (row_scal)
+   {
+      row_scal = row_sum / row_scal;
+   }
+   else
+   {
+      row_scal = 1.0;
+   }
+
+   /* 3. scale the row */
+   for (HYPRE_Int i = p_diag + lane; i < p_diag + cnt_diag; i += HYPRE_WARP_SIZE)
+   {
+      P_diag_a[i] *= row_scal;
+   }
+
+   for (HYPRE_Int i = p_offd + lane; i < p_offd + cnt_offd; i += HYPRE_WARP_SIZE)
+   {
+      P_offd_a[i] *= row_scal;
+   }
+
+   if (!lane)
+   {
+      P_diag_i_new[row] = cnt_diag;
+      P_offd_i_new[row] = cnt_offd;
+   }
+}
+
+static __device__ __forceinline__
+void hypre_smallest_abs_val( HYPRE_Int   n,
+                             HYPRE_Real *v,
+                             HYPRE_Real &min_v,
+                             HYPRE_Int  &min_j )
+{
+   min_v = hypre_abs(v[0]);
+   min_j = 0;
+
+   for (HYPRE_Int j = 1; j < n; j++)
+   {
+      const HYPRE_Real vj = hypre_abs(v[j]);
+      if (vj < min_v)
+      {
+         min_v = vj;
+         min_j = j;
+      }
+   }
+}
+
+/* TODO: using 1 thread per row, which can be suboptimal */
+__global__ void
+hypreGPUKernel_InterpTruncationPass1_v1( hypre_DeviceItem &item,
+#if defined(HYPRE_USING_SYCL)
+                                         char *shmem_ptr,
+#endif
+                                         HYPRE_Int   nrows,
+                                         HYPRE_Real  trunc_factor,
+                                         HYPRE_Int   max_elmts,
+                                         HYPRE_Int  *P_diag_i,
+                                         HYPRE_Int  *P_diag_j,
+                                         HYPRE_Real *P_diag_a,
+                                         HYPRE_Int  *P_offd_i,
+                                         HYPRE_Int  *P_offd_j,
+                                         HYPRE_Real *P_offd_a,
+                                         HYPRE_Int  *P_diag_i_new,
+                                         HYPRE_Int  *P_offd_i_new )
+{
+   const HYPRE_Int row = hypre_gpu_get_grid_thread_id<1, 1>(item);
+
+   if (row >= nrows)
+   {
+      return;
+   }
+
+   const HYPRE_Int p_diag = read_only_load(P_diag_i + row);
+   const HYPRE_Int q_diag = read_only_load(P_diag_i + row + 1);
+   const HYPRE_Int p_offd = read_only_load(P_offd_i + row);
+   const HYPRE_Int q_offd = read_only_load(P_offd_i + row + 1);
+
+   /* 1. get row max and compute truncation threshold, and compute row_sum */
+   HYPRE_Real row_max = 0.0, row_sum = 0.0;
+
+   for (HYPRE_Int i = p_diag; i < q_diag; i++)
+   {
+      HYPRE_Real v = P_diag_a[i];
+      row_sum += v;
+      row_max = hypre_max(row_max, hypre_abs(v));
+   }
+
+   for (HYPRE_Int i = p_offd; i < q_offd; i++)
+   {
+      HYPRE_Real v = P_offd_a[i];
+      row_sum += v;
+      row_max = hypre_max(row_max, hypre_abs(v));
+   }
+
+   row_max *= trunc_factor;
+
+   /* 2. save the largest max_elmts entries in sh_val/pos */
+   const HYPRE_Int nt = hypre_gpu_get_num_threads<1>(item);
+   const HYPRE_Int tid = hypre_gpu_get_thread_id<1>(item);
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_Int *shared_mem = (HYPRE_Int*) shmem_ptr;
+#else
+   extern __shared__ HYPRE_Int shared_mem[];
+#endif
+   HYPRE_Int *sh_pos = &shared_mem[tid * max_elmts];
+   HYPRE_Real *sh_val = &((HYPRE_Real *) &shared_mem[nt * max_elmts])[tid * max_elmts];
+   HYPRE_Int cnt = 0;
+
+   for (HYPRE_Int i = p_diag; i < q_diag; i++)
+   {
+      const HYPRE_Real v = P_diag_a[i];
+
+      if (hypre_abs(v) < row_max) { continue; }
+
+      if (cnt < max_elmts)
+      {
+         sh_val[cnt] = v;
+         sh_pos[cnt ++] = i;
+      }
+      else
+      {
+         HYPRE_Real min_v;
+         HYPRE_Int min_j;
+
+         hypre_smallest_abs_val(max_elmts, sh_val, min_v, min_j);
+
+         if (hypre_abs(v) > min_v)
+         {
+            sh_val[min_j] = v;
+            sh_pos[min_j] = i;
+         }
+      }
+   }
+
+   for (HYPRE_Int i = p_offd; i < q_offd; i++)
+   {
+      const HYPRE_Real v = P_offd_a[i];
+
+      if (hypre_abs(v) < row_max) { continue; }
+
+      if (cnt < max_elmts)
+      {
+         sh_val[cnt] = v;
+         sh_pos[cnt ++] = i + q_diag;
+      }
+      else
+      {
+         HYPRE_Real min_v;
+         HYPRE_Int min_j;
+
+         hypre_smallest_abs_val(max_elmts, sh_val, min_v, min_j);
+
+         if (hypre_abs(v) > min_v)
+         {
+            sh_val[min_j] = v;
+            sh_pos[min_j] = i + q_diag;
+         }
+      }
+   }
+
+   /* 3. load actual j and compute row_scal */
+   HYPRE_Real row_scal = 0.0;
+
+   for (HYPRE_Int i = 0; i < cnt; i++)
+   {
+      const HYPRE_Int j = sh_pos[i];
+
+      if (j < q_diag)
+      {
+         sh_pos[i] = P_diag_j[j];
+      }
+      else
+      {
+         sh_pos[i] = -1 - P_offd_j[j - q_diag];
+      }
+
+      row_scal += sh_val[i];
+   }
+
+   if (row_scal)
+   {
+      row_scal = row_sum / row_scal;
+   }
+   else
+   {
+      row_scal = 1.0;
+   }
+
+   /* 4. write to P_diag_j and P_offd_j */
+   HYPRE_Int cnt_diag = 0;
+   for (HYPRE_Int i = 0; i < cnt; i++)
+   {
+      const HYPRE_Int j = sh_pos[i];
+
+      if (j >= 0)
+      {
+         P_diag_j[p_diag + cnt_diag] = j;
+         P_diag_a[p_diag + cnt_diag] = sh_val[i] * row_scal;
+         cnt_diag ++;
+      }
+      else
+      {
+         P_offd_j[p_offd + i - cnt_diag] = -1 - j;
+         P_offd_a[p_offd + i - cnt_diag] = sh_val[i] * row_scal;
+      }
+   }
+
+   P_diag_i_new[row] = cnt_diag;
+   P_offd_i_new[row] = cnt - cnt_diag;
+}
+
+/* using 1 warp per row */
+__global__ void
+hypreGPUKernel_InterpTruncationPass2_v1( hypre_DeviceItem &item,
+                                         HYPRE_Int   nrows,
+                                         HYPRE_Int  *P_diag_i,
+                                         HYPRE_Int  *P_diag_j,
+                                         HYPRE_Real *P_diag_a,
+                                         HYPRE_Int  *P_offd_i,
+                                         HYPRE_Int  *P_offd_j,
+                                         HYPRE_Real *P_offd_a,
+                                         HYPRE_Int  *P_diag_i_new,
+                                         HYPRE_Int  *P_diag_j_new,
+                                         HYPRE_Real *P_diag_a_new,
+                                         HYPRE_Int  *P_offd_i_new,
+                                         HYPRE_Int  *P_offd_j_new,
+                                         HYPRE_Real *P_offd_a_new )
+{
+   HYPRE_Int i = hypre_gpu_get_grid_warp_id<1, 1>(item);
+
+   if (i >= nrows)
+   {
+      return;
+   }
+
+   HYPRE_Int lane = hypre_gpu_get_lane_id<1>(item);
+   HYPRE_Int p = 0, pnew = 0, qnew = 0, shift;
+
+   if (lane < 2)
+   {
+      p = read_only_load(P_diag_i + i + lane);
+      pnew = read_only_load(P_diag_i_new + i + lane);
+   }
+   p = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 0);
+   qnew = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, pnew, 1);
+   pnew = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, pnew, 0);
+
+   shift = p - pnew;
+   for (HYPRE_Int k = pnew + lane; k < qnew; k += HYPRE_WARP_SIZE)
+   {
+      P_diag_j_new[k] = P_diag_j[k + shift];
+      P_diag_a_new[k] = P_diag_a[k + shift];
+   }
+
+   if (lane < 2)
+   {
+      p = read_only_load(P_offd_i + i + lane);
+      pnew = read_only_load(P_offd_i_new + i + lane);
+   }
+   p = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 0);
+   qnew = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, pnew, 1);
+   pnew = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, pnew, 0);
+
+   shift = p - pnew;
+   for (HYPRE_Int k = pnew + lane; k < qnew; k += HYPRE_WARP_SIZE)
+   {
+      P_offd_j_new[k] = P_offd_j[k + shift];
+      P_offd_a_new[k] = P_offd_a[k + shift];
+   }
+}
+
+/* This is a "fast" version that works for small max_elmts values */
+HYPRE_Int
+hypre_BoomerAMGInterpTruncationDevice_v1( hypre_ParCSRMatrix *P,
+                                          HYPRE_Real          trunc_factor,
+                                          HYPRE_Int           max_elmts )
+{
+   HYPRE_Int        nrows       = hypre_ParCSRMatrixNumRows(P);
+   hypre_CSRMatrix *P_diag      = hypre_ParCSRMatrixDiag(P);
+   HYPRE_Int       *P_diag_i    = hypre_CSRMatrixI(P_diag);
+   HYPRE_Int       *P_diag_j    = hypre_CSRMatrixJ(P_diag);
+   HYPRE_Real      *P_diag_a    = hypre_CSRMatrixData(P_diag);
+   hypre_CSRMatrix *P_offd      = hypre_ParCSRMatrixOffd(P);
+   HYPRE_Int       *P_offd_i    = hypre_CSRMatrixI(P_offd);
+   HYPRE_Int       *P_offd_j    = hypre_CSRMatrixJ(P_offd);
+   HYPRE_Real      *P_offd_a    = hypre_CSRMatrixData(P_offd);
+
+   HYPRE_MemoryLocation memory_location = hypre_ParCSRMatrixMemoryLocation(P);
+
+   HYPRE_Int *P_diag_i_new = hypre_TAlloc(HYPRE_Int, nrows + 1, memory_location);
+   HYPRE_Int *P_offd_i_new = hypre_TAlloc(HYPRE_Int, nrows + 1, memory_location);
+
+   /* truncate P, wanted entries are marked negative in P_diag/offd_j */
+   if (max_elmts == 0)
+   {
+      dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+      dim3 gDim = hypre_GetDefaultDeviceGridDimension(nrows, "warp", bDim);
+
+      HYPRE_GPU_LAUNCH( hypreGPUKernel_InterpTruncationPass0_v1,
+                        gDim, bDim,
+                        nrows, trunc_factor,
+                        P_diag_i, P_diag_j, P_diag_a,
+                        P_offd_i, P_offd_j, P_offd_a,
+                        P_diag_i_new, P_offd_i_new);
+   }
+   else
+   {
+      dim3 bDim = hypre_dim3(256);
+      dim3 gDim = hypre_GetDefaultDeviceGridDimension(nrows, "thread", bDim);
+#if defined(HYPRE_USING_SYCL)
+      size_t shmem_bytes = bDim.get(2) * max_elmts * (sizeof(HYPRE_Int) + sizeof(HYPRE_Real));
+#else
+      size_t shmem_bytes = bDim.x * max_elmts * (sizeof(HYPRE_Int) + sizeof(HYPRE_Real));
+#endif
+      HYPRE_GPU_LAUNCH2( hypreGPUKernel_InterpTruncationPass1_v1,
+                         gDim, bDim, shmem_bytes,
+                         nrows, trunc_factor, max_elmts,
+                         P_diag_i, P_diag_j, P_diag_a,
+                         P_offd_i, P_offd_j, P_offd_a,
+                         P_diag_i_new, P_offd_i_new);
+   }
+
+   hypre_Memset(&P_diag_i_new[nrows], 0, sizeof(HYPRE_Int), memory_location);
+   hypre_Memset(&P_offd_i_new[nrows], 0, sizeof(HYPRE_Int), memory_location);
+
+   hypreDevice_IntegerExclusiveScan(nrows + 1, P_diag_i_new);
+   hypreDevice_IntegerExclusiveScan(nrows + 1, P_offd_i_new);
+
+   HYPRE_Int nnz_diag, nnz_offd;
+
+   hypre_TMemcpy(&nnz_diag, &P_diag_i_new[nrows], HYPRE_Int, 1,
+                 HYPRE_MEMORY_HOST, memory_location);
+   hypre_TMemcpy(&nnz_offd, &P_offd_i_new[nrows], HYPRE_Int, 1,
+                 HYPRE_MEMORY_HOST, memory_location);
+
+   hypre_CSRMatrixNumNonzeros(P_diag) = nnz_diag;
+   hypre_CSRMatrixNumNonzeros(P_offd) = nnz_offd;
+
+   HYPRE_Int  *P_diag_j_new = hypre_TAlloc(HYPRE_Int,  nnz_diag, memory_location);
+   HYPRE_Real *P_diag_a_new = hypre_TAlloc(HYPRE_Real, nnz_diag, memory_location);
+   HYPRE_Int  *P_offd_j_new = hypre_TAlloc(HYPRE_Int,  nnz_offd, memory_location);
+   HYPRE_Real *P_offd_a_new = hypre_TAlloc(HYPRE_Real, nnz_offd, memory_location);
+
+   dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+   dim3 gDim = hypre_GetDefaultDeviceGridDimension(nrows, "warp", bDim);
+   HYPRE_GPU_LAUNCH( hypreGPUKernel_InterpTruncationPass2_v1,
+                     gDim, bDim,
+                     nrows,
+                     P_diag_i, P_diag_j, P_diag_a,
+                     P_offd_i, P_offd_j, P_offd_a,
+                     P_diag_i_new, P_diag_j_new, P_diag_a_new,
+                     P_offd_i_new, P_offd_j_new, P_offd_a_new );
+
+   hypre_CSRMatrixI   (P_diag) = P_diag_i_new;
+   hypre_CSRMatrixJ   (P_diag) = P_diag_j_new;
+   hypre_CSRMatrixData(P_diag) = P_diag_a_new;
+   hypre_CSRMatrixI   (P_offd) = P_offd_i_new;
+   hypre_CSRMatrixJ   (P_offd) = P_offd_j_new;
+   hypre_CSRMatrixData(P_offd) = P_offd_a_new;
+
+   hypre_TFree(P_diag_i, memory_location);
+   hypre_TFree(P_diag_j, memory_location);
+   hypre_TFree(P_diag_a, memory_location);
+   hypre_TFree(P_offd_i, memory_location);
+   hypre_TFree(P_offd_j, memory_location);
+   hypre_TFree(P_offd_a, memory_location);
+
+   return hypre_error_flag;
+}
+
+__global__ void
+hypreGPUKernel_InterpTruncation_v2( hypre_DeviceItem &item,
+                                    HYPRE_Int   nrows,
+                                    HYPRE_Real  trunc_factor,
+                                    HYPRE_Int   max_elmts,
+                                    HYPRE_Int  *P_i,
+                                    HYPRE_Int  *P_j,
+                                    HYPRE_Real *P_a)
+{
+   HYPRE_Real row_max = 0.0, row_sum = 0.0, row_scal = 0.0;
+   HYPRE_Int row = hypre_gpu_get_grid_warp_id<1, 1>(item);
+
+   if (row >= nrows)
+   {
+      return;
+   }
+
+   HYPRE_Int lane = hypre_gpu_get_lane_id<1>(item), p = 0, q;
+
+   /* 1. compute row max, rowsum */
+   if (lane < 2)
+   {
+      p = read_only_load(P_i + row + lane);
+   }
+   q = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 1);
+   p = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 0);
+
+   for (HYPRE_Int i = p + lane; i < q; i += HYPRE_WARP_SIZE)
+   {
+      HYPRE_Real v = read_only_load(&P_a[i]);
+      row_max = hypre_max(row_max, hypre_abs(v));
+      row_sum += v;
+   }
+
+   row_max = warp_allreduce_max(item, row_max) * trunc_factor;
+   row_sum = warp_allreduce_sum(item, row_sum);
 
    /* 2. mark dropped entries by -1 in P_j, and compute row_scal */
    HYPRE_Int last_pos = -1;
-   for (HYPRE_Int i = p + lane; __any_sync(HYPRE_WARP_FULL_MASK, i < q); i += HYPRE_WARP_SIZE)
+   for (HYPRE_Int i = p + lane; warp_any_sync(item, HYPRE_WARP_FULL_MASK, i < q); i += HYPRE_WARP_SIZE)
    {
       HYPRE_Int cond = 0, cond_prev;
 
-      cond_prev = i == p + lane || warp_allreduce_min(cond);
+      cond_prev = i == p + lane || warp_allreduce_min(item, cond);
 
       if (i < q)
       {
@@ -65,7 +553,7 @@ hypreCUDAKernel_InterpTruncation( HYPRE_Int   nrows,
          {
             v = read_only_load(&P_a[i]);
          }
-         cond = cond && fabs(v) >= row_max;
+         cond = cond && hypre_abs(v) >= row_max;
 
          if (cond)
          {
@@ -79,7 +567,7 @@ hypreCUDAKernel_InterpTruncation( HYPRE_Int   nrows,
       }
    }
 
-   row_scal = warp_allreduce_sum(row_scal);
+   row_scal = warp_allreduce_sum(item, row_scal);
 
    if (row_scal)
    {
@@ -97,16 +585,15 @@ hypreCUDAKernel_InterpTruncation( HYPRE_Int   nrows,
    }
 }
 
-/*-----------------------------------------------------------------------*
+/*------------------------------------------------------------------------------------
  * RL: To be consistent with the CPU version, max_elmts == 0 means no limit on rownnz
+ * This is a generic version that works for all max_elmts values
  */
 HYPRE_Int
-hypre_BoomerAMGInterpTruncationDevice( hypre_ParCSRMatrix *P, HYPRE_Real trunc_factor, HYPRE_Int max_elmts )
+hypre_BoomerAMGInterpTruncationDevice_v2( hypre_ParCSRMatrix *P,
+                                          HYPRE_Real          trunc_factor,
+                                          HYPRE_Int           max_elmts )
 {
-#ifdef HYPRE_PROFILE
-   hypre_profile_times[HYPRE_TIMER_ID_INTERP_TRUNC] -= hypre_MPI_Wtime();
-#endif
-
    hypre_CSRMatrix *P_diag      = hypre_ParCSRMatrixDiag(P);
    HYPRE_Int       *P_diag_i    = hypre_CSRMatrixI(P_diag);
    HYPRE_Int       *P_diag_j    = hypre_CSRMatrixJ(P_diag);
@@ -122,33 +609,32 @@ hypre_BoomerAMGInterpTruncationDevice( hypre_ParCSRMatrix *P, HYPRE_Real trunc_f
    HYPRE_Int        nnz_diag    = hypre_CSRMatrixNumNonzeros(P_diag);
    HYPRE_Int        nnz_offd    = hypre_CSRMatrixNumNonzeros(P_offd);
    HYPRE_Int        nnz_P       = nnz_diag + nnz_offd;
-   HYPRE_Int       *P_i         = hypre_TAlloc(HYPRE_Int,  nnz_P,   HYPRE_MEMORY_DEVICE);
-   HYPRE_Int       *P_j         = hypre_TAlloc(HYPRE_Int,  nnz_P,   HYPRE_MEMORY_DEVICE);
-   HYPRE_Real      *P_a         = hypre_TAlloc(HYPRE_Real, nnz_P,   HYPRE_MEMORY_DEVICE);
-   HYPRE_Int       *P_rowptr    = hypre_TAlloc(HYPRE_Int,  nrows+1, HYPRE_MEMORY_DEVICE);
-   HYPRE_Int       *tmp_rowid   = hypre_TAlloc(HYPRE_Int,  nnz_P,   HYPRE_MEMORY_DEVICE);
+   HYPRE_Int       *P_i         = hypre_TAlloc(HYPRE_Int,  nnz_P,     HYPRE_MEMORY_DEVICE);
+   HYPRE_Int       *P_j         = hypre_TAlloc(HYPRE_Int,  nnz_P,     HYPRE_MEMORY_DEVICE);
+   HYPRE_Real      *P_a         = hypre_TAlloc(HYPRE_Real, nnz_P,     HYPRE_MEMORY_DEVICE);
+   HYPRE_Int       *P_rowptr    = hypre_TAlloc(HYPRE_Int,  nrows + 1, HYPRE_MEMORY_DEVICE);
+   HYPRE_Int       *tmp_rowid   = hypre_TAlloc(HYPRE_Int,  nnz_P,     HYPRE_MEMORY_DEVICE);
 
    HYPRE_Int        new_nnz_diag = 0, new_nnz_offd = 0;
-   HYPRE_Int        ierr         = 0;
 
-   HYPRE_MemoryLocation        memory_location = hypre_ParCSRMatrixMemoryLocation(P);
-
-   /*
-   HYPRE_Int        num_procs, my_id;
-   MPI_Comm         comm = hypre_ParCSRMatrixComm(P);
-   hypre_MPI_Comm_size(comm, &num_procs);
-   hypre_MPI_Comm_rank(comm, &my_id);
-   */
+   HYPRE_MemoryLocation memory_location = hypre_ParCSRMatrixMemoryLocation(P);
 
    hypreDevice_CsrRowPtrsToIndices_v2(nrows, nnz_diag, P_diag_i, P_i);
    hypreDevice_CsrRowPtrsToIndices_v2(nrows, nnz_offd, P_offd_i, P_i + nnz_diag);
 
    hypre_TMemcpy(P_j, P_diag_j, HYPRE_Int, nnz_diag, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
    /* offd col id := -2 - offd col id */
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_ONEDPL_CALL(std::transform, P_offd_j, P_offd_j + nnz_offd, P_j + nnz_diag,
+   [] (const auto & x) {return -x - 2;} );
+#else
    HYPRE_THRUST_CALL(transform, P_offd_j, P_offd_j + nnz_offd, P_j + nnz_diag, -_1 - 2);
+#endif
 
-   hypre_TMemcpy(P_a,            P_diag_a, HYPRE_Real, nnz_diag, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
-   hypre_TMemcpy(P_a + nnz_diag, P_offd_a, HYPRE_Real, nnz_offd, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+   hypre_TMemcpy(P_a,            P_diag_a, HYPRE_Real, nnz_diag, HYPRE_MEMORY_DEVICE,
+                 HYPRE_MEMORY_DEVICE);
+   hypre_TMemcpy(P_a + nnz_diag, P_offd_a, HYPRE_Real, nnz_offd, HYPRE_MEMORY_DEVICE,
+                 HYPRE_MEMORY_DEVICE);
 
    /* sort rows based on (rowind, abs(P_a)) */
    hypreDevice_StableSortByTupleKey(nnz_P, P_i, P_a, P_j, 1);
@@ -156,24 +642,32 @@ hypre_BoomerAMGInterpTruncationDevice( hypre_ParCSRMatrix *P, HYPRE_Real trunc_f
    hypreDevice_CsrRowIndicesToPtrs_v2(nrows, nnz_P, P_i, P_rowptr);
 
    /* truncate P, unwanted entries are marked -1 in P_j */
-   dim3 bDim = hypre_GetDefaultCUDABlockDimension();
-   dim3 gDim = hypre_GetDefaultCUDAGridDimension(nrows, "warp", bDim);
+   dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+   dim3 gDim = hypre_GetDefaultDeviceGridDimension(nrows, "warp", bDim);
 
-   HYPRE_CUDA_LAUNCH( hypreCUDAKernel_InterpTruncation, gDim, bDim,
-                      nrows, trunc_factor, max_elmts, P_rowptr, P_j, P_a );
+   HYPRE_GPU_LAUNCH( hypreGPUKernel_InterpTruncation_v2, gDim, bDim,
+                     nrows, trunc_factor, max_elmts, P_rowptr, P_j, P_a );
 
    /* build new P_diag and P_offd */
    if (nnz_diag)
    {
+#if defined(HYPRE_USING_SYCL)
+      auto new_end = hypreSycl_copy_if( oneapi::dpl::make_zip_iterator(P_i,       P_j,       P_a),
+                                        oneapi::dpl::make_zip_iterator(P_i + nnz_P, P_j + nnz_P, P_a + nnz_P),
+                                        P_j,
+                                        oneapi::dpl::make_zip_iterator(tmp_rowid, P_diag_j,  P_diag_a),
+                                        is_nonnegative<HYPRE_Int>() );
+      new_nnz_diag = std::get<0>(new_end.base()) - tmp_rowid;
+#else
       auto new_end = HYPRE_THRUST_CALL(
-            copy_if,
-            thrust::make_zip_iterator(thrust::make_tuple(P_i,       P_j,       P_a)),
-            thrust::make_zip_iterator(thrust::make_tuple(P_i+nnz_P, P_j+nnz_P, P_a+nnz_P)),
-            P_j,
-            thrust::make_zip_iterator(thrust::make_tuple(tmp_rowid, P_diag_j,  P_diag_a)),
-            is_nonnegative<HYPRE_Int>() );
-
+                        copy_if,
+                        thrust::make_zip_iterator(thrust::make_tuple(P_i,       P_j,       P_a)),
+                        thrust::make_zip_iterator(thrust::make_tuple(P_i + nnz_P, P_j + nnz_P, P_a + nnz_P)),
+                        P_j,
+                        thrust::make_zip_iterator(thrust::make_tuple(tmp_rowid, P_diag_j,  P_diag_a)),
+                        is_nonnegative<HYPRE_Int>() );
       new_nnz_diag = thrust::get<0>(new_end.get_iterator_tuple()) - tmp_rowid;
+#endif
 
       hypre_assert(new_nnz_diag <= nnz_diag);
 
@@ -183,32 +677,44 @@ hypre_BoomerAMGInterpTruncationDevice( hypre_ParCSRMatrix *P, HYPRE_Real trunc_f
    if (nnz_offd)
    {
       less_than<HYPRE_Int> pred(-1);
+#if defined(HYPRE_USING_SYCL)
+      auto new_end = hypreSycl_copy_if( oneapi::dpl::make_zip_iterator(P_i,       P_j,       P_a),
+                                        oneapi::dpl::make_zip_iterator(P_i + nnz_P, P_j + nnz_P, P_a + nnz_P),
+                                        P_j,
+                                        oneapi::dpl::make_zip_iterator(tmp_rowid, P_offd_j,  P_offd_a),
+                                        pred );
+      new_nnz_offd = std::get<0>(new_end.base()) - tmp_rowid;
+#else
       auto new_end = HYPRE_THRUST_CALL(
-            copy_if,
-            thrust::make_zip_iterator(thrust::make_tuple(P_i,       P_j,       P_a)),
-            thrust::make_zip_iterator(thrust::make_tuple(P_i+nnz_P, P_j+nnz_P, P_a+nnz_P)),
-            P_j,
-            thrust::make_zip_iterator(thrust::make_tuple(tmp_rowid, P_offd_j,  P_offd_a)),
-            pred );
-
+                        copy_if,
+                        thrust::make_zip_iterator(thrust::make_tuple(P_i,       P_j,       P_a)),
+                        thrust::make_zip_iterator(thrust::make_tuple(P_i + nnz_P, P_j + nnz_P, P_a + nnz_P)),
+                        P_j,
+                        thrust::make_zip_iterator(thrust::make_tuple(tmp_rowid, P_offd_j,  P_offd_a)),
+                        pred );
       new_nnz_offd = thrust::get<0>(new_end.get_iterator_tuple()) - tmp_rowid;
+#endif
 
       hypre_assert(new_nnz_offd <= nnz_offd);
 
+#if defined(HYPRE_USING_SYCL)
+      HYPRE_ONEDPL_CALL(std::transform, P_offd_j, P_offd_j + new_nnz_offd, P_offd_j,
+      [] (const auto & x) {return -x - 2;} );
+#else
       HYPRE_THRUST_CALL(transform, P_offd_j, P_offd_j + new_nnz_offd, P_offd_j, -_1 - 2);
+#endif
 
       hypreDevice_CsrRowIndicesToPtrs_v2(nrows, new_nnz_offd, tmp_rowid, P_offd_i);
    }
 
-   /*
-   printf("nnz_diag %d, new nnz_diag %d\n", nnz_diag, new_nnz_diag);
-   printf("nnz_offd %d, new nnz_offd %d\n", nnz_offd, new_nnz_offd);
-   */
-
-   hypre_CSRMatrixJ   (P_diag) = hypre_TReAlloc_v2(P_diag_j, HYPRE_Int,  nnz_diag, HYPRE_Int,  new_nnz_diag, memory_location);
-   hypre_CSRMatrixData(P_diag) = hypre_TReAlloc_v2(P_diag_a, HYPRE_Real, nnz_diag, HYPRE_Real, new_nnz_diag, memory_location);
-   hypre_CSRMatrixJ   (P_offd) = hypre_TReAlloc_v2(P_offd_j, HYPRE_Int,  nnz_offd, HYPRE_Int,  new_nnz_offd, memory_location);
-   hypre_CSRMatrixData(P_offd) = hypre_TReAlloc_v2(P_offd_a, HYPRE_Real, nnz_offd, HYPRE_Real, new_nnz_offd, memory_location);
+   hypre_CSRMatrixJ   (P_diag) = hypre_TReAlloc_v2(P_diag_j, HYPRE_Int,  nnz_diag, HYPRE_Int,
+                                                   new_nnz_diag, memory_location);
+   hypre_CSRMatrixData(P_diag) = hypre_TReAlloc_v2(P_diag_a, HYPRE_Real, nnz_diag, HYPRE_Real,
+                                                   new_nnz_diag, memory_location);
+   hypre_CSRMatrixJ   (P_offd) = hypre_TReAlloc_v2(P_offd_j, HYPRE_Int,  nnz_offd, HYPRE_Int,
+                                                   new_nnz_offd, memory_location);
+   hypre_CSRMatrixData(P_offd) = hypre_TReAlloc_v2(P_offd_a, HYPRE_Real, nnz_offd, HYPRE_Real,
+                                                   new_nnz_offd, memory_location);
    hypre_CSRMatrixNumNonzeros(P_diag) = new_nnz_diag;
    hypre_CSRMatrixNumNonzeros(P_offd) = new_nnz_offd;
 
@@ -218,11 +724,35 @@ hypre_BoomerAMGInterpTruncationDevice( hypre_ParCSRMatrix *P, HYPRE_Real trunc_f
    hypre_TFree(P_rowptr,  HYPRE_MEMORY_DEVICE);
    hypre_TFree(tmp_rowid, HYPRE_MEMORY_DEVICE);
 
+   return hypre_error_flag;
+}
+
+HYPRE_Int
+hypre_BoomerAMGInterpTruncationDevice( hypre_ParCSRMatrix *P,
+                                       HYPRE_Real          trunc_factor,
+                                       HYPRE_Int           max_elmts )
+{
+#ifdef HYPRE_PROFILE
+   hypre_profile_times[HYPRE_TIMER_ID_INTERP_TRUNC] -= hypre_MPI_Wtime();
+#endif
+   hypre_GpuProfilingPushRange("Interp-Truncation");
+
+   if (max_elmts <= HYPRE_INTERPTRUNC_ALGORITHM_SWITCH)
+   {
+      hypre_BoomerAMGInterpTruncationDevice_v1(P, trunc_factor, max_elmts);
+   }
+   else
+   {
+      hypre_BoomerAMGInterpTruncationDevice_v2(P, trunc_factor, max_elmts);
+   }
+
+   hypre_GpuProfilingPopRange();
+
 #ifdef HYPRE_PROFILE
    hypre_profile_times[HYPRE_TIMER_ID_INTERP_TRUNC] += hypre_MPI_Wtime();
 #endif
 
-   return ierr;
+   return hypre_error_flag;
 }
 
-#endif /* #if defined(HYPRE_USING_CUDA)  || defined(HYPRE_USING_HIP) */
+#endif /* #if defined(HYPRE_USING_GPU) */
diff --git a/external/hypre/src/parcsr_ls/par_jacobi_interp.c b/external/hypre/src/parcsr_ls/par_jacobi_interp.c
index 661b550b..9b72a369 100644
--- a/external/hypre/src/parcsr_ls/par_jacobi_interp.c
+++ b/external/hypre/src/parcsr_ls/par_jacobi_interp.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -33,7 +33,7 @@ void hypre_BoomerAMGJacobiInterp( hypre_ParCSRMatrix * A,
                                      dof_func,
                                      &dof_func_offd );
 
-   for ( iji=0; iji<nji; ++iji )
+   for ( iji = 0; iji < nji; ++iji )
    {
       hypre_BoomerAMGJacobiInterp_1( A, P, S, CF_marker, level,
                                      truncation_threshold, truncation_threshold_minus,
@@ -42,7 +42,9 @@ void hypre_BoomerAMGJacobiInterp( hypre_ParCSRMatrix * A,
    }
 
    if ( dof_func_offd != NULL )
-      hypre_TFree( dof_func_offd , HYPRE_MEMORY_HOST);
+   {
+      hypre_TFree( dof_func_offd, HYPRE_MEMORY_HOST);
+   }
 }
 
 void hypre_BoomerAMGJacobiInterp_1( hypre_ParCSRMatrix * A,
@@ -72,6 +74,9 @@ void hypre_BoomerAMGJacobiInterp_1( hypre_ParCSRMatrix * A,
 
 */
 {
+   HYPRE_UNUSED_VAR(S);
+   HYPRE_UNUSED_VAR(level);
+
    hypre_ParCSRMatrix * Pnew;
    hypre_ParCSRMatrix * C;
    hypre_CSRMatrix *P_diag = hypre_ParCSRMatrixDiag(*P);
@@ -85,12 +90,15 @@ void hypre_BoomerAMGJacobiInterp_1( hypre_ParCSRMatrix * A,
    hypre_CSRMatrix *C_offd;
    hypre_CSRMatrix *Pnew_diag;
    hypre_CSRMatrix *Pnew_offd;*/
-   HYPRE_Int	num_rows_diag_P = hypre_CSRMatrixNumRows(P_diag);
+   HYPRE_Int   num_rows_diag_P = hypre_CSRMatrixNumRows(P_diag);
    HYPRE_Int i;
    /*HYPRE_Int Jnochanges=0, Jchanges, Pnew_num_nonzeros*/;
-   HYPRE_Int CF_coarse=0;
-   HYPRE_Int * J_marker = hypre_CTAlloc( HYPRE_Int,  num_rows_diag_P , HYPRE_MEMORY_HOST);
-   HYPRE_Int nc, ncmax, ncmin, nc1;
+#ifdef HYPRE_JACINT_PRINT_DIAGNOSTICS
+   HYPRE_Int CF_coarse = 0;
+   HYPRE_Int nc1;
+#endif
+   HYPRE_Int * J_marker = hypre_CTAlloc( HYPRE_Int,  num_rows_diag_P, HYPRE_MEMORY_HOST);
+   HYPRE_Int nc, ncmax, ncmin;
    HYPRE_Int num_procs, my_id;
    MPI_Comm comm = hypre_ParCSRMatrixComm( A );
 #ifdef HYPRE_JACINT_PRINT_ROW_SUMS
@@ -105,68 +113,79 @@ void hypre_BoomerAMGJacobiInterp_1( hypre_ParCSRMatrix * A,
    HYPRE_Int *base_j_ptr = &j_dummy;
 #endif
 #ifdef HYPRE_JACINT_PRINT_SOME_ROWS
-   HYPRE_Int sample_rows[50], n_sample_rows=0, isamp;
+   HYPRE_Int sample_rows[50], n_sample_rows = 0, isamp;
 #endif
 
    hypre_MPI_Comm_size(comm, &num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_rank(comm, &my_id);
 
 
-   for ( i=0; i<num_rows_diag_P; ++i )
+   for ( i = 0; i < num_rows_diag_P; ++i )
    {
       J_marker[i] = CF_marker[i];
-      if (CF_marker[i]>=0) ++CF_coarse;
+#ifdef HYPRE_JACINT_PRINT_DIAGNOSTICS
+      if (CF_marker[i] >= 0) { ++CF_coarse; }
+#endif
    }
 #ifdef HYPRE_JACINT_PRINT_DIAGNOSTICS
    hypre_printf("%i %i Jacobi_Interp_1, P has %i+%i=%i nonzeros, local sum %e\n", my_id, level,
-          hypre_CSRMatrixNumNonzeros(P_diag), hypre_CSRMatrixNumNonzeros(P_offd),
-          hypre_CSRMatrixNumNonzeros(P_diag)+hypre_CSRMatrixNumNonzeros(P_offd),
-          hypre_ParCSRMatrixLocalSumElts(*P) );
+                hypre_CSRMatrixNumNonzeros(P_diag), hypre_CSRMatrixNumNonzeros(P_offd),
+                hypre_CSRMatrixNumNonzeros(P_diag) + hypre_CSRMatrixNumNonzeros(P_offd),
+                hypre_ParCSRMatrixLocalSumElts(*P) );
 #endif
 
    /* row sum computations, for output */
 #ifdef HYPRE_JACINT_PRINT_ROW_SUMS
-   PIimax=-1.0e12, PIimin=1.0e12, PIimav=0, PIipav=0;
-   nmav=0, npav=0;
-   for ( i=0; i<num_rows_diag_P; ++i )
+   PIimax = -1.0e12, PIimin = 1.0e12, PIimav = 0, PIipav = 0;
+   nmav = 0, npav = 0;
+   for ( i = 0; i < num_rows_diag_P; ++i )
    {
       PIi = 0;  /* i-th value of P*1, i.e. sum of row i of P */
-      for ( m=P_diag_i[i]; m<P_diag_i[i+1]; ++m )
+      for ( m = P_diag_i[i]; m < P_diag_i[i + 1]; ++m )
+      {
          PIi += P_diag_data[m];
-      for ( m=P_offd_i[i]; m<P_offd_i[i+1]; ++m )
+      }
+      for ( m = P_offd_i[i]; m < P_offd_i[i + 1]; ++m )
+      {
          PIi += P_offd_data[m];
-      if (CF_marker[i]<0)
+      }
+      if (CF_marker[i] < 0)
       {
          PIimax = hypre_max( PIimax, PIi );
          PIimin = hypre_min( PIimin, PIi );
-         if (PIi<=1-eps) { PIimav+=PIi; ++nmav; };
-         if (PIi>=1+eps) { PIipav+=PIi; ++npav; };
+         if (PIi <= 1 - eps) { PIimav += PIi; ++nmav; };
+         if (PIi >= 1 + eps) { PIipav += PIi; ++npav; };
       }
    }
-   if ( nmav>0 ) PIimav = PIimav/nmav;
-   if ( npav>0 ) PIipav = PIipav/npav;
+   if ( nmav > 0 ) { PIimav = PIimav / nmav; }
+   if ( npav > 0 ) { PIipav = PIipav / npav; }
    hypre_printf("%i %i P in max,min row sums %e %e\n", my_id, level, PIimax, PIimin );
 #endif
 
-   ncmax=0; ncmin=num_rows_diag_P; nc1=0;
-   for ( i=0; i<num_rows_diag_P; ++i )
-      if (CF_marker[i]<0)
+   ncmax = 0; ncmin = num_rows_diag_P;
+#ifdef HYPRE_JACINT_PRINT_DIAGNOSTICS
+   nc1 = 0;
+#endif
+   for ( i = 0; i < num_rows_diag_P; ++i )
+      if (CF_marker[i] < 0)
       {
-         nc = P_diag_i[i+1] - P_diag_i[i];
-         if (nc<=1)
+         nc = P_diag_i[i + 1] - P_diag_i[i];
+#ifdef HYPRE_JACINT_PRINT_DIAGNOSTICS
+         if (nc <= 1)
          {
             ++nc1;
          }
+#endif
          ncmax = hypre_max( nc, ncmax );
          ncmin = hypre_min( nc, ncmin );
       }
 #if 0
    /* a very agressive reduction in how much the Jacobi step does: */
-   for ( i=0; i<num_rows_diag_P; ++i )
-      if (CF_marker[i]<0)
+   for ( i = 0; i < num_rows_diag_P; ++i )
+      if (CF_marker[i] < 0)
       {
-         nc = P_diag_i[i+1] - P_diag_i[i];
-         if (nc>ncmin+1)
+         nc = P_diag_i[i + 1] - P_diag_i[i];
+         if (nc > ncmin + 1)
             /*if ( nc > ncmin + 0.5*(ncmax-ncmin) )*/
          {
             J_marker[i] = 1;
@@ -178,16 +197,18 @@ void hypre_BoomerAMGJacobiInterp_1( hypre_ParCSRMatrix * A,
 #ifdef HYPRE_JACINT_PRINT_SOME_ROWS
    Jchanges = num_rows_diag_P - Jnochanges - CF_coarse;
    hypre_printf("some rows to be changed: ");
-   randthresh = 15/(HYPRE_Real)Jchanges;
-   for ( i=0; i<num_rows_diag_P; ++i )
+   randthresh = 15 / (HYPRE_Real)Jchanges;
+   for ( i = 0; i < num_rows_diag_P; ++i )
    {
-      if ( J_marker[i]<0 )
+      if ( J_marker[i] < 0 )
       {
          if ( ((HYPRE_Real)hypre_Rand()) < randthresh )
          {
             hypre_printf( "%i: ", i );
-            for ( m=P_diag_i[i]; m<P_diag_i[i+1]; ++m )
+            for ( m = P_diag_i[i]; m < P_diag_i[i + 1]; ++m )
+            {
                hypre_printf( " %i %f, ", P_diag_j[m], P_diag_data[m] );
+            }
             hypre_printf(";  ");
             sample_rows[n_sample_rows] = i;
             ++n_sample_rows;
@@ -198,18 +219,19 @@ void hypre_BoomerAMGJacobiInterp_1( hypre_ParCSRMatrix * A,
 #endif
 #ifdef HYPRE_JACINT_PRINT_DIAGNOSTICS
    hypre_printf("%i %i P has %i rows, %i changeable, %i don't change-good, %i coarse\n",
-          my_id, level, num_rows_diag_P, Jchanges, Jnochanges, CF_coarse );
-   hypre_printf("%i %i min,max diag cols per row: %i, %i;  no.rows w.<=1 col: %i\n", my_id, level, ncmin, ncmax, nc1 );
+                my_id, level, num_rows_diag_P, Jchanges, Jnochanges, CF_coarse );
+   hypre_printf("%i %i min,max diag cols per row: %i, %i;  no.rows w.<=1 col: %i\n", my_id, level,
+                ncmin, ncmax, nc1 );
 #endif
 #ifdef HYPRE_JACINT_PRINT_MATRICES
    if ( num_rows_diag_P <= HYPRE_MAX_PRINTABLE_MATRIX )
    {
       hypre_sprintf( filename, "Ain%i", level );
-      hypre_ParCSRMatrixPrintIJ( A,0,0,filename);
+      hypre_ParCSRMatrixPrintIJ( A, 0, 0, filename);
       hypre_sprintf( filename, "Sin%i", level );
-      hypre_ParCSRMatrixPrintIJ( S,0,0,filename);
+      hypre_ParCSRMatrixPrintIJ( S, 0, 0, filename);
       hypre_sprintf( filename, "Pin%i", level );
-      hypre_ParCSRMatrixPrintIJ( *P,0,0,filename);
+      hypre_ParCSRMatrixPrintIJ( *P, 0, 0, filename);
    }
 #endif
 
@@ -225,16 +247,16 @@ void hypre_BoomerAMGJacobiInterp_1( hypre_ParCSRMatrix * A,
    */
 #ifdef HYPRE_JACINT_PRINT_MATRICES
    hypre_sprintf( filename, "C%i", level );
-   if ( num_rows_diag_P <= HYPRE_MAX_PRINTABLE_MATRIX ) hypre_ParCSRMatrixPrintIJ( C,0,0,filename);
+   if ( num_rows_diag_P <= HYPRE_MAX_PRINTABLE_MATRIX ) { hypre_ParCSRMatrixPrintIJ( C, 0, 0, filename); }
 #endif
 #ifdef HYPRE_JACINT_PRINT_DIAGNOSTICS
    C_diag = hypre_ParCSRMatrixDiag(C);
    C_offd = hypre_ParCSRMatrixOffd(C);
    hypre_printf("%i %i Jacobi_Interp_1 after matmul, C has %i+%i=%i nonzeros, local sum %e\n",
-          my_id, level, hypre_CSRMatrixNumNonzeros(C_diag),
-          hypre_CSRMatrixNumNonzeros(C_offd),
-          hypre_CSRMatrixNumNonzeros(C_diag)+hypre_CSRMatrixNumNonzeros(C_offd),
-          hypre_ParCSRMatrixLocalSumElts(C) );
+                my_id, level, hypre_CSRMatrixNumNonzeros(C_diag),
+                hypre_CSRMatrixNumNonzeros(C_offd),
+                hypre_CSRMatrixNumNonzeros(C_diag) + hypre_CSRMatrixNumNonzeros(C_offd),
+                hypre_ParCSRMatrixLocalSumElts(C) );
 #endif
 
    hypre_ParMatScaleDiagInv_F( C, A, weight_AF, J_marker );
@@ -246,7 +268,7 @@ void hypre_BoomerAMGJacobiInterp_1( hypre_ParCSRMatrix * A,
    */
 #ifdef HYPRE_JACINT_PRINT_MATRICES
    hypre_sprintf( filename, "Cout%i", level );
-   if ( num_rows_diag_P <= HYPRE_MAX_PRINTABLE_MATRIX )  hypre_ParCSRMatrixPrintIJ( C,0,0,filename);
+   if ( num_rows_diag_P <= HYPRE_MAX_PRINTABLE_MATRIX ) { hypre_ParCSRMatrixPrintIJ( C, 0, 0, filename); }
 #endif
 
    Pnew = hypre_ParMatMinus_F( *P, C, J_marker );
@@ -258,11 +280,11 @@ void hypre_BoomerAMGJacobiInterp_1( hypre_ParCSRMatrix * A,
 #ifdef HYPRE_JACINT_PRINT_DIAGNOSTICS
    Pnew_diag = hypre_ParCSRMatrixDiag(Pnew);
    Pnew_offd = hypre_ParCSRMatrixOffd(Pnew);
-   Pnew_num_nonzeros = hypre_CSRMatrixNumNonzeros(Pnew_diag)+hypre_CSRMatrixNumNonzeros(Pnew_offd);
+   Pnew_num_nonzeros = hypre_CSRMatrixNumNonzeros(Pnew_diag) + hypre_CSRMatrixNumNonzeros(Pnew_offd);
    hypre_printf("%i %i Jacobi_Interp_1 after MatMinus, Pnew has %i+%i=%i nonzeros, local sum %e\n",
-          my_id, level, hypre_CSRMatrixNumNonzeros(Pnew_diag),
-          hypre_CSRMatrixNumNonzeros(Pnew_offd), Pnew_num_nonzeros,
-          hypre_ParCSRMatrixLocalSumElts(Pnew) );
+                my_id, level, hypre_CSRMatrixNumNonzeros(Pnew_diag),
+                hypre_CSRMatrixNumNonzeros(Pnew_offd), Pnew_num_nonzeros,
+                hypre_ParCSRMatrixLocalSumElts(Pnew) );
 #endif
 
    hypre_ParCSRMatrixDestroy( C );
@@ -271,10 +293,11 @@ void hypre_BoomerAMGJacobiInterp_1( hypre_ParCSRMatrix * A,
    /* Note that I'm truncating all the fine rows, not just the J-marked ones. */
 #if 0
    if ( Pnew_num_nonzeros < 10000 )  /* a fixed number like this makes it no.procs.-depdendent */
-   {  /* ad-hoc attempt to reduce zero-matrix problems seen in testing..*/
+   {
+      /* ad-hoc attempt to reduce zero-matrix problems seen in testing..*/
       truncation_threshold = 1.0e-6 * truncation_threshold;
       truncation_threshold_minus = 1.0e-6 * truncation_threshold_minus;
-  }
+   }
 #endif
    hypre_BoomerAMGTruncateInterp( Pnew, truncation_threshold,
                                   truncation_threshold_minus, CF_marker );
@@ -294,59 +317,71 @@ void hypre_BoomerAMGJacobiInterp_1( hypre_ParCSRMatrix * A,
    P_diag_j = hypre_CSRMatrixJ(P_diag);
    P_offd_data = hypre_CSRMatrixData(P_offd);
    P_offd_i = hypre_CSRMatrixI(P_offd);
-   PIimax=-1.0e12, PIimin=1.0e12, PIimav=0, PIipav=0;
-   nmav=0, npav=0;
-   for ( i=0; i<num_rows_diag_P; ++i )
+   PIimax = -1.0e12, PIimin = 1.0e12, PIimav = 0, PIipav = 0;
+   nmav = 0, npav = 0;
+   for ( i = 0; i < num_rows_diag_P; ++i )
    {
       PIi = 0;  /* i-th value of P*1, i.e. sum of row i of P */
-      for ( m=P_diag_i[i]; m<P_diag_i[i+1]; ++m )
+      for ( m = P_diag_i[i]; m < P_diag_i[i + 1]; ++m )
+      {
          PIi += P_diag_data[m];
-      for ( m=P_offd_i[i]; m<P_offd_i[i+1]; ++m )
+      }
+      for ( m = P_offd_i[i]; m < P_offd_i[i + 1]; ++m )
+      {
          PIi += P_offd_data[m];
-      if (CF_marker[i]<0)
+      }
+      if (CF_marker[i] < 0)
       {
          PIimax = hypre_max( PIimax, PIi );
          PIimin = hypre_min( PIimin, PIi );
-         if (PIi<=1-eps) { PIimav+=PIi; ++nmav; };
-         if (PIi>=1+eps) { PIipav+=PIi; ++npav; };
+         if (PIi <= 1 - eps) { PIimav += PIi; ++nmav; };
+         if (PIi >= 1 + eps) { PIipav += PIi; ++npav; };
       }
    }
-   if ( nmav>0 ) PIimav = PIimav/nmav;
-   if ( npav>0 ) PIipav = PIipav/npav;
+   if ( nmav > 0 ) { PIimav = PIimav / nmav; }
+   if ( npav > 0 ) { PIipav = PIipav / npav; }
    hypre_printf("%i %i P out max,min row sums %e %e\n", my_id, level, PIimax, PIimin );
 #endif
 
 #ifdef HYPRE_JACINT_PRINT_SOME_ROWS
    hypre_printf("some changed rows: ");
-   for ( isamp=0; isamp<n_sample_rows; ++isamp )
+   for ( isamp = 0; isamp < n_sample_rows; ++isamp )
    {
       i = sample_rows[isamp];
       hypre_printf( "%i: ", i );
-      for ( m=P_diag_i[i]; m<P_diag_i[i+1]; ++m )
+      for ( m = P_diag_i[i]; m < P_diag_i[i + 1]; ++m )
+      {
          hypre_printf( " %i %f, ", P_diag_j[m], P_diag_data[m] );
+      }
       hypre_printf(";  ");
    }
    hypre_printf("\n");
 #endif
-   ncmax=0; ncmin=num_rows_diag_P; nc1=0;
-   for ( i=0; i<num_rows_diag_P; ++i )
-      if (CF_marker[i]<0)
+   ncmax = 0; ncmin = num_rows_diag_P;
+#ifdef HYPRE_JACINT_PRINT_DIAGNOSTICS
+   nc1 = 0;
+#endif
+   for ( i = 0; i < num_rows_diag_P; ++i )
+      if (CF_marker[i] < 0)
       {
-         nc = P_diag_i[i+1] - P_diag_i[i];
-         if (nc<=1) ++nc1;
+         nc = P_diag_i[i + 1] - P_diag_i[i];
+#ifdef HYPRE_JACINT_PRINT_DIAGNOSTICS
+         if (nc <= 1) { ++nc1; }
+#endif
          ncmax = hypre_max( nc, ncmax );
          ncmin = hypre_min( nc, ncmin );
       }
 #ifdef HYPRE_JACINT_PRINT_DIAGNOSTICS
    hypre_printf("%i %i P has %i rows, %i changeable, %i too good, %i coarse\n",
-          my_id, level, num_rows_diag_P, num_rows_diag_P-Jnochanges-CF_coarse, Jnochanges, CF_coarse );
-   hypre_printf("%i %i min,max diag cols per row: %i, %i;  no.rows w.<=1 col: %i\n", my_id, level, ncmin, ncmax, nc1 );
+                my_id, level, num_rows_diag_P, num_rows_diag_P - Jnochanges - CF_coarse, Jnochanges, CF_coarse );
+   hypre_printf("%i %i min,max diag cols per row: %i, %i;  no.rows w.<=1 col: %i\n", my_id, level,
+                ncmin, ncmax, nc1 );
 
    hypre_printf("%i %i Jacobi_Interp_1 after truncation (%e), Pnew has %i+%i=%i nonzeros, local sum %e\n",
-          my_id, level, truncation_threshold,
-          hypre_CSRMatrixNumNonzeros(Pnew_diag), hypre_CSRMatrixNumNonzeros(Pnew_offd),
-          hypre_CSRMatrixNumNonzeros(Pnew_diag)+hypre_CSRMatrixNumNonzeros(Pnew_offd),
-          hypre_ParCSRMatrixLocalSumElts(Pnew) );
+                my_id, level, truncation_threshold,
+                hypre_CSRMatrixNumNonzeros(Pnew_diag), hypre_CSRMatrixNumNonzeros(Pnew_offd),
+                hypre_CSRMatrixNumNonzeros(Pnew_diag) + hypre_CSRMatrixNumNonzeros(Pnew_offd),
+                hypre_ParCSRMatrixLocalSumElts(Pnew) );
 #endif
 
    /* Programming Notes:
@@ -355,10 +390,10 @@ void hypre_BoomerAMGJacobiInterp_1( hypre_ParCSRMatrix * A,
    */
 #ifdef HYPRE_JACINT_PRINT_MATRICES
    hypre_sprintf( filename, "Pout%i", level );
-   if ( num_rows_diag_P <= HYPRE_MAX_PRINTABLE_MATRIX )  hypre_ParCSRMatrixPrintIJ( *P,0,0,filename);
+   if ( num_rows_diag_P <= HYPRE_MAX_PRINTABLE_MATRIX ) { hypre_ParCSRMatrixPrintIJ( *P, 0, 0, filename); }
 #endif
 
-   hypre_TFree( J_marker , HYPRE_MEMORY_HOST);
+   hypre_TFree( J_marker, HYPRE_MEMORY_HOST);
 
 }
 
@@ -395,8 +430,8 @@ void hypre_BoomerAMGTruncateInterp( hypre_ParCSRMatrix *P,
    HYPRE_Int       *P_offd_j = hypre_CSRMatrixJ(P_offd);
    HYPRE_Int       *new_P_diag_i;
    HYPRE_Int       *new_P_offd_i;
-   HYPRE_Int	num_rows_diag_P = hypre_CSRMatrixNumRows(P_diag);
-   HYPRE_Int	num_rows_offd_P = hypre_CSRMatrixNumRows(P_offd);
+   HYPRE_Int   num_rows_diag_P = hypre_CSRMatrixNumRows(P_diag);
+   HYPRE_Int   num_rows_offd_P = hypre_CSRMatrixNumRows(P_offd);
    HYPRE_Int num_nonzeros_diag = hypre_CSRMatrixNumNonzeros(P_diag);
    HYPRE_Int num_nonzeros_offd = hypre_CSRMatrixNumNonzeros(P_offd);
 #if 0
@@ -411,18 +446,18 @@ void hypre_BoomerAMGTruncateInterp( hypre_ParCSRMatrix *P,
    /* compute vmax = eps*max(P(i,j)), vmin = eps*min(P(i,j)) */
    for ( i1 = 0; i1 < num_rows_diag_P; i1++ )
    {
-      for ( m=P_diag_i[i1]; m<P_diag_i[i1+1]; ++m )
-         {
-            v = P_diag_data[m];
-            vmax = hypre_max( v, vmax );
-            vmin = hypre_min( v, vmin );
-         }
-      for ( m=P_offd_i[i1]; m<P_offd_i[i1+1]; ++m )
-         {
-            v = P_offd_data[m];
-            vmax = hypre_max( v, vmax );
-            vmin = hypre_min( v, vmin );
-         }
+      for ( m = P_diag_i[i1]; m < P_diag_i[i1 + 1]; ++m )
+      {
+         v = P_diag_data[m];
+         vmax = hypre_max( v, vmax );
+         vmin = hypre_min( v, vmin );
+      }
+      for ( m = P_offd_i[i1]; m < P_offd_i[i1 + 1]; ++m )
+      {
+         v = P_offd_data[m];
+         vmax = hypre_max( v, vmax );
+         vmin = hypre_min( v, vmin );
+      }
    }
 #if 0
    /* This can make max,min global so results don't depend on no. processors
@@ -433,8 +468,8 @@ void hypre_BoomerAMGTruncateInterp( hypre_ParCSRMatrix *P,
    hypre_MPI_Allreduce( &vmax1, &vmax, 1, HYPRE_MPI_REAL, hypre_MPI_MAX, comm );
    hypre_MPI_Allreduce( &vmin1, &vmin, 1, HYPRE_MPI_REAL, hypre_MPI_MIN, comm );
 #endif
-   if ( vmax <= 0.0 ) vmax =  1.0;  /* make sure no v is v>vmax if no v is v>0 */
-   if ( vmin >= 0.0 ) vmin = -1.0;  /* make sure no v is v<vmin if no v is v<0 */
+   if ( vmax <= 0.0 ) { vmax =  1.0; }  /* make sure no v is v>vmax if no v is v>0 */
+   if ( vmin >= 0.0 ) { vmin = -1.0; }  /* make sure no v is v<vmin if no v is v<0 */
    wmax = - dlt * vmin;
    wmin = - dlt * vmax;
    vmax *= eps;
@@ -444,67 +479,76 @@ void hypre_BoomerAMGTruncateInterp( hypre_ParCSRMatrix *P,
       Elements of Coarse rows (CF_marker>=0) are always kept.
       The arrays are not re-allocated, so there will generally be unused space
       at the ends of the arrays. */
-   new_P_diag_i = hypre_CTAlloc( HYPRE_Int,  num_rows_diag_P+1 , HYPRE_MEMORY_HOST);
-   new_P_offd_i = hypre_CTAlloc( HYPRE_Int,  num_rows_offd_P+1 , HYPRE_MEMORY_HOST);
+   new_P_diag_i = hypre_CTAlloc( HYPRE_Int,  num_rows_diag_P + 1, HYPRE_MEMORY_HOST);
+   new_P_offd_i = hypre_CTAlloc( HYPRE_Int,  num_rows_offd_P + 1, HYPRE_MEMORY_HOST);
    m1d = P_diag_i[0];
    m1o = P_offd_i[0];
    for ( i1 = 0; i1 < num_rows_diag_P; i1++ )
    {
       old_sum = 0;
       new_sum = 0;
-      for ( m=P_diag_i[i1]; m<P_diag_i[i1+1]; ++m )
+      for ( m = P_diag_i[i1]; m < P_diag_i[i1 + 1]; ++m )
       {
          v = P_diag_data[m];
          old_sum += v;
-         if ( CF_marker[i1]>=0 || ( v>=vmax && v>=wmax ) || ( v<=vmin && v<=wmin ) )
-         {  /* keep v */
+         if ( CF_marker[i1] >= 0 || ( v >= vmax && v >= wmax ) || ( v <= vmin && v <= wmin ) )
+         {
+            /* keep v */
             new_sum += v;
             P_diag_j[m1d] = P_diag_j[m];
             P_diag_data[m1d] = P_diag_data[m];
             ++m1d;
          }
          else
-         {  /* discard v */
+         {
+            /* discard v */
             --num_nonzeros_diag;
          }
       }
-      for ( m=P_offd_i[i1]; m<P_offd_i[i1+1]; ++m )
+      for ( m = P_offd_i[i1]; m < P_offd_i[i1 + 1]; ++m )
       {
          v = P_offd_data[m];
          old_sum += v;
-         if ( CF_marker[i1]>=0 || ( v>=vmax && v>=wmax ) || ( v<=vmin && v<=wmin ) )
-         {  /* keep v */
+         if ( CF_marker[i1] >= 0 || ( v >= vmax && v >= wmax ) || ( v <= vmin && v <= wmin ) )
+         {
+            /* keep v */
             new_sum += v;
             P_offd_j[m1o] = P_offd_j[m];
             P_offd_data[m1o] = P_offd_data[m];
             ++m1o;
          }
          else
-         {  /* discard v */
+         {
+            /* discard v */
             --num_nonzeros_offd;
          }
       }
 
-      new_P_diag_i[i1+1] = m1d;
-      if ( i1<num_rows_offd_P ) new_P_offd_i[i1+1] = m1o;
+      new_P_diag_i[i1 + 1] = m1d;
+      if ( i1 < num_rows_offd_P ) { new_P_offd_i[i1 + 1] = m1o; }
 
       /* rescale to keep row sum the same */
-      if (new_sum!=0) scale = old_sum/new_sum; else scale = 1.0;
-      for ( m=new_P_diag_i[i1]; m<new_P_diag_i[i1+1]; ++m )
+      if (new_sum != 0) { scale = old_sum / new_sum; }
+      else { scale = 1.0; }
+      for ( m = new_P_diag_i[i1]; m < new_P_diag_i[i1 + 1]; ++m )
+      {
          P_diag_data[m] *= scale;
-      if ( i1<num_rows_offd_P ) /* this test fails when there is no offd block */
-         for ( m=new_P_offd_i[i1]; m<new_P_offd_i[i1+1]; ++m )
+      }
+      if ( i1 < num_rows_offd_P ) /* this test fails when there is no offd block */
+         for ( m = new_P_offd_i[i1]; m < new_P_offd_i[i1 + 1]; ++m )
+         {
             P_offd_data[m] *= scale;
+         }
 
    }
 
    for ( i1 = 1; i1 <= num_rows_diag_P; i1++ )
    {
       P_diag_i[i1] = new_P_diag_i[i1];
-      if ( i1<=num_rows_offd_P && num_nonzeros_offd>0 ) P_offd_i[i1] = new_P_offd_i[i1];
+      if ( i1 <= num_rows_offd_P && num_nonzeros_offd > 0 ) { P_offd_i[i1] = new_P_offd_i[i1]; }
    }
-   hypre_TFree( new_P_diag_i , HYPRE_MEMORY_HOST);
-   if ( num_rows_offd_P>0 ) hypre_TFree( new_P_offd_i , HYPRE_MEMORY_HOST);
+   hypre_TFree( new_P_diag_i, HYPRE_MEMORY_HOST);
+   if ( num_rows_offd_P > 0 ) { hypre_TFree( new_P_offd_i, HYPRE_MEMORY_HOST); }
 
    hypre_CSRMatrixNumNonzeros(P_diag) = num_nonzeros_diag;
    hypre_CSRMatrixNumNonzeros(P_offd) = num_nonzeros_offd;
@@ -534,51 +578,53 @@ hypre_ParCSRMatrix_dof_func_offd(
    hypre_ParCSRCommHandle  *comm_handle;
    hypre_CSRMatrix    *A_offd          = hypre_ParCSRMatrixOffd(A);
 
-   HYPRE_Int 		       num_cols_offd = 0;
+   HYPRE_Int             num_cols_offd = 0;
    HYPRE_Int                 Solve_err_flag = 0;
-   HYPRE_Int			num_sends;
-   HYPRE_Int		       *int_buf_data;
-   HYPRE_Int			index, start, i, j;
+   HYPRE_Int         num_sends;
+   HYPRE_Int             *int_buf_data;
+   HYPRE_Int         index, start, i, j;
 
    num_cols_offd = hypre_CSRMatrixNumCols(A_offd);
    *dof_func_offd = NULL;
    if (num_cols_offd)
    {
-        if (num_functions > 1)
-	   *dof_func_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_offd, HYPRE_MEMORY_HOST);
+      if (num_functions > 1)
+      {
+         *dof_func_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_offd, HYPRE_MEMORY_HOST);
+      }
    }
 
 
-  /*-------------------------------------------------------------------
-    * Get the dof_func data for the off-processor columns
-    *-------------------------------------------------------------------*/
+   /*-------------------------------------------------------------------
+     * Get the dof_func data for the off-processor columns
+     *-------------------------------------------------------------------*/
 
    if (!comm_pkg)
    {
-	hypre_MatvecCommPkgCreate(A);
-	comm_pkg = hypre_ParCSRMatrixCommPkg(A);
+      hypre_MatvecCommPkgCreate(A);
+      comm_pkg = hypre_ParCSRMatrixCommPkg(A);
    }
 
    num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
    if (num_functions > 1)
    {
       int_buf_data = hypre_CTAlloc(HYPRE_Int, hypre_ParCSRCommPkgSendMapStart(comm_pkg,
-						num_sends), HYPRE_MEMORY_HOST);
+                                                                              num_sends), HYPRE_MEMORY_HOST);
       index = 0;
       for (i = 0; i < num_sends; i++)
       {
-	 start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-	 for (j=start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
-		int_buf_data[index++]
-		 = dof_func[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+         start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
+         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
+            int_buf_data[index++]
+               = dof_func[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
       }
 
       comm_handle = hypre_ParCSRCommHandleCreate( 11, comm_pkg, int_buf_data,
-	*dof_func_offd);
+                                                  *dof_func_offd);
 
       hypre_ParCSRCommHandleDestroy(comm_handle);
       hypre_TFree(int_buf_data, HYPRE_MEMORY_HOST);
    }
 
-   return(Solve_err_flag);
+   return (Solve_err_flag);
 }
diff --git a/external/hypre/src/parcsr_ls/par_krylov_func.c b/external/hypre/src/parcsr_ls/par_krylov_func.c
index ae3c48b9..4eb05cc8 100644
--- a/external/hypre/src/parcsr_ls/par_krylov_func.c
+++ b/external/hypre/src/parcsr_ls/par_krylov_func.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -16,7 +16,7 @@ hypre_ParKrylovCAlloc( size_t               count,
                        size_t               elt_size,
                        HYPRE_MemoryLocation location )
 {
-   return( (void*) hypre_CTAlloc(char, count * elt_size, location) );
+   return ( (void*) hypre_CTAlloc(char, count * elt_size, location) );
 }
 
 /*--------------------------------------------------------------------------
@@ -28,7 +28,7 @@ hypre_ParKrylovFree( void *ptr )
 {
    HYPRE_Int ierr = 0;
 
-   hypre_TFree( ptr , HYPRE_MEMORY_HOST);
+   hypre_TFree( ptr, HYPRE_MEMORY_HOST);
 
    return ierr;
 }
@@ -43,9 +43,10 @@ hypre_ParKrylovCreateVector( void *vvector )
    hypre_ParVector *vector = (hypre_ParVector *) vvector;
    hypre_ParVector *new_vector;
 
-   new_vector = hypre_ParVectorCreate( hypre_ParVectorComm(vector),
-                                       hypre_ParVectorGlobalSize(vector),
-                                       hypre_ParVectorPartitioning(vector) );
+   new_vector = hypre_ParMultiVectorCreate( hypre_ParVectorComm(vector),
+                                            hypre_ParVectorGlobalSize(vector),
+                                            hypre_ParVectorPartitioning(vector),
+                                            hypre_ParVectorNumVectors(vector) );
 
    hypre_ParVectorInitialize_v2(new_vector, hypre_ParVectorMemoryLocation(vector));
 
@@ -64,20 +65,22 @@ hypre_ParKrylovCreateVectorArray(HYPRE_Int n, void *vvector )
    hypre_ParVector *vector = (hypre_ParVector *) vvector;
 
    hypre_ParVector **new_vector;
-   HYPRE_Int i, size;
+   HYPRE_Int i, size, num_vectors;
    HYPRE_Complex *array_data;
 
    HYPRE_MemoryLocation memory_location = hypre_ParVectorMemoryLocation(vector);
 
    size = hypre_VectorSize(hypre_ParVectorLocalVector(vector));
-   array_data = hypre_CTAlloc(HYPRE_Complex, (n*size), memory_location);
+   num_vectors = hypre_VectorNumVectors(hypre_ParVectorLocalVector(vector));
+   array_data = hypre_CTAlloc(HYPRE_Complex, (n * size * num_vectors), memory_location);
    new_vector = hypre_CTAlloc(hypre_ParVector*, n, HYPRE_MEMORY_HOST);
    for (i = 0; i < n; i++)
    {
-      new_vector[i] = hypre_ParVectorCreate( hypre_ParVectorComm(vector),
-                                             hypre_ParVectorGlobalSize(vector),
-                                             hypre_ParVectorPartitioning(vector) );
-      hypre_VectorData(hypre_ParVectorLocalVector(new_vector[i])) = &array_data[i*size];
+      new_vector[i] = hypre_ParMultiVectorCreate( hypre_ParVectorComm(vector),
+                                                  hypre_ParVectorGlobalSize(vector),
+                                                  hypre_ParVectorPartitioning(vector),
+                                                  hypre_ParVectorNumVectors(vector) );
+      hypre_VectorData(hypre_ParVectorLocalVector(new_vector[i])) = &array_data[i * size * num_vectors];
       hypre_ParVectorInitialize_v2(new_vector[i], memory_location);
       if (i)
       {
@@ -98,7 +101,7 @@ hypre_ParKrylovDestroyVector( void *vvector )
 {
    hypre_ParVector *vector = (hypre_ParVector *) vvector;
 
-   return( hypre_ParVectorDestroy( vector ) );
+   return ( hypre_ParVectorDestroy( vector ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -109,6 +112,9 @@ void *
 hypre_ParKrylovMatvecCreate( void   *A,
                              void   *x )
 {
+   HYPRE_UNUSED_VAR(A);
+   HYPRE_UNUSED_VAR(x);
+
    void *matvec_data;
 
    matvec_data = NULL;
@@ -121,13 +127,15 @@ hypre_ParKrylovMatvecCreate( void   *A,
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_ParKrylovMatvec( void   *matvec_data,
+hypre_ParKrylovMatvec( void          *matvec_data,
                        HYPRE_Complex  alpha,
-                       void   *A,
-                       void   *x,
+                       void          *A,
+                       void          *x,
                        HYPRE_Complex  beta,
-                       void   *y           )
+                       void          *y )
 {
+   HYPRE_UNUSED_VAR(matvec_data);
+
    return ( hypre_ParCSRMatrixMatvec ( alpha,
                                        (hypre_ParCSRMatrix *) A,
                                        (hypre_ParVector *) x,
@@ -140,13 +148,15 @@ hypre_ParKrylovMatvec( void   *matvec_data,
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_ParKrylovMatvecT(void   *matvec_data,
+hypre_ParKrylovMatvecT(void          *matvec_data,
                        HYPRE_Complex  alpha,
-                       void   *A,
-                       void   *x,
+                       void          *A,
+                       void          *x,
                        HYPRE_Complex  beta,
-                       void   *y           )
+                       void          *y)
 {
+   HYPRE_UNUSED_VAR(matvec_data);
+
    return ( hypre_ParCSRMatrixMatvecT( alpha,
                                        (hypre_ParCSRMatrix *) A,
                                        (hypre_ParVector *) x,
@@ -161,6 +171,8 @@ hypre_ParKrylovMatvecT(void   *matvec_data,
 HYPRE_Int
 hypre_ParKrylovMatvecDestroy( void *matvec_data )
 {
+   HYPRE_UNUSED_VAR(matvec_data);
+
    return 0;
 }
 
@@ -181,9 +193,10 @@ hypre_ParKrylovInnerProd( void *x,
  *--------------------------------------------------------------------------*/
 HYPRE_Int
 hypre_ParKrylovMassInnerProd( void *x,
-                          void **y, HYPRE_Int k, HYPRE_Int unroll, void  * result )
+                              void **y, HYPRE_Int k, HYPRE_Int unroll, void  * result )
 {
-   return ( hypre_ParVectorMassInnerProd( (hypre_ParVector *) x,(hypre_ParVector **) y, k, unroll, (HYPRE_Real*)result ) );
+   return ( hypre_ParVectorMassInnerProd( (hypre_ParVector *) x, (hypre_ParVector **) y, k, unroll,
+                                          (HYPRE_Real*)result ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -191,10 +204,11 @@ hypre_ParKrylovMassInnerProd( void *x,
  *--------------------------------------------------------------------------*/
 HYPRE_Int
 hypre_ParKrylovMassDotpTwo( void *x, void *y,
-                          void **z, HYPRE_Int k, HYPRE_Int unroll, void  *result_x, void *result_y )
+                            void **z, HYPRE_Int k, HYPRE_Int unroll, void  *result_x, void *result_y )
 {
-   return ( hypre_ParVectorMassDotpTwo( (hypre_ParVector *) x, (hypre_ParVector *) y, (hypre_ParVector **) z, k,
-            unroll, (HYPRE_Real *)result_x, (HYPRE_Real *)result_y ) );
+   return ( hypre_ParVectorMassDotpTwo( (hypre_ParVector *) x, (hypre_ParVector *) y,
+                                        (hypre_ParVector **) z, k,
+                                        unroll, (HYPRE_Real *)result_x, (HYPRE_Real *)result_y ) );
 }
 
 
@@ -218,7 +232,7 @@ hypre_ParKrylovCopyVector( void *x,
 HYPRE_Int
 hypre_ParKrylovClearVector( void *x )
 {
-   return ( hypre_ParVectorSetConstantValues( (hypre_ParVector *) x, 0.0 ) );
+   return ( hypre_ParVectorSetZeros( (hypre_ParVector *) x ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -270,8 +284,8 @@ HYPRE_Int
 hypre_ParKrylovCommInfo( void   *A, HYPRE_Int *my_id, HYPRE_Int *num_procs)
 {
    MPI_Comm comm = hypre_ParCSRMatrixComm ( (hypre_ParCSRMatrix *) A);
-   hypre_MPI_Comm_size(comm,num_procs);
-   hypre_MPI_Comm_rank(comm,my_id);
+   hypre_MPI_Comm_size(comm, num_procs);
+   hypre_MPI_Comm_rank(comm, my_id);
    return 0;
 }
 
@@ -286,6 +300,11 @@ hypre_ParKrylovIdentitySetup( void *vdata,
                               void *x     )
 
 {
+   HYPRE_UNUSED_VAR(vdata);
+   HYPRE_UNUSED_VAR(A);
+   HYPRE_UNUSED_VAR(b);
+   HYPRE_UNUSED_VAR(x);
+
    return 0;
 }
 
@@ -300,5 +319,8 @@ hypre_ParKrylovIdentity( void *vdata,
                          void *x     )
 
 {
-   return( hypre_ParKrylovCopyVector( b, x ) );
+   HYPRE_UNUSED_VAR(vdata);
+   HYPRE_UNUSED_VAR(A);
+
+   return ( hypre_ParKrylovCopyVector( b, x ) );
 }
diff --git a/external/hypre/src/parcsr_ls/par_laplace.c b/external/hypre/src/parcsr_ls/par_laplace.c
index 49ed4533..43343211 100644
--- a/external/hypre/src/parcsr_ls/par_laplace.c
+++ b/external/hypre/src/parcsr_ls/par_laplace.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -37,7 +37,7 @@ GenerateLaplacian( MPI_Comm       comm,
    HYPRE_BigInt *big_offd_j = NULL;
    HYPRE_Real *offd_data = NULL;
 
-   HYPRE_BigInt *global_part;
+   HYPRE_BigInt global_part[2];
    HYPRE_BigInt ix, iy, iz;
    HYPRE_Int cnt, o_cnt;
    HYPRE_Int local_num_rows;
@@ -56,40 +56,39 @@ GenerateLaplacian( MPI_Comm       comm,
    HYPRE_Int num_procs;
    HYPRE_Int P_busy, Q_busy, R_busy;
 
-   hypre_MPI_Comm_size(comm,&num_procs);
+   hypre_MPI_Comm_size(comm, &num_procs);
 
-   grid_size = nx*ny*nz;
+   grid_size = nx * ny * nz;
 
-   hypre_GeneratePartitioning(nx,P,&nx_part);
-   hypre_GeneratePartitioning(ny,Q,&ny_part);
-   hypre_GeneratePartitioning(nz,R,&nz_part);
+   hypre_GeneratePartitioning(nx, P, &nx_part);
+   hypre_GeneratePartitioning(ny, Q, &ny_part);
+   hypre_GeneratePartitioning(nz, R, &nz_part);
 
-   nx_local =(HYPRE_Int)(nx_part[ip+1] - nx_part[ip]);
-   ny_local =(HYPRE_Int)(ny_part[iq+1] - ny_part[iq]);
-   nz_local =(HYPRE_Int)(nz_part[ir+1] - nz_part[ir]);
+   nx_local = (HYPRE_Int)(nx_part[ip + 1] - nx_part[ip]);
+   ny_local = (HYPRE_Int)(ny_part[iq + 1] - ny_part[iq]);
+   nz_local = (HYPRE_Int)(nz_part[ir + 1] - nz_part[ir]);
 
-   local_num_rows = nx_local*ny_local*nz_local;
+   local_num_rows = nx_local * ny_local * nz_local;
 
-   global_part = hypre_CTAlloc(HYPRE_BigInt, 2, HYPRE_MEMORY_HOST);
-   global_part[0] = nz_part[ir]*nx*ny+(ny_part[iq]*nx+nx_part[ip]*ny_local)*nz_local;
+   global_part[0] = nz_part[ir] * nx * ny + (ny_part[iq] * nx + nx_part[ip] * ny_local) * nz_local;
    global_part[1] = global_part[0] + (HYPRE_BigInt)local_num_rows;
 
-   diag_i = hypre_CTAlloc(HYPRE_Int, local_num_rows+1, HYPRE_MEMORY_HOST);
-   offd_i = hypre_CTAlloc(HYPRE_Int, local_num_rows+1, HYPRE_MEMORY_HOST);
+   diag_i = hypre_CTAlloc(HYPRE_Int, local_num_rows + 1, HYPRE_MEMORY_HOST);
+   offd_i = hypre_CTAlloc(HYPRE_Int, local_num_rows + 1, HYPRE_MEMORY_HOST);
 
-   P_busy = hypre_min(nx,P);
-   Q_busy = hypre_min(ny,Q);
-   R_busy = hypre_min(nz,R);
+   P_busy = hypre_min(nx, P);
+   Q_busy = hypre_min(ny, Q);
+   R_busy = hypre_min(nz, R);
 
    num_cols_offd = 0;
-   if (ip) num_cols_offd += ny_local*nz_local;
-   if (ip < P_busy-1) num_cols_offd += ny_local*nz_local;
-   if (iq) num_cols_offd += nx_local*nz_local;
-   if (iq < Q_busy-1) num_cols_offd += nx_local*nz_local;
-   if (ir) num_cols_offd += nx_local*ny_local;
-   if (ir < R_busy-1) num_cols_offd += nx_local*ny_local;
+   if (ip) { num_cols_offd += ny_local * nz_local; }
+   if (ip < P_busy - 1) { num_cols_offd += ny_local * nz_local; }
+   if (iq) { num_cols_offd += nx_local * nz_local; }
+   if (iq < Q_busy - 1) { num_cols_offd += nx_local * nz_local; }
+   if (ir) { num_cols_offd += nx_local * ny_local; }
+   if (ir < R_busy - 1) { num_cols_offd += nx_local * ny_local; }
 
-   if (!local_num_rows) num_cols_offd = 0;
+   if (!local_num_rows) { num_cols_offd = 0; }
 
    col_map_offd = hypre_CTAlloc(HYPRE_BigInt, num_cols_offd, HYPRE_MEMORY_HOST);
 
@@ -97,17 +96,19 @@ GenerateLaplacian( MPI_Comm       comm,
    o_cnt = 1;
    diag_i[0] = 0;
    offd_i[0] = 0;
-   for (iz = nz_part[ir]; iz < nz_part[ir+1]; iz++)
+   for (iz = nz_part[ir]; iz < nz_part[ir + 1]; iz++)
    {
-      for (iy = ny_part[iq];  iy < ny_part[iq+1]; iy++)
+      for (iy = ny_part[iq];  iy < ny_part[iq + 1]; iy++)
       {
-         for (ix = nx_part[ip]; ix < nx_part[ip+1]; ix++)
+         for (ix = nx_part[ip]; ix < nx_part[ip + 1]; ix++)
          {
-            diag_i[cnt] = diag_i[cnt-1];
-            offd_i[o_cnt] = offd_i[o_cnt-1];
+            diag_i[cnt] = diag_i[cnt - 1];
+            offd_i[o_cnt] = offd_i[o_cnt - 1];
             diag_i[cnt]++;
             if (iz > nz_part[ir])
+            {
                diag_i[cnt]++;
+            }
             else
             {
                if (iz)
@@ -116,7 +117,9 @@ GenerateLaplacian( MPI_Comm       comm,
                }
             }
             if (iy > ny_part[iq] )
+            {
                diag_i[cnt]++;
+            }
             else
             {
                if (iy)
@@ -125,7 +128,9 @@ GenerateLaplacian( MPI_Comm       comm,
                }
             }
             if (ix > nx_part[ip] )
+            {
                diag_i[cnt]++;
+            }
             else
             {
                if (ix)
@@ -133,29 +138,35 @@ GenerateLaplacian( MPI_Comm       comm,
                   offd_i[o_cnt]++;
                }
             }
-            if (ix+1 < nx_part[ip+1])
+            if (ix + 1 < nx_part[ip + 1])
+            {
                diag_i[cnt]++;
+            }
             else
             {
-               if (ix+1 < nx)
+               if (ix + 1 < nx)
                {
                   offd_i[o_cnt]++;
                }
             }
-            if (iy+1 < ny_part[iq+1])
+            if (iy + 1 < ny_part[iq + 1])
+            {
                diag_i[cnt]++;
+            }
             else
             {
-               if (iy+1 < ny)
+               if (iy + 1 < ny)
                {
                   offd_i[o_cnt]++;
                }
             }
-            if (iz+1 < nz_part[ir+1])
+            if (iz + 1 < nz_part[ir + 1])
+            {
                diag_i[cnt]++;
+            }
             else
             {
-               if (iz+1 < nz)
+               if (iz + 1 < nz)
                {
                   offd_i[o_cnt]++;
                }
@@ -179,95 +190,95 @@ GenerateLaplacian( MPI_Comm       comm,
    row_index = 0;
    cnt = 0;
    o_cnt = 0;
-   for (iz = nz_part[ir]; iz < nz_part[ir+1]; iz++)
+   for (iz = nz_part[ir]; iz < nz_part[ir + 1]; iz++)
    {
-      for (iy = ny_part[iq];  iy < ny_part[iq+1]; iy++)
+      for (iy = ny_part[iq];  iy < ny_part[iq + 1]; iy++)
       {
-         for (ix = nx_part[ip]; ix < nx_part[ip+1]; ix++)
+         for (ix = nx_part[ip]; ix < nx_part[ip + 1]; ix++)
          {
             diag_j[cnt] = row_index;
             diag_data[cnt++] = value[0];
             if (iz > nz_part[ir])
             {
-               diag_j[cnt] = row_index-nx_local*ny_local;
+               diag_j[cnt] = row_index - nx_local * ny_local;
                diag_data[cnt++] = value[3];
             }
             else
             {
                if (iz)
                {
-                  big_offd_j[o_cnt] = hypre_map(ix,iy,iz-1,ip,iq,ir-1,nx,ny,
-                                                nx_part,ny_part,nz_part);
+                  big_offd_j[o_cnt] = hypre_map(ix, iy, iz - 1, ip, iq, ir - 1, nx, ny,
+                                                nx_part, ny_part, nz_part);
                   offd_data[o_cnt++] = value[3];
                }
             }
             if (iy > ny_part[iq])
             {
-               diag_j[cnt] = row_index-nx_local;
+               diag_j[cnt] = row_index - nx_local;
                diag_data[cnt++] = value[2];
             }
             else
             {
                if (iy)
                {
-                  big_offd_j[o_cnt] = hypre_map(ix,iy-1,iz,ip,iq-1,ir,nx,ny,
-                                                nx_part,ny_part,nz_part);
+                  big_offd_j[o_cnt] = hypre_map(ix, iy - 1, iz, ip, iq - 1, ir, nx, ny,
+                                                nx_part, ny_part, nz_part);
                   offd_data[o_cnt++] = value[2];
                }
             }
             if (ix > nx_part[ip])
             {
-               diag_j[cnt] = row_index-1;
+               diag_j[cnt] = row_index - 1;
                diag_data[cnt++] = value[1];
             }
             else
             {
                if (ix)
                {
-                  big_offd_j[o_cnt] = hypre_map(ix-1,iy,iz,ip-1,iq,ir,nx,ny,
-                                                nx_part,ny_part,nz_part);
+                  big_offd_j[o_cnt] = hypre_map(ix - 1, iy, iz, ip - 1, iq, ir, nx, ny,
+                                                nx_part, ny_part, nz_part);
                   offd_data[o_cnt++] = value[1];
                }
             }
-            if (ix+1 < nx_part[ip+1])
+            if (ix + 1 < nx_part[ip + 1])
             {
-               diag_j[cnt] = row_index+1;
+               diag_j[cnt] = row_index + 1;
                diag_data[cnt++] = value[1];
             }
             else
             {
-               if (ix+1 < nx)
+               if (ix + 1 < nx)
                {
-                  big_offd_j[o_cnt] = hypre_map(ix+1,iy,iz,ip+1,iq,ir,nx,ny,
-                                                nx_part,ny_part,nz_part);
+                  big_offd_j[o_cnt] = hypre_map(ix + 1, iy, iz, ip + 1, iq, ir, nx, ny,
+                                                nx_part, ny_part, nz_part);
                   offd_data[o_cnt++] = value[1];
                }
             }
-            if (iy+1 < ny_part[iq+1])
+            if (iy + 1 < ny_part[iq + 1])
             {
-               diag_j[cnt] = row_index+nx_local;
+               diag_j[cnt] = row_index + nx_local;
                diag_data[cnt++] = value[2];
             }
             else
             {
-               if (iy+1 < ny)
+               if (iy + 1 < ny)
                {
-                  big_offd_j[o_cnt] = hypre_map(ix,iy+1,iz,ip,iq+1,ir,nx,ny,
-                                                nx_part,ny_part,nz_part);
+                  big_offd_j[o_cnt] = hypre_map(ix, iy + 1, iz, ip, iq + 1, ir, nx, ny,
+                                                nx_part, ny_part, nz_part);
                   offd_data[o_cnt++] = value[2];
                }
             }
-            if (iz+1 < nz_part[ir+1])
+            if (iz + 1 < nz_part[ir + 1])
             {
-               diag_j[cnt] = row_index+nx_local*ny_local;
+               diag_j[cnt] = row_index + nx_local * ny_local;
                diag_data[cnt++] = value[3];
             }
             else
             {
-               if (iz+1 < nz)
+               if (iz + 1 < nz)
                {
-                  big_offd_j[o_cnt] = hypre_map(ix,iy,iz+1,ip,iq,ir+1,nx,ny,
-                                                nx_part,ny_part,nz_part);
+                  big_offd_j[o_cnt] = hypre_map(ix, iy, iz + 1, ip, iq, ir + 1, nx, ny,
+                                                nx_part, ny_part, nz_part);
                   offd_data[o_cnt++] = value[3];
                }
             }
@@ -278,13 +289,15 @@ GenerateLaplacian( MPI_Comm       comm,
 
    if (num_procs > 1)
    {
-      for (i=0; i < num_cols_offd; i++)
+      for (i = 0; i < num_cols_offd; i++)
+      {
          col_map_offd[i] = big_offd_j[i];
+      }
 
-      hypre_BigQsort0(col_map_offd, 0, num_cols_offd-1);
+      hypre_BigQsort0(col_map_offd, 0, num_cols_offd - 1);
 
-      for (i=0; i < num_cols_offd; i++)
-         for (j=0; j < num_cols_offd; j++)
+      for (i = 0; i < num_cols_offd; i++)
+         for (j = 0; j < num_cols_offd; j++)
             if (big_offd_j[i] == col_map_offd[j])
             {
                offd_j[i] = j;
@@ -326,7 +339,6 @@ GenerateLaplacian( MPI_Comm       comm,
    hypre_TFree(ny_part,     HYPRE_MEMORY_HOST);
    hypre_TFree(nz_part,     HYPRE_MEMORY_HOST);
    hypre_TFree(big_offd_j,  HYPRE_MEMORY_HOST);
-   hypre_TFree(global_part, HYPRE_MEMORY_HOST);
 
    return (HYPRE_ParCSRMatrix) A;
 }
@@ -336,27 +348,28 @@ GenerateLaplacian( MPI_Comm       comm,
 
 HYPRE_BigInt
 hypre_map(HYPRE_BigInt  ix,
-     HYPRE_BigInt  iy,
-     HYPRE_BigInt  iz,
-     HYPRE_Int     p,
-     HYPRE_Int     q,
-     HYPRE_Int     r,
-     HYPRE_BigInt  nx,
-     HYPRE_BigInt  ny,
-     HYPRE_BigInt *nx_part,
-     HYPRE_BigInt *ny_part,
-     HYPRE_BigInt *nz_part)
+          HYPRE_BigInt  iy,
+          HYPRE_BigInt  iz,
+          HYPRE_Int     p,
+          HYPRE_Int     q,
+          HYPRE_Int     r,
+          HYPRE_BigInt  nx,
+          HYPRE_BigInt  ny,
+          HYPRE_BigInt *nx_part,
+          HYPRE_BigInt *ny_part,
+          HYPRE_BigInt *nz_part)
 {
-   HYPRE_Int nx_local = (HYPRE_Int)(nx_part[p+1]-nx_part[p]);
-   HYPRE_Int ny_local = (HYPRE_Int)(ny_part[q+1]-ny_part[q]);
-   HYPRE_Int nz_local = (HYPRE_Int)(nz_part[r+1]-nz_part[r]);
-   HYPRE_Int ix_local = (HYPRE_Int)(ix-nx_part[p]);
-   HYPRE_Int iy_local = (HYPRE_Int)(iy-ny_part[q]);
-   HYPRE_Int iz_local = (HYPRE_Int)(iz-nz_part[r]);
+   HYPRE_Int nx_local = (HYPRE_Int)(nx_part[p + 1] - nx_part[p]);
+   HYPRE_Int ny_local = (HYPRE_Int)(ny_part[q + 1] - ny_part[q]);
+   HYPRE_Int nz_local = (HYPRE_Int)(nz_part[r + 1] - nz_part[r]);
+   HYPRE_Int ix_local = (HYPRE_Int)(ix - nx_part[p]);
+   HYPRE_Int iy_local = (HYPRE_Int)(iy - ny_part[q]);
+   HYPRE_Int iz_local = (HYPRE_Int)(iz - nz_part[r]);
    HYPRE_BigInt global_index;
 
-   global_index = nz_part[r]*nx*ny+ny_part[q]*nx*(HYPRE_BigInt)nz_local+nx_part[p]*(HYPRE_BigInt)(ny_local*nz_local);
-   global_index += (HYPRE_BigInt)((iz_local*ny_local+iy_local)*nx_local + ix_local);
+   global_index = nz_part[r] * nx * ny + ny_part[q] * nx * (HYPRE_BigInt)nz_local + nx_part[p] *
+                  (HYPRE_BigInt)(ny_local * nz_local);
+   global_index += (HYPRE_BigInt)((iz_local * ny_local + iy_local) * nx_local + ix_local);
    return global_index;
 }
 
@@ -390,16 +403,16 @@ GenerateSysLaplacian( MPI_Comm comm,
    HYPRE_Int    *offd_i;
    HYPRE_Int    *offd_j = NULL;
    HYPRE_BigInt *big_offd_j = NULL;
-   HYPRE_Real *offd_data;
+   HYPRE_Real *offd_data = NULL;
 
-   HYPRE_BigInt *global_part;
+   HYPRE_BigInt global_part[2];
    HYPRE_Int ix, iy, iz;
    HYPRE_Int cnt, o_cnt;
    HYPRE_Int local_num_rows;
    HYPRE_BigInt *col_map_offd;
    HYPRE_Int row_index, row, col;
    HYPRE_Int index, diag_index;
-   HYPRE_Int i,j;
+   HYPRE_Int i, j;
 
    HYPRE_Int nx_local, ny_local, nz_local;
    HYPRE_Int num_cols_offd;
@@ -418,60 +431,61 @@ GenerateSysLaplacian( MPI_Comm comm,
    HYPRE_Real val;
    HYPRE_Int gp_size;
 
-   hypre_MPI_Comm_size(comm,&num_procs);
+   hypre_MPI_Comm_size(comm, &num_procs);
 
-   grid_size = nx*ny*nz;
+   grid_size = nx * ny * nz;
 
-   hypre_GeneratePartitioning(nx,P,&nx_part);
-   hypre_GeneratePartitioning(ny,Q,&ny_part);
-   hypre_GeneratePartitioning(nz,R,&nz_part);
+   hypre_GeneratePartitioning(nx, P, &nx_part);
+   hypre_GeneratePartitioning(ny, Q, &ny_part);
+   hypre_GeneratePartitioning(nz, R, &nz_part);
 
-   nx_local = (HYPRE_Int)(nx_part[p+1] - nx_part[p]);
-   ny_local = (HYPRE_Int)(ny_part[q+1] - ny_part[q]);
-   nz_local = (HYPRE_Int)(nz_part[r+1] - nz_part[r]);
+   nx_local = (HYPRE_Int)(nx_part[p + 1] - nx_part[p]);
+   ny_local = (HYPRE_Int)(ny_part[q + 1] - ny_part[q]);
+   nz_local = (HYPRE_Int)(nz_part[r + 1] - nz_part[r]);
 
-   local_grid_size = nx_local*ny_local*nz_local;
-   local_num_rows = num_fun*local_grid_size;
+   local_grid_size = nx_local * ny_local * nz_local;
+   local_num_rows = num_fun * local_grid_size;
 
-   global_part = hypre_CTAlloc(HYPRE_BigInt, 2, HYPRE_MEMORY_HOST);
-   global_part[0] = nz_part[r]*nx*ny+(ny_part[q]*nx+nx_part[p]*ny_local)*nz_local;
+   global_part[0] = nz_part[r] * nx * ny + (ny_part[q] * nx + nx_part[p] * ny_local) * nz_local;
    global_part[1] = global_part[0] + (HYPRE_BigInt)local_grid_size;
    gp_size = 2;
 
-   diag_i = hypre_CTAlloc(HYPRE_Int, local_num_rows+1, HYPRE_MEMORY_HOST);
-   offd_i = hypre_CTAlloc(HYPRE_Int, local_num_rows+1, HYPRE_MEMORY_HOST);
+   diag_i = hypre_CTAlloc(HYPRE_Int, local_num_rows + 1, HYPRE_MEMORY_HOST);
+   offd_i = hypre_CTAlloc(HYPRE_Int, local_num_rows + 1, HYPRE_MEMORY_HOST);
 
-   P_busy = hypre_min(nx,P);
-   Q_busy = hypre_min(ny,Q);
-   R_busy = hypre_min(nz,R);
+   P_busy = hypre_min(nx, P);
+   Q_busy = hypre_min(ny, Q);
+   R_busy = hypre_min(nz, R);
 
    num_cols_offd = 0;
-   if (p) num_cols_offd += ny_local*nz_local;
-   if (p < P_busy-1) num_cols_offd += ny_local*nz_local;
-   if (q) num_cols_offd += nx_local*nz_local;
-   if (q < Q_busy-1) num_cols_offd += nx_local*nz_local;
-   if (r) num_cols_offd += nx_local*ny_local;
-   if (r < R_busy-1) num_cols_offd += nx_local*ny_local;
+   if (p) { num_cols_offd += ny_local * nz_local; }
+   if (p < P_busy - 1) { num_cols_offd += ny_local * nz_local; }
+   if (q) { num_cols_offd += nx_local * nz_local; }
+   if (q < Q_busy - 1) { num_cols_offd += nx_local * nz_local; }
+   if (r) { num_cols_offd += nx_local * ny_local; }
+   if (r < R_busy - 1) { num_cols_offd += nx_local * ny_local; }
    num_cols_offd *= num_fun;
 
-   if (!local_num_rows) num_cols_offd = 0;
+   if (!local_num_rows) { num_cols_offd = 0; }
 
    col_map_offd = hypre_CTAlloc(HYPRE_BigInt, num_cols_offd, HYPRE_MEMORY_HOST);
 
    cnt = 1;
    diag_i[0] = 0;
    offd_i[0] = 0;
-   for (iz = nz_part[r]; iz < nz_part[r+1]; iz++)
+   for (iz = nz_part[r]; iz < nz_part[r + 1]; iz++)
    {
-      for (iy = ny_part[q];  iy < ny_part[q+1]; iy++)
+      for (iy = ny_part[q];  iy < ny_part[q + 1]; iy++)
       {
-         for (ix = nx_part[p]; ix < nx_part[p+1]; ix++)
+         for (ix = nx_part[p]; ix < nx_part[p + 1]; ix++)
          {
-            diag_i[cnt] = diag_i[cnt-1];
-            offd_i[cnt] = offd_i[cnt-1];
+            diag_i[cnt] = diag_i[cnt - 1];
+            offd_i[cnt] = offd_i[cnt - 1];
             diag_i[cnt] += num_fun;
             if (iz > nz_part[r])
+            {
                diag_i[cnt] += num_fun;
+            }
             else
             {
                if (iz)
@@ -480,7 +494,9 @@ GenerateSysLaplacian( MPI_Comm comm,
                }
             }
             if (iy > ny_part[q])
+            {
                diag_i[cnt] += num_fun;
+            }
             else
             {
                if (iy)
@@ -489,7 +505,9 @@ GenerateSysLaplacian( MPI_Comm comm,
                }
             }
             if (ix > nx_part[p])
+            {
                diag_i[cnt] += num_fun;
+            }
             else
             {
                if (ix)
@@ -497,40 +515,46 @@ GenerateSysLaplacian( MPI_Comm comm,
                   offd_i[cnt] += num_fun;
                }
             }
-            if (ix+1 < nx_part[p+1])
+            if (ix + 1 < nx_part[p + 1])
+            {
                diag_i[cnt] += num_fun;
+            }
             else
             {
-               if (ix+1 < nx)
+               if (ix + 1 < nx)
                {
                   offd_i[cnt] += num_fun;
                }
             }
-            if (iy+1 < ny_part[q+1])
+            if (iy + 1 < ny_part[q + 1])
+            {
                diag_i[cnt] += num_fun;
+            }
             else
             {
-               if (iy+1 < ny)
+               if (iy + 1 < ny)
                {
                   offd_i[cnt] += num_fun;
                }
             }
-            if (iz+1 < nz_part[r+1])
+            if (iz + 1 < nz_part[r + 1])
+            {
                diag_i[cnt] += num_fun;
+            }
             else
             {
-               if (iz+1 < nz)
+               if (iz + 1 < nz)
                {
                   offd_i[cnt] += num_fun;
                }
             }
-            num_coeffs = diag_i[cnt]-diag_i[cnt-1];
-            num_offd_coeffs = offd_i[cnt]-offd_i[cnt-1];
+            num_coeffs = diag_i[cnt] - diag_i[cnt - 1];
+            num_offd_coeffs = offd_i[cnt] - offd_i[cnt - 1];
             cnt++;
-            for (i=1; i < num_fun; i++)
+            for (i = 1; i < num_fun; i++)
             {
-               diag_i[cnt] = diag_i[cnt-1]+num_coeffs;
-               offd_i[cnt] = offd_i[cnt-1]+num_offd_coeffs;
+               diag_i[cnt] = diag_i[cnt - 1] + num_coeffs;
+               offd_i[cnt] = offd_i[cnt - 1] + num_offd_coeffs;
                cnt++;
             }
          }
@@ -548,37 +572,37 @@ GenerateSysLaplacian( MPI_Comm comm,
    }
 
    row_index = 0;
-   for (iz = nz_part[r]; iz < nz_part[r+1]; iz++)
+   for (iz = nz_part[r]; iz < nz_part[r + 1]; iz++)
    {
-      for (iy = ny_part[q];  iy < ny_part[q+1]; iy++)
+      for (iy = ny_part[q];  iy < ny_part[q + 1]; iy++)
       {
-         for (ix = nx_part[p]; ix < nx_part[p+1]; ix++)
+         for (ix = nx_part[p]; ix < nx_part[p + 1]; ix++)
          {
             cnt = diag_i[row_index];;
             o_cnt = offd_i[row_index];;
-            num_coeffs = diag_i[row_index+1]-diag_i[row_index];
-            num_offd_coeffs = offd_i[row_index+1]-offd_i[row_index];
+            num_coeffs = diag_i[row_index + 1] - diag_i[row_index];
+            num_offd_coeffs = offd_i[row_index + 1] - offd_i[row_index];
             first_j = row_index;
-            for (i=0; i < num_fun; i++)
+            for (i = 0; i < num_fun; i++)
             {
-               for (j=0; j < num_fun; j++)
+               for (j = 0; j < num_fun; j++)
                {
-                  j_ind = cnt+i*num_coeffs+j;
-                  diag_j[j_ind] = first_j+j;
-                  diag_data[j_ind] = value[0]*mtrx[i*num_fun+j];
+                  j_ind = cnt + i * num_coeffs + j;
+                  diag_j[j_ind] = first_j + j;
+                  diag_data[j_ind] = value[0] * mtrx[i * num_fun + j];
                }
             }
             cnt += num_fun;
             if (iz > nz_part[r])
             {
-               first_j = row_index-nx_local*ny_local*num_fun;
-               for (i=0; i < num_fun; i++)
+               first_j = row_index - nx_local * ny_local * num_fun;
+               for (i = 0; i < num_fun; i++)
                {
-                  for (j=0; j < num_fun; j++)
+                  for (j = 0; j < num_fun; j++)
                   {
-                     j_ind = cnt+i*num_coeffs+j;
-                     diag_j[j_ind] = first_j+j;
-                     diag_data[j_ind] = value[3]*mtrx[i*num_fun+j];
+                     j_ind = cnt + i * num_coeffs + j;
+                     diag_j[j_ind] = first_j + j;
+                     diag_data[j_ind] = value[3] * mtrx[i * num_fun + j];
                   }
                }
                cnt += num_fun;
@@ -587,15 +611,15 @@ GenerateSysLaplacian( MPI_Comm comm,
             {
                if (iz)
                {
-                  big_first_j = big_num_fun*hypre_map(ix,iy,iz-1,p,q,r-1,nx,ny,
-                                                nx_part,ny_part,nz_part);
-                  for (i=0; i < num_fun; i++)
+                  big_first_j = big_num_fun * hypre_map(ix, iy, iz - 1, p, q, r - 1, nx, ny,
+                                                        nx_part, ny_part, nz_part);
+                  for (i = 0; i < num_fun; i++)
                   {
-                     for (j=0; j < num_fun; j++)
+                     for (j = 0; j < num_fun; j++)
                      {
-                        j_ind = o_cnt+i*num_offd_coeffs+j;
-                        big_offd_j[j_ind] = big_first_j+(HYPRE_BigInt)j;
-                        offd_data[j_ind] = value[3]*mtrx[i*num_fun+j];
+                        j_ind = o_cnt + i * num_offd_coeffs + j;
+                        big_offd_j[j_ind] = big_first_j + (HYPRE_BigInt)j;
+                        offd_data[j_ind] = value[3] * mtrx[i * num_fun + j];
                      }
                   }
                   o_cnt += num_fun;
@@ -603,14 +627,14 @@ GenerateSysLaplacian( MPI_Comm comm,
             }
             if (iy > ny_part[q])
             {
-               first_j = row_index-nx_local*num_fun;
-               for (i=0; i < num_fun; i++)
+               first_j = row_index - nx_local * num_fun;
+               for (i = 0; i < num_fun; i++)
                {
-                  for (j=0; j < num_fun; j++)
+                  for (j = 0; j < num_fun; j++)
                   {
-                     j_ind = cnt+i*num_coeffs+j;
-                     diag_j[j_ind] = first_j+j;
-                     diag_data[j_ind] = value[2]*mtrx[i*num_fun+j];
+                     j_ind = cnt + i * num_coeffs + j;
+                     diag_j[j_ind] = first_j + j;
+                     diag_data[j_ind] = value[2] * mtrx[i * num_fun + j];
                   }
                }
                cnt += num_fun;
@@ -619,15 +643,15 @@ GenerateSysLaplacian( MPI_Comm comm,
             {
                if (iy)
                {
-                  big_first_j = big_num_fun*hypre_map(ix,iy-1,iz,p,q-1,r,nx,ny,
-                                                nx_part,ny_part,nz_part);
-                  for (i=0; i < num_fun; i++)
+                  big_first_j = big_num_fun * hypre_map(ix, iy - 1, iz, p, q - 1, r, nx, ny,
+                                                        nx_part, ny_part, nz_part);
+                  for (i = 0; i < num_fun; i++)
                   {
-                     for (j=0; j < num_fun; j++)
+                     for (j = 0; j < num_fun; j++)
                      {
-                        j_ind = o_cnt+i*num_offd_coeffs+j;
-                        big_offd_j[j_ind] = big_first_j+(HYPRE_BigInt)j;
-                        offd_data[j_ind] = value[2]*mtrx[i*num_fun+j];
+                        j_ind = o_cnt + i * num_offd_coeffs + j;
+                        big_offd_j[j_ind] = big_first_j + (HYPRE_BigInt)j;
+                        offd_data[j_ind] = value[2] * mtrx[i * num_fun + j];
                      }
                   }
                   o_cnt += num_fun;
@@ -635,14 +659,14 @@ GenerateSysLaplacian( MPI_Comm comm,
             }
             if (ix > nx_part[p])
             {
-               first_j = row_index-num_fun;
-               for (i=0; i < num_fun; i++)
+               first_j = row_index - num_fun;
+               for (i = 0; i < num_fun; i++)
                {
-                  for (j=0; j < num_fun; j++)
+                  for (j = 0; j < num_fun; j++)
                   {
-                     j_ind = cnt+i*num_coeffs+j;
-                     diag_j[j_ind] = first_j+j;
-                     diag_data[j_ind] = value[1]*mtrx[i*num_fun+j];
+                     j_ind = cnt + i * num_coeffs + j;
+                     diag_j[j_ind] = first_j + j;
+                     diag_data[j_ind] = value[1] * mtrx[i * num_fun + j];
                   }
                }
                cnt += num_fun;
@@ -651,111 +675,111 @@ GenerateSysLaplacian( MPI_Comm comm,
             {
                if (ix)
                {
-                  big_first_j = big_num_fun*hypre_map(ix-1,iy,iz,p-1,q,r,nx,ny,
-                                                nx_part,ny_part,nz_part);
-                  for (i=0; i < num_fun; i++)
+                  big_first_j = big_num_fun * hypre_map(ix - 1, iy, iz, p - 1, q, r, nx, ny,
+                                                        nx_part, ny_part, nz_part);
+                  for (i = 0; i < num_fun; i++)
                   {
-                     for (j=0; j < num_fun; j++)
+                     for (j = 0; j < num_fun; j++)
                      {
-                        j_ind = o_cnt+i*num_offd_coeffs+j;
-                        big_offd_j[j_ind] = big_first_j+(HYPRE_BigInt)j;
-                        offd_data[j_ind] = value[1]*mtrx[i*num_fun+j];
+                        j_ind = o_cnt + i * num_offd_coeffs + j;
+                        big_offd_j[j_ind] = big_first_j + (HYPRE_BigInt)j;
+                        offd_data[j_ind] = value[1] * mtrx[i * num_fun + j];
                      }
                   }
                   o_cnt += num_fun;
                }
             }
-            if (ix+1 < nx_part[p+1])
+            if (ix + 1 < nx_part[p + 1])
             {
-               first_j = row_index+num_fun;
-               for (i=0; i < num_fun; i++)
+               first_j = row_index + num_fun;
+               for (i = 0; i < num_fun; i++)
                {
-                  for (j=0; j < num_fun; j++)
+                  for (j = 0; j < num_fun; j++)
                   {
-                     j_ind = cnt+i*num_coeffs+j;
-                     diag_j[j_ind] = first_j+j;
-                     diag_data[j_ind] = value[1]*mtrx[i*num_fun+j];
+                     j_ind = cnt + i * num_coeffs + j;
+                     diag_j[j_ind] = first_j + j;
+                     diag_data[j_ind] = value[1] * mtrx[i * num_fun + j];
                   }
                }
                cnt += num_fun;
             }
             else
             {
-               if (ix+1 < nx)
+               if (ix + 1 < nx)
                {
-                  big_first_j = big_num_fun*hypre_map(ix+1,iy,iz,p+1,q,r,nx,ny,
-                                                nx_part,ny_part,nz_part);
-                  for (i=0; i < num_fun; i++)
+                  big_first_j = big_num_fun * hypre_map(ix + 1, iy, iz, p + 1, q, r, nx, ny,
+                                                        nx_part, ny_part, nz_part);
+                  for (i = 0; i < num_fun; i++)
                   {
-                     for (j=0; j < num_fun; j++)
+                     for (j = 0; j < num_fun; j++)
                      {
-                        j_ind = o_cnt+i*num_offd_coeffs+j;
-                        big_offd_j[j_ind] = big_first_j+(HYPRE_BigInt)j;
-                        offd_data[j_ind] = value[1]*mtrx[i*num_fun+j];
+                        j_ind = o_cnt + i * num_offd_coeffs + j;
+                        big_offd_j[j_ind] = big_first_j + (HYPRE_BigInt)j;
+                        offd_data[j_ind] = value[1] * mtrx[i * num_fun + j];
                      }
                   }
                   o_cnt += num_fun;
                }
             }
-            if (iy+1 < ny_part[q+1])
+            if (iy + 1 < ny_part[q + 1])
             {
-               first_j = row_index+nx_local*num_fun;
-               for (i=0; i < num_fun; i++)
+               first_j = row_index + nx_local * num_fun;
+               for (i = 0; i < num_fun; i++)
                {
-                  for (j=0; j < num_fun; j++)
+                  for (j = 0; j < num_fun; j++)
                   {
-                     j_ind = cnt+i*num_coeffs+j;
-                     diag_j[j_ind] = first_j+j;
-                     diag_data[j_ind] = value[2]*mtrx[i*num_fun+j];
+                     j_ind = cnt + i * num_coeffs + j;
+                     diag_j[j_ind] = first_j + j;
+                     diag_data[j_ind] = value[2] * mtrx[i * num_fun + j];
                   }
                }
                cnt += num_fun;
             }
             else
             {
-               if (iy+1 < ny)
+               if (iy + 1 < ny)
                {
-                  big_first_j = big_num_fun*hypre_map(ix,iy+1,iz,p,q+1,r,nx,ny,
-                                                nx_part,ny_part,nz_part);
-                  for (i=0; i < num_fun; i++)
+                  big_first_j = big_num_fun * hypre_map(ix, iy + 1, iz, p, q + 1, r, nx, ny,
+                                                        nx_part, ny_part, nz_part);
+                  for (i = 0; i < num_fun; i++)
                   {
-                     for (j=0; j < num_fun; j++)
+                     for (j = 0; j < num_fun; j++)
                      {
-                        j_ind = o_cnt+i*num_offd_coeffs+j;
-                        big_offd_j[j_ind] = big_first_j+(HYPRE_BigInt)j;
-                        offd_data[j_ind] = value[2]*mtrx[i*num_fun+j];
+                        j_ind = o_cnt + i * num_offd_coeffs + j;
+                        big_offd_j[j_ind] = big_first_j + (HYPRE_BigInt)j;
+                        offd_data[j_ind] = value[2] * mtrx[i * num_fun + j];
                      }
                   }
                   o_cnt += num_fun;
                }
             }
-            if (iz+1 < nz_part[r+1])
+            if (iz + 1 < nz_part[r + 1])
             {
-               first_j = row_index+nx_local*ny_local*num_fun;
-               for (i=0; i < num_fun; i++)
+               first_j = row_index + nx_local * ny_local * num_fun;
+               for (i = 0; i < num_fun; i++)
                {
-                  for (j=0; j < num_fun; j++)
+                  for (j = 0; j < num_fun; j++)
                   {
-                     j_ind = cnt+i*num_coeffs+j;
-                     diag_j[j_ind] = first_j+j;
-                     diag_data[j_ind] = value[3]*mtrx[i*num_fun+j];
+                     j_ind = cnt + i * num_coeffs + j;
+                     diag_j[j_ind] = first_j + j;
+                     diag_data[j_ind] = value[3] * mtrx[i * num_fun + j];
                   }
                }
                cnt += num_fun;
             }
             else
             {
-               if (iz+1 < nz)
+               if (iz + 1 < nz)
                {
-                  big_first_j = big_num_fun*hypre_map(ix,iy,iz+1,p,q,r+1,nx,ny,
-                                                nx_part,ny_part,nz_part);
-                  for (i=0; i < num_fun; i++)
+                  big_first_j = big_num_fun * hypre_map(ix, iy, iz + 1, p, q, r + 1, nx, ny,
+                                                        nx_part, ny_part, nz_part);
+                  for (i = 0; i < num_fun; i++)
                   {
-                     for (j=0; j < num_fun; j++)
+                     for (j = 0; j < num_fun; j++)
                      {
-                        j_ind = o_cnt+i*num_offd_coeffs+j;
-                        big_offd_j[j_ind] = big_first_j+(HYPRE_BigInt)j;
-                        offd_data[j_ind] = value[3]*mtrx[i*num_fun+j];
+                        j_ind = o_cnt + i * num_offd_coeffs + j;
+                        big_offd_j[j_ind] = big_first_j + (HYPRE_BigInt)j;
+                        offd_data[j_ind] = value[3] * mtrx[i * num_fun + j];
                      }
                   }
                   o_cnt += num_fun;
@@ -768,19 +792,19 @@ GenerateSysLaplacian( MPI_Comm comm,
 
    if (num_procs > 1)
    {
-         cnt = 0;
-         for (i=0; i < local_num_rows; i+=num_fun)
+      cnt = 0;
+      for (i = 0; i < local_num_rows; i += num_fun)
+      {
+         for (j = offd_i[i]; j < offd_i[i + 1]; j++)
          {
-            for (j=offd_i[i]; j < offd_i[i+1]; j++)
-            {
-               col_map_offd[cnt++] = big_offd_j[j];
-            }
+            col_map_offd[cnt++] = big_offd_j[j];
          }
+      }
 
-      hypre_BigQsort0(col_map_offd, 0, num_cols_offd-1);
+      hypre_BigQsort0(col_map_offd, 0, num_cols_offd - 1);
 
-      for (i=0; i < num_fun*num_cols_offd; i++)
-         for (j=hypre_min(0,hypre_abs(i-num_fun)); j < num_cols_offd; j++)
+      for (i = 0; i < num_fun * num_cols_offd; i++)
+         for (j = hypre_min(0, hypre_abs(i - num_fun)); j < num_cols_offd; j++)
             if (big_offd_j[i] == col_map_offd[j])
             {
                offd_j[i] = j;
@@ -788,16 +812,18 @@ GenerateSysLaplacian( MPI_Comm comm,
             }
    }
 
-   for (i=0; i < gp_size; i++)
+   for (i = 0; i < gp_size; i++)
+   {
       global_part[i] *= big_num_fun;
+   }
 
-   for (j=1; j< num_fun; j++)
+   for (j = 1; j < num_fun; j++)
    {
-      for (i=0; i<local_grid_size; i++)
+      for (i = 0; i < local_grid_size; i++)
       {
-         row = i*num_fun+j;
+         row = i * num_fun + j;
          diag_index = diag_i[row];
-         index = diag_index+j;
+         index = diag_index + j;
          val = diag_data[diag_index];
          col = diag_j[diag_index];
          diag_data[diag_index] = diag_data[index];
@@ -807,7 +833,7 @@ GenerateSysLaplacian( MPI_Comm comm,
       }
    }
 
-   A = hypre_ParCSRMatrixCreate(comm, big_num_fun*grid_size, big_num_fun*grid_size,
+   A = hypre_ParCSRMatrixCreate(comm, big_num_fun * grid_size, big_num_fun * grid_size,
                                 global_part, global_part, num_cols_offd,
                                 diag_i[local_num_rows],
                                 offd_i[local_num_rows]);
@@ -836,7 +862,6 @@ GenerateSysLaplacian( MPI_Comm comm,
    hypre_TFree(ny_part,     HYPRE_MEMORY_HOST);
    hypre_TFree(nz_part,     HYPRE_MEMORY_HOST);
    hypre_TFree(big_offd_j,  HYPRE_MEMORY_HOST);
-   hypre_TFree(global_part, HYPRE_MEMORY_HOST);
 
    return (HYPRE_ParCSRMatrix) A;
 }
@@ -870,18 +895,18 @@ GenerateSysLaplacianVCoef( MPI_Comm       comm,
    HYPRE_Real *diag_data;
 
    HYPRE_Int    *offd_i;
-   HYPRE_Int    *offd_j;
-   HYPRE_BigInt *big_offd_j;
-   HYPRE_Real *offd_data;
+   HYPRE_Int    *offd_j = NULL;
+   HYPRE_BigInt *big_offd_j = NULL;
+   HYPRE_Real *offd_data = NULL;
 
-   HYPRE_BigInt *global_part;
+   HYPRE_BigInt global_part[2];
    HYPRE_BigInt ix, iy, iz;
    HYPRE_Int cnt, o_cnt;
    HYPRE_Int local_num_rows;
    HYPRE_BigInt *col_map_offd;
    HYPRE_Int row_index, row, col;
    HYPRE_Int index, diag_index;
-   HYPRE_Int i,j;
+   HYPRE_Int i, j;
    HYPRE_Int gp_size;
 
    HYPRE_Int nx_local, ny_local, nz_local;
@@ -899,62 +924,63 @@ GenerateSysLaplacianVCoef( MPI_Comm       comm,
    HYPRE_Int num_procs, P_busy, Q_busy, R_busy;
    HYPRE_Real val;
 
-  /* for indexing in values */
-   HYPRE_Int sz = num_fun*num_fun;
+   /* for indexing in values */
+   HYPRE_Int sz = num_fun * num_fun;
 
-   hypre_MPI_Comm_size(comm,&num_procs);
+   hypre_MPI_Comm_size(comm, &num_procs);
 
-   grid_size = nx*ny*nz;
+   grid_size = nx * ny * nz;
 
-   hypre_GeneratePartitioning(nx,P,&nx_part);
-   hypre_GeneratePartitioning(ny,Q,&ny_part);
-   hypre_GeneratePartitioning(nz,R,&nz_part);
+   hypre_GeneratePartitioning(nx, P, &nx_part);
+   hypre_GeneratePartitioning(ny, Q, &ny_part);
+   hypre_GeneratePartitioning(nz, R, &nz_part);
 
-   nx_local = (HYPRE_Int)(nx_part[p+1] - nx_part[p]);
-   ny_local = (HYPRE_Int)(ny_part[q+1] - ny_part[q]);
-   nz_local = (HYPRE_Int)(nz_part[r+1] - nz_part[r]);
+   nx_local = (HYPRE_Int)(nx_part[p + 1] - nx_part[p]);
+   ny_local = (HYPRE_Int)(ny_part[q + 1] - ny_part[q]);
+   nz_local = (HYPRE_Int)(nz_part[r + 1] - nz_part[r]);
 
-   local_grid_size = nx_local*ny_local*nz_local;
-   global_part = hypre_CTAlloc(HYPRE_BigInt, 2, HYPRE_MEMORY_HOST);
-   global_part[0] = nz_part[r]*nx*ny+(ny_part[q]*nx+nx_part[p]*ny_local)*nz_local;
+   local_grid_size = nx_local * ny_local * nz_local;
+   global_part[0] = nz_part[r] * nx * ny + (ny_part[q] * nx + nx_part[p] * ny_local) * nz_local;
    global_part[1] = global_part[0] + (HYPRE_BigInt)local_grid_size;
    gp_size = 2;
 
-   local_num_rows = num_fun*local_grid_size;
-   diag_i = hypre_CTAlloc(HYPRE_Int, local_num_rows+1, HYPRE_MEMORY_HOST);
-   offd_i = hypre_CTAlloc(HYPRE_Int, local_num_rows+1, HYPRE_MEMORY_HOST);
+   local_num_rows = num_fun * local_grid_size;
+   diag_i = hypre_CTAlloc(HYPRE_Int, local_num_rows + 1, HYPRE_MEMORY_HOST);
+   offd_i = hypre_CTAlloc(HYPRE_Int, local_num_rows + 1, HYPRE_MEMORY_HOST);
 
-   P_busy = hypre_min(nx,P);
-   Q_busy = hypre_min(ny,Q);
-   R_busy = hypre_min(nz,R);
+   P_busy = hypre_min(nx, P);
+   Q_busy = hypre_min(ny, Q);
+   R_busy = hypre_min(nz, R);
 
    num_cols_offd = 0;
-   if (p) num_cols_offd += ny_local*nz_local;
-   if (p < P_busy-1) num_cols_offd += ny_local*nz_local;
-   if (q) num_cols_offd += nx_local*nz_local;
-   if (q < Q_busy-1) num_cols_offd += nx_local*nz_local;
-   if (r) num_cols_offd += nx_local*ny_local;
-   if (r < R_busy-1) num_cols_offd += nx_local*ny_local;
+   if (p) { num_cols_offd += ny_local * nz_local; }
+   if (p < P_busy - 1) { num_cols_offd += ny_local * nz_local; }
+   if (q) { num_cols_offd += nx_local * nz_local; }
+   if (q < Q_busy - 1) { num_cols_offd += nx_local * nz_local; }
+   if (r) { num_cols_offd += nx_local * ny_local; }
+   if (r < R_busy - 1) { num_cols_offd += nx_local * ny_local; }
    num_cols_offd *= num_fun;
 
-   if (!local_num_rows) num_cols_offd = 0;
+   if (!local_num_rows) { num_cols_offd = 0; }
 
    col_map_offd = hypre_CTAlloc(HYPRE_BigInt, num_cols_offd, HYPRE_MEMORY_HOST);
 
    cnt = 1;
    diag_i[0] = 0;
    offd_i[0] = 0;
-   for (iz = nz_part[r]; iz < nz_part[r+1]; iz++)
+   for (iz = nz_part[r]; iz < nz_part[r + 1]; iz++)
    {
-      for (iy = ny_part[q];  iy < ny_part[q+1]; iy++)
+      for (iy = ny_part[q];  iy < ny_part[q + 1]; iy++)
       {
-         for (ix = nx_part[p]; ix < nx_part[p+1]; ix++)
+         for (ix = nx_part[p]; ix < nx_part[p + 1]; ix++)
          {
-            diag_i[cnt] = diag_i[cnt-1];
-            offd_i[cnt] = offd_i[cnt-1];
+            diag_i[cnt] = diag_i[cnt - 1];
+            offd_i[cnt] = offd_i[cnt - 1];
             diag_i[cnt] += num_fun;
             if (iz > nz_part[r])
+            {
                diag_i[cnt] += num_fun;
+            }
             else
             {
                if (iz)
@@ -963,7 +989,9 @@ GenerateSysLaplacianVCoef( MPI_Comm       comm,
                }
             }
             if (iy > ny_part[q])
+            {
                diag_i[cnt] += num_fun;
+            }
             else
             {
                if (iy)
@@ -972,7 +1000,9 @@ GenerateSysLaplacianVCoef( MPI_Comm       comm,
                }
             }
             if (ix > nx_part[p])
+            {
                diag_i[cnt] += num_fun;
+            }
             else
             {
                if (ix)
@@ -980,40 +1010,46 @@ GenerateSysLaplacianVCoef( MPI_Comm       comm,
                   offd_i[cnt] += num_fun;
                }
             }
-            if (ix+1 < nx_part[p+1])
+            if (ix + 1 < nx_part[p + 1])
+            {
                diag_i[cnt] += num_fun;
+            }
             else
             {
-               if (ix+1 < nx)
+               if (ix + 1 < nx)
                {
                   offd_i[cnt] += num_fun;
                }
             }
-            if (iy+1 < ny_part[q+1])
+            if (iy + 1 < ny_part[q + 1])
+            {
                diag_i[cnt] += num_fun;
+            }
             else
             {
-               if (iy+1 < ny)
+               if (iy + 1 < ny)
                {
                   offd_i[cnt] += num_fun;
                }
             }
-            if (iz+1 < nz_part[r+1])
+            if (iz + 1 < nz_part[r + 1])
+            {
                diag_i[cnt] += num_fun;
+            }
             else
             {
-               if (iz+1 < nz)
+               if (iz + 1 < nz)
                {
                   offd_i[cnt] += num_fun;
                }
             }
-            num_coeffs = diag_i[cnt]-diag_i[cnt-1];
-            num_offd_coeffs = offd_i[cnt]-offd_i[cnt-1];
+            num_coeffs = diag_i[cnt] - diag_i[cnt - 1];
+            num_offd_coeffs = offd_i[cnt] - offd_i[cnt - 1];
             cnt++;
-            for (i=1; i < num_fun; i++)
+            for (i = 1; i < num_fun; i++)
             {
-               diag_i[cnt] = diag_i[cnt-1]+num_coeffs;
-               offd_i[cnt] = offd_i[cnt-1]+num_offd_coeffs;
+               diag_i[cnt] = diag_i[cnt - 1] + num_coeffs;
+               offd_i[cnt] = offd_i[cnt - 1] + num_offd_coeffs;
                cnt++;
             }
          }
@@ -1031,37 +1067,37 @@ GenerateSysLaplacianVCoef( MPI_Comm       comm,
    }
 
    row_index = 0;
-   for (iz = nz_part[r]; iz < nz_part[r+1]; iz++)
+   for (iz = nz_part[r]; iz < nz_part[r + 1]; iz++)
    {
-      for (iy = ny_part[q];  iy < ny_part[q+1]; iy++)
+      for (iy = ny_part[q];  iy < ny_part[q + 1]; iy++)
       {
-         for (ix = nx_part[p]; ix < nx_part[p+1]; ix++)
+         for (ix = nx_part[p]; ix < nx_part[p + 1]; ix++)
          {
             cnt = diag_i[row_index];;
             o_cnt = offd_i[row_index];;
-            num_coeffs = diag_i[row_index+1]-diag_i[row_index];
-            num_offd_coeffs = offd_i[row_index+1]-offd_i[row_index];
+            num_coeffs = diag_i[row_index + 1] - diag_i[row_index];
+            num_offd_coeffs = offd_i[row_index + 1] - offd_i[row_index];
             first_j = row_index;
-            for (i=0; i < num_fun; i++)
+            for (i = 0; i < num_fun; i++)
             {
-               for (j=0; j < num_fun; j++)
+               for (j = 0; j < num_fun; j++)
                {
-                  j_ind = cnt+i*num_coeffs+j;
-                  diag_j[j_ind] = first_j+j;
-                  diag_data[j_ind] = value[0*sz + i*num_fun+j]*mtrx[i*num_fun+j];
+                  j_ind = cnt + i * num_coeffs + j;
+                  diag_j[j_ind] = first_j + j;
+                  diag_data[j_ind] = value[0 * sz + i * num_fun + j] * mtrx[i * num_fun + j];
                }
             }
             cnt += num_fun;
             if (iz > nz_part[r])
             {
-               first_j = row_index-nx_local*ny_local*num_fun;
-               for (i=0; i < num_fun; i++)
+               first_j = row_index - nx_local * ny_local * num_fun;
+               for (i = 0; i < num_fun; i++)
                {
-                  for (j=0; j < num_fun; j++)
+                  for (j = 0; j < num_fun; j++)
                   {
-                     j_ind = cnt+i*num_coeffs+j;
-                     diag_j[j_ind] = first_j+j;
-                     diag_data[j_ind] = value[3*sz + i*num_fun+j]*mtrx[i*num_fun+j];
+                     j_ind = cnt + i * num_coeffs + j;
+                     diag_j[j_ind] = first_j + j;
+                     diag_data[j_ind] = value[3 * sz + i * num_fun + j] * mtrx[i * num_fun + j];
                   }
                }
                cnt += num_fun;
@@ -1070,15 +1106,15 @@ GenerateSysLaplacianVCoef( MPI_Comm       comm,
             {
                if (iz)
                {
-                  big_first_j = big_num_fun*hypre_map(ix,iy,iz-1,p,q,r-1,nx,ny,
-                                                nx_part,ny_part,nz_part);
-                  for (i=0; i < num_fun; i++)
+                  big_first_j = big_num_fun * hypre_map(ix, iy, iz - 1, p, q, r - 1, nx, ny,
+                                                        nx_part, ny_part, nz_part);
+                  for (i = 0; i < num_fun; i++)
                   {
-                     for (j=0; j < num_fun; j++)
+                     for (j = 0; j < num_fun; j++)
                      {
-                        j_ind = o_cnt+i*num_offd_coeffs+j;
-                        big_offd_j[j_ind] = big_first_j+(HYPRE_BigInt)j;
-                        offd_data[j_ind] = value[3*sz + i*num_fun+j]*mtrx[i*num_fun+j];
+                        j_ind = o_cnt + i * num_offd_coeffs + j;
+                        big_offd_j[j_ind] = big_first_j + (HYPRE_BigInt)j;
+                        offd_data[j_ind] = value[3 * sz + i * num_fun + j] * mtrx[i * num_fun + j];
                      }
                   }
                   o_cnt += num_fun;
@@ -1086,14 +1122,14 @@ GenerateSysLaplacianVCoef( MPI_Comm       comm,
             }
             if (iy > ny_part[q])
             {
-               first_j = row_index-nx_local*num_fun;
-               for (i=0; i < num_fun; i++)
+               first_j = row_index - nx_local * num_fun;
+               for (i = 0; i < num_fun; i++)
                {
-                  for (j=0; j < num_fun; j++)
+                  for (j = 0; j < num_fun; j++)
                   {
-                     j_ind = cnt+i*num_coeffs+j;
-                     diag_j[j_ind] = first_j+j;
-                     diag_data[j_ind] = value[2*sz + i*num_fun+j]*mtrx[i*num_fun+j];
+                     j_ind = cnt + i * num_coeffs + j;
+                     diag_j[j_ind] = first_j + j;
+                     diag_data[j_ind] = value[2 * sz + i * num_fun + j] * mtrx[i * num_fun + j];
                   }
                }
                cnt += num_fun;
@@ -1102,15 +1138,15 @@ GenerateSysLaplacianVCoef( MPI_Comm       comm,
             {
                if (iy)
                {
-                  big_first_j = big_num_fun*hypre_map(ix,iy-1,iz,p,q-1,r,nx,ny,
-                                                nx_part,ny_part,nz_part);
-                  for (i=0; i < num_fun; i++)
+                  big_first_j = big_num_fun * hypre_map(ix, iy - 1, iz, p, q - 1, r, nx, ny,
+                                                        nx_part, ny_part, nz_part);
+                  for (i = 0; i < num_fun; i++)
                   {
-                     for (j=0; j < num_fun; j++)
+                     for (j = 0; j < num_fun; j++)
                      {
-                        j_ind = o_cnt+i*num_offd_coeffs+j;
-                        big_offd_j[j_ind] = big_first_j+(HYPRE_BigInt)j;
-                        offd_data[j_ind] = value[2*sz + i*num_fun+j]*mtrx[i*num_fun+j];
+                        j_ind = o_cnt + i * num_offd_coeffs + j;
+                        big_offd_j[j_ind] = big_first_j + (HYPRE_BigInt)j;
+                        offd_data[j_ind] = value[2 * sz + i * num_fun + j] * mtrx[i * num_fun + j];
                      }
                   }
                   o_cnt += num_fun;
@@ -1118,14 +1154,14 @@ GenerateSysLaplacianVCoef( MPI_Comm       comm,
             }
             if (ix > nx_part[p])
             {
-               first_j = row_index-num_fun;
-               for (i=0; i < num_fun; i++)
+               first_j = row_index - num_fun;
+               for (i = 0; i < num_fun; i++)
                {
-                  for (j=0; j < num_fun; j++)
+                  for (j = 0; j < num_fun; j++)
                   {
-                     j_ind = cnt+i*num_coeffs+j;
-                     diag_j[j_ind] = first_j+j;
-                     diag_data[j_ind] = value[1*sz + i*num_fun+j]*mtrx[i*num_fun+j];
+                     j_ind = cnt + i * num_coeffs + j;
+                     diag_j[j_ind] = first_j + j;
+                     diag_data[j_ind] = value[1 * sz + i * num_fun + j] * mtrx[i * num_fun + j];
                   }
                }
                cnt += num_fun;
@@ -1134,111 +1170,111 @@ GenerateSysLaplacianVCoef( MPI_Comm       comm,
             {
                if (ix)
                {
-                  big_first_j = big_num_fun*hypre_map(ix-1,iy,iz,p-1,q,r,nx,ny,
-                                                nx_part,ny_part,nz_part);
-                  for (i=0; i < num_fun; i++)
+                  big_first_j = big_num_fun * hypre_map(ix - 1, iy, iz, p - 1, q, r, nx, ny,
+                                                        nx_part, ny_part, nz_part);
+                  for (i = 0; i < num_fun; i++)
                   {
-                     for (j=0; j < num_fun; j++)
+                     for (j = 0; j < num_fun; j++)
                      {
-                        j_ind = o_cnt+i*num_offd_coeffs+j;
-                        big_offd_j[j_ind] = big_first_j+(HYPRE_BigInt)j;
-                        offd_data[j_ind] = value[1*sz + i*num_fun+j]*mtrx[i*num_fun+j];
+                        j_ind = o_cnt + i * num_offd_coeffs + j;
+                        big_offd_j[j_ind] = big_first_j + (HYPRE_BigInt)j;
+                        offd_data[j_ind] = value[1 * sz + i * num_fun + j] * mtrx[i * num_fun + j];
                      }
                   }
                   o_cnt += num_fun;
                }
             }
-            if (ix+1 < nx_part[p+1])
+            if (ix + 1 < nx_part[p + 1])
             {
-               first_j = row_index+num_fun;
-               for (i=0; i < num_fun; i++)
+               first_j = row_index + num_fun;
+               for (i = 0; i < num_fun; i++)
                {
-                  for (j=0; j < num_fun; j++)
+                  for (j = 0; j < num_fun; j++)
                   {
-                     j_ind = cnt+i*num_coeffs+j;
-                     diag_j[j_ind] = first_j+j;
-                     diag_data[j_ind] = value[1*sz + i*num_fun+j]*mtrx[i*num_fun+j];
+                     j_ind = cnt + i * num_coeffs + j;
+                     diag_j[j_ind] = first_j + j;
+                     diag_data[j_ind] = value[1 * sz + i * num_fun + j] * mtrx[i * num_fun + j];
                   }
                }
                cnt += num_fun;
             }
             else
             {
-               if (ix+1 < nx)
+               if (ix + 1 < nx)
                {
-                  big_first_j = big_num_fun*hypre_map(ix+1,iy,iz,p+1,q,r,nx,ny,
-                                                nx_part,ny_part,nz_part);
-                  for (i=0; i < num_fun; i++)
+                  big_first_j = big_num_fun * hypre_map(ix + 1, iy, iz, p + 1, q, r, nx, ny,
+                                                        nx_part, ny_part, nz_part);
+                  for (i = 0; i < num_fun; i++)
                   {
-                     for (j=0; j < num_fun; j++)
+                     for (j = 0; j < num_fun; j++)
                      {
-                        j_ind = o_cnt+i*num_offd_coeffs+j;
-                        big_offd_j[j_ind] = big_first_j+(HYPRE_BigInt)j;
-                        offd_data[j_ind] = value[1*sz + i*num_fun+j]*mtrx[i*num_fun+j];
+                        j_ind = o_cnt + i * num_offd_coeffs + j;
+                        big_offd_j[j_ind] = big_first_j + (HYPRE_BigInt)j;
+                        offd_data[j_ind] = value[1 * sz + i * num_fun + j] * mtrx[i * num_fun + j];
                      }
                   }
                   o_cnt += num_fun;
                }
             }
-            if (iy+1 < ny_part[q+1])
+            if (iy + 1 < ny_part[q + 1])
             {
-               first_j = row_index+nx_local*num_fun;
-               for (i=0; i < num_fun; i++)
+               first_j = row_index + nx_local * num_fun;
+               for (i = 0; i < num_fun; i++)
                {
-                  for (j=0; j < num_fun; j++)
+                  for (j = 0; j < num_fun; j++)
                   {
-                     j_ind = cnt+i*num_coeffs+j;
-                     diag_j[j_ind] = first_j+j;
-                     diag_data[j_ind] = value[2*sz + i*num_fun+j]*mtrx[i*num_fun+j];
+                     j_ind = cnt + i * num_coeffs + j;
+                     diag_j[j_ind] = first_j + j;
+                     diag_data[j_ind] = value[2 * sz + i * num_fun + j] * mtrx[i * num_fun + j];
                   }
                }
                cnt += num_fun;
             }
             else
             {
-               if (iy+1 < ny)
+               if (iy + 1 < ny)
                {
-                  big_first_j = big_num_fun*hypre_map(ix,iy+1,iz,p,q+1,r,nx,ny,
-                                                nx_part,ny_part,nz_part);
-                  for (i=0; i < num_fun; i++)
+                  big_first_j = big_num_fun * hypre_map(ix, iy + 1, iz, p, q + 1, r, nx, ny,
+                                                        nx_part, ny_part, nz_part);
+                  for (i = 0; i < num_fun; i++)
                   {
-                     for (j=0; j < num_fun; j++)
+                     for (j = 0; j < num_fun; j++)
                      {
-                        j_ind = o_cnt+i*num_offd_coeffs+j;
-                        big_offd_j[j_ind] = big_first_j+(HYPRE_BigInt)j;
-                        offd_data[j_ind] = value[2*sz + i*num_fun+j]*mtrx[i*num_fun+j];
+                        j_ind = o_cnt + i * num_offd_coeffs + j;
+                        big_offd_j[j_ind] = big_first_j + (HYPRE_BigInt)j;
+                        offd_data[j_ind] = value[2 * sz + i * num_fun + j] * mtrx[i * num_fun + j];
                      }
                   }
                   o_cnt += num_fun;
                }
             }
-            if (iz+1 < nz_part[r+1])
+            if (iz + 1 < nz_part[r + 1])
             {
-               first_j = row_index+nx_local*ny_local*num_fun;
-               for (i=0; i < num_fun; i++)
+               first_j = row_index + nx_local * ny_local * num_fun;
+               for (i = 0; i < num_fun; i++)
                {
-                  for (j=0; j < num_fun; j++)
+                  for (j = 0; j < num_fun; j++)
                   {
-                     j_ind = cnt+i*num_coeffs+j;
-                     diag_j[j_ind] = first_j+j;
-                     diag_data[j_ind] = value[3*sz + i*num_fun+j]*mtrx[i*num_fun+j];
+                     j_ind = cnt + i * num_coeffs + j;
+                     diag_j[j_ind] = first_j + j;
+                     diag_data[j_ind] = value[3 * sz + i * num_fun + j] * mtrx[i * num_fun + j];
                   }
                }
                cnt += num_fun;
             }
             else
             {
-               if (iz+1 < nz)
+               if (iz + 1 < nz)
                {
-                  big_first_j = big_num_fun*hypre_map(ix,iy,iz+1,p,q,r+1,nx,ny,
-                                                nx_part,ny_part,nz_part);
-                  for (i=0; i < num_fun; i++)
+                  big_first_j = big_num_fun * hypre_map(ix, iy, iz + 1, p, q, r + 1, nx, ny,
+                                                        nx_part, ny_part, nz_part);
+                  for (i = 0; i < num_fun; i++)
                   {
-                     for (j=0; j < num_fun; j++)
+                     for (j = 0; j < num_fun; j++)
                      {
-                        j_ind = o_cnt+i*num_offd_coeffs+j;
-                        big_offd_j[j_ind] = big_first_j+(HYPRE_BigInt)j;
-                        offd_data[j_ind] = value[3*sz + i*num_fun+j]*mtrx[i*num_fun+j];
+                        j_ind = o_cnt + i * num_offd_coeffs + j;
+                        big_offd_j[j_ind] = big_first_j + (HYPRE_BigInt)j;
+                        offd_data[j_ind] = value[3 * sz + i * num_fun + j] * mtrx[i * num_fun + j];
                      }
                   }
                   o_cnt += num_fun;
@@ -1251,19 +1287,19 @@ GenerateSysLaplacianVCoef( MPI_Comm       comm,
 
    if (num_procs > 1)
    {
-         cnt = 0;
-         for (i=0; i < local_num_rows; i+=num_fun)
+      cnt = 0;
+      for (i = 0; i < local_num_rows; i += num_fun)
+      {
+         for (j = offd_i[i]; j < offd_i[i + 1]; j++)
          {
-            for (j=offd_i[i]; j < offd_i[i+1]; j++)
-            {
-               col_map_offd[cnt++] = big_offd_j[j];
-            }
+            col_map_offd[cnt++] = big_offd_j[j];
          }
+      }
 
-      hypre_BigQsort0(col_map_offd, 0, num_cols_offd-1);
+      hypre_BigQsort0(col_map_offd, 0, num_cols_offd - 1);
 
-      for (i=0; i < num_fun*num_cols_offd; i++)
-         for (j=hypre_min(0,hypre_abs(i-num_fun)); j < num_cols_offd; j++)
+      for (i = 0; i < num_fun * num_cols_offd; i++)
+         for (j = hypre_min(0, hypre_abs(i - num_fun)); j < num_cols_offd; j++)
             if (big_offd_j[i] == col_map_offd[j])
             {
                offd_j[i] = j;
@@ -1271,16 +1307,18 @@ GenerateSysLaplacianVCoef( MPI_Comm       comm,
             }
    }
 
-   for (i=0; i < gp_size; i++)
+   for (i = 0; i < gp_size; i++)
+   {
       global_part[i] *= num_fun;
+   }
 
-   for (j=1; j< num_fun; j++)
+   for (j = 1; j < num_fun; j++)
    {
-      for (i=0; i<local_grid_size; i++)
+      for (i = 0; i < local_grid_size; i++)
       {
-         row = i*num_fun+j;
+         row = i * num_fun + j;
          diag_index = diag_i[row];
-         index = diag_index+j;
+         index = diag_index + j;
          val = diag_data[diag_index];
          col = diag_j[diag_index];
          diag_data[diag_index] = diag_data[index];
@@ -1290,7 +1328,7 @@ GenerateSysLaplacianVCoef( MPI_Comm       comm,
       }
    }
 
-   A = hypre_ParCSRMatrixCreate(comm, num_fun*grid_size, num_fun*grid_size,
+   A = hypre_ParCSRMatrixCreate(comm, num_fun * grid_size, num_fun * grid_size,
                                 global_part, global_part, num_cols_offd,
                                 diag_i[local_num_rows],
                                 offd_i[local_num_rows]);
@@ -1319,7 +1357,6 @@ GenerateSysLaplacianVCoef( MPI_Comm       comm,
    hypre_TFree(ny_part,     HYPRE_MEMORY_HOST);
    hypre_TFree(nz_part,     HYPRE_MEMORY_HOST);
    hypre_TFree(big_offd_j,  HYPRE_MEMORY_HOST);
-   hypre_TFree(global_part, HYPRE_MEMORY_HOST);
 
    return (HYPRE_ParCSRMatrix) A;
 }
diff --git a/external/hypre/src/parcsr_ls/par_laplace_27pt.c b/external/hypre/src/parcsr_ls/par_laplace_27pt.c
index fe880cc2..43209d50 100644
--- a/external/hypre/src/parcsr_ls/par_laplace_27pt.c
+++ b/external/hypre/src/parcsr_ls/par_laplace_27pt.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -33,11 +33,11 @@ GenerateLaplacian27pt(MPI_Comm comm,
    HYPRE_Real *diag_data;
 
    HYPRE_Int    *offd_i;
-   HYPRE_Int    *offd_j;
+   HYPRE_Int    *offd_j = NULL;
    HYPRE_BigInt *big_offd_j = NULL;
-   HYPRE_Real *offd_data;
+   HYPRE_Real *offd_data = NULL;
 
-   HYPRE_BigInt *global_part;
+   HYPRE_BigInt global_part[2];
    HYPRE_BigInt ix, iy, iz;
    HYPRE_Int cnt, o_cnt;
    HYPRE_Int local_num_rows;
@@ -58,60 +58,59 @@ GenerateLaplacian27pt(MPI_Comm comm,
    HYPRE_Int num_procs;
    HYPRE_Int P_busy, Q_busy, R_busy;
 
-   hypre_MPI_Comm_size(comm,&num_procs);
+   hypre_MPI_Comm_size(comm, &num_procs);
 
-   grid_size = nx*ny*nz;
+   grid_size = nx * ny * nz;
 
-   hypre_GeneratePartitioning(nx,P,&nx_part);
-   hypre_GeneratePartitioning(ny,Q,&ny_part);
-   hypre_GeneratePartitioning(nz,R,&nz_part);
+   hypre_GeneratePartitioning(nx, P, &nx_part);
+   hypre_GeneratePartitioning(ny, Q, &ny_part);
+   hypre_GeneratePartitioning(nz, R, &nz_part);
 
-   nx_local = (HYPRE_Int)(nx_part[p+1] - nx_part[p]);
-   ny_local = (HYPRE_Int)(ny_part[q+1] - ny_part[q]);
-   nz_local = (HYPRE_Int)(nz_part[r+1] - nz_part[r]);
+   nx_local = (HYPRE_Int)(nx_part[p + 1] - nx_part[p]);
+   ny_local = (HYPRE_Int)(ny_part[q + 1] - ny_part[q]);
+   nz_local = (HYPRE_Int)(nz_part[r + 1] - nz_part[r]);
 
-   local_num_rows = nx_local*ny_local*nz_local;
+   local_num_rows = nx_local * ny_local * nz_local;
 
-   global_part = hypre_CTAlloc(HYPRE_BigInt, 2, HYPRE_MEMORY_HOST);
-   global_part[0] = nz_part[r]*nx*ny+(ny_part[q]*nx+nx_part[p]*ny_local)*nz_local;
+   global_part[0] = nz_part[r] * nx * ny + (ny_part[q] * nx + nx_part[p] * ny_local) * nz_local;
    global_part[1] = global_part[0] + (HYPRE_BigInt)local_num_rows;
 
-   diag_i = hypre_CTAlloc(HYPRE_Int,  local_num_rows+1, HYPRE_MEMORY_HOST);
-   offd_i = hypre_CTAlloc(HYPRE_Int,  local_num_rows+1, HYPRE_MEMORY_HOST);
+   diag_i = hypre_CTAlloc(HYPRE_Int,  local_num_rows + 1, HYPRE_MEMORY_HOST);
+   offd_i = hypre_CTAlloc(HYPRE_Int,  local_num_rows + 1, HYPRE_MEMORY_HOST);
 
-   P_busy = hypre_min(nx,P);
-   Q_busy = hypre_min(ny,Q);
-   R_busy = hypre_min(nz,R);
+   P_busy = hypre_min(nx, P);
+   Q_busy = hypre_min(ny, Q);
+   R_busy = hypre_min(nz, R);
 
    num_cols_offd = 0;
-   if (p) num_cols_offd += ny_local*nz_local;
-   if (p < P_busy-1) num_cols_offd += ny_local*nz_local;
-   if (q) num_cols_offd += nx_local*nz_local;
-   if (q < Q_busy-1) num_cols_offd += nx_local*nz_local;
-   if (r) num_cols_offd += nx_local*ny_local;
-   if (r < R_busy-1) num_cols_offd += nx_local*ny_local;
-   if (p && q) num_cols_offd += nz_local;
-   if (p && q < Q_busy-1 ) num_cols_offd += nz_local;
-   if (p < P_busy-1 && q ) num_cols_offd += nz_local;
-   if (p < P_busy-1 && q < Q_busy-1 ) num_cols_offd += nz_local;
-   if (p && r) num_cols_offd += ny_local;
-   if (p && r < R_busy-1 ) num_cols_offd += ny_local;
-   if (p < P_busy-1 && r ) num_cols_offd += ny_local;
-   if (p < P_busy-1 && r < R_busy-1 ) num_cols_offd += ny_local;
-   if (q && r) num_cols_offd += nx_local;
-   if (q && r < R_busy-1 ) num_cols_offd += nx_local;
-   if (q < Q_busy-1 && r ) num_cols_offd += nx_local;
-   if (q < Q_busy-1 && r < R_busy-1 ) num_cols_offd += nx_local;
-   if (p && q && r) num_cols_offd++;
-   if (p && q && r < R_busy-1) num_cols_offd++;
-   if (p && q < Q_busy-1 && r) num_cols_offd++;
-   if (p && q < Q_busy-1 && r < R_busy-1) num_cols_offd++;
-   if (p < P_busy-1 && q && r) num_cols_offd++;
-   if (p < P_busy-1 && q && r < R_busy-1 ) num_cols_offd++;
-   if (p < P_busy-1 && q < Q_busy-1 && r ) num_cols_offd++;
-   if (p < P_busy-1 && q < Q_busy-1 && r < R_busy-1) num_cols_offd++;
+   if (p) { num_cols_offd += ny_local * nz_local; }
+   if (p < P_busy - 1) { num_cols_offd += ny_local * nz_local; }
+   if (q) { num_cols_offd += nx_local * nz_local; }
+   if (q < Q_busy - 1) { num_cols_offd += nx_local * nz_local; }
+   if (r) { num_cols_offd += nx_local * ny_local; }
+   if (r < R_busy - 1) { num_cols_offd += nx_local * ny_local; }
+   if (p && q) { num_cols_offd += nz_local; }
+   if (p && q < Q_busy - 1 ) { num_cols_offd += nz_local; }
+   if (p < P_busy - 1 && q ) { num_cols_offd += nz_local; }
+   if (p < P_busy - 1 && q < Q_busy - 1 ) { num_cols_offd += nz_local; }
+   if (p && r) { num_cols_offd += ny_local; }
+   if (p && r < R_busy - 1 ) { num_cols_offd += ny_local; }
+   if (p < P_busy - 1 && r ) { num_cols_offd += ny_local; }
+   if (p < P_busy - 1 && r < R_busy - 1 ) { num_cols_offd += ny_local; }
+   if (q && r) { num_cols_offd += nx_local; }
+   if (q && r < R_busy - 1 ) { num_cols_offd += nx_local; }
+   if (q < Q_busy - 1 && r ) { num_cols_offd += nx_local; }
+   if (q < Q_busy - 1 && r < R_busy - 1 ) { num_cols_offd += nx_local; }
+   if (p && q && r) { num_cols_offd++; }
+   if (p && q && r < R_busy - 1) { num_cols_offd++; }
+   if (p && q < Q_busy - 1 && r) { num_cols_offd++; }
+   if (p && q < Q_busy - 1 && r < R_busy - 1) { num_cols_offd++; }
+   if (p < P_busy - 1 && q && r) { num_cols_offd++; }
+   if (p < P_busy - 1 && q && r < R_busy - 1 ) { num_cols_offd++; }
+   if (p < P_busy - 1 && q < Q_busy - 1 && r ) { num_cols_offd++; }
+   if (p < P_busy - 1 && q < Q_busy - 1 && r < R_busy - 1) { num_cols_offd++; }
 
-   if (!local_num_rows) num_cols_offd = 0;
+   if (!local_num_rows) { num_cols_offd = 0; }
 
    col_map_offd = hypre_CTAlloc(HYPRE_BigInt, num_cols_offd, HYPRE_MEMORY_HOST);
 
@@ -119,16 +118,16 @@ GenerateLaplacian27pt(MPI_Comm comm,
    o_cnt = 0;
    diag_i[0] = 0;
    offd_i[0] = 0;
-   for (iz = nz_part[r];  iz < nz_part[r+1]; iz++)
+   for (iz = nz_part[r];  iz < nz_part[r + 1]; iz++)
    {
-      for (iy = ny_part[q];  iy < ny_part[q+1]; iy++)
+      for (iy = ny_part[q];  iy < ny_part[q + 1]; iy++)
       {
-         for (ix = nx_part[p]; ix < nx_part[p+1]; ix++)
+         for (ix = nx_part[p]; ix < nx_part[p + 1]; ix++)
          {
             cnt++;
             o_cnt++;
-            diag_i[cnt] = diag_i[cnt-1];
-            offd_i[o_cnt] = offd_i[o_cnt-1];
+            diag_i[cnt] = diag_i[cnt - 1];
+            offd_i[o_cnt] = offd_i[o_cnt - 1];
             diag_i[cnt]++;
             if (iz > nz_part[r])
             {
@@ -143,16 +142,20 @@ GenerateLaplacian27pt(MPI_Comm comm,
                   else
                   {
                      if (ix)
+                     {
                         offd_i[o_cnt]++;
+                     }
                   }
-                  if (ix < nx_part[p+1]-1)
+                  if (ix < nx_part[p + 1] - 1)
                   {
                      diag_i[cnt]++;
                   }
                   else
                   {
-                     if (ix+1 < nx)
+                     if (ix + 1 < nx)
+                     {
                         offd_i[o_cnt]++;
+                     }
                   }
                }
                else
@@ -168,18 +171,20 @@ GenerateLaplacian27pt(MPI_Comm comm,
                      {
                         offd_i[o_cnt]++;
                      }
-                     if (ix < nx_part[p+1]-1)
+                     if (ix < nx_part[p + 1] - 1)
                      {
                         offd_i[o_cnt]++;
                      }
-                     else if (ix < nx-1)
+                     else if (ix < nx - 1)
                      {
                         offd_i[o_cnt]++;
                      }
                   }
                }
                if (ix > nx_part[p])
+               {
                   diag_i[cnt]++;
+               }
                else
                {
                   if (ix)
@@ -187,16 +192,18 @@ GenerateLaplacian27pt(MPI_Comm comm,
                      offd_i[o_cnt]++;
                   }
                }
-               if (ix+1 < nx_part[p+1])
+               if (ix + 1 < nx_part[p + 1])
+               {
                   diag_i[cnt]++;
+               }
                else
                {
-                  if (ix+1 < nx)
+                  if (ix + 1 < nx)
                   {
                      offd_i[o_cnt]++;
                   }
                }
-               if (iy+1 < ny_part[q+1])
+               if (iy + 1 < ny_part[q + 1])
                {
                   diag_i[cnt]++;
                   if (ix > nx_part[p])
@@ -206,21 +213,25 @@ GenerateLaplacian27pt(MPI_Comm comm,
                   else
                   {
                      if (ix)
+                     {
                         offd_i[o_cnt]++;
+                     }
                   }
-                  if (ix < nx_part[p+1]-1)
+                  if (ix < nx_part[p + 1] - 1)
                   {
                      diag_i[cnt]++;
                   }
                   else
                   {
-                     if (ix+1 < nx)
+                     if (ix + 1 < nx)
+                     {
                         offd_i[o_cnt]++;
+                     }
                   }
                }
                else
                {
-                  if (iy+1 < ny)
+                  if (iy + 1 < ny)
                   {
                      offd_i[o_cnt]++;
                      if (ix > nx_part[p])
@@ -231,11 +242,11 @@ GenerateLaplacian27pt(MPI_Comm comm,
                      {
                         offd_i[o_cnt]++;
                      }
-                     if (ix < nx_part[p+1]-1)
+                     if (ix < nx_part[p + 1] - 1)
                      {
                         offd_i[o_cnt]++;
                      }
-                     else if (ix < nx-1)
+                     else if (ix < nx - 1)
                      {
                         offd_i[o_cnt]++;
                      }
@@ -257,16 +268,20 @@ GenerateLaplacian27pt(MPI_Comm comm,
                      else
                      {
                         if (ix)
+                        {
                            offd_i[o_cnt]++;
+                        }
                      }
-                     if (ix < nx_part[p+1]-1)
+                     if (ix < nx_part[p + 1] - 1)
                      {
                         offd_i[o_cnt]++;
                      }
                      else
                      {
-                        if (ix+1 < nx)
+                        if (ix + 1 < nx)
+                        {
                            offd_i[o_cnt]++;
+                        }
                      }
                   }
                   else
@@ -282,18 +297,20 @@ GenerateLaplacian27pt(MPI_Comm comm,
                         {
                            offd_i[o_cnt]++;
                         }
-                        if (ix < nx_part[p+1]-1)
+                        if (ix < nx_part[p + 1] - 1)
                         {
                            offd_i[o_cnt]++;
                         }
-                        else if (ix < nx-1)
+                        else if (ix < nx - 1)
                         {
                            offd_i[o_cnt]++;
                         }
                      }
                   }
                   if (ix > nx_part[p])
+                  {
                      offd_i[o_cnt]++;
+                  }
                   else
                   {
                      if (ix)
@@ -301,16 +318,18 @@ GenerateLaplacian27pt(MPI_Comm comm,
                         offd_i[o_cnt]++;
                      }
                   }
-                  if (ix+1 < nx_part[p+1])
+                  if (ix + 1 < nx_part[p + 1])
+                  {
                      offd_i[o_cnt]++;
+                  }
                   else
                   {
-                     if (ix+1 < nx)
+                     if (ix + 1 < nx)
                      {
                         offd_i[o_cnt]++;
                      }
                   }
-                  if (iy+1 < ny_part[q+1])
+                  if (iy + 1 < ny_part[q + 1])
                   {
                      offd_i[o_cnt]++;
                      if (ix > nx_part[p])
@@ -320,21 +339,25 @@ GenerateLaplacian27pt(MPI_Comm comm,
                      else
                      {
                         if (ix)
+                        {
                            offd_i[o_cnt]++;
+                        }
                      }
-                     if (ix < nx_part[p+1]-1)
+                     if (ix < nx_part[p + 1] - 1)
                      {
                         offd_i[o_cnt]++;
                      }
                      else
                      {
-                        if (ix+1 < nx)
+                        if (ix + 1 < nx)
+                        {
                            offd_i[o_cnt]++;
+                        }
                      }
                   }
                   else
                   {
-                     if (iy+1 < ny)
+                     if (iy + 1 < ny)
                      {
                         offd_i[o_cnt]++;
                         if (ix > nx_part[p])
@@ -345,11 +368,11 @@ GenerateLaplacian27pt(MPI_Comm comm,
                         {
                            offd_i[o_cnt]++;
                         }
-                        if (ix < nx_part[p+1]-1)
+                        if (ix < nx_part[p + 1] - 1)
                         {
                            offd_i[o_cnt]++;
                         }
-                        else if (ix < nx-1)
+                        else if (ix < nx - 1)
                         {
                            offd_i[o_cnt]++;
                         }
@@ -367,16 +390,20 @@ GenerateLaplacian27pt(MPI_Comm comm,
                else
                {
                   if (ix)
+                  {
                      offd_i[o_cnt]++;
+                  }
                }
-               if (ix < nx_part[p+1]-1)
+               if (ix < nx_part[p + 1] - 1)
                {
                   diag_i[cnt]++;
                }
                else
                {
-                  if (ix+1 < nx)
+                  if (ix + 1 < nx)
+                  {
                      offd_i[o_cnt]++;
+                  }
                }
             }
             else
@@ -392,18 +419,20 @@ GenerateLaplacian27pt(MPI_Comm comm,
                   {
                      offd_i[o_cnt]++;
                   }
-                  if (ix < nx_part[p+1]-1)
+                  if (ix < nx_part[p + 1] - 1)
                   {
                      offd_i[o_cnt]++;
                   }
-                  else if (ix < nx-1)
+                  else if (ix < nx - 1)
                   {
                      offd_i[o_cnt]++;
                   }
                }
             }
             if (ix > nx_part[p])
+            {
                diag_i[cnt]++;
+            }
             else
             {
                if (ix)
@@ -411,16 +440,18 @@ GenerateLaplacian27pt(MPI_Comm comm,
                   offd_i[o_cnt]++;
                }
             }
-            if (ix+1 < nx_part[p+1])
+            if (ix + 1 < nx_part[p + 1])
+            {
                diag_i[cnt]++;
+            }
             else
             {
-               if (ix+1 < nx)
+               if (ix + 1 < nx)
                {
                   offd_i[o_cnt]++;
                }
             }
-            if (iy+1 < ny_part[q+1])
+            if (iy + 1 < ny_part[q + 1])
             {
                diag_i[cnt]++;
                if (ix > nx_part[p])
@@ -430,21 +461,25 @@ GenerateLaplacian27pt(MPI_Comm comm,
                else
                {
                   if (ix)
+                  {
                      offd_i[o_cnt]++;
+                  }
                }
-               if (ix < nx_part[p+1]-1)
+               if (ix < nx_part[p + 1] - 1)
                {
                   diag_i[cnt]++;
                }
                else
                {
-                  if (ix+1 < nx)
+                  if (ix + 1 < nx)
+                  {
                      offd_i[o_cnt]++;
+                  }
                }
             }
             else
             {
-               if (iy+1 < ny)
+               if (iy + 1 < ny)
                {
                   offd_i[o_cnt]++;
                   if (ix > nx_part[p])
@@ -455,17 +490,17 @@ GenerateLaplacian27pt(MPI_Comm comm,
                   {
                      offd_i[o_cnt]++;
                   }
-                  if (ix < nx_part[p+1]-1)
+                  if (ix < nx_part[p + 1] - 1)
                   {
                      offd_i[o_cnt]++;
                   }
-                  else if (ix < nx-1)
+                  else if (ix < nx - 1)
                   {
                      offd_i[o_cnt]++;
                   }
                }
             }
-            if (iz+1 < nz_part[r+1])
+            if (iz + 1 < nz_part[r + 1])
             {
                diag_i[cnt]++;
                if (iy > ny_part[q])
@@ -478,16 +513,20 @@ GenerateLaplacian27pt(MPI_Comm comm,
                   else
                   {
                      if (ix)
+                     {
                         offd_i[o_cnt]++;
+                     }
                   }
-                  if (ix < nx_part[p+1]-1)
+                  if (ix < nx_part[p + 1] - 1)
                   {
                      diag_i[cnt]++;
                   }
                   else
                   {
-                     if (ix+1 < nx)
+                     if (ix + 1 < nx)
+                     {
                         offd_i[o_cnt]++;
+                     }
                   }
                }
                else
@@ -503,18 +542,20 @@ GenerateLaplacian27pt(MPI_Comm comm,
                      {
                         offd_i[o_cnt]++;
                      }
-                     if (ix < nx_part[p+1]-1)
+                     if (ix < nx_part[p + 1] - 1)
                      {
                         offd_i[o_cnt]++;
                      }
-                     else if (ix < nx-1)
+                     else if (ix < nx - 1)
                      {
                         offd_i[o_cnt]++;
                      }
                   }
                }
                if (ix > nx_part[p])
+               {
                   diag_i[cnt]++;
+               }
                else
                {
                   if (ix)
@@ -522,16 +563,18 @@ GenerateLaplacian27pt(MPI_Comm comm,
                      offd_i[o_cnt]++;
                   }
                }
-               if (ix+1 < nx_part[p+1])
+               if (ix + 1 < nx_part[p + 1])
+               {
                   diag_i[cnt]++;
+               }
                else
                {
-                  if (ix+1 < nx)
+                  if (ix + 1 < nx)
                   {
                      offd_i[o_cnt]++;
                   }
                }
-               if (iy+1 < ny_part[q+1])
+               if (iy + 1 < ny_part[q + 1])
                {
                   diag_i[cnt]++;
                   if (ix > nx_part[p])
@@ -541,21 +584,25 @@ GenerateLaplacian27pt(MPI_Comm comm,
                   else
                   {
                      if (ix)
+                     {
                         offd_i[o_cnt]++;
+                     }
                   }
-                  if (ix < nx_part[p+1]-1)
+                  if (ix < nx_part[p + 1] - 1)
                   {
                      diag_i[cnt]++;
                   }
                   else
                   {
-                     if (ix+1 < nx)
+                     if (ix + 1 < nx)
+                     {
                         offd_i[o_cnt]++;
+                     }
                   }
                }
                else
                {
-                  if (iy+1 < ny)
+                  if (iy + 1 < ny)
                   {
                      offd_i[o_cnt]++;
                      if (ix > nx_part[p])
@@ -566,11 +613,11 @@ GenerateLaplacian27pt(MPI_Comm comm,
                      {
                         offd_i[o_cnt]++;
                      }
-                     if (ix < nx_part[p+1]-1)
+                     if (ix < nx_part[p + 1] - 1)
                      {
                         offd_i[o_cnt]++;
                      }
-                     else if (ix < nx-1)
+                     else if (ix < nx - 1)
                      {
                         offd_i[o_cnt]++;
                      }
@@ -579,7 +626,7 @@ GenerateLaplacian27pt(MPI_Comm comm,
             }
             else
             {
-               if (iz+1 < nz)
+               if (iz + 1 < nz)
                {
                   offd_i[o_cnt]++;
                   if (iy > ny_part[q])
@@ -592,16 +639,20 @@ GenerateLaplacian27pt(MPI_Comm comm,
                      else
                      {
                         if (ix)
+                        {
                            offd_i[o_cnt]++;
+                        }
                      }
-                     if (ix < nx_part[p+1]-1)
+                     if (ix < nx_part[p + 1] - 1)
                      {
                         offd_i[o_cnt]++;
                      }
                      else
                      {
-                        if (ix+1 < nx)
+                        if (ix + 1 < nx)
+                        {
                            offd_i[o_cnt]++;
+                        }
                      }
                   }
                   else
@@ -617,18 +668,20 @@ GenerateLaplacian27pt(MPI_Comm comm,
                         {
                            offd_i[o_cnt]++;
                         }
-                        if (ix < nx_part[p+1]-1)
+                        if (ix < nx_part[p + 1] - 1)
                         {
                            offd_i[o_cnt]++;
                         }
-                        else if (ix < nx-1)
+                        else if (ix < nx - 1)
                         {
                            offd_i[o_cnt]++;
                         }
                      }
                   }
                   if (ix > nx_part[p])
+                  {
                      offd_i[o_cnt]++;
+                  }
                   else
                   {
                      if (ix)
@@ -636,16 +689,18 @@ GenerateLaplacian27pt(MPI_Comm comm,
                         offd_i[o_cnt]++;
                      }
                   }
-                  if (ix+1 < nx_part[p+1])
+                  if (ix + 1 < nx_part[p + 1])
+                  {
                      offd_i[o_cnt]++;
+                  }
                   else
                   {
-                     if (ix+1 < nx)
+                     if (ix + 1 < nx)
                      {
                         offd_i[o_cnt]++;
                      }
                   }
-                  if (iy+1 < ny_part[q+1])
+                  if (iy + 1 < ny_part[q + 1])
                   {
                      offd_i[o_cnt]++;
                      if (ix > nx_part[p])
@@ -655,21 +710,25 @@ GenerateLaplacian27pt(MPI_Comm comm,
                      else
                      {
                         if (ix)
+                        {
                            offd_i[o_cnt]++;
+                        }
                      }
-                     if (ix < nx_part[p+1]-1)
+                     if (ix < nx_part[p + 1] - 1)
                      {
                         offd_i[o_cnt]++;
                      }
                      else
                      {
-                        if (ix+1 < nx)
+                        if (ix + 1 < nx)
+                        {
                            offd_i[o_cnt]++;
+                        }
                      }
                   }
                   else
                   {
-                     if (iy+1 < ny)
+                     if (iy + 1 < ny)
                      {
                         offd_i[o_cnt]++;
                         if (ix > nx_part[p])
@@ -680,11 +739,11 @@ GenerateLaplacian27pt(MPI_Comm comm,
                         {
                            offd_i[o_cnt]++;
                         }
-                        if (ix < nx_part[p+1]-1)
+                        if (ix < nx_part[p + 1] - 1)
                         {
                            offd_i[o_cnt]++;
                         }
-                        else if (ix < nx-1)
+                        else if (ix < nx - 1)
                         {
                            offd_i[o_cnt]++;
                         }
@@ -706,15 +765,15 @@ GenerateLaplacian27pt(MPI_Comm comm,
       offd_data = hypre_CTAlloc(HYPRE_Real,  offd_i[local_num_rows], HYPRE_MEMORY_HOST);
    }
 
-   nxy = nx_local*ny_local;
+   nxy = nx_local * ny_local;
    row_index = 0;
    cnt = 0;
    o_cnt = 0;
-   for (iz = nz_part[r];  iz < nz_part[r+1]; iz++)
+   for (iz = nz_part[r];  iz < nz_part[r + 1]; iz++)
    {
-      for (iy = ny_part[q];  iy < ny_part[q+1]; iy++)
+      for (iy = ny_part[q];  iy < ny_part[q + 1]; iy++)
       {
-         for (ix = nx_part[p]; ix < nx_part[p+1]; ix++)
+         for (ix = nx_part[p]; ix < nx_part[p + 1]; ix++)
          {
             diag_j[cnt] = row_index;
             diag_data[cnt++] = value[0];
@@ -724,31 +783,31 @@ GenerateLaplacian27pt(MPI_Comm comm,
                {
                   if (ix > nx_part[p])
                   {
-                     diag_j[cnt] = row_index-nxy-nx_local-1;
+                     diag_j[cnt] = row_index - nxy - nx_local - 1;
                      diag_data[cnt++] = value[1];
                   }
                   else
                   {
                      if (ix)
                      {
-                        big_offd_j[o_cnt] = hypre_map(ix-1,iy-1,iz-1,p-1,q,r,nx,ny,
-                              nx_part,ny_part,nz_part);
+                        big_offd_j[o_cnt] = hypre_map(ix - 1, iy - 1, iz - 1, p - 1, q, r, nx, ny,
+                                                      nx_part, ny_part, nz_part);
                         offd_data[o_cnt++] = value[1];
                      }
                   }
-                  diag_j[cnt] = row_index-nxy-nx_local;
+                  diag_j[cnt] = row_index - nxy - nx_local;
                   diag_data[cnt++] = value[1];
-                  if (ix < nx_part[p+1]-1)
+                  if (ix < nx_part[p + 1] - 1)
                   {
-                     diag_j[cnt] = row_index-nxy-nx_local+1;
+                     diag_j[cnt] = row_index - nxy - nx_local + 1;
                      diag_data[cnt++] = value[1];
                   }
                   else
                   {
-                     if (ix+1 < nx)
+                     if (ix + 1 < nx)
                      {
-                        big_offd_j[o_cnt] = hypre_map(ix+1,iy-1,iz-1,p+1,q,r,nx,ny,
-                              nx_part,ny_part,nz_part);
+                        big_offd_j[o_cnt] = hypre_map(ix + 1, iy - 1, iz - 1, p + 1, q, r, nx, ny,
+                                                      nx_part, ny_part, nz_part);
                         offd_data[o_cnt++] = value[1];
                      }
                   }
@@ -759,125 +818,125 @@ GenerateLaplacian27pt(MPI_Comm comm,
                   {
                      if (ix > nx_part[p])
                      {
-                        big_offd_j[o_cnt] = hypre_map(ix-1,iy-1,iz-1,p,q-1,r,nx,ny,
-                              nx_part,ny_part,nz_part);
+                        big_offd_j[o_cnt] = hypre_map(ix - 1, iy - 1, iz - 1, p, q - 1, r, nx, ny,
+                                                      nx_part, ny_part, nz_part);
                         offd_data[o_cnt++] = value[1];
                      }
                      else if (ix)
                      {
-                        big_offd_j[o_cnt] = hypre_map(ix-1,iy-1,iz-1,p-1,q-1,r,nx,ny,
-                              nx_part,ny_part,nz_part);
+                        big_offd_j[o_cnt] = hypre_map(ix - 1, iy - 1, iz - 1, p - 1, q - 1, r, nx, ny,
+                                                      nx_part, ny_part, nz_part);
                         offd_data[o_cnt++] = value[1];
                      }
-                     big_offd_j[o_cnt] = hypre_map(ix,iy-1,iz-1,p,q-1,r,nx,ny,
-                           nx_part,ny_part,nz_part);
+                     big_offd_j[o_cnt] = hypre_map(ix, iy - 1, iz - 1, p, q - 1, r, nx, ny,
+                                                   nx_part, ny_part, nz_part);
                      offd_data[o_cnt++] = value[1];
-                     if (ix < nx_part[p+1]-1)
+                     if (ix < nx_part[p + 1] - 1)
                      {
-                        big_offd_j[o_cnt] = hypre_map(ix+1,iy-1,iz-1,p,q-1,r,nx,ny,
-                              nx_part,ny_part,nz_part);
+                        big_offd_j[o_cnt] = hypre_map(ix + 1, iy - 1, iz - 1, p, q - 1, r, nx, ny,
+                                                      nx_part, ny_part, nz_part);
                         offd_data[o_cnt++] = value[1];
                      }
-                     else if (ix < nx-1)
+                     else if (ix < nx - 1)
                      {
-                        big_offd_j[o_cnt] = hypre_map(ix+1,iy-1,iz-1,p+1,q-1,r,nx,ny,
-                              nx_part,ny_part,nz_part);
+                        big_offd_j[o_cnt] = hypre_map(ix + 1, iy - 1, iz - 1, p + 1, q - 1, r, nx, ny,
+                                                      nx_part, ny_part, nz_part);
                         offd_data[o_cnt++] = value[1];
                      }
                   }
                }
                if (ix > nx_part[p])
                {
-                  diag_j[cnt] = row_index-nxy-1;
+                  diag_j[cnt] = row_index - nxy - 1;
                   diag_data[cnt++] = value[1];
                }
                else
                {
                   if (ix)
                   {
-                     big_offd_j[o_cnt] = hypre_map(ix-1,iy,iz-1,p-1,q,r,nx,ny,
-                           nx_part,ny_part,nz_part);
+                     big_offd_j[o_cnt] = hypre_map(ix - 1, iy, iz - 1, p - 1, q, r, nx, ny,
+                                                   nx_part, ny_part, nz_part);
                      offd_data[o_cnt++] = value[1];
                   }
                }
-               diag_j[cnt] = row_index-nxy;
+               diag_j[cnt] = row_index - nxy;
                diag_data[cnt++] = value[1];
-               if (ix+1 < nx_part[p+1])
+               if (ix + 1 < nx_part[p + 1])
                {
-                  diag_j[cnt] = row_index-nxy+1;
+                  diag_j[cnt] = row_index - nxy + 1;
                   diag_data[cnt++] = value[1];
                }
                else
                {
-                  if (ix+1 < nx)
+                  if (ix + 1 < nx)
                   {
-                     big_offd_j[o_cnt] = hypre_map(ix+1,iy,iz-1,p+1,q,r,nx,ny,
-                           nx_part,ny_part,nz_part);
+                     big_offd_j[o_cnt] = hypre_map(ix + 1, iy, iz - 1, p + 1, q, r, nx, ny,
+                                                   nx_part, ny_part, nz_part);
                      offd_data[o_cnt++] = value[1];
                   }
                }
-               if (iy+1 < ny_part[q+1])
+               if (iy + 1 < ny_part[q + 1])
                {
                   if (ix > nx_part[p])
                   {
-                     diag_j[cnt] = row_index-nxy+nx_local-1;
+                     diag_j[cnt] = row_index - nxy + nx_local - 1;
                      diag_data[cnt++] = value[1];
                   }
                   else
                   {
                      if (ix)
                      {
-                        big_offd_j[o_cnt] = hypre_map(ix-1,iy+1,iz-1,p-1,q,r,nx,ny,
-                              nx_part,ny_part,nz_part);
+                        big_offd_j[o_cnt] = hypre_map(ix - 1, iy + 1, iz - 1, p - 1, q, r, nx, ny,
+                                                      nx_part, ny_part, nz_part);
                         offd_data[o_cnt++] = value[1];
                      }
                   }
-                  diag_j[cnt] = row_index-nxy+nx_local;
+                  diag_j[cnt] = row_index - nxy + nx_local;
                   diag_data[cnt++] = value[1];
-                  if (ix < nx_part[p+1]-1)
+                  if (ix < nx_part[p + 1] - 1)
                   {
-                     diag_j[cnt] = row_index-nxy+nx_local+1;
+                     diag_j[cnt] = row_index - nxy + nx_local + 1;
                      diag_data[cnt++] = value[1];
                   }
                   else
                   {
-                     if (ix+1 < nx)
+                     if (ix + 1 < nx)
                      {
-                        big_offd_j[o_cnt] = hypre_map(ix+1,iy+1,iz-1,p+1,q,r,nx,ny,
-                              nx_part,ny_part,nz_part);
+                        big_offd_j[o_cnt] = hypre_map(ix + 1, iy + 1, iz - 1, p + 1, q, r, nx, ny,
+                                                      nx_part, ny_part, nz_part);
                         offd_data[o_cnt++] = value[1];
                      }
                   }
                }
                else
                {
-                  if (iy+1 < ny)
+                  if (iy + 1 < ny)
                   {
                      if (ix > nx_part[p])
                      {
-                        big_offd_j[o_cnt] = hypre_map(ix-1,iy+1,iz-1,p,q+1,r,nx,ny,
-                              nx_part,ny_part,nz_part);
+                        big_offd_j[o_cnt] = hypre_map(ix - 1, iy + 1, iz - 1, p, q + 1, r, nx, ny,
+                                                      nx_part, ny_part, nz_part);
                         offd_data[o_cnt++] = value[1];
                      }
                      else if (ix)
                      {
-                        big_offd_j[o_cnt] = hypre_map(ix-1,iy+1,iz-1,p-1,q+1,r,nx,ny,
-                              nx_part,ny_part,nz_part);
+                        big_offd_j[o_cnt] = hypre_map(ix - 1, iy + 1, iz - 1, p - 1, q + 1, r, nx, ny,
+                                                      nx_part, ny_part, nz_part);
                         offd_data[o_cnt++] = value[1];
                      }
-                     big_offd_j[o_cnt] = hypre_map(ix,iy+1,iz-1,p,q+1,r,nx,ny,
-                           nx_part,ny_part,nz_part);
+                     big_offd_j[o_cnt] = hypre_map(ix, iy + 1, iz - 1, p, q + 1, r, nx, ny,
+                                                   nx_part, ny_part, nz_part);
                      offd_data[o_cnt++] = value[1];
-                     if (ix < nx_part[p+1]-1)
+                     if (ix < nx_part[p + 1] - 1)
                      {
-                        big_offd_j[o_cnt] = hypre_map(ix+1,iy+1,iz-1,p,q+1,r,nx,ny,
-                              nx_part,ny_part,nz_part);
+                        big_offd_j[o_cnt] = hypre_map(ix + 1, iy + 1, iz - 1, p, q + 1, r, nx, ny,
+                                                      nx_part, ny_part, nz_part);
                         offd_data[o_cnt++] = value[1];
                      }
-                     else if (ix < nx-1)
+                     else if (ix < nx - 1)
                      {
-                        big_offd_j[o_cnt] = hypre_map(ix+1,iy+1,iz-1,p+1,q+1,r,nx,ny,
-                              nx_part,ny_part,nz_part);
+                        big_offd_j[o_cnt] = hypre_map(ix + 1, iy + 1, iz - 1, p + 1, q + 1, r, nx, ny,
+                                                      nx_part, ny_part, nz_part);
                         offd_data[o_cnt++] = value[1];
                      }
                   }
@@ -891,34 +950,34 @@ GenerateLaplacian27pt(MPI_Comm comm,
                   {
                      if (ix > nx_part[p])
                      {
-                        big_offd_j[o_cnt] = hypre_map(ix-1,iy-1,iz-1,p,q,r-1,nx,ny,
-                              nx_part,ny_part,nz_part);
+                        big_offd_j[o_cnt] = hypre_map(ix - 1, iy - 1, iz - 1, p, q, r - 1, nx, ny,
+                                                      nx_part, ny_part, nz_part);
                         offd_data[o_cnt++] = value[1];
                      }
                      else
                      {
                         if (ix)
                         {
-                           big_offd_j[o_cnt] = hypre_map(ix-1,iy-1,iz-1,p-1,q,r-1,nx,ny,
-                                 nx_part,ny_part,nz_part);
+                           big_offd_j[o_cnt] = hypre_map(ix - 1, iy - 1, iz - 1, p - 1, q, r - 1, nx, ny,
+                                                         nx_part, ny_part, nz_part);
                            offd_data[o_cnt++] = value[1];
                         }
                      }
-                     big_offd_j[o_cnt] = hypre_map(ix,iy-1,iz-1,p,q,r-1,nx,ny,
-                           nx_part,ny_part,nz_part);
+                     big_offd_j[o_cnt] = hypre_map(ix, iy - 1, iz - 1, p, q, r - 1, nx, ny,
+                                                   nx_part, ny_part, nz_part);
                      offd_data[o_cnt++] = value[1];
-                     if (ix < nx_part[p+1]-1)
+                     if (ix < nx_part[p + 1] - 1)
                      {
-                        big_offd_j[o_cnt] = hypre_map(ix+1,iy-1,iz-1,p,q,r-1,nx,ny,
-                              nx_part,ny_part,nz_part);
+                        big_offd_j[o_cnt] = hypre_map(ix + 1, iy - 1, iz - 1, p, q, r - 1, nx, ny,
+                                                      nx_part, ny_part, nz_part);
                         offd_data[o_cnt++] = value[1];
                      }
                      else
                      {
-                        if (ix+1 < nx)
+                        if (ix + 1 < nx)
                         {
-                           big_offd_j[o_cnt] = hypre_map(ix+1,iy-1,iz-1,p+1,q,r-1,nx,ny,
-                                 nx_part,ny_part,nz_part);
+                           big_offd_j[o_cnt] = hypre_map(ix + 1, iy - 1, iz - 1, p + 1, q, r - 1, nx, ny,
+                                                         nx_part, ny_part, nz_part);
                            offd_data[o_cnt++] = value[1];
                         }
                      }
@@ -929,131 +988,131 @@ GenerateLaplacian27pt(MPI_Comm comm,
                      {
                         if (ix > nx_part[p])
                         {
-                           big_offd_j[o_cnt] = hypre_map(ix-1,iy-1,iz-1,p,q-1,r-1,nx,ny,
-                                 nx_part,ny_part,nz_part);
+                           big_offd_j[o_cnt] = hypre_map(ix - 1, iy - 1, iz - 1, p, q - 1, r - 1, nx, ny,
+                                                         nx_part, ny_part, nz_part);
                            offd_data[o_cnt++] = value[1];
                         }
                         else if (ix)
                         {
-                           big_offd_j[o_cnt] =hypre_map(ix-1,iy-1,iz-1,p-1,q-1,r-1,nx,ny,
-                                 nx_part,ny_part,nz_part);
+                           big_offd_j[o_cnt] = hypre_map(ix - 1, iy - 1, iz - 1, p - 1, q - 1, r - 1, nx, ny,
+                                                         nx_part, ny_part, nz_part);
                            offd_data[o_cnt++] = value[1];
                         }
-                        big_offd_j[o_cnt] = hypre_map(ix,iy-1,iz-1,p,q-1,r-1,nx,ny,
-                              nx_part,ny_part,nz_part);
+                        big_offd_j[o_cnt] = hypre_map(ix, iy - 1, iz - 1, p, q - 1, r - 1, nx, ny,
+                                                      nx_part, ny_part, nz_part);
                         offd_data[o_cnt++] = value[1];
-                        if (ix < nx_part[p+1]-1)
+                        if (ix < nx_part[p + 1] - 1)
                         {
-                           big_offd_j[o_cnt] = hypre_map(ix+1,iy-1,iz-1,p,q-1,r-1,nx,ny,
-                                 nx_part,ny_part,nz_part);
+                           big_offd_j[o_cnt] = hypre_map(ix + 1, iy - 1, iz - 1, p, q - 1, r - 1, nx, ny,
+                                                         nx_part, ny_part, nz_part);
                            offd_data[o_cnt++] = value[1];
                         }
-                        else if (ix < nx-1)
+                        else if (ix < nx - 1)
                         {
-                           big_offd_j[o_cnt] =hypre_map(ix+1,iy-1,iz-1,p+1,q-1,r-1,nx,ny,
-                                 nx_part,ny_part,nz_part);
+                           big_offd_j[o_cnt] = hypre_map(ix + 1, iy - 1, iz - 1, p + 1, q - 1, r - 1, nx, ny,
+                                                         nx_part, ny_part, nz_part);
                            offd_data[o_cnt++] = value[1];
                         }
                      }
                   }
                   if (ix > nx_part[p])
                   {
-                     big_offd_j[o_cnt] =hypre_map(ix-1,iy,iz-1,p,q,r-1,nx,ny,
-                           nx_part,ny_part,nz_part);
+                     big_offd_j[o_cnt] = hypre_map(ix - 1, iy, iz - 1, p, q, r - 1, nx, ny,
+                                                   nx_part, ny_part, nz_part);
                      offd_data[o_cnt++] = value[1];
                   }
                   else
                   {
                      if (ix)
                      {
-                        big_offd_j[o_cnt] =hypre_map(ix-1,iy,iz-1,p-1,q,r-1,nx,ny,
-                              nx_part,ny_part,nz_part);
+                        big_offd_j[o_cnt] = hypre_map(ix - 1, iy, iz - 1, p - 1, q, r - 1, nx, ny,
+                                                      nx_part, ny_part, nz_part);
                         offd_data[o_cnt++] = value[1];
                      }
                   }
-                  big_offd_j[o_cnt] =hypre_map(ix,iy,iz-1,p,q,r-1,nx,ny,
-                        nx_part,ny_part,nz_part);
+                  big_offd_j[o_cnt] = hypre_map(ix, iy, iz - 1, p, q, r - 1, nx, ny,
+                                                nx_part, ny_part, nz_part);
                   offd_data[o_cnt++] = value[1];
-                  if (ix+1 < nx_part[p+1])
+                  if (ix + 1 < nx_part[p + 1])
                   {
-                     big_offd_j[o_cnt] =hypre_map(ix+1,iy,iz-1,p,q,r-1,nx,ny,
-                           nx_part,ny_part,nz_part);
+                     big_offd_j[o_cnt] = hypre_map(ix + 1, iy, iz - 1, p, q, r - 1, nx, ny,
+                                                   nx_part, ny_part, nz_part);
                      offd_data[o_cnt++] = value[1];
                   }
                   else
                   {
-                     if (ix+1 < nx)
+                     if (ix + 1 < nx)
                      {
-                        big_offd_j[o_cnt] =hypre_map(ix+1,iy,iz-1,p+1,q,r-1,nx,ny,
-                              nx_part,ny_part,nz_part);
+                        big_offd_j[o_cnt] = hypre_map(ix + 1, iy, iz - 1, p + 1, q, r - 1, nx, ny,
+                                                      nx_part, ny_part, nz_part);
                         offd_data[o_cnt++] = value[1];
                      }
                   }
-                  if (iy+1 < ny_part[q+1])
+                  if (iy + 1 < ny_part[q + 1])
                   {
                      if (ix > nx_part[p])
                      {
-                        big_offd_j[o_cnt] =hypre_map(ix-1,iy+1,iz-1,p,q,r-1,nx,ny,
-                              nx_part,ny_part,nz_part);
+                        big_offd_j[o_cnt] = hypre_map(ix - 1, iy + 1, iz - 1, p, q, r - 1, nx, ny,
+                                                      nx_part, ny_part, nz_part);
                         offd_data[o_cnt++] = value[1];
                      }
                      else
                      {
                         if (ix)
                         {
-                           big_offd_j[o_cnt] =hypre_map(ix-1,iy+1,iz-1,p-1,q,r-1,nx,ny,
-                                 nx_part,ny_part,nz_part);
+                           big_offd_j[o_cnt] = hypre_map(ix - 1, iy + 1, iz - 1, p - 1, q, r - 1, nx, ny,
+                                                         nx_part, ny_part, nz_part);
                            offd_data[o_cnt++] = value[1];
                         }
                      }
-                     big_offd_j[o_cnt] =hypre_map(ix,iy+1,iz-1,p,q,r-1,nx,ny,
-                           nx_part,ny_part,nz_part);
+                     big_offd_j[o_cnt] = hypre_map(ix, iy + 1, iz - 1, p, q, r - 1, nx, ny,
+                                                   nx_part, ny_part, nz_part);
                      offd_data[o_cnt++] = value[1];
-                     if (ix < nx_part[p+1]-1)
+                     if (ix < nx_part[p + 1] - 1)
                      {
-                        big_offd_j[o_cnt] =hypre_map(ix+1,iy+1,iz-1,p,q,r-1,nx,ny,
-                              nx_part,ny_part,nz_part);
+                        big_offd_j[o_cnt] = hypre_map(ix + 1, iy + 1, iz - 1, p, q, r - 1, nx, ny,
+                                                      nx_part, ny_part, nz_part);
                         offd_data[o_cnt++] = value[1];
                      }
                      else
                      {
-                        if (ix+1 < nx)
+                        if (ix + 1 < nx)
                         {
-                           big_offd_j[o_cnt] =hypre_map(ix+1,iy+1,iz-1,p+1,q,r-1,nx,ny,
-                                 nx_part,ny_part,nz_part);
+                           big_offd_j[o_cnt] = hypre_map(ix + 1, iy + 1, iz - 1, p + 1, q, r - 1, nx, ny,
+                                                         nx_part, ny_part, nz_part);
                            offd_data[o_cnt++] = value[1];
                         }
                      }
                   }
                   else
                   {
-                     if (iy+1 < ny)
+                     if (iy + 1 < ny)
                      {
                         if (ix > nx_part[p])
                         {
-                           big_offd_j[o_cnt] =hypre_map(ix-1,iy+1,iz-1,p,q+1,r-1,nx,ny,
-                                 nx_part,ny_part,nz_part);
+                           big_offd_j[o_cnt] = hypre_map(ix - 1, iy + 1, iz - 1, p, q + 1, r - 1, nx, ny,
+                                                         nx_part, ny_part, nz_part);
                            offd_data[o_cnt++] = value[1];
                         }
                         else if (ix)
                         {
-                           big_offd_j[o_cnt] =hypre_map(ix-1,iy+1,iz-1,p-1,q+1,r-1,nx,ny,
-                                 nx_part,ny_part,nz_part);
+                           big_offd_j[o_cnt] = hypre_map(ix - 1, iy + 1, iz - 1, p - 1, q + 1, r - 1, nx, ny,
+                                                         nx_part, ny_part, nz_part);
                            offd_data[o_cnt++] = value[1];
                         }
-                        big_offd_j[o_cnt] =hypre_map(ix,iy+1,iz-1,p,q+1,r-1,nx,ny,
-                              nx_part,ny_part,nz_part);
+                        big_offd_j[o_cnt] = hypre_map(ix, iy + 1, iz - 1, p, q + 1, r - 1, nx, ny,
+                                                      nx_part, ny_part, nz_part);
                         offd_data[o_cnt++] = value[1];
-                        if (ix < nx_part[p+1]-1)
+                        if (ix < nx_part[p + 1] - 1)
                         {
-                           big_offd_j[o_cnt] =hypre_map(ix+1,iy+1,iz-1,p,q+1,r-1,nx,ny,
-                                 nx_part,ny_part,nz_part);
+                           big_offd_j[o_cnt] = hypre_map(ix + 1, iy + 1, iz - 1, p, q + 1, r - 1, nx, ny,
+                                                         nx_part, ny_part, nz_part);
                            offd_data[o_cnt++] = value[1];
                         }
-                        else if (ix < nx-1)
+                        else if (ix < nx - 1)
                         {
-                           big_offd_j[o_cnt] =hypre_map(ix+1,iy+1,iz-1,p+1,q+1,r-1,nx,ny,
-                                 nx_part,ny_part,nz_part);
+                           big_offd_j[o_cnt] = hypre_map(ix + 1, iy + 1, iz - 1, p + 1, q + 1, r - 1, nx, ny,
+                                                         nx_part, ny_part, nz_part);
                            offd_data[o_cnt++] = value[1];
                         }
                      }
@@ -1064,31 +1123,31 @@ GenerateLaplacian27pt(MPI_Comm comm,
             {
                if (ix > nx_part[p])
                {
-                  diag_j[cnt] = row_index-nx_local-1;
+                  diag_j[cnt] = row_index - nx_local - 1;
                   diag_data[cnt++] = value[1];
                }
                else
                {
                   if (ix)
                   {
-                     big_offd_j[o_cnt] =hypre_map(ix-1,iy-1,iz,p-1,q,r,nx,ny,
-                           nx_part,ny_part,nz_part);
+                     big_offd_j[o_cnt] = hypre_map(ix - 1, iy - 1, iz, p - 1, q, r, nx, ny,
+                                                   nx_part, ny_part, nz_part);
                      offd_data[o_cnt++] = value[1];
                   }
                }
-               diag_j[cnt] = row_index-nx_local;
+               diag_j[cnt] = row_index - nx_local;
                diag_data[cnt++] = value[1];
-               if (ix < nx_part[p+1]-1)
+               if (ix < nx_part[p + 1] - 1)
                {
-                  diag_j[cnt] = row_index-nx_local+1;
+                  diag_j[cnt] = row_index - nx_local + 1;
                   diag_data[cnt++] = value[1];
                }
                else
                {
-                  if (ix+1 < nx)
+                  if (ix + 1 < nx)
                   {
-                     big_offd_j[o_cnt] =hypre_map(ix+1,iy-1,iz,p+1,q,r,nx,ny,
-                           nx_part,ny_part,nz_part);
+                     big_offd_j[o_cnt] = hypre_map(ix + 1, iy - 1, iz, p + 1, q, r, nx, ny,
+                                                   nx_part, ny_part, nz_part);
                      offd_data[o_cnt++] = value[1];
                   }
                }
@@ -1099,158 +1158,158 @@ GenerateLaplacian27pt(MPI_Comm comm,
                {
                   if (ix > nx_part[p])
                   {
-                     big_offd_j[o_cnt] =hypre_map(ix-1,iy-1,iz,p,q-1,r,nx,ny,
-                           nx_part,ny_part,nz_part);
+                     big_offd_j[o_cnt] = hypre_map(ix - 1, iy - 1, iz, p, q - 1, r, nx, ny,
+                                                   nx_part, ny_part, nz_part);
                      offd_data[o_cnt++] = value[1];
                   }
                   else if (ix)
                   {
-                     big_offd_j[o_cnt] =hypre_map(ix-1,iy-1,iz,p-1,q-1,r,nx,ny,
-                           nx_part,ny_part,nz_part);
+                     big_offd_j[o_cnt] = hypre_map(ix - 1, iy - 1, iz, p - 1, q - 1, r, nx, ny,
+                                                   nx_part, ny_part, nz_part);
                      offd_data[o_cnt++] = value[1];
                   }
-                  big_offd_j[o_cnt] =hypre_map(ix,iy-1,iz,p,q-1,r,nx,ny,
-                        nx_part,ny_part,nz_part);
+                  big_offd_j[o_cnt] = hypre_map(ix, iy - 1, iz, p, q - 1, r, nx, ny,
+                                                nx_part, ny_part, nz_part);
                   offd_data[o_cnt++] = value[1];
-                  if (ix < nx_part[p+1]-1)
+                  if (ix < nx_part[p + 1] - 1)
                   {
-                     big_offd_j[o_cnt] =hypre_map(ix+1,iy-1,iz,p,q-1,r,nx,ny,
-                           nx_part,ny_part,nz_part);
+                     big_offd_j[o_cnt] = hypre_map(ix + 1, iy - 1, iz, p, q - 1, r, nx, ny,
+                                                   nx_part, ny_part, nz_part);
                      offd_data[o_cnt++] = value[1];
                   }
-                  else if (ix < nx-1)
+                  else if (ix < nx - 1)
                   {
-                     big_offd_j[o_cnt] =hypre_map(ix+1,iy-1,iz,p+1,q-1,r,nx,ny,
-                           nx_part,ny_part,nz_part);
+                     big_offd_j[o_cnt] = hypre_map(ix + 1, iy - 1, iz, p + 1, q - 1, r, nx, ny,
+                                                   nx_part, ny_part, nz_part);
                      offd_data[o_cnt++] = value[1];
                   }
                }
             }
             if (ix > nx_part[p])
             {
-               diag_j[cnt] = row_index-1;
+               diag_j[cnt] = row_index - 1;
                diag_data[cnt++] = value[1];
             }
             else
             {
                if (ix)
                {
-                  big_offd_j[o_cnt] =hypre_map(ix-1,iy,iz,p-1,q,r,nx,ny,
-                        nx_part,ny_part,nz_part);
+                  big_offd_j[o_cnt] = hypre_map(ix - 1, iy, iz, p - 1, q, r, nx, ny,
+                                                nx_part, ny_part, nz_part);
                   offd_data[o_cnt++] = value[1];
                }
             }
-            if (ix+1 < nx_part[p+1])
+            if (ix + 1 < nx_part[p + 1])
             {
-               diag_j[cnt] = row_index+1;
+               diag_j[cnt] = row_index + 1;
                diag_data[cnt++] = value[1];
             }
             else
             {
-               if (ix+1 < nx)
+               if (ix + 1 < nx)
                {
-                  big_offd_j[o_cnt] =hypre_map(ix+1,iy,iz,p+1,q,r,nx,ny,
-                        nx_part,ny_part,nz_part);
+                  big_offd_j[o_cnt] = hypre_map(ix + 1, iy, iz, p + 1, q, r, nx, ny,
+                                                nx_part, ny_part, nz_part);
                   offd_data[o_cnt++] = value[1];
                }
             }
-            if (iy+1 < ny_part[q+1])
+            if (iy + 1 < ny_part[q + 1])
             {
                if (ix > nx_part[p])
                {
-                  diag_j[cnt] = row_index+nx_local-1;
+                  diag_j[cnt] = row_index + nx_local - 1;
                   diag_data[cnt++] = value[1];
                }
                else
                {
                   if (ix)
                   {
-                     big_offd_j[o_cnt] =hypre_map(ix-1,iy+1,iz,p-1,q,r,nx,ny,
-                           nx_part,ny_part,nz_part);
+                     big_offd_j[o_cnt] = hypre_map(ix - 1, iy + 1, iz, p - 1, q, r, nx, ny,
+                                                   nx_part, ny_part, nz_part);
                      offd_data[o_cnt++] = value[1];
                   }
                }
-               diag_j[cnt] = row_index+nx_local;
+               diag_j[cnt] = row_index + nx_local;
                diag_data[cnt++] = value[1];
-               if (ix < nx_part[p+1]-1)
+               if (ix < nx_part[p + 1] - 1)
                {
-                  diag_j[cnt] = row_index+nx_local+1;
+                  diag_j[cnt] = row_index + nx_local + 1;
                   diag_data[cnt++] = value[1];
                }
                else
                {
-                  if (ix+1 < nx)
+                  if (ix + 1 < nx)
                   {
-                     big_offd_j[o_cnt] =hypre_map(ix+1,iy+1,iz,p+1,q,r,nx,ny,
-                           nx_part,ny_part,nz_part);
+                     big_offd_j[o_cnt] = hypre_map(ix + 1, iy + 1, iz, p + 1, q, r, nx, ny,
+                                                   nx_part, ny_part, nz_part);
                      offd_data[o_cnt++] = value[1];
                   }
                }
             }
             else
             {
-               if (iy+1 < ny)
+               if (iy + 1 < ny)
                {
                   if (ix > nx_part[p])
                   {
-                     big_offd_j[o_cnt] =hypre_map(ix-1,iy+1,iz,p,q+1,r,nx,ny,
-                           nx_part,ny_part,nz_part);
+                     big_offd_j[o_cnt] = hypre_map(ix - 1, iy + 1, iz, p, q + 1, r, nx, ny,
+                                                   nx_part, ny_part, nz_part);
                      offd_data[o_cnt++] = value[1];
                   }
                   else if (ix)
                   {
-                     big_offd_j[o_cnt] =hypre_map(ix-1,iy+1,iz,p-1,q+1,r,nx,ny,
-                           nx_part,ny_part,nz_part);
+                     big_offd_j[o_cnt] = hypre_map(ix - 1, iy + 1, iz, p - 1, q + 1, r, nx, ny,
+                                                   nx_part, ny_part, nz_part);
                      offd_data[o_cnt++] = value[1];
                   }
-                  big_offd_j[o_cnt] =hypre_map(ix,iy+1,iz,p,q+1,r,nx,ny,
-                        nx_part,ny_part,nz_part);
+                  big_offd_j[o_cnt] = hypre_map(ix, iy + 1, iz, p, q + 1, r, nx, ny,
+                                                nx_part, ny_part, nz_part);
                   offd_data[o_cnt++] = value[1];
-                  if (ix < nx_part[p+1]-1)
+                  if (ix < nx_part[p + 1] - 1)
                   {
-                     big_offd_j[o_cnt] =hypre_map(ix+1,iy+1,iz,p,q+1,r,nx,ny,
-                           nx_part,ny_part,nz_part);
+                     big_offd_j[o_cnt] = hypre_map(ix + 1, iy + 1, iz, p, q + 1, r, nx, ny,
+                                                   nx_part, ny_part, nz_part);
                      offd_data[o_cnt++] = value[1];
                   }
-                  else if (ix < nx-1)
+                  else if (ix < nx - 1)
                   {
-                     big_offd_j[o_cnt] =hypre_map(ix+1,iy+1,iz,p+1,q+1,r,nx,ny,
-                           nx_part,ny_part,nz_part);
+                     big_offd_j[o_cnt] = hypre_map(ix + 1, iy + 1, iz, p + 1, q + 1, r, nx, ny,
+                                                   nx_part, ny_part, nz_part);
                      offd_data[o_cnt++] = value[1];
                   }
                }
             }
-            if (iz+1 < nz_part[r+1])
+            if (iz + 1 < nz_part[r + 1])
             {
                if (iy > ny_part[q])
                {
                   if (ix > nx_part[p])
                   {
-                     diag_j[cnt] = row_index+nxy-nx_local-1;
+                     diag_j[cnt] = row_index + nxy - nx_local - 1;
                      diag_data[cnt++] = value[1];
                   }
                   else
                   {
                      if (ix)
                      {
-                        big_offd_j[o_cnt] =hypre_map(ix-1,iy-1,iz+1,p-1,q,r,nx,ny,
-                              nx_part,ny_part,nz_part);
+                        big_offd_j[o_cnt] = hypre_map(ix - 1, iy - 1, iz + 1, p - 1, q, r, nx, ny,
+                                                      nx_part, ny_part, nz_part);
                         offd_data[o_cnt++] = value[1];
                      }
                   }
-                  diag_j[cnt] = row_index+nxy-nx_local;
+                  diag_j[cnt] = row_index + nxy - nx_local;
                   diag_data[cnt++] = value[1];
-                  if (ix < nx_part[p+1]-1)
+                  if (ix < nx_part[p + 1] - 1)
                   {
-                     diag_j[cnt] = row_index+nxy-nx_local+1;
+                     diag_j[cnt] = row_index + nxy - nx_local + 1;
                      diag_data[cnt++] = value[1];
                   }
                   else
                   {
-                     if (ix+1 < nx)
+                     if (ix + 1 < nx)
                      {
-                        big_offd_j[o_cnt] =hypre_map(ix+1,iy-1,iz+1,p+1,q,r,nx,ny,
-                              nx_part,ny_part,nz_part);
+                        big_offd_j[o_cnt] = hypre_map(ix + 1, iy - 1, iz + 1, p + 1, q, r, nx, ny,
+                                                      nx_part, ny_part, nz_part);
                         offd_data[o_cnt++] = value[1];
                      }
                   }
@@ -1261,125 +1320,125 @@ GenerateLaplacian27pt(MPI_Comm comm,
                   {
                      if (ix > nx_part[p])
                      {
-                        big_offd_j[o_cnt] =hypre_map(ix-1,iy-1,iz+1,p,q-1,r,nx,ny,
-                              nx_part,ny_part,nz_part);
+                        big_offd_j[o_cnt] = hypre_map(ix - 1, iy - 1, iz + 1, p, q - 1, r, nx, ny,
+                                                      nx_part, ny_part, nz_part);
                         offd_data[o_cnt++] = value[1];
                      }
                      else if (ix)
                      {
-                        big_offd_j[o_cnt] =hypre_map(ix-1,iy-1,iz+1,p-1,q-1,r,nx,ny,
-                              nx_part,ny_part,nz_part);
+                        big_offd_j[o_cnt] = hypre_map(ix - 1, iy - 1, iz + 1, p - 1, q - 1, r, nx, ny,
+                                                      nx_part, ny_part, nz_part);
                         offd_data[o_cnt++] = value[1];
                      }
-                     big_offd_j[o_cnt] =hypre_map(ix,iy-1,iz+1,p,q-1,r,nx,ny,
-                           nx_part,ny_part,nz_part);
+                     big_offd_j[o_cnt] = hypre_map(ix, iy - 1, iz + 1, p, q - 1, r, nx, ny,
+                                                   nx_part, ny_part, nz_part);
                      offd_data[o_cnt++] = value[1];
-                     if (ix < nx_part[p+1]-1)
+                     if (ix < nx_part[p + 1] - 1)
                      {
-                        big_offd_j[o_cnt] =hypre_map(ix+1,iy-1,iz+1,p,q-1,r,nx,ny,
-                              nx_part,ny_part,nz_part);
+                        big_offd_j[o_cnt] = hypre_map(ix + 1, iy - 1, iz + 1, p, q - 1, r, nx, ny,
+                                                      nx_part, ny_part, nz_part);
                         offd_data[o_cnt++] = value[1];
                      }
-                     else if (ix < nx-1)
+                     else if (ix < nx - 1)
                      {
-                        big_offd_j[o_cnt] =hypre_map(ix+1,iy-1,iz+1,p+1,q-1,r,nx,ny,
-                              nx_part,ny_part,nz_part);
+                        big_offd_j[o_cnt] = hypre_map(ix + 1, iy - 1, iz + 1, p + 1, q - 1, r, nx, ny,
+                                                      nx_part, ny_part, nz_part);
                         offd_data[o_cnt++] = value[1];
                      }
                   }
                }
                if (ix > nx_part[p])
                {
-                  diag_j[cnt] = row_index+nxy-1;
+                  diag_j[cnt] = row_index + nxy - 1;
                   diag_data[cnt++] = value[1];
                }
                else
                {
                   if (ix)
                   {
-                     big_offd_j[o_cnt] =hypre_map(ix-1,iy,iz+1,p-1,q,r,nx,ny,
-                           nx_part,ny_part,nz_part);
+                     big_offd_j[o_cnt] = hypre_map(ix - 1, iy, iz + 1, p - 1, q, r, nx, ny,
+                                                   nx_part, ny_part, nz_part);
                      offd_data[o_cnt++] = value[1];
                   }
                }
-               diag_j[cnt] = row_index+nxy;
+               diag_j[cnt] = row_index + nxy;
                diag_data[cnt++] = value[1];
-               if (ix+1 < nx_part[p+1])
+               if (ix + 1 < nx_part[p + 1])
                {
-                  diag_j[cnt] = row_index+nxy+1;
+                  diag_j[cnt] = row_index + nxy + 1;
                   diag_data[cnt++] = value[1];
                }
                else
                {
-                  if (ix+1 < nx)
+                  if (ix + 1 < nx)
                   {
-                     big_offd_j[o_cnt] =hypre_map(ix+1,iy,iz+1,p+1,q,r,nx,ny,
-                           nx_part,ny_part,nz_part);
+                     big_offd_j[o_cnt] = hypre_map(ix + 1, iy, iz + 1, p + 1, q, r, nx, ny,
+                                                   nx_part, ny_part, nz_part);
                      offd_data[o_cnt++] = value[1];
                   }
                }
-               if (iy+1 < ny_part[q+1])
+               if (iy + 1 < ny_part[q + 1])
                {
                   if (ix > nx_part[p])
                   {
-                     diag_j[cnt] = row_index+nxy+nx_local-1;
+                     diag_j[cnt] = row_index + nxy + nx_local - 1;
                      diag_data[cnt++] = value[1];
                   }
                   else
                   {
                      if (ix)
                      {
-                        big_offd_j[o_cnt] =hypre_map(ix-1,iy+1,iz+1,p-1,q,r,nx,ny,
-                              nx_part,ny_part,nz_part);
+                        big_offd_j[o_cnt] = hypre_map(ix - 1, iy + 1, iz + 1, p - 1, q, r, nx, ny,
+                                                      nx_part, ny_part, nz_part);
                         offd_data[o_cnt++] = value[1];
                      }
                   }
-                  diag_j[cnt] = row_index+nxy+nx_local;
+                  diag_j[cnt] = row_index + nxy + nx_local;
                   diag_data[cnt++] = value[1];
-                  if (ix < nx_part[p+1]-1)
+                  if (ix < nx_part[p + 1] - 1)
                   {
-                     diag_j[cnt] = row_index+nxy+nx_local+1;
+                     diag_j[cnt] = row_index + nxy + nx_local + 1;
                      diag_data[cnt++] = value[1];
                   }
                   else
                   {
-                     if (ix+1 < nx)
+                     if (ix + 1 < nx)
                      {
-                        big_offd_j[o_cnt] =hypre_map(ix+1,iy+1,iz+1,p+1,q,r,nx,ny,
-                              nx_part,ny_part,nz_part);
+                        big_offd_j[o_cnt] = hypre_map(ix + 1, iy + 1, iz + 1, p + 1, q, r, nx, ny,
+                                                      nx_part, ny_part, nz_part);
                         offd_data[o_cnt++] = value[1];
                      }
                   }
                }
                else
                {
-                  if (iy+1 < ny)
+                  if (iy + 1 < ny)
                   {
                      if (ix > nx_part[p])
                      {
-                        big_offd_j[o_cnt] =hypre_map(ix-1,iy+1,iz+1,p,q+1,r,nx,ny,
-                              nx_part,ny_part,nz_part);
+                        big_offd_j[o_cnt] = hypre_map(ix - 1, iy + 1, iz + 1, p, q + 1, r, nx, ny,
+                                                      nx_part, ny_part, nz_part);
                         offd_data[o_cnt++] = value[1];
                      }
                      else if (ix)
                      {
-                        big_offd_j[o_cnt] =hypre_map(ix-1,iy+1,iz+1,p-1,q+1,r,nx,ny,
-                              nx_part,ny_part,nz_part);
+                        big_offd_j[o_cnt] = hypre_map(ix - 1, iy + 1, iz + 1, p - 1, q + 1, r, nx, ny,
+                                                      nx_part, ny_part, nz_part);
                         offd_data[o_cnt++] = value[1];
                      }
-                     big_offd_j[o_cnt] =hypre_map(ix,iy+1,iz+1,p,q+1,r,nx,ny,
-                           nx_part,ny_part,nz_part);
+                     big_offd_j[o_cnt] = hypre_map(ix, iy + 1, iz + 1, p, q + 1, r, nx, ny,
+                                                   nx_part, ny_part, nz_part);
                      offd_data[o_cnt++] = value[1];
-                     if (ix < nx_part[p+1]-1)
+                     if (ix < nx_part[p + 1] - 1)
                      {
-                        big_offd_j[o_cnt] =hypre_map(ix+1,iy+1,iz+1,p,q+1,r,nx,ny,
-                              nx_part,ny_part,nz_part);
+                        big_offd_j[o_cnt] = hypre_map(ix + 1, iy + 1, iz + 1, p, q + 1, r, nx, ny,
+                                                      nx_part, ny_part, nz_part);
                         offd_data[o_cnt++] = value[1];
                      }
-                     else if (ix < nx-1)
+                     else if (ix < nx - 1)
                      {
-                        big_offd_j[o_cnt] =hypre_map(ix+1,iy+1,iz+1,p+1,q+1,r,nx,ny,
-                              nx_part,ny_part,nz_part);
+                        big_offd_j[o_cnt] = hypre_map(ix + 1, iy + 1, iz + 1, p + 1, q + 1, r, nx, ny,
+                                                      nx_part, ny_part, nz_part);
                         offd_data[o_cnt++] = value[1];
                      }
                   }
@@ -1387,40 +1446,40 @@ GenerateLaplacian27pt(MPI_Comm comm,
             }
             else
             {
-               if (iz+1 < nz)
+               if (iz + 1 < nz)
                {
                   if (iy > ny_part[q])
                   {
                      if (ix > nx_part[p])
                      {
-                        big_offd_j[o_cnt] =hypre_map(ix-1,iy-1,iz+1,p,q,r+1,nx,ny,
-                              nx_part,ny_part,nz_part);
+                        big_offd_j[o_cnt] = hypre_map(ix - 1, iy - 1, iz + 1, p, q, r + 1, nx, ny,
+                                                      nx_part, ny_part, nz_part);
                         offd_data[o_cnt++] = value[1];
                      }
                      else
                      {
                         if (ix)
                         {
-                           big_offd_j[o_cnt] =hypre_map(ix-1,iy-1,iz+1,p-1,q,r+1,nx,ny,
-                                 nx_part,ny_part,nz_part);
+                           big_offd_j[o_cnt] = hypre_map(ix - 1, iy - 1, iz + 1, p - 1, q, r + 1, nx, ny,
+                                                         nx_part, ny_part, nz_part);
                            offd_data[o_cnt++] = value[1];
                         }
                      }
-                     big_offd_j[o_cnt] =hypre_map(ix,iy-1,iz+1,p,q,r+1,nx,ny,
-                           nx_part,ny_part,nz_part);
+                     big_offd_j[o_cnt] = hypre_map(ix, iy - 1, iz + 1, p, q, r + 1, nx, ny,
+                                                   nx_part, ny_part, nz_part);
                      offd_data[o_cnt++] = value[1];
-                     if (ix < nx_part[p+1]-1)
+                     if (ix < nx_part[p + 1] - 1)
                      {
-                        big_offd_j[o_cnt] =hypre_map(ix+1,iy-1,iz+1,p,q,r+1,nx,ny,
-                              nx_part,ny_part,nz_part);
+                        big_offd_j[o_cnt] = hypre_map(ix + 1, iy - 1, iz + 1, p, q, r + 1, nx, ny,
+                                                      nx_part, ny_part, nz_part);
                         offd_data[o_cnt++] = value[1];
                      }
                      else
                      {
-                        if (ix+1 < nx)
+                        if (ix + 1 < nx)
                         {
-                           big_offd_j[o_cnt] =hypre_map(ix+1,iy-1,iz+1,p+1,q,r+1,nx,ny,
-                                 nx_part,ny_part,nz_part);
+                           big_offd_j[o_cnt] = hypre_map(ix + 1, iy - 1, iz + 1, p + 1, q, r + 1, nx, ny,
+                                                         nx_part, ny_part, nz_part);
                            offd_data[o_cnt++] = value[1];
                         }
                      }
@@ -1431,131 +1490,131 @@ GenerateLaplacian27pt(MPI_Comm comm,
                      {
                         if (ix > nx_part[p])
                         {
-                           big_offd_j[o_cnt] =hypre_map(ix-1,iy-1,iz+1,p,q-1,r+1,nx,ny,
-                                 nx_part,ny_part,nz_part);
+                           big_offd_j[o_cnt] = hypre_map(ix - 1, iy - 1, iz + 1, p, q - 1, r + 1, nx, ny,
+                                                         nx_part, ny_part, nz_part);
                            offd_data[o_cnt++] = value[1];
                         }
                         else if (ix)
                         {
-                           big_offd_j[o_cnt] =hypre_map(ix-1,iy-1,iz+1,p-1,q-1,r+1,nx,ny,
-                                 nx_part,ny_part,nz_part);
+                           big_offd_j[o_cnt] = hypre_map(ix - 1, iy - 1, iz + 1, p - 1, q - 1, r + 1, nx, ny,
+                                                         nx_part, ny_part, nz_part);
                            offd_data[o_cnt++] = value[1];
                         }
-                        big_offd_j[o_cnt] =hypre_map(ix,iy-1,iz+1,p,q-1,r+1,nx,ny,
-                              nx_part,ny_part,nz_part);
+                        big_offd_j[o_cnt] = hypre_map(ix, iy - 1, iz + 1, p, q - 1, r + 1, nx, ny,
+                                                      nx_part, ny_part, nz_part);
                         offd_data[o_cnt++] = value[1];
-                        if (ix < nx_part[p+1]-1)
+                        if (ix < nx_part[p + 1] - 1)
                         {
-                           big_offd_j[o_cnt] =hypre_map(ix+1,iy-1,iz+1,p,q-1,r+1,nx,ny,
-                                 nx_part,ny_part,nz_part);
+                           big_offd_j[o_cnt] = hypre_map(ix + 1, iy - 1, iz + 1, p, q - 1, r + 1, nx, ny,
+                                                         nx_part, ny_part, nz_part);
                            offd_data[o_cnt++] = value[1];
                         }
-                        else if (ix < nx-1)
+                        else if (ix < nx - 1)
                         {
-                           big_offd_j[o_cnt] =hypre_map(ix+1,iy-1,iz+1,p+1,q-1,r+1,nx,ny,
-                                 nx_part,ny_part,nz_part);
+                           big_offd_j[o_cnt] = hypre_map(ix + 1, iy - 1, iz + 1, p + 1, q - 1, r + 1, nx, ny,
+                                                         nx_part, ny_part, nz_part);
                            offd_data[o_cnt++] = value[1];
                         }
                      }
                   }
                   if (ix > nx_part[p])
                   {
-                     big_offd_j[o_cnt] =hypre_map(ix-1,iy,iz+1,p,q,r+1,nx,ny,
-                           nx_part,ny_part,nz_part);
+                     big_offd_j[o_cnt] = hypre_map(ix - 1, iy, iz + 1, p, q, r + 1, nx, ny,
+                                                   nx_part, ny_part, nz_part);
                      offd_data[o_cnt++] = value[1];
                   }
                   else
                   {
                      if (ix)
                      {
-                        big_offd_j[o_cnt] =hypre_map(ix-1,iy,iz+1,p-1,q,r+1,nx,ny,
-                              nx_part,ny_part,nz_part);
+                        big_offd_j[o_cnt] = hypre_map(ix - 1, iy, iz + 1, p - 1, q, r + 1, nx, ny,
+                                                      nx_part, ny_part, nz_part);
                         offd_data[o_cnt++] = value[1];
                      }
                   }
-                  big_offd_j[o_cnt] =hypre_map(ix,iy,iz+1,p,q,r+1,nx,ny,
-                        nx_part,ny_part,nz_part);
+                  big_offd_j[o_cnt] = hypre_map(ix, iy, iz + 1, p, q, r + 1, nx, ny,
+                                                nx_part, ny_part, nz_part);
                   offd_data[o_cnt++] = value[1];
-                  if (ix+1 < nx_part[p+1])
+                  if (ix + 1 < nx_part[p + 1])
                   {
-                     big_offd_j[o_cnt] =hypre_map(ix+1,iy,iz+1,p,q,r+1,nx,ny,
-                           nx_part,ny_part,nz_part);
+                     big_offd_j[o_cnt] = hypre_map(ix + 1, iy, iz + 1, p, q, r + 1, nx, ny,
+                                                   nx_part, ny_part, nz_part);
                      offd_data[o_cnt++] = value[1];
                   }
                   else
                   {
-                     if (ix+1 < nx)
+                     if (ix + 1 < nx)
                      {
-                        big_offd_j[o_cnt] =hypre_map(ix+1,iy,iz+1,p+1,q,r+1,nx,ny,
-                              nx_part,ny_part,nz_part);
+                        big_offd_j[o_cnt] = hypre_map(ix + 1, iy, iz + 1, p + 1, q, r + 1, nx, ny,
+                                                      nx_part, ny_part, nz_part);
                         offd_data[o_cnt++] = value[1];
                      }
                   }
-                  if (iy+1 < ny_part[q+1])
+                  if (iy + 1 < ny_part[q + 1])
                   {
                      if (ix > nx_part[p])
                      {
-                        big_offd_j[o_cnt] =hypre_map(ix-1,iy+1,iz+1,p,q,r+1,nx,ny,
-                              nx_part,ny_part,nz_part);
+                        big_offd_j[o_cnt] = hypre_map(ix - 1, iy + 1, iz + 1, p, q, r + 1, nx, ny,
+                                                      nx_part, ny_part, nz_part);
                         offd_data[o_cnt++] = value[1];
                      }
                      else
                      {
                         if (ix)
                         {
-                           big_offd_j[o_cnt] =hypre_map(ix-1,iy+1,iz+1,p-1,q,r+1,nx,ny,
-                                 nx_part,ny_part,nz_part);
+                           big_offd_j[o_cnt] = hypre_map(ix - 1, iy + 1, iz + 1, p - 1, q, r + 1, nx, ny,
+                                                         nx_part, ny_part, nz_part);
                            offd_data[o_cnt++] = value[1];
                         }
                      }
-                     big_offd_j[o_cnt] =hypre_map(ix,iy+1,iz+1,p,q,r+1,nx,ny,
-                           nx_part,ny_part,nz_part);
+                     big_offd_j[o_cnt] = hypre_map(ix, iy + 1, iz + 1, p, q, r + 1, nx, ny,
+                                                   nx_part, ny_part, nz_part);
                      offd_data[o_cnt++] = value[1];
-                     if (ix < nx_part[p+1]-1)
+                     if (ix < nx_part[p + 1] - 1)
                      {
-                        big_offd_j[o_cnt] =hypre_map(ix+1,iy+1,iz+1,p,q,r+1,nx,ny,
-                              nx_part,ny_part,nz_part);
+                        big_offd_j[o_cnt] = hypre_map(ix + 1, iy + 1, iz + 1, p, q, r + 1, nx, ny,
+                                                      nx_part, ny_part, nz_part);
                         offd_data[o_cnt++] = value[1];
                      }
                      else
                      {
-                        if (ix+1 < nx)
+                        if (ix + 1 < nx)
                         {
-                           big_offd_j[o_cnt] =hypre_map(ix+1,iy+1,iz+1,p+1,q,r+1,nx,ny,
-                                 nx_part,ny_part,nz_part);
+                           big_offd_j[o_cnt] = hypre_map(ix + 1, iy + 1, iz + 1, p + 1, q, r + 1, nx, ny,
+                                                         nx_part, ny_part, nz_part);
                            offd_data[o_cnt++] = value[1];
                         }
                      }
                   }
                   else
                   {
-                     if (iy+1 < ny)
+                     if (iy + 1 < ny)
                      {
                         if (ix > nx_part[p])
                         {
-                           big_offd_j[o_cnt] =hypre_map(ix-1,iy+1,iz+1,p,q+1,r+1,nx,ny,
-                                 nx_part,ny_part,nz_part);
+                           big_offd_j[o_cnt] = hypre_map(ix - 1, iy + 1, iz + 1, p, q + 1, r + 1, nx, ny,
+                                                         nx_part, ny_part, nz_part);
                            offd_data[o_cnt++] = value[1];
                         }
                         else if (ix)
                         {
-                           big_offd_j[o_cnt] =hypre_map(ix-1,iy+1,iz+1,p-1,q+1,r+1,nx,ny,
-                                 nx_part,ny_part,nz_part);
+                           big_offd_j[o_cnt] = hypre_map(ix - 1, iy + 1, iz + 1, p - 1, q + 1, r + 1, nx, ny,
+                                                         nx_part, ny_part, nz_part);
                            offd_data[o_cnt++] = value[1];
                         }
-                        big_offd_j[o_cnt] =hypre_map(ix,iy+1,iz+1,p,q+1,r+1,nx,ny,
-                              nx_part,ny_part,nz_part);
+                        big_offd_j[o_cnt] = hypre_map(ix, iy + 1, iz + 1, p, q + 1, r + 1, nx, ny,
+                                                      nx_part, ny_part, nz_part);
                         offd_data[o_cnt++] = value[1];
-                        if (ix < nx_part[p+1]-1)
+                        if (ix < nx_part[p + 1] - 1)
                         {
-                           big_offd_j[o_cnt] =hypre_map(ix+1,iy+1,iz+1,p,q+1,r+1,nx,ny,
-                                 nx_part,ny_part,nz_part);
+                           big_offd_j[o_cnt] = hypre_map(ix + 1, iy + 1, iz + 1, p, q + 1, r + 1, nx, ny,
+                                                         nx_part, ny_part, nz_part);
                            offd_data[o_cnt++] = value[1];
                         }
-                        else if (ix < nx-1)
+                        else if (ix < nx - 1)
                         {
-                           big_offd_j[o_cnt] =hypre_map(ix+1,iy+1,iz+1,p+1,q+1,r+1,nx,ny,
-                                 nx_part,ny_part,nz_part);
+                           big_offd_j[o_cnt] = hypre_map(ix + 1, iy + 1, iz + 1, p + 1, q + 1, r + 1, nx, ny,
+                                                         nx_part, ny_part, nz_part);
                            offd_data[o_cnt++] = value[1];
                         }
                      }
@@ -1571,14 +1630,16 @@ GenerateLaplacian27pt(MPI_Comm comm,
    {
       work = hypre_CTAlloc(HYPRE_BigInt, o_cnt, HYPRE_MEMORY_HOST);
 
-      for (i=0; i < o_cnt; i++)
+      for (i = 0; i < o_cnt; i++)
+      {
          work[i] = big_offd_j[i];
+      }
 
-      hypre_BigQsort0(work, 0, o_cnt-1);
+      hypre_BigQsort0(work, 0, o_cnt - 1);
 
       col_map_offd[0] = work[0];
       cnt = 0;
-      for (i=0; i < o_cnt; i++)
+      for (i = 0; i < o_cnt; i++)
       {
          if (work[i] > col_map_offd[cnt])
          {
@@ -1587,9 +1648,9 @@ GenerateLaplacian27pt(MPI_Comm comm,
          }
       }
 
-      for (i=0; i < o_cnt; i++)
+      for (i = 0; i < o_cnt; i++)
       {
-         offd_j[i] = hypre_BigBinarySearch(col_map_offd,big_offd_j[i],num_cols_offd);
+         offd_j[i] = hypre_BigBinarySearch(col_map_offd, big_offd_j[i], num_cols_offd);
       }
 
       hypre_TFree(work, HYPRE_MEMORY_HOST);
@@ -1624,7 +1685,6 @@ GenerateLaplacian27pt(MPI_Comm comm,
    hypre_TFree(ny_part,     HYPRE_MEMORY_HOST);
    hypre_TFree(nz_part,     HYPRE_MEMORY_HOST);
    hypre_TFree(big_offd_j,  HYPRE_MEMORY_HOST);
-   hypre_TFree(global_part, HYPRE_MEMORY_HOST);
 
    return (HYPRE_ParCSRMatrix) A;
 }
diff --git a/external/hypre/src/parcsr_ls/par_laplace_9pt.c b/external/hypre/src/parcsr_ls/par_laplace_9pt.c
index 9171a2b3..4e3827b4 100644
--- a/external/hypre/src/parcsr_ls/par_laplace_9pt.c
+++ b/external/hypre/src/parcsr_ls/par_laplace_9pt.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -30,15 +30,15 @@ GenerateLaplacian9pt( MPI_Comm comm,
    HYPRE_Real *diag_data;
 
    HYPRE_Int    *offd_i;
-   HYPRE_Int    *offd_j;
-   HYPRE_Real *offd_data;
+   HYPRE_Int    *offd_j = NULL;
+   HYPRE_Real *offd_data = NULL;
 
-   HYPRE_BigInt *global_part;
+   HYPRE_BigInt global_part[2];
    HYPRE_BigInt ix, iy;
    HYPRE_Int cnt, o_cnt;
    HYPRE_Int local_num_rows;
    HYPRE_BigInt *col_map_offd;
-   HYPRE_BigInt *big_offd_j;
+   HYPRE_BigInt *big_offd_j = NULL;
    HYPRE_Int row_index;
    HYPRE_Int i;
 
@@ -52,39 +52,38 @@ GenerateLaplacian9pt( MPI_Comm comm,
    HYPRE_Int num_procs;
    HYPRE_Int P_busy, Q_busy;
 
-   hypre_MPI_Comm_size(comm,&num_procs);
+   hypre_MPI_Comm_size(comm, &num_procs);
 
-   grid_size = nx*ny;
+   grid_size = nx * ny;
 
-   hypre_GeneratePartitioning(nx,P,&nx_part);
-   hypre_GeneratePartitioning(ny,Q,&ny_part);
+   hypre_GeneratePartitioning(nx, P, &nx_part);
+   hypre_GeneratePartitioning(ny, Q, &ny_part);
 
-   nx_local = (HYPRE_Int)(nx_part[p+1] - nx_part[p]);
-   ny_local = (HYPRE_Int)(ny_part[q+1] - ny_part[q]);
+   nx_local = (HYPRE_Int)(nx_part[p + 1] - nx_part[p]);
+   ny_local = (HYPRE_Int)(ny_part[q + 1] - ny_part[q]);
 
-   local_num_rows = nx_local*ny_local;
+   local_num_rows = nx_local * ny_local;
 
-   global_part = hypre_CTAlloc(HYPRE_BigInt, 2, HYPRE_MEMORY_HOST);
-   global_part[0] = ny_part[q]*nx + nx_part[p]*ny_local;
-   global_part[1] = global_part[0]+(HYPRE_BigInt)local_num_rows;
+   global_part[0] = ny_part[q] * nx + nx_part[p] * ny_local;
+   global_part[1] = global_part[0] + (HYPRE_BigInt)local_num_rows;
 
-   diag_i = hypre_CTAlloc(HYPRE_Int, local_num_rows+1, HYPRE_MEMORY_HOST);
-   offd_i = hypre_CTAlloc(HYPRE_Int, local_num_rows+1, HYPRE_MEMORY_HOST);
+   diag_i = hypre_CTAlloc(HYPRE_Int, local_num_rows + 1, HYPRE_MEMORY_HOST);
+   offd_i = hypre_CTAlloc(HYPRE_Int, local_num_rows + 1, HYPRE_MEMORY_HOST);
 
-   P_busy = hypre_min(nx,P);
-   Q_busy = hypre_min(ny,Q);
+   P_busy = hypre_min(nx, P);
+   Q_busy = hypre_min(ny, Q);
 
    num_cols_offd = 0;
-   if (p) num_cols_offd += ny_local;
-   if (p < P_busy-1) num_cols_offd += ny_local;
-   if (q) num_cols_offd += nx_local;
-   if (q < Q_busy-1) num_cols_offd += nx_local;
-   if (p && q) num_cols_offd++;
-   if (p && q < Q_busy-1 ) num_cols_offd++;
-   if (p < P_busy-1 && q ) num_cols_offd++;
-   if (p < P_busy-1 && q < Q_busy-1 ) num_cols_offd++;
+   if (p) { num_cols_offd += ny_local; }
+   if (p < P_busy - 1) { num_cols_offd += ny_local; }
+   if (q) { num_cols_offd += nx_local; }
+   if (q < Q_busy - 1) { num_cols_offd += nx_local; }
+   if (p && q) { num_cols_offd++; }
+   if (p && q < Q_busy - 1 ) { num_cols_offd++; }
+   if (p < P_busy - 1 && q ) { num_cols_offd++; }
+   if (p < P_busy - 1 && q < Q_busy - 1 ) { num_cols_offd++; }
 
-   if (!local_num_rows) num_cols_offd = 0;
+   if (!local_num_rows) { num_cols_offd = 0; }
 
    col_map_offd = hypre_CTAlloc(HYPRE_BigInt, num_cols_offd, HYPRE_MEMORY_HOST);
 
@@ -92,14 +91,14 @@ GenerateLaplacian9pt( MPI_Comm comm,
    o_cnt = 0;
    diag_i[0] = 0;
    offd_i[0] = 0;
-   for (iy = ny_part[q];  iy < ny_part[q+1]; iy++)
+   for (iy = ny_part[q];  iy < ny_part[q + 1]; iy++)
    {
-      for (ix = nx_part[p]; ix < nx_part[p+1]; ix++)
+      for (ix = nx_part[p]; ix < nx_part[p + 1]; ix++)
       {
          cnt++;
          o_cnt++;
-         diag_i[cnt] = diag_i[cnt-1];
-         offd_i[o_cnt] = offd_i[o_cnt-1];
+         diag_i[cnt] = diag_i[cnt - 1];
+         offd_i[o_cnt] = offd_i[o_cnt - 1];
          diag_i[cnt]++;
          if (iy > ny_part[q])
          {
@@ -111,16 +110,20 @@ GenerateLaplacian9pt( MPI_Comm comm,
             else
             {
                if (ix)
+               {
                   offd_i[o_cnt]++;
+               }
             }
-            if (ix < nx_part[p+1]-1)
+            if (ix < nx_part[p + 1] - 1)
             {
                diag_i[cnt]++;
             }
             else
             {
-               if (ix+1 < nx)
+               if (ix + 1 < nx)
+               {
                   offd_i[o_cnt]++;
+               }
             }
          }
          else
@@ -136,18 +139,20 @@ GenerateLaplacian9pt( MPI_Comm comm,
                {
                   offd_i[o_cnt]++;
                }
-               if (ix < nx_part[p+1]-1)
+               if (ix < nx_part[p + 1] - 1)
                {
                   offd_i[o_cnt]++;
                }
-               else if (ix < nx-1)
+               else if (ix < nx - 1)
                {
                   offd_i[o_cnt]++;
                }
             }
          }
          if (ix > nx_part[p])
+         {
             diag_i[cnt]++;
+         }
          else
          {
             if (ix)
@@ -155,16 +160,18 @@ GenerateLaplacian9pt( MPI_Comm comm,
                offd_i[o_cnt]++;
             }
          }
-         if (ix+1 < nx_part[p+1])
+         if (ix + 1 < nx_part[p + 1])
+         {
             diag_i[cnt]++;
+         }
          else
          {
-            if (ix+1 < nx)
+            if (ix + 1 < nx)
             {
                offd_i[o_cnt]++;
             }
          }
-         if (iy+1 < ny_part[q+1])
+         if (iy + 1 < ny_part[q + 1])
          {
             diag_i[cnt]++;
             if (ix > nx_part[p])
@@ -174,21 +181,25 @@ GenerateLaplacian9pt( MPI_Comm comm,
             else
             {
                if (ix)
+               {
                   offd_i[o_cnt]++;
+               }
             }
-            if (ix < nx_part[p+1]-1)
+            if (ix < nx_part[p + 1] - 1)
             {
                diag_i[cnt]++;
             }
             else
             {
-               if (ix+1 < nx)
+               if (ix + 1 < nx)
+               {
                   offd_i[o_cnt]++;
+               }
             }
          }
          else
          {
-            if (iy+1 < ny)
+            if (iy + 1 < ny)
             {
                offd_i[o_cnt]++;
                if (ix > nx_part[p])
@@ -199,11 +210,11 @@ GenerateLaplacian9pt( MPI_Comm comm,
                {
                   offd_i[o_cnt]++;
                }
-               if (ix < nx_part[p+1]-1)
+               if (ix < nx_part[p + 1] - 1)
                {
                   offd_i[o_cnt]++;
                }
-               else if (ix < nx-1)
+               else if (ix < nx - 1)
                {
                   offd_i[o_cnt]++;
                }
@@ -225,9 +236,9 @@ GenerateLaplacian9pt( MPI_Comm comm,
    row_index = 0;
    cnt = 0;
    o_cnt = 0;
-   for (iy = ny_part[q];  iy < ny_part[q+1]; iy++)
+   for (iy = ny_part[q];  iy < ny_part[q + 1]; iy++)
    {
-      for (ix = nx_part[p]; ix < nx_part[p+1]; ix++)
+      for (ix = nx_part[p]; ix < nx_part[p + 1]; ix++)
       {
          diag_j[cnt] = row_index;
          diag_data[cnt++] = value[0];
@@ -235,31 +246,31 @@ GenerateLaplacian9pt( MPI_Comm comm,
          {
             if (ix > nx_part[p])
             {
-               diag_j[cnt] = row_index-nx_local-1 ;
+               diag_j[cnt] = row_index - nx_local - 1 ;
                diag_data[cnt++] = value[1];
             }
             else
             {
                if (ix)
                {
-                  big_offd_j[o_cnt] = hypre_map2(ix-1,iy-1,p-1,q,nx,
-                        nx_part,ny_part);
+                  big_offd_j[o_cnt] = hypre_map2(ix - 1, iy - 1, p - 1, q, nx,
+                                                 nx_part, ny_part);
                   offd_data[o_cnt++] = value[1];
                }
             }
-            diag_j[cnt] = row_index-nx_local;
+            diag_j[cnt] = row_index - nx_local;
             diag_data[cnt++] = value[1];
-            if (ix < nx_part[p+1]-1)
+            if (ix < nx_part[p + 1] - 1)
             {
-               diag_j[cnt] = row_index-nx_local+1 ;
+               diag_j[cnt] = row_index - nx_local + 1 ;
                diag_data[cnt++] = value[1];
             }
             else
             {
-               if (ix+1 < nx)
+               if (ix + 1 < nx)
                {
-                  big_offd_j[o_cnt] = hypre_map2(ix+1,iy-1,p+1,q,nx,
-                        nx_part,ny_part);
+                  big_offd_j[o_cnt] = hypre_map2(ix + 1, iy - 1, p + 1, q, nx,
+                                                 nx_part, ny_part);
                   offd_data[o_cnt++] = value[1];
                }
             }
@@ -270,123 +281,123 @@ GenerateLaplacian9pt( MPI_Comm comm,
             {
                if (ix > nx_part[p])
                {
-                  big_offd_j[o_cnt] = hypre_map2(ix-1,iy-1,p,q-1,nx,
-                        nx_part,ny_part);
+                  big_offd_j[o_cnt] = hypre_map2(ix - 1, iy - 1, p, q - 1, nx,
+                                                 nx_part, ny_part);
                   offd_data[o_cnt++] = value[1];
                }
                else if (ix)
                {
-                  big_offd_j[o_cnt] = hypre_map2(ix-1,iy-1,p-1,q-1,nx,
-                        nx_part,ny_part);
+                  big_offd_j[o_cnt] = hypre_map2(ix - 1, iy - 1, p - 1, q - 1, nx,
+                                                 nx_part, ny_part);
                   offd_data[o_cnt++] = value[1];
                }
-               big_offd_j[o_cnt] = hypre_map2(ix,iy-1,p,q-1,nx,
-                     nx_part,ny_part);
+               big_offd_j[o_cnt] = hypre_map2(ix, iy - 1, p, q - 1, nx,
+                                              nx_part, ny_part);
                offd_data[o_cnt++] = value[1];
-               if (ix < nx_part[p+1]-1)
+               if (ix < nx_part[p + 1] - 1)
                {
-                  big_offd_j[o_cnt] = hypre_map2(ix+1,iy-1,p,q-1,nx,
-                        nx_part,ny_part);
+                  big_offd_j[o_cnt] = hypre_map2(ix + 1, iy - 1, p, q - 1, nx,
+                                                 nx_part, ny_part);
                   offd_data[o_cnt++] = value[1];
                }
-               else if (ix+1 < nx)
+               else if (ix + 1 < nx)
                {
-                  big_offd_j[o_cnt] = hypre_map2(ix+1,iy-1,p+1,q-1,nx,
-                        nx_part,ny_part);
+                  big_offd_j[o_cnt] = hypre_map2(ix + 1, iy - 1, p + 1, q - 1, nx,
+                                                 nx_part, ny_part);
                   offd_data[o_cnt++] = value[1];
                }
             }
          }
          if (ix > nx_part[p])
          {
-            diag_j[cnt] = row_index-1;
+            diag_j[cnt] = row_index - 1;
             diag_data[cnt++] = value[1];
          }
          else
          {
             if (ix)
             {
-               big_offd_j[o_cnt] = hypre_map2(ix-1,iy,p-1,q,nx,
-                     nx_part,ny_part);
+               big_offd_j[o_cnt] = hypre_map2(ix - 1, iy, p - 1, q, nx,
+                                              nx_part, ny_part);
                offd_data[o_cnt++] = value[1];
             }
          }
-         if (ix+1 < nx_part[p+1])
+         if (ix + 1 < nx_part[p + 1])
          {
-            diag_j[cnt] = row_index+1;
+            diag_j[cnt] = row_index + 1;
             diag_data[cnt++] = value[1];
          }
          else
          {
-            if (ix+1 < nx)
+            if (ix + 1 < nx)
             {
-               big_offd_j[o_cnt] = hypre_map2(ix+1,iy,p+1,q,nx,
-                     nx_part,ny_part);
+               big_offd_j[o_cnt] = hypre_map2(ix + 1, iy, p + 1, q, nx,
+                                              nx_part, ny_part);
                offd_data[o_cnt++] = value[1];
             }
          }
-         if (iy+1 < ny_part[q+1])
+         if (iy + 1 < ny_part[q + 1])
          {
             if (ix > nx_part[p])
             {
-               diag_j[cnt] = row_index+nx_local-1 ;
+               diag_j[cnt] = row_index + nx_local - 1 ;
                diag_data[cnt++] = value[1];
             }
             else
             {
                if (ix)
                {
-                  big_offd_j[o_cnt] = hypre_map2(ix-1,iy+1,p-1,q,nx,
-                        nx_part,ny_part);
+                  big_offd_j[o_cnt] = hypre_map2(ix - 1, iy + 1, p - 1, q, nx,
+                                                 nx_part, ny_part);
                   offd_data[o_cnt++] = value[1];
                }
             }
-            diag_j[cnt] = row_index+nx_local;
+            diag_j[cnt] = row_index + nx_local;
             diag_data[cnt++] = value[1];
-            if (ix < nx_part[p+1]-1)
+            if (ix < nx_part[p + 1] - 1)
             {
-               diag_j[cnt] = row_index+nx_local+1 ;
+               diag_j[cnt] = row_index + nx_local + 1 ;
                diag_data[cnt++] = value[1];
             }
             else
             {
-               if (ix+1 < nx)
+               if (ix + 1 < nx)
                {
-                  big_offd_j[o_cnt] = hypre_map2(ix+1,iy+1,p+1,q,nx,
-                        nx_part,ny_part);
+                  big_offd_j[o_cnt] = hypre_map2(ix + 1, iy + 1, p + 1, q, nx,
+                                                 nx_part, ny_part);
                   offd_data[o_cnt++] = value[1];
                }
             }
          }
          else
          {
-            if (iy+1 < ny)
+            if (iy + 1 < ny)
             {
                if (ix > nx_part[p])
                {
-                  big_offd_j[o_cnt] = hypre_map2(ix-1,iy+1,p,q+1,nx,
-                        nx_part,ny_part);
+                  big_offd_j[o_cnt] = hypre_map2(ix - 1, iy + 1, p, q + 1, nx,
+                                                 nx_part, ny_part);
                   offd_data[o_cnt++] = value[1];
                }
                else if (ix)
                {
-                  big_offd_j[o_cnt] = hypre_map2(ix-1,iy+1,p-1,q+1,nx,
-                        nx_part,ny_part);
+                  big_offd_j[o_cnt] = hypre_map2(ix - 1, iy + 1, p - 1, q + 1, nx,
+                                                 nx_part, ny_part);
                   offd_data[o_cnt++] = value[1];
                }
-               big_offd_j[o_cnt] = hypre_map2(ix,iy+1,p,q+1,nx,
-                     nx_part,ny_part);
+               big_offd_j[o_cnt] = hypre_map2(ix, iy + 1, p, q + 1, nx,
+                                              nx_part, ny_part);
                offd_data[o_cnt++] = value[1];
-               if (ix < nx_part[p+1]-1)
+               if (ix < nx_part[p + 1] - 1)
                {
-                  big_offd_j[o_cnt] = hypre_map2(ix+1,iy+1,p,q+1,nx,
-                        nx_part,ny_part);
+                  big_offd_j[o_cnt] = hypre_map2(ix + 1, iy + 1, p, q + 1, nx,
+                                                 nx_part, ny_part);
                   offd_data[o_cnt++] = value[1];
                }
-               else if (ix < nx-1)
+               else if (ix < nx - 1)
                {
-                  big_offd_j[o_cnt] = hypre_map2(ix+1,iy+1,p+1,q+1,nx,
-                        nx_part,ny_part);
+                  big_offd_j[o_cnt] = hypre_map2(ix + 1, iy + 1, p + 1, q + 1, nx,
+                                                 nx_part, ny_part);
                   offd_data[o_cnt++] = value[1];
                }
             }
@@ -399,14 +410,16 @@ GenerateLaplacian9pt( MPI_Comm comm,
    {
       HYPRE_BigInt *tmp = hypre_CTAlloc(HYPRE_BigInt, o_cnt, HYPRE_MEMORY_HOST);
 
-      for (i=0; i < o_cnt; i++)
+      for (i = 0; i < o_cnt; i++)
+      {
          tmp[i] = big_offd_j[i];
+      }
 
-      hypre_BigQsort0(tmp, 0, o_cnt-1);
+      hypre_BigQsort0(tmp, 0, o_cnt - 1);
 
       col_map_offd[0] = tmp[0];
       cnt = 0;
-      for (i=0; i < o_cnt; i++)
+      for (i = 0; i < o_cnt; i++)
       {
          if (tmp[i] > col_map_offd[cnt])
          {
@@ -415,9 +428,9 @@ GenerateLaplacian9pt( MPI_Comm comm,
          }
       }
 
-      for (i=0; i < o_cnt; i++)
+      for (i = 0; i < o_cnt; i++)
       {
-         offd_j[i] = hypre_BigBinarySearch(col_map_offd,big_offd_j[i],num_cols_offd);
+         offd_j[i] = hypre_BigBinarySearch(col_map_offd, big_offd_j[i], num_cols_offd);
       }
 
       hypre_TFree(big_offd_j, HYPRE_MEMORY_HOST);
@@ -425,9 +438,9 @@ GenerateLaplacian9pt( MPI_Comm comm,
    }
 
    A = hypre_ParCSRMatrixCreate(comm, grid_size, grid_size,
-         global_part, global_part, num_cols_offd,
-         diag_i[local_num_rows],
-         offd_i[local_num_rows]);
+                                global_part, global_part, num_cols_offd,
+                                diag_i[local_num_rows],
+                                offd_i[local_num_rows]);
 
    hypre_ParCSRMatrixColMapOffd(A) = col_map_offd;
 
@@ -451,7 +464,6 @@ GenerateLaplacian9pt( MPI_Comm comm,
 
    hypre_TFree(nx_part, HYPRE_MEMORY_HOST);
    hypre_TFree(ny_part, HYPRE_MEMORY_HOST);
-   hypre_TFree(global_part, HYPRE_MEMORY_HOST);
 
    return (HYPRE_ParCSRMatrix) A;
 }
@@ -461,12 +473,12 @@ GenerateLaplacian9pt( MPI_Comm comm,
 
 HYPRE_BigInt
 hypre_map2( HYPRE_BigInt  ix,
-      HYPRE_BigInt  iy,
-      HYPRE_Int  p,
-      HYPRE_Int  q,
-      HYPRE_BigInt  nx,
-      HYPRE_BigInt *nx_part,
-      HYPRE_BigInt *ny_part)
+            HYPRE_BigInt  iy,
+            HYPRE_Int  p,
+            HYPRE_Int  q,
+            HYPRE_BigInt  nx,
+            HYPRE_BigInt *nx_part,
+            HYPRE_BigInt *ny_part)
 {
    HYPRE_Int nx_local;
    HYPRE_Int ny_local;
@@ -474,12 +486,12 @@ hypre_map2( HYPRE_BigInt  ix,
    HYPRE_Int iy_local;
    HYPRE_BigInt global_index;
 
-   nx_local = (HYPRE_Int)(nx_part[p+1] - nx_part[p]);
-   ny_local = (HYPRE_Int)(ny_part[q+1] - ny_part[q]);
+   nx_local = (HYPRE_Int)(nx_part[p + 1] - nx_part[p]);
+   ny_local = (HYPRE_Int)(ny_part[q + 1] - ny_part[q]);
    ix_local = (HYPRE_Int)(ix - nx_part[p]);
    iy_local = (HYPRE_Int)(iy - ny_part[q]);
-   global_index = ny_part[q]*nx + nx_part[p]* (HYPRE_BigInt)ny_local;
-   global_index += (HYPRE_BigInt)(iy_local*nx_local + ix_local);
+   global_index = ny_part[q] * nx + nx_part[p] * (HYPRE_BigInt)ny_local;
+   global_index += (HYPRE_BigInt)(iy_local * nx_local + ix_local);
 
    return global_index;
 }
diff --git a/external/hypre/src/parcsr_ls/par_lr_interp.c b/external/hypre/src/parcsr_ls/par_lr_interp.c
index 9dce8470..5311f81b 100644
--- a/external/hypre/src/parcsr_ls/par_lr_interp.c
+++ b/external/hypre/src/parcsr_ls/par_lr_interp.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -86,10 +86,10 @@ hypre_BoomerAMGBuildStdInterp(hypre_ParCSRMatrix  *A,
    HYPRE_Int       *dof_func_offd = NULL;
 
    /* Full row information for columns of A that are off diag*/
-   hypre_CSRMatrix *A_ext;
-   HYPRE_Real      *A_ext_data;
-   HYPRE_Int       *A_ext_i;
-   HYPRE_BigInt    *A_ext_j;
+   hypre_CSRMatrix *A_ext = NULL;
+   HYPRE_Real      *A_ext_data = NULL;
+   HYPRE_Int       *A_ext_i = NULL;
+   HYPRE_BigInt    *A_ext_j = NULL;
 
    HYPRE_Int       *fine_to_coarse = NULL;
    HYPRE_BigInt    *fine_to_coarse_offd = NULL;
@@ -98,9 +98,9 @@ hypre_BoomerAMGBuildStdInterp(hypre_ParCSRMatrix  *A,
    HYPRE_Int        loc_col;
    HYPRE_Int        full_off_procNodes;
 
-   hypre_CSRMatrix *Sop;
-   HYPRE_Int       *Sop_i;
-   HYPRE_BigInt    *Sop_j;
+   hypre_CSRMatrix *Sop = NULL;
+   HYPRE_Int       *Sop_i = NULL;
+   HYPRE_BigInt    *Sop_j = NULL;
 
    /* Variables to keep count of interpolatory points */
    HYPRE_Int        jj_counter, jj_counter_offd;
@@ -132,23 +132,22 @@ hypre_BoomerAMGBuildStdInterp(hypre_ParCSRMatrix  *A,
    /* Definitions */
    HYPRE_Real       zero = 0.0;
    HYPRE_Real       one  = 1.0;
-   HYPRE_Real       wall_time;
-   HYPRE_Real       wall_1 = 0;
-   HYPRE_Real       wall_2 = 0;
-   HYPRE_Real       wall_3 = 0;
-
+   HYPRE_Real       wall_time = 0.0;
+   HYPRE_Real       wall_1 = 0.0;
+   HYPRE_Real       wall_2 = 0.0;
+   HYPRE_Real       wall_3 = 0.0;
 
    hypre_ParCSRCommPkg   *extend_comm_pkg = NULL;
 
-   if (debug_flag== 4) wall_time = time_getWallclockSeconds();
+   if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
 
    /* BEGIN */
    hypre_MPI_Comm_size(comm, &num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_rank(comm, &my_id);
 
    my_first_cpt = num_cpts_global[0];
-   if (my_id == (num_procs -1)) total_global_cpts = num_cpts_global[1];
-   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
+   if (my_id == (num_procs - 1)) { total_global_cpts = num_cpts_global[1]; }
+   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
 
    if (!comm_pkg)
    {
@@ -162,8 +161,8 @@ hypre_BoomerAMGBuildStdInterp(hypre_ParCSRMatrix  *A,
    if (num_procs > 1)
    {
       hypre_exchange_interp_data(
-            &CF_marker_offd, &dof_func_offd, &A_ext, &full_off_procNodes, &Sop, &extend_comm_pkg,
-            A, CF_marker, S, num_functions, dof_func, 0);
+         &CF_marker_offd, &dof_func_offd, &A_ext, &full_off_procNodes, &Sop, &extend_comm_pkg,
+         A, CF_marker, S, num_functions, dof_func, 0);
       {
 #ifdef HYPRE_PROFILE
          hypre_profile_times[HYPRE_TIMER_ID_EXTENDED_I_INTERP] += hypre_MPI_Wtime();
@@ -185,8 +184,8 @@ hypre_BoomerAMGBuildStdInterp(hypre_ParCSRMatrix  *A,
    /*-----------------------------------------------------------------------
     *  Intialize counters and allocate mapping vector.
     *-----------------------------------------------------------------------*/
-   P_diag_i    = hypre_CTAlloc(HYPRE_Int, n_fine+1, memory_location_P);
-   P_offd_i    = hypre_CTAlloc(HYPRE_Int, n_fine+1, memory_location_P);
+   P_diag_i    = hypre_CTAlloc(HYPRE_Int, n_fine + 1, memory_location_P);
+   P_offd_i    = hypre_CTAlloc(HYPRE_Int, n_fine + 1, memory_location_P);
 
    if (n_fine)
    {
@@ -233,11 +232,12 @@ hypre_BoomerAMGBuildStdInterp(hypre_ParCSRMatrix  *A,
        *--------------------------------------------------------------------*/
       else if (CF_marker[i] != -3)
       {
-         for (jj = S_diag_i[i]; jj < S_diag_i[i+1]; jj++)
+         for (jj = S_diag_i[i]; jj < S_diag_i[i + 1]; jj++)
          {
             i1 = S_diag_j[jj];
             if (CF_marker[i1] >= 0)
-            { /* i1 is a C point */
+            {
+               /* i1 is a C point */
                if (P_marker[i1] < P_diag_i[i])
                {
                   P_marker[i1] = jj_counter;
@@ -245,8 +245,9 @@ hypre_BoomerAMGBuildStdInterp(hypre_ParCSRMatrix  *A,
                }
             }
             else if (CF_marker[i1] != -3)
-            { /* i1 is a F point, loop through it's strong neighbors */
-               for (kk = S_diag_i[i1]; kk < S_diag_i[i1+1]; kk++)
+            {
+               /* i1 is a F point, loop through it's strong neighbors */
+               for (kk = S_diag_i[i1]; kk < S_diag_i[i1 + 1]; kk++)
                {
                   k1 = S_diag_j[kk];
                   if (CF_marker[k1] >= 0)
@@ -260,7 +261,7 @@ hypre_BoomerAMGBuildStdInterp(hypre_ParCSRMatrix  *A,
                }
                if (num_procs > 1)
                {
-                  for (kk = S_offd_i[i1]; kk < S_offd_i[i1+1]; kk++)
+                  for (kk = S_offd_i[i1]; kk < S_offd_i[i1 + 1]; kk++)
                   {
                      k1 = S_offd_j[kk];
                      if (CF_marker_offd[k1] >= 0)
@@ -279,7 +280,7 @@ hypre_BoomerAMGBuildStdInterp(hypre_ParCSRMatrix  *A,
          /* Look at off diag strong connections of i */
          if (num_procs > 1)
          {
-            for (jj = S_offd_i[i]; jj < S_offd_i[i+1]; jj++)
+            for (jj = S_offd_i[i]; jj < S_offd_i[i + 1]; jj++)
             {
                i1 = S_offd_j[jj];
                if (CF_marker_offd[i1] >= 0)
@@ -296,12 +297,13 @@ hypre_BoomerAMGBuildStdInterp(hypre_ParCSRMatrix  *A,
                   /* F point; look at neighbors of i1. Sop contains global col
                   * numbers and entries that could be in S_diag or S_offd or
                   * neither. */
-                  for (kk = Sop_i[i1]; kk < Sop_i[i1+1]; kk++)
+                  for (kk = Sop_i[i1]; kk < Sop_i[i1 + 1]; kk++)
                   {
                      big_k1 = Sop_j[kk];
                      if (big_k1 >= col_1 && big_k1 < col_n)
-                     { /* In S_diag */
-                        loc_col = (HYPRE_Int)(big_k1-col_1);
+                     {
+                        /* In S_diag */
+                        loc_col = (HYPRE_Int)(big_k1 - col_1);
                         if (CF_marker[loc_col] >= 0)
                         {
                            if (P_marker[loc_col] < P_diag_i[i])
@@ -331,11 +333,11 @@ hypre_BoomerAMGBuildStdInterp(hypre_ParCSRMatrix  *A,
       }
    }
 
-   if (debug_flag==4)
+   if (debug_flag == 4)
    {
       wall_time = time_getWallclockSeconds() - wall_time;
       hypre_printf("Proc = %d     determine structure    %f\n",
-            my_id, wall_time);
+                   my_id, wall_time);
       fflush(NULL);
    }
    /*-----------------------------------------------------------------------
@@ -428,9 +430,9 @@ hypre_BoomerAMGBuildStdInterp(hypre_ParCSRMatrix  *A,
 
       else if (CF_marker[i] != -3)
       {
-         if (debug_flag==4) wall_time = time_getWallclockSeconds();
+         if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
          strong_f_marker--;
-         for (jj = S_diag_i[i]; jj < S_diag_i[i+1]; jj++)
+         for (jj = S_diag_i[i]; jj < S_diag_i[i + 1]; jj++)
          {
             i1 = S_diag_j[jj];
 
@@ -452,7 +454,7 @@ hypre_BoomerAMGBuildStdInterp(hypre_ParCSRMatrix  *A,
             else  if (CF_marker[i1] != -3)
             {
                P_marker[i1] = strong_f_marker;
-               for (kk = S_diag_i[i1]; kk < S_diag_i[i1+1]; kk++)
+               for (kk = S_diag_i[i1]; kk < S_diag_i[i1 + 1]; kk++)
                {
                   k1 = S_diag_j[kk];
                   if (CF_marker[k1] >= 0)
@@ -468,7 +470,7 @@ hypre_BoomerAMGBuildStdInterp(hypre_ParCSRMatrix  *A,
                }
                if (num_procs > 1)
                {
-                  for (kk = S_offd_i[i1]; kk < S_offd_i[i1+1]; kk++)
+                  for (kk = S_offd_i[i1]; kk < S_offd_i[i1 + 1]; kk++)
                   {
                      k1 = S_offd_j[kk];
                      if (CF_marker_offd[k1] >= 0)
@@ -488,7 +490,7 @@ hypre_BoomerAMGBuildStdInterp(hypre_ParCSRMatrix  *A,
 
          if ( num_procs > 1)
          {
-            for (jj=S_offd_i[i]; jj < S_offd_i[i+1]; jj++)
+            for (jj = S_offd_i[i]; jj < S_offd_i[i + 1]; jj++)
             {
                i1 = S_offd_j[jj];
                if ( CF_marker_offd[i1] >= 0)
@@ -496,7 +498,7 @@ hypre_BoomerAMGBuildStdInterp(hypre_ParCSRMatrix  *A,
                   if (P_marker_offd[i1] < jj_begin_row_offd)
                   {
                      P_marker_offd[i1] = jj_counter_offd;
-                     P_offd_j[jj_counter_offd]=i1;
+                     P_offd_j[jj_counter_offd] = i1;
                      P_offd_data[jj_counter_offd] = zero;
                      jj_counter_offd++;
                   }
@@ -504,12 +506,12 @@ hypre_BoomerAMGBuildStdInterp(hypre_ParCSRMatrix  *A,
                else if (CF_marker_offd[i1] != -3)
                {
                   P_marker_offd[i1] = strong_f_marker;
-                  for (kk = Sop_i[i1]; kk < Sop_i[i1+1]; kk++)
+                  for (kk = Sop_i[i1]; kk < Sop_i[i1 + 1]; kk++)
                   {
                      big_k1 = Sop_j[kk];
                      if (big_k1 >= col_1 && big_k1 < col_n)
                      {
-                        loc_col = (HYPRE_Int)(big_k1-col_1);
+                        loc_col = (HYPRE_Int)(big_k1 - col_1);
                         if (CF_marker[loc_col] >= 0)
                         {
                            if (P_marker[loc_col] < jj_begin_row)
@@ -529,7 +531,7 @@ hypre_BoomerAMGBuildStdInterp(hypre_ParCSRMatrix  *A,
                            if (P_marker_offd[loc_col] < jj_begin_row_offd)
                            {
                               P_marker_offd[loc_col] = jj_counter_offd;
-                              P_offd_j[jj_counter_offd]=loc_col;
+                              P_offd_j[jj_counter_offd] = loc_col;
                               P_offd_data[jj_counter_offd] = zero;
                               jj_counter_offd++;
                            }
@@ -543,25 +545,26 @@ hypre_BoomerAMGBuildStdInterp(hypre_ParCSRMatrix  *A,
          jj_end_row = jj_counter;
          jj_end_row_offd = jj_counter_offd;
 
-         if (debug_flag==4)
+         if (debug_flag == 4)
          {
             wall_time = time_getWallclockSeconds() - wall_time;
             wall_1 += wall_time;
             fflush(NULL);
          }
-         if (debug_flag==4)
+         if (debug_flag == 4)
          {
             wall_time = time_getWallclockSeconds();
          }
          cnt_c = 0;
-         cnt_f = jj_end_row-jj_begin_row;
+         cnt_f = jj_end_row - jj_begin_row;
          cnt_c_offd = 0;
-         cnt_f_offd = jj_end_row_offd-jj_begin_row_offd;
+         cnt_f_offd = jj_end_row_offd - jj_begin_row_offd;
          ihat[i] = cnt_f;
          ipnt[cnt_f] = i;
          ahat[cnt_f++] = A_diag_data[A_diag_i[i]];
-         for (jj = A_diag_i[i]+1; jj < A_diag_i[i+1]; jj++)
-         { /* i1 is direct neighbor */
+         for (jj = A_diag_i[i] + 1; jj < A_diag_i[i + 1]; jj++)
+         {
+            /* i1 is direct neighbor */
             i1 = A_diag_j[jj];
             if (P_marker[i1] != strong_f_marker)
             {
@@ -587,29 +590,31 @@ hypre_BoomerAMGBuildStdInterp(hypre_ParCSRMatrix  *A,
             {
                if (num_functions == 1 || dof_func[i] == dof_func[i1])
                {
-                  distribute = A_diag_data[jj]/A_diag_data[A_diag_i[i1]];
-                  for (kk = A_diag_i[i1]+1; kk < A_diag_i[i1+1]; kk++)
+                  distribute = A_diag_data[jj] / A_diag_data[A_diag_i[i1]];
+                  for (kk = A_diag_i[i1] + 1; kk < A_diag_i[i1 + 1]; kk++)
                   {
                      k1 = A_diag_j[kk];
                      indx = ihat[k1];
                      if (indx > -1)
-                        ahat[indx] -= A_diag_data[kk]*distribute;
+                     {
+                        ahat[indx] -= A_diag_data[kk] * distribute;
+                     }
                      else if (P_marker[k1] >= jj_begin_row)
                      {
                         ihat[k1] = cnt_c;
                         ipnt[cnt_c] = k1;
-                        ahat[cnt_c++] -= A_diag_data[kk]*distribute;
+                        ahat[cnt_c++] -= A_diag_data[kk] * distribute;
                      }
                      else
                      {
                         ihat[k1] = cnt_f;
                         ipnt[cnt_f] = k1;
-                        ahat[cnt_f++] -= A_diag_data[kk]*distribute;
+                        ahat[cnt_f++] -= A_diag_data[kk] * distribute;
                      }
                   }
                   if (num_procs > 1)
                   {
-                     for (kk = A_offd_i[i1]; kk < A_offd_i[i1+1]; kk++)
+                     for (kk = A_offd_i[i1]; kk < A_offd_i[i1 + 1]; kk++)
                      {
                         k1 = A_offd_j[kk];
                         indx = ihat_offd[k1];
@@ -617,19 +622,19 @@ hypre_BoomerAMGBuildStdInterp(hypre_ParCSRMatrix  *A,
                         {
                            if (indx > -1)
                            {
-                              ahat_offd[indx] -= A_offd_data[kk]*distribute;
+                              ahat_offd[indx] -= A_offd_data[kk] * distribute;
                            }
                            else if (P_marker_offd[k1] >= jj_begin_row_offd)
                            {
                               ihat_offd[k1] = cnt_c_offd;
                               ipnt_offd[cnt_c_offd] = k1;
-                              ahat_offd[cnt_c_offd++] -= A_offd_data[kk]*distribute;
+                              ahat_offd[cnt_c_offd++] -= A_offd_data[kk] * distribute;
                            }
                            else
                            {
                               ihat_offd[k1] = cnt_f_offd;
                               ipnt_offd[cnt_f_offd] = k1;
-                              ahat_offd[cnt_f_offd++] -= A_offd_data[kk]*distribute;
+                              ahat_offd[cnt_f_offd++] -= A_offd_data[kk] * distribute;
                            }
                         }
                      }
@@ -639,14 +644,16 @@ hypre_BoomerAMGBuildStdInterp(hypre_ParCSRMatrix  *A,
          }
          if (num_procs > 1)
          {
-            for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+            for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
             {
                i1 = A_offd_j[jj];
                if (P_marker_offd[i1] != strong_f_marker)
                {
                   indx = ihat_offd[i1];
                   if (indx > -1)
+                  {
                      ahat_offd[indx] += A_offd_data[jj];
+                  }
                   else if (P_marker_offd[i1] >= jj_begin_row_offd)
                   {
                      ihat_offd[i1] = cnt_c_offd;
@@ -664,29 +671,30 @@ hypre_BoomerAMGBuildStdInterp(hypre_ParCSRMatrix  *A,
                {
                   if (num_functions == 1 || dof_func[i] == dof_func_offd[i1])
                   {
-                     distribute = A_offd_data[jj]/A_ext_data[A_ext_i[i1]];
-                     for (kk = A_ext_i[i1]+1; kk < A_ext_i[i1+1]; kk++)
+                     distribute = A_offd_data[jj] / A_ext_data[A_ext_i[i1]];
+                     for (kk = A_ext_i[i1] + 1; kk < A_ext_i[i1 + 1]; kk++)
                      {
                         big_k1 = A_ext_j[kk];
                         if (big_k1 >= col_1 && big_k1 < col_n)
-                        { /*diag*/
+                        {
+                           /*diag*/
                            loc_col = (HYPRE_Int)(big_k1 - col_1);
                            indx = ihat[loc_col];
                            if (indx > -1)
                            {
-                              ahat[indx] -= A_ext_data[kk]*distribute;
+                              ahat[indx] -= A_ext_data[kk] * distribute;
                            }
                            else if (P_marker[loc_col] >= jj_begin_row)
                            {
                               ihat[loc_col] = cnt_c;
                               ipnt[cnt_c] = loc_col;
-                              ahat[cnt_c++] -= A_ext_data[kk]*distribute;
+                              ahat[cnt_c++] -= A_ext_data[kk] * distribute;
                            }
                            else
                            {
                               ihat[loc_col] = cnt_f;
                               ipnt[cnt_f] = loc_col;
-                              ahat[cnt_f++] -= A_ext_data[kk]*distribute;
+                              ahat[cnt_f++] -= A_ext_data[kk] * distribute;
                            }
                         }
                         else
@@ -697,19 +705,19 @@ hypre_BoomerAMGBuildStdInterp(hypre_ParCSRMatrix  *A,
                               indx = ihat_offd[loc_col];
                               if (indx > -1)
                               {
-                                 ahat_offd[indx] -= A_ext_data[kk]*distribute;
+                                 ahat_offd[indx] -= A_ext_data[kk] * distribute;
                               }
                               else if (P_marker_offd[loc_col] >= jj_begin_row_offd)
                               {
                                  ihat_offd[loc_col] = cnt_c_offd;
                                  ipnt_offd[cnt_c_offd] = loc_col;
-                                 ahat_offd[cnt_c_offd++] -= A_ext_data[kk]*distribute;
+                                 ahat_offd[cnt_c_offd++] -= A_ext_data[kk] * distribute;
                               }
                               else
                               {
                                  ihat_offd[loc_col] = cnt_f_offd;
                                  ipnt_offd[cnt_f_offd] = loc_col;
-                                 ahat_offd[cnt_f_offd++] -= A_ext_data[kk]*distribute;
+                                 ahat_offd[cnt_f_offd++] -= A_ext_data[kk] * distribute;
                               }
                            }
                         }
@@ -718,14 +726,14 @@ hypre_BoomerAMGBuildStdInterp(hypre_ParCSRMatrix  *A,
                }
             }
          }
-         if (debug_flag==4)
+         if (debug_flag == 4)
          {
             wall_time = time_getWallclockSeconds() - wall_time;
             wall_2 += wall_time;
             fflush(NULL);
          }
 
-         if (debug_flag==4) wall_time = time_getWallclockSeconds();
+         if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
          diagonal = ahat[cnt_c];
          ahat[cnt_c] = 0;
          sum_pos = 0;
@@ -736,7 +744,7 @@ hypre_BoomerAMGBuildStdInterp(hypre_ParCSRMatrix  *A,
          sum_C = 0;
          if (sep_weight == 1)
          {
-            for (jj=0; jj < cnt_c; jj++)
+            for (jj = 0; jj < cnt_c; jj++)
             {
                if (ahat[jj] > 0)
                {
@@ -749,7 +757,7 @@ hypre_BoomerAMGBuildStdInterp(hypre_ParCSRMatrix  *A,
             }
             if (num_procs > 1)
             {
-               for (jj=0; jj < cnt_c_offd; jj++)
+               for (jj = 0; jj < cnt_c_offd; jj++)
                {
                   if (ahat_offd[jj] > 0)
                   {
@@ -763,7 +771,7 @@ hypre_BoomerAMGBuildStdInterp(hypre_ParCSRMatrix  *A,
             }
             sum_pos = sum_pos_C;
             sum_neg = sum_neg_C;
-            for (jj=cnt_c+1; jj < cnt_f; jj++)
+            for (jj = cnt_c + 1; jj < cnt_f; jj++)
             {
                if (ahat[jj] > 0)
                {
@@ -777,7 +785,7 @@ hypre_BoomerAMGBuildStdInterp(hypre_ParCSRMatrix  *A,
             }
             if (num_procs > 1)
             {
-               for (jj=cnt_c_offd; jj < cnt_f_offd; jj++)
+               for (jj = cnt_c_offd; jj < cnt_f_offd; jj++)
                {
                   if (ahat_offd[jj] > 0)
                   {
@@ -790,13 +798,13 @@ hypre_BoomerAMGBuildStdInterp(hypre_ParCSRMatrix  *A,
                   ahat_offd[jj] = 0;
                }
             }
-            if (sum_neg_C*diagonal != 0)
+            if (sum_neg_C * diagonal != 0)
             {
-               alfa = sum_neg/sum_neg_C/diagonal;
+               alfa = sum_neg / sum_neg_C / diagonal;
             }
-            if (sum_pos_C*diagonal != 0)
+            if (sum_pos_C * diagonal != 0)
             {
-               beta = sum_pos/sum_pos_C/diagonal;
+               beta = sum_pos / sum_pos_C / diagonal;
             }
 
             /*-----------------------------------------------------------------
@@ -808,18 +816,18 @@ hypre_BoomerAMGBuildStdInterp(hypre_ParCSRMatrix  *A,
                j1 = ihat[P_diag_j[jj]];
                if (ahat[j1] > 0)
                {
-                  P_diag_data[jj] = -beta*ahat[j1];
+                  P_diag_data[jj] = -beta * ahat[j1];
                }
                else
                {
-                  P_diag_data[jj] = -alfa*ahat[j1];
+                  P_diag_data[jj] = -alfa * ahat[j1];
                }
 
                P_diag_j[jj] = fine_to_coarse[P_diag_j[jj]];
                ahat[j1] = 0;
             }
 
-            for (jj=0; jj < cnt_f; jj++)
+            for (jj = 0; jj < cnt_f; jj++)
             {
                ihat[ipnt[jj]] = -1;
             }
@@ -831,16 +839,16 @@ hypre_BoomerAMGBuildStdInterp(hypre_ParCSRMatrix  *A,
                   j1 = ihat_offd[P_offd_j[jj]];
                   if (ahat_offd[j1] > 0)
                   {
-                     P_offd_data[jj] = -beta*ahat_offd[j1];
+                     P_offd_data[jj] = -beta * ahat_offd[j1];
                   }
                   else
                   {
-                     P_offd_data[jj] = -alfa*ahat_offd[j1];
+                     P_offd_data[jj] = -alfa * ahat_offd[j1];
                   }
 
                   ahat_offd[j1] = 0;
                }
-               for (jj=0; jj < cnt_f_offd; jj++)
+               for (jj = 0; jj < cnt_f_offd; jj++)
                {
                   ihat_offd[ipnt_offd[jj]] = -1;
                }
@@ -848,34 +856,34 @@ hypre_BoomerAMGBuildStdInterp(hypre_ParCSRMatrix  *A,
          }
          else
          {
-            for (jj=0; jj < cnt_c; jj++)
+            for (jj = 0; jj < cnt_c; jj++)
             {
                sum_C += ahat[jj];
             }
             if (num_procs > 1)
             {
-               for (jj=0; jj < cnt_c_offd; jj++)
+               for (jj = 0; jj < cnt_c_offd; jj++)
                {
                   sum_C += ahat_offd[jj];
                }
             }
             sum = sum_C;
-            for (jj=cnt_c+1; jj < cnt_f; jj++)
+            for (jj = cnt_c + 1; jj < cnt_f; jj++)
             {
                sum += ahat[jj];
                ahat[jj] = 0;
             }
             if (num_procs > 1)
             {
-               for (jj=cnt_c_offd; jj < cnt_f_offd; jj++)
+               for (jj = cnt_c_offd; jj < cnt_f_offd; jj++)
                {
                   sum += ahat_offd[jj];
                   ahat_offd[jj] = 0;
                }
             }
-            if (sum_C*diagonal != 0)
+            if (sum_C * diagonal != 0)
             {
-               alfa = sum/sum_C/diagonal;
+               alfa = sum / sum_C / diagonal;
             }
 
             /*-----------------------------------------------------------------
@@ -885,11 +893,11 @@ hypre_BoomerAMGBuildStdInterp(hypre_ParCSRMatrix  *A,
             for (jj = jj_begin_row; jj < jj_end_row; jj++)
             {
                j1 = ihat[P_diag_j[jj]];
-               P_diag_data[jj] = -alfa*ahat[j1];
+               P_diag_data[jj] = -alfa * ahat[j1];
                P_diag_j[jj] = fine_to_coarse[P_diag_j[jj]];
                ahat[j1] = 0;
             }
-            for (jj=0; jj < cnt_f; jj++)
+            for (jj = 0; jj < cnt_f; jj++)
             {
                ihat[ipnt[jj]] = -1;
             }
@@ -898,16 +906,16 @@ hypre_BoomerAMGBuildStdInterp(hypre_ParCSRMatrix  *A,
                for (jj = jj_begin_row_offd; jj < jj_end_row_offd; jj++)
                {
                   j1 = ihat_offd[P_offd_j[jj]];
-                  P_offd_data[jj] = -alfa*ahat_offd[j1];
+                  P_offd_data[jj] = -alfa * ahat_offd[j1];
                   ahat_offd[j1] = 0;
                }
-               for (jj=0; jj < cnt_f_offd; jj++)
+               for (jj = 0; jj < cnt_f_offd; jj++)
                {
                   ihat_offd[ipnt_offd[jj]] = -1;
                }
             }
          }
-         if (debug_flag==4)
+         if (debug_flag == 4)
          {
             wall_time = time_getWallclockSeconds() - wall_time;
             wall_3 += wall_time;
@@ -916,10 +924,10 @@ hypre_BoomerAMGBuildStdInterp(hypre_ParCSRMatrix  *A,
       }
    }
 
-   if (debug_flag==4)
+   if (debug_flag == 4)
    {
       hypre_printf("Proc = %d fill part 1 %f part 2 %f  part 3 %f\n",
-            my_id, wall_1, wall_2, wall_3);
+                   my_id, wall_1, wall_2, wall_3);
       fflush(NULL);
    }
    P = hypre_ParCSRMatrixCreate(comm,
@@ -966,7 +974,7 @@ hypre_BoomerAMGBuildStdInterp(hypre_ParCSRMatrix  *A,
 
    hypre_MatvecCommPkgCreate(P);
 
-   for (i=0; i < n_fine; i++)
+   for (i = 0; i < n_fine; i++)
    {
       if (CF_marker[i] == -3)
       {
@@ -1083,10 +1091,10 @@ hypre_BoomerAMGBuildExtPIInterpHost(hypre_ParCSRMatrix   *A,
    HYPRE_Int       *dof_func_offd = NULL;
 
    /* Full row information for columns of A that are off diag*/
-   hypre_CSRMatrix *A_ext;
-   HYPRE_Real      *A_ext_data;
-   HYPRE_Int       *A_ext_i;
-   HYPRE_BigInt    *A_ext_j;
+   hypre_CSRMatrix *A_ext = NULL;
+   HYPRE_Real      *A_ext_data = NULL;
+   HYPRE_Int       *A_ext_i = NULL;
+   HYPRE_BigInt    *A_ext_j = NULL;
 
    HYPRE_Int       *fine_to_coarse = NULL;
    HYPRE_BigInt    *fine_to_coarse_offd = NULL;
@@ -1094,9 +1102,9 @@ hypre_BoomerAMGBuildExtPIInterpHost(hypre_ParCSRMatrix   *A,
    HYPRE_Int        loc_col;
    HYPRE_Int        full_off_procNodes;
 
-   hypre_CSRMatrix *Sop;
-   HYPRE_Int       *Sop_i;
-   HYPRE_BigInt    *Sop_j;
+   hypre_CSRMatrix *Sop = NULL;
+   HYPRE_Int       *Sop_i = NULL;
+   HYPRE_BigInt    *Sop_j = NULL;
 
    HYPRE_Int        sgn = 1;
 
@@ -1132,15 +1140,15 @@ hypre_BoomerAMGBuildExtPIInterpHost(hypre_ParCSRMatrix   *A,
 
    hypre_ParCSRCommPkg   *extend_comm_pkg = NULL;
 
-   if (debug_flag==4) wall_time = time_getWallclockSeconds();
+   if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
 
    /* BEGIN */
    hypre_MPI_Comm_size(comm, &num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_rank(comm, &my_id);
 
    my_first_cpt = num_cpts_global[0];
-   if (my_id == (num_procs -1)) total_global_cpts = num_cpts_global[1];
-   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
+   if (my_id == (num_procs - 1)) { total_global_cpts = num_cpts_global[1]; }
+   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
 
    if (!comm_pkg)
    {
@@ -1154,8 +1162,8 @@ hypre_BoomerAMGBuildExtPIInterpHost(hypre_ParCSRMatrix   *A,
    if (num_procs > 1)
    {
       hypre_exchange_interp_data(
-            &CF_marker_offd, &dof_func_offd, &A_ext, &full_off_procNodes, &Sop, &extend_comm_pkg,
-            A, CF_marker, S, num_functions, dof_func, 1);
+         &CF_marker_offd, &dof_func_offd, &A_ext, &full_off_procNodes, &Sop, &extend_comm_pkg,
+         A, CF_marker, S, num_functions, dof_func, 1);
       {
 #ifdef HYPRE_PROFILE
          hypre_profile_times[HYPRE_TIMER_ID_EXTENDED_I_INTERP] += hypre_MPI_Wtime();
@@ -1177,8 +1185,8 @@ hypre_BoomerAMGBuildExtPIInterpHost(hypre_ParCSRMatrix   *A,
    /*-----------------------------------------------------------------------
     *  Intialize counters and allocate mapping vector.
     *-----------------------------------------------------------------------*/
-   P_diag_i    = hypre_CTAlloc(HYPRE_Int, n_fine+1, memory_location_P);
-   P_offd_i    = hypre_CTAlloc(HYPRE_Int, n_fine+1, memory_location_P);
+   P_diag_i    = hypre_CTAlloc(HYPRE_Int, n_fine + 1, memory_location_P);
+   P_offd_i    = hypre_CTAlloc(HYPRE_Int, n_fine + 1, memory_location_P);
 
    if (n_fine)
    {
@@ -1194,8 +1202,8 @@ hypre_BoomerAMGBuildExtPIInterpHost(hypre_ParCSRMatrix   *A,
    /* This function is smart enough to check P_marker and P_marker_offd only,
     * and set them if they are not NULL.  The other vectors are set regardless.*/
    hypre_initialize_vecs(n_fine, full_off_procNodes, fine_to_coarse,
-         fine_to_coarse_offd, P_marker, P_marker_offd,
-         tmp_CF_marker_offd);
+                         fine_to_coarse_offd, P_marker, P_marker_offd,
+                         tmp_CF_marker_offd);
 
 
    /*-----------------------------------------------------------------------
@@ -1205,7 +1213,7 @@ hypre_BoomerAMGBuildExtPIInterpHost(hypre_ParCSRMatrix   *A,
    diag_offset           = hypre_CTAlloc(HYPRE_Int, max_num_threads[0], HYPRE_MEMORY_HOST);
    fine_to_coarse_offset = hypre_CTAlloc(HYPRE_Int, max_num_threads[0], HYPRE_MEMORY_HOST);
    offd_offset           = hypre_CTAlloc(HYPRE_Int, max_num_threads[0], HYPRE_MEMORY_HOST);
-   for (i=0; i < max_num_threads[0]; i++)
+   for (i = 0; i < max_num_threads[0]; i++)
    {
       diag_offset[i] = 0;
       fine_to_coarse_offset[i] = 0;
@@ -1216,7 +1224,7 @@ hypre_BoomerAMGBuildExtPIInterpHost(hypre_ParCSRMatrix   *A,
     *  Loop over fine grid.
     *-----------------------------------------------------------------------*/
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel private(i,my_thread_num,num_threads,start,stop,coarse_counter,jj_counter,jj_counter_offd, P_marker, P_marker_offd,jj,kk,i1,k1,loc_col,jj_begin_row,jj_begin_row_offd,jj_end_row,jj_end_row_offd,diagonal,sum,sgn,jj1,i2,distribute,strong_f_marker, big_k1)
+   #pragma omp parallel private(i,my_thread_num,num_threads,start,stop,coarse_counter,jj_counter,jj_counter_offd, P_marker, P_marker_offd,jj,kk,i1,k1,loc_col,jj_begin_row,jj_begin_row_offd,jj_end_row,jj_end_row_offd,diagonal,sum,sgn,jj1,i2,distribute,strong_f_marker, big_k1)
 #endif
    {
 
@@ -1237,6 +1245,8 @@ hypre_BoomerAMGBuildExtPIInterpHost(hypre_ParCSRMatrix   *A,
        */
 
       /* initialize thread-wise variables */
+      P_marker = NULL;
+      P_marker_offd = NULL;
       strong_f_marker = -2;
       coarse_counter = 0;
       jj_counter = start_indexing;
@@ -1257,11 +1267,11 @@ hypre_BoomerAMGBuildExtPIInterpHost(hypre_ParCSRMatrix   *A,
       /* this thread's row range */
       my_thread_num = hypre_GetThreadNum();
       num_threads = hypre_NumActiveThreads();
-      start = (n_fine/num_threads)*my_thread_num;
-      if (my_thread_num == num_threads-1)
+      start = (n_fine / num_threads) * my_thread_num;
+      if (my_thread_num == num_threads - 1)
       {  stop = n_fine; }
       else
-      {  stop = (n_fine/num_threads)*(my_thread_num+1); }
+      {  stop = (n_fine / num_threads) * (my_thread_num + 1); }
 
       /* loop over rows */
       /* This loop counts the number of elements in P */
@@ -1271,7 +1281,9 @@ hypre_BoomerAMGBuildExtPIInterpHost(hypre_ParCSRMatrix   *A,
       {
          P_diag_i[i] = jj_counter;
          if (num_procs > 1)
+         {
             P_offd_i[i] = jj_counter_offd;
+         }
 
          if (CF_marker[i] >= 0)
          {
@@ -1288,11 +1300,12 @@ hypre_BoomerAMGBuildExtPIInterpHost(hypre_ParCSRMatrix   *A,
           *--------------------------------------------------------------------*/
          else if (CF_marker[i] != -3)
          {
-            for (jj = S_diag_i[i]; jj < S_diag_i[i+1]; jj++)
+            for (jj = S_diag_i[i]; jj < S_diag_i[i + 1]; jj++)
             {
                i1 = S_diag_j[jj];
                if (CF_marker[i1] >= 0)
-               { /* i1 is a C point */
+               {
+                  /* i1 is a C point */
                   if (P_marker[i1] < P_diag_i[i])
                   {
                      P_marker[i1] = jj_counter;
@@ -1300,8 +1313,9 @@ hypre_BoomerAMGBuildExtPIInterpHost(hypre_ParCSRMatrix   *A,
                   }
                }
                else if (CF_marker[i1] != -3)
-               { /* i1 is a F point, loop through it's strong neighbors */
-                  for (kk = S_diag_i[i1]; kk < S_diag_i[i1+1]; kk++)
+               {
+                  /* i1 is a F point, loop through it's strong neighbors */
+                  for (kk = S_diag_i[i1]; kk < S_diag_i[i1 + 1]; kk++)
                   {
                      k1 = S_diag_j[kk];
                      if (CF_marker[k1] >= 0)
@@ -1315,7 +1329,7 @@ hypre_BoomerAMGBuildExtPIInterpHost(hypre_ParCSRMatrix   *A,
                   }
                   if (num_procs > 1)
                   {
-                     for (kk = S_offd_i[i1]; kk < S_offd_i[i1+1]; kk++)
+                     for (kk = S_offd_i[i1]; kk < S_offd_i[i1 + 1]; kk++)
                      {
                         k1 = S_offd_j[kk];
                         if (CF_marker_offd[k1] >= 0)
@@ -1334,7 +1348,7 @@ hypre_BoomerAMGBuildExtPIInterpHost(hypre_ParCSRMatrix   *A,
             /* Look at off diag strong connections of i */
             if (num_procs > 1)
             {
-               for (jj = S_offd_i[i]; jj < S_offd_i[i+1]; jj++)
+               for (jj = S_offd_i[i]; jj < S_offd_i[i + 1]; jj++)
                {
                   i1 = S_offd_j[jj];
                   if (CF_marker_offd[i1] >= 0)
@@ -1347,15 +1361,17 @@ hypre_BoomerAMGBuildExtPIInterpHost(hypre_ParCSRMatrix   *A,
                      }
                   }
                   else if (CF_marker_offd[i1] != -3)
-                  { /* F point; look at neighbors of i1. Sop contains global col
-                     * numbers and entries that could be in S_diag or S_offd or
-                     * neither. */
-                     for (kk = Sop_i[i1]; kk < Sop_i[i1+1]; kk++)
+                  {
+                     /* F point; look at neighbors of i1. Sop contains global col
+                      * numbers and entries that could be in S_diag or S_offd or
+                      * neither. */
+                     for (kk = Sop_i[i1]; kk < Sop_i[i1 + 1]; kk++)
                      {
                         big_k1 = Sop_j[kk];
                         if (big_k1 >= col_1 && big_k1 < col_n)
-                        { /* In S_diag */
-                           loc_col = (HYPRE_Int)(big_k1-col_1);
+                        {
+                           /* In S_diag */
+                           loc_col = (HYPRE_Int)(big_k1 - col_1);
                            if (P_marker[loc_col] < P_diag_i[i])
                            {
                               P_marker[loc_col] = jj_counter;
@@ -1382,7 +1398,7 @@ hypre_BoomerAMGBuildExtPIInterpHost(hypre_ParCSRMatrix   *A,
        *  End loop over fine grid.
        *-----------------------------------------------------------------------*/
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
       P_diag_i[stop] = jj_counter;
       P_offd_i[stop] = jj_counter_offd;
@@ -1392,57 +1408,57 @@ hypre_BoomerAMGBuildExtPIInterpHost(hypre_ParCSRMatrix   *A,
 
       /* Stitch P_diag_i, P_offd_i and fine_to_coarse together */
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
       if (my_thread_num == 0)
       {
          /* Calculate the offset for P_diag_i and P_offd_i for each thread */
          for (i = 1; i < num_threads; i++)
          {
-            diag_offset[i] = diag_offset[i-1] + diag_offset[i];
-            fine_to_coarse_offset[i] = fine_to_coarse_offset[i-1] + fine_to_coarse_offset[i];
-            offd_offset[i] = offd_offset[i-1] + offd_offset[i];
+            diag_offset[i] = diag_offset[i - 1] + diag_offset[i];
+            fine_to_coarse_offset[i] = fine_to_coarse_offset[i - 1] + fine_to_coarse_offset[i];
+            offd_offset[i] = offd_offset[i - 1] + offd_offset[i];
          }
       }
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
 
       if (my_thread_num > 0)
       {
          /* update row pointer array with offset,
           * making sure to update the row stop index */
-         for (i = start+1; i <= stop; i++)
+         for (i = start + 1; i <= stop; i++)
          {
-            P_diag_i[i] += diag_offset[my_thread_num-1];
-            P_offd_i[i] += offd_offset[my_thread_num-1];
+            P_diag_i[i] += diag_offset[my_thread_num - 1];
+            P_offd_i[i] += offd_offset[my_thread_num - 1];
          }
          /* update fine_to_coarse by offsetting with the offset
           * from the preceding thread */
          for (i = start; i < stop; i++)
          {
             if (fine_to_coarse[i] >= 0)
-            { fine_to_coarse[i] += fine_to_coarse_offset[my_thread_num-1]; }
+            { fine_to_coarse[i] += fine_to_coarse_offset[my_thread_num - 1]; }
          }
       }
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
 
       if (my_thread_num == 0)
       {
-         if (debug_flag==4)
+         if (debug_flag == 4)
          {
             wall_time = time_getWallclockSeconds() - wall_time;
             hypre_printf("Proc = %d     determine structure    %f\n",
-                  my_id, wall_time);
+                         my_id, wall_time);
             fflush(NULL);
          }
          /*-----------------------------------------------------------------------
           *  Allocate  arrays.
           *-----------------------------------------------------------------------*/
 
-         if (debug_flag== 4) wall_time = time_getWallclockSeconds();
+         if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
 
          P_diag_size =  P_diag_i[n_fine];
          P_offd_size = P_offd_i[n_fine];
@@ -1464,8 +1480,8 @@ hypre_BoomerAMGBuildExtPIInterpHost(hypre_ParCSRMatrix   *A,
       if (num_procs > 1   &&   my_thread_num == 0)
       {
          hypre_big_insert_new_nodes(comm_pkg, extend_comm_pkg, fine_to_coarse,
-               full_off_procNodes, my_first_cpt,
-               fine_to_coarse_offd);
+                                    full_off_procNodes, my_first_cpt,
+                                    fine_to_coarse_offd);
       }
 
       for (i = 0; i < n_fine; i++)
@@ -1482,7 +1498,7 @@ hypre_BoomerAMGBuildExtPIInterpHost(hypre_ParCSRMatrix   *A,
        *  Loop over fine grid points.
        *-----------------------------------------------------------------------*/
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
       for (i = start; i < stop; i++)
       {
@@ -1509,7 +1525,7 @@ hypre_BoomerAMGBuildExtPIInterpHost(hypre_ParCSRMatrix   *A,
          else if (CF_marker[i] != -3)
          {
             strong_f_marker--;
-            for (jj = S_diag_i[i]; jj < S_diag_i[i+1]; jj++)
+            for (jj = S_diag_i[i]; jj < S_diag_i[i + 1]; jj++)
             {
                i1 = S_diag_j[jj];
 
@@ -1531,7 +1547,7 @@ hypre_BoomerAMGBuildExtPIInterpHost(hypre_ParCSRMatrix   *A,
                else  if (CF_marker[i1] != -3)
                {
                   P_marker[i1] = strong_f_marker;
-                  for (kk = S_diag_i[i1]; kk < S_diag_i[i1+1]; kk++)
+                  for (kk = S_diag_i[i1]; kk < S_diag_i[i1 + 1]; kk++)
                   {
                      k1 = S_diag_j[kk];
                      if (CF_marker[k1] >= 0)
@@ -1547,7 +1563,7 @@ hypre_BoomerAMGBuildExtPIInterpHost(hypre_ParCSRMatrix   *A,
                   }
                   if (num_procs > 1)
                   {
-                     for (kk = S_offd_i[i1]; kk < S_offd_i[i1+1]; kk++)
+                     for (kk = S_offd_i[i1]; kk < S_offd_i[i1 + 1]; kk++)
                      {
                         k1 = S_offd_j[kk];
                         if (CF_marker_offd[k1] >= 0)
@@ -1567,7 +1583,7 @@ hypre_BoomerAMGBuildExtPIInterpHost(hypre_ParCSRMatrix   *A,
 
             if ( num_procs > 1)
             {
-               for (jj=S_offd_i[i]; jj < S_offd_i[i+1]; jj++)
+               for (jj = S_offd_i[i]; jj < S_offd_i[i + 1]; jj++)
                {
                   i1 = S_offd_j[jj];
                   if ( CF_marker_offd[i1] >= 0)
@@ -1583,13 +1599,13 @@ hypre_BoomerAMGBuildExtPIInterpHost(hypre_ParCSRMatrix   *A,
                   else if (CF_marker_offd[i1] != -3)
                   {
                      P_marker_offd[i1] = strong_f_marker;
-                     for (kk = Sop_i[i1]; kk < Sop_i[i1+1]; kk++)
+                     for (kk = Sop_i[i1]; kk < Sop_i[i1 + 1]; kk++)
                      {
                         big_k1 = Sop_j[kk];
                         /* Find local col number */
                         if (big_k1 >= col_1 && big_k1 < col_n)
                         {
-                           loc_col = (HYPRE_Int)(big_k1-col_1);
+                           loc_col = (HYPRE_Int)(big_k1 - col_1);
                            if (P_marker[loc_col] < jj_begin_row)
                            {
                               P_marker[loc_col] = jj_counter;
@@ -1604,7 +1620,7 @@ hypre_BoomerAMGBuildExtPIInterpHost(hypre_ParCSRMatrix   *A,
                            if (P_marker_offd[loc_col] < jj_begin_row_offd)
                            {
                               P_marker_offd[loc_col] = jj_counter_offd;
-                              P_offd_j[jj_counter_offd]=loc_col;
+                              P_offd_j[jj_counter_offd] = loc_col;
                               P_offd_data[jj_counter_offd] = zero;
                               jj_counter_offd++;
                            }
@@ -1619,9 +1635,10 @@ hypre_BoomerAMGBuildExtPIInterpHost(hypre_ParCSRMatrix   *A,
 
             diagonal = A_diag_data[A_diag_i[i]];
 
-            for (jj = A_diag_i[i]+1; jj < A_diag_i[i+1]; jj++)
-            { /* i1 is a c-point and strongly influences i, accumulate
-               * a_(i,i1) into interpolation weight */
+            for (jj = A_diag_i[i] + 1; jj < A_diag_i[i + 1]; jj++)
+            {
+               /* i1 is a c-point and strongly influences i, accumulate
+                * a_(i,i1) into interpolation weight */
                i1 = A_diag_j[jj];
                if (P_marker[i1] >= jj_begin_row)
                {
@@ -1631,47 +1648,53 @@ hypre_BoomerAMGBuildExtPIInterpHost(hypre_ParCSRMatrix   *A,
                {
                   sum = zero;
                   sgn = 1;
-                  if (A_diag_data[A_diag_i[i1]] < 0) sgn = -1;
+                  if (A_diag_data[A_diag_i[i1]] < 0) { sgn = -1; }
                   /* Loop over row of A for point i1 and calculate the sum
                    * of the connections to c-points that strongly influence i. */
-                  for (jj1 = A_diag_i[i1]+1; jj1 < A_diag_i[i1+1]; jj1++)
+                  for (jj1 = A_diag_i[i1] + 1; jj1 < A_diag_i[i1 + 1]; jj1++)
                   {
                      i2 = A_diag_j[jj1];
-                     if ((P_marker[i2] >= jj_begin_row || i2 == i) && (sgn*A_diag_data[jj1]) < 0)
+                     if ((P_marker[i2] >= jj_begin_row || i2 == i) && (sgn * A_diag_data[jj1]) < 0)
+                     {
                         sum += A_diag_data[jj1];
+                     }
                   }
                   if (num_procs > 1)
                   {
-                     for (jj1 = A_offd_i[i1]; jj1< A_offd_i[i1+1]; jj1++)
+                     for (jj1 = A_offd_i[i1]; jj1 < A_offd_i[i1 + 1]; jj1++)
                      {
                         i2 = A_offd_j[jj1];
                         if (P_marker_offd[i2] >= jj_begin_row_offd &&
-                              (sgn*A_offd_data[jj1]) < 0)
+                            (sgn * A_offd_data[jj1]) < 0)
+                        {
                            sum += A_offd_data[jj1];
+                        }
                      }
                   }
                   if (sum != 0)
                   {
-                     distribute = A_diag_data[jj]/sum;
+                     distribute = A_diag_data[jj] / sum;
                      /* Loop over row of A for point i1 and do the distribution */
-                     for (jj1 = A_diag_i[i1]+1; jj1 < A_diag_i[i1+1]; jj1++)
+                     for (jj1 = A_diag_i[i1] + 1; jj1 < A_diag_i[i1 + 1]; jj1++)
                      {
                         i2 = A_diag_j[jj1];
-                        if (P_marker[i2] >= jj_begin_row && (sgn*A_diag_data[jj1]) < 0)
+                        if (P_marker[i2] >= jj_begin_row && (sgn * A_diag_data[jj1]) < 0)
                            P_diag_data[P_marker[i2]] +=
-                              distribute*A_diag_data[jj1];
-                        if (i2 == i && (sgn*A_diag_data[jj1]) < 0)
-                           diagonal += distribute*A_diag_data[jj1];
+                              distribute * A_diag_data[jj1];
+                        if (i2 == i && (sgn * A_diag_data[jj1]) < 0)
+                        {
+                           diagonal += distribute * A_diag_data[jj1];
+                        }
                      }
                      if (num_procs > 1)
                      {
-                        for (jj1 = A_offd_i[i1]; jj1 < A_offd_i[i1+1]; jj1++)
+                        for (jj1 = A_offd_i[i1]; jj1 < A_offd_i[i1 + 1]; jj1++)
                         {
                            i2 = A_offd_j[jj1];
                            if (P_marker_offd[i2] >= jj_begin_row_offd &&
-                                 (sgn*A_offd_data[jj1]) < 0)
+                               (sgn * A_offd_data[jj1]) < 0)
                               P_offd_data[P_marker_offd[i2]] +=
-                                 distribute*A_offd_data[jj1];
+                                 distribute * A_offd_data[jj1];
                         }
                      }
                   }
@@ -1685,56 +1708,68 @@ hypre_BoomerAMGBuildExtPIInterpHost(hypre_ParCSRMatrix   *A,
                else if (CF_marker[i1] != -3)
                {
                   if (num_functions == 1 || dof_func[i] == dof_func[i1])
+                  {
                      diagonal += A_diag_data[jj];
+                  }
                }
             }
             if (num_procs > 1)
             {
-               for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+               for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
                {
                   i1 = A_offd_j[jj];
                   if (P_marker_offd[i1] >= jj_begin_row_offd)
+                  {
                      P_offd_data[P_marker_offd[i1]] += A_offd_data[jj];
+                  }
                   else if (P_marker_offd[i1] == strong_f_marker)
                   {
                      sum = zero;
-                     for (jj1 = A_ext_i[i1]; jj1 < A_ext_i[i1+1]; jj1++)
+                     for (jj1 = A_ext_i[i1]; jj1 < A_ext_i[i1 + 1]; jj1++)
                      {
                         big_k1 = A_ext_j[jj1];
                         if (big_k1 >= col_1 && big_k1 < col_n)
-                        { /* diag */
+                        {
+                           /* diag */
                            loc_col = (HYPRE_Int)(big_k1 - col_1);
                            if (P_marker[loc_col] >= jj_begin_row || loc_col == i)
+                           {
                               sum += A_ext_data[jj1];
+                           }
                         }
                         else
                         {
                            loc_col = (HYPRE_Int)(-big_k1 - 1);
                            if (P_marker_offd[loc_col] >= jj_begin_row_offd)
+                           {
                               sum += A_ext_data[jj1];
+                           }
                         }
                      }
                      if (sum != 0)
                      {
                         distribute = A_offd_data[jj] / sum;
-                        for (jj1 = A_ext_i[i1]; jj1 < A_ext_i[i1+1]; jj1++)
+                        for (jj1 = A_ext_i[i1]; jj1 < A_ext_i[i1 + 1]; jj1++)
                         {
                            big_k1 = A_ext_j[jj1];
                            if (big_k1 >= col_1 && big_k1 < col_n)
-                           { /* diag */
+                           {
+                              /* diag */
                               loc_col = (HYPRE_Int)(big_k1 - col_1);
                               if (P_marker[loc_col] >= jj_begin_row)
-                                 P_diag_data[P_marker[loc_col]] += distribute*
-                                    A_ext_data[jj1];
+                                 P_diag_data[P_marker[loc_col]] += distribute *
+                                                                   A_ext_data[jj1];
                               if (loc_col == i)
-                                 diagonal += distribute*A_ext_data[jj1];
+                              {
+                                 diagonal += distribute * A_ext_data[jj1];
+                              }
                            }
                            else
                            {
                               loc_col = (HYPRE_Int)(-big_k1 - 1);
                               if (P_marker_offd[loc_col] >= jj_begin_row_offd)
-                                 P_offd_data[P_marker_offd[loc_col]] += distribute*
-                                    A_ext_data[jj1];
+                                 P_offd_data[P_marker_offd[loc_col]] += distribute *
+                                                                        A_ext_data[jj1];
                            }
                         }
                      }
@@ -1746,16 +1781,22 @@ hypre_BoomerAMGBuildExtPIInterpHost(hypre_ParCSRMatrix   *A,
                   else if (CF_marker_offd[i1] != -3)
                   {
                      if (num_functions == 1 || dof_func[i] == dof_func_offd[i1])
+                     {
                         diagonal += A_offd_data[jj];
+                     }
                   }
                }
             }
             if (diagonal)
             {
                for (jj = jj_begin_row; jj < jj_end_row; jj++)
+               {
                   P_diag_data[jj] /= -diagonal;
+               }
                for (jj = jj_begin_row_offd; jj < jj_end_row_offd; jj++)
+               {
                   P_offd_data[jj] /= -diagonal;
+               }
             }
          }
          strong_f_marker--;
@@ -1778,11 +1819,11 @@ hypre_BoomerAMGBuildExtPIInterpHost(hypre_ParCSRMatrix   *A,
     *  End PAR_REGION
     *-----------------------------------------------------------------------*/
 
-   if (debug_flag==4)
+   if (debug_flag == 4)
    {
       wall_time = time_getWallclockSeconds() - wall_time;
       hypre_printf("Proc = %d     fill structure    %f\n",
-            my_id, wall_time);
+                   my_id, wall_time);
       fflush(NULL);
    }
    /*-----------------------------------------------------------------------
@@ -1841,9 +1882,9 @@ hypre_BoomerAMGBuildExtPIInterpHost(hypre_ParCSRMatrix   *A,
    hypre_MatvecCommPkgCreate(P);
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-   for (i=0; i < n_fine; i++)
+   for (i = 0; i < n_fine; i++)
    {
       if (CF_marker[i] == -3)
       {
@@ -1898,6 +1939,8 @@ hypre_BoomerAMGBuildExtPICCInterp(hypre_ParCSRMatrix  *A,
                                   HYPRE_Int            max_elmts,
                                   hypre_ParCSRMatrix **P_ptr)
 {
+   HYPRE_UNUSED_VAR(debug_flag);
+
    /* Communication Variables */
    MPI_Comm                 comm = hypre_ParCSRMatrixComm(A);
    hypre_ParCSRCommPkg     *comm_pkg = hypre_ParCSRMatrixCommPkg(A);
@@ -1957,10 +2000,10 @@ hypre_BoomerAMGBuildExtPICCInterp(hypre_ParCSRMatrix  *A,
    HYPRE_Int        common_c;
 
    /* Full row information for columns of A that are off diag*/
-   hypre_CSRMatrix *A_ext;
-   HYPRE_Real      *A_ext_data;
-   HYPRE_Int       *A_ext_i;
-   HYPRE_BigInt    *A_ext_j;
+   hypre_CSRMatrix *A_ext = NULL;
+   HYPRE_Real      *A_ext_data = NULL;
+   HYPRE_Int       *A_ext_i = NULL;
+   HYPRE_BigInt    *A_ext_j = NULL;
 
    HYPRE_Int       *fine_to_coarse = NULL;
    HYPRE_BigInt    *fine_to_coarse_offd = NULL;
@@ -1968,9 +2011,9 @@ hypre_BoomerAMGBuildExtPICCInterp(hypre_ParCSRMatrix  *A,
    HYPRE_Int        loc_col;
    HYPRE_Int        full_off_procNodes;
 
-   hypre_CSRMatrix *Sop;
-   HYPRE_Int       *Sop_i;
-   HYPRE_BigInt    *Sop_j;
+   hypre_CSRMatrix *Sop = NULL;
+   HYPRE_Int       *Sop_i = NULL;
+   HYPRE_BigInt    *Sop_j = NULL;
 
    HYPRE_Int        sgn = 1;
 
@@ -2001,11 +2044,11 @@ hypre_BoomerAMGBuildExtPICCInterp(hypre_ParCSRMatrix  *A,
 
    /* BEGIN */
    hypre_MPI_Comm_size(comm, &num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_rank(comm, &my_id);
 
    my_first_cpt = num_cpts_global[0];
-   if (my_id == (num_procs -1)) total_global_cpts = num_cpts_global[1];
-   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
+   if (my_id == (num_procs - 1)) { total_global_cpts = num_cpts_global[1]; }
+   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
 
    if (!comm_pkg)
    {
@@ -2019,8 +2062,8 @@ hypre_BoomerAMGBuildExtPICCInterp(hypre_ParCSRMatrix  *A,
    if (num_procs > 1)
    {
       hypre_exchange_interp_data(
-            &CF_marker_offd, &dof_func_offd, &A_ext, &full_off_procNodes, &Sop, &extend_comm_pkg,
-            A, CF_marker, S, num_functions, dof_func, 1);
+         &CF_marker_offd, &dof_func_offd, &A_ext, &full_off_procNodes, &Sop, &extend_comm_pkg,
+         A, CF_marker, S, num_functions, dof_func, 1);
       {
 #ifdef HYPRE_PROFILE
          hypre_profile_times[HYPRE_TIMER_ID_EXTENDED_I_INTERP] += hypre_MPI_Wtime();
@@ -2042,8 +2085,8 @@ hypre_BoomerAMGBuildExtPICCInterp(hypre_ParCSRMatrix  *A,
    /*-----------------------------------------------------------------------
     *  Intialize counters and allocate mapping vector.
     *-----------------------------------------------------------------------*/
-   P_diag_i = hypre_CTAlloc(HYPRE_Int, n_fine+1, memory_location_P);
-   P_offd_i = hypre_CTAlloc(HYPRE_Int, n_fine+1, memory_location_P);
+   P_diag_i = hypre_CTAlloc(HYPRE_Int, n_fine + 1, memory_location_P);
+   P_offd_i = hypre_CTAlloc(HYPRE_Int, n_fine + 1, memory_location_P);
 
    if (n_fine)
    {
@@ -2069,8 +2112,8 @@ hypre_BoomerAMGBuildExtPICCInterp(hypre_ParCSRMatrix  *A,
      }*/
 
    hypre_initialize_vecs(n_fine, full_off_procNodes, fine_to_coarse,
-         fine_to_coarse_offd, P_marker, P_marker_offd,
-         tmp_CF_marker_offd);
+                         fine_to_coarse_offd, P_marker, P_marker_offd,
+                         tmp_CF_marker_offd);
 
    jj_counter = start_indexing;
    jj_counter_offd = start_indexing;
@@ -2083,7 +2126,9 @@ hypre_BoomerAMGBuildExtPICCInterp(hypre_ParCSRMatrix  *A,
    {
       P_diag_i[i] = jj_counter;
       if (num_procs > 1)
+      {
          P_offd_i[i] = jj_counter_offd;
+      }
 
       if (CF_marker[i] >= 0)
       {
@@ -2102,11 +2147,13 @@ hypre_BoomerAMGBuildExtPICCInterp(hypre_ParCSRMatrix  *A,
          /* Initialize ccounter for each f point */
          /*ccounter = 0;
            ccounter_offd = 0;*/
-         for (jj = S_diag_i[i]; jj < S_diag_i[i+1]; jj++)
-         { /* search through diag to find all c neighbors */
+         for (jj = S_diag_i[i]; jj < S_diag_i[i + 1]; jj++)
+         {
+            /* search through diag to find all c neighbors */
             i1 = S_diag_j[jj];
             if (CF_marker[i1] > 0)
-            { /* i1 is a C point */
+            {
+               /* i1 is a C point */
                CF_marker[i1] = 2;
                if (P_marker[i1] < P_diag_i[i])
                {
@@ -2119,11 +2166,13 @@ hypre_BoomerAMGBuildExtPICCInterp(hypre_ParCSRMatrix  *A,
          /*qsort0(clist,0,ccounter-1);*/
          if (num_procs > 1)
          {
-            for (jj = S_offd_i[i]; jj < S_offd_i[i+1]; jj++)
-            { /* search through offd to find all c neighbors */
+            for (jj = S_offd_i[i]; jj < S_offd_i[i + 1]; jj++)
+            {
+               /* search through offd to find all c neighbors */
                i1 = S_offd_j[jj];
                if (CF_marker_offd[i1] > 0)
-               { /* i1 is a C point direct neighbor */
+               {
+                  /* i1 is a C point direct neighbor */
                   CF_marker_offd[i1] = 2;
                   if (P_marker_offd[i1] < P_offd_i[i])
                   {
@@ -2136,13 +2185,15 @@ hypre_BoomerAMGBuildExtPICCInterp(hypre_ParCSRMatrix  *A,
             }
             /*qsort0(clist_offd,0,ccounter_offd-1);*/
          }
-         for (jj = S_diag_i[i]; jj < S_diag_i[i+1]; jj++)
-         { /* Search diag to find f neighbors and determine if common c point */
+         for (jj = S_diag_i[i]; jj < S_diag_i[i + 1]; jj++)
+         {
+            /* Search diag to find f neighbors and determine if common c point */
             i1 = S_diag_j[jj];
             if (CF_marker[i1] == -1)
-            { /* i1 is a F point, loop through it's strong neighbors */
+            {
+               /* i1 is a F point, loop through it's strong neighbors */
                common_c = 0;
-               for (kk = S_diag_i[i1]; kk < S_diag_i[i1+1]; kk++)
+               for (kk = S_diag_i[i1]; kk < S_diag_i[i1 + 1]; kk++)
                {
                   k1 = S_diag_j[kk];
                   if (CF_marker[k1] == 2)
@@ -2156,13 +2207,15 @@ hypre_BoomerAMGBuildExtPICCInterp(hypre_ParCSRMatrix  *A,
                   }
                }
                if (num_procs > 1 && common_c == 0)
-               { /* no common c point yet, check offd */
-                  for (kk = S_offd_i[i1]; kk < S_offd_i[i1+1]; kk++)
+               {
+                  /* no common c point yet, check offd */
+                  for (kk = S_offd_i[i1]; kk < S_offd_i[i1 + 1]; kk++)
                   {
                      k1 = S_offd_j[kk];
 
                      if (CF_marker_offd[k1] == 2)
-                     { /* k1 is a c point check if it is common */
+                     {
+                        /* k1 is a c point check if it is common */
                         /*if (hypre_BinarySearch(clist_offd,k1,ccounter_offd) >= 0)
                           {*/
                         common_c = 1;
@@ -2173,8 +2226,9 @@ hypre_BoomerAMGBuildExtPICCInterp(hypre_ParCSRMatrix  *A,
                   }
                }
                if (!common_c)
-               { /* No common c point, extend the interp set */
-                  for (kk = S_diag_i[i1]; kk < S_diag_i[i1+1]; kk++)
+               {
+                  /* No common c point, extend the interp set */
+                  for (kk = S_diag_i[i1]; kk < S_diag_i[i1 + 1]; kk++)
                   {
                      k1 = S_diag_j[kk];
                      if (CF_marker[k1] > 0)
@@ -2189,7 +2243,7 @@ hypre_BoomerAMGBuildExtPICCInterp(hypre_ParCSRMatrix  *A,
                   }
                   if (num_procs > 1)
                   {
-                     for (kk = S_offd_i[i1]; kk < S_offd_i[i1+1]; kk++)
+                     for (kk = S_offd_i[i1]; kk < S_offd_i[i1 + 1]; kk++)
                      {
                         k1 = S_offd_j[kk];
                         if (CF_marker_offd[k1] >  0)
@@ -2210,20 +2264,23 @@ hypre_BoomerAMGBuildExtPICCInterp(hypre_ParCSRMatrix  *A,
          /* Look at off diag strong connections of i */
          if (num_procs > 1)
          {
-            for (jj = S_offd_i[i]; jj < S_offd_i[i+1]; jj++)
+            for (jj = S_offd_i[i]; jj < S_offd_i[i + 1]; jj++)
             {
                i1 = S_offd_j[jj];
                if (CF_marker_offd[i1] == -1)
-               { /* F point; look at neighbors of i1. Sop contains global col
-                  * numbers and entries that could be in S_diag or S_offd or
-                  * neither. */
+               {
+                  /* F point; look at neighbors of i1. Sop contains global col
+                   * numbers and entries that could be in S_diag or S_offd or
+                   * neither. */
                   common_c = 0;
-                  for (kk = Sop_i[i1]; kk < Sop_i[i1+1]; kk++)
-                  { /* Check if common c */
+                  for (kk = Sop_i[i1]; kk < Sop_i[i1 + 1]; kk++)
+                  {
+                     /* Check if common c */
                      big_k1 = Sop_j[kk];
                      if (big_k1 >= col_1 && big_k1 < col_n)
-                     { /* In S_diag */
-                        loc_col = (HYPRE_Int)(big_k1-col_1);
+                     {
+                        /* In S_diag */
+                        loc_col = (HYPRE_Int)(big_k1 - col_1);
                         if (CF_marker[loc_col] == 2)
                         {
                            /*if (hypre_BinarySearch(clist,loc_col,ccounter) >= 0)
@@ -2251,12 +2308,14 @@ hypre_BoomerAMGBuildExtPICCInterp(hypre_ParCSRMatrix  *A,
                   }
                   if (!common_c)
                   {
-                     for (kk = Sop_i[i1]; kk < Sop_i[i1+1]; kk++)
-                     { /* Check if common c */
+                     for (kk = Sop_i[i1]; kk < Sop_i[i1 + 1]; kk++)
+                     {
+                        /* Check if common c */
                         big_k1 = Sop_j[kk];
                         if (big_k1 >= col_1 && big_k1 < col_n)
-                        { /* In S_diag */
-                           loc_col = (HYPRE_Int)(big_k1-col_1);
+                        {
+                           /* In S_diag */
+                           loc_col = (HYPRE_Int)(big_k1 - col_1);
                            if (P_marker[loc_col] < P_diag_i[i])
                            {
                               P_marker[loc_col] = jj_counter;
@@ -2280,19 +2339,24 @@ hypre_BoomerAMGBuildExtPICCInterp(hypre_ParCSRMatrix  *A,
                }
             }
          }
-         for (jj = S_diag_i[i]; jj < S_diag_i[i+1]; jj++)
-         { /* search through diag to find all c neighbors */
+         for (jj = S_diag_i[i]; jj < S_diag_i[i + 1]; jj++)
+         {
+            /* search through diag to find all c neighbors */
             i1 = S_diag_j[jj];
             if (CF_marker[i1] == 2)
+            {
                CF_marker[i1] = 1;
+            }
          }
          if (num_procs > 1)
          {
-            for (jj = S_offd_i[i]; jj < S_offd_i[i+1]; jj++)
-            { /* search through offd to find all c neighbors */
+            for (jj = S_offd_i[i]; jj < S_offd_i[i + 1]; jj++)
+            {
+               /* search through offd to find all c neighbors */
                i1 = S_offd_j[jj];
                if (CF_marker_offd[i1] == 2)
-               { /* i1 is a C point direct neighbor */
+               {
+                  /* i1 is a C point direct neighbor */
                   CF_marker_offd[i1] = 1;
                }
             }
@@ -2331,15 +2395,19 @@ hypre_BoomerAMGBuildExtPICCInterp(hypre_ParCSRMatrix  *A,
    if (num_procs > 1)
    {
       hypre_big_insert_new_nodes(comm_pkg, extend_comm_pkg, fine_to_coarse,
-            full_off_procNodes, my_first_cpt,
-            fine_to_coarse_offd);
+                                 full_off_procNodes, my_first_cpt,
+                                 fine_to_coarse_offd);
    }
 
    for (i = 0; i < n_fine; i++)
+   {
       P_marker[i] = -1;
+   }
 
    for (i = 0; i < full_off_procNodes; i++)
+   {
       P_marker_offd[i] = -1;
+   }
 
    /*-----------------------------------------------------------------------
     *  Loop over fine grid points.
@@ -2348,7 +2416,9 @@ hypre_BoomerAMGBuildExtPICCInterp(hypre_ParCSRMatrix  *A,
    {
       jj_begin_row = jj_counter;
       if (num_procs > 1)
+      {
          jj_begin_row_offd = jj_counter_offd;
+      }
 
       /*--------------------------------------------------------------------
        *  If i is a c-point, interpolation is the identity.
@@ -2371,8 +2441,9 @@ hypre_BoomerAMGBuildExtPICCInterp(hypre_ParCSRMatrix  *A,
            ccounter_offd = 0;*/
          strong_f_marker--;
 
-         for (jj = S_diag_i[i]; jj < S_diag_i[i+1]; jj++)
-         { /* Search C points only */
+         for (jj = S_diag_i[i]; jj < S_diag_i[i + 1]; jj++)
+         {
+            /* Search C points only */
             i1 = S_diag_j[jj];
 
             /*--------------------------------------------------------------
@@ -2396,7 +2467,7 @@ hypre_BoomerAMGBuildExtPICCInterp(hypre_ParCSRMatrix  *A,
          /*qsort0(clist,0,ccounter-1);*/
          if ( num_procs > 1)
          {
-            for (jj=S_offd_i[i]; jj < S_offd_i[i+1]; jj++)
+            for (jj = S_offd_i[i]; jj < S_offd_i[i + 1]; jj++)
             {
                i1 = S_offd_j[jj];
                if ( CF_marker_offd[i1] > 0)
@@ -2415,14 +2486,15 @@ hypre_BoomerAMGBuildExtPICCInterp(hypre_ParCSRMatrix  *A,
             /*qsort0(clist_offd,0,ccounter_offd-1);*/
          }
 
-         for (jj = S_diag_i[i]; jj < S_diag_i[i+1]; jj++)
-         { /* Search through F points */
+         for (jj = S_diag_i[i]; jj < S_diag_i[i + 1]; jj++)
+         {
+            /* Search through F points */
             i1 = S_diag_j[jj];
             if (CF_marker[i1] == -1)
             {
                P_marker[i1] = strong_f_marker;
                common_c = 0;
-               for (kk = S_diag_i[i1]; kk < S_diag_i[i1+1]; kk++)
+               for (kk = S_diag_i[i1]; kk < S_diag_i[i1 + 1]; kk++)
                {
                   k1 = S_diag_j[kk];
                   if (CF_marker[k1] == 2)
@@ -2436,13 +2508,15 @@ hypre_BoomerAMGBuildExtPICCInterp(hypre_ParCSRMatrix  *A,
                   }
                }
                if (num_procs > 1 && common_c == 0)
-               { /* no common c point yet, check offd */
-                  for (kk = S_offd_i[i1]; kk < S_offd_i[i1+1]; kk++)
+               {
+                  /* no common c point yet, check offd */
+                  for (kk = S_offd_i[i1]; kk < S_offd_i[i1 + 1]; kk++)
                   {
                      k1 = S_offd_j[kk];
 
                      if (CF_marker_offd[k1] == 2)
-                     { /* k1 is a c point check if it is common */
+                     {
+                        /* k1 is a c point check if it is common */
                         /*if (hypre_BinarySearch(clist_offd,k1,ccounter_offd) >= 0)
                           {*/
                         common_c = 1;
@@ -2453,8 +2527,9 @@ hypre_BoomerAMGBuildExtPICCInterp(hypre_ParCSRMatrix  *A,
                   }
                }
                if (!common_c)
-               { /* No common c point, extend the interp set */
-                  for (kk = S_diag_i[i1]; kk < S_diag_i[i1+1]; kk++)
+               {
+                  /* No common c point, extend the interp set */
+                  for (kk = S_diag_i[i1]; kk < S_diag_i[i1 + 1]; kk++)
                   {
                      k1 = S_diag_j[kk];
                      if (CF_marker[k1] >= 0)
@@ -2471,7 +2546,7 @@ hypre_BoomerAMGBuildExtPICCInterp(hypre_ParCSRMatrix  *A,
                   }
                   if (num_procs > 1)
                   {
-                     for (kk = S_offd_i[i1]; kk < S_offd_i[i1+1]; kk++)
+                     for (kk = S_offd_i[i1]; kk < S_offd_i[i1 + 1]; kk++)
                      {
                         k1 = S_offd_j[kk];
                         if (CF_marker_offd[k1] >= 0)
@@ -2492,19 +2567,22 @@ hypre_BoomerAMGBuildExtPICCInterp(hypre_ParCSRMatrix  *A,
          }
          if ( num_procs > 1)
          {
-            for (jj=S_offd_i[i]; jj < S_offd_i[i+1]; jj++)
+            for (jj = S_offd_i[i]; jj < S_offd_i[i + 1]; jj++)
             {
                i1 = S_offd_j[jj];
                if (CF_marker_offd[i1] == -1)
-               { /* F points that are off proc */
+               {
+                  /* F points that are off proc */
                   P_marker_offd[i1] = strong_f_marker;
                   common_c = 0;
-                  for (kk = Sop_i[i1]; kk < Sop_i[i1+1]; kk++)
-                  { /* Check if common c */
+                  for (kk = Sop_i[i1]; kk < Sop_i[i1 + 1]; kk++)
+                  {
+                     /* Check if common c */
                      big_k1 = Sop_j[kk];
                      if (big_k1 >= col_1 && big_k1 < col_n)
-                     { /* In S_diag */
-                        loc_col = (HYPRE_Int)(big_k1-col_1);
+                     {
+                        /* In S_diag */
+                        loc_col = (HYPRE_Int)(big_k1 - col_1);
                         if (CF_marker[loc_col] == 2)
                         {
                            /*if (hypre_BinarySearch(clist,loc_col,ccounter) >= 0)
@@ -2532,13 +2610,13 @@ hypre_BoomerAMGBuildExtPICCInterp(hypre_ParCSRMatrix  *A,
                   }
                   if (!common_c)
                   {
-                     for (kk = Sop_i[i1]; kk < Sop_i[i1+1]; kk++)
+                     for (kk = Sop_i[i1]; kk < Sop_i[i1 + 1]; kk++)
                      {
                         big_k1 = Sop_j[kk];
                         /* Find local col number */
                         if (big_k1 >= col_1 && big_k1 < col_n)
                         {
-                           loc_col = (HYPRE_Int)(big_k1-col_1);
+                           loc_col = (HYPRE_Int)(big_k1 - col_1);
                            if (P_marker[loc_col] < jj_begin_row)
                            {
                               P_marker[loc_col] = jj_counter;
@@ -2554,7 +2632,7 @@ hypre_BoomerAMGBuildExtPICCInterp(hypre_ParCSRMatrix  *A,
                            if (P_marker_offd[loc_col] < jj_begin_row_offd)
                            {
                               P_marker_offd[loc_col] = jj_counter_offd;
-                              P_offd_j[jj_counter_offd]=loc_col;
+                              P_offd_j[jj_counter_offd] = loc_col;
                               P_offd_data[jj_counter_offd] = zero;
                               jj_counter_offd++;
                               /*break;*/
@@ -2565,8 +2643,9 @@ hypre_BoomerAMGBuildExtPICCInterp(hypre_ParCSRMatrix  *A,
                }
             }
          }
-         for (jj = S_diag_i[i]; jj < S_diag_i[i+1]; jj++)
-         { /* Search C points only */
+         for (jj = S_diag_i[i]; jj < S_diag_i[i + 1]; jj++)
+         {
+            /* Search C points only */
             i1 = S_diag_j[jj];
 
             /*--------------------------------------------------------------
@@ -2581,7 +2660,7 @@ hypre_BoomerAMGBuildExtPICCInterp(hypre_ParCSRMatrix  *A,
          }
          if ( num_procs > 1)
          {
-            for (jj=S_offd_i[i]; jj < S_offd_i[i+1]; jj++)
+            for (jj = S_offd_i[i]; jj < S_offd_i[i + 1]; jj++)
             {
                i1 = S_offd_j[jj];
                if ( CF_marker_offd[i1] == 2)
@@ -2596,9 +2675,10 @@ hypre_BoomerAMGBuildExtPICCInterp(hypre_ParCSRMatrix  *A,
          jj_end_row_offd = jj_counter_offd;
 
          diagonal = A_diag_data[A_diag_i[i]];
-         for (jj = A_diag_i[i]+1; jj < A_diag_i[i+1]; jj++)
-         { /* i1 is a c-point and strongly influences i, accumulate
-            * a_(i,i1) into interpolation weight */
+         for (jj = A_diag_i[i] + 1; jj < A_diag_i[i + 1]; jj++)
+         {
+            /* i1 is a c-point and strongly influences i, accumulate
+             * a_(i,i1) into interpolation weight */
             i1 = A_diag_j[jj];
             if (P_marker[i1] >= jj_begin_row)
             {
@@ -2608,139 +2688,167 @@ hypre_BoomerAMGBuildExtPICCInterp(hypre_ParCSRMatrix  *A,
             {
                sum = zero;
                sgn = 1;
-               if (A_diag_data[A_diag_i[i1]] < 0) sgn = -1;
-               for (jj1 = A_diag_i[i1]+1; jj1 < A_diag_i[i1+1]; jj1++)
+               if (A_diag_data[A_diag_i[i1]] < 0) { sgn = -1; }
+               for (jj1 = A_diag_i[i1] + 1; jj1 < A_diag_i[i1 + 1]; jj1++)
                {
                   i2 = A_diag_j[jj1];
-                  if ((P_marker[i2] >= jj_begin_row || i2 == i)  && (sgn*A_diag_data[jj1]) < 0)
+                  if ((P_marker[i2] >= jj_begin_row || i2 == i)  && (sgn * A_diag_data[jj1]) < 0)
+                  {
                      sum += A_diag_data[jj1];
+                  }
                }
                if (num_procs > 1)
                {
-                  for (jj1 = A_offd_i[i1]; jj1< A_offd_i[i1+1]; jj1++)
+                  for (jj1 = A_offd_i[i1]; jj1 < A_offd_i[i1 + 1]; jj1++)
                   {
                      i2 = A_offd_j[jj1];
                      if (P_marker_offd[i2] >= jj_begin_row_offd &&
-                           (sgn*A_offd_data[jj1]) < 0)
+                         (sgn * A_offd_data[jj1]) < 0)
+                     {
                         sum += A_offd_data[jj1];
+                     }
                   }
                }
                if (sum != 0)
                {
-                  distribute = A_diag_data[jj]/sum;
+                  distribute = A_diag_data[jj] / sum;
                   /* Loop over row of A for point i1 and do the distribution */
-                  for (jj1 = A_diag_i[i1]; jj1 < A_diag_i[i1+1]; jj1++)
+                  for (jj1 = A_diag_i[i1]; jj1 < A_diag_i[i1 + 1]; jj1++)
                   {
                      i2 = A_diag_j[jj1];
-                     if (P_marker[i2] >= jj_begin_row && (sgn*A_diag_data[jj1]) < 0)
+                     if (P_marker[i2] >= jj_begin_row && (sgn * A_diag_data[jj1]) < 0)
                         P_diag_data[P_marker[i2]] +=
-                           distribute*A_diag_data[jj1];
-                     if (i2 == i && (sgn*A_diag_data[jj1]) < 0)
-                        diagonal += distribute*A_diag_data[jj1];
+                           distribute * A_diag_data[jj1];
+                     if (i2 == i && (sgn * A_diag_data[jj1]) < 0)
+                     {
+                        diagonal += distribute * A_diag_data[jj1];
+                     }
                   }
                   if (num_procs > 1)
                   {
-                     for (jj1 = A_offd_i[i1]; jj1 < A_offd_i[i1+1]; jj1++)
+                     for (jj1 = A_offd_i[i1]; jj1 < A_offd_i[i1 + 1]; jj1++)
                      {
                         i2 = A_offd_j[jj1];
                         if (P_marker_offd[i2] >= jj_begin_row_offd &&
-                              (sgn*A_offd_data[jj1]) < 0)
+                            (sgn * A_offd_data[jj1]) < 0)
                            P_offd_data[P_marker_offd[i2]] +=
-                              distribute*A_offd_data[jj1];
+                              distribute * A_offd_data[jj1];
                      }
                   }
                }
                else
+               {
                   diagonal += A_diag_data[jj];
+               }
             }
             /* neighbor i1 weakly influences i, accumulate a_(i,i1) into
              * diagonal */
             else if (CF_marker[i1] != -3)
             {
                if (num_functions == 1 || dof_func[i] == dof_func[i1])
+               {
                   diagonal += A_diag_data[jj];
+               }
             }
          }
          if (num_procs > 1)
          {
-            for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+            for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
             {
                i1 = A_offd_j[jj];
                if (P_marker_offd[i1] >= jj_begin_row_offd)
+               {
                   P_offd_data[P_marker_offd[i1]] += A_offd_data[jj];
+               }
                else if (P_marker_offd[i1] == strong_f_marker)
                {
                   sum = zero;
                   sgn = 1;
-                  for (jj1 = A_ext_i[i1]; jj1 < A_ext_i[i1+1]; jj1++)
+                  for (jj1 = A_ext_i[i1]; jj1 < A_ext_i[i1 + 1]; jj1++)
                   {
                      big_k1 = A_ext_j[jj1];
                      if (big_k1 >= col_1 && big_k1 < col_n)
-                     { /* diag */
+                     {
+                        /* diag */
                         loc_col = (HYPRE_Int)(big_k1 - col_1);
                         if (P_marker[loc_col] >= jj_begin_row || loc_col == i)
+                        {
                            sum += A_ext_data[jj1];
+                        }
                      }
                      else
                      {
                         loc_col = (HYPRE_Int)(-big_k1 - 1);
                         if (P_marker_offd[loc_col] >= jj_begin_row_offd)
+                        {
                            sum += A_ext_data[jj1];
+                        }
                      }
                   }
                   if (sum != 0)
                   {
                      distribute = A_offd_data[jj] / sum;
-                     for (jj1 = A_ext_i[i1]; jj1 < A_ext_i[i1+1]; jj1++)
+                     for (jj1 = A_ext_i[i1]; jj1 < A_ext_i[i1 + 1]; jj1++)
                      {
                         big_k1 = A_ext_j[jj1];
                         if (big_k1 >= col_1 && big_k1 < col_n)
-                        { /* diag */
+                        {
+                           /* diag */
                            loc_col = (HYPRE_Int)(big_k1 - col_1);
                            if (P_marker[loc_col] >= jj_begin_row)
-                              P_diag_data[P_marker[loc_col]] += distribute*
-                                 A_ext_data[jj1];
+                              P_diag_data[P_marker[loc_col]] += distribute *
+                                                                A_ext_data[jj1];
                            if (loc_col == i)
-                              diagonal += distribute*A_ext_data[jj1];
+                           {
+                              diagonal += distribute * A_ext_data[jj1];
+                           }
                         }
                         else
                         {
                            loc_col = (HYPRE_Int)(-big_k1 - 1);
                            if (P_marker_offd[loc_col] >= jj_begin_row_offd)
-                              P_offd_data[P_marker_offd[loc_col]] += distribute*
-                                 A_ext_data[jj1];
+                              P_offd_data[P_marker_offd[loc_col]] += distribute *
+                                                                     A_ext_data[jj1];
                         }
                      }
                   }
                   else
+                  {
                      diagonal += A_offd_data[jj];
+                  }
                }
                else if (CF_marker_offd[i1] != -3)
                {
                   if (num_functions == 1 || dof_func[i] == dof_func_offd[i1])
+                  {
                      diagonal += A_offd_data[jj];
+                  }
                }
             }
          }
          if (diagonal)
          {
             for (jj = jj_begin_row; jj < jj_end_row; jj++)
+            {
                P_diag_data[jj] /= -diagonal;
+            }
             for (jj = jj_begin_row_offd; jj < jj_end_row_offd; jj++)
+            {
                P_offd_data[jj] /= -diagonal;
+            }
          }
       }
       strong_f_marker--;
    }
 
    P = hypre_ParCSRMatrixCreate(comm,
-         hypre_ParCSRMatrixGlobalNumRows(A),
-         total_global_cpts,
-         hypre_ParCSRMatrixColStarts(A),
-         num_cpts_global,
-         0,
-         P_diag_i[n_fine],
-         P_offd_i[n_fine]);
+                                hypre_ParCSRMatrixGlobalNumRows(A),
+                                total_global_cpts,
+                                hypre_ParCSRMatrixColStarts(A),
+                                num_cpts_global,
+                                0,
+                                P_diag_i[n_fine],
+                                P_offd_i[n_fine]);
 
    P_diag = hypre_ParCSRMatrixDiag(P);
    hypre_CSRMatrixData(P_diag) = P_diag_data;
@@ -2777,8 +2885,8 @@ hypre_BoomerAMGBuildExtPICCInterp(hypre_ParCSRMatrix  *A,
 
    hypre_MatvecCommPkgCreate(P);
 
-   for (i=0; i < n_fine; i++)
-      if (CF_marker[i] == -3) CF_marker[i] = -1;
+   for (i = 0; i < n_fine; i++)
+      if (CF_marker[i] == -3) { CF_marker[i] = -1; }
 
    *P_ptr = P;
 
@@ -2797,7 +2905,9 @@ hypre_BoomerAMGBuildExtPICCInterp(hypre_ParCSRMatrix  *A,
       hypre_TFree(CF_marker_offd, HYPRE_MEMORY_HOST);
       hypre_TFree(tmp_CF_marker_offd, HYPRE_MEMORY_HOST);
       if (num_functions > 1)
+      {
          hypre_TFree(dof_func_offd, HYPRE_MEMORY_HOST);
+      }
 
       hypre_MatvecCommPkgDestroy(extend_comm_pkg);
    }
@@ -2821,6 +2931,8 @@ hypre_BoomerAMGBuildFFInterp(hypre_ParCSRMatrix  *A,
                              HYPRE_Int            max_elmts,
                              hypre_ParCSRMatrix **P_ptr)
 {
+   HYPRE_UNUSED_VAR(debug_flag);
+
    /* Communication Variables */
    MPI_Comm                 comm = hypre_ParCSRMatrixComm(A);
    hypre_ParCSRCommPkg     *comm_pkg = hypre_ParCSRMatrixCommPkg(A);
@@ -2878,10 +2990,10 @@ hypre_BoomerAMGBuildFFInterp(hypre_ParCSRMatrix  *A,
    HYPRE_Int        common_c;
 
    /* Full row information for columns of A that are off diag*/
-   hypre_CSRMatrix *A_ext;
-   HYPRE_Real      *A_ext_data;
-   HYPRE_Int       *A_ext_i;
-   HYPRE_BigInt    *A_ext_j;
+   hypre_CSRMatrix *A_ext = NULL;
+   HYPRE_Real      *A_ext_data = NULL;
+   HYPRE_Int       *A_ext_i = NULL;
+   HYPRE_BigInt    *A_ext_j = NULL;
 
    HYPRE_Int       *fine_to_coarse = NULL;
    HYPRE_BigInt    *fine_to_coarse_offd = NULL;
@@ -2889,9 +3001,9 @@ hypre_BoomerAMGBuildFFInterp(hypre_ParCSRMatrix  *A,
    HYPRE_Int        loc_col;
    HYPRE_Int        full_off_procNodes;
 
-   hypre_CSRMatrix *Sop;
-   HYPRE_Int       *Sop_i;
-   HYPRE_BigInt    *Sop_j;
+   hypre_CSRMatrix *Sop = NULL;
+   HYPRE_Int       *Sop_i = NULL;
+   HYPRE_BigInt    *Sop_j = NULL;
 
    /* Variables to keep count of interpolatory points */
    HYPRE_Int        jj_counter, jj_counter_offd;
@@ -2921,11 +3033,11 @@ hypre_BoomerAMGBuildFFInterp(hypre_ParCSRMatrix  *A,
 
    /* BEGIN */
    hypre_MPI_Comm_size(comm, &num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_rank(comm, &my_id);
 
    my_first_cpt = num_cpts_global[0];
-   if (my_id == (num_procs -1)) total_global_cpts = num_cpts_global[1];
-   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
+   if (my_id == (num_procs - 1)) { total_global_cpts = num_cpts_global[1]; }
+   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
 
    if (!comm_pkg)
    {
@@ -2939,8 +3051,8 @@ hypre_BoomerAMGBuildFFInterp(hypre_ParCSRMatrix  *A,
    if (num_procs > 1)
    {
       hypre_exchange_interp_data(
-            &CF_marker_offd, &dof_func_offd, &A_ext, &full_off_procNodes, &Sop, &extend_comm_pkg,
-            A, CF_marker, S, num_functions, dof_func, 1);
+         &CF_marker_offd, &dof_func_offd, &A_ext, &full_off_procNodes, &Sop, &extend_comm_pkg,
+         A, CF_marker, S, num_functions, dof_func, 1);
       {
 #ifdef HYPRE_PROFILE
          hypre_profile_times[HYPRE_TIMER_ID_EXTENDED_I_INTERP] += hypre_MPI_Wtime();
@@ -2962,8 +3074,8 @@ hypre_BoomerAMGBuildFFInterp(hypre_ParCSRMatrix  *A,
    /*-----------------------------------------------------------------------
     *  Intialize counters and allocate mapping vector.
     *-----------------------------------------------------------------------*/
-   P_diag_i    = hypre_CTAlloc(HYPRE_Int, n_fine+1, memory_location_P);
-   P_offd_i    = hypre_CTAlloc(HYPRE_Int, n_fine+1, memory_location_P);
+   P_diag_i    = hypre_CTAlloc(HYPRE_Int, n_fine + 1, memory_location_P);
+   P_offd_i    = hypre_CTAlloc(HYPRE_Int, n_fine + 1, memory_location_P);
 
    if (n_fine)
    {
@@ -2979,8 +3091,8 @@ hypre_BoomerAMGBuildFFInterp(hypre_ParCSRMatrix  *A,
    }
 
    hypre_initialize_vecs(n_fine, full_off_procNodes, fine_to_coarse,
-         fine_to_coarse_offd, P_marker, P_marker_offd,
-         tmp_CF_marker_offd);
+                         fine_to_coarse_offd, P_marker, P_marker_offd,
+                         tmp_CF_marker_offd);
 
    jj_counter = start_indexing;
    jj_counter_offd = start_indexing;
@@ -2993,7 +3105,9 @@ hypre_BoomerAMGBuildFFInterp(hypre_ParCSRMatrix  *A,
    {
       P_diag_i[i] = jj_counter;
       if (num_procs > 1)
+      {
          P_offd_i[i] = jj_counter_offd;
+      }
 
       if (CF_marker[i] >= 0)
       {
@@ -3012,11 +3126,13 @@ hypre_BoomerAMGBuildFFInterp(hypre_ParCSRMatrix  *A,
          /* Initialize ccounter for each f point */
          /*ccounter = 0;
            ccounter_offd = 0;*/
-         for (jj = S_diag_i[i]; jj < S_diag_i[i+1]; jj++)
-         { /* search through diag to find all c neighbors */
+         for (jj = S_diag_i[i]; jj < S_diag_i[i + 1]; jj++)
+         {
+            /* search through diag to find all c neighbors */
             i1 = S_diag_j[jj];
             if (CF_marker[i1] > 0)
-            { /* i1 is a C point */
+            {
+               /* i1 is a C point */
                CF_marker[i1] = 2;
                if (P_marker[i1] < P_diag_i[i])
                {
@@ -3027,11 +3143,13 @@ hypre_BoomerAMGBuildFFInterp(hypre_ParCSRMatrix  *A,
          }
          if (num_procs > 1)
          {
-            for (jj = S_offd_i[i]; jj < S_offd_i[i+1]; jj++)
-            { /* search through offd to find all c neighbors */
+            for (jj = S_offd_i[i]; jj < S_offd_i[i + 1]; jj++)
+            {
+               /* search through offd to find all c neighbors */
                i1 = S_offd_j[jj];
                if (CF_marker_offd[i1] > 0)
-               { /* i1 is a C point direct neighbor */
+               {
+                  /* i1 is a C point direct neighbor */
                   CF_marker_offd[i1] = 2;
                   if (P_marker_offd[i1] < P_offd_i[i])
                   {
@@ -3042,13 +3160,15 @@ hypre_BoomerAMGBuildFFInterp(hypre_ParCSRMatrix  *A,
                }
             }
          }
-         for (jj = S_diag_i[i]; jj < S_diag_i[i+1]; jj++)
-         { /* Search diag to find f neighbors and determine if common c point */
+         for (jj = S_diag_i[i]; jj < S_diag_i[i + 1]; jj++)
+         {
+            /* Search diag to find f neighbors and determine if common c point */
             i1 = S_diag_j[jj];
             if (CF_marker[i1] < 0)
-            { /* i1 is a F point, loop through it's strong neighbors */
+            {
+               /* i1 is a F point, loop through it's strong neighbors */
                common_c = 0;
-               for (kk = S_diag_i[i1]; kk < S_diag_i[i1+1]; kk++)
+               for (kk = S_diag_i[i1]; kk < S_diag_i[i1 + 1]; kk++)
                {
                   k1 = S_diag_j[kk];
                   if (CF_marker[k1] == 2)
@@ -3058,8 +3178,9 @@ hypre_BoomerAMGBuildFFInterp(hypre_ParCSRMatrix  *A,
                   }
                }
                if (num_procs > 1 && common_c == 0)
-               { /* no common c point yet, check offd */
-                  for (kk = S_offd_i[i1]; kk < S_offd_i[i1+1]; kk++)
+               {
+                  /* no common c point yet, check offd */
+                  for (kk = S_offd_i[i1]; kk < S_offd_i[i1 + 1]; kk++)
                   {
                      k1 = S_offd_j[kk];
 
@@ -3071,8 +3192,9 @@ hypre_BoomerAMGBuildFFInterp(hypre_ParCSRMatrix  *A,
                   }
                }
                if (!common_c)
-               { /* No common c point, extend the interp set */
-                  for (kk = S_diag_i[i1]; kk < S_diag_i[i1+1]; kk++)
+               {
+                  /* No common c point, extend the interp set */
+                  for (kk = S_diag_i[i1]; kk < S_diag_i[i1 + 1]; kk++)
                   {
                      k1 = S_diag_j[kk];
                      if (CF_marker[k1] > 0)
@@ -3086,7 +3208,7 @@ hypre_BoomerAMGBuildFFInterp(hypre_ParCSRMatrix  *A,
                   }
                   if (num_procs > 1)
                   {
-                     for (kk = S_offd_i[i1]; kk < S_offd_i[i1+1]; kk++)
+                     for (kk = S_offd_i[i1]; kk < S_offd_i[i1 + 1]; kk++)
                      {
                         k1 = S_offd_j[kk];
                         if (CF_marker_offd[k1] >  0)
@@ -3106,20 +3228,23 @@ hypre_BoomerAMGBuildFFInterp(hypre_ParCSRMatrix  *A,
          /* Look at off diag strong connections of i */
          if (num_procs > 1)
          {
-            for (jj = S_offd_i[i]; jj < S_offd_i[i+1]; jj++)
+            for (jj = S_offd_i[i]; jj < S_offd_i[i + 1]; jj++)
             {
                i1 = S_offd_j[jj];
                if (CF_marker_offd[i1] < 0)
-               { /* F point; look at neighbors of i1. Sop contains global col
-                  * numbers and entries that could be in S_diag or S_offd or
-                  * neither. */
+               {
+                  /* F point; look at neighbors of i1. Sop contains global col
+                   * numbers and entries that could be in S_diag or S_offd or
+                   * neither. */
                   common_c = 0;
-                  for (kk = Sop_i[i1]; kk < Sop_i[i1+1]; kk++)
-                  { /* Check if common c */
+                  for (kk = Sop_i[i1]; kk < Sop_i[i1 + 1]; kk++)
+                  {
+                     /* Check if common c */
                      big_k1 = Sop_j[kk];
                      if (big_k1 >= col_1 && big_k1 < col_n)
-                     { /* In S_diag */
-                        loc_col = (HYPRE_Int)(big_k1-col_1);
+                     {
+                        /* In S_diag */
+                        loc_col = (HYPRE_Int)(big_k1 - col_1);
                         if (CF_marker[loc_col] == 2)
                         {
                            common_c = 1;
@@ -3138,12 +3263,14 @@ hypre_BoomerAMGBuildFFInterp(hypre_ParCSRMatrix  *A,
                   }
                   if (!common_c)
                   {
-                     for (kk = Sop_i[i1]; kk < Sop_i[i1+1]; kk++)
-                     { /* Check if common c */
+                     for (kk = Sop_i[i1]; kk < Sop_i[i1 + 1]; kk++)
+                     {
+                        /* Check if common c */
                         big_k1 = Sop_j[kk];
                         if (big_k1 >= col_1 && big_k1 < col_n)
-                        { /* In S_diag */
-                           loc_col = (HYPRE_Int)(big_k1-col_1);
+                        {
+                           /* In S_diag */
+                           loc_col = (HYPRE_Int)(big_k1 - col_1);
                            if (P_marker[loc_col] < P_diag_i[i])
                            {
                               P_marker[loc_col] = jj_counter;
@@ -3165,19 +3292,24 @@ hypre_BoomerAMGBuildFFInterp(hypre_ParCSRMatrix  *A,
                }
             }
          }
-         for (jj = S_diag_i[i]; jj < S_diag_i[i+1]; jj++)
-         { /* search through diag to find all c neighbors */
+         for (jj = S_diag_i[i]; jj < S_diag_i[i + 1]; jj++)
+         {
+            /* search through diag to find all c neighbors */
             i1 = S_diag_j[jj];
             if (CF_marker[i1] == 2)
+            {
                CF_marker[i1] = 1;
+            }
          }
          if (num_procs > 1)
          {
-            for (jj = S_offd_i[i]; jj < S_offd_i[i+1]; jj++)
-            { /* search through offd to find all c neighbors */
+            for (jj = S_offd_i[i]; jj < S_offd_i[i + 1]; jj++)
+            {
+               /* search through offd to find all c neighbors */
                i1 = S_offd_j[jj];
                if (CF_marker_offd[i1] == 2)
-               { /* i1 is a C point direct neighbor */
+               {
+                  /* i1 is a C point direct neighbor */
                   CF_marker_offd[i1] = 1;
                }
             }
@@ -3216,15 +3348,19 @@ hypre_BoomerAMGBuildFFInterp(hypre_ParCSRMatrix  *A,
    if (num_procs > 1)
    {
       hypre_big_insert_new_nodes(comm_pkg, extend_comm_pkg, fine_to_coarse,
-            full_off_procNodes, my_first_cpt,
-            fine_to_coarse_offd);
+                                 full_off_procNodes, my_first_cpt,
+                                 fine_to_coarse_offd);
    }
 
    for (i = 0; i < n_fine; i++)
+   {
       P_marker[i] = -1;
+   }
 
    for (i = 0; i < full_off_procNodes; i++)
+   {
       P_marker_offd[i] = -1;
+   }
 
    /*-----------------------------------------------------------------------
     *  Loop over fine grid points.
@@ -3234,7 +3370,9 @@ hypre_BoomerAMGBuildFFInterp(hypre_ParCSRMatrix  *A,
    {
       jj_begin_row = jj_counter;
       if (num_procs > 1)
+      {
          jj_begin_row_offd = jj_counter_offd;
+      }
 
       /*--------------------------------------------------------------------
        *  If i is a c-point, interpolation is the identity.
@@ -3257,8 +3395,9 @@ hypre_BoomerAMGBuildFFInterp(hypre_ParCSRMatrix  *A,
            ccounter_offd = 0;*/
          strong_f_marker--;
 
-         for (jj = S_diag_i[i]; jj < S_diag_i[i+1]; jj++)
-         { /* Search C points only */
+         for (jj = S_diag_i[i]; jj < S_diag_i[i + 1]; jj++)
+         {
+            /* Search C points only */
             i1 = S_diag_j[jj];
 
             /*--------------------------------------------------------------
@@ -3280,7 +3419,7 @@ hypre_BoomerAMGBuildFFInterp(hypre_ParCSRMatrix  *A,
          }
          if ( num_procs > 1)
          {
-            for (jj=S_offd_i[i]; jj < S_offd_i[i+1]; jj++)
+            for (jj = S_offd_i[i]; jj < S_offd_i[i + 1]; jj++)
             {
                i1 = S_offd_j[jj];
                if ( CF_marker_offd[i1] > 0)
@@ -3297,14 +3436,15 @@ hypre_BoomerAMGBuildFFInterp(hypre_ParCSRMatrix  *A,
             }
          }
 
-         for (jj = S_diag_i[i]; jj < S_diag_i[i+1]; jj++)
-         { /* Search through F points */
+         for (jj = S_diag_i[i]; jj < S_diag_i[i + 1]; jj++)
+         {
+            /* Search through F points */
             i1 = S_diag_j[jj];
             if (CF_marker[i1] == -1)
             {
                P_marker[i1] = strong_f_marker;
                common_c = 0;
-               for (kk = S_diag_i[i1]; kk < S_diag_i[i1+1]; kk++)
+               for (kk = S_diag_i[i1]; kk < S_diag_i[i1 + 1]; kk++)
                {
                   k1 = S_diag_j[kk];
                   if (CF_marker[k1] == 2)
@@ -3314,8 +3454,9 @@ hypre_BoomerAMGBuildFFInterp(hypre_ParCSRMatrix  *A,
                   }
                }
                if (num_procs > 1 && common_c == 0)
-               { /* no common c point yet, check offd */
-                  for (kk = S_offd_i[i1]; kk < S_offd_i[i1+1]; kk++)
+               {
+                  /* no common c point yet, check offd */
+                  for (kk = S_offd_i[i1]; kk < S_offd_i[i1 + 1]; kk++)
                   {
                      k1 = S_offd_j[kk];
 
@@ -3327,8 +3468,9 @@ hypre_BoomerAMGBuildFFInterp(hypre_ParCSRMatrix  *A,
                   }
                }
                if (!common_c)
-               { /* No common c point, extend the interp set */
-                  for (kk = S_diag_i[i1]; kk < S_diag_i[i1+1]; kk++)
+               {
+                  /* No common c point, extend the interp set */
+                  for (kk = S_diag_i[i1]; kk < S_diag_i[i1 + 1]; kk++)
                   {
                      k1 = S_diag_j[kk];
                      if (CF_marker[k1] >= 0)
@@ -3344,7 +3486,7 @@ hypre_BoomerAMGBuildFFInterp(hypre_ParCSRMatrix  *A,
                   }
                   if (num_procs > 1)
                   {
-                     for (kk = S_offd_i[i1]; kk < S_offd_i[i1+1]; kk++)
+                     for (kk = S_offd_i[i1]; kk < S_offd_i[i1 + 1]; kk++)
                      {
                         k1 = S_offd_j[kk];
                         if (CF_marker_offd[k1] >= 0)
@@ -3364,19 +3506,22 @@ hypre_BoomerAMGBuildFFInterp(hypre_ParCSRMatrix  *A,
          }
          if ( num_procs > 1)
          {
-            for (jj=S_offd_i[i]; jj < S_offd_i[i+1]; jj++)
+            for (jj = S_offd_i[i]; jj < S_offd_i[i + 1]; jj++)
             {
                i1 = S_offd_j[jj];
                if (CF_marker_offd[i1] == -1)
-               { /* F points that are off proc */
+               {
+                  /* F points that are off proc */
                   P_marker_offd[i1] = strong_f_marker;
                   common_c = 0;
-                  for (kk = Sop_i[i1]; kk < Sop_i[i1+1]; kk++)
-                  { /* Check if common c */
+                  for (kk = Sop_i[i1]; kk < Sop_i[i1 + 1]; kk++)
+                  {
+                     /* Check if common c */
                      big_k1 = Sop_j[kk];
                      if (big_k1 >= col_1 && big_k1 < col_n)
-                     { /* In S_diag */
-                        loc_col = (HYPRE_Int)(big_k1-col_1);
+                     {
+                        /* In S_diag */
+                        loc_col = (HYPRE_Int)(big_k1 - col_1);
                         if (CF_marker[loc_col] == 2)
                         {
                            common_c = 1;
@@ -3395,13 +3540,13 @@ hypre_BoomerAMGBuildFFInterp(hypre_ParCSRMatrix  *A,
                   }
                   if (!common_c)
                   {
-                     for (kk = Sop_i[i1]; kk < Sop_i[i1+1]; kk++)
+                     for (kk = Sop_i[i1]; kk < Sop_i[i1 + 1]; kk++)
                      {
                         big_k1 = Sop_j[kk];
                         /* Find local col number */
                         if (big_k1 >= col_1 && big_k1 < col_n)
                         {
-                           loc_col = (HYPRE_Int)(big_k1-col_1);
+                           loc_col = (HYPRE_Int)(big_k1 - col_1);
                            if (P_marker[loc_col] < jj_begin_row)
                            {
                               P_marker[loc_col] = jj_counter;
@@ -3416,7 +3561,7 @@ hypre_BoomerAMGBuildFFInterp(hypre_ParCSRMatrix  *A,
                            if (P_marker_offd[loc_col] < jj_begin_row_offd)
                            {
                               P_marker_offd[loc_col] = jj_counter_offd;
-                              P_offd_j[jj_counter_offd]=loc_col;
+                              P_offd_j[jj_counter_offd] = loc_col;
                               P_offd_data[jj_counter_offd] = zero;
                               jj_counter_offd++;
                            }
@@ -3426,8 +3571,9 @@ hypre_BoomerAMGBuildFFInterp(hypre_ParCSRMatrix  *A,
                }
             }
          }
-         for (jj = S_diag_i[i]; jj < S_diag_i[i+1]; jj++)
-         { /* Search C points only */
+         for (jj = S_diag_i[i]; jj < S_diag_i[i + 1]; jj++)
+         {
+            /* Search C points only */
             i1 = S_diag_j[jj];
 
             /*--------------------------------------------------------------
@@ -3442,7 +3588,7 @@ hypre_BoomerAMGBuildFFInterp(hypre_ParCSRMatrix  *A,
          }
          if ( num_procs > 1)
          {
-            for (jj=S_offd_i[i]; jj < S_offd_i[i+1]; jj++)
+            for (jj = S_offd_i[i]; jj < S_offd_i[i + 1]; jj++)
             {
                i1 = S_offd_j[jj];
                if ( CF_marker_offd[i1] == 2)
@@ -3457,9 +3603,10 @@ hypre_BoomerAMGBuildFFInterp(hypre_ParCSRMatrix  *A,
          jj_end_row_offd = jj_counter_offd;
 
          diagonal = A_diag_data[A_diag_i[i]];
-         for (jj = A_diag_i[i]+1; jj < A_diag_i[i+1]; jj++)
-         { /* i1 is a c-point and strongly influences i, accumulate
-            * a_(i,i1) into interpolation weight */
+         for (jj = A_diag_i[i] + 1; jj < A_diag_i[i + 1]; jj++)
+         {
+            /* i1 is a c-point and strongly influences i, accumulate
+             * a_(i,i1) into interpolation weight */
             i1 = A_diag_j[jj];
             if (P_marker[i1] >= jj_begin_row)
             {
@@ -3468,136 +3615,160 @@ hypre_BoomerAMGBuildFFInterp(hypre_ParCSRMatrix  *A,
             else if (P_marker[i1] == strong_f_marker)
             {
                sum = zero;
-               if (A_diag_data[A_diag_i[i1]] < 0) sgn = -1;
+               if (A_diag_data[A_diag_i[i1]] < 0) { sgn = -1; }
                /* Loop over row of A for point i1 and calculate the sum
                 * of the connections to c-points that strongly incluence i. */
-               for (jj1 = A_diag_i[i1]; jj1 < A_diag_i[i1+1]; jj1++)
+               for (jj1 = A_diag_i[i1]; jj1 < A_diag_i[i1 + 1]; jj1++)
                {
                   i2 = A_diag_j[jj1];
-                  if (P_marker[i2] >= jj_begin_row && (sgn*A_diag_data[jj1]) < 0)
+                  if (P_marker[i2] >= jj_begin_row && (sgn * A_diag_data[jj1]) < 0)
+                  {
                      sum += A_diag_data[jj1];
+                  }
                }
                if (num_procs > 1)
                {
-                  for (jj1 = A_offd_i[i1]; jj1< A_offd_i[i1+1]; jj1++)
+                  for (jj1 = A_offd_i[i1]; jj1 < A_offd_i[i1 + 1]; jj1++)
                   {
                      i2 = A_offd_j[jj1];
                      if (P_marker_offd[i2] >= jj_begin_row_offd &&
-                           (sgn*A_offd_data[jj1]) < 0)
+                         (sgn * A_offd_data[jj1]) < 0)
+                     {
                         sum += A_offd_data[jj1];
+                     }
                   }
                }
                if (sum != 0)
                {
-                  distribute = A_diag_data[jj]/sum;
+                  distribute = A_diag_data[jj] / sum;
                   /* Loop over row of A for point i1 and do the distribution */
-                  for (jj1 = A_diag_i[i1]; jj1 < A_diag_i[i1+1]; jj1++)
+                  for (jj1 = A_diag_i[i1]; jj1 < A_diag_i[i1 + 1]; jj1++)
                   {
                      i2 = A_diag_j[jj1];
-                     if (P_marker[i2] >= jj_begin_row && (sgn*A_diag_data[jj1]) < 0)
+                     if (P_marker[i2] >= jj_begin_row && (sgn * A_diag_data[jj1]) < 0)
                         P_diag_data[P_marker[i2]] +=
-                           distribute*A_diag_data[jj1];
+                           distribute * A_diag_data[jj1];
                   }
                   if (num_procs > 1)
                   {
-                     for (jj1 = A_offd_i[i1]; jj1 < A_offd_i[i1+1]; jj1++)
+                     for (jj1 = A_offd_i[i1]; jj1 < A_offd_i[i1 + 1]; jj1++)
                      {
                         i2 = A_offd_j[jj1];
                         if (P_marker_offd[i2] >= jj_begin_row_offd &&
-                              (sgn*A_offd_data[jj1]) < 0)
+                            (sgn * A_offd_data[jj1]) < 0)
                            P_offd_data[P_marker_offd[i2]] +=
-                              distribute*A_offd_data[jj1];
+                              distribute * A_offd_data[jj1];
                      }
                   }
                }
                else
+               {
                   diagonal += A_diag_data[jj];
+               }
             }
             /* neighbor i1 weakly influences i, accumulate a_(i,i1) into
              * diagonal */
             else if (CF_marker[i1] != -3)
             {
                if (num_functions == 1 || dof_func[i] == dof_func[i1])
+               {
                   diagonal += A_diag_data[jj];
+               }
             }
          }
          if (num_procs > 1)
          {
-            for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+            for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
             {
                i1 = A_offd_j[jj];
                if (P_marker_offd[i1] >= jj_begin_row_offd)
+               {
                   P_offd_data[P_marker_offd[i1]] += A_offd_data[jj];
+               }
                else if (P_marker_offd[i1] == strong_f_marker)
                {
                   sum = zero;
-                  for (jj1 = A_ext_i[i1]; jj1 < A_ext_i[i1+1]; jj1++)
+                  for (jj1 = A_ext_i[i1]; jj1 < A_ext_i[i1 + 1]; jj1++)
                   {
                      big_k1 = A_ext_j[jj1];
                      if (big_k1 >= col_1 && big_k1 < col_n)
-                     { /* diag */
+                     {
+                        /* diag */
                         loc_col = (HYPRE_Int)(big_k1 - col_1);
                         if (P_marker[loc_col] >= jj_begin_row)
+                        {
                            sum += A_ext_data[jj1];
+                        }
                      }
                      else
                      {
                         loc_col = -(HYPRE_Int)big_k1 - 1;
                         if (P_marker_offd[loc_col] >= jj_begin_row_offd)
+                        {
                            sum += A_ext_data[jj1];
+                        }
                      }
                   }
                   if (sum != 0)
                   {
                      distribute = A_offd_data[jj] / sum;
-                     for (jj1 = A_ext_i[i1]; jj1 < A_ext_i[i1+1]; jj1++)
+                     for (jj1 = A_ext_i[i1]; jj1 < A_ext_i[i1 + 1]; jj1++)
                      {
                         big_k1 = A_ext_j[jj1];
                         if (big_k1 >= col_1 && big_k1 < col_n)
-                        { /* diag */
+                        {
+                           /* diag */
                            loc_col = (HYPRE_Int)(big_k1 - col_1);
                            if (P_marker[loc_col] >= jj_begin_row)
-                              P_diag_data[P_marker[loc_col]] += distribute*
-                                 A_ext_data[jj1];
+                              P_diag_data[P_marker[loc_col]] += distribute *
+                                                                A_ext_data[jj1];
                         }
                         else
                         {
                            loc_col = -(HYPRE_Int)big_k1 - 1;
                            if (P_marker_offd[loc_col] >= jj_begin_row_offd)
-                              P_offd_data[P_marker_offd[loc_col]] += distribute*
-                                 A_ext_data[jj1];
+                              P_offd_data[P_marker_offd[loc_col]] += distribute *
+                                                                     A_ext_data[jj1];
                         }
                      }
                   }
                   else
+                  {
                      diagonal += A_offd_data[jj];
+                  }
                }
                else if (CF_marker_offd[i1] != -3)
                {
                   if (num_functions == 1 || dof_func[i] == dof_func_offd[i1])
+                  {
                      diagonal += A_offd_data[jj];
+                  }
                }
             }
          }
          if (diagonal)
          {
             for (jj = jj_begin_row; jj < jj_end_row; jj++)
+            {
                P_diag_data[jj] /= -diagonal;
+            }
             for (jj = jj_begin_row_offd; jj < jj_end_row_offd; jj++)
+            {
                P_offd_data[jj] /= -diagonal;
+            }
          }
       }
       strong_f_marker--;
    }
 
    P = hypre_ParCSRMatrixCreate(comm,
-         hypre_ParCSRMatrixGlobalNumRows(A),
-         total_global_cpts,
-         hypre_ParCSRMatrixColStarts(A),
-         num_cpts_global,
-         0,
-         P_diag_i[n_fine],
-         P_offd_i[n_fine]);
+                                hypre_ParCSRMatrixGlobalNumRows(A),
+                                total_global_cpts,
+                                hypre_ParCSRMatrixColStarts(A),
+                                num_cpts_global,
+                                0,
+                                P_diag_i[n_fine],
+                                P_offd_i[n_fine]);
 
    P_diag = hypre_ParCSRMatrixDiag(P);
    hypre_CSRMatrixData(P_diag) = P_diag_data;
@@ -3634,8 +3805,8 @@ hypre_BoomerAMGBuildFFInterp(hypre_ParCSRMatrix  *A,
 
    hypre_MatvecCommPkgCreate(P);
 
-   for (i=0; i < n_fine; i++)
-      if (CF_marker[i] == -3) CF_marker[i] = -1;
+   for (i = 0; i < n_fine; i++)
+      if (CF_marker[i] == -3) { CF_marker[i] = -1; }
 
    *P_ptr = P;
 
@@ -3652,7 +3823,9 @@ hypre_BoomerAMGBuildFFInterp(hypre_ParCSRMatrix  *A,
       hypre_TFree(CF_marker_offd, HYPRE_MEMORY_HOST);
       hypre_TFree(tmp_CF_marker_offd, HYPRE_MEMORY_HOST);
       if (num_functions > 1)
+      {
          hypre_TFree(dof_func_offd, HYPRE_MEMORY_HOST);
+      }
 
       hypre_MatvecCommPkgDestroy(extend_comm_pkg);
 
@@ -3677,6 +3850,8 @@ hypre_BoomerAMGBuildFF1Interp(hypre_ParCSRMatrix  *A,
                               HYPRE_Int            max_elmts,
                               hypre_ParCSRMatrix **P_ptr)
 {
+   HYPRE_UNUSED_VAR(debug_flag);
+
    /* Communication Variables */
    MPI_Comm                 comm = hypre_ParCSRMatrixComm(A);
    hypre_ParCSRCommPkg     *comm_pkg = hypre_ParCSRMatrixCommPkg(A);
@@ -3734,10 +3909,10 @@ hypre_BoomerAMGBuildFF1Interp(hypre_ParCSRMatrix  *A,
    HYPRE_Int        common_c;
 
    /* Full row information for columns of A that are off diag*/
-   hypre_CSRMatrix *A_ext;
-   HYPRE_Real      *A_ext_data;
-   HYPRE_Int       *A_ext_i;
-   HYPRE_BigInt    *A_ext_j;
+   hypre_CSRMatrix *A_ext = NULL;
+   HYPRE_Real      *A_ext_data = NULL;
+   HYPRE_Int       *A_ext_i = NULL;
+   HYPRE_BigInt    *A_ext_j = NULL;
 
    HYPRE_Int       *fine_to_coarse = NULL;
    HYPRE_BigInt    *fine_to_coarse_offd = NULL;
@@ -3745,9 +3920,9 @@ hypre_BoomerAMGBuildFF1Interp(hypre_ParCSRMatrix  *A,
    HYPRE_Int        loc_col;
    HYPRE_Int        full_off_procNodes;
 
-   hypre_CSRMatrix *Sop;
-   HYPRE_Int       *Sop_i;
-   HYPRE_BigInt    *Sop_j;
+   hypre_CSRMatrix *Sop = NULL;
+   HYPRE_Int       *Sop_i = NULL;
+   HYPRE_BigInt    *Sop_j = NULL;
 
    /* Variables to keep count of interpolatory points */
    HYPRE_Int        jj_counter, jj_counter_offd;
@@ -3776,11 +3951,11 @@ hypre_BoomerAMGBuildFF1Interp(hypre_ParCSRMatrix  *A,
    hypre_ParCSRCommPkg   *extend_comm_pkg = NULL;
    /* BEGIN */
    hypre_MPI_Comm_size(comm, &num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_rank(comm, &my_id);
 
    my_first_cpt = num_cpts_global[0];
-   if (my_id == (num_procs -1)) total_global_cpts = num_cpts_global[1];
-   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
+   if (my_id == (num_procs - 1)) { total_global_cpts = num_cpts_global[1]; }
+   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
 
    if (!comm_pkg)
    {
@@ -3794,8 +3969,8 @@ hypre_BoomerAMGBuildFF1Interp(hypre_ParCSRMatrix  *A,
    if (num_procs > 1)
    {
       hypre_exchange_interp_data(
-            &CF_marker_offd, &dof_func_offd, &A_ext, &full_off_procNodes, &Sop, &extend_comm_pkg,
-            A, CF_marker, S, num_functions, dof_func, 1);
+         &CF_marker_offd, &dof_func_offd, &A_ext, &full_off_procNodes, &Sop, &extend_comm_pkg,
+         A, CF_marker, S, num_functions, dof_func, 1);
       {
 #ifdef HYPRE_PROFILE
          hypre_profile_times[HYPRE_TIMER_ID_EXTENDED_I_INTERP] += hypre_MPI_Wtime();
@@ -3817,8 +3992,8 @@ hypre_BoomerAMGBuildFF1Interp(hypre_ParCSRMatrix  *A,
    /*-----------------------------------------------------------------------
     *  Intialize counters and allocate mapping vector.
     *-----------------------------------------------------------------------*/
-   P_diag_i    = hypre_CTAlloc(HYPRE_Int, n_fine+1, memory_location_P);
-   P_offd_i    = hypre_CTAlloc(HYPRE_Int, n_fine+1, memory_location_P);
+   P_diag_i    = hypre_CTAlloc(HYPRE_Int, n_fine + 1, memory_location_P);
+   P_offd_i    = hypre_CTAlloc(HYPRE_Int, n_fine + 1, memory_location_P);
 
    if (n_fine)
    {
@@ -3834,8 +4009,8 @@ hypre_BoomerAMGBuildFF1Interp(hypre_ParCSRMatrix  *A,
    }
 
    hypre_initialize_vecs(n_fine, full_off_procNodes, fine_to_coarse,
-         fine_to_coarse_offd, P_marker, P_marker_offd,
-         tmp_CF_marker_offd);
+                         fine_to_coarse_offd, P_marker, P_marker_offd,
+                         tmp_CF_marker_offd);
 
    jj_counter = start_indexing;
    jj_counter_offd = start_indexing;
@@ -3848,7 +4023,9 @@ hypre_BoomerAMGBuildFF1Interp(hypre_ParCSRMatrix  *A,
    {
       P_diag_i[i] = jj_counter;
       if (num_procs > 1)
+      {
          P_offd_i[i] = jj_counter_offd;
+      }
 
       if (CF_marker[i] >= 0)
       {
@@ -3867,11 +4044,13 @@ hypre_BoomerAMGBuildFF1Interp(hypre_ParCSRMatrix  *A,
          /* Initialize ccounter for each f point */
          /*ccounter = 0;
            ccounter_offd = 0;*/
-         for (jj = S_diag_i[i]; jj < S_diag_i[i+1]; jj++)
-         { /* search through diag to find all c neighbors */
+         for (jj = S_diag_i[i]; jj < S_diag_i[i + 1]; jj++)
+         {
+            /* search through diag to find all c neighbors */
             i1 = S_diag_j[jj];
             if (CF_marker[i1] > 0)
-            { /* i1 is a C point */
+            {
+               /* i1 is a C point */
                CF_marker[i1] = 2;
                if (P_marker[i1] < P_diag_i[i])
                {
@@ -3882,11 +4061,13 @@ hypre_BoomerAMGBuildFF1Interp(hypre_ParCSRMatrix  *A,
          }
          if (num_procs > 1)
          {
-            for (jj = S_offd_i[i]; jj < S_offd_i[i+1]; jj++)
-            { /* search through offd to find all c neighbors */
+            for (jj = S_offd_i[i]; jj < S_offd_i[i + 1]; jj++)
+            {
+               /* search through offd to find all c neighbors */
                i1 = S_offd_j[jj];
                if (CF_marker_offd[i1] > 0)
-               { /* i1 is a C point direct neighbor */
+               {
+                  /* i1 is a C point direct neighbor */
                   CF_marker_offd[i1] = 2;
                   if (P_marker_offd[i1] < P_offd_i[i])
                   {
@@ -3897,13 +4078,15 @@ hypre_BoomerAMGBuildFF1Interp(hypre_ParCSRMatrix  *A,
                }
             }
          }
-         for (jj = S_diag_i[i]; jj < S_diag_i[i+1]; jj++)
-         { /* Search diag to find f neighbors and determine if common c point */
+         for (jj = S_diag_i[i]; jj < S_diag_i[i + 1]; jj++)
+         {
+            /* Search diag to find f neighbors and determine if common c point */
             i1 = S_diag_j[jj];
             if (CF_marker[i1] < 0)
-            { /* i1 is a F point, loop through it's strong neighbors */
+            {
+               /* i1 is a F point, loop through it's strong neighbors */
                common_c = 0;
-               for (kk = S_diag_i[i1]; kk < S_diag_i[i1+1]; kk++)
+               for (kk = S_diag_i[i1]; kk < S_diag_i[i1 + 1]; kk++)
                {
                   k1 = S_diag_j[kk];
                   if (CF_marker[k1] == 2)
@@ -3913,22 +4096,25 @@ hypre_BoomerAMGBuildFF1Interp(hypre_ParCSRMatrix  *A,
                   }
                }
                if (num_procs > 1 && common_c == 0)
-               { /* no common c point yet, check offd */
-                  for (kk = S_offd_i[i1]; kk < S_offd_i[i1+1]; kk++)
+               {
+                  /* no common c point yet, check offd */
+                  for (kk = S_offd_i[i1]; kk < S_offd_i[i1 + 1]; kk++)
                   {
                      k1 = S_offd_j[kk];
 
                      if (CF_marker_offd[k1] == 2)
-                     { /* k1 is a c point check if it is common */
+                     {
+                        /* k1 is a c point check if it is common */
                         common_c = 1;
                         break;
                      }
                   }
                }
                if (!common_c)
-               { /* No common c point, extend the interp set */
+               {
+                  /* No common c point, extend the interp set */
                   found_c = 0;
-                  for (kk = S_diag_i[i1]; kk < S_diag_i[i1+1]; kk++)
+                  for (kk = S_diag_i[i1]; kk < S_diag_i[i1 + 1]; kk++)
                   {
                      k1 = S_diag_j[kk];
                      if (CF_marker[k1] > 0)
@@ -3944,7 +4130,7 @@ hypre_BoomerAMGBuildFF1Interp(hypre_ParCSRMatrix  *A,
                   }
                   if (num_procs > 1 && !found_c)
                   {
-                     for (kk = S_offd_i[i1]; kk < S_offd_i[i1+1]; kk++)
+                     for (kk = S_offd_i[i1]; kk < S_offd_i[i1 + 1]; kk++)
                      {
                         k1 = S_offd_j[kk];
                         if (CF_marker_offd[k1] >  0)
@@ -3965,20 +4151,23 @@ hypre_BoomerAMGBuildFF1Interp(hypre_ParCSRMatrix  *A,
          /* Look at off diag strong connections of i */
          if (num_procs > 1)
          {
-            for (jj = S_offd_i[i]; jj < S_offd_i[i+1]; jj++)
+            for (jj = S_offd_i[i]; jj < S_offd_i[i + 1]; jj++)
             {
                i1 = S_offd_j[jj];
                if (CF_marker_offd[i1] < 0)
-               { /* F point; look at neighbors of i1. Sop contains global col
-                  * numbers and entries that could be in S_diag or S_offd or
-                  * neither. */
+               {
+                  /* F point; look at neighbors of i1. Sop contains global col
+                   * numbers and entries that could be in S_diag or S_offd or
+                   * neither. */
                   common_c = 0;
-                  for (kk = Sop_i[i1]; kk < Sop_i[i1+1]; kk++)
-                  { /* Check if common c */
+                  for (kk = Sop_i[i1]; kk < Sop_i[i1 + 1]; kk++)
+                  {
+                     /* Check if common c */
                      big_k1 = Sop_j[kk];
                      if (big_k1 >= col_1 && big_k1 < col_n)
-                     { /* In S_diag */
-                        loc_col = (HYPRE_Int)(big_k1-col_1);
+                     {
+                        /* In S_diag */
+                        loc_col = (HYPRE_Int)(big_k1 - col_1);
                         if (CF_marker[loc_col] == 2)
                         {
                            common_c = 1;
@@ -3997,12 +4186,14 @@ hypre_BoomerAMGBuildFF1Interp(hypre_ParCSRMatrix  *A,
                   }
                   if (!common_c)
                   {
-                     for (kk = Sop_i[i1]; kk < Sop_i[i1+1]; kk++)
-                     { /* Check if common c */
+                     for (kk = Sop_i[i1]; kk < Sop_i[i1 + 1]; kk++)
+                     {
+                        /* Check if common c */
                         big_k1 = Sop_j[kk];
                         if (big_k1 >= col_1 && big_k1 < col_n)
-                        { /* In S_diag */
-                           loc_col = (HYPRE_Int)(big_k1-col_1);
+                        {
+                           /* In S_diag */
+                           loc_col = (HYPRE_Int)(big_k1 - col_1);
                            if (P_marker[loc_col] < P_diag_i[i])
                            {
                               P_marker[loc_col] = jj_counter;
@@ -4026,19 +4217,24 @@ hypre_BoomerAMGBuildFF1Interp(hypre_ParCSRMatrix  *A,
                }
             }
          }
-         for (jj = S_diag_i[i]; jj < S_diag_i[i+1]; jj++)
-         { /* search through diag to find all c neighbors */
+         for (jj = S_diag_i[i]; jj < S_diag_i[i + 1]; jj++)
+         {
+            /* search through diag to find all c neighbors */
             i1 = S_diag_j[jj];
             if (CF_marker[i1] == 2)
+            {
                CF_marker[i1] = 1;
+            }
          }
          if (num_procs > 1)
          {
-            for (jj = S_offd_i[i]; jj < S_offd_i[i+1]; jj++)
-            { /* search through offd to find all c neighbors */
+            for (jj = S_offd_i[i]; jj < S_offd_i[i + 1]; jj++)
+            {
+               /* search through offd to find all c neighbors */
                i1 = S_offd_j[jj];
                if (CF_marker_offd[i1] == 2)
-               { /* i1 is a C point direct neighbor */
+               {
+                  /* i1 is a C point direct neighbor */
                   CF_marker_offd[i1] = 1;
                }
             }
@@ -4077,15 +4273,19 @@ hypre_BoomerAMGBuildFF1Interp(hypre_ParCSRMatrix  *A,
    if (num_procs > 1)
    {
       hypre_big_insert_new_nodes(comm_pkg, extend_comm_pkg, fine_to_coarse,
-            full_off_procNodes, my_first_cpt,
-            fine_to_coarse_offd);
+                                 full_off_procNodes, my_first_cpt,
+                                 fine_to_coarse_offd);
    }
 
    for (i = 0; i < n_fine; i++)
+   {
       P_marker[i] = -1;
+   }
 
    for (i = 0; i < full_off_procNodes; i++)
+   {
       P_marker_offd[i] = -1;
+   }
 
    /*-----------------------------------------------------------------------
     *  Loop over fine grid points.
@@ -4095,7 +4295,9 @@ hypre_BoomerAMGBuildFF1Interp(hypre_ParCSRMatrix  *A,
    {
       jj_begin_row = jj_counter;
       if (num_procs > 1)
+      {
          jj_begin_row_offd = jj_counter_offd;
+      }
 
       /*--------------------------------------------------------------------
        *  If i is a c-point, interpolation is the identity.
@@ -4118,8 +4320,9 @@ hypre_BoomerAMGBuildFF1Interp(hypre_ParCSRMatrix  *A,
            ccounter_offd = 0;*/
          strong_f_marker--;
 
-         for (jj = S_diag_i[i]; jj < S_diag_i[i+1]; jj++)
-         { /* Search C points only */
+         for (jj = S_diag_i[i]; jj < S_diag_i[i + 1]; jj++)
+         {
+            /* Search C points only */
             i1 = S_diag_j[jj];
 
             /*--------------------------------------------------------------
@@ -4141,7 +4344,7 @@ hypre_BoomerAMGBuildFF1Interp(hypre_ParCSRMatrix  *A,
          }
          if ( num_procs > 1)
          {
-            for (jj=S_offd_i[i]; jj < S_offd_i[i+1]; jj++)
+            for (jj = S_offd_i[i]; jj < S_offd_i[i + 1]; jj++)
             {
                i1 = S_offd_j[jj];
                if ( CF_marker_offd[i1] > 0)
@@ -4158,14 +4361,15 @@ hypre_BoomerAMGBuildFF1Interp(hypre_ParCSRMatrix  *A,
             }
          }
 
-         for (jj = S_diag_i[i]; jj < S_diag_i[i+1]; jj++)
-         { /* Search through F points */
+         for (jj = S_diag_i[i]; jj < S_diag_i[i + 1]; jj++)
+         {
+            /* Search through F points */
             i1 = S_diag_j[jj];
             if (CF_marker[i1] == -1)
             {
                P_marker[i1] = strong_f_marker;
                common_c = 0;
-               for (kk = S_diag_i[i1]; kk < S_diag_i[i1+1]; kk++)
+               for (kk = S_diag_i[i1]; kk < S_diag_i[i1 + 1]; kk++)
                {
                   k1 = S_diag_j[kk];
                   if (CF_marker[k1] == 2)
@@ -4175,22 +4379,25 @@ hypre_BoomerAMGBuildFF1Interp(hypre_ParCSRMatrix  *A,
                   }
                }
                if (num_procs > 1 && common_c == 0)
-               { /* no common c point yet, check offd */
-                  for (kk = S_offd_i[i1]; kk < S_offd_i[i1+1]; kk++)
+               {
+                  /* no common c point yet, check offd */
+                  for (kk = S_offd_i[i1]; kk < S_offd_i[i1 + 1]; kk++)
                   {
                      k1 = S_offd_j[kk];
 
                      if (CF_marker_offd[k1] == 2)
-                     { /* k1 is a c point check if it is common */
+                     {
+                        /* k1 is a c point check if it is common */
                         common_c = 1;
                         break;
                      }
                   }
                }
                if (!common_c)
-               { /* No common c point, extend the interp set */
+               {
+                  /* No common c point, extend the interp set */
                   found_c = 0;
-                  for (kk = S_diag_i[i1]; kk < S_diag_i[i1+1]; kk++)
+                  for (kk = S_diag_i[i1]; kk < S_diag_i[i1 + 1]; kk++)
                   {
                      k1 = S_diag_j[kk];
                      if (CF_marker[k1] >= 0)
@@ -4208,7 +4415,7 @@ hypre_BoomerAMGBuildFF1Interp(hypre_ParCSRMatrix  *A,
                   }
                   if (num_procs > 1 && !found_c)
                   {
-                     for (kk = S_offd_i[i1]; kk < S_offd_i[i1+1]; kk++)
+                     for (kk = S_offd_i[i1]; kk < S_offd_i[i1 + 1]; kk++)
                      {
                         k1 = S_offd_j[kk];
                         if (CF_marker_offd[k1] >= 0)
@@ -4229,19 +4436,22 @@ hypre_BoomerAMGBuildFF1Interp(hypre_ParCSRMatrix  *A,
          }
          if ( num_procs > 1)
          {
-            for (jj=S_offd_i[i]; jj < S_offd_i[i+1]; jj++)
+            for (jj = S_offd_i[i]; jj < S_offd_i[i + 1]; jj++)
             {
                i1 = S_offd_j[jj];
                if (CF_marker_offd[i1] == -1)
-               { /* F points that are off proc */
+               {
+                  /* F points that are off proc */
                   P_marker_offd[i1] = strong_f_marker;
                   common_c = 0;
-                  for (kk = Sop_i[i1]; kk < Sop_i[i1+1]; kk++)
-                  { /* Check if common c */
+                  for (kk = Sop_i[i1]; kk < Sop_i[i1 + 1]; kk++)
+                  {
+                     /* Check if common c */
                      big_k1 = Sop_j[kk];
                      if (big_k1 >= col_1 && big_k1 < col_n)
-                     { /* In S_diag */
-                        loc_col = (HYPRE_Int)(big_k1-col_1);
+                     {
+                        /* In S_diag */
+                        loc_col = (HYPRE_Int)(big_k1 - col_1);
                         if (CF_marker[loc_col] == 2)
                         {
                            common_c = 1;
@@ -4260,13 +4470,13 @@ hypre_BoomerAMGBuildFF1Interp(hypre_ParCSRMatrix  *A,
                   }
                   if (!common_c)
                   {
-                     for (kk = Sop_i[i1]; kk < Sop_i[i1+1]; kk++)
+                     for (kk = Sop_i[i1]; kk < Sop_i[i1 + 1]; kk++)
                      {
                         big_k1 = Sop_j[kk];
                         /* Find local col number */
                         if (big_k1 >= col_1 && big_k1 < col_n)
                         {
-                           loc_col = (HYPRE_Int)(big_k1-col_1);
+                           loc_col = (HYPRE_Int)(big_k1 - col_1);
                            if (P_marker[loc_col] < jj_begin_row)
                            {
                               P_marker[loc_col] = jj_counter;
@@ -4282,7 +4492,7 @@ hypre_BoomerAMGBuildFF1Interp(hypre_ParCSRMatrix  *A,
                            if (P_marker_offd[loc_col] < jj_begin_row_offd)
                            {
                               P_marker_offd[loc_col] = jj_counter_offd;
-                              P_offd_j[jj_counter_offd]=loc_col;
+                              P_offd_j[jj_counter_offd] = loc_col;
                               P_offd_data[jj_counter_offd] = zero;
                               jj_counter_offd++;
                               break;
@@ -4293,8 +4503,9 @@ hypre_BoomerAMGBuildFF1Interp(hypre_ParCSRMatrix  *A,
                }
             }
          }
-         for (jj = S_diag_i[i]; jj < S_diag_i[i+1]; jj++)
-         { /* Search C points only */
+         for (jj = S_diag_i[i]; jj < S_diag_i[i + 1]; jj++)
+         {
+            /* Search C points only */
             i1 = S_diag_j[jj];
 
             /*--------------------------------------------------------------
@@ -4309,7 +4520,7 @@ hypre_BoomerAMGBuildFF1Interp(hypre_ParCSRMatrix  *A,
          }
          if ( num_procs > 1)
          {
-            for (jj=S_offd_i[i]; jj < S_offd_i[i+1]; jj++)
+            for (jj = S_offd_i[i]; jj < S_offd_i[i + 1]; jj++)
             {
                i1 = S_offd_j[jj];
                if ( CF_marker_offd[i1] == 2)
@@ -4324,9 +4535,10 @@ hypre_BoomerAMGBuildFF1Interp(hypre_ParCSRMatrix  *A,
          jj_end_row_offd = jj_counter_offd;
 
          diagonal = A_diag_data[A_diag_i[i]];
-         for (jj = A_diag_i[i]+1; jj < A_diag_i[i+1]; jj++)
-         { /* i1 is a c-point and strongly influences i, accumulate
-            * a_(i,i1) into interpolation weight */
+         for (jj = A_diag_i[i] + 1; jj < A_diag_i[i + 1]; jj++)
+         {
+            /* i1 is a c-point and strongly influences i, accumulate
+             * a_(i,i1) into interpolation weight */
             i1 = A_diag_j[jj];
             if (P_marker[i1] >= jj_begin_row)
             {
@@ -4335,136 +4547,160 @@ hypre_BoomerAMGBuildFF1Interp(hypre_ParCSRMatrix  *A,
             else if (P_marker[i1] == strong_f_marker)
             {
                sum = zero;
-               if (A_diag_data[A_diag_i[i1]] < 0) sgn = -1;
+               if (A_diag_data[A_diag_i[i1]] < 0) { sgn = -1; }
                /* Loop over row of A for point i1 and calculate the sum
                 * of the connections to c-points that strongly incluence i. */
-               for (jj1 = A_diag_i[i1]; jj1 < A_diag_i[i1+1]; jj1++)
+               for (jj1 = A_diag_i[i1]; jj1 < A_diag_i[i1 + 1]; jj1++)
                {
                   i2 = A_diag_j[jj1];
-                  if (P_marker[i2] >= jj_begin_row && (sgn*A_diag_data[jj1]) < 0)
+                  if (P_marker[i2] >= jj_begin_row && (sgn * A_diag_data[jj1]) < 0)
+                  {
                      sum += A_diag_data[jj1];
+                  }
                }
                if (num_procs > 1)
                {
-                  for (jj1 = A_offd_i[i1]; jj1< A_offd_i[i1+1]; jj1++)
+                  for (jj1 = A_offd_i[i1]; jj1 < A_offd_i[i1 + 1]; jj1++)
                   {
                      i2 = A_offd_j[jj1];
                      if (P_marker_offd[i2] >= jj_begin_row_offd &&
-                           (sgn*A_offd_data[jj1]) < 0)
+                         (sgn * A_offd_data[jj1]) < 0)
+                     {
                         sum += A_offd_data[jj1];
+                     }
                   }
                }
                if (sum != 0)
                {
-                  distribute = A_diag_data[jj]/sum;
+                  distribute = A_diag_data[jj] / sum;
                   /* Loop over row of A for point i1 and do the distribution */
-                  for (jj1 = A_diag_i[i1]; jj1 < A_diag_i[i1+1]; jj1++)
+                  for (jj1 = A_diag_i[i1]; jj1 < A_diag_i[i1 + 1]; jj1++)
                   {
                      i2 = A_diag_j[jj1];
-                     if (P_marker[i2] >= jj_begin_row && (sgn*A_diag_data[jj1]) < 0)
+                     if (P_marker[i2] >= jj_begin_row && (sgn * A_diag_data[jj1]) < 0)
                         P_diag_data[P_marker[i2]] +=
-                           distribute*A_diag_data[jj1];
+                           distribute * A_diag_data[jj1];
                   }
                   if (num_procs > 1)
                   {
-                     for (jj1 = A_offd_i[i1]; jj1 < A_offd_i[i1+1]; jj1++)
+                     for (jj1 = A_offd_i[i1]; jj1 < A_offd_i[i1 + 1]; jj1++)
                      {
                         i2 = A_offd_j[jj1];
                         if (P_marker_offd[i2] >= jj_begin_row_offd &&
-                              (sgn*A_offd_data[jj1]) < 0)
+                            (sgn * A_offd_data[jj1]) < 0)
                            P_offd_data[P_marker_offd[i2]] +=
-                              distribute*A_offd_data[jj1];
+                              distribute * A_offd_data[jj1];
                      }
                   }
                }
                else
+               {
                   diagonal += A_diag_data[jj];
+               }
             }
             /* neighbor i1 weakly influences i, accumulate a_(i,i1) into
              * diagonal */
             else if (CF_marker[i1] != -3)
             {
                if (num_functions == 1 || dof_func[i] == dof_func[i1])
+               {
                   diagonal += A_diag_data[jj];
+               }
             }
          }
          if (num_procs > 1)
          {
-            for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+            for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
             {
                i1 = A_offd_j[jj];
                if (P_marker_offd[i1] >= jj_begin_row_offd)
+               {
                   P_offd_data[P_marker_offd[i1]] += A_offd_data[jj];
+               }
                else if (P_marker_offd[i1] == strong_f_marker)
                {
                   sum = zero;
-                  for (jj1 = A_ext_i[i1]; jj1 < A_ext_i[i1+1]; jj1++)
+                  for (jj1 = A_ext_i[i1]; jj1 < A_ext_i[i1 + 1]; jj1++)
                   {
                      big_k1 = A_ext_j[jj1];
                      if (big_k1 >= col_1 && big_k1 < col_n)
-                     { /* diag */
+                     {
+                        /* diag */
                         loc_col = (HYPRE_Int)(big_k1 - col_1);
                         if (P_marker[loc_col] >= jj_begin_row)
+                        {
                            sum += A_ext_data[jj1];
+                        }
                      }
                      else
                      {
                         loc_col = -(HYPRE_Int)big_k1 - 1;
                         if (P_marker_offd[loc_col] >= jj_begin_row_offd)
+                        {
                            sum += A_ext_data[jj1];
+                        }
                      }
                   }
                   if (sum != 0)
                   {
                      distribute = A_offd_data[jj] / sum;
-                     for (jj1 = A_ext_i[i1]; jj1 < A_ext_i[i1+1]; jj1++)
+                     for (jj1 = A_ext_i[i1]; jj1 < A_ext_i[i1 + 1]; jj1++)
                      {
                         big_k1 = A_ext_j[jj1];
                         if (big_k1 >= col_1 && big_k1 < col_n)
-                        { /* diag */
+                        {
+                           /* diag */
                            loc_col = (HYPRE_Int)(big_k1 - col_1);
                            if (P_marker[loc_col] >= jj_begin_row)
-                              P_diag_data[P_marker[loc_col]] += distribute*
-                                 A_ext_data[jj1];
+                              P_diag_data[P_marker[loc_col]] += distribute *
+                                                                A_ext_data[jj1];
                         }
                         else
                         {
                            loc_col = - (HYPRE_Int)big_k1 - 1;
                            if (P_marker_offd[loc_col] >= jj_begin_row_offd)
-                              P_offd_data[P_marker_offd[loc_col]] += distribute*
-                                 A_ext_data[jj1];
+                              P_offd_data[P_marker_offd[loc_col]] += distribute *
+                                                                     A_ext_data[jj1];
                         }
                      }
                   }
                   else
+                  {
                      diagonal += A_offd_data[jj];
+                  }
                }
                else if (CF_marker_offd[i1] != -3)
                {
                   if (num_functions == 1 || dof_func[i] == dof_func_offd[i1])
+                  {
                      diagonal += A_offd_data[jj];
+                  }
                }
             }
          }
          if (diagonal)
          {
             for (jj = jj_begin_row; jj < jj_end_row; jj++)
+            {
                P_diag_data[jj] /= -diagonal;
+            }
             for (jj = jj_begin_row_offd; jj < jj_end_row_offd; jj++)
+            {
                P_offd_data[jj] /= -diagonal;
+            }
          }
       }
       strong_f_marker--;
    }
 
    P = hypre_ParCSRMatrixCreate(comm,
-         hypre_ParCSRMatrixGlobalNumRows(A),
-         total_global_cpts,
-         hypre_ParCSRMatrixColStarts(A),
-         num_cpts_global,
-         0,
-         P_diag_i[n_fine],
-         P_offd_i[n_fine]);
+                                hypre_ParCSRMatrixGlobalNumRows(A),
+                                total_global_cpts,
+                                hypre_ParCSRMatrixColStarts(A),
+                                num_cpts_global,
+                                0,
+                                P_diag_i[n_fine],
+                                P_offd_i[n_fine]);
 
    P_diag = hypre_ParCSRMatrixDiag(P);
    hypre_CSRMatrixData(P_diag) = P_diag_data;
@@ -4501,8 +4737,8 @@ hypre_BoomerAMGBuildFF1Interp(hypre_ParCSRMatrix  *A,
 
    hypre_MatvecCommPkgCreate(P);
 
-   for (i=0; i < n_fine; i++)
-      if (CF_marker[i] == -3) CF_marker[i] = -1;
+   for (i = 0; i < n_fine; i++)
+      if (CF_marker[i] == -3) { CF_marker[i] = -1; }
 
    *P_ptr = P;
 
@@ -4522,7 +4758,9 @@ hypre_BoomerAMGBuildFF1Interp(hypre_ParCSRMatrix  *A,
       hypre_TFree(CF_marker_offd, HYPRE_MEMORY_HOST);
       hypre_TFree(tmp_CF_marker_offd, HYPRE_MEMORY_HOST);
       if (num_functions > 1)
+      {
          hypre_TFree(dof_func_offd, HYPRE_MEMORY_HOST);
+      }
 
       hypre_MatvecCommPkgDestroy(extend_comm_pkg);
 
@@ -4602,10 +4840,10 @@ hypre_BoomerAMGBuildExtInterpHost(hypre_ParCSRMatrix  *A,
    HYPRE_Int       *dof_func_offd = NULL;
 
    /* Full row information for columns of A that are off diag*/
-   hypre_CSRMatrix *A_ext;
-   HYPRE_Real      *A_ext_data;
-   HYPRE_Int       *A_ext_i;
-   HYPRE_BigInt    *A_ext_j;
+   hypre_CSRMatrix *A_ext = NULL;
+   HYPRE_Real      *A_ext_data = NULL;
+   HYPRE_Int       *A_ext_i = NULL;
+   HYPRE_BigInt    *A_ext_j = NULL;
 
    HYPRE_Int       *fine_to_coarse = NULL;
    HYPRE_BigInt    *fine_to_coarse_offd = NULL;
@@ -4613,9 +4851,9 @@ hypre_BoomerAMGBuildExtInterpHost(hypre_ParCSRMatrix  *A,
    HYPRE_Int        loc_col;
    HYPRE_Int        full_off_procNodes;
 
-   hypre_CSRMatrix *Sop;
-   HYPRE_Int       *Sop_i;
-   HYPRE_BigInt    *Sop_j;
+   hypre_CSRMatrix *Sop = NULL;
+   HYPRE_Int       *Sop_i = NULL;
+   HYPRE_BigInt    *Sop_j = NULL;
 
    HYPRE_Int        sgn = 1;
 
@@ -4639,23 +4877,22 @@ hypre_BoomerAMGBuildExtInterpHost(hypre_ParCSRMatrix  *A,
    /* Definitions */
    HYPRE_Real       zero = 0.0;
    HYPRE_Real       one  = 1.0;
-   HYPRE_Real       wall_time;
-
+   HYPRE_Real       wall_time = 0.0;
 
    hypre_ParCSRCommPkg   *extend_comm_pkg = NULL;
 
-   if (debug_flag==4) wall_time = time_getWallclockSeconds();
+   if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
 
    /* BEGIN */
    hypre_MPI_Comm_size(comm, &num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_rank(comm, &my_id);
 
    my_first_cpt = num_cpts_global[0];
-   if (my_id == (num_procs -1))
+   if (my_id == (num_procs - 1))
    {
       total_global_cpts = num_cpts_global[1];
    }
-   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
+   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
 
    if (!comm_pkg)
    {
@@ -4669,8 +4906,8 @@ hypre_BoomerAMGBuildExtInterpHost(hypre_ParCSRMatrix  *A,
    if (num_procs > 1)
    {
       hypre_exchange_interp_data(
-            &CF_marker_offd, &dof_func_offd, &A_ext, &full_off_procNodes, &Sop, &extend_comm_pkg,
-            A, CF_marker, S, num_functions, dof_func, 1);
+         &CF_marker_offd, &dof_func_offd, &A_ext, &full_off_procNodes, &Sop, &extend_comm_pkg,
+         A, CF_marker, S, num_functions, dof_func, 1);
       {
 #ifdef HYPRE_PROFILE
          hypre_profile_times[HYPRE_TIMER_ID_EXTENDED_I_INTERP] += hypre_MPI_Wtime();
@@ -4693,8 +4930,8 @@ hypre_BoomerAMGBuildExtInterpHost(hypre_ParCSRMatrix  *A,
    /*-----------------------------------------------------------------------
     *  Intialize counters and allocate mapping vector.
     *-----------------------------------------------------------------------*/
-   P_diag_i = hypre_CTAlloc(HYPRE_Int, n_fine+1, memory_location_P);
-   P_offd_i = hypre_CTAlloc(HYPRE_Int, n_fine+1, memory_location_P);
+   P_diag_i = hypre_CTAlloc(HYPRE_Int, n_fine + 1, memory_location_P);
+   P_offd_i = hypre_CTAlloc(HYPRE_Int, n_fine + 1, memory_location_P);
 
    if (n_fine)
    {
@@ -4742,11 +4979,12 @@ hypre_BoomerAMGBuildExtInterpHost(hypre_ParCSRMatrix  *A,
        *--------------------------------------------------------------------*/
       else if (CF_marker[i] != -3)
       {
-         for (jj = S_diag_i[i]; jj < S_diag_i[i+1]; jj++)
+         for (jj = S_diag_i[i]; jj < S_diag_i[i + 1]; jj++)
          {
             i1 = S_diag_j[jj];
             if (CF_marker[i1] >= 0)
-            { /* i1 is a C point */
+            {
+               /* i1 is a C point */
                if (P_marker[i1] < P_diag_i[i])
                {
                   P_marker[i1] = jj_counter;
@@ -4754,8 +4992,9 @@ hypre_BoomerAMGBuildExtInterpHost(hypre_ParCSRMatrix  *A,
                }
             }
             else if (CF_marker[i1] != -3)
-            { /* i1 is a F point, loop through it's strong neighbors */
-               for (kk = S_diag_i[i1]; kk < S_diag_i[i1+1]; kk++)
+            {
+               /* i1 is a F point, loop through it's strong neighbors */
+               for (kk = S_diag_i[i1]; kk < S_diag_i[i1 + 1]; kk++)
                {
                   k1 = S_diag_j[kk];
                   if (CF_marker[k1] >= 0)
@@ -4769,7 +5008,7 @@ hypre_BoomerAMGBuildExtInterpHost(hypre_ParCSRMatrix  *A,
                }
                if (num_procs > 1)
                {
-                  for (kk = S_offd_i[i1]; kk < S_offd_i[i1+1]; kk++)
+                  for (kk = S_offd_i[i1]; kk < S_offd_i[i1 + 1]; kk++)
                   {
                      k1 = S_offd_j[kk];
                      if (CF_marker_offd[k1] >= 0)
@@ -4788,7 +5027,7 @@ hypre_BoomerAMGBuildExtInterpHost(hypre_ParCSRMatrix  *A,
          /* Look at off diag strong connections of i */
          if (num_procs > 1)
          {
-            for (jj = S_offd_i[i]; jj < S_offd_i[i+1]; jj++)
+            for (jj = S_offd_i[i]; jj < S_offd_i[i + 1]; jj++)
             {
                i1 = S_offd_j[jj];
                if (CF_marker_offd[i1] >= 0)
@@ -4801,15 +5040,17 @@ hypre_BoomerAMGBuildExtInterpHost(hypre_ParCSRMatrix  *A,
                   }
                }
                else if (CF_marker_offd[i1] != -3)
-               { /* F point; look at neighbors of i1. Sop contains global col
-                  * numbers and entries that could be in S_diag or S_offd or
-                  * neither. */
-                  for (kk = Sop_i[i1]; kk < Sop_i[i1+1]; kk++)
+               {
+                  /* F point; look at neighbors of i1. Sop contains global col
+                   * numbers and entries that could be in S_diag or S_offd or
+                   * neither. */
+                  for (kk = Sop_i[i1]; kk < Sop_i[i1 + 1]; kk++)
                   {
                      big_k1 = Sop_j[kk];
                      if (big_k1 >= col_1 && big_k1 < col_n)
-                     { /* In S_diag */
-                        loc_col = (HYPRE_Int)(big_k1-col_1);
+                     {
+                        /* In S_diag */
+                        loc_col = (HYPRE_Int)(big_k1 - col_1);
                         if (P_marker[loc_col] < P_diag_i[i])
                         {
                            P_marker[loc_col] = jj_counter;
@@ -4833,18 +5074,18 @@ hypre_BoomerAMGBuildExtInterpHost(hypre_ParCSRMatrix  *A,
       }
    }
 
-   if (debug_flag==4)
+   if (debug_flag == 4)
    {
       wall_time = time_getWallclockSeconds() - wall_time;
       hypre_printf("Proc = %d     determine structure    %f\n",
-            my_id, wall_time);
+                   my_id, wall_time);
       fflush(NULL);
    }
    /*-----------------------------------------------------------------------
     *  Allocate  arrays.
     *-----------------------------------------------------------------------*/
 
-   if (debug_flag== 4)
+   if (debug_flag == 4)
    {
       wall_time = time_getWallclockSeconds();
    }
@@ -4914,7 +5155,7 @@ hypre_BoomerAMGBuildExtInterpHost(hypre_ParCSRMatrix  *A,
       else if (CF_marker[i] != -3)
       {
          strong_f_marker--;
-         for (jj = S_diag_i[i]; jj < S_diag_i[i+1]; jj++)
+         for (jj = S_diag_i[i]; jj < S_diag_i[i + 1]; jj++)
          {
             i1 = S_diag_j[jj];
 
@@ -4936,7 +5177,7 @@ hypre_BoomerAMGBuildExtInterpHost(hypre_ParCSRMatrix  *A,
             else  if (CF_marker[i1] != -3)
             {
                P_marker[i1] = strong_f_marker;
-               for (kk = S_diag_i[i1]; kk < S_diag_i[i1+1]; kk++)
+               for (kk = S_diag_i[i1]; kk < S_diag_i[i1 + 1]; kk++)
                {
                   k1 = S_diag_j[kk];
                   if (CF_marker[k1] >= 0)
@@ -4952,7 +5193,7 @@ hypre_BoomerAMGBuildExtInterpHost(hypre_ParCSRMatrix  *A,
                }
                if (num_procs > 1)
                {
-                  for (kk = S_offd_i[i1]; kk < S_offd_i[i1+1]; kk++)
+                  for (kk = S_offd_i[i1]; kk < S_offd_i[i1 + 1]; kk++)
                   {
                      k1 = S_offd_j[kk];
                      if (CF_marker_offd[k1] >= 0)
@@ -4972,7 +5213,7 @@ hypre_BoomerAMGBuildExtInterpHost(hypre_ParCSRMatrix  *A,
 
          if ( num_procs > 1)
          {
-            for (jj=S_offd_i[i]; jj < S_offd_i[i+1]; jj++)
+            for (jj = S_offd_i[i]; jj < S_offd_i[i + 1]; jj++)
             {
                i1 = S_offd_j[jj];
                if ( CF_marker_offd[i1] >= 0)
@@ -4988,13 +5229,13 @@ hypre_BoomerAMGBuildExtInterpHost(hypre_ParCSRMatrix  *A,
                else if (CF_marker_offd[i1] != -3)
                {
                   P_marker_offd[i1] = strong_f_marker;
-                  for (kk = Sop_i[i1]; kk < Sop_i[i1+1]; kk++)
+                  for (kk = Sop_i[i1]; kk < Sop_i[i1 + 1]; kk++)
                   {
                      big_k1 = Sop_j[kk];
                      /* Find local col number */
                      if (big_k1 >= col_1 && big_k1 < col_n)
                      {
-                        loc_col = (HYPRE_Int)(big_k1-col_1);
+                        loc_col = (HYPRE_Int)(big_k1 - col_1);
                         if (P_marker[loc_col] < jj_begin_row)
                         {
                            P_marker[loc_col] = jj_counter;
@@ -5009,7 +5250,7 @@ hypre_BoomerAMGBuildExtInterpHost(hypre_ParCSRMatrix  *A,
                         if (P_marker_offd[loc_col] < jj_begin_row_offd)
                         {
                            P_marker_offd[loc_col] = jj_counter_offd;
-                           P_offd_j[jj_counter_offd]=loc_col;
+                           P_offd_j[jj_counter_offd] = loc_col;
                            P_offd_data[jj_counter_offd] = zero;
                            jj_counter_offd++;
                         }
@@ -5024,9 +5265,10 @@ hypre_BoomerAMGBuildExtInterpHost(hypre_ParCSRMatrix  *A,
 
          diagonal = A_diag_data[A_diag_i[i]];
 
-         for (jj = A_diag_i[i]+1; jj < A_diag_i[i+1]; jj++)
-         { /* i1 is a c-point and strongly influences i, accumulate
-            * a_(i,i1) into interpolation weight */
+         for (jj = A_diag_i[i] + 1; jj < A_diag_i[i + 1]; jj++)
+         {
+            /* i1 is a c-point and strongly influences i, accumulate
+             * a_(i,i1) into interpolation weight */
             i1 = A_diag_j[jj];
             if (P_marker[i1] >= jj_begin_row)
             {
@@ -5042,20 +5284,20 @@ hypre_BoomerAMGBuildExtInterpHost(hypre_ParCSRMatrix  *A,
                }
                /* Loop over row of A for point i1 and calculate the sum
                 * of the connections to c-points that strongly incluence i. */
-               for (jj1 = A_diag_i[i1]+1; jj1 < A_diag_i[i1+1]; jj1++)
+               for (jj1 = A_diag_i[i1] + 1; jj1 < A_diag_i[i1 + 1]; jj1++)
                {
                   i2 = A_diag_j[jj1];
-                  if ((P_marker[i2] >= jj_begin_row ) && (sgn*A_diag_data[jj1]) < 0)
+                  if ((P_marker[i2] >= jj_begin_row ) && (sgn * A_diag_data[jj1]) < 0)
                   {
                      sum += A_diag_data[jj1];
                   }
                }
                if (num_procs > 1)
                {
-                  for (jj1 = A_offd_i[i1]; jj1< A_offd_i[i1+1]; jj1++)
+                  for (jj1 = A_offd_i[i1]; jj1 < A_offd_i[i1 + 1]; jj1++)
                   {
                      i2 = A_offd_j[jj1];
-                     if (P_marker_offd[i2] >= jj_begin_row_offd && (sgn*A_offd_data[jj1]) < 0)
+                     if (P_marker_offd[i2] >= jj_begin_row_offd && (sgn * A_offd_data[jj1]) < 0)
                      {
                         sum += A_offd_data[jj1];
                      }
@@ -5063,24 +5305,24 @@ hypre_BoomerAMGBuildExtInterpHost(hypre_ParCSRMatrix  *A,
                }
                if (sum != 0)
                {
-                  distribute = A_diag_data[jj]/sum;
+                  distribute = A_diag_data[jj] / sum;
                   /* Loop over row of A for point i1 and do the distribution */
-                  for (jj1 = A_diag_i[i1]+1; jj1 < A_diag_i[i1+1]; jj1++)
+                  for (jj1 = A_diag_i[i1] + 1; jj1 < A_diag_i[i1 + 1]; jj1++)
                   {
                      i2 = A_diag_j[jj1];
-                     if (P_marker[i2] >= jj_begin_row && (sgn*A_diag_data[jj1]) < 0)
+                     if (P_marker[i2] >= jj_begin_row && (sgn * A_diag_data[jj1]) < 0)
                      {
-                        P_diag_data[P_marker[i2]] += distribute*A_diag_data[jj1];
+                        P_diag_data[P_marker[i2]] += distribute * A_diag_data[jj1];
                      }
                   }
                   if (num_procs > 1)
                   {
-                     for (jj1 = A_offd_i[i1]; jj1 < A_offd_i[i1+1]; jj1++)
+                     for (jj1 = A_offd_i[i1]; jj1 < A_offd_i[i1 + 1]; jj1++)
                      {
                         i2 = A_offd_j[jj1];
-                        if (P_marker_offd[i2] >= jj_begin_row_offd && (sgn*A_offd_data[jj1]) < 0)
+                        if (P_marker_offd[i2] >= jj_begin_row_offd && (sgn * A_offd_data[jj1]) < 0)
                         {
-                           P_offd_data[P_marker_offd[i2]] += distribute*A_offd_data[jj1];
+                           P_offd_data[P_marker_offd[i2]] += distribute * A_offd_data[jj1];
                         }
                      }
                   }
@@ -5102,7 +5344,7 @@ hypre_BoomerAMGBuildExtInterpHost(hypre_ParCSRMatrix  *A,
          }
          if (num_procs > 1)
          {
-            for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+            for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
             {
                i1 = A_offd_j[jj];
                if (P_marker_offd[i1] >= jj_begin_row_offd)
@@ -5112,11 +5354,12 @@ hypre_BoomerAMGBuildExtInterpHost(hypre_ParCSRMatrix  *A,
                else if (P_marker_offd[i1] == strong_f_marker)
                {
                   sum = zero;
-                  for (jj1 = A_ext_i[i1]; jj1 < A_ext_i[i1+1]; jj1++)
+                  for (jj1 = A_ext_i[i1]; jj1 < A_ext_i[i1 + 1]; jj1++)
                   {
                      big_k1 = A_ext_j[jj1];
                      if (big_k1 >= col_1 && big_k1 < col_n)
-                     { /* diag */
+                     {
+                        /* diag */
                         loc_col = (HYPRE_Int)(big_k1 - col_1);
                         if (P_marker[loc_col] >= jj_begin_row )
                         {
@@ -5135,11 +5378,12 @@ hypre_BoomerAMGBuildExtInterpHost(hypre_ParCSRMatrix  *A,
                   if (sum != 0)
                   {
                      distribute = A_offd_data[jj] / sum;
-                     for (jj1 = A_ext_i[i1]; jj1 < A_ext_i[i1+1]; jj1++)
+                     for (jj1 = A_ext_i[i1]; jj1 < A_ext_i[i1 + 1]; jj1++)
                      {
                         big_k1 = A_ext_j[jj1];
                         if (big_k1 >= col_1 && big_k1 < col_n)
-                        { /* diag */
+                        {
+                           /* diag */
                            loc_col = (HYPRE_Int)(big_k1 - col_1);
                            if (P_marker[loc_col] >= jj_begin_row)
                            {
@@ -5151,7 +5395,7 @@ hypre_BoomerAMGBuildExtInterpHost(hypre_ParCSRMatrix  *A,
                            loc_col = -(HYPRE_Int)big_k1 - 1;
                            if (P_marker_offd[loc_col] >= jj_begin_row_offd)
                            {
-                              P_offd_data[P_marker_offd[loc_col]] += distribute*A_ext_data[jj1];
+                              P_offd_data[P_marker_offd[loc_col]] += distribute * A_ext_data[jj1];
                            }
                         }
                      }
@@ -5185,7 +5429,7 @@ hypre_BoomerAMGBuildExtInterpHost(hypre_ParCSRMatrix  *A,
       strong_f_marker--;
    }
 
-   if (debug_flag==4)
+   if (debug_flag == 4)
    {
       wall_time = time_getWallclockSeconds() - wall_time;
       hypre_printf("Proc = %d     fill structure    %f\n", my_id, wall_time);
@@ -5239,7 +5483,7 @@ hypre_BoomerAMGBuildExtInterpHost(hypre_ParCSRMatrix  *A,
 
    hypre_MatvecCommPkgCreate(P);
 
-   for (i=0; i < n_fine; i++)
+   for (i = 0; i < n_fine; i++)
    {
       if (CF_marker[i] == -3)
       {
@@ -5279,30 +5523,26 @@ hypre_BoomerAMGBuildExtInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
                               HYPRE_Real trunc_factor, HYPRE_Int max_elmts,
                               hypre_ParCSRMatrix  **P_ptr)
 {
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    hypre_GpuProfilingPushRange("ExtInterp");
-#endif
-
-   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_ParCSRMatrixMemoryLocation(A) );
 
    HYPRE_Int ierr = 0;
 
-   if (exec == HYPRE_EXEC_HOST)
+#if defined(HYPRE_USING_GPU)
+   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_ParCSRMatrixMemoryLocation(A) );
+   if (exec == HYPRE_EXEC_DEVICE)
    {
-      ierr = hypre_BoomerAMGBuildExtInterpHost(A,CF_marker,S,num_cpts_global,num_functions,dof_func,
-                                               debug_flag,trunc_factor,max_elmts,P_ptr);
+      ierr = hypre_BoomerAMGBuildExtInterpDevice(A, CF_marker, S, num_cpts_global, num_functions,
+                                                 dof_func,
+                                                 debug_flag, trunc_factor, max_elmts, P_ptr);
    }
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    else
+#endif
    {
-      ierr = hypre_BoomerAMGBuildExtInterpDevice(A,CF_marker,S,num_cpts_global,num_functions,dof_func,
-                                                 debug_flag,trunc_factor,max_elmts,P_ptr);
+      ierr = hypre_BoomerAMGBuildExtInterpHost(A, CF_marker, S, num_cpts_global, num_functions, dof_func,
+                                               debug_flag, trunc_factor, max_elmts, P_ptr);
    }
-#endif
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    hypre_GpuProfilingPopRange();
-#endif
 
    return ierr;
 }
@@ -5321,30 +5561,27 @@ hypre_BoomerAMGBuildExtPIInterp(hypre_ParCSRMatrix   *A,
                                 HYPRE_Int             max_elmts,
                                 hypre_ParCSRMatrix  **P_ptr)
 {
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    hypre_GpuProfilingPushRange("ExtPIInterp");
-#endif
-
-   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_ParCSRMatrixMemoryLocation(A) );
 
    HYPRE_Int ierr = 0;
 
-   if (exec == HYPRE_EXEC_HOST)
+#if defined(HYPRE_USING_GPU)
+   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_ParCSRMatrixMemoryLocation(A) );
+   if (exec == HYPRE_EXEC_DEVICE)
    {
-      ierr = hypre_BoomerAMGBuildExtPIInterpHost(A, CF_marker, S, num_cpts_global, num_functions, dof_func,
-                                                 debug_flag, trunc_factor, max_elmts, P_ptr);
+      ierr = hypre_BoomerAMGBuildExtPIInterpDevice(A, CF_marker, S, num_cpts_global, num_functions,
+                                                   dof_func,
+                                                   debug_flag, trunc_factor, max_elmts, P_ptr);
    }
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    else
+#endif
    {
-      ierr = hypre_BoomerAMGBuildExtPIInterpDevice(A, CF_marker, S, num_cpts_global, num_functions, dof_func,
-                                                   debug_flag, trunc_factor, max_elmts, P_ptr);
+      ierr = hypre_BoomerAMGBuildExtPIInterpHost(A, CF_marker, S, num_cpts_global, num_functions,
+                                                 dof_func,
+                                                 debug_flag, trunc_factor, max_elmts, P_ptr);
    }
-#endif
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    hypre_GpuProfilingPopRange();
-#endif
 
    return ierr;
 }
diff --git a/external/hypre/src/parcsr_ls/par_lr_interp_device.c b/external/hypre/src/parcsr_ls/par_lr_interp_device.c
index 84e1ba4e..744508b4 100644
--- a/external/hypre/src/parcsr_ls/par_lr_interp_device.c
+++ b/external/hypre/src/parcsr_ls/par_lr_interp_device.c
@@ -1,458 +1,810 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
  ******************************************************************************/
 
+#include "_hypre_onedpl.hpp"
 #include "_hypre_parcsr_ls.h"
 #include "aux_interp.h"
 #include "_hypre_utilities.hpp"
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
 
 #define MAX_C_CONNECTIONS 100
 #define HAVE_COMMON_C 1
 
-__global__ void hypreCUDAKernel_compute_weak_rowsums( HYPRE_Int nr_of_rows, bool has_offd, HYPRE_Int *CF_marker, HYPRE_Int *A_diag_i, HYPRE_Complex *A_diag_a, HYPRE_Int *S_diag_j, HYPRE_Int *A_offd_i, HYPRE_Complex *A_offd_a, HYPRE_Int *S_offd_j, HYPRE_Real *rs, HYPRE_Int flag );
-
-__global__ void hypreCUDAKernel_compute_aff_afc( HYPRE_Int nr_of_rows, HYPRE_Int *AFF_diag_i, HYPRE_Int *AFF_diag_j, HYPRE_Complex *AFF_diag_data, HYPRE_Int *AFF_offd_i, HYPRE_Complex *AFF_offd_data, HYPRE_Int *AFC_diag_i, HYPRE_Complex *AFC_diag_data, HYPRE_Int *AFC_offd_i, HYPRE_Complex *AFC_offd_data, HYPRE_Complex *rsW, HYPRE_Complex *rsFC );
+//-----------------------------------------------------------------------
+// S_*_j is the special j-array from device SoC
+// -1: weak, -2: diag, >=0 (== A_diag_j) : strong
+// add weak and the diagonal entries of F-rows
+#if defined(HYPRE_USING_SYCL)
+SYCL_EXTERNAL
+#endif
+__global__
+void hypreGPUKernel_compute_weak_rowsums( hypre_DeviceItem    &item,
+                                          HYPRE_Int      nr_of_rows,
+                                          bool           has_offd,
+                                          HYPRE_Int     *CF_marker,
+                                          HYPRE_Int     *A_diag_i,
+                                          HYPRE_Complex *A_diag_a,
+                                          HYPRE_Int     *Soc_diag_j,
+                                          HYPRE_Int     *A_offd_i,
+                                          HYPRE_Complex *A_offd_a,
+                                          HYPRE_Int     *Soc_offd_j,
+                                          HYPRE_Real    *rs,
+                                          HYPRE_Int      flag)
+{
+   HYPRE_Int row = hypre_gpu_get_grid_warp_id<1, 1>(item);
 
-void hypreDevice_extendWtoP( HYPRE_Int P_nr_of_rows, HYPRE_Int W_nr_of_rows, HYPRE_Int W_nr_of_cols, HYPRE_Int *CF_marker, HYPRE_Int W_diag_nnz, HYPRE_Int *W_diag_i, HYPRE_Int *W_diag_j, HYPRE_Complex *W_diag_data, HYPRE_Int *P_diag_i, HYPRE_Int *P_diag_j, HYPRE_Complex *P_diag_data, HYPRE_Int *W_offd_i, HYPRE_Int *P_offd_i );
+   if (row >= nr_of_rows)
+   {
+      return;
+   }
 
-__global__ void hypreCUDAKernel_compute_twiaff_w( HYPRE_Int nr_of_rows, HYPRE_BigInt first_index, HYPRE_Int *AFF_diag_i, HYPRE_Int *AFF_diag_j, HYPRE_Complex *AFF_diag_data, HYPRE_Complex *AFF_diag_data_old, HYPRE_Int *AFF_offd_i, HYPRE_Int *AFF_offd_j, HYPRE_Complex *AFF_offd_data, HYPRE_Int *AFF_ext_i, HYPRE_BigInt *AFF_ext_j, HYPRE_Complex *AFF_ext_data, HYPRE_Complex *rsW, HYPRE_Complex *rsFC, HYPRE_Complex *rsFC_offd );
+   HYPRE_Int lane = hypre_gpu_get_lane_id<1>(item);
+   HYPRE_Int ib = 0, ie;
 
-__global__ void hypreCUDAKernel_compute_aff_afc_epe( HYPRE_Int nr_of_rows, HYPRE_Int *AFF_diag_i, HYPRE_Int *AFF_diag_j, HYPRE_Complex *AFF_diag_data, HYPRE_Int *AFF_offd_i, HYPRE_Int *AFF_offd_j, HYPRE_Complex *AFF_offd_data, HYPRE_Int *AFC_diag_i, HYPRE_Complex *AFC_diag_data, HYPRE_Int *AFC_offd_i, HYPRE_Complex *AFC_offd_data, HYPRE_Complex *rsW, HYPRE_Complex *dlam, HYPRE_Complex *d_tmp, HYPRE_Complex *dtmp_offd );
+   if (lane == 0)
+   {
+      ib = read_only_load(CF_marker + row);
+   }
+   ib = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, ib, 0);
 
-__global__ void hypreCUDAKernel_compute_dlam_dtmp( HYPRE_Int nr_of_rows, HYPRE_Int *AFF_diag_i, HYPRE_Int *AFF_diag_j, HYPRE_Complex *AFF_diag_data, HYPRE_Int *AFF_offd_i, HYPRE_Complex *AFF_offd_data, HYPRE_Complex *rsFC, HYPRE_Complex *dlam, HYPRE_Complex *dtmp );
+   if (ib >= flag)
+   {
+      return;
+   }
 
-/*---------------------------------------------------------------------
- * Extended Interpolation in the form of Mat-Mat
- *---------------------------------------------------------------------*/
-HYPRE_Int
-hypre_BoomerAMGBuildExtInterpDevice(hypre_ParCSRMatrix  *A,
-                                    HYPRE_Int           *CF_marker,
-                                    hypre_ParCSRMatrix  *S,
-                                    HYPRE_BigInt        *num_cpts_global,
-                                    HYPRE_Int            num_functions,
-                                    HYPRE_Int           *dof_func,
-                                    HYPRE_Int            debug_flag,
-                                    HYPRE_Real           trunc_factor,
-                                    HYPRE_Int            max_elmts,
-                                    hypre_ParCSRMatrix **P_ptr)
-{
-   HYPRE_Int           A_nr_of_rows = hypre_ParCSRMatrixNumRows(A);
-   hypre_CSRMatrix    *A_diag       = hypre_ParCSRMatrixDiag(A);
-   HYPRE_Complex      *A_diag_data  = hypre_CSRMatrixData(A_diag);
-   HYPRE_Int          *A_diag_i     = hypre_CSRMatrixI(A_diag);
-   hypre_CSRMatrix    *A_offd       = hypre_ParCSRMatrixOffd(A);
-   HYPRE_Complex      *A_offd_data  = hypre_CSRMatrixData(A_offd);
-   HYPRE_Int          *A_offd_i     = hypre_CSRMatrixI(A_offd);
-   HYPRE_Int           A_offd_nnz   = hypre_CSRMatrixNumNonzeros(A_offd);
+   if (lane < 2)
+   {
+      ib = read_only_load(A_diag_i + row + lane);
+   }
+   ie = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, ib, 1);
+   ib = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, ib, 0);
 
-   hypre_ParCSRMatrix *AFF, *AFC;
-   hypre_ParCSRMatrix *W, *P;
-   HYPRE_Int           W_nr_of_rows, P_diag_nnz;
-   HYPRE_Complex      *rsFC, *rsWA, *rsW;
-   HYPRE_Int          *P_diag_i, *P_diag_j, *P_offd_i;
-   HYPRE_Complex      *P_diag_data;
+   HYPRE_Complex rl = 0.0;
 
-   hypre_BoomerAMGMakeSocFromSDevice(A, S);
+   for (HYPRE_Int i = ib + lane; i < ie; i += HYPRE_WARP_SIZE)
+   {
+      rl += read_only_load(&A_diag_a[i]) * (read_only_load(&Soc_diag_j[i]) < 0);
+   }
 
-   HYPRE_Int          *Soc_diag_j   = hypre_ParCSRMatrixSocDiagJ(S);
-   HYPRE_Int          *Soc_offd_j   = hypre_ParCSRMatrixSocOffdJ(S);
+   if (has_offd)
+   {
+      if (lane < 2)
+      {
+         ib = read_only_load(A_offd_i + row + lane);
+      }
+      ie = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, ib, 1);
+      ib = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, ib, 0);
 
-   /* 0. Find row sums of weak elements */
-   /* row sum of A-weak + Diag(A), i.e., (D_gamma + D_alpha) in the notes, only for F-pts */
-   rsWA = hypre_TAlloc(HYPRE_Complex, A_nr_of_rows, HYPRE_MEMORY_DEVICE);
+      for (HYPRE_Int i = ib + lane; i < ie; i += HYPRE_WARP_SIZE)
+      {
+         rl += read_only_load(&A_offd_a[i]) * (read_only_load(&Soc_offd_j[i]) < 0);
+      }
+   }
 
-   dim3 bDim = hypre_GetDefaultCUDABlockDimension();
-   dim3 gDim = hypre_GetDefaultCUDAGridDimension(A_nr_of_rows, "warp", bDim);
+   rl = warp_reduce_sum(item, rl);
 
-   HYPRE_CUDA_LAUNCH( hypreCUDAKernel_compute_weak_rowsums,
-                      gDim, bDim,
-                      A_nr_of_rows,
-                      A_offd_nnz > 0,
-                      CF_marker,
-                      A_diag_i,
-                      A_diag_data,
-                      Soc_diag_j,
-                      A_offd_i,
-                      A_offd_data,
-                      Soc_offd_j,
-                      rsWA,
-                      0 );
+   if (lane == 0)
+   {
+      rs[row] = rl;
+   }
+}
 
-   // AFF AFC
-   hypre_GpuProfilingPushRange("Extract Submatrix");
-   hypre_ParCSRMatrixGenerateFFFCDevice(A, CF_marker, num_cpts_global, S, &AFC, &AFF);
-   hypre_GpuProfilingPopRange();
+//-----------------------------------------------------------------------
+__global__
+void hypreGPUKernel_compute_aff_afc( hypre_DeviceItem    &item,
+                                     HYPRE_Int      nr_of_rows,
+                                     HYPRE_Int     *AFF_diag_i,
+                                     HYPRE_Int     *AFF_diag_j,
+                                     HYPRE_Complex *AFF_diag_data,
+                                     HYPRE_Int     *AFF_offd_i,
+                                     HYPRE_Complex *AFF_offd_data,
+                                     HYPRE_Int     *AFC_diag_i,
+                                     HYPRE_Complex *AFC_diag_data,
+                                     HYPRE_Int     *AFC_offd_i,
+                                     HYPRE_Complex *AFC_offd_data,
+                                     HYPRE_Complex *rsW,
+                                     HYPRE_Complex *rsFC )
+{
+   HYPRE_Int row = hypre_gpu_get_grid_warp_id<1, 1>(item);
 
-   W_nr_of_rows = hypre_ParCSRMatrixNumRows(AFF);
-   hypre_assert(A_nr_of_rows == W_nr_of_rows + hypre_ParCSRMatrixNumCols(AFC));
+   if (row >= nr_of_rows)
+   {
+      return;
+   }
 
-   rsW = hypre_TAlloc(HYPRE_Complex, W_nr_of_rows, HYPRE_MEMORY_DEVICE);
-   HYPRE_Complex *new_end = HYPRE_THRUST_CALL( copy_if,
-                                               rsWA,
-                                               rsWA + A_nr_of_rows,
-                                               CF_marker,
-                                               rsW,
-                                               is_negative<HYPRE_Int>() );
-   hypre_assert(new_end - rsW == W_nr_of_rows);
-   hypre_TFree(rsWA, HYPRE_MEMORY_DEVICE);
+   HYPRE_Int lane = hypre_gpu_get_lane_id<1>(item);
+   HYPRE_Int p = 0, q;
 
-   /* row sum of AFC, i.e., D_beta */
-   rsFC = hypre_TAlloc(HYPRE_Complex, W_nr_of_rows, HYPRE_MEMORY_DEVICE);
-   hypre_CSRMatrixComputeRowSumDevice(hypre_ParCSRMatrixDiag(AFC), NULL, NULL, rsFC, 0, 1.0, "set");
-   hypre_CSRMatrixComputeRowSumDevice(hypre_ParCSRMatrixOffd(AFC), NULL, NULL, rsFC, 0, 1.0, "add");
+   HYPRE_Complex iscale = 0.0, beta = 0.0;
 
-   /* 5. Form matrix ~{A_FF}, (return twAFF in AFF data structure ) */
-   /* 6. Form matrix ~{A_FC}, (return twAFC in AFC data structure) */
-   hypre_GpuProfilingPushRange("Compute interp matrix");
-   gDim = hypre_GetDefaultCUDAGridDimension(W_nr_of_rows, "warp", bDim);
-   HYPRE_CUDA_LAUNCH( hypreCUDAKernel_compute_aff_afc,
-                      gDim, bDim,
-                      W_nr_of_rows,
-                      hypre_CSRMatrixI(hypre_ParCSRMatrixDiag(AFF)),
-                      hypre_CSRMatrixJ(hypre_ParCSRMatrixDiag(AFF)),
-                      hypre_CSRMatrixData(hypre_ParCSRMatrixDiag(AFF)),
-                      hypre_CSRMatrixI(hypre_ParCSRMatrixOffd(AFF)),
-                      hypre_CSRMatrixData(hypre_ParCSRMatrixOffd(AFF)),
-                      hypre_CSRMatrixI(hypre_ParCSRMatrixDiag(AFC)),
-                      hypre_CSRMatrixData(hypre_ParCSRMatrixDiag(AFC)),
-                      hypre_CSRMatrixI(hypre_ParCSRMatrixOffd(AFC)),
-                      hypre_CSRMatrixData(hypre_ParCSRMatrixOffd(AFC)),
-                      rsW,
-                      rsFC );
-   hypre_TFree(rsW,  HYPRE_MEMORY_DEVICE);
-   hypre_TFree(rsFC, HYPRE_MEMORY_DEVICE);
-   hypre_GpuProfilingPopRange();
+   if (lane == 0)
+   {
+      iscale = -1.0 / read_only_load(&rsW[row]);
+      beta = read_only_load(&rsFC[row]);
+   }
+   iscale = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, iscale, 0);
+   beta   = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, beta,   0);
 
-   /* 7. Perform matrix-matrix multiplication */
-   hypre_GpuProfilingPushRange("Matrix-matrix mult");
-   W = hypre_ParCSRMatMatDevice(AFF, AFC);
-   hypre_GpuProfilingPopRange();
+   // AFF
+   /* Diag part */
+   if (lane < 2)
+   {
+      p = read_only_load(AFF_diag_i + row + lane);
+   }
+   q = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 1);
+   p = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 0);
 
-   hypre_ParCSRMatrixDestroy(AFF);
-   hypre_ParCSRMatrixDestroy(AFC);
+   // do not assume diag is the first element of row
+   for (HYPRE_Int j = p + lane; j < q; j += HYPRE_WARP_SIZE)
+   {
+      if (read_only_load(&AFF_diag_j[j]) == row)
+      {
+         AFF_diag_data[j] = beta * iscale;
+      }
+      else
+      {
+         AFF_diag_data[j] *= iscale;
+      }
+   }
 
-   /* 8. Construct P from matrix product W */
-   P_diag_nnz = hypre_CSRMatrixNumNonzeros(hypre_ParCSRMatrixDiag(W)) +
-                hypre_ParCSRMatrixNumCols(W);
+   /* offd part */
+   if (lane < 2)
+   {
+      p = read_only_load(AFF_offd_i + row + lane);
+   }
+   q = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 1);
+   p = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 0);
 
-   P_diag_i    = hypre_TAlloc(HYPRE_Int,     A_nr_of_rows+1, HYPRE_MEMORY_DEVICE);
-   P_diag_j    = hypre_TAlloc(HYPRE_Int,     P_diag_nnz,     HYPRE_MEMORY_DEVICE);
-   P_diag_data = hypre_TAlloc(HYPRE_Complex, P_diag_nnz,     HYPRE_MEMORY_DEVICE);
-   P_offd_i    = hypre_TAlloc(HYPRE_Int,     A_nr_of_rows+1, HYPRE_MEMORY_DEVICE);
+   for (HYPRE_Int j = p + lane; j < q; j += HYPRE_WARP_SIZE)
+   {
+      AFF_offd_data[j] *= iscale;
+   }
 
-   hypre_GpuProfilingPushRange("Extend matrix");
-   hypreDevice_extendWtoP( A_nr_of_rows,
-                           W_nr_of_rows,
-                           hypre_ParCSRMatrixNumCols(W),
-                           CF_marker,
-                           hypre_CSRMatrixNumNonzeros(hypre_ParCSRMatrixDiag(W)),
-                           hypre_CSRMatrixI(hypre_ParCSRMatrixDiag(W)),
-                           hypre_CSRMatrixJ(hypre_ParCSRMatrixDiag(W)),
-                           hypre_CSRMatrixData(hypre_ParCSRMatrixDiag(W)),
-                           P_diag_i,
-                           P_diag_j,
-                           P_diag_data,
-                           hypre_CSRMatrixI(hypre_ParCSRMatrixOffd(W)),
-                           P_offd_i );
-   hypre_GpuProfilingPopRange();
+   if (beta != 0.0)
+   {
+      beta = 1.0 / beta;
+   }
 
-   // final P
-   P = hypre_ParCSRMatrixCreate(hypre_ParCSRMatrixComm(A),
-                                hypre_ParCSRMatrixGlobalNumRows(A),
-                                hypre_ParCSRMatrixGlobalNumCols(W),
-                                hypre_ParCSRMatrixColStarts(A),
-                                hypre_ParCSRMatrixColStarts(W),
-                                hypre_CSRMatrixNumCols(hypre_ParCSRMatrixOffd(W)),
-                                P_diag_nnz,
-                                hypre_CSRMatrixNumNonzeros(hypre_ParCSRMatrixOffd(W)));
+   // AFC
+   if (lane < 2)
+   {
+      p = read_only_load(AFC_diag_i + row + lane);
+   }
+   q = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 1);
+   p = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 0);
 
-   hypre_CSRMatrixI(hypre_ParCSRMatrixDiag(P))    = P_diag_i;
-   hypre_CSRMatrixJ(hypre_ParCSRMatrixDiag(P))    = P_diag_j;
-   hypre_CSRMatrixData(hypre_ParCSRMatrixDiag(P)) = P_diag_data;
+   /* Diag part */
+   for (HYPRE_Int j = p + lane; j < q; j += HYPRE_WARP_SIZE)
+   {
+      AFC_diag_data[j] *= beta;
+   }
 
-   hypre_CSRMatrixI(hypre_ParCSRMatrixOffd(P))    = P_offd_i;
-   hypre_CSRMatrixJ(hypre_ParCSRMatrixOffd(P))    = hypre_CSRMatrixJ(hypre_ParCSRMatrixOffd(W));
-   hypre_CSRMatrixData(hypre_ParCSRMatrixOffd(P)) = hypre_CSRMatrixData(hypre_ParCSRMatrixOffd(W));
-   hypre_CSRMatrixJ(hypre_ParCSRMatrixOffd(W))    = NULL;
-   hypre_CSRMatrixData(hypre_ParCSRMatrixOffd(W)) = NULL;
+   /* offd part */
+   if (lane < 2)
+   {
+      p = read_only_load(AFC_offd_i + row + lane);
+   }
+   q = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 1);
+   p = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 0);
 
-   hypre_CSRMatrixMemoryLocation(hypre_ParCSRMatrixDiag(P)) = HYPRE_MEMORY_DEVICE;
-   hypre_CSRMatrixMemoryLocation(hypre_ParCSRMatrixOffd(P)) = HYPRE_MEMORY_DEVICE;
+   for (HYPRE_Int j = p + lane; j < q; j += HYPRE_WARP_SIZE)
+   {
+      AFC_offd_data[j] *= beta;
+   }
+}
 
-   hypre_ParCSRMatrixDeviceColMapOffd(P) = hypre_ParCSRMatrixDeviceColMapOffd(W);
-   hypre_ParCSRMatrixColMapOffd(P)       = hypre_ParCSRMatrixColMapOffd(W);
-   hypre_ParCSRMatrixDeviceColMapOffd(W) = NULL;
-   hypre_ParCSRMatrixColMapOffd(W)       = NULL;
 
-   hypre_ParCSRMatrixNumNonzeros(P)  = hypre_ParCSRMatrixNumNonzeros(W) +
-                                       hypre_ParCSRMatrixGlobalNumCols(W);
-   hypre_ParCSRMatrixDNumNonzeros(P) = (HYPRE_Real) hypre_ParCSRMatrixNumNonzeros(P);
+//-----------------------------------------------------------------------
+HYPRE_Int
+hypreDevice_extendWtoP( HYPRE_Int      P_nr_of_rows,
+                        HYPRE_Int      W_nr_of_rows,
+                        HYPRE_Int      W_nr_of_cols,
+                        HYPRE_Int     *CF_marker,
+                        HYPRE_Int      W_diag_nnz,
+                        HYPRE_Int     *W_diag_i,
+                        HYPRE_Int     *W_diag_j,
+                        HYPRE_Complex *W_diag_data,
+                        HYPRE_Int     *P_diag_i,
+                        HYPRE_Int     *P_diag_j,
+                        HYPRE_Complex *P_diag_data,
+                        HYPRE_Int     *W_offd_i,
+                        HYPRE_Int     *P_offd_i )
+{
+   hypre_GpuProfilingPushRange("extendWtoP");
 
-   hypre_GpuProfilingPushRange("Truncation");
-   if (trunc_factor != 0.0 || max_elmts > 0)
-   {
-      hypre_BoomerAMGInterpTruncationDevice(P, trunc_factor, max_elmts );
-   }
-   hypre_GpuProfilingPopRange();
+   // row index shift P --> W
+   HYPRE_Int *PWoffset = hypre_TAlloc(HYPRE_Int, P_nr_of_rows + 1, HYPRE_MEMORY_DEVICE);
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_ONEDPL_CALL( std::transform,
+                      CF_marker,
+                      &CF_marker[P_nr_of_rows],
+                      PWoffset,
+                      is_nonnegative<HYPRE_Int>() );
+#else
+   HYPRE_THRUST_CALL( transform,
+                      CF_marker,
+                      &CF_marker[P_nr_of_rows],
+                      PWoffset,
+                      is_nonnegative<HYPRE_Int>() );
+#endif
 
-   hypre_MatvecCommPkgCreate(P);
+   hypre_Memset(PWoffset + P_nr_of_rows, 0, sizeof(HYPRE_Int), HYPRE_MEMORY_DEVICE);
 
-   HYPRE_THRUST_CALL( replace_if, CF_marker, CF_marker + A_nr_of_rows, equal<HYPRE_Int>(-3), -1);  
+   hypreDevice_IntegerExclusiveScan(P_nr_of_rows + 1, PWoffset);
 
-   *P_ptr = P;
+   // map F+C to (next) F
+   HYPRE_Int *map2F = hypre_TAlloc(HYPRE_Int, P_nr_of_rows + 1, HYPRE_MEMORY_DEVICE);
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_ONEDPL_CALL( std::transform,
+                      oneapi::dpl::counting_iterator<HYPRE_Int>(0),
+                      oneapi::dpl::counting_iterator<HYPRE_Int>(P_nr_of_rows + 1),
+                      PWoffset,
+                      map2F,
+                      std::minus<HYPRE_Int>() );
+#else
+   HYPRE_THRUST_CALL( transform,
+                      thrust::counting_iterator<HYPRE_Int>(0),
+                      thrust::counting_iterator<HYPRE_Int>(P_nr_of_rows + 1),
+                      PWoffset,
+                      map2F,
+                      thrust::minus<HYPRE_Int>() );
+#endif
 
-   /* 9. Free memory */
-   hypre_ParCSRMatrixDestroy(W);
+   // P_diag_i
+#if defined(HYPRE_USING_SYCL)
+   hypreSycl_gather( map2F,
+                     map2F + P_nr_of_rows + 1,
+                     W_diag_i,
+                     P_diag_i );
 
-   return hypre_error_flag;
-}
+   hypreDevice_IntAxpyn( P_diag_i, P_nr_of_rows + 1, PWoffset, P_diag_i, 1 );
 
-/*-----------------------------------------------------------------------*/
-HYPRE_Int
-hypre_BoomerAMGBuildExtPIInterpDevice( hypre_ParCSRMatrix  *A,
-                                       HYPRE_Int           *CF_marker,
-                                       hypre_ParCSRMatrix  *S,
-                                       HYPRE_BigInt        *num_cpts_global,
-                                       HYPRE_Int            num_functions,
-                                       HYPRE_Int           *dof_func,
-                                       HYPRE_Int            debug_flag,
-                                       HYPRE_Real           trunc_factor,
-                                       HYPRE_Int            max_elmts,
-                                       hypre_ParCSRMatrix **P_ptr)
-{
-   HYPRE_Int           A_nr_of_rows = hypre_ParCSRMatrixNumRows(A);
-   hypre_CSRMatrix    *A_diag       = hypre_ParCSRMatrixDiag(A);
-   HYPRE_Complex      *A_diag_data  = hypre_CSRMatrixData(A_diag);
-   HYPRE_Int          *A_diag_i     = hypre_CSRMatrixI(A_diag);
-   hypre_CSRMatrix    *A_offd       = hypre_ParCSRMatrixOffd(A);
-   HYPRE_Complex      *A_offd_data  = hypre_CSRMatrixData(A_offd);
-   HYPRE_Int          *A_offd_i     = hypre_CSRMatrixI(A_offd);
-   HYPRE_Int           A_offd_nnz   = hypre_CSRMatrixNumNonzeros(A_offd);
-   hypre_CSRMatrix    *AFF_ext = NULL;
-   hypre_ParCSRMatrix *AFF, *AFC;
-   hypre_ParCSRMatrix *W, *P;
-   HYPRE_Int           W_nr_of_rows, P_diag_nnz;
-   HYPRE_Complex      *rsFC, *rsFC_offd, *rsWA, *rsW;
-   HYPRE_Int          *P_diag_i, *P_diag_j, *P_offd_i, num_procs;
-   HYPRE_Complex      *P_diag_data;
+   // P_offd_i
+   if (W_offd_i && P_offd_i)
+   {
+      hypreSycl_gather( map2F,
+                        map2F + P_nr_of_rows + 1,
+                        W_offd_i,
+                        P_offd_i );
+   }
+#else
+   HYPRE_THRUST_CALL( gather,
+                      map2F,
+                      map2F + P_nr_of_rows + 1,
+                      W_diag_i,
+                      P_diag_i );
 
-   hypre_BoomerAMGMakeSocFromSDevice(A, S);
+   hypreDevice_IntAxpyn( P_diag_i, P_nr_of_rows + 1, PWoffset, P_diag_i, 1 );
 
-   HYPRE_Int          *Soc_diag_j   = hypre_ParCSRMatrixSocDiagJ(S);
-   HYPRE_Int          *Soc_offd_j   = hypre_ParCSRMatrixSocOffdJ(S);
+   // P_offd_i
+   if (W_offd_i && P_offd_i)
+   {
+      HYPRE_THRUST_CALL( gather,
+                         map2F,
+                         map2F + P_nr_of_rows + 1,
+                         W_offd_i,
+                         P_offd_i );
+   }
+#endif
 
-   hypre_MPI_Comm_size(hypre_ParCSRMatrixComm(A), &num_procs);
+   hypre_TFree(map2F, HYPRE_MEMORY_DEVICE);
 
-   /* 0.Find row sums of weak elements */
-   /* row sum of A-weak + Diag(A), i.e., (D_gamma + D_alpha) in the notes, only for F-pts */
-   rsWA = hypre_TAlloc(HYPRE_Complex, A_nr_of_rows, HYPRE_MEMORY_DEVICE);
+   // row index shift W --> P
+   HYPRE_Int *WPoffset = hypre_TAlloc(HYPRE_Int, W_nr_of_rows, HYPRE_MEMORY_DEVICE);
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_Int *new_end = hypreSycl_copy_if( PWoffset,
+                                           PWoffset + P_nr_of_rows,
+                                           CF_marker,
+                                           WPoffset,
+                                           is_negative<HYPRE_Int>() );
+#else
+   HYPRE_Int *new_end = HYPRE_THRUST_CALL( copy_if,
+                                           PWoffset,
+                                           PWoffset + P_nr_of_rows,
+                                           CF_marker,
+                                           WPoffset,
+                                           is_negative<HYPRE_Int>() );
+#endif
+   hypre_assert(new_end - WPoffset == W_nr_of_rows);
 
-   dim3 bDim = hypre_GetDefaultCUDABlockDimension();
-   dim3 gDim = hypre_GetDefaultCUDAGridDimension(A_nr_of_rows, "warp",   bDim);
+   hypre_TFree(PWoffset, HYPRE_MEMORY_DEVICE);
 
-   HYPRE_CUDA_LAUNCH( hypreCUDAKernel_compute_weak_rowsums,
-                      gDim, bDim,
-                      A_nr_of_rows,
-                      A_offd_nnz > 0,
-                      CF_marker,
-                      A_diag_i,
-                      A_diag_data,
-                      Soc_diag_j,
-                      A_offd_i,
-                      A_offd_data,
-                      Soc_offd_j,
-                      rsWA,
-                      0 );
+   // elements shift
+   HYPRE_Int *shift = hypreDevice_CsrRowPtrsToIndices(W_nr_of_rows, W_diag_nnz, W_diag_i);
+#if defined(HYPRE_USING_SYCL)
+   hypreSycl_gather( shift,
+                     shift + W_diag_nnz,
+                     WPoffset,
+                     shift);
+#else
+   HYPRE_THRUST_CALL( gather,
+                      shift,
+                      shift + W_diag_nnz,
+                      WPoffset,
+                      shift);
+#endif
+
+   hypre_TFree(WPoffset, HYPRE_MEMORY_DEVICE);
+
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_ONEDPL_CALL( std::transform,
+                      shift,
+                      shift + W_diag_nnz,
+                      oneapi::dpl::counting_iterator<HYPRE_Int>(0),
+                      shift,
+                      std::plus<HYPRE_Int>() );
+
+   // P_diag_j and P_diag_data
+   if (W_diag_j && W_diag_data)
+   {
+      hypreSycl_scatter( oneapi::dpl::make_zip_iterator(W_diag_j, W_diag_data),
+                         oneapi::dpl::make_zip_iterator(W_diag_j, W_diag_data) + W_diag_nnz,
+                         shift,
+                         oneapi::dpl::make_zip_iterator(P_diag_j, P_diag_data) );
+   }
+#else
+   HYPRE_THRUST_CALL( transform,
+                      shift,
+                      shift + W_diag_nnz,
+                      thrust::counting_iterator<HYPRE_Int>(0),
+                      shift,
+                      thrust::plus<HYPRE_Int>() );
+
+   // P_diag_j and P_diag_data
+   if (W_diag_j && W_diag_data)
+   {
+      HYPRE_THRUST_CALL( scatter,
+                         thrust::make_zip_iterator(thrust::make_tuple(W_diag_j, W_diag_data)),
+                         thrust::make_zip_iterator(thrust::make_tuple(W_diag_j, W_diag_data)) + W_diag_nnz,
+                         shift,
+                         thrust::make_zip_iterator(thrust::make_tuple(P_diag_j, P_diag_data)) );
+   }
+#endif
+   hypre_TFree(shift, HYPRE_MEMORY_DEVICE);
+
+   // fill the gap
+   HYPRE_Int *PC_i = hypre_TAlloc(HYPRE_Int, W_nr_of_cols, HYPRE_MEMORY_DEVICE);
+#if defined(HYPRE_USING_SYCL)
+   new_end = hypreSycl_copy_if( P_diag_i,
+                                P_diag_i + P_nr_of_rows,
+                                CF_marker,
+                                PC_i,
+                                is_nonnegative<HYPRE_Int>() );
+#else
+   new_end = HYPRE_THRUST_CALL( copy_if,
+                                P_diag_i,
+                                P_diag_i + P_nr_of_rows,
+                                CF_marker,
+                                PC_i,
+                                is_nonnegative<HYPRE_Int>() );
+#endif
+
+   hypre_assert(new_end - PC_i == W_nr_of_cols);
+
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_ONEDPL_CALL( copy,
+                      oneapi::dpl::counting_iterator<HYPRE_Int>(0),
+                      oneapi::dpl::counting_iterator<HYPRE_Int>(W_nr_of_cols),
+                      oneapi::dpl::make_permutation_iterator(P_diag_j, PC_i) );
+#else
+   HYPRE_THRUST_CALL( scatter,
+                      thrust::counting_iterator<HYPRE_Int>(0),
+                      thrust::counting_iterator<HYPRE_Int>(W_nr_of_cols),
+                      PC_i,
+                      P_diag_j );
+#endif
+
+   hypreDevice_ScatterConstant(P_diag_data, W_nr_of_cols, PC_i, (HYPRE_Complex) 1.0);
+
+   hypre_TFree(PC_i, HYPRE_MEMORY_DEVICE);
 
-   // AFF AFC
-   hypre_GpuProfilingPushRange("Extract Submatrix");
-   hypre_ParCSRMatrixGenerateFFFCDevice(A, CF_marker, num_cpts_global, S, &AFC, &AFF);
    hypre_GpuProfilingPopRange();
 
-   W_nr_of_rows  = hypre_CSRMatrixNumRows(hypre_ParCSRMatrixDiag(AFF));
-   hypre_assert(A_nr_of_rows == W_nr_of_rows + hypre_ParCSRMatrixNumCols(AFC));
+   return hypre_error_flag;
+}
 
-   rsW = hypre_TAlloc(HYPRE_Complex, W_nr_of_rows, HYPRE_MEMORY_DEVICE);
-   HYPRE_Complex *new_end = HYPRE_THRUST_CALL( copy_if,
-                                               rsWA,
-                                               rsWA + A_nr_of_rows,
-                                               CF_marker,
-                                               rsW,
-                                               is_negative<HYPRE_Int>() );
-   hypre_assert(new_end - rsW == W_nr_of_rows);
-   hypre_TFree(rsWA, HYPRE_MEMORY_DEVICE);
+//-----------------------------------------------------------------------
+// For Ext+i Interp, scale AFF from the left and the right
+__global__
+void hypreGPUKernel_compute_twiaff_w( hypre_DeviceItem    &item,
+                                      HYPRE_Int      nr_of_rows,
+                                      HYPRE_BigInt   first_index,
+                                      HYPRE_Int     *AFF_diag_i,
+                                      HYPRE_Int     *AFF_diag_j,
+                                      HYPRE_Complex *AFF_diag_data,
+                                      HYPRE_Complex *AFF_diag_data_old,
+                                      HYPRE_Int     *AFF_offd_i,
+                                      HYPRE_Int     *AFF_offd_j,
+                                      HYPRE_Complex *AFF_offd_data,
+                                      HYPRE_Int     *AFF_ext_i,
+                                      HYPRE_BigInt  *AFF_ext_j,
+                                      HYPRE_Complex *AFF_ext_data,
+                                      HYPRE_Complex *rsW,
+                                      HYPRE_Complex *rsFC,
+                                      HYPRE_Complex *rsFC_offd )
+{
+   HYPRE_Int row = hypre_gpu_get_grid_warp_id<1, 1>(item);
+
+   if (row >= nr_of_rows)
+   {
+      return;
+   }
+
+   HYPRE_Int lane = hypre_gpu_get_lane_id<1>(item);
+
+   HYPRE_Int ib_diag = 0, ie_diag, ib_offd = 0, ie_offd;
+
+   // diag
+   if (lane < 2)
+   {
+      ib_diag = read_only_load(AFF_diag_i + row + lane);
+   }
+   ie_diag = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, ib_diag, 1);
+   ib_diag = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, ib_diag, 0);
+
+   HYPRE_Complex theta_i = 0.0;
+
+   // do not assume diag is the first element of row
+   // entire warp works on each j
+   for (HYPRE_Int indj = ib_diag; indj < ie_diag; indj++)
+   {
+      HYPRE_Int j = 0;
+
+      if (lane == 0)
+      {
+         j = read_only_load(&AFF_diag_j[indj]);
+      }
+      j = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, j, 0);
+
+      if (j == row)
+      {
+         if (lane == 0)
+         {
+            AFF_diag_data[indj] = 1.0;
+         }
+
+         continue;
+      }
+
+      HYPRE_Int kb = 0, ke;
+
+      // find if there exists entry (j, row) in row j of diag
+      if (lane < 2)
+      {
+         kb = read_only_load(AFF_diag_i + j + lane);
+      }
+      ke = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, kb, 1);
+      kb = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, kb, 0);
+
+      HYPRE_Int kmatch = -1;
+      for (HYPRE_Int indk = kb + lane; warp_any_sync(item, HYPRE_WARP_FULL_MASK, indk < ke);
+           indk += HYPRE_WARP_SIZE)
+      {
+         if (indk < ke && row == read_only_load(&AFF_diag_j[indk]))
+         {
+            kmatch = indk;
+         }
+
+         if (warp_any_sync(item, HYPRE_WARP_FULL_MASK, kmatch >= 0))
+         {
+            break;
+         }
+      }
+      kmatch = warp_reduce_max(item, kmatch);
+
+      if (lane == 0)
+      {
+         HYPRE_Complex vji = kmatch >= 0 ? read_only_load(&AFF_diag_data_old[kmatch]) : 0.0;
+         HYPRE_Complex rsj = read_only_load(&rsFC[j]) + vji;
+         if (rsj)
+         {
+            HYPRE_Complex vij = read_only_load(&AFF_diag_data_old[indj]) / rsj;
+            AFF_diag_data[indj] = vij;
+            theta_i += vji * vij;
+         }
+         else
+         {
+            AFF_diag_data[indj] = 0.0;
+            theta_i += read_only_load(&AFF_diag_data_old[indj]);
+         }
+      }
+   }
+
+   // offd
+   if (lane < 2)
+   {
+      ib_offd = read_only_load(AFF_offd_i + row + lane);
+   }
+   ie_offd = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, ib_offd, 1);
+   ib_offd = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, ib_offd, 0);
+
+   for (HYPRE_Int indj = ib_offd; indj < ie_offd; indj++)
+   {
+      HYPRE_Int j = 0;
+
+      if (lane == 0)
+      {
+         j = read_only_load(&AFF_offd_j[indj]);
+      }
+      j = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, j, 0);
+
+      HYPRE_Int kb = 0, ke;
+
+      if (lane < 2)
+      {
+         kb = read_only_load(AFF_ext_i + j + lane);
+      }
+      ke = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, kb, 1);
+      kb = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, kb, 0);
+
+      HYPRE_Int kmatch = -1;
+      for (HYPRE_Int indk = kb + lane; warp_any_sync(item, HYPRE_WARP_FULL_MASK, indk < ke);
+           indk += HYPRE_WARP_SIZE)
+      {
+         if (indk < ke && row + first_index == read_only_load(&AFF_ext_j[indk]))
+         {
+            kmatch = indk;
+         }
+
+         if (warp_any_sync(item, HYPRE_WARP_FULL_MASK, kmatch >= 0))
+         {
+            break;
+         }
+      }
+      kmatch = warp_reduce_max(item, kmatch);
+
+      if (lane == 0)
+      {
+         HYPRE_Complex vji = kmatch >= 0 ? read_only_load(&AFF_ext_data[kmatch]) : 0.0;
+         HYPRE_Complex rsj = read_only_load(&rsFC_offd[j]) + vji;
+         if (rsj)
+         {
+            HYPRE_Complex vij = read_only_load(&AFF_offd_data[indj]) / rsj;
+            AFF_offd_data[indj] = vij;
+            theta_i += vji * vij;
+         }
+         else
+         {
+            AFF_offd_data[indj] = 0.0;
+            theta_i += read_only_load(&AFF_offd_data[indj]);
+         }
+      }
+   }
+
+   // scale row
+   if (lane == 0)
+   {
+      theta_i += read_only_load(rsW + row);
+      theta_i = theta_i ? -1.0 / theta_i : -1.0;
+   }
+   theta_i = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, theta_i, 0);
+
+   for (HYPRE_Int j = ib_diag + lane; j < ie_diag; j += HYPRE_WARP_SIZE)
+   {
+      AFF_diag_data[j] *= theta_i;
+   }
+
+   for (HYPRE_Int j = ib_offd + lane; j < ie_offd; j += HYPRE_WARP_SIZE)
+   {
+      AFF_offd_data[j] *= theta_i;
+   }
+}
+
+
+//-----------------------------------------------------------------------
+__global__
+void hypreGPUKernel_compute_aff_afc_epe( hypre_DeviceItem    &item,
+                                         HYPRE_Int      nr_of_rows,
+                                         HYPRE_Int     *AFF_diag_i,
+                                         HYPRE_Int     *AFF_diag_j,
+                                         HYPRE_Complex *AFF_diag_data,
+                                         HYPRE_Int     *AFF_offd_i,
+                                         HYPRE_Int     *AFF_offd_j,
+                                         HYPRE_Complex *AFF_offd_data,
+                                         HYPRE_Int     *AFC_diag_i,
+                                         HYPRE_Complex *AFC_diag_data,
+                                         HYPRE_Int     *AFC_offd_i,
+                                         HYPRE_Complex *AFC_offd_data,
+                                         HYPRE_Complex *rsW,
+                                         HYPRE_Complex *dlam,
+                                         HYPRE_Complex *dtmp,
+                                         HYPRE_Complex *dtmp_offd )
+{
+   HYPRE_Int row = hypre_gpu_get_grid_warp_id<1, 1>(item);
 
-   /* row sum of AFC, i.e., D_beta */
-   rsFC = hypre_TAlloc(HYPRE_Complex, W_nr_of_rows, HYPRE_MEMORY_DEVICE);
-   hypre_CSRMatrixComputeRowSumDevice(hypre_ParCSRMatrixDiag(AFC), NULL, NULL, rsFC, 0, 1.0, "set");
-   hypre_CSRMatrixComputeRowSumDevice(hypre_ParCSRMatrixOffd(AFC), NULL, NULL, rsFC, 0, 1.0, "add");
+   if (row >= nr_of_rows)
+   {
+      return;
+   }
 
-   /* collect off-processor rsFC */
-   hypre_ParCSRCommPkg    *comm_pkg = hypre_ParCSRMatrixCommPkg(AFF);
-   hypre_ParCSRCommHandle *comm_handle;
-   if (!comm_pkg)
+   HYPRE_Int lane = hypre_gpu_get_lane_id<1>(item);
+   HYPRE_Int pd = 0, qd, po = 0, qo, xd = 0, yd, xo = 0, yo;
+
+   HYPRE_Complex theta = 0.0, value = 0.0;
+   HYPRE_Complex dtau_i = 0.0;
+
+   if (lane < 2)
    {
-      hypre_MatvecCommPkgCreate(AFF);
-      comm_pkg = hypre_ParCSRMatrixCommPkg(AFF);
+      pd = read_only_load(AFF_diag_i + row + lane);
+      po = read_only_load(AFF_offd_i + row + lane);
+      xd = read_only_load(AFC_diag_i + row + lane);
+      xo = read_only_load(AFC_offd_i + row + lane);
    }
-   rsFC_offd = hypre_TAlloc(HYPRE_Complex, hypre_CSRMatrixNumCols(hypre_ParCSRMatrixOffd(AFF)), HYPRE_MEMORY_DEVICE);
-   HYPRE_Int num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
-   HYPRE_Int num_elmts_send = hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends);
-   HYPRE_Complex *send_buf = hypre_TAlloc(HYPRE_Complex, num_elmts_send, HYPRE_MEMORY_DEVICE);
-   hypre_ParCSRCommPkgCopySendMapElmtsToDevice(comm_pkg);
-   HYPRE_THRUST_CALL( gather,
-                      hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg),
-                      hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg) + num_elmts_send,
-                      rsFC,
-                      send_buf );
-   comm_handle = hypre_ParCSRCommHandleCreate_v2(1, comm_pkg, HYPRE_MEMORY_DEVICE, send_buf, HYPRE_MEMORY_DEVICE, rsFC_offd);
-   hypre_ParCSRCommHandleDestroy(comm_handle);
-   hypre_TFree(send_buf, HYPRE_MEMORY_DEVICE);
 
-   /* offd rows of AFF */
-   if (num_procs > 1)
+   qd = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, pd, 1);
+   pd = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, pd, 0);
+   qo = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, po, 1);
+   po = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, po, 0);
+   yd = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, xd, 1);
+   xd = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, xd, 0);
+   yo = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, xo, 1);
+   xo = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, xo, 0);
+
+   /* D_\tau */
+   /* do not assume the first element is the diagonal */
+   for (HYPRE_Int j = pd + lane; j < qd; j += HYPRE_WARP_SIZE)
    {
-      AFF_ext = hypre_ParCSRMatrixExtractBExtDevice(AFF, AFF, 1);
+      const HYPRE_Int index = read_only_load(&AFF_diag_j[j]);
+      if (index != row)
+      {
+         dtau_i += AFF_diag_data[j] * read_only_load(&dtmp[index]);
+      }
    }
 
-   /* 5. Form matrix ~{A_FF}, (return twAFF in AFF data structure ) */
-   HYPRE_Complex *AFF_diag_data_old = hypre_TAlloc(HYPRE_Complex, hypre_CSRMatrixNumNonzeros(hypre_ParCSRMatrixDiag(AFF)),
-                                                   HYPRE_MEMORY_DEVICE);
-   HYPRE_THRUST_CALL( copy,
-                      hypre_CSRMatrixData(hypre_ParCSRMatrixDiag(AFF)),
-                      hypre_CSRMatrixData(hypre_ParCSRMatrixDiag(AFF)) + hypre_CSRMatrixNumNonzeros(hypre_ParCSRMatrixDiag(AFF)),
-                      AFF_diag_data_old );
+   for (HYPRE_Int j = po + lane; j < qo; j += HYPRE_WARP_SIZE)
+   {
+      const HYPRE_Int index = read_only_load(&AFF_offd_j[j]);
+      dtau_i += AFF_offd_data[j] * read_only_load(&dtmp_offd[index]);
+   }
 
-   hypre_GpuProfilingPushRange("Compute interp matrix");
-   gDim = hypre_GetDefaultCUDAGridDimension(W_nr_of_rows, "warp", bDim);
-   HYPRE_CUDA_LAUNCH( hypreCUDAKernel_compute_twiaff_w,
-                      gDim, bDim,
-                      W_nr_of_rows,
-                      hypre_ParCSRMatrixFirstRowIndex(AFF),
-                      hypre_CSRMatrixI(hypre_ParCSRMatrixDiag(AFF)),
-                      hypre_CSRMatrixJ(hypre_ParCSRMatrixDiag(AFF)),
-                      hypre_CSRMatrixData(hypre_ParCSRMatrixDiag(AFF)),
-                      AFF_diag_data_old,
-                      hypre_CSRMatrixI(hypre_ParCSRMatrixOffd(AFF)),
-                      hypre_CSRMatrixJ(hypre_ParCSRMatrixOffd(AFF)),
-                      hypre_CSRMatrixData(hypre_ParCSRMatrixOffd(AFF)),
-                      AFF_ext ? hypre_CSRMatrixI(AFF_ext)    : NULL,
-                      AFF_ext ? hypre_CSRMatrixBigJ(AFF_ext) : NULL,
-                      AFF_ext ? hypre_CSRMatrixData(AFF_ext) : NULL,
-                      rsW,
-                      rsFC,
-                      rsFC_offd );
-   hypre_TFree(rsW,               HYPRE_MEMORY_DEVICE);
-   hypre_TFree(rsFC,              HYPRE_MEMORY_DEVICE);
-   hypre_TFree(rsFC_offd,         HYPRE_MEMORY_DEVICE);
-   hypre_TFree(AFF_diag_data_old, HYPRE_MEMORY_DEVICE);
-   hypre_CSRMatrixDestroy(AFF_ext);
-   hypre_GpuProfilingPopRange();
+   dtau_i = warp_reduce_sum(item, dtau_i);
 
-   /* 7. Perform matrix-matrix multiplication */
-   hypre_GpuProfilingPushRange("Matrix-matrix mult");
-   W = hypre_ParCSRMatMatDevice(AFF, AFC);
-   hypre_GpuProfilingPopRange();
+   if (lane == 0)
+   {
+      value = read_only_load(&rsW[row]) + dtau_i;
+      value = value != 0.0 ? -1.0 / value : 0.0;
 
-   hypre_ParCSRMatrixDestroy(AFF);
-   hypre_ParCSRMatrixDestroy(AFC);
+      theta = read_only_load(&dlam[row]);
+   }
 
-   /* 8. Construct P from matrix product W */
-   P_diag_nnz = hypre_CSRMatrixNumNonzeros(hypre_ParCSRMatrixDiag(W)) +
-                hypre_ParCSRMatrixNumCols(W);
+   value = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, value, 0);
+   theta = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, theta, 0);
 
-   P_diag_i    = hypre_TAlloc(HYPRE_Int,     A_nr_of_rows+1, HYPRE_MEMORY_DEVICE);
-   P_diag_j    = hypre_TAlloc(HYPRE_Int,     P_diag_nnz,     HYPRE_MEMORY_DEVICE);
-   P_diag_data = hypre_TAlloc(HYPRE_Complex, P_diag_nnz,     HYPRE_MEMORY_DEVICE);
-   P_offd_i    = hypre_TAlloc(HYPRE_Int,     A_nr_of_rows+1, HYPRE_MEMORY_DEVICE);
+   /* AFF Diag part */
+   // do not assume diag is the first element of row
+   for (HYPRE_Int j = pd + lane; j < qd; j += HYPRE_WARP_SIZE)
+   {
+      if (read_only_load(&AFF_diag_j[j]) == row)
+      {
+         AFF_diag_data[j] = theta * value;
+      }
+      else
+      {
+         AFF_diag_data[j] *= value;
+      }
+   }
 
-   hypre_GpuProfilingPushRange("Extend matrix");
-   hypreDevice_extendWtoP( A_nr_of_rows,
-                           W_nr_of_rows,
-                           hypre_ParCSRMatrixNumCols(W),
-                           CF_marker,
-                           hypre_CSRMatrixNumNonzeros(hypre_ParCSRMatrixDiag(W)),
-                           hypre_CSRMatrixI(hypre_ParCSRMatrixDiag(W)),
-                           hypre_CSRMatrixJ(hypre_ParCSRMatrixDiag(W)),
-                           hypre_CSRMatrixData(hypre_ParCSRMatrixDiag(W)),
-                           P_diag_i,
-                           P_diag_j,
-                           P_diag_data,
-                           hypre_CSRMatrixI(hypre_ParCSRMatrixOffd(W)),
-                           P_offd_i );
-   hypre_GpuProfilingPopRange();
+   /* AFF offd part */
+   for (HYPRE_Int j = po + lane; j < qo; j += HYPRE_WARP_SIZE)
+   {
+      AFF_offd_data[j] *= value;
+   }
 
-   // final P
-   P = hypre_ParCSRMatrixCreate(hypre_ParCSRMatrixComm(A),
-                                hypre_ParCSRMatrixGlobalNumRows(A),
-                                hypre_ParCSRMatrixGlobalNumCols(W),
-                                hypre_ParCSRMatrixColStarts(A),
-                                hypre_ParCSRMatrixColStarts(W),
-                                hypre_CSRMatrixNumCols(hypre_ParCSRMatrixOffd(W)),
-                                P_diag_nnz,
-                                hypre_CSRMatrixNumNonzeros(hypre_ParCSRMatrixOffd(W)));
+   theta = theta != 0.0 ? 1.0 / theta : 0.0;
 
-   hypre_CSRMatrixI(hypre_ParCSRMatrixDiag(P))    = P_diag_i;
-   hypre_CSRMatrixJ(hypre_ParCSRMatrixDiag(P))    = P_diag_j;
-   hypre_CSRMatrixData(hypre_ParCSRMatrixDiag(P)) = P_diag_data;
+   /* AFC Diag part */
+   for (HYPRE_Int j = xd + lane; j < yd; j += HYPRE_WARP_SIZE)
+   {
+      AFC_diag_data[j] *= theta;
+   }
 
-   hypre_CSRMatrixI(hypre_ParCSRMatrixOffd(P))    = P_offd_i;
-   hypre_CSRMatrixJ(hypre_ParCSRMatrixOffd(P))    = hypre_CSRMatrixJ(hypre_ParCSRMatrixOffd(W));
-   hypre_CSRMatrixData(hypre_ParCSRMatrixOffd(P)) = hypre_CSRMatrixData(hypre_ParCSRMatrixOffd(W));
-   hypre_CSRMatrixJ(hypre_ParCSRMatrixOffd(W))    = NULL;
-   hypre_CSRMatrixData(hypre_ParCSRMatrixOffd(W)) = NULL;
+   /* AFC offd part */
+   for (HYPRE_Int j = xo + lane; j < yo; j += HYPRE_WARP_SIZE)
+   {
+      AFC_offd_data[j] *= theta;
+   }
+}
 
-   hypre_CSRMatrixMemoryLocation(hypre_ParCSRMatrixDiag(P)) = HYPRE_MEMORY_DEVICE;
-   hypre_CSRMatrixMemoryLocation(hypre_ParCSRMatrixOffd(P)) = HYPRE_MEMORY_DEVICE;
+//-----------------------------------------------------------------------
+// For Ext+e Interp, compute D_lambda and D_tmp = D_mu / D_lambda
+#if defined(HYPRE_USING_SYCL)
+SYCL_EXTERNAL
+#endif
+__global__
+void hypreGPUKernel_compute_dlam_dtmp( hypre_DeviceItem    &item,
+                                       HYPRE_Int      nr_of_rows,
+                                       HYPRE_Int     *AFF_diag_i,
+                                       HYPRE_Int     *AFF_diag_j,
+                                       HYPRE_Complex *AFF_diag_data,
+                                       HYPRE_Int     *AFF_offd_i,
+                                       HYPRE_Complex *AFF_offd_data,
+                                       HYPRE_Complex *rsFC,
+                                       HYPRE_Complex *dlam,
+                                       HYPRE_Complex *dtmp )
+{
+   HYPRE_Int row = hypre_gpu_get_grid_warp_id<1, 1>(item);
 
-   hypre_ParCSRMatrixDeviceColMapOffd(P) = hypre_ParCSRMatrixDeviceColMapOffd(W);
-   hypre_ParCSRMatrixColMapOffd(P)       = hypre_ParCSRMatrixColMapOffd(W);
-   hypre_ParCSRMatrixDeviceColMapOffd(W) = NULL;
-   hypre_ParCSRMatrixColMapOffd(W)       = NULL;
+   if (row >= nr_of_rows)
+   {
+      return;
+   }
 
-   hypre_ParCSRMatrixNumNonzeros(P)  = hypre_ParCSRMatrixNumNonzeros(W) +
-                                       hypre_ParCSRMatrixGlobalNumCols(W);
-   hypre_ParCSRMatrixDNumNonzeros(P) = (HYPRE_Real) hypre_ParCSRMatrixNumNonzeros(P);
+   HYPRE_Int lane = hypre_gpu_get_lane_id<1>(item);
+   HYPRE_Int p_diag = 0, p_offd = 0, q_diag, q_offd;
 
-   hypre_GpuProfilingPushRange("Truncation");
-   if (trunc_factor != 0.0 || max_elmts > 0)
+   if (lane < 2)
    {
-      hypre_BoomerAMGInterpTruncationDevice(P, trunc_factor, max_elmts );
+      p_diag = read_only_load(AFF_diag_i + row + lane);
    }
-   hypre_GpuProfilingPopRange();
+   q_diag = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_diag, 1);
+   p_diag = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_diag, 0);
 
-   hypre_MatvecCommPkgCreate(P);
+   HYPRE_Complex row_sum = 0.0;
+   HYPRE_Int find_diag = 0;
 
-   HYPRE_THRUST_CALL( replace_if, CF_marker, CF_marker + A_nr_of_rows, equal<HYPRE_Int>(-3), -1);  
+   /* do not assume the first element is the diagonal */
+   for (HYPRE_Int j = p_diag + lane; j < q_diag; j += HYPRE_WARP_SIZE)
+   {
+      if (read_only_load(&AFF_diag_j[j]) == row)
+      {
+         find_diag ++;
+      }
+      else
+      {
+         row_sum += read_only_load(&AFF_diag_data[j]);
+      }
+   }
 
-   *P_ptr = P;
+   if (lane < 2)
+   {
+      p_offd = read_only_load(AFF_offd_i + row + lane);
+   }
+   q_offd = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_offd, 1);
+   p_offd = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_offd, 0);
 
-   /* 9. Free memory */
-   hypre_ParCSRMatrixDestroy(W);
+   for (HYPRE_Int j = p_offd + lane; j < q_offd; j += HYPRE_WARP_SIZE)
+   {
+      row_sum += read_only_load(&AFF_offd_data[j]);
+   }
 
-   return hypre_error_flag;
+   row_sum = warp_reduce_sum(item, row_sum);
+   find_diag = warp_reduce_sum(item, find_diag);
+
+   if (lane == 0)
+   {
+      HYPRE_Int num = q_diag - p_diag + q_offd - p_offd - find_diag;
+      HYPRE_Complex mu = num > 0 ? row_sum / ((HYPRE_Complex) num) : 0.0;
+      /* lambda = beta + mu */
+      HYPRE_Complex lam = read_only_load(&rsFC[row]) + mu;
+      dlam[row] = lam;
+      dtmp[row] = lam != 0.0 ? mu / lam : 0.0;
+   }
 }
 
 /*---------------------------------------------------------------------
- * Extended+e Interpolation in the form of Mat-Mat
+ * Extended Interpolation in the form of Mat-Mat
  *---------------------------------------------------------------------*/
 HYPRE_Int
-hypre_BoomerAMGBuildExtPEInterpDevice(hypre_ParCSRMatrix  *A,
-                                      HYPRE_Int           *CF_marker,
-                                      hypre_ParCSRMatrix  *S,
-                                      HYPRE_BigInt        *num_cpts_global,
-                                      HYPRE_Int            num_functions,
-                                      HYPRE_Int           *dof_func,
-                                      HYPRE_Int            debug_flag,
-                                      HYPRE_Real           trunc_factor,
-                                      HYPRE_Int            max_elmts,
-                                      hypre_ParCSRMatrix **P_ptr)
+hypre_BoomerAMGBuildExtInterpDevice(hypre_ParCSRMatrix  *A,
+                                    HYPRE_Int           *CF_marker,
+                                    hypre_ParCSRMatrix  *S,
+                                    HYPRE_BigInt        *num_cpts_global,
+                                    HYPRE_Int            num_functions,
+                                    HYPRE_Int           *dof_func,
+                                    HYPRE_Int            debug_flag,
+                                    HYPRE_Real           trunc_factor,
+                                    HYPRE_Int            max_elmts,
+                                    hypre_ParCSRMatrix **P_ptr)
 {
+   HYPRE_UNUSED_VAR(num_functions);
+   HYPRE_UNUSED_VAR(debug_flag);
+   HYPRE_UNUSED_VAR(dof_func);
+
    HYPRE_Int           A_nr_of_rows = hypre_ParCSRMatrixNumRows(A);
    hypre_CSRMatrix    *A_diag       = hypre_ParCSRMatrixDiag(A);
    HYPRE_Complex      *A_diag_data  = hypre_CSRMatrixData(A_diag);
@@ -462,37 +814,38 @@ hypre_BoomerAMGBuildExtPEInterpDevice(hypre_ParCSRMatrix  *A,
    HYPRE_Int          *A_offd_i     = hypre_CSRMatrixI(A_offd);
    HYPRE_Int           A_offd_nnz   = hypre_CSRMatrixNumNonzeros(A_offd);
 
-   hypre_BoomerAMGMakeSocFromSDevice(A, S);
-
-   HYPRE_Int          *Soc_diag_j   = hypre_ParCSRMatrixSocDiagJ(S);
-   HYPRE_Int          *Soc_offd_j   = hypre_ParCSRMatrixSocOffdJ(S);
    hypre_ParCSRMatrix *AFF, *AFC;
    hypre_ParCSRMatrix *W, *P;
    HYPRE_Int           W_nr_of_rows, P_diag_nnz;
-   HYPRE_Complex      *dlam, *dtmp, *dtmp_offd, *rsFC, *rsWA, *rsW;
+   HYPRE_Complex      *rsFC, *rsWA, *rsW;
    HYPRE_Int          *P_diag_i, *P_diag_j, *P_offd_i;
    HYPRE_Complex      *P_diag_data;
 
+   hypre_BoomerAMGMakeSocFromSDevice(A, S);
+
+   HYPRE_Int          *Soc_diag_j   = hypre_ParCSRMatrixSocDiagJ(S);
+   HYPRE_Int          *Soc_offd_j   = hypre_ParCSRMatrixSocOffdJ(S);
+
    /* 0. Find row sums of weak elements */
-   /* row sum of A-weak + Diag(A), i.e., (D_gamma + D_FF) in the notes, only for F-pts */
+   /* row sum of A-weak + Diag(A), i.e., (D_gamma + D_alpha) in the notes, only for F-pts */
    rsWA = hypre_TAlloc(HYPRE_Complex, A_nr_of_rows, HYPRE_MEMORY_DEVICE);
 
-   dim3 bDim = hypre_GetDefaultCUDABlockDimension();
-   dim3 gDim = hypre_GetDefaultCUDAGridDimension(A_nr_of_rows, "warp", bDim);
-
-   HYPRE_CUDA_LAUNCH( hypreCUDAKernel_compute_weak_rowsums,
-                      gDim, bDim,
-                      A_nr_of_rows,
-                      A_offd_nnz > 0,
-                      CF_marker,
-                      A_diag_i,
-                      A_diag_data,
-                      Soc_diag_j,
-                      A_offd_i,
-                      A_offd_data,
-                      Soc_offd_j,
-                      rsWA,
-                      0 );
+   dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+   dim3 gDim = hypre_GetDefaultDeviceGridDimension(A_nr_of_rows, "warp", bDim);
+
+   HYPRE_GPU_LAUNCH( hypreGPUKernel_compute_weak_rowsums,
+                     gDim, bDim,
+                     A_nr_of_rows,
+                     A_offd_nnz > 0,
+                     CF_marker,
+                     A_diag_i,
+                     A_diag_data,
+                     Soc_diag_j,
+                     A_offd_i,
+                     A_offd_data,
+                     Soc_offd_j,
+                     rsWA,
+                     0 );
 
    // AFF AFC
    hypre_GpuProfilingPushRange("Extract Submatrix");
@@ -503,88 +856,57 @@ hypre_BoomerAMGBuildExtPEInterpDevice(hypre_ParCSRMatrix  *A,
    hypre_assert(A_nr_of_rows == W_nr_of_rows + hypre_ParCSRMatrixNumCols(AFC));
 
    rsW = hypre_TAlloc(HYPRE_Complex, W_nr_of_rows, HYPRE_MEMORY_DEVICE);
-   HYPRE_Complex *new_end = HYPRE_THRUST_CALL( copy_if,
-                                               rsWA,
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_Complex *new_end = hypreSycl_copy_if( rsWA,
                                                rsWA + A_nr_of_rows,
                                                CF_marker,
                                                rsW,
                                                is_negative<HYPRE_Int>() );
-   hypre_assert(new_end - rsW == W_nr_of_rows);
-   hypre_TFree(rsWA, HYPRE_MEMORY_DEVICE);
-
-   /* row sum of AFC, i.e., D_beta */
-   rsFC = hypre_TAlloc(HYPRE_Complex, W_nr_of_rows, HYPRE_MEMORY_DEVICE);
-   hypre_CSRMatrixComputeRowSumDevice(hypre_ParCSRMatrixDiag(AFC), NULL, NULL, rsFC, 0, 1.0, "set");
-   hypre_CSRMatrixComputeRowSumDevice(hypre_ParCSRMatrixOffd(AFC), NULL, NULL, rsFC, 0, 1.0, "add");
-
-   /* Generate D_lambda in the paper: D_beta + (row sum of AFF without diagonal elements / row_nnz) */
-   /* Generate D_tmp, i.e., D_mu / D_lambda */
-   dlam = hypre_TAlloc(HYPRE_Complex, W_nr_of_rows, HYPRE_MEMORY_DEVICE);
-   dtmp = hypre_TAlloc(HYPRE_Complex, W_nr_of_rows, HYPRE_MEMORY_DEVICE);
-   hypre_GpuProfilingPushRange("Compute D_tmp");
-   gDim = hypre_GetDefaultCUDAGridDimension(W_nr_of_rows, "warp", bDim);
-   HYPRE_CUDA_LAUNCH( hypreCUDAKernel_compute_dlam_dtmp,
-                      gDim, bDim,
-                      W_nr_of_rows,
-                      hypre_CSRMatrixI(hypre_ParCSRMatrixDiag(AFF)),
-                      hypre_CSRMatrixJ(hypre_ParCSRMatrixDiag(AFF)),
-                      hypre_CSRMatrixData(hypre_ParCSRMatrixDiag(AFF)),
-                      hypre_CSRMatrixI(hypre_ParCSRMatrixOffd(AFF)),
-                      hypre_CSRMatrixData(hypre_ParCSRMatrixOffd(AFF)),
-                      rsFC,
-                      dlam,
-                      dtmp );
-
-   /* collect off-processor dtmp */
-   hypre_ParCSRCommPkg    *comm_pkg = hypre_ParCSRMatrixCommPkg(AFF);
-   hypre_ParCSRCommHandle *comm_handle;
-   if (!comm_pkg)
-   {
-      hypre_MatvecCommPkgCreate(AFF);
-      comm_pkg = hypre_ParCSRMatrixCommPkg(AFF);
-   }
-   dtmp_offd = hypre_TAlloc(HYPRE_Complex, hypre_CSRMatrixNumCols(hypre_ParCSRMatrixOffd(AFF)), HYPRE_MEMORY_DEVICE);
-   HYPRE_Int num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
-   HYPRE_Int num_elmts_send = hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends);
-   HYPRE_Complex *send_buf = hypre_TAlloc(HYPRE_Complex, num_elmts_send, HYPRE_MEMORY_DEVICE);
-   hypre_ParCSRCommPkgCopySendMapElmtsToDevice(comm_pkg);
-   HYPRE_THRUST_CALL( gather,
-                      hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg),
-                      hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg) + num_elmts_send,
-                      dtmp,
-                      send_buf );
-   comm_handle = hypre_ParCSRCommHandleCreate_v2(1, comm_pkg, HYPRE_MEMORY_DEVICE, send_buf, HYPRE_MEMORY_DEVICE, dtmp_offd);
-   hypre_ParCSRCommHandleDestroy(comm_handle);
-   hypre_TFree(send_buf, HYPRE_MEMORY_DEVICE);
-   hypre_GpuProfilingPopRange();
+#else
+   HYPRE_Complex *new_end = HYPRE_THRUST_CALL( copy_if,
+                                               rsWA,
+                                               rsWA + A_nr_of_rows,
+                                               CF_marker,
+                                               rsW,
+                                               is_negative<HYPRE_Int>() );
+#endif
+   hypre_assert(new_end - rsW == W_nr_of_rows);
+   hypre_TFree(rsWA, HYPRE_MEMORY_DEVICE);
+
+   /* row sum of AFC, i.e., D_beta */
+   rsFC = hypre_TAlloc(HYPRE_Complex, W_nr_of_rows, HYPRE_MEMORY_DEVICE);
+   hypre_CSRMatrixComputeRowSumDevice(hypre_ParCSRMatrixDiag(AFC), NULL, NULL, rsFC, 0, 1.0, "set");
+   hypre_CSRMatrixComputeRowSumDevice(hypre_ParCSRMatrixOffd(AFC), NULL, NULL, rsFC, 0, 1.0, "add");
 
-   /* 4. Form D_tau */
    /* 5. Form matrix ~{A_FF}, (return twAFF in AFF data structure ) */
    /* 6. Form matrix ~{A_FC}, (return twAFC in AFC data structure) */
    hypre_GpuProfilingPushRange("Compute interp matrix");
-   gDim = hypre_GetDefaultCUDAGridDimension(W_nr_of_rows, "warp", bDim);
-   HYPRE_CUDA_LAUNCH( hypreCUDAKernel_compute_aff_afc_epe,
-                      gDim, bDim,
-                      W_nr_of_rows,
-                      hypre_CSRMatrixI(hypre_ParCSRMatrixDiag(AFF)),
-                      hypre_CSRMatrixJ(hypre_ParCSRMatrixDiag(AFF)),
-                      hypre_CSRMatrixData(hypre_ParCSRMatrixDiag(AFF)),
-                      hypre_CSRMatrixI(hypre_ParCSRMatrixOffd(AFF)),
-                      hypre_CSRMatrixJ(hypre_ParCSRMatrixOffd(AFF)),
-                      hypre_CSRMatrixData(hypre_ParCSRMatrixOffd(AFF)),
-                      hypre_CSRMatrixI(hypre_ParCSRMatrixDiag(AFC)),
-                      hypre_CSRMatrixData(hypre_ParCSRMatrixDiag(AFC)),
-                      hypre_CSRMatrixI(hypre_ParCSRMatrixOffd(AFC)),
-                      hypre_CSRMatrixData(hypre_ParCSRMatrixOffd(AFC)),
-                      rsW,
-                      dlam,
-                      dtmp,
-                      dtmp_offd );
+   gDim = hypre_GetDefaultDeviceGridDimension(W_nr_of_rows, "warp", bDim);
+   HYPRE_Int *AFF_diag_i = hypre_CSRMatrixI(hypre_ParCSRMatrixDiag(AFF));
+   HYPRE_Int *AFF_diag_j = hypre_CSRMatrixJ(hypre_ParCSRMatrixDiag(AFF));
+   HYPRE_Complex *AFF_diag_a = hypre_CSRMatrixData(hypre_ParCSRMatrixDiag(AFF));
+   HYPRE_Int *AFF_offd_i = hypre_CSRMatrixI(hypre_ParCSRMatrixOffd(AFF));
+   HYPRE_Complex *AFF_offd_a = hypre_CSRMatrixData(hypre_ParCSRMatrixOffd(AFF));
+   HYPRE_Int *AFC_diag_i = hypre_CSRMatrixI(hypre_ParCSRMatrixDiag(AFC));
+   HYPRE_Complex *AFC_diag_a = hypre_CSRMatrixData(hypre_ParCSRMatrixDiag(AFC));
+   HYPRE_Int *AFC_offd_i = hypre_CSRMatrixI(hypre_ParCSRMatrixOffd(AFC));
+   HYPRE_Complex *AFC_offd_a = hypre_CSRMatrixData(hypre_ParCSRMatrixOffd(AFC));
+   HYPRE_GPU_LAUNCH( hypreGPUKernel_compute_aff_afc,
+                     gDim, bDim,
+                     W_nr_of_rows,
+                     AFF_diag_i,
+                     AFF_diag_j,
+                     AFF_diag_a,
+                     AFF_offd_i,
+                     AFF_offd_a,
+                     AFC_diag_i,
+                     AFC_diag_a,
+                     AFC_offd_i,
+                     AFC_offd_a,
+                     rsW,
+                     rsFC );
    hypre_TFree(rsW,  HYPRE_MEMORY_DEVICE);
    hypre_TFree(rsFC, HYPRE_MEMORY_DEVICE);
-   hypre_TFree(dlam, HYPRE_MEMORY_DEVICE);
-   hypre_TFree(dtmp, HYPRE_MEMORY_DEVICE);
-   hypre_TFree(dtmp_offd, HYPRE_MEMORY_DEVICE);
    hypre_GpuProfilingPopRange();
 
    /* 7. Perform matrix-matrix multiplication */
@@ -599,12 +921,11 @@ hypre_BoomerAMGBuildExtPEInterpDevice(hypre_ParCSRMatrix  *A,
    P_diag_nnz = hypre_CSRMatrixNumNonzeros(hypre_ParCSRMatrixDiag(W)) +
                 hypre_ParCSRMatrixNumCols(W);
 
-   P_diag_i    = hypre_TAlloc(HYPRE_Int,     A_nr_of_rows+1, HYPRE_MEMORY_DEVICE);
+   P_diag_i    = hypre_TAlloc(HYPRE_Int,     A_nr_of_rows + 1, HYPRE_MEMORY_DEVICE);
    P_diag_j    = hypre_TAlloc(HYPRE_Int,     P_diag_nnz,     HYPRE_MEMORY_DEVICE);
    P_diag_data = hypre_TAlloc(HYPRE_Complex, P_diag_nnz,     HYPRE_MEMORY_DEVICE);
-   P_offd_i    = hypre_TAlloc(HYPRE_Int,     A_nr_of_rows+1, HYPRE_MEMORY_DEVICE);
+   P_offd_i    = hypre_TAlloc(HYPRE_Int,     A_nr_of_rows + 1, HYPRE_MEMORY_DEVICE);
 
-   hypre_GpuProfilingPushRange("Extend matrix");
    hypreDevice_extendWtoP( A_nr_of_rows,
                            W_nr_of_rows,
                            hypre_ParCSRMatrixNumCols(W),
@@ -618,7 +939,6 @@ hypre_BoomerAMGBuildExtPEInterpDevice(hypre_ParCSRMatrix  *A,
                            P_diag_data,
                            hypre_CSRMatrixI(hypre_ParCSRMatrixOffd(W)),
                            P_offd_i );
-   hypre_GpuProfilingPopRange();
 
    // final P
    P = hypre_ParCSRMatrixCreate(hypre_ParCSRMatrixComm(A),
@@ -655,13 +975,18 @@ hypre_BoomerAMGBuildExtPEInterpDevice(hypre_ParCSRMatrix  *A,
    hypre_GpuProfilingPushRange("Truncation");
    if (trunc_factor != 0.0 || max_elmts > 0)
    {
-      hypre_BoomerAMGInterpTruncationDevice(P, trunc_factor, max_elmts );
+      hypre_BoomerAMGInterpTruncationDevice(P, trunc_factor, max_elmts);
+      hypre_ParCSRMatrixCompressOffdMapDevice(P);
    }
    hypre_GpuProfilingPopRange();
 
    hypre_MatvecCommPkgCreate(P);
 
-   HYPRE_THRUST_CALL( replace_if, CF_marker, CF_marker + A_nr_of_rows, equal<HYPRE_Int>(-3), -1);  
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_ONEDPL_CALL( std::replace_if, CF_marker, CF_marker + A_nr_of_rows, equal<HYPRE_Int>(-3), -1);
+#else
+   HYPRE_THRUST_CALL( replace_if, CF_marker, CF_marker + A_nr_of_rows, equal<HYPRE_Int>(-3), -1);
+#endif
 
    *P_ptr = P;
 
@@ -671,723 +996,559 @@ hypre_BoomerAMGBuildExtPEInterpDevice(hypre_ParCSRMatrix  *A,
    return hypre_error_flag;
 }
 
-//-----------------------------------------------------------------------
-// S_*_j is the special j-array from device SoC
-// -1: weak, -2: diag, >=0 (== A_diag_j) : strong
-// add weak and the diagonal entries of F-rows
-__global__
-void hypreCUDAKernel_compute_weak_rowsums( HYPRE_Int      nr_of_rows,
-                                           bool           has_offd,
-                                           HYPRE_Int     *CF_marker,
-                                           HYPRE_Int     *A_diag_i,
-                                           HYPRE_Complex *A_diag_a,
-                                           HYPRE_Int     *Soc_diag_j,
-                                           HYPRE_Int     *A_offd_i,
-                                           HYPRE_Complex *A_offd_a,
-                                           HYPRE_Int     *Soc_offd_j,
-                                           HYPRE_Real    *rs,
-                                           HYPRE_Int      flag)
-{
-   HYPRE_Int row = hypre_cuda_get_grid_warp_id<1,1>();
-
-   if (row >= nr_of_rows)
-   {
-      return;
-   }
-
-   HYPRE_Int lane = hypre_cuda_get_lane_id<1>();
-   HYPRE_Int ib, ie;
-
-   if (lane == 0)
-   {
-      ib = read_only_load(CF_marker + row);
-   }
-   ib = __shfl_sync(HYPRE_WARP_FULL_MASK, ib, 0);
-
-   if (ib >= flag)
-   {
-      return;
-   }
-
-   if (lane < 2)
-   {
-      ib = read_only_load(A_diag_i + row + lane);
-   }
-   ie = __shfl_sync(HYPRE_WARP_FULL_MASK, ib, 1);
-   ib = __shfl_sync(HYPRE_WARP_FULL_MASK, ib, 0);
-
-   HYPRE_Complex rl = 0.0;
-
-   for (HYPRE_Int i = ib + lane; __any_sync(HYPRE_WARP_FULL_MASK, i < ie); i += HYPRE_WARP_SIZE)
-   {
-      if (i < ie)
-      {
-         rl += read_only_load(&A_diag_a[i]) * (read_only_load(&Soc_diag_j[i]) < 0);
-      }
-   }
-
-   if (has_offd)
-   {
-      if (lane < 2)
-      {
-         ib = read_only_load(A_offd_i + row + lane);
-      }
-      ie = __shfl_sync(HYPRE_WARP_FULL_MASK, ib, 1);
-      ib = __shfl_sync(HYPRE_WARP_FULL_MASK, ib, 0);
-
-      for (HYPRE_Int i = ib + lane; __any_sync(HYPRE_WARP_FULL_MASK, i < ie); i += HYPRE_WARP_SIZE)
-      {
-         if (i < ie)
-         {
-            rl += read_only_load(&A_offd_a[i]) * (read_only_load(&Soc_offd_j[i]) < 0);
-         }
-      }
-   }
-
-   rl = warp_reduce_sum(rl);
-
-   if (lane == 0)
-   {
-      rs[row] = rl;
-   }
-}
-
-//-----------------------------------------------------------------------
-__global__
-void hypreCUDAKernel_compute_aff_afc( HYPRE_Int      nr_of_rows,
-                                      HYPRE_Int     *AFF_diag_i,
-                                      HYPRE_Int     *AFF_diag_j,
-                                      HYPRE_Complex *AFF_diag_data,
-                                      HYPRE_Int     *AFF_offd_i,
-                                      HYPRE_Complex *AFF_offd_data,
-                                      HYPRE_Int     *AFC_diag_i,
-                                      HYPRE_Complex *AFC_diag_data,
-                                      HYPRE_Int     *AFC_offd_i,
-                                      HYPRE_Complex *AFC_offd_data,
-                                      HYPRE_Complex *rsW,
-                                      HYPRE_Complex *rsFC )
-{
-   HYPRE_Int row = hypre_cuda_get_grid_warp_id<1,1>();
-
-   if (row >= nr_of_rows)
-   {
-      return;
-   }
-
-   HYPRE_Int lane = hypre_cuda_get_lane_id<1>();
-   HYPRE_Int p, q;
-
-   HYPRE_Complex iscale, beta;
-
-   if (lane == 0)
-   {
-      iscale = -1.0 / read_only_load(&rsW[row]);
-      beta = read_only_load(&rsFC[row]);
-   }
-   iscale = __shfl_sync(HYPRE_WARP_FULL_MASK, iscale, 0);
-   beta   = __shfl_sync(HYPRE_WARP_FULL_MASK, beta,   0);
-
-   // AFF
-   /* Diag part */
-   if (lane < 2)
-   {
-      p = read_only_load(AFF_diag_i + row + lane);
-   }
-   q = __shfl_sync(HYPRE_WARP_FULL_MASK, p, 1);
-   p = __shfl_sync(HYPRE_WARP_FULL_MASK, p, 0);
-
-   // do not assume diag is the first element of row
-   for (HYPRE_Int j = p + lane; __any_sync(HYPRE_WARP_FULL_MASK, j < q); j += HYPRE_WARP_SIZE)
-   {
-      if (j < q)
-      {
-         if (read_only_load(&AFF_diag_j[j]) == row)
-         {
-            AFF_diag_data[j] = beta * iscale;
-         }
-         else
-         {
-            AFF_diag_data[j] *= iscale;
-         }
-      }
-   }
-
-   /* offd part */
-   if (lane < 2)
-   {
-      p = read_only_load(AFF_offd_i + row + lane);
-   }
-   q = __shfl_sync(HYPRE_WARP_FULL_MASK, p, 1);
-   p = __shfl_sync(HYPRE_WARP_FULL_MASK, p, 0);
-
-   for (HYPRE_Int j = p + lane; __any_sync(HYPRE_WARP_FULL_MASK, j < q); j += HYPRE_WARP_SIZE)
-   {
-      if (j < q)
-      {
-         AFF_offd_data[j] *= iscale;
-      }
-   }
-
-   if (beta != 0.0)
-   {
-      beta = 1.0 / beta;
-   }
-
-   // AFC
-   if (lane < 2)
-   {
-      p = read_only_load(AFC_diag_i + row + lane);
-   }
-   q = __shfl_sync(HYPRE_WARP_FULL_MASK, p, 1);
-   p = __shfl_sync(HYPRE_WARP_FULL_MASK, p, 0);
-
-   /* Diag part */
-   for (HYPRE_Int j = p + lane; __any_sync(HYPRE_WARP_FULL_MASK, j < q); j += HYPRE_WARP_SIZE)
-   {
-      if (j < q)
-      {
-         AFC_diag_data[j] *= beta;
-      }
-   }
-
-   /* offd part */
-   if (lane < 2)
-   {
-      p = read_only_load(AFC_offd_i + row + lane);
-   }
-   q = __shfl_sync(HYPRE_WARP_FULL_MASK, p, 1);
-   p = __shfl_sync(HYPRE_WARP_FULL_MASK, p, 0);
-
-   for (HYPRE_Int j = p + lane; __any_sync(HYPRE_WARP_FULL_MASK, j < q); j += HYPRE_WARP_SIZE)
-   {
-      if (j < q)
-      {
-         AFC_offd_data[j] *= beta;
-      }
-   }
-}
-
-
-//-----------------------------------------------------------------------
-void
-hypreDevice_extendWtoP( HYPRE_Int      P_nr_of_rows,
-                        HYPRE_Int      W_nr_of_rows,
-                        HYPRE_Int      W_nr_of_cols,
-                        HYPRE_Int     *CF_marker,
-                        HYPRE_Int      W_diag_nnz,
-                        HYPRE_Int     *W_diag_i,
-                        HYPRE_Int     *W_diag_j,
-                        HYPRE_Complex *W_diag_data,
-                        HYPRE_Int     *P_diag_i,
-                        HYPRE_Int     *P_diag_j,
-                        HYPRE_Complex *P_diag_data,
-                        HYPRE_Int     *W_offd_i,
-                        HYPRE_Int     *P_offd_i )
+/*-----------------------------------------------------------------------*/
+HYPRE_Int
+hypre_BoomerAMGBuildExtPIInterpDevice( hypre_ParCSRMatrix  *A,
+                                       HYPRE_Int           *CF_marker,
+                                       hypre_ParCSRMatrix  *S,
+                                       HYPRE_BigInt        *num_cpts_global,
+                                       HYPRE_Int            num_functions,
+                                       HYPRE_Int           *dof_func,
+                                       HYPRE_Int            debug_flag,
+                                       HYPRE_Real           trunc_factor,
+                                       HYPRE_Int            max_elmts,
+                                       hypre_ParCSRMatrix **P_ptr)
 {
-   // row index shift P --> W
-   HYPRE_Int *PWoffset = hypre_TAlloc(HYPRE_Int, P_nr_of_rows + 1, HYPRE_MEMORY_DEVICE);
-   HYPRE_THRUST_CALL( transform,
-                      CF_marker,
-                      &CF_marker[P_nr_of_rows],
-                      PWoffset,
-                      is_nonnegative<HYPRE_Int>() );
-
-   HYPRE_THRUST_CALL( exclusive_scan,
-                      PWoffset,
-                      &PWoffset[P_nr_of_rows+1],
-                      PWoffset);
-
-   // map F+C to (next) F
-   HYPRE_Int *map2F = hypre_TAlloc(HYPRE_Int, P_nr_of_rows + 1, HYPRE_MEMORY_DEVICE);
-   HYPRE_THRUST_CALL( transform,
-                      thrust::counting_iterator<HYPRE_Int>(0),
-                      thrust::counting_iterator<HYPRE_Int>(P_nr_of_rows + 1),
-                      PWoffset,
-                      map2F,
-                      thrust::minus<HYPRE_Int>() );
-
-   // P_diag_i
-   HYPRE_THRUST_CALL( gather,
-                      map2F,
-                      map2F + P_nr_of_rows + 1,
-                      W_diag_i,
-                      P_diag_i );
-
-   HYPRE_THRUST_CALL( transform,
-                      P_diag_i,
-                      P_diag_i + P_nr_of_rows + 1,
-                      PWoffset,
-                      P_diag_i,
-                      thrust::plus<HYPRE_Int>() );
-
-   // P_offd_i
-   HYPRE_THRUST_CALL( gather,
-                      map2F,
-                      map2F + P_nr_of_rows + 1,
-                      W_offd_i,
-                      P_offd_i );
-
-   hypre_TFree(map2F, HYPRE_MEMORY_DEVICE);
-
-   // row index shift W --> P
-   HYPRE_Int *WPoffset = hypre_TAlloc(HYPRE_Int, W_nr_of_rows, HYPRE_MEMORY_DEVICE);
-   HYPRE_Int *new_end = HYPRE_THRUST_CALL( copy_if,
-                                           PWoffset,
-                                           PWoffset + P_nr_of_rows,
-                                           CF_marker,
-                                           WPoffset,
-                                           is_negative<HYPRE_Int>() );
-   hypre_assert(new_end - WPoffset == W_nr_of_rows);
-
-   hypre_TFree(PWoffset, HYPRE_MEMORY_DEVICE);
-
-   // elements shift
-   HYPRE_Int *shift = hypreDevice_CsrRowPtrsToIndices(W_nr_of_rows, W_diag_nnz, W_diag_i);
-   HYPRE_THRUST_CALL( gather,
-                      shift,
-                      shift + W_diag_nnz,
-                      WPoffset,
-                      shift);
-
-   hypre_TFree(WPoffset, HYPRE_MEMORY_DEVICE);
+   HYPRE_UNUSED_VAR(num_cpts_global);
+   HYPRE_UNUSED_VAR(num_functions);
+   HYPRE_UNUSED_VAR(dof_func);
+   HYPRE_UNUSED_VAR(debug_flag);
 
-   HYPRE_THRUST_CALL( transform,
-                      shift,
-                      shift + W_diag_nnz,
-                      thrust::counting_iterator<HYPRE_Int>(0),
-                      shift,
-                      thrust::plus<HYPRE_Int>() );
+   HYPRE_Int           A_nr_of_rows = hypre_ParCSRMatrixNumRows(A);
+   hypre_CSRMatrix    *A_diag       = hypre_ParCSRMatrixDiag(A);
+   HYPRE_Complex      *A_diag_data  = hypre_CSRMatrixData(A_diag);
+   HYPRE_Int          *A_diag_i     = hypre_CSRMatrixI(A_diag);
+   hypre_CSRMatrix    *A_offd       = hypre_ParCSRMatrixOffd(A);
+   HYPRE_Complex      *A_offd_data  = hypre_CSRMatrixData(A_offd);
+   HYPRE_Int          *A_offd_i     = hypre_CSRMatrixI(A_offd);
+   HYPRE_Int           A_offd_nnz   = hypre_CSRMatrixNumNonzeros(A_offd);
+   hypre_CSRMatrix    *AFF_ext = NULL;
+   hypre_ParCSRMatrix *AFF, *AFC;
+   hypre_ParCSRMatrix *W, *P;
+   HYPRE_Int           W_nr_of_rows, P_diag_nnz;
+   HYPRE_Complex      *rsFC, *rsFC_offd, *rsWA, *rsW;
+   HYPRE_Int          *P_diag_i, *P_diag_j, *P_offd_i, num_procs;
+   HYPRE_Complex      *P_diag_data;
 
-   // P_diag_j and P_diag_data
-   HYPRE_THRUST_CALL( scatter,
-                      thrust::make_zip_iterator(thrust::make_tuple(W_diag_j, W_diag_data)),
-                      thrust::make_zip_iterator(thrust::make_tuple(W_diag_j, W_diag_data)) + W_diag_nnz,
-                      shift,
-                      thrust::make_zip_iterator(thrust::make_tuple(P_diag_j, P_diag_data)) );
+   hypre_BoomerAMGMakeSocFromSDevice(A, S);
 
-   hypre_TFree(shift, HYPRE_MEMORY_DEVICE);
+   HYPRE_Int          *Soc_diag_j   = hypre_ParCSRMatrixSocDiagJ(S);
+   HYPRE_Int          *Soc_offd_j   = hypre_ParCSRMatrixSocOffdJ(S);
 
-   // fill the gap
-   HYPRE_Int *PC_i = hypre_TAlloc(HYPRE_Int, W_nr_of_cols, HYPRE_MEMORY_DEVICE);
-   new_end = HYPRE_THRUST_CALL( copy_if,
-                                P_diag_i,
-                                P_diag_i + P_nr_of_rows,
-                                CF_marker,
-                                PC_i,
-                                is_nonnegative<HYPRE_Int>() );
+   hypre_MPI_Comm_size(hypre_ParCSRMatrixComm(A), &num_procs);
 
-   hypre_assert(new_end - PC_i == W_nr_of_cols);
+   /* 0.Find row sums of weak elements */
+   /* row sum of A-weak + Diag(A), i.e., (D_gamma + D_alpha) in the notes, only for F-pts */
+   rsWA = hypre_TAlloc(HYPRE_Complex, A_nr_of_rows, HYPRE_MEMORY_DEVICE);
 
-   HYPRE_THRUST_CALL( scatter,
-                      thrust::counting_iterator<HYPRE_Int>(0),
-                      thrust::counting_iterator<HYPRE_Int>(W_nr_of_cols),
-                      PC_i,
-                      P_diag_j );
+   dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+   dim3 gDim = hypre_GetDefaultDeviceGridDimension(A_nr_of_rows, "warp",   bDim);
+
+   HYPRE_GPU_LAUNCH( hypreGPUKernel_compute_weak_rowsums,
+                     gDim, bDim,
+                     A_nr_of_rows,
+                     A_offd_nnz > 0,
+                     CF_marker,
+                     A_diag_i,
+                     A_diag_data,
+                     Soc_diag_j,
+                     A_offd_i,
+                     A_offd_data,
+                     Soc_offd_j,
+                     rsWA,
+                     0 );
 
-   hypreDevice_ScatterConstant(P_diag_data, W_nr_of_cols, PC_i, 1.0);
+   // AFF AFC
+   hypre_GpuProfilingPushRange("Extract Submatrix");
+   hypre_ParCSRMatrixGenerateFFFCDevice(A, CF_marker, num_cpts_global, S, &AFC, &AFF);
+   hypre_GpuProfilingPopRange();
 
-   hypre_TFree(PC_i, HYPRE_MEMORY_DEVICE);
-}
+   W_nr_of_rows  = hypre_CSRMatrixNumRows(hypre_ParCSRMatrixDiag(AFF));
+   hypre_assert(A_nr_of_rows == W_nr_of_rows + hypre_ParCSRMatrixNumCols(AFC));
 
+   rsW = hypre_TAlloc(HYPRE_Complex, W_nr_of_rows, HYPRE_MEMORY_DEVICE);
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_Complex *new_end = hypreSycl_copy_if( rsWA,
+                                               rsWA + A_nr_of_rows,
+                                               CF_marker,
+                                               rsW,
+                                               is_negative<HYPRE_Int>() );
+#else
+   HYPRE_Complex *new_end = HYPRE_THRUST_CALL( copy_if,
+                                               rsWA,
+                                               rsWA + A_nr_of_rows,
+                                               CF_marker,
+                                               rsW,
+                                               is_negative<HYPRE_Int>() );
+#endif
+   hypre_assert(new_end - rsW == W_nr_of_rows);
+   hypre_TFree(rsWA, HYPRE_MEMORY_DEVICE);
 
-//-----------------------------------------------------------------------
-// For Ext+i Interp, scale AFF from the left and the right
-__global__
-void hypreCUDAKernel_compute_twiaff_w( HYPRE_Int      nr_of_rows,
-                                       HYPRE_BigInt   first_index,
-                                       HYPRE_Int     *AFF_diag_i,
-                                       HYPRE_Int     *AFF_diag_j,
-                                       HYPRE_Complex *AFF_diag_data,
-                                       HYPRE_Complex *AFF_diag_data_old,
-                                       HYPRE_Int     *AFF_offd_i,
-                                       HYPRE_Int     *AFF_offd_j,
-                                       HYPRE_Complex *AFF_offd_data,
-                                       HYPRE_Int     *AFF_ext_i,
-                                       HYPRE_BigInt  *AFF_ext_j,
-                                       HYPRE_Complex *AFF_ext_data,
-                                       HYPRE_Complex *rsW,
-                                       HYPRE_Complex *rsFC,
-                                       HYPRE_Complex *rsFC_offd )
-{
-   HYPRE_Int row = hypre_cuda_get_grid_warp_id<1,1>();
+   /* row sum of AFC, i.e., D_beta */
+   rsFC = hypre_TAlloc(HYPRE_Complex, W_nr_of_rows, HYPRE_MEMORY_DEVICE);
+   hypre_CSRMatrixComputeRowSumDevice(hypre_ParCSRMatrixDiag(AFC), NULL, NULL, rsFC, 0, 1.0, "set");
+   hypre_CSRMatrixComputeRowSumDevice(hypre_ParCSRMatrixOffd(AFC), NULL, NULL, rsFC, 0, 1.0, "add");
 
-   if (row >= nr_of_rows)
+   /* collect off-processor rsFC */
+   hypre_ParCSRCommPkg    *comm_pkg = hypre_ParCSRMatrixCommPkg(AFF);
+   hypre_ParCSRCommHandle *comm_handle;
+   if (!comm_pkg)
    {
-      return;
+      hypre_MatvecCommPkgCreate(AFF);
+      comm_pkg = hypre_ParCSRMatrixCommPkg(AFF);
    }
+   rsFC_offd = hypre_TAlloc(HYPRE_Complex, hypre_CSRMatrixNumCols(hypre_ParCSRMatrixOffd(AFF)),
+                            HYPRE_MEMORY_DEVICE);
+   HYPRE_Int num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
+   HYPRE_Int num_elmts_send = hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends);
+   HYPRE_Complex *send_buf = hypre_TAlloc(HYPRE_Complex, num_elmts_send, HYPRE_MEMORY_DEVICE);
+   hypre_ParCSRCommPkgCopySendMapElmtsToDevice(comm_pkg);
+#if defined(HYPRE_USING_SYCL)
+   hypreSycl_gather( hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg),
+                     hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg) + num_elmts_send,
+                     rsFC,
+                     send_buf );
+#else
+   HYPRE_THRUST_CALL( gather,
+                      hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg),
+                      hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg) + num_elmts_send,
+                      rsFC,
+                      send_buf );
+#endif
 
-   HYPRE_Int lane = hypre_cuda_get_lane_id<1>();
+#if defined(HYPRE_USING_THRUST_NOSYNC)
+   /* RL: make sure send_buf is ready before issuing GPU-GPU MPI */
+   if (hypre_GetGpuAwareMPI())
+   {
+      hypre_ForceSyncComputeStream();
+   }
+#endif
 
-   HYPRE_Int ib_diag, ie_diag, ib_offd, ie_offd;
+   comm_handle = hypre_ParCSRCommHandleCreate_v2(1, comm_pkg, HYPRE_MEMORY_DEVICE, send_buf,
+                                                 HYPRE_MEMORY_DEVICE, rsFC_offd);
+   hypre_ParCSRCommHandleDestroy(comm_handle);
+   hypre_TFree(send_buf, HYPRE_MEMORY_DEVICE);
 
-   // diag
-   if (lane < 2)
+   /* offd rows of AFF */
+   if (num_procs > 1)
    {
-      ib_diag = read_only_load(AFF_diag_i + row + lane);
+      AFF_ext = hypre_ParCSRMatrixExtractBExtDevice(AFF, AFF, 1);
    }
-   ie_diag = __shfl_sync(HYPRE_WARP_FULL_MASK, ib_diag, 1);
-   ib_diag = __shfl_sync(HYPRE_WARP_FULL_MASK, ib_diag, 0);
 
-   HYPRE_Complex theta_i = 0.0;
+   /* 5. Form matrix ~{A_FF}, (return twAFF in AFF data structure ) */
+   HYPRE_Complex *AFF_diag_data_old = hypre_TAlloc(HYPRE_Complex,
+                                                   hypre_CSRMatrixNumNonzeros(hypre_ParCSRMatrixDiag(AFF)),
+                                                   HYPRE_MEMORY_DEVICE);
+   hypre_TMemcpy( AFF_diag_data_old,
+                  hypre_CSRMatrixData(hypre_ParCSRMatrixDiag(AFF)),
+                  HYPRE_Complex,
+                  hypre_CSRMatrixNumNonzeros(hypre_ParCSRMatrixDiag(AFF)),
+                  HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
 
-   // do not assume diag is the first element of row
-   // entire warp works on each j
-   for (HYPRE_Int indj = ib_diag; indj < ie_diag; indj++)
+   hypre_GpuProfilingPushRange("Compute interp matrix");
+   gDim = hypre_GetDefaultDeviceGridDimension(W_nr_of_rows, "warp", bDim);
+   HYPRE_BigInt AFF_first_row_idx = hypre_ParCSRMatrixFirstRowIndex(AFF);
+   HYPRE_Int *AFF_diag_i = hypre_CSRMatrixI(hypre_ParCSRMatrixDiag(AFF));
+   HYPRE_Int *AFF_diag_j = hypre_CSRMatrixJ(hypre_ParCSRMatrixDiag(AFF));
+   HYPRE_Complex *AFF_diag_a = hypre_CSRMatrixData(hypre_ParCSRMatrixDiag(AFF));
+   HYPRE_Int *AFF_offd_i = hypre_CSRMatrixI(hypre_ParCSRMatrixOffd(AFF));
+   HYPRE_Int *AFF_offd_j = hypre_CSRMatrixJ(hypre_ParCSRMatrixOffd(AFF));
+   HYPRE_Complex *AFF_offd_a = hypre_CSRMatrixData(hypre_ParCSRMatrixOffd(AFF));
+   HYPRE_Int *AFF_ext_i = NULL;
+   HYPRE_BigInt *AFF_ext_bigj = NULL;
+   HYPRE_Complex *AFF_ext_a = NULL;
+   if (AFF_ext)
    {
-      HYPRE_Int j;
+      AFF_ext_i = hypre_CSRMatrixI(AFF_ext);
+      AFF_ext_bigj = hypre_CSRMatrixBigJ(AFF_ext);
+      AFF_ext_a = hypre_CSRMatrixData(AFF_ext);
+   }
+   HYPRE_GPU_LAUNCH( hypreGPUKernel_compute_twiaff_w,
+                     gDim, bDim,
+                     W_nr_of_rows,
+                     AFF_first_row_idx,
+                     AFF_diag_i,
+                     AFF_diag_j,
+                     AFF_diag_a,
+                     AFF_diag_data_old,
+                     AFF_offd_i,
+                     AFF_offd_j,
+                     AFF_offd_a,
+                     AFF_ext_i,
+                     AFF_ext_bigj,
+                     AFF_ext_a,
+                     rsW,
+                     rsFC,
+                     rsFC_offd );
+   hypre_TFree(rsW,               HYPRE_MEMORY_DEVICE);
+   hypre_TFree(rsFC,              HYPRE_MEMORY_DEVICE);
+   hypre_TFree(rsFC_offd,         HYPRE_MEMORY_DEVICE);
+   hypre_TFree(AFF_diag_data_old, HYPRE_MEMORY_DEVICE);
+   hypre_CSRMatrixDestroy(AFF_ext);
+   hypre_GpuProfilingPopRange();
 
-      if (lane == 0)
-      {
-         j = read_only_load(&AFF_diag_j[indj]);
-      }
-      j = __shfl_sync(HYPRE_WARP_FULL_MASK, j, 0);
+   /* 7. Perform matrix-matrix multiplication */
+   hypre_GpuProfilingPushRange("Matrix-matrix mult");
+   W = hypre_ParCSRMatMatDevice(AFF, AFC);
+   hypre_GpuProfilingPopRange();
 
-      if (j == row)
-      {
-         if (lane == 0)
-         {
-            AFF_diag_data[indj] = 1.0;
-         }
+   hypre_ParCSRMatrixDestroy(AFF);
+   hypre_ParCSRMatrixDestroy(AFC);
 
-         continue;
-      }
+   /* 8. Construct P from matrix product W */
+   P_diag_nnz = hypre_CSRMatrixNumNonzeros(hypre_ParCSRMatrixDiag(W)) +
+                hypre_ParCSRMatrixNumCols(W);
 
-      HYPRE_Int kb, ke;
+   P_diag_i    = hypre_TAlloc(HYPRE_Int,     A_nr_of_rows + 1, HYPRE_MEMORY_DEVICE);
+   P_diag_j    = hypre_TAlloc(HYPRE_Int,     P_diag_nnz,     HYPRE_MEMORY_DEVICE);
+   P_diag_data = hypre_TAlloc(HYPRE_Complex, P_diag_nnz,     HYPRE_MEMORY_DEVICE);
+   P_offd_i    = hypre_TAlloc(HYPRE_Int,     A_nr_of_rows + 1, HYPRE_MEMORY_DEVICE);
 
-      // find if there exists entry (j, row) in row j of diag
-      if (lane < 2)
-      {
-         kb = read_only_load(AFF_diag_i + j + lane);
-      }
-      ke = __shfl_sync(HYPRE_WARP_FULL_MASK, kb, 1);
-      kb = __shfl_sync(HYPRE_WARP_FULL_MASK, kb, 0);
+   hypreDevice_extendWtoP( A_nr_of_rows,
+                           W_nr_of_rows,
+                           hypre_ParCSRMatrixNumCols(W),
+                           CF_marker,
+                           hypre_CSRMatrixNumNonzeros(hypre_ParCSRMatrixDiag(W)),
+                           hypre_CSRMatrixI(hypre_ParCSRMatrixDiag(W)),
+                           hypre_CSRMatrixJ(hypre_ParCSRMatrixDiag(W)),
+                           hypre_CSRMatrixData(hypre_ParCSRMatrixDiag(W)),
+                           P_diag_i,
+                           P_diag_j,
+                           P_diag_data,
+                           hypre_CSRMatrixI(hypre_ParCSRMatrixOffd(W)),
+                           P_offd_i );
 
-      HYPRE_Int kmatch = -1;
-      for (HYPRE_Int indk = kb + lane; __any_sync(HYPRE_WARP_FULL_MASK, indk < ke); indk += HYPRE_WARP_SIZE)
-      {
-         if (indk < ke && row == read_only_load(&AFF_diag_j[indk]))
-         {
-            kmatch = indk;
-         }
+   // final P
+   P = hypre_ParCSRMatrixCreate(hypre_ParCSRMatrixComm(A),
+                                hypre_ParCSRMatrixGlobalNumRows(A),
+                                hypre_ParCSRMatrixGlobalNumCols(W),
+                                hypre_ParCSRMatrixColStarts(A),
+                                hypre_ParCSRMatrixColStarts(W),
+                                hypre_CSRMatrixNumCols(hypre_ParCSRMatrixOffd(W)),
+                                P_diag_nnz,
+                                hypre_CSRMatrixNumNonzeros(hypre_ParCSRMatrixOffd(W)));
 
-         if (__any_sync(HYPRE_WARP_FULL_MASK, kmatch >= 0))
-         {
-            break;
-         }
-      }
-      kmatch = warp_reduce_max(kmatch);
+   hypre_CSRMatrixI(hypre_ParCSRMatrixDiag(P))    = P_diag_i;
+   hypre_CSRMatrixJ(hypre_ParCSRMatrixDiag(P))    = P_diag_j;
+   hypre_CSRMatrixData(hypre_ParCSRMatrixDiag(P)) = P_diag_data;
 
-      if (lane == 0)
-      {
-         HYPRE_Complex vji = kmatch >= 0 ? read_only_load(&AFF_diag_data_old[kmatch]) : 0.0;
-         HYPRE_Complex rsj = read_only_load(&rsFC[j]) + vji;
-         if (rsj)
-         {
-            HYPRE_Complex vij = read_only_load(&AFF_diag_data_old[indj]) / rsj;
-            AFF_diag_data[indj] = vij;
-            theta_i += vji * vij;
-         }
-         else
-         {
-            AFF_diag_data[indj] = 0.0;
-            theta_i += read_only_load(&AFF_diag_data_old[indj]);
-         }
-      }
-   }
+   hypre_CSRMatrixI(hypre_ParCSRMatrixOffd(P))    = P_offd_i;
+   hypre_CSRMatrixJ(hypre_ParCSRMatrixOffd(P))    = hypre_CSRMatrixJ(hypre_ParCSRMatrixOffd(W));
+   hypre_CSRMatrixData(hypre_ParCSRMatrixOffd(P)) = hypre_CSRMatrixData(hypre_ParCSRMatrixOffd(W));
+   hypre_CSRMatrixJ(hypre_ParCSRMatrixOffd(W))    = NULL;
+   hypre_CSRMatrixData(hypre_ParCSRMatrixOffd(W)) = NULL;
 
-   // offd
-   if (lane < 2)
-   {
-      ib_offd = read_only_load(AFF_offd_i + row + lane);
-   }
-   ie_offd = __shfl_sync(HYPRE_WARP_FULL_MASK, ib_offd, 1);
-   ib_offd = __shfl_sync(HYPRE_WARP_FULL_MASK, ib_offd, 0);
+   hypre_CSRMatrixMemoryLocation(hypre_ParCSRMatrixDiag(P)) = HYPRE_MEMORY_DEVICE;
+   hypre_CSRMatrixMemoryLocation(hypre_ParCSRMatrixOffd(P)) = HYPRE_MEMORY_DEVICE;
 
-   for (HYPRE_Int indj = ib_offd; indj < ie_offd; indj++)
+   hypre_ParCSRMatrixDeviceColMapOffd(P) = hypre_ParCSRMatrixDeviceColMapOffd(W);
+   hypre_ParCSRMatrixColMapOffd(P)       = hypre_ParCSRMatrixColMapOffd(W);
+   hypre_ParCSRMatrixDeviceColMapOffd(W) = NULL;
+   hypre_ParCSRMatrixColMapOffd(W)       = NULL;
+
+   hypre_ParCSRMatrixNumNonzeros(P)  = hypre_ParCSRMatrixNumNonzeros(W) +
+                                       hypre_ParCSRMatrixGlobalNumCols(W);
+   hypre_ParCSRMatrixDNumNonzeros(P) = (HYPRE_Real) hypre_ParCSRMatrixNumNonzeros(P);
+
+   hypre_GpuProfilingPushRange("Truncation");
+   if (trunc_factor != 0.0 || max_elmts > 0)
    {
-      HYPRE_Int j;
+      hypre_BoomerAMGInterpTruncationDevice(P, trunc_factor, max_elmts);
+      hypre_ParCSRMatrixCompressOffdMapDevice(P);
+   }
+   hypre_GpuProfilingPopRange();
 
-      if (lane == 0)
-      {
-         j = read_only_load(&AFF_offd_j[indj]);
-      }
-      j = __shfl_sync(HYPRE_WARP_FULL_MASK, j, 0);
+   hypre_MatvecCommPkgCreate(P);
 
-      HYPRE_Int kb, ke;
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_ONEDPL_CALL( std::replace_if, CF_marker, CF_marker + A_nr_of_rows, equal<HYPRE_Int>(-3), -1);
+#else
+   HYPRE_THRUST_CALL( replace_if, CF_marker, CF_marker + A_nr_of_rows, equal<HYPRE_Int>(-3), -1);
+#endif
 
-      if (lane < 2)
-      {
-         kb = read_only_load(AFF_ext_i + j + lane);
-      }
-      ke = __shfl_sync(HYPRE_WARP_FULL_MASK, kb, 1);
-      kb = __shfl_sync(HYPRE_WARP_FULL_MASK, kb, 0);
+   *P_ptr = P;
 
-      HYPRE_Int kmatch = -1;
-      for (HYPRE_Int indk = kb + lane; __any_sync(HYPRE_WARP_FULL_MASK, indk < ke); indk += HYPRE_WARP_SIZE)
-      {
-         if (indk < ke && row + first_index == read_only_load(&AFF_ext_j[indk]))
-         {
-            kmatch = indk;
-         }
+   /* 9. Free memory */
+   hypre_ParCSRMatrixDestroy(W);
 
-         if (__any_sync(HYPRE_WARP_FULL_MASK, kmatch >= 0))
-         {
-            break;
-         }
-      }
-      kmatch = warp_reduce_max(kmatch);
+   return hypre_error_flag;
+}
 
-      if (lane == 0)
-      {
-         HYPRE_Complex vji = kmatch >= 0 ? read_only_load(&AFF_ext_data[kmatch]) : 0.0;
-         HYPRE_Complex rsj = read_only_load(&rsFC_offd[j]) + vji;
-         if (rsj)
-         {
-            HYPRE_Complex vij = read_only_load(&AFF_offd_data[indj]) / rsj;
-            AFF_offd_data[indj] = vij;
-            theta_i += vji * vij;
-         }
-         else
-         {
-            AFF_offd_data[indj] = 0.0;
-            theta_i += read_only_load(&AFF_offd_data[indj]);
-         }
-      }
-   }
+/*---------------------------------------------------------------------
+ * Extended+e Interpolation in the form of Mat-Mat
+ *---------------------------------------------------------------------*/
+HYPRE_Int
+hypre_BoomerAMGBuildExtPEInterpDevice(hypre_ParCSRMatrix  *A,
+                                      HYPRE_Int           *CF_marker,
+                                      hypre_ParCSRMatrix  *S,
+                                      HYPRE_BigInt        *num_cpts_global,
+                                      HYPRE_Int            num_functions,
+                                      HYPRE_Int           *dof_func,
+                                      HYPRE_Int            debug_flag,
+                                      HYPRE_Real           trunc_factor,
+                                      HYPRE_Int            max_elmts,
+                                      hypre_ParCSRMatrix **P_ptr)
+{
+   HYPRE_UNUSED_VAR(num_cpts_global);
+   HYPRE_UNUSED_VAR(num_functions);
+   HYPRE_UNUSED_VAR(dof_func);
+   HYPRE_UNUSED_VAR(debug_flag);
 
-   // scale row
-   if (lane == 0)
-   {
-      theta_i += read_only_load(rsW + row);
-      theta_i = theta_i ? -1.0 / theta_i : -1.0;
-   }
-   theta_i = __shfl_sync(HYPRE_WARP_FULL_MASK, theta_i, 0);
+   HYPRE_Int           A_nr_of_rows = hypre_ParCSRMatrixNumRows(A);
+   hypre_CSRMatrix    *A_diag       = hypre_ParCSRMatrixDiag(A);
+   HYPRE_Complex      *A_diag_data  = hypre_CSRMatrixData(A_diag);
+   HYPRE_Int          *A_diag_i     = hypre_CSRMatrixI(A_diag);
+   hypre_CSRMatrix    *A_offd       = hypre_ParCSRMatrixOffd(A);
+   HYPRE_Complex      *A_offd_data  = hypre_CSRMatrixData(A_offd);
+   HYPRE_Int          *A_offd_i     = hypre_CSRMatrixI(A_offd);
+   HYPRE_Int           A_offd_nnz   = hypre_CSRMatrixNumNonzeros(A_offd);
 
-   for (HYPRE_Int j = ib_diag + lane; __any_sync(HYPRE_WARP_FULL_MASK, j < ie_diag); j += HYPRE_WARP_SIZE)
-   {
-      if (j < ie_diag)
-      {
-         AFF_diag_data[j] *= theta_i;
-      }
-   }
+   hypre_BoomerAMGMakeSocFromSDevice(A, S);
 
-   for (HYPRE_Int j = ib_offd + lane; __any_sync(HYPRE_WARP_FULL_MASK, j < ie_offd); j += HYPRE_WARP_SIZE)
-   {
-      if (j < ie_offd)
-      {
-         AFF_offd_data[j] *= theta_i;
-      }
-   }
-}
+   HYPRE_Int          *Soc_diag_j   = hypre_ParCSRMatrixSocDiagJ(S);
+   HYPRE_Int          *Soc_offd_j   = hypre_ParCSRMatrixSocOffdJ(S);
+   hypre_ParCSRMatrix *AFF, *AFC;
+   hypre_ParCSRMatrix *W, *P;
+   HYPRE_Int           W_nr_of_rows, P_diag_nnz;
+   HYPRE_Complex      *dlam, *dtmp, *dtmp_offd, *rsFC, *rsWA, *rsW;
+   HYPRE_Int          *P_diag_i, *P_diag_j, *P_offd_i;
+   HYPRE_Complex      *P_diag_data;
 
+   /* 0. Find row sums of weak elements */
+   /* row sum of A-weak + Diag(A), i.e., (D_gamma + D_FF) in the notes, only for F-pts */
+   rsWA = hypre_TAlloc(HYPRE_Complex, A_nr_of_rows, HYPRE_MEMORY_DEVICE);
 
-//-----------------------------------------------------------------------
-__global__
-void hypreCUDAKernel_compute_aff_afc_epe( HYPRE_Int      nr_of_rows,
-                                          HYPRE_Int     *AFF_diag_i,
-                                          HYPRE_Int     *AFF_diag_j,
-                                          HYPRE_Complex *AFF_diag_data,
-                                          HYPRE_Int     *AFF_offd_i,
-                                          HYPRE_Int     *AFF_offd_j,
-                                          HYPRE_Complex *AFF_offd_data,
-                                          HYPRE_Int     *AFC_diag_i,
-                                          HYPRE_Complex *AFC_diag_data,
-                                          HYPRE_Int     *AFC_offd_i,
-                                          HYPRE_Complex *AFC_offd_data,
-                                          HYPRE_Complex *rsW,
-                                          HYPRE_Complex *dlam,
-                                          HYPRE_Complex *dtmp,
-                                          HYPRE_Complex *dtmp_offd )
-{
-   HYPRE_Int row = hypre_cuda_get_grid_warp_id<1,1>();
+   dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+   dim3 gDim = hypre_GetDefaultDeviceGridDimension(A_nr_of_rows, "warp", bDim);
+
+   HYPRE_GPU_LAUNCH( hypreGPUKernel_compute_weak_rowsums,
+                     gDim, bDim,
+                     A_nr_of_rows,
+                     A_offd_nnz > 0,
+                     CF_marker,
+                     A_diag_i,
+                     A_diag_data,
+                     Soc_diag_j,
+                     A_offd_i,
+                     A_offd_data,
+                     Soc_offd_j,
+                     rsWA,
+                     0 );
 
-   if (row >= nr_of_rows)
-   {
-      return;
-   }
+   // AFF AFC
+   hypre_GpuProfilingPushRange("Extract Submatrix");
+   hypre_ParCSRMatrixGenerateFFFCDevice(A, CF_marker, num_cpts_global, S, &AFC, &AFF);
+   hypre_GpuProfilingPopRange();
 
-   HYPRE_Int lane = hypre_cuda_get_lane_id<1>();
-   HYPRE_Int pd, qd, po, qo, xd, yd, xo, yo;
+   W_nr_of_rows = hypre_ParCSRMatrixNumRows(AFF);
+   hypre_assert(A_nr_of_rows == W_nr_of_rows + hypre_ParCSRMatrixNumCols(AFC));
 
-   HYPRE_Complex theta, value;
-   HYPRE_Complex dtau_i = 0.0;
+   rsW = hypre_TAlloc(HYPRE_Complex, W_nr_of_rows, HYPRE_MEMORY_DEVICE);
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_Complex *new_end = hypreSycl_copy_if( rsWA,
+                                               rsWA + A_nr_of_rows,
+                                               CF_marker,
+                                               rsW,
+                                               is_negative<HYPRE_Int>() );
+#else
+   HYPRE_Complex *new_end = HYPRE_THRUST_CALL( copy_if,
+                                               rsWA,
+                                               rsWA + A_nr_of_rows,
+                                               CF_marker,
+                                               rsW,
+                                               is_negative<HYPRE_Int>() );
+#endif
+   hypre_assert(new_end - rsW == W_nr_of_rows);
+   hypre_TFree(rsWA, HYPRE_MEMORY_DEVICE);
 
-   if (lane < 2)
-   {
-      pd = read_only_load(AFF_diag_i + row + lane);
-      po = read_only_load(AFF_offd_i + row + lane);
-      xd = read_only_load(AFC_diag_i + row + lane);
-      xo = read_only_load(AFC_offd_i + row + lane);
-   }
+   /* row sum of AFC, i.e., D_beta */
+   rsFC = hypre_TAlloc(HYPRE_Complex, W_nr_of_rows, HYPRE_MEMORY_DEVICE);
+   hypre_CSRMatrixComputeRowSumDevice(hypre_ParCSRMatrixDiag(AFC), NULL, NULL, rsFC, 0, 1.0, "set");
+   hypre_CSRMatrixComputeRowSumDevice(hypre_ParCSRMatrixOffd(AFC), NULL, NULL, rsFC, 0, 1.0, "add");
 
-   qd = __shfl_sync(HYPRE_WARP_FULL_MASK, pd, 1);
-   pd = __shfl_sync(HYPRE_WARP_FULL_MASK, pd, 0);
-   qo = __shfl_sync(HYPRE_WARP_FULL_MASK, po, 1);
-   po = __shfl_sync(HYPRE_WARP_FULL_MASK, po, 0);
-   yd = __shfl_sync(HYPRE_WARP_FULL_MASK, xd, 1);
-   xd = __shfl_sync(HYPRE_WARP_FULL_MASK, xd, 0);
-   yo = __shfl_sync(HYPRE_WARP_FULL_MASK, xo, 1);
-   xo = __shfl_sync(HYPRE_WARP_FULL_MASK, xo, 0);
+   /* Generate D_lambda in the paper: D_beta + (row sum of AFF without diagonal elements / row_nnz) */
+   /* Generate D_tmp, i.e., D_mu / D_lambda */
+   dlam = hypre_TAlloc(HYPRE_Complex, W_nr_of_rows, HYPRE_MEMORY_DEVICE);
+   dtmp = hypre_TAlloc(HYPRE_Complex, W_nr_of_rows, HYPRE_MEMORY_DEVICE);
+   hypre_GpuProfilingPushRange("Compute D_tmp");
+   gDim = hypre_GetDefaultDeviceGridDimension(W_nr_of_rows, "warp", bDim);
+   HYPRE_Int *AFF_diag_i = hypre_CSRMatrixI(hypre_ParCSRMatrixDiag(AFF));
+   HYPRE_Int *AFF_diag_j = hypre_CSRMatrixJ(hypre_ParCSRMatrixDiag(AFF));
+   HYPRE_Complex *AFF_diag_a = hypre_CSRMatrixData(hypre_ParCSRMatrixDiag(AFF));
+   HYPRE_Int *AFF_offd_i = hypre_CSRMatrixI(hypre_ParCSRMatrixOffd(AFF));
+   HYPRE_Int *AFF_offd_j = hypre_CSRMatrixJ(hypre_ParCSRMatrixOffd(AFF));
+   HYPRE_Complex *AFF_offd_a = hypre_CSRMatrixData(hypre_ParCSRMatrixOffd(AFF));
+   HYPRE_Int *AFC_diag_i = hypre_CSRMatrixI(hypre_ParCSRMatrixDiag(AFC));
+   HYPRE_Complex *AFC_diag_a = hypre_CSRMatrixData(hypre_ParCSRMatrixDiag(AFC));
+   HYPRE_Int *AFC_offd_i = hypre_CSRMatrixI(hypre_ParCSRMatrixOffd(AFC));
+   HYPRE_Complex *AFC_offd_a = hypre_CSRMatrixData(hypre_ParCSRMatrixOffd(AFC));
+   HYPRE_GPU_LAUNCH( hypreGPUKernel_compute_dlam_dtmp,
+                     gDim, bDim,
+                     W_nr_of_rows,
+                     AFF_diag_i,
+                     AFF_diag_j,
+                     AFF_diag_a,
+                     AFF_offd_i,
+                     AFF_offd_a,
+                     rsFC,
+                     dlam,
+                     dtmp );
 
-   /* D_\tau */
-   /* do not assume the first element is the diagonal */
-   for (HYPRE_Int j = pd + lane; __any_sync(HYPRE_WARP_FULL_MASK, j < qd); j += HYPRE_WARP_SIZE)
+   /* collect off-processor dtmp */
+   hypre_ParCSRCommPkg    *comm_pkg = hypre_ParCSRMatrixCommPkg(AFF);
+   hypre_ParCSRCommHandle *comm_handle;
+   if (!comm_pkg)
    {
-      if (j < qd)
-      {
-         const HYPRE_Int index = read_only_load(&AFF_diag_j[j]);
-         if (index != row)
-         {
-            dtau_i += AFF_diag_data[j] * read_only_load(&dtmp[index]);
-         }
-      }
+      hypre_MatvecCommPkgCreate(AFF);
+      comm_pkg = hypre_ParCSRMatrixCommPkg(AFF);
    }
+   dtmp_offd = hypre_TAlloc(HYPRE_Complex, hypre_CSRMatrixNumCols(hypre_ParCSRMatrixOffd(AFF)),
+                            HYPRE_MEMORY_DEVICE);
+   HYPRE_Int num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
+   HYPRE_Int num_elmts_send = hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends);
+   HYPRE_Complex *send_buf = hypre_TAlloc(HYPRE_Complex, num_elmts_send, HYPRE_MEMORY_DEVICE);
+   hypre_ParCSRCommPkgCopySendMapElmtsToDevice(comm_pkg);
+#if defined(HYPRE_USING_SYCL)
+   hypreSycl_gather( hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg),
+                     hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg) + num_elmts_send,
+                     dtmp,
+                     send_buf );
+#else
+   HYPRE_THRUST_CALL( gather,
+                      hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg),
+                      hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg) + num_elmts_send,
+                      dtmp,
+                      send_buf );
+#endif
 
-   for (HYPRE_Int j = po + lane; __any_sync(HYPRE_WARP_FULL_MASK, j < qo); j += HYPRE_WARP_SIZE)
+#if defined(HYPRE_USING_THRUST_NOSYNC)
+   /* RL: make sure send_buf is ready before issuing GPU-GPU MPI */
+   if (hypre_GetGpuAwareMPI())
    {
-      if (j < qo)
-      {
-         const HYPRE_Int index = read_only_load(&AFF_offd_j[j]);
-         dtau_i += AFF_offd_data[j] * read_only_load(&dtmp_offd[index]);
-      }
+      hypre_ForceSyncComputeStream();
    }
+#endif
 
-   dtau_i = warp_reduce_sum(dtau_i);
-
-   if (lane == 0)
-   {
-      value = read_only_load(&rsW[row]) + dtau_i;
-      value = value != 0.0 ? -1.0 / value : 0.0;
+   comm_handle = hypre_ParCSRCommHandleCreate_v2(1, comm_pkg, HYPRE_MEMORY_DEVICE, send_buf,
+                                                 HYPRE_MEMORY_DEVICE, dtmp_offd);
+   hypre_ParCSRCommHandleDestroy(comm_handle);
+   hypre_TFree(send_buf, HYPRE_MEMORY_DEVICE);
+   hypre_GpuProfilingPopRange();
 
-      theta = read_only_load(&dlam[row]);
-   }
+   /* 4. Form D_tau */
+   /* 5. Form matrix ~{A_FF}, (return twAFF in AFF data structure ) */
+   /* 6. Form matrix ~{A_FC}, (return twAFC in AFC data structure) */
+   hypre_GpuProfilingPushRange("Compute interp matrix");
+   gDim = hypre_GetDefaultDeviceGridDimension(W_nr_of_rows, "warp", bDim);
+   HYPRE_GPU_LAUNCH( hypreGPUKernel_compute_aff_afc_epe,
+                     gDim, bDim,
+                     W_nr_of_rows,
+                     AFF_diag_i,
+                     AFF_diag_j,
+                     AFF_diag_a,
+                     AFF_offd_i,
+                     AFF_offd_j,
+                     AFF_offd_a,
+                     AFC_diag_i,
+                     AFC_diag_a,
+                     AFC_offd_i,
+                     AFC_offd_a,
+                     rsW,
+                     dlam,
+                     dtmp,
+                     dtmp_offd );
+   hypre_TFree(rsW,  HYPRE_MEMORY_DEVICE);
+   hypre_TFree(rsFC, HYPRE_MEMORY_DEVICE);
+   hypre_TFree(dlam, HYPRE_MEMORY_DEVICE);
+   hypre_TFree(dtmp, HYPRE_MEMORY_DEVICE);
+   hypre_TFree(dtmp_offd, HYPRE_MEMORY_DEVICE);
+   hypre_GpuProfilingPopRange();
 
-   value = __shfl_sync(HYPRE_WARP_FULL_MASK, value, 0);
-   theta = __shfl_sync(HYPRE_WARP_FULL_MASK, theta, 0);
+   /* 7. Perform matrix-matrix multiplication */
+   hypre_GpuProfilingPushRange("Matrix-matrix mult");
+   W = hypre_ParCSRMatMatDevice(AFF, AFC);
+   hypre_GpuProfilingPopRange();
 
-   /* AFF Diag part */
-   // do not assume diag is the first element of row
-   for (HYPRE_Int j = pd + lane; __any_sync(HYPRE_WARP_FULL_MASK, j < qd); j += HYPRE_WARP_SIZE)
-   {
-      if (j < qd)
-      {
-         if (read_only_load(&AFF_diag_j[j]) == row)
-         {
-            AFF_diag_data[j] = theta * value;
-         }
-         else
-         {
-            AFF_diag_data[j] *= value;
-         }
-      }
-   }
+   hypre_ParCSRMatrixDestroy(AFF);
+   hypre_ParCSRMatrixDestroy(AFC);
 
-   /* AFF offd part */
-   for (HYPRE_Int j = po + lane; __any_sync(HYPRE_WARP_FULL_MASK, j < qo); j += HYPRE_WARP_SIZE)
-   {
-      if (j < qo)
-      {
-         AFF_offd_data[j] *= value;
-      }
-   }
+   /* 8. Construct P from matrix product W */
+   P_diag_nnz = hypre_CSRMatrixNumNonzeros(hypre_ParCSRMatrixDiag(W)) +
+                hypre_ParCSRMatrixNumCols(W);
 
-   theta = theta != 0.0 ? 1.0 / theta : 0.0;
+   P_diag_i    = hypre_TAlloc(HYPRE_Int,     A_nr_of_rows + 1, HYPRE_MEMORY_DEVICE);
+   P_diag_j    = hypre_TAlloc(HYPRE_Int,     P_diag_nnz,     HYPRE_MEMORY_DEVICE);
+   P_diag_data = hypre_TAlloc(HYPRE_Complex, P_diag_nnz,     HYPRE_MEMORY_DEVICE);
+   P_offd_i    = hypre_TAlloc(HYPRE_Int,     A_nr_of_rows + 1, HYPRE_MEMORY_DEVICE);
 
-   /* AFC Diag part */
-   for (HYPRE_Int j = xd + lane; __any_sync(HYPRE_WARP_FULL_MASK, j < yd); j += HYPRE_WARP_SIZE)
-   {
-      if (j < yd)
-      {
-         AFC_diag_data[j] *= theta;
-      }
-   }
+   hypreDevice_extendWtoP( A_nr_of_rows,
+                           W_nr_of_rows,
+                           hypre_ParCSRMatrixNumCols(W),
+                           CF_marker,
+                           hypre_CSRMatrixNumNonzeros(hypre_ParCSRMatrixDiag(W)),
+                           hypre_CSRMatrixI(hypre_ParCSRMatrixDiag(W)),
+                           hypre_CSRMatrixJ(hypre_ParCSRMatrixDiag(W)),
+                           hypre_CSRMatrixData(hypre_ParCSRMatrixDiag(W)),
+                           P_diag_i,
+                           P_diag_j,
+                           P_diag_data,
+                           hypre_CSRMatrixI(hypre_ParCSRMatrixOffd(W)),
+                           P_offd_i );
 
-   /* AFC offd part */
-   for (HYPRE_Int j = xo + lane; __any_sync(HYPRE_WARP_FULL_MASK, j < yo); j += HYPRE_WARP_SIZE)
-   {
-      if (j < yo)
-      {
-         AFC_offd_data[j] *= theta;
-      }
-   }
-}
+   // final P
+   P = hypre_ParCSRMatrixCreate(hypre_ParCSRMatrixComm(A),
+                                hypre_ParCSRMatrixGlobalNumRows(A),
+                                hypre_ParCSRMatrixGlobalNumCols(W),
+                                hypre_ParCSRMatrixColStarts(A),
+                                hypre_ParCSRMatrixColStarts(W),
+                                hypre_CSRMatrixNumCols(hypre_ParCSRMatrixOffd(W)),
+                                P_diag_nnz,
+                                hypre_CSRMatrixNumNonzeros(hypre_ParCSRMatrixOffd(W)));
 
-//-----------------------------------------------------------------------
-// For Ext+e Interp, compute D_lambda and D_tmp = D_mu / D_lambda
-__global__
-void hypreCUDAKernel_compute_dlam_dtmp( HYPRE_Int      nr_of_rows,
-                                        HYPRE_Int     *AFF_diag_i,
-                                        HYPRE_Int     *AFF_diag_j,
-                                        HYPRE_Complex *AFF_diag_data,
-                                        HYPRE_Int     *AFF_offd_i,
-                                        HYPRE_Complex *AFF_offd_data,
-                                        HYPRE_Complex *rsFC,
-                                        HYPRE_Complex *dlam,
-                                        HYPRE_Complex *dtmp )
-{
-   HYPRE_Int row = hypre_cuda_get_grid_warp_id<1,1>();
+   hypre_CSRMatrixI(hypre_ParCSRMatrixDiag(P))    = P_diag_i;
+   hypre_CSRMatrixJ(hypre_ParCSRMatrixDiag(P))    = P_diag_j;
+   hypre_CSRMatrixData(hypre_ParCSRMatrixDiag(P)) = P_diag_data;
 
-   if (row >= nr_of_rows)
-   {
-      return;
-   }
+   hypre_CSRMatrixI(hypre_ParCSRMatrixOffd(P))    = P_offd_i;
+   hypre_CSRMatrixJ(hypre_ParCSRMatrixOffd(P))    = hypre_CSRMatrixJ(hypre_ParCSRMatrixOffd(W));
+   hypre_CSRMatrixData(hypre_ParCSRMatrixOffd(P)) = hypre_CSRMatrixData(hypre_ParCSRMatrixOffd(W));
+   hypre_CSRMatrixJ(hypre_ParCSRMatrixOffd(W))    = NULL;
+   hypre_CSRMatrixData(hypre_ParCSRMatrixOffd(W)) = NULL;
 
-   HYPRE_Int lane = hypre_cuda_get_lane_id<1>();
-   HYPRE_Int p_diag, p_offd, q_diag, q_offd;
+   hypre_CSRMatrixMemoryLocation(hypre_ParCSRMatrixDiag(P)) = HYPRE_MEMORY_DEVICE;
+   hypre_CSRMatrixMemoryLocation(hypre_ParCSRMatrixOffd(P)) = HYPRE_MEMORY_DEVICE;
 
-   if (lane < 2)
-   {
-      p_diag = read_only_load(AFF_diag_i + row + lane);
-   }
-   q_diag = __shfl_sync(HYPRE_WARP_FULL_MASK, p_diag, 1);
-   p_diag = __shfl_sync(HYPRE_WARP_FULL_MASK, p_diag, 0);
+   hypre_ParCSRMatrixDeviceColMapOffd(P) = hypre_ParCSRMatrixDeviceColMapOffd(W);
+   hypre_ParCSRMatrixColMapOffd(P)       = hypre_ParCSRMatrixColMapOffd(W);
+   hypre_ParCSRMatrixDeviceColMapOffd(W) = NULL;
+   hypre_ParCSRMatrixColMapOffd(W)       = NULL;
 
-   HYPRE_Complex row_sum = 0.0;
-   HYPRE_Int find_diag = 0;
+   hypre_ParCSRMatrixNumNonzeros(P)  = hypre_ParCSRMatrixNumNonzeros(W) +
+                                       hypre_ParCSRMatrixGlobalNumCols(W);
+   hypre_ParCSRMatrixDNumNonzeros(P) = (HYPRE_Real) hypre_ParCSRMatrixNumNonzeros(P);
 
-   /* do not assume the first element is the diagonal */
-   for (HYPRE_Int j = p_diag + lane; __any_sync(HYPRE_WARP_FULL_MASK, j < q_diag); j += HYPRE_WARP_SIZE)
+   hypre_GpuProfilingPushRange("Truncation");
+   if (trunc_factor != 0.0 || max_elmts > 0)
    {
-      if ( j < q_diag )
-      {
-         if (read_only_load(&AFF_diag_j[j]) == row)
-         {
-            find_diag ++;
-         }
-         else
-         {
-            row_sum += read_only_load(&AFF_diag_data[j]);
-         }
-      }
+      hypre_BoomerAMGInterpTruncationDevice(P, trunc_factor, max_elmts);
+      hypre_ParCSRMatrixCompressOffdMapDevice(P);
    }
+   hypre_GpuProfilingPopRange();
 
-   if (lane < 2)
-   {
-      p_offd = read_only_load(AFF_offd_i + row + lane);
-   }
-   q_offd = __shfl_sync(HYPRE_WARP_FULL_MASK, p_offd, 1);
-   p_offd = __shfl_sync(HYPRE_WARP_FULL_MASK, p_offd, 0);
+   hypre_MatvecCommPkgCreate(P);
 
-   for (HYPRE_Int j = p_offd + lane; __any_sync(HYPRE_WARP_FULL_MASK, j < q_offd); j += HYPRE_WARP_SIZE)
-   {
-      if ( j < q_offd )
-      {
-         row_sum += read_only_load(&AFF_offd_data[j]);
-      }
-   }
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_ONEDPL_CALL( std::replace_if, CF_marker, CF_marker + A_nr_of_rows, equal<HYPRE_Int>(-3), -1);
+#else
+   HYPRE_THRUST_CALL( replace_if, CF_marker, CF_marker + A_nr_of_rows, equal<HYPRE_Int>(-3), -1);
+#endif
 
-   row_sum = warp_reduce_sum(row_sum);
-   find_diag = warp_reduce_sum(find_diag);
+   *P_ptr = P;
 
-   if (lane == 0)
-   {
-      HYPRE_Int num = q_diag - p_diag + q_offd - p_offd - find_diag;
-      HYPRE_Complex mu = num > 0 ? row_sum / ((HYPRE_Complex) num) : 0.0;
-      /* lambda = beta + mu */
-      HYPRE_Complex lam = read_only_load(&rsFC[row]) + mu;
-      dlam[row] = lam;
-      dtmp[row] = lam != 0.0 ? mu / lam : 0.0;
-   }
+   /* 9. Free memory */
+   hypre_ParCSRMatrixDestroy(W);
+
+   return hypre_error_flag;
 }
 
-#endif // defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#endif // defined(HYPRE_USING_GPU)
diff --git a/external/hypre/src/parcsr_ls/par_lr_restr.c b/external/hypre/src/parcsr_ls/par_lr_restr.c
index a3eff883..1c7ce2a7 100644
--- a/external/hypre/src/parcsr_ls/par_lr_restr.c
+++ b/external/hypre/src/parcsr_ls/par_lr_restr.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -24,8 +24,10 @@ HYPRE_Int AIR_MAX_SOL_SIZE = 0;
 #define EPSILON 1e-18
 #define EPSIMAC 1e-16
 
-void hypre_fgmresT(HYPRE_Int n, HYPRE_Complex *A, HYPRE_Complex *b, HYPRE_Real tol, HYPRE_Int kdim, HYPRE_Complex *x, HYPRE_Real *relres, HYPRE_Int *iter, HYPRE_Int job);
-void hypre_ordered_GS(const HYPRE_Complex L[], const HYPRE_Complex rhs[], HYPRE_Complex x[], const HYPRE_Int n);
+void hypre_fgmresT(HYPRE_Int n, HYPRE_Complex *A, HYPRE_Complex *b, HYPRE_Real tol, HYPRE_Int kdim,
+                   HYPRE_Complex *x, HYPRE_Real *relres, HYPRE_Int *iter, HYPRE_Int job);
+void hypre_ordered_GS(const HYPRE_Complex L[], const HYPRE_Complex rhs[], HYPRE_Complex x[],
+                      const HYPRE_Int n);
 
 /*
 HYPRE_Real air_time0 = 0.0;
@@ -50,13 +52,14 @@ hypre_BoomerAMGBuildRestrDist2AIR( hypre_ParCSRMatrix   *A,
                                    HYPRE_Int             is_triangular,
                                    HYPRE_Int             gmres_switch)
 {
+   HYPRE_UNUSED_VAR(debug_flag);
    /* HYPRE_Real t0 = hypre_MPI_Wtime(); */
 
    MPI_Comm                 comm     = hypre_ParCSRMatrixComm(A);
    hypre_ParCSRCommPkg     *comm_pkg = hypre_ParCSRMatrixCommPkg(A);
    hypre_ParCSRCommHandle  *comm_handle;
 
-   hypre_ParCSRCommPkg     *comm_pkg_SF;
+   hypre_ParCSRCommPkg     *comm_pkg_SF = NULL;
 
    /* diag part of A */
    hypre_CSRMatrix *A_diag   = hypre_ParCSRMatrixDiag(A);
@@ -148,7 +151,7 @@ hypre_BoomerAMGBuildRestrDist2AIR( hypre_ParCSRMatrix   *A,
    HYPRE_Int *Marker_FF2_offd_j, Marker_FF2_offd_count;
 
    /* for communication of offd F and F^2 rows of A */
-   hypre_ParCSRCommPkg *comm_pkg_FF2_i, *comm_pkg_FF2_j;
+   hypre_ParCSRCommPkg *comm_pkg_FF2_i, *comm_pkg_FF2_j = NULL;
    HYPRE_BigInt *send_FF2_j, *recv_FF2_j;
    HYPRE_Int num_sends_FF2, *send_FF2_i, send_FF2_ilen, send_FF2_jlen,
              num_recvs_FF2, *recv_FF2_i, recv_FF2_ilen, recv_FF2_jlen,
@@ -168,11 +171,11 @@ hypre_BoomerAMGBuildRestrDist2AIR( hypre_ParCSRMatrix   *A,
 
    /*-------------- global number of C points and my start position */
    /*my_first_cpt = num_cpts_global[0];*/
-   if (my_id == (num_procs -1))
+   if (my_id == (num_procs - 1))
    {
       total_global_cpts = num_cpts_global[1];
    }
-   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
+   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
 
    /*-------------------------------------------------------------------
     * Get the CF_marker data for the off-processor columns
@@ -209,7 +212,7 @@ hypre_BoomerAMGBuildRestrDist2AIR( hypre_ParCSRMatrix   *A,
 
    /* send buffer, of size send_map_starts[num_sends]),
     * i.e., number of entries to send */
-   send_buf_i = hypre_CTAlloc(HYPRE_Int , num_elems_send, HYPRE_MEMORY_HOST);
+   send_buf_i = hypre_CTAlloc(HYPRE_Int, num_elems_send, HYPRE_MEMORY_HOST);
 
    /* copy CF markers of elements to send to buffer
     * RL: why copy them with two for loops? Why not just loop through all in one */
@@ -218,10 +221,10 @@ hypre_BoomerAMGBuildRestrDist2AIR( hypre_ParCSRMatrix   *A,
       /* start pos of elements sent to send_proc[i] */
       start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
       /* loop through all elems to send_proc[i] */
-      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
       {
          /* CF marker of send_map_elemts[j] */
-         send_buf_i[index++] = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+         send_buf_i[index++] = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
       }
    }
    /* create a handle to start communication. 11: for integer */
@@ -235,9 +238,9 @@ hypre_BoomerAMGBuildRestrDist2AIR( hypre_ParCSRMatrix   *A,
       for (i = 0, index = 0; i < num_sends; i++)
       {
          start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-         for (j=start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
          {
-            send_buf_i[index++] = dof_func[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+            send_buf_i[index++] = dof_func[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
          }
       }
       comm_handle = hypre_ParCSRCommHandleCreate(11, comm_pkg, send_buf_i, dof_func_offd);
@@ -264,7 +267,7 @@ hypre_BoomerAMGBuildRestrDist2AIR( hypre_ParCSRMatrix   *A,
          continue;
       }
       /* diag part of row i1 */
-      for (j = S_diag_i[i1]; j < S_diag_i[i1+1]; j++)
+      for (j = S_diag_i[i1]; j < S_diag_i[i1 + 1]; j++)
       {
          if (CF_marker[S_diag_j[j]] < 0)
          {
@@ -272,7 +275,7 @@ hypre_BoomerAMGBuildRestrDist2AIR( hypre_ParCSRMatrix   *A,
          }
       }
       /* offd part of row i1 */
-      for (j = S_offd_i[i1]; j < S_offd_i[i1+1]; j++)
+      for (j = S_offd_i[i1]; j < S_offd_i[i1 + 1]; j++)
       {
          j1 = S_offd_j[j];
          if (CF_marker_offd[j1] < 0)
@@ -286,7 +289,7 @@ hypre_BoomerAMGBuildRestrDist2AIR( hypre_ParCSRMatrix   *A,
    }
 
    /* do communication */
-   comm_handle = hypre_ParCSRCommHandleCreate(11, comm_pkg, send_SF_i, recv_SF_i+1);
+   comm_handle = hypre_ParCSRCommHandleCreate(11, comm_pkg, send_SF_i, recv_SF_i + 1);
    /* ... */
    hypre_ParCSRCommHandleDestroy(comm_handle);
 
@@ -298,7 +301,7 @@ hypre_BoomerAMGBuildRestrDist2AIR( hypre_ParCSRMatrix   *A,
       /* start pos of elements sent to send_proc[i] */
       start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
       /* 1-past-the-end pos */
-      end   = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1);
+      end   = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1);
 
       for (j = start; j < end; j++)
       {
@@ -310,7 +313,7 @@ hypre_BoomerAMGBuildRestrDist2AIR( hypre_ParCSRMatrix   *A,
             continue;
          }
          /* diag part of row j1 */
-         for (k = S_diag_i[j1]; k < S_diag_i[j1+1]; k++)
+         for (k = S_diag_i[j1]; k < S_diag_i[j1 + 1]; k++)
          {
             k1 = S_diag_j[k];
             if (CF_marker[k1] < 0)
@@ -319,7 +322,7 @@ hypre_BoomerAMGBuildRestrDist2AIR( hypre_ParCSRMatrix   *A,
             }
          }
          /* offd part of row j1 */
-         for (k = S_offd_i[j1]; k < S_offd_i[j1+1]; k++)
+         for (k = S_offd_i[j1]; k < S_offd_i[j1 + 1]; k++)
          {
             k1 = S_offd_j[k];
             if (CF_marker_offd[k1] < 0)
@@ -328,7 +331,7 @@ hypre_BoomerAMGBuildRestrDist2AIR( hypre_ParCSRMatrix   *A,
             }
          }
       }
-      send_SF_jstarts[i+1] = i1;
+      send_SF_jstarts[i + 1] = i1;
    }
 
    hypre_assert(i1 == send_SF_jlen);
@@ -336,7 +339,7 @@ hypre_BoomerAMGBuildRestrDist2AIR( hypre_ParCSRMatrix   *A,
    /* adjust recv_SF_i to ptrs */
    for (i = 1; i <= num_cols_A_offd; i++)
    {
-      recv_SF_i[i] += recv_SF_i[i-1];
+      recv_SF_i[i] += recv_SF_i[i - 1];
    }
 
    recv_SF_jlen = recv_SF_i[num_cols_A_offd];
@@ -350,14 +353,15 @@ hypre_BoomerAMGBuildRestrDist2AIR( hypre_ParCSRMatrix   *A,
    }
 
    /* create a communication package for SF_j */
-   comm_pkg_SF = hypre_CTAlloc(hypre_ParCSRCommPkg, 1, HYPRE_MEMORY_HOST);
-   hypre_ParCSRCommPkgComm         (comm_pkg_SF) = comm;
-   hypre_ParCSRCommPkgNumSends     (comm_pkg_SF) = num_sends;
-   hypre_ParCSRCommPkgSendProcs    (comm_pkg_SF) = hypre_ParCSRCommPkgSendProcs(comm_pkg);
-   hypre_ParCSRCommPkgSendMapStarts(comm_pkg_SF) = send_SF_jstarts;
-   hypre_ParCSRCommPkgNumRecvs     (comm_pkg_SF) = num_recvs;
-   hypre_ParCSRCommPkgRecvProcs    (comm_pkg_SF) = hypre_ParCSRCommPkgRecvProcs(comm_pkg);
-   hypre_ParCSRCommPkgRecvVecStarts(comm_pkg_SF) = recv_SF_jstarts;
+   hypre_ParCSRCommPkgCreateAndFill(comm,
+                                    num_recvs,
+                                    hypre_ParCSRCommPkgRecvProcs(comm_pkg),
+                                    recv_SF_jstarts,
+                                    num_sends,
+                                    hypre_ParCSRCommPkgSendProcs(comm_pkg),
+                                    send_SF_jstarts,
+                                    NULL,
+                                    &comm_pkg_SF);
 
    /* do communication */
    comm_handle = hypre_ParCSRCommHandleCreate(21, comm_pkg_SF, send_SF_j, recv_SF_j);
@@ -387,11 +391,11 @@ hypre_BoomerAMGBuildRestrDist2AIR( hypre_ParCSRMatrix   *A,
    }
 
    /* remove redundancy after sorting */
-   hypre_BigQsort0(recv_SF_offd_list, 0, j-1);
+   hypre_BigQsort0(recv_SF_offd_list, 0, j - 1);
 
    for (i = 0, recv_SF_offd_list_len = 0; i < j; i++)
    {
-      if (i == 0 || recv_SF_offd_list[i] != recv_SF_offd_list[i-1])
+      if (i == 0 || recv_SF_offd_list[i] != recv_SF_offd_list[i - 1])
       {
          recv_SF_offd_list[recv_SF_offd_list_len++] = recv_SF_offd_list[i];
       }
@@ -444,14 +448,14 @@ hypre_BoomerAMGBuildRestrDist2AIR( hypre_ParCSRMatrix   *A,
       }
 
       /* diag(F)-offd(F) */
-      for (j = S_diag_i[i]; j < S_diag_i[i+1]; j++)
+      for (j = S_diag_i[i]; j < S_diag_i[i + 1]; j++)
       {
          j1 = S_diag_j[j];
          /* if it is F */
          if (CF_marker[j1] < 0)
          {
             /* go through its offd part */
-            for (k = S_offd_i[j1]; k < S_offd_i[j1+1]; k++)
+            for (k = S_offd_i[j1]; k < S_offd_i[j1 + 1]; k++)
             {
                k1 = S_offd_j[k];
                if (CF_marker_offd[k1] < 0)
@@ -471,7 +475,7 @@ hypre_BoomerAMGBuildRestrDist2AIR( hypre_ParCSRMatrix   *A,
        * NOTE: we are working with two marker arrays here: Marker_offd and Marker_recv_SF_offd_list
        * which may have overlap.
        * So, we always check the first marker array */
-      for (j = S_offd_i[i]; j < S_offd_i[i+1]; j++)
+      for (j = S_offd_i[i]; j < S_offd_i[i + 1]; j++)
       {
          j1 = S_offd_j[j];
          /* offd F pts */
@@ -483,7 +487,7 @@ hypre_BoomerAMGBuildRestrDist2AIR( hypre_ParCSRMatrix   *A,
                Marker_offd[j1] = 1;
             }
             /* offd(F)-offd(F), need to open recv_SF */
-            for (k = recv_SF_i[j1]; k < recv_SF_i[j1+1]; k++)
+            for (k = recv_SF_i[j1]; k < recv_SF_i[j1 + 1]; k++)
             {
                /* k1: global index */
                big_k1 = recv_SF_j[k];
@@ -555,12 +559,12 @@ hypre_BoomerAMGBuildRestrDist2AIR( hypre_ParCSRMatrix   *A,
    hypre_assert(k == FF2_offd_len);
 
    /* sort the list */
-   hypre_BigQsort0(FF2_offd, 0, FF2_offd_len-1);
+   hypre_BigQsort0(FF2_offd, 0, FF2_offd_len - 1);
 
    /* there must be no repetition in FF2_offd */
    for (i = 1; i < FF2_offd_len; i++)
    {
-      hypre_assert(FF2_offd[i] != FF2_offd[i-1]);
+      hypre_assert(FF2_offd[i] != FF2_offd[i - 1]);
    }
 
    /*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -593,7 +597,7 @@ hypre_BoomerAMGBuildRestrDist2AIR( hypre_ParCSRMatrix   *A,
    for (i = 0, send_FF2_jlen = 0; i < send_FF2_ilen; i++)
    {
       j = hypre_ParCSRCommPkgSendMapElmt(comm_pkg_FF2_i, i);
-      for (k = A_diag_i[j]; k < A_diag_i[j+1]; k++)
+      for (k = A_diag_i[j]; k < A_diag_i[j + 1]; k++)
       {
          if (CF_marker[A_diag_j[k]] < 0)
          {
@@ -602,7 +606,7 @@ hypre_BoomerAMGBuildRestrDist2AIR( hypre_ParCSRMatrix   *A,
       }
       if (num_procs > 1)
       {
-         for (k = A_offd_i[j]; k < A_offd_i[j+1]; k++)
+         for (k = A_offd_i[j]; k < A_offd_i[j + 1]; k++)
          {
             if (CF_marker_offd[A_offd_j[k]] < 0)
             {
@@ -615,7 +619,7 @@ hypre_BoomerAMGBuildRestrDist2AIR( hypre_ParCSRMatrix   *A,
    }
 
    /* do communication */
-   comm_handle = hypre_ParCSRCommHandleCreate(11, comm_pkg_FF2_i, send_FF2_i, recv_FF2_i+1);
+   comm_handle = hypre_ParCSRCommHandleCreate(11, comm_pkg_FF2_i, send_FF2_i, recv_FF2_i + 1);
    /* ... */
    hypre_ParCSRCommHandleDestroy(comm_handle);
 
@@ -626,13 +630,13 @@ hypre_BoomerAMGBuildRestrDist2AIR( hypre_ParCSRMatrix   *A,
    for (i = 0, i1 = 0; i < num_sends_FF2; i++)
    {
       start = hypre_ParCSRCommPkgSendMapStart(comm_pkg_FF2_i, i);
-      end   = hypre_ParCSRCommPkgSendMapStart(comm_pkg_FF2_i, i+1);
+      end   = hypre_ParCSRCommPkgSendMapStart(comm_pkg_FF2_i, i + 1);
       for (j = start; j < end; j++)
       {
          /* will send row j1 to send_proc[i] */
          j1 = hypre_ParCSRCommPkgSendMapElmt(comm_pkg_FF2_i, j);
          /* open row j1 and fill ja and a */
-         for (k = A_diag_i[j1]; k < A_diag_i[j1+1]; k++)
+         for (k = A_diag_i[j1]; k < A_diag_i[j1 + 1]; k++)
          {
             HYPRE_Int k1 = A_diag_j[k];
             if (CF_marker[k1] < 0)
@@ -644,7 +648,7 @@ hypre_BoomerAMGBuildRestrDist2AIR( hypre_ParCSRMatrix   *A,
          }
          if (num_procs > 1)
          {
-            for (k = A_offd_i[j1]; k < A_offd_i[j1+1]; k++)
+            for (k = A_offd_i[j1]; k < A_offd_i[j1 + 1]; k++)
             {
                HYPRE_Int k1 = A_offd_j[k];
                if (CF_marker_offd[k1] < 0)
@@ -656,14 +660,14 @@ hypre_BoomerAMGBuildRestrDist2AIR( hypre_ParCSRMatrix   *A,
             }
          }
       }
-      send_FF2_jstarts[i+1] = i1;
+      send_FF2_jstarts[i + 1] = i1;
    }
    hypre_assert(i1 == send_FF2_jlen);
 
    /* adjust recv_FF2_i to ptrs */
    for (i = 1; i <= recv_FF2_ilen; i++)
    {
-      recv_FF2_i[i] += recv_FF2_i[i-1];
+      recv_FF2_i[i] += recv_FF2_i[i - 1];
    }
 
    recv_FF2_jlen = recv_FF2_i[recv_FF2_ilen];
@@ -678,14 +682,15 @@ hypre_BoomerAMGBuildRestrDist2AIR( hypre_ParCSRMatrix   *A,
    }
 
    /* create a communication package for FF2_j */
-   comm_pkg_FF2_j = hypre_CTAlloc(hypre_ParCSRCommPkg, 1, HYPRE_MEMORY_HOST);
-   hypre_ParCSRCommPkgComm         (comm_pkg_FF2_j) = comm;
-   hypre_ParCSRCommPkgNumSends     (comm_pkg_FF2_j) = num_sends_FF2;
-   hypre_ParCSRCommPkgSendProcs    (comm_pkg_FF2_j) = hypre_ParCSRCommPkgSendProcs(comm_pkg_FF2_i);
-   hypre_ParCSRCommPkgSendMapStarts(comm_pkg_FF2_j) = send_FF2_jstarts;
-   hypre_ParCSRCommPkgNumRecvs     (comm_pkg_FF2_j) = num_recvs_FF2;
-   hypre_ParCSRCommPkgRecvProcs    (comm_pkg_FF2_j) = hypre_ParCSRCommPkgRecvProcs(comm_pkg_FF2_i);
-   hypre_ParCSRCommPkgRecvVecStarts(comm_pkg_FF2_j) = recv_FF2_jstarts;
+   hypre_ParCSRCommPkgCreateAndFill(comm,
+                                    num_recvs_FF2,
+                                    hypre_ParCSRCommPkgRecvProcs(comm_pkg_FF2_i),
+                                    recv_FF2_jstarts,
+                                    num_sends_FF2,
+                                    hypre_ParCSRCommPkgSendProcs(comm_pkg_FF2_i),
+                                    send_FF2_jstarts,
+                                    NULL,
+                                    &comm_pkg_FF2_j);
 
    /* do communication */
    /* ja */
@@ -792,7 +797,7 @@ hypre_BoomerAMGBuildRestrDist2AIR( hypre_ParCSRMatrix   *A,
       n_cpts ++;
 
       /* diag part of row i */
-      for (j = S_diag_i[i]; j < S_diag_i[i+1]; j++)
+      for (j = S_diag_i[i]; j < S_diag_i[i + 1]; j++)
       {
          j1 = S_diag_j[j];
          if (CF_marker[j1] >= 0)
@@ -807,7 +812,7 @@ hypre_BoomerAMGBuildRestrDist2AIR( hypre_ParCSRMatrix   *A,
             cnt_diag ++;
          }
          /* F^2: D1-D2. Open row j1 */
-         for (k = S_diag_i[j1]; k < S_diag_i[j1+1]; k++)
+         for (k = S_diag_i[j1]; k < S_diag_i[j1 + 1]; k++)
          {
             k1 = S_diag_j[k];
             /* F-pt and never seen before */
@@ -819,7 +824,7 @@ hypre_BoomerAMGBuildRestrDist2AIR( hypre_ParCSRMatrix   *A,
             }
          }
          /* F^2: D1-O2. Open row j1 */
-         for (k = S_offd_i[j1]; k < S_offd_i[j1+1]; k++)
+         for (k = S_offd_i[j1]; k < S_offd_i[j1 + 1]; k++)
          {
             k1 = S_offd_j[k];
 
@@ -843,7 +848,7 @@ hypre_BoomerAMGBuildRestrDist2AIR( hypre_ParCSRMatrix   *A,
       }
 
       /* offd part of row i */
-      for (j = S_offd_i[i]; j < S_offd_i[i+1]; j++)
+      for (j = S_offd_i[i]; j < S_offd_i[i + 1]; j++)
       {
          j1 = S_offd_j[j];
 
@@ -868,7 +873,7 @@ hypre_BoomerAMGBuildRestrDist2AIR( hypre_ParCSRMatrix   *A,
 
          /* F^2: O1-D2, O1-O2 */
          /* row j1 is an external row. check recv_SF for strong F-neighbors  */
-         for (k = recv_SF_i[j1]; k < recv_SF_i[j1+1]; k++)
+         for (k = recv_SF_i[j1]; k < recv_SF_i[j1 + 1]; k++)
          {
             /* k1: global index */
             big_k1 = recv_SF_j[k];
@@ -929,13 +934,13 @@ hypre_BoomerAMGBuildRestrDist2AIR( hypre_ParCSRMatrix   *A,
    nnz_offd = cnt_offd;
 
    /*------------- allocate arrays */
-   R_diag_i    = hypre_CTAlloc(HYPRE_Int,  n_cpts+1, HYPRE_MEMORY_HOST);
+   R_diag_i    = hypre_CTAlloc(HYPRE_Int,  n_cpts + 1, HYPRE_MEMORY_HOST);
    R_diag_j    = hypre_CTAlloc(HYPRE_Int,  nnz_diag, HYPRE_MEMORY_HOST);
    R_diag_data = hypre_CTAlloc(HYPRE_Complex, nnz_diag, HYPRE_MEMORY_HOST);
 
    /* not in ``if num_procs > 1'',
     * allocation needed even for empty CSR */
-   R_offd_i    = hypre_CTAlloc(HYPRE_Int,  n_cpts+1, HYPRE_MEMORY_HOST);
+   R_offd_i    = hypre_CTAlloc(HYPRE_Int,  n_cpts + 1, HYPRE_MEMORY_HOST);
    R_offd_j    = hypre_CTAlloc(HYPRE_Int,  nnz_offd, HYPRE_MEMORY_HOST);
    R_offd_data = hypre_CTAlloc(HYPRE_Complex, nnz_offd, HYPRE_MEMORY_HOST);
 
@@ -972,7 +977,7 @@ hypre_BoomerAMGBuildRestrDist2AIR( hypre_ParCSRMatrix   *A,
    //printf("AIR: max local dense solve size %d\n", local_max_size);
 
    // Allocate the rhs and dense local matrix in column-major form (for LAPACK)
-   DAi = hypre_CTAlloc(HYPRE_Complex, local_max_size*local_max_size, HYPRE_MEMORY_HOST);
+   DAi = hypre_CTAlloc(HYPRE_Complex, local_max_size * local_max_size, HYPRE_MEMORY_HOST);
    Dbi = hypre_CTAlloc(HYPRE_Complex, local_max_size, HYPRE_MEMORY_HOST);
    Dxi = hypre_CTAlloc(HYPRE_Complex, local_max_size, HYPRE_MEMORY_HOST);
    Ipi = hypre_CTAlloc(HYPRE_Int, local_max_size, HYPRE_MEMORY_HOST); // pivot matrix
@@ -1024,7 +1029,7 @@ hypre_BoomerAMGBuildRestrDist2AIR( hypre_ParCSRMatrix   *A,
 
       /* Access matrices for the First time, mark the points we want */
       /* diag part of row i */
-      for (j = S_diag_i[i]; j < S_diag_i[i+1]; j++)
+      for (j = S_diag_i[i]; j < S_diag_i[i + 1]; j++)
       {
          j1 = S_diag_j[j];
          if (CF_marker[j1] >= 0)
@@ -1040,7 +1045,7 @@ hypre_BoomerAMGBuildRestrDist2AIR( hypre_ParCSRMatrix   *A,
             Marker_diag[j1] = local_size ++;
          }
          /* F^2: D1-D2. Open row j1 */
-         for (k = S_diag_i[j1]; k < S_diag_i[j1+1]; k++)
+         for (k = S_diag_i[j1]; k < S_diag_i[j1 + 1]; k++)
          {
             k1 = S_diag_j[k];
             /* F-pt and never seen before */
@@ -1053,7 +1058,7 @@ hypre_BoomerAMGBuildRestrDist2AIR( hypre_ParCSRMatrix   *A,
             }
          }
          /* F^2: D1-O2. Open row j1 */
-         for (k = S_offd_i[j1]; k < S_offd_i[j1+1]; k++)
+         for (k = S_offd_i[j1]; k < S_offd_i[j1 + 1]; k++)
          {
             k1 = S_offd_j[k];
 
@@ -1081,7 +1086,7 @@ hypre_BoomerAMGBuildRestrDist2AIR( hypre_ParCSRMatrix   *A,
       /* offd part of row i */
       if (num_procs > 1)
       {
-         for (j = S_offd_i[i]; j < S_offd_i[i+1]; j++)
+         for (j = S_offd_i[i]; j < S_offd_i[i + 1]; j++)
          {
             j1 = S_offd_j[j];
 
@@ -1108,7 +1113,7 @@ hypre_BoomerAMGBuildRestrDist2AIR( hypre_ParCSRMatrix   *A,
 
             /* F^2: O1-D2, O1-O2 */
             /* row j1 is an external row. check recv_SF for strong F-neighbors  */
-            for (k = recv_SF_i[j1]; k < recv_SF_i[j1+1]; k++)
+            for (k = recv_SF_i[j1]; k < recv_SF_i[j1 + 1]; k++)
             {
                /* k1: global index */
                big_k1 = recv_SF_j[k];
@@ -1181,7 +1186,7 @@ hypre_BoomerAMGBuildRestrDist2AIR( hypre_ParCSRMatrix   *A,
          if (i2)  /* i2 == 1, i1 is an offd row */
          {
             /* open row i1, a remote row */
-            for (j = hypre_CSRMatrixI(A_offd_FF2)[i1]; j < hypre_CSRMatrixI(A_offd_FF2)[i1+1]; j++)
+            for (j = hypre_CSRMatrixI(A_offd_FF2)[i1]; j < hypre_CSRMatrixI(A_offd_FF2)[i1 + 1]; j++)
             {
                /* big_j1 is a global index */
                big_j1 = hypre_CSRMatrixBigJ(A_offd_FF2)[j];
@@ -1197,7 +1202,7 @@ hypre_BoomerAMGBuildRestrDist2AIR( hypre_ParCSRMatrix   *A,
                      /* copy the value */
                      /* rr and cc: local dense ids */
                      HYPRE_Complex vv = hypre_CSRMatrixData(A_offd_FF2)[j];
-                     DAi[rr + cc*local_size] = vv;
+                     DAi[rr + cc * local_size] = vv;
 
                   }
                }
@@ -1223,7 +1228,7 @@ hypre_BoomerAMGBuildRestrDist2AIR( hypre_ParCSRMatrix   *A,
          else /* i2 == 0, i1 is a local row */
          {
             /* open row i1, a local row */
-            for (j = A_diag_i[i1]; j < A_diag_i[i1+1]; j++)
+            for (j = A_diag_i[i1]; j < A_diag_i[i1 + 1]; j++)
             {
                /* j1 is a local index */
                j1 = A_diag_j[j];
@@ -1242,7 +1247,7 @@ hypre_BoomerAMGBuildRestrDist2AIR( hypre_ParCSRMatrix   *A,
 
             if (num_procs > 1)
             {
-               for (j = A_offd_i[i1]; j < A_offd_i[i1+1]; j++)
+               for (j = A_offd_i[i1]; j < A_offd_i[i1 + 1]; j++)
                {
                   j1 = A_offd_j[j];
                   /* map to FF2_offd */
@@ -1305,7 +1310,7 @@ hypre_BoomerAMGBuildRestrDist2AIR( hypre_ParCSRMatrix   *A,
       /* rhs bi: entries from row i of A */
       rr = 0;
       /* diag part */
-      for (j = A_diag_i[i]; j < A_diag_i[i+1]; j++)
+      for (j = A_diag_i[i]; j < A_diag_i[i + 1]; j++)
       {
          i1 = A_diag_j[j];
          if ((cc = Marker_diag[i1]) >= 0)
@@ -1320,7 +1325,7 @@ hypre_BoomerAMGBuildRestrDist2AIR( hypre_ParCSRMatrix   *A,
       /* if parallel, offd part */
       if (num_procs > 1)
       {
-         for (j = A_offd_i[i]; j < A_offd_i[i+1]; j++)
+         for (j = A_offd_i[i]; j < A_offd_i[i + 1]; j++)
          {
             i1 = A_offd_j[j];
             i2 = Mapper_offd_A[i1];
@@ -1348,7 +1353,8 @@ hypre_BoomerAMGBuildRestrDist2AIR( hypre_ParCSRMatrix   *A,
       Aisol_method = local_size <= gmres_switch ? 'L' : 'G';
       if (local_size > 0)
       {
-         if (is_triangular) {
+         if (is_triangular)
+         {
             hypre_ordered_GS(DAi, Dbi, Dxi, local_size);
 #if AIR_DEBUG
             HYPRE_Real alp = -1.0, err;
@@ -1366,8 +1372,8 @@ hypre_BoomerAMGBuildRestrDist2AIR( hypre_ParCSRMatrix   *A,
          else if (Aisol_method == 'L')
          {
 #if AIR_DEBUG
-            memcpy(TMPA, DAi, local_size*local_size*sizeof(HYPRE_Complex));
-            memcpy(TMPb, Dbi, local_size*sizeof(HYPRE_Complex));
+            memcpy(TMPA, DAi, local_size * local_size * sizeof(HYPRE_Complex));
+            memcpy(TMPb, Dbi, local_size * sizeof(HYPRE_Complex));
 #endif
             hypre_dgetrf(&local_size, &local_size, DAi, &local_size, Ipi,
                          &lapack_info);
@@ -1418,9 +1424,9 @@ hypre_BoomerAMGBuildRestrDist2AIR( hypre_ParCSRMatrix   *A,
             nrmb = hypre_dnrm2(&local_size, Dbi, &ione);
             hypre_daxpy(&local_size, &alp, Dbi, &ione, TMPd, &ione);
             err = hypre_dnrm2(&local_size, TMPd, &ione);
-            if (err/nrmb > gmresAi_tol)
+            if (err / nrmb > gmresAi_tol)
             {
-               hypre_printf("GMRES/Jacobi: res norm %e, nrmb %e, relative %e\n", err, nrmb, err/nrmb);
+               hypre_printf("GMRES/Jacobi: res norm %e, nrmb %e, relative %e\n", err, nrmb, err / nrmb);
                hypre_printf("GMRES/Jacobi: relative %e\n", gmresAi_res);
                exit(0);
             }
@@ -1428,7 +1434,7 @@ hypre_BoomerAMGBuildRestrDist2AIR( hypre_ParCSRMatrix   *A,
          }
       }
 
-      HYPRE_Complex *Soli = (is_triangular || (Aisol_method=='G')) ? Dxi : Dbi;
+      HYPRE_Complex *Soli = (is_triangular || (Aisol_method == 'G')) ? Dxi : Dbi;
 
       /*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
        * Now we are ready to fill this row of R
@@ -1467,9 +1473,9 @@ hypre_BoomerAMGBuildRestrDist2AIR( hypre_ParCSRMatrix   *A,
       R_diag_data[cnt_diag++] = 1.0;
 
       /* row ptr of the next row */
-      R_diag_i[ic+1] = cnt_diag;
+      R_diag_i[ic + 1] = cnt_diag;
 
-      R_offd_i[ic+1] = cnt_offd;
+      R_offd_i[ic + 1] = cnt_offd;
 
       /* RESET marker arrays */
       for (j = 0; j < Marker_diag_count; j++)
@@ -1593,7 +1599,8 @@ hypre_BoomerAMGBuildRestrDist2AIR( hypre_ParCSRMatrix   *A,
    */
 
    /* Filter small entries from R */
-   if (filter_thresholdR > 0) {
+   if (filter_thresholdR > 0)
+   {
       hypre_ParCSRMatrixDropSmallEntries(R, filter_thresholdR, -1);
    }
 
@@ -1660,16 +1667,20 @@ hypre_BoomerAMGBuildRestrDist2AIR( hypre_ParCSRMatrix   *A,
 
 HYPRE_Int
 hypre_BoomerAMGBuildRestrNeumannAIRHost( hypre_ParCSRMatrix   *A,
-                                     HYPRE_Int            *CF_marker,
-                                     HYPRE_BigInt         *num_cpts_global,
-                                     HYPRE_Int             num_functions,
-                                     HYPRE_Int            *dof_func,
-                                     HYPRE_Int             NeumannDeg,
-                                     HYPRE_Real            strong_thresholdR,
-                                     HYPRE_Real            filter_thresholdR,
-                                     HYPRE_Int             debug_flag,
-                                     hypre_ParCSRMatrix  **R_ptr)
+                                         HYPRE_Int            *CF_marker,
+                                         HYPRE_BigInt         *num_cpts_global,
+                                         HYPRE_Int             num_functions,
+                                         HYPRE_Int            *dof_func,
+                                         HYPRE_Int             NeumannDeg,
+                                         HYPRE_Real            strong_thresholdR,
+                                         HYPRE_Real            filter_thresholdR,
+                                         HYPRE_Int             debug_flag,
+                                         hypre_ParCSRMatrix  **R_ptr)
 {
+   HYPRE_UNUSED_VAR(num_functions);
+   HYPRE_UNUSED_VAR(dof_func);
+   HYPRE_UNUSED_VAR(debug_flag);
+
    /* HYPRE_Real t0 = hypre_MPI_Wtime(); */
    MPI_Comm                 comm     = hypre_ParCSRMatrixComm(A);
    hypre_ParCSRCommHandle  *comm_handle;
@@ -1686,7 +1697,7 @@ hypre_BoomerAMGBuildRestrNeumannAIRHost( hypre_ParCSRMatrix   *A,
    HYPRE_Complex   *R_diag_a;
    HYPRE_Int       *R_diag_i;
    HYPRE_Int       *R_diag_j;
-   HYPRE_Complex      *R_offd_a;
+   HYPRE_Complex   *R_offd_a;
    HYPRE_Int       *R_offd_i;
    HYPRE_Int       *R_offd_j;
    HYPRE_BigInt    *col_map_offd_R;
@@ -1696,7 +1707,7 @@ hypre_BoomerAMGBuildRestrNeumannAIRHost( hypre_ParCSRMatrix   *A,
    HYPRE_Int        my_id, num_procs;
    HYPRE_BigInt     total_global_cpts/*, my_first_cpt*/;
    HYPRE_Int        nnz_diag, nnz_offd, cnt_diag, cnt_offd;
-   HYPRE_BigInt       *send_buf_i;
+   HYPRE_BigInt    *send_buf_i;
 
    /* local size */
    HYPRE_Int n_fine = hypre_CSRMatrixNumRows(A_diag);
@@ -1706,13 +1717,15 @@ hypre_BoomerAMGBuildRestrNeumannAIRHost( hypre_ParCSRMatrix   *A,
    hypre_MPI_Comm_size(comm, &num_procs);
    hypre_MPI_Comm_rank(comm, &my_id);
 
+   HYPRE_MemoryLocation memory_location_R = hypre_ParCSRMatrixMemoryLocation(A);
+
    /*-------------- global number of C points and my start position */
    /*my_first_cpt = num_cpts_global[0];*/
-   if (my_id == (num_procs -1))
+   if (my_id == (num_procs - 1))
    {
       total_global_cpts = num_cpts_global[1];
    }
-   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
+   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
 
    /*-------------------------------------------------------------------
     * Get the CF_marker data for the off-processor columns
@@ -1752,7 +1765,7 @@ hypre_BoomerAMGBuildRestrNeumannAIRHost( hypre_ParCSRMatrix   *A,
    /* copy CF markers of elements to send to buffer */
    for (i = 0;  i < num_elems_send; i++)
    {
-      send_buf_i[i] = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,i)];
+      send_buf_i[i] = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, i)];
    }
    /* create a handle to start communication. 11: for integer */
    comm_handle = hypre_ParCSRCommHandleCreate(11, comm_pkg, send_buf_i, CF_marker_offd);
@@ -1764,7 +1777,7 @@ hypre_BoomerAMGBuildRestrNeumannAIRHost( hypre_ParCSRMatrix   *A,
    {
       for (i = 0; i < num_elems_send; i++)
       {
-         send_buf_i[i] = dof_func[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,i)];
+         send_buf_i[i] = dof_func[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, i)];
       }
       comm_handle = hypre_ParCSRCommHandleCreate(11, comm_pkg, send_buf_i, dof_func_offd);
       hypre_ParCSRCommHandleDestroy(comm_handle);
@@ -1810,7 +1823,7 @@ hypre_BoomerAMGBuildRestrNeumannAIRHost( hypre_ParCSRMatrix   *A,
    for (i = 0; i < n_fpts; i++)
    {
       /* find the diagonal element and store inverse */
-      for (j = AFF_diag_i[i]; j < AFF_diag_i[i+1]; j++)
+      for (j = AFF_diag_i[i]; j < AFF_diag_i[i + 1]; j++)
       {
          if (AFF_diag_j[j] == i)
          {
@@ -1820,13 +1833,13 @@ hypre_BoomerAMGBuildRestrNeumannAIRHost( hypre_ParCSRMatrix   *A,
          }
       }
 
-      for (j = AFF_diag_i[i]; j < AFF_diag_i[i+1]; j++)
+      for (j = AFF_diag_i[i]; j < AFF_diag_i[i + 1]; j++)
       {
          AFF_diag_a[j] *= -diag_entries[i];
       }
       if (num_procs > 1)
       {
-         for (j = AFF_offd_i[i]; j < AFF_offd_i[i+1]; j++)
+         for (j = AFF_offd_i[i]; j < AFF_offd_i[i + 1]; j++)
          {
             hypre_assert( hypre_ParCSRMatrixColMapOffd(AFF)[AFF_offd_j[j]] != \
                           i + hypre_ParCSRMatrixFirstRowIndex(AFF) );
@@ -1915,15 +1928,15 @@ hypre_BoomerAMGBuildRestrNeumannAIRHost( hypre_ParCSRMatrix   *A,
    nnz_offd = hypre_CSRMatrixNumNonzeros(Z_offd);
 
    /*------------- allocate arrays */
-   R_diag_i = hypre_CTAlloc(HYPRE_Int,  n_cpts+1, HYPRE_MEMORY_DEVICE);
-   R_diag_j = hypre_CTAlloc(HYPRE_Int,  nnz_diag, HYPRE_MEMORY_DEVICE);
-   R_diag_a = hypre_CTAlloc(HYPRE_Complex, nnz_diag, HYPRE_MEMORY_DEVICE);
+   R_diag_i = hypre_CTAlloc(HYPRE_Int,  n_cpts + 1, memory_location_R);
+   R_diag_j = hypre_CTAlloc(HYPRE_Int,  nnz_diag, memory_location_R);
+   R_diag_a = hypre_CTAlloc(HYPRE_Complex, nnz_diag, memory_location_R);
 
    /* not in ``if num_procs > 1'',
     * allocation needed even for empty CSR */
-   R_offd_i = hypre_CTAlloc(HYPRE_Int,  n_cpts+1, HYPRE_MEMORY_DEVICE);
-   R_offd_j = hypre_CTAlloc(HYPRE_Int,  nnz_offd, HYPRE_MEMORY_DEVICE);
-   R_offd_a = hypre_CTAlloc(HYPRE_Complex, nnz_offd, HYPRE_MEMORY_DEVICE);
+   R_offd_i = hypre_CTAlloc(HYPRE_Int,  n_cpts + 1, memory_location_R);
+   R_offd_j = hypre_CTAlloc(HYPRE_Int,  nnz_offd, memory_location_R);
+   R_offd_a = hypre_CTAlloc(HYPRE_Complex, nnz_offd, memory_location_R);
 
    /* redundant */
    R_diag_i[0] = 0;
@@ -1941,7 +1954,7 @@ hypre_BoomerAMGBuildRestrNeumannAIRHost( hypre_ParCSRMatrix   *A,
          continue;
       }
 
-      for (j = Z_diag_i[ic]; j < Z_diag_i[ic+1]; j++)
+      for (j = Z_diag_i[ic]; j < Z_diag_i[ic + 1]; j++)
       {
          j1 = Z_diag_j[j];
          R_diag_j[cnt_diag] = Fmap[j1];
@@ -1952,15 +1965,15 @@ hypre_BoomerAMGBuildRestrNeumannAIRHost( hypre_ParCSRMatrix   *A,
       R_diag_j[cnt_diag] = i;
       R_diag_a[cnt_diag++] = 1.0;
 
-      for (j = Z_offd_i[ic]; j < Z_offd_i[ic+1]; j++)
+      for (j = Z_offd_i[ic]; j < Z_offd_i[ic + 1]; j++)
       {
          j1 = Z_offd_j[j];
          R_offd_j[cnt_offd] = j1;
          R_offd_a[cnt_offd++] = -Z_offd_a[j] * diag_entries_offd[j1];
       }
 
-      R_diag_i[ic+1] = cnt_diag;
-      R_offd_i[ic+1] = cnt_offd;
+      R_diag_i[ic + 1] = cnt_diag;
+      R_offd_i[ic + 1] = cnt_offd;
 
       ic++;
    }
@@ -2000,7 +2013,8 @@ hypre_BoomerAMGBuildRestrNeumannAIRHost( hypre_ParCSRMatrix   *A,
    hypre_MatvecCommPkgCreate(R);
 
    /* Filter small entries from R */
-   if (filter_thresholdR > 0) {
+   if (filter_thresholdR > 0)
+   {
       hypre_ParCSRMatrixDropSmallEntries(R, filter_thresholdR, -1);
    }
 
@@ -2028,32 +2042,30 @@ hypre_BoomerAMGBuildRestrNeumannAIR( hypre_ParCSRMatrix   *A,
                                      HYPRE_Int             debug_flag,
                                      hypre_ParCSRMatrix  **R_ptr)
 {
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    hypre_GpuProfilingPushRange("RestrNeumannAIR");
-#endif
 
    HYPRE_Int ierr = 0;
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
    HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_ParCSRMatrixMemoryLocation(A) );
 
    if (exec == HYPRE_EXEC_DEVICE)
    {
-      ierr = hypre_BoomerAMGBuildRestrNeumannAIRDevice(A,CF_marker,num_cpts_global,num_functions,dof_func,
-                                                 NeumannDeg, strong_thresholdR, filter_thresholdR,
-                                                 debug_flag, R_ptr);
+      ierr = hypre_BoomerAMGBuildRestrNeumannAIRDevice(A, CF_marker, num_cpts_global, num_functions,
+                                                       dof_func,
+                                                       NeumannDeg, strong_thresholdR, filter_thresholdR,
+                                                       debug_flag, R_ptr);
    }
    else
 #endif
    {
-      ierr = hypre_BoomerAMGBuildRestrNeumannAIRHost(A,CF_marker,num_cpts_global,num_functions,dof_func,
-                                                 NeumannDeg, strong_thresholdR, filter_thresholdR,
-                                                 debug_flag, R_ptr);
+      ierr = hypre_BoomerAMGBuildRestrNeumannAIRHost(A, CF_marker, num_cpts_global, num_functions,
+                                                     dof_func,
+                                                     NeumannDeg, strong_thresholdR, filter_thresholdR,
+                                                     debug_flag, R_ptr);
    }
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    hypre_GpuProfilingPopRange();
-#endif
 
    return ierr;
 }
diff --git a/external/hypre/src/parcsr_ls/par_lr_restr_device.c b/external/hypre/src/parcsr_ls/par_lr_restr_device.c
index ff5e6450..bf791818 100644
--- a/external/hypre/src/parcsr_ls/par_lr_restr_device.c
+++ b/external/hypre/src/parcsr_ls/par_lr_restr_device.c
@@ -1,16 +1,20 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
  ******************************************************************************/
 
+#include "_hypre_onedpl.hpp"
 #include "_hypre_parcsr_ls.h"
 #include "_hypre_utilities.hpp"
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
 
-__global__ void hypre_BoomerAMGBuildRestrNeumannAIR_assembleRdiag( HYPRE_Int nr_of_rows, HYPRE_Int *Fmap, HYPRE_Int *Cmap, HYPRE_Int *Z_diag_i, HYPRE_Int *Z_diag_j, HYPRE_Complex *Z_diag_a, HYPRE_Int *R_diag_i, HYPRE_Int *R_diag_j, HYPRE_Complex *R_diag_a);
+__global__ void hypre_BoomerAMGBuildRestrNeumannAIR_assembleRdiag( hypre_DeviceItem &item,
+                                                                   HYPRE_Int nr_of_rows,
+                                                                   HYPRE_Int *Fmap, HYPRE_Int *Cmap, HYPRE_Int *Z_diag_i, HYPRE_Int *Z_diag_j, HYPRE_Complex *Z_diag_a,
+                                                                   HYPRE_Int *R_diag_i, HYPRE_Int *R_diag_j, HYPRE_Complex *R_diag_a);
 
 /*---------------------------------------------------------------------------
  * hypre_BoomerAMGBuildRestrNeumannAIR
@@ -18,16 +22,18 @@ __global__ void hypre_BoomerAMGBuildRestrNeumannAIR_assembleRdiag( HYPRE_Int nr_
 
 HYPRE_Int
 hypre_BoomerAMGBuildRestrNeumannAIRDevice( hypre_ParCSRMatrix   *A,
-                                     HYPRE_Int            *CF_marker,
-                                     HYPRE_BigInt         *num_cpts_global,
-                                     HYPRE_Int             num_functions,
-                                     HYPRE_Int            *dof_func,
-                                     HYPRE_Int             NeumannDeg,
-                                     HYPRE_Real            strong_thresholdR,
-                                     HYPRE_Real            filter_thresholdR,
-                                     HYPRE_Int             debug_flag,
-                                     hypre_ParCSRMatrix  **R_ptr)
+                                           HYPRE_Int            *CF_marker,
+                                           HYPRE_BigInt         *num_cpts_global,
+                                           HYPRE_Int             num_functions,
+                                           HYPRE_Int            *dof_func,
+                                           HYPRE_Int             NeumannDeg,
+                                           HYPRE_Real            strong_thresholdR,
+                                           HYPRE_Real            filter_thresholdR,
+                                           HYPRE_Int             debug_flag,
+                                           hypre_ParCSRMatrix  **R_ptr)
 {
+   HYPRE_UNUSED_VAR(debug_flag);
+
    MPI_Comm                 comm     = hypre_ParCSRMatrixComm(A);
    hypre_ParCSRCommHandle  *comm_handle;
 
@@ -59,11 +65,11 @@ hypre_BoomerAMGBuildRestrNeumannAIRDevice( hypre_ParCSRMatrix   *A,
    hypre_MPI_Comm_rank(comm, &my_id);
 
    /* global number of C points and my start position */
-   if (my_id == (num_procs -1))
+   if (my_id == (num_procs - 1))
    {
       total_global_cpts = num_cpts_global[1];
    }
-   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
+   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
 
    /* get AFF and ACF */
    hypre_ParCSRMatrix *AFF, *ACF, *Dinv, *N, *X, *X2, *Z, *Z2;
@@ -91,6 +97,19 @@ hypre_BoomerAMGBuildRestrNeumannAIRDevice( hypre_ParCSRMatrix   *A,
    /* maps from F-pts and C-pts to all points */
    HYPRE_Int       *Fmap = hypre_TAlloc(HYPRE_Int, n_fpts, HYPRE_MEMORY_DEVICE);
    HYPRE_Int       *Cmap = hypre_TAlloc(HYPRE_Int, n_cpts, HYPRE_MEMORY_DEVICE);
+#if defined(HYPRE_USING_SYCL)
+   oneapi::dpl::counting_iterator<HYPRE_Int> count(0);
+   hypreSycl_copy_if( count,
+                      count + n_fine,
+                      CF_marker,
+                      Fmap,
+                      is_negative<HYPRE_Int>());
+   hypreSycl_copy_if( count,
+                      count + n_fine,
+                      CF_marker,
+                      Cmap,
+                      is_positive<HYPRE_Int>());
+#else
    HYPRE_THRUST_CALL( copy_if,
                       thrust::make_counting_iterator(0),
                       thrust::make_counting_iterator(n_fine),
@@ -103,29 +122,42 @@ hypre_BoomerAMGBuildRestrNeumannAIRDevice( hypre_ParCSRMatrix   *A,
                       CF_marker,
                       Cmap,
                       is_positive<HYPRE_Int>());
+#endif
 
    /* setup Dinv = 1/(diagonal of AFF) */
    Dinv = hypre_ParCSRMatrixCreate(comm,
-                                hypre_ParCSRMatrixGlobalNumRows(AFF),
-                                hypre_ParCSRMatrixGlobalNumCols(AFF),
-                                hypre_ParCSRMatrixRowStarts(AFF),
-                                hypre_ParCSRMatrixColStarts(AFF),
-                                0,
-                                hypre_ParCSRMatrixNumRows(AFF),
-                                0);
+                                   hypre_ParCSRMatrixGlobalNumRows(AFF),
+                                   hypre_ParCSRMatrixGlobalNumCols(AFF),
+                                   hypre_ParCSRMatrixRowStarts(AFF),
+                                   hypre_ParCSRMatrixColStarts(AFF),
+                                   0,
+                                   hypre_ParCSRMatrixNumRows(AFF),
+                                   0);
    hypre_ParCSRMatrixAssumedPartition(Dinv) = hypre_ParCSRMatrixAssumedPartition(AFF);
    hypre_ParCSRMatrixOwnsAssumedPartition(Dinv) = 0;
    hypre_ParCSRMatrixInitialize(Dinv);
    hypre_CSRMatrix *Dinv_diag = hypre_ParCSRMatrixDiag(Dinv);
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_ONEDPL_CALL( std::copy,
+                      count,
+                      count + hypre_CSRMatrixNumRows(Dinv_diag) + 1,
+                      hypre_CSRMatrixI(Dinv_diag) );
+   HYPRE_ONEDPL_CALL( std::copy,
+                      count,
+                      count + hypre_CSRMatrixNumRows(Dinv_diag),
+                      hypre_CSRMatrixJ(Dinv_diag) );
+#else
    HYPRE_THRUST_CALL( copy,
-                        thrust::make_counting_iterator(0),
-                        thrust::make_counting_iterator(hypre_CSRMatrixNumRows(Dinv_diag)+1),
-                        hypre_CSRMatrixI(Dinv_diag) );
+                      thrust::make_counting_iterator(0),
+                      thrust::make_counting_iterator(hypre_CSRMatrixNumRows(Dinv_diag) + 1),
+                      hypre_CSRMatrixI(Dinv_diag) );
    HYPRE_THRUST_CALL( copy,
-                        thrust::make_counting_iterator(0),
-                        thrust::make_counting_iterator(hypre_CSRMatrixNumRows(Dinv_diag)),
-                        hypre_CSRMatrixJ(Dinv_diag) );
-   hypre_CSRMatrixExtractDiagonalDevice(hypre_ParCSRMatrixDiag(AFF), hypre_CSRMatrixData(Dinv_diag), 2);
+                      thrust::make_counting_iterator(0),
+                      thrust::make_counting_iterator(hypre_CSRMatrixNumRows(Dinv_diag)),
+                      hypre_CSRMatrixJ(Dinv_diag) );
+#endif
+   hypre_CSRMatrixExtractDiagonalDevice(hypre_ParCSRMatrixDiag(AFF), hypre_CSRMatrixData(Dinv_diag),
+                                        2);
 
    /* N = I - D^{-1}*A_FF */
    if (NeumannDeg >= 1)
@@ -134,16 +166,33 @@ hypre_BoomerAMGBuildRestrNeumannAIRDevice( hypre_ParCSRMatrix   *A,
 
       hypre_CSRMatrixRemoveDiagonalDevice(hypre_ParCSRMatrixDiag(N));
 
+#if defined(HYPRE_USING_SYCL)
+      HYPRE_ONEDPL_CALL( std::transform,
+                         hypre_CSRMatrixData(hypre_ParCSRMatrixDiag(N)),
+                         hypre_CSRMatrixData(hypre_ParCSRMatrixDiag(N)) + hypre_CSRMatrixNumNonzeros(hypre_ParCSRMatrixDiag(
+                                                                                                        N)),
+                         hypre_CSRMatrixData(hypre_ParCSRMatrixDiag(N)),
+                         std::negate<HYPRE_Complex>() );
+      HYPRE_ONEDPL_CALL( std::transform,
+                         hypre_CSRMatrixData(hypre_ParCSRMatrixOffd(N)),
+                         hypre_CSRMatrixData(hypre_ParCSRMatrixOffd(N)) + hypre_CSRMatrixNumNonzeros(hypre_ParCSRMatrixOffd(
+                                                                                                        N)),
+                         hypre_CSRMatrixData(hypre_ParCSRMatrixOffd(N)),
+                         std::negate<HYPRE_Complex>() );
+#else
       HYPRE_THRUST_CALL( transform,
-                           hypre_CSRMatrixData(hypre_ParCSRMatrixDiag(N)),
-                           hypre_CSRMatrixData(hypre_ParCSRMatrixDiag(N)) + hypre_CSRMatrixNumNonzeros(hypre_ParCSRMatrixDiag(N)),
-                           hypre_CSRMatrixData(hypre_ParCSRMatrixDiag(N)),
-                           thrust::negate<HYPRE_Complex>() );
+                         hypre_CSRMatrixData(hypre_ParCSRMatrixDiag(N)),
+                         hypre_CSRMatrixData(hypre_ParCSRMatrixDiag(N)) + hypre_CSRMatrixNumNonzeros(hypre_ParCSRMatrixDiag(
+                                                                                                        N)),
+                         hypre_CSRMatrixData(hypre_ParCSRMatrixDiag(N)),
+                         thrust::negate<HYPRE_Complex>() );
       HYPRE_THRUST_CALL( transform,
-                           hypre_CSRMatrixData(hypre_ParCSRMatrixOffd(N)),
-                           hypre_CSRMatrixData(hypre_ParCSRMatrixOffd(N)) + hypre_CSRMatrixNumNonzeros(hypre_ParCSRMatrixOffd(N)),
-                           hypre_CSRMatrixData(hypre_ParCSRMatrixOffd(N)),
-                           thrust::negate<HYPRE_Complex>() );
+                         hypre_CSRMatrixData(hypre_ParCSRMatrixOffd(N)),
+                         hypre_CSRMatrixData(hypre_ParCSRMatrixOffd(N)) + hypre_CSRMatrixNumNonzeros(hypre_ParCSRMatrixOffd(
+                                                                                                        N)),
+                         hypre_CSRMatrixData(hypre_ParCSRMatrixOffd(N)),
+                         thrust::negate<HYPRE_Complex>() );
+#endif
    }
 
    /* Z = Acf * (I + N + N^2 + ... + N^k) * D^{-1} */
@@ -196,7 +245,8 @@ hypre_BoomerAMGBuildRestrNeumannAIRDevice( hypre_ParCSRMatrix   *A,
    HYPRE_Int       *Z_diag_j = hypre_CSRMatrixJ(Z_diag);
    HYPRE_Int        num_cols_offd_Z = hypre_CSRMatrixNumCols(Z_offd);
    HYPRE_Int        nnz_diag_Z = hypre_CSRMatrixNumNonzeros(Z_diag);
-   HYPRE_BigInt    *Fmap_offd_global = hypre_TAlloc(HYPRE_BigInt, num_cols_offd_Z, HYPRE_MEMORY_DEVICE);
+   HYPRE_BigInt    *Fmap_offd_global = hypre_TAlloc(HYPRE_BigInt, num_cols_offd_Z,
+                                                    HYPRE_MEMORY_DEVICE);
 
    /* send and recv Fmap (wrt Z): global */
    if (num_procs > 1)
@@ -209,20 +259,42 @@ hypre_BoomerAMGBuildRestrNeumannAIRDevice( hypre_ParCSRMatrix   *A,
       send_buf_i = hypre_TAlloc(HYPRE_BigInt, num_elems_send_Z, HYPRE_MEMORY_DEVICE);
 
       hypre_ParCSRCommPkgCopySendMapElmtsToDevice(comm_pkg_Z);
+#if defined(HYPRE_USING_SYCL)
+      hypreSycl_gather( hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg_Z),
+                        hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg_Z) +
+                        hypre_ParCSRCommPkgSendMapStart(comm_pkg_Z, num_sends_Z),
+                        Fmap,
+                        send_buf_i );
+      HYPRE_ONEDPL_CALL( std::transform,
+                         send_buf_i,
+                         send_buf_i + num_elems_send_Z,
+                         send_buf_i,
+      [y = col_start](auto & x) {return x + y;} );
+#else
       HYPRE_THRUST_CALL( gather,
-                           hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg_Z),
-                           hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg_Z) +
-                           hypre_ParCSRCommPkgSendMapStart(comm_pkg_Z, num_sends_Z),
-                           Fmap,
-                           send_buf_i );
+                         hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg_Z),
+                         hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg_Z) +
+                         hypre_ParCSRCommPkgSendMapStart(comm_pkg_Z, num_sends_Z),
+                         Fmap,
+                         send_buf_i );
       HYPRE_THRUST_CALL( transform,
-                           send_buf_i,
-                           send_buf_i + num_elems_send_Z,
-                           thrust::make_constant_iterator(col_start),
-                           send_buf_i,
-                           thrust::plus<HYPRE_BigInt>() );
+                         send_buf_i,
+                         send_buf_i + num_elems_send_Z,
+                         thrust::make_constant_iterator(col_start),
+                         send_buf_i,
+                         thrust::plus<HYPRE_BigInt>() );
+#endif
+
+#if defined(HYPRE_USING_THRUST_NOSYNC)
+      /* RL: make sure send_buf_i is ready before issuing GPU-GPU MPI */
+      if (hypre_GetGpuAwareMPI())
+      {
+         hypre_ForceSyncComputeStream();
+      }
+#endif
 
-      comm_handle = hypre_ParCSRCommHandleCreate_v2(21, comm_pkg_Z, HYPRE_MEMORY_DEVICE, send_buf_i, HYPRE_MEMORY_DEVICE, Fmap_offd_global);
+      comm_handle = hypre_ParCSRCommHandleCreate_v2(21, comm_pkg_Z, HYPRE_MEMORY_DEVICE, send_buf_i,
+                                                    HYPRE_MEMORY_DEVICE, Fmap_offd_global);
       hypre_ParCSRCommHandleDestroy(comm_handle);
       hypre_TFree(send_buf_i, HYPRE_MEMORY_DEVICE);
    }
@@ -232,27 +304,37 @@ hypre_BoomerAMGBuildRestrNeumannAIRDevice( hypre_ParCSRMatrix   *A,
    nnz_offd = hypre_CSRMatrixNumNonzeros(Z_offd);
 
    /* allocate arrays for R diag */
-   R_diag_i = hypre_CTAlloc(HYPRE_Int,  n_cpts+1, HYPRE_MEMORY_DEVICE);
+   R_diag_i = hypre_CTAlloc(HYPRE_Int,  n_cpts + 1, HYPRE_MEMORY_DEVICE);
    R_diag_j = hypre_CTAlloc(HYPRE_Int,  nnz_diag, HYPRE_MEMORY_DEVICE);
    R_diag_a = hypre_CTAlloc(HYPRE_Complex, nnz_diag, HYPRE_MEMORY_DEVICE);
 
    /* setup R row indices (just Z row indices plus one extra entry for each C-pt)*/
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_ONEDPL_CALL( std::transform,
+                      Z_diag_i,
+                      Z_diag_i + n_cpts + 1,
+                      count,
+                      R_diag_i,
+                      std::plus<HYPRE_Int>() );
+#else
    HYPRE_THRUST_CALL( transform,
-                        Z_diag_i,
-                        Z_diag_i + n_cpts + 1,
-                        thrust::make_counting_iterator(0),
-                        R_diag_i,
-                        thrust::plus<HYPRE_Int>() );
+                      Z_diag_i,
+                      Z_diag_i + n_cpts + 1,
+                      thrust::make_counting_iterator(0),
+                      R_diag_i,
+                      thrust::plus<HYPRE_Int>() );
+#endif
 
    /* assemble the diagonal part of R from Z */
-   dim3 bDim = hypre_GetDefaultCUDABlockDimension();
-   dim3 gDim = hypre_GetDefaultCUDAGridDimension(n_fine, "warp", bDim);
-   HYPRE_CUDA_LAUNCH( hypre_BoomerAMGBuildRestrNeumannAIR_assembleRdiag, gDim, bDim,
-                      n_cpts, Fmap, Cmap, Z_diag_i, Z_diag_j, Z_diag_a, R_diag_i, R_diag_j, R_diag_a);
+   dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+   dim3 gDim = hypre_GetDefaultDeviceGridDimension(n_fine, "warp", bDim);
+   HYPRE_GPU_LAUNCH( hypre_BoomerAMGBuildRestrNeumannAIR_assembleRdiag, gDim, bDim,
+                     n_cpts, Fmap, Cmap, Z_diag_i, Z_diag_j, Z_diag_a, R_diag_i, R_diag_j, R_diag_a);
 
    num_cols_offd_R = num_cols_offd_Z;
    col_map_offd_R = hypre_TAlloc(HYPRE_BigInt, num_cols_offd_Z, HYPRE_MEMORY_HOST);
-   hypre_TMemcpy(col_map_offd_R, Fmap_offd_global, HYPRE_BigInt, num_cols_offd_Z, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
+   hypre_TMemcpy(col_map_offd_R, Fmap_offd_global, HYPRE_BigInt, num_cols_offd_Z, HYPRE_MEMORY_HOST,
+                 HYPRE_MEMORY_DEVICE);
 
    /* Now, we should have everything of Parcsr matrix R */
    R = hypre_ParCSRMatrixCreate(comm,
@@ -272,11 +354,21 @@ hypre_BoomerAMGBuildRestrNeumannAIRDevice( hypre_ParCSRMatrix   *A,
    /* R_offd is simply a clone of -Z_offd */
    hypre_CSRMatrixDestroy(hypre_ParCSRMatrixOffd(R));
    hypre_ParCSRMatrixOffd(R) = hypre_CSRMatrixClone(Z_offd, 1);
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_ONEDPL_CALL( std::transform,
+                      hypre_CSRMatrixData(hypre_ParCSRMatrixOffd(R)),
+                      hypre_CSRMatrixData(hypre_ParCSRMatrixOffd(R)) + hypre_CSRMatrixNumNonzeros(hypre_ParCSRMatrixOffd(
+                                                                                                     R)),
+                      hypre_CSRMatrixData(hypre_ParCSRMatrixOffd(R)),
+                      std::negate<HYPRE_Complex>() );
+#else
    HYPRE_THRUST_CALL( transform,
                       hypre_CSRMatrixData(hypre_ParCSRMatrixOffd(R)),
-                      hypre_CSRMatrixData(hypre_ParCSRMatrixOffd(R)) + hypre_CSRMatrixNumNonzeros(hypre_ParCSRMatrixOffd(R)),
+                      hypre_CSRMatrixData(hypre_ParCSRMatrixOffd(R)) + hypre_CSRMatrixNumNonzeros(hypre_ParCSRMatrixOffd(
+                                                                                                     R)),
                       hypre_CSRMatrixData(hypre_ParCSRMatrixOffd(R)),
                       thrust::negate<HYPRE_Complex>() );
+#endif
 
    hypre_ParCSRMatrixColMapOffd(R) = col_map_offd_R;
 
@@ -296,13 +388,15 @@ hypre_BoomerAMGBuildRestrNeumannAIRDevice( hypre_ParCSRMatrix   *A,
    hypre_ParCSRMatrixDestroy(Z);
    hypre_TFree(Fmap, HYPRE_MEMORY_DEVICE);
    hypre_TFree(Cmap, HYPRE_MEMORY_DEVICE);
+   hypre_TFree(Fmap_offd_global, HYPRE_MEMORY_DEVICE);
 
    return 0;
 }
 
 /*-----------------------------------------------------------------------*/
 __global__ void
-hypre_BoomerAMGBuildRestrNeumannAIR_assembleRdiag( HYPRE_Int      nr_of_rows,
+hypre_BoomerAMGBuildRestrNeumannAIR_assembleRdiag( hypre_DeviceItem    &item,
+                                                   HYPRE_Int      nr_of_rows,
                                                    HYPRE_Int     *Fmap,
                                                    HYPRE_Int     *Cmap,
                                                    HYPRE_Int     *Z_diag_i,
@@ -323,28 +417,28 @@ hypre_BoomerAMGBuildRestrNeumannAIR_assembleRdiag( HYPRE_Int      nr_of_rows,
     */
    /*-----------------------------------------------------------------------*/
 
-   HYPRE_Int i = hypre_cuda_get_grid_warp_id<1,1>();
+   HYPRE_Int i = hypre_gpu_get_grid_warp_id<1, 1>(item);
 
    if (i >= nr_of_rows)
    {
       return;
    }
 
-   HYPRE_Int p, q, pZ;
-   HYPRE_Int lane = hypre_cuda_get_lane_id<1>();
+   HYPRE_Int p = 0, q, pZ = 0;
+   HYPRE_Int lane = hypre_gpu_get_lane_id<1>(item);
 
    /* diag part */
    if (lane < 2)
    {
       p = read_only_load(R_diag_i + i + lane);
    }
-   q = __shfl_sync(HYPRE_WARP_FULL_MASK, p, 1);
-   p = __shfl_sync(HYPRE_WARP_FULL_MASK, p, 0);
+   q = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 1);
+   p = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 0);
    if (lane < 1)
    {
       pZ = read_only_load(Z_diag_i + i + lane);
    }
-   pZ = __shfl_sync(HYPRE_WARP_FULL_MASK, pZ, 0);
+   pZ = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, pZ, 0);
 
    for (HYPRE_Int j = p + lane; j < q; j += HYPRE_WARP_SIZE)
    {
@@ -362,26 +456,39 @@ hypre_BoomerAMGBuildRestrNeumannAIR_assembleRdiag( HYPRE_Int      nr_of_rows,
    }
 }
 
-
-struct setTo1minus1 : public thrust::unary_function<HYPRE_Int,HYPRE_Int>
+#if !defined(HYPRE_USING_SYCL)
+#if (defined(THRUST_VERSION) && THRUST_VERSION < 101000)
+struct setTo1minus1 : public thrust::unary_function<HYPRE_Int, HYPRE_Int>
+#else
+struct setTo1minus1
+#endif
 {
-  __host__ __device__ HYPRE_Int operator()(const HYPRE_Int &x) const
-  {
-    return x > 0 ? 1 : -1;
-  }
+   __host__ __device__ HYPRE_Int operator()(const HYPRE_Int &x) const
+   {
+      return x > 0 ? 1 : -1;
+   }
 };
+#endif
 
 HYPRE_Int
 hypre_BoomerAMGCFMarkerTo1minus1Device( HYPRE_Int *CF_marker,
                                         HYPRE_Int size )
 {
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_ONEDPL_CALL( std::transform,
+                      CF_marker,
+                      CF_marker + size,
+                      CF_marker,
+   [] (const auto & x) {return x > 0 ? 1 : -1;} );
+#else
    HYPRE_THRUST_CALL( transform,
                       CF_marker,
                       CF_marker + size,
                       CF_marker,
                       setTo1minus1() );
+#endif
 
    return hypre_error_flag;
 }
 
-#endif // defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#endif // defined(HYPRE_USING_GPU)
diff --git a/external/hypre/src/parcsr_ls/par_mgr.c b/external/hypre/src/parcsr_ls/par_mgr.c
index 01d9982c..b5bdeb69 100644
--- a/external/hypre/src/parcsr_ls/par_mgr.c
+++ b/external/hypre/src/parcsr_ls/par_mgr.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -14,112 +14,144 @@
 #include "_hypre_parcsr_ls.h"
 #include "par_amg.h"
 #include "par_mgr.h"
+#include "_hypre_blas.h"
+#include "_hypre_lapack.h"
 
-#ifdef HYPRE_USING_DSUPERLU
-#include "dsuperlu.h"
-#endif
+//#ifdef HYPRE_USING_DSUPERLU
+//#include "dsuperlu.h"
+//#endif
+
+/* Need to define these hypre_lapack protos here instead of including _hypre_lapack.h to avoid conflicts with
+ * dsuperlu.h on some lapack functions. Alternative is to move superLU related functions to a separate file.
+*/
+/* dgetrf.c */
+//HYPRE_Int hypre_dgetrf ( HYPRE_Int *m, HYPRE_Int *n, HYPRE_Real *a, HYPRE_Int *lda, HYPRE_Int *ipiv,
+//                         HYPRE_Int *info );
+/* dgetri.c */
+//HYPRE_Int hypre_dgetri ( HYPRE_Int *n, HYPRE_Real *a, HYPRE_Int *lda, HYPRE_Int *ipiv,
+//                         HYPRE_Real *work, HYPRE_Int *lwork, HYPRE_Int *info);
 
 /* Create */
 void *
-hypre_MGRCreate()
+hypre_MGRCreate(void)
 {
-  hypre_ParMGRData  *mgr_data;
-
-  mgr_data = hypre_CTAlloc(hypre_ParMGRData,  1, HYPRE_MEMORY_HOST);
-
-  /* block data */
-  (mgr_data -> block_size) = 1;
-  (mgr_data -> block_num_coarse_indexes) = NULL;
-  (mgr_data -> point_marker_array) = NULL;
-  (mgr_data -> block_cf_marker) = NULL;
-
-  /* general data */
-  (mgr_data -> max_num_coarse_levels) = 10;
-  (mgr_data -> A_array) = NULL;
-  (mgr_data -> P_array) = NULL;
-  (mgr_data -> RT_array) = NULL;
-  (mgr_data -> RAP) = NULL;
-  (mgr_data -> CF_marker_array) = NULL;
-  (mgr_data -> coarse_indices_lvls) = NULL;
-
-  (mgr_data -> A_ff_array) = NULL;
-  (mgr_data -> F_fine_array) = NULL;
-  (mgr_data -> U_fine_array) = NULL;
-  (mgr_data -> aff_solver) = NULL;
-  (mgr_data -> fine_grid_solver_setup) = NULL;
-  (mgr_data -> fine_grid_solver_solve) = NULL;
-
-  (mgr_data -> F_array) = NULL;
-  (mgr_data -> U_array) = NULL;
-  (mgr_data -> residual) = NULL;
-  (mgr_data -> rel_res_norms) = NULL;
-  (mgr_data -> Vtemp) = NULL;
-  (mgr_data -> Ztemp) = NULL;
-  (mgr_data -> Utemp) = NULL;
-  (mgr_data -> Ftemp) = NULL;
-
-  (mgr_data -> num_iterations) = 0;
-  (mgr_data -> num_interp_sweeps) = 1;
-  (mgr_data -> num_restrict_sweeps) = 1;
-  (mgr_data -> trunc_factor) = 0.0;
-  (mgr_data -> max_row_sum) = 0.9;
-  (mgr_data -> strong_threshold) = 0.25;
-  (mgr_data -> P_max_elmts) = 0;
-
-  (mgr_data -> coarse_grid_solver) = NULL;
-  (mgr_data -> coarse_grid_solver_setup) = NULL;
-  (mgr_data -> coarse_grid_solver_solve) = NULL;
-
-  (mgr_data -> global_smoother) = NULL;
-
-  (mgr_data -> use_default_cgrid_solver) = 1;
-  (mgr_data -> use_default_fsolver) = -1; // set to -1 to avoid printing when not used
-  (mgr_data -> omega) = 1.;
-  (mgr_data -> max_iter) = 20;
-  (mgr_data -> tol) = 1.0e-6;
-  (mgr_data -> relax_type) = 0;
-  (mgr_data -> relax_order) = 1; // not fully utilized. Only used to compute L1-norms.
-  (mgr_data -> interp_type) = NULL;
-  (mgr_data -> restrict_type) = NULL;
-  (mgr_data -> num_relax_sweeps) = 1;
-  (mgr_data -> relax_weight) = 1.0;
-
-  (mgr_data -> logging) = 0;
-  (mgr_data -> print_level) = 0;
-  (mgr_data -> frelax_print_level) = 0;
-  (mgr_data -> cg_print_level) = 0;
-
-  (mgr_data -> l1_norms) = NULL;
-
-  (mgr_data -> reserved_coarse_size) = 0;
-  (mgr_data -> reserved_coarse_indexes) = NULL;
-  (mgr_data -> reserved_Cpoint_local_indexes) = NULL;
-
-  (mgr_data -> diaginv) = NULL;
-  (mgr_data -> global_smooth_iters) = 1;
-  (mgr_data -> global_smooth_type) = 0;
-
-  (mgr_data -> set_non_Cpoints_to_F) = 0;
-  (mgr_data -> idx_array) = NULL;
-
-  (mgr_data -> Frelax_method) = NULL;
-  (mgr_data -> VcycleRelaxVtemp) = NULL;
-  (mgr_data -> VcycleRelaxZtemp) = NULL;
-  (mgr_data -> FrelaxVcycleData) = NULL;
-  (mgr_data -> Frelax_num_functions) = NULL;
-  (mgr_data -> max_local_lvls) = 10;
-
-  (mgr_data -> use_non_galerkin_cg) = NULL;
-
-  (mgr_data -> print_coarse_system) = 0;
-
-  (mgr_data -> set_c_points_method) = 0;
-  (mgr_data -> lvl_to_keep_cpoints) = 0;
-  (mgr_data -> cg_convergence_factor) = 0.0;
-
-  (mgr_data -> truncate_coarse_grid_threshold) = 0.0;
-
-  return (void *) mgr_data;
+   hypre_ParMGRData  *mgr_data;
+
+   mgr_data = hypre_CTAlloc(hypre_ParMGRData,  1, HYPRE_MEMORY_HOST);
+
+   /* block data */
+   (mgr_data -> block_size) = 1;
+   (mgr_data -> block_num_coarse_indexes) = NULL;
+   (mgr_data -> point_marker_array) = NULL;
+   (mgr_data -> block_cf_marker) = NULL;
+
+   /* general data */
+   (mgr_data -> max_num_coarse_levels) = 10;
+   (mgr_data -> A_array) = NULL;
+   (mgr_data -> B_array) = NULL;
+   (mgr_data -> B_FF_array) = NULL;
+#if defined(HYPRE_USING_GPU)
+   (mgr_data -> P_FF_array) = NULL;
+#endif
+   (mgr_data -> P_array) = NULL;
+   (mgr_data -> R_array) = NULL;
+   (mgr_data -> RT_array) = NULL;
+   (mgr_data -> RAP) = NULL;
+   (mgr_data -> CF_marker_array) = NULL;
+   (mgr_data -> coarse_indices_lvls) = NULL;
+
+   (mgr_data -> A_ff_array) = NULL;
+   (mgr_data -> F_fine_array) = NULL;
+   (mgr_data -> U_fine_array) = NULL;
+   (mgr_data -> aff_solver) = NULL;
+   (mgr_data -> fine_grid_solver_setup) = NULL;
+   (mgr_data -> fine_grid_solver_solve) = NULL;
+
+   (mgr_data -> F_array) = NULL;
+   (mgr_data -> U_array) = NULL;
+   (mgr_data -> residual) = NULL;
+   (mgr_data -> rel_res_norms) = NULL;
+   (mgr_data -> Vtemp) = NULL;
+   (mgr_data -> Ztemp) = NULL;
+   (mgr_data -> Utemp) = NULL;
+   (mgr_data -> Ftemp) = NULL;
+
+   (mgr_data -> num_iterations) = 0;
+   (mgr_data -> num_interp_sweeps) = 1;
+   (mgr_data -> num_restrict_sweeps) = 1;
+   (mgr_data -> trunc_factor) = 0.0;
+   (mgr_data -> max_row_sum) = 0.9;
+   (mgr_data -> strong_threshold) = 0.25;
+   (mgr_data -> P_max_elmts) = NULL;
+
+   (mgr_data -> coarse_grid_solver) = NULL;
+   (mgr_data -> coarse_grid_solver_setup) = NULL;
+   (mgr_data -> coarse_grid_solver_solve) = NULL;
+
+   //(mgr_data -> global_smoother) = NULL;
+
+   (mgr_data -> use_default_cgrid_solver) = 1;
+   (mgr_data -> fsolver_mode) = -1; // user or hypre -prescribed F-solver
+   (mgr_data -> omega) = 1.;
+   (mgr_data -> max_iter) = 20;
+   (mgr_data -> tol) = 1.0e-6;
+   (mgr_data -> relax_type) = 0;
+   (mgr_data -> Frelax_type) = NULL;
+   (mgr_data -> relax_order) = 1; // not fully utilized. Only used to compute L1-norms.
+   (mgr_data -> num_relax_sweeps) = NULL;
+   (mgr_data -> relax_weight) = 1.0;
+
+   (mgr_data -> interp_type) = NULL;
+   (mgr_data -> restrict_type) = NULL;
+   (mgr_data -> level_smooth_iters) = NULL;
+   (mgr_data -> level_smooth_type) = NULL;
+   (mgr_data -> level_smoother) = NULL;
+   (mgr_data -> global_smooth_cycle) = 1; // Pre = 1 or Post  = 2 global smoothing
+
+   (mgr_data -> logging) = 0;
+   (mgr_data -> print_level) = 0;
+   (mgr_data -> frelax_print_level) = 0;
+   (mgr_data -> cg_print_level) = 0;
+   (mgr_data -> data_path) = NULL;
+
+   (mgr_data -> l1_norms) = NULL;
+
+   (mgr_data -> reserved_coarse_size) = 0;
+   (mgr_data -> reserved_coarse_indexes) = NULL;
+   (mgr_data -> reserved_Cpoint_local_indexes) = NULL;
+
+   (mgr_data -> level_diaginv) = NULL;
+   (mgr_data -> frelax_diaginv) = NULL;
+   //(mgr_data -> global_smooth_iters) = 1;
+   //(mgr_data -> global_smooth_type) = 0;
+
+   (mgr_data -> set_non_Cpoints_to_F) = 0;
+   (mgr_data -> idx_array) = NULL;
+
+   (mgr_data -> Frelax_method) = NULL;
+   (mgr_data -> VcycleRelaxVtemp) = NULL;
+   (mgr_data -> VcycleRelaxZtemp) = NULL;
+   (mgr_data -> FrelaxVcycleData) = NULL;
+   (mgr_data -> Frelax_num_functions) = NULL;
+   (mgr_data -> max_local_lvls) = 10;
+
+   (mgr_data -> coarse_grid_method) = NULL;
+   (mgr_data -> nonglk_max_elmts) = NULL;
+
+   (mgr_data -> print_coarse_system) = 0;
+
+   (mgr_data -> set_c_points_method) = 0;
+   (mgr_data -> lvl_to_keep_cpoints) = 0;
+   (mgr_data -> cg_convergence_factor) = 0.0;
+
+   (mgr_data -> block_jacobi_bsize) = 0;
+   (mgr_data -> blk_size) = NULL;
+
+   (mgr_data -> truncate_coarse_grid_threshold) = 0.0;
+
+   (mgr_data -> GSElimData) = NULL;
+
+   return (void *) mgr_data;
 }
 
 /*--------------------------------------------------------------------------
@@ -128,372 +160,509 @@ hypre_MGRCreate()
 HYPRE_Int
 hypre_MGRDestroy( void *data )
 {
-  hypre_ParMGRData * mgr_data = (hypre_ParMGRData*) data;
+   hypre_ParMGRData  *mgr_data = (hypre_ParMGRData*) data;
+   hypre_Solver      *aff_base;
 
-  HYPRE_Int i;
-  HYPRE_Int num_coarse_levels = (mgr_data -> num_coarse_levels);
-
-  /* block info data */
-  if ((mgr_data -> block_cf_marker))
-  {
-    for (i=0; i < (mgr_data -> max_num_coarse_levels); i++)
-    {
-      if ((mgr_data -> block_cf_marker)[i])
+   HYPRE_Int i;
+   HYPRE_Int num_coarse_levels = (mgr_data -> num_coarse_levels);
+
+   /* block info data */
+   if ((mgr_data -> block_cf_marker))
+   {
+      for (i = 0; i < (mgr_data -> max_num_coarse_levels); i++)
       {
-        hypre_TFree((mgr_data -> block_cf_marker)[i], HYPRE_MEMORY_HOST);
+         hypre_TFree((mgr_data -> block_cf_marker)[i], HYPRE_MEMORY_HOST);
       }
-    }
-    hypre_TFree((mgr_data -> block_cf_marker), HYPRE_MEMORY_HOST);
-    (mgr_data -> block_cf_marker) = NULL;
-  }
+      hypre_TFree((mgr_data -> block_cf_marker), HYPRE_MEMORY_HOST);
+   }
 
-  if(mgr_data -> block_num_coarse_indexes)
-  {
-    hypre_TFree(mgr_data -> block_num_coarse_indexes, HYPRE_MEMORY_HOST);
-    (mgr_data -> block_num_coarse_indexes) = NULL;
-  }
+   hypre_TFree(mgr_data -> block_num_coarse_indexes, HYPRE_MEMORY_HOST);
 
-  /* final residual vector */
-  if((mgr_data -> residual))
-  {
-    hypre_ParVectorDestroy( (mgr_data -> residual) );
-    (mgr_data -> residual) = NULL;
-  }
-  if((mgr_data -> rel_res_norms))
-  {
-    hypre_TFree( (mgr_data -> rel_res_norms) , HYPRE_MEMORY_HOST);
-    (mgr_data -> rel_res_norms) = NULL;
-  }
-  /* temp vectors for solve phase */
-  if((mgr_data -> Vtemp))
-  {
-    hypre_ParVectorDestroy( (mgr_data -> Vtemp) );
-    (mgr_data -> Vtemp) = NULL;
-  }
-  if((mgr_data -> Ztemp))
-  {
-    hypre_ParVectorDestroy( (mgr_data -> Ztemp) );
-    (mgr_data -> Ztemp) = NULL;
-  }
-  if((mgr_data -> Utemp))
-  {
-    hypre_ParVectorDestroy( (mgr_data -> Utemp) );
-    (mgr_data -> Utemp) = NULL;
-  }
-  if((mgr_data -> Ftemp))
-  {
-    hypre_ParVectorDestroy( (mgr_data -> Ftemp) );
-    (mgr_data -> Ftemp) = NULL;
-  }
-  /* coarse grid solver */
-  if((mgr_data -> use_default_cgrid_solver))
-  {
-    if((mgr_data -> coarse_grid_solver))
-    {
-      hypre_BoomerAMGDestroy( (mgr_data -> coarse_grid_solver) );
-    }
-    (mgr_data -> coarse_grid_solver) = NULL;
-  }
-  /* l1_norms */
-  if ((mgr_data -> l1_norms))
-  {
-    for (i=0; i < (num_coarse_levels); i++)
-    {
-       hypre_SeqVectorDestroy((mgr_data -> l1_norms)[i]);
-    }
-    hypre_TFree((mgr_data -> l1_norms), HYPRE_MEMORY_HOST);
-  }
+   /* final residual vector */
+   if ((mgr_data -> residual))
+   {
+      hypre_ParVectorDestroy( (mgr_data -> residual) );
+      (mgr_data -> residual) = NULL;
+   }
 
-  /* coarse_indices_lvls */
-  if ((mgr_data -> coarse_indices_lvls))
-  {
-    for (i=0; i < (num_coarse_levels); i++)
-      if ((mgr_data -> coarse_indices_lvls)[i])
-        hypre_TFree((mgr_data -> coarse_indices_lvls)[i], HYPRE_MEMORY_HOST);
-    hypre_TFree((mgr_data -> coarse_indices_lvls), HYPRE_MEMORY_HOST);
-  }
+   hypre_TFree( (mgr_data -> rel_res_norms), HYPRE_MEMORY_HOST);
 
-  /* linear system and cf marker array */
-  if(mgr_data -> A_array || mgr_data -> P_array || mgr_data -> RT_array || mgr_data -> CF_marker_array)
-  {
-    for (i=1; i < num_coarse_levels+1; i++) {
-      hypre_ParVectorDestroy((mgr_data -> F_array)[i]);
-      hypre_ParVectorDestroy((mgr_data -> U_array)[i]);
-
-      if ((mgr_data -> P_array)[i-1])
-        hypre_ParCSRMatrixDestroy((mgr_data -> P_array)[i-1]);
-
-      if ((mgr_data -> RT_array)[i-1])
-        hypre_ParCSRMatrixDestroy((mgr_data -> RT_array)[i-1]);
-
-      hypre_IntArrayDestroy(mgr_data -> CF_marker_array[i-1]);
-    }
-    for (i=1; i < (num_coarse_levels); i++) {
-      if ((mgr_data -> A_array)[i])
-        hypre_ParCSRMatrixDestroy((mgr_data -> A_array)[i]);
-    }
-  }
+   /* temp vectors for solve phase */
+   if ((mgr_data -> Vtemp))
+   {
+      hypre_ParVectorDestroy( (mgr_data -> Vtemp) );
+      (mgr_data -> Vtemp) = NULL;
+   }
+   if ((mgr_data -> Ztemp))
+   {
+      hypre_ParVectorDestroy( (mgr_data -> Ztemp) );
+      (mgr_data -> Ztemp) = NULL;
+   }
+   if ((mgr_data -> Utemp))
+   {
+      hypre_ParVectorDestroy( (mgr_data -> Utemp) );
+      (mgr_data -> Utemp) = NULL;
+   }
+   if ((mgr_data -> Ftemp))
+   {
+      hypre_ParVectorDestroy( (mgr_data -> Ftemp) );
+      (mgr_data -> Ftemp) = NULL;
+   }
+   /* coarse grid solver */
+   if ((mgr_data -> use_default_cgrid_solver))
+   {
+      if ((mgr_data -> coarse_grid_solver))
+      {
+         hypre_BoomerAMGDestroy( (mgr_data -> coarse_grid_solver) );
+      }
+      (mgr_data -> coarse_grid_solver) = NULL;
+   }
+   /* l1_norms */
+   if ((mgr_data -> l1_norms))
+   {
+      for (i = 0; i < (num_coarse_levels); i++)
+      {
+         hypre_SeqVectorDestroy((mgr_data -> l1_norms)[i]);
+      }
+      hypre_TFree((mgr_data -> l1_norms), HYPRE_MEMORY_HOST);
+   }
 
-  /* AMG for Frelax */
-  if(mgr_data -> A_ff_array || mgr_data -> F_fine_array || mgr_data -> U_fine_array)
-  {
-    for (i=1; i < num_coarse_levels+1; i++)
-    {
-      if (mgr_data -> F_fine_array[i])
-        hypre_ParVectorDestroy((mgr_data -> F_fine_array)[i]);
-      if (mgr_data -> U_fine_array[i])
-        hypre_ParVectorDestroy((mgr_data -> U_fine_array)[i]);
-    }
-    for (i=1; i < (num_coarse_levels); i++)
-    {
-      if ((mgr_data -> A_ff_array)[i])
-        hypre_ParCSRMatrixDestroy((mgr_data -> A_ff_array)[i]);
-    }
-    if (mgr_data -> use_default_fsolver)
-    {
-      hypre_ParCSRMatrixDestroy((mgr_data -> A_ff_array)[0]);
-    }
-    hypre_TFree(mgr_data -> F_fine_array, HYPRE_MEMORY_HOST);
-    (mgr_data -> F_fine_array) = NULL;
-    hypre_TFree(mgr_data -> U_fine_array, HYPRE_MEMORY_HOST);
-    (mgr_data -> U_fine_array) = NULL;
-    hypre_TFree(mgr_data -> A_ff_array, HYPRE_MEMORY_HOST);
-    (mgr_data -> A_ff_array) = NULL;
-  }
+   /* coarse_indices_lvls */
+   if ((mgr_data -> coarse_indices_lvls))
+   {
+      for (i = 0; i < (num_coarse_levels); i++)
+      {
+         hypre_TFree((mgr_data -> coarse_indices_lvls)[i], HYPRE_MEMORY_HOST);
+      }
+      hypre_TFree((mgr_data -> coarse_indices_lvls), HYPRE_MEMORY_HOST);
+   }
 
-  if(mgr_data -> aff_solver)
-  {
-    for (i = 1; i < (num_coarse_levels); i++) {
-      if ((mgr_data -> aff_solver)[i])
-        hypre_BoomerAMGDestroy((mgr_data -> aff_solver)[i]);
-    }
-    if (mgr_data -> use_default_fsolver)
-    {
-      if ((mgr_data -> aff_solver)[0])
-        hypre_BoomerAMGDestroy((mgr_data -> aff_solver)[0]);
-    }
-    hypre_TFree(mgr_data -> aff_solver, HYPRE_MEMORY_HOST);
-    (mgr_data -> aff_solver) = NULL;
-  }
+   /* linear system and cf marker array */
+   if (mgr_data -> A_array || mgr_data -> P_array ||
+       mgr_data -> RT_array || mgr_data -> R_array ||
+       mgr_data -> CF_marker_array)
+   {
+      for (i = 1; i < num_coarse_levels + 1; i++)
+      {
+         hypre_ParVectorDestroy((mgr_data -> F_array)[i]);
+         hypre_ParVectorDestroy((mgr_data -> U_array)[i]);
 
-  if((mgr_data -> F_array))
-  {
-    hypre_TFree((mgr_data -> F_array), HYPRE_MEMORY_HOST);
-    (mgr_data -> F_array) = NULL;
-  }
-  if((mgr_data -> U_array))
-  {
-    hypre_TFree((mgr_data -> U_array), HYPRE_MEMORY_HOST);
-    (mgr_data -> U_array) = NULL;
-  }
-  if((mgr_data -> A_array))
-  {
-    hypre_TFree((mgr_data -> A_array), HYPRE_MEMORY_HOST);
-    (mgr_data -> A_array) = NULL;
-  }
-  if((mgr_data -> P_array))
-  {
-    hypre_TFree((mgr_data -> P_array), HYPRE_MEMORY_HOST);
-    (mgr_data -> P_array) = NULL;
-  }
-  if((mgr_data -> RT_array))
-  {
-    hypre_TFree((mgr_data -> RT_array), HYPRE_MEMORY_HOST);
-    (mgr_data -> RT_array) = NULL;
-  }
-  if((mgr_data -> CF_marker_array))
-  {
-    hypre_TFree((mgr_data -> CF_marker_array), HYPRE_MEMORY_HOST);
-    (mgr_data -> CF_marker_array) = NULL;
-  }
-  if((mgr_data -> reserved_Cpoint_local_indexes))
-  {
-    hypre_TFree((mgr_data -> reserved_Cpoint_local_indexes), HYPRE_MEMORY_HOST);
-    (mgr_data -> reserved_Cpoint_local_indexes) = NULL;
-  }
-  if (mgr_data -> restrict_type)
-  {
-    hypre_TFree(mgr_data -> restrict_type, HYPRE_MEMORY_HOST);
-    (mgr_data -> restrict_type) = NULL;
-  }
-  if (mgr_data -> interp_type)
-  {
-    hypre_TFree(mgr_data -> interp_type, HYPRE_MEMORY_HOST);
-    (mgr_data -> interp_type) = NULL;
-  }
-  /* Frelax_method */
-  if (mgr_data -> Frelax_method)
-  {
-    hypre_TFree(mgr_data -> Frelax_method, HYPRE_MEMORY_HOST);
-    (mgr_data -> Frelax_method) = NULL;
-  }
-  /* Frelax_num_functions */
-  if (mgr_data -> Frelax_num_functions)
-  {
-    hypre_TFree(mgr_data -> Frelax_num_functions, HYPRE_MEMORY_HOST);
-    (mgr_data -> Frelax_num_functions) = NULL;
-  }
-  /* data for V-cycle F-relaxation */
-  if((mgr_data -> VcycleRelaxVtemp))
-  {
-    hypre_ParVectorDestroy( (mgr_data -> VcycleRelaxVtemp) );
-    (mgr_data -> VcycleRelaxVtemp) = NULL;
-  }
-  if((mgr_data -> VcycleRelaxZtemp))
-  {
-    hypre_ParVectorDestroy( (mgr_data -> VcycleRelaxZtemp) );
-    (mgr_data -> VcycleRelaxZtemp) = NULL;
-  }
-  if (mgr_data -> FrelaxVcycleData) {
-    for (i = 0; i < num_coarse_levels; i++) {
-      if ((mgr_data -> FrelaxVcycleData)[i]) {
-        hypre_MGRDestroyFrelaxVcycleData((mgr_data -> FrelaxVcycleData)[i]);
-        (mgr_data -> FrelaxVcycleData)[i] = NULL;
+         if ((mgr_data -> P_array)[i - 1])
+         {
+            hypre_ParCSRMatrixDestroy((mgr_data -> P_array)[i - 1]);
+         }
+
+         if ((mgr_data -> R_array)[i - 1])
+         {
+            hypre_ParCSRMatrixDestroy((mgr_data -> R_array)[i - 1]);
+         }
+
+         if ((mgr_data -> RT_array)[i - 1])
+         {
+            hypre_ParCSRMatrixDestroy((mgr_data -> RT_array)[i - 1]);
+         }
+
+         hypre_IntArrayDestroy(mgr_data -> CF_marker_array[i - 1]);
       }
-    }
-    hypre_TFree(mgr_data -> FrelaxVcycleData, HYPRE_MEMORY_HOST);
-    (mgr_data -> FrelaxVcycleData) = NULL;
-  }
-  /* data for reserved coarse nodes */
-  if(mgr_data -> reserved_coarse_indexes)
-  {
-    hypre_TFree(mgr_data -> reserved_coarse_indexes, HYPRE_MEMORY_HOST);
-    (mgr_data -> reserved_coarse_indexes) = NULL;
-  }
-  /* index array for setting Cpoints by global block */
-  if ((mgr_data -> set_c_points_method) == 1)
-  {
-    hypre_TFree(mgr_data -> idx_array, HYPRE_MEMORY_HOST);
-    (mgr_data -> idx_array) = NULL;
-  }
-  /* array for setting option to use non-Galerkin coarse grid */
-   if (mgr_data -> use_non_galerkin_cg)
-  {
-    hypre_TFree(mgr_data -> use_non_galerkin_cg, HYPRE_MEMORY_HOST);
-    (mgr_data -> use_non_galerkin_cg) = NULL;
-  }
-  /* coarse level matrix - RAP */
-  if ((mgr_data -> RAP))
-    hypre_ParCSRMatrixDestroy((mgr_data -> RAP));
-  if ((mgr_data -> diaginv))
-    hypre_TFree((mgr_data -> diaginv), HYPRE_MEMORY_HOST);
-  if ((mgr_data -> global_smoother))
-  {
-    if (mgr_data -> global_smooth_type == 8)
-    {
-      HYPRE_EuclidDestroy((mgr_data -> global_smoother));
-    }
-    else if (mgr_data -> global_smooth_type == 16)
-    {
-      HYPRE_ILUDestroy((mgr_data -> global_smoother));
-    }
-  }
-  /* mgr data */
-  hypre_TFree(mgr_data, HYPRE_MEMORY_HOST);
+      for (i = 1; i < (num_coarse_levels); i++)
+      {
+         if ((mgr_data -> A_array)[i])
+         {
+            hypre_ParCSRMatrixDestroy((mgr_data -> A_array)[i]);
+         }
+      }
+   }
+
+   /* Block relaxation/interpolation matrices */
+   if (hypre_ParMGRDataBArray(mgr_data))
+   {
+      for (i = 0; i < num_coarse_levels; i++)
+      {
+         hypre_ParCSRMatrixDestroy(hypre_ParMGRDataB(mgr_data, i));
+      }
+   }
+
+   if (hypre_ParMGRDataBFFArray(mgr_data))
+   {
+      for (i = 0; i < num_coarse_levels; i++)
+      {
+         hypre_ParCSRMatrixDestroy(hypre_ParMGRDataBFF(mgr_data, i));
+      }
+   }
+
+#if defined(HYPRE_USING_GPU)
+   if (mgr_data -> P_FF_array)
+   {
+      for (i = 0; i < num_coarse_levels; i++)
+      {
+         if ((mgr_data -> P_array)[i])
+         {
+            hypre_ParCSRMatrixDestroy((mgr_data -> P_FF_array)[i]);
+         }
+      }
+      //hypre_TFree(P_FF_array, hypre_HandleMemoryLocation(hypre_handle()));
+      hypre_TFree((mgr_data -> P_FF_array), HYPRE_MEMORY_HOST);
+      (mgr_data -> P_FF_array) = NULL;
+   }
+#endif
+
+   /* AMG for Frelax */
+   if (mgr_data -> A_ff_array || mgr_data -> F_fine_array || mgr_data -> U_fine_array)
+   {
+      for (i = 1; i < num_coarse_levels + 1; i++)
+      {
+         if (mgr_data -> F_fine_array[i])
+         {
+            hypre_ParVectorDestroy((mgr_data -> F_fine_array)[i]);
+         }
+         if (mgr_data -> U_fine_array[i])
+         {
+            hypre_ParVectorDestroy((mgr_data -> U_fine_array)[i]);
+         }
+      }
+      for (i = 1; i < (num_coarse_levels); i++)
+      {
+         if ((mgr_data -> A_ff_array)[i])
+         {
+            hypre_ParCSRMatrixDestroy((mgr_data -> A_ff_array)[i]);
+         }
+      }
+      if (mgr_data -> fsolver_mode != 0)
+      {
+         if ((mgr_data -> A_ff_array)[0])
+         {
+            hypre_ParCSRMatrixDestroy((mgr_data -> A_ff_array)[0]);
+         }
+      }
+      hypre_TFree(mgr_data -> F_fine_array, HYPRE_MEMORY_HOST);
+      (mgr_data -> F_fine_array) = NULL;
+      hypre_TFree(mgr_data -> U_fine_array, HYPRE_MEMORY_HOST);
+      (mgr_data -> U_fine_array) = NULL;
+      hypre_TFree(mgr_data -> A_ff_array, HYPRE_MEMORY_HOST);
+      (mgr_data -> A_ff_array) = NULL;
+   }
+
+   if (mgr_data -> aff_solver)
+   {
+      for (i = 1; i < (num_coarse_levels); i++)
+      {
+         if ((mgr_data -> aff_solver)[i])
+         {
+            aff_base = (hypre_Solver*) (mgr_data -> aff_solver)[i];
+            hypre_SolverDestroy(aff_base)((HYPRE_Solver) (aff_base));
+         }
+      }
+      if (mgr_data -> fsolver_mode == 2)
+      {
+         hypre_BoomerAMGDestroy((mgr_data -> aff_solver)[0]);
+      }
+      hypre_TFree(mgr_data -> aff_solver, HYPRE_MEMORY_HOST);
+      (mgr_data -> aff_solver) = NULL;
+   }
+
+   if (mgr_data -> level_diaginv)
+   {
+      for (i = 0; i < (num_coarse_levels); i++)
+      {
+         hypre_TFree((mgr_data -> level_diaginv)[i], HYPRE_MEMORY_HOST);
+      }
+      hypre_TFree(mgr_data -> level_diaginv, HYPRE_MEMORY_HOST);
+   }
 
-  return hypre_error_flag;
+   if (mgr_data -> frelax_diaginv)
+   {
+      for (i = 0; i < (num_coarse_levels); i++)
+      {
+         hypre_TFree((mgr_data -> frelax_diaginv)[i], HYPRE_MEMORY_HOST);
+      }
+      hypre_TFree(mgr_data -> frelax_diaginv, HYPRE_MEMORY_HOST);
+   }
+   hypre_TFree((mgr_data -> F_array), HYPRE_MEMORY_HOST);
+   hypre_TFree((mgr_data -> U_array), HYPRE_MEMORY_HOST);
+   hypre_TFree((mgr_data -> A_array), HYPRE_MEMORY_HOST);
+   hypre_TFree((mgr_data -> B_array), HYPRE_MEMORY_HOST);
+   hypre_TFree((mgr_data -> B_FF_array), HYPRE_MEMORY_HOST);
+   hypre_TFree((mgr_data -> P_array), HYPRE_MEMORY_HOST);
+   hypre_TFree((mgr_data -> R_array), HYPRE_MEMORY_HOST);
+   hypre_TFree((mgr_data -> RT_array), HYPRE_MEMORY_HOST);
+   hypre_TFree((mgr_data -> CF_marker_array), HYPRE_MEMORY_HOST);
+   hypre_TFree((mgr_data -> reserved_Cpoint_local_indexes), HYPRE_MEMORY_HOST);
+   hypre_TFree((mgr_data -> restrict_type), HYPRE_MEMORY_HOST);
+   hypre_TFree((mgr_data -> interp_type), HYPRE_MEMORY_HOST);
+   hypre_TFree((mgr_data -> P_max_elmts), HYPRE_MEMORY_HOST);
+   /* Frelax_type */
+   hypre_TFree(mgr_data -> Frelax_type, HYPRE_MEMORY_HOST);
+   /* Frelax_method */
+   hypre_TFree(mgr_data -> Frelax_method, HYPRE_MEMORY_HOST);
+   /* Frelax_num_functions */
+   hypre_TFree(mgr_data -> Frelax_num_functions, HYPRE_MEMORY_HOST);
+
+   /* data for V-cycle F-relaxation */
+   if ((mgr_data -> VcycleRelaxVtemp))
+   {
+      hypre_ParVectorDestroy( (mgr_data -> VcycleRelaxVtemp) );
+      (mgr_data -> VcycleRelaxVtemp) = NULL;
+   }
+   if ((mgr_data -> VcycleRelaxZtemp))
+   {
+      hypre_ParVectorDestroy( (mgr_data -> VcycleRelaxZtemp) );
+      (mgr_data -> VcycleRelaxZtemp) = NULL;
+   }
+   if (mgr_data -> FrelaxVcycleData)
+   {
+      for (i = 0; i < num_coarse_levels; i++)
+      {
+         hypre_MGRDestroyFrelaxVcycleData((mgr_data -> FrelaxVcycleData)[i]);
+      }
+      hypre_TFree(mgr_data -> FrelaxVcycleData, HYPRE_MEMORY_HOST);
+   }
+
+   /* data for reserved coarse nodes */
+   hypre_TFree(mgr_data -> reserved_coarse_indexes, HYPRE_MEMORY_HOST);
+
+   /* index array for setting Cpoints by global block */
+   if ((mgr_data -> set_c_points_method) == 1)
+   {
+      hypre_TFree(mgr_data -> idx_array, HYPRE_MEMORY_HOST);
+   }
+
+   /* Coarse grid options */
+   hypre_TFree(mgr_data -> coarse_grid_method, HYPRE_MEMORY_HOST);
+   hypre_TFree(mgr_data -> nonglk_max_elmts, HYPRE_MEMORY_HOST);
+
+   /* coarsest level matrix - RAP */
+   if ((mgr_data -> RAP))
+   {
+      hypre_ParCSRMatrixDestroy((mgr_data -> RAP));
+   }
+
+   if ((mgr_data -> level_smoother) != NULL)
+   {
+      for (i = 0; i < num_coarse_levels; i++)
+      {
+         if ((mgr_data -> level_smooth_iters)[i] > 0)
+         {
+            if ((mgr_data -> level_smooth_type)[i] == 8)
+            {
+               HYPRE_EuclidDestroy((mgr_data -> level_smoother)[i]);
+            }
+            else if ((mgr_data -> level_smooth_type)[i] == 16)
+            {
+               HYPRE_ILUDestroy((mgr_data -> level_smoother)[i]);
+            }
+            else if ((mgr_data -> level_smoother)[i])
+            {
+               hypre_Solver *smoother_base = (hypre_Solver*) (mgr_data -> level_smoother)[i];
+               hypre_SolverDestroy(smoother_base)((mgr_data -> level_smoother)[i]);
+            }
+         }
+      }
+      hypre_TFree(mgr_data -> level_smoother, HYPRE_MEMORY_HOST);
+   }
+
+   /* free level data */
+   hypre_TFree(mgr_data -> blk_size, HYPRE_MEMORY_HOST);
+   hypre_TFree(mgr_data -> level_smooth_type, HYPRE_MEMORY_HOST);
+   hypre_TFree(mgr_data -> level_smooth_iters, HYPRE_MEMORY_HOST);
+   hypre_TFree(mgr_data -> num_relax_sweeps, HYPRE_MEMORY_HOST);
+
+   if (mgr_data -> GSElimData)
+   {
+      for (i = 0; i < num_coarse_levels; i++)
+      {
+         if ((mgr_data -> GSElimData)[i])
+         {
+            hypre_MGRDestroyGSElimData((mgr_data -> GSElimData)[i]);
+            (mgr_data -> GSElimData)[i] = NULL;
+         }
+      }
+      hypre_TFree(mgr_data -> GSElimData, HYPRE_MEMORY_HOST);
+   }
+
+   /* Free the data path filename */
+   hypre_TFree(mgr_data -> data_path, HYPRE_MEMORY_HOST);
+
+   /* mgr data */
+   hypre_TFree(mgr_data, HYPRE_MEMORY_HOST);
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_MGRCreateGSElimData
+ *
+ * Create data for Gaussian Elimination for F-relaxation.
+ *--------------------------------------------------------------------------*/
+
+void *
+hypre_MGRCreateGSElimData( void )
+{
+   hypre_ParAMGData  *gsdata = hypre_CTAlloc(hypre_ParAMGData,  1, HYPRE_MEMORY_HOST);
+
+   hypre_ParAMGDataGSSetup(gsdata)          = 0;
+   hypre_ParAMGDataGEMemoryLocation(gsdata) = HYPRE_MEMORY_UNDEFINED;
+   hypre_ParAMGDataNewComm(gsdata)          = hypre_MPI_COMM_NULL;
+   hypre_ParAMGDataCommInfo(gsdata)         = NULL;
+   hypre_ParAMGDataAMat(gsdata)             = NULL;
+   hypre_ParAMGDataAWork(gsdata)            = NULL;
+   hypre_ParAMGDataAPiv(gsdata)             = NULL;
+   hypre_ParAMGDataBVec(gsdata)             = NULL;
+   hypre_ParAMGDataUVec(gsdata)             = NULL;
+
+   return (void *) gsdata;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_MGRDestroyGSElimData
+ *
+ * Destroy data for Gaussian Elimination for F-relaxation.
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_MGRDestroyGSElimData( void *data )
+{
+   hypre_ParAMGData  *gsdata   = (hypre_ParAMGData*) data;
+   MPI_Comm           new_comm = hypre_ParAMGDataNewComm(gsdata);
+
+#if defined(HYPRE_USING_MAGMA)
+   hypre_TFree(hypre_ParAMGDataAPiv(gsdata),  HYPRE_MEMORY_HOST);
+#else
+   hypre_TFree(hypre_ParAMGDataAPiv(gsdata),  hypre_ParAMGDataGEMemoryLocation(gsdata));
+#endif
+   hypre_TFree(hypre_ParAMGDataAMat(gsdata),  hypre_ParAMGDataGEMemoryLocation(gsdata));
+   hypre_TFree(hypre_ParAMGDataAWork(gsdata), hypre_ParAMGDataGEMemoryLocation(gsdata));
+   hypre_TFree(hypre_ParAMGDataBVec(gsdata),  hypre_ParAMGDataGEMemoryLocation(gsdata));
+   hypre_TFree(hypre_ParAMGDataUVec(gsdata),  hypre_ParAMGDataGEMemoryLocation(gsdata));
+   hypre_TFree(hypre_ParAMGDataCommInfo(gsdata), HYPRE_MEMORY_HOST);
+
+   if (new_comm != hypre_MPI_COMM_NULL)
+   {
+      hypre_MPI_Comm_free(&new_comm);
+   }
+
+   hypre_TFree(gsdata, HYPRE_MEMORY_HOST);
+
+   return hypre_error_flag;
 }
 
 /* Create data for V-cycle F-relaxtion */
 void *
-hypre_MGRCreateFrelaxVcycleData()
+hypre_MGRCreateFrelaxVcycleData( void )
 {
-  hypre_ParAMGData  *vdata = hypre_CTAlloc(hypre_ParAMGData,  1, HYPRE_MEMORY_HOST);
-
-  hypre_ParAMGDataAArray(vdata) = NULL;
-  hypre_ParAMGDataPArray(vdata) = NULL;
-  hypre_ParAMGDataFArray(vdata) = NULL;
-  hypre_ParAMGDataCFMarkerArray(vdata) = NULL;
-  hypre_ParAMGDataVtemp(vdata)  = NULL;
-  hypre_ParAMGDataAMat(vdata)  = NULL;
-  hypre_ParAMGDataBVec(vdata)  = NULL;
-  hypre_ParAMGDataZtemp(vdata)  = NULL;
-  hypre_ParAMGDataCommInfo(vdata) = NULL;
-  hypre_ParAMGDataUArray(vdata) = NULL;
-  hypre_ParAMGDataNewComm(vdata) = hypre_MPI_COMM_NULL;
-  hypre_ParAMGDataNumLevels(vdata) = 0;
-  hypre_ParAMGDataMaxLevels(vdata) = 10;
-  hypre_ParAMGDataNumFunctions(vdata) = 1;
-  hypre_ParAMGDataSCommPkgSwitch(vdata) = 1.0;
-  hypre_ParAMGDataRelaxOrder(vdata) = 1;
-  hypre_ParAMGDataMaxCoarseSize(vdata) = 9;
-  hypre_ParAMGDataMinCoarseSize(vdata) = 0;
-  hypre_ParAMGDataUserCoarseRelaxType(vdata) = 9;
-
-  return (void *) vdata;
+   hypre_ParAMGData  *vdata = hypre_CTAlloc(hypre_ParAMGData,  1, HYPRE_MEMORY_HOST);
+
+   hypre_ParAMGDataAArray(vdata) = NULL;
+   hypre_ParAMGDataPArray(vdata) = NULL;
+   hypre_ParAMGDataFArray(vdata) = NULL;
+   hypre_ParAMGDataCFMarkerArray(vdata) = NULL;
+   hypre_ParAMGDataVtemp(vdata)  = NULL;
+   //   hypre_ParAMGDataAMat(vdata)  = NULL;
+   //   hypre_ParAMGDataBVec(vdata)  = NULL;
+   hypre_ParAMGDataZtemp(vdata)  = NULL;
+   //   hypre_ParAMGDataCommInfo(vdata) = NULL;
+   hypre_ParAMGDataUArray(vdata) = NULL;
+   hypre_ParAMGDataNewComm(vdata) = hypre_MPI_COMM_NULL;
+   hypre_ParAMGDataNumLevels(vdata) = 0;
+   hypre_ParAMGDataMaxLevels(vdata) = 10;
+   hypre_ParAMGDataNumFunctions(vdata) = 1;
+   hypre_ParAMGDataSCommPkgSwitch(vdata) = 1.0;
+   hypre_ParAMGDataRelaxOrder(vdata) = 1;
+   hypre_ParAMGDataMaxCoarseSize(vdata) = 9;
+   hypre_ParAMGDataMinCoarseSize(vdata) = 0;
+   hypre_ParAMGDataUserCoarseRelaxType(vdata) = 9;
+
+   /* Gaussian Elim data */
+   hypre_ParAMGDataGSSetup(vdata) = 0;
+   hypre_ParAMGDataAMat(vdata) = NULL;
+   hypre_ParAMGDataAWork(vdata) = NULL;
+   hypre_ParAMGDataBVec(vdata) = NULL;
+   hypre_ParAMGDataCommInfo(vdata) = NULL;
+
+   return (void *) vdata;
 }
 
 /* Destroy data for V-cycle F-relaxation */
 HYPRE_Int
 hypre_MGRDestroyFrelaxVcycleData( void *data )
 {
-  hypre_ParAMGData * vdata = (hypre_ParAMGData*) data;
-  HYPRE_Int i;
-  HYPRE_Int num_levels = hypre_ParAMGDataNumLevels(vdata);
-  MPI_Comm new_comm = hypre_ParAMGDataNewComm(vdata);
-
-  hypre_TFree(hypre_ParAMGDataDofFuncArray(vdata)[0], HYPRE_MEMORY_HOST);
-  for (i=1; i < num_levels + 1; i++)
-  {
-    if (hypre_ParAMGDataAArray(vdata)[i])
-      hypre_ParCSRMatrixDestroy(hypre_ParAMGDataAArray(vdata)[i]);
-
-    if (hypre_ParAMGDataPArray(vdata)[i-1])
-      hypre_ParCSRMatrixDestroy(hypre_ParAMGDataPArray(vdata)[i-1]);
-
-    hypre_IntArrayDestroy(hypre_ParAMGDataCFMarkerArray(vdata)[i-1]);
-    hypre_ParVectorDestroy(hypre_ParAMGDataFArray(vdata)[i]);
-    hypre_ParVectorDestroy(hypre_ParAMGDataUArray(vdata)[i]);
-    hypre_TFree(hypre_ParAMGDataDofFuncArray(vdata)[i], HYPRE_MEMORY_HOST);
-  }
+   hypre_ParAMGData * vdata = (hypre_ParAMGData*) data;
+   HYPRE_Int i;
+   HYPRE_Int num_levels = hypre_ParAMGDataNumLevels(vdata);
+   MPI_Comm new_comm = hypre_ParAMGDataNewComm(vdata);
 
-  if (num_levels < 1)
-  {
-    hypre_IntArrayDestroy(hypre_ParAMGDataCFMarkerArray(vdata)[0]);
-  }
+   hypre_TFree(hypre_ParAMGDataDofFuncArray(vdata)[0], HYPRE_MEMORY_HOST);
+   for (i = 1; i < num_levels + 1; i++)
+   {
+      if (hypre_ParAMGDataAArray(vdata)[i])
+      {
+         hypre_ParCSRMatrixDestroy(hypre_ParAMGDataAArray(vdata)[i]);
+      }
 
-  /* Points to VcycleRelaxVtemp of mgr_data, which is already destroyed */
-  //hypre_ParVectorDestroy(hypre_ParAMGDataVtemp(vdata));
-  hypre_TFree(hypre_ParAMGDataFArray(vdata), HYPRE_MEMORY_HOST);
-  hypre_TFree(hypre_ParAMGDataUArray(vdata), HYPRE_MEMORY_HOST);
-  hypre_TFree(hypre_ParAMGDataAArray(vdata), HYPRE_MEMORY_HOST);
-  hypre_TFree(hypre_ParAMGDataPArray(vdata), HYPRE_MEMORY_HOST);
-  hypre_TFree(hypre_ParAMGDataCFMarkerArray(vdata), HYPRE_MEMORY_HOST);
-  //hypre_TFree(hypre_ParAMGDataGridRelaxType(vdata), HYPRE_MEMORY_HOST);
-  hypre_TFree(hypre_ParAMGDataDofFuncArray(vdata), HYPRE_MEMORY_HOST);
-
-  /* Points to VcycleRelaxZtemp of mgr_data, which is already destroyed */
-  /*
-    if (hypre_ParAMGDataZtemp(vdata))
-        hypre_ParVectorDestroy(hypre_ParAMGDataZtemp(vdata));
-  */
-
-  if (hypre_ParAMGDataAMat(vdata)) hypre_TFree(hypre_ParAMGDataAMat(vdata), HYPRE_MEMORY_HOST);
-  if (hypre_ParAMGDataBVec(vdata)) hypre_TFree(hypre_ParAMGDataBVec(vdata), HYPRE_MEMORY_HOST);
-  if (hypre_ParAMGDataCommInfo(vdata)) hypre_TFree(hypre_ParAMGDataCommInfo(vdata), HYPRE_MEMORY_HOST);
-
-  if (new_comm != hypre_MPI_COMM_NULL)
-  {
-    hypre_MPI_Comm_free (&new_comm);
-  }
-  hypre_TFree(vdata, HYPRE_MEMORY_HOST);
+      if (hypre_ParAMGDataPArray(vdata)[i - 1])
+      {
+         hypre_ParCSRMatrixDestroy(hypre_ParAMGDataPArray(vdata)[i - 1]);
+      }
+
+      hypre_IntArrayDestroy(hypre_ParAMGDataCFMarkerArray(vdata)[i - 1]);
+      hypre_ParVectorDestroy(hypre_ParAMGDataFArray(vdata)[i]);
+      hypre_ParVectorDestroy(hypre_ParAMGDataUArray(vdata)[i]);
+      hypre_TFree(hypre_ParAMGDataDofFuncArray(vdata)[i], HYPRE_MEMORY_HOST);
+   }
+
+   if (num_levels < 1)
+   {
+      hypre_IntArrayDestroy(hypre_ParAMGDataCFMarkerArray(vdata)[0]);
+   }
+
+   /* Points to VcycleRelaxVtemp of mgr_data, which is already destroyed */
+   //hypre_ParVectorDestroy(hypre_ParAMGDataVtemp(vdata));
+   hypre_TFree(hypre_ParAMGDataFArray(vdata), HYPRE_MEMORY_HOST);
+   hypre_TFree(hypre_ParAMGDataUArray(vdata), HYPRE_MEMORY_HOST);
+   hypre_TFree(hypre_ParAMGDataAArray(vdata), HYPRE_MEMORY_HOST);
+   hypre_TFree(hypre_ParAMGDataPArray(vdata), HYPRE_MEMORY_HOST);
+   hypre_TFree(hypre_ParAMGDataCFMarkerArray(vdata), HYPRE_MEMORY_HOST);
+   //hypre_TFree(hypre_ParAMGDataGridRelaxType(vdata), HYPRE_MEMORY_HOST);
+   hypre_TFree(hypre_ParAMGDataDofFuncArray(vdata), HYPRE_MEMORY_HOST);
+
+   /* Points to VcycleRelaxZtemp of mgr_data, which is already destroyed */
+   /*
+     if (hypre_ParAMGDataZtemp(vdata))
+         hypre_ParVectorDestroy(hypre_ParAMGDataZtemp(vdata));
+   */
+
+#if defined(HYPRE_USING_MAGMA)
+   hypre_TFree(hypre_ParAMGDataAPiv(vdata),  HYPRE_MEMORY_HOST);
+#else
+   hypre_TFree(hypre_ParAMGDataAPiv(vdata),  hypre_ParAMGDataGEMemoryLocation(vdata));
+#endif
+   hypre_TFree(hypre_ParAMGDataAMat(vdata),  hypre_ParAMGDataGEMemoryLocation(vdata));
+   hypre_TFree(hypre_ParAMGDataAWork(vdata), hypre_ParAMGDataGEMemoryLocation(vdata));
+   hypre_TFree(hypre_ParAMGDataBVec(vdata),  hypre_ParAMGDataGEMemoryLocation(vdata));
+   hypre_TFree(hypre_ParAMGDataUVec(vdata),  hypre_ParAMGDataGEMemoryLocation(vdata));
+   hypre_TFree(hypre_ParAMGDataCommInfo(vdata), HYPRE_MEMORY_HOST);
+
+   if (new_comm != hypre_MPI_COMM_NULL)
+   {
+      hypre_MPI_Comm_free (&new_comm);
+   }
+   hypre_TFree(vdata, HYPRE_MEMORY_HOST);
 
-  return hypre_error_flag;
+   return hypre_error_flag;
 }
 
 /* Set C-point variables for each reduction level */
 /* Currently not implemented */
 HYPRE_Int
 hypre_MGRSetReductionLevelCpoints( void      *mgr_vdata,
-                         HYPRE_Int  nlevels,
-                         HYPRE_Int *num_coarse_points,
-                         HYPRE_Int  **level_coarse_indexes)
+                                   HYPRE_Int  nlevels,
+                                   HYPRE_Int *num_coarse_points,
+                                   HYPRE_Int  **level_coarse_indexes)
 {
-  hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
-  (mgr_data -> num_coarse_levels) = nlevels;
-  (mgr_data -> num_coarse_per_level) = num_coarse_points;
-  (mgr_data -> level_coarse_indexes) = level_coarse_indexes;
-  return hypre_error_flag;
+   hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
+   (mgr_data -> num_coarse_levels) = nlevels;
+   (mgr_data -> num_coarse_per_level) = num_coarse_points;
+   (mgr_data -> level_coarse_indexes) = level_coarse_indexes;
+   return hypre_error_flag;
 }
 
 /* Initialize some data */
@@ -501,3672 +670,2061 @@ hypre_MGRSetReductionLevelCpoints( void      *mgr_vdata,
 HYPRE_Int
 hypre_MGRSetNonCpointsToFpoints( void      *mgr_vdata, HYPRE_Int nonCptToFptFlag)
 {
-  hypre_ParMGRData *mgr_data = (hypre_ParMGRData*) mgr_vdata;
-  (mgr_data -> set_non_Cpoints_to_F) = nonCptToFptFlag;
+   hypre_ParMGRData *mgr_data = (hypre_ParMGRData*) mgr_vdata;
+   (mgr_data -> set_non_Cpoints_to_F) = nonCptToFptFlag;
 
-  return hypre_error_flag;
+   return hypre_error_flag;
 }
 
 /* Set whether the reserved C points are reduced before the coarse grid solve */
 HYPRE_Int
 hypre_MGRSetReservedCpointsLevelToKeep(void *mgr_vdata, HYPRE_Int level)
 {
-  hypre_ParMGRData *mgr_data = (hypre_ParMGRData*) mgr_vdata;
-  (mgr_data -> lvl_to_keep_cpoints) = level;
+   hypre_ParMGRData *mgr_data = (hypre_ParMGRData*) mgr_vdata;
+   (mgr_data -> lvl_to_keep_cpoints) = level;
 
-  return hypre_error_flag;
+   return hypre_error_flag;
 }
 
 /* Set Cpoints by contiguous blocks, i.e. p1, p2, ..., pn, s1, s2, ..., sn, ... */
 HYPRE_Int
 hypre_MGRSetCpointsByContiguousBlock( void  *mgr_vdata,
-                          HYPRE_Int  block_size,
-                          HYPRE_Int  max_num_levels,
-                          HYPRE_BigInt  *begin_idx_array,
-                          HYPRE_Int  *block_num_coarse_points,
-                          HYPRE_Int  **block_coarse_indexes)
+                                      HYPRE_Int  block_size,
+                                      HYPRE_Int  max_num_levels,
+                                      HYPRE_BigInt  *begin_idx_array,
+                                      HYPRE_Int  *block_num_coarse_points,
+                                      HYPRE_Int  **block_coarse_indexes)
 {
-  hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
-  HYPRE_Int i;
-  if((mgr_data -> idx_array) != NULL) {
-    hypre_TFree(mgr_data -> idx_array, HYPRE_MEMORY_HOST);
-    (mgr_data -> idx_array) = NULL;
-  }
-  HYPRE_BigInt *index_array = hypre_CTAlloc(HYPRE_BigInt, block_size, HYPRE_MEMORY_HOST);
-  if (begin_idx_array != NULL)
-  {
-    for (i = 0; i < block_size; i++) {
-      index_array[i] = *(begin_idx_array+i);
-    }
-  }
-  hypre_MGRSetCpointsByBlock(mgr_data, block_size, max_num_levels, block_num_coarse_points, block_coarse_indexes);
-  (mgr_data -> idx_array) = index_array;
-  (mgr_data -> set_c_points_method) = 1;
-  return hypre_error_flag;
+   hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
+   HYPRE_Int i;
+   if ((mgr_data -> idx_array) != NULL)
+   {
+      hypre_TFree(mgr_data -> idx_array, HYPRE_MEMORY_HOST);
+      (mgr_data -> idx_array) = NULL;
+   }
+   HYPRE_BigInt *index_array = hypre_CTAlloc(HYPRE_BigInt, block_size, HYPRE_MEMORY_HOST);
+   if (begin_idx_array != NULL)
+   {
+      for (i = 0; i < block_size; i++)
+      {
+         index_array[i] = *(begin_idx_array + i);
+      }
+   }
+   hypre_MGRSetCpointsByBlock(mgr_data, block_size, max_num_levels, block_num_coarse_points,
+                              block_coarse_indexes);
+   (mgr_data -> idx_array) = index_array;
+   (mgr_data -> set_c_points_method) = 1;
+   return hypre_error_flag;
 }
 
 /* Initialize/ set local block data information */
 HYPRE_Int
 hypre_MGRSetCpointsByBlock( void      *mgr_vdata,
-                         HYPRE_Int  block_size,
-                         HYPRE_Int  max_num_levels,
-                         HYPRE_Int  *block_num_coarse_points,
-                         HYPRE_Int  **block_coarse_indexes)
+                            HYPRE_Int  block_size,
+                            HYPRE_Int  max_num_levels,
+                            HYPRE_Int  *block_num_coarse_points,
+                            HYPRE_Int  **block_coarse_indexes)
 {
-  HYPRE_Int  i,j;
-  HYPRE_Int  **block_cf_marker = NULL;
-  HYPRE_Int *block_num_coarse_indexes = NULL;
-
-  hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
-
-  /* free block cf_marker data if not previously destroyed */
-  if((mgr_data -> block_cf_marker) != NULL)
-  {
-    for (i=0; i < (mgr_data -> max_num_coarse_levels); i++)
-    {
-      if ((mgr_data -> block_cf_marker)[i])
-      {
-        hypre_TFree((mgr_data -> block_cf_marker)[i], HYPRE_MEMORY_HOST);
-        (mgr_data -> block_cf_marker)[i] = NULL;
-      }
-    }
-    hypre_TFree(mgr_data -> block_cf_marker, HYPRE_MEMORY_HOST);
-    (mgr_data -> block_cf_marker) = NULL;
-  }
-  if((mgr_data -> block_num_coarse_indexes))
-  {
-    hypre_TFree((mgr_data -> block_num_coarse_indexes), HYPRE_MEMORY_HOST);
-    (mgr_data -> block_num_coarse_indexes) = NULL;
-  }
-
-  /* store block cf_marker */
-  block_cf_marker = hypre_CTAlloc(HYPRE_Int *, max_num_levels, HYPRE_MEMORY_HOST);
-  for (i = 0; i < max_num_levels; i++)
-  {
-   block_cf_marker[i] = hypre_CTAlloc(HYPRE_Int, block_size, HYPRE_MEMORY_HOST);
-   memset(block_cf_marker[i], FMRK, block_size*sizeof(HYPRE_Int));
-  }
-  for (i = 0; i < max_num_levels; i++)
-  {
-    for(j=0; j<block_num_coarse_points[i]; j++)
-    {
-      (block_cf_marker[i])[block_coarse_indexes[i][j]] = CMRK;
-    }
-  }
+   HYPRE_Int  i, j;
+   HYPRE_Int  **block_cf_marker = NULL;
+   HYPRE_Int *block_num_coarse_indexes = NULL;
 
-  /* store block_num_coarse_points */
-  if(max_num_levels > 0)
-  {
-    block_num_coarse_indexes = hypre_CTAlloc(HYPRE_Int,  max_num_levels, HYPRE_MEMORY_HOST);
-    for(i=0; i<max_num_levels; i++)
-      block_num_coarse_indexes[i] = block_num_coarse_points[i];
-  }
-  /* set block data */
-  (mgr_data -> max_num_coarse_levels) = max_num_levels;
-  (mgr_data -> block_size) = block_size;
-  (mgr_data -> block_num_coarse_indexes) = block_num_coarse_indexes;
-  (mgr_data -> block_cf_marker) = block_cf_marker;
-  (mgr_data -> set_c_points_method) = 0;
-
-  return hypre_error_flag;
-}
+   hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
 
-HYPRE_Int
-hypre_MGRSetCpointsByPointMarkerArray( void      *mgr_vdata,
-                           HYPRE_Int  block_size,
-                           HYPRE_Int  max_num_levels,
-                           HYPRE_Int  *lvl_num_coarse_points,
-                           HYPRE_Int  **lvl_coarse_indexes,
-                           HYPRE_Int  *point_marker_array)
-{
-  hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
-  HYPRE_Int  i,j;
-  HYPRE_Int  **block_cf_marker = NULL;
-  HYPRE_Int *block_num_coarse_indexes = NULL;
-
-  /* free block cf_marker data if not previously destroyed */
-  if((mgr_data -> block_cf_marker) != NULL)
-  {
-    for (i=0; i < (mgr_data -> max_num_coarse_levels); i++)
-    {
-      if ((mgr_data -> block_cf_marker)[i])
+   /* free block cf_marker data if not previously destroyed */
+   if ((mgr_data -> block_cf_marker) != NULL)
+   {
+      for (i = 0; i < (mgr_data -> max_num_coarse_levels); i++)
       {
-        hypre_TFree((mgr_data -> block_cf_marker)[i], HYPRE_MEMORY_HOST);
-        (mgr_data -> block_cf_marker)[i] = NULL;
+         if ((mgr_data -> block_cf_marker)[i])
+         {
+            hypre_TFree((mgr_data -> block_cf_marker)[i], HYPRE_MEMORY_HOST);
+            (mgr_data -> block_cf_marker)[i] = NULL;
+         }
       }
-    }
-    hypre_TFree(mgr_data -> block_cf_marker, HYPRE_MEMORY_HOST);
-    (mgr_data -> block_cf_marker) = NULL;
-  }
-  if((mgr_data -> block_num_coarse_indexes))
-  {
-    hypre_TFree((mgr_data -> block_num_coarse_indexes), HYPRE_MEMORY_HOST);
-    (mgr_data -> block_num_coarse_indexes) = NULL;
-  }
+      hypre_TFree(mgr_data -> block_cf_marker, HYPRE_MEMORY_HOST);
+      (mgr_data -> block_cf_marker) = NULL;
+   }
+   if ((mgr_data -> block_num_coarse_indexes))
+   {
+      hypre_TFree((mgr_data -> block_num_coarse_indexes), HYPRE_MEMORY_HOST);
+      (mgr_data -> block_num_coarse_indexes) = NULL;
+   }
 
-  /* store block cf_marker */
-  block_cf_marker = hypre_CTAlloc(HYPRE_Int *, max_num_levels, HYPRE_MEMORY_HOST);
-  for (i = 0; i < max_num_levels; i++)
-  {
-    block_cf_marker[i] = hypre_CTAlloc(HYPRE_Int, block_size, HYPRE_MEMORY_HOST);
-    memset(block_cf_marker[i], FMRK, block_size*sizeof(HYPRE_Int));
-  }
-  for (i = 0; i < max_num_levels; i++)
-  {
-    for(j=0; j<lvl_num_coarse_points[i]; j++)
-    {
-      block_cf_marker[i][j] = lvl_coarse_indexes[i][j];
-    }
-  }
-
-  /* store block_num_coarse_points */
-  if(max_num_levels > 0)
-  {
-    block_num_coarse_indexes = hypre_CTAlloc(HYPRE_Int,  max_num_levels, HYPRE_MEMORY_HOST);
-    for(i=0; i<max_num_levels; i++)
-      block_num_coarse_indexes[i] = lvl_num_coarse_points[i];
-  }
-  /* set block data */
-  (mgr_data -> max_num_coarse_levels) = max_num_levels;
-  (mgr_data -> block_size) = block_size;
-  (mgr_data -> block_num_coarse_indexes) = block_num_coarse_indexes;
-  (mgr_data -> block_cf_marker) = block_cf_marker;
-  (mgr_data -> point_marker_array) = point_marker_array;
-  (mgr_data -> set_c_points_method) = 2;
-
-  return hypre_error_flag;
-}
-
-/*Set number of points that remain part of the coarse grid throughout the hierarchy */
-HYPRE_Int
-hypre_MGRSetReservedCoarseNodes(void      *mgr_vdata,
-                  HYPRE_Int reserved_coarse_size,
-                  HYPRE_BigInt *reserved_cpt_index)
-{
-  hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
-  HYPRE_BigInt *reserved_coarse_indexes = NULL;
-  HYPRE_Int i;
-
-  if (!mgr_data)
-  {
-    hypre_error_w_msg(HYPRE_ERROR_GENERIC,"Warning! MGR object empty!\n");
-    return hypre_error_flag;
-  }
-
-  if(reserved_coarse_size < 0)
-  {
-    hypre_error_in_arg(2);
-    return hypre_error_flag;
-  }
-  /* free data not previously destroyed */
-  if((mgr_data -> reserved_coarse_indexes))
-  {
-    hypre_TFree((mgr_data -> reserved_coarse_indexes), HYPRE_MEMORY_HOST);
-    (mgr_data -> reserved_coarse_indexes) = NULL;
-  }
-
-  /* set reserved coarse nodes */
-  if(reserved_coarse_size > 0)
-  {
-    reserved_coarse_indexes = hypre_CTAlloc(HYPRE_BigInt,  reserved_coarse_size, HYPRE_MEMORY_HOST);
-    for(i=0; i<reserved_coarse_size; i++)
-      reserved_coarse_indexes[i] = reserved_cpt_index[i];
-  }
-  (mgr_data -> reserved_coarse_size) = reserved_coarse_size;
-  (mgr_data -> reserved_coarse_indexes) = reserved_coarse_indexes;
-
-  return hypre_error_flag;
-}
-
-/* Set CF marker array */
-HYPRE_Int
-hypre_MGRCoarsen(hypre_ParCSRMatrix *S,
-               hypre_ParCSRMatrix *A,
-               HYPRE_Int fixed_coarse_size,
-               HYPRE_Int *fixed_coarse_indexes,
-               HYPRE_Int debug_flag,
-               hypre_IntArray **CF_marker_ptr,
-               HYPRE_Int cflag)
-{
-  HYPRE_Int   *CF_marker = NULL;
-  HYPRE_Int *cindexes = fixed_coarse_indexes;
-  HYPRE_Int    i, row, nc;
-  HYPRE_Int nloc =  hypre_CSRMatrixNumRows(hypre_ParCSRMatrixDiag(A));
-
-  /* If this is the last level, coarsen onto fixed coarse set */
-  if(cflag)
-  {
-    if(*CF_marker_ptr != NULL)
-    {
-      hypre_IntArrayDestroy(*CF_marker_ptr);
-    }
-    *CF_marker_ptr = hypre_IntArrayCreate(nloc);
-    hypre_IntArrayInitialize(*CF_marker_ptr);
-    hypre_IntArraySetConstantValues(*CF_marker_ptr, FMRK);
-    CF_marker = hypre_IntArrayData(*CF_marker_ptr);
-
-    /* first mark fixed coarse set */
-    nc = fixed_coarse_size;
-    for(i = 0; i < nc; i++)
-    {
-      CF_marker[cindexes[i]] = CMRK;
-    }
-  }
-  else
-  {
-    /* First coarsen to get initial CF splitting.
-     * This is then followed by updating the CF marker to pass
-     * coarse information to the next levels. NOTE: It may be
-     * convenient to implement this way (allows the use of multiple
-     * coarsening strategies without changing too much code),
-     * but not necessarily the best option, compared to initializing
-     * CF_marker first and then coarsening on subgraph which excludes
-     * the initialized coarse nodes.
-    */
-    hypre_BoomerAMGCoarsen(S, A, 0, debug_flag, CF_marker_ptr);
-    CF_marker = hypre_IntArrayData(*CF_marker_ptr);
-
-    /* Update CF_marker to correct Cpoints marked as Fpoints. */
-    nc = fixed_coarse_size;
-    for(i = 0; i < nc; i++)
-    {
-      CF_marker[cindexes[i]] = CMRK;
-    }
-    /* set F-points to FMRK. This is necessary since the different coarsening schemes differentiate
-     * between type of F-points (example Ruge coarsening). We do not need that distinction here.
-    */
-    for (row = 0; row <nloc; row++)
-    {
-      if(CF_marker[row] == CMRK) continue;
-      CF_marker[row] = FMRK;
-    }
-#if 0
-    /* IMPORTANT: Update coarse_indexes array to define the positions of the fixed coarse points
-     * in the next level.
-     */
-    nc = 0;
-    index_i = 0;
-    for (row = 0; row <nloc; row++)
-    {
-       /* loop through new c-points */
-       if(CF_marker[row] == CMRK) nc++;
-       else if(CF_marker[row] == S_CMRK)
-       {
-          /* previously marked c-point is part of fixed coarse set. Track its current local index */
-          cindexes[index_i++] = nc;
-          /* reset c-point from S_CMRK to CMRK */
-          cf_marker[row] = CMRK;
-          nc++;
-       }
-       /* set F-points to FMRK. This is necessary since the different coarsening schemes differentiate
-        * between type of F-points (example Ruge coarsening). We do not need that distinction here.
-        */
-       else
-       {
-          CF_marker[row] = FMRK;
-       }
-    }
-    /* check if this should be last level */
-    if( nc == fixed_coarse_size)
-       last_level = 1;
-    //printf(" nc = %d and fixed coarse size = %d \n", nc, fixed_coarse_size);
-#endif
-  }
-
-  return hypre_error_flag;
-}
-
-/* Interpolation for MGR - Adapted from BoomerAMGBuildInterp */
-HYPRE_Int
-hypre_MGRBuildP( hypre_ParCSRMatrix   *A,
-               HYPRE_Int            *CF_marker,
-               HYPRE_BigInt         *num_cpts_global,
-               HYPRE_Int             method,
-               HYPRE_Int             debug_flag,
-               hypre_ParCSRMatrix  **P_ptr)
-{
-  MPI_Comm          comm = hypre_ParCSRMatrixComm(A);
-  hypre_ParCSRCommPkg     *comm_pkg = hypre_ParCSRMatrixCommPkg(A);
-  hypre_ParCSRCommHandle  *comm_handle;
-
-  hypre_CSRMatrix *A_diag = hypre_ParCSRMatrixDiag(A);
-  HYPRE_Real      *A_diag_data = hypre_CSRMatrixData(A_diag);
-  HYPRE_Int       *A_diag_i = hypre_CSRMatrixI(A_diag);
-  HYPRE_Int       *A_diag_j = hypre_CSRMatrixJ(A_diag);
-
-  hypre_CSRMatrix *A_offd         = hypre_ParCSRMatrixOffd(A);
-  HYPRE_Real      *A_offd_data    = hypre_CSRMatrixData(A_offd);
-  HYPRE_Int       *A_offd_i = hypre_CSRMatrixI(A_offd);
-  HYPRE_Int       *A_offd_j = hypre_CSRMatrixJ(A_offd);
-  HYPRE_Int        num_cols_A_offd = hypre_CSRMatrixNumCols(A_offd);
-  HYPRE_Real      *a_diag;
-
-  hypre_ParCSRMatrix    *P;
-  HYPRE_BigInt    *col_map_offd_P;
-  HYPRE_Int       *tmp_map_offd = NULL;
-
-  HYPRE_Int       *CF_marker_offd = NULL;
-
-  hypre_CSRMatrix *P_diag;
-  hypre_CSRMatrix *P_offd;
-
-  HYPRE_Real      *P_diag_data;
-  HYPRE_Int       *P_diag_i;
-  HYPRE_Int       *P_diag_j;
-  HYPRE_Real      *P_offd_data;
-  HYPRE_Int       *P_offd_i;
-  HYPRE_Int       *P_offd_j;
-
-  HYPRE_Int        P_diag_size, P_offd_size;
-
-  HYPRE_Int       *P_marker, *P_marker_offd;
-
-  HYPRE_Int        jj_counter,jj_counter_offd;
-  HYPRE_Int       *jj_count, *jj_count_offd;
-  //   HYPRE_Int              jj_begin_row,jj_begin_row_offd;
-  //   HYPRE_Int              jj_end_row,jj_end_row_offd;
-
-  HYPRE_Int        start_indexing = 0; /* start indexing for P_data at 0 */
-
-  HYPRE_Int        n_fine = hypre_CSRMatrixNumRows(A_diag);
-
-  HYPRE_Int       *fine_to_coarse;
-  //HYPRE_BigInt    *fine_to_coarse_offd;
-  HYPRE_Int       *coarse_counter;
-  HYPRE_Int        coarse_shift;
-  HYPRE_BigInt     total_global_cpts;
-  //HYPRE_BigInt     my_first_cpt;
-  HYPRE_Int        num_cols_P_offd;
-
-  HYPRE_Int        i,i1;
-  HYPRE_Int        j,jl,jj;
-  HYPRE_Int        start;
-
-  HYPRE_Real       one  = 1.0;
-
-  HYPRE_Int        my_id;
-  HYPRE_Int        num_procs;
-  HYPRE_Int        num_threads;
-  HYPRE_Int        num_sends;
-  HYPRE_Int        index;
-  HYPRE_Int        ns, ne, size, rest;
-
-  HYPRE_Int       *int_buf_data;
-
-  HYPRE_Real       wall_time;  /* for debugging instrumentation  */
-
-  hypre_MPI_Comm_size(comm, &num_procs);
-  hypre_MPI_Comm_rank(comm,&my_id);
-  //num_threads = hypre_NumThreads();
-  // Temporary fix, disable threading
-  // TODO: enable threading
-  num_threads = 1;
-
-  //my_first_cpt = num_cpts_global[0];
-  if (my_id == (num_procs -1)) total_global_cpts = num_cpts_global[1];
-  hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
-
-  /*-------------------------------------------------------------------
-  * Get the CF_marker data for the off-processor columns
-  *-------------------------------------------------------------------*/
-
-  if (debug_flag < 0)
-  {
-    debug_flag = -debug_flag;
-  }
-
-  if (debug_flag==4) wall_time = time_getWallclockSeconds();
-
-  if (num_cols_A_offd) CF_marker_offd = hypre_CTAlloc(HYPRE_Int, num_cols_A_offd, HYPRE_MEMORY_HOST);
-
-  if (!comm_pkg)
-  {
-    hypre_MatvecCommPkgCreate(A);
-    comm_pkg = hypre_ParCSRMatrixCommPkg(A);
-  }
-
-  num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
-  int_buf_data = hypre_CTAlloc(HYPRE_Int,  hypre_ParCSRCommPkgSendMapStart(comm_pkg,
-                                                       num_sends), HYPRE_MEMORY_HOST);
-
-  index = 0;
-  for (i = 0; i < num_sends; i++)
-  {
-    start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-    for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
-      int_buf_data[index++] = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
-  }
-
-  comm_handle = hypre_ParCSRCommHandleCreate( 11, comm_pkg, int_buf_data, CF_marker_offd);
-  hypre_ParCSRCommHandleDestroy(comm_handle);
-
-  if (debug_flag==4)
-  {
-    wall_time = time_getWallclockSeconds() - wall_time;
-    hypre_printf("Proc = %d     Interp: Comm 1 CF_marker =    %f\n",
-              my_id, wall_time);
-    fflush(NULL);
-  }
-
-  /*-----------------------------------------------------------------------
-  *  First Pass: Determine size of P and fill in fine_to_coarse mapping.
-  *-----------------------------------------------------------------------*/
-
-  /*-----------------------------------------------------------------------
-  *  Intialize counters and allocate mapping vector.
-  *-----------------------------------------------------------------------*/
-
-  coarse_counter = hypre_CTAlloc(HYPRE_Int,  num_threads, HYPRE_MEMORY_HOST);
-  jj_count = hypre_CTAlloc(HYPRE_Int,  num_threads, HYPRE_MEMORY_HOST);
-  jj_count_offd = hypre_CTAlloc(HYPRE_Int,  num_threads, HYPRE_MEMORY_HOST);
-
-  fine_to_coarse = hypre_CTAlloc(HYPRE_Int,  n_fine, HYPRE_MEMORY_HOST);
-#if 0
-#ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
-#endif
-#endif
-  for (i = 0; i < n_fine; i++) fine_to_coarse[i] = -1;
-
-  jj_counter = start_indexing;
-  jj_counter_offd = start_indexing;
-
-  /*-----------------------------------------------------------------------
-  *  Loop over fine grid.
-  *-----------------------------------------------------------------------*/
-
-/* RDF: this looks a little tricky, but doable */
-#if 0
-#ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i,j,i1,jj,ns,ne,size,rest) HYPRE_SMP_SCHEDULE
-#endif
-#endif
-  for (j = 0; j < num_threads; j++)
-  {
-    size = n_fine/num_threads;
-    rest = n_fine - size*num_threads;
-
-    if (j < rest)
-    {
-      ns = j*size+j;
-      ne = (j+1)*size+j+1;
-    }
-    else
-    {
-      ns = j*size+rest;
-      ne = (j+1)*size+rest;
-    }
-    for (i = ns; i < ne; i++)
-    {
-      /*--------------------------------------------------------------------
-       *  If i is a C-point, interpolation is the identity. Also set up
-       *  mapping vector.
-       *--------------------------------------------------------------------*/
-
-      if (CF_marker[i] >= 0)
-      {
-        jj_count[j]++;
-        fine_to_coarse[i] = coarse_counter[j];
-        coarse_counter[j]++;
-      }
-      /*--------------------------------------------------------------------
-       *  If i is an F-point, interpolation is the approximation of A_{ff}^{-1}A_{fc}
-       *--------------------------------------------------------------------*/
-      else
-      {
-        for (jj = A_diag_i[i]; jj < A_diag_i[i+1]; jj++)
-        {
-          i1 = A_diag_j[jj];
-          if ((CF_marker[i1] >= 0) && (method > 0))
-          {
-            jj_count[j]++;
-          }
-        }
-
-        if (num_procs > 1)
-        {
-          for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
-          {
-            i1 = A_offd_j[jj];
-            if ((CF_marker_offd[i1] >= 0) && (method > 0))
-            {
-              jj_count_offd[j]++;
-            }
-          }
-        }
-      }
-    }
-  }
-
-  /*-----------------------------------------------------------------------
-  *  Allocate  arrays.
-  *-----------------------------------------------------------------------*/
-  for (i=0; i < num_threads-1; i++)
-  {
-    coarse_counter[i+1] += coarse_counter[i];
-    jj_count[i+1] += jj_count[i];
-    jj_count_offd[i+1] += jj_count_offd[i];
-  }
-  i = num_threads-1;
-  jj_counter = jj_count[i];
-  jj_counter_offd = jj_count_offd[i];
-
-  P_diag_size = jj_counter;
-
-  P_diag_i    = hypre_CTAlloc(HYPRE_Int,  n_fine+1, HYPRE_MEMORY_DEVICE);
-  P_diag_j    = hypre_CTAlloc(HYPRE_Int,  P_diag_size, HYPRE_MEMORY_DEVICE);
-  P_diag_data = hypre_CTAlloc(HYPRE_Real,  P_diag_size, HYPRE_MEMORY_DEVICE);
-
-  P_diag_i[n_fine] = jj_counter;
-
-  P_offd_size = jj_counter_offd;
-
-  P_offd_i    = hypre_CTAlloc(HYPRE_Int,  n_fine+1, HYPRE_MEMORY_DEVICE);
-  P_offd_j    = hypre_CTAlloc(HYPRE_Int,  P_offd_size, HYPRE_MEMORY_DEVICE);
-  P_offd_data = hypre_CTAlloc(HYPRE_Real,  P_offd_size, HYPRE_MEMORY_DEVICE);
-
-  /*-----------------------------------------------------------------------
-  *  Intialize some stuff.
-  *-----------------------------------------------------------------------*/
-
-  jj_counter = start_indexing;
-  jj_counter_offd = start_indexing;
-
-  if (debug_flag==4)
-  {
-    wall_time = time_getWallclockSeconds() - wall_time;
-    hypre_printf("Proc = %d     Interp: Internal work 1 =     %f\n",
-              my_id, wall_time);
-    fflush(NULL);
-  }
-
-  /*-----------------------------------------------------------------------
-  *  Send and receive fine_to_coarse info.
-  *-----------------------------------------------------------------------*/
-
-  if (debug_flag==4) wall_time = time_getWallclockSeconds();
-
-  //fine_to_coarse_offd = hypre_CTAlloc(HYPRE_BigInt, num_cols_A_offd, HYPRE_MEMORY_HOST);
-
-#if 0
-#ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i,j,ns,ne,size,rest,coarse_shift) HYPRE_SMP_SCHEDULE
-#endif
-#endif
-  for (j = 0; j < num_threads; j++)
-  {
-    coarse_shift = 0;
-    if (j > 0) coarse_shift = coarse_counter[j-1];
-    size = n_fine/num_threads;
-    rest = n_fine - size*num_threads;
-    if (j < rest)
-    {
-       ns = j*size+j;
-       ne = (j+1)*size+j+1;
-    }
-    else
-    {
-      ns = j*size+rest;
-      ne = (j+1)*size+rest;
-    }
-    for (i = ns; i < ne; i++)
-    {
-      fine_to_coarse[i] += coarse_shift;
-    }
-  }
-
-/*   index = 0;
-   for (i = 0; i < num_sends; i++)
-   {
-      start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
-         big_buf_data[index++]
-            = fine_to_coarse[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)]+ my_first_cpt;
-   }
-
-   comm_handle = hypre_ParCSRCommHandleCreate( 21, comm_pkg, big_buf_data,
-                                    fine_to_coarse_offd);
-
-   hypre_ParCSRCommHandleDestroy(comm_handle);
-*/
-   if (debug_flag==4)
-   {
-      wall_time = time_getWallclockSeconds() - wall_time;
-      hypre_printf("Proc = %d     Interp: Comm 4 FineToCoarse = %f\n",
-                my_id, wall_time);
-      fflush(NULL);
-   }
-
-   if (debug_flag==4) wall_time = time_getWallclockSeconds();
-
-#if 0
-#ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
-#endif
-#endif
-  //for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;
-
-  /*-----------------------------------------------------------------------
-  *  Loop over fine grid points.
-  *-----------------------------------------------------------------------*/
-  a_diag = hypre_CTAlloc(HYPRE_Real,  n_fine, HYPRE_MEMORY_HOST);
-  for (i = 0; i < n_fine; i++)
-  {
-    if (CF_marker[i] < 0)
-    {
-      for (jj = A_diag_i[i]; jj < A_diag_i[i+1]; jj++)
-      {
-        i1 = A_diag_j[jj];
-        if ( i==i1 )  /* diagonal of A only */
-        {
-          a_diag[i] = 1.0/A_diag_data[jj];
-        }
-      }
-    }
-  }
-
-#if 0
-#ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i,j,jl,i1,jj,ns,ne,size,rest,P_marker,P_marker_offd,jj_counter,jj_counter_offd,jj_begin_row,jj_end_row,jj_begin_row_offd,jj_end_row_offd) HYPRE_SMP_SCHEDULE
-#endif
-#endif
-  for (jl = 0; jl < num_threads; jl++)
-  {
-    size = n_fine/num_threads;
-    rest = n_fine - size*num_threads;
-    if (jl < rest)
-    {
-      ns = jl*size+jl;
-      ne = (jl+1)*size+jl+1;
-    }
-    else
-    {
-      ns = jl*size+rest;
-      ne = (jl+1)*size+rest;
-    }
-    jj_counter = 0;
-    if (jl > 0) jj_counter = jj_count[jl-1];
-    jj_counter_offd = 0;
-    if (jl > 0) jj_counter_offd = jj_count_offd[jl-1];
-    P_marker = hypre_CTAlloc(HYPRE_Int,  n_fine, HYPRE_MEMORY_HOST);
-    if (num_cols_A_offd)
-       P_marker_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_A_offd, HYPRE_MEMORY_HOST);
-    else
-       P_marker_offd = NULL;
-
-    for (i = 0; i < n_fine; i++)
-    {
-       P_marker[i] = -1;
-    }
-    for (i = 0; i < num_cols_A_offd; i++)
-    {
-       P_marker_offd[i] = -1;
-    }
-    for (i = ns; i < ne; i++)
-    {
-      /*--------------------------------------------------------------------
-      *  If i is a c-point, interpolation is the identity.
-      *--------------------------------------------------------------------*/
-      if (CF_marker[i] >= 0)
-      {
-        P_diag_i[i] = jj_counter;
-        P_diag_j[jj_counter]    = fine_to_coarse[i];
-        P_diag_data[jj_counter] = one;
-        jj_counter++;
-      }
-      /*--------------------------------------------------------------------
-      *  If i is an F-point, build interpolation.
-      *--------------------------------------------------------------------*/
-      else
-      {
-        /* Diagonal part of P */
-        P_diag_i[i] = jj_counter;
-        for (jj = A_diag_i[i]; jj < A_diag_i[i+1]; jj++)
-        {
-          i1 = A_diag_j[jj];
-
-          /*--------------------------------------------------------------
-           * If neighbor i1 is a C-point, set column number in P_diag_j
-           * and initialize interpolation weight to zero.
-           *--------------------------------------------------------------*/
-
-          if ((CF_marker[i1] >= 0) && (method > 0))
-          {
-            P_marker[i1] = jj_counter;
-            P_diag_j[jj_counter]    = fine_to_coarse[i1];
-            /*
-            if(method == 0)
-            {
-              P_diag_data[jj_counter] = 0.0;
-            }
-            */
-            if (method == 1)
-            {
-              P_diag_data[jj_counter] = - A_diag_data[jj];
-            }
-            else if (method == 2)
-            {
-              P_diag_data[jj_counter] = - A_diag_data[jj]*a_diag[i];
-            }
-            jj_counter++;
-          }
-        }
-
-        /* Off-Diagonal part of P */
-        P_offd_i[i] = jj_counter_offd;
-
-        if (num_procs > 1)
-        {
-          for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
-          {
-            i1 = A_offd_j[jj];
-
-            /*-----------------------------------------------------------
-            * If neighbor i1 is a C-point, set column number in P_offd_j
-            * and initialize interpolation weight to zero.
-            *-----------------------------------------------------------*/
-
-            if ((CF_marker_offd[i1] >= 0) && (method > 0))
-            {
-              P_marker_offd[i1] = jj_counter_offd;
-              /*P_offd_j[jj_counter_offd]  = fine_to_coarse_offd[i1];*/
-              P_offd_j[jj_counter_offd]  = i1;
-              /*
-              if(method == 0)
-              {
-                P_offd_data[jj_counter_offd] = 0.0;
-              }
-              */
-              if (method == 1)
-              {
-                P_offd_data[jj_counter_offd] = - A_offd_data[jj];
-              }
-              else if (method == 2)
-              {
-                P_offd_data[jj_counter_offd] = - A_offd_data[jj]*a_diag[i];
-              }
-              jj_counter_offd++;
-            }
-          }
-        }
-      }
-      P_offd_i[i+1] = jj_counter_offd;
-    }
-    hypre_TFree(P_marker, HYPRE_MEMORY_HOST);
-    hypre_TFree(P_marker_offd, HYPRE_MEMORY_HOST);
-  }
-  hypre_TFree(a_diag, HYPRE_MEMORY_HOST);
-  P = hypre_ParCSRMatrixCreate(comm,
-                         hypre_ParCSRMatrixGlobalNumRows(A),
-                         total_global_cpts,
-                         hypre_ParCSRMatrixColStarts(A),
-                         num_cpts_global,
-                         0,
-                         P_diag_i[n_fine],
-                         P_offd_i[n_fine]);
-
-  P_diag = hypre_ParCSRMatrixDiag(P);
-  hypre_CSRMatrixData(P_diag) = P_diag_data;
-  hypre_CSRMatrixI(P_diag) = P_diag_i;
-  hypre_CSRMatrixJ(P_diag) = P_diag_j;
-  P_offd = hypre_ParCSRMatrixOffd(P);
-  hypre_CSRMatrixData(P_offd) = P_offd_data;
-  hypre_CSRMatrixI(P_offd) = P_offd_i;
-  hypre_CSRMatrixJ(P_offd) = P_offd_j;
-
-  num_cols_P_offd = 0;
-
-  if (P_offd_size)
-  {
-    P_marker = hypre_CTAlloc(HYPRE_Int,  num_cols_A_offd, HYPRE_MEMORY_HOST);
-#if 0
-#ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
-#endif
-#endif
-    for (i=0; i < num_cols_A_offd; i++)
-      P_marker[i] = 0;
-    num_cols_P_offd = 0;
-    for (i=0; i < P_offd_size; i++)
-    {
-      index = P_offd_j[i];
-      if (!P_marker[index])
-      {
-        num_cols_P_offd++;
-        P_marker[index] = 1;
-      }
-    }
-
-    col_map_offd_P = hypre_CTAlloc(HYPRE_BigInt, num_cols_P_offd, HYPRE_MEMORY_HOST);
-    tmp_map_offd = hypre_CTAlloc(HYPRE_Int, num_cols_P_offd, HYPRE_MEMORY_HOST);
-    index = 0;
-    for (i=0; i < num_cols_P_offd; i++)
-    {
-      while (P_marker[index]==0) index++;
-      tmp_map_offd[i] = index++;
-    }
-
-#if 0
-#ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
-#endif
-#endif
-    for (i=0; i < P_offd_size; i++)
-      P_offd_j[i] = hypre_BinarySearch(tmp_map_offd,
-                              P_offd_j[i],
-                              num_cols_P_offd);
-    hypre_TFree(P_marker, HYPRE_MEMORY_HOST);
-  }
-
-  for (i=0; i < n_fine; i++)
-    if (CF_marker[i] == -3) CF_marker[i] = -1;
-  if (num_cols_P_offd)
-  {
-    hypre_ParCSRMatrixColMapOffd(P) = col_map_offd_P;
-    hypre_CSRMatrixNumCols(P_offd) = num_cols_P_offd;
-  }
-  hypre_GetCommPkgRTFromCommPkgA(P,A, fine_to_coarse, tmp_map_offd);
-
-  *P_ptr = P;
-
-  hypre_TFree(tmp_map_offd, HYPRE_MEMORY_HOST);
-  hypre_TFree(CF_marker_offd, HYPRE_MEMORY_HOST);
-  hypre_TFree(int_buf_data, HYPRE_MEMORY_HOST);
-  hypre_TFree(fine_to_coarse, HYPRE_MEMORY_HOST);
-  //hypre_TFree(fine_to_coarse_offd, HYPRE_MEMORY_HOST);
-  hypre_TFree(coarse_counter, HYPRE_MEMORY_HOST);
-  hypre_TFree(jj_count, HYPRE_MEMORY_HOST);
-  hypre_TFree(jj_count_offd, HYPRE_MEMORY_HOST);
-
-  return(0);
-}
-
-
-/* Interpolation for MGR - Dynamic Row Sum method */
-
-HYPRE_Int
-hypre_MGRBuildPDRS( hypre_ParCSRMatrix   *A,
-                 HYPRE_Int            *CF_marker,
-                 HYPRE_BigInt         *num_cpts_global,
-                 HYPRE_Int             blk_size,
-                 HYPRE_Int             reserved_coarse_size,
-                 HYPRE_Int             debug_flag,
-                 hypre_ParCSRMatrix  **P_ptr)
-{
-   MPI_Comm          comm = hypre_ParCSRMatrixComm(A);
-   hypre_ParCSRCommPkg     *comm_pkg = hypre_ParCSRMatrixCommPkg(A);
-   hypre_ParCSRCommHandle  *comm_handle;
-
-   hypre_CSRMatrix *A_diag = hypre_ParCSRMatrixDiag(A);
-   HYPRE_Real      *A_diag_data = hypre_CSRMatrixData(A_diag);
-   HYPRE_Int       *A_diag_i = hypre_CSRMatrixI(A_diag);
-   HYPRE_Int       *A_diag_j = hypre_CSRMatrixJ(A_diag);
-
-   hypre_CSRMatrix *A_offd         = hypre_ParCSRMatrixOffd(A);
-   HYPRE_Real      *A_offd_data    = hypre_CSRMatrixData(A_offd);
-   HYPRE_Int       *A_offd_i = hypre_CSRMatrixI(A_offd);
-   HYPRE_Int       *A_offd_j = hypre_CSRMatrixJ(A_offd);
-   HYPRE_Int        num_cols_A_offd = hypre_CSRMatrixNumCols(A_offd);
-   HYPRE_Real      *a_diag;
-
-   hypre_ParCSRMatrix    *P;
-   HYPRE_BigInt    *col_map_offd_P;
-   HYPRE_Int       *tmp_map_offd;
-
-   HYPRE_Int       *CF_marker_offd = NULL;
-
-   hypre_CSRMatrix *P_diag;
-   hypre_CSRMatrix *P_offd;
-
-   HYPRE_Real      *P_diag_data;
-   HYPRE_Int       *P_diag_i;
-   HYPRE_Int       *P_diag_j;
-   HYPRE_Real      *P_offd_data;
-   HYPRE_Int       *P_offd_i;
-   HYPRE_Int       *P_offd_j;
-
-   HYPRE_Int        P_diag_size, P_offd_size;
-
-   HYPRE_Int       *P_marker, *P_marker_offd;
-
-   HYPRE_Int        jj_counter,jj_counter_offd;
-   HYPRE_Int       *jj_count, *jj_count_offd;
-//   HYPRE_Int              jj_begin_row,jj_begin_row_offd;
-//   HYPRE_Int              jj_end_row,jj_end_row_offd;
-
-   HYPRE_Int        start_indexing = 0; /* start indexing for P_data at 0 */
-
-   HYPRE_Int        n_fine  = hypre_CSRMatrixNumRows(A_diag);
-
-   HYPRE_Int       *fine_to_coarse;
-   //HYPRE_BigInt             *fine_to_coarse_offd;
-   HYPRE_Int       *coarse_counter;
-   HYPRE_Int        coarse_shift;
-   HYPRE_BigInt     total_global_cpts;
-   //HYPRE_BigInt     my_first_cpt;
-   HYPRE_Int        num_cols_P_offd;
-
-   HYPRE_Int        i,i1;
-   HYPRE_Int        j,jl,jj;
-   HYPRE_Int        start;
-
-   HYPRE_Real       one  = 1.0;
-
-   HYPRE_Int        my_id;
-   HYPRE_Int        num_procs;
-   HYPRE_Int        num_threads;
-   HYPRE_Int        num_sends;
-   HYPRE_Int        index;
-   HYPRE_Int        ns, ne, size, rest;
-
-   HYPRE_Int       *int_buf_data;
-
-   HYPRE_Real       wall_time;  /* for debugging instrumentation  */
-
-   hypre_MPI_Comm_size(comm, &num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
-  //num_threads = hypre_NumThreads();
-  // Temporary fix, disable threading
-  // TODO: enable threading
-  num_threads = 1;
-
-   //my_first_cpt = num_cpts_global[0];
-   if (my_id == (num_procs -1)) total_global_cpts = num_cpts_global[1];
-   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
-
-   /*-------------------------------------------------------------------
-    * Get the CF_marker data for the off-processor columns
-    *-------------------------------------------------------------------*/
-
-   if (debug_flag < 0)
-   {
-      debug_flag = -debug_flag;
-   }
-
-   if (debug_flag==4) wall_time = time_getWallclockSeconds();
-
-   if (num_cols_A_offd) CF_marker_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_A_offd, HYPRE_MEMORY_HOST);
-
-   if (!comm_pkg)
-   {
-      hypre_MatvecCommPkgCreate(A);
-      comm_pkg = hypre_ParCSRMatrixCommPkg(A);
-   }
-
-   num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
-   int_buf_data = hypre_CTAlloc(HYPRE_Int,  hypre_ParCSRCommPkgSendMapStart(comm_pkg,
-                                                         num_sends), HYPRE_MEMORY_HOST);
-
-   index = 0;
-   for (i = 0; i < num_sends; i++)
-   {
-      start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
-         int_buf_data[index++]
-            = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
-   }
-
-   comm_handle = hypre_ParCSRCommHandleCreate( 11, comm_pkg, int_buf_data,
-                                    CF_marker_offd);
-   hypre_ParCSRCommHandleDestroy(comm_handle);
-
-   if (debug_flag==4)
-   {
-      wall_time = time_getWallclockSeconds() - wall_time;
-      hypre_printf("Proc = %d     Interp: Comm 1 CF_marker =    %f\n",
-                my_id, wall_time);
-      fflush(NULL);
-   }
-
-   /*-----------------------------------------------------------------------
-    *  First Pass: Determine size of P and fill in fine_to_coarse mapping.
-    *-----------------------------------------------------------------------*/
-
-   /*-----------------------------------------------------------------------
-    *  Intialize counters and allocate mapping vector.
-    *-----------------------------------------------------------------------*/
-
-   coarse_counter = hypre_CTAlloc(HYPRE_Int,  num_threads, HYPRE_MEMORY_HOST);
-   jj_count = hypre_CTAlloc(HYPRE_Int,  num_threads, HYPRE_MEMORY_HOST);
-   jj_count_offd = hypre_CTAlloc(HYPRE_Int,  num_threads, HYPRE_MEMORY_HOST);
-
-   fine_to_coarse = hypre_CTAlloc(HYPRE_Int,  n_fine, HYPRE_MEMORY_HOST);
-#if 0
-#ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
-#endif
-#endif
-   for (i = 0; i < n_fine; i++) fine_to_coarse[i] = -1;
-
-   jj_counter = start_indexing;
-   jj_counter_offd = start_indexing;
-
-   /*-----------------------------------------------------------------------
-    *  Loop over fine grid.
-    *-----------------------------------------------------------------------*/
-
-/* RDF: this looks a little tricky, but doable */
-#if 0
-#ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i,j,i1,jj,ns,ne,size,rest) HYPRE_SMP_SCHEDULE
-#endif
-#endif
-   for (j = 0; j < num_threads; j++)
-   {
-      size = n_fine/num_threads;
-      rest = n_fine - size*num_threads;
-
-      if (j < rest)
-      {
-         ns = j*size+j;
-         ne = (j+1)*size+j+1;
-      }
-      else
-      {
-         ns = j*size+rest;
-         ne = (j+1)*size+rest;
-      }
-      for (i = ns; i < ne; i++)
-      {
-         /*--------------------------------------------------------------------
-          *  If i is a C-point, interpolation is the identity. Also set up
-          *  mapping vector.
-          *--------------------------------------------------------------------*/
-
-         if (CF_marker[i] >= 0)
-         {
-            jj_count[j]++;
-            fine_to_coarse[i] = coarse_counter[j];
-            coarse_counter[j]++;
-         }
-         /*--------------------------------------------------------------------
-          *  If i is an F-point, interpolation is the approximation of A_{ff}^{-1}A_{fc}
-          *--------------------------------------------------------------------*/
-          else
-          {
-             for (jj = A_diag_i[i]; jj < A_diag_i[i+1]; jj++)
-             {
-                i1 = A_diag_j[jj];
-                if (CF_marker[i1] >= 0)
-                {
-                   jj_count[j]++;
-                }
-             }
-
-             if (num_procs > 1)
-             {
-                for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
-                {
-                   i1 = A_offd_j[jj];
-                   if (CF_marker_offd[i1] >= 0)
-                   {
-                      jj_count_offd[j]++;
-                   }
-                }
-             }
-          }
-         /*--------------------------------------------------------------------
-          *  Set up the indexes for the DRS method
-          *--------------------------------------------------------------------*/
-
-      }
-   }
-
-   /*-----------------------------------------------------------------------
-    *  Allocate  arrays.
-    *-----------------------------------------------------------------------*/
-   for (i=0; i < num_threads-1; i++)
-   {
-      coarse_counter[i+1] += coarse_counter[i];
-      jj_count[i+1] += jj_count[i];
-      jj_count_offd[i+1] += jj_count_offd[i];
-   }
-   i = num_threads-1;
-   jj_counter = jj_count[i];
-   jj_counter_offd = jj_count_offd[i];
-
-   P_diag_size = jj_counter;
-
-   P_diag_i    = hypre_CTAlloc(HYPRE_Int,  n_fine+1, HYPRE_MEMORY_HOST);
-   P_diag_j    = hypre_CTAlloc(HYPRE_Int,  P_diag_size, HYPRE_MEMORY_HOST);
-   P_diag_data = hypre_CTAlloc(HYPRE_Real,  P_diag_size, HYPRE_MEMORY_HOST);
-
-   P_diag_i[n_fine] = jj_counter;
-
-
-   P_offd_size = jj_counter_offd;
-
-   P_offd_i    = hypre_CTAlloc(HYPRE_Int,  n_fine+1, HYPRE_MEMORY_HOST);
-   P_offd_j    = hypre_CTAlloc(HYPRE_Int,  P_offd_size, HYPRE_MEMORY_HOST);
-   P_offd_data = hypre_CTAlloc(HYPRE_Real,  P_offd_size, HYPRE_MEMORY_HOST);
-
-   /*-----------------------------------------------------------------------
-    *  Intialize some stuff.
-    *-----------------------------------------------------------------------*/
-
-   jj_counter = start_indexing;
-   jj_counter_offd = start_indexing;
-
-   if (debug_flag==4)
+   /* store block cf_marker */
+   block_cf_marker = hypre_CTAlloc(HYPRE_Int *, max_num_levels, HYPRE_MEMORY_HOST);
+   for (i = 0; i < max_num_levels; i++)
    {
-      wall_time = time_getWallclockSeconds() - wall_time;
-      hypre_printf("Proc = %d     Interp: Internal work 1 =     %f\n",
-                my_id, wall_time);
-      fflush(NULL);
+      block_cf_marker[i] = hypre_CTAlloc(HYPRE_Int, block_size, HYPRE_MEMORY_HOST);
+      memset(block_cf_marker[i], FMRK, block_size * sizeof(HYPRE_Int));
    }
-
-   /*-----------------------------------------------------------------------
-    *  Send and receive fine_to_coarse info.
-    *-----------------------------------------------------------------------*/
-
-   if (debug_flag==4) wall_time = time_getWallclockSeconds();
-
-   //fine_to_coarse_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_A_offd, HYPRE_MEMORY_HOST);
-
-#if 0
-#ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i,j,ns,ne,size,rest,coarse_shift) HYPRE_SMP_SCHEDULE
-#endif
-#endif
-   for (j = 0; j < num_threads; j++)
+   for (i = 0; i < max_num_levels; i++)
    {
-      coarse_shift = 0;
-      if (j > 0) coarse_shift = coarse_counter[j-1];
-      size = n_fine/num_threads;
-      rest = n_fine - size*num_threads;
-      if (j < rest)
+      for (j = 0; j < block_num_coarse_points[i]; j++)
       {
-         ns = j*size+j;
-         ne = (j+1)*size+j+1;
+         (block_cf_marker[i])[block_coarse_indexes[i][j]] = CMRK;
       }
-      else
-      {
-         ns = j*size+rest;
-         ne = (j+1)*size+rest;
-      }
-      for (i = ns; i < ne; i++)
-         fine_to_coarse[i] += coarse_shift;
-   }
-
-   /*index = 0;
-   for (i = 0; i < num_sends; i++)
-   {
-      start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
-         int_buf_data[index++]
-            = fine_to_coarse[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
    }
 
-   comm_handle = hypre_ParCSRCommHandleCreate( 11, comm_pkg, int_buf_data,
-                                    fine_to_coarse_offd);
-
-   hypre_ParCSRCommHandleDestroy(comm_handle);
-*/
-   if (debug_flag==4)
+   /* store block_num_coarse_points */
+   if (max_num_levels > 0)
    {
-      wall_time = time_getWallclockSeconds() - wall_time;
-      hypre_printf("Proc = %d     Interp: Comm 4 FineToCoarse = %f\n",
-                my_id, wall_time);
-      fflush(NULL);
+      block_num_coarse_indexes = hypre_CTAlloc(HYPRE_Int,  max_num_levels, HYPRE_MEMORY_HOST);
+      for (i = 0; i < max_num_levels; i++)
+      {
+         block_num_coarse_indexes[i] = block_num_coarse_points[i];
+      }
    }
+   /* set block data */
+   (mgr_data -> max_num_coarse_levels) = max_num_levels;
+   (mgr_data -> block_size) = block_size;
+   (mgr_data -> block_num_coarse_indexes) = block_num_coarse_indexes;
+   (mgr_data -> block_cf_marker) = block_cf_marker;
+   (mgr_data -> set_c_points_method) = 0;
 
-   if (debug_flag==4) wall_time = time_getWallclockSeconds();
-
-#if 0
-#ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
-#endif
-#endif
+   return hypre_error_flag;
+}
 
-   //for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;
+HYPRE_Int
+hypre_MGRSetCpointsByPointMarkerArray( void      *mgr_vdata,
+                                       HYPRE_Int  block_size,
+                                       HYPRE_Int  max_num_levels,
+                                       HYPRE_Int  *lvl_num_coarse_points,
+                                       HYPRE_Int  **lvl_coarse_indexes,
+                                       HYPRE_Int  *point_marker_array)
+{
+   hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
+   HYPRE_Int  i, j;
+   HYPRE_Int  **block_cf_marker = NULL;
+   HYPRE_Int *block_num_coarse_indexes = NULL;
 
-   /*-----------------------------------------------------------------------
-    *  Loop over fine grid points.
-    *-----------------------------------------------------------------------*/
-   a_diag = hypre_CTAlloc(HYPRE_Real,  n_fine, HYPRE_MEMORY_HOST);
-   for (i = 0; i < n_fine; i++)
+   /* free block cf_marker data if not previously destroyed */
+   if ((mgr_data -> block_cf_marker) != NULL)
    {
-      for (jj = A_diag_i[i]; jj < A_diag_i[i+1]; jj++)
+      for (i = 0; i < (mgr_data -> max_num_coarse_levels); i++)
       {
-         i1 = A_diag_j[jj];
-         if ( i==i1 )  /* diagonal of A only */
+         if ((mgr_data -> block_cf_marker)[i])
          {
-            a_diag[i] = 1.0/A_diag_data[jj];
+            hypre_TFree((mgr_data -> block_cf_marker)[i], HYPRE_MEMORY_HOST);
+            (mgr_data -> block_cf_marker)[i] = NULL;
          }
       }
+      hypre_TFree(mgr_data -> block_cf_marker, HYPRE_MEMORY_HOST);
+      (mgr_data -> block_cf_marker) = NULL;
+   }
+   if ((mgr_data -> block_num_coarse_indexes))
+   {
+      hypre_TFree((mgr_data -> block_num_coarse_indexes), HYPRE_MEMORY_HOST);
+      (mgr_data -> block_num_coarse_indexes) = NULL;
    }
 
-#if 0
-#ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i,j,jl,i1,jj,ns,ne,size,rest,P_marker,P_marker_offd,jj_counter,jj_counter_offd,jj_begin_row,jj_end_row,jj_begin_row_offd,jj_end_row_offd) HYPRE_SMP_SCHEDULE
-#endif
-#endif
-   for (jl = 0; jl < num_threads; jl++)
+   /* store block cf_marker */
+   block_cf_marker = hypre_CTAlloc(HYPRE_Int *, max_num_levels, HYPRE_MEMORY_HOST);
+   for (i = 0; i < max_num_levels; i++)
    {
-      size = n_fine/num_threads;
-      rest = n_fine - size*num_threads;
-      if (jl < rest)
-      {
-         ns = jl*size+jl;
-         ne = (jl+1)*size+jl+1;
-      }
-      else
+      block_cf_marker[i] = hypre_CTAlloc(HYPRE_Int, block_size, HYPRE_MEMORY_HOST);
+      memset(block_cf_marker[i], FMRK, block_size * sizeof(HYPRE_Int));
+   }
+   for (i = 0; i < max_num_levels; i++)
+   {
+      for (j = 0; j < lvl_num_coarse_points[i]; j++)
       {
-         ns = jl*size+rest;
-         ne = (jl+1)*size+rest;
+         block_cf_marker[i][j] = lvl_coarse_indexes[i][j];
       }
-      jj_counter = 0;
-      if (jl > 0) jj_counter = jj_count[jl-1];
-      jj_counter_offd = 0;
-      if (jl > 0) jj_counter_offd = jj_count_offd[jl-1];
-      P_marker = hypre_CTAlloc(HYPRE_Int,  n_fine, HYPRE_MEMORY_HOST);
-      if (num_cols_A_offd)
-         P_marker_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_A_offd, HYPRE_MEMORY_HOST);
-      else
-         P_marker_offd = NULL;
+   }
 
-      for (i = 0; i < n_fine; i++)
-      {
-         P_marker[i] = -1;
-      }
-      for (i = 0; i < num_cols_A_offd; i++)
-      {
-         P_marker_offd[i] = -1;
-      }
-      for (i = ns; i < ne; i++)
+   /* store block_num_coarse_points */
+   if (max_num_levels > 0)
+   {
+      block_num_coarse_indexes = hypre_CTAlloc(HYPRE_Int,  max_num_levels, HYPRE_MEMORY_HOST);
+      for (i = 0; i < max_num_levels; i++)
       {
-         /*--------------------------------------------------------------------
-          *  If i is a c-point, interpolation is the identity.
-          *--------------------------------------------------------------------*/
-         if (CF_marker[i] >= 0)
-         {
-            P_diag_i[i] = jj_counter;
-            P_diag_j[jj_counter]    = fine_to_coarse[i];
-            P_diag_data[jj_counter] = one;
-            jj_counter++;
-         }
-         /*--------------------------------------------------------------------
-          *  If i is an F-point, build interpolation.
-          *--------------------------------------------------------------------*/
-         else
-         {
-            /* Diagonal part of P */
-            P_diag_i[i] = jj_counter;
-            for (jj = A_diag_i[i]; jj < A_diag_i[i+1]; jj++)
-            {
-               i1 = A_diag_j[jj];
-
-               /*--------------------------------------------------------------
-                * If neighbor i1 is a C-point, set column number in P_diag_j
-                * and initialize interpolation weight to zero.
-                *--------------------------------------------------------------*/
-
-               if (CF_marker[i1] >= 0)
-               {
-                  P_marker[i1] = jj_counter;
-                  P_diag_j[jj_counter]    = fine_to_coarse[i1];
-                  P_diag_data[jj_counter] = - A_diag_data[jj]*a_diag[i];
-
-                  jj_counter++;
-               }
-            }
-
-            /* Off-Diagonal part of P */
-            P_offd_i[i] = jj_counter_offd;
-
-            if (num_procs > 1)
-            {
-               for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
-               {
-                  i1 = A_offd_j[jj];
-
-                  /*-----------------------------------------------------------
-                   * If neighbor i1 is a C-point, set column number in P_offd_j
-                   * and initialize interpolation weight to zero.
-                   *-----------------------------------------------------------*/
-
-                  if (CF_marker_offd[i1] >= 0)
-                  {
-                     P_marker_offd[i1] = jj_counter_offd;
-                     /*P_offd_j[jj_counter_offd]  = fine_to_coarse_offd[i1];*/
-                     P_offd_j[jj_counter_offd]  = i1;
-                     P_offd_data[jj_counter_offd] = - A_offd_data[jj]*a_diag[i];
-
-                     jj_counter_offd++;
-                  }
-               }
-            }
-         }
-         P_offd_i[i+1] = jj_counter_offd;
+         block_num_coarse_indexes[i] = lvl_num_coarse_points[i];
       }
-    hypre_TFree(P_marker, HYPRE_MEMORY_HOST);
-    hypre_TFree(P_marker_offd, HYPRE_MEMORY_HOST);
-   }
- hypre_TFree(a_diag, HYPRE_MEMORY_HOST);
-   P = hypre_ParCSRMatrixCreate(comm,
-                         hypre_ParCSRMatrixGlobalNumRows(A),
-                         total_global_cpts,
-                         hypre_ParCSRMatrixColStarts(A),
-                         num_cpts_global,
-                         0,
-                         P_diag_i[n_fine],
-                         P_offd_i[n_fine]);
-
-   P_diag = hypre_ParCSRMatrixDiag(P);
-   hypre_CSRMatrixData(P_diag) = P_diag_data;
-   hypre_CSRMatrixI(P_diag) = P_diag_i;
-   hypre_CSRMatrixJ(P_diag) = P_diag_j;
-   P_offd = hypre_ParCSRMatrixOffd(P);
-   hypre_CSRMatrixData(P_offd) = P_offd_data;
-   hypre_CSRMatrixI(P_offd) = P_offd_i;
-   hypre_CSRMatrixJ(P_offd) = P_offd_j;
-
-   num_cols_P_offd = 0;
-
-   if (P_offd_size)
-   {
-      P_marker = hypre_CTAlloc(HYPRE_Int,  num_cols_A_offd, HYPRE_MEMORY_HOST);
+   }
+   /* set block data */
+   (mgr_data -> max_num_coarse_levels) = max_num_levels;
+   (mgr_data -> block_size) = block_size;
+   (mgr_data -> block_num_coarse_indexes) = block_num_coarse_indexes;
+   (mgr_data -> block_cf_marker) = block_cf_marker;
+   (mgr_data -> point_marker_array) = point_marker_array;
+   (mgr_data -> set_c_points_method) = 2;
 
-#if 0
-#ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
-#endif
-#endif
-      for (i=0; i < num_cols_A_offd; i++)
-         P_marker[i] = 0;
-      num_cols_P_offd = 0;
-      for (i=0; i < P_offd_size; i++)
-      {
-         index = P_offd_j[i];
-         if (!P_marker[index])
-         {
-            num_cols_P_offd++;
-            P_marker[index] = 1;
-         }
-      }
+   return hypre_error_flag;
+}
 
-      tmp_map_offd = hypre_CTAlloc(HYPRE_Int, num_cols_P_offd, HYPRE_MEMORY_HOST);
-      col_map_offd_P = hypre_CTAlloc(HYPRE_BigInt, num_cols_P_offd, HYPRE_MEMORY_HOST);
-      index = 0;
-      for (i=0; i < num_cols_P_offd; i++)
-      {
-         while (P_marker[index]==0) index++;
-         tmp_map_offd[i] = index++;
-      }
+/*Set number of points that remain part of the coarse grid throughout the hierarchy */
+HYPRE_Int
+hypre_MGRSetReservedCoarseNodes(void      *mgr_vdata,
+                                HYPRE_Int reserved_coarse_size,
+                                HYPRE_BigInt *reserved_cpt_index)
+{
+   hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
+   HYPRE_BigInt *reserved_coarse_indexes = NULL;
+   HYPRE_Int i;
 
-#if 0
-#ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
-#endif
-#endif
-      for (i=0; i < P_offd_size; i++)
-         P_offd_j[i] = hypre_BinarySearch(tmp_map_offd,
-                                  P_offd_j[i],
-                                  num_cols_P_offd);
-    hypre_TFree(P_marker, HYPRE_MEMORY_HOST);
+   /* free data not previously destroyed */
+   if ((mgr_data -> reserved_coarse_indexes))
+   {
+      hypre_TFree((mgr_data -> reserved_coarse_indexes), HYPRE_MEMORY_HOST);
+      (mgr_data -> reserved_coarse_indexes) = NULL;
    }
 
-   for (i=0; i < n_fine; i++)
-      if (CF_marker[i] == -3) CF_marker[i] = -1;
-   if (num_cols_P_offd)
+   /* set reserved coarse nodes */
+   if (reserved_coarse_size > 0)
    {
-      hypre_ParCSRMatrixColMapOffd(P) = col_map_offd_P;
-      hypre_CSRMatrixNumCols(P_offd) = num_cols_P_offd;
+      reserved_coarse_indexes = hypre_CTAlloc(HYPRE_BigInt,  reserved_coarse_size, HYPRE_MEMORY_HOST);
+      for (i = 0; i < reserved_coarse_size; i++)
+      {
+         reserved_coarse_indexes[i] = reserved_cpt_index[i];
+      }
    }
-   hypre_GetCommPkgRTFromCommPkgA(P,A, fine_to_coarse, tmp_map_offd);
+   (mgr_data -> reserved_coarse_size) = reserved_coarse_size;
+   (mgr_data -> reserved_coarse_indexes) = reserved_coarse_indexes;
 
-   *P_ptr = P;
-
- hypre_TFree(tmp_map_offd, HYPRE_MEMORY_HOST);
- hypre_TFree(CF_marker_offd, HYPRE_MEMORY_HOST);
- hypre_TFree(int_buf_data, HYPRE_MEMORY_HOST);
- hypre_TFree(fine_to_coarse, HYPRE_MEMORY_HOST);
-// hypre_TFree(fine_to_coarse_offd, HYPRE_MEMORY_HOST);
- hypre_TFree(coarse_counter, HYPRE_MEMORY_HOST);
- hypre_TFree(jj_count, HYPRE_MEMORY_HOST);
- hypre_TFree(jj_count_offd, HYPRE_MEMORY_HOST);
-
-   return(0);
-}
-
-/* Scale ParCSR matrix A = scalar * A
- * A: the target CSR matrix
- * vector: array of real numbers
- */
-HYPRE_Int
-hypre_ParCSRMatrixLeftScale(HYPRE_Real *vector,
-                            hypre_ParCSRMatrix *A)
-{
-  HYPRE_Int i, j, n_local;
-  hypre_CSRMatrix *A_diag = hypre_ParCSRMatrixDiag(A);
-  HYPRE_Real      *A_diag_data = hypre_CSRMatrixData(A_diag);
-  HYPRE_Int             *A_diag_i = hypre_CSRMatrixI(A_diag);
-
-  hypre_CSRMatrix *A_offd         = hypre_ParCSRMatrixOffd(A);
-  HYPRE_Real      *A_offd_data    = hypre_CSRMatrixData(A_offd);
-  HYPRE_Int             *A_offd_i = hypre_CSRMatrixI(A_offd);
-
-  n_local = hypre_CSRMatrixNumRows(A_diag);
-
-  for (i = 0; i < n_local; i++)
-  {
-    HYPRE_Real factor = vector[i];
-    for (j = A_diag_i[i]; j < A_diag_i[i+1]; j++)
-    {
-      A_diag_data[j] *= factor;
-    }
-    for (j = A_offd_i[i]; j < A_offd_i[i+1]; j++)
-    {
-      A_offd_data[j] *= factor;
-    }
-  }
-
-  return(0);
+   return hypre_error_flag;
 }
 
-/************************************************************
-* Available methods:
-*   0: inv(A_FF) approximated by its diagonal inverse
-*   1: inv(A_FF) approximated by sparse approximate inverse
-*************************************************************/
+/* Set CF marker array */
 HYPRE_Int
-hypre_MGRComputeNonGalerkinCoarseGrid(hypre_ParCSRMatrix    *A,
-                                      hypre_ParCSRMatrix    *P,
-                                      hypre_ParCSRMatrix    *RT,
-                                      HYPRE_Int             bsize,
-                                      HYPRE_Int             ordering,
-                                      HYPRE_Int             method,
-                                      HYPRE_Int             Pmax,
-                                      HYPRE_Int             keep_stencil,
-                                      HYPRE_Int             *CF_marker,
-                                      hypre_ParCSRMatrix    **A_h_ptr)
+hypre_MGRCoarsen(hypre_ParCSRMatrix *S,
+                 hypre_ParCSRMatrix *A,
+                 HYPRE_Int fixed_coarse_size,
+                 HYPRE_Int *fixed_coarse_indexes,
+                 HYPRE_Int debug_flag,
+                 hypre_IntArray **CF_marker_ptr,
+                 HYPRE_Int cflag)
 {
-  HYPRE_Int *c_marker, *f_marker;
-  HYPRE_Int n_local_fine_grid, i, i1, jj;
-  hypre_ParCSRMatrix *A_cc;
-  hypre_ParCSRMatrix *A_ff;
-  hypre_ParCSRMatrix *A_fc;
-  hypre_ParCSRMatrix *A_cf;
-  hypre_ParCSRMatrix *A_h;
-  hypre_ParCSRMatrix *A_h_correction;
-  HYPRE_Int  max_elmts = Pmax;
-//  HYPRE_Real wall_time = 0.;
-  hypre_ParCSRMatrix *P_mod = NULL;
-
-  HYPRE_Int my_id;
-  MPI_Comm comm = hypre_ParCSRMatrixComm(A);
-  hypre_MPI_Comm_rank(comm,&my_id);
-  HYPRE_MemoryLocation memory_location = hypre_ParCSRMatrixMemoryLocation(A);
-
-  n_local_fine_grid = hypre_CSRMatrixNumRows(hypre_ParCSRMatrixDiag(A));
-  c_marker = hypre_CTAlloc(HYPRE_Int, n_local_fine_grid, HYPRE_MEMORY_HOST);
-  f_marker = hypre_CTAlloc(HYPRE_Int, n_local_fine_grid, HYPRE_MEMORY_HOST);
-
-  for (i = 0; i < n_local_fine_grid; i++)
-  {
-    HYPRE_Int point_type = CF_marker[i];
-    hypre_assert(point_type == 1 || point_type == -1);
-    c_marker[i] = point_type;
-    f_marker[i] = -point_type;
-  }
-
-  // get the A_cc sub-block
-  hypre_MGRGetSubBlock(A, c_marker, c_marker, 0, &A_cc);
-
-  if (method == 0)
-  {
-    if (keep_stencil)
-    {
-      //wall_time = time_getWallclockSeconds();
-      hypre_MGRGetSubBlock(A, c_marker, f_marker, 0, &A_cf);
-      hypre_MGRGetSubBlock(A, f_marker, c_marker, 0, &A_fc);
-      hypre_MGRGetSubBlock(A, f_marker, f_marker, 0, &A_ff);
-
-      // extract the diagonal of A_ff and compute D_ff_inv
-      hypre_CSRMatrix *A_ff_diag = hypre_ParCSRMatrixDiag(A_ff);
-      HYPRE_Real      *A_ff_diag_data = hypre_CSRMatrixData(A_ff_diag);
-      HYPRE_Int             *A_ff_diag_i = hypre_CSRMatrixI(A_ff_diag);
-      HYPRE_Int             *A_ff_diag_j = hypre_CSRMatrixJ(A_ff_diag);
-      HYPRE_Int n_local_fpoints = hypre_CSRMatrixNumRows(A_ff_diag);
-
-      HYPRE_Real *D_ff_inv;
-      D_ff_inv = hypre_CTAlloc(HYPRE_Real, n_local_fpoints, HYPRE_MEMORY_HOST);
-      for (i = 0; i < n_local_fpoints; i++)
+   HYPRE_Int   *CF_marker = NULL;
+   HYPRE_Int *cindexes = fixed_coarse_indexes;
+   HYPRE_Int    i, row, nc;
+   HYPRE_Int nloc =  hypre_ParCSRMatrixNumRows(A);
+   HYPRE_MemoryLocation memory_location;
+
+   /* If this is the last level, coarsen onto fixed coarse set */
+   if (cflag)
+   {
+      if (*CF_marker_ptr != NULL)
       {
-        for (jj = A_ff_diag_i[i]; jj < A_ff_diag_i[i+1]; jj++)
-        {
-          i1 = A_ff_diag_j[jj];
-          if ( i==i1 )
-          {
-            D_ff_inv[i] = -1.0/A_ff_diag_data[jj];
-          }
-        }
+         hypre_IntArrayDestroy(*CF_marker_ptr);
       }
+      *CF_marker_ptr = hypre_IntArrayCreate(nloc);
+      hypre_IntArrayInitialize(*CF_marker_ptr);
+      hypre_IntArraySetConstantValues(*CF_marker_ptr, FMRK);
+      memory_location = hypre_IntArrayMemoryLocation(*CF_marker_ptr);
 
-      // extract the diagonal of A_cf
-      hypre_CSRMatrix *A_cf_diag = hypre_ParCSRMatrixDiag(A_cf);
-      HYPRE_Real      *A_cf_diag_data = hypre_CSRMatrixData(A_cf_diag);
-      HYPRE_Int             *A_cf_diag_i = hypre_CSRMatrixI(A_cf_diag);
-      HYPRE_Int             *A_cf_diag_j = hypre_CSRMatrixJ(A_cf_diag);
-
-      n_local_fpoints = hypre_CSRMatrixNumRows(A_cf_diag);
-      HYPRE_Real *D_cf;
-      D_cf = hypre_CTAlloc(HYPRE_Real, n_local_fpoints, HYPRE_MEMORY_HOST);
-      for (i = 0; i < n_local_fpoints; i++)
+      if (hypre_GetActualMemLocation(memory_location) == hypre_MEMORY_DEVICE)
       {
-        i1 = A_cf_diag_j[A_cf_diag_i[i]];
-        D_cf[i] = A_cf_diag_data[jj];
+         hypre_IntArrayMigrate(*CF_marker_ptr, HYPRE_MEMORY_HOST);
       }
-      // compute the triple product
-      hypre_ParCSRMatrixLeftScale(D_ff_inv, A_fc);
-      hypre_ParCSRMatrixLeftScale(D_cf, A_fc);
-      A_h_correction = A_fc;
-
-      hypre_TFree(D_cf, HYPRE_MEMORY_HOST);
-      hypre_TFree(D_ff_inv, HYPRE_MEMORY_HOST);
-      hypre_ParCSRMatrixDestroy(A_ff);
-      hypre_ParCSRMatrixDestroy(A_cf);
-      //wall_time = time_getWallclockSeconds() - wall_time;
-      //hypre_printf("Compute triple product D_cf * D_ff_inv * A_fc time: %1.5f\n", wall_time);
-    }
-    else
-    {
-      //wall_time = time_getWallclockSeconds();
-      P_mod = hypre_ParCSRMatrixCompleteClone(P);
-      hypre_ParCSRMatrixCopy(P,P_mod,1);
-
-      HYPRE_Int n_local_rows = hypre_ParCSRMatrixNumRows(P_mod);
-      hypre_CSRMatrix *P_mod_diag = hypre_ParCSRMatrixDiag(P_mod);
-      HYPRE_Int *P_mod_diag_i = hypre_CSRMatrixI(P_mod_diag);
-      HYPRE_Real *P_mod_diag_data = hypre_CSRMatrixData(P_mod_diag);
-      for (i = 0; i < n_local_rows; i ++)
+      CF_marker = hypre_IntArrayData(*CF_marker_ptr);
+
+      /* first mark fixed coarse set */
+      nc = fixed_coarse_size;
+      for (i = 0; i < nc; i++)
       {
-        if (CF_marker[i] >= 0)
-        {
-          HYPRE_Int ii = P_mod_diag_i[i];
-          P_mod_diag_data[ii] = 0.0;
-        }
+         CF_marker[cindexes[i]] = CMRK;
       }
-      hypre_BoomerAMGBuildCoarseOperator(RT, A, P_mod, &A_h_correction);
-      //wall_time = time_getWallclockSeconds() - wall_time;
-      //hypre_printf("Compute triple product time new: %1.5f\n", wall_time);
-
-      hypre_ParCSRMatrixDestroy(P_mod);
-    }
-  }
-  else
-  {
-    // Approximate inverse for ideal interploation
-    hypre_MGRGetSubBlock(A, c_marker, f_marker, 0, &A_cf);
-    hypre_MGRGetSubBlock(A, f_marker, c_marker, 0, &A_fc);
-    hypre_MGRGetSubBlock(A, f_marker, f_marker, 0, &A_ff);
-
-    hypre_ParCSRMatrix *A_ff_inv = NULL;
-    hypre_ParCSRMatrix *minus_Wp = NULL;
-    hypre_MGRApproximateInverse(A_ff, &A_ff_inv);
-    minus_Wp = hypre_ParMatmul(A_ff_inv, A_fc);
-    A_h_correction = hypre_ParMatmul(A_cf, minus_Wp);
-
-    hypre_ParCSRMatrixDestroy(minus_Wp);
-    hypre_ParCSRMatrixDestroy(A_ff);
-    hypre_ParCSRMatrixDestroy(A_fc);
-    hypre_ParCSRMatrixDestroy(A_cf);
-  }
-
-  // perform dropping for A_h_correction
-  // specific to multiphase poromechanics
-  // we only keep the diagonal of each block
 
-  //wall_time = time_getWallclockSeconds();
-  HYPRE_Int n_local_cpoints = hypre_CSRMatrixNumRows(hypre_ParCSRMatrixDiag(A_h_correction));
-
-  hypre_CSRMatrix *A_h_correction_diag = hypre_ParCSRMatrixDiag(A_h_correction);
-  HYPRE_Real      *A_h_correction_diag_data = hypre_CSRMatrixData(A_h_correction_diag);
-  HYPRE_Int             *A_h_correction_diag_i = hypre_CSRMatrixI(A_h_correction_diag);
-  HYPRE_Int             *A_h_correction_diag_j = hypre_CSRMatrixJ(A_h_correction_diag);
-  HYPRE_Int             ncol_diag = hypre_CSRMatrixNumCols(A_h_correction_diag);
-
-  hypre_CSRMatrix *A_h_correction_offd = hypre_ParCSRMatrixOffd(A_h_correction);
-  HYPRE_Real      *A_h_correction_offd_data = hypre_CSRMatrixData(A_h_correction_offd);
-  HYPRE_Int             *A_h_correction_offd_i = hypre_CSRMatrixI(A_h_correction_offd);
-  HYPRE_Int             *A_h_correction_offd_j = hypre_CSRMatrixJ(A_h_correction_offd);
-
-  if (Pmax > 0)
-  {
-    if (ordering == 0) // interleaved ordering
-    {
-      HYPRE_Int *A_h_correction_diag_i_new = hypre_CTAlloc(HYPRE_Int, n_local_cpoints+1, memory_location);
-      HYPRE_Int *A_h_correction_diag_j_new = hypre_CTAlloc(HYPRE_Int, (bsize + max_elmts)*n_local_cpoints, memory_location);
-      HYPRE_Complex *A_h_correction_diag_data_new = hypre_CTAlloc(HYPRE_Complex, (bsize + max_elmts)*n_local_cpoints, memory_location);
-      HYPRE_Int num_nonzeros_diag_new = 0;
-
-      HYPRE_Int *A_h_correction_offd_i_new = hypre_CTAlloc(HYPRE_Int, n_local_cpoints+1, memory_location);
-      HYPRE_Int *A_h_correction_offd_j_new = hypre_CTAlloc(HYPRE_Int, max_elmts*n_local_cpoints, memory_location);
-      HYPRE_Complex *A_h_correction_offd_data_new = hypre_CTAlloc(HYPRE_Complex, max_elmts*n_local_cpoints, memory_location);
-      HYPRE_Int num_nonzeros_offd_new = 0;
-
-
-      for (i = 0; i < n_local_cpoints; i++)
+      if (hypre_GetActualMemLocation(memory_location) == hypre_MEMORY_DEVICE)
       {
-        HYPRE_Int max_num_nonzeros = A_h_correction_diag_i[i+1] - A_h_correction_diag_i[i] + A_h_correction_offd_i[i+1] - A_h_correction_offd_i[i];
-        HYPRE_Int *aux_j = hypre_CTAlloc(HYPRE_Int, max_num_nonzeros, HYPRE_MEMORY_HOST);
-        HYPRE_Real *aux_data = hypre_CTAlloc(HYPRE_Real, max_num_nonzeros, HYPRE_MEMORY_HOST);
-        HYPRE_Int row_start = i - (i % bsize);
-        HYPRE_Int row_stop = row_start + bsize - 1;
-        HYPRE_Int cnt = 0;
-        for (jj = A_h_correction_offd_i[i]; jj < A_h_correction_offd_i[i+1]; jj++)
-        {
-          aux_j[cnt] = A_h_correction_offd_j[jj] + ncol_diag;
-          aux_data[cnt] = A_h_correction_offd_data[jj];
-          cnt++;
-        }
-        for (jj = A_h_correction_diag_i[i]; jj < A_h_correction_diag_i[i+1]; jj++)
-        {
-          aux_j[cnt] = A_h_correction_diag_j[jj];
-          aux_data[cnt] = A_h_correction_diag_data[jj];
-          cnt++;
-        }
-        hypre_qsort2_abs(aux_j, aux_data, 0, cnt-1);
-
-        for (jj = A_h_correction_diag_i[i]; jj < A_h_correction_diag_i[i+1]; jj++)
-        {
-          i1 = A_h_correction_diag_j[jj];
-          if (i1 >= row_start && i1 <= row_stop)
-          {
-            // copy data to new arrays
-            A_h_correction_diag_j_new[num_nonzeros_diag_new] = i1;
-            A_h_correction_diag_data_new[num_nonzeros_diag_new] = A_h_correction_diag_data[jj];
-            ++num_nonzeros_diag_new;
-          }
-          else
-          {
-            // Do nothing
-          }
-        }
-
-        if (max_elmts > 0)
-        {
-          for (jj = 0; jj < hypre_min(max_elmts, cnt); jj++)
-          {
-            HYPRE_Int col_idx = aux_j[jj];
-            HYPRE_Real col_value = aux_data[jj];
-            if (col_idx < ncol_diag && (col_idx < row_start || col_idx > row_stop))
-            {
-              A_h_correction_diag_j_new[num_nonzeros_diag_new] = col_idx;
-              A_h_correction_diag_data_new[num_nonzeros_diag_new] = col_value;
-              ++num_nonzeros_diag_new;
-            }
-            else if (col_idx >= ncol_diag)
-            {
-              A_h_correction_offd_j_new[num_nonzeros_offd_new] = col_idx - ncol_diag;
-              A_h_correction_offd_data_new[num_nonzeros_offd_new] = col_value;
-              ++num_nonzeros_offd_new;
-            }
-          }
-        }
-        A_h_correction_diag_i_new[i+1] = num_nonzeros_diag_new;
-        A_h_correction_offd_i_new[i+1] = num_nonzeros_offd_new;
-
-        hypre_TFree(aux_j, HYPRE_MEMORY_HOST);
-        hypre_TFree(aux_data, HYPRE_MEMORY_HOST);
+         hypre_IntArrayMigrate(*CF_marker_ptr, HYPRE_MEMORY_DEVICE);
       }
-
-      hypre_TFree(A_h_correction_diag_i, memory_location);
-      hypre_TFree(A_h_correction_diag_j, memory_location);
-      hypre_TFree(A_h_correction_diag_data, memory_location);
-      hypre_CSRMatrixI(A_h_correction_diag) = A_h_correction_diag_i_new;
-      hypre_CSRMatrixJ(A_h_correction_diag) = A_h_correction_diag_j_new;
-      hypre_CSRMatrixData(A_h_correction_diag) = A_h_correction_diag_data_new;
-      hypre_CSRMatrixNumNonzeros(A_h_correction_diag) = num_nonzeros_diag_new;
-
-      if (A_h_correction_offd_i) hypre_TFree(A_h_correction_offd_i, memory_location);
-      if (A_h_correction_offd_j) hypre_TFree(A_h_correction_offd_j, memory_location);
-      if (A_h_correction_offd_data) hypre_TFree(A_h_correction_offd_data, memory_location);
-      hypre_CSRMatrixI(A_h_correction_offd) = A_h_correction_offd_i_new;
-      hypre_CSRMatrixJ(A_h_correction_offd) = A_h_correction_offd_j_new;
-      hypre_CSRMatrixData(A_h_correction_offd) = A_h_correction_offd_data_new;
-      hypre_CSRMatrixNumNonzeros(A_h_correction_offd) = num_nonzeros_offd_new;
-    }
-    else
-    {
-      hypre_printf("Error!! Block ordering for non-Galerkin coarse grid is not currently supported\n");
-      exit(-1);
-    }
-  }
-  //hypre_MGRParCSRMatrixTruncate(A_h_correction, max_elmts);
-  //wall_time = time_getWallclockSeconds() - wall_time;
-  //hypre_printf("Filter A_h_correction time: %1.5f\n", wall_time);
-  //hypre_ParCSRMatrixPrintIJ(A_h_correction,1,1,"A_h_correction_filtered");
-
-  // coarse grid / schur complement
-  hypre_ParCSRMatrixAdd(1.0, A_cc, 1.0, A_h_correction, &A_h);
-  *A_h_ptr = A_h;
-  //hypre_ParCSRMatrixPrintIJ(A_h,1,1,"A_h");
-
-  hypre_ParCSRMatrixDestroy(A_cc);
-  hypre_ParCSRMatrixDestroy(A_h_correction);
-  hypre_TFree(c_marker, HYPRE_MEMORY_HOST);
-  hypre_TFree(f_marker, HYPRE_MEMORY_HOST);
-
-  return hypre_error_flag;
-}
-
-HYPRE_Int
-hypre_MGRComputeAlgebraicFixedStress(hypre_ParCSRMatrix  *A,
-                                     HYPRE_BigInt        *mgr_idx_array,
-                                     HYPRE_Solver         A_ff_solver)
-{
-  HYPRE_Int *U_marker, *S_marker, *P_marker;
-  HYPRE_Int n_fine, i;
-  HYPRE_BigInt ibegin;
-  hypre_ParCSRMatrix *A_up;
-  hypre_ParCSRMatrix *A_uu;
-  hypre_ParCSRMatrix *A_su;
-  hypre_ParCSRMatrix *A_pu;
-  hypre_ParVector *e1_vector;
-  hypre_ParVector *e2_vector;
-  hypre_ParVector *e3_vector;
-  hypre_ParVector *e4_vector;
-  hypre_ParVector *e5_vector;
-
-  n_fine = hypre_CSRMatrixNumRows(hypre_ParCSRMatrixDiag(A));
-  ibegin = hypre_ParCSRMatrixFirstRowIndex(A);
-  hypre_assert(ibegin == mgr_idx_array[0]);
-  U_marker = hypre_CTAlloc(HYPRE_Int, n_fine, HYPRE_MEMORY_HOST);
-  S_marker = hypre_CTAlloc(HYPRE_Int, n_fine, HYPRE_MEMORY_HOST);
-  P_marker = hypre_CTAlloc(HYPRE_Int, n_fine, HYPRE_MEMORY_HOST);
-
-  for (i = 0; i < n_fine; i++)
-  {
-    U_marker[i] = -1;
-    S_marker[i] = -1;
-    P_marker[i] = -1;
-  }
-
-  // create C and F markers
-  for (i = 0; i < n_fine; i++)
-  {
-    if (i < mgr_idx_array[1] - ibegin)
-    {
-      U_marker[i] = 1;
-    }
-    else if (i >= (mgr_idx_array[1] - ibegin) && i < (mgr_idx_array[2] - ibegin))
-    {
-      S_marker[i] = 1;
-    }
-    else
-    {
-      P_marker[i] = 1;
-    }
-  }
-
-  // Get A_up
-  hypre_MGRGetSubBlock(A, U_marker, P_marker, 0, &A_up);
-  // GetA_uu
-  hypre_MGRGetSubBlock(A, U_marker, U_marker, 0, &A_uu);
-  // Get A_su
-  hypre_MGRGetSubBlock(A, S_marker, U_marker, 0, &A_su);
-  // Get A_pu
-  hypre_MGRGetSubBlock(A, P_marker, U_marker, 0, &A_pu);
-
-  e1_vector = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A_up),
-                  hypre_ParCSRMatrixGlobalNumCols(A_up),
-                  hypre_ParCSRMatrixColStarts(A_up));
-  hypre_ParVectorInitialize(e1_vector);
-  hypre_ParVectorSetConstantValues(e1_vector, 1.0);
-
-  e2_vector = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A_uu),
-                  hypre_ParCSRMatrixGlobalNumRows(A_uu),
-                  hypre_ParCSRMatrixRowStarts(A_uu));
-  hypre_ParVectorInitialize(e2_vector);
-  hypre_ParVectorSetConstantValues(e2_vector, 0.0);
-
-  e3_vector = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A_uu),
-                  hypre_ParCSRMatrixGlobalNumRows(A_uu),
-                  hypre_ParCSRMatrixRowStarts(A_uu));
-  hypre_ParVectorInitialize(e3_vector);
-  hypre_ParVectorSetConstantValues(e3_vector, 0.0);
-
-  e4_vector = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A_su),
-                  hypre_ParCSRMatrixGlobalNumRows(A_su),
-                  hypre_ParCSRMatrixRowStarts(A_su));
-  hypre_ParVectorInitialize(e4_vector);
-  hypre_ParVectorSetConstantValues(e4_vector, 0.0);
-
-  e5_vector = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A_pu),
-                  hypre_ParCSRMatrixGlobalNumRows(A_pu),
-                  hypre_ParCSRMatrixRowStarts(A_pu));
-  hypre_ParVectorInitialize(e5_vector);
-  hypre_ParVectorSetConstantValues(e5_vector, 0.0);
-
-  // compute e2 = A_up * e1
-  hypre_ParCSRMatrixMatvecOutOfPlace(1.0, A_up, e1_vector, 0.0, e2_vector, e2_vector);
-
-  // solve e3 = A_uu^-1 * e2
-  hypre_BoomerAMGSolve(A_ff_solver, A_uu, e2_vector, e3_vector);
-
-  // compute e4 = A_su * e3
-  hypre_ParCSRMatrixMatvecOutOfPlace(1.0, A_su, e3_vector, 0.0, e4_vector, e4_vector);
-
-  // compute e4 = A_su * e3
-  hypre_ParCSRMatrixMatvecOutOfPlace(1.0, A_su, e3_vector, 0.0, e4_vector, e4_vector);
-
-  // print e4
-  hypre_ParVectorPrintIJ(e4_vector,1,"Dsp");
-
-  // compute e5 = A_pu * e3
-  hypre_ParCSRMatrixMatvecOutOfPlace(1.0, A_pu, e3_vector, 0.0, e5_vector, e5_vector);
-
-  hypre_ParVectorPrintIJ(e5_vector,1,"Dpp");
-
-  hypre_ParVectorDestroy(e1_vector);
-  hypre_ParVectorDestroy(e2_vector);
-  hypre_ParVectorDestroy(e3_vector);
-  hypre_ParCSRMatrixDestroy(A_uu);
-  hypre_ParCSRMatrixDestroy(A_up);
-  hypre_ParCSRMatrixDestroy(A_pu);
-  hypre_ParCSRMatrixDestroy(A_su);
-  hypre_TFree(U_marker, HYPRE_MEMORY_HOST);
-  hypre_TFree(S_marker, HYPRE_MEMORY_HOST);
-  hypre_TFree(P_marker, HYPRE_MEMORY_HOST);
-
-  return hypre_error_flag;
-}
-
-
-HYPRE_Int
-hypre_MGRApproximateInverse(hypre_ParCSRMatrix      *A,
-                            hypre_ParCSRMatrix     **A_inv)
-{
-  HYPRE_Int print_level, mr_max_row_nnz, mr_max_iter, nsh_max_row_nnz, nsh_max_iter, mr_col_version;
-  HYPRE_Real mr_tol, nsh_tol;
-  HYPRE_Real *droptol = hypre_CTAlloc(HYPRE_Real, 2, HYPRE_MEMORY_HOST);
-  hypre_ParCSRMatrix *approx_A_inv = NULL;
-
-  print_level = 0;
-  nsh_max_iter = 2;
-  nsh_max_row_nnz = 2; // default 1000
-  mr_max_iter = 1;
-  mr_tol = 1.0e-3;
-  mr_max_row_nnz = 2; // default 800
-  mr_col_version = 0;
-  nsh_tol = 1.0e-3;
-  droptol[0] = 1.0e-2;
-  droptol[1] = 1.0e-2;
-
-  hypre_ILUParCSRInverseNSH(A, &approx_A_inv, droptol, mr_tol, nsh_tol, DIVIDE_TOL, mr_max_row_nnz,
-                              nsh_max_row_nnz, mr_max_iter, nsh_max_iter, mr_col_version, print_level);
-  *A_inv = approx_A_inv;
-
-  if (droptol) hypre_TFree(droptol, HYPRE_MEMORY_HOST);
-
-  return hypre_error_flag;
-}
-
-HYPRE_Int
-hypre_MGRBuildInterpApproximateInverseExp(hypre_ParCSRMatrix  *A,
-                                          hypre_ParCSRMatrix  *S,
-                                          HYPRE_Int           *CF_marker,
-                                          HYPRE_BigInt        *num_cpts_global,
-                                          HYPRE_Int            debug_flag,
-                                          hypre_ParCSRMatrix **P_ptr)
-{
-  HYPRE_Int            *C_marker;
-  HYPRE_Int            *F_marker;
-  hypre_ParCSRMatrix   *A_fc;
-  hypre_ParCSRMatrix   *minus_Wp;
-
-  MPI_Comm        comm = hypre_ParCSRMatrixComm(A);
-
-  hypre_ParCSRMatrix    *P;
-  HYPRE_BigInt         *col_map_offd_P;
-
-  hypre_CSRMatrix    *P_diag;
-  hypre_CSRMatrix    *P_offd;
-
-  HYPRE_Real      *P_diag_data;
-  HYPRE_Int             *P_diag_i;
-  HYPRE_Int             *P_diag_j;
-  HYPRE_Real      *P_offd_data;
-  HYPRE_Int             *P_offd_i;
-  HYPRE_Int             *P_offd_j;
-
-  HYPRE_Int              P_diag_size, P_offd_size;
-
-  HYPRE_Int              jj_counter,jj_counter_offd;
-
-  HYPRE_Int              start_indexing = 0; /* start indexing for P_data at 0 */
-
-  HYPRE_Int              n_fine = hypre_CSRMatrixNumRows(hypre_ParCSRMatrixDiag(A));
-
-  HYPRE_Int             *fine_to_coarse = NULL;
-  HYPRE_Int              coarse_counter;
-  HYPRE_BigInt              total_global_cpts;
-  HYPRE_Int              num_cols_P_offd;
-//  HYPRE_BigInt              my_first_cpt;
-
-  HYPRE_Int              i, jj;
-
-  HYPRE_Real       one  = 1.0;
-
-  HYPRE_Int              my_id;
-  HYPRE_Int              num_procs;
-//  HYPRE_Int              num_threads;
-
-//  HYPRE_Real       wall_time;  /* for debugging instrumentation  */
-
-  C_marker = hypre_CTAlloc(HYPRE_Int, n_fine, HYPRE_MEMORY_HOST);
-  F_marker = hypre_CTAlloc(HYPRE_Int, n_fine, HYPRE_MEMORY_HOST);
-
-  // create C and F markers
-  for (i = 0; i < n_fine; i++)
-  {
-    C_marker[i] = (CF_marker[i] == 1)? 1: -1;
-    F_marker[i] = (CF_marker[i] == 1) ? -1: 1;
-  }
-
-  // Get A_FC
-  hypre_MGRGetSubBlock(A, F_marker, C_marker, 0, &A_fc);
-
-  // compute -Wp
-  minus_Wp = hypre_ParMatmul(S, A_fc);
-
-  hypre_CSRMatrix *minus_Wp_diag = hypre_ParCSRMatrixDiag(minus_Wp);
-  HYPRE_Real      *minus_Wp_diag_data = hypre_CSRMatrixData(minus_Wp_diag);
-  HYPRE_Int       *minus_Wp_diag_i = hypre_CSRMatrixI(minus_Wp_diag);
-  HYPRE_Int       *minus_Wp_diag_j = hypre_CSRMatrixJ(minus_Wp_diag);
-
-  hypre_CSRMatrix *minus_Wp_offd         = hypre_ParCSRMatrixOffd(minus_Wp);
-  HYPRE_Real      *minus_Wp_offd_data    = hypre_CSRMatrixData(minus_Wp_offd);
-  HYPRE_Int             *minus_Wp_offd_i = hypre_CSRMatrixI(minus_Wp_offd);
-  HYPRE_Int             *minus_Wp_offd_j = hypre_CSRMatrixJ(minus_Wp_offd);
-
-  hypre_MPI_Comm_size(comm, &num_procs);
-  hypre_MPI_Comm_rank(comm,&my_id);
-//  num_threads = hypre_NumThreads();
-
-//  my_first_cpt = num_cpts_global[0];
-  if (my_id == (num_procs -1)) total_global_cpts = num_cpts_global[1];
-  hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
-
-  /*-----------------------------------------------------------------------
-   *  First Pass: Determine size of P and fill in fine_to_coarse mapping.
-   *-----------------------------------------------------------------------*/
-
-  /*-----------------------------------------------------------------------
-   *  Intialize counters and allocate mapping vector.
-   *-----------------------------------------------------------------------*/
-
-  fine_to_coarse = hypre_CTAlloc(HYPRE_Int,  n_fine, HYPRE_MEMORY_HOST);
-#if 0
-#ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
-#endif
-#endif
-  for (i = 0; i < n_fine; i++) fine_to_coarse[i] = -1;
-
-  jj_counter = start_indexing;
-  jj_counter_offd = start_indexing;
-
-  /*-----------------------------------------------------------------------
-   *  Loop over fine grid.
-   *-----------------------------------------------------------------------*/
-
-  HYPRE_Int row_counter = 0;
-  coarse_counter = 0;
-  for (i = 0; i < n_fine; i++)
-  {
-    /*--------------------------------------------------------------------
-     *  If i is a C-point, interpolation is the identity. Also set up
-     *  mapping vector.
-     *--------------------------------------------------------------------*/
-
-    if (CF_marker[i] > 0)
-    {
-      jj_counter++;
-      fine_to_coarse[i] = coarse_counter;
-      coarse_counter++;
-    }
-    else
-    {
-      /*--------------------------------------------------------------------
-       *  If i is an F-point, interpolation is the approximation of A_{ff}^{-1}A_{fc}
-       *--------------------------------------------------------------------*/
-      for (jj = minus_Wp_diag_i[row_counter]; jj < minus_Wp_diag_i[row_counter+1]; jj++)
+   }
+   else
+   {
+      /* First coarsen to get initial CF splitting.
+       * This is then followed by updating the CF marker to pass
+       * coarse information to the next levels. NOTE: It may be
+       * convenient to implement this way (allows the use of multiple
+       * coarsening strategies without changing too much code),
+       * but not necessarily the best option, compared to initializing
+       * CF_marker first and then coarsening on subgraph which excludes
+       * the initialized coarse nodes.
+      */
+      hypre_BoomerAMGCoarsen(S, A, 0, debug_flag, CF_marker_ptr);
+      CF_marker = hypre_IntArrayData(*CF_marker_ptr);
+
+      /* Update CF_marker to correct Cpoints marked as Fpoints. */
+      nc = fixed_coarse_size;
+      for (i = 0; i < nc; i++)
       {
-        jj_counter++;
+         CF_marker[cindexes[i]] = CMRK;
       }
-
-      if (num_procs > 1)
+      /* set F-points to FMRK. This is necessary since the different coarsening schemes differentiate
+       * between type of F-points (example Ruge coarsening). We do not need that distinction here.
+      */
+      for (row = 0; row < nloc; row++)
       {
-        for (jj = minus_Wp_offd_i[row_counter]; jj < minus_Wp_offd_i[row_counter+1]; jj++)
-        {
-          jj_counter_offd++;
-        }
+         if (CF_marker[row] == CMRK) { continue; }
+         CF_marker[row] = FMRK;
       }
-      row_counter++;
-    }
-  }
-
-  /*-----------------------------------------------------------------------
-   *  Allocate  arrays.
-   *-----------------------------------------------------------------------*/
-
-  P_diag_size = jj_counter;
-
-  P_diag_i    = hypre_CTAlloc(HYPRE_Int,  n_fine+1, HYPRE_MEMORY_DEVICE);
-  P_diag_j    = hypre_CTAlloc(HYPRE_Int,  P_diag_size, HYPRE_MEMORY_DEVICE);
-  P_diag_data = hypre_CTAlloc(HYPRE_Real,  P_diag_size, HYPRE_MEMORY_DEVICE);
-
-  P_diag_i[n_fine] = jj_counter;
-
-
-  P_offd_size = jj_counter_offd;
-
-  P_offd_i    = hypre_CTAlloc(HYPRE_Int,  n_fine+1, HYPRE_MEMORY_DEVICE);
-  P_offd_j    = hypre_CTAlloc(HYPRE_Int,  P_offd_size, HYPRE_MEMORY_DEVICE);
-  P_offd_data = hypre_CTAlloc(HYPRE_Real,  P_offd_size, HYPRE_MEMORY_DEVICE);
-
-  /*-----------------------------------------------------------------------
-   *  Intialize some stuff.
-   *-----------------------------------------------------------------------*/
-
-  jj_counter = start_indexing;
-  jj_counter_offd = start_indexing;
-
-  /*-----------------------------------------------------------------------
-   *  Send and receive fine_to_coarse info.
-   *-----------------------------------------------------------------------*/
-
-  row_counter = 0;
-  for (i = 0; i < n_fine; i++)
-  {
-    /*--------------------------------------------------------------------
-     *  If i is a c-point, interpolation is the identity.
-     *--------------------------------------------------------------------*/
-    if (CF_marker[i] >= 0)
-    {
-      P_diag_i[i] = jj_counter;
-      P_diag_j[jj_counter]    = fine_to_coarse[i];
-      P_diag_data[jj_counter] = one;
-      jj_counter++;
-    }
-    /*--------------------------------------------------------------------
-     *  If i is an F-point, build interpolation.
-     *--------------------------------------------------------------------*/
-    else
-    {
-      /* Diagonal part of P */
-      P_diag_i[i] = jj_counter;
-      for (jj = minus_Wp_diag_i[row_counter]; jj < minus_Wp_diag_i[row_counter+1]; jj++)
+#if 0
+      /* IMPORTANT: Update coarse_indexes array to define the positions of the fixed coarse points
+       * in the next level.
+       */
+      nc = 0;
+      index_i = 0;
+      for (row = 0; row < nloc; row++)
       {
-        P_diag_j[jj_counter]    = minus_Wp_diag_j[jj];
-        P_diag_data[jj_counter] = - minus_Wp_diag_data[jj];
-        jj_counter++;
+         /* loop through new c-points */
+         if (CF_marker[row] == CMRK) { nc++; }
+         else if (CF_marker[row] == S_CMRK)
+         {
+            /* previously marked c-point is part of fixed coarse set. Track its current local index */
+            cindexes[index_i++] = nc;
+            /* reset c-point from S_CMRK to CMRK */
+            cf_marker[row] = CMRK;
+            nc++;
+         }
+         /* set F-points to FMRK. This is necessary since the different coarsening schemes differentiate
+          * between type of F-points (example Ruge coarsening). We do not need that distinction here.
+          */
+         else
+         {
+            CF_marker[row] = FMRK;
+         }
       }
-
-      /* Off-Diagonal part of P */
-      P_offd_i[i] = jj_counter_offd;
-
-      if (num_procs > 1)
+      /* check if this should be last level */
+      if ( nc == fixed_coarse_size)
       {
-        for (jj = minus_Wp_offd_i[row_counter]; jj < minus_Wp_offd_i[row_counter+1]; jj++)
-        {
-          P_offd_j[jj_counter_offd]  = minus_Wp_offd_j[jj];
-          P_offd_data[jj_counter_offd] = - minus_Wp_offd_data[jj];
-          jj_counter_offd++;
-        }
+         last_level = 1;
       }
-      row_counter++;
-    }
-    P_offd_i[i+1] = jj_counter_offd;
-  }
-
-  P = hypre_ParCSRMatrixCreate(comm,
-                 hypre_ParCSRMatrixGlobalNumRows(A),
-                 total_global_cpts,
-                 hypre_ParCSRMatrixColStarts(A),
-                 num_cpts_global,
-                 0,
-                 P_diag_i[n_fine],
-                 P_offd_i[n_fine]);
-
-  P_diag = hypre_ParCSRMatrixDiag(P);
-  hypre_CSRMatrixData(P_diag) = P_diag_data;
-  hypre_CSRMatrixI(P_diag) = P_diag_i;
-  hypre_CSRMatrixJ(P_diag) = P_diag_j;
-  P_offd = hypre_ParCSRMatrixOffd(P);
-  hypre_CSRMatrixData(P_offd) = P_offd_data;
-  hypre_CSRMatrixI(P_offd) = P_offd_i;
-  hypre_CSRMatrixJ(P_offd) = P_offd_j;
-
-  num_cols_P_offd = hypre_CSRMatrixNumCols(minus_Wp_offd);
-  HYPRE_BigInt *col_map_offd_tmp = hypre_ParCSRMatrixColMapOffd(minus_Wp);
-  if (P_offd_size)
-  {
-    col_map_offd_P = hypre_CTAlloc(HYPRE_BigInt, num_cols_P_offd, HYPRE_MEMORY_HOST);
-    for (i=0; i < num_cols_P_offd; i++)
-    {
-      col_map_offd_P[i] = col_map_offd_tmp[i];
-    }
-  }
-
-  if (num_cols_P_offd)
-  {
-    hypre_ParCSRMatrixColMapOffd(P) = col_map_offd_P;
-    hypre_CSRMatrixNumCols(P_offd) = num_cols_P_offd;
-  }
-  hypre_MatvecCommPkgCreate(P);
-
-  *P_ptr = P;
-
-  hypre_TFree(fine_to_coarse, HYPRE_MEMORY_HOST);
-  hypre_TFree(C_marker, HYPRE_MEMORY_HOST);
-  hypre_TFree(F_marker, HYPRE_MEMORY_HOST);
-  hypre_ParCSRMatrixDestroy(A_fc);
-  hypre_ParCSRMatrixDestroy(minus_Wp);
+      //printf(" nc = %d and fixed coarse size = %d \n", nc, fixed_coarse_size);
+#endif
+   }
 
-  return 0;
+   return hypre_error_flag;
 }
 
+/* Scale ParCSR matrix A = scalar * A
+ * A: the target CSR matrix
+ * vector: array of real numbers
+ */
 HYPRE_Int
-hypre_MGRBuildInterpApproximateInverse(hypre_ParCSRMatrix   *A,
-                                       HYPRE_Int            *CF_marker,
-                                       HYPRE_BigInt            *num_cpts_global,
-                                       HYPRE_Int            debug_flag,
-                                       hypre_ParCSRMatrix   **P_ptr)
+hypre_ParCSRMatrixLeftScale(HYPRE_Real *vector,
+                            hypre_ParCSRMatrix *A)
 {
-  HYPRE_Int            *C_marker;
-  HYPRE_Int            *F_marker;
-  hypre_ParCSRMatrix   *A_ff;
-  hypre_ParCSRMatrix   *A_fc;
-  hypre_ParCSRMatrix   *A_ff_inv;
-  hypre_ParCSRMatrix   *minus_Wp;
-
-  MPI_Comm        comm = hypre_ParCSRMatrixComm(A);
-
-  hypre_ParCSRMatrix    *P;
-  HYPRE_BigInt         *col_map_offd_P;
-
-  hypre_CSRMatrix    *P_diag;
-  hypre_CSRMatrix    *P_offd;
-
-  HYPRE_Real      *P_diag_data;
-  HYPRE_Int             *P_diag_i;
-  HYPRE_Int             *P_diag_j;
-  HYPRE_Real      *P_offd_data;
-  HYPRE_Int             *P_offd_i;
-  HYPRE_Int             *P_offd_j;
-
-  HYPRE_Int              P_diag_size, P_offd_size;
+   HYPRE_Int i, j, n_local;
+   hypre_CSRMatrix *A_diag = hypre_ParCSRMatrixDiag(A);
+   HYPRE_Real      *A_diag_data = hypre_CSRMatrixData(A_diag);
+   HYPRE_Int             *A_diag_i = hypre_CSRMatrixI(A_diag);
 
-  HYPRE_Int              jj_counter,jj_counter_offd;
-  //HYPRE_Int              jj_begin_row,jj_begin_row_offd;
-  //HYPRE_Int              jj_end_row,jj_end_row_offd;
+   hypre_CSRMatrix *A_offd         = hypre_ParCSRMatrixOffd(A);
+   HYPRE_Real      *A_offd_data    = hypre_CSRMatrixData(A_offd);
+   HYPRE_Int             *A_offd_i = hypre_CSRMatrixI(A_offd);
 
-  HYPRE_Int              start_indexing = 0; /* start indexing for P_data at 0 */
+   n_local = hypre_CSRMatrixNumRows(A_diag);
 
-  HYPRE_Int              n_fine = hypre_CSRMatrixNumRows(hypre_ParCSRMatrixDiag(A));
+   for (i = 0; i < n_local; i++)
+   {
+      HYPRE_Real factor = vector[i];
+      for (j = A_diag_i[i]; j < A_diag_i[i + 1]; j++)
+      {
+         A_diag_data[j] *= factor;
+      }
+      for (j = A_offd_i[i]; j < A_offd_i[i + 1]; j++)
+      {
+         A_offd_data[j] *= factor;
+      }
+   }
 
-  HYPRE_Int             *fine_to_coarse = NULL;
-  //HYPRE_Int             *coarse_counter;
-  HYPRE_Int              coarse_counter;
-  HYPRE_BigInt              total_global_cpts;
-  HYPRE_Int              num_cols_P_offd;
-//  HYPRE_BigInt              my_first_cpt;
+   return hypre_error_flag;
+}
 
-  HYPRE_Int              i,jj;
+HYPRE_Int
+hypre_MGRComputeAlgebraicFixedStress(hypre_ParCSRMatrix  *A,
+                                     HYPRE_BigInt        *mgr_idx_array,
+                                     HYPRE_Solver         A_ff_solver)
+{
+   HYPRE_Int *U_marker, *S_marker, *P_marker;
+   HYPRE_Int n_fine, i;
+   HYPRE_BigInt ibegin;
+   hypre_ParCSRMatrix *A_up;
+   hypre_ParCSRMatrix *A_uu;
+   hypre_ParCSRMatrix *A_su;
+   hypre_ParCSRMatrix *A_pu;
+   hypre_ParVector *e1_vector;
+   hypre_ParVector *e2_vector;
+   hypre_ParVector *e3_vector;
+   hypre_ParVector *e4_vector;
+   hypre_ParVector *e5_vector;
+
+   n_fine = hypre_CSRMatrixNumRows(hypre_ParCSRMatrixDiag(A));
+   ibegin = hypre_ParCSRMatrixFirstRowIndex(A);
+   hypre_assert(ibegin == mgr_idx_array[0]);
+   U_marker = hypre_CTAlloc(HYPRE_Int, n_fine, HYPRE_MEMORY_HOST);
+   S_marker = hypre_CTAlloc(HYPRE_Int, n_fine, HYPRE_MEMORY_HOST);
+   P_marker = hypre_CTAlloc(HYPRE_Int, n_fine, HYPRE_MEMORY_HOST);
 
-  HYPRE_Real       one  = 1.0;
+   for (i = 0; i < n_fine; i++)
+   {
+      U_marker[i] = -1;
+      S_marker[i] = -1;
+      P_marker[i] = -1;
+   }
 
-  HYPRE_Int              my_id;
-  HYPRE_Int              num_procs;
-//  HYPRE_Int              num_threads;
+   // create C and F markers
+   for (i = 0; i < n_fine; i++)
+   {
+      if (i < mgr_idx_array[1] - ibegin)
+      {
+         U_marker[i] = 1;
+      }
+      else if (i >= (mgr_idx_array[1] - ibegin) && i < (mgr_idx_array[2] - ibegin))
+      {
+         S_marker[i] = 1;
+      }
+      else
+      {
+         P_marker[i] = 1;
+      }
+   }
 
-//  HYPRE_Real       wall_time;  /* for debugging instrumentation  */
+   // Get A_up
+   hypre_MGRGetSubBlock(A, U_marker, P_marker, 0, &A_up);
+   // GetA_uu
+   hypre_MGRGetSubBlock(A, U_marker, U_marker, 0, &A_uu);
+   // Get A_su
+   hypre_MGRGetSubBlock(A, S_marker, U_marker, 0, &A_su);
+   // Get A_pu
+   hypre_MGRGetSubBlock(A, P_marker, U_marker, 0, &A_pu);
+
+   e1_vector = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A_up),
+                                     hypre_ParCSRMatrixGlobalNumCols(A_up),
+                                     hypre_ParCSRMatrixColStarts(A_up));
+   hypre_ParVectorInitialize(e1_vector);
+   hypre_ParVectorSetConstantValues(e1_vector, 1.0);
+
+   e2_vector = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A_uu),
+                                     hypre_ParCSRMatrixGlobalNumRows(A_uu),
+                                     hypre_ParCSRMatrixRowStarts(A_uu));
+   hypre_ParVectorInitialize(e2_vector);
+   hypre_ParVectorSetConstantValues(e2_vector, 0.0);
+
+   e3_vector = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A_uu),
+                                     hypre_ParCSRMatrixGlobalNumRows(A_uu),
+                                     hypre_ParCSRMatrixRowStarts(A_uu));
+   hypre_ParVectorInitialize(e3_vector);
+   hypre_ParVectorSetConstantValues(e3_vector, 0.0);
+
+   e4_vector = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A_su),
+                                     hypre_ParCSRMatrixGlobalNumRows(A_su),
+                                     hypre_ParCSRMatrixRowStarts(A_su));
+   hypre_ParVectorInitialize(e4_vector);
+   hypre_ParVectorSetConstantValues(e4_vector, 0.0);
+
+   e5_vector = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A_pu),
+                                     hypre_ParCSRMatrixGlobalNumRows(A_pu),
+                                     hypre_ParCSRMatrixRowStarts(A_pu));
+   hypre_ParVectorInitialize(e5_vector);
+   hypre_ParVectorSetConstantValues(e5_vector, 0.0);
+
+   // compute e2 = A_up * e1
+   hypre_ParCSRMatrixMatvecOutOfPlace(1.0, A_up, e1_vector, 0.0, e2_vector, e2_vector);
+
+   // solve e3 = A_uu^-1 * e2
+   hypre_BoomerAMGSolve(A_ff_solver, A_uu, e2_vector, e3_vector);
+
+   // compute e4 = A_su * e3
+   hypre_ParCSRMatrixMatvecOutOfPlace(1.0, A_su, e3_vector, 0.0, e4_vector, e4_vector);
+
+   // compute e4 = A_su * e3
+   hypre_ParCSRMatrixMatvecOutOfPlace(1.0, A_su, e3_vector, 0.0, e4_vector, e4_vector);
+
+   // print e4
+   hypre_ParVectorPrintIJ(e4_vector, 1, "Dsp");
+
+   // compute e5 = A_pu * e3
+   hypre_ParCSRMatrixMatvecOutOfPlace(1.0, A_pu, e3_vector, 0.0, e5_vector, e5_vector);
+
+   hypre_ParVectorPrintIJ(e5_vector, 1, "Dpp");
+
+   hypre_ParVectorDestroy(e1_vector);
+   hypre_ParVectorDestroy(e2_vector);
+   hypre_ParVectorDestroy(e3_vector);
+   hypre_ParCSRMatrixDestroy(A_uu);
+   hypre_ParCSRMatrixDestroy(A_up);
+   hypre_ParCSRMatrixDestroy(A_pu);
+   hypre_ParCSRMatrixDestroy(A_su);
+   hypre_TFree(U_marker, HYPRE_MEMORY_HOST);
+   hypre_TFree(S_marker, HYPRE_MEMORY_HOST);
+   hypre_TFree(P_marker, HYPRE_MEMORY_HOST);
 
-  C_marker = hypre_CTAlloc(HYPRE_Int, n_fine, HYPRE_MEMORY_HOST);
-  F_marker = hypre_CTAlloc(HYPRE_Int, n_fine, HYPRE_MEMORY_HOST);
+   return hypre_error_flag;
+}
 
-  // create C and F markers
-  for (i = 0; i < n_fine; i++)
-  {
-    C_marker[i] = (CF_marker[i] == 1)? 1: -1;
-    F_marker[i] = (CF_marker[i] == 1) ? -1: 1;
-  }
 
-  // Get A_FF
-  hypre_MGRGetSubBlock(A, F_marker, F_marker, 0, &A_ff);
-//  hypre_ParCSRMatrixPrintIJ(A_ff, 1, 1, "A_ff");
-  // Get A_FC
-  hypre_MGRGetSubBlock(A, F_marker, C_marker, 0, &A_fc);
+HYPRE_Int
+hypre_MGRApproximateInverse(hypre_ParCSRMatrix      *A,
+                            hypre_ParCSRMatrix     **A_inv)
+{
+   HYPRE_Int print_level, mr_max_row_nnz, mr_max_iter, nsh_max_row_nnz, nsh_max_iter, mr_col_version;
+   HYPRE_Real mr_tol, nsh_tol;
+   HYPRE_Real *droptol = hypre_CTAlloc(HYPRE_Real, 2, HYPRE_MEMORY_HOST);
+   hypre_ParCSRMatrix *approx_A_inv = NULL;
+
+   print_level = 0;
+   nsh_max_iter = 2;
+   nsh_max_row_nnz = 2; // default 1000
+   mr_max_iter = 1;
+   mr_tol = 1.0e-3;
+   mr_max_row_nnz = 2; // default 800
+   mr_col_version = 0;
+   nsh_tol = 1.0e-3;
+   droptol[0] = 1.0e-2;
+   droptol[1] = 1.0e-2;
+
+   hypre_ILUParCSRInverseNSH(A, &approx_A_inv, droptol, mr_tol, nsh_tol, HYPRE_REAL_MIN,
+                             mr_max_row_nnz,
+                             nsh_max_row_nnz, mr_max_iter, nsh_max_iter, mr_col_version, print_level);
+   *A_inv = approx_A_inv;
+
+   if (droptol) { hypre_TFree(droptol, HYPRE_MEMORY_HOST); }
 
-  hypre_MGRApproximateInverse(A_ff, &A_ff_inv);
-//  hypre_ParCSRMatrixPrintIJ(A_ff_inv, 1, 1, "A_ff_inv");
-//  hypre_ParCSRMatrixPrintIJ(A_fc, 1, 1, "A_fc");
-  minus_Wp = hypre_ParMatmul(A_ff_inv, A_fc);
-//  hypre_ParCSRMatrixPrintIJ(minus_Wp, 1, 1, "Wp");
+   return hypre_error_flag;
+}
 
-  hypre_CSRMatrix *minus_Wp_diag = hypre_ParCSRMatrixDiag(minus_Wp);
-  HYPRE_Real      *minus_Wp_diag_data = hypre_CSRMatrixData(minus_Wp_diag);
-  HYPRE_Int       *minus_Wp_diag_i = hypre_CSRMatrixI(minus_Wp_diag);
-  HYPRE_Int       *minus_Wp_diag_j = hypre_CSRMatrixJ(minus_Wp_diag);
+/*--------------------------------------------------------------------------
+ * hypre_blas_smat_inv_n2
+ *
+ * TODO (VPM): move this function to seq_ls
+ *--------------------------------------------------------------------------*/
 
-  hypre_CSRMatrix *minus_Wp_offd         = hypre_ParCSRMatrixOffd(minus_Wp);
-  HYPRE_Real      *minus_Wp_offd_data    = hypre_CSRMatrixData(minus_Wp_offd);
-  HYPRE_Int             *minus_Wp_offd_i = hypre_CSRMatrixI(minus_Wp_offd);
-  HYPRE_Int             *minus_Wp_offd_j = hypre_CSRMatrixJ(minus_Wp_offd);
+void hypre_blas_smat_inv_n2 (HYPRE_Real *a)
+{
+   const HYPRE_Real a11 = a[0], a12 = a[1];
+   const HYPRE_Real a21 = a[2], a22 = a[3];
+   const HYPRE_Real det_inv = 1.0 / (a11 * a22 - a12 * a21);
+
+   a[0] =  a22 * det_inv;
+   a[1] = -a12 * det_inv;
+   a[2] = -a21 * det_inv;
+   a[3] =  a11 * det_inv;
+}
 
-  //hypre_CSRMatrix *minus_Wp_offd = hypre_ParCSRMatrixOffd(minus_Wp);
-  //HYPRE_Int             num_cols_minus_Wp_offd  = hypre_CSRMatrixNumCols(minus_Wp_offd);
+/*--------------------------------------------------------------------------
+ * hypre_blas_smat_inv_n3
+ *
+ * TODO (VPM): move this function to seq_ls
+ *--------------------------------------------------------------------------*/
 
-  hypre_MPI_Comm_size(comm, &num_procs);
-  hypre_MPI_Comm_rank(comm,&my_id);
-//  num_threads = hypre_NumThreads();
+void hypre_blas_smat_inv_n3 (HYPRE_Real *a)
+{
+   const HYPRE_Real a11 = a[0],  a12 = a[1],  a13 = a[2];
+   const HYPRE_Real a21 = a[3],  a22 = a[4],  a23 = a[5];
+   const HYPRE_Real a31 = a[6],  a32 = a[7],  a33 = a[8];
+
+   const HYPRE_Real det = a11 * a22 * a33 - a11 * a23 * a32 -
+                          a12 * a21 * a33 + a12 * a23 * a31 +
+                          a13 * a21 * a32 - a13 * a22 * a31;
+   const HYPRE_Real det_inv = 1.0 / det;
+
+   a[0] = (a22 * a33 - a23 * a32) * det_inv;
+   a[1] = (a13 * a32 - a12 * a33) * det_inv;
+   a[2] = (a12 * a23 - a13 * a22) * det_inv;
+   a[3] = (a23 * a31 - a21 * a33) * det_inv;
+   a[4] = (a11 * a33 - a13 * a31) * det_inv;
+   a[5] = (a13 * a21 - a11 * a23) * det_inv;
+   a[6] = (a21 * a32 - a22 * a31) * det_inv;
+   a[7] = (a12 * a31 - a11 * a32) * det_inv;
+   a[8] = (a11 * a22 - a12 * a21) * det_inv;
+}
 
-//  my_first_cpt = num_cpts_global[0];
-  if (my_id == (num_procs -1)) total_global_cpts = num_cpts_global[1];
-  hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
+/*--------------------------------------------------------------------------
+ * hypre_blas_smat_inv_n4
+ *
+ * TODO (VPM): move this function to seq_ls
+ *--------------------------------------------------------------------------*/
 
-  /*-----------------------------------------------------------------------
-   *  First Pass: Determine size of P and fill in fine_to_coarse mapping.
-   *-----------------------------------------------------------------------*/
+void hypre_blas_smat_inv_n4 (HYPRE_Real *a)
+{
+   const HYPRE_Real a11 = a[0],  a12 = a[1],  a13 = a[2],  a14 = a[3];
+   const HYPRE_Real a21 = a[4],  a22 = a[5],  a23 = a[6],  a24 = a[7];
+   const HYPRE_Real a31 = a[8],  a32 = a[9],  a33 = a[10], a34 = a[11];
+   const HYPRE_Real a41 = a[12], a42 = a[13], a43 = a[14], a44 = a[15];
+
+   const HYPRE_Real M11 = a22 * a33 * a44 + a23 * a34 * a42 +
+                          a24 * a32 * a43 - a22 * a34 * a43 -
+                          a23 * a32 * a44 - a24 * a33 * a42;
+
+   const HYPRE_Real M12 = a12 * a34 * a43 + a13 * a32 * a44 +
+                          a14 * a33 * a42 - a12 * a33 * a44 -
+                          a13 * a34 * a42 - a14 * a32 * a43;
+
+   const HYPRE_Real M13 = a12 * a23 * a44 + a13 * a24 * a42 +
+                          a14 * a22 * a43 - a12 * a24 * a43 -
+                          a13 * a22 * a44 - a14 * a23 * a42;
+
+   const HYPRE_Real M14 = a12 * a24 * a33 + a13 * a22 * a34 +
+                          a14 * a23 * a32 - a12 * a23 * a34 -
+                          a13 * a24 * a32 - a14 * a22 * a33;
+
+   const HYPRE_Real M21 = a21 * a34 * a43 + a23 * a31 * a44 +
+                          a24 * a33 * a41 - a21 * a33 * a44 -
+                          a23 * a34 * a41 - a24 * a31 * a43;
+
+   const HYPRE_Real M22 = a11 * a33 * a44 + a13 * a34 * a41 +
+                          a14 * a31 * a43 - a11 * a34 * a43 -
+                          a13 * a31 * a44 - a14 * a33 * a41;
+
+   const HYPRE_Real M23 = a11 * a24 * a43 + a13 * a21 * a44 +
+                          a14 * a23 * a41 - a11 * a23 * a44 -
+                          a13 * a24 * a41 - a14 * a21 * a43;
+
+   const HYPRE_Real M24 = a11 * a23 * a34 + a13 * a24 * a31 +
+                          a14 * a21 * a33 - a11 * a24 * a33 -
+                          a13 * a21 * a34 - a14 * a23 * a31;
+
+   const HYPRE_Real M31 = a21 * a32 * a44 + a22 * a34 * a41 +
+                          a24 * a31 * a42 - a21 * a34 * a42 -
+                          a22 * a31 * a44 - a24 * a32 * a41;
+
+   const HYPRE_Real M32 = a11 * a34 * a42 + a12 * a31 * a44 +
+                          a14 * a32 * a41 - a11 * a32 * a44 -
+                          a12 * a34 * a41 - a14 * a31 * a42;
+
+   const HYPRE_Real M33 = a11 * a22 * a44 + a12 * a24 * a41 +
+                          a14 * a21 * a42 - a11 * a24 * a42 -
+                          a12 * a21 * a44 - a14 * a22 * a41;
+
+   const HYPRE_Real M34 = a11 * a24 * a32 + a12 * a21 * a34 +
+                          a14 * a22 * a31 - a11 * a22 * a34 -
+                          a12 * a24 * a31 - a14 * a21 * a32;
+
+   const HYPRE_Real M41 = a21 * a33 * a42 + a22 * a31 * a43 +
+                          a23 * a32 * a41 - a21 * a32 * a43 -
+                          a22 * a33 * a41 - a23 * a31 * a42;
+
+   const HYPRE_Real M42 = a11 * a32 * a43 + a12 * a33 * a41 +
+                          a13 * a31 * a42 - a11 * a33 * a42 -
+                          a12 * a31 * a43 - a13 * a32 * a41;
+
+   const HYPRE_Real M43 = a11 * a23 * a42 + a12 * a21 * a43 +
+                          a13 * a22 * a41 - a11 * a22 * a43 -
+                          a12 * a23 * a41 - a13 * a21 * a42;
+
+   const HYPRE_Real M44 = a11 * a22 * a33 + a12 * a23 * a31 +
+                          a13 * a21 * a32 - a11 * a23 * a32 -
+                          a12 * a21 * a33 - a13 * a22 * a31;
+
+   const HYPRE_Real det = a11 * M11 + a12 * M21 + a13 * M31 + a14 * M41;
+   HYPRE_Real       det_inv = 1.0 / det;
+
+   //if ( hypre_abs(det) < 1e-22 ) {
+   //hypre_printf("### WARNING: Matrix is nearly singular! det = %e\n", det);
+   /*
+   printf("##----------------------------------------------\n");
+   printf("## %12.5e %12.5e %12.5e \n", a0, a1, a2);
+   printf("## %12.5e %12.5e %12.5e \n", a3, a4, a5);
+   printf("## %12.5e %12.5e %12.5e \n", a5, a6, a7);
+   printf("##----------------------------------------------\n");
+   getchar();
+   */
+   //}
 
-  /*-----------------------------------------------------------------------
-   *  Intialize counters and allocate mapping vector.
-   *-----------------------------------------------------------------------*/
+   a[0]  = M11 * det_inv; a[1]  = M12 * det_inv; a[2]  = M13 * det_inv; a[3]  = M14 * det_inv;
+   a[4]  = M21 * det_inv; a[5]  = M22 * det_inv; a[6]  = M23 * det_inv; a[7]  = M24 * det_inv;
+   a[8]  = M31 * det_inv; a[9]  = M32 * det_inv; a[10] = M33 * det_inv; a[11] = M34 * det_inv;
+   a[12] = M41 * det_inv; a[13] = M42 * det_inv; a[14] = M43 * det_inv; a[15] = M44 * det_inv;
+}
 
-  //coarse_counter = hypre_CTAlloc(HYPRE_Int,  num_threads, HYPRE_MEMORY_HOST);
-  //jj_count = hypre_CTAlloc(HYPRE_Int,  num_threads, HYPRE_MEMORY_HOST);
-  //jj_count_offd = hypre_CTAlloc(HYPRE_Int,  num_threads, HYPRE_MEMORY_HOST);
+/*--------------------------------------------------------------------------
+ * hypre_MGRSmallBlkInverse
+ *
+ * TODO (VPM): move this function to seq_ls
+ *--------------------------------------------------------------------------*/
 
+void hypre_MGRSmallBlkInverse(HYPRE_Real *mat,
+                              HYPRE_Int   blk_size)
+{
+   if (blk_size == 2)
+   {
+      hypre_blas_smat_inv_n2(mat);
+   }
+   else if (blk_size == 3)
+   {
+      hypre_blas_smat_inv_n3(mat);
+   }
+   else if (blk_size == 4)
+   {
+      hypre_blas_smat_inv_n4(mat);
+   }
+}
 
-  fine_to_coarse = hypre_CTAlloc(HYPRE_Int,  n_fine, HYPRE_MEMORY_HOST);
-#if 0
-#ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
-#endif
-#endif
-  for (i = 0; i < n_fine; i++) fine_to_coarse[i] = -1;
-
-  jj_counter = start_indexing;
-  jj_counter_offd = start_indexing;
-
-  /*-----------------------------------------------------------------------
-   *  Loop over fine grid.
-   *-----------------------------------------------------------------------*/
-
-  HYPRE_Int row_counter = 0;
-  coarse_counter = 0;
-  for (i = 0; i < n_fine; i++)
-  {
-    /*--------------------------------------------------------------------
-     *  If i is a C-point, interpolation is the identity. Also set up
-     *  mapping vector.
-     *--------------------------------------------------------------------*/
-
-    if (CF_marker[i] > 0)
-    {
-      //jj_count[j]++;
-      //fine_to_coarse[i] = coarse_counter[j];
-      //coarse_counter[j]++;
-      jj_counter++;
-      fine_to_coarse[i] = coarse_counter;
-      coarse_counter++;
-    }
-    else
-    {
-      /*--------------------------------------------------------------------
-       *  If i is an F-point, interpolation is the approximation of A_{ff}^{-1}A_{fc}
-       *--------------------------------------------------------------------*/
-      for (jj = minus_Wp_diag_i[row_counter]; jj < minus_Wp_diag_i[row_counter+1]; jj++)
-      {
-        //jj_count[j]++;
-        jj_counter++;
-      }
+/*--------------------------------------------------------------------------
+ * hypre_MGRSmallBlkInverse
+ *
+ * TODO (VPM): move this function to seq_ls
+ *--------------------------------------------------------------------------*/
 
-      if (num_procs > 1)
+void hypre_blas_mat_inv(HYPRE_Real *a,
+                        HYPRE_Int n)
+{
+   HYPRE_Int i, j, k, l, u, kn, in;
+   HYPRE_Real alinv;
+   if (n == 4)
+   {
+      hypre_blas_smat_inv_n4(a);
+   }
+   else
+   {
+      for (k = 0; k < n; ++k)
       {
-        for (jj = minus_Wp_offd_i[row_counter]; jj < minus_Wp_offd_i[row_counter+1]; jj++)
-        {
-          //jj_count_offd[j]++;
-          jj_counter_offd++;
-        }
-      }
-      row_counter++;
-    }
-  }
-
-  /*-----------------------------------------------------------------------
-   *  Allocate  arrays.
-   *-----------------------------------------------------------------------*/
-  /*
-  for (i=0; i < num_threads-1; i++)
-  {
-    coarse_counter[i+1] += coarse_counter[i];
-    jj_count[i+1] += jj_count[i];
-    jj_count_offd[i+1] += jj_count_offd[i];
-  }
-  i = num_threads-1;
-  jj_counter = jj_count[i];
-  jj_counter_offd = jj_count_offd[i];
-  */
-
-  P_diag_size = jj_counter;
+         kn = k * n;
+         l  = kn + k;
+
+         //if (hypre_abs(a[l]) < HYPRE_REAL_MIN) {
+         //   printf("### WARNING: Diagonal entry is close to zero!");
+         //   printf("### WARNING: diag_%d=%e\n", k, a[l]);
+         //   a[l] = HYPRE_REAL_MIN;
+         //}
+         alinv = 1.0 / a[l];
+         a[l] = alinv;
+
+         for (j = 0; j < k; ++j)
+         {
+            u = kn + j; a[u] *= alinv;
+         }
 
-  P_diag_i    = hypre_CTAlloc(HYPRE_Int,  n_fine+1, HYPRE_MEMORY_DEVICE);
-  P_diag_j    = hypre_CTAlloc(HYPRE_Int,  P_diag_size, HYPRE_MEMORY_DEVICE);
-  P_diag_data = hypre_CTAlloc(HYPRE_Real,  P_diag_size, HYPRE_MEMORY_DEVICE);
+         for (j = k + 1; j < n; ++j)
+         {
+            u = kn + j; a[u] *= alinv;
+         }
 
-  P_diag_i[n_fine] = jj_counter;
+         for (i = 0; i < k; ++i)
+         {
+            in = i * n;
+            for (j = 0; j < n; ++j)
+               if (j != k)
+               {
+                  u = in + j; a[u] -= a[in + k] * a[kn + j];
+               } // end if (j!=k)
+         }
 
+         for (i = k + 1; i < n; ++i)
+         {
+            in = i * n;
+            for (j = 0; j < n; ++j)
+               if (j != k)
+               {
+                  u = in + j; a[u] -= a[in + k] * a[kn + j];
+               } // end if (j!=k)
+         }
 
-  P_offd_size = jj_counter_offd;
+         for (i = 0; i < k; ++i)
+         {
+            u = i * n + k; a[u] *= -alinv;
+         }
 
-  P_offd_i    = hypre_CTAlloc(HYPRE_Int,  n_fine+1, HYPRE_MEMORY_DEVICE);
-  P_offd_j    = hypre_CTAlloc(HYPRE_Int,  P_offd_size, HYPRE_MEMORY_DEVICE);
-  P_offd_data = hypre_CTAlloc(HYPRE_Real,  P_offd_size, HYPRE_MEMORY_DEVICE);
+         for (i = k + 1; i < n; ++i)
+         {
+            u = i * n + k; a[u] *= -alinv;
+         }
+      } // end for (k=0; k<n; ++k)
+   }// end if
+}
 
-  /*-----------------------------------------------------------------------
-   *  Intialize some stuff.
-   *-----------------------------------------------------------------------*/
+HYPRE_Int
+hypre_block_jacobi_solve( hypre_ParCSRMatrix *A,
+                          hypre_ParVector    *f,
+                          hypre_ParVector    *u,
+                          HYPRE_Int           blk_size,
+                          HYPRE_Int           method,
+                          HYPRE_Real         *diaginv,
+                          hypre_ParVector    *Vtemp )
+{
+   MPI_Comm      comm = hypre_ParCSRMatrixComm(A);
+   hypre_CSRMatrix *A_diag = hypre_ParCSRMatrixDiag(A);
+   HYPRE_Real      *A_diag_data  = hypre_CSRMatrixData(A_diag);
+   HYPRE_Int       *A_diag_i     = hypre_CSRMatrixI(A_diag);
+   HYPRE_Int       *A_diag_j     = hypre_CSRMatrixJ(A_diag);
+   hypre_CSRMatrix *A_offd = hypre_ParCSRMatrixOffd(A);
+   HYPRE_Int       *A_offd_i     = hypre_CSRMatrixI(A_offd);
+   HYPRE_Real      *A_offd_data  = hypre_CSRMatrixData(A_offd);
+   HYPRE_Int       *A_offd_j     = hypre_CSRMatrixJ(A_offd);
+   hypre_ParCSRCommPkg  *comm_pkg = hypre_ParCSRMatrixCommPkg(A);
+   hypre_ParCSRCommHandle *comm_handle = NULL;
+
+   HYPRE_Int        n       = hypre_CSRMatrixNumRows(A_diag);
+   HYPRE_Int        num_cols_offd = hypre_CSRMatrixNumCols(A_offd);
+
+   hypre_Vector    *u_local = hypre_ParVectorLocalVector(u);
+   HYPRE_Real      *u_data  = hypre_VectorData(u_local);
+
+   hypre_Vector    *f_local = hypre_ParVectorLocalVector(f);
+   HYPRE_Real      *f_data  = hypre_VectorData(f_local);
+
+   hypre_Vector    *Vtemp_local = hypre_ParVectorLocalVector(Vtemp);
+   HYPRE_Real      *Vtemp_data = hypre_VectorData(Vtemp_local);
+   HYPRE_Real      *Vext_data = NULL;
+   HYPRE_Real      *v_buf_data = NULL;
+
+   HYPRE_Int        i, j, k;
+   HYPRE_Int        ii, jj;
+   HYPRE_Int        bidx, bidx1;
+   HYPRE_Int        num_sends;
+   HYPRE_Int        index, start;
+   HYPRE_Int        num_procs, my_id;
+   HYPRE_Real      *res;
 
-  jj_counter = start_indexing;
-  jj_counter_offd = start_indexing;
+   const HYPRE_Int  nb2 = blk_size * blk_size;
+   const HYPRE_Int  n_block = n / blk_size;
 
-  /*
-  if (debug_flag==4)
-  {
-    wall_time = time_getWallclockSeconds() - wall_time;
-    hypre_printf("Proc = %d     Interp: Internal work 1 =     %f\n",
-           my_id, wall_time);
-    fflush(NULL);
-  }
-  */
-
-  /*-----------------------------------------------------------------------
-   *  Send and receive fine_to_coarse info.
-   *-----------------------------------------------------------------------*/
-
-  /*
-  if (num_procs > 1)
-  {
-    if (debug_flag==4) wall_time = time_getWallclockSeconds();
-
-    fine_to_coarse_offd = hypre_CTAlloc(HYPRE_Int, num_cols_minus_Wp_offd, HYPRE_MEMORY_HOST);
-
-    for (i = 0; i < n_fine; i++)
-    {
-      fine_to_coarse[i] += my_first_cpt;
-    }
-
-    comm_pkg = hypre_ParCSRMatrixCommPkg(minus_Wp);
-    if (!comm_pkg)
-    {
-      hypre_MatvecCommPkgCreate(minus_Wp);
-      comm_pkg = hypre_ParCSRMatrixCommPkg(minus_Wp);
-    }
-    num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
-
-    index = 0;
-    for (i = 0; i < num_sends; i++)
-    {
-      start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
-        int_buf_data[index++]
-          = fine_to_coarse[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
-    }
+   hypre_MPI_Comm_size(comm, &num_procs);
+   hypre_MPI_Comm_rank(comm, &my_id);
+   //   HYPRE_Int num_threads = hypre_NumThreads();
 
-    comm_handle = hypre_ParCSRCommHandleCreate( 11, comm_pkg, int_buf_data,
-                          fine_to_coarse_offd);
+   res = hypre_CTAlloc(HYPRE_Real, blk_size, HYPRE_MEMORY_HOST);
 
-    hypre_ParCSRCommHandleDestroy(comm_handle);
+   if (!comm_pkg)
+   {
+      hypre_MatvecCommPkgCreate(A);
+      comm_pkg = hypre_ParCSRMatrixCommPkg(A);
+   }
 
-    if (debug_flag==4)
-    {
-      wall_time = time_getWallclockSeconds() - wall_time;
-      hypre_printf("Proc = %d     Interp: Comm 4 FineToCoarse = %f\n",
-             my_id, wall_time);
-      fflush(NULL);
-    }
+   if (num_procs > 1)
+   {
+      num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
 
-    if (debug_flag==4) wall_time = time_getWallclockSeconds();
+      v_buf_data = hypre_CTAlloc(HYPRE_Real,
+                                 hypre_ParCSRCommPkgSendMapStart(comm_pkg,  num_sends),
+                                 HYPRE_MEMORY_HOST);
 
-#if 0
-#ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
-#endif
-#endif
-    for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;
+      Vext_data = hypre_CTAlloc(HYPRE_Real, num_cols_offd, HYPRE_MEMORY_HOST);
 
-  }
-  */
-
-
-  row_counter = 0;
-  for (i = 0; i < n_fine; i++)
-  {
-    /*--------------------------------------------------------------------
-     *  If i is a c-point, interpolation is the identity.
-     *--------------------------------------------------------------------*/
-    if (CF_marker[i] >= 0)
-    {
-      P_diag_i[i] = jj_counter;
-      P_diag_j[jj_counter]    = fine_to_coarse[i];
-      P_diag_data[jj_counter] = one;
-      jj_counter++;
-    }
-    /*--------------------------------------------------------------------
-     *  If i is an F-point, build interpolation.
-     *--------------------------------------------------------------------*/
-    else
-    {
-      /* Diagonal part of P */
-      P_diag_i[i] = jj_counter;
-      for (jj = minus_Wp_diag_i[row_counter]; jj < minus_Wp_diag_i[row_counter+1]; jj++)
+      if (num_cols_offd)
       {
-        //P_marker[row_counter] = jj_counter;
-        P_diag_j[jj_counter]    = minus_Wp_diag_j[jj];
-        P_diag_data[jj_counter] = - minus_Wp_diag_data[jj];
-        jj_counter++;
+         A_offd_j = hypre_CSRMatrixJ(A_offd);
+         A_offd_data = hypre_CSRMatrixData(A_offd);
       }
 
-      /* Off-Diagonal part of P */
-      P_offd_i[i] = jj_counter_offd;
-
-      if (num_procs > 1)
+      index = 0;
+      for (i = 0; i < num_sends; i++)
       {
-        for (jj = minus_Wp_offd_i[row_counter]; jj < minus_Wp_offd_i[row_counter+1]; jj++)
-        {
-          //P_marker_offd[row_counter] = jj_counter_offd;
-          P_offd_j[jj_counter_offd]  = minus_Wp_offd_j[jj];
-          P_offd_data[jj_counter_offd] = - minus_Wp_offd_data[jj];
-          jj_counter_offd++;
-        }
+         start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
+         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
+         {
+            v_buf_data[index++] = u_data[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
+         }
       }
-      row_counter++;
-    }
-    P_offd_i[i+1] = jj_counter_offd;
-  }
-  //hypre_printf("Num rows of Wp = %d\n", row_counter);
-  //P_offd_i[row_counter] = jj_counter_offd;
-
-
-  P = hypre_ParCSRMatrixCreate(comm,
-                 hypre_ParCSRMatrixGlobalNumRows(A),
-                 total_global_cpts,
-                 hypre_ParCSRMatrixColStarts(A),
-                 num_cpts_global,
-                 0,
-                 P_diag_i[n_fine],
-                 P_offd_i[n_fine]);
-
-  P_diag = hypre_ParCSRMatrixDiag(P);
-  hypre_CSRMatrixData(P_diag) = P_diag_data;
-  hypre_CSRMatrixI(P_diag) = P_diag_i;
-  hypre_CSRMatrixJ(P_diag) = P_diag_j;
-  P_offd = hypre_ParCSRMatrixOffd(P);
-  hypre_CSRMatrixData(P_offd) = P_offd_data;
-  hypre_CSRMatrixI(P_offd) = P_offd_i;
-  hypre_CSRMatrixJ(P_offd) = P_offd_j;
-
-  num_cols_P_offd = hypre_CSRMatrixNumCols(minus_Wp_offd);
-  HYPRE_BigInt *col_map_offd_tmp = hypre_ParCSRMatrixColMapOffd(minus_Wp);
-  if (P_offd_size)
-  {
-    col_map_offd_P = hypre_CTAlloc(HYPRE_BigInt, num_cols_P_offd, HYPRE_MEMORY_HOST);
-    for (i=0; i < num_cols_P_offd; i++)
-    {
-      col_map_offd_P[i] = col_map_offd_tmp[i];
-    }
-  }
 
-  /*
-  num_cols_P_offd = 0;
+      comm_handle = hypre_ParCSRCommHandleCreate(1, comm_pkg, v_buf_data, Vext_data);
+   }
+
+   /*-----------------------------------------------------------------
+   * Copy current approximation into temporary vector.
+   *-----------------------------------------------------------------*/
 
-  if (P_offd_size)
-  {
-    P_marker = hypre_CTAlloc(HYPRE_Int, num_cols_minus_Wp_offd, HYPRE_MEMORY_HOST);
 #if 0
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
 #endif
-    for (i=0; i < num_cols_minus_Wp_offd; i++)
-      P_marker[i] = 0;
-    num_cols_P_offd = 0;
-    for (i=0; i < P_offd_size; i++)
-    {
-      index = P_offd_j[i];
-      if (!P_marker[index])
+   for (i = 0; i < n; i++)
+   {
+      Vtemp_data[i] = u_data[i];
+      //printf("u_old[%d] = %e\n",i,Vtemp_data[i]);
+   }
+   if (num_procs > 1)
+   {
+      hypre_ParCSRCommHandleDestroy(comm_handle);
+      comm_handle = NULL;
+   }
+
+   /*-----------------------------------------------------------------
+   * Relax points block by block
+   *-----------------------------------------------------------------*/
+   for (i = 0; i < n_block; i++)
+   {
+      for (j = 0; j < blk_size; j++)
       {
-        num_cols_P_offd++;
-        P_marker[index] = 1;
+         bidx = i * blk_size + j;
+         res[j] = f_data[bidx];
+         for (jj = A_diag_i[bidx]; jj < A_diag_i[bidx + 1]; jj++)
+         {
+            ii = A_diag_j[jj];
+            if (method == 0)
+            {
+               // Jacobi for diagonal part
+               res[j] -= A_diag_data[jj] * Vtemp_data[ii];
+            }
+            else if (method == 1)
+            {
+               // Gauss-Seidel for diagonal part
+               res[j] -= A_diag_data[jj] * u_data[ii];
+            }
+            else
+            {
+               // Default do Jacobi for diagonal part
+               res[j] -= A_diag_data[jj] * Vtemp_data[ii];
+            }
+            //printf("%d: Au= %e * %e =%e\n",ii,A_diag_data[jj],Vtemp_data[ii], res[j]);
+         }
+         for (jj = A_offd_i[bidx]; jj < A_offd_i[bidx + 1]; jj++)
+         {
+            // always do Jacobi for off-diagonal part
+            ii = A_offd_j[jj];
+            res[j] -= A_offd_data[jj] * Vext_data[ii];
+         }
+         //printf("%d: res = %e\n",bidx,res[j]);
       }
-    }
-
-    col_map_offd_P = hypre_CTAlloc(HYPRE_Int, num_cols_P_offd, HYPRE_MEMORY_HOST);
-    index = 0;
-    for (i=0; i < num_cols_P_offd; i++)
-    {
-      while (P_marker[index]==0) index++;
-      col_map_offd_P[i] = index++;
-    }
 
-#if 0
-#ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
-#endif
-#endif
-    for (i=0; i < P_offd_size; i++)
-      P_offd_j[i] = hypre_BinarySearch(col_map_offd_P,
-                       P_offd_j[i],
-                       num_cols_P_offd);
-    hypre_TFree(P_marker, HYPRE_MEMORY_HOST);
-  }
-  */
+      for (j = 0; j < blk_size; j++)
+      {
+         bidx1 = i * blk_size + j;
+         for (k = 0; k < blk_size; k++)
+         {
+            bidx  = i * nb2 + j * blk_size + k;
+            u_data[bidx1] += res[k] * diaginv[bidx];
+            //printf("u[%d] = %e, diaginv[%d] = %e\n",bidx1,u_data[bidx1],bidx,diaginv[bidx]);
+         }
+         //printf("u[%d] = %e\n",bidx1,u_data[bidx1]);
+      }
+   }
 
-  if (num_cols_P_offd)
-  {
-    hypre_ParCSRMatrixColMapOffd(P) = col_map_offd_P;
-    hypre_CSRMatrixNumCols(P_offd) = num_cols_P_offd;
-  }
-  hypre_MatvecCommPkgCreate(P);
-  //hypre_GetCommPkgRTFromCommPkgA(P,A, fine_to_coarse_offd);
-
-  *P_ptr = P;
-
-  //hypre_TFree(CF_marker_offd, HYPRE_MEMORY_HOST);
-  //hypre_TFree(int_buf_data, HYPRE_MEMORY_HOST);
-  hypre_TFree(fine_to_coarse, HYPRE_MEMORY_HOST);
-  //if (fine_to_coarse_offd) hypre_TFree(fine_to_coarse_offd, HYPRE_MEMORY_HOST);
-  //hypre_TFree(coarse_counter, HYPRE_MEMORY_HOST);
-  //hypre_TFree(jj_count, HYPRE_MEMORY_HOST);
-  //hypre_TFree(jj_count_offd, HYPRE_MEMORY_HOST);
-  hypre_TFree(C_marker, HYPRE_MEMORY_HOST);
-  hypre_TFree(F_marker, HYPRE_MEMORY_HOST);
-  hypre_ParCSRMatrixDestroy(A_ff);
-  hypre_ParCSRMatrixDestroy(A_fc);
-  hypre_ParCSRMatrixDestroy(A_ff_inv);
-  hypre_ParCSRMatrixDestroy(minus_Wp);
+   if (num_procs > 1)
+   {
+      hypre_TFree(Vext_data, HYPRE_MEMORY_HOST);
+      hypre_TFree(v_buf_data, HYPRE_MEMORY_HOST);
+   }
+   hypre_TFree(res, HYPRE_MEMORY_HOST);
 
-  return 0;
+   return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_MGRBlockRelaxSolveDevice
+ *--------------------------------------------------------------------------*/
 
-
-/* Setup interpolation operator */
 HYPRE_Int
-hypre_MGRBuildInterp(hypre_ParCSRMatrix   *A,
-                     HYPRE_Int            *CF_marker,
-                     hypre_ParCSRMatrix   *S,
-                     HYPRE_BigInt         *num_cpts_global,
-                     HYPRE_Int             num_functions,
-                     HYPRE_Int            *dof_func,
-                     HYPRE_Int             debug_flag,
-                     HYPRE_Real            trunc_factor,
-                     HYPRE_Int             max_elmts,
-                     hypre_ParCSRMatrix  **P,
-         HYPRE_Int         interp_type,
-                     HYPRE_Int             numsweeps)
+hypre_MGRBlockRelaxSolveDevice( hypre_ParCSRMatrix  *B,
+                                hypre_ParCSRMatrix  *A,
+                                hypre_ParVector     *f,
+                                hypre_ParVector     *u,
+                                hypre_ParVector     *Vtemp,
+                                HYPRE_Real           relax_weight )
 {
-//  HYPRE_Int i;
-  hypre_ParCSRMatrix    *P_ptr = NULL;
-//  HYPRE_Real       jac_trunc_threshold = trunc_factor;
-//  HYPRE_Real       jac_trunc_threshold_minus = 0.5*jac_trunc_threshold;
+   hypre_GpuProfilingPushRange("BlockRelaxSolve");
 
-  /* Interpolation for each level */
-  if (interp_type <3)
-  {
-    hypre_MGRBuildP( A,CF_marker,num_cpts_global,interp_type,debug_flag,&P_ptr);
+   /* Copy f into temporary vector */
+   hypre_ParVectorCopy(f, Vtemp);
 
-    /* Could do a few sweeps of Jacobi to further improve Jacobi interpolation P */
-/*
-    if(interp_type == 2)
-    {
-       for(i=0; i<numsweeps; i++)
-       {
-         hypre_BoomerAMGJacobiInterp(A, &P_ptr, S,1, NULL, CF_marker, 0, jac_trunc_threshold, jac_trunc_threshold_minus );
-       }
-       hypre_BoomerAMGInterpTruncation(P_ptr, trunc_factor, max_elmts);
-    }
-*/
-  }
-  else if (interp_type == 4)
-  {
-    hypre_MGRBuildInterpApproximateInverse(A, CF_marker, num_cpts_global, debug_flag, &P_ptr);
-    hypre_BoomerAMGInterpTruncation(P_ptr, trunc_factor, max_elmts);
-  }
-  else if (interp_type == 99)
-  {
-    hypre_MGRBuildInterpApproximateInverseExp(A, S, CF_marker, num_cpts_global, debug_flag, &P_ptr);
-    hypre_BoomerAMGInterpTruncation(P_ptr, trunc_factor, max_elmts);
-  }
-  else
-  {
-    /* Classical modified interpolation */
-    hypre_BoomerAMGBuildInterp(A, CF_marker, S, num_cpts_global,1, NULL,debug_flag,
-                      trunc_factor, max_elmts, &P_ptr);
-  }
+   /* Perform Matvec: Vtemp = w * (f - Au) */
+   if (hypre_ParVectorAllZeros(u))
+   {
+#if defined(HYPRE_DEBUG)
+      hypre_assert(hypre_ParVectorInnerProd(u, u) == 0.0);
+#endif
+      hypre_ParVectorScale(relax_weight, Vtemp);
+   }
+   else
+   {
+      hypre_ParCSRMatrixMatvec(-relax_weight, A, u, relax_weight, Vtemp);
+   }
+
+   /* Update solution: u += B * Vtemp */
+   hypre_ParCSRMatrixMatvec(1.0, B, Vtemp, 1.0, u);
+   hypre_ParVectorAllZeros(u) = 0;
 
-  /* set pointer to P */
-  *P = P_ptr;
+   hypre_GpuProfilingPopRange();
 
-  return hypre_error_flag;
+   return hypre_error_flag;
 }
 
-/* Setup restriction operator */
+/*--------------------------------------------------------------------------
+ * hypre_MGRBlockRelaxSolve
+ *
+ * Computes a block Jacobi relaxation of matrix A, given the inverse of the
+ * diagonal blocks (of A) obtained by calling hypre_MGRBlockRelaxSetup.
+ *
+ * TODO: Adapt to relax on specific points based on CF_marker information
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_MGRBuildRestrict(hypre_ParCSRMatrix     *A,
-                     HYPRE_Int              *CF_marker,
-                     HYPRE_BigInt           *num_cpts_global,
-                     HYPRE_Int              num_functions,
-                     HYPRE_Int              *dof_func,
-                     HYPRE_Int              debug_flag,
-                     HYPRE_Real             trunc_factor,
-                     HYPRE_Int              max_elmts,
-                     HYPRE_Real             strong_threshold,
-                     HYPRE_Real             max_row_sum,
-                     hypre_ParCSRMatrix     **R,
-                     HYPRE_Int              restrict_type,
-                     HYPRE_Int              numsweeps)
+hypre_MGRBlockRelaxSolve( hypre_ParCSRMatrix *A,
+                          hypre_ParVector    *f,
+                          hypre_ParVector    *u,
+                          HYPRE_Int           blk_size,
+                          HYPRE_Int           n_block,
+                          HYPRE_Int           left_size,
+                          HYPRE_Int           method,
+                          HYPRE_Real         *diaginv,
+                          hypre_ParVector    *Vtemp )
 {
-  //   HYPRE_Int i;
-  hypre_ParCSRMatrix    *R_ptr = NULL;
-  hypre_ParCSRMatrix    *AT = NULL;
-  hypre_ParCSRMatrix    *ST = NULL;
-  //   HYPRE_Real       jac_trunc_threshold = trunc_factor;
-  //   HYPRE_Real       jac_trunc_threshold_minus = 0.5*jac_trunc_threshold;
-
-  /* Build AT (transpose A) */
-  if (restrict_type > 0)
-  {
-    hypre_ParCSRMatrixTranspose(A, &AT, 1);
-  }
+   HYPRE_UNUSED_VAR(left_size);
 
-  /* Restriction for each level */
-  if (restrict_type == 0)
-  {
-    hypre_MGRBuildP(A, CF_marker, num_cpts_global, restrict_type, debug_flag, &R_ptr);
-  }
-  else if (restrict_type == 1 || restrict_type == 2)
-  {
-    hypre_MGRBuildP(AT, CF_marker, num_cpts_global, restrict_type, debug_flag, &R_ptr);
-  }
-  else if (restrict_type == 3)
-  {
-    /* move diagonal to first entry */
-    hypre_CSRMatrixReorder(hypre_ParCSRMatrixDiag(AT));
-    hypre_MGRBuildInterpApproximateInverse(AT, CF_marker, num_cpts_global, debug_flag, &R_ptr);
-    hypre_BoomerAMGInterpTruncation(R_ptr, trunc_factor, max_elmts);
-  }
-  else
-  {
-    /* Build new strength matrix */
-    hypre_BoomerAMGCreateS(AT, strong_threshold, max_row_sum, 1, NULL, &ST);
-
-    /* Classical modified interpolation */
-    hypre_BoomerAMGBuildInterp(AT, CF_marker, ST, num_cpts_global,1, NULL,debug_flag,
-                               trunc_factor, max_elmts, &R_ptr);
-  }
+   MPI_Comm      comm = hypre_ParCSRMatrixComm(A);
+   hypre_CSRMatrix *A_diag = hypre_ParCSRMatrixDiag(A);
+   HYPRE_Real      *A_diag_data  = hypre_CSRMatrixData(A_diag);
+   HYPRE_Int       *A_diag_i     = hypre_CSRMatrixI(A_diag);
+   HYPRE_Int       *A_diag_j     = hypre_CSRMatrixJ(A_diag);
+   hypre_CSRMatrix *A_offd = hypre_ParCSRMatrixOffd(A);
+   HYPRE_Int       *A_offd_i     = hypre_CSRMatrixI(A_offd);
+   HYPRE_Real      *A_offd_data  = hypre_CSRMatrixData(A_offd);
+   HYPRE_Int       *A_offd_j     = hypre_CSRMatrixJ(A_offd);
+   hypre_ParCSRCommPkg  *comm_pkg = hypre_ParCSRMatrixCommPkg(A);
+   hypre_ParCSRCommHandle *comm_handle = NULL;
+
+   HYPRE_Int        n       = hypre_CSRMatrixNumRows(A_diag);
+   HYPRE_Int        num_cols_offd = hypre_CSRMatrixNumCols(A_offd);
+
+   hypre_Vector    *u_local = hypre_ParVectorLocalVector(u);
+   HYPRE_Real      *u_data  = hypre_VectorData(u_local);
+
+   hypre_Vector    *f_local = hypre_ParVectorLocalVector(f);
+   HYPRE_Real      *f_data  = hypre_VectorData(f_local);
+
+   hypre_Vector    *Vtemp_local = hypre_ParVectorLocalVector(Vtemp);
+   HYPRE_Real      *Vtemp_data = hypre_VectorData(Vtemp_local);
+   HYPRE_Real      *Vext_data = NULL;
+   HYPRE_Real      *v_buf_data = NULL;
+
+   HYPRE_Int        i, j, k;
+   HYPRE_Int        ii, jj;
+   HYPRE_Int        bidx, bidx1, bidxm1;
+   HYPRE_Int        num_sends;
+   HYPRE_Int        index, start;
+   HYPRE_Int        num_procs, my_id;
+   HYPRE_Real      *res;
 
-  /* set pointer to P */
-  *R = R_ptr;
+   const HYPRE_Int  nb2 = blk_size * blk_size;
 
-  /* Free memory */
-  if (restrict_type > 0)
-  {
-    hypre_ParCSRMatrixDestroy(AT);
-  }
-  if (restrict_type > 5)
-  {
-    hypre_ParCSRMatrixDestroy(ST);
-  }
+   hypre_MPI_Comm_size(comm, &num_procs);
+   hypre_MPI_Comm_rank(comm, &my_id);
+   //   HYPRE_Int num_threads = hypre_NumThreads();
 
-  return hypre_error_flag;
-}
+   res = hypre_CTAlloc(HYPRE_Real,  blk_size, HYPRE_MEMORY_HOST);
 
-void hypre_blas_smat_inv_n4 (HYPRE_Real *a)
-{
-  const HYPRE_Real a11 = a[0],  a12 = a[1],  a13 = a[2],  a14 = a[3];
-  const HYPRE_Real a21 = a[4],  a22 = a[5],  a23 = a[6],  a24 = a[7];
-  const HYPRE_Real a31 = a[8],  a32 = a[9],  a33 = a[10], a34 = a[11];
-  const HYPRE_Real a41 = a[12], a42 = a[13], a43 = a[14], a44 = a[15];
-
-  const HYPRE_Real M11 = a22*a33*a44 + a23*a34*a42 + a24*a32*a43 - a22*a34*a43 - a23*a32*a44 - a24*a33*a42;
-  const HYPRE_Real M12 = a12*a34*a43 + a13*a32*a44 + a14*a33*a42 - a12*a33*a44 - a13*a34*a42 - a14*a32*a43;
-  const HYPRE_Real M13 = a12*a23*a44 + a13*a24*a42 + a14*a22*a43 - a12*a24*a43 - a13*a22*a44 - a14*a23*a42;
-  const HYPRE_Real M14 = a12*a24*a33 + a13*a22*a34 + a14*a23*a32 - a12*a23*a34 - a13*a24*a32 - a14*a22*a33;
-  const HYPRE_Real M21 = a21*a34*a43 + a23*a31*a44 + a24*a33*a41 - a21*a33*a44 - a23*a34*a41 - a24*a31*a43;
-  const HYPRE_Real M22 = a11*a33*a44 + a13*a34*a41 + a14*a31*a43 - a11*a34*a43 - a13*a31*a44 - a14*a33*a41;
-  const HYPRE_Real M23 = a11*a24*a43 + a13*a21*a44 + a14*a23*a41 - a11*a23*a44 - a13*a24*a41 - a14*a21*a43;
-  const HYPRE_Real M24 = a11*a23*a34 + a13*a24*a31 + a14*a21*a33 - a11*a24*a33 - a13*a21*a34 - a14*a23*a31;
-  const HYPRE_Real M31 = a21*a32*a44 + a22*a34*a41 + a24*a31*a42 - a21*a34*a42 - a22*a31*a44 - a24*a32*a41;
-  const HYPRE_Real M32 = a11*a34*a42 + a12*a31*a44 + a14*a32*a41 - a11*a32*a44 - a12*a34*a41 - a14*a31*a42;
-  const HYPRE_Real M33 = a11*a22*a44 + a12*a24*a41 + a14*a21*a42 - a11*a24*a42 - a12*a21*a44 - a14*a22*a41;
-  const HYPRE_Real M34 = a11*a24*a32 + a12*a21*a34 + a14*a22*a31 - a11*a22*a34 - a12*a24*a31 - a14*a21*a32;
-  const HYPRE_Real M41 = a21*a33*a42 + a22*a31*a43 + a23*a32*a41 - a21*a32*a43 - a22*a33*a41 - a23*a31*a42;
-  const HYPRE_Real M42 = a11*a32*a43 + a12*a33*a41 + a13*a31*a42 - a11*a33*a42 - a12*a31*a43 - a13*a32*a41;
-  const HYPRE_Real M43 = a11*a23*a42 + a12*a21*a43 + a13*a22*a41 - a11*a22*a43 - a12*a23*a41 - a13*a21*a42;
-  const HYPRE_Real M44 = a11*a22*a33 + a12*a23*a31 + a13*a21*a32 - a11*a23*a32 - a12*a21*a33 - a13*a22*a31;
-
-  const HYPRE_Real det = a11*M11 + a12*M21 + a13*M31 + a14*M41;
-  HYPRE_Real det_inv;
-
-  //if ( fabs(det) < 1e-22 ) {
-  //hypre_printf("### WARNING: Matrix is nearly singular! det = %e\n", det);
-  /*
-  printf("##----------------------------------------------\n");
-  printf("## %12.5e %12.5e %12.5e \n", a0, a1, a2);
-  printf("## %12.5e %12.5e %12.5e \n", a3, a4, a5);
-  printf("## %12.5e %12.5e %12.5e \n", a5, a6, a7);
-  printf("##----------------------------------------------\n");
-  getchar();
-  */
-  //}
-
-  det_inv = 1.0/det;
-
-  a[0] = M11*det_inv;  a[1] = M12*det_inv;  a[2] = M13*det_inv;  a[3] = M14*det_inv;
-  a[4] = M21*det_inv;  a[5] = M22*det_inv;  a[6] = M23*det_inv;  a[7] = M24*det_inv;
-  a[8] = M31*det_inv;  a[9] = M32*det_inv;  a[10] = M33*det_inv; a[11] = M34*det_inv;
-  a[12] = M41*det_inv; a[13] = M42*det_inv; a[14] = M43*det_inv; a[15] = M44*det_inv;
+   if (!comm_pkg)
+   {
+      hypre_MatvecCommPkgCreate(A);
+      comm_pkg = hypre_ParCSRMatrixCommPkg(A);
+   }
 
-}
+   if (num_procs > 1)
+   {
+      num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
 
-void hypre_blas_mat_inv(HYPRE_Real *a,
-                  HYPRE_Int n)
-{
-  HYPRE_Int i,j,k,l,u,kn,in;
-  HYPRE_Real alinv;
-  if (n == 4)
-  {
-    hypre_blas_smat_inv_n4(a);
-  }
-  else
-  {
-    for (k=0; k<n; ++k) {
-      kn = k*n;
-      l  = kn+k;
-
-      //if (fabs(a[l]) < SMALLREAL) {
-      //   printf("### WARNING: Diagonal entry is close to zero!");
-      //   printf("### WARNING: diag_%d=%e\n", k, a[l]);
-      //   a[l] = SMALLREAL;
-      //}
-      alinv = 1.0/a[l];
-      a[l] = alinv;
-
-      for (j=0; j<k; ++j) {
-        u = kn+j; a[u] *= alinv;
-      }
+      v_buf_data = hypre_CTAlloc(HYPRE_Real,
+                                 hypre_ParCSRCommPkgSendMapStart(comm_pkg,  num_sends),
+                                 HYPRE_MEMORY_HOST);
+
+      Vext_data = hypre_CTAlloc(HYPRE_Real, num_cols_offd, HYPRE_MEMORY_HOST);
 
-      for (j=k+1; j<n; ++j) {
-        u = kn+j; a[u] *= alinv;
+      if (num_cols_offd)
+      {
+         A_offd_j = hypre_CSRMatrixJ(A_offd);
+         A_offd_data = hypre_CSRMatrixData(A_offd);
       }
 
-      for (i=0; i<k; ++i) {
-        in = i*n;
-        for (j=0; j<n; ++j)
-           if (j!=k) {
-              u = in+j; a[u] -= a[in+k]*a[kn+j];
-           } // end if (j!=k)
+      index = 0;
+      for (i = 0; i < num_sends; i++)
+      {
+         start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
+         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
+            v_buf_data[index++]
+               = u_data[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
       }
 
-      for (i=k+1; i<n; ++i) {
-        in = i*n;
-        for (j=0; j<n; ++j)
-           if (j!=k) {
-              u = in+j; a[u] -= a[in+k]*a[kn+j];
-           } // end if (j!=k)
-      }
+      comm_handle = hypre_ParCSRCommHandleCreate( 1, comm_pkg, v_buf_data,
+                                                  Vext_data);
+   }
+
+   /*-----------------------------------------------------------------
+   * Copy current approximation into temporary vector.
+   *-----------------------------------------------------------------*/
+
+#if 0
+#ifdef HYPRE_USING_OPENMP
+   #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+#endif
+#endif
+   for (i = 0; i < n; i++)
+   {
+      Vtemp_data[i] = u_data[i];
+      //printf("u_old[%d] = %e\n",i,Vtemp_data[i]);
+   }
+   if (num_procs > 1)
+   {
+      hypre_ParCSRCommHandleDestroy(comm_handle);
+      comm_handle = NULL;
+   }
 
-      for (i=0; i<k; ++i) {
-        u=i*n+k; a[u] *= -alinv;
+   /*-----------------------------------------------------------------
+   * Relax points block by block
+   *-----------------------------------------------------------------*/
+   for (i = 0; i < n_block; i++)
+   {
+      bidxm1 = i * blk_size;
+      for (j = 0; j < blk_size; j++)
+      {
+         bidx = bidxm1 + j;
+         res[j] = f_data[bidx];
+         for (jj = A_diag_i[bidx]; jj < A_diag_i[bidx + 1]; jj++)
+         {
+            ii = A_diag_j[jj];
+            if (method == 0)
+            {
+               // Jacobi for diagonal part
+               res[j] -= A_diag_data[jj] * Vtemp_data[ii];
+            }
+            else if (method == 1)
+            {
+               // Gauss-Seidel for diagonal part
+               res[j] -= A_diag_data[jj] * u_data[ii];
+            }
+            else
+            {
+               // Default do Jacobi for diagonal part
+               res[j] -= A_diag_data[jj] * Vtemp_data[ii];
+            }
+            //printf("%d: Au= %e * %e =%e\n",ii,A_diag_data[jj],Vtemp_data[ii], res[j]);
+         }
+         for (jj = A_offd_i[bidx]; jj < A_offd_i[bidx + 1]; jj++)
+         {
+            // always do Jacobi for off-diagonal part
+            ii = A_offd_j[jj];
+            res[j] -= A_offd_data[jj] * Vext_data[ii];
+         }
+         //printf("%d: res = %e\n",bidx,res[j]);
       }
 
-      for (i=k+1; i<n; ++i) {
-        u=i*n+k; a[u] *= -alinv;
+      for (j = 0; j < blk_size; j++)
+      {
+         bidx1 = bidxm1 + j;
+         for (k = 0; k < blk_size; k++)
+         {
+            bidx  = i * nb2 + j * blk_size + k;
+            u_data[bidx1] += res[k] * diaginv[bidx];
+            //printf("u[%d] = %e, diaginv[%d] = %e\n",bidx1,u_data[bidx1],bidx,diaginv[bidx]);
+         }
+         //printf("u[%d] = %e\n",bidx1,u_data[bidx1]);
       }
-    } // end for (k=0; k<n; ++k)
-  }// end if
+   }
+   if (num_procs > 1)
+   {
+      hypre_TFree(Vext_data, HYPRE_MEMORY_HOST);
+      hypre_TFree(v_buf_data, HYPRE_MEMORY_HOST);
+   }
+   hypre_TFree(res, HYPRE_MEMORY_HOST);
+   return hypre_error_flag;
 }
 
-HYPRE_Int hypre_block_jacobi_scaling(hypre_ParCSRMatrix *A, hypre_ParCSRMatrix **B_ptr,
-                 void *mgr_vdata, HYPRE_Int debug_flag)
-{
-  MPI_Comm             comm = hypre_ParCSRMatrixComm(A);
-
-  hypre_ParMGRData   *mgr_data =  (hypre_ParMGRData*) mgr_vdata;
+/*--------------------------------------------------------------------------
+ * hypre_BlockDiagInvLapack
+ *
+ * TODO (VPM): move this function to seq_ls
+ *--------------------------------------------------------------------------*/
 
-  HYPRE_Int         num_procs,  my_id;
+HYPRE_Int
+hypre_BlockDiagInvLapack(HYPRE_Real *diag, HYPRE_Int N, HYPRE_Int blk_size)
+{
+   HYPRE_Int nblock, left_size, i;
+   //HYPRE_Int *IPIV = hypre_CTAlloc(HYPRE_Int, blk_size, HYPRE_MEMORY_HOST);
+   HYPRE_Int LWORK = blk_size * blk_size;
+   HYPRE_Real *WORK = hypre_CTAlloc(HYPRE_Real, LWORK, HYPRE_MEMORY_HOST);
+   HYPRE_Int INFO;
+
+   HYPRE_Real wall_time;
+   HYPRE_Int my_id;
+   MPI_Comm comm = hypre_MPI_COMM_WORLD;
+   hypre_MPI_Comm_rank(comm, &my_id);
 
-  HYPRE_Int    blk_size  = (mgr_data -> block_size);
-  HYPRE_Int    reserved_coarse_size = (mgr_data -> reserved_coarse_size);
+   nblock = N / blk_size;
+   left_size = N - blk_size * nblock;
+   i = nblock;
+   HYPRE_Int *IPIV = hypre_CTAlloc(HYPRE_Int, blk_size, HYPRE_MEMORY_HOST);
 
-  hypre_CSRMatrix *A_diag = hypre_ParCSRMatrixDiag(A);
-  HYPRE_Real      *A_diag_data = hypre_CSRMatrixData(A_diag);
-  HYPRE_Int             *A_diag_i = hypre_CSRMatrixI(A_diag);
-  HYPRE_Int             *A_diag_j = hypre_CSRMatrixJ(A_diag);
+   wall_time = time_getWallclockSeconds();
+   if (blk_size >= 2 && blk_size <= 4)
+   {
+      for (i = 0; i < nblock; i++)
+      {
+         hypre_MGRSmallBlkInverse(diag + i * LWORK, blk_size);
+         //hypre_blas_smat_inv_n2(diag+i*LWORK);
+      }
+   }
+   else if (blk_size > 4)
+   {
+      for (i = 0; i < nblock; i++)
+      {
+         hypre_dgetrf(&blk_size, &blk_size, diag + i * LWORK, &blk_size, IPIV, &INFO);
+         hypre_dgetri(&blk_size, diag + i * LWORK, &blk_size, IPIV, WORK, &LWORK, &INFO);
+      }
+   }
 
-  hypre_ParCSRMatrix    *B;
+   // Left size
+   if (left_size > 0)
+   {
+      hypre_dgetrf(&left_size, &left_size, diag + i * LWORK, &left_size, IPIV, &INFO);
+      hypre_dgetri(&left_size, diag + i * LWORK, &left_size, IPIV, WORK, &LWORK, &INFO);
+   }
+   wall_time = time_getWallclockSeconds() - wall_time;
+   //if (my_id == 0) hypre_printf("Proc = %d, Compute inverse time: %1.5f\n", my_id, wall_time);
 
-  hypre_CSRMatrix *B_diag;
-  HYPRE_Real      *B_diag_data;
-  HYPRE_Int       *B_diag_i;
-  HYPRE_Int       *B_diag_j;
+   hypre_TFree(IPIV, HYPRE_MEMORY_HOST);
+   hypre_TFree(WORK, HYPRE_MEMORY_HOST);
 
-  hypre_CSRMatrix *B_offd;
-  HYPRE_Int              i,ii;
-  HYPRE_Int              j,jj;
-  HYPRE_Int              k;
+   return hypre_error_flag;
+}
 
-  HYPRE_Int              n = hypre_CSRMatrixNumRows(A_diag);
-  HYPRE_Int n_block, left_size,inv_size;
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixExtractBlockDiagHost
+ *
+ * Extract the block diagonal part of a A or a principal submatrix of A
+ * defined by a marker (point_type) in an associated CF_marker array.
+ * The result is an array of (flattened) block diagonals.
+ *
+ * If CF marker array is NULL, it returns an array of the (flattened)
+ * block diagonal of the entire matrix A.
+ *
+ * Options for diag_type are:
+ *   diag_type = 1: return the inverse of the block diagonals
+ *   otherwise    : return the block diagonals
+ *
+ * On return, blk_diag_size contains the size of the returned
+ * (flattened) array. (i.e. nnz of extracted block diagonal)
+ *
+ * Input parameters are:
+ *    A          - original ParCSR matrix
+ *    blk_size   - Size of diagonal blocks to extract
+ *    CF_marker  - Array prescribing submatrix from which to extract
+ *                 block diagonals. Ignored if NULL.
+ *    point_type - marker tag in CF_marker array to extract diagonal
+ *    diag_type  - Type of block diagonal entries to return.
+ *                 Currently supports block diagonal or inverse block
+ *                 diagonal entries (diag_type = 1).
+ *
+ * Output parameters are:
+ *      diag_ptr - Array of block diagonal entries
+ * blk_diag_size - number of entries in extracted block diagonal
+ *                 (size of diag_ptr).
+ *--------------------------------------------------------------------------*/
 
-  //   HYPRE_Real       wall_time;  /* for debugging instrumentation  */
-  HYPRE_Int        bidx,bidxm1,bidxp1;
-  HYPRE_Real       * diaginv;
+HYPRE_Int
+hypre_ParCSRMatrixExtractBlockDiagHost( hypre_ParCSRMatrix   *par_A,
+                                        HYPRE_Int             blk_size,
+                                        HYPRE_Int             num_points,
+                                        HYPRE_Int             point_type,
+                                        HYPRE_Int            *CF_marker,
+                                        HYPRE_Int             diag_size,
+                                        HYPRE_Int             diag_type,
+                                        HYPRE_Real           *diag_data )
+{
+   HYPRE_UNUSED_VAR(diag_size);
+
+   hypre_CSRMatrix      *A_diag       = hypre_ParCSRMatrixDiag(par_A);
+   HYPRE_Int             nrows        = hypre_CSRMatrixNumRows(A_diag);
+   HYPRE_Complex        *A_diag_data  = hypre_CSRMatrixData(A_diag);
+   HYPRE_Int            *A_diag_i     = hypre_CSRMatrixI(A_diag);
+   HYPRE_Int            *A_diag_j     = hypre_CSRMatrixJ(A_diag);
+
+   HYPRE_Int             i, j;
+   HYPRE_Int             ii, jj;
+   HYPRE_Int             bidx, bidxm1, bidxp1, ridx, didx;
+   HYPRE_Int             row_offset;
+
+   HYPRE_Int             whole_num_points, cnt, bstart;
+   HYPRE_Int             bs2 = blk_size * blk_size;
+   HYPRE_Int             num_blocks;
+   HYPRE_Int             left_size = 0;
+
+   // First count the number of points matching point_type in CF_marker
+   num_blocks       = num_points / blk_size;
+   whole_num_points = blk_size * num_blocks;
+   left_size        = num_points - whole_num_points;
+   bstart           = bs2 * num_blocks;
+
+   /*-----------------------------------------------------------------
+    * Get all the diagonal sub-blocks
+    *-----------------------------------------------------------------*/
+
+   HYPRE_ANNOTATE_REGION_BEGIN("%s", "ExtractDiagSubBlocks");
+   if (CF_marker == NULL)
+   {
+      // CF Marker is NULL. Consider all rows of matrix.
+      for (i = 0; i < num_blocks; i++)
+      {
+         bidxm1 = i * blk_size;
+         bidxp1 = (i + 1) * blk_size;
 
-  const HYPRE_Int     nb2 = blk_size*blk_size;
+         for (j = 0; j < blk_size; j++)
+         {
+            for (ii = A_diag_i[bidxm1 + j]; ii < A_diag_i[bidxm1 + j + 1]; ii++)
+            {
+               jj = A_diag_j[ii];
+               if ((jj >= bidxm1) &&
+                   (jj < bidxp1)  &&
+                   hypre_cabs(A_diag_data[ii]) > HYPRE_REAL_MIN)
+               {
+                  bidx = j * blk_size + jj - bidxm1;
+                  diag_data[i * bs2 + bidx] = A_diag_data[ii];
+               }
+            }
+         }
+      }
 
-  HYPRE_Int block_scaling_error = 0;
+      // deal with remaining points if any
+      if (left_size)
+      {
+         bidxm1 = whole_num_points;
+         bidxp1 = num_points;
+         for (j = 0; j < left_size; j++)
+         {
+            for (ii = A_diag_i[bidxm1 + j]; ii < A_diag_i[bidxm1 + j + 1]; ii++)
+            {
+               jj = A_diag_j[ii];
+               if ((jj >= bidxm1) &&
+                   (jj < bidxp1)  &&
+                   hypre_cabs(A_diag_data[ii]) > HYPRE_REAL_MIN)
+               {
+                  bidx = j * left_size + jj - bidxm1;
+                  diag_data[bstart + bidx] = A_diag_data[ii];
+               }
+            }
+         }
+      }
+   }
+   else
+   {
+      // extract only block diagonal of submatrix defined by CF marker
+      cnt = 0;
+      row_offset = 0;
+      for (i = 0; i < nrows; i++)
+      {
+         if (CF_marker[i] == point_type)
+         {
+            bidx = cnt / blk_size;
+            ridx = cnt % blk_size;
+            bidxm1 = bidx * blk_size;
+            bidxp1 = (bidx + 1) * blk_size;
+            for (ii = A_diag_i[i]; ii < A_diag_i[i + 1]; ii++)
+            {
+               jj = A_diag_j[ii];
+               if (CF_marker[jj] == point_type)
+               {
+                  if ((jj - row_offset >= bidxm1) &&
+                      (jj - row_offset < bidxp1)  &&
+                      (hypre_cabs(A_diag_data[ii]) > HYPRE_REAL_MIN))
+                  {
+                     didx = bidx * bs2 + ridx * blk_size + jj - bidxm1 - row_offset;
+                     diag_data[didx] = A_diag_data[ii];
+                  }
+               }
+            }
+            if (++cnt == whole_num_points)
+            {
+               break;
+            }
+         }
+         else
+         {
+            row_offset++;
+         }
+      }
 
-  hypre_MPI_Comm_size(comm,&num_procs);
-  hypre_MPI_Comm_rank(comm,&my_id);
-  //   HYPRE_Int num_threads = hypre_NumThreads();
+      // remaining points
+      for (i = whole_num_points; i < num_points; i++)
+      {
+         if (CF_marker[i] == point_type)
+         {
+            bidx = num_blocks;
+            ridx = cnt - whole_num_points;
+            bidxm1 = whole_num_points;
+            bidxp1 = num_points;
+            for (ii = A_diag_i[i]; ii < A_diag_i[i + 1]; ii++)
+            {
+               jj = A_diag_j[ii];
+               if (CF_marker[jj] == point_type)
+               {
+                  if ((jj - row_offset >= bidxm1) &&
+                      (jj - row_offset < bidxp1)  &&
+                      (hypre_cabs(A_diag_data[ii]) > HYPRE_REAL_MIN))
+                  {
+                     didx = bstart + ridx * left_size + jj - bidxm1 - row_offset;
+                     diag_data[didx] = A_diag_data[ii];
+                  }
+               }
+            }
+            cnt++;
+         }
+         else
+         {
+            row_offset++;
+         }
+      }
+   }
+   HYPRE_ANNOTATE_REGION_END("%s", "ExtractDiagSubBlocks");
 
-  //printf("n = %d\n",n);
+   /*-----------------------------------------------------------------
+    * Compute the inverses of all the diagonal sub-blocks
+    *-----------------------------------------------------------------*/
 
-  if (my_id == num_procs)
-  {
-    n_block   = (n - reserved_coarse_size) / blk_size;
-    left_size = n - blk_size*n_block;
-  }
-  else
-  {
-    n_block = n / blk_size;
-    left_size = n - blk_size*n_block;
-  }
+   if (diag_type == 1)
+   {
+      HYPRE_ANNOTATE_REGION_BEGIN("%s", "InvertDiagSubBlocks");
+      if (blk_size > 1)
+      {
+         hypre_BlockDiagInvLapack(diag_data, num_points, blk_size);
+      }
+      else
+      {
+         for (i = 0; i < num_points; i++)
+         {
+            if (hypre_cabs(diag_data[i]) < HYPRE_REAL_MIN)
+            {
+               diag_data[i] = 0.0;
+            }
+            else
+            {
+               diag_data[i] = 1.0 / diag_data[i];
+            }
+         }
+      }
+      HYPRE_ANNOTATE_REGION_END("%s", "InvertDiagSubBlocks");
+   }
 
-  inv_size  = nb2*n_block + left_size*left_size;
+   return hypre_error_flag;
+}
 
-  //printf("inv_size = %d\n",inv_size);
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixBlockDiagMatrix
+ *
+ * Extract the block diagonal part of a A or a principal submatrix of A defined
+ * by a marker (point_type) in an associated CF_marker array. The result is
+ * a new block diagonal parCSR matrix.
+ *
+ * If CF marker array is NULL, it returns the block diagonal of the matrix A.
+ *
+ * Options for diag_type are:
+ *    diag_type = 1: return the inverse of the block diagonals
+ *    otherwise : return the block diagonals
+ *
+ * Input parameters are:
+ *    par_A      - original ParCSR matrix
+ *    blk_size   - Size of diagonal blocks to extract
+ *    CF_marker  - Array prescribing submatrix from which to extract block
+ *                 diagonals. Ignored if NULL.
+ *    point_type - marker tag in CF_marker array to extract diagonal
+ *    diag_type  - Type of block diagonal entries to return. Currently supports
+ *                 block diagonal or inverse block diagonal entries.
+ *
+ * Output parameters are:
+ *    B_ptr      - New block diagonal matrix
+ *--------------------------------------------------------------------------*/
 
-  hypre_blockRelax_setup(A,blk_size,reserved_coarse_size,&(mgr_data -> diaginv));
+HYPRE_Int
+hypre_ParCSRMatrixBlockDiagMatrix( hypre_ParCSRMatrix  *A,
+                                   HYPRE_Int            blk_size,
+                                   HYPRE_Int            point_type,
+                                   HYPRE_Int           *CF_marker,
+                                   HYPRE_Int            diag_type,
+                                   hypre_ParCSRMatrix **B_ptr )
+{
+#if defined (HYPRE_USING_GPU)
+   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_ParCSRMatrixMemoryLocation(A) );
 
-  //   if (debug_flag==4) wall_time = time_getWallclockSeconds();
+   if (exec == HYPRE_EXEC_DEVICE)
+   {
+      hypre_ParCSRMatrixBlockDiagMatrixDevice(A, blk_size, point_type,
+                                              CF_marker, diag_type, B_ptr);
+   }
+   else
+#endif
+   {
+      hypre_ParCSRMatrixBlockDiagMatrixHost(A, blk_size, point_type,
+                                            CF_marker, diag_type, B_ptr);
+   }
 
-  /*-----------------------------------------------------------------------
-  *  First Pass: Determine size of B and fill in
-  *-----------------------------------------------------------------------*/
+   return hypre_error_flag;
+}
 
-  B_diag_i    = hypre_CTAlloc(HYPRE_Int,  n+1, HYPRE_MEMORY_HOST);
-  B_diag_j    = hypre_CTAlloc(HYPRE_Int,  inv_size, HYPRE_MEMORY_HOST);
-  B_diag_data = hypre_CTAlloc(HYPRE_Real,  inv_size, HYPRE_MEMORY_HOST);
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixBlockDiagMatrixHost
+ *--------------------------------------------------------------------------*/
 
-  B_diag_i[n] = inv_size;
+HYPRE_Int
+hypre_ParCSRMatrixBlockDiagMatrixHost( hypre_ParCSRMatrix  *A,
+                                       HYPRE_Int            blk_size,
+                                       HYPRE_Int            point_type,
+                                       HYPRE_Int           *CF_marker,
+                                       HYPRE_Int            diag_type,
+                                       hypre_ParCSRMatrix **B_ptr )
+{
+   /* Input matrix info */
+   MPI_Comm              comm            = hypre_ParCSRMatrixComm(A);
+   HYPRE_BigInt         *row_starts_A    = hypre_ParCSRMatrixRowStarts(A);
+   HYPRE_BigInt          num_rows_A      = hypre_ParCSRMatrixGlobalNumRows(A);
+   hypre_CSRMatrix      *A_diag          = hypre_ParCSRMatrixDiag(A);
+   HYPRE_Int             A_diag_num_rows = hypre_CSRMatrixNumRows(A_diag);
+
+   /* Global block matrix info */
+   hypre_ParCSRMatrix   *par_B;
+   HYPRE_BigInt          num_rows_B;
+   HYPRE_BigInt          row_starts_B[2];
+
+   /* Diagonal block matrix info */
+   hypre_CSRMatrix      *B_diag;
+   HYPRE_Int             B_diag_num_rows = 0;
+   HYPRE_Int             B_diag_size;
+   HYPRE_Int            *B_diag_i;
+   HYPRE_Int            *B_diag_j;
+   HYPRE_Complex        *B_diag_data;
+
+   /* Local variables */
+   HYPRE_BigInt          num_rows_big;
+   HYPRE_BigInt          scan_recv;
+   HYPRE_Int             num_procs, my_id;
+   HYPRE_Int             nb2 = blk_size * blk_size;
+   HYPRE_Int             num_blocks, num_left;
+   HYPRE_Int             bidx, i, j, k;
 
-  //B_offd_i    = hypre_CTAlloc(HYPRE_Int,  n+1, HYPRE_MEMORY_HOST);
-  //B_offd_j    = hypre_CTAlloc(HYPRE_Int,  1, HYPRE_MEMORY_HOST);
-  //B_offd_data = hypre_CTAlloc(HYPRE_Real, 1, HYPRE_MEMORY_HOST);
+   hypre_MPI_Comm_rank(comm, &my_id);
+   hypre_MPI_Comm_size(comm, &num_procs);
 
-  //B_offd_i[n] = 1;
-  /*-----------------------------------------------------------------
-  * Get all the diagonal sub-blocks
-  *-----------------------------------------------------------------*/
-  diaginv = hypre_CTAlloc(HYPRE_Real,  nb2, HYPRE_MEMORY_HOST);
-  //printf("n_block = %d\n",n_block);
-  for (i = 0;i < n_block; i++)
-  {
-    bidxm1 = i*blk_size;
-    bidxp1 = (i+1)*blk_size;
+   /* Sanity check */
+   if ((num_rows_A > 0) && (num_rows_A < blk_size))
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Error!!! Input matrix is smaller than block size.");
+      return hypre_error_flag;
+   }
 
-    for (k = 0;k < blk_size; k++)
-    {
-      for (j = 0;j < blk_size; j++)
-      {
-        bidx = k*blk_size + j;
-        diaginv[bidx] = 0.0;
-      }
+   /*-----------------------------------------------------------------
+    * Count the number of points matching point_type in CF_marker
+    *-----------------------------------------------------------------*/
 
-      for (ii = A_diag_i[bidxm1+k]; ii < A_diag_i[bidxm1+k+1]; ii++)
+   if (CF_marker == NULL)
+   {
+      B_diag_num_rows = A_diag_num_rows;
+   }
+   else
+   {
+#if !defined(_MSC_VER) && defined(HYPRE_USING_OPENMP)
+      #pragma omp parallel for private(i) reduction(+:B_diag_num_rows) HYPRE_SMP_SCHEDULE
+#endif
+      for (i = 0; i < A_diag_num_rows; i++)
       {
-        jj = A_diag_j[ii];
-        if (jj >= bidxm1 && jj < bidxp1 && fabs(A_diag_data[ii]) > SMALLREAL)
-        {
-           bidx = k*blk_size + jj - bidxm1;
-           //printf("jj = %d,val = %e, bidx = %d\n",jj,A_diag_data[ii],bidx);
-           diaginv[bidx] = A_diag_data[ii];
-        }
+         B_diag_num_rows += (CF_marker[i] == point_type) ? 1 : 0;
       }
-    }
+   }
+   num_blocks  = B_diag_num_rows / blk_size;
+   num_left    = B_diag_num_rows - num_blocks * blk_size;
+   B_diag_size = blk_size * (blk_size * num_blocks) + num_left * num_left;
 
-    /* for (k = 0;k < blk_size; k++) */
-    /* { */
-    /*    for (j = 0;j < blk_size; j++) */
-    /*    { */
-    /*       bidx = k*blk_size + j; */
-    /*       printf("diaginv[%d] = %e\n",bidx,diaginv[bidx]); */
-    /*    } */
-    /* } */
+   /*-----------------------------------------------------------------
+    * Compute global number of rows and partitionings
+    *-----------------------------------------------------------------*/
 
-    hypre_blas_mat_inv(diaginv, blk_size);
+   if (CF_marker)
+   {
+      num_rows_big = (HYPRE_BigInt) B_diag_num_rows;
+      hypre_MPI_Scan(&num_rows_big, &scan_recv, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
 
-    for (k = 0;k < blk_size; k++)
-    {
-      B_diag_i[i*blk_size+k] = i*nb2 + k*blk_size;
-      //B_offd_i[i*nb2+k] = 0;
+      /* first point in my range */
+      row_starts_B[0] = scan_recv - num_rows_big;
 
-      for (j = 0;j < blk_size; j++)
+      /* first point in next proc's range */
+      row_starts_B[1] = scan_recv;
+      if (my_id == (num_procs - 1))
       {
-        bidx = i*nb2 + k*blk_size + j;
-        B_diag_j[bidx] = i*blk_size + j;
-        B_diag_data[bidx] = diaginv[k*blk_size + j];
+         num_rows_B = row_starts_B[1];
       }
-    }
-  }
-
-  //printf("Before create\n");
-  B = hypre_ParCSRMatrixCreate(comm,
-                        hypre_ParCSRMatrixGlobalNumRows(A),
-                        hypre_ParCSRMatrixGlobalNumCols(A),
-                        hypre_ParCSRMatrixRowStarts(A),
-                        hypre_ParCSRMatrixColStarts(A),
-                        0,
-                        inv_size,
-                       0);
-  //printf("After create\n");
-  B_diag = hypre_ParCSRMatrixDiag(B);
-  hypre_CSRMatrixData(B_diag) = B_diag_data;
-  hypre_CSRMatrixI(B_diag) = B_diag_i;
-  hypre_CSRMatrixJ(B_diag) = B_diag_j;
-  B_offd = hypre_ParCSRMatrixOffd(B);
-  hypre_CSRMatrixData(B_offd) = NULL;
-  hypre_CSRMatrixI(B_offd) = NULL;
-  hypre_CSRMatrixJ(B_offd) = NULL;
-
-  *B_ptr = B;
-
-  return(block_scaling_error);
-}
-
-HYPRE_Int hypre_blockRelax_solve (hypre_ParCSRMatrix *A,
-                       hypre_ParVector    *f,
-                       hypre_ParVector    *u,
-                       HYPRE_Real         blk_size,
-                       HYPRE_Int           n_block,
-                       HYPRE_Int           left_size,
-                HYPRE_Int          method,
-                       HYPRE_Real         *diaginv,
-                       hypre_ParVector    *Vtemp)
-{
-  MPI_Comm      comm = hypre_ParCSRMatrixComm(A);
-  hypre_CSRMatrix *A_diag = hypre_ParCSRMatrixDiag(A);
-  HYPRE_Real      *A_diag_data  = hypre_CSRMatrixData(A_diag);
-  HYPRE_Int       *A_diag_i     = hypre_CSRMatrixI(A_diag);
-  HYPRE_Int       *A_diag_j     = hypre_CSRMatrixJ(A_diag);
-  hypre_CSRMatrix *A_offd = hypre_ParCSRMatrixOffd(A);
-  HYPRE_Int       *A_offd_i     = hypre_CSRMatrixI(A_offd);
-  HYPRE_Real      *A_offd_data  = hypre_CSRMatrixData(A_offd);
-  HYPRE_Int       *A_offd_j     = hypre_CSRMatrixJ(A_offd);
-  hypre_ParCSRCommPkg  *comm_pkg = hypre_ParCSRMatrixCommPkg(A);
-  hypre_ParCSRCommHandle *comm_handle;
-
-  HYPRE_Int        n       = hypre_CSRMatrixNumRows(A_diag);
-  HYPRE_Int        num_cols_offd = hypre_CSRMatrixNumCols(A_offd);
-
-  hypre_Vector    *u_local = hypre_ParVectorLocalVector(u);
-  HYPRE_Real      *u_data  = hypre_VectorData(u_local);
-
-  hypre_Vector    *f_local = hypre_ParVectorLocalVector(f);
-  HYPRE_Real      *f_data  = hypre_VectorData(f_local);
-
-  hypre_Vector    *Vtemp_local = hypre_ParVectorLocalVector(Vtemp);
-  HYPRE_Real      *Vtemp_data = hypre_VectorData(Vtemp_local);
-  HYPRE_Real      *Vext_data = NULL;
-  HYPRE_Real      *v_buf_data;
-
-  HYPRE_Int        i, j, k;
-  HYPRE_Int        ii, jj;
-  HYPRE_Int        bidx,bidx1;
-  HYPRE_Int        relax_error = 0;
-  HYPRE_Int        num_sends;
-  HYPRE_Int        index, start;
-  HYPRE_Int        num_procs, my_id;
-  HYPRE_Real      *res;
-
-  const HYPRE_Int  nb2 = blk_size*blk_size;
-
-  hypre_MPI_Comm_size(comm,&num_procs);
-  hypre_MPI_Comm_rank(comm,&my_id);
-  //   HYPRE_Int num_threads = hypre_NumThreads();
-
-  res = hypre_CTAlloc(HYPRE_Real,  blk_size, HYPRE_MEMORY_HOST);
-
-  if (!comm_pkg)
-  {
-    hypre_MatvecCommPkgCreate(A);
-    comm_pkg = hypre_ParCSRMatrixCommPkg(A);
-  }
+      hypre_MPI_Bcast(&num_rows_B, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
+   }
+   else
+   {
+      row_starts_B[0] = row_starts_A[0];
+      row_starts_B[1] = row_starts_A[1];
+      num_rows_B = num_rows_A;
+   }
 
-  if (num_procs > 1)
-  {
-    num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
+   /* Create matrix B */
+   par_B = hypre_ParCSRMatrixCreate(comm,
+                                    num_rows_B,
+                                    num_rows_B,
+                                    row_starts_B,
+                                    row_starts_B,
+                                    0,
+                                    B_diag_size,
+                                    0);
+   hypre_ParCSRMatrixInitialize_v2(par_B, HYPRE_MEMORY_HOST);
+   B_diag      = hypre_ParCSRMatrixDiag(par_B);
+   B_diag_i    = hypre_CSRMatrixI(B_diag);
+   B_diag_j    = hypre_CSRMatrixJ(B_diag);
+   B_diag_data = hypre_CSRMatrixData(B_diag);
 
-    v_buf_data = hypre_CTAlloc(HYPRE_Real,
-                         hypre_ParCSRCommPkgSendMapStart(comm_pkg,  num_sends), HYPRE_MEMORY_HOST);
+   /*-----------------------------------------------------------------------
+    * Extract coefficients
+    *-----------------------------------------------------------------------*/
 
-    Vext_data = hypre_CTAlloc(HYPRE_Real, num_cols_offd, HYPRE_MEMORY_HOST);
+   hypre_ParCSRMatrixExtractBlockDiagHost(A, blk_size, B_diag_num_rows,
+                                          point_type, CF_marker,
+                                          B_diag_size, diag_type,
+                                          B_diag_data);
 
-    if (num_cols_offd)
-    {
-      A_offd_j = hypre_CSRMatrixJ(A_offd);
-      A_offd_data = hypre_CSRMatrixData(A_offd);
-    }
+   /*-----------------------------------------------------------------
+    * Set row/col indices of diagonal blocks
+    *-----------------------------------------------------------------*/
 
-    index = 0;
-    for (i = 0; i < num_sends; i++)
-    {
-      start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-      for (j=start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
-        v_buf_data[index++]
-                  = u_data[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
-    }
+   B_diag_i[B_diag_num_rows] = B_diag_size;
+   for (i = 0; i < num_blocks; i++)
+   {
+      //diag_local = &diag[i * nb2];
+      for (k = 0; k < blk_size; k++)
+      {
+         B_diag_i[i * blk_size + k] = i * nb2 + k * blk_size;
 
-    comm_handle = hypre_ParCSRCommHandleCreate( 1, comm_pkg, v_buf_data,
-                                     Vext_data);
-  }
+         for (j = 0; j < blk_size; j++)
+         {
+            bidx = i * nb2 + k * blk_size + j;
+            B_diag_j[bidx] = i * blk_size + j;
+            //B_diag_data[bidx] = diag_local[k * blk_size + j];
+         }
+      }
+   }
 
-  /*-----------------------------------------------------------------
-  * Copy current approximation into temporary vector.
-  *-----------------------------------------------------------------*/
+   /*-----------------------------------------------------------------
+    * Treat the remaining points
+    *-----------------------------------------------------------------*/
 
-#if 0
-#ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
-#endif
-#endif
-  for (i = 0; i < n; i++)
-  {
-    Vtemp_data[i] = u_data[i];
-    //printf("u_old[%d] = %e\n",i,Vtemp_data[i]);
-  }
-  if (num_procs > 1)
-  {
-    hypre_ParCSRCommHandleDestroy(comm_handle);
-    comm_handle = NULL;
-  }
+   //diag_local = &diag[num_blocks * nb2];
+   for (k = 0; k < num_left; k++)
+   {
+      B_diag_i[num_blocks * blk_size + k] = num_blocks * nb2 + k * num_left;
 
-  /*-----------------------------------------------------------------
-  * Relax points block by block
-  *-----------------------------------------------------------------*/
-  for (i = 0;i < n_block; i++)
-  {
-    for (j = 0;j < blk_size; j++)
-    {
-      bidx = i*blk_size +j;
-      res[j] = f_data[bidx];
-      for (jj = A_diag_i[bidx]; jj < A_diag_i[bidx+1]; jj++)
-      {
-        ii = A_diag_j[jj];
-        if (method == 0)
-        {
-          // Jacobi for diagonal part
-          res[j] -= A_diag_data[jj] * Vtemp_data[ii];
-        }
-        else if (method == 1)
-        {
-          // Gauss-Seidel for diagonal part
-          res[j] -= A_diag_data[jj] * u_data[ii];
-        }
-        else
-        {
-          // Default do Jacobi for diagonal part
-          res[j] -= A_diag_data[jj] * Vtemp_data[ii];
-        }
-          //printf("%d: Au= %e * %e =%e\n",ii,A_diag_data[jj],Vtemp_data[ii], res[j]);
-      }
-      for (jj = A_offd_i[bidx]; jj < A_offd_i[bidx+1]; jj++)
+      for (j = 0; j < num_left; j++)
       {
-        // always do Jacobi for off-diagonal part
-        ii = A_offd_j[jj];
-        res[j] -= A_offd_data[jj] * Vext_data[ii];
+         bidx = num_blocks * nb2 + k * num_left + j;
+         B_diag_j[bidx] = num_blocks * blk_size + j;
+         //B_diag_data[bidx] = diag_local[k * num_left + j];
       }
-      //printf("%d: res = %e\n",bidx,res[j]);
-    }
+   }
 
-    for (j = 0;j < blk_size; j++)
-    {
-       bidx1 = i*blk_size +j;
-       for (k = 0;k < blk_size; k++)
-       {
-          bidx  = i*nb2 +j*blk_size+k;
-          u_data[bidx1] += res[k]*diaginv[bidx];
-          //printf("u[%d] = %e, diaginv[%d] = %e\n",bidx1,u_data[bidx1],bidx,diaginv[bidx]);
-       }
-       //printf("u[%d] = %e\n",bidx1,u_data[bidx1]);
-    }
-  }
+   /* Set output pointer */
+   *B_ptr = par_B;
 
-  if (num_procs > 1)
-  {
-  hypre_TFree(Vext_data, HYPRE_MEMORY_HOST);
-  hypre_TFree(v_buf_data, HYPRE_MEMORY_HOST);
-  }
-  hypre_TFree(res, HYPRE_MEMORY_HOST);
-  return(relax_error);
+   return hypre_error_flag;
 }
 
-HYPRE_Int hypre_block_gs (hypre_ParCSRMatrix *A,
-                hypre_ParVector    *f,
-                hypre_ParVector    *u,
-                HYPRE_Real         blk_size,
-                HYPRE_Int           n_block,
-                HYPRE_Int           left_size,
-                HYPRE_Real          *diaginv,
-                hypre_ParVector    *Vtemp)
+/*--------------------------------------------------------------------------
+ * hypre_MGRBlockRelaxSetup
+ *
+ * Setup block smoother. Computes the entries of the inverse of the block
+ * diagonal matrix with blk_size diagonal blocks.
+ *
+ * Current implementation ignores reserved C-pts and acts on whole matrix.
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_MGRBlockRelaxSetup( hypre_ParCSRMatrix *A,
+                          HYPRE_Int           blk_size,
+                          HYPRE_Real        **diaginvptr )
 {
-  MPI_Comm     comm = hypre_ParCSRMatrixComm(A);
-  hypre_CSRMatrix *A_diag = hypre_ParCSRMatrixDiag(A);
-  HYPRE_Real     *A_diag_data  = hypre_CSRMatrixData(A_diag);
-  HYPRE_Int            *A_diag_i     = hypre_CSRMatrixI(A_diag);
-  HYPRE_Int            *A_diag_j     = hypre_CSRMatrixJ(A_diag);
-  hypre_CSRMatrix *A_offd = hypre_ParCSRMatrixOffd(A);
-  HYPRE_Int            *A_offd_i     = hypre_CSRMatrixI(A_offd);
-  HYPRE_Real     *A_offd_data  = hypre_CSRMatrixData(A_offd);
-  HYPRE_Int            *A_offd_j     = hypre_CSRMatrixJ(A_offd);
-  hypre_ParCSRCommPkg  *comm_pkg = hypre_ParCSRMatrixCommPkg(A);
-  hypre_ParCSRCommHandle *comm_handle;
-
-  HYPRE_Int             n       = hypre_CSRMatrixNumRows(A_diag);
-  HYPRE_Int             num_cols_offd = hypre_CSRMatrixNumCols(A_offd);
-
-  hypre_Vector   *u_local = hypre_ParVectorLocalVector(u);
-  HYPRE_Real     *u_data  = hypre_VectorData(u_local);
-
-  hypre_Vector   *f_local = hypre_ParVectorLocalVector(f);
-  HYPRE_Real     *f_data  = hypre_VectorData(f_local);
-
-  hypre_Vector   *Vtemp_local = hypre_ParVectorLocalVector(Vtemp);
-  HYPRE_Real    *Vtemp_data = hypre_VectorData(Vtemp_local);
-  HYPRE_Real    *Vext_data = NULL;
-  HYPRE_Real    *v_buf_data;
-
-  HYPRE_Int             i, j, k;
-  HYPRE_Int             ii, jj;
-  HYPRE_Int             bidx,bidx1;
-  HYPRE_Int             relax_error = 0;
-  HYPRE_Int      num_sends;
-  HYPRE_Int      index, start;
-  HYPRE_Int      num_procs, my_id;
-  HYPRE_Real      *res;
-
-  const HYPRE_Int     nb2 = blk_size*blk_size;
-
-  hypre_MPI_Comm_size(comm,&num_procs);
-  hypre_MPI_Comm_rank(comm,&my_id);
-  //HYPRE_Int num_threads = hypre_NumThreads();
-
-  res = hypre_CTAlloc(HYPRE_Real,  blk_size, HYPRE_MEMORY_HOST);
-
-  if (!comm_pkg)
-  {
-    hypre_MatvecCommPkgCreate(A);
-    comm_pkg = hypre_ParCSRMatrixCommPkg(A);
-  }
+   hypre_CSRMatrix      *A_diag   = hypre_ParCSRMatrixDiag(A);
+   HYPRE_Int             num_rows = hypre_CSRMatrixNumRows(A_diag);
 
-  if (num_procs > 1)
-  {
-    num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
+   HYPRE_Int             num_blocks;
+   HYPRE_Int             diag_size;
+   HYPRE_Complex        *diaginv = *diaginvptr;
 
-    v_buf_data = hypre_CTAlloc(HYPRE_Real,
-                   hypre_ParCSRCommPkgSendMapStart(comm_pkg,  num_sends), HYPRE_MEMORY_HOST);
+   num_blocks = 1 + (num_rows - 1) / blk_size;
+   diag_size  = blk_size * (blk_size * num_blocks);
 
-    Vext_data = hypre_CTAlloc(HYPRE_Real, num_cols_offd, HYPRE_MEMORY_HOST);
+   hypre_TFree(diaginv, HYPRE_MEMORY_HOST);
+   diaginv = hypre_CTAlloc(HYPRE_Complex, diag_size, HYPRE_MEMORY_HOST);
 
-    if (num_cols_offd)
-    {
-      A_offd_j = hypre_CSRMatrixJ(A_offd);
-      A_offd_data = hypre_CSRMatrixData(A_offd);
-    }
+   hypre_ParCSRMatrixExtractBlockDiagHost(A, blk_size, num_rows, 0, NULL,
+                                          diag_size, 1, diaginv);
 
-    index = 0;
-    for (i = 0; i < num_sends; i++)
-    {
-      start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-      for (j=start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
-        v_buf_data[index++]
-              = u_data[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
-    }
+   *diaginvptr = diaginv;
 
-    comm_handle = hypre_ParCSRCommHandleCreate( 1, comm_pkg, v_buf_data,
-                          Vext_data);
-  }
+#if 0
+   MPI_Comm      comm = hypre_ParCSRMatrixComm(A);
+   hypre_CSRMatrix *A_diag = hypre_ParCSRMatrixDiag(A);
+   HYPRE_Real     *A_diag_data  = hypre_CSRMatrixData(A_diag);
+   HYPRE_Int            *A_diag_i     = hypre_CSRMatrixI(A_diag);
+   HYPRE_Int            *A_diag_j     = hypre_CSRMatrixJ(A_diag);
+   HYPRE_Int             n       = hypre_CSRMatrixNumRows(A_diag);
 
-  /*-----------------------------------------------------------------
-   * Copy current approximation into temporary vector.
-   *-----------------------------------------------------------------*/
+   HYPRE_Int             i, j, k;
+   HYPRE_Int             ii, jj;
+   HYPRE_Int             bidx, bidxm1, bidxp1;
+   HYPRE_Int         num_procs, my_id;
 
-#if 0
-#ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
-#endif
-#endif
-  for (i = 0; i < n; i++)
-  {
-    Vtemp_data[i] = u_data[i];
-    //printf("u_old[%d] = %e\n",i,Vtemp_data[i]);
-  }
-  if (num_procs > 1)
-  {
-    hypre_ParCSRCommHandleDestroy(comm_handle);
-    comm_handle = NULL;
-  }
+   const HYPRE_Int     nb2 = blk_size * blk_size;
+   HYPRE_Int           n_block;
+   HYPRE_Int           left_size, inv_size;
+   HYPRE_Real        *diaginv = *diaginvptr;
 
-  /*-----------------------------------------------------------------
-   * Relax points block by block
-   *-----------------------------------------------------------------*/
-  for (i = 0;i < n_block; i++)
-  {
-    for (j = 0;j < blk_size; j++)
-    {
-      bidx = i*blk_size +j;
-      res[j] = f_data[bidx];
-      for (jj = A_diag_i[bidx]; jj < A_diag_i[bidx+1]; jj++)
-      {
-        ii = A_diag_j[jj];
-        //res[j] -= A_diag_data[jj] * Vtemp_data[ii];
-        //printf("my_id = %d, %d: Au = %e * %e\n",my_id,ii,A_diag_data[jj],Vtemp_data[ii]);
-        res[j] -= A_diag_data[jj] * u_data[ii];
-        //printf("%d: Au= %e * %e =%e\n",ii,A_diag_data[jj],Vtemp_data[ii], res[j]);
-      }
-      for (jj = A_offd_i[bidx]; jj < A_offd_i[bidx+1]; jj++)
-      {
-        ii = A_offd_j[jj];
-        res[j] -= A_offd_data[jj] * Vext_data[ii];
-      }
-      //printf("%d: res = %e\n",bidx,res[j]);
-    }
 
-    for (j = 0;j < blk_size; j++)
-    {
-       bidx1 = i*blk_size +j;
-       for (k = 0;k < blk_size; k++)
-       {
-          bidx  = i*nb2 +j*blk_size+k;
-          u_data[bidx1] += res[k]*diaginv[bidx];
-          //printf("u[%d] = %e, diaginv[%d] = %e\n",bidx1,u_data[bidx1],bidx,diaginv[bidx]);
-       }
-       //printf("u[%d] = %e\n",bidx1,u_data[bidx1]);
-    }
-  }
+   hypre_MPI_Comm_size(comm, &num_procs);
+   hypre_MPI_Comm_rank(comm, &my_id);
+   //HYPRE_Int num_threads = hypre_NumThreads();
 
-  if (num_procs > 1)
-  {
-  hypre_TFree(Vext_data, HYPRE_MEMORY_HOST);
-  hypre_TFree(v_buf_data, HYPRE_MEMORY_HOST);
-  }
-  hypre_TFree(res, HYPRE_MEMORY_HOST);
-  return(relax_error);
-}
+   if (my_id == num_procs)
+   {
+      n_block   = (n - reserved_coarse_size) / blk_size;
+      left_size = n - blk_size * n_block;
+   }
+   else
+   {
+      n_block = n / blk_size;
+      left_size = n - blk_size * n_block;
+   }
 
-/*Block smoother*/
-HYPRE_Int
-hypre_blockRelax_setup(hypre_ParCSRMatrix *A,
-                  HYPRE_Int          blk_size,
-                  HYPRE_Int          reserved_coarse_size,
-                  HYPRE_Real        **diaginvptr)
-{
-  MPI_Comm      comm = hypre_ParCSRMatrixComm(A);
-  hypre_CSRMatrix *A_diag = hypre_ParCSRMatrixDiag(A);
-  HYPRE_Real     *A_diag_data  = hypre_CSRMatrixData(A_diag);
-  HYPRE_Int            *A_diag_i     = hypre_CSRMatrixI(A_diag);
-  HYPRE_Int            *A_diag_j     = hypre_CSRMatrixJ(A_diag);
-  HYPRE_Int             n       = hypre_CSRMatrixNumRows(A_diag);
-
-  HYPRE_Int             i, j,k;
-  HYPRE_Int             ii, jj;
-  HYPRE_Int             bidx,bidxm1,bidxp1;
-  HYPRE_Int         num_procs, my_id;
-
-  const HYPRE_Int     nb2 = blk_size*blk_size;
-  HYPRE_Int           n_block;
-  HYPRE_Int           left_size,inv_size;
-  HYPRE_Real        *diaginv = *diaginvptr;
-
-
-  hypre_MPI_Comm_size(comm,&num_procs);
-  hypre_MPI_Comm_rank(comm,&my_id);
-  //HYPRE_Int num_threads = hypre_NumThreads();
-
-  if (my_id == num_procs)
-  {
-    n_block   = (n - reserved_coarse_size) / blk_size;
-    left_size = n - blk_size*n_block;
-  }
-  else
-  {
-    n_block = n / blk_size;
-    left_size = n - blk_size*n_block;
-  }
+   n_block = n / blk_size;
+   left_size = n - blk_size * n_block;
 
-  inv_size  = nb2*n_block + left_size*left_size;
+   inv_size  = nb2 * n_block + left_size * left_size;
 
-  if (diaginv !=NULL)
-  {
-  hypre_TFree(diaginv, HYPRE_MEMORY_HOST);
-    diaginv = hypre_CTAlloc(HYPRE_Real,  inv_size, HYPRE_MEMORY_HOST);
-  }
-  else {
-    diaginv = hypre_CTAlloc(HYPRE_Real,  inv_size, HYPRE_MEMORY_HOST);
-  }
+   if (diaginv != NULL)
+   {
+      hypre_TFree(diaginv, HYPRE_MEMORY_HOST);
+      diaginv = hypre_CTAlloc(HYPRE_Real,  inv_size, HYPRE_MEMORY_HOST);
+   }
+   else
+   {
+      diaginv = hypre_CTAlloc(HYPRE_Real,  inv_size, HYPRE_MEMORY_HOST);
+   }
+
+   /*-----------------------------------------------------------------
+   * Get all the diagonal sub-blocks
+   *-----------------------------------------------------------------*/
+   for (i = 0; i < n_block; i++)
+   {
+      bidxm1 = i * blk_size;
+      bidxp1 = (i + 1) * blk_size;
+      //printf("bidxm1 = %d,bidxp1 = %d\n",bidxm1,bidxp1);
 
-  /*-----------------------------------------------------------------
-  * Get all the diagonal sub-blocks
-  *-----------------------------------------------------------------*/
-  for (i = 0;i < n_block; i++)
-  {
-    bidxm1 = i*blk_size;
-    bidxp1 = (i+1)*blk_size;
-    //printf("bidxm1 = %d,bidxp1 = %d\n",bidxm1,bidxp1);
-
-    for (k = 0;k < blk_size; k++)
-    {
-      for (j = 0;j < blk_size; j++)
+      for (k = 0; k < blk_size; k++)
       {
-        bidx = i*nb2 + k*blk_size + j;
-        diaginv[bidx] = 0.0;
+         for (j = 0; j < blk_size; j++)
+         {
+            bidx = i * nb2 + k * blk_size + j;
+            diaginv[bidx] = 0.0;
+         }
+
+         for (ii = A_diag_i[bidxm1 + k]; ii < A_diag_i[bidxm1 + k + 1]; ii++)
+         {
+            jj = A_diag_j[ii];
+            if (jj >= bidxm1 && jj < bidxp1 && hypre_cabs(A_diag_data[ii]) > HYPRE_REAL_MIN)
+            {
+               bidx = i * nb2 + k * blk_size + jj - bidxm1;
+               //printf("jj = %d,val = %e, bidx = %d\n",jj,A_diag_data[ii],bidx);
+               diaginv[bidx] = A_diag_data[ii];
+            }
+         }
       }
+   }
 
-      for (ii = A_diag_i[bidxm1+k]; ii < A_diag_i[bidxm1+k+1]; ii++)
+   for (i = 0; i < left_size; i++)
+   {
+      bidxm1 = n_block * nb2 + i * blk_size;
+      bidxp1 = n_block * nb2 + (i + 1) * blk_size;
+      for (j = 0; j < left_size; j++)
       {
-        jj = A_diag_j[ii];
-        if (jj >= bidxm1 && jj < bidxp1 && fabs(A_diag_data[ii]) > SMALLREAL)
-        {
-          bidx = i*nb2 + k*blk_size + jj - bidxm1;
-          //printf("jj = %d,val = %e, bidx = %d\n",jj,A_diag_data[ii],bidx);
-          diaginv[bidx] = A_diag_data[ii];
-        }
+         bidx = n_block * nb2 + i * blk_size + j;
+         diaginv[bidx] = 0.0;
       }
-    }
-  }
 
-  for (i = 0;i < left_size; i++)
-  {
-    bidxm1 =n_block*nb2 + i*blk_size;
-    bidxp1 =n_block*nb2 + (i+1)*blk_size;
-    for (j = 0;j < left_size; j++)
-    {
-      bidx = n_block*nb2 + i*blk_size +j;
-      diaginv[bidx] = 0.0;
-    }
-
-    for (ii = A_diag_i[n_block*blk_size + i]; ii < A_diag_i[n_block*blk_size+i+1]; ii++)
-    {
-      jj = A_diag_j[ii];
-      if (jj > n_block*blk_size)
+      for (ii = A_diag_i[n_block * blk_size + i]; ii < A_diag_i[n_block * blk_size + i + 1]; ii++)
       {
-        bidx = n_block*nb2 + i*blk_size + jj - n_block*blk_size;
-        diaginv[bidx] = A_diag_data[ii];
+         jj = A_diag_j[ii];
+         if (jj > n_block * blk_size)
+         {
+            bidx = n_block * nb2 + i * blk_size + jj - n_block * blk_size;
+            diaginv[bidx] = A_diag_data[ii];
+         }
       }
-    }
-  }
-
-
-  /*-----------------------------------------------------------------
-  * compute the inverses of all the diagonal sub-blocks
-  *-----------------------------------------------------------------*/
-  if (blk_size > 1)
-  {
-    for (i = 0;i < n_block; i++)
-    {
-      hypre_blas_mat_inv(diaginv+i*nb2, blk_size);
-    }
-    hypre_blas_mat_inv(diaginv+(HYPRE_Int)(blk_size*nb2),left_size);
-  }
-  else
-  {
-    for (i = 0;i < n; i++)
-    {
-      // FIX-ME: zero-diagonal should be tested previously
-      if (fabs(diaginv[i]) < SMALLREAL)
-        diaginv[i] = 0.0;
-      else
-        diaginv[i] = 1.0 / diaginv[i];
-    }
-  }
+   }
 
-  *diaginvptr = diaginv;
+   /*-----------------------------------------------------------------
+   * compute the inverses of all the diagonal sub-blocks
+   *-----------------------------------------------------------------*/
+   if (blk_size > 1)
+   {
+      for (i = 0; i < n_block; i++)
+      {
+         hypre_blas_mat_inv(diaginv + i * nb2, blk_size);
+      }
+      hypre_blas_mat_inv(diaginv + (HYPRE_Int)(blk_size * nb2), left_size);
+   }
+   else
+   {
+      for (i = 0; i < n; i++)
+      {
+         /* TODO: zero-diagonal should be tested previously */
+         if (hypre_cabs(diaginv[i]) < HYPRE_REAL_MIN)
+         {
+            diaginv[i] = 0.0;
+         }
+         else
+         {
+            diaginv[i] = 1.0 / diaginv[i];
+         }
+      }
+   }
 
-  return 1;
+   *diaginvptr = diaginv;
+#endif
+   return hypre_error_flag;
 }
-
+#if 0
 HYPRE_Int
 hypre_blockRelax(hypre_ParCSRMatrix *A,
-             hypre_ParVector    *f,
-             hypre_ParVector    *u,
-             HYPRE_Int          blk_size,
-             HYPRE_Int          reserved_coarse_size,
-             HYPRE_Int          method,
-             hypre_ParVector    *Vtemp,
-             hypre_ParVector    *Ztemp)
+                 hypre_ParVector    *f,
+                 hypre_ParVector    *u,
+                 HYPRE_Int          blk_size,
+                 HYPRE_Int          reserved_coarse_size,
+                 HYPRE_Int          method,
+                 hypre_ParVector    *Vtemp,
+                 hypre_ParVector    *Ztemp)
 {
-  MPI_Comm      comm = hypre_ParCSRMatrixComm(A);
-  hypre_CSRMatrix *A_diag = hypre_ParCSRMatrixDiag(A);
-  HYPRE_Real     *A_diag_data  = hypre_CSRMatrixData(A_diag);
-  HYPRE_Int            *A_diag_i     = hypre_CSRMatrixI(A_diag);
-  HYPRE_Int            *A_diag_j     = hypre_CSRMatrixJ(A_diag);
-  HYPRE_Int             n       = hypre_CSRMatrixNumRows(A_diag);
+   MPI_Comm      comm = hypre_ParCSRMatrixComm(A);
+   hypre_CSRMatrix *A_diag = hypre_ParCSRMatrixDiag(A);
+   HYPRE_Real     *A_diag_data  = hypre_CSRMatrixData(A_diag);
+   HYPRE_Int            *A_diag_i     = hypre_CSRMatrixI(A_diag);
+   HYPRE_Int            *A_diag_j     = hypre_CSRMatrixJ(A_diag);
+   HYPRE_Int             n       = hypre_CSRMatrixNumRows(A_diag);
 
-  HYPRE_Int             i, j,k;
-  HYPRE_Int             ii, jj;
+   HYPRE_Int             i, j, k;
+   HYPRE_Int             ii, jj;
 
-  HYPRE_Int             bidx,bidxm1,bidxp1;
-  HYPRE_Int             relax_error = 0;
+   HYPRE_Int             bidx, bidxm1, bidxp1;
 
-  HYPRE_Int         num_procs, my_id;
+   HYPRE_Int         num_procs, my_id;
 
-  const HYPRE_Int     nb2 = blk_size*blk_size;
-  HYPRE_Int           n_block;
-  HYPRE_Int           left_size,inv_size;
-  HYPRE_Real          *diaginv;
+   const HYPRE_Int     nb2 = blk_size * blk_size;
+   HYPRE_Int           n_block;
+   HYPRE_Int           left_size, inv_size;
+   HYPRE_Real          *diaginv;
 
-  hypre_MPI_Comm_size(comm,&num_procs);
-  hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_size(comm, &num_procs);
+   hypre_MPI_Comm_rank(comm, &my_id);
 
-  //HYPRE_Int num_threads = hypre_NumThreads();
+   //HYPRE_Int num_threads = hypre_NumThreads();
 
-  if (my_id == num_procs)
-  {
-    n_block   = (n - reserved_coarse_size) / blk_size;
-    left_size = n - blk_size*n_block;
-  }
-  else
-  {
-    n_block = n / blk_size;
-    left_size = n - blk_size*n_block;
-  }
+   if (my_id == num_procs)
+   {
+      n_block   = (n - reserved_coarse_size) / blk_size;
+      left_size = n - blk_size * n_block;
+   }
+   else
+   {
+      n_block = n / blk_size;
+      left_size = n - blk_size * n_block;
+   }
 
-  inv_size  = nb2*n_block + left_size*left_size;
-
-  diaginv = hypre_CTAlloc(HYPRE_Real,  inv_size, HYPRE_MEMORY_HOST);
-  /*-----------------------------------------------------------------
-  * Get all the diagonal sub-blocks
-  *-----------------------------------------------------------------*/
-  for (i = 0;i < n_block; i++)
-  {
-    bidxm1 = i*blk_size;
-    bidxp1 = (i+1)*blk_size;
-    //printf("bidxm1 = %d,bidxp1 = %d\n",bidxm1,bidxp1);
-
-    for (k = 0;k < blk_size; k++)
-    {
-      for (j = 0;j < blk_size; j++)
+   inv_size  = nb2 * n_block + left_size * left_size;
+
+   diaginv = hypre_CTAlloc(HYPRE_Real,  inv_size, HYPRE_MEMORY_HOST);
+   /*-----------------------------------------------------------------
+   * Get all the diagonal sub-blocks
+   *-----------------------------------------------------------------*/
+   for (i = 0; i < n_block; i++)
+   {
+      bidxm1 = i * blk_size;
+      bidxp1 = (i + 1) * blk_size;
+      //printf("bidxm1 = %d,bidxp1 = %d\n",bidxm1,bidxp1);
+
+      for (k = 0; k < blk_size; k++)
       {
-        bidx = i*nb2 + k*blk_size + j;
-        diaginv[bidx] = 0.0;
+         for (j = 0; j < blk_size; j++)
+         {
+            bidx = i * nb2 + k * blk_size + j;
+            diaginv[bidx] = 0.0;
+         }
+
+         for (ii = A_diag_i[bidxm1 + k]; ii < A_diag_i[bidxm1 + k + 1]; ii++)
+         {
+            jj = A_diag_j[ii];
+
+            if (jj >= bidxm1 && jj < bidxp1 && hypre_abs(A_diag_data[ii]) > HYPRE_REAL_MIN)
+            {
+               bidx = i * nb2 + k * blk_size + jj - bidxm1;
+               //printf("jj = %d,val = %e, bidx = %d\n",jj,A_diag_data[ii],bidx);
+               diaginv[bidx] = A_diag_data[ii];
+            }
+         }
       }
+   }
 
-      for (ii = A_diag_i[bidxm1+k]; ii < A_diag_i[bidxm1+k+1]; ii++)
+   for (i = 0; i < left_size; i++)
+   {
+      bidxm1 = n_block * nb2 + i * blk_size;
+      bidxp1 = n_block * nb2 + (i + 1) * blk_size;
+      for (j = 0; j < left_size; j++)
       {
-        jj = A_diag_j[ii];
-
-        if (jj >= bidxm1 && jj < bidxp1 && fabs(A_diag_data[ii]) > SMALLREAL)
-        {
-          bidx = i*nb2 + k*blk_size + jj - bidxm1;
-          //printf("jj = %d,val = %e, bidx = %d\n",jj,A_diag_data[ii],bidx);
-          diaginv[bidx] = A_diag_data[ii];
-        }
+         bidx = n_block * nb2 + i * blk_size + j;
+         diaginv[bidx] = 0.0;
       }
-    }
-  }
 
-  for (i = 0;i < left_size; i++)
-  {
-    bidxm1 =n_block*nb2 + i*blk_size;
-    bidxp1 =n_block*nb2 + (i+1)*blk_size;
-    for (j = 0;j < left_size; j++)
-    {
-      bidx = n_block*nb2 + i*blk_size +j;
-      diaginv[bidx] = 0.0;
-    }
-
-    for (ii = A_diag_i[n_block*blk_size + i]; ii < A_diag_i[n_block*blk_size+i+1]; ii++)
-    {
-      jj = A_diag_j[ii];
-      if (jj > n_block*blk_size)
+      for (ii = A_diag_i[n_block * blk_size + i]; ii < A_diag_i[n_block * blk_size + i + 1]; ii++)
       {
-        bidx = n_block*nb2 + i*blk_size + jj - n_block*blk_size;
-        diaginv[bidx] = A_diag_data[ii];
+         jj = A_diag_j[ii];
+         if (jj > n_block * blk_size)
+         {
+            bidx = n_block * nb2 + i * blk_size + jj - n_block * blk_size;
+            diaginv[bidx] = A_diag_data[ii];
+         }
       }
-    }
-  }
-  /*
-  for (i = 0;i < n_block; i++)
-  {
-    for (j = 0;j < blk_size; j++)
-    {
-      for (k = 0;k < blk_size; k ++)
+   }
+   /*
+   for (i = 0;i < n_block; i++)
+   {
+     for (j = 0;j < blk_size; j++)
+     {
+       for (k = 0;k < blk_size; k ++)
+       {
+         bidx = i*nb2 + j*blk_size + k;
+         printf("%e\t",diaginv[bidx]);
+       }
+       printf("\n");
+     }
+     printf("\n");
+   }
+   */
+   /*-----------------------------------------------------------------
+   * compute the inverses of all the diagonal sub-blocks
+   *-----------------------------------------------------------------*/
+   if (blk_size > 1)
+   {
+      for (i = 0; i < n_block; i++)
       {
-        bidx = i*nb2 + j*blk_size + k;
-        printf("%e\t",diaginv[bidx]);
+         hypre_blas_mat_inv(diaginv + i * nb2, blk_size);
       }
-      printf("\n");
-    }
-    printf("\n");
-  }
-  */
-  /*-----------------------------------------------------------------
-  * compute the inverses of all the diagonal sub-blocks
-  *-----------------------------------------------------------------*/
-  if (blk_size > 1)
-  {
-    for (i = 0;i < n_block; i++)
-    {
-      hypre_blas_mat_inv(diaginv+i*nb2, blk_size);
-    }
-    hypre_blas_mat_inv(diaginv+(HYPRE_Int)(blk_size*nb2),left_size);
-    /*
-    for (i = 0;i < n_block; i++)
-    {
-      for (j = 0;j < blk_size; j++)
+      hypre_blas_mat_inv(diaginv + (HYPRE_Int)(blk_size * nb2), left_size);
+      /*
+      for (i = 0;i < n_block; i++)
       {
-        for (k = 0;k < blk_size; k ++)
+        for (j = 0;j < blk_size; j++)
         {
-          bidx = i*nb2 + j*blk_size + k;
-          printf("%e\t",diaginv[bidx]);
+          for (k = 0;k < blk_size; k ++)
+          {
+            bidx = i*nb2 + j*blk_size + k;
+            printf("%e\t",diaginv[bidx]);
+          }
+          printf("\n");
         }
         printf("\n");
       }
-      printf("\n");
-    }
-    */
-  }
-  else
-  {
-    for (i = 0;i < n; i++)
-    {
-      // FIX-ME: zero-diagonal should be tested previously
-      if (fabs(diaginv[i]) < SMALLREAL)
-        diaginv[i] = 0.0;
-      else
-        diaginv[i] = 1.0 / diaginv[i];
-    }
-  }
+      */
+   }
+   else
+   {
+      for (i = 0; i < n; i++)
+      {
+         // FIX-ME: zero-diagonal should be tested previously
+         if (hypre_abs(diaginv[i]) < HYPRE_REAL_MIN)
+         {
+            diaginv[i] = 0.0;
+         }
+         else
+         {
+            diaginv[i] = 1.0 / diaginv[i];
+         }
+      }
+   }
 
-  hypre_blockRelax_solve(A,f,u,blk_size,n_block,left_size,method,diaginv,Vtemp);
+   hypre_MGRBlockRelaxSolve(A, f, u, blk_size, n_block, left_size, method, diaginv, Vtemp);
 
-  /*-----------------------------------------------------------------
-  * Free temperary memeory
-  *-----------------------------------------------------------------*/
-  hypre_TFree(diaginv, HYPRE_MEMORY_HOST);
+   /*-----------------------------------------------------------------
+   * Free temporary memory
+   *-----------------------------------------------------------------*/
+   hypre_TFree(diaginv, HYPRE_MEMORY_HOST);
 
-  return(relax_error);
+   return (hypre_error_flag);
 }
+#endif
+
+/*--------------------------------------------------------------------------
+ * hypre_MGRSetFSolver
+ *
+ * set F-relaxation solver
+ *--------------------------------------------------------------------------*/
 
-/* set coarse grid solver */
 HYPRE_Int
 hypre_MGRSetFSolver( void  *mgr_vdata,
-              HYPRE_Int  (*fine_grid_solver_solve)(void*,void*,void*,void*),
-              HYPRE_Int  (*fine_grid_solver_setup)(void*,void*,void*,void*),
-              void       *fsolver )
+                     HYPRE_Int  (*fine_grid_solver_solve)(void*, void*, void*, void*),
+                     HYPRE_Int  (*fine_grid_solver_setup)(void*, void*, void*, void*),
+                     void       *fsolver )
 {
-  hypre_ParMGRData *mgr_data = (hypre_ParMGRData*) mgr_vdata;
+   hypre_ParMGRData *mgr_data = (hypre_ParMGRData*) mgr_vdata;
+   HYPRE_Int         max_num_coarse_levels = (mgr_data -> max_num_coarse_levels);
+   HYPRE_Solver    **aff_solver = (mgr_data -> aff_solver);
 
-  if (!mgr_data)
-  {
-    hypre_error_in_arg(1);
-    return hypre_error_flag;
-  }
-  HYPRE_Int max_num_coarse_levels = (mgr_data -> max_num_coarse_levels);
-  HYPRE_Solver **aff_solver = (mgr_data -> aff_solver);
-
-  if (aff_solver == NULL)
-    aff_solver = hypre_CTAlloc(HYPRE_Solver*, max_num_coarse_levels, HYPRE_MEMORY_HOST);
+   if (aff_solver == NULL)
+   {
+      aff_solver = hypre_CTAlloc(HYPRE_Solver*, max_num_coarse_levels, HYPRE_MEMORY_HOST);
+   }
 
-  /* only allow to set F-solver for the first level */
-  aff_solver[0] = (HYPRE_Solver *) fsolver;
+   /* only allow to set F-solver for the first level */
+   aff_solver[0] = (HYPRE_Solver *) fsolver;
 
-  (mgr_data -> fine_grid_solver_solve) = fine_grid_solver_solve;
-  (mgr_data -> fine_grid_solver_setup) = fine_grid_solver_setup;
-  (mgr_data -> aff_solver) = aff_solver;
-  (mgr_data -> use_default_fsolver) = 0;
+   (mgr_data -> fine_grid_solver_solve) = fine_grid_solver_solve;
+   (mgr_data -> fine_grid_solver_setup) = fine_grid_solver_setup;
+   (mgr_data -> aff_solver) = aff_solver;
+   (mgr_data -> fsolver_mode) = 0;
 
-  return hypre_error_flag;
+   return hypre_error_flag;
 }
 
-/* set coarse grid solver */
+/*--------------------------------------------------------------------------
+ * hypre_MGRSetFSolverAtLevel
+ *
+ * set F-relaxation solver for a given MGR level.
+ *
+ * Note this function asks for a level identifier and doesn't expect an array
+ * of function pointers for each level (as done by SetLevel functions).
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_MGRSetCoarseSolver( void  *mgr_vdata,
-                     HYPRE_Int  (*coarse_grid_solver_solve)(void*,void*,void*,void*),
-                     HYPRE_Int  (*coarse_grid_solver_setup)(void*,void*,void*,void*),
-                     void  *coarse_grid_solver )
+hypre_MGRSetFSolverAtLevel( void       *mgr_vdata,
+                            void       *fsolver,
+                            HYPRE_Int   level )
 {
-  hypre_ParMGRData *mgr_data = (hypre_ParMGRData*) mgr_vdata;
+   hypre_ParMGRData *mgr_data = (hypre_ParMGRData*) mgr_vdata;
+   HYPRE_Int         max_num_coarse_levels = (mgr_data -> max_num_coarse_levels);
+   HYPRE_Solver    **aff_solver = (mgr_data -> aff_solver);
 
-  if (!mgr_data)
-  {
-    hypre_error_in_arg(1);
-    return hypre_error_flag;
-  }
+   /* Check if the requested level makes sense */
+   if (level < 0 || level >= max_num_coarse_levels)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
 
-  (mgr_data -> coarse_grid_solver_solve) = coarse_grid_solver_solve;
-  (mgr_data -> coarse_grid_solver_setup) = coarse_grid_solver_setup;
-  (mgr_data -> coarse_grid_solver)       = (HYPRE_Solver) coarse_grid_solver;
+   /* Allocate aff_solver if needed */
+   if (!aff_solver)
+   {
+      (mgr_data -> aff_solver) = aff_solver = hypre_CTAlloc(HYPRE_Solver*,
+                                                            max_num_coarse_levels,
+                                                            HYPRE_MEMORY_HOST);
+   }
 
-  (mgr_data -> use_default_cgrid_solver) = 0;
+   aff_solver[level] = (HYPRE_Solver *) fsolver;
+   (mgr_data -> fsolver_mode) = 1;
 
-  return hypre_error_flag;
+   return hypre_error_flag;
 }
 
+/* set coarse grid solver */
 HYPRE_Int
-hypre_MGRSetAffInv( void  *mgr_vdata,
-                    hypre_ParCSRMatrix *A_ff_inv )
+hypre_MGRSetCoarseSolver( void        *mgr_vdata,
+                          HYPRE_Int  (*coarse_grid_solver_solve)(void*, void*, void*, void*),
+                          HYPRE_Int  (*coarse_grid_solver_setup)(void*, void*, void*, void*),
+                          void        *coarse_grid_solver )
 {
-  hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
-  (mgr_data -> A_ff_inv) = A_ff_inv;
-  return hypre_error_flag;
+   hypre_ParMGRData *mgr_data = (hypre_ParMGRData*) mgr_vdata;
+
+   (mgr_data -> coarse_grid_solver_solve) = coarse_grid_solver_solve;
+   (mgr_data -> coarse_grid_solver_setup) = coarse_grid_solver_setup;
+   (mgr_data -> coarse_grid_solver)       = (HYPRE_Solver) coarse_grid_solver;
+
+   (mgr_data -> use_default_cgrid_solver) = 0;
+
+   return hypre_error_flag;
 }
 
 /* Set the maximum number of coarse levels.
@@ -4175,183 +2733,318 @@ hypre_MGRSetAffInv( void  *mgr_vdata,
 HYPRE_Int
 hypre_MGRSetMaxCoarseLevels( void *mgr_vdata, HYPRE_Int maxcoarselevs )
 {
-  hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
-  (mgr_data -> max_num_coarse_levels) = maxcoarselevs;
-  return hypre_error_flag;
+   hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
+   (mgr_data -> max_num_coarse_levels) = maxcoarselevs;
+
+   return hypre_error_flag;
 }
+
 /* Set the system block size */
 HYPRE_Int
 hypre_MGRSetBlockSize( void *mgr_vdata, HYPRE_Int bsize )
 {
-  hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
-  (mgr_data -> block_size) = bsize;
-  return hypre_error_flag;
+   hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
+   (mgr_data -> block_size) = bsize;
+
+   return hypre_error_flag;
 }
+
 /* Set the relaxation type for the fine levels of the reduction.
  * Currently supports the following flavors of relaxation types
  * as described in the documentation:
  * relax_types 0 - 8, 13, 14, 18, 19, 98.
  * See par_relax.c and par_relax_more.c for more details.
- *
-*/
+ * */
 HYPRE_Int
 hypre_MGRSetRelaxType( void *mgr_vdata, HYPRE_Int relax_type )
 {
-  hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
-  (mgr_data -> relax_type) = relax_type;
-  return hypre_error_flag;
+   hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
+   (mgr_data -> relax_type) = relax_type;
+   return hypre_error_flag;
 }
 
 /* Set the number of relaxation sweeps */
 HYPRE_Int
 hypre_MGRSetNumRelaxSweeps( void *mgr_vdata, HYPRE_Int nsweeps )
 {
-  hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
-  (mgr_data -> num_relax_sweeps) = nsweeps;
-  return hypre_error_flag;
+   hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
+   HYPRE_Int i;
+   HYPRE_Int max_num_coarse_levels = (mgr_data -> max_num_coarse_levels);
+   hypre_TFree(mgr_data -> num_relax_sweeps, HYPRE_MEMORY_HOST);
+   HYPRE_Int *num_relax_sweeps = hypre_CTAlloc(HYPRE_Int, max_num_coarse_levels,
+                                               HYPRE_MEMORY_HOST);
+   for (i = 0; i < max_num_coarse_levels; i++)
+   {
+      num_relax_sweeps[i] = nsweeps;
+   }
+   (mgr_data -> num_relax_sweeps) = num_relax_sweeps;
+
+   return hypre_error_flag;
+}
+
+HYPRE_Int
+hypre_MGRSetLevelNumRelaxSweeps( void *mgr_vdata, HYPRE_Int *level_nsweeps )
+{
+   hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
+   HYPRE_Int i;
+   HYPRE_Int max_num_coarse_levels = (mgr_data -> max_num_coarse_levels);
+   hypre_TFree(mgr_data -> num_relax_sweeps, HYPRE_MEMORY_HOST);
+
+   HYPRE_Int *num_relax_sweeps = hypre_CTAlloc(HYPRE_Int, max_num_coarse_levels,
+                                               HYPRE_MEMORY_HOST);
+   if (level_nsweeps != NULL)
+   {
+      for (i = 0; i < max_num_coarse_levels; i++)
+      {
+         num_relax_sweeps[i] = level_nsweeps[i];
+      }
+   }
+   else
+   {
+      for (i = 0; i < max_num_coarse_levels; i++)
+      {
+         num_relax_sweeps[i] = 0;
+      }
+   }
+   (mgr_data -> num_relax_sweeps) = num_relax_sweeps;
+
+   return hypre_error_flag;
+}
+
+/* Set the order of the global smoothing step at each level
+ * 1=Down cycle/ Pre-smoothing (default)
+ * 2=Up cycle/ Post-smoothing
+ */
+HYPRE_Int
+hypre_MGRSetGlobalSmoothCycle( void *mgr_vdata, HYPRE_Int smooth_cycle )
+{
+   hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
+   (mgr_data -> global_smooth_cycle) = smooth_cycle;
+   return hypre_error_flag;
 }
 
 /* Set the F-relaxation strategy: 0=single level, 1=multi level */
 HYPRE_Int
 hypre_MGRSetFRelaxMethod( void *mgr_vdata, HYPRE_Int relax_method )
 {
-  hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
-  HYPRE_Int i;
-  HYPRE_Int max_num_coarse_levels = (mgr_data -> max_num_coarse_levels);
-  if((mgr_data -> Frelax_method) != NULL) {
-    hypre_TFree(mgr_data -> Frelax_method, HYPRE_MEMORY_HOST);
-    (mgr_data -> Frelax_method) = NULL;
-  }
-  HYPRE_Int *Frelax_method = hypre_CTAlloc(HYPRE_Int, max_num_coarse_levels, HYPRE_MEMORY_HOST);
-  for (i=0; i < max_num_coarse_levels; i++)
-  {
-    Frelax_method[i] = relax_method;
-  }
-  (mgr_data -> Frelax_method) = Frelax_method;
-  return hypre_error_flag;
+   hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
+   HYPRE_Int i;
+   HYPRE_Int max_num_coarse_levels = (mgr_data -> max_num_coarse_levels);
+   hypre_TFree(mgr_data -> Frelax_method, HYPRE_MEMORY_HOST);
+   HYPRE_Int *Frelax_method = hypre_CTAlloc(HYPRE_Int, max_num_coarse_levels, HYPRE_MEMORY_HOST);
+   for (i = 0; i < max_num_coarse_levels; i++)
+   {
+      Frelax_method[i] = relax_method;
+   }
+   (mgr_data -> Frelax_method) = Frelax_method;
+   return hypre_error_flag;
 }
 
 /* Set the F-relaxation strategy: 0=single level, 1=multi level */
+/* This will be removed later. Use SetLevelFrelaxType */
 HYPRE_Int
 hypre_MGRSetLevelFRelaxMethod( void *mgr_vdata, HYPRE_Int *relax_method )
 {
-  hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
-  HYPRE_Int i;
-  HYPRE_Int max_num_coarse_levels = (mgr_data -> max_num_coarse_levels);
-  if((mgr_data -> Frelax_method) != NULL) {
-    hypre_TFree(mgr_data -> Frelax_method, HYPRE_MEMORY_HOST);
-    (mgr_data -> Frelax_method) = NULL;
-  }
-  HYPRE_Int *Frelax_method = hypre_CTAlloc(HYPRE_Int, max_num_coarse_levels, HYPRE_MEMORY_HOST);
-  if (relax_method != NULL)
-  {
-    for (i=0; i < max_num_coarse_levels; i++)
-    {
-      Frelax_method[i] = relax_method[i];
-    }
-  }
-  else
-  {
-    for (i = 0; i < max_num_coarse_levels; i++)
-    {
-      Frelax_method[i] = 0;
-    }
-  }
-  (mgr_data -> Frelax_method) = Frelax_method;
-  return hypre_error_flag;
+   hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
+   HYPRE_Int i;
+   HYPRE_Int max_num_coarse_levels = (mgr_data -> max_num_coarse_levels);
+   hypre_TFree(mgr_data -> Frelax_method, HYPRE_MEMORY_HOST);
+
+   HYPRE_Int *Frelax_method = hypre_CTAlloc(HYPRE_Int, max_num_coarse_levels, HYPRE_MEMORY_HOST);
+   if (relax_method != NULL)
+   {
+      for (i = 0; i < max_num_coarse_levels; i++)
+      {
+         Frelax_method[i] = relax_method[i];
+      }
+   }
+   else
+   {
+      for (i = 0; i < max_num_coarse_levels; i++)
+      {
+         Frelax_method[i] = 0;
+      }
+   }
+   (mgr_data -> Frelax_method) = Frelax_method;
+   return hypre_error_flag;
+}
+
+/* Set the F-relaxation type:
+ * 0: Jacobi
+ * 1: Vcycle smoother
+ * 2: AMG
+ * Otherwise: use standard BoomerAMGRelax options
+*/
+HYPRE_Int
+hypre_MGRSetLevelFRelaxType( void *mgr_vdata, HYPRE_Int *relax_type )
+{
+   hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
+   HYPRE_Int i;
+   HYPRE_Int max_num_coarse_levels = (mgr_data -> max_num_coarse_levels);
+   hypre_TFree(mgr_data -> Frelax_type, HYPRE_MEMORY_HOST);
+
+   HYPRE_Int *Frelax_type = hypre_CTAlloc(HYPRE_Int, max_num_coarse_levels, HYPRE_MEMORY_HOST);
+   if (relax_type != NULL)
+   {
+      for (i = 0; i < max_num_coarse_levels; i++)
+      {
+         Frelax_type[i] = relax_type[i];
+      }
+   }
+   else
+   {
+      for (i = 0; i < max_num_coarse_levels; i++)
+      {
+         Frelax_type[i] = 0;
+      }
+   }
+   (mgr_data -> Frelax_type) = Frelax_type;
+   return hypre_error_flag;
 }
 
-/* Coarse grid method: 0=Galerkin RAP, 1=non-Galerkin with dropping*/
+/* Coarse grid method: 0=Galerkin RAP, 1=non-Galerkin with dropping */
 HYPRE_Int
 hypre_MGRSetCoarseGridMethod( void *mgr_vdata, HYPRE_Int *cg_method )
 {
-  hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
-  HYPRE_Int i;
-  HYPRE_Int max_num_coarse_levels = (mgr_data -> max_num_coarse_levels);
-  if((mgr_data -> use_non_galerkin_cg) != NULL) {
-    hypre_TFree(mgr_data -> use_non_galerkin_cg, HYPRE_MEMORY_HOST);
-    (mgr_data -> use_non_galerkin_cg) = NULL;
-  }
-  HYPRE_Int *use_non_galerkin_cg = hypre_CTAlloc(HYPRE_Int, max_num_coarse_levels, HYPRE_MEMORY_HOST);
-  if (cg_method != NULL)
-  {
-    for (i=0; i < max_num_coarse_levels; i++)
-    {
-      use_non_galerkin_cg[i] = cg_method[i];
-    }
-  }
-  else
-  {
-    for (i = 0; i < max_num_coarse_levels; i++)
-    {
-      use_non_galerkin_cg[i] = 0;
-    }
-  }
-  (mgr_data -> use_non_galerkin_cg) = use_non_galerkin_cg;
-  return hypre_error_flag;
+   hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
+   HYPRE_Int i;
+   HYPRE_Int max_num_coarse_levels = (mgr_data -> max_num_coarse_levels);
+
+   hypre_TFree(mgr_data -> coarse_grid_method, HYPRE_MEMORY_HOST);
+   HYPRE_Int *coarse_grid_method = hypre_CTAlloc(HYPRE_Int, max_num_coarse_levels,
+                                                 HYPRE_MEMORY_HOST);
+   if (cg_method != NULL)
+   {
+      for (i = 0; i < max_num_coarse_levels; i++)
+      {
+         coarse_grid_method[i] = cg_method[i];
+      }
+   }
+   else
+   {
+      for (i = 0; i < max_num_coarse_levels; i++)
+      {
+         coarse_grid_method[i] = 0;
+      }
+   }
+   (mgr_data -> coarse_grid_method) = coarse_grid_method;
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_MGRSetNonGalerkinMaxElmts
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_MGRSetNonGalerkinMaxElmts( void *mgr_vdata, HYPRE_Int max_elmts )
+{
+   hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
+   HYPRE_Int           max_num_coarse_levels = (mgr_data -> max_num_coarse_levels);
+   HYPRE_Int          *nonglk_max_elmts = (mgr_data -> nonglk_max_elmts);
+   HYPRE_Int           i;
+
+   if (!nonglk_max_elmts)
+   {
+      nonglk_max_elmts = hypre_CTAlloc(HYPRE_Int, max_num_coarse_levels, HYPRE_MEMORY_HOST);
+   }
+   hypre_TFree(mgr_data -> nonglk_max_elmts, HYPRE_MEMORY_HOST);
+
+   for (i = 0; i < max_num_coarse_levels; i++)
+   {
+      nonglk_max_elmts[i] = max_elmts;
+   }
+
+   (mgr_data -> nonglk_max_elmts) = nonglk_max_elmts;
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_MGRSetLevelNonGalerkinMaxElmts
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_MGRSetLevelNonGalerkinMaxElmts( void *mgr_vdata, HYPRE_Int *max_elmts )
+{
+   hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
+   HYPRE_Int           max_num_coarse_levels = (mgr_data -> max_num_coarse_levels);
+   HYPRE_Int          *nonglk_max_elmts = (mgr_data -> nonglk_max_elmts);
+   HYPRE_Int           i;
+
+   if (!nonglk_max_elmts)
+   {
+      nonglk_max_elmts = hypre_CTAlloc(HYPRE_Int, max_num_coarse_levels, HYPRE_MEMORY_HOST);
+   }
+   hypre_TFree(mgr_data -> nonglk_max_elmts, HYPRE_MEMORY_HOST);
+
+   for (i = 0; i < max_num_coarse_levels; i++)
+   {
+      nonglk_max_elmts[i] = max_elmts[i];
+   }
+
+   (mgr_data -> nonglk_max_elmts) = nonglk_max_elmts;
+
+   return hypre_error_flag;
 }
 
 /* Set the F-relaxation number of functions for each level */
 HYPRE_Int
 hypre_MGRSetLevelFRelaxNumFunctions( void *mgr_vdata, HYPRE_Int *num_functions )
 {
-  hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
-  HYPRE_Int i;
-  HYPRE_Int max_num_coarse_levels = (mgr_data -> max_num_coarse_levels);
-  if((mgr_data -> Frelax_num_functions) != NULL) {
-    hypre_TFree(mgr_data -> Frelax_num_functions, HYPRE_MEMORY_HOST);
-    (mgr_data -> Frelax_num_functions) = NULL;
-  }
-  HYPRE_Int *Frelax_num_functions = hypre_CTAlloc(HYPRE_Int, max_num_coarse_levels, HYPRE_MEMORY_HOST);
-  if (num_functions != NULL)
-  {
-    for (i=0; i < max_num_coarse_levels; i++)
-    {
-      Frelax_num_functions[i] = num_functions[i];
-    }
-  }
-  else
-  {
-    for (i = 0; i < max_num_coarse_levels; i++)
-    {
-      Frelax_num_functions[i] = 1;
-    }
-  }
-  (mgr_data -> Frelax_num_functions) = Frelax_num_functions;
-  return hypre_error_flag;
+   hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
+   HYPRE_Int i;
+   HYPRE_Int max_num_coarse_levels = (mgr_data -> max_num_coarse_levels);
+
+   hypre_TFree(mgr_data -> Frelax_num_functions, HYPRE_MEMORY_HOST);
+
+   HYPRE_Int *Frelax_num_functions = hypre_CTAlloc(HYPRE_Int, max_num_coarse_levels,
+                                                   HYPRE_MEMORY_HOST);
+   if (num_functions != NULL)
+   {
+      for (i = 0; i < max_num_coarse_levels; i++)
+      {
+         Frelax_num_functions[i] = num_functions[i];
+      }
+   }
+   else
+   {
+      for (i = 0; i < max_num_coarse_levels; i++)
+      {
+         Frelax_num_functions[i] = 1;
+      }
+   }
+   (mgr_data -> Frelax_num_functions) = Frelax_num_functions;
+   return hypre_error_flag;
 }
 
 /* Set the type of the restriction type
  * for computing restriction operator
 */
 HYPRE_Int
-hypre_MGRSetLevelRestrictType( void *mgr_vdata, HYPRE_Int *restrict_type)
-{
-  hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
-  HYPRE_Int i;
-  HYPRE_Int max_num_coarse_levels = (mgr_data -> max_num_coarse_levels);
-  if ((mgr_data -> restrict_type) != NULL)
-  {
-    hypre_TFree((mgr_data -> restrict_type), HYPRE_MEMORY_HOST);
-    (mgr_data -> restrict_type) = NULL;
-  }
-  HYPRE_Int *level_restrict_type = hypre_CTAlloc(HYPRE_Int, max_num_coarse_levels, HYPRE_MEMORY_HOST);
-  if (restrict_type != NULL)
-  {
-    for (i=0; i < max_num_coarse_levels; i++)
-    {
-      level_restrict_type[i] = *(restrict_type + i);
-    }
-  }
-  else
-  {
-    for (i=0; i < max_num_coarse_levels; i++)
-    {
-      level_restrict_type[i] = 0;
-    }
-  }
-  (mgr_data -> restrict_type) = level_restrict_type;
-  return hypre_error_flag;
+hypre_MGRSetLevelRestrictType( void *mgr_vdata, HYPRE_Int *restrict_type)
+{
+   hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
+   HYPRE_Int i;
+   HYPRE_Int max_num_coarse_levels = (mgr_data -> max_num_coarse_levels);
+   hypre_TFree((mgr_data -> restrict_type), HYPRE_MEMORY_HOST);
+
+   HYPRE_Int *level_restrict_type = hypre_CTAlloc(HYPRE_Int, max_num_coarse_levels, HYPRE_MEMORY_HOST);
+   if (restrict_type != NULL)
+   {
+      for (i = 0; i < max_num_coarse_levels; i++)
+      {
+         level_restrict_type[i] = *(restrict_type + i);
+      }
+   }
+   else
+   {
+      for (i = 0; i < max_num_coarse_levels; i++)
+      {
+         level_restrict_type[i] = 0;
+      }
+   }
+   (mgr_data -> restrict_type) = level_restrict_type;
+   return hypre_error_flag;
 }
 
 /* Set the type of the restriction type
@@ -4360,21 +3053,21 @@ hypre_MGRSetLevelRestrictType( void *mgr_vdata, HYPRE_Int *restrict_type)
 HYPRE_Int
 hypre_MGRSetRestrictType( void *mgr_vdata, HYPRE_Int restrict_type)
 {
-  hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
-  HYPRE_Int i;
-  HYPRE_Int max_num_coarse_levels = (mgr_data -> max_num_coarse_levels);
-  if ((mgr_data -> restrict_type) != NULL)
-  {
-    hypre_TFree((mgr_data -> restrict_type), HYPRE_MEMORY_HOST);
-    (mgr_data -> restrict_type) = NULL;
-  }
-  HYPRE_Int *level_restrict_type = hypre_CTAlloc(HYPRE_Int, max_num_coarse_levels, HYPRE_MEMORY_HOST);
-  for (i=0; i < max_num_coarse_levels; i++)
-  {
-    level_restrict_type[i] = restrict_type;
-  }
-  (mgr_data -> restrict_type) = level_restrict_type;
-  return hypre_error_flag;
+   hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
+   HYPRE_Int i;
+   HYPRE_Int max_num_coarse_levels = (mgr_data -> max_num_coarse_levels);
+   if ((mgr_data -> restrict_type) != NULL)
+   {
+      hypre_TFree((mgr_data -> restrict_type), HYPRE_MEMORY_HOST);
+      (mgr_data -> restrict_type) = NULL;
+   }
+   HYPRE_Int *level_restrict_type = hypre_CTAlloc(HYPRE_Int, max_num_coarse_levels, HYPRE_MEMORY_HOST);
+   for (i = 0; i < max_num_coarse_levels; i++)
+   {
+      level_restrict_type[i] = restrict_type;
+   }
+   (mgr_data -> restrict_type) = level_restrict_type;
+   return hypre_error_flag;
 }
 
 /* Set the number of Jacobi interpolation iterations
@@ -4383,9 +3076,9 @@ hypre_MGRSetRestrictType( void *mgr_vdata, HYPRE_Int restrict_type)
 HYPRE_Int
 hypre_MGRSetNumRestrictSweeps( void *mgr_vdata, HYPRE_Int nsweeps )
 {
-  hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
-  (mgr_data -> num_restrict_sweeps) = nsweeps;
-  return hypre_error_flag;
+   hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
+   (mgr_data -> num_restrict_sweeps) = nsweeps;
+   return hypre_error_flag;
 }
 
 /* Set the type of the interpolation
@@ -4394,21 +3087,21 @@ hypre_MGRSetNumRestrictSweeps( void *mgr_vdata, HYPRE_Int nsweeps )
 HYPRE_Int
 hypre_MGRSetInterpType( void *mgr_vdata, HYPRE_Int interpType)
 {
-  hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
-  HYPRE_Int i;
-  HYPRE_Int max_num_coarse_levels = (mgr_data -> max_num_coarse_levels);
-  if ((mgr_data -> interp_type) != NULL)
-  {
-    hypre_TFree((mgr_data -> interp_type), HYPRE_MEMORY_HOST);
-    (mgr_data -> interp_type) = NULL;
-  }
-  HYPRE_Int *level_interp_type = hypre_CTAlloc(HYPRE_Int, max_num_coarse_levels, HYPRE_MEMORY_HOST);
-  for (i=0; i < max_num_coarse_levels; i++)
-  {
-    level_interp_type[i] = interpType;
-  }
-  (mgr_data -> interp_type) = level_interp_type;
-  return hypre_error_flag;
+   hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
+   HYPRE_Int i;
+   HYPRE_Int max_num_coarse_levels = (mgr_data -> max_num_coarse_levels);
+   if ((mgr_data -> interp_type) != NULL)
+   {
+      hypre_TFree((mgr_data -> interp_type), HYPRE_MEMORY_HOST);
+      (mgr_data -> interp_type) = NULL;
+   }
+   HYPRE_Int *level_interp_type = hypre_CTAlloc(HYPRE_Int, max_num_coarse_levels, HYPRE_MEMORY_HOST);
+   for (i = 0; i < max_num_coarse_levels; i++)
+   {
+      level_interp_type[i] = interpType;
+   }
+   (mgr_data -> interp_type) = level_interp_type;
+   return hypre_error_flag;
 }
 
 /* Set the type of the interpolation
@@ -4417,31 +3110,28 @@ hypre_MGRSetInterpType( void *mgr_vdata, HYPRE_Int interpType)
 HYPRE_Int
 hypre_MGRSetLevelInterpType( void *mgr_vdata, HYPRE_Int *interpType)
 {
-  hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
-  HYPRE_Int i;
-  HYPRE_Int max_num_coarse_levels = (mgr_data -> max_num_coarse_levels);
-  if ((mgr_data -> interp_type) != NULL)
-  {
-    hypre_TFree((mgr_data -> interp_type), HYPRE_MEMORY_HOST);
-    (mgr_data -> interp_type) = NULL;
-  }
-  HYPRE_Int *level_interp_type = hypre_CTAlloc(HYPRE_Int, max_num_coarse_levels, HYPRE_MEMORY_HOST);
-  if (interpType != NULL)
-  {
-    for (i=0; i < max_num_coarse_levels; i++)
-    {
-      level_interp_type[i] = *(interpType + i);
-    }
-  }
-  else
-  {
-    for (i=0; i < max_num_coarse_levels; i++)
-    {
-      level_interp_type[i] = 2;
-    }
-  }
-  (mgr_data -> interp_type) = level_interp_type;
-  return hypre_error_flag;
+   hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
+   HYPRE_Int i;
+   HYPRE_Int max_num_coarse_levels = (mgr_data -> max_num_coarse_levels);
+   hypre_TFree((mgr_data -> interp_type), HYPRE_MEMORY_HOST);
+
+   HYPRE_Int *level_interp_type = hypre_CTAlloc(HYPRE_Int, max_num_coarse_levels, HYPRE_MEMORY_HOST);
+   if (interpType != NULL)
+   {
+      for (i = 0; i < max_num_coarse_levels; i++)
+      {
+         level_interp_type[i] = *(interpType + i);
+      }
+   }
+   else
+   {
+      for (i = 0; i < max_num_coarse_levels; i++)
+      {
+         level_interp_type[i] = 2;
+      }
+   }
+   (mgr_data -> interp_type) = level_interp_type;
+   return hypre_error_flag;
 }
 
 /* Set the number of Jacobi interpolation iterations
@@ -4450,9 +3140,9 @@ hypre_MGRSetLevelInterpType( void *mgr_vdata, HYPRE_Int *interpType)
 HYPRE_Int
 hypre_MGRSetNumInterpSweeps( void *mgr_vdata, HYPRE_Int nsweeps )
 {
-  hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
-  (mgr_data -> num_interp_sweeps) = nsweeps;
-  return hypre_error_flag;
+   hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
+   (mgr_data -> num_interp_sweeps) = nsweeps;
+   return hypre_error_flag;
 }
 
 /* Set the threshold to truncate the coarse grid at each
@@ -4461,639 +3151,864 @@ hypre_MGRSetNumInterpSweeps( void *mgr_vdata, HYPRE_Int nsweeps )
 HYPRE_Int
 hypre_MGRSetTruncateCoarseGridThreshold( void *mgr_vdata, HYPRE_Real threshold)
 {
-  hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
-  (mgr_data -> truncate_coarse_grid_threshold) = threshold;
-  return hypre_error_flag;
+   hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
+   (mgr_data -> truncate_coarse_grid_threshold) = threshold;
+   return hypre_error_flag;
+}
+
+/* Set block size for block Jacobi Interp/Relax */
+HYPRE_Int
+hypre_MGRSetBlockJacobiBlockSize( void *mgr_vdata, HYPRE_Int blk_size)
+{
+   hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
+   (mgr_data -> block_jacobi_bsize) = blk_size;
+   return hypre_error_flag;
 }
 
 /* Set print level for F-relaxation solver */
 HYPRE_Int
 hypre_MGRSetFrelaxPrintLevel( void *mgr_vdata, HYPRE_Int print_level )
 {
-  hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
-  (mgr_data -> frelax_print_level) = print_level;
-  return hypre_error_flag;
+   hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
+   (mgr_data -> frelax_print_level) = print_level;
+   return hypre_error_flag;
 }
 
 /* Set print level for coarse grid solver */
 HYPRE_Int
 hypre_MGRSetCoarseGridPrintLevel( void *mgr_vdata, HYPRE_Int print_level )
 {
-  hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
-  (mgr_data -> cg_print_level) = print_level;
-  return hypre_error_flag;
+   hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
+   (mgr_data -> cg_print_level) = print_level;
+   return hypre_error_flag;
 }
 
 /* Set print level for mgr solver */
 HYPRE_Int
 hypre_MGRSetPrintLevel( void *mgr_vdata, HYPRE_Int print_level )
 {
-  hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
-  (mgr_data -> print_level) = print_level;
-  return hypre_error_flag;
+   hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
+
+   /* Unset reserved bits if any are active */
+   (mgr_data -> print_level) = print_level & ~(HYPRE_MGR_PRINT_RESERVED_A |
+                                               HYPRE_MGR_PRINT_RESERVED_B |
+                                               HYPRE_MGR_PRINT_RESERVED_C);
+   return hypre_error_flag;
 }
 
 /* Set logging level for mgr solver */
 HYPRE_Int
 hypre_MGRSetLogging( void *mgr_vdata, HYPRE_Int logging )
 {
-  hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
-  (mgr_data -> logging) = logging;
-  return hypre_error_flag;
+   hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
+   (mgr_data -> logging) = logging;
+   return hypre_error_flag;
 }
 
 /* Set max number of iterations for mgr solver */
 HYPRE_Int
 hypre_MGRSetMaxIter( void *mgr_vdata, HYPRE_Int max_iter )
 {
-  hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
-  (mgr_data -> max_iter) = max_iter;
-  return hypre_error_flag;
+   hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
+   (mgr_data -> max_iter) = max_iter;
+   return hypre_error_flag;
 }
 
 /* Set convergence tolerance for mgr solver */
 HYPRE_Int
 hypre_MGRSetTol( void *mgr_vdata, HYPRE_Real tol )
 {
-  hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
-  (mgr_data -> tol) = tol;
-  return hypre_error_flag;
+   hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
+   (mgr_data -> tol) = tol;
+   return hypre_error_flag;
 }
 
 /* Set max number of iterations for mgr global smoother */
 HYPRE_Int
-hypre_MGRSetMaxGlobalsmoothIters( void *mgr_vdata, HYPRE_Int max_iter )
+hypre_MGRSetMaxGlobalSmoothIters( void *mgr_vdata, HYPRE_Int max_iter )
+{
+   hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
+   HYPRE_Int max_num_coarse_levels = (mgr_data -> max_num_coarse_levels);
+   if ((mgr_data -> level_smooth_iters) != NULL)
+   {
+      hypre_TFree((mgr_data -> level_smooth_iters), HYPRE_MEMORY_HOST);
+      (mgr_data -> level_smooth_iters) = NULL;
+   }
+   HYPRE_Int *level_smooth_iters = hypre_CTAlloc(HYPRE_Int, max_num_coarse_levels, HYPRE_MEMORY_HOST);
+   if (max_num_coarse_levels > 0)
+   {
+      level_smooth_iters[0] = max_iter;
+   }
+   (mgr_data -> level_smooth_iters) = level_smooth_iters;
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_MGRSetGlobalSmoothType
+ *
+ * Set global smoothing type at the first (finest) MGR level
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_MGRSetGlobalSmoothType( void *mgr_vdata, HYPRE_Int gsmooth_type )
+{
+   hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
+   HYPRE_Int max_num_coarse_levels = (mgr_data -> max_num_coarse_levels);
+   if ((mgr_data -> level_smooth_type) != NULL)
+   {
+      hypre_TFree((mgr_data -> level_smooth_type), HYPRE_MEMORY_HOST);
+      (mgr_data -> level_smooth_type) = NULL;
+   }
+   HYPRE_Int *level_smooth_type = hypre_CTAlloc(HYPRE_Int, max_num_coarse_levels, HYPRE_MEMORY_HOST);
+   if (max_num_coarse_levels > 0)
+   {
+      level_smooth_type[0] = gsmooth_type;
+   }
+   (mgr_data -> level_smooth_type) = level_smooth_type;
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_MGRSetLevelSmoothType
+ *
+ * Set global smoothing type at each MGR level.
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_MGRSetLevelSmoothType( void       *mgr_vdata,
+                             HYPRE_Int  *gsmooth_type )
+{
+   hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
+   HYPRE_Int           max_num_coarse_levels = (mgr_data -> max_num_coarse_levels);
+   HYPRE_Int          *level_smooth_type, i;
+   char                msg[1024];
+
+   /* Set level_smooth_type array */
+   level_smooth_type = hypre_CTAlloc(HYPRE_Int, max_num_coarse_levels, HYPRE_MEMORY_HOST);
+   hypre_TFree((mgr_data -> level_smooth_type), HYPRE_MEMORY_HOST);
+   if (gsmooth_type != NULL)
+   {
+      for (i = 0; i < max_num_coarse_levels; i++)
+      {
+         /* For meaningful values of global smoothing type, the option set via
+            hypre_MGRSetGlobalSmootherAtLevel has precedence over the option set
+            via this function. */
+         if ((mgr_data -> level_smoother) && (mgr_data -> level_smoother)[i] &&
+             (gsmooth_type[i] >= 0))
+         {
+            hypre_sprintf(msg, "hypre_MGRSetLevelSmoothType does not take effect at level %d since\n\
+                                hypre_MGRSetGlobalSmootherAtLevel has been called at the same level",
+                          i);
+            hypre_error_w_msg(HYPRE_ERROR_GENERIC, msg);
+         }
+         else
+         {
+            level_smooth_type[i] = gsmooth_type[i];
+         }
+      }
+   }
+   else
+   {
+      for (i = 0; i < max_num_coarse_levels; i++)
+      {
+         level_smooth_type[i] = 0; // Jacobi
+      }
+   }
+   (mgr_data -> level_smooth_type) = level_smooth_type;
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_MGRSetLevelSmoothIters
+ *
+ * Set the number of global smoothing iterations at each MGR level.
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_MGRSetLevelSmoothIters( void      *mgr_vdata,
+                              HYPRE_Int *gsmooth_iters )
+{
+   hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
+   HYPRE_Int           max_num_coarse_levels = (mgr_data -> max_num_coarse_levels);
+   HYPRE_Int          *level_smooth_iters;
+   HYPRE_Int           i;
+
+   level_smooth_iters = hypre_CTAlloc(HYPRE_Int, max_num_coarse_levels, HYPRE_MEMORY_HOST);
+   hypre_TFree((mgr_data -> level_smooth_iters), HYPRE_MEMORY_HOST);
+   if (gsmooth_iters != NULL)
+   {
+      for (i = 0; i < max_num_coarse_levels; i++)
+      {
+         level_smooth_iters[i] = gsmooth_iters[i];
+      }
+   }
+   else
+   {
+      for (i = 0; i < max_num_coarse_levels; i++)
+      {
+         level_smooth_iters[i] = 0;
+      }
+   }
+   (mgr_data -> level_smooth_iters) = level_smooth_iters;
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_MGRSetGlobalSmootherAtLevel
+ *
+ * Set global relaxation method for a given MGR level via a HYPRE solver object.
+ *
+ * Note this function asks for a level identifier and doesn't expect an array
+ * of function pointers for each level (as done by SetLevel functions).
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_MGRSetGlobalSmootherAtLevel( void         *mgr_vdata,
+                                   HYPRE_Solver  smoother,
+                                   HYPRE_Int     level )
 {
-  hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
-  (mgr_data -> global_smooth_iters) = max_iter;
-  return hypre_error_flag;
+   hypre_Solver          *base = (hypre_Solver*) smoother;
+   HYPRE_PtrToSolverFcn   setup = hypre_SolverSetup(base);
+   hypre_ParMGRData      *mgr_data = (hypre_ParMGRData*) mgr_vdata;
+   HYPRE_Int              max_num_coarse_levels = (mgr_data -> max_num_coarse_levels);
+   HYPRE_Int              smoother_type;
+   char                   msg[1024];
+
+   /* Check if the requested level makes sense */
+   if (level < 0 || level >= max_num_coarse_levels)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   /* Allocate level_smoother if needed */
+   if (!(mgr_data -> level_smoother))
+   {
+      (mgr_data -> level_smoother) = hypre_CTAlloc(HYPRE_Solver,
+                                                   max_num_coarse_levels,
+                                                   HYPRE_MEMORY_HOST);
+   }
+
+   /* Allocate level_smooth_type if needed */
+   if (!(mgr_data -> level_smooth_type))
+   {
+      (mgr_data -> level_smooth_type) = hypre_CTAlloc(HYPRE_Int,
+                                                      max_num_coarse_levels,
+                                                      HYPRE_MEMORY_HOST);
+   }
+
+   (mgr_data -> level_smoother)[level] = smoother;
+
+   /* Obtain corresponding smoother type */
+   if (setup == (HYPRE_PtrToSolverFcn) HYPRE_ILUSetup)
+   {
+      smoother_type = 16;
+   }
+   else
+   {
+      smoother_type = -1; /* Unknown smoother */
+   }
+
+   /* Check if level_smooth_type[level] corresponds to the right smoother type */
+   if ((mgr_data -> level_smooth_type)[level] > 0 &&
+       (mgr_data -> level_smooth_type)[level] != smoother_type)
+   {
+      hypre_sprintf(msg, "Reseting global relaxation type at level %d to user's smoother", level);
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, msg);
+   }
+   (mgr_data -> level_smooth_type)[level] = smoother_type;
+
+   return hypre_error_flag;
 }
 
-/* Set global smoothing type for mgr solver */
+/* Set the maximum number of non-zero entries for interpolation operators */
 HYPRE_Int
-hypre_MGRSetGlobalsmoothType( void *mgr_vdata, HYPRE_Int iter_type )
+hypre_MGRSetPMaxElmts(void *mgr_vdata, HYPRE_Int P_max_elmts)
 {
-  hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
-  (mgr_data -> global_smooth_type) = iter_type;
-  return hypre_error_flag;
+   hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
+   HYPRE_Int           max_num_coarse_levels = (mgr_data -> max_num_coarse_levels);
+   HYPRE_Int           i;
+
+   /* Allocate internal P_max_elmts if needed */
+   if (!(mgr_data -> P_max_elmts))
+   {
+      (mgr_data -> P_max_elmts) = hypre_CTAlloc(HYPRE_Int, max_num_coarse_levels, HYPRE_MEMORY_HOST);
+   }
+
+   /* Set all P_max_elmts entries to the value passed as input */
+   for (i = 0; i < max_num_coarse_levels; i++)
+   {
+      (mgr_data -> P_max_elmts)[i] = P_max_elmts;
+   }
+
+   return hypre_error_flag;
 }
 
-/* Set the maximum number of non-zero entries for restriction
-   and interpolation operator if classical AMG interpolation is used */
+/* Set the maximum number of non-zero entries for interpolation operators per level */
 HYPRE_Int
-hypre_MGRSetPMaxElmts( void *mgr_vdata, HYPRE_Int P_max_elmts)
+hypre_MGRSetLevelPMaxElmts(void *mgr_vdata, HYPRE_Int *P_max_elmts)
 {
-  hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
-  (mgr_data -> P_max_elmts) = P_max_elmts;
-  return hypre_error_flag;
+   hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
+   HYPRE_Int           max_num_coarse_levels = (mgr_data -> max_num_coarse_levels);
+   HYPRE_Int           i;
+
+   /* Allocate internal P_max_elmts if needed */
+   if (!(mgr_data -> P_max_elmts))
+   {
+      (mgr_data -> P_max_elmts) = hypre_CTAlloc(HYPRE_Int, max_num_coarse_levels, HYPRE_MEMORY_HOST);
+   }
+
+   /* Set all P_max_elmts entries to the value passed as input */
+   for (i = 0; i < max_num_coarse_levels; i++)
+   {
+      (mgr_data -> P_max_elmts)[i] = (P_max_elmts) ? P_max_elmts[i] : 0;
+   }
+
+   return hypre_error_flag;
 }
 
 /* Get number of iterations for MGR solver */
 HYPRE_Int
 hypre_MGRGetNumIterations( void *mgr_vdata, HYPRE_Int *num_iterations )
 {
-  hypre_ParMGRData  *mgr_data = (hypre_ParMGRData*) mgr_vdata;
+   hypre_ParMGRData  *mgr_data = (hypre_ParMGRData*) mgr_vdata;
 
-  if (!mgr_data)
-  {
-    hypre_error_in_arg(1);
-    return hypre_error_flag;
-  }
-  *num_iterations = mgr_data->num_iterations;
+   *num_iterations = mgr_data->num_iterations;
 
-  return hypre_error_flag;
+   return hypre_error_flag;
 }
 
 /* Get residual norms for MGR solver */
 HYPRE_Int
 hypre_MGRGetFinalRelativeResidualNorm( void *mgr_vdata, HYPRE_Real *res_norm )
 {
-  hypre_ParMGRData  *mgr_data = (hypre_ParMGRData*) mgr_vdata;
+   hypre_ParMGRData  *mgr_data = (hypre_ParMGRData*) mgr_vdata;
 
-  if (!mgr_data)
-  {
-    hypre_error_in_arg(1);
-    return hypre_error_flag;
-  }
-  *res_norm = mgr_data->final_rel_residual_norm;
+   *res_norm = mgr_data->final_rel_residual_norm;
 
-  return hypre_error_flag;
+   return hypre_error_flag;
 }
 
 HYPRE_Int
-hypre_MGRGetCoarseGridConvergenceFactor( void *mgr_vdata , HYPRE_Real *conv_factor )
+hypre_MGRGetCoarseGridConvergenceFactor( void *mgr_vdata, HYPRE_Real *conv_factor )
 {
-  hypre_ParMGRData  *mgr_data = (hypre_ParMGRData*) mgr_vdata;
+   hypre_ParMGRData  *mgr_data = (hypre_ParMGRData*) mgr_vdata;
 
-  if (!mgr_data)
-  {
-    hypre_error_in_arg(1);
-    return hypre_error_flag;
-  }
-  *conv_factor = (mgr_data -> cg_convergence_factor);
+   *conv_factor = (mgr_data -> cg_convergence_factor);
 
-  return hypre_error_flag;
+   return hypre_error_flag;
 }
 
-
 /* Build A_FF matrix from A given a CF_marker array */
 HYPRE_Int
 hypre_MGRGetSubBlock( hypre_ParCSRMatrix   *A,
-           HYPRE_Int            *row_cf_marker,
-           HYPRE_Int            *col_cf_marker,
-           HYPRE_Int             debug_flag,
-           hypre_ParCSRMatrix  **A_block_ptr )
+                      HYPRE_Int            *row_cf_marker,
+                      HYPRE_Int            *col_cf_marker,
+                      HYPRE_Int             debug_flag,
+                      hypre_ParCSRMatrix  **A_block_ptr )
 {
-  MPI_Comm        comm = hypre_ParCSRMatrixComm(A);
-  hypre_ParCSRCommPkg     *comm_pkg = hypre_ParCSRMatrixCommPkg(A);
-  hypre_ParCSRCommHandle  *comm_handle;
-  HYPRE_MemoryLocation memory_location = hypre_ParCSRMatrixMemoryLocation(A);
-
-  hypre_CSRMatrix *A_diag = hypre_ParCSRMatrixDiag(A);
-  HYPRE_Real      *A_diag_data = hypre_CSRMatrixData(A_diag);
-  HYPRE_Int             *A_diag_i = hypre_CSRMatrixI(A_diag);
-  HYPRE_Int             *A_diag_j = hypre_CSRMatrixJ(A_diag);
-
-  hypre_CSRMatrix *A_offd         = hypre_ParCSRMatrixOffd(A);
-  HYPRE_Real      *A_offd_data    = hypre_CSRMatrixData(A_offd);
-  HYPRE_Int             *A_offd_i = hypre_CSRMatrixI(A_offd);
-  HYPRE_Int             *A_offd_j = hypre_CSRMatrixJ(A_offd);
-  HYPRE_Int              num_cols_A_offd = hypre_CSRMatrixNumCols(A_offd);
-  //HYPRE_Int             *col_map_offd = hypre_ParCSRMatrixColMapOffd(A);
-
-  hypre_IntArray          *coarse_dof_func_ptr = NULL;
-  HYPRE_BigInt            *num_row_cpts_global = NULL;
-  HYPRE_BigInt            *num_col_cpts_global = NULL;
-
-  hypre_ParCSRMatrix    *Ablock;
-  HYPRE_BigInt         *col_map_offd_Ablock;
-  HYPRE_Int       *tmp_map_offd = NULL;
-
-  HYPRE_Int             *CF_marker_offd = NULL;
-
-  hypre_CSRMatrix    *Ablock_diag;
-  hypre_CSRMatrix    *Ablock_offd;
-
-  HYPRE_Real      *Ablock_diag_data;
-  HYPRE_Int             *Ablock_diag_i;
-  HYPRE_Int             *Ablock_diag_j;
-  HYPRE_Real      *Ablock_offd_data;
-  HYPRE_Int             *Ablock_offd_i;
-  HYPRE_Int             *Ablock_offd_j;
-
-  HYPRE_Int              Ablock_diag_size, Ablock_offd_size;
-
-  HYPRE_Int             *Ablock_marker;
-
-  HYPRE_Int              ii_counter;
-  HYPRE_Int              jj_counter, jj_counter_offd;
-  HYPRE_Int             *jj_count, *jj_count_offd;
-
-  HYPRE_Int              start_indexing = 0; /* start indexing for Aff_data at 0 */
-
-  HYPRE_Int              n_fine = hypre_CSRMatrixNumRows(A_diag);
-
-  HYPRE_Int             *fine_to_coarse;
-  HYPRE_Int             *coarse_counter;
-  HYPRE_Int             *col_coarse_counter;
-  HYPRE_Int              coarse_shift;
-  HYPRE_BigInt              total_global_row_cpts;
-  HYPRE_BigInt              total_global_col_cpts;
-  HYPRE_Int              num_cols_Ablock_offd;
-//  HYPRE_BigInt              my_first_row_cpt, my_first_col_cpt;
-
-  HYPRE_Int              i,i1;
-  HYPRE_Int              j,jl,jj;
-  HYPRE_Int              start;
-
-  HYPRE_Int              my_id;
-  HYPRE_Int              num_procs;
-  HYPRE_Int              num_threads;
-  HYPRE_Int              num_sends;
-  HYPRE_Int              index;
-  HYPRE_Int              ns, ne, size, rest;
-  HYPRE_Int             *int_buf_data;
-  HYPRE_Int              local_numrows = hypre_CSRMatrixNumRows(A_diag);
-
-  hypre_IntArray        *wrap_cf;
-
-//  HYPRE_Real       wall_time;  /* for debugging instrumentation  */
-
-  hypre_MPI_Comm_size(comm, &num_procs);
-  hypre_MPI_Comm_rank(comm,&my_id);
-  //num_threads = hypre_NumThreads();
-  // Temporary fix, disable threading
-  // TODO: enable threading
-  num_threads = 1;
-
-  /* get the number of coarse rows */
-  wrap_cf = hypre_IntArrayCreate(local_numrows);
-  hypre_IntArrayMemoryLocation(wrap_cf) = HYPRE_MEMORY_HOST;
-  hypre_IntArrayData(wrap_cf) = row_cf_marker;
-  hypre_BoomerAMGCoarseParms(comm, local_numrows, 1, NULL, wrap_cf, &coarse_dof_func_ptr, &num_row_cpts_global);
-  hypre_IntArrayDestroy(coarse_dof_func_ptr);
-  coarse_dof_func_ptr = NULL;
-
-  //hypre_printf("my_id = %d, cpts_this = %d, cpts_next = %d\n", my_id, num_row_cpts_global[0], num_row_cpts_global[1]);
-
-//  my_first_row_cpt = num_row_cpts_global[0];
-  if (my_id == (num_procs -1)) total_global_row_cpts = num_row_cpts_global[1];
-  hypre_MPI_Bcast(&total_global_row_cpts, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
-
-  /* get the number of coarse rows */
-  hypre_IntArrayData(wrap_cf) = col_cf_marker;
-  hypre_BoomerAMGCoarseParms(comm, local_numrows, 1, NULL, wrap_cf, &coarse_dof_func_ptr, &num_col_cpts_global);
-  hypre_IntArrayDestroy(coarse_dof_func_ptr);
-  coarse_dof_func_ptr = NULL;
-
-  //hypre_printf("my_id = %d, cpts_this = %d, cpts_next = %d\n", my_id, num_col_cpts_global[0], num_col_cpts_global[1]);
-
-//  my_first_col_cpt = num_col_cpts_global[0];
-  if (my_id == (num_procs -1)) total_global_col_cpts = num_col_cpts_global[1];
-  hypre_MPI_Bcast(&total_global_col_cpts, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
-
-  /*-------------------------------------------------------------------
-   * Get the CF_marker data for the off-processor columns
-   *-------------------------------------------------------------------*/
-  if (debug_flag < 0)
-  {
-    debug_flag = -debug_flag;
-  }
+   MPI_Comm        comm = hypre_ParCSRMatrixComm(A);
+   hypre_ParCSRCommPkg     *comm_pkg = hypre_ParCSRMatrixCommPkg(A);
+   hypre_ParCSRCommHandle  *comm_handle;
+   HYPRE_MemoryLocation memory_location = hypre_ParCSRMatrixMemoryLocation(A);
+
+   hypre_CSRMatrix *A_diag = hypre_ParCSRMatrixDiag(A);
+   HYPRE_Real      *A_diag_data = hypre_CSRMatrixData(A_diag);
+   HYPRE_Int             *A_diag_i = hypre_CSRMatrixI(A_diag);
+   HYPRE_Int             *A_diag_j = hypre_CSRMatrixJ(A_diag);
+
+   hypre_CSRMatrix *A_offd         = hypre_ParCSRMatrixOffd(A);
+   HYPRE_Real      *A_offd_data    = hypre_CSRMatrixData(A_offd);
+   HYPRE_Int             *A_offd_i = hypre_CSRMatrixI(A_offd);
+   HYPRE_Int             *A_offd_j = hypre_CSRMatrixJ(A_offd);
+   HYPRE_Int              num_cols_A_offd = hypre_CSRMatrixNumCols(A_offd);
+   //HYPRE_Int             *col_map_offd = hypre_ParCSRMatrixColMapOffd(A);
 
-//  if (debug_flag==4) wall_time = time_getWallclockSeconds();
+   hypre_IntArray          *coarse_dof_func_ptr = NULL;
+   HYPRE_BigInt            num_row_cpts_global[2];
+   HYPRE_BigInt            num_col_cpts_global[2];
 
-  if (num_cols_A_offd) CF_marker_offd = hypre_CTAlloc(HYPRE_Int, num_cols_A_offd, HYPRE_MEMORY_HOST);
+   hypre_ParCSRMatrix    *Ablock;
+   HYPRE_BigInt         *col_map_offd_Ablock;
+   HYPRE_Int       *tmp_map_offd = NULL;
 
-  if (!comm_pkg)
-  {
-    hypre_MatvecCommPkgCreate(A);
-    comm_pkg = hypre_ParCSRMatrixCommPkg(A);
-  }
+   HYPRE_Int             *CF_marker_offd = NULL;
 
-  num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
-  int_buf_data = hypre_CTAlloc(HYPRE_Int, hypre_ParCSRCommPkgSendMapStart(comm_pkg,
-                                      num_sends), HYPRE_MEMORY_HOST);
-
-  index = 0;
-  for (i = 0; i < num_sends; i++)
-  {
-    start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-    for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
-      int_buf_data[index++]
-        = col_cf_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
-  }
+   hypre_CSRMatrix    *Ablock_diag;
+   hypre_CSRMatrix    *Ablock_offd;
+
+   HYPRE_Real      *Ablock_diag_data;
+   HYPRE_Int             *Ablock_diag_i;
+   HYPRE_Int             *Ablock_diag_j;
+   HYPRE_Real      *Ablock_offd_data;
+   HYPRE_Int             *Ablock_offd_i;
+   HYPRE_Int             *Ablock_offd_j;
+
+   HYPRE_Int              Ablock_diag_size, Ablock_offd_size;
+
+   HYPRE_Int             *Ablock_marker;
+
+   HYPRE_Int              ii_counter;
+   HYPRE_Int              jj_counter, jj_counter_offd;
+   HYPRE_Int             *jj_count, *jj_count_offd;
+
+   HYPRE_Int              start_indexing = 0; /* start indexing for Aff_data at 0 */
+
+   HYPRE_Int              n_fine = hypre_CSRMatrixNumRows(A_diag);
+
+   HYPRE_Int             *fine_to_coarse;
+   HYPRE_Int             *coarse_counter;
+   HYPRE_Int             *col_coarse_counter;
+   HYPRE_Int              coarse_shift;
+   HYPRE_BigInt              total_global_row_cpts;
+   HYPRE_BigInt              total_global_col_cpts;
+   HYPRE_Int              num_cols_Ablock_offd;
+   //  HYPRE_BigInt              my_first_row_cpt, my_first_col_cpt;
+
+   HYPRE_Int              i, i1;
+   HYPRE_Int              j, jl, jj;
+   HYPRE_Int              start;
+
+   HYPRE_Int              my_id;
+   HYPRE_Int              num_procs;
+   HYPRE_Int              num_threads;
+   HYPRE_Int              num_sends;
+   HYPRE_Int              index;
+   HYPRE_Int              ns, ne, size, rest;
+   HYPRE_Int             *int_buf_data;
+   HYPRE_Int              local_numrows = hypre_CSRMatrixNumRows(A_diag);
+
+   hypre_IntArray        *wrap_cf;
+
+   //  HYPRE_Real       wall_time;  /* for debugging instrumentation  */
+
+   hypre_MPI_Comm_size(comm, &num_procs);
+   hypre_MPI_Comm_rank(comm, &my_id);
+   //num_threads = hypre_NumThreads();
+   // Temporary fix, disable threading
+   // TODO: enable threading
+   num_threads = 1;
+
+   /* get the number of coarse rows */
+   wrap_cf = hypre_IntArrayCreate(local_numrows);
+   hypre_IntArrayMemoryLocation(wrap_cf) = HYPRE_MEMORY_HOST;
+   hypre_IntArrayData(wrap_cf) = row_cf_marker;
+   hypre_BoomerAMGCoarseParms(comm, local_numrows, 1, NULL, wrap_cf, &coarse_dof_func_ptr,
+                              num_row_cpts_global);
+   hypre_IntArrayDestroy(coarse_dof_func_ptr);
+   coarse_dof_func_ptr = NULL;
+
+   //hypre_printf("my_id = %d, cpts_this = %d, cpts_next = %d\n", my_id, num_row_cpts_global[0], num_row_cpts_global[1]);
+
+   //  my_first_row_cpt = num_row_cpts_global[0];
+   if (my_id == (num_procs - 1)) { total_global_row_cpts = num_row_cpts_global[1]; }
+   hypre_MPI_Bcast(&total_global_row_cpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
+
+   /* get the number of coarse rows */
+   hypre_IntArrayData(wrap_cf) = col_cf_marker;
+   hypre_BoomerAMGCoarseParms(comm, local_numrows, 1, NULL, wrap_cf, &coarse_dof_func_ptr,
+                              num_col_cpts_global);
+   hypre_IntArrayDestroy(coarse_dof_func_ptr);
+   coarse_dof_func_ptr = NULL;
+
+   //hypre_printf("my_id = %d, cpts_this = %d, cpts_next = %d\n", my_id, num_col_cpts_global[0], num_col_cpts_global[1]);
+
+   //  my_first_col_cpt = num_col_cpts_global[0];
+   if (my_id == (num_procs - 1)) { total_global_col_cpts = num_col_cpts_global[1]; }
+   hypre_MPI_Bcast(&total_global_col_cpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
+
+   /*-------------------------------------------------------------------
+    * Get the CF_marker data for the off-processor columns
+    *-------------------------------------------------------------------*/
+   if (debug_flag < 0)
+   {
+      debug_flag = -debug_flag;
+   }
+
+   //  if (debug_flag==4) wall_time = time_getWallclockSeconds();
+
+   if (num_cols_A_offd) { CF_marker_offd = hypre_CTAlloc(HYPRE_Int, num_cols_A_offd, HYPRE_MEMORY_HOST); }
+
+   if (!comm_pkg)
+   {
+      hypre_MatvecCommPkgCreate(A);
+      comm_pkg = hypre_ParCSRMatrixCommPkg(A);
+   }
+
+   num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
+   int_buf_data = hypre_CTAlloc(HYPRE_Int, hypre_ParCSRCommPkgSendMapStart(comm_pkg,
+                                                                           num_sends), HYPRE_MEMORY_HOST);
+
+   index = 0;
+   for (i = 0; i < num_sends; i++)
+   {
+      start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
+      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
+         int_buf_data[index++]
+            = col_cf_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
+   }
 
-  comm_handle = hypre_ParCSRCommHandleCreate( 11, comm_pkg, int_buf_data,
-                        CF_marker_offd);
-  hypre_ParCSRCommHandleDestroy(comm_handle);
+   comm_handle = hypre_ParCSRCommHandleCreate( 11, comm_pkg, int_buf_data,
+                                               CF_marker_offd);
+   hypre_ParCSRCommHandleDestroy(comm_handle);
 
-  /*-----------------------------------------------------------------------
-   *  First Pass: Determine size of Ablock and fill in fine_to_coarse mapping.
-   *-----------------------------------------------------------------------*/
+   /*-----------------------------------------------------------------------
+    *  First Pass: Determine size of Ablock and fill in fine_to_coarse mapping.
+    *-----------------------------------------------------------------------*/
 
-  /*-----------------------------------------------------------------------
-   *  Intialize counters and allocate mapping vector.
-   *-----------------------------------------------------------------------*/
+   /*-----------------------------------------------------------------------
+    *  Intialize counters and allocate mapping vector.
+    *-----------------------------------------------------------------------*/
 
-  coarse_counter = hypre_CTAlloc(HYPRE_Int, num_threads, HYPRE_MEMORY_HOST);
-  col_coarse_counter = hypre_CTAlloc(HYPRE_Int, num_threads, HYPRE_MEMORY_HOST);
-  jj_count = hypre_CTAlloc(HYPRE_Int, num_threads, HYPRE_MEMORY_HOST);
-  jj_count_offd = hypre_CTAlloc(HYPRE_Int, num_threads, HYPRE_MEMORY_HOST);
+   coarse_counter = hypre_CTAlloc(HYPRE_Int, num_threads, HYPRE_MEMORY_HOST);
+   col_coarse_counter = hypre_CTAlloc(HYPRE_Int, num_threads, HYPRE_MEMORY_HOST);
+   jj_count = hypre_CTAlloc(HYPRE_Int, num_threads, HYPRE_MEMORY_HOST);
+   jj_count_offd = hypre_CTAlloc(HYPRE_Int, num_threads, HYPRE_MEMORY_HOST);
 
-  fine_to_coarse = hypre_CTAlloc(HYPRE_Int, n_fine, HYPRE_MEMORY_HOST);
+   fine_to_coarse = hypre_CTAlloc(HYPRE_Int, n_fine, HYPRE_MEMORY_HOST);
 #if 0
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
 #endif
-  for (i = 0; i < n_fine; i++) fine_to_coarse[i] = -1;
+   for (i = 0; i < n_fine; i++) { fine_to_coarse[i] = -1; }
 
-  jj_counter = start_indexing;
-  jj_counter_offd = start_indexing;
+   jj_counter = start_indexing;
+   jj_counter_offd = start_indexing;
 
-  /*-----------------------------------------------------------------------
-   *  Loop over fine grid.
-   *-----------------------------------------------------------------------*/
+   /*-----------------------------------------------------------------------
+    *  Loop over fine grid.
+    *-----------------------------------------------------------------------*/
 
-/* RDF: this looks a little tricky, but doable */
+   /* RDF: this looks a little tricky, but doable */
 #if 0
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i,j,i1,jj,ns,ne,size,rest) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i,j,i1,jj,ns,ne,size,rest) HYPRE_SMP_SCHEDULE
 #endif
 #endif
-  for (j = 0; j < num_threads; j++)
-  {
-    size = n_fine/num_threads;
-    rest = n_fine - size*num_threads;
-
-    if (j < rest)
-    {
-      ns = j*size+j;
-      ne = (j+1)*size+j+1;
-    }
-    else
-    {
-      ns = j*size+rest;
-      ne = (j+1)*size+rest;
-    }
-    for (i = ns; i < ne; i++)
-    {
-      /*--------------------------------------------------------------------
-       *  If i is a F-point, we loop through the columns and select
-       *  the F-columns. Also set up mapping vector.
-       *--------------------------------------------------------------------*/
-
-      if (col_cf_marker[i] > 0)
+   for (j = 0; j < num_threads; j++)
+   {
+      size = n_fine / num_threads;
+      rest = n_fine - size * num_threads;
+
+      if (j < rest)
       {
-        fine_to_coarse[i] = col_coarse_counter[j];
-        col_coarse_counter[j]++;
+         ns = j * size + j;
+         ne = (j + 1) * size + j + 1;
       }
-
-      if (row_cf_marker[i] > 0)
+      else
       {
-        //fine_to_coarse[i] = coarse_counter[j];
-        coarse_counter[j]++;
-        for (jj = A_diag_i[i]; jj < A_diag_i[i+1]; jj++)
-        {
-          i1 = A_diag_j[jj];
-          if (col_cf_marker[i1] > 0)
-          {
-            jj_count[j]++;
-          }
-        }
+         ns = j * size + rest;
+         ne = (j + 1) * size + rest;
+      }
+      for (i = ns; i < ne; i++)
+      {
+         /*--------------------------------------------------------------------
+          *  If i is a F-point, we loop through the columns and select
+          *  the F-columns. Also set up mapping vector.
+          *--------------------------------------------------------------------*/
+
+         if (col_cf_marker[i] > 0)
+         {
+            fine_to_coarse[i] = col_coarse_counter[j];
+            col_coarse_counter[j]++;
+         }
+
+         if (row_cf_marker[i] > 0)
+         {
+            //fine_to_coarse[i] = coarse_counter[j];
+            coarse_counter[j]++;
+            for (jj = A_diag_i[i]; jj < A_diag_i[i + 1]; jj++)
+            {
+               i1 = A_diag_j[jj];
+               if (col_cf_marker[i1] > 0)
+               {
+                  jj_count[j]++;
+               }
+            }
 
-        if (num_procs > 1)
-        {
-          for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
-          {
-            i1 = A_offd_j[jj];
-            if (CF_marker_offd[i1] > 0)
+            if (num_procs > 1)
             {
-              jj_count_offd[j]++;
+               for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
+               {
+                  i1 = A_offd_j[jj];
+                  if (CF_marker_offd[i1] > 0)
+                  {
+                     jj_count_offd[j]++;
+                  }
+               }
             }
-          }
-        }
+         }
       }
-    }
-  }
+   }
 
-  /*-----------------------------------------------------------------------
-   *  Allocate  arrays.
-   *-----------------------------------------------------------------------*/
-  for (i=0; i < num_threads-1; i++)
-  {
-    jj_count[i+1] += jj_count[i];
-    jj_count_offd[i+1] += jj_count_offd[i];
-    coarse_counter[i+1] += coarse_counter[i];
-    col_coarse_counter[i+1] += col_coarse_counter[i];
-  }
-  i = num_threads-1;
-  jj_counter = jj_count[i];
-  jj_counter_offd = jj_count_offd[i];
-  ii_counter = coarse_counter[i];
+   /*-----------------------------------------------------------------------
+    *  Allocate  arrays.
+    *-----------------------------------------------------------------------*/
+   for (i = 0; i < num_threads - 1; i++)
+   {
+      jj_count[i + 1] += jj_count[i];
+      jj_count_offd[i + 1] += jj_count_offd[i];
+      coarse_counter[i + 1] += coarse_counter[i];
+      col_coarse_counter[i + 1] += col_coarse_counter[i];
+   }
+   i = num_threads - 1;
+   jj_counter = jj_count[i];
+   jj_counter_offd = jj_count_offd[i];
+   ii_counter = coarse_counter[i];
 
-  Ablock_diag_size = jj_counter;
+   Ablock_diag_size = jj_counter;
 
-  Ablock_diag_i    = hypre_CTAlloc(HYPRE_Int, ii_counter+1, memory_location);
-  Ablock_diag_j    = hypre_CTAlloc(HYPRE_Int, Ablock_diag_size, memory_location);
-  Ablock_diag_data = hypre_CTAlloc(HYPRE_Real, Ablock_diag_size, memory_location);
+   Ablock_diag_i    = hypre_CTAlloc(HYPRE_Int, ii_counter + 1, memory_location);
+   Ablock_diag_j    = hypre_CTAlloc(HYPRE_Int, Ablock_diag_size, memory_location);
+   Ablock_diag_data = hypre_CTAlloc(HYPRE_Real, Ablock_diag_size, memory_location);
 
-  Ablock_diag_i[ii_counter] = jj_counter;
+   Ablock_diag_i[ii_counter] = jj_counter;
 
 
-  Ablock_offd_size = jj_counter_offd;
+   Ablock_offd_size = jj_counter_offd;
 
-  Ablock_offd_i    = hypre_CTAlloc(HYPRE_Int, ii_counter+1, memory_location);
-  Ablock_offd_j    = hypre_CTAlloc(HYPRE_Int, Ablock_offd_size, memory_location);
-  Ablock_offd_data = hypre_CTAlloc(HYPRE_Real, Ablock_offd_size, memory_location);
+   Ablock_offd_i    = hypre_CTAlloc(HYPRE_Int, ii_counter + 1, memory_location);
+   Ablock_offd_j    = hypre_CTAlloc(HYPRE_Int, Ablock_offd_size, memory_location);
+   Ablock_offd_data = hypre_CTAlloc(HYPRE_Real, Ablock_offd_size, memory_location);
 
-  /*-----------------------------------------------------------------------
-   *  Intialize some stuff.
-   *-----------------------------------------------------------------------*/
+   /*-----------------------------------------------------------------------
+    *  Intialize some stuff.
+    *-----------------------------------------------------------------------*/
 
-  jj_counter = start_indexing;
-  jj_counter_offd = start_indexing;
+   jj_counter = start_indexing;
+   jj_counter_offd = start_indexing;
 
-  //-----------------------------------------------------------------------
-  //  Send and receive fine_to_coarse info.
-  //-----------------------------------------------------------------------
+   //-----------------------------------------------------------------------
+   //  Send and receive fine_to_coarse info.
+   //-----------------------------------------------------------------------
 
-//  if (debug_flag==4) wall_time = time_getWallclockSeconds();
+   //  if (debug_flag==4) wall_time = time_getWallclockSeconds();
 #if 0
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i,j,ns,ne,size,rest,coarse_shift) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i,j,ns,ne,size,rest,coarse_shift) HYPRE_SMP_SCHEDULE
 #endif
 #endif
-  for (j = 0; j < num_threads; j++)
-  {
-    coarse_shift = 0;
-    if (j > 0) coarse_shift = col_coarse_counter[j-1];
-    size = n_fine/num_threads;
-    rest = n_fine - size*num_threads;
-    if (j < rest)
-    {
-      ns = j*size+j;
-      ne = (j+1)*size+j+1;
-    }
-    else
-    {
-      ns = j*size+rest;
-      ne = (j+1)*size+rest;
-    }
-    for (i = ns; i < ne; i++)
-      fine_to_coarse[i] += coarse_shift;
-  }
+   for (j = 0; j < num_threads; j++)
+   {
+      coarse_shift = 0;
+      if (j > 0) { coarse_shift = col_coarse_counter[j - 1]; }
+      size = n_fine / num_threads;
+      rest = n_fine - size * num_threads;
+      if (j < rest)
+      {
+         ns = j * size + j;
+         ne = (j + 1) * size + j + 1;
+      }
+      else
+      {
+         ns = j * size + rest;
+         ne = (j + 1) * size + rest;
+      }
+      for (i = ns; i < ne; i++)
+      {
+         fine_to_coarse[i] += coarse_shift;
+      }
+   }
 
-//  if (debug_flag==4) wall_time = time_getWallclockSeconds();
+   //  if (debug_flag==4) wall_time = time_getWallclockSeconds();
 #if 0
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
 #endif
-//  for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_col_cpt;
+   //  for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_col_cpt;
 
 #if 0
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i,jl,i1,jj,ns,ne,size,rest,jj_counter,jj_counter_offd,ii_counter) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i,jl,i1,jj,ns,ne,size,rest,jj_counter,jj_counter_offd,ii_counter) HYPRE_SMP_SCHEDULE
 #endif
 #endif
-  for (jl = 0; jl < num_threads; jl++)
-  {
-    size = n_fine/num_threads;
-    rest = n_fine - size*num_threads;
-    if (jl < rest)
-    {
-      ns = jl*size+jl;
-      ne = (jl+1)*size+jl+1;
-    }
-    else
-    {
-      ns = jl*size+rest;
-      ne = (jl+1)*size+rest;
-    }
-    jj_counter = 0;
-    if (jl > 0) jj_counter = jj_count[jl-1];
-    jj_counter_offd = 0;
-    if (jl > 0) jj_counter_offd = jj_count_offd[jl-1];
-    ii_counter = 0;
-    for (i = ns; i < ne; i++)
-    {
-      /*--------------------------------------------------------------------
-       *  If i is a F-point, we loop through the columns and select
-       *  the F-columns. Also set up mapping vector.
-       *--------------------------------------------------------------------*/
-      if (row_cf_marker[i] > 0)
+   for (jl = 0; jl < num_threads; jl++)
+   {
+      size = n_fine / num_threads;
+      rest = n_fine - size * num_threads;
+      if (jl < rest)
       {
-        // Diagonal part of Ablock //
-        Ablock_diag_i[ii_counter] = jj_counter;
-        for (jj = A_diag_i[i]; jj < A_diag_i[i+1]; jj++)
-        {
-          i1 = A_diag_j[jj];
-          if (col_cf_marker[i1] > 0)
-          {
-            Ablock_diag_j[jj_counter]    = fine_to_coarse[i1];
-            Ablock_diag_data[jj_counter] = A_diag_data[jj];
-            jj_counter++;
-          }
-        }
+         ns = jl * size + jl;
+         ne = (jl + 1) * size + jl + 1;
+      }
+      else
+      {
+         ns = jl * size + rest;
+         ne = (jl + 1) * size + rest;
+      }
+      jj_counter = 0;
+      if (jl > 0) { jj_counter = jj_count[jl - 1]; }
+      jj_counter_offd = 0;
+      if (jl > 0) { jj_counter_offd = jj_count_offd[jl - 1]; }
+      ii_counter = 0;
+      for (i = ns; i < ne; i++)
+      {
+         /*--------------------------------------------------------------------
+          *  If i is a F-point, we loop through the columns and select
+          *  the F-columns. Also set up mapping vector.
+          *--------------------------------------------------------------------*/
+         if (row_cf_marker[i] > 0)
+         {
+            // Diagonal part of Ablock //
+            Ablock_diag_i[ii_counter] = jj_counter;
+            for (jj = A_diag_i[i]; jj < A_diag_i[i + 1]; jj++)
+            {
+               i1 = A_diag_j[jj];
+               if (col_cf_marker[i1] > 0)
+               {
+                  Ablock_diag_j[jj_counter]    = fine_to_coarse[i1];
+                  Ablock_diag_data[jj_counter] = A_diag_data[jj];
+                  jj_counter++;
+               }
+            }
 
-        // Off-Diagonal part of Ablock //
-        Ablock_offd_i[ii_counter] = jj_counter_offd;
-        if (num_procs > 1)
-        {
-          for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
-          {
-            i1 = A_offd_j[jj];
-            if (CF_marker_offd[i1] > 0)
+            // Off-Diagonal part of Ablock //
+            Ablock_offd_i[ii_counter] = jj_counter_offd;
+            if (num_procs > 1)
             {
-              Ablock_offd_j[jj_counter_offd]  = i1;
-              Ablock_offd_data[jj_counter_offd] = A_offd_data[jj];
-              jj_counter_offd++;
+               for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
+               {
+                  i1 = A_offd_j[jj];
+                  if (CF_marker_offd[i1] > 0)
+                  {
+                     Ablock_offd_j[jj_counter_offd]  = i1;
+                     Ablock_offd_data[jj_counter_offd] = A_offd_data[jj];
+                     jj_counter_offd++;
+                  }
+               }
             }
-          }
-        }
-        ii_counter++;
+            ii_counter++;
+         }
       }
-    }
-    Ablock_offd_i[ii_counter] = jj_counter_offd;
-    Ablock_diag_i[ii_counter] = jj_counter;
-  }
-  Ablock = hypre_ParCSRMatrixCreate(comm,
-                 total_global_row_cpts,
-                 total_global_col_cpts,
-                 num_row_cpts_global,
-                 num_col_cpts_global,
-                 0,
-                 Ablock_diag_i[ii_counter],
-                 Ablock_offd_i[ii_counter]);
-
-  Ablock_diag = hypre_ParCSRMatrixDiag(Ablock);
-  hypre_CSRMatrixData(Ablock_diag) = Ablock_diag_data;
-  hypre_CSRMatrixI(Ablock_diag) = Ablock_diag_i;
-  hypre_CSRMatrixJ(Ablock_diag) = Ablock_diag_j;
-  Ablock_offd = hypre_ParCSRMatrixOffd(Ablock);
-  hypre_CSRMatrixData(Ablock_offd) = Ablock_offd_data;
-  hypre_CSRMatrixI(Ablock_offd) = Ablock_offd_i;
-  hypre_CSRMatrixJ(Ablock_offd) = Ablock_offd_j;
-
-  num_cols_Ablock_offd = 0;
-
-  if (Ablock_offd_size)
-  {
-    Ablock_marker = hypre_CTAlloc(HYPRE_Int, num_cols_A_offd, HYPRE_MEMORY_HOST);
+      Ablock_offd_i[ii_counter] = jj_counter_offd;
+      Ablock_diag_i[ii_counter] = jj_counter;
+   }
+   Ablock = hypre_ParCSRMatrixCreate(comm,
+                                     total_global_row_cpts,
+                                     total_global_col_cpts,
+                                     num_row_cpts_global,
+                                     num_col_cpts_global,
+                                     0,
+                                     Ablock_diag_i[ii_counter],
+                                     Ablock_offd_i[ii_counter]);
+
+   Ablock_diag = hypre_ParCSRMatrixDiag(Ablock);
+   hypre_CSRMatrixData(Ablock_diag) = Ablock_diag_data;
+   hypre_CSRMatrixI(Ablock_diag) = Ablock_diag_i;
+   hypre_CSRMatrixJ(Ablock_diag) = Ablock_diag_j;
+   Ablock_offd = hypre_ParCSRMatrixOffd(Ablock);
+   hypre_CSRMatrixData(Ablock_offd) = Ablock_offd_data;
+   hypre_CSRMatrixI(Ablock_offd) = Ablock_offd_i;
+   hypre_CSRMatrixJ(Ablock_offd) = Ablock_offd_j;
+
+   num_cols_Ablock_offd = 0;
+
+   if (Ablock_offd_size)
+   {
+      Ablock_marker = hypre_CTAlloc(HYPRE_Int, num_cols_A_offd, HYPRE_MEMORY_HOST);
 #if 0
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
 #endif
-    for (i=0; i < num_cols_A_offd; i++)
-      Ablock_marker[i] = 0;
-    num_cols_Ablock_offd = 0;
-    for (i=0; i < Ablock_offd_size; i++)
-    {
-      index = Ablock_offd_j[i];
-      if (!Ablock_marker[index])
+      for (i = 0; i < num_cols_A_offd; i++)
+      {
+         Ablock_marker[i] = 0;
+      }
+      num_cols_Ablock_offd = 0;
+      for (i = 0; i < Ablock_offd_size; i++)
+      {
+         index = Ablock_offd_j[i];
+         if (!Ablock_marker[index])
+         {
+            num_cols_Ablock_offd++;
+            Ablock_marker[index] = 1;
+         }
+      }
+
+      col_map_offd_Ablock = hypre_CTAlloc(HYPRE_BigInt, num_cols_Ablock_offd, memory_location);
+      tmp_map_offd = hypre_CTAlloc(HYPRE_Int, num_cols_Ablock_offd, HYPRE_MEMORY_HOST);
+      index = 0;
+      for (i = 0; i < num_cols_Ablock_offd; i++)
       {
-        num_cols_Ablock_offd++;
-        Ablock_marker[index] = 1;
+         while (Ablock_marker[index] == 0) { index++; }
+         tmp_map_offd[i] = index++;
       }
-    }
-
-    col_map_offd_Ablock = hypre_CTAlloc(HYPRE_BigInt, num_cols_Ablock_offd, memory_location);
-    tmp_map_offd = hypre_CTAlloc(HYPRE_Int, num_cols_Ablock_offd, HYPRE_MEMORY_HOST);
-    index = 0;
-    for (i=0; i < num_cols_Ablock_offd; i++)
-    {
-      while (Ablock_marker[index]==0) index++;
-      tmp_map_offd[i] = index++;
-    }
 #if 0
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
 #endif
-    for (i=0; i < Ablock_offd_size; i++)
-      Ablock_offd_j[i] = hypre_BinarySearch(tmp_map_offd,
-                       Ablock_offd_j[i],
-                       num_cols_Ablock_offd);
-    hypre_TFree(Ablock_marker, HYPRE_MEMORY_HOST);
-  }
+      for (i = 0; i < Ablock_offd_size; i++)
+         Ablock_offd_j[i] = hypre_BinarySearch(tmp_map_offd,
+                                               Ablock_offd_j[i],
+                                               num_cols_Ablock_offd);
+      hypre_TFree(Ablock_marker, HYPRE_MEMORY_HOST);
+   }
 
-  if (num_cols_Ablock_offd)
-  {
-    hypre_ParCSRMatrixColMapOffd(Ablock) = col_map_offd_Ablock;
-    hypre_CSRMatrixNumCols(Ablock_offd) = num_cols_Ablock_offd;
-  }
+   if (num_cols_Ablock_offd)
+   {
+      hypre_ParCSRMatrixColMapOffd(Ablock) = col_map_offd_Ablock;
+      hypre_CSRMatrixNumCols(Ablock_offd) = num_cols_Ablock_offd;
+   }
 
-  hypre_GetCommPkgRTFromCommPkgA(Ablock, A, fine_to_coarse, tmp_map_offd);
+   hypre_GetCommPkgRTFromCommPkgA(Ablock, A, fine_to_coarse, tmp_map_offd);
 
-  /* Create the assumed partition */
-  if (hypre_ParCSRMatrixAssumedPartition(Ablock) == NULL)
-  {
-    hypre_ParCSRMatrixCreateAssumedPartition(Ablock);
-  }
+   /* Create the assumed partition */
+   if (hypre_ParCSRMatrixAssumedPartition(Ablock) == NULL)
+   {
+      hypre_ParCSRMatrixCreateAssumedPartition(Ablock);
+   }
 
-  *A_block_ptr= Ablock;
+   *A_block_ptr = Ablock;
 
-  hypre_TFree(tmp_map_offd, HYPRE_MEMORY_HOST);
-  hypre_TFree(CF_marker_offd, HYPRE_MEMORY_HOST);
-  hypre_TFree(int_buf_data, HYPRE_MEMORY_HOST);
-  hypre_TFree(fine_to_coarse, HYPRE_MEMORY_HOST);
-  hypre_TFree(coarse_counter, HYPRE_MEMORY_HOST);
-  hypre_TFree(col_coarse_counter, HYPRE_MEMORY_HOST);
-  hypre_TFree(jj_count, HYPRE_MEMORY_HOST);
-  hypre_TFree(jj_count_offd, HYPRE_MEMORY_HOST);
+   hypre_TFree(tmp_map_offd, HYPRE_MEMORY_HOST);
+   hypre_TFree(CF_marker_offd, HYPRE_MEMORY_HOST);
+   hypre_TFree(int_buf_data, HYPRE_MEMORY_HOST);
+   hypre_TFree(fine_to_coarse, HYPRE_MEMORY_HOST);
+   hypre_TFree(coarse_counter, HYPRE_MEMORY_HOST);
+   hypre_TFree(col_coarse_counter, HYPRE_MEMORY_HOST);
+   hypre_TFree(jj_count, HYPRE_MEMORY_HOST);
+   hypre_TFree(jj_count_offd, HYPRE_MEMORY_HOST);
+   hypre_IntArrayData(wrap_cf) = NULL;
+   hypre_IntArrayDestroy(wrap_cf);
 
-  return(0);
+   return hypre_error_flag;
 }
 
-
 /* Build A_FF matrix from A given a CF_marker array */
 HYPRE_Int
 hypre_MGRBuildAff( hypre_ParCSRMatrix   *A,
-           HYPRE_Int            *CF_marker,
-           HYPRE_Int             debug_flag,
-           hypre_ParCSRMatrix  **A_ff_ptr )
+                   HYPRE_Int            *CF_marker,
+                   HYPRE_Int             debug_flag,
+                   hypre_ParCSRMatrix  **A_ff_ptr )
 {
-  HYPRE_Int i;
-  HYPRE_Int local_numrows = hypre_CSRMatrixNumRows(hypre_ParCSRMatrixDiag(A));
-  /* create a copy of the CF_marker array and switch C-points to F-points */
-  HYPRE_Int *CF_marker_copy = hypre_CTAlloc(HYPRE_Int, local_numrows, HYPRE_MEMORY_HOST);
+   HYPRE_Int i;
+   HYPRE_Int local_numrows = hypre_CSRMatrixNumRows(hypre_ParCSRMatrixDiag(A));
+   /* create a copy of the CF_marker array and switch C-points to F-points */
+   HYPRE_Int *CF_marker_copy = hypre_CTAlloc(HYPRE_Int, local_numrows, HYPRE_MEMORY_HOST);
 
 #if 0
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
 #endif
-  for (i = 0; i < local_numrows; i++) {
-    CF_marker_copy[i] = -CF_marker[i];
-  }
+   for (i = 0; i < local_numrows; i++)
+   {
+      CF_marker_copy[i] = -CF_marker[i];
+   }
 
-  hypre_MGRGetSubBlock(A, CF_marker_copy, CF_marker_copy, debug_flag, A_ff_ptr);
+   hypre_MGRGetSubBlock(A, CF_marker_copy, CF_marker_copy, debug_flag, A_ff_ptr);
 
-  /* Free copy of CF marker */
-  hypre_TFree(CF_marker_copy, HYPRE_MEMORY_HOST);
-  return(0);
+   /* Free copy of CF marker */
+   hypre_TFree(CF_marker_copy, HYPRE_MEMORY_HOST);
+   return (0);
 }
 
 /*********************************************************************************
@@ -5104,29 +4019,33 @@ hypre_MGRBuildAff( hypre_ParCSRMatrix   *A,
  * same as the 'point_type'
  *********************************************************************************/
 HYPRE_Int
-hypre_MGRAddVectorP ( HYPRE_Int  *CF_marker,
-        HYPRE_Int        point_type,
-        HYPRE_Real       a,
-        hypre_ParVector  *fromVector,
-        HYPRE_Real       b,
-        hypre_ParVector  **toVector )
+hypre_MGRAddVectorP ( hypre_IntArray  *CF_marker,
+                      HYPRE_Int        point_type,
+                      HYPRE_Real       a,
+                      hypre_ParVector  *fromVector,
+                      HYPRE_Real       b,
+                      hypre_ParVector  **toVector )
 {
-  hypre_Vector    *fromVectorLocal = hypre_ParVectorLocalVector(fromVector);
-  HYPRE_Real      *fromVectorData  = hypre_VectorData(fromVectorLocal);
-  hypre_Vector    *toVectorLocal   = hypre_ParVectorLocalVector(*toVector);
-  HYPRE_Real      *toVectorData    = hypre_VectorData(toVectorLocal);
-
-  HYPRE_Int       n = hypre_ParVectorActualLocalSize(*toVector);
-  HYPRE_Int       i, j;
-
-  j = 0;
-  for (i = 0; i < n; i++) {
-    if (CF_marker[i] == point_type) {
-      toVectorData[i] = b * toVectorData[i] + a * fromVectorData[j];
-      j++;
-    }
-  }
-  return 0;
+   hypre_Vector    *fromVectorLocal = hypre_ParVectorLocalVector(fromVector);
+   HYPRE_Real      *fromVectorData  = hypre_VectorData(fromVectorLocal);
+   hypre_Vector    *toVectorLocal   = hypre_ParVectorLocalVector(*toVector);
+   HYPRE_Real      *toVectorData    = hypre_VectorData(toVectorLocal);
+   HYPRE_Int       *CF_marker_data = hypre_IntArrayData(CF_marker);
+
+   //HYPRE_Int       n = hypre_ParVectorActualLocalSize(*toVector);
+   HYPRE_Int       n = hypre_IntArraySize(CF_marker);
+   HYPRE_Int       i, j;
+
+   j = 0;
+   for (i = 0; i < n; i++)
+   {
+      if (CF_marker_data[i] == point_type)
+      {
+         toVectorData[i] = b * toVectorData[i] + a * fromVectorData[j];
+         j++;
+      }
+   }
+   return 0;
 }
 
 /*************************************************************************************
@@ -5137,29 +4056,33 @@ hypre_MGRAddVectorP ( HYPRE_Int  *CF_marker,
  * same as the 'point_type' to the 'toVector'
  *************************************************************************************/
 HYPRE_Int
-hypre_MGRAddVectorR ( HYPRE_Int  *CF_marker,
-        HYPRE_Int        point_type,
-        HYPRE_Real       a,
-        hypre_ParVector  *fromVector,
-        HYPRE_Real       b,
-        hypre_ParVector  **toVector )
+hypre_MGRAddVectorR ( hypre_IntArray *CF_marker,
+                      HYPRE_Int        point_type,
+                      HYPRE_Real       a,
+                      hypre_ParVector  *fromVector,
+                      HYPRE_Real       b,
+                      hypre_ParVector  **toVector )
 {
-  hypre_Vector    *fromVectorLocal = hypre_ParVectorLocalVector(fromVector);
-  HYPRE_Real      *fromVectorData  = hypre_VectorData(fromVectorLocal);
-  hypre_Vector    *toVectorLocal   = hypre_ParVectorLocalVector(*toVector);
-  HYPRE_Real      *toVectorData    = hypre_VectorData(toVectorLocal);
-
-  HYPRE_Int       n = hypre_ParVectorActualLocalSize(fromVector);
-  HYPRE_Int       i, j;
-
-  j = 0;
-  for (i = 0; i < n; i++) {
-    if (CF_marker[i] == point_type) {
-      toVectorData[j] = b * toVectorData[j] + a * fromVectorData[i];
-      j++;
-    }
-  }
-  return 0;
+   hypre_Vector    *fromVectorLocal = hypre_ParVectorLocalVector(fromVector);
+   HYPRE_Real      *fromVectorData  = hypre_VectorData(fromVectorLocal);
+   hypre_Vector    *toVectorLocal   = hypre_ParVectorLocalVector(*toVector);
+   HYPRE_Real      *toVectorData    = hypre_VectorData(toVectorLocal);
+   HYPRE_Int       *CF_marker_data = hypre_IntArrayData(CF_marker);
+
+   //HYPRE_Int       n = hypre_ParVectorActualLocalSize(*toVector);
+   HYPRE_Int       n = hypre_IntArraySize(CF_marker);
+   HYPRE_Int       i, j;
+
+   j = 0;
+   for (i = 0; i < n; i++)
+   {
+      if (CF_marker_data[i] == point_type)
+      {
+         toVectorData[j] = b * toVectorData[j] + a * fromVectorData[i];
+         j++;
+      }
+   }
+   return 0;
 }
 
 /*
@@ -5187,252 +4110,353 @@ hypre_MGRBuildAffRAP( MPI_Comm comm, HYPRE_Int local_num_variables, HYPRE_Int nu
 HYPRE_Int
 hypre_MGRGetCoarseGridMatrix( void *mgr_vdata, hypre_ParCSRMatrix **RAP )
 {
-  hypre_ParMGRData  *mgr_data = (hypre_ParMGRData*) mgr_vdata;
+   hypre_ParMGRData  *mgr_data = (hypre_ParMGRData*) mgr_vdata;
 
-  if (!mgr_data)
-  {
-    hypre_error_in_arg(1);
-    return hypre_error_flag;
-  }
-  if (mgr_data -> RAP == NULL)
-  {
-    hypre_error_w_msg(HYPRE_ERROR_GENERIC," Coarse grid matrix is NULL. Please make sure MGRSetup() is called \n");
-    return hypre_error_flag;
-  }
-  *RAP = mgr_data->RAP;
+   if (mgr_data -> RAP == NULL)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                        " Coarse grid matrix is NULL. Please make sure MGRSetup() is called \n");
+      return hypre_error_flag;
+   }
+   *RAP = mgr_data->RAP;
 
-  return hypre_error_flag;
+   return hypre_error_flag;
 }
 
 /* Get pointer to coarse grid solution for MGR solver */
 HYPRE_Int
 hypre_MGRGetCoarseGridSolution( void *mgr_vdata, hypre_ParVector **sol )
 {
-  hypre_ParMGRData  *mgr_data = (hypre_ParMGRData*) mgr_vdata;
+   hypre_ParMGRData  *mgr_data = (hypre_ParMGRData*) mgr_vdata;
 
-  if (!mgr_data)
-  {
-    hypre_error_in_arg(1);
-    return hypre_error_flag;
-  }
-  if (mgr_data -> U_array == NULL)
-  {
-    hypre_error_w_msg(HYPRE_ERROR_GENERIC," MGR solution array is NULL. Please make sure MGRSetup() and MGRSolve() are called \n");
-    return hypre_error_flag;
-  }
-  *sol = mgr_data->U_array[mgr_data->num_coarse_levels];
+   if (mgr_data -> U_array == NULL)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                        " MGR solution array is NULL. Please make sure MGRSetup() and MGRSolve() are called \n");
+      return hypre_error_flag;
+   }
+   *sol = mgr_data->U_array[mgr_data->num_coarse_levels];
 
-  return hypre_error_flag;
+   return hypre_error_flag;
 }
 
 /* Get pointer to coarse grid solution for MGR solver */
 HYPRE_Int
 hypre_MGRGetCoarseGridRHS( void *mgr_vdata, hypre_ParVector **rhs )
 {
-  hypre_ParMGRData  *mgr_data = (hypre_ParMGRData*) mgr_vdata;
+   hypre_ParMGRData  *mgr_data = (hypre_ParMGRData*) mgr_vdata;
 
-  if (!mgr_data)
-  {
-    hypre_error_in_arg(1);
-    return hypre_error_flag;
-  }
-  if (mgr_data -> F_array == NULL)
-  {
-    hypre_error_w_msg(HYPRE_ERROR_GENERIC," MGR RHS array is NULL. Please make sure MGRSetup() and MGRSolve() are called \n");
-    return hypre_error_flag;
-  }
-  *rhs = mgr_data->F_array[mgr_data->num_coarse_levels];
+   if (mgr_data -> F_array == NULL)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                        " MGR RHS array is NULL. Please make sure MGRSetup() and MGRSolve() are called \n");
+      return hypre_error_flag;
+   }
+   *rhs = mgr_data->F_array[mgr_data->num_coarse_levels];
 
-  return hypre_error_flag;
+   return hypre_error_flag;
 }
 
 /* Print coarse grid linear system (for debugging)*/
 HYPRE_Int
 hypre_MGRPrintCoarseSystem( void *mgr_vdata, HYPRE_Int print_flag)
 {
-  hypre_ParMGRData  *mgr_data = (hypre_ParMGRData*) mgr_vdata;
-  mgr_data->print_coarse_system = print_flag;
+   hypre_ParMGRData  *mgr_data = (hypre_ParMGRData*) mgr_vdata;
+   mgr_data->print_coarse_system = print_flag;
 
-  return hypre_error_flag;
+   return hypre_error_flag;
 }
 
-/* Print solver params */
+/*--------------------------------------------------------------------------
+ * hypre_MGRDataPrint
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_MGRWriteSolverParams(void *mgr_vdata)
+hypre_MGRDataPrint(void *mgr_vdata)
 {
-  hypre_ParMGRData  *mgr_data = (hypre_ParMGRData*) mgr_vdata;
-  HYPRE_Int i, j;
-  HYPRE_Int max_num_coarse_levels = (mgr_data -> max_num_coarse_levels);
-  hypre_printf("MGR Setup parameters: \n");
-  hypre_printf("Block size: %d\n", (mgr_data -> block_size));
-  hypre_printf("Max number of coarse levels: %d\n", (mgr_data -> max_num_coarse_levels));
-  hypre_printf("Relax type: %d\n", (mgr_data -> relax_type));
-  hypre_printf("Set non-Cpoints to F-points: %d\n", (mgr_data -> set_non_Cpoints_to_F));
-  hypre_printf("Set Cpoints method: %d\n", (mgr_data -> set_c_points_method));
-  for (i = 0; i < max_num_coarse_levels; i++)
-  {
-    hypre_printf("Lev = %d, Interpolation type: %d\n", i, (mgr_data -> interp_type)[i]);
-    hypre_printf("Lev = %d, Restriction type: %d\n", i, (mgr_data -> restrict_type)[i]);
-    hypre_printf("Lev = %d, F-relaxation method: %d\n", i, (mgr_data -> Frelax_method)[i]);
-    hypre_printf("Lev = %d, Use non-Galerkin coarse grid: %d\n", i, (mgr_data -> use_non_galerkin_cg)[i]);
-    HYPRE_Int lvl_num_coarse_points = (mgr_data -> block_num_coarse_indexes)[i];
-    hypre_printf("Lev = %d, Number of Cpoints: %d\n", i, lvl_num_coarse_points);
-    hypre_printf("Cpoints indices: ");
-    for (j = 0; j < lvl_num_coarse_points; j++)
-    {
-      if ((mgr_data -> block_cf_marker)[i][j] == 1)
+   hypre_ParMGRData     *mgr_data           = (hypre_ParMGRData*) mgr_vdata;
+   HYPRE_Int             print_level        = (mgr_data -> print_level);
+   HYPRE_Int             num_coarse_levels  = (mgr_data -> num_coarse_levels);
+   hypre_ParCSRMatrix  **A_array            = (mgr_data -> A_array);
+   hypre_ParCSRMatrix  **P_array            = (mgr_data -> P_array);
+   hypre_ParCSRMatrix  **RT_array           = (mgr_data -> RT_array);
+   hypre_ParCSRMatrix   *A_coarsest         = (mgr_data -> RAP);
+   hypre_ParVector     **f_array            = (mgr_data -> F_array);
+   HYPRE_Int            *point_marker_array = (mgr_data -> point_marker_array);
+   HYPRE_Int             block_size         = (mgr_data -> block_size);
+   char                 *data_path          = (mgr_data -> data_path);
+
+   char                  topdir[] = "./hypre-data";
+   char                 *filename = NULL;
+   hypre_IntArray       *dofmap   = NULL;
+   MPI_Comm              comm;
+   HYPRE_Int             myid, lvl;
+   HYPRE_Int             data_path_length = 0;
+
+   /* Sanity check */
+   if (!A_array[0])
+   {
+      return hypre_error_flag;
+   }
+
+   /* Get rank ID */
+   comm = hypre_ParCSRMatrixComm(A_array[0]);
+   hypre_MPI_Comm_rank(comm, &myid);
+
+   /* Create new "ls_" folder (data_path) */
+   if (((print_level & HYPRE_MGR_PRINT_INFO_PARAMS) ||
+        (print_level & HYPRE_MGR_PRINT_FINE_MATRIX) ||
+        (print_level & HYPRE_MGR_PRINT_FINE_RHS)    ||
+        (print_level & HYPRE_MGR_PRINT_CRSE_MATRIX) ||
+        (print_level & HYPRE_MGR_PRINT_LVLS_MATRIX) )   &&
+       (data_path == NULL))
+   {
+      if (!myid)
       {
-        hypre_printf("%d ", j);
+         if (!hypre_CheckDirExists(topdir))
+         {
+            hypre_CreateDir(topdir);
+         }
+
+         hypre_CreateNextDirOfSequence(topdir, "ls_", &data_path);
+         data_path_length = strlen(data_path) + 1;
       }
-    }
-    hypre_printf("\n");
-  }
-  hypre_printf("Number of Reserved Cpoints: %d\n", (mgr_data -> reserved_coarse_size));
-  hypre_printf("Keep reserved Cpoints to level: %d\n", (mgr_data -> lvl_to_keep_cpoints));
-
-  hypre_printf("\n MGR Solver Parameters: \n");
-  hypre_printf("Number of relax sweeps: %d\n", (mgr_data -> num_relax_sweeps));
-  hypre_printf("Number of interpolation sweeps: %d\n", (mgr_data -> num_interp_sweeps));
-  hypre_printf("Number of restriction sweeps: %d\n", (mgr_data -> num_restrict_sweeps));
-  hypre_printf("Global smoother type: %d\n", (mgr_data ->global_smooth_type));
-  hypre_printf("Number of global smoother sweeps: %d\n", (mgr_data ->global_smooth_iters));
-  hypre_printf("Max number of iterations: %d\n", (mgr_data -> max_iter));
-  hypre_printf("Stopping tolerance: %e\n", (mgr_data -> tol));
-  hypre_printf("Use default coarse grid solver: %d\n", (mgr_data -> use_default_cgrid_solver));
-  if((mgr_data -> use_default_fsolver) >= 0)
-  {
-    hypre_printf("Use default AMG solver for full AMG F-relaxation: %d\n", (mgr_data -> use_default_fsolver));
-  }
-  return hypre_error_flag;
-}
+      hypre_MPI_Bcast(&data_path_length, 1, HYPRE_MPI_INT, 0, comm);
 
-#ifdef HYPRE_USING_DSUPERLU
-void *
-hypre_MGRDirectSolverCreate()
-{
-  hypre_DSLUData *dslu_data = hypre_CTAlloc(hypre_DSLUData, 1, HYPRE_MEMORY_HOST);
-  return (void *) dslu_data;
-}
+      if (data_path_length > 0)
+      {
+         if (myid)
+         {
+            data_path = hypre_TAlloc(char, data_path_length, HYPRE_MEMORY_HOST);
+         }
+      }
+      else
+      {
+         hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Unable to create data path!");
+         return hypre_error_flag;
+      }
+      hypre_MPI_Bcast(data_path, data_path_length, hypre_MPI_CHAR, 0, comm);
 
-HYPRE_Int
-hypre_MGRDirectSolverSetup( void                *solver,
-                            hypre_ParCSRMatrix  *A,
-                            hypre_ParVector     *f,
-                            hypre_ParVector     *u )
-{
-      /* Par Data Structure variables */
-   HYPRE_BigInt global_num_rows = hypre_ParCSRMatrixGlobalNumRows(A);
-   MPI_Comm           comm = hypre_ParCSRMatrixComm(A);
-   hypre_CSRMatrix *A_local;
-   HYPRE_Int num_rows;
-   HYPRE_Int num_procs, my_id;
-   HYPRE_Int pcols=1, prows=1;
-   HYPRE_BigInt *big_rowptr = NULL;
-   hypre_DSLUData *dslu_data = (hypre_DSLUData *) solver;
-
-   HYPRE_Int info = 0;
-   HYPRE_Int nrhs = 0;
+      /* Save data_path */
+      (mgr_data -> data_path) = data_path;
+   }
+   else
+   {
+      if (data_path)
+      {
+         data_path_length = strlen(data_path);
+      }
+   }
 
-   hypre_MPI_Comm_size(comm, &num_procs);
-   hypre_MPI_Comm_rank(comm, &my_id);
+   /* Allocate memory for filename */
+   filename = hypre_TAlloc(char, data_path_length + 16, HYPRE_MEMORY_HOST);
+
+   /* Print MGR parameters to file */
+   if (print_level & HYPRE_MGR_PRINT_INFO_PARAMS)
+   {
+      /* TODO (VPM): print internal MGR parameters to file */
 
-   /* Merge diag and offd into one matrix (global ids) */
-   A_local = hypre_MergeDiagAndOffd(A);
+      /* Signal that the MGR parameters have already been printed */
+      (mgr_data -> print_level) &= ~HYPRE_MGR_PRINT_INFO_PARAMS;
+      (mgr_data -> print_level) |= HYPRE_MGR_PRINT_RESERVED_A;
+   }
 
-   num_rows = hypre_CSRMatrixNumRows(A_local);
-   /* Now convert hypre matrix to a SuperMatrix */
-#ifdef HYPRE_MIXEDINT
+   /* Print linear system matrix at the finest level and dofmap */
+   if ((print_level & (HYPRE_MGR_PRINT_FINE_MATRIX + HYPRE_MGR_PRINT_LVLS_MATRIX)) && A_array[0])
    {
-      HYPRE_Int *rowptr = NULL;
-      HYPRE_Int  i;
-      rowptr = hypre_CSRMatrixI(A_local);
-      big_rowptr = hypre_CTAlloc(HYPRE_BigInt, (num_rows+1), HYPRE_MEMORY_HOST);
-      for(i=0; i<(num_rows+1); i++)
+      /* Build dofmap array */
+      dofmap = hypre_IntArrayCreate(hypre_ParCSRMatrixNumRows(A_array[0]));
+      hypre_IntArrayInitialize_v2(dofmap, HYPRE_MEMORY_HOST);
+      if (point_marker_array)
       {
-         big_rowptr[i] = (HYPRE_BigInt)rowptr[i];
+         hypre_TMemcpy(hypre_IntArrayData(dofmap), point_marker_array,
+                       HYPRE_Int, hypre_ParCSRMatrixNumRows(A_array[0]),
+                       HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
       }
+      else
+      {
+         hypre_IntArraySetInterleavedValues(dofmap, block_size);
+      }
+
+      /* Print dofmap */
+      hypre_ParPrintf(comm, "Writing dofmap to path: %s\n", data_path);
+      hypre_sprintf(filename, "%s/dofmap.out", data_path);
+      hypre_IntArrayPrint(comm, dofmap, filename);
+
+      /* Free memory */
+      hypre_IntArrayDestroy(dofmap);
+
+      /* Print Matrix */
+      hypre_ParPrintf(comm, "Writing fine level matrix to path: %s\n", data_path);
+      hypre_sprintf(filename, "%s/IJ.out.A", data_path);
+      if (print_level & HYPRE_MGR_PRINT_MODE_ASCII)
+      {
+         hypre_ParCSRMatrixPrintIJ(A_array[0], 0, 0, filename);
+      }
+      else
+      {
+         hypre_ParCSRMatrixPrintBinaryIJ(A_array[0], 0, 0, filename);
+      }
+
+      /* Signal that the matrix has already been printed */
+      (mgr_data -> print_level) &= ~HYPRE_MGR_PRINT_FINE_MATRIX;
+      (mgr_data -> print_level) |= HYPRE_MGR_PRINT_RESERVED_B;
    }
-#else
-   big_rowptr = hypre_CSRMatrixI(A_local);
-#endif
-   dCreate_CompRowLoc_Matrix_dist(
-            &(dslu_data->A_dslu),global_num_rows,global_num_rows,
-            hypre_CSRMatrixNumNonzeros(A_local),
-            num_rows,
-            hypre_ParCSRMatrixFirstRowIndex(A),
-            hypre_CSRMatrixData(A_local),
-            hypre_CSRMatrixBigJ(A_local),big_rowptr,
-            SLU_NR_loc, SLU_D, SLU_GE);
-
-   /* DOK: SuperLU frees assigned data, so set them to null before
-    * calling hypre_CSRMatrixdestroy on A_local to avoid memory errors.
-   */
-#ifndef HYPRE_MIXEDINT
-   hypre_CSRMatrixI(A_local) = NULL;
-#endif
-   hypre_CSRMatrixData(A_local) = NULL;
-   hypre_CSRMatrixBigJ(A_local) = NULL;
-   hypre_CSRMatrixDestroy(A_local);
 
-   /*Create process grid */
-   while (prows*pcols <= num_procs) ++prows;
-   --prows;
-   pcols = num_procs/prows;
-   while (prows*pcols != num_procs)
+   /* Print linear system RHS at the finest level */
+   if ((print_level & HYPRE_MGR_PRINT_FINE_RHS) && f_array[0])
    {
-      prows -= 1;
-      pcols = num_procs/prows;
+      /* Print RHS */
+      hypre_ParPrintf(comm, "Writing RHS to path: %s\n", data_path);
+      hypre_sprintf(filename, "%s/IJ.out.b", data_path);
+      if (print_level & HYPRE_MGR_PRINT_MODE_ASCII)
+      {
+         hypre_ParVectorPrintIJ(f_array[0], 0, filename);
+      }
+      else
+      {
+         hypre_ParVectorPrintBinaryIJ(f_array[0], filename);
+      }
+
+      /* Free memory */
+      hypre_TFree(filename, HYPRE_MEMORY_HOST);
+
+      /* Signal that the vector has already been printed */
+      (mgr_data -> print_level) &= ~HYPRE_MGR_PRINT_FINE_RHS;
+      (mgr_data -> print_level) |= HYPRE_MGR_PRINT_RESERVED_C;
+   }
+
+   /* Print linear system matrix at the coarsest level */
+   if ((print_level & (HYPRE_MGR_PRINT_CRSE_MATRIX + HYPRE_MGR_PRINT_LVLS_MATRIX)) && A_coarsest)
+   {
+      hypre_ParPrintf(comm, "Writing coarsest level matrix to path: %s\n", data_path);
+      hypre_sprintf(filename, "%s/IJ.out.A.%02d", data_path, num_coarse_levels);
+      if (print_level & HYPRE_MGR_PRINT_MODE_ASCII)
+      {
+         hypre_ParCSRMatrixPrintIJ(A_coarsest, 0, 0, filename);
+      }
+      else
+      {
+         hypre_ParCSRMatrixPrintBinaryIJ(A_coarsest, 0, 0, filename);
+      }
+
+      /* Signal that the matrix has already been printed */
+      (mgr_data -> print_level) &= ~HYPRE_MGR_PRINT_CRSE_MATRIX;
    }
-   //hypre_printf(" prows %d pcols %d\n", prows, pcols);
 
-   superlu_gridinit(comm, prows, pcols, &(dslu_data->dslu_data_grid));
+   /* Print MGR hierarchy */
+   if ((print_level & HYPRE_MGR_PRINT_LVLS_MATRIX))
+   {
+      for (lvl = 0; lvl < num_coarse_levels - 1; lvl++)
+      {
+         /* Print operator matrix */
+         hypre_ParPrintf(comm, "Writing level %d matrix to path: %s\n", lvl + 1, data_path);
+         hypre_sprintf(filename, "%s/IJ.out.A.%02d", data_path, lvl + 1);
+         if (print_level & HYPRE_MGR_PRINT_MODE_ASCII)
+         {
+            hypre_ParCSRMatrixPrintIJ(A_array[lvl + 1], 0, 0, filename);
+         }
+         else
+         {
+            hypre_ParCSRMatrixPrintBinaryIJ(A_array[lvl + 1], 0, 0, filename);
+         }
+
+         /* Print interpolation matrix */
+         if (P_array[lvl])
+         {
+            hypre_ParPrintf(comm, "Writing level %d interpolation to path: %s\n", lvl, data_path);
+            hypre_sprintf(filename, "%s/IJ.out.P.%02d", data_path, lvl);
+            if (print_level & HYPRE_MGR_PRINT_MODE_ASCII)
+            {
+               hypre_ParCSRMatrixPrintIJ(P_array[lvl], 0, 0, filename);
+            }
+            else
+            {
+               hypre_ParCSRMatrixPrintBinaryIJ(P_array[lvl], 0, 0, filename);
+            }
+         }
+
+         /* Print restriction matrix */
+         if (RT_array[lvl])
+         {
+            hypre_ParPrintf(comm, "Writing level %d restriction to path: %s\n", lvl, data_path);
+            hypre_sprintf(filename, "%s/IJ.out.RT.%02d", data_path, lvl);
+            if (print_level & HYPRE_MGR_PRINT_MODE_ASCII)
+            {
+               hypre_ParCSRMatrixPrintIJ(RT_array[lvl], 0, 0, filename);
+            }
+            else
+            {
+               hypre_ParCSRMatrixPrintBinaryIJ(RT_array[lvl], 0, 0, filename);
+            }
+         }
+      }
 
-   set_default_options_dist(&(dslu_data->dslu_options));
+      /* Signal that the data has already been printed */
+      (mgr_data -> print_level) &= ~HYPRE_MGR_PRINT_LVLS_MATRIX;
+   }
 
-   dslu_data->dslu_options.Fact = DOFACT;
-   dslu_data->dslu_options.PrintStat = NO;
-   /*dslu_data->dslu_options.IterRefine = SLU_DOUBLE;
-   dslu_data->dslu_options.ColPerm = MMD_AT_PLUS_A;
-   dslu_data->dslu_options.DiagPivotThresh = 1.0;
-   dslu_data->dslu_options.ReplaceTinyPivot = NO; */
+   /* Free memory */
+   hypre_TFree(filename, HYPRE_MEMORY_HOST);
 
-   dScalePermstructInit(global_num_rows, global_num_rows, &(dslu_data->dslu_ScalePermstruct));
+   return hypre_error_flag;
+}
 
-   dLUstructInit(global_num_rows, &(dslu_data->dslu_data_LU));
+/***************************************************************************
+ ***************************************************************************/
 
-   PStatInit(&(dslu_data->dslu_data_stat));
+#ifdef HYPRE_USING_DSUPERLU
 
-   dslu_data->global_num_rows = global_num_rows;
+/*--------------------------------------------------------------------------
+ * hypre_MGRDirectSolverCreate
+ *--------------------------------------------------------------------------*/
 
-   dslu_data->berr = hypre_CTAlloc(HYPRE_Real, 1, HYPRE_MEMORY_HOST);
-   dslu_data->berr[0] = 0.0;
+void *
+hypre_MGRDirectSolverCreate()
+{
+   //   hypre_DSLUData *dslu_data = hypre_CTAlloc(hypre_DSLUData, 1, HYPRE_MEMORY_HOST);
+   //   return (void *) dslu_data;
+   return NULL;
+}
 
-   pdgssvx(&(dslu_data->dslu_options), &(dslu_data->A_dslu),
-      &(dslu_data->dslu_ScalePermstruct), NULL, num_rows, nrhs,
-      &(dslu_data->dslu_data_grid), &(dslu_data->dslu_data_LU),
-      &(dslu_data->dslu_solve), dslu_data->berr, &(dslu_data->dslu_data_stat), &info);
+/*--------------------------------------------------------------------------
+ * hypre_MGRDirectSolverSetup
+ *--------------------------------------------------------------------------*/
 
-   dslu_data->dslu_options.Fact = FACTORED;
+HYPRE_Int
+hypre_MGRDirectSolverSetup( void                *solver,
+                            hypre_ParCSRMatrix  *A,
+                            hypre_ParVector     *f,
+                            hypre_ParVector     *u )
+{
+   HYPRE_UNUSED_VAR(f);
+   HYPRE_UNUSED_VAR(u);
 
-   return hypre_error_flag;
+   return hypre_SLUDistSetup(solver, A, 0);
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_MGRDirectSolverSolve
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_MGRDirectSolverSolve( void                *solver,
                             hypre_ParCSRMatrix  *A,
                             hypre_ParVector     *f,
                             hypre_ParVector     *u )
 {
-  hypre_SLUDistSolve(solver, f, u);
+   HYPRE_UNUSED_VAR(A);
 
-  return hypre_error_flag;
+   return hypre_SLUDistSolve(solver, f, u);
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_MGRDirectSolverDestroy
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_MGRDirectSolverDestroy( void *solver )
 {
-  hypre_SLUDistDestroy(solver);
-
-  return hypre_error_flag;
+   return hypre_SLUDistDestroy(solver);
 }
 #endif
diff --git a/external/hypre/src/parcsr_ls/par_mgr.h b/external/hypre/src/parcsr_ls/par_mgr.h
index 37cd73b2..5e761be1 100644
--- a/external/hypre/src/parcsr_ls/par_mgr.h
+++ b/external/hypre/src/parcsr_ls/par_mgr.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -7,128 +7,172 @@
 
 #ifndef hypre_ParMGR_DATA_HEADER
 #define hypre_ParMGR_DATA_HEADER
+
 /*--------------------------------------------------------------------------
  * hypre_ParMGRData
  *--------------------------------------------------------------------------*/
+
 typedef struct
 {
-  // block data
-  HYPRE_Int  block_size;
-  HYPRE_Int  *block_num_coarse_indexes;
-  HYPRE_Int  *point_marker_array;
-  HYPRE_Int  **block_cf_marker;
-
-  // initial setup data (user provided)
-  HYPRE_Int num_coarse_levels;
-  HYPRE_Int *num_coarse_per_level;
-  HYPRE_Int **level_coarse_indexes;
-
-  //general data
-  HYPRE_Int max_num_coarse_levels;
-  hypre_ParCSRMatrix **A_array;
-  hypre_ParCSRMatrix **P_array;
-  hypre_ParCSRMatrix **RT_array;
-  hypre_ParCSRMatrix *RAP;
-  hypre_IntArray    **CF_marker_array;
-  HYPRE_Int **coarse_indices_lvls;
-  hypre_ParVector    **F_array;
-  hypre_ParVector    **U_array;
-  hypre_ParVector    *residual;
-  HYPRE_Real    *rel_res_norms;
-
-  hypre_ParCSRMatrix  **A_ff_array;
-  hypre_ParVector    **F_fine_array;
-  hypre_ParVector    **U_fine_array;
-  HYPRE_Solver **aff_solver;
-  HYPRE_Int   (*fine_grid_solver_setup)(void*,void*,void*,void*);
-  HYPRE_Int   (*fine_grid_solver_solve)(void*,void*,void*,void*);
-
-  HYPRE_Real   max_row_sum;
-  HYPRE_Int    num_interp_sweeps;
-  HYPRE_Int    num_restrict_sweeps;
-  //HYPRE_Int    interp_type;
-  HYPRE_Int    *interp_type;
-  HYPRE_Int    *restrict_type;
-  HYPRE_Real   strong_threshold;
-  HYPRE_Real   trunc_factor;
-  HYPRE_Real   S_commpkg_switch;
-  HYPRE_Int    P_max_elmts;
-  HYPRE_Int    num_iterations;
-
-  hypre_Vector **l1_norms;
-  HYPRE_Real    final_rel_residual_norm;
-  HYPRE_Real    tol;
-  HYPRE_Real    relax_weight;
-  HYPRE_Int     relax_type;
-  HYPRE_Int     logging;
-  HYPRE_Int     print_level;
-  HYPRE_Int     frelax_print_level;
-  HYPRE_Int     cg_print_level;
-  HYPRE_Int     max_iter;
-  HYPRE_Int     relax_order;
-  HYPRE_Int     num_relax_sweeps;
-
-  HYPRE_Solver coarse_grid_solver;
-  HYPRE_Int     (*coarse_grid_solver_setup)(void*,void*,void*,void*);
-  HYPRE_Int     (*coarse_grid_solver_solve)(void*,void*,void*,void*);
-
-  HYPRE_Int     use_default_cgrid_solver;
-  HYPRE_Int     use_default_fsolver;
-//  HYPRE_Int     fsolver_type;
-  HYPRE_Real    omega;
-
-  /* temp vectors for solve phase */
-  hypre_ParVector   *Vtemp;
-  hypre_ParVector   *Ztemp;
-  hypre_ParVector   *Utemp;
-  hypre_ParVector   *Ftemp;
-
-  HYPRE_Real          *diaginv;
-  hypre_ParCSRMatrix  *A_ff_inv;
-  HYPRE_Int           n_block;
-  HYPRE_Int           left_size;
-  HYPRE_Int           global_smooth_iters;
-  HYPRE_Int           global_smooth_type;
-  HYPRE_Solver global_smoother;
-  /*
-   Number of points that remain part of the coarse grid throughout the hierarchy.
-   For example, number of well equations
-   */
-  HYPRE_Int reserved_coarse_size;
-  HYPRE_BigInt *reserved_coarse_indexes;
-  HYPRE_Int *reserved_Cpoint_local_indexes;
-
-  HYPRE_Int set_non_Cpoints_to_F;
-  HYPRE_BigInt *idx_array;
-
-  /* F-relaxation method */
-  HYPRE_Int *Frelax_method;
-  HYPRE_Int *Frelax_num_functions;
-
-  /* Non-Galerkin coarse grid */
-  HYPRE_Int *use_non_galerkin_cg;
-
-  /* V-cycle F relaxation method */
-  hypre_ParAMGData    **FrelaxVcycleData;
-  hypre_ParVector   *VcycleRelaxVtemp;
-  hypre_ParVector   *VcycleRelaxZtemp;
-
-  HYPRE_Int   max_local_lvls;
-
-  HYPRE_Int   print_coarse_system;
-  HYPRE_Real  truncate_coarse_grid_threshold;
-
-  /* how to set C points */
-  HYPRE_Int   set_c_points_method;
-
-  /* reduce reserved C-points before coarse grid solve? */
-  /* this might be necessary for some applications, e.g. phase transitions */
-  HYPRE_Int   lvl_to_keep_cpoints;
-
-  HYPRE_Real  cg_convergence_factor;
-
+   /* block data */
+   HYPRE_Int             block_size;
+   HYPRE_Int            *block_num_coarse_indexes;
+   HYPRE_Int            *point_marker_array;
+   HYPRE_Int           **block_cf_marker;
+
+   /* initial setup data (user provided) */
+   HYPRE_Int             num_coarse_levels;
+   HYPRE_Int            *num_coarse_per_level;
+   HYPRE_Int           **level_coarse_indexes;
+
+   /* general data */
+   HYPRE_Int             max_num_coarse_levels;
+   hypre_ParCSRMatrix  **A_array;
+   hypre_ParCSRMatrix  **B_array;    /* block diagonal inverse matrices */
+   hypre_ParCSRMatrix  **B_FF_array; /* block-FF diagonal inverse matrices */
+   hypre_ParCSRMatrix  **A_ff_array;
+#if defined(HYPRE_USING_GPU)
+   hypre_ParCSRMatrix  **P_FF_array;
+#endif
+   hypre_ParCSRMatrix  **P_array;
+   hypre_ParCSRMatrix  **R_array;
+   hypre_ParCSRMatrix  **RT_array;
+   hypre_ParCSRMatrix   *RAP;
+   hypre_IntArray      **CF_marker_array;
+   HYPRE_Int           **coarse_indices_lvls;
+   hypre_ParVector     **F_array;
+   hypre_ParVector     **U_array;
+   hypre_ParVector      *residual;
+   HYPRE_Real           *rel_res_norms;
+
+   hypre_ParVector     **F_fine_array;
+   hypre_ParVector     **U_fine_array;
+   HYPRE_Solver        **aff_solver;
+   HYPRE_Int           (*fine_grid_solver_setup)(void*, void*, void*, void*);
+   HYPRE_Int           (*fine_grid_solver_solve)(void*, void*, void*, void*);
+
+   HYPRE_Real            max_row_sum;
+   HYPRE_Int             num_interp_sweeps;
+   HYPRE_Int             num_restrict_sweeps;
+   HYPRE_Int            *interp_type;
+   HYPRE_Int            *restrict_type;
+   HYPRE_Real            strong_threshold;
+   HYPRE_Real            trunc_factor;
+   HYPRE_Real            S_commpkg_switch;
+   HYPRE_Int            *P_max_elmts;
+   HYPRE_Int             num_iterations;
+
+   hypre_Vector        **l1_norms;
+   HYPRE_Real            final_rel_residual_norm;
+   HYPRE_Real            tol;
+   HYPRE_Real            relax_weight;
+   HYPRE_Int             relax_type;
+   HYPRE_Int             logging;
+   HYPRE_Int             print_level;
+   HYPRE_Int             frelax_print_level;
+   HYPRE_Int             cg_print_level;
+   HYPRE_Int             max_iter;
+   HYPRE_Int             relax_order;
+   HYPRE_Int            *num_relax_sweeps;
+   char                 *data_path;
+
+   HYPRE_Solver          coarse_grid_solver;
+   HYPRE_Int           (*coarse_grid_solver_setup)(void*, void*, void*, void*);
+   HYPRE_Int           (*coarse_grid_solver_solve)(void*, void*, void*, void*);
+
+   HYPRE_Int             use_default_cgrid_solver;
+   // Mode to use an external AMG solver for F-relaxation
+   // 0: use an external AMG solver that is already setup
+   // 1: use an external AMG solver but do setup inside MGR
+   // 2: use default internal AMG solver
+   HYPRE_Int             fsolver_mode;
+   //  HYPRE_Int          fsolver_type;
+   HYPRE_Real            omega;
+
+   /* temp vectors for solve phase */
+   hypre_ParVector      *Vtemp;
+   hypre_ParVector      *Ztemp;
+   hypre_ParVector      *Utemp;
+   hypre_ParVector      *Ftemp;
+
+   HYPRE_Real          **level_diaginv;
+   HYPRE_Real          **frelax_diaginv;
+   HYPRE_Int             n_block;
+   HYPRE_Int             left_size;
+   HYPRE_Int            *blk_size;
+   HYPRE_Int            *level_smooth_iters;
+   HYPRE_Int            *level_smooth_type;
+   HYPRE_Solver         *level_smoother;
+   HYPRE_Int             global_smooth_cycle;
+
+   /*
+    Number of points that remain part of the coarse grid throughout the hierarchy.
+    For example, number of well equations
+    */
+   HYPRE_Int             reserved_coarse_size;
+   HYPRE_BigInt         *reserved_coarse_indexes;
+   HYPRE_Int            *reserved_Cpoint_local_indexes;
+
+   HYPRE_Int             set_non_Cpoints_to_F;
+   HYPRE_BigInt         *idx_array;
+
+   /* F-relaxation type */
+   HYPRE_Int            *Frelax_method;
+   HYPRE_Int            *Frelax_type;
+   HYPRE_Int            *Frelax_num_functions;
+
+   /* Non-Galerkin coarse grid */
+   HYPRE_Int            *coarse_grid_method;
+   HYPRE_Int            *nonglk_max_elmts;
+
+   /* V-cycle F relaxation method */
+   hypre_ParAMGData    **FrelaxVcycleData;
+   hypre_ParVector      *VcycleRelaxVtemp;
+   hypre_ParVector      *VcycleRelaxZtemp;
+
+   HYPRE_Int             max_local_lvls;
+
+   HYPRE_Int             print_coarse_system;
+   HYPRE_Real            truncate_coarse_grid_threshold;
+
+   /* how to set C points */
+   HYPRE_Int             set_c_points_method;
+
+   /* reduce reserved C-points before coarse grid solve? */
+   /* this might be necessary for some applications, e.g. phase transitions */
+   HYPRE_Int             lvl_to_keep_cpoints;
+
+   /* block size for block Jacobi interpolation and relaxation */
+   HYPRE_Int             block_jacobi_bsize;
+
+   HYPRE_Real            cg_convergence_factor;
+
+   /* Data for Gaussian elimination F-relaxation */
+   hypre_ParAMGData    **GSElimData;
 } hypre_ParMGRData;
 
+/*--------------------------------------------------------------------------
+ * hypre_MGRRelaxData
+ *--------------------------------------------------------------------------*/
+
+/* F-relaxation struct for future refactoring of F-relaxation in MGR */
+typedef struct
+{
+   HYPRE_Int             relax_type;
+   HYPRE_Int             relax_nsweeps;
+
+   hypre_ParCSRMatrix   *A;
+   hypre_ParVector      *b;
+
+   /* for hypre's smoother options */
+   HYPRE_Int            *CF_marker;
+
+   /* for block Jacobi/GS option */
+   HYPRE_Complex        *diaginv;
+
+   /* for ILU option */
+   HYPRE_Solver          frelax_solver;
+} hypre_MGRRelaxData;
 
 #define FMRK  -1
 #define CMRK  1
@@ -138,7 +182,70 @@ typedef struct
 #define FPT(i, bsize) (((i) % (bsize)) == FMRK)
 #define CPT(i, bsize) (((i) % (bsize)) == CMRK)
 
-#define SMALLREAL 1e-20
-#define DIVIDE_TOL 1e-32
+/*--------------------------------------------------------------------------
+ * MGR print level codes
+ *--------------------------------------------------------------------------*/
+
+#define HYPRE_MGR_PRINT_INFO_SETUP  0x01       /*   1 (1st bit) */
+#define HYPRE_MGR_PRINT_INFO_SOLVE  0x02       /*   2 (2nd bit) */
+#define HYPRE_MGR_PRINT_INFO_PARAMS 0x04       /*   4 (3rd bit) */
+#define HYPRE_MGR_PRINT_MODE_ASCII  0x08       /*   8 (4th bit) */
+#define HYPRE_MGR_PRINT_FINE_MATRIX 0x10       /*  16 (5th bit) */
+#define HYPRE_MGR_PRINT_FINE_RHS    0x20       /*  32 (6th bit) */
+#define HYPRE_MGR_PRINT_CRSE_MATRIX 0x40       /*  64 (7th bit) */
+#define HYPRE_MGR_PRINT_LVLS_MATRIX 0x80       /* 128 (8th bit) */
+/* ... */
+/* Reserved codes */
+#define HYPRE_MGR_PRINT_RESERVED_C  0x10000000 /*  268435456 (29th bit) */
+#define HYPRE_MGR_PRINT_RESERVED_B  0x20000000 /*  536870912 (30th bit) */
+#define HYPRE_MGR_PRINT_RESERVED_A  0x40000000 /* 1073741824 (31th bit) */
+
+/*--------------------------------------------------------------------------
+ * Acessor macros
+ *--------------------------------------------------------------------------*/
+
+/* TODO (VPM): add remaining acessor macros */
+#define hypre_ParMGRDataBlockSize(data)             ((data) -> block_size)     /* TODO (VPM): block_dim? 3x3=9 is the block_size */
+#define hypre_ParMGRDataBlockNumCoarseIndexes(data) ((data) -> block_num_coarse_indexes)
+#define hypre_ParMGRDataBlockCFMarker(data)         ((data) -> block_cf_marker)
+#define hypre_ParMGRDataPointMarker(data)           ((data) -> point_marker_array)
+
+#define hypre_ParMGRDataNumCoarseLevels(data)       ((data) -> num_coarse_levels)     /* TODO (VPM): change to num_levels ? */
+#define hypre_ParMGRDataMaxCoarseLevels(data)       ((data) -> max_num_coarse_levels) /* TODO (VPM): change to max_levels ? */
+
+#define hypre_ParMGRDataAArray(data)                ((data) -> A_array)
+#define hypre_ParMGRDataA(data, i)                  ((data) -> A_array[i])
+#define hypre_ParMGRDataBArray(data)                ((data) -> B_array)
+#define hypre_ParMGRDataB(data, i)                  ((data) -> B_array[i])
+#define hypre_ParMGRDataPArray(data)                ((data) -> P_array)
+#define hypre_ParMGRDataP(data, i)                  ((data) -> P_array[i])
+#define hypre_ParMGRDataRArray(data)                ((data) -> R_array)
+#define hypre_ParMGRDataR(data, i)                  ((data) -> R_array[i])
+#define hypre_ParMGRDataRTArray(data)               ((data) -> RT_array)
+#define hypre_ParMGRDataRT(data, i)                 ((data) -> RT_array[i])
+#define hypre_ParMGRDataBFFArray(data)              ((data) -> B_FF_array)
+#define hypre_ParMGRDataBFF(data, i)                ((data) -> B_FF_array[i])
+#define hypre_ParMGRDataRAP(data)                   ((data) -> RAP)
+
+#define hypre_ParMGRDataInterpType(data)            ((data) -> interp_type)
+#define hypre_ParMGRDataInterpTypeI(data, i)        ((data) -> interp_type[i])
+#define hypre_ParMGRDataRestrictType(data)          ((data) -> restrict_type)
+#define hypre_ParMGRDataRestrictTypeI(data, i)      ((data) -> restrict_type[i])
+
+#define hypre_ParMGRDataLevelSmoothType(data)       ((data) -> level_smooth_type)
+#define hypre_ParMGRDataLevelSmoothTypeI(data, i)   ((data) -> level_smooth_type[i])
+#define hypre_ParMGRDataLevelSmoother(data)         ((data) -> level_smoother)
+#define hypre_ParMGRDataLevelSmootherI(data, i)     ((data) -> level_smoother[i])
+
+#define hypre_ParMGRDataRelaxType(data)             ((data) -> relax_type)
+#define hypre_ParMGRDataFRelaxType(data)            ((data) -> Frelax_type)
+#define hypre_ParMGRDataFRelaxTypeI(data, i)        ((data) -> Frelax_type[i])
+#define hypre_ParMGRDataAFFsolver(data)             ((data) -> aff_solver)
+#define hypre_ParMGRDataAFFsolverI(data)            ((data) -> aff_solver[i])
+
+#define hypre_ParMGRDataCoarseGridMethod(data)      ((data) -> coarse_grid_method)
+#define hypre_ParMGRDataCoarseGridMethodI(data, i)  ((data) -> coarse_grid_method[i])
+#define hypre_ParMGRDataCoarseGridSolver(data)      ((data) -> coarse_grid_solver)
+#define hypre_ParMGRDataCoarseGridSolverSetup(data) ((data) -> coarse_grid_solver_setup)
 
 #endif
diff --git a/external/hypre/src/parcsr_ls/par_mgr_coarsen.c b/external/hypre/src/parcsr_ls/par_mgr_coarsen.c
new file mode 100644
index 00000000..8d4c6edb
--- /dev/null
+++ b/external/hypre/src/parcsr_ls/par_mgr_coarsen.c
@@ -0,0 +1,54 @@
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+#include "_hypre_parcsr_ls.h"
+#include "par_mgr.h"
+
+/*--------------------------------------------------------------------------
+ * hypre_MGRCoarseParms
+ *
+ * Computes the fine and coarse partitioning arrays at once.
+ *
+ * TODO: Generate the dof_func array as in hypre_BoomerAMGCoarseParms
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_MGRCoarseParms(MPI_Comm          comm,
+                     HYPRE_Int         num_rows,
+                     hypre_IntArray   *CF_marker,
+                     HYPRE_BigInt     *row_starts_cpts,
+                     HYPRE_BigInt     *row_starts_fpts)
+{
+   HYPRE_UNUSED_VAR(num_rows);
+
+   HYPRE_Int     num_cpts;
+   HYPRE_Int     num_fpts;
+
+   HYPRE_BigInt  sbuffer_recv[2];
+   HYPRE_BigInt  sbuffer_send[2];
+
+   /* Count number of Coarse points */
+   hypre_IntArrayCount(CF_marker, 1, &num_cpts);
+
+   /* Count number of Fine points */
+   hypre_IntArrayCount(CF_marker, -1, &num_fpts);
+
+   /* Scan global starts */
+   sbuffer_send[0] = (HYPRE_BigInt) num_cpts;
+   sbuffer_send[1] = (HYPRE_BigInt) num_fpts;
+   hypre_MPI_Scan(&sbuffer_send, &sbuffer_recv, 2, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
+
+   /* First points in next processor's range */
+   row_starts_cpts[1] = sbuffer_recv[0];
+   row_starts_fpts[1] = sbuffer_recv[1];
+
+   /* First points in current processor's range */
+   row_starts_cpts[0] = row_starts_cpts[1] - sbuffer_send[0];
+   row_starts_fpts[0] = row_starts_fpts[1] - sbuffer_send[1];
+
+   return hypre_error_flag;
+}
diff --git a/external/hypre/src/parcsr_ls/par_mgr_device.c b/external/hypre/src/parcsr_ls/par_mgr_device.c
new file mode 100644
index 00000000..1b0e0549
--- /dev/null
+++ b/external/hypre/src/parcsr_ls/par_mgr_device.c
@@ -0,0 +1,1007 @@
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ * Two-grid system solver
+ *
+ *****************************************************************************/
+
+#include "_hypre_onedpl.hpp"
+#include "seq_mv/seq_mv.h"
+#include "_hypre_parcsr_ls.h"
+#include "_hypre_utilities.hpp"
+
+#if defined (HYPRE_USING_GPU)
+
+template<typename T>
+#if defined(HYPRE_USING_SYCL)
+struct functor
+#else
+struct functor : public thrust::binary_function<T, T, T>
+#endif
+{
+   T scale;
+
+   functor(T scale_) { scale = scale_; }
+
+   __host__ __device__
+   T operator()(const T &x, const T &y) const
+   {
+      return x + scale * (y - hypre_abs(x));
+   }
+};
+
+/*--------------------------------------------------------------------------
+ * hypre_MGRBuildPFromWpDevice
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_MGRBuildPFromWpDevice( hypre_ParCSRMatrix   *A,
+                             hypre_ParCSRMatrix   *Wp,
+                             HYPRE_Int            *CF_marker,
+                             hypre_ParCSRMatrix  **P_ptr)
+{
+   /* Wp info */
+   hypre_CSRMatrix     *Wp_diag = hypre_ParCSRMatrixDiag(Wp);
+   hypre_CSRMatrix     *Wp_offd = hypre_ParCSRMatrixOffd(Wp);
+
+   /* Local variables */
+   hypre_ParCSRMatrix  *P;
+   hypre_CSRMatrix     *P_diag;
+   hypre_CSRMatrix     *P_offd;
+   HYPRE_Int            P_diag_nnz;
+
+   hypre_GpuProfilingPushRange("MGRBuildPFromWp");
+
+   /* Set local variables */
+   P_diag_nnz = hypre_CSRMatrixNumNonzeros(Wp_diag) +
+                hypre_CSRMatrixNumCols(Wp_diag);
+
+   /* Create interpolation matrix */
+   P = hypre_ParCSRMatrixCreate(hypre_ParCSRMatrixComm(A),
+                                hypre_ParCSRMatrixGlobalNumRows(A),
+                                hypre_ParCSRMatrixGlobalNumCols(Wp),
+                                hypre_ParCSRMatrixRowStarts(A),
+                                hypre_ParCSRMatrixColStarts(Wp),
+                                hypre_CSRMatrixNumCols(Wp_offd),
+                                P_diag_nnz,
+                                hypre_CSRMatrixNumNonzeros(Wp_offd));
+
+   /* Initialize interpolation matrix */
+   hypre_ParCSRMatrixInitialize_v2(P, HYPRE_MEMORY_DEVICE);
+   hypre_ParCSRMatrixDNumNonzeros(P) = (HYPRE_Real) hypre_ParCSRMatrixNumNonzeros(P);
+   P_diag = hypre_ParCSRMatrixDiag(P);
+   P_offd = hypre_ParCSRMatrixOffd(P);
+
+   /* Copy contents from W to P and set identity matrix for the mapping between coarse points */
+   hypreDevice_extendWtoP(hypre_ParCSRMatrixNumRows(A),
+                          hypre_ParCSRMatrixNumRows(Wp),
+                          hypre_CSRMatrixNumCols(Wp_diag),
+                          CF_marker,
+                          hypre_CSRMatrixNumNonzeros(Wp_diag),
+                          hypre_CSRMatrixI(Wp_diag),
+                          hypre_CSRMatrixJ(Wp_diag),
+                          hypre_CSRMatrixData(Wp_diag),
+                          hypre_CSRMatrixI(P_diag),
+                          hypre_CSRMatrixJ(P_diag),
+                          hypre_CSRMatrixData(P_diag),
+                          hypre_CSRMatrixI(Wp_offd),
+                          hypre_CSRMatrixI(P_offd));
+
+   /* Swap some pointers to avoid data copies */
+   hypre_CSRMatrixJ(hypre_ParCSRMatrixOffd(P))    = hypre_CSRMatrixJ(Wp_offd);
+   hypre_CSRMatrixData(hypre_ParCSRMatrixOffd(P)) = hypre_CSRMatrixData(Wp_offd);
+   hypre_CSRMatrixJ(Wp_offd)    = NULL;
+   hypre_CSRMatrixData(Wp_offd) = NULL;
+   /* hypre_ParCSRMatrixDeviceColMapOffd(P)    = hypre_ParCSRMatrixDeviceColMapOffd(Wp); */
+   /* hypre_ParCSRMatrixColMapOffd(P)          = hypre_ParCSRMatrixColMapOffd(Wp); */
+   /* hypre_ParCSRMatrixDeviceColMapOffd(Wp)   = NULL; */
+   /* hypre_ParCSRMatrixColMapOffd(Wp)         = NULL; */
+
+   /* Create communication package */
+   hypre_MatvecCommPkgCreate(P);
+
+   /* Set output pointer to the interpolation matrix */
+   *P_ptr = P;
+
+   hypre_GpuProfilingPopRange();
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_MGRBuildPDevice
+ *
+ * TODO: make use of hypre_MGRBuildPFromWpDevice
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_MGRBuildPDevice(hypre_ParCSRMatrix  *A,
+                      HYPRE_Int           *CF_marker,
+                      HYPRE_BigInt        *num_cpts_global,
+                      HYPRE_Int            method,
+                      hypre_ParCSRMatrix **P_ptr)
+{
+   MPI_Comm            comm = hypre_ParCSRMatrixComm(A);
+   HYPRE_Int           num_procs, my_id;
+   HYPRE_Int           A_nr_of_rows = hypre_ParCSRMatrixNumRows(A);
+
+   hypre_ParCSRMatrix *A_FF = NULL, *A_FC = NULL, *P = NULL;
+   hypre_CSRMatrix    *W_diag = NULL, *W_offd = NULL;
+   HYPRE_Int           W_nr_of_rows, P_diag_nnz, nfpoints;
+   HYPRE_Int          *P_diag_i = NULL, *P_diag_j = NULL, *P_offd_i = NULL;
+   HYPRE_Complex      *P_diag_data = NULL, *diag = NULL, *diag1 = NULL;
+   HYPRE_BigInt        nC_global;
+
+   hypre_MPI_Comm_size(comm, &num_procs);
+   hypre_MPI_Comm_rank(comm, &my_id);
+   hypre_GpuProfilingPushRange("MGRBuildP");
+
+#if defined(HYPRE_USING_SYCL)
+   nfpoints = HYPRE_ONEDPL_CALL(std::count,
+                                CF_marker,
+                                CF_marker + A_nr_of_rows,
+                                -1);
+#else
+   nfpoints = HYPRE_THRUST_CALL(count,
+                                CF_marker,
+                                CF_marker + A_nr_of_rows,
+                                -1);
+#endif
+
+   if (method > 0)
+   {
+      hypre_ParCSRMatrixGenerateFFFCDevice(A, CF_marker, num_cpts_global, NULL, &A_FC, &A_FF);
+      diag = hypre_CTAlloc(HYPRE_Complex, nfpoints, HYPRE_MEMORY_DEVICE);
+      if (method == 1)
+      {
+         // extract diag inverse sqrt
+         // hypre_CSRMatrixExtractDiagonalDevice(hypre_ParCSRMatrixDiag(A_FF), diag, 3);
+
+         // L1-Jacobi-type interpolation
+         HYPRE_Complex scal = 1.0;
+
+         diag1 = hypre_CTAlloc(HYPRE_Complex, nfpoints, HYPRE_MEMORY_DEVICE);
+         hypre_CSRMatrixExtractDiagonalDevice(hypre_ParCSRMatrixDiag(A_FF), diag, 0);
+
+         hypre_CSRMatrixComputeRowSumDevice(hypre_ParCSRMatrixDiag(A_FF), NULL, NULL,
+                                            diag1, 1, 1.0, "set");
+         hypre_CSRMatrixComputeRowSumDevice(hypre_ParCSRMatrixDiag(A_FC), NULL, NULL,
+                                            diag1, 1, 1.0, "add");
+         hypre_CSRMatrixComputeRowSumDevice(hypre_ParCSRMatrixOffd(A_FF), NULL, NULL,
+                                            diag1, 1, 1.0, "add");
+         hypre_CSRMatrixComputeRowSumDevice(hypre_ParCSRMatrixOffd(A_FC), NULL, NULL,
+                                            diag1, 1, 1.0, "add");
+
+#if defined(HYPRE_USING_SYCL)
+         HYPRE_ONEDPL_CALL(std::transform,
+                           diag,
+                           diag + nfpoints,
+                           diag1,
+                           diag,
+                           functor<HYPRE_Complex>(scal));
+
+         HYPRE_ONEDPL_CALL(std::transform,
+                           diag,
+                           diag + nfpoints,
+                           diag,
+         [] (auto x) { return 1.0 / x; });
+#else
+         HYPRE_THRUST_CALL(transform,
+                           diag,
+                           diag + nfpoints,
+                           diag1,
+                           diag,
+                           functor<HYPRE_Complex>(scal));
+
+         HYPRE_THRUST_CALL(transform,
+                           diag,
+                           diag + nfpoints,
+                           diag,
+                           1.0 / _1);
+#endif
+
+         hypre_TFree(diag1, HYPRE_MEMORY_DEVICE);
+      }
+      else if (method == 2)
+      {
+         // extract diag inverse
+         hypre_CSRMatrixExtractDiagonalDevice(hypre_ParCSRMatrixDiag(A_FF), diag, 2);
+      }
+
+#if defined(HYPRE_USING_SYCL)
+      HYPRE_ONEDPL_CALL( transform, diag, diag + nfpoints, diag, std::negate<HYPRE_Complex>() );
+#else
+      HYPRE_THRUST_CALL( transform, diag, diag + nfpoints, diag, thrust::negate<HYPRE_Complex>() );
+#endif
+
+      hypre_Vector *D_FF_inv = hypre_SeqVectorCreate(nfpoints);
+      hypre_VectorData(D_FF_inv) = diag;
+      hypre_SeqVectorInitialize_v2(D_FF_inv, HYPRE_MEMORY_DEVICE);
+      hypre_CSRMatrixDiagScaleDevice(hypre_ParCSRMatrixDiag(A_FC), D_FF_inv, NULL);
+      hypre_CSRMatrixDiagScaleDevice(hypre_ParCSRMatrixOffd(A_FC), D_FF_inv, NULL);
+      hypre_SeqVectorDestroy(D_FF_inv);
+      W_diag = hypre_ParCSRMatrixDiag(A_FC);
+      W_offd = hypre_ParCSRMatrixOffd(A_FC);
+      nC_global = hypre_ParCSRMatrixGlobalNumCols(A_FC);
+   }
+   else
+   {
+      W_diag = hypre_CSRMatrixCreate(nfpoints, A_nr_of_rows - nfpoints, 0);
+      W_offd = hypre_CSRMatrixCreate(nfpoints, 0, 0);
+      hypre_CSRMatrixInitialize_v2(W_diag, 0, HYPRE_MEMORY_DEVICE);
+      hypre_CSRMatrixInitialize_v2(W_offd, 0, HYPRE_MEMORY_DEVICE);
+
+      if (my_id == (num_procs - 1))
+      {
+         nC_global = num_cpts_global[1];
+      }
+      hypre_MPI_Bcast(&nC_global, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
+   }
+
+   W_nr_of_rows = hypre_CSRMatrixNumRows(W_diag);
+
+   /* Construct P from matrix product W_diag */
+   P_diag_nnz  = hypre_CSRMatrixNumNonzeros(W_diag) + hypre_CSRMatrixNumCols(W_diag);
+   P_diag_i    = hypre_TAlloc(HYPRE_Int,     A_nr_of_rows + 1, HYPRE_MEMORY_DEVICE);
+   P_diag_j    = hypre_TAlloc(HYPRE_Int,     P_diag_nnz,     HYPRE_MEMORY_DEVICE);
+   P_diag_data = hypre_TAlloc(HYPRE_Complex, P_diag_nnz,     HYPRE_MEMORY_DEVICE);
+   P_offd_i    = hypre_TAlloc(HYPRE_Int,     A_nr_of_rows + 1, HYPRE_MEMORY_DEVICE);
+
+   hypreDevice_extendWtoP( A_nr_of_rows,
+                           W_nr_of_rows,
+                           hypre_CSRMatrixNumCols(W_diag),
+                           CF_marker,
+                           hypre_CSRMatrixNumNonzeros(W_diag),
+                           hypre_CSRMatrixI(W_diag),
+                           hypre_CSRMatrixJ(W_diag),
+                           hypre_CSRMatrixData(W_diag),
+                           P_diag_i,
+                           P_diag_j,
+                           P_diag_data,
+                           hypre_CSRMatrixI(W_offd),
+                           P_offd_i );
+
+   // final P
+   P = hypre_ParCSRMatrixCreate(hypre_ParCSRMatrixComm(A),
+                                hypre_ParCSRMatrixGlobalNumRows(A),
+                                nC_global,
+                                hypre_ParCSRMatrixColStarts(A),
+                                num_cpts_global,
+                                hypre_CSRMatrixNumCols(W_offd),
+                                P_diag_nnz,
+                                hypre_CSRMatrixNumNonzeros(W_offd) );
+
+   hypre_CSRMatrixMemoryLocation(hypre_ParCSRMatrixDiag(P)) = HYPRE_MEMORY_DEVICE;
+   hypre_CSRMatrixMemoryLocation(hypre_ParCSRMatrixOffd(P)) = HYPRE_MEMORY_DEVICE;
+
+   hypre_CSRMatrixI(hypre_ParCSRMatrixDiag(P))    = P_diag_i;
+   hypre_CSRMatrixJ(hypre_ParCSRMatrixDiag(P))    = P_diag_j;
+   hypre_CSRMatrixData(hypre_ParCSRMatrixDiag(P)) = P_diag_data;
+
+   hypre_CSRMatrixI(hypre_ParCSRMatrixOffd(P))    = P_offd_i;
+   hypre_CSRMatrixJ(hypre_ParCSRMatrixOffd(P))    = hypre_CSRMatrixJ(W_offd);
+   hypre_CSRMatrixData(hypre_ParCSRMatrixOffd(P)) = hypre_CSRMatrixData(W_offd);
+   hypre_CSRMatrixJ(W_offd)    = NULL;
+   hypre_CSRMatrixData(W_offd) = NULL;
+
+   if (method > 0)
+   {
+      hypre_ParCSRMatrixDeviceColMapOffd(P)    = hypre_ParCSRMatrixDeviceColMapOffd(A_FC);
+      hypre_ParCSRMatrixColMapOffd(P)          = hypre_ParCSRMatrixColMapOffd(A_FC);
+      hypre_ParCSRMatrixDeviceColMapOffd(A_FC) = NULL;
+      hypre_ParCSRMatrixColMapOffd(A_FC)       = NULL;
+      hypre_ParCSRMatrixNumNonzeros(P)         = hypre_ParCSRMatrixNumNonzeros(A_FC) +
+                                                 hypre_ParCSRMatrixGlobalNumCols(A_FC);
+   }
+   else
+   {
+      hypre_ParCSRMatrixNumNonzeros(P) = nC_global;
+   }
+   hypre_ParCSRMatrixDNumNonzeros(P) = (HYPRE_Real) hypre_ParCSRMatrixNumNonzeros(P);
+
+   hypre_MatvecCommPkgCreate(P);
+
+   *P_ptr = P;
+
+   if (A_FF)
+   {
+      hypre_ParCSRMatrixDestroy(A_FF);
+   }
+   if (A_FC)
+   {
+      hypre_ParCSRMatrixDestroy(A_FC);
+   }
+
+   if (method <= 0)
+   {
+      hypre_CSRMatrixDestroy(W_diag);
+      hypre_CSRMatrixDestroy(W_offd);
+   }
+
+   hypre_GpuProfilingPopRange();
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_MGRRelaxL1JacobiDevice
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_MGRRelaxL1JacobiDevice( hypre_ParCSRMatrix *A,
+                              hypre_ParVector    *f,
+                              HYPRE_Int          *CF_marker,
+                              HYPRE_Int           relax_points,
+                              HYPRE_Real          relax_weight,
+                              HYPRE_Real         *l1_norms,
+                              hypre_ParVector    *u,
+                              hypre_ParVector    *Vtemp )
+{
+   hypre_BoomerAMGRelax(A, f, CF_marker, 18,
+                        relax_points, relax_weight, 1.0,
+                        l1_norms, u, Vtemp, NULL);
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypreGPUKernel_CSRMatrixExtractBlockDiag
+ *
+ * Fills vector diag with the block diagonals from the input matrix.
+ * This function uses column-major storage for diag.
+ *
+ * TODOs:
+ *    1) Move this to csr_matop_device.c
+ *    2) Use sub-warps?
+ *    3) blk_size as template arg.
+ *    4) Choose diag storage between row and column-major?
+ *    5) Should we build flat arrays, arrays of pointers, or allow both?
+ *--------------------------------------------------------------------------*/
+
+__global__ void
+hypreGPUKernel_CSRMatrixExtractBlockDiag( hypre_DeviceItem  &item,
+                                          HYPRE_Int          blk_size,
+                                          HYPRE_Int          num_rows,
+                                          HYPRE_Int         *A_i,
+                                          HYPRE_Int         *A_j,
+                                          HYPRE_Complex     *A_a,
+                                          HYPRE_Int         *B_i,
+                                          HYPRE_Int         *B_j,
+                                          HYPRE_Complex     *B_a )
+{
+   HYPRE_Int   lane = hypre_gpu_get_lane_id<1>(item);
+   HYPRE_Int   bs2  = blk_size * blk_size;
+   HYPRE_Int   bidx;
+   HYPRE_Int   lidx;
+   HYPRE_Int   i, ii, j, pj, qj;
+   HYPRE_Int   col;
+
+   /* Grid-stride loop over block matrix rows */
+   for (bidx = hypre_gpu_get_grid_warp_id<1, 1>(item);
+        bidx < num_rows / blk_size;
+        bidx += hypre_gpu_get_grid_num_warps<1, 1>(item))
+   {
+      ii = bidx * blk_size;
+
+      /* Set output row pointer and column indices */
+      for (i = lane; i < blk_size; i += HYPRE_WARP_SIZE)
+      {
+         B_i[ii + i + 1] = (ii + i + 1) * blk_size;
+      }
+
+      /* Set output column indices (row major) */
+      for (j = lane; j < bs2; j += HYPRE_WARP_SIZE)
+      {
+         B_j[ii * blk_size + j] = ii + j % blk_size;
+      }
+
+      /* TODO: unroll this loop */
+      for (lidx = 0; lidx < blk_size; lidx++)
+      {
+         i = ii + lidx;
+
+         if (lane < 2)
+         {
+            pj = read_only_load(A_i + i + lane);
+         }
+         qj = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, pj, 1);
+         pj = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, pj, 0);
+
+         /* Loop over columns */
+         for (j = pj + lane; j < qj; j += HYPRE_WARP_SIZE)
+         {
+            col = read_only_load(A_j + j);
+
+            if ((col >= ii) &&
+                (col <  ii + blk_size) &&
+                (fabs(A_a[j]) > HYPRE_REAL_MIN))
+            {
+               /* batch offset + column offset + row offset */
+               B_a[ii * blk_size + (col - ii) * blk_size + lidx] = A_a[j];
+            }
+         }
+      } /* Local block loop */
+   } /* Grid-stride loop */
+}
+
+/*--------------------------------------------------------------------------
+ * hypreGPUKernel_CSRMatrixExtractBlockDiagMarked
+ *
+ * Fills vector diag with the block diagonals from the input matrix.
+ * This function uses column-major storage for diag.
+ *
+ * TODOs:
+ *    1) Move this to csr_matop_device.c
+ *    2) Use sub-warps?
+ *    3) blk_size as template arg.
+ *    4) Choose diag storage between row and column-major?
+ *    5) Should we build flat arrays, arrays of pointers, or allow both?
+ *--------------------------------------------------------------------------*/
+
+__global__ void
+hypreGPUKernel_CSRMatrixExtractBlockDiagMarked( hypre_DeviceItem  &item,
+                                                HYPRE_Int          blk_size,
+                                                HYPRE_Int          num_rows,
+                                                HYPRE_Int          marker_val,
+                                                HYPRE_Int         *marker,
+                                                HYPRE_Int         *marker_indices,
+                                                HYPRE_Int         *A_i,
+                                                HYPRE_Int         *A_j,
+                                                HYPRE_Complex     *A_a,
+                                                HYPRE_Int         *B_i,
+                                                HYPRE_Int         *B_j,
+                                                HYPRE_Complex     *B_a )
+{
+   HYPRE_Int   lane = hypre_gpu_get_lane_id<1>(item);
+   HYPRE_Int   bidx;
+   HYPRE_Int   lidx;
+   HYPRE_Int   i, ii, j, pj, qj, k;
+   HYPRE_Int   col;
+
+   /* Grid-stride loop over block matrix rows */
+   for (bidx = hypre_gpu_get_grid_warp_id<1, 1>(item);
+        bidx < num_rows / blk_size;
+        bidx += hypre_gpu_get_grid_num_warps<1, 1>(item))
+   {
+      /* TODO: unroll this loop */
+      for (lidx = 0; lidx < blk_size; lidx++)
+      {
+         ii = bidx * blk_size;
+         i  = ii + lidx;
+
+         if (marker[i] == marker_val)
+         {
+            if (lane < 2)
+            {
+               pj = read_only_load(A_i + i + lane);
+            }
+            qj = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, pj, 1);
+            pj = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, pj, 0);
+
+            /* Loop over columns */
+            for (j = pj + lane; j < qj; j += HYPRE_WARP_SIZE)
+            {
+               k = read_only_load(A_j + j);
+               col = A_j[k];
+
+               if (marker[col] == marker_val)
+               {
+                  if ((col >= ii) &&
+                      (col <  ii + blk_size) &&
+                      (fabs(A_a[k]) > HYPRE_REAL_MIN))
+                  {
+                     /* batch offset + column offset + row offset */
+                     B_a[marker_indices[ii] * blk_size + (col - ii) * blk_size + lidx] = A_a[k];
+                  }
+               }
+            }
+         } /* row check */
+      } /* Local block loop */
+   } /* Grid-stride loop */
+}
+
+/*--------------------------------------------------------------------------
+ * hypreGPUKernel_ComplexMatrixBatchedTranspose
+ *
+ * Transposes a group of dense matrices. Assigns one warp per block (batch).
+ * Naive implementation.
+ *
+ * TODOs (VPM):
+ *    1) Move to proper file.
+ *    2) Use template argument for other data types
+ *    3) Implement in-place transpose.
+ *--------------------------------------------------------------------------*/
+
+__global__ void
+hypreGPUKernel_ComplexMatrixBatchedTranspose( hypre_DeviceItem  &item,
+                                              HYPRE_Int          num_blocks,
+                                              HYPRE_Int          block_size,
+                                              HYPRE_Complex     *A_data,
+                                              HYPRE_Complex     *B_data )
+{
+   HYPRE_Int   lane = hypre_gpu_get_lane_id<1>(item);
+   HYPRE_Int   bs2  = block_size * block_size;
+   HYPRE_Int   bidx, lidx;
+
+   /* Grid-stride loop over block matrix rows */
+   for (bidx = hypre_gpu_get_grid_warp_id<1, 1>(item);
+        bidx < num_blocks;
+        bidx += hypre_gpu_get_grid_num_warps<1, 1>(item))
+   {
+      for (lidx = lane; lidx < bs2; lidx += HYPRE_WARP_SIZE)
+      {
+         B_data[bidx * bs2 + lidx] =
+            A_data[bidx * bs2 + (lidx / block_size + (lidx % block_size) * block_size)];
+      }
+   } /* Grid-stride loop */
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixExtractBlockDiagDevice
+ *
+ * TODOs (VPM):
+ *   1) Allow other local solver choices. Design an interface for that.
+ *   2) Move this to par_csr_matop_device.c
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ParCSRMatrixExtractBlockDiagDevice( hypre_ParCSRMatrix   *A,
+                                          HYPRE_Int             blk_size,
+                                          HYPRE_Int             num_points,
+                                          HYPRE_Int             point_type,
+                                          HYPRE_Int            *CF_marker,
+                                          HYPRE_Int             diag_size,
+                                          HYPRE_Int             diag_type,
+                                          HYPRE_Int            *B_diag_i,
+                                          HYPRE_Int            *B_diag_j,
+                                          HYPRE_Complex        *B_diag_data )
+{
+   HYPRE_UNUSED_VAR(CF_marker);
+   HYPRE_UNUSED_VAR(diag_size);
+
+   /* Matrix variables */
+   HYPRE_BigInt          num_rows_A   = hypre_ParCSRMatrixGlobalNumRows(A);
+   hypre_CSRMatrix      *A_diag       = hypre_ParCSRMatrixDiag(A);
+   HYPRE_Int             num_rows     = hypre_CSRMatrixNumRows(A_diag);
+   HYPRE_Int            *A_diag_i     = hypre_CSRMatrixI(A_diag);
+   HYPRE_Int            *A_diag_j     = hypre_CSRMatrixJ(A_diag);
+   HYPRE_Complex        *A_diag_data  = hypre_CSRMatrixData(A_diag);
+
+   /* Local LS variables */
+#if defined(HYPRE_USING_ONEMKLBLAS)
+   std::int64_t         *pivots;
+   std::int64_t          work_sizes[2];
+   std::int64_t          work_size;
+   HYPRE_Complex        *scratchpad;
+#else
+   HYPRE_Int            *pivots;
+   HYPRE_Complex       **tmpdiag_aop;
+   HYPRE_Int            *info;
+#endif
+   HYPRE_Int            *blk_row_indices;
+   HYPRE_Complex        *tmpdiag;
+   HYPRE_Complex       **diag_aop;
+
+   /* Local variables */
+   HYPRE_Int             bs2 = blk_size * blk_size;
+   HYPRE_Int             num_blocks;
+   HYPRE_Int             bdiag_size;
+
+   /* Additional variables for debugging */
+#if HYPRE_DEBUG
+   HYPRE_Int            *h_info;
+   HYPRE_Int             k, myid;
+
+   hypre_MPI_Comm_rank(hypre_ParCSRMatrixComm(A), &myid);
+#endif
+
+   /*-----------------------------------------------------------------
+    * Sanity checks
+    *-----------------------------------------------------------------*/
+
+   if (blk_size < 1)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Invalid block size!");
+
+      return hypre_error_flag;
+   }
+
+   if ((num_rows_A > 0) && (num_rows_A < blk_size))
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Input matrix is smaller than block size!");
+
+      return hypre_error_flag;
+   }
+
+   /* Return if the local matrix is empty */
+   if (!num_rows)
+   {
+      return hypre_error_flag;
+   }
+
+   /*-----------------------------------------------------------------
+    * Initial
+    *-----------------------------------------------------------------*/
+
+   hypre_GpuProfilingPushRange("ParCSRMatrixExtractBlockDiag");
+
+   /* Count the number of points matching point_type in CF_marker */
+   if (CF_marker)
+   {
+      /* Compute block row indices */
+      blk_row_indices = hypre_TAlloc(HYPRE_Int, num_rows, HYPRE_MEMORY_DEVICE);
+      hypreDevice_IntFilln(blk_row_indices, (size_t) num_rows, 1);
+#if defined(HYPRE_USING_SYCL)
+      HYPRE_ONEDPL_CALL(oneapi::dpl::exclusive_scan_by_segment,
+                        CF_marker,
+                        CF_marker + num_rows,
+                        blk_row_indices,
+                        blk_row_indices);
+#else
+      HYPRE_THRUST_CALL(exclusive_scan_by_key,
+                        CF_marker,
+                        CF_marker + num_rows,
+                        blk_row_indices,
+                        blk_row_indices);
+#endif
+   }
+   else
+   {
+      blk_row_indices = NULL;
+   }
+
+   /* Compute block info */
+   num_blocks = hypre_ceildiv(num_points, blk_size);
+   bdiag_size = num_blocks * bs2;
+
+   if (num_points % blk_size)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "TODO! num_points % blk_size != 0");
+      hypre_GpuProfilingPopRange();
+
+      return hypre_error_flag;
+   }
+
+   /*-----------------------------------------------------------------
+    * Extract diagonal sub-blocks (pattern and coefficients)
+    *-----------------------------------------------------------------*/
+   {
+      dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+      dim3 gDim = hypre_GetDefaultDeviceGridDimension(num_blocks, "warp", bDim);
+
+      if (CF_marker)
+      {
+         HYPRE_GPU_LAUNCH( hypreGPUKernel_CSRMatrixExtractBlockDiagMarked, gDim, bDim,
+                           blk_size, num_rows, point_type, CF_marker, blk_row_indices,
+                           A_diag_i, A_diag_j, A_diag_data,
+                           B_diag_i, B_diag_j, B_diag_data );
+      }
+      else
+      {
+         HYPRE_GPU_LAUNCH( hypreGPUKernel_CSRMatrixExtractBlockDiag, gDim, bDim,
+                           blk_size, num_rows,
+                           A_diag_i, A_diag_j, A_diag_data,
+                           B_diag_i, B_diag_j, B_diag_data );
+      }
+   }
+
+   /*-----------------------------------------------------------------
+    * Invert diagonal sub-blocks
+    *-----------------------------------------------------------------*/
+
+   if (diag_type == 1)
+   {
+      HYPRE_ANNOTATE_REGION_BEGIN("%s", "InvertDiagSubBlocks");
+
+      /* Memory allocation */
+      tmpdiag     = hypre_TAlloc(HYPRE_Complex, bdiag_size, HYPRE_MEMORY_DEVICE);
+      diag_aop    = hypre_TAlloc(HYPRE_Complex *, num_blocks, HYPRE_MEMORY_DEVICE);
+#if defined(HYPRE_USING_ONEMKLBLAS)
+      pivots      = hypre_CTAlloc(std::int64_t, num_rows * blk_size, HYPRE_MEMORY_DEVICE);
+#else
+      pivots      = hypre_CTAlloc(HYPRE_Int, num_rows * blk_size, HYPRE_MEMORY_DEVICE);
+      tmpdiag_aop = hypre_TAlloc(HYPRE_Complex *, num_blocks, HYPRE_MEMORY_DEVICE);
+      info        = hypre_CTAlloc(HYPRE_Int, num_blocks, HYPRE_MEMORY_DEVICE);
+#if defined (HYPRE_DEBUG)
+      h_info      = hypre_TAlloc(HYPRE_Int,  num_blocks, HYPRE_MEMORY_HOST);
+#endif
+
+      /* Memory copy */
+      hypre_TMemcpy(tmpdiag, B_diag_data, HYPRE_Complex, bdiag_size,
+                    HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+
+      /* Set work array of pointers */
+      hypreDevice_ComplexArrayToArrayOfPtrs(num_blocks, bs2, tmpdiag, tmpdiag_aop);
+#endif
+
+      /* Set array of pointers */
+      hypreDevice_ComplexArrayToArrayOfPtrs(num_blocks, bs2, B_diag_data, diag_aop);
+
+      /* Compute LU factorization */
+#if defined(HYPRE_USING_CUBLAS)
+      HYPRE_CUBLAS_CALL(hypre_cublas_getrfBatched(hypre_HandleCublasHandle(hypre_handle()),
+                                                  blk_size,
+                                                  tmpdiag_aop,
+                                                  blk_size,
+                                                  pivots,
+                                                  info,
+                                                  num_blocks));
+#elif defined(HYPRE_USING_ROCSOLVER)
+      HYPRE_ROCSOLVER_CALL(rocsolver_dgetrf_batched(hypre_HandleVendorSolverHandle(hypre_handle()),
+                                                    blk_size,
+                                                    blk_size,
+                                                    tmpdiag_aop,
+                                                    blk_size,
+                                                    pivots,
+                                                    blk_size,
+                                                    info,
+                                                    num_blocks));
+
+#elif defined(HYPRE_USING_ONEMKLBLAS)
+      HYPRE_ONEMKL_CALL( work_sizes[0] =
+                            oneapi::mkl::lapack::getrf_batch_scratchpad_size<HYPRE_Complex>( *hypre_HandleComputeStream(
+                                                                                                hypre_handle()),
+                                                                                             blk_size, // std::int64_t m,
+                                                                                             blk_size, // std::int64_t n,
+                                                                                             blk_size, // std::int64_t lda,
+                                                                                             bs2, // std::int64_t stride_a,
+                                                                                             blk_size, // std::int64_t stride_ipiv,
+                                                                                             num_blocks ) ); // std::int64_t batch_size
+
+      HYPRE_ONEMKL_CALL( work_sizes[1] =
+                            oneapi::mkl::lapack::getri_batch_scratchpad_size<HYPRE_Complex>( *hypre_HandleComputeStream(
+                                                                                                hypre_handle()),
+                                                                                             (std::int64_t) blk_size, // std::int64_t n,
+                                                                                             (std::int64_t) blk_size, // std::int64_t lda,
+                                                                                             (std::int64_t) bs2, // std::int64_t stride_a,
+                                                                                             (std::int64_t) blk_size, // std::int64_t stride_ipiv,
+                                                                                             (std::int64_t) num_blocks // std::int64_t batch_size
+                                                                                           ) );
+      work_size  = hypre_max(work_sizes[0], work_sizes[1]);
+      scratchpad = hypre_TAlloc(HYPRE_Complex, work_size, HYPRE_MEMORY_DEVICE);
+
+      HYPRE_ONEMKL_CALL( oneapi::mkl::lapack::getrf_batch( *hypre_HandleComputeStream(hypre_handle()),
+                                                           (std::int64_t) blk_size, // std::int64_t m,
+                                                           (std::int64_t) blk_size, // std::int64_t n,
+                                                           *diag_aop, // T *a,
+                                                           (std::int64_t) blk_size, // std::int64_t lda,
+                                                           (std::int64_t) bs2, // std::int64_t stride_a,
+                                                           pivots, // std::int64_t *ipiv,
+                                                           (std::int64_t) blk_size, // std::int64_t stride_ipiv,
+                                                           (std::int64_t) num_blocks, // std::int64_t batch_size,
+                                                           scratchpad, // T *scratchpad,
+                                                           (std::int64_t) work_size // std::int64_t scratchpad_size,
+                                                         ).wait() ); // const std::vector<cl::sycl::event> &events = {} ) );
+#else
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Block inversion not available!");
+      return hypre_error_flag;
+#endif
+
+#if defined (HYPRE_DEBUG) && !defined(HYPRE_USING_ONEMKLBLAS)
+      hypre_TMemcpy(h_info, info, HYPRE_Int, num_blocks, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
+      for (k = 0; k < num_blocks; k++)
+      {
+         if (h_info[k] != 0)
+         {
+            if (h_info[k] < 0)
+            {
+               hypre_printf("[%d]: LU fact. failed at system %d, parameter %d ",
+                            myid, k, h_info[k]);
+            }
+            else
+            {
+               hypre_printf("[%d]: Singular U(%d, %d) at system %d",
+                            myid, h_info[k], h_info[k], k);
+            }
+         }
+      }
+#endif
+
+      /* Compute sub-blocks inverses */
+#if defined(HYPRE_USING_CUBLAS)
+      HYPRE_CUBLAS_CALL(hypre_cublas_getriBatched(hypre_HandleCublasHandle(hypre_handle()),
+                                                  blk_size,
+                                                  (const HYPRE_Real **) tmpdiag_aop,
+                                                  blk_size,
+                                                  pivots,
+                                                  diag_aop,
+                                                  blk_size,
+                                                  info,
+                                                  num_blocks));
+#elif defined(HYPRE_USING_ROCSOLVER)
+      HYPRE_ROCSOLVER_CALL(rocsolver_dgetri_batched(hypre_HandleVendorSolverHandle(hypre_handle()),
+                                                    blk_size,
+                                                    tmpdiag_aop,
+                                                    blk_size,
+                                                    pivots,
+                                                    blk_size,
+                                                    info,
+                                                    num_blocks));
+#elif defined(HYPRE_USING_ONEMKLBLAS)
+      HYPRE_ONEMKL_CALL( oneapi::mkl::lapack::getri_batch( *hypre_HandleComputeStream(hypre_handle()),
+                                                           (std::int64_t) blk_size, // std::int64_t n,
+                                                           *diag_aop, // T *a,
+                                                           (std::int64_t) blk_size, // std::int64_t lda,
+                                                           (std::int64_t) bs2, // std::int64_t stride_a,
+                                                           pivots, // std::int64_t *ipiv,
+                                                           (std::int64_t) blk_size, // std::int64_t stride_ipiv,
+                                                           (std::int64_t) num_blocks, // std::int64_t batch_size,
+                                                           scratchpad, // T *scratchpad,
+                                                           work_size // std::int64_t scratchpad_size
+                                                         ).wait() );
+#else
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Block inversion not available!");
+      return hypre_error_flag;
+#endif
+
+      /* Free memory */
+      hypre_TFree(diag_aop, HYPRE_MEMORY_DEVICE);
+      hypre_TFree(pivots, HYPRE_MEMORY_DEVICE);
+#if defined(HYPRE_USING_ONEMKLBLAS)
+      hypre_TFree(scratchpad, HYPRE_MEMORY_DEVICE);
+#else
+      hypre_TFree(tmpdiag_aop, HYPRE_MEMORY_DEVICE);
+      hypre_TFree(info, HYPRE_MEMORY_DEVICE);
+#if defined (HYPRE_DEBUG)
+      hypre_TFree(h_info, HYPRE_MEMORY_HOST);
+#endif
+#endif
+
+      /* Transpose data to row-major format */
+      {
+         dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+         dim3 gDim = hypre_GetDefaultDeviceGridDimension(num_blocks, "warp", bDim);
+
+         /* Memory copy */
+         hypre_TMemcpy(tmpdiag, B_diag_data, HYPRE_Complex, bdiag_size,
+                       HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+
+         HYPRE_GPU_LAUNCH( hypreGPUKernel_ComplexMatrixBatchedTranspose, gDim, bDim,
+                           num_blocks, blk_size, tmpdiag, B_diag_data );
+      }
+
+      /* Free memory */
+      hypre_TFree(tmpdiag, HYPRE_MEMORY_DEVICE);
+
+      HYPRE_ANNOTATE_REGION_END("%s", "InvertDiagSubBlocks");
+   }
+
+   /* Free memory */
+   hypre_TFree(blk_row_indices, HYPRE_MEMORY_DEVICE);
+   hypre_GpuProfilingPopRange();
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixBlockDiagMatrixDevice
+ *
+ * TODO: Move this to par_csr_matop_device.c (VPM)
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ParCSRMatrixBlockDiagMatrixDevice( hypre_ParCSRMatrix  *A,
+                                         HYPRE_Int            blk_size,
+                                         HYPRE_Int            point_type,
+                                         HYPRE_Int           *CF_marker,
+                                         HYPRE_Int            diag_type,
+                                         hypre_ParCSRMatrix **B_ptr )
+{
+   /* Input matrix info */
+   MPI_Comm              comm            = hypre_ParCSRMatrixComm(A);
+   HYPRE_BigInt         *row_starts_A    = hypre_ParCSRMatrixRowStarts(A);
+   HYPRE_BigInt          num_rows_A      = hypre_ParCSRMatrixGlobalNumRows(A);
+   hypre_CSRMatrix      *A_diag          = hypre_ParCSRMatrixDiag(A);
+   HYPRE_Int             A_diag_num_rows = hypre_CSRMatrixNumRows(A_diag);
+
+   /* Global block matrix info */
+   hypre_ParCSRMatrix   *par_B;
+   HYPRE_BigInt          num_rows_B;
+   HYPRE_BigInt          row_starts_B[2];
+
+   /* Diagonal block matrix info */
+   hypre_CSRMatrix      *B_diag;
+   HYPRE_Int             B_diag_num_rows;
+   HYPRE_Int             B_diag_size;
+   HYPRE_Int            *B_diag_i;
+   HYPRE_Int            *B_diag_j;
+   HYPRE_Complex        *B_diag_data;
+
+   /* Local variables */
+   HYPRE_BigInt          num_rows_big;
+   HYPRE_BigInt          scan_recv;
+   HYPRE_Int             num_procs, my_id;
+   HYPRE_Int             num_blocks;
+
+   hypre_MPI_Comm_rank(comm, &my_id);
+   hypre_MPI_Comm_size(comm, &num_procs);
+
+   /*-----------------------------------------------------------------
+    * Count the number of points matching point_type in CF_marker
+    *-----------------------------------------------------------------*/
+
+   if (!CF_marker)
+   {
+      B_diag_num_rows = A_diag_num_rows;
+   }
+   else
+   {
+#if defined(HYPRE_USING_SYCL)
+      B_diag_num_rows = HYPRE_ONEDPL_CALL( std::count,
+                                           CF_marker,
+                                           CF_marker + A_diag_num_rows,
+                                           point_type );
+#else
+      B_diag_num_rows = HYPRE_THRUST_CALL( count,
+                                           CF_marker,
+                                           CF_marker + A_diag_num_rows,
+                                           point_type );
+#endif
+   }
+   num_blocks  = hypre_ceildiv(B_diag_num_rows, blk_size);
+   B_diag_size = blk_size * (blk_size * num_blocks);
+
+   /*-----------------------------------------------------------------
+    * Compute global number of rows and partitionings
+    *-----------------------------------------------------------------*/
+
+   if (CF_marker)
+   {
+      num_rows_big = (HYPRE_BigInt) B_diag_num_rows;
+      hypre_MPI_Scan(&num_rows_big, &scan_recv, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
+
+      /* first point in my range */
+      row_starts_B[0] = scan_recv - num_rows_big;
+
+      /* first point in next proc's range */
+      row_starts_B[1] = scan_recv;
+      if (my_id == (num_procs - 1))
+      {
+         num_rows_B = row_starts_B[1];
+      }
+      hypre_MPI_Bcast(&num_rows_B, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
+   }
+   else
+   {
+      row_starts_B[0] = row_starts_A[0];
+      row_starts_B[1] = row_starts_A[1];
+      num_rows_B = num_rows_A;
+   }
+
+   /* Create matrix B */
+   par_B = hypre_ParCSRMatrixCreate(comm,
+                                    num_rows_B,
+                                    num_rows_B,
+                                    row_starts_B,
+                                    row_starts_B,
+                                    0,
+                                    B_diag_size,
+                                    0);
+   hypre_ParCSRMatrixInitialize_v2(par_B, HYPRE_MEMORY_DEVICE);
+   B_diag      = hypre_ParCSRMatrixDiag(par_B);
+   B_diag_i    = hypre_CSRMatrixI(B_diag);
+   B_diag_j    = hypre_CSRMatrixJ(B_diag);
+   B_diag_data = hypre_CSRMatrixData(B_diag);
+
+   /*-----------------------------------------------------------------------
+    * Extract coefficients
+    *-----------------------------------------------------------------------*/
+
+   hypre_ParCSRMatrixExtractBlockDiagDevice(A, blk_size, B_diag_num_rows,
+                                            point_type, CF_marker,
+                                            B_diag_size, diag_type,
+                                            B_diag_i, B_diag_j, B_diag_data);
+
+   /* Set output pointer */
+   *B_ptr = par_B;
+
+   return hypre_error_flag;
+}
+
+#endif
diff --git a/external/hypre/src/parcsr_ls/par_mgr_interp.c b/external/hypre/src/parcsr_ls/par_mgr_interp.c
new file mode 100644
index 00000000..83a4776b
--- /dev/null
+++ b/external/hypre/src/parcsr_ls/par_mgr_interp.c
@@ -0,0 +1,2637 @@
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+#include "_hypre_parcsr_ls.h"
+#include "par_mgr.h"
+
+/*--------------------------------------------------------------------------
+ * hypre_MGRBuildInterp
+ *
+ * Build MGR's prolongation matrix P = [Wp I]^T where Wp might be computed
+ * explicitly and returned as an output of this function.
+ * Wp approximates [- inv(A_FF) * A_FC]. Note the negative sign.
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_MGRBuildInterp(hypre_ParCSRMatrix   *A,
+                     hypre_ParCSRMatrix   *A_FF,
+                     hypre_ParCSRMatrix   *A_FC,
+                     hypre_ParCSRMatrix   *S,
+                     hypre_IntArray       *CF_marker,
+                     HYPRE_BigInt         *num_cpts_global,
+                     HYPRE_Real            trunc_factor,
+                     HYPRE_Int             max_elmts,
+                     HYPRE_Int             blk_size,
+                     HYPRE_Int             interp_type,
+                     HYPRE_Int             num_sweeps_post,
+                     hypre_ParCSRMatrix  **Wp_ptr,
+                     hypre_ParCSRMatrix  **P_ptr)
+{
+   HYPRE_Int             *CF_marker_data  = hypre_IntArrayData(CF_marker);
+   hypre_ParCSRMatrix    *P = NULL;
+   hypre_ParCSRMatrix    *Wp = NULL;
+
+#if defined (HYPRE_USING_GPU)
+   HYPRE_MemoryLocation   memory_location = hypre_ParCSRMatrixMemoryLocation(A);
+   HYPRE_ExecutionPolicy  exec = hypre_GetExecPolicy1(memory_location);
+#endif
+
+   /* Sanity checks */
+   if (!Wp_ptr)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Wp_ptr is not NULL!");
+      return hypre_error_flag;
+   }
+
+   if (!P_ptr)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "P_ptr is not NULL!");
+      return hypre_error_flag;
+   }
+
+   HYPRE_ANNOTATE_FUNC_BEGIN;
+   hypre_GpuProfilingPushRange("Interp");
+
+   /* Interpolation for each level */
+   if (interp_type < 3)
+   {
+#if defined (HYPRE_USING_GPU)
+      if (exec == HYPRE_EXEC_DEVICE)
+      {
+         hypre_MGRBuildPDevice(A, CF_marker_data, num_cpts_global, interp_type, &P);
+      }
+      else
+#endif
+      {
+         hypre_MGRBuildPHost(A, A_FF, A_FC, CF_marker_data, num_cpts_global,
+                             interp_type, &Wp, &P);
+
+         /* TODO (VPM): Revisit Prolongation post-smoothing */
+#if 0
+         if (interp_type == 2)
+         {
+            HYPRE_Real  jac_trunc_threshold = trunc_factor;
+            HYPRE_Real  jac_trunc_threshold_minus = 0.5 * jac_trunc_threshold;
+            HYPRE_Int   i;
+
+            for (i = 0; i < num_sweeps_post; i++)
+            {
+               hypre_BoomerAMGJacobiInterp(A, &P, S, 1, NULL, CF_marker_data, 0,
+                                           jac_trunc_threshold, jac_trunc_threshold_minus);
+            }
+            hypre_BoomerAMGInterpTruncation(P, trunc_factor, max_elmts);
+         }
+#else
+         HYPRE_UNUSED_VAR(num_sweeps_post);
+#endif
+      }
+   }
+   else if (interp_type == 4)
+   {
+#if defined (HYPRE_USING_GPU)
+      if (exec == HYPRE_EXEC_DEVICE)
+      {
+         hypre_IntArrayMigrate(CF_marker, HYPRE_MEMORY_HOST);
+         hypre_ParCSRMatrixMigrate(A, HYPRE_MEMORY_HOST);
+         hypre_MGRBuildInterpApproximateInverse(A, CF_marker_data, num_cpts_global, &P);
+         hypre_ParCSRMatrixMigrate(A, memory_location);
+         hypre_IntArrayMigrate(CF_marker, memory_location);
+      }
+      else
+#endif
+      {
+         hypre_MGRBuildInterpApproximateInverse(A, CF_marker_data, num_cpts_global, &P);
+      }
+
+      /* Perform truncation */
+      hypre_BoomerAMGInterpTruncation(P, trunc_factor, max_elmts);
+   }
+   else if (interp_type == 5)
+   {
+      hypre_BoomerAMGBuildModExtInterp(A, CF_marker_data, S, num_cpts_global,
+                                       1, NULL, 0, trunc_factor, max_elmts, &P);
+   }
+   else if (interp_type == 6)
+   {
+      hypre_BoomerAMGBuildModExtPIInterp(A, CF_marker_data, S, num_cpts_global,
+                                         1, NULL, 0, trunc_factor, max_elmts, &P);
+   }
+   else if (interp_type == 7)
+   {
+      hypre_BoomerAMGBuildModExtPEInterp(A, CF_marker_data, S, num_cpts_global,
+                                         1, NULL, 0, trunc_factor, max_elmts, &P);
+   }
+   else if (interp_type == 12)
+   {
+      /* Block diagonal interpolation */
+      hypre_MGRBuildBlockJacobiWp(A_FF, A_FC, blk_size, &Wp);
+      hypre_MGRBuildBlockJacobiP(A, A_FF, A_FC, Wp, blk_size, CF_marker_data, &P);
+   }
+   else
+   {
+      /* Classical modified interpolation */
+      hypre_BoomerAMGBuildInterp(A, CF_marker_data, S, num_cpts_global, 1, NULL, 0,
+                                 trunc_factor, max_elmts, &P);
+   }
+
+   /* set pointer to Wp and P */
+   *Wp_ptr = Wp;
+   *P_ptr = P;
+
+   hypre_GpuProfilingPopRange();
+   HYPRE_ANNOTATE_FUNC_END;
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_MGRBuildRestrict
+ *
+ * Build MGR's restriction matrix R = [Wr I] where Wr might be computed
+ * explicitly and returned as an output of this function.
+ * Wr approximates [- A_CF * inv(A_FF)]. Note the negative sign.
+ *
+ * TODOs (VPM):
+ *   1) Add post-smoothing
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_MGRBuildRestrict( hypre_ParCSRMatrix    *A,
+                        hypre_ParCSRMatrix    *A_FF,
+                        hypre_ParCSRMatrix    *A_FC,
+                        hypre_ParCSRMatrix    *A_CF,
+                        hypre_IntArray        *CF_marker,
+                        HYPRE_BigInt          *num_cpts_global,
+                        HYPRE_Real             trunc_factor,
+                        HYPRE_Int              max_elmts,
+                        HYPRE_Real             strong_threshold,
+                        HYPRE_Real             max_row_sum,
+                        HYPRE_Int              blk_size,
+                        HYPRE_Int              restrict_type,
+                        hypre_ParCSRMatrix   **Wr_ptr,
+                        hypre_ParCSRMatrix   **R_ptr,
+                        hypre_ParCSRMatrix   **RT_ptr)
+{
+   /* Input variables */
+   HYPRE_Int             *CF_marker_data = hypre_IntArrayData(CF_marker);
+
+   /* Output variables */
+   hypre_ParCSRMatrix    *Wr    = NULL;
+   hypre_ParCSRMatrix    *R     = NULL;
+   hypre_ParCSRMatrix    *RT    = NULL;
+
+   /* Local variables */
+   hypre_ParCSRMatrix    *AT    = NULL;
+   hypre_ParCSRMatrix    *A_FFT = NULL;
+   hypre_ParCSRMatrix    *A_FCT = NULL;
+   hypre_ParCSRMatrix    *ST    = NULL;
+
+#if defined (HYPRE_USING_GPU)
+   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_ParCSRMatrixMemoryLocation(A) );
+#endif
+
+   HYPRE_ANNOTATE_FUNC_BEGIN;
+   hypre_GpuProfilingPushRange("Restrict");
+
+   /* Build AT (transpose A) */
+   if (restrict_type > 0 && restrict_type != 14)
+   {
+      hypre_ParCSRMatrixTranspose(A, &AT, 1);
+
+      if (A_FF)
+      {
+         hypre_ParCSRMatrixTranspose(A_FF, &A_FFT, 1);
+      }
+
+      if (A_FC)
+      {
+         hypre_ParCSRMatrixTranspose(A_FC, &A_FCT, 1);
+      }
+   }
+
+   /* Restriction for each level */
+   if (restrict_type == 0)
+   {
+#if defined (HYPRE_USING_GPU)
+      if (exec == HYPRE_EXEC_DEVICE)
+      {
+         hypre_MGRBuildPDevice(A, CF_marker_data, num_cpts_global, restrict_type, &RT);
+      }
+      else
+#endif
+      {
+         hypre_MGRBuildP(A, CF_marker_data, num_cpts_global, restrict_type, 0, &RT);
+      }
+   }
+   else if (restrict_type == 1 || restrict_type == 2)
+   {
+#if defined (HYPRE_USING_GPU)
+      if (exec == HYPRE_EXEC_DEVICE)
+      {
+         hypre_MGRBuildPDevice(AT, CF_marker_data, num_cpts_global, restrict_type, &RT);
+      }
+      else
+#endif
+      {
+         hypre_MGRBuildP(AT, CF_marker_data, num_cpts_global, restrict_type, 0, &RT);
+      }
+   }
+   else if (restrict_type == 3)
+   {
+      /* move diagonal to first entry */
+      hypre_CSRMatrixReorder(hypre_ParCSRMatrixDiag(AT));
+      hypre_MGRBuildInterpApproximateInverse(AT, CF_marker_data, num_cpts_global, &RT);
+      hypre_BoomerAMGInterpTruncation(RT, trunc_factor, max_elmts);
+   }
+   else if (restrict_type == 4 || restrict_type == 5)
+   {
+      /* Approximate Ideal Restriction (AIR) */
+      HYPRE_Real    filter_thresholdR = 0.0;
+      HYPRE_Int     gmres_switch = 64;
+      HYPRE_Int     is_triangular = 0;
+      HYPRE_Int    *dofunc_buff_data = NULL;
+      HYPRE_Int     air15_flag = 1;
+      HYPRE_Int     debug = 0;
+
+      hypre_BoomerAMGCreateSabs(A, strong_threshold, 1.0, 1, NULL, &ST);
+
+      if (restrict_type == 4)
+      {
+         /* distance-1 AIR */
+         hypre_BoomerAMGBuildRestrAIR(A, CF_marker_data, ST, num_cpts_global, 1,
+                                      dofunc_buff_data, filter_thresholdR, debug, &R,
+                                      is_triangular, gmres_switch);
+      }
+      else
+      {
+         /* distance-1.5 AIR - distance 2 locally and distance 1 across procs. */
+         hypre_BoomerAMGBuildRestrDist2AIR(A, CF_marker_data, ST, num_cpts_global, 1,
+                                           dofunc_buff_data, filter_thresholdR, debug, &R,
+                                           air15_flag, is_triangular, gmres_switch);
+      }
+   }
+   else if (restrict_type == 12)
+   {
+      hypre_MGRBuildBlockJacobiP(AT, A_FFT, A_FCT, NULL, blk_size, CF_marker_data, &RT);
+   }
+   else if (restrict_type == 13) // CPR-like restriction operator
+   {
+      /* TODO: create a function with this block (VPM) */
+      hypre_ParCSRMatrix   *A_CF_blk    = NULL;
+      hypre_ParCSRMatrix   *A_CFT_blk   = NULL;
+      hypre_ParCSRMatrix   *WrT         = NULL;
+      hypre_ParCSRMatrix   *A_FF_blkinv = NULL;
+
+#if defined (HYPRE_USING_GPU)
+      if (exec == HYPRE_EXEC_DEVICE)
+      {
+         hypre_error_w_msg(HYPRE_ERROR_GENERIC, "No GPU support!");
+
+         hypre_GpuProfilingPopRange();
+         HYPRE_ANNOTATE_FUNC_END;
+         return hypre_error_flag;
+      }
+      else
+#endif
+      {
+         /* Get block A_CF */
+         hypre_MGRTruncateAcfCPR(A_CF, &A_CF_blk);
+
+         /* Transpose block A_CF */
+         hypre_ParCSRMatrixTranspose(A_CF_blk, &A_CFT_blk, 1);
+
+         /* Compute block diagonal A_FF */
+         hypre_ParCSRMatrixBlockDiagMatrix(AT, blk_size, -1, CF_marker_data, 1,
+                                           &A_FF_blkinv);
+
+         /* Compute WrT = -A_FF_blk^{-T} * A_CF^{T}  */
+         WrT = hypre_ParCSRMatMat(A_FF_blkinv, A_CFT_blk);
+         hypre_ParCSRMatrixScale(WrT, -1.0);
+
+         /* compute restriction operator RT = [WrT  I] (transposed for use with RAP) */
+         hypre_MGRBuildPFromWp(AT, WrT, CF_marker_data, &RT);
+      }
+
+      /* Free memory */
+      hypre_ParCSRMatrixDestroy(A_CF_blk);
+      hypre_ParCSRMatrixDestroy(A_CFT_blk);
+      hypre_ParCSRMatrixDestroy(WrT);
+      hypre_ParCSRMatrixDestroy(A_FF_blkinv);
+   }
+   else if (restrict_type == 14)
+   {
+      if (blk_size > 1)
+      {
+         /* Block column-lumped restriction */
+         hypre_MGRBlockColLumpedRestrict(A, A_FF, A_CF, CF_marker, blk_size, &Wr, &R);
+      }
+      else
+      {
+         /* Column-lumped restriction */
+         hypre_MGRColLumpedRestrict(A, A_FF, A_CF, CF_marker, &Wr, &R);
+      }
+   }
+   else
+   {
+      /* Build new strength matrix */
+      hypre_BoomerAMGCreateS(AT, strong_threshold, max_row_sum, 1, NULL, &ST);
+
+      /* Classical modified interpolation */
+      hypre_BoomerAMGBuildInterp(AT, CF_marker_data, ST, num_cpts_global, 1, NULL, 0,
+                                 trunc_factor, max_elmts, &RT);
+   }
+
+   /* Compute R^T so it can be used in the solve phase */
+   if (RT)
+   {
+      hypre_ParCSRMatrixLocalTranspose(RT);
+   }
+
+   /* Set output pointers */
+   *RT_ptr = RT;
+   *R_ptr  = R;
+   *Wr_ptr = Wr;
+
+   /* Free memory */
+   hypre_ParCSRMatrixDestroy(AT);
+   hypre_ParCSRMatrixDestroy(A_FFT);
+   hypre_ParCSRMatrixDestroy(A_FCT);
+   hypre_ParCSRMatrixDestroy(ST);
+
+   hypre_GpuProfilingPopRange();
+   HYPRE_ANNOTATE_FUNC_END;
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_MGRBuildPFromWp
+ *
+ * Build prolongation matrix from the Nf x Nc matrix
+ *
+ * TODO (VPM): Move this function to par_interp.c ?
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_MGRBuildPFromWp( hypre_ParCSRMatrix    *A,
+                       hypre_ParCSRMatrix    *Wp,
+                       HYPRE_Int             *CF_marker,
+                       hypre_ParCSRMatrix   **P_ptr)
+{
+   HYPRE_ANNOTATE_FUNC_BEGIN;
+
+#if defined(HYPRE_USING_GPU)
+   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_ParCSRMatrixMemoryLocation(A) );
+
+   if (exec == HYPRE_EXEC_DEVICE)
+   {
+      hypre_MGRBuildPFromWpDevice(A, Wp, CF_marker, P_ptr);
+   }
+   else
+#endif
+   {
+      hypre_MGRBuildPFromWpHost(A, Wp, CF_marker, P_ptr);
+   }
+
+   HYPRE_ANNOTATE_FUNC_END;
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_MGRBuildPFromWpHost
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_MGRBuildPFromWpHost( hypre_ParCSRMatrix    *A,
+                           hypre_ParCSRMatrix    *Wp,
+                           HYPRE_Int             *CF_marker,
+                           hypre_ParCSRMatrix   **P_ptr)
+{
+   MPI_Comm               comm = hypre_ParCSRMatrixComm(A);
+   HYPRE_MemoryLocation   memory_location_P = hypre_ParCSRMatrixMemoryLocation(A);
+   hypre_ParCSRMatrix    *P;
+
+   hypre_CSRMatrix       *P_diag = NULL;
+   hypre_CSRMatrix       *P_offd = NULL;
+   hypre_CSRMatrix       *Wp_diag, *Wp_offd;
+
+   HYPRE_Real            *P_diag_data, *Wp_diag_data;
+   HYPRE_Int             *P_diag_i, *Wp_diag_i;
+   HYPRE_Int             *P_diag_j, *Wp_diag_j;
+   HYPRE_Real            *P_offd_data, *Wp_offd_data;
+   HYPRE_Int             *P_offd_i, *Wp_offd_i;
+   HYPRE_Int             *P_offd_j, *Wp_offd_j;
+
+   HYPRE_Int              P_num_rows, P_diag_size, P_offd_size;
+   HYPRE_Int              jj_counter, jj_counter_offd;
+   HYPRE_Int              start_indexing = 0; /* start indexing for P_data at 0 */
+
+   HYPRE_Int              i, jj;
+   HYPRE_Int              row_Wp, coarse_counter;
+   HYPRE_Real             one  = 1.0;
+   HYPRE_Int              my_id;
+   HYPRE_Int              num_procs;
+
+   hypre_MPI_Comm_size(comm, &num_procs);
+   hypre_MPI_Comm_rank(comm, &my_id);
+   //num_threads = hypre_NumThreads();
+   // Temporary fix, disable threading
+   // TODO: enable threading
+   P_num_rows = hypre_CSRMatrixNumRows(hypre_ParCSRMatrixDiag(A));
+
+   Wp_diag = hypre_ParCSRMatrixDiag(Wp);
+   Wp_offd = hypre_ParCSRMatrixOffd(Wp);
+   Wp_diag_i = hypre_CSRMatrixI(Wp_diag);
+   Wp_diag_j = hypre_CSRMatrixJ(Wp_diag);
+   Wp_diag_data = hypre_CSRMatrixData(Wp_diag);
+   Wp_offd_i = hypre_CSRMatrixI(Wp_offd);
+   Wp_offd_j = hypre_CSRMatrixJ(Wp_offd);
+   Wp_offd_data = hypre_CSRMatrixData(Wp_offd);
+
+   /*-----------------------------------------------------------------------
+   *  Intialize counters and allocate mapping vector.
+   *-----------------------------------------------------------------------*/
+   P_diag_size = hypre_CSRMatrixNumNonzeros(Wp_diag) + hypre_CSRMatrixNumCols(Wp_diag);
+
+   P_diag_i    = hypre_CTAlloc(HYPRE_Int,  P_num_rows + 1, memory_location_P);
+   P_diag_j    = hypre_CTAlloc(HYPRE_Int,  P_diag_size, memory_location_P);
+   P_diag_data = hypre_CTAlloc(HYPRE_Real,  P_diag_size, memory_location_P);
+   P_diag_i[P_num_rows] = P_diag_size;
+
+   P_offd_size = hypre_CSRMatrixNumNonzeros(Wp_offd);
+
+   P_offd_i    = hypre_CTAlloc(HYPRE_Int,  P_num_rows + 1, memory_location_P);
+   P_offd_j    = hypre_CTAlloc(HYPRE_Int,  P_offd_size, memory_location_P);
+   P_offd_data = hypre_CTAlloc(HYPRE_Real,  P_offd_size, memory_location_P);
+   P_offd_i[P_num_rows] = P_offd_size;
+
+   /*-----------------------------------------------------------------------
+   *  Intialize some stuff.
+   *-----------------------------------------------------------------------*/
+   jj_counter = start_indexing;
+   jj_counter_offd = start_indexing;
+
+   row_Wp = 0;
+   coarse_counter = 0;
+   for (i = 0; i < P_num_rows; i++)
+   {
+      /*--------------------------------------------------------------------
+      *  If i is a c-point, interpolation is the identity.
+      *--------------------------------------------------------------------*/
+      if (CF_marker[i] >= 0)
+      {
+         P_diag_i[i] = jj_counter;
+         P_diag_j[jj_counter]    = coarse_counter;
+         P_diag_data[jj_counter] = one;
+         coarse_counter++;
+         jj_counter++;
+      }
+      /*--------------------------------------------------------------------
+      *  If i is an F-point, build interpolation.
+      *--------------------------------------------------------------------*/
+      else
+      {
+         /* Diagonal part of P */
+         P_diag_i[i] = jj_counter;
+         for (jj = Wp_diag_i[row_Wp]; jj < Wp_diag_i[row_Wp + 1]; jj++)
+         {
+            P_diag_j[jj_counter]    = Wp_diag_j[jj];
+            P_diag_data[jj_counter] = Wp_diag_data[jj];
+            jj_counter++;
+         }
+
+         /* Off-Diagonal part of P */
+         P_offd_i[i] = jj_counter_offd;
+         if (num_procs > 1)
+         {
+            for (jj = Wp_offd_i[row_Wp]; jj < Wp_offd_i[row_Wp + 1]; jj++)
+            {
+               P_offd_j[jj_counter_offd]    = Wp_offd_j[jj];
+               P_offd_data[jj_counter_offd] = Wp_offd_data[jj];
+               jj_counter_offd++;
+            }
+         }
+         row_Wp++;
+      }
+      P_offd_i[i + 1] = jj_counter_offd;
+   }
+   P = hypre_ParCSRMatrixCreate(comm,
+                                hypre_ParCSRMatrixGlobalNumRows(A),
+                                hypre_ParCSRMatrixGlobalNumCols(Wp),
+                                hypre_ParCSRMatrixColStarts(A),
+                                hypre_ParCSRMatrixColStarts(Wp),
+                                hypre_CSRMatrixNumCols(hypre_ParCSRMatrixOffd(Wp)),
+                                P_diag_size,
+                                P_offd_size);
+
+   P_diag = hypre_ParCSRMatrixDiag(P);
+   hypre_CSRMatrixData(P_diag) = P_diag_data;
+   hypre_CSRMatrixI(P_diag) = P_diag_i;
+   hypre_CSRMatrixJ(P_diag) = P_diag_j;
+
+   P_offd = hypre_ParCSRMatrixOffd(P);
+   hypre_CSRMatrixData(P_offd) = P_offd_data;
+   hypre_CSRMatrixI(P_offd) = P_offd_i;
+   hypre_CSRMatrixJ(P_offd) = P_offd_j;
+
+   hypre_ParCSRMatrixColMapOffd(P) =
+      hypre_TAlloc(HYPRE_BigInt,
+                   hypre_CSRMatrixNumCols(hypre_ParCSRMatrixOffd(Wp)),
+                   memory_location_P);
+   hypre_TMemcpy(hypre_ParCSRMatrixColMapOffd(P), hypre_ParCSRMatrixColMapOffd(Wp),
+                 HYPRE_BigInt, hypre_CSRMatrixNumCols(hypre_ParCSRMatrixOffd(Wp)),
+                 memory_location_P, memory_location_P);
+
+   hypre_ParCSRMatrixNumNonzeros(P)  = hypre_CSRMatrixNumNonzeros(hypre_ParCSRMatrixDiag(P)) +
+                                       hypre_CSRMatrixNumNonzeros(hypre_ParCSRMatrixOffd(P));
+   hypre_ParCSRMatrixDNumNonzeros(P) = (HYPRE_Real) hypre_ParCSRMatrixNumNonzeros(P);
+
+   hypre_MatvecCommPkgCreate(P);
+   *P_ptr = P;
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_MGRBuildBlockJacobiWp
+ *
+ * TODO: Move this to hypre_MGRBuildBlockJacobiP? (VPM)
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_MGRBuildBlockJacobiWp( hypre_ParCSRMatrix   *A_FF,
+                             hypre_ParCSRMatrix   *A_FC,
+                             HYPRE_Int             blk_size,
+                             hypre_ParCSRMatrix  **Wp_ptr )
+{
+   hypre_ParCSRMatrix   *A_FF_inv;
+   hypre_ParCSRMatrix   *Wp;
+
+   HYPRE_ANNOTATE_FUNC_BEGIN;
+
+   /* Build A_FF_inv */
+   hypre_ParCSRMatrixBlockDiagMatrix(A_FF, blk_size, -1, NULL, 1, &A_FF_inv);
+
+   /* Compute Wp = -A_FF_inv * A_FC */
+   Wp = hypre_ParCSRMatMat(A_FF_inv, A_FC);
+   hypre_ParCSRMatrixScale(Wp, -1.0);
+
+   /* Free memory */
+   hypre_ParCSRMatrixDestroy(A_FF_inv);
+
+   /* Set output pointer */
+   *Wp_ptr = Wp;
+
+   HYPRE_ANNOTATE_FUNC_END;
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_MGRBuildBlockJacobiP
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_MGRBuildBlockJacobiP( hypre_ParCSRMatrix   *A,
+                            hypre_ParCSRMatrix   *A_FF,
+                            hypre_ParCSRMatrix   *A_FC,
+                            hypre_ParCSRMatrix   *Wp,
+                            HYPRE_Int             blk_size,
+                            HYPRE_Int            *CF_marker,
+                            hypre_ParCSRMatrix  **P_ptr)
+{
+   hypre_ParCSRMatrix   *Wp_tmp;
+
+   HYPRE_ANNOTATE_FUNC_BEGIN;
+
+   if (Wp == NULL)
+   {
+      hypre_MGRBuildBlockJacobiWp(A_FF, A_FC, blk_size, &Wp_tmp);
+      hypre_MGRBuildPFromWp(A, Wp_tmp, CF_marker, P_ptr);
+
+      hypre_ParCSRMatrixDeviceColMapOffd(Wp_tmp) = NULL;
+      hypre_ParCSRMatrixColMapOffd(Wp_tmp)       = NULL;
+
+      hypre_ParCSRMatrixDestroy(Wp_tmp);
+   }
+   else
+   {
+      hypre_MGRBuildPFromWp(A, Wp, CF_marker, P_ptr);
+   }
+
+   HYPRE_ANNOTATE_FUNC_END;
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_ExtendWtoPHost
+ *
+ * TODO (VPM): merge with hypre_MGRBuildPFromWpHost
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ExtendWtoPHost(HYPRE_Int      P_nr_of_rows,
+                     HYPRE_Int     *CF_marker,
+                     HYPRE_Int     *W_diag_i,
+                     HYPRE_Int     *W_diag_j,
+                     HYPRE_Complex *W_diag_data,
+                     HYPRE_Int     *P_diag_i,
+                     HYPRE_Int     *P_diag_j,
+                     HYPRE_Complex *P_diag_data,
+                     HYPRE_Int     *W_offd_i,
+                     HYPRE_Int     *P_offd_i)
+{
+   HYPRE_Int      jj_counter, jj_counter_offd;
+   HYPRE_Int      start_indexing = 0; /* start indexing for P_data at 0 */
+   HYPRE_Int     *fine_to_coarse = NULL;
+   HYPRE_Int      coarse_counter;
+
+   HYPRE_Int      i, jj;
+   HYPRE_Real     one  = 1.0;
+
+   /*-----------------------------------------------------------------------
+    *  Intialize counters and allocate mapping vector.
+    *-----------------------------------------------------------------------*/
+
+   fine_to_coarse = hypre_CTAlloc(HYPRE_Int, P_nr_of_rows, HYPRE_MEMORY_HOST);
+
+   for (i = 0; i < P_nr_of_rows; i++) { fine_to_coarse[i] = -1; }
+
+   /*-----------------------------------------------------------------------
+    *  Loop over fine grid.
+    *-----------------------------------------------------------------------*/
+
+   HYPRE_Int row_counter = 0;
+   coarse_counter = 0;
+   for (i = 0; i < P_nr_of_rows; i++)
+   {
+      /*--------------------------------------------------------------------
+       *  If i is a C-point, interpolation is the identity. Also set up
+       *  mapping vector.
+       *--------------------------------------------------------------------*/
+
+      if (CF_marker[i] > 0)
+      {
+         fine_to_coarse[i] = coarse_counter;
+         coarse_counter++;
+      }
+   }
+
+   /*-----------------------------------------------------------------------
+    *  Intialize counters
+    *-----------------------------------------------------------------------*/
+
+   jj_counter = start_indexing;
+   jj_counter_offd = start_indexing;
+
+   row_counter = 0;
+   for (i = 0; i < P_nr_of_rows; i++)
+   {
+      /*--------------------------------------------------------------------
+       *  If i is a c-point, interpolation is the identity.
+       *--------------------------------------------------------------------*/
+      if (CF_marker[i] >= 0)
+      {
+         P_diag_i[i] = jj_counter;
+         P_diag_j[jj_counter]    = fine_to_coarse[i];
+         P_diag_data[jj_counter] = one;
+         jj_counter++;
+      }
+      /*--------------------------------------------------------------------
+       *  If i is an F-point, build interpolation.
+       *--------------------------------------------------------------------*/
+      else
+      {
+         /* Diagonal part of P */
+         P_diag_i[i] = jj_counter;
+         for (jj = W_diag_i[row_counter]; jj < W_diag_i[row_counter + 1]; jj++)
+         {
+            //P_marker[row_counter] = jj_counter;
+            P_diag_j[jj_counter]    = W_diag_j[jj];
+            P_diag_data[jj_counter] = W_diag_data[jj];
+            jj_counter++;
+         }
+
+         /* Off-Diagonal part of P */
+         P_offd_i[i] = jj_counter_offd;
+         jj_counter_offd += W_offd_i[row_counter + 1] - W_offd_i[row_counter];
+
+         row_counter++;
+      }
+      /* update off-diagonal row pointer */
+      P_offd_i[i + 1] = jj_counter_offd;
+   }
+   P_diag_i[P_nr_of_rows] = jj_counter;
+
+   hypre_TFree(fine_to_coarse, HYPRE_MEMORY_HOST);
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_MGRBuildPHost
+ *
+ * Interpolation for MGR - Adapted from BoomerAMGBuildInterp
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_MGRBuildPHost( hypre_ParCSRMatrix   *A,
+                     hypre_ParCSRMatrix   *A_FF,
+                     hypre_ParCSRMatrix   *A_FC,
+                     HYPRE_Int            *CF_marker,
+                     HYPRE_BigInt         *num_cpts_global,
+                     HYPRE_Int             method,
+                     hypre_ParCSRMatrix  **Wp_ptr,
+                     hypre_ParCSRMatrix  **P_ptr)
+{
+   MPI_Comm             comm = hypre_ParCSRMatrixComm(A);
+   HYPRE_Int            num_rows_A   = hypre_ParCSRMatrixNumRows(A);
+   HYPRE_Int            num_rows_AFF = hypre_ParCSRMatrixNumRows(A_FF);
+   HYPRE_Int            num_procs, my_id;
+
+   HYPRE_Real           zero      = 0.0;
+   HYPRE_Real           one       = 1.0;
+   HYPRE_Complex        scal      = 1.0;
+   hypre_CSRMatrix     *A_FF_diag = hypre_ParCSRMatrixDiag(A_FF);
+   hypre_CSRMatrix     *A_FC_diag = hypre_ParCSRMatrixDiag(A_FC);
+   hypre_CSRMatrix     *A_FF_offd = hypre_ParCSRMatrixOffd(A_FF);
+   hypre_CSRMatrix     *A_FC_offd = hypre_ParCSRMatrixOffd(A_FC);
+
+   hypre_ParVector     *D_FF_inv;
+   hypre_ParCSRMatrix  *P, *Wp;
+   hypre_CSRMatrix     *W_diag = NULL, *W_offd = NULL;
+   hypre_CSRMatrix     *P_diag = NULL, *P_offd = NULL;
+   HYPRE_Int            P_diag_nnz;
+   HYPRE_Int           *P_diag_i = NULL, *P_diag_j = NULL, *P_offd_i = NULL;
+   HYPRE_Complex       *P_diag_a = NULL, *diag = NULL, *diag_FF = NULL;
+   HYPRE_Int            i;
+   HYPRE_Complex        dsum;
+
+   HYPRE_MemoryLocation memory_location_P = hypre_ParCSRMatrixMemoryLocation(A);
+
+   hypre_MPI_Comm_size(comm, &num_procs);
+   hypre_MPI_Comm_rank(comm, &my_id);
+
+   if (method > 0)
+   {
+      diag = hypre_CTAlloc(HYPRE_Complex, num_rows_AFF, memory_location_P);
+      if (method == 1)
+      {
+         // L1-Jacobi-type interpolation
+         diag_FF = hypre_CTAlloc(HYPRE_Complex, num_rows_AFF, memory_location_P);
+         hypre_CSRMatrixExtractDiagonalHost(hypre_ParCSRMatrixDiag(A_FF), diag, 0);
+         hypre_CSRMatrixComputeRowSumHost(A_FF_diag, NULL, NULL, diag_FF, 1, 1.0, "set");
+         hypre_CSRMatrixComputeRowSumHost(A_FC_diag, NULL, NULL, diag_FF, 1, 1.0, "add");
+         hypre_CSRMatrixComputeRowSumHost(A_FF_offd, NULL, NULL, diag_FF, 1, 1.0, "add");
+         hypre_CSRMatrixComputeRowSumHost(A_FC_offd, NULL, NULL, diag_FF, 1, 1.0, "add");
+
+         for (i = 0; i < num_rows_AFF; i++)
+         {
+            dsum = diag[i] + scal * (diag_FF[i] - hypre_cabs(diag[i]));
+            diag[i] = (hypre_cabs(dsum) > zero || hypre_cabs(dsum) < zero) ?
+                      (one / dsum) : one;
+         }
+         hypre_TFree(diag_FF, memory_location_P);
+      }
+      else if (method == 2)
+      {
+         // extract diag inverse
+         hypre_CSRMatrixExtractDiagonalHost(hypre_ParCSRMatrixDiag(A_FF), diag, 2);
+      }
+
+      Wp = hypre_ParCSRMatrixClone_v2(A_FC, 1, memory_location_P);
+      D_FF_inv = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A_FF),
+                                       hypre_ParCSRMatrixGlobalNumRows(A_FF),
+                                       hypre_ParCSRMatrixRowStarts(A_FC));
+      hypre_ParVectorLocalData(D_FF_inv) = diag;
+      hypre_ParVectorInitialize_v2(D_FF_inv, memory_location_P);
+      hypre_ParVectorScale(-1.0, D_FF_inv);
+      hypre_ParCSRMatrixDiagScale(Wp, D_FF_inv, NULL);
+      hypre_ParVectorDestroy(D_FF_inv);
+   }
+   else
+   {
+      Wp = hypre_ParCSRMatrixCreate(hypre_ParCSRMatrixComm(A_FF),
+                                    hypre_ParCSRMatrixGlobalNumRows(A_FF),
+                                    hypre_ParCSRMatrixGlobalNumCols(A_FC),
+                                    hypre_ParCSRMatrixRowStarts(A_FC),
+                                    hypre_ParCSRMatrixColStarts(A_FC),
+                                    0, 0, 0);
+      hypre_ParCSRMatrixInitialize_v2(Wp, memory_location_P);
+   }
+
+   /* Construct P from matrix product W_diag */
+   W_diag      = hypre_ParCSRMatrixDiag(Wp);
+   W_offd      = hypre_ParCSRMatrixOffd(Wp);
+   P_diag_nnz  = hypre_CSRMatrixNumNonzeros(W_diag) + hypre_CSRMatrixNumCols(W_diag);
+   P_diag_i    = hypre_CTAlloc(HYPRE_Int,     num_rows_A + 1, memory_location_P);
+   P_diag_j    = hypre_CTAlloc(HYPRE_Int,     P_diag_nnz,     memory_location_P);
+   P_diag_a    = hypre_CTAlloc(HYPRE_Complex, P_diag_nnz,     memory_location_P);
+   P_offd_i    = hypre_CTAlloc(HYPRE_Int,     num_rows_A + 1, memory_location_P);
+
+   /* Extend W data to P data */
+   hypre_ExtendWtoPHost(num_rows_A,
+                        CF_marker,
+                        hypre_CSRMatrixI(W_diag),
+                        hypre_CSRMatrixJ(W_diag),
+                        hypre_CSRMatrixData(W_diag),
+                        P_diag_i,
+                        P_diag_j,
+                        P_diag_a,
+                        hypre_CSRMatrixI(W_offd),
+                        P_offd_i);
+
+   /* finalize P */
+   P = hypre_ParCSRMatrixCreate(hypre_ParCSRMatrixComm(A),
+                                hypre_ParCSRMatrixGlobalNumRows(A),
+                                hypre_ParCSRMatrixGlobalNumCols(A_FC),
+                                hypre_ParCSRMatrixColStarts(A),
+                                num_cpts_global,
+                                hypre_CSRMatrixNumCols(W_offd),
+                                P_diag_nnz,
+                                hypre_CSRMatrixNumNonzeros(W_offd));
+   P_diag = hypre_ParCSRMatrixDiag(P);
+   P_offd = hypre_ParCSRMatrixOffd(P);
+
+   hypre_CSRMatrixMemoryLocation(P_diag) = memory_location_P;
+   hypre_CSRMatrixMemoryLocation(P_offd) = memory_location_P;
+   hypre_CSRMatrixI(P_diag)              = P_diag_i;
+   hypre_CSRMatrixJ(P_diag)              = P_diag_j;
+   hypre_CSRMatrixData(P_diag)           = P_diag_a;
+   hypre_CSRMatrixI(P_offd)              = P_offd_i;
+   hypre_CSRMatrixJ(P_offd)              = hypre_TAlloc(HYPRE_Int,
+                                                        hypre_CSRMatrixNumNonzeros(W_offd),
+                                                        memory_location_P);
+   hypre_CSRMatrixData(P_offd)           = hypre_TAlloc(HYPRE_Complex,
+                                                        hypre_CSRMatrixNumNonzeros(W_offd),
+                                                        memory_location_P);
+   hypre_ParCSRMatrixColMapOffd(P)       = hypre_TAlloc(HYPRE_BigInt,
+                                                        hypre_CSRMatrixNumCols(W_offd),
+                                                        memory_location_P);
+
+   hypre_TMemcpy(hypre_CSRMatrixJ(P_offd), hypre_CSRMatrixJ(W_offd),
+                 HYPRE_Int, hypre_CSRMatrixNumNonzeros(W_offd),
+                 memory_location_P, memory_location_P);
+
+   hypre_TMemcpy(hypre_CSRMatrixData(P_offd), hypre_CSRMatrixData(W_offd),
+                 HYPRE_Complex, hypre_CSRMatrixNumNonzeros(W_offd),
+                 memory_location_P, memory_location_P);
+
+   hypre_TMemcpy(hypre_ParCSRMatrixColMapOffd(P), hypre_ParCSRMatrixColMapOffd(Wp),
+                 HYPRE_BigInt, hypre_CSRMatrixNumCols(W_offd),
+                 memory_location_P, memory_location_P);
+
+   hypre_ParCSRMatrixSetNumNonzeros(P);
+   hypre_ParCSRMatrixDNumNonzeros(P) = (HYPRE_Real) hypre_ParCSRMatrixNumNonzeros(P);
+   hypre_MatvecCommPkgCreate(P);
+
+   /* Set output pointer */
+   *P_ptr  = P;
+   *Wp_ptr = Wp;
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_MGRBuildP
+ *
+ * Interpolation for MGR - Adapted from BoomerAMGBuildInterp
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_MGRBuildP( hypre_ParCSRMatrix   *A,
+                 HYPRE_Int            *CF_marker,
+                 HYPRE_BigInt         *num_cpts_global,
+                 HYPRE_Int             method,
+                 HYPRE_Int             debug_flag,
+                 hypre_ParCSRMatrix  **P_ptr)
+{
+   MPI_Comm          comm = hypre_ParCSRMatrixComm(A);
+   hypre_ParCSRCommPkg     *comm_pkg = hypre_ParCSRMatrixCommPkg(A);
+   hypre_ParCSRCommHandle  *comm_handle;
+   HYPRE_MemoryLocation memory_location_P = hypre_ParCSRMatrixMemoryLocation(A);
+
+   hypre_CSRMatrix *A_diag = hypre_ParCSRMatrixDiag(A);
+   HYPRE_Real      *A_diag_data = hypre_CSRMatrixData(A_diag);
+   HYPRE_Int       *A_diag_i = hypre_CSRMatrixI(A_diag);
+   HYPRE_Int       *A_diag_j = hypre_CSRMatrixJ(A_diag);
+
+   hypre_CSRMatrix *A_offd         = hypre_ParCSRMatrixOffd(A);
+   HYPRE_Real      *A_offd_data    = hypre_CSRMatrixData(A_offd);
+   HYPRE_Int       *A_offd_i = hypre_CSRMatrixI(A_offd);
+   HYPRE_Int       *A_offd_j = hypre_CSRMatrixJ(A_offd);
+   HYPRE_Int        num_cols_A_offd = hypre_CSRMatrixNumCols(A_offd);
+   HYPRE_Real      *a_diag;
+
+   hypre_ParCSRMatrix    *P;
+   HYPRE_BigInt    *col_map_offd_P;
+   HYPRE_Int       *tmp_map_offd = NULL;
+
+   HYPRE_Int       *CF_marker_offd = NULL;
+
+   hypre_CSRMatrix *P_diag;
+   hypre_CSRMatrix *P_offd;
+
+   HYPRE_Real      *P_diag_data;
+   HYPRE_Int       *P_diag_i;
+   HYPRE_Int       *P_diag_j;
+   HYPRE_Real      *P_offd_data;
+   HYPRE_Int       *P_offd_i;
+   HYPRE_Int       *P_offd_j;
+
+   HYPRE_Int        P_diag_size, P_offd_size;
+
+   HYPRE_Int       *P_marker, *P_marker_offd;
+
+   HYPRE_Int        jj_counter, jj_counter_offd;
+   HYPRE_Int       *jj_count, *jj_count_offd;
+   //   HYPRE_Int              jj_begin_row,jj_begin_row_offd;
+   //   HYPRE_Int              jj_end_row,jj_end_row_offd;
+
+   HYPRE_Int        start_indexing = 0; /* start indexing for P_data at 0 */
+
+   HYPRE_Int        n_fine = hypre_CSRMatrixNumRows(A_diag);
+
+   HYPRE_Int       *fine_to_coarse;
+   //HYPRE_BigInt    *fine_to_coarse_offd;
+   HYPRE_Int       *coarse_counter;
+   HYPRE_Int        coarse_shift;
+   HYPRE_BigInt     total_global_cpts;
+   //HYPRE_BigInt     my_first_cpt;
+   HYPRE_Int        num_cols_P_offd;
+
+   HYPRE_Int        i, i1;
+   HYPRE_Int        j, jl, jj;
+   HYPRE_Int        start;
+
+   HYPRE_Real       one  = 1.0;
+
+   HYPRE_Int        my_id;
+   HYPRE_Int        num_procs;
+   HYPRE_Int        num_threads;
+   HYPRE_Int        num_sends;
+   HYPRE_Int        index;
+   HYPRE_Int        ns, ne, size, rest;
+
+   HYPRE_Int       *int_buf_data;
+
+   HYPRE_Real       wall_time;  /* for debugging instrumentation  */
+
+   hypre_MPI_Comm_size(comm, &num_procs);
+   hypre_MPI_Comm_rank(comm, &my_id);
+   //num_threads = hypre_NumThreads();
+   // Temporary fix, disable threading
+   // TODO: enable threading
+   num_threads = 1;
+
+   //my_first_cpt = num_cpts_global[0];
+   if (my_id == (num_procs - 1)) { total_global_cpts = num_cpts_global[1]; }
+   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
+
+   /*-------------------------------------------------------------------
+   * Get the CF_marker data for the off-processor columns
+   *-------------------------------------------------------------------*/
+
+   if (debug_flag < 0)
+   {
+      debug_flag = -debug_flag;
+   }
+
+   if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
+
+   CF_marker_offd = hypre_CTAlloc(HYPRE_Int, num_cols_A_offd, HYPRE_MEMORY_HOST);
+
+   if (!comm_pkg)
+   {
+      hypre_MatvecCommPkgCreate(A);
+      comm_pkg = hypre_ParCSRMatrixCommPkg(A);
+   }
+
+   num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
+   int_buf_data = hypre_CTAlloc(HYPRE_Int,
+                                hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                                HYPRE_MEMORY_HOST);
+
+   index = 0;
+   for (i = 0; i < num_sends; i++)
+   {
+      start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
+      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
+      {
+         int_buf_data[index++] = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
+      }
+   }
+
+   comm_handle = hypre_ParCSRCommHandleCreate( 11, comm_pkg, int_buf_data, CF_marker_offd);
+   hypre_ParCSRCommHandleDestroy(comm_handle);
+
+   if (debug_flag == 4)
+   {
+      wall_time = time_getWallclockSeconds() - wall_time;
+      hypre_printf("Proc = %d     Interp: Comm 1 CF_marker =    %f\n",
+                   my_id, wall_time);
+      fflush(NULL);
+   }
+
+   /*-----------------------------------------------------------------------
+   *  First Pass: Determine size of P and fill in fine_to_coarse mapping.
+   *-----------------------------------------------------------------------*/
+
+   /*-----------------------------------------------------------------------
+   *  Intialize counters and allocate mapping vector.
+   *-----------------------------------------------------------------------*/
+
+   coarse_counter = hypre_CTAlloc(HYPRE_Int,  num_threads, HYPRE_MEMORY_HOST);
+   jj_count = hypre_CTAlloc(HYPRE_Int,  num_threads, HYPRE_MEMORY_HOST);
+   jj_count_offd = hypre_CTAlloc(HYPRE_Int,  num_threads, HYPRE_MEMORY_HOST);
+
+   fine_to_coarse = hypre_CTAlloc(HYPRE_Int,  n_fine, HYPRE_MEMORY_HOST);
+#if 0
+#ifdef HYPRE_USING_OPENMP
+   #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+#endif
+#endif
+   for (i = 0; i < n_fine; i++) { fine_to_coarse[i] = -1; }
+
+   jj_counter = start_indexing;
+   jj_counter_offd = start_indexing;
+
+   /*-----------------------------------------------------------------------
+   *  Loop over fine grid.
+   *-----------------------------------------------------------------------*/
+
+   /* RDF: this looks a little tricky, but doable */
+#if 0
+#ifdef HYPRE_USING_OPENMP
+   #pragma omp parallel for private(i,j,i1,jj,ns,ne,size,rest) HYPRE_SMP_SCHEDULE
+#endif
+#endif
+   for (j = 0; j < num_threads; j++)
+   {
+      size = n_fine / num_threads;
+      rest = n_fine - size * num_threads;
+
+      if (j < rest)
+      {
+         ns = j * size + j;
+         ne = (j + 1) * size + j + 1;
+      }
+      else
+      {
+         ns = j * size + rest;
+         ne = (j + 1) * size + rest;
+      }
+      for (i = ns; i < ne; i++)
+      {
+         /*--------------------------------------------------------------------
+          *  If i is a C-point, interpolation is the identity. Also set up
+          *  mapping vector.
+          *--------------------------------------------------------------------*/
+
+         if (CF_marker[i] >= 0)
+         {
+            jj_count[j]++;
+            fine_to_coarse[i] = coarse_counter[j];
+            coarse_counter[j]++;
+         }
+         /*--------------------------------------------------------------------
+          *  If i is an F-point, interpolation is the approximation of A_{ff}^{-1}A_{fc}
+          *--------------------------------------------------------------------*/
+         else
+         {
+            for (jj = A_diag_i[i]; jj < A_diag_i[i + 1]; jj++)
+            {
+               i1 = A_diag_j[jj];
+               if ((CF_marker[i1] >= 0) && (method > 0))
+               {
+                  jj_count[j]++;
+               }
+            }
+
+            if (num_procs > 1)
+            {
+               for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
+               {
+                  i1 = A_offd_j[jj];
+                  if ((CF_marker_offd[i1] >= 0) && (method > 0))
+                  {
+                     jj_count_offd[j]++;
+                  }
+               }
+            }
+         }
+      }
+   }
+
+   /*-----------------------------------------------------------------------
+    *  Allocate  arrays.
+    *-----------------------------------------------------------------------*/
+   for (i = 0; i < num_threads - 1; i++)
+   {
+      coarse_counter[i + 1] += coarse_counter[i];
+      jj_count[i + 1] += jj_count[i];
+      jj_count_offd[i + 1] += jj_count_offd[i];
+   }
+   i = num_threads - 1;
+   jj_counter = jj_count[i];
+   jj_counter_offd = jj_count_offd[i];
+
+   P_diag_size = jj_counter;
+
+   P_diag_i    = hypre_CTAlloc(HYPRE_Int,  n_fine + 1, memory_location_P);
+   P_diag_j    = hypre_CTAlloc(HYPRE_Int,  P_diag_size, memory_location_P);
+   P_diag_data = hypre_CTAlloc(HYPRE_Real,  P_diag_size, memory_location_P);
+
+   P_diag_i[n_fine] = jj_counter;
+
+   P_offd_size = jj_counter_offd;
+
+   P_offd_i    = hypre_CTAlloc(HYPRE_Int,  n_fine + 1, memory_location_P);
+   P_offd_j    = hypre_CTAlloc(HYPRE_Int,  P_offd_size, memory_location_P);
+   P_offd_data = hypre_CTAlloc(HYPRE_Real,  P_offd_size, memory_location_P);
+
+   /*-----------------------------------------------------------------------
+   *  Intialize some stuff.
+   *-----------------------------------------------------------------------*/
+
+   jj_counter = start_indexing;
+   jj_counter_offd = start_indexing;
+
+   if (debug_flag == 4)
+   {
+      wall_time = time_getWallclockSeconds() - wall_time;
+      hypre_printf("Proc = %d     Interp: Internal work 1 =     %f\n",
+                   my_id, wall_time);
+      fflush(NULL);
+   }
+
+   /*-----------------------------------------------------------------------
+   *  Send and receive fine_to_coarse info.
+   *-----------------------------------------------------------------------*/
+
+   if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
+
+   //fine_to_coarse_offd = hypre_CTAlloc(HYPRE_BigInt, num_cols_A_offd, HYPRE_MEMORY_HOST);
+
+#if 0
+#ifdef HYPRE_USING_OPENMP
+   #pragma omp parallel for private(i,j,ns,ne,size,rest,coarse_shift) HYPRE_SMP_SCHEDULE
+#endif
+#endif
+   for (j = 0; j < num_threads; j++)
+   {
+      coarse_shift = 0;
+      if (j > 0) { coarse_shift = coarse_counter[j - 1]; }
+      size = n_fine / num_threads;
+      rest = n_fine - size * num_threads;
+      if (j < rest)
+      {
+         ns = j * size + j;
+         ne = (j + 1) * size + j + 1;
+      }
+      else
+      {
+         ns = j * size + rest;
+         ne = (j + 1) * size + rest;
+      }
+      for (i = ns; i < ne; i++)
+      {
+         fine_to_coarse[i] += coarse_shift;
+      }
+   }
+
+   /*   index = 0;
+      for (i = 0; i < num_sends; i++)
+      {
+         start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
+         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+            big_buf_data[index++]
+               = fine_to_coarse[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)]+ my_first_cpt;
+      }
+
+      comm_handle = hypre_ParCSRCommHandleCreate( 21, comm_pkg, big_buf_data,
+                                       fine_to_coarse_offd);
+
+   hypre_ParCSRCommHandleDestroy(comm_handle);
+   */
+   if (debug_flag == 4)
+   {
+      wall_time = time_getWallclockSeconds() - wall_time;
+      hypre_printf("Proc = %d     Interp: Comm 4 FineToCoarse = %f\n",
+                   my_id, wall_time);
+      fflush(NULL);
+   }
+
+   if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
+
+#if 0
+#ifdef HYPRE_USING_OPENMP
+   #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+#endif
+#endif
+   //for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;
+
+   /*-----------------------------------------------------------------------
+   *  Loop over fine grid points.
+   *-----------------------------------------------------------------------*/
+   a_diag = hypre_CTAlloc(HYPRE_Real,  n_fine, HYPRE_MEMORY_HOST);
+   for (i = 0; i < n_fine; i++)
+   {
+      if (CF_marker[i] < 0)
+      {
+         for (jj = A_diag_i[i]; jj < A_diag_i[i + 1]; jj++)
+         {
+            i1 = A_diag_j[jj];
+            if ( i == i1 ) /* diagonal of A only */
+            {
+               a_diag[i] = 1.0 / A_diag_data[jj];
+            }
+         }
+      }
+   }
+
+#if 0
+#ifdef HYPRE_USING_OPENMP
+   #pragma omp parallel for private(i,j,jl,i1,jj,ns,ne,size,rest,P_marker,P_marker_offd,jj_counter,jj_counter_offd,jj_begin_row,jj_end_row,jj_begin_row_offd,jj_end_row_offd) HYPRE_SMP_SCHEDULE
+#endif
+#endif
+   for (jl = 0; jl < num_threads; jl++)
+   {
+      size = n_fine / num_threads;
+      rest = n_fine - size * num_threads;
+      if (jl < rest)
+      {
+         ns = jl * size + jl;
+         ne = (jl + 1) * size + jl + 1;
+      }
+      else
+      {
+         ns = jl * size + rest;
+         ne = (jl + 1) * size + rest;
+      }
+      jj_counter = 0;
+      if (jl > 0) { jj_counter = jj_count[jl - 1]; }
+      jj_counter_offd = 0;
+      if (jl > 0) { jj_counter_offd = jj_count_offd[jl - 1]; }
+      P_marker = hypre_CTAlloc(HYPRE_Int,  n_fine, HYPRE_MEMORY_HOST);
+      if (num_cols_A_offd)
+      {
+         P_marker_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_A_offd, HYPRE_MEMORY_HOST);
+      }
+      else
+      {
+         P_marker_offd = NULL;
+      }
+
+      for (i = 0; i < n_fine; i++)
+      {
+         P_marker[i] = -1;
+      }
+      for (i = 0; i < num_cols_A_offd; i++)
+      {
+         P_marker_offd[i] = -1;
+      }
+      for (i = ns; i < ne; i++)
+      {
+         /*--------------------------------------------------------------------
+         *  If i is a c-point, interpolation is the identity.
+         *--------------------------------------------------------------------*/
+         if (CF_marker[i] >= 0)
+         {
+            P_diag_i[i] = jj_counter;
+            P_diag_j[jj_counter]    = fine_to_coarse[i];
+            P_diag_data[jj_counter] = one;
+            jj_counter++;
+         }
+         /*--------------------------------------------------------------------
+         *  If i is an F-point, build interpolation.
+         *--------------------------------------------------------------------*/
+         else
+         {
+            /* Diagonal part of P */
+            P_diag_i[i] = jj_counter;
+            for (jj = A_diag_i[i]; jj < A_diag_i[i + 1]; jj++)
+            {
+               i1 = A_diag_j[jj];
+
+               /*--------------------------------------------------------------
+                * If neighbor i1 is a C-point, set column number in P_diag_j
+                * and initialize interpolation weight to zero.
+                *--------------------------------------------------------------*/
+
+               if ((CF_marker[i1] >= 0) && (method > 0))
+               {
+                  P_marker[i1] = jj_counter;
+                  P_diag_j[jj_counter]    = fine_to_coarse[i1];
+                  /*
+                  if(method == 0)
+                  {
+                    P_diag_data[jj_counter] = 0.0;
+                  }
+                  */
+                  if (method == 1)
+                  {
+                     P_diag_data[jj_counter] = - A_diag_data[jj];
+                  }
+                  else if (method == 2)
+                  {
+                     P_diag_data[jj_counter] = - A_diag_data[jj] * a_diag[i];
+                  }
+                  jj_counter++;
+               }
+            }
+
+            /* Off-Diagonal part of P */
+            P_offd_i[i] = jj_counter_offd;
+
+            if (num_procs > 1)
+            {
+               for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
+               {
+                  i1 = A_offd_j[jj];
+
+                  /*-----------------------------------------------------------
+                  * If neighbor i1 is a C-point, set column number in P_offd_j
+                  * and initialize interpolation weight to zero.
+                  *-----------------------------------------------------------*/
+
+                  if ((CF_marker_offd[i1] >= 0) && (method > 0))
+                  {
+                     P_marker_offd[i1] = jj_counter_offd;
+                     /*P_offd_j[jj_counter_offd]  = fine_to_coarse_offd[i1];*/
+                     P_offd_j[jj_counter_offd]  = i1;
+                     /*
+                     if(method == 0)
+                     {
+                       P_offd_data[jj_counter_offd] = 0.0;
+                     }
+                     */
+                     if (method == 1)
+                     {
+                        P_offd_data[jj_counter_offd] = - A_offd_data[jj];
+                     }
+                     else if (method == 2)
+                     {
+                        P_offd_data[jj_counter_offd] = - A_offd_data[jj] * a_diag[i];
+                     }
+                     jj_counter_offd++;
+                  }
+               }
+            }
+         }
+         P_offd_i[i + 1] = jj_counter_offd;
+      }
+      hypre_TFree(P_marker, HYPRE_MEMORY_HOST);
+      hypre_TFree(P_marker_offd, HYPRE_MEMORY_HOST);
+   }
+   hypre_TFree(a_diag, HYPRE_MEMORY_HOST);
+   P = hypre_ParCSRMatrixCreate(comm,
+                                hypre_ParCSRMatrixGlobalNumRows(A),
+                                total_global_cpts,
+                                hypre_ParCSRMatrixColStarts(A),
+                                num_cpts_global,
+                                0,
+                                P_diag_i[n_fine],
+                                P_offd_i[n_fine]);
+
+   P_diag = hypre_ParCSRMatrixDiag(P);
+   hypre_CSRMatrixData(P_diag) = P_diag_data;
+   hypre_CSRMatrixI(P_diag) = P_diag_i;
+   hypre_CSRMatrixJ(P_diag) = P_diag_j;
+   P_offd = hypre_ParCSRMatrixOffd(P);
+   hypre_CSRMatrixData(P_offd) = P_offd_data;
+   hypre_CSRMatrixI(P_offd) = P_offd_i;
+   hypre_CSRMatrixJ(P_offd) = P_offd_j;
+
+   num_cols_P_offd = 0;
+
+   if (P_offd_size)
+   {
+      P_marker = hypre_CTAlloc(HYPRE_Int,  num_cols_A_offd, HYPRE_MEMORY_HOST);
+#if 0
+#ifdef HYPRE_USING_OPENMP
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+#endif
+#endif
+      for (i = 0; i < num_cols_A_offd; i++)
+      {
+         P_marker[i] = 0;
+      }
+      num_cols_P_offd = 0;
+      for (i = 0; i < P_offd_size; i++)
+      {
+         index = P_offd_j[i];
+         if (!P_marker[index])
+         {
+            num_cols_P_offd++;
+            P_marker[index] = 1;
+         }
+      }
+
+      col_map_offd_P = hypre_CTAlloc(HYPRE_BigInt, num_cols_P_offd, HYPRE_MEMORY_HOST);
+      tmp_map_offd = hypre_CTAlloc(HYPRE_Int, num_cols_P_offd, HYPRE_MEMORY_HOST);
+      index = 0;
+      for (i = 0; i < num_cols_P_offd; i++)
+      {
+         while (P_marker[index] == 0) { index++; }
+         tmp_map_offd[i] = index++;
+      }
+
+#if 0
+#ifdef HYPRE_USING_OPENMP
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+#endif
+#endif
+      for (i = 0; i < P_offd_size; i++)
+         P_offd_j[i] = hypre_BinarySearch(tmp_map_offd,
+                                          P_offd_j[i],
+                                          num_cols_P_offd);
+      hypre_TFree(P_marker, HYPRE_MEMORY_HOST);
+   }
+
+   for (i = 0; i < n_fine; i++)
+      if (CF_marker[i] == -3) { CF_marker[i] = -1; }
+   if (num_cols_P_offd)
+   {
+      hypre_ParCSRMatrixColMapOffd(P) = col_map_offd_P;
+      hypre_CSRMatrixNumCols(P_offd) = num_cols_P_offd;
+   }
+   hypre_GetCommPkgRTFromCommPkgA(P, A, fine_to_coarse, tmp_map_offd);
+
+   *P_ptr = P;
+
+   hypre_TFree(tmp_map_offd, HYPRE_MEMORY_HOST);
+   hypre_TFree(CF_marker_offd, HYPRE_MEMORY_HOST);
+   hypre_TFree(int_buf_data, HYPRE_MEMORY_HOST);
+   hypre_TFree(fine_to_coarse, HYPRE_MEMORY_HOST);
+   // hypre_TFree(fine_to_coarse_offd, HYPRE_MEMORY_HOST);
+   hypre_TFree(coarse_counter, HYPRE_MEMORY_HOST);
+   hypre_TFree(jj_count, HYPRE_MEMORY_HOST);
+   hypre_TFree(jj_count_offd, HYPRE_MEMORY_HOST);
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_MGRBuildPDRS
+ *
+ * Interpolation for MGR - Dynamic Row Sum method
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_MGRBuildPDRS( hypre_ParCSRMatrix   *A,
+                    HYPRE_Int            *CF_marker,
+                    HYPRE_BigInt         *num_cpts_global,
+                    HYPRE_Int             debug_flag,
+                    hypre_ParCSRMatrix  **P_ptr)
+{
+   MPI_Comm                 comm = hypre_ParCSRMatrixComm(A);
+   hypre_ParCSRCommPkg     *comm_pkg = hypre_ParCSRMatrixCommPkg(A);
+   hypre_ParCSRCommHandle  *comm_handle;
+
+   hypre_CSRMatrix         *A_diag = hypre_ParCSRMatrixDiag(A);
+   HYPRE_Real              *A_diag_data = hypre_CSRMatrixData(A_diag);
+   HYPRE_Int               *A_diag_i = hypre_CSRMatrixI(A_diag);
+   HYPRE_Int               *A_diag_j = hypre_CSRMatrixJ(A_diag);
+
+   hypre_CSRMatrix         *A_offd         = hypre_ParCSRMatrixOffd(A);
+   HYPRE_Real              *A_offd_data    = hypre_CSRMatrixData(A_offd);
+   HYPRE_Int               *A_offd_i = hypre_CSRMatrixI(A_offd);
+   HYPRE_Int               *A_offd_j = hypre_CSRMatrixJ(A_offd);
+   HYPRE_Int                num_cols_A_offd = hypre_CSRMatrixNumCols(A_offd);
+   HYPRE_Real              *a_diag;
+
+   hypre_ParCSRMatrix      *P;
+   HYPRE_BigInt            *col_map_offd_P;
+   HYPRE_Int               *tmp_map_offd = NULL;
+   HYPRE_Int               *CF_marker_offd = NULL;
+
+   hypre_CSRMatrix         *P_diag;
+   hypre_CSRMatrix         *P_offd;
+
+   HYPRE_Real              *P_diag_data;
+   HYPRE_Int               *P_diag_i, *P_diag_j;
+   HYPRE_Real              *P_offd_data;
+   HYPRE_Int               *P_offd_i, *P_offd_j;
+
+   HYPRE_Int                P_diag_size, P_offd_size;
+   HYPRE_Int               *P_marker, *P_marker_offd;
+   HYPRE_Int                jj_counter, jj_counter_offd;
+   HYPRE_Int               *jj_count, *jj_count_offd;
+
+   HYPRE_Int                start_indexing = 0; /* start indexing for P_data at 0 */
+   HYPRE_Int                n_fine  = hypre_CSRMatrixNumRows(A_diag);
+
+   HYPRE_Int               *fine_to_coarse;
+   HYPRE_Int               *coarse_counter;
+   HYPRE_Int                coarse_shift;
+   HYPRE_BigInt             total_global_cpts;
+   HYPRE_Int                num_cols_P_offd;
+
+   HYPRE_Int                i, i1;
+   HYPRE_Int                j, jl, jj;
+   HYPRE_Int                start;
+   HYPRE_Real               one  = 1.0;
+   HYPRE_Int                my_id, num_procs;
+   HYPRE_Int                num_threads;
+   HYPRE_Int                num_sends;
+   HYPRE_Int                index;
+   HYPRE_Int                ns, ne, size, rest;
+
+   HYPRE_Int               *int_buf_data;
+   HYPRE_Real               wall_time;  /* for debugging instrumentation  */
+
+   hypre_MPI_Comm_size(comm, &num_procs);
+   hypre_MPI_Comm_rank(comm, &my_id);
+   //num_threads = hypre_NumThreads();
+   // Temporary fix, disable threading
+   // TODO: enable threading
+   num_threads = 1;
+
+   //my_first_cpt = num_cpts_global[0];
+   if (my_id == (num_procs - 1)) { total_global_cpts = num_cpts_global[1]; }
+   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
+
+   /*-------------------------------------------------------------------
+    * Get the CF_marker data for the off-processor columns
+    *-------------------------------------------------------------------*/
+
+   if (debug_flag < 0)
+   {
+      debug_flag = -debug_flag;
+   }
+
+   if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
+
+   CF_marker_offd = hypre_CTAlloc(HYPRE_Int, num_cols_A_offd, HYPRE_MEMORY_HOST);
+
+   if (!comm_pkg)
+   {
+      hypre_MatvecCommPkgCreate(A);
+      comm_pkg = hypre_ParCSRMatrixCommPkg(A);
+   }
+
+   num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
+   int_buf_data = hypre_CTAlloc(HYPRE_Int,
+                                hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                                HYPRE_MEMORY_HOST);
+
+   index = 0;
+   for (i = 0; i < num_sends; i++)
+   {
+      start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
+      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
+      {
+         int_buf_data[index++] =
+            CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
+      }
+   }
+
+   comm_handle = hypre_ParCSRCommHandleCreate(11, comm_pkg, int_buf_data, CF_marker_offd);
+   hypre_ParCSRCommHandleDestroy(comm_handle);
+
+   if (debug_flag == 4)
+   {
+      wall_time = time_getWallclockSeconds() - wall_time;
+      hypre_printf("Proc = %d     Interp: Comm 1 CF_marker =    %f\n",
+                   my_id, wall_time);
+      fflush(NULL);
+   }
+
+   /*-----------------------------------------------------------------------
+    *  First Pass: Determine size of P and fill in fine_to_coarse mapping.
+    *-----------------------------------------------------------------------*/
+
+   /*-----------------------------------------------------------------------
+    *  Intialize counters and allocate mapping vector.
+    *-----------------------------------------------------------------------*/
+
+   coarse_counter = hypre_CTAlloc(HYPRE_Int,  num_threads, HYPRE_MEMORY_HOST);
+   jj_count = hypre_CTAlloc(HYPRE_Int,  num_threads, HYPRE_MEMORY_HOST);
+   jj_count_offd = hypre_CTAlloc(HYPRE_Int,  num_threads, HYPRE_MEMORY_HOST);
+
+   fine_to_coarse = hypre_CTAlloc(HYPRE_Int,  n_fine, HYPRE_MEMORY_HOST);
+#if 0
+#ifdef HYPRE_USING_OPENMP
+   #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+#endif
+#endif
+   for (i = 0; i < n_fine; i++) { fine_to_coarse[i] = -1; }
+
+   jj_counter = start_indexing;
+   jj_counter_offd = start_indexing;
+
+   /*-----------------------------------------------------------------------
+    *  Loop over fine grid.
+    *-----------------------------------------------------------------------*/
+
+   /* RDF: this looks a little tricky, but doable */
+#if 0
+#ifdef HYPRE_USING_OPENMP
+   #pragma omp parallel for private(i,j,i1,jj,ns,ne,size,rest) HYPRE_SMP_SCHEDULE
+#endif
+#endif
+   for (j = 0; j < num_threads; j++)
+   {
+      size = n_fine / num_threads;
+      rest = n_fine - size * num_threads;
+
+      if (j < rest)
+      {
+         ns = j * size + j;
+         ne = (j + 1) * size + j + 1;
+      }
+      else
+      {
+         ns = j * size + rest;
+         ne = (j + 1) * size + rest;
+      }
+      for (i = ns; i < ne; i++)
+      {
+         /*--------------------------------------------------------------------
+          *  If i is a C-point, interpolation is the identity. Also set up
+          *  mapping vector.
+          *--------------------------------------------------------------------*/
+
+         if (CF_marker[i] >= 0)
+         {
+            jj_count[j]++;
+            fine_to_coarse[i] = coarse_counter[j];
+            coarse_counter[j]++;
+         }
+         /*--------------------------------------------------------------------
+          *  If i is an F-point, interpolation is the approximation of A_{ff}^{-1}A_{fc}
+          *--------------------------------------------------------------------*/
+         else
+         {
+            for (jj = A_diag_i[i]; jj < A_diag_i[i + 1]; jj++)
+            {
+               i1 = A_diag_j[jj];
+               if (CF_marker[i1] >= 0)
+               {
+                  jj_count[j]++;
+               }
+            }
+
+            if (num_procs > 1)
+            {
+               for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
+               {
+                  i1 = A_offd_j[jj];
+                  if (CF_marker_offd[i1] >= 0)
+                  {
+                     jj_count_offd[j]++;
+                  }
+               }
+            }
+         }
+         /*--------------------------------------------------------------------
+          *  Set up the indexes for the DRS method
+          *--------------------------------------------------------------------*/
+
+      }
+   }
+
+   /*-----------------------------------------------------------------------
+    *  Allocate  arrays.
+    *-----------------------------------------------------------------------*/
+   for (i = 0; i < num_threads - 1; i++)
+   {
+      coarse_counter[i + 1] += coarse_counter[i];
+      jj_count[i + 1] += jj_count[i];
+      jj_count_offd[i + 1] += jj_count_offd[i];
+   }
+   i = num_threads - 1;
+   jj_counter = jj_count[i];
+   jj_counter_offd = jj_count_offd[i];
+
+   P_diag_size = jj_counter;
+
+   P_diag_i    = hypre_CTAlloc(HYPRE_Int,  n_fine + 1, HYPRE_MEMORY_HOST);
+   P_diag_j    = hypre_CTAlloc(HYPRE_Int,  P_diag_size, HYPRE_MEMORY_HOST);
+   P_diag_data = hypre_CTAlloc(HYPRE_Real,  P_diag_size, HYPRE_MEMORY_HOST);
+
+   P_diag_i[n_fine] = jj_counter;
+
+
+   P_offd_size = jj_counter_offd;
+
+   P_offd_i    = hypre_CTAlloc(HYPRE_Int,  n_fine + 1, HYPRE_MEMORY_HOST);
+   P_offd_j    = hypre_CTAlloc(HYPRE_Int,  P_offd_size, HYPRE_MEMORY_HOST);
+   P_offd_data = hypre_CTAlloc(HYPRE_Real,  P_offd_size, HYPRE_MEMORY_HOST);
+
+   /*-----------------------------------------------------------------------
+    *  Intialize some stuff.
+    *-----------------------------------------------------------------------*/
+
+   jj_counter = start_indexing;
+   jj_counter_offd = start_indexing;
+
+   if (debug_flag == 4)
+   {
+      wall_time = time_getWallclockSeconds() - wall_time;
+      hypre_printf("Proc = %d     Interp: Internal work 1 =     %f\n",
+                   my_id, wall_time);
+      fflush(NULL);
+   }
+
+   /*-----------------------------------------------------------------------
+    *  Send and receive fine_to_coarse info.
+    *-----------------------------------------------------------------------*/
+
+   if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
+
+#if 0
+#ifdef HYPRE_USING_OPENMP
+   #pragma omp parallel for private(i,j,ns,ne,size,rest,coarse_shift) HYPRE_SMP_SCHEDULE
+#endif
+#endif
+   for (j = 0; j < num_threads; j++)
+   {
+      coarse_shift = 0;
+      if (j > 0) { coarse_shift = coarse_counter[j - 1]; }
+      size = n_fine / num_threads;
+      rest = n_fine - size * num_threads;
+      if (j < rest)
+      {
+         ns = j * size + j;
+         ne = (j + 1) * size + j + 1;
+      }
+      else
+      {
+         ns = j * size + rest;
+         ne = (j + 1) * size + rest;
+      }
+      for (i = ns; i < ne; i++)
+      {
+         fine_to_coarse[i] += coarse_shift;
+      }
+   }
+
+   /*index = 0;
+   for (i = 0; i < num_sends; i++)
+   {
+      start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
+      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+         int_buf_data[index++]
+            = fine_to_coarse[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+   }
+
+   comm_handle = hypre_ParCSRCommHandleCreate( 11, comm_pkg, int_buf_data,
+                                    fine_to_coarse_offd);
+
+   hypre_ParCSRCommHandleDestroy(comm_handle);
+   */
+   if (debug_flag == 4)
+   {
+      wall_time = time_getWallclockSeconds() - wall_time;
+      hypre_printf("Proc = %d     Interp: Comm 4 FineToCoarse = %f\n",
+                   my_id, wall_time);
+      fflush(NULL);
+   }
+
+   if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
+
+#if 0
+#ifdef HYPRE_USING_OPENMP
+   #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+#endif
+#endif
+
+   //for (i = 0; i < n_fine; i++) fine_to_coarse[i] -= my_first_cpt;
+
+   /*-----------------------------------------------------------------------
+    *  Loop over fine grid points.
+    *-----------------------------------------------------------------------*/
+   a_diag = hypre_CTAlloc(HYPRE_Real,  n_fine, HYPRE_MEMORY_HOST);
+   for (i = 0; i < n_fine; i++)
+   {
+      for (jj = A_diag_i[i]; jj < A_diag_i[i + 1]; jj++)
+      {
+         i1 = A_diag_j[jj];
+         if ( i == i1 ) /* diagonal of A only */
+         {
+            a_diag[i] = 1.0 / A_diag_data[jj];
+         }
+      }
+   }
+
+#if 0
+#ifdef HYPRE_USING_OPENMP
+   #pragma omp parallel for private(i,j,jl,i1,jj,ns,ne,size,rest,P_marker,P_marker_offd,jj_counter,jj_counter_offd,jj_begin_row,jj_end_row,jj_begin_row_offd,jj_end_row_offd) HYPRE_SMP_SCHEDULE
+#endif
+#endif
+   for (jl = 0; jl < num_threads; jl++)
+   {
+      size = n_fine / num_threads;
+      rest = n_fine - size * num_threads;
+      if (jl < rest)
+      {
+         ns = jl * size + jl;
+         ne = (jl + 1) * size + jl + 1;
+      }
+      else
+      {
+         ns = jl * size + rest;
+         ne = (jl + 1) * size + rest;
+      }
+      jj_counter = 0;
+      if (jl > 0) { jj_counter = jj_count[jl - 1]; }
+      jj_counter_offd = 0;
+      if (jl > 0) { jj_counter_offd = jj_count_offd[jl - 1]; }
+      P_marker = hypre_CTAlloc(HYPRE_Int,  n_fine, HYPRE_MEMORY_HOST);
+      if (num_cols_A_offd)
+      {
+         P_marker_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_A_offd, HYPRE_MEMORY_HOST);
+      }
+      else
+      {
+         P_marker_offd = NULL;
+      }
+
+      for (i = 0; i < n_fine; i++)
+      {
+         P_marker[i] = -1;
+      }
+      for (i = 0; i < num_cols_A_offd; i++)
+      {
+         P_marker_offd[i] = -1;
+      }
+      for (i = ns; i < ne; i++)
+      {
+         /*--------------------------------------------------------------------
+          *  If i is a c-point, interpolation is the identity.
+          *--------------------------------------------------------------------*/
+         if (CF_marker[i] >= 0)
+         {
+            P_diag_i[i] = jj_counter;
+            P_diag_j[jj_counter]    = fine_to_coarse[i];
+            P_diag_data[jj_counter] = one;
+            jj_counter++;
+         }
+         /*--------------------------------------------------------------------
+          *  If i is an F-point, build interpolation.
+          *--------------------------------------------------------------------*/
+         else
+         {
+            /* Diagonal part of P */
+            P_diag_i[i] = jj_counter;
+            for (jj = A_diag_i[i]; jj < A_diag_i[i + 1]; jj++)
+            {
+               i1 = A_diag_j[jj];
+
+               /*--------------------------------------------------------------
+                * If neighbor i1 is a C-point, set column number in P_diag_j
+                * and initialize interpolation weight to zero.
+                *--------------------------------------------------------------*/
+
+               if (CF_marker[i1] >= 0)
+               {
+                  P_marker[i1] = jj_counter;
+                  P_diag_j[jj_counter]    = fine_to_coarse[i1];
+                  P_diag_data[jj_counter] = - A_diag_data[jj] * a_diag[i];
+
+                  jj_counter++;
+               }
+            }
+
+            /* Off-Diagonal part of P */
+            P_offd_i[i] = jj_counter_offd;
+
+            if (num_procs > 1)
+            {
+               for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
+               {
+                  i1 = A_offd_j[jj];
+
+                  /*-----------------------------------------------------------
+                   * If neighbor i1 is a C-point, set column number in P_offd_j
+                   * and initialize interpolation weight to zero.
+                   *-----------------------------------------------------------*/
+
+                  if (CF_marker_offd[i1] >= 0)
+                  {
+                     P_marker_offd[i1] = jj_counter_offd;
+                     P_offd_j[jj_counter_offd]    = i1;
+                     P_offd_data[jj_counter_offd] = - A_offd_data[jj] * a_diag[i];
+
+                     jj_counter_offd++;
+                  }
+               }
+            }
+         }
+         P_offd_i[i + 1] = jj_counter_offd;
+      }
+      hypre_TFree(P_marker, HYPRE_MEMORY_HOST);
+      hypre_TFree(P_marker_offd, HYPRE_MEMORY_HOST);
+   }
+   hypre_TFree(a_diag, HYPRE_MEMORY_HOST);
+   P = hypre_ParCSRMatrixCreate(comm,
+                                hypre_ParCSRMatrixGlobalNumRows(A),
+                                total_global_cpts,
+                                hypre_ParCSRMatrixColStarts(A),
+                                num_cpts_global,
+                                0,
+                                P_diag_i[n_fine],
+                                P_offd_i[n_fine]);
+
+   P_diag = hypre_ParCSRMatrixDiag(P);
+   hypre_CSRMatrixData(P_diag) = P_diag_data;
+   hypre_CSRMatrixI(P_diag) = P_diag_i;
+   hypre_CSRMatrixJ(P_diag) = P_diag_j;
+   P_offd = hypre_ParCSRMatrixOffd(P);
+   hypre_CSRMatrixData(P_offd) = P_offd_data;
+   hypre_CSRMatrixI(P_offd) = P_offd_i;
+   hypre_CSRMatrixJ(P_offd) = P_offd_j;
+
+   num_cols_P_offd = 0;
+
+   if (P_offd_size)
+   {
+      P_marker = hypre_CTAlloc(HYPRE_Int,  num_cols_A_offd, HYPRE_MEMORY_HOST);
+
+#if 0
+#ifdef HYPRE_USING_OPENMP
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+#endif
+#endif
+      for (i = 0; i < num_cols_A_offd; i++)
+      {
+         P_marker[i] = 0;
+      }
+      num_cols_P_offd = 0;
+      for (i = 0; i < P_offd_size; i++)
+      {
+         index = P_offd_j[i];
+         if (!P_marker[index])
+         {
+            num_cols_P_offd++;
+            P_marker[index] = 1;
+         }
+      }
+
+      tmp_map_offd = hypre_CTAlloc(HYPRE_Int, num_cols_P_offd, HYPRE_MEMORY_HOST);
+      col_map_offd_P = hypre_CTAlloc(HYPRE_BigInt, num_cols_P_offd, HYPRE_MEMORY_HOST);
+      index = 0;
+      for (i = 0; i < num_cols_P_offd; i++)
+      {
+         while (P_marker[index] == 0) { index++; }
+         tmp_map_offd[i] = index++;
+      }
+
+#if 0
+#ifdef HYPRE_USING_OPENMP
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+#endif
+#endif
+      for (i = 0; i < P_offd_size; i++)
+      {
+         P_offd_j[i] = hypre_BinarySearch(tmp_map_offd,
+                                          P_offd_j[i],
+                                          num_cols_P_offd);
+      }
+      hypre_TFree(P_marker, HYPRE_MEMORY_HOST);
+   }
+
+   for (i = 0; i < n_fine; i++)
+   {
+      if (CF_marker[i] == -3)
+      {
+         CF_marker[i] = -1;
+      }
+   }
+   if (num_cols_P_offd)
+   {
+      hypre_ParCSRMatrixColMapOffd(P) = col_map_offd_P;
+      hypre_CSRMatrixNumCols(P_offd) = num_cols_P_offd;
+   }
+   hypre_GetCommPkgRTFromCommPkgA(P, A, fine_to_coarse, tmp_map_offd);
+
+   *P_ptr = P;
+
+   hypre_TFree(tmp_map_offd, HYPRE_MEMORY_HOST);
+   hypre_TFree(CF_marker_offd, HYPRE_MEMORY_HOST);
+   hypre_TFree(int_buf_data, HYPRE_MEMORY_HOST);
+   hypre_TFree(fine_to_coarse, HYPRE_MEMORY_HOST);
+   hypre_TFree(coarse_counter, HYPRE_MEMORY_HOST);
+   hypre_TFree(jj_count, HYPRE_MEMORY_HOST);
+   hypre_TFree(jj_count_offd, HYPRE_MEMORY_HOST);
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_MGRBuildInterpApproximateInverse
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_MGRBuildInterpApproximateInverse(hypre_ParCSRMatrix   *A,
+                                       HYPRE_Int            *CF_marker,
+                                       HYPRE_BigInt         *num_cpts_global,
+                                       hypre_ParCSRMatrix  **P_ptr)
+{
+   HYPRE_Int             *C_marker;
+   HYPRE_Int             *F_marker;
+   hypre_ParCSRMatrix    *A_ff;
+   hypre_ParCSRMatrix    *A_fc;
+   hypre_ParCSRMatrix    *A_ff_inv;
+   hypre_ParCSRMatrix    *W;
+   MPI_Comm               comm = hypre_ParCSRMatrixComm(A);
+   hypre_ParCSRMatrix    *P;
+   HYPRE_BigInt          *col_map_offd_P = NULL;
+   HYPRE_Real            *P_diag_data;
+   HYPRE_Int             *P_diag_i;
+   HYPRE_Int             *P_diag_j;
+   HYPRE_Int             *P_offd_i;
+   HYPRE_Int              P_diag_nnz;
+   HYPRE_Int              n_fine = hypre_CSRMatrixNumRows(hypre_ParCSRMatrixDiag(A));
+   HYPRE_BigInt           total_global_cpts;
+   HYPRE_Int              num_cols_P_offd;
+
+   HYPRE_Int              i;
+
+   HYPRE_Real             m_one = -1.0;
+
+   HYPRE_Int              my_id;
+   HYPRE_Int              num_procs;
+
+   HYPRE_MemoryLocation memory_location_P = hypre_ParCSRMatrixMemoryLocation(A);
+
+   C_marker = hypre_CTAlloc(HYPRE_Int, n_fine, HYPRE_MEMORY_HOST);
+   F_marker = hypre_CTAlloc(HYPRE_Int, n_fine, HYPRE_MEMORY_HOST);
+
+   // create C and F markers
+   for (i = 0; i < n_fine; i++)
+   {
+      C_marker[i] = (CF_marker[i] == 1) ? 1 : -1;
+      F_marker[i] = (CF_marker[i] == 1) ? -1 : 1;
+   }
+
+   // Get A_FF
+   hypre_MGRGetSubBlock(A, F_marker, F_marker, 0, &A_ff);
+   //  hypre_ParCSRMatrixPrintIJ(A_ff, 1, 1, "A_ff");
+   // Get A_FC
+   hypre_MGRGetSubBlock(A, F_marker, C_marker, 0, &A_fc);
+
+   hypre_MGRApproximateInverse(A_ff, &A_ff_inv);
+   //  hypre_ParCSRMatrixPrintIJ(A_ff_inv, 1, 1, "A_ff_inv");
+   //  hypre_ParCSRMatrixPrintIJ(A_fc, 1, 1, "A_fc");
+   W = hypre_ParMatmul(A_ff_inv, A_fc);
+   hypre_ParCSRMatrixScale(W, m_one);
+   //  hypre_ParCSRMatrixPrintIJ(W, 1, 1, "Wp");
+
+   hypre_CSRMatrix *W_diag = hypre_ParCSRMatrixDiag(W);
+   hypre_CSRMatrix *W_offd = hypre_ParCSRMatrixOffd(W);
+
+   hypre_MPI_Comm_size(comm, &num_procs);
+   hypre_MPI_Comm_rank(comm, &my_id);
+
+   if (my_id == (num_procs - 1)) { total_global_cpts = num_cpts_global[1]; }
+   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
+
+   /*-----------------------------------------------------------------------
+    *  Allocate  arrays.
+    *-----------------------------------------------------------------------*/
+
+   P_diag_nnz  = hypre_CSRMatrixNumNonzeros(W_diag) + hypre_CSRMatrixNumCols(W_diag);
+   P_diag_i    = hypre_CTAlloc(HYPRE_Int,  n_fine + 1, memory_location_P);
+   P_diag_j    = hypre_CTAlloc(HYPRE_Int,  P_diag_nnz, memory_location_P);
+   P_diag_data = hypre_CTAlloc(HYPRE_Real,  P_diag_nnz, memory_location_P);
+   P_offd_i    = hypre_CTAlloc(HYPRE_Int,  n_fine + 1, memory_location_P);
+
+   /* Extend W data to P data */
+   hypre_ExtendWtoPHost( n_fine,
+                         CF_marker,
+                         hypre_CSRMatrixI(W_diag),
+                         hypre_CSRMatrixJ(W_diag),
+                         hypre_CSRMatrixData(W_diag),
+                         P_diag_i,
+                         P_diag_j,
+                         P_diag_data,
+                         hypre_CSRMatrixI(W_offd),
+                         P_offd_i );
+   // final P
+   P = hypre_ParCSRMatrixCreate(comm,
+                                hypre_ParCSRMatrixGlobalNumRows(A),
+                                total_global_cpts,
+                                hypre_ParCSRMatrixColStarts(A),
+                                num_cpts_global,
+                                hypre_CSRMatrixNumCols(W_offd),
+                                P_diag_nnz,
+                                hypre_CSRMatrixNumNonzeros(W_offd) );
+
+   hypre_CSRMatrixMemoryLocation(hypre_ParCSRMatrixDiag(P)) = memory_location_P;
+   hypre_CSRMatrixMemoryLocation(hypre_ParCSRMatrixOffd(P)) = memory_location_P;
+
+   hypre_CSRMatrixI(hypre_ParCSRMatrixDiag(P))    = P_diag_i;
+   hypre_CSRMatrixJ(hypre_ParCSRMatrixDiag(P))    = P_diag_j;
+   hypre_CSRMatrixData(hypre_ParCSRMatrixDiag(P)) = P_diag_data;
+
+   hypre_CSRMatrixI(hypre_ParCSRMatrixOffd(P))    = P_offd_i;
+   hypre_CSRMatrixJ(hypre_ParCSRMatrixOffd(P))    = hypre_CSRMatrixJ(W_offd);
+   hypre_CSRMatrixData(hypre_ParCSRMatrixOffd(P)) = hypre_CSRMatrixData(W_offd);
+   hypre_CSRMatrixJ(W_offd)    = NULL;
+   hypre_CSRMatrixData(W_offd) = NULL;
+
+   num_cols_P_offd = hypre_CSRMatrixNumCols(W_offd);
+   HYPRE_BigInt *col_map_offd_tmp = hypre_ParCSRMatrixColMapOffd(W);
+   if (hypre_CSRMatrixNumNonzeros(hypre_ParCSRMatrixOffd(P)))
+   {
+      col_map_offd_P = hypre_CTAlloc(HYPRE_BigInt, num_cols_P_offd, HYPRE_MEMORY_HOST);
+      for (i = 0; i < num_cols_P_offd; i++)
+      {
+         col_map_offd_P[i] = col_map_offd_tmp[i];
+      }
+   }
+
+   if (num_cols_P_offd)
+   {
+      hypre_ParCSRMatrixColMapOffd(P) = col_map_offd_P;
+      hypre_CSRMatrixNumCols(hypre_ParCSRMatrixOffd(P)) = num_cols_P_offd;
+   }
+   hypre_MatvecCommPkgCreate(P);
+
+   *P_ptr = P;
+
+   hypre_TFree(C_marker, HYPRE_MEMORY_HOST);
+   hypre_TFree(F_marker, HYPRE_MEMORY_HOST);
+   hypre_ParCSRMatrixDestroy(A_ff);
+   hypre_ParCSRMatrixDestroy(A_fc);
+   hypre_ParCSRMatrixDestroy(A_ff_inv);
+   hypre_ParCSRMatrixDestroy(W);
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_MGRTruncateAcfCPRDevice
+ *
+ * TODO (VPM): Port truncation to GPUs
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_MGRTruncateAcfCPRDevice(hypre_ParCSRMatrix  *A_CF,
+                              hypre_ParCSRMatrix **A_CF_new_ptr)
+{
+   hypre_ParCSRMatrix *hA_CF;
+   hypre_ParCSRMatrix *A_CF_new;
+
+   hypre_GpuProfilingPushRange("MGRTruncateAcfCPR");
+
+   /* Clone matrix to host, truncate, and migrate result to device */
+   hA_CF = hypre_ParCSRMatrixClone_v2(A_CF, 1, HYPRE_MEMORY_HOST);
+   hypre_MGRTruncateAcfCPR(hA_CF, &A_CF_new);
+   hypre_ParCSRMatrixMigrate(A_CF_new, HYPRE_MEMORY_DEVICE);
+   hypre_ParCSRMatrixDestroy(hA_CF);
+
+   /* Set output pointer */
+   *A_CF_new_ptr = A_CF_new;
+
+   hypre_GpuProfilingPopRange();
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_MGRTruncateAcfCPR
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_MGRTruncateAcfCPR(hypre_ParCSRMatrix  *A_CF,
+                        hypre_ParCSRMatrix **A_CF_new_ptr)
+{
+   /* Input matrix info */
+   MPI_Comm             comm           = hypre_ParCSRMatrixComm(A_CF);
+   HYPRE_BigInt         num_rows       = hypre_ParCSRMatrixGlobalNumRows(A_CF);
+   HYPRE_BigInt         num_cols       = hypre_ParCSRMatrixGlobalNumCols(A_CF);
+
+   hypre_CSRMatrix     *A_CF_diag      = hypre_ParCSRMatrixDiag(A_CF);
+   HYPRE_Int           *A_CF_diag_i    = hypre_CSRMatrixI(A_CF_diag);
+   HYPRE_Int           *A_CF_diag_j    = hypre_CSRMatrixJ(A_CF_diag);
+   HYPRE_Complex       *A_CF_diag_data = hypre_CSRMatrixData(A_CF_diag);
+   HYPRE_Int            num_rows_local = hypre_CSRMatrixNumRows(A_CF_diag);
+
+   /* Output matrix info */
+   hypre_ParCSRMatrix  *A_CF_new;
+   hypre_CSRMatrix     *A_CF_diag_new;
+   HYPRE_Int           *A_CF_diag_i_new;
+   HYPRE_Int           *A_CF_diag_j_new;
+   HYPRE_Complex       *A_CF_diag_data_new;
+   HYPRE_Int            nnz_diag_new;
+
+   /* Local variables */
+   HYPRE_Int            i, j, jj;
+   HYPRE_Int            jj_counter;
+   HYPRE_Int            blk_size = num_cols / num_rows;
+
+   HYPRE_ANNOTATE_FUNC_BEGIN;
+
+   /* First pass: count the nnz of truncated (new) A_CF */
+   jj_counter = 0;
+   for (i = 0; i < num_rows_local; i++)
+   {
+      for (j = A_CF_diag_i[i]; j < A_CF_diag_i[i + 1]; j++)
+      {
+         jj = A_CF_diag_j[j];
+         if (jj >= i * blk_size && jj < (i + 1) * blk_size)
+         {
+            jj_counter++;
+         }
+      }
+   }
+   nnz_diag_new = jj_counter;
+
+   /* Create truncated matrix */
+   A_CF_new = hypre_ParCSRMatrixCreate(comm,
+                                       num_rows,
+                                       num_cols,
+                                       hypre_ParCSRMatrixRowStarts(A_CF),
+                                       hypre_ParCSRMatrixColStarts(A_CF),
+                                       0,
+                                       nnz_diag_new,
+                                       0);
+
+   hypre_ParCSRMatrixInitialize_v2(A_CF_new, HYPRE_MEMORY_HOST);
+   A_CF_diag_new      = hypre_ParCSRMatrixDiag(A_CF_new);
+   A_CF_diag_i_new    = hypre_CSRMatrixI(A_CF_diag_new);
+   A_CF_diag_j_new    = hypre_CSRMatrixJ(A_CF_diag_new);
+   A_CF_diag_data_new = hypre_CSRMatrixData(A_CF_diag_new);
+
+   /* Second pass: fill entries of the truncated (new) A_CF */
+   jj_counter = 0;
+   for (i = 0; i < num_rows_local; i++)
+   {
+      A_CF_diag_i_new[i] = jj_counter;
+      for (j = A_CF_diag_i[i]; j < A_CF_diag_i[i + 1]; j++)
+      {
+         jj = A_CF_diag_j[j];
+         if (jj >= i * blk_size && jj < (i + 1) * blk_size)
+         {
+            A_CF_diag_j_new[jj_counter] = jj;
+            A_CF_diag_data_new[jj_counter] = A_CF_diag_data[j];
+            jj_counter++;
+         }
+      }
+   }
+   A_CF_diag_i_new[num_rows_local] = nnz_diag_new;
+
+   /* Set output pointer */
+   *A_CF_new_ptr = A_CF_new;
+
+   HYPRE_ANNOTATE_FUNC_END;
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_MGRBuildRFromWrHost
+ *
+ * Constructs a classical restriction operator as R = [Wr I].
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_MGRBuildRFromWrHost(hypre_IntArray      *C_map,
+                          hypre_IntArray      *F_map,
+                          hypre_ParCSRMatrix  *Wr,
+                          hypre_ParCSRMatrix  *R)
+{
+   /* Input matrix variables */
+   hypre_CSRMatrix       *Wr_diag          = hypre_ParCSRMatrixDiag(Wr);
+   HYPRE_Int             *Wr_diag_i        = hypre_CSRMatrixI(Wr_diag);
+   HYPRE_Int             *Wr_diag_j        = hypre_CSRMatrixJ(Wr_diag);
+   HYPRE_Complex         *Wr_diag_a        = hypre_CSRMatrixData(Wr_diag);
+   HYPRE_Int              Wr_diag_num_rows = hypre_CSRMatrixNumRows(Wr_diag);
+   HYPRE_Int             *C_map_data       = hypre_IntArrayData(C_map);
+   HYPRE_Int             *F_map_data       = hypre_IntArrayData(F_map);
+
+   /* Output matrix */
+   hypre_CSRMatrix       *R_diag           = hypre_ParCSRMatrixDiag(R);
+   HYPRE_Int             *R_diag_i         = hypre_CSRMatrixI(R_diag);
+   HYPRE_Int             *R_diag_j         = hypre_CSRMatrixJ(R_diag);
+   HYPRE_Complex         *R_diag_a         = hypre_CSRMatrixData(R_diag);
+
+   /* Local variables */
+   HYPRE_Int              i, j, nnz_diag;
+   HYPRE_Real             one  = 1.0;
+
+   R_diag_i[0] = nnz_diag = 0;
+   for (i = 0; i < Wr_diag_num_rows; i++)
+   {
+      /* Set CC connection */
+      R_diag_j[nnz_diag] = C_map_data[i];
+      R_diag_a[nnz_diag] = one;
+      nnz_diag++;
+
+      /* Set CF connections */
+      for (j = Wr_diag_i[i]; j < Wr_diag_i[i + 1]; j++)
+      {
+         R_diag_j[nnz_diag] = F_map_data[Wr_diag_j[j]];
+         R_diag_a[nnz_diag] = Wr_diag_a[j];
+         nnz_diag++;
+      }
+
+      /* Update row pointer */
+      R_diag_i[i + 1] = nnz_diag;
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_MGRBuildRFromWr
+ *
+ * Constructs a classical restriction operator as R = [Wr I].
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_MGRBuildRFromWr(hypre_IntArray       *C_map,
+                      hypre_IntArray       *F_map,
+                      HYPRE_BigInt          global_num_rows_R,
+                      HYPRE_BigInt          global_num_cols_R,
+                      HYPRE_BigInt         *row_starts_R,
+                      HYPRE_BigInt         *col_starts_R,
+                      hypre_ParCSRMatrix   *Wr,
+                      hypre_ParCSRMatrix  **R_ptr)
+{
+   /* Input matrix variables */
+   MPI_Comm               comm               = hypre_ParCSRMatrixComm(Wr);
+   HYPRE_MemoryLocation   memory_location_Wr = hypre_ParCSRMatrixMemoryLocation(Wr);
+
+   hypre_CSRMatrix       *Wr_diag            = hypre_ParCSRMatrixDiag(Wr);
+   HYPRE_Int              Wr_diag_num_rows   = hypre_CSRMatrixNumRows(Wr_diag);
+   HYPRE_Int              Wr_diag_nnz        = hypre_CSRMatrixNumNonzeros(Wr_diag);
+
+   hypre_CSRMatrix       *Wr_offd            = hypre_ParCSRMatrixOffd(Wr);
+   HYPRE_Int              Wr_offd_num_cols   = hypre_CSRMatrixNumCols(Wr_offd);
+   HYPRE_Int              Wr_offd_nnz        = hypre_CSRMatrixNumNonzeros(Wr_offd);
+
+   /* Output matrix */
+   hypre_ParCSRMatrix    *R;
+   HYPRE_Int              num_nonzeros_diag  = Wr_diag_nnz + Wr_diag_num_rows;
+   HYPRE_Int              num_nonzeros_offd  = Wr_offd_nnz;
+
+   /* Sanity checks */
+   if (Wr_offd_nnz > 0 || Wr_offd_num_cols > 0)
+   {
+      *R_ptr = NULL;
+
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Not implemented for matrices with nonzero offd");
+      return hypre_error_flag;
+   }
+
+   HYPRE_ANNOTATE_FUNC_BEGIN;
+
+   /*-----------------------------------------------------------------------
+    * Create and initialize output matrix
+    *-----------------------------------------------------------------------*/
+
+   R = hypre_ParCSRMatrixCreate(comm, global_num_rows_R, global_num_cols_R,
+                                row_starts_R, col_starts_R, Wr_offd_num_cols,
+                                num_nonzeros_diag, num_nonzeros_offd);
+   hypre_ParCSRMatrixInitialize_v2(R, memory_location_Wr);
+
+   /*-----------------------------------------------------------------------
+    * Fill matrix entries
+    *-----------------------------------------------------------------------*/
+
+#if defined (HYPRE_USING_GPU)
+   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1(memory_location_Wr);
+
+   if (exec == HYPRE_EXEC_DEVICE)
+   {
+      /* TODO (VPM): Implement hypre_MGRBuildRFromWrDevice */
+      hypre_ParCSRMatrixMigrate(Wr, HYPRE_MEMORY_HOST);
+      hypre_ParCSRMatrixMigrate(R, HYPRE_MEMORY_HOST);
+      hypre_IntArrayMigrate(C_map, HYPRE_MEMORY_HOST);
+      hypre_IntArrayMigrate(F_map, HYPRE_MEMORY_HOST);
+      hypre_MGRBuildRFromWrHost(C_map, F_map, Wr, R);
+      hypre_ParCSRMatrixMigrate(Wr, HYPRE_MEMORY_DEVICE);
+      hypre_ParCSRMatrixMigrate(R, HYPRE_MEMORY_DEVICE);
+   }
+   else
+#endif
+   {
+      hypre_MGRBuildRFromWrHost(C_map, F_map, Wr, R);
+   }
+
+   /* Setup communication package */
+   hypre_MatvecCommPkgCreate(R);
+
+   /* Set output pointer */
+   *R_ptr = R;
+
+   HYPRE_ANNOTATE_FUNC_END;
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_MGRColLumpedRestrict
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_MGRColLumpedRestrict(hypre_ParCSRMatrix  *A,
+                           hypre_ParCSRMatrix  *A_FF,
+                           hypre_ParCSRMatrix  *A_CF,
+                           hypre_IntArray      *CF_marker,
+                           hypre_ParCSRMatrix **Wr_ptr,
+                           hypre_ParCSRMatrix **R_ptr)
+{
+   hypre_ParVector         *b_FF       = NULL;
+   hypre_ParVector         *b_CF       = NULL;
+   hypre_ParVector         *r_CF       = NULL;
+   hypre_ParCSRMatrix      *Wr         = NULL;
+   hypre_ParCSRMatrix      *R          = NULL;
+
+   HYPRE_Int                num_points = 2;
+   HYPRE_Int                points[2]  = {1, -1}; // {C, F}
+   HYPRE_Int                sizes[2]   = {hypre_ParCSRMatrixNumRows(A_CF),
+                                          hypre_ParCSRMatrixNumCols(A_CF)
+                                         };
+   hypre_IntArrayArray     *CF_maps;
+
+   HYPRE_ANNOTATE_FUNC_BEGIN;
+
+   /*-------------------------------------------------------
+    * 1) b_FF = approx(A_FF)
+    *-------------------------------------------------------*/
+
+   hypre_ParCSRMatrixColSum(A_FF, &b_FF);
+
+   /*-------------------------------------------------------
+    * 2) b_CF = approx(A_CF)
+    *-------------------------------------------------------*/
+
+   hypre_ParCSRMatrixColSum(A_CF, &b_CF);
+
+   /*-------------------------------------------------------
+    * 3) Wr = - approx(A_CF) * inv(approx(A_FF))
+    *-------------------------------------------------------*/
+
+   r_CF = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A_CF),
+                                hypre_ParCSRMatrixGlobalNumRows(A_CF),
+                                hypre_ParCSRMatrixRowStarts(A_CF));
+   hypre_ParVectorInitialize_v2(r_CF, hypre_ParCSRMatrixMemoryLocation(A_CF));
+   hypre_ParVectorElmdivpy(b_CF, b_FF, r_CF);
+   hypre_ParVectorScale(-1.0, r_CF);
+   Wr = hypre_ParCSRMatrixCreateFromParVector(r_CF,
+                                              hypre_ParCSRMatrixGlobalNumRows(A_CF),
+                                              hypre_ParCSRMatrixGlobalNumCols(A_CF),
+                                              hypre_ParCSRMatrixRowStarts(A_CF),
+                                              hypre_ParCSRMatrixColStarts(A_CF));
+
+   /* Free memory */
+   hypre_ParVectorDestroy(b_FF);
+   hypre_ParVectorDestroy(b_CF);
+   hypre_ParVectorDestroy(r_CF);
+
+   /*-------------------------------------------------------
+    * 4) Build Restriction
+    *-------------------------------------------------------*/
+
+   /* Compute C/F local mappings */
+   hypre_IntArraySeparateByValue(num_points, points, sizes, CF_marker, &CF_maps);
+
+   /* Build restriction from Wr (R = [Wr  I]) */
+   hypre_MGRBuildRFromWr(hypre_IntArrayArrayEntryI(CF_maps, 0),
+                         hypre_IntArrayArrayEntryI(CF_maps, 1),
+                         hypre_ParCSRMatrixGlobalNumRows(A_CF),
+                         hypre_ParCSRMatrixGlobalNumCols(A),
+                         hypre_ParCSRMatrixRowStarts(A_CF),
+                         hypre_ParCSRMatrixColStarts(A),
+                         Wr, &R);
+
+   /* Set output pointers */
+   *Wr_ptr = Wr;
+   *R_ptr  = R;
+
+   /* Free memory */
+   hypre_IntArrayArrayDestroy(CF_maps);
+
+   HYPRE_ANNOTATE_FUNC_END;
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_MGRBlockColLumpedRestrict
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_MGRBlockColLumpedRestrict(hypre_ParCSRMatrix  *A,
+                                hypre_ParCSRMatrix  *A_FF,
+                                hypre_ParCSRMatrix  *A_CF,
+                                hypre_IntArray      *CF_marker,
+                                HYPRE_Int            block_dim,
+                                hypre_ParCSRMatrix **Wr_ptr,
+                                hypre_ParCSRMatrix **R_ptr)
+{
+   hypre_DenseBlockMatrix  *b_FF       = NULL;
+   hypre_DenseBlockMatrix  *b_CF       = NULL;
+   hypre_DenseBlockMatrix  *r_CF       = NULL;
+   hypre_ParCSRMatrix      *Wr         = NULL;
+   hypre_ParCSRMatrix      *R          = NULL;
+
+   HYPRE_Int                row_major  = 0;
+   HYPRE_Int                num_points = 2;
+   HYPRE_Int                points[2]  = {1, -1}; // {C, F}
+   HYPRE_Int                sizes[2]   = {hypre_ParCSRMatrixNumRows(A_CF),
+                                          hypre_ParCSRMatrixNumCols(A_CF)
+                                         };
+   hypre_IntArrayArray     *CF_maps;
+
+   HYPRE_ANNOTATE_FUNC_BEGIN;
+
+   /* Sanity check */
+   if (block_dim <= 1)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Invalid block dimension!");
+      return hypre_error_flag;
+   }
+
+   /*-------------------------------------------------------
+    * 1) b_FF = approx(A_FF)
+    *-------------------------------------------------------*/
+
+   hypre_ParCSRMatrixBlockColSum(A_FF, row_major, block_dim, block_dim, &b_FF);
+
+   /*-------------------------------------------------------
+    * 2) b_CF = approx(A_CF)
+    *-------------------------------------------------------*/
+
+   hypre_ParCSRMatrixBlockColSum(A_CF, row_major, 1, block_dim, &b_CF);
+
+   /*-------------------------------------------------------
+    * 3) b_FF = inv(approx(A_FF))          (invert in-place)
+    *-------------------------------------------------------*/
+
+#if defined (HYPRE_USING_GPU)
+   if (hypre_GetExecPolicy1(hypre_DenseBlockMatrixMemoryLocation(b_FF)) == HYPRE_EXEC_DEVICE)
+   {
+      /* TODO (VPM): GPU version */
+      hypre_DenseBlockMatrixMigrate(b_FF, HYPRE_MEMORY_HOST);
+      hypre_BlockDiagInvLapack(hypre_DenseBlockMatrixData(b_FF),
+                               hypre_DenseBlockMatrixNumRows(b_FF),
+                               hypre_DenseBlockMatrixNumRowsBlock(b_FF));
+      hypre_DenseBlockMatrixMigrate(b_FF, HYPRE_MEMORY_DEVICE);
+   }
+   else
+#endif
+   {
+      hypre_BlockDiagInvLapack(hypre_DenseBlockMatrixData(b_FF),
+                               hypre_DenseBlockMatrixNumRows(b_FF),
+                               hypre_DenseBlockMatrixNumRowsBlock(b_FF));
+   }
+
+   /*-------------------------------------------------------
+    * 4) Wr = - approx(A_CF) * inv(approx(A_FF))
+    *-------------------------------------------------------*/
+
+   hypre_DenseBlockMatrixMultiply(b_CF, b_FF, &r_CF);
+   hypre_DenseBlockMatrixPrint(hypre_ParCSRMatrixComm(A), r_CF, "r_CF");
+   Wr = hypre_ParCSRMatrixCreateFromDenseBlockMatrix(hypre_ParCSRMatrixComm(A_CF),
+                                                     hypre_ParCSRMatrixGlobalNumRows(A_CF),
+                                                     hypre_ParCSRMatrixGlobalNumCols(A_CF),
+                                                     hypre_ParCSRMatrixRowStarts(A_CF),
+                                                     hypre_ParCSRMatrixColStarts(A_CF),
+                                                     r_CF);
+   hypre_ParCSRMatrixScale(Wr, -1.0);
+
+   /* Free memory */
+   hypre_DenseBlockMatrixDestroy(b_FF);
+   hypre_DenseBlockMatrixDestroy(b_CF);
+   hypre_DenseBlockMatrixDestroy(r_CF);
+
+   /*-------------------------------------------------------
+    * 5) Build Restriction
+    *-------------------------------------------------------*/
+
+   /* Compute C/F local mappings */
+   hypre_IntArraySeparateByValue(num_points, points, sizes, CF_marker, &CF_maps);
+
+   /* Build restriction from W (R = [Wr  I]) */
+   hypre_MGRBuildRFromWr(hypre_IntArrayArrayEntryI(CF_maps, 0),
+                         hypre_IntArrayArrayEntryI(CF_maps, 1),
+                         hypre_ParCSRMatrixGlobalNumRows(A_CF),
+                         hypre_ParCSRMatrixGlobalNumCols(A),
+                         hypre_ParCSRMatrixRowStarts(A_CF),
+                         hypre_ParCSRMatrixColStarts(A),
+                         Wr, &R);
+
+   /* Set output pointers */
+   *Wr_ptr = Wr;
+   *R_ptr  = R;
+
+   /* Free memory */
+   hypre_IntArrayArrayDestroy(CF_maps);
+
+   HYPRE_ANNOTATE_FUNC_END;
+
+   return hypre_error_flag;
+}
diff --git a/external/hypre/src/parcsr_ls/par_mgr_rap.c b/external/hypre/src/parcsr_ls/par_mgr_rap.c
new file mode 100644
index 00000000..c18c61d1
--- /dev/null
+++ b/external/hypre/src/parcsr_ls/par_mgr_rap.c
@@ -0,0 +1,692 @@
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+#include "_hypre_parcsr_ls.h"
+#include "par_mgr.h"
+
+/*--------------------------------------------------------------------------
+ * hypre_MGRNonGalerkinTruncate
+ *
+ * Applies filtering in-place to the input matrix "A" based on the maximum
+ * number of nonzero entries per row. This algorithm is tailored to the needs
+ * of the Non-Galerkin approach in MGR.
+ *
+ *  - max_elmts == 0: no filtering
+ *  - max_elmts == 1 and blk_dim == 1: keep diagonal entries
+ *  - max_elmts == 1 and  blk_dim > 1: keep block diagonal entries
+ *  - max_elmts > 1 and blk_dim == 1: keep diagonal entries and
+ *                                    (max_elmts - 1) largest ones per row
+ *  - max_elmts > blk_dim and blk_dim > 1: keep block diagonal entries and
+ *                                         (max_elmts - blk_dim) largest ones
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_MGRNonGalerkinTruncate(hypre_ParCSRMatrix *A,
+                             HYPRE_Int           ordering,
+                             HYPRE_Int           blk_dim,
+                             HYPRE_Int           max_elmts)
+{
+   HYPRE_MemoryLocation   memory_location = hypre_ParCSRMatrixMemoryLocation(A);
+   HYPRE_Int              nrows = hypre_CSRMatrixNumRows(hypre_ParCSRMatrixDiag(A));
+
+   hypre_CSRMatrix *A_diag    = hypre_ParCSRMatrixDiag(A);
+   HYPRE_Complex   *A_diag_a  = hypre_CSRMatrixData(A_diag);
+   HYPRE_Int       *A_diag_i  = hypre_CSRMatrixI(A_diag);
+   HYPRE_Int       *A_diag_j  = hypre_CSRMatrixJ(A_diag);
+   HYPRE_Int        ncol_diag = hypre_CSRMatrixNumCols(A_diag);
+
+   hypre_CSRMatrix *A_offd    = hypre_ParCSRMatrixOffd(A);
+   HYPRE_Complex   *A_offd_a  = hypre_CSRMatrixData(A_offd);
+   HYPRE_Int       *A_offd_i  = hypre_CSRMatrixI(A_offd);
+   HYPRE_Int       *A_offd_j  = hypre_CSRMatrixJ(A_offd);
+
+   HYPRE_Int        i, i1, jj;
+
+   HYPRE_Int       *A_diag_i_new, *A_diag_j_new;
+   HYPRE_Complex   *A_diag_a_new;
+   HYPRE_Int        num_nonzeros_diag_new = 0;
+
+   HYPRE_Int       *A_offd_i_new, *A_offd_j_new;
+   HYPRE_Complex   *A_offd_a_new;
+   HYPRE_Int        num_nonzeros_offd_new = 0;
+   HYPRE_Int        num_nonzeros_max = (blk_dim + max_elmts) * nrows;
+   HYPRE_Int        num_nonzeros_offd_max = max_elmts * nrows;
+
+   HYPRE_Int        max_num_nonzeros;
+   HYPRE_Int       *aux_j = NULL;
+   HYPRE_Real      *aux_data = NULL;
+   HYPRE_Int        row_start, row_stop, cnt;
+   HYPRE_Int        col_idx;
+   HYPRE_Real       col_value;
+
+   /* Return if max_elmts is zero, i.e., no truncation */
+   if (max_elmts == 0)
+   {
+      return hypre_error_flag;
+   }
+
+   /* Allocate new memory */
+   if (ordering == 0)
+   {
+#if defined (HYPRE_USING_GPU)
+      if (hypre_GetExecPolicy1(memory_location) == HYPRE_EXEC_DEVICE)
+      {
+         hypre_ParCSRMatrixMigrate(A, HYPRE_MEMORY_HOST);
+      }
+#endif
+
+      A_diag_i_new = hypre_CTAlloc(HYPRE_Int, nrows + 1, HYPRE_MEMORY_HOST);
+      A_diag_j_new = hypre_CTAlloc(HYPRE_Int, num_nonzeros_max, HYPRE_MEMORY_HOST);
+      A_diag_a_new = hypre_CTAlloc(HYPRE_Complex, num_nonzeros_max, HYPRE_MEMORY_HOST);
+      A_offd_i_new = hypre_CTAlloc(HYPRE_Int, nrows + 1, HYPRE_MEMORY_HOST);
+      A_offd_j_new = hypre_CTAlloc(HYPRE_Int, num_nonzeros_offd_max, HYPRE_MEMORY_HOST);
+      A_offd_a_new = hypre_CTAlloc(HYPRE_Complex, num_nonzeros_offd_max, HYPRE_MEMORY_HOST);
+
+      if (max_elmts > 0)
+      {
+         max_num_nonzeros = 0;
+         for (i = 0; i < nrows; i++)
+         {
+            max_num_nonzeros = hypre_max(max_num_nonzeros,
+                                         (A_diag_i[i + 1] - A_diag_i[i]) +
+                                         (A_offd_i[i + 1] - A_offd_i[i]));
+         }
+         aux_j = hypre_CTAlloc(HYPRE_Int, max_num_nonzeros, HYPRE_MEMORY_HOST);
+         aux_data = hypre_CTAlloc(HYPRE_Real, max_num_nonzeros, HYPRE_MEMORY_HOST);
+      }
+
+      for (i = 0; i < nrows; i++)
+      {
+         row_start = i - (i % blk_dim);
+         row_stop  = row_start + blk_dim - 1;
+
+         /* Copy (block) diagonal data to new arrays */
+         for (jj = A_diag_i[i]; jj < A_diag_i[i + 1]; jj++)
+         {
+            i1 = A_diag_j[jj];
+            if (i1 >= row_start && i1 <= row_stop)
+            {
+               A_diag_j_new[num_nonzeros_diag_new] = i1;
+               A_diag_a_new[num_nonzeros_diag_new] = A_diag_a[jj];
+               ++num_nonzeros_diag_new;
+            }
+         }
+
+         /* Add other connections? */
+         if (max_elmts > 0)
+         {
+            cnt = 0;
+            for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
+            {
+               aux_j[cnt] = A_offd_j[jj] + ncol_diag;
+               aux_data[cnt] = A_offd_a[jj];
+               cnt++;
+            }
+
+            for (jj = A_diag_i[i]; jj < A_diag_i[i + 1]; jj++)
+            {
+               aux_j[cnt] = A_diag_j[jj];
+               aux_data[cnt] = A_diag_a[jj];
+               cnt++;
+            }
+            hypre_qsort2_abs(aux_j, aux_data, 0, cnt - 1);
+
+            for (jj = 0; jj < hypre_min(max_elmts, cnt); jj++)
+            {
+               col_idx   = aux_j[jj];
+               col_value = aux_data[jj];
+               if (col_idx < ncol_diag && (col_idx < row_start || col_idx > row_stop))
+               {
+                  A_diag_j_new[num_nonzeros_diag_new] = col_idx;
+                  A_diag_a_new[num_nonzeros_diag_new] = col_value;
+                  ++num_nonzeros_diag_new;
+               }
+               else if (col_idx >= ncol_diag)
+               {
+                  A_offd_j_new[num_nonzeros_offd_new] = col_idx - ncol_diag;
+                  A_offd_a_new[num_nonzeros_offd_new] = col_value;
+                  ++num_nonzeros_offd_new;
+               }
+            }
+         }
+
+         A_diag_i_new[i + 1] = num_nonzeros_diag_new;
+         A_offd_i_new[i + 1] = num_nonzeros_offd_new;
+      }
+
+      hypre_TFree(aux_j, HYPRE_MEMORY_HOST);
+      hypre_TFree(aux_data, HYPRE_MEMORY_HOST);
+
+      /* Update input matrix */
+      hypre_TFree(A_diag_i, HYPRE_MEMORY_HOST);
+      hypre_TFree(A_diag_j, HYPRE_MEMORY_HOST);
+      hypre_TFree(A_diag_a, HYPRE_MEMORY_HOST);
+      hypre_CSRMatrixI(A_diag) = A_diag_i_new;
+      hypre_CSRMatrixJ(A_diag) = A_diag_j_new;
+      hypre_CSRMatrixData(A_diag) = A_diag_a_new;
+      hypre_CSRMatrixNumNonzeros(A_diag) = num_nonzeros_diag_new;
+
+      hypre_TFree(A_offd_i, HYPRE_MEMORY_HOST);
+      hypre_TFree(A_offd_j, HYPRE_MEMORY_HOST);
+      hypre_TFree(A_offd_a, HYPRE_MEMORY_HOST);
+      hypre_CSRMatrixI(A_offd) = A_offd_i_new;
+      hypre_CSRMatrixJ(A_offd) = A_offd_j_new;
+      hypre_CSRMatrixData(A_offd) = A_offd_a_new;
+      hypre_CSRMatrixNumNonzeros(A_offd) = num_nonzeros_offd_new;
+
+#if defined (HYPRE_USING_GPU)
+      if (hypre_GetExecPolicy1(memory_location) == HYPRE_EXEC_DEVICE)
+      {
+         hypre_ParCSRMatrixMigrate(A, memory_location);
+      }
+#endif
+   }
+   else
+   {
+      /* Keep only the diagonal portion of A
+         TODO (VPM): consider other combinations of max_elmts and blk_dim */
+      hypre_CSRMatrixNumCols(A_offd) = 0;
+      hypre_CSRMatrixNumNonzeros(A_offd) = 0;
+      hypre_CSRMatrixNumRownnz(A_offd) = 0;
+      hypre_TFree(hypre_CSRMatrixRownnz(A_offd), memory_location);
+      hypre_TFree(hypre_CSRMatrixI(A_offd), memory_location);
+      hypre_TFree(hypre_CSRMatrixJ(A_offd), memory_location);
+      hypre_TFree(hypre_CSRMatrixData(A_offd), memory_location);
+      hypre_TFree(hypre_ParCSRMatrixColMapOffd(A), HYPRE_MEMORY_HOST);
+      hypre_TFree(hypre_ParCSRMatrixDeviceColMapOffd(A), memory_location);
+      hypre_CSRMatrixI(A_offd) = hypre_CTAlloc(HYPRE_Int, nrows + 1, memory_location);
+
+      hypre_CSRMatrixTruncateDiag(A_diag);
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_MGRBuildNonGalerkinCoarseOperatorHost
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_MGRBuildNonGalerkinCoarseOperatorHost(hypre_ParCSRMatrix    *A_FF,
+                                            hypre_ParCSRMatrix    *A_FC,
+                                            hypre_ParCSRMatrix    *A_CF,
+                                            hypre_ParCSRMatrix    *A_CC,
+                                            hypre_ParCSRMatrix    *Wp,
+                                            hypre_ParCSRMatrix    *Wr,
+                                            HYPRE_Int              fine_blk_dim,
+                                            HYPRE_Int              coarse_blk_dim,
+                                            HYPRE_Int              ordering,
+                                            HYPRE_Int              method,
+                                            HYPRE_Int              max_elmts,
+                                            hypre_ParCSRMatrix   **A_H_ptr)
+{
+   hypre_ParCSRMatrix    *A_H = NULL;
+   hypre_ParCSRMatrix    *A_Hc = NULL;
+   hypre_ParCSRMatrix    *Wp_tmp = NULL;
+   hypre_ParCSRMatrix    *Wr_tmp = NULL;
+   hypre_ParCSRMatrix    *A_CF_truncated = NULL;
+   hypre_ParCSRMatrix    *A_FF_inv = NULL;
+   hypre_ParCSRMatrix    *minus_Wp = NULL;
+
+   HYPRE_Int              blk_inv_size;
+   HYPRE_Complex          neg_one = -1.0;
+   HYPRE_Complex          one = 1.0;
+   HYPRE_Complex          beta = 0.0;
+
+   if (Wp != NULL && max_elmts > 0)
+   {
+      /* A_Hc = diag(A_CF * Wp) */
+      hypre_ParCSRMatMatDiag(A_CF, Wp, &A_Hc);
+
+      /* Coarse grid / Schur complement
+         Note that beta is one since A_Hc has positive sign */
+      hypre_ParCSRMatrixAdd(one, A_CC, one, A_Hc, &A_H);
+
+      /* Free memory */
+      hypre_ParCSRMatrixDestroy(A_Hc);
+
+      /* Set output pointer */
+      *A_H_ptr = A_H;
+
+      return hypre_error_flag;
+   }
+
+   if (method == 1)
+   {
+      if (Wp != NULL)
+      {
+         A_Hc = hypre_ParCSRMatMat(A_CF, Wp);
+
+         /* Set multiplication factor to A_Hc */
+         beta = one;
+      }
+      else
+      {
+         // Build block diagonal inverse for A_FF
+         hypre_ParCSRMatrixBlockDiagMatrix(A_FF, fine_blk_dim, -1, NULL, 1, &A_FF_inv);
+
+         // compute Wp = A_FF_inv * A_FC
+         // NOTE: Use hypre_ParMatmul here instead of hypre_ParCSRMatMat to avoid padding
+         // zero entries at diagonals for the latter routine. Use MatMat once this padding
+         // issue is resolved since it is more efficient.
+         //         hypre_ParCSRMatrix *Wp_tmp = hypre_ParCSRMatMat(A_FF_inv, A_FC);
+         Wp_tmp = hypre_ParMatmul(A_FF_inv, A_FC);
+
+         /* Compute correction A_Hc = A_CF * (A_FF_inv * A_FC); */
+         A_Hc = hypre_ParCSRMatMat(A_CF, Wp_tmp);
+         hypre_ParCSRMatrixDestroy(Wp_tmp);
+         hypre_ParCSRMatrixDestroy(A_FF_inv);
+
+         /* Set multiplication factor to A_Hc */
+         beta = neg_one;
+      }
+   }
+   else if (method == 2 || method == 3)
+   {
+      /* Extract the diagonal of A_CF */
+      hypre_MGRTruncateAcfCPR(A_CF, &A_CF_truncated);
+      if (Wp != NULL)
+      {
+         A_Hc = hypre_ParCSRMatMat(A_CF_truncated, Wp);
+
+         /* Set multiplication factor to A_Hc */
+         beta = one;
+      }
+      else
+      {
+         blk_inv_size = method == 2 ? 1 : fine_blk_dim;
+         hypre_ParCSRMatrixBlockDiagMatrix(A_FF, blk_inv_size, -1, NULL, 1, &A_FF_inv);
+
+         /* TODO (VPM): We shouldn't need to compute Wr_tmp since we are passing in Wr already */
+         HYPRE_UNUSED_VAR(Wr);
+         Wr_tmp = hypre_ParCSRMatMat(A_CF_truncated, A_FF_inv);
+         A_Hc = hypre_ParCSRMatMat(Wr_tmp, A_FC);
+         hypre_ParCSRMatrixDestroy(Wr_tmp);
+         hypre_ParCSRMatrixDestroy(A_FF_inv);
+
+         /* Set multiplication factor to A_Hc */
+         beta = neg_one;
+      }
+      hypre_ParCSRMatrixDestroy(A_CF_truncated);
+   }
+   else if (method == 4)
+   {
+      /* Approximate inverse for ideal interploation */
+      hypre_MGRApproximateInverse(A_FF, &A_FF_inv);
+
+      minus_Wp = hypre_ParCSRMatMat(A_FF_inv, A_FC);
+      A_Hc = hypre_ParCSRMatMat(A_CF, minus_Wp);
+      hypre_ParCSRMatrixDestroy(minus_Wp);
+
+      /* Set multiplication factor to A_Hc */
+      beta = neg_one;
+   }
+
+   /* Drop small entries in the correction term A_Hc */
+   hypre_MGRNonGalerkinTruncate(A_Hc, ordering, coarse_blk_dim, max_elmts);
+
+   /* Coarse grid / Schur complement */
+   hypre_ParCSRMatrixAdd(one, A_CC, beta, A_Hc, &A_H);
+
+   /* Free memory */
+   hypre_ParCSRMatrixDestroy(A_Hc);
+
+   /* Set output pointer */
+   *A_H_ptr = A_H;
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_MGRBuildNonGalerkinCoarseOperatorDevice
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_MGRBuildNonGalerkinCoarseOperatorDevice(hypre_ParCSRMatrix    *A_FF,
+                                              hypre_ParCSRMatrix    *A_FC,
+                                              hypre_ParCSRMatrix    *A_CF,
+                                              hypre_ParCSRMatrix    *A_CC,
+                                              hypre_ParCSRMatrix    *Wp,
+                                              hypre_ParCSRMatrix    *Wr,
+                                              HYPRE_Int              fine_blk_dim,
+                                              HYPRE_Int              coarse_blk_dim,
+                                              HYPRE_Int              ordering,
+                                              HYPRE_Int              method,
+                                              HYPRE_Int              max_elmts,
+                                              hypre_ParCSRMatrix   **A_H_ptr)
+{
+   /* Local variables */
+   hypre_ParCSRMatrix   *A_H;
+   hypre_ParCSRMatrix   *A_Hc;
+   hypre_ParCSRMatrix   *A_CF_trunc;
+   hypre_ParCSRMatrix   *Wp_tmp = Wp;
+   HYPRE_Complex         neg_one = -1.0;
+   HYPRE_Complex         one = 1.0;
+
+   hypre_GpuProfilingPushRange("MGRComputeNonGalerkinCG");
+
+   /* Truncate A_CF according to the method */
+   if (method == 2 || method == 3)
+   {
+      hypre_MGRTruncateAcfCPRDevice(A_CF, &A_CF_trunc);
+   }
+   else
+   {
+      A_CF_trunc = A_CF;
+   }
+
+   /* Compute Wp/Wr if not passed in */
+   if (!Wp && (method == 1 || method == 2))
+   {
+      hypre_ParVector      *D_FF_inv;
+      HYPRE_Complex        *data;
+
+      /* Create vector to store A_FF's diagonal inverse  */
+      D_FF_inv = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A_FF),
+                                       hypre_ParCSRMatrixGlobalNumRows(A_FF),
+                                       hypre_ParCSRMatrixRowStarts(A_FF));
+      hypre_ParVectorInitialize_v2(D_FF_inv, HYPRE_MEMORY_DEVICE);
+      data = hypre_ParVectorLocalData(D_FF_inv);
+
+      /* Compute the inverse of A_FF and compute its inverse */
+      hypre_CSRMatrixExtractDiagonal(hypre_ParCSRMatrixDiag(A_FF), data, 2);
+      hypre_ParVectorScale(neg_one, D_FF_inv);
+
+      /* Compute D_FF_inv*A_FC */
+      Wp_tmp = hypre_ParCSRMatrixClone(A_FC, 1);
+      hypre_ParCSRMatrixDiagScale(Wp_tmp, D_FF_inv, NULL);
+
+      /* Free memory */
+      hypre_ParVectorDestroy(D_FF_inv);
+   }
+   else if (!Wp && (method == 3))
+   {
+      hypre_ParCSRMatrix  *B_FF_inv;
+
+      /* Compute the block diagonal inverse of A_FF */
+      hypre_ParCSRMatrixBlockDiagMatrix(A_FF, fine_blk_dim, -1, NULL, 1, &B_FF_inv);
+
+      /* Compute Wp = A_FF_inv * A_FC */
+      Wp_tmp = hypre_ParCSRMatMat(B_FF_inv, A_FC);
+      hypre_ParCSRMatrixScale(Wp_tmp, neg_one);
+
+      /* Free memory */
+      hypre_ParCSRMatrixDestroy(B_FF_inv);
+   }
+
+   /* Compute A_Hc (the correction for A_H) */
+   if (Wp_tmp)
+   {
+      if (max_elmts > 0)
+      {
+         /* A_Hc = diag(A_CF * Wp) */
+         hypre_ParCSRMatMatDiag(A_CF_trunc, Wp_tmp, &A_Hc);
+
+         /* Coarse grid / Schur complement */
+         hypre_ParCSRMatrixAdd(one, A_CC, one, A_Hc, &A_H);
+
+         /* Free memory */
+         hypre_ParCSRMatrixDestroy(A_Hc);
+         if (method == 2 || method == 3)
+         {
+            hypre_ParCSRMatrixDestroy(A_CF_trunc);
+         }
+         if (Wp_tmp != Wp)
+         {
+            hypre_ParCSRMatrixDestroy(Wp_tmp);
+         }
+
+         /* Set output pointer */
+         *A_H_ptr = A_H;
+
+         hypre_GpuProfilingPopRange();
+
+         return hypre_error_flag;
+      }
+
+      A_Hc = hypre_ParCSRMatMat(A_CF_trunc, Wp_tmp);
+   }
+   else if (Wr)
+   {
+      A_Hc = hypre_ParCSRMatMat(Wr, A_FC);
+   }
+   else
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Wp/Wr matrices were not provided!");
+      hypre_GpuProfilingPopRange();
+
+      return hypre_error_flag;
+   }
+
+   /* Filter A_Hc */
+   hypre_MGRNonGalerkinTruncate(A_Hc, ordering, coarse_blk_dim, max_elmts);
+
+   /* Coarse grid (Schur complement) computation */
+   hypre_ParCSRMatrixAdd(one, A_CC, one, A_Hc, &A_H);
+
+   /* Free memory */
+   hypre_ParCSRMatrixDestroy(A_Hc);
+   if (Wp_tmp != Wp)
+   {
+      hypre_ParCSRMatrixDestroy(Wp_tmp);
+   }
+   if (method == 2 || method == 3)
+   {
+      hypre_ParCSRMatrixDestroy(A_CF_trunc);
+   }
+
+   /* Set output pointer to coarse grid matrix */
+   *A_H_ptr = A_H;
+
+   hypre_GpuProfilingPopRange();
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_MGRBuildNonGalerkinCoarseOperator
+ *
+ * Computes the coarse level operator A_H = RAP via a Non-Galerkin approach.
+ *
+ * Available methods:
+ *   1: inv(A_FF) approximated by its (block) diagonal inverse
+ *   2: CPR-like approx. with inv(A_FF) approx. by its diagonal inverse
+ *   3: CPR-like approx. with inv(A_FF) approx. by its block diagonal inverse
+ *   4: inv(A_FF) approximated by sparse approximate inverse
+ *
+ * Methods 1-4 assume that restriction is the injection operator.
+ *
+ * TODO (VPM): inv(A_FF)*A_FC might have been computed before. Reuse it!
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_MGRBuildNonGalerkinCoarseOperator(hypre_ParCSRMatrix    *A_FF,
+                                        hypre_ParCSRMatrix    *A_FC,
+                                        hypre_ParCSRMatrix    *A_CF,
+                                        hypre_ParCSRMatrix    *A_CC,
+                                        hypre_ParCSRMatrix    *Wp,
+                                        hypre_ParCSRMatrix    *Wr,
+                                        HYPRE_Int              fine_blk_dim,
+                                        HYPRE_Int              coarse_blk_dim,
+                                        HYPRE_Int              ordering,
+                                        HYPRE_Int              method,
+                                        HYPRE_Int              max_elmts,
+                                        hypre_ParCSRMatrix   **A_H_ptr)
+{
+   hypre_ParCSRMatrix   *matrices[6] = {A_FF, A_FC, A_CF, A_CC, Wp, Wr};
+   HYPRE_Int             i;
+
+   /* Check that the memory locations of the input matrices match */
+   for (i = 0; i < 5; i++)
+   {
+      if (matrices[i] && matrices[i + 1] &&
+          hypre_ParCSRMatrixMemoryLocation(matrices[i]) !=
+          hypre_ParCSRMatrixMemoryLocation(matrices[i + 1]))
+      {
+         hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Memory locations do not match!");
+         return hypre_error_flag;
+      }
+   }
+
+#if defined (HYPRE_USING_GPU)
+   HYPRE_MemoryLocation  memory_location = hypre_ParCSRMatrixMemoryLocation(A_FF);
+
+   if (hypre_GetExecPolicy1(memory_location) == HYPRE_EXEC_DEVICE)
+   {
+      hypre_MGRBuildNonGalerkinCoarseOperatorDevice(A_FF, A_FC, A_CF, A_CC, Wp, Wr,
+                                                    fine_blk_dim, coarse_blk_dim,
+                                                    ordering, method, max_elmts, A_H_ptr);
+   }
+   else
+#endif
+   {
+      hypre_MGRBuildNonGalerkinCoarseOperatorHost(A_FF, A_FC, A_CF, A_CC, Wp, Wr,
+                                                  fine_blk_dim, coarse_blk_dim,
+                                                  ordering, method, max_elmts, A_H_ptr);
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_MGRBuildCoarseOperator
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_MGRBuildCoarseOperator(void                *mgr_vdata,
+                             hypre_ParCSRMatrix  *A_FF,
+                             hypre_ParCSRMatrix  *A_FC,
+                             hypre_ParCSRMatrix  *A_CF,
+                             hypre_ParCSRMatrix **A_CC_ptr,
+                             hypre_ParCSRMatrix  *Wp,
+                             hypre_ParCSRMatrix  *Wr,
+                             HYPRE_Int            level)
+{
+   hypre_ParMGRData      *mgr_data = (hypre_ParMGRData*) mgr_vdata;
+   hypre_ParCSRMatrix    *A  = (mgr_data -> A_array)[level];
+   hypre_ParCSRMatrix    *P  = (mgr_data -> P_array)[level];
+   hypre_ParCSRMatrix    *R  = (mgr_data -> R_array)[level];
+   hypre_ParCSRMatrix    *RT = (mgr_data -> RT_array)[level];
+   hypre_ParCSRMatrix    *A_CC = *A_CC_ptr;
+
+   HYPRE_Int             *blk_dims = (mgr_data -> block_num_coarse_indexes);
+   HYPRE_Int              block_size = (mgr_data -> block_size);
+   HYPRE_Int              method = (mgr_data -> coarse_grid_method)[level];
+   HYPRE_Int              num_coarse_levels = (mgr_data -> max_num_coarse_levels);
+   HYPRE_Int              ordering = (mgr_data -> set_c_points_method);
+   HYPRE_Int              max_elmts = (mgr_data -> nonglk_max_elmts)[level];
+   HYPRE_Int              interp_type = (mgr_data -> interp_type)[level];
+   HYPRE_Int              restrict_type = (mgr_data -> restrict_type)[level];
+   HYPRE_Real             threshold = (mgr_data -> truncate_coarse_grid_threshold);
+
+   hypre_ParCSRMatrix    *AP, *RAP, *RAP_c;
+   HYPRE_Int              fine_blk_dim = (level) ? blk_dims[level - 1] - blk_dims[level] :
+                                         block_size - blk_dims[level];
+   HYPRE_Int              coarse_blk_dim = blk_dims[level];
+   HYPRE_Int              rebuild_commpkg = 0;
+   HYPRE_Complex          one = 1.0;
+   HYPRE_MemoryLocation   memory_location = hypre_ParCSRMatrixMemoryLocation(A);
+   HYPRE_ExecutionPolicy  exec_policy = hypre_GetExecPolicy1(memory_location);
+
+   HYPRE_ANNOTATE_FUNC_BEGIN;
+   hypre_GpuProfilingPushRange("RAP");
+
+   if (!method)
+   {
+      /* Galerkin path */
+      if ((interp_type == 0) && Wr && (exec_policy == HYPRE_EXEC_HOST))
+      {
+         /* Prolongation is the injection operator and
+            Restriction is not the injection operator (Wr != NULL) */
+         RAP_c = hypre_ParCSRMatMat(Wr, A_FC);
+         hypre_ParCSRMatrixAdd(one, A_CC, one, RAP_c, &RAP);
+         hypre_ParCSRMatrixDestroy(RAP_c);
+      }
+      else if ((restrict_type == 0) && Wp && (exec_policy == HYPRE_EXEC_HOST))
+      {
+         /* Prolongation is not the injection operator (Wp != NULL) and
+            Restriction is the injection operator */
+         RAP_c = hypre_ParCSRMatMat(A_CF, Wp);
+         hypre_ParCSRMatrixAdd(one, A_CC, one, RAP_c, &RAP);
+         hypre_ParCSRMatrixDestroy(RAP_c);
+      }
+      else if (RT)
+      {
+         RAP = hypre_ParCSRMatrixRAPKT(RT, A, P, 1);
+      }
+      else if (R)
+      {
+         AP  = hypre_ParCSRMatMat(A, P);
+         RAP = hypre_ParCSRMatMat(R, AP);
+         hypre_CSRMatrixReorder(hypre_ParCSRMatrixDiag(RAP));
+         hypre_ParCSRMatrixDestroy(AP);
+      }
+      else
+      {
+         hypre_GpuProfilingPopRange();
+         hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Expected either Wp, Wr, R or RT!");
+         return hypre_error_flag;
+      }
+   }
+   else if (method == 5)
+   {
+      /* Approximate the coarse level matrix as A_CC */
+      RAP = *A_CC_ptr;
+      *A_CC_ptr = NULL;
+   }
+   else
+   {
+      /* Non-Galerkin path */
+      hypre_MGRBuildNonGalerkinCoarseOperator(A_FF, A_FC, A_CF, A_CC, Wp, Wr,
+                                              fine_blk_dim, coarse_blk_dim,
+                                              ordering, method, max_elmts, &RAP);
+   }
+
+   /* Truncate coarse level matrix based on input threshold */
+   if (threshold > 0.0)
+   {
+#if defined (HYPRE_USING_GPU)
+      HYPRE_MemoryLocation memory_location = hypre_ParCSRMatrixMemoryLocation(RAP);
+
+      if (hypre_GetExecPolicy1(memory_location) == HYPRE_EXEC_DEVICE)
+      {
+         hypre_ParCSRMatrixDropSmallEntriesDevice(RAP, threshold, -1);
+         rebuild_commpkg = 1;
+      }
+      else
+#endif
+      {
+         hypre_ParCSRMatrixTruncate(RAP, threshold, 0, 0, 0);
+      }
+   }
+
+   /* Compute/rebuild communication package */
+   if (rebuild_commpkg)
+   {
+      if (hypre_ParCSRMatrixCommPkg(RAP))
+      {
+         hypre_MatvecCommPkgDestroy(hypre_ParCSRMatrixCommPkg(RAP));
+      }
+      hypre_MatvecCommPkgCreate(RAP);
+   }
+   if (!hypre_ParCSRMatrixCommPkg(RAP))
+   {
+      hypre_MatvecCommPkgCreate(RAP);
+   }
+
+   /* Set coarse grid matrix */
+   (mgr_data -> A_array)[level + 1] = RAP;
+   if ((level + 1) == num_coarse_levels)
+   {
+      (mgr_data -> RAP) = RAP;
+   }
+
+   hypre_GpuProfilingPopRange();
+   HYPRE_ANNOTATE_FUNC_END;
+
+   return hypre_error_flag;
+}
diff --git a/external/hypre/src/parcsr_ls/par_mgr_setup.c b/external/hypre/src/parcsr_ls/par_mgr_setup.c
index 863abcb0..ef484ea0 100644
--- a/external/hypre/src/parcsr_ls/par_mgr_setup.c
+++ b/external/hypre/src/parcsr_ls/par_mgr_setup.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -12,1509 +12,2078 @@
 /* Setup MGR data */
 HYPRE_Int
 hypre_MGRSetup( void               *mgr_vdata,
-                  hypre_ParCSRMatrix *A,
-                  hypre_ParVector    *f,
-                  hypre_ParVector    *u )
+                hypre_ParCSRMatrix *A,
+                hypre_ParVector    *f,
+                hypre_ParVector    *u )
 {
-  MPI_Comm           comm = hypre_ParCSRMatrixComm(A);
-  hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
-
-  HYPRE_Int       i,j, final_coarse_size, block_size, idx, **block_cf_marker;
-  HYPRE_Int       *block_num_coarse_indexes, *point_marker_array;
-  HYPRE_BigInt    row, end_idx;
-  HYPRE_Int    lev, num_coarsening_levs, last_level;
-  HYPRE_Int    num_c_levels,nc,index_i,cflag;
-  HYPRE_Int      set_c_points_method;
-  HYPRE_Int    debug_flag = 0;
-//  HYPRE_Int	num_threads;
-
-  hypre_ParCSRMatrix  *RT = NULL;
-  hypre_ParCSRMatrix  *P = NULL;
-  hypre_ParCSRMatrix  *S = NULL;
-  hypre_ParCSRMatrix  *ST = NULL;
-  hypre_ParCSRMatrix  *AT = NULL;
-
-  hypre_IntArray      *dof_func_buff = NULL;
-  HYPRE_Int           *dof_func_buff_data = NULL;
-  HYPRE_BigInt        *coarse_pnts_global = NULL;
-  hypre_Vector       **l1_norms = NULL;
-
-  hypre_ParVector     *Ztemp;
-  hypre_ParVector     *Vtemp;
-  hypre_ParVector     *Utemp;
-  hypre_ParVector     *Ftemp;
-
-  /* pointers to mgr data */
-  HYPRE_Int  use_default_cgrid_solver = (mgr_data -> use_default_cgrid_solver);
-  HYPRE_Int  use_default_fsolver = (mgr_data -> use_default_fsolver);
-  HYPRE_Int  logging = (mgr_data -> logging);
-  HYPRE_Int  print_level = (mgr_data -> print_level);
-  HYPRE_Int  relax_type = (mgr_data -> relax_type);
-  HYPRE_Int  relax_order = (mgr_data -> relax_order);
-
-  HYPRE_Int  *interp_type = (mgr_data -> interp_type);
-  HYPRE_Int  *restrict_type = (mgr_data -> restrict_type);
-  HYPRE_Int num_interp_sweeps = (mgr_data -> num_interp_sweeps);
-  HYPRE_Int num_restrict_sweeps = (mgr_data -> num_interp_sweeps);
-  HYPRE_Int max_elmts = (mgr_data -> P_max_elmts);
-  HYPRE_Real   max_row_sum = (mgr_data -> max_row_sum);
-  HYPRE_Real   strong_threshold = (mgr_data -> strong_threshold);
-  HYPRE_Real   trunc_factor = (mgr_data -> trunc_factor);
-  HYPRE_Int  old_num_coarse_levels = (mgr_data -> num_coarse_levels);
-  HYPRE_Int  max_num_coarse_levels = (mgr_data -> max_num_coarse_levels);
-  HYPRE_Int * reserved_Cpoint_local_indexes = (mgr_data -> reserved_Cpoint_local_indexes);
-  hypre_IntArray      **CF_marker_array = (mgr_data -> CF_marker_array);
-  HYPRE_Int            *CF_marker;
-  hypre_ParCSRMatrix  **A_array = (mgr_data -> A_array);
-  hypre_ParCSRMatrix  **P_array = (mgr_data -> P_array);
-  hypre_ParCSRMatrix  **RT_array = (mgr_data -> RT_array);
-  hypre_ParCSRMatrix  *RAP_ptr = NULL;
-
-  hypre_ParCSRMatrix  *A_ff_ptr = NULL;
-  HYPRE_Solver **aff_solver = (mgr_data -> aff_solver);
-  hypre_ParCSRMatrix  **A_ff_array = (mgr_data -> A_ff_array);
-  hypre_ParVector    **F_fine_array = (mgr_data -> F_fine_array);
-  hypre_ParVector    **U_fine_array = (mgr_data -> U_fine_array);
-
-  HYPRE_Int (*fine_grid_solver_setup)(void*,void*,void*,void*);
-  HYPRE_Int (*fine_grid_solver_solve)(void*,void*,void*,void*);
-
-  hypre_ParVector    **F_array = (mgr_data -> F_array);
-  hypre_ParVector    **U_array = (mgr_data -> U_array);
-  hypre_ParVector    *residual = (mgr_data -> residual);
-  HYPRE_Real    *rel_res_norms = (mgr_data -> rel_res_norms);
-
-  HYPRE_Solver      default_cg_solver;
-  HYPRE_Int (*coarse_grid_solver_setup)(void*,void*,void*,void*) = (HYPRE_Int (*)(void*, void*, void*, void*)) (mgr_data -> coarse_grid_solver_setup);
-  HYPRE_Int (*coarse_grid_solver_solve)(void*,void*,void*,void*) = (HYPRE_Int (*)(void*, void*, void*, void*)) (mgr_data -> coarse_grid_solver_solve);
-
-  HYPRE_Int    global_smooth_type =  (mgr_data -> global_smooth_type);
-  HYPRE_Int    global_smooth_iters = (mgr_data -> global_smooth_iters);
-
-  HYPRE_Int    reserved_coarse_size = (mgr_data -> reserved_coarse_size);
-
-  HYPRE_Int      num_procs,  my_id;
-  hypre_CSRMatrix *A_diag = hypre_ParCSRMatrixDiag(A);
-  HYPRE_Int             n       = hypre_CSRMatrixNumRows(A_diag);
-
-  HYPRE_Int use_VcycleSmoother = 0;
-  hypre_ParVector     *VcycleRelaxZtemp;
-  hypre_ParVector     *VcycleRelaxVtemp;
-  hypre_ParAMGData    **FrelaxVcycleData;
-  HYPRE_Int *Frelax_method = (mgr_data -> Frelax_method);
-  HYPRE_Int *Frelax_num_functions = (mgr_data -> Frelax_num_functions);
-
-  HYPRE_Int *use_non_galerkin_cg = (mgr_data -> use_non_galerkin_cg);
-
-  hypre_ParCSRMatrix *A_ff_inv = (mgr_data -> A_ff_inv);
-
-  HYPRE_Int use_air = 0;
-  HYPRE_Real truncate_cg_threshold = (mgr_data -> truncate_coarse_grid_threshold);
-//  HYPRE_Real wall_time;
-
-  /* ----- begin -----*/
-  HYPRE_ANNOTATE_FUNC_BEGIN;
-//  num_threads = hypre_NumThreads();
-
-  block_size = (mgr_data -> block_size);
-  block_cf_marker = (mgr_data -> block_cf_marker);
-  block_num_coarse_indexes = (mgr_data -> block_num_coarse_indexes);
-  point_marker_array = (mgr_data -> point_marker_array);
-  set_c_points_method = (mgr_data -> set_c_points_method);
-
-  HYPRE_Int **level_coarse_indexes = NULL;
-  HYPRE_Int *level_coarse_size = NULL;
-  HYPRE_Int setNonCpointToF = (mgr_data -> set_non_Cpoints_to_F);
-  HYPRE_BigInt *reserved_coarse_indexes = (mgr_data -> reserved_coarse_indexes);
-  HYPRE_BigInt *idx_array = (mgr_data -> idx_array);
-  HYPRE_Int lvl_to_keep_cpoints = (mgr_data -> lvl_to_keep_cpoints);
-
-  HYPRE_Int nloc =  hypre_CSRMatrixNumRows(hypre_ParCSRMatrixDiag(A));
-  HYPRE_BigInt ilower =  hypre_ParCSRMatrixFirstRowIndex(A);
-  HYPRE_BigInt iupper =  hypre_ParCSRMatrixLastRowIndex(A);
-
-  hypre_MPI_Comm_size(comm,&num_procs);
-  hypre_MPI_Comm_rank(comm,&my_id);
-
-  /* Trivial case: simply solve the coarse level problem */
-  if( block_size < 2 || (mgr_data -> max_num_coarse_levels) < 1)
-  {
-    if (my_id == 0 && print_level > 0)
-    {
-      hypre_printf("Warning: Block size is < 2 or number of coarse levels is < 1. \n");
-      hypre_printf("Solving scalar problem on fine grid using coarse level solver \n");
-    }
-
-    if(use_default_cgrid_solver)
-    {
+   MPI_Comm           comm = hypre_ParCSRMatrixComm(A);
+   hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
+
+   HYPRE_Int       i, j, final_coarse_size = 0, block_size, idx, **block_cf_marker;
+   HYPRE_Int       *block_num_coarse_indexes, *point_marker_array;
+   HYPRE_BigInt    row, end_idx;
+   HYPRE_Int    lev, num_coarsening_levs, last_level;
+   HYPRE_Int    num_c_levels = 0, nc, index_i, cflag;
+   HYPRE_Int      set_c_points_method;
+   HYPRE_Int    debug_flag = 0;
+   HYPRE_Int    block_jacobi_bsize;
+   HYPRE_Int    *blk_size = mgr_data -> blk_size;
+   HYPRE_Int    level_blk_size;
+
+   hypre_ParCSRMatrix  *RT = NULL;
+   hypre_ParCSRMatrix  *R  = NULL;
+   hypre_ParCSRMatrix  *P = NULL;
+   hypre_ParCSRMatrix  *S = NULL;
+   hypre_ParCSRMatrix  *Wp = NULL;
+   hypre_ParCSRMatrix  *Wr = NULL;
+
+   HYPRE_BigInt         coarse_pnts_global[2]; // TODO: Change to row_starts_cpts
+   HYPRE_BigInt         row_starts_fpts[2];
+   hypre_Vector       **l1_norms = NULL;
+   HYPRE_Real          *l1_norms_data;
+
+   hypre_ParVector     *Ztemp;
+   hypre_ParVector     *Vtemp;
+   hypre_ParVector     *Utemp;
+   hypre_ParVector     *Ftemp;
+
+   /* pointers to mgr data */
+   HYPRE_Int  use_default_cgrid_solver = (mgr_data -> use_default_cgrid_solver);
+   HYPRE_Int  logging = (mgr_data -> logging);
+   HYPRE_Int  print_level = (mgr_data -> print_level);
+   HYPRE_Int  relax_type = (mgr_data -> relax_type);
+   HYPRE_Int  relax_order = (mgr_data -> relax_order);
+   HYPRE_Int  *interp_type = (mgr_data -> interp_type);
+   HYPRE_Int  *restrict_type = (mgr_data -> restrict_type);
+   HYPRE_Int  *num_relax_sweeps = (mgr_data -> num_relax_sweeps);
+   HYPRE_Int num_interp_sweeps = (mgr_data -> num_interp_sweeps);
+   //HYPRE_Int num_restrict_sweeps = (mgr_data -> num_interp_sweeps);
+   HYPRE_Int *P_max_elmts = (mgr_data -> P_max_elmts);
+   HYPRE_Real   max_row_sum = (mgr_data -> max_row_sum);
+   HYPRE_Real   strong_threshold = (mgr_data -> strong_threshold);
+   HYPRE_Real   trunc_factor = (mgr_data -> trunc_factor);
+   HYPRE_Int  old_num_coarse_levels = (mgr_data -> num_coarse_levels);
+   HYPRE_Int  max_num_coarse_levels = (mgr_data -> max_num_coarse_levels);
+   HYPRE_Int * reserved_Cpoint_local_indexes = (mgr_data -> reserved_Cpoint_local_indexes);
+   hypre_IntArray      **CF_marker_array = (mgr_data -> CF_marker_array);
+   HYPRE_Int            *CF_marker;
+   hypre_IntArray       *FC_marker;
+   hypre_ParCSRMatrix  **A_array = (mgr_data -> A_array);
+   hypre_ParCSRMatrix  **B_array = (mgr_data -> B_array);
+   hypre_ParCSRMatrix  **B_FF_array = (mgr_data -> B_FF_array);
+#if defined(HYPRE_USING_GPU)
+   hypre_ParCSRMatrix  **P_FF_array = (mgr_data -> P_FF_array);
+#endif
+   hypre_ParCSRMatrix  **P_array = (mgr_data -> P_array);
+   hypre_ParCSRMatrix  **R_array = (mgr_data -> RT_array);
+   hypre_ParCSRMatrix  **RT_array = (mgr_data -> RT_array);
+
+   hypre_ParCSRMatrix  *A_FF = NULL;
+   hypre_ParCSRMatrix  *A_FC = NULL;
+   hypre_ParCSRMatrix  *A_CF = NULL;
+   hypre_ParCSRMatrix  *A_CC = NULL;
+
+   hypre_Solver         *aff_base;
+   HYPRE_Solver        **aff_solver = (mgr_data -> aff_solver);
+   hypre_ParCSRMatrix  **A_ff_array = (mgr_data -> A_ff_array);
+   hypre_ParVector     **F_fine_array = (mgr_data -> F_fine_array);
+   hypre_ParVector     **U_fine_array = (mgr_data -> U_fine_array);
+
+   HYPRE_Int (*fgrid_solver_setup)(void*, void*, void*, void*);
+   HYPRE_Int (*fgrid_solver_solve)(void*, void*, void*, void*);
+
+   hypre_ParVector    **F_array = (mgr_data -> F_array);
+   hypre_ParVector    **U_array = (mgr_data -> U_array);
+   hypre_ParVector    *residual = (mgr_data -> residual);
+   HYPRE_Real    *rel_res_norms = (mgr_data -> rel_res_norms);
+   HYPRE_Real    **frelax_diaginv = (mgr_data -> frelax_diaginv);
+   HYPRE_Real    **level_diaginv = (mgr_data -> level_diaginv);
+   // VPM: Do we need both frelax_diaginv and level_diaginv?
+
+   HYPRE_Solver      default_cg_solver;
+   HYPRE_Int (*cgrid_solver_setup)(void*, void*, void*, void*) =
+      (HYPRE_Int (*)(void*, void*, void*, void*)) (mgr_data -> coarse_grid_solver_setup);
+
+   HYPRE_Int (*cgrid_solver_solve)(void*, void*, void*, void*) =
+      (HYPRE_Int (*)(void*, void*, void*, void*)) (mgr_data -> coarse_grid_solver_solve);
+
+   HYPRE_Int    *level_smooth_type =  (mgr_data -> level_smooth_type);
+   HYPRE_Int    *level_smooth_iters = (mgr_data -> level_smooth_iters);
+   HYPRE_Solver *level_smoother = (mgr_data -> level_smoother);
+
+   HYPRE_Int    reserved_coarse_size = (mgr_data -> reserved_coarse_size);
+
+   HYPRE_Int      num_procs,  my_id;
+   hypre_CSRMatrix *A_diag = hypre_ParCSRMatrixDiag(A);
+   HYPRE_Int             n       = hypre_CSRMatrixNumRows(A_diag);
+
+   HYPRE_Int use_VcycleSmoother = 0;
+   HYPRE_Int use_GSElimSmoother = 0;
+   //   HYPRE_Int use_ComplexSmoother = 0;
+   hypre_ParVector     *VcycleRelaxZtemp;
+   hypre_ParVector     *VcycleRelaxVtemp;
+   hypre_ParAMGData    **FrelaxVcycleData;
+   hypre_ParAMGData    **GSElimData;
+   HYPRE_Int *Frelax_method = (mgr_data -> Frelax_method);
+   HYPRE_Int *Frelax_num_functions = (mgr_data -> Frelax_num_functions);
+
+   HYPRE_Int *Frelax_type = (mgr_data -> Frelax_type);
+
+   HYPRE_Int *coarse_grid_method = (mgr_data -> coarse_grid_method);
+
+   HYPRE_MemoryLocation memory_location = hypre_ParCSRMatrixMemoryLocation(A);
+#if defined(HYPRE_USING_GPU)
+   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1(memory_location);
+#endif
+   char        region_name[1024];
+   char        msg[2048];
+
+   /* ----- begin -----*/
+   HYPRE_ANNOTATE_FUNC_BEGIN;
+   hypre_GpuProfilingPushRange("MGRSetup");
+   hypre_GpuProfilingPushRange("MGRSetup-Init");
+   hypre_MemoryPrintUsage(comm, hypre_HandleLogLevel(hypre_handle()), "MGR setup begin", 0);
+
+   block_size = (mgr_data -> block_size);
+   block_jacobi_bsize = (mgr_data -> block_jacobi_bsize);
+   block_cf_marker = (mgr_data -> block_cf_marker);
+   block_num_coarse_indexes = (mgr_data -> block_num_coarse_indexes);
+   point_marker_array = (mgr_data -> point_marker_array);
+   set_c_points_method = (mgr_data -> set_c_points_method);
+
+   HYPRE_Int **level_coarse_indexes = NULL;
+   HYPRE_Int *level_coarse_size = NULL;
+   HYPRE_Int setNonCpointToF = (mgr_data -> set_non_Cpoints_to_F);
+   HYPRE_BigInt *reserved_coarse_indexes = (mgr_data -> reserved_coarse_indexes);
+   HYPRE_BigInt *idx_array = (mgr_data -> idx_array);
+   HYPRE_Int lvl_to_keep_cpoints = ((mgr_data -> lvl_to_keep_cpoints) >
+                                    (mgr_data -> max_num_coarse_levels)) ?
+                                   (mgr_data -> max_num_coarse_levels) :
+                                   (mgr_data -> lvl_to_keep_cpoints);
+   HYPRE_Int    nloc   =  hypre_ParCSRMatrixNumRows(A);
+   HYPRE_BigInt ilower =  hypre_ParCSRMatrixFirstRowIndex(A);
+   HYPRE_BigInt iupper =  hypre_ParCSRMatrixLastRowIndex(A);
+
+   hypre_MPI_Comm_size(comm, &num_procs);
+   hypre_MPI_Comm_rank(comm, &my_id);
+
+   /* Reset print_level codes. This is useful for printing
+      information when solving a sequence of linear systems */
+   print_level |= ((print_level & HYPRE_MGR_PRINT_RESERVED_A) == HYPRE_MGR_PRINT_RESERVED_A) ?
+                  HYPRE_MGR_PRINT_INFO_PARAMS : 0;
+   print_level |= ((print_level & HYPRE_MGR_PRINT_RESERVED_B) == HYPRE_MGR_PRINT_RESERVED_B) ?
+                  HYPRE_MGR_PRINT_FINE_MATRIX : 0;
+   print_level |= ((print_level & HYPRE_MGR_PRINT_RESERVED_C) == HYPRE_MGR_PRINT_RESERVED_C) ?
+                  HYPRE_MGR_PRINT_FINE_RHS : 0;
+   (mgr_data -> print_level) = print_level;
+
+   /* Trivial case: simply solve the coarse level problem */
+   if (block_size < 2 || (mgr_data -> max_num_coarse_levels) < 1)
+   {
       if (my_id == 0 && print_level > 0)
-        hypre_printf("No coarse grid solver provided. Using default AMG solver ... \n");
+      {
+         hypre_printf("Warning: Block size is < 2 or number of coarse levels is < 1. \n");
+         hypre_printf("Solving scalar problem on fine grid using coarse level solver \n");
+      }
+
+      if (use_default_cgrid_solver)
+      {
+         if (my_id == 0 && print_level > 0)
+         {
+            hypre_printf("No coarse grid solver provided. Using default AMG solver ... \n");
+         }
+
+         /* create and set default solver parameters here */
+         /* create and initialize default_cg_solver */
+         default_cg_solver = (HYPRE_Solver) hypre_BoomerAMGCreate();
+         hypre_BoomerAMGSetMaxIter(default_cg_solver, (mgr_data -> max_iter));
+         hypre_BoomerAMGSetRelaxOrder(default_cg_solver, 1);
+         hypre_BoomerAMGSetPrintLevel(default_cg_solver, 3);
+
+         /* set setup and solve functions */
+         cgrid_solver_setup = (HYPRE_Int (*)(void*, void*, void*, void*)) hypre_BoomerAMGSetup;
+         cgrid_solver_solve = (HYPRE_Int (*)(void*, void*, void*, void*)) hypre_BoomerAMGSolve;
+         (mgr_data -> coarse_grid_solver_setup) = cgrid_solver_setup;
+         (mgr_data -> coarse_grid_solver_solve) = cgrid_solver_solve;
+         (mgr_data -> coarse_grid_solver) = default_cg_solver;
+      }
+
+      /* keep reserved coarse indexes to coarsest grid */
+      if (reserved_coarse_size > 0)
+      {
+         HYPRE_BoomerAMGSetCPoints((mgr_data ->coarse_grid_solver), 25, reserved_coarse_size,
+                                   reserved_coarse_indexes);
+      }
+
+      /* setup coarse grid solver */
+      cgrid_solver_setup((mgr_data -> coarse_grid_solver), A, f, u);
+      (mgr_data -> num_coarse_levels) = 0;
+
+      HYPRE_ANNOTATE_FUNC_END;
+      hypre_GpuProfilingPopRange();
+      hypre_GpuProfilingPopRange();
+
+      return hypre_error_flag;
+   }
+
+   /* If we reduce the reserved C-points, increase one level */
+   if (lvl_to_keep_cpoints > 0)
+   {
+      max_num_coarse_levels++;
+   }
+
+   /* Initialize local indexes of coarse sets at different levels */
+   level_coarse_indexes = hypre_CTAlloc(HYPRE_Int*, max_num_coarse_levels, HYPRE_MEMORY_HOST);
+   for (i = 0; i < max_num_coarse_levels; i++)
+   {
+      level_coarse_indexes[i] = hypre_CTAlloc(HYPRE_Int, nloc, HYPRE_MEMORY_HOST);
+   }
+
+   level_coarse_size = hypre_CTAlloc(HYPRE_Int, max_num_coarse_levels, HYPRE_MEMORY_HOST);
+   HYPRE_Int reserved_cpoints_eliminated = 0;
+
+   /* TODO: move this to par_mgr_coarsen.c and port to GPUs (VPM) */
+   for (i = 0; i < max_num_coarse_levels; i++)
+   {
+      // if we want to reduce the reserved Cpoints, set the current level
+      // coarse indices the same as the previous level
+      if (i == lvl_to_keep_cpoints && i > 0)
+      {
+         reserved_cpoints_eliminated++;
+         for (j = 0; j < final_coarse_size; j++)
+         {
+            level_coarse_indexes[i][j] = level_coarse_indexes[i - 1][j];
+         }
+         level_coarse_size[i] = final_coarse_size;
+         continue;
+      }
+      final_coarse_size = 0;
+      if (set_c_points_method == 0) // interleaved ordering, i.e. s1,p1,s2,p2,...
+      {
+         // loop over rows
+         for (row = ilower; row <= iupper; row++)
+         {
+            idx = row % block_size;
+            if (block_cf_marker[i - reserved_cpoints_eliminated][idx] == CMRK)
+            {
+               level_coarse_indexes[i][final_coarse_size++] = (HYPRE_Int)(row - ilower);
+            }
+         }
+      }
+      else if (set_c_points_method == 1) // block ordering s1,s2,...,p1,p2,...
+      {
+         for (j = 0; j < block_size; j++)
+         {
+            if (block_cf_marker[i - reserved_cpoints_eliminated][j] == CMRK)
+            {
+               if (j == block_size - 1)
+               {
+                  end_idx = iupper + 1;
+               }
+               else
+               {
+                  end_idx = idx_array[j + 1];
+               }
+               for (row = idx_array[j]; row < end_idx; row++)
+               {
+                  level_coarse_indexes[i][final_coarse_size++] = (HYPRE_Int)(row - ilower);
+               }
+            }
+         }
+         //hypre_printf("Level %d, # of coarse points %d\n", i, final_coarse_size);
+      }
+      else if (set_c_points_method == 2)
+      {
+         HYPRE_Int isCpoint;
+         // row start from 0 since point_marker_array is local
+         for (row = 0; row < nloc; row++)
+         {
+            isCpoint = 0;
+            for (j = 0; j < block_num_coarse_indexes[i]; j++)
+            {
+               if (point_marker_array[row] == block_cf_marker[i][j])
+               {
+                  isCpoint = 1;
+                  break;
+               }
+            }
+            if (isCpoint)
+            {
+               level_coarse_indexes[i][final_coarse_size++] = row;
+               //printf("%d\n",row);
+            }
+         }
+      }
+      else
+      {
+         if (my_id == 0)
+         {
+            hypre_printf("ERROR! Unknown method for setting C points.");
+         }
+         exit(-1); // TODO: Fix error handling (VPM)
+      }
+      level_coarse_size[i] = final_coarse_size;
+   }
+
+   /* Set reserved coarse indexes to be kept to the coarsest level of the MGR solver */
+   hypre_TFree((mgr_data -> reserved_Cpoint_local_indexes), HYPRE_MEMORY_HOST);
+
+   if (reserved_coarse_size > 0)
+   {
+      (mgr_data -> reserved_Cpoint_local_indexes) = hypre_CTAlloc(HYPRE_Int,
+                                                                  reserved_coarse_size,
+                                                                  HYPRE_MEMORY_HOST);
+      reserved_Cpoint_local_indexes = (mgr_data -> reserved_Cpoint_local_indexes);
+      for (i = 0; i < reserved_coarse_size; i++)
+      {
+         row = reserved_coarse_indexes[i];
+         HYPRE_Int local_row = (HYPRE_Int)(row - ilower);
+         reserved_Cpoint_local_indexes[i] = local_row;
+         HYPRE_Int lvl = lvl_to_keep_cpoints == 0 ? max_num_coarse_levels : lvl_to_keep_cpoints;
+         if (set_c_points_method < 2)
+         {
+            idx = row % block_size;
+            for (j = 0; j < lvl; j++)
+            {
+               if (block_cf_marker[j][idx] != CMRK)
+               {
+                  level_coarse_indexes[j][level_coarse_size[j]++] = local_row;
+               }
+            }
+         }
+         else
+         {
+            HYPRE_Int isCpoint = 0;
+            for (j = 0; j < lvl; j++)
+            {
+               HYPRE_Int k;
+               for (k = 0; k < block_num_coarse_indexes[j]; k++)
+               {
+                  if (point_marker_array[local_row] == block_cf_marker[j][k])
+                  {
+                     isCpoint = 1;
+                     break;
+                  }
+               }
+               if (!isCpoint)
+               {
+                  level_coarse_indexes[j][level_coarse_size[j]++] = local_row;
+               }
+            }
+         }
+      }
+   }
+
+   (mgr_data -> level_coarse_indexes) = level_coarse_indexes;
+   (mgr_data -> num_coarse_per_level) = level_coarse_size;
+
+   /* Free Previously allocated data, if any not destroyed */
+   if (A_array || B_array || B_FF_array ||
+       P_array || R_array || RT_array || CF_marker_array)
+   {
+      for (j = 1; j < (old_num_coarse_levels); j++)
+      {
+         if (A_array[j])
+         {
+            hypre_ParCSRMatrixDestroy(A_array[j]);
+            A_array[j] = NULL;
+         }
+      }
+
+      for (j = 0; j < old_num_coarse_levels; j++)
+      {
+         if (B_array[j])
+         {
+            hypre_ParCSRMatrixDestroy(B_array[j]);
+            B_array[j] = NULL;
+         }
+
+         if (B_FF_array[j])
+         {
+            hypre_ParCSRMatrixDestroy(B_FF_array[j]);
+            B_FF_array[j] = NULL;
+         }
+
+         if (P_array[j])
+         {
+            hypre_ParCSRMatrixDestroy(P_array[j]);
+            P_array[j] = NULL;
+         }
+
+         if (R_array[j])
+         {
+            hypre_ParCSRMatrixDestroy(R_array[j]);
+            R_array[j] = NULL;
+         }
+
+         if (RT_array[j])
+         {
+            hypre_ParCSRMatrixDestroy(RT_array[j]);
+            RT_array[j] = NULL;
+         }
+
+         if (CF_marker_array[j])
+         {
+            hypre_IntArrayDestroy(CF_marker_array[j]);
+            CF_marker_array[j] = NULL;
+         }
+      }
+      hypre_TFree(B_array, HYPRE_MEMORY_HOST);
+      hypre_TFree(B_FF_array, HYPRE_MEMORY_HOST);
+      hypre_TFree(P_array, HYPRE_MEMORY_HOST);
+      hypre_TFree(R_array, HYPRE_MEMORY_HOST);
+      hypre_TFree(RT_array, HYPRE_MEMORY_HOST);
+      hypre_TFree(CF_marker_array, HYPRE_MEMORY_HOST);
+   }
+
+#if defined(HYPRE_USING_GPU)
+   if (P_FF_array)
+   {
+      for (j = 0; j < old_num_coarse_levels; j++)
+      {
+         if (P_FF_array[j])
+         {
+            hypre_ParCSRMatrixDestroy(P_FF_array[j]);
+            P_FF_array[j] = NULL;
+         }
+      }
+      hypre_TFree(P_FF_array, HYPRE_MEMORY_HOST);
+   }
+#endif
+
+   /* Free previously allocated FrelaxVcycleData if not destroyed */
+   if ((mgr_data -> VcycleRelaxZtemp))
+   {
+      hypre_ParVectorDestroy((mgr_data -> VcycleRelaxZtemp));
+      (mgr_data -> VcycleRelaxZtemp) = NULL;
+   }
+   if ((mgr_data -> VcycleRelaxVtemp))
+   {
+      hypre_ParVectorDestroy((mgr_data -> VcycleRelaxVtemp));
+      (mgr_data -> VcycleRelaxVtemp) = NULL;
+   }
+   if ((mgr_data -> FrelaxVcycleData))
+   {
+      for (j = 0; j < old_num_coarse_levels; j++)
+      {
+         if ((mgr_data -> FrelaxVcycleData)[j])
+         {
+            hypre_MGRDestroyFrelaxVcycleData((mgr_data -> FrelaxVcycleData)[j]);
+            (mgr_data -> FrelaxVcycleData)[j] = NULL;
+         }
+      }
+      hypre_TFree((mgr_data -> FrelaxVcycleData), HYPRE_MEMORY_HOST);
+      (mgr_data -> FrelaxVcycleData) = NULL;
+   }
+
+   /* destroy previously allocated Gaussian Elim. data */
+   if ((mgr_data -> GSElimData))
+   {
+      for (j = 0; j < old_num_coarse_levels; j++)
+      {
+         if ((mgr_data -> GSElimData)[j])
+         {
+            hypre_MGRDestroyGSElimData((mgr_data -> GSElimData)[j]);
+            (mgr_data -> GSElimData)[j] = NULL;
+         }
+      }
+      hypre_TFree((mgr_data -> GSElimData), HYPRE_MEMORY_HOST);
+      (mgr_data -> GSElimData) = NULL;
+   }
+
+   /* destroy final coarse grid matrix, if not previously destroyed */
+   if ((mgr_data -> RAP))
+   {
+      hypre_ParCSRMatrixDestroy((mgr_data -> RAP));
+      (mgr_data -> RAP) = NULL;
+   }
+
+   /* Setup for global block smoothers*/
+   if (set_c_points_method == 0)
+   {
+      if (my_id == num_procs)
+      {
+         mgr_data -> n_block   = (n - reserved_coarse_size) / block_size;
+         mgr_data -> left_size = n - block_size * (mgr_data -> n_block);
+      }
+      else
+      {
+         mgr_data -> n_block = n / block_size;
+         mgr_data -> left_size = n - block_size * (mgr_data -> n_block);
+      }
+   }
+   else
+   {
+      mgr_data -> n_block = n;
+      mgr_data -> left_size = 0;
+   }
+
+   /* clear old l1_norm data, if created */
+   if ((mgr_data -> l1_norms))
+   {
+      for (j = 0; j < (old_num_coarse_levels); j++)
+      {
+         if ((mgr_data -> l1_norms)[j])
+         {
+            hypre_SeqVectorDestroy((mgr_data -> l1_norms)[i]);
+            (mgr_data -> l1_norms)[j] = NULL;
+         }
+      }
+      hypre_TFree((mgr_data -> l1_norms), HYPRE_MEMORY_HOST);
+   }
+
+   if ((mgr_data -> frelax_diaginv))
+   {
+      for (j = 0; j < (old_num_coarse_levels); j++)
+      {
+         if ((mgr_data -> frelax_diaginv)[j])
+         {
+            hypre_TFree((mgr_data -> frelax_diaginv)[j], HYPRE_MEMORY_HOST);
+            (mgr_data -> frelax_diaginv)[j] = NULL;
+         }
+      }
+      hypre_TFree((mgr_data -> frelax_diaginv), HYPRE_MEMORY_HOST);
+   }
+
+   if ((mgr_data -> level_diaginv))
+   {
+      for (j = 0; j < (old_num_coarse_levels); j++)
+      {
+         if ((mgr_data -> level_diaginv)[j])
+         {
+            hypre_TFree((mgr_data -> level_diaginv)[j], HYPRE_MEMORY_HOST);
+            (mgr_data -> level_diaginv)[j] = NULL;
+         }
+      }
+      hypre_TFree((mgr_data -> level_diaginv), HYPRE_MEMORY_HOST);
+   }
+
+   /* setup temporary storage */
+   if ((mgr_data -> Ztemp))
+   {
+      hypre_ParVectorDestroy((mgr_data -> Ztemp));
+      (mgr_data -> Ztemp) = NULL;
+   }
+   if ((mgr_data -> Vtemp))
+   {
+      hypre_ParVectorDestroy((mgr_data -> Vtemp));
+      (mgr_data -> Vtemp) = NULL;
+   }
+   if ((mgr_data -> Utemp))
+   {
+      hypre_ParVectorDestroy((mgr_data -> Utemp));
+      (mgr_data -> Utemp) = NULL;
+   }
+   if ((mgr_data -> Ftemp))
+   {
+      hypre_ParVectorDestroy((mgr_data -> Ftemp));
+      (mgr_data -> Ftemp) = NULL;
+   }
+   if ((mgr_data -> residual))
+   {
+      hypre_ParVectorDestroy((mgr_data -> residual));
+      (mgr_data -> residual) = NULL;
+   }
+   hypre_TFree((mgr_data -> rel_res_norms), HYPRE_MEMORY_HOST);
+   hypre_TFree((mgr_data -> blk_size), HYPRE_MEMORY_HOST);
+
+   Vtemp = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A),
+                                 hypre_ParCSRMatrixGlobalNumRows(A),
+                                 hypre_ParCSRMatrixRowStarts(A));
+   hypre_ParVectorInitialize(Vtemp);
+   (mgr_data ->Vtemp) = Vtemp;
+
+   Ztemp = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A),
+                                 hypre_ParCSRMatrixGlobalNumRows(A),
+                                 hypre_ParCSRMatrixRowStarts(A));
+   hypre_ParVectorInitialize(Ztemp);
+   (mgr_data -> Ztemp) = Ztemp;
+
+   Utemp = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A),
+                                 hypre_ParCSRMatrixGlobalNumRows(A),
+                                 hypre_ParCSRMatrixRowStarts(A));
+   hypre_ParVectorInitialize(Utemp);
+   (mgr_data ->Utemp) = Utemp;
+
+   Ftemp = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A),
+                                 hypre_ParCSRMatrixGlobalNumRows(A),
+                                 hypre_ParCSRMatrixRowStarts(A));
+   hypre_ParVectorInitialize(Ftemp);
+   (mgr_data ->Ftemp) = Ftemp;
+
+   /* Allocate memory for level structure */
+   if (A_array == NULL)
+   {
+      A_array = hypre_CTAlloc(hypre_ParCSRMatrix*, max_num_coarse_levels + 1, HYPRE_MEMORY_HOST);
+   }
+   if (B_array == NULL)
+   {
+      B_array = hypre_CTAlloc(hypre_ParCSRMatrix*, max_num_coarse_levels, HYPRE_MEMORY_HOST);
+   }
+   if (P_array == NULL && max_num_coarse_levels > 0)
+   {
+      P_array = hypre_CTAlloc(hypre_ParCSRMatrix*, max_num_coarse_levels, HYPRE_MEMORY_HOST);
+   }
+   if (R_array == NULL && max_num_coarse_levels > 0)
+   {
+      R_array = hypre_CTAlloc(hypre_ParCSRMatrix*, max_num_coarse_levels, HYPRE_MEMORY_HOST);
+   }
+#if defined(HYPRE_USING_GPU)
+   if (P_FF_array == NULL && max_num_coarse_levels > 0)
+   {
+      P_FF_array = hypre_CTAlloc(hypre_ParCSRMatrix*, max_num_coarse_levels, HYPRE_MEMORY_HOST);
+   }
+#endif
+   if (RT_array == NULL && max_num_coarse_levels > 0)
+   {
+      RT_array = hypre_CTAlloc(hypre_ParCSRMatrix*, max_num_coarse_levels, HYPRE_MEMORY_HOST);
+   }
+   if (CF_marker_array == NULL)
+   {
+      CF_marker_array = hypre_CTAlloc(hypre_IntArray*, max_num_coarse_levels, HYPRE_MEMORY_HOST);
+   }
+   if (l1_norms == NULL)
+   {
+      l1_norms = hypre_CTAlloc(hypre_Vector*, max_num_coarse_levels, HYPRE_MEMORY_HOST);
+   }
+   if (P_max_elmts == NULL)
+   {
+      P_max_elmts = hypre_CTAlloc(HYPRE_Int, max_num_coarse_levels, HYPRE_MEMORY_HOST);
+   }
+
+   /* Set default for Frelax_method if not set already -- Supports deprecated function */
+   /*
+      if (Frelax_method == NULL)
+      {
+         Frelax_method = hypre_CTAlloc(HYPRE_Int, max_num_coarse_levels, HYPRE_MEMORY_HOST);
+         for (i = 0; i < max_num_coarse_levels; i++)
+         {
+            Frelax_method[i] = 0;
+         }
+         (mgr_data -> Frelax_method) = Frelax_method;
+      }
+   */
+   /* Set default for Frelax_type if not set already.
+    * We also consolidate inputs from relax_type and Frelax_method here.
+    * This should be simplified once the other options are removed.
+   */
+   if (Frelax_type == NULL)
+   {
+      Frelax_type = hypre_CTAlloc(HYPRE_Int, max_num_coarse_levels, HYPRE_MEMORY_HOST);
+
+      /* Use relax type/ frelax_method data or set default type to use */
+      if (Frelax_method)
+      {
+         for (i = 0; i < max_num_coarse_levels; i++)
+         {
+            Frelax_type[i] = Frelax_method[i] > 0 ? Frelax_method[i] : relax_type;
+         }
+      }
+      else if (relax_type)
+      {
+         for (i = 0; i < max_num_coarse_levels; i++)
+         {
+            Frelax_type[i] = relax_type;
+         }
+      }
+      else /* set default here */
+      {
+         for (i = 0; i < max_num_coarse_levels; i++)
+         {
+            Frelax_type[i] = 0;
+         }
+      }
+
+      (mgr_data -> Frelax_type) = Frelax_type;
+   }
+
+   /* When running on the device and using Jacobi relaxation, switch to GPU-supported Jacobi */
+#if defined(HYPRE_USING_GPU)
+   for (i = 0; i < max_num_coarse_levels; i++)
+   {
+      if (Frelax_type[i] == 0 && interp_type && interp_type[i] != 12)
+      {
+         Frelax_type[i] = 7;
+         if (print_level)
+         {
+            hypre_ParPrintf(comm, "Changing F-relaxation type to 7 at MGR level %d\n", i);
+         }
+      }
+   }
+#endif
+
+   /* Set default for using Non-Galerkin coarse grid */
+   if (coarse_grid_method == NULL)
+   {
+      coarse_grid_method = hypre_CTAlloc(HYPRE_Int, max_num_coarse_levels, HYPRE_MEMORY_HOST);
+      (mgr_data -> coarse_grid_method) = coarse_grid_method;
+   }
+
+   /* Set default for Non-Galerkin correction truncation */
+   if ((mgr_data -> nonglk_max_elmts) == NULL)
+   {
+      (mgr_data -> nonglk_max_elmts) = hypre_CTAlloc(HYPRE_Int, max_num_coarse_levels, HYPRE_MEMORY_HOST);
+      for (i = 0; i < max_num_coarse_levels; i++)
+      {
+         (mgr_data -> nonglk_max_elmts)[i] = 1;
+      }
+   }
+
+   /* Set default options for the interpolation type at each level if not already set */
+   if (interp_type == NULL)
+   {
+      interp_type = hypre_CTAlloc(HYPRE_Int, max_num_coarse_levels, HYPRE_MEMORY_HOST);
+      for (i = 0; i < max_num_coarse_levels; i++)
+      {
+         interp_type[i] = 2;
+      }
+      (mgr_data -> interp_type) = interp_type;
+   }
+
+   /* Set default options for restriction type at each level if not already set */
+   if (restrict_type == NULL)
+   {
+      restrict_type = hypre_CTAlloc(HYPRE_Int, max_num_coarse_levels, HYPRE_MEMORY_HOST);
+      for (i = 0; i < max_num_coarse_levels; i++)
+      {
+         restrict_type[i] = 0;
+      }
+      (mgr_data -> restrict_type) = restrict_type;
+   }
+
+   /* Set default number of sweeps at each level if not already set */
+   if (num_relax_sweeps == NULL)
+   {
+      num_relax_sweeps = hypre_CTAlloc(HYPRE_Int, max_num_coarse_levels, HYPRE_MEMORY_HOST);
+      for (i = 0; i < max_num_coarse_levels; i++)
+      {
+         num_relax_sweeps[i] = 1;
+      }
+      (mgr_data -> num_relax_sweeps) = num_relax_sweeps;
+   }
+
+   /* set interp_type, restrict_type, and Frelax_type if we reduce the reserved C-points */
+   reserved_cpoints_eliminated = 0;
+   if (lvl_to_keep_cpoints > 0 && reserved_coarse_size > 0)
+   {
+      HYPRE_Int *level_interp_type   = hypre_CTAlloc(HYPRE_Int, max_num_coarse_levels,
+                                                     HYPRE_MEMORY_HOST);
+      HYPRE_Int *level_restrict_type = hypre_CTAlloc(HYPRE_Int, max_num_coarse_levels,
+                                                     HYPRE_MEMORY_HOST);
+      HYPRE_Int *level_frelax_type   = hypre_CTAlloc(HYPRE_Int, max_num_coarse_levels,
+                                                     HYPRE_MEMORY_HOST);
+      for (i = 0; i < max_num_coarse_levels; i++)
+      {
+         if (i == lvl_to_keep_cpoints)
+         {
+            level_interp_type[i] = 2;
+            level_restrict_type[i] = 0;
+            level_frelax_type[i] = 2; //99;
+            reserved_cpoints_eliminated++;
+         }
+         else
+         {
+            level_interp_type[i] = interp_type[i - reserved_cpoints_eliminated];
+            level_restrict_type[i] = restrict_type[i - reserved_cpoints_eliminated];
+            level_frelax_type[i] = Frelax_type[i - reserved_cpoints_eliminated];
+         }
+      }
+      hypre_TFree(interp_type, HYPRE_MEMORY_HOST);
+      hypre_TFree(restrict_type, HYPRE_MEMORY_HOST);
+      hypre_TFree(Frelax_type, HYPRE_MEMORY_HOST);
+
+      interp_type = level_interp_type;
+      restrict_type = level_restrict_type;
+      Frelax_type = level_frelax_type;
+      (mgr_data -> interp_type) = level_interp_type;
+      (mgr_data -> restrict_type) = level_restrict_type;
+      (mgr_data -> Frelax_type) = level_frelax_type;
+   }
+
+   /* set pointers to mgr data */
+   (mgr_data -> A_array)         = A_array;
+   (mgr_data -> B_array)         = B_array;
+   (mgr_data -> P_array)         = P_array;
+   (mgr_data -> R_array)         = R_array;
+   (mgr_data -> RT_array)        = RT_array;
+   (mgr_data -> CF_marker_array) = CF_marker_array;
+   (mgr_data -> l1_norms)        = l1_norms;
+   (mgr_data -> P_max_elmts)     = P_max_elmts;
+#if defined(HYPRE_USING_GPU)
+   (mgr_data -> P_FF_array)      = P_FF_array;
+#endif
+
+   /* Set up solution and rhs arrays */
+   if (F_array != NULL || U_array != NULL)
+   {
+      for (j = 1; j < old_num_coarse_levels + 1; j++)
+      {
+         if (F_array[j] != NULL)
+         {
+            hypre_ParVectorDestroy(F_array[j]);
+            F_array[j] = NULL;
+         }
+         if (U_array[j] != NULL)
+         {
+            hypre_ParVectorDestroy(U_array[j]);
+            U_array[j] = NULL;
+         }
+      }
+   }
+
+   if (F_array == NULL)
+   {
+      F_array = hypre_CTAlloc(hypre_ParVector*, max_num_coarse_levels + 1, HYPRE_MEMORY_HOST);
+   }
+   if (U_array == NULL)
+   {
+      U_array = hypre_CTAlloc(hypre_ParVector*, max_num_coarse_levels + 1, HYPRE_MEMORY_HOST);
+   }
+
+   /* TODO: Change to A_FF_array (VPM) */
+   if (A_ff_array)
+   {
+      for (j = 1; j < old_num_coarse_levels; j++)
+      {
+         if (A_ff_array[j])
+         {
+            hypre_ParCSRMatrixDestroy(A_ff_array[j]);
+            A_ff_array[j] = NULL;
+         }
+      }
+      if (mgr_data -> fsolver_mode != 0)
+      {
+         if (A_ff_array[0])
+         {
+            hypre_ParCSRMatrixDestroy(A_ff_array[0]);
+            A_ff_array[0] = NULL;
+         }
+      }
+      hypre_TFree(A_ff_array, HYPRE_MEMORY_HOST);
+      A_ff_array = NULL;
+   }
+
+   if (aff_solver)
+   {
+      for (j = 1; j < (old_num_coarse_levels); j++)
+      {
+         if (aff_solver[j])
+         {
+            aff_base = (hypre_Solver*) aff_solver[j];
+            hypre_SolverDestroy(aff_base)((HYPRE_Solver) (aff_base));
+            aff_solver[j] = NULL;
+         }
+      }
+      if (mgr_data -> fsolver_mode == 2)
+      {
+         hypre_BoomerAMGDestroy(aff_solver[0]);
+      }
+   }
+
+   if ((mgr_data -> fine_grid_solver_setup) != NULL)
+   {
+      fgrid_solver_setup = (mgr_data -> fine_grid_solver_setup);
+   }
+   else
+   {
+      fgrid_solver_setup = (HYPRE_Int (*)(void*, void*, void*, void*)) hypre_BoomerAMGSetup;
+      (mgr_data -> fine_grid_solver_setup) = fgrid_solver_setup;
+   }
+   if ((mgr_data -> fine_grid_solver_solve) != NULL)
+   {
+      fgrid_solver_solve = (mgr_data -> fine_grid_solver_solve);
+   }
+   else
+   {
+      fgrid_solver_solve = (HYPRE_Int (*)(void*, void*, void*, void*)) hypre_BoomerAMGSolve;
+      (mgr_data -> fine_grid_solver_solve) = fgrid_solver_solve;
+   }
+
+   /* Set up solution and rhs arrays for Frelax */
+   if (F_fine_array != NULL || U_fine_array != NULL)
+   {
+      for (j = 1; j < old_num_coarse_levels + 1; j++)
+      {
+         if (F_fine_array[j] != NULL)
+         {
+            hypre_ParVectorDestroy(F_fine_array[j]);
+            F_fine_array[j] = NULL;
+         }
+         if (U_fine_array[j] != NULL)
+         {
+            hypre_ParVectorDestroy(U_fine_array[j]);
+            U_fine_array[j] = NULL;
+         }
+      }
+   }
+
+   if (F_fine_array == NULL)
+   {
+      F_fine_array = hypre_CTAlloc(hypre_ParVector*, max_num_coarse_levels + 1,
+                                   HYPRE_MEMORY_HOST);
+   }
+   if (U_fine_array == NULL)
+   {
+      U_fine_array = hypre_CTAlloc(hypre_ParVector*, max_num_coarse_levels + 1,
+                                   HYPRE_MEMORY_HOST);
+   }
+   if (aff_solver == NULL)
+   {
+      aff_solver = hypre_CTAlloc(HYPRE_Solver*, max_num_coarse_levels, HYPRE_MEMORY_HOST);
+   }
+   if (A_ff_array == NULL)
+   {
+      A_ff_array = hypre_CTAlloc(hypre_ParCSRMatrix*, max_num_coarse_levels, HYPRE_MEMORY_HOST);
+   }
+   if (B_FF_array == NULL)
+   {
+      B_FF_array = hypre_CTAlloc(hypre_ParCSRMatrix*, max_num_coarse_levels, HYPRE_MEMORY_HOST);
+   }
+   if (frelax_diaginv == NULL)
+   {
+      frelax_diaginv = hypre_CTAlloc(HYPRE_Real*, max_num_coarse_levels, HYPRE_MEMORY_HOST);
+   }
+   if (level_diaginv == NULL)
+   {
+      level_diaginv = hypre_CTAlloc(HYPRE_Real*, max_num_coarse_levels, HYPRE_MEMORY_HOST);
+   }
+   if (blk_size == NULL)
+   {
+      blk_size = hypre_CTAlloc(HYPRE_Int, max_num_coarse_levels, HYPRE_MEMORY_HOST);
+   }
+   if (level_smooth_type == NULL)
+   {
+      level_smooth_type = hypre_CTAlloc(HYPRE_Int, max_num_coarse_levels, HYPRE_MEMORY_HOST);
+   }
+   if (level_smooth_iters == NULL)
+   {
+      level_smooth_iters = hypre_CTAlloc(HYPRE_Int, max_num_coarse_levels, HYPRE_MEMORY_HOST);
+   }
+   if (level_smoother == NULL)
+   {
+      level_smoother = hypre_CTAlloc(HYPRE_Solver, max_num_coarse_levels, HYPRE_MEMORY_HOST);
+   }
+
+   /* set solution and rhs pointers */
+   F_array[0] = f;
+   U_array[0] = u;
+
+   (mgr_data -> F_array) = F_array;
+   (mgr_data -> U_array) = U_array;
+
+   (mgr_data -> F_fine_array) = F_fine_array;
+   (mgr_data -> U_fine_array) = U_fine_array;
+   (mgr_data -> aff_solver) = aff_solver;
+   (mgr_data -> A_ff_array) = A_ff_array;
+   (mgr_data -> B_FF_array) = B_FF_array;
+   (mgr_data -> frelax_diaginv) = frelax_diaginv;
+   (mgr_data -> level_diaginv) = level_diaginv;
+   (mgr_data -> blk_size) = blk_size;
+   (mgr_data -> level_smooth_type) = level_smooth_type;
+   (mgr_data -> level_smooth_iters) = level_smooth_iters;
+   (mgr_data -> level_smoother) = level_smoother;
+
+   /* begin coarsening loop */
+   num_coarsening_levs = max_num_coarse_levels;
+
+   /* Close MGRSetup-Init region */
+   hypre_GpuProfilingPopRange();
+
+   /* Initialize first entry in A_array to the input matrix */
+   A_array[0] = A;
+
+   /* loop over levels of coarsening */
+   for (lev = 0; lev < num_coarsening_levs; lev++)
+   {
+      hypre_sprintf(region_name, "%s-%d", "MGR_Level", lev);
+      hypre_GpuProfilingPushRange(region_name);
+      HYPRE_ANNOTATE_REGION_BEGIN("%s", region_name);
+
+      /* Check if this is the last level */
+      last_level = (lev == (num_coarsening_levs - 1));
+
+      /* Set level's block size */
+      level_blk_size = (lev == 0) ? block_size : block_num_coarse_indexes[lev - 1];
+
+      /* Get number of local unknowns */
+      nloc = hypre_ParCSRMatrixNumRows(A_array[lev]);
+
+      /* Reset pointers */
+      l1_norms_data = NULL;
+
+      /* Setup global smoother */
+      hypre_sprintf(region_name, "Global-Relax");
+      hypre_GpuProfilingPushRange(region_name);
+      HYPRE_ANNOTATE_REGION_BEGIN("%s", region_name);
+
+      /* TODO (VPM): Change option types for block-Jacobi and block-GS to 30 and 31 and
+            make them accessible through hypre_BoomerAMGRelax? */
+      if (level_smooth_iters[lev] > 0)
+      {
+         if (level_smoother[lev])
+         {
+            hypre_Solver *smoother_base = (hypre_Solver*) level_smoother[lev];
+
+            /* Call setup function */
+            hypre_SolverSetup(smoother_base)((HYPRE_Solver) level_smoother[lev],
+                                             (HYPRE_Matrix) A_array[lev],
+                                             NULL, NULL);
+         }
+         else if (level_smooth_type[lev] == 0 || level_smooth_type[lev] == 1)
+         {
+            /* TODO (VPM): move this to hypre_MGRBlockRelaxSetup and change its declaration */
+#if defined (HYPRE_USING_GPU)
+            if (exec == HYPRE_EXEC_DEVICE)
+            {
+               if (!B_array[lev])
+               {
+                  hypre_ParCSRMatrixBlockDiagMatrixDevice(A_array[lev], level_blk_size,
+                                                          0, NULL, 1, &B_array[lev]);
+               }
+            }
+            else
+#endif
+            {
+               hypre_MGRBlockRelaxSetup(A_array[lev], level_blk_size,
+                                        &(mgr_data -> level_diaginv)[lev]);
+            }
+         }
+         else if (level_smooth_type[lev] == 8)
+         {
+            /* TODO (VPM): Option 8 should be for hybrid L1 Symm. Gauss-Seidel */
+            HYPRE_EuclidCreate(comm, &(level_smoother[lev]));
+            HYPRE_EuclidSetLevel(level_smoother[lev], 0);
+            HYPRE_EuclidSetBJ(level_smoother[lev], 1);
+            HYPRE_EuclidSetup(level_smoother[lev], A_array[lev], NULL, NULL);
+         }
+         else if (level_smooth_type[lev] == 16)
+         {
+            /* TODO (VPM): Option 16 should be for Chebyshev */
+            HYPRE_ILUCreate(&(level_smoother[lev]));
+            HYPRE_ILUSetType(level_smoother[lev], 0);
+            HYPRE_ILUSetLevelOfFill(level_smoother[lev], 0);
+            HYPRE_ILUSetMaxIter(level_smoother[lev], level_smooth_iters[lev]);
+            HYPRE_ILUSetTol(level_smoother[lev], 0.0);
+            HYPRE_ILUSetLocalReordering(level_smoother[lev], 0);
+            HYPRE_ILUSetup(level_smoother[lev], A_array[lev], NULL, NULL);
+         }
+         else
+         {
+            /* Compute l1_norms according to relaxation type */
+            hypre_BoomerAMGRelaxComputeL1Norms(A_array[lev], level_smooth_type[lev],
+                                               0, 0, NULL, &l1_norms_data);
+            if (l1_norms_data)
+            {
+               l1_norms[lev] = hypre_SeqVectorCreate(nloc);
+               hypre_VectorData(l1_norms[lev]) = l1_norms_data;
+               hypre_VectorMemoryLocation(l1_norms[lev]) = memory_location;
+
+               if (print_level)
+               {
+                  hypre_ParPrintf(comm, "Setting l1_norms for global relax at MGR level %d\n", i);
+               }
+            }
+         }
+      }
+      hypre_GpuProfilingPopRange();
+      HYPRE_ANNOTATE_REGION_END("%s", region_name);
+
+      /* Compute strength matrix for interpolation operator
+         use default parameters, to be modified later */
+      hypre_sprintf(region_name, "Coarsen");
+      hypre_GpuProfilingPushRange(region_name);
+      HYPRE_ANNOTATE_REGION_BEGIN("%s", region_name);
+      cflag = last_level || setNonCpointToF;
+      if (interp_type[lev] == 3 || interp_type[lev] == 5 ||
+          interp_type[lev] == 6 || interp_type[lev] == 7 || !cflag)
+      {
+         hypre_BoomerAMGCreateS(A_array[lev], strong_threshold, max_row_sum, 1, NULL, &S);
+      }
+
+      /* Coarsen: Build CF_marker array based on rows of A */
+      hypre_MGRCoarsen(S, A_array[lev], level_coarse_size[lev], level_coarse_indexes[lev],
+                       debug_flag, &CF_marker_array[lev], cflag);
+      CF_marker = hypre_IntArrayData(CF_marker_array[lev]);
+
+      /* Get global fine/coarse partitionings. TODO: generate dof_func */
+      hypre_MGRCoarseParms(comm, nloc, CF_marker_array[lev],
+                           coarse_pnts_global, row_starts_fpts);
+      hypre_GpuProfilingPopRange();
+      HYPRE_ANNOTATE_REGION_END("%s", region_name);
+
+      /* Compute Petrov-Galerkin operators */
+      num_interp_sweeps = (mgr_data -> num_interp_sweeps);
+
+      if (mgr_data -> block_jacobi_bsize == 0)
+      {
+         block_jacobi_bsize = level_blk_size - block_num_coarse_indexes[lev];
+      }
+
+      if (block_jacobi_bsize == 1 && interp_type[lev] == 12)
+      {
+         interp_type[lev] = 2;
+      }
+
+      /* Compute C/F splitting (needed by RAP computation and other operations) */
+      FC_marker = hypre_IntArrayCloneDeep(CF_marker_array[lev]);
+      hypre_IntArrayNegate(FC_marker);
+
+      hypre_ParCSRMatrixGenerateFFFC(A_array[lev], CF_marker, coarse_pnts_global,
+                                     NULL, &A_FC, &A_FF);
+      hypre_ParCSRMatrixGenerateFFFC(A_array[lev], hypre_IntArrayData(FC_marker), row_starts_fpts,
+                                     NULL, &A_CF, &A_CC);
+
+      /* Build interpolation operator */
+      hypre_MGRBuildInterp(A_array[lev], A_FF, A_FC, S, CF_marker_array[lev],
+                           coarse_pnts_global, trunc_factor, P_max_elmts[lev],
+                           block_jacobi_bsize, interp_type[lev], num_interp_sweeps,
+                           &Wp, &P);
+      P_array[lev] = P;
+
+      /* Build Restriction operator */
+      if (block_jacobi_bsize == 1 && restrict_type[lev] == 12)
+      {
+         restrict_type[lev] = 2;
+      }
+      hypre_MGRBuildRestrict(A_array[lev], A_FF, A_FC, A_CF, CF_marker_array[lev],
+                             coarse_pnts_global, trunc_factor, P_max_elmts[lev],
+                             strong_threshold, max_row_sum, block_jacobi_bsize,
+                             restrict_type[lev], &Wr, &R, &RT);
+      R_array[lev]  = R;
+      RT_array[lev] = RT;
+
+      /* Use block Jacobi F-relaxation with block Jacobi interpolation */
+      hypre_sprintf(region_name, "F-Relax");
+      hypre_GpuProfilingPushRange(region_name);
+      HYPRE_ANNOTATE_REGION_BEGIN("%s", region_name);
+
+      if (interp_type[lev] == 12 && (mgr_data -> num_relax_sweeps)[lev] > 0)
+      {
+         /* TODO: refactor the following block (VPM) */
+#if defined (HYPRE_USING_GPU)
+         if (exec == HYPRE_EXEC_DEVICE)
+         {
+            hypre_ParCSRMatrixBlockDiagMatrixDevice(A_FF, block_jacobi_bsize,
+                                                    0, NULL, 1, &B_FF_array[lev]);
+         }
+         else
+#endif
+         {
+            HYPRE_Real *diag_inv = NULL;
+            HYPRE_Int   inv_num_rows;
+            HYPRE_Int   inv_size;
 
-      /* create and set default solver parameters here */
-      /* create and initialize default_cg_solver */
-      default_cg_solver = (HYPRE_Solver) hypre_BoomerAMGCreate();
-      hypre_BoomerAMGSetMaxIter ( default_cg_solver, (mgr_data -> max_iter) );
+            /* TODO: replace this with hypre_IntArrayCount (VPM) */
+            inv_num_rows = 0;
+            for (i = 0; i < nloc; i++)
+            {
+               inv_num_rows += (CF_marker[i] == -1) ? 1 : 0;
+            }
 
-      hypre_BoomerAMGSetRelaxOrder( default_cg_solver, 1);
-      hypre_BoomerAMGSetPrintLevel(default_cg_solver, 3);
-      /* set setup and solve functions */
-      coarse_grid_solver_setup = (HYPRE_Int (*)(void*, void*, void*, void*)) hypre_BoomerAMGSetup;
-      coarse_grid_solver_solve = (HYPRE_Int (*)(void*, void*, void*, void*)) hypre_BoomerAMGSolve;
-      (mgr_data -> coarse_grid_solver_setup) = coarse_grid_solver_setup;
-      (mgr_data -> coarse_grid_solver_solve) = coarse_grid_solver_solve;
-      (mgr_data -> coarse_grid_solver) = default_cg_solver;
-    }
-
-    // keep reserved coarse indexes to coarsest grid
-
-    if (reserved_coarse_size > 0)
-    {
-      HYPRE_BoomerAMGSetCPoints((mgr_data ->coarse_grid_solver), 25, reserved_coarse_size, reserved_coarse_indexes);
-    }
-
-    /* setup coarse grid solver */
-    coarse_grid_solver_setup((mgr_data -> coarse_grid_solver), A, f, u);
-    (mgr_data -> num_coarse_levels) = 0;
-    HYPRE_ANNOTATE_FUNC_END;
-
-    return hypre_error_flag;
-  }
-
-  /* If we reduce the reserved C-points, increase one level */
-  if (lvl_to_keep_cpoints > 0) max_num_coarse_levels++;
-  /* Initialize local indexes of coarse sets at different levels */
-  level_coarse_indexes = hypre_CTAlloc(HYPRE_Int*,  max_num_coarse_levels, HYPRE_MEMORY_HOST);
-  for (i = 0; i < max_num_coarse_levels; i++)
-  {
-    level_coarse_indexes[i] = hypre_CTAlloc(HYPRE_Int, nloc, HYPRE_MEMORY_HOST);
-  }
-
-  level_coarse_size = hypre_CTAlloc(HYPRE_Int,  max_num_coarse_levels, HYPRE_MEMORY_HOST);
-  HYPRE_Int reserved_cpoints_eliminated = 0;
-  // loop over levels
-  for(i=0; i<max_num_coarse_levels; i++)
-  {
-    // if we want to reduce the reserved Cpoints, set the current level
-    // coarse indices the same as the previous level
-    if (i == lvl_to_keep_cpoints && i > 0)
-    {
-      reserved_cpoints_eliminated++;
-      for (j = 0; j < final_coarse_size; j++)
-      {
-        level_coarse_indexes[i][j] = level_coarse_indexes[i-1][j];
+            /* Extract block diagonal inverses */
+            inv_size = inv_num_rows * block_jacobi_bsize;
+            diag_inv = hypre_CTAlloc(HYPRE_Complex, inv_size, HYPRE_MEMORY_HOST);
+
+            /* TODO: Extend this to device (VPM) */
+            hypre_ParCSRMatrixExtractBlockDiagHost(A_array[lev], block_jacobi_bsize, inv_num_rows,
+                                                   -1, CF_marker, inv_size, 1, diag_inv);
+            frelax_diaginv[lev] = diag_inv;
+            blk_size[lev] = block_jacobi_bsize;
+            if (!A_FF)
+            {
+               hypre_MGRBuildAff(A_array[lev], CF_marker, debug_flag, &A_FF);
+            }
+         }
+
+         /* Set A_ff pointer */
+         A_ff_array[lev] = A_FF;
+
+         F_fine_array[lev + 1] =
+            hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A_FF),
+                                  hypre_ParCSRMatrixGlobalNumRows(A_FF),
+                                  hypre_ParCSRMatrixRowStarts(A_FF));
+         hypre_ParVectorInitialize(F_fine_array[lev + 1]);
+
+         U_fine_array[lev + 1] =
+            hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A_FF),
+                                  hypre_ParCSRMatrixGlobalNumRows(A_FF),
+                                  hypre_ParCSRMatrixRowStarts(A_FF));
+         hypre_ParVectorInitialize(U_fine_array[lev + 1]);
       }
-      level_coarse_size[i] = final_coarse_size;
-      continue;
-    }
-    final_coarse_size = 0;
-    if (set_c_points_method == 0) // interleaved ordering, i.e. s1,p1,s2,p2,...
-    {
-      // loop over rows
-      for(row = ilower; row <=iupper; row++)
-      {
-        idx = row % block_size;
-        if(block_cf_marker[i - reserved_cpoints_eliminated][idx] == CMRK)
-        {
-          level_coarse_indexes[i][final_coarse_size++] = (HYPRE_Int)(row - ilower);
-        }
-      }
-    }
-    else if (set_c_points_method == 1) // block ordering s1,s2,...,p1,p2,...
-    {
-      for (j=0; j < block_size; j++)
-      {
-        if (block_cf_marker[i - reserved_cpoints_eliminated][j] == CMRK)
-        {
-          if (j == block_size - 1)
-          {
-            end_idx = iupper+1;
-          }
-          else
-          {
-            end_idx = idx_array[j+1];
-          }
-          for (row = idx_array[j]; row < end_idx; row++)
-          {
-            level_coarse_indexes[i][final_coarse_size++] = (HYPRE_Int)(row - ilower);
-          }
-        }
-      }
-      //hypre_printf("Level %d, # of coarse points %d\n", i, final_coarse_size);
-    }
-    else if (set_c_points_method == 2)
-    {
-      HYPRE_Int isCpoint;
-      // row start from 0 since point_marker_array is local
-      for (row = 0; row < nloc; row++)
-      {
-        isCpoint = 0;
-        for (j = 0; j < block_num_coarse_indexes[i]; j++)
-        {
-          if (point_marker_array[row] == block_cf_marker[i][j])
-          {
-            isCpoint = 1;
-            break;
-          }
-        }
-        if (isCpoint)
-        {
-          level_coarse_indexes[i][final_coarse_size++] = row;
-          //printf("%d\n",row);
-        }
-      }
-    }
-    else
-    {
-      if (my_id == 0)
-        hypre_printf("ERROR! Unknown method for setting C points.");
-      exit(-1);
-    }
-     level_coarse_size[i] = final_coarse_size;
-  }
-
-  // Set reserved coarse indexes to be kept to the coarsest level of the MGR solver
-  if ((mgr_data -> reserved_Cpoint_local_indexes) != NULL)
-    hypre_TFree((mgr_data -> reserved_Cpoint_local_indexes), HYPRE_MEMORY_HOST);
-  if (reserved_coarse_size > 0)
-  {
-    (mgr_data -> reserved_Cpoint_local_indexes) = hypre_CTAlloc(HYPRE_Int,  reserved_coarse_size, HYPRE_MEMORY_HOST);
-    reserved_Cpoint_local_indexes = (mgr_data -> reserved_Cpoint_local_indexes);
-    for(i=0; i<reserved_coarse_size; i++)
-    {
-      row = reserved_coarse_indexes[i];
-      HYPRE_Int local_row = (HYPRE_Int)(row - ilower);
-      reserved_Cpoint_local_indexes[i] = local_row;
-      HYPRE_Int lvl = lvl_to_keep_cpoints == 0 ? max_num_coarse_levels : lvl_to_keep_cpoints;
-      if (set_c_points_method < 2)
-      {
-        idx = row % block_size;
-        for(j=0; j<lvl; j++)
-        {
-          if(block_cf_marker[j][idx] != CMRK)
-          {
-            level_coarse_indexes[j][level_coarse_size[j]++] = local_row;
-          }
-        }
+      hypre_GpuProfilingPopRange();
+      HYPRE_ANNOTATE_REGION_END("%s", region_name);
+
+      /* Compute coarse level matrix */
+      hypre_MGRBuildCoarseOperator(mgr_vdata, A_FF, A_FC, A_CF, &A_CC, Wp, Wr, lev);
+
+      /* Destroy temporary variables */
+      hypre_ParCSRMatrixDestroy(A_FC), A_FC = NULL;
+      hypre_ParCSRMatrixDestroy(A_CF), A_CF = NULL;
+      hypre_ParCSRMatrixDestroy(A_CC), A_CC = NULL;
+      hypre_ParCSRMatrixDestroy(Wr); Wr = NULL;
+      if (Wp)
+      {
+         hypre_ParCSRMatrixDestroy(Wp); Wp = NULL;
       }
-      else
+
+      /* User-prescribed F-solver */
+      if (Frelax_type[lev] == 2  ||
+          Frelax_type[lev] == 9  ||
+          Frelax_type[lev] == 99 ||
+          Frelax_type[lev] == 199)
       {
-        HYPRE_Int isCpoint = 0;
-        for (j = 0; j < lvl; j++)
-        {
-          HYPRE_Int k;
-          for (k = 0; k < block_num_coarse_indexes[j]; k++)
-          {
-            if (point_marker_array[local_row] == block_cf_marker[j][k])
+         if (lev == 0 && (mgr_data -> fsolver_mode) == 0)
+         {
+            if (Frelax_type[lev] == 2)
+            {
+               if (((hypre_ParAMGData*)aff_solver[lev])->A_array != NULL)
+               {
+                  if (((hypre_ParAMGData*)aff_solver[lev])->A_array[0] != NULL)
+                  {
+                     /* F-solver is already set up, only need to store A_ff_ptr */
+                     A_ff_array[lev] = ((hypre_ParAMGData*) aff_solver[lev]) -> A_array[0];
+                  }
+                  else
+                  {
+                     hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                                       "F-relaxation solver has not been setup\n");
+                     HYPRE_ANNOTATE_FUNC_END;
+                     hypre_GpuProfilingPopRange();
+                     hypre_GpuProfilingPopRange();
+
+                     return hypre_error_flag;
+                  }
+               }
+               else /* F-relaxation solver prescribed but not set up */
+               {
+                  /* Save A_FF splitting */
+                  A_ff_array[lev] = A_FF;
+
+                  /* Setup F-solver */
+                  fgrid_solver_setup(aff_solver[lev],
+                                     A_ff_array[lev],
+                                     F_fine_array[lev + 1],
+                                     U_fine_array[lev + 1]);
+                  (mgr_data -> fsolver_mode) = 1;
+               }
+            }
+            else if (aff_solver[lev])
             {
-              isCpoint = 1;
-              break;
+               hypre_sprintf(msg, "Warning!! User-prescribed F-solver for the first level\n\
+                             reduction (set in HYPRE_MGRSetFSolver()) only supports AMG\n\
+                             Ignoring this call and using user prescribed Frelax_type %d",
+                             Frelax_type[lev]);
+               hypre_error_w_msg(0, msg);
             }
-          }
-          if (!isCpoint)
-          {
-            level_coarse_indexes[j][level_coarse_size[j]++] = local_row;
-          }
-        }
-      }
-    }
-  }
-
-  (mgr_data -> level_coarse_indexes) = level_coarse_indexes;
-  (mgr_data -> num_coarse_per_level) = level_coarse_size;
-
-  /* Free Previously allocated data, if any not destroyed */
-  if (A_array || P_array || RT_array || CF_marker_array)
-  {
-    for (j = 1; j < (old_num_coarse_levels); j++)
-    {
-      if (A_array[j])
-      {
-        hypre_ParCSRMatrixDestroy(A_array[j]);
-        A_array[j] = NULL;
-      }
-    }
-
-    for (j = 0; j < old_num_coarse_levels; j++)
-    {
-      if (P_array[j])
-      {
-        hypre_ParCSRMatrixDestroy(P_array[j]);
-        P_array[j] = NULL;
-      }
-
-      if (RT_array[j])
-      {
-        hypre_ParCSRMatrixDestroy(RT_array[j]);
-        RT_array[j] = NULL;
-      }
-
-      if (CF_marker_array[j])
-      {
-        hypre_IntArrayDestroy(CF_marker_array[j]);
-        CF_marker_array[j] = NULL;
-      }
-    }
-    hypre_TFree(P_array, HYPRE_MEMORY_HOST);
-    P_array = NULL;
-    hypre_TFree(RT_array, HYPRE_MEMORY_HOST);
-    RT_array = NULL;
-    hypre_TFree(CF_marker_array, HYPRE_MEMORY_HOST);
-    CF_marker_array = NULL;
-  }
-
-  /* Free previously allocated FrelaxVcycleData if not destroyed */
-  if ((mgr_data -> VcycleRelaxZtemp))
-  {
-    hypre_ParVectorDestroy((mgr_data -> VcycleRelaxZtemp));
-    (mgr_data -> VcycleRelaxZtemp) = NULL;
-  }
-  if ((mgr_data -> VcycleRelaxVtemp))
-  {
-    hypre_ParVectorDestroy((mgr_data -> VcycleRelaxVtemp));
-    (mgr_data -> VcycleRelaxVtemp) = NULL;
-  }
-  if ((mgr_data -> FrelaxVcycleData))
-  {
-    for (j = 0; j < old_num_coarse_levels; j++)
-    {
-      if ((mgr_data -> FrelaxVcycleData)[j])
-      {
-        hypre_MGRDestroyFrelaxVcycleData((mgr_data -> FrelaxVcycleData)[j]);
-        (mgr_data -> FrelaxVcycleData)[j] = NULL;
-      }
-    }
-    hypre_TFree((mgr_data -> FrelaxVcycleData), HYPRE_MEMORY_HOST);
-    (mgr_data -> FrelaxVcycleData) = NULL;
-  }
-
-  /* destroy final coarse grid matrix, if not previously destroyed */
-  if((mgr_data -> RAP))
-  {
-    hypre_ParCSRMatrixDestroy((mgr_data -> RAP));
-    (mgr_data -> RAP) = NULL;
-  }
-
-  /* Setup for global block smoothers*/
-  if (set_c_points_method == 0)
-  {
-    if (my_id == num_procs)
-    {
-        mgr_data -> n_block   = (n - reserved_coarse_size) / block_size;
-        mgr_data -> left_size = n - block_size*(mgr_data -> n_block);
-    }
-    else
-    {
-        mgr_data -> n_block = n / block_size;
-        mgr_data -> left_size = n - block_size*(mgr_data -> n_block);
-    }
-  }
-  else
-  {
-    mgr_data -> n_block = n;
-    mgr_data -> left_size = 0;
-  }
-  //wall_time = time_getWallclockSeconds();
-  if (global_smooth_iters > 0)
-  {
-    if (global_smooth_type == 0)
-    {
-      if (set_c_points_method == 0)
-      {
-        hypre_blockRelax_setup(A,block_size,reserved_coarse_size,&(mgr_data -> diaginv));
+         }
+         else if (aff_solver[lev])
+         {
+            aff_base = (hypre_Solver*) aff_solver[lev];
+
+            /* Save A_FF splitting */
+            A_ff_array[lev] = A_FF;
+
+            /* Call setup function */
+            hypre_SolverSetup(aff_base)((HYPRE_Solver) aff_solver[lev],
+                                        (HYPRE_Matrix) A_ff_array[lev],
+                                        (HYPRE_Vector) F_fine_array[lev + 1],
+                                        (HYPRE_Vector) U_fine_array[lev + 1]);
+         }
+         else if (Frelax_type[lev] == 2) /* Construct default AMG solver */
+         {
+            /* Save A_FF splitting */
+            A_ff_array[lev] = A_FF;
+
+            /* Create BoomerAMG solver for A_FF */
+            aff_solver[lev] = (HYPRE_Solver*) hypre_BoomerAMGCreate();
+            hypre_BoomerAMGSetMaxIter(aff_solver[lev], (mgr_data -> num_relax_sweeps)[lev]);
+            hypre_BoomerAMGSetTol(aff_solver[lev], 0.0);
+            //hypre_BoomerAMGSetStrongThreshold(aff_solver[lev], 0.6);
+#if defined(HYPRE_USING_GPU)
+            hypre_BoomerAMGSetRelaxType(aff_solver[lev], 18);
+            hypre_BoomerAMGSetCoarsenType(aff_solver[lev], 8);
+            hypre_BoomerAMGSetNumSweeps(aff_solver[lev], 3);
+#else
+            hypre_BoomerAMGSetRelaxOrder(aff_solver[lev], 1);
+#endif
+            hypre_BoomerAMGSetPrintLevel(aff_solver[lev], mgr_data -> frelax_print_level);
+
+            fgrid_solver_setup(aff_solver[lev],
+                               A_ff_array[lev],
+                               F_fine_array[lev + 1],
+                               U_fine_array[lev + 1]);
+
+            (mgr_data -> fsolver_mode) = 2;
+         }
+         else
+         {
+            /* Save A_FF splitting */
+            A_ff_array[lev] = A_FF;
+         }
+
+         /* TODO: Check use of A_ff_array[lev], vectors at (lev + 1) are correct? (VPM) */
+         if (!F_fine_array[lev + 1])
+         {
+            F_fine_array[lev + 1] =
+               hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A_ff_array[lev]),
+                                     hypre_ParCSRMatrixGlobalNumRows(A_ff_array[lev]),
+                                     hypre_ParCSRMatrixRowStarts(A_ff_array[lev]));
+            hypre_ParVectorInitialize(F_fine_array[lev + 1]);
+         }
+
+         if (!U_fine_array[lev + 1])
+         {
+            U_fine_array[lev + 1] =
+               hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A_ff_array[lev]),
+                                     hypre_ParCSRMatrixGlobalNumRows(A_ff_array[lev]),
+                                     hypre_ParCSRMatrixRowStarts(A_ff_array[lev]));
+            hypre_ParVectorInitialize(U_fine_array[lev + 1]);
+         }
       }
-      else
+
+      /* TODO: refactor this block (VPM) */
+#if defined (HYPRE_USING_GPU)
+      if (exec == HYPRE_EXEC_DEVICE)
       {
-        hypre_blockRelax_setup(A,1,reserved_coarse_size,&(mgr_data -> diaginv));
-      }
-    }
-    else if (global_smooth_type == 8)
-    {
-      HYPRE_EuclidCreate(comm, &(mgr_data -> global_smoother));
-      HYPRE_EuclidSetLevel(mgr_data -> global_smoother, 0);
-      HYPRE_EuclidSetBJ(mgr_data -> global_smoother, 1);
-      HYPRE_EuclidSetup(mgr_data -> global_smoother, A, f, u);
-    }
-    else if (global_smooth_type == 16)
-    {
-      HYPRE_ILUCreate(&(mgr_data -> global_smoother));
-      HYPRE_ILUSetType(mgr_data -> global_smoother, 0);
-      HYPRE_ILUSetLevelOfFill(mgr_data -> global_smoother, 0);
-      HYPRE_ILUSetMaxIter(mgr_data -> global_smoother, global_smooth_iters);
-      HYPRE_ILUSetTol(mgr_data -> global_smoother, 0.0);
-      HYPRE_ILUSetup(mgr_data -> global_smoother, A, f, u);
-    }
-  }
-  //wall_time = time_getWallclockSeconds() - wall_time;
-  //hypre_printf("Proc = %d     Global smoother setup: %f\n", my_id, wall_time);
-
-  /* clear old l1_norm data, if created */
-  if((mgr_data -> l1_norms))
-  {
-    for (j = 0; j < (old_num_coarse_levels); j++)
-    {
-      if ((mgr_data -> l1_norms)[j])
-      {
-        hypre_SeqVectorDestroy((mgr_data -> l1_norms)[i]);
-        //hypre_TFree((mgr_data -> l1_norms)[j], HYPRE_MEMORY_HOST);
-        (mgr_data -> l1_norms)[j] = NULL;
-      }
-    }
-    hypre_TFree((mgr_data -> l1_norms), HYPRE_MEMORY_HOST);
-  }
-
-  /* setup temporary storage */
-  if ((mgr_data -> Ztemp))
-  {
-    hypre_ParVectorDestroy((mgr_data -> Ztemp));
-    (mgr_data -> Ztemp) = NULL;
-  }
-  if ((mgr_data -> Vtemp))
-  {
-    hypre_ParVectorDestroy((mgr_data -> Vtemp));
-    (mgr_data -> Vtemp) = NULL;
-  }
-  if ((mgr_data -> Utemp))
-  {
-    hypre_ParVectorDestroy((mgr_data -> Utemp));
-    (mgr_data -> Utemp) = NULL;
-  }
-  if ((mgr_data -> Ftemp))
-  {
-    hypre_ParVectorDestroy((mgr_data -> Ftemp));
-    (mgr_data -> Ftemp) = NULL;
-  }
-  if ((mgr_data -> residual))
-  {
-    hypre_ParVectorDestroy((mgr_data -> residual));
-    (mgr_data -> residual) = NULL;
-  }
-  if ((mgr_data -> rel_res_norms))
-  {
-    hypre_TFree((mgr_data -> rel_res_norms), HYPRE_MEMORY_HOST);
-    (mgr_data -> rel_res_norms) = NULL;
-  }
-
-  Vtemp = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A),
-                  hypre_ParCSRMatrixGlobalNumRows(A),
-                  hypre_ParCSRMatrixRowStarts(A));
-  hypre_ParVectorInitialize(Vtemp);
-  (mgr_data ->Vtemp) = Vtemp;
-
-  Ztemp = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A),
-                  hypre_ParCSRMatrixGlobalNumRows(A),
-                  hypre_ParCSRMatrixRowStarts(A));
-  hypre_ParVectorInitialize(Ztemp);
-  (mgr_data -> Ztemp) = Ztemp;
-
-  Utemp = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A),
-                  hypre_ParCSRMatrixGlobalNumRows(A),
-                  hypre_ParCSRMatrixRowStarts(A));
-  hypre_ParVectorInitialize(Utemp);
-  (mgr_data ->Utemp) = Utemp;
-
-  Ftemp = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A),
-                  hypre_ParCSRMatrixGlobalNumRows(A),
-                  hypre_ParCSRMatrixRowStarts(A));
-  hypre_ParVectorInitialize(Ftemp);
-  (mgr_data ->Ftemp) = Ftemp;
-
-  /* Allocate memory for level structure */
-  if (A_array == NULL)
-    A_array = hypre_CTAlloc(hypre_ParCSRMatrix*,  max_num_coarse_levels, HYPRE_MEMORY_HOST);
-  if (P_array == NULL && max_num_coarse_levels > 0)
-    P_array = hypre_CTAlloc(hypre_ParCSRMatrix*,  max_num_coarse_levels, HYPRE_MEMORY_HOST);
-  if (RT_array == NULL && max_num_coarse_levels > 0)
-    RT_array = hypre_CTAlloc(hypre_ParCSRMatrix*,  max_num_coarse_levels, HYPRE_MEMORY_HOST);
-  if (CF_marker_array == NULL)
-    CF_marker_array = hypre_CTAlloc(hypre_IntArray*,  max_num_coarse_levels, HYPRE_MEMORY_HOST);
-
-  /* Set default for Frelax_method and Frelax_num_functions if not set already */
-  if (Frelax_method == NULL)
-  {
-    Frelax_method = hypre_CTAlloc(HYPRE_Int, max_num_coarse_levels, HYPRE_MEMORY_HOST);
-    for (i = 0; i < max_num_coarse_levels; i++)
-    {
-      Frelax_method[i] = 0;
-    }
-    (mgr_data -> Frelax_method) = Frelax_method;
-  }
-  /* Set default for using non-Galerkin coarse grid */
-  if (use_non_galerkin_cg == NULL)
-  {
-    use_non_galerkin_cg = hypre_CTAlloc(HYPRE_Int, max_num_coarse_levels, HYPRE_MEMORY_HOST);
-    for (i = 0; i < max_num_coarse_levels; i++)
-    {
-      use_non_galerkin_cg[i] = 0;
-    }
-    (mgr_data -> use_non_galerkin_cg) = use_non_galerkin_cg;
-  }
-
-  /*
-  if (Frelax_num_functions== NULL)
-  {
-    Frelax_num_functions = hypre_CTAlloc(HYPRE_Int, max_num_coarse_levels, HYPRE_MEMORY_HOST);
-    for (i = 0; i < max_num_coarse_levels; i++)
-    {
-      Frelax_num_functions[i] = 1;
-    }
-    (mgr_data -> Frelax_num_functions) = Frelax_num_functions;
-  }
-  */
-  /* Set default for interp_type and restrict_type if not set already */
-  if (interp_type == NULL)
-  {
-    interp_type = hypre_CTAlloc(HYPRE_Int, max_num_coarse_levels, HYPRE_MEMORY_HOST);
-    for (i = 0; i < max_num_coarse_levels; i++)
-    {
-      interp_type[i] = 2;
-    }
-    (mgr_data -> interp_type) = interp_type;
-  }
-  if (restrict_type == NULL)
-  {
-    restrict_type = hypre_CTAlloc(HYPRE_Int, max_num_coarse_levels, HYPRE_MEMORY_HOST);
-    for (i = 0; i < max_num_coarse_levels; i++)
-    {
-      (mgr_data -> restrict_type) = 0;
-    }
-    (mgr_data -> restrict_type) = restrict_type;
-  }
-
-  /* set interp_type, restrict_type, and Frelax_method if we reduce the reserved C-points */
-  reserved_cpoints_eliminated = 0;
-  if (lvl_to_keep_cpoints > 0 && reserved_coarse_size > 0)
-  {
-    HYPRE_Int *level_interp_type = hypre_CTAlloc(HYPRE_Int, max_num_coarse_levels, HYPRE_MEMORY_HOST);
-    HYPRE_Int *level_restrict_type = hypre_CTAlloc(HYPRE_Int, max_num_coarse_levels, HYPRE_MEMORY_HOST);
-    HYPRE_Int *level_frelax_method = hypre_CTAlloc(HYPRE_Int, max_num_coarse_levels, HYPRE_MEMORY_HOST);
-    for (i=0; i < max_num_coarse_levels; i++)
-    {
-      if (i == lvl_to_keep_cpoints)
-      {
-        level_interp_type[i] = 2;
-        level_restrict_type[i] = 0;
-        level_frelax_method[i] = 99;
-        reserved_cpoints_eliminated++;
+         hypre_MGRBuildPDevice(A_array[lev], hypre_IntArrayData(FC_marker),
+                               row_starts_fpts, 0, &P_FF_array[lev]);
       }
-      else
+#endif
+
+      /* Destroy A_FF if it has not been saved on A_ff_array[lev] */
+      if (!A_ff_array[lev])
       {
-        level_interp_type[i] = interp_type[i - reserved_cpoints_eliminated];
-        level_restrict_type[i] = restrict_type[i - reserved_cpoints_eliminated];
-        level_frelax_method[i] = Frelax_method[i - reserved_cpoints_eliminated];
-      }
-    }
-    hypre_TFree(interp_type, HYPRE_MEMORY_HOST);
-    hypre_TFree(restrict_type, HYPRE_MEMORY_HOST);
-    hypre_TFree(Frelax_method, HYPRE_MEMORY_HOST);
-    interp_type = level_interp_type;
-    restrict_type = level_restrict_type;
-    Frelax_method = level_frelax_method;
-    (mgr_data -> interp_type) = level_interp_type;
-    (mgr_data -> restrict_type) = level_restrict_type;
-    (mgr_data -> Frelax_method) = level_frelax_method;
-  }
-
-  /* set pointers to mgr data */
-  (mgr_data -> A_array) = A_array;
-  (mgr_data -> P_array) = P_array;
-  (mgr_data -> RT_array) = RT_array;
-  (mgr_data -> CF_marker_array) = CF_marker_array;
-
-  /* Set up solution and rhs arrays */
-  if (F_array != NULL || U_array != NULL)
-  {
-    for (j = 1; j < old_num_coarse_levels+1; j++)
-    {
-      if (F_array[j] != NULL)
-      {
-        hypre_ParVectorDestroy(F_array[j]);
-        F_array[j] = NULL;
-      }
-      if (U_array[j] != NULL)
-      {
-        hypre_ParVectorDestroy(U_array[j]);
-        U_array[j] = NULL;
-      }
-    }
-  }
-
-  if (F_array == NULL)
-    F_array = hypre_CTAlloc(hypre_ParVector*,  max_num_coarse_levels+1, HYPRE_MEMORY_HOST);
-  if (U_array == NULL)
-    U_array = hypre_CTAlloc(hypre_ParVector*,  max_num_coarse_levels+1, HYPRE_MEMORY_HOST);
-
-  if (A_ff_array)
-  {
-    for (j = 0; j < old_num_coarse_levels - 1; j++)
-    {
-      if (A_ff_array[j])
-      {
-        hypre_ParCSRMatrixDestroy(A_ff_array[j]);
-        A_ff_array[j] = NULL;
-      }
-    }
-    hypre_TFree(A_ff_array, HYPRE_MEMORY_HOST);
-    A_ff_array = NULL;
-  }
-  if ((mgr_data -> fine_grid_solver_setup) != NULL)
-  {
-    fine_grid_solver_setup = (mgr_data -> fine_grid_solver_setup);
-  }
-  else
-  {
-    fine_grid_solver_setup = (HYPRE_Int (*)(void*, void*, void*, void*)) hypre_BoomerAMGSetup;
-    (mgr_data -> fine_grid_solver_setup) = fine_grid_solver_setup;
-  }
-  if ((mgr_data -> fine_grid_solver_solve) != NULL)
-  {
-    fine_grid_solver_solve = (mgr_data -> fine_grid_solver_solve);
-  }
-  else
-  {
-    fine_grid_solver_solve = (HYPRE_Int (*)(void*, void*, void*, void*)) hypre_BoomerAMGSolve;
-    (mgr_data -> fine_grid_solver_solve) = fine_grid_solver_solve;
-  }
-
-
-  /* Set up solution and rhs arrays for Frelax */
-  if (F_fine_array != NULL || U_fine_array != NULL)
-  {
-    for (j = 1; j < old_num_coarse_levels+1; j++)
-    {
-      if (F_fine_array[j] != NULL)
-      {
-        hypre_ParVectorDestroy(F_fine_array[j]);
-        F_fine_array[j] = NULL;
-      }
-      if (U_fine_array[j] != NULL)
-      {
-        hypre_ParVectorDestroy(U_fine_array[j]);
-        U_fine_array[j] = NULL;
-      }
-    }
-  }
-
-  if (F_fine_array == NULL)
-    F_fine_array = hypre_CTAlloc(hypre_ParVector*,  max_num_coarse_levels+1, HYPRE_MEMORY_HOST);
-  if (U_fine_array == NULL)
-    U_fine_array = hypre_CTAlloc(hypre_ParVector*,  max_num_coarse_levels+1, HYPRE_MEMORY_HOST);
-  if (aff_solver == NULL)
-    aff_solver = hypre_CTAlloc(HYPRE_Solver*, max_num_coarse_levels, HYPRE_MEMORY_HOST);
-  if (A_ff_array == NULL)
-    A_ff_array = hypre_CTAlloc(hypre_ParCSRMatrix*, max_num_coarse_levels, HYPRE_MEMORY_HOST);
-
-  /* set solution and rhs pointers */
-  F_array[0] = f;
-  U_array[0] = u;
-
-  (mgr_data -> F_array) = F_array;
-  (mgr_data -> U_array) = U_array;
-
-  (mgr_data -> F_fine_array) = F_fine_array;
-  (mgr_data -> U_fine_array) = U_fine_array;
-  (mgr_data -> aff_solver) = aff_solver;
-  (mgr_data -> A_ff_array) = A_ff_array;
-
-  /* begin coarsening loop */
-  num_coarsening_levs = max_num_coarse_levels;
-  /* initialize level data matrix here */
-  RAP_ptr = A;
-  /* loop over levels of coarsening */
-  for(lev = 0; lev < num_coarsening_levs; lev++)
-  {
-    /* check if this is the last level */
-    last_level = ((lev == num_coarsening_levs-1));
-
-    /* initialize A_array */
-    A_array[lev] = RAP_ptr;
-        nloc = hypre_CSRMatrixNumRows(hypre_ParCSRMatrixDiag(A_array[lev]));
-
-    /* Compute strength matrix for interpolation operator - use default parameters, to be modified later */
-    hypre_BoomerAMGCreateS(A_array[lev], strong_threshold, max_row_sum, 1, NULL, &S);
-
-    /* Coarsen: Build CF_marker array based on rows of A */
-                cflag = ((last_level || setNonCpointToF));
-                hypre_MGRCoarsen(S, A_array[lev], level_coarse_size[lev], level_coarse_indexes[lev],debug_flag, &CF_marker_array[lev], cflag);
-    CF_marker = hypre_IntArrayData(CF_marker_array[lev]);
-
-    /*
-    char fname[256];
-    sprintf(fname,"CF_marker_lvl_%d_new.%05d", lev, my_id);
-    FILE* fout;
-    fout = fopen(fname,"w");
-    for (i=0; i < nloc; i++)
-    {
-      fprintf(fout, "%d %d\n", i, CF_marker_array[lev][i]);
-    }
-    fclose(fout);
-    */
-
-    /* Get global coarse sizes. Note that we assume num_functions = 1
-     * so dof_func arrays are NULL */
-    hypre_BoomerAMGCoarseParms(comm, nloc, 1, NULL, CF_marker_array[lev], &dof_func_buff, &coarse_pnts_global);
-    if (dof_func_buff)
-    {
-       dof_func_buff_data = hypre_IntArrayData(dof_func_buff);
-    }
-    /* Compute Petrov-Galerkin operators */
-    /* Interpolation operator */
-    num_interp_sweeps = (mgr_data -> num_interp_sweeps);
-
-    if (interp_type[lev] == 99)
-    {
-      //wall_time = time_getWallclockSeconds();
-      hypre_MGRBuildInterp(A_array[lev], CF_marker, A_ff_inv, coarse_pnts_global, 1, dof_func_buff_data,
-                          debug_flag, trunc_factor, max_elmts, &P, interp_type[lev], num_interp_sweeps);
-      //wall_time = time_getWallclockSeconds() - wall_time;
-      //hypre_printf("Proc = %d     BuildInterp: %f\n", my_id, wall_time);
-    }
-    else
-    {
-      hypre_MGRBuildInterp(A_array[lev], CF_marker, S, coarse_pnts_global, 1, dof_func_buff_data,
-                          debug_flag, trunc_factor, max_elmts, &P, interp_type[lev], num_interp_sweeps);
-    }
-
-    P_array[lev] = P;
-
-    if (restrict_type[lev] == 4)
-      use_air = 1;
-    else if (restrict_type[lev] == 5)
-      use_air = 2;
-    else
-      use_air = 0;
-
-    if(use_air)
-    {
-      HYPRE_Real   filter_thresholdR = 0.0;
-      HYPRE_Int     gmres_switch = 64;
-      HYPRE_Int     is_triangular = 0;
-
-      /* for AIR, need absolute value SOC */
-
-      hypre_BoomerAMGCreateSabs(A_array[lev], strong_threshold, 1.0, 1, NULL, &ST);
-
-      /* !!! Ensure that CF_marker contains -1 or 1 !!! */
-      /*
-      for (i = 0; i < hypre_CSRMatrixNumRows(hypre_ParCSRMatrixDiag(A_array[level])); i++)
+         hypre_ParCSRMatrixDestroy(A_FF);
+      }
+      A_FF = NULL;
+      hypre_IntArrayDestroy(FC_marker);
+
+      /* TODO: move this to par_mgr_coarsen.c and port to GPUs (VPM) */
+      /* Update coarse level indexes for next levels */
+      if (lev < num_coarsening_levs - 1)
       {
-        CF_marker[i] = CF_marker[i] > 0 ? 1 : -1;
+         for (i = lev + 1; i < max_num_coarse_levels; i++)
+         {
+            memory_location = hypre_IntArrayMemoryLocation(CF_marker_array[lev]);
+            if (hypre_GetActualMemLocation(memory_location) == hypre_MEMORY_DEVICE)
+            {
+               hypre_IntArrayMigrate(CF_marker_array[lev], HYPRE_MEMORY_HOST);
+            }
+            CF_marker = hypre_IntArrayData(CF_marker_array[lev]);
+
+            /* First mark indexes to be updated */
+            for (j = 0; j < level_coarse_size[i]; j++)
+            {
+               CF_marker[level_coarse_indexes[i][j]] = S_CMRK;
+            }
+
+            /* Next: loop over levels to update indexes */
+            nc = 0;
+            index_i = 0;
+            for (j = 0; j < nloc; j++)
+            {
+               if (CF_marker[j] == CMRK)
+               {
+                  nc++;
+               }
+               if (CF_marker[j] == S_CMRK)
+               {
+                  level_coarse_indexes[i][index_i++] = nc++;
+               }
+               //if(index_i == level_coarse_size[i]) break;
+            }
+            hypre_assert(index_i == level_coarse_size[i]);
+
+            // then: reset previously marked indexes
+            for (j = 0; j < level_coarse_size[lev]; j++)
+            {
+               CF_marker[level_coarse_indexes[lev][j]] = CMRK;
+            }
+
+            if (hypre_GetActualMemLocation(memory_location) == hypre_MEMORY_DEVICE)
+            {
+               hypre_IntArrayMigrate(CF_marker_array[lev], HYPRE_MEMORY_DEVICE);
+            }
+         }
       }
-      */
-      if (use_air == 1) /* distance-1 AIR */
+
+      /* Update reserved coarse indexes to be kept to coarsest level
+       * first mark indexes to be updated
+       * skip if we reduce the reserved C-points before the coarse grid solve */
+      if (mgr_data -> lvl_to_keep_cpoints == 0)
+      {
+         memory_location = hypre_IntArrayMemoryLocation(CF_marker_array[lev]);
+         if (hypre_GetActualMemLocation(memory_location) == hypre_MEMORY_DEVICE)
+         {
+            hypre_IntArrayMigrate(CF_marker_array[lev], HYPRE_MEMORY_HOST);
+         }
+         CF_marker = hypre_IntArrayData(CF_marker_array[lev]);
+
+         for (i = 0; i < reserved_coarse_size; i++)
+         {
+            CF_marker[reserved_Cpoint_local_indexes[i]] = S_CMRK;
+         }
+
+         /* loop to update reserved Cpoints */
+         nc = 0;
+         index_i = 0;
+         for (i = 0; i < nloc; i++)
+         {
+            if (CF_marker[i] == CMRK)
+            {
+               nc++;
+            }
+            if (CF_marker[i] == S_CMRK)
+            {
+               reserved_Cpoint_local_indexes[index_i++] = nc++;
+
+               /* reset modified CF marker array indexes */
+               CF_marker[i] = CMRK;
+            }
+         }
+
+         if (hypre_GetActualMemLocation(memory_location) == hypre_MEMORY_DEVICE)
+         {
+            hypre_IntArrayMigrate(CF_marker_array[lev], HYPRE_MEMORY_DEVICE);
+         }
+      }
+
+      /* allocate space for solution and rhs arrays */
+      F_array[lev + 1] =
+         hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A_array[lev + 1]),
+                               hypre_ParCSRMatrixGlobalNumRows(A_array[lev + 1]),
+                               hypre_ParCSRMatrixRowStarts(A_array[lev + 1]));
+      hypre_ParVectorInitialize(F_array[lev + 1]);
+
+      U_array[lev + 1] =
+         hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A_array[lev + 1]),
+                               hypre_ParCSRMatrixGlobalNumRows(A_array[lev + 1]),
+                               hypre_ParCSRMatrixRowStarts(A_array[lev + 1]));
+      hypre_ParVectorInitialize(U_array[lev + 1]);
+
+      /* free memory before starting next level */
+      hypre_ParCSRMatrixDestroy(S); S = NULL;
+
+      /* check if Vcycle smoother setup required */
+      if ((mgr_data -> max_local_lvls) > 1)
+      {
+         if (Frelax_type[lev] == 1)
+         {
+            use_VcycleSmoother = 1;
+            // use_ComplexSmoother = 1;
+         }
+      }
+      else
       {
-        hypre_BoomerAMGBuildRestrAIR(A_array[lev], CF_marker,
-                          ST, coarse_pnts_global, 1,
-                          dof_func_buff_data, filter_thresholdR,
-                          debug_flag, &RT,
-                          is_triangular, gmres_switch);
+         /* Only check for vcycle smoother option.
+          * Currently leaves Frelax_type[lev] = 2 (full amg) option as is */
+         if (Frelax_type[lev] == 1)
+         {
+            Frelax_type[lev] = 0;
+         }
       }
-      else /* distance-1.5 AIR - distance 2 locally and distance 1 across procs. */
+
+      if (Frelax_type[lev] == 9 ||
+          Frelax_type[lev] == 99 ||
+          Frelax_type[lev] == 199 )
       {
-        hypre_BoomerAMGBuildRestrDist2AIR(A_array[lev], CF_marker,
-                            ST, coarse_pnts_global, 1,
-                            dof_func_buff_data, debug_flag, filter_thresholdR,
-                            &RT,
-                            1, is_triangular, gmres_switch );
+         use_GSElimSmoother = 1;
       }
 
-      RT_array[lev] = RT;
+      hypre_sprintf(region_name, "%s-%d", "MGR_Level", lev);
+      hypre_GpuProfilingPopRange();
+      HYPRE_ANNOTATE_REGION_END("%s", region_name);
 
-      /* Use two matrix products to generate A_H */
-      hypre_ParCSRMatrix *AP = NULL;
-      AP  = hypre_ParMatmul(A_array[lev], P_array[lev]);
-      RAP_ptr = hypre_ParMatmul(RT, AP);
-      if (num_procs > 1)
+      /* check if last level */
+      if (last_level)
       {
-        hypre_MatvecCommPkgCreate(RAP_ptr);
+         num_c_levels = lev + 1;
+         lev = num_coarsening_levs;
       }
-      /* Delete AP */
-      hypre_ParCSRMatrixDestroy(AP);
-    }
-    else
-    {
-      hypre_MGRBuildRestrict(A_array[lev], CF_marker, coarse_pnts_global, 1, dof_func_buff_data,
-            debug_flag, trunc_factor, max_elmts, strong_threshold, max_row_sum, &RT,
-            restrict_type[lev], num_restrict_sweeps);
+   }
 
-      RT_array[lev] = RT;
+   /* set pointer to last level matrix */
+   (mgr_data -> num_coarse_levels) = num_c_levels;
 
-      /* Compute RAP for next level */
-      if (use_non_galerkin_cg[lev] != 0)
+   /* setup default coarsest grid solver (BoomerAMG) */
+   if (use_default_cgrid_solver)
+   {
+      if (my_id == 0 && print_level > 0)
       {
-        HYPRE_Int block_num_f_points = (lev == 0 ? block_size : block_num_coarse_indexes[lev-1]) - block_num_coarse_indexes[lev];
-        hypre_MGRComputeNonGalerkinCoarseGrid(A_array[lev], P, RT, block_num_f_points,
-          /* ordering */set_c_points_method, /* method (approx. inverse or not) */ 0, max_elmts, /* keep_stencil */ 0, CF_marker, &RAP_ptr);
+         hypre_printf("No coarse grid solver provided. Using default AMG solver ... \n");
       }
-      else
+
+      /* create and set default solver parameters here */
+      default_cg_solver = (HYPRE_Solver) hypre_BoomerAMGCreate();
+      hypre_BoomerAMGSetMaxIter(default_cg_solver, 1);
+      hypre_BoomerAMGSetTol(default_cg_solver, 0.0);
+      hypre_BoomerAMGSetRelaxOrder(default_cg_solver, 1);
+      hypre_BoomerAMGSetPrintLevel(default_cg_solver, mgr_data -> cg_print_level);
+
+      /* set setup and solve functions */
+      cgrid_solver_setup = (HYPRE_Int (*)(void*, void*, void*, void*)) hypre_BoomerAMGSetup;
+      cgrid_solver_solve = (HYPRE_Int (*)(void*, void*, void*, void*)) hypre_BoomerAMGSolve;
+      (mgr_data -> coarse_grid_solver_setup) = cgrid_solver_setup;
+      (mgr_data -> coarse_grid_solver_solve) = cgrid_solver_solve;
+      (mgr_data -> coarse_grid_solver) = default_cg_solver;
+   }
+
+   /* keep reserved coarse indexes to coarsest grid */
+   if (reserved_coarse_size > 0 && lvl_to_keep_cpoints == 0)
+   {
+      ilower = hypre_ParCSRMatrixFirstRowIndex(A_array[num_c_levels]);
+      for (i = 0; i < reserved_coarse_size; i++)
       {
-        hypre_BoomerAMGBuildCoarseOperator(RT, A_array[lev], P, &RAP_ptr);
-      }
-    }
-
-    // truncate the coarse grid
-    hypre_ParCSRMatrixTruncate(RAP_ptr, truncate_cg_threshold, 0, 0, 0);
-
-    if (Frelax_method[lev] == 2) // full AMG
-    {
-      // user provided AMG solver
-      // only support AMG at the first level
-      // TODO: input check to avoid crashing
-      if (lev == 0 && use_default_fsolver == 0)
-      {
-        if (((hypre_ParAMGData*)aff_solver[0])->A_array[0] == NULL)
-        {
-          if (my_id == 0)
-          {
-            printf("Error!!! F-relaxation solver has not been setup.\n");
-            hypre_error(1);
-            return hypre_error_flag;
-          }
-        }
-        A_ff_ptr = ((hypre_ParAMGData*)aff_solver[0])->A_array[0];
-
-        F_fine_array[lev+1] =
-        hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A_ff_ptr),
-                       hypre_ParCSRMatrixGlobalNumRows(A_ff_ptr),
-                       hypre_ParCSRMatrixRowStarts(A_ff_ptr));
-        hypre_ParVectorInitialize(F_fine_array[lev+1]);
-
-        U_fine_array[lev+1] =
-        hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A_ff_ptr),
-                       hypre_ParCSRMatrixGlobalNumRows(A_ff_ptr),
-                       hypre_ParCSRMatrixRowStarts(A_ff_ptr));
-        hypre_ParVectorInitialize(U_fine_array[lev+1]);
-        A_ff_array[lev] = A_ff_ptr;
-      }
-      else // construct default AMG solver
-      {
-        hypre_MGRBuildAff(A_array[lev], CF_marker, debug_flag, &A_ff_ptr);
-
-        F_fine_array[lev+1] =
-        hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A_ff_ptr),
-                       hypre_ParCSRMatrixGlobalNumRows(A_ff_ptr),
-                       hypre_ParCSRMatrixRowStarts(A_ff_ptr));
-        hypre_ParVectorInitialize(F_fine_array[lev+1]);
-
-        U_fine_array[lev+1] =
-        hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A_ff_ptr),
-                       hypre_ParCSRMatrixGlobalNumRows(A_ff_ptr),
-                       hypre_ParCSRMatrixRowStarts(A_ff_ptr));
-        hypre_ParVectorInitialize(U_fine_array[lev+1]);
-        A_ff_array[lev] = A_ff_ptr;
-
-        aff_solver[lev] = (HYPRE_Solver*) hypre_BoomerAMGCreate();
-        hypre_BoomerAMGSetMaxIter(aff_solver[lev], mgr_data -> num_relax_sweeps);
-        hypre_BoomerAMGSetTol(aff_solver[lev], 0.0);
-        hypre_BoomerAMGSetRelaxOrder(aff_solver[lev], 1);
-        //hypre_BoomerAMGSetAggNumLevels(aff_solver[lev], 1);
-        hypre_BoomerAMGSetNumSweeps(aff_solver[lev], 3);
-        hypre_BoomerAMGSetPrintLevel(aff_solver[lev], mgr_data -> frelax_print_level);
-        hypre_BoomerAMGSetNumFunctions(aff_solver[lev], 1);
-
-        fine_grid_solver_setup(aff_solver[lev], A_ff_ptr, F_fine_array[lev+1], U_fine_array[lev+1]);
-
-        (mgr_data -> use_default_fsolver) = 1;
-        use_default_fsolver = (mgr_data -> use_default_fsolver);
-      }
-
-    }
-
-    /* Update coarse level indexes for next levels */
-    if (lev < num_coarsening_levs - 1)
-    {
-      for(i=lev+1; i<max_num_coarse_levels; i++)
-      {
-        // first mark indexes to be updated
-        for(j=0; j<level_coarse_size[i]; j++)
-        {
-          CF_marker[level_coarse_indexes[i][j]] = S_CMRK;
-        }
-
-        // next: loop over levels to update indexes
-        nc = 0;
-        index_i = 0;
-        for(j=0; j<nloc; j++)
-        {
-          if(CF_marker[j] == CMRK) nc++;
-          if(CF_marker[j] == S_CMRK)
-          {
-            level_coarse_indexes[i][index_i++] = nc++;
-          }
-          //if(index_i == level_coarse_size[i]) break;
-        }
-        hypre_assert(index_i == level_coarse_size[i]);
-
-        // then: reset previously marked indexes
-        for(j=0; j<level_coarse_size[lev]; j++)
-        {
-          CF_marker[level_coarse_indexes[lev][j]] = CMRK;
-        }
-      }
-    }
-    // update reserved coarse indexes to be kept to coarsest level
-    // first mark indexes to be updated
-    // skip if we reduce the reserved C-points before the coarse grid solve
-    if (mgr_data -> lvl_to_keep_cpoints == 0)
-    {
-      for(i=0; i<reserved_coarse_size; i++)
-      {
-        CF_marker[reserved_Cpoint_local_indexes[i]] = S_CMRK;
-      }
-      // loop to update reserved Cpoints
-      nc = 0;
-      index_i = 0;
-      for(i=0; i<nloc; i++)
-      {
-        if(CF_marker[i] == CMRK) nc++;
-        if(CF_marker[i] == S_CMRK)
-        {
-          reserved_Cpoint_local_indexes[index_i++] = nc++;
-          // reset modified CF marker array indexes
-          CF_marker[i] = CMRK;
-        }
-      }
-    }
-
-    /* allocate space for solution and rhs arrays */
-    F_array[lev+1] =
-      hypre_ParVectorCreate(hypre_ParCSRMatrixComm(RAP_ptr),
-                            hypre_ParCSRMatrixGlobalNumRows(RAP_ptr),
-                            hypre_ParCSRMatrixRowStarts(RAP_ptr));
-    hypre_ParVectorInitialize(F_array[lev+1]);
-
-    U_array[lev+1] =
-      hypre_ParVectorCreate(hypre_ParCSRMatrixComm(RAP_ptr),
-                            hypre_ParCSRMatrixGlobalNumRows(RAP_ptr),
-                            hypre_ParCSRMatrixRowStarts(RAP_ptr));
-    hypre_ParVectorInitialize(U_array[lev+1]);
-
-    /* free memory before starting next level */
-    hypre_ParCSRMatrixDestroy(S);
-    S = NULL;
-
-    if (!use_air)
-    {
-    hypre_ParCSRMatrixDestroy(AT);
-      AT = NULL;
-    }
-    hypre_ParCSRMatrixDestroy(ST);
-    ST = NULL;
-
-    /* check if Vcycle smoother setup required */
-    if((mgr_data -> max_local_lvls) > 1)
-    {
-      if(Frelax_method[lev] == 1)
-      {
-        use_VcycleSmoother = 1;
-      }
-    }
-    else
-    {
-      /* Only check for vcycle smoother option.
-      * Currently leaves Frelax_method[lev] = 99 (full amg) option as is
-      */
-      if(Frelax_method[lev] == 1)
-      {
-        Frelax_method[lev] = 0;
-      }
-    }
-
-    /* check if last level */
-    if(last_level) break;
-  }
-
-  /* set pointer to last level matrix */
-  num_c_levels = lev+1;
-  (mgr_data->num_coarse_levels) = num_c_levels;
-  (mgr_data->RAP) = RAP_ptr;
-
-  /* setup default coarse grid solver */
-  /* default is BoomerAMG */
-  if(use_default_cgrid_solver)
-  {
-    if (my_id == 0 && print_level > 0)
-      hypre_printf("No coarse grid solver provided. Using default AMG solver ... \n");
-
-    /* create and set default solver parameters here */
-    default_cg_solver = (HYPRE_Solver) hypre_BoomerAMGCreate();
-    hypre_BoomerAMGSetMaxIter ( default_cg_solver, 1 );
-    hypre_BoomerAMGSetTol ( default_cg_solver, 0.0 );
-    hypre_BoomerAMGSetRelaxOrder( default_cg_solver, 1);
-    hypre_BoomerAMGSetPrintLevel(default_cg_solver, mgr_data -> cg_print_level);
-    /* set setup and solve functions */
-    coarse_grid_solver_setup =  (HYPRE_Int (*)(void*, void*, void*, void*)) hypre_BoomerAMGSetup;
-    coarse_grid_solver_solve =  (HYPRE_Int (*)(void*, void*, void*, void*)) hypre_BoomerAMGSolve;
-    (mgr_data -> coarse_grid_solver_setup) =   coarse_grid_solver_setup;
-    (mgr_data -> coarse_grid_solver_solve) =   coarse_grid_solver_solve;
-    (mgr_data -> coarse_grid_solver) = default_cg_solver;
-  }
-  // keep reserved coarse indexes to coarsest grid
-  if(reserved_coarse_size > 0 && lvl_to_keep_cpoints == 0)
-  {
-    ilower = hypre_ParCSRMatrixFirstRowIndex(RAP_ptr);
-    for (i = 0; i < reserved_coarse_size; i++)
-    {
-      reserved_coarse_indexes[i] = (HYPRE_BigInt) (reserved_Cpoint_local_indexes[i] + ilower);
-    }
-    HYPRE_BoomerAMGSetCPoints((mgr_data ->coarse_grid_solver), 25, reserved_coarse_size, reserved_coarse_indexes);
-  }
-
-  /* setup coarse grid solver */
-  //wall_time = time_getWallclockSeconds();
-  coarse_grid_solver_setup((mgr_data -> coarse_grid_solver), RAP_ptr, F_array[num_c_levels], U_array[num_c_levels]);
-  //hypre_ParCSRMatrixPrintIJ(RAP_ptr,1,1,"RAP");
-  //wall_time = time_getWallclockSeconds() - wall_time;
-  //hypre_printf("Proc = %d   Coarse grid setup: %f\n", my_id, wall_time);
-
-  /* Setup smoother for fine grid */
-   if ( relax_type == 8 || relax_type == 13 || relax_type == 14 || relax_type == 18 )
-   {
-      l1_norms = hypre_CTAlloc(hypre_Vector*, num_c_levels, HYPRE_MEMORY_HOST);
-      (mgr_data -> l1_norms) = l1_norms;
+         reserved_coarse_indexes[i] = (HYPRE_BigInt) (reserved_Cpoint_local_indexes[i] + ilower);
+      }
+      HYPRE_BoomerAMGSetCPoints((mgr_data ->coarse_grid_solver),
+                                25, reserved_coarse_size,
+                                reserved_coarse_indexes);
    }
 
+   /* Setup coarse grid solver */
+   hypre_sprintf(region_name, "%s-%d", "MGR_Level", num_c_levels);
+   hypre_GpuProfilingPushRange(region_name);
+   HYPRE_ANNOTATE_REGION_BEGIN("%s", region_name);
+
+   cgrid_solver_setup((mgr_data -> coarse_grid_solver),
+                      A_array[num_c_levels],
+                      F_array[num_c_levels],
+                      U_array[num_c_levels]);
+
+   hypre_GpuProfilingPopRange();
+   HYPRE_ANNOTATE_REGION_END("%s", region_name);
+
+   /* Allocate l1_norms when necessary
+      TODO (VPM): move this block closer to global smoother setup */
    for (j = 0; j < num_c_levels; j++)
    {
-      HYPRE_Real *l1_norm_data = NULL;
-      CF_marker = hypre_IntArrayData(CF_marker_array[j]);
-
-      if (relax_type == 8 || relax_type == 13 || relax_type == 14)
+      if (!l1_norms[j])
       {
-         if (relax_order)
-         {
-            hypre_ParCSRComputeL1Norms(A_array[j], 4, CF_marker, &l1_norm_data);
-         }
-         else
+         /* Compute l1_norms according to relaxation type */
+         hypre_BoomerAMGRelaxComputeL1Norms(A_array[j], Frelax_type[j],
+                                            relax_order, 0, CF_marker_array[j],
+                                            &l1_norms_data);
+         if (l1_norms_data)
          {
-            hypre_ParCSRComputeL1Norms(A_array[j], 4, NULL, &l1_norm_data);
+            l1_norms[j] = hypre_SeqVectorCreate(hypre_ParCSRMatrixNumRows(A_array[j]));
+            hypre_VectorData(l1_norms[j]) = l1_norms_data;
+            hypre_VectorMemoryLocation(l1_norms[j]) = memory_location;
          }
       }
-      else if (relax_type == 18)
+   }
+
+   /* Setup Vcycle data for Frelax_type == 1 */
+   if (use_VcycleSmoother)
+   {
+      /* allocate memory and set pointer to (mgr_data -> FrelaxVcycleData) */
+      FrelaxVcycleData = hypre_TAlloc(hypre_ParAMGData*, max_num_coarse_levels,
+                                      HYPRE_MEMORY_HOST);
+      (mgr_data -> FrelaxVcycleData) = FrelaxVcycleData;
+
+      /* Setup temporary storage - TODO (VPM): Use hypre_ParVectorInitialize_v2 */
+      VcycleRelaxVtemp = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A),
+                                               hypre_ParCSRMatrixGlobalNumRows(A),
+                                               hypre_ParCSRMatrixRowStarts(A));
+      hypre_ParVectorInitialize(VcycleRelaxVtemp);
+      (mgr_data ->VcycleRelaxVtemp) = VcycleRelaxVtemp;
+
+      VcycleRelaxZtemp = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A),
+                                               hypre_ParCSRMatrixGlobalNumRows(A),
+                                               hypre_ParCSRMatrixRowStarts(A));
+      hypre_ParVectorInitialize(VcycleRelaxZtemp);
+      (mgr_data -> VcycleRelaxZtemp) = VcycleRelaxZtemp;
+
+      /* loop over levels */
+      for (i = 0; i < (mgr_data->num_coarse_levels); i++)
       {
-         if (relax_order)
+         if (Frelax_type[i] == 1)
          {
-            hypre_ParCSRComputeL1Norms(A_array[j], 1, CF_marker, &l1_norm_data);
+            FrelaxVcycleData[i] = (hypre_ParAMGData*) hypre_MGRCreateFrelaxVcycleData();
+            if (Frelax_num_functions != NULL)
+            {
+               hypre_ParAMGDataNumFunctions(FrelaxVcycleData[i]) = Frelax_num_functions[i];
+            }
+            (FrelaxVcycleData[i] -> Vtemp) = VcycleRelaxVtemp;
+            (FrelaxVcycleData[i] -> Ztemp) = VcycleRelaxZtemp;
+
+            /* Setup variables for the V-cycle in the F-relaxation step */
+            hypre_MGRSetupFrelaxVcycleData(mgr_data, A_array[i], F_array[i], U_array[i], i);
          }
-         else
+      }
+   }
+   else if (use_GSElimSmoother)
+   {
+      /* Allocate memory and set pointer to (mgr_data -> GSElimData) */
+      GSElimData = hypre_CTAlloc(hypre_ParAMGData*, max_num_coarse_levels,
+                                 HYPRE_MEMORY_HOST);
+      (mgr_data -> GSElimData) = GSElimData;
+
+      /* loop over levels */
+      for (i = 0; i < (mgr_data->num_coarse_levels); i++)
+      {
+         if (Frelax_type[i] == 9 || Frelax_type[i] == 99 || Frelax_type[i] == 199)
          {
-            hypre_ParCSRComputeL1Norms(A_array[j], 1, NULL, &l1_norm_data);
+            GSElimData[i] = (hypre_ParAMGData*) hypre_MGRCreateGSElimData();
+
+            // Set pointers to GSElimData. Here, all solvers point to the same array for
+            // A_ff_array, F_fine_array, and U_fine_array and will act on the appropriate
+            // components during setup and solve. We adjust {F/U}_fine_array to start at index 1
+            // by definition of {F/U}_fine_array.
+            (GSElimData[i] -> A_array) = A_ff_array;
+            (GSElimData[i] -> F_array) = &F_fine_array[1];
+            (GSElimData[i] -> U_array) = &U_fine_array[1];
+
+            /* Save current error code to a temporary variable */
+            hypre_error_code_save();
+
+            // setup Gaussian Elim. in the F-relaxation step. Here, we apply GSElim at level 0
+            // since we have a single matrix (and not an array of matrices).
+            // hypre_printf("Setting GSElim Solver %d \n", Frelax_type[i]);
+            hypre_GaussElimSetup(GSElimData[i], i, Frelax_type[i]);
+
+            /* Fallback to Jacobi when Gaussian Elim. is not successful */
+            if (HYPRE_GetGlobalError(hypre_ParCSRMatrixComm(A_array[i])))
+            {
+               hypre_MGRDestroyGSElimData((mgr_data -> GSElimData)[i]);
+               (mgr_data -> GSElimData)[i] = NULL;
+
+               Frelax_type[i] = 7; /* Jacobi */
+               if (print_level)
+               {
+                  hypre_ParPrintf(comm, "Switching F-relaxation at level %d to Jacobi", i);
+               }
+
+               /* Compute l1_norms if needed */
+               if (!l1_norms[i])
+               {
+                  hypre_BoomerAMGRelaxComputeL1Norms(A_array[i], Frelax_type[i], 0, 0, NULL,
+                                                     &l1_norms_data);
+                  if (l1_norms_data)
+                  {
+                     l1_norms[i] = hypre_SeqVectorCreate(hypre_ParCSRMatrixNumRows(A_array[i]));
+                     hypre_VectorData(l1_norms[i]) = l1_norms_data;
+                     hypre_VectorMemoryLocation(l1_norms[i]) = memory_location;
+                  }
+               }
+            }
+
+            /* Restore error code prior to GaussElimSetup call */
+            hypre_error_code_restore();
          }
       }
+   }
+
+   if (logging > 1)
+   {
+      residual = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A_array[0]),
+                                       hypre_ParCSRMatrixGlobalNumRows(A_array[0]),
+                                       hypre_ParCSRMatrixRowStarts(A_array[0]) );
+      hypre_ParVectorInitialize(residual);
+      (mgr_data -> residual) = residual;
+   }
+   else
+   {
+      (mgr_data -> residual) = NULL;
+   }
+   rel_res_norms = hypre_CTAlloc(HYPRE_Real, (mgr_data -> max_iter), HYPRE_MEMORY_HOST);
+   (mgr_data -> rel_res_norms) = rel_res_norms;
 
-      if (l1_norm_data)
+   /* Free level_coarse_indexes data */
+   if (level_coarse_indexes != NULL)
+   {
+      for (i = 0; i < max_num_coarse_levels; i++)
       {
-         l1_norms[j] = hypre_SeqVectorCreate(hypre_ParCSRMatrixNumRows(A_array[j]));
-         hypre_VectorData(l1_norms[j]) = l1_norm_data;
-         hypre_SeqVectorInitialize_v2(l1_norms[j], hypre_ParCSRMatrixMemoryLocation(A_array[j]));
+         hypre_TFree(level_coarse_indexes[i], HYPRE_MEMORY_HOST);
       }
+      hypre_TFree(level_coarse_indexes, HYPRE_MEMORY_HOST);
+      (mgr_data -> level_coarse_indexes) = NULL;
+
+      hypre_TFree(level_coarse_size, HYPRE_MEMORY_HOST);
+      (mgr_data -> num_coarse_per_level) = NULL;
    }
 
-   /* Setup Vcycle data for Frelax_method > 0 */
-  if(use_VcycleSmoother)
-  {
-    /* setup temporary storage */
-    VcycleRelaxVtemp = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A),
-                hypre_ParCSRMatrixGlobalNumRows(A),
-                hypre_ParCSRMatrixRowStarts(A));
-    hypre_ParVectorInitialize(VcycleRelaxVtemp);
-    (mgr_data ->VcycleRelaxVtemp) = VcycleRelaxVtemp;
+   /* Print statistics */
+   hypre_MGRSetupStats(mgr_vdata);
 
-    VcycleRelaxZtemp = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A),
-                hypre_ParCSRMatrixGlobalNumRows(A),
-                hypre_ParCSRMatrixRowStarts(A));
-    hypre_ParVectorInitialize(VcycleRelaxZtemp);
-    (mgr_data -> VcycleRelaxZtemp) = VcycleRelaxZtemp;
-      /* allocate memory and set pointer to (mgr_data -> FrelaxVcycleData) */
-         FrelaxVcycleData = hypre_CTAlloc(hypre_ParAMGData*,  max_num_coarse_levels, HYPRE_MEMORY_HOST);
-      (mgr_data -> FrelaxVcycleData) = FrelaxVcycleData;
+   /* Print MGR and linear system info according to print level */
+   hypre_MGRDataPrint(mgr_vdata);
 
-    /* loop over levels */
-    for(i=0; i<(mgr_data->num_coarse_levels); i++)
-    {
-      if (Frelax_method[i] == 1)
-      {
-        FrelaxVcycleData[i] = (hypre_ParAMGData*) hypre_MGRCreateFrelaxVcycleData();
-        if (Frelax_num_functions != NULL)
-        {
-          hypre_ParAMGDataNumFunctions(FrelaxVcycleData[i]) = Frelax_num_functions[i];
-        }
-        (FrelaxVcycleData[i] -> Vtemp) = VcycleRelaxVtemp;
-        (FrelaxVcycleData[i] -> Ztemp) = VcycleRelaxZtemp;
-
-        // setup variables for the V-cycle in the F-relaxation step //
-        hypre_MGRSetupFrelaxVcycleData(mgr_data, A_array[i], F_array[i], U_array[i], i);
-      }
-    }
-  }
-
-  if ( logging > 1 )
-  {
-    residual = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A_array[0]),
-                              hypre_ParCSRMatrixGlobalNumRows(A_array[0]),
-                              hypre_ParCSRMatrixRowStarts(A_array[0]) );
-      hypre_ParVectorInitialize(residual);
-      (mgr_data -> residual) = residual;
-  }
-  else
-  {
-    (mgr_data -> residual) = NULL;
-  }
-  rel_res_norms = hypre_CTAlloc(HYPRE_Real, (mgr_data -> max_iter), HYPRE_MEMORY_HOST);
-  (mgr_data -> rel_res_norms) = rel_res_norms;
-
-  /* free level_coarse_indexes data */
-  if ( level_coarse_indexes != NULL)
-  {
-    for(i=0; i<max_num_coarse_levels; i++)
-    {
-      hypre_TFree(level_coarse_indexes[i], HYPRE_MEMORY_HOST);
-    }
-    hypre_TFree( level_coarse_indexes, HYPRE_MEMORY_HOST);
-    level_coarse_indexes = NULL;
-    hypre_TFree(level_coarse_size, HYPRE_MEMORY_HOST);
-    level_coarse_size = NULL;
-  }
-  hypre_TFree(coarse_pnts_global, HYPRE_MEMORY_HOST);
-
-  HYPRE_ANNOTATE_FUNC_END;
-
-  return hypre_error_flag;
+   hypre_MemoryPrintUsage(comm, hypre_HandleLogLevel(hypre_handle()), "MGR setup end", 0);
+   hypre_GpuProfilingPopRange();
+   HYPRE_ANNOTATE_FUNC_END;
+
+   return hypre_error_flag;
 }
 
-/* Setup data for Frelax V-cycle */
+/*--------------------------------------------------------------------------
+ * hypre_MGRSetupFrelaxVcycleData
+ *
+ * Setup data for Frelax V-cycle
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_MGRSetupFrelaxVcycleData( void *mgr_vdata,
-                  hypre_ParCSRMatrix *A,
-                  hypre_ParVector    *f,
-                  hypre_ParVector    *u,
-                  HYPRE_Int      lev )
+hypre_MGRSetupFrelaxVcycleData( void               *mgr_vdata,
+                                hypre_ParCSRMatrix *A,
+                                hypre_ParVector    *f,
+                                hypre_ParVector    *u,
+                                HYPRE_Int           lev )
 {
-  MPI_Comm           comm = hypre_ParCSRMatrixComm(A);
-  hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
-  hypre_ParAMGData    **FrelaxVcycleData = mgr_data -> FrelaxVcycleData;
-
-  HYPRE_Int i, j, num_procs, my_id;
-
-  HYPRE_Int max_local_lvls = (mgr_data -> max_local_lvls);
-  HYPRE_Int lev_local;
-  HYPRE_Int not_finished;
-  HYPRE_Int max_local_coarse_size = hypre_ParAMGDataMaxCoarseSize(FrelaxVcycleData[lev]);
-  hypre_IntArray       **CF_marker_array = (mgr_data -> CF_marker_array);
-  HYPRE_Int local_size;
-  HYPRE_BigInt coarse_size;
-
-  HYPRE_BigInt    *coarse_pnts_global_lvl = NULL;
-  hypre_IntArray  *coarse_dof_func_lvl    = NULL;
-  hypre_IntArray  *dof_func               = NULL;
-  HYPRE_Int       *dof_func_data          = NULL;
-
-  hypre_ParCSRMatrix *RAP_local = NULL;
-  hypre_ParCSRMatrix *P_local = NULL;
-  hypre_ParCSRMatrix *S_local = NULL;
-
-  HYPRE_Int     smrk_local = -1;
-  HYPRE_Int       P_max_elmts = 4;
-  HYPRE_Real      trunc_factor = 0.0;
-  HYPRE_Int       debug_flag = 0;
-  HYPRE_Int       measure_type = 0;
-  HYPRE_Real      strong_threshold = 0.25;
-  HYPRE_Real      max_row_sum = 0.9;
-
-  HYPRE_Int       old_num_levels = hypre_ParAMGDataNumLevels(FrelaxVcycleData[lev]);
-  hypre_IntArray       **CF_marker_array_local = (FrelaxVcycleData[lev] -> CF_marker_array);
-  HYPRE_Int            *CF_marker_local = NULL;
-  hypre_ParCSRMatrix   **A_array_local = (FrelaxVcycleData[lev] -> A_array);
-  hypre_ParCSRMatrix   **P_array_local = (FrelaxVcycleData[lev] -> P_array);
-  hypre_ParVector      **F_array_local = (FrelaxVcycleData[lev] -> F_array);
-  hypre_ParVector      **U_array_local = (FrelaxVcycleData[lev] -> U_array);
-  hypre_IntArray       **dof_func_array = (FrelaxVcycleData[lev] -> dof_func_array);
-  HYPRE_Int            relax_type = 3;
-  HYPRE_Int            indx, k, tms;
-  HYPRE_Int            num_fine_points = 0;
-  HYPRE_Int            num_functions = hypre_ParAMGDataNumFunctions(FrelaxVcycleData[lev]);
-  HYPRE_Int            relax_order = hypre_ParAMGDataRelaxOrder(FrelaxVcycleData[lev]);
-
-  hypre_MPI_Comm_size(comm, &num_procs);
-  hypre_MPI_Comm_rank(comm,&my_id);
-
-
-  local_size = hypre_CSRMatrixNumRows(hypre_ParCSRMatrixDiag(A));
-
-  /* Free any local data not previously destroyed */
-  if (A_array_local || P_array_local || CF_marker_array_local)
-  {
-    for (j = 1; j < old_num_levels; j++)
-    {
-      if (A_array_local[j])
-      {
-        hypre_ParCSRMatrixDestroy(A_array_local[j]);
-        A_array_local[j] = NULL;
-      }
-    }
-
-    for (j = 0; j < old_num_levels-1; j++)
-    {
-      if (P_array_local[j])
-      {
-        hypre_ParCSRMatrixDestroy(P_array_local[j]);
-        P_array_local[j] = NULL;
-      }
-    }
-
-    for (j = 0; j < old_num_levels-1; j++)
-    {
-      if (CF_marker_array_local[j])
-      {
-        hypre_IntArrayDestroy(CF_marker_array_local[j]);
-        CF_marker_array_local[j] = NULL;
-      }
-    }
-    hypre_TFree(A_array_local, HYPRE_MEMORY_HOST);
-    A_array_local = NULL;
-    hypre_TFree(P_array_local, HYPRE_MEMORY_HOST);
-    P_array_local = NULL;
-    hypre_TFree(CF_marker_array_local, HYPRE_MEMORY_HOST);
-    CF_marker_array_local = NULL;
-  }
-  /* free solution arrays not previously destroyed */
-  if (F_array_local != NULL || U_array_local != NULL)
-  {
-    for (j = 1; j < old_num_levels; j++)
-    {
-      if (F_array_local[j] != NULL)
-      {
-        hypre_ParVectorDestroy(F_array_local[j]);
-        F_array_local[j] = NULL;
-      }
-      if (U_array_local[j] != NULL)
-      {
-        hypre_ParVectorDestroy(U_array_local[j]);
-        U_array_local[j] = NULL;
-      }
-    }
-    hypre_TFree(F_array_local, HYPRE_MEMORY_HOST);
-    F_array_local = NULL;
-    hypre_TFree(U_array_local, HYPRE_MEMORY_HOST);
-    U_array_local = NULL;
-  }
-
-  /* Initialize some variables and allocate memory */
-  not_finished = 1;
-  lev_local = 0;
-  if(A_array_local == NULL)
-     A_array_local = hypre_CTAlloc(hypre_ParCSRMatrix*,  max_local_lvls, HYPRE_MEMORY_HOST);
-  if(P_array_local == NULL && max_local_lvls > 1)
-    P_array_local = hypre_CTAlloc(hypre_ParCSRMatrix*,  max_local_lvls-1, HYPRE_MEMORY_HOST);
-  if(F_array_local == NULL)
-    F_array_local = hypre_CTAlloc(hypre_ParVector*,  max_local_lvls, HYPRE_MEMORY_HOST);
-  if(U_array_local == NULL)
-    U_array_local = hypre_CTAlloc(hypre_ParVector*,  max_local_lvls, HYPRE_MEMORY_HOST);
-  if(CF_marker_array_local == NULL)
-    CF_marker_array_local = hypre_CTAlloc(hypre_IntArray*,  max_local_lvls, HYPRE_MEMORY_HOST);
-  if(dof_func_array == NULL)
-    dof_func_array = hypre_CTAlloc(hypre_IntArray*, max_local_lvls, HYPRE_MEMORY_HOST);
-
-  A_array_local[0] = A;
-  F_array_local[0] = f;
-  U_array_local[0] = u;
-
-  for (i = 0; i < local_size; i++)
-  {
-    if (hypre_IntArrayData(CF_marker_array[lev])[i] == smrk_local)
-      num_fine_points++;
-  }
-  //hypre_printf("My_ID = %d, Size of A_FF matrix: %d \n", my_id, num_fine_points);
-
-  if (num_functions > 1 && dof_func == NULL)
-  {
-    dof_func = hypre_IntArrayCreate(num_fine_points);
-    hypre_IntArrayInitialize(dof_func);
-    indx = 0;
-    tms = num_fine_points/num_functions;
-    if (tms*num_functions+indx > num_fine_points) tms--;
-    for (j=0; j < tms; j++)
-    {
-      for (k=0; k < num_functions; k++)
-        hypre_IntArrayData(dof_func)[indx++] = k;
-    }
-    k = 0;
-    while (indx < num_fine_points)
-      hypre_IntArrayData(dof_func)[indx++] = k++;
-    FrelaxVcycleData[lev] -> dof_func = dof_func;
-  }
-  dof_func_array[0] = dof_func;
-  hypre_ParAMGDataDofFuncArray(FrelaxVcycleData[lev]) = dof_func_array;
-
-  while (not_finished)
-  {
-    local_size = hypre_CSRMatrixNumRows(hypre_ParCSRMatrixDiag(A_array_local[lev_local]));
-    dof_func_data = NULL;
-    if (dof_func_array[lev_local])
-    {
-       dof_func_data = hypre_IntArrayData(dof_func_array[lev_local]);
-    }
-
-    if (lev_local == 0)
-    {
-      /* use the CF_marker from the outer MGR cycle to create the strength connection matrix */
-      hypre_BoomerAMGCreateSFromCFMarker(A_array_local[lev_local], strong_threshold, max_row_sum, hypre_IntArrayData(CF_marker_array[lev]),
-                           num_functions, dof_func_data, smrk_local, &S_local);
-      //hypre_ParCSRMatrixPrintIJ(S_local,0,0,"S_mat");
-    }
-    else if (lev_local > 0)
-    {
-      hypre_BoomerAMGCreateS(A_array_local[lev_local], strong_threshold, max_row_sum, num_functions,
-                   dof_func_data, &S_local);
-    }
-
-    CF_marker_array_local[lev_local] = hypre_IntArrayCreate(local_size);
-    hypre_IntArrayInitialize(CF_marker_array_local[lev_local]);
-    CF_marker_local = hypre_IntArrayData(CF_marker_array_local[lev_local]);
-
-    HYPRE_Int coarsen_cut_factor = 0;
-    hypre_BoomerAMGCoarsenHMIS(S_local, A_array_local[lev_local], measure_type, coarsen_cut_factor, debug_flag, &(CF_marker_array_local[lev_local]));
-
-
-    hypre_BoomerAMGCoarseParms(comm, local_size,
-                        num_functions, dof_func_array[lev_local], CF_marker_array_local[lev_local],
-                        &coarse_dof_func_lvl, &coarse_pnts_global_lvl);
-
-    if (my_id == (num_procs -1)) coarse_size = coarse_pnts_global_lvl[1];
-      hypre_MPI_Bcast(&coarse_size, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
-    //hypre_printf("Coarse size = %d \n", coarse_size);
-    if (coarse_size == 0) // stop coarsening
-    {
-      if (S_local) hypre_ParCSRMatrixDestroy(S_local);
-      hypre_IntArrayDestroy(coarse_dof_func_lvl);
+   MPI_Comm           comm = hypre_ParCSRMatrixComm(A);
+   hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
+   hypre_ParAMGData    **FrelaxVcycleData = mgr_data -> FrelaxVcycleData;
+   HYPRE_MemoryLocation memory_location = hypre_ParCSRMatrixMemoryLocation(A);
+
+   HYPRE_Int i, j, num_procs, my_id;
+
+   HYPRE_Int max_local_lvls = (mgr_data -> max_local_lvls);
+   HYPRE_Int lev_local;
+   HYPRE_Int not_finished;
+   HYPRE_Int max_local_coarse_size = hypre_ParAMGDataMaxCoarseSize(FrelaxVcycleData[lev]);
+   hypre_IntArray       **CF_marker_array = (mgr_data -> CF_marker_array);
+   HYPRE_Int local_size;
+   HYPRE_BigInt coarse_size;
+
+   HYPRE_BigInt     coarse_pnts_global_lvl[2];
+   hypre_IntArray  *coarse_dof_func_lvl    = NULL;
+   hypre_IntArray  *dof_func               = NULL;
+   HYPRE_Int       *dof_func_data          = NULL;
+
+   hypre_ParCSRMatrix *RAP_local = NULL;
+   hypre_ParCSRMatrix *P_local = NULL;
+   hypre_ParCSRMatrix *S_local = NULL;
+
+   HYPRE_Int     smrk_local = -1;
+   HYPRE_Int       P_max_elmts = 4;
+   HYPRE_Real      trunc_factor = 0.0;
+   HYPRE_Int       debug_flag = 0;
+   HYPRE_Int       measure_type = 0;
+   HYPRE_Real      strong_threshold = 0.25;
+   HYPRE_Real      max_row_sum = 0.9;
+   HYPRE_Int       coarsen_cut_factor = 0;
+
+   HYPRE_Int       old_num_levels = hypre_ParAMGDataNumLevels(FrelaxVcycleData[lev]);
+   hypre_IntArray       **CF_marker_array_local = (FrelaxVcycleData[lev] -> CF_marker_array);
+   HYPRE_Int            *CF_marker_local = NULL;
+   hypre_ParCSRMatrix   **A_array_local = (FrelaxVcycleData[lev] -> A_array);
+   hypre_ParCSRMatrix   **P_array_local = (FrelaxVcycleData[lev] -> P_array);
+   hypre_ParVector      **F_array_local = (FrelaxVcycleData[lev] -> F_array);
+   hypre_ParVector      **U_array_local = (FrelaxVcycleData[lev] -> U_array);
+   hypre_IntArray       **dof_func_array = (FrelaxVcycleData[lev] -> dof_func_array);
+   HYPRE_Int            relax_type = 3;
+   HYPRE_Int            indx, k, tms;
+   HYPRE_Int            num_fine_points = 0;
+   HYPRE_Int            num_functions = hypre_ParAMGDataNumFunctions(FrelaxVcycleData[lev]);
+   HYPRE_Int            relax_order = hypre_ParAMGDataRelaxOrder(FrelaxVcycleData[lev]);
+
+   hypre_MPI_Comm_size(comm, &num_procs);
+   hypre_MPI_Comm_rank(comm, &my_id);
+
+   local_size = hypre_ParCSRMatrixNumRows(A);
+
+   /* Free any local data not previously destroyed */
+   if (A_array_local || P_array_local || CF_marker_array_local)
+   {
+      for (j = 1; j < old_num_levels; j++)
+      {
+         if (A_array_local[j])
+         {
+            hypre_ParCSRMatrixDestroy(A_array_local[j]);
+            A_array_local[j] = NULL;
+         }
+      }
+
+      for (j = 0; j < old_num_levels - 1; j++)
+      {
+         if (P_array_local[j])
+         {
+            hypre_ParCSRMatrixDestroy(P_array_local[j]);
+            P_array_local[j] = NULL;
+         }
+      }
+
+      for (j = 0; j < old_num_levels - 1; j++)
+      {
+         if (CF_marker_array_local[j])
+         {
+            hypre_IntArrayDestroy(CF_marker_array_local[j]);
+            CF_marker_array_local[j] = NULL;
+         }
+      }
+      hypre_TFree(A_array_local, HYPRE_MEMORY_HOST);
+      A_array_local = NULL;
+      hypre_TFree(P_array_local, HYPRE_MEMORY_HOST);
+      P_array_local = NULL;
+      hypre_TFree(CF_marker_array_local, HYPRE_MEMORY_HOST);
+      CF_marker_array_local = NULL;
+   }
+   /* free solution arrays not previously destroyed */
+   if (F_array_local != NULL || U_array_local != NULL)
+   {
+      for (j = 1; j < old_num_levels; j++)
+      {
+         if (F_array_local[j] != NULL)
+         {
+            hypre_ParVectorDestroy(F_array_local[j]);
+            F_array_local[j] = NULL;
+         }
+         if (U_array_local[j] != NULL)
+         {
+            hypre_ParVectorDestroy(U_array_local[j]);
+            U_array_local[j] = NULL;
+         }
+      }
+      hypre_TFree(F_array_local, HYPRE_MEMORY_HOST);
+      F_array_local = NULL;
+      hypre_TFree(U_array_local, HYPRE_MEMORY_HOST);
+      U_array_local = NULL;
+   }
+
+   /* Initialize some variables and allocate memory */
+   not_finished = 1;
+   lev_local = 0;
+   if (A_array_local == NULL)
+   {
+      A_array_local = hypre_CTAlloc(hypre_ParCSRMatrix*,  max_local_lvls, HYPRE_MEMORY_HOST);
+   }
+   if (P_array_local == NULL && max_local_lvls > 1)
+   {
+      P_array_local = hypre_CTAlloc(hypre_ParCSRMatrix*,  max_local_lvls - 1, HYPRE_MEMORY_HOST);
+   }
+   if (F_array_local == NULL)
+   {
+      F_array_local = hypre_CTAlloc(hypre_ParVector*,  max_local_lvls, HYPRE_MEMORY_HOST);
+   }
+   if (U_array_local == NULL)
+   {
+      U_array_local = hypre_CTAlloc(hypre_ParVector*,  max_local_lvls, HYPRE_MEMORY_HOST);
+   }
+   if (CF_marker_array_local == NULL)
+   {
+      CF_marker_array_local = hypre_CTAlloc(hypre_IntArray*,  max_local_lvls, HYPRE_MEMORY_HOST);
+   }
+   if (dof_func_array == NULL)
+   {
+      dof_func_array = hypre_CTAlloc(hypre_IntArray*, max_local_lvls, HYPRE_MEMORY_HOST);
+   }
+
+   A_array_local[0] = A;
+   F_array_local[0] = f;
+   U_array_local[0] = u;
+
+   for (i = 0; i < local_size; i++)
+   {
+      if (hypre_IntArrayData(CF_marker_array[lev])[i] == smrk_local)
+      {
+         num_fine_points++;
+      }
+   }
+   //hypre_printf("My_ID = %d, Size of A_FF matrix: %d \n", my_id, num_fine_points);
+
+   if (num_functions > 1 && dof_func == NULL)
+   {
+      dof_func = hypre_IntArrayCreate(num_fine_points);
+      hypre_IntArrayInitialize(dof_func);
+      indx = 0;
+      tms = num_fine_points / num_functions;
+      if (tms * num_functions + indx > num_fine_points) { tms--; }
+      for (j = 0; j < tms; j++)
+      {
+         for (k = 0; k < num_functions; k++)
+         {
+            hypre_IntArrayData(dof_func)[indx++] = k;
+         }
+      }
+      k = 0;
+      while (indx < num_fine_points)
+      {
+         hypre_IntArrayData(dof_func)[indx++] = k++;
+      }
+      FrelaxVcycleData[lev] -> dof_func = dof_func;
+   }
+   dof_func_array[0] = dof_func;
+   hypre_ParAMGDataDofFuncArray(FrelaxVcycleData[lev]) = dof_func_array;
+
+   while (not_finished)
+   {
+      local_size = hypre_ParCSRMatrixNumRows(A_array_local[lev_local]);
+      dof_func_data = NULL;
+      if (dof_func_array[lev_local])
+      {
+         dof_func_data = hypre_IntArrayData(dof_func_array[lev_local]);
+      }
+
+      if (lev_local == 0)
+      {
+         /* use the CF_marker from the outer MGR cycle
+            to create the strength connection matrix */
+         hypre_BoomerAMGCreateSFromCFMarker(A_array_local[lev_local],
+                                            strong_threshold,
+                                            max_row_sum,
+                                            hypre_IntArrayData(CF_marker_array[lev]),
+                                            num_functions, dof_func_data,
+                                            smrk_local, &S_local);
+      }
+      else if (lev_local > 0)
+      {
+         hypre_BoomerAMGCreateS(A_array_local[lev_local], strong_threshold,
+                                max_row_sum, num_functions,
+                                dof_func_data, &S_local);
+      }
+
+      CF_marker_array_local[lev_local] = hypre_IntArrayCreate(local_size);
+      hypre_IntArrayInitialize_v2(CF_marker_array_local[lev_local], memory_location);
+      CF_marker_local = hypre_IntArrayData(CF_marker_array_local[lev_local]);
+
+      hypre_BoomerAMGCoarsenHMIS(S_local, A_array_local[lev_local], measure_type,
+                                 coarsen_cut_factor, debug_flag,
+                                 &(CF_marker_array_local[lev_local]));
+
+      hypre_BoomerAMGCoarseParms(comm, local_size,
+                                 num_functions, dof_func_array[lev_local],
+                                 CF_marker_array_local[lev_local],
+                                 &coarse_dof_func_lvl, coarse_pnts_global_lvl);
+
+      if (my_id == (num_procs - 1))
+      {
+         coarse_size = coarse_pnts_global_lvl[1];
+      }
+      hypre_MPI_Bcast(&coarse_size, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
+
+      if (coarse_size == 0) // stop coarsening
+      {
+         if (S_local) { hypre_ParCSRMatrixDestroy(S_local); }
+         hypre_IntArrayDestroy(coarse_dof_func_lvl);
+
+         if (lev_local == 0)
+         {
+            // Save the cf_marker from outer MGR level (lev).
+            if (relax_order == 1)
+            {
+               /* We need to mask out C-points from outer CF-marker for
+                  C/F relaxation at solve phase --DOK*/
+               for (i = 0; i < local_size; i++)
+               {
+                  if (hypre_IntArrayData(CF_marker_array[lev])[i] == 1)
+                  {
+                     CF_marker_local[i] = 0;
+                  }
+               }
+            }
+            else
+            {
+               /* Do lexicographic relaxation on F-points from outer CF-marker --DOK*/
+               for (i = 0; i < local_size; i++)
+               {
+                  CF_marker_local[i] = hypre_IntArrayData(CF_marker_array[lev])[i];
+               }
+            }
+         }
+         else
+         {
+            hypre_IntArrayDestroy(CF_marker_array_local[lev_local]);
+            CF_marker_array_local[lev_local] = NULL;
+         }
+         break;
+      }
 
+      hypre_BoomerAMGBuildExtPIInterpHost(A_array_local[lev_local], CF_marker_local,
+                                          S_local, coarse_pnts_global_lvl, num_functions, dof_func_data,
+                                          debug_flag, trunc_factor, P_max_elmts, &P_local);
+
+      //    hypre_BoomerAMGBuildInterp(A_array_local[lev_local], CF_marker_local,
+      //                                   S_local, coarse_pnts_global_lvl, 1, NULL,
+      //                                   0, 0.0, 0, NULL, &P_local);
+
+      /* Save the CF_marker pointer. For lev_local = 0, save the cf_marker from outer MGR level (lev).
+       * This is necessary to enable relaxations over the A_FF matrix during the solve phase. -- DOK
+       */
       if (lev_local == 0)
       {
-        // Save the cf_marker from outer MGR level (lev).
-        if (relax_order == 1)
-        {
-          /* We need to mask out C-points from outer CF-marker for C/F relaxation at solve phase --DOK*/
-          for (i = 0; i < local_size; i++)
-          {
-            if (hypre_IntArrayData(CF_marker_array[lev])[i] == 1)
+         if (relax_order == 1)
+         {
+            /* We need to mask out C-points from outer CF-marker for C/F relaxation at solve phase --DOK*/
+            for (i = 0; i < local_size; i++)
+            {
+               if (hypre_IntArrayData(CF_marker_array[lev])[i] == 1)
+               {
+                  CF_marker_local[i] = 0;
+               }
+            }
+         }
+         else
+         {
+            /* Do lexicographic relaxation on F-points from outer CF-marker --DOK */
+            for (i = 0; i < local_size; i++)
             {
-              CF_marker_local[i] = 0;
+               CF_marker_local[i] = hypre_IntArrayData(CF_marker_array[lev])[i];
             }
-          }
-        }
-        else
-        {
-          /* Do lexicographic relaxation on F-points from outer CF-marker --DOK*/
-          for (i = 0; i < local_size; i++)
-          {
-            CF_marker_local[i] = hypre_IntArrayData(CF_marker_array[lev])[i];
-          }
-        }
+         }
       }
-      else
+      /* Save interpolation matrix pointer */
+      P_array_local[lev_local] = P_local;
+
+      if (num_functions > 1)
+      {
+         dof_func_array[lev_local + 1] = coarse_dof_func_lvl;
+      }
+
+      /* build the coarse grid */
+      hypre_BoomerAMGBuildCoarseOperatorKT(P_local, A_array_local[lev_local],
+                                           P_local, 0, &RAP_local);
+      /*
+          if (my_id == (num_procs -1)) coarse_size = coarse_pnts_global_lvl[1];
+          hypre_MPI_Bcast(&coarse_size, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
+      */
+      lev_local++;
+
+      if (S_local) { hypre_ParCSRMatrixDestroy(S_local); }
+      S_local = NULL;
+      if ( (lev_local == max_local_lvls - 1) || (coarse_size <= max_local_coarse_size) )
+      {
+         not_finished = 0;
+      }
+
+      A_array_local[lev_local] = RAP_local;
+      F_array_local[lev_local] = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(RAP_local),
+                                                       hypre_ParCSRMatrixGlobalNumRows(RAP_local),
+                                                       hypre_ParCSRMatrixRowStarts(RAP_local));
+      hypre_ParVectorInitialize(F_array_local[lev_local]);
+
+      U_array_local[lev_local] = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(RAP_local),
+                                                       hypre_ParCSRMatrixGlobalNumRows(RAP_local),
+                                                       hypre_ParCSRMatrixRowStarts(RAP_local));
+      hypre_ParVectorInitialize(U_array_local[lev_local]);
+   } // end while loop
+
+   // setup Vcycle data
+   (FrelaxVcycleData[lev] -> A_array) = A_array_local;
+   (FrelaxVcycleData[lev] -> P_array) = P_array_local;
+   (FrelaxVcycleData[lev] -> F_array) = F_array_local;
+   (FrelaxVcycleData[lev] -> U_array) = U_array_local;
+   (FrelaxVcycleData[lev] -> CF_marker_array) = CF_marker_array_local;
+   (FrelaxVcycleData[lev] -> num_levels) = lev_local;
+   //if(lev == 1)
+   //{
+   //  for (i = 0; i < local_size; i++)
+   //  {
+   //    if(CF_marker_array_local[0][i] == 1)
+   //    hypre_printf("cfmarker[%d] = %d\n",i, CF_marker_array_local[0][i]);
+   //  }
+   //}
+   /* setup GE for coarsest level (if small enough) */
+   if ((lev_local > 0) && (hypre_ParAMGDataUserCoarseRelaxType(FrelaxVcycleData[lev]) == 9))
+   {
+      if ((coarse_size <= max_local_coarse_size) && coarse_size > 0)
       {
-        hypre_IntArrayDestroy(CF_marker_array_local[lev_local]);
-        CF_marker_array_local[lev_local] = NULL;
-      }
-      hypre_TFree(coarse_pnts_global_lvl, HYPRE_MEMORY_HOST);
-      break;
-    }
-
-    hypre_BoomerAMGBuildExtPIInterpHost(A_array_local[lev_local], CF_marker_local,
-                        S_local, coarse_pnts_global_lvl, num_functions, dof_func_data,
-                        debug_flag, trunc_factor, P_max_elmts, &P_local);
-
-//    hypre_BoomerAMGBuildInterp(A_array_local[lev_local], CF_marker_local,
-//                                   S_local, coarse_pnts_global_lvl, 1, NULL,
-//                                   0, 0.0, 0, NULL, &P_local);
-
-    /* Save the CF_marker pointer. For lev_local = 0, save the cf_marker from outer MGR level (lev).
-     * This is necessary to enable relaxations over the A_FF matrix during the solve phase. -- DOK
-     */
-    if(lev_local == 0)
-    {
-      if(relax_order == 1)
-      {
-        /* We need to mask out C-points from outer CF-marker for C/F relaxation at solve phase --DOK*/
-        for (i = 0; i < local_size; i++)
-        {
-          if (hypre_IntArrayData(CF_marker_array[lev])[i] == 1)
-          {
-            CF_marker_local[i] = 0;
-          }
-        }
+         hypre_GaussElimSetup(FrelaxVcycleData[lev], lev_local, 9);
       }
       else
       {
-        /* Do lexicographic relaxation on F-points from outer CF-marker --DOK */
-        for (i = 0; i < local_size; i++)
-        {
-          CF_marker_local[i] = hypre_IntArrayData(CF_marker_array[lev])[i];
-        }
-      }
-    }
-    /* Save interpolation matrix pointer */
-    P_array_local[lev_local] = P_local;
-
-    if (num_functions > 1)
-      dof_func_array[lev_local+1] = coarse_dof_func_lvl;
-
-    /* build the coarse grid */
-    hypre_BoomerAMGBuildCoarseOperatorKT(P_local, A_array_local[lev_local],
-                                    P_local, 0, &RAP_local);
-/*
-    if (my_id == (num_procs -1)) coarse_size = coarse_pnts_global_lvl[1];
-    hypre_MPI_Bcast(&coarse_size, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
-*/
-    lev_local++;
-
-    if (S_local) hypre_ParCSRMatrixDestroy(S_local);
-    S_local = NULL;
-    if ( (lev_local == max_local_lvls-1) || (coarse_size <= max_local_coarse_size) )
-    {
-      hypre_TFree(coarse_pnts_global_lvl, HYPRE_MEMORY_HOST);
-      not_finished = 0;
-    }
-
-    A_array_local[lev_local] = RAP_local;
-    F_array_local[lev_local] = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(RAP_local),
-                                          hypre_ParCSRMatrixGlobalNumRows(RAP_local),
-                                          hypre_ParCSRMatrixRowStarts(RAP_local));
-    hypre_ParVectorInitialize(F_array_local[lev_local]);
-
-    U_array_local[lev_local] = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(RAP_local),
-                                          hypre_ParCSRMatrixGlobalNumRows(RAP_local),
-                                          hypre_ParCSRMatrixRowStarts(RAP_local));
-    hypre_ParVectorInitialize(U_array_local[lev_local]);
-  } // end while loop
-
-  // setup Vcycle data
-  (FrelaxVcycleData[lev] -> A_array) = A_array_local;
-  (FrelaxVcycleData[lev] -> P_array) = P_array_local;
-  (FrelaxVcycleData[lev] -> F_array) = F_array_local;
-  (FrelaxVcycleData[lev] -> U_array) = U_array_local;
-  (FrelaxVcycleData[lev] -> CF_marker_array) = CF_marker_array_local;
-  (FrelaxVcycleData[lev] -> num_levels) = lev_local;
-  //if(lev == 1)
-  //{
-  //  for (i = 0; i < local_size; i++)
-  //  {
-  //    if(CF_marker_array_local[0][i] == 1)
-  //    hypre_printf("cfmarker[%d] = %d\n",i, CF_marker_array_local[0][i]);
-  //  }
-  //}
-  /* setup GE for coarsest level (if small enough) */
-  if ((lev_local > 0) && (hypre_ParAMGDataUserCoarseRelaxType(FrelaxVcycleData[lev]) == 9))
-  {
-    if((coarse_size <= max_local_coarse_size) && coarse_size > 0)
-    {
-      hypre_GaussElimSetup(FrelaxVcycleData[lev], lev_local, 9);
-    }
-    else
-    {
-      /* use relaxation */
-      hypre_ParAMGDataUserCoarseRelaxType(FrelaxVcycleData[lev]) = relax_type;
-    }
-  }
-
-  return hypre_error_flag;
+         /* use relaxation */
+         hypre_ParAMGDataUserCoarseRelaxType(FrelaxVcycleData[lev]) = relax_type;
+      }
+   }
+
+   return hypre_error_flag;
 }
diff --git a/external/hypre/src/parcsr_ls/par_mgr_solve.c b/external/hypre/src/parcsr_ls/par_mgr_solve.c
index 46f9d734..3d75cb34 100644
--- a/external/hypre/src/parcsr_ls/par_mgr_solve.c
+++ b/external/hypre/src/parcsr_ls/par_mgr_solve.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -25,9 +25,9 @@ hypre_MGRSolve( void               *mgr_vdata,
 {
 
    MPI_Comm              comm = hypre_ParCSRMatrixComm(A);
-   hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
+   hypre_ParMGRData     *mgr_data = (hypre_ParMGRData*) mgr_vdata;
 
-   hypre_ParCSRMatrix  **A_array = (mgr_data -> A_array);
+   hypre_ParCSRMatrix **A_array = (mgr_data -> A_array);
    hypre_ParVector    **F_array = (mgr_data -> F_array);
    hypre_ParVector    **U_array = (mgr_data -> U_array);
 
@@ -35,13 +35,14 @@ hypre_MGRSolve( void               *mgr_vdata,
    HYPRE_Int            logging = (mgr_data -> logging);
    HYPRE_Int            print_level = (mgr_data -> print_level);
    HYPRE_Int            max_iter = (mgr_data -> max_iter);
-   HYPRE_Real           *norms = (mgr_data -> rel_res_norms);
-   hypre_ParVector      *Vtemp = (mgr_data -> Vtemp);
-   hypre_ParVector      *Utemp = (mgr_data -> Utemp);
-   hypre_ParVector      *residual;
-
-   HYPRE_Real           alpha = -1.0;
-   HYPRE_Real           beta = 1.0;
+   HYPRE_Real          *norms = (mgr_data -> rel_res_norms);
+   hypre_ParVector     *Vtemp = (mgr_data -> Vtemp);
+   //   hypre_ParVector      *Utemp = (mgr_data -> Utemp);
+   hypre_ParVector     *residual = NULL;
+
+   HYPRE_Complex        fp_zero = 0.0;
+   HYPRE_Complex        fp_one = 1.0;
+   HYPRE_Complex        fp_neg_one = - fp_one;
    HYPRE_Real           conv_factor = 0.0;
    HYPRE_Real           resnorm = 1.0;
    HYPRE_Real           init_resnorm = 0.0;
@@ -51,39 +52,20 @@ hypre_MGRSolve( void               *mgr_vdata,
    HYPRE_Real           ieee_check = 0.;
 
    HYPRE_Int            iter, num_procs, my_id;
-   HYPRE_Int            Solve_err_flag;
-
-   /*
-      HYPRE_Real   total_coeffs;
-      HYPRE_Real   total_variables;
-      HYPRE_Real   operat_cmplxty;
-      HYPRE_Real   grid_cmplxty;
-      */
-   HYPRE_Solver         cg_solver = (mgr_data -> coarse_grid_solver);
-   HYPRE_Int            (*coarse_grid_solver_solve)(void*,void*,void*,void*) = (mgr_data -> coarse_grid_solver_solve);
-   HYPRE_Int  set_c_points_method = (mgr_data -> set_c_points_method);
-
-   HYPRE_Int    blk_size  = (mgr_data -> block_size);
-   HYPRE_Real    *diaginv = (mgr_data -> diaginv);
-   HYPRE_Int      n_block = (mgr_data -> n_block);
-   HYPRE_Int    left_size = (mgr_data -> left_size);
-
-   HYPRE_Int    global_smooth_iters      =  (mgr_data -> global_smooth_iters);
-   HYPRE_Int    global_smooth_type =  (mgr_data -> global_smooth_type);
 
-//   HYPRE_Real   wall_time = 0.0;
-
-   HYPRE_Int    i;
+   HYPRE_Solver         cg_solver = (mgr_data -> coarse_grid_solver);
+   HYPRE_Int            (*coarse_grid_solver_solve)(void*, void*, void*,
+                                                    void*) = (mgr_data -> coarse_grid_solver_solve);
 
    HYPRE_ANNOTATE_FUNC_BEGIN;
-   if(logging > 1)
+   if (logging > 1)
    {
       residual = (mgr_data -> residual);
    }
 
    (mgr_data -> num_iterations) = 0;
 
-   if((mgr_data -> num_coarse_levels) == 0)
+   if ((mgr_data -> num_coarse_levels) == 0)
    {
       /* Do scalar AMG solve when only one level */
       coarse_grid_solver_solve(cg_solver, A, f, u);
@@ -96,64 +78,61 @@ hypre_MGRSolve( void               *mgr_vdata,
       return hypre_error_flag;
    }
 
+   A_array[0] = A;
    U_array[0] = u;
    F_array[0] = f;
 
    hypre_MPI_Comm_size(comm, &num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_rank(comm, &my_id);
 
    /*-----------------------------------------------------------------------
     *    Write the solver parameters
     *-----------------------------------------------------------------------*/
-   if (my_id == 0 && print_level > 1)
-      hypre_MGRWriteSolverParams(mgr_data);
 
-   /*-----------------------------------------------------------------------
-    *    Initialize the solver error flag and assorted bookkeeping variables
-    *-----------------------------------------------------------------------*/
+   /* Print MGR and linear system info according to print level */
+   hypre_MGRDataPrint(mgr_vdata);
 
-   Solve_err_flag = 0;
-   /*
-      total_coeffs = 0;
-      total_variables = 0;
-      operat_cmplxty = 0;
-      grid_cmplxty = 0;
-      */
    /*-----------------------------------------------------------------------
     *     write some initial info
     *-----------------------------------------------------------------------*/
 
-   if (my_id == 0 && print_level > 1 && tol > 0.)
-      hypre_printf("\n\nTWO-GRID SOLVER SOLUTION INFO:\n");
-
+   if (my_id == 0 && (print_level & HYPRE_MGR_PRINT_INFO_SOLVE) && tol > 0.)
+   {
+      hypre_printf("\n\nMGR SOLVER SOLUTION INFO:\n");
+   }
 
    /*-----------------------------------------------------------------------
     *    Compute initial fine-grid residual and print
     *-----------------------------------------------------------------------*/
-   if (print_level > 1 || logging > 1 || tol > 0.)
+
+   if ((print_level & HYPRE_MGR_PRINT_INFO_SOLVE) || logging > 1 || tol > 0.)
    {
-      if ( logging > 1 )
+      if (logging > 1)
       {
-         hypre_ParVectorCopy(F_array[0], residual );
-         if (tol > 0.0)
+         hypre_ParVectorCopy(F_array[0], residual);
+         if (tol > hypre_cabs(fp_zero))
          {
-            hypre_ParCSRMatrixMatvec(alpha, A_array[0], U_array[0], beta, residual );
+            hypre_ParCSRMatrixMatvec(fp_neg_one, A_array[0], U_array[0], fp_one, residual);
          }
-         resnorm = sqrt(hypre_ParVectorInnerProd( residual, residual ));
+         resnorm = hypre_sqrt(hypre_ParVectorInnerProd(residual, residual));
       }
       else
       {
          hypre_ParVectorCopy(F_array[0], Vtemp);
-         if (tol > 0.0)
+         if (tol > hypre_cabs(fp_zero))
          {
-            hypre_ParCSRMatrixMatvec(alpha, A_array[0], U_array[0], beta, Vtemp);
+            hypre_ParCSRMatrixMatvec(fp_neg_one, A_array[0], U_array[0], fp_one, Vtemp);
          }
-         resnorm = sqrt(hypre_ParVectorInnerProd(Vtemp, Vtemp));
+         resnorm = hypre_sqrt(hypre_ParVectorInnerProd(Vtemp, Vtemp));
       }
 
-      /* Since it is does not diminish performance, attempt to return an error flag
+      /* Since it does not diminish performance, attempt to return an error flag
        * and notify users when they supply bad input. */
-      if (resnorm != 0.) ieee_check = resnorm/resnorm; /* INF -> NaN conversion */
+      if (resnorm != 0.)
+      {
+         ieee_check = resnorm / resnorm; /* INF -> NaN conversion */
+      }
+
       if (ieee_check != ieee_check)
       {
          /* ...INFs or NaNs in input can make ieee_check a NaN.  This test
@@ -175,7 +154,7 @@ hypre_MGRSolve( void               *mgr_vdata,
       }
 
       init_resnorm = resnorm;
-      rhs_norm = sqrt(hypre_ParVectorInnerProd(f, f));
+      rhs_norm = hypre_sqrt(hypre_ParVectorInnerProd(f, f));
       if (rhs_norm > HYPRE_REAL_EPSILON)
       {
          rel_resnorm = init_resnorm / rhs_norm;
@@ -183,10 +162,10 @@ hypre_MGRSolve( void               *mgr_vdata,
       else
       {
          /* rhs is zero, return a zero solution */
-         hypre_ParVectorSetConstantValues(U_array[0], 0.0);
-         if(logging > 0)
+         hypre_ParVectorSetZeros(U_array[0]);
+         if (logging > 0)
          {
-            rel_resnorm = 0.0;
+            rel_resnorm = fp_zero;
             (mgr_data -> final_rel_residual_norm) = rel_resnorm;
          }
          HYPRE_ANNOTATE_FUNC_END;
@@ -199,109 +178,45 @@ hypre_MGRSolve( void               *mgr_vdata,
       rel_resnorm = 1.;
    }
 
-   if (my_id == 0 && print_level > 1)
+   if (my_id == 0 && (print_level & HYPRE_MGR_PRINT_INFO_SOLVE))
    {
       hypre_printf("                                            relative\n");
       hypre_printf("               residual        factor       residual\n");
       hypre_printf("               --------        ------       --------\n");
-      hypre_printf("    Initial    %e                 %e\n",init_resnorm,
-            rel_resnorm);
+      hypre_printf("    Initial    %e                 %e\n", init_resnorm,
+                   rel_resnorm);
    }
+
    /************** Main Solver Loop - always do 1 iteration ************/
    iter = 0;
    while ((rel_resnorm >= tol || iter < 1) && iter < max_iter)
    {
-      if (global_smooth_iters)
-      {
-         //wall_time = time_getWallclockSeconds();
-         /** DEBUG: **/
-         //      hypre_ParCSRMatrixMatvecOutOfPlace(alpha, A_array[0], U_array[0], beta, F_array[0], Vtemp);
-         //      HYPRE_Real resnorm_gsmooth = hypre_ParVectorInnerProd(Vtemp, Vtemp);
-         if (global_smooth_type == 0)//block Jacobi smoother
-         {
-            for (i = 0;i < global_smooth_iters;i ++)
-            {
-               if (set_c_points_method == 0)
-               {
-                  hypre_blockRelax_solve(A_array[0],F_array[0],U_array[0],blk_size,n_block,left_size,global_smooth_type,diaginv,Vtemp);
-               }
-               else
-               {
-                  hypre_blockRelax_solve(A_array[0],F_array[0],U_array[0],1,n_block,left_size,global_smooth_type,diaginv,Vtemp);
-               }
-            }
-         }
-         else if ((global_smooth_type > 0) && (global_smooth_type < 7))
-         {
-            for (i = 0;i < global_smooth_iters;i ++)
-            {
-               hypre_BoomerAMGRelax(A_array[0], F_array[0], NULL, global_smooth_type-1, 0, 1.0, 0.0, NULL, U_array[0], Vtemp, NULL);
-            }
-         }
-         else if (global_smooth_type == 8)//EUCLID ILU smoother
-         {
-            for (i = 0;i < global_smooth_iters;i ++)
-            {
-               // compute residual
-               hypre_ParCSRMatrixMatvecOutOfPlace(alpha, A_array[0], U_array[0], beta, F_array[0], Vtemp);
-               // solve
-               HYPRE_EuclidSolve( (mgr_data -> global_smoother),A_array[0],Vtemp,Utemp);
-               // update solution
-               hypre_ParVectorAxpy(beta, Utemp, U_array[0]);
-            }
-         }
-         else if (global_smooth_type == 16) // HYPRE ILU
-         {
-            // solve
-            HYPRE_ILUSolve(mgr_data -> global_smoother, A_array[0], F_array[0], U_array[0]);
-         }
-         /** DEBUG: **/
-         //      hypre_ParCSRMatrixMatvecOutOfPlace(alpha, A_array[0], U_array[0], beta, F_array[0], Vtemp);
-         //      resnorm_gsmooth = hypre_ParVectorInnerProd(Vtemp, Vtemp);
-         //if (my_id == 0) hypre_printf("Global smoothing convergence factor: %1.2f\n", resnorm_gsmooth/conv_factor_gsmooth);
-         //wall_time = time_getWallclockSeconds() - wall_time;
-         //if (my_id == 0) hypre_printf("Global smoother solve: %f\n", wall_time);
-      }
-
-      //wall_time = time_getWallclockSeconds();
-      /* Do one cycle of reduction solve on Ae=r */
+      /* Do one cycle of reduction solve on A*e = r */
       hypre_MGRCycle(mgr_data, F_array, U_array);
-      //wall_time = time_getWallclockSeconds() - wall_time;
-      //if (my_id == 0) hypre_printf("MGR Cycle time: %f\n", wall_time);
-
 
       /*---------------------------------------------------------------
        *    Compute  fine-grid residual and residual norm
        *----------------------------------------------------------------*/
 
-      if (print_level > 1 || logging > 1 || tol > 0.)
+      if ((print_level & HYPRE_MGR_PRINT_INFO_SOLVE) || logging > 1 || tol > 0.)
       {
          old_resnorm = resnorm;
 
-         if ( logging > 1 )
+         if (logging > 1)
          {
             hypre_ParVectorCopy(F_array[0], residual);
-            hypre_ParCSRMatrixMatvec(alpha, A_array[0], U_array[0], beta, residual );
-            resnorm = sqrt(hypre_ParVectorInnerProd( residual, residual ));
+            hypre_ParCSRMatrixMatvec(fp_neg_one, A_array[0], U_array[0], fp_one, residual);
+            resnorm = hypre_sqrt(hypre_ParVectorInnerProd(residual, residual));
          }
          else
          {
             hypre_ParVectorCopy(F_array[0], Vtemp);
-            hypre_ParCSRMatrixMatvec(alpha, A_array[0], U_array[0], beta, Vtemp);
-            resnorm = sqrt(hypre_ParVectorInnerProd(Vtemp, Vtemp));
-         }
-
-         if (old_resnorm) conv_factor = resnorm / old_resnorm;
-         else conv_factor = resnorm;
-         if (rhs_norm > HYPRE_REAL_EPSILON)
-         {
-            rel_resnorm = resnorm / rhs_norm;
-         }
-         else
-         {
-            rel_resnorm = resnorm;
+            hypre_ParCSRMatrixMatvec(fp_neg_one, A_array[0], U_array[0], fp_one, Vtemp);
+            resnorm = hypre_sqrt(hypre_ParVectorInnerProd(Vtemp, Vtemp));
          }
 
+         conv_factor = (old_resnorm > HYPRE_REAL_EPSILON) ? (resnorm / old_resnorm) : resnorm;
+         rel_resnorm = (rhs_norm > HYPRE_REAL_EPSILON) ? (resnorm / rhs_norm) : resnorm;
          norms[iter] = rel_resnorm;
       }
 
@@ -309,70 +224,68 @@ hypre_MGRSolve( void               *mgr_vdata,
       (mgr_data -> num_iterations) = iter;
       (mgr_data -> final_rel_residual_norm) = rel_resnorm;
 
-      if (my_id == 0 && print_level > 1)
+      if (my_id == 0 && (print_level & HYPRE_MGR_PRINT_INFO_SOLVE))
       {
          hypre_printf("    MGRCycle %2d   %e    %f     %e \n", iter,
-               resnorm, conv_factor, rel_resnorm);
+                      resnorm, conv_factor, rel_resnorm);
       }
    }
 
    /* check convergence within max_iter */
    if (iter == max_iter && tol > 0.)
    {
-      Solve_err_flag = 1;
       hypre_error(HYPRE_ERROR_CONV);
-   }
 
-   /*-----------------------------------------------------------------------
-    *    Print closing statistics
-    *    Add operator and grid complexity stats
-    *-----------------------------------------------------------------------*/
-
-   if (iter > 0 && init_resnorm)
-      conv_factor = pow((resnorm/init_resnorm),(1.0/(HYPRE_Real) iter));
-   else
-      conv_factor = 1.;
+      if (!my_id && (print_level & HYPRE_MGR_PRINT_INFO_SOLVE))
+      {
+         hypre_printf("\n\n==============================================");
+         hypre_printf("\n NOTE: Convergence tolerance was not achieved\n");
+         hypre_printf("      within the allowed %d iterations\n", max_iter);
+         hypre_printf("==============================================");
+      }
+   }
 
-   if (print_level > 1)
+   if ((my_id == 0) && (print_level & HYPRE_MGR_PRINT_INFO_SOLVE))
    {
-      /*** compute operator and grid complexities here ?? ***/
-      if (my_id == 0)
+      if (iter > 0 && init_resnorm)
       {
-         if (Solve_err_flag == 1)
-         {
-            hypre_printf("\n\n==============================================");
-            hypre_printf("\n NOTE: Convergence tolerance was not achieved\n");
-            hypre_printf("      within the allowed %d iterations\n",max_iter);
-            hypre_printf("==============================================");
-         }
-         hypre_printf("\n\n Average Convergence Factor = %f \n",conv_factor);
-         hypre_printf(" Number of coarse levels = %d \n",(mgr_data -> num_coarse_levels));
-         //         hypre_printf("\n\n     Complexity:    grid = %f\n",grid_cmplxty);
-         //         hypre_printf("                operator = %f\n",operat_cmplxty);
-         //         hypre_printf("                   cycle = %f\n\n\n\n",cycle_cmplxty);
+         conv_factor = hypre_pow((resnorm / init_resnorm),
+                                 (fp_one / (HYPRE_Real) iter));
+      }
+      else
+      {
+         conv_factor = fp_one;
       }
+
+      hypre_printf("\n\n Average Convergence Factor = %f \n", conv_factor);
    }
+
    HYPRE_ANNOTATE_FUNC_END;
 
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_MGRFrelaxVcycle
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_MGRFrelaxVcycle ( void   *Frelax_vdata, hypre_ParVector *f, hypre_ParVector *u )
+hypre_MGRFrelaxVcycle ( void            *Frelax_vdata,
+                        hypre_ParVector *f,
+                        hypre_ParVector *u )
 {
-   hypre_ParAMGData   *Frelax_data = (hypre_ParAMGData*) Frelax_vdata;
-
-   HYPRE_Int Not_Finished = 0;
-   HYPRE_Int level = 0;
-   HYPRE_Int cycle_param = 1;
-   HYPRE_Int j, Solve_err_flag, coarse_grid, fine_grid;
-   HYPRE_Int local_size;
-   HYPRE_Int num_sweeps = 1;
-   HYPRE_Int relax_order = hypre_ParAMGDataRelaxOrder(Frelax_data);
-   HYPRE_Int relax_type = 3;
-   HYPRE_Int relax_weight = 1;
-   HYPRE_Int omega = 1;
-   //  HYPRE_Int max_coarse_size = hypre_ParAMGDataMaxCoarseSize(Frelax_data);
+   hypre_ParAMGData    *Frelax_data = (hypre_ParAMGData*) Frelax_vdata;
+
+   HYPRE_Int            Not_Finished = 0;
+   HYPRE_Int            level = 0;
+   HYPRE_Int            cycle_param = 1;
+   HYPRE_Int            j, Solve_err_flag, coarse_grid, fine_grid;
+   HYPRE_Int            local_size;
+   HYPRE_Int            num_sweeps = 1;
+   HYPRE_Int            relax_order = hypre_ParAMGDataRelaxOrder(Frelax_data);
+   HYPRE_Int            relax_type = 3;
+   HYPRE_Real           relax_weight = 1.0;
+   HYPRE_Real           omega = 1.0;
 
    hypre_ParVector    **F_array = (Frelax_data) -> F_array;
    hypre_ParVector    **U_array = (Frelax_data) -> U_array;
@@ -383,15 +296,17 @@ hypre_MGRFrelaxVcycle ( void   *Frelax_vdata, hypre_ParVector *f, hypre_ParVecto
    hypre_IntArray     **CF_marker_array = ((Frelax_data) -> CF_marker_array);
    HYPRE_Int           *CF_marker;
 
-   hypre_ParVector *Vtemp = (Frelax_data) -> Vtemp;
-   hypre_ParVector *Ztemp = (Frelax_data) -> Ztemp;
+   hypre_ParVector     *Vtemp = (Frelax_data) -> Vtemp;
+   hypre_ParVector     *Ztemp = (Frelax_data) -> Ztemp;
 
-   HYPRE_Int num_c_levels = (Frelax_data) -> num_levels;
+   HYPRE_Int            num_c_levels = (Frelax_data) -> num_levels;
 
-   hypre_ParVector *Aux_F = NULL;
-   hypre_ParVector *Aux_U = NULL;
+   hypre_ParVector     *Aux_F = NULL;
+   hypre_ParVector     *Aux_U = NULL;
 
-   HYPRE_Real alpha, beta;
+   HYPRE_Complex        fp_zero = 0.0;
+   HYPRE_Complex        fp_one = 1.0;
+   HYPRE_Complex        fp_neg_one = - fp_one;
 
    HYPRE_ANNOTATE_FUNC_BEGIN;
 
@@ -406,48 +321,53 @@ hypre_MGRFrelaxVcycle ( void   *Frelax_vdata, hypre_ParVector *f, hypre_ParVecto
 
    /* (Re)set local_size for Vtemp */
    local_size = hypre_VectorSize(hypre_ParVectorLocalVector(F_array[0]));
-   hypre_VectorSize(hypre_ParVectorLocalVector(Vtemp)) = local_size;
+   hypre_ParVectorSetLocalSize(Vtemp, local_size);
+
    /* smoother on finest level:
     * This is separated from subsequent levels since the finest level matrix
     * may be larger than what is needed for the vcycle solve
     */
-   if(relax_order == 1)// C/F ordering for smoother
+   if (relax_order == 1) // C/F ordering for smoother
    {
-      for (j = 0; j < num_sweeps; j++) {
+      for (j = 0; j < num_sweeps; j++)
+      {
          Solve_err_flag = hypre_BoomerAMGRelaxIF(A_array[0],
-               F_array[0],
-               CF_marker,
-               relax_type,
-               relax_order,
-               1,
-               relax_weight,
-               omega,
-               NULL,
-               U_array[0],
-               Vtemp,
-               Ztemp);
+                                                 F_array[0],
+                                                 CF_marker,
+                                                 relax_type,
+                                                 relax_order,
+                                                 1,
+                                                 relax_weight,
+                                                 omega,
+                                                 NULL,
+                                                 U_array[0],
+                                                 Vtemp,
+                                                 Ztemp);
       }
    }
    else // lexicographic ordering for smoother (on F points in CF marker)
    {
-      for (j = 0; j < num_sweeps; j++) {
+      for (j = 0; j < num_sweeps; j++)
+      {
          Solve_err_flag = hypre_BoomerAMGRelax(A_array[0],
-               F_array[0],
-               CF_marker,
-               relax_type,
-               -1,
-               relax_weight,
-               omega,
-               NULL,
-               U_array[0],
-               Vtemp,
-               Ztemp);
+                                               F_array[0],
+                                               CF_marker,
+                                               relax_type,
+                                               -1,
+                                               relax_weight,
+                                               omega,
+                                               NULL,
+                                               U_array[0],
+                                               Vtemp,
+                                               Ztemp);
       }
    }
 
    /* coarse grids exist */
-   if(num_c_levels > 0)
+   if (num_c_levels > 0)
+   {
       Not_Finished = 1;
+   }
 
    while (Not_Finished)
    {
@@ -455,26 +375,26 @@ hypre_MGRFrelaxVcycle ( void   *Frelax_vdata, hypre_ParVector *f, hypre_ParVecto
       {
          //hypre_printf("Vcycle smoother (down cycle): vtemp size = %d, level = %d \n", hypre_VectorSize(hypre_ParVectorLocalVector(Vtemp)), level);
          /* compute coarse grid vectors */
-         fine_grid = level;
+         fine_grid   = level;
          coarse_grid = level + 1;
 
-         hypre_ParVectorSetConstantValues(U_array[coarse_grid], 0.0);
-
-         alpha = -1.0;
-         beta = 1.0;
+         hypre_ParVectorSetZeros(U_array[coarse_grid]);
 
-         // JSP: avoid unnecessary copy using out-of-place version of SpMV
-         hypre_ParCSRMatrixMatvecOutOfPlace(alpha, A_array[fine_grid], U_array[fine_grid],
-               beta, F_array[fine_grid], Vtemp);
+         /* Avoid unnecessary copy using out-of-place version of SpMV */
+         hypre_ParCSRMatrixMatvecOutOfPlace(fp_neg_one, A_array[fine_grid], U_array[fine_grid],
+                                            fp_one, F_array[fine_grid], Vtemp);
 
-         alpha = 1.0;
-         beta = 0.0;
-         hypre_ParCSRMatrixMatvecT(alpha,R_array[fine_grid],Vtemp,
-               beta,F_array[coarse_grid]);
+         hypre_ParCSRMatrixMatvecT(fp_one, R_array[fine_grid], Vtemp,
+                                   fp_zero, F_array[coarse_grid]);
 
          /* update level */
          ++level;
 
+         /* Update scratch vector sizes */
+         local_size = hypre_VectorSize(hypre_ParVectorLocalVector(F_array[level]));
+         hypre_ParVectorSetLocalSize(Vtemp, local_size);
+         hypre_ParVectorSetLocalSize(Ztemp, local_size);
+
          CF_marker = NULL;
          if (CF_marker_array[level])
          {
@@ -489,55 +409,53 @@ hypre_MGRFrelaxVcycle ( void   *Frelax_vdata, hypre_ParVector *f, hypre_ParVecto
          }
          else
          {
-            local_size = hypre_VectorSize(hypre_ParVectorLocalVector(F_array[level]));
-            hypre_VectorSize(hypre_ParVectorLocalVector(Vtemp)) = local_size;
             Aux_F = F_array[level];
             Aux_U = U_array[level];
             /* relax and visit next coarse grid */
-            for (j = 0; j < num_sweeps; j++) {
+            for (j = 0; j < num_sweeps; j++)
+            {
                Solve_err_flag = hypre_BoomerAMGRelaxIF(A_array[level],
-                     Aux_F,
-                     CF_marker,
-                     relax_type,
-                     relax_order,
-                     cycle_param,
-                     relax_weight,
-                     omega,
-                     NULL,
-                     Aux_U,
-                     Vtemp,
-                     Ztemp);
+                                                       Aux_F,
+                                                       CF_marker,
+                                                       relax_type,
+                                                       relax_order,
+                                                       cycle_param,
+                                                       relax_weight,
+                                                       omega,
+                                                       NULL,
+                                                       Aux_U,
+                                                       Vtemp,
+                                                       Ztemp);
             }
             cycle_param = 1;
          }
       }
       else if (cycle_param == 3)
       {
-         if(hypre_ParAMGDataUserCoarseRelaxType(Frelax_data) == 9)
+         if (hypre_ParAMGDataUserCoarseRelaxType(Frelax_data) == 9)
          {
-            // solve the coarsest grid with Gaussian elimination
+            /* solve the coarsest grid with Gaussian elimination */
             hypre_GaussElimSolve(Frelax_data, level, 9);
          }
          else
          {
-            // solve with relaxation
-            local_size = hypre_VectorSize(hypre_ParVectorLocalVector(F_array[level]));
-            hypre_VectorSize(hypre_ParVectorLocalVector(Vtemp)) = local_size;
+            /* solve with relaxation */
             Aux_F = F_array[level];
             Aux_U = U_array[level];
-            for (j = 0; j < num_sweeps; j++) {
+            for (j = 0; j < num_sweeps; j++)
+            {
                Solve_err_flag = hypre_BoomerAMGRelaxIF(A_array[level],
-                     Aux_F,
-                     CF_marker,
-                     relax_type,
-                     relax_order,
-                     cycle_param,
-                     relax_weight,
-                     omega,
-                     NULL,
-                     Aux_U,
-                     Vtemp,
-                     Ztemp);
+                                                       Aux_F,
+                                                       CF_marker,
+                                                       relax_type,
+                                                       relax_order,
+                                                       cycle_param,
+                                                       relax_weight,
+                                                       omega,
+                                                       NULL,
+                                                       Aux_U,
+                                                       Vtemp,
+                                                       Ztemp);
             }
          }
          //hypre_printf("Vcycle smoother (coarse level): vtemp size = %d, level = %d \n", hypre_VectorSize(hypre_ParVectorLocalVector(Vtemp)), level);
@@ -551,21 +469,22 @@ hypre_MGRFrelaxVcycle ( void   *Frelax_vdata, hypre_ParVector *f, hypre_ParVecto
           * Reset counters and cycling parameters for finer level.
           *--------------------------------------------------------------*/
 
-         fine_grid = level - 1;
+         fine_grid   = level - 1;
          coarse_grid = level;
-         alpha = 1.0;
-         beta = 1.0;
-         hypre_ParCSRMatrixMatvec(alpha, P_array[fine_grid],
-               U_array[coarse_grid],
-               beta, U_array[fine_grid]);
+
+         /* Update solution at the fine level */
+         hypre_ParCSRMatrixMatvec(fp_one, P_array[fine_grid],
+                                  U_array[coarse_grid],
+                                  fp_one, U_array[fine_grid]);
 
          --level;
          cycle_param = 2;
-         if (level == 0) cycle_param = 99;
+         if (level == 0) { cycle_param = 99; }
 
-         // reset vtemp size
+         /* Update scratch vector sizes */
          local_size = hypre_VectorSize(hypre_ParVectorLocalVector(F_array[level]));
-         hypre_VectorSize(hypre_ParVectorLocalVector(Vtemp)) = local_size;
+         hypre_ParVectorSetLocalSize(Vtemp, local_size);
+         hypre_ParVectorSetLocalSize(Ztemp, local_size);
          //hypre_printf("Vcycle smoother (up cycle): vtemp size = %d, level = %d \n", hypre_VectorSize(hypre_ParVectorLocalVector(Vtemp)), level);
       }
       else
@@ -578,68 +497,100 @@ hypre_MGRFrelaxVcycle ( void   *Frelax_vdata, hypre_ParVector *f, hypre_ParVecto
    return Solve_err_flag;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_MGRCycle
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_MGRCycle( void               *mgr_vdata,
-                hypre_ParVector    **F_array,
-                hypre_ParVector    **U_array )
+hypre_MGRCycle( void              *mgr_vdata,
+                hypre_ParVector  **F_array,
+                hypre_ParVector  **U_array )
 {
-   MPI_Comm          comm;
-   hypre_ParMGRData   *mgr_data = (hypre_ParMGRData*) mgr_vdata;
-
-   HYPRE_Int       Solve_err_flag;
-   HYPRE_Int       level;
-   HYPRE_Int       coarse_grid;
-   HYPRE_Int       fine_grid;
-   HYPRE_Int       Not_Finished;
-   HYPRE_Int       cycle_type;
-   HYPRE_Int            print_level = (mgr_data -> print_level);   
-   HYPRE_Int            frelax_print_level = (mgr_data -> frelax_print_level);   
-
-   hypre_ParCSRMatrix   **A_array = (mgr_data -> A_array);
-   hypre_ParCSRMatrix   **RT_array  = (mgr_data -> RT_array);
-   hypre_ParCSRMatrix   **P_array   = (mgr_data -> P_array);
-   hypre_ParCSRMatrix   *RAP = (mgr_data -> RAP);
-   HYPRE_Int  use_default_cgrid_solver = (mgr_data -> use_default_cgrid_solver);
-   HYPRE_Solver         cg_solver = (mgr_data -> coarse_grid_solver);
-   HYPRE_Int            (*coarse_grid_solver_solve)(void*, void*, void*, void*) = (mgr_data -> coarse_grid_solver_solve);
-
-   hypre_IntArray     **CF_marker = (mgr_data -> CF_marker_array);
-   HYPRE_Int            nsweeps = (mgr_data -> num_relax_sweeps);
-   HYPRE_Int            relax_type = (mgr_data -> relax_type);
-   HYPRE_Real           relax_weight = (mgr_data -> relax_weight);
-   HYPRE_Real           omega = (mgr_data -> omega);
-   hypre_Vector       **relax_l1_norms = (mgr_data -> l1_norms);
-   hypre_ParVector      *Vtemp = (mgr_data -> Vtemp);
-   hypre_ParVector      *Ztemp = (mgr_data -> Ztemp);
-//   hypre_ParVector      *Utemp = (mgr_data -> Utemp);
+   MPI_Comm               comm;
+   hypre_ParMGRData      *mgr_data = (hypre_ParMGRData*) mgr_vdata;
+   hypre_Solver          *aff_base;
+
+   HYPRE_Int              local_size;
+   HYPRE_Int              level;
+   HYPRE_Int              coarse_grid;
+   HYPRE_Int              fine_grid;
+   HYPRE_Int              Not_Finished;
+   HYPRE_Int              cycle_type;
+   HYPRE_Int              print_level = (mgr_data -> print_level);
+   HYPRE_Int              frelax_print_level = (mgr_data -> frelax_print_level);
+
+   HYPRE_Complex         *l1_norms;
+   HYPRE_Int             *CF_marker_data;
+
+   hypre_ParCSRMatrix   **A_array    = (mgr_data -> A_array);
+   hypre_ParCSRMatrix   **RT_array   = (mgr_data -> RT_array);
+   hypre_ParCSRMatrix   **P_array    = (mgr_data -> P_array);
+   hypre_ParCSRMatrix   **R_array    = (mgr_data -> R_array);
+#if defined(HYPRE_USING_GPU)
+   hypre_ParCSRMatrix   **B_array    = (mgr_data -> B_array);
+   hypre_ParCSRMatrix   **B_FF_array = (mgr_data -> B_FF_array);
+   hypre_ParCSRMatrix   **P_FF_array = (mgr_data -> P_FF_array);
+#endif
+   hypre_ParCSRMatrix    *RAP        = (mgr_data -> RAP);
+   HYPRE_Int              use_default_cgrid_solver = (mgr_data -> use_default_cgrid_solver);
+   HYPRE_Solver           cg_solver = (mgr_data -> coarse_grid_solver);
+   HYPRE_Int            (*coarse_grid_solver_solve)(void*, void*, void*, void*) =
+      (mgr_data -> coarse_grid_solver_solve);
+
+   hypre_IntArray       **CF_marker = (mgr_data -> CF_marker_array);
+   HYPRE_Int             *nsweeps = (mgr_data -> num_relax_sweeps);
+   HYPRE_Int              relax_type = (mgr_data -> relax_type);
+   HYPRE_Real             relax_weight = (mgr_data -> relax_weight);
+   HYPRE_Real             omega = (mgr_data -> omega);
+   hypre_Vector         **l1_norms_array = (mgr_data -> l1_norms);
+   hypre_ParVector       *Vtemp = (mgr_data -> Vtemp);
+   hypre_ParVector       *Ztemp = (mgr_data -> Ztemp);
+   hypre_ParVector       *Utemp = (mgr_data -> Utemp);
 
    hypre_ParVector      **U_fine_array = (mgr_data -> U_fine_array);
    hypre_ParVector      **F_fine_array = (mgr_data -> F_fine_array);
-   HYPRE_Int      (*fine_grid_solver_solve)(void*, void*, void*, void*) = (mgr_data -> fine_grid_solver_solve);
+   HYPRE_Int            (*fine_grid_solver_solve)(void*, void*, void*, void*) =
+      (mgr_data -> fine_grid_solver_solve);
    hypre_ParCSRMatrix   **A_ff_array = (mgr_data -> A_ff_array);
 
-   HYPRE_Int            i, relax_points;
-   HYPRE_Int            num_coarse_levels = (mgr_data -> num_coarse_levels);
-
-   HYPRE_Real    alpha;
-   HYPRE_Real    beta;
-
-   HYPRE_Int           *Frelax_method = (mgr_data -> Frelax_method);
-   hypre_ParAMGData    **FrelaxVcycleData = (mgr_data -> FrelaxVcycleData);
-
-   HYPRE_Int      *restrict_type = (mgr_data -> restrict_type);
-   HYPRE_Int      use_air = 0;
-   HYPRE_Int      my_id;
-
-//   HYPRE_Real     wall_time;
+   HYPRE_Int              i, relax_points;
+   HYPRE_Int              num_coarse_levels = (mgr_data -> num_coarse_levels);
+
+   HYPRE_Complex          fp_zero = 0.0;
+   HYPRE_Complex          fp_one = 1.0;
+   HYPRE_Complex          fp_neg_one = - fp_one;
+
+   HYPRE_Int             *Frelax_type = (mgr_data -> Frelax_type);
+   HYPRE_Int             *interp_type = (mgr_data -> interp_type);
+   hypre_ParAMGData     **FrelaxVcycleData = (mgr_data -> FrelaxVcycleData);
+   HYPRE_Real           **frelax_diaginv = (mgr_data -> frelax_diaginv);
+   HYPRE_Int             *blk_size = (mgr_data -> blk_size);
+   HYPRE_Int              block_size = (mgr_data -> block_size);
+   HYPRE_Int             *block_num_coarse_indexes = (mgr_data -> block_num_coarse_indexes);
+   /* TODO (VPM): refactor names blk_size and block_size */
+
+   HYPRE_Int             *level_smooth_type = (mgr_data -> level_smooth_type);
+   HYPRE_Int             *level_smooth_iters = (mgr_data -> level_smooth_iters);
+
+   HYPRE_Int             *restrict_type  = (mgr_data -> restrict_type);
+   HYPRE_Int              pre_smoothing  = (mgr_data -> global_smooth_cycle) == 1 ? 1 : 0;
+   HYPRE_Int              post_smoothing = (mgr_data -> global_smooth_cycle) == 2 ? 1 : 0;
+   HYPRE_Int              my_id;
+   char                   region_name[1024];
+   char                   msg[1024];
+
+#if defined(HYPRE_USING_GPU)
+   HYPRE_MemoryLocation   memory_location;
+   HYPRE_ExecutionPolicy  exec;
+#endif
 
    /* Initialize */
    HYPRE_ANNOTATE_FUNC_BEGIN;
+   hypre_GpuProfilingPushRange("MGRCycle");
 
    comm = hypre_ParCSRMatrixComm(A_array[0]);
    hypre_MPI_Comm_rank(comm, &my_id);
 
-   Solve_err_flag = 0;
    Not_Finished = 1;
    cycle_type = 1;
    level = 0;
@@ -647,269 +598,687 @@ hypre_MGRCycle( void               *mgr_vdata,
    /***** Main loop ******/
    while (Not_Finished)
    {
+      /* Update scratch vector sizes */
+      local_size = hypre_VectorSize(hypre_ParVectorLocalVector(F_array[level]));
+      hypre_ParVectorSetLocalSize(Vtemp, local_size);
+      hypre_ParVectorSetLocalSize(Ztemp, local_size);
+      hypre_ParVectorSetLocalSize(Utemp, local_size);
+
       /* Do coarse grid correction solve */
-      if(cycle_type == 3)
+      if (cycle_type == 3)
       {
-         /* call coarse grid solver here */
-         /* default is BoomerAMG */
-         //wall_time = time_getWallclockSeconds();
+         /* call coarse grid solver here (default is BoomerAMG) */
+         hypre_sprintf(region_name, "%s-%d", "MGR_Level", level);
+         hypre_GpuProfilingPushRange(region_name);
+         HYPRE_ANNOTATE_REGION_BEGIN("%s", region_name);
+
          coarse_grid_solver_solve(cg_solver, RAP, F_array[level], U_array[level]);
          if (use_default_cgrid_solver)
          {
             HYPRE_Real convergence_factor_cg;
             hypre_BoomerAMGGetRelResidualNorm(cg_solver, &convergence_factor_cg);
             (mgr_data -> cg_convergence_factor) = convergence_factor_cg;
-            if ((print_level) > 1 && my_id == 0 && convergence_factor_cg > 1.0)
+            if ((print_level) > 1 && my_id == 0 && convergence_factor_cg > hypre_cabs(fp_one))
             {
-               hypre_printf("Warning!!! Coarse grid solve diverges. Factor = %1.2e\n", convergence_factor_cg);
+               hypre_printf("Warning!!! Coarse grid solve diverges. Factor = %1.2e\n",
+                            convergence_factor_cg);
             }
          }
-         //wall_time = time_getWallclockSeconds() - wall_time;
-         //if (my_id == 0) hypre_printf("Coarse grid solve: %f\n", wall_time);
 
-         // DEBUG: print the coarse system indicated by mgr_data ->print_coarse_system
-         if(mgr_data -> print_coarse_system)
+         /* Error checking */
+         if (HYPRE_GetError())
+         {
+            hypre_sprintf(msg, "[%d]: Error from MGR's coarsest level solver (level %d)\n",
+                          my_id, level);
+            hypre_error_w_msg(HYPRE_ERROR_GENERIC, msg);
+            HYPRE_ClearAllErrors();
+         }
+
+         /* DEBUG: print the coarse system indicated by mgr_data->print_coarse_system */
+         if (mgr_data -> print_coarse_system)
          {
-            //HYPRE_ParCSRMatrixPrint(RAP, "RAP_mat");
-            //HYPRE_ParVectorPrint(F_array[level], "RAP_rhs");
-            //HYPRE_ParVectorPrint(U_array[level], "RAP_sol");
             hypre_ParCSRMatrixPrintIJ(RAP, 1, 1, "RAP_mat");
             hypre_ParVectorPrintIJ(F_array[level], 1, "RAP_rhs");
             hypre_ParVectorPrintIJ(U_array[level], 1, "RAP_sol");
             mgr_data -> print_coarse_system--;
          }
+
          /**** cycle up ***/
          cycle_type = 2;
+
+         hypre_GpuProfilingPopRange();
+         HYPRE_ANNOTATE_REGION_END("%s", region_name);
       }
-      /* F-relaxation */
-      else if(cycle_type == 1)
+      /* Down cycle */
+      else if (cycle_type == 1)
       {
-         fine_grid = level;
-         coarse_grid = level + 1;
-         /* Relax solution - F-relaxation */
-         relax_points = -1;
+         /* Set fine/coarse grid level indices */
+         fine_grid       = level;
+         coarse_grid     = level + 1;
+         l1_norms        = l1_norms_array[fine_grid] ?
+                           hypre_VectorData(l1_norms_array[fine_grid]) : NULL;
+         CF_marker_data  = hypre_IntArrayData(CF_marker[fine_grid]);
+
+#if defined(HYPRE_USING_GPU)
+         memory_location = hypre_ParCSRMatrixMemoryLocation(A_array[fine_grid]);
+         exec            = hypre_GetExecPolicy1(memory_location);
+#endif
+
+         hypre_sprintf(region_name, "%s-%d", "MGR_Level", fine_grid);
+         hypre_GpuProfilingPushRange(region_name);
+         HYPRE_ANNOTATE_REGION_BEGIN("%s", region_name);
+
+         /* Global pre smoothing sweeps */
+         if (pre_smoothing && (level_smooth_iters[fine_grid] > 0))
+         {
+            hypre_sprintf(region_name, "Global-Relax");
+            hypre_GpuProfilingPushRange(region_name);
+            HYPRE_ANNOTATE_REGION_BEGIN("%s", region_name);
+
+            if ((level_smooth_type[fine_grid]) == 0 ||
+                (level_smooth_type[fine_grid]) == 1)
+            {
+               /* Block Jacobi/Gauss-Seidel smoother */
+#if defined(HYPRE_USING_GPU)
+               if (exec == HYPRE_EXEC_DEVICE)
+               {
+                  for (i = 0; i < level_smooth_iters[fine_grid]; i++)
+                  {
+                     hypre_MGRBlockRelaxSolveDevice(B_array[fine_grid], A_array[fine_grid],
+                                                    F_array[fine_grid], U_array[fine_grid],
+                                                    Vtemp, fp_one);
+                  }
+               }
+               else
+#endif
+               {
+                  HYPRE_Real *level_diaginv  = (mgr_data -> level_diaginv)[fine_grid];
+                  HYPRE_Int   level_blk_size = (level == 0) ? block_size :
+                                               block_num_coarse_indexes[level - 1];
+                  HYPRE_Int   nrows          = hypre_ParCSRMatrixNumRows(A_array[fine_grid]);
+                  HYPRE_Int   n_block        = nrows / level_blk_size;
+                  HYPRE_Int   left_size      = nrows - n_block * level_blk_size;
+                  for (i = 0; i < level_smooth_iters[fine_grid]; i++)
+                  {
+                     hypre_MGRBlockRelaxSolve(A_array[fine_grid], F_array[fine_grid],
+                                              U_array[fine_grid], level_blk_size,
+                                              n_block, left_size, level_smooth_type[fine_grid],
+                                              level_diaginv, Vtemp);
+                  }
+               }
+            }
+            else if ((level_smooth_type[fine_grid] > 1) &&
+                     (level_smooth_type[fine_grid] < 7))
+            {
+               for (i = 0; i < level_smooth_iters[fine_grid]; i ++)
+               {
+                  hypre_BoomerAMGRelax(A_array[fine_grid], F_array[fine_grid], NULL,
+                                       level_smooth_type[fine_grid] - 1, 0, fp_one,
+                                       fp_zero, NULL, U_array[fine_grid], Vtemp, NULL);
+               }
+            }
+            else if (level_smooth_type[fine_grid] == 8)
+            {
+               /* Euclid ILU smoother */
+               for (i = 0; i < level_smooth_iters[fine_grid]; i++)
+               {
+                  /* Compute residual */
+                  hypre_ParCSRMatrixMatvecOutOfPlace(fp_neg_one, A_array[fine_grid],
+                                                     U_array[fine_grid], fp_one,
+                                                     F_array[fine_grid], Vtemp);
 
-         //wall_time = time_getWallclockSeconds() - wall_time;
-         if (Frelax_method[level] == 0)
-         { /* (single level) relaxation for A_ff */
-            if (relax_type == 18)
+                  /* Solve */
+                  HYPRE_EuclidSolve((mgr_data -> level_smoother)[fine_grid],
+                                    A_array[fine_grid], Vtemp, Utemp);
+
+                  /* Update solution */
+                  hypre_ParVectorAxpy(fp_one, Utemp, U_array[fine_grid]);
+               }
+            }
+            else if ((mgr_data -> level_smoother)[fine_grid])
+            {
+               /* Generic smoother object */
+               hypre_Solver *base = (hypre_Solver*) (mgr_data -> level_smoother)[fine_grid];
+
+               hypre_SolverSolve(base)((mgr_data -> level_smoother)[fine_grid],
+                                       (HYPRE_Matrix) A_array[fine_grid],
+                                       (HYPRE_Vector) F_array[fine_grid],
+                                       (HYPRE_Vector) U_array[fine_grid]);
+            }
+            else
             {
-               for(i=0; i<nsweeps; i++)
+               /* Generic relaxation interface */
+               for (i = 0; i < level_smooth_iters[fine_grid]; i++)
                {
-                  hypre_ParCSRRelax_L1_Jacobi(A_array[fine_grid], F_array[fine_grid], hypre_IntArrayData(CF_marker[fine_grid]),
-                        relax_points, relax_weight,
-                        relax_l1_norms[fine_grid] ? hypre_VectorData(relax_l1_norms[fine_grid]) : NULL,
-                        U_array[fine_grid], Vtemp);
+                  hypre_BoomerAMGRelax(A_array[fine_grid], F_array[fine_grid],
+                                       NULL, level_smooth_type[fine_grid],
+                                       0, fp_one, fp_one, l1_norms,
+                                       U_array[fine_grid], Vtemp, Ztemp);
                }
             }
-            else if(relax_type == 8 || relax_type == 13 || relax_type == 14)
+            hypre_ParVectorAllZeros(U_array[fine_grid]) = 0;
+
+            /* Error checking */
+            if (HYPRE_GetError())
             {
-               for(i=0; i<nsweeps; i++)
+               hypre_sprintf(msg, "[%d]: Error from global pre-relaxation %d at level %d \n",
+                             my_id, level_smooth_type[fine_grid], fine_grid);
+               hypre_error_w_msg(HYPRE_ERROR_GENERIC, msg);
+               HYPRE_ClearAllErrors();
+            }
+
+            hypre_GpuProfilingPopRange();
+            HYPRE_ANNOTATE_REGION_END("%s", region_name);
+         } /* End global pre-smoothing */
+
+         /* F-relaxation */
+         relax_points = -1;
+         hypre_sprintf(region_name, "F-Relax");
+         hypre_GpuProfilingPushRange(region_name);
+         HYPRE_ANNOTATE_REGION_BEGIN("%s", region_name);
+
+         if (Frelax_type[fine_grid] == 0)
+         {
+            /* (single level) Block-relaxation for A_ff */
+            if (interp_type[fine_grid] == 12)
+            {
+               HYPRE_Int  nrows     = hypre_ParCSRMatrixNumRows(A_ff_array[fine_grid]);
+               HYPRE_Int  n_block   = nrows / blk_size[fine_grid];
+               HYPRE_Int  left_size = nrows - n_block * blk_size[fine_grid];
+
+               for (i = 0; i < nsweeps[fine_grid]; i++)
                {
-                  hypre_BoomerAMGRelax(A_array[fine_grid], F_array[fine_grid], hypre_IntArrayData(CF_marker[fine_grid]),
-                        relax_type, relax_points, relax_weight,
-                        omega,
-                        relax_l1_norms[fine_grid] ? hypre_VectorData(relax_l1_norms[fine_grid]) : NULL,
-                        U_array[fine_grid], Vtemp, Ztemp);
+                  /* F-relaxation is reducing the global residual, thus recompute it */
+                  hypre_ParCSRMatrixMatvecOutOfPlace(fp_neg_one, A_array[fine_grid],
+                                                     U_array[fine_grid], fp_one,
+                                                     F_array[fine_grid], Vtemp);
+
+                  /* Restrict to F points */
+#if defined(HYPRE_USING_GPU)
+                  if (exec == HYPRE_EXEC_DEVICE)
+                  {
+                     hypre_ParCSRMatrixMatvecT(fp_one, P_FF_array[fine_grid], Vtemp,
+                                               fp_zero, F_fine_array[coarse_grid]);
+                  }
+                  else
+#endif
+                  {
+                     hypre_MGRAddVectorR(CF_marker[fine_grid], FMRK, fp_one, Vtemp,
+                                         fp_zero, &(F_fine_array[coarse_grid]));
+                  }
+
+                  /* Set initial guess to zero */
+                  hypre_ParVectorSetZeros(U_fine_array[coarse_grid]);
+
+#if defined(HYPRE_USING_GPU)
+                  if (exec == HYPRE_EXEC_DEVICE)
+                  {
+                     hypre_MGRBlockRelaxSolveDevice(B_FF_array[fine_grid],
+                                                    A_ff_array[fine_grid],
+                                                    F_fine_array[coarse_grid],
+                                                    U_fine_array[coarse_grid],
+                                                    Vtemp, fp_one);
+                  }
+                  else
+#endif
+                  {
+                     hypre_MGRBlockRelaxSolve(A_ff_array[fine_grid], F_fine_array[coarse_grid],
+                                              U_fine_array[coarse_grid], blk_size[fine_grid],
+                                              n_block, left_size, 0, frelax_diaginv[fine_grid],
+                                              Vtemp);
+                  }
+
+                  /* Interpolate the solution back to the fine grid level */
+#if defined(HYPRE_USING_GPU)
+                  if (exec == HYPRE_EXEC_DEVICE)
+                  {
+                     hypre_ParCSRMatrixMatvec(fp_one, P_FF_array[fine_grid],
+                                              U_fine_array[coarse_grid], fp_one,
+                                              U_fine_array[fine_grid]);
+                  }
+                  else
+#endif
+                  {
+                     hypre_MGRAddVectorP(CF_marker[fine_grid], FMRK, fp_one,
+                                         U_fine_array[coarse_grid], fp_one,
+                                         &(U_array[fine_grid]));
+                  }
                }
             }
             else
             {
-               for(i=0; i<nsweeps; i++)
+               if (relax_type == 18)
+               {
+#if defined(HYPRE_USING_GPU)
+                  if (exec == HYPRE_EXEC_DEVICE)
+                  {
+                     for (i = 0; i < nsweeps[fine_grid]; i++)
+                     {
+                        hypre_MGRRelaxL1JacobiDevice(A_array[fine_grid], F_array[fine_grid],
+                                                     CF_marker_data, relax_points, relax_weight,
+                                                     l1_norms, U_array[fine_grid], Vtemp);
+                     }
+                  }
+                  else
+#endif
+                  {
+                     for (i = 0; i < nsweeps[fine_grid]; i++)
+                     {
+                        hypre_ParCSRRelax_L1_Jacobi(A_array[fine_grid], F_array[fine_grid],
+                                                    CF_marker_data, relax_points, relax_weight,
+                                                    l1_norms, U_array[fine_grid], Vtemp);
+                     }
+                  }
+               }
+               else
                {
-                  Solve_err_flag = hypre_BoomerAMGRelax(A_array[fine_grid], F_array[fine_grid], hypre_IntArrayData(CF_marker[fine_grid]),
-                        relax_type,relax_points,relax_weight,omega,NULL, U_array[fine_grid], Vtemp, Ztemp);
+                  for (i = 0; i < nsweeps[fine_grid]; i++)
+                  {
+                     hypre_BoomerAMGRelax(A_array[fine_grid], F_array[fine_grid],
+                                          CF_marker_data, relax_type, relax_points,
+                                          relax_weight, omega, l1_norms,
+                                          U_array[fine_grid], Vtemp, Ztemp);
+                  }
                }
             }
          }
-         else if (Frelax_method[level] == 1)
+         else if (Frelax_type[fine_grid] == 1)
          {
-            /* v-cycle smoother for A_ff */
+            /* V-cycle smoother for A_ff */
             //HYPRE_Real convergence_factor_frelax;
             // compute residual before solve
-            //  hypre_ParCSRMatrixMatvecOutOfPlace(-1.0, A_array[level],
-            //                                    U_array[level], 1.0, F_array[level], Vtemp);
+            // hypre_ParCSRMatrixMatvecOutOfPlace(-fp_one, A_array[fine_grid],
+            //                                    U_array[fine_grid], fp_one,
+            //                                    F_array[fine_grid], Vtemp);
             //  convergence_factor_frelax = hypre_ParVectorInnerProd(Vtemp, Vtemp);
 
-            HYPRE_Real resnorm, init_resnorm;
-            HYPRE_Real rhs_norm, old_resnorm;
-            HYPRE_Real rel_resnorm = 1.0;
-            HYPRE_Real conv_factor = 1.0;
+            HYPRE_Real resnorm = 0.0, init_resnorm;
+            HYPRE_Real rhs_norm = 0.0, old_resnorm;
+            HYPRE_Real rel_resnorm = fp_one;
+            HYPRE_Real conv_factor = fp_one;
             if (frelax_print_level > 1)
-            {                                
-                hypre_ParCSRMatrixMatvecOutOfPlace(-1.0, A_array[level],
-                                                U_array[level], 1.0, F_array[level], Vtemp);
-                                                
-                resnorm = hypre_ParVectorInnerProd(Vtemp, Vtemp);                                
-                init_resnorm = resnorm;
-                rhs_norm = sqrt(hypre_ParVectorInnerProd(F_array[level], F_array[level]));
-                
-                if (rhs_norm > HYPRE_REAL_EPSILON)
-                {
-                   rel_resnorm = init_resnorm / rhs_norm;
-                }                                      
-                else
-                {
-                   /* rhs is zero, return a zero solution */
-                   hypre_ParVectorSetConstantValues(U_array[0], 0.0);
-
-                   HYPRE_ANNOTATE_FUNC_END;
-
-                   return hypre_error_flag;
-                }
-                if(my_id == 0)
-                {                                                
-                   hypre_printf("\nBegin F-relaxation: V-Cycle Smoother \n");
-                   hypre_printf("                                            relative\n");
-                   hypre_printf("               residual        factor       residual\n");
-                   hypre_printf("               --------        ------       --------\n");
-                   hypre_printf("    Initial    %e                 %e\n",init_resnorm,
-                                     rel_resnorm);
+            {
+               hypre_ParCSRMatrixMatvecOutOfPlace(fp_neg_one, A_array[fine_grid],
+                                                  U_array[fine_grid], fp_one,
+                                                  F_array[fine_grid], Vtemp);
+
+               resnorm = hypre_sqrt(hypre_ParVectorInnerProd(Vtemp, Vtemp));
+               init_resnorm = resnorm;
+               rhs_norm = hypre_sqrt(hypre_ParVectorInnerProd(F_array[fine_grid], F_array[fine_grid]));
+
+               if (rhs_norm > HYPRE_REAL_EPSILON)
+               {
+                  rel_resnorm = init_resnorm / rhs_norm;
+               }
+               else
+               {
+                  /* rhs is zero, return a zero solution */
+                  hypre_ParVectorSetZeros(U_array[0]);
+
+                  HYPRE_ANNOTATE_FUNC_END;
+                  hypre_GpuProfilingPopRange();
+
+                  return hypre_error_flag;
+               }
+               if (my_id == 0 && frelax_print_level > 1)
+               {
+                  hypre_printf("\nBegin F-relaxation: V-Cycle Smoother \n");
+                  hypre_printf("                                            relative\n");
+                  hypre_printf("               residual        factor       residual\n");
+                  hypre_printf("               --------        ------       --------\n");
+                  hypre_printf("    Initial    %e                 %e\n", init_resnorm,
+                               rel_resnorm);
                }
             }
 
-            for(i=0; i<nsweeps; i++)
+            for (i = 0; i < nsweeps[fine_grid]; i++)
             {
-               hypre_MGRFrelaxVcycle(FrelaxVcycleData[level], F_array[level], U_array[level]);
-               
-               if(frelax_print_level > 1)
+               hypre_MGRFrelaxVcycle(FrelaxVcycleData[fine_grid],
+                                     F_array[fine_grid],
+                                     U_array[fine_grid]);
+
+               if (frelax_print_level > 1)
                {
                   old_resnorm = resnorm;
-                  hypre_ParCSRMatrixMatvecOutOfPlace(-1.0, A_array[level],
-                                                   U_array[level], 1.0, F_array[level], Vtemp);
-                  resnorm = hypre_ParVectorInnerProd(Vtemp, Vtemp);                                
-
-                  if (old_resnorm) conv_factor = resnorm / old_resnorm;
-                  else conv_factor = resnorm;               
-                
-                  if (rhs_norm > HYPRE_REAL_EPSILON)
-                  {
-                     rel_resnorm = resnorm / rhs_norm;
-                  }
-                  else
-                  {
-                     rel_resnorm = resnorm;
-                  }   
-
-                  if (my_id == 0 )
+                  hypre_ParCSRMatrixMatvecOutOfPlace(fp_neg_one, A_array[fine_grid],
+                                                     U_array[fine_grid], fp_one,
+                                                     F_array[fine_grid], Vtemp);
+                  resnorm = hypre_sqrt(hypre_ParVectorInnerProd(Vtemp, Vtemp));
+                  conv_factor = (old_resnorm > HYPRE_REAL_EPSILON) ?
+                                (resnorm / old_resnorm) : resnorm;
+                  rel_resnorm = (rhs_norm > HYPRE_REAL_EPSILON) ? (resnorm / rhs_norm) : resnorm;
+
+                  if (my_id == 0)
                   {
-                      hypre_printf("\n    V-Cycle %2d   %e    %f     %e \n", i,
-                      resnorm, conv_factor, rel_resnorm);
+                     hypre_printf("\n    V-Cycle %2d   %e    %f     %e \n", i,
+                                  resnorm, conv_factor, rel_resnorm);
                   }
                }
             }
             if (my_id == 0 && frelax_print_level > 1)
-            {     
-                hypre_printf("End F-relaxation: V-Cycle Smoother \n\n");
+            {
+               hypre_printf("End F-relaxation: V-Cycle Smoother \n\n");
             }
             // compute residual after solve
-            //hypre_ParCSRMatrixMatvecOutOfPlace(-1.0, A_array[level],
-            //                                  U_array[level], 1.0, F_array[level], Vtemp);
+            //hypre_ParCSRMatrixMatvecOutOfPlace(fp_neg_one, A_array[fine_grid],
+            //                                   U_array[fine_grid], fp_one,
+            //                                   F_array[fine_grid], Vtemp);
             //convergence_factor_frelax = hypre_ParVectorInnerProd(Vtemp, Vtemp)/convergence_factor_frelax;
             //hypre_printf("F-relaxation V-cycle convergence factor: %5f\n", convergence_factor_frelax);
          }
-         else if (Frelax_method[level] == 2)
+         else if (Frelax_type[level] == 2  ||
+                  Frelax_type[level] == 9  ||
+                  Frelax_type[level] == 99 ||
+                  Frelax_type[level] == 199)
          {
-                // We need to first compute residual to ensure that 
-                // F-relaxation is reducing the global residual
-
-                alpha = -1.0;
-                beta = 1.0;
-               hypre_ParCSRMatrixMatvecOutOfPlace(alpha, A_array[fine_grid], U_array[fine_grid], beta, F_array[fine_grid], Vtemp);
-               
-            // restrict to F points
-//            hypre_ParVectorSetConstantValues(F_fine_array[coarse_grid], 0.0);
-            hypre_MGRAddVectorR(hypre_IntArrayData(CF_marker[fine_grid]), FMRK, 1.0, Vtemp, 0.0, &(F_fine_array[coarse_grid]));
-            // initialize solution array
-            hypre_ParVectorSetConstantValues(U_fine_array[coarse_grid], 0.0);            
-            // solve
-            fine_grid_solver_solve((mgr_data -> aff_solver)[fine_grid], A_ff_array[fine_grid], F_fine_array[coarse_grid],
-                  U_fine_array[coarse_grid]);
-            // update solution      
-            hypre_MGRAddVectorP(hypre_IntArrayData(CF_marker[fine_grid]), FMRK, 1.0, U_fine_array[coarse_grid], 1.0, &(U_array[fine_grid]));
+            /* We need to compute the residual first to ensure that
+               F-relaxation is reducing the global residual */
+            hypre_ParCSRMatrixMatvecOutOfPlace(fp_neg_one, A_array[fine_grid],
+                                               U_array[fine_grid], fp_one,
+                                               F_array[fine_grid], Vtemp);
+
+            /* Restrict to F points */
+#if defined(HYPRE_USING_GPU)
+            if (exec == HYPRE_EXEC_DEVICE)
+            {
+               hypre_ParCSRMatrixMatvecT(fp_one, P_FF_array[fine_grid], Vtemp,
+                                         fp_zero, F_fine_array[coarse_grid]);
+            }
+            else
+#endif
+            {
+               hypre_MGRAddVectorR(CF_marker[fine_grid], FMRK, fp_one, Vtemp,
+                                   fp_zero, &(F_fine_array[coarse_grid]));
+            }
+
+            /* Set initial guess to zeros */
+            hypre_ParVectorSetZeros(U_fine_array[coarse_grid]);
+
+            if (Frelax_type[level] == 2)
+            {
+               /* Do F-relaxation using AMG */
+               if (level == 0)
+               {
+                  /* TODO (VPM): unify with the next block */
+                  fine_grid_solver_solve((mgr_data -> aff_solver)[fine_grid],
+                                         A_ff_array[fine_grid],
+                                         F_fine_array[coarse_grid],
+                                         U_fine_array[coarse_grid]);
+               }
+               else
+               {
+                  aff_base = (hypre_Solver*) (mgr_data -> aff_solver)[level];
+
+                  hypre_SolverSolve(aff_base)((HYPRE_Solver) (mgr_data -> aff_solver)[level],
+                                              (HYPRE_Matrix) A_ff_array[level],
+                                              (HYPRE_Vector) F_fine_array[level + 1],
+                                              (HYPRE_Vector) U_fine_array[level + 1]);
+               }
+            }
+            else
+            {
+               /* Do F-relaxation using Gaussian Elimination */
+               hypre_GaussElimSolve((mgr_data -> GSElimData)[fine_grid],
+                                    level, Frelax_type[level]);
+            }
+
+            /* Interpolate the solution back to the fine grid level */
+#if defined(HYPRE_USING_GPU)
+            if (exec == HYPRE_EXEC_DEVICE)
+            {
+               hypre_ParCSRMatrixMatvec(fp_one, P_FF_array[fine_grid],
+                                        U_fine_array[coarse_grid], fp_one,
+                                        U_array[fine_grid]);
+            }
+            else
+#endif
+            {
+               hypre_MGRAddVectorP(CF_marker[fine_grid], FMRK, fp_one,
+                                   U_fine_array[coarse_grid], fp_one,
+                                   &(U_array[fine_grid]));
+            }
          }
          else
          {
-            for (i=0; i<nsweeps; i++)
+            for (i = 0; i < nsweeps[fine_grid]; i++)
             {
-               Solve_err_flag = hypre_BoomerAMGRelax(A_array[fine_grid], F_array[fine_grid], hypre_IntArrayData(CF_marker[fine_grid]),
-                     relax_type, relax_points, relax_weight, omega, NULL, U_array[fine_grid], Vtemp, Ztemp);
+               hypre_BoomerAMGRelax(A_array[fine_grid], F_array[fine_grid],
+                                    CF_marker_data, Frelax_type[fine_grid],
+                                    relax_points, relax_weight, omega, l1_norms,
+                                    U_array[fine_grid], Vtemp, Ztemp);
             }
          }
-         //wall_time = time_getWallclockSeconds() - wall_time;
-         //if (my_id == 0) hypre_printf("F-relaxation solve level %d: %f\n", coarse_grid, wall_time);
 
-         // Update residual and compute coarse-grid rhs
-         alpha = -1.0;
-         beta = 1.0;
+         /* Error checking */
+         if (HYPRE_GetError())
+         {
+            hypre_sprintf(msg, "[%d]: Error from F-relaxation %d at MGR level %d\n",
+                          my_id, Frelax_type[fine_grid], fine_grid);
+            hypre_error_w_msg(HYPRE_ERROR_GENERIC, msg);
+            HYPRE_ClearAllErrors();
+         }
+
+         hypre_GpuProfilingPopRange();
+         HYPRE_ANNOTATE_REGION_END("%s", region_name);
 
-         hypre_ParCSRMatrixMatvecOutOfPlace(alpha, A_array[fine_grid], U_array[fine_grid],
-               beta, F_array[fine_grid], Vtemp);
+         /* Update residual and compute coarse-grid rhs */
+         hypre_sprintf(region_name, "Residual");
+         hypre_GpuProfilingPushRange(region_name);
+         HYPRE_ANNOTATE_REGION_BEGIN("%s", region_name);
 
-         alpha = 1.0;
-         beta = 0.0;
+         hypre_ParCSRMatrixMatvecOutOfPlace(fp_neg_one, A_array[fine_grid],
+                                            U_array[fine_grid], fp_one,
+                                            F_array[fine_grid], Vtemp);
 
-         if (restrict_type[fine_grid] == 4 || restrict_type[fine_grid] == 5)
-            use_air = 1;
+         hypre_GpuProfilingPopRange();
+         HYPRE_ANNOTATE_REGION_END("%s", region_name);
 
-         if (use_air)
+         hypre_sprintf(region_name, "Restrict");
+         hypre_GpuProfilingPushRange(region_name);
+         HYPRE_ANNOTATE_REGION_BEGIN("%s", region_name);
+         if (R_array[fine_grid])
          {
             /* no transpose necessary for R */
-            hypre_ParCSRMatrixMatvec(alpha, RT_array[fine_grid], Vtemp,
-                  beta, F_array[coarse_grid]);
+            hypre_ParCSRMatrixMatvec(fp_one, R_array[fine_grid], Vtemp,
+                                     fp_zero, F_array[coarse_grid]);
          }
          else
          {
-            hypre_ParCSRMatrixMatvecT(alpha,RT_array[fine_grid],Vtemp,
-                  beta,F_array[coarse_grid]);
+#if defined(HYPRE_USING_GPU)
+            if (restrict_type[fine_grid] > 0 || (exec == HYPRE_EXEC_DEVICE))
+#else
+            if (restrict_type[fine_grid] > 0)
+#endif
+            {
+               hypre_ParCSRMatrixMatvecT(fp_one, RT_array[fine_grid], Vtemp,
+                                         fp_zero, F_array[coarse_grid]);
+            }
+            else
+            {
+               hypre_MGRAddVectorR(CF_marker[fine_grid], CMRK, fp_one,
+                                   Vtemp, fp_zero, &(F_array[coarse_grid]));
+            }
          }
-         // initialize coarse grid solution array
-         hypre_ParVectorSetConstantValues(U_array[coarse_grid], 0.0);
+         hypre_GpuProfilingPopRange();
+         HYPRE_ANNOTATE_REGION_END("%s", region_name);
 
-         ++level;
+         hypre_sprintf(region_name, "%s-%d", "MGR_Level", fine_grid);
+         hypre_GpuProfilingPopRange();
+         HYPRE_ANNOTATE_REGION_END("%s", region_name);
 
-         if (level == num_coarse_levels) cycle_type = 3;
-      } // end cycle_type == 1
-      else if(level != 0)
+         /* Initialize coarse grid solution array (VPM: double-check this for multiple cycles)*/
+         hypre_ParVectorSetZeros(U_array[coarse_grid]);
+
+         ++level;
+         if (level == num_coarse_levels)
+         {
+            cycle_type = 3;
+         }
+      }
+      /* Up cycle */
+      else if (level != 0)
       {
+         /* Set fine/coarse grid level indices */
+         fine_grid       = level - 1;
+         coarse_grid     = level;
+         l1_norms        = l1_norms_array[fine_grid] ?
+                           hypre_VectorData(l1_norms_array[fine_grid]) : NULL;
+         CF_marker_data  = hypre_IntArrayData(CF_marker[fine_grid]);
+
+#if defined(HYPRE_USING_GPU)
+         memory_location = hypre_ParCSRMatrixMemoryLocation(A_array[fine_grid]);
+         exec            = hypre_GetExecPolicy1(memory_location);
+#endif
+
+         hypre_sprintf(region_name, "%s-%d", "MGR_Level", fine_grid);
+         hypre_GpuProfilingPushRange(region_name);
+         HYPRE_ANNOTATE_REGION_BEGIN("%s", region_name);
+
          /* Interpolate */
+         hypre_sprintf(region_name, "Prolongate");
+         hypre_GpuProfilingPushRange(region_name);
+         HYPRE_ANNOTATE_REGION_BEGIN("%s", region_name);
+
+#if defined(HYPRE_USING_GPU)
+         if (interp_type[fine_grid] > 0 || (exec == HYPRE_EXEC_DEVICE))
+#else
+         if (interp_type[fine_grid] > 0)
+#endif
+         {
+            hypre_ParCSRMatrixMatvec(fp_one, P_array[fine_grid],
+                                     U_array[coarse_grid],
+                                     fp_one, U_array[fine_grid]);
+         }
+         else
+         {
+            hypre_MGRAddVectorP(CF_marker[fine_grid], CMRK, fp_one,
+                                U_array[coarse_grid], fp_one,
+                                &(U_array[fine_grid]));
+         }
 
-         fine_grid = level - 1;
-         coarse_grid = level;
-         alpha = 1.0;
-         beta = 1.0;
+         hypre_GpuProfilingPopRange();
+         HYPRE_ANNOTATE_REGION_END("%s", region_name);
 
-         hypre_ParCSRMatrixMatvec(alpha, P_array[fine_grid],
-               U_array[coarse_grid],
-               beta, U_array[fine_grid]);
+         /* Global post smoothing sweeps */
+         if (post_smoothing & (level_smooth_iters[fine_grid] > 0))
+         {
+            hypre_sprintf(region_name, "Global-Relax");
+            hypre_GpuProfilingPushRange(region_name);
+            HYPRE_ANNOTATE_REGION_BEGIN("%s", region_name);
 
-         /* post relaxation sweeps */
-         /*
-            if (level == 2)
+            /* Block Jacobi smoother */
+            if ((level_smooth_type[fine_grid] == 0) ||
+                (level_smooth_type[fine_grid] == 1))
+            {
+#if defined(HYPRE_USING_GPU)
+               if (exec == HYPRE_EXEC_DEVICE)
+               {
+                  for (i = 0; i < level_smooth_iters[fine_grid]; i++)
+                  {
+                     hypre_MGRBlockRelaxSolveDevice(B_array[fine_grid], A_array[fine_grid],
+                                                    F_array[fine_grid], U_array[fine_grid],
+                                                    Vtemp, fp_one);
+                  }
+               }
+               else
+#endif
+               {
+                  HYPRE_Real *level_diaginv  = (mgr_data -> level_diaginv)[fine_grid];
+                  HYPRE_Int   level_blk_size = (fine_grid == 0) ? block_size :
+                                               block_num_coarse_indexes[fine_grid - 1];
+                  HYPRE_Int   nrows          = hypre_ParCSRMatrixNumRows(A_array[fine_grid]);
+                  HYPRE_Int   n_block        = nrows / level_blk_size;
+                  HYPRE_Int   left_size      = nrows - n_block * level_blk_size;
+                  for (i = 0; i < level_smooth_iters[fine_grid]; i++)
+                  {
+                     hypre_MGRBlockRelaxSolve(A_array[fine_grid], F_array[fine_grid],
+                                              U_array[fine_grid], level_blk_size, n_block,
+                                              left_size, level_smooth_type[fine_grid],
+                                              level_diaginv, Vtemp);
+                  }
+               }
+            }
+            else if ((level_smooth_type[fine_grid] > 1) && (level_smooth_type[fine_grid] < 7))
             {
-            hypre_printf("Size of A: %d\n", hypre_ParCSRMatrixGlobalNumRows(A_array[fine_grid]));
-            for(i=0; i<nsweeps; i++)
+               for (i = 0; i < level_smooth_iters[fine_grid]; i++)
+               {
+                  hypre_BoomerAMGRelax(A_array[fine_grid], F_array[fine_grid], NULL,
+                                       level_smooth_type[fine_grid] - 1, 0, fp_one,
+                                       fp_zero, l1_norms, U_array[fine_grid], Vtemp, NULL);
+               }
+            }
+            else if (level_smooth_type[fine_grid] == 8)
             {
-            Solve_err_flag = hypre_BoomerAMGRelax(A_array[fine_grid], F_array[fine_grid], CF_marker[fine_grid],
-            relax_type, relax_points, relax_weight, omega, NULL, U_array[fine_grid], Vtemp, Ztemp);
+               /* Euclid ILU */
+               for (i = 0; i < level_smooth_iters[fine_grid]; i++)
+               {
+                  /* Compute residual */
+                  hypre_ParCSRMatrixMatvecOutOfPlace(fp_neg_one, A_array[fine_grid],
+                                                     U_array[fine_grid], fp_one,
+                                                     F_array[fine_grid], Vtemp);
+                  /* Solve */
+                  HYPRE_EuclidSolve((mgr_data -> level_smoother)[fine_grid],
+                                    A_array[fine_grid], Vtemp, Utemp);
+
+                  /* Update solution */
+                  hypre_ParVectorAxpy(fp_one, Utemp, U_array[fine_grid]);
+               }
             }
+            else if (level_smooth_type[fine_grid] == 16)
+            {
+               /* HYPRE ILU */
+               HYPRE_ILUSolve((mgr_data -> level_smoother)[fine_grid],
+                              A_array[fine_grid], F_array[fine_grid],
+                              U_array[fine_grid]);
             }
-            */
+            else if ((mgr_data -> level_smoother)[fine_grid])
+            {
+               /* User smoother */
+               hypre_Solver *base = (hypre_Solver*) (mgr_data -> level_smoother)[fine_grid];
 
-         if (Solve_err_flag != 0)
-         {
-            HYPRE_ANNOTATE_FUNC_END;
-            return(Solve_err_flag);
-         }
+               hypre_SolverSolve(base)((mgr_data -> level_smoother)[fine_grid],
+                                       (HYPRE_Matrix) A_array[fine_grid],
+                                       (HYPRE_Vector) F_array[fine_grid],
+                                       (HYPRE_Vector) U_array[fine_grid]);
+            }
+            else
+            {
+               /* Generic relaxation interface */
+               for (i = 0; i < level_smooth_iters[level]; i++)
+               {
+                  hypre_BoomerAMGRelax(A_array[fine_grid], F_array[fine_grid],
+                                       NULL, level_smooth_type[fine_grid], 0,
+                                       fp_one, fp_one, l1_norms,
+                                       U_array[fine_grid], Vtemp, Ztemp);
+               }
+            }
+
+            /* Error checking */
+            if (HYPRE_GetError())
+            {
+               hypre_sprintf(msg, "[%d]: Error from global post-relaxation %d at MGR level %d\n",
+                             my_id, level_smooth_type[fine_grid], fine_grid);
+               hypre_error_w_msg(HYPRE_ERROR_GENERIC, msg);
+               HYPRE_ClearAllErrors();
+            }
+
+            hypre_GpuProfilingPopRange();
+            HYPRE_ANNOTATE_REGION_END("%s", region_name);
+         } /* End post-smoothing */
+
+         hypre_sprintf(region_name, "%s-%d", "MGR_Level", fine_grid);
+         hypre_GpuProfilingPopRange();
+         HYPRE_ANNOTATE_REGION_END("%s", region_name);
 
          --level;
-      } // end interpolate
+      } /* End interpolate */
       else
       {
          Not_Finished = 0;
       }
    }
    HYPRE_ANNOTATE_FUNC_END;
+   hypre_GpuProfilingPopRange();
 
-   return Solve_err_flag;
+   return hypre_error_flag;
 }
diff --git a/external/hypre/src/parcsr_ls/par_mgr_stats.c b/external/hypre/src/parcsr_ls/par_mgr_stats.c
new file mode 100644
index 00000000..3f331469
--- /dev/null
+++ b/external/hypre/src/parcsr_ls/par_mgr_stats.c
@@ -0,0 +1,745 @@
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+#include "_hypre_parcsr_ls.h"
+#include "par_mgr.h" /* TODO (VPM): include this into _hypre_parcsr_ls.h */
+#include "par_ilu.h" /* TODO (VPM): include this into _hypre_parcsr_ls.h */
+
+/*--------------------------------------------------------------------
+ * hypre_MGRGetGlobalRelaxName
+ *--------------------------------------------------------------------*/
+
+const char*
+hypre_MGRGetGlobalRelaxName(hypre_ParMGRData  *mgr_data,
+                            HYPRE_Int          level )
+{
+   HYPRE_Int    smoother_type = hypre_ParMGRDataLevelSmoothTypeI(mgr_data, level);
+
+   if ((mgr_data -> level_smooth_iters)[level] < 1)
+   {
+      return "--";
+   }
+
+   switch (smoother_type)
+   {
+      case 0:
+         return "Blk-Jacobi";
+
+      case 1:
+         return "Blk-GS";
+
+      case 2:
+         return "GS";
+
+      case 3:
+         return "Forward hGS";
+
+      case 4:
+         return "Backward hGS";
+
+      case 5:
+         return "Chaotic hGS";
+
+      case 6:
+         return "hSGS";
+
+      case 7:
+         return "Jacobi";
+
+      case 8:
+         return "Euclid ILU";
+
+      case 13:
+         return "Forward L1-hGS";
+
+      case 14:
+         return "Backward L1-hGS";
+
+      case 16:
+         /* TODO (VPM): Move this to hypre_ILUGetName */
+      {
+         hypre_ParILUData *ilu_smoother = (hypre_ParILUData*)
+                                          hypre_ParMGRDataLevelSmootherI(mgr_data, level);
+         HYPRE_Int         ilu_type = hypre_ParILUDataIluType(ilu_smoother);
+         HYPRE_Int         ilu_fill = hypre_ParILUDataLfil(ilu_smoother);
+
+         switch (ilu_type)
+         {
+            case 0:
+               return (ilu_fill == 0) ? "BJ-ILU0" : "BJ-ILUK";
+
+            case 1:
+               return "BJ-ILUT";
+
+            case 10:
+               return (ilu_fill == 0) ? "GMRES-ILU0" : "GMRES-ILUK";
+
+            case 11:
+               return "GMRES-ILUT";
+
+            case 20:
+               return (ilu_fill == 0) ? "NSH-ILU0" : "NSH-ILUK";
+
+            case 21:
+               return "NSH-ILUT";
+
+            case 30:
+               return (ilu_fill == 0) ? "RAS-ILU0" : "RAS-ILUK";
+
+            case 31:
+               return "RAS-ILUT";
+
+            case 40:
+               return (ilu_fill == 0) ? "ddPQ-GMRES-ILU0" : "ddPQ-GMRES-ILUK";
+
+            case 41:
+               return "ddPQ-GMRES-ILUT";
+
+            case 50:
+               return "RAP-modILU0";
+
+            default:
+               return "Unknown";
+         }
+      }
+
+      default:
+         return "Unknown";
+   }
+}
+
+/*--------------------------------------------------------------------
+ * hypre_MGRGetFRelaxName
+ *--------------------------------------------------------------------*/
+
+const char*
+hypre_MGRGetFRelaxName(hypre_ParMGRData  *mgr_data,
+                       HYPRE_Int          level )
+{
+   HYPRE_Int  F_relax_type = hypre_ParMGRDataFRelaxTypeI(mgr_data, level);
+
+   if ((mgr_data -> num_relax_sweeps)[level] < 1)
+   {
+      return "--";
+   }
+
+   switch (F_relax_type)
+   {
+      case 0: case 7:
+         if (hypre_ParMGRDataInterpTypeI(mgr_data, level) == 12)
+         {
+            return "Blk-Jacobi";
+         }
+         else
+         {
+            return "Jacobi";
+         }
+
+      case 1:
+         return "Default AMG";
+
+      case 2:
+         return "User AMG";
+
+      case 3:
+         return "Forward hGS";
+
+      case 4:
+         return "Backward hGS";
+
+      case 5:
+         return "Chaotic hGS";
+
+      case 6:
+         return "hSGS";
+
+      case 8:
+         return "L1-hSGS";
+
+      case 9:
+         return "GaussElim";
+
+      case 13:
+         return "Forward L1-hGS";
+
+      case 14:
+         return "Backward L1-hGS";
+
+      case 16:
+         return "Chebyshev";
+
+      case 19:
+         return "LU";
+
+      case 99:
+         return "LU piv";
+
+      case 199:
+         return "Dense Inv";
+
+      default:
+         return "Unknown";
+   }
+}
+
+/*--------------------------------------------------------------------
+ * hypre_MGRGetProlongationName
+ *--------------------------------------------------------------------*/
+
+const char*
+hypre_MGRGetProlongationName(hypre_ParMGRData  *mgr_data,
+                             HYPRE_Int          level )
+{
+   switch (hypre_ParMGRDataInterpTypeI(mgr_data, level))
+   {
+      case 0:
+         return "Injection";
+
+      case 1:
+         return "L1-Jac Inv";
+
+      case 2:
+         return "Diag Inv";
+
+      case 4:
+         return "Approx Inv";
+
+      case 5:
+         return "MM-ext";
+
+      case 6:
+         return "MM-ext+i";
+
+      case 7:
+         return "MM-ext+e";
+
+      case 12:
+         return "Blk-Diag Inv";
+
+      default:
+         return "Classical";
+   }
+}
+
+/*--------------------------------------------------------------------
+ * hypre_MGRGetRestrictionName
+ *--------------------------------------------------------------------*/
+
+const char*
+hypre_MGRGetRestrictionName(hypre_ParMGRData  *mgr_data,
+                            HYPRE_Int          level )
+{
+   switch (hypre_ParMGRDataRestrictTypeI(mgr_data, level))
+   {
+      case 0:
+         return "Injection";
+
+      case 1:
+         return "L1-Jac Inv";
+
+      case 2:
+         return "Diag Inv";
+
+      case 3:
+         return "Approx Inv";
+
+      case 12:
+         return "Blk-Diag Inv";
+
+      case 13:
+         return "CPR-like";
+
+      case 14:
+         return "Blk-ColLumped";
+
+      default:
+         return "Classical";
+   }
+}
+
+/*--------------------------------------------------------------------
+ * hypre_MGRGetCoarseGridName
+ *--------------------------------------------------------------------*/
+
+const char*
+hypre_MGRGetCoarseGridName(hypre_ParMGRData  *mgr_data,
+                           HYPRE_Int          level )
+{
+   switch (hypre_ParMGRDataCoarseGridMethodI(mgr_data, level))
+   {
+      case 0:
+         return "Glk-RAP";
+
+      case 1:
+         return "NG-BlkDiag";
+
+      case 2:
+         return "NG-CPR-Diag";
+
+      case 3:
+         return "NG-CPR-BlkDiag";
+
+      case 4:
+         return "NG-ApproxInv";
+
+      case 5:
+         return "NG-A_CC";
+
+      default:
+         return "Unknown";
+   }
+}
+
+/*--------------------------------------------------------------------
+ * hypre_MGRSetupStats
+ *
+ * TODO (VPM):
+ *      1) Add total number of GPUs or number of ranks using 1 GPU?
+ *--------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_MGRSetupStats(void *mgr_vdata)
+{
+   hypre_ParMGRData          *mgr_data   = (hypre_ParMGRData*) mgr_vdata;
+
+   /* MGR data */
+   HYPRE_Int                  print_level     = (mgr_data -> print_level);
+   hypre_ParCSRMatrix        *A_finest        = hypre_ParMGRDataA(mgr_data, 0);
+   hypre_ParCSRMatrix        *A_coarsest      = hypre_ParMGRDataRAP(mgr_data);
+   HYPRE_Int                  num_levels_mgr  = hypre_ParMGRDataNumCoarseLevels(mgr_data);
+   HYPRE_Solver               coarse_solver   = hypre_ParMGRDataCoarseGridSolver(mgr_data);
+   HYPRE_Solver             **A_FF_solver     = hypre_ParMGRDataAFFsolver(mgr_data);
+   HYPRE_Int                 *Frelax_type     = hypre_ParMGRDataFRelaxType(mgr_data);
+   HYPRE_Int                  block_size      = hypre_ParMGRDataBlockSize(mgr_data);
+   HYPRE_Int                 *block_num_Cpts  = hypre_ParMGRDataBlockNumCoarseIndexes(mgr_data);
+   HYPRE_Int                **block_CF_marker = hypre_ParMGRDataBlockCFMarker(mgr_data);
+
+   /* Finest matrix variables */
+   MPI_Comm                   comm            = hypre_ParCSRMatrixComm(A_finest);
+   HYPRE_MemoryLocation       memory_location = hypre_ParCSRMatrixMemoryLocation(A_finest);
+   HYPRE_ExecutionPolicy      exec            = hypre_GetExecPolicy1(memory_location);
+
+   /* Local variables */
+   hypre_ParAMGData          *amg_solver = NULL;
+   hypre_ParAMGData          *coarse_amg_solver = NULL;
+   hypre_ParCSRMatrix       **A_array;
+   hypre_ParCSRMatrix       **P_array;
+   hypre_ParCSRMatrix       **R_array;
+   hypre_ParCSRMatrix       **RT_array;
+   hypre_MatrixStatsArray    *stats_array;
+
+   HYPRE_Real                *gridcomp;
+   HYPRE_Real                *opcomp;
+   HYPRE_Real                *memcomp;
+
+   HYPRE_Int                  max_length;
+   char                      *coarse_dofs_str = NULL;
+
+   HYPRE_Int                  coarsest_mgr_level;
+   HYPRE_Int                  num_levels_total;
+   HYPRE_Int                  num_levels[2];
+   HYPRE_Int                  max_levels;
+   HYPRE_Int                 *num_sublevels_amg;
+   HYPRE_Int                  num_procs, num_threads;
+   HYPRE_Int                  i, k, myid;
+   HYPRE_Int                  divisors[1];
+
+   /* Print statistics only if first print_level bit is set */
+   if (!(print_level & HYPRE_MGR_PRINT_INFO_SETUP))
+   {
+      return hypre_error_flag;
+   }
+
+   /*-------------------------------------------------
+    *  Initialize and allocate data
+    *-------------------------------------------------*/
+
+   hypre_MPI_Comm_size(comm, &num_procs);
+   hypre_MPI_Comm_rank(comm, &myid);
+   num_threads = hypre_NumThreads();
+
+   coarsest_mgr_level = num_levels_mgr;
+   num_sublevels_amg  = hypre_CTAlloc(HYPRE_Int, num_levels_mgr + 1, HYPRE_MEMORY_HOST);
+
+   /* Check MGR's coarse level solver */
+   if ((HYPRE_PtrToParSolverFcn) hypre_ParMGRDataCoarseGridSolverSetup(mgr_data) ==
+       HYPRE_BoomerAMGSetup)
+   {
+      coarse_amg_solver = (hypre_ParAMGData *) coarse_solver;
+      num_sublevels_amg[coarsest_mgr_level] = hypre_ParAMGDataNumLevels(coarse_amg_solver);
+   }
+#ifdef HYPRE_USING_DSUPERLU
+   else if ((HYPRE_PtrToParSolverFcn) hypre_ParMGRDataCoarseGridSolverSetup(mgr_data) ==
+            (HYPRE_PtrToParSolverFcn) hypre_MGRDirectSolverSetup)
+   {
+      /* TODO (VPM): Set SuperLU solver specifics */
+      num_sublevels_amg[coarsest_mgr_level] = 0;
+   }
+#endif
+   else
+   {
+      hypre_TFree(num_sublevels_amg, HYPRE_MEMORY_HOST);
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Unknown coarsest level solver for MGR!\n");
+      return hypre_error_flag;
+   }
+   num_levels_total = num_levels_mgr + num_sublevels_amg[coarsest_mgr_level];
+
+   /* Compute number of AMG sublevels at each MGR level */
+   max_levels = num_levels_total;
+   for (i = 0; i < num_levels_mgr; i++)
+   {
+      if (Frelax_type[i] == 2)
+      {
+         amg_solver = (hypre_ParAMGData *) A_FF_solver[i];
+         num_sublevels_amg[i] = hypre_ParAMGDataNumLevels(amg_solver);
+
+         max_levels = hypre_max(max_levels, num_sublevels_amg[i]);
+      }
+   }
+
+   /* Create array of statistics */
+   stats_array = hypre_MatrixStatsArrayCreate(max_levels + 1);
+
+   /*-------------------------------------------------
+    *  Print general info
+    *-------------------------------------------------*/
+
+   if (!myid)
+   {
+      /* Determine max_length for printing coarse DOFs */
+      if (block_num_Cpts)
+      {
+         coarse_dofs_str = hypre_ConvertIndicesToString(block_num_Cpts[0], block_CF_marker[0]);
+         max_length = hypre_min(strlen(coarse_dofs_str) + 2, 50);
+         hypre_TFree(coarse_dofs_str, HYPRE_MEMORY_HOST);
+      }
+      else
+      {
+         max_length = 10;
+      }
+
+      hypre_printf("\n\n");
+      hypre_printf(" Num MPI tasks = %d\n",  num_procs);
+      hypre_printf(" Num OpenMP threads = %d\n", num_threads);
+      hypre_printf(" Execution policy = %s\n\n", HYPRE_GetExecutionPolicyName(exec));
+      hypre_printf("\n");
+      hypre_printf("MGR SETUP PARAMETERS:\n\n");
+      hypre_printf("        MGR num levels = %d\n", num_levels_mgr);
+      hypre_printf(" coarse AMG num levels = %d\n", num_sublevels_amg[coarsest_mgr_level]);
+      hypre_printf("      Total num levels = %d\n\n", num_levels_total);
+
+      divisors[0] = 83 + max_length;
+      //hypre_printf("\nMGR level options:\n\n");
+      hypre_printf("%10s %*s %11s %14s %14s\n",
+                   "Total", max_length, "Coarse", "Global", "Fine", "Coarse");
+      hypre_printf("%3s %6s %*s %11s %14s %14s %14s %14s\n", "lev",
+                   "DOFs", max_length, "DOFs", "relaxation", "relaxation",
+                   "grid method", "Prolongation", "Restriction");
+      HYPRE_PRINT_TOP_DIVISOR(1, divisors);
+      for (i = 0; i < num_levels_mgr; i++)
+      {
+         if (block_num_Cpts)
+         {
+            coarse_dofs_str = hypre_ConvertIndicesToString(block_num_Cpts[i],
+                                                           block_CF_marker[i]);
+         }
+
+         hypre_printf("%3d %6d %*s %11s %14s %14s %14s %14s\n",
+                      i,
+                      (i > 0 && block_num_Cpts) ? block_num_Cpts[i - 1] : block_size,
+                      max_length,
+                      (block_num_Cpts) ? coarse_dofs_str : "--",
+                      hypre_MGRGetGlobalRelaxName(mgr_data, i),
+                      hypre_MGRGetFRelaxName(mgr_data, i),
+                      hypre_MGRGetCoarseGridName(mgr_data, i),
+                      hypre_MGRGetProlongationName(mgr_data, i),
+                      hypre_MGRGetRestrictionName(mgr_data, i));
+
+         hypre_TFree(coarse_dofs_str, HYPRE_MEMORY_HOST);
+      }
+      hypre_printf("\n\n");
+   }
+
+   /*-------------------------------------------------
+    *  Print MGR hierarchy info
+    *-------------------------------------------------*/
+
+   /* Set pointers to level matrices */
+   A_array = hypre_TAlloc(hypre_ParCSRMatrix *, max_levels, HYPRE_MEMORY_HOST);
+   for (i = 0; i < num_levels_mgr; i++)
+   {
+      A_array[i] = hypre_ParMGRDataA(mgr_data, i);
+   }
+   A_array[num_levels_mgr] = A_coarsest;
+
+   for (i = 1; i < num_sublevels_amg[coarsest_mgr_level]; i++)
+   {
+      A_array[num_levels_mgr + i] = hypre_ParAMGDataAArray(coarse_amg_solver)[i];
+   }
+
+   /* Compute statistics data structure */
+   hypre_ParCSRMatrixStatsArrayCompute(num_levels_total, A_array, stats_array);
+
+   if (!myid)
+   {
+      const char *msg[] = { "Full Operator Matrix Hierarchy Information:\n\n",
+                            "MGR's coarsest level",
+                            "\t( MGR )",
+                            "\t( AMG )"
+                          };
+
+      num_levels[0] = num_levels_mgr - 1;
+      num_levels[1] = num_sublevels_amg[coarsest_mgr_level] + 1;
+      hypre_MatrixStatsArrayPrint(2, num_levels, 1, 0, msg, stats_array);
+   }
+
+   /*-------------------------------------------------
+    *  Print MGR level input data
+    *-------------------------------------------------*/
+
+   /* Set pointer to level matrices */
+   P_array  = hypre_TAlloc(hypre_ParCSRMatrix *, max_levels, HYPRE_MEMORY_HOST);
+   R_array  = hypre_TAlloc(hypre_ParCSRMatrix *, max_levels, HYPRE_MEMORY_HOST);
+   RT_array = hypre_TAlloc(hypre_ParCSRMatrix *, max_levels, HYPRE_MEMORY_HOST);
+   for (i = 0; i < num_levels_mgr; i++)
+   {
+      P_array[i] = hypre_ParMGRDataP(mgr_data, i);
+
+      if (hypre_ParMGRDataR(mgr_data, i))
+      {
+         R_array[i] = hypre_ParMGRDataR(mgr_data, i);
+      }
+      else if (hypre_ParMGRDataRT(mgr_data, i))
+      {
+         hypre_ParCSRMatrixTranspose(hypre_ParMGRDataRT(mgr_data, i), &R_array[i], 1);
+      }
+      else
+      {
+         R_array[i] = NULL;
+      }
+   }
+
+   for (i = 0; i < num_sublevels_amg[coarsest_mgr_level]; i++)
+   {
+      P_array[num_levels_mgr + i] = hypre_ParAMGDataPArray(coarse_amg_solver)[i];
+      R_array[num_levels_mgr + i] = NULL;
+   }
+
+   /* Compute statistics data structure for Prolongation operator */
+   hypre_ParCSRMatrixStatsArrayCompute(num_levels_total - 1, P_array, stats_array);
+
+   if (!myid)
+   {
+      const char *msg[] = { "Full Prolongation Matrix Hierarchy Information:\n\n",
+                            "MGR's coarsest level",
+                            "\t( MGR )",
+                            "\t( AMG )"
+                          };
+
+      num_levels[0] = num_levels_mgr;
+      num_levels[1] = num_sublevels_amg[coarsest_mgr_level] - 1;
+      hypre_MatrixStatsArrayPrint(2, num_levels, 1, 0, msg, stats_array);
+   }
+
+   /* Compute statistics data structure for Restriction operator (only for MGR) */
+   hypre_ParCSRMatrixStatsArrayCompute(num_levels_mgr, R_array, stats_array);
+
+   if (!myid)
+   {
+      const char *msg[] = { "MGR Restriction Matrix Hierarchy Information:\n\n" };
+
+      num_levels[0] = num_levels_mgr;
+      hypre_MatrixStatsArrayPrint(1, num_levels, 1, 0, msg, stats_array);
+   }
+
+   /*-------------------------------------------------
+    *  Print MGR F-relaxation info
+    *-------------------------------------------------*/
+
+   for (i = 0; i < num_levels_mgr; i++)
+   {
+      if (num_sublevels_amg[i] > 0)
+      {
+         if (!myid)
+         {
+            hypre_printf("At MGR level %d --> F-relaxation solver parameters\n\n", i);
+         }
+         amg_solver = (hypre_ParAMGData *) A_FF_solver[i];
+
+         /* General AMG info */
+         if (!myid)
+         {
+            hypre_BoomerAMGPrintGeneralInfo(amg_solver, 3);
+         }
+
+         /* Gather A matrices */
+         for (k = 0; k < num_sublevels_amg[i]; k++)
+         {
+            A_array[k] = hypre_ParAMGDataAArray(amg_solver)[k];
+         }
+
+         /* Compute statistics */
+         hypre_ParCSRMatrixStatsArrayCompute(num_sublevels_amg[i], A_array, stats_array);
+
+         /* Print A matrices info */
+         if (!myid)
+         {
+            const char *msg[] = {"Operator Matrix Hierarchy Information:\n\n"};
+            num_levels[0] = num_sublevels_amg[i];
+            hypre_MatrixStatsArrayPrint(1, num_levels, 1, 3, msg, stats_array);
+         }
+
+         /* Gather P matrices */
+         for (k = 0; k < num_sublevels_amg[i] - 1; k++)
+         {
+            P_array[k] = hypre_ParAMGDataPArray(amg_solver)[k];
+         }
+
+         /* Compute statistics */
+         hypre_ParCSRMatrixStatsArrayCompute(num_sublevels_amg[i] - 1, P_array, stats_array);
+
+         /* Print P matrices info */
+         if (!myid)
+         {
+            const char *msg[] = {"Prolongation Matrix Hierarchy Information:\n\n"};
+            num_levels[0] = num_sublevels_amg[i] - 1;
+            hypre_MatrixStatsArrayPrint(1, num_levels, 1, 3, msg, stats_array);
+         }
+      }
+   }
+
+   /*-------------------------------------------------
+    *  Print MGR coarsest level solver info
+    *-------------------------------------------------*/
+
+   if (!myid && coarse_amg_solver && num_sublevels_amg[coarsest_mgr_level] > 1)
+   {
+      hypre_printf("At coarsest MGR level --> Solver parameters:\n\n");
+      hypre_BoomerAMGPrintGeneralInfo(coarse_amg_solver, 3);
+   }
+
+   /*-------------------------------------------------
+    *  Print MGR complexities
+    *-------------------------------------------------*/
+
+   /* Allocate memory for complexities arrays */
+   gridcomp = hypre_CTAlloc(HYPRE_Real, num_levels_mgr + 2, HYPRE_MEMORY_HOST);
+   opcomp   = hypre_CTAlloc(HYPRE_Real, num_levels_mgr + 2, HYPRE_MEMORY_HOST);
+   memcomp  = hypre_CTAlloc(HYPRE_Real, num_levels_mgr + 2, HYPRE_MEMORY_HOST);
+
+   /* Compute complexities at each MGR level */
+   for (i = 0; i < num_levels_mgr + 1; i++)
+   {
+      if (num_sublevels_amg[i] > 0)
+      {
+         if (i < num_levels_mgr)
+         {
+            amg_solver = (hypre_ParAMGData *) A_FF_solver[i];
+         }
+         else
+         {
+            amg_solver = coarse_amg_solver;
+         }
+
+         for (k = 0; k < num_sublevels_amg[i]; k++)
+         {
+            A_array[k]  = hypre_ParAMGDataAArray(amg_solver)[k];
+            P_array[k]  = (k < (num_sublevels_amg[i] - 1)) ?
+                          hypre_ParAMGDataPArray(amg_solver)[k] : NULL;
+            RT_array[k] = (k < (num_sublevels_amg[i] - 1)) ?
+                          hypre_ParAMGDataRArray(amg_solver)[k] : NULL;
+
+            gridcomp[i] += (HYPRE_Real) hypre_ParCSRMatrixGlobalNumRows(A_array[k]);
+            opcomp[i]   += (HYPRE_Real) hypre_ParCSRMatrixNumNonzeros(A_array[k]);
+            if (k < (num_sublevels_amg[i] - 1))
+            {
+               memcomp[i] += (HYPRE_Real) hypre_ParCSRMatrixNumNonzeros(A_array[k]) +
+                             (HYPRE_Real) hypre_ParCSRMatrixNumNonzeros(P_array[k]) +
+                             (HYPRE_Real) hypre_ParCSRMatrixNumNonzeros(RT_array[k]);
+            }
+         }
+         gridcomp[num_levels_mgr + 1] += gridcomp[i];
+         opcomp[num_levels_mgr + 1]   += opcomp[i] /
+                                         hypre_ParCSRMatrixNumNonzeros(A_finest);
+         memcomp[num_levels_mgr + 1]  += memcomp[i] /
+                                         hypre_ParCSRMatrixNumNonzeros(A_finest);
+
+         gridcomp[i] /= (HYPRE_Real) hypre_ParCSRMatrixGlobalNumRows(A_array[0]);
+         opcomp[i]   /= hypre_ParCSRMatrixDNumNonzeros(A_array[0]);
+         memcomp[i]  /= hypre_ParCSRMatrixDNumNonzeros(A_array[0]);
+      }
+      else
+      {
+         /* TODO (VPM): Assume single-level for now, extend to ILU later */
+         gridcomp[i] = 1.0;
+         opcomp[i]   = 1.0; /* TODO (VPM): adjust according to F/G-relaxation choices */
+         memcomp[i]  = 1.0;
+
+         A_array[i] = hypre_ParMGRDataA(mgr_data, i);
+         gridcomp[num_levels_mgr + 1] += hypre_ParCSRMatrixGlobalNumRows(A_array[i]);
+         opcomp[num_levels_mgr + 1]   += hypre_ParCSRMatrixDNumNonzeros(A_array[i]) /
+                                         hypre_ParCSRMatrixNumNonzeros(A_finest);
+         memcomp[num_levels_mgr + 1]  += hypre_ParCSRMatrixDNumNonzeros(A_array[i]) /
+                                         hypre_ParCSRMatrixNumNonzeros(A_finest);
+      }
+   }
+   gridcomp[num_levels_mgr + 1] /= (HYPRE_Real) hypre_ParCSRMatrixGlobalNumRows(A_finest);
+
+   /* Print complexities */
+   if (!myid)
+   {
+      divisors[0] = 37;
+      hypre_printf("MGR complexities:\n\n");
+      hypre_printf("%4s ",  "lev");
+      hypre_printf("%10s ", "grid");
+      hypre_printf("%10s ", "operator");
+      hypre_printf("%10s ", "memory");
+      hypre_printf("\n");
+      HYPRE_PRINT_TOP_DIVISOR(1, divisors);
+
+      for (i = 0; i < num_levels_mgr + 1; i++)
+      {
+         hypre_printf("%4d ",    i);
+         hypre_printf("%10.3f ", gridcomp[i]);
+         hypre_printf("%10.3f ", opcomp[i]);
+         hypre_printf("%10.3f ", memcomp[i]);
+         hypre_printf("\n");
+      }
+      HYPRE_PRINT_MID_DIVISOR(1, divisors, "")
+      hypre_printf("%4s ", "All");
+      hypre_printf("%10.3f ", gridcomp[i]);
+      hypre_printf("%10.3f ", opcomp[i]);
+      hypre_printf("%10.3f ", memcomp[i]);
+      hypre_printf("\n");
+      HYPRE_PRINT_MID_DIVISOR(1, divisors, "")
+      hypre_printf("\n\n");
+   }
+
+   /*-------------------------------------------------
+    *  Free memory
+    *-------------------------------------------------*/
+
+   for (i = 0; i < num_levels_mgr; i++)
+   {
+      if (hypre_ParMGRDataRT(mgr_data, i))
+      {
+         hypre_ParCSRMatrixDestroy(R_array[i]);
+      }
+   }
+
+   hypre_MatrixStatsArrayDestroy(stats_array);
+   hypre_TFree(A_array, HYPRE_MEMORY_HOST);
+   hypre_TFree(P_array, HYPRE_MEMORY_HOST);
+   hypre_TFree(R_array, HYPRE_MEMORY_HOST);
+   hypre_TFree(RT_array, HYPRE_MEMORY_HOST);
+   hypre_TFree(num_sublevels_amg, HYPRE_MEMORY_HOST);
+   hypre_TFree(gridcomp, HYPRE_MEMORY_HOST);
+   hypre_TFree(opcomp, HYPRE_MEMORY_HOST);
+   hypre_TFree(memcomp, HYPRE_MEMORY_HOST);
+
+   return hypre_error_flag;
+}
diff --git a/external/hypre/src/parcsr_ls/par_mod_lr_interp.c b/external/hypre/src/parcsr_ls/par_mod_lr_interp.c
index bc0ecbe0..235d3811 100644
--- a/external/hypre/src/parcsr_ls/par_mod_lr_interp.c
+++ b/external/hypre/src/parcsr_ls/par_mod_lr_interp.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -24,6 +24,8 @@ hypre_BoomerAMGBuildModExtInterpHost(hypre_ParCSRMatrix  *A,
                                      HYPRE_Int            max_elmts,
                                      hypre_ParCSRMatrix **P_ptr)
 {
+   HYPRE_UNUSED_VAR(debug_flag);
+
    /* Communication Variables */
    MPI_Comm              comm = hypre_ParCSRMatrixComm(A);
    HYPRE_MemoryLocation  memory_location_P = hypre_ParCSRMatrixMemoryLocation(A);
@@ -116,13 +118,13 @@ hypre_BoomerAMGBuildModExtInterpHost(hypre_ParCSRMatrix  *A,
 
    /* BEGIN */
    hypre_MPI_Comm_size(comm, &num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_rank(comm, &my_id);
 
-   if (my_id == (num_procs -1)) total_global_cpts = num_cpts_global[1];
-   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
-   n_Cpts = num_cpts_global[1]-num_cpts_global[0];
+   if (my_id == (num_procs - 1)) { total_global_cpts = num_cpts_global[1]; }
+   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
+   n_Cpts = num_cpts_global[1] - num_cpts_global[0];
 
-   hypre_ParCSRMatrixGenerateFFFC(A, CF_marker, num_cpts_global, S, &As_FC, &As_FF);
+   hypre_ParCSRMatrixGenerateFFFCHost(A, CF_marker, num_cpts_global, S, &As_FC, &As_FF);
 
    As_FC_diag = hypre_ParCSRMatrixDiag(As_FC);
    As_FC_diag_i = hypre_CSRMatrixI(As_FC_diag);
@@ -141,27 +143,27 @@ hypre_BoomerAMGBuildModExtInterpHost(hypre_ParCSRMatrix  *A,
    D_q = hypre_CTAlloc(HYPRE_Real, n_Fpts, HYPRE_MEMORY_HOST);
    D_w = hypre_CTAlloc(HYPRE_Real, n_Fpts, HYPRE_MEMORY_HOST);
    cpt_array = hypre_CTAlloc(HYPRE_Int, num_threads, HYPRE_MEMORY_HOST);
-   start_array = hypre_CTAlloc(HYPRE_Int, num_threads+1, HYPRE_MEMORY_HOST);
-   startf_array = hypre_CTAlloc(HYPRE_Int, num_threads+1, HYPRE_MEMORY_HOST);
+   start_array = hypre_CTAlloc(HYPRE_Int, num_threads + 1, HYPRE_MEMORY_HOST);
+   startf_array = hypre_CTAlloc(HYPRE_Int, num_threads + 1, HYPRE_MEMORY_HOST);
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel private(i,j,start,stop,startf,stopf,row)
+   #pragma omp parallel private(i,j,start,stop,startf,stopf,row)
 #endif
    {
       HYPRE_Int my_thread_num = hypre_GetThreadNum();
       HYPRE_Real beta, gamma;
 
-      start = (n_fine/num_threads)*my_thread_num;
-      if (my_thread_num == num_threads-1)
+      start = (n_fine / num_threads) * my_thread_num;
+      if (my_thread_num == num_threads - 1)
       {
          stop = n_fine;
       }
       else
       {
-         stop = (n_fine/num_threads)*(my_thread_num+1);
+         stop = (n_fine / num_threads) * (my_thread_num + 1);
       }
-      start_array[my_thread_num+1] = stop;
-      for (i=start; i < stop; i++)
+      start_array[my_thread_num + 1] = stop;
+      for (i = start; i < stop; i++)
       {
          if (CF_marker[i] > 0)
          {
@@ -170,13 +172,13 @@ hypre_BoomerAMGBuildModExtInterpHost(hypre_ParCSRMatrix  *A,
       }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
       if (my_thread_num == 0)
       {
-         for (i=1; i < num_threads; i++)
+         for (i = 1; i < num_threads; i++)
          {
-            cpt_array[i] += cpt_array[i-1];
+            cpt_array[i] += cpt_array[i - 1];
          }
          if (num_functions > 1)
          {
@@ -186,13 +188,14 @@ hypre_BoomerAMGBuildModExtInterpHost(hypre_ParCSRMatrix  *A,
             dof_func_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_A_offd, HYPRE_MEMORY_HOST);
             index = 0;
             num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
-            int_buf_data = hypre_CTAlloc(HYPRE_Int, hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends), HYPRE_MEMORY_HOST);
+            int_buf_data = hypre_CTAlloc(HYPRE_Int, hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                                         HYPRE_MEMORY_HOST);
             for (i = 0; i < num_sends; i++)
             {
                startc = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-               for (j = startc; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+               for (j = startc; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
                {
-                  int_buf_data[index++] = dof_func[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+                  int_buf_data[index++] = dof_func[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
                }
             }
             comm_handle = hypre_ParCSRCommHandleCreate( 11, comm_pkg, int_buf_data, dof_func_offd);
@@ -202,28 +205,36 @@ hypre_BoomerAMGBuildModExtInterpHost(hypre_ParCSRMatrix  *A,
       }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
       if (my_thread_num > 0)
-         startf = start - cpt_array[my_thread_num-1];
+      {
+         startf = start - cpt_array[my_thread_num - 1];
+      }
       else
+      {
          startf = 0;
+      }
 
-      if (my_thread_num < num_threads-1)
+      if (my_thread_num < num_threads - 1)
+      {
          stopf = stop - cpt_array[my_thread_num];
+      }
       else
+      {
          stopf = n_Fpts;
+      }
 
-      startf_array[my_thread_num+1] = stopf;
+      startf_array[my_thread_num + 1] = stopf;
 
       /* Create D_q = D_beta */
-      for (i=startf; i < stopf; i++)
+      for (i = startf; i < stopf; i++)
       {
-         for (j=As_FC_diag_i[i]; j < As_FC_diag_i[i+1]; j++)
+         for (j = As_FC_diag_i[i]; j < As_FC_diag_i[i + 1]; j++)
          {
             D_q[i] += As_FC_diag_data[j];
          }
-         for (j=As_FC_offd_i[i]; j < As_FC_offd_i[i+1]; j++)
+         for (j = As_FC_offd_i[i]; j < As_FC_offd_i[i + 1]; j++)
          {
             D_q[i] += As_FC_offd_data[j];
          }
@@ -231,7 +242,7 @@ hypre_BoomerAMGBuildModExtInterpHost(hypre_ParCSRMatrix  *A,
 
       /* Create D_w = D_alpha + D_gamma */
       row = startf;
-      for (i=start; i < stop; i++)
+      for (i = start; i < stop; i++)
       {
          if (CF_marker[i] < 0)
          {
@@ -239,7 +250,7 @@ hypre_BoomerAMGBuildModExtInterpHost(hypre_ParCSRMatrix  *A,
             {
                HYPRE_Int jA, jS, jC;
                jC = A_diag_i[i];
-               for (j=S_diag_i[i]; j < S_diag_i[i+1]; j++)
+               for (j = S_diag_i[i]; j < S_diag_i[i + 1]; j++)
                {
                   jS = S_diag_j[j];
                   jA = A_diag_j[jC];
@@ -250,18 +261,22 @@ hypre_BoomerAMGBuildModExtInterpHost(hypre_ParCSRMatrix  *A,
                         D_w[row] += A_diag_data[jC++];
                      }
                      else
+                     {
                         jC++;
+                     }
                      jA = A_diag_j[jC];
                   }
                   jC++;
                }
-               for (j=jC; j < A_diag_i[i+1]; j++)
+               for (j = jC; j < A_diag_i[i + 1]; j++)
                {
                   if (dof_func[i] == dof_func[A_diag_j[j]])
-                        D_w[row] += A_diag_data[j];
+                  {
+                     D_w[row] += A_diag_data[j];
+                  }
                }
                jC = A_offd_i[i];
-               for (j=S_offd_i[i]; j < S_offd_i[i+1]; j++)
+               for (j = S_offd_i[i]; j < S_offd_i[i + 1]; j++)
                {
                   jS = S_offd_j[j];
                   jA = A_offd_j[jC];
@@ -272,33 +287,37 @@ hypre_BoomerAMGBuildModExtInterpHost(hypre_ParCSRMatrix  *A,
                         D_w[row] += A_offd_data[jC++];
                      }
                      else
+                     {
                         jC++;
+                     }
                      jA = A_offd_j[jC];
                   }
                   jC++;
                }
-               for (j=jC; j < A_offd_i[i+1]; j++)
+               for (j = jC; j < A_offd_i[i + 1]; j++)
                {
                   if (dof_func[i] == dof_func_offd[A_offd_j[j]])
-                        D_w[row] += A_offd_data[j];
+                  {
+                     D_w[row] += A_offd_data[j];
+                  }
                }
                row++;
             }
             else
             {
-               for (j=A_diag_i[i]; j < A_diag_i[i+1]; j++)
+               for (j = A_diag_i[i]; j < A_diag_i[i + 1]; j++)
                {
                   D_w[row] += A_diag_data[j];
                }
-               for (j=A_offd_i[i]; j < A_offd_i[i+1]; j++)
+               for (j = A_offd_i[i]; j < A_offd_i[i + 1]; j++)
                {
                   D_w[row] += A_offd_data[j];
                }
-               for (j=As_FF_diag_i[row]+1; j < As_FF_diag_i[row+1]; j++)
+               for (j = As_FF_diag_i[row] + 1; j < As_FF_diag_i[row + 1]; j++)
                {
                   D_w[row] -= As_FF_diag_data[j];
                }
-               for (j=As_FF_offd_i[row]; j < As_FF_offd_i[row+1]; j++)
+               for (j = As_FF_offd_i[row]; j < As_FF_offd_i[row + 1]; j++)
                {
                   D_w[row] -= As_FF_offd_data[j];
                }
@@ -308,22 +327,30 @@ hypre_BoomerAMGBuildModExtInterpHost(hypre_ParCSRMatrix  *A,
          }
       }
 
-      for (i=startf; i<stopf; i++)
+      for (i = startf; i < stopf; i++)
       {
          j = As_FF_diag_i[i];
-         if (D_w[i]) beta = 1.0/D_w[i];
-         else beta = 1.0;
-         As_FF_diag_data[j] = beta*D_q[i];
-         if (D_q[i]) gamma = -1.0/D_q[i];
-         else gamma = 1.0;
-         for (j=As_FF_diag_i[i]+1; j < As_FF_diag_i[i+1]; j++)
+         if (D_w[i]) { beta = 1.0 / D_w[i]; }
+         else { beta = 1.0; }
+         As_FF_diag_data[j] = beta * D_q[i];
+         if (D_q[i]) { gamma = -1.0 / D_q[i]; }
+         else { gamma = 1.0; }
+         for (j = As_FF_diag_i[i] + 1; j < As_FF_diag_i[i + 1]; j++)
+         {
             As_FF_diag_data[j] *= beta;
-         for (j=As_FF_offd_i[i]; j < As_FF_offd_i[i+1]; j++)
+         }
+         for (j = As_FF_offd_i[i]; j < As_FF_offd_i[i + 1]; j++)
+         {
             As_FF_offd_data[j] *= beta;
-         for (j=As_FC_diag_i[i]; j < As_FC_diag_i[i+1]; j++)
+         }
+         for (j = As_FC_diag_i[i]; j < As_FC_diag_i[i + 1]; j++)
+         {
             As_FC_diag_data[j] *= gamma;
-         for (j=As_FC_offd_i[i]; j < As_FC_offd_i[i+1]; j++)
+         }
+         for (j = As_FC_offd_i[i]; j < As_FC_offd_i[i + 1]; j++)
+         {
             As_FC_offd_data[j] *= gamma;
+         }
       }
 
    }   /* end parallel region */
@@ -341,8 +368,8 @@ hypre_BoomerAMGBuildModExtInterpHost(hypre_ParCSRMatrix  *A,
    /*-----------------------------------------------------------------------
     *  Intialize data for P
     *-----------------------------------------------------------------------*/
-   P_diag_i    = hypre_CTAlloc(HYPRE_Int,  n_fine+1, memory_location_P);
-   P_offd_i    = hypre_CTAlloc(HYPRE_Int,  n_fine+1, memory_location_P);
+   P_diag_i    = hypre_CTAlloc(HYPRE_Int,  n_fine + 1, memory_location_P);
+   P_offd_i    = hypre_CTAlloc(HYPRE_Int,  n_fine + 1, memory_location_P);
 
    P_diag_size = n_Cpts + hypre_CSRMatrixI(W_diag)[n_Fpts];
    P_offd_size = hypre_CSRMatrixI(W_offd)[n_Fpts];
@@ -360,23 +387,27 @@ hypre_BoomerAMGBuildModExtInterpHost(hypre_ParCSRMatrix  *A,
    }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel private(i,j,start,stop,startf,stopf,c_pt,row,cnt_diag,cnt_offd)
+   #pragma omp parallel private(i,j,start,stop,startf,stopf,c_pt,row,cnt_diag,cnt_offd)
 #endif
    {
       HYPRE_Int my_thread_num = hypre_GetThreadNum();
       startf = startf_array[my_thread_num];
-      stopf = startf_array[my_thread_num+1];
+      stopf = startf_array[my_thread_num + 1];
       start = start_array[my_thread_num];
-      stop = start_array[my_thread_num+1];
+      stop = start_array[my_thread_num + 1];
 
       if (my_thread_num > 0)
-         c_pt = cpt_array[my_thread_num-1];
+      {
+         c_pt = cpt_array[my_thread_num - 1];
+      }
       else
+      {
          c_pt = 0;
-      cnt_diag = W_diag_i[startf]+c_pt;
+      }
+      cnt_diag = W_diag_i[startf] + c_pt;
       cnt_offd = W_offd_i[startf];
       row = startf;
-      for (i=start; i < stop; i++)
+      for (i = start; i < stop; i++)
       {
          if (CF_marker[i] > 0)
          {
@@ -385,20 +416,20 @@ hypre_BoomerAMGBuildModExtInterpHost(hypre_ParCSRMatrix  *A,
          }
          else
          {
-            for (j=W_diag_i[row]; j < W_diag_i[row+1]; j++)
+            for (j = W_diag_i[row]; j < W_diag_i[row + 1]; j++)
             {
                P_diag_j[cnt_diag] = W_diag_j[j];
                P_diag_data[cnt_diag++] = W_diag_data[j];
             }
-            for (j=W_offd_i[row]; j < W_offd_i[row+1]; j++)
+            for (j = W_offd_i[row]; j < W_offd_i[row + 1]; j++)
             {
                P_offd_j[cnt_offd] = W_offd_j[j];
                P_offd_data[cnt_offd++] = W_offd_data[j];
             }
             row++;
          }
-         P_diag_i[i+1] = cnt_diag;
-         P_offd_i[i+1] = cnt_offd;
+         P_diag_i[i + 1] = cnt_diag;
+         P_offd_i[i + 1] = cnt_offd;
       }
 
    }   /* end parallel region */
@@ -408,13 +439,13 @@ hypre_BoomerAMGBuildModExtInterpHost(hypre_ParCSRMatrix  *A,
     *-----------------------------------------------------------------------*/
 
    P = hypre_ParCSRMatrixCreate(comm,
-         hypre_ParCSRMatrixGlobalNumRows(A),
-         total_global_cpts,
-         hypre_ParCSRMatrixColStarts(A),
-         num_cpts_global,
-         num_cols_P_offd,
-         P_diag_i[n_fine],
-         P_offd_i[n_fine]);
+                                hypre_ParCSRMatrixGlobalNumRows(A),
+                                total_global_cpts,
+                                hypre_ParCSRMatrixColStarts(A),
+                                num_cpts_global,
+                                num_cols_P_offd,
+                                P_diag_i[n_fine],
+                                P_offd_i[n_fine]);
 
    P_diag = hypre_ParCSRMatrixDiag(P);
    hypre_CSRMatrixData(P_diag) = P_diag_data;
@@ -448,22 +479,22 @@ hypre_BoomerAMGBuildModExtInterpHost(hypre_ParCSRMatrix  *A,
       if (num_cols_P_offd)
       {
          P_marker = hypre_CTAlloc(HYPRE_Int, num_cols_P_offd, HYPRE_MEMORY_HOST);
-         for (i=0; i < P_offd_size; i++)
+         for (i = 0; i < P_offd_size; i++)
          {
             P_marker[P_offd_j[i]] = 1;
          }
 
          new_ncols_P_offd = 0;
-         for (i=0; i < num_cols_P_offd; i++)
+         for (i = 0; i < num_cols_P_offd; i++)
          {
-            if (P_marker[i]) new_ncols_P_offd++;
+            if (P_marker[i]) { new_ncols_P_offd++; }
          }
 
          new_col_map_offd = hypre_CTAlloc(HYPRE_BigInt, new_ncols_P_offd, HYPRE_MEMORY_HOST);
          map = hypre_CTAlloc(HYPRE_Int, new_ncols_P_offd, HYPRE_MEMORY_HOST);
 
          index = 0;
-         for (i=0; i < num_cols_P_offd; i++)
+         for (i = 0; i < num_cols_P_offd; i++)
             if (P_marker[i])
             {
                new_col_map_offd[index] = col_map_offd_P[i];
@@ -473,12 +504,12 @@ hypre_BoomerAMGBuildModExtInterpHost(hypre_ParCSRMatrix  *A,
 
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+         #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-         for (i=0; i < P_offd_size; i++)
+         for (i = 0; i < P_offd_size; i++)
          {
             P_offd_j[i] = hypre_BinarySearch(map, P_offd_j[i],
-               new_ncols_P_offd);
+                                             new_ncols_P_offd);
          }
 
          hypre_TFree(col_map_offd_P, HYPRE_MEMORY_HOST);
@@ -521,30 +552,26 @@ hypre_BoomerAMGBuildModExtInterp(hypre_ParCSRMatrix  *A,
                                  HYPRE_Int            max_elmts,
                                  hypre_ParCSRMatrix **P_ptr)
 {
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    hypre_GpuProfilingPushRange("ModExtInterp");
-#endif
-
-   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_ParCSRMatrixMemoryLocation(A) );
 
    HYPRE_Int ierr = 0;
 
-   if (exec == HYPRE_EXEC_HOST)
+#if defined(HYPRE_USING_GPU)
+   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_ParCSRMatrixMemoryLocation(A) );
+   if (exec == HYPRE_EXEC_DEVICE)
    {
-      ierr = hypre_BoomerAMGBuildModExtInterpHost(A,CF_marker,S,num_cpts_global,num_functions,dof_func,
-                                                  debug_flag,trunc_factor,max_elmts,P_ptr);
+      ierr = hypre_BoomerAMGBuildExtInterpDevice(A, CF_marker, S, num_cpts_global, 1, NULL,
+                                                 debug_flag, trunc_factor, max_elmts, P_ptr);
    }
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    else
+#endif
    {
-      ierr = hypre_BoomerAMGBuildExtInterpDevice(A,CF_marker,S,num_cpts_global,1,NULL,
-                                                 debug_flag,trunc_factor,max_elmts,P_ptr);
+      ierr = hypre_BoomerAMGBuildModExtInterpHost(A, CF_marker, S, num_cpts_global, num_functions,
+                                                  dof_func,
+                                                  debug_flag, trunc_factor, max_elmts, P_ptr);
    }
-#endif
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    hypre_GpuProfilingPopRange();
-#endif
 
    return ierr;
 }
@@ -566,6 +593,8 @@ hypre_BoomerAMGBuildModExtPIInterpHost(hypre_ParCSRMatrix  *A,
                                        HYPRE_Int            max_elmts,
                                        hypre_ParCSRMatrix **P_ptr)
 {
+   HYPRE_UNUSED_VAR(debug_flag);
+
    /* Communication Variables */
    MPI_Comm                 comm = hypre_ParCSRMatrixComm(A);
    hypre_ParCSRCommPkg     *comm_pkg = hypre_ParCSRMatrixCommPkg(A);
@@ -671,17 +700,17 @@ hypre_BoomerAMGBuildModExtPIInterpHost(hypre_ParCSRMatrix  *A,
 
    /* BEGIN */
    hypre_MPI_Comm_size(comm, &num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_rank(comm, &my_id);
 
-   if (my_id == (num_procs -1)) total_global_cpts = num_cpts_global[1];
-   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
-   n_Cpts = num_cpts_global[1]-num_cpts_global[0];
+   if (my_id == (num_procs - 1)) { total_global_cpts = num_cpts_global[1]; }
+   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
+   n_Cpts = num_cpts_global[1] - num_cpts_global[0];
 
-   hypre_ParCSRMatrixGenerateFFFC(A, CF_marker, num_cpts_global, S, &As_FC, &As_FF);
+   hypre_ParCSRMatrixGenerateFFFCHost(A, CF_marker, num_cpts_global, S, &As_FC, &As_FF);
 
    if (num_procs > 1)
    {
-      As_FF_ext = hypre_ParCSRMatrixExtractBExt(As_FF,As_FF,1);
+      As_FF_ext = hypre_ParCSRMatrixExtractBExt(As_FF, As_FF, 1);
       As_FF_ext_i = hypre_CSRMatrixI(As_FF_ext);
       As_FF_ext_j = hypre_CSRMatrixBigJ(As_FF_ext);
       As_FF_ext_data = hypre_CSRMatrixData(As_FF_ext);
@@ -710,26 +739,26 @@ hypre_BoomerAMGBuildModExtPIInterpHost(hypre_ParCSRMatrix  *A,
    D_theta = hypre_CTAlloc(HYPRE_Real, n_Fpts, HYPRE_MEMORY_HOST);
    D_w = hypre_CTAlloc(HYPRE_Real, n_Fpts, HYPRE_MEMORY_HOST);
    cpt_array = hypre_CTAlloc(HYPRE_Int, num_threads, HYPRE_MEMORY_HOST);
-   start_array = hypre_CTAlloc(HYPRE_Int, num_threads+1, HYPRE_MEMORY_HOST);
-   startf_array = hypre_CTAlloc(HYPRE_Int, num_threads+1, HYPRE_MEMORY_HOST);
+   start_array = hypre_CTAlloc(HYPRE_Int, num_threads + 1, HYPRE_MEMORY_HOST);
+   startf_array = hypre_CTAlloc(HYPRE_Int, num_threads + 1, HYPRE_MEMORY_HOST);
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel private(i,j,jj,k,kk,start,stop,startf,stopf,row,theta,value,value1)
+   #pragma omp parallel private(i,j,jj,k,kk,start,stop,startf,stopf,row,theta,value,value1)
 #endif
    {
       HYPRE_Int my_thread_num = hypre_GetThreadNum();
 
-      start = (n_fine/num_threads)*my_thread_num;
-      if (my_thread_num == num_threads-1)
+      start = (n_fine / num_threads) * my_thread_num;
+      if (my_thread_num == num_threads - 1)
       {
          stop = n_fine;
       }
       else
       {
-         stop = (n_fine/num_threads)*(my_thread_num+1);
+         stop = (n_fine / num_threads) * (my_thread_num + 1);
       }
-      start_array[my_thread_num+1] = stop;
-      for (i=start; i < stop; i++)
+      start_array[my_thread_num + 1] = stop;
+      for (i = start; i < stop; i++)
       {
          if (CF_marker[i] > 0)
          {
@@ -738,37 +767,45 @@ hypre_BoomerAMGBuildModExtPIInterpHost(hypre_ParCSRMatrix  *A,
       }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
       if (my_thread_num == 0)
       {
-         for (i=1; i < num_threads; i++)
+         for (i = 1; i < num_threads; i++)
          {
-            cpt_array[i] += cpt_array[i-1];
+            cpt_array[i] += cpt_array[i - 1];
          }
       }
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
       if (my_thread_num > 0)
-         startf = start - cpt_array[my_thread_num-1];
+      {
+         startf = start - cpt_array[my_thread_num - 1];
+      }
       else
+      {
          startf = 0;
+      }
 
-      if (my_thread_num < num_threads-1)
+      if (my_thread_num < num_threads - 1)
+      {
          stopf = stop - cpt_array[my_thread_num];
+      }
       else
+      {
          stopf = n_Fpts;
+      }
 
-      startf_array[my_thread_num+1] = stopf;
+      startf_array[my_thread_num + 1] = stopf;
 
-      for (i=startf; i < stopf; i++)
+      for (i = startf; i < stopf; i++)
       {
-         for (j=As_FC_diag_i[i]; j < As_FC_diag_i[i+1]; j++)
+         for (j = As_FC_diag_i[i]; j < As_FC_diag_i[i + 1]; j++)
          {
             D_q[i] += As_FC_diag_data[j];
          }
-         for (j=As_FC_offd_i[i]; j < As_FC_offd_i[i+1]; j++)
+         for (j = As_FC_offd_i[i]; j < As_FC_offd_i[i + 1]; j++)
          {
             D_q[i] += As_FC_offd_data[j];
          }
@@ -781,7 +818,7 @@ hypre_BoomerAMGBuildModExtPIInterpHost(hypre_ParCSRMatrix  *A,
 
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
       if (my_thread_num == 0)
       {
@@ -797,13 +834,14 @@ hypre_BoomerAMGBuildModExtPIInterpHost(hypre_ParCSRMatrix  *A,
             comm_pkg = hypre_ParCSRMatrixCommPkg(As_FF);
          }
          num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
-         buf_data = hypre_CTAlloc(HYPRE_Real, hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends), HYPRE_MEMORY_HOST);
+         buf_data = hypre_CTAlloc(HYPRE_Real, hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                                  HYPRE_MEMORY_HOST);
          for (i = 0; i < num_sends; i++)
          {
             startc = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-            for (j = startc; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+            for (j = startc; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
             {
-               buf_data[index++] = D_q[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+               buf_data[index++] = D_q[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
             }
          }
 
@@ -818,13 +856,14 @@ hypre_BoomerAMGBuildModExtPIInterpHost(hypre_ParCSRMatrix  *A,
             dof_func_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_A_offd, HYPRE_MEMORY_HOST);
             index = 0;
             num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
-            int_buf_data = hypre_CTAlloc(HYPRE_Int, hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends), HYPRE_MEMORY_HOST);
+            int_buf_data = hypre_CTAlloc(HYPRE_Int, hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                                         HYPRE_MEMORY_HOST);
             for (i = 0; i < num_sends; i++)
             {
                startc = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-               for (j = startc; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+               for (j = startc; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
                {
-                  int_buf_data[index++] = dof_func[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+                  int_buf_data[index++] = dof_func[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
                }
             }
             comm_handle = hypre_ParCSRCommHandleCreate( 11, comm_pkg, int_buf_data, dof_func_offd);
@@ -834,11 +873,11 @@ hypre_BoomerAMGBuildModExtPIInterpHost(hypre_ParCSRMatrix  *A,
       }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
 
       row = startf;
-      for (i=start; i < stop; i++)
+      for (i = start; i < stop; i++)
       {
          HYPRE_Int jA, jC, jS;
          if (CF_marker[i] < 0)
@@ -846,7 +885,7 @@ hypre_BoomerAMGBuildModExtPIInterpHost(hypre_ParCSRMatrix  *A,
             if (num_functions > 1)
             {
                jC = A_diag_i[i];
-               for (j=S_diag_i[i]; j < S_diag_i[i+1]; j++)
+               for (j = S_diag_i[i]; j < S_diag_i[i + 1]; j++)
                {
                   jS = S_diag_j[j];
                   jA = A_diag_j[jC];
@@ -857,18 +896,22 @@ hypre_BoomerAMGBuildModExtPIInterpHost(hypre_ParCSRMatrix  *A,
                         D_w[row] += A_diag_data[jC++];
                      }
                      else
+                     {
                         jC++;
+                     }
                      jA = A_diag_j[jC];
                   }
                   jC++;
                }
-               for (j=jC; j < A_diag_i[i+1]; j++)
+               for (j = jC; j < A_diag_i[i + 1]; j++)
                {
                   if (dof_func[i] == dof_func[A_diag_j[j]])
-                        D_w[row] += A_diag_data[j];
+                  {
+                     D_w[row] += A_diag_data[j];
+                  }
                }
                jC = A_offd_i[i];
-               for (j=S_offd_i[i]; j < S_offd_i[i+1]; j++)
+               for (j = S_offd_i[i]; j < S_offd_i[i + 1]; j++)
                {
                   jS = S_offd_j[j];
                   jA = A_offd_j[jC];
@@ -879,33 +922,37 @@ hypre_BoomerAMGBuildModExtPIInterpHost(hypre_ParCSRMatrix  *A,
                         D_w[row] += A_offd_data[jC++];
                      }
                      else
+                     {
                         jC++;
+                     }
                      jA = A_offd_j[jC];
                   }
                   jC++;
                }
-               for (j=jC; j < A_offd_i[i+1]; j++)
+               for (j = jC; j < A_offd_i[i + 1]; j++)
                {
                   if (dof_func[i] == dof_func_offd[A_offd_j[j]])
-                        D_w[row] += A_offd_data[j];
+                  {
+                     D_w[row] += A_offd_data[j];
+                  }
                }
                row++;
             }
             else
             {
-               for (j=A_diag_i[i]; j < A_diag_i[i+1]; j++)
+               for (j = A_diag_i[i]; j < A_diag_i[i + 1]; j++)
                {
                   D_w[row] += A_diag_data[j];
                }
-               for (j=A_offd_i[i]; j < A_offd_i[i+1]; j++)
+               for (j = A_offd_i[i]; j < A_offd_i[i + 1]; j++)
                {
                   D_w[row] += A_offd_data[j];
                }
-               for (j=As_FF_diag_i[row]+1; j < As_FF_diag_i[row+1]; j++)
+               for (j = As_FF_diag_i[row] + 1; j < As_FF_diag_i[row + 1]; j++)
                {
                   D_w[row] -= As_FF_diag_data[j];
                }
-               for (j=As_FF_offd_i[row]; j < As_FF_offd_i[row+1]; j++)
+               for (j = As_FF_offd_i[row]; j < As_FF_offd_i[row + 1]; j++)
                {
                   D_w[row] -= As_FF_offd_data[j];
                }
@@ -915,37 +962,37 @@ hypre_BoomerAMGBuildModExtPIInterpHost(hypre_ParCSRMatrix  *A,
          }
       }
 
-      for (i=startf; i<stopf; i++)
+      for (i = startf; i < stopf; i++)
       {
-         for (j = As_FF_diag_i[i]+1; j < As_FF_diag_i[i+1]; j++)
+         for (j = As_FF_diag_i[i] + 1; j < As_FF_diag_i[i + 1]; j++)
          {
             jj = As_FF_diag_j[j];
             value = D_q[jj];
-            for (k = As_FF_diag_i[jj]+1; k < As_FF_diag_i[jj+1]; k++)
+            for (k = As_FF_diag_i[jj] + 1; k < As_FF_diag_i[jj + 1]; k++)
             {
                kk = As_FF_diag_j[k];
                if (kk == i)
                {
                   value1 = tmp_FF_diag_data[k];
                   value += value1;
-                  D_theta[i] += As_FF_diag_data[j]*value1/value;
+                  D_theta[i] += As_FF_diag_data[j] * value1 / value;
                   break;
                }
             }
             As_FF_diag_data[j] /= value;
          }
-         for (j = As_FF_offd_i[i]; j < As_FF_offd_i[i+1]; j++)
+         for (j = As_FF_offd_i[i]; j < As_FF_offd_i[i + 1]; j++)
          {
             jj = As_FF_offd_j[j];
             value = D_q_offd[jj];
-            for (k = As_FF_ext_i[jj]; k < As_FF_ext_i[jj+1]; k++)
+            for (k = As_FF_ext_i[jj]; k < As_FF_ext_i[jj + 1]; k++)
             {
                kk = (HYPRE_Int)(As_FF_ext_j[k] - first_index);
                if (kk == i)
                {
                   value1 = As_FF_ext_data[k];
                   value += value1;
-                  D_theta[i] += As_FF_offd_data[j]*value1/value;
+                  D_theta[i] += As_FF_offd_data[j] * value1 / value;
                   break;
                }
             }
@@ -955,19 +1002,23 @@ hypre_BoomerAMGBuildModExtPIInterpHost(hypre_ParCSRMatrix  *A,
       }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
 
-      for (i=startf; i<stopf; i++)
+      for (i = startf; i < stopf; i++)
       {
-         theta = (D_theta[i]+D_w[i]);
+         theta = (D_theta[i] + D_w[i]);
          if (theta)
          {
-            theta = -1.0/theta;
-            for (j=As_FF_diag_i[i]; j < As_FF_diag_i[i+1]; j++)
+            theta = -1.0 / theta;
+            for (j = As_FF_diag_i[i]; j < As_FF_diag_i[i + 1]; j++)
+            {
                As_FF_diag_data[j] *= theta;
-            for (j=As_FF_offd_i[i]; j < As_FF_offd_i[i+1]; j++)
+            }
+            for (j = As_FF_offd_i[i]; j < As_FF_offd_i[i + 1]; j++)
+            {
                As_FF_offd_data[j] *= theta;
+            }
          }
       }
 
@@ -986,8 +1037,8 @@ hypre_BoomerAMGBuildModExtPIInterpHost(hypre_ParCSRMatrix  *A,
    /*-----------------------------------------------------------------------
     *  Intialize data for P
     *-----------------------------------------------------------------------*/
-   P_diag_i    = hypre_CTAlloc(HYPRE_Int,  n_fine+1, memory_location_P);
-   P_offd_i    = hypre_CTAlloc(HYPRE_Int,  n_fine+1, memory_location_P);
+   P_diag_i    = hypre_CTAlloc(HYPRE_Int,  n_fine + 1, memory_location_P);
+   P_offd_i    = hypre_CTAlloc(HYPRE_Int,  n_fine + 1, memory_location_P);
 
    P_diag_size = n_Cpts + hypre_CSRMatrixI(W_diag)[n_Fpts];
    P_offd_size = hypre_CSRMatrixI(W_offd)[n_Fpts];
@@ -1005,23 +1056,27 @@ hypre_BoomerAMGBuildModExtPIInterpHost(hypre_ParCSRMatrix  *A,
    }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel private(i,j,start,stop,startf,stopf,c_pt,row,cnt_diag,cnt_offd)
+   #pragma omp parallel private(i,j,start,stop,startf,stopf,c_pt,row,cnt_diag,cnt_offd)
 #endif
    {
       HYPRE_Int my_thread_num = hypre_GetThreadNum();
       startf = startf_array[my_thread_num];
-      stopf = startf_array[my_thread_num+1];
+      stopf = startf_array[my_thread_num + 1];
       start = start_array[my_thread_num];
-      stop = start_array[my_thread_num+1];
+      stop = start_array[my_thread_num + 1];
 
       if (my_thread_num > 0)
-         c_pt = cpt_array[my_thread_num-1];
+      {
+         c_pt = cpt_array[my_thread_num - 1];
+      }
       else
+      {
          c_pt = 0;
-      cnt_diag = W_diag_i[startf]+c_pt;
+      }
+      cnt_diag = W_diag_i[startf] + c_pt;
       cnt_offd = W_offd_i[startf];
       row = startf;
-      for (i=start; i < stop; i++)
+      for (i = start; i < stop; i++)
       {
          if (CF_marker[i] > 0)
          {
@@ -1030,20 +1085,20 @@ hypre_BoomerAMGBuildModExtPIInterpHost(hypre_ParCSRMatrix  *A,
          }
          else
          {
-            for (j=W_diag_i[row]; j < W_diag_i[row+1]; j++)
+            for (j = W_diag_i[row]; j < W_diag_i[row + 1]; j++)
             {
                P_diag_j[cnt_diag] = W_diag_j[j];
                P_diag_data[cnt_diag++] = W_diag_data[j];
             }
-            for (j=W_offd_i[row]; j < W_offd_i[row+1]; j++)
+            for (j = W_offd_i[row]; j < W_offd_i[row + 1]; j++)
             {
                P_offd_j[cnt_offd] = W_offd_j[j];
                P_offd_data[cnt_offd++] = W_offd_data[j];
             }
             row++;
          }
-         P_diag_i[i+1] = cnt_diag;
-         P_offd_i[i+1] = cnt_offd;
+         P_diag_i[i + 1] = cnt_diag;
+         P_offd_i[i + 1] = cnt_offd;
       }
 
    }   /* end parallel region */
@@ -1053,13 +1108,13 @@ hypre_BoomerAMGBuildModExtPIInterpHost(hypre_ParCSRMatrix  *A,
     *-----------------------------------------------------------------------*/
 
    P = hypre_ParCSRMatrixCreate(comm,
-         hypre_ParCSRMatrixGlobalNumRows(A),
-         total_global_cpts,
-         hypre_ParCSRMatrixColStarts(A),
-         num_cpts_global,
-         num_cols_P_offd,
-         P_diag_i[n_fine],
-         P_offd_i[n_fine]);
+                                hypre_ParCSRMatrixGlobalNumRows(A),
+                                total_global_cpts,
+                                hypre_ParCSRMatrixColStarts(A),
+                                num_cpts_global,
+                                num_cols_P_offd,
+                                P_diag_i[n_fine],
+                                P_offd_i[n_fine]);
 
    P_diag = hypre_ParCSRMatrixDiag(P);
    hypre_CSRMatrixData(P_diag) = P_diag_data;
@@ -1093,33 +1148,35 @@ hypre_BoomerAMGBuildModExtPIInterpHost(hypre_ParCSRMatrix  *A,
       if (num_cols_P_offd)
       {
          P_marker = hypre_CTAlloc(HYPRE_Int, num_cols_P_offd, HYPRE_MEMORY_HOST);
-         for (i=0; i < P_offd_size; i++)
+         for (i = 0; i < P_offd_size; i++)
+         {
             P_marker[P_offd_j[i]] = 1;
+         }
 
          new_ncols_P_offd = 0;
-         for (i=0; i < num_cols_P_offd; i++)
-            if (P_marker[i]) new_ncols_P_offd++;
+         for (i = 0; i < num_cols_P_offd; i++)
+            if (P_marker[i]) { new_ncols_P_offd++; }
 
          new_col_map_offd = hypre_CTAlloc(HYPRE_BigInt, new_ncols_P_offd, HYPRE_MEMORY_HOST);
          map = hypre_CTAlloc(HYPRE_Int, new_ncols_P_offd, HYPRE_MEMORY_HOST);
 
          index = 0;
-         for (i=0; i < num_cols_P_offd; i++)
+         for (i = 0; i < num_cols_P_offd; i++)
             if (P_marker[i])
             {
-                new_col_map_offd[index] = col_map_offd_P[i];
-                map[index++] = i;
+               new_col_map_offd[index] = col_map_offd_P[i];
+               map[index++] = i;
             }
          hypre_TFree(P_marker, HYPRE_MEMORY_HOST);
 
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+         #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-         for (i=0; i < P_offd_size; i++)
+         for (i = 0; i < P_offd_size; i++)
          {
             P_offd_j[i] = hypre_BinarySearch(map, P_offd_j[i],
-               new_ncols_P_offd);
+                                             new_ncols_P_offd);
          }
          hypre_TFree(col_map_offd_P, HYPRE_MEMORY_HOST);
          hypre_ParCSRMatrixColMapOffd(P) = new_col_map_offd;
@@ -1166,31 +1223,26 @@ hypre_BoomerAMGBuildModExtPIInterp(hypre_ParCSRMatrix  *A,
                                    HYPRE_Int            max_elmts,
                                    hypre_ParCSRMatrix **P_ptr)
 {
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    hypre_GpuProfilingPushRange("ModExtPIInterp");
-#endif
-
-   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_ParCSRMatrixMemoryLocation(A) );
 
    HYPRE_Int ierr = 0;
 
-   if (exec == HYPRE_EXEC_HOST)
-   {
-      ierr = hypre_BoomerAMGBuildModExtPIInterpHost(A, CF_marker, S, num_cpts_global,
-                                                    debug_flag, num_functions, dof_func,
-                                                    trunc_factor, max_elmts, P_ptr);
-   }
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-   else
+#if defined(HYPRE_USING_GPU)
+   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_ParCSRMatrixMemoryLocation(A) );
+   if (exec == HYPRE_EXEC_DEVICE)
    {
       ierr = hypre_BoomerAMGBuildExtPIInterpDevice(A, CF_marker, S, num_cpts_global, 1, NULL,
                                                    debug_flag, trunc_factor, max_elmts, P_ptr);
    }
+   else
 #endif
+   {
+      ierr = hypre_BoomerAMGBuildModExtPIInterpHost(A, CF_marker, S, num_cpts_global,
+                                                    debug_flag, num_functions, dof_func,
+                                                    trunc_factor, max_elmts, P_ptr);
+   }
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    hypre_GpuProfilingPopRange();
-#endif
 
    return ierr;
 }
@@ -1211,6 +1263,8 @@ hypre_BoomerAMGBuildModExtPEInterpHost(hypre_ParCSRMatrix   *A,
                                        HYPRE_Int             max_elmts,
                                        hypre_ParCSRMatrix  **P_ptr)
 {
+   HYPRE_UNUSED_VAR(debug_flag);
+
    /* Communication Variables */
    MPI_Comm                 comm = hypre_ParCSRMatrixComm(A);
    HYPRE_MemoryLocation memory_location_P = hypre_ParCSRMatrixMemoryLocation(A);
@@ -1309,13 +1363,13 @@ hypre_BoomerAMGBuildModExtPEInterpHost(hypre_ParCSRMatrix   *A,
 
    /* BEGIN */
    hypre_MPI_Comm_size(comm, &num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_rank(comm, &my_id);
 
-   if (my_id == (num_procs -1)) total_global_cpts = num_cpts_global[1];
-   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
-   n_Cpts = num_cpts_global[1]-num_cpts_global[0];
+   if (my_id == (num_procs - 1)) { total_global_cpts = num_cpts_global[1]; }
+   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
+   n_Cpts = num_cpts_global[1] - num_cpts_global[0];
 
-   hypre_ParCSRMatrixGenerateFFFC(A, CF_marker, num_cpts_global, S, &As_FC, &As_FF);
+   hypre_ParCSRMatrixGenerateFFFCHost(A, CF_marker, num_cpts_global, S, &As_FC, &As_FF);
 
    As_FC_diag = hypre_ParCSRMatrixDiag(As_FC);
    As_FC_diag_i = hypre_CSRMatrixI(As_FC_diag);
@@ -1340,26 +1394,26 @@ hypre_BoomerAMGBuildModExtPEInterpHost(hypre_ParCSRMatrix   *A,
    D_tau = hypre_CTAlloc(HYPRE_Real, n_Fpts, HYPRE_MEMORY_HOST);
    D_w = hypre_CTAlloc(HYPRE_Real, n_Fpts, HYPRE_MEMORY_HOST);
    cpt_array = hypre_CTAlloc(HYPRE_Int, num_threads, HYPRE_MEMORY_HOST);
-   start_array = hypre_CTAlloc(HYPRE_Int, num_threads+1, HYPRE_MEMORY_HOST);
-   startf_array = hypre_CTAlloc(HYPRE_Int, num_threads+1, HYPRE_MEMORY_HOST);
+   start_array = hypre_CTAlloc(HYPRE_Int, num_threads + 1, HYPRE_MEMORY_HOST);
+   startf_array = hypre_CTAlloc(HYPRE_Int, num_threads + 1, HYPRE_MEMORY_HOST);
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel private(i,j,start,stop,startf,stopf,row,theta,value)
+   #pragma omp parallel private(i,j,start,stop,startf,stopf,row,theta,value)
 #endif
    {
       HYPRE_Int my_thread_num = hypre_GetThreadNum();
 
-      start = (n_fine/num_threads)*my_thread_num;
-      if (my_thread_num == num_threads-1)
+      start = (n_fine / num_threads) * my_thread_num;
+      if (my_thread_num == num_threads - 1)
       {
          stop = n_fine;
       }
       else
       {
-         stop = (n_fine/num_threads)*(my_thread_num+1);
+         stop = (n_fine / num_threads) * (my_thread_num + 1);
       }
-      start_array[my_thread_num+1] = stop;
-      for (i=start; i < stop; i++)
+      start_array[my_thread_num + 1] = stop;
+      for (i = start; i < stop; i++)
       {
          if (CF_marker[i] > 0)
          {
@@ -1368,13 +1422,13 @@ hypre_BoomerAMGBuildModExtPEInterpHost(hypre_ParCSRMatrix   *A,
       }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
       if (my_thread_num == 0)
       {
-         for (i=1; i < num_threads; i++)
+         for (i = 1; i < num_threads; i++)
          {
-            cpt_array[i] += cpt_array[i-1];
+            cpt_array[i] += cpt_array[i - 1];
          }
          if (num_functions > 1)
          {
@@ -1384,13 +1438,14 @@ hypre_BoomerAMGBuildModExtPEInterpHost(hypre_ParCSRMatrix   *A,
             dof_func_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_A_offd, HYPRE_MEMORY_HOST);
             index = 0;
             num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
-            int_buf_data = hypre_CTAlloc(HYPRE_Int, hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends), HYPRE_MEMORY_HOST);
+            int_buf_data = hypre_CTAlloc(HYPRE_Int, hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                                         HYPRE_MEMORY_HOST);
             for (i = 0; i < num_sends; i++)
             {
                startc = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-               for (j = startc; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+               for (j = startc; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
                {
-                  int_buf_data[index++] = dof_func[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+                  int_buf_data[index++] = dof_func[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
                }
             }
             comm_handle = hypre_ParCSRCommHandleCreate( 11, comm_pkg, int_buf_data, dof_func_offd);
@@ -1399,47 +1454,56 @@ hypre_BoomerAMGBuildModExtPEInterpHost(hypre_ParCSRMatrix   *A,
          }
       }
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
       if (my_thread_num > 0)
-         startf = start - cpt_array[my_thread_num-1];
+      {
+         startf = start - cpt_array[my_thread_num - 1];
+      }
       else
+      {
          startf = 0;
+      }
 
-      if (my_thread_num < num_threads-1)
+      if (my_thread_num < num_threads - 1)
+      {
          stopf = stop - cpt_array[my_thread_num];
+      }
       else
+      {
          stopf = n_Fpts;
+      }
 
-      startf_array[my_thread_num+1] = stopf;
+      startf_array[my_thread_num + 1] = stopf;
 
-      for (i=startf; i < stopf; i++)
+      for (i = startf; i < stopf; i++)
       {
          HYPRE_Real number;
-         for (j=As_FF_diag_i[i]+1; j < As_FF_diag_i[i+1]; j++)
+         for (j = As_FF_diag_i[i] + 1; j < As_FF_diag_i[i + 1]; j++)
          {
             D_lambda[i] += As_FF_diag_data[j];
          }
-         for (j=As_FF_offd_i[i]; j < As_FF_offd_i[i+1]; j++)
+         for (j = As_FF_offd_i[i]; j < As_FF_offd_i[i + 1]; j++)
          {
             D_lambda[i] += As_FF_offd_data[j];
          }
-         number = (HYPRE_Real)(As_FF_diag_i[i+1]-As_FF_diag_i[i]-1+As_FF_offd_i[i+1]-As_FF_offd_i[i]);
-         if (number) D_lambda[i] /= number;
-         for (j=As_FC_diag_i[i]; j < As_FC_diag_i[i+1]; j++)
+         number = (HYPRE_Real)(As_FF_diag_i[i + 1] - As_FF_diag_i[i] - 1 + As_FF_offd_i[i + 1] -
+                               As_FF_offd_i[i]);
+         if (number) { D_lambda[i] /= number; }
+         for (j = As_FC_diag_i[i]; j < As_FC_diag_i[i + 1]; j++)
          {
             D_beta[i] += As_FC_diag_data[j];
          }
-         for (j=As_FC_offd_i[i]; j < As_FC_offd_i[i+1]; j++)
+         for (j = As_FC_offd_i[i]; j < As_FC_offd_i[i + 1]; j++)
          {
             D_beta[i] += As_FC_offd_data[j];
          }
-         if (D_lambda[i]+D_beta[i]) D_tmp[i] = D_lambda[i]/(D_beta[i]+D_lambda[i]);
+         if (D_lambda[i] + D_beta[i]) { D_tmp[i] = D_lambda[i] / (D_beta[i] + D_lambda[i]); }
       }
 
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
       if (my_thread_num == 0)
       {
@@ -1455,13 +1519,14 @@ hypre_BoomerAMGBuildModExtPEInterpHost(hypre_ParCSRMatrix   *A,
             comm_pkg = hypre_ParCSRMatrixCommPkg(As_FF);
          }
          num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
-         buf_data = hypre_CTAlloc(HYPRE_Real, hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends), HYPRE_MEMORY_HOST);
+         buf_data = hypre_CTAlloc(HYPRE_Real, hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                                  HYPRE_MEMORY_HOST);
          for (i = 0; i < num_sends; i++)
          {
             startc = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-            for (j = startc; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+            for (j = startc; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
             {
-               buf_data[index++] = D_tmp[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+               buf_data[index++] = D_tmp[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
             }
          }
 
@@ -1470,11 +1535,11 @@ hypre_BoomerAMGBuildModExtPEInterpHost(hypre_ParCSRMatrix   *A,
       }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
 
       row = startf;
-      for (i=start; i < stop; i++)
+      for (i = start; i < stop; i++)
       {
          if (CF_marker[i] < 0)
          {
@@ -1482,7 +1547,7 @@ hypre_BoomerAMGBuildModExtPEInterpHost(hypre_ParCSRMatrix   *A,
             {
                HYPRE_Int jA, jC, jS;
                jC = A_diag_i[i];
-               for (j=S_diag_i[i]; j < S_diag_i[i+1]; j++)
+               for (j = S_diag_i[i]; j < S_diag_i[i + 1]; j++)
                {
                   jS = S_diag_j[j];
                   jA = A_diag_j[jC];
@@ -1493,18 +1558,22 @@ hypre_BoomerAMGBuildModExtPEInterpHost(hypre_ParCSRMatrix   *A,
                         D_w[row] += A_diag_data[jC++];
                      }
                      else
+                     {
                         jC++;
+                     }
                      jA = A_diag_j[jC];
                   }
                   jC++;
                }
-               for (j=jC; j < A_diag_i[i+1]; j++)
+               for (j = jC; j < A_diag_i[i + 1]; j++)
                {
                   if (dof_func[i] == dof_func[A_diag_j[j]])
-                        D_w[row] += A_diag_data[j];
+                  {
+                     D_w[row] += A_diag_data[j];
+                  }
                }
                jC = A_offd_i[i];
-               for (j=S_offd_i[i]; j < S_offd_i[i+1]; j++)
+               for (j = S_offd_i[i]; j < S_offd_i[i + 1]; j++)
                {
                   jS = S_offd_j[j];
                   jA = A_offd_j[jC];
@@ -1515,33 +1584,37 @@ hypre_BoomerAMGBuildModExtPEInterpHost(hypre_ParCSRMatrix   *A,
                         D_w[row] += A_offd_data[jC++];
                      }
                      else
+                     {
                         jC++;
+                     }
                      jA = A_offd_j[jC];
                   }
                   jC++;
                }
-               for (j=jC; j < A_offd_i[i+1]; j++)
+               for (j = jC; j < A_offd_i[i + 1]; j++)
                {
                   if (dof_func[i] == dof_func_offd[A_offd_j[j]])
-                        D_w[row] += A_offd_data[j];
+                  {
+                     D_w[row] += A_offd_data[j];
+                  }
                }
                row++;
             }
             else
             {
-               for (j=A_diag_i[i]; j < A_diag_i[i+1]; j++)
+               for (j = A_diag_i[i]; j < A_diag_i[i + 1]; j++)
                {
                   D_w[row] += A_diag_data[j];
                }
-               for (j=A_offd_i[i]; j < A_offd_i[i+1]; j++)
+               for (j = A_offd_i[i]; j < A_offd_i[i + 1]; j++)
                {
                   D_w[row] += A_offd_data[j];
                }
-               for (j=As_FF_diag_i[row]+1; j < As_FF_diag_i[row+1]; j++)
+               for (j = As_FF_diag_i[row] + 1; j < As_FF_diag_i[row + 1]; j++)
                {
                   D_w[row] -= As_FF_diag_data[j];
                }
-               for (j=As_FF_offd_i[row]; j < As_FF_offd_i[row+1]; j++)
+               for (j = As_FF_offd_i[row]; j < As_FF_offd_i[row + 1]; j++)
                {
                   D_w[row] -= As_FF_offd_data[j];
                }
@@ -1551,39 +1624,39 @@ hypre_BoomerAMGBuildModExtPEInterpHost(hypre_ParCSRMatrix   *A,
          }
       }
 
-      for (i=startf; i<stopf; i++)
+      for (i = startf; i < stopf; i++)
       {
-         for (j=As_FF_diag_i[i]+1; j < As_FF_diag_i[i+1]; j++)
+         for (j = As_FF_diag_i[i] + 1; j < As_FF_diag_i[i + 1]; j++)
          {
             index = As_FF_diag_j[j];
-            D_tau[i] += As_FF_diag_data[j]*D_tmp[index];
+            D_tau[i] += As_FF_diag_data[j] * D_tmp[index];
          }
-         for (j=As_FF_offd_i[i]; j < As_FF_offd_i[i+1]; j++)
+         for (j = As_FF_offd_i[i]; j < As_FF_offd_i[i + 1]; j++)
          {
             index = As_FF_offd_j[j];
-            D_tau[i] += As_FF_offd_data[j]*D_tmp_offd[index];
+            D_tau[i] += As_FF_offd_data[j] * D_tmp_offd[index];
          }
       }
-      for (i=startf; i<stopf; i++)
+      for (i = startf; i < stopf; i++)
       {
-         value = D_w[i]+D_tau[i];
-         if (value) value = -1.0/value;
-         theta = D_beta[i]+D_lambda[i];
-         As_FF_diag_data[As_FF_diag_i[i]] = value*theta;
-         if (theta) theta = 1.0/theta;
-         for (j = As_FF_diag_i[i]+1; j < As_FF_diag_i[i+1]; j++)
+         value = D_w[i] + D_tau[i];
+         if (value) { value = -1.0 / value; }
+         theta = D_beta[i] + D_lambda[i];
+         As_FF_diag_data[As_FF_diag_i[i]] = value * theta;
+         if (theta) { theta = 1.0 / theta; }
+         for (j = As_FF_diag_i[i] + 1; j < As_FF_diag_i[i + 1]; j++)
          {
             As_FF_diag_data[j] *= value;
          }
-         for (j = As_FF_offd_i[i]; j < As_FF_offd_i[i+1]; j++)
+         for (j = As_FF_offd_i[i]; j < As_FF_offd_i[i + 1]; j++)
          {
             As_FF_offd_data[j] *= value;
          }
-         for (j = As_FC_diag_i[i]; j < As_FC_diag_i[i+1]; j++)
+         for (j = As_FC_diag_i[i]; j < As_FC_diag_i[i + 1]; j++)
          {
             As_FC_diag_data[j] *= theta;
          }
-         for (j = As_FC_offd_i[i]; j < As_FC_offd_i[i+1]; j++)
+         for (j = As_FC_offd_i[i]; j < As_FC_offd_i[i + 1]; j++)
          {
             As_FC_offd_data[j] *= theta;
          }
@@ -1604,8 +1677,8 @@ hypre_BoomerAMGBuildModExtPEInterpHost(hypre_ParCSRMatrix   *A,
    /*-----------------------------------------------------------------------
     *  Intialize data for P
     *-----------------------------------------------------------------------*/
-   P_diag_i    = hypre_CTAlloc(HYPRE_Int,  n_fine+1, memory_location_P);
-   P_offd_i    = hypre_CTAlloc(HYPRE_Int,  n_fine+1, memory_location_P);
+   P_diag_i    = hypre_CTAlloc(HYPRE_Int,  n_fine + 1, memory_location_P);
+   P_offd_i    = hypre_CTAlloc(HYPRE_Int,  n_fine + 1, memory_location_P);
 
    P_diag_size = n_Cpts + hypre_CSRMatrixI(W_diag)[n_Fpts];
    P_offd_size = hypre_CSRMatrixI(W_offd)[n_Fpts];
@@ -1623,23 +1696,27 @@ hypre_BoomerAMGBuildModExtPEInterpHost(hypre_ParCSRMatrix   *A,
    }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel private(i,j,start,stop,startf,stopf,c_pt,row,cnt_diag,cnt_offd)
+   #pragma omp parallel private(i,j,start,stop,startf,stopf,c_pt,row,cnt_diag,cnt_offd)
 #endif
    {
       HYPRE_Int my_thread_num = hypre_GetThreadNum();
       startf = startf_array[my_thread_num];
-      stopf = startf_array[my_thread_num+1];
+      stopf = startf_array[my_thread_num + 1];
       start = start_array[my_thread_num];
-      stop = start_array[my_thread_num+1];
+      stop = start_array[my_thread_num + 1];
 
       if (my_thread_num > 0)
-         c_pt = cpt_array[my_thread_num-1];
+      {
+         c_pt = cpt_array[my_thread_num - 1];
+      }
       else
+      {
          c_pt = 0;
-      cnt_diag = W_diag_i[startf]+c_pt;
+      }
+      cnt_diag = W_diag_i[startf] + c_pt;
       cnt_offd = W_offd_i[startf];
       row = startf;
-      for (i=start; i < stop; i++)
+      for (i = start; i < stop; i++)
       {
          if (CF_marker[i] > 0)
          {
@@ -1648,20 +1725,20 @@ hypre_BoomerAMGBuildModExtPEInterpHost(hypre_ParCSRMatrix   *A,
          }
          else
          {
-            for (j=W_diag_i[row]; j < W_diag_i[row+1]; j++)
+            for (j = W_diag_i[row]; j < W_diag_i[row + 1]; j++)
             {
                P_diag_j[cnt_diag] = W_diag_j[j];
                P_diag_data[cnt_diag++] = W_diag_data[j];
             }
-            for (j=W_offd_i[row]; j < W_offd_i[row+1]; j++)
+            for (j = W_offd_i[row]; j < W_offd_i[row + 1]; j++)
             {
                P_offd_j[cnt_offd] = W_offd_j[j];
                P_offd_data[cnt_offd++] = W_offd_data[j];
             }
             row++;
          }
-         P_diag_i[i+1] = cnt_diag;
-         P_offd_i[i+1] = cnt_offd;
+         P_diag_i[i + 1] = cnt_diag;
+         P_offd_i[i + 1] = cnt_offd;
       }
 
    }   /* end parallel region */
@@ -1671,13 +1748,13 @@ hypre_BoomerAMGBuildModExtPEInterpHost(hypre_ParCSRMatrix   *A,
     *-----------------------------------------------------------------------*/
 
    P = hypre_ParCSRMatrixCreate(comm,
-         hypre_ParCSRMatrixGlobalNumRows(A),
-         total_global_cpts,
-         hypre_ParCSRMatrixColStarts(A),
-         num_cpts_global,
-         num_cols_P_offd,
-         P_diag_i[n_fine],
-         P_offd_i[n_fine]);
+                                hypre_ParCSRMatrixGlobalNumRows(A),
+                                total_global_cpts,
+                                hypre_ParCSRMatrixColStarts(A),
+                                num_cpts_global,
+                                num_cols_P_offd,
+                                P_diag_i[n_fine],
+                                P_offd_i[n_fine]);
 
    P_diag = hypre_ParCSRMatrixDiag(P);
    hypre_CSRMatrixData(P_diag) = P_diag_data;
@@ -1711,33 +1788,35 @@ hypre_BoomerAMGBuildModExtPEInterpHost(hypre_ParCSRMatrix   *A,
       if (num_cols_P_offd)
       {
          P_marker = hypre_CTAlloc(HYPRE_Int, num_cols_P_offd, HYPRE_MEMORY_HOST);
-         for (i=0; i < P_offd_size; i++)
+         for (i = 0; i < P_offd_size; i++)
+         {
             P_marker[P_offd_j[i]] = 1;
+         }
 
          new_ncols_P_offd = 0;
-         for (i=0; i < num_cols_P_offd; i++)
-            if (P_marker[i]) new_ncols_P_offd++;
+         for (i = 0; i < num_cols_P_offd; i++)
+            if (P_marker[i]) { new_ncols_P_offd++; }
 
          new_col_map_offd = hypre_CTAlloc(HYPRE_BigInt, new_ncols_P_offd, HYPRE_MEMORY_HOST);
          map = hypre_CTAlloc(HYPRE_Int, new_ncols_P_offd, HYPRE_MEMORY_HOST);
 
          index = 0;
-         for (i=0; i < num_cols_P_offd; i++)
+         for (i = 0; i < num_cols_P_offd; i++)
             if (P_marker[i])
             {
-                new_col_map_offd[index] = col_map_offd_P[i];
-                map[index++] = i;
+               new_col_map_offd[index] = col_map_offd_P[i];
+               map[index++] = i;
             }
          hypre_TFree(P_marker, HYPRE_MEMORY_HOST);
 
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+         #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-         for (i=0; i < P_offd_size; i++)
+         for (i = 0; i < P_offd_size; i++)
          {
             P_offd_j[i] = hypre_BinarySearch(map, P_offd_j[i],
-               new_ncols_P_offd);
+                                             new_ncols_P_offd);
          }
          hypre_TFree(col_map_offd_P, HYPRE_MEMORY_HOST);
          hypre_ParCSRMatrixColMapOffd(P) = new_col_map_offd;
@@ -1761,6 +1840,7 @@ hypre_BoomerAMGBuildModExtPEInterpHost(hypre_ParCSRMatrix   *A,
    hypre_TFree(start_array, HYPRE_MEMORY_HOST);
    hypre_TFree(startf_array, HYPRE_MEMORY_HOST);
    hypre_TFree(buf_data, HYPRE_MEMORY_HOST);
+   hypre_TFree(dof_func_offd, HYPRE_MEMORY_HOST);
    hypre_ParCSRMatrixDestroy(As_FF);
    hypre_ParCSRMatrixDestroy(As_FC);
    hypre_ParCSRMatrixDestroy(W);
@@ -1773,41 +1853,36 @@ hypre_BoomerAMGBuildModExtPEInterpHost(hypre_ParCSRMatrix   *A,
  *-----------------------------------------------------------------------*/
 HYPRE_Int
 hypre_BoomerAMGBuildModExtPEInterp(hypre_ParCSRMatrix  *A,
-                                      HYPRE_Int           *CF_marker,
-                                      hypre_ParCSRMatrix  *S,
-                                      HYPRE_BigInt        *num_cpts_global,
-                                      HYPRE_Int            num_functions,
-                                      HYPRE_Int           *dof_func,
-                                      HYPRE_Int            debug_flag,
-                                      HYPRE_Real           trunc_factor,
-                                      HYPRE_Int            max_elmts,
-                                      hypre_ParCSRMatrix **P_ptr)
+                                   HYPRE_Int           *CF_marker,
+                                   hypre_ParCSRMatrix  *S,
+                                   HYPRE_BigInt        *num_cpts_global,
+                                   HYPRE_Int            num_functions,
+                                   HYPRE_Int           *dof_func,
+                                   HYPRE_Int            debug_flag,
+                                   HYPRE_Real           trunc_factor,
+                                   HYPRE_Int            max_elmts,
+                                   hypre_ParCSRMatrix **P_ptr)
 {
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    hypre_GpuProfilingPushRange("ModExtPEInterp");
-#endif
-
-   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_ParCSRMatrixMemoryLocation(A) );
 
    HYPRE_Int ierr = 0;
 
-   if (exec == HYPRE_EXEC_HOST)
+#if defined(HYPRE_USING_GPU)
+   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_ParCSRMatrixMemoryLocation(A) );
+   if (exec == HYPRE_EXEC_DEVICE)
    {
-      ierr = hypre_BoomerAMGBuildModExtPEInterpHost(A, CF_marker, S, num_cpts_global,
-                                                    num_functions, dof_func,
-                                                    debug_flag, trunc_factor, max_elmts, P_ptr);
+      ierr = hypre_BoomerAMGBuildExtPEInterpDevice(A, CF_marker, S, num_cpts_global, 1, NULL,
+                                                   debug_flag, trunc_factor, max_elmts, P_ptr);
    }
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    else
+#endif
    {
-      ierr = hypre_BoomerAMGBuildExtPEInterpDevice(A,CF_marker,S,num_cpts_global,1,NULL,
-                                                 debug_flag,trunc_factor,max_elmts,P_ptr);
+      ierr = hypre_BoomerAMGBuildModExtPEInterpHost(A, CF_marker, S, num_cpts_global,
+                                                    num_functions, dof_func,
+                                                    debug_flag, trunc_factor, max_elmts, P_ptr);
    }
-#endif
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    hypre_GpuProfilingPopRange();
-#endif
 
    return ierr;
 }
diff --git a/external/hypre/src/parcsr_ls/par_mod_multi_interp.c b/external/hypre/src/parcsr_ls/par_mod_multi_interp.c
new file mode 100644
index 00000000..1280ba36
--- /dev/null
+++ b/external/hypre/src/parcsr_ls/par_mod_multi_interp.c
@@ -0,0 +1,1318 @@
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+#include "_hypre_parcsr_ls.h"
+
+/*--------------------------------------------------------------------------
+ * hypre_ParAMGBuildModMultipass
+ * This routine implements Stuben's direct interpolation with multiple passes.
+ * expressed with matrix matrix multiplications
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_BoomerAMGBuildModMultipassHost( hypre_ParCSRMatrix  *A,
+                                      HYPRE_Int           *CF_marker,
+                                      hypre_ParCSRMatrix  *S,
+                                      HYPRE_BigInt        *num_cpts_global,
+                                      HYPRE_Real           trunc_factor,
+                                      HYPRE_Int            P_max_elmts,
+                                      HYPRE_Int            interp_type,
+                                      HYPRE_Int            num_functions,
+                                      HYPRE_Int           *dof_func,
+                                      hypre_ParCSRMatrix **P_ptr )
+{
+#ifdef HYPRE_PROFILE
+   hypre_profile_times[HYPRE_TIMER_ID_MULTIPASS_INTERP] -= hypre_MPI_Wtime();
+#endif
+
+   MPI_Comm                comm = hypre_ParCSRMatrixComm(A);
+   hypre_ParCSRCommPkg    *comm_pkg = hypre_ParCSRMatrixCommPkg(A);
+   hypre_ParCSRCommHandle *comm_handle;
+
+   HYPRE_MemoryLocation memory_location_P = hypre_ParCSRMatrixMemoryLocation(A);
+
+   hypre_CSRMatrix *A_diag = hypre_ParCSRMatrixDiag(A);
+   HYPRE_Int       *A_diag_i = hypre_CSRMatrixI(A_diag);
+   HYPRE_Int       *A_diag_j = hypre_CSRMatrixJ(A_diag);
+   HYPRE_Real      *A_diag_data = hypre_CSRMatrixData(A_diag);
+   HYPRE_Int        n_fine = hypre_CSRMatrixNumRows(A_diag);
+
+   hypre_CSRMatrix *A_offd = hypre_ParCSRMatrixOffd(A);
+   HYPRE_Int       *A_offd_i = hypre_CSRMatrixI(A_offd);
+   HYPRE_Int       *A_offd_j = hypre_CSRMatrixJ(A_offd);
+   HYPRE_Real      *A_offd_data = hypre_CSRMatrixData(A_offd);
+
+   HYPRE_Int        num_cols_offd_A = hypre_CSRMatrixNumCols(A_offd);
+
+   hypre_CSRMatrix *S_diag = hypre_ParCSRMatrixDiag(S);
+   HYPRE_Int       *S_diag_i = hypre_CSRMatrixI(S_diag);
+   HYPRE_Int       *S_diag_j = hypre_CSRMatrixJ(S_diag);
+
+   hypre_CSRMatrix *S_offd = hypre_ParCSRMatrixOffd(S);
+   HYPRE_Int       *S_offd_i = hypre_CSRMatrixI(S_offd);
+   HYPRE_Int       *S_offd_j = hypre_CSRMatrixJ(S_offd);
+
+   hypre_ParCSRMatrix **Pi;
+   hypre_ParCSRMatrix *P;
+   hypre_CSRMatrix *P_diag;
+   HYPRE_Real      *P_diag_data;
+   HYPRE_Int       *P_diag_i; /*at first counter of nonzero cols for each row,
+                                      finally will be pointer to start of row */
+   HYPRE_Int       *P_diag_j;
+
+   hypre_CSRMatrix *P_offd;
+   HYPRE_Real      *P_offd_data = NULL;
+   HYPRE_Int       *P_offd_i; /*at first counter of nonzero cols for each row,
+                                      finally will be pointer to start of row */
+   HYPRE_Int       *P_offd_j = NULL;
+   HYPRE_BigInt    *col_map_offd_P = NULL;
+   HYPRE_Int        num_cols_offd_P = 0;
+
+   HYPRE_Int        num_sends = 0;
+   HYPRE_Int       *int_buf_data = NULL;
+
+   HYPRE_Int       *fine_to_coarse;
+   HYPRE_Int       *points_left;
+   HYPRE_Int       *pass_marker;
+   HYPRE_Int       *pass_marker_offd = NULL;
+   HYPRE_Int       *pass_order;
+   HYPRE_Int       *pass_starts;
+
+   HYPRE_Int        i, j, i1, i2, j1;
+   HYPRE_Int        num_passes, p;
+   HYPRE_BigInt     global_remaining, remaining;
+   HYPRE_Int        cnt, cnt_old, cnt_rem, current_pass;
+   HYPRE_Int        startc, index;
+
+   HYPRE_BigInt     total_global_cpts;
+   HYPRE_Int        my_id, num_procs;
+   HYPRE_Int        P_offd_size = 0;
+
+   HYPRE_Int       *dof_func_offd = NULL;
+   HYPRE_Real      *row_sums = NULL;
+
+   /* MPI size and rank*/
+   hypre_MPI_Comm_size(comm, &num_procs);
+   hypre_MPI_Comm_rank(comm, &my_id);
+
+   if (num_procs > 1)
+   {
+      if (my_id == num_procs - 1)
+      {
+         total_global_cpts = num_cpts_global[1];
+      }
+      hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
+   }
+   else
+   {
+      total_global_cpts = num_cpts_global[1];
+   }
+
+   if (total_global_cpts == 0)
+   {
+      *P_ptr = NULL;
+      return hypre_error_flag;
+   }
+   /* Generate pass marker array */
+
+   pass_marker = hypre_CTAlloc(HYPRE_Int, n_fine, HYPRE_MEMORY_HOST);
+   /* contains pass numbers for each variable according to original order */
+   pass_order = hypre_CTAlloc(HYPRE_Int, n_fine, HYPRE_MEMORY_HOST);
+   /* contains row numbers according to new order, pass 1 followed by pass 2 etc */
+   fine_to_coarse = hypre_CTAlloc(HYPRE_Int, n_fine, HYPRE_MEMORY_HOST);
+   /* reverse of pass_order, keeps track where original numbers go */
+   points_left = hypre_CTAlloc(HYPRE_Int, n_fine, HYPRE_MEMORY_HOST);
+   /* contains row numbers of remaining points, auxiliary */
+   pass_starts = hypre_CTAlloc(HYPRE_Int, 11, HYPRE_MEMORY_HOST);
+   /* contains beginning for each pass in pass_order field, assume no more than 10 passes */
+
+   P_diag_i = hypre_CTAlloc(HYPRE_Int, n_fine + 1, memory_location_P);
+   P_offd_i = hypre_CTAlloc(HYPRE_Int, n_fine + 1, memory_location_P);
+
+   cnt = 0;
+   remaining = 0;
+   for (i = 0; i < n_fine; i++)
+   {
+      if (CF_marker[i] == 1)
+      {
+         pass_marker[i] = 1;
+         P_diag_i[i + 1] = 1;
+         P_offd_i[i + 1] = 0;
+         fine_to_coarse[i] = cnt;
+         pass_order[cnt++] = i;
+      }
+      else
+      {
+         points_left[remaining++] = i;
+      }
+   }
+   pass_starts[0] = 0;
+   pass_starts[1] = cnt;
+
+   if (num_functions > 1)
+   {
+      dof_func_offd = hypre_CTAlloc(HYPRE_Int, num_cols_offd_A, HYPRE_MEMORY_HOST);
+      index = 0;
+      num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
+      int_buf_data = hypre_CTAlloc(HYPRE_Int,  hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                                   HYPRE_MEMORY_HOST);
+      for (i = 0; i < num_sends; i++)
+      {
+         startc = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
+         for (j = startc; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
+         {
+            int_buf_data[index++] = dof_func[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
+         }
+      }
+
+      comm_handle = hypre_ParCSRCommHandleCreate( 11, comm_pkg, int_buf_data, dof_func_offd);
+
+      hypre_ParCSRCommHandleDestroy(comm_handle);
+
+      hypre_TFree(int_buf_data, HYPRE_MEMORY_HOST);
+   }
+
+   if (num_procs > 1)
+   {
+      pass_marker_offd = hypre_CTAlloc(HYPRE_Int, num_cols_offd_A, HYPRE_MEMORY_HOST);
+      index = 0;
+      num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
+      int_buf_data = hypre_CTAlloc(HYPRE_Int, hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                                   HYPRE_MEMORY_HOST);
+      for (i = 0; i < num_sends; i++)
+      {
+         startc = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
+         for (j = startc; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
+         {
+            int_buf_data[index++] = pass_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
+         }
+      }
+
+      comm_handle = hypre_ParCSRCommHandleCreate(11, comm_pkg, int_buf_data, pass_marker_offd);
+
+      hypre_ParCSRCommHandleDestroy(comm_handle);
+   }
+   current_pass = 1;
+   num_passes = 1;
+   /* color points according to pass number */
+   hypre_MPI_Allreduce(&remaining, &global_remaining, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
+   while (global_remaining > 0)
+   {
+      HYPRE_Int remaining_pts = (HYPRE_Int) remaining;
+      HYPRE_BigInt old_global_remaining = global_remaining;
+      cnt_rem = 0;
+      for (i = 0; i < remaining_pts; i++)
+      {
+         i1 = points_left[i];
+         cnt_old = cnt;
+         for (j = S_diag_i[i1]; j < S_diag_i[i1 + 1]; j++)
+         {
+            j1 = S_diag_j[j];
+            if (pass_marker[j1] == current_pass)
+            {
+               pass_marker[i1] = current_pass + 1;
+               pass_order[cnt++] = i1;
+               remaining--;
+               break;
+            }
+         }
+         if (cnt == cnt_old)
+         {
+            for (j = S_offd_i[i1]; j < S_offd_i[i1 + 1]; j++)
+            {
+               j1 = S_offd_j[j];
+               if (pass_marker_offd[j1] == current_pass)
+               {
+                  pass_marker[i1] = current_pass + 1;
+                  pass_order[cnt++] = i1;
+                  remaining--;
+                  break;
+               }
+            }
+         }
+         if (cnt == cnt_old)
+         {
+            points_left[cnt_rem++] = i1;
+         }
+      }
+      remaining = (HYPRE_BigInt) cnt_rem;
+      current_pass++;
+      num_passes++;
+      if (num_passes > 9)
+      {
+         hypre_error_w_msg(HYPRE_ERROR_GENERIC, " Warning!!! too many passes! out of range!\n");
+         break;
+      }
+      pass_starts[num_passes] = cnt;
+      /* update pass_marker_offd */
+      index = 0;
+      if (num_procs > 1)
+      {
+         for (i = 0; i < num_sends; i++)
+         {
+            startc = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
+            for (j = startc; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
+            {
+               int_buf_data[index++] = pass_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
+            }
+         }
+         comm_handle = hypre_ParCSRCommHandleCreate(11, comm_pkg, int_buf_data, pass_marker_offd);
+
+         hypre_ParCSRCommHandleDestroy(comm_handle);
+      }
+      old_global_remaining = global_remaining;
+      hypre_MPI_Allreduce(&remaining, &global_remaining, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
+      /* if the number of remaining points does not change, we have a situation of isolated areas of
+       * fine points that are not connected to any C-points, and the pass generation process breaks
+       * down. Those points can be ignored, i.e. the corresponding rows in P will just be 0
+       * and can be ignored for the algorithm. */
+      if (old_global_remaining == global_remaining) { break; }
+   }
+   hypre_TFree(int_buf_data, HYPRE_MEMORY_HOST);
+   hypre_TFree(points_left, HYPRE_MEMORY_HOST);
+
+   /* generate row sum of weak points and C-points to be ignored */
+
+   row_sums = hypre_CTAlloc(HYPRE_Real, n_fine, HYPRE_MEMORY_HOST);
+   if (num_functions >  1)
+   {
+      for (i = 0; i < n_fine; i++)
+      {
+         if (CF_marker[i] < 0)
+         {
+            for (j = A_diag_i[i] + 1; j < A_diag_i[i + 1]; j++)
+            {
+               if (dof_func[i] == dof_func[A_diag_j[j]])
+               {
+                  row_sums[i] += A_diag_data[j];
+               }
+            }
+            for (j = A_offd_i[i]; j < A_offd_i[i + 1]; j++)
+            {
+               if (dof_func[i] == dof_func_offd[A_offd_j[j]])
+               {
+                  row_sums[i] += A_offd_data[j];
+               }
+            }
+         }
+      }
+   }
+   else
+   {
+      for (i = 0; i < n_fine; i++)
+      {
+         if (CF_marker[i] < 0)
+         {
+            for (j = A_diag_i[i] + 1; j < A_diag_i[i + 1]; j++)
+            {
+               row_sums[i] += A_diag_data[j];
+            }
+            for (j = A_offd_i[i]; j < A_offd_i[i + 1]; j++)
+            {
+               row_sums[i] += A_offd_data[j];
+            }
+         }
+      }
+   }
+
+   Pi = hypre_CTAlloc(hypre_ParCSRMatrix*, num_passes, HYPRE_MEMORY_HOST);
+   hypre_GenerateMultipassPi(A, S, num_cpts_global, &pass_order[pass_starts[1]], pass_marker,
+                             pass_marker_offd, pass_starts[2] - pass_starts[1], 1, row_sums, &Pi[0]);
+   if (interp_type == 8)
+   {
+      for (i = 1; i < num_passes - 1; i++)
+      {
+         hypre_ParCSRMatrix *Q;
+         HYPRE_BigInt *c_pts_starts = hypre_ParCSRMatrixRowStarts(Pi[i - 1]);
+         hypre_GenerateMultipassPi(A, S, c_pts_starts, &pass_order[pass_starts[i + 1]], pass_marker,
+                                   pass_marker_offd, pass_starts[i + 2] - pass_starts[i + 1], i + 1, row_sums, &Q);
+         Pi[i] = hypre_ParMatmul(Q, Pi[i - 1]);
+         hypre_ParCSRMatrixDestroy(Q);
+      }
+   }
+   else if (interp_type == 9)
+   {
+      for (i = 1; i < num_passes - 1; i++)
+      {
+         HYPRE_BigInt *c_pts_starts = hypre_ParCSRMatrixRowStarts(Pi[i - 1]);
+         hypre_GenerateMultiPi(A, S, Pi[i - 1], c_pts_starts, &pass_order[pass_starts[i + 1]], pass_marker,
+                               pass_marker_offd, pass_starts[i + 2] - pass_starts[i + 1], i + 1,
+                               num_functions, dof_func, dof_func_offd, &Pi[i]);
+      }
+   }
+
+   /* p pulate P_diag_i[i+1] with nnz of i-th row */
+   for (i = 0; i < num_passes - 1; i++)
+   {
+      HYPRE_Int *Pi_diag_i = hypre_CSRMatrixI(hypre_ParCSRMatrixDiag(Pi[i]));
+      HYPRE_Int *Pi_offd_i = hypre_CSRMatrixI(hypre_ParCSRMatrixOffd(Pi[i]));
+      j1 = 0;
+      for (j = pass_starts[i + 1]; j < pass_starts[i + 2]; j++)
+      {
+         i1 = pass_order[j];
+         P_diag_i[i1 + 1] = Pi_diag_i[j1 + 1] - Pi_diag_i[j1];
+         P_offd_i[i1 + 1] = Pi_offd_i[j1 + 1] - Pi_offd_i[j1];
+         j1++;
+      }
+   }
+
+   for (i = 0; i < n_fine; i++)
+   {
+      P_diag_i[i + 1] += P_diag_i[i];
+      P_offd_i[i + 1] += P_offd_i[i];
+   }
+
+   P_diag_j = hypre_CTAlloc(HYPRE_Int, P_diag_i[n_fine], memory_location_P);
+   P_diag_data = hypre_CTAlloc(HYPRE_Real, P_diag_i[n_fine], memory_location_P);
+   P_offd_j = hypre_CTAlloc(HYPRE_Int, P_offd_i[n_fine], memory_location_P);
+   P_offd_data = hypre_CTAlloc(HYPRE_Real, P_offd_i[n_fine], memory_location_P);
+
+   /* insert weights for coarse points */
+   for (i = 0; i < pass_starts[1]; i++)
+   {
+      i1 = pass_order[i];
+      j = P_diag_i[i1];
+      P_diag_j[j] = fine_to_coarse[i1];
+      P_diag_data[j] = 1.0;
+   }
+
+   /* generate col_map_offd_P by combining all col_map_offd_Pi
+    * and reompute indices if needed */
+
+   /* insert remaining weights */
+   for (p = 0; p < num_passes - 1; p++)
+   {
+      HYPRE_Int *Pi_diag_i = hypre_CSRMatrixI(hypre_ParCSRMatrixDiag(Pi[p]));
+      HYPRE_Int *Pi_offd_i = hypre_CSRMatrixI(hypre_ParCSRMatrixOffd(Pi[p]));
+      HYPRE_Int *Pi_diag_j = hypre_CSRMatrixJ(hypre_ParCSRMatrixDiag(Pi[p]));
+      HYPRE_Int *Pi_offd_j = hypre_CSRMatrixJ(hypre_ParCSRMatrixOffd(Pi[p]));
+      HYPRE_Real *Pi_diag_data = hypre_CSRMatrixData(hypre_ParCSRMatrixDiag(Pi[p]));
+      HYPRE_Real *Pi_offd_data = hypre_CSRMatrixData(hypre_ParCSRMatrixOffd(Pi[p]));
+      j1 = 0;
+      for (i = pass_starts[p + 1]; i < pass_starts[p + 2]; i++)
+      {
+         i1 = pass_order[i];
+         i2 = Pi_diag_i[j1];
+         for (j = P_diag_i[i1]; j < P_diag_i[i1 + 1]; j++)
+         {
+            P_diag_j[j] = Pi_diag_j[i2];
+            P_diag_data[j] = Pi_diag_data[i2++];
+         }
+         i2 = Pi_offd_i[j1];
+         for (j = P_offd_i[i1]; j < P_offd_i[i1 + 1]; j++)
+         {
+            P_offd_j[j] = Pi_offd_j[i2];
+            P_offd_data[j] = Pi_offd_data[i2++];
+         }
+         j1++;
+      }
+   }
+   /* Note that col indices in P_offd_j probably not consistent,
+      this gets fixed after truncation */
+
+   P = hypre_ParCSRMatrixCreate(comm,
+                                hypre_ParCSRMatrixGlobalNumRows(A),
+                                total_global_cpts,
+                                hypre_ParCSRMatrixRowStarts(A),
+                                num_cpts_global,
+                                num_cols_offd_P,
+                                P_diag_i[n_fine],
+                                P_offd_i[n_fine]);
+   P_diag = hypre_ParCSRMatrixDiag(P);
+   hypre_CSRMatrixData(P_diag) = P_diag_data;
+   hypre_CSRMatrixI(P_diag) = P_diag_i;
+   hypre_CSRMatrixJ(P_diag) = P_diag_j;
+   P_offd = hypre_ParCSRMatrixOffd(P);
+   hypre_CSRMatrixData(P_offd) = P_offd_data;
+   hypre_CSRMatrixI(P_offd) = P_offd_i;
+   hypre_CSRMatrixJ(P_offd) = P_offd_j;
+
+   /* Compress P, removing coefficients smaller than trunc_factor * Max */
+
+   if (trunc_factor != 0.0 || P_max_elmts > 0)
+   {
+      hypre_BoomerAMGInterpTruncation(P, trunc_factor, P_max_elmts);
+      P_diag_data = hypre_CSRMatrixData(P_diag);
+      P_diag_i = hypre_CSRMatrixI(P_diag);
+      P_diag_j = hypre_CSRMatrixJ(P_diag);
+      P_offd_data = hypre_CSRMatrixData(P_offd);
+      P_offd_i = hypre_CSRMatrixI(P_offd);
+      P_offd_j = hypre_CSRMatrixJ(P_offd);
+   }
+
+   num_cols_offd_P = 0;
+   P_offd_size = P_offd_i[n_fine];
+   if (P_offd_size)
+   {
+      HYPRE_BigInt *tmp_P_offd_j = hypre_CTAlloc(HYPRE_BigInt, P_offd_size, HYPRE_MEMORY_HOST);
+      HYPRE_BigInt *big_P_offd_j = hypre_CTAlloc(HYPRE_BigInt, P_offd_size, HYPRE_MEMORY_HOST);
+      for (p = 0; p < num_passes - 1; p++)
+      {
+         HYPRE_BigInt *col_map_offd_Pi = hypre_ParCSRMatrixColMapOffd(Pi[p]);
+         for (i = pass_starts[p + 1]; i < pass_starts[p + 2]; i++)
+         {
+            i1 = pass_order[i];
+            for (j = P_offd_i[i1]; j < P_offd_i[i1 + 1]; j++)
+            {
+               big_P_offd_j[j] = col_map_offd_Pi[P_offd_j[j]];
+            }
+         }
+      }
+
+      for (i = 0; i < P_offd_size; i++)
+      {
+         tmp_P_offd_j[i] = big_P_offd_j[i];
+      }
+
+      hypre_BigQsort0(tmp_P_offd_j, 0, P_offd_size - 1);
+
+      num_cols_offd_P = 1;
+      for (i = 0; i < P_offd_size - 1; i++)
+      {
+         if (tmp_P_offd_j[i + 1] > tmp_P_offd_j[i])
+         {
+            tmp_P_offd_j[num_cols_offd_P++] = tmp_P_offd_j[i + 1];
+         }
+      }
+
+      col_map_offd_P = hypre_CTAlloc(HYPRE_BigInt, num_cols_offd_P, HYPRE_MEMORY_HOST);
+
+      for (i = 0; i < num_cols_offd_P; i++)
+      {
+         col_map_offd_P[i] = tmp_P_offd_j[i];
+      }
+
+      for (i = 0; i < P_offd_size; i++)
+      {
+         P_offd_j[i] = hypre_BigBinarySearch(col_map_offd_P,
+                                             big_P_offd_j[i],
+                                             num_cols_offd_P);
+      }
+      hypre_TFree(tmp_P_offd_j, HYPRE_MEMORY_HOST);
+      hypre_TFree(big_P_offd_j, HYPRE_MEMORY_HOST);
+   }
+
+   for (i = 0; i < num_passes - 1; i++)
+   {
+      hypre_ParCSRMatrixDestroy(Pi[i]);
+   }
+   hypre_TFree (Pi, HYPRE_MEMORY_HOST);
+   hypre_TFree (pass_marker, HYPRE_MEMORY_HOST);
+   hypre_TFree (pass_marker_offd, HYPRE_MEMORY_HOST);
+   hypre_TFree (pass_order, HYPRE_MEMORY_HOST);
+   hypre_TFree (pass_starts, HYPRE_MEMORY_HOST);
+   hypre_TFree (fine_to_coarse, HYPRE_MEMORY_HOST);
+   hypre_TFree (dof_func_offd, HYPRE_MEMORY_HOST);
+   hypre_TFree (row_sums, HYPRE_MEMORY_HOST);
+
+   for (i = 0; i < n_fine; i++)
+   {
+      if (CF_marker[i] == -3) { CF_marker[i] = -1; }
+   }
+
+   hypre_ParCSRMatrixColMapOffd(P) = col_map_offd_P;
+   hypre_CSRMatrixNumCols(P_offd) = num_cols_offd_P;
+
+   hypre_MatvecCommPkgCreate(P);
+
+   *P_ptr = P;
+
+   return hypre_error_flag;
+
+}
+
+
+HYPRE_Int
+hypre_GenerateMultipassPi( hypre_ParCSRMatrix  *A,
+                           hypre_ParCSRMatrix  *S,
+                           HYPRE_BigInt        *c_pts_starts,
+                           HYPRE_Int
+                           *pass_order, /* array containing row numbers of rows in A and S to be considered */
+                           HYPRE_Int           *pass_marker,
+                           HYPRE_Int           *pass_marker_offd,
+                           HYPRE_Int            num_points,
+                           HYPRE_Int            color,
+                           HYPRE_Real          *row_sums,
+                           hypre_ParCSRMatrix **P_ptr )
+{
+   MPI_Comm                comm = hypre_ParCSRMatrixComm(A);
+   hypre_ParCSRCommPkg    *comm_pkg = hypre_ParCSRMatrixCommPkg(A);
+   hypre_ParCSRCommHandle *comm_handle;
+
+   hypre_CSRMatrix *A_diag = hypre_ParCSRMatrixDiag(A);
+   HYPRE_Real      *A_diag_data = hypre_CSRMatrixData(A_diag);
+   HYPRE_Int       *A_diag_i = hypre_CSRMatrixI(A_diag);
+   HYPRE_Int       *A_diag_j = hypre_CSRMatrixJ(A_diag);
+   HYPRE_Int        n_fine = hypre_CSRMatrixNumRows(A_diag);
+
+   hypre_CSRMatrix *A_offd = hypre_ParCSRMatrixOffd(A);
+   HYPRE_Real      *A_offd_data = hypre_CSRMatrixData(A_offd);
+   HYPRE_Int       *A_offd_i = hypre_CSRMatrixI(A_offd);
+   HYPRE_Int       *A_offd_j = hypre_CSRMatrixJ(A_offd);
+   HYPRE_Int        num_cols_offd_A = hypre_CSRMatrixNumCols(A_offd);
+
+   hypre_CSRMatrix *S_diag = hypre_ParCSRMatrixDiag(S);
+   HYPRE_Int       *S_diag_i = hypre_CSRMatrixI(S_diag);
+   HYPRE_Int       *S_diag_j = hypre_CSRMatrixJ(S_diag);
+
+   hypre_CSRMatrix *S_offd = hypre_ParCSRMatrixOffd(S);
+   HYPRE_Int       *S_offd_i = hypre_CSRMatrixI(S_offd);
+   HYPRE_Int       *S_offd_j = hypre_CSRMatrixJ(S_offd);
+   HYPRE_BigInt    *col_map_offd_P = NULL;
+   HYPRE_Int        num_cols_offd_P;
+   HYPRE_Int        nnz_diag, nnz_offd;
+   HYPRE_Int        n_cpts, i, j, i1, j1, j2;
+   HYPRE_Int        startc, index;
+   HYPRE_Int        cpt, cnt_diag, cnt_offd;
+
+   hypre_ParCSRMatrix *P;
+   hypre_CSRMatrix *P_diag;
+   HYPRE_Real      *P_diag_data;
+   HYPRE_Int       *P_diag_i; /*at first counter of nonzero cols for each row,
+                                      finally will be pointer to start of row */
+   HYPRE_Int       *P_diag_j;
+
+   hypre_CSRMatrix *P_offd;
+   HYPRE_Real      *P_offd_data = NULL;
+   HYPRE_Int       *P_offd_i; /*at first counter of nonzero cols for each row,
+                                      finally will be pointer to start of row */
+   HYPRE_Int       *P_offd_j = NULL;
+   HYPRE_Int       *fine_to_coarse;
+   HYPRE_Int       *fine_to_coarse_offd = NULL;
+   HYPRE_BigInt     f_pts_starts[2];
+   HYPRE_Int        my_id, num_procs;
+   HYPRE_BigInt     total_global_fpts;
+   HYPRE_BigInt     total_global_cpts;
+   HYPRE_BigInt    *big_convert;
+   HYPRE_BigInt    *big_convert_offd = NULL;
+   HYPRE_BigInt    *big_buf_data = NULL;
+   HYPRE_Int        num_sends;
+   HYPRE_Real      *row_sum_C;
+
+   /* MPI size and rank*/
+   hypre_MPI_Comm_size(comm, &num_procs);
+   hypre_MPI_Comm_rank(comm, &my_id);
+
+   /* define P matrices */
+
+   P_diag_i = hypre_CTAlloc(HYPRE_Int, num_points + 1, HYPRE_MEMORY_HOST);
+   P_offd_i = hypre_CTAlloc(HYPRE_Int, num_points + 1, HYPRE_MEMORY_HOST);
+   fine_to_coarse = hypre_CTAlloc(HYPRE_Int, n_fine, HYPRE_MEMORY_HOST);
+
+   /* fill P */
+
+   n_cpts = 0;
+   for (i = 0; i < n_fine; i++)
+   {
+      if (pass_marker[i] == color)
+      {
+         fine_to_coarse[i] = n_cpts++;
+      }
+      else
+      {
+         fine_to_coarse[i] = -1;
+      }
+   }
+
+   if (num_procs > 1)
+   {
+      HYPRE_BigInt big_Fpts;
+      big_Fpts = num_points;
+
+      hypre_MPI_Scan(&big_Fpts, f_pts_starts + 1, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
+      f_pts_starts[0] = f_pts_starts[1] - big_Fpts;
+      if (my_id == num_procs - 1)
+      {
+         total_global_fpts = f_pts_starts[1];
+         total_global_cpts = c_pts_starts[1];
+      }
+      hypre_MPI_Bcast(&total_global_fpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
+      hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
+   }
+   else
+   {
+      f_pts_starts[0] = 0;
+      f_pts_starts[1] = num_points;
+      total_global_fpts = f_pts_starts[1];
+      total_global_cpts = c_pts_starts[1];
+   }
+
+   {
+      big_convert = hypre_CTAlloc(HYPRE_BigInt, n_fine, HYPRE_MEMORY_HOST);
+      for (i = 0; i < n_fine; i++)
+      {
+         if (pass_marker[i] == color)
+         {
+            big_convert[i] = (HYPRE_BigInt)fine_to_coarse[i] + c_pts_starts[0];
+         }
+      }
+
+      num_cols_offd_P = 0;
+      if (num_procs > 1)
+      {
+         big_convert_offd = hypre_CTAlloc(HYPRE_BigInt, num_cols_offd_A, HYPRE_MEMORY_HOST);
+         fine_to_coarse_offd = hypre_CTAlloc(HYPRE_Int, num_cols_offd_A, HYPRE_MEMORY_HOST);
+         index = 0;
+         num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
+         big_buf_data = hypre_CTAlloc(HYPRE_BigInt, hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                                      HYPRE_MEMORY_HOST);
+         for (i = 0; i < num_sends; i++)
+         {
+            startc = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
+            for (j = startc; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
+            {
+               big_buf_data[index++] = big_convert[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
+            }
+         }
+
+         comm_handle = hypre_ParCSRCommHandleCreate( 21, comm_pkg, big_buf_data, big_convert_offd);
+
+         hypre_ParCSRCommHandleDestroy(comm_handle);
+
+         num_cols_offd_P = 0;
+         for (i = 0; i < num_cols_offd_A; i++)
+         {
+            if (pass_marker_offd[i] == color)
+            {
+               fine_to_coarse_offd[i] = num_cols_offd_P++;
+            }
+         }
+
+         col_map_offd_P = hypre_CTAlloc(HYPRE_BigInt, num_cols_offd_P, HYPRE_MEMORY_HOST);
+
+         cpt = 0;
+         for (i = 0; i < num_cols_offd_A; i++)
+         {
+            if (pass_marker_offd[i] == color)
+            {
+               col_map_offd_P[cpt++] = big_convert_offd[i];
+            }
+         }
+      }
+   }
+
+   /* generate P_diag_i and P_offd_i */
+   nnz_diag = 0;
+   nnz_offd = 0;
+   for (i = 0; i < num_points; i++)
+   {
+      i1 = pass_order[i];
+      for (j = S_diag_i[i1]; j < S_diag_i[i1 + 1]; j++)
+      {
+         j1 = S_diag_j[j];
+         if (pass_marker[j1] == color)
+         {
+            P_diag_i[i + 1]++;
+            nnz_diag++;
+         }
+      }
+      for (j = S_offd_i[i1]; j < S_offd_i[i1 + 1]; j++)
+      {
+         j1 = S_offd_j[j];
+         if (pass_marker_offd[j1] == color)
+         {
+            P_offd_i[i + 1]++;
+            nnz_offd++;
+         }
+      }
+   }
+
+   for (i = 1; i < num_points + 1; i++)
+   {
+      P_diag_i[i] += P_diag_i[i - 1];
+      P_offd_i[i] += P_offd_i[i - 1];
+   }
+
+   P_diag_j = hypre_CTAlloc(HYPRE_Int, nnz_diag, HYPRE_MEMORY_HOST);
+   P_diag_data = hypre_CTAlloc(HYPRE_Real, nnz_diag, HYPRE_MEMORY_HOST);
+   P_offd_j = hypre_CTAlloc(HYPRE_Int, nnz_offd, HYPRE_MEMORY_HOST);
+   P_offd_data = hypre_CTAlloc(HYPRE_Real, nnz_offd, HYPRE_MEMORY_HOST);
+
+   cnt_diag = 0;
+   cnt_offd = 0;
+   for (i = 0; i < num_points; i++)
+   {
+      i1 = pass_order[i];
+      j2 = A_diag_i[i1];
+      for (j = S_diag_i[i1]; j < S_diag_i[i1 + 1]; j++)
+      {
+         j1 = S_diag_j[j];
+         while (A_diag_j[j2] != j1) { j2++; }
+         if (pass_marker[j1] == color && A_diag_j[j2] == j1)
+         {
+            P_diag_j[cnt_diag] = fine_to_coarse[j1];
+            P_diag_data[cnt_diag++] = A_diag_data[j2];
+         }
+      }
+      j2 = A_offd_i[i1];
+      for (j = S_offd_i[i1]; j < S_offd_i[i1 + 1]; j++)
+      {
+         j1 = S_offd_j[j];
+         while (A_offd_j[j2] != j1) { j2++; }
+         if (pass_marker_offd[j1] == color && A_offd_j[j2] == j1)
+         {
+            P_offd_j[cnt_offd] = fine_to_coarse_offd[j1];
+            P_offd_data[cnt_offd++] = A_offd_data[j2];
+         }
+      }
+   }
+
+   //row_sums = hypre_CTAlloc(HYPRE_Real, num_points, HYPRE_MEMORY_HOST);
+   row_sum_C = hypre_CTAlloc(HYPRE_Real, num_points, HYPRE_MEMORY_HOST);
+   for (i = 0; i < num_points; i++)
+   {
+      HYPRE_Real diagonal, value;
+      i1 = pass_order[i];
+      diagonal = A_diag_data[A_diag_i[i1]];
+      /*for (j=A_diag_i[i1]+1; j < A_diag_i[i1+1]; j++)
+      {
+         row_sums[i] += A_diag_data[j];
+      }
+      for (j=A_offd_i[i1]; j < A_offd_i[i1+1]; j++)
+      {
+         row_sums[i] += A_offd_data[j];
+      }*/
+      for (j = P_diag_i[i]; j < P_diag_i[i + 1]; j++)
+      {
+         row_sum_C[i] += P_diag_data[j];
+      }
+      for (j = P_offd_i[i]; j < P_offd_i[i + 1]; j++)
+      {
+         row_sum_C[i] += P_offd_data[j];
+      }
+      value = row_sum_C[i] * diagonal;
+      if (value != 0)
+      {
+         row_sums[i1] /= value;
+      }
+      for (j = P_diag_i[i]; j < P_diag_i[i + 1]; j++)
+      {
+         P_diag_data[j] = -P_diag_data[j] * row_sums[i1];
+      }
+      for (j = P_offd_i[i]; j < P_offd_i[i + 1]; j++)
+      {
+         P_offd_data[j] = -P_offd_data[j] * row_sums[i1];
+      }
+   }
+
+
+   P = hypre_ParCSRMatrixCreate(comm,
+                                total_global_fpts,
+                                total_global_cpts,
+                                f_pts_starts,
+                                c_pts_starts,
+                                num_cols_offd_P,
+                                P_diag_i[num_points],
+                                P_offd_i[num_points]);
+
+   P_diag = hypre_ParCSRMatrixDiag(P);
+   hypre_CSRMatrixData(P_diag) = P_diag_data;
+   hypre_CSRMatrixI(P_diag) = P_diag_i;
+   hypre_CSRMatrixJ(P_diag) = P_diag_j;
+   P_offd = hypre_ParCSRMatrixOffd(P);
+   hypre_CSRMatrixData(P_offd) = P_offd_data;
+   hypre_CSRMatrixI(P_offd) = P_offd_i;
+   hypre_CSRMatrixJ(P_offd) = P_offd_j;
+   hypre_ParCSRMatrixColMapOffd(P) = col_map_offd_P;
+
+   hypre_CSRMatrixMemoryLocation(P_diag) = HYPRE_MEMORY_HOST;
+   hypre_CSRMatrixMemoryLocation(P_offd) = HYPRE_MEMORY_HOST;
+
+   /* free stuff */
+   hypre_TFree(fine_to_coarse, HYPRE_MEMORY_HOST);
+   hypre_TFree(fine_to_coarse_offd, HYPRE_MEMORY_HOST);
+   //hypre_TFree(row_sums, HYPRE_MEMORY_HOST);
+   hypre_TFree(row_sum_C, HYPRE_MEMORY_HOST);
+   hypre_TFree(big_convert, HYPRE_MEMORY_HOST);
+   hypre_TFree(big_convert_offd, HYPRE_MEMORY_HOST);
+   hypre_TFree(big_buf_data, HYPRE_MEMORY_HOST);
+
+   hypre_MatvecCommPkgCreate(P);
+   *P_ptr = P;
+
+   return hypre_error_flag;
+}
+
+HYPRE_Int
+hypre_GenerateMultiPi( hypre_ParCSRMatrix  *A,
+                       hypre_ParCSRMatrix  *S,
+                       hypre_ParCSRMatrix  *P,
+                       HYPRE_BigInt        *c_pts_starts,
+                       HYPRE_Int
+                       *pass_order, /* array containing row numbers of rows in A and S to be considered */
+                       HYPRE_Int           *pass_marker,
+                       HYPRE_Int           *pass_marker_offd,
+                       HYPRE_Int            num_points,
+                       HYPRE_Int            color,
+                       HYPRE_Int            num_functions,
+                       HYPRE_Int           *dof_func,
+                       HYPRE_Int           *dof_func_offd,
+                       hypre_ParCSRMatrix **Pi_ptr )
+{
+   MPI_Comm                comm = hypre_ParCSRMatrixComm(A);
+   hypre_ParCSRCommPkg    *comm_pkg = hypre_ParCSRMatrixCommPkg(A);
+   hypre_ParCSRCommHandle *comm_handle;
+
+   hypre_CSRMatrix *A_diag = hypre_ParCSRMatrixDiag(A);
+   HYPRE_Real      *A_diag_data = hypre_CSRMatrixData(A_diag);
+   HYPRE_Int       *A_diag_i = hypre_CSRMatrixI(A_diag);
+   HYPRE_Int       *A_diag_j = hypre_CSRMatrixJ(A_diag);
+   HYPRE_Int        n_fine = hypre_CSRMatrixNumRows(A_diag);
+
+   hypre_CSRMatrix *A_offd = hypre_ParCSRMatrixOffd(A);
+   HYPRE_Real      *A_offd_data = hypre_CSRMatrixData(A_offd);
+   HYPRE_Int       *A_offd_i = hypre_CSRMatrixI(A_offd);
+   HYPRE_Int       *A_offd_j = hypre_CSRMatrixJ(A_offd);
+   HYPRE_Int        num_cols_offd_A = hypre_CSRMatrixNumCols(A_offd);
+
+   hypre_CSRMatrix *S_diag = hypre_ParCSRMatrixDiag(S);
+   HYPRE_Int       *S_diag_i = hypre_CSRMatrixI(S_diag);
+   HYPRE_Int       *S_diag_j = hypre_CSRMatrixJ(S_diag);
+
+   hypre_CSRMatrix *S_offd = hypre_ParCSRMatrixOffd(S);
+   HYPRE_Int       *S_offd_i = hypre_CSRMatrixI(S_offd);
+   HYPRE_Int       *S_offd_j = hypre_CSRMatrixJ(S_offd);
+   HYPRE_BigInt    *col_map_offd_Q = NULL;
+   HYPRE_Int        num_cols_offd_Q;
+
+   hypre_ParCSRMatrix *Pi;
+   hypre_CSRMatrix *Pi_diag;
+   HYPRE_Int       *Pi_diag_i;
+   HYPRE_Real      *Pi_diag_data;
+
+   hypre_CSRMatrix *Pi_offd;
+   HYPRE_Int       *Pi_offd_i;
+   HYPRE_Real      *Pi_offd_data;
+
+   HYPRE_Int        nnz_diag, nnz_offd;
+   HYPRE_Int        n_cpts, i, j, i1, j1, j2;
+   HYPRE_Int        startc, index;
+   HYPRE_Int        cpt, cnt_diag, cnt_offd;
+
+   hypre_ParCSRMatrix *Q;
+   hypre_CSRMatrix *Q_diag;
+   HYPRE_Real      *Q_diag_data;
+   HYPRE_Int       *Q_diag_i; /*at first counter of nonzero cols for each row,
+                                      finally will be pointer to start of row */
+   HYPRE_Int       *Q_diag_j;
+
+   hypre_CSRMatrix *Q_offd;
+   HYPRE_Real      *Q_offd_data = NULL;
+   HYPRE_Int       *Q_offd_i; /*at first counter of nonzero cols for each row,
+                                      finally will be pointer to start of row */
+   HYPRE_Int       *Q_offd_j = NULL;
+   HYPRE_Int       *fine_to_coarse;
+   HYPRE_Int       *fine_to_coarse_offd = NULL;
+   HYPRE_BigInt     f_pts_starts[2];
+   HYPRE_Int        my_id, num_procs;
+   HYPRE_BigInt     total_global_fpts;
+   HYPRE_BigInt     total_global_cpts;
+   HYPRE_BigInt    *big_convert;
+   HYPRE_BigInt    *big_convert_offd = NULL;
+   HYPRE_BigInt    *big_buf_data = NULL;
+   HYPRE_Int        num_sends;
+   //HYPRE_Real      *row_sums;
+   HYPRE_Real      *row_sums_C;
+   HYPRE_Real      *w_row_sum;
+
+   /* MPI size and rank*/
+   hypre_MPI_Comm_size(comm, &num_procs);
+   hypre_MPI_Comm_rank(comm, &my_id);
+
+   /* define P matrices */
+
+   Q_diag_i = hypre_CTAlloc(HYPRE_Int, num_points + 1, HYPRE_MEMORY_HOST);
+   Q_offd_i = hypre_CTAlloc(HYPRE_Int, num_points + 1, HYPRE_MEMORY_HOST);
+   fine_to_coarse = hypre_CTAlloc(HYPRE_Int, n_fine, HYPRE_MEMORY_HOST);
+
+   /* fill P */
+
+   n_cpts = 0;
+   for (i = 0; i < n_fine; i++)
+   {
+      if (pass_marker[i] == color)
+      {
+         fine_to_coarse[i] = n_cpts++;
+      }
+      else
+      {
+         fine_to_coarse[i] = -1;
+      }
+   }
+
+   if (num_procs > 1)
+   {
+      HYPRE_BigInt big_Fpts;
+      big_Fpts = num_points;
+
+      hypre_MPI_Scan(&big_Fpts, f_pts_starts + 1, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
+      f_pts_starts[0] = f_pts_starts[1] - big_Fpts;
+      if (my_id == num_procs - 1)
+      {
+         total_global_fpts = f_pts_starts[1];
+         total_global_cpts = c_pts_starts[1];
+      }
+      hypre_MPI_Bcast(&total_global_fpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
+      hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
+   }
+   else
+   {
+      f_pts_starts[0] = 0;
+      f_pts_starts[1] = num_points;
+      total_global_fpts = f_pts_starts[1];
+      total_global_cpts = c_pts_starts[1];
+   }
+
+   {
+      big_convert = hypre_CTAlloc(HYPRE_BigInt, n_fine, HYPRE_MEMORY_HOST);
+      for (i = 0; i < n_fine; i++)
+      {
+         if (pass_marker[i] == color)
+         {
+            big_convert[i] = (HYPRE_BigInt)fine_to_coarse[i] + c_pts_starts[0];
+         }
+      }
+
+      num_cols_offd_Q = 0;
+      if (num_procs > 1)
+      {
+         big_convert_offd = hypre_CTAlloc(HYPRE_BigInt, num_cols_offd_A, HYPRE_MEMORY_HOST);
+         fine_to_coarse_offd = hypre_CTAlloc(HYPRE_Int, num_cols_offd_A, HYPRE_MEMORY_HOST);
+         index = 0;
+         num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
+         big_buf_data = hypre_CTAlloc(HYPRE_BigInt,  hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                                      HYPRE_MEMORY_HOST);
+         for (i = 0; i < num_sends; i++)
+         {
+            startc = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
+            for (j = startc; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
+            {
+               big_buf_data[index++] = big_convert[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
+            }
+         }
+
+         comm_handle = hypre_ParCSRCommHandleCreate( 21, comm_pkg, big_buf_data, big_convert_offd);
+
+         hypre_ParCSRCommHandleDestroy(comm_handle);
+
+         num_cols_offd_Q = 0;
+         for (i = 0; i < num_cols_offd_A; i++)
+         {
+            if (pass_marker_offd[i] == color)
+            {
+               fine_to_coarse_offd[i] = num_cols_offd_Q++;
+            }
+         }
+
+         col_map_offd_Q = hypre_CTAlloc(HYPRE_BigInt, num_cols_offd_Q, HYPRE_MEMORY_HOST);
+
+         cpt = 0;
+         for (i = 0; i < num_cols_offd_A; i++)
+         {
+            if (pass_marker_offd[i] == color)
+            {
+               col_map_offd_Q[cpt++] = big_convert_offd[i];
+            }
+         }
+      }
+   }
+
+   /* generate Q_diag_i and Q_offd_i */
+   nnz_diag = 0;
+   nnz_offd = 0;
+   for (i = 0; i < num_points; i++)
+   {
+      i1 = pass_order[i];
+      for (j = S_diag_i[i1]; j < S_diag_i[i1 + 1]; j++)
+      {
+         j1 = S_diag_j[j];
+         if (pass_marker[j1] == color)
+         {
+            Q_diag_i[i + 1]++;
+            nnz_diag++;
+         }
+      }
+      for (j = S_offd_i[i1]; j < S_offd_i[i1 + 1]; j++)
+      {
+         j1 = S_offd_j[j];
+         if (pass_marker_offd[j1] == color)
+         {
+            Q_offd_i[i + 1]++;
+            nnz_offd++;
+         }
+      }
+   }
+
+   for (i = 1; i < num_points + 1; i++)
+   {
+      Q_diag_i[i] += Q_diag_i[i - 1];
+      Q_offd_i[i] += Q_offd_i[i - 1];
+   }
+
+   Q_diag_j = hypre_CTAlloc(HYPRE_Int, nnz_diag, HYPRE_MEMORY_HOST);
+   Q_diag_data = hypre_CTAlloc(HYPRE_Real, nnz_diag, HYPRE_MEMORY_HOST);
+   Q_offd_j = hypre_CTAlloc(HYPRE_Int, nnz_offd, HYPRE_MEMORY_HOST);
+   Q_offd_data = hypre_CTAlloc(HYPRE_Real, nnz_offd, HYPRE_MEMORY_HOST);
+   w_row_sum = hypre_CTAlloc(HYPRE_Real, num_points, HYPRE_MEMORY_HOST);
+
+   cnt_diag = 0;
+   cnt_offd = 0;
+   if (num_functions > 1)
+   {
+      for (i = 0; i < num_points; i++)
+      {
+         i1 = pass_order[i];
+         j2 = A_diag_i[i1] + 1;
+         //if (w_row_minus) w_row_sum[i] = -w_row_minus[i1];
+         for (j = S_diag_i[i1]; j < S_diag_i[i1 + 1]; j++)
+         {
+            j1 = S_diag_j[j];
+            while (A_diag_j[j2] != j1)
+            {
+               if (dof_func[i1] == dof_func[A_diag_j[j2]])
+               {
+                  w_row_sum[i] += A_diag_data[j2];
+               }
+               j2++;
+            }
+            if (pass_marker[j1] == color && A_diag_j[j2] == j1)
+            {
+               Q_diag_j[cnt_diag] = fine_to_coarse[j1];
+               Q_diag_data[cnt_diag++] = A_diag_data[j2++];
+            }
+            else
+            {
+               if (dof_func[i1] == dof_func[A_diag_j[j2]])
+               {
+                  w_row_sum[i] += A_diag_data[j2];
+               }
+               j2++;
+            }
+         }
+         while (j2 < A_diag_i[i1 + 1])
+         {
+            if (dof_func[i1] == dof_func[A_diag_j[j2]])
+            {
+               w_row_sum[i] += A_diag_data[j2];
+            }
+            j2++;
+         }
+         j2 = A_offd_i[i1];
+         for (j = S_offd_i[i1]; j < S_offd_i[i1 + 1]; j++)
+         {
+            j1 = S_offd_j[j];
+            while (A_offd_j[j2] != j1)
+            {
+               if (dof_func[i1] == dof_func_offd[A_offd_j[j2]])
+               {
+                  w_row_sum[i] += A_offd_data[j2];
+               }
+               j2++;
+            }
+            if (pass_marker_offd[j1] == color && A_offd_j[j2] == j1)
+            {
+               Q_offd_j[cnt_offd] = fine_to_coarse_offd[j1];
+               Q_offd_data[cnt_offd++] = A_offd_data[j2++];
+            }
+            else
+            {
+               if (dof_func[i1] == dof_func_offd[A_offd_j[j2]])
+               {
+                  w_row_sum[i] += A_offd_data[j2];
+               }
+               j2++;
+            }
+         }
+         while (j2 < A_offd_i[i1 + 1])
+         {
+            if (dof_func[i1] == dof_func_offd[A_offd_j[j2]])
+            {
+               w_row_sum[i] += A_offd_data[j2];
+            }
+            j2++;
+         }
+      }
+   }
+   else
+   {
+      for (i = 0; i < num_points; i++)
+      {
+         i1 = pass_order[i];
+         j2 = A_diag_i[i1] + 1;
+         for (j = S_diag_i[i1]; j < S_diag_i[i1 + 1]; j++)
+         {
+            j1 = S_diag_j[j];
+            while (A_diag_j[j2] != j1)
+            {
+               w_row_sum[i] += A_diag_data[j2];
+               j2++;
+            }
+            if (pass_marker[j1] == color && A_diag_j[j2] == j1)
+            {
+               Q_diag_j[cnt_diag] = fine_to_coarse[j1];
+               Q_diag_data[cnt_diag++] = A_diag_data[j2++];
+            }
+            else
+            {
+               w_row_sum[i] += A_diag_data[j2];
+               j2++;
+            }
+         }
+         while (j2 < A_diag_i[i1 + 1])
+         {
+            w_row_sum[i] += A_diag_data[j2];
+            j2++;
+         }
+         j2 = A_offd_i[i1];
+         for (j = S_offd_i[i1]; j < S_offd_i[i1 + 1]; j++)
+         {
+            j1 = S_offd_j[j];
+            while (A_offd_j[j2] != j1)
+            {
+               w_row_sum[i] += A_offd_data[j2];
+               j2++;
+            }
+            if (pass_marker_offd[j1] == color && A_offd_j[j2] == j1)
+            {
+               Q_offd_j[cnt_offd] = fine_to_coarse_offd[j1];
+               Q_offd_data[cnt_offd++] = A_offd_data[j2++];
+            }
+            else
+            {
+               w_row_sum[i] += A_offd_data[j2];
+               j2++;
+            }
+         }
+         while (j2 < A_offd_i[i1 + 1])
+         {
+            w_row_sum[i] += A_offd_data[j2];
+            j2++;
+         }
+      }
+   }
+
+   Q = hypre_ParCSRMatrixCreate(comm,
+                                total_global_fpts,
+                                total_global_cpts,
+                                f_pts_starts,
+                                c_pts_starts,
+                                num_cols_offd_Q,
+                                Q_diag_i[num_points],
+                                Q_offd_i[num_points]);
+
+   Q_diag = hypre_ParCSRMatrixDiag(Q);
+   hypre_CSRMatrixData(Q_diag) = Q_diag_data;
+   hypre_CSRMatrixI(Q_diag) = Q_diag_i;
+   hypre_CSRMatrixJ(Q_diag) = Q_diag_j;
+   Q_offd = hypre_ParCSRMatrixOffd(Q);
+   hypre_CSRMatrixData(Q_offd) = Q_offd_data;
+   hypre_CSRMatrixI(Q_offd) = Q_offd_i;
+   hypre_CSRMatrixJ(Q_offd) = Q_offd_j;
+   hypre_ParCSRMatrixColMapOffd(Q) = col_map_offd_Q;
+
+   hypre_CSRMatrixMemoryLocation(Q_diag) = HYPRE_MEMORY_HOST;
+   hypre_CSRMatrixMemoryLocation(Q_offd) = HYPRE_MEMORY_HOST;
+
+   /* free stuff */
+   hypre_TFree(fine_to_coarse, HYPRE_MEMORY_HOST);
+   hypre_TFree(fine_to_coarse_offd, HYPRE_MEMORY_HOST);
+   hypre_TFree(big_convert, HYPRE_MEMORY_HOST);
+   hypre_TFree(big_convert_offd, HYPRE_MEMORY_HOST);
+   hypre_TFree(big_buf_data, HYPRE_MEMORY_HOST);
+
+   hypre_MatvecCommPkgCreate(Q);
+
+   Pi = hypre_ParMatmul(Q, P);
+
+   Pi_diag = hypre_ParCSRMatrixDiag(Pi);
+   Pi_diag_data = hypre_CSRMatrixData(Pi_diag);
+   Pi_diag_i = hypre_CSRMatrixI(Pi_diag);
+   Pi_offd = hypre_ParCSRMatrixOffd(Pi);
+   Pi_offd_data = hypre_CSRMatrixData(Pi_offd);
+   Pi_offd_i = hypre_CSRMatrixI(Pi_offd);
+
+   row_sums_C = hypre_CTAlloc(HYPRE_Real, num_points, HYPRE_MEMORY_HOST);
+   for (i = 0; i < num_points; i++)
+   {
+      HYPRE_Real diagonal, value;
+      i1 = pass_order[i];
+      diagonal = A_diag_data[A_diag_i[i1]];
+      for (j = Pi_diag_i[i]; j < Pi_diag_i[i + 1]; j++)
+      {
+         row_sums_C[i] += Pi_diag_data[j];
+      }
+      for (j = Pi_offd_i[i]; j < Pi_offd_i[i + 1]; j++)
+      {
+         row_sums_C[i] += Pi_offd_data[j];
+      }
+      value = row_sums_C[i] * diagonal;
+      row_sums_C[i] += w_row_sum[i];
+      if (value != 0)
+      {
+         row_sums_C[i] /= value;
+      }
+      for (j = Pi_diag_i[i]; j < Pi_diag_i[i + 1]; j++)
+      {
+         Pi_diag_data[j] = -Pi_diag_data[j] * row_sums_C[i];
+      }
+      for (j = Pi_offd_i[i]; j < Pi_offd_i[i + 1]; j++)
+      {
+         Pi_offd_data[j] = -Pi_offd_data[j] * row_sums_C[i];
+      }
+   }
+
+   hypre_ParCSRMatrixDestroy(Q);
+   //hypre_TFree(row_sums, HYPRE_MEMORY_HOST);
+   hypre_TFree(row_sums_C, HYPRE_MEMORY_HOST);
+   hypre_TFree(w_row_sum, HYPRE_MEMORY_HOST);
+
+   *Pi_ptr = Pi;
+
+   return hypre_error_flag;
+}
+
+
+HYPRE_Int
+hypre_BoomerAMGBuildModMultipass( hypre_ParCSRMatrix  *A,
+                                  HYPRE_Int           *CF_marker,
+                                  hypre_ParCSRMatrix  *S,
+                                  HYPRE_BigInt        *num_cpts_global,
+                                  HYPRE_Real           trunc_factor,
+                                  HYPRE_Int            P_max_elmts,
+                                  HYPRE_Int            interp_type,
+                                  HYPRE_Int            num_functions,
+                                  HYPRE_Int           *dof_func,
+                                  hypre_ParCSRMatrix **P_ptr )
+{
+   hypre_GpuProfilingPushRange("ModMultipass");
+
+   HYPRE_Int ierr = 0;
+
+#if defined(HYPRE_USING_GPU)
+   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy2( hypre_ParCSRMatrixMemoryLocation(A),
+                                                      hypre_ParCSRMatrixMemoryLocation(S) );
+   if (exec == HYPRE_EXEC_DEVICE)
+   {
+      ierr = hypre_BoomerAMGBuildModMultipassDevice( A, CF_marker, S, num_cpts_global,
+                                                     trunc_factor, P_max_elmts,
+                                                     interp_type, num_functions,
+                                                     dof_func, P_ptr);
+   }
+   else
+#endif
+   {
+      ierr = hypre_BoomerAMGBuildModMultipassHost( A, CF_marker, S, num_cpts_global,
+                                                   trunc_factor, P_max_elmts,
+                                                   interp_type, num_functions,
+                                                   dof_func, P_ptr);
+   }
+
+   hypre_GpuProfilingPopRange();
+
+   return ierr;
+}
+
diff --git a/external/hypre/src/parcsr_ls/par_mod_multi_interp_device.c b/external/hypre/src/parcsr_ls/par_mod_multi_interp_device.c
new file mode 100644
index 00000000..0f925dc3
--- /dev/null
+++ b/external/hypre/src/parcsr_ls/par_mod_multi_interp_device.c
@@ -0,0 +1,2492 @@
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+#include "_hypre_onedpl.hpp"
+#include "_hypre_parcsr_ls.h"
+#include "_hypre_utilities.hpp"
+
+#if defined(HYPRE_USING_GPU)
+
+#if defined(HYPRE_USING_SYCL)
+template<typename T>
+struct tuple_plus
+{
+   __host__ __device__
+   std::tuple<T, T> operator()( const std::tuple<T, T> & x1, const std::tuple<T, T> & x2) const
+   {
+      return std::make_tuple( std::get<0>(x1) + std::get<0>(x2),
+                              std::get<1>(x1) + std::get<1>(x2) );
+   }
+};
+
+struct local_equal_plus_constant
+{
+   HYPRE_BigInt _value;
+
+   local_equal_plus_constant(HYPRE_BigInt value) : _value(value) {}
+
+   __host__ __device__ HYPRE_BigInt operator()(HYPRE_BigInt /*x*/, HYPRE_BigInt y) const
+   { return y + _value; }
+};
+
+/* transform from local C index to global C index */
+struct globalC_functor
+{
+   HYPRE_BigInt C_first;
+
+   globalC_functor(HYPRE_BigInt C_first_)
+   {
+      C_first = C_first_;
+   }
+
+   __host__ __device__
+   HYPRE_BigInt operator()(const HYPRE_Int x) const
+   {
+      return ( (HYPRE_BigInt) x + C_first );
+   }
+};
+#else
+template<typename T>
+struct tuple_plus : public
+   thrust::binary_function<thrust::tuple<T, T>, thrust::tuple<T, T>, thrust::tuple<T, T> >
+{
+   __host__ __device__
+   thrust::tuple<T, T> operator()( const thrust::tuple<T, T> & x1, const thrust::tuple<T, T> & x2)
+   {
+      return thrust::make_tuple( thrust::get<0>(x1) + thrust::get<0>(x2),
+                                 thrust::get<1>(x1) + thrust::get<1>(x2) );
+   }
+};
+
+template<typename T>
+struct tuple_minus : public
+   thrust::binary_function<thrust::tuple<T, T>, thrust::tuple<T, T>, thrust::tuple<T, T> >
+{
+   __host__ __device__
+   thrust::tuple<T, T> operator()( const thrust::tuple<T, T> & x1, const thrust::tuple<T, T> & x2)
+   {
+      return thrust::make_tuple( thrust::get<0>(x1) - thrust::get<0>(x2),
+                                 thrust::get<1>(x1) - thrust::get<1>(x2) );
+   }
+};
+
+struct local_equal_plus_constant : public
+   thrust::binary_function<HYPRE_BigInt, HYPRE_BigInt, HYPRE_BigInt>
+{
+   HYPRE_BigInt _value;
+
+   local_equal_plus_constant(HYPRE_BigInt value) : _value(value) {}
+
+   __host__ __device__ HYPRE_BigInt operator()(HYPRE_BigInt /*x*/, HYPRE_BigInt y)
+   { return y + _value; }
+};
+
+/* transform from local C index to global C index */
+#if (defined(THRUST_VERSION) && THRUST_VERSION < 101000)
+struct globalC_functor : public thrust::unary_function<HYPRE_Int, HYPRE_BigInt>
+#else
+struct globalC_functor
+#endif
+{
+   HYPRE_BigInt C_first;
+
+   globalC_functor(HYPRE_BigInt C_first_)
+   {
+      C_first = C_first_;
+   }
+
+   __host__ __device__
+   HYPRE_BigInt operator()(const HYPRE_Int x) const
+   {
+      return ( (HYPRE_BigInt) x + C_first );
+   }
+};
+#endif
+
+void hypre_modmp_init_fine_to_coarse( HYPRE_Int n_fine, HYPRE_Int *pass_marker, HYPRE_Int color,
+                                      HYPRE_Int *fine_to_coarse );
+
+void hypre_modmp_compute_num_cols_offd_fine_to_coarse( HYPRE_Int * pass_marker_offd,
+                                                       HYPRE_Int color, HYPRE_Int num_cols_offd_A, HYPRE_Int & num_cols_offd,
+                                                       HYPRE_Int ** fine_to_coarse_offd );
+
+__global__ void hypreGPUKernel_cfmarker_masked_rowsum( hypre_DeviceItem &item, HYPRE_Int nrows,
+                                                       HYPRE_Int *A_diag_i,
+                                                       HYPRE_Int *A_diag_j, HYPRE_Complex *A_diag_data, HYPRE_Int *A_offd_i, HYPRE_Int *A_offd_j,
+                                                       HYPRE_Complex *A_offd_data, HYPRE_Int *CF_marker, HYPRE_Int *dof_func, HYPRE_Int *dof_func_offd,
+                                                       HYPRE_Complex *row_sums );
+
+__global__ void hypreGPUKernel_generate_Pdiag_i_Poffd_i( hypre_DeviceItem &item,
+                                                         HYPRE_Int num_points,
+                                                         HYPRE_Int color,
+                                                         HYPRE_Int *pass_order, HYPRE_Int *pass_marker, HYPRE_Int *pass_marker_offd, HYPRE_Int *S_diag_i,
+                                                         HYPRE_Int *S_diag_j, HYPRE_Int *S_offd_i, HYPRE_Int *S_offd_j, HYPRE_Int *P_diag_i,
+                                                         HYPRE_Int *P_offd_i );
+
+__global__ void hypreGPUKernel_generate_Pdiag_j_Poffd_j( hypre_DeviceItem &item,
+                                                         HYPRE_Int num_points,
+                                                         HYPRE_Int color,
+                                                         HYPRE_Int *pass_order, HYPRE_Int *pass_marker, HYPRE_Int *pass_marker_offd,
+                                                         HYPRE_Int *fine_to_coarse, HYPRE_Int *fine_to_coarse_offd, HYPRE_Int *A_diag_i, HYPRE_Int *A_diag_j,
+                                                         HYPRE_Complex *A_diag_data, HYPRE_Int *A_offd_i, HYPRE_Int *A_offd_j, HYPRE_Complex *A_offd_data,
+                                                         HYPRE_Int *Soc_diag_j, HYPRE_Int *Soc_offd_j, HYPRE_Int *P_diag_i, HYPRE_Int *P_offd_i,
+                                                         HYPRE_Int *P_diag_j, HYPRE_Complex *P_diag_data, HYPRE_Int *P_offd_j, HYPRE_Complex *P_offd_data,
+                                                         HYPRE_Complex *row_sums );
+
+__global__ void hypreGPUKernel_insert_remaining_weights( hypre_DeviceItem &item, HYPRE_Int start,
+                                                         HYPRE_Int stop,
+                                                         HYPRE_Int *pass_order, HYPRE_Int *Pi_diag_i, HYPRE_Int *Pi_diag_j, HYPRE_Real *Pi_diag_data,
+                                                         HYPRE_Int *P_diag_i, HYPRE_Int *P_diag_j, HYPRE_Real *P_diag_data, HYPRE_Int *Pi_offd_i,
+                                                         HYPRE_Int *Pi_offd_j, HYPRE_Real *Pi_offd_data, HYPRE_Int *P_offd_i, HYPRE_Int *P_offd_j,
+                                                         HYPRE_Real *P_offd_data );
+
+__global__ void hypreGPUKernel_generate_Qdiag_j_Qoffd_j( hypre_DeviceItem &item,
+                                                         HYPRE_Int num_points,
+                                                         HYPRE_Int color,
+                                                         HYPRE_Int *pass_order, HYPRE_Int *pass_marker, HYPRE_Int *pass_marker_offd,
+                                                         HYPRE_Int *fine_to_coarse, HYPRE_Int *fine_to_coarse_offd, HYPRE_Int *A_diag_i, HYPRE_Int *A_diag_j,
+                                                         HYPRE_Complex *A_diag_data, HYPRE_Int *A_offd_i, HYPRE_Int *A_offd_j, HYPRE_Complex *A_offd_data,
+                                                         HYPRE_Int *Soc_diag_j, HYPRE_Int *Soc_offd_j, HYPRE_Int *Q_diag_i, HYPRE_Int *Q_offd_i,
+                                                         HYPRE_Int *Q_diag_j, HYPRE_Complex *Q_diag_data, HYPRE_Int *Q_offd_j, HYPRE_Complex *Q_offd_data,
+                                                         HYPRE_Complex *w_row_sum, HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int *dof_func_offd );
+
+__global__ void hypreGPUKernel_mutli_pi_rowsum( hypre_DeviceItem &item, HYPRE_Int num_points,
+                                                HYPRE_Int *pass_order,
+                                                HYPRE_Int *A_diag_i, HYPRE_Complex *A_diag_data, HYPRE_Int *Pi_diag_i, HYPRE_Complex *Pi_diag_data,
+                                                HYPRE_Int *Pi_offd_i, HYPRE_Complex *Pi_offd_data, HYPRE_Complex *w_row_sum );
+
+__global__ void hypreGPUKernel_pass_order_count( hypre_DeviceItem &item, HYPRE_Int num_points,
+                                                 HYPRE_Int color,
+                                                 HYPRE_Int *points_left, HYPRE_Int *pass_marker, HYPRE_Int *pass_marker_offd, HYPRE_Int *S_diag_i,
+                                                 HYPRE_Int *S_diag_j, HYPRE_Int *S_offd_i, HYPRE_Int *S_offd_j, HYPRE_Int *diag_shifts );
+
+__global__ void hypreGPUKernel_populate_big_P_offd_j( hypre_DeviceItem &item, HYPRE_Int start,
+                                                      HYPRE_Int stop,
+                                                      HYPRE_Int *pass_order, HYPRE_Int *P_offd_i, HYPRE_Int *P_offd_j, HYPRE_BigInt *col_map_offd_Pi,
+                                                      HYPRE_BigInt *big_P_offd_j );
+
+/*--------------------------------------------------------------------------
+ * hypre_ParAMGBuildModMultipass
+ * This routine implements Stuben's direct interpolation with multiple passes.
+ * expressed with matrix matrix multiplications
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_BoomerAMGBuildModMultipassDevice( hypre_ParCSRMatrix  *A,
+                                        HYPRE_Int           *CF_marker,
+                                        hypre_ParCSRMatrix  *S,
+                                        HYPRE_BigInt        *num_cpts_global,
+                                        HYPRE_Real           trunc_factor,
+                                        HYPRE_Int            P_max_elmts,
+                                        HYPRE_Int            interp_type,
+                                        HYPRE_Int            num_functions,
+                                        HYPRE_Int           *dof_func,
+                                        hypre_ParCSRMatrix **P_ptr )
+{
+#ifdef HYPRE_PROFILE
+   hypre_profile_times[HYPRE_TIMER_ID_MULTIPASS_INTERP] -= hypre_MPI_Wtime();
+#endif
+
+   hypre_assert( hypre_ParCSRMatrixMemoryLocation(A) == HYPRE_MEMORY_DEVICE );
+   hypre_assert( hypre_ParCSRMatrixMemoryLocation(S) == HYPRE_MEMORY_DEVICE );
+
+   MPI_Comm                comm     = hypre_ParCSRMatrixComm(A);
+   hypre_ParCSRCommPkg    *comm_pkg = hypre_ParCSRMatrixCommPkg(A);
+   hypre_ParCSRCommHandle *comm_handle;
+
+   HYPRE_Int        n_fine          = hypre_ParCSRMatrixNumRows(A);
+   hypre_CSRMatrix *A_diag          = hypre_ParCSRMatrixDiag(A);
+   HYPRE_Real      *A_diag_data     = hypre_CSRMatrixData(A_diag);
+   HYPRE_Int       *A_diag_i        = hypre_CSRMatrixI(A_diag);
+   HYPRE_Int       *A_diag_j        = hypre_CSRMatrixJ(A_diag);
+   hypre_CSRMatrix *A_offd          = hypre_ParCSRMatrixOffd(A);
+   HYPRE_Int       *A_offd_i        = hypre_CSRMatrixI(A_offd);
+   HYPRE_Int       *A_offd_j        = hypre_CSRMatrixJ(A_offd);
+   HYPRE_Real      *A_offd_data     = hypre_CSRMatrixData(A_offd);
+   HYPRE_Int        num_cols_offd_A = hypre_CSRMatrixNumCols(A_offd);
+
+   hypre_CSRMatrix *S_diag       = hypre_ParCSRMatrixDiag(S);
+   HYPRE_Int       *S_diag_i     = hypre_CSRMatrixI(S_diag);
+   HYPRE_Int       *S_diag_j     = hypre_CSRMatrixJ(S_diag);
+   hypre_CSRMatrix *S_offd       = hypre_ParCSRMatrixOffd(S);
+   HYPRE_Int       *S_offd_i     = hypre_CSRMatrixI(S_offd);
+   HYPRE_Int       *S_offd_j     = hypre_CSRMatrixJ(S_offd);
+
+   hypre_ParCSRMatrix **Pi;
+   hypre_ParCSRMatrix  *P;
+   hypre_CSRMatrix     *P_diag;
+   HYPRE_Real          *P_diag_data;
+   HYPRE_Int           *P_diag_i;
+   HYPRE_Int           *P_diag_j;
+   hypre_CSRMatrix     *P_offd;
+   HYPRE_Real          *P_offd_data = NULL;
+   HYPRE_Int           *P_offd_i;
+   HYPRE_Int           *P_offd_j = NULL;
+   HYPRE_BigInt        *col_map_offd_P = NULL;
+   HYPRE_BigInt        *col_map_offd_P_host = NULL;
+   HYPRE_Int            num_cols_offd_P = 0;
+   HYPRE_Int            num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
+   HYPRE_Int            num_elem_send = hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends);
+   HYPRE_Int           *int_buf_data = NULL;
+   HYPRE_Int            P_diag_size = 0, P_offd_size = 0;
+
+   HYPRE_Int       *pass_starts;
+   HYPRE_Int       *fine_to_coarse;
+   HYPRE_Int       *points_left;
+   HYPRE_Int       *pass_marker;
+   HYPRE_Int       *pass_marker_offd = NULL;
+   HYPRE_Int       *pass_order;
+
+   HYPRE_Int        i;
+   HYPRE_Int        num_passes, p, remaining;
+   HYPRE_Int        pass_starts_p1, pass_starts_p2;
+   HYPRE_BigInt     remaining_big; /* tmp variable for reducing global_remaining */
+   HYPRE_BigInt     global_remaining;
+   HYPRE_Int        cnt, cnt_old, cnt_rem, current_pass;
+
+   HYPRE_BigInt     total_global_cpts;
+   HYPRE_Int        my_id, num_procs;
+
+   HYPRE_Int       *dof_func_offd = NULL;
+   HYPRE_Real      *row_sums = NULL;
+
+   hypre_GpuProfilingPushRange("Section1");
+
+   /* MPI size and rank*/
+   hypre_MPI_Comm_size(comm, &num_procs);
+   hypre_MPI_Comm_rank(comm, &my_id);
+
+   if (num_procs > 1)
+   {
+      if (my_id == num_procs - 1)
+      {
+         total_global_cpts = num_cpts_global[1];
+      }
+      hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
+   }
+   else
+   {
+      total_global_cpts = num_cpts_global[1];
+   }
+
+   if (!total_global_cpts)
+   {
+      *P_ptr = NULL;
+      return hypre_error_flag;
+   }
+
+   hypre_BoomerAMGMakeSocFromSDevice(A, S);
+
+   /* Generate pass marker array */
+   /* contains pass numbers for each variable according to original order */
+   pass_marker = hypre_CTAlloc(HYPRE_Int, n_fine, HYPRE_MEMORY_DEVICE);
+   /* contains row numbers according to new order, pass 1 followed by pass 2 etc */
+   pass_order = hypre_CTAlloc(HYPRE_Int, n_fine, HYPRE_MEMORY_DEVICE);
+   /* F2C mapping */
+   /* reverse of pass_order, keeps track where original numbers go */
+   fine_to_coarse = hypre_TAlloc(HYPRE_Int, n_fine, HYPRE_MEMORY_DEVICE);
+   /* contains row numbers of remaining points, auxiliary */
+   points_left = hypre_CTAlloc(HYPRE_Int, n_fine, HYPRE_MEMORY_DEVICE);
+   P_diag_i = hypre_CTAlloc(HYPRE_Int, n_fine + 1, HYPRE_MEMORY_DEVICE);
+   P_offd_i = hypre_CTAlloc(HYPRE_Int, n_fine + 1, HYPRE_MEMORY_DEVICE);
+
+#if defined(HYPRE_USING_SYCL)
+   /* Fpts; number of F pts */
+   oneapi::dpl::counting_iterator<HYPRE_Int> count(0);
+   HYPRE_Int *points_end = hypreSycl_copy_if( count,
+                                              count + n_fine,
+                                              CF_marker,
+                                              points_left,
+   [] (const auto & x) {return x != 1;} );
+   remaining = points_end - points_left;
+
+   /* Cpts; number of C pts */
+   HYPRE_Int *pass_end = hypreSycl_copy_if( count,
+                                            count + n_fine,
+                                            CF_marker,
+                                            pass_order,
+                                            equal<HYPRE_Int>(1) );
+
+   P_diag_size = cnt = pass_end - pass_order;
+
+   /* mark C points pass-1; row nnz of C-diag = 1, C-offd = 0 */
+   auto zip0 = oneapi::dpl::make_zip_iterator( pass_marker, P_diag_i, P_offd_i );
+   hypreSycl_transform_if( zip0,
+                           zip0 + n_fine,
+                           CF_marker,
+                           zip0,
+   [] (const auto & x) {return std::make_tuple(HYPRE_Int(1), HYPRE_Int(1), HYPRE_Int(0));},
+   equal<HYPRE_Int>(1) );
+
+   HYPRE_ONEDPL_CALL( std::exclusive_scan,
+                      oneapi::dpl::make_transform_iterator(CF_marker,          equal<HYPRE_Int>(1)),
+                      oneapi::dpl::make_transform_iterator(CF_marker + n_fine, equal<HYPRE_Int>(1)),
+                      fine_to_coarse,
+                      HYPRE_Int(0) );
+#else
+   /* Fpts; number of F pts */
+   HYPRE_Int *points_end = HYPRE_THRUST_CALL( copy_if,
+                                              thrust::make_counting_iterator(0),
+                                              thrust::make_counting_iterator(n_fine),
+                                              CF_marker,
+                                              points_left,
+                                              HYPRE_THRUST_NOT(equal<HYPRE_Int>(1)) );
+   remaining = points_end - points_left;
+
+   /* Cpts; number of C pts */
+   HYPRE_Int *pass_end = HYPRE_THRUST_CALL( copy_if,
+                                            thrust::make_counting_iterator(0),
+                                            thrust::make_counting_iterator(n_fine),
+                                            CF_marker,
+                                            pass_order,
+                                            equal<HYPRE_Int>(1) );
+
+   P_diag_size = cnt = pass_end - pass_order;
+
+   /* mark C points pass-1; row nnz of C-diag = 1, C-offd = 0 */
+   HYPRE_THRUST_CALL( replace_if,
+                      thrust::make_zip_iterator( thrust::make_tuple(pass_marker, P_diag_i, P_offd_i) ),
+                      thrust::make_zip_iterator( thrust::make_tuple(pass_marker, P_diag_i, P_offd_i) ) + n_fine,
+                      CF_marker,
+                      equal<HYPRE_Int>(1),
+                      thrust::make_tuple(HYPRE_Int(1), HYPRE_Int(1), HYPRE_Int(0)) );
+
+   HYPRE_THRUST_CALL( exclusive_scan,
+                      thrust::make_transform_iterator(CF_marker,          equal<HYPRE_Int>(1)),
+                      thrust::make_transform_iterator(CF_marker + n_fine, equal<HYPRE_Int>(1)),
+                      fine_to_coarse,
+                      HYPRE_Int(0) );
+#endif
+
+   /* contains beginning for each pass in pass_order field, assume no more than 10 passes */
+   pass_starts = hypre_CTAlloc(HYPRE_Int, 11, HYPRE_MEMORY_HOST);
+   /* first pass is C */
+   pass_starts[0] = 0;
+   pass_starts[1] = cnt;
+
+   /* communicate dof_func */
+   if (num_procs > 1 && num_functions > 1)
+   {
+      int_buf_data = hypre_TAlloc(HYPRE_Int, num_elem_send, HYPRE_MEMORY_DEVICE);
+
+      hypre_ParCSRCommPkgCopySendMapElmtsToDevice(comm_pkg);
+#if defined(HYPRE_USING_SYCL)
+      hypreSycl_gather( hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg),
+                        hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg) + num_elem_send,
+                        dof_func,
+                        int_buf_data );
+#else
+      HYPRE_THRUST_CALL( gather,
+                         hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg),
+                         hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg) + num_elem_send,
+                         dof_func,
+                         int_buf_data );
+#endif
+
+#if defined(HYPRE_USING_THRUST_NOSYNC)
+      /* RL: make sure int_buf_data is ready before issuing GPU-GPU MPI */
+      if (hypre_GetGpuAwareMPI())
+      {
+         hypre_ForceSyncComputeStream();
+      }
+#endif
+
+      dof_func_offd = hypre_TAlloc(HYPRE_Int, num_cols_offd_A, HYPRE_MEMORY_DEVICE);
+
+      comm_handle = hypre_ParCSRCommHandleCreate_v2(11, comm_pkg, HYPRE_MEMORY_DEVICE, int_buf_data,
+                                                    HYPRE_MEMORY_DEVICE, dof_func_offd);
+      hypre_ParCSRCommHandleDestroy(comm_handle);
+   }
+
+   /* communicate pass_marker */
+   if (num_procs > 1)
+   {
+      if (!int_buf_data)
+      {
+         int_buf_data = hypre_CTAlloc(HYPRE_Int, num_elem_send, HYPRE_MEMORY_DEVICE);
+      }
+
+      hypre_ParCSRCommPkgCopySendMapElmtsToDevice(comm_pkg);
+
+#if defined(HYPRE_USING_SYCL)
+      hypreSycl_gather( hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg),
+                        hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg) + num_elem_send,
+                        pass_marker,
+                        int_buf_data );
+#else
+      HYPRE_THRUST_CALL( gather,
+                         hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg),
+                         hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg) + num_elem_send,
+                         pass_marker,
+                         int_buf_data );
+#endif
+
+#if defined(HYPRE_USING_THRUST_NOSYNC)
+      /* RL: make sure int_buf_data is ready before issuing GPU-GPU MPI */
+      if (hypre_GetGpuAwareMPI())
+      {
+         hypre_ForceSyncComputeStream();
+      }
+#endif
+
+      /* allocate one more see comments in hypre_modmp_compute_num_cols_offd_fine_to_coarse */
+      pass_marker_offd = hypre_CTAlloc(HYPRE_Int, num_cols_offd_A + 1, HYPRE_MEMORY_DEVICE);
+
+      /* create a handle to start communication. 11: for integer */
+      comm_handle = hypre_ParCSRCommHandleCreate_v2(11, comm_pkg, HYPRE_MEMORY_DEVICE, int_buf_data,
+                                                    HYPRE_MEMORY_DEVICE, pass_marker_offd);
+
+      /* destroy the handle to finish communication */
+      hypre_ParCSRCommHandleDestroy(comm_handle);
+   }
+
+   current_pass = 1;
+   num_passes = 1;
+   /* color points according to pass number */
+   remaining_big = remaining;
+   hypre_MPI_Allreduce(&remaining_big, &global_remaining, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
+
+   hypre_GpuProfilingPopRange();
+
+   hypre_GpuProfilingPushRange("Section2");
+
+   HYPRE_Int *points_left_old = hypre_TAlloc(HYPRE_Int, remaining, HYPRE_MEMORY_DEVICE);
+   HYPRE_Int *diag_shifts     = hypre_TAlloc(HYPRE_Int, remaining, HYPRE_MEMORY_DEVICE);
+
+   while (global_remaining > 0)
+   {
+      cnt_rem = 0;
+      cnt_old = cnt;
+
+      {
+         dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+         dim3 gDim = hypre_GetDefaultDeviceGridDimension(remaining, "warp", bDim);
+
+         /* output diag_shifts is 0/1 indicating if points_left_dev[i] is picked in this pass */
+         HYPRE_GPU_LAUNCH( hypreGPUKernel_pass_order_count,
+                           gDim, bDim,
+                           remaining,
+                           current_pass,
+                           points_left,
+                           pass_marker,
+                           pass_marker_offd,
+                           S_diag_i,
+                           S_diag_j,
+                           S_offd_i,
+                           S_offd_j,
+                           diag_shifts );
+
+#if defined(HYPRE_USING_SYCL)
+         cnt = HYPRE_ONEDPL_CALL( std::reduce,
+                                  diag_shifts,
+                                  diag_shifts + remaining,
+                                  cnt_old,
+                                  std::plus<HYPRE_Int>() );
+
+         cnt_rem = remaining - (cnt - cnt_old);
+
+         auto perm0 = oneapi::dpl::make_permutation_iterator(pass_marker, points_left);
+         hypreSycl_transform_if( perm0,
+                                 perm0 + remaining,
+                                 diag_shifts,
+                                 perm0,
+         [current_pass = current_pass] (const auto & x) {return current_pass + 1;},
+         [] (const auto & x) {return x;} );
+
+         hypre_TMemcpy(points_left_old, points_left, HYPRE_Int, remaining, HYPRE_MEMORY_DEVICE,
+                       HYPRE_MEMORY_DEVICE);
+
+         HYPRE_Int *new_end;
+         new_end = hypreSycl_copy_if( points_left_old,
+                                      points_left_old + remaining,
+                                      diag_shifts,
+                                      pass_order + cnt_old,
+         [] (const auto & x) {return x;} );
+
+         hypre_assert(new_end - pass_order == cnt);
+
+         new_end = hypreSycl_copy_if( points_left_old,
+                                      points_left_old + remaining,
+                                      diag_shifts,
+                                      points_left,
+         [] (const auto & x) {return !x;} );
+#else
+         cnt = HYPRE_THRUST_CALL( reduce,
+                                  diag_shifts,
+                                  diag_shifts + remaining,
+                                  cnt_old,
+                                  thrust::plus<HYPRE_Int>() );
+
+         cnt_rem = remaining - (cnt - cnt_old);
+
+         HYPRE_THRUST_CALL( replace_if,
+                            thrust::make_permutation_iterator(pass_marker, points_left),
+                            thrust::make_permutation_iterator(pass_marker, points_left + remaining),
+                            diag_shifts,
+                            thrust::identity<HYPRE_Int>(),
+                            current_pass + 1 );
+
+         hypre_TMemcpy(points_left_old, points_left, HYPRE_Int, remaining, HYPRE_MEMORY_DEVICE,
+                       HYPRE_MEMORY_DEVICE);
+
+         HYPRE_Int *new_end;
+         new_end = HYPRE_THRUST_CALL( copy_if,
+                                      points_left_old,
+                                      points_left_old + remaining,
+                                      diag_shifts,
+                                      pass_order + cnt_old,
+                                      thrust::identity<HYPRE_Int>() );
+
+         hypre_assert(new_end - pass_order == cnt);
+
+         new_end = HYPRE_THRUST_CALL( copy_if,
+                                      points_left_old,
+                                      points_left_old + remaining,
+                                      diag_shifts,
+                                      points_left,
+                                      HYPRE_THRUST_NOT(thrust::identity<HYPRE_Int>()) );
+#endif
+
+         hypre_assert(new_end - points_left == cnt_rem);
+      }
+
+      remaining = cnt_rem;
+      current_pass++;
+      num_passes++;
+
+      if (num_passes > 9)
+      {
+         hypre_error_w_msg(HYPRE_ERROR_GENERIC, " Warning!!! too many passes! out of range!\n");
+         break;
+      }
+
+      pass_starts[num_passes] = cnt;
+
+      /* update pass_marker_offd */
+      if (num_procs > 1)
+      {
+#if defined(HYPRE_USING_SYCL)
+         hypreSycl_gather( hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg),
+                           hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg) + num_elem_send,
+                           pass_marker,
+                           int_buf_data );
+#else
+         HYPRE_THRUST_CALL( gather,
+                            hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg),
+                            hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg) + num_elem_send,
+                            pass_marker,
+                            int_buf_data );
+#endif
+
+#if defined(HYPRE_USING_THRUST_NOSYNC)
+         /* RL: make sure int_buf_data is ready before issuing GPU-GPU MPI */
+         if (hypre_GetGpuAwareMPI())
+         {
+            hypre_ForceSyncComputeStream();
+         }
+#endif
+
+         /* create a handle to start communication. 11: for integer */
+         comm_handle = hypre_ParCSRCommHandleCreate_v2(11, comm_pkg, HYPRE_MEMORY_DEVICE, int_buf_data,
+                                                       HYPRE_MEMORY_DEVICE, pass_marker_offd);
+
+         /* destroy the handle to finish communication */
+         hypre_ParCSRCommHandleDestroy(comm_handle);
+      }
+
+      HYPRE_BigInt old_global_remaining = global_remaining;
+
+      remaining_big = remaining;
+      hypre_MPI_Allreduce(&remaining_big, &global_remaining, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
+
+      /* if the number of remaining points does not change, we have a situation of isolated areas of
+       * fine points that are not connected to any C-points, and the pass generation process breaks
+       * down. Those points can be ignored, i.e. the corresponding rows in P will just be 0
+       * and can be ignored for the algorithm. */
+      if (old_global_remaining == global_remaining)
+      {
+         break;
+      }
+
+   } // while (global_remaining > 0)
+
+   hypre_TFree(diag_shifts,     HYPRE_MEMORY_DEVICE);
+   hypre_TFree(points_left_old, HYPRE_MEMORY_DEVICE);
+   hypre_TFree(int_buf_data,    HYPRE_MEMORY_DEVICE);
+   hypre_TFree(points_left,     HYPRE_MEMORY_DEVICE);
+
+   /* generate row sum of weak points and C-points to be ignored */
+   row_sums = hypre_CTAlloc(HYPRE_Real, n_fine, HYPRE_MEMORY_DEVICE);
+
+   {
+      dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+      dim3 gDim = hypre_GetDefaultDeviceGridDimension(n_fine, "warp", bDim);
+
+      HYPRE_GPU_LAUNCH( hypreGPUKernel_cfmarker_masked_rowsum, gDim, bDim,
+                        n_fine, A_diag_i, A_diag_j, A_diag_data,
+                        A_offd_i, A_offd_j, A_offd_data,
+                        CF_marker,
+                        num_functions > 1 ? dof_func : NULL,
+                        num_functions > 1 ? dof_func_offd : NULL,
+                        row_sums );
+   }
+
+   hypre_GpuProfilingPopRange();
+
+   hypre_GpuProfilingPushRange("MultipassPiDevice");
+
+   Pi = hypre_CTAlloc(hypre_ParCSRMatrix*, num_passes, HYPRE_MEMORY_HOST);
+
+   hypre_GenerateMultipassPiDevice(A, S, num_cpts_global, &pass_order[pass_starts[1]],
+                                   pass_marker, pass_marker_offd,
+                                   pass_starts[2] - pass_starts[1], 1, row_sums, &Pi[0]);
+
+   hypre_GpuProfilingPopRange();
+
+   if (interp_type == 8)
+   {
+      for (i = 1; i < num_passes - 1; i++)
+      {
+         hypre_GpuProfilingPushRange(std::string("MultipassPiDevice Loop" + std::to_string(i)).c_str());
+
+         hypre_ParCSRMatrix *Q;
+         HYPRE_BigInt *c_pts_starts = hypre_ParCSRMatrixRowStarts(Pi[i - 1]);
+
+         hypre_GenerateMultipassPiDevice(A, S, c_pts_starts, &pass_order[pass_starts[i + 1]],
+                                         pass_marker, pass_marker_offd,
+                                         pass_starts[i + 2] - pass_starts[i + 1], i + 1, row_sums, &Q);
+
+         hypre_GpuProfilingPopRange();
+         Pi[i] = hypre_ParCSRMatMat(Q, Pi[i - 1]);
+
+         hypre_ParCSRMatrixDestroy(Q);
+      }
+   }
+   else if (interp_type == 9)
+   {
+      for (i = 1; i < num_passes - 1; i++)
+      {
+         hypre_GpuProfilingPushRange(std::string("MultiPiDevice Loop" + std::to_string(i)).c_str());
+         HYPRE_BigInt *c_pts_starts = hypre_ParCSRMatrixRowStarts(Pi[i - 1]);
+
+         hypre_GenerateMultiPiDevice(A, S, Pi[i - 1], c_pts_starts, &pass_order[pass_starts[i + 1]],
+                                     pass_marker, pass_marker_offd,
+                                     pass_starts[i + 2] - pass_starts[i + 1], i + 1,
+                                     num_functions, dof_func, dof_func_offd, &Pi[i] );
+
+         hypre_GpuProfilingPopRange();
+      }
+   }
+
+   hypre_GpuProfilingPushRange("Section3");
+
+   // We don't need the row sums anymore
+   hypre_TFree(row_sums, HYPRE_MEMORY_DEVICE);
+
+   /* populate P_diag_i/P_offd_i[i] with nnz of i-th row */
+   for (i = 0; i < num_passes - 1; i++)
+   {
+      HYPRE_Int *Pi_diag_i = hypre_CSRMatrixI(hypre_ParCSRMatrixDiag(Pi[i]));
+      HYPRE_Int *Pi_offd_i = hypre_CSRMatrixI(hypre_ParCSRMatrixOffd(Pi[i]));
+
+      HYPRE_Int start = pass_starts[i + 1];
+      HYPRE_Int stop  = pass_starts[i + 2];
+
+#if defined(HYPRE_USING_SYCL)
+      HYPRE_ONEDPL_CALL( std::transform,
+                         Pi_diag_i + 1,
+                         Pi_diag_i + stop - start + 1,
+                         Pi_diag_i,
+                         oneapi::dpl::make_permutation_iterator( P_diag_i, pass_order + start ),
+                         std::minus<HYPRE_Int>() );
+      HYPRE_ONEDPL_CALL( std::transform,
+                         Pi_offd_i + 1,
+                         Pi_offd_i + stop - start + 1,
+                         Pi_offd_i,
+                         oneapi::dpl::make_permutation_iterator( P_offd_i, pass_order + start ),
+                         std::minus<HYPRE_Int>() );
+#else
+      HYPRE_THRUST_CALL( transform,
+                         thrust::make_zip_iterator(thrust::make_tuple(Pi_diag_i, Pi_offd_i)) + 1,
+                         thrust::make_zip_iterator(thrust::make_tuple(Pi_diag_i, Pi_offd_i)) + stop - start + 1,
+                         thrust::make_zip_iterator(thrust::make_tuple(Pi_diag_i, Pi_offd_i)),
+                         thrust::make_permutation_iterator( thrust::make_zip_iterator(thrust::make_tuple(P_diag_i,
+                                                                                                         P_offd_i)), pass_order + start ),
+                         tuple_minus<HYPRE_Int>() );
+#endif
+
+      P_diag_size += hypre_CSRMatrixNumNonzeros(hypre_ParCSRMatrixDiag(Pi[i]));
+      P_offd_size += hypre_CSRMatrixNumNonzeros(hypre_ParCSRMatrixOffd(Pi[i]));
+   }
+
+#if defined(HYPRE_USING_SYCL)
+   auto zip2 = oneapi::dpl::make_zip_iterator( P_diag_i, P_offd_i );
+   HYPRE_ONEDPL_CALL( std::exclusive_scan,
+                      zip2,
+                      zip2 + n_fine + 1,
+                      oneapi::dpl::make_zip_iterator(P_diag_i, P_offd_i),
+                      std::make_tuple(HYPRE_Int(0), HYPRE_Int(0)),
+                      tuple_plus<HYPRE_Int>() );
+#else
+   HYPRE_THRUST_CALL( exclusive_scan,
+                      thrust::make_zip_iterator( thrust::make_tuple(P_diag_i, P_offd_i) ),
+                      thrust::make_zip_iterator( thrust::make_tuple(P_diag_i, P_offd_i) ) + n_fine + 1,
+                      thrust::make_zip_iterator( thrust::make_tuple(P_diag_i, P_offd_i) ),
+                      thrust::make_tuple(HYPRE_Int(0), HYPRE_Int(0)),
+                      tuple_plus<HYPRE_Int>() );
+#endif
+
+#ifdef HYPRE_DEBUG
+   {
+      HYPRE_Int tmp;
+      hypre_TMemcpy(&tmp, &P_diag_i[n_fine], HYPRE_Int, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
+      hypre_assert(tmp == P_diag_size);
+      hypre_TMemcpy(&tmp, &P_offd_i[n_fine], HYPRE_Int, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
+      hypre_assert(tmp == P_offd_size);
+   }
+#endif
+
+   P_diag_j    = hypre_TAlloc(HYPRE_Int,  P_diag_size, HYPRE_MEMORY_DEVICE);
+   P_diag_data = hypre_TAlloc(HYPRE_Real, P_diag_size, HYPRE_MEMORY_DEVICE);
+   P_offd_j    = hypre_TAlloc(HYPRE_Int,  P_offd_size, HYPRE_MEMORY_DEVICE);
+   P_offd_data = hypre_TAlloc(HYPRE_Real, P_offd_size, HYPRE_MEMORY_DEVICE);
+
+   /* insert weights for coarse points */
+   {
+#if defined(HYPRE_USING_SYCL)
+      auto perm1 = oneapi::dpl::make_permutation_iterator( fine_to_coarse, pass_order );
+      hypreSycl_scatter( perm1,
+                         perm1 + pass_starts[1],
+                         oneapi::dpl::make_permutation_iterator( P_diag_i, pass_order ),
+                         P_diag_j );
+
+      auto perm2 = oneapi::dpl::make_permutation_iterator( P_diag_i, pass_order );
+      auto perm3 = oneapi::dpl::make_permutation_iterator( P_diag_data, perm2 );
+      HYPRE_ONEDPL_CALL( std::transform,
+                         perm3,
+                         perm3 + pass_starts[1],
+                         perm3,
+      [] (const auto & x) {return 1.0;} );
+#else
+      HYPRE_THRUST_CALL( scatter,
+                         thrust::make_permutation_iterator( fine_to_coarse, pass_order ),
+                         thrust::make_permutation_iterator( fine_to_coarse, pass_order ) + pass_starts[1],
+                         thrust::make_permutation_iterator( P_diag_i, pass_order ),
+                         P_diag_j );
+
+      HYPRE_THRUST_CALL( scatter,
+                         thrust::make_constant_iterator<HYPRE_Real>(1.0),
+                         thrust::make_constant_iterator<HYPRE_Real>(1.0) + pass_starts[1],
+                         thrust::make_permutation_iterator( P_diag_i, pass_order ),
+                         P_diag_data );
+#endif
+   }
+
+   /* generate col_map_offd_P by combining all col_map_offd_Pi
+    * and reompute indices if needed */
+
+   /* insert remaining weights */
+   for (p = 0; p < num_passes - 1; p++)
+   {
+      HYPRE_Int  *Pi_diag_i    = hypre_CSRMatrixI(hypre_ParCSRMatrixDiag(Pi[p]));
+      HYPRE_Int  *Pi_offd_i    = hypre_CSRMatrixI(hypre_ParCSRMatrixOffd(Pi[p]));
+      HYPRE_Int  *Pi_diag_j    = hypre_CSRMatrixJ(hypre_ParCSRMatrixDiag(Pi[p]));
+      HYPRE_Int  *Pi_offd_j    = hypre_CSRMatrixJ(hypre_ParCSRMatrixOffd(Pi[p]));
+      HYPRE_Real *Pi_diag_data = hypre_CSRMatrixData(hypre_ParCSRMatrixDiag(Pi[p]));
+      HYPRE_Real *Pi_offd_data = hypre_CSRMatrixData(hypre_ParCSRMatrixOffd(Pi[p]));
+
+      HYPRE_Int num_points = pass_starts[p + 2] - pass_starts[p + 1];
+
+      dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+      dim3 gDim = hypre_GetDefaultDeviceGridDimension(num_points, "warp", bDim);
+
+      pass_starts_p1 = pass_starts[p + 1];
+      pass_starts_p2 = pass_starts[p + 2];
+      HYPRE_GPU_LAUNCH( hypreGPUKernel_insert_remaining_weights, gDim, bDim,
+                        pass_starts_p1, pass_starts_p2, pass_order,
+                        Pi_diag_i, Pi_diag_j, Pi_diag_data,
+                        P_diag_i, P_diag_j, P_diag_data,
+                        Pi_offd_i, Pi_offd_j, Pi_offd_data,
+                        P_offd_i, P_offd_j, P_offd_data );
+   }
+
+   /* Note that col indices in P_offd_j probably not consistent,
+      this gets fixed after truncation */
+   P = hypre_ParCSRMatrixCreate(comm,
+                                hypre_ParCSRMatrixGlobalNumRows(A),
+                                total_global_cpts,
+                                hypre_ParCSRMatrixRowStarts(A),
+                                num_cpts_global,
+                                num_cols_offd_P,
+                                P_diag_size,
+                                P_offd_size);
+
+   P_diag = hypre_ParCSRMatrixDiag(P);
+   hypre_CSRMatrixData(P_diag) = P_diag_data;
+   hypre_CSRMatrixI(P_diag)    = P_diag_i;
+   hypre_CSRMatrixJ(P_diag)    = P_diag_j;
+
+   P_offd = hypre_ParCSRMatrixOffd(P);
+   hypre_CSRMatrixData(P_offd) = P_offd_data;
+   hypre_CSRMatrixI(P_offd)    = P_offd_i;
+   hypre_CSRMatrixJ(P_offd)    = P_offd_j;
+
+   /* Compress P, removing coefficients smaller than trunc_factor * Max */
+   if (trunc_factor != 0.0 || P_max_elmts > 0)
+   {
+      hypre_BoomerAMGInterpTruncationDevice(P, trunc_factor, P_max_elmts);
+      P_diag_data = hypre_CSRMatrixData(P_diag);
+      P_diag_i = hypre_CSRMatrixI(P_diag);
+      P_diag_j = hypre_CSRMatrixJ(P_diag);
+      P_offd_data = hypre_CSRMatrixData(P_offd);
+      P_offd_i = hypre_CSRMatrixI(P_offd);
+      P_offd_j = hypre_CSRMatrixJ(P_offd);
+      P_offd_size = hypre_CSRMatrixNumNonzeros(P_offd);
+   }
+
+   hypre_GpuProfilingPopRange();
+
+   num_cols_offd_P = 0;
+
+   if (P_offd_size)
+   {
+      hypre_GpuProfilingPushRange("Section4");
+
+      HYPRE_BigInt *big_P_offd_j = hypre_TAlloc(HYPRE_BigInt, P_offd_size, HYPRE_MEMORY_DEVICE);
+
+      for (p = 0; p < num_passes - 1; p++)
+      {
+         HYPRE_BigInt *col_map_offd_Pi = hypre_ParCSRMatrixDeviceColMapOffd(Pi[p]);
+
+         HYPRE_Int npoints = pass_starts[p + 2] - pass_starts[p + 1];
+         dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+         dim3 gDim = hypre_GetDefaultDeviceGridDimension(npoints, "warp", bDim);
+
+         pass_starts_p1 = pass_starts[p + 1];
+         pass_starts_p2 = pass_starts[p + 2];
+         HYPRE_GPU_LAUNCH( hypreGPUKernel_populate_big_P_offd_j, gDim, bDim,
+                           pass_starts_p1,
+                           pass_starts_p2,
+                           pass_order,
+                           P_offd_i,
+                           P_offd_j,
+                           col_map_offd_Pi,
+                           big_P_offd_j );
+
+      } // end num_passes for loop
+
+      HYPRE_BigInt *tmp_P_offd_j = hypre_TAlloc(HYPRE_BigInt, P_offd_size, HYPRE_MEMORY_DEVICE);
+      hypre_TMemcpy(tmp_P_offd_j, big_P_offd_j, HYPRE_BigInt, P_offd_size, HYPRE_MEMORY_DEVICE,
+                    HYPRE_MEMORY_DEVICE);
+
+#if defined(HYPRE_USING_SYCL)
+      HYPRE_ONEDPL_CALL( std::sort,
+                         tmp_P_offd_j,
+                         tmp_P_offd_j + P_offd_size );
+
+      HYPRE_BigInt *new_end = HYPRE_ONEDPL_CALL( std::unique,
+                                                 tmp_P_offd_j,
+                                                 tmp_P_offd_j + P_offd_size );
+#else
+      HYPRE_THRUST_CALL( sort,
+                         tmp_P_offd_j,
+                         tmp_P_offd_j + P_offd_size );
+
+      HYPRE_BigInt *new_end = HYPRE_THRUST_CALL( unique,
+                                                 tmp_P_offd_j,
+                                                 tmp_P_offd_j + P_offd_size );
+#endif
+
+      num_cols_offd_P = new_end - tmp_P_offd_j;
+      col_map_offd_P = hypre_TAlloc(HYPRE_BigInt, num_cols_offd_P, HYPRE_MEMORY_DEVICE);
+      hypre_TMemcpy(col_map_offd_P, tmp_P_offd_j, HYPRE_BigInt, num_cols_offd_P, HYPRE_MEMORY_DEVICE,
+                    HYPRE_MEMORY_DEVICE);
+      hypre_TFree(tmp_P_offd_j, HYPRE_MEMORY_DEVICE);
+
+      // PB: It seems we still need this on the host??
+      col_map_offd_P_host = hypre_TAlloc(HYPRE_BigInt, num_cols_offd_P, HYPRE_MEMORY_HOST);
+      hypre_TMemcpy(col_map_offd_P_host, col_map_offd_P, HYPRE_BigInt, num_cols_offd_P, HYPRE_MEMORY_HOST,
+                    HYPRE_MEMORY_DEVICE);
+
+#if defined(HYPRE_USING_SYCL)
+      HYPRE_ONEDPL_CALL( oneapi::dpl::lower_bound,
+                         col_map_offd_P,
+                         col_map_offd_P + num_cols_offd_P,
+                         big_P_offd_j,
+                         big_P_offd_j + P_offd_size,
+                         P_offd_j );
+#else
+      HYPRE_THRUST_CALL( lower_bound,
+                         col_map_offd_P,
+                         col_map_offd_P + num_cols_offd_P,
+                         big_P_offd_j,
+                         big_P_offd_j + P_offd_size,
+                         P_offd_j );
+#endif
+
+      hypre_TFree(big_P_offd_j, HYPRE_MEMORY_DEVICE);
+
+      hypre_GpuProfilingPopRange();
+   } // if (P_offd_size)
+
+   hypre_GpuProfilingPushRange("Section5");
+
+   hypre_ParCSRMatrixColMapOffd(P)       = col_map_offd_P_host;
+   hypre_ParCSRMatrixDeviceColMapOffd(P) = col_map_offd_P;
+   hypre_CSRMatrixNumCols(P_offd)        = num_cols_offd_P;
+
+   hypre_CSRMatrixMemoryLocation(P_diag) = HYPRE_MEMORY_DEVICE;
+   hypre_CSRMatrixMemoryLocation(P_offd) = HYPRE_MEMORY_DEVICE;
+
+   hypre_MatvecCommPkgCreate(P);
+
+   for (i = 0; i < num_passes - 1; i++)
+   {
+      hypre_ParCSRMatrixDestroy(Pi[i]);
+   }
+
+   hypre_TFree(Pi,               HYPRE_MEMORY_HOST);
+   hypre_TFree(dof_func_offd,    HYPRE_MEMORY_DEVICE);
+   hypre_TFree(pass_starts,      HYPRE_MEMORY_HOST);
+   hypre_TFree(pass_marker,      HYPRE_MEMORY_DEVICE);
+   hypre_TFree(pass_marker_offd, HYPRE_MEMORY_DEVICE);
+   hypre_TFree(pass_order,       HYPRE_MEMORY_DEVICE);
+   hypre_TFree(fine_to_coarse,   HYPRE_MEMORY_DEVICE);
+
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_ONEDPL_CALL( std::replace_if,
+                      CF_marker,
+                      CF_marker + n_fine,
+                      equal<HYPRE_Int>(-3),
+                      static_cast<HYPRE_Int>(-1) );
+#else
+   HYPRE_THRUST_CALL( replace_if,
+                      CF_marker,
+                      CF_marker + n_fine,
+                      equal<HYPRE_Int>(-3),
+                      static_cast<HYPRE_Int>(-1) );
+#endif
+
+   *P_ptr = P;
+
+   hypre_GpuProfilingPopRange();
+
+   return hypre_error_flag;
+}
+
+HYPRE_Int
+hypre_GenerateMultipassPiDevice( hypre_ParCSRMatrix  *A,
+                                 hypre_ParCSRMatrix  *S,
+                                 HYPRE_BigInt        *c_pts_starts,
+                                 HYPRE_Int           *pass_order,
+                                 HYPRE_Int           *pass_marker,
+                                 HYPRE_Int           *pass_marker_offd,
+                                 HYPRE_Int            num_points, /* |F| */
+                                 HYPRE_Int            color, /* C-color */
+                                 HYPRE_Real          *row_sums,
+                                 hypre_ParCSRMatrix **P_ptr)
+{
+   MPI_Comm                comm     = hypre_ParCSRMatrixComm(A);
+   hypre_ParCSRCommPkg    *comm_pkg = hypre_ParCSRMatrixCommPkg(A);
+   hypre_ParCSRCommHandle *comm_handle;
+
+   hypre_CSRMatrix *A_diag      = hypre_ParCSRMatrixDiag(A);
+   HYPRE_Real      *A_diag_data = hypre_CSRMatrixData(A_diag);
+   HYPRE_Int       *A_diag_i    = hypre_CSRMatrixI(A_diag);
+   HYPRE_Int       *A_diag_j    = hypre_CSRMatrixJ(A_diag);
+   HYPRE_Int        n_fine      = hypre_CSRMatrixNumRows(A_diag);
+
+   hypre_CSRMatrix *A_offd          = hypre_ParCSRMatrixOffd(A);
+   HYPRE_Int       *A_offd_i        = hypre_CSRMatrixI(A_offd);
+   HYPRE_Int       *A_offd_j        = hypre_CSRMatrixJ(A_offd);
+   HYPRE_Real      *A_offd_data     = hypre_CSRMatrixData(A_offd);
+   HYPRE_Int        num_cols_offd_A = hypre_CSRMatrixNumCols(A_offd);
+
+   hypre_CSRMatrix *S_diag   = hypre_ParCSRMatrixDiag(S);
+   HYPRE_Int       *S_diag_i = hypre_CSRMatrixI(S_diag);
+   HYPRE_Int       *S_diag_j = hypre_CSRMatrixJ(S_diag);
+
+   hypre_CSRMatrix *S_offd   = hypre_ParCSRMatrixOffd(S);
+   HYPRE_Int       *S_offd_i = hypre_CSRMatrixI(S_offd);
+   HYPRE_Int       *S_offd_j = hypre_CSRMatrixJ(S_offd);
+
+   HYPRE_Int *Soc_diag_j = hypre_ParCSRMatrixSocDiagJ(S);
+   HYPRE_Int *Soc_offd_j = hypre_ParCSRMatrixSocOffdJ(S);
+
+   HYPRE_BigInt    *col_map_offd_P     = NULL;
+   HYPRE_BigInt    *col_map_offd_P_dev = NULL;
+   HYPRE_Int        num_cols_offd_P;
+   HYPRE_Int        nnz_diag, nnz_offd;
+
+   hypre_ParCSRMatrix *P;
+   hypre_CSRMatrix    *P_diag;
+   HYPRE_Real         *P_diag_data;
+   HYPRE_Int          *P_diag_i; /*at first counter of nonzero cols for each row,
+                                   finally will be pointer to start of row */
+   HYPRE_Int          *P_diag_j;
+   hypre_CSRMatrix    *P_offd;
+   HYPRE_Real         *P_offd_data = NULL;
+   HYPRE_Int          *P_offd_i; /*at first counter of nonzero cols for each row,
+                                   finally will be pointer to start of row */
+   HYPRE_Int          *P_offd_j = NULL;
+
+   HYPRE_Int       *fine_to_coarse;
+   HYPRE_Int       *fine_to_coarse_offd = NULL;
+   HYPRE_BigInt     f_pts_starts[2];
+   HYPRE_Int        my_id, num_procs;
+   HYPRE_BigInt     total_global_fpts;
+   HYPRE_BigInt     total_global_cpts;
+   HYPRE_BigInt    *big_convert_offd = NULL;
+   HYPRE_BigInt    *big_buf_data = NULL;
+
+   /* MPI size and rank*/
+   hypre_MPI_Comm_size(comm, &num_procs);
+   hypre_MPI_Comm_rank(comm, &my_id);
+
+   fine_to_coarse = hypre_TAlloc(HYPRE_Int, n_fine, HYPRE_MEMORY_DEVICE);
+
+   hypre_modmp_init_fine_to_coarse(n_fine, pass_marker, color, fine_to_coarse);
+
+   if (num_procs > 1)
+   {
+      HYPRE_BigInt big_Fpts = num_points;
+
+      hypre_MPI_Scan(&big_Fpts, f_pts_starts + 1, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
+
+      f_pts_starts[0] = f_pts_starts[1] - big_Fpts;
+
+      if (my_id == num_procs - 1)
+      {
+         total_global_fpts = f_pts_starts[1];
+         total_global_cpts = c_pts_starts[1];
+      }
+      hypre_MPI_Bcast(&total_global_fpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
+      hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
+   }
+   else
+   {
+      f_pts_starts[0] = 0;
+      f_pts_starts[1] = num_points;
+      total_global_fpts = f_pts_starts[1];
+      total_global_cpts = c_pts_starts[1];
+   }
+
+   num_cols_offd_P = 0;
+
+   if (num_procs > 1)
+   {
+      HYPRE_Int num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
+      HYPRE_Int num_elem_send = hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends);
+
+      big_convert_offd = hypre_TAlloc(HYPRE_BigInt, num_cols_offd_A, HYPRE_MEMORY_DEVICE);
+      big_buf_data     = hypre_TAlloc(HYPRE_BigInt, num_elem_send,   HYPRE_MEMORY_DEVICE);
+
+      globalC_functor functor(c_pts_starts[0]);
+
+#if defined(HYPRE_USING_SYCL)
+      hypreSycl_gather( hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg),
+                        hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg) + num_elem_send,
+                        oneapi::dpl::make_transform_iterator(fine_to_coarse, functor),
+                        big_buf_data );
+#else
+      HYPRE_THRUST_CALL( gather,
+                         hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg),
+                         hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg) + num_elem_send,
+                         thrust::make_transform_iterator(fine_to_coarse, functor),
+                         big_buf_data );
+#endif
+
+#if defined(HYPRE_USING_THRUST_NOSYNC)
+      /* RL: make sure big_buf_data is ready before issuing GPU-GPU MPI */
+      if (hypre_GetGpuAwareMPI())
+      {
+         hypre_ForceSyncComputeStream();
+      }
+#endif
+
+      comm_handle = hypre_ParCSRCommHandleCreate_v2(21, comm_pkg, HYPRE_MEMORY_DEVICE, big_buf_data,
+                                                    HYPRE_MEMORY_DEVICE, big_convert_offd);
+
+      hypre_ParCSRCommHandleDestroy(comm_handle);
+
+      // This will allocate fine_to_coarse_offd
+      hypre_modmp_compute_num_cols_offd_fine_to_coarse( pass_marker_offd, color, num_cols_offd_A,
+                                                        num_cols_offd_P, &fine_to_coarse_offd );
+
+      //FIXME: Clean this up when we don't need the host pointer anymore
+      col_map_offd_P     = hypre_TAlloc(HYPRE_BigInt, num_cols_offd_P, HYPRE_MEMORY_HOST);
+      col_map_offd_P_dev = hypre_TAlloc(HYPRE_BigInt, num_cols_offd_P, HYPRE_MEMORY_DEVICE);
+
+#if defined(HYPRE_USING_SYCL)
+      HYPRE_BigInt *col_map_end = hypreSycl_copy_if( big_convert_offd,
+                                                     big_convert_offd + num_cols_offd_A,
+                                                     pass_marker_offd,
+                                                     col_map_offd_P_dev,
+                                                     equal<HYPRE_Int>(color) );
+#else
+      HYPRE_BigInt *col_map_end = HYPRE_THRUST_CALL( copy_if,
+                                                     big_convert_offd,
+                                                     big_convert_offd + num_cols_offd_A,
+                                                     pass_marker_offd,
+                                                     col_map_offd_P_dev,
+                                                     equal<HYPRE_Int>(color) );
+#endif
+
+      hypre_assert(num_cols_offd_P == col_map_end - col_map_offd_P_dev);
+
+      //FIXME: Clean this up when we don't need the host pointer anymore
+      hypre_TMemcpy(col_map_offd_P, col_map_offd_P_dev, HYPRE_BigInt, num_cols_offd_P, HYPRE_MEMORY_HOST,
+                    HYPRE_MEMORY_DEVICE);
+
+      hypre_TFree(big_convert_offd, HYPRE_MEMORY_DEVICE);
+      hypre_TFree(big_buf_data,     HYPRE_MEMORY_DEVICE);
+   }
+
+   P_diag_i = hypre_TAlloc(HYPRE_Int, num_points + 1, HYPRE_MEMORY_DEVICE);
+   P_offd_i = hypre_TAlloc(HYPRE_Int, num_points + 1, HYPRE_MEMORY_DEVICE);
+
+   /* generate P_diag_i and P_offd_i */
+   {
+      dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+      dim3 gDim = hypre_GetDefaultDeviceGridDimension(num_points, "warp", bDim);
+
+      HYPRE_GPU_LAUNCH( hypreGPUKernel_generate_Pdiag_i_Poffd_i, gDim, bDim,
+                        num_points, color, pass_order, pass_marker, pass_marker_offd,
+                        S_diag_i, S_diag_j, S_offd_i, S_offd_j,
+                        P_diag_i, P_offd_i );
+
+      hypre_Memset(P_diag_i + num_points, 0, sizeof(HYPRE_Int), HYPRE_MEMORY_DEVICE);
+      hypre_Memset(P_offd_i + num_points, 0, sizeof(HYPRE_Int), HYPRE_MEMORY_DEVICE);
+
+#if defined(HYPRE_USING_SYCL)
+      auto zip3 = oneapi::dpl::make_zip_iterator( P_diag_i, P_offd_i );
+      HYPRE_ONEDPL_CALL( std::exclusive_scan,
+                         zip3,
+                         zip3 + num_points + 1,
+                         oneapi::dpl::make_zip_iterator( P_diag_i, P_offd_i ),
+                         std::make_tuple(HYPRE_Int(0), HYPRE_Int(0)),
+                         tuple_plus<HYPRE_Int>() );
+#else
+      HYPRE_THRUST_CALL( exclusive_scan,
+                         thrust::make_zip_iterator( thrust::make_tuple(P_diag_i, P_offd_i) ),
+                         thrust::make_zip_iterator( thrust::make_tuple(P_diag_i, P_offd_i) ) + num_points + 1,
+                         thrust::make_zip_iterator( thrust::make_tuple(P_diag_i, P_offd_i) ),
+                         thrust::make_tuple(HYPRE_Int(0), HYPRE_Int(0)),
+                         tuple_plus<HYPRE_Int>() );
+#endif
+
+      hypre_TMemcpy(&nnz_diag, &P_diag_i[num_points], HYPRE_Int, 1, HYPRE_MEMORY_HOST,
+                    HYPRE_MEMORY_DEVICE);
+      hypre_TMemcpy(&nnz_offd, &P_offd_i[num_points], HYPRE_Int, 1, HYPRE_MEMORY_HOST,
+                    HYPRE_MEMORY_DEVICE);
+   }
+
+   /* generate P_diag_j/data and P_offd_j/data */
+   P_diag_j    = hypre_TAlloc(HYPRE_Int,  nnz_diag, HYPRE_MEMORY_DEVICE);
+   P_diag_data = hypre_TAlloc(HYPRE_Real, nnz_diag, HYPRE_MEMORY_DEVICE);
+   P_offd_j    = hypre_TAlloc(HYPRE_Int,  nnz_offd, HYPRE_MEMORY_DEVICE);
+   P_offd_data = hypre_TAlloc(HYPRE_Real, nnz_offd, HYPRE_MEMORY_DEVICE);
+
+   {
+      dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+      dim3 gDim = hypre_GetDefaultDeviceGridDimension(num_points, "warp", bDim);
+
+      HYPRE_GPU_LAUNCH( hypreGPUKernel_generate_Pdiag_j_Poffd_j, gDim, bDim,
+                        num_points,
+                        color,
+                        pass_order,
+                        pass_marker,
+                        pass_marker_offd,
+                        fine_to_coarse,
+                        fine_to_coarse_offd,
+                        A_diag_i,
+                        A_diag_j,
+                        A_diag_data,
+                        A_offd_i,
+                        A_offd_j,
+                        A_offd_data,
+                        Soc_diag_j,
+                        Soc_offd_j,
+                        P_diag_i,
+                        P_offd_i,
+                        P_diag_j,
+                        P_diag_data,
+                        P_offd_j,
+                        P_offd_data,
+                        row_sums );
+   }
+
+   hypre_TFree(fine_to_coarse,      HYPRE_MEMORY_DEVICE);
+   hypre_TFree(fine_to_coarse_offd, HYPRE_MEMORY_DEVICE);
+
+   P = hypre_ParCSRMatrixCreate(comm,
+                                total_global_fpts,
+                                total_global_cpts,
+                                f_pts_starts,
+                                c_pts_starts,
+                                num_cols_offd_P,
+                                nnz_diag,
+                                nnz_offd);
+
+   P_diag = hypre_ParCSRMatrixDiag(P);
+   hypre_CSRMatrixData(P_diag) = P_diag_data;
+   hypre_CSRMatrixI(P_diag)    = P_diag_i;
+   hypre_CSRMatrixJ(P_diag)    = P_diag_j;
+
+   P_offd = hypre_ParCSRMatrixOffd(P);
+   hypre_CSRMatrixData(P_offd) = P_offd_data;
+   hypre_CSRMatrixI(P_offd)    = P_offd_i;
+   hypre_CSRMatrixJ(P_offd)    = P_offd_j;
+
+   hypre_ParCSRMatrixColMapOffd(P) = col_map_offd_P;
+   hypre_ParCSRMatrixDeviceColMapOffd(P) = col_map_offd_P_dev;
+
+   hypre_CSRMatrixMemoryLocation(P_diag) = HYPRE_MEMORY_DEVICE;
+   hypre_CSRMatrixMemoryLocation(P_offd) = HYPRE_MEMORY_DEVICE;
+
+   hypre_MatvecCommPkgCreate(P);
+
+   *P_ptr = P;
+
+   return hypre_error_flag;
+}
+
+HYPRE_Int
+hypre_GenerateMultiPiDevice( hypre_ParCSRMatrix  *A,
+                             hypre_ParCSRMatrix  *S,
+                             hypre_ParCSRMatrix  *P,
+                             HYPRE_BigInt        *c_pts_starts,
+                             HYPRE_Int           *pass_order,
+                             HYPRE_Int           *pass_marker,
+                             HYPRE_Int           *pass_marker_offd,
+                             HYPRE_Int            num_points,
+                             HYPRE_Int            color,
+                             HYPRE_Int            num_functions,
+                             HYPRE_Int           *dof_func,
+                             HYPRE_Int           *dof_func_offd,
+                             hypre_ParCSRMatrix **Pi_ptr )
+{
+   MPI_Comm                comm = hypre_ParCSRMatrixComm(A);
+   hypre_ParCSRCommPkg    *comm_pkg = hypre_ParCSRMatrixCommPkg(A);
+   hypre_ParCSRCommHandle *comm_handle;
+
+   hypre_CSRMatrix *A_diag      = hypre_ParCSRMatrixDiag(A);
+   HYPRE_Real      *A_diag_data = hypre_CSRMatrixData(A_diag);
+   HYPRE_Int       *A_diag_i    = hypre_CSRMatrixI(A_diag);
+   HYPRE_Int       *A_diag_j    = hypre_CSRMatrixJ(A_diag);
+   HYPRE_Int        n_fine      = hypre_CSRMatrixNumRows(A_diag);
+
+   hypre_CSRMatrix *A_offd          = hypre_ParCSRMatrixOffd(A);
+   HYPRE_Int       *A_offd_i        = hypre_CSRMatrixI(A_offd);
+   HYPRE_Int       *A_offd_j        = hypre_CSRMatrixJ(A_offd);
+   HYPRE_Real      *A_offd_data     = hypre_CSRMatrixData(A_offd);
+   HYPRE_Int        num_cols_offd_A = hypre_CSRMatrixNumCols(A_offd);
+
+   hypre_CSRMatrix *S_diag   = hypre_ParCSRMatrixDiag(S);
+   HYPRE_Int       *S_diag_i = hypre_CSRMatrixI(S_diag);
+   HYPRE_Int       *S_diag_j = hypre_CSRMatrixJ(S_diag);
+
+   hypre_CSRMatrix *S_offd   = hypre_ParCSRMatrixOffd(S);
+   HYPRE_Int       *S_offd_i = hypre_CSRMatrixI(S_offd);
+   HYPRE_Int       *S_offd_j = hypre_CSRMatrixJ(S_offd);
+
+   HYPRE_Int *Soc_diag_j = hypre_ParCSRMatrixSocDiagJ(S);
+   HYPRE_Int *Soc_offd_j = hypre_ParCSRMatrixSocOffdJ(S);
+
+   HYPRE_BigInt    *col_map_offd_Q     = NULL;
+   HYPRE_BigInt    *col_map_offd_Q_dev = NULL;
+   HYPRE_Int        num_cols_offd_Q;
+
+   hypre_ParCSRMatrix *Pi;
+   hypre_CSRMatrix    *Pi_diag;
+   HYPRE_Int          *Pi_diag_i;
+   HYPRE_Real         *Pi_diag_data;
+   hypre_CSRMatrix    *Pi_offd;
+   HYPRE_Int          *Pi_offd_i;
+   HYPRE_Real         *Pi_offd_data;
+
+   HYPRE_Int           nnz_diag, nnz_offd;
+
+   hypre_ParCSRMatrix *Q;
+   hypre_CSRMatrix    *Q_diag;
+   HYPRE_Real         *Q_diag_data;
+   HYPRE_Int          *Q_diag_i; /*at first counter of nonzero cols for each row,
+                                   finally will be pointer to start of row */
+   HYPRE_Int          *Q_diag_j;
+   hypre_CSRMatrix    *Q_offd;
+   HYPRE_Real         *Q_offd_data = NULL;
+   HYPRE_Int          *Q_offd_i; /*at first counter of nonzero cols for each row,
+                                  finally will be pointer to start of row */
+   HYPRE_Int          *Q_offd_j = NULL;
+
+   HYPRE_Int       *fine_to_coarse;
+   HYPRE_Int       *fine_to_coarse_offd = NULL;
+   HYPRE_BigInt     f_pts_starts[2];
+   HYPRE_Int        my_id, num_procs;
+   HYPRE_BigInt     total_global_fpts;
+   HYPRE_BigInt     total_global_cpts;
+   HYPRE_BigInt    *big_convert_offd = NULL;
+   HYPRE_BigInt    *big_buf_data = NULL;
+   HYPRE_Real      *w_row_sum;
+
+   /* MPI size and rank*/
+   hypre_MPI_Comm_size(comm, &num_procs);
+   hypre_MPI_Comm_rank(comm, &my_id);
+
+   fine_to_coarse = hypre_TAlloc(HYPRE_Int, n_fine, HYPRE_MEMORY_DEVICE);
+
+   hypre_modmp_init_fine_to_coarse(n_fine, pass_marker, color, fine_to_coarse);
+
+   if (num_procs > 1)
+   {
+      HYPRE_BigInt big_Fpts = num_points;
+
+      hypre_MPI_Scan(&big_Fpts, f_pts_starts + 1, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
+
+      f_pts_starts[0] = f_pts_starts[1] - big_Fpts;
+
+      if (my_id == num_procs - 1)
+      {
+         total_global_fpts = f_pts_starts[1];
+         total_global_cpts = c_pts_starts[1];
+      }
+      hypre_MPI_Bcast(&total_global_fpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
+      hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
+   }
+   else
+   {
+      f_pts_starts[0] = 0;
+      f_pts_starts[1] = num_points;
+      total_global_fpts = f_pts_starts[1];
+      total_global_cpts = c_pts_starts[1];
+   }
+
+   num_cols_offd_Q = 0;
+
+   if (num_procs > 1)
+   {
+      HYPRE_Int num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
+      HYPRE_Int num_elem_send = hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends);
+
+      big_convert_offd = hypre_TAlloc(HYPRE_BigInt, num_cols_offd_A, HYPRE_MEMORY_DEVICE);
+      big_buf_data     = hypre_TAlloc(HYPRE_BigInt, num_elem_send,   HYPRE_MEMORY_DEVICE);
+
+      globalC_functor functor(c_pts_starts[0]);
+
+#if defined(HYPRE_USING_SYCL)
+      hypreSycl_gather( hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg),
+                        hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg) + num_elem_send,
+                        oneapi::dpl::make_transform_iterator(fine_to_coarse, functor),
+                        big_buf_data );
+#else
+      HYPRE_THRUST_CALL( gather,
+                         hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg),
+                         hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg) + num_elem_send,
+                         thrust::make_transform_iterator(fine_to_coarse, functor),
+                         big_buf_data );
+#endif
+
+#if defined(HYPRE_USING_THRUST_NOSYNC)
+      /* RL: make sure big_buf_data is ready before issuing GPU-GPU MPI */
+      if (hypre_GetGpuAwareMPI())
+      {
+         hypre_ForceSyncComputeStream();
+      }
+#endif
+
+      comm_handle = hypre_ParCSRCommHandleCreate_v2(21, comm_pkg, HYPRE_MEMORY_DEVICE, big_buf_data,
+                                                    HYPRE_MEMORY_DEVICE, big_convert_offd);
+
+      hypre_ParCSRCommHandleDestroy(comm_handle);
+
+      // This will allocate fine_to_coarse_offd_dev
+      hypre_modmp_compute_num_cols_offd_fine_to_coarse( pass_marker_offd, color, num_cols_offd_A,
+                                                        num_cols_offd_Q, &fine_to_coarse_offd );
+
+      //FIXME: PB: It seems we need the host value too?!?!
+      col_map_offd_Q     = hypre_TAlloc(HYPRE_BigInt, num_cols_offd_Q, HYPRE_MEMORY_HOST);
+      col_map_offd_Q_dev = hypre_TAlloc(HYPRE_BigInt, num_cols_offd_Q, HYPRE_MEMORY_DEVICE);
+
+#if defined(HYPRE_USING_SYCL)
+      HYPRE_BigInt *col_map_end = hypreSycl_copy_if( big_convert_offd,
+                                                     big_convert_offd + num_cols_offd_A,
+                                                     pass_marker_offd,
+                                                     col_map_offd_Q_dev,
+                                                     equal<HYPRE_Int>(color) );
+#else
+      HYPRE_BigInt *col_map_end = HYPRE_THRUST_CALL( copy_if,
+                                                     big_convert_offd,
+                                                     big_convert_offd + num_cols_offd_A,
+                                                     pass_marker_offd,
+                                                     col_map_offd_Q_dev,
+                                                     equal<HYPRE_Int>(color) );
+#endif
+
+      hypre_assert(num_cols_offd_Q == col_map_end - col_map_offd_Q_dev);
+
+      //FIXME: PB: It seems like we're required to have a host version of this??
+      hypre_TMemcpy(col_map_offd_Q, col_map_offd_Q_dev, HYPRE_BigInt, num_cols_offd_Q, HYPRE_MEMORY_HOST,
+                    HYPRE_MEMORY_DEVICE);
+
+      hypre_TFree(big_convert_offd, HYPRE_MEMORY_DEVICE );
+      hypre_TFree(big_buf_data, HYPRE_MEMORY_DEVICE);
+   }
+
+   Q_diag_i = hypre_TAlloc(HYPRE_Int, num_points + 1, HYPRE_MEMORY_DEVICE);
+   Q_offd_i = hypre_TAlloc(HYPRE_Int, num_points + 1, HYPRE_MEMORY_DEVICE);
+
+   /* generate Q_diag_i and Q_offd_i */
+   {
+      dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+      dim3 gDim = hypre_GetDefaultDeviceGridDimension(num_points, "warp", bDim);
+
+      HYPRE_GPU_LAUNCH( hypreGPUKernel_generate_Pdiag_i_Poffd_i, gDim, bDim,
+                        num_points, color, pass_order, pass_marker, pass_marker_offd,
+                        S_diag_i, S_diag_j, S_offd_i, S_offd_j,
+                        Q_diag_i, Q_offd_i );
+
+      hypre_Memset(Q_diag_i + num_points, 0, sizeof(HYPRE_Int), HYPRE_MEMORY_DEVICE);
+      hypre_Memset(Q_offd_i + num_points, 0, sizeof(HYPRE_Int), HYPRE_MEMORY_DEVICE);
+
+#if defined(HYPRE_USING_SYCL)
+      auto zip4 = oneapi::dpl::make_zip_iterator( Q_diag_i, Q_offd_i );
+      HYPRE_ONEDPL_CALL( std::exclusive_scan,
+                         zip4,
+                         zip4 + num_points + 1,
+                         oneapi::dpl::make_zip_iterator( Q_diag_i, Q_offd_i ),
+                         std::make_tuple(HYPRE_Int(0), HYPRE_Int(0)),
+                         tuple_plus<HYPRE_Int>() );
+#else
+      HYPRE_THRUST_CALL( exclusive_scan,
+                         thrust::make_zip_iterator( thrust::make_tuple(Q_diag_i, Q_offd_i) ),
+                         thrust::make_zip_iterator( thrust::make_tuple(Q_diag_i, Q_offd_i) ) + num_points + 1,
+                         thrust::make_zip_iterator( thrust::make_tuple(Q_diag_i, Q_offd_i) ),
+                         thrust::make_tuple(HYPRE_Int(0), HYPRE_Int(0)),
+                         tuple_plus<HYPRE_Int>() );
+#endif
+
+      hypre_TMemcpy(&nnz_diag, &Q_diag_i[num_points], HYPRE_Int, 1, HYPRE_MEMORY_HOST,
+                    HYPRE_MEMORY_DEVICE);
+      hypre_TMemcpy(&nnz_offd, &Q_offd_i[num_points], HYPRE_Int, 1, HYPRE_MEMORY_HOST,
+                    HYPRE_MEMORY_DEVICE);
+   }
+
+   /* generate P_diag_j/data and P_offd_j/data */
+   Q_diag_j    = hypre_TAlloc(HYPRE_Int,  nnz_diag,   HYPRE_MEMORY_DEVICE);
+   Q_diag_data = hypre_TAlloc(HYPRE_Real, nnz_diag,   HYPRE_MEMORY_DEVICE);
+   Q_offd_j    = hypre_TAlloc(HYPRE_Int,  nnz_offd,   HYPRE_MEMORY_DEVICE);
+   Q_offd_data = hypre_TAlloc(HYPRE_Real, nnz_offd,   HYPRE_MEMORY_DEVICE);
+   w_row_sum   = hypre_TAlloc(HYPRE_Real, num_points, HYPRE_MEMORY_DEVICE);
+
+   {
+      dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+      dim3 gDim = hypre_GetDefaultDeviceGridDimension(num_points, "warp", bDim);
+
+      HYPRE_GPU_LAUNCH( hypreGPUKernel_generate_Qdiag_j_Qoffd_j, gDim, bDim,
+                        num_points,
+                        color,
+                        pass_order,
+                        pass_marker,
+                        pass_marker_offd,
+                        fine_to_coarse,
+                        fine_to_coarse_offd,
+                        A_diag_i,
+                        A_diag_j,
+                        A_diag_data,
+                        A_offd_i,
+                        A_offd_j,
+                        A_offd_data,
+                        Soc_diag_j,
+                        Soc_offd_j,
+                        Q_diag_i,
+                        Q_offd_i,
+                        Q_diag_j,
+                        Q_diag_data,
+                        Q_offd_j,
+                        Q_offd_data,
+                        w_row_sum,
+                        num_functions,
+                        dof_func,
+                        dof_func_offd );
+   }
+
+   hypre_TFree(fine_to_coarse,      HYPRE_MEMORY_DEVICE);
+   hypre_TFree(fine_to_coarse_offd, HYPRE_MEMORY_DEVICE);
+
+   Q = hypre_ParCSRMatrixCreate(comm,
+                                total_global_fpts,
+                                total_global_cpts,
+                                f_pts_starts,
+                                c_pts_starts,
+                                num_cols_offd_Q,
+                                nnz_diag,
+                                nnz_offd);
+
+   Q_diag = hypre_ParCSRMatrixDiag(Q);
+   hypre_CSRMatrixData(Q_diag) = Q_diag_data;
+   hypre_CSRMatrixI(Q_diag)    = Q_diag_i;
+   hypre_CSRMatrixJ(Q_diag)    = Q_diag_j;
+
+   Q_offd = hypre_ParCSRMatrixOffd(Q);
+   hypre_CSRMatrixData(Q_offd) = Q_offd_data;
+   hypre_CSRMatrixI(Q_offd)    = Q_offd_i;
+   hypre_CSRMatrixJ(Q_offd)    = Q_offd_j;
+
+   hypre_ParCSRMatrixColMapOffd(Q) = col_map_offd_Q;
+   hypre_ParCSRMatrixDeviceColMapOffd(Q) = col_map_offd_Q_dev;
+
+   hypre_CSRMatrixMemoryLocation(Q_diag) = HYPRE_MEMORY_DEVICE;
+   hypre_CSRMatrixMemoryLocation(Q_offd) = HYPRE_MEMORY_DEVICE;
+
+   hypre_MatvecCommPkgCreate(Q);
+
+   Pi = hypre_ParCSRMatMat(Q, P);
+
+   Pi_diag = hypre_ParCSRMatrixDiag(Pi);
+   Pi_diag_data = hypre_CSRMatrixData(Pi_diag);
+   Pi_diag_i = hypre_CSRMatrixI(Pi_diag);
+   Pi_offd = hypre_ParCSRMatrixOffd(Pi);
+   Pi_offd_data = hypre_CSRMatrixData(Pi_offd);
+   Pi_offd_i = hypre_CSRMatrixI(Pi_offd);
+
+   {
+      dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+      dim3 gDim = hypre_GetDefaultDeviceGridDimension(num_points, "warp", bDim);
+
+      HYPRE_GPU_LAUNCH( hypreGPUKernel_mutli_pi_rowsum, gDim, bDim,
+                        num_points, pass_order, A_diag_i, A_diag_data,
+                        Pi_diag_i, Pi_diag_data, Pi_offd_i, Pi_offd_data,
+                        w_row_sum );
+   }
+
+   hypre_TFree(w_row_sum, HYPRE_MEMORY_DEVICE);
+
+   hypre_ParCSRMatrixDestroy(Q);
+
+   *Pi_ptr = Pi;
+
+   return hypre_error_flag;
+}
+
+void hypre_modmp_init_fine_to_coarse( HYPRE_Int  n_fine,
+                                      HYPRE_Int *pass_marker,
+                                      HYPRE_Int  color,
+                                      HYPRE_Int *fine_to_coarse )
+{
+   // n_fine == pass_marker.size()
+   // Host code this is replacing:
+   // n_cpts = 0;
+   // for (HYPRE_Int i=0; i < n_fine; i++)
+   //  {
+   //    if (pass_marker[i] == color)
+   //      fine_to_coarse[i] = n_cpts++;
+   //    else
+   //      fine_to_coarse[i] = -1;
+   //  }
+
+   if (n_fine == 0)
+   {
+      return;
+   }
+
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_ONEDPL_CALL( std::exclusive_scan,
+                      oneapi::dpl::make_transform_iterator(pass_marker,          equal<HYPRE_Int>(color)),
+                      oneapi::dpl::make_transform_iterator(pass_marker + n_fine, equal<HYPRE_Int>(color)),
+                      fine_to_coarse,
+                      HYPRE_Int(0) );
+
+   hypreSycl_transform_if( fine_to_coarse,
+                           fine_to_coarse + n_fine,
+                           pass_marker,
+                           fine_to_coarse,
+   [] (const auto & x) {return -1;},
+   [color = color] (const auto & x) {return x != color;} );
+#else
+   HYPRE_THRUST_CALL( exclusive_scan,
+                      thrust::make_transform_iterator(pass_marker,          equal<HYPRE_Int>(color)),
+                      thrust::make_transform_iterator(pass_marker + n_fine, equal<HYPRE_Int>(color)),
+                      fine_to_coarse,
+                      HYPRE_Int(0) );
+
+   HYPRE_THRUST_CALL( replace_if,
+                      fine_to_coarse,
+                      fine_to_coarse + n_fine,
+                      pass_marker,
+                      HYPRE_THRUST_NOT(equal<HYPRE_Int>(color)),
+                      -1 );
+#endif
+}
+
+void
+hypre_modmp_compute_num_cols_offd_fine_to_coarse( HYPRE_Int  *pass_marker_offd,
+                                                  HYPRE_Int   color,
+                                                  HYPRE_Int   num_cols_offd_A,
+                                                  HYPRE_Int  &num_cols_offd,
+                                                  HYPRE_Int **fine_to_coarse_offd_ptr )
+{
+   // We allocate with a "+1" because the host version of this code incremented the counter
+   // even on the last match, so we create an extra entry the exclusive_scan will reflect this
+   // and we can read off the last entry and only do 1 kernel call and 1 memcpy
+   // RL: this trick requires pass_marker_offd has 1 more space allocated too
+   HYPRE_Int *fine_to_coarse_offd = hypre_TAlloc(HYPRE_Int, num_cols_offd_A + 1, HYPRE_MEMORY_DEVICE);
+
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_ONEDPL_CALL( std::exclusive_scan,
+                      oneapi::dpl::make_transform_iterator(pass_marker_offd,
+                                                           equal<HYPRE_Int>(color)),
+                      oneapi::dpl::make_transform_iterator(pass_marker_offd + num_cols_offd_A + 1,
+                                                           equal<HYPRE_Int>(color)),
+                      fine_to_coarse_offd,
+                      HYPRE_Int(0) );
+#else
+   HYPRE_THRUST_CALL( exclusive_scan,
+                      thrust::make_transform_iterator(pass_marker_offd,                       equal<HYPRE_Int>(color)),
+                      thrust::make_transform_iterator(pass_marker_offd + num_cols_offd_A + 1, equal<HYPRE_Int>(color)),
+                      fine_to_coarse_offd,
+                      HYPRE_Int(0) );
+#endif
+
+   hypre_TMemcpy( &num_cols_offd, fine_to_coarse_offd + num_cols_offd_A, HYPRE_Int, 1,
+                  HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
+
+   *fine_to_coarse_offd_ptr = fine_to_coarse_offd;
+}
+
+__global__
+void hypreGPUKernel_cfmarker_masked_rowsum( hypre_DeviceItem    &item,
+                                            HYPRE_Int      nrows,
+                                            HYPRE_Int     *A_diag_i,
+                                            HYPRE_Int     *A_diag_j,
+                                            HYPRE_Complex *A_diag_data,
+                                            HYPRE_Int     *A_offd_i,
+                                            HYPRE_Int     *A_offd_j,
+                                            HYPRE_Complex *A_offd_data,
+                                            HYPRE_Int     *CF_marker,
+                                            HYPRE_Int     *dof_func,
+                                            HYPRE_Int     *dof_func_offd,
+                                            HYPRE_Complex *row_sums )
+{
+   HYPRE_Int row_i = hypre_gpu_get_grid_warp_id<1, 1>(item);
+
+   if (row_i >= nrows || read_only_load(&CF_marker[row_i]) >= 0)
+   {
+      return;
+   }
+
+   HYPRE_Int lane = hypre_gpu_get_lane_id<1>(item);
+   HYPRE_Int p = 0;
+   HYPRE_Int q = 0;
+   HYPRE_Int func_i = dof_func ? read_only_load(&dof_func[row_i]) : 0;
+
+   // A_diag part
+   if (lane < 2)
+   {
+      p = read_only_load(A_diag_i + row_i + lane);
+   }
+   q = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 1);
+   p = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 0);
+
+   HYPRE_Complex row_sum_i = 0.0;
+
+   // exclude diagonal: do not assume it is the first entry
+   for (HYPRE_Int j = p + lane; j < q; j += HYPRE_WARP_SIZE)
+   {
+      HYPRE_Int col = read_only_load(&A_diag_j[j]);
+
+      if (row_i != col)
+      {
+         HYPRE_Int func_j = dof_func ? read_only_load(&dof_func[col]) : 0;
+
+         if (func_i == func_j)
+         {
+            HYPRE_Complex value = read_only_load(&A_diag_data[j]);
+            row_sum_i += value;
+         }
+      }
+   }
+
+   // A_offd part
+   if (lane < 2)
+   {
+      p = read_only_load(A_offd_i + row_i + lane);
+   }
+   q = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 1);
+   p = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 0);
+
+   for (HYPRE_Int j = p + lane; j < q; j += HYPRE_WARP_SIZE)
+   {
+      HYPRE_Int func_j = 0;
+      if (dof_func_offd)
+      {
+         HYPRE_Int col = read_only_load(&A_offd_j[j]);
+         func_j = read_only_load(&dof_func_offd[col]);
+      }
+
+      if (func_i == func_j)
+      {
+         HYPRE_Complex value = read_only_load(&A_offd_data[j]);
+         row_sum_i += value;
+      }
+   }
+
+   row_sum_i = warp_reduce_sum(item, row_sum_i);
+
+   if (lane == 0)
+   {
+      row_sums[row_i] = row_sum_i;
+   }
+}
+
+__global__
+void hypreGPUKernel_mutli_pi_rowsum( hypre_DeviceItem    &item,
+                                     HYPRE_Int      num_points,
+                                     HYPRE_Int     *pass_order,
+                                     HYPRE_Int     *A_diag_i,
+                                     HYPRE_Complex *A_diag_data,
+                                     HYPRE_Int     *Pi_diag_i,
+                                     HYPRE_Complex *Pi_diag_data,
+                                     HYPRE_Int     *Pi_offd_i,
+                                     HYPRE_Complex *Pi_offd_data,
+                                     HYPRE_Complex *w_row_sum )
+{
+   HYPRE_Int row_i = hypre_gpu_get_grid_warp_id<1, 1>(item);
+
+   if (row_i >= num_points)
+   {
+      return;
+   }
+
+   HYPRE_Int lane = hypre_gpu_get_lane_id<1>(item);
+   HYPRE_Int p_diag = 0, q_diag = 0, p_offd = 0, q_offd = 0;
+   HYPRE_Real row_sum_C = 0.0;
+
+   // Pi_diag
+   if (lane < 2)
+   {
+      p_diag = read_only_load(Pi_diag_i + row_i + lane);
+   }
+   q_diag = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_diag, 1);
+   p_diag = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_diag, 0);
+
+   for (HYPRE_Int j = p_diag + lane; j < q_diag; j += HYPRE_WARP_SIZE)
+   {
+      row_sum_C += read_only_load(&Pi_diag_data[j]);
+   }
+
+   // Pi_offd
+   if (lane < 2)
+   {
+      p_offd = read_only_load(Pi_offd_i + row_i + lane);
+   }
+   q_offd = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_offd, 1);
+   p_offd = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_offd, 0);
+
+   for (HYPRE_Int j = p_offd + lane; j < q_offd; j += HYPRE_WARP_SIZE)
+   {
+      row_sum_C += read_only_load(&Pi_offd_data[j]);
+   }
+
+   row_sum_C = warp_reduce_sum(item, row_sum_C);
+
+   if ( lane == 0 )
+   {
+      const HYPRE_Int i1 = read_only_load(&pass_order[row_i]);
+      const HYPRE_Int j1 = read_only_load(&A_diag_i[i1]);
+      //XXX RL: rely on diagonal is the first of row [FIX?]
+      const HYPRE_Real diagonal = read_only_load(&A_diag_data[j1]);
+      const HYPRE_Real value = row_sum_C * diagonal;
+      row_sum_C += read_only_load(&w_row_sum[row_i]);
+
+      if ( value != 0.0 )
+      {
+         row_sum_C /= value;
+      }
+   }
+
+   row_sum_C = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, row_sum_C, 0);
+
+   // Pi_diag
+   for (HYPRE_Int j = p_diag + lane; j < q_diag; j += HYPRE_WARP_SIZE)
+   {
+      Pi_diag_data[j] *= -row_sum_C;
+   }
+
+   // Pi_offd
+   for (HYPRE_Int j = p_offd + lane; j < q_offd; j += HYPRE_WARP_SIZE)
+   {
+      Pi_offd_data[j] *= -row_sum_C;
+   }
+}
+
+__global__
+void hypreGPUKernel_generate_Pdiag_i_Poffd_i( hypre_DeviceItem &item,
+                                              HYPRE_Int  num_points,
+                                              HYPRE_Int  color,
+                                              HYPRE_Int *pass_order,
+                                              HYPRE_Int *pass_marker,
+                                              HYPRE_Int *pass_marker_offd,
+                                              HYPRE_Int *S_diag_i,
+                                              HYPRE_Int *S_diag_j,
+                                              HYPRE_Int *S_offd_i,
+                                              HYPRE_Int *S_offd_j,
+                                              HYPRE_Int *P_diag_i,
+                                              HYPRE_Int *P_offd_i )
+{
+   /*
+    nnz_diag = 0;
+    nnz_offd = 0;
+    for (i=0; i < num_points; i++)
+    {
+      i1 = pass_order[i];
+      for (j=S_diag_i[i1]; j < S_diag_i[i1+1]; j++)
+      {
+         j1 = S_diag_j[j];
+         if (pass_marker[j1] == color)
+         {
+             P_diag_i[i]++;
+             nnz_diag++;
+         }
+      }
+      for (j=S_offd_i[i1]; j < S_offd_i[i1+1]; j++)
+      {
+         j1 = S_offd_j[j];
+         if (pass_marker_offd[j1] == color)
+         {
+             P_offd_i[i]++;
+             nnz_offd++;
+         }
+      }
+    }
+   */
+
+   HYPRE_Int row_i = hypre_gpu_get_grid_warp_id<1, 1>(item);
+
+   if (row_i >= num_points)
+   {
+      return;
+   }
+
+   HYPRE_Int i1 = read_only_load(&pass_order[row_i]);
+   HYPRE_Int lane = hypre_gpu_get_lane_id<1>(item);
+   HYPRE_Int p = 0;
+   HYPRE_Int q = 0;
+   HYPRE_Int diag_increment = 0;
+   HYPRE_Int offd_increment = 0;
+
+   // S_diag
+   if (lane < 2)
+   {
+      p = read_only_load(S_diag_i + i1 + lane);
+   }
+   q = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 1);
+   p = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 0);
+
+   for (HYPRE_Int j = p + lane; j < q; j += HYPRE_WARP_SIZE)
+   {
+      const HYPRE_Int j1 = read_only_load(&S_diag_j[j]);
+      const HYPRE_Int marker = read_only_load(&pass_marker[j1]);
+
+      diag_increment += marker == color;
+   }
+
+   diag_increment = warp_reduce_sum(item, diag_increment);
+
+   // Increment P_diag_i, but then we need to also do a block reduction
+   // on diag_increment to log the total nnz_diag for the block
+   // Then after the kernel, we'll accumulate nnz_diag for each block
+   if (lane == 0)
+   {
+      P_diag_i[row_i] = diag_increment;
+   }
+
+   // S_offd
+   if (lane < 2)
+   {
+      p = read_only_load(S_offd_i + i1 + lane);
+   }
+   q = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 1);
+   p = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 0);
+
+   for (HYPRE_Int j = p + lane; j < q; j += HYPRE_WARP_SIZE)
+   {
+      const HYPRE_Int j1 = read_only_load(&S_offd_j[j]);
+      const HYPRE_Int marker = read_only_load(&pass_marker_offd[j1]);
+
+      offd_increment += marker == color;
+   }
+
+   offd_increment = warp_reduce_sum(item, offd_increment);
+
+   // Increment P_offd_i, but then we need to also do a block reduction
+   // on offd_increment to log the total nnz_offd for the block
+   // Then after the kernel, we'll accumulate nnz_offd for each block
+   if (lane == 0)
+   {
+      P_offd_i[row_i] = offd_increment;
+   }
+}
+
+__global__
+void hypreGPUKernel_generate_Pdiag_j_Poffd_j( hypre_DeviceItem    &item,
+                                              HYPRE_Int      num_points,
+                                              HYPRE_Int      color,
+                                              HYPRE_Int     *pass_order,
+                                              HYPRE_Int     *pass_marker,
+                                              HYPRE_Int     *pass_marker_offd,
+                                              HYPRE_Int     *fine_to_coarse,
+                                              HYPRE_Int     *fine_to_coarse_offd,
+                                              HYPRE_Int     *A_diag_i,
+                                              HYPRE_Int     *A_diag_j,
+                                              HYPRE_Complex *A_diag_data,
+                                              HYPRE_Int     *A_offd_i,
+                                              HYPRE_Int     *A_offd_j,
+                                              HYPRE_Complex *A_offd_data,
+                                              HYPRE_Int     *Soc_diag_j,
+                                              HYPRE_Int     *Soc_offd_j,
+                                              HYPRE_Int     *P_diag_i,
+                                              HYPRE_Int     *P_offd_i,
+                                              HYPRE_Int     *P_diag_j,
+                                              HYPRE_Complex *P_diag_data,
+                                              HYPRE_Int     *P_offd_j,
+                                              HYPRE_Complex *P_offd_data,
+                                              HYPRE_Complex *row_sums )
+{
+   HYPRE_Int row_i = hypre_gpu_get_grid_warp_id<1, 1>(item);
+
+   if (row_i >= num_points)
+   {
+      return;
+   }
+
+   HYPRE_Int i1 = read_only_load(&pass_order[row_i]);
+   HYPRE_Int lane = hypre_gpu_get_lane_id<1>(item);
+   HYPRE_Int p_diag_A = 0, q_diag_A, p_diag_P = 0, q_diag_P;
+   HYPRE_Int k;
+   HYPRE_Complex row_sum_C = 0.0, diagonal = 0.0;
+
+   // S_diag
+   if (lane < 2)
+   {
+      p_diag_A = read_only_load(A_diag_i + i1 + lane);
+      p_diag_P = read_only_load(P_diag_i + row_i + lane);
+   }
+   q_diag_A = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_diag_A, 1);
+   p_diag_A = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_diag_A, 0);
+   q_diag_P = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_diag_P, 1);
+   p_diag_P = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_diag_P, 0);
+
+   k = p_diag_P;
+   for (HYPRE_Int j = p_diag_A + lane; warp_any_sync(item, HYPRE_WARP_FULL_MASK, j < q_diag_A);
+        j += HYPRE_WARP_SIZE)
+   {
+      HYPRE_Int equal = 0;
+      HYPRE_Int sum = 0;
+      HYPRE_Int j1 = -1;
+
+      if ( j < q_diag_A )
+      {
+         j1 = read_only_load(&Soc_diag_j[j]);
+         equal = j1 > -1 && read_only_load(&pass_marker[j1]) == color;
+      }
+
+      HYPRE_Int pos = warp_prefix_sum(item, lane, equal, sum);
+
+      if (equal)
+      {
+         P_diag_j[k + pos] = read_only_load(&fine_to_coarse[j1]);
+         HYPRE_Complex val = read_only_load(&A_diag_data[j]);
+         P_diag_data[k + pos] = val;
+         row_sum_C += val;
+      }
+
+      if (j1 == -2)
+      {
+         diagonal = read_only_load(&A_diag_data[j]);
+      }
+
+      k += sum;
+   }
+
+   hypre_device_assert(k == q_diag_P);
+
+   // S_offd
+   HYPRE_Int p_offd_A = 0, q_offd_A, p_offd_P = 0, q_offd_P;
+
+   if (lane < 2)
+   {
+      p_offd_A = read_only_load(A_offd_i + i1 + lane);
+      p_offd_P = read_only_load(P_offd_i + row_i + lane);
+   }
+   q_offd_A = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_offd_A, 1);
+   p_offd_A = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_offd_A, 0);
+   q_offd_P = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_offd_P, 1);
+   p_offd_P = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_offd_P, 0);
+
+   k = p_offd_P;
+   for (HYPRE_Int j = p_offd_A + lane; warp_any_sync(item, HYPRE_WARP_FULL_MASK, j < q_offd_A);
+        j += HYPRE_WARP_SIZE)
+   {
+      HYPRE_Int equal = 0;
+      HYPRE_Int sum = 0;
+      HYPRE_Int j1 = -1;
+
+      if ( j < q_offd_A )
+      {
+         j1 = read_only_load(&Soc_offd_j[j]);
+         equal = j1 > -1 && read_only_load(&pass_marker_offd[j1]) == color;
+      }
+
+      HYPRE_Int pos = warp_prefix_sum(item, lane, equal, sum);
+
+      if (equal)
+      {
+         P_offd_j[k + pos] = read_only_load(&fine_to_coarse_offd[j1]);
+         HYPRE_Complex val = read_only_load(&A_offd_data[j]);
+         P_offd_data[k + pos] = val;
+         row_sum_C += val;
+      }
+
+      k += sum;
+   }
+
+   hypre_device_assert(k == q_offd_P);
+
+   row_sum_C = warp_reduce_sum(item, row_sum_C);
+   diagonal = warp_reduce_sum(item, diagonal);
+   HYPRE_Complex value = row_sum_C * diagonal;
+   HYPRE_Complex row_sum_i = 0.0;
+
+   if (lane == 0)
+   {
+      row_sum_i = read_only_load(&row_sums[i1]);
+
+      if (value)
+      {
+         row_sum_i /= value;
+         row_sums[i1] = row_sum_i;
+      }
+   }
+
+   row_sum_i = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, row_sum_i, 0);
+
+   for (HYPRE_Int j = p_diag_P + lane; j < q_diag_P; j += HYPRE_WARP_SIZE)
+   {
+      P_diag_data[j] = -P_diag_data[j] * row_sum_i;
+   }
+
+   for (HYPRE_Int j = p_offd_P + lane; j < q_offd_P; j += HYPRE_WARP_SIZE)
+   {
+      P_offd_data[j] = -P_offd_data[j] * row_sum_i;
+   }
+}
+
+__global__
+void hypreGPUKernel_insert_remaining_weights( hypre_DeviceItem &item,
+                                              HYPRE_Int   start,
+                                              HYPRE_Int   stop,
+                                              HYPRE_Int  *pass_order,
+                                              HYPRE_Int  *Pi_diag_i,
+                                              HYPRE_Int  *Pi_diag_j,
+                                              HYPRE_Real *Pi_diag_data,
+                                              HYPRE_Int  *P_diag_i,
+                                              HYPRE_Int  *P_diag_j,
+                                              HYPRE_Real *P_diag_data,
+                                              HYPRE_Int  *Pi_offd_i,
+                                              HYPRE_Int  *Pi_offd_j,
+                                              HYPRE_Real *Pi_offd_data,
+                                              HYPRE_Int  *P_offd_i,
+                                              HYPRE_Int  *P_offd_j,
+                                              HYPRE_Real *P_offd_data )
+{
+   HYPRE_Int row_i = hypre_gpu_get_grid_warp_id<1, 1>(item);
+
+   if (row_i >= stop - start)
+   {
+      return;
+   }
+
+   HYPRE_Int i1 = read_only_load(&pass_order[row_i + start]);
+   HYPRE_Int lane = hypre_gpu_get_lane_id<1>(item);
+   HYPRE_Int p = 0;
+   HYPRE_Int q = 0;
+   HYPRE_Int i2;
+
+   // P_diag
+   if (lane < 2)
+   {
+      p = read_only_load(P_diag_i + i1 + lane);
+   }
+   q = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 1);
+   p = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 0);
+
+   i2 = read_only_load(&Pi_diag_i[row_i]) - p;
+   for (HYPRE_Int j = p + lane; j < q; j += HYPRE_WARP_SIZE)
+   {
+      P_diag_j[j] = Pi_diag_j[j + i2];
+      P_diag_data[j] = Pi_diag_data[j + i2];
+   }
+
+   // P_offd
+   if (lane < 2)
+   {
+      p = read_only_load(P_offd_i + i1 + lane);
+   }
+   q = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 1);
+   p = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 0);
+
+   i2 = read_only_load(&Pi_offd_i[row_i]) - p;
+   for (HYPRE_Int j = p + lane; j < q; j += HYPRE_WARP_SIZE)
+   {
+      P_offd_j[j] = Pi_offd_j[j + i2];
+      P_offd_data[j] = Pi_offd_data[j + i2];
+   }
+}
+
+
+__global__
+void hypreGPUKernel_generate_Qdiag_j_Qoffd_j( hypre_DeviceItem    &item,
+                                              HYPRE_Int      num_points,
+                                              HYPRE_Int      color,
+                                              HYPRE_Int     *pass_order,
+                                              HYPRE_Int     *pass_marker,
+                                              HYPRE_Int     *pass_marker_offd,
+                                              HYPRE_Int     *fine_to_coarse,
+                                              HYPRE_Int     *fine_to_coarse_offd,
+                                              HYPRE_Int     *A_diag_i,
+                                              HYPRE_Int     *A_diag_j,
+                                              HYPRE_Complex *A_diag_data,
+                                              HYPRE_Int     *A_offd_i,
+                                              HYPRE_Int     *A_offd_j,
+                                              HYPRE_Complex *A_offd_data,
+                                              HYPRE_Int     *Soc_diag_j,
+                                              HYPRE_Int     *Soc_offd_j,
+                                              HYPRE_Int     *Q_diag_i,
+                                              HYPRE_Int     *Q_offd_i,
+                                              HYPRE_Int     *Q_diag_j,
+                                              HYPRE_Complex *Q_diag_data,
+                                              HYPRE_Int     *Q_offd_j,
+                                              HYPRE_Complex *Q_offd_data,
+                                              HYPRE_Complex *w_row_sum,
+                                              HYPRE_Int      num_functions,
+                                              HYPRE_Int     *dof_func,
+                                              HYPRE_Int     *dof_func_offd )
+{
+   HYPRE_Int row_i = hypre_gpu_get_grid_warp_id<1, 1>(item);
+
+   if (row_i >= num_points)
+   {
+      return;
+   }
+
+   HYPRE_Int i1 = read_only_load(&pass_order[row_i]);
+   HYPRE_Int lane = hypre_gpu_get_lane_id<1>(item);
+   HYPRE_Int p_diag_A = 0, q_diag_A, p_diag_P = 0;
+#ifdef HYPRE_DEBUG
+   HYPRE_Int q_diag_P;
+#endif
+   HYPRE_Int k;
+   HYPRE_Complex w_row_sum_i = 0.0;
+   HYPRE_Int dof_func_i1 = -1;
+
+   if (num_functions > 1)
+   {
+      if (lane == 0)
+      {
+         dof_func_i1 = read_only_load(&dof_func[i1]);
+      }
+      dof_func_i1 = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, dof_func_i1, 0);
+   }
+
+   // S_diag
+#ifdef HYPRE_DEBUG
+   if (lane < 2)
+   {
+      p_diag_A = read_only_load(A_diag_i + i1 + lane);
+      p_diag_P = read_only_load(Q_diag_i + row_i + lane);
+   }
+   q_diag_A = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_diag_A, 1);
+   p_diag_A = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_diag_A, 0);
+   q_diag_P = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_diag_P, 1);
+   p_diag_P = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_diag_P, 0);
+#else
+   if (lane < 2)
+   {
+      p_diag_A = read_only_load(A_diag_i + i1 + lane);
+   }
+   q_diag_A = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_diag_A, 1);
+   p_diag_A = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_diag_A, 0);
+   if (lane == 0)
+   {
+      p_diag_P = read_only_load(Q_diag_i + row_i);
+   }
+   p_diag_P = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_diag_P, 0);
+#endif
+
+   k = p_diag_P;
+   for (HYPRE_Int j = p_diag_A + lane; warp_any_sync(item, HYPRE_WARP_FULL_MASK, j < q_diag_A);
+        j += HYPRE_WARP_SIZE)
+   {
+      HYPRE_Int equal = 0;
+      HYPRE_Int sum = 0;
+      HYPRE_Int j1 = -1;
+
+      if ( j < q_diag_A )
+      {
+         j1 = read_only_load(&Soc_diag_j[j]);
+         equal = j1 > -1 && read_only_load(&pass_marker[j1]) == color;
+      }
+
+      HYPRE_Int pos = warp_prefix_sum(item, lane, equal, sum);
+
+      if (equal)
+      {
+         Q_diag_j[k + pos] = read_only_load(&fine_to_coarse[j1]);
+         Q_diag_data[k + pos] = read_only_load(&A_diag_data[j]);
+      }
+      else if (j < q_diag_A && j1 != -2)
+      {
+         if (num_functions > 1)
+         {
+            const HYPRE_Int col = read_only_load(&A_diag_j[j]);
+            if ( dof_func_i1 == read_only_load(&dof_func[col]) )
+            {
+               w_row_sum_i += read_only_load(&A_diag_data[j]);
+            }
+         }
+         else
+         {
+            w_row_sum_i += read_only_load(&A_diag_data[j]);
+         }
+      }
+
+      k += sum;
+   }
+
+#ifdef HYPRE_DEBUG
+   hypre_device_assert(k == q_diag_P);
+#endif
+
+   // S_offd
+   HYPRE_Int p_offd_A = 0, q_offd_A, p_offd_P = 0;
+#ifdef HYPRE_DEBUG
+   HYPRE_Int q_offd_P;
+#endif
+
+#ifdef HYPRE_DEBUG
+   if (lane < 2)
+   {
+      p_offd_A = read_only_load(A_offd_i + i1 + lane);
+      p_offd_P = read_only_load(Q_offd_i + row_i + lane);
+   }
+   q_offd_A = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_offd_A, 1);
+   p_offd_A = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_offd_A, 0);
+   q_offd_P = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_offd_P, 1);
+   p_offd_P = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_offd_P, 0);
+#else
+   if (lane < 2)
+   {
+      p_offd_A = read_only_load(A_offd_i + i1 + lane);
+   }
+   q_offd_A = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_offd_A, 1);
+   p_offd_A = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_offd_A, 0);
+   if (lane == 0)
+   {
+      p_offd_P = read_only_load(Q_offd_i + row_i);
+   }
+   p_offd_P = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_offd_P, 0);
+#endif
+
+   k = p_offd_P;
+   for (HYPRE_Int j = p_offd_A + lane; warp_any_sync(item, HYPRE_WARP_FULL_MASK, j < q_offd_A);
+        j += HYPRE_WARP_SIZE)
+   {
+      HYPRE_Int equal = 0;
+      HYPRE_Int sum = 0;
+      HYPRE_Int j1 = -1;
+
+      if ( j < q_offd_A )
+      {
+         j1 = read_only_load(&Soc_offd_j[j]);
+         equal = j1 > -1 && read_only_load(&pass_marker_offd[j1]) == color;
+      }
+
+      HYPRE_Int pos = warp_prefix_sum(item, lane, equal, sum);
+
+      if (equal)
+      {
+         Q_offd_j[k + pos] = read_only_load(&fine_to_coarse_offd[j1]);
+         Q_offd_data[k + pos] = read_only_load(&A_offd_data[j]);
+      }
+      else if (j < q_offd_A)
+      {
+         if (num_functions > 1)
+         {
+            const HYPRE_Int col = read_only_load(&A_offd_j[j]);
+            if ( dof_func_i1 == read_only_load(&dof_func_offd[col]) )
+            {
+               w_row_sum_i += read_only_load(&A_offd_data[j]);
+            }
+         }
+         else
+         {
+            w_row_sum_i += read_only_load(&A_offd_data[j]);
+         }
+      }
+
+      k += sum;
+   }
+
+#ifdef HYPRE_DEBUG
+   hypre_device_assert(k == q_offd_P);
+#endif
+
+   w_row_sum_i = warp_reduce_sum(item, w_row_sum_i);
+
+   if (lane == 0)
+   {
+      w_row_sum[row_i] = w_row_sum_i;
+   }
+}
+
+__global__
+void hypreGPUKernel_pass_order_count( hypre_DeviceItem &item,
+                                      HYPRE_Int  num_points,
+                                      HYPRE_Int  color,
+                                      HYPRE_Int *points_left,
+                                      HYPRE_Int *pass_marker,
+                                      HYPRE_Int *pass_marker_offd,
+                                      HYPRE_Int *S_diag_i,
+                                      HYPRE_Int *S_diag_j,
+                                      HYPRE_Int *S_offd_i,
+                                      HYPRE_Int *S_offd_j,
+                                      HYPRE_Int *diag_shifts )
+{
+   HYPRE_Int row_i = hypre_gpu_get_grid_warp_id<1, 1>(item);
+
+   if (row_i >= num_points)
+   {
+      return;
+   }
+
+   HYPRE_Int i1 = read_only_load(&points_left[row_i]);
+   HYPRE_Int lane = hypre_gpu_get_lane_id<1>(item);
+   HYPRE_Int p = 0;
+   HYPRE_Int q = 0;
+   hypre_int brk = 0;
+
+   // S_diag
+   if (lane < 2)
+   {
+      p = read_only_load(S_diag_i + i1 + lane);
+   }
+   q = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 1);
+   p = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 0);
+
+   for (HYPRE_Int j = p + lane; warp_any_sync(item, HYPRE_WARP_FULL_MASK, j < q); j += HYPRE_WARP_SIZE)
+   {
+      if (j < q)
+      {
+         HYPRE_Int j1 = read_only_load(&S_diag_j[j]);
+         if ( read_only_load(&pass_marker[j1]) == color )
+         {
+            brk = 1;
+         }
+      }
+
+      brk = warp_any_sync(item, HYPRE_WARP_FULL_MASK, brk);
+
+      if (brk)
+      {
+         break;
+      }
+   }
+
+   if (brk)
+   {
+      // Only one thread can increment because of the break
+      // so we just need to increment by 1
+      if (lane == 0)
+      {
+         diag_shifts[row_i] = 1;
+      }
+
+      return;
+   }
+
+   // S_offd
+   if (lane < 2)
+   {
+      p = read_only_load(S_offd_i + i1 + lane);
+   }
+   q = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 1);
+   p = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 0);
+
+   for (HYPRE_Int j = p + lane; warp_any_sync(item, HYPRE_WARP_FULL_MASK, j < q); j += HYPRE_WARP_SIZE)
+   {
+      if (j < q)
+      {
+         HYPRE_Int j1 = read_only_load(&S_offd_j[j]);
+         if ( read_only_load(&pass_marker_offd[j1]) == color )
+         {
+            brk = 1;
+         }
+      }
+
+      brk = warp_any_sync(item, HYPRE_WARP_FULL_MASK, brk);
+
+      if (brk)
+      {
+         break;
+      }
+   }
+
+   // Only one thread can increment because of the break
+   // so we just need to increment by 1
+   if (lane == 0)
+   {
+      diag_shifts[row_i] = (brk != 0);
+   }
+}
+
+__global__
+void hypreGPUKernel_populate_big_P_offd_j( hypre_DeviceItem   &item,
+                                           HYPRE_Int     start,
+                                           HYPRE_Int     stop,
+                                           HYPRE_Int    *pass_order,
+                                           HYPRE_Int    *P_offd_i,
+                                           HYPRE_Int    *P_offd_j,
+                                           HYPRE_BigInt *col_map_offd_Pi,
+                                           HYPRE_BigInt *big_P_offd_j )
+{
+   HYPRE_Int i = hypre_gpu_get_grid_warp_id<1, 1>(item) + start;
+
+   if (i >= stop)
+   {
+      return;
+   }
+
+   HYPRE_Int lane = hypre_gpu_get_lane_id<1>(item);
+   HYPRE_Int i1 = read_only_load(&pass_order[i]);
+   HYPRE_Int p = 0;
+   HYPRE_Int q = 0;
+
+   if (lane < 2)
+   {
+      p = read_only_load(P_offd_i + i1 + lane);
+   }
+   q = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 1);
+   p = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 0);
+
+   for (HYPRE_Int j = p + lane; j < q; j += HYPRE_WARP_SIZE)
+   {
+      HYPRE_Int col = read_only_load(&P_offd_j[j]);
+      big_P_offd_j[j] = read_only_load(&col_map_offd_Pi[col]);
+   }
+}
+
+#endif // defined(HYPRE_USING_GPU)
diff --git a/external/hypre/src/parcsr_ls/par_multi_interp.c b/external/hypre/src/parcsr_ls/par_multi_interp.c
index bfc8ab9a..2bb118d5 100644
--- a/external/hypre/src/parcsr_ls/par_multi_interp.c
+++ b/external/hypre/src/parcsr_ls/par_multi_interp.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -13,18 +13,20 @@
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
-                               HYPRE_Int           *CF_marker,
-                               hypre_ParCSRMatrix  *S,
-                               HYPRE_BigInt        *num_cpts_global,
-                               HYPRE_Int            num_functions,
-                               HYPRE_Int           *dof_func,
-                               HYPRE_Int            debug_flag,
-                               HYPRE_Real           trunc_factor,
-                               HYPRE_Int            P_max_elmts,
-                               HYPRE_Int            weight_option,
-                               hypre_ParCSRMatrix **P_ptr )
+hypre_BoomerAMGBuildMultipassHost( hypre_ParCSRMatrix  *A,
+                                   HYPRE_Int           *CF_marker,
+                                   hypre_ParCSRMatrix  *S,
+                                   HYPRE_BigInt        *num_cpts_global,
+                                   HYPRE_Int            num_functions,
+                                   HYPRE_Int           *dof_func,
+                                   HYPRE_Int            debug_flag,
+                                   HYPRE_Real           trunc_factor,
+                                   HYPRE_Int            P_max_elmts,
+                                   HYPRE_Int            weight_option,
+                                   hypre_ParCSRMatrix **P_ptr )
 {
+   HYPRE_UNUSED_VAR(debug_flag);
+
 #ifdef HYPRE_PROFILE
    hypre_profile_times[HYPRE_TIMER_ID_MULTIPASS_INTERP] -= hypre_MPI_Wtime();
 #endif
@@ -32,7 +34,9 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
    MPI_Comm                comm = hypre_ParCSRMatrixComm(A);
    hypre_ParCSRCommPkg    *comm_pkg = hypre_ParCSRMatrixCommPkg(S);
    hypre_ParCSRCommHandle *comm_handle;
-   hypre_ParCSRCommPkg    *tmp_comm_pkg;
+   hypre_ParCSRCommPkg    *tmp_comm_pkg = NULL;
+
+   HYPRE_MemoryLocation memory_location_P = hypre_ParCSRMatrixMemoryLocation(A);
 
    hypre_CSRMatrix *A_diag = hypre_ParCSRMatrixDiag(A);
    HYPRE_Real      *A_diag_data = hypre_CSRMatrixData(A_diag);
@@ -74,12 +78,12 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
    HYPRE_Int        num_sends = 0;
    HYPRE_Int       *int_buf_data = NULL;
    HYPRE_BigInt    *big_buf_data = NULL;
-   HYPRE_Int       *send_map_start;
-   HYPRE_Int       *send_map_elmt;
-   HYPRE_Int       *send_procs;
+   HYPRE_Int       *send_map_start = NULL;
+   HYPRE_Int       *send_map_elmt = NULL;
+   HYPRE_Int       *send_procs = NULL;
    HYPRE_Int        num_recvs = 0;
-   HYPRE_Int       *recv_vec_start;
-   HYPRE_Int       *recv_procs;
+   HYPRE_Int       *recv_vec_start = NULL;
+   HYPRE_Int       *recv_procs = NULL;
    HYPRE_Int       *new_recv_vec_start = NULL;
    HYPRE_Int      **Pext_send_map_start = NULL;
    HYPRE_Int      **Pext_recv_vec_start = NULL;
@@ -128,7 +132,6 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
    HYPRE_Int        n_coarse = 0;
    HYPRE_Int        n_coarse_offd = 0;
    HYPRE_Int        n_SF = 0;
-   HYPRE_Int        n_SF_offd = 0;
 
    HYPRE_Int       *fine_to_coarse = NULL;
    HYPRE_BigInt    *fine_to_coarse_offd = NULL;
@@ -148,9 +151,9 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
    HYPRE_Int        j_start;
    HYPRE_Int        j_end;
 
-   HYPRE_Int        i,i1;
-   HYPRE_Int        j,j1;
-   HYPRE_Int        k,k1,k2,k3;
+   HYPRE_Int        i, i1;
+   HYPRE_Int        j, j1;
+   HYPRE_Int        k, k1, k2, k3;
    HYPRE_BigInt     big_k1;
    HYPRE_Int        pass_array_size;
    HYPRE_BigInt     global_pass_array_size;
@@ -190,7 +193,7 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
    max_num_threads[0] = hypre_NumThreads();
    cnt_nz_per_thread = hypre_CTAlloc(HYPRE_Int,  max_num_threads[0], HYPRE_MEMORY_HOST);
    cnt_nz_offd_per_thread = hypre_CTAlloc(HYPRE_Int,  max_num_threads[0], HYPRE_MEMORY_HOST);
-   for(i=0; i < max_num_threads[0]; i++)
+   for (i = 0; i < max_num_threads[0]; i++)
    {
       cnt_nz_offd_per_thread[i] = 0;
       cnt_nz_per_thread[i] = 0;
@@ -201,13 +204,13 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
     *  Access the CSR vectors for A and S. Also get size of fine grid.
     *-----------------------------------------------------------------------*/
 
-   hypre_MPI_Comm_size(comm,&num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_size(comm, &num_procs);
+   hypre_MPI_Comm_rank(comm, &my_id);
 
    my_first_cpt = num_cpts_global[0];
    /*   total_global_cpts = 0; */
-   if (my_id == (num_procs -1)) total_global_cpts = num_cpts_global[1];
-   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
+   if (my_id == (num_procs - 1)) { total_global_cpts = num_cpts_global[1]; }
+   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
 
    if (!comm_pkg)
    {
@@ -230,7 +233,9 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
    }
 
    if (num_cols_offd)
+   {
       S_offd_j    = hypre_CSRMatrixJ(S_offd);
+   }
 
    n_fine = hypre_CSRMatrixNumRows(A_diag);
 
@@ -238,29 +243,37 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
     *  Intialize counters and allocate mapping vector.
     *-----------------------------------------------------------------------*/
 
-   if (n_fine) fine_to_coarse = hypre_CTAlloc(HYPRE_Int,  n_fine, HYPRE_MEMORY_HOST);
+   fine_to_coarse = hypre_CTAlloc(HYPRE_Int, n_fine, HYPRE_MEMORY_HOST);
 
    n_coarse = 0;
    n_SF = 0;
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) reduction(+:n_coarse,n_SF ) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i) reduction(+:n_coarse,n_SF) HYPRE_SMP_SCHEDULE
 #endif
-   for (i=0; i < n_fine; i++)
-      if (CF_marker[i] == 1) n_coarse++;
-      else if (CF_marker[i] == -3) n_SF++;
-
-   pass_array_size = n_fine-n_coarse-n_SF;
-   if (pass_array_size) pass_array = hypre_CTAlloc(HYPRE_Int,  pass_array_size, HYPRE_MEMORY_HOST);
-   pass_pointer = hypre_CTAlloc(HYPRE_Int,  max_num_passes+1, HYPRE_MEMORY_HOST);
-   if (n_fine) assigned = hypre_CTAlloc(HYPRE_Int,  n_fine, HYPRE_MEMORY_HOST);
-   P_diag_i = hypre_CTAlloc(HYPRE_Int, n_fine+1, HYPRE_MEMORY_DEVICE);
-   P_offd_i = hypre_CTAlloc(HYPRE_Int, n_fine+1, HYPRE_MEMORY_DEVICE);
-   if (n_coarse) C_array = hypre_CTAlloc(HYPRE_Int,  n_coarse, HYPRE_MEMORY_HOST);
+   for (i = 0; i < n_fine; i++)
+   {
+      if (CF_marker[i] == 1)
+      {
+         n_coarse++;
+      }
+      else if (CF_marker[i] == -3)
+      {
+         n_SF++;
+      }
+   }
+
+   pass_array_size = n_fine - n_coarse - n_SF;
+   pass_array = hypre_CTAlloc(HYPRE_Int,  pass_array_size, HYPRE_MEMORY_HOST);
+   pass_pointer = hypre_CTAlloc(HYPRE_Int,  max_num_passes + 1, HYPRE_MEMORY_HOST);
+   assigned = hypre_CTAlloc(HYPRE_Int,  n_fine, HYPRE_MEMORY_HOST);
+   P_diag_i = hypre_CTAlloc(HYPRE_Int, n_fine + 1, memory_location_P);
+   P_offd_i = hypre_CTAlloc(HYPRE_Int, n_fine + 1, memory_location_P);
+   C_array = hypre_CTAlloc(HYPRE_Int,  n_coarse, HYPRE_MEMORY_HOST);
 
    if (num_cols_offd)
    {
       CF_marker_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_offd, HYPRE_MEMORY_HOST);
-      if (num_functions > 1) dof_func_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_offd, HYPRE_MEMORY_HOST);
+      if (num_functions > 1) { dof_func_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_offd, HYPRE_MEMORY_HOST); }
    }
 
    if (num_procs > 1)
@@ -274,18 +287,19 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
       recv_vec_start = hypre_ParCSRCommPkgRecvVecStarts(comm_pkg);
       if (send_map_start[num_sends])
       {
-         int_buf_data = hypre_CTAlloc(HYPRE_Int,  send_map_start[num_sends], HYPRE_MEMORY_HOST);
-         big_buf_data = hypre_CTAlloc(HYPRE_BigInt,  send_map_start[num_sends], HYPRE_MEMORY_HOST);
+         int_buf_data = hypre_CTAlloc(HYPRE_Int, send_map_start[num_sends], HYPRE_MEMORY_HOST);
+         big_buf_data = hypre_CTAlloc(HYPRE_BigInt, send_map_start[num_sends], HYPRE_MEMORY_HOST);
       }
    }
 
-
    index = 0;
-   for (i=0; i < num_sends; i++)
+   for (i = 0; i < num_sends; i++)
    {
       start = send_map_start[i];
-      for (j = start; j < send_map_start[i+1]; j++)
+      for (j = start; j < send_map_start[i + 1]; j++)
+      {
          int_buf_data[index++] = CF_marker[send_map_elmt[j]];
+      }
    }
    if (num_procs > 1)
    {
@@ -297,11 +311,13 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
    if (num_functions > 1)
    {
       index = 0;
-      for (i=0; i < num_sends; i++)
+      for (i = 0; i < num_sends; i++)
       {
          start = send_map_start[i];
-         for (j = start; j < send_map_start[i+1]; j++)
+         for (j = start; j < send_map_start[i + 1]; j++)
+         {
             int_buf_data[index++] = dof_func[send_map_elmt[j]];
+         }
       }
       if (num_procs > 1)
       {
@@ -312,13 +328,11 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
    }
 
    n_coarse_offd = 0;
-   n_SF_offd = 0;
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) reduction(+:n_coarse_offd,n_SF_offd) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i) reduction(+:n_coarse_offd) HYPRE_SMP_SCHEDULE
 #endif
-   for (i=0; i < num_cols_offd; i++)
-      if (CF_marker_offd[i] == 1) n_coarse_offd++;
-      else if (CF_marker_offd[i] == -3) n_SF_offd++;
+   for (i = 0; i < num_cols_offd; i++)
+      if (CF_marker_offd[i] == 1) { n_coarse_offd++; }
 
    if (num_cols_offd)
    {
@@ -356,7 +370,7 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
 
 
    cnt = 0;
-   p_cnt = pass_array_size-1;
+   p_cnt = pass_array_size - 1;
    P_diag_i[0] = 0;
    P_offd_i[0] = 0;
    for (i = 0; i < n_fine; i++)
@@ -368,35 +382,37 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
                                      and in column of P */
          C_array[cnt++] = i;
          assigned[i] = 0;
-         P_diag_i[i+1] = 1; /* one element in row i1 of P */
-         P_offd_i[i+1] = 0;
+         P_diag_i[i + 1] = 1; /* one element in row i1 of P */
+         P_offd_i[i + 1] = 0;
       }
       else if (CF_marker[i] == -1)
       {
          pass_array[p_cnt--] = i;
-         P_diag_i[i+1] = 0;
-         P_offd_i[i+1] = 0;
+         P_diag_i[i + 1] = 0;
+         P_offd_i[i + 1] = 0;
          assigned[i] = -1;
          fine_to_coarse[i] = -1;
       }
       else
       {
-         P_diag_i[i+1] = 0;
-         P_offd_i[i+1] = 0;
+         P_diag_i[i + 1] = 0;
+         P_offd_i[i + 1] = 0;
          assigned[i] = -1;
          fine_to_coarse[i] = -1;
       }
    }
 
    index = 0;
-   for (i=0; i < num_sends; i++)
+   for (i = 0; i < num_sends; i++)
    {
       start = send_map_start[i];
-      for (j = start; j < send_map_start[i+1]; j++)
+      for (j = start; j < send_map_start[i + 1]; j++)
       {
          big_buf_data[index] = (HYPRE_BigInt)fine_to_coarse[send_map_elmt[j]];
          if (big_buf_data[index] > -1)
+         {
             big_buf_data[index] += my_first_cpt;
+         }
          index++;
       }
    }
@@ -407,16 +423,18 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
       hypre_ParCSRCommHandleDestroy(comm_handle);
    }
 
-   new_recv_vec_start = hypre_CTAlloc(HYPRE_Int, num_recvs+1, HYPRE_MEMORY_HOST);
+   new_recv_vec_start = hypre_CTAlloc(HYPRE_Int, num_recvs + 1, HYPRE_MEMORY_HOST);
 
    if (n_coarse_offd)
+   {
       C_array_offd = hypre_CTAlloc(HYPRE_Int, n_coarse_offd, HYPRE_MEMORY_HOST);
+   }
 
    cnt = 0;
    new_recv_vec_start[0] = 0;
    for (j = 0; j < num_recvs; j++)
    {
-      for (i = recv_vec_start[j]; i < recv_vec_start[j+1]; i++)
+      for (i = recv_vec_start[j]; i < recv_vec_start[j + 1]; i++)
       {
          if (CF_marker_offd[i] == 1)
          {
@@ -431,7 +449,7 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
             map_S_to_new[i] = -1;
          }
       }
-      new_recv_vec_start[j+1] = cnt;
+      new_recv_vec_start[j + 1] = cnt;
    }
 
    cnt = 0;
@@ -450,25 +468,25 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
    cnt_offd = 0;
    cnt_nz = 0;
    cnt_nz_offd = 0;
-   for (i = pass_array_size-1; i > cnt-1; i--)
+   for (i = pass_array_size - 1; i > cnt - 1; i--)
    {
       i1 = pass_array[i];
-      for (j=S_diag_i[i1]; j < S_diag_i[i1+1]; j++)
+      for (j = S_diag_i[i1]; j < S_diag_i[i1 + 1]; j++)
       {
          j1 = S_diag_j[j];
          if (CF_marker[j1] == 1)
          {
-            P_diag_i[i1+1]++;
+            P_diag_i[i1 + 1]++;
             cnt_nz++;
             assigned[i1] = 1;
          }
       }
-      for (j=S_offd_i[i1]; j < S_offd_i[i1+1]; j++)
+      for (j = S_offd_i[i1]; j < S_offd_i[i1 + 1]; j++)
       {
          j1 = S_offd_j[j];
          if (CF_marker_offd[j1] == 1)
          {
-            P_offd_i[i1+1]++;
+            P_offd_i[i1 + 1]++;
             cnt_nz_offd++;
             assigned[i1] = 1;
          }
@@ -488,10 +506,10 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
     *-----------------------------------------------------------------------*/
 
    index = 0;
-   for (i=0; i < num_sends; i++)
+   for (i = 0; i < num_sends; i++)
    {
       start = send_map_start[i];
-      for (j = start; j < send_map_start[i+1]; j++)
+      for (j = start; j < send_map_start[i + 1]; j++)
       {    int_buf_data[index++] = assigned[send_map_elmt[j]]; }
    }
    if (num_procs > 1)
@@ -512,14 +530,14 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
                        hypre_MPI_SUM, comm);
    while (global_pass_array_size && pass < max_num_passes)
    {
-      for (i = pass_array_size-1; i > cnt-1; i--)
+      for (i = pass_array_size - 1; i > cnt - 1; i--)
       {
          i1 = pass_array[i];
          no_break = 1;
-         for (j=S_diag_i[i1]; j < S_diag_i[i1+1]; j++)
+         for (j = S_diag_i[i1]; j < S_diag_i[i1 + 1]; j++)
          {
             j1 = S_diag_j[j];
-            if (assigned[j1] == pass-1)
+            if (assigned[j1] == pass - 1)
             {
                pass_array[i++] = pass_array[cnt];
                pass_array[cnt++] = i1;
@@ -530,10 +548,10 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
          }
          if (no_break)
          {
-            for (j=S_offd_i[i1]; j < S_offd_i[i1+1]; j++)
+            for (j = S_offd_i[i1]; j < S_offd_i[i1 + 1]; j++)
             {
                j1 = S_offd_j[j];
-               if (assigned_offd[j1] == pass-1)
+               if (assigned_offd[j1] == pass - 1)
                {
                   pass_array[i++] = pass_array[cnt];
                   pass_array[cnt++] = i1;
@@ -552,10 +570,10 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
       hypre_MPI_Allreduce(&local_pass_array_size, &global_pass_array_size, 1, HYPRE_MPI_BIG_INT,
                           hypre_MPI_SUM, comm);
       index = 0;
-      for (i=0; i < num_sends; i++)
+      for (i = 0; i < num_sends; i++)
       {
          start = send_map_start[i];
-         for (j = start; j < send_map_start[i+1]; j++)
+         for (j = start; j < send_map_start[i + 1]; j++)
          {   int_buf_data[index++] = assigned[send_map_elmt[j]]; }
       }
       if (num_procs > 1)
@@ -571,7 +589,8 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
 
    num_passes = pass;
 
-   P_diag_pass = hypre_CTAlloc(HYPRE_Int*, num_passes, HYPRE_MEMORY_HOST); /* P_diag_pass[i] will contain
+   P_diag_pass = hypre_CTAlloc(HYPRE_Int*, num_passes,
+                               HYPRE_MEMORY_HOST); /* P_diag_pass[i] will contain
                                                                               all column numbers for points of pass i */
 
    P_diag_pass[1] = hypre_CTAlloc(HYPRE_Int, cnt_nz, HYPRE_MEMORY_HOST);
@@ -587,13 +606,17 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
       P_offd_pass = hypre_CTAlloc(HYPRE_Int*, num_passes, HYPRE_MEMORY_HOST);
 
       if (cnt_nz_offd)
+      {
          P_offd_pass[1] = hypre_CTAlloc(HYPRE_Int, cnt_nz_offd, HYPRE_MEMORY_HOST);
+      }
       else
+      {
          P_offd_pass[1] = NULL;
+      }
 
       new_elmts = hypre_CTAlloc(HYPRE_BigInt*, num_passes, HYPRE_MEMORY_HOST);
 
-      new_counter = hypre_CTAlloc(HYPRE_Int,  num_passes+1, HYPRE_MEMORY_HOST);
+      new_counter = hypre_CTAlloc(HYPRE_Int,  num_passes + 1, HYPRE_MEMORY_HOST);
 
       new_counter[0] = 0;
       new_counter[1] = n_coarse_offd;
@@ -609,18 +632,18 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
    cnt_nz = 0;
    cnt_nz_offd = 0;
    /* JBS: Possible candidate for threading */
-   for (i=pass_pointer[1]; i < pass_pointer[2]; i++)
+   for (i = pass_pointer[1]; i < pass_pointer[2]; i++)
    {
       i1 = pass_array[i];
       P_diag_start[i1] = cnt_nz;
       P_offd_start[i1] = cnt_nz_offd;
-      for (j=S_diag_i[i1]; j < S_diag_i[i1+1]; j++)
+      for (j = S_diag_i[i1]; j < S_diag_i[i1 + 1]; j++)
       {
          j1 = S_diag_j[j];
          if (CF_marker[j1] == 1)
          {   P_diag_pass[1][cnt_nz++] = fine_to_coarse[j1]; }
       }
-      for (j=S_offd_i[i1]; j < S_offd_i[i1+1]; j++)
+      for (j = S_offd_i[i1]; j < S_offd_i[i1 + 1]; j++)
       {
          j1 = S_offd_j[j];
          if (CF_marker_offd[j1] == 1)
@@ -634,53 +657,54 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
 
    if (num_procs > 1)
    {
-      tmp_comm_pkg = hypre_CTAlloc(hypre_ParCSRCommPkg, 1, HYPRE_MEMORY_HOST);
       Pext_send_map_start = hypre_CTAlloc(HYPRE_Int*, num_passes, HYPRE_MEMORY_HOST);
       Pext_recv_vec_start = hypre_CTAlloc(HYPRE_Int*, num_passes, HYPRE_MEMORY_HOST);
       Pext_pass = hypre_CTAlloc(HYPRE_Int*, num_passes, HYPRE_MEMORY_HOST);
-      Pext_i = hypre_CTAlloc(HYPRE_Int,  num_cols_offd+1, HYPRE_MEMORY_HOST);
-      if (num_cols_offd) Pext_start = hypre_CTAlloc(HYPRE_Int,  num_cols_offd, HYPRE_MEMORY_HOST);
+      Pext_i = hypre_CTAlloc(HYPRE_Int,  num_cols_offd + 1, HYPRE_MEMORY_HOST);
+      if (num_cols_offd) { Pext_start = hypre_CTAlloc(HYPRE_Int,  num_cols_offd, HYPRE_MEMORY_HOST); }
       if (send_map_start[num_sends])
+      {
          P_ncols = hypre_CTAlloc(HYPRE_Int, send_map_start[num_sends], HYPRE_MEMORY_HOST);
+      }
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-      for (i=0; i < num_cols_offd+1; i++)
+      for (i = 0; i < num_cols_offd + 1; i++)
       {   Pext_i[i] = 0; }
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-      for (i=0; i < send_map_start[num_sends]; i++)
+      for (i = 0; i < send_map_start[num_sends]; i++)
       {   P_ncols[i] = 0; }
    }
 
    old_Pext_send_size = 0;
    old_Pext_recv_size = 0;
-   for (pass=2; pass < num_passes; pass++)
+   for (pass = 2; pass < num_passes; pass++)
    {
 
       if (num_procs > 1)
       {
-         Pext_send_map_start[pass] = hypre_CTAlloc(HYPRE_Int,  num_sends+1, HYPRE_MEMORY_HOST);
-         Pext_recv_vec_start[pass] = hypre_CTAlloc(HYPRE_Int,  num_recvs+1, HYPRE_MEMORY_HOST);
+         Pext_send_map_start[pass] = hypre_CTAlloc(HYPRE_Int,  num_sends + 1, HYPRE_MEMORY_HOST);
+         Pext_recv_vec_start[pass] = hypre_CTAlloc(HYPRE_Int,  num_recvs + 1, HYPRE_MEMORY_HOST);
          Pext_send_size = 0;
          Pext_send_map_start[pass][0] = 0;
 
-         for (i=0; i < num_sends; i++)
+         for (i = 0; i < num_sends; i++)
          {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(j,j1) reduction(+:Pext_send_size) HYPRE_SMP_SCHEDULE
+            #pragma omp parallel for private(j,j1) reduction(+:Pext_send_size) HYPRE_SMP_SCHEDULE
 #endif
-            for (j=send_map_start[i]; j < send_map_start[i+1]; j++)
+            for (j = send_map_start[i]; j < send_map_start[i + 1]; j++)
             {
                j1 = send_map_elmt[j];
-               if (assigned[j1] == pass-1)
+               if (assigned[j1] == pass - 1)
                {
-                  P_ncols[j] = P_diag_i[j1+1] + P_offd_i[j1+1];
+                  P_ncols[j] = P_diag_i[j1 + 1] + P_offd_i[j1 + 1];
                   Pext_send_size += P_ncols[j];
                }
             }
-            Pext_send_map_start[pass][i+1] = Pext_send_size;
+            Pext_send_map_start[pass][i + 1] = Pext_send_size;
          }
 
          comm_handle = hypre_ParCSRCommHandleCreate (11, comm_pkg,
@@ -696,31 +720,31 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
       }
 
       cnt_offd = 0;
-      for (i=0; i < num_sends; i++)
+      for (i = 0; i < num_sends; i++)
       {
-         for (j=send_map_start[i]; j < send_map_start[i+1]; j++)
+         for (j = send_map_start[i]; j < send_map_start[i + 1]; j++)
          {
             j1 = send_map_elmt[j];
-            if (assigned[j1] == pass-1)
+            if (assigned[j1] == pass - 1)
             {
                j_start = P_diag_start[j1];
-               j_end = j_start+P_diag_i[j1+1];
-               for (k=j_start; k < j_end; k++)
+               j_end = j_start + P_diag_i[j1 + 1];
+               for (k = j_start; k < j_end; k++)
                {
                   Pext_send_buffer[cnt_offd++] = my_first_cpt
-                     + (HYPRE_BigInt) P_diag_pass[pass-1][k];
+                                                 + (HYPRE_BigInt) P_diag_pass[pass - 1][k];
                }
                j_start = P_offd_start[j1];
-               j_end = j_start+P_offd_i[j1+1];
-               for (k=j_start; k < j_end; k++)
+               j_end = j_start + P_offd_i[j1 + 1];
+               for (k = j_start; k < j_end; k++)
                {
-                  k1 = P_offd_pass[pass-1][k];
+                  k1 = P_offd_pass[pass - 1][k];
                   k3 = 0;
-                  while (k3 < pass-1)
+                  while (k3 < pass - 1)
                   {
-                     if (k1 < new_counter[k3+1])
+                     if (k1 < new_counter[k3 + 1])
                      {
-                        k2 = k1-new_counter[k3];
+                        k2 = k1 - new_counter[k3];
                         Pext_send_buffer[cnt_offd++] = new_elmts[k3][k2];
                         break;
                      }
@@ -736,39 +760,36 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
          Pext_recv_size = 0;
          Pext_recv_vec_start[pass][0] = 0;
          cnt_offd = 0;
-         for (i=0; i < num_recvs; i++)
+         for (i = 0; i < num_recvs; i++)
          {
-            for (j=recv_vec_start[i]; j<recv_vec_start[i+1]; j++)
+            for (j = recv_vec_start[i]; j < recv_vec_start[i + 1]; j++)
             {
-               if (assigned_offd[j] == pass-1)
+               if (assigned_offd[j] == pass - 1)
                {
                   Pext_start[j] = cnt_offd;
-                  cnt_offd += Pext_i[j+1];
+                  cnt_offd += Pext_i[j + 1];
                }
             }
             Pext_recv_size = cnt_offd;
-            Pext_recv_vec_start[pass][i+1] = Pext_recv_size;
+            Pext_recv_vec_start[pass][i + 1] = Pext_recv_size;
          }
 
-         hypre_ParCSRCommPkgComm(tmp_comm_pkg) = comm;
-         hypre_ParCSRCommPkgNumSends(tmp_comm_pkg) = num_sends;
-         hypre_ParCSRCommPkgSendProcs(tmp_comm_pkg) = send_procs;
-         hypre_ParCSRCommPkgSendMapStarts(tmp_comm_pkg) =
-            Pext_send_map_start[pass];
-         hypre_ParCSRCommPkgNumRecvs(tmp_comm_pkg) = num_recvs;
-         hypre_ParCSRCommPkgRecvProcs(tmp_comm_pkg) = recv_procs;
-         hypre_ParCSRCommPkgRecvVecStarts(tmp_comm_pkg) =
-            Pext_recv_vec_start[pass];
+         /* Create temporary communication package */
+         hypre_ParCSRCommPkgCreateAndFill(comm,
+                                          num_recvs, recv_procs, Pext_recv_vec_start[pass],
+                                          num_sends, send_procs, Pext_send_map_start[pass],
+                                          NULL,
+                                          &tmp_comm_pkg);
 
          if (Pext_recv_size)
          {
             Pext_pass[pass] = hypre_CTAlloc(HYPRE_Int,  Pext_recv_size, HYPRE_MEMORY_HOST);
-            new_elmts[pass-1] = hypre_CTAlloc(HYPRE_BigInt, Pext_recv_size, HYPRE_MEMORY_HOST);
+            new_elmts[pass - 1] = hypre_CTAlloc(HYPRE_BigInt, Pext_recv_size, HYPRE_MEMORY_HOST);
          }
          else
          {
             Pext_pass[pass] = NULL;
-            new_elmts[pass-1] = NULL;
+            new_elmts[pass - 1] = NULL;
          }
 
          if (Pext_recv_size > old_Pext_recv_size)
@@ -788,26 +809,26 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
       cnt_new = 0;
       cnt_offd = 0;
       /* JBS: Possible candidate for threading */
-      for (i=0; i < num_recvs; i++)
+      for (i = 0; i < num_recvs; i++)
       {
-         for (j=recv_vec_start[i]; j < recv_vec_start[i+1]; j++)
+         for (j = recv_vec_start[i]; j < recv_vec_start[i + 1]; j++)
          {
-            if (assigned_offd[j] == pass-1)
+            if (assigned_offd[j] == pass - 1)
             {
-               for (j1 = cnt_offd; j1 < cnt_offd+Pext_i[j+1]; j1++)
+               for (j1 = cnt_offd; j1 < cnt_offd + Pext_i[j + 1]; j1++)
                {
                   big_k1 = big_temp_pass[j1];
                   k2 = (HYPRE_Int)(big_k1 - my_first_cpt);
                   if (k2 > -1 && k2 < n_coarse)
-                  {  Pext_pass[pass][j1] = -k2-1; }
+                  {  Pext_pass[pass][j1] = -k2 - 1; }
                   else
                   {
                      not_found = 1;
                      k3 = 0;
-                     while (k3 < pass-1 && not_found)
+                     while (k3 < pass - 1 && not_found)
                      {
                         k2 = hypre_BigBinarySearch(new_elmts[k3], big_k1,
-                                                (new_counter[k3+1]-new_counter[k3]));
+                                                   (new_counter[k3 + 1] - new_counter[k3]));
                         if (k2 > -1)
                         {
                            Pext_pass[pass][j1] = k2 + new_counter[k3];
@@ -820,43 +841,45 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
                      }
                      if (not_found)
                      {
-                        new_elmts[pass-1][cnt_new] = big_k1;
+                        new_elmts[pass - 1][cnt_new] = big_k1;
                         loc[cnt_new++] = j1;
                      }
                   }
                }
-               cnt_offd += Pext_i[j+1];
+               cnt_offd += Pext_i[j + 1];
             }
          }
       }
 
       if (cnt_new)
       {
-         hypre_BigQsortbi(new_elmts[pass-1],loc,0,cnt_new-1);
+         hypre_BigQsortbi(new_elmts[pass - 1], loc, 0, cnt_new - 1);
          cnt = 0;
-         local_index = new_counter[pass-1];
+         local_index = new_counter[pass - 1];
          Pext_pass[pass][loc[0]] = local_index;
 
-         for (i=1; i < cnt_new; i++)
+         for (i = 1; i < cnt_new; i++)
          {
-            if (new_elmts[pass-1][i] > new_elmts[pass-1][cnt])
+            if (new_elmts[pass - 1][i] > new_elmts[pass - 1][cnt])
             {
-               new_elmts[pass-1][++cnt] = new_elmts[pass-1][i];
+               new_elmts[pass - 1][++cnt] = new_elmts[pass - 1][i];
                local_index++;
             }
             Pext_pass[pass][loc[i]] = local_index;
          }
-         new_counter[pass] = local_index+1;
+         new_counter[pass] = local_index + 1;
       }
       else if (num_procs > 1)
-         new_counter[pass] = new_counter[pass-1];
+      {
+         new_counter[pass] = new_counter[pass - 1];
+      }
 
-      if (new_num_cols_offd < local_index+1)
-      {    new_num_cols_offd = local_index+1; }
+      if (new_num_cols_offd < local_index + 1)
+      {    new_num_cols_offd = local_index + 1; }
 
-      pass_length = pass_pointer[pass+1] - pass_pointer[pass];
+      pass_length = pass_pointer[pass + 1] - pass_pointer[pass];
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel private(i,my_thread_num,num_threads,thread_start,thread_stop,cnt_nz,cnt_nz_offd,i1,j,j1,j_start,j_end,k1,k,P_marker,P_marker_offd)
+      #pragma omp parallel private(i,my_thread_num,num_threads,thread_start,thread_stop,cnt_nz,cnt_nz_offd,i1,j,j1,j_start,j_end,k1,k,P_marker,P_marker_offd)
 #endif
       {
          /* Thread by computing the sparsity structure for this pass only over
@@ -865,13 +888,14 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
           * P_marker, are initialized and de-allocated internally to the
           * parallel region. */
 
+         P_marker_offd = NULL;
          my_thread_num = hypre_GetThreadNum();
          num_threads = hypre_NumActiveThreads();
-         thread_start = (pass_length/num_threads)*my_thread_num;
-         if (my_thread_num == num_threads-1)
+         thread_start = (pass_length / num_threads) * my_thread_num;
+         if (my_thread_num == num_threads - 1)
          {  thread_stop = pass_length; }
          else
-         {  thread_stop = (pass_length/num_threads)*(my_thread_num+1); }
+         {  thread_stop = (pass_length / num_threads) * (my_thread_num + 1); }
          thread_start += pass_pointer[pass];
          thread_stop += pass_pointer[pass];
 
@@ -881,19 +905,20 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
 
          /* This block of code is to go to the top of the parallel region starting before
           * the loop over num_passes. */
-         P_marker = hypre_CTAlloc(HYPRE_Int,  n_coarse, HYPRE_MEMORY_HOST); /* marks points to see if they're counted */
-         for (i=0; i < n_coarse; i++)
+         P_marker = hypre_CTAlloc(HYPRE_Int,  n_coarse,
+                                  HYPRE_MEMORY_HOST); /* marks points to see if they're counted */
+         for (i = 0; i < n_coarse; i++)
          {   P_marker[i] = -1; }
-         if (new_num_cols_offd == local_index+1)
+         if (new_num_cols_offd == local_index + 1)
          {
             P_marker_offd = hypre_CTAlloc(HYPRE_Int, new_num_cols_offd, HYPRE_MEMORY_HOST);
-            for (i=0; i < new_num_cols_offd; i++)
+            for (i = 0; i < new_num_cols_offd; i++)
             {   P_marker_offd[i] = -1; }
          }
          else if (n_coarse_offd)
          {
             P_marker_offd = hypre_CTAlloc(HYPRE_Int,  n_coarse_offd, HYPRE_MEMORY_HOST);
-            for (i=0; i < n_coarse_offd; i++)
+            for (i = 0; i < n_coarse_offd; i++)
             {   P_marker_offd[i] = -1; }
          }
 
@@ -904,66 +929,66 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
           * P_diag_i, P_offd_i: data parallel here, and require no special treatment
           * P_diag_start, P_offd_start: are not data parallel, require special treatment
           */
-         for (i=thread_start; i < thread_stop; i++)
+         for (i = thread_start; i < thread_stop; i++)
          {
             i1 = pass_array[i];
             P_diag_start[i1] = cnt_nz;
             P_offd_start[i1] = cnt_nz_offd;
-            for (j=S_diag_i[i1]; j < S_diag_i[i1+1]; j++)
+            for (j = S_diag_i[i1]; j < S_diag_i[i1 + 1]; j++)
             {
                j1 = S_diag_j[j];
-               if (assigned[j1] == pass-1)
+               if (assigned[j1] == pass - 1)
                {
                   j_start = P_diag_start[j1];
-                  j_end = j_start+P_diag_i[j1+1];
-                  for (k=j_start; k < j_end; k++)
+                  j_end = j_start + P_diag_i[j1 + 1];
+                  for (k = j_start; k < j_end; k++)
                   {
-                     k1 = P_diag_pass[pass-1][k];
+                     k1 = P_diag_pass[pass - 1][k];
                      if (P_marker[k1] != i1)
                      {
                         cnt_nz++;
-                        P_diag_i[i1+1]++;
+                        P_diag_i[i1 + 1]++;
                         P_marker[k1] = i1;
                      }
                   }
                   j_start = P_offd_start[j1];
-                  j_end = j_start+P_offd_i[j1+1];
-                  for (k=j_start; k < j_end; k++)
+                  j_end = j_start + P_offd_i[j1 + 1];
+                  for (k = j_start; k < j_end; k++)
                   {
-                     k1 = P_offd_pass[pass-1][k];
+                     k1 = P_offd_pass[pass - 1][k];
                      if (P_marker_offd[k1] != i1)
                      {
                         cnt_nz_offd++;
-                        P_offd_i[i1+1]++;
+                        P_offd_i[i1 + 1]++;
                         P_marker_offd[k1] = i1;
                      }
                   }
                }
             }
             j_start = 0;
-            for (j=S_offd_i[i1]; j < S_offd_i[i1+1]; j++)
+            for (j = S_offd_i[i1]; j < S_offd_i[i1 + 1]; j++)
             {
                j1 = S_offd_j[j];
-               if (assigned_offd[j1] == pass-1)
+               if (assigned_offd[j1] == pass - 1)
                {
                   j_start = Pext_start[j1];
-                  j_end = j_start+Pext_i[j1+1];
-                  for (k=j_start; k < j_end; k++)
+                  j_end = j_start + Pext_i[j1 + 1];
+                  for (k = j_start; k < j_end; k++)
                   {
                      k1 = Pext_pass[pass][k];
                      if (k1 < 0)
                      {
-                        if (P_marker[-k1-1] != i1)
+                        if (P_marker[-k1 - 1] != i1)
                         {
                            cnt_nz++;
-                           P_diag_i[i1+1]++;
-                           P_marker[-k1-1] = i1;
+                           P_diag_i[i1 + 1]++;
+                           P_marker[-k1 - 1] = i1;
                         }
                      }
                      else if (P_marker_offd[k1] != i1)
                      {
                         cnt_nz_offd++;
-                        P_offd_i[i1+1]++;
+                        P_offd_i[i1 + 1]++;
                         P_marker_offd[k1] = i1;
                      }
                   }
@@ -973,40 +998,40 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
 
          /* Update P_diag_start, P_offd_start with cumulative
           * nonzero counts over all threads */
-         if(my_thread_num == 0)
+         if (my_thread_num == 0)
          {   max_num_threads[0] = num_threads; }
          cnt_nz_offd_per_thread[my_thread_num] = cnt_nz_offd;
          cnt_nz_per_thread[my_thread_num] = cnt_nz;
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+         #pragma omp barrier
 #endif
-         if(my_thread_num == 0)
+         if (my_thread_num == 0)
          {
-            for(i = 1; i < max_num_threads[0]; i++)
+            for (i = 1; i < max_num_threads[0]; i++)
             {
-               cnt_nz_offd_per_thread[i] += cnt_nz_offd_per_thread[i-1];
-               cnt_nz_per_thread[i] += cnt_nz_per_thread[i-1];
+               cnt_nz_offd_per_thread[i] += cnt_nz_offd_per_thread[i - 1];
+               cnt_nz_per_thread[i] += cnt_nz_per_thread[i - 1];
             }
          }
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+         #pragma omp barrier
 #endif
-         if(my_thread_num > 0)
+         if (my_thread_num > 0)
          {
             /* update this thread's section of P_diag_start and P_offd_start
              * with the num of nz's counted by previous threads */
-            for (i=thread_start; i < thread_stop; i++)
+            for (i = thread_start; i < thread_stop; i++)
             {
                i1 = pass_array[i];
-               P_diag_start[i1] += cnt_nz_per_thread[my_thread_num-1];
-               P_offd_start[i1] += cnt_nz_offd_per_thread[my_thread_num-1];
+               P_diag_start[i1] += cnt_nz_per_thread[my_thread_num - 1];
+               P_offd_start[i1] += cnt_nz_offd_per_thread[my_thread_num - 1];
             }
          }
          else /* if my_thread_num == 0 */
          {
             /* Grab the nz count for all threads */
-            cnt_nz = cnt_nz_per_thread[max_num_threads[0]-1];
-            cnt_nz_offd = cnt_nz_offd_per_thread[max_num_threads[0]-1];
+            cnt_nz = cnt_nz_per_thread[max_num_threads[0] - 1];
+            cnt_nz_offd = cnt_nz_offd_per_thread[max_num_threads[0] - 1];
 
             /* Updated total nz count */
             total_nz += cnt_nz;
@@ -1015,20 +1040,24 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
             /* Allocate P_diag_pass and P_offd_pass for all threads */
             P_diag_pass[pass] = hypre_CTAlloc(HYPRE_Int,  cnt_nz, HYPRE_MEMORY_HOST);
             if (cnt_nz_offd)
+            {
                P_offd_pass[pass] = hypre_CTAlloc(HYPRE_Int,  cnt_nz_offd, HYPRE_MEMORY_HOST);
+            }
             else if (num_procs > 1)
+            {
                P_offd_pass[pass] = NULL;
+            }
          }
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+         #pragma omp barrier
 #endif
 
          /* offset cnt_nz and cnt_nz_offd to point to the starting
           * point in P_diag_pass and P_offd_pass for each thread */
-         if(my_thread_num > 0)
+         if (my_thread_num > 0)
          {
-            cnt_nz = cnt_nz_per_thread[my_thread_num-1];
-            cnt_nz_offd = cnt_nz_offd_per_thread[my_thread_num-1];
+            cnt_nz = cnt_nz_per_thread[my_thread_num - 1];
+            cnt_nz_offd = cnt_nz_offd_per_thread[my_thread_num - 1];
          }
          else
          {
@@ -1037,60 +1066,60 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
          }
 
          /* Set P_diag_pass and P_offd_pass */
-         for (i=thread_start; i < thread_stop; i++)
+         for (i = thread_start; i < thread_stop; i++)
          {
             i1 = pass_array[i];
-            for (j=S_diag_i[i1]; j < S_diag_i[i1+1]; j++)
+            for (j = S_diag_i[i1]; j < S_diag_i[i1 + 1]; j++)
             {
                j1 = S_diag_j[j];
-               if (assigned[j1] == pass-1)
+               if (assigned[j1] == pass - 1)
                {
                   j_start = P_diag_start[j1];
-                  j_end = j_start+P_diag_i[j1+1];
-                  for (k=j_start; k < j_end; k++)
+                  j_end = j_start + P_diag_i[j1 + 1];
+                  for (k = j_start; k < j_end; k++)
                   {
-                     k1 = P_diag_pass[pass-1][k];
-                     if (P_marker[k1] != -i1-1)
+                     k1 = P_diag_pass[pass - 1][k];
+                     if (P_marker[k1] != -i1 - 1)
                      {
                         P_diag_pass[pass][cnt_nz++] = k1;
-                        P_marker[k1] = -i1-1;
+                        P_marker[k1] = -i1 - 1;
                      }
                   }
                   j_start = P_offd_start[j1];
-                  j_end = j_start+P_offd_i[j1+1];
-                  for (k=j_start; k < j_end; k++)
+                  j_end = j_start + P_offd_i[j1 + 1];
+                  for (k = j_start; k < j_end; k++)
                   {
-                     k1 = P_offd_pass[pass-1][k];
-                     if (P_marker_offd[k1] != -i1-1)
+                     k1 = P_offd_pass[pass - 1][k];
+                     if (P_marker_offd[k1] != -i1 - 1)
                      {
                         P_offd_pass[pass][cnt_nz_offd++] = k1;
-                        P_marker_offd[k1] = -i1-1;
+                        P_marker_offd[k1] = -i1 - 1;
                      }
                   }
                }
             }
-            for (j=S_offd_i[i1]; j < S_offd_i[i1+1]; j++)
+            for (j = S_offd_i[i1]; j < S_offd_i[i1 + 1]; j++)
             {
                j1 = S_offd_j[j];
-               if (assigned_offd[j1] == pass-1)
+               if (assigned_offd[j1] == pass - 1)
                {
                   j_start = Pext_start[j1];
-                  j_end = j_start+Pext_i[j1+1];
-                  for (k=j_start; k < j_end; k++)
+                  j_end = j_start + Pext_i[j1 + 1];
+                  for (k = j_start; k < j_end; k++)
                   {
                      k1 = Pext_pass[pass][k];
                      if (k1 < 0)
                      {
-                        if (P_marker[-k1-1] != -i1-1)
+                        if (P_marker[-k1 - 1] != -i1 - 1)
                         {
-                           P_diag_pass[pass][cnt_nz++] = -k1-1;
-                           P_marker[-k1-1] = -i1-1;
+                           P_diag_pass[pass][cnt_nz++] = -k1 - 1;
+                           P_marker[-k1 - 1] = -i1 - 1;
                         }
                      }
-                     else if (P_marker_offd[k1] != -i1-1)
+                     else if (P_marker_offd[k1] != -i1 - 1)
                      {
                         P_offd_pass[pass][cnt_nz_offd++] = k1;
-                        P_marker_offd[k1] = -i1-1;
+                        P_marker_offd[k1] = -i1 - 1;
                      }
                   }
                }
@@ -1098,7 +1127,7 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
          }
 
          hypre_TFree(P_marker, HYPRE_MEMORY_HOST);
-         if ( (n_coarse_offd) || (new_num_cols_offd  == local_index+1) )
+         if ( (n_coarse_offd) || (new_num_cols_offd  == local_index + 1) )
          {    hypre_TFree(P_marker_offd, HYPRE_MEMORY_HOST); }
 
       } /* End parallel region */
@@ -1114,28 +1143,28 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
    hypre_TFree(cnt_nz_offd_per_thread, HYPRE_MEMORY_HOST);
    hypre_TFree(max_num_threads, HYPRE_MEMORY_HOST);
 
-   P_diag_j = hypre_CTAlloc(HYPRE_Int, total_nz, HYPRE_MEMORY_DEVICE);
-   P_diag_data = hypre_CTAlloc(HYPRE_Real, total_nz, HYPRE_MEMORY_DEVICE);
+   P_diag_j = hypre_CTAlloc(HYPRE_Int, total_nz, memory_location_P);
+   P_diag_data = hypre_CTAlloc(HYPRE_Real, total_nz, memory_location_P);
 
 
    if (total_nz_offd)
    {
-      P_offd_j = hypre_CTAlloc(HYPRE_Int, total_nz_offd, HYPRE_MEMORY_DEVICE);
-      P_offd_data = hypre_CTAlloc(HYPRE_Real, total_nz_offd, HYPRE_MEMORY_DEVICE);
+      P_offd_j = hypre_CTAlloc(HYPRE_Int, total_nz_offd, memory_location_P);
+      P_offd_data = hypre_CTAlloc(HYPRE_Real, total_nz_offd, memory_location_P);
    }
 
-   for (i=0; i < n_fine; i++)
+   for (i = 0; i < n_fine; i++)
    {
-      P_diag_i[i+1] += P_diag_i[i];
-      P_offd_i[i+1] += P_offd_i[i];
+      P_diag_i[i + 1] += P_diag_i[i];
+      P_offd_i[i + 1] += P_offd_i[i];
    }
 
-/* determine P for coarse points */
+   /* determine P for coarse points */
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i,i1) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i,i1) HYPRE_SMP_SCHEDULE
 #endif
-   for (i=0; i < n_coarse; i++)
+   for (i = 0; i < n_coarse; i++)
    {
       i1 = C_array[i];
       P_diag_j[P_diag_i[i1]] = fine_to_coarse[i1];
@@ -1148,9 +1177,9 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
                         accordingly */
    {
 
-      pass_length = pass_pointer[2]-pass_pointer[1];
+      pass_length = pass_pointer[2] - pass_pointer[1];
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel private(thread_start,thread_stop,my_thread_num,num_threads,P_marker,P_marker_offd,i,i1,sum_C_pos,sum_C_neg,sum_N_pos,sum_N_neg,j_start,j_end,j,k1,cnt,j1,cnt_offd,diagonal,alfa,beta)
+      #pragma omp parallel private(thread_start,thread_stop,my_thread_num,num_threads,P_marker,P_marker_offd,i,i1,sum_C_pos,sum_C_neg,sum_N_pos,sum_N_neg,j_start,j_end,j,k1,cnt,j1,cnt_offd,diagonal,alfa,beta)
 #endif
       {
          /* Sparsity structure is now finished.  Next, calculate interpolation
@@ -1158,27 +1187,31 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
           * weights only over each thread's range of rows.  Rows are divided
           * up evenly amongst the threads. */
 
+         alfa = beta = 1.0;
+         P_marker_offd = C_array_offd = NULL;
          P_marker = hypre_CTAlloc(HYPRE_Int, n_fine, HYPRE_MEMORY_HOST);
-         for (i=0; i < n_fine; i++)
+         for (i = 0; i < n_fine; i++)
          {   P_marker[i] = -1; }
          if (num_cols_offd)
          {
             P_marker_offd = hypre_CTAlloc(HYPRE_Int, num_cols_offd, HYPRE_MEMORY_HOST);
-            for (i=0; i < num_cols_offd; i++)
+            for (i = 0; i < num_cols_offd; i++)
+            {
                P_marker_offd[i] = -1;
+            }
          }
 
          /* Compute this thread's range of pass_length */
          my_thread_num = hypre_GetThreadNum();
          num_threads = hypre_NumActiveThreads();
-         thread_start = pass_pointer[1] + (pass_length/num_threads)*my_thread_num;
-         if (my_thread_num == num_threads-1)
+         thread_start = pass_pointer[1] + (pass_length / num_threads) * my_thread_num;
+         if (my_thread_num == num_threads - 1)
          {  thread_stop = pass_pointer[1] + pass_length; }
          else
-         {  thread_stop = pass_pointer[1] + (pass_length/num_threads)*(my_thread_num+1); }
+         {  thread_stop = pass_pointer[1] + (pass_length / num_threads) * (my_thread_num + 1); }
 
          /* determine P for points of pass 1, i.e. neighbors of coarse points */
-         for (i=thread_start; i < thread_stop; i++)
+         for (i = thread_start; i < thread_stop; i++)
          {
             i1 = pass_array[i];
             sum_C_pos = 0;
@@ -1186,76 +1219,100 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
             sum_N_pos = 0;
             sum_N_neg = 0;
             j_start = P_diag_start[i1];
-            j_end = j_start+P_diag_i[i1+1]-P_diag_i[i1];
-            for (j=j_start; j < j_end; j++)
+            j_end = j_start + P_diag_i[i1 + 1] - P_diag_i[i1];
+            for (j = j_start; j < j_end; j++)
             {
                k1 = P_diag_pass[1][j];
                P_marker[C_array[k1]] = i1;
             }
             cnt = P_diag_i[i1];
-            for (j=A_diag_i[i1]+1; j < A_diag_i[i1+1]; j++)
+            for (j = A_diag_i[i1] + 1; j < A_diag_i[i1 + 1]; j++)
             {
                j1 = A_diag_j[j];
                if (CF_marker[j1] != -3 &&
                    (num_functions == 1 || dof_func[i1] == dof_func[j1]))
                {
                   if (A_diag_data[j] < 0)
+                  {
                      sum_N_neg += A_diag_data[j];
+                  }
                   else
+                  {
                      sum_N_pos += A_diag_data[j];
+                  }
                }
                if (j1 != -1 && P_marker[j1] == i1)
                {
                   P_diag_data[cnt] = A_diag_data[j];
                   P_diag_j[cnt++] = fine_to_coarse[j1];
                   if (A_diag_data[j] < 0)
+                  {
                      sum_C_neg += A_diag_data[j];
+                  }
                   else
+                  {
                      sum_C_pos += A_diag_data[j];
+                  }
                }
             }
             j_start = P_offd_start[i1];
-            j_end = j_start+P_offd_i[i1+1]-P_offd_i[i1];
-            for (j=j_start; j < j_end; j++)
+            j_end = j_start + P_offd_i[i1 + 1] - P_offd_i[i1];
+            for (j = j_start; j < j_end; j++)
             {
                k1 = P_offd_pass[1][j];
                P_marker_offd[C_array_offd[k1]] = i1;
             }
             cnt_offd = P_offd_i[i1];
-            for (j=A_offd_i[i1]; j < A_offd_i[i1+1]; j++)
+            for (j = A_offd_i[i1]; j < A_offd_i[i1 + 1]; j++)
             {
                j1 = A_offd_j[j];
                if (CF_marker_offd[j1] != -3 &&
                    (num_functions == 1 || dof_func[i1] == dof_func_offd[j1]))
                {
                   if (A_offd_data[j] < 0)
+                  {
                      sum_N_neg += A_offd_data[j];
+                  }
                   else
+                  {
                      sum_N_pos += A_offd_data[j];
+                  }
                }
                if (j1 != -1 && P_marker_offd[j1] == i1)
                {
                   P_offd_data[cnt_offd] = A_offd_data[j];
                   P_offd_j[cnt_offd++] = map_S_to_new[j1];
                   if (A_offd_data[j] < 0)
+                  {
                      sum_C_neg += A_offd_data[j];
+                  }
                   else
+                  {
                      sum_C_pos += A_offd_data[j];
+                  }
                }
             }
             diagonal = A_diag_data[A_diag_i[i1]];
-            if (sum_C_neg*diagonal != 0) alfa = -sum_N_neg/(sum_C_neg*diagonal);
-            if (sum_C_pos*diagonal != 0) beta = -sum_N_pos/(sum_C_pos*diagonal);
-            for (j=P_diag_i[i1]; j < cnt; j++)
+            if (sum_C_neg * diagonal != 0) { alfa = -sum_N_neg / (sum_C_neg * diagonal); }
+            if (sum_C_pos * diagonal != 0) { beta = -sum_N_pos / (sum_C_pos * diagonal); }
+            for (j = P_diag_i[i1]; j < cnt; j++)
                if (P_diag_data[j] < 0)
+               {
                   P_diag_data[j] *= alfa;
+               }
                else
+               {
                   P_diag_data[j] *= beta;
-            for (j=P_offd_i[i1]; j < cnt_offd; j++)
+               }
+            for (j = P_offd_i[i1]; j < cnt_offd; j++)
                if (P_offd_data[j] < 0)
+               {
                   P_offd_data[j] *= alfa;
+               }
                else
+               {
                   P_offd_data[j] *= beta;
+               }
          }
 
          hypre_TFree(P_marker, HYPRE_MEMORY_HOST);
@@ -1266,10 +1323,10 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
       old_Pext_send_size = 0;
       old_Pext_recv_size = 0;
 
-      if (n_coarse) hypre_TFree(C_array, HYPRE_MEMORY_HOST);
+      if (n_coarse) { hypre_TFree(C_array, HYPRE_MEMORY_HOST); }
       hypre_TFree(C_array_offd, HYPRE_MEMORY_HOST);
       hypre_TFree(P_diag_pass[1], HYPRE_MEMORY_HOST);
-      if (num_procs > 1) hypre_TFree(P_offd_pass[1], HYPRE_MEMORY_HOST);
+      if (num_procs > 1) { hypre_TFree(P_offd_pass[1], HYPRE_MEMORY_HOST); }
 
 
       for (pass = 2; pass < num_passes; pass++)
@@ -1286,20 +1343,20 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
             old_Pext_send_size = Pext_send_size;
 
             cnt_offd = 0;
-            for (i=0; i < num_sends; i++)
+            for (i = 0; i < num_sends; i++)
             {
-               for (j=send_map_start[i]; j < send_map_start[i+1]; j++)
+               for (j = send_map_start[i]; j < send_map_start[i + 1]; j++)
                {
                   j1 = send_map_elmt[j];
-                  if (assigned[j1] == pass-1)
+                  if (assigned[j1] == pass - 1)
                   {
                      j_start = P_diag_i[j1];
-                     j_end = P_diag_i[j1+1];
-                     for (k=j_start; k < j_end; k++)
+                     j_end = P_diag_i[j1 + 1];
+                     for (k = j_start; k < j_end; k++)
                      {   Pext_send_data[cnt_offd++] = P_diag_data[k]; }
                      j_start = P_offd_i[j1];
-                     j_end = P_offd_i[j1+1];
-                     for (k=j_start; k < j_end; k++)
+                     j_end = P_offd_i[j1 + 1];
+                     for (k = j_start; k < j_end; k++)
                      {  Pext_send_data[cnt_offd++] = P_offd_data[k]; }
                   }
                }
@@ -1329,9 +1386,9 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
             hypre_TFree(Pext_recv_vec_start[pass], HYPRE_MEMORY_HOST);
          }
 
-         pass_length = pass_pointer[pass+1]-pass_pointer[pass];
+         pass_length = pass_pointer[pass + 1] - pass_pointer[pass];
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel private(thread_start,thread_stop,my_thread_num,num_threads,P_marker,P_marker_offd,i,i1,sum_C_neg,sum_C_pos,sum_N_neg,sum_N_pos,j_start,j_end,cnt,j,k1,cnt_offd,j1,k,alfa,beta,diagonal,C_array,C_array_offd)
+         #pragma omp parallel private(thread_start,thread_stop,my_thread_num,num_threads,P_marker,P_marker_offd,i,i1,sum_C_neg,sum_C_pos,sum_N_neg,sum_N_pos,j_start,j_end,cnt,j,k1,cnt_offd,j1,k,alfa,beta,diagonal,C_array,C_array_offd)
 #endif
          {
             /* Sparsity structure is now finished.  Next, calculate interpolation
@@ -1339,14 +1396,18 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
              * weights only over each thread's range of rows.  Rows are divided
              * up evenly amongst the threads. */
 
+            alfa = beta = 1.0;
+            P_marker_offd = NULL;
             P_marker = hypre_CTAlloc(HYPRE_Int, n_fine, HYPRE_MEMORY_HOST);
-            for (i=0; i < n_fine; i++)
+            for (i = 0; i < n_fine; i++)
             {   P_marker[i] = -1; }
             if (num_cols_offd)
             {
                P_marker_offd = hypre_CTAlloc(HYPRE_Int, num_cols_offd, HYPRE_MEMORY_HOST);
-               for (i=0; i < num_cols_offd; i++)
+               for (i = 0; i < num_cols_offd; i++)
+               {
                   P_marker_offd[i] = -1;
+               }
             }
 
             C_array = NULL;
@@ -1361,14 +1422,14 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
             /* Compute this thread's range of pass_length */
             my_thread_num = hypre_GetThreadNum();
             num_threads = hypre_NumActiveThreads();
-            thread_start = pass_pointer[pass] + (pass_length/num_threads)*my_thread_num;
-            if (my_thread_num == num_threads-1)
+            thread_start = pass_pointer[pass] + (pass_length / num_threads) * my_thread_num;
+            if (my_thread_num == num_threads - 1)
             {  thread_stop = pass_pointer[pass] + pass_length; }
             else
-            {  thread_stop = pass_pointer[pass] + (pass_length/num_threads)*(my_thread_num+1); }
+            {  thread_stop = pass_pointer[pass] + (pass_length / num_threads) * (my_thread_num + 1); }
 
             /* Loop over each thread's row-range */
-            for (i=thread_start; i < thread_stop; i++)
+            for (i = thread_start; i < thread_stop; i++)
             {
                i1 = pass_array[i];
                sum_C_neg = 0;
@@ -1376,9 +1437,9 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
                sum_N_neg = 0;
                sum_N_pos = 0;
                j_start = P_diag_start[i1];
-               j_end = j_start+P_diag_i[i1+1]-P_diag_i[i1];
+               j_end = j_start + P_diag_i[i1 + 1] - P_diag_i[i1];
                cnt = P_diag_i[i1];
-               for (j=j_start; j < j_end; j++)
+               for (j = j_start; j < j_end; j++)
                {
                   k1 = P_diag_pass[pass][j];
                   C_array[k1] = cnt;
@@ -1386,36 +1447,40 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
                   P_diag_j[cnt++] = k1;
                }
                j_start = P_offd_start[i1];
-               j_end = j_start+P_offd_i[i1+1]-P_offd_i[i1];
+               j_end = j_start + P_offd_i[i1 + 1] - P_offd_i[i1];
                cnt_offd = P_offd_i[i1];
-               for (j=j_start; j < j_end; j++)
+               for (j = j_start; j < j_end; j++)
                {
                   k1 = P_offd_pass[pass][j];
                   C_array_offd[k1] = cnt_offd;
                   P_offd_data[cnt_offd] = 0;
                   P_offd_j[cnt_offd++] = k1;
                }
-               for (j=S_diag_i[i1]; j < S_diag_i[i1+1]; j++)
+               for (j = S_diag_i[i1]; j < S_diag_i[i1 + 1]; j++)
                {
                   j1 = S_diag_j[j];
-                  if (assigned[j1] == pass-1)
+                  if (assigned[j1] == pass - 1)
+                  {
                      P_marker[j1] = i1;
+                  }
                }
-               for (j=S_offd_i[i1]; j < S_offd_i[i1+1]; j++)
+               for (j = S_offd_i[i1]; j < S_offd_i[i1 + 1]; j++)
                {
                   j1 = S_offd_j[j];
-                  if (assigned_offd[j1] == pass-1)
+                  if (assigned_offd[j1] == pass - 1)
+                  {
                      P_marker_offd[j1] = i1;
+                  }
                }
-               for (j=A_diag_i[i1]+1; j < A_diag_i[i1+1]; j++)
+               for (j = A_diag_i[i1] + 1; j < A_diag_i[i1 + 1]; j++)
                {
                   j1 = A_diag_j[j];
                   if (P_marker[j1] == i1)
                   {
-                     for (k=P_diag_i[j1]; k < P_diag_i[j1+1]; k++)
+                     for (k = P_diag_i[j1]; k < P_diag_i[j1 + 1]; k++)
                      {
                         k1 = P_diag_j[k];
-                        alfa = A_diag_data[j]*P_diag_data[k];
+                        alfa = A_diag_data[j] * P_diag_data[k];
                         P_diag_data[C_array[k1]] += alfa;
                         if (alfa < 0)
                         {
@@ -1428,10 +1493,10 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
                            sum_N_pos += alfa;
                         }
                      }
-                     for (k=P_offd_i[j1]; k < P_offd_i[j1+1]; k++)
+                     for (k = P_offd_i[j1]; k < P_offd_i[j1 + 1]; k++)
                      {
                         k1 = P_offd_j[k];
-                        alfa = A_diag_data[j]*P_offd_data[k];
+                        alfa = A_diag_data[j] * P_offd_data[k];
                         P_offd_data[C_array_offd[k1]] += alfa;
                         if (alfa < 0)
                         {
@@ -1451,28 +1516,36 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
                          (num_functions == 1 || dof_func[i1] == dof_func[j1]))
                      {
                         if (A_diag_data[j] < 0)
+                        {
                            sum_N_neg += A_diag_data[j];
+                        }
                         else
+                        {
                            sum_N_pos += A_diag_data[j];
+                        }
                      }
                   }
                }
-               for (j=A_offd_i[i1]; j < A_offd_i[i1+1]; j++)
+               for (j = A_offd_i[i1]; j < A_offd_i[i1 + 1]; j++)
                {
                   j1 = A_offd_j[j];
 
                   if (j1 > -1 && P_marker_offd[j1] == i1)
                   {
                      j_start = Pext_start[j1];
-                     j_end = j_start+Pext_i[j1+1];
-                     for (k=j_start; k < j_end; k++)
+                     j_end = j_start + Pext_i[j1 + 1];
+                     for (k = j_start; k < j_end; k++)
                      {
                         k1 = Pext_pass[pass][k];
-                        alfa = A_offd_data[j]*Pext_data[k];
+                        alfa = A_offd_data[j] * Pext_data[k];
                         if (k1 < 0)
-                           P_diag_data[C_array[-k1-1]] += alfa;
+                        {
+                           P_diag_data[C_array[-k1 - 1]] += alfa;
+                        }
                         else
+                        {
                            P_offd_data[C_array_offd[k1]] += alfa;
+                        }
                         if (alfa < 0)
                         {
                            sum_C_neg += alfa;
@@ -1491,26 +1564,38 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
                          (num_functions == 1 || dof_func_offd[j1] == dof_func[i1]))
                      {
                         if ( A_offd_data[j] < 0)
+                        {
                            sum_N_neg += A_offd_data[j];
+                        }
                         else
+                        {
                            sum_N_pos += A_offd_data[j];
+                        }
                      }
                   }
                }
                diagonal = A_diag_data[A_diag_i[i1]];
-               if (sum_C_neg*diagonal != 0) alfa = -sum_N_neg/(sum_C_neg*diagonal);
-               if (sum_C_pos*diagonal != 0) beta = -sum_N_pos/(sum_C_pos*diagonal);
+               if (sum_C_neg * diagonal != 0) { alfa = -sum_N_neg / (sum_C_neg * diagonal); }
+               if (sum_C_pos * diagonal != 0) { beta = -sum_N_pos / (sum_C_pos * diagonal); }
 
-               for (j=P_diag_i[i1]; j < P_diag_i[i1+1]; j++)
+               for (j = P_diag_i[i1]; j < P_diag_i[i1 + 1]; j++)
                   if (P_diag_data[j] < 0)
+                  {
                      P_diag_data[j] *= alfa;
+                  }
                   else
+                  {
                      P_diag_data[j] *= beta;
-               for (j=P_offd_i[i1]; j < P_offd_i[i1+1]; j++)
+                  }
+               for (j = P_offd_i[i1]; j < P_offd_i[i1 + 1]; j++)
                   if (P_offd_data[j] < 0)
+                  {
                      P_offd_data[j] *= alfa;
+                  }
                   else
+                  {
                      P_offd_data[j] *= beta;
+                  }
             }
 
             hypre_TFree(C_array, HYPRE_MEMORY_HOST);
@@ -1532,9 +1617,9 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
    else /* no distinction between positive and negative offdiagonal element */
    {
 
-      pass_length = pass_pointer[2]-pass_pointer[1];
+      pass_length = pass_pointer[2] - pass_pointer[1];
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel private(thread_start,thread_stop,my_thread_num,num_threads,k,k1,i,i1,j,j1,sum_C,sum_N,j_start,j_end,cnt,tmp_marker,tmp_marker_offd,cnt_offd,diagonal,alfa)
+      #pragma omp parallel private(thread_start,thread_stop,my_thread_num,num_threads,k,k1,i,i1,j,j1,sum_C,sum_N,j_start,j_end,cnt,tmp_marker,tmp_marker_offd,cnt_offd,diagonal,alfa)
 #endif
       {
          /* Sparsity structure is now finished.  Next, calculate interpolation
@@ -1543,46 +1628,49 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
           * up evenly amongst the threads. */
 
          /* Initialize thread-wise variables */
+         alfa = 1.0;
          tmp_marker = NULL;
          if (n_fine)
          {   tmp_marker = hypre_CTAlloc(HYPRE_Int, n_fine, HYPRE_MEMORY_HOST); }
          tmp_marker_offd = NULL;
          if (num_cols_offd)
          {   tmp_marker_offd = hypre_CTAlloc(HYPRE_Int, num_cols_offd, HYPRE_MEMORY_HOST); }
-         for (i=0; i < n_fine; i++)
+         for (i = 0; i < n_fine; i++)
          {   tmp_marker[i] = -1; }
-         for (i=0; i < num_cols_offd; i++)
+         for (i = 0; i < num_cols_offd; i++)
          {   tmp_marker_offd[i] = -1; }
 
          /* Compute this thread's range of pass_length */
          my_thread_num = hypre_GetThreadNum();
          num_threads = hypre_NumActiveThreads();
-         thread_start = pass_pointer[1] + (pass_length/num_threads)*my_thread_num;
-         if (my_thread_num == num_threads-1)
+         thread_start = pass_pointer[1] + (pass_length / num_threads) * my_thread_num;
+         if (my_thread_num == num_threads - 1)
          {  thread_stop = pass_pointer[1] + pass_length; }
          else
-         {  thread_stop = pass_pointer[1] + (pass_length/num_threads)*(my_thread_num+1); }
+         {  thread_stop = pass_pointer[1] + (pass_length / num_threads) * (my_thread_num + 1); }
 
          /* determine P for points of pass 1, i.e. neighbors of coarse points */
-         for (i=thread_start; i < thread_stop; i++)
+         for (i = thread_start; i < thread_stop; i++)
          {
             i1 = pass_array[i];
             sum_C = 0;
             sum_N = 0;
             j_start = P_diag_start[i1];
-            j_end = j_start+P_diag_i[i1+1]-P_diag_i[i1];
-            for (j=j_start; j < j_end; j++)
+            j_end = j_start + P_diag_i[i1 + 1] - P_diag_i[i1];
+            for (j = j_start; j < j_end; j++)
             {
                k1 = P_diag_pass[1][j];
                tmp_marker[C_array[k1]] = i1;
             }
             cnt = P_diag_i[i1];
-            for (j=A_diag_i[i1]+1; j < A_diag_i[i1+1]; j++)
+            for (j = A_diag_i[i1] + 1; j < A_diag_i[i1 + 1]; j++)
             {
                j1 = A_diag_j[j];
                if (CF_marker[j1] != -3 &&
                    (num_functions == 1 || dof_func[i1] == dof_func[j1]))
+               {
                   sum_N += A_diag_data[j];
+               }
                if (j1 != -1 && tmp_marker[j1] == i1)
                {
                   P_diag_data[cnt] = A_diag_data[j];
@@ -1591,19 +1679,21 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
                }
             }
             j_start = P_offd_start[i1];
-            j_end = j_start+P_offd_i[i1+1]-P_offd_i[i1];
-            for (j=j_start; j < j_end; j++)
+            j_end = j_start + P_offd_i[i1 + 1] - P_offd_i[i1];
+            for (j = j_start; j < j_end; j++)
             {
                k1 = P_offd_pass[1][j];
                tmp_marker_offd[C_array_offd[k1]] = i1;
             }
             cnt_offd = P_offd_i[i1];
-            for (j=A_offd_i[i1]; j < A_offd_i[i1+1]; j++)
+            for (j = A_offd_i[i1]; j < A_offd_i[i1 + 1]; j++)
             {
                j1 = A_offd_j[j];
                if (CF_marker_offd[j1] != -3 &&
                    (num_functions == 1 || dof_func[i1] == dof_func_offd[j1]))
+               {
                   sum_N += A_offd_data[j];
+               }
                if (j1 != -1 && tmp_marker_offd[j1] == i1)
                {
                   P_offd_data[cnt_offd] = A_offd_data[j];
@@ -1612,11 +1702,15 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
                }
             }
             diagonal = A_diag_data[A_diag_i[i1]];
-            if (sum_C*diagonal != 0) alfa = -sum_N/(sum_C*diagonal);
-            for (j=P_diag_i[i1]; j < cnt; j++)
+            if (sum_C * diagonal != 0) { alfa = -sum_N / (sum_C * diagonal); }
+            for (j = P_diag_i[i1]; j < cnt; j++)
+            {
                P_diag_data[j] *= alfa;
-            for (j=P_offd_i[i1]; j < cnt_offd; j++)
+            }
+            for (j = P_offd_i[i1]; j < cnt_offd; j++)
+            {
                P_offd_data[j] *= alfa;
+            }
          }
          hypre_TFree(tmp_marker, HYPRE_MEMORY_HOST);
          hypre_TFree(tmp_marker_offd, HYPRE_MEMORY_HOST);
@@ -1625,10 +1719,10 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
       old_Pext_send_size = 0;
       old_Pext_recv_size = 0;
 
-      if (n_coarse) hypre_TFree(C_array, HYPRE_MEMORY_HOST);
+      if (n_coarse) { hypre_TFree(C_array, HYPRE_MEMORY_HOST); }
       hypre_TFree(C_array_offd, HYPRE_MEMORY_HOST);
       hypre_TFree(P_diag_pass[1], HYPRE_MEMORY_HOST);
-      if (num_procs > 1) hypre_TFree(P_offd_pass[1], HYPRE_MEMORY_HOST);
+      if (num_procs > 1) { hypre_TFree(P_offd_pass[1], HYPRE_MEMORY_HOST); }
 
       for (pass = 2; pass < num_passes; pass++)
       {
@@ -1644,22 +1738,22 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
             old_Pext_send_size = Pext_send_size;
 
             cnt_offd = 0;
-            for (i=0; i < num_sends; i++)
+            for (i = 0; i < num_sends; i++)
             {
-               for (j=send_map_start[i]; j < send_map_start[i+1]; j++)
+               for (j = send_map_start[i]; j < send_map_start[i + 1]; j++)
                {
                   j1 = send_map_elmt[j];
-                  if (assigned[j1] == pass-1)
+                  if (assigned[j1] == pass - 1)
                   {
                      j_start = P_diag_i[j1];
-                     j_end = P_diag_i[j1+1];
-                     for (k=j_start; k < j_end; k++)
+                     j_end = P_diag_i[j1 + 1];
+                     for (k = j_start; k < j_end; k++)
                      {
                         Pext_send_data[cnt_offd++] = P_diag_data[k];
                      }
                      j_start = P_offd_i[j1];
-                     j_end = P_offd_i[j1+1];
-                     for (k=j_start; k < j_end; k++)
+                     j_end = P_offd_i[j1 + 1];
+                     for (k = j_start; k < j_end; k++)
                      {
                         Pext_send_data[cnt_offd++] = P_offd_data[k];
                      }
@@ -1691,9 +1785,9 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
             hypre_TFree(Pext_recv_vec_start[pass], HYPRE_MEMORY_HOST);
          }
 
-         pass_length = pass_pointer[pass+1]-pass_pointer[pass];
+         pass_length = pass_pointer[pass + 1] - pass_pointer[pass];
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel private(thread_start,thread_stop,my_thread_num,num_threads,k,k1,i,i1,j,j1,sum_C,sum_N,j_start,j_end,cnt,tmp_marker,tmp_marker_offd,cnt_offd,diagonal,alfa,tmp_array,tmp_array_offd)
+         #pragma omp parallel private(thread_start,thread_stop,my_thread_num,num_threads,k,k1,i,i1,j,j1,sum_C,sum_N,j_start,j_end,cnt,tmp_marker,tmp_marker_offd,cnt_offd,diagonal,alfa,tmp_array,tmp_array_offd)
 #endif
          {
             /* Sparsity structure is now finished.  Next, calculate interpolation
@@ -1702,6 +1796,7 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
              * up evenly amongst the threads. */
 
             /* Initialize thread-wise variables */
+            alfa = beta = 1.0;
             tmp_marker = NULL;
             if (n_fine)
             {    tmp_marker = hypre_CTAlloc(HYPRE_Int, n_fine, HYPRE_MEMORY_HOST); }
@@ -1716,29 +1811,29 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
             {    tmp_array_offd = hypre_CTAlloc(HYPRE_Int, new_num_cols_offd, HYPRE_MEMORY_HOST); }
             else
             {    tmp_array_offd = hypre_CTAlloc(HYPRE_Int, n_coarse_offd, HYPRE_MEMORY_HOST);}
-            for (i=0; i < n_fine; i++)
+            for (i = 0; i < n_fine; i++)
             {    tmp_marker[i] = -1; }
-            for (i=0; i < num_cols_offd; i++)
+            for (i = 0; i < num_cols_offd; i++)
             {    tmp_marker_offd[i] = -1; }
 
             /* Compute this thread's range of pass_length */
             my_thread_num = hypre_GetThreadNum();
             num_threads = hypre_NumActiveThreads();
-            thread_start = pass_pointer[pass] + (pass_length/num_threads)*my_thread_num;
-            if (my_thread_num == num_threads-1)
+            thread_start = pass_pointer[pass] + (pass_length / num_threads) * my_thread_num;
+            if (my_thread_num == num_threads - 1)
             {  thread_stop = pass_pointer[pass] + pass_length; }
             else
-            {  thread_stop = pass_pointer[pass] + (pass_length/num_threads)*(my_thread_num+1); }
+            {  thread_stop = pass_pointer[pass] + (pass_length / num_threads) * (my_thread_num + 1); }
 
-            for (i=thread_start; i < thread_stop; i++)
+            for (i = thread_start; i < thread_stop; i++)
             {
                i1 = pass_array[i];
                sum_C = 0;
                sum_N = 0;
                j_start = P_diag_start[i1];
-               j_end = j_start+P_diag_i[i1+1]-P_diag_i[i1];
+               j_end = j_start + P_diag_i[i1 + 1] - P_diag_i[i1];
                cnt = P_diag_i[i1];
-               for (j=j_start; j < j_end; j++)
+               for (j = j_start; j < j_end; j++)
                {
                   k1 = P_diag_pass[pass][j];
                   tmp_array[k1] = cnt;
@@ -1746,44 +1841,48 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
                   P_diag_j[cnt++] = k1;
                }
                j_start = P_offd_start[i1];
-               j_end = j_start+P_offd_i[i1+1]-P_offd_i[i1];
+               j_end = j_start + P_offd_i[i1 + 1] - P_offd_i[i1];
                cnt_offd = P_offd_i[i1];
-               for (j=j_start; j < j_end; j++)
+               for (j = j_start; j < j_end; j++)
                {
                   k1 = P_offd_pass[pass][j];
                   tmp_array_offd[k1] = cnt_offd;
                   P_offd_data[cnt_offd] = 0;
                   P_offd_j[cnt_offd++] = k1;
                }
-               for (j=S_diag_i[i1]; j < S_diag_i[i1+1]; j++)
+               for (j = S_diag_i[i1]; j < S_diag_i[i1 + 1]; j++)
                {
                   j1 = S_diag_j[j];
-                  if (assigned[j1] == pass-1)
+                  if (assigned[j1] == pass - 1)
+                  {
                      tmp_marker[j1] = i1;
+                  }
                }
-               for (j=S_offd_i[i1]; j < S_offd_i[i1+1]; j++)
+               for (j = S_offd_i[i1]; j < S_offd_i[i1 + 1]; j++)
                {
                   j1 = S_offd_j[j];
-                  if (assigned_offd[j1] == pass-1)
+                  if (assigned_offd[j1] == pass - 1)
+                  {
                      tmp_marker_offd[j1] = i1;
+                  }
                }
-               for (j=A_diag_i[i1]+1; j < A_diag_i[i1+1]; j++)
+               for (j = A_diag_i[i1] + 1; j < A_diag_i[i1 + 1]; j++)
                {
                   j1 = A_diag_j[j];
                   if (tmp_marker[j1] == i1)
                   {
-                     for (k=P_diag_i[j1]; k < P_diag_i[j1+1]; k++)
+                     for (k = P_diag_i[j1]; k < P_diag_i[j1 + 1]; k++)
                      {
                         k1 = P_diag_j[k];
-                        alfa = A_diag_data[j]*P_diag_data[k];
+                        alfa = A_diag_data[j] * P_diag_data[k];
                         P_diag_data[tmp_array[k1]] += alfa;
                         sum_C += alfa;
                         sum_N += alfa;
                      }
-                     for (k=P_offd_i[j1]; k < P_offd_i[j1+1]; k++)
+                     for (k = P_offd_i[j1]; k < P_offd_i[j1 + 1]; k++)
                      {
                         k1 = P_offd_j[k];
-                        alfa = A_diag_data[j]*P_offd_data[k];
+                        alfa = A_diag_data[j] * P_offd_data[k];
                         P_offd_data[tmp_array_offd[k1]] += alfa;
                         sum_C += alfa;
                         sum_N += alfa;
@@ -1793,25 +1892,31 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
                   {
                      if (CF_marker[j1] != -3 &&
                          (num_functions == 1 || dof_func[i1] == dof_func[j1]))
+                     {
                         sum_N += A_diag_data[j];
+                     }
                   }
                }
-               for (j=A_offd_i[i1]; j < A_offd_i[i1+1]; j++)
+               for (j = A_offd_i[i1]; j < A_offd_i[i1 + 1]; j++)
                {
                   j1 = A_offd_j[j];
 
                   if (j1 > -1 && tmp_marker_offd[j1] == i1)
                   {
                      j_start = Pext_start[j1];
-                     j_end = j_start+Pext_i[j1+1];
-                     for (k=j_start; k < j_end; k++)
+                     j_end = j_start + Pext_i[j1 + 1];
+                     for (k = j_start; k < j_end; k++)
                      {
                         k1 = Pext_pass[pass][k];
-                        alfa = A_offd_data[j]*Pext_data[k];
+                        alfa = A_offd_data[j] * Pext_data[k];
                         if (k1 < 0)
-                           P_diag_data[tmp_array[-k1-1]] += alfa;
+                        {
+                           P_diag_data[tmp_array[-k1 - 1]] += alfa;
+                        }
                         else
+                        {
                            P_offd_data[tmp_array_offd[k1]] += alfa;
+                        }
                         sum_C += alfa;
                         sum_N += alfa;
                      }
@@ -1820,16 +1925,22 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
                   {
                      if (CF_marker_offd[j1] != -3 &&
                          (num_functions == 1 || dof_func_offd[j1] == dof_func[i1]))
+                     {
                         sum_N += A_offd_data[j];
+                     }
                   }
                }
                diagonal = A_diag_data[A_diag_i[i1]];
-               if (sum_C*diagonal != 0.0) alfa = -sum_N/(sum_C*diagonal);
+               if (sum_C * diagonal != 0.0) { alfa = -sum_N / (sum_C * diagonal); }
 
-               for (j=P_diag_i[i1]; j < P_diag_i[i1+1]; j++)
+               for (j = P_diag_i[i1]; j < P_diag_i[i1 + 1]; j++)
+               {
                   P_diag_data[j] *= alfa;
-               for (j=P_offd_i[i1]; j < P_offd_i[i1+1]; j++)
+               }
+               for (j = P_offd_i[i1]; j < P_offd_i[i1 + 1]; j++)
+               {
                   P_offd_data[j] *= alfa;
+               }
             }
             hypre_TFree(tmp_marker, HYPRE_MEMORY_HOST);
             hypre_TFree(tmp_marker_offd, HYPRE_MEMORY_HOST);
@@ -1865,7 +1976,7 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
    hypre_TFree(pass_pointer, HYPRE_MEMORY_HOST);
    hypre_TFree(pass_array, HYPRE_MEMORY_HOST);
    hypre_TFree(map_S_to_new, HYPRE_MEMORY_HOST);
-   if (num_procs > 1) hypre_TFree(tmp_comm_pkg, HYPRE_MEMORY_HOST);
+   if (num_procs > 1) { hypre_TFree(tmp_comm_pkg, HYPRE_MEMORY_HOST); }
 
    P = hypre_ParCSRMatrixCreate(comm,
                                 hypre_ParCSRMatrixGlobalNumRows(A),
@@ -1907,13 +2018,13 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
       else
       {   P_marker_offd = hypre_CTAlloc(HYPRE_Int, num_cols_offd, HYPRE_MEMORY_HOST); }
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-      for (i=0; i < new_num_cols_offd; i++)
+      for (i = 0; i < new_num_cols_offd; i++)
       {   P_marker_offd[i] = 0; }
 
       num_cols_offd_P = 0;
-      for (i=0; i < P_offd_size; i++)
+      for (i = 0; i < P_offd_size; i++)
       {
          index = P_offd_j[i];
          if (!P_marker_offd[index])
@@ -1924,52 +2035,58 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
       }
 
       col_map_offd_P = hypre_CTAlloc(HYPRE_BigInt, num_cols_offd_P, HYPRE_MEMORY_HOST);
-      permute = hypre_CTAlloc(HYPRE_Int,  new_counter[num_passes-1], HYPRE_MEMORY_HOST);
-      big_permute = hypre_CTAlloc(HYPRE_BigInt,  new_counter[num_passes-1], HYPRE_MEMORY_HOST);
+      permute = hypre_CTAlloc(HYPRE_Int,  new_counter[num_passes - 1], HYPRE_MEMORY_HOST);
+      big_permute = hypre_CTAlloc(HYPRE_BigInt,  new_counter[num_passes - 1], HYPRE_MEMORY_HOST);
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-      for (i=0; i < new_counter[num_passes-1]; i++)
+      for (i = 0; i < new_counter[num_passes - 1]; i++)
+      {
          big_permute[i] = -1;
+      }
 
       cnt = 0;
-      for (i=0; i < num_passes-1; i++)
+      for (i = 0; i < num_passes - 1; i++)
       {
-         for (j=new_counter[i]; j < new_counter[i+1]; j++)
+         for (j = new_counter[i]; j < new_counter[i + 1]; j++)
          {
             if (P_marker_offd[j])
             {
-               col_map_offd_P[cnt] = new_elmts[i][j-(HYPRE_BigInt)new_counter[i]];
+               col_map_offd_P[cnt] = new_elmts[i][j - (HYPRE_BigInt)new_counter[i]];
                big_permute[j] = col_map_offd_P[cnt++];
             }
          }
       }
 
-      hypre_BigQsort0(col_map_offd_P,0,num_cols_offd_P-1);
+      hypre_BigQsort0(col_map_offd_P, 0, num_cols_offd_P - 1);
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i,big_k1) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i,big_k1) HYPRE_SMP_SCHEDULE
 #endif
-      for (i=0; i < new_counter[num_passes-1]; i++)
+      for (i = 0; i < new_counter[num_passes - 1]; i++)
       {
          big_k1 = big_permute[i];
          if (big_k1 != -1)
-            permute[i] = hypre_BigBinarySearch(col_map_offd_P,big_k1,num_cols_offd_P);
+         {
+            permute[i] = hypre_BigBinarySearch(col_map_offd_P, big_k1, num_cols_offd_P);
+         }
       }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-      for (i=0; i < P_offd_size; i++)
+      for (i = 0; i < P_offd_size; i++)
       {   P_offd_j[i] = permute[P_offd_j[i]]; }
 
       hypre_TFree(P_marker_offd, HYPRE_MEMORY_HOST);
    }
    if (num_procs > 1)
    {
-      for (i=0; i < num_passes-1; i++)
+      for (i = 0; i < num_passes - 1; i++)
+      {
          hypre_TFree(new_elmts[i], HYPRE_MEMORY_HOST);
+      }
    }
    hypre_TFree(permute, HYPRE_MEMORY_HOST);
    hypre_TFree(big_permute, HYPRE_MEMORY_HOST);
@@ -1985,10 +2102,10 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
    if (n_SF)
    {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-      for (i=0; i < n_fine; i++)
-         if (CF_marker[i] == -3) CF_marker[i] = -1;
+      for (i = 0; i < n_fine; i++)
+         if (CF_marker[i] == -3) { CF_marker[i] = -1; }
    }
 
    if (num_procs > 1)
@@ -2013,5 +2130,47 @@ hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
    hypre_profile_times[HYPRE_TIMER_ID_MULTIPASS_INTERP] += hypre_MPI_Wtime();
 #endif
 
-   return(0);
+   return (0);
+}
+
+HYPRE_Int
+hypre_BoomerAMGBuildMultipass( hypre_ParCSRMatrix  *A,
+                               HYPRE_Int           *CF_marker,
+                               hypre_ParCSRMatrix  *S,
+                               HYPRE_BigInt        *num_cpts_global,
+                               HYPRE_Int            num_functions,
+                               HYPRE_Int           *dof_func,
+                               HYPRE_Int            debug_flag,
+                               HYPRE_Real           trunc_factor,
+                               HYPRE_Int            P_max_elmts,
+                               HYPRE_Int            weight_option,
+                               hypre_ParCSRMatrix **P_ptr )
+{
+   hypre_GpuProfilingPushRange("MultipassInterp");
+
+   HYPRE_Int ierr = 0;
+
+#if defined(HYPRE_USING_GPU)
+   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy2( hypre_ParCSRMatrixMemoryLocation(A),
+                                                      hypre_ParCSRMatrixMemoryLocation(S) );
+   if (exec == HYPRE_EXEC_DEVICE)
+   {
+      /* Notice: call the mod version on GPUs */
+      ierr = hypre_BoomerAMGBuildModMultipassDevice( A, CF_marker, S, num_cpts_global,
+                                                     trunc_factor, P_max_elmts, 9,
+                                                     num_functions, dof_func,
+                                                     P_ptr );
+   }
+   else
+#endif
+   {
+      ierr = hypre_BoomerAMGBuildMultipassHost( A, CF_marker, S, num_cpts_global,
+                                                num_functions, dof_func, debug_flag,
+                                                trunc_factor, P_max_elmts, weight_option,
+                                                P_ptr );
+   }
+
+   hypre_GpuProfilingPopRange();
+
+   return ierr;
 }
diff --git a/external/hypre/src/parcsr_ls/par_nodal_systems.c b/external/hypre/src/parcsr_ls/par_nodal_systems.c
index 1c302e2f..12c517a3 100644
--- a/external/hypre/src/parcsr_ls/par_nodal_systems.c
+++ b/external/hypre/src/parcsr_ls/par_nodal_systems.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -43,6 +43,8 @@ hypre_BoomerAMGCreateNodalA(hypre_ParCSRMatrix    *A,
                             HYPRE_Int              diag_option,
                             hypre_ParCSRMatrix   **AN_ptr)
 {
+   HYPRE_UNUSED_VAR(dof_func);
+
    MPI_Comm            comm            = hypre_ParCSRMatrixComm(A);
    hypre_CSRMatrix    *A_diag          = hypre_ParCSRMatrixDiag(A);
    HYPRE_Int          *A_diag_i        = hypre_CSRMatrixI(A_diag);
@@ -69,31 +71,31 @@ hypre_BoomerAMGCreateNodalA(hypre_ParCSRMatrix    *A,
    hypre_CSRMatrix    *AN_offd;
    HYPRE_Int          *AN_offd_i;
    HYPRE_Int          *AN_offd_j;
-   HYPRE_Real         *AN_offd_data;
+   HYPRE_Real         *AN_offd_data = NULL;
    HYPRE_BigInt       *col_map_offd_AN;
    HYPRE_BigInt       *new_col_map_offd;
-   HYPRE_BigInt       *row_starts_AN;
+   HYPRE_BigInt        row_starts_AN[2];
    HYPRE_Int           AN_num_nonzeros_diag = 0;
    HYPRE_Int           AN_num_nonzeros_offd = 0;
    HYPRE_Int           num_cols_offd_AN;
    HYPRE_Int           new_num_cols_offd;
 
    hypre_ParCSRCommPkg *comm_pkg = hypre_ParCSRMatrixCommPkg(A);
-   HYPRE_Int            num_sends;
-   HYPRE_Int            num_recvs;
+   HYPRE_Int            num_sends = 0;
+   HYPRE_Int            num_recvs = 0;
    HYPRE_Int           *send_procs;
-   HYPRE_Int           *send_map_starts;
-   HYPRE_Int           *send_map_elmts = NULL;
+   HYPRE_Int           *send_map_starts = NULL;
+   HYPRE_Int           *send_map_elmts  = NULL;
    HYPRE_Int           *new_send_map_elmts;
    HYPRE_Int           *recv_procs;
-   HYPRE_Int           *recv_vec_starts;
+   HYPRE_Int           *recv_vec_starts = NULL;
 
    hypre_ParCSRCommPkg *comm_pkg_AN;
    HYPRE_Int           *send_procs_AN;
-   HYPRE_Int           *send_map_starts_AN;
-   HYPRE_Int           *send_map_elmts_AN;
+   HYPRE_Int           *send_map_starts_AN = NULL;
+   HYPRE_Int           *send_map_elmts_AN = NULL;
    HYPRE_Int           *recv_procs_AN;
-   HYPRE_Int           *recv_vec_starts_AN;
+   HYPRE_Int           *recv_vec_starts_AN = NULL;
 
    HYPRE_Int           i, j, k, k_map;
 
@@ -110,7 +112,7 @@ hypre_BoomerAMGCreateNodalA(hypre_ParCSRMatrix    *A,
    HYPRE_Int           num_fun2;
    HYPRE_BigInt       *big_map_to_node = NULL;
    HYPRE_Int          *map_to_node;
-   HYPRE_Int          *map_to_map;
+   HYPRE_Int          *map_to_map = NULL;
    HYPRE_Int          *counter;
 
    HYPRE_Real sum;
@@ -118,7 +120,7 @@ hypre_BoomerAMGCreateNodalA(hypre_ParCSRMatrix    *A,
 
    HYPRE_MemoryLocation memory_location = hypre_ParCSRMatrixMemoryLocation(A);
 
-   hypre_MPI_Comm_size(comm,&num_procs);
+   hypre_MPI_Comm_size(comm, &num_procs);
 
    if (!comm_pkg)
    {
@@ -131,14 +133,12 @@ hypre_BoomerAMGCreateNodalA(hypre_ParCSRMatrix    *A,
    comm_pkg_AN = NULL;
    col_map_offd_AN = NULL;
 
-   row_starts_AN = hypre_CTAlloc(HYPRE_BigInt, 2, HYPRE_MEMORY_HOST);
-
    for (i = 0; i < 2; i++)
    {
       row_starts_AN[i] = row_starts[i] / (HYPRE_BigInt)num_functions;
-      if (row_starts_AN[i]*(HYPRE_BigInt)num_functions < row_starts[i])
+      if (row_starts_AN[i] * (HYPRE_BigInt)num_functions < row_starts[i])
       {
-         hypre_error_w_msg(HYPRE_ERROR_GENERIC,"nodes not properly aligned or incomplete info!\n");
+         hypre_error_w_msg(HYPRE_ERROR_GENERIC, "nodes not properly aligned or incomplete info!\n");
          return hypre_error_flag;
       }
    }
@@ -149,7 +149,7 @@ hypre_BoomerAMGCreateNodalA(hypre_ParCSRMatrix    *A,
    num_fun2 = num_functions * num_functions;
 
    map_to_node = hypre_CTAlloc(HYPRE_Int, num_variables, HYPRE_MEMORY_HOST);
-   AN_diag_i = hypre_CTAlloc(HYPRE_Int, num_nodes+1, memory_location);
+   AN_diag_i = hypre_CTAlloc(HYPRE_Int, num_nodes + 1, memory_location);
    counter = hypre_CTAlloc(HYPRE_Int, num_nodes, HYPRE_MEMORY_HOST);
    for (i = 0; i < num_variables; i++)
    {
@@ -167,7 +167,7 @@ hypre_BoomerAMGCreateNodalA(hypre_ParCSRMatrix    *A,
       AN_diag_i[i] = AN_num_nonzeros_diag;
       for (j = 0; j < num_functions; j++)
       {
-         for (k = A_diag_i[row]; k < A_diag_i[row+1]; k++)
+         for (k = A_diag_i[row]; k < A_diag_i[row + 1]; k++)
          {
             k_map = map_to_node[A_diag_j[k]];
             if (counter[k_map] < i)
@@ -189,7 +189,7 @@ hypre_BoomerAMGCreateNodalA(hypre_ParCSRMatrix    *A,
    hypre_CSRMatrixJ(AN_diag) = AN_diag_j;
    hypre_CSRMatrixData(AN_diag) = AN_diag_data;
 
-   for (i=0; i < num_nodes; i++)
+   for (i = 0; i < num_nodes; i++)
    {
       counter[i] = -1;
    }
@@ -201,74 +201,78 @@ hypre_BoomerAMGCreateNodalA(hypre_ParCSRMatrix    *A,
    {
       case 1:  /* frobenius norm */
       {
-         for (i=0; i < num_nodes; i++)
+         for (i = 0; i < num_nodes; i++)
          {
-            for (j=0; j < num_functions; j++)
+            for (j = 0; j < num_functions; j++)
             {
-               for (k=A_diag_i[row]; k < A_diag_i[row+1]; k++)
+               for (k = A_diag_i[row]; k < A_diag_i[row + 1]; k++)
                {
                   k_map = map_to_node[A_diag_j[k]];
                   if (counter[k_map] < start_index)
                   {
                      counter[k_map] = index;
                      AN_diag_j[index] = k_map;
-                     AN_diag_data[index] = A_diag_data[k]*A_diag_data[k];
+                     AN_diag_data[index] = A_diag_data[k] * A_diag_data[k];
                      index++;
                   }
                   else
                   {
                      AN_diag_data[counter[k_map]] +=
-                        A_diag_data[k]*A_diag_data[k];
+                        A_diag_data[k] * A_diag_data[k];
                   }
                }
                row++;
             }
             start_index = index;
          }
-         for (i=0; i < AN_num_nonzeros_diag; i++)
-            AN_diag_data[i] = sqrt(AN_diag_data[i]);
+         for (i = 0; i < AN_num_nonzeros_diag; i++)
+         {
+            AN_diag_data[i] = hypre_sqrt(AN_diag_data[i]);
+         }
 
       }
       break;
 
       case 2:  /* sum of abs. value of all elements in each block */
       {
-         for (i=0; i < num_nodes; i++)
+         for (i = 0; i < num_nodes; i++)
          {
-            for (j=0; j < num_functions; j++)
+            for (j = 0; j < num_functions; j++)
             {
-               for (k=A_diag_i[row]; k < A_diag_i[row+1]; k++)
+               for (k = A_diag_i[row]; k < A_diag_i[row + 1]; k++)
                {
                   k_map = map_to_node[A_diag_j[k]];
                   if (counter[k_map] < start_index)
                   {
                      counter[k_map] = index;
                      AN_diag_j[index] = k_map;
-                     AN_diag_data[index] = fabs(A_diag_data[k]);
+                     AN_diag_data[index] = hypre_abs(A_diag_data[k]);
                      index++;
                   }
                   else
                   {
-                     AN_diag_data[counter[k_map]] += fabs(A_diag_data[k]);
+                     AN_diag_data[counter[k_map]] += hypre_abs(A_diag_data[k]);
                   }
                }
                row++;
             }
             start_index = index;
          }
-         for (i=0; i < AN_num_nonzeros_diag; i++)
+         for (i = 0; i < AN_num_nonzeros_diag; i++)
+         {
             AN_diag_data[i] /= num_fun2;
+         }
       }
       break;
 
       case 3:  /* largest element of each block (sets true value - not abs. value) */
       {
 
-         for (i=0; i < num_nodes; i++)
+         for (i = 0; i < num_nodes; i++)
          {
-            for (j=0; j < num_functions; j++)
+            for (j = 0; j < num_functions; j++)
             {
-               for (k=A_diag_i[row]; k < A_diag_i[row+1]; k++)
+               for (k = A_diag_i[row]; k < A_diag_i[row + 1]; k++)
                {
                   k_map = map_to_node[A_diag_j[k]];
                   if (counter[k_map] < start_index)
@@ -280,9 +284,11 @@ hypre_BoomerAMGCreateNodalA(hypre_ParCSRMatrix    *A,
                   }
                   else
                   {
-                     if (fabs(A_diag_data[k]) >
-                           fabs(AN_diag_data[counter[k_map]]))
+                     if (hypre_abs(A_diag_data[k]) >
+                         hypre_abs(AN_diag_data[counter[k_map]]))
+                     {
                         AN_diag_data[counter[k_map]] = A_diag_data[k];
+                     }
                   }
                }
                row++;
@@ -295,38 +301,38 @@ hypre_BoomerAMGCreateNodalA(hypre_ParCSRMatrix    *A,
       case 4:  /* inf. norm (row-sum)  */
       {
 
-         data = hypre_CTAlloc(HYPRE_Real,  AN_num_nonzeros_diag*num_functions, HYPRE_MEMORY_HOST);
+         data = hypre_CTAlloc(HYPRE_Real,  AN_num_nonzeros_diag * num_functions, HYPRE_MEMORY_HOST);
 
-         for (i=0; i < num_nodes; i++)
+         for (i = 0; i < num_nodes; i++)
          {
-            for (j=0; j < num_functions; j++)
+            for (j = 0; j < num_functions; j++)
             {
-               for (k=A_diag_i[row]; k < A_diag_i[row+1]; k++)
+               for (k = A_diag_i[row]; k < A_diag_i[row + 1]; k++)
                {
                   k_map = map_to_node[A_diag_j[k]];
                   if (counter[k_map] < start_index)
                   {
                      counter[k_map] = index;
                      AN_diag_j[index] = k_map;
-                     data[index*num_functions + j] = fabs(A_diag_data[k]);
+                     data[index * num_functions + j] = hypre_abs(A_diag_data[k]);
                      index++;
                   }
                   else
                   {
-                     data[(counter[k_map])*num_functions + j] += fabs(A_diag_data[k]);
+                     data[(counter[k_map])*num_functions + j] += hypre_abs(A_diag_data[k]);
                   }
                }
                row++;
             }
             start_index = index;
          }
-         for (i=0; i < AN_num_nonzeros_diag; i++)
+         for (i = 0; i < AN_num_nonzeros_diag; i++)
          {
-            AN_diag_data[i]  = data[i*num_functions];
+            AN_diag_data[i]  = data[i * num_functions];
 
-            for (j=1; j< num_functions; j++)
+            for (j = 1; j < num_functions; j++)
             {
-               AN_diag_data[i]  = hypre_max( AN_diag_data[i],data[i*num_functions+j]);
+               AN_diag_data[i]  = hypre_max( AN_diag_data[i], data[i * num_functions + j]);
             }
          }
          hypre_TFree(data, HYPRE_MEMORY_HOST);
@@ -336,11 +342,11 @@ hypre_BoomerAMGCreateNodalA(hypre_ParCSRMatrix    *A,
 
       case 6:  /* sum of all elements in each block */
       {
-         for (i=0; i < num_nodes; i++)
+         for (i = 0; i < num_nodes; i++)
          {
-            for (j=0; j < num_functions; j++)
+            for (j = 0; j < num_functions; j++)
             {
-               for (k=A_diag_i[row]; k < A_diag_i[row+1]; k++)
+               for (k = A_diag_i[row]; k < A_diag_i[row + 1]; k++)
                {
                   k_map = map_to_node[A_diag_j[k]];
                   if (counter[k_map] < start_index)
@@ -364,14 +370,14 @@ hypre_BoomerAMGCreateNodalA(hypre_ParCSRMatrix    *A,
 
    }
 
-   if (diag_option ==1 )
+   if (diag_option == 1 )
    {
       /* make the diag entry the negative of the sum of off-diag entries (DO MORE BELOW) */
-      for (i=0; i < num_nodes; i++)
+      for (i = 0; i < num_nodes; i++)
       {
          index = AN_diag_i[i];
          sum = 0.0;
-         for (k = AN_diag_i[i]+1; k < AN_diag_i[i+1]; k++)
+         for (k = AN_diag_i[i] + 1; k < AN_diag_i[i + 1]; k++)
          {
             sum += AN_diag_data[k];
 
@@ -386,7 +392,7 @@ hypre_BoomerAMGCreateNodalA(hypre_ParCSRMatrix    *A,
       /*  make all diagonal entries negative */
       /* the diagonal is the first element listed in each row - */
 
-      for (i=0; i < num_nodes; i++)
+      for (i = 0; i < num_nodes; i++)
       {
          index = AN_diag_i[i];
          AN_diag_data[index] = - AN_diag_data[index];
@@ -394,23 +400,20 @@ hypre_BoomerAMGCreateNodalA(hypre_ParCSRMatrix    *A,
    }
 
    num_nonzeros_offd = A_offd_i[num_variables];
-   AN_offd_i = hypre_CTAlloc(HYPRE_Int, num_nodes+1, memory_location);
+   AN_offd_i = hypre_CTAlloc(HYPRE_Int, num_nodes + 1, memory_location);
 
    num_cols_offd_AN = 0;
 
    if (comm_pkg)
    {
-      comm_pkg_AN = hypre_CTAlloc(hypre_ParCSRCommPkg, 1, HYPRE_MEMORY_HOST);
-      hypre_ParCSRCommPkgComm(comm_pkg_AN) = comm;
       num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
-      hypre_ParCSRCommPkgNumSends(comm_pkg_AN) = num_sends;
       num_recvs = hypre_ParCSRCommPkgNumRecvs(comm_pkg);
-      hypre_ParCSRCommPkgNumRecvs(comm_pkg_AN) = num_recvs;
       send_procs = hypre_ParCSRCommPkgSendProcs(comm_pkg);
       send_map_starts = hypre_ParCSRCommPkgSendMapStarts(comm_pkg);
       send_map_elmts = hypre_ParCSRCommPkgSendMapElmts(comm_pkg);
       recv_procs = hypre_ParCSRCommPkgRecvProcs(comm_pkg);
       recv_vec_starts = hypre_ParCSRCommPkgRecvVecStarts(comm_pkg);
+
       send_procs_AN = NULL;
       send_map_elmts_AN = NULL;
       if (num_sends)
@@ -418,35 +421,45 @@ hypre_BoomerAMGCreateNodalA(hypre_ParCSRMatrix    *A,
          send_procs_AN = hypre_CTAlloc(HYPRE_Int, num_sends, HYPRE_MEMORY_HOST);
          send_map_elmts_AN = hypre_CTAlloc(HYPRE_Int, send_map_starts[num_sends], HYPRE_MEMORY_HOST);
       }
-      send_map_starts_AN = hypre_CTAlloc(HYPRE_Int, num_sends+1, HYPRE_MEMORY_HOST);
-      recv_vec_starts_AN = hypre_CTAlloc(HYPRE_Int, num_recvs+1, HYPRE_MEMORY_HOST);
+      send_map_starts_AN = hypre_CTAlloc(HYPRE_Int, num_sends + 1, HYPRE_MEMORY_HOST);
+      recv_vec_starts_AN = hypre_CTAlloc(HYPRE_Int, num_recvs + 1, HYPRE_MEMORY_HOST);
       recv_procs_AN = NULL;
-      if (num_recvs) recv_procs_AN = hypre_CTAlloc(HYPRE_Int, num_recvs, HYPRE_MEMORY_HOST);
-      for (i=0; i < num_sends; i++)
+      if (num_recvs) { recv_procs_AN = hypre_CTAlloc(HYPRE_Int, num_recvs, HYPRE_MEMORY_HOST); }
+      for (i = 0; i < num_sends; i++)
+      {
          send_procs_AN[i] = send_procs[i];
-      for (i=0; i < num_recvs; i++)
+      }
+      for (i = 0; i < num_recvs; i++)
+      {
          recv_procs_AN[i] = recv_procs[i];
+      }
 
       send_map_starts_AN[0] = 0;
       cnt = 0;
-      for (i=0; i < num_sends; i++)
+      for (i = 0; i < num_sends; i++)
       {
          k_map = send_map_starts[i];
-         if (send_map_starts[i+1]-k_map)
-            send_map_elmts_AN[cnt++] = send_map_elmts[k_map]/num_functions;
-         for (j=send_map_starts[i]+1; j < send_map_starts[i+1]; j++)
+         if (send_map_starts[i + 1] - k_map)
          {
-            node = send_map_elmts[j]/num_functions;
-            if (node > send_map_elmts_AN[cnt-1])
+            send_map_elmts_AN[cnt++] = send_map_elmts[k_map] / num_functions;
+         }
+         for (j = send_map_starts[i] + 1; j < send_map_starts[i + 1]; j++)
+         {
+            node = send_map_elmts[j] / num_functions;
+            if (node > send_map_elmts_AN[cnt - 1])
+            {
                send_map_elmts_AN[cnt++] = node;
+            }
          }
-         send_map_starts_AN[i+1] = cnt;
+         send_map_starts_AN[i + 1] = cnt;
       }
-      hypre_ParCSRCommPkgSendProcs(comm_pkg_AN) = send_procs_AN;
-      hypre_ParCSRCommPkgSendMapStarts(comm_pkg_AN) = send_map_starts_AN;
-      hypre_ParCSRCommPkgSendMapElmts(comm_pkg_AN) = send_map_elmts_AN;
-      hypre_ParCSRCommPkgRecvProcs(comm_pkg_AN) = recv_procs_AN;
-      hypre_ParCSRCommPkgRecvVecStarts(comm_pkg_AN) = recv_vec_starts_AN;
+
+      /* Create communication package */
+      hypre_ParCSRCommPkgCreateAndFill(comm,
+                                       num_recvs, recv_procs_AN, recv_vec_starts_AN,
+                                       num_sends, send_procs_AN, send_map_starts_AN,
+                                       send_map_elmts_AN,
+                                       &comm_pkg_AN);
    }
    hypre_TFree(map_to_node, HYPRE_MEMORY_HOST);
 
@@ -456,11 +469,11 @@ hypre_BoomerAMGCreateNodalA(hypre_ParCSRMatrix    *A,
       big_map_to_node = hypre_CTAlloc(HYPRE_BigInt, num_cols_offd, HYPRE_MEMORY_HOST);
 
       num_cols_offd_AN = 1;
-      big_map_to_node[0] = col_map_offd[0]/(HYPRE_BigInt)num_functions;
-      for (i=1; i < num_cols_offd; i++)
+      big_map_to_node[0] = col_map_offd[0] / (HYPRE_BigInt)num_functions;
+      for (i = 1; i < num_cols_offd; i++)
       {
-         big_map_to_node[i] = col_map_offd[i]/(HYPRE_BigInt)num_functions;
-         if (big_map_to_node[i] > big_map_to_node[i-1]) num_cols_offd_AN++;
+         big_map_to_node[i] = col_map_offd[i] / (HYPRE_BigInt)num_functions;
+         if (big_map_to_node[i] > big_map_to_node[i - 1]) { num_cols_offd_AN++; }
       }
 
       if (num_cols_offd_AN > num_nodes)
@@ -469,38 +482,38 @@ hypre_BoomerAMGCreateNodalA(hypre_ParCSRMatrix    *A,
          counter = hypre_CTAlloc(HYPRE_Int, num_cols_offd_AN, HYPRE_MEMORY_HOST);
       }
 
-      map_to_map = NULL;
-      col_map_offd_AN = NULL;
       map_to_map = hypre_CTAlloc(HYPRE_Int,  num_cols_offd, HYPRE_MEMORY_HOST);
       col_map_offd_AN = hypre_CTAlloc(HYPRE_BigInt, num_cols_offd_AN, HYPRE_MEMORY_HOST);
       col_map_offd_AN[0] = big_map_to_node[0];
       recv_vec_starts_AN[0] = 0;
       cnt = 1;
-      for (i=0; i < num_recvs; i++)
+      for (i = 0; i < num_recvs; i++)
       {
-         for (j=recv_vec_starts[i]; j < recv_vec_starts[i+1]; j++)
+         for (j = recv_vec_starts[i]; j < recv_vec_starts[i + 1]; j++)
          {
             big_node = big_map_to_node[j];
-            if (big_node > col_map_offd_AN[cnt-1])
+            if (big_node > col_map_offd_AN[cnt - 1])
             {
                col_map_offd_AN[cnt++] = big_node;
             }
-            map_to_map[j] = cnt-1;
+            map_to_map[j] = cnt - 1;
          }
-         recv_vec_starts_AN[i+1] = cnt;
+         recv_vec_starts_AN[i + 1] = cnt;
       }
 
-      for (i=0; i < num_cols_offd_AN; i++)
+      for (i = 0; i < num_cols_offd_AN; i++)
+      {
          counter[i] = -1;
+      }
 
       AN_num_nonzeros_offd = 0;
       row = 0;
-      for (i=0; i < num_nodes; i++)
+      for (i = 0; i < num_nodes; i++)
       {
          AN_offd_i[i] = AN_num_nonzeros_offd;
-         for (j=0; j < num_functions; j++)
+         for (j = 0; j < num_functions; j++)
          {
-            for (k=A_offd_i[row]; k < A_offd_i[row+1]; k++)
+            for (k = A_offd_i[row]; k < A_offd_i[row + 1]; k++)
             {
                k_map = map_to_map[A_offd_j[k]];
                if (counter[k_map] < i)
@@ -516,8 +529,8 @@ hypre_BoomerAMGCreateNodalA(hypre_ParCSRMatrix    *A,
    }
 
 
-   AN_offd = hypre_CSRMatrixCreate(num_nodes,num_cols_offd_AN,
-         AN_num_nonzeros_offd);
+   AN_offd = hypre_CSRMatrixCreate(num_nodes, num_cols_offd_AN,
+                                   AN_num_nonzeros_offd);
    hypre_CSRMatrixI(AN_offd) = AN_offd_i;
    if (AN_num_nonzeros_offd)
    {
@@ -526,8 +539,10 @@ hypre_BoomerAMGCreateNodalA(hypre_ParCSRMatrix    *A,
       hypre_CSRMatrixJ(AN_offd) = AN_offd_j;
       hypre_CSRMatrixData(AN_offd) = AN_offd_data;
 
-      for (i=0; i < num_cols_offd_AN; i++)
+      for (i = 0; i < num_cols_offd_AN; i++)
+      {
          counter[i] = -1;
+      }
       index = 0;
       row = 0;
       AN_offd_i[0] = 0;
@@ -536,72 +551,76 @@ hypre_BoomerAMGCreateNodalA(hypre_ParCSRMatrix    *A,
       {
          case 1: /* frobenius norm */
          {
-            for (i=0; i < num_nodes; i++)
+            for (i = 0; i < num_nodes; i++)
             {
-               for (j=0; j < num_functions; j++)
+               for (j = 0; j < num_functions; j++)
                {
-                  for (k=A_offd_i[row]; k < A_offd_i[row+1]; k++)
+                  for (k = A_offd_i[row]; k < A_offd_i[row + 1]; k++)
                   {
                      k_map = map_to_map[A_offd_j[k]];
                      if (counter[k_map] < start_index)
                      {
                         counter[k_map] = index;
                         AN_offd_j[index] = k_map;
-                        AN_offd_data[index] = A_offd_data[k]*A_offd_data[k];
+                        AN_offd_data[index] = A_offd_data[k] * A_offd_data[k];
                         index++;
                      }
                      else
                      {
                         AN_offd_data[counter[k_map]] +=
-                           A_offd_data[k]*A_offd_data[k];
+                           A_offd_data[k] * A_offd_data[k];
                      }
                   }
                   row++;
                }
                start_index = index;
             }
-            for (i=0; i < AN_num_nonzeros_offd; i++)
-               AN_offd_data[i] = sqrt(AN_offd_data[i]);
+            for (i = 0; i < AN_num_nonzeros_offd; i++)
+            {
+               AN_offd_data[i] = hypre_sqrt(AN_offd_data[i]);
+            }
          }
          break;
 
          case 2:  /* sum of abs. value of all elements in block */
          {
-            for (i=0; i < num_nodes; i++)
+            for (i = 0; i < num_nodes; i++)
             {
-               for (j=0; j < num_functions; j++)
+               for (j = 0; j < num_functions; j++)
                {
-                  for (k=A_offd_i[row]; k < A_offd_i[row+1]; k++)
+                  for (k = A_offd_i[row]; k < A_offd_i[row + 1]; k++)
                   {
                      k_map = map_to_map[A_offd_j[k]];
                      if (counter[k_map] < start_index)
                      {
                         counter[k_map] = index;
                         AN_offd_j[index] = k_map;
-                        AN_offd_data[index] = fabs(A_offd_data[k]);
+                        AN_offd_data[index] = hypre_abs(A_offd_data[k]);
                         index++;
                      }
                      else
                      {
-                        AN_offd_data[counter[k_map]] += fabs(A_offd_data[k]);
+                        AN_offd_data[counter[k_map]] += hypre_abs(A_offd_data[k]);
                      }
                   }
                   row++;
                }
                start_index = index;
             }
-            for (i=0; i < AN_num_nonzeros_offd; i++)
+            for (i = 0; i < AN_num_nonzeros_offd; i++)
+            {
                AN_offd_data[i] /= num_fun2;
+            }
          }
          break;
 
          case 3: /* largest element in each block (not abs. value ) */
          {
-            for (i=0; i < num_nodes; i++)
+            for (i = 0; i < num_nodes; i++)
             {
-               for (j=0; j < num_functions; j++)
+               for (j = 0; j < num_functions; j++)
                {
-                  for (k=A_offd_i[row]; k < A_offd_i[row+1]; k++)
+                  for (k = A_offd_i[row]; k < A_offd_i[row + 1]; k++)
                   {
                      k_map = map_to_map[A_offd_j[k]];
                      if (counter[k_map] < start_index)
@@ -613,9 +632,11 @@ hypre_BoomerAMGCreateNodalA(hypre_ParCSRMatrix    *A,
                      }
                      else
                      {
-                        if (fabs(A_offd_data[k]) >
-                              fabs(AN_offd_data[counter[k_map]]))
+                        if (hypre_abs(A_offd_data[k]) >
+                            hypre_abs(AN_offd_data[counter[k_map]]))
+                        {
                            AN_offd_data[counter[k_map]] = A_offd_data[k];
+                        }
                      }
                   }
                   row++;
@@ -628,38 +649,38 @@ hypre_BoomerAMGCreateNodalA(hypre_ParCSRMatrix    *A,
          case 4:  /* inf. norm (row-sum)  */
          {
 
-            data = hypre_CTAlloc(HYPRE_Real,  AN_num_nonzeros_offd*num_functions, HYPRE_MEMORY_HOST);
+            data = hypre_CTAlloc(HYPRE_Real,  AN_num_nonzeros_offd * num_functions, HYPRE_MEMORY_HOST);
 
-            for (i=0; i < num_nodes; i++)
+            for (i = 0; i < num_nodes; i++)
             {
-               for (j=0; j < num_functions; j++)
+               for (j = 0; j < num_functions; j++)
                {
-                  for (k=A_offd_i[row]; k < A_offd_i[row+1]; k++)
+                  for (k = A_offd_i[row]; k < A_offd_i[row + 1]; k++)
                   {
                      k_map = map_to_map[A_offd_j[k]];
                      if (counter[k_map] < start_index)
                      {
                         counter[k_map] = index;
                         AN_offd_j[index] = k_map;
-                        data[index*num_functions + j] = fabs(A_offd_data[k]);
+                        data[index * num_functions + j] = hypre_abs(A_offd_data[k]);
                         index++;
                      }
                      else
                      {
-                        data[(counter[k_map])*num_functions + j] += fabs(A_offd_data[k]);
+                        data[(counter[k_map])*num_functions + j] += hypre_abs(A_offd_data[k]);
                      }
                   }
                   row++;
                }
                start_index = index;
             }
-            for (i=0; i < AN_num_nonzeros_offd; i++)
+            for (i = 0; i < AN_num_nonzeros_offd; i++)
             {
-               AN_offd_data[i]  = data[i*num_functions];
+               AN_offd_data[i]  = data[i * num_functions];
 
-               for (j=1; j< num_functions; j++)
+               for (j = 1; j < num_functions; j++)
                {
-                  AN_offd_data[i]  = hypre_max( AN_offd_data[i],data[i*num_functions+j]);
+                  AN_offd_data[i]  = hypre_max( AN_offd_data[i], data[i * num_functions + j]);
                }
             }
             hypre_TFree(data, HYPRE_MEMORY_HOST);
@@ -669,11 +690,11 @@ hypre_BoomerAMGCreateNodalA(hypre_ParCSRMatrix    *A,
 
          case 6:  /* sum of value of all elements in block */
          {
-            for (i=0; i < num_nodes; i++)
+            for (i = 0; i < num_nodes; i++)
             {
-               for (j=0; j < num_functions; j++)
+               for (j = 0; j < num_functions; j++)
                {
-                  for (k=A_offd_i[row]; k < A_offd_i[row+1]; k++)
+                  for (k = A_offd_i[row]; k < A_offd_i[row + 1]; k++)
                   {
                      k_map = map_to_map[A_offd_j[k]];
                      if (counter[k_map] < start_index)
@@ -696,19 +717,17 @@ hypre_BoomerAMGCreateNodalA(hypre_ParCSRMatrix    *A,
          }
          break;
       }
-
-      hypre_TFree(map_to_map, HYPRE_MEMORY_HOST);
    }
 
-   if (diag_option ==1 )
+   if (diag_option == 1 )
    {
       /* make the diag entry the negative of the sum of off-diag entries (here we are adding the
          off_diag contribution)*/
       /* the diagonal is the first element listed in each row of AN_diag_data - */
-      for (i=0; i < num_nodes; i++)
+      for (i = 0; i < num_nodes; i++)
       {
          sum = 0.0;
-         for (k = AN_offd_i[i]; k < AN_offd_i[i+1]; k++)
+         for (k = AN_offd_i[i]; k < AN_offd_i[i + 1]; k++)
          {
             sum += AN_offd_data[k];
 
@@ -721,8 +740,8 @@ hypre_BoomerAMGCreateNodalA(hypre_ParCSRMatrix    *A,
 
 
    AN = hypre_ParCSRMatrixCreate(comm, global_num_nodes, global_num_nodes,
-         row_starts_AN, row_starts_AN, num_cols_offd_AN,
-         AN_num_nonzeros_diag, AN_num_nonzeros_offd);
+                                 row_starts_AN, row_starts_AN, num_cols_offd_AN,
+                                 AN_num_nonzeros_diag, AN_num_nonzeros_offd);
 
    /* we already created the diag and offd matrices - so we don't need the ones
       created above */
@@ -737,7 +756,7 @@ hypre_BoomerAMGCreateNodalA(hypre_ParCSRMatrix    *A,
    hypre_ParCSRMatrixColMapOffd(AN) = col_map_offd_AN;
    hypre_ParCSRMatrixCommPkg(AN) = comm_pkg_AN;
 
-   new_num_cols_offd = num_functions*num_cols_offd_AN;
+   new_num_cols_offd = num_functions * num_cols_offd_AN;
 
    if (new_num_cols_offd > num_cols_offd)
    {
@@ -747,19 +766,21 @@ hypre_BoomerAMGCreateNodalA(hypre_ParCSRMatrix    *A,
       {
          for (j = 0; j < num_functions; j++)
          {
-            new_col_map_offd[cnt++] = (HYPRE_BigInt)num_functions*col_map_offd_AN[i]+(HYPRE_BigInt)j;
+            new_col_map_offd[cnt++] = (HYPRE_BigInt)num_functions * col_map_offd_AN[i] + (HYPRE_BigInt)j;
          }
       }
       cnt = 0;
       for (i = 0; i < num_cols_offd; i++)
       {
          while (col_map_offd[i] >  new_col_map_offd[cnt])
+         {
             cnt++;
+         }
          col_map_offd[i] = (HYPRE_BigInt)cnt++;
       }
-      for (i = 0; i < num_recvs+1; i++)
+      for (i = 0; i < num_recvs + 1; i++)
       {
-         recv_vec_starts[i] = num_functions*recv_vec_starts_AN[i];
+         recv_vec_starts[i] = num_functions * recv_vec_starts_AN[i];
       }
 
       for (i = 0; i < num_nonzeros_offd; i++)
@@ -773,20 +794,22 @@ hypre_BoomerAMGCreateNodalA(hypre_ParCSRMatrix    *A,
    }
 
    hypre_TFree(big_map_to_node, HYPRE_MEMORY_HOST);
-   new_send_elmts_size = send_map_starts_AN[num_sends]*num_functions;
+   new_send_elmts_size = send_map_starts_AN[num_sends] * num_functions;
 
    if (new_send_elmts_size > send_map_starts[num_sends])
    {
       new_send_map_elmts = hypre_CTAlloc(HYPRE_Int, new_send_elmts_size, HYPRE_MEMORY_HOST);
       cnt = 0;
       send_map_starts[0] = 0;
-      for (i=0; i < num_sends; i++)
+      for (i = 0; i < num_sends; i++)
       {
-         send_map_starts[i+1] = send_map_starts_AN[i+1]*num_functions;
-         for (j=send_map_starts_AN[i]; j < send_map_starts_AN[i+1]; j++)
+         send_map_starts[i + 1] = send_map_starts_AN[i + 1] * num_functions;
+         for (j = send_map_starts_AN[i]; j < send_map_starts_AN[i + 1]; j++)
          {
-            for (k=0; k < num_functions; k++)
-               new_send_map_elmts[cnt++] = send_map_elmts_AN[j]*num_functions+k;
+            for (k = 0; k < num_functions; k++)
+            {
+               new_send_map_elmts[cnt++] = send_map_elmts_AN[j] * num_functions + k;
+            }
          }
       }
       hypre_TFree(send_map_elmts, HYPRE_MEMORY_HOST);
@@ -796,7 +819,7 @@ hypre_BoomerAMGCreateNodalA(hypre_ParCSRMatrix    *A,
    *AN_ptr = AN;
 
    hypre_TFree(counter, HYPRE_MEMORY_HOST);
-   hypre_TFree(row_starts_AN, HYPRE_MEMORY_HOST);
+   hypre_TFree(map_to_map, HYPRE_MEMORY_HOST);
 
    return hypre_error_flag;
 }
@@ -824,8 +847,8 @@ hypre_BoomerAMGCreateScalarCFS(hypre_ParCSRMatrix  *SN,
    hypre_CSRMatrix    *S_offd;
    HYPRE_Int          *S_offd_i;
    HYPRE_Int          *S_offd_j;
-   HYPRE_BigInt       *row_starts_S = NULL;
-   HYPRE_BigInt       *col_starts_S = NULL;
+   HYPRE_BigInt        row_starts_S[2];
+   HYPRE_BigInt        col_starts_S[2];
    HYPRE_BigInt       *row_starts_A = hypre_ParCSRMatrixRowStarts(A);
    HYPRE_BigInt       *col_starts_A = hypre_ParCSRMatrixColStarts(A);
    hypre_CSRMatrix    *A_diag = hypre_ParCSRMatrixDiag(A);
@@ -854,7 +877,7 @@ hypre_BoomerAMGCreateScalarCFS(hypre_ParCSRMatrix  *SN,
    HYPRE_Int          *S_tmp_j;
 
    HYPRE_Int           num_coarse_nodes;
-   HYPRE_Int           i,j,k,cnt;
+   HYPRE_Int           i, j, k, cnt;
    HYPRE_Int           num_procs;
    HYPRE_Int           num_cols_offd_A = hypre_CSRMatrixNumCols(A_offd);
    HYPRE_Int           A_num_nonzeros_diag;
@@ -870,7 +893,7 @@ hypre_BoomerAMGCreateScalarCFS(hypre_ParCSRMatrix  *SN,
 
    hypre_MPI_Comm_size(comm, &num_procs);
 
-   num_variables = num_functions*num_nodes;
+   num_variables = num_functions * num_nodes;
 
    /* Allocate CF_marker if not done before */
    if (*CF_marker_ptr == NULL)
@@ -896,7 +919,7 @@ hypre_BoomerAMGCreateScalarCFS(hypre_ParCSRMatrix  *SN,
          }
       }
 
-      *dof_func_ptr = hypre_IntArrayCreate(num_coarse_nodes*num_functions);
+      *dof_func_ptr = hypre_IntArrayCreate(num_coarse_nodes * num_functions);
       hypre_IntArrayInitialize(*dof_func_ptr);
       dof_func = hypre_IntArrayData(*dof_func_ptr);
       cnt = 0;
@@ -923,15 +946,9 @@ hypre_BoomerAMGCreateScalarCFS(hypre_ParCSRMatrix  *SN,
       }
    }
 
-   row_starts_S = hypre_CTAlloc(HYPRE_BigInt, 2, HYPRE_MEMORY_HOST);
    for (i = 0; i < 2; i++)
    {
       row_starts_S[i] = row_starts_A[i];
-   }
-
-   col_starts_S = hypre_CTAlloc(HYPRE_BigInt, 2, HYPRE_MEMORY_HOST);
-   for (i = 0; i < 2; i++)
-   {
       col_starts_S[i] = col_starts_A[i];
    }
 
@@ -941,23 +958,23 @@ hypre_BoomerAMGCreateScalarCFS(hypre_ParCSRMatrix  *SN,
    A_num_nonzeros_offd = A_offd_i[num_variables];
 
    global_num_nodes = hypre_ParCSRMatrixGlobalNumRows(SN);
-   global_num_cols = hypre_ParCSRMatrixGlobalNumCols(SN)*num_functions;
+   global_num_cols = hypre_ParCSRMatrixGlobalNumCols(SN) * num_functions;
 
-   global_num_vars = global_num_nodes*(HYPRE_BigInt)num_functions;
+   global_num_vars = global_num_nodes * (HYPRE_BigInt)num_functions;
 
    S_marker = hypre_TAlloc(HYPRE_Int, num_variables, HYPRE_MEMORY_HOST);
    nnz = A_num_nonzeros_diag;
-   if (nnz < A_num_nonzeros_offd) nnz = A_num_nonzeros_offd;
+   if (nnz < A_num_nonzeros_offd) { nnz = A_num_nonzeros_offd; }
    S_tmp_j = hypre_TAlloc(HYPRE_Int, nnz, HYPRE_MEMORY_HOST);
-   S_diag_i = hypre_CTAlloc(HYPRE_Int, num_variables+1, memory_locationS);
-   S_offd_i = hypre_CTAlloc(HYPRE_Int, num_variables+1, memory_locationS);
+   S_diag_i = hypre_CTAlloc(HYPRE_Int, num_variables + 1, memory_locationS);
+   S_offd_i = hypre_CTAlloc(HYPRE_Int, num_variables + 1, memory_locationS);
 
    //Generate S_diag_i and S_diag_j
-   for (i=0; i < A_num_nonzeros_diag; i++)
+   for (i = 0; i < A_num_nonzeros_diag; i++)
    {
       S_tmp_j[i] = -1;
    }
-   for (i=0; i < num_variables; i++)
+   for (i = 0; i < num_variables; i++)
    {
       S_marker[i] = -1;
    }
@@ -969,13 +986,13 @@ hypre_BoomerAMGCreateScalarCFS(hypre_ParCSRMatrix  *SN,
       HYPRE_Int index, index_A, kn, position;
       for (kn = 0; kn < num_functions; kn++)
       {
-         i = in*num_functions+kn;
-         position = A_diag_i[i]-1;
+         i = in * num_functions + kn;
+         position = A_diag_i[i] - 1;
          if (!keep_same_sign)
          {
             if (A_diag_data[A_diag_i[i]] > 0.0)
             {
-               for (j = A_diag_i[i]+1; j < A_diag_i[i+1]; j++)
+               for (j = A_diag_i[i] + 1; j < A_diag_i[i + 1]; j++)
                {
                   if (A_diag_data[j] < 0.0)
                   {
@@ -985,7 +1002,7 @@ hypre_BoomerAMGCreateScalarCFS(hypre_ParCSRMatrix  *SN,
             }
             else
             {
-               for (j = A_diag_i[i]+1; j < A_diag_i[i+1]; j++)
+               for (j = A_diag_i[i] + 1; j < A_diag_i[i + 1]; j++)
                {
                   if (A_diag_data[j] > 0.0)
                   {
@@ -996,16 +1013,16 @@ hypre_BoomerAMGCreateScalarCFS(hypre_ParCSRMatrix  *SN,
          }
          else
          {
-            for (j = A_diag_i[i]; j < A_diag_i[i+1]; j++)
+            for (j = A_diag_i[i]; j < A_diag_i[i + 1]; j++)
             {
                S_marker[A_diag_j[j]] = j;
             }
          }
-         for (j = SN_diag_i[in]; j < SN_diag_i[in+1]; j++)
+         for (j = SN_diag_i[in]; j < SN_diag_i[in + 1]; j++)
          {
             // only include diagonal elements of block, assuming unknown-based
             // approach for interpolation, i.e. ignore connections between different variables
-            index = SN_diag_j[j]*num_functions+kn;
+            index = SN_diag_j[j] * num_functions + kn;
             index_A = S_marker[index];
             if (index_A > position)
             {
@@ -1013,7 +1030,7 @@ hypre_BoomerAMGCreateScalarCFS(hypre_ParCSRMatrix  *SN,
                S_cnt++;
             }
          }
-         S_diag_i[i+1] = S_cnt;
+         S_diag_i[i + 1] = S_cnt;
       }
    }
 
@@ -1050,13 +1067,13 @@ hypre_BoomerAMGCreateScalarCFS(hypre_ParCSRMatrix  *SN,
       HYPRE_BigInt big_index;
       for (kn = 0; kn < num_functions; kn++)
       {
-         i = in*num_functions+kn;
-         position = A_offd_i[i]-1;
+         i = in * num_functions + kn;
+         position = A_offd_i[i] - 1;
          if (!keep_same_sign)
          {
             if (A_diag_data[A_diag_i[i]] > 0.0)
             {
-               for (j = A_offd_i[i]; j < A_offd_i[i+1]; j++)
+               for (j = A_offd_i[i]; j < A_offd_i[i + 1]; j++)
                {
                   if (A_offd_data[j] < 0.0)
                   {
@@ -1066,7 +1083,7 @@ hypre_BoomerAMGCreateScalarCFS(hypre_ParCSRMatrix  *SN,
             }
             else
             {
-               for (j = A_offd_i[i]; j < A_offd_i[i+1]; j++)
+               for (j = A_offd_i[i]; j < A_offd_i[i + 1]; j++)
                {
                   if (A_offd_data[j] > 0.0)
                   {
@@ -1077,15 +1094,15 @@ hypre_BoomerAMGCreateScalarCFS(hypre_ParCSRMatrix  *SN,
          }
          else
          {
-            for (j = A_offd_i[i]; j < A_offd_i[i+1]; j++)
+            for (j = A_offd_i[i]; j < A_offd_i[i + 1]; j++)
             {
                S_marker_offd[A_offd_j[j]] = j;
             }
          }
-         for (j = SN_offd_i[in]; j < SN_offd_i[in+1]; j++)
+         for (j = SN_offd_i[in]; j < SN_offd_i[in + 1]; j++)
          {
-            big_index = col_map_offd_SN[SN_offd_j[j]]*num_functions+kn;
-            index = hypre_BigBinarySearch(col_map_offd_A,big_index, num_cols_offd_A);
+            big_index = col_map_offd_SN[SN_offd_j[j]] * num_functions + kn;
+            index = hypre_BigBinarySearch(col_map_offd_A, big_index, num_cols_offd_A);
             if (index > -1)
             {
                index_A = S_marker_offd[index];
@@ -1096,7 +1113,7 @@ hypre_BoomerAMGCreateScalarCFS(hypre_ParCSRMatrix  *SN,
                }
             }
          }
-         S_offd_i[i+1] = S_cnt;
+         S_offd_i[i + 1] = S_cnt;
       }
    }
 
@@ -1112,8 +1129,8 @@ hypre_BoomerAMGCreateScalarCFS(hypre_ParCSRMatrix  *SN,
    }
 
    S = hypre_ParCSRMatrixCreate(comm, global_num_vars, global_num_cols,
-         row_starts_S, col_starts_S, num_cols_offd_A,
-         S_num_nonzeros_diag, S_num_nonzeros_offd);
+                                row_starts_S, col_starts_S, num_cols_offd_A,
+                                S_num_nonzeros_diag, S_num_nonzeros_offd);
 
    S_diag = hypre_ParCSRMatrixDiag(S);
    S_offd = hypre_ParCSRMatrixOffd(S);
@@ -1130,8 +1147,6 @@ hypre_BoomerAMGCreateScalarCFS(hypre_ParCSRMatrix  *SN,
    hypre_TFree(S_tmp_j, HYPRE_MEMORY_HOST);
    hypre_TFree(S_marker, HYPRE_MEMORY_HOST);
    hypre_TFree(S_marker_offd, HYPRE_MEMORY_HOST);
-   hypre_TFree(row_starts_S, HYPRE_MEMORY_HOST);
-   hypre_TFree(col_starts_S, HYPRE_MEMORY_HOST);
 
    *S_ptr = S;
 
@@ -1139,7 +1154,7 @@ hypre_BoomerAMGCreateScalarCFS(hypre_ParCSRMatrix  *SN,
 }
 
 
-/* This function just finds the scalaer CF_marker and dof_func */
+/* This function just finds the scalar CF_marker and dof_func */
 
 HYPRE_Int
 hypre_BoomerAMGCreateScalarCF(HYPRE_Int                   *CFN_marker,
@@ -1153,10 +1168,10 @@ hypre_BoomerAMGCreateScalarCF(HYPRE_Int                   *CFN_marker,
    HYPRE_Int      *dof_func;
    HYPRE_Int       num_variables;
    HYPRE_Int       num_coarse_nodes;
-   HYPRE_Int       i,j,k,cnt;
+   HYPRE_Int       i, j, k, cnt;
 
 
-   num_variables = num_functions*num_nodes;
+   num_variables = num_functions * num_nodes;
 
    /* Allocate CF_marker if not done before */
    if (*CF_marker_ptr == NULL)
@@ -1168,23 +1183,27 @@ hypre_BoomerAMGCreateScalarCF(HYPRE_Int                   *CFN_marker,
 
    cnt = 0;
    num_coarse_nodes = 0;
-   for (i=0; i < num_nodes; i++)
+   for (i = 0; i < num_nodes; i++)
    {
-      if (CFN_marker[i] == 1) num_coarse_nodes++;
-      for (j=0; j < num_functions; j++)
+      if (CFN_marker[i] == 1) { num_coarse_nodes++; }
+      for (j = 0; j < num_functions; j++)
+      {
          CF_marker[cnt++] = CFN_marker[i];
+      }
    }
 
-   *dof_func_ptr = hypre_IntArrayCreate(num_coarse_nodes*num_functions);
+   *dof_func_ptr = hypre_IntArrayCreate(num_coarse_nodes * num_functions);
    hypre_IntArrayInitialize(*dof_func_ptr);
    dof_func = hypre_IntArrayData(*dof_func_ptr);
    cnt = 0;
-   for (i=0; i < num_nodes; i++)
+   for (i = 0; i < num_nodes; i++)
    {
       if (CFN_marker[i] == 1)
       {
-         for (k=0; k < num_functions; k++)
+         for (k = 0; k < num_functions; k++)
+         {
             dof_func[cnt++] = k;
+         }
       }
    }
 
diff --git a/external/hypre/src/parcsr_ls/par_nongalerkin.c b/external/hypre/src/parcsr_ls/par_nongalerkin.c
index b8a75b2c..d052dc12 100644
--- a/external/hypre/src/parcsr_ls/par_nongalerkin.c
+++ b/external/hypre/src/parcsr_ls/par_nongalerkin.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -7,6 +7,7 @@
 
 #include "_hypre_parcsr_ls.h"
 #include "../HYPRE.h"
+#include "_hypre_IJ_mv.h"
 
 /* This file contains the routines for constructing non-Galerkin coarse grid
  * operators, based on the original Galerkin coarse grid
@@ -25,13 +26,15 @@ hypre_GrabSubArray(HYPRE_Int * indices,
                    HYPRE_BigInt * array,
                    HYPRE_BigInt * output)
 {
-    HYPRE_Int i, length;
-    length = end - start + 1;
+   HYPRE_Int i, length;
+   length = end - start + 1;
 
-    for(i = 0; i < length; i++)
-    {   output[i] = array[ indices[start + i] ]; }
+   for (i = 0; i < length; i++)
+   {
+      output[i] = array[indices[start + i]];
+   }
 
-    return 0;
+   return hypre_error_flag;
 }
 
 /* Compute the intersection of x and y, placing
@@ -58,70 +61,70 @@ hypre_IntersectTwoArrays(HYPRE_Int *x,
                          HYPRE_Real *output_x_data,
                          HYPRE_Int  *intersect_length)
 {
-    HYPRE_Int x_index = 0;
-    HYPRE_Int y_index = 0;
-    *intersect_length = 0;
-
-    /* Compute Intersection, looping over each array */
-    while ( (x_index < x_length) && (y_index < y_length) )
-    {
-        if (x[x_index] > y[y_index])
-        {
-            y_index = y_index + 1;
-        }
-        else if (x[x_index] < y[y_index])
-        {
-            x_index = x_index + 1;
-        }
-        else
-        {
-            z[*intersect_length] = x[x_index];
-            output_x_data[*intersect_length] = x_data[x_index];
-            x_index = x_index + 1;
-            y_index = y_index + 1;
-            *intersect_length = *intersect_length + 1;
-        }
-    }
-
-    return 1;
+   HYPRE_Int x_index = 0;
+   HYPRE_Int y_index = 0;
+   *intersect_length = 0;
+
+   /* Compute Intersection, looping over each array */
+   while ( (x_index < x_length) && (y_index < y_length) )
+   {
+      if (x[x_index] > y[y_index])
+      {
+         y_index = y_index + 1;
+      }
+      else if (x[x_index] < y[y_index])
+      {
+         x_index = x_index + 1;
+      }
+      else
+      {
+         z[*intersect_length] = x[x_index];
+         output_x_data[*intersect_length] = x_data[x_index];
+         x_index = x_index + 1;
+         y_index = y_index + 1;
+         *intersect_length = *intersect_length + 1;
+      }
+   }
+
+   return 1;
 }
 
 HYPRE_Int
 hypre_IntersectTwoBigArrays(HYPRE_BigInt *x,
-                         HYPRE_Real *x_data,
-                         HYPRE_Int  x_length,
-                         HYPRE_BigInt *y,
-                         HYPRE_Int  y_length,
-                         HYPRE_BigInt *z,
-                         HYPRE_Real *output_x_data,
-                         HYPRE_Int  *intersect_length)
+                            HYPRE_Real *x_data,
+                            HYPRE_Int  x_length,
+                            HYPRE_BigInt *y,
+                            HYPRE_Int  y_length,
+                            HYPRE_BigInt *z,
+                            HYPRE_Real *output_x_data,
+                            HYPRE_Int  *intersect_length)
 {
-    HYPRE_Int x_index = 0;
-    HYPRE_Int y_index = 0;
-    *intersect_length = 0;
-
-    /* Compute Intersection, looping over each array */
-    while ( (x_index < x_length) && (y_index < y_length) )
-    {
-        if (x[x_index] > y[y_index])
-        {
-            y_index = y_index + 1;
-        }
-        else if (x[x_index] < y[y_index])
-        {
-            x_index = x_index + 1;
-        }
-        else
-        {
-            z[*intersect_length] = x[x_index];
-            output_x_data[*intersect_length] = x_data[x_index];
-            x_index = x_index + 1;
-            y_index = y_index + 1;
-            *intersect_length = *intersect_length + 1;
-        }
-    }
-
-    return 1;
+   HYPRE_Int x_index = 0;
+   HYPRE_Int y_index = 0;
+   *intersect_length = 0;
+
+   /* Compute Intersection, looping over each array */
+   while ( (x_index < x_length) && (y_index < y_length) )
+   {
+      if (x[x_index] > y[y_index])
+      {
+         y_index = y_index + 1;
+      }
+      else if (x[x_index] < y[y_index])
+      {
+         x_index = x_index + 1;
+      }
+      else
+      {
+         z[*intersect_length] = x[x_index];
+         output_x_data[*intersect_length] = x_data[x_index];
+         x_index = x_index + 1;
+         y_index = y_index + 1;
+         *intersect_length = *intersect_length + 1;
+      }
+   }
+
+   return 1;
 }
 
 /* Copy CSR matrix A to CSR matrix B.  The column indices are
@@ -137,84 +140,84 @@ HYPRE_Int
 hypre_SortedCopyParCSRData(hypre_ParCSRMatrix  *A,
                            hypre_ParCSRMatrix  *B)
 {
-    /* Grab off A and B's data structures */
-    hypre_CSRMatrix     *A_diag               = hypre_ParCSRMatrixDiag(A);
-    HYPRE_Int           *A_diag_i             = hypre_CSRMatrixI(A_diag);
-    HYPRE_Int           *A_diag_j             = hypre_CSRMatrixJ(A_diag);
-    HYPRE_Real          *A_diag_data          = hypre_CSRMatrixData(A_diag);
-
-    hypre_CSRMatrix     *A_offd               = hypre_ParCSRMatrixOffd(A);
-    HYPRE_Int           *A_offd_i             = hypre_CSRMatrixI(A_offd);
-    HYPRE_Int           *A_offd_j             = hypre_CSRMatrixJ(A_offd);
-    HYPRE_Real          *A_offd_data          = hypre_CSRMatrixData(A_offd);
-
-    hypre_CSRMatrix     *B_diag               = hypre_ParCSRMatrixDiag(B);
-    HYPRE_Int           *B_diag_i             = hypre_CSRMatrixI(B_diag);
-    HYPRE_Int           *B_diag_j             = hypre_CSRMatrixJ(B_diag);
-    HYPRE_Real          *B_diag_data          = hypre_CSRMatrixData(B_diag);
-
-    hypre_CSRMatrix     *B_offd               = hypre_ParCSRMatrixOffd(B);
-    HYPRE_Int           *B_offd_i             = hypre_CSRMatrixI(B_offd);
-    HYPRE_Int           *B_offd_j             = hypre_CSRMatrixJ(B_offd);
-    HYPRE_Real          *B_offd_data          = hypre_CSRMatrixData(B_offd);
-
-    HYPRE_Int            num_variables        = hypre_CSRMatrixNumRows(A_diag);
-    HYPRE_Int            *temp_int_array      = NULL;
-    HYPRE_Int            temp_int_array_length=0;
-    HYPRE_Int            i, length, offset_A, offset_B;
-
-    for(i = 0; i < num_variables; i++)
-    {
-
-        /* Deal with the first row entries, which may be diagonal elements */
-        if( A_diag_j[A_diag_i[i]] == i)
-        {   offset_A = 1; }
-        else
-        {   offset_A = 0; }
-        if( B_diag_j[B_diag_i[i]] == i)
-        {   offset_B = 1; }
-        else
-        {   offset_B = 0; }
-        if( (offset_B == 1) && (offset_A == 1) )
-        {   B_diag_data[B_diag_i[i]] = A_diag_data[A_diag_i[i]]; }
-
-        /* This finds the intersection of the column indices, and
-         * also copies the matching data in A to the data array in B
-         **/
-        if( (A_diag_i[i+1] - A_diag_i[i] - offset_A) > temp_int_array_length )
-        {
-            hypre_TFree(temp_int_array, HYPRE_MEMORY_HOST);
-            temp_int_array_length = (A_diag_i[i+1] - A_diag_i[i] - offset_A);
-            temp_int_array = hypre_CTAlloc(HYPRE_Int,  temp_int_array_length, HYPRE_MEMORY_HOST);
-        }
-        hypre_IntersectTwoArrays(&(A_diag_j[A_diag_i[i] + offset_A]),
-                                 &(A_diag_data[A_diag_i[i] + offset_A]),
-                                 A_diag_i[i+1] - A_diag_i[i] - offset_A,
-                                 &(B_diag_j[B_diag_i[i] + offset_B]),
-                                 B_diag_i[i+1] - B_diag_i[i] - offset_B,
-                                 temp_int_array,
-                                 &(B_diag_data[B_diag_i[i] + offset_B]),
-                                 &length);
-
-        if( (A_offd_i[i+1] - A_offd_i[i]) > temp_int_array_length )
-        {
-            hypre_TFree(temp_int_array, HYPRE_MEMORY_HOST);
-            temp_int_array_length = (A_offd_i[i+1] - A_offd_i[i]);
-            temp_int_array = hypre_CTAlloc(HYPRE_Int,  temp_int_array_length, HYPRE_MEMORY_HOST);
-        }
-        hypre_IntersectTwoArrays(&(A_offd_j[A_offd_i[i]]),
-                                 &(A_offd_data[A_offd_i[i]]),
-                                 A_offd_i[i+1] - A_offd_i[i],
-                                 &(B_offd_j[B_offd_i[i]]),
-                                 B_offd_i[i+1] - B_offd_i[i],
-                                 temp_int_array,
-                                 &(B_offd_data[B_offd_i[i]]),
-                                 &length);
-    }
-
-    if(temp_int_array)
-    {    hypre_TFree(temp_int_array, HYPRE_MEMORY_HOST); }
-    return 1;
+   /* Grab off A and B's data structures */
+   hypre_CSRMatrix     *A_diag               = hypre_ParCSRMatrixDiag(A);
+   HYPRE_Int           *A_diag_i             = hypre_CSRMatrixI(A_diag);
+   HYPRE_Int           *A_diag_j             = hypre_CSRMatrixJ(A_diag);
+   HYPRE_Real          *A_diag_data          = hypre_CSRMatrixData(A_diag);
+
+   hypre_CSRMatrix     *A_offd               = hypre_ParCSRMatrixOffd(A);
+   HYPRE_Int           *A_offd_i             = hypre_CSRMatrixI(A_offd);
+   HYPRE_Int           *A_offd_j             = hypre_CSRMatrixJ(A_offd);
+   HYPRE_Real          *A_offd_data          = hypre_CSRMatrixData(A_offd);
+
+   hypre_CSRMatrix     *B_diag               = hypre_ParCSRMatrixDiag(B);
+   HYPRE_Int           *B_diag_i             = hypre_CSRMatrixI(B_diag);
+   HYPRE_Int           *B_diag_j             = hypre_CSRMatrixJ(B_diag);
+   HYPRE_Real          *B_diag_data          = hypre_CSRMatrixData(B_diag);
+
+   hypre_CSRMatrix     *B_offd               = hypre_ParCSRMatrixOffd(B);
+   HYPRE_Int           *B_offd_i             = hypre_CSRMatrixI(B_offd);
+   HYPRE_Int           *B_offd_j             = hypre_CSRMatrixJ(B_offd);
+   HYPRE_Real          *B_offd_data          = hypre_CSRMatrixData(B_offd);
+
+   HYPRE_Int            num_variables        = hypre_CSRMatrixNumRows(A_diag);
+   HYPRE_Int            *temp_int_array      = NULL;
+   HYPRE_Int            temp_int_array_length = 0;
+   HYPRE_Int            i, length, offset_A, offset_B;
+
+   for (i = 0; i < num_variables; i++)
+   {
+
+      /* Deal with the first row entries, which may be diagonal elements */
+      if ( A_diag_j[A_diag_i[i]] == i)
+      {   offset_A = 1; }
+      else
+      {   offset_A = 0; }
+      if ( B_diag_j[B_diag_i[i]] == i)
+      {   offset_B = 1; }
+      else
+      {   offset_B = 0; }
+      if ( (offset_B == 1) && (offset_A == 1) )
+      {   B_diag_data[B_diag_i[i]] = A_diag_data[A_diag_i[i]]; }
+
+      /* This finds the intersection of the column indices, and
+       * also copies the matching data in A to the data array in B
+       **/
+      if ( (A_diag_i[i + 1] - A_diag_i[i] - offset_A) > temp_int_array_length )
+      {
+         hypre_TFree(temp_int_array, HYPRE_MEMORY_HOST);
+         temp_int_array_length = (A_diag_i[i + 1] - A_diag_i[i] - offset_A);
+         temp_int_array = hypre_CTAlloc(HYPRE_Int,  temp_int_array_length, HYPRE_MEMORY_HOST);
+      }
+      hypre_IntersectTwoArrays(&(A_diag_j[A_diag_i[i] + offset_A]),
+                               &(A_diag_data[A_diag_i[i] + offset_A]),
+                               A_diag_i[i + 1] - A_diag_i[i] - offset_A,
+                               &(B_diag_j[B_diag_i[i] + offset_B]),
+                               B_diag_i[i + 1] - B_diag_i[i] - offset_B,
+                               temp_int_array,
+                               &(B_diag_data[B_diag_i[i] + offset_B]),
+                               &length);
+
+      if ( (A_offd_i[i + 1] - A_offd_i[i]) > temp_int_array_length )
+      {
+         hypre_TFree(temp_int_array, HYPRE_MEMORY_HOST);
+         temp_int_array_length = (A_offd_i[i + 1] - A_offd_i[i]);
+         temp_int_array = hypre_CTAlloc(HYPRE_Int,  temp_int_array_length, HYPRE_MEMORY_HOST);
+      }
+      hypre_IntersectTwoArrays(&(A_offd_j[A_offd_i[i]]),
+                               &(A_offd_data[A_offd_i[i]]),
+                               A_offd_i[i + 1] - A_offd_i[i],
+                               &(B_offd_j[B_offd_i[i]]),
+                               B_offd_i[i + 1] - B_offd_i[i],
+                               temp_int_array,
+                               &(B_offd_data[B_offd_i[i]]),
+                               &length);
+   }
+
+   if (temp_int_array)
+   {    hypre_TFree(temp_int_array, HYPRE_MEMORY_HOST); }
+   return 1;
 }
 
 /*
@@ -229,380 +232,385 @@ hypre_BoomerAMG_MyCreateS(hypre_ParCSRMatrix  *A,
                           HYPRE_Int           *dof_func,
                           hypre_ParCSRMatrix  **S_ptr)
 {
-    MPI_Comm                 comm            = hypre_ParCSRMatrixComm(A);
-    hypre_ParCSRCommPkg     *comm_pkg        = hypre_ParCSRMatrixCommPkg(A);
-    hypre_ParCSRCommHandle  *comm_handle;
-    hypre_CSRMatrix         *A_diag          = hypre_ParCSRMatrixDiag(A);
-    HYPRE_Int               *A_diag_i        = hypre_CSRMatrixI(A_diag);
-    HYPRE_Real              *A_diag_data     = hypre_CSRMatrixData(A_diag);
-
-
-    hypre_CSRMatrix         *A_offd          = hypre_ParCSRMatrixOffd(A);
-    HYPRE_Int               *A_offd_i        = hypre_CSRMatrixI(A_offd);
-    HYPRE_Real              *A_offd_data     = NULL;
-    HYPRE_Int               *A_diag_j        = hypre_CSRMatrixJ(A_diag);
-    HYPRE_Int               *A_offd_j        = hypre_CSRMatrixJ(A_offd);
-
-    HYPRE_BigInt            *row_starts      = hypre_ParCSRMatrixRowStarts(A);
-    HYPRE_Int                num_variables   = hypre_CSRMatrixNumRows(A_diag);
-    HYPRE_BigInt             global_num_vars = hypre_ParCSRMatrixGlobalNumRows(A);
-    HYPRE_Int                num_nonzeros_diag;
-    HYPRE_Int                num_nonzeros_offd = 0;
-    HYPRE_Int                num_cols_offd     = 0;
-
-    hypre_ParCSRMatrix      *S;
-    hypre_CSRMatrix         *S_diag;
-    HYPRE_Int               *S_diag_i;
-    HYPRE_Int               *S_diag_j;
-    HYPRE_Real              *S_diag_data;
-    hypre_CSRMatrix         *S_offd;
-    HYPRE_Int               *S_offd_i = NULL;
-    HYPRE_Int               *S_offd_j = NULL;
-    HYPRE_Real              *S_offd_data;
-
-    HYPRE_Real               diag, row_scale, row_sum;
-    HYPRE_Int                i, jA, jS;
-
-    HYPRE_Int                ierr = 0;
-
-    HYPRE_Int               *dof_func_offd;
-    HYPRE_Int                num_sends;
-    HYPRE_Int               *int_buf_data;
-    HYPRE_Int                index, start, j;
-
-    /*--------------------------------------------------------------
-     * Compute a  ParCSR strength matrix, S.
-     *
-     * For now, the "strength" of dependence/influence is defined in
-     * the following way: i depends on j if
-     *     aij > hypre_max (k != i) aik,    aii < 0
-     * or
-     *     aij < hypre_min (k != i) aik,    aii >= 0
-     * Then S_ij = aij, else S_ij = 0.
-     *
-     * NOTE: the entries are negative initially, corresponding
-     * to "unaccounted-for" dependence.
-     *----------------------------------------------------------------*/
-
-    num_nonzeros_diag = A_diag_i[num_variables];
-    num_cols_offd = hypre_CSRMatrixNumCols(A_offd);
-
-    A_offd_i = hypre_CSRMatrixI(A_offd);
-    num_nonzeros_offd = A_offd_i[num_variables];
-
-    /* Initialize S */
-    S = hypre_ParCSRMatrixCreate(comm, global_num_vars, global_num_vars,
-                                 row_starts, row_starts,
-                                 num_cols_offd, num_nonzeros_diag, num_nonzeros_offd);
-    S_diag = hypre_ParCSRMatrixDiag(S);
-    hypre_CSRMatrixI(S_diag) = hypre_CTAlloc(HYPRE_Int,  num_variables+1, HYPRE_MEMORY_HOST);
-    hypre_CSRMatrixJ(S_diag) = hypre_CTAlloc(HYPRE_Int,  num_nonzeros_diag, HYPRE_MEMORY_HOST);
-    hypre_CSRMatrixData(S_diag) = hypre_CTAlloc(HYPRE_Real,  num_nonzeros_diag, HYPRE_MEMORY_HOST);
-    S_offd = hypre_ParCSRMatrixOffd(S);
-    hypre_CSRMatrixI(S_offd) = hypre_CTAlloc(HYPRE_Int,  num_variables+1, HYPRE_MEMORY_HOST);
-
-    S_diag_i = hypre_CSRMatrixI(S_diag);
-    S_diag_j = hypre_CSRMatrixJ(S_diag);
-    S_diag_data = hypre_CSRMatrixData(S_diag);
-    S_offd_i = hypre_CSRMatrixI(S_offd);
+   MPI_Comm                 comm            = hypre_ParCSRMatrixComm(A);
+   hypre_ParCSRCommPkg     *comm_pkg        = hypre_ParCSRMatrixCommPkg(A);
+   hypre_ParCSRCommHandle  *comm_handle;
+   hypre_CSRMatrix         *A_diag          = hypre_ParCSRMatrixDiag(A);
+   HYPRE_Int               *A_diag_i        = hypre_CSRMatrixI(A_diag);
+   HYPRE_Real              *A_diag_data     = hypre_CSRMatrixData(A_diag);
+
+
+   hypre_CSRMatrix         *A_offd          = hypre_ParCSRMatrixOffd(A);
+   HYPRE_Int               *A_offd_i        = hypre_CSRMatrixI(A_offd);
+   HYPRE_Real              *A_offd_data     = NULL;
+   HYPRE_Int               *A_diag_j        = hypre_CSRMatrixJ(A_diag);
+   HYPRE_Int               *A_offd_j        = hypre_CSRMatrixJ(A_offd);
+
+   HYPRE_BigInt            *row_starts      = hypre_ParCSRMatrixRowStarts(A);
+   HYPRE_Int                num_variables   = hypre_CSRMatrixNumRows(A_diag);
+   HYPRE_BigInt             global_num_vars = hypre_ParCSRMatrixGlobalNumRows(A);
+   HYPRE_Int                num_nonzeros_diag;
+   HYPRE_Int                num_nonzeros_offd = 0;
+   HYPRE_Int                num_cols_offd     = 0;
+
+   hypre_ParCSRMatrix      *S;
+   hypre_CSRMatrix         *S_diag;
+   HYPRE_Int               *S_diag_i;
+   HYPRE_Int               *S_diag_j;
+   HYPRE_Real              *S_diag_data;
+   hypre_CSRMatrix         *S_offd;
+   HYPRE_Int               *S_offd_i = NULL;
+   HYPRE_Int               *S_offd_j = NULL;
+   HYPRE_Real              *S_offd_data = NULL;
+
+   HYPRE_Real               diag, row_scale, row_sum;
+   HYPRE_Int                i, jA, jS;
+
+   HYPRE_Int                ierr = 0;
+
+   HYPRE_Int               *dof_func_offd;
+   HYPRE_Int                num_sends;
+   HYPRE_Int               *int_buf_data;
+   HYPRE_Int                index, start, j;
+
+   /*--------------------------------------------------------------
+    * Compute a  ParCSR strength matrix, S.
+    *
+    * For now, the "strength" of dependence/influence is defined in
+    * the following way: i depends on j if
+    *     aij > hypre_max (k != i) aik,    aii < 0
+    * or
+    *     aij < hypre_min (k != i) aik,    aii >= 0
+    * Then S_ij = aij, else S_ij = 0.
+    *
+    * NOTE: the entries are negative initially, corresponding
+    * to "unaccounted-for" dependence.
+    *----------------------------------------------------------------*/
+
+   num_nonzeros_diag = A_diag_i[num_variables];
+   num_cols_offd = hypre_CSRMatrixNumCols(A_offd);
+
+   A_offd_i = hypre_CSRMatrixI(A_offd);
+   num_nonzeros_offd = A_offd_i[num_variables];
+
+   /* Initialize S */
+   S = hypre_ParCSRMatrixCreate(comm, global_num_vars, global_num_vars,
+                                row_starts, row_starts,
+                                num_cols_offd, num_nonzeros_diag, num_nonzeros_offd);
+   S_diag = hypre_ParCSRMatrixDiag(S);
+   hypre_CSRMatrixI(S_diag) = hypre_CTAlloc(HYPRE_Int,  num_variables + 1, HYPRE_MEMORY_HOST);
+   hypre_CSRMatrixJ(S_diag) = hypre_CTAlloc(HYPRE_Int,  num_nonzeros_diag, HYPRE_MEMORY_HOST);
+   hypre_CSRMatrixData(S_diag) = hypre_CTAlloc(HYPRE_Real,  num_nonzeros_diag, HYPRE_MEMORY_HOST);
+   S_offd = hypre_ParCSRMatrixOffd(S);
+   hypre_CSRMatrixI(S_offd) = hypre_CTAlloc(HYPRE_Int,  num_variables + 1, HYPRE_MEMORY_HOST);
+
+   S_diag_i = hypre_CSRMatrixI(S_diag);
+   S_diag_j = hypre_CSRMatrixJ(S_diag);
+   S_diag_data = hypre_CSRMatrixData(S_diag);
+   S_offd_i = hypre_CSRMatrixI(S_offd);
 
    hypre_CSRMatrixMemoryLocation(S_diag) = HYPRE_MEMORY_HOST;
    hypre_CSRMatrixMemoryLocation(S_offd) = HYPRE_MEMORY_HOST;
 
-    dof_func_offd = NULL;
-
-    if (num_cols_offd)
-    {
-        A_offd_data = hypre_CSRMatrixData(A_offd);
-        hypre_CSRMatrixJ(S_offd) = hypre_CTAlloc(HYPRE_Int,  num_nonzeros_offd, HYPRE_MEMORY_HOST);
-        hypre_CSRMatrixData(S_offd) = hypre_CTAlloc(HYPRE_Real,  num_nonzeros_offd, HYPRE_MEMORY_HOST);
-        S_offd_j = hypre_CSRMatrixJ(S_offd);
-        S_offd_data = hypre_CSRMatrixData(S_offd);
-        hypre_ParCSRMatrixColMapOffd(S) = hypre_CTAlloc(HYPRE_BigInt,  num_cols_offd, HYPRE_MEMORY_HOST);
-        if (num_functions > 1)
-            dof_func_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_offd, HYPRE_MEMORY_HOST);
-    }
-
-
-    /*-------------------------------------------------------------------
-     * Get the dof_func data for the off-processor columns
-     *-------------------------------------------------------------------*/
-
-    if (!comm_pkg)
-    {
-        hypre_MatvecCommPkgCreate(A);
-        comm_pkg = hypre_ParCSRMatrixCommPkg(A);
-    }
-
-    num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
-    if (num_functions > 1)
-    {
-        int_buf_data = hypre_CTAlloc(HYPRE_Int, hypre_ParCSRCommPkgSendMapStart(comm_pkg,
-                                                                               num_sends), HYPRE_MEMORY_HOST);
-        index = 0;
-        for (i = 0; i < num_sends; i++)
-        {
-            start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-            for (j=start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
-                int_buf_data[index++] = dof_func[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
-        }
-
-        comm_handle = hypre_ParCSRCommHandleCreate( 11, comm_pkg, int_buf_data,
-                                                   dof_func_offd);
-
-        hypre_ParCSRCommHandleDestroy(comm_handle);
-        hypre_TFree(int_buf_data, HYPRE_MEMORY_HOST);
-    }
-
-    /* give S same nonzero structure as A */
-    hypre_ParCSRMatrixCopy(A,S,1);
+   dof_func_offd = NULL;
+
+   if (num_cols_offd)
+   {
+      A_offd_data = hypre_CSRMatrixData(A_offd);
+      hypre_CSRMatrixJ(S_offd) = hypre_CTAlloc(HYPRE_Int,  num_nonzeros_offd, HYPRE_MEMORY_HOST);
+      hypre_CSRMatrixData(S_offd) = hypre_CTAlloc(HYPRE_Real,  num_nonzeros_offd, HYPRE_MEMORY_HOST);
+      S_offd_j = hypre_CSRMatrixJ(S_offd);
+      S_offd_data = hypre_CSRMatrixData(S_offd);
+      hypre_ParCSRMatrixColMapOffd(S) = hypre_CTAlloc(HYPRE_BigInt,  num_cols_offd, HYPRE_MEMORY_HOST);
+      if (num_functions > 1)
+      {
+         dof_func_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_offd, HYPRE_MEMORY_HOST);
+      }
+   }
+
+
+   /*-------------------------------------------------------------------
+    * Get the dof_func data for the off-processor columns
+    *-------------------------------------------------------------------*/
+
+   if (!comm_pkg)
+   {
+      hypre_MatvecCommPkgCreate(A);
+      comm_pkg = hypre_ParCSRMatrixCommPkg(A);
+   }
+
+   num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
+   if (num_functions > 1)
+   {
+      int_buf_data = hypre_CTAlloc(HYPRE_Int, hypre_ParCSRCommPkgSendMapStart(comm_pkg,
+                                                                              num_sends), HYPRE_MEMORY_HOST);
+      index = 0;
+      for (i = 0; i < num_sends; i++)
+      {
+         start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
+         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
+         {
+            int_buf_data[index++] = dof_func[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
+         }
+      }
+
+      comm_handle = hypre_ParCSRCommHandleCreate( 11, comm_pkg, int_buf_data,
+                                                  dof_func_offd);
+
+      hypre_ParCSRCommHandleDestroy(comm_handle);
+      hypre_TFree(int_buf_data, HYPRE_MEMORY_HOST);
+   }
+
+   /* give S same nonzero structure as A */
+   hypre_ParCSRMatrixCopy(A, S, 1);
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i,diag,row_scale,row_sum,jA) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i,diag,row_scale,row_sum,jA) HYPRE_SMP_SCHEDULE
 #endif
-    for (i = 0; i < num_variables; i++)
-    {
-        diag = A_diag_data[A_diag_i[i]];
-
-        /* compute scaling factor and row sum */
-        row_scale = 0.0;
-        row_sum = diag;
-        if (num_functions > 1)
-        {
-            if (diag < 0)
+   for (i = 0; i < num_variables; i++)
+   {
+      diag = A_diag_data[A_diag_i[i]];
+
+      /* compute scaling factor and row sum */
+      row_scale = 0.0;
+      row_sum = diag;
+      if (num_functions > 1)
+      {
+         if (diag < 0)
+         {
+            for (jA = A_diag_i[i] + 1; jA < A_diag_i[i + 1]; jA++)
             {
-                for (jA = A_diag_i[i]+1; jA < A_diag_i[i+1]; jA++)
-                {
-                    if (dof_func[i] == dof_func[A_diag_j[jA]])
-                    {
-                        row_scale = hypre_max(row_scale, A_diag_data[jA]);
-                        row_sum += A_diag_data[jA];
-                    }
-                }
-                for (jA = A_offd_i[i]; jA < A_offd_i[i+1]; jA++)
-                {
-                    if (dof_func[i] == dof_func_offd[A_offd_j[jA]])
-                    {
-                        row_scale = hypre_max(row_scale, A_offd_data[jA]);
-                        row_sum += A_offd_data[jA];
-                    }
-                }
+               if (dof_func[i] == dof_func[A_diag_j[jA]])
+               {
+                  row_scale = hypre_max(row_scale, A_diag_data[jA]);
+                  row_sum += A_diag_data[jA];
+               }
             }
-            else
+            for (jA = A_offd_i[i]; jA < A_offd_i[i + 1]; jA++)
             {
-                for (jA = A_diag_i[i]+1; jA < A_diag_i[i+1]; jA++)
-                {
-                    if (dof_func[i] == dof_func[A_diag_j[jA]])
-                    {
-                        row_scale = hypre_min(row_scale, A_diag_data[jA]);
-                        row_sum += A_diag_data[jA];
-                    }
-                }
-                for (jA = A_offd_i[i]; jA < A_offd_i[i+1]; jA++)
-                {
-                    if (dof_func[i] == dof_func_offd[A_offd_j[jA]])
-                    {
-                        row_scale = hypre_min(row_scale, A_offd_data[jA]);
-                        row_sum += A_offd_data[jA];
-                    }
-                }
+               if (dof_func[i] == dof_func_offd[A_offd_j[jA]])
+               {
+                  row_scale = hypre_max(row_scale, A_offd_data[jA]);
+                  row_sum += A_offd_data[jA];
+               }
             }
-        }
-        else
-        {
-            if (diag < 0)
+         }
+         else
+         {
+            for (jA = A_diag_i[i] + 1; jA < A_diag_i[i + 1]; jA++)
             {
-                for (jA = A_diag_i[i]+1; jA < A_diag_i[i+1]; jA++)
-                {
-                    row_scale = hypre_max(row_scale, A_diag_data[jA]);
-                    row_sum += A_diag_data[jA];
-                }
-                for (jA = A_offd_i[i]; jA < A_offd_i[i+1]; jA++)
-                {
-                    row_scale = hypre_max(row_scale, A_offd_data[jA]);
-                    row_sum += A_offd_data[jA];
-                }
+               if (dof_func[i] == dof_func[A_diag_j[jA]])
+               {
+                  row_scale = hypre_min(row_scale, A_diag_data[jA]);
+                  row_sum += A_diag_data[jA];
+               }
             }
-            else
+            for (jA = A_offd_i[i]; jA < A_offd_i[i + 1]; jA++)
             {
-                for (jA = A_diag_i[i]+1; jA < A_diag_i[i+1]; jA++)
-                {
-                    row_scale = hypre_min(row_scale, A_diag_data[jA]);
-                    row_sum += A_diag_data[jA];
-                }
-                for (jA = A_offd_i[i]; jA < A_offd_i[i+1]; jA++)
-                {
-                    row_scale = hypre_min(row_scale, A_offd_data[jA]);
-                    row_sum += A_offd_data[jA];
-                }
+               if (dof_func[i] == dof_func_offd[A_offd_j[jA]])
+               {
+                  row_scale = hypre_min(row_scale, A_offd_data[jA]);
+                  row_sum += A_offd_data[jA];
+               }
             }
-        }
-
-        /* compute row entries of S */
-        S_diag_j[A_diag_i[i]] = -1;
-        if ((fabs(row_sum) > fabs(diag)*max_row_sum) && (max_row_sum < 1.0))
-        {
-            /* make all dependencies weak */
-            for (jA = A_diag_i[i]+1; jA < A_diag_i[i+1]; jA++)
+         }
+      }
+      else
+      {
+         if (diag < 0)
+         {
+            for (jA = A_diag_i[i] + 1; jA < A_diag_i[i + 1]; jA++)
             {
-                S_diag_j[jA] = -1;
+               row_scale = hypre_max(row_scale, A_diag_data[jA]);
+               row_sum += A_diag_data[jA];
             }
-            for (jA = A_offd_i[i]; jA < A_offd_i[i+1]; jA++)
+            for (jA = A_offd_i[i]; jA < A_offd_i[i + 1]; jA++)
             {
-                S_offd_j[jA] = -1;
+               row_scale = hypre_max(row_scale, A_offd_data[jA]);
+               row_sum += A_offd_data[jA];
             }
-        }
-        else
-        {
-            if (num_functions > 1)
+         }
+         else
+         {
+            for (jA = A_diag_i[i] + 1; jA < A_diag_i[i + 1]; jA++)
             {
-                if (diag < 0)
-                {
-                    for (jA = A_diag_i[i]+1; jA < A_diag_i[i+1]; jA++)
-                    {
-                        if (A_diag_data[jA] <= strength_threshold * row_scale
-                            || dof_func[i] != dof_func[A_diag_j[jA]])
-                        {
-                            S_diag_j[jA] = -1;
-                        }
-                    }
-                    for (jA = A_offd_i[i]; jA < A_offd_i[i+1]; jA++)
-                    {
-                        if (A_offd_data[jA] <= strength_threshold * row_scale
-                            || dof_func[i] != dof_func_offd[A_offd_j[jA]])
-                        {
-                            S_offd_j[jA] = -1;
-                        }
-                    }
-                }
-                else
-                {
-                    for (jA = A_diag_i[i]+1; jA < A_diag_i[i+1]; jA++)
-                    {
-                        if (A_diag_data[jA] >= strength_threshold * row_scale
-                            || dof_func[i] != dof_func[A_diag_j[jA]])
-                        {
-                            S_diag_j[jA] = -1;
-                        }
-                    }
-                    for (jA = A_offd_i[i]; jA < A_offd_i[i+1]; jA++)
-                    {
-                        if (A_offd_data[jA] >= strength_threshold * row_scale
-                            || dof_func[i] != dof_func_offd[A_offd_j[jA]])
-                        {
-                            S_offd_j[jA] = -1;
-                        }
-                    }
-                }
+               row_scale = hypre_min(row_scale, A_diag_data[jA]);
+               row_sum += A_diag_data[jA];
+            }
+            for (jA = A_offd_i[i]; jA < A_offd_i[i + 1]; jA++)
+            {
+               row_scale = hypre_min(row_scale, A_offd_data[jA]);
+               row_sum += A_offd_data[jA];
+            }
+         }
+      }
+
+      /* compute row entries of S */
+      S_diag_j[A_diag_i[i]] = -1;
+      if ((hypre_abs(row_sum) > hypre_abs(diag)*max_row_sum) && (max_row_sum < 1.0))
+      {
+         /* make all dependencies weak */
+         for (jA = A_diag_i[i] + 1; jA < A_diag_i[i + 1]; jA++)
+         {
+            S_diag_j[jA] = -1;
+         }
+         for (jA = A_offd_i[i]; jA < A_offd_i[i + 1]; jA++)
+         {
+            S_offd_j[jA] = -1;
+         }
+      }
+      else
+      {
+         if (num_functions > 1)
+         {
+            if (diag < 0)
+            {
+               for (jA = A_diag_i[i] + 1; jA < A_diag_i[i + 1]; jA++)
+               {
+                  if (A_diag_data[jA] <= strength_threshold * row_scale
+                      || dof_func[i] != dof_func[A_diag_j[jA]])
+                  {
+                     S_diag_j[jA] = -1;
+                  }
+               }
+               for (jA = A_offd_i[i]; jA < A_offd_i[i + 1]; jA++)
+               {
+                  if (A_offd_data[jA] <= strength_threshold * row_scale
+                      || dof_func[i] != dof_func_offd[A_offd_j[jA]])
+                  {
+                     S_offd_j[jA] = -1;
+                  }
+               }
             }
             else
             {
-                if (diag < 0)
-                {
-                    for (jA = A_diag_i[i]+1; jA < A_diag_i[i+1]; jA++)
-                    {
-                        if (A_diag_data[jA] <= strength_threshold * row_scale)
-                        {
-                            S_diag_j[jA] = -1;
-                        }
-                    }
-                    for (jA = A_offd_i[i]; jA < A_offd_i[i+1]; jA++)
-                    {
-                        if (A_offd_data[jA] <= strength_threshold * row_scale)
-                        {
-                            S_offd_j[jA] = -1;
-                        }
-                    }
-                }
-                else
-                {
-                    for (jA = A_diag_i[i]+1; jA < A_diag_i[i+1]; jA++)
-                    {
-                        if (A_diag_data[jA] >= strength_threshold * row_scale)
-                        {
-                            S_diag_j[jA] = -1;
-                        }
-                    }
-                    for (jA = A_offd_i[i]; jA < A_offd_i[i+1]; jA++)
-                    {
-                        if (A_offd_data[jA] >= strength_threshold * row_scale)
-                        {
-                            S_offd_j[jA] = -1;
-                        }
-                    }
-                }
+               for (jA = A_diag_i[i] + 1; jA < A_diag_i[i + 1]; jA++)
+               {
+                  if (A_diag_data[jA] >= strength_threshold * row_scale
+                      || dof_func[i] != dof_func[A_diag_j[jA]])
+                  {
+                     S_diag_j[jA] = -1;
+                  }
+               }
+               for (jA = A_offd_i[i]; jA < A_offd_i[i + 1]; jA++)
+               {
+                  if (A_offd_data[jA] >= strength_threshold * row_scale
+                      || dof_func[i] != dof_func_offd[A_offd_j[jA]])
+                  {
+                     S_offd_j[jA] = -1;
+                  }
+               }
             }
-        }
-    }
-
-    /*--------------------------------------------------------------
-     * "Compress" the strength matrix.
-     *
-     * NOTE: S has *NO DIAGONAL ELEMENT* on any row.  Caveat Emptor!
-     *
-     * NOTE: This "compression" section of code may not be removed, the
-     * non-Galerkin routine depends on it.
-     *----------------------------------------------------------------*/
-
-    /* RDF: not sure if able to thread this loop */
-    jS = 0;
-    for (i = 0; i < num_variables; i++)
-    {
-        S_diag_i[i] = jS;
-        for (jA = A_diag_i[i]; jA < A_diag_i[i+1]; jA++)
-        {
-            if (S_diag_j[jA] > -1)
+         }
+         else
+         {
+            if (diag < 0)
             {
-                S_diag_j[jS]    = S_diag_j[jA];
-                S_diag_data[jS] = S_diag_data[jA];
-                jS++;
+               for (jA = A_diag_i[i] + 1; jA < A_diag_i[i + 1]; jA++)
+               {
+                  if (A_diag_data[jA] <= strength_threshold * row_scale)
+                  {
+                     S_diag_j[jA] = -1;
+                  }
+               }
+               for (jA = A_offd_i[i]; jA < A_offd_i[i + 1]; jA++)
+               {
+                  if (A_offd_data[jA] <= strength_threshold * row_scale)
+                  {
+                     S_offd_j[jA] = -1;
+                  }
+               }
             }
-        }
-    }
-    S_diag_i[num_variables] = jS;
-    hypre_CSRMatrixNumNonzeros(S_diag) = jS;
-
-    /* RDF: not sure if able to thread this loop */
-    jS = 0;
-    for (i = 0; i < num_variables; i++)
-    {
-        S_offd_i[i] = jS;
-        for (jA = A_offd_i[i]; jA < A_offd_i[i+1]; jA++)
-        {
-            if (S_offd_j[jA] > -1)
+            else
             {
-                S_offd_j[jS]    = S_offd_j[jA];
-                S_offd_data[jS] = S_offd_data[jA];
-                jS++;
+               for (jA = A_diag_i[i] + 1; jA < A_diag_i[i + 1]; jA++)
+               {
+                  if (A_diag_data[jA] >= strength_threshold * row_scale)
+                  {
+                     S_diag_j[jA] = -1;
+                  }
+               }
+               for (jA = A_offd_i[i]; jA < A_offd_i[i + 1]; jA++)
+               {
+                  if (A_offd_data[jA] >= strength_threshold * row_scale)
+                  {
+                     S_offd_j[jA] = -1;
+                  }
+               }
             }
-        }
-    }
-    S_offd_i[num_variables] = jS;
-    hypre_CSRMatrixNumNonzeros(S_offd) = jS;
-    hypre_ParCSRMatrixCommPkg(S) = NULL;
-
-    *S_ptr        = S;
-
-    hypre_TFree(dof_func_offd, HYPRE_MEMORY_HOST);
-
-    return (ierr);
+         }
+      }
+   }
+
+   /*--------------------------------------------------------------
+    * "Compress" the strength matrix.
+    *
+    * NOTE: S has *NO DIAGONAL ELEMENT* on any row.  Caveat Emptor!
+    *
+    * NOTE: This "compression" section of code may not be removed, the
+    * non-Galerkin routine depends on it.
+    *----------------------------------------------------------------*/
+
+   /* RDF: not sure if able to thread this loop */
+   jS = 0;
+   for (i = 0; i < num_variables; i++)
+   {
+      S_diag_i[i] = jS;
+      for (jA = A_diag_i[i]; jA < A_diag_i[i + 1]; jA++)
+      {
+         if (S_diag_j[jA] > -1)
+         {
+            S_diag_j[jS]    = S_diag_j[jA];
+            S_diag_data[jS] = S_diag_data[jA];
+            jS++;
+         }
+      }
+   }
+   S_diag_i[num_variables] = jS;
+   hypre_CSRMatrixNumNonzeros(S_diag) = jS;
+
+   /* RDF: not sure if able to thread this loop */
+   jS = 0;
+   for (i = 0; i < num_variables; i++)
+   {
+      S_offd_i[i] = jS;
+      for (jA = A_offd_i[i]; jA < A_offd_i[i + 1]; jA++)
+      {
+         if (S_offd_j[jA] > -1)
+         {
+            S_offd_j[jS]    = S_offd_j[jA];
+            S_offd_data[jS] = S_offd_data[jA];
+            jS++;
+         }
+      }
+   }
+   S_offd_i[num_variables] = jS;
+   hypre_CSRMatrixNumNonzeros(S_offd) = jS;
+   hypre_ParCSRMatrixCommPkg(S) = NULL;
+
+   *S_ptr        = S;
+
+   hypre_TFree(dof_func_offd, HYPRE_MEMORY_HOST);
+
+   return (ierr);
 }
 
 /**
  * Initialize the IJBuffer counters
  **/
 HYPRE_Int
-hypre_NonGalerkinIJBufferInit( HYPRE_Int     *ijbuf_cnt,           /* See NonGalerkinIJBufferWrite for parameter descriptions */
+hypre_NonGalerkinIJBufferInit( HYPRE_Int
+                               *ijbuf_cnt,           /* See NonGalerkinIJBufferWrite for parameter descriptions */
                                HYPRE_Int     *ijbuf_rowcounter,
                                HYPRE_Int     *ijbuf_numcols )
 {
-    HYPRE_Int                ierr = 0;
+   HYPRE_Int                ierr = 0;
 
-    (*ijbuf_cnt)         = 0;
-    (*ijbuf_rowcounter)  = 1; /*Always points to the next row*/
-    ijbuf_numcols[0]     = 0;
+   (*ijbuf_cnt)         = 0;
+   (*ijbuf_rowcounter)  = 1; /*Always points to the next row*/
+   ijbuf_numcols[0]     = 0;
 
-    return ierr;
+   return ierr;
 }
 
 
@@ -610,17 +618,18 @@ hypre_NonGalerkinIJBufferInit( HYPRE_Int     *ijbuf_cnt,           /* See NonGal
  * Initialize the IJBuffer counters
  **/
 HYPRE_Int
-hypre_NonGalerkinIJBigBufferInit( HYPRE_Int     *ijbuf_cnt,           /* See NonGalerkinIJBufferWrite for parameter descriptions */
-                               HYPRE_Int     *ijbuf_rowcounter,
-                               HYPRE_BigInt     *ijbuf_numcols )
+hypre_NonGalerkinIJBigBufferInit( HYPRE_Int
+                                  *ijbuf_cnt,           /* See NonGalerkinIJBufferWrite for parameter descriptions */
+                                  HYPRE_Int     *ijbuf_rowcounter,
+                                  HYPRE_BigInt     *ijbuf_numcols )
 {
-    HYPRE_Int                ierr = 0;
+   HYPRE_Int                ierr = 0;
 
-    (*ijbuf_cnt)         = 0;
-    (*ijbuf_rowcounter)  = 1; /*Always points to the next row*/
-    ijbuf_numcols[0]     = 0;
+   (*ijbuf_cnt)         = 0;
+   (*ijbuf_rowcounter)  = 1; /*Always points to the next row*/
+   ijbuf_numcols[0]     = 0;
 
-    return ierr;
+   return ierr;
 }
 
 
@@ -629,67 +638,71 @@ hypre_NonGalerkinIJBigBufferInit( HYPRE_Int     *ijbuf_cnt,           /* See Non
  * Update the buffer counters
  **/
 HYPRE_Int
-hypre_NonGalerkinIJBufferNewRow(HYPRE_BigInt  *ijbuf_rownums, /* See NonGalerkinIJBufferWrite for parameter descriptions */
+hypre_NonGalerkinIJBufferNewRow(HYPRE_BigInt
+                                *ijbuf_rownums, /* See NonGalerkinIJBufferWrite for parameter descriptions */
                                 HYPRE_Int     *ijbuf_numcols,
                                 HYPRE_Int     *ijbuf_rowcounter,
                                 HYPRE_BigInt   new_row)
 {
-    HYPRE_Int                ierr = 0;
-
-    /* First check to see if the previous row was empty, and if so, overwrite that row */
-    if( ijbuf_numcols[(*ijbuf_rowcounter)-1] == 0 )
-    {
-       ijbuf_rownums[(*ijbuf_rowcounter)-1] = new_row;
-    }
-    else
-    {
-       /* Move to the next row */
-       ijbuf_rownums[(*ijbuf_rowcounter)] = new_row;
-       ijbuf_numcols[(*ijbuf_rowcounter)] = 0;
-       (*ijbuf_rowcounter)++;
-    }
-
-    return ierr;
+   HYPRE_Int                ierr = 0;
+
+   /* First check to see if the previous row was empty, and if so, overwrite that row */
+   if ( ijbuf_numcols[(*ijbuf_rowcounter) - 1] == 0 )
+   {
+      ijbuf_rownums[(*ijbuf_rowcounter) - 1] = new_row;
+   }
+   else
+   {
+      /* Move to the next row */
+      ijbuf_rownums[(*ijbuf_rowcounter)] = new_row;
+      ijbuf_numcols[(*ijbuf_rowcounter)] = 0;
+      (*ijbuf_rowcounter)++;
+   }
+
+   return ierr;
 }
 
 /**
  * Compress the current row in an IJ Buffer by removing duplicate entries
  **/
 HYPRE_Int
-hypre_NonGalerkinIJBufferCompressRow( HYPRE_Int      *ijbuf_cnt,      /* See NonGalerkinIJBufferWrite for parameter descriptions */
+hypre_NonGalerkinIJBufferCompressRow( HYPRE_Int
+                                      *ijbuf_cnt,      /* See NonGalerkinIJBufferWrite for parameter descriptions */
                                       HYPRE_Int      ijbuf_rowcounter,
                                       HYPRE_Real     *ijbuf_data,
                                       HYPRE_BigInt   *ijbuf_cols,
                                       HYPRE_BigInt   *ijbuf_rownums,
                                       HYPRE_Int      *ijbuf_numcols)
 {
-    HYPRE_Int                ierr = 0;
-    HYPRE_Int                nentries, i, nduplicate;
-
-    /* Compress the current row by removing any repeat entries,
-     * making sure to decrement ijbuf_cnt by nduplicate */
-    nentries = ijbuf_numcols[ ijbuf_rowcounter-1 ];
-    nduplicate = 0;
-    hypre_BigQsort1(ijbuf_cols, ijbuf_data, (*ijbuf_cnt)-nentries, (*ijbuf_cnt)-1 );
-
-    for(i =(*ijbuf_cnt)-nentries+1; i <= (*ijbuf_cnt)-1; i++)
-    {
-        if( ijbuf_cols[i] == ijbuf_cols[i-1] )
-        {
-            /* Shift duplicate entry down */
-            nduplicate++;
-            ijbuf_data[i - nduplicate] += ijbuf_data[i];
-        }
-        else if(nduplicate > 0)
-        {
-            ijbuf_data[i - nduplicate] = ijbuf_data[i];
-            ijbuf_cols[i - nduplicate] = ijbuf_cols[i];
-        }
-    }
-    (*ijbuf_cnt) -= nduplicate;
-    ijbuf_numcols[ ijbuf_rowcounter-1 ] -= nduplicate;
-
-    return ierr;
+   HYPRE_UNUSED_VAR(ijbuf_rownums);
+
+   HYPRE_Int                ierr = 0;
+   HYPRE_Int                nentries, i, nduplicate;
+
+   /* Compress the current row by removing any repeat entries,
+    * making sure to decrement ijbuf_cnt by nduplicate */
+   nentries = ijbuf_numcols[ ijbuf_rowcounter - 1 ];
+   nduplicate = 0;
+   hypre_BigQsort1(ijbuf_cols, ijbuf_data, (*ijbuf_cnt) - nentries, (*ijbuf_cnt) - 1 );
+
+   for (i = (*ijbuf_cnt) - nentries + 1; i <= (*ijbuf_cnt) - 1; i++)
+   {
+      if ( ijbuf_cols[i] == ijbuf_cols[i - 1] )
+      {
+         /* Shift duplicate entry down */
+         nduplicate++;
+         ijbuf_data[i - nduplicate] += ijbuf_data[i];
+      }
+      else if (nduplicate > 0)
+      {
+         ijbuf_data[i - nduplicate] = ijbuf_data[i];
+         ijbuf_cols[i - nduplicate] = ijbuf_cols[i];
+      }
+   }
+   (*ijbuf_cnt) -= nduplicate;
+   ijbuf_numcols[ ijbuf_rowcounter - 1 ] -= nduplicate;
+
+   return ierr;
 }
 
 
@@ -698,129 +711,131 @@ hypre_NonGalerkinIJBufferCompressRow( HYPRE_Int      *ijbuf_cnt,      /* See Non
  * Compress the entire buffer, removing duplicate rows
  **/
 HYPRE_Int
-hypre_NonGalerkinIJBufferCompress( HYPRE_Int      ijbuf_size,
-                                   HYPRE_Int      *ijbuf_cnt,      /* See NonGalerkinIJBufferWrite for parameter descriptions */
-                                   HYPRE_Int      *ijbuf_rowcounter,
-                                   HYPRE_Real     **ijbuf_data,
-                                   HYPRE_BigInt   **ijbuf_cols,
-                                   HYPRE_BigInt   **ijbuf_rownums,
-                                   HYPRE_Int      **ijbuf_numcols)
+hypre_NonGalerkinIJBufferCompress( HYPRE_MemoryLocation memory_location,
+                                   HYPRE_Int            ijbuf_size,
+                                   HYPRE_Int           *ijbuf_cnt,      /* See NonGalerkinIJBufferWrite for parameter descriptions */
+                                   HYPRE_Int           *ijbuf_rowcounter,
+                                   HYPRE_Real         **ijbuf_data,
+                                   HYPRE_BigInt       **ijbuf_cols,
+                                   HYPRE_BigInt       **ijbuf_rownums,
+                                   HYPRE_Int          **ijbuf_numcols)
 {
-    HYPRE_Int                ierr       = 0;
-    HYPRE_Int                *indys     = hypre_CTAlloc(HYPRE_Int,  (*ijbuf_rowcounter) , HYPRE_MEMORY_HOST);
-
-    HYPRE_Int                i, j, duplicate, cnt_new, rowcounter_new, prev_row;
-    HYPRE_Int                row_loc;
-    HYPRE_BigInt             row_start, row_stop, row;
-
-    HYPRE_Real               *data_new;
-    HYPRE_BigInt             *cols_new;
-    HYPRE_BigInt             *rownums_new;
-    HYPRE_Int                *numcols_new;
-
-
-    /* Do a sort on rownums, but store the original order in indys.
-     * Then see if there are any duplicate rows */
-    for(i = 0; i < (*ijbuf_rowcounter); i++)
-    {   indys[i] = i; }
-    hypre_BigQsortbi((*ijbuf_rownums), indys, 0, (*ijbuf_rowcounter)-1);
-    duplicate = 0;
-    for(i = 1; i < (*ijbuf_rowcounter); i++)
-    {
-        if(indys[i] != (indys[i-1]+1))
-        {
-            duplicate = 1;
-            break;
-        }
-    }
-
-    /* Compress duplicate rows */
-    if(duplicate)
-    {
-
-        /* Accumulate numcols, so that it functions like a CSR row-pointer */
-        for(i = 1; i < (*ijbuf_rowcounter); i++)
-        {   (*ijbuf_numcols)[i] += (*ijbuf_numcols)[i-1]; }
-
-        /* Initialize new buffer */
-        prev_row         = -1;
-        rowcounter_new   = 0;
-        cnt_new          = 0;
-        data_new         = hypre_CTAlloc(HYPRE_Real,   ijbuf_size, HYPRE_MEMORY_DEVICE);
-        cols_new         = hypre_CTAlloc(HYPRE_BigInt, ijbuf_size, HYPRE_MEMORY_DEVICE);
-        rownums_new      = hypre_CTAlloc(HYPRE_BigInt, ijbuf_size, HYPRE_MEMORY_DEVICE);
-        numcols_new      = hypre_CTAlloc(HYPRE_Int,    ijbuf_size, HYPRE_MEMORY_DEVICE);
-        numcols_new[0]   = 0;
-
-        /* Cycle through each row */
-        for(i = 0; i < (*ijbuf_rowcounter); i++)
-        {
-
-            /* Find which row this is in local and global numberings, and where
-             * this row's data starts and stops in the buffer*/
-            row_loc = indys[i];
-            row = (*ijbuf_rownums)[i];
-            if(row_loc > 0)
+   HYPRE_Int                ierr       = 0;
+   HYPRE_Int                *indys     = hypre_CTAlloc(HYPRE_Int,  (*ijbuf_rowcounter),
+                                                       HYPRE_MEMORY_HOST);
+
+   HYPRE_Int                i, duplicate, cnt_new, rowcounter_new;
+   HYPRE_Int                row_loc;
+   HYPRE_BigInt             row_start, row_stop, row, prev_row, j;
+
+   HYPRE_Real               *data_new;
+   HYPRE_BigInt             *cols_new;
+   HYPRE_BigInt             *rownums_new;
+   HYPRE_Int                *numcols_new;
+
+   /* Do a sort on rownums, but store the original order in indys.
+    * Then see if there are any duplicate rows */
+   for (i = 0; i < (*ijbuf_rowcounter); i++)
+   {
+      indys[i] = i;
+   }
+   hypre_BigQsortbi((*ijbuf_rownums), indys, 0, (*ijbuf_rowcounter) - 1);
+   duplicate = 0;
+   for (i = 1; i < (*ijbuf_rowcounter); i++)
+   {
+      if (indys[i] != (indys[i - 1] + 1))
+      {
+         duplicate = 1;
+         break;
+      }
+   }
+
+   /* Compress duplicate rows */
+   if (duplicate)
+   {
+      /* Accumulate numcols, so that it functions like a CSR row-pointer */
+      for (i = 1; i < (*ijbuf_rowcounter); i++)
+      {   (*ijbuf_numcols)[i] += (*ijbuf_numcols)[i - 1]; }
+
+      /* Initialize new buffer */
+      prev_row         = -1;
+      rowcounter_new   = 0;
+      cnt_new          = 0;
+      data_new         = hypre_CTAlloc(HYPRE_Real,   ijbuf_size, memory_location);
+      cols_new         = hypre_CTAlloc(HYPRE_BigInt, ijbuf_size, memory_location);
+      rownums_new      = hypre_CTAlloc(HYPRE_BigInt, ijbuf_size, memory_location);
+      numcols_new      = hypre_CTAlloc(HYPRE_Int,    ijbuf_size, memory_location);
+      numcols_new[0]   = 0;
+
+      /* Cycle through each row */
+      for (i = 0; i < (*ijbuf_rowcounter); i++)
+      {
+
+         /* Find which row this is in local and global numberings, and where
+          * this row's data starts and stops in the buffer*/
+         row_loc = indys[i];
+         row = (*ijbuf_rownums)[i];
+         if (row_loc > 0)
+         {
+            row_start = (HYPRE_BigInt) (*ijbuf_numcols)[row_loc - 1];
+            row_stop  = (HYPRE_BigInt) (*ijbuf_numcols)[row_loc];
+         }
+         else
+         {
+            row_start = 0;
+            row_stop  = (HYPRE_BigInt) (*ijbuf_numcols)[row_loc];
+         }
+
+         /* Is this a new row?  If so, compress previous row, and add a new
+          * one.  Noting that prev_row = -1 is a special value */
+         if (row != prev_row)
+         {
+            if (prev_row != -1)
             {
-                row_start = (*ijbuf_numcols)[row_loc-1];
-                row_stop  = (*ijbuf_numcols)[row_loc];
+               /* Compress previous row */
+               hypre_NonGalerkinIJBufferCompressRow(&cnt_new, rowcounter_new, data_new,
+                                                    cols_new, rownums_new, numcols_new);
             }
-            else
-            {
-                row_start = 0;
-                row_stop  = (*ijbuf_numcols)[row_loc];
-            }
-
-            /* Is this a new row?  If so, compress previous row, and add a new
-             * one.  Noting that prev_row = -1 is a special value */
-            if(row != prev_row)
-            {
-                if(prev_row != -1)
-                {
-                    /* Compress previous row */
-                    hypre_NonGalerkinIJBufferCompressRow(&cnt_new, rowcounter_new, data_new,
-                                          cols_new, rownums_new, numcols_new);
-                }
-                prev_row = row;
-                numcols_new[rowcounter_new] = 0;
-                rownums_new[rowcounter_new] = row;
-                rowcounter_new++;
-            }
-
-            /* Copy row into new buffer */
-            for(j = row_start; j < row_stop; j++)
-            {
-                data_new[cnt_new] = (*ijbuf_data)[j];
-                cols_new[cnt_new] = (*ijbuf_cols)[j];
-                numcols_new[rowcounter_new-1]++;
-                cnt_new++;
-            }
-        }
-
-        /* Compress the final row */
-        if(i > 1)
-        {
-            hypre_NonGalerkinIJBufferCompressRow(&cnt_new, rowcounter_new, data_new,
-                                       cols_new, rownums_new, numcols_new);
-        }
-
-        *ijbuf_cnt = cnt_new;
-        *ijbuf_rowcounter = rowcounter_new;
-
-        /* Point to the new buffer */
-        hypre_TFree(*ijbuf_data,    HYPRE_MEMORY_DEVICE);
-        hypre_TFree(*ijbuf_cols,    HYPRE_MEMORY_DEVICE);
-        hypre_TFree(*ijbuf_rownums, HYPRE_MEMORY_DEVICE);
-        hypre_TFree(*ijbuf_numcols, HYPRE_MEMORY_DEVICE);
-        (*ijbuf_data)    = data_new;
-        (*ijbuf_cols)    = cols_new;
-        (*ijbuf_rownums) = rownums_new;
-        (*ijbuf_numcols) = numcols_new;
-    }
-
-    hypre_TFree(indys, HYPRE_MEMORY_HOST);
-
-    return ierr;
+            prev_row = row;
+            numcols_new[rowcounter_new] = 0;
+            rownums_new[rowcounter_new] = row;
+            rowcounter_new++;
+         }
+
+         /* Copy row into new buffer */
+         for (j = row_start; j < row_stop; j++)
+         {
+            data_new[cnt_new] = (*ijbuf_data)[j];
+            cols_new[cnt_new] = (*ijbuf_cols)[j];
+            numcols_new[rowcounter_new - 1]++;
+            cnt_new++;
+         }
+      }
+
+      /* Compress the final row */
+      if (i > 1)
+      {
+         hypre_NonGalerkinIJBufferCompressRow(&cnt_new, rowcounter_new, data_new,
+                                              cols_new, rownums_new, numcols_new);
+      }
+
+      *ijbuf_cnt = cnt_new;
+      *ijbuf_rowcounter = rowcounter_new;
+
+      /* Point to the new buffer */
+      hypre_TFree(*ijbuf_data,    memory_location);
+      hypre_TFree(*ijbuf_cols,    memory_location);
+      hypre_TFree(*ijbuf_rownums, memory_location);
+      hypre_TFree(*ijbuf_numcols, memory_location);
+      (*ijbuf_data)    = data_new;
+      (*ijbuf_cols)    = cols_new;
+      (*ijbuf_rownums) = rownums_new;
+      (*ijbuf_numcols) = numcols_new;
+   }
+
+   hypre_TFree(indys, HYPRE_MEMORY_HOST);
+
+   return ierr;
 }
 
 
@@ -832,64 +847,71 @@ hypre_NonGalerkinIJBufferCompress( HYPRE_Int      ijbuf_size,
  *  A[row_to_write, col_to_write] += val_to_write
  **/
 HYPRE_Int
-hypre_NonGalerkinIJBufferWrite( HYPRE_IJMatrix B,                 /* Unassembled matrix to add an entry to */
+hypre_NonGalerkinIJBufferWrite( HYPRE_IJMatrix
+                                B,                 /* Unassembled matrix to add an entry to */
                                 HYPRE_Int    *ijbuf_cnt,          /* current buffer size */
                                 HYPRE_Int     ijbuf_size,         /* max buffer size */
                                 HYPRE_Int    *ijbuf_rowcounter,   /* num of rows in rownums, (i.e., size of rownums) */
-                                                                  /* This counter will increase as you call this function for multiple rows */
+                                /* This counter will increase as you call this function for multiple rows */
                                 HYPRE_Real   **ijbuf_data,         /* Array of values, of size ijbuf_size */
                                 HYPRE_BigInt **ijbuf_cols,         /* Array of col indices, of size ijbuf_size */
-                                HYPRE_BigInt **ijbuf_rownums,      /* Holds row-indices that with numcols makes for a CSR-like data structure*/
-                                HYPRE_Int    **ijbuf_numcols,      /* rownums[i] is the row num, and numcols holds the number of entries being added */
-                                                                  /* for that row. Note numcols is not cumulative like an actual CSR data structure*/
+                                HYPRE_BigInt
+                                **ijbuf_rownums,      /* Holds row-indices that with numcols makes for a CSR-like data structure*/
+                                HYPRE_Int
+                                **ijbuf_numcols,      /* rownums[i] is the row num, and numcols holds the number of entries being added */
+                                /* for that row. Note numcols is not cumulative like an actual CSR data structure*/
                                 HYPRE_BigInt  row_to_write,       /* Entry to add to the buffer */
                                 HYPRE_BigInt  col_to_write,       /*          Ditto             */
                                 HYPRE_Real    val_to_write )      /*          Ditto             */
 {
-    HYPRE_Int                ierr = 0;
-
-
-    if( (*ijbuf_cnt) == 0 )
-    {
-        /* brand new buffer: increment buffer structures for the new row */
-        hypre_NonGalerkinIJBufferNewRow((*ijbuf_rownums), (*ijbuf_numcols), ijbuf_rowcounter, row_to_write);
-
-    }
-    else if((*ijbuf_rownums)[ (*ijbuf_rowcounter)-1 ] != row_to_write)
-    {
-        /* If this is a new row, compress the previous row */
-        hypre_NonGalerkinIJBufferCompressRow(ijbuf_cnt, (*ijbuf_rowcounter), (*ijbuf_data),
-                                          (*ijbuf_cols), (*ijbuf_rownums), (*ijbuf_numcols));
-        /* increment buffer structures for the new row */
-        hypre_NonGalerkinIJBufferNewRow( (*ijbuf_rownums), (*ijbuf_numcols), ijbuf_rowcounter, row_to_write);
-    }
-
-    /* Add new entry to buffer */
-    (*ijbuf_cols)[(*ijbuf_cnt)] = col_to_write;
-    (*ijbuf_data)[(*ijbuf_cnt)] = val_to_write;
-    (*ijbuf_numcols)[ (*ijbuf_rowcounter)-1 ]++;
-    (*ijbuf_cnt)++;
-
-    /* Buffer is full, write to the matrix object */
-    if ( (*ijbuf_cnt) == (ijbuf_size-1) )
-    {
-       /* If the last row is empty, decrement rowcounter */
-       if( (*ijbuf_numcols)[ (*ijbuf_rowcounter)-1 ] == 0)
-       {    (*ijbuf_rowcounter)--; }
-
-       /* Compress and Add Entries */
-       hypre_NonGalerkinIJBufferCompressRow(ijbuf_cnt, (*ijbuf_rowcounter), (*ijbuf_data),
-                                         (*ijbuf_cols), (*ijbuf_rownums), (*ijbuf_numcols));
-       hypre_NonGalerkinIJBufferCompress(ijbuf_size, ijbuf_cnt, ijbuf_rowcounter, ijbuf_data,
-                                         ijbuf_cols, ijbuf_rownums, ijbuf_numcols);
-       ierr += HYPRE_IJMatrixAddToValues(B, *ijbuf_rowcounter, (*ijbuf_numcols), (*ijbuf_rownums), (*ijbuf_cols), (*ijbuf_data));
-
-       /* Reinitialize the buffer */
-       hypre_NonGalerkinIJBufferInit( ijbuf_cnt, ijbuf_rowcounter, (*ijbuf_numcols));
-       hypre_NonGalerkinIJBufferNewRow((*ijbuf_rownums), (*ijbuf_numcols), ijbuf_rowcounter, row_to_write);
-    }
-
-    return ierr;
+   HYPRE_Int                ierr = 0;
+
+   HYPRE_MemoryLocation memory_location = hypre_IJMatrixMemoryLocation(B);
+
+   if ( (*ijbuf_cnt) == 0 )
+   {
+      /* brand new buffer: increment buffer structures for the new row */
+      hypre_NonGalerkinIJBufferNewRow((*ijbuf_rownums), (*ijbuf_numcols), ijbuf_rowcounter, row_to_write);
+
+   }
+   else if ((*ijbuf_rownums)[ (*ijbuf_rowcounter) - 1 ] != row_to_write)
+   {
+      /* If this is a new row, compress the previous row */
+      hypre_NonGalerkinIJBufferCompressRow(ijbuf_cnt, (*ijbuf_rowcounter), (*ijbuf_data),
+                                           (*ijbuf_cols), (*ijbuf_rownums), (*ijbuf_numcols));
+      /* increment buffer structures for the new row */
+      hypre_NonGalerkinIJBufferNewRow( (*ijbuf_rownums), (*ijbuf_numcols), ijbuf_rowcounter,
+                                       row_to_write);
+   }
+
+   /* Add new entry to buffer */
+   (*ijbuf_cols)[(*ijbuf_cnt)] = col_to_write;
+   (*ijbuf_data)[(*ijbuf_cnt)] = val_to_write;
+   (*ijbuf_numcols)[ (*ijbuf_rowcounter) - 1 ]++;
+   (*ijbuf_cnt)++;
+
+   /* Buffer is full, write to the matrix object */
+   if ( (*ijbuf_cnt) == (ijbuf_size - 1) )
+   {
+      /* If the last row is empty, decrement rowcounter */
+      if ( (*ijbuf_numcols)[ (*ijbuf_rowcounter) - 1 ] == 0)
+      {    (*ijbuf_rowcounter)--; }
+
+      /* Compress and Add Entries */
+      hypre_NonGalerkinIJBufferCompressRow(ijbuf_cnt, (*ijbuf_rowcounter), (*ijbuf_data),
+                                           (*ijbuf_cols), (*ijbuf_rownums), (*ijbuf_numcols));
+      hypre_NonGalerkinIJBufferCompress(memory_location, ijbuf_size, ijbuf_cnt, ijbuf_rowcounter,
+                                        ijbuf_data,
+                                        ijbuf_cols, ijbuf_rownums, ijbuf_numcols);
+      ierr += HYPRE_IJMatrixAddToValues(B, *ijbuf_rowcounter, (*ijbuf_numcols), (*ijbuf_rownums),
+                                        (*ijbuf_cols), (*ijbuf_data));
+
+      /* Reinitialize the buffer */
+      hypre_NonGalerkinIJBufferInit( ijbuf_cnt, ijbuf_rowcounter, (*ijbuf_numcols));
+      hypre_NonGalerkinIJBufferNewRow((*ijbuf_rownums), (*ijbuf_numcols), ijbuf_rowcounter, row_to_write);
+   }
+
+   return ierr;
 }
 
 
@@ -897,7 +919,8 @@ hypre_NonGalerkinIJBufferWrite( HYPRE_IJMatrix B,                 /* Unassembled
  * Empty the IJ Buffer with a final AddToValues.
  **/
 HYPRE_Int
-hypre_NonGalerkinIJBufferEmpty(HYPRE_IJMatrix B,             /* See NonGalerkinIJBufferWrite for parameter descriptions */
+hypre_NonGalerkinIJBufferEmpty(HYPRE_IJMatrix
+                               B, /* See NonGalerkinIJBufferWrite for parameter descriptions */
                                HYPRE_Int      ijbuf_size,
                                HYPRE_Int      *ijbuf_cnt,
                                HYPRE_Int      ijbuf_rowcounter,
@@ -906,20 +929,23 @@ hypre_NonGalerkinIJBufferEmpty(HYPRE_IJMatrix B,             /* See NonGalerkinI
                                HYPRE_BigInt   **ijbuf_rownums,
                                HYPRE_Int      **ijbuf_numcols)
 {
-    HYPRE_Int                ierr = 0;
-
-    if( (*ijbuf_cnt) > 0)
-    {
-       /* Compress the last row and then write */
-       hypre_NonGalerkinIJBufferCompressRow(ijbuf_cnt, ijbuf_rowcounter, (*ijbuf_data),
-                                         (*ijbuf_cols), (*ijbuf_rownums), (*ijbuf_numcols));
-       hypre_NonGalerkinIJBufferCompress(ijbuf_size, ijbuf_cnt, &ijbuf_rowcounter, ijbuf_data,
-                                         ijbuf_cols, ijbuf_rownums, ijbuf_numcols);
-       ierr += HYPRE_IJMatrixAddToValues(B, ijbuf_rowcounter, (*ijbuf_numcols), (*ijbuf_rownums), (*ijbuf_cols), (*ijbuf_data));
-    }
-    (*ijbuf_cnt = 0);
-
-    return ierr;
+   HYPRE_Int                ierr = 0;
+   HYPRE_MemoryLocation memory_location = hypre_IJMatrixMemoryLocation(B);
+
+   if ( (*ijbuf_cnt) > 0)
+   {
+      /* Compress the last row and then write */
+      hypre_NonGalerkinIJBufferCompressRow(ijbuf_cnt, ijbuf_rowcounter, (*ijbuf_data),
+                                           (*ijbuf_cols), (*ijbuf_rownums), (*ijbuf_numcols));
+      hypre_NonGalerkinIJBufferCompress(memory_location, ijbuf_size, ijbuf_cnt, &ijbuf_rowcounter,
+                                        ijbuf_data,
+                                        ijbuf_cols, ijbuf_rownums, ijbuf_numcols);
+      ierr += HYPRE_IJMatrixAddToValues(B, ijbuf_rowcounter, (*ijbuf_numcols), (*ijbuf_rownums),
+                                        (*ijbuf_cols), (*ijbuf_data));
+   }
+   (*ijbuf_cnt = 0);
+
+   return ierr;
 }
 
 
@@ -934,275 +960,284 @@ hypre_NonGalerkinSparsityPattern(hypre_ParCSRMatrix *R_IAP,
                                  HYPRE_Int sym_collapse,
                                  HYPRE_Int collapse_beta )
 {
-    /* MPI Communicator */
-    MPI_Comm            comm                      = hypre_ParCSRMatrixComm(RAP);
-
-    /* Declare R_IAP */
-    hypre_CSRMatrix     *R_IAP_diag               = hypre_ParCSRMatrixDiag(R_IAP);
-    HYPRE_Int           *R_IAP_diag_i             = hypre_CSRMatrixI(R_IAP_diag);
-    HYPRE_Int           *R_IAP_diag_j             = hypre_CSRMatrixJ(R_IAP_diag);
-
-    hypre_CSRMatrix     *R_IAP_offd               = hypre_ParCSRMatrixOffd(R_IAP);
-    HYPRE_Int           *R_IAP_offd_i             = hypre_CSRMatrixI(R_IAP_offd);
-    HYPRE_Int           *R_IAP_offd_j             = hypre_CSRMatrixJ(R_IAP_offd);
-    HYPRE_BigInt        *col_map_offd_R_IAP       = hypre_ParCSRMatrixColMapOffd(R_IAP);
-
-    /* Declare RAP */
-    hypre_CSRMatrix     *RAP_diag             = hypre_ParCSRMatrixDiag(RAP);
-    HYPRE_Int           *RAP_diag_i           = hypre_CSRMatrixI(RAP_diag);
-    HYPRE_Real          *RAP_diag_data        = hypre_CSRMatrixData(RAP_diag);
-    HYPRE_Int           *RAP_diag_j           = hypre_CSRMatrixJ(RAP_diag);
-    HYPRE_BigInt         first_col_diag_RAP   = hypre_ParCSRMatrixFirstColDiag(RAP);
-    HYPRE_Int            num_cols_diag_RAP    = hypre_CSRMatrixNumCols(RAP_diag);
-    HYPRE_BigInt         last_col_diag_RAP    = first_col_diag_RAP + (HYPRE_BigInt)num_cols_diag_RAP - 1;
-
-    hypre_CSRMatrix     *RAP_offd             = hypre_ParCSRMatrixOffd(RAP);
-    HYPRE_Int           *RAP_offd_i           = hypre_CSRMatrixI(RAP_offd);
-    HYPRE_Real          *RAP_offd_data        = NULL;
-    HYPRE_Int           *RAP_offd_j           = hypre_CSRMatrixJ(RAP_offd);
-    HYPRE_BigInt        *col_map_offd_RAP     = hypre_ParCSRMatrixColMapOffd(RAP);
-    HYPRE_Int            num_cols_RAP_offd    = hypre_CSRMatrixNumCols(RAP_offd);
-
-    HYPRE_Int            num_variables        = hypre_CSRMatrixNumRows(RAP_diag);
-
-    /* Declare A */
-    HYPRE_Int            num_fine_variables   = hypre_CSRMatrixNumRows(R_IAP_diag);
-
-    /* Declare IJ matrices */
-    HYPRE_IJMatrix      Pattern;
-    hypre_ParCSRMatrix  *Pattern_CSR              = NULL;
-
-    /* Buffered IJAddToValues */
-    HYPRE_Int           ijbuf_cnt, ijbuf_size, ijbuf_rowcounter;
-    HYPRE_Real          *ijbuf_data;
-    HYPRE_BigInt        *ijbuf_cols, *ijbuf_rownums;
-    HYPRE_Int           *ijbuf_numcols;
-
-    /* Buffered IJAddToValues for Symmetric Entries */
-    HYPRE_Int           ijbuf_sym_cnt, ijbuf_sym_rowcounter;
-    HYPRE_Real          *ijbuf_sym_data;
-    HYPRE_BigInt        *ijbuf_sym_cols, *ijbuf_sym_rownums;
-    HYPRE_Int           *ijbuf_sym_numcols;
-
-    /* Other Declarations */
-    HYPRE_Int ierr                                = 0;
-    HYPRE_Real          max_entry                 = 0.0;
-    HYPRE_Real          max_entry_offd            = 0.0;
-    HYPRE_Int           * rownz                   = NULL;
-    HYPRE_Int i, j, Cpt;
-    HYPRE_BigInt row_start, row_end, global_row, global_col;
-
-    /* Other Setup */
-    if (num_cols_RAP_offd)
-    { RAP_offd_data        = hypre_CSRMatrixData(RAP_offd); }
-
-
-    /*
-     * Initialize the IJ matrix, leveraging our rough knowledge of the
-     * nonzero structure of Pattern based on RAP
-     *
-     *                                 ilower,             iupper,            jlower,             jupper */
-    ierr += HYPRE_IJMatrixCreate(comm, first_col_diag_RAP, last_col_diag_RAP, first_col_diag_RAP, last_col_diag_RAP, &Pattern);
-    ierr += HYPRE_IJMatrixSetObjectType(Pattern, HYPRE_PARCSR);
-    rownz = hypre_CTAlloc(HYPRE_Int,  num_variables, HYPRE_MEMORY_HOST);
-    for(i = 0; i < num_variables; i++)
-    {   rownz[i] = 1.2*(RAP_diag_i[i+1] - RAP_diag_i[i]) + 1.2*(RAP_offd_i[i+1] - RAP_offd_i[i]); }
-    HYPRE_IJMatrixSetRowSizes(Pattern, rownz);
-    ierr += HYPRE_IJMatrixInitialize(Pattern);
-    hypre_TFree(rownz, HYPRE_MEMORY_HOST);
-
-    /*
-     *For efficiency, we do a buffered IJAddToValues.
-     * Here, we initialize the buffer and then initialize the buffer counters
-     */
-    ijbuf_size       = 1000;
-    ijbuf_data       = hypre_CTAlloc(HYPRE_Real,   ijbuf_size, HYPRE_MEMORY_DEVICE);
-    ijbuf_cols       = hypre_CTAlloc(HYPRE_BigInt, ijbuf_size, HYPRE_MEMORY_DEVICE);
-    ijbuf_rownums    = hypre_CTAlloc(HYPRE_BigInt, ijbuf_size, HYPRE_MEMORY_DEVICE);
-    ijbuf_numcols    = hypre_CTAlloc(HYPRE_Int,    ijbuf_size, HYPRE_MEMORY_DEVICE);
-    hypre_NonGalerkinIJBigBufferInit( &ijbuf_cnt, &ijbuf_rowcounter, ijbuf_cols );
-    if(sym_collapse)
-    {
-        ijbuf_sym_data   = hypre_CTAlloc(HYPRE_Real,    ijbuf_size, HYPRE_MEMORY_DEVICE);
-        ijbuf_sym_cols   = hypre_CTAlloc(HYPRE_BigInt,  ijbuf_size, HYPRE_MEMORY_DEVICE);
-        ijbuf_sym_rownums= hypre_CTAlloc(HYPRE_BigInt,  ijbuf_size, HYPRE_MEMORY_DEVICE);
-        ijbuf_sym_numcols= hypre_CTAlloc(HYPRE_Int,     ijbuf_size, HYPRE_MEMORY_DEVICE);
-        hypre_NonGalerkinIJBigBufferInit( &ijbuf_sym_cnt, &ijbuf_sym_rowcounter, ijbuf_sym_cols );
-    }
-
-
-    /*
-     * Place entries in R_IAP into Pattern
-     */
-    Cpt = -1; /* Cpt contains the fine grid index of the i-th Cpt */
-    for(i = 0; i < num_variables; i++)
-    {
-        global_row = i+first_col_diag_RAP;
-
-        /* Find the next Coarse Point in CF_marker */
-        for(j = Cpt+1; j < num_fine_variables; j++)
-        {
-            if(CF_marker[j] == 1)   /* Found Next C-point */
-            {
-                Cpt = j;
-                break;
-            }
-        }
-
-        /* Diag Portion */
-        row_start = R_IAP_diag_i[Cpt];
-        row_end = R_IAP_diag_i[Cpt+1];
-        for(j = row_start; j < row_end; j++)
-        {
-            global_col = R_IAP_diag_j[j] + first_col_diag_RAP;
-            /* This call adds a                        1 x 1 to  i            j           data */
-            hypre_NonGalerkinIJBufferWrite( Pattern, &ijbuf_cnt, ijbuf_size, &ijbuf_rowcounter,
-                              &ijbuf_data, &ijbuf_cols, &ijbuf_rownums, &ijbuf_numcols, global_row,
-                              global_col, 1.0);
+   /* MPI Communicator */
+   MPI_Comm            comm               = hypre_ParCSRMatrixComm(RAP);
+
+   HYPRE_MemoryLocation memory_location_RAP = hypre_ParCSRMatrixMemoryLocation(RAP);
+
+   /* Declare R_IAP */
+   hypre_CSRMatrix    *R_IAP_diag         = hypre_ParCSRMatrixDiag(R_IAP);
+   HYPRE_Int          *R_IAP_diag_i       = hypre_CSRMatrixI(R_IAP_diag);
+   HYPRE_Int          *R_IAP_diag_j       = hypre_CSRMatrixJ(R_IAP_diag);
+
+   hypre_CSRMatrix    *R_IAP_offd         = hypre_ParCSRMatrixOffd(R_IAP);
+   HYPRE_Int          *R_IAP_offd_i       = hypre_CSRMatrixI(R_IAP_offd);
+   HYPRE_Int          *R_IAP_offd_j       = hypre_CSRMatrixJ(R_IAP_offd);
+   HYPRE_BigInt       *col_map_offd_R_IAP = hypre_ParCSRMatrixColMapOffd(R_IAP);
+
+   /* Declare RAP */
+   hypre_CSRMatrix    *RAP_diag           = hypre_ParCSRMatrixDiag(RAP);
+   HYPRE_Int          *RAP_diag_i         = hypre_CSRMatrixI(RAP_diag);
+   HYPRE_Real         *RAP_diag_data      = hypre_CSRMatrixData(RAP_diag);
+   HYPRE_Int          *RAP_diag_j         = hypre_CSRMatrixJ(RAP_diag);
+   HYPRE_BigInt        first_col_diag_RAP = hypre_ParCSRMatrixFirstColDiag(RAP);
+   HYPRE_Int           num_cols_diag_RAP  = hypre_CSRMatrixNumCols(RAP_diag);
+   HYPRE_BigInt        last_col_diag_RAP  = first_col_diag_RAP + (HYPRE_BigInt)num_cols_diag_RAP - 1;
+
+   hypre_CSRMatrix    *RAP_offd           = hypre_ParCSRMatrixOffd(RAP);
+   HYPRE_Int          *RAP_offd_i         = hypre_CSRMatrixI(RAP_offd);
+   HYPRE_Real         *RAP_offd_data      = NULL;
+   HYPRE_Int          *RAP_offd_j         = hypre_CSRMatrixJ(RAP_offd);
+   HYPRE_BigInt       *col_map_offd_RAP   = hypre_ParCSRMatrixColMapOffd(RAP);
+   HYPRE_Int           num_cols_RAP_offd  = hypre_CSRMatrixNumCols(RAP_offd);
+
+   HYPRE_Int           num_variables      = hypre_CSRMatrixNumRows(RAP_diag);
+
+   /* Declare A */
+   HYPRE_Int           num_fine_variables = hypre_CSRMatrixNumRows(R_IAP_diag);
+
+   /* Declare IJ matrices */
+   HYPRE_IJMatrix      Pattern;
+   hypre_ParCSRMatrix *Pattern_CSR        = NULL;
+
+   /* Buffered IJAddToValues */
+   HYPRE_Int           ijbuf_cnt, ijbuf_size, ijbuf_rowcounter;
+   HYPRE_Real         *ijbuf_data;
+   HYPRE_BigInt       *ijbuf_cols, *ijbuf_rownums;
+   HYPRE_Int          *ijbuf_numcols;
+
+   /* Buffered IJAddToValues for Symmetric Entries */
+   HYPRE_Int           ijbuf_sym_cnt, ijbuf_sym_rowcounter;
+   HYPRE_Real         *ijbuf_sym_data;
+   HYPRE_BigInt       *ijbuf_sym_cols, *ijbuf_sym_rownums;
+   HYPRE_Int          *ijbuf_sym_numcols;
+
+   /* Other Declarations */
+   HYPRE_Real          max_entry         = 0.0;
+   HYPRE_Real          max_entry_offd    = 0.0;
+   HYPRE_Int          *rownz             = NULL;
+   HYPRE_Int           i, j, Cpt, row_start, row_end;
+   HYPRE_BigInt        global_row, global_col;
+
+   HYPRE_ANNOTATE_FUNC_BEGIN;
+
+   /* Other Setup */
+   if (num_cols_RAP_offd)
+   {
+      RAP_offd_data = hypre_CSRMatrixData(RAP_offd);
+   }
+
+   /*
+    * Initialize the IJ matrix, leveraging our rough knowledge of the
+    * nonzero structure of Pattern based on RAP
+    *
+    *                         ilower,             iupper,            jlower,             jupper */
+   HYPRE_IJMatrixCreate(comm, first_col_diag_RAP, last_col_diag_RAP, first_col_diag_RAP,
+                        last_col_diag_RAP, &Pattern);
+   HYPRE_IJMatrixSetObjectType(Pattern, HYPRE_PARCSR);
+   rownz = hypre_CTAlloc(HYPRE_Int,  num_variables, HYPRE_MEMORY_HOST);
+   for (i = 0; i < num_variables; i++)
+   {
+      rownz[i] = (HYPRE_Int)(1.2 * (RAP_diag_i[i + 1] - RAP_diag_i[i]) +
+                             1.2 * (RAP_offd_i[i + 1] - RAP_offd_i[i]));
+   }
+   HYPRE_IJMatrixSetRowSizes(Pattern, rownz);
+   HYPRE_IJMatrixInitialize(Pattern);
+   hypre_TFree(rownz, HYPRE_MEMORY_HOST);
+
+   /*
+    * For efficiency, we do a buffered IJAddToValues.
+    * Here, we initialize the buffer and then initialize the buffer counters
+    */
+   ijbuf_size       = 1000;
+   ijbuf_data       = hypre_CTAlloc(HYPRE_Real,   ijbuf_size, memory_location_RAP);
+   ijbuf_cols       = hypre_CTAlloc(HYPRE_BigInt, ijbuf_size, memory_location_RAP);
+   ijbuf_rownums    = hypre_CTAlloc(HYPRE_BigInt, ijbuf_size, memory_location_RAP);
+   ijbuf_numcols    = hypre_CTAlloc(HYPRE_Int,    ijbuf_size, memory_location_RAP);
+   hypre_NonGalerkinIJBigBufferInit(&ijbuf_cnt, &ijbuf_rowcounter, ijbuf_cols);
+   if (sym_collapse)
+   {
+      ijbuf_sym_data    = hypre_CTAlloc(HYPRE_Real,    ijbuf_size, memory_location_RAP);
+      ijbuf_sym_cols    = hypre_CTAlloc(HYPRE_BigInt,  ijbuf_size, memory_location_RAP);
+      ijbuf_sym_rownums = hypre_CTAlloc(HYPRE_BigInt,  ijbuf_size, memory_location_RAP);
+      ijbuf_sym_numcols = hypre_CTAlloc(HYPRE_Int,     ijbuf_size, memory_location_RAP);
+      hypre_NonGalerkinIJBigBufferInit(&ijbuf_sym_cnt, &ijbuf_sym_rowcounter, ijbuf_sym_cols);
+   }
+
+   /*
+    * Place entries in R_IAP into Pattern
+    */
+   Cpt = -1; /* Cpt contains the fine grid index of the i-th Cpt */
+   for (i = 0; i < num_variables; i++)
+   {
+      global_row = i + first_col_diag_RAP;
+
+      /* Find the next Coarse Point in CF_marker */
+      for (j = Cpt + 1; j < num_fine_variables; j++)
+      {
+         if (CF_marker[j] == 1)  /* Found Next C-point */
+         {
+            Cpt = j;
+            break;
+         }
+      }
+
+      /* Diag Portion */
+      row_start = R_IAP_diag_i[Cpt];
+      row_end = R_IAP_diag_i[Cpt + 1];
+      for (j = row_start; j < row_end; j++)
+      {
+         global_col = R_IAP_diag_j[j] + first_col_diag_RAP;
+         /* This call adds a                       1 x 1 to  i            j           data */
+         hypre_NonGalerkinIJBufferWrite(Pattern, &ijbuf_cnt, ijbuf_size, &ijbuf_rowcounter,
+                                        &ijbuf_data, &ijbuf_cols, &ijbuf_rownums, &ijbuf_numcols,
+                                        global_row, global_col, 1.0);
+         if (sym_collapse)
+         {
+            hypre_NonGalerkinIJBufferWrite(Pattern, &ijbuf_sym_cnt,
+                                           ijbuf_size, &ijbuf_sym_rowcounter, &ijbuf_sym_data,
+                                           &ijbuf_sym_cols, &ijbuf_sym_rownums, &ijbuf_sym_numcols,
+                                           global_col, global_row, 1.0);
+         }
+      }
+
+      /* Offdiag Portion */
+      row_start = R_IAP_offd_i[Cpt];
+      row_end = R_IAP_offd_i[Cpt + 1];
+      for (j = row_start; j < row_end; j++)
+      {
+         global_col = col_map_offd_R_IAP[R_IAP_offd_j[j]];
+         /* This call adds a                       1 x 1 to  i            j           data */
+         hypre_NonGalerkinIJBufferWrite(Pattern, &ijbuf_cnt, ijbuf_size, &ijbuf_rowcounter,
+                                        &ijbuf_data, &ijbuf_cols, &ijbuf_rownums, &ijbuf_numcols,
+                                        global_row, global_col, 1.0);
+
+         if (sym_collapse)
+         {
+            hypre_NonGalerkinIJBufferWrite(Pattern, &ijbuf_sym_cnt,
+                                           ijbuf_size, &ijbuf_sym_rowcounter, &ijbuf_sym_data,
+                                           &ijbuf_sym_cols, &ijbuf_sym_rownums, &ijbuf_sym_numcols,
+                                           global_col, global_row, 1.0);
+         }
+      }
+   }
+
+   /*
+    * Use drop-tolerance to compute new entries for sparsity pattern
+    */
+   /*#ifdef HYPRE_USING_OPENMP
+   #pragma omp parallel for private(i,j,max_entry,max_entry_offd,global_col,global_row) HYPRE_SMP_SCHEDULE
+   #endif  */
+   for (i = 0; i < num_variables; i++)
+   {
+      global_row = i + first_col_diag_RAP;
+
+      /* Compute the drop tolerance for this row, which is just
+       *  abs(max of row i)*droptol  */
+      max_entry = -1.0;
+      for (j = RAP_diag_i[i]; j < RAP_diag_i[i + 1]; j++)
+      {
+         if ( (RAP_diag_j[j] != i) && (max_entry < hypre_abs(RAP_diag_data[j]) ) )
+         {   max_entry = hypre_abs(RAP_diag_data[j]); }
+      }
+      for (j = RAP_offd_i[i]; j < RAP_offd_i[i + 1]; j++)
+      {
+         {
+            if ( max_entry < hypre_abs(RAP_offd_data[j]) )
+            {   max_entry = hypre_abs(RAP_offd_data[j]); }
+         }
+      }
+      max_entry *= droptol;
+      max_entry_offd = max_entry * collapse_beta;
+
+      /* Loop over diag portion, adding all entries that are "strong" */
+      for (j = RAP_diag_i[i]; j < RAP_diag_i[i + 1]; j++)
+      {
+         if ( hypre_abs(RAP_diag_data[j]) > max_entry )
+         {
+            global_col = RAP_diag_j[j] + first_col_diag_RAP;
+            /*#ifdef HYPRE_USING_OPENMP
+            #pragma omp critical (IJAdd)
+            #endif
+            {*/
+            /* For efficiency, we do a buffered IJAddToValues
+             * A[global_row, global_col] += 1.0 */
+            hypre_NonGalerkinIJBufferWrite(Pattern, &ijbuf_cnt, ijbuf_size, &ijbuf_rowcounter,
+                                           &ijbuf_data, &ijbuf_cols, &ijbuf_rownums, &ijbuf_numcols,
+                                           global_row, global_col, 1.0);
             if (sym_collapse)
             {
-               hypre_NonGalerkinIJBufferWrite( Pattern, &ijbuf_sym_cnt,
-                  ijbuf_size, &ijbuf_sym_rowcounter, &ijbuf_sym_data,
-                  &ijbuf_sym_cols, &ijbuf_sym_rownums, &ijbuf_sym_numcols,
-                  global_col, global_row, 1.0);
+               hypre_NonGalerkinIJBufferWrite(Pattern, &ijbuf_sym_cnt,
+                                              ijbuf_size, &ijbuf_sym_rowcounter, &ijbuf_sym_data,
+                                              &ijbuf_sym_cols, &ijbuf_sym_rownums, &ijbuf_sym_numcols,
+                                              global_col, global_row, 1.0);
             }
-        }
-
-        /* Offdiag Portion */
-        row_start = R_IAP_offd_i[Cpt];
-        row_end = R_IAP_offd_i[Cpt+1];
-        for(j = row_start; j < row_end; j++)
-        {
-            global_col = col_map_offd_R_IAP[ R_IAP_offd_j[j] ];
-            /* This call adds a                        1 x 1 to  i            j           data */
-            hypre_NonGalerkinIJBufferWrite( Pattern, &ijbuf_cnt, ijbuf_size, &ijbuf_rowcounter,
-                           &ijbuf_data, &ijbuf_cols, &ijbuf_rownums, &ijbuf_numcols, global_row,
-                           global_col, 1.0);
-
+            /*}*/
+         }
+      }
+
+      /* Loop over offd portion, adding all entries that are "strong" */
+      for (j = RAP_offd_i[i]; j < RAP_offd_i[i + 1]; j++)
+      {
+         if ( hypre_abs(RAP_offd_data[j]) > max_entry_offd )
+         {
+            global_col = col_map_offd_RAP[ RAP_offd_j[j] ];
+            /*#ifdef HYPRE_USING_OPENMP
+            #pragma omp critical (IJAdd)
+            #endif
+            {*/
+            /* For efficiency, we do a buffered IJAddToValues
+             * A[global_row, global_col] += 1.0 */
+            hypre_NonGalerkinIJBufferWrite(Pattern, &ijbuf_cnt, ijbuf_size, &ijbuf_rowcounter,
+                                           &ijbuf_data, &ijbuf_cols, &ijbuf_rownums, &ijbuf_numcols,
+                                           global_row, global_col, 1.0);
             if (sym_collapse)
             {
-               hypre_NonGalerkinIJBufferWrite( Pattern, &ijbuf_sym_cnt,
-                  ijbuf_size, &ijbuf_sym_rowcounter, &ijbuf_sym_data,
-                  &ijbuf_sym_cols, &ijbuf_sym_rownums, &ijbuf_sym_numcols,
-                  global_col, global_row, 1.0);
-            }
-        }
-
-    }
-
-    /*
-     * Use drop-tolerance to compute new entries for sparsity pattern
-     */
-/*#ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i,j,max_entry,max_entry_offd,global_col,global_row) HYPRE_SMP_SCHEDULE
-#endif  */
-    for(i = 0; i < num_variables; i++)
-    {
-        global_row = i+first_col_diag_RAP;
-
-        /* Compute the drop tolerance for this row, which is just
-         *  abs(max of row i)*droptol  */
-        max_entry = -1.0;
-        for(j = RAP_diag_i[i]; j < RAP_diag_i[i+1]; j++)
-        {
-            if( (RAP_diag_j[j] != i) && (max_entry < fabs(RAP_diag_data[j]) ) )
-            {   max_entry = fabs(RAP_diag_data[j]); }
-        }
-        for(j = RAP_offd_i[i]; j < RAP_offd_i[i+1]; j++)
-        {
-            {
-                if( max_entry < fabs(RAP_offd_data[j]) )
-                {   max_entry = fabs(RAP_offd_data[j]); }
-            }
-        }
-        max_entry *= droptol;
-        max_entry_offd = max_entry*collapse_beta;
-
-
-        /* Loop over diag portion, adding all entries that are "strong" */
-        for(j = RAP_diag_i[i]; j < RAP_diag_i[i+1]; j++)
-        {
-            if( fabs(RAP_diag_data[j]) > max_entry )
-            {
-                global_col = RAP_diag_j[j] + first_col_diag_RAP;
-/*#ifdef HYPRE_USING_OPENMP
-#pragma omp critical (IJAdd)
-#endif
-{*/
-              /* For efficiency, we do a buffered IJAddToValues
-               * A[global_row, global_col] += 1.0 */
-              hypre_NonGalerkinIJBufferWrite( Pattern, &ijbuf_cnt, ijbuf_size, &ijbuf_rowcounter,
-                                &ijbuf_data, &ijbuf_cols, &ijbuf_rownums, &ijbuf_numcols, global_row,
-                                global_col, 1.0 );
-              if(sym_collapse)
-              {
-                hypre_NonGalerkinIJBufferWrite( Pattern, &ijbuf_sym_cnt,
-                   ijbuf_size, &ijbuf_sym_rowcounter, &ijbuf_sym_data,
-                   &ijbuf_sym_cols, &ijbuf_sym_rownums, &ijbuf_sym_numcols,
-                   global_col, global_row, 1.0 );
-              }
-/*}*/
-            }
-        }
-
-        /* Loop over offd portion, adding all entries that are "strong" */
-        for(j = RAP_offd_i[i]; j < RAP_offd_i[i+1]; j++)
-        {
-            if( fabs(RAP_offd_data[j]) > max_entry_offd )
-            {
-                global_col = col_map_offd_RAP[ RAP_offd_j[j] ];
-/*#ifdef HYPRE_USING_OPENMP
-#pragma omp critical (IJAdd)
-#endif
-{*/
-                /* For efficiency, we do a buffered IJAddToValues
-                 * A[global_row, global_col] += 1.0 */
-                hypre_NonGalerkinIJBufferWrite( Pattern, &ijbuf_cnt, ijbuf_size, &ijbuf_rowcounter,
-                                  &ijbuf_data, &ijbuf_cols, &ijbuf_rownums, &ijbuf_numcols, global_row,
-                                  global_col, 1.0 );
-                if(sym_collapse)
-                {
-                    hypre_NonGalerkinIJBufferWrite( Pattern, &ijbuf_sym_cnt,
-                       ijbuf_size, &ijbuf_sym_rowcounter, &ijbuf_sym_data,
-                       &ijbuf_sym_cols, &ijbuf_sym_rownums, &ijbuf_sym_numcols,
-                       global_col, global_row, 1.0 );
-                }
-/*}*/
+               hypre_NonGalerkinIJBufferWrite(Pattern, &ijbuf_sym_cnt,
+                                              ijbuf_size, &ijbuf_sym_rowcounter, &ijbuf_sym_data,
+                                              &ijbuf_sym_cols, &ijbuf_sym_rownums, &ijbuf_sym_numcols,
+                                              global_col, global_row, 1.0);
             }
-        }
-
-    }
-
-    /* For efficiency, we do a buffered IJAddToValues.
-     * This empties the buffer of any remaining values */
-    hypre_NonGalerkinIJBufferEmpty(Pattern, ijbuf_size, &ijbuf_cnt, ijbuf_rowcounter,
-                                &ijbuf_data, &ijbuf_cols, &ijbuf_rownums, &ijbuf_numcols);
-    if(sym_collapse)
-        hypre_NonGalerkinIJBufferEmpty(Pattern, ijbuf_size, &ijbuf_sym_cnt, ijbuf_sym_rowcounter,
-                                &ijbuf_sym_data, &ijbuf_sym_cols, &ijbuf_sym_rownums,
-                                &ijbuf_sym_numcols);
-
-    /* Finalize Construction of Pattern */
-    ierr += HYPRE_IJMatrixAssemble(Pattern);
-    ierr += HYPRE_IJMatrixGetObject( Pattern, (void**) &Pattern_CSR );
-
-    /* Deallocate */
-    ierr += HYPRE_IJMatrixSetObjectType(Pattern, -1);
-    ierr += HYPRE_IJMatrixDestroy(Pattern);
-    hypre_TFree(ijbuf_data,    HYPRE_MEMORY_DEVICE);
-    hypre_TFree(ijbuf_cols,    HYPRE_MEMORY_DEVICE);
-    hypre_TFree(ijbuf_rownums, HYPRE_MEMORY_DEVICE);
-    hypre_TFree(ijbuf_numcols, HYPRE_MEMORY_DEVICE);
-
-    if(sym_collapse)
-    {
-        hypre_TFree(ijbuf_sym_data,    HYPRE_MEMORY_DEVICE);
-        hypre_TFree(ijbuf_sym_cols,    HYPRE_MEMORY_DEVICE);
-        hypre_TFree(ijbuf_sym_rownums, HYPRE_MEMORY_DEVICE);
-        hypre_TFree(ijbuf_sym_numcols, HYPRE_MEMORY_DEVICE);
-    }
-
-    return Pattern_CSR;
+            /*}*/
+         }
+      }
+
+   }
+
+   /* For efficiency, we do a buffered IJAddToValues.
+    * This empties the buffer of any remaining values */
+   hypre_NonGalerkinIJBufferEmpty(Pattern, ijbuf_size, &ijbuf_cnt, ijbuf_rowcounter,
+                                  &ijbuf_data, &ijbuf_cols, &ijbuf_rownums, &ijbuf_numcols);
+   if (sym_collapse)
+   {
+      hypre_NonGalerkinIJBufferEmpty(Pattern, ijbuf_size, &ijbuf_sym_cnt, ijbuf_sym_rowcounter,
+                                     &ijbuf_sym_data, &ijbuf_sym_cols, &ijbuf_sym_rownums,
+                                     &ijbuf_sym_numcols);
+   }
+
+   /* Finalize Construction of Pattern */
+   HYPRE_IJMatrixAssemble(Pattern);
+   HYPRE_IJMatrixGetObject(Pattern, (void**) &Pattern_CSR);
+
+   /* Deallocate */
+   HYPRE_IJMatrixSetObjectType(Pattern, -1);
+   HYPRE_IJMatrixDestroy(Pattern);
+   hypre_TFree(ijbuf_data,    memory_location_RAP);
+   hypre_TFree(ijbuf_cols,    memory_location_RAP);
+   hypre_TFree(ijbuf_rownums, memory_location_RAP);
+   hypre_TFree(ijbuf_numcols, memory_location_RAP);
+
+   if (sym_collapse)
+   {
+      hypre_TFree(ijbuf_sym_data,    memory_location_RAP);
+      hypre_TFree(ijbuf_sym_cols,    memory_location_RAP);
+      hypre_TFree(ijbuf_sym_rownums, memory_location_RAP);
+      hypre_TFree(ijbuf_sym_numcols, memory_location_RAP);
+   }
+
+   HYPRE_ANNOTATE_FUNC_END;
+
+   return Pattern_CSR;
 }
 
 
@@ -1217,1098 +1252,1113 @@ hypre_BoomerAMGBuildNonGalerkinCoarseOperator( hypre_ParCSRMatrix **RAP_ptr,
                                                HYPRE_Real droptol, HYPRE_Int sym_collapse,
                                                HYPRE_Real lump_percent, HYPRE_Int collapse_beta )
 {
-    /* Initializations */
-    MPI_Comm            comm                  = hypre_ParCSRMatrixComm(*RAP_ptr);
-    hypre_ParCSRMatrix  *S                    = NULL;
-    hypre_ParCSRMatrix  *RAP                  = *RAP_ptr;
-    HYPRE_Int           i, j, k, row_start, row_end, value, num_cols_offd_Sext, num_procs;
-    HYPRE_Int           S_ext_diag_size, S_ext_offd_size, last_col_diag_RAP, cnt_offd, cnt_diag, cnt;
-    HYPRE_Int           col_indx_Pattern, current_Pattern_j, col_indx_RAP;
-    /* HYPRE_Real          start_time            = hypre_MPI_Wtime(); */
-    /* HYPRE_Real          end_time; */
-    HYPRE_BigInt       *temp                = NULL;
-    HYPRE_Int           ierr                  = 0;
-    char                filename[256];
-
-    /* Lumping related variables */
-    HYPRE_IJMatrix      ijmatrix;
-    HYPRE_BigInt        * Pattern_offd_indices          = NULL;
-    HYPRE_BigInt        * S_offd_indices                = NULL;
-    HYPRE_BigInt        * offd_intersection             = NULL;
-    HYPRE_Real          * offd_intersection_data        = NULL;
-    HYPRE_Int           * diag_intersection             = NULL;
-    HYPRE_Real          * diag_intersection_data        = NULL;
-    HYPRE_Int           Pattern_offd_indices_len        = 0;
-    HYPRE_Int           Pattern_offd_indices_allocated_len= 0;
-    HYPRE_Int           S_offd_indices_len              = 0;
-    HYPRE_Int           S_offd_indices_allocated_len    = 0;
-    HYPRE_Int           offd_intersection_len           = 0;
-    HYPRE_Int           offd_intersection_allocated_len = 0;
-    HYPRE_Int           diag_intersection_len           = 0;
-    HYPRE_Int           diag_intersection_allocated_len = 0;
-    HYPRE_Real          intersection_len                = 0;
-    HYPRE_Int           * Pattern_indices_ptr           = NULL;
-    HYPRE_Int           Pattern_diag_indices_len        = 0;
-    HYPRE_Int           global_row                      = 0;
-    HYPRE_Int           has_row_ended                   = 0;
-    HYPRE_Real          lump_value                      = 0.;
-    HYPRE_Real          diagonal_lump_value             = 0.;
-    HYPRE_Real          neg_lump_value                  = 0.;
-    HYPRE_Real          sum_strong_neigh                = 0.;
-    HYPRE_Int           * rownz                         = NULL;
-
-    /* offd and diag portions of RAP */
-    hypre_CSRMatrix     *RAP_diag             = hypre_ParCSRMatrixDiag(RAP);
-    HYPRE_Int           *RAP_diag_i           = hypre_CSRMatrixI(RAP_diag);
-    HYPRE_Real          *RAP_diag_data        = hypre_CSRMatrixData(RAP_diag);
-    HYPRE_Int           *RAP_diag_j           = hypre_CSRMatrixJ(RAP_diag);
-    HYPRE_BigInt         first_col_diag_RAP   = hypre_ParCSRMatrixFirstColDiag(RAP);
-    HYPRE_Int            num_cols_diag_RAP    = hypre_CSRMatrixNumCols(RAP_diag);
-
-    hypre_CSRMatrix     *RAP_offd             = hypre_ParCSRMatrixOffd(RAP);
-    HYPRE_Int           *RAP_offd_i           = hypre_CSRMatrixI(RAP_offd);
-    HYPRE_Real          *RAP_offd_data        = NULL;
-    HYPRE_Int           *RAP_offd_j           = hypre_CSRMatrixJ(RAP_offd);
-    HYPRE_BigInt        *col_map_offd_RAP     = hypre_ParCSRMatrixColMapOffd(RAP);
-    HYPRE_Int            num_cols_RAP_offd    = hypre_CSRMatrixNumCols(RAP_offd);
-
-    HYPRE_Int            num_variables        = hypre_CSRMatrixNumRows(RAP_diag);
-    HYPRE_BigInt         global_num_vars      = hypre_ParCSRMatrixGlobalNumRows(RAP);
-
-    /* offd and diag portions of S */
-    hypre_CSRMatrix     *S_diag               = NULL;
-    HYPRE_Int           *S_diag_i             = NULL;
-    HYPRE_Real          *S_diag_data          = NULL;
-    HYPRE_Int           *S_diag_j             = NULL;
-
-    hypre_CSRMatrix     *S_offd               = NULL;
-    HYPRE_Int           *S_offd_i             = NULL;
-    HYPRE_Real          *S_offd_data          = NULL;
-    HYPRE_Int           *S_offd_j             = NULL;
-    HYPRE_BigInt        *col_map_offd_S       = NULL;
-
-    HYPRE_Int            num_cols_offd_S;
-    /* HYPRE_Int         num_nonzeros_S_diag; */
-
-    /* off processor portions of S */
-    hypre_CSRMatrix    *S_ext                 = NULL;
-    HYPRE_Int          *S_ext_i               = NULL;
-    HYPRE_Real         *S_ext_data            = NULL;
-    HYPRE_BigInt       *S_ext_j               = NULL;
-
-    HYPRE_Int          *S_ext_diag_i          = NULL;
-    HYPRE_Real         *S_ext_diag_data       = NULL;
-    HYPRE_Int          *S_ext_diag_j          = NULL;
-
-    HYPRE_Int          *S_ext_offd_i          = NULL;
-    HYPRE_Real         *S_ext_offd_data       = NULL;
-    HYPRE_Int          *S_ext_offd_j          = NULL;
-    HYPRE_BigInt       *col_map_offd_Sext     = NULL;
-    /* HYPRE_Int            num_nonzeros_S_ext_diag;
-       HYPRE_Int            num_nonzeros_S_ext_offd;
-       HYPRE_Int            num_rows_Sext         = 0; */
-    HYPRE_Int           row_indx_Sext         = 0;
-
-
-    /* offd and diag portions of Pattern */
-    hypre_ParCSRMatrix  *Pattern              = NULL;
-    hypre_CSRMatrix     *Pattern_diag         = NULL;
-    HYPRE_Int           *Pattern_diag_i       = NULL;
-    HYPRE_Real          *Pattern_diag_data    = NULL;
-    HYPRE_Int           *Pattern_diag_j       = NULL;
-
-    hypre_CSRMatrix     *Pattern_offd         = NULL;
-    HYPRE_Int           *Pattern_offd_i       = NULL;
-    HYPRE_Real          *Pattern_offd_data    = NULL;
-    HYPRE_Int           *Pattern_offd_j       = NULL;
-    HYPRE_BigInt        *col_map_offd_Pattern = NULL;
-
-    HYPRE_Int            num_cols_Pattern_offd;
-    HYPRE_Int            my_id;
-
-    /* Buffered IJAddToValues */
-    HYPRE_Int           ijbuf_cnt, ijbuf_size, ijbuf_rowcounter;
-    HYPRE_Real          *ijbuf_data;
-    HYPRE_BigInt        *ijbuf_cols, *ijbuf_rownums;
-    HYPRE_Int           *ijbuf_numcols;
-
-    /* Buffered IJAddToValues for Symmetric Entries */
-    HYPRE_Int           ijbuf_sym_cnt, ijbuf_sym_rowcounter;
-    HYPRE_Real          *ijbuf_sym_data;
-    HYPRE_BigInt        *ijbuf_sym_cols, *ijbuf_sym_rownums;
-    HYPRE_Int           *ijbuf_sym_numcols;
-
-    /* Further Initializations */
-    if (num_cols_RAP_offd)
-    {   RAP_offd_data = hypre_CSRMatrixData(RAP_offd); }
-    hypre_MPI_Comm_size(comm, &num_procs);
-    hypre_MPI_Comm_rank(comm, &my_id);
-
-    /* Compute Sparsity Pattern  */
-    Pattern                    = hypre_NonGalerkinSparsityPattern(AP, RAP, CF_marker, droptol, sym_collapse, collapse_beta);
-    Pattern_diag               = hypre_ParCSRMatrixDiag(Pattern);
-    Pattern_diag_i             = hypre_CSRMatrixI(Pattern_diag);
-    Pattern_diag_data          = hypre_CSRMatrixData(Pattern_diag);
-    Pattern_diag_j             = hypre_CSRMatrixJ(Pattern_diag);
-
-    Pattern_offd               = hypre_ParCSRMatrixOffd(Pattern);
-    Pattern_offd_i             = hypre_CSRMatrixI(Pattern_offd);
-    Pattern_offd_j             = hypre_CSRMatrixJ(Pattern_offd);
-    col_map_offd_Pattern       = hypre_ParCSRMatrixColMapOffd(Pattern);
-
-    num_cols_Pattern_offd      = hypre_CSRMatrixNumCols(Pattern_offd);
-    if (num_cols_Pattern_offd)
-    {   Pattern_offd_data = hypre_CSRMatrixData(Pattern_offd); }
-
-    /**
-     * Fill in the entries of Pattern with entries from RAP
-     **/
-
-    /* First, sort column indices in RAP and Pattern */
-    for(i = 0; i < num_variables; i++)
-    {
-        /* The diag matrices store the diagonal as first element in each row.
-         * We maintain that for the case of Pattern and RAP, because the
-         * strength of connection routine relies on it and we need to ignore
-         * diagonal entries in Pattern later during set intersections.
-         * */
-
-        /* Sort diag portion of RAP */
-        row_start = RAP_diag_i[i];
-        if( RAP_diag_j[row_start] == i)
-        {   row_start = row_start + 1; }
-        row_end = RAP_diag_i[i+1];
-        hypre_qsort1(RAP_diag_j, RAP_diag_data, row_start, row_end-1 );
-
-        /* Sort diag portion of Pattern */
-        row_start = Pattern_diag_i[i];
-
-        if( Pattern_diag_j[row_start] == i)
-        {   row_start = row_start + 1; }
-        row_end = Pattern_diag_i[i+1];
-        hypre_qsort1(Pattern_diag_j, Pattern_diag_data, row_start, row_end-1 );
-
-        /* Sort offd portion of RAP */
-        row_start = RAP_offd_i[i];
-        row_end = RAP_offd_i[i+1];
-        hypre_qsort1(RAP_offd_j, RAP_offd_data, row_start, row_end-1 );
-
-        /* Sort offd portion of Pattern */
-        /* Be careful to map coarse dof i with CF_marker into Pattern */
-        row_start = Pattern_offd_i[i];
-        row_end = Pattern_offd_i[i+1];
-        hypre_qsort1(Pattern_offd_j, Pattern_offd_data, row_start, row_end-1 );
-
-    }
-
-
-    /* Create Strength matrix based on RAP or Pattern.  If Pattern is used,
-     * then the SortedCopyParCSRData(...) function call must also be commented
-     * back in */
-    /* hypre_SortedCopyParCSRData(RAP, Pattern); */
-    if(0)
-    {
-        /* hypre_BoomerAMG_MyCreateS(Pattern, strong_threshold, max_row_sum, */
-        hypre_BoomerAMG_MyCreateS(RAP, strong_threshold, max_row_sum,
-                                  num_functions, dof_func_value, &S);
-    }
-    else
-    {
-        /* Passing in "1, NULL" because dof_array is not needed
-         * because we assume that  the number of functions is 1 */
-        /* hypre_BoomerAMG_MyCreateS(Pattern, strong_threshold, max_row_sum,*/
-        hypre_BoomerAMG_MyCreateS(RAP, strong_threshold, max_row_sum,
-                                  1, NULL, &S);
-    }
-    /* Grab diag and offd parts of S */
-    S_diag               = hypre_ParCSRMatrixDiag(S);
-    S_diag_i             = hypre_CSRMatrixI(S_diag);
-    S_diag_j             = hypre_CSRMatrixJ(S_diag);
-    S_diag_data          = hypre_CSRMatrixData(S_diag);
-
-    S_offd               = hypre_ParCSRMatrixOffd(S);
-    S_offd_i             = hypre_CSRMatrixI(S_offd);
-    S_offd_j             = hypre_CSRMatrixJ(S_offd);
-    S_offd_data          = hypre_CSRMatrixData(S_offd);
-    col_map_offd_S       = hypre_ParCSRMatrixColMapOffd(S);
-
-    num_cols_offd_S      = hypre_CSRMatrixNumCols(S_offd);
-    /* num_nonzeros_S_diag  = S_diag_i[num_variables]; */
-
-
-
-
-    /* Grab part of S that is distance one away from the local rows
-     * This is needed later for the stencil collapsing.  This section
-     * of the code mimics par_rap.c when it extracts Ps_ext.
-     * When moving from par_rap.c, the variable name changes were:
-     * A      --> RAP
-     * P      --> S
-     * Ps_ext --> S_ext
-     * P_ext_diag --> S_ext_diag
-     * P_ext_offd --> S_ext_offd
-     *
-     * The data layout of S_ext as returned by ExtractBExt gives you only global
-     * column indices, and must be converted to the local numbering.  This code
-     * section constructs S_ext_diag and S_ext_offd, which are the distance 1
-     * couplings in S based on the sparsity structure in RAP.
-     * --> S_ext_diag corresponds to the same column slice that RAP_diag
-     *     corresponds to.  Thus, the column indexing is the same as in
-     *     RAP_diag such that S_ext_diag_j[k] just needs to be offset by
-     *     the RAP_diag first global dof offset.
-     * --> S_ext_offd column indexing is a little more complicated, and
-     *     requires the computation below of col_map_S_ext_offd, which
-     *     maps the local 0,1,2,... column indexing in S_ext_offd to global
-     *     dof numbers.  Note, that the num_cols_RAP_offd is NOT equal to
-     *     num_cols_offd_S_ext
-     * --> The row indexing of S_ext_diag|offd is as follows.  Use
-     *     col_map_offd_RAP, where the first index corresponds to the
-     *     first global row index in S_ext_diag|offd.  Remember that ExtractBExt
-     *     grabs the information from S required for locally computing
-     *     (RAP*S)[proc_k row slice, :] */
-
-    if (num_procs > 1)
-    {
-        S_ext      = hypre_ParCSRMatrixExtractBExt(S,RAP,1);
-        S_ext_data = hypre_CSRMatrixData(S_ext);
-        S_ext_i    = hypre_CSRMatrixI(S_ext);
-        S_ext_j    = hypre_CSRMatrixBigJ(S_ext);
-    }
-
-    /* This uses the num_cols_RAP_offd to set S_ext_diag|offd_i, because S_ext
-     * is the off-processor information needed to compute RAP*S.  That is,
-     * num_cols_RAP_offd represents the number of rows needed from S_ext for
-     * the multiplication */
-    S_ext_diag_i = hypre_CTAlloc(HYPRE_Int, num_cols_RAP_offd+1, HYPRE_MEMORY_HOST);
-    S_ext_offd_i = hypre_CTAlloc(HYPRE_Int, num_cols_RAP_offd+1, HYPRE_MEMORY_HOST);
-    S_ext_diag_size = 0;
-    S_ext_offd_size = 0;
-    /* num_rows_Sext = num_cols_RAP_offd; */
-    last_col_diag_RAP = first_col_diag_RAP + num_cols_diag_RAP - 1;
-
-    /* construct the S_ext_diag and _offd row-pointer arrays by counting elements
-     * This looks to create offd and diag blocks related to the local rows belonging
-     * to this processor...we may not need to split up S_ext this way...or we could.
-     * It would make for faster binary searching and set intersecting later...this will
-     * be the bottle neck so LETS SPLIT THIS UP Between offd and diag*/
-    for (i=0; i < num_cols_RAP_offd; i++)
-    {
-        for (j=S_ext_i[i]; j < S_ext_i[i+1]; j++)
-            if (S_ext_j[j] < first_col_diag_RAP || S_ext_j[j] > last_col_diag_RAP)
-                S_ext_offd_size++;
-            else
-                S_ext_diag_size++;
-        S_ext_diag_i[i+1] = S_ext_diag_size;
-        S_ext_offd_i[i+1] = S_ext_offd_size;
-    }
-
-    if (S_ext_diag_size)
-    {
-        S_ext_diag_j = hypre_CTAlloc(HYPRE_Int,  S_ext_diag_size, HYPRE_MEMORY_HOST);
-        S_ext_diag_data = hypre_CTAlloc(HYPRE_Real,  S_ext_diag_size, HYPRE_MEMORY_HOST);
-    }
-    if (S_ext_offd_size)
-    {
-        S_ext_offd_j = hypre_CTAlloc(HYPRE_Int,  S_ext_offd_size, HYPRE_MEMORY_HOST);
-        S_ext_offd_data = hypre_CTAlloc(HYPRE_Real,  S_ext_offd_size, HYPRE_MEMORY_HOST);
-    }
-
-    /* This copies over the column indices into the offd and diag parts.
-     * The diag portion has it's local column indices shifted to start at 0.
-     * The offd portion requires more work to construct the col_map_offd array
-     * and a local column ordering. */
-    cnt_offd = 0;
-    cnt_diag = 0;
-    cnt = 0;
-    for (i=0; i < num_cols_RAP_offd; i++)
-    {
-        for (j=S_ext_i[i]; j < S_ext_i[i+1]; j++)
-            if (S_ext_j[j] < first_col_diag_RAP || S_ext_j[j] > last_col_diag_RAP)
+   /* Initializations */
+   MPI_Comm            comm                  = hypre_ParCSRMatrixComm(*RAP_ptr);
+   hypre_ParCSRMatrix  *S                    = NULL;
+   hypre_ParCSRMatrix  *RAP                  = *RAP_ptr;
+   HYPRE_Int           i, j, k, row_start, row_end, num_cols_offd_Sext, num_procs;
+   HYPRE_Int           S_ext_diag_size, S_ext_offd_size;
+   HYPRE_BigInt        last_col_diag_RAP;
+   HYPRE_Int           cnt_offd, cnt_diag, cnt;
+   HYPRE_Int           col_indx_Pattern, current_Pattern_j, col_indx_RAP;
+   HYPRE_BigInt        value;
+   HYPRE_BigInt       *temp                = NULL;
+
+   HYPRE_MemoryLocation memory_location_RAP = hypre_ParCSRMatrixMemoryLocation(RAP);
+
+   /* Lumping related variables */
+   HYPRE_IJMatrix      ijmatrix;
+   HYPRE_BigInt        * Pattern_offd_indices          = NULL;
+   HYPRE_BigInt        * S_offd_indices                = NULL;
+   HYPRE_BigInt        * offd_intersection             = NULL;
+   HYPRE_Real          * offd_intersection_data        = NULL;
+   HYPRE_Int           * diag_intersection             = NULL;
+   HYPRE_Real          * diag_intersection_data        = NULL;
+   HYPRE_Int           Pattern_offd_indices_len        = 0;
+   HYPRE_Int           Pattern_offd_indices_allocated_len = 0;
+   HYPRE_Int           S_offd_indices_len              = 0;
+   HYPRE_Int           S_offd_indices_allocated_len    = 0;
+   HYPRE_Int           offd_intersection_len           = 0;
+   HYPRE_Int           offd_intersection_allocated_len = 0;
+   HYPRE_Int           diag_intersection_len           = 0;
+   HYPRE_Int           diag_intersection_allocated_len = 0;
+   HYPRE_Real          intersection_len                = 0;
+   HYPRE_Int           * Pattern_indices_ptr           = NULL;
+   HYPRE_Int           Pattern_diag_indices_len        = 0;
+   HYPRE_Int           global_row                      = 0;
+   HYPRE_Int           has_row_ended                   = 0;
+   HYPRE_Real          lump_value                      = 0.;
+   HYPRE_Real          diagonal_lump_value             = 0.;
+   HYPRE_Real          neg_lump_value                  = 0.;
+   HYPRE_Real          sum_strong_neigh                = 0.;
+   HYPRE_Int           * rownz                         = NULL;
+
+   /* offd and diag portions of RAP */
+   hypre_CSRMatrix     *RAP_diag             = hypre_ParCSRMatrixDiag(RAP);
+   HYPRE_Int           *RAP_diag_i           = hypre_CSRMatrixI(RAP_diag);
+   HYPRE_Real          *RAP_diag_data        = hypre_CSRMatrixData(RAP_diag);
+   HYPRE_Int           *RAP_diag_j           = hypre_CSRMatrixJ(RAP_diag);
+   HYPRE_BigInt         first_col_diag_RAP   = hypre_ParCSRMatrixFirstColDiag(RAP);
+   HYPRE_Int            num_cols_diag_RAP    = hypre_CSRMatrixNumCols(RAP_diag);
+
+   hypre_CSRMatrix     *RAP_offd             = hypre_ParCSRMatrixOffd(RAP);
+   HYPRE_Int           *RAP_offd_i           = hypre_CSRMatrixI(RAP_offd);
+   HYPRE_Real          *RAP_offd_data        = NULL;
+   HYPRE_Int           *RAP_offd_j           = hypre_CSRMatrixJ(RAP_offd);
+   HYPRE_BigInt        *col_map_offd_RAP     = hypre_ParCSRMatrixColMapOffd(RAP);
+   HYPRE_Int            num_cols_RAP_offd    = hypre_CSRMatrixNumCols(RAP_offd);
+   HYPRE_Int            num_variables        = hypre_CSRMatrixNumRows(RAP_diag);
+
+   /* offd and diag portions of S */
+   hypre_CSRMatrix     *S_diag               = NULL;
+   HYPRE_Int           *S_diag_i             = NULL;
+   HYPRE_Real          *S_diag_data          = NULL;
+   HYPRE_Int           *S_diag_j             = NULL;
+
+   hypre_CSRMatrix     *S_offd               = NULL;
+   HYPRE_Int           *S_offd_i             = NULL;
+   HYPRE_Real          *S_offd_data          = NULL;
+   HYPRE_Int           *S_offd_j             = NULL;
+   HYPRE_BigInt        *col_map_offd_S       = NULL;
+
+   HYPRE_Int            num_cols_offd_S;
+   /* HYPRE_Int         num_nonzeros_S_diag; */
+
+   /* off processor portions of S */
+   hypre_CSRMatrix    *S_ext                 = NULL;
+   HYPRE_Int          *S_ext_i               = NULL;
+   HYPRE_Real         *S_ext_data            = NULL;
+   HYPRE_BigInt       *S_ext_j               = NULL;
+
+   HYPRE_Int          *S_ext_diag_i          = NULL;
+   HYPRE_Real         *S_ext_diag_data       = NULL;
+   HYPRE_Int          *S_ext_diag_j          = NULL;
+
+   HYPRE_Int          *S_ext_offd_i          = NULL;
+   HYPRE_Real         *S_ext_offd_data       = NULL;
+   HYPRE_Int          *S_ext_offd_j          = NULL;
+   HYPRE_BigInt       *col_map_offd_Sext     = NULL;
+   /* HYPRE_Int            num_nonzeros_S_ext_diag;
+      HYPRE_Int            num_nonzeros_S_ext_offd;
+      HYPRE_Int            num_rows_Sext         = 0; */
+   HYPRE_Int           row_indx_Sext         = 0;
+
+
+   /* offd and diag portions of Pattern */
+   hypre_ParCSRMatrix  *Pattern              = NULL;
+   hypre_CSRMatrix     *Pattern_diag         = NULL;
+   HYPRE_Int           *Pattern_diag_i       = NULL;
+   HYPRE_Real          *Pattern_diag_data    = NULL;
+   HYPRE_Int           *Pattern_diag_j       = NULL;
+
+   hypre_CSRMatrix     *Pattern_offd         = NULL;
+   HYPRE_Int           *Pattern_offd_i       = NULL;
+   HYPRE_Real          *Pattern_offd_data    = NULL;
+   HYPRE_Int           *Pattern_offd_j       = NULL;
+   HYPRE_BigInt        *col_map_offd_Pattern = NULL;
+
+   HYPRE_Int            num_cols_Pattern_offd;
+   HYPRE_Int            my_id;
+
+   /* Buffered IJAddToValues */
+   HYPRE_Int           ijbuf_cnt, ijbuf_size, ijbuf_rowcounter;
+   HYPRE_Real          *ijbuf_data;
+   HYPRE_BigInt        *ijbuf_cols, *ijbuf_rownums;
+   HYPRE_Int           *ijbuf_numcols;
+
+   /* Buffered IJAddToValues for Symmetric Entries */
+   HYPRE_Int           ijbuf_sym_cnt, ijbuf_sym_rowcounter;
+   HYPRE_Real          *ijbuf_sym_data;
+   HYPRE_BigInt        *ijbuf_sym_cols, *ijbuf_sym_rownums;
+   HYPRE_Int           *ijbuf_sym_numcols;
+
+   HYPRE_ANNOTATE_FUNC_BEGIN;
+
+   /* Further Initializations */
+   if (num_cols_RAP_offd)
+   {   RAP_offd_data = hypre_CSRMatrixData(RAP_offd); }
+   hypre_MPI_Comm_size(comm, &num_procs);
+   hypre_MPI_Comm_rank(comm, &my_id);
+
+   /* Compute Sparsity Pattern  */
+   Pattern                    = hypre_NonGalerkinSparsityPattern(AP, RAP, CF_marker, droptol,
+                                                                 sym_collapse, collapse_beta);
+   Pattern_diag               = hypre_ParCSRMatrixDiag(Pattern);
+   Pattern_diag_i             = hypre_CSRMatrixI(Pattern_diag);
+   Pattern_diag_data          = hypre_CSRMatrixData(Pattern_diag);
+   Pattern_diag_j             = hypre_CSRMatrixJ(Pattern_diag);
+
+   Pattern_offd               = hypre_ParCSRMatrixOffd(Pattern);
+   Pattern_offd_i             = hypre_CSRMatrixI(Pattern_offd);
+   Pattern_offd_j             = hypre_CSRMatrixJ(Pattern_offd);
+   col_map_offd_Pattern       = hypre_ParCSRMatrixColMapOffd(Pattern);
+
+   num_cols_Pattern_offd      = hypre_CSRMatrixNumCols(Pattern_offd);
+   if (num_cols_Pattern_offd)
+   {   Pattern_offd_data = hypre_CSRMatrixData(Pattern_offd); }
+
+   /**
+    * Fill in the entries of Pattern with entries from RAP
+    **/
+
+   /* First, sort column indices in RAP and Pattern */
+   for (i = 0; i < num_variables; i++)
+   {
+      /* The diag matrices store the diagonal as first element in each row.
+       * We maintain that for the case of Pattern and RAP, because the
+       * strength of connection routine relies on it and we need to ignore
+       * diagonal entries in Pattern later during set intersections.
+       * */
+
+      /* Sort diag portion of RAP */
+      row_start = RAP_diag_i[i];
+      if ( RAP_diag_j[row_start] == i)
+      {   row_start = row_start + 1; }
+      row_end = RAP_diag_i[i + 1];
+      hypre_qsort1(RAP_diag_j, RAP_diag_data, row_start, row_end - 1 );
+
+      /* Sort diag portion of Pattern */
+      row_start = Pattern_diag_i[i];
+
+      if ( Pattern_diag_j[row_start] == i)
+      {   row_start = row_start + 1; }
+      row_end = Pattern_diag_i[i + 1];
+      hypre_qsort1(Pattern_diag_j, Pattern_diag_data, row_start, row_end - 1 );
+
+      /* Sort offd portion of RAP */
+      row_start = RAP_offd_i[i];
+      row_end = RAP_offd_i[i + 1];
+      hypre_qsort1(RAP_offd_j, RAP_offd_data, row_start, row_end - 1 );
+
+      /* Sort offd portion of Pattern */
+      /* Be careful to map coarse dof i with CF_marker into Pattern */
+      row_start = Pattern_offd_i[i];
+      row_end = Pattern_offd_i[i + 1];
+      hypre_qsort1(Pattern_offd_j, Pattern_offd_data, row_start, row_end - 1 );
+
+   }
+
+
+   /* Create Strength matrix based on RAP or Pattern.  If Pattern is used,
+    * then the SortedCopyParCSRData(...) function call must also be commented
+    * back in */
+   /* hypre_SortedCopyParCSRData(RAP, Pattern); */
+   if (0)
+   {
+      /* hypre_BoomerAMG_MyCreateS(Pattern, strong_threshold, max_row_sum, */
+      hypre_BoomerAMG_MyCreateS(RAP, strong_threshold, max_row_sum,
+                                num_functions, dof_func_value, &S);
+   }
+   else
+   {
+      /* Passing in "1, NULL" because dof_array is not needed
+       * because we assume that  the number of functions is 1 */
+      /* hypre_BoomerAMG_MyCreateS(Pattern, strong_threshold, max_row_sum,*/
+      hypre_BoomerAMG_MyCreateS(RAP, strong_threshold, max_row_sum,
+                                1, NULL, &S);
+   }
+   /* Grab diag and offd parts of S */
+   S_diag               = hypre_ParCSRMatrixDiag(S);
+   S_diag_i             = hypre_CSRMatrixI(S_diag);
+   S_diag_j             = hypre_CSRMatrixJ(S_diag);
+   S_diag_data          = hypre_CSRMatrixData(S_diag);
+
+   S_offd               = hypre_ParCSRMatrixOffd(S);
+   S_offd_i             = hypre_CSRMatrixI(S_offd);
+   S_offd_j             = hypre_CSRMatrixJ(S_offd);
+   S_offd_data          = hypre_CSRMatrixData(S_offd);
+   col_map_offd_S       = hypre_ParCSRMatrixColMapOffd(S);
+
+   num_cols_offd_S      = hypre_CSRMatrixNumCols(S_offd);
+   /* num_nonzeros_S_diag  = S_diag_i[num_variables]; */
+
+
+
+
+   /* Grab part of S that is distance one away from the local rows
+    * This is needed later for the stencil collapsing.  This section
+    * of the code mimics par_rap.c when it extracts Ps_ext.
+    * When moving from par_rap.c, the variable name changes were:
+    * A      --> RAP
+    * P      --> S
+    * Ps_ext --> S_ext
+    * P_ext_diag --> S_ext_diag
+    * P_ext_offd --> S_ext_offd
+    *
+    * The data layout of S_ext as returned by ExtractBExt gives you only global
+    * column indices, and must be converted to the local numbering.  This code
+    * section constructs S_ext_diag and S_ext_offd, which are the distance 1
+    * couplings in S based on the sparsity structure in RAP.
+    * --> S_ext_diag corresponds to the same column slice that RAP_diag
+    *     corresponds to.  Thus, the column indexing is the same as in
+    *     RAP_diag such that S_ext_diag_j[k] just needs to be offset by
+    *     the RAP_diag first global dof offset.
+    * --> S_ext_offd column indexing is a little more complicated, and
+    *     requires the computation below of col_map_S_ext_offd, which
+    *     maps the local 0,1,2,... column indexing in S_ext_offd to global
+    *     dof numbers.  Note, that the num_cols_RAP_offd is NOT equal to
+    *     num_cols_offd_S_ext
+    * --> The row indexing of S_ext_diag|offd is as follows.  Use
+    *     col_map_offd_RAP, where the first index corresponds to the
+    *     first global row index in S_ext_diag|offd.  Remember that ExtractBExt
+    *     grabs the information from S required for locally computing
+    *     (RAP*S)[proc_k row slice, :] */
+
+   if (num_procs > 1)
+   {
+      S_ext      = hypre_ParCSRMatrixExtractBExt(S, RAP, 1);
+      S_ext_data = hypre_CSRMatrixData(S_ext);
+      S_ext_i    = hypre_CSRMatrixI(S_ext);
+      S_ext_j    = hypre_CSRMatrixBigJ(S_ext);
+   }
+
+   /* This uses the num_cols_RAP_offd to set S_ext_diag|offd_i, because S_ext
+    * is the off-processor information needed to compute RAP*S.  That is,
+    * num_cols_RAP_offd represents the number of rows needed from S_ext for
+    * the multiplication */
+   S_ext_diag_i = hypre_CTAlloc(HYPRE_Int, num_cols_RAP_offd + 1, HYPRE_MEMORY_HOST);
+   S_ext_offd_i = hypre_CTAlloc(HYPRE_Int, num_cols_RAP_offd + 1, HYPRE_MEMORY_HOST);
+   S_ext_diag_size = 0;
+   S_ext_offd_size = 0;
+   /* num_rows_Sext = num_cols_RAP_offd; */
+   last_col_diag_RAP = first_col_diag_RAP + ((HYPRE_BigInt) (num_cols_diag_RAP - 1));
+
+   /* construct the S_ext_diag and _offd row-pointer arrays by counting elements
+    * This looks to create offd and diag blocks related to the local rows belonging
+    * to this processor...we may not need to split up S_ext this way...or we could.
+    * It would make for faster binary searching and set intersecting later...this will
+    * be the bottle neck so LETS SPLIT THIS UP Between offd and diag*/
+   for (i = 0; i < num_cols_RAP_offd; i++)
+   {
+      for (j = S_ext_i[i]; j < S_ext_i[i + 1]; j++)
+      {
+         if (S_ext_j[j] < first_col_diag_RAP || S_ext_j[j] > last_col_diag_RAP)
+         {
+            S_ext_offd_size++;
+         }
+         else
+         {
+            S_ext_diag_size++;
+         }
+      }
+      S_ext_diag_i[i + 1] = S_ext_diag_size;
+      S_ext_offd_i[i + 1] = S_ext_offd_size;
+   }
+
+   if (S_ext_diag_size)
+   {
+      S_ext_diag_j = hypre_CTAlloc(HYPRE_Int,  S_ext_diag_size, HYPRE_MEMORY_HOST);
+      S_ext_diag_data = hypre_CTAlloc(HYPRE_Real,  S_ext_diag_size, HYPRE_MEMORY_HOST);
+   }
+   if (S_ext_offd_size)
+   {
+      S_ext_offd_j = hypre_CTAlloc(HYPRE_Int,  S_ext_offd_size, HYPRE_MEMORY_HOST);
+      S_ext_offd_data = hypre_CTAlloc(HYPRE_Real,  S_ext_offd_size, HYPRE_MEMORY_HOST);
+   }
+
+   /* This copies over the column indices into the offd and diag parts.
+    * The diag portion has it's local column indices shifted to start at 0.
+    * The offd portion requires more work to construct the col_map_offd array
+    * and a local column ordering. */
+   cnt_offd = 0;
+   cnt_diag = 0;
+   cnt = 0;
+   for (i = 0; i < num_cols_RAP_offd; i++)
+   {
+      for (j = S_ext_i[i]; j < S_ext_i[i + 1]; j++)
+      {
+         if (S_ext_j[j] < first_col_diag_RAP || S_ext_j[j] > last_col_diag_RAP)
+         {
+            S_ext_offd_data[cnt_offd] = S_ext_data[j];
+            //S_ext_offd_j[cnt_offd++] = S_ext_j[j];
+            S_ext_j[cnt_offd++] = S_ext_j[j];
+         }
+         else
+         {
+            S_ext_diag_data[cnt_diag] = S_ext_data[j];
+            S_ext_diag_j[cnt_diag++] = (HYPRE_Int)(S_ext_j[j] - first_col_diag_RAP);
+         }
+      }
+   }
+
+   /* This creates col_map_offd_Sext */
+   if (S_ext_offd_size || num_cols_offd_S)
+   {
+      temp = hypre_CTAlloc(HYPRE_BigInt,  S_ext_offd_size + num_cols_offd_S, HYPRE_MEMORY_HOST);
+      for (i = 0; i < S_ext_offd_size; i++)
+      {
+         temp[i] = S_ext_j[i];
+      }
+      cnt = S_ext_offd_size;
+      for (i = 0; i < num_cols_offd_S; i++)
+      {
+         temp[cnt++] = col_map_offd_S[i];
+      }
+   }
+   if (cnt)
+   {
+      /* after this, the first so many entries of temp will hold the
+       * unique column indices in S_ext_offd_j unioned with the indices
+       * in col_map_offd_S */
+      hypre_BigQsort0(temp, 0, cnt - 1);
+
+      num_cols_offd_Sext = 1;
+      value = temp[0];
+      for (i = 1; i < cnt; i++)
+      {
+         if (temp[i] > value)
+         {
+            value = temp[i];
+            temp[num_cols_offd_Sext++] = value;
+         }
+      }
+   }
+   else
+   {
+      num_cols_offd_Sext = 0;
+   }
+
+   /* num_nonzeros_S_ext_diag = cnt_diag;
+    num_nonzeros_S_ext_offd = S_ext_offd_size; */
+
+   col_map_offd_Sext = hypre_CTAlloc(HYPRE_BigInt, num_cols_offd_Sext, HYPRE_MEMORY_HOST);
+
+   for (i = 0; i < num_cols_offd_Sext; i++)
+   {
+      col_map_offd_Sext[i] = temp[i];
+   }
+
+   if (S_ext_offd_size || num_cols_offd_S)
+   {
+      hypre_TFree(temp, HYPRE_MEMORY_HOST);
+   }
+
+   /* look for S_ext_offd_j[i] in col_map_offd_Sext, and set S_ext_offd_j[i]
+    * to the index of that column value in col_map_offd_Sext */
+   for (i = 0 ; i < S_ext_offd_size; i++)
+   {
+      S_ext_offd_j[i] = hypre_BigBinarySearch(col_map_offd_Sext,
+                                              S_ext_j[i],
+                                              num_cols_offd_Sext);
+   }
+
+   if (num_procs > 1)
+   {
+      hypre_CSRMatrixDestroy(S_ext);
+      S_ext = NULL;
+   }
+
+   /* Need to sort column indices in S and S_ext */
+   for (i = 0; i < num_variables; i++)
+   {
+      /* Re-Sort diag portion of Pattern, placing the diagonal entry in a
+       * sorted position */
+      row_start = Pattern_diag_i[i];
+      row_end = Pattern_diag_i[i + 1];
+      hypre_qsort1(Pattern_diag_j, Pattern_diag_data, row_start, row_end - 1 );
+
+      /* Sort diag portion of S, noting that no diagonal entry */
+      /* S has not "data" array...it's just NULL */
+      row_start = S_diag_i[i];
+      row_end = S_diag_i[i + 1];
+      hypre_qsort1(S_diag_j, S_diag_data, row_start, row_end - 1 );
+
+      /* Sort offd portion of S */
+      /* S has no "data" array...it's just NULL */
+      row_start = S_offd_i[i];
+      row_end = S_offd_i[i + 1];
+      hypre_qsort1(S_offd_j, S_offd_data, row_start, row_end - 1 );
+   }
+
+   /* Sort S_ext
+    * num_cols_RAP_offd  equals  num_rows for S_ext*/
+   for (i = 0; i < num_cols_RAP_offd; i++)
+   {
+      /* Sort diag portion of S_ext */
+      row_start = S_ext_diag_i[i];
+      row_end = S_ext_diag_i[i + 1];
+      hypre_qsort1(S_ext_diag_j, S_ext_diag_data, row_start, row_end - 1 );
+
+      /* Sort offd portion of S_ext */
+      row_start = S_ext_offd_i[i];
+      row_end = S_ext_offd_i[i + 1];
+      hypre_qsort1(S_ext_offd_j, S_ext_offd_data, row_start, row_end - 1 );
+
+   }
+
+   /*
+    * Now, for the fun stuff -- Computing the Non-Galerkin Operator
+    */
+
+   /* Initialize the ijmatrix, leveraging our knowledge of the nonzero
+    * structure in Pattern */
+   HYPRE_IJMatrixCreate(comm, first_col_diag_RAP, last_col_diag_RAP,
+                        first_col_diag_RAP, last_col_diag_RAP, &ijmatrix);
+   HYPRE_IJMatrixSetObjectType(ijmatrix, HYPRE_PARCSR);
+   rownz = hypre_CTAlloc(HYPRE_Int,  num_variables, HYPRE_MEMORY_HOST);
+   for (i = 0; i < num_variables; i++)
+   {
+      rownz[i] = (HYPRE_Int)(1.2 * (Pattern_diag_i[i + 1] - Pattern_diag_i[i]) +
+                             1.2 * (Pattern_offd_i[i + 1] - Pattern_offd_i[i]));
+   }
+   HYPRE_IJMatrixSetRowSizes(ijmatrix, rownz);
+   HYPRE_IJMatrixInitialize(ijmatrix);
+   hypre_TFree(rownz, HYPRE_MEMORY_HOST);
+
+   /*
+    *For efficiency, we do a buffered IJAddToValues.
+    * Here, we initialize the buffer and then initialize the buffer counters
+    */
+   ijbuf_size       = 1000;
+   ijbuf_data       = hypre_CTAlloc(HYPRE_Real,   ijbuf_size, memory_location_RAP);
+   ijbuf_cols       = hypre_CTAlloc(HYPRE_BigInt, ijbuf_size, memory_location_RAP);
+   ijbuf_rownums    = hypre_CTAlloc(HYPRE_BigInt, ijbuf_size, memory_location_RAP);
+   ijbuf_numcols    = hypre_CTAlloc(HYPRE_Int,    ijbuf_size, memory_location_RAP);
+   hypre_NonGalerkinIJBigBufferInit( &ijbuf_cnt, &ijbuf_rowcounter, ijbuf_cols );
+   if (sym_collapse)
+   {
+      ijbuf_sym_data   = hypre_CTAlloc(HYPRE_Real,   ijbuf_size, memory_location_RAP);
+      ijbuf_sym_cols   = hypre_CTAlloc(HYPRE_BigInt, ijbuf_size, memory_location_RAP);
+      ijbuf_sym_rownums = hypre_CTAlloc(HYPRE_BigInt, ijbuf_size, memory_location_RAP);
+      ijbuf_sym_numcols = hypre_CTAlloc(HYPRE_Int,    ijbuf_size, memory_location_RAP);
+      hypre_NonGalerkinIJBigBufferInit( &ijbuf_sym_cnt, &ijbuf_sym_rowcounter, ijbuf_sym_cols );
+   }
+
+   /*
+    * Eliminate Entries In RAP_diag
+    * */
+   for (i = 0; i < num_variables; i++)
+   {
+      global_row = (HYPRE_BigInt) i + first_col_diag_RAP;
+      row_start = RAP_diag_i[i];
+      row_end = RAP_diag_i[i + 1];
+      has_row_ended = 0;
+
+      /* Only do work if row has nonzeros */
+      if ( row_start < row_end)
+      {
+         /* Grab pointer to current entry in Pattern_diag */
+         current_Pattern_j = Pattern_diag_i[i];
+         col_indx_Pattern = Pattern_diag_j[current_Pattern_j];
+
+         /* Grab this row's indices out of Pattern offd and diag.  This will
+          * be for computing index set intersections for lumping */
+         /* Ensure adequate length */
+         Pattern_offd_indices_len = Pattern_offd_i[i + 1] - Pattern_offd_i[i];
+         if (Pattern_offd_indices_allocated_len < Pattern_offd_indices_len)
+         {
+            hypre_TFree(Pattern_offd_indices, HYPRE_MEMORY_HOST);
+            Pattern_offd_indices = hypre_CTAlloc(HYPRE_BigInt,  Pattern_offd_indices_len, HYPRE_MEMORY_HOST);
+            Pattern_offd_indices_allocated_len = Pattern_offd_indices_len;
+         }
+         /* Grab sub array from col_map, corresponding to the slice of Pattern_offd_j */
+         hypre_GrabSubArray(Pattern_offd_j,
+                            Pattern_offd_i[i], Pattern_offd_i[i + 1] - 1,
+                            col_map_offd_Pattern, Pattern_offd_indices);
+         /* No need to grab info out of Pattern_diag_j[...], here we just start from
+          * Pattern_diag_i[i] and end at index Pattern_diag_i[i+1] - 1.  We do need to
+          * ignore the diagonal entry in Pattern, because we don't lump entries there */
+         if ( Pattern_diag_j[Pattern_diag_i[i]] == i )
+         {
+            Pattern_indices_ptr = &( Pattern_diag_j[Pattern_diag_i[i] + 1]);
+            Pattern_diag_indices_len = Pattern_diag_i[i + 1] - Pattern_diag_i[i] - 1;
+         }
+         else
+         {
+            Pattern_indices_ptr = &( Pattern_diag_j[Pattern_diag_i[i]]);
+            Pattern_diag_indices_len = Pattern_diag_i[i + 1] - Pattern_diag_i[i];
+         }
+      }
+
+      for (j = row_start; j < row_end; j++)
+      {
+         col_indx_RAP = RAP_diag_j[j];
+
+         /* Ignore zero entries in RAP */
+         if ( RAP_diag_data[j] != 0.0)
+         {
+            /* Don't change the diagonal, just write it */
+            if (col_indx_RAP == i)
             {
-                S_ext_offd_data[cnt_offd] = S_ext_data[j];
-                //S_ext_offd_j[cnt_offd++] = S_ext_j[j];
-                S_ext_j[cnt_offd++] = S_ext_j[j];
+               /*#ifdef HY   PRE_USING_OPENMP
+               #pragma omp    critical (IJAdd)
+               #endif
+               {*/
+               /* For efficiency, we do a buffered IJAddToValues.
+                * A[global_row, global_row] += RAP_diag_data[j] */
+               hypre_NonGalerkinIJBufferWrite( ijmatrix, &ijbuf_cnt, ijbuf_size, &ijbuf_rowcounter,
+                                               &ijbuf_data, &ijbuf_cols, &ijbuf_rownums, &ijbuf_numcols, global_row,
+                                               global_row, RAP_diag_data[j] );
+               /*}*/
+
             }
-            else
+            /* The entry in RAP does not appear in Pattern, so LUMP it */
+            else if ( (col_indx_RAP < col_indx_Pattern) || has_row_ended)
             {
-                S_ext_diag_data[cnt_diag] = S_ext_data[j];
-                S_ext_diag_j[cnt_diag++] = (HYPRE_Int)(S_ext_j[j] - first_col_diag_RAP);
+               /* Lump entry (i, col_indx_RAP) in RAP */
+
+               /* Grab the indices for row col_indx_RAP of S_offd and diag.  This will
+                * be for computing lumping locations */
+               S_offd_indices_len = S_offd_i[col_indx_RAP + 1] - S_offd_i[col_indx_RAP];
+               if (S_offd_indices_allocated_len < S_offd_indices_len)
+               {
+                  hypre_TFree(S_offd_indices, HYPRE_MEMORY_HOST);
+                  S_offd_indices = hypre_CTAlloc(HYPRE_BigInt,  S_offd_indices_len, HYPRE_MEMORY_HOST);
+                  S_offd_indices_allocated_len = S_offd_indices_len;
+               }
+               /* Grab sub array from col_map, corresponding to the slice of S_offd_j */
+               hypre_GrabSubArray(S_offd_j, S_offd_i[col_indx_RAP], S_offd_i[col_indx_RAP + 1] - 1,
+                                  col_map_offd_S, S_offd_indices);
+               /* No need to grab info out of S_diag_j[...], here we just start from
+                * S_diag_i[col_indx_RAP] and end at index S_diag_i[col_indx_RAP+1] - 1 */
+
+               /* Intersect the diag and offd pieces, remembering that the
+                * diag array will need to have the offset +first_col_diag_RAP */
+               cnt = hypre_max(S_offd_indices_len, Pattern_offd_indices_len);
+               if (offd_intersection_allocated_len < cnt)
+               {
+                  hypre_TFree(offd_intersection, HYPRE_MEMORY_HOST);
+                  hypre_TFree(offd_intersection_data, HYPRE_MEMORY_HOST);
+                  offd_intersection = hypre_CTAlloc(HYPRE_BigInt,  cnt, HYPRE_MEMORY_HOST);
+                  offd_intersection_data = hypre_CTAlloc(HYPRE_Real,  cnt, HYPRE_MEMORY_HOST);
+                  offd_intersection_allocated_len = cnt;
+               }
+               /* This intersection also tracks S_offd_data and assumes that
+                * S_offd_indices is the first argument here */
+               hypre_IntersectTwoBigArrays(S_offd_indices,
+                                           &(S_offd_data[ S_offd_i[col_indx_RAP] ]),
+                                           S_offd_indices_len,
+                                           Pattern_offd_indices,
+                                           Pattern_offd_indices_len,
+                                           offd_intersection,
+                                           offd_intersection_data,
+                                           &offd_intersection_len);
+
+
+               /* Now, intersect the indices for the diag block.  Note that S_diag_j does
+                * not have a diagonal entry, so no lumping occurs to the diagonal. */
+               cnt = hypre_max(Pattern_diag_indices_len,
+                               S_diag_i[col_indx_RAP + 1] - S_diag_i[col_indx_RAP] );
+               if (diag_intersection_allocated_len < cnt)
+               {
+                  hypre_TFree(diag_intersection, HYPRE_MEMORY_HOST);
+                  hypre_TFree(diag_intersection_data, HYPRE_MEMORY_HOST);
+                  diag_intersection = hypre_CTAlloc(HYPRE_Int,  cnt, HYPRE_MEMORY_HOST);
+                  diag_intersection_data = hypre_CTAlloc(HYPRE_Real,  cnt, HYPRE_MEMORY_HOST);
+                  diag_intersection_allocated_len = cnt;
+               }
+               /* There is no diagonal entry in first position of S */
+               hypre_IntersectTwoArrays( &(S_diag_j[S_diag_i[col_indx_RAP]]),
+                                         &(S_diag_data[ S_diag_i[col_indx_RAP] ]),
+                                         S_diag_i[col_indx_RAP + 1] - S_diag_i[col_indx_RAP],
+                                         Pattern_indices_ptr,
+                                         Pattern_diag_indices_len,
+                                         diag_intersection,
+                                         diag_intersection_data,
+                                         &diag_intersection_len);
+
+               /* Loop over these intersections, and lump a constant fraction of
+                * RAP_diag_data[j] to each entry */
+               intersection_len = diag_intersection_len + offd_intersection_len;
+               if (intersection_len > 0)
+               {
+                  /* Sum the strength-of-connection values from row
+                   * col_indx_RAP in S, corresponding to the indices we are
+                   * collapsing to in row i This will give us our collapsing
+                   * weights. */
+                  sum_strong_neigh = 0.0;
+                  for (k = 0; k < diag_intersection_len; k++)
+                  {   sum_strong_neigh += hypre_abs(diag_intersection_data[k]); }
+                  for (k = 0; k < offd_intersection_len; k++)
+                  {   sum_strong_neigh += hypre_abs(offd_intersection_data[k]); }
+                  sum_strong_neigh = RAP_diag_data[j] / sum_strong_neigh;
+
+                  /* When lumping with the diag_intersection, must offset column index */
+                  for (k = 0; k < diag_intersection_len; k++)
+                  {
+                     lump_value = lump_percent * hypre_abs(diag_intersection_data[k]) * sum_strong_neigh;
+                     diagonal_lump_value = (1.0 - lump_percent) * hypre_abs(diag_intersection_data[k]) *
+                                           sum_strong_neigh;
+                     neg_lump_value = -1.0 * lump_value;
+                     cnt = diag_intersection[k] + first_col_diag_RAP;
+
+                     /*#ifdef HY   PRE_USING_OPENMP
+                     #pragma omp    critical (IJAdd)
+                     #endif
+                     {*/
+                     /* For efficiency, we do a buffered IJAddToValues.
+                      * A[global_row, cnt] += RAP_diag_data[j] */
+                     hypre_NonGalerkinIJBufferWrite( ijmatrix, &ijbuf_cnt, ijbuf_size, &ijbuf_rowcounter,
+                                                     &ijbuf_data, &ijbuf_cols, &ijbuf_rownums, &ijbuf_numcols, global_row,
+                                                     cnt, lump_value );
+                     if (lump_percent < 1.0)
+                     {
+                        /* Preserve row sum by updating diagonal */
+                        hypre_NonGalerkinIJBufferWrite( ijmatrix, &ijbuf_cnt, ijbuf_size, &ijbuf_rowcounter,
+                                                        &ijbuf_data, &ijbuf_cols, &ijbuf_rownums, &ijbuf_numcols, global_row,
+                                                        global_row, diagonal_lump_value );
+                     }
+
+                     /* Update mirror entries, if symmetric collapsing */
+                     if (sym_collapse)
+                     {
+                        /* Update mirror entry */
+                        hypre_NonGalerkinIJBufferWrite( ijmatrix,
+                                                        &ijbuf_sym_cnt, ijbuf_size, &ijbuf_sym_rowcounter,
+                                                        &ijbuf_sym_data, &ijbuf_sym_cols, &ijbuf_sym_rownums,
+                                                        &ijbuf_sym_numcols, cnt, global_row, lump_value );
+                        /* Update mirror entry diagonal */
+                        hypre_NonGalerkinIJBufferWrite( ijmatrix,
+                                                        &ijbuf_sym_cnt, ijbuf_size, &ijbuf_sym_rowcounter,
+                                                        &ijbuf_sym_data, &ijbuf_sym_cols, &ijbuf_sym_rownums,
+                                                        &ijbuf_sym_numcols, cnt, cnt, neg_lump_value );
+                     }
+                     /*}*/
+                  }
+
+                  /* The offd_intersection has global column indices, i.e., the
+                   * col_map arrays contain global indices */
+                  for (k = 0; k < offd_intersection_len; k++)
+                  {
+                     lump_value = lump_percent * hypre_abs(offd_intersection_data[k]) * sum_strong_neigh;
+                     diagonal_lump_value = (1.0 - lump_percent) * hypre_abs(offd_intersection_data[k]) *
+                                           sum_strong_neigh;
+                     neg_lump_value = -1.0 * lump_value;
+
+                     hypre_NonGalerkinIJBufferWrite( ijmatrix, &ijbuf_cnt, ijbuf_size, &ijbuf_rowcounter,
+                                                     &ijbuf_data, &ijbuf_cols, &ijbuf_rownums, &ijbuf_numcols, global_row,
+                                                     offd_intersection[k], lump_value );
+
+                     if (lump_percent < 1.0)
+                     {
+                        hypre_NonGalerkinIJBufferWrite( ijmatrix, &ijbuf_cnt, ijbuf_size, &ijbuf_rowcounter,
+                                                        &ijbuf_data, &ijbuf_cols, &ijbuf_rownums, &ijbuf_numcols, global_row,
+                                                        global_row, diagonal_lump_value );
+                     }
+
+                     /* Update mirror entries, if symmetric collapsing */
+                     if (sym_collapse)
+                     {
+                        hypre_NonGalerkinIJBufferWrite( ijmatrix,
+                                                        &ijbuf_sym_cnt, ijbuf_size, &ijbuf_sym_rowcounter,
+                                                        &ijbuf_sym_data, &ijbuf_sym_cols, &ijbuf_sym_rownums,
+                                                        &ijbuf_sym_numcols, offd_intersection[k],
+                                                        global_row, lump_value );
+                        hypre_NonGalerkinIJBufferWrite( ijmatrix,
+                                                        &ijbuf_sym_cnt, ijbuf_size, &ijbuf_sym_rowcounter,
+                                                        &ijbuf_sym_data, &ijbuf_sym_cols, &ijbuf_sym_rownums,
+                                                        &ijbuf_sym_numcols, offd_intersection[k],
+                                                        offd_intersection[k], neg_lump_value );
+                     }
+                  }
+               }
+               /* If intersection is empty, do not eliminate entry */
+               else
+               {
+                  /* Don't forget to update mirror entry if collapsing symmetrically */
+                  if (sym_collapse)
+                  {   lump_value = 0.5 * RAP_diag_data[j]; }
+                  else
+                  {   lump_value = RAP_diag_data[j]; }
+
+                  cnt = col_indx_RAP + first_col_diag_RAP;
+                  hypre_NonGalerkinIJBufferWrite( ijmatrix, &ijbuf_cnt, ijbuf_size, &ijbuf_rowcounter,
+                                                  &ijbuf_data, &ijbuf_cols, &ijbuf_rownums, &ijbuf_numcols, global_row,
+                                                  cnt, lump_value );
+                  if (sym_collapse)
+                  {
+                     hypre_NonGalerkinIJBufferWrite( ijmatrix,
+                                                     &ijbuf_sym_cnt, ijbuf_size, &ijbuf_sym_rowcounter,
+                                                     &ijbuf_sym_data, &ijbuf_sym_cols, &ijbuf_sym_rownums,
+                                                     &ijbuf_sym_numcols, cnt, global_row, lump_value );
+                  }
+               }
             }
-    }
-
-    /* This creates col_map_offd_Sext */
-    if (S_ext_offd_size || num_cols_offd_S)
-    {
-        temp = hypre_CTAlloc(HYPRE_BigInt,  S_ext_offd_size+num_cols_offd_S, HYPRE_MEMORY_HOST);
-        for (i=0; i < S_ext_offd_size; i++)
-            temp[i] = S_ext_j[i];
-        cnt = S_ext_offd_size;
-        for (i=0; i < num_cols_offd_S; i++)
-            temp[cnt++] = col_map_offd_S[i];
-    }
-    if (cnt)
-    {
-        /* after this, the first so many entries of temp will hold the
-         * unique column indices in S_ext_offd_j unioned with the indices
-         * in col_map_offd_S */
-        hypre_BigQsort0(temp, 0, cnt-1);
-
-        num_cols_offd_Sext = 1;
-        value = temp[0];
-        for (i=1; i < cnt; i++)
-        {
-            if (temp[i] > value)
+            /* The entry in RAP appears in Pattern, so keep it */
+            else if (col_indx_RAP == col_indx_Pattern)
             {
-                value = temp[i];
-                temp[num_cols_offd_Sext++] = value;
+               cnt = col_indx_RAP + first_col_diag_RAP;
+               hypre_NonGalerkinIJBufferWrite( ijmatrix, &ijbuf_cnt, ijbuf_size, &ijbuf_rowcounter,
+                                               &ijbuf_data, &ijbuf_cols, &ijbuf_rownums, &ijbuf_numcols, global_row,
+                                               cnt, RAP_diag_data[j] );
+
+               /* Only go to the next entry in Pattern, if this is not the end of a row */
+               if ( current_Pattern_j < Pattern_diag_i[i + 1] - 1 )
+               {
+                  current_Pattern_j += 1;
+                  col_indx_Pattern = Pattern_diag_j[current_Pattern_j];
+               }
+               else
+               {   has_row_ended = 1;}
             }
-        }
-    }
-    else
-    {
-        num_cols_offd_Sext = 0;
-    }
-
-    /* num_nonzeros_S_ext_diag = cnt_diag;
-     num_nonzeros_S_ext_offd = S_ext_offd_size; */
-
-    if (num_cols_offd_Sext)
-        col_map_offd_Sext = hypre_CTAlloc(HYPRE_BigInt,  num_cols_offd_Sext, HYPRE_MEMORY_HOST);
-
-    for (i=0; i < num_cols_offd_Sext; i++)
-        col_map_offd_Sext[i] = temp[i];
-
-    if (S_ext_offd_size || num_cols_offd_S)
-        hypre_TFree(temp, HYPRE_MEMORY_HOST);
-
-    /* look for S_ext_offd_j[i] in col_map_offd_Sext, and set S_ext_offd_j[i]
-     * to the index of that column value in col_map_offd_Sext */
-    for (i=0 ; i < S_ext_offd_size; i++)
-        S_ext_offd_j[i] = hypre_BigBinarySearch(col_map_offd_Sext,
-                                             S_ext_j[i],
-                                             num_cols_offd_Sext);
-
-
-    if (num_procs > 1)
-    {
-        hypre_CSRMatrixDestroy(S_ext);
-        S_ext = NULL;
-    }
-
-    /* Need to sort column indices in S and S_ext */
-    for(i = 0; i < num_variables; i++)
-    {
-
-        /* Re-Sort diag portion of Pattern, placing the diagonal entry in a
-         * sorted position */
-        row_start = Pattern_diag_i[i];
-        row_end = Pattern_diag_i[i+1];
-        hypre_qsort1(Pattern_diag_j, Pattern_diag_data, row_start, row_end-1 );
-
-        /* Sort diag portion of S, noting that no diagonal entry */
-        /* S has not "data" array...it's just NULL */
-        row_start = S_diag_i[i];
-        row_end = S_diag_i[i+1];
-        hypre_qsort1(S_diag_j, S_diag_data, row_start, row_end-1 );
-
-        /* Sort offd portion of S */
-        /* S has no "data" array...it's just NULL */
-        row_start = S_offd_i[i];
-        row_end = S_offd_i[i+1];
-        hypre_qsort1(S_offd_j, S_offd_data, row_start, row_end-1 );
-
-    }
-
-    /* Sort S_ext
-     * num_cols_RAP_offd  equals  num_rows for S_ext*/
-    for(i = 0; i < num_cols_RAP_offd; i++)
-    {
-        /* Sort diag portion of S_ext */
-        row_start = S_ext_diag_i[i];
-        row_end = S_ext_diag_i[i+1];
-        hypre_qsort1(S_ext_diag_j, S_ext_diag_data, row_start, row_end-1 );
-
-        /* Sort offd portion of S_ext */
-        row_start = S_ext_offd_i[i];
-        row_end = S_ext_offd_i[i+1];
-        hypre_qsort1(S_ext_offd_j, S_ext_offd_data, row_start, row_end-1 );
-
-    }
-
-    /*
-     * Now, for the fun stuff -- Computing the Non-Galerkin Operator
-     */
-
-    /* Initialize the ijmatrix, leveraging our knowledge of the nonzero
-     * structure in Pattern */
-    ierr += HYPRE_IJMatrixCreate(comm, first_col_diag_RAP, last_col_diag_RAP,
-                                 first_col_diag_RAP, last_col_diag_RAP, &ijmatrix);
-    ierr += HYPRE_IJMatrixSetObjectType(ijmatrix, HYPRE_PARCSR);
-    rownz = hypre_CTAlloc(HYPRE_Int,  num_variables, HYPRE_MEMORY_HOST);
-    for(i = 0; i < num_variables; i++)
-    {   rownz[i] = 1.2*(Pattern_diag_i[i+1] - Pattern_diag_i[i]) + 1.2*(Pattern_offd_i[i+1] - Pattern_offd_i[i]); }
-    HYPRE_IJMatrixSetRowSizes(ijmatrix, rownz);
-    ierr += HYPRE_IJMatrixInitialize(ijmatrix);
-    hypre_TFree(rownz, HYPRE_MEMORY_HOST);
-
-    /*
-     *For efficiency, we do a buffered IJAddToValues.
-     * Here, we initialize the buffer and then initialize the buffer counters
-     */
-    ijbuf_size       = 1000;
-    ijbuf_data       = hypre_CTAlloc(HYPRE_Real,   ijbuf_size, HYPRE_MEMORY_DEVICE);
-    ijbuf_cols       = hypre_CTAlloc(HYPRE_BigInt, ijbuf_size, HYPRE_MEMORY_DEVICE);
-    ijbuf_rownums    = hypre_CTAlloc(HYPRE_BigInt, ijbuf_size, HYPRE_MEMORY_DEVICE);
-    ijbuf_numcols    = hypre_CTAlloc(HYPRE_Int,    ijbuf_size, HYPRE_MEMORY_DEVICE);
-    hypre_NonGalerkinIJBigBufferInit( &ijbuf_cnt, &ijbuf_rowcounter, ijbuf_cols );
-    if(sym_collapse)
-    {
-        ijbuf_sym_data   = hypre_CTAlloc(HYPRE_Real,   ijbuf_size, HYPRE_MEMORY_DEVICE);
-        ijbuf_sym_cols   = hypre_CTAlloc(HYPRE_BigInt, ijbuf_size, HYPRE_MEMORY_DEVICE);
-        ijbuf_sym_rownums= hypre_CTAlloc(HYPRE_BigInt, ijbuf_size, HYPRE_MEMORY_DEVICE);
-        ijbuf_sym_numcols= hypre_CTAlloc(HYPRE_Int,    ijbuf_size, HYPRE_MEMORY_DEVICE);
-        hypre_NonGalerkinIJBigBufferInit( &ijbuf_sym_cnt, &ijbuf_sym_rowcounter, ijbuf_sym_cols );
-    }
-
-    /*
-     * Eliminate Entries In RAP_diag
-     * */
-    for(i = 0; i < num_variables; i++)
-    {
-        global_row = i+first_col_diag_RAP;
-        row_start = RAP_diag_i[i];
-        row_end = RAP_diag_i[i+1];
-        has_row_ended = 0;
-
-        /* Only do work if row has nonzeros */
-        if( row_start < row_end)
-        {
-            /* Grab pointer to current entry in Pattern_diag */
-            current_Pattern_j = Pattern_diag_i[i];
-            col_indx_Pattern = Pattern_diag_j[current_Pattern_j];
+            /* Increment col_indx_Pattern, and repeat this loop iter for current
+             * col_ind_RAP value */
+            else if (col_indx_RAP > col_indx_Pattern)
+            {
+               for (; current_Pattern_j < Pattern_diag_i[i + 1]; current_Pattern_j++)
+               {
+                  col_indx_Pattern = Pattern_diag_j[current_Pattern_j];
+                  if (col_indx_RAP <= col_indx_Pattern)
+                  {   break;}
+               }
 
-            /* Grab this row's indices out of Pattern offd and diag.  This will
-             * be for computing index set intersections for lumping */
-            /* Ensure adequate length */
-            Pattern_offd_indices_len = Pattern_offd_i[i+1] - Pattern_offd_i[i];
-            if(Pattern_offd_indices_allocated_len < Pattern_offd_indices_len)
+               /* If col_indx_RAP is still greater (i.e., we've reached a row end), then
+                * we need to lump everything else in this row */
+               if (col_indx_RAP > col_indx_Pattern)
+               {   has_row_ended = 1; }
+
+               /* Decrement j, in order to repeat this loop iteration for the current
+                * col_indx_RAP value */
+               j--;
+            }
+         }
+      }
+
+   }
+
+   /*
+    * Eliminate Entries In RAP_offd
+    * Structure of this for-loop is very similar to the RAP_diag for-loop
+    * But, not so similar that these loops should be combined into a single fuction.
+    * */
+   if (num_cols_RAP_offd)
+   {
+      for (i = 0; i < num_variables; i++)
+      {
+         global_row = i + first_col_diag_RAP;
+         row_start = RAP_offd_i[i];
+         row_end = RAP_offd_i[i + 1];
+         has_row_ended = 0;
+
+         /* Only do work if row has nonzeros */
+         if ( row_start < row_end)
+         {
+            current_Pattern_j = Pattern_offd_i[i];
+            Pattern_offd_indices_len = Pattern_offd_i[i + 1] - Pattern_offd_i[i];
+            if ( (Pattern_offd_j != NULL) && (Pattern_offd_indices_len > 0) )
+            {   col_indx_Pattern = col_map_offd_Pattern[ Pattern_offd_j[current_Pattern_j] ]; }
+            else
             {
-                hypre_TFree(Pattern_offd_indices, HYPRE_MEMORY_HOST);
-                Pattern_offd_indices = hypre_CTAlloc(HYPRE_BigInt,  Pattern_offd_indices_len, HYPRE_MEMORY_HOST);
-                Pattern_offd_indices_allocated_len = Pattern_offd_indices_len;
+               /* if Pattern_offd_j is not allocated or this is a zero length row,
+                then all entries need to be lumped.
+                This is an analagous situation to has_row_ended=1. */
+               col_indx_Pattern = -1;
+               has_row_ended = 1;
             }
-            /* Grab sub array from col_map, corresponding to the slice of Pattern_offd_j */
+
+            /* Grab this row's indices out of Pattern offd and diag.  This will
+             * be for computing index set intersections for lumping.  The above
+             * loop over RAP_diag ensures adequate length of Pattern_offd_indices */
+            /* Ensure adequate length */
             hypre_GrabSubArray(Pattern_offd_j,
-                               Pattern_offd_i[i], Pattern_offd_i[i+1]-1,
+                               Pattern_offd_i[i], Pattern_offd_i[i + 1] - 1,
                                col_map_offd_Pattern, Pattern_offd_indices);
             /* No need to grab info out of Pattern_diag_j[...], here we just start from
              * Pattern_diag_i[i] and end at index Pattern_diag_i[i+1] - 1.  We do need to
              * ignore the diagonal entry in Pattern, because we don't lump entries there */
-            if( Pattern_diag_j[Pattern_diag_i[i]] == i )
+            if ( Pattern_diag_j[Pattern_diag_i[i]] == i )
             {
-                Pattern_indices_ptr = &( Pattern_diag_j[Pattern_diag_i[i]+1]);
-                Pattern_diag_indices_len = Pattern_diag_i[i+1] - Pattern_diag_i[i] - 1;
+               Pattern_indices_ptr = &( Pattern_diag_j[Pattern_diag_i[i] + 1]);
+               Pattern_diag_indices_len = Pattern_diag_i[i + 1] - Pattern_diag_i[i] - 1;
             }
             else
             {
-                Pattern_indices_ptr = &( Pattern_diag_j[Pattern_diag_i[i]]);
-                Pattern_diag_indices_len = Pattern_diag_i[i+1] - Pattern_diag_i[i];
+               Pattern_indices_ptr = &( Pattern_diag_j[Pattern_diag_i[i]]);
+               Pattern_diag_indices_len = Pattern_diag_i[i + 1] - Pattern_diag_i[i];
             }
-        }
 
-        for(j = row_start; j < row_end; j++)
-        {
-            col_indx_RAP = RAP_diag_j[j];
+         }
+
+         for (j = row_start; j < row_end; j++)
+         {
 
             /* Ignore zero entries in RAP */
-            if( RAP_diag_data[j] != 0.0)
+            if ( RAP_offd_data[j] != 0.0)
             {
-               /* Don't change the diagonal, just write it */
-               if(col_indx_RAP == i)
-               {
-/*#ifdef HY   PRE_USING_OPENMP
-#pragma omp    critical (IJAdd)
-#endif
-{*/
-                 /* For efficiency, we do a buffered IJAddToValues.
-                  * A[global_row, global_row] += RAP_diag_data[j] */
-                 hypre_NonGalerkinIJBufferWrite( ijmatrix, &ijbuf_cnt, ijbuf_size, &ijbuf_rowcounter,
-                                   &ijbuf_data, &ijbuf_cols, &ijbuf_rownums, &ijbuf_numcols, global_row,
-                                   global_row, RAP_diag_data[j] );
-/*}*/
 
-               }
+               /* In general for all the offd_j arrays, we have to indirectly
+                * index with the col_map_offd array to get a global index */
+               col_indx_RAP = col_map_offd_RAP[ RAP_offd_j[j] ];
+
                /* The entry in RAP does not appear in Pattern, so LUMP it */
-               else if( (col_indx_RAP < col_indx_Pattern) || has_row_ended)
+               if ( (col_indx_RAP < col_indx_Pattern) || has_row_ended)
                {
-                   /* Lump entry (i, col_indx_RAP) in RAP */
-
-                   /* Grab the indices for row col_indx_RAP of S_offd and diag.  This will
-                    * be for computing lumping locations */
-                   S_offd_indices_len = S_offd_i[col_indx_RAP+1] - S_offd_i[col_indx_RAP];
-                   if(S_offd_indices_allocated_len < S_offd_indices_len)
-                   {
-                       hypre_TFree(S_offd_indices, HYPRE_MEMORY_HOST);
-                       S_offd_indices = hypre_CTAlloc(HYPRE_BigInt,  S_offd_indices_len, HYPRE_MEMORY_HOST);
-                       S_offd_indices_allocated_len = S_offd_indices_len;
-                   }
-                   /* Grab sub array from col_map, corresponding to the slice of S_offd_j */
-                   hypre_GrabSubArray(S_offd_j, S_offd_i[col_indx_RAP], S_offd_i[col_indx_RAP+1]-1,
-                                      col_map_offd_S, S_offd_indices);
-                   /* No need to grab info out of S_diag_j[...], here we just start from
-                    * S_diag_i[col_indx_RAP] and end at index S_diag_i[col_indx_RAP+1] - 1 */
-
-                   /* Intersect the diag and offd pieces, remembering that the
-                    * diag array will need to have the offset +first_col_diag_RAP */
-                   cnt = hypre_max(S_offd_indices_len, Pattern_offd_indices_len);
-                   if(offd_intersection_allocated_len < cnt)
-                   {
-                       hypre_TFree(offd_intersection, HYPRE_MEMORY_HOST);
-                       hypre_TFree(offd_intersection_data, HYPRE_MEMORY_HOST);
-                       offd_intersection = hypre_CTAlloc(HYPRE_BigInt,  cnt, HYPRE_MEMORY_HOST);
-                       offd_intersection_data = hypre_CTAlloc(HYPRE_Real,  cnt, HYPRE_MEMORY_HOST);
-                       offd_intersection_allocated_len = cnt;
-                   }
-                   /* This intersection also tracks S_offd_data and assumes that
-                    * S_offd_indices is the first argument here */
-                   hypre_IntersectTwoBigArrays(S_offd_indices,
-                                            &(S_offd_data[ S_offd_i[col_indx_RAP] ]),
-                                            S_offd_indices_len,
-                                            Pattern_offd_indices,
-                                            Pattern_offd_indices_len,
-                                            offd_intersection,
-                                            offd_intersection_data,
-                                            &offd_intersection_len);
-
-
-                   /* Now, intersect the indices for the diag block.  Note that S_diag_j does
-                    * not have a diagonal entry, so no lumping occurs to the diagonal. */
-                   cnt = hypre_max(Pattern_diag_indices_len,
-                                   S_diag_i[col_indx_RAP+1] - S_diag_i[col_indx_RAP] );
-                   if(diag_intersection_allocated_len < cnt)
-                   {
-                       hypre_TFree(diag_intersection, HYPRE_MEMORY_HOST);
-                       hypre_TFree(diag_intersection_data, HYPRE_MEMORY_HOST);
-                       diag_intersection = hypre_CTAlloc(HYPRE_Int,  cnt, HYPRE_MEMORY_HOST);
-                       diag_intersection_data = hypre_CTAlloc(HYPRE_Real,  cnt, HYPRE_MEMORY_HOST);
-                       diag_intersection_allocated_len = cnt;
-                   }
-                   /* There is no diagonal entry in first position of S */
-                   hypre_IntersectTwoArrays( &(S_diag_j[S_diag_i[col_indx_RAP]]),
-                                            &(S_diag_data[ S_diag_i[col_indx_RAP] ]),
-                                            S_diag_i[col_indx_RAP+1] - S_diag_i[col_indx_RAP],
+                  /* The row_indx_Sext would be found with:
+                   row_indx_Sext     = hypre_BinarySearch(col_map_offd_RAP, col_indx_RAP, num_cols_RAP_offd);
+                   But, we already know the answer to this with, */
+                  row_indx_Sext        = RAP_offd_j[j];
+
+                  /* Grab the indices for row row_indx_Sext from the offd and diag parts.  This will
+                   * be for computing lumping locations */
+                  S_offd_indices_len = S_ext_offd_i[row_indx_Sext + 1] - S_ext_offd_i[row_indx_Sext];
+                  if (S_offd_indices_allocated_len < S_offd_indices_len)
+                  {
+                     hypre_TFree(S_offd_indices, HYPRE_MEMORY_HOST);
+                     S_offd_indices = hypre_CTAlloc(HYPRE_BigInt,  S_offd_indices_len, HYPRE_MEMORY_HOST);
+                     S_offd_indices_allocated_len = S_offd_indices_len;
+                  }
+                  /* Grab sub array from col_map, corresponding to the slice of S_ext_offd_j */
+                  hypre_GrabSubArray(S_ext_offd_j, S_ext_offd_i[row_indx_Sext], S_ext_offd_i[row_indx_Sext + 1] - 1,
+                                     col_map_offd_Sext, S_offd_indices);
+                  /* No need to grab info out of S_ext_diag_j[...], here we just start from
+                   * S_ext_diag_i[row_indx_Sext] and end at index S_ext_diag_i[row_indx_Sext+1] - 1 */
+
+                  /* Intersect the diag and offd pieces, remembering that the
+                   * diag array will need to have the offset +first_col_diag_RAP */
+                  cnt = hypre_max(S_offd_indices_len, Pattern_offd_indices_len);
+                  if (offd_intersection_allocated_len < cnt)
+                  {
+                     hypre_TFree(offd_intersection, HYPRE_MEMORY_HOST);
+                     hypre_TFree(offd_intersection_data, HYPRE_MEMORY_HOST);
+                     offd_intersection = hypre_CTAlloc(HYPRE_BigInt,  cnt, HYPRE_MEMORY_HOST);
+                     offd_intersection_data = hypre_CTAlloc(HYPRE_Real,  cnt, HYPRE_MEMORY_HOST);
+                     offd_intersection_allocated_len = cnt;
+                  }
+                  hypre_IntersectTwoBigArrays(S_offd_indices,
+                                              &(S_ext_offd_data[ S_ext_offd_i[row_indx_Sext] ]),
+                                              S_offd_indices_len,
+                                              Pattern_offd_indices,
+                                              Pattern_offd_indices_len,
+                                              offd_intersection,
+                                              offd_intersection_data,
+                                              &offd_intersection_len);
+
+                  /* Now, intersect the indices for the diag block. */
+                  cnt = hypre_max(Pattern_diag_indices_len,
+                                  S_ext_diag_i[row_indx_Sext + 1] - S_ext_diag_i[row_indx_Sext] );
+                  if (diag_intersection_allocated_len < cnt)
+                  {
+                     hypre_TFree(diag_intersection, HYPRE_MEMORY_HOST);
+                     hypre_TFree(diag_intersection_data, HYPRE_MEMORY_HOST);
+                     diag_intersection = hypre_CTAlloc(HYPRE_Int,  cnt, HYPRE_MEMORY_HOST);
+                     diag_intersection_data = hypre_CTAlloc(HYPRE_Real,  cnt, HYPRE_MEMORY_HOST);
+                     diag_intersection_allocated_len = cnt;
+                  }
+                  hypre_IntersectTwoArrays( &(S_ext_diag_j[S_ext_diag_i[row_indx_Sext]]),
+                                            &(S_ext_diag_data[ S_ext_diag_i[row_indx_Sext] ]),
+                                            S_ext_diag_i[row_indx_Sext + 1] - S_ext_diag_i[row_indx_Sext],
                                             Pattern_indices_ptr,
                                             Pattern_diag_indices_len,
                                             diag_intersection,
                                             diag_intersection_data,
                                             &diag_intersection_len);
 
-                   /* Loop over these intersections, and lump a constant fraction of
-                    * RAP_diag_data[j] to each entry */
-                   intersection_len = diag_intersection_len + offd_intersection_len;
-                   if(intersection_len > 0)
-                   {
-                       /* Sum the strength-of-connection values from row
-                        * col_indx_RAP in S, corresponding to the indices we are
-                        * collapsing to in row i This will give us our collapsing
-                        * weights. */
-                       sum_strong_neigh = 0.0;
-                       for(k = 0; k < diag_intersection_len; k++)
-                       {   sum_strong_neigh += fabs(diag_intersection_data[k]); }
-                       for(k = 0; k < offd_intersection_len; k++)
-                       {   sum_strong_neigh += fabs(offd_intersection_data[k]); }
-                       sum_strong_neigh = RAP_diag_data[j]/sum_strong_neigh;
-
-                       /* When lumping with the diag_intersection, must offset column index */
-                       for(k = 0; k < diag_intersection_len; k++)
-                       {
-                           lump_value = lump_percent * fabs(diag_intersection_data[k])*sum_strong_neigh;
-                           diagonal_lump_value = (1.0 - lump_percent) * fabs(diag_intersection_data[k])*sum_strong_neigh;
-                           neg_lump_value = -1.0 * lump_value;
-                           cnt = diag_intersection[k]+first_col_diag_RAP;
-
-/*#ifdef HY   PRE_USING_OPENMP
-#pragma omp    critical (IJAdd)
-#endif
-{*/
-                           /* For efficiency, we do a buffered IJAddToValues.
-                            * A[global_row, cnt] += RAP_diag_data[j] */
+                  /* Loop over these intersections, and lump a constant fraction of
+                   * RAP_offd_data[j] to each entry */
+                  intersection_len = diag_intersection_len + offd_intersection_len;
+                  if (intersection_len > 0)
+                  {
+                     /* Sum the strength-of-connection values from row
+                      * row_indx_Sext in S, corresponding to the indices we are
+                      * collapsing to in row i. This will give us our collapsing
+                      * weights. */
+                     sum_strong_neigh = 0.0;
+                     for (k = 0; k < diag_intersection_len; k++)
+                     {   sum_strong_neigh += hypre_abs(diag_intersection_data[k]); }
+                     for (k = 0; k < offd_intersection_len; k++)
+                     {   sum_strong_neigh += hypre_abs(offd_intersection_data[k]); }
+                     sum_strong_neigh = RAP_offd_data[j] / sum_strong_neigh;
+
+                     /* When lumping with the diag_intersection, must offset column index */
+                     for (k = 0; k < diag_intersection_len; k++)
+                     {
+                        lump_value = lump_percent * hypre_abs(diag_intersection_data[k]) * sum_strong_neigh;
+                        diagonal_lump_value = (1.0 - lump_percent) * hypre_abs(diag_intersection_data[k]) *
+                                              sum_strong_neigh;
+                        neg_lump_value = -1.0 * lump_value;
+                        cnt = diag_intersection[k] + first_col_diag_RAP;
+
+                        hypre_NonGalerkinIJBufferWrite( ijmatrix, &ijbuf_cnt, ijbuf_size, &ijbuf_rowcounter,
+                                                        &ijbuf_data, &ijbuf_cols, &ijbuf_rownums, &ijbuf_numcols, global_row, cnt, lump_value );
+                        if (lump_percent < 1.0)
+                        {
                            hypre_NonGalerkinIJBufferWrite( ijmatrix, &ijbuf_cnt, ijbuf_size, &ijbuf_rowcounter,
-                                             &ijbuf_data, &ijbuf_cols, &ijbuf_rownums, &ijbuf_numcols, global_row,
-                                             cnt, lump_value );
-                           if (lump_percent < 1.0)
-                           {
-                               /* Preserve row sum by updating diagonal */
-                               hypre_NonGalerkinIJBufferWrite( ijmatrix, &ijbuf_cnt, ijbuf_size, &ijbuf_rowcounter,
-                                             &ijbuf_data, &ijbuf_cols, &ijbuf_rownums, &ijbuf_numcols, global_row,
-                                             global_row, diagonal_lump_value );
-                           }
-
-                           /* Update mirror entries, if symmetric collapsing */
-                           if(sym_collapse)
-                           {
-                              /* Update mirror entry */
-                              hypre_NonGalerkinIJBufferWrite( ijmatrix,
-                                 &ijbuf_sym_cnt, ijbuf_size, &ijbuf_sym_rowcounter,
-                                 &ijbuf_sym_data, &ijbuf_sym_cols, &ijbuf_sym_rownums,
-                                 &ijbuf_sym_numcols, cnt, global_row, lump_value );
-                              /* Update mirror entry diagonal */
-                              hypre_NonGalerkinIJBufferWrite( ijmatrix,
-                                 &ijbuf_sym_cnt, ijbuf_size, &ijbuf_sym_rowcounter,
-                                 &ijbuf_sym_data, &ijbuf_sym_cols, &ijbuf_sym_rownums,
-                                 &ijbuf_sym_numcols, cnt, cnt, neg_lump_value );
-                           }
-/*}*/
-                       }
-
-                       /* The offd_intersection has global column indices, i.e., the
-                        * col_map arrays contain global indices */
-                       for(k = 0; k < offd_intersection_len; k++)
-                       {
-                           lump_value = lump_percent * fabs(offd_intersection_data[k])*sum_strong_neigh;
-                           diagonal_lump_value = (1.0 - lump_percent) * fabs(offd_intersection_data[k])*sum_strong_neigh;
-                           neg_lump_value = -1.0 * lump_value;
+                                                           &ijbuf_data, &ijbuf_cols, &ijbuf_rownums, &ijbuf_numcols, global_row, global_row,
+                                                           diagonal_lump_value );
+                        }
 
+                        /* Update mirror entries, if symmetric collapsing */
+                        if (sym_collapse)
+                        {
+                           hypre_NonGalerkinIJBufferWrite( ijmatrix,
+                                                           &ijbuf_sym_cnt, ijbuf_size,
+                                                           &ijbuf_sym_rowcounter, &ijbuf_sym_data,
+                                                           &ijbuf_sym_cols, &ijbuf_sym_rownums,
+                                                           &ijbuf_sym_numcols, cnt, global_row, lump_value);
+                           hypre_NonGalerkinIJBufferWrite( ijmatrix,
+                                                           &ijbuf_sym_cnt, ijbuf_size,
+                                                           &ijbuf_sym_rowcounter, &ijbuf_sym_data,
+                                                           &ijbuf_sym_cols, &ijbuf_sym_rownums,
+                                                           &ijbuf_sym_numcols, cnt, cnt, neg_lump_value );
+                        }
+                     }
+
+                     /* The offd_intersection has global column indices, i.e., the
+                      * col_map arrays contain global indices */
+                     for (k = 0; k < offd_intersection_len; k++)
+                     {
+                        lump_value = lump_percent * hypre_abs(offd_intersection_data[k]) * sum_strong_neigh;
+                        diagonal_lump_value = (1.0 - lump_percent) * hypre_abs(offd_intersection_data[k]) *
+                                              sum_strong_neigh;
+                        neg_lump_value = -1.0 * lump_value;
+
+                        hypre_NonGalerkinIJBufferWrite( ijmatrix, &ijbuf_cnt, ijbuf_size, &ijbuf_rowcounter,
+                                                        &ijbuf_data, &ijbuf_cols, &ijbuf_rownums, &ijbuf_numcols, global_row,
+                                                        offd_intersection[k], lump_value );
+                        if (lump_percent < 1.0)
+                        {
                            hypre_NonGalerkinIJBufferWrite( ijmatrix, &ijbuf_cnt, ijbuf_size, &ijbuf_rowcounter,
-                                   &ijbuf_data, &ijbuf_cols, &ijbuf_rownums, &ijbuf_numcols, global_row,
-                                   offd_intersection[k], lump_value );
-
-                           if (lump_percent < 1.0)
-                           {
-                              hypre_NonGalerkinIJBufferWrite( ijmatrix, &ijbuf_cnt, ijbuf_size, &ijbuf_rowcounter,
-                                      &ijbuf_data, &ijbuf_cols, &ijbuf_rownums, &ijbuf_numcols, global_row,
-                                      global_row, diagonal_lump_value );
-                           }
-
-                           /* Update mirror entries, if symmetric collapsing */
-                           if (sym_collapse)
-                           {
-                               hypre_NonGalerkinIJBufferWrite( ijmatrix,
-                                  &ijbuf_sym_cnt, ijbuf_size, &ijbuf_sym_rowcounter,
-                                  &ijbuf_sym_data, &ijbuf_sym_cols, &ijbuf_sym_rownums,
-                                  &ijbuf_sym_numcols, offd_intersection[k],
-                                  global_row, lump_value );
-                               hypre_NonGalerkinIJBufferWrite( ijmatrix,
-                                  &ijbuf_sym_cnt, ijbuf_size, &ijbuf_sym_rowcounter,
-                                  &ijbuf_sym_data, &ijbuf_sym_cols, &ijbuf_sym_rownums,
-                                  &ijbuf_sym_numcols, offd_intersection[k],
-                                  offd_intersection[k], neg_lump_value );
-                           }
-                       }
-                   }
-                   /* If intersection is empty, do not eliminate entry */
-                   else
-                   {
-                       /* Don't forget to update mirror entry if collapsing symmetrically */
-                       if (sym_collapse)
-                       {   lump_value = 0.5*RAP_diag_data[j]; }
-                       else
-                       {   lump_value = RAP_diag_data[j]; }
-
-                       cnt = col_indx_RAP+first_col_diag_RAP;
-                       hypre_NonGalerkinIJBufferWrite( ijmatrix, &ijbuf_cnt, ijbuf_size, &ijbuf_rowcounter,
-                              &ijbuf_data, &ijbuf_cols, &ijbuf_rownums, &ijbuf_numcols, global_row,
-                              cnt, lump_value );
-                       if (sym_collapse)
-                       {
+                                                           &ijbuf_data, &ijbuf_cols, &ijbuf_rownums, &ijbuf_numcols, global_row, global_row,
+                                                           diagonal_lump_value );
+                        }
+
+
+                        /* Update mirror entries, if symmetric collapsing */
+                        if (sym_collapse)
+                        {
                            hypre_NonGalerkinIJBufferWrite( ijmatrix,
-                              &ijbuf_sym_cnt, ijbuf_size, &ijbuf_sym_rowcounter,
-                              &ijbuf_sym_data, &ijbuf_sym_cols, &ijbuf_sym_rownums,
-                              &ijbuf_sym_numcols, cnt, global_row, lump_value );
-                       }
-                   }
+                                                           &ijbuf_sym_cnt, ijbuf_size,
+                                                           &ijbuf_sym_rowcounter, &ijbuf_sym_data,
+                                                           &ijbuf_sym_cols, &ijbuf_sym_rownums,
+                                                           &ijbuf_sym_numcols, offd_intersection[k],
+                                                           global_row, lump_value );
+                           hypre_NonGalerkinIJBufferWrite( ijmatrix,
+                                                           &ijbuf_sym_cnt, ijbuf_size,
+                                                           &ijbuf_sym_rowcounter, &ijbuf_sym_data,
+                                                           &ijbuf_sym_cols, &ijbuf_sym_rownums,
+                                                           &ijbuf_sym_numcols, offd_intersection[k],
+                                                           offd_intersection[k], neg_lump_value );
+                        }
+                     }
+                  }
+                  /* If intersection is empty, do not eliminate entry */
+                  else
+                  {
+                     /* Don't forget to update mirror entry if collapsing symmetrically */
+                     if (sym_collapse)
+                     {   lump_value = 0.5 * RAP_offd_data[j]; }
+                     else
+                     {   lump_value = RAP_offd_data[j]; }
+
+                     hypre_NonGalerkinIJBufferWrite( ijmatrix, &ijbuf_cnt, ijbuf_size, &ijbuf_rowcounter,
+                                                     &ijbuf_data, &ijbuf_cols, &ijbuf_rownums, &ijbuf_numcols, global_row, col_indx_RAP,
+                                                     lump_value );
+                     if (sym_collapse)
+                     {
+                        hypre_NonGalerkinIJBufferWrite( ijmatrix,
+                                                        &ijbuf_sym_cnt, ijbuf_size, &ijbuf_sym_rowcounter,
+                                                        &ijbuf_sym_data, &ijbuf_sym_cols, &ijbuf_sym_rownums,
+                                                        &ijbuf_sym_numcols, col_indx_RAP, global_row,
+                                                        lump_value );
+                     }
+                  }
                }
                /* The entry in RAP appears in Pattern, so keep it */
-               else if(col_indx_RAP == col_indx_Pattern)
+               else if (col_indx_RAP == col_indx_Pattern)
                {
-                   cnt = col_indx_RAP+first_col_diag_RAP;
-                   hypre_NonGalerkinIJBufferWrite( ijmatrix, &ijbuf_cnt, ijbuf_size, &ijbuf_rowcounter,
-                      &ijbuf_data, &ijbuf_cols, &ijbuf_rownums, &ijbuf_numcols, global_row,
-                      cnt, RAP_diag_data[j] );
-
-                   /* Only go to the next entry in Pattern, if this is not the end of a row */
-                   if( current_Pattern_j < Pattern_diag_i[i+1]-1 )
-                   {
-                       current_Pattern_j += 1;
-                       col_indx_Pattern = Pattern_diag_j[current_Pattern_j];
-                   }
-                   else
-                   {   has_row_ended = 1;}
+                  /* For the offd structure, col_indx_RAP is a global dof number */
+                  hypre_NonGalerkinIJBufferWrite( ijmatrix, &ijbuf_cnt, ijbuf_size, &ijbuf_rowcounter,
+                                                  &ijbuf_data, &ijbuf_cols, &ijbuf_rownums, &ijbuf_numcols, global_row, col_indx_RAP,
+                                                  RAP_offd_data[j]);
+
+                  /* Only go to the next entry in Pattern, if this is not the end of a row */
+                  if ( current_Pattern_j < Pattern_offd_i[i + 1] - 1 )
+                  {
+                     current_Pattern_j += 1;
+                     col_indx_Pattern = col_map_offd_Pattern[ Pattern_offd_j[current_Pattern_j] ];
+                  }
+                  else
+                  {   has_row_ended = 1;}
                }
                /* Increment col_indx_Pattern, and repeat this loop iter for current
                 * col_ind_RAP value */
-               else if(col_indx_RAP > col_indx_Pattern)
+               else if (col_indx_RAP > col_indx_Pattern)
                {
-                   for(; current_Pattern_j < Pattern_diag_i[i+1]; current_Pattern_j++)
-                   {
-                       col_indx_Pattern = Pattern_diag_j[current_Pattern_j];
-                       if(col_indx_RAP <= col_indx_Pattern)
-                       {   break;}
-                   }
-
-                   /* If col_indx_RAP is still greater (i.e., we've reached a row end), then
-                    * we need to lump everything else in this row */
-                   if(col_indx_RAP > col_indx_Pattern)
-                   {   has_row_ended = 1; }
-
-                   /* Decrement j, in order to repeat this loop iteration for the current
-                    * col_indx_RAP value */
-                   j--;
+                  for (; current_Pattern_j < Pattern_offd_i[i + 1]; current_Pattern_j++)
+                  {
+                     col_indx_Pattern = col_map_offd_Pattern[ Pattern_offd_j[current_Pattern_j] ];
+                     if (col_indx_RAP <= col_indx_Pattern)
+                     {   break;}
+                  }
+
+                  /* If col_indx_RAP is still greater (i.e., we've reached a row end), then
+                   * we need to lump everything else in this row */
+                  if (col_indx_RAP > col_indx_Pattern)
+                  {   has_row_ended = 1; }
+
+                  /* Decrement j, in order to repeat this loop iteration for the current
+                   * col_indx_RAP value */
+                  j--;
                }
             }
-        }
-
-    }
-
-    /*
-     * Eliminate Entries In RAP_offd
-     * Structure of this for-loop is very similar to the RAP_diag for-loop
-     * But, not so similar that these loops should be combined into a single fuction.
-     * */
-    if(num_cols_RAP_offd)
-    {
-        for(i = 0; i < num_variables; i++)
-        {
-            global_row = i+first_col_diag_RAP;
-            row_start = RAP_offd_i[i];
-            row_end = RAP_offd_i[i+1];
-            has_row_ended = 0;
-
-            /* Only do work if row has nonzeros */
-            if( row_start < row_end)
-            {
-                current_Pattern_j = Pattern_offd_i[i];
-                Pattern_offd_indices_len = Pattern_offd_i[i+1] - Pattern_offd_i[i];
-                if( (Pattern_offd_j != NULL) && (Pattern_offd_indices_len > 0) )
-                {   col_indx_Pattern = col_map_offd_Pattern[ Pattern_offd_j[current_Pattern_j] ]; }
-                else
-                {   /* if Pattern_offd_j is not allocated or this is a zero length row,
-                     then all entries need to be lumped.
-                     This is an analagous situation to has_row_ended=1. */
-                    col_indx_Pattern = -1;
-                    has_row_ended = 1;
-                }
-
-                /* Grab this row's indices out of Pattern offd and diag.  This will
-                 * be for computing index set intersections for lumping.  The above
-                 * loop over RAP_diag ensures adequate length of Pattern_offd_indices */
-                /* Ensure adequate length */
-                hypre_GrabSubArray(Pattern_offd_j,
-                                   Pattern_offd_i[i], Pattern_offd_i[i+1]-1,
-                                   col_map_offd_Pattern, Pattern_offd_indices);
-                /* No need to grab info out of Pattern_diag_j[...], here we just start from
-                 * Pattern_diag_i[i] and end at index Pattern_diag_i[i+1] - 1.  We do need to
-                 * ignore the diagonal entry in Pattern, because we don't lump entries there */
-                if( Pattern_diag_j[Pattern_diag_i[i]] == i )
-                {
-                    Pattern_indices_ptr = &( Pattern_diag_j[Pattern_diag_i[i]+1]);
-                    Pattern_diag_indices_len = Pattern_diag_i[i+1] - Pattern_diag_i[i] - 1;
-                }
-                else
-                {
-                    Pattern_indices_ptr = &( Pattern_diag_j[Pattern_diag_i[i]]);
-                    Pattern_diag_indices_len = Pattern_diag_i[i+1] - Pattern_diag_i[i];
-                }
-
-            }
-
-            for(j = row_start; j < row_end; j++)
-            {
-
-                /* Ignore zero entries in RAP */
-                if( RAP_offd_data[j] != 0.0)
-                {
-
-                   /* In general for all the offd_j arrays, we have to indirectly
-                    * index with the col_map_offd array to get a global index */
-                   col_indx_RAP = col_map_offd_RAP[ RAP_offd_j[j] ];
-
-                   /* The entry in RAP does not appear in Pattern, so LUMP it */
-                   if( (col_indx_RAP < col_indx_Pattern) || has_row_ended)
-                   {
-                       /* The row_indx_Sext would be found with:
-                        row_indx_Sext     = hypre_BinarySearch(col_map_offd_RAP, col_indx_RAP, num_cols_RAP_offd);
-                        But, we already know the answer to this with, */
-                       row_indx_Sext        = RAP_offd_j[j];
-
-                       /* Grab the indices for row row_indx_Sext from the offd and diag parts.  This will
-                        * be for computing lumping locations */
-                       S_offd_indices_len = S_ext_offd_i[row_indx_Sext+1] - S_ext_offd_i[row_indx_Sext];
-                       if(S_offd_indices_allocated_len < S_offd_indices_len)
-                       {
-                           hypre_TFree(S_offd_indices, HYPRE_MEMORY_HOST);
-                           S_offd_indices = hypre_CTAlloc(HYPRE_BigInt,  S_offd_indices_len, HYPRE_MEMORY_HOST);
-                           S_offd_indices_allocated_len = S_offd_indices_len;
-                       }
-                       /* Grab sub array from col_map, corresponding to the slice of S_ext_offd_j */
-                       hypre_GrabSubArray(S_ext_offd_j, S_ext_offd_i[row_indx_Sext], S_ext_offd_i[row_indx_Sext+1]-1,
-                                          col_map_offd_Sext, S_offd_indices);
-                       /* No need to grab info out of S_ext_diag_j[...], here we just start from
-                        * S_ext_diag_i[row_indx_Sext] and end at index S_ext_diag_i[row_indx_Sext+1] - 1 */
-
-                       /* Intersect the diag and offd pieces, remembering that the
-                        * diag array will need to have the offset +first_col_diag_RAP */
-                       cnt = hypre_max(S_offd_indices_len, Pattern_offd_indices_len);
-                       if(offd_intersection_allocated_len < cnt)
-                       {
-                           hypre_TFree(offd_intersection, HYPRE_MEMORY_HOST);
-                           hypre_TFree(offd_intersection_data, HYPRE_MEMORY_HOST);
-                           offd_intersection = hypre_CTAlloc(HYPRE_BigInt,  cnt, HYPRE_MEMORY_HOST);
-                           offd_intersection_data = hypre_CTAlloc(HYPRE_Real,  cnt, HYPRE_MEMORY_HOST);
-                           offd_intersection_allocated_len = cnt;
-                       }
-                       hypre_IntersectTwoBigArrays(S_offd_indices,
-                                                &(S_ext_offd_data[ S_ext_offd_i[row_indx_Sext] ]),
-                                                S_offd_indices_len,
-                                                Pattern_offd_indices,
-                                                Pattern_offd_indices_len,
-                                                offd_intersection,
-                                                offd_intersection_data,
-                                                &offd_intersection_len);
-
-                       /* Now, intersect the indices for the diag block. */
-                       cnt = hypre_max(Pattern_diag_indices_len,
-                                       S_ext_diag_i[row_indx_Sext+1] - S_ext_diag_i[row_indx_Sext] );
-                       if(diag_intersection_allocated_len < cnt)
-                       {
-                           hypre_TFree(diag_intersection, HYPRE_MEMORY_HOST);
-                           hypre_TFree(diag_intersection_data, HYPRE_MEMORY_HOST);
-                           diag_intersection = hypre_CTAlloc(HYPRE_Int,  cnt, HYPRE_MEMORY_HOST);
-                           diag_intersection_data = hypre_CTAlloc(HYPRE_Real,  cnt, HYPRE_MEMORY_HOST);
-                           diag_intersection_allocated_len = cnt;
-                       }
-                       hypre_IntersectTwoArrays( &(S_ext_diag_j[S_ext_diag_i[row_indx_Sext]]),
-                                                &(S_ext_diag_data[ S_ext_diag_i[row_indx_Sext] ]),
-                                                S_ext_diag_i[row_indx_Sext+1] - S_ext_diag_i[row_indx_Sext],
-                                                Pattern_indices_ptr,
-                                                Pattern_diag_indices_len,
-                                                diag_intersection,
-                                                diag_intersection_data,
-                                                &diag_intersection_len);
-
-                       /* Loop over these intersections, and lump a constant fraction of
-                        * RAP_offd_data[j] to each entry */
-                       intersection_len = diag_intersection_len + offd_intersection_len;
-                       if(intersection_len > 0)
-                       {
-                           /* Sum the strength-of-connection values from row
-                            * row_indx_Sext in S, corresponding to the indices we are
-                            * collapsing to in row i. This will give us our collapsing
-                            * weights. */
-                           sum_strong_neigh = 0.0;
-                           for(k = 0; k < diag_intersection_len; k++)
-                           {   sum_strong_neigh += fabs(diag_intersection_data[k]); }
-                           for(k = 0; k < offd_intersection_len; k++)
-                           {   sum_strong_neigh += fabs(offd_intersection_data[k]); }
-                           sum_strong_neigh = RAP_offd_data[j]/sum_strong_neigh;
-
-                           /* When lumping with the diag_intersection, must offset column index */
-                           for(k = 0; k < diag_intersection_len; k++)
-                           {
-                               lump_value = lump_percent * fabs(diag_intersection_data[k])*sum_strong_neigh;
-                               diagonal_lump_value = (1.0 - lump_percent) * fabs(diag_intersection_data[k])*sum_strong_neigh;
-                               neg_lump_value = -1.0 * lump_value;
-                               cnt = diag_intersection[k]+first_col_diag_RAP;
-
-                               hypre_NonGalerkinIJBufferWrite( ijmatrix, &ijbuf_cnt, ijbuf_size, &ijbuf_rowcounter,
-                                  &ijbuf_data, &ijbuf_cols, &ijbuf_rownums, &ijbuf_numcols, global_row, cnt, lump_value );
-                               if (lump_percent < 1.0)
-                               {
-                                   hypre_NonGalerkinIJBufferWrite( ijmatrix, &ijbuf_cnt, ijbuf_size, &ijbuf_rowcounter,
-                                      &ijbuf_data, &ijbuf_cols, &ijbuf_rownums, &ijbuf_numcols, global_row, global_row,
-                                      diagonal_lump_value );
-                               }
-
-                               /* Update mirror entries, if symmetric collapsing */
-                               if (sym_collapse)
-                               {
-                                   hypre_NonGalerkinIJBufferWrite( ijmatrix,
-                                      &ijbuf_sym_cnt, ijbuf_size,
-                                      &ijbuf_sym_rowcounter, &ijbuf_sym_data,
-                                      &ijbuf_sym_cols, &ijbuf_sym_rownums,
-                                      &ijbuf_sym_numcols, cnt, global_row, lump_value);
-                                   hypre_NonGalerkinIJBufferWrite( ijmatrix,
-                                      &ijbuf_sym_cnt, ijbuf_size,
-                                      &ijbuf_sym_rowcounter, &ijbuf_sym_data,
-                                      &ijbuf_sym_cols, &ijbuf_sym_rownums,
-                                      &ijbuf_sym_numcols, cnt, cnt, neg_lump_value );
-                              }
-                           }
-
-                           /* The offd_intersection has global column indices, i.e., the
-                            * col_map arrays contain global indices */
-                           for(k = 0; k < offd_intersection_len; k++)
-                           {
-                               lump_value = lump_percent * fabs(offd_intersection_data[k])*sum_strong_neigh;
-                               diagonal_lump_value = (1.0 - lump_percent) * fabs(offd_intersection_data[k])*sum_strong_neigh;
-                               neg_lump_value = -1.0 * lump_value;
-
-                               hypre_NonGalerkinIJBufferWrite( ijmatrix, &ijbuf_cnt, ijbuf_size, &ijbuf_rowcounter,
-                                  &ijbuf_data, &ijbuf_cols, &ijbuf_rownums, &ijbuf_numcols, global_row,
-                                  offd_intersection[k], lump_value );
-                               if (lump_percent < 1.0)
-                               {
-                                   hypre_NonGalerkinIJBufferWrite( ijmatrix, &ijbuf_cnt, ijbuf_size, &ijbuf_rowcounter,
-                                      &ijbuf_data, &ijbuf_cols, &ijbuf_rownums, &ijbuf_numcols, global_row, global_row,
-                                      diagonal_lump_value );
-                               }
-
-
-                               /* Update mirror entries, if symmetric collapsing */
-                               if (sym_collapse)
-                               {
-                                   hypre_NonGalerkinIJBufferWrite( ijmatrix,
-                                      &ijbuf_sym_cnt, ijbuf_size,
-                                      &ijbuf_sym_rowcounter, &ijbuf_sym_data,
-                                      &ijbuf_sym_cols, &ijbuf_sym_rownums,
-                                      &ijbuf_sym_numcols, offd_intersection[k],
-                                      global_row, lump_value );
-                                   hypre_NonGalerkinIJBufferWrite( ijmatrix,
-                                      &ijbuf_sym_cnt, ijbuf_size,
-                                      &ijbuf_sym_rowcounter, &ijbuf_sym_data,
-                                      &ijbuf_sym_cols, &ijbuf_sym_rownums,
-                                      &ijbuf_sym_numcols, offd_intersection[k],
-                                      offd_intersection[k], neg_lump_value );
-                               }
-                           }
-                       }
-                       /* If intersection is empty, do not eliminate entry */
-                       else
-                       {
-                           /* Don't forget to update mirror entry if collapsing symmetrically */
-                           if (sym_collapse)
-                           {   lump_value = 0.5*RAP_offd_data[j]; }
-                           else
-                           {   lump_value = RAP_offd_data[j]; }
-
-                           hypre_NonGalerkinIJBufferWrite( ijmatrix, &ijbuf_cnt, ijbuf_size, &ijbuf_rowcounter,
-                              &ijbuf_data, &ijbuf_cols, &ijbuf_rownums, &ijbuf_numcols, global_row, col_indx_RAP,
-                              lump_value );
-                           if (sym_collapse)
-                           {
-                               hypre_NonGalerkinIJBufferWrite( ijmatrix,
-                                  &ijbuf_sym_cnt, ijbuf_size, &ijbuf_sym_rowcounter,
-                                  &ijbuf_sym_data, &ijbuf_sym_cols, &ijbuf_sym_rownums,
-                                  &ijbuf_sym_numcols, col_indx_RAP, global_row,
-                                  lump_value );
-                           }
-                       }
-                   }
-                   /* The entry in RAP appears in Pattern, so keep it */
-                   else if (col_indx_RAP == col_indx_Pattern)
-                   {
-                       /* For the offd structure, col_indx_RAP is a global dof number */
-                       hypre_NonGalerkinIJBufferWrite( ijmatrix, &ijbuf_cnt, ijbuf_size, &ijbuf_rowcounter,
-                          &ijbuf_data, &ijbuf_cols, &ijbuf_rownums, &ijbuf_numcols, global_row, col_indx_RAP,
-                          RAP_offd_data[j]);
-
-                       /* Only go to the next entry in Pattern, if this is not the end of a row */
-                       if( current_Pattern_j < Pattern_offd_i[i+1]-1 )
-                       {
-                           current_Pattern_j += 1;
-                           col_indx_Pattern = col_map_offd_Pattern[ Pattern_offd_j[current_Pattern_j] ];
-                       }
-                       else
-                       {   has_row_ended = 1;}
-                   }
-                   /* Increment col_indx_Pattern, and repeat this loop iter for current
-                    * col_ind_RAP value */
-                   else if(col_indx_RAP > col_indx_Pattern)
-                   {
-                       for(; current_Pattern_j < Pattern_offd_i[i+1]; current_Pattern_j++)
-                       {
-                           col_indx_Pattern = col_map_offd_Pattern[ Pattern_offd_j[current_Pattern_j] ];
-                           if(col_indx_RAP <= col_indx_Pattern)
-                           {   break;}
-                       }
-
-                       /* If col_indx_RAP is still greater (i.e., we've reached a row end), then
-                        * we need to lump everything else in this row */
-                       if(col_indx_RAP > col_indx_Pattern)
-                       {   has_row_ended = 1; }
-
-                       /* Decrement j, in order to repeat this loop iteration for the current
-                        * col_indx_RAP value */
-                       j--;
-                   }
-                }
-            }
+         }
+      }
+   }
+
+   /* For efficiency, we do a buffered IJAddToValues.
+    * This empties the buffer of any remaining values */
+   hypre_NonGalerkinIJBufferEmpty(ijmatrix, ijbuf_size, &ijbuf_cnt, ijbuf_rowcounter,
+                                  &ijbuf_data, &ijbuf_cols, &ijbuf_rownums, &ijbuf_numcols);
+   if (sym_collapse)
+   {
+      hypre_NonGalerkinIJBufferEmpty(ijmatrix, ijbuf_size, &ijbuf_sym_cnt, ijbuf_sym_rowcounter,
+                                     &ijbuf_sym_data, &ijbuf_sym_cols, &ijbuf_sym_rownums,
+                                     &ijbuf_sym_numcols);
+   }
+
+   /* Assemble non-Galerkin Matrix, and overwrite current RAP*/
+   HYPRE_IJMatrixAssemble(ijmatrix);
+   HYPRE_IJMatrixGetObject(ijmatrix, (void**) RAP_ptr);
+
+   /* Optional diagnostic matrix printing */
+#if 0
+   char  filename[256];
+
+   hypre_sprintf(filename, "Pattern_%d.ij", global_num_vars);
+   hypre_ParCSRMatrixPrintIJ(Pattern, 0, 0, filename);
+   hypre_sprintf(filename, "Strength_%d.ij", global_num_vars);
+   hypre_ParCSRMatrixPrintIJ(S, 0, 0, filename);
+   hypre_sprintf(filename, "RAP_%d.ij", global_num_vars);
+   hypre_ParCSRMatrixPrintIJ(RAP, 0, 0, filename);
+   hypre_sprintf(filename, "RAPc_%d.ij", global_num_vars);
+   hypre_ParCSRMatrixPrintIJ(*RAP_ptr, 0, 0, filename);
+   hypre_sprintf(filename, "AP_%d.ij", global_num_vars);
+   hypre_ParCSRMatrixPrintIJ(AP, 0, 0, filename);
+#endif
 
-        }
-
-    }
-
-    /* For efficiency, we do a buffered IJAddToValues.
-     * This empties the buffer of any remaining values */
-    hypre_NonGalerkinIJBufferEmpty(ijmatrix, ijbuf_size, &ijbuf_cnt, ijbuf_rowcounter,
-                                &ijbuf_data, &ijbuf_cols, &ijbuf_rownums, &ijbuf_numcols);
-    if(sym_collapse)
-        hypre_NonGalerkinIJBufferEmpty(ijmatrix, ijbuf_size, &ijbuf_sym_cnt, ijbuf_sym_rowcounter,
-                                &ijbuf_sym_data, &ijbuf_sym_cols, &ijbuf_sym_rownums,
-                                &ijbuf_sym_numcols);
-
-    /* Assemble non-Galerkin Matrix, and overwrite current RAP*/
-    ierr += HYPRE_IJMatrixAssemble (ijmatrix);
-    ierr += HYPRE_IJMatrixGetObject( ijmatrix, (void**) RAP_ptr);
-
-    /* Optional diagnostic matrix printing */
-    if (0)
-    {
-        hypre_sprintf(filename, "Pattern_%d.ij", global_num_vars);
-        hypre_ParCSRMatrixPrintIJ(Pattern, 0, 0, filename);
-        hypre_sprintf(filename, "Strength_%d.ij", global_num_vars);
-        hypre_ParCSRMatrixPrintIJ(S, 0, 0, filename);
-        hypre_sprintf(filename, "RAP_%d.ij", global_num_vars);
-        hypre_ParCSRMatrixPrintIJ(RAP, 0, 0, filename);
-        hypre_sprintf(filename, "RAPc_%d.ij", global_num_vars);
-        hypre_ParCSRMatrixPrintIJ(*RAP_ptr, 0, 0, filename);
-        hypre_sprintf(filename, "AP_%d.ij", global_num_vars);
-        hypre_ParCSRMatrixPrintIJ(AP, 0, 0, filename);
-    }
-
-    /* Free matrices and variables and arrays */
-    hypre_TFree(ijbuf_data,    HYPRE_MEMORY_DEVICE);
-    hypre_TFree(ijbuf_cols,    HYPRE_MEMORY_DEVICE);
-    hypre_TFree(ijbuf_rownums, HYPRE_MEMORY_DEVICE);
-    hypre_TFree(ijbuf_numcols, HYPRE_MEMORY_DEVICE);
-    if(sym_collapse)
-    {
-        hypre_TFree(ijbuf_sym_data,    HYPRE_MEMORY_DEVICE);
-        hypre_TFree(ijbuf_sym_cols,    HYPRE_MEMORY_DEVICE);
-        hypre_TFree(ijbuf_sym_rownums, HYPRE_MEMORY_DEVICE);
-        hypre_TFree(ijbuf_sym_numcols, HYPRE_MEMORY_DEVICE);
-    }
-
-    hypre_TFree(Pattern_offd_indices, HYPRE_MEMORY_HOST);
-    hypre_TFree(S_ext_diag_i, HYPRE_MEMORY_HOST);
-    hypre_TFree(S_ext_offd_i, HYPRE_MEMORY_HOST);
-    hypre_TFree(S_offd_indices, HYPRE_MEMORY_HOST);
-    hypre_TFree(offd_intersection, HYPRE_MEMORY_HOST);
-    hypre_TFree(offd_intersection_data, HYPRE_MEMORY_HOST);
-    hypre_TFree(diag_intersection, HYPRE_MEMORY_HOST);
-    hypre_TFree(diag_intersection_data, HYPRE_MEMORY_HOST);
-    if (S_ext_diag_size)
-    {
-        hypre_TFree(S_ext_diag_j, HYPRE_MEMORY_HOST);
-        hypre_TFree(S_ext_diag_data, HYPRE_MEMORY_HOST);
-    }
-    if (S_ext_offd_size)
-    {
-        hypre_TFree(S_ext_offd_j, HYPRE_MEMORY_HOST);
-        hypre_TFree(S_ext_offd_data, HYPRE_MEMORY_HOST);
-    }
-    if (num_cols_offd_Sext)
-    {   hypre_TFree(col_map_offd_Sext, HYPRE_MEMORY_HOST); }
-
-    ierr += hypre_ParCSRMatrixDestroy(Pattern);
-    ierr += hypre_ParCSRMatrixDestroy(RAP);
-    ierr += hypre_ParCSRMatrixDestroy(S);
-    ierr += HYPRE_IJMatrixSetObjectType(ijmatrix, -1);
-    ierr += HYPRE_IJMatrixDestroy(ijmatrix);
-
-    /*end_time = hypre_MPI_Wtime();
-      if(my_id == 0)
-      {   fprintf(stdout, "NonGalerkin Time:  %1.2e\n", end_time-start_time); } */
-
-    return ierr;
+   /* Free matrices and variables and arrays */
+   hypre_TFree(ijbuf_data,    memory_location_RAP);
+   hypre_TFree(ijbuf_cols,    memory_location_RAP);
+   hypre_TFree(ijbuf_rownums, memory_location_RAP);
+   hypre_TFree(ijbuf_numcols, memory_location_RAP);
+   if (sym_collapse)
+   {
+      hypre_TFree(ijbuf_sym_data,    memory_location_RAP);
+      hypre_TFree(ijbuf_sym_cols,    memory_location_RAP);
+      hypre_TFree(ijbuf_sym_rownums, memory_location_RAP);
+      hypre_TFree(ijbuf_sym_numcols, memory_location_RAP);
+   }
+   hypre_TFree(Pattern_offd_indices, HYPRE_MEMORY_HOST);
+   hypre_TFree(S_ext_diag_i, HYPRE_MEMORY_HOST);
+   hypre_TFree(S_ext_offd_i, HYPRE_MEMORY_HOST);
+   hypre_TFree(S_offd_indices, HYPRE_MEMORY_HOST);
+   hypre_TFree(offd_intersection, HYPRE_MEMORY_HOST);
+   hypre_TFree(offd_intersection_data, HYPRE_MEMORY_HOST);
+   hypre_TFree(diag_intersection, HYPRE_MEMORY_HOST);
+   hypre_TFree(diag_intersection_data, HYPRE_MEMORY_HOST);
+   hypre_TFree(S_ext_diag_j, HYPRE_MEMORY_HOST);
+   hypre_TFree(S_ext_diag_data, HYPRE_MEMORY_HOST);
+   hypre_TFree(S_ext_offd_j, HYPRE_MEMORY_HOST);
+   hypre_TFree(S_ext_offd_data, HYPRE_MEMORY_HOST);
+   hypre_TFree(col_map_offd_Sext, HYPRE_MEMORY_HOST);
+
+   hypre_ParCSRMatrixDestroy(Pattern);
+   hypre_ParCSRMatrixDestroy(RAP);
+   hypre_ParCSRMatrixDestroy(S);
+   HYPRE_IJMatrixSetObjectType(ijmatrix, -1);
+   HYPRE_IJMatrixDestroy(ijmatrix);
+
+   HYPRE_ANNOTATE_FUNC_END;
+
+   return hypre_error_flag;
 }
diff --git a/external/hypre/src/parcsr_ls/par_rap.c b/external/hypre/src/parcsr_ls/par_rap.c
index 5c5faf3c..c432b369 100644
--- a/external/hypre/src/parcsr_ls/par_rap.c
+++ b/external/hypre/src/parcsr_ls/par_rap.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -22,6 +22,10 @@ hypre_BoomerAMGBuildCoarseOperator( hypre_ParCSRMatrix  *RT,
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_BoomerAMGBuildCoarseOperatorKT
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
                                       hypre_ParCSRMatrix  *A,
@@ -34,79 +38,73 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
    hypre_profile_times[HYPRE_TIMER_ID_RAP] -= hypre_MPI_Wtime();
 #endif
 
-   MPI_Comm        comm = hypre_ParCSRMatrixComm(A);
+   MPI_Comm               comm = hypre_ParCSRMatrixComm(A);
 
-   hypre_CSRMatrix *RT_diag = hypre_ParCSRMatrixDiag(RT);
-   hypre_CSRMatrix *RT_offd = hypre_ParCSRMatrixOffd(RT);
-   HYPRE_Int             num_cols_diag_RT = hypre_CSRMatrixNumCols(RT_diag);
-   HYPRE_Int             num_cols_offd_RT = hypre_CSRMatrixNumCols(RT_offd);
-   HYPRE_Int             num_rows_offd_RT = hypre_CSRMatrixNumRows(RT_offd);
-   hypre_ParCSRCommPkg   *comm_pkg_RT = hypre_ParCSRMatrixCommPkg(RT);
-   HYPRE_Int             num_recvs_RT = 0;
-   HYPRE_Int             num_sends_RT = 0;
-   HYPRE_Int             *send_map_starts_RT;
-   HYPRE_Int             *send_map_elmts_RT;
+   HYPRE_MemoryLocation   memory_location_RAP = hypre_ParCSRMatrixMemoryLocation(A);
 
-   hypre_CSRMatrix *A_diag = hypre_ParCSRMatrixDiag(A);
+   hypre_CSRMatrix       *RT_diag = hypre_ParCSRMatrixDiag(RT);
+   hypre_CSRMatrix       *RT_offd = hypre_ParCSRMatrixOffd(RT);
+   HYPRE_Int              num_cols_diag_RT = hypre_CSRMatrixNumCols(RT_diag);
+   HYPRE_Int              num_cols_offd_RT = hypre_CSRMatrixNumCols(RT_offd);
+   HYPRE_Int              num_rows_offd_RT = hypre_CSRMatrixNumRows(RT_offd);
+   hypre_ParCSRCommPkg   *comm_pkg_RT = hypre_ParCSRMatrixCommPkg(RT);
+   HYPRE_Int              num_recvs_RT = 0;
+   HYPRE_Int              num_sends_RT = 0;
+   HYPRE_Int             *send_map_starts_RT = NULL;
+   HYPRE_Int             *send_map_elmts_RT = NULL;
 
-   HYPRE_Real      *A_diag_data = hypre_CSRMatrixData(A_diag);
+   hypre_CSRMatrix       *A_diag = hypre_ParCSRMatrixDiag(A);
+   HYPRE_Complex         *A_diag_data = hypre_CSRMatrixData(A_diag);
    HYPRE_Int             *A_diag_i = hypre_CSRMatrixI(A_diag);
    HYPRE_Int             *A_diag_j = hypre_CSRMatrixJ(A_diag);
 
-   hypre_CSRMatrix *A_offd = hypre_ParCSRMatrixOffd(A);
-
-   HYPRE_Real      *A_offd_data = hypre_CSRMatrixData(A_offd);
+   hypre_CSRMatrix       *A_offd = hypre_ParCSRMatrixOffd(A);
+   HYPRE_Complex         *A_offd_data = hypre_CSRMatrixData(A_offd);
    HYPRE_Int             *A_offd_i = hypre_CSRMatrixI(A_offd);
    HYPRE_Int             *A_offd_j = hypre_CSRMatrixJ(A_offd);
 
-   HYPRE_Int  num_cols_diag_A = hypre_CSRMatrixNumCols(A_diag);
-   HYPRE_Int  num_cols_offd_A = hypre_CSRMatrixNumCols(A_offd);
-
-   hypre_CSRMatrix *P_diag = hypre_ParCSRMatrixDiag(P);
+   HYPRE_Int              num_cols_diag_A = hypre_CSRMatrixNumCols(A_diag);
+   HYPRE_Int              num_cols_offd_A = hypre_CSRMatrixNumCols(A_offd);
 
-   HYPRE_Real      *P_diag_data = hypre_CSRMatrixData(P_diag);
+   hypre_CSRMatrix       *P_diag = hypre_ParCSRMatrixDiag(P);
+   HYPRE_Complex         *P_diag_data = hypre_CSRMatrixData(P_diag);
    HYPRE_Int             *P_diag_i = hypre_CSRMatrixI(P_diag);
    HYPRE_Int             *P_diag_j = hypre_CSRMatrixJ(P_diag);
 
-   hypre_CSRMatrix *P_offd = hypre_ParCSRMatrixOffd(P);
-   HYPRE_BigInt    *col_map_offd_P = hypre_ParCSRMatrixColMapOffd(P);
-
-   HYPRE_Real      *P_offd_data = hypre_CSRMatrixData(P_offd);
+   hypre_CSRMatrix       *P_offd = hypre_ParCSRMatrixOffd(P);
+   HYPRE_BigInt          *col_map_offd_P = hypre_ParCSRMatrixColMapOffd(P);
+   HYPRE_Complex         *P_offd_data = hypre_CSRMatrixData(P_offd);
    HYPRE_Int             *P_offd_i = hypre_CSRMatrixI(P_offd);
    HYPRE_Int             *P_offd_j = hypre_CSRMatrixJ(P_offd);
 
-   HYPRE_BigInt  first_col_diag_P = hypre_ParCSRMatrixFirstColDiag(P);
-   HYPRE_BigInt  last_col_diag_P;
-   HYPRE_Int  num_cols_diag_P = hypre_CSRMatrixNumCols(P_diag);
-   HYPRE_Int  num_cols_offd_P = hypre_CSRMatrixNumCols(P_offd);
-   HYPRE_BigInt *coarse_partitioning = hypre_ParCSRMatrixColStarts(P);
-   HYPRE_BigInt *RT_partitioning = hypre_ParCSRMatrixColStarts(RT);
-
-   hypre_ParCSRMatrix *RAP;
-   HYPRE_BigInt       *col_map_offd_RAP = NULL;
-   HYPRE_BigInt       *new_col_map_offd_RAP = NULL;
+   HYPRE_BigInt           first_col_diag_P = hypre_ParCSRMatrixFirstColDiag(P);
+   HYPRE_BigInt           last_col_diag_P;
+   HYPRE_Int              num_cols_diag_P = hypre_CSRMatrixNumCols(P_diag);
+   HYPRE_Int              num_cols_offd_P = hypre_CSRMatrixNumCols(P_offd);
+   HYPRE_BigInt          *coarse_partitioning = hypre_ParCSRMatrixColStarts(P);
+   HYPRE_BigInt          *RT_partitioning = hypre_ParCSRMatrixColStarts(RT);
 
-   hypre_CSRMatrix *RAP_int = NULL;
+   hypre_ParCSRMatrix    *RAP;
+   HYPRE_BigInt          *col_map_offd_RAP = NULL;
+   HYPRE_BigInt          *new_col_map_offd_RAP = NULL;
 
-   HYPRE_Real      *RAP_int_data;
+   hypre_CSRMatrix       *RAP_int = NULL;
+   HYPRE_Complex         *RAP_int_data;
    HYPRE_Int             *RAP_int_i;
-   HYPRE_BigInt    *RAP_int_j;
+   HYPRE_BigInt          *RAP_int_j;
 
-   hypre_CSRMatrix *RAP_ext;
-
-   HYPRE_Real      *RAP_ext_data = NULL;
+   hypre_CSRMatrix       *RAP_ext = NULL;
+   HYPRE_Complex         *RAP_ext_data = NULL;
    HYPRE_Int             *RAP_ext_i = NULL;
-   HYPRE_BigInt    *RAP_ext_j = NULL;
-
-   hypre_CSRMatrix *RAP_diag;
+   HYPRE_BigInt          *RAP_ext_j = NULL;
 
-   HYPRE_Real      *RAP_diag_data;
+   hypre_CSRMatrix       *RAP_diag;
+   HYPRE_Complex         *RAP_diag_data = NULL;
    HYPRE_Int             *RAP_diag_i;
-   HYPRE_Int             *RAP_diag_j;
-
-   hypre_CSRMatrix *RAP_offd;
+   HYPRE_Int             *RAP_diag_j = NULL;
 
-   HYPRE_Real      *RAP_offd_data = NULL;
+   hypre_CSRMatrix       *RAP_offd;
+   HYPRE_Complex         *RAP_offd_data = NULL;
    HYPRE_Int             *RAP_offd_i = NULL;
    HYPRE_Int             *RAP_offd_j = NULL;
 
@@ -116,54 +114,51 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
    HYPRE_Int              RAP_offd_size;
    HYPRE_Int              P_ext_diag_size;
    HYPRE_Int              P_ext_offd_size;
-   HYPRE_BigInt     first_col_diag_RAP;
-   HYPRE_BigInt     last_col_diag_RAP;
+   HYPRE_BigInt           first_col_diag_RAP;
+   HYPRE_BigInt           last_col_diag_RAP;
    HYPRE_Int              num_cols_offd_RAP = 0;
 
-   hypre_CSRMatrix *R_diag;
-
-   HYPRE_Real      *R_diag_data;
+   hypre_CSRMatrix       *R_diag;
+   HYPRE_Complex         *R_diag_data;
    HYPRE_Int             *R_diag_i;
    HYPRE_Int             *R_diag_j;
 
-   hypre_CSRMatrix *R_offd;
-
-   HYPRE_Real      *R_offd_data;
-   HYPRE_Int             *R_offd_i;
-   HYPRE_Int             *R_offd_j;
+   hypre_CSRMatrix       *R_offd = NULL;
+   HYPRE_Complex         *R_offd_data = NULL;
+   HYPRE_Int             *R_offd_i = NULL;
+   HYPRE_Int             *R_offd_j = NULL;
 
-   HYPRE_Real *RA_diag_data_array = NULL;
-   HYPRE_Int *RA_diag_j_array = NULL;
-   HYPRE_Real *RA_offd_data_array = NULL;
-   HYPRE_Int *RA_offd_j_array = NULL;
+   HYPRE_Real            *RA_diag_data_array = NULL;
+   HYPRE_Int             *RA_diag_j_array = NULL;
+   HYPRE_Real            *RA_offd_data_array = NULL;
+   HYPRE_Int             *RA_offd_j_array = NULL;
 
-   hypre_CSRMatrix *Ps_ext;
+   hypre_CSRMatrix       *Ps_ext = NULL;
+   HYPRE_Complex         *Ps_ext_data = NULL;
+   HYPRE_Int             *Ps_ext_i = NULL;
+   HYPRE_BigInt          *Ps_ext_j = NULL;
 
-   HYPRE_Real      *Ps_ext_data;
-   HYPRE_Int             *Ps_ext_i;
-   HYPRE_BigInt    *Ps_ext_j;
-
-   HYPRE_Real      *P_ext_diag_data = NULL;
+   HYPRE_Complex         *P_ext_diag_data = NULL;
    HYPRE_Int             *P_ext_diag_i = NULL;
    HYPRE_Int             *P_ext_diag_j = NULL;
 
-   HYPRE_Real      *P_ext_offd_data = NULL;
+   HYPRE_Complex         *P_ext_offd_data = NULL;
    HYPRE_Int             *P_ext_offd_i = NULL;
    HYPRE_Int             *P_ext_offd_j = NULL;
-   HYPRE_BigInt    *P_big_offd_j = NULL;
+   HYPRE_BigInt          *P_big_offd_j = NULL;
 
-   HYPRE_BigInt    *col_map_offd_Pext;
+   HYPRE_BigInt          *col_map_offd_Pext = NULL;
    HYPRE_Int             *map_P_to_Pext = NULL;
    HYPRE_Int             *map_P_to_RAP = NULL;
    HYPRE_Int             *map_Pext_to_RAP = NULL;
 
-   HYPRE_Int             *P_marker;
+   HYPRE_Int             *P_marker = NULL;
    HYPRE_Int            **P_mark_array;
    HYPRE_Int            **A_mark_array;
    HYPRE_Int             *A_marker;
-   HYPRE_BigInt    *temp;
+   HYPRE_BigInt          *temp;
 
-   HYPRE_BigInt     n_coarse, n_coarse_RT;
+   HYPRE_BigInt           n_coarse, n_coarse_RT;
    HYPRE_Int              square = 1;
    HYPRE_Int              num_cols_offd_Pext = 0;
 
@@ -180,26 +175,26 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
    HYPRE_Int              num_procs;
    HYPRE_Int              num_threads;
 
-   HYPRE_Real       r_entry;
-   HYPRE_Real       r_a_product;
-   HYPRE_Real       r_a_p_product;
+   HYPRE_Real             r_entry;
+   HYPRE_Real             r_a_product;
+   HYPRE_Real             r_a_p_product;
 
-   HYPRE_Real       zero = 0.0;
-   HYPRE_Int 	   *prefix_sum_workspace;
+   HYPRE_Real             zero = 0.0;
+   HYPRE_Int             *prefix_sum_workspace;
 
    /*-----------------------------------------------------------------------
     *  Copy ParCSRMatrix RT into CSRMatrix R so that we have row-wise access
     *  to restriction .
     *-----------------------------------------------------------------------*/
 
-   hypre_MPI_Comm_size(comm,&num_procs);
+   hypre_MPI_Comm_size(comm, &num_procs);
    num_threads = hypre_NumThreads();
 
    if (comm_pkg_RT)
    {
       num_recvs_RT = hypre_ParCSRCommPkgNumRecvs(comm_pkg_RT);
       num_sends_RT = hypre_ParCSRCommPkgNumSends(comm_pkg_RT);
-      send_map_starts_RT =hypre_ParCSRCommPkgSendMapStarts(comm_pkg_RT);
+      send_map_starts_RT = hypre_ParCSRCommPkgSendMapStarts(comm_pkg_RT);
       send_map_elmts_RT = hypre_ParCSRCommPkgSendMapElmts(comm_pkg_RT);
    }
    else if (num_procs > 1)
@@ -208,14 +203,14 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
       comm_pkg_RT = hypre_ParCSRMatrixCommPkg(RT);
       num_recvs_RT = hypre_ParCSRCommPkgNumRecvs(comm_pkg_RT);
       num_sends_RT = hypre_ParCSRCommPkgNumSends(comm_pkg_RT);
-      send_map_starts_RT =hypre_ParCSRCommPkgSendMapStarts(comm_pkg_RT);
+      send_map_starts_RT = hypre_ParCSRCommPkgSendMapStarts(comm_pkg_RT);
       send_map_elmts_RT = hypre_ParCSRCommPkgSendMapElmts(comm_pkg_RT);
    }
 
-   hypre_CSRMatrixTranspose(RT_diag,&R_diag,1);
+   hypre_CSRMatrixTranspose(RT_diag, &R_diag, 1);
    if (num_cols_offd_RT)
    {
-      hypre_CSRMatrixTranspose(RT_offd,&R_offd,1);
+      hypre_CSRMatrixTranspose(RT_offd, &R_offd, 1);
       R_offd_data = hypre_CSRMatrixData(R_offd);
       R_offd_i    = hypre_CSRMatrixI(R_offd);
       R_offd_j    = hypre_CSRMatrixJ(R_offd);
@@ -234,8 +229,11 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
    num_nz_cols_A = num_cols_diag_A + num_cols_offd_A;
 
    n_coarse_RT = hypre_ParCSRMatrixGlobalNumCols(RT);
-   if (n_coarse != n_coarse_RT)
+
+   if (n_coarse != n_coarse_RT || num_cols_diag_RT != num_cols_diag_P)
+   {
       square = 0;
+   }
 
    /*-----------------------------------------------------------------------
     *  Generate Ps_ext, i.e. portion of P that is stored on neighbor procs
@@ -252,9 +250,10 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
    if (send_map_elmts_RT_inverse_map_initialized)
    {
       hypre_UnorderedIntSet send_map_elmts_set;
-      hypre_UnorderedIntSetCreate(&send_map_elmts_set, 2*(send_map_starts_RT[num_sends_RT] - send_map_starts_RT[0]), 16*hypre_NumThreads());
+      hypre_UnorderedIntSetCreate(&send_map_elmts_set,
+                                  2 * (send_map_starts_RT[num_sends_RT] - send_map_starts_RT[0]), 16 * hypre_NumThreads());
 
-#pragma omp parallel for HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for HYPRE_SMP_SCHEDULE
       for (i = send_map_starts_RT[0]; i < send_map_starts_RT[num_sends_RT]; i++)
       {
          HYPRE_Int key = send_map_elmts_RT[i];
@@ -262,31 +261,35 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
       }
 
       HYPRE_Int send_map_elmts_unique_size;
-      HYPRE_Int *send_map_elmts_unique = hypre_UnorderedIntSetCopyToArray(&send_map_elmts_set, &send_map_elmts_unique_size);
+      HYPRE_Int *send_map_elmts_unique = hypre_UnorderedIntSetCopyToArray(&send_map_elmts_set,
+                                                                          &send_map_elmts_unique_size);
       hypre_UnorderedIntSetDestroy(&send_map_elmts_set);
 
-      hypre_UnorderedIntMapCreate(&send_map_elmts_RT_inverse_map, 2*send_map_elmts_unique_size, 16*hypre_NumThreads());
-#pragma omp parallel for HYPRE_SMP_SCHEDULE
+      hypre_UnorderedIntMapCreate(&send_map_elmts_RT_inverse_map, 2 * send_map_elmts_unique_size,
+                                  16 * hypre_NumThreads());
+      #pragma omp parallel for HYPRE_SMP_SCHEDULE
       for (i = 0; i < send_map_elmts_unique_size; i++)
       {
          hypre_UnorderedIntMapPutIfAbsent(&send_map_elmts_RT_inverse_map, send_map_elmts_unique[i], i);
       }
       hypre_TFree(send_map_elmts_unique, HYPRE_MEMORY_HOST);
 
-      send_map_elmts_starts_RT_aggregated = hypre_TAlloc(HYPRE_Int,  send_map_elmts_unique_size + 1, HYPRE_MEMORY_HOST);
-      send_map_elmts_RT_aggregated = hypre_TAlloc(HYPRE_Int,  send_map_starts_RT[num_sends_RT], HYPRE_MEMORY_HOST);
+      send_map_elmts_starts_RT_aggregated = hypre_TAlloc(HYPRE_Int,  send_map_elmts_unique_size + 1,
+                                                         HYPRE_MEMORY_HOST);
+      send_map_elmts_RT_aggregated = hypre_TAlloc(HYPRE_Int,  send_map_starts_RT[num_sends_RT],
+                                                  HYPRE_MEMORY_HOST);
 
-#pragma omp parallel for HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for HYPRE_SMP_SCHEDULE
       for (i = 0; i < send_map_elmts_unique_size; i++)
       {
          send_map_elmts_starts_RT_aggregated[i] = 0;
       }
 
-#pragma omp parallel for HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for HYPRE_SMP_SCHEDULE
       for (i = send_map_starts_RT[0]; i < send_map_starts_RT[num_sends_RT]; i++)
       {
          HYPRE_Int idx = hypre_UnorderedIntMapGet(&send_map_elmts_RT_inverse_map, send_map_elmts_RT[i]);
-#pragma omp atomic
+         #pragma omp atomic
          send_map_elmts_starts_RT_aggregated[idx]++;
       }
 
@@ -296,7 +299,7 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
       }
       send_map_elmts_starts_RT_aggregated[send_map_elmts_unique_size] = send_map_starts_RT[num_sends_RT];
 
-#pragma omp parallel for HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for HYPRE_SMP_SCHEDULE
       for (i = send_map_starts_RT[num_sends_RT] - 1; i >= send_map_starts_RT[0]; i--)
       {
          HYPRE_Int idx = hypre_UnorderedIntMapGet(&send_map_elmts_RT_inverse_map, send_map_elmts_RT[i]);
@@ -313,14 +316,14 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
 
    if (num_procs > 1)
    {
-      Ps_ext = hypre_ParCSRMatrixExtractBExt(P,A,1);
+      Ps_ext = hypre_ParCSRMatrixExtractBExt(P, A, 1);
       Ps_ext_data = hypre_CSRMatrixData(Ps_ext);
       Ps_ext_i    = hypre_CSRMatrixI(Ps_ext);
       Ps_ext_j    = hypre_CSRMatrixBigJ(Ps_ext);
    }
 
-   P_ext_diag_i = hypre_TAlloc(HYPRE_Int, num_cols_offd_A+1, HYPRE_MEMORY_HOST);
-   P_ext_offd_i = hypre_TAlloc(HYPRE_Int, num_cols_offd_A+1, HYPRE_MEMORY_HOST);
+   P_ext_diag_i = hypre_TAlloc(HYPRE_Int, num_cols_offd_A + 1, HYPRE_MEMORY_HOST);
+   P_ext_offd_i = hypre_TAlloc(HYPRE_Int, num_cols_offd_A + 1, HYPRE_MEMORY_HOST);
    P_ext_diag_i[0] = 0;
    P_ext_offd_i[0] = 0;
    P_ext_diag_size = 0;
@@ -328,10 +331,10 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
    last_col_diag_P = first_col_diag_P + (HYPRE_BigInt) num_cols_diag_P - 1;
 
    /*HYPRE_Int prefix_sum_workspace[2*(num_threads + 1)];*/
-   prefix_sum_workspace = hypre_TAlloc(HYPRE_Int,  2*(num_threads + 1), HYPRE_MEMORY_HOST);
+   prefix_sum_workspace = hypre_TAlloc(HYPRE_Int,  2 * (num_threads + 1), HYPRE_MEMORY_HOST);
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel private(i,j)
+   #pragma omp parallel private(i,j)
 #endif /* This threading causes problem, maybe the prefix_sum in combination with BigInt? */
    {
       HYPRE_Int i_begin, i_end;
@@ -342,17 +345,22 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
 
       for (i = i_begin; i < i_end; i++)
       {
-         for (j=Ps_ext_i[i]; j < Ps_ext_i[i+1]; j++)
+         for (j = Ps_ext_i[i]; j < Ps_ext_i[i + 1]; j++)
             if (Ps_ext_j[j] < first_col_diag_P || Ps_ext_j[j] > last_col_diag_P)
+            {
                P_ext_offd_size_private++;
+            }
             else
+            {
                P_ext_diag_size_private++;
+            }
       }
 
-      hypre_prefix_sum_pair(&P_ext_diag_size_private, &P_ext_diag_size, &P_ext_offd_size_private, &P_ext_offd_size, prefix_sum_workspace);
+      hypre_prefix_sum_pair(&P_ext_diag_size_private, &P_ext_diag_size, &P_ext_offd_size_private,
+                            &P_ext_offd_size, prefix_sum_workspace);
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp master
+      #pragma omp master
 #endif
       {
          if (P_ext_diag_size)
@@ -369,12 +377,12 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
          }
       }
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
 
       for (i = i_begin; i < i_end; i++)
       {
-         for (j=Ps_ext_i[i]; j < Ps_ext_i[i+1]; j++)
+         for (j = Ps_ext_i[i]; j < Ps_ext_i[i + 1]; j++)
          {
             HYPRE_BigInt value = Ps_ext_j[j];
             if (value < first_col_diag_P || value > last_col_diag_P)
@@ -390,8 +398,8 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
                P_ext_diag_data[P_ext_diag_size_private++] = Ps_ext_data[j];
             }
          }
-         P_ext_diag_i[i+1] = P_ext_diag_size_private;
-         P_ext_offd_i[i+1] = P_ext_offd_size_private;
+         P_ext_diag_i[i + 1] = P_ext_diag_size_private;
+         P_ext_offd_i[i + 1] = P_ext_offd_size_private;
       }
    } /* omp parallel */
    hypre_TFree(prefix_sum_workspace, HYPRE_MEMORY_HOST);
@@ -406,18 +414,19 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
    if (P_ext_offd_size || num_cols_offd_P)
    {
       hypre_UnorderedBigIntSet found_set;
-      hypre_UnorderedBigIntSetCreate(&found_set, P_ext_offd_size + num_cols_offd_P, 16*hypre_NumThreads());
+      hypre_UnorderedBigIntSetCreate(&found_set, P_ext_offd_size + num_cols_offd_P,
+                                     16 * hypre_NumThreads());
 
-#pragma omp parallel private(i)
+      #pragma omp parallel private(i)
       {
-#pragma omp for HYPRE_SMP_SCHEDULE
+         #pragma omp for HYPRE_SMP_SCHEDULE
          for (i = 0; i < P_ext_offd_size; i++)
          {
             //hypre_UnorderedBigIntSetPut(&found_set, Ps_ext_j[i]);
             hypre_UnorderedBigIntSetPut(&found_set, P_big_offd_j[i]);
          }
 
-#pragma omp for HYPRE_SMP_SCHEDULE
+         #pragma omp for HYPRE_SMP_SCHEDULE
          for (i = 0; i < num_cols_offd_P; i++)
          {
             hypre_UnorderedBigIntSetPut(&found_set, col_map_offd_P[i]);
@@ -430,33 +439,40 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
       hypre_UnorderedBigIntSetDestroy(&found_set);
 
       hypre_UnorderedBigIntMap col_map_offd_Pext_inverse;
-      hypre_big_sort_and_create_inverse_map(temp, num_cols_offd_Pext, &col_map_offd_Pext, &col_map_offd_Pext_inverse);
+      hypre_big_sort_and_create_inverse_map(temp, num_cols_offd_Pext, &col_map_offd_Pext,
+                                            &col_map_offd_Pext_inverse);
 
-#pragma omp parallel for HYPRE_SMP_SCHEDULE
-      for (i=0 ; i < P_ext_offd_size; i++)
+      #pragma omp parallel for HYPRE_SMP_SCHEDULE
+      for (i = 0 ; i < P_ext_offd_size; i++)
          //Ps_ext_j[i] = hypre_UnorderedBigIntMapGet(&col_map_offd_Pext_inverse, Ps_ext_j[i]);
+      {
          P_ext_offd_j[i] = hypre_UnorderedBigIntMapGet(&col_map_offd_Pext_inverse, P_big_offd_j[i]);
-      if (num_cols_offd_Pext) hypre_UnorderedBigIntMapDestroy(&col_map_offd_Pext_inverse);
+      }
+      if (num_cols_offd_Pext) { hypre_UnorderedBigIntMapDestroy(&col_map_offd_Pext_inverse); }
    }
 #else /* !HYPRE_CONCURRENT_HOPSCOTCH */
    if (P_ext_offd_size || num_cols_offd_P)
    {
-      temp = hypre_CTAlloc(HYPRE_BigInt,  P_ext_offd_size+num_cols_offd_P, HYPRE_MEMORY_HOST);
-      for (i=0; i < P_ext_offd_size; i++)
+      temp = hypre_CTAlloc(HYPRE_BigInt,  P_ext_offd_size + num_cols_offd_P, HYPRE_MEMORY_HOST);
+      for (i = 0; i < P_ext_offd_size; i++)
          //Ps_ext_j[i] = temp[i];
          //temp[i] = Ps_ext_j[i];
+      {
          temp[i] = P_big_offd_j[i];
+      }
       cnt = P_ext_offd_size;
-      for (i=0; i < num_cols_offd_P; i++)
+      for (i = 0; i < num_cols_offd_P; i++)
+      {
          temp[cnt++] = col_map_offd_P[i];
+      }
    }
    if (cnt)
    {
-      hypre_BigQsort0(temp, 0, cnt-1);
+      hypre_BigQsort0(temp, 0, cnt - 1);
 
       num_cols_offd_Pext = 1;
       HYPRE_BigInt value = temp[0];
-      for (i=1; i < cnt; i++)
+      for (i = 1; i < cnt; i++)
       {
          if (temp[i] > value)
          {
@@ -467,25 +483,33 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
    }
 
    if (num_cols_offd_Pext)
+   {
       col_map_offd_Pext = hypre_CTAlloc(HYPRE_BigInt, num_cols_offd_Pext, HYPRE_MEMORY_HOST);
+   }
 
-   for (i=0; i < num_cols_offd_Pext; i++)
+   for (i = 0; i < num_cols_offd_Pext; i++)
+   {
       col_map_offd_Pext[i] = temp[i];
+   }
 
    if (P_ext_offd_size || num_cols_offd_P)
+   {
       hypre_TFree(temp, HYPRE_MEMORY_HOST);
+   }
 
    /*if (P_ext_offd_size)
      P_ext_offd_j = hypre_CTAlloc(HYPRE_Int,  P_ext_offd_size, HYPRE_MEMORY_HOST);*/
-   for (i=0 ; i < P_ext_offd_size; i++)
+   for (i = 0 ; i < P_ext_offd_size; i++)
       P_ext_offd_j[i] = hypre_BigBinarySearch(col_map_offd_Pext,
-            //Ps_ext_j[i],
-            P_big_offd_j[i],
-            num_cols_offd_Pext);
+                                              //Ps_ext_j[i],
+                                              P_big_offd_j[i],
+                                              num_cols_offd_Pext);
 #endif /* !HYPRE_CONCURRENT_HOPSCOTCH */
 
    if (P_ext_offd_size)
+   {
       hypre_TFree(P_big_offd_j, HYPRE_MEMORY_HOST);
+   }
    /*if (num_procs > 1)
      {
      hypre_CSRMatrixDestroy(Ps_ext);
@@ -497,11 +521,11 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
       map_P_to_Pext = hypre_CTAlloc(HYPRE_Int, num_cols_offd_P, HYPRE_MEMORY_HOST);
 
       cnt = 0;
-      for (i=0; i < num_cols_offd_Pext; i++)
+      for (i = 0; i < num_cols_offd_Pext; i++)
          if (col_map_offd_Pext[i] == col_map_offd_P[cnt])
          {
             map_P_to_Pext[cnt++] = i;
-            if (cnt == num_cols_offd_P) break;
+            if (cnt == num_cols_offd_P) { break; }
          }
    }
 #ifdef HYPRE_PROFILE
@@ -522,21 +546,21 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
       jj_count = hypre_CTAlloc(HYPRE_Int,  num_threads, HYPRE_MEMORY_HOST);
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i,ii,ic,i1,i2,i3,jj1,jj2,jj3,ns,ne,size,rest,jj_counter,jj_row_begining,A_marker,P_marker) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i,ii,ic,i1,i2,i3,jj1,jj2,jj3,ns,ne,size,rest,jj_counter,jj_row_begining,A_marker,P_marker) HYPRE_SMP_SCHEDULE
 #endif
       for (ii = 0; ii < num_threads; ii++)
       {
-         size = num_cols_offd_RT/num_threads;
-         rest = num_cols_offd_RT - size*num_threads;
+         size = num_cols_offd_RT / num_threads;
+         rest = num_cols_offd_RT - size * num_threads;
          if (ii < rest)
          {
-            ns = ii*size+ii;
-            ne = (ii+1)*size+ii+1;
+            ns = ii * size + ii;
+            ne = (ii + 1) * size + ii + 1;
          }
          else
          {
-            ns = ii*size+rest;
-            ne = (ii+1)*size+rest;
+            ns = ii * size + rest;
+            ne = (ii + 1) * size + rest;
          }
 
          /*-----------------------------------------------------------------------
@@ -545,9 +569,14 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
 
          if (num_cols_offd_Pext || num_cols_diag_P)
          {
-            P_mark_array[ii] = hypre_CTAlloc(HYPRE_Int,  num_cols_diag_P+num_cols_offd_Pext, HYPRE_MEMORY_HOST);
+            P_mark_array[ii] = hypre_CTAlloc(HYPRE_Int,  num_cols_diag_P + num_cols_offd_Pext,
+                                             HYPRE_MEMORY_HOST);
             P_marker = P_mark_array[ii];
          }
+         else
+         {
+            P_marker = NULL;
+         }
          A_mark_array[ii] = hypre_CTAlloc(HYPRE_Int,  num_nz_cols_A, HYPRE_MEMORY_HOST);
          A_marker = A_mark_array[ii];
          /*-----------------------------------------------------------------------
@@ -555,7 +584,7 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
           *-----------------------------------------------------------------------*/
 
          jj_counter = start_indexing;
-         for (ic = 0; ic < num_cols_diag_P+num_cols_offd_Pext; ic++)
+         for (ic = 0; ic < num_cols_diag_P + num_cols_offd_Pext; ic++)
          {
             P_marker[ic] = -1;
          }
@@ -577,7 +606,7 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
              *  Loop over entries in row ic of R_offd.
              *--------------------------------------------------------------------*/
 
-            for (jj1 = R_offd_i[ic]; jj1 < R_offd_i[ic+1]; jj1++)
+            for (jj1 = R_offd_i[ic]; jj1 < R_offd_i[ic + 1]; jj1++)
             {
                i1  = R_offd_j[jj1];
 
@@ -585,7 +614,7 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
                 *  Loop over entries in row i1 of A_offd.
                 *-----------------------------------------------------------------*/
 
-               for (jj2 = A_offd_i[i1]; jj2 < A_offd_i[i1+1]; jj2++)
+               for (jj2 = A_offd_i[i1]; jj2 < A_offd_i[i1 + 1]; jj2++)
                {
                   i2 = A_offd_j[jj2];
 
@@ -607,7 +636,7 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
                       *  Loop over entries in row i2 of P_ext.
                       *-----------------------------------------------------------*/
 
-                     for (jj3 = P_ext_diag_i[i2]; jj3 < P_ext_diag_i[i2+1]; jj3++)
+                     for (jj3 = P_ext_diag_i[i2]; jj3 < P_ext_diag_i[i2 + 1]; jj3++)
                      {
                         i3 = P_ext_diag_j[jj3];
 
@@ -623,7 +652,7 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
                            jj_counter++;
                         }
                      }
-                     for (jj3 = P_ext_offd_i[i2]; jj3 < P_ext_offd_i[i2+1]; jj3++)
+                     for (jj3 = P_ext_offd_i[i2]; jj3 < P_ext_offd_i[i2 + 1]; jj3++)
                      {
                         i3 = P_ext_offd_j[jj3] + num_cols_diag_P;
 
@@ -645,7 +674,7 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
                 *  Loop over entries in row i1 of A_diag.
                 *-----------------------------------------------------------------*/
 
-               for (jj2 = A_diag_i[i1]; jj2 < A_diag_i[i1+1]; jj2++)
+               for (jj2 = A_diag_i[i1]; jj2 < A_diag_i[i1 + 1]; jj2++)
                {
                   i2 = A_diag_j[jj2];
 
@@ -654,20 +683,20 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
                    *  visited. New entries in RAP only occur from unmarked points.
                    *--------------------------------------------------------------*/
 
-                  if (A_marker[i2+num_cols_offd_A] != ic)
+                  if (A_marker[i2 + num_cols_offd_A] != ic)
                   {
 
                      /*-----------------------------------------------------------
                       *  Mark i2 as visited.
                       *-----------------------------------------------------------*/
 
-                     A_marker[i2+num_cols_offd_A] = ic;
+                     A_marker[i2 + num_cols_offd_A] = ic;
 
                      /*-----------------------------------------------------------
                       *  Loop over entries in row i2 of P_diag.
                       *-----------------------------------------------------------*/
 
-                     for (jj3 = P_diag_i[i2]; jj3 < P_diag_i[i2+1]; jj3++)
+                     for (jj3 = P_diag_i[i2]; jj3 < P_diag_i[i2 + 1]; jj3++)
                      {
                         i3 = P_diag_j[jj3];
 
@@ -687,7 +716,7 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
                       *  Loop over entries in row i2 of P_offd.
                       *-----------------------------------------------------------*/
 
-                     for (jj3 = P_offd_i[i2]; jj3 < P_offd_i[i2+1]; jj3++)
+                     for (jj3 = P_offd_i[i2]; jj3 < P_offd_i[i2 + 1]; jj3++)
                      {
                         i3 = map_P_to_Pext[P_offd_j[jj3]] + num_cols_diag_P;
 
@@ -715,11 +744,13 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
       /*-----------------------------------------------------------------------
        *  Allocate RAP_int_data and RAP_int_j arrays.
        *-----------------------------------------------------------------------*/
-      for (i = 0; i < num_threads-1; i++)
-         jj_count[i+1] += jj_count[i];
+      for (i = 0; i < num_threads - 1; i++)
+      {
+         jj_count[i + 1] += jj_count[i];
+      }
 
-      RAP_size = jj_count[num_threads-1];
-      RAP_int_i = hypre_CTAlloc(HYPRE_Int,  num_cols_offd_RT+1, HYPRE_MEMORY_HOST);
+      RAP_size = jj_count[num_threads - 1];
+      RAP_int_i = hypre_CTAlloc(HYPRE_Int,  num_cols_offd_RT + 1, HYPRE_MEMORY_HOST);
       RAP_int_data = hypre_CTAlloc(HYPRE_Real,  RAP_size, HYPRE_MEMORY_HOST);
       RAP_int_j    = hypre_CTAlloc(HYPRE_BigInt,  RAP_size, HYPRE_MEMORY_HOST);
 
@@ -730,34 +761,37 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
        *-----------------------------------------------------------------------*/
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i,ii,ic,i1,i2,i3,jj1,jj2,jj3,ns,ne,size,rest,jj_counter,jj_row_begining,A_marker,P_marker,r_entry,r_a_product,r_a_p_product) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i,ii,ic,i1,i2,i3,jj1,jj2,jj3,ns,ne,size,rest,jj_counter,jj_row_begining,A_marker,P_marker,r_entry,r_a_product,r_a_p_product) HYPRE_SMP_SCHEDULE
 #endif
       for (ii = 0; ii < num_threads; ii++)
       {
-         size = num_cols_offd_RT/num_threads;
-         rest = num_cols_offd_RT - size*num_threads;
+         P_marker = NULL;
+         size = num_cols_offd_RT / num_threads;
+         rest = num_cols_offd_RT - size * num_threads;
          if (ii < rest)
          {
-            ns = ii*size+ii;
-            ne = (ii+1)*size+ii+1;
+            ns = ii * size + ii;
+            ne = (ii + 1) * size + ii + 1;
          }
          else
          {
-            ns = ii*size+rest;
-            ne = (ii+1)*size+rest;
+            ns = ii * size + rest;
+            ne = (ii + 1) * size + rest;
          }
 
          /*-----------------------------------------------------------------------
           *  Initialize some stuff.
           *-----------------------------------------------------------------------*/
          if (num_cols_offd_Pext || num_cols_diag_P)
+         {
             P_marker = P_mark_array[ii];
+         }
          A_marker = A_mark_array[ii];
 
          jj_counter = start_indexing;
-         if (ii > 0) jj_counter = jj_count[ii-1];
+         if (ii > 0) { jj_counter = jj_count[ii - 1]; }
 
-         for (ic = 0; ic < num_cols_diag_P+num_cols_offd_Pext; ic++)
+         for (ic = 0; ic < num_cols_diag_P + num_cols_offd_Pext; ic++)
          {
             P_marker[ic] = -1;
          }
@@ -780,7 +814,7 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
              *  Loop over entries in row ic of R_offd.
              *--------------------------------------------------------------------*/
 
-            for (jj1 = R_offd_i[ic]; jj1 < R_offd_i[ic+1]; jj1++)
+            for (jj1 = R_offd_i[ic]; jj1 < R_offd_i[ic + 1]; jj1++)
             {
                i1  = R_offd_j[jj1];
                r_entry = R_offd_data[jj1];
@@ -789,7 +823,7 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
                 *  Loop over entries in row i1 of A_offd.
                 *-----------------------------------------------------------------*/
 
-               for (jj2 = A_offd_i[i1]; jj2 < A_offd_i[i1+1]; jj2++)
+               for (jj2 = A_offd_i[i1]; jj2 < A_offd_i[i1 + 1]; jj2++)
                {
                   i2 = A_offd_j[jj2];
                   r_a_product = r_entry * A_offd_data[jj2];
@@ -812,7 +846,7 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
                       *  Loop over entries in row i2 of P_ext.
                       *-----------------------------------------------------------*/
 
-                     for (jj3 = P_ext_diag_i[i2]; jj3 < P_ext_diag_i[i2+1]; jj3++)
+                     for (jj3 = P_ext_diag_i[i2]; jj3 < P_ext_diag_i[i2 + 1]; jj3++)
                      {
                         i3 = P_ext_diag_j[jj3];
                         r_a_p_product = r_a_product * P_ext_diag_data[jj3];
@@ -836,7 +870,7 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
                         }
                      }
 
-                     for (jj3 = P_ext_offd_i[i2]; jj3 < P_ext_offd_i[i2+1]; jj3++)
+                     for (jj3 = P_ext_offd_i[i2]; jj3 < P_ext_offd_i[i2 + 1]; jj3++)
                      {
                         i3 = P_ext_offd_j[jj3] + num_cols_diag_P;
                         r_a_p_product = r_a_product * P_ext_offd_data[jj3];
@@ -852,7 +886,7 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
                            P_marker[i3] = jj_counter;
                            RAP_int_data[jj_counter] = r_a_p_product;
                            RAP_int_j[jj_counter]
-                              = col_map_offd_Pext[i3-num_cols_diag_P];
+                              = col_map_offd_Pext[i3 - num_cols_diag_P];
                            jj_counter++;
                         }
                         else
@@ -869,13 +903,13 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
 
                   else
                   {
-                     for (jj3 = P_ext_diag_i[i2]; jj3 < P_ext_diag_i[i2+1]; jj3++)
+                     for (jj3 = P_ext_diag_i[i2]; jj3 < P_ext_diag_i[i2 + 1]; jj3++)
                      {
                         i3 = P_ext_diag_j[jj3];
                         r_a_p_product = r_a_product * P_ext_diag_data[jj3];
                         RAP_int_data[P_marker[i3]] += r_a_p_product;
                      }
-                     for (jj3 = P_ext_offd_i[i2]; jj3 < P_ext_offd_i[i2+1]; jj3++)
+                     for (jj3 = P_ext_offd_i[i2]; jj3 < P_ext_offd_i[i2 + 1]; jj3++)
                      {
                         i3 = P_ext_offd_j[jj3] + num_cols_diag_P;
                         r_a_p_product = r_a_product * P_ext_offd_data[jj3];
@@ -888,7 +922,7 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
                 *  Loop over entries in row i1 of A_diag.
                 *-----------------------------------------------------------------*/
 
-               for (jj2 = A_diag_i[i1]; jj2 < A_diag_i[i1+1]; jj2++)
+               for (jj2 = A_diag_i[i1]; jj2 < A_diag_i[i1 + 1]; jj2++)
                {
                   i2 = A_diag_j[jj2];
                   r_a_product = r_entry * A_diag_data[jj2];
@@ -898,20 +932,20 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
                    *  visited. New entries in RAP only occur from unmarked points.
                    *--------------------------------------------------------------*/
 
-                  if (A_marker[i2+num_cols_offd_A] != ic)
+                  if (A_marker[i2 + num_cols_offd_A] != ic)
                   {
 
                      /*-----------------------------------------------------------
                       *  Mark i2 as visited.
                       *-----------------------------------------------------------*/
 
-                     A_marker[i2+num_cols_offd_A] = ic;
+                     A_marker[i2 + num_cols_offd_A] = ic;
 
                      /*-----------------------------------------------------------
                       *  Loop over entries in row i2 of P_diag.
                       *-----------------------------------------------------------*/
 
-                     for (jj3 = P_diag_i[i2]; jj3 < P_diag_i[i2+1]; jj3++)
+                     for (jj3 = P_diag_i[i2]; jj3 < P_diag_i[i2 + 1]; jj3++)
                      {
                         i3 = P_diag_j[jj3];
                         r_a_p_product = r_a_product * P_diag_data[jj3];
@@ -934,7 +968,7 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
                            RAP_int_data[P_marker[i3]] += r_a_p_product;
                         }
                      }
-                     for (jj3 = P_offd_i[i2]; jj3 < P_offd_i[i2+1]; jj3++)
+                     for (jj3 = P_offd_i[i2]; jj3 < P_offd_i[i2 + 1]; jj3++)
                      {
                         i3 = map_P_to_Pext[P_offd_j[jj3]] + num_cols_diag_P;
                         r_a_p_product = r_a_product * P_offd_data[jj3];
@@ -950,7 +984,7 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
                            P_marker[i3] = jj_counter;
                            RAP_int_data[jj_counter] = r_a_p_product;
                            RAP_int_j[jj_counter] =
-                              col_map_offd_Pext[i3-num_cols_diag_P];
+                              col_map_offd_Pext[i3 - num_cols_diag_P];
                            jj_counter++;
                         }
                         else
@@ -967,13 +1001,13 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
 
                   else
                   {
-                     for (jj3 = P_diag_i[i2]; jj3 < P_diag_i[i2+1]; jj3++)
+                     for (jj3 = P_diag_i[i2]; jj3 < P_diag_i[i2 + 1]; jj3++)
                      {
                         i3 = P_diag_j[jj3];
                         r_a_p_product = r_a_product * P_diag_data[jj3];
                         RAP_int_data[P_marker[i3]] += r_a_p_product;
                      }
-                     for (jj3 = P_offd_i[i2]; jj3 < P_offd_i[i2+1]; jj3++)
+                     for (jj3 = P_offd_i[i2]; jj3 < P_offd_i[i2 + 1]; jj3++)
                      {
                         i3 = map_P_to_Pext[P_offd_j[jj3]] + num_cols_diag_P;
                         r_a_p_product = r_a_product * P_offd_data[jj3];
@@ -984,11 +1018,13 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
             }
          }
          if (num_cols_offd_Pext || num_cols_diag_P)
+         {
             hypre_TFree(P_mark_array[ii], HYPRE_MEMORY_HOST);
+         }
          hypre_TFree(A_mark_array[ii], HYPRE_MEMORY_HOST);
       }
 
-      RAP_int = hypre_CSRMatrixCreate(num_cols_offd_RT,num_rows_offd_RT,RAP_size);
+      RAP_int = hypre_CSRMatrixCreate(num_cols_offd_RT, num_rows_offd_RT, RAP_size);
 
       hypre_CSRMatrixMemoryLocation(RAP_int) = HYPRE_MEMORY_HOST;
 
@@ -1020,8 +1056,8 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
       RAP_int = NULL;
    }
 
-   RAP_diag_i = hypre_TAlloc(HYPRE_Int,  num_cols_diag_RT+1, HYPRE_MEMORY_DEVICE);
-   RAP_offd_i = hypre_TAlloc(HYPRE_Int,  num_cols_diag_RT+1, HYPRE_MEMORY_DEVICE);
+   RAP_diag_i = hypre_TAlloc(HYPRE_Int,  num_cols_diag_RT + 1, memory_location_RAP);
+   RAP_offd_i = hypre_TAlloc(HYPRE_Int,  num_cols_diag_RT + 1, memory_location_RAP);
 
    first_col_diag_RAP = first_col_diag_P;
    last_col_diag_RAP = first_col_diag_P + num_cols_diag_P - 1;
@@ -1035,20 +1071,23 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
    if (RAP_ext_size || num_cols_offd_Pext)
    {
       hypre_UnorderedBigIntSet found_set;
-      hypre_UnorderedBigIntSetCreate(&found_set, 2*(RAP_ext_size + num_cols_offd_Pext), 16*hypre_NumThreads());
+      hypre_UnorderedBigIntSetCreate(&found_set, 2 * (RAP_ext_size + num_cols_offd_Pext),
+                                     16 * hypre_NumThreads());
       cnt = 0;
 
-#pragma omp parallel private(i)
+      #pragma omp parallel private(i)
       {
-#pragma omp for HYPRE_SMP_SCHEDULE
+         #pragma omp for HYPRE_SMP_SCHEDULE
          for (i = 0; i < RAP_ext_size; i++)
          {
             if (RAP_ext_j[i] < first_col_diag_RAP
-                  || RAP_ext_j[i] > last_col_diag_RAP)
+                || RAP_ext_j[i] > last_col_diag_RAP)
+            {
                hypre_UnorderedBigIntSetPut(&found_set, RAP_ext_j[i]);
+            }
          }
 
-#pragma omp for HYPRE_SMP_SCHEDULE
+         #pragma omp for HYPRE_SMP_SCHEDULE
          for (i = 0; i < num_cols_offd_Pext; i++)
          {
             hypre_UnorderedBigIntSetPut(&found_set, col_map_offd_Pext[i]);
@@ -1057,27 +1096,32 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
 
       temp = hypre_UnorderedBigIntSetCopyToArray(&found_set, &num_cols_offd_RAP);
       hypre_UnorderedBigIntSetDestroy(&found_set);
-      hypre_big_sort_and_create_inverse_map(temp, num_cols_offd_RAP, &col_map_offd_RAP, &col_map_offd_RAP_inverse);
+      hypre_big_sort_and_create_inverse_map(temp, num_cols_offd_RAP, &col_map_offd_RAP,
+                                            &col_map_offd_RAP_inverse);
    }
 #else /* !HYPRE_CONCURRENT_HOPSCOTCH */
    if (RAP_ext_size || num_cols_offd_Pext)
    {
-      temp = hypre_CTAlloc(HYPRE_BigInt, RAP_ext_size+num_cols_offd_Pext, HYPRE_MEMORY_HOST);
+      temp = hypre_CTAlloc(HYPRE_BigInt, RAP_ext_size + num_cols_offd_Pext, HYPRE_MEMORY_HOST);
       cnt = 0;
-      for (i=0; i < RAP_ext_size; i++)
+      for (i = 0; i < RAP_ext_size; i++)
          if (RAP_ext_j[i] < first_col_diag_RAP
-               || RAP_ext_j[i] > last_col_diag_RAP)
+             || RAP_ext_j[i] > last_col_diag_RAP)
+         {
             temp[cnt++] = RAP_ext_j[i];
-      for (i=0; i < num_cols_offd_Pext; i++)
+         }
+      for (i = 0; i < num_cols_offd_Pext; i++)
+      {
          temp[cnt++] = col_map_offd_Pext[i];
+      }
 
 
       if (cnt)
       {
-         hypre_BigQsort0(temp,0,cnt-1);
+         hypre_BigQsort0(temp, 0, cnt - 1);
          HYPRE_BigInt value = temp[0];
          num_cols_offd_RAP = 1;
-         for (i=1; i < cnt; i++)
+         for (i = 1; i < cnt; i++)
          {
             if (temp[i] > value)
             {
@@ -1089,10 +1133,14 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
 
       /* now evaluate col_map_offd_RAP */
       if (num_cols_offd_RAP)
+      {
          col_map_offd_RAP = hypre_CTAlloc(HYPRE_BigInt,  num_cols_offd_RAP, HYPRE_MEMORY_HOST);
+      }
 
-      for (i=0 ; i < num_cols_offd_RAP; i++)
+      for (i = 0 ; i < num_cols_offd_RAP; i++)
+      {
          col_map_offd_RAP[i] = temp[i];
+      }
 
       hypre_TFree(temp, HYPRE_MEMORY_HOST);
    }
@@ -1103,11 +1151,11 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
       map_P_to_RAP = hypre_TAlloc(HYPRE_Int, num_cols_offd_P, HYPRE_MEMORY_HOST);
 
       cnt = 0;
-      for (i=0; i < num_cols_offd_RAP; i++)
+      for (i = 0; i < num_cols_offd_RAP; i++)
          if (col_map_offd_RAP[i] == col_map_offd_P[cnt])
          {
             map_P_to_RAP[cnt++] = i;
-            if (cnt == num_cols_offd_P) break;
+            if (cnt == num_cols_offd_P) { break; }
          }
    }
 
@@ -1116,11 +1164,11 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
       map_Pext_to_RAP = hypre_TAlloc(HYPRE_Int, num_cols_offd_Pext, HYPRE_MEMORY_HOST);
 
       cnt = 0;
-      for (i=0; i < num_cols_offd_RAP; i++)
+      for (i = 0; i < num_cols_offd_RAP; i++)
          if (col_map_offd_RAP[i] == col_map_offd_Pext[cnt])
          {
             map_Pext_to_RAP[cnt++] = i;
-            if (cnt == num_cols_offd_Pext) break;
+            if (cnt == num_cols_offd_Pext) { break; }
          }
    }
 
@@ -1129,23 +1177,27 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
     *-----------------------------------------------------------------------*/
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for HYPRE_SMP_SCHEDULE
 #endif
-   for (i=0; i < RAP_ext_size; i++)
+   for (i = 0; i < RAP_ext_size; i++)
       if (RAP_ext_j[i] < first_col_diag_RAP
-            || RAP_ext_j[i] > last_col_diag_RAP)
+          || RAP_ext_j[i] > last_col_diag_RAP)
          RAP_ext_j[i] = (HYPRE_BigInt)num_cols_diag_P
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-            +(HYPRE_BigInt)hypre_UnorderedBigIntMapGet(&col_map_offd_RAP_inverse, RAP_ext_j[i]);
+                        + (HYPRE_BigInt)hypre_UnorderedBigIntMapGet(&col_map_offd_RAP_inverse, RAP_ext_j[i]);
 #else
-   +(HYPRE_BigInt)hypre_BigBinarySearch(col_map_offd_RAP, RAP_ext_j[i],num_cols_offd_RAP);
+                        +(HYPRE_BigInt)hypre_BigBinarySearch(col_map_offd_RAP, RAP_ext_j[i], num_cols_offd_RAP);
 #endif
       else
+      {
          RAP_ext_j[i] -= first_col_diag_RAP;
+      }
 
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
    if (num_cols_offd_RAP)
+   {
       hypre_UnorderedBigIntMapDestroy(&col_map_offd_RAP_inverse);
+   }
 #endif
 
 #ifdef HYPRE_PROFILE
@@ -1161,31 +1213,32 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
    jj_cnt_offd = hypre_CTAlloc(HYPRE_Int,  num_threads, HYPRE_MEMORY_HOST);
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i,j,k,jcol,ii,ic,i1,i2,i3,jj1,jj2,jj3,ns,ne,size,rest,jj_count_diag,jj_count_offd,jj_row_begin_diag,jj_row_begin_offd,A_marker,P_marker) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i,j,k,jcol,ii,ic,i1,i2,i3,jj1,jj2,jj3,ns,ne,size,rest,jj_count_diag,jj_count_offd,jj_row_begin_diag,jj_row_begin_offd,A_marker,P_marker) HYPRE_SMP_SCHEDULE
 #endif
    for (ii = 0; ii < num_threads; ii++)
    {
-      size = num_cols_diag_RT/num_threads;
-      rest = num_cols_diag_RT - size*num_threads;
+      size = num_cols_diag_RT / num_threads;
+      rest = num_cols_diag_RT - size * num_threads;
       if (ii < rest)
       {
-         ns = ii*size+ii;
-         ne = (ii+1)*size+ii+1;
+         ns = ii * size + ii;
+         ne = (ii + 1) * size + ii + 1;
       }
       else
       {
-         ns = ii*size+rest;
-         ne = (ii+1)*size+rest;
+         ns = ii * size + rest;
+         ne = (ii + 1) * size + rest;
       }
 
-      P_mark_array[ii] = hypre_CTAlloc(HYPRE_Int,  num_cols_diag_P+num_cols_offd_RAP, HYPRE_MEMORY_HOST);
+      P_mark_array[ii] = hypre_CTAlloc(HYPRE_Int,  num_cols_diag_P + num_cols_offd_RAP,
+                                       HYPRE_MEMORY_HOST);
       A_mark_array[ii] = hypre_CTAlloc(HYPRE_Int,  num_nz_cols_A, HYPRE_MEMORY_HOST);
       P_marker = P_mark_array[ii];
       A_marker = A_mark_array[ii];
       jj_count_diag = start_indexing;
       jj_count_offd = start_indexing;
 
-      for (ic = 0; ic < num_cols_diag_P+num_cols_offd_RAP; ic++)
+      for (ic = 0; ic < num_cols_diag_P + num_cols_offd_RAP; ic++)
       {
          P_marker[ic] = -1;
       }
@@ -1210,7 +1263,9 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
          jj_row_begin_offd = jj_count_offd;
 
          if (square)
+         {
             P_marker[ic] = jj_count_diag++;
+         }
 
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
          if (send_map_elmts_RT_inverse_map_initialized)
@@ -1218,10 +1273,11 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
             HYPRE_Int i = hypre_UnorderedIntMapGet(&send_map_elmts_RT_inverse_map, ic);
             if (i != -1)
             {
-               for (j = send_map_elmts_starts_RT_aggregated[i]; j < send_map_elmts_starts_RT_aggregated[i + 1]; j++)
+               for (j = send_map_elmts_starts_RT_aggregated[i]; j < send_map_elmts_starts_RT_aggregated[i + 1];
+                    j++)
                {
                   HYPRE_Int jj = send_map_elmts_RT_aggregated[j];
-                  for (k=RAP_ext_i[jj]; k < RAP_ext_i[jj+1]; k++)
+                  for (k = RAP_ext_i[jj]; k < RAP_ext_i[jj + 1]; k++)
                   {
                      jcol = (HYPRE_Int)RAP_ext_j[k];
                      if (jcol < num_cols_diag_P)
@@ -1245,11 +1301,11 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
             } // if (set)
          }
 #else /* !HYPRE_CONCURRENT_HOPSCOTCH */
-         for (i=0; i < num_sends_RT; i++)
-            for (j = send_map_starts_RT[i]; j < send_map_starts_RT[i+1]; j++)
+         for (i = 0; i < num_sends_RT; i++)
+            for (j = send_map_starts_RT[i]; j < send_map_starts_RT[i + 1]; j++)
                if (send_map_elmts_RT[j] == ic)
                {
-                  for (k=RAP_ext_i[j]; k < RAP_ext_i[j+1]; k++)
+                  for (k = RAP_ext_i[j]; k < RAP_ext_i[j + 1]; k++)
                   {
                      jcol = (HYPRE_Int) RAP_ext_j[k];
                      if (jcol < num_cols_diag_P)
@@ -1277,7 +1333,7 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
           *  Loop over entries in row ic of R_diag.
           *--------------------------------------------------------------------*/
 
-         for (jj1 = R_diag_i[ic]; jj1 < R_diag_i[ic+1]; jj1++)
+         for (jj1 = R_diag_i[ic]; jj1 < R_diag_i[ic + 1]; jj1++)
          {
             i1  = R_diag_j[jj1];
 
@@ -1287,7 +1343,7 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
 
             if (num_cols_offd_A)
             {
-               for (jj2 = A_offd_i[i1]; jj2 < A_offd_i[i1+1]; jj2++)
+               for (jj2 = A_offd_i[i1]; jj2 < A_offd_i[i1 + 1]; jj2++)
                {
                   i2 = A_offd_j[jj2];
 
@@ -1309,7 +1365,7 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
                       *  Loop over entries in row i2 of P_ext.
                       *-----------------------------------------------------------*/
 
-                     for (jj3 = P_ext_diag_i[i2]; jj3 < P_ext_diag_i[i2+1]; jj3++)
+                     for (jj3 = P_ext_diag_i[i2]; jj3 < P_ext_diag_i[i2 + 1]; jj3++)
                      {
                         i3 = P_ext_diag_j[jj3];
 
@@ -1325,9 +1381,9 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
                            jj_count_diag++;
                         }
                      }
-                     for (jj3 = P_ext_offd_i[i2]; jj3 < P_ext_offd_i[i2+1]; jj3++)
+                     for (jj3 = P_ext_offd_i[i2]; jj3 < P_ext_offd_i[i2 + 1]; jj3++)
                      {
-                        i3 = map_Pext_to_RAP[P_ext_offd_j[jj3]]+num_cols_diag_P;
+                        i3 = map_Pext_to_RAP[P_ext_offd_j[jj3]] + num_cols_diag_P;
 
                         /*--------------------------------------------------------
                          *  Check P_marker to see that RAP_{ic,i3} has not already
@@ -1348,7 +1404,7 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
              *  Loop over entries in row i1 of A_diag.
              *-----------------------------------------------------------------*/
 
-            for (jj2 = A_diag_i[i1]; jj2 < A_diag_i[i1+1]; jj2++)
+            for (jj2 = A_diag_i[i1]; jj2 < A_diag_i[i1 + 1]; jj2++)
             {
                i2 = A_diag_j[jj2];
 
@@ -1357,20 +1413,20 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
                 *  visited. New entries in RAP only occur from unmarked points.
                 *--------------------------------------------------------------*/
 
-               if (A_marker[i2+num_cols_offd_A] != ic)
+               if (A_marker[i2 + num_cols_offd_A] != ic)
                {
 
                   /*-----------------------------------------------------------
                    *  Mark i2 as visited.
                    *-----------------------------------------------------------*/
 
-                  A_marker[i2+num_cols_offd_A] = ic;
+                  A_marker[i2 + num_cols_offd_A] = ic;
 
                   /*-----------------------------------------------------------
                    *  Loop over entries in row i2 of P_diag.
                    *-----------------------------------------------------------*/
 
-                  for (jj3 = P_diag_i[i2]; jj3 < P_diag_i[i2+1]; jj3++)
+                  for (jj3 = P_diag_i[i2]; jj3 < P_diag_i[i2 + 1]; jj3++)
                   {
                      i3 = P_diag_j[jj3];
 
@@ -1392,7 +1448,7 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
 
                   if (num_cols_offd_P)
                   {
-                     for (jj3 = P_offd_i[i2]; jj3 < P_offd_i[i2+1]; jj3++)
+                     for (jj3 = P_offd_i[i2]; jj3 < P_offd_i[i2 + 1]; jj3++)
                      {
                         i3 = map_P_to_RAP[P_offd_j[jj3]] + num_cols_diag_P;
 
@@ -1425,14 +1481,14 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
       jj_cnt_offd[ii] = jj_count_offd;
    }
 
-   for (i=0; i < num_threads-1; i++)
+   for (i = 0; i < num_threads - 1; i++)
    {
-      jj_cnt_diag[i+1] += jj_cnt_diag[i];
-      jj_cnt_offd[i+1] += jj_cnt_offd[i];
+      jj_cnt_diag[i + 1] += jj_cnt_diag[i];
+      jj_cnt_offd[i + 1] += jj_cnt_offd[i];
    }
 
-   jj_count_diag = jj_cnt_diag[num_threads-1];
-   jj_count_offd = jj_cnt_offd[num_threads-1];
+   jj_count_diag = jj_cnt_diag[num_threads - 1];
+   jj_count_offd = jj_cnt_offd[num_threads - 1];
 
    RAP_diag_i[num_cols_diag_RT] = jj_count_diag;
    RAP_offd_i[num_cols_diag_RT] = jj_count_offd;
@@ -1445,15 +1501,15 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
    RAP_diag_size = jj_count_diag;
    if (RAP_diag_size)
    {
-      RAP_diag_data = hypre_CTAlloc(HYPRE_Real, RAP_diag_size, HYPRE_MEMORY_DEVICE);
-      RAP_diag_j    = hypre_CTAlloc(HYPRE_Int,  RAP_diag_size, HYPRE_MEMORY_DEVICE);
+      RAP_diag_data = hypre_CTAlloc(HYPRE_Real, RAP_diag_size, memory_location_RAP);
+      RAP_diag_j    = hypre_CTAlloc(HYPRE_Int,  RAP_diag_size, memory_location_RAP);
    }
 
    RAP_offd_size = jj_count_offd;
    if (RAP_offd_size)
    {
-      RAP_offd_data = hypre_CTAlloc(HYPRE_Real, RAP_offd_size, HYPRE_MEMORY_DEVICE);
-      RAP_offd_j    = hypre_CTAlloc(HYPRE_Int,  RAP_offd_size, HYPRE_MEMORY_DEVICE);
+      RAP_offd_data = hypre_CTAlloc(HYPRE_Real, RAP_offd_size, memory_location_RAP);
+      RAP_offd_j    = hypre_CTAlloc(HYPRE_Int,  RAP_offd_size, memory_location_RAP);
    }
 
    if (RAP_offd_size == 0 && num_cols_offd_RAP != 0)
@@ -1462,12 +1518,12 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
       hypre_TFree(col_map_offd_RAP, HYPRE_MEMORY_HOST);
    }
 
-   RA_diag_data_array = hypre_TAlloc(HYPRE_Real,  num_cols_diag_A*num_threads, HYPRE_MEMORY_HOST);
-   RA_diag_j_array = hypre_TAlloc(HYPRE_Int,  num_cols_diag_A*num_threads, HYPRE_MEMORY_HOST);
+   RA_diag_data_array = hypre_TAlloc(HYPRE_Real,  num_cols_diag_A * num_threads, HYPRE_MEMORY_HOST);
+   RA_diag_j_array = hypre_TAlloc(HYPRE_Int,  num_cols_diag_A * num_threads, HYPRE_MEMORY_HOST);
    if (num_cols_offd_A)
    {
-      RA_offd_data_array = hypre_TAlloc(HYPRE_Real,  num_cols_offd_A*num_threads, HYPRE_MEMORY_HOST);
-      RA_offd_j_array = hypre_TAlloc(HYPRE_Int,  num_cols_offd_A*num_threads, HYPRE_MEMORY_HOST);
+      RA_offd_data_array = hypre_TAlloc(HYPRE_Real,  num_cols_offd_A * num_threads, HYPRE_MEMORY_HOST);
+      RA_offd_j_array = hypre_TAlloc(HYPRE_Int,  num_cols_offd_A * num_threads, HYPRE_MEMORY_HOST);
    }
 
    /*-----------------------------------------------------------------------
@@ -1476,21 +1532,21 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
     *-----------------------------------------------------------------------*/
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i,j,k,jcol,ii,ic,i1,i2,i3,jj1,jj2,jj3,ns,ne,size,rest,jj_count_diag,jj_count_offd,jj_row_begin_diag,jj_row_begin_offd,A_marker,P_marker,r_entry,r_a_product,r_a_p_product) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i,j,k,jcol,ii,ic,i1,i2,i3,jj1,jj2,jj3,ns,ne,size,rest,jj_count_diag,jj_count_offd,jj_row_begin_diag,jj_row_begin_offd,A_marker,P_marker,r_entry,r_a_product,r_a_p_product) HYPRE_SMP_SCHEDULE
 #endif
    for (ii = 0; ii < num_threads; ii++)
    {
-      size = num_cols_diag_RT/num_threads;
-      rest = num_cols_diag_RT - size*num_threads;
+      size = num_cols_diag_RT / num_threads;
+      rest = num_cols_diag_RT - size * num_threads;
       if (ii < rest)
       {
-         ns = ii*size+ii;
-         ne = (ii+1)*size+ii+1;
+         ns = ii * size + ii;
+         ne = (ii + 1) * size + ii + 1;
       }
       else
       {
-         ns = ii*size+rest;
-         ne = (ii+1)*size+rest;
+         ns = ii * size + rest;
+         ne = (ii + 1) * size + rest;
       }
 
       /*-----------------------------------------------------------------------
@@ -1499,7 +1555,7 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
 
       P_marker = P_mark_array[ii];
       A_marker = A_mark_array[ii];
-      for (ic = 0; ic < num_cols_diag_P+num_cols_offd_RAP; ic++)
+      for (ic = 0; ic < num_cols_diag_P + num_cols_offd_RAP; ic++)
       {
          P_marker[ic] = -1;
       }
@@ -1512,23 +1568,28 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
       jj_count_offd = start_indexing;
       if (ii > 0)
       {
-         jj_count_diag = jj_cnt_diag[ii-1];
-         jj_count_offd = jj_cnt_offd[ii-1];
+         jj_count_diag = jj_cnt_diag[ii - 1];
+         jj_count_offd = jj_cnt_offd[ii - 1];
       }
 
       // temporal matrix RA = R*A
       // only need to store one row per thread because R*A and (R*A)*P are fused
       // into one loop.
       hypre_CSRMatrix RA_diag, RA_offd;
-      RA_diag.data = RA_diag_data_array + num_cols_diag_A*ii;
-      RA_diag.j = RA_diag_j_array + num_cols_diag_A*ii;
+      RA_diag.data = RA_diag_data_array + num_cols_diag_A * ii;
+      RA_diag.j = RA_diag_j_array + num_cols_diag_A * ii;
       RA_diag.num_nonzeros = 0;
       RA_offd.num_nonzeros = 0;
 
       if (num_cols_offd_A)
       {
-         RA_offd.data = RA_offd_data_array + num_cols_offd_A*ii;
-         RA_offd.j = RA_offd_j_array + num_cols_offd_A*ii;
+         RA_offd.data = RA_offd_data_array + num_cols_offd_A * ii;
+         RA_offd.j = RA_offd_j_array + num_cols_offd_A * ii;
+      }
+      else
+      {
+         RA_offd.data = NULL;
+         RA_offd.j = NULL;
       }
 
       /*-----------------------------------------------------------------------
@@ -1564,10 +1625,11 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
             HYPRE_Int i = hypre_UnorderedIntMapGet(&send_map_elmts_RT_inverse_map, ic);
             if (i != -1)
             {
-               for (j = send_map_elmts_starts_RT_aggregated[i]; j < send_map_elmts_starts_RT_aggregated[i + 1]; j++)
+               for (j = send_map_elmts_starts_RT_aggregated[i]; j < send_map_elmts_starts_RT_aggregated[i + 1];
+                    j++)
                {
                   HYPRE_Int jj = send_map_elmts_RT_aggregated[j];
-                  for (k=RAP_ext_i[jj]; k < RAP_ext_i[jj+1]; k++)
+                  for (k = RAP_ext_i[jj]; k < RAP_ext_i[jj + 1]; k++)
                   {
                      jcol = (HYPRE_Int)RAP_ext_j[k];
                      if (jcol < num_cols_diag_P)
@@ -1582,7 +1644,7 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
                         }
                         else
                            RAP_diag_data[P_marker[jcol]]
-                              += RAP_ext_data[k];
+                           += RAP_ext_data[k];
                      }
                      else
                      {
@@ -1592,23 +1654,23 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
                            RAP_offd_data[jj_count_offd]
                               = RAP_ext_data[k];
                            RAP_offd_j[jj_count_offd]
-                              = jcol-num_cols_diag_P;
+                              = jcol - num_cols_diag_P;
                            jj_count_offd++;
                         }
                         else
                            RAP_offd_data[P_marker[jcol]]
-                              += RAP_ext_data[k];
+                           += RAP_ext_data[k];
                      }
                   }
                }
             } // if (set)
          }
 #else /* !HYPRE_CONCURRENT_HOPSCOTCH */
-         for (i=0; i < num_sends_RT; i++)
-            for (j = send_map_starts_RT[i]; j < send_map_starts_RT[i+1]; j++)
+         for (i = 0; i < num_sends_RT; i++)
+            for (j = send_map_starts_RT[i]; j < send_map_starts_RT[i + 1]; j++)
                if (send_map_elmts_RT[j] == ic)
                {
-                  for (k=RAP_ext_i[j]; k < RAP_ext_i[j+1]; k++)
+                  for (k = RAP_ext_i[j]; k < RAP_ext_i[j + 1]; k++)
                   {
                      jcol = (HYPRE_Int)RAP_ext_j[k];
                      if (jcol < num_cols_diag_P)
@@ -1623,7 +1685,7 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
                         }
                         else
                            RAP_diag_data[P_marker[jcol]]
-                              += RAP_ext_data[k];
+                           += RAP_ext_data[k];
                      }
                      else
                      {
@@ -1633,12 +1695,12 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
                            RAP_offd_data[jj_count_offd]
                               = RAP_ext_data[k];
                            RAP_offd_j[jj_count_offd]
-                              = jcol-num_cols_diag_P;
+                              = jcol - num_cols_diag_P;
                            jj_count_offd++;
                         }
                         else
                            RAP_offd_data[P_marker[jcol]]
-                              += RAP_ext_data[k];
+                           += RAP_ext_data[k];
                      }
                   }
                   break;
@@ -1649,7 +1711,7 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
           *  Loop over entries in row ic of R_diag and compute row ic of RA.
           *--------------------------------------------------------------------*/
 
-         for (jj1 = R_diag_i[ic]; jj1 < R_diag_i[ic+1]; jj1++)
+         for (jj1 = R_diag_i[ic]; jj1 < R_diag_i[ic + 1]; jj1++)
          {
             i1  = R_diag_j[jj1];
             r_entry = R_diag_data[jj1];
@@ -1660,7 +1722,7 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
 
             if (num_cols_offd_A)
             {
-               for (jj2 = A_offd_i[i1]; jj2 < A_offd_i[i1+1]; jj2++)
+               for (jj2 = A_offd_i[i1]; jj2 < A_offd_i[i1 + 1]; jj2++)
                {
                   i2 = A_offd_j[jj2];
                   HYPRE_Real a_entry = A_offd_data[jj2];
@@ -1700,11 +1762,11 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
              *  Loop over entries in row i1 of A_diag.
              *-----------------------------------------------------------------*/
 
-            for (jj2 = A_diag_i[i1]; jj2 < A_diag_i[i1+1]; jj2++)
+            for (jj2 = A_diag_i[i1]; jj2 < A_diag_i[i1 + 1]; jj2++)
             {
                i2 = A_diag_j[jj2];
                HYPRE_Real a_entry = A_diag_data[jj2];
-               HYPRE_Int marker = A_marker[i2+num_cols_offd_A];
+               HYPRE_Int marker = A_marker[i2 + num_cols_offd_A];
 
                /*--------------------------------------------------------------
                 *  Check A_marker to see if point i2 has been previously
@@ -1716,7 +1778,7 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
                   /*-----------------------------------------------------------
                    *  Mark i2 as visited.
                    *-----------------------------------------------------------*/
-                  A_marker[i2+num_cols_offd_A] = RA_diag.num_nonzeros;
+                  A_marker[i2 + num_cols_offd_A] = RA_diag.num_nonzeros;
                   RA_diag.data[RA_diag.num_nonzeros - ra_row_begin_diag] = r_entry * a_entry;
                   RA_diag.j[RA_diag.num_nonzeros - ra_row_begin_diag] = i2;
                   RA_diag.num_nonzeros++;
@@ -1744,7 +1806,7 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
             /*-----------------------------------------------------------
              *  Loop over entries in row i1 of P_ext.
              *-----------------------------------------------------------*/
-            for (jj2 = P_ext_diag_i[i1]; jj2 < P_ext_diag_i[i1+1]; jj2++)
+            for (jj2 = P_ext_diag_i[i1]; jj2 < P_ext_diag_i[i1 + 1]; jj2++)
             {
                i2 = P_ext_diag_j[jj2];
                HYPRE_Real p_entry = P_ext_diag_data[jj2];
@@ -1763,9 +1825,11 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
                   jj_count_diag++;
                }
                else
+               {
                   RAP_diag_data[marker] += r_a_product * p_entry;
+               }
             }
-            for (jj2 = P_ext_offd_i[i1]; jj2 < P_ext_offd_i[i1+1]; jj2++)
+            for (jj2 = P_ext_offd_i[i1]; jj2 < P_ext_offd_i[i1 + 1]; jj2++)
             {
                i2 = map_Pext_to_RAP[P_ext_offd_j[jj2]] + num_cols_diag_P;
                HYPRE_Real p_entry = P_ext_offd_data[jj2];
@@ -1784,7 +1848,9 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
                   jj_count_offd++;
                }
                else
+               {
                   RAP_offd_data[marker] += r_a_product * p_entry;
+               }
             }
          } // loop over entries in row ic of RA_offd
 
@@ -1800,7 +1866,7 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
             /*-----------------------------------------------------------------
              *  Loop over entries in row i1 of P_diag.
              *-----------------------------------------------------------------*/
-            for (jj2 = P_diag_i[i1]; jj2 < P_diag_i[i1+1]; jj2++)
+            for (jj2 = P_diag_i[i1]; jj2 < P_diag_i[i1 + 1]; jj2++)
             {
                i2 = P_diag_j[jj2];
                HYPRE_Real p_entry = P_diag_data[jj2];
@@ -1826,7 +1892,7 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
             }
             if (num_cols_offd_P)
             {
-               for (jj2 = P_offd_i[i1]; jj2 < P_offd_i[i1+1]; jj2++)
+               for (jj2 = P_offd_i[i1]; jj2 < P_offd_i[i1 + 1]; jj2++)
                {
                   i2 = map_P_to_RAP[P_offd_j[jj2]] + num_cols_diag_P;
                   HYPRE_Real p_entry = P_offd_data[jj2];
@@ -1862,16 +1928,18 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
 
    P_marker = hypre_CTAlloc(HYPRE_Int, num_cols_offd_RAP, HYPRE_MEMORY_HOST);
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for HYPRE_SMP_SCHEDULE
 #endif
-   for (i=0; i < num_cols_offd_RAP; i++)
+   for (i = 0; i < num_cols_offd_RAP; i++)
+   {
       P_marker[i] = -1;
+   }
 
    jj_count_offd = 0;
 #ifdef HYPRE_USING_ATOMIC
-#pragma omp parallel for private(i3) reduction(+:jj_count_offd) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i3) reduction(+:jj_count_offd) HYPRE_SMP_SCHEDULE
 #endif
-   for (i=0; i < RAP_offd_size; i++)
+   for (i = 0; i < RAP_offd_size; i++)
    {
       i3 = RAP_offd_j[i];
 #ifdef HYPRE_USING_ATOMIC
@@ -1892,7 +1960,7 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
    {
       new_col_map_offd_RAP = hypre_CTAlloc(HYPRE_BigInt, jj_count_offd, HYPRE_MEMORY_HOST);
       jj_counter = 0;
-      for (i=0; i < num_cols_offd_RAP; i++)
+      for (i = 0; i < num_cols_offd_RAP; i++)
          if (!P_marker[i])
          {
             P_marker[i] = jj_counter;
@@ -1900,9 +1968,9 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
          }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i3) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i3) HYPRE_SMP_SCHEDULE
 #endif
-      for (i=0; i < RAP_offd_size; i++)
+      for (i = 0; i < RAP_offd_size; i++)
       {
          i3 = RAP_offd_j[i];
          RAP_offd_j[i] = P_marker[i3];
@@ -1915,9 +1983,9 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
    hypre_TFree(P_marker, HYPRE_MEMORY_HOST);
 
    RAP = hypre_ParCSRMatrixCreate(comm, n_coarse_RT, n_coarse,
-         RT_partitioning, coarse_partitioning,
-         num_cols_offd_RAP, RAP_diag_size,
-         RAP_offd_size);
+                                  RT_partitioning, coarse_partitioning,
+                                  num_cols_offd_RAP, RAP_diag_size,
+                                  RAP_offd_size);
 
    RAP_diag = hypre_ParCSRMatrixDiag(RAP);
    hypre_CSRMatrixI(RAP_diag) = RAP_diag_i;
@@ -2022,5 +2090,5 @@ hypre_BoomerAMGBuildCoarseOperatorKT( hypre_ParCSRMatrix  *RT,
    hypre_profile_times[HYPRE_TIMER_ID_RAP] += hypre_MPI_Wtime();
 #endif
 
-   return(0);
+   return hypre_error_flag;
 }
diff --git a/external/hypre/src/parcsr_ls/par_rap_communication.c b/external/hypre/src/parcsr_ls/par_rap_communication.c
index d2295a2a..073ad966 100644
--- a/external/hypre/src/parcsr_ls/par_rap_communication.c
+++ b/external/hypre/src/parcsr_ls/par_rap_communication.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -23,7 +23,7 @@ hypre_GetCommPkgRTFromCommPkgA( hypre_ParCSRMatrix *RT,
    HYPRE_Int *send_procs_A = hypre_ParCSRCommPkgSendProcs(comm_pkg_A);
    HYPRE_Int *send_map_starts_A = hypre_ParCSRCommPkgSendMapStarts(comm_pkg_A);
 
-   hypre_ParCSRCommPkg *comm_pkg;
+   hypre_ParCSRCommPkg *comm_pkg = NULL;
    HYPRE_Int num_recvs_RT;
    HYPRE_Int *recv_procs_RT;
    HYPRE_Int *recv_vec_starts_RT;
@@ -60,8 +60,8 @@ hypre_GetCommPkgRTFromCommPkgA( hypre_ParCSRMatrix *RT,
    hypre_MPI_Request *requests;
    hypre_MPI_Status *status;
 
-   hypre_MPI_Comm_size(comm,&num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_size(comm, &num_procs);
+   hypre_MPI_Comm_rank(comm, &my_id);
 
    /*--------------------------------------------------------------------------
     * determine num_recvs, recv_procs and recv_vec_starts for RT
@@ -69,27 +69,29 @@ hypre_GetCommPkgRTFromCommPkgA( hypre_ParCSRMatrix *RT,
 
    proc_mark = hypre_CTAlloc(HYPRE_Int,  num_recvs_A, HYPRE_MEMORY_HOST);
 
-   for (i=0; i < num_recvs_A; i++)
+   for (i = 0; i < num_recvs_A; i++)
+   {
       proc_mark[i] = 0;
+   }
 
    proc_num = 0;
    num_recvs_RT = 0;
    if (num_cols_offd_RT)
    {
-      for (i=0; i < num_recvs_A; i++)
+      for (i = 0; i < num_recvs_A; i++)
       {
-         for (j=recv_vec_starts_A[i]; j<recv_vec_starts_A[i+1]; j++)
+         for (j = recv_vec_starts_A[i]; j < recv_vec_starts_A[i + 1]; j++)
          {
             offd_col = tmp_map_offd[proc_num];
             if (offd_col == j)
             {
                proc_mark[i]++;
                proc_num++;
-               if (proc_num == num_cols_offd_RT) break;
+               if (proc_num == num_cols_offd_RT) { break; }
             }
          }
-         if (proc_mark[i]) num_recvs_RT++;
-         if (proc_num == num_cols_offd_RT) break;
+         if (proc_mark[i]) { num_recvs_RT++; }
+         if (proc_num == num_cols_offd_RT) { break; }
       }
    }
 
@@ -100,44 +102,48 @@ hypre_GetCommPkgRTFromCommPkgA( hypre_ParCSRMatrix *RT,
    my_first_cpt = hypre_ParCSRMatrixColStarts(RT)[0];
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i,j,ns,ne,size,rest,coarse_shift) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i,j,ns,ne,size,rest,coarse_shift) HYPRE_SMP_SCHEDULE
 #endif
    for (j = 0; j < num_threads; j++)
    {
       coarse_shift = 0;
-      if (j > 0) coarse_shift = coarse_counter[j-1];
-      size = n_fine/num_threads;
-      rest = n_fine - size*num_threads;
+      if (j > 0) { coarse_shift = coarse_counter[j - 1]; }
+      size = n_fine / num_threads;
+      rest = n_fine - size * num_threads;
       if (j < rest)
       {
-         ns = j*size+j;
-         ne = (j+1)*size+j+1;
+         ns = j * size + j;
+         ne = (j + 1) * size + j + 1;
       }
       else
       {
-         ns = j*size+rest;
-         ne = (j+1)*size+rest;
+         ns = j * size + rest;
+         ne = (j + 1) * size + rest;
       }
       for (i = ns; i < ne; i++)
+      {
          fine_to_coarse[i] += coarse_shift;
+      }
    }
 
    index = 0;
    for (i = 0; i < num_sends_A; i++)
    {
       start = hypre_ParCSRCommPkgSendMapStart(comm_pkg_A, i);
-      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg_A, i+1); j++)
-         big_buf_data[index++] = my_first_cpt+
-            (HYPRE_BigInt)fine_to_coarse[hypre_ParCSRCommPkgSendMapElmt(comm_pkg_A,j)];
+      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg_A, i + 1); j++)
+         big_buf_data[index++] = my_first_cpt +
+                                 (HYPRE_BigInt)fine_to_coarse[hypre_ParCSRCommPkgSendMapElmt(comm_pkg_A, j)];
    }
 
    comm_handle = hypre_ParCSRCommHandleCreate( 21, comm_pkg_A, big_buf_data,
-         fine_to_coarse_offd);
+                                               fine_to_coarse_offd);
 
    hypre_ParCSRCommHandleDestroy(comm_handle);
 
-   for (i=0; i < num_cols_offd_RT; i++)
+   for (i = 0; i < num_cols_offd_RT; i++)
+   {
       col_map_offd_RT[i] = fine_to_coarse_offd[tmp_map_offd[i]];
+   }
 
    hypre_TFree(big_buf_data, HYPRE_MEMORY_HOST);
    hypre_TFree(fine_to_coarse_offd, HYPRE_MEMORY_HOST);
@@ -145,16 +151,16 @@ hypre_GetCommPkgRTFromCommPkgA( hypre_ParCSRMatrix *RT,
    //hypre_TFree(tmp_map_offd, HYPRE_MEMORY_HOST);
 
    recv_procs_RT = hypre_CTAlloc(HYPRE_Int, num_recvs_RT, HYPRE_MEMORY_HOST);
-   recv_vec_starts_RT = hypre_CTAlloc(HYPRE_Int,  num_recvs_RT+1, HYPRE_MEMORY_HOST);
+   recv_vec_starts_RT = hypre_CTAlloc(HYPRE_Int,  num_recvs_RT + 1, HYPRE_MEMORY_HOST);
 
    j = 0;
    recv_vec_starts_RT[0] = 0;
-   for (i=0; i < num_recvs_A; i++)
+   for (i = 0; i < num_recvs_A; i++)
    {
       if (proc_mark[i])
       {
          recv_procs_RT[j] = recv_procs_A[i];
-         recv_vec_starts_RT[j+1] = recv_vec_starts_RT[j]+proc_mark[i];
+         recv_vec_starts_RT[j + 1] = recv_vec_starts_RT[j] + proc_mark[i];
          j++;
       }
    }
@@ -163,22 +169,22 @@ hypre_GetCommPkgRTFromCommPkgA( hypre_ParCSRMatrix *RT,
     * send num_changes to recv_procs_A and receive change_array from send_procs_A
     *--------------------------------------------------------------------------*/
 
-   num_requests = num_recvs_A+num_sends_A;
+   num_requests = num_recvs_A + num_sends_A;
    requests = hypre_CTAlloc(hypre_MPI_Request,  num_requests, HYPRE_MEMORY_HOST);
    status = hypre_CTAlloc(hypre_MPI_Status,  num_requests, HYPRE_MEMORY_HOST);
 
    change_array = hypre_CTAlloc(HYPRE_Int,  num_sends_A, HYPRE_MEMORY_HOST);
 
    j = 0;
-   for (i=0; i < num_sends_A; i++)
-      hypre_MPI_Irecv(&change_array[i],1,HYPRE_MPI_INT,send_procs_A[i],0,comm,
-            &requests[j++]);
+   for (i = 0; i < num_sends_A; i++)
+      hypre_MPI_Irecv(&change_array[i], 1, HYPRE_MPI_INT, send_procs_A[i], 0, comm,
+                      &requests[j++]);
 
-   for (i=0; i < num_recvs_A; i++)
-      hypre_MPI_Isend(&proc_mark[i],1,HYPRE_MPI_INT,recv_procs_A[i],0,comm,
-            &requests[j++]);
+   for (i = 0; i < num_recvs_A; i++)
+      hypre_MPI_Isend(&proc_mark[i], 1, HYPRE_MPI_INT, recv_procs_A[i], 0, comm,
+                      &requests[j++]);
 
-   hypre_MPI_Waitall(num_requests,requests,status);
+   hypre_MPI_Waitall(num_requests, requests, status);
 
    hypre_TFree(proc_mark, HYPRE_MEMORY_HOST);
 
@@ -187,23 +193,23 @@ hypre_GetCommPkgRTFromCommPkgA( hypre_ParCSRMatrix *RT,
     *--------------------------------------------------------------------------*/
 
    num_sends_RT = 0;
-   for (i=0; i < num_sends_A; i++)
+   for (i = 0; i < num_sends_A; i++)
       if (change_array[i])
       {
          num_sends_RT++;
       }
 
    send_procs_RT = hypre_CTAlloc(HYPRE_Int,  num_sends_RT, HYPRE_MEMORY_HOST);
-   send_map_starts_RT = hypre_CTAlloc(HYPRE_Int,  num_sends_RT+1, HYPRE_MEMORY_HOST);
+   send_map_starts_RT = hypre_CTAlloc(HYPRE_Int,  num_sends_RT + 1, HYPRE_MEMORY_HOST);
 
    j = 0;
    send_map_starts_RT[0] = 0;
-   for (i=0; i < num_sends_A; i++)
+   for (i = 0; i < num_sends_A; i++)
    {
       if (change_array[i])
       {
          send_procs_RT[j] = send_procs_A[i];
-         send_map_starts_RT[j+1] = send_map_starts_RT[j]+change_array[i];
+         send_map_starts_RT[j + 1] = send_map_starts_RT[j] + change_array[i];
          j++;
       }
    }
@@ -216,37 +222,35 @@ hypre_GetCommPkgRTFromCommPkgA( hypre_ParCSRMatrix *RT,
    send_big_elmts = hypre_CTAlloc(HYPRE_BigInt, send_map_starts_RT[num_sends_RT], HYPRE_MEMORY_HOST);
 
    j = 0;
-   for (i=0; i < num_sends_RT; i++)
+   for (i = 0; i < num_sends_RT; i++)
    {
       vec_start = send_map_starts_RT[i];
-      vec_len = send_map_starts_RT[i+1]-vec_start;
-      hypre_MPI_Irecv(&send_big_elmts[vec_start],vec_len,HYPRE_MPI_BIG_INT,
-            send_procs_RT[i],0,comm,&requests[j++]);
+      vec_len = send_map_starts_RT[i + 1] - vec_start;
+      hypre_MPI_Irecv(&send_big_elmts[vec_start], vec_len, HYPRE_MPI_BIG_INT,
+                      send_procs_RT[i], 0, comm, &requests[j++]);
    }
 
-   for (i=0; i < num_recvs_RT; i++)
+   for (i = 0; i < num_recvs_RT; i++)
    {
       vec_start = recv_vec_starts_RT[i];
-      vec_len = recv_vec_starts_RT[i+1] - vec_start;
-      hypre_MPI_Isend(&col_map_offd_RT[vec_start],vec_len,HYPRE_MPI_BIG_INT,
-            recv_procs_RT[i],0,comm,&requests[j++]);
+      vec_len = recv_vec_starts_RT[i + 1] - vec_start;
+      hypre_MPI_Isend(&col_map_offd_RT[vec_start], vec_len, HYPRE_MPI_BIG_INT,
+                      recv_procs_RT[i], 0, comm, &requests[j++]);
    }
 
-   hypre_MPI_Waitall(j,requests,status);
+   hypre_MPI_Waitall(j, requests, status);
 
-   for (i=0; i < send_map_starts_RT[num_sends_RT]; i++)
-      send_map_elmts_RT[i] = (HYPRE_Int)(send_big_elmts[i]-first_col_diag);
-
-   comm_pkg = hypre_CTAlloc(hypre_ParCSRCommPkg, 1, HYPRE_MEMORY_HOST);
+   for (i = 0; i < send_map_starts_RT[num_sends_RT]; i++)
+   {
+      send_map_elmts_RT[i] = (HYPRE_Int)(send_big_elmts[i] - first_col_diag);
+   }
 
-   hypre_ParCSRCommPkgComm(comm_pkg) = comm;
-   hypre_ParCSRCommPkgNumSends(comm_pkg) = num_sends_RT;
-   hypre_ParCSRCommPkgNumRecvs(comm_pkg) = num_recvs_RT;
-   hypre_ParCSRCommPkgSendProcs(comm_pkg) = send_procs_RT;
-   hypre_ParCSRCommPkgRecvProcs(comm_pkg) = recv_procs_RT;
-   hypre_ParCSRCommPkgRecvVecStarts(comm_pkg) = recv_vec_starts_RT;
-   hypre_ParCSRCommPkgSendMapStarts(comm_pkg) = send_map_starts_RT;
-   hypre_ParCSRCommPkgSendMapElmts(comm_pkg) = send_map_elmts_RT;
+   /* Create and fill communication package */
+   hypre_ParCSRCommPkgCreateAndFill(comm,
+                                    num_recvs_RT, recv_procs_RT, recv_vec_starts_RT,
+                                    num_sends_RT, send_procs_RT, send_map_starts_RT,
+                                    send_map_elmts_RT,
+                                    &comm_pkg);
 
    hypre_TFree(status, HYPRE_MEMORY_HOST);
    hypre_TFree(requests, HYPRE_MEMORY_HOST);
@@ -266,11 +270,11 @@ hypre_GenerateSendMapAndCommPkg(MPI_Comm comm, HYPRE_Int num_sends, HYPRE_Int nu
    HYPRE_Int *send_map_starts;
    HYPRE_Int *send_map_elmts;
    HYPRE_Int i, j;
-   HYPRE_Int num_requests = num_sends+num_recvs;
+   HYPRE_Int num_requests = num_sends + num_recvs;
    hypre_MPI_Request *requests;
    hypre_MPI_Status *status;
    HYPRE_Int vec_len, vec_start;
-   hypre_ParCSRCommPkg *comm_pkg;
+   hypre_ParCSRCommPkg *comm_pkg = NULL;
    HYPRE_BigInt *col_map_offd = hypre_ParCSRMatrixColMapOffd(A);
    HYPRE_BigInt first_col_diag = hypre_ParCSRMatrixFirstColDiag(A);
    HYPRE_BigInt *send_big_elmts = NULL;
@@ -278,66 +282,70 @@ hypre_GenerateSendMapAndCommPkg(MPI_Comm comm, HYPRE_Int num_sends, HYPRE_Int nu
    /*--------------------------------------------------------------------------
     * generate send_map_starts and send_map_elmts
     *--------------------------------------------------------------------------*/
+
    requests = hypre_CTAlloc(hypre_MPI_Request, num_requests, HYPRE_MEMORY_HOST);
    status = hypre_CTAlloc(hypre_MPI_Status, num_requests, HYPRE_MEMORY_HOST);
-   send_map_starts = hypre_CTAlloc(HYPRE_Int,  num_sends+1, HYPRE_MEMORY_HOST);
+   send_map_starts = hypre_CTAlloc(HYPRE_Int,  num_sends + 1, HYPRE_MEMORY_HOST);
    j = 0;
-   for (i=0; i < num_sends; i++)
-      hypre_MPI_Irecv(&send_map_starts[i+1],1,HYPRE_MPI_INT,send_procs[i],0,comm,
-            &requests[j++]);
+   for (i = 0; i < num_sends; i++)
+   {
+      hypre_MPI_Irecv(&send_map_starts[i + 1], 1, HYPRE_MPI_INT, send_procs[i], 0, comm,
+                      &requests[j++]);
+   }
 
-   for (i=0; i < num_recvs; i++)
+   for (i = 0; i < num_recvs; i++)
    {
-      vec_len = recv_vec_starts[i+1] - recv_vec_starts[i];
-      hypre_MPI_Isend(&vec_len,1,HYPRE_MPI_INT, recv_procs[i],0,comm,&requests[j++]);
+      vec_len = recv_vec_starts[i + 1] - recv_vec_starts[i];
+      hypre_MPI_Isend(&vec_len, 1, HYPRE_MPI_INT, recv_procs[i], 0, comm, &requests[j++]);
    }
 
-   hypre_MPI_Waitall(j,requests,status);
+   hypre_MPI_Waitall(j, requests, status);
 
    send_map_starts[0] = 0;
-   for (i=0; i < num_sends; i++)
-      send_map_starts[i+1] += send_map_starts[i];
+   for (i = 0; i < num_sends; i++)
+   {
+      send_map_starts[i + 1] += send_map_starts[i];
+   }
 
    send_map_elmts = hypre_CTAlloc(HYPRE_Int, send_map_starts[num_sends], HYPRE_MEMORY_HOST);
    send_big_elmts = hypre_CTAlloc(HYPRE_BigInt, send_map_starts[num_sends], HYPRE_MEMORY_HOST);
 
    j = 0;
-   for (i=0; i < num_sends; i++)
+   for (i = 0; i < num_sends; i++)
    {
       vec_start = send_map_starts[i];
-      vec_len = send_map_starts[i+1]-vec_start;
-      hypre_MPI_Irecv(&send_big_elmts[vec_start],vec_len,HYPRE_MPI_BIG_INT,
-            send_procs[i],0,comm,&requests[j++]);
+      vec_len = send_map_starts[i + 1] - vec_start;
+      hypre_MPI_Irecv(&send_big_elmts[vec_start], vec_len, HYPRE_MPI_BIG_INT,
+                      send_procs[i], 0, comm, &requests[j++]);
    }
 
-   for (i=0; i < num_recvs; i++)
+   for (i = 0; i < num_recvs; i++)
    {
       vec_start = recv_vec_starts[i];
-      vec_len = recv_vec_starts[i+1] - vec_start;
-      hypre_MPI_Isend(&col_map_offd[vec_start],vec_len,HYPRE_MPI_BIG_INT,
-            recv_procs[i],0,comm,&requests[j++]);
+      vec_len = recv_vec_starts[i + 1] - vec_start;
+      hypre_MPI_Isend(&col_map_offd[vec_start], vec_len, HYPRE_MPI_BIG_INT,
+                      recv_procs[i], 0, comm, &requests[j++]);
    }
 
-   hypre_MPI_Waitall(j,requests,status);
-
-   for (i=0; i < send_map_starts[num_sends]; i++)
-      send_map_elmts[i] = (HYPRE_Int)(send_big_elmts[i]-first_col_diag);
+   hypre_MPI_Waitall(j, requests, status);
 
-   comm_pkg = hypre_CTAlloc(hypre_ParCSRCommPkg, 1, HYPRE_MEMORY_HOST);
+   for (i = 0; i < send_map_starts[num_sends]; i++)
+   {
+      send_map_elmts[i] = (HYPRE_Int)(send_big_elmts[i] - first_col_diag);
+   }
 
-   hypre_ParCSRCommPkgComm(comm_pkg) = comm;
-   hypre_ParCSRCommPkgNumSends(comm_pkg) = num_sends;
-   hypre_ParCSRCommPkgNumRecvs(comm_pkg) = num_recvs;
-   hypre_ParCSRCommPkgSendProcs(comm_pkg) = send_procs;
-   hypre_ParCSRCommPkgRecvProcs(comm_pkg) = recv_procs;
-   hypre_ParCSRCommPkgRecvVecStarts(comm_pkg) = recv_vec_starts;
-   hypre_ParCSRCommPkgSendMapStarts(comm_pkg) = send_map_starts;
-   hypre_ParCSRCommPkgSendMapElmts(comm_pkg) = send_map_elmts;
+   /* Create and fill communication package */
+   hypre_ParCSRCommPkgCreateAndFill(comm,
+                                    num_recvs, recv_procs, recv_vec_starts,
+                                    num_sends, send_procs, send_map_starts,
+                                    send_map_elmts,
+                                    &comm_pkg);
 
    hypre_TFree(status, HYPRE_MEMORY_HOST);
    hypre_TFree(requests, HYPRE_MEMORY_HOST);
    hypre_TFree(send_big_elmts, HYPRE_MEMORY_HOST);
 
    hypre_ParCSRMatrixCommPkg(A) = comm_pkg;
-   return 0;
+
+   return hypre_error_flag;
 }
diff --git a/external/hypre/src/parcsr_ls/par_relax.c b/external/hypre/src/parcsr_ls/par_relax.c
index 13255f94..4b94bb54 100644
--- a/external/hypre/src/parcsr_ls/par_relax.c
+++ b/external/hypre/src/parcsr_ls/par_relax.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -19,6 +19,7 @@
 /*--------------------------------------------------------------------------
  * hypre_BoomerAMGRelax
  *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_BoomerAMGRelax( hypre_ParCSRMatrix *A,
                       hypre_ParVector    *f,
@@ -47,9 +48,9 @@ hypre_BoomerAMGRelax( hypre_ParCSRMatrix *A,
     *     relax_type =  5 -> hybrid: GS-J mix off-processor, chaotic GS on-node
     *     relax_type =  6 -> hybrid: SSOR-J mix off-processor, SSOR on-processor
     *                               with outer relaxation parameters
-    *     relax_type =  7 -> Jacobi (uses Matvec), only needed in CGNR [GPU-supported, CF supported with redundant computation]
-    *     relax_type =  8 -> hybrid L1 Symm. Gauss-Seidel
-    *     relax_type =  9 -> Direct solve, Gaussian elimination
+    *     relax_type =  7 -> Jacobi (uses Matvec), only needed in CGNR
+    *                        [GPU-supported, CF supported with redundant computation]
+    *     relax_type =  8 -> hybrid L1 Symm. Gauss-Seidel (SSOR)
     *     relax_type = 10 -> On-processor direct forward solve for matrices with
     *                        triangular structure (indices need not be ordered
     *                        triangular)
@@ -64,19 +65,17 @@ hypre_BoomerAMGRelax( hypre_ParCSRMatrix *A,
     *     relax_type = 16 -> Scaled Chebyshev
     *     relax_type = 17 -> FCF-Jacobi
     *     relax_type = 18 -> L1-Jacobi [GPU-supported through call to relax7Jacobi]
-    *     relax_type = 19 -> Direct Solve, (old version)
-    *     relax_type = 20 -> Kaczmarz
-    *     relax_type = 29 -> Direct solve: use gaussian elimination & BLAS
-    *                        (with pivoting) (old version)
-    *     relax_type = 98 -> Direct solve, Gaussian elimination
-    *     relax_type = 99 -> Direct solve, Gaussian elimination
-    *     relax_type = 199-> Direct solve, Gaussian elimination
+    *     relax_type = 21 -> the same as 8 except forcing serialization on CPU (#OMP-thread = 1)
+    *     relax_type = 30 -> Kaczmarz
+    *     relax_type = 88 -> convergent version of SSOR (option 8)
+    *     relax_type = 89 -> L1 Symm. hybrid Gauss-Seidel
     *-------------------------------------------------------------------------------------*/
 
    switch (relax_type)
    {
       case 0: /* Weighted Jacobi */
-         hypre_BoomerAMGRelax0WeightedJacobi(A, f, cf_marker, relax_points, relax_weight, u, Vtemp);
+         hypre_BoomerAMGRelax0WeightedJacobi(A, f, cf_marker, relax_points,
+                                             relax_weight, u, Vtemp);
          break;
 
       case 1: /* Gauss-Seidel VERY SLOW */
@@ -87,13 +86,16 @@ hypre_BoomerAMGRelax( hypre_ParCSRMatrix *A,
          hypre_BoomerAMGRelax2GaussSeidel(A, f, cf_marker, relax_points, u);
          break;
 
-      /* Hybrid: Jacobi off-processor, Gauss-Seidel on-processor (forward loop) */
-      case 3:
-         hypre_BoomerAMGRelax3HybridGaussSeidel(A, f, cf_marker, relax_points, relax_weight, omega, u, Vtemp, Ztemp);
+      case 3: /* Hybrid: Jacobi off-processor, Gauss-Seidel on-processor (forward loop) */
+         hypre_BoomerAMGRelax3HybridGaussSeidel(A, f, cf_marker, relax_points,
+                                                relax_weight, omega, u, Vtemp,
+                                                Ztemp);
          break;
 
       case 4: /* Hybrid: Jacobi off-processor, Gauss-Seidel/SOR on-processor (backward loop) */
-         hypre_BoomerAMGRelax4HybridGaussSeidel(A, f, cf_marker, relax_points, relax_weight, omega, u, Vtemp, Ztemp);
+         hypre_BoomerAMGRelax4HybridGaussSeidel(A, f, cf_marker, relax_points,
+                                                relax_weight, omega, u, Vtemp,
+                                                Ztemp);
          break;
 
       case 5: /* Hybrid: Jacobi off-processor, chaotic Gauss-Seidel on-processor */
@@ -101,58 +103,79 @@ hypre_BoomerAMGRelax( hypre_ParCSRMatrix *A,
          break;
 
       case 6: /* Hybrid: Jacobi off-processor, Symm. Gauss-Seidel/SSOR on-processor with outer relaxation parameter */
-         hypre_BoomerAMGRelax6HybridSSOR(A, f, cf_marker, relax_points, relax_weight, omega, u, Vtemp, Ztemp);
+         hypre_BoomerAMGRelax6HybridSSOR(A, f, cf_marker, relax_points,
+                                         relax_weight, omega, u, Vtemp,
+                                         Ztemp);
          break;
 
       case 7: /* Jacobi (uses ParMatvec) */
-         hypre_BoomerAMGRelax7Jacobi(A, f, cf_marker, relax_points, relax_weight, l1_norms, u, Vtemp);
+         hypre_BoomerAMGRelax7Jacobi(A, f, cf_marker, relax_points,
+                                     relax_weight, l1_norms, u, Vtemp);
          break;
 
-      case 8: /* hybrid L1 Symm. Gauss-Seidel */
-         hypre_BoomerAMGRelax8HybridL1SSOR(A, f, cf_marker, relax_points, relax_weight, omega, l1_norms, u, Vtemp, Ztemp);
+      case 8: /* L1 hybrid Symm. Gauss-Seidel */
+      case 88: /* L1 hybrid Symm. Gauss-Seidel (with a convergent l1 term) */
+         hypre_BoomerAMGRelax8HybridL1SSOR(A, f, cf_marker, relax_points,
+                                           relax_weight, omega, l1_norms, u,
+                                           Vtemp, Ztemp);
          break;
 
-      /* Hybrid: Jacobi off-processor, ordered Gauss-Seidel on-processor */
-      case 10:
-         hypre_BoomerAMGRelax10TopoOrderedGaussSeidel(A, f, cf_marker, relax_points, relax_weight, omega, u, Vtemp, Ztemp);
+      case 10: /* Hybrid: Jacobi off-processor, ordered Gauss-Seidel on-processor */
+         hypre_BoomerAMGRelax10TopoOrderedGaussSeidel(A, f, cf_marker, relax_points,
+                                                      relax_weight, omega, u,
+                                                      Vtemp, Ztemp);
          break;
 
       case 11: /* Two Stage Gauss Seidel. Forward sweep only */
-         hypre_BoomerAMGRelax11TwoStageGaussSeidel(A, f, cf_marker, relax_points, relax_weight, omega, u, Vtemp, Ztemp);
+         hypre_BoomerAMGRelax11TwoStageGaussSeidel(A, f, cf_marker, relax_points,
+                                                   relax_weight, omega, l1_norms, u,
+                                                   Vtemp, Ztemp);
          break;
 
       case 12: /* Two Stage Gauss Seidel. Uses the diagonal matrix for the GS part */
-         hypre_BoomerAMGRelax12TwoStageGaussSeidel(A, f, cf_marker, relax_points, relax_weight, omega, u, Vtemp, Ztemp);
+         hypre_BoomerAMGRelax12TwoStageGaussSeidel(A, f, cf_marker, relax_points,
+                                                   relax_weight, omega, l1_norms, u,
+                                                   Vtemp, Ztemp);
          break;
 
       case 13: /* hybrid L1 Gauss-Seidel forward solve */
-         hypre_BoomerAMGRelax13HybridL1GaussSeidel(A, f, cf_marker, relax_points, relax_weight, omega, l1_norms, u, Vtemp, Ztemp);
+         hypre_BoomerAMGRelax13HybridL1GaussSeidel(A, f, cf_marker, relax_points,
+                                                   relax_weight, omega, l1_norms, u,
+                                                   Vtemp, Ztemp);
          break;
 
       case 14: /* hybrid L1 Gauss-Seidel backward solve */
-         hypre_BoomerAMGRelax14HybridL1GaussSeidel(A, f, cf_marker, relax_points, relax_weight, omega, l1_norms, u, Vtemp, Ztemp);
+         hypre_BoomerAMGRelax14HybridL1GaussSeidel(A, f, cf_marker, relax_points,
+                                                   relax_weight, omega, l1_norms, u,
+                                                   Vtemp, Ztemp);
          break;
 
       case 18: /* weighted L1 Jacobi */
-         hypre_BoomerAMGRelax18WeightedL1Jacobi(A, f, cf_marker, relax_points, relax_weight, l1_norms, u, Vtemp);
-         break;
-
-      case 19: /* Direct solve: use gaussian elimination */
-         relax_error = hypre_BoomerAMGRelax19GaussElim(A, f, u);
+         hypre_BoomerAMGRelax18WeightedL1Jacobi(A, f, cf_marker, relax_points,
+                                                relax_weight, l1_norms, u,
+                                                Vtemp);
          break;
 
-      case 20: /* Kaczmarz */
+      case 30: /* Kaczmarz */
          hypre_BoomerAMGRelaxKaczmarz(A, f, omega, l1_norms, u);
          break;
 
-      case 98: /* Direct solve: use gaussian elimination & BLAS (with pivoting) */
-         relax_error = hypre_BoomerAMGRelax98GaussElimPivot(A, f, u);
+      case 89: /* L1 Symm. hybrid Gauss-Seidel */
+         hypre_BoomerAMGRelax89HybridL1SSOR(A, f, cf_marker, relax_points,
+                                            relax_weight, omega, l1_norms, u,
+                                            Vtemp, Ztemp);
          break;
    }
 
+   hypre_ParVectorAllZeros(u) = 0;
+
    return relax_error;
 }
 
+/*--------------------------------------------------------------------
+ * hypre_BoomerAMGRelaxWeightedJacobi_core
+ *--------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_BoomerAMGRelaxWeightedJacobi_core( hypre_ParCSRMatrix *A,
                                          hypre_ParVector    *f,
@@ -190,7 +213,15 @@ hypre_BoomerAMGRelaxWeightedJacobi_core( hypre_ParCSRMatrix *A,
    HYPRE_Complex        res;
 
    HYPRE_Int num_procs, my_id, i, j, ii, jj, index, num_sends, start;
-   hypre_ParCSRCommHandle *comm_handle;
+   hypre_ParCSRCommHandle *comm_handle = NULL;
+
+   /* Sanity check */
+   if (hypre_ParVectorNumVectors(f) > 1)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                        "Jacobi relaxation doesn't support multicomponent vectors");
+      return hypre_error_flag;
+   }
 
    hypre_MPI_Comm_size(comm, &num_procs);
    hypre_MPI_Comm_rank(comm, &my_id);
@@ -198,14 +229,15 @@ hypre_BoomerAMGRelaxWeightedJacobi_core( hypre_ParCSRMatrix *A,
    if (num_procs > 1)
    {
       num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
-      v_buf_data = hypre_CTAlloc(HYPRE_Real, hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends), HYPRE_MEMORY_HOST);
+      v_buf_data = hypre_CTAlloc(HYPRE_Real, hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                                 HYPRE_MEMORY_HOST);
       v_ext_data = hypre_CTAlloc(HYPRE_Real, num_cols_offd, HYPRE_MEMORY_HOST);
 
       index = 0;
       for (i = 0; i < num_sends; i++)
       {
          start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
          {
             v_buf_data[index++] = u_data[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
          }
@@ -218,7 +250,7 @@ hypre_BoomerAMGRelaxWeightedJacobi_core( hypre_ParCSRMatrix *A,
     * Copy current approximation into temporary vector.
     *-----------------------------------------------------------------*/
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
    for (i = 0; i < num_rows; i++)
    {
@@ -235,7 +267,7 @@ hypre_BoomerAMGRelaxWeightedJacobi_core( hypre_ParCSRMatrix *A,
     * Relax all points.
     *-----------------------------------------------------------------*/
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i,ii,jj,res) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i,ii,jj,res) HYPRE_SMP_SCHEDULE
 #endif
    for (i = 0; i < num_rows; i++)
    {
@@ -249,12 +281,12 @@ hypre_BoomerAMGRelaxWeightedJacobi_core( hypre_ParCSRMatrix *A,
       if ( (relax_points == 0 || cf_marker[i] == relax_points) && di != zero )
       {
          res = f_data[i];
-         for (jj = A_diag_i[i] + Skip_diag; jj < A_diag_i[i+1]; jj++)
+         for (jj = A_diag_i[i] + Skip_diag; jj < A_diag_i[i + 1]; jj++)
          {
             ii = A_diag_j[jj];
             res -= A_diag_data[jj] * Vtemp_data[ii];
          }
-         for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+         for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
          {
             ii = A_offd_j[jj];
             res -= A_offd_data[jj] * v_ext_data[ii];
@@ -281,6 +313,10 @@ hypre_BoomerAMGRelaxWeightedJacobi_core( hypre_ParCSRMatrix *A,
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------
+ * hypre_BoomerAMGRelax0WeightedJacobi
+ *--------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_BoomerAMGRelax0WeightedJacobi( hypre_ParCSRMatrix *A,
                                      hypre_ParVector    *f,
@@ -290,9 +326,14 @@ hypre_BoomerAMGRelax0WeightedJacobi( hypre_ParCSRMatrix *A,
                                      hypre_ParVector    *u,
                                      hypre_ParVector    *Vtemp )
 {
-   return hypre_BoomerAMGRelaxWeightedJacobi_core(A, f, cf_marker, relax_points, relax_weight, NULL, u, Vtemp, 1);
+   return hypre_BoomerAMGRelaxWeightedJacobi_core(A, f, cf_marker, relax_points, relax_weight, NULL, u,
+                                                  Vtemp, 1);
 }
 
+/*--------------------------------------------------------------------
+ * hypre_BoomerAMGRelax18WeightedL1Jacobi
+ *--------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_BoomerAMGRelax18WeightedL1Jacobi( hypre_ParCSRMatrix *A,
                                         hypre_ParVector    *f,
@@ -303,10 +344,9 @@ hypre_BoomerAMGRelax18WeightedL1Jacobi( hypre_ParCSRMatrix *A,
                                         hypre_ParVector    *u,
                                         hypre_ParVector    *Vtemp )
 {
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-   //HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy2( hypre_ParCSRMatrixMemoryLocation(A), hypre_VectorMemoryLocation(f) );
-   //RL: TODO back to hypre_GetExecPolicy2 later
-   HYPRE_ExecutionPolicy exec = HYPRE_EXEC_DEVICE;
+#if defined(HYPRE_USING_GPU)
+   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy2( hypre_ParCSRMatrixMemoryLocation(A),
+                                                      hypre_ParVectorMemoryLocation(f) );
    if (exec == HYPRE_EXEC_DEVICE)
    {
       // XXX GPU calls Relax7 XXX
@@ -322,11 +362,16 @@ hypre_BoomerAMGRelax18WeightedL1Jacobi( hypre_ParCSRMatrix *A,
       }
       else
       {
-         return hypre_BoomerAMGRelaxWeightedJacobi_core(A, f, cf_marker, relax_points, relax_weight, l1_norms, u, Vtemp, 0);
+         return hypre_BoomerAMGRelaxWeightedJacobi_core(A, f, cf_marker, relax_points, relax_weight,
+                                                        l1_norms, u, Vtemp, 0);
       }
    }
 }
 
+/*--------------------------------------------------------------------
+ * hypre_BoomerAMGRelax1GaussSeidel
+ *--------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_BoomerAMGRelax1GaussSeidel( hypre_ParCSRMatrix *A,
                                   hypre_ParVector    *f,
@@ -355,9 +400,20 @@ hypre_BoomerAMGRelax1GaussSeidel( hypre_ParCSRMatrix *A,
    HYPRE_Complex        zero          = 0.0;
    HYPRE_Complex        res;
 
-   HYPRE_Int num_procs, my_id, i, j, ii, jj, p, jr, ip, num_sends, num_recvs, vec_start, vec_len;
-   hypre_MPI_Status *status;
-   hypre_MPI_Request *requests;
+   hypre_MPI_Status    *status        = NULL;
+   hypre_MPI_Request   *requests      = NULL;
+   HYPRE_Int            num_procs, my_id, i, j, ii, jj, p, jr, ip;
+   HYPRE_Int            vec_start, vec_len;
+   HYPRE_Int            num_sends = 0;
+   HYPRE_Int            num_recvs = 0;
+
+   /* Sanity check */
+   if (hypre_ParVectorNumVectors(f) > 1)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                        "GS (1) relaxation doesn't support multicomponent vectors");
+      return hypre_error_flag;
+   }
 
    hypre_MPI_Comm_size(comm, &num_procs);
    hypre_MPI_Comm_rank(comm, &my_id);
@@ -367,11 +423,13 @@ hypre_BoomerAMGRelax1GaussSeidel( hypre_ParCSRMatrix *A,
       num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
       num_recvs = hypre_ParCSRCommPkgNumRecvs(comm_pkg);
 
-      v_buf_data = hypre_CTAlloc(HYPRE_Real, hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends), HYPRE_MEMORY_HOST);
-      v_ext_data = hypre_CTAlloc(HYPRE_Real, num_cols_offd, HYPRE_MEMORY_HOST);
+      v_buf_data = hypre_CTAlloc(HYPRE_Complex,
+                                 hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                                 HYPRE_MEMORY_HOST);
+      v_ext_data = hypre_CTAlloc(HYPRE_Complex, num_cols_offd, HYPRE_MEMORY_HOST);
 
-      status = hypre_CTAlloc(hypre_MPI_Status, num_recvs+num_sends, HYPRE_MEMORY_HOST);
-      requests = hypre_CTAlloc(hypre_MPI_Request, num_recvs+num_sends, HYPRE_MEMORY_HOST);
+      status = hypre_CTAlloc(hypre_MPI_Status, num_recvs + num_sends, HYPRE_MEMORY_HOST);
+      requests = hypre_CTAlloc(hypre_MPI_Request, num_recvs + num_sends, HYPRE_MEMORY_HOST);
    }
 
    /*-----------------------------------------------------------------
@@ -388,12 +446,13 @@ hypre_BoomerAMGRelax1GaussSeidel( hypre_ParCSRMatrix *A,
             if (ip == p)
             {
                vec_start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-               vec_len = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1) - vec_start;
-               for (j = vec_start; j < vec_start+vec_len; j++)
+               vec_len = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1) - vec_start;
+               for (j = vec_start; j < vec_start + vec_len; j++)
                {
-                  v_buf_data[j] = u_data[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+                  v_buf_data[j] = u_data[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
                }
-               hypre_MPI_Isend(&v_buf_data[vec_start], vec_len, HYPRE_MPI_REAL, ip, 0, comm, &requests[jr++]);
+               hypre_MPI_Isend(&v_buf_data[vec_start], vec_len, HYPRE_MPI_COMPLEX, ip, 0,
+                               comm, &requests[jr++]);
             }
          }
          hypre_MPI_Waitall(jr, requests, status);
@@ -406,9 +465,10 @@ hypre_BoomerAMGRelax1GaussSeidel( hypre_ParCSRMatrix *A,
             for (i = 0; i < num_recvs; i++)
             {
                ip = hypre_ParCSRCommPkgRecvProc(comm_pkg, i);
-               vec_start = hypre_ParCSRCommPkgRecvVecStart(comm_pkg,i);
-               vec_len = hypre_ParCSRCommPkgRecvVecStart(comm_pkg,i+1) - vec_start;
-               hypre_MPI_Irecv(&v_ext_data[vec_start], vec_len, HYPRE_MPI_REAL, ip, 0, comm, &requests[jr++]);
+               vec_start = hypre_ParCSRCommPkgRecvVecStart(comm_pkg, i);
+               vec_len = hypre_ParCSRCommPkgRecvVecStart(comm_pkg, i + 1) - vec_start;
+               hypre_MPI_Irecv(&v_ext_data[vec_start], vec_len, HYPRE_MPI_COMPLEX, ip, 0,
+                               comm, &requests[jr++]);
             }
             hypre_MPI_Waitall(jr, requests, status);
          }
@@ -420,15 +480,16 @@ hypre_BoomerAMGRelax1GaussSeidel( hypre_ParCSRMatrix *A,
              * nonzero, relax point i; otherwise, skip it.
              * Relax only C or F points as determined by relax_points.
              *-----------------------------------------------------------*/
-            if ( (relax_points == 0 || cf_marker[i] == relax_points) && A_diag_data[A_diag_i[i]] != zero )
+            if ( (relax_points == 0 || cf_marker[i] == relax_points) &&
+                 A_diag_data[A_diag_i[i]] != zero )
             {
                res = f_data[i];
-               for (jj = A_diag_i[i] + 1; jj < A_diag_i[i+1]; jj++)
+               for (jj = A_diag_i[i] + 1; jj < A_diag_i[i + 1]; jj++)
                {
                   ii = A_diag_j[jj];
                   res -= A_diag_data[jj] * u_data[ii];
                }
-               for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+               for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
                {
                   ii = A_offd_j[jj];
                   res -= A_offd_data[jj] * v_ext_data[ii];
@@ -455,6 +516,10 @@ hypre_BoomerAMGRelax1GaussSeidel( hypre_ParCSRMatrix *A,
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------
+ * hypre_BoomerAMGRelax2GaussSeidel
+ *--------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_BoomerAMGRelax2GaussSeidel( hypre_ParCSRMatrix *A,
                                   hypre_ParVector    *f,
@@ -483,9 +548,20 @@ hypre_BoomerAMGRelax2GaussSeidel( hypre_ParCSRMatrix *A,
    HYPRE_Complex        zero          = 0.0;
    HYPRE_Complex        res;
 
-   HYPRE_Int num_procs, my_id, i, j, ii, jj, p, jr, ip, num_sends, num_recvs, vec_start, vec_len;
-   hypre_MPI_Status *status;
-   hypre_MPI_Request *requests;
+   HYPRE_Int            num_procs, my_id, i, j, ii, jj, p, jr, ip;
+   HYPRE_Int            num_sends = 0;
+   HYPRE_Int            num_recvs = 0;
+   HYPRE_Int            vec_start, vec_len;
+   hypre_MPI_Status    *status = NULL;
+   hypre_MPI_Request   *requests = NULL;
+
+   /* Sanity check */
+   if (hypre_ParVectorNumVectors(f) > 1)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                        "GS (2) relaxation doesn't support multicomponent vectors");
+      return hypre_error_flag;
+   }
 
    hypre_MPI_Comm_size(comm, &num_procs);
    hypre_MPI_Comm_rank(comm, &my_id);
@@ -495,27 +571,31 @@ hypre_BoomerAMGRelax2GaussSeidel( hypre_ParCSRMatrix *A,
       num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
       num_recvs = hypre_ParCSRCommPkgNumRecvs(comm_pkg);
 
-      v_buf_data = hypre_CTAlloc(HYPRE_Real, hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends), HYPRE_MEMORY_HOST);
-      v_ext_data = hypre_CTAlloc(HYPRE_Real, num_cols_offd, HYPRE_MEMORY_HOST);
+      v_buf_data = hypre_CTAlloc(HYPRE_Complex,
+                                 hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                                 HYPRE_MEMORY_HOST);
+      v_ext_data = hypre_CTAlloc(HYPRE_Complex, num_cols_offd, HYPRE_MEMORY_HOST);
 
-      status  = hypre_CTAlloc(hypre_MPI_Status, num_recvs+num_sends, HYPRE_MEMORY_HOST);
-      requests = hypre_CTAlloc(hypre_MPI_Request, num_recvs+num_sends, HYPRE_MEMORY_HOST);
+      status  = hypre_CTAlloc(hypre_MPI_Status, num_recvs + num_sends, HYPRE_MEMORY_HOST);
+      requests = hypre_CTAlloc(hypre_MPI_Request, num_recvs + num_sends, HYPRE_MEMORY_HOST);
    }
 
    /*-----------------------------------------------------------------
     * Relax interior points first
     *-----------------------------------------------------------------*/
+
    for (i = 0; i < num_rows; i++)
    {
       /*-----------------------------------------------------------
        * If i is of the right type ( C or F or All ) and diagonal is
        * nonzero, relax point i; otherwise, skip it.
        *-----------------------------------------------------------*/
-      if ( (relax_points == 0 || cf_marker[i] == relax_points) && A_offd_i[i+1] - A_offd_i[i] == zero &&
-            A_diag_data[A_diag_i[i]] != zero )
+      if ( (relax_points == 0 || cf_marker[i] == relax_points) &&
+           (A_offd_i[i + 1] - A_offd_i[i] == zero) &&
+           (A_diag_data[A_diag_i[i]] != zero) )
       {
          res = f_data[i];
-         for (jj = A_diag_i[i] + 1; jj < A_diag_i[i+1]; jj++)
+         for (jj = A_diag_i[i] + 1; jj < A_diag_i[i + 1]; jj++)
          {
             ii = A_diag_j[jj];
             res -= A_diag_data[jj] * u_data[ii];
@@ -535,12 +615,13 @@ hypre_BoomerAMGRelax2GaussSeidel( hypre_ParCSRMatrix *A,
             if (ip == p)
             {
                vec_start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-               vec_len = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1) - vec_start;
-               for (j = vec_start; j < vec_start+vec_len; j++)
+               vec_len = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1) - vec_start;
+               for (j = vec_start; j < vec_start + vec_len; j++)
                {
-                  v_buf_data[j] = u_data[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+                  v_buf_data[j] = u_data[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
                }
-               hypre_MPI_Isend(&v_buf_data[vec_start], vec_len, HYPRE_MPI_REAL, ip, 0, comm, &requests[jr++]);
+               hypre_MPI_Isend(&v_buf_data[vec_start], vec_len, HYPRE_MPI_COMPLEX, ip, 0,
+                               comm, &requests[jr++]);
             }
          }
          hypre_MPI_Waitall(jr, requests, status);
@@ -553,12 +634,14 @@ hypre_BoomerAMGRelax2GaussSeidel( hypre_ParCSRMatrix *A,
             for (i = 0; i < num_recvs; i++)
             {
                ip = hypre_ParCSRCommPkgRecvProc(comm_pkg, i);
-               vec_start = hypre_ParCSRCommPkgRecvVecStart(comm_pkg,i);
-               vec_len = hypre_ParCSRCommPkgRecvVecStart(comm_pkg,i+1) - vec_start;
-               hypre_MPI_Irecv(&v_ext_data[vec_start], vec_len, HYPRE_MPI_REAL, ip, 0, comm, &requests[jr++]);
+               vec_start = hypre_ParCSRCommPkgRecvVecStart(comm_pkg, i);
+               vec_len = hypre_ParCSRCommPkgRecvVecStart(comm_pkg, i + 1) - vec_start;
+               hypre_MPI_Irecv(&v_ext_data[vec_start], vec_len, HYPRE_MPI_COMPLEX, ip, 0,
+                               comm, &requests[jr++]);
             }
             hypre_MPI_Waitall(jr, requests, status);
          }
+
          for (i = 0; i < num_rows; i++)
          {
             /*-----------------------------------------------------------
@@ -566,16 +649,17 @@ hypre_BoomerAMGRelax2GaussSeidel( hypre_ParCSRMatrix *A,
              * nonzero, relax point i; otherwise, skip it.
              * Relax only C or F points as determined by relax_points.
              *-----------------------------------------------------------*/
-            if ( (relax_points == 0 || cf_marker[i] == relax_points) && A_offd_i[i+1] - A_offd_i[i] != zero &&
-                  A_diag_data[A_diag_i[i]] != zero)
+            if ( (relax_points == 0 || cf_marker[i] == relax_points) &&
+                 (A_offd_i[i + 1] - A_offd_i[i] != zero) &&
+                 (A_diag_data[A_diag_i[i]] != zero) )
             {
                res = f_data[i];
-               for (jj = A_diag_i[i]+1; jj < A_diag_i[i+1]; jj++)
+               for (jj = A_diag_i[i] + 1; jj < A_diag_i[i + 1]; jj++)
                {
                   ii = A_diag_j[jj];
                   res -= A_diag_data[jj] * u_data[ii];
                }
-               for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+               for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
                {
                   ii = A_offd_j[jj];
                   res -= A_offd_data[jj] * v_ext_data[ii];
@@ -600,6 +684,10 @@ hypre_BoomerAMGRelax2GaussSeidel( hypre_ParCSRMatrix *A,
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------
+ * hypre_BoomerAMGRelaxHybridGaussSeidel_core
+ *--------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_BoomerAMGRelaxHybridGaussSeidel_core( hypre_ParCSRMatrix *A,
                                             hypre_ParVector    *f,
@@ -617,6 +705,8 @@ hypre_BoomerAMGRelaxHybridGaussSeidel_core( hypre_ParCSRMatrix *A,
                                             HYPRE_Int           forced_seq,
                                             HYPRE_Int           Topo_order )
 {
+   HYPRE_UNUSED_VAR(Ztemp);
+
    MPI_Comm             comm          = hypre_ParCSRMatrixComm(A);
    hypre_CSRMatrix     *A_diag        = hypre_ParCSRMatrixDiag(A);
    HYPRE_Real          *A_diag_data   = hypre_CSRMatrixData(A_diag);
@@ -628,7 +718,6 @@ hypre_BoomerAMGRelaxHybridGaussSeidel_core( hypre_ParCSRMatrix *A,
    HYPRE_Int           *A_offd_j      = hypre_CSRMatrixJ(A_offd);
    hypre_ParCSRCommPkg *comm_pkg      = hypre_ParCSRMatrixCommPkg(A);
    HYPRE_Int            num_rows      = hypre_CSRMatrixNumRows(A_diag);
-   HYPRE_Int            num_cols_offd = hypre_CSRMatrixNumCols(A_offd);
    hypre_Vector        *u_local       = hypre_ParVectorLocalVector(u);
    HYPRE_Complex       *u_data        = hypre_VectorData(u_local);
    hypre_Vector        *f_local       = hypre_ParVectorLocalVector(f);
@@ -646,12 +735,26 @@ hypre_BoomerAMGRelaxHybridGaussSeidel_core( hypre_ParCSRMatrix *A,
    const HYPRE_Real     one_minus_omega  = 1.0 - omega;
    HYPRE_Int            num_procs, my_id, num_threads, j, num_sends;
 
-   hypre_ParCSRCommHandle *comm_handle;
+#if defined(HYPRE_USING_PERSISTENT_COMM)
+   // JSP: persistent comm can be similarly used for other smoothers
+   hypre_ParCSRPersistentCommHandle *persistent_comm_handle;
+#else
+   hypre_ParCSRCommHandle           *comm_handle;
+   HYPRE_Int                         num_cols_offd = hypre_CSRMatrixNumCols(A_offd);
+#endif
 
    hypre_MPI_Comm_size(comm, &num_procs);
    hypre_MPI_Comm_rank(comm, &my_id);
    num_threads = forced_seq ? 1 : hypre_NumThreads();
 
+   /* Sanity check */
+   if (hypre_ParVectorNumVectors(f) > 1)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                        "Hybrid GS relaxation doesn't support multicomponent vectors");
+      return hypre_error_flag;
+   }
+
    /* GS order: forward or backward */
    const HYPRE_Int gs_order = GS_order > 0 ? 1 : -1;
    /* for symmetric GS, a forward followed by a backward */
@@ -669,11 +772,6 @@ hypre_BoomerAMGRelaxHybridGaussSeidel_core( hypre_ParCSRMatrix *A,
    }
    */
 
-#if defined(HYPRE_USING_PERSISTENT_COMM)
-   // JSP: persistent comm can be similarly used for other smoothers
-   hypre_ParCSRPersistentCommHandle *persistent_comm_handle;
-#endif
-
    if (num_procs > 1)
    {
 #ifdef HYPRE_PROFILE
@@ -691,16 +789,18 @@ hypre_BoomerAMGRelaxHybridGaussSeidel_core( hypre_ParCSRMatrix *A,
 #if defined(HYPRE_USING_PERSISTENT_COMM)
       persistent_comm_handle = hypre_ParCSRCommPkgGetPersistentCommHandle(1, comm_pkg);
       v_buf_data = (HYPRE_Real *) hypre_ParCSRCommHandleSendDataBuffer(persistent_comm_handle);
-      v_ext_data  = (HYPRE_Real *) hypre_ParCSRCommHandleRecvDataBuffer(persistent_comm_handle);
+      v_ext_data = (HYPRE_Real *) hypre_ParCSRCommHandleRecvDataBuffer(persistent_comm_handle);
 #else
-      v_buf_data = hypre_CTAlloc(HYPRE_Real, hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends), HYPRE_MEMORY_HOST);
+      v_buf_data = hypre_CTAlloc(HYPRE_Real,
+                                 hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                                 HYPRE_MEMORY_HOST);
       v_ext_data = hypre_CTAlloc(HYPRE_Real, num_cols_offd, HYPRE_MEMORY_HOST);
 #endif
 
       HYPRE_Int begin = hypre_ParCSRCommPkgSendMapStart(comm_pkg, 0);
       HYPRE_Int end   = hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends);
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for HYPRE_SMP_SCHEDULE
 #endif
       for (j = begin; j < end; j++)
       {
@@ -723,7 +823,6 @@ hypre_BoomerAMGRelaxHybridGaussSeidel_core( hypre_ParCSRMatrix *A,
 #else
       hypre_ParCSRCommHandleDestroy(comm_handle);
 #endif
-      comm_handle = NULL;
 
 #ifdef HYPRE_PROFILE
       hypre_profile_times[HYPRE_TIMER_ID_HALO_EXCHANGE] += hypre_MPI_Wtime();
@@ -758,7 +857,7 @@ hypre_BoomerAMGRelaxHybridGaussSeidel_core( hypre_ParCSRMatrix *A,
    if ( (num_threads > 1 || !non_scale) && Vtemp_data )
    {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(j) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(j) HYPRE_SMP_SCHEDULE
 #endif
       for (j = 0; j < num_rows; j++)
       {
@@ -769,7 +868,7 @@ hypre_BoomerAMGRelaxHybridGaussSeidel_core( hypre_ParCSRMatrix *A,
    if (num_threads > 1)
    {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(j) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(j) HYPRE_SMP_SCHEDULE
 #endif
       for (j = 0; j < num_threads; j++)
       {
@@ -845,7 +944,12 @@ hypre_BoomerAMGRelaxHybridGaussSeidel_core( hypre_ParCSRMatrix *A,
    return hypre_error_flag;
 }
 
-/* forward hybrid G-S */
+/*--------------------------------------------------------------------
+ * hypre_BoomerAMGRelax3HybridGaussSeidel
+ *
+ * forward hybrid GS
+ *--------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_BoomerAMGRelax3HybridGaussSeidel( hypre_ParCSRMatrix *A,
                                         hypre_ParVector    *f,
@@ -857,37 +961,17 @@ hypre_BoomerAMGRelax3HybridGaussSeidel( hypre_ParCSRMatrix *A,
                                         hypre_ParVector    *Vtemp,
                                         hypre_ParVector    *Ztemp )
 {
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-   //HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy2( hypre_ParCSRMatrixMemoryLocation(A), hypre_VectorMemoryLocation(f) );
-   //RL: TODO back to hypre_GetExecPolicy2 later
-   HYPRE_ExecutionPolicy exec = HYPRE_EXEC_DEVICE;
-   // TODO implement CF relax on GPUs
-   if (relax_points != 0)
-   {
-      exec = HYPRE_EXEC_HOST;
-   }
-
-#if defined(HYPRE_USING_GPU)
-   if (hypre_HandleDeviceGSMethod(hypre_handle()) == 0)
-   {
-      exec = HYPRE_EXEC_HOST;
-   }
-#endif
-
-   if (exec == HYPRE_EXEC_DEVICE)
-   {
-      return hypre_BoomerAMGRelaxHybridGaussSeidelDevice(A, f, cf_marker, relax_points, relax_weight, omega, NULL, u, Vtemp, Ztemp,
-                                                         1 /* forward */,  0 /* nonsymm */);
-   }
-   else
-#endif
-   {
-      return hypre_BoomerAMGRelaxHybridGaussSeidel_core(A, f, cf_marker, relax_points, relax_weight, omega, NULL, u, Vtemp, Ztemp,
-                                                        1 /* forward */,  0 /* nonsymm */, 1 /* skip diag */, 0, 0);
-   }
+   return hypre_BoomerAMGRelaxHybridSOR(A, f, cf_marker, relax_points, relax_weight,
+                                        omega, NULL, u, Vtemp, Ztemp,
+                                        1, 0, 1, 0);
 }
 
-/* backward hybrid G-S */
+/*--------------------------------------------------------------------
+ * hypre_BoomerAMGRelax4HybridGaussSeidel
+ *
+ * backward hybrid GS
+ *--------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_BoomerAMGRelax4HybridGaussSeidel( hypre_ParCSRMatrix *A,
                                         hypre_ParVector    *f,
@@ -899,37 +983,17 @@ hypre_BoomerAMGRelax4HybridGaussSeidel( hypre_ParCSRMatrix *A,
                                         hypre_ParVector    *Vtemp,
                                         hypre_ParVector    *Ztemp )
 {
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-   //HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy2( hypre_ParCSRMatrixMemoryLocation(A), hypre_VectorMemoryLocation(f) );
-   //RL: TODO back to hypre_GetExecPolicy2 later
-   HYPRE_ExecutionPolicy exec = HYPRE_EXEC_DEVICE;
-   // TODO implement CF relax on GPUs
-   if (relax_points != 0)
-   {
-      exec = HYPRE_EXEC_HOST;
-   }
-
-#if defined(HYPRE_USING_GPU)
-   if (hypre_HandleDeviceGSMethod(hypre_handle()) == 0)
-   {
-      exec = HYPRE_EXEC_HOST;
-   }
-#endif
-
-   if (exec == HYPRE_EXEC_DEVICE)
-   {
-      return hypre_BoomerAMGRelaxHybridGaussSeidelDevice(A, f, cf_marker, relax_points, relax_weight, omega, NULL, u, Vtemp, Ztemp,
-                                                         -1 /* backward */,  0 /* nonsymm */);
-   }
-   else
-#endif
-   {
-      return hypre_BoomerAMGRelaxHybridGaussSeidel_core(A, f, cf_marker, relax_points, relax_weight, omega, NULL, u, Vtemp, Ztemp,
-                                                        -1 /* backward */, 0 /* nosymm */, 1 /* skip diag */, 0, 0);
-   }
+   return hypre_BoomerAMGRelaxHybridSOR(A, f, cf_marker, relax_points, relax_weight,
+                                        omega, NULL, u, Vtemp, Ztemp,
+                                        -1, 0, 1, 0);
 }
 
-/* chaotic forward G-S */
+/*--------------------------------------------------------------------
+ * hypre_BoomerAMGRelax5ChaoticHybridGaussSeidel
+ *
+ * chaotic forward GS
+ *--------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_BoomerAMGRelax5ChaoticHybridGaussSeidel( hypre_ParCSRMatrix *A,
                                                hypre_ParVector    *f,
@@ -962,22 +1026,31 @@ hypre_BoomerAMGRelax5ChaoticHybridGaussSeidel( hypre_ParCSRMatrix *A,
    HYPRE_Int num_procs, my_id, i, j, ii, jj, index, num_sends, start;
    hypre_ParCSRCommHandle *comm_handle;
 
+   /* Sanity check */
+   if (hypre_ParVectorNumVectors(f) > 1)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                        "Chaotic GS relaxation doesn't support multicomponent vectors");
+      return hypre_error_flag;
+   }
+
    hypre_MPI_Comm_size(comm, &num_procs);
    hypre_MPI_Comm_rank(comm, &my_id);
 
    if (num_procs > 1)
    {
       num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
-      v_buf_data = hypre_CTAlloc(HYPRE_Real, hypre_ParCSRCommPkgSendMapStart(comm_pkg,  num_sends), HYPRE_MEMORY_HOST);
+      v_buf_data = hypre_CTAlloc(HYPRE_Real, hypre_ParCSRCommPkgSendMapStart(comm_pkg,  num_sends),
+                                 HYPRE_MEMORY_HOST);
       v_ext_data = hypre_CTAlloc(HYPRE_Real, num_cols_offd, HYPRE_MEMORY_HOST);
 
       index = 0;
       for (i = 0; i < num_sends; i++)
       {
          start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg,i+1); j++)
+         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
          {
-            v_buf_data[index++] = u_data[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+            v_buf_data[index++] = u_data[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
          }
       }
 
@@ -991,7 +1064,7 @@ hypre_BoomerAMGRelax5ChaoticHybridGaussSeidel( hypre_ParCSRMatrix *A,
    }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i,ii,jj,res) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i,ii,jj,res) HYPRE_SMP_SCHEDULE
 #endif
    for (i = 0; i < num_rows; i++)
    {
@@ -1003,12 +1076,12 @@ hypre_BoomerAMGRelax5ChaoticHybridGaussSeidel( hypre_ParCSRMatrix *A,
       if ( (relax_points == 0 || cf_marker[i] == relax_points) && A_diag_data[A_diag_i[i]] != zero )
       {
          res = f_data[i];
-         for (jj = A_diag_i[i] + 1; jj < A_diag_i[i+1]; jj++)
+         for (jj = A_diag_i[i] + 1; jj < A_diag_i[i + 1]; jj++)
          {
             ii = A_diag_j[jj];
             res -= A_diag_data[jj] * u_data[ii];
          }
-         for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+         for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
          {
             ii = A_offd_j[jj];
             res -= A_offd_data[jj] * v_ext_data[ii];
@@ -1026,48 +1099,81 @@ hypre_BoomerAMGRelax5ChaoticHybridGaussSeidel( hypre_ParCSRMatrix *A,
    return hypre_error_flag;
 }
 
-/* symmetric hybrid G-S */
+/*--------------------------------------------------------------------
+ * hypre_BoomerAMGRelaxHybridSOR
+ *
+ * symmetric hybrid SOR
+ *--------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_BoomerAMGRelax6HybridSSOR( hypre_ParCSRMatrix *A,
-                                 hypre_ParVector    *f,
-                                 HYPRE_Int          *cf_marker,
-                                 HYPRE_Int           relax_points,
-                                 HYPRE_Real          relax_weight,
-                                 HYPRE_Real          omega,
-                                 hypre_ParVector    *u,
-                                 hypre_ParVector    *Vtemp,
-                                 hypre_ParVector    *Ztemp )
+hypre_BoomerAMGRelaxHybridSOR( hypre_ParCSRMatrix *A,
+                               hypre_ParVector    *f,
+                               HYPRE_Int          *cf_marker,
+                               HYPRE_Int           relax_points,
+                               HYPRE_Real          relax_weight,
+                               HYPRE_Real          omega,
+                               HYPRE_Real         *l1_norms,
+                               hypre_ParVector    *u,
+                               hypre_ParVector    *Vtemp,
+                               hypre_ParVector    *Ztemp,
+                               HYPRE_Int           direction,
+                               HYPRE_Int           symm,
+                               HYPRE_Int           skip_diag,
+                               HYPRE_Int           force_seq )
 {
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-   //HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy2( hypre_ParCSRMatrixMemoryLocation(A), hypre_VectorMemoryLocation(f) );
-   //RL: TODO back to hypre_GetExecPolicy2 later
-   HYPRE_ExecutionPolicy exec = HYPRE_EXEC_DEVICE;
+#if defined(HYPRE_USING_GPU)
+   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy2( hypre_ParCSRMatrixMemoryLocation(A),
+                                                      hypre_ParVectorMemoryLocation(f) );
+
    // TODO implement CF relax on GPUs
    if (relax_points != 0)
    {
       exec = HYPRE_EXEC_HOST;
    }
 
-#if defined(HYPRE_USING_GPU)
    if (hypre_HandleDeviceGSMethod(hypre_handle()) == 0)
    {
       exec = HYPRE_EXEC_HOST;
    }
-#endif
 
    if (exec == HYPRE_EXEC_DEVICE)
    {
-      return hypre_BoomerAMGRelaxHybridGaussSeidelDevice(A, f, cf_marker, relax_points, relax_weight, omega, NULL, u, Vtemp, Ztemp,
-                                                         1,  1 /* symm */);
+      return hypre_BoomerAMGRelaxHybridGaussSeidelDevice(A, f, cf_marker, relax_points, relax_weight,
+                                                         omega, l1_norms, u, Vtemp, Ztemp,
+                                                         direction, symm);
    }
    else
 #endif
    {
-      return hypre_BoomerAMGRelaxHybridGaussSeidel_core(A, f, cf_marker, relax_points, relax_weight, omega, NULL, u, Vtemp, Ztemp,
-                                                        1, 1 /* symm */, 1 /* skip diag */, 0, 0);
+      return hypre_BoomerAMGRelaxHybridGaussSeidel_core(A, f, cf_marker, relax_points, relax_weight,
+                                                        omega, l1_norms, u, Vtemp, Ztemp,
+                                                        direction, symm, skip_diag, force_seq, 0);
    }
 }
 
+/*--------------------------------------------------------------------
+ * hypre_BoomerAMGRelax6HybridSSOR
+ *--------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_BoomerAMGRelax6HybridSSOR( hypre_ParCSRMatrix *A,
+                                 hypre_ParVector    *f,
+                                 HYPRE_Int          *cf_marker,
+                                 HYPRE_Int           relax_points,
+                                 HYPRE_Real          relax_weight,
+                                 HYPRE_Real          omega,
+                                 hypre_ParVector    *u,
+                                 hypre_ParVector    *Vtemp,
+                                 hypre_ParVector    *Ztemp )
+{
+   return hypre_BoomerAMGRelaxHybridSOR(A, f, cf_marker, relax_points, relax_weight,
+                                        omega, NULL, u, Vtemp, Ztemp, 1, 1, 1, 0);
+}
+
+/*--------------------------------------------------------------------
+ * hypre_BoomerAMGRelax7Jacobi
+ *--------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_BoomerAMGRelax7Jacobi( hypre_ParCSRMatrix *A,
                              hypre_ParVector    *f,
@@ -1082,8 +1188,14 @@ hypre_BoomerAMGRelax7Jacobi( hypre_ParCSRMatrix *A,
    hypre_Vector    l1_norms_vec;
    hypre_ParVector l1_norms_parvec;
 
+   hypre_GpuProfilingPushRange("Relax7Jacobi");
+
+   hypre_VectorNumVectors(&l1_norms_vec) = 1;
+   hypre_VectorMultiVecStorageMethod(&l1_norms_vec) = 0;
+   hypre_VectorOwnsData(&l1_norms_vec) = 0;
    hypre_VectorData(&l1_norms_vec) = l1_norms;
    hypre_VectorSize(&l1_norms_vec) = num_rows;
+
    /* TODO XXX
     * The next line is NOT 100% correct, which should be the memory location of l1_norms instead of f
     * But how do I know it? As said, don't use raw pointers, don't use raw pointers!
@@ -1092,7 +1204,7 @@ hypre_BoomerAMGRelax7Jacobi( hypre_ParCSRMatrix *A,
    hypre_VectorMemoryLocation(&l1_norms_vec) = hypre_ParVectorMemoryLocation(f);
    hypre_ParVectorLocalVector(&l1_norms_parvec) = &l1_norms_vec;
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
    HYPRE_Int sync_stream;
    hypre_GetSyncCudaCompute(&sync_stream);
    hypre_SetSyncCudaCompute(0);
@@ -1106,7 +1218,18 @@ hypre_BoomerAMGRelax7Jacobi( hypre_ParCSRMatrix *A,
    /*-----------------------------------------------------------------
     * Perform Matvec Vtemp = w * (f - Au)
     *-----------------------------------------------------------------*/
-   hypre_ParCSRMatrixMatvec(-relax_weight, A, u, relax_weight, Vtemp);
+   if (hypre_ParVectorAllZeros(u))
+   {
+#if defined(HYPRE_DEBUG)
+      hypre_assert(hypre_ParVectorInnerProd(u, u) == 0.0);
+      /*hypre_ParPrintf(hypre_ParCSRMatrixComm(A), "A %d: skip a matvec\n", hypre_ParCSRMatrixGlobalNumRows(A));*/
+#endif
+      hypre_ParVectorScale(relax_weight, Vtemp);
+   }
+   else
+   {
+      hypre_ParCSRMatrixMatvec(-relax_weight, A, u, relax_weight, Vtemp);
+   }
 
    /*-----------------------------------------------------------------
     * u += D^{-1} * Vtemp, where D_ii = ||A(i,:)||_1
@@ -1120,15 +1243,22 @@ hypre_BoomerAMGRelax7Jacobi( hypre_ParCSRMatrix *A,
       hypre_ParVectorElmdivpy(Vtemp, &l1_norms_parvec, u);
    }
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
    hypre_SetSyncCudaCompute(sync_stream);
-   hypre_SyncCudaComputeStream(hypre_handle());
+   hypre_SyncComputeStream();
 #endif
 
+   hypre_GpuProfilingPopRange();
+
    return hypre_error_flag;
 }
 
-/* symmetric l1 hybrid G-S */
+/*--------------------------------------------------------------------
+ * hypre_BoomerAMGRelax14HybridL1GaussSeidel
+ *
+ * l1 hybrid symmetric GS
+ *--------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_BoomerAMGRelax8HybridL1SSOR( hypre_ParCSRMatrix *A,
                                    hypre_ParVector    *f,
@@ -1143,37 +1273,43 @@ hypre_BoomerAMGRelax8HybridL1SSOR( hypre_ParCSRMatrix *A,
 {
    const HYPRE_Int skip_diag = relax_weight == 1.0 && omega == 1.0 ? 0 : 1;
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-   //HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy2( hypre_ParCSRMatrixMemoryLocation(A), hypre_VectorMemoryLocation(f) );
-   //RL: TODO back to hypre_GetExecPolicy2 later
-   HYPRE_ExecutionPolicy exec = HYPRE_EXEC_DEVICE;
-   // TODO implement CF relax on GPUs
-   if (relax_points != 0)
-   {
-      exec = HYPRE_EXEC_HOST;
-   }
+   return hypre_BoomerAMGRelaxHybridSOR(A, f, cf_marker, relax_points, relax_weight,
+                                        omega, l1_norms, u, Vtemp, Ztemp, 1, 1, skip_diag, 0);
+}
 
-#if defined(HYPRE_USING_GPU)
-   if (hypre_HandleDeviceGSMethod(hypre_handle()) == 0)
-   {
-      exec = HYPRE_EXEC_HOST;
-   }
-#endif
+/*--------------------------------------------------------------------
+ * hypre_BoomerAMGRelax14HybridL1GaussSeidel
+ *
+ * l1 symmetric hybrid GS
+ *--------------------------------------------------------------------*/
 
-   if (exec == HYPRE_EXEC_DEVICE)
-   {
-      return hypre_BoomerAMGRelaxHybridGaussSeidelDevice(A, f, cf_marker, relax_points, relax_weight, omega, l1_norms, u, Vtemp, Ztemp,
-                                                         1,  1 /* symm */);
-   }
-   else
-#endif
-   {
-      return hypre_BoomerAMGRelaxHybridGaussSeidel_core(A, f, cf_marker, relax_points, relax_weight, omega, l1_norms, u, Vtemp, Ztemp,
-                                                        1, 1 /* symm */, skip_diag, 0, 0);
-   }
+HYPRE_Int
+hypre_BoomerAMGRelax89HybridL1SSOR( hypre_ParCSRMatrix *A,
+                                    hypre_ParVector    *f,
+                                    HYPRE_Int          *cf_marker,
+                                    HYPRE_Int           relax_points,
+                                    HYPRE_Real          relax_weight,
+                                    HYPRE_Real          omega,
+                                    HYPRE_Real         *l1_norms,
+                                    hypre_ParVector    *u,
+                                    hypre_ParVector    *Vtemp,
+                                    hypre_ParVector    *Ztemp )
+{
+   hypre_BoomerAMGRelax13HybridL1GaussSeidel(A, f, cf_marker, relax_points, relax_weight,
+                                             omega, l1_norms, u, Vtemp, Ztemp);
+
+   hypre_BoomerAMGRelax14HybridL1GaussSeidel(A, f, cf_marker, relax_points, relax_weight,
+                                             omega, l1_norms, u, Vtemp, Ztemp);
+
+   return hypre_error_flag;
 }
 
-/* forward hybrid topology ordered G-S */
+/*--------------------------------------------------------------------
+ * hypre_BoomerAMGRelax14HybridL1GaussSeidel
+ *
+ * Forward hybrid topology ordered GS
+ *--------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_BoomerAMGRelax10TopoOrderedGaussSeidel( hypre_ParCSRMatrix *A,
                                               hypre_ParVector    *f,
@@ -1185,11 +1321,17 @@ hypre_BoomerAMGRelax10TopoOrderedGaussSeidel( hypre_ParCSRMatrix *A,
                                               hypre_ParVector    *Vtemp,
                                               hypre_ParVector    *Ztemp )
 {
-   return hypre_BoomerAMGRelaxHybridGaussSeidel_core(A, f, cf_marker, relax_points, relax_weight, omega, NULL, u, Vtemp, Ztemp,
+   return hypre_BoomerAMGRelaxHybridGaussSeidel_core(A, f, cf_marker, relax_points, relax_weight,
+                                                     omega, NULL, u, Vtemp, Ztemp,
                                                      1 /* forward */, 0 /* nonsymm */, 1 /* skip_diag */, 1, 1);
 }
 
-/* forward l1 hybrid G-S */
+/*--------------------------------------------------------------------
+ * hypre_BoomerAMGRelax14HybridL1GaussSeidel
+ *
+ * Forward l1 hybrid GS
+ *--------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_BoomerAMGRelax13HybridL1GaussSeidel( hypre_ParCSRMatrix *A,
                                            hypre_ParVector    *f,
@@ -1204,37 +1346,17 @@ hypre_BoomerAMGRelax13HybridL1GaussSeidel( hypre_ParCSRMatrix *A,
 {
    const HYPRE_Int skip_diag = relax_weight == 1.0 && omega == 1.0 ? 0 : 1;
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-   //HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy2( hypre_ParCSRMatrixMemoryLocation(A), hypre_VectorMemoryLocation(f) );
-   //RL: TODO back to hypre_GetExecPolicy2 later
-   HYPRE_ExecutionPolicy exec = HYPRE_EXEC_DEVICE;
-   // TODO implement CF relax on GPUs
-   if (relax_points != 0)
-   {
-      exec = HYPRE_EXEC_HOST;
-   }
-
-#if defined(HYPRE_USING_GPU)
-   if (hypre_HandleDeviceGSMethod(hypre_handle()) == 0)
-   {
-      exec = HYPRE_EXEC_HOST;
-   }
-#endif
-
-   if (exec == HYPRE_EXEC_DEVICE)
-   {
-      return hypre_BoomerAMGRelaxHybridGaussSeidelDevice(A, f, cf_marker, relax_points, relax_weight, omega, l1_norms, u, Vtemp, Ztemp,
-                                                         1,  0 /* nonsymm */);
-   }
-   else
-#endif
-   {
-      return hypre_BoomerAMGRelaxHybridGaussSeidel_core(A, f, cf_marker, relax_points, relax_weight, omega, l1_norms, u, Vtemp, Ztemp,
-                                                        1 /* forward */, 0 /* nonsymm */, skip_diag, 0, 0 );
-   }
+   return hypre_BoomerAMGRelaxHybridSOR(A, f, cf_marker, relax_points, relax_weight,
+                                        omega, l1_norms, u, Vtemp, Ztemp,
+                                        1,  0, skip_diag, 0);
 }
 
-/* backward l1 hybrid G-S */
+/*--------------------------------------------------------------------
+ * hypre_BoomerAMGRelax14HybridL1GaussSeidel
+ *
+ * Backward l1 hybrid GS
+ *--------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_BoomerAMGRelax14HybridL1GaussSeidel( hypre_ParCSRMatrix *A,
                                            hypre_ParVector    *f,
@@ -1249,199 +1371,14 @@ hypre_BoomerAMGRelax14HybridL1GaussSeidel( hypre_ParCSRMatrix *A,
 {
    const HYPRE_Int skip_diag = relax_weight == 1.0 && omega == 1.0 ? 0 : 1;
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-   //HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy2( hypre_ParCSRMatrixMemoryLocation(A), hypre_VectorMemoryLocation(f) );
-   //RL: TODO back to hypre_GetExecPolicy2 later
-   HYPRE_ExecutionPolicy exec = HYPRE_EXEC_DEVICE;
-   // TODO implement CF relax on GPUs
-   if (relax_points != 0)
-   {
-      exec = HYPRE_EXEC_HOST;
-   }
-
-#if defined(HYPRE_USING_GPU)
-   if (hypre_HandleDeviceGSMethod(hypre_handle()) == 0)
-   {
-      exec = HYPRE_EXEC_HOST;
-   }
-#endif
-
-   if (exec == HYPRE_EXEC_DEVICE)
-   {
-      return hypre_BoomerAMGRelaxHybridGaussSeidelDevice(A, f, cf_marker, relax_points, relax_weight, omega, l1_norms, u, Vtemp, Ztemp,
-                                                         -1,  0 /* nonsymm */);
-   }
-   else
-#endif
-   {
-      return hypre_BoomerAMGRelaxHybridGaussSeidel_core(A, f, cf_marker, relax_points, relax_weight, omega, l1_norms, u, Vtemp, Ztemp,
-                                                        -1 /* backward */, 0 /* nonsymm */, skip_diag, 0, 0 );
-   }
-}
-
-HYPRE_Int
-hypre_BoomerAMGRelax19GaussElim( hypre_ParCSRMatrix *A,
-                                 hypre_ParVector    *f,
-                                 hypre_ParVector    *u )
-{
-   HYPRE_BigInt     global_num_rows = hypre_ParCSRMatrixGlobalNumRows(A);
-   HYPRE_BigInt     first_ind       = hypre_ParVectorFirstIndex(u);
-   HYPRE_Int        n_global        = (HYPRE_Int) global_num_rows;
-   HYPRE_Int        first_index     = (HYPRE_Int) first_ind;
-   HYPRE_Int        num_rows        = hypre_ParCSRMatrixNumRows(A);
-   hypre_Vector    *u_local         = hypre_ParVectorLocalVector(u);
-   HYPRE_Complex   *u_data          = hypre_VectorData(u_local);
-   hypre_CSRMatrix *A_CSR;
-   HYPRE_Int       *A_CSR_i;
-   HYPRE_Int       *A_CSR_j;
-   HYPRE_Real      *A_CSR_data;
-   hypre_Vector    *f_vector;
-   HYPRE_Real      *f_vector_data;
-   HYPRE_Real      *A_mat;
-   HYPRE_Real      *b_vec;
-   HYPRE_Int        i, jj, column, relax_error = 0;
-
-   /*-----------------------------------------------------------------
-    *  Generate CSR matrix from ParCSRMatrix A
-    *-----------------------------------------------------------------*/
-   /* all processors are needed for these routines */
-   A_CSR = hypre_ParCSRMatrixToCSRMatrixAll(A);
-   f_vector = hypre_ParVectorToVectorAll(f);
-   if (num_rows)
-   {
-      A_CSR_i = hypre_CSRMatrixI(A_CSR);
-      A_CSR_j = hypre_CSRMatrixJ(A_CSR);
-      A_CSR_data = hypre_CSRMatrixData(A_CSR);
-      f_vector_data = hypre_VectorData(f_vector);
-
-      A_mat = hypre_CTAlloc(HYPRE_Real, n_global*n_global, HYPRE_MEMORY_HOST);
-      b_vec = hypre_CTAlloc(HYPRE_Real, n_global, HYPRE_MEMORY_HOST);
-
-      /*---------------------------------------------------------------
-       *  Load CSR matrix into A_mat.
-       *---------------------------------------------------------------*/
-      for (i = 0; i < n_global; i++)
-      {
-         for (jj = A_CSR_i[i]; jj < A_CSR_i[i+1]; jj++)
-         {
-            column = A_CSR_j[jj];
-            A_mat[i*n_global+column] = A_CSR_data[jj];
-         }
-         b_vec[i] = f_vector_data[i];
-      }
-
-      hypre_gselim(A_mat, b_vec, n_global, relax_error);
-
-      for (i = 0; i < num_rows; i++)
-      {
-         u_data[i] = b_vec[first_index + i];
-      }
-
-      hypre_TFree(A_mat, HYPRE_MEMORY_HOST);
-      hypre_TFree(b_vec, HYPRE_MEMORY_HOST);
-      hypre_CSRMatrixDestroy(A_CSR);
-      A_CSR = NULL;
-      hypre_SeqVectorDestroy(f_vector);
-      f_vector = NULL;
-   }
-   else
-   {
-      hypre_CSRMatrixDestroy(A_CSR);
-      A_CSR = NULL;
-      hypre_SeqVectorDestroy(f_vector);
-      f_vector = NULL;
-   }
-
-   return relax_error;
+   return hypre_BoomerAMGRelaxHybridSOR(A, f, cf_marker, relax_points, relax_weight,
+                                        omega, l1_norms, u, Vtemp, Ztemp,
+                                        -1, 0, skip_diag, 0);
 }
 
-HYPRE_Int
-hypre_BoomerAMGRelax98GaussElimPivot( hypre_ParCSRMatrix *A,
-                                      hypre_ParVector    *f,
-                                      hypre_ParVector    *u )
-{
-   HYPRE_BigInt     global_num_rows = hypre_ParCSRMatrixGlobalNumRows(A);
-   HYPRE_BigInt     first_ind       = hypre_ParVectorFirstIndex(u);
-   HYPRE_Int        n_global        = (HYPRE_Int) global_num_rows;
-   HYPRE_Int        first_index     = (HYPRE_Int) first_ind;
-   HYPRE_Int        num_rows        = hypre_ParCSRMatrixNumRows(A);
-   hypre_Vector    *u_local         = hypre_ParVectorLocalVector(u);
-   HYPRE_Complex   *u_data          = hypre_VectorData(u_local);
-   hypre_CSRMatrix *A_CSR;
-   HYPRE_Int       *A_CSR_i;
-   HYPRE_Int       *A_CSR_j;
-   HYPRE_Real      *A_CSR_data;
-   hypre_Vector    *f_vector;
-   HYPRE_Real      *f_vector_data;
-   HYPRE_Real      *A_mat;
-   HYPRE_Real      *b_vec;
-   HYPRE_Int        i, jj, column, relax_error = 0;
-   HYPRE_Int        info;
-   HYPRE_Int        one_i = 1;
-   HYPRE_Int       *piv;
-
-   /*-----------------------------------------------------------------
-    *  Generate CSR matrix from ParCSRMatrix A
-    *-----------------------------------------------------------------*/
-   /* all processors are needed for these routines */
-   A_CSR = hypre_ParCSRMatrixToCSRMatrixAll(A);
-   f_vector = hypre_ParVectorToVectorAll(f);
-   if (num_rows)
-   {
-      A_CSR_i = hypre_CSRMatrixI(A_CSR);
-      A_CSR_j = hypre_CSRMatrixJ(A_CSR);
-      A_CSR_data = hypre_CSRMatrixData(A_CSR);
-      f_vector_data = hypre_VectorData(f_vector);
-
-      A_mat = hypre_CTAlloc(HYPRE_Real,  n_global*n_global, HYPRE_MEMORY_HOST);
-      b_vec = hypre_CTAlloc(HYPRE_Real,  n_global, HYPRE_MEMORY_HOST);
-
-      /*---------------------------------------------------------------
-       *  Load CSR matrix into A_mat.
-       *---------------------------------------------------------------*/
-      for (i = 0; i < n_global; i++)
-      {
-         for (jj = A_CSR_i[i]; jj < A_CSR_i[i+1]; jj++)
-         {
-            /* need col major */
-            column = A_CSR_j[jj];
-            A_mat[i + n_global*column] = A_CSR_data[jj];
-         }
-         b_vec[i] = f_vector_data[i];
-      }
-
-      piv = hypre_CTAlloc(HYPRE_Int,  n_global, HYPRE_MEMORY_HOST);
-
-      /* write over A with LU */
-      hypre_dgetrf(&n_global, &n_global, A_mat, &n_global, piv, &info);
-
-      /*now b_vec = inv(A)*b_vec  */
-      hypre_dgetrs("N", &n_global, &one_i, A_mat, &n_global, piv, b_vec, &n_global, &info);
-
-      hypre_TFree(piv, HYPRE_MEMORY_HOST);
-
-      for (i = 0; i < num_rows; i++)
-      {
-         u_data[i] = b_vec[first_index+i];
-      }
-
-      hypre_TFree(A_mat, HYPRE_MEMORY_HOST);
-      hypre_TFree(b_vec, HYPRE_MEMORY_HOST);
-      hypre_CSRMatrixDestroy(A_CSR);
-      A_CSR = NULL;
-      hypre_SeqVectorDestroy(f_vector);
-      f_vector = NULL;
-   }
-   else
-   {
-      hypre_CSRMatrixDestroy(A_CSR);
-      A_CSR = NULL;
-      hypre_SeqVectorDestroy(f_vector);
-      f_vector = NULL;
-   }
-
-   return relax_error;
-}
+/*--------------------------------------------------------------------
+ * hypre_BoomerAMGRelaxKaczmarz
+ *--------------------------------------------------------------------*/
 
 HYPRE_Int
 hypre_BoomerAMGRelaxKaczmarz( hypre_ParCSRMatrix *A,
@@ -1473,6 +1410,14 @@ hypre_BoomerAMGRelaxKaczmarz( hypre_ParCSRMatrix *A,
    HYPRE_Int num_procs, my_id, i, j, index, num_sends, start;
    hypre_ParCSRCommHandle *comm_handle;
 
+   /* Sanity check */
+   if (hypre_ParVectorNumVectors(f) > 1)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                        "Kaczmarz relaxation doesn't support multicomponent vectors");
+      return hypre_error_flag;
+   }
+
    hypre_MPI_Comm_size(comm, &num_procs);
    hypre_MPI_Comm_rank(comm, &my_id);
 
@@ -1485,14 +1430,15 @@ hypre_BoomerAMGRelaxKaczmarz( hypre_ParCSRMatrix *A,
       }
 
       num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
-      u_buf_data = hypre_TAlloc(HYPRE_Real, hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends), HYPRE_MEMORY_HOST);
+      u_buf_data = hypre_TAlloc(HYPRE_Real, hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                                HYPRE_MEMORY_HOST);
       u_offd_data = hypre_TAlloc(HYPRE_Real, num_cols_offd, HYPRE_MEMORY_HOST);
 
       index = 0;
       for (i = 0; i < num_sends; i++)
       {
          start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
          {
             u_buf_data[index++] = u_data[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
          }
@@ -1507,19 +1453,19 @@ hypre_BoomerAMGRelaxKaczmarz( hypre_ParCSRMatrix *A,
    for (i = 0; i < num_rows; i++)
    {
       res = f_data[i];
-      for (j = A_diag_i[i]; j < A_diag_i[i+1]; j++)
+      for (j = A_diag_i[i]; j < A_diag_i[i + 1]; j++)
       {
          res -= A_diag_data[j] * u_data[A_diag_j[j]];
       }
 
-      for (j = A_offd_i[i]; j < A_offd_i[i+1]; j++)
+      for (j = A_offd_i[i]; j < A_offd_i[i + 1]; j++)
       {
          res -= A_offd_data[j] * u_offd_data[A_offd_j[j]];
       }
 
       res /= l1_norms[i];
 
-      for (j = A_diag_i[i]; j < A_diag_i[i+1]; j++)
+      for (j = A_diag_i[i]; j < A_diag_i[i + 1]; j++)
       {
          u_data[A_diag_j[j]] += omega * res * A_diag_data[j];
       }
@@ -1529,19 +1475,19 @@ hypre_BoomerAMGRelaxKaczmarz( hypre_ParCSRMatrix *A,
    for (i = num_rows - 1; i > -1; i--)
    {
       res = f_data[i];
-      for (j = A_diag_i[i]; j < A_diag_i[i+1]; j++)
+      for (j = A_diag_i[i]; j < A_diag_i[i + 1]; j++)
       {
          res -= A_diag_data[j] * u_data[A_diag_j[j]];
       }
 
-      for (j = A_offd_i[i]; j < A_offd_i[i+1]; j++)
+      for (j = A_offd_i[i]; j < A_offd_i[i + 1]; j++)
       {
          res -= A_offd_data[j] * u_offd_data[A_offd_j[j]];
       }
 
       res /= l1_norms[i];
 
-      for (j = A_diag_i[i]; j < A_diag_i[i+1]; j++)
+      for (j = A_diag_i[i]; j < A_diag_i[i + 1]; j++)
       {
          u_data[A_diag_j[j]] += omega * res * A_diag_data[j];
       }
@@ -1552,7 +1498,9 @@ hypre_BoomerAMGRelaxKaczmarz( hypre_ParCSRMatrix *A,
    return hypre_error_flag;
 }
 
-
+/*--------------------------------------------------------------------
+ * hypre_BoomerAMGRelaxTwoStageGaussSeidelHost
+ *--------------------------------------------------------------------*/
 
 HYPRE_Int
 hypre_BoomerAMGRelaxTwoStageGaussSeidelHost( hypre_ParCSRMatrix *A,
@@ -1561,8 +1509,10 @@ hypre_BoomerAMGRelaxTwoStageGaussSeidelHost( hypre_ParCSRMatrix *A,
                                              HYPRE_Real          omega,
                                              hypre_ParVector    *u,
                                              hypre_ParVector    *Vtemp,
-                                             HYPRE_Int           num_inner_iters)
+                                             HYPRE_Int           num_inner_iters )
 {
+   HYPRE_UNUSED_VAR(omega);
+
    hypre_CSRMatrix *A_diag      = hypre_ParCSRMatrixDiag(A);
    HYPRE_Int        num_rows    = hypre_CSRMatrixNumRows(A_diag);
    HYPRE_Real      *A_diag_data = hypre_CSRMatrixData(A_diag);
@@ -1572,8 +1522,17 @@ hypre_BoomerAMGRelaxTwoStageGaussSeidelHost( hypre_ParCSRMatrix *A,
    HYPRE_Complex   *Vtemp_data  = hypre_VectorData(Vtemp_local);
    hypre_Vector    *u_local     = hypre_ParVectorLocalVector(u);
    HYPRE_Complex   *u_data      = hypre_VectorData(u_local);
-   HYPRE_Int        i, k, jj, ii;
+
    HYPRE_Complex    multiplier  = 1.0;
+   HYPRE_Int        i, k, jj, ii;
+
+   /* Sanity check */
+   if (hypre_ParVectorNumVectors(f) > 1)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                        "2-stage GS relaxation (Host) doesn't support multicomponent vectors");
+      return hypre_error_flag;
+   }
 
    /* Need to check that EVERY diagonal is nonzero first. If any are, throw exception */
    for (i = 0; i < num_rows; i++)
@@ -1586,8 +1545,8 @@ hypre_BoomerAMGRelaxTwoStageGaussSeidelHost( hypre_ParCSRMatrix *A,
 
    hypre_ParCSRMatrixMatvecOutOfPlace(-relax_weight, A, u, relax_weight, f, Vtemp);
 
-
-   for (i = 0; i < num_rows; i++) /* Run the smoother */
+   /* Run the smoother */
+   for (i = 0; i < num_rows; i++)
    {
       // V = V/D
       Vtemp_data[i] /= A_diag_data[A_diag_i[i]];
@@ -1603,11 +1562,11 @@ hypre_BoomerAMGRelaxTwoStageGaussSeidelHost( hypre_ParCSRMatrix *A,
    {
       // By going from bottom to top, we can update Vtemp in place because
       // we're operating with the strict, lower triangular matrix
-      for (i = num_rows-1; i >=0; i--) /* Run the smoother */
+      for (i = num_rows - 1; i >= 0; i--) /* Run the smoother */
       {
          // spmv for the row first
          HYPRE_Complex res = 0.0;
-         for (jj = A_diag_i[i]; jj < A_diag_i[i+1]; jj++)
+         for (jj = A_diag_i[i]; jj < A_diag_i[i + 1]; jj++)
          {
             ii = A_diag_j[jj];
             if (ii < i)
@@ -1628,6 +1587,10 @@ hypre_BoomerAMGRelaxTwoStageGaussSeidelHost( hypre_ParCSRMatrix *A,
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------
+ * hypre_BoomerAMGRelax11TwoStageGaussSeidel
+ *--------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_BoomerAMGRelax11TwoStageGaussSeidel( hypre_ParCSRMatrix *A,
                                            hypre_ParVector    *f,
@@ -1635,28 +1598,37 @@ hypre_BoomerAMGRelax11TwoStageGaussSeidel( hypre_ParCSRMatrix *A,
                                            HYPRE_Int           relax_points,
                                            HYPRE_Real          relax_weight,
                                            HYPRE_Real          omega,
+                                           HYPRE_Real         *A_diag_diag,
                                            hypre_ParVector    *u,
                                            hypre_ParVector    *Vtemp,
                                            hypre_ParVector    *Ztemp )
 {
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-   //HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy2( hypre_VectorMemoryLocation(x), hypre_VectorMemoryLocation(b) );
-   //RL: TODO back to hypre_GetExecPolicy2 later
-   HYPRE_ExecutionPolicy exec = HYPRE_EXEC_DEVICE;
+   HYPRE_UNUSED_VAR(cf_marker);
+   HYPRE_UNUSED_VAR(relax_points);
+
+#if defined(HYPRE_USING_GPU)
+   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy2( hypre_ParCSRMatrixMemoryLocation(A),
+                                                      hypre_ParVectorMemoryLocation(f) );
 
    if (exec == HYPRE_EXEC_DEVICE)
    {
-      hypre_BoomerAMGRelaxTwoStageGaussSeidelDevice(A, f, relax_weight, omega, u, Vtemp, Ztemp, 1);
+      hypre_BoomerAMGRelaxTwoStageGaussSeidelDevice(A, f, relax_weight, omega,
+                                                    A_diag_diag, u, Vtemp, Ztemp, 1);
    }
    else
 #endif
    {
+      HYPRE_UNUSED_VAR(A_diag_diag);
+      HYPRE_UNUSED_VAR(Ztemp);
       hypre_BoomerAMGRelaxTwoStageGaussSeidelHost(A, f, relax_weight, omega, u, Vtemp, 1);
    }
 
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------
+ * hypre_BoomerAMGRelax12TwoStageGaussSeidel
+ *--------------------------------------------------------------------*/
 
 HYPRE_Int
 hypre_BoomerAMGRelax12TwoStageGaussSeidel( hypre_ParCSRMatrix *A,
@@ -1665,25 +1637,74 @@ hypre_BoomerAMGRelax12TwoStageGaussSeidel( hypre_ParCSRMatrix *A,
                                            HYPRE_Int           relax_points,
                                            HYPRE_Real          relax_weight,
                                            HYPRE_Real          omega,
+                                           HYPRE_Real         *A_diag_diag,
                                            hypre_ParVector    *u,
                                            hypre_ParVector    *Vtemp,
                                            hypre_ParVector    *Ztemp )
 {
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-   //HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy2( hypre_VectorMemoryLocation(x), hypre_VectorMemoryLocation(b) );
-   //RL: TODO back to hypre_GetExecPolicy2 later
-   HYPRE_ExecutionPolicy exec = HYPRE_EXEC_DEVICE;
+   HYPRE_UNUSED_VAR(cf_marker);
+   HYPRE_UNUSED_VAR(relax_points);
+
+#if defined(HYPRE_USING_GPU)
+   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy2( hypre_ParCSRMatrixMemoryLocation(A),
+                                                      hypre_ParVectorMemoryLocation(f) );
 
    if (exec == HYPRE_EXEC_DEVICE)
    {
-      hypre_BoomerAMGRelaxTwoStageGaussSeidelDevice(A, f, relax_weight, omega, u, Vtemp, Ztemp, 2);
+      hypre_BoomerAMGRelaxTwoStageGaussSeidelDevice(A, f, relax_weight, omega,
+                                                    A_diag_diag, u, Vtemp, Ztemp, 2);
    }
    else
 #endif
    {
-     hypre_BoomerAMGRelaxTwoStageGaussSeidelHost(A, f, relax_weight, omega, u, Vtemp, 2);
+      HYPRE_UNUSED_VAR(A_diag_diag);
+      HYPRE_UNUSED_VAR(Ztemp);
+      hypre_BoomerAMGRelaxTwoStageGaussSeidelHost(A, f, relax_weight, omega, u, Vtemp, 2);
    }
 
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_BoomerAMGRelaxComputeL1Norms
+ *
+ * TODO (VPM): Use this function in BoomerAMGSetup
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_BoomerAMGRelaxComputeL1Norms( hypre_ParCSRMatrix *A,
+                                    HYPRE_Int           relax_type,
+                                    HYPRE_Int           relax_order,
+                                    HYPRE_Int           coarsest_lvl,
+                                    hypre_IntArray     *CF_marker,
+                                    HYPRE_Real        **l1_norms_data_ptr )
+{
+   HYPRE_Int     *CF_marker_data;
+   HYPRE_Real    *l1_norms_data = NULL;
+
+   /* Relax according to F/C points ordering? */
+   CF_marker_data = (relax_order && CF_marker) ? hypre_IntArrayData(CF_marker) : NULL;
+
+   /* Are we in the coarsest level? */
+   CF_marker_data = (coarsest_lvl) ? NULL : CF_marker_data;
+
+   if (relax_type == 18)
+   {
+      /* l1_norm = sum(|A_ij|)_j */
+      hypre_ParCSRComputeL1Norms(A, 1, CF_marker_data, &l1_norms_data);
+   }
+   else if (relax_type == 8 || relax_type == 13 || relax_type == 14)
+   {
+      /* l1_norm = sum(|D_ij| + 0.5*|A_offd_ij|)_j */
+      hypre_ParCSRComputeL1Norms(A, 4, CF_marker_data, &l1_norms_data);
+   }
+   else if (relax_type == 7 || relax_type == 11 || relax_type == 12)
+   {
+      /* l1_norm = |D_ii| */
+      hypre_ParCSRComputeL1Norms(A, 5, NULL, &l1_norms_data);
+   }
+
+   *l1_norms_data_ptr = l1_norms_data;
+
+   return hypre_error_flag;
+}
diff --git a/external/hypre/src/parcsr_ls/par_relax.h b/external/hypre/src/parcsr_ls/par_relax.h
index eefdd96e..72920d2a 100644
--- a/external/hypre/src/parcsr_ls/par_relax.h
+++ b/external/hypre/src/parcsr_ls/par_relax.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -28,6 +28,8 @@ hypre_HybridGaussSeidelNS( HYPRE_Int     *A_diag_i,
                            HYPRE_Int      iorder,
                            HYPRE_Int      Skip_diag )
 {
+   HYPRE_UNUSED_VAR(v_tmp_data);
+
    HYPRE_Int i;
    const HYPRE_Complex zero = 0.0;
 
@@ -45,13 +47,13 @@ hypre_HybridGaussSeidelNS( HYPRE_Int     *A_diag_i,
             HYPRE_Int jj;
             HYPRE_Complex res = f_data[i];
 
-            for (jj = A_diag_i[i] + Skip_diag; jj < A_diag_i[i+1]; jj++)
+            for (jj = A_diag_i[i] + Skip_diag; jj < A_diag_i[i + 1]; jj++)
             {
                const HYPRE_Int ii = A_diag_j[jj];
                res -= A_diag_data[jj] * u_data[ii];
             }
 
-            for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+            for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
             {
                const HYPRE_Int ii = A_offd_j[jj];
                res -= A_offd_data[jj] * v_ext_data[ii];
@@ -77,13 +79,13 @@ hypre_HybridGaussSeidelNS( HYPRE_Int     *A_diag_i,
             HYPRE_Int jj;
             HYPRE_Complex res = f_data[i];
 
-            for (jj = A_diag_i[i] + Skip_diag; jj < A_diag_i[i+1]; jj++)
+            for (jj = A_diag_i[i] + Skip_diag; jj < A_diag_i[i + 1]; jj++)
             {
                const HYPRE_Int ii = A_diag_j[jj];
                res -= A_diag_data[jj] * u_data[ii];
             }
 
-            for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+            for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
             {
                const HYPRE_Int ii = A_offd_j[jj];
                res -= A_offd_data[jj] * v_ext_data[ii];
@@ -147,7 +149,7 @@ hypre_HybridGaussSeidelNSThreads( HYPRE_Int     *A_diag_i,
             HYPRE_Int jj;
             HYPRE_Complex res = f_data[i];
 
-            for (jj = A_diag_i[i] + Skip_diag; jj < A_diag_i[i+1]; jj++)
+            for (jj = A_diag_i[i] + Skip_diag; jj < A_diag_i[i + 1]; jj++)
             {
                const HYPRE_Int ii = A_diag_j[jj];
                if (ii >= ns && ii < ne)
@@ -160,7 +162,7 @@ hypre_HybridGaussSeidelNSThreads( HYPRE_Int     *A_diag_i,
                }
             }
 
-            for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+            for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
             {
                const HYPRE_Int ii = A_offd_j[jj];
                res -= A_offd_data[jj] * v_ext_data[ii];
@@ -186,7 +188,7 @@ hypre_HybridGaussSeidelNSThreads( HYPRE_Int     *A_diag_i,
             HYPRE_Int jj;
             HYPRE_Complex res = f_data[i];
 
-            for (jj = A_diag_i[i] + Skip_diag; jj < A_diag_i[i+1]; jj++)
+            for (jj = A_diag_i[i] + Skip_diag; jj < A_diag_i[i + 1]; jj++)
             {
                const HYPRE_Int ii = A_diag_j[jj];
                if (ii >= ns && ii < ne)
@@ -199,7 +201,7 @@ hypre_HybridGaussSeidelNSThreads( HYPRE_Int     *A_diag_i,
                }
             }
 
-            for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+            for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
             {
                const HYPRE_Int ii = A_offd_j[jj];
                res -= A_offd_data[jj] * v_ext_data[ii];
@@ -262,14 +264,14 @@ hypre_HybridGaussSeidel( HYPRE_Int     *A_diag_i,
             HYPRE_Complex res0 = 0.0;
             HYPRE_Complex res2 = 0.0;
 
-            for (jj = A_diag_i[i] + Skip_diag; jj < A_diag_i[i+1]; jj++)
+            for (jj = A_diag_i[i] + Skip_diag; jj < A_diag_i[i + 1]; jj++)
             {
                const HYPRE_Int ii = A_diag_j[jj];
                res0 -= A_diag_data[jj] * u_data[ii];
                res2 += A_diag_data[jj] * v_tmp_data[ii];
             }
 
-            for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+            for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
             {
                const HYPRE_Int ii = A_offd_j[jj];
                res -= A_offd_data[jj] * v_ext_data[ii];
@@ -298,14 +300,14 @@ hypre_HybridGaussSeidel( HYPRE_Int     *A_diag_i,
             HYPRE_Complex res0 = 0.0;
             HYPRE_Complex res2 = 0.0;
 
-            for (jj = A_diag_i[i] + Skip_diag; jj < A_diag_i[i+1]; jj++)
+            for (jj = A_diag_i[i] + Skip_diag; jj < A_diag_i[i + 1]; jj++)
             {
                const HYPRE_Int ii = A_diag_j[jj];
                res0 -= A_diag_data[jj] * u_data[ii];
                res2 += A_diag_data[jj] * v_tmp_data[ii];
             }
 
-            for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+            for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
             {
                const HYPRE_Int ii = A_offd_j[jj];
                res -= A_offd_data[jj] * v_ext_data[ii];
@@ -314,11 +316,13 @@ hypre_HybridGaussSeidel( HYPRE_Int     *A_diag_i,
             if (Skip_diag)
             {
                u_data[i] *= prod;
-               u_data[i] += relax_weight * (omega * res + res0 + one_minus_omega * res2) / A_diag_data[A_diag_i[i]];
+               u_data[i] += relax_weight * (omega * res + res0 + one_minus_omega * res2) /
+                            A_diag_data[A_diag_i[i]];
             }
             else
             {
-               u_data[i] += relax_weight * (omega * res + res0 + one_minus_omega * res2) / A_diag_data[A_diag_i[i]];
+               u_data[i] += relax_weight * (omega * res + res0 + one_minus_omega * res2) /
+                            A_diag_data[A_diag_i[i]];
             }
          }
       } /* for ( i = ...) */
@@ -370,7 +374,7 @@ hypre_HybridGaussSeidelThreads( HYPRE_Int     *A_diag_i,
             HYPRE_Complex res0 = 0.0;
             HYPRE_Complex res2 = 0.0;
 
-            for (jj = A_diag_i[i] + Skip_diag; jj < A_diag_i[i+1]; jj++)
+            for (jj = A_diag_i[i] + Skip_diag; jj < A_diag_i[i + 1]; jj++)
             {
                const HYPRE_Int ii = A_diag_j[jj];
                if (ii >= ns && ii < ne)
@@ -384,7 +388,7 @@ hypre_HybridGaussSeidelThreads( HYPRE_Int     *A_diag_i,
                }
             }
 
-            for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+            for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
             {
                const HYPRE_Int ii = A_offd_j[jj];
                res -= A_offd_data[jj] * v_ext_data[ii];
@@ -413,7 +417,7 @@ hypre_HybridGaussSeidelThreads( HYPRE_Int     *A_diag_i,
             HYPRE_Complex res0 = 0.0;
             HYPRE_Complex res2 = 0.0;
 
-            for (jj = A_diag_i[i] + Skip_diag; jj < A_diag_i[i+1]; jj++)
+            for (jj = A_diag_i[i] + Skip_diag; jj < A_diag_i[i + 1]; jj++)
             {
                const HYPRE_Int ii = A_diag_j[jj];
                if (ii >= ns && ii < ne)
@@ -427,7 +431,7 @@ hypre_HybridGaussSeidelThreads( HYPRE_Int     *A_diag_i,
                }
             }
 
-            for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+            for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
             {
                const HYPRE_Int ii = A_offd_j[jj];
                res -= A_offd_data[jj] * v_ext_data[ii];
@@ -436,11 +440,13 @@ hypre_HybridGaussSeidelThreads( HYPRE_Int     *A_diag_i,
             if (Skip_diag)
             {
                u_data[i] *= prod;
-               u_data[i] += relax_weight * (omega * res + res0 + one_minus_omega * res2) / A_diag_data[A_diag_i[i]];
+               u_data[i] += relax_weight * (omega * res + res0 + one_minus_omega * res2) /
+                            A_diag_data[A_diag_i[i]];
             }
             else
             {
-               u_data[i] += relax_weight * (omega * res + res0 + one_minus_omega * res2) / A_diag_data[A_diag_i[i]];
+               u_data[i] += relax_weight * (omega * res + res0 + one_minus_omega * res2) /
+                            A_diag_data[A_diag_i[i]];
             }
          }
       } /* for ( i = ...) */
@@ -467,6 +473,8 @@ hypre_HybridGaussSeidelOrderedNS( HYPRE_Int     *A_diag_i,
                                   HYPRE_Int      iorder,
                                   HYPRE_Int     *proc_ordering )
 {
+   HYPRE_UNUSED_VAR(v_tmp_data);
+
    HYPRE_Int j;
    const HYPRE_Complex zero = 0.0;
 
@@ -483,13 +491,13 @@ hypre_HybridGaussSeidelOrderedNS( HYPRE_Int     *A_diag_i,
          HYPRE_Int jj;
          HYPRE_Complex res = f_data[i];
 
-         for (jj = A_diag_i[i] + 1; jj < A_diag_i[i+1]; jj++)
+         for (jj = A_diag_i[i] + 1; jj < A_diag_i[i + 1]; jj++)
          {
             const HYPRE_Int ii = A_diag_j[jj];
             res -= A_diag_data[jj] * u_data[ii];
          }
 
-         for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+         for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
          {
             const HYPRE_Int ii = A_offd_j[jj];
             res -= A_offd_data[jj] * v_ext_data[ii];
@@ -501,4 +509,3 @@ hypre_HybridGaussSeidelOrderedNS( HYPRE_Int     *A_diag_i,
 }
 
 #endif /* #ifndef HYPRE_PAR_RELAX_HEADER */
-
diff --git a/external/hypre/src/parcsr_ls/par_relax_device.c b/external/hypre/src/parcsr_ls/par_relax_device.c
index 1554e927..da76b947 100644
--- a/external/hypre/src/parcsr_ls/par_relax_device.c
+++ b/external/hypre/src/parcsr_ls/par_relax_device.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -9,7 +9,11 @@
 #include "_hypre_parcsr_ls.h"
 #include "_hypre_utilities.hpp"
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
+
+/*--------------------------------------------------------------------------
+ * hypre_BoomerAMGRelaxHybridGaussSeidelDevice
+ *--------------------------------------------------------------------------*/
 
 HYPRE_Int
 hypre_BoomerAMGRelaxHybridGaussSeidelDevice( hypre_ParCSRMatrix *A,
@@ -25,11 +29,18 @@ hypre_BoomerAMGRelaxHybridGaussSeidelDevice( hypre_ParCSRMatrix *A,
                                              HYPRE_Int           GS_order,
                                              HYPRE_Int           Symm )
 {
+   HYPRE_UNUSED_VAR(cf_marker);
+   HYPRE_UNUSED_VAR(relax_points);
+   HYPRE_UNUSED_VAR(omega);
+
    /* Vtemp, Ztemp have the fine-grid size. Create two shell vectors that have the correct size */
    hypre_ParVector *w1 = hypre_ParVectorCloneShallow(f);
    hypre_ParVector *w2 = hypre_ParVectorCloneShallow(u);
-   hypre_VectorData(hypre_ParVectorLocalVector(w1)) = hypre_VectorData(hypre_ParVectorLocalVector(Vtemp));
-   hypre_VectorData(hypre_ParVectorLocalVector(w2)) = hypre_VectorData(hypre_ParVectorLocalVector(Ztemp));
+
+   hypre_VectorData(hypre_ParVectorLocalVector(w1)) = hypre_VectorData(hypre_ParVectorLocalVector(
+                                                                          Vtemp));
+   hypre_VectorData(hypre_ParVectorLocalVector(w2)) = hypre_VectorData(hypre_ParVectorLocalVector(
+                                                                          Ztemp));
 
    if (Symm)
    {
@@ -37,19 +48,22 @@ hypre_BoomerAMGRelaxHybridGaussSeidelDevice( hypre_ParCSRMatrix *A,
       hypre_ParCSRMatrixMatvecOutOfPlace(-1.0, A, u, 1.0, f, w1);
 
       /* Z = L^{-1}*V */
-      hypre_CSRMatrixTriLowerUpperSolveDevice('L', hypre_ParCSRMatrixDiag(A), l1_norms,
-                                              hypre_ParVectorLocalVector(w1), hypre_ParVectorLocalVector(w2));
+      hypre_CSRMatrixTriLowerUpperSolveDevice('L', 0, hypre_ParCSRMatrixDiag(A), l1_norms,
+                                              hypre_ParVectorLocalVector(w1),
+                                              hypre_ParVectorLocalVector(w2));
 
       /* u = u + w*Z */
       hypre_ParVectorAxpy(relax_weight, w2, u);
 
       /* Note: only update V from local change of u, i.e., V = V - w*A_diag*Z_local */
-      hypre_CSRMatrixMatvec(-relax_weight, hypre_ParCSRMatrixDiag(A), hypre_ParVectorLocalVector(w2),
-                            1.0, hypre_ParVectorLocalVector(w1));
+      hypre_CSRMatrixMatvec(-relax_weight, hypre_ParCSRMatrixDiag(A),
+                            hypre_ParVectorLocalVector(w2), 1.0,
+                            hypre_ParVectorLocalVector(w1));
 
       /* Z = U^{-1}*V */
-      hypre_CSRMatrixTriLowerUpperSolveDevice('U', hypre_ParCSRMatrixDiag(A), l1_norms,
-                                              hypre_ParVectorLocalVector(w1), hypre_ParVectorLocalVector(w2));
+      hypre_CSRMatrixTriLowerUpperSolveDevice('U', 0, hypre_ParCSRMatrixDiag(A), l1_norms,
+                                              hypre_ParVectorLocalVector(w1),
+                                              hypre_ParVectorLocalVector(w2));
 
       /* u = u + w*Z */
       hypre_ParVectorAxpy(relax_weight, w2, u);
@@ -61,8 +75,9 @@ hypre_BoomerAMGRelaxHybridGaussSeidelDevice( hypre_ParCSRMatrix *A,
       hypre_ParCSRMatrixMatvecOutOfPlace(-1.0, A, u, 1.0, f, w1);
 
       /* Z = L^{-1}*V or Z = U^{-1}*V */
-      hypre_CSRMatrixTriLowerUpperSolveDevice(uplo, hypre_ParCSRMatrixDiag(A), l1_norms,
-                                              hypre_ParVectorLocalVector(w1), hypre_ParVectorLocalVector(w2));
+      hypre_CSRMatrixTriLowerUpperSolveDevice(uplo, 0, hypre_ParCSRMatrixDiag(A), l1_norms,
+                                              hypre_ParVectorLocalVector(w1),
+                                              hypre_ParVectorLocalVector(w2));
 
       /* u = u + w*Z */
       hypre_ParVectorAxpy(relax_weight, w2, u);
@@ -74,60 +89,69 @@ hypre_BoomerAMGRelaxHybridGaussSeidelDevice( hypre_ParCSRMatrix *A,
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_BoomerAMGRelaxTwoStageGaussSeidelDevice
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_BoomerAMGRelaxTwoStageGaussSeidelDevice ( hypre_ParCSRMatrix *A,
-                                                hypre_ParVector    *f,
-                                                HYPRE_Real          relax_weight,
-                                                HYPRE_Real          omega,
-                                                hypre_ParVector    *u,
-                                                hypre_ParVector    *r,
-                                                hypre_ParVector    *z,
-                                                HYPRE_Int           num_inner_iters)
+hypre_BoomerAMGRelaxTwoStageGaussSeidelDevice( hypre_ParCSRMatrix *A,
+                                               hypre_ParVector    *f,
+                                               HYPRE_Real          relax_weight,
+                                               HYPRE_Real          omega,
+                                               HYPRE_Real         *A_diag_diag,
+                                               hypre_ParVector    *u,
+                                               hypre_ParVector    *r,
+                                               hypre_ParVector    *z,
+                                               HYPRE_Int           num_inner_iters )
 {
-   hypre_GpuProfilingPushRange("BoomerAMGRelaxTwoStageGaussSeidelDevice");
+   HYPRE_UNUSED_VAR(omega);
 
    hypre_CSRMatrix *A_diag       = hypre_ParCSRMatrixDiag(A);
    HYPRE_Int        num_rows     = hypre_CSRMatrixNumRows(A_diag);
-   HYPRE_Int       *A_diag_i     = hypre_CSRMatrixI(A_diag);
-   HYPRE_Complex   *A_diag_data  = hypre_CSRMatrixData(A_diag);
+
    hypre_Vector    *u_local      = hypre_ParVectorLocalVector(u);
    hypre_Vector    *r_local      = hypre_ParVectorLocalVector(r);
    hypre_Vector    *z_local      = hypre_ParVectorLocalVector(z);
+
+   HYPRE_Int        u_vecstride  = hypre_VectorVectorStride(u_local);
+   HYPRE_Int        r_vecstride  = hypre_VectorVectorStride(r_local);
    HYPRE_Complex   *u_data       = hypre_VectorData(u_local);
    HYPRE_Complex   *r_data       = hypre_VectorData(r_local);
    HYPRE_Complex   *z_data       = hypre_VectorData(z_local);
-   HYPRE_Int        zsize        = hypre_VectorSize(z_local);
-   HYPRE_Int        rsize        = hypre_VectorSize(r_local);
+
+   HYPRE_Int        num_vectors  = hypre_VectorNumVectors(r_local);
    HYPRE_Complex    multiplier   = 1.0;
    HYPRE_Int        i;
 
-   hypre_ParCSRMatrixMatvecOutOfPlace(-relax_weight, A, u, relax_weight, f, r);
+   hypre_GpuProfilingPushRange("BoomerAMGRelaxTwoStageGaussSeidelDevice");
 
-   hypreDevice_DiagScaleVector(num_rows, A_diag_i, A_diag_data, r_data, 0.0, z_data);
+   /* Sanity checks */
+   hypre_assert(u_vecstride == num_rows);
+   hypre_assert(r_vecstride == num_rows);
 
-   // set this so that axpy works out properly. Reset later.
-   hypre_VectorSize(z_local) = rsize;
+   // 0) r = relax_weight * (f - A * u)
+   hypre_ParCSRMatrixMatvecOutOfPlace(-relax_weight, A, u, relax_weight, f, r);
 
-   // 1) u = u + z
-   hypre_SeqVectorAxpy(multiplier, z_local, u_local);
+   // 1) z = r/D, u = u + z
+   hypreDevice_DiagScaleVector2(num_vectors, num_rows, A_diag_diag,
+                                r_data, 1.0, z_data, u_data, 1);
    multiplier *= -1.0;
 
-   for (i = 0; i < num_inner_iters; ++i) 
+   for (i = 0; i < num_inner_iters; i++)
    {
-       // 2) r = Lz
-       hypre_CSRMatrixSpMVDevice(1.0, A_diag, z_local, 0.0, r_local, -2);
-       // 3) z = r/D, u = u + m*z
-       hypreDevice_DiagScaleVector2(num_rows, A_diag_i, A_diag_data, r_data, multiplier, z_data, u_data);
-       multiplier *= -1.0;
+      // 2) r = L * z
+      hypre_CSRMatrixSpMVDevice(0, 1.0, A_diag, z_local, 0.0, r_local, -2);
+
+      // 3) z = r/D, u = u + m * z
+      hypreDevice_DiagScaleVector2(num_vectors, num_rows, A_diag_diag,
+                                   r_data, multiplier, z_data, u_data,
+                                   (num_inner_iters > i + 1));
+      multiplier *= -1.0;
    }
 
-   // reset this
-   hypre_VectorSize(z_local) = zsize;
-
    hypre_GpuProfilingPopRange();
 
-   return 0;
+   return hypre_error_flag;
 }
 
-#endif /* #if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP) */
-
+#endif /* #if defined(HYPRE_USING_GPU) */
diff --git a/external/hypre/src/parcsr_ls/par_relax_interface.c b/external/hypre/src/parcsr_ls/par_relax_interface.c
index 1a105991..994da816 100644
--- a/external/hypre/src/parcsr_ls/par_relax_interface.c
+++ b/external/hypre/src/parcsr_ls/par_relax_interface.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -78,7 +78,8 @@ hypre_ParCSRRelax_L1_Jacobi( hypre_ParCSRMatrix *A,
                              hypre_ParVector    *Vtemp )
 
 {
-   return hypre_BoomerAMGRelax(A, f, cf_marker, 18, relax_points, relax_weight, 0.0, l1_norms, u, Vtemp, NULL);
+   return hypre_BoomerAMGRelax(A, f, cf_marker, 18, relax_points, relax_weight, 0.0, l1_norms, u,
+                               Vtemp, NULL);
 }
 
 /*--------------------------------------------------------------------------
diff --git a/external/hypre/src/parcsr_ls/par_relax_more.c b/external/hypre/src/parcsr_ls/par_relax_more.c
index b05128ed..ae8433b1 100644
--- a/external/hypre/src/parcsr_ls/par_relax_more.c
+++ b/external/hypre/src/parcsr_ls/par_relax_more.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -33,9 +33,9 @@
  *****************************************************************************/
 HYPRE_Int
 hypre_ParCSRMaxEigEstimateHost( hypre_ParCSRMatrix *A,       /* matrix to relax with */
-                            HYPRE_Int           scale,   /* scale by diagonal?   */
-                            HYPRE_Real         *max_eig,
-                            HYPRE_Real         *min_eig )
+                                HYPRE_Int           scale,   /* scale by diagonal?   */
+                                HYPRE_Real         *max_eig,
+                                HYPRE_Real         *min_eig )
 {
    HYPRE_Int   A_num_rows  = hypre_ParCSRMatrixNumRows(A);
    HYPRE_Int  *A_diag_i    = hypre_CSRMatrixI(hypre_ParCSRMatrixDiag(A));
@@ -45,7 +45,8 @@ hypre_ParCSRMaxEigEstimateHost( hypre_ParCSRMatrix *A,       /* matrix to relax
    HYPRE_Real *A_offd_data = hypre_CSRMatrixData(hypre_ParCSRMatrixOffd(A));
    HYPRE_Real *diag        = NULL;
    HYPRE_Int   i, j;
-   HYPRE_Real  e_max, e_min;
+   HYPRE_Real  e_max = 0.0;
+   HYPRE_Real  e_min = 0.0;
    HYPRE_Real  send_buf[2], recv_buf[2];
 
    HYPRE_MemoryLocation memory_location = hypre_ParCSRMatrixMemoryLocation(A);
@@ -59,7 +60,7 @@ hypre_ParCSRMaxEigEstimateHost( hypre_ParCSRMatrix *A,       /* matrix to relax
    {
       HYPRE_Real a_ii = 0.0, r_i = 0.0, lower, upper;
 
-      for (j = A_diag_i[i]; j < A_diag_i[i+1]; j++)
+      for (j = A_diag_i[i]; j < A_diag_i[i + 1]; j++)
       {
          if (A_diag_j[j] == i)
          {
@@ -71,7 +72,7 @@ hypre_ParCSRMaxEigEstimateHost( hypre_ParCSRMatrix *A,       /* matrix to relax
          }
       }
 
-      for (j = A_offd_i[i]; j < A_offd_i[i+1]; j++)
+      for (j = A_offd_i[i]; j < A_offd_i[i + 1]; j++)
       {
          r_i += hypre_abs(A_offd_data[j]);
       }
@@ -101,7 +102,8 @@ hypre_ParCSRMaxEigEstimateHost( hypre_ParCSRMatrix *A,       /* matrix to relax
    send_buf[1] =  e_max;
 
    /* get e_min e_max across procs */
-   hypre_MPI_Allreduce(send_buf, recv_buf, 2, HYPRE_MPI_REAL, hypre_MPI_MAX, hypre_ParCSRMatrixComm(A));
+   hypre_MPI_Allreduce(send_buf, recv_buf, 2, HYPRE_MPI_REAL, hypre_MPI_MAX,
+                       hypre_ParCSRMatrixComm(A));
 
    e_min = -recv_buf[0];
    e_max =  recv_buf[1];
@@ -137,24 +139,20 @@ hypre_ParCSRMaxEigEstimate(hypre_ParCSRMatrix *A, /* matrix to relax with */
                            HYPRE_Real *max_eig,
                            HYPRE_Real *min_eig)
 {
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    hypre_GpuProfilingPushRange("ParCSRMaxEigEstimate");
-#endif
-   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_ParCSRMatrixMemoryLocation(A) );
    HYPRE_Int ierr = 0;
-   if (exec == HYPRE_EXEC_HOST)
+#if defined(HYPRE_USING_GPU)
+   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_ParCSRMatrixMemoryLocation(A) );
+   if (exec == HYPRE_EXEC_DEVICE)
    {
-      ierr = hypre_ParCSRMaxEigEstimateHost(A,scale,max_eig,min_eig);
+      ierr = hypre_ParCSRMaxEigEstimateDevice(A, scale, max_eig, min_eig);
    }
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    else
+#endif
    {
-      ierr = hypre_ParCSRMaxEigEstimateDevice(A,scale,max_eig,min_eig);
+      ierr = hypre_ParCSRMaxEigEstimateHost(A, scale, max_eig, min_eig);
    }
-#endif
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    hypre_GpuProfilingPopRange();
-#endif
    return ierr;
 }
 
@@ -175,24 +173,20 @@ hypre_ParCSRMaxEigEstimateCG(hypre_ParCSRMatrix *A,     /* matrix to relax with
                              HYPRE_Real         *max_eig,
                              HYPRE_Real         *min_eig)
 {
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    hypre_GpuProfilingPushRange("ParCSRMaxEigEstimateCG");
-#endif
-   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1(hypre_ParCSRMatrixMemoryLocation(A));
    HYPRE_Int             ierr = 0;
-   if (exec == HYPRE_EXEC_HOST)
+#if defined(HYPRE_USING_GPU)
+   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1(hypre_ParCSRMatrixMemoryLocation(A));
+   if (exec == HYPRE_EXEC_DEVICE)
    {
-      ierr = hypre_ParCSRMaxEigEstimateCGHost(A, scale, max_iter, max_eig, min_eig);
+      ierr = hypre_ParCSRMaxEigEstimateCGDevice(A, scale, max_iter, max_eig, min_eig);
    }
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    else
+#endif
    {
-      ierr = hypre_ParCSRMaxEigEstimateCGDevice(A, scale, max_iter, max_eig, min_eig);
+      ierr = hypre_ParCSRMaxEigEstimateCGHost(A, scale, max_iter, max_eig, min_eig);
    }
-#endif
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    hypre_GpuProfilingPopRange();
-#endif
    return ierr;
 }
 
@@ -207,10 +201,10 @@ hypre_ParCSRMaxEigEstimateCG(hypre_ParCSRMatrix *A,     /* matrix to relax with
  */
 HYPRE_Int
 hypre_ParCSRMaxEigEstimateCGHost( hypre_ParCSRMatrix *A,     /* matrix to relax with */
-                                 HYPRE_Int           scale, /* scale by diagonal?*/
-                                 HYPRE_Int           max_iter,
-                                 HYPRE_Real         *max_eig,
-                                 HYPRE_Real         *min_eig )
+                                  HYPRE_Int           scale, /* scale by diagonal?*/
+                                  HYPRE_Int           max_iter,
+                                  HYPRE_Real         *max_eig,
+                                  HYPRE_Real         *min_eig )
 {
    HYPRE_Int i, j, err;
    hypre_ParVector *p;
@@ -269,16 +263,16 @@ hypre_ParCSRMaxEigEstimateCGHost( hypre_ParCSRMatrix *A,     /* matrix to relax
    u_data = hypre_VectorData(hypre_ParVectorLocalVector(u));
 
    /* make room for tri-diag matrix */
-   tridiag = hypre_CTAlloc(HYPRE_Real, max_iter+1, HYPRE_MEMORY_HOST);
-   trioffd = hypre_CTAlloc(HYPRE_Real, max_iter+1, HYPRE_MEMORY_HOST);
-   for (i=0; i < max_iter + 1; i++)
+   tridiag = hypre_CTAlloc(HYPRE_Real, max_iter + 1, HYPRE_MEMORY_HOST);
+   trioffd = hypre_CTAlloc(HYPRE_Real, max_iter + 1, HYPRE_MEMORY_HOST);
+   for (i = 0; i < max_iter + 1; i++)
    {
       tridiag[i] = 0;
       trioffd[i] = 0;
    }
 
    /* set residual to random */
-   hypre_ParVectorSetRandomValues(r,1);
+   hypre_ParVectorSetRandomValues(r, 1);
 
    if (scale)
    {
@@ -287,11 +281,11 @@ hypre_ParCSRMaxEigEstimateCGHost( hypre_ParCSRMatrix *A,     /* matrix to relax
    else
    {
       /* set ds to 1 */
-      hypre_ParVectorSetConstantValues(ds,1.0);
+      hypre_ParVectorSetConstantValues(ds, 1.0);
    }
 
    /* gamma = <r,Cr> */
-   gamma = hypre_ParVectorInnerProd(r,p);
+   gamma = hypre_ParVectorInnerProd(r, p);
 
    /* for the initial filling of the tridiag matrix */
    beta = 1.0;
@@ -305,9 +299,14 @@ hypre_ParCSRMaxEigEstimateCGHost( hypre_ParCSRMatrix *A,     /* matrix to relax
 
       /*gamma = <r,Cr> */
       gamma_old = gamma;
-      gamma = hypre_ParVectorInnerProd(r,s);
+      gamma = hypre_ParVectorInnerProd(r, s);
+
+      if (gamma < HYPRE_REAL_EPSILON)
+      {
+         break;
+      }
 
-      if (i==0)
+      if (i == 0)
       {
          beta = 1.0;
          /* p_0 = C*r */
@@ -320,11 +319,11 @@ hypre_ParCSRMaxEigEstimateCGHost( hypre_ParCSRMatrix *A,     /* matrix to relax
 
          /* p = s + beta p */
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(j) HYPRE_SMP_SCHEDULE
+         #pragma omp parallel for private(j) HYPRE_SMP_SCHEDULE
 #endif
-         for (j=0; j < local_size; j++)
+         for (j = 0; j < local_size; j++)
          {
-            p_data[j] = s_data[j] + beta*p_data[j];
+            p_data[j] = s_data[j] + beta * p_data[j];
          }
       }
 
@@ -348,34 +347,34 @@ hypre_ParCSRMaxEigEstimateCGHost( hypre_ParCSRMatrix *A,     /* matrix to relax
       }
 
       /* <s,p> */
-      sdotp =  hypre_ParVectorInnerProd(s,p);
+      sdotp =  hypre_ParVectorInnerProd(s, p);
 
       /* alpha = gamma / <s,p> */
-      alpha = gamma/sdotp;
+      alpha = gamma / sdotp;
 
       /* get tridiagonal matrix */
-      alphainv = 1.0/alpha;
+      alphainv = 1.0 / alpha;
 
-      tridiag[i+1] = alphainv;
+      tridiag[i + 1] = alphainv;
       tridiag[i] *= beta;
       tridiag[i] += alphainv;
 
-      trioffd[i+1] = alphainv;
-      trioffd[i] *= sqrt(beta);
+      trioffd[i + 1] = alphainv;
+      trioffd[i] *= hypre_sqrt(beta);
 
       /* x = x + alpha*p */
       /* don't need */
 
       /* r = r - alpha*s */
-      hypre_ParVectorAxpy( -alpha, s, r);
+      hypre_ParVectorAxpy(-alpha, s, r);
 
       i++;
    }
 
    /* eispack routine - eigenvalues return in tridiag and ordered*/
-   hypre_LINPACKcgtql1(&i,tridiag,trioffd,&err);
+   hypre_LINPACKcgtql1(&i, tridiag, trioffd, &err);
 
-   lambda_max = tridiag[i-1];
+   lambda_max = tridiag[i - 1];
    lambda_min = tridiag[0];
    /* hypre_printf("linpack max eig est = %g\n", lambda_max);*/
    /* hypre_printf("linpack min eig est = %g\n", lambda_min);*/
@@ -431,7 +430,8 @@ hypre_ParCSRRelax_Cheby(hypre_ParCSRMatrix *A, /* matrix to relax with */
    hypre_ParVector *tmp_vec    = NULL;
    hypre_ParVector *orig_u_vec = NULL;
 
-   hypre_ParCSRRelax_Cheby_Setup(A, max_eig, min_eig, fraction, order, scale, variant, &coefs, &ds_data);
+   hypre_ParCSRRelax_Cheby_Setup(A, max_eig, min_eig, fraction, order, scale, variant, &coefs,
+                                 &ds_data);
 
    orig_u_vec = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A),
                                       hypre_ParCSRMatrixGlobalNumRows(A),
@@ -445,7 +445,8 @@ hypre_ParCSRRelax_Cheby(hypre_ParCSRMatrix *A, /* matrix to relax with */
                                       hypre_ParCSRMatrixRowStarts(A));
       hypre_ParVectorInitialize_v2(tmp_vec, hypre_ParCSRMatrixMemoryLocation(A));
    }
-   hypre_ParCSRRelax_Cheby_Solve(A, f, ds_data, coefs, order, scale, variant, u, v, r, orig_u_vec, tmp_vec);
+   hypre_ParCSRRelax_Cheby_Solve(A, f, ds_data, coefs, order, scale, variant, u, v, r, orig_u_vec,
+                                 tmp_vec);
 
    hypre_TFree(ds_data, hypre_ParCSRMatrixMemoryLocation(A));
    hypre_TFree(coefs, HYPRE_MEMORY_HOST);
@@ -480,12 +481,12 @@ hypre_ParCSRRelax_CG( HYPRE_Solver        solver,
       hypre_MPI_Comm_rank(hypre_MPI_COMM_WORLD, &myid);
       HYPRE_PCGGetNumIterations(solver, &num_iterations);
       HYPRE_PCGGetFinalRelativeResidualNorm(solver, &final_res_norm);
-      if (myid ==0)
+      if (myid == 0)
       {
          hypre_printf("            -----CG PCG Iterations = %d\n", num_iterations);
          hypre_printf("            -----CG PCG Final Relative Residual Norm = %e\n", final_res_norm);
       }
-    }
+   }
 #endif
 
    return hypre_error_flag;
@@ -503,22 +504,22 @@ hypre_ParCSRRelax_CG( HYPRE_Solver        solver,
 */
 
 HYPRE_Int
-hypre_LINPACKcgtql1(HYPRE_Int *n,HYPRE_Real *d,HYPRE_Real *e,HYPRE_Int *ierr)
+hypre_LINPACKcgtql1(HYPRE_Int *n, HYPRE_Real *d, HYPRE_Real *e, HYPRE_Int *ierr)
 {
    /* System generated locals */
-   HYPRE_Int  i__1,i__2;
-   HYPRE_Real d__1,d__2,c_b10 = 1.0;
+   HYPRE_Int  i__1, i__2;
+   HYPRE_Real d__1, d__2, c_b10 = 1.0;
 
    /* Local variables */
-   HYPRE_Real c,f,g,h;
-   HYPRE_Int  i,j,l,m;
-   HYPRE_Real p,r,s,c2,c3 = 0.0;
-   HYPRE_Int  l1,l2;
+   HYPRE_Real c, f, g, h;
+   HYPRE_Int  i, j, l, m;
+   HYPRE_Real p, r, s, c2, c3 = 0.0;
+   HYPRE_Int  l1, l2;
    HYPRE_Real s2 = 0.0;
    HYPRE_Int  ii;
-   HYPRE_Real dl1,el1;
+   HYPRE_Real dl1, el1;
    HYPRE_Int  mml;
-   HYPRE_Real tst1,tst2;
+   HYPRE_Real tst1, tst2;
 
    /*     THIS SUBROUTINE IS A TRANSLATION OF THE ALGOL PROCEDURE TQL1, */
    /*     NUM. MATH. 11, 293-306(1968) BY BOWDLER, MARTIN, REINSCH, AND */
@@ -586,15 +587,16 @@ hypre_LINPACKcgtql1(HYPRE_Int *n,HYPRE_Real *d,HYPRE_Real *e,HYPRE_Int *ierr)
    for (l = 1; l <= i__1; ++l)
    {
       j = 0;
-      h = (d__1 = d[l],fabs(d__1)) + (d__2 = e[l],fabs(d__2));
+      h = (d__1 = d[l], hypre_abs(d__1)) + (d__2 = e[l], hypre_abs(d__2));
       if (tst1 < h)
       {
          tst1 = h;
       }
       /*     .......... LOOK FOR SMALL SUB-DIAGONAL ELEMENT .......... */
       i__2 = *n;
-      for (m = l; m <= i__2; ++m) {
-         tst2 = tst1 + (d__1 = e[m],fabs(d__1));
+      for (m = l; m <= i__2; ++m)
+      {
+         tst2 = tst1 + (d__1 = e[m], hypre_abs(d__1));
          if (tst2 == tst1)
          {
             goto L120;
@@ -602,12 +604,12 @@ hypre_LINPACKcgtql1(HYPRE_Int *n,HYPRE_Real *d,HYPRE_Real *e,HYPRE_Int *ierr)
          /*     .......... E(N) IS ALWAYS ZERO,SO THERE IS NO EXIT */
          /*                THROUGH THE BOTTOM OF THE LOOP .......... */
       }
-L120:
+   L120:
       if (m == l)
       {
          goto L210;
       }
-L130:
+   L130:
       if (j == 30)
       {
          goto L1000;
@@ -618,10 +620,11 @@ hypre_LINPACKcgtql1(HYPRE_Int *n,HYPRE_Real *d,HYPRE_Real *e,HYPRE_Int *ierr)
       l2 = l1 + 1;
       g = d[l];
       p = (d[l1] - g) / (e[l] * 2.);
-      r = hypre_LINPACKcgpthy(&p,&c_b10);
-      ds = 1.0; if (p < 0.0) ds = -1.0;
-      d[l] = e[l] / (p + ds*r);
-      d[l1] = e[l] * (p + ds*r);
+      r = hypre_LINPACKcgpthy(&p, &c_b10);
+      ds = 1.0;
+      if (p < 0.0) { ds = -1.0; }
+      d[l] = e[l] / (p + ds * r);
+      d[l1] = e[l] * (p + ds * r);
       dl1 = d[l1];
       h = g - d[l];
       if (l2 > *n)
@@ -630,11 +633,12 @@ hypre_LINPACKcgtql1(HYPRE_Int *n,HYPRE_Real *d,HYPRE_Real *e,HYPRE_Int *ierr)
       }
 
       i__2 = *n;
-      for (i = l2; i <= i__2; ++i) {
+      for (i = l2; i <= i__2; ++i)
+      {
          d[i] -= h;
       }
 
-L145:
+   L145:
       f += h;
       /*     .......... QL TRANSFORMATION .......... */
       p = d[m];
@@ -653,7 +657,7 @@ hypre_LINPACKcgtql1(HYPRE_Int *n,HYPRE_Real *d,HYPRE_Real *e,HYPRE_Int *ierr)
          i = m - ii;
          g = c * e[i];
          h = c * p;
-         r = hypre_LINPACKcgpthy(&p,&e[i]);
+         r = hypre_LINPACKcgpthy(&p, &e[i]);
          e[i + 1] = s * r;
          s = e[i] / r;
          c = p / r;
@@ -664,15 +668,16 @@ hypre_LINPACKcgtql1(HYPRE_Int *n,HYPRE_Real *d,HYPRE_Real *e,HYPRE_Int *ierr)
       p = -s * s2 * c3 * el1 * e[l] / dl1;
       e[l] = s * p;
       d[l] = c * p;
-      tst2 = tst1 + (d__1 = e[l],fabs(d__1));
+      tst2 = tst1 + (d__1 = e[l], hypre_abs(d__1));
       if (tst2 > tst1)
       {
          goto L130;
       }
-L210:
+   L210:
       p = d[l] + f;
       /*     .......... ORDER EIGENVALUES .......... */
-      if (l == 1) {
+      if (l == 1)
+      {
          goto L250;
       }
       /*     .......... FOR I=L STEP -1 UNTIL 2 DO -- .......... */
@@ -687,9 +692,9 @@ hypre_LINPACKcgtql1(HYPRE_Int *n,HYPRE_Real *d,HYPRE_Real *e,HYPRE_Int *ierr)
          d[i] = d[i - 1];
       }
 
-L250:
+   L250:
       i = 1;
-L270:
+   L270:
       d[i] = p;
    }
 
@@ -704,28 +709,28 @@ hypre_LINPACKcgtql1(HYPRE_Int *n,HYPRE_Real *d,HYPRE_Real *e,HYPRE_Int *ierr)
 } /* cgtql1_ */
 
 HYPRE_Real
-hypre_LINPACKcgpthy(HYPRE_Real *a,HYPRE_Real *b)
+hypre_LINPACKcgpthy(HYPRE_Real *a, HYPRE_Real *b)
 {
    /* System generated locals */
-   HYPRE_Real ret_val,d__1,d__2,d__3;
+   HYPRE_Real ret_val, d__1, d__2, d__3;
 
    /* Local variables */
-   HYPRE_Real p,r,s,t,u;
+   HYPRE_Real p, r, s, t, u;
 
    /*     FINDS DSQRT(A**2+B**2) WITHOUT OVERFLOW OR DESTRUCTIVE UNDERFLOW */
 
 
    /* Computing MAX */
-   d__1 = fabs(*a),d__2 = fabs(*b);
-   p = hypre_max(d__1,d__2);
+   d__1 = hypre_abs(*a), d__2 = hypre_abs(*b);
+   p = hypre_max(d__1, d__2);
    if (!p)
    {
       goto L20;
    }
    /* Computing MIN */
-   d__2 = fabs(*a),d__3 = fabs(*b);
+   d__2 = hypre_abs(*a), d__3 = hypre_abs(*b);
    /* Computing 2nd power */
-   d__1 = hypre_min(d__2,d__3) / p;
+   d__1 = hypre_min(d__2, d__3) / p;
    r = d__1 * d__1;
 L10:
    t = r + 4.;
diff --git a/external/hypre/src/parcsr_ls/par_relax_more_device.c b/external/hypre/src/parcsr_ls/par_relax_more_device.c
index 6cf1769b..2eeb334c 100644
--- a/external/hypre/src/parcsr_ls/par_relax_more_device.c
+++ b/external/hypre/src/parcsr_ls/par_relax_more_device.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -12,9 +12,10 @@
  *
  *****************************************************************************/
 
+#include "_hypre_onedpl.hpp"
 #include "_hypre_parcsr_ls.h"
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
 #include "_hypre_utilities.hpp"
 
 /**
@@ -22,26 +23,27 @@
  * to be used for the MaxEigEstimate
  */
 __global__ void
-hypreCUDAKernel_CSRMaxEigEstimate(HYPRE_Int      nrows,
-                                  HYPRE_Int     *diag_ia,
-                                  HYPRE_Int     *diag_ja,
-                                  HYPRE_Complex *diag_aa,
-                                  HYPRE_Int     *offd_ia,
-                                  HYPRE_Int     *offd_ja,
-                                  HYPRE_Complex *offd_aa,
-                                  HYPRE_Complex *row_sum_lower,
-                                  HYPRE_Complex *row_sum_upper,
-                                  HYPRE_Int      scale)
+hypreGPUKernel_CSRMaxEigEstimate(hypre_DeviceItem    &item,
+                                 HYPRE_Int      nrows,
+                                 HYPRE_Int     *diag_ia,
+                                 HYPRE_Int     *diag_ja,
+                                 HYPRE_Complex *diag_aa,
+                                 HYPRE_Int     *offd_ia,
+                                 HYPRE_Int     *offd_ja,
+                                 HYPRE_Complex *offd_aa,
+                                 HYPRE_Complex *row_sum_lower,
+                                 HYPRE_Complex *row_sum_upper,
+                                 HYPRE_Int      scale)
 {
-   HYPRE_Int row_i = hypre_cuda_get_grid_warp_id<1, 1>();
+   HYPRE_Int row_i = hypre_gpu_get_grid_warp_id<1, 1>(item);
 
    if (row_i >= nrows)
    {
       return;
    }
 
-   HYPRE_Int lane = hypre_cuda_get_lane_id<1>();
-   HYPRE_Int p, q;
+   HYPRE_Int lane = hypre_gpu_get_lane_id<1>(item);
+   HYPRE_Int p = 0, q;
 
    HYPRE_Complex diag_value = 0.0;
    HYPRE_Complex row_sum_i  = 0.0;
@@ -51,16 +53,11 @@ hypreCUDAKernel_CSRMaxEigEstimate(HYPRE_Int      nrows,
    {
       p = read_only_load(diag_ia + row_i + lane);
    }
-   q = __shfl_sync(HYPRE_WARP_FULL_MASK, p, 1);
-   p = __shfl_sync(HYPRE_WARP_FULL_MASK, p, 0);
+   q = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 1);
+   p = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 0);
 
-   for (HYPRE_Int j = p + lane; __any_sync(HYPRE_WARP_FULL_MASK, j < q); j += HYPRE_WARP_SIZE)
+   for (HYPRE_Int j = p + lane; j < q; j += HYPRE_WARP_SIZE)
    {
-      if (j >= q)
-      {
-         continue;
-      }
-
       HYPRE_Complex aij = read_only_load(&diag_aa[j]);
       if ( read_only_load(&diag_ja[j]) == row_i )
       {
@@ -68,7 +65,7 @@ hypreCUDAKernel_CSRMaxEigEstimate(HYPRE_Int      nrows,
       }
       else
       {
-         row_sum_i += fabs(aij);
+         row_sum_i += hypre_abs(aij);
       }
    }
 
@@ -76,24 +73,19 @@ hypreCUDAKernel_CSRMaxEigEstimate(HYPRE_Int      nrows,
    {
       p = read_only_load(offd_ia + row_i + lane);
    }
-   q = __shfl_sync(HYPRE_WARP_FULL_MASK, p, 1);
-   p = __shfl_sync(HYPRE_WARP_FULL_MASK, p, 0);
+   q = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 1);
+   p = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 0);
 
-   for (HYPRE_Int j = p + lane; __any_sync(HYPRE_WARP_FULL_MASK, j < q); j += HYPRE_WARP_SIZE)
+   for (HYPRE_Int j = p + lane; j < q; j += HYPRE_WARP_SIZE)
    {
-      if (j >= q)
-      {
-         continue;
-      }
-
       HYPRE_Complex aij = read_only_load(&offd_aa[j]);
-      row_sum_i += fabs(aij);
+      row_sum_i += hypre_abs(aij);
    }
 
    // Get the row_sum and diagonal value on lane 0
-   row_sum_i = warp_reduce_sum(row_sum_i);
+   row_sum_i = warp_reduce_sum(item, row_sum_i);
 
-   diag_value = warp_reduce_sum(diag_value);
+   diag_value = warp_reduce_sum(item, diag_value);
 
    if (lane == 0)
    {
@@ -102,8 +94,8 @@ hypreCUDAKernel_CSRMaxEigEstimate(HYPRE_Int      nrows,
 
       if (scale)
       {
-        lower /= hypre_abs(diag_value);
-        upper /= hypre_abs(diag_value);
+         lower /= hypre_abs(diag_value);
+         upper /= hypre_abs(diag_value);
       }
 
       row_sum_upper[row_i] = upper;
@@ -139,8 +131,10 @@ hypre_ParCSRMaxEigEstimateDevice( hypre_ParCSRMatrix *A,
 
    A_num_rows = hypre_CSRMatrixNumRows(hypre_ParCSRMatrixDiag(A));
 
-   HYPRE_Real *rowsums_lower = hypre_TAlloc(HYPRE_Real, A_num_rows, hypre_ParCSRMatrixMemoryLocation(A));
-   HYPRE_Real *rowsums_upper = hypre_TAlloc(HYPRE_Real, A_num_rows, hypre_ParCSRMatrixMemoryLocation(A));
+   HYPRE_Real *rowsums_lower = hypre_TAlloc(HYPRE_Real, A_num_rows,
+                                            hypre_ParCSRMatrixMemoryLocation(A));
+   HYPRE_Real *rowsums_upper = hypre_TAlloc(HYPRE_Real, A_num_rows,
+                                            hypre_ParCSRMatrixMemoryLocation(A));
 
    A_diag_i    = hypre_CSRMatrixI(hypre_ParCSRMatrixDiag(A));
    A_diag_j    = hypre_CSRMatrixJ(hypre_ParCSRMatrixDiag(A));
@@ -149,28 +143,35 @@ hypre_ParCSRMaxEigEstimateDevice( hypre_ParCSRMatrix *A,
    A_offd_j    = hypre_CSRMatrixJ(hypre_ParCSRMatrixOffd(A));
    A_offd_data = hypre_CSRMatrixData(hypre_ParCSRMatrixOffd(A));
 
-   dim3 bDim, gDim;
-
-   bDim = hypre_GetDefaultCUDABlockDimension();
-   gDim = hypre_GetDefaultCUDAGridDimension(A_num_rows, "warp", bDim);
-   HYPRE_CUDA_LAUNCH(hypreCUDAKernel_CSRMaxEigEstimate,
-                     gDim,
-                     bDim,
-                     A_num_rows,
-                     A_diag_i,
-                     A_diag_j,
-                     A_diag_data,
-                     A_offd_i,
-                     A_offd_j,
-                     A_offd_data,
-                     rowsums_lower,
-                     rowsums_upper,
-                     scale);
-
-   hypre_SyncCudaComputeStream(hypre_handle());
-
-   e_min = HYPRE_THRUST_CALL(reduce, rowsums_lower, rowsums_lower + A_num_rows, (HYPRE_Real)0, thrust::minimum<HYPRE_Real>());
-   e_max = HYPRE_THRUST_CALL(reduce, rowsums_upper, rowsums_upper + A_num_rows, (HYPRE_Real)0, thrust::maximum<HYPRE_Real>());
+   dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+   dim3 gDim = hypre_GetDefaultDeviceGridDimension(A_num_rows, "warp", bDim);
+   HYPRE_GPU_LAUNCH(hypreGPUKernel_CSRMaxEigEstimate,
+                    gDim,
+                    bDim,
+                    A_num_rows,
+                    A_diag_i,
+                    A_diag_j,
+                    A_diag_data,
+                    A_offd_i,
+                    A_offd_j,
+                    A_offd_data,
+                    rowsums_lower,
+                    rowsums_upper,
+                    scale);
+
+   hypre_SyncComputeStream();
+
+#if defined(HYPRE_USING_SYCL)
+   e_min = HYPRE_ONEDPL_CALL(std::reduce, rowsums_lower, rowsums_lower + A_num_rows, (HYPRE_Real)0,
+                             oneapi::dpl::minimum<HYPRE_Real>());
+   e_max = HYPRE_ONEDPL_CALL(std::reduce, rowsums_upper, rowsums_upper + A_num_rows, (HYPRE_Real)0,
+                             oneapi::dpl::maximum<HYPRE_Real>());
+#else
+   e_min = HYPRE_THRUST_CALL(reduce, rowsums_lower, rowsums_lower + A_num_rows, (HYPRE_Real)0,
+                             thrust::minimum<HYPRE_Real>());
+   e_max = HYPRE_THRUST_CALL(reduce, rowsums_upper, rowsums_upper + A_num_rows, (HYPRE_Real)0,
+                             thrust::maximum<HYPRE_Real>());
+#endif
 
    /* Same as hypre_ParCSRMaxEigEstimateHost */
 
@@ -180,7 +181,8 @@ hypre_ParCSRMaxEigEstimateDevice( hypre_ParCSRMatrix *A,
    send_buf[0] = -e_min;
    send_buf[1] = e_max;
 
-   hypre_MPI_Allreduce(send_buf, recv_buf, 2, HYPRE_MPI_REAL, hypre_MPI_MAX, hypre_ParCSRMatrixComm(A));
+   hypre_MPI_Allreduce(send_buf, recv_buf, 2, HYPRE_MPI_REAL, hypre_MPI_MAX,
+                       hypre_ParCSRMatrixComm(A));
 
    /* return */
    if ( hypre_abs(e_min) > hypre_abs(e_max) )
@@ -216,9 +218,7 @@ hypre_ParCSRMaxEigEstimateCGDevice(hypre_ParCSRMatrix *A,     /* matrix to relax
                                    HYPRE_Real         *max_eig,
                                    HYPRE_Real         *min_eig)
 {
-#if defined(HYPRE_USING_CUDA)
    hypre_GpuProfilingPushRange("ParCSRMaxEigEstimate_Setup");
-#endif
    HYPRE_Int        i, err;
    hypre_ParVector *p;
    hypre_ParVector *s;
@@ -243,9 +243,7 @@ hypre_ParCSRMaxEigEstimateCGDevice(hypre_ParCSRMatrix *A,     /* matrix to relax
       max_iter = (HYPRE_Int)size;
    }
 
-#if defined(HYPRE_USING_CUDA)
    hypre_GpuProfilingPushRange("ParCSRMaxEigEstimate_Setup_DataAlloc");
-#endif
    /* create some temp vectors: p, s, r , ds, u*/
    r = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A),
                              hypre_ParCSRMatrixGlobalNumRows(A),
@@ -280,57 +278,45 @@ hypre_ParCSRMaxEigEstimateCGDevice(hypre_ParCSRMatrix *A,     /* matrix to relax
    u_data = hypre_VectorData(hypre_ParVectorLocalVector(u));
    r_data = hypre_VectorData(hypre_ParVectorLocalVector(r));
 
-#if defined(HYPRE_USING_CUDA)
    hypre_GpuProfilingPopRange(); /*Setup Data Alloc*/
-#endif
 
-#if defined(HYPRE_USING_CUDA)
    hypre_GpuProfilingPushRange("ParCSRMaxEigEstimate_Setup_CPUAlloc_Setup");
-#endif
 
-#if defined(HYPRE_USING_CUDA)
    hypre_GpuProfilingPushRange("ParCSRMaxEigEstimate_Setup_CPUAlloc_Setup_Alloc");
-#endif
 
    /* make room for tri-diag matrix */
    tridiag = hypre_CTAlloc(HYPRE_Real, max_iter + 1, HYPRE_MEMORY_HOST);
    trioffd = hypre_CTAlloc(HYPRE_Real, max_iter + 1, HYPRE_MEMORY_HOST);
-#if defined(HYPRE_USING_CUDA)
    hypre_GpuProfilingPopRange(); /*SETUP_Alloc*/
-#endif
 
-#if defined(HYPRE_USING_CUDA)
    hypre_GpuProfilingPushRange("ParCSRMaxEigEstimate_Setup_CPUAlloc_Zeroing");
-#endif
    for (i = 0; i < max_iter + 1; i++)
    {
       tridiag[i] = 0;
       trioffd[i] = 0;
    }
-#if defined(HYPRE_USING_CUDA)
    hypre_GpuProfilingPopRange(); /*Zeroing */
-#endif
 
-#if defined(HYPRE_USING_CUDA)
    hypre_GpuProfilingPushRange("ParCSRMaxEigEstimate_Setup_CPUAlloc_Random");
-#endif
 
    /* set residual to random */
-  hypre_CurandUniform(local_size, r_data, 0, 0, 0, 0);
-
-  hypre_SyncCudaComputeStream(hypre_handle());
-
-  HYPRE_THRUST_CALL(transform,
-                    r_data, r_data + local_size, r_data,
-                    2.0 * _1 - 1.0);
+   hypre_CurandUniform(local_size, r_data, 0, 0, 0, 0);
+
+   hypre_SyncComputeStream();
+
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_ONEDPL_CALL(std::transform,
+                     r_data, r_data + local_size, r_data,
+   [] (auto x) { return 2.0 * x - 1.0; } );
+#else
+   HYPRE_THRUST_CALL(transform,
+                     r_data, r_data + local_size, r_data,
+                     2.0 * _1 - 1.0);
+#endif
 
-#if defined(HYPRE_USING_CUDA)
    hypre_GpuProfilingPopRange(); /*CPUAlloc_Random*/
-#endif
 
-#if defined(HYPRE_USING_CUDA)
    hypre_GpuProfilingPushRange("ParCSRMaxEigEstimate_Setup_CPUAlloc_Diag");
-#endif
 
    if (scale)
    {
@@ -342,19 +328,10 @@ hypre_ParCSRMaxEigEstimateCGDevice(hypre_ParCSRMatrix *A,     /* matrix to relax
       hypre_ParVectorSetConstantValues(ds, 1.0);
    }
 
-#if defined(HYPRE_USING_CUDA)
    hypre_GpuProfilingPopRange(); /*Setup_CPUAlloc__Diag */
-#endif
-#if defined(HYPRE_USING_CUDA) /*CPUAlloc_Setup */
-   hypre_GpuProfilingPopRange();
-#endif
-
-#if defined(HYPRE_USING_CUDA)
+   hypre_GpuProfilingPopRange(); /*CPUAlloc_Setup */
    hypre_GpuProfilingPopRange(); /* Setup */
-#endif
-#if defined(HYPRE_USING_CUDA)
    hypre_GpuProfilingPushRange("ParCSRMaxEigEstimate_Iter");
-#endif
 
    /* gamma = <r,Cr> */
    gamma = hypre_ParVectorInnerProd(r, p);
@@ -373,6 +350,11 @@ hypre_ParCSRMaxEigEstimateCGDevice(hypre_ParCSRMatrix *A,     /* matrix to relax
       gamma_old = gamma;
       gamma     = hypre_ParVectorInnerProd(r, s);
 
+      if (gamma < HYPRE_REAL_EPSILON)
+      {
+         break;
+      }
+
       if (i == 0)
       {
          beta = 1.0;
@@ -385,9 +367,7 @@ hypre_ParCSRMaxEigEstimateCGDevice(hypre_ParCSRMatrix *A,     /* matrix to relax
          beta = gamma / gamma_old;
 
          /* p = s + beta p */
-         HYPRE_THRUST_CALL(transform,
-                           s_data, s_data + local_size, p_data, p_data,
-                           _1 + beta * _2);
+         hypreDevice_ComplexAxpyn(p_data, local_size, s_data, p_data, beta);
       }
 
       if (scale)
@@ -395,12 +375,22 @@ hypre_ParCSRMaxEigEstimateCGDevice(hypre_ParCSRMatrix *A,     /* matrix to relax
          /* s = D^{-1/2}A*D^{-1/2}*p */
 
          /* u = ds .* p */
+#if defined(HYPRE_USING_SYCL)
+         HYPRE_ONEDPL_CALL( std::transform, ds_data, ds_data + local_size, p_data, u_data,
+         [] (auto x, auto y) { return x * y; } );
+#else
          HYPRE_THRUST_CALL( transform, ds_data, ds_data + local_size, p_data, u_data, _1 * _2 );
+#endif
 
          hypre_ParCSRMatrixMatvec(1.0, A, u, 0.0, s);
 
          /* s = ds .* s */
+#if defined(HYPRE_USING_SYCL)
+         HYPRE_ONEDPL_CALL( std::transform, ds_data, ds_data + local_size, s_data, s_data,
+         [] (auto x, auto y) { return x * y; } );
+#else
          HYPRE_THRUST_CALL( transform, ds_data, ds_data + local_size, s_data, s_data, _1 * _2 );
+#endif
       }
       else
       {
@@ -422,7 +412,7 @@ hypre_ParCSRMaxEigEstimateCGDevice(hypre_ParCSRMatrix *A,     /* matrix to relax
       tridiag[i] += alphainv;
 
       trioffd[i + 1] = alphainv;
-      trioffd[i] *= sqrt(beta);
+      trioffd[i] *= hypre_sqrt(beta);
 
       /* x = x + alpha*p */
       /* don't need */
@@ -446,21 +436,15 @@ hypre_ParCSRMaxEigEstimateCGDevice(hypre_ParCSRMatrix *A,     /* matrix to relax
     * but I am not certain, nor do I have the legal knowledge to know if the
     * license is compatible with that which HYPRE is released under.
     */
-#if defined(HYPRE_USING_CUDA)
    hypre_GpuProfilingPopRange();
-#endif
-#if defined(HYPRE_USING_CUDA)
    hypre_GpuProfilingPushRange("ParCSRMaxEigEstimate_TriDiagEigenSolve");
-#endif
 
    /* eispack routine - eigenvalues return in tridiag and ordered*/
    hypre_LINPACKcgtql1(&i, tridiag, trioffd, &err);
 
    lambda_max = tridiag[i - 1];
    lambda_min = tridiag[0];
-#if defined(HYPRE_USING_CUDA)
    hypre_GpuProfilingPopRange();
-#endif
    /* hypre_printf("linpack max eig est = %g\n", lambda_max);*/
    /* hypre_printf("linpack min eig est = %g\n", lambda_min);*/
 
diff --git a/external/hypre/src/parcsr_ls/par_restr.c b/external/hypre/src/parcsr_ls/par_restr.c
index 5d1772e1..ba1cabd5 100644
--- a/external/hypre/src/parcsr_ls/par_restr.c
+++ b/external/hypre/src/parcsr_ls/par_restr.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -13,8 +13,10 @@
 #define EPSILON 1e-18
 #define EPSIMAC 1e-16
 
-void hypre_fgmresT(HYPRE_Int n, HYPRE_Complex *A, HYPRE_Complex *b, HYPRE_Real tol, HYPRE_Int kdim, HYPRE_Complex *x, HYPRE_Real *relres, HYPRE_Int *iter, HYPRE_Int job);
-void hypre_ordered_GS(const HYPRE_Complex L[], const HYPRE_Complex rhs[], HYPRE_Complex x[], const HYPRE_Int n);
+void hypre_fgmresT(HYPRE_Int n, HYPRE_Complex *A, HYPRE_Complex *b, HYPRE_Real tol, HYPRE_Int kdim,
+                   HYPRE_Complex *x, HYPRE_Real *relres, HYPRE_Int *iter, HYPRE_Int job);
+void hypre_ordered_GS(const HYPRE_Complex L[], const HYPRE_Complex rhs[], HYPRE_Complex x[],
+                      const HYPRE_Int n);
 
 HYPRE_Int
 hypre_BoomerAMGBuildRestrAIR( hypre_ParCSRMatrix   *A,
@@ -29,6 +31,7 @@ hypre_BoomerAMGBuildRestrAIR( hypre_ParCSRMatrix   *A,
                               HYPRE_Int             is_triangular,
                               HYPRE_Int             gmres_switch)
 {
+   HYPRE_UNUSED_VAR(debug_flag);
 
    MPI_Comm                 comm     = hypre_ParCSRMatrixComm(A);
    hypre_ParCSRCommPkg     *comm_pkg = hypre_ParCSRMatrixCommPkg(A);
@@ -113,11 +116,11 @@ hypre_BoomerAMGBuildRestrAIR( hypre_ParCSRMatrix   *A,
 
    /*-------------- global number of C points and my start position */
    /*my_first_cpt = num_cpts_global[0];*/
-   if (my_id == (num_procs -1))
+   if (my_id == (num_procs - 1))
    {
       total_global_cpts = num_cpts_global[1];
    }
-   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
+   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
 
    /*-------------------------------------------------------------------
     * Get the CF_marker data for the off-processor columns
@@ -125,12 +128,12 @@ hypre_BoomerAMGBuildRestrAIR( hypre_ParCSRMatrix   *A,
    /* CF marker for the off-diag columns */
    if (num_cols_A_offd)
    {
-      CF_marker_offd = hypre_CTAlloc(HYPRE_Int, num_cols_A_offd,HYPRE_MEMORY_HOST);
+      CF_marker_offd = hypre_CTAlloc(HYPRE_Int, num_cols_A_offd, HYPRE_MEMORY_HOST);
    }
    /* function type indicator for the off-diag columns */
    if (num_functions > 1 && num_cols_A_offd)
    {
-      dof_func_offd = hypre_CTAlloc(HYPRE_Int, num_cols_A_offd,HYPRE_MEMORY_HOST);
+      dof_func_offd = hypre_CTAlloc(HYPRE_Int, num_cols_A_offd, HYPRE_MEMORY_HOST);
    }
    /* if CommPkg of A is not present, create it */
    if (!comm_pkg)
@@ -142,7 +145,8 @@ hypre_BoomerAMGBuildRestrAIR( hypre_ParCSRMatrix   *A,
    num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
    /* send buffer, of size send_map_starts[num_sends]),
     * i.e., number of entries to send */
-   int_buf_data = hypre_CTAlloc(HYPRE_Int, hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),HYPRE_MEMORY_HOST);
+   int_buf_data = hypre_CTAlloc(HYPRE_Int, hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                                HYPRE_MEMORY_HOST);
    /* copy CF markers of elements to send to buffer
     * RL: why copy them with two for loops? Why not just loop through all in one */
    index = 0;
@@ -151,10 +155,10 @@ hypre_BoomerAMGBuildRestrAIR( hypre_ParCSRMatrix   *A,
       /* start pos of elements sent to send_proc[i] */
       start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
       /* loop through all elems to send_proc[i] */
-      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
       {
          /* CF marker of send_map_elemts[j] */
-         int_buf_data[index++] = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+         int_buf_data[index++] = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
       }
    }
    /* create a handle to start communication. 11: for integer */
@@ -168,9 +172,9 @@ hypre_BoomerAMGBuildRestrAIR( hypre_ParCSRMatrix   *A,
       for (i = 0; i < num_sends; i++)
       {
          start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-         for (j=start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
          {
-            int_buf_data[index++] = dof_func[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+            int_buf_data[index++] = dof_func[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
          }
       }
       comm_handle = hypre_ParCSRCommHandleCreate(11, comm_pkg, int_buf_data, dof_func_offd);
@@ -198,7 +202,7 @@ hypre_BoomerAMGBuildRestrAIR( hypre_ParCSRMatrix   *A,
        * strongly influence i */
       local_size = 0;
       /* loop through the diag part of S */
-      for (j = S_diag_i[i]; j < S_diag_i[i+1]; j++)
+      for (j = S_diag_i[i]; j < S_diag_i[i + 1]; j++)
       {
          i1 = S_diag_j[j];
          /* F point */
@@ -212,7 +216,7 @@ hypre_BoomerAMGBuildRestrAIR( hypre_ParCSRMatrix   *A,
       if (num_procs > 1)
       {
          /* use this mapping to have offd indices of A */
-         for (j = S_offd_i[i]; j < S_offd_i[i+1]; j++)
+         for (j = S_offd_i[i]; j < S_offd_i[i + 1]; j++)
          {
             i1 = S_offd_j[j];
             if (CF_marker_offd[i1] < 0)
@@ -234,15 +238,15 @@ hypre_BoomerAMGBuildRestrAIR( hypre_ParCSRMatrix   *A,
    nnz_offd = cnt_offd;
 
    /*------------- allocate arrays */
-   R_diag_i    = hypre_CTAlloc(HYPRE_Int,  n_cpts+1,HYPRE_MEMORY_HOST);
-   R_diag_j    = hypre_CTAlloc(HYPRE_Int,  nnz_diag,HYPRE_MEMORY_HOST);
-   R_diag_data = hypre_CTAlloc(HYPRE_Complex, nnz_diag,HYPRE_MEMORY_HOST);
+   R_diag_i    = hypre_CTAlloc(HYPRE_Int,  n_cpts + 1, HYPRE_MEMORY_HOST);
+   R_diag_j    = hypre_CTAlloc(HYPRE_Int,  nnz_diag, HYPRE_MEMORY_HOST);
+   R_diag_data = hypre_CTAlloc(HYPRE_Complex, nnz_diag, HYPRE_MEMORY_HOST);
 
    /* not in ``if num_procs > 1'',
     * allocation needed even for empty CSR */
-   R_offd_i    = hypre_CTAlloc(HYPRE_Int,  n_cpts+1,HYPRE_MEMORY_HOST);
-   R_offd_j    = hypre_CTAlloc(HYPRE_Int,  nnz_offd,HYPRE_MEMORY_HOST);
-   R_offd_data = hypre_CTAlloc(HYPRE_Complex, nnz_offd,HYPRE_MEMORY_HOST);
+   R_offd_i    = hypre_CTAlloc(HYPRE_Int,  n_cpts + 1, HYPRE_MEMORY_HOST);
+   R_offd_j    = hypre_CTAlloc(HYPRE_Int,  nnz_offd, HYPRE_MEMORY_HOST);
+   R_offd_data = hypre_CTAlloc(HYPRE_Complex, nnz_offd, HYPRE_MEMORY_HOST);
 
    /* redundant */
    R_diag_i[0] = 0;
@@ -277,13 +281,13 @@ hypre_BoomerAMGBuildRestrAIR( hypre_ParCSRMatrix   *A,
       marker_diag[i] = -1;
    }
    marker_offd = hypre_CTAlloc(HYPRE_Int, num_cols_A_offd, HYPRE_MEMORY_HOST);
-   for (i = 0; i< num_cols_A_offd; i++)
+   for (i = 0; i < num_cols_A_offd; i++)
    {
       marker_offd[i] = -1;
    }
 
    // Allocate the rhs and dense local matrix in column-major form (for LAPACK)
-   DAi = hypre_CTAlloc(HYPRE_Complex, local_max_size*local_max_size, HYPRE_MEMORY_HOST);
+   DAi = hypre_CTAlloc(HYPRE_Complex, local_max_size * local_max_size, HYPRE_MEMORY_HOST);
    Dbi = hypre_CTAlloc(HYPRE_Complex, local_max_size, HYPRE_MEMORY_HOST);
    Dxi = hypre_CTAlloc(HYPRE_Complex, local_max_size, HYPRE_MEMORY_HOST);
    Ipi = hypre_CTAlloc(HYPRE_Int, local_max_size, HYPRE_MEMORY_HOST); // pivot matrix
@@ -320,7 +324,7 @@ hypre_BoomerAMGBuildRestrAIR( hypre_ParCSRMatrix   *A,
        * strongly influence i
        * Access S for the first time, mark the points we want */
       /* 1: loop through the diag part of S */
-      for (j = S_diag_i[i]; j < S_diag_i[i+1]; j++)
+      for (j = S_diag_i[i]; j < S_diag_i[i + 1]; j++)
       {
          i1 = S_diag_j[j];
          /* F point */
@@ -334,7 +338,7 @@ hypre_BoomerAMGBuildRestrAIR( hypre_ParCSRMatrix   *A,
       /* 2: if parallel, loop through the offd part */
       if (num_procs > 1)
       {
-         for (j = S_offd_i[i]; j < S_offd_i[i+1]; j++)
+         for (j = S_offd_i[i]; j < S_offd_i[i + 1]; j++)
          {
             /* use this mapping to have offd indices of A */
             i1 = S_offd_j[j];
@@ -384,7 +388,7 @@ hypre_BoomerAMGBuildRestrAIR( hypre_ParCSRMatrix   *A,
        * rr is the local dense matrix row counter */
       rr = 0;
       /* 1. diag part of row i */
-      for (j = S_diag_i[i]; j < S_diag_i[i+1]; j++)
+      for (j = S_diag_i[i]; j < S_diag_i[i + 1]; j++)
       {
          /* row i1 */
          i1 = S_diag_j[j];
@@ -393,7 +397,7 @@ hypre_BoomerAMGBuildRestrAIR( hypre_ParCSRMatrix   *A,
          {
             /* go through row i1 of A: a local row */
             /* diag part of row i1 */
-            for (k = A_diag_i[i1]; k < A_diag_i[i1+1]; k++)
+            for (k = A_diag_i[i1]; k < A_diag_i[i1 + 1]; k++)
             {
                k1 = A_diag_j[k];
                /* if this col is marked with its local dense id */
@@ -408,7 +412,7 @@ hypre_BoomerAMGBuildRestrAIR( hypre_ParCSRMatrix   *A,
             /* if parallel, offd part of row i1 */
             if (num_procs > 1)
             {
-               for (k = A_offd_i[i1]; k < A_offd_i[i1+1]; k++)
+               for (k = A_offd_i[i1]; k < A_offd_i[i1 + 1]; k++)
                {
                   k1 = A_offd_j[k];
                   /* if this col is marked with its local dense id */
@@ -431,7 +435,7 @@ hypre_BoomerAMGBuildRestrAIR( hypre_ParCSRMatrix   *A,
       if (num_procs > 1)
       {
          HYPRE_BigInt big_k1;
-         for (j = S_offd_i[i]; j < S_offd_i[i+1]; j++)
+         for (j = S_offd_i[i]; j < S_offd_i[i + 1]; j++)
          {
             /* row i1: use this mapping to have offd indices of A */
             i1 = S_offd_j[j];
@@ -439,14 +443,14 @@ hypre_BoomerAMGBuildRestrAIR( hypre_ParCSRMatrix   *A,
             if (CF_marker_offd[i1] < 0)
             {
                /* loop through row i1 of A_ext, a global CSR matrix */
-               for (k = A_ext_i[i1]; k < A_ext_i[i1+1]; k++)
+               for (k = A_ext_i[i1]; k < A_ext_i[i1 + 1]; k++)
                {
                   /* k1 is a global index! */
                   big_k1 = A_ext_j[k];
                   if (big_k1 >= col_start && big_k1 < col_end)
                   {
                      /* big_k1 is in the diag part, adjust to local index */
-                     k1 = (HYPRE_Int)(big_k1-col_start);
+                     k1 = (HYPRE_Int)(big_k1 - col_start);
                      /* if this col is marked with its local dense id*/
                      if ((cc = marker_diag[k1]) >= 0)
                      {
@@ -486,7 +490,7 @@ hypre_BoomerAMGBuildRestrAIR( hypre_ParCSRMatrix   *A,
       /* assemble rhs bi: entries from row i of A */
       rr = 0;
       /* diag part */
-      for (j = A_diag_i[i]; j < A_diag_i[i+1]; j++)
+      for (j = A_diag_i[i]; j < A_diag_i[i + 1]; j++)
       {
          i1 = A_diag_j[j];
          if ((cc = marker_diag[i1]) >= 0)
@@ -503,7 +507,7 @@ hypre_BoomerAMGBuildRestrAIR( hypre_ParCSRMatrix   *A,
       /* if parallel, offd part */
       if (num_procs > 1)
       {
-         for (j = A_offd_i[i]; j < A_offd_i[i+1]; j++)
+         for (j = A_offd_i[i]; j < A_offd_i[i + 1]; j++)
          {
             i1 = A_offd_j[j];
             if ((cc = marker_offd[i1]) >= 0)
@@ -548,9 +552,10 @@ hypre_BoomerAMGBuildRestrAIR( hypre_ParCSRMatrix   *A,
          else if (Aisol_method == 'L')
          {
 #if AIR_DEBUG
-            memcpy(TMPA, DAi, local_size*local_size*sizeof(HYPRE_Complex));
-            memcpy(TMPb, Dbi, local_size*sizeof(HYPRE_Complex));
+            memcpy(TMPA, DAi, local_size * local_size * sizeof(HYPRE_Complex));
+            memcpy(TMPb, Dbi, local_size * sizeof(HYPRE_Complex));
 #endif
+            lapack_info = 0;
             hypre_dgetrf(&local_size, &local_size, DAi, &local_size, Ipi,
                          &lapack_info);
 
@@ -600,9 +605,9 @@ hypre_BoomerAMGBuildRestrAIR( hypre_ParCSRMatrix   *A,
             nrmb = hypre_dnrm2(&local_size, Dbi, &ione);
             hypre_daxpy(&local_size, &alp, Dbi, &ione, TMPd, &ione);
             err = hypre_dnrm2(&local_size, TMPd, &ione);
-            if (err/nrmb > gmresAi_tol)
+            if (err / nrmb > gmresAi_tol)
             {
-               hypre_printf("GMRES/Jacobi: res norm %e, nrmb %e, relative %e\n", err, nrmb, err/nrmb);
+               hypre_printf("GMRES/Jacobi: res norm %e, nrmb %e, relative %e\n", err, nrmb, err / nrmb);
                hypre_printf("GMRES/Jacobi: relative %e\n", gmresAi_res);
                exit(0);
             }
@@ -610,12 +615,12 @@ hypre_BoomerAMGBuildRestrAIR( hypre_ParCSRMatrix   *A,
          }
       }
 
-      HYPRE_Complex *Soli = (is_triangular || (Aisol_method=='G')) ? Dxi : Dbi;
+      HYPRE_Complex *Soli = (is_triangular || (Aisol_method == 'G')) ? Dxi : Dbi;
 
       /* now we are ready to fill this row of R */
       /* diag part */
       rr = 0;
-      for (j = S_diag_i[i]; j < S_diag_i[i+1]; j++)
+      for (j = S_diag_i[i]; j < S_diag_i[i + 1]; j++)
       {
          i1 = S_diag_j[j];
          /* F point */
@@ -635,12 +640,12 @@ hypre_BoomerAMGBuildRestrAIR( hypre_ParCSRMatrix   *A,
       R_diag_data[cnt_diag++] = 1.0;
 
       /* row ptr of the next row */
-      R_diag_i[ic+1] = cnt_diag;
+      R_diag_i[ic + 1] = cnt_diag;
 
       /* offd part */
       if (num_procs > 1)
       {
-         for (j = S_offd_i[i]; j < S_offd_i[i+1]; j++)
+         for (j = S_offd_i[i]; j < S_offd_i[i + 1]; j++)
          {
             /* use this mapping to have offd indices of A */
             i1 = S_offd_j[j];
@@ -657,13 +662,13 @@ hypre_BoomerAMGBuildRestrAIR( hypre_ParCSRMatrix   *A,
          }
       }
       /* row ptr of the next row */
-      R_offd_i[ic+1] = cnt_offd;
+      R_offd_i[ic + 1] = cnt_offd;
 
       /* we must have copied all entries */
       hypre_assert(rr == local_size);
 
       /* reset markers */
-      for (j = S_diag_i[i]; j < S_diag_i[i+1]; j++)
+      for (j = S_diag_i[i]; j < S_diag_i[i + 1]; j++)
       {
          i1 = S_diag_j[j];
          /* F point */
@@ -675,7 +680,7 @@ hypre_BoomerAMGBuildRestrAIR( hypre_ParCSRMatrix   *A,
       }
       if (num_procs > 1)
       {
-         for (j = S_offd_i[i]; j < S_offd_i[i+1]; j++)
+         for (j = S_offd_i[i]; j < S_offd_i[i + 1]; j++)
          {
             /* use this mapping to have offd indices of A */
             i1 = S_offd_j[j];
@@ -770,7 +775,8 @@ hypre_BoomerAMGBuildRestrAIR( hypre_ParCSRMatrix   *A,
    hypre_MatvecCommPkgCreate(R);
 
    /* Filter small entries from R */
-   if (filter_thresholdR > 0) {
+   if (filter_thresholdR > 0)
+   {
       hypre_ParCSRMatrixDropSmallEntries(R, filter_thresholdR, -1);
    }
 
@@ -805,16 +811,19 @@ hypre_BoomerAMGBuildRestrAIR( hypre_ParCSRMatrix   *A,
    return 0;
 }
 
-
 /* Compute matvec A^Tx = y, where A is stored in column major form. */
 // This can also probably be accomplished with BLAS
-static inline void colmaj_mvT(HYPRE_Complex *A, HYPRE_Complex *x, HYPRE_Complex *y, HYPRE_Int n)
+static inline void
+colmaj_mvT(HYPRE_Complex *A,
+           HYPRE_Complex *x,
+           HYPRE_Complex *y,
+           HYPRE_Int      n)
 {
-   memset(y, 0, n*sizeof(HYPRE_Complex));
+   memset(y, 0, n * sizeof(HYPRE_Complex));
    HYPRE_Int i, j;
    for (i = 0; i < n; i++)
    {
-      HYPRE_Int row0 = i*n;
+      HYPRE_Int row0 = i * n;
       for (j = 0; j < n; j++)
       {
          y[i] += x[j] * A[row0 + j];
@@ -823,32 +832,32 @@ static inline void colmaj_mvT(HYPRE_Complex *A, HYPRE_Complex *x, HYPRE_Complex
 }
 
 // TODO : need to initialize and de-initialize GMRES
-void hypre_fgmresT(HYPRE_Int n,
-                   HYPRE_Complex *A,
-                   HYPRE_Complex *b,
-                   HYPRE_Real tol,
-                   HYPRE_Int kdim,
-                   HYPRE_Complex *x,
-                   HYPRE_Real *relres,
-                   HYPRE_Int *iter,
-                   HYPRE_Int job)
+void
+hypre_fgmresT(HYPRE_Int      n,
+              HYPRE_Complex *A,
+              HYPRE_Complex *b,
+              HYPRE_Real     tol,
+              HYPRE_Int      kdim,
+              HYPRE_Complex *x,
+              HYPRE_Real    *relres,
+              HYPRE_Int     *iter,
+              HYPRE_Int      job)
 {
-
-   HYPRE_Int one=1, i, j, k;
-   static HYPRE_Complex *V=NULL, *Z=NULL, *H=NULL, *c=NULL, *s=NULL, *rs=NULL;
+   HYPRE_Int one = 1, i, j, k;
+   static HYPRE_Complex *V = NULL, *Z = NULL, *H = NULL, *c = NULL, *s = NULL, *rs = NULL;
    HYPRE_Complex *v, *z, *w;
    HYPRE_Real t, normr, normr0, tolr;
 
    if (job == -1)
    {
-      V  = hypre_TAlloc(HYPRE_Complex, n*(kdim+1),    HYPRE_MEMORY_HOST);
+      V  = hypre_TAlloc(HYPRE_Complex, n * (kdim + 1),    HYPRE_MEMORY_HOST);
       /* Z  = hypre_TAlloc(HYPRE_Complex, n*kdim,        HYPRE_MEMORY_HOST); */
       /* XXX NO PRECOND */
       Z = V;
-      H  = hypre_TAlloc(HYPRE_Complex, (kdim+1)*kdim, HYPRE_MEMORY_HOST);
+      H  = hypre_TAlloc(HYPRE_Complex, (kdim + 1) * kdim, HYPRE_MEMORY_HOST);
       c  = hypre_TAlloc(HYPRE_Complex, kdim,          HYPRE_MEMORY_HOST);
       s  = hypre_TAlloc(HYPRE_Complex, kdim,          HYPRE_MEMORY_HOST);
-      rs = hypre_TAlloc(HYPRE_Complex, kdim+1,        HYPRE_MEMORY_HOST);
+      rs = hypre_TAlloc(HYPRE_Complex, kdim + 1,        HYPRE_MEMORY_HOST);
       return;
    }
    else if (job == -2)
@@ -866,7 +875,7 @@ void hypre_fgmresT(HYPRE_Int n,
    /* XXX: x_0 is all ZERO !!! so r0 = b */
    v = V;
    hypre_TMemcpy(v, b, HYPRE_Complex, n, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
-   normr0 = sqrt(hypre_ddot(&n, v, &one, v, &one));
+   normr = normr0 = hypre_sqrt(hypre_ddot(&n, v, &one, v, &one));
 
    if (normr0 < EPSIMAC)
    {
@@ -883,8 +892,8 @@ void hypre_fgmresT(HYPRE_Int n,
    {
       i++;
       // zi = M^{-1} * vi;
-      v = V + (i-1) * n;
-      z = Z + (i-1) * n;
+      v = V + (i - 1) * n;
+      z = Z + (i - 1) * n;
       /* XXX NO PRECOND */
       /* memcpy(z, v, n*sizeof(HYPRE_Complex)); */
       // w = v_{i+1} = A * zi
@@ -894,12 +903,12 @@ void hypre_fgmresT(HYPRE_Int n,
       for (j = 0; j < i; j++)
       {
          v = V + j * n;
-         H[j+(i-1)*kdim] = t = hypre_ddot(&n, v, &one, w, &one);
+         H[j + (i - 1)*kdim] = t = hypre_ddot(&n, v, &one, w, &one);
          t = -t;
          hypre_daxpy(&n, &t, v, &one, w, &one);
       }
-      H[i+(i-1)*kdim] = t = sqrt(hypre_ddot(&n, w, &one, w, &one));
-      if (fabs(t) > EPSILON)
+      H[i + (i - 1)*kdim] = t = hypre_sqrt(hypre_ddot(&n, w, &one, w, &one));
+      if (hypre_abs(t) > EPSILON)
       {
          t = 1.0 / t;
          hypre_dscal(&n, &t, w, &one);
@@ -907,25 +916,25 @@ void hypre_fgmresT(HYPRE_Int n,
       // Least square problem of H
       for (j = 1; j < i; j++)
       {
-         t = H[j-1+(i-1)*kdim];
-         H[j-1+(i-1)*kdim] =  c[j-1]*t + s[j-1]*H[j+(i-1)*kdim];
-         H[j+(i-1)*kdim]   = -s[j-1]*t + c[j-1]*H[j+(i-1)*kdim];
+         t = H[j - 1 + (i - 1) * kdim];
+         H[j - 1 + (i - 1)*kdim] =  c[j - 1] * t + s[j - 1] * H[j + (i - 1) * kdim];
+         H[j + (i - 1)*kdim]   = -s[j - 1] * t + c[j - 1] * H[j + (i - 1) * kdim];
       }
-      HYPRE_Complex hii  = H[i-1+(i-1)*kdim];
-      HYPRE_Complex hii1 = H[i+(i-1)*kdim];
-      HYPRE_Complex gam = sqrt(hii*hii + hii1*hii1);
+      HYPRE_Complex hii  = H[i - 1 + (i - 1) * kdim];
+      HYPRE_Complex hii1 = H[i + (i - 1) * kdim];
+      HYPRE_Complex gam = hypre_sqrt(hii * hii + hii1 * hii1);
 
-      if (fabs(gam) < EPSILON)
+      if (hypre_cabs(gam) < EPSILON)
       {
          gam = EPSIMAC;
       }
-      c[i-1] = hii / gam;
-      s[i-1] = hii1 / gam;
-      rs[i]   = -s[i-1] * rs[i-1];
-      rs[i-1] =  c[i-1] * rs[i-1];
+      c[i - 1] = hii / gam;
+      s[i - 1] = hii1 / gam;
+      rs[i]   = -s[i - 1] * rs[i - 1];
+      rs[i - 1] =  c[i - 1] * rs[i - 1];
       // residue norm
-      H[i-1+(i-1)*kdim] = c[i-1]*hii + s[i-1]*hii1;
-      normr = fabs(rs[i]);
+      H[i - 1 + (i - 1)*kdim] = c[i - 1] * hii + s[i - 1] * hii1;
+      normr = hypre_cabs(rs[i]);
       if (normr <= tolr)
       {
          break;
@@ -933,33 +942,34 @@ void hypre_fgmresT(HYPRE_Int n,
    }
 
    // solve the upper triangular system
-   rs[i-1] /= H[i-1+(i-1)*kdim];
-   for (k = i-2; k >= 0; k--)
+   rs[i - 1] /= H[i - 1 + (i - 1) * kdim];
+   for (k = i - 2; k >= 0; k--)
    {
-      for (j = k+1; j < i; j++)
+      for (j = k + 1; j < i; j++)
       {
-         rs[k] -= H[k+j*kdim]*rs[j];
+         rs[k] -= H[k + j * kdim] * rs[j];
       }
-      rs[k] /= H[k+k*kdim];
+      rs[k] /= H[k + k * kdim];
    }
+
    // get solution
    for (j = 0; j < i; j++)
    {
       z = Z + j * n;
-      hypre_daxpy(&n, rs+j, z, &one, x, &one);
+      hypre_daxpy(&n, rs + j, z, &one, x, &one);
    }
 
    *relres = normr / normr0;
    *iter = i;
 }
 
-
 /* Ordered Gauss Seidel on A^T in column major format. Since we are
  * solving A^T, equivalent to solving A in row major format. */
-void hypre_ordered_GS(const HYPRE_Complex L[],
-                      const HYPRE_Complex rhs[],
-                      HYPRE_Complex x[],
-                      const HYPRE_Int n)
+void
+hypre_ordered_GS(const HYPRE_Complex L[],
+                 const HYPRE_Complex rhs[],
+                 HYPRE_Complex       x[],
+                 const HYPRE_Int     n)
 {
    // Get triangular ordering of L^T in col major as ordering of L in row major
    HYPRE_Int *ordering = hypre_TAlloc(HYPRE_Int, n, HYPRE_MEMORY_HOST);
@@ -975,11 +985,12 @@ void hypre_ordered_GS(const HYPRE_Complex L[],
       {
          if (col != row)
          {
-            temp -= L[row*n+col] * x[col];   // row-major
+            temp -= L[row * n + col] * x[col]; // row-major
          }
       }
-      HYPRE_Complex diag = L[row*n + row];
-      if (fabs(diag) < 1e-12)
+
+      HYPRE_Complex diag = L[row * n + row];
+      if (hypre_cabs(diag) < 1e-12)
       {
          x[row] = 0.0;
       }
diff --git a/external/hypre/src/parcsr_ls/par_rotate_7pt.c b/external/hypre/src/parcsr_ls/par_rotate_7pt.c
index f1aa6ee3..cf11eb75 100644
--- a/external/hypre/src/parcsr_ls/par_rotate_7pt.c
+++ b/external/hypre/src/parcsr_ls/par_rotate_7pt.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -31,12 +31,12 @@ GenerateRotate7pt( MPI_Comm       comm,
    HYPRE_Real *diag_data;
 
    HYPRE_Int    *offd_i;
-   HYPRE_Int    *offd_j;
-   HYPRE_Real *offd_data;
+   HYPRE_Int    *offd_j = NULL;
+   HYPRE_Real *offd_data = NULL;
 
    HYPRE_Real *value;
    HYPRE_Real ac, bc, cc, s, c, pi, x;
-   HYPRE_BigInt *global_part;
+   HYPRE_BigInt global_part[2];
    HYPRE_BigInt ix, iy;
    HYPRE_Int cnt, o_cnt;
    HYPRE_Int local_num_rows;
@@ -55,52 +55,51 @@ GenerateRotate7pt( MPI_Comm       comm,
    HYPRE_Int num_procs;
    HYPRE_Int P_busy, Q_busy;
 
-   hypre_MPI_Comm_size(comm,&num_procs);
+   hypre_MPI_Comm_size(comm, &num_procs);
 
-   grid_size = nx*ny;
+   grid_size = nx * ny;
 
    value = hypre_CTAlloc(HYPRE_Real, 4, HYPRE_MEMORY_HOST);
-   pi = 4.0*atan(1.0);
-   x = pi*alpha/180.0;
-   s = sin(x);
-   c = cos(x);
-   ac = -(c*c + eps*s*s);
-   bc = 2.0*(1.0 - eps)*s*c;
-   cc = -(s*s + eps*c*c);
-   value[0] = -2*(2*ac+bc+2*cc);
-   value[1] = 2*ac+bc;
-   value[2] = bc+2*cc;
+   pi = 4.0 * hypre_atan(1.0);
+   x = pi * alpha / 180.0;
+   s = hypre_sin(x);
+   c = hypre_cos(x);
+   ac = -(c * c + eps * s * s);
+   bc = 2.0 * (1.0 - eps) * s * c;
+   cc = -(s * s + eps * c * c);
+   value[0] = -2 * (2 * ac + bc + 2 * cc);
+   value[1] = 2 * ac + bc;
+   value[2] = bc + 2 * cc;
    value[3] = -bc;
 
-   hypre_GeneratePartitioning(nx,P,&nx_part);
-   hypre_GeneratePartitioning(ny,Q,&ny_part);
+   hypre_GeneratePartitioning(nx, P, &nx_part);
+   hypre_GeneratePartitioning(ny, Q, &ny_part);
 
-   nx_local = (HYPRE_Int)(nx_part[p+1] - nx_part[p]);
-   ny_local = (HYPRE_Int)(ny_part[q+1] - ny_part[q]);
+   nx_local = (HYPRE_Int)(nx_part[p + 1] - nx_part[p]);
+   ny_local = (HYPRE_Int)(ny_part[q + 1] - ny_part[q]);
 
-   local_num_rows = nx_local*ny_local;
+   local_num_rows = nx_local * ny_local;
 
-   global_part = hypre_CTAlloc(HYPRE_BigInt, 2, HYPRE_MEMORY_HOST);
-   global_part[0] = ny_part[q]*nx + nx_part[p]*ny_local;
-   global_part[1] = global_part[0]+(HYPRE_BigInt)local_num_rows;
+   global_part[0] = ny_part[q] * nx + nx_part[p] * ny_local;
+   global_part[1] = global_part[0] + (HYPRE_BigInt)local_num_rows;
 
-   diag_i = hypre_CTAlloc(HYPRE_Int,  local_num_rows+1, HYPRE_MEMORY_HOST);
-   offd_i = hypre_CTAlloc(HYPRE_Int,  local_num_rows+1, HYPRE_MEMORY_HOST);
+   diag_i = hypre_CTAlloc(HYPRE_Int,  local_num_rows + 1, HYPRE_MEMORY_HOST);
+   offd_i = hypre_CTAlloc(HYPRE_Int,  local_num_rows + 1, HYPRE_MEMORY_HOST);
 
-   P_busy = hypre_min(nx,P);
-   Q_busy = hypre_min(ny,Q);
+   P_busy = hypre_min(nx, P);
+   Q_busy = hypre_min(ny, Q);
 
    num_cols_offd = 0;
-   if (p) num_cols_offd += ny_local;
-   if (p < P_busy-1) num_cols_offd += ny_local;
-   if (q) num_cols_offd += nx_local;
-   if (q < Q_busy-1) num_cols_offd += nx_local;
-   if (p && q) num_cols_offd++;
-   if (p && q < Q_busy-1 ) num_cols_offd++;
-   if (p < P_busy-1 && q ) num_cols_offd++;
-   if (p < P_busy-1 && q < Q_busy-1 ) num_cols_offd++;
+   if (p) { num_cols_offd += ny_local; }
+   if (p < P_busy - 1) { num_cols_offd += ny_local; }
+   if (q) { num_cols_offd += nx_local; }
+   if (q < Q_busy - 1) { num_cols_offd += nx_local; }
+   if (p && q) { num_cols_offd++; }
+   if (p && q < Q_busy - 1 ) { num_cols_offd++; }
+   if (p < P_busy - 1 && q ) { num_cols_offd++; }
+   if (p < P_busy - 1 && q < Q_busy - 1 ) { num_cols_offd++; }
 
-   if (!local_num_rows) num_cols_offd = 0;
+   if (!local_num_rows) { num_cols_offd = 0; }
 
    col_map_offd = hypre_CTAlloc(HYPRE_BigInt,  num_cols_offd, HYPRE_MEMORY_HOST);
 
@@ -108,14 +107,14 @@ GenerateRotate7pt( MPI_Comm       comm,
    o_cnt = 0;
    diag_i[0] = 0;
    offd_i[0] = 0;
-   for (iy = ny_part[q];  iy < ny_part[q+1]; iy++)
+   for (iy = ny_part[q];  iy < ny_part[q + 1]; iy++)
    {
-      for (ix = nx_part[p]; ix < nx_part[p+1]; ix++)
+      for (ix = nx_part[p]; ix < nx_part[p + 1]; ix++)
       {
          cnt++;
          o_cnt++;
-         diag_i[cnt] = diag_i[cnt-1];
-         offd_i[o_cnt] = offd_i[o_cnt-1];
+         diag_i[cnt] = diag_i[cnt - 1];
+         offd_i[o_cnt] = offd_i[o_cnt - 1];
          diag_i[cnt]++;
          if (iy > ny_part[q])
          {
@@ -127,7 +126,9 @@ GenerateRotate7pt( MPI_Comm       comm,
             else
             {
                if (ix)
+               {
                   offd_i[o_cnt]++;
+               }
             }
          }
          else
@@ -146,7 +147,9 @@ GenerateRotate7pt( MPI_Comm       comm,
             }
          }
          if (ix > nx_part[p])
+         {
             diag_i[cnt]++;
+         }
          else
          {
             if (ix)
@@ -154,38 +157,42 @@ GenerateRotate7pt( MPI_Comm       comm,
                offd_i[o_cnt]++;
             }
          }
-         if (ix+1 < nx_part[p+1])
+         if (ix + 1 < nx_part[p + 1])
+         {
             diag_i[cnt]++;
+         }
          else
          {
-            if (ix+1 < nx)
+            if (ix + 1 < nx)
             {
                offd_i[o_cnt]++;
             }
          }
-         if (iy+1 < ny_part[q+1])
+         if (iy + 1 < ny_part[q + 1])
          {
             diag_i[cnt]++;
-            if (ix < nx_part[p+1]-1)
+            if (ix < nx_part[p + 1] - 1)
             {
                diag_i[cnt]++;
             }
             else
             {
-               if (ix+1 < nx)
+               if (ix + 1 < nx)
+               {
                   offd_i[o_cnt]++;
+               }
             }
          }
          else
          {
-            if (iy+1 < ny)
+            if (iy + 1 < ny)
             {
                offd_i[o_cnt]++;
-               if (ix < nx_part[p+1]-1)
+               if (ix < nx_part[p + 1] - 1)
                {
                   offd_i[o_cnt]++;
                }
-               else if (ix < nx-1)
+               else if (ix < nx - 1)
                {
                   offd_i[o_cnt]++;
                }
@@ -207,9 +214,9 @@ GenerateRotate7pt( MPI_Comm       comm,
    row_index = 0;
    cnt = 0;
    o_cnt = 0;
-   for (iy = ny_part[q];  iy < ny_part[q+1]; iy++)
+   for (iy = ny_part[q];  iy < ny_part[q + 1]; iy++)
    {
-      for (ix = nx_part[p]; ix < nx_part[p+1]; ix++)
+      for (ix = nx_part[p]; ix < nx_part[p + 1]; ix++)
       {
          diag_j[cnt] = row_index;
          diag_data[cnt++] = value[0];
@@ -217,19 +224,19 @@ GenerateRotate7pt( MPI_Comm       comm,
          {
             if (ix > nx_part[p])
             {
-               diag_j[cnt] = row_index-nx_local-1 ;
+               diag_j[cnt] = row_index - nx_local - 1 ;
                diag_data[cnt++] = value[3];
             }
             else
             {
                if (ix)
                {
-                  big_offd_j[o_cnt] = hypre_map2(ix-1,iy-1,p-1,q,nx,
-                        nx_part,ny_part);
+                  big_offd_j[o_cnt] = hypre_map2(ix - 1, iy - 1, p - 1, q, nx,
+                                                 nx_part, ny_part);
                   offd_data[o_cnt++] = value[3];
                }
             }
-            diag_j[cnt] = row_index-nx_local;
+            diag_j[cnt] = row_index - nx_local;
             diag_data[cnt++] = value[2];
          }
          else
@@ -238,85 +245,85 @@ GenerateRotate7pt( MPI_Comm       comm,
             {
                if (ix > nx_part[p])
                {
-                  big_offd_j[o_cnt] = hypre_map2(ix-1,iy-1,p,q-1,nx,
-                        nx_part,ny_part);
+                  big_offd_j[o_cnt] = hypre_map2(ix - 1, iy - 1, p, q - 1, nx,
+                                                 nx_part, ny_part);
                   offd_data[o_cnt++] = value[3];
                }
                else if (ix)
                {
-                  big_offd_j[o_cnt] = hypre_map2(ix-1,iy-1,p-1,q-1,nx,
-                        nx_part,ny_part);
+                  big_offd_j[o_cnt] = hypre_map2(ix - 1, iy - 1, p - 1, q - 1, nx,
+                                                 nx_part, ny_part);
                   offd_data[o_cnt++] = value[3];
                }
-               big_offd_j[o_cnt] = hypre_map2(ix,iy-1,p,q-1,nx,
-                     nx_part,ny_part);
+               big_offd_j[o_cnt] = hypre_map2(ix, iy - 1, p, q - 1, nx,
+                                              nx_part, ny_part);
                offd_data[o_cnt++] = value[2];
             }
          }
          if (ix > nx_part[p])
          {
-            diag_j[cnt] = row_index-1;
+            diag_j[cnt] = row_index - 1;
             diag_data[cnt++] = value[1];
          }
          else
          {
             if (ix)
             {
-               big_offd_j[o_cnt] = hypre_map2(ix-1,iy,p-1,q,nx,
-                     nx_part,ny_part);
+               big_offd_j[o_cnt] = hypre_map2(ix - 1, iy, p - 1, q, nx,
+                                              nx_part, ny_part);
                offd_data[o_cnt++] = value[1];
             }
          }
-         if (ix+1 < nx_part[p+1])
+         if (ix + 1 < nx_part[p + 1])
          {
-            diag_j[cnt] = row_index+1;
+            diag_j[cnt] = row_index + 1;
             diag_data[cnt++] = value[1];
          }
          else
          {
-            if (ix+1 < nx)
+            if (ix + 1 < nx)
             {
-               big_offd_j[o_cnt] = hypre_map2(ix+1,iy,p+1,q,nx,
-                     nx_part,ny_part);
+               big_offd_j[o_cnt] = hypre_map2(ix + 1, iy, p + 1, q, nx,
+                                              nx_part, ny_part);
                offd_data[o_cnt++] = value[1];
             }
          }
-         if (iy+1 < ny_part[q+1])
+         if (iy + 1 < ny_part[q + 1])
          {
-            diag_j[cnt] = row_index+nx_local;
+            diag_j[cnt] = row_index + nx_local;
             diag_data[cnt++] = value[2];
-            if (ix < nx_part[p+1]-1)
+            if (ix < nx_part[p + 1] - 1)
             {
-               diag_j[cnt] = row_index+nx_local+1 ;
+               diag_j[cnt] = row_index + nx_local + 1 ;
                diag_data[cnt++] = value[3];
             }
             else
             {
-               if (ix+1 < nx)
+               if (ix + 1 < nx)
                {
-                  big_offd_j[o_cnt] = hypre_map2(ix+1,iy+1,p+1,q,nx,
-                        nx_part,ny_part);
+                  big_offd_j[o_cnt] = hypre_map2(ix + 1, iy + 1, p + 1, q, nx,
+                                                 nx_part, ny_part);
                   offd_data[o_cnt++] = value[3];
                }
             }
          }
          else
          {
-            if (iy+1 < ny)
+            if (iy + 1 < ny)
             {
-               big_offd_j[o_cnt] = hypre_map2(ix,iy+1,p,q+1,nx,
-                     nx_part,ny_part);
+               big_offd_j[o_cnt] = hypre_map2(ix, iy + 1, p, q + 1, nx,
+                                              nx_part, ny_part);
                offd_data[o_cnt++] = value[2];
-               if (ix < nx_part[p+1]-1)
+               if (ix < nx_part[p + 1] - 1)
                {
-                  big_offd_j[o_cnt] = hypre_map2(ix+1,iy+1,p,q+1,nx,
-                        nx_part,ny_part);
+                  big_offd_j[o_cnt] = hypre_map2(ix + 1, iy + 1, p, q + 1, nx,
+                                                 nx_part, ny_part);
                   offd_data[o_cnt++] = value[3];
                }
-               else if (ix < nx-1)
+               else if (ix < nx - 1)
                {
-                  big_offd_j[o_cnt] = hypre_map2(ix+1,iy+1,p+1,q+1,nx,
-                        nx_part,ny_part);
+                  big_offd_j[o_cnt] = hypre_map2(ix + 1, iy + 1, p + 1, q + 1, nx,
+                                                 nx_part, ny_part);
                   offd_data[o_cnt++] = value[3];
                }
             }
@@ -329,14 +336,16 @@ GenerateRotate7pt( MPI_Comm       comm,
    {
       HYPRE_BigInt *work = hypre_CTAlloc(HYPRE_BigInt, o_cnt, HYPRE_MEMORY_HOST);
 
-      for (i=0; i < o_cnt; i++)
+      for (i = 0; i < o_cnt; i++)
+      {
          work[i] = big_offd_j[i];
+      }
 
-      hypre_BigQsort0(work, 0, o_cnt-1);
+      hypre_BigQsort0(work, 0, o_cnt - 1);
 
       col_map_offd[0] = work[0];
       cnt = 0;
-      for (i=0; i < o_cnt; i++)
+      for (i = 0; i < o_cnt; i++)
       {
          if (work[i] > col_map_offd[cnt])
          {
@@ -345,10 +354,10 @@ GenerateRotate7pt( MPI_Comm       comm,
          }
       }
 
-      num_cols_offd = cnt+1;
-      for (i=0; i < o_cnt; i++)
+      num_cols_offd = cnt + 1;
+      for (i = 0; i < o_cnt; i++)
       {
-         offd_j[i] = hypre_BigBinarySearch(col_map_offd,big_offd_j[i],num_cols_offd);
+         offd_j[i] = hypre_BigBinarySearch(col_map_offd, big_offd_j[i], num_cols_offd);
       }
 
       hypre_TFree(work, HYPRE_MEMORY_HOST);
@@ -383,7 +392,6 @@ GenerateRotate7pt( MPI_Comm       comm,
    hypre_TFree(nx_part, HYPRE_MEMORY_HOST);
    hypre_TFree(ny_part, HYPRE_MEMORY_HOST);
    hypre_TFree(value,   HYPRE_MEMORY_HOST);
-   hypre_TFree(global_part, HYPRE_MEMORY_HOST);
 
    return (HYPRE_ParCSRMatrix) A;
 }
diff --git a/external/hypre/src/parcsr_ls/par_scaled_matnorm.c b/external/hypre/src/parcsr_ls/par_scaled_matnorm.c
index 54634000..d4e24e56 100644
--- a/external/hypre/src/parcsr_ls/par_scaled_matnorm.c
+++ b/external/hypre/src/parcsr_ls/par_scaled_matnorm.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -20,30 +20,30 @@
 HYPRE_Int
 hypre_ParCSRMatrixScaledNorm( hypre_ParCSRMatrix *A, HYPRE_Real *scnorm)
 {
-   hypre_ParCSRCommHandle	*comm_handle;
-   hypre_ParCSRCommPkg	*comm_pkg = hypre_ParCSRMatrixCommPkg(A);
-   MPI_Comm		 comm = hypre_ParCSRMatrixComm(A);
+   hypre_ParCSRCommHandle  *comm_handle;
+   hypre_ParCSRCommPkg  *comm_pkg = hypre_ParCSRMatrixCommPkg(A);
+   MPI_Comm     comm = hypre_ParCSRMatrixComm(A);
    hypre_CSRMatrix      *diag   = hypre_ParCSRMatrixDiag(A);
-   HYPRE_Int		*diag_i = hypre_CSRMatrixI(diag);
-   HYPRE_Int		*diag_j = hypre_CSRMatrixJ(diag);
-   HYPRE_Real		*diag_data = hypre_CSRMatrixData(diag);
+   HYPRE_Int      *diag_i = hypre_CSRMatrixI(diag);
+   HYPRE_Int      *diag_j = hypre_CSRMatrixJ(diag);
+   HYPRE_Real     *diag_data = hypre_CSRMatrixData(diag);
    hypre_CSRMatrix      *offd   = hypre_ParCSRMatrixOffd(A);
-   HYPRE_Int		*offd_i = hypre_CSRMatrixI(offd);
-   HYPRE_Int		*offd_j = hypre_CSRMatrixJ(offd);
-   HYPRE_Real		*offd_data = hypre_CSRMatrixData(offd);
-   HYPRE_BigInt     	 global_num_rows = hypre_ParCSRMatrixGlobalNumRows(A);
-   HYPRE_BigInt	        *row_starts = hypre_ParCSRMatrixRowStarts(A);
-   HYPRE_Int		 num_rows = hypre_CSRMatrixNumRows(diag);
+   HYPRE_Int      *offd_i = hypre_CSRMatrixI(offd);
+   HYPRE_Int      *offd_j = hypre_CSRMatrixJ(offd);
+   HYPRE_Real     *offd_data = hypre_CSRMatrixData(offd);
+   HYPRE_BigInt       global_num_rows = hypre_ParCSRMatrixGlobalNumRows(A);
+   HYPRE_BigInt           *row_starts = hypre_ParCSRMatrixRowStarts(A);
+   HYPRE_Int       num_rows = hypre_CSRMatrixNumRows(diag);
 
    hypre_ParVector      *dinvsqrt;
-   HYPRE_Real		*dis_data;
-   hypre_Vector      	*dis_ext;
-   HYPRE_Real 		*dis_ext_data;
+   HYPRE_Real     *dis_data;
+   hypre_Vector         *dis_ext;
+   HYPRE_Real     *dis_ext_data;
    hypre_Vector         *sum;
-   HYPRE_Real		*sum_data;
+   HYPRE_Real     *sum_data;
 
-   HYPRE_Int	      num_cols_offd = hypre_CSRMatrixNumCols(offd);
-   HYPRE_Int	      num_sends, i, j, index, start;
+   HYPRE_Int         num_cols_offd = hypre_CSRMatrixNumCols(offd);
+   HYPRE_Int         num_sends, i, j, index, start;
 
    HYPRE_Real *d_buf_data;
    HYPRE_Real  mat_norm, max_row_sum;
@@ -61,7 +61,7 @@ hypre_ParCSRMatrixScaledNorm( hypre_ParCSRMatrix *A, HYPRE_Real *scnorm)
    /* generate dinvsqrt */
    for (i = 0; i < num_rows; i++)
    {
-      dis_data[i] = 1.0/sqrt(fabs(diag_data[diag_i[i]]));
+      dis_data[i] = 1.0 / hypre_sqrt(hypre_abs(diag_data[diag_i[i]]));
    }
 
    /*---------------------------------------------------------------------
@@ -76,42 +76,44 @@ hypre_ParCSRMatrixScaledNorm( hypre_ParCSRMatrix *A, HYPRE_Real *scnorm)
 
    num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
    d_buf_data = hypre_CTAlloc(HYPRE_Real,  hypre_ParCSRCommPkgSendMapStart(comm_pkg,
-						num_sends), HYPRE_MEMORY_HOST);
+                                                                           num_sends), HYPRE_MEMORY_HOST);
 
    index = 0;
    for (i = 0; i < num_sends; i++)
    {
-	start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-	for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
-		d_buf_data[index++]
-		 = dis_data[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+      start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
+      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
+         d_buf_data[index++]
+            = dis_data[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
    }
 
    comm_handle = hypre_ParCSRCommHandleCreate( 1, comm_pkg, d_buf_data,
-	dis_ext_data);
+                                               dis_ext_data);
 
-   for (i=0; i < num_rows; i++)
+   for (i = 0; i < num_rows; i++)
    {
-      for (j=diag_i[i]; j < diag_i[i+1]; j++)
+      for (j = diag_i[i]; j < diag_i[i + 1]; j++)
       {
-	 sum_data[i] += fabs(diag_data[j])*dis_data[i]*dis_data[diag_j[j]];
+         sum_data[i] += hypre_abs(diag_data[j]) * dis_data[i] * dis_data[diag_j[j]];
       }
    }
    hypre_ParCSRCommHandleDestroy(comm_handle);
 
-   for (i=0; i < num_rows; i++)
+   for (i = 0; i < num_rows; i++)
    {
-      for (j=offd_i[i]; j < offd_i[i+1]; j++)
+      for (j = offd_i[i]; j < offd_i[i + 1]; j++)
       {
-	 sum_data[i] += fabs(offd_data[j])*dis_data[i]*dis_ext_data[offd_j[j]];
+         sum_data[i] += hypre_abs(offd_data[j]) * dis_data[i] * dis_ext_data[offd_j[j]];
       }
    }
 
    max_row_sum = 0;
-   for (i=0; i < num_rows; i++)
+   for (i = 0; i < num_rows; i++)
    {
       if (max_row_sum < sum_data[i])
-	 max_row_sum = sum_data[i];
+      {
+         max_row_sum = sum_data[i];
+      }
    }
 
    hypre_MPI_Allreduce(&max_row_sum, &mat_norm, 1, HYPRE_MPI_REAL, hypre_MPI_MAX, comm);
diff --git a/external/hypre/src/parcsr_ls/par_schwarz.c b/external/hypre/src/parcsr_ls/par_schwarz.c
index b0e70ff9..027fc134 100644
--- a/external/hypre/src/parcsr_ls/par_schwarz.c
+++ b/external/hypre/src/parcsr_ls/par_schwarz.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -19,7 +19,7 @@
  *--------------------------------------------------------------------------*/
 
 void *
-hypre_SchwarzCreate()
+hypre_SchwarzCreate( void )
 {
    hypre_SchwarzData *schwarz_data;
 
@@ -70,16 +70,24 @@ hypre_SchwarzDestroy( void *data )
    hypre_SchwarzData  *schwarz_data = (hypre_SchwarzData*) data;
 
    if (hypre_SchwarzDataScale(schwarz_data))
+   {
       hypre_TFree(hypre_SchwarzDataScale(schwarz_data), HYPRE_MEMORY_HOST);
+   }
    if (hypre_SchwarzDataDofFunc(schwarz_data))
+   {
       hypre_TFree(hypre_SchwarzDataDofFunc(schwarz_data), HYPRE_MEMORY_HOST);
+   }
    hypre_CSRMatrixDestroy(hypre_SchwarzDataDomainStructure(schwarz_data));
    if (hypre_SchwarzDataVariant(schwarz_data) == 3)
+   {
       hypre_CSRMatrixDestroy(hypre_SchwarzDataABoundary(schwarz_data));
+   }
    hypre_ParVectorDestroy(hypre_SchwarzDataVtemp(schwarz_data));
 
    if (hypre_SchwarzDataPivots(schwarz_data))
+   {
       hypre_TFree(hypre_SchwarzDataPivots(schwarz_data), HYPRE_MEMORY_HOST);
+   }
 
 
    hypre_TFree(schwarz_data, HYPRE_MEMORY_HOST);
@@ -91,8 +99,10 @@ HYPRE_Int
 hypre_SchwarzSetup(void               *schwarz_vdata,
                    hypre_ParCSRMatrix *A,
                    hypre_ParVector    *f,
-                   hypre_ParVector    *u         )
+                   hypre_ParVector    *u)
 {
+   HYPRE_UNUSED_VAR(f);
+   HYPRE_UNUSED_VAR(u);
 
    hypre_SchwarzData   *schwarz_data = (hypre_SchwarzData*) schwarz_vdata;
    HYPRE_Int *dof_func;
@@ -114,8 +124,8 @@ hypre_SchwarzSetup(void               *schwarz_vdata,
    dof_func = hypre_SchwarzDataDofFunc(schwarz_data);
 
    Vtemp = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A),
-         hypre_ParCSRMatrixGlobalNumRows(A),
-         hypre_ParCSRMatrixRowStarts(A));
+                                 hypre_ParCSRMatrixGlobalNumRows(A),
+                                 hypre_ParCSRMatrixRowStarts(A));
    hypre_ParVectorInitialize(Vtemp);
    hypre_SchwarzDataVtemp(schwarz_data) = Vtemp;
 
@@ -128,21 +138,25 @@ hypre_SchwarzSetup(void               *schwarz_vdata,
 
       if (domain_structure)
       {
-       if (variant == 2)
-       {
-         hypre_ParGenerateScale(A, domain_structure, relax_weight,
-               &scale);
-         hypre_SchwarzDataScale(schwarz_data) = scale;
-       }
-       else
-       {
-         hypre_ParGenerateHybridScale(A, domain_structure, &A_boundary, &scale);
-         hypre_SchwarzDataScale(schwarz_data) = scale;
-         if (hypre_CSRMatrixNumCols(hypre_ParCSRMatrixOffd(A)))
-            hypre_SchwarzDataABoundary(schwarz_data) = A_boundary;
+         if (variant == 2)
+         {
+            hypre_ParGenerateScale(A, domain_structure, relax_weight,
+                                   &scale);
+            hypre_SchwarzDataScale(schwarz_data) = scale;
+         }
          else
-            hypre_SchwarzDataABoundary(schwarz_data) = NULL;
-       }
+         {
+            hypre_ParGenerateHybridScale(A, domain_structure, &A_boundary, &scale);
+            hypre_SchwarzDataScale(schwarz_data) = scale;
+            if (hypre_CSRMatrixNumCols(hypre_ParCSRMatrixOffd(A)))
+            {
+               hypre_SchwarzDataABoundary(schwarz_data) = A_boundary;
+            }
+            else
+            {
+               hypre_SchwarzDataABoundary(schwarz_data) = NULL;
+            }
+         }
       }
    }
    else
@@ -153,13 +167,13 @@ hypre_SchwarzSetup(void               *schwarz_vdata,
                                 &domain_structure, &pivots, use_nonsymm);
       if (domain_structure)
       {
-       if (variant == 1)
-       {
-         hypre_GenerateScale(domain_structure,
-               hypre_CSRMatrixNumRows(hypre_ParCSRMatrixDiag(A)),
-               relax_weight, &scale);
-         hypre_SchwarzDataScale(schwarz_data) = scale;
-       }
+         if (variant == 1)
+         {
+            hypre_GenerateScale(domain_structure,
+                                hypre_CSRMatrixNumRows(hypre_ParCSRMatrixDiag(A)),
+                                relax_weight, &scale);
+            hypre_SchwarzDataScale(schwarz_data) = scale;
+         }
       }
    }
 
@@ -195,31 +209,31 @@ hypre_SchwarzSolve(void               *schwarz_vdata,
 
    if (domain_structure)
    {
-    if (variant == 2)
-    {
-      hypre_ParAdSchwarzSolve(A, f, domain_structure, scale, u, Vtemp, pivots, use_nonsymm);
-    }
-    else if (variant == 3)
-    {
-      hypre_ParMPSchwarzSolve(A, A_boundary, f, domain_structure, u,
-                              relax_wt, scale, Vtemp, pivots, use_nonsymm);
-    }
-    else if (variant == 1)
-    {
-      hypre_AdSchwarzSolve(A, f, domain_structure, scale, u, Vtemp, pivots, use_nonsymm);
-    }
-    else if (variant == 4)
-    {
-      hypre_MPSchwarzFWSolve(A, hypre_ParVectorLocalVector(f),
-            domain_structure, u, relax_wt,
-                             hypre_ParVectorLocalVector(Vtemp), pivots, use_nonsymm);
-    }
-    else
-    {
-      hypre_MPSchwarzSolve(A, hypre_ParVectorLocalVector(f),
-                                  domain_structure, u, relax_wt,
-                                  hypre_ParVectorLocalVector(Vtemp), pivots, use_nonsymm);
-    }
+      if (variant == 2)
+      {
+         hypre_ParAdSchwarzSolve(A, f, domain_structure, scale, u, Vtemp, pivots, use_nonsymm);
+      }
+      else if (variant == 3)
+      {
+         hypre_ParMPSchwarzSolve(A, A_boundary, f, domain_structure, u,
+                                 relax_wt, scale, Vtemp, pivots, use_nonsymm);
+      }
+      else if (variant == 1)
+      {
+         hypre_AdSchwarzSolve(A, f, domain_structure, scale, u, Vtemp, pivots, use_nonsymm);
+      }
+      else if (variant == 4)
+      {
+         hypre_MPSchwarzFWSolve(A, hypre_ParVectorLocalVector(f),
+                                domain_structure, u, relax_wt,
+                                hypre_ParVectorLocalVector(Vtemp), pivots, use_nonsymm);
+      }
+      else
+      {
+         hypre_MPSchwarzSolve(A, hypre_ParVectorLocalVector(f),
+                              domain_structure, u, relax_wt,
+                              hypre_ParVectorLocalVector(Vtemp), pivots, use_nonsymm);
+      }
    }
 
    return hypre_error_flag;
@@ -251,22 +265,22 @@ hypre_SchwarzCFSolve(void               *schwarz_vdata,
 
    if (variant == 1)
    {
-       hypre_AdSchwarzCFSolve(A, f, domain_structure, scale, u, Vtemp,
-             CF_marker, rlx_pt, pivots, use_nonsymm);
+      hypre_AdSchwarzCFSolve(A, f, domain_structure, scale, u, Vtemp,
+                             CF_marker, rlx_pt, pivots, use_nonsymm);
    }
    else if (variant == 4)
    {
       hypre_MPSchwarzCFFWSolve(A, hypre_ParVectorLocalVector(f),
-            domain_structure, u, relax_wt,
-            hypre_ParVectorLocalVector(Vtemp),
-            CF_marker, rlx_pt, pivots, use_nonsymm);
+                               domain_structure, u, relax_wt,
+                               hypre_ParVectorLocalVector(Vtemp),
+                               CF_marker, rlx_pt, pivots, use_nonsymm);
    }
    else
    {
       hypre_MPSchwarzCFSolve(A, hypre_ParVectorLocalVector(f),
-            domain_structure, u, relax_wt,
-            hypre_ParVectorLocalVector(Vtemp),
-            CF_marker, rlx_pt, pivots, use_nonsymm);
+                             domain_structure, u, relax_wt,
+                             hypre_ParVectorLocalVector(Vtemp),
+                             CF_marker, rlx_pt, pivots, use_nonsymm);
    }
 
    return hypre_error_flag;
@@ -374,8 +388,10 @@ hypre_SchwarzReScale( void *data, HYPRE_Int size, HYPRE_Real value)
    hypre_SchwarzData  *schwarz_data = (hypre_SchwarzData*) data;
 
    scale = hypre_SchwarzDataScale(schwarz_data);
-   for (i=0; i < size; i++)
+   for (i = 0; i < size; i++)
+   {
       scale[i] *= value;
+   }
 
    return hypre_error_flag;
 
diff --git a/external/hypre/src/parcsr_ls/par_stats.c b/external/hypre/src/parcsr_ls/par_stats.c
index a93cc3d9..16ef79c6 100644
--- a/external/hypre/src/parcsr_ls/par_stats.c
+++ b/external/hypre/src/parcsr_ls/par_stats.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -8,20 +8,20 @@
 #include "_hypre_parcsr_ls.h"
 #include "par_amg.h"
 
-/*****************************************************************************
+/*--------------------------------------------------------------------
+ * hypre_BoomerAMGSetupStats
  *
  * Routine for getting matrix statistics from setup
  *
- *
  * AHB - using block norm 6 (sum of all elements) instead of 1 (frobenius)
- *
- *****************************************************************************/
-
+ *--------------------------------------------------------------------*/
 
 HYPRE_Int
 hypre_BoomerAMGSetupStats( void               *amg_vdata,
-                           hypre_ParCSRMatrix *A         )
+                           hypre_ParCSRMatrix *A )
 {
+   hypre_GpuProfilingPushRange("AMGSetupStats");
+
    MPI_Comm          comm = hypre_ParCSRMatrixComm(A);
 
    hypre_ParAMGData *amg_data = (hypre_ParAMGData*) amg_vdata;
@@ -65,6 +65,8 @@ hypre_BoomerAMGSetupStats( void               *amg_vdata,
 
 
    HYPRE_Int      num_levels;
+   HYPRE_Int      num_functions;
+   HYPRE_Int      filter_functions;
    HYPRE_Int      coarsen_type;
    HYPRE_Int      interp_type;
    HYPRE_Int      restri_type;
@@ -85,7 +87,7 @@ hypre_BoomerAMGSetupStats( void               *amg_vdata,
    HYPRE_Int       min_entries;
    HYPRE_Int       max_entries;
 
-   HYPRE_Int       num_procs,my_id;
+   HYPRE_Int       num_procs, my_id;
    HYPRE_Int       num_threads;
 
 
@@ -135,7 +137,8 @@ hypre_BoomerAMGSetupStats( void               *amg_vdata,
    HYPRE_Real   tol;
 
    HYPRE_Int block_mode;
-   HYPRE_Int block_size, bnnz;
+   HYPRE_Int block_size = 1;
+   HYPRE_Int bnnz = 1;
 
    HYPRE_Real tmp_norm;
 
@@ -153,12 +156,14 @@ hypre_BoomerAMGSetupStats( void               *amg_vdata,
    HYPRE_Real add_rlx_wt;
 
    hypre_MPI_Comm_size(comm, &num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_rank(comm, &my_id);
    num_threads = hypre_NumThreads();
 
    A_array = hypre_ParAMGDataAArray(amg_data);
    P_array = hypre_ParAMGDataPArray(amg_data);
    num_levels = hypre_ParAMGDataNumLevels(amg_data);
+   num_functions = hypre_ParAMGDataNumFunctions(amg_data);
+   filter_functions = hypre_ParAMGDataFilterFunctions(amg_data);
    coarsen_type = hypre_ParAMGDataCoarsenType(amg_data);
    interp_type = hypre_ParAMGDataInterpType(amg_data);
    restri_type = hypre_ParAMGDataRestriction(amg_data); /* RL */
@@ -198,19 +203,19 @@ hypre_BoomerAMGSetupStats( void               *amg_vdata,
    send_buff     = hypre_CTAlloc(HYPRE_Real,  6, HYPRE_MEMORY_HOST);
    gather_buff = hypre_CTAlloc(HYPRE_Real, 6, HYPRE_MEMORY_HOST);
 
-   if (my_id==0)
+   if (my_id == 0)
    {
-      hypre_printf("\n\n Num MPI tasks = %d\n\n",num_procs);
-      hypre_printf(" Num OpenMP threads = %d\n\n",num_threads);
+      hypre_printf("\n\n Num MPI tasks = %d\n\n", num_procs);
+      hypre_printf(" Num OpenMP threads = %d\n\n", num_threads);
       hypre_printf("\nBoomerAMG SETUP PARAMETERS:\n\n");
-      hypre_printf(" Max levels = %d\n",hypre_ParAMGDataMaxLevels(amg_data));
-      hypre_printf(" Num levels = %d\n\n",num_levels);
+      hypre_printf(" Max levels = %d\n", hypre_ParAMGDataMaxLevels(amg_data));
+      hypre_printf(" Num levels = %d\n\n", num_levels);
       hypre_printf(" Strength Threshold = %f\n",
-            hypre_ParAMGDataStrongThreshold(amg_data));
+                   hypre_ParAMGDataStrongThreshold(amg_data));
       hypre_printf(" Interpolation Truncation Factor = %f\n",
-            hypre_ParAMGDataTruncFactor(amg_data));
+                   hypre_ParAMGDataTruncFactor(amg_data));
       hypre_printf(" Maximum Row Sum Threshold for Dependency Weakening = %f\n\n",
-            hypre_ParAMGDataMaxRowSum(amg_data));
+                   hypre_ParAMGDataMaxRowSum(amg_data));
 
       if (coarsen_type == 0)
       {
@@ -277,19 +282,27 @@ hypre_BoomerAMGSetupStats( void               *amg_vdata,
       {
          hypre_printf("\n No. of levels of aggressive coarsening: %d\n\n", agg_num_levels);
          if (agg_interp_type == 4)
+         {
             hypre_printf(" Interpolation on agg. levels= multipass interpolation\n");
+         }
          else if (agg_interp_type == 1)
+         {
             hypre_printf(" Interpolation on agg. levels = 2-stage extended+i interpolation \n");
+         }
          else if (agg_interp_type == 2)
+         {
             hypre_printf(" Interpolation on agg. levels = 2-stage std interpolation \n");
+         }
          else if (agg_interp_type == 3)
+         {
             hypre_printf(" Interpolation on agg. levels = 2-stage extended interpolation \n");
+         }
       }
 
 
       if (coarsen_type)
          hypre_printf(" measures are determined %s\n\n",
-               (measure_type ? "globally" : "locally"));
+                      (measure_type ? "globally" : "locally"));
 
       hypre_printf( "\n No global partition option chosen.\n\n");
 
@@ -390,7 +403,14 @@ hypre_BoomerAMGSetupStats( void               *amg_vdata,
       }
       else if (restri_type >= 3)
       {
-         hypre_printf(" Restriction = local approximate ideal restriction (Neumann AIR-%d)\n", restri_type-3);
+         hypre_printf(" Restriction = local approximate ideal restriction (Neumann AIR-%d)\n",
+                      restri_type - 3);
+      }
+
+      if (num_functions > 1)
+      {
+         hypre_printf(" Number of functions = %d\n", num_functions);
+         hypre_printf(" Functions filtering is %s\n", (filter_functions > 0) ? "on" : "off");
       }
 
       if (block_mode)
@@ -437,7 +457,7 @@ hypre_BoomerAMGSetupStats( void               *amg_vdata,
    ndigits[2] = ndigits[2] + 2;
    ndigits[3] = ndigits[0] + ndigits[1] + ndigits[2];
 
-   if(my_id == 0)
+   if (my_id == 0)
    {
       hypre_printf("%*s", (ndigits[0] + 13), "nonzero");
       hypre_printf("%*s", (ndigits[1] + 15), "entries/row");
@@ -446,7 +466,7 @@ hypre_BoomerAMGSetupStats( void               *amg_vdata,
       hypre_printf("%*s", ndigits[1], "entries");
       hypre_printf("%7s %5s %4s", "sparse", "min", "max");
       hypre_printf("%*s %8s %11s\n", (ndigits[2] + 2), "avg", "min", "max");
-      for (i = 0; i < (49 + ndigits[3]); i++) hypre_printf("%s", "=");
+      for (i = 0; i < (49 + ndigits[3]); i++) { hypre_printf("%s", "="); }
       hypre_printf("\n");
    }
 
@@ -473,7 +493,7 @@ hypre_BoomerAMGSetupStats( void               *amg_vdata,
          A_offd_i = hypre_CSRMatrixI(A_block_offd);
 
          block_size =  hypre_ParCSRBlockMatrixBlockSize(A_block_array[level]);
-         bnnz = block_size*block_size;
+         bnnz = block_size * block_size;
 
          row_starts = hypre_ParCSRBlockMatrixRowStarts(A_block_array[level]);
 
@@ -483,7 +503,7 @@ hypre_BoomerAMGSetupStats( void               *amg_vdata,
          num_mem[level] = global_nonzeros;
          num_variables[level] = (HYPRE_Real) fine_size;
 
-         sparse = global_nonzeros /((HYPRE_Real) fine_size * (HYPRE_Real) fine_size);
+         sparse = global_nonzeros / ((HYPRE_Real) fine_size * (HYPRE_Real) fine_size);
 
          min_entries = 0;
          max_entries = 0;
@@ -492,16 +512,16 @@ hypre_BoomerAMGSetupStats( void               *amg_vdata,
 
          if (hypre_CSRBlockMatrixNumRows(A_block_diag))
          {
-            min_entries = (A_diag_i[1]-A_diag_i[0])+(A_offd_i[1]-A_offd_i[0]);
+            min_entries = (A_diag_i[1] - A_diag_i[0]) + (A_offd_i[1] - A_offd_i[0]);
             for (j = A_diag_i[0]; j < A_diag_i[1]; j++)
             {
-               hypre_CSRBlockMatrixBlockNorm(6, &A_diag_data[j*bnnz], &tmp_norm, block_size);
+               hypre_CSRBlockMatrixBlockNorm(6, &A_diag_data[j * bnnz], &tmp_norm, block_size);
                min_rowsum += tmp_norm;
             }
 
             for (j = A_offd_i[0]; j < A_offd_i[1]; j++)
             {
-               hypre_CSRBlockMatrixBlockNorm(6, &A_offd_data[j*bnnz], &tmp_norm, block_size);
+               hypre_CSRBlockMatrixBlockNorm(6, &A_offd_data[j * bnnz], &tmp_norm, block_size);
                min_rowsum += tmp_norm;
             }
 
@@ -509,19 +529,19 @@ hypre_BoomerAMGSetupStats( void               *amg_vdata,
 
             for (j = 0; j < hypre_CSRBlockMatrixNumRows(A_block_diag); j++)
             {
-               entries = (A_diag_i[j+1]-A_diag_i[j])+(A_offd_i[j+1]-A_offd_i[j]);
+               entries = (A_diag_i[j + 1] - A_diag_i[j]) + (A_offd_i[j + 1] - A_offd_i[j]);
                min_entries = hypre_min(entries, min_entries);
                max_entries = hypre_max(entries, max_entries);
 
                rowsum = 0.0;
-               for (i = A_diag_i[j]; i < A_diag_i[j+1]; i++)
+               for (i = A_diag_i[j]; i < A_diag_i[j + 1]; i++)
                {
-                  hypre_CSRBlockMatrixBlockNorm(6, &A_diag_data[i*bnnz], &tmp_norm, block_size);
+                  hypre_CSRBlockMatrixBlockNorm(6, &A_diag_data[i * bnnz], &tmp_norm, block_size);
                   rowsum += tmp_norm;
                }
-               for (i = A_offd_i[j]; i < A_offd_i[j+1]; i++)
+               for (i = A_offd_i[j]; i < A_offd_i[j + 1]; i++)
                {
-                  hypre_CSRBlockMatrixBlockNorm(6, &A_offd_data[i*bnnz], &tmp_norm, block_size);
+                  hypre_CSRBlockMatrixBlockNorm(6, &A_offd_data[i * bnnz], &tmp_norm, block_size);
                   rowsum += tmp_norm;
                }
                min_rowsum = hypre_min(rowsum, min_rowsum);
@@ -562,17 +582,23 @@ hypre_BoomerAMGSetupStats( void               *amg_vdata,
          global_nonzeros = hypre_ParCSRMatrixDNumNonzeros(A_array[level]);
          num_coeffs[level] = global_nonzeros;
          if (level == 0)
+         {
             num_mem[level] += global_nonzeros;
+         }
          if (level == 0 && (additive == 0 || mult_additive == 0) )
+         {
             num_mem[level] += global_nonzeros;
+         }
          if (level > 0)
          {
             if (simple > level || simple == -1)
+            {
                num_mem[level] += global_nonzeros;
+            }
          }
          num_variables[level] = (HYPRE_Real) fine_size;
 
-         sparse = global_nonzeros /((HYPRE_Real) fine_size * (HYPRE_Real) fine_size);
+         sparse = global_nonzeros / ((HYPRE_Real) fine_size * (HYPRE_Real) fine_size);
 
          min_entries = 0;
          max_entries = 0;
@@ -581,26 +607,34 @@ hypre_BoomerAMGSetupStats( void               *amg_vdata,
 
          if (hypre_CSRMatrixNumRows(A_diag))
          {
-            min_entries = (A_diag_i[1]-A_diag_i[0])+(A_offd_i[1]-A_offd_i[0]);
+            min_entries = (A_diag_i[1] - A_diag_i[0]) + (A_offd_i[1] - A_offd_i[0]);
             for (j = A_diag_i[0]; j < A_diag_i[1]; j++)
+            {
                min_rowsum += A_diag_data[j];
+            }
             for (j = A_offd_i[0]; j < A_offd_i[1]; j++)
+            {
                min_rowsum += A_offd_data[j];
+            }
 
             max_rowsum = min_rowsum;
 
             for (j = 0; j < hypre_CSRMatrixNumRows(A_diag); j++)
             {
-               entries = (A_diag_i[j+1]-A_diag_i[j])+(A_offd_i[j+1]-A_offd_i[j]);
+               entries = (A_diag_i[j + 1] - A_diag_i[j]) + (A_offd_i[j + 1] - A_offd_i[j]);
                min_entries = hypre_min(entries, min_entries);
                max_entries = hypre_max(entries, max_entries);
 
                rowsum = 0.0;
-               for (i = A_diag_i[j]; i < A_diag_i[j+1]; i++)
+               for (i = A_diag_i[j]; i < A_diag_i[j + 1]; i++)
+               {
                   rowsum += A_diag_data[i];
+               }
 
-               for (i = A_offd_i[j]; i < A_offd_i[j+1]; i++)
+               for (i = A_offd_i[j]; i < A_offd_i[j + 1]; i++)
+               {
                   rowsum += A_offd_data[i];
+               }
 
                min_rowsum = hypre_min(rowsum, min_rowsum);
                max_rowsum = hypre_max(rowsum, max_rowsum);
@@ -619,7 +653,7 @@ hypre_BoomerAMGSetupStats( void               *amg_vdata,
          }
       }
 
-      numrows = (HYPRE_Int)(row_starts[1]-row_starts[0]);
+      numrows = (HYPRE_Int)(row_starts[1] - row_starts[0]);
       if (!numrows) /* if we don't have any rows, then don't have this count toward
                        min row sum or min num entries */
       {
@@ -634,7 +668,7 @@ hypre_BoomerAMGSetupStats( void               *amg_vdata,
 
       hypre_MPI_Reduce(send_buff, gather_buff, 4, HYPRE_MPI_REAL, hypre_MPI_MAX, 0, comm);
 
-      if (my_id ==0)
+      if (my_id == 0)
       {
          global_min_e = - (HYPRE_Int)gather_buff[0];
          global_max_e = (HYPRE_Int)gather_buff[1];
@@ -642,10 +676,10 @@ hypre_BoomerAMGSetupStats( void               *amg_vdata,
          global_max_rsum = gather_buff[3];
 
          hypre_printf("%3d %*b %*.0f  %0.3f  %4d %4d",
-               level, ndigits[0], fine_size, ndigits[1], global_nonzeros,
-               sparse, global_min_e, global_max_e);
+                      level, ndigits[0], fine_size, ndigits[1], global_nonzeros,
+                      sparse, global_min_e, global_max_e);
          hypre_printf("  %*.1f  %10.3e  %10.3e\n", ndigits[2], avg_entries,
-               global_min_rsum, global_max_rsum);
+                      global_min_rsum, global_max_rsum);
       }
    }
 
@@ -654,7 +688,8 @@ hypre_BoomerAMGSetupStats( void               *amg_vdata,
    {
       if (block_mode)
       {
-         ndigits[0] = hypre_max(hypre_ndigits(hypre_ParCSRBlockMatrixGlobalNumRows(P_block_array[0])), ndigits[0]);
+         ndigits[0] = hypre_max(hypre_ndigits(hypre_ParCSRBlockMatrixGlobalNumRows(P_block_array[0])),
+                                ndigits[0]);
       }
       else
       {
@@ -675,11 +710,11 @@ hypre_BoomerAMGSetupStats( void               *amg_vdata,
 
       }
 
-      hypre_printf("%*s ", (2*ndigits[0] + 21), "entries/row");
+      hypre_printf("%*s ", (2 * ndigits[0] + 21), "entries/row");
       hypre_printf("%10s %10s %19s\n", "min", "max", "row sums");
       hypre_printf("lev %*s x %-*s min  max  avgW", ndigits[0], "rows", ndigits[0], "cols");
       hypre_printf("%11s %11s %9s %11s\n", "weight", "weight", "min", "max");
-      for (i = 0; i < (70 + 2*ndigits[0]); i++) hypre_printf("%s", "=");
+      for (i = 0; i < (70 + 2 * ndigits[0]); i++) { hypre_printf("%s", "="); }
       hypre_printf("\n");
    }
 
@@ -687,7 +722,7 @@ hypre_BoomerAMGSetupStats( void               *amg_vdata,
     *  Enter Statistics Loop
     *-----------------------------------------------------*/
 
-   for (level = 0; level < num_levels-1; level++)
+   for (level = 0; level < num_levels - 1; level++)
    {
 
       if (block_mode)
@@ -725,11 +760,13 @@ hypre_BoomerAMGSetupStats( void               *amg_vdata,
 
             for (j = P_diag_i[0]; j < P_diag_i[1]; j++)
             {
-               hypre_CSRBlockMatrixBlockNorm(6, &P_diag_data[j*bnnz], &tmp_norm, block_size);
+               hypre_CSRBlockMatrixBlockNorm(6, &P_diag_data[j * bnnz], &tmp_norm, block_size);
                min_weight = hypre_min(min_weight, tmp_norm);
 
                if (tmp_norm != 1.0)
+               {
                   max_weight = hypre_max(max_weight, tmp_norm);
+               }
 
                min_rowsum += tmp_norm;
 
@@ -737,45 +774,51 @@ hypre_BoomerAMGSetupStats( void               *amg_vdata,
             }
             for (j = P_offd_i[0]; j < P_offd_i[1]; j++)
             {
-               hypre_CSRBlockMatrixBlockNorm(6, &P_offd_data[j*bnnz], &tmp_norm, block_size);
+               hypre_CSRBlockMatrixBlockNorm(6, &P_offd_data[j * bnnz], &tmp_norm, block_size);
                min_weight = hypre_min(min_weight, tmp_norm);
 
                if (tmp_norm != 1.0)
+               {
                   max_weight = hypre_max(max_weight, tmp_norm);
+               }
 
                min_rowsum += tmp_norm;
             }
 
             max_rowsum = min_rowsum;
 
-            min_entries = (P_diag_i[1]-P_diag_i[0])+(P_offd_i[1]-P_offd_i[0]);
+            min_entries = (P_diag_i[1] - P_diag_i[0]) + (P_offd_i[1] - P_offd_i[0]);
             max_entries = 0;
 
             for (j = 0; j < hypre_CSRBlockMatrixNumRows(P_block_diag); j++)
             {
-               entries = (P_diag_i[j+1]-P_diag_i[j])+(P_offd_i[j+1]-P_offd_i[j]);
+               entries = (P_diag_i[j + 1] - P_diag_i[j]) + (P_offd_i[j + 1] - P_offd_i[j]);
                min_entries = hypre_min(entries, min_entries);
                max_entries = hypre_max(entries, max_entries);
 
                rowsum = 0.0;
-               for (i = P_diag_i[j]; i < P_diag_i[j+1]; i++)
+               for (i = P_diag_i[j]; i < P_diag_i[j + 1]; i++)
                {
-                  hypre_CSRBlockMatrixBlockNorm(6, &P_diag_data[i*bnnz], &tmp_norm, block_size);
+                  hypre_CSRBlockMatrixBlockNorm(6, &P_diag_data[i * bnnz], &tmp_norm, block_size);
                   min_weight = hypre_min(min_weight, tmp_norm);
 
                   if (tmp_norm != 1.0)
+                  {
                      max_weight = hypre_max(max_weight, tmp_norm);
+                  }
 
                   rowsum += tmp_norm;
                }
 
-               for (i = P_offd_i[j]; i < P_offd_i[j+1]; i++)
+               for (i = P_offd_i[j]; i < P_offd_i[j + 1]; i++)
                {
-                  hypre_CSRBlockMatrixBlockNorm(6, &P_offd_data[i*bnnz], &tmp_norm, block_size);
+                  hypre_CSRBlockMatrixBlockNorm(6, &P_offd_data[i * bnnz], &tmp_norm, block_size);
                   min_weight = hypre_min(min_weight, tmp_norm);
 
                   if (tmp_norm != 1.0)
+                  {
                      max_weight = hypre_max(max_weight, P_offd_data[i]);
+                  }
 
                   rowsum += tmp_norm;
                }
@@ -786,7 +829,8 @@ hypre_BoomerAMGSetupStats( void               *amg_vdata,
 
 
          }
-         avg_entries = ((HYPRE_Real) (global_nonzeros - coarse_size)) / ((HYPRE_Real) (fine_size - coarse_size));
+         avg_entries = ((HYPRE_Real) (global_nonzeros - coarse_size)) / ((HYPRE_Real) (
+                                                                            fine_size - coarse_size));
       }
       else
       {
@@ -831,47 +875,55 @@ hypre_BoomerAMGSetupStats( void               *amg_vdata,
 
          if (hypre_CSRMatrixNumRows(P_diag))
          {
-            if (P_diag_data) min_weight = P_diag_data[0];
+            if (P_diag_data) { min_weight = P_diag_data[0]; }
             for (j = P_diag_i[0]; j < P_diag_i[1]; j++)
             {
                min_weight = hypre_min(min_weight, P_diag_data[j]);
                if (P_diag_data[j] != 1.0)
+               {
                   max_weight = hypre_max(max_weight, P_diag_data[j]);
+               }
                min_rowsum += P_diag_data[j];
             }
             for (j = P_offd_i[0]; j < P_offd_i[1]; j++)
             {
                min_weight = hypre_min(min_weight, P_offd_data[j]);
                if (P_offd_data[j] != 1.0)
+               {
                   max_weight = hypre_max(max_weight, P_offd_data[j]);
+               }
                min_rowsum += P_offd_data[j];
             }
 
             max_rowsum = min_rowsum;
 
-            min_entries = (P_diag_i[1]-P_diag_i[0])+(P_offd_i[1]-P_offd_i[0]);
+            min_entries = (P_diag_i[1] - P_diag_i[0]) + (P_offd_i[1] - P_offd_i[0]);
             max_entries = 0;
 
             for (j = 0; j < hypre_CSRMatrixNumRows(P_diag); j++)
             {
-               entries = (P_diag_i[j+1]-P_diag_i[j])+(P_offd_i[j+1]-P_offd_i[j]);
+               entries = (P_diag_i[j + 1] - P_diag_i[j]) + (P_offd_i[j + 1] - P_offd_i[j]);
                min_entries = hypre_min(entries, min_entries);
                max_entries = hypre_max(entries, max_entries);
 
                rowsum = 0.0;
-               for (i = P_diag_i[j]; i < P_diag_i[j+1]; i++)
+               for (i = P_diag_i[j]; i < P_diag_i[j + 1]; i++)
                {
                   min_weight = hypre_min(min_weight, P_diag_data[i]);
                   if (P_diag_data[i] != 1.0)
+                  {
                      max_weight = hypre_max(max_weight, P_diag_data[i]);
+                  }
                   rowsum += P_diag_data[i];
                }
 
-               for (i = P_offd_i[j]; i < P_offd_i[j+1]; i++)
+               for (i = P_offd_i[j]; i < P_offd_i[j + 1]; i++)
                {
                   min_weight = hypre_min(min_weight, P_offd_data[i]);
                   if (P_offd_data[i] != 1.0)
+                  {
                      max_weight = hypre_max(max_weight, P_offd_data[i]);
+                  }
                   rowsum += P_offd_data[i];
                }
 
@@ -880,7 +932,8 @@ hypre_BoomerAMGSetupStats( void               *amg_vdata,
             }
 
          }
-         avg_entries = ((HYPRE_Real) (global_nonzeros - coarse_size)) / ((HYPRE_Real) (fine_size - coarse_size));
+         avg_entries = ((HYPRE_Real) (global_nonzeros - coarse_size)) / ((HYPRE_Real) (
+                                                                            fine_size - coarse_size));
 
          if (P_diag_clone != P_diag)
          {
@@ -893,7 +946,7 @@ hypre_BoomerAMGSetupStats( void               *amg_vdata,
          }
       }
 
-      numrows = row_starts[1]-row_starts[0];
+      numrows = row_starts[1] - row_starts[0];
       if (!numrows) /* if we don't have any rows, then don't have this count toward
                        min row sum or min num entries */
       {
@@ -921,39 +974,41 @@ hypre_BoomerAMGSetupStats( void               *amg_vdata,
          global_max_wt = gather_buff[5];
 
          hypre_printf("%3d %*b x %-*b %3d  %3d",
-               level, ndigits[0], fine_size, ndigits[0], coarse_size,
-               global_min_e, global_max_e);
+                      level, ndigits[0], fine_size, ndigits[0], coarse_size,
+                      global_min_e, global_max_e);
          hypre_printf("  %4.1f  %10.3e  %10.3e  %10.3e  %10.3e\n",
-               avg_entries, global_min_wt, global_max_wt,
-               global_min_rsum, global_max_rsum);
+                      avg_entries, global_min_wt, global_max_wt,
+                      global_min_rsum, global_max_rsum);
       }
    }
 
    total_variables = 0;
    operat_cmplxty = 0;
-   for (j=0;j<hypre_ParAMGDataNumLevels(amg_data);j++)
+   for (j = 0; j < hypre_ParAMGDataNumLevels(amg_data); j++)
    {
-      memory_cmplxty +=  num_mem[j] / num_coeffs[0];
-      operat_cmplxty +=  num_coeffs[j] / num_coeffs[0];
+      memory_cmplxty  += num_mem[j] / num_coeffs[0];
+      operat_cmplxty  += num_coeffs[j] / num_coeffs[0];
       total_variables += num_variables[j];
    }
    if (num_variables[0] != 0)
+   {
       grid_cmplxty = total_variables / num_variables[0];
+   }
 
    if (my_id == 0 )
    {
       hypre_printf("\n\n");
-      hypre_printf("     Complexity:    grid = %f\n",grid_cmplxty);
-      hypre_printf("                operator = %f\n",operat_cmplxty);
-      hypre_printf("                memory = %f\n",memory_cmplxty);
+      hypre_printf("     Complexity:   grid = %f\n", grid_cmplxty);
+      hypre_printf("               operator = %f\n", operat_cmplxty);
+      hypre_printf("                 memory = %f\n", memory_cmplxty);
       hypre_printf("\n\n");
    }
 
    if (my_id == 0)
    {
       hypre_printf("\n\nBoomerAMG SOLVER PARAMETERS:\n\n");
-      hypre_printf( "  Maximum number of cycles:         %d \n",max_iter);
-      hypre_printf( "  Stopping Tolerance:               %e \n",tol);
+      hypre_printf( "  Maximum number of cycles:         %d \n", max_iter);
+      hypre_printf( "  Stopping Tolerance:               %e \n", tol);
       if (fcycle)
       {
          hypre_printf( "  Full Multigrid. Cycle type (1 = V, 2 = W, etc.):  %d\n\n", cycle_type);
@@ -965,224 +1020,349 @@ hypre_BoomerAMGSetupStats( void               *amg_vdata,
 
       if (additive == 0 || mult_additive == 0 || simple == 0)
       {
-         HYPRE_Int add_lvl = add_end;
-         if (add_end == -1) add_lvl = num_levels-1;
+         HYPRE_Int add_lvl = (add_end == -1) ? num_levels - 1 : add_end;
+
          if (additive > -1)
+         {
             hypre_printf( "  Additive V-cycle 1st level %d last level %d: \n", additive, add_lvl);
+         }
          if (mult_additive > -1)
+         {
             hypre_printf( "  Mult-Additive V-cycle 1st level %d last level %d: \n", mult_additive, add_lvl);
+         }
          if (simple > -1)
-            hypre_printf( "  Simplified Mult-Additive V-cycle 1st level %d: last level %d \n", simple, add_lvl);
+         {
+            hypre_printf( "  Simplified Mult-Additive V-cycle 1st level %d: last level %d \n", simple,
+                          add_lvl);
+         }
          hypre_printf( "  Relaxation Parameters:\n");
-         if (add_lvl == num_levels-1)
+         if (add_lvl == num_levels - 1)
          {
             hypre_printf( "   Visiting Grid:                     down   up  coarse\n");
             hypre_printf( "            Number of sweeps:         %4d   %2d  %4d \n",
-                  num_grid_sweeps[1],
-                  num_grid_sweeps[1],(2*num_grid_sweeps[1]));
-            hypre_printf( "   Type 0=Jac, 3=hGS, 6=hSGS, 9=GE:    %2d   %2d   %2d \n", add_rlx, add_rlx, add_rlx);
+                          num_grid_sweeps[1],
+                          num_grid_sweeps[1], (2 * num_grid_sweeps[1]));
+            hypre_printf( "   Type 0=Jac, 3=hGS, 6=hSGS, 9=GE:    %2d   %2d   %2d \n", add_rlx, add_rlx,
+                          add_rlx);
          }
          else
          {
             hypre_printf( "   Visiting Grid:                     down   up\n");
             hypre_printf( "            Number of sweeps:         %4d   %2d\n",
-                  num_grid_sweeps[1], num_grid_sweeps[1]);
+                          num_grid_sweeps[1], num_grid_sweeps[1]);
             hypre_printf( "   Type 0=Jac, 3=hGS, 6=hSGS, 9=GE:    %2d   %2d\n", add_rlx, add_rlx);
          }
-         if (add_lvl < num_levels -1)
+         if (add_lvl < num_levels - 1)
          {
             hypre_printf( " \n");
             hypre_printf( "Multiplicative portion: \n");
             hypre_printf( "   Visiting Grid:                     down   up  coarse\n");
             hypre_printf( "            Number of sweeps:         %4d   %2d  %4d\n",
-                  num_grid_sweeps[1], num_grid_sweeps[2], num_grid_sweeps[3]);
+                          num_grid_sweeps[1], num_grid_sweeps[2], num_grid_sweeps[3]);
             hypre_printf( "   Type 0=Jac, 3=hGS, 6=hSGS, 9=GE:   %4d   %2d  %4d\n",
-                  grid_relax_type[1], grid_relax_type[2], grid_relax_type[3]);
+                          grid_relax_type[1], grid_relax_type[2], grid_relax_type[3]);
+         }
+         if (add_rlx == 0)
+         {
+            hypre_printf( "   Relaxation Weight:   %e \n", add_rlx_wt);
+         }
+         {
+            hypre_printf( "   Point types, partial sweeps (1=C, -1=F):\n");
+            hypre_printf( "                  Pre-CG relaxation (down):");
          }
-         if (add_rlx == 0) hypre_printf( "   Relaxation Weight:   %e \n", add_rlx_wt);
-         hypre_printf( "   Point types, partial sweeps (1=C, -1=F):\n");
-         hypre_printf( "                  Pre-CG relaxation (down):");
          for (j = 0; j < num_grid_sweeps[1]; j++)
+         {
             hypre_printf("  %2d", zero);
-         hypre_printf( "\n");
-         hypre_printf( "                   Post-CG relaxation (up):");
+         }
+         {
+            hypre_printf( "\n");
+            hypre_printf( "                   Post-CG relaxation (up):");
+         }
          for (j = 0; j < num_grid_sweeps[2]; j++)
+         {
             hypre_printf("  %2d", zero);
-         hypre_printf( "\n");
-         hypre_printf( "                             Coarsest grid:");
+         }
+         {
+            hypre_printf( "\n");
+            hypre_printf( "                             Coarsest grid:");
+         }
          for (j = 0; j < num_grid_sweeps[3]; j++)
+         {
             hypre_printf("  %2d", zero);
-         hypre_printf( "\n\n");
+         }
+         {
+            hypre_printf( "\n");
+         }
       }
       else if (additive > 0 || mult_additive > 0 || simple > 0)
       {
-         HYPRE_Int add_lvl = add_end;
-         if (add_end == -1) add_lvl = num_levels-1;
+         HYPRE_Int add_lvl = (add_end == -1) ? (num_levels - 1) : add_end;
+
          hypre_printf( "  Relaxation Parameters:\n");
-         if (add_lvl < num_levels -1)
+         if (add_lvl < num_levels - 1)
          {
             hypre_printf( "   Visiting Grid:                     down   up  coarse\n");
             hypre_printf( "            Number of sweeps:         %4d   %2d  %4d\n",
-                  num_grid_sweeps[1], num_grid_sweeps[2], num_grid_sweeps[3]);
+                          num_grid_sweeps[1], num_grid_sweeps[2], num_grid_sweeps[3]);
             hypre_printf( "   Type 0=Jac, 3=hGS, 6=hSGS, 9=GE:   %4d   %2d  %4d\n",
-                  grid_relax_type[1], grid_relax_type[2], grid_relax_type[3]);
+                          grid_relax_type[1], grid_relax_type[2], grid_relax_type[3]);
          }
          else
          {
             hypre_printf( "   Visiting Grid:                     down   up  \n");
             hypre_printf( "            Number of sweeps:         %4d   %2d  \n",
-                  num_grid_sweeps[1], num_grid_sweeps[2]);
+                          num_grid_sweeps[1], num_grid_sweeps[2]);
             hypre_printf( "   Type 0=Jac, 3=hGS, 6=hSGS, 9=GE:   %4d   %2d  \n",
-                  grid_relax_type[1], grid_relax_type[2]);
+                          grid_relax_type[1], grid_relax_type[2]);
          }
          hypre_printf( "   Point types, partial sweeps (1=C, -1=F):\n");
          if (grid_relax_points && grid_relax_type[1] != 8)
          {
             hypre_printf( "                  Pre-CG relaxation (down):");
             for (j = 0; j < num_grid_sweeps[1]; j++)
+            {
                hypre_printf("  %2d", grid_relax_points[1][j]);
+            }
             hypre_printf( "\n");
             hypre_printf( "                   Post-CG relaxation (up):");
             for (j = 0; j < num_grid_sweeps[2]; j++)
+            {
                hypre_printf("  %2d", grid_relax_points[2][j]);
+            }
             hypre_printf( "\n");
          }
          else if (relax_order == 1 && grid_relax_type[1] != 8)
          {
             hypre_printf( "                  Pre-CG relaxation (down):");
             for (j = 0; j < num_grid_sweeps[1]; j++)
+            {
                hypre_printf("  %2d  %2d", one, minus_one);
+            }
             hypre_printf( "\n");
             hypre_printf( "                   Post-CG relaxation (up):");
             for (j = 0; j < num_grid_sweeps[2]; j++)
+            {
                hypre_printf("  %2d  %2d", minus_one, one);
+            }
             hypre_printf( "\n");
          }
          else
          {
             hypre_printf( "                  Pre-CG relaxation (down):");
             for (j = 0; j < num_grid_sweeps[1]; j++)
+            {
                hypre_printf("  %2d", zero);
+            }
             hypre_printf( "\n");
             hypre_printf( "                   Post-CG relaxation (up):");
             for (j = 0; j < num_grid_sweeps[2]; j++)
+            {
                hypre_printf("  %2d", zero);
+            }
             hypre_printf( "\n");
          }
-         hypre_printf( "\n\n");
+         {
+            hypre_printf( "\n\n");
+         }
          if (additive > -1)
+         {
             hypre_printf( "  Additive V-cycle 1st level %d last level %d:  \n", additive, add_lvl);
+         }
          if (mult_additive > -1)
+         {
             hypre_printf( "  Mult-Additive V-cycle 1st level %d last level %d: \n", mult_additive, add_lvl);
+         }
          if (simple > -1)
-            hypre_printf( "  Simplified Mult-Additive V-cycle 1st level %d: last level %d  \n", simple, add_lvl);
-         hypre_printf( "  Relaxation Parameters:\n");
-         if (add_lvl == num_levels-1)
+         {
+            hypre_printf( "  Simplified Mult-Additive V-cycle 1st level %d: last level %d  \n", simple,
+                          add_lvl);
+         }
+         {
+            hypre_printf( "  Relaxation Parameters:\n");
+         }
+         if (add_lvl == num_levels - 1)
          {
             hypre_printf( "   Visiting Grid:                     down   up  coarse\n");
             hypre_printf( "            Number of sweeps:         %4d   %2d  %4d \n",
-                  num_grid_sweeps[1],
-                  num_grid_sweeps[1],(2*num_grid_sweeps[1]));
-            hypre_printf( "   Type 0=Jac, 3=hGS, 6=hSGS, 9=GE:    %2d   %2d   %2d \n", add_rlx, add_rlx, add_rlx);
+                          num_grid_sweeps[1],
+                          num_grid_sweeps[1], (2 * num_grid_sweeps[1]));
+            hypre_printf( "   Type 0=Jac, 3=hGS, 6=hSGS, 9=GE:    %2d   %2d   %2d \n", add_rlx, add_rlx,
+                          add_rlx);
          }
          else
          {
             hypre_printf( "   Visiting Grid:                     down   up\n");
             hypre_printf( "            Number of sweeps:         %4d   %2d\n",
-                  num_grid_sweeps[1], num_grid_sweeps[1]);
+                          num_grid_sweeps[1], num_grid_sweeps[1]);
             hypre_printf( "   Type 0=Jac, 3=hGS, 6=hSGS, 9=GE:    %2d   %2d\n", add_rlx, add_rlx);
          }
-         if (add_rlx == 0) hypre_printf( "   Relaxation Weight:   %e \n", add_rlx_wt);
-         hypre_printf( "   Point types, partial sweeps (1=C, -1=F):\n");
-         hypre_printf( "                  Pre-CG relaxation (down):");
+         if (add_rlx == 0)
+         {
+            hypre_printf( "   Relaxation Weight:   %e \n", add_rlx_wt);
+         }
+         {
+            hypre_printf( "   Point types, partial sweeps (1=C, -1=F):\n");
+            hypre_printf( "                  Pre-CG relaxation (down):");
+         }
          for (j = 0; j < num_grid_sweeps[1]; j++)
+         {
             hypre_printf("  %2d", zero);
-         hypre_printf( "\n");
-         hypre_printf( "                   Post-CG relaxation (up):");
+         }
+         {
+            hypre_printf( "\n");
+            hypre_printf( "                   Post-CG relaxation (up):");
+         }
          for (j = 0; j < num_grid_sweeps[2]; j++)
+         {
             hypre_printf("  %2d", zero);
-         hypre_printf( "\n");
-         hypre_printf( "                             Coarsest grid:");
+         }
+         {
+            hypre_printf( "\n");
+            hypre_printf( "                             Coarsest grid:");
+         }
          for (j = 0; j < num_grid_sweeps[3]; j++)
+         {
             hypre_printf("  %2d", zero);
-         hypre_printf( "\n\n");
+         }
+         {
+            hypre_printf( "\n");
+         }
       }
       else
       {
          hypre_printf( "  Relaxation Parameters:\n");
          hypre_printf( "   Visiting Grid:                     down   up  coarse\n");
          hypre_printf( "            Number of sweeps:         %4d   %2d  %4d \n",
-               num_grid_sweeps[1],
-               num_grid_sweeps[2],num_grid_sweeps[3]);
+                       num_grid_sweeps[1],
+                       num_grid_sweeps[2], num_grid_sweeps[3]);
          hypre_printf( "   Type 0=Jac, 3=hGS, 6=hSGS, 9=GE:   %4d   %2d  %4d \n",
-               grid_relax_type[1],
-               grid_relax_type[2],grid_relax_type[3]);
+                       grid_relax_type[1],
+                       grid_relax_type[2], grid_relax_type[3]);
          hypre_printf( "   Point types, partial sweeps (1=C, -1=F):\n");
          if (grid_relax_points && grid_relax_type[1] != 8)
          {
             hypre_printf( "                  Pre-CG relaxation (down):");
             for (j = 0; j < num_grid_sweeps[1]; j++)
+            {
                hypre_printf("  %2d", grid_relax_points[1][j]);
+            }
             hypre_printf( "\n");
             hypre_printf( "                   Post-CG relaxation (up):");
             for (j = 0; j < num_grid_sweeps[2]; j++)
+            {
                hypre_printf("  %2d", grid_relax_points[2][j]);
+            }
             hypre_printf( "\n");
             hypre_printf( "                             Coarsest grid:");
             for (j = 0; j < num_grid_sweeps[3]; j++)
+            {
                hypre_printf("  %2d", grid_relax_points[3][j]);
-            hypre_printf( "\n\n");
+            }
+            {
+               hypre_printf( "\n");
+            }
          }
          else if (relax_order == 1 && grid_relax_type[1] != 8)
          {
             hypre_printf( "                  Pre-CG relaxation (down):");
             for (j = 0; j < num_grid_sweeps[1]; j++)
+            {
                hypre_printf("  %2d  %2d", one, minus_one);
+            }
             hypre_printf( "\n");
             hypre_printf( "                   Post-CG relaxation (up):");
             for (j = 0; j < num_grid_sweeps[2]; j++)
+            {
                hypre_printf("  %2d  %2d", minus_one, one);
+            }
             hypre_printf( "\n");
             hypre_printf( "                             Coarsest grid:");
             for (j = 0; j < num_grid_sweeps[3]; j++)
+            {
                hypre_printf("  %2d", zero);
-            hypre_printf( "\n\n");
+            }
+            {
+               hypre_printf( "\n");
+            }
          }
          else
          {
             hypre_printf( "                  Pre-CG relaxation (down):");
             for (j = 0; j < num_grid_sweeps[1]; j++)
+            {
                hypre_printf("  %2d", zero);
+            }
             hypre_printf( "\n");
             hypre_printf( "                   Post-CG relaxation (up):");
             for (j = 0; j < num_grid_sweeps[2]; j++)
+            {
                hypre_printf("  %2d", zero);
+            }
             hypre_printf( "\n");
             hypre_printf( "                             Coarsest grid:");
             for (j = 0; j < num_grid_sweeps[3]; j++)
+            {
                hypre_printf("  %2d", zero);
-            hypre_printf( "\n\n");
+            }
+            {
+               hypre_printf( "\n");
+            }
          }
       }
+#if defined(HYPRE_USING_MAGMA)
+      if (grid_relax_type[3] ==  98 || grid_relax_type[3] ==  99 ||
+          grid_relax_type[3] == 198 || grid_relax_type[3] == 199)
+      {
+         hypre_printf( "   Using MAGMA's LU factorization on coarse level\n");
+      }
+#endif
+      {
+         hypre_printf( "\n");
+      }
+
       if (smooth_type == 6)
-         for (j=0; j < smooth_num_levels; j++)
+      {
+         for (j = 0; j < smooth_num_levels; j++)
+         {
             hypre_printf( " Schwarz Relaxation Weight %f level %d\n",
-                  hypre_ParAMGDataSchwarzRlxWeight(amg_data),j);
+                          hypre_ParAMGDataSchwarzRlxWeight(amg_data), j);
+         }
+      }
       if (smooth_type == 7)
-         for (j=0; j < smooth_num_levels; j++)
+      {
+         for (j = 0; j < smooth_num_levels; j++)
+         {
             hypre_printf( " Pilut smoother level %d\n", j);
+         }
+      }
       if (smooth_type == 8)
-         for (j=0; j < smooth_num_levels; j++)
+      {
+         for (j = 0; j < smooth_num_levels; j++)
+         {
             hypre_printf( " ParaSails smoother level %d\n", j);
+         }
+      }
       if (smooth_type == 9)
-         for (j=0; j < smooth_num_levels; j++)
+      {
+         for (j = 0; j < smooth_num_levels; j++)
+         {
             hypre_printf( " Euclid smoother level %d\n", j);
-      for (j=0; j < num_levels; j++)
+         }
+      }
+      for (j = 0; j < num_levels; j++)
+      {
          if (relax_weight[j] != 1)
-            hypre_printf( " Relaxation Weight %f level %d\n",relax_weight[j],j);
-      for (j=0; j < num_levels; j++)
+         {
+            hypre_printf( " Relaxation Weight %f level %d\n", relax_weight[j], j);
+         }
+      }
+      for (j = 0; j < num_levels; j++)
+      {
          if (omega[j] != 1)
-            hypre_printf( " Outer relaxation weight %f level %d\n",omega[j],j);
+         {
+            hypre_printf( " Outer relaxation weight %f level %d\n", omega[j], j);
+         }
+      }
    }
 
    hypre_TFree(num_coeffs, HYPRE_MEMORY_HOST);
@@ -1191,43 +1371,42 @@ hypre_BoomerAMGSetupStats( void               *amg_vdata,
    hypre_TFree(send_buff, HYPRE_MEMORY_HOST);
    hypre_TFree(gather_buff, HYPRE_MEMORY_HOST);
 
-   return(0);
-}
-
-
+   hypre_GpuProfilingPopRange();
 
+   return hypre_error_flag;
+}
 
 /*---------------------------------------------------------------
  * hypre_BoomerAMGWriteSolverParams
  *---------------------------------------------------------------*/
 
-
-HYPRE_Int    hypre_BoomerAMGWriteSolverParams(void* data)
+HYPRE_Int
+hypre_BoomerAMGWriteSolverParams(void* data)
 {
    hypre_ParAMGData  *amg_data = (hypre_ParAMGData*) data;
 
    /* amg solve params */
-   HYPRE_Int      num_levels;
-   HYPRE_Int      max_iter;
-   HYPRE_Int      cycle_type;
-   HYPRE_Int      fcycle;
-   HYPRE_Int     *num_grid_sweeps;
-   HYPRE_Int     *grid_relax_type;
-   HYPRE_Int    **grid_relax_points;
-   HYPRE_Int      relax_order;
-   HYPRE_Real  *relax_weight;
-   HYPRE_Real  *omega;
-   HYPRE_Real   tol;
-   HYPRE_Int      smooth_type;
-   HYPRE_Int      smooth_num_levels;
-   /* amg output params */
-   HYPRE_Int      amg_print_level;
+   HYPRE_Int          num_levels;
+   HYPRE_Int          max_iter;
+   HYPRE_Int          cycle_type;
+   HYPRE_Int          fcycle;
+   HYPRE_Int         *num_grid_sweeps;
+   HYPRE_Int         *grid_relax_type;
+   HYPRE_Int        **grid_relax_points;
+   HYPRE_Int          relax_order;
+   HYPRE_Real        *relax_weight;
+   HYPRE_Real        *omega;
+   HYPRE_Real         tol;
+   HYPRE_Int          smooth_type;
+   HYPRE_Int          smooth_num_levels;
 
-   HYPRE_Int      j;
-   HYPRE_Int      one = 1;
-   HYPRE_Int      minus_one = -1;
-   HYPRE_Int      zero = 0;
+   /* amg output params */
+   HYPRE_Int          amg_print_level;
 
+   HYPRE_Int          j;
+   HYPRE_Int          one = 1;
+   HYPRE_Int          minus_one = -1;
+   HYPRE_Int          zero = 0;
 
    /*----------------------------------------------------------
     * Get the amg_data data
@@ -1256,8 +1435,8 @@ HYPRE_Int    hypre_BoomerAMGWriteSolverParams(void* data)
    if (amg_print_level == 1 || amg_print_level == 3)
    {
       hypre_printf("\n\nBoomerAMG SOLVER PARAMETERS:\n\n");
-      hypre_printf( "  Maximum number of cycles:         %d \n",max_iter);
-      hypre_printf( "  Stopping Tolerance:               %e \n",tol);
+      hypre_printf( "  Maximum number of cycles:         %d \n", max_iter);
+      hypre_printf( "  Stopping Tolerance:               %e \n", tol);
       if (fcycle)
       {
          hypre_printf( "  Full Multigrid. Cycle type (1 = V, 2 = W, etc.):  %d\n\n", cycle_type);
@@ -1269,71 +1448,348 @@ HYPRE_Int    hypre_BoomerAMGWriteSolverParams(void* data)
       hypre_printf( "  Relaxation Parameters:\n");
       hypre_printf( "   Visiting Grid:                     down   up  coarse\n");
       hypre_printf( "            Number of sweeps:         %4d   %2d  %4d \n",
-            num_grid_sweeps[1],
-            num_grid_sweeps[2],num_grid_sweeps[3]);
+                    num_grid_sweeps[1],
+                    num_grid_sweeps[2], num_grid_sweeps[3]);
       hypre_printf( "   Type 0=Jac, 3=hGS, 6=hSGS, 9=GE:   %4d   %2d  %4d \n",
-            grid_relax_type[1],
-            grid_relax_type[2],grid_relax_type[3]);
+                    grid_relax_type[1],
+                    grid_relax_type[2], grid_relax_type[3]);
       hypre_printf( "   Point types, partial sweeps (1=C, -1=F):\n");
       if (grid_relax_points)
       {
          hypre_printf( "                  Pre-CG relaxation (down):");
          for (j = 0; j < num_grid_sweeps[1]; j++)
+         {
             hypre_printf("  %2d", grid_relax_points[1][j]);
+         }
          hypre_printf( "\n");
          hypre_printf( "                   Post-CG relaxation (up):");
          for (j = 0; j < num_grid_sweeps[2]; j++)
+         {
             hypre_printf("  %2d", grid_relax_points[2][j]);
+         }
          hypre_printf( "\n");
          hypre_printf( "                             Coarsest grid:");
          for (j = 0; j < num_grid_sweeps[3]; j++)
+         {
             hypre_printf("  %2d", grid_relax_points[3][j]);
+         }
          hypre_printf( "\n\n");
       }
       else if (relax_order == 1)
       {
          hypre_printf( "                  Pre-CG relaxation (down):");
          for (j = 0; j < num_grid_sweeps[1]; j++)
+         {
             hypre_printf("  %2d  %2d", one, minus_one);
+         }
          hypre_printf( "\n");
          hypre_printf( "                   Post-CG relaxation (up):");
          for (j = 0; j < num_grid_sweeps[2]; j++)
+         {
             hypre_printf("  %2d  %2d", minus_one, one);
+         }
          hypre_printf( "\n");
          hypre_printf( "                             Coarsest grid:");
          for (j = 0; j < num_grid_sweeps[3]; j++)
+         {
             hypre_printf("  %2d", zero);
+         }
          hypre_printf( "\n\n");
       }
       else
       {
          hypre_printf( "                  Pre-CG relaxation (down):");
          for (j = 0; j < num_grid_sweeps[1]; j++)
+         {
             hypre_printf("  %2d", zero);
+         }
          hypre_printf( "\n");
          hypre_printf( "                   Post-CG relaxation (up):");
          for (j = 0; j < num_grid_sweeps[2]; j++)
+         {
             hypre_printf("  %2d", zero);
+         }
          hypre_printf( "\n");
          hypre_printf( "                             Coarsest grid:");
          for (j = 0; j < num_grid_sweeps[3]; j++)
+         {
             hypre_printf("  %2d", zero);
+         }
          hypre_printf( "\n\n");
       }
+
       if (smooth_type == 6)
-         for (j=0; j < smooth_num_levels; j++)
+      {
+         for (j = 0; j < smooth_num_levels; j++)
+         {
             hypre_printf( " Schwarz Relaxation Weight %f level %d\n",
-                  hypre_ParAMGDataSchwarzRlxWeight(amg_data),j);
-      for (j=0; j < num_levels; j++)
+                          hypre_ParAMGDataSchwarzRlxWeight(amg_data), j);
+         }
+      }
+      for (j = 0; j < num_levels; j++)
+      {
          if (relax_weight[j] != 1)
-            hypre_printf( " Relaxation Weight %f level %d\n",relax_weight[j],j);
-      for (j=0; j < num_levels; j++)
+         {
+            hypre_printf( " Relaxation Weight %f level %d\n", relax_weight[j], j);
+         }
+      }
+      for (j = 0; j < num_levels; j++)
+      {
          if (omega[j] != 1)
-            hypre_printf( " Outer relaxation weight %f level %d\n",omega[j],j);
+         {
+            hypre_printf( " Outer relaxation weight %f level %d\n", omega[j], j);
+         }
+      }
 
       hypre_printf( " Output flag (print_level): %d \n", amg_print_level);
    }
 
-   return 0;
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------
+ * hypre_BoomerAMGGetProlongationName
+ *--------------------------------------------------------------------*/
+
+const char*
+hypre_BoomerAMGGetProlongationName(hypre_ParAMGData *amg_data)
+{
+   switch (hypre_ParAMGDataInterpType(amg_data))
+   {
+      case 0:
+         return "modified classical";
+
+      case 1:
+         return "LS";
+
+      case 2:
+         return "modified classical for hyperbolic PDEs";
+
+      case 3:
+         return "direct with separation of weights";
+
+      case 4:
+         return "multipass";
+
+      case 5:
+         return "multipass with separation of weights";
+
+      case 6:
+         return "extended+i";
+
+      case 7:
+         return "extended+i (if no common C-point)";
+
+      case 8:
+         return "standard";
+
+      case 9:
+         return "standard with separation of weights";
+
+      case 10:
+         return "block classical for nodal systems";
+
+      case 11:
+         return "block classical with diagonal blocks for nodal systems";
+
+      case 12:
+         return "F-F";
+
+      case 13:
+         return "F-F1";
+
+      case 14:
+         return "extended";
+
+      case 15:
+         return "direct with separation of weights";
+
+      case 16:
+         return "MM-extended";
+
+      case 17:
+         return "MM-extended+i";
+
+      case 18:
+         return "MM-extended+e";
+
+      case 24:
+         return "block direct for nodal systems";
+
+      case 100:
+         return "one-point";
+
+      default:
+         return "Unknown";
+   }
+}
+
+/*--------------------------------------------------------------------
+ * hypre_BoomerAMGGetAggProlongationName
+ *--------------------------------------------------------------------*/
+
+const char*
+hypre_BoomerAMGGetAggProlongationName(hypre_ParAMGData *amg_data)
+{
+   if (hypre_ParAMGDataAggNumLevels(amg_data))
+   {
+      switch (hypre_ParAMGDataAggInterpType(amg_data))
+      {
+         case 1:
+            return "2-stage extended+i";
+
+         case 2:
+            return "2-stage standard";
+
+         case 3:
+            return "2-stage extended";
+
+         case 4:
+            return "multipass";
+
+         default:
+            return "Unknown";
+      }
+   }
+   else
+   {
+      return "";
+   }
 }
 
+/*--------------------------------------------------------------------
+ * hypre_BoomerAMGGetCoarseningName
+ *--------------------------------------------------------------------*/
+
+const char*
+hypre_BoomerAMGGetCoarseningName(hypre_ParAMGData *amg_data)
+{
+   switch (hypre_ParAMGDataCoarsenType(amg_data))
+   {
+      case 0:
+         return "Cleary-Luby-Jones-Plassman";
+
+      case 1:
+         return "Ruge";
+
+      case 2:
+         return "Ruge-2B";
+
+      case 3:
+         return "Ruge-3";
+
+      case 4:
+         return "Ruge-3c";
+
+      case 5:
+         return "Ruge relax special points";
+
+      case 6:
+         return "Falgout-CLJP";
+
+      case 7:
+         return "CLJP, fixed random";
+
+      case 8:
+         return "PMIS";
+
+      case 9:
+         return "PMIS, fixed random";
+
+      case 10:
+         return "HMIS";
+
+      case 11:
+         return "Ruge 1st pass only";
+
+      case 21:
+         return "CGC";
+
+      case 22:
+         return "CGC-E";
+
+      default:
+         return "Unknown";
+   }
+}
+
+/*--------------------------------------------------------------------
+ * hypre_BoomerAMGGetCoarseningName
+ *--------------------------------------------------------------------*/
+
+const char*
+hypre_BoomerAMGGetCycleName(hypre_ParAMGData *amg_data)
+{
+   static char name[10];
+
+   switch (hypre_ParAMGDataCycleType(amg_data))
+   {
+      case 1:
+         hypre_sprintf(name, "V(%d,%d)",
+                       hypre_ParAMGDataNumGridSweeps(amg_data)[0],
+                       hypre_ParAMGDataNumGridSweeps(amg_data)[1]);
+         break;
+
+      case 2:
+         hypre_sprintf(name, "W(%d,%d)",
+                       hypre_ParAMGDataNumGridSweeps(amg_data)[0],
+                       hypre_ParAMGDataNumGridSweeps(amg_data)[1]);
+         break;
+
+      default:
+         return "Unknown";
+   }
+
+   return name;
+}
+
+/*--------------------------------------------------------------------
+ * hypre_BoomerAMGPrintGeneralInfo
+ *
+ * Prints to stdout info about BoomerAMG parameters.
+ * The input parameter "shift" refers to the number of whitespaces
+ * added to the beginning of each line.
+ *--------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_BoomerAMGPrintGeneralInfo(hypre_ParAMGData *amg_data,
+                                HYPRE_Int         shift)
+{
+   HYPRE_PRINT_SHIFTED_PARAM(shift,
+                             "Solver Type = BoomerAMG\n");
+
+   HYPRE_PRINT_SHIFTED_PARAM(shift,
+                             "Strength Threshold = %f\n",
+                             hypre_ParAMGDataStrongThreshold(amg_data));
+
+   HYPRE_PRINT_SHIFTED_PARAM(shift,
+                             "Interpolation Truncation Factor = %f\n",
+                             hypre_ParAMGDataTruncFactor(amg_data));
+
+   HYPRE_PRINT_SHIFTED_PARAM(shift,
+                             "Maximum Row Sum Threshold for Dependency Weakening = %f\n",
+                             hypre_ParAMGDataMaxRowSum(amg_data));
+
+   HYPRE_PRINT_SHIFTED_PARAM(shift,
+                             "Number of functions = %d\n",
+                             hypre_ParAMGDataNumFunctions(amg_data));
+
+   HYPRE_PRINT_SHIFTED_PARAM(shift,
+                             "Functions filtering is %s\n",
+                             (hypre_ParAMGDataFilterFunctions(amg_data) > 0) ? "on" : "off");
+
+   HYPRE_PRINT_SHIFTED_PARAM(shift,
+                             "Coarsening type = %s\n",
+                             hypre_BoomerAMGGetCoarseningName(amg_data));
+
+   HYPRE_PRINT_SHIFTED_PARAM(shift,
+                             "Prolongation type = %s\n",
+                             hypre_BoomerAMGGetProlongationName(amg_data));
+
+   HYPRE_PRINT_SHIFTED_PARAM(shift,
+                             "Cycle type = %s\n",
+                             hypre_BoomerAMGGetCycleName(amg_data));
+   hypre_printf("\n");
+
+   return hypre_error_flag;
+}
diff --git a/external/hypre/src/parcsr_ls/par_strength.c b/external/hypre/src/parcsr_ls/par_strength.c
index 4b7408a2..f514737e 100644
--- a/external/hypre/src/parcsr_ls/par_strength.c
+++ b/external/hypre/src/parcsr_ls/par_strength.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -153,10 +153,10 @@ hypre_BoomerAMGCreateSHost(hypre_ParCSRMatrix    *A,
                                 num_cols_offd, num_nonzeros_diag, num_nonzeros_offd);
 
    S_diag = hypre_ParCSRMatrixDiag(S);
-   hypre_CSRMatrixI(S_diag) = hypre_CTAlloc(HYPRE_Int, num_variables+1, memory_location);
+   hypre_CSRMatrixI(S_diag) = hypre_CTAlloc(HYPRE_Int, num_variables + 1, memory_location);
    hypre_CSRMatrixJ(S_diag) = hypre_CTAlloc(HYPRE_Int, num_nonzeros_diag, HYPRE_MEMORY_HOST);
    S_offd = hypre_ParCSRMatrixOffd(S);
-   hypre_CSRMatrixI(S_offd) = hypre_CTAlloc(HYPRE_Int, num_variables+1, memory_location);
+   hypre_CSRMatrixI(S_offd) = hypre_CTAlloc(HYPRE_Int, num_variables + 1, memory_location);
 
    S_diag_i = hypre_CSRMatrixI(S_diag);
    HYPRE_Int *S_temp_diag_j = hypre_CSRMatrixJ(S_diag);
@@ -183,7 +183,7 @@ hypre_BoomerAMGCreateSHost(hypre_ParCSRMatrix    *A,
 
       HYPRE_BigInt *col_map_offd_A = hypre_ParCSRMatrixColMapOffd(A);
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
       for (i = 0; i < num_cols_offd; i++)
       {
@@ -210,9 +210,9 @@ hypre_BoomerAMGCreateSHost(hypre_ParCSRMatrix    *A,
       for (i = 0; i < num_sends; i++)
       {
          start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
          {
-            int_buf_data[index++] = dof_func[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+            int_buf_data[index++] = dof_func[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
          }
       }
 
@@ -223,11 +223,11 @@ hypre_BoomerAMGCreateSHost(hypre_ParCSRMatrix    *A,
    }
 
    /*HYPRE_Int prefix_sum_workspace[2*(hypre_NumThreads() + 1)];*/
-   prefix_sum_workspace = hypre_TAlloc(HYPRE_Int,  2*(hypre_NumThreads() + 1), HYPRE_MEMORY_HOST);
+   prefix_sum_workspace = hypre_TAlloc(HYPRE_Int,  2 * (hypre_NumThreads() + 1), HYPRE_MEMORY_HOST);
 
    /* give S same nonzero structure as A */
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel private(i,diag,row_scale,row_sum,jA,jS)
+   #pragma omp parallel private(i,diag,row_scale,row_sum,jA,jS)
 #endif
    {
       HYPRE_Int start, stop;
@@ -251,7 +251,7 @@ hypre_BoomerAMGCreateSHost(hypre_ParCSRMatrix    *A,
          {
             if (diag < 0)
             {
-               for (jA = A_diag_i[i]+1; jA < A_diag_i[i+1]; jA++)
+               for (jA = A_diag_i[i] + 1; jA < A_diag_i[i + 1]; jA++)
                {
                   if (dof_func[i] == dof_func[A_diag_j[jA]])
                   {
@@ -259,7 +259,7 @@ hypre_BoomerAMGCreateSHost(hypre_ParCSRMatrix    *A,
                      row_sum += A_diag_data[jA];
                   }
                }
-               for (jA = A_offd_i[i]; jA < A_offd_i[i+1]; jA++)
+               for (jA = A_offd_i[i]; jA < A_offd_i[i + 1]; jA++)
                {
                   if (dof_func[i] == dof_func_offd[A_offd_j[jA]])
                   {
@@ -270,7 +270,7 @@ hypre_BoomerAMGCreateSHost(hypre_ParCSRMatrix    *A,
             }
             else
             {
-               for (jA = A_diag_i[i]+1; jA < A_diag_i[i+1]; jA++)
+               for (jA = A_diag_i[i] + 1; jA < A_diag_i[i + 1]; jA++)
                {
                   if (dof_func[i] == dof_func[A_diag_j[jA]])
                   {
@@ -278,7 +278,7 @@ hypre_BoomerAMGCreateSHost(hypre_ParCSRMatrix    *A,
                      row_sum += A_diag_data[jA];
                   }
                }
-               for (jA = A_offd_i[i]; jA < A_offd_i[i+1]; jA++)
+               for (jA = A_offd_i[i]; jA < A_offd_i[i + 1]; jA++)
                {
                   if (dof_func[i] == dof_func_offd[A_offd_j[jA]])
                   {
@@ -292,12 +292,12 @@ hypre_BoomerAMGCreateSHost(hypre_ParCSRMatrix    *A,
          {
             if (diag < 0)
             {
-               for (jA = A_diag_i[i]+1; jA < A_diag_i[i+1]; jA++)
+               for (jA = A_diag_i[i] + 1; jA < A_diag_i[i + 1]; jA++)
                {
                   row_scale = hypre_max(row_scale, A_diag_data[jA]);
                   row_sum += A_diag_data[jA];
                }
-               for (jA = A_offd_i[i]; jA < A_offd_i[i+1]; jA++)
+               for (jA = A_offd_i[i]; jA < A_offd_i[i + 1]; jA++)
                {
                   row_scale = hypre_max(row_scale, A_offd_data[jA]);
                   row_sum += A_offd_data[jA];
@@ -305,12 +305,12 @@ hypre_BoomerAMGCreateSHost(hypre_ParCSRMatrix    *A,
             }
             else
             {
-               for (jA = A_diag_i[i]+1; jA < A_diag_i[i+1]; jA++)
+               for (jA = A_diag_i[i] + 1; jA < A_diag_i[i + 1]; jA++)
                {
                   row_scale = hypre_min(row_scale, A_diag_data[jA]);
                   row_sum += A_diag_data[jA];
                }
-               for (jA = A_offd_i[i]; jA < A_offd_i[i+1]; jA++)
+               for (jA = A_offd_i[i]; jA < A_offd_i[i + 1]; jA++)
                {
                   row_scale = hypre_min(row_scale, A_offd_data[jA]);
                   row_sum += A_offd_data[jA];
@@ -323,16 +323,16 @@ hypre_BoomerAMGCreateSHost(hypre_ParCSRMatrix    *A,
 
          /* compute row entries of S */
          S_temp_diag_j[A_diag_i[i]] = -1;
-         if ((fabs(row_sum) > fabs(diag)*max_row_sum) && (max_row_sum < 1.0))
+         if ((hypre_abs(row_sum) > hypre_abs(diag)*max_row_sum) && (max_row_sum < 1.0))
          {
             /* make all dependencies weak */
-            for (jA = A_diag_i[i]+1; jA < A_diag_i[i+1]; jA++)
+            for (jA = A_diag_i[i] + 1; jA < A_diag_i[i + 1]; jA++)
             {
                S_temp_diag_j[jA] = -1;
             }
             jS_diag -= A_diag_i[i + 1] - (A_diag_i[i] + 1);
 
-            for (jA = A_offd_i[i]; jA < A_offd_i[i+1]; jA++)
+            for (jA = A_offd_i[i]; jA < A_offd_i[i + 1]; jA++)
             {
                S_temp_offd_j[jA] = -1;
             }
@@ -344,10 +344,10 @@ hypre_BoomerAMGCreateSHost(hypre_ParCSRMatrix    *A,
             {
                if (diag < 0)
                {
-                  for (jA = A_diag_i[i]+1; jA < A_diag_i[i+1]; jA++)
+                  for (jA = A_diag_i[i] + 1; jA < A_diag_i[i + 1]; jA++)
                   {
                      if (A_diag_data[jA] <= strength_threshold * row_scale
-                           || dof_func[i] != dof_func[A_diag_j[jA]])
+                         || dof_func[i] != dof_func[A_diag_j[jA]])
                      {
                         S_temp_diag_j[jA] = -1;
                         --jS_diag;
@@ -357,10 +357,10 @@ hypre_BoomerAMGCreateSHost(hypre_ParCSRMatrix    *A,
                         S_temp_diag_j[jA] = A_diag_j[jA];
                      }
                   }
-                  for (jA = A_offd_i[i]; jA < A_offd_i[i+1]; jA++)
+                  for (jA = A_offd_i[i]; jA < A_offd_i[i + 1]; jA++)
                   {
                      if (A_offd_data[jA] <= strength_threshold * row_scale
-                           || dof_func[i] != dof_func_offd[A_offd_j[jA]])
+                         || dof_func[i] != dof_func_offd[A_offd_j[jA]])
                      {
                         S_temp_offd_j[jA] = -1;
                         --jS_offd;
@@ -373,10 +373,10 @@ hypre_BoomerAMGCreateSHost(hypre_ParCSRMatrix    *A,
                }
                else
                {
-                  for (jA = A_diag_i[i]+1; jA < A_diag_i[i+1]; jA++)
+                  for (jA = A_diag_i[i] + 1; jA < A_diag_i[i + 1]; jA++)
                   {
                      if (A_diag_data[jA] >= strength_threshold * row_scale
-                           || dof_func[i] != dof_func[A_diag_j[jA]])
+                         || dof_func[i] != dof_func[A_diag_j[jA]])
                      {
                         S_temp_diag_j[jA] = -1;
                         --jS_diag;
@@ -386,10 +386,10 @@ hypre_BoomerAMGCreateSHost(hypre_ParCSRMatrix    *A,
                         S_temp_diag_j[jA] = A_diag_j[jA];
                      }
                   }
-                  for (jA = A_offd_i[i]; jA < A_offd_i[i+1]; jA++)
+                  for (jA = A_offd_i[i]; jA < A_offd_i[i + 1]; jA++)
                   {
                      if (A_offd_data[jA] >= strength_threshold * row_scale
-                           || dof_func[i] != dof_func_offd[A_offd_j[jA]])
+                         || dof_func[i] != dof_func_offd[A_offd_j[jA]])
                      {
                         S_temp_offd_j[jA] = -1;
                         --jS_offd;
@@ -405,7 +405,7 @@ hypre_BoomerAMGCreateSHost(hypre_ParCSRMatrix    *A,
             {
                if (diag < 0)
                {
-                  for (jA = A_diag_i[i]+1; jA < A_diag_i[i+1]; jA++)
+                  for (jA = A_diag_i[i] + 1; jA < A_diag_i[i + 1]; jA++)
                   {
                      if (A_diag_data[jA] <= strength_threshold * row_scale)
                      {
@@ -417,7 +417,7 @@ hypre_BoomerAMGCreateSHost(hypre_ParCSRMatrix    *A,
                         S_temp_diag_j[jA] = A_diag_j[jA];
                      }
                   }
-                  for (jA = A_offd_i[i]; jA < A_offd_i[i+1]; jA++)
+                  for (jA = A_offd_i[i]; jA < A_offd_i[i + 1]; jA++)
                   {
                      if (A_offd_data[jA] <= strength_threshold * row_scale)
                      {
@@ -432,7 +432,7 @@ hypre_BoomerAMGCreateSHost(hypre_ParCSRMatrix    *A,
                }
                else
                {
-                  for (jA = A_diag_i[i]+1; jA < A_diag_i[i+1]; jA++)
+                  for (jA = A_diag_i[i] + 1; jA < A_diag_i[i + 1]; jA++)
                   {
                      if (A_diag_data[jA] >= strength_threshold * row_scale)
                      {
@@ -444,7 +444,7 @@ hypre_BoomerAMGCreateSHost(hypre_ParCSRMatrix    *A,
                         S_temp_diag_j[jA] = A_diag_j[jA];
                      }
                   }
-                  for (jA = A_offd_i[i]; jA < A_offd_i[i+1]; jA++)
+                  for (jA = A_offd_i[i]; jA < A_offd_i[i + 1]; jA++)
                   {
                      if (A_offd_data[jA] >= strength_threshold * row_scale)
                      {
@@ -461,7 +461,8 @@ hypre_BoomerAMGCreateSHost(hypre_ParCSRMatrix    *A,
          } /* !((row_sum > max_row_sum) && (max_row_sum < 1.0)) */
       } /* for each variable */
 
-      hypre_prefix_sum_pair(&jS_diag, S_diag_i + num_variables, &jS_offd, S_offd_i + num_variables, prefix_sum_workspace);
+      hypre_prefix_sum_pair(&jS_diag, S_diag_i + num_variables, &jS_offd, S_offd_i + num_variables,
+                            prefix_sum_workspace);
 
       /*--------------------------------------------------------------
        * "Compress" the strength matrix.
@@ -479,7 +480,7 @@ hypre_BoomerAMGCreateSHost(hypre_ParCSRMatrix    *A,
          S_offd_i[i] += jS_offd;
 
          jS = S_diag_i[i];
-         for (jA = A_diag_i[i]; jA < A_diag_i[i+1]; jA++)
+         for (jA = A_diag_i[i]; jA < A_diag_i[i + 1]; jA++)
          {
             if (S_temp_diag_j[jA] > -1)
             {
@@ -489,7 +490,7 @@ hypre_BoomerAMGCreateSHost(hypre_ParCSRMatrix    *A,
          }
 
          jS = S_offd_i[i];
-         for (jA = A_offd_i[i]; jA < A_offd_i[i+1]; jA++)
+         for (jA = A_offd_i[i]; jA < A_offd_i[i + 1]; jA++)
          {
             if (S_temp_offd_j[jA] > -1)
             {
@@ -534,28 +535,26 @@ hypre_BoomerAMGCreateS(hypre_ParCSRMatrix    *A,
                        HYPRE_Int             *dof_func,
                        hypre_ParCSRMatrix   **S_ptr)
 {
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    hypre_GpuProfilingPushRange("CreateS");
-#endif
 
    HYPRE_Int ierr = 0;
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
    HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_ParCSRMatrixMemoryLocation(A) );
 
    if (exec == HYPRE_EXEC_DEVICE)
    {
-      ierr = hypre_BoomerAMGCreateSDevice(A,0,strength_threshold,max_row_sum,num_functions,dof_func,S_ptr);
+      ierr = hypre_BoomerAMGCreateSDevice(A, 0, strength_threshold, max_row_sum, num_functions, dof_func,
+                                          S_ptr);
    }
    else
 #endif
    {
-      ierr = hypre_BoomerAMGCreateSHost(A,strength_threshold,max_row_sum,num_functions,dof_func,S_ptr);
+      ierr = hypre_BoomerAMGCreateSHost(A, strength_threshold, max_row_sum, num_functions, dof_func,
+                                        S_ptr);
    }
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    hypre_GpuProfilingPopRange();
-#endif
 
    return ierr;
 }
@@ -585,48 +584,48 @@ hypre_BoomerAMGCreateSFromCFMarker(hypre_ParCSRMatrix   *A,
    hypre_profile_times[HYPRE_TIMER_ID_CREATES] -= hypre_MPI_Wtime();
 #endif
 
-   MPI_Comm                 comm     = hypre_ParCSRMatrixComm(A);
-   hypre_ParCSRCommPkg     *comm_pkg = hypre_ParCSRMatrixCommPkg(A);
-   hypre_ParCSRCommHandle  *comm_handle;
-   hypre_CSRMatrix    *A_diag          = hypre_ParCSRMatrixDiag(A);
-   HYPRE_Int          *A_diag_i        = hypre_CSRMatrixI(A_diag);
-   HYPRE_Real         *A_diag_data     = hypre_CSRMatrixData(A_diag);
-
-
-   hypre_CSRMatrix    *A_offd          = hypre_ParCSRMatrixOffd(A);
-   HYPRE_Int          *A_offd_i        = hypre_CSRMatrixI(A_offd);
-   HYPRE_Real         *A_offd_data = NULL;
-   HYPRE_Int          *A_diag_j        = hypre_CSRMatrixJ(A_diag);
-   HYPRE_Int          *A_offd_j        = hypre_CSRMatrixJ(A_offd);
+   HYPRE_MemoryLocation     memloc        = hypre_ParCSRMatrixMemoryLocation(A);
+   MPI_Comm                 comm          = hypre_ParCSRMatrixComm(A);
+   hypre_ParCSRCommPkg     *comm_pkg      = hypre_ParCSRMatrixCommPkg(A);
+   hypre_CSRMatrix         *A_diag        = hypre_ParCSRMatrixDiag(A);
+   HYPRE_Int               *A_diag_i      = hypre_CSRMatrixI(A_diag);
+   HYPRE_Real              *A_diag_data   = hypre_CSRMatrixData(A_diag);
+
+   hypre_CSRMatrix         *A_offd        = hypre_ParCSRMatrixOffd(A);
+   HYPRE_Int               *A_offd_i      = hypre_CSRMatrixI(A_offd);
+   HYPRE_Real              *A_offd_data   = NULL;
+   HYPRE_Int               *A_diag_j      = hypre_CSRMatrixJ(A_diag);
+   HYPRE_Int               *A_offd_j      = hypre_CSRMatrixJ(A_offd);
+
+   HYPRE_BigInt            *row_starts    = hypre_ParCSRMatrixRowStarts(A);
+   HYPRE_Int                num_variables = hypre_CSRMatrixNumRows(A_diag);
+   HYPRE_BigInt             global_num_vars = hypre_ParCSRMatrixGlobalNumRows(A);
+   HYPRE_Int                num_nonzeros_diag;
+   HYPRE_Int                num_nonzeros_offd = 0;
+   HYPRE_Int                num_cols_offd = 0;
 
-   HYPRE_BigInt       *row_starts      = hypre_ParCSRMatrixRowStarts(A);
-   HYPRE_Int           num_variables   = hypre_CSRMatrixNumRows(A_diag);
-   HYPRE_BigInt        global_num_vars = hypre_ParCSRMatrixGlobalNumRows(A);
-   HYPRE_Int           num_nonzeros_diag;
-   HYPRE_Int           num_nonzeros_offd = 0;
-   HYPRE_Int           num_cols_offd = 0;
-
-   hypre_ParCSRMatrix *S;
-   hypre_CSRMatrix    *S_diag;
-   HYPRE_Int          *S_diag_i;
-   HYPRE_Int          *S_diag_j;
+   hypre_ParCSRCommHandle  *comm_handle;
+   hypre_ParCSRMatrix      *S;
+   hypre_CSRMatrix         *S_diag;
+   HYPRE_Int               *S_diag_i;
+   HYPRE_Int               *S_diag_j;
    /* HYPRE_Real         *S_diag_data; */
-   hypre_CSRMatrix    *S_offd;
-   HYPRE_Int          *S_offd_i = NULL;
-   HYPRE_Int          *S_offd_j = NULL;
+   hypre_CSRMatrix         *S_offd;
+   HYPRE_Int               *S_offd_i = NULL;
+   HYPRE_Int               *S_offd_j = NULL;
    /* HYPRE_Real         *S_offd_data; */
-   HYPRE_Int          *dof_func_offd = NULL;
+   HYPRE_Int               *dof_func_offd = NULL;
 
-   HYPRE_Real          diag, row_scale, row_sum;
-   HYPRE_Int           i, jj, jA, jS;
-   HYPRE_Int           num_sends, start, j, index;
-   HYPRE_Int          *int_buf_data;
+   HYPRE_Real               diag, row_scale, row_sum;
+   HYPRE_Int                i, jj, jA, jS;
+   HYPRE_Int                num_sends, start, j, index;
+   HYPRE_Int               *int_buf_data;
 
-   HYPRE_Int           ierr = 0;
-   HYPRE_Int          *CF_marker_offd = NULL;
+   HYPRE_Int                ierr = 0;
+   HYPRE_Int               *CF_marker_offd = NULL;
 
-   HYPRE_Int          *prefix_sum_workspace;
-   HYPRE_Int           my_id;
+   HYPRE_Int               *prefix_sum_workspace;
+   HYPRE_Int                my_id;
 
    /*--------------------------------------------------------------
     * Compute a  ParCSR strength matrix, S.
@@ -654,10 +653,10 @@ hypre_BoomerAMGCreateSFromCFMarker(hypre_ParCSRMatrix   *A,
                                 num_cols_offd, num_nonzeros_diag, num_nonzeros_offd);
 
    S_diag = hypre_ParCSRMatrixDiag(S);
-   hypre_CSRMatrixI(S_diag) = hypre_CTAlloc(HYPRE_Int,  num_variables+1, HYPRE_MEMORY_HOST);
+   hypre_CSRMatrixI(S_diag) = hypre_CTAlloc(HYPRE_Int,  num_variables + 1, HYPRE_MEMORY_HOST);
    hypre_CSRMatrixJ(S_diag) = hypre_CTAlloc(HYPRE_Int,  num_nonzeros_diag, HYPRE_MEMORY_HOST);
    S_offd = hypre_ParCSRMatrixOffd(S);
-   hypre_CSRMatrixI(S_offd) = hypre_CTAlloc(HYPRE_Int,  num_variables+1, HYPRE_MEMORY_HOST);
+   hypre_CSRMatrixI(S_offd) = hypre_CTAlloc(HYPRE_Int,  num_variables + 1, HYPRE_MEMORY_HOST);
 
    S_diag_i = hypre_CSRMatrixI(S_diag);
    HYPRE_Int *S_temp_diag_j = hypre_CSRMatrixJ(S_diag);
@@ -684,7 +683,7 @@ hypre_BoomerAMGCreateSFromCFMarker(hypre_ParCSRMatrix   *A,
       HYPRE_BigInt *col_map_offd_A = hypre_ParCSRMatrixColMapOffd(A);
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
       for (i = 0; i < num_cols_offd; i++)
       {
@@ -704,17 +703,20 @@ hypre_BoomerAMGCreateSFromCFMarker(hypre_ParCSRMatrix   *A,
    num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
    if (num_functions > 1)
    {
-      int_buf_data = hypre_CTAlloc(HYPRE_Int, hypre_ParCSRCommPkgSendMapStart(comm_pkg,
-               num_sends), HYPRE_MEMORY_HOST);
+      int_buf_data = hypre_CTAlloc(HYPRE_Int,
+                                   hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                                   HYPRE_MEMORY_HOST);
       index = 0;
       for (i = 0; i < num_sends; i++)
       {
          start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-         for (j=start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
-            int_buf_data[index++] = dof_func[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
+         {
+            int_buf_data[index++] = dof_func[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
+         }
       }
 
-      comm_handle = hypre_ParCSRCommHandleCreate( 11, comm_pkg, int_buf_data, dof_func_offd);
+      comm_handle = hypre_ParCSRCommHandleCreate(11, comm_pkg, int_buf_data, dof_func_offd);
 
       hypre_ParCSRCommHandleDestroy(comm_handle);
       hypre_TFree(int_buf_data, HYPRE_MEMORY_HOST);
@@ -723,37 +725,39 @@ hypre_BoomerAMGCreateSFromCFMarker(hypre_ParCSRMatrix   *A,
    /*-------------------------------------------------------------------
     * Get the CF_marker data for the off-processor columns
     *-------------------------------------------------------------------*/
-   if (num_cols_offd) CF_marker_offd = hypre_CTAlloc(HYPRE_Int, num_cols_offd, HYPRE_MEMORY_HOST);
+   CF_marker_offd = hypre_CTAlloc(HYPRE_Int, num_cols_offd, HYPRE_MEMORY_HOST);
    if (!comm_pkg)
    {
       hypre_MatvecCommPkgCreate(A);
       comm_pkg = hypre_ParCSRMatrixCommPkg(A);
    }
    num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
-   int_buf_data = hypre_CTAlloc(HYPRE_Int, hypre_ParCSRCommPkgSendMapStart(comm_pkg,
-            num_sends), HYPRE_MEMORY_HOST);
+   int_buf_data = hypre_CTAlloc(HYPRE_Int,
+                                hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                                HYPRE_MEMORY_HOST);
 
    index = 0;
    for (i = 0; i < num_sends; i++)
    {
       start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+      for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
          int_buf_data[index++]
-            = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+            = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
    }
 
-   comm_handle = hypre_ParCSRCommHandleCreate( 11, comm_pkg, int_buf_data,
-                                               CF_marker_offd);
+   comm_handle = hypre_ParCSRCommHandleCreate(11, comm_pkg, int_buf_data,
+                                              CF_marker_offd);
    hypre_ParCSRCommHandleDestroy(comm_handle);
    hypre_TFree(int_buf_data, HYPRE_MEMORY_HOST);
 
    /*HYPRE_Int prefix_sum_workspace[2*(hypre_NumThreads() + 1)];*/
-   prefix_sum_workspace = hypre_TAlloc(HYPRE_Int,  2*(hypre_NumThreads() + 1), HYPRE_MEMORY_HOST);
+   prefix_sum_workspace = hypre_TAlloc(HYPRE_Int,
+                                       2 * (hypre_NumThreads() + 1),
+                                       HYPRE_MEMORY_HOST);
 
    /* give S same nonzero structure as A */
-
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel private(i,diag,row_scale,row_sum,jA,jS)
+   #pragma omp parallel private(i,diag,row_scale,row_sum,jA,jS)
 #endif
    {
       HYPRE_Int start, stop;
@@ -762,7 +766,8 @@ hypre_BoomerAMGCreateSFromCFMarker(hypre_ParCSRMatrix   *A,
 
       for (i = start; i < stop; i++)
       {
-         if (CF_marker[i] == SMRK) {
+         if (CF_marker[i] == SMRK)
+         {
             S_diag_i[i] = jS_diag;
             if (num_cols_offd)
             {
@@ -778,7 +783,7 @@ hypre_BoomerAMGCreateSFromCFMarker(hypre_ParCSRMatrix   *A,
             {
                if (diag < 0)
                {
-                  for (jA = A_diag_i[i]+1; jA < A_diag_i[i+1]; jA++)
+                  for (jA = A_diag_i[i] + 1; jA < A_diag_i[i + 1]; jA++)
                   {
                      jj = A_diag_j[jA];
                      if ((CF_marker[jj] == SMRK) && (dof_func[i] == dof_func[jj]))
@@ -787,10 +792,11 @@ hypre_BoomerAMGCreateSFromCFMarker(hypre_ParCSRMatrix   *A,
                         row_sum += A_diag_data[jA];
                      }
                   }
-                  for (jA = A_offd_i[i]; jA < A_offd_i[i+1]; jA++)
+                  for (jA = A_offd_i[i]; jA < A_offd_i[i + 1]; jA++)
                   {
                      jj = A_offd_j[jA];
-                     if ((CF_marker_offd[jj] == SMRK) && (dof_func[i] == dof_func_offd[jj]))
+                     if ((CF_marker_offd[jj] == SMRK) &&
+                         (dof_func[i] == dof_func_offd[jj]))
                      {
                         row_scale = hypre_max(row_scale, A_offd_data[jA]);
                         row_sum += A_offd_data[jA];
@@ -799,7 +805,7 @@ hypre_BoomerAMGCreateSFromCFMarker(hypre_ParCSRMatrix   *A,
                } /* diag < 0 */
                else
                {
-                  for (jA = A_diag_i[i]+1; jA < A_diag_i[i+1]; jA++)
+                  for (jA = A_diag_i[i] + 1; jA < A_diag_i[i + 1]; jA++)
                   {
                      jj = A_diag_j[jA];
                      if ((CF_marker[jj] == SMRK) && (dof_func[i] == dof_func[jj]))
@@ -808,10 +814,11 @@ hypre_BoomerAMGCreateSFromCFMarker(hypre_ParCSRMatrix   *A,
                         row_sum += A_diag_data[jA];
                      }
                   }
-                  for (jA = A_offd_i[i]; jA < A_offd_i[i+1]; jA++)
+                  for (jA = A_offd_i[i]; jA < A_offd_i[i + 1]; jA++)
                   {
                      jj = A_offd_j[jA];
-                     if ((CF_marker_offd[jj] == SMRK) && (dof_func[i] == dof_func_offd[A_offd_j[jA]]))
+                     if ((CF_marker_offd[jj] == SMRK) &&
+                         (dof_func[i] == dof_func_offd[A_offd_j[jA]]))
                      {
                         row_scale = hypre_min(row_scale, A_offd_data[jA]);
                         row_sum += A_offd_data[jA];
@@ -823,18 +830,20 @@ hypre_BoomerAMGCreateSFromCFMarker(hypre_ParCSRMatrix   *A,
             {
                if (diag < 0)
                {
-                  for (jA = A_diag_i[i]+1; jA < A_diag_i[i+1]; jA++)
+                  for (jA = A_diag_i[i] + 1; jA < A_diag_i[i + 1]; jA++)
                   {
                      jj = A_diag_j[jA];
-                     if (CF_marker[jj] == SMRK) {
+                     if (CF_marker[jj] == SMRK)
+                     {
                         row_scale = hypre_max(row_scale, A_diag_data[jA]);
                         row_sum += A_diag_data[jA];
                      }
                   }
-                  for (jA = A_offd_i[i]; jA < A_offd_i[i+1]; jA++)
+                  for (jA = A_offd_i[i]; jA < A_offd_i[i + 1]; jA++)
                   {
                      jj = A_offd_j[jA];
-                     if (CF_marker_offd[jj] == SMRK) {
+                     if (CF_marker_offd[jj] == SMRK)
+                     {
                         row_scale = hypre_max(row_scale, A_offd_data[jA]);
                         row_sum += A_offd_data[jA];
                      }
@@ -842,18 +851,20 @@ hypre_BoomerAMGCreateSFromCFMarker(hypre_ParCSRMatrix   *A,
                } /* diag < 0 */
                else
                {
-                  for (jA = A_diag_i[i]+1; jA < A_diag_i[i+1]; jA++)
+                  for (jA = A_diag_i[i] + 1; jA < A_diag_i[i + 1]; jA++)
                   {
                      jj = A_diag_j[jA];
-                     if (CF_marker[jj] == SMRK) {
+                     if (CF_marker[jj] == SMRK)
+                     {
                         row_scale = hypre_min(row_scale, A_diag_data[jA]);
                         row_sum += A_diag_data[jA];
                      }
                   }
-                  for (jA = A_offd_i[i]; jA < A_offd_i[i+1]; jA++)
+                  for (jA = A_offd_i[i]; jA < A_offd_i[i + 1]; jA++)
                   {
                      jj = A_offd_j[jA];
-                     if (CF_marker_offd[jj] == SMRK) {
+                     if (CF_marker_offd[jj] == SMRK)
+                     {
                         row_scale = hypre_min(row_scale, A_offd_data[jA]);
                         row_sum += A_offd_data[jA];
                      }
@@ -864,15 +875,16 @@ hypre_BoomerAMGCreateSFromCFMarker(hypre_ParCSRMatrix   *A,
 
             /* compute row entries of S */
             S_temp_diag_j[A_diag_i[i]] = -1;
-            if ((fabs(row_sum) > fabs(diag)*max_row_sum) && (max_row_sum < 1.0))
+            if ((hypre_abs(row_sum) > hypre_abs(diag)*max_row_sum) &&
+                (max_row_sum < 1.0))
             {
                /* make all dependencies weak */
-               for (jA = A_diag_i[i]+1; jA < A_diag_i[i+1]; jA++)
+               for (jA = A_diag_i[i] + 1; jA < A_diag_i[i + 1]; jA++)
                {
                   S_temp_diag_j[jA] = -1;
                }
 
-               for (jA = A_offd_i[i]; jA < A_offd_i[i+1]; jA++)
+               for (jA = A_offd_i[i]; jA < A_offd_i[i + 1]; jA++)
                {
                   S_temp_offd_j[jA] = -1;
                }
@@ -883,13 +895,13 @@ hypre_BoomerAMGCreateSFromCFMarker(hypre_ParCSRMatrix   *A,
                {
                   if (diag < 0)
                   {
-                     for (jA = A_diag_i[i]+1; jA < A_diag_i[i+1]; jA++)
+                     for (jA = A_diag_i[i] + 1; jA < A_diag_i[i + 1]; jA++)
                      {
                         jj = A_diag_j[jA];
                         if (CF_marker[jj] == SMRK)
                         {
                            if ((A_diag_data[jA] <= strength_threshold * row_scale)
-                                 || (dof_func[i] != dof_func[jj]))
+                               || (dof_func[i] != dof_func[jj]))
                            {
                               S_temp_diag_j[jA] = -1;
                            }
@@ -904,13 +916,13 @@ hypre_BoomerAMGCreateSFromCFMarker(hypre_ParCSRMatrix   *A,
                            S_temp_diag_j[jA] = -1;
                         }
                      }
-                     for (jA = A_offd_i[i]; jA < A_offd_i[i+1]; jA++)
+                     for (jA = A_offd_i[i]; jA < A_offd_i[i + 1]; jA++)
                      {
                         jj = A_offd_j[jA];
                         if (CF_marker_offd[jj] == SMRK)
                         {
                            if ((A_offd_data[jA] <= strength_threshold * row_scale)
-                                 || (dof_func[i] != dof_func_offd[jj]))
+                               || (dof_func[i] != dof_func_offd[jj]))
                            {
                               S_temp_offd_j[jA] = -1;
                            }
@@ -928,13 +940,13 @@ hypre_BoomerAMGCreateSFromCFMarker(hypre_ParCSRMatrix   *A,
                   } /* end diag < 0 */
                   else
                   {
-                     for (jA = A_diag_i[i]+1; jA < A_diag_i[i+1]; jA++)
+                     for (jA = A_diag_i[i] + 1; jA < A_diag_i[i + 1]; jA++)
                      {
                         jj = A_diag_j[jA];
                         if (CF_marker[jj] == SMRK)
                         {
                            if ((A_diag_data[jA] >= strength_threshold * row_scale)
-                                 || (dof_func[i] != dof_func[jj]))
+                               || (dof_func[i] != dof_func[jj]))
                            {
                               S_temp_diag_j[jA] = -1;
                            }
@@ -949,13 +961,13 @@ hypre_BoomerAMGCreateSFromCFMarker(hypre_ParCSRMatrix   *A,
                            S_temp_diag_j[jA] = -1;
                         }
                      }
-                     for (jA = A_offd_i[i]; jA < A_offd_i[i+1]; jA++)
+                     for (jA = A_offd_i[i]; jA < A_offd_i[i + 1]; jA++)
                      {
                         jj = A_offd_j[jA];
                         if (CF_marker_offd[jj] == SMRK)
                         {
                            if ((A_offd_data[jA] >= strength_threshold * row_scale)
-                                 || (dof_func[i] != dof_func_offd[jj]))
+                               || (dof_func[i] != dof_func_offd[jj]))
                            {
                               S_temp_offd_j[jA] = -1;
                            }
@@ -976,10 +988,11 @@ hypre_BoomerAMGCreateSFromCFMarker(hypre_ParCSRMatrix   *A,
                {
                   if (diag < 0)
                   {
-                     for (jA = A_diag_i[i]+1; jA < A_diag_i[i+1]; jA++)
+                     for (jA = A_diag_i[i] + 1; jA < A_diag_i[i + 1]; jA++)
                      {
                         jj = A_diag_j[jA];
-                        if (CF_marker[jj] == SMRK) {
+                        if (CF_marker[jj] == SMRK)
+                        {
                            if (A_diag_data[jA] <= strength_threshold * row_scale)
                            {
                               S_temp_diag_j[jA] = -1;
@@ -989,14 +1002,17 @@ hypre_BoomerAMGCreateSFromCFMarker(hypre_ParCSRMatrix   *A,
                               S_temp_diag_j[jA] = jj;
                               ++jS_diag;
                            }
-                        } else {
+                        }
+                        else
+                        {
                            S_temp_diag_j[jA] = -1;
                         }
                      }
-                     for (jA = A_offd_i[i]; jA < A_offd_i[i+1]; jA++)
+                     for (jA = A_offd_i[i]; jA < A_offd_i[i + 1]; jA++)
                      {
                         jj = A_offd_j[jA];
-                        if (CF_marker_offd[jj] == SMRK) {
+                        if (CF_marker_offd[jj] == SMRK)
+                        {
                            if (A_offd_data[jA] <= strength_threshold * row_scale)
                            {
                               S_temp_offd_j[jA] = -1;
@@ -1006,17 +1022,20 @@ hypre_BoomerAMGCreateSFromCFMarker(hypre_ParCSRMatrix   *A,
                               S_temp_offd_j[jA] = jj;
                               ++jS_offd;
                            }
-                        } else {
+                        }
+                        else
+                        {
                            S_temp_offd_j[jA] = -1;
                         }
                      }
                   } /* diag < 0 */
                   else
                   {
-                     for (jA = A_diag_i[i]+1; jA < A_diag_i[i+1]; jA++)
+                     for (jA = A_diag_i[i] + 1; jA < A_diag_i[i + 1]; jA++)
                      {
                         jj = A_diag_j[jA];
-                        if (CF_marker[jj] == SMRK) {
+                        if (CF_marker[jj] == SMRK)
+                        {
                            if (A_diag_data[jA] >= strength_threshold * row_scale)
                            {
                               S_temp_diag_j[jA] = -1;
@@ -1026,14 +1045,17 @@ hypre_BoomerAMGCreateSFromCFMarker(hypre_ParCSRMatrix   *A,
                               S_temp_diag_j[jA] = jj;
                               ++jS_diag;
                            }
-                        } else {
+                        }
+                        else
+                        {
                            S_temp_diag_j[jA] = -1;
                         }
                      }
-                     for (jA = A_offd_i[i]; jA < A_offd_i[i+1]; jA++)
+                     for (jA = A_offd_i[i]; jA < A_offd_i[i + 1]; jA++)
                      {
                         jj = A_offd_j[jA];
-                        if (CF_marker_offd[jj] == SMRK) {
+                        if (CF_marker_offd[jj] == SMRK)
+                        {
                            if (A_offd_data[jA] >= strength_threshold * row_scale)
                            {
                               S_temp_offd_j[jA] = -1;
@@ -1043,7 +1065,9 @@ hypre_BoomerAMGCreateSFromCFMarker(hypre_ParCSRMatrix   *A,
                               S_temp_offd_j[jA] = jj;
                               ++jS_offd;
                            }
-                        } else {
+                        }
+                        else
+                        {
                            S_temp_offd_j[jA] = -1;
                         }
                      }
@@ -1059,19 +1083,20 @@ hypre_BoomerAMGCreateSFromCFMarker(hypre_ParCSRMatrix   *A,
                S_offd_i[i] = jS_offd;
             }
 
-            for (jA = A_diag_i[i]; jA < A_diag_i[i+1]; jA++)
+            for (jA = A_diag_i[i]; jA < A_diag_i[i + 1]; jA++)
             {
                S_temp_diag_j[jA] = -1;
             }
 
-            for (jA = A_offd_i[i]; jA < A_offd_i[i+1]; jA++)
+            for (jA = A_offd_i[i]; jA < A_offd_i[i + 1]; jA++)
             {
                S_temp_offd_j[jA] = -1;
             }
          } /* CF_marker != SMRK */
       } /* for each variable */
 
-      hypre_prefix_sum_pair(&jS_diag, S_diag_i + num_variables, &jS_offd, S_offd_i + num_variables, prefix_sum_workspace);
+      hypre_prefix_sum_pair(&jS_diag, S_diag_i + num_variables, &jS_offd,
+                            S_offd_i + num_variables, prefix_sum_workspace);
 
       /*--------------------------------------------------------------
        * "Compress" the strength matrix.
@@ -1089,7 +1114,7 @@ hypre_BoomerAMGCreateSFromCFMarker(hypre_ParCSRMatrix   *A,
          S_offd_i[i] += jS_offd;
 
          jS = S_diag_i[i];
-         for (jA = A_diag_i[i]; jA < A_diag_i[i+1]; jA++)
+         for (jA = A_diag_i[i]; jA < A_diag_i[i + 1]; jA++)
          {
             if (S_temp_diag_j[jA] > -1)
             {
@@ -1099,7 +1124,7 @@ hypre_BoomerAMGCreateSFromCFMarker(hypre_ParCSRMatrix   *A,
          }
 
          jS = S_offd_i[i];
-         for (jA = A_offd_i[i]; jA < A_offd_i[i+1]; jA++)
+         for (jA = A_offd_i[i]; jA < A_offd_i[i + 1]; jA++)
          {
             if (S_temp_offd_j[jA] > -1)
             {
@@ -1121,7 +1146,9 @@ hypre_BoomerAMGCreateSFromCFMarker(hypre_ParCSRMatrix   *A,
 
    hypre_ParCSRMatrixCommPkg(S) = NULL;
 
-   *S_ptr        = S;
+   hypre_ParCSRMatrixMigrate(S, memloc);
+
+   *S_ptr = S;
 
    hypre_TFree(prefix_sum_workspace, HYPRE_MEMORY_HOST);
    hypre_TFree(S_temp_diag_j, HYPRE_MEMORY_HOST);
@@ -1269,10 +1296,10 @@ hypre_BoomerAMGCreateSabsHost(hypre_ParCSRMatrix    *A,
                                 num_cols_offd, num_nonzeros_diag, num_nonzeros_offd);
 
    S_diag = hypre_ParCSRMatrixDiag(S);
-   hypre_CSRMatrixI(S_diag) = hypre_CTAlloc(HYPRE_Int, num_variables+1, memory_location);
+   hypre_CSRMatrixI(S_diag) = hypre_CTAlloc(HYPRE_Int, num_variables + 1, memory_location);
    hypre_CSRMatrixJ(S_diag) = hypre_CTAlloc(HYPRE_Int, num_nonzeros_diag, memory_location);
    S_offd = hypre_ParCSRMatrixOffd(S);
-   hypre_CSRMatrixI(S_offd) = hypre_CTAlloc(HYPRE_Int, num_variables+1, memory_location);
+   hypre_CSRMatrixI(S_offd) = hypre_CTAlloc(HYPRE_Int, num_variables + 1, memory_location);
 
    S_diag_i = hypre_CSRMatrixI(S_diag);
    S_diag_j = hypre_CSRMatrixJ(S_diag);
@@ -1309,14 +1336,15 @@ hypre_BoomerAMGCreateSabsHost(hypre_ParCSRMatrix    *A,
    num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
    if (num_functions > 1)
    {
-      int_buf_data = hypre_CTAlloc(HYPRE_Int, hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends), HYPRE_MEMORY_HOST);
+      int_buf_data = hypre_CTAlloc(HYPRE_Int, hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                                   HYPRE_MEMORY_HOST);
       index = 0;
       for (i = 0; i < num_sends; i++)
       {
          start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-         for (j=start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
          {
-            int_buf_data[index++] = dof_func[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+            int_buf_data[index++] = dof_func[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
          }
       }
 
@@ -1327,10 +1355,10 @@ hypre_BoomerAMGCreateSabsHost(hypre_ParCSRMatrix    *A,
    }
 
    /* give S same nonzero structure as A */
-   hypre_ParCSRMatrixCopy(A,S,0);
+   hypre_ParCSRMatrixCopy(A, S, 0);
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i,diag,row_scale,row_sum,jA) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i,diag,row_scale,row_sum,jA) HYPRE_SMP_SCHEDULE
 #endif
    for (i = 0; i < num_variables; i++)
    {
@@ -1338,50 +1366,50 @@ hypre_BoomerAMGCreateSabsHost(hypre_ParCSRMatrix    *A,
 
       /* compute scaling factor and row sum */
       row_scale = 0.0;
-      row_sum = fabs(diag);
+      row_sum = hypre_abs(diag);
       if (num_functions > 1)
       {
-         for (jA = A_diag_i[i]+1; jA < A_diag_i[i+1]; jA++)
+         for (jA = A_diag_i[i] + 1; jA < A_diag_i[i + 1]; jA++)
          {
             if (dof_func[i] == dof_func[A_diag_j[jA]])
             {
-               row_scale = hypre_max(row_scale, fabs(A_diag_data[jA]));
-               row_sum += fabs(A_diag_data[jA]);
+               row_scale = hypre_max(row_scale, hypre_abs(A_diag_data[jA]));
+               row_sum += hypre_abs(A_diag_data[jA]);
             }
          }
-         for (jA = A_offd_i[i]; jA < A_offd_i[i+1]; jA++)
+         for (jA = A_offd_i[i]; jA < A_offd_i[i + 1]; jA++)
          {
             if (dof_func[i] == dof_func_offd[A_offd_j[jA]])
             {
-               row_scale = hypre_max(row_scale, fabs(A_offd_data[jA]));
-               row_sum += fabs(A_offd_data[jA]);
+               row_scale = hypre_max(row_scale, hypre_abs(A_offd_data[jA]));
+               row_sum += hypre_abs(A_offd_data[jA]);
             }
          }
       }
       else
       {
-         for (jA = A_diag_i[i]+1; jA < A_diag_i[i+1]; jA++)
+         for (jA = A_diag_i[i] + 1; jA < A_diag_i[i + 1]; jA++)
          {
-            row_scale = hypre_max(row_scale, fabs(A_diag_data[jA]));
-            row_sum += fabs(A_diag_data[jA]);
+            row_scale = hypre_max(row_scale, hypre_abs(A_diag_data[jA]));
+            row_sum += hypre_abs(A_diag_data[jA]);
          }
-         for (jA = A_offd_i[i]; jA < A_offd_i[i+1]; jA++)
+         for (jA = A_offd_i[i]; jA < A_offd_i[i + 1]; jA++)
          {
-            row_scale = hypre_max(row_scale, fabs(A_offd_data[jA]));
-            row_sum += fabs(A_offd_data[jA]);
+            row_scale = hypre_max(row_scale, hypre_abs(A_offd_data[jA]));
+            row_sum += hypre_abs(A_offd_data[jA]);
          }
       }
 
       /* compute row entries of S */
       S_diag_j[A_diag_i[i]] = -1; /* reject diag entry */
-      if ( fabs(row_sum) < fabs(diag)*(2.0-max_row_sum) && max_row_sum < 1.0 )
+      if ( hypre_abs(row_sum) < hypre_abs(diag) * (2.0 - max_row_sum) && max_row_sum < 1.0 )
       {
          /* make all dependencies weak */
-         for (jA = A_diag_i[i]+1; jA < A_diag_i[i+1]; jA++)
+         for (jA = A_diag_i[i] + 1; jA < A_diag_i[i + 1]; jA++)
          {
             S_diag_j[jA] = -1;
          }
-         for (jA = A_offd_i[i]; jA < A_offd_i[i+1]; jA++)
+         for (jA = A_offd_i[i]; jA < A_offd_i[i + 1]; jA++)
          {
             S_offd_j[jA] = -1;
          }
@@ -1390,18 +1418,18 @@ hypre_BoomerAMGCreateSabsHost(hypre_ParCSRMatrix    *A,
       {
          if (num_functions > 1)
          {
-            for (jA = A_diag_i[i]+1; jA < A_diag_i[i+1]; jA++)
+            for (jA = A_diag_i[i] + 1; jA < A_diag_i[i + 1]; jA++)
             {
-               if (fabs(A_diag_data[jA]) <= strength_threshold * row_scale
-                     || dof_func[i] != dof_func[A_diag_j[jA]])
+               if (hypre_abs(A_diag_data[jA]) <= strength_threshold * row_scale
+                   || dof_func[i] != dof_func[A_diag_j[jA]])
                {
                   S_diag_j[jA] = -1;
                }
             }
-            for (jA = A_offd_i[i]; jA < A_offd_i[i+1]; jA++)
+            for (jA = A_offd_i[i]; jA < A_offd_i[i + 1]; jA++)
             {
-               if (fabs(A_offd_data[jA]) <= strength_threshold * row_scale
-                     || dof_func[i] != dof_func_offd[A_offd_j[jA]])
+               if (hypre_abs(A_offd_data[jA]) <= strength_threshold * row_scale
+                   || dof_func[i] != dof_func_offd[A_offd_j[jA]])
                {
                   S_offd_j[jA] = -1;
                }
@@ -1409,16 +1437,16 @@ hypre_BoomerAMGCreateSabsHost(hypre_ParCSRMatrix    *A,
          }
          else
          {
-            for (jA = A_diag_i[i]+1; jA < A_diag_i[i+1]; jA++)
+            for (jA = A_diag_i[i] + 1; jA < A_diag_i[i + 1]; jA++)
             {
-               if (fabs(A_diag_data[jA]) <= strength_threshold * row_scale)
+               if (hypre_abs(A_diag_data[jA]) <= strength_threshold * row_scale)
                {
                   S_diag_j[jA] = -1;
                }
             }
-            for (jA = A_offd_i[i]; jA < A_offd_i[i+1]; jA++)
+            for (jA = A_offd_i[i]; jA < A_offd_i[i + 1]; jA++)
             {
-               if (fabs(A_offd_data[jA]) <= strength_threshold * row_scale)
+               if (hypre_abs(A_offd_data[jA]) <= strength_threshold * row_scale)
                {
                   S_offd_j[jA] = -1;
                }
@@ -1442,7 +1470,7 @@ hypre_BoomerAMGCreateSabsHost(hypre_ParCSRMatrix    *A,
    for (i = 0; i < num_variables; i++)
    {
       S_diag_i[i] = jS;
-      for (jA = A_diag_i[i]; jA < A_diag_i[i+1]; jA++)
+      for (jA = A_diag_i[i]; jA < A_diag_i[i + 1]; jA++)
       {
          if (S_diag_j[jA] > -1)
          {
@@ -1459,7 +1487,7 @@ hypre_BoomerAMGCreateSabsHost(hypre_ParCSRMatrix    *A,
    for (i = 0; i < num_variables; i++)
    {
       S_offd_i[i] = jS;
-      for (jA = A_offd_i[i]; jA < A_offd_i[i+1]; jA++)
+      for (jA = A_offd_i[i]; jA < A_offd_i[i + 1]; jA++)
       {
          if (S_offd_j[jA] > -1)
          {
@@ -1487,28 +1515,26 @@ hypre_BoomerAMGCreateSabs(hypre_ParCSRMatrix    *A,
                           HYPRE_Int             *dof_func,
                           hypre_ParCSRMatrix   **S_ptr)
 {
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    hypre_GpuProfilingPushRange("CreateSabs");
-#endif
 
    HYPRE_Int ierr = 0;
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
    HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_ParCSRMatrixMemoryLocation(A) );
 
    if (exec == HYPRE_EXEC_DEVICE)
    {
-      ierr = hypre_BoomerAMGCreateSDevice(A,1,strength_threshold,max_row_sum,num_functions,dof_func,S_ptr);
+      ierr = hypre_BoomerAMGCreateSDevice(A, 1, strength_threshold, max_row_sum, num_functions, dof_func,
+                                          S_ptr);
    }
    else
 #endif
    {
-      ierr = hypre_BoomerAMGCreateSabsHost(A,strength_threshold,max_row_sum,num_functions,dof_func,S_ptr);
+      ierr = hypre_BoomerAMGCreateSabsHost(A, strength_threshold, max_row_sum, num_functions, dof_func,
+                                           S_ptr);
    }
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    hypre_GpuProfilingPopRange();
-#endif
 
    return ierr;
 }
@@ -1524,7 +1550,7 @@ hypre_BoomerAMGCreateSCommPkg(hypre_ParCSRMatrix *A,
    hypre_MPI_Status        *status;
    hypre_MPI_Request       *requests;
    hypre_ParCSRCommPkg     *comm_pkg_A = hypre_ParCSRMatrixCommPkg(A);
-   hypre_ParCSRCommPkg     *comm_pkg_S;
+   hypre_ParCSRCommPkg     *comm_pkg_S = NULL;
    hypre_ParCSRCommHandle  *comm_handle;
    hypre_CSRMatrix         *A_offd = hypre_ParCSRMatrixOffd(A);
    HYPRE_BigInt            *col_map_offd_A = hypre_ParCSRMatrixColMapOffd(A);
@@ -1570,12 +1596,16 @@ hypre_BoomerAMGCreateSCommPkg(hypre_ParCSRMatrix *A,
 
    S_marker = NULL;
    if (num_cols_offd_A)
+   {
       S_marker = hypre_CTAlloc(HYPRE_Int, num_cols_offd_A, HYPRE_MEMORY_HOST);
+   }
 
-   for (i=0; i < num_cols_offd_A; i++)
+   for (i = 0; i < num_cols_offd_A; i++)
+   {
       S_marker[i] = -1;
+   }
 
-   for (i=0; i < num_nonzeros; i++)
+   for (i = 0; i < num_nonzeros; i++)
    {
       jcol = S_offd_j[i];
       S_marker[jcol] = 0;
@@ -1585,9 +1615,9 @@ hypre_BoomerAMGCreateSCommPkg(hypre_ParCSRMatrix *A,
    proc_cnt = 0;
    cnt = 0;
    num_recvs_S = 0;
-   for (i=0; i < num_recvs_A; i++)
+   for (i = 0; i < num_recvs_A; i++)
    {
-      for (j=recv_vec_starts_A[i]; j < recv_vec_starts_A[i+1]; j++)
+      for (j = recv_vec_starts_A[i]; j < recv_vec_starts_A[i + 1]; j++)
       {
          if (!S_marker[j])
          {
@@ -1604,13 +1634,13 @@ hypre_BoomerAMGCreateSCommPkg(hypre_ParCSRMatrix *A,
    recv_change = NULL;
    recv_procs_S = NULL;
    send_change = NULL;
-   if (col_map_offd_S) hypre_TFree(col_map_offd_S, HYPRE_MEMORY_HOST);
+   if (col_map_offd_S) { hypre_TFree(col_map_offd_S, HYPRE_MEMORY_HOST); }
    col_map_offd_S = NULL;
    col_offd_S_to_A = NULL;
-   if (num_recvs_A) recv_change = hypre_CTAlloc(HYPRE_Int,  num_recvs_A, HYPRE_MEMORY_HOST);
-   if (num_sends_A) send_change = hypre_CTAlloc(HYPRE_Int,  num_sends_A, HYPRE_MEMORY_HOST);
-   if (num_recvs_S) recv_procs_S = hypre_CTAlloc(HYPRE_Int,  num_recvs_S, HYPRE_MEMORY_HOST);
-   recv_vec_starts_S = hypre_CTAlloc(HYPRE_Int,  num_recvs_S+1, HYPRE_MEMORY_HOST);
+   if (num_recvs_A) { recv_change = hypre_CTAlloc(HYPRE_Int,  num_recvs_A, HYPRE_MEMORY_HOST); }
+   if (num_sends_A) { send_change = hypre_CTAlloc(HYPRE_Int,  num_sends_A, HYPRE_MEMORY_HOST); }
+   if (num_recvs_S) { recv_procs_S = hypre_CTAlloc(HYPRE_Int,  num_recvs_S, HYPRE_MEMORY_HOST); }
+   recv_vec_starts_S = hypre_CTAlloc(HYPRE_Int,  num_recvs_S + 1, HYPRE_MEMORY_HOST);
    if (num_cols_offd_S)
    {
       col_map_offd_S = hypre_CTAlloc(HYPRE_BigInt, num_cols_offd_S, HYPRE_MEMORY_HOST);
@@ -1618,7 +1648,7 @@ hypre_BoomerAMGCreateSCommPkg(hypre_ParCSRMatrix *A,
    }
    if (num_cols_offd_S < num_cols_offd_A)
    {
-      for (i=0; i < num_nonzeros; i++)
+      for (i = 0; i < num_nonzeros; i++)
       {
          jcol = S_offd_j[i];
          S_offd_j[i] = S_marker[jcol];
@@ -1628,9 +1658,9 @@ hypre_BoomerAMGCreateSCommPkg(hypre_ParCSRMatrix *A,
       proc_cnt = 0;
       cnt = 0;
       recv_vec_starts_S[0] = 0;
-      for (i=0; i < num_recvs_A; i++)
+      for (i = 0; i < num_recvs_A; i++)
       {
-         for (j=recv_vec_starts_A[i]; j < recv_vec_starts_A[i+1]; j++)
+         for (j = recv_vec_starts_A[i]; j < recv_vec_starts_A[i + 1]; j++)
          {
             if (S_marker[j] != -1)
             {
@@ -1639,7 +1669,7 @@ hypre_BoomerAMGCreateSCommPkg(hypre_ParCSRMatrix *A,
                proc = 1;
             }
          }
-         recv_change[i] = j-cnt-recv_vec_starts_A[i]+recv_vec_starts_S[proc_cnt];
+         recv_change[i] = j - cnt - recv_vec_starts_A[i] + recv_vec_starts_S[proc_cnt];
          if (proc)
          {
             recv_procs_S[proc_cnt++] = recv_procs_A[i];
@@ -1650,9 +1680,9 @@ hypre_BoomerAMGCreateSCommPkg(hypre_ParCSRMatrix *A,
    }
    else
    {
-      for (i=0; i < num_recvs_A; i++)
+      for (i = 0; i < num_recvs_A; i++)
       {
-         for (j=recv_vec_starts_A[i]; j < recv_vec_starts_A[i+1]; j++)
+         for (j = recv_vec_starts_A[i]; j < recv_vec_starts_A[i + 1]; j++)
          {
             col_map_offd_S[j] = col_map_offd_A[j];
             col_offd_S_to_A[j] = j;
@@ -1663,37 +1693,47 @@ hypre_BoomerAMGCreateSCommPkg(hypre_ParCSRMatrix *A,
       recv_vec_starts_S[num_recvs_A] = recv_vec_starts_A[num_recvs_A];
    }
 
-   requests = hypre_CTAlloc(hypre_MPI_Request, num_sends_A+num_recvs_A, HYPRE_MEMORY_HOST);
-   j=0;
-   for (i=0; i < num_sends_A; i++)
-      hypre_MPI_Irecv(&send_change[i],1,HYPRE_MPI_INT,send_procs_A[i], 0,comm,&requests[j++]);
+   requests = hypre_CTAlloc(hypre_MPI_Request, num_sends_A + num_recvs_A, HYPRE_MEMORY_HOST);
+   j = 0;
+   for (i = 0; i < num_sends_A; i++)
+   {
+      hypre_MPI_Irecv(&send_change[i], 1, HYPRE_MPI_INT, send_procs_A[i], 0, comm, &requests[j++]);
+   }
 
-   for (i=0; i < num_recvs_A; i++)
-      hypre_MPI_Isend(&recv_change[i],1,HYPRE_MPI_INT,recv_procs_A[i], 0,comm,&requests[j++]);
+   for (i = 0; i < num_recvs_A; i++)
+   {
+      hypre_MPI_Isend(&recv_change[i], 1, HYPRE_MPI_INT, recv_procs_A[i], 0, comm, &requests[j++]);
+   }
 
    status = hypre_CTAlloc(hypre_MPI_Status, j, HYPRE_MEMORY_HOST);
-   hypre_MPI_Waitall(j,requests,status);
+   hypre_MPI_Waitall(j, requests, status);
    hypre_TFree(status, HYPRE_MEMORY_HOST);
    hypre_TFree(requests, HYPRE_MEMORY_HOST);
 
    num_sends_S = 0;
    total_nz = send_map_starts_A[num_sends_A];
-   for (i=0; i < num_sends_A; i++)
+   for (i = 0; i < num_sends_A; i++)
    {
       if (send_change[i])
       {
-         if ((send_map_starts_A[i+1]-send_map_starts_A[i]) > send_change[i])
+         if ((send_map_starts_A[i + 1] - send_map_starts_A[i]) > send_change[i])
+         {
             num_sends_S++;
+         }
       }
       else
+      {
          num_sends_S++;
+      }
       total_nz -= send_change[i];
    }
 
    send_procs_S = NULL;
    if (num_sends_S)
+   {
       send_procs_S = hypre_CTAlloc(HYPRE_Int, num_sends_S, HYPRE_MEMORY_HOST);
-   send_map_starts_S = hypre_CTAlloc(HYPRE_Int, num_sends_S+1, HYPRE_MEMORY_HOST);
+   }
+   send_map_starts_S = hypre_CTAlloc(HYPRE_Int, num_sends_S + 1, HYPRE_MEMORY_HOST);
    send_map_elmts_S = NULL;
    if (total_nz)
    {
@@ -1701,38 +1741,37 @@ hypre_BoomerAMGCreateSCommPkg(hypre_ParCSRMatrix *A,
       big_send_map_elmts_S = hypre_CTAlloc(HYPRE_BigInt, total_nz, HYPRE_MEMORY_HOST);
    }
 
-
    proc = 0;
    proc_cnt = 0;
-   for (i=0; i < num_sends_A; i++)
+   for (i = 0; i < num_sends_A; i++)
    {
-      cnt = send_map_starts_A[i+1]-send_map_starts_A[i]-send_change[i];
+      cnt = send_map_starts_A[i + 1] - send_map_starts_A[i] - send_change[i];
       if (cnt)
       {
          send_procs_S[proc_cnt++] = send_procs_A[i];
-         send_map_starts_S[proc_cnt] = send_map_starts_S[proc_cnt-1]+cnt;
+         send_map_starts_S[proc_cnt] = send_map_starts_S[proc_cnt - 1] + cnt;
       }
    }
 
-   comm_pkg_S = hypre_CTAlloc(hypre_ParCSRCommPkg, 1, HYPRE_MEMORY_HOST);
-   hypre_ParCSRCommPkgComm(comm_pkg_S) = comm;
-   hypre_ParCSRCommPkgNumRecvs(comm_pkg_S) = num_recvs_S;
-   hypre_ParCSRCommPkgRecvProcs(comm_pkg_S) = recv_procs_S;
-   hypre_ParCSRCommPkgRecvVecStarts(comm_pkg_S) = recv_vec_starts_S;
-   hypre_ParCSRCommPkgNumSends(comm_pkg_S) = num_sends_S;
-   hypre_ParCSRCommPkgSendProcs(comm_pkg_S) = send_procs_S;
-   hypre_ParCSRCommPkgSendMapStarts(comm_pkg_S) = send_map_starts_S;
+   /* Create communication package for S */
+   hypre_ParCSRCommPkgCreateAndFill(comm,
+                                    num_recvs_S, recv_procs_S, recv_vec_starts_S,
+                                    num_sends_S, send_procs_S, send_map_starts_S,
+                                    send_map_elmts_S,
+                                    &comm_pkg_S);
 
    comm_handle = hypre_ParCSRCommHandleCreate(22, comm_pkg_S, col_map_offd_S,
-         big_send_map_elmts_S);
+                                              big_send_map_elmts_S);
    hypre_ParCSRCommHandleDestroy(comm_handle);
 
    first_row = hypre_ParCSRMatrixFirstRowIndex(A);
    if (first_row)
-      for (i=0; i < send_map_starts_S[num_sends_S]; i++)
-         send_map_elmts_S[i] = (HYPRE_Int)(big_send_map_elmts_S[i]-first_row);
-
-   hypre_ParCSRCommPkgSendMapElmts(comm_pkg_S) = send_map_elmts_S;
+   {
+      for (i = 0; i < send_map_starts_S[num_sends_S]; i++)
+      {
+         send_map_elmts_S[i] = (HYPRE_Int)(big_send_map_elmts_S[i] - first_row);
+      }
+   }
 
    hypre_ParCSRMatrixCommPkg(S) = comm_pkg_S;
    hypre_ParCSRMatrixColMapOffd(S) = col_map_offd_S;
@@ -1765,7 +1804,7 @@ hypre_BoomerAMGCreate2ndSHost( hypre_ParCSRMatrix  *S,
 
    MPI_Comm             comm = hypre_ParCSRMatrixComm(S);
    hypre_ParCSRCommPkg *comm_pkg = hypre_ParCSRMatrixCommPkg(S);
-   hypre_ParCSRCommPkg *tmp_comm_pkg;
+   hypre_ParCSRCommPkg *tmp_comm_pkg = NULL;
    hypre_ParCSRCommHandle *comm_handle;
 
    hypre_CSRMatrix *S_diag = hypre_ParCSRMatrixDiag(S);
@@ -1794,7 +1833,7 @@ hypre_BoomerAMGCreate2ndSHost( hypre_ParCSRMatrix  *S,
 
    /*HYPRE_Int          *C_offd_data=NULL;*/
    HYPRE_Int             *C_offd_i;
-   HYPRE_Int             *C_offd_j=NULL;
+   HYPRE_Int             *C_offd_j = NULL;
 
    HYPRE_Int              num_cols_offd_C = 0;
 
@@ -1849,7 +1888,7 @@ hypre_BoomerAMGCreate2ndSHost( hypre_ParCSRMatrix  *S,
    /*HYPRE_Int prefix_sum_workspace[2*(hypre_NumThreads() + 1)];*/
    HYPRE_Int *prefix_sum_workspace;
    HYPRE_Int *num_coarse_prefix_sum;
-   prefix_sum_workspace = hypre_TAlloc(HYPRE_Int,  2*(hypre_NumThreads() + 1), HYPRE_MEMORY_HOST);
+   prefix_sum_workspace = hypre_TAlloc(HYPRE_Int,  2 * (hypre_NumThreads() + 1), HYPRE_MEMORY_HOST);
    num_coarse_prefix_sum = hypre_TAlloc(HYPRE_Int,  hypre_NumThreads() + 1, HYPRE_MEMORY_HOST);
 
    /*-----------------------------------------------------------------------
@@ -1861,9 +1900,9 @@ hypre_BoomerAMGCreate2ndSHost( hypre_ParCSRMatrix  *S,
    hypre_MPI_Comm_rank(comm, &my_id);
 
    my_first_cpt = coarse_row_starts[0];
-   my_last_cpt = coarse_row_starts[1]-1;
-   if (my_id == (num_procs -1)) global_num_coarse = coarse_row_starts[1];
-   hypre_MPI_Bcast(&global_num_coarse, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
+   my_last_cpt = coarse_row_starts[1] - 1;
+   if (my_id == (num_procs - 1)) { global_num_coarse = coarse_row_starts[1]; }
+   hypre_MPI_Bcast(&global_num_coarse, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
 
    if (num_cols_offd_S)
    {
@@ -1881,7 +1920,7 @@ hypre_BoomerAMGCreate2ndSHost( hypre_ParCSRMatrix  *S,
    /*HYPRE_Int num_coarse_prefix_sum[hypre_NumThreads() + 1];*/
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel private(i)
+   #pragma omp parallel private(i)
 #endif
    {
       HYPRE_Int num_coarse_private = 0;
@@ -1891,7 +1930,7 @@ hypre_BoomerAMGCreate2ndSHost( hypre_ParCSRMatrix  *S,
 
       for (i = i_begin; i < i_end; i++)
       {
-         if (CF_marker[i] > 0) num_coarse_private++;
+         if (CF_marker[i] > 0) { num_coarse_private++; }
       }
 
       hypre_prefix_sum(&num_coarse_private, &num_coarse, num_coarse_prefix_sum);
@@ -1929,21 +1968,22 @@ hypre_BoomerAMGCreate2ndSHost( hypre_ParCSRMatrix  *S,
       HYPRE_Int end = send_map_starts[num_sends];
       big_int_buf_data = hypre_TAlloc(HYPRE_BigInt,  end, HYPRE_MEMORY_HOST);
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for HYPRE_SMP_SCHEDULE
 #endif
       for (index = begin; index < end; index++)
       {
-         big_int_buf_data[index - begin] = (HYPRE_BigInt)fine_to_coarse[send_map_elmts[index]] + my_first_cpt;
+         big_int_buf_data[index - begin] = (HYPRE_BigInt)fine_to_coarse[send_map_elmts[index]] +
+                                           my_first_cpt;
       }
 
       comm_handle = hypre_ParCSRCommHandleCreate( 21, comm_pkg, big_int_buf_data,
-            fine_to_coarse_offd);
+                                                  fine_to_coarse_offd);
 
       hypre_ParCSRCommHandleDestroy(comm_handle);
 
       int_buf_data = hypre_TAlloc(HYPRE_Int,  end, HYPRE_MEMORY_HOST);
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for HYPRE_SMP_SCHEDULE
 #endif
       for (index = begin; index < end; index++)
       {
@@ -1951,14 +1991,14 @@ hypre_BoomerAMGCreate2ndSHost( hypre_ParCSRMatrix  *S,
       }
 
       comm_handle = hypre_ParCSRCommHandleCreate(11, comm_pkg, int_buf_data,
-            CF_marker_offd);
+                                                 CF_marker_offd);
 
       hypre_ParCSRCommHandleDestroy(comm_handle);
       hypre_TFree(int_buf_data, HYPRE_MEMORY_HOST);
       hypre_TFree(big_int_buf_data, HYPRE_MEMORY_HOST);
 
-      S_int_i = hypre_TAlloc(HYPRE_Int,  end+1, HYPRE_MEMORY_HOST);
-      S_ext_i = hypre_CTAlloc(HYPRE_Int,  recv_vec_starts[num_recvs]+1, HYPRE_MEMORY_HOST);
+      S_int_i = hypre_TAlloc(HYPRE_Int,  end + 1, HYPRE_MEMORY_HOST);
+      S_ext_i = hypre_CTAlloc(HYPRE_Int,  recv_vec_starts[num_recvs] + 1, HYPRE_MEMORY_HOST);
 
       /*--------------------------------------------------------------------------
        * generate S_int_i through adding number of coarse row-elements of offd and diag
@@ -1968,19 +2008,19 @@ hypre_BoomerAMGCreate2ndSHost( hypre_ParCSRMatrix  *S,
       S_int_i[0] = 0;
       num_nonzeros = 0;
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(j,k) reduction(+:num_nonzeros) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(j,k) reduction(+:num_nonzeros) HYPRE_SMP_SCHEDULE
 #endif
       for (j = begin; j < end; j++)
       {
          HYPRE_Int jrow = send_map_elmts[j];
          HYPRE_Int index = 0;
-         for (k = S_diag_i[jrow]; k < S_diag_i[jrow+1]; k++)
+         for (k = S_diag_i[jrow]; k < S_diag_i[jrow + 1]; k++)
          {
-            if (CF_marker[S_diag_j[k]] > 0) index++;
+            if (CF_marker[S_diag_j[k]] > 0) { index++; }
          }
-         for (k = S_offd_i[jrow]; k < S_offd_i[jrow+1]; k++)
+         for (k = S_offd_i[jrow]; k < S_offd_i[jrow + 1]; k++)
          {
-            if (CF_marker_offd[S_offd_j[k]] > 0) index++;
+            if (CF_marker_offd[S_offd_j[k]] > 0) { index++; }
          }
          S_int_i[j - begin + 1] = index;
          num_nonzeros += S_int_i[j - begin + 1];
@@ -1990,41 +2030,50 @@ hypre_BoomerAMGCreate2ndSHost( hypre_ParCSRMatrix  *S,
        * initialize communication
        *--------------------------------------------------------------------------*/
       if (num_procs > 1)
-         comm_handle = hypre_ParCSRCommHandleCreate(11,comm_pkg,&S_int_i[1],&S_ext_i[1]);
+      {
+         comm_handle = hypre_ParCSRCommHandleCreate(11, comm_pkg, &S_int_i[1], &S_ext_i[1]);
+      }
 
-      if (num_nonzeros) S_int_j = hypre_TAlloc(HYPRE_BigInt,  num_nonzeros, HYPRE_MEMORY_HOST);
+      if (num_nonzeros) { S_int_j = hypre_TAlloc(HYPRE_BigInt,  num_nonzeros, HYPRE_MEMORY_HOST); }
 
-      tmp_send_map_starts = hypre_CTAlloc(HYPRE_Int,  num_sends+1, HYPRE_MEMORY_HOST);
-      tmp_recv_vec_starts = hypre_CTAlloc(HYPRE_Int,  num_recvs+1, HYPRE_MEMORY_HOST);
+      tmp_send_map_starts = hypre_CTAlloc(HYPRE_Int,  num_sends + 1, HYPRE_MEMORY_HOST);
+      tmp_recv_vec_starts = hypre_CTAlloc(HYPRE_Int,  num_recvs + 1, HYPRE_MEMORY_HOST);
 
       tmp_send_map_starts[0] = 0;
       j_cnt = 0;
-      for (i=0; i < num_sends; i++)
+      for (i = 0; i < num_sends; i++)
       {
-         for (j = send_map_starts[i]; j < send_map_starts[i+1]; j++)
+         for (j = send_map_starts[i]; j < send_map_starts[i + 1]; j++)
          {
             jrow = send_map_elmts[j];
-            for (k=S_diag_i[jrow]; k < S_diag_i[jrow+1]; k++)
+            for (k = S_diag_i[jrow]; k < S_diag_i[jrow + 1]; k++)
             {
                if (CF_marker[S_diag_j[k]] > 0)
-                  S_int_j[j_cnt++] = (HYPRE_BigInt)fine_to_coarse[S_diag_j[k]]+my_first_cpt;
+               {
+                  S_int_j[j_cnt++] = (HYPRE_BigInt)fine_to_coarse[S_diag_j[k]] + my_first_cpt;
+               }
             }
-            for (k=S_offd_i[jrow]; k < S_offd_i[jrow+1]; k++)
+            for (k = S_offd_i[jrow]; k < S_offd_i[jrow + 1]; k++)
             {
                if (CF_marker_offd[S_offd_j[k]] > 0)
+               {
                   S_int_j[j_cnt++] = fine_to_coarse_offd[S_offd_j[k]];
+               }
             }
          }
-         tmp_send_map_starts[i+1] = j_cnt;
+         tmp_send_map_starts[i + 1] = j_cnt;
       }
 
-      tmp_comm_pkg = hypre_CTAlloc(hypre_ParCSRCommPkg, 1, HYPRE_MEMORY_HOST);
-      hypre_ParCSRCommPkgComm(tmp_comm_pkg) = comm;
-      hypre_ParCSRCommPkgNumSends(tmp_comm_pkg) = num_sends;
-      hypre_ParCSRCommPkgNumRecvs(tmp_comm_pkg) = num_recvs;
-      hypre_ParCSRCommPkgSendProcs(tmp_comm_pkg) = hypre_ParCSRCommPkgSendProcs(comm_pkg);
-      hypre_ParCSRCommPkgRecvProcs(tmp_comm_pkg) = hypre_ParCSRCommPkgRecvProcs(comm_pkg);
-      hypre_ParCSRCommPkgSendMapStarts(tmp_comm_pkg) = tmp_send_map_starts;
+      /* Create temporary communication package */
+      hypre_ParCSRCommPkgCreateAndFill(comm,
+                                       num_recvs,
+                                       hypre_ParCSRCommPkgRecvProcs(comm_pkg),
+                                       tmp_recv_vec_starts,
+                                       num_sends,
+                                       hypre_ParCSRCommPkgSendProcs(comm_pkg),
+                                       tmp_send_map_starts,
+                                       NULL,
+                                       &tmp_comm_pkg);
 
       hypre_ParCSRCommHandleDestroy(comm_handle);
       comm_handle = NULL;
@@ -2034,20 +2083,24 @@ hypre_BoomerAMGCreate2ndSHost( hypre_ParCSRMatrix  *S,
        * evaluate S_ext_i and compute num_nonzeros for S_ext
        *--------------------------------------------------------------------------*/
 
-      for (i=0; i < recv_vec_starts[num_recvs]; i++)
-         S_ext_i[i+1] += S_ext_i[i];
+      for (i = 0; i < recv_vec_starts[num_recvs]; i++)
+      {
+         S_ext_i[i + 1] += S_ext_i[i];
+      }
 
       num_nonzeros = S_ext_i[recv_vec_starts[num_recvs]];
 
-      if (num_nonzeros) S_ext_j = hypre_TAlloc(HYPRE_BigInt,  num_nonzeros, HYPRE_MEMORY_HOST);
-
-      tmp_recv_vec_starts[0] = 0;
-      for (i=0; i < num_recvs; i++)
-         tmp_recv_vec_starts[i+1] = S_ext_i[recv_vec_starts[i+1]];
+      if (num_nonzeros)
+      {
+         S_ext_j = hypre_TAlloc(HYPRE_BigInt,  num_nonzeros, HYPRE_MEMORY_HOST);
+      }
 
-      hypre_ParCSRCommPkgRecvVecStarts(tmp_comm_pkg) = tmp_recv_vec_starts;
+      for (i = 0; i < num_recvs; i++)
+      {
+         tmp_recv_vec_starts[i + 1] = S_ext_i[recv_vec_starts[i + 1]];
+      }
 
-      comm_handle = hypre_ParCSRCommHandleCreate(21,tmp_comm_pkg,S_int_j,S_ext_j);
+      comm_handle = hypre_ParCSRCommHandleCreate(21, tmp_comm_pkg, S_int_j, S_ext_j);
       hypre_ParCSRCommHandleDestroy(comm_handle);
       comm_handle = NULL;
 
@@ -2064,15 +2117,16 @@ hypre_BoomerAMGCreate2ndSHost( hypre_ParCSRMatrix  *S,
 
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
       HYPRE_BigInt          *S_big_offd_j = NULL;
-      S_ext_diag_i = hypre_TAlloc(HYPRE_Int,  num_cols_offd_S+1, HYPRE_MEMORY_HOST);
+      S_ext_diag_i = hypre_TAlloc(HYPRE_Int,  num_cols_offd_S + 1, HYPRE_MEMORY_HOST);
       S_ext_diag_i[0] = 0;
-      S_ext_offd_i = hypre_TAlloc(HYPRE_Int,  num_cols_offd_S+1, HYPRE_MEMORY_HOST);
+      S_ext_offd_i = hypre_TAlloc(HYPRE_Int,  num_cols_offd_S + 1, HYPRE_MEMORY_HOST);
       S_ext_offd_i[0] = 0;
 
       hypre_UnorderedBigIntSet found_set;
-      hypre_UnorderedBigIntSetCreate(&found_set, S_ext_i[num_cols_offd_S] + num_cols_offd_S, 16*hypre_NumThreads());
+      hypre_UnorderedBigIntSetCreate(&found_set, S_ext_i[num_cols_offd_S] + num_cols_offd_S,
+                                     16 * hypre_NumThreads());
 
-#pragma omp parallel private(i,j, big_i1)
+      #pragma omp parallel private(i,j, big_i1)
       {
          HYPRE_Int S_ext_offd_size_private = 0;
          HYPRE_Int S_ext_diag_size_private = 0;
@@ -2086,7 +2140,7 @@ hypre_BoomerAMGCreate2ndSHost( hypre_ParCSRMatrix  *S,
             {
                hypre_UnorderedBigIntSetPut(&found_set, fine_to_coarse_offd[i]);
             }
-            for (j=S_ext_i[i]; j < S_ext_i[i+1]; j++)
+            for (j = S_ext_i[i]; j < S_ext_i[i + 1]; j++)
             {
                big_i1 = S_ext_j[j];
                if (big_i1 < my_first_cpt || big_i1 > my_last_cpt)
@@ -2095,19 +2149,23 @@ hypre_BoomerAMGCreate2ndSHost( hypre_ParCSRMatrix  *S,
                   hypre_UnorderedBigIntSetPut(&found_set, big_i1);
                }
                else
+               {
                   S_ext_diag_size_private++;
+               }
             }
          }
 
          hypre_prefix_sum_pair(
-               &S_ext_diag_size_private, &S_ext_diag_size,
-               &S_ext_offd_size_private, &S_ext_offd_size,
-               prefix_sum_workspace);
+            &S_ext_diag_size_private, &S_ext_diag_size,
+            &S_ext_offd_size_private, &S_ext_offd_size,
+            prefix_sum_workspace);
 
-#pragma omp master
+         #pragma omp master
          {
             if (S_ext_diag_size)
+            {
                S_ext_diag_j = hypre_TAlloc(HYPRE_Int,  S_ext_diag_size, HYPRE_MEMORY_HOST);
+            }
             if (S_ext_offd_size)
             {
                S_ext_offd_j = hypre_TAlloc(HYPRE_Int,  S_ext_offd_size, HYPRE_MEMORY_HOST);
@@ -2115,18 +2173,22 @@ hypre_BoomerAMGCreate2ndSHost( hypre_ParCSRMatrix  *S,
             }
          }
 
-#pragma omp barrier
+         #pragma omp barrier
 
          for (i = i_begin; i < i_end; i++)
          {
-            for (j=S_ext_i[i]; j < S_ext_i[i+1]; j++)
+            for (j = S_ext_i[i]; j < S_ext_i[i + 1]; j++)
             {
                big_i1 = S_ext_j[j];
                if (big_i1 < my_first_cpt || big_i1 > my_last_cpt)
+               {
                   S_big_offd_j[S_ext_offd_size_private++] = big_i1;
+               }
                //S_ext_offd_j[S_ext_offd_size_private++] = big_i1;
                else
+               {
                   S_ext_diag_j[S_ext_diag_size_private++] = (HYPRE_Int)(big_i1 - my_first_cpt);
+               }
             }
             S_ext_diag_i[i + 1] = S_ext_diag_size_private;
             S_ext_offd_i[i + 1] = S_ext_offd_size_private;
@@ -2139,33 +2201,40 @@ hypre_BoomerAMGCreate2ndSHost( hypre_ParCSRMatrix  *S,
       hypre_TFree(S_ext_i, HYPRE_MEMORY_HOST);
 
       hypre_UnorderedBigIntMap col_map_offd_C_inverse;
-      hypre_big_sort_and_create_inverse_map(temp, num_cols_offd_C, &col_map_offd_C, &col_map_offd_C_inverse);
+      hypre_big_sort_and_create_inverse_map(temp, num_cols_offd_C, &col_map_offd_C,
+                                            &col_map_offd_C_inverse);
 
-#pragma omp parallel for HYPRE_SMP_SCHEDULE
-      for (i=0 ; i < S_ext_offd_size; i++)
+      #pragma omp parallel for HYPRE_SMP_SCHEDULE
+      for (i = 0 ; i < S_ext_offd_size; i++)
+      {
          S_ext_offd_j[i] = hypre_UnorderedBigIntMapGet(&col_map_offd_C_inverse, S_big_offd_j[i]);
+      }
       //S_ext_offd_j[i] = hypre_UnorderedIntMapGet(&col_map_offd_C_inverse, S_ext_offd_j[i]);
 
       hypre_TFree(S_ext_j, HYPRE_MEMORY_HOST);
       hypre_TFree(S_big_offd_j, HYPRE_MEMORY_HOST);
-      if (num_cols_offd_C) hypre_UnorderedBigIntMapDestroy(&col_map_offd_C_inverse);
+      if (num_cols_offd_C) { hypre_UnorderedBigIntMapDestroy(&col_map_offd_C_inverse); }
 #else /* !HYPRE_CONCURRENT_HOPSCOTCH */
       HYPRE_Int cnt_offd, cnt_diag, cnt, value;
       S_ext_diag_size = 0;
       S_ext_offd_size = 0;
 
-      for (i=0; i < num_cols_offd_S; i++)
+      for (i = 0; i < num_cols_offd_S; i++)
       {
-         for (j=S_ext_i[i]; j < S_ext_i[i+1]; j++)
+         for (j = S_ext_i[i]; j < S_ext_i[i + 1]; j++)
          {
             if (S_ext_j[j] < my_first_cpt || S_ext_j[j] > my_last_cpt)
+            {
                S_ext_offd_size++;
+            }
             else
+            {
                S_ext_diag_size++;
+            }
          }
       }
-      S_ext_diag_i = hypre_CTAlloc(HYPRE_Int,  num_cols_offd_S+1, HYPRE_MEMORY_HOST);
-      S_ext_offd_i = hypre_CTAlloc(HYPRE_Int,  num_cols_offd_S+1, HYPRE_MEMORY_HOST);
+      S_ext_diag_i = hypre_CTAlloc(HYPRE_Int,  num_cols_offd_S + 1, HYPRE_MEMORY_HOST);
+      S_ext_offd_i = hypre_CTAlloc(HYPRE_Int,  num_cols_offd_S + 1, HYPRE_MEMORY_HOST);
 
       if (S_ext_diag_size)
       {
@@ -2180,17 +2249,21 @@ hypre_BoomerAMGCreate2ndSHost( hypre_ParCSRMatrix  *S,
       cnt_diag = 0;
       cnt = 0;
       HYPRE_Int num_coarse_offd = 0;
-      for (i=0; i < num_cols_offd_S; i++)
+      for (i = 0; i < num_cols_offd_S; i++)
       {
-         if (CF_marker_offd[i] > 0) num_coarse_offd++;
+         if (CF_marker_offd[i] > 0) { num_coarse_offd++; }
 
-         for (j=S_ext_i[i]; j < S_ext_i[i+1]; j++)
+         for (j = S_ext_i[i]; j < S_ext_i[i + 1]; j++)
          {
             big_i1 = S_ext_j[j];
             if (big_i1 < my_first_cpt || big_i1 > my_last_cpt)
+            {
                S_ext_j[cnt_offd++] = big_i1;
+            }
             else
+            {
                S_ext_diag_j[cnt_diag++] = (HYPRE_Int)(big_i1 - my_first_cpt);
+            }
          }
          S_ext_diag_i[++cnt] = cnt_diag;
          S_ext_offd_i[cnt] = cnt_offd;
@@ -2201,20 +2274,22 @@ hypre_BoomerAMGCreate2ndSHost( hypre_ParCSRMatrix  *S,
       cnt = 0;
       if (S_ext_offd_size || num_coarse_offd)
       {
-         temp = hypre_CTAlloc(HYPRE_BigInt,  S_ext_offd_size+num_coarse_offd, HYPRE_MEMORY_HOST);
-         for (i=0; i < S_ext_offd_size; i++)
+         temp = hypre_CTAlloc(HYPRE_BigInt,  S_ext_offd_size + num_coarse_offd, HYPRE_MEMORY_HOST);
+         for (i = 0; i < S_ext_offd_size; i++)
+         {
             temp[i] = S_ext_j[i];
+         }
          cnt = S_ext_offd_size;
-         for (i=0; i < num_cols_offd_S; i++)
-            if (CF_marker_offd[i] > 0) temp[cnt++] = fine_to_coarse_offd[i];
+         for (i = 0; i < num_cols_offd_S; i++)
+            if (CF_marker_offd[i] > 0) { temp[cnt++] = fine_to_coarse_offd[i]; }
       }
       if (cnt)
       {
-         hypre_BigQsort0(temp, 0, cnt-1);
+         hypre_BigQsort0(temp, 0, cnt - 1);
 
          num_cols_offd_C = 1;
          value = temp[0];
-         for (i=1; i < cnt; i++)
+         for (i = 1; i < cnt; i++)
          {
             if (temp[i] > value)
             {
@@ -2225,15 +2300,21 @@ hypre_BoomerAMGCreate2ndSHost( hypre_ParCSRMatrix  *S,
       }
 
       if (num_cols_offd_C)
+      {
          col_map_offd_C = hypre_CTAlloc(HYPRE_BigInt, num_cols_offd_C, HYPRE_MEMORY_HOST);
+      }
 
-      for (i=0; i < num_cols_offd_C; i++)
+      for (i = 0; i < num_cols_offd_C; i++)
+      {
          col_map_offd_C[i] = temp[i];
+      }
 
       if (S_ext_offd_size || num_coarse_offd)
+      {
          hypre_TFree(temp, HYPRE_MEMORY_HOST);
+      }
 
-      for (i=0 ; i < S_ext_offd_size; i++)
+      for (i = 0 ; i < S_ext_offd_size; i++)
          S_ext_offd_j[i] = hypre_BigBinarySearch(col_map_offd_C,
                                                  S_ext_j[i],
                                                  num_cols_offd_C);
@@ -2246,7 +2327,7 @@ hypre_BoomerAMGCreate2ndSHost( hypre_ParCSRMatrix  *S,
          map_S_to_C = hypre_TAlloc(HYPRE_Int, num_cols_offd_S, HYPRE_MEMORY_HOST);
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel private(i)
+         #pragma omp parallel private(i)
 #endif
          {
             HYPRE_Int i_begin, i_end;
@@ -2257,10 +2338,11 @@ hypre_BoomerAMGCreate2ndSHost( hypre_ParCSRMatrix  *S,
             {
                if (CF_marker_offd[i] > 0)
                {
-                  cnt = hypre_BigLowerBound(col_map_offd_C + cnt, col_map_offd_C + num_cols_offd_C, fine_to_coarse_offd[i]) - col_map_offd_C;
+                  cnt = hypre_BigLowerBound(col_map_offd_C + cnt, col_map_offd_C + num_cols_offd_C,
+                                            fine_to_coarse_offd[i]) - col_map_offd_C;
                   map_S_to_C[i] = cnt++;
                }
-               else map_S_to_C[i] = -1;
+               else { map_S_to_C[i] = -1; }
             }
          } /* omp parallel */
       }
@@ -2275,8 +2357,8 @@ hypre_BoomerAMGCreate2ndSHost( hypre_ParCSRMatrix  *S,
     *-----------------------------------------------------------------------*/
 
    HYPRE_Int *S_marker_array = NULL, *S_marker_offd_array = NULL;
-   if (num_coarse) S_marker_array = hypre_TAlloc(HYPRE_Int,  num_coarse*hypre_NumThreads(), HYPRE_MEMORY_HOST);
-   if (num_cols_offd_C) S_marker_offd_array = hypre_TAlloc(HYPRE_Int,  num_cols_offd_C*hypre_NumThreads(), HYPRE_MEMORY_HOST);
+   if (num_coarse) { S_marker_array = hypre_TAlloc(HYPRE_Int,  num_coarse * hypre_NumThreads(), HYPRE_MEMORY_HOST); }
+   if (num_cols_offd_C) { S_marker_offd_array = hypre_TAlloc(HYPRE_Int,  num_cols_offd_C * hypre_NumThreads(), HYPRE_MEMORY_HOST); }
 
    HYPRE_Int *C_temp_offd_j_array = NULL;
    HYPRE_Int *C_temp_diag_j_array = NULL;
@@ -2285,22 +2367,25 @@ hypre_BoomerAMGCreate2ndSHost( hypre_ParCSRMatrix  *S,
 
    if (num_paths > 1)
    {
-      C_temp_diag_j_array = hypre_TAlloc(HYPRE_Int,  num_coarse*hypre_NumThreads(), HYPRE_MEMORY_HOST);
-      C_temp_offd_j_array = hypre_TAlloc(HYPRE_Int,  num_cols_offd_C*hypre_NumThreads(), HYPRE_MEMORY_HOST);
-
-      C_temp_diag_data_array = hypre_TAlloc(HYPRE_Int,  num_coarse*hypre_NumThreads(), HYPRE_MEMORY_HOST);
-      C_temp_offd_data_array = hypre_TAlloc(HYPRE_Int,  num_cols_offd_C*hypre_NumThreads(), HYPRE_MEMORY_HOST);
+      C_temp_diag_j_array = hypre_TAlloc(HYPRE_Int,  num_coarse * hypre_NumThreads(), HYPRE_MEMORY_HOST);
+      C_temp_offd_j_array = hypre_TAlloc(HYPRE_Int,  num_cols_offd_C * hypre_NumThreads(),
+                                         HYPRE_MEMORY_HOST);
+
+      C_temp_diag_data_array = hypre_TAlloc(HYPRE_Int,  num_coarse * hypre_NumThreads(),
+                                            HYPRE_MEMORY_HOST);
+      C_temp_offd_data_array = hypre_TAlloc(HYPRE_Int,  num_cols_offd_C * hypre_NumThreads(),
+                                            HYPRE_MEMORY_HOST);
    }
 
-   C_diag_i = hypre_CTAlloc(HYPRE_Int,  num_coarse+1, HYPRE_MEMORY_HOST);
-   C_offd_i = hypre_CTAlloc(HYPRE_Int,  num_coarse+1, HYPRE_MEMORY_HOST);
+   C_diag_i = hypre_CTAlloc(HYPRE_Int,  num_coarse + 1, HYPRE_MEMORY_HOST);
+   C_offd_i = hypre_CTAlloc(HYPRE_Int,  num_coarse + 1, HYPRE_MEMORY_HOST);
 
    /*-----------------------------------------------------------------------
     *  Loop over rows of S
     *-----------------------------------------------------------------------*/
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel private(i1,i2,i3,jj1,jj2,index)
+   #pragma omp parallel private(i1,i2,i3,jj1,jj2,index)
 #endif
    {
       HYPRE_Int my_thread_num = hypre_GetThreadNum();
@@ -2313,16 +2398,16 @@ hypre_BoomerAMGCreate2ndSHost( hypre_ParCSRMatrix  *S,
 
       if (num_paths > 1)
       {
-         C_temp_diag_j = C_temp_diag_j_array + num_coarse*my_thread_num;
-         C_temp_offd_j = C_temp_offd_j_array + num_cols_offd_C*my_thread_num;
+         C_temp_diag_j = C_temp_diag_j_array + num_coarse * my_thread_num;
+         C_temp_offd_j = C_temp_offd_j_array + num_cols_offd_C * my_thread_num;
 
-         C_temp_diag_data = C_temp_diag_data_array + num_coarse*my_thread_num;
-         C_temp_offd_data = C_temp_offd_data_array + num_cols_offd_C*my_thread_num;
+         C_temp_diag_data = C_temp_diag_data_array + num_coarse * my_thread_num;
+         C_temp_offd_data = C_temp_offd_data_array + num_cols_offd_C * my_thread_num;
       }
 
       HYPRE_Int *S_marker = NULL, *S_marker_offd = NULL;
-      if (num_coarse) S_marker = S_marker_array + num_coarse*my_thread_num;
-      if (num_cols_offd_C) S_marker_offd = S_marker_offd_array + num_cols_offd_C*my_thread_num;
+      if (num_coarse) { S_marker = S_marker_array + num_coarse * my_thread_num; }
+      if (num_cols_offd_C) { S_marker_offd = S_marker_offd_array + num_cols_offd_C * my_thread_num; }
       for (i1 = 0; i1 < num_coarse; i1++)
       {
          S_marker[i1] = -1;
@@ -2363,7 +2448,7 @@ hypre_BoomerAMGCreate2ndSHost( hypre_ParCSRMatrix  *S,
                C_offd_i[ic] = num_nonzeros_offd;
             }
 
-            for (jj1 = S_diag_i[i1]; jj1 < S_diag_i[i1+1]; jj1++)
+            for (jj1 = S_diag_i[i1]; jj1 < S_diag_i[i1 + 1]; jj1++)
             {
                i2 = S_diag_j[jj1];
                if (CF_marker[i2] > 0)
@@ -2375,7 +2460,7 @@ hypre_BoomerAMGCreate2ndSHost( hypre_ParCSRMatrix  *S,
                      num_nonzeros_diag++;
                   }
                }
-               for (jj2 = S_diag_i[i2]; jj2 < S_diag_i[i2+1]; jj2++)
+               for (jj2 = S_diag_i[i2]; jj2 < S_diag_i[i2 + 1]; jj2++)
                {
                   i3 = S_diag_j[jj2];
                   if (CF_marker[i3] > 0)
@@ -2388,7 +2473,7 @@ hypre_BoomerAMGCreate2ndSHost( hypre_ParCSRMatrix  *S,
                      }
                   }
                }
-               for (jj2 = S_offd_i[i2]; jj2 < S_offd_i[i2+1]; jj2++)
+               for (jj2 = S_offd_i[i2]; jj2 < S_offd_i[i2 + 1]; jj2++)
                {
                   i3 = S_offd_j[jj2];
                   if (CF_marker_offd[i3] > 0)
@@ -2402,7 +2487,7 @@ hypre_BoomerAMGCreate2ndSHost( hypre_ParCSRMatrix  *S,
                   }
                }
             }
-            for (jj1 = S_offd_i[i1]; jj1 < S_offd_i[i1+1]; jj1++)
+            for (jj1 = S_offd_i[i1]; jj1 < S_offd_i[i1 + 1]; jj1++)
             {
                i2 = S_offd_j[jj1];
                if (CF_marker_offd[i2] > 0)
@@ -2414,7 +2499,7 @@ hypre_BoomerAMGCreate2ndSHost( hypre_ParCSRMatrix  *S,
                      num_nonzeros_offd++;
                   }
                }
-               for (jj2 = S_ext_diag_i[i2]; jj2 < S_ext_diag_i[i2+1]; jj2++)
+               for (jj2 = S_ext_diag_i[i2]; jj2 < S_ext_diag_i[i2 + 1]; jj2++)
                {
                   i3 = S_ext_diag_j[jj2];
                   if (i3 != ic && S_marker[i3] < jj_row_begin_diag)
@@ -2423,7 +2508,7 @@ hypre_BoomerAMGCreate2ndSHost( hypre_ParCSRMatrix  *S,
                      num_nonzeros_diag++;
                   }
                }
-               for (jj2 = S_ext_offd_i[i2]; jj2 < S_ext_offd_i[i2+1]; jj2++)
+               for (jj2 = S_ext_offd_i[i2]; jj2 < S_ext_offd_i[i2 + 1]; jj2++)
                {
                   i3 = S_ext_offd_j[jj2];
                   if (S_marker_offd[i3] < jj_row_begin_offd)
@@ -2455,7 +2540,7 @@ hypre_BoomerAMGCreate2ndSHost( hypre_ParCSRMatrix  *S,
                C_offd_i[ic] = num_nonzeros_offd;
             }
 
-            for (jj1 = S_diag_i[i1]; jj1 < S_diag_i[i1+1]; jj1++)
+            for (jj1 = S_diag_i[i1]; jj1 < S_diag_i[i1 + 1]; jj1++)
             {
                i2 = S_diag_j[jj1];
                if (CF_marker[i2] > 0)
@@ -2472,7 +2557,7 @@ hypre_BoomerAMGCreate2ndSHost( hypre_ParCSRMatrix  *S,
                      C_temp_diag_data[S_marker[index] - jj_row_begin_diag] += 2;
                   }
                }
-               for (jj2 = S_diag_i[i2]; jj2 < S_diag_i[i2+1]; jj2++)
+               for (jj2 = S_diag_i[i2]; jj2 < S_diag_i[i2 + 1]; jj2++)
                {
                   i3 = S_diag_j[jj2];
                   if (CF_marker[i3] > 0 && fine_to_coarse[i3] != ic)
@@ -2490,7 +2575,7 @@ hypre_BoomerAMGCreate2ndSHost( hypre_ParCSRMatrix  *S,
                      }
                   }
                }
-               for (jj2 = S_offd_i[i2]; jj2 < S_offd_i[i2+1]; jj2++)
+               for (jj2 = S_offd_i[i2]; jj2 < S_offd_i[i2 + 1]; jj2++)
                {
                   i3 = S_offd_j[jj2];
                   if (CF_marker_offd[i3] > 0)
@@ -2509,7 +2594,7 @@ hypre_BoomerAMGCreate2ndSHost( hypre_ParCSRMatrix  *S,
                   }
                }
             }
-            for (jj1 = S_offd_i[i1]; jj1 < S_offd_i[i1+1]; jj1++)
+            for (jj1 = S_offd_i[i1]; jj1 < S_offd_i[i1 + 1]; jj1++)
             {
                i2 = S_offd_j[jj1];
                if (CF_marker_offd[i2] > 0)
@@ -2526,7 +2611,7 @@ hypre_BoomerAMGCreate2ndSHost( hypre_ParCSRMatrix  *S,
                      C_temp_offd_data[S_marker_offd[index] - jj_row_begin_offd] += 2;
                   }
                }
-               for (jj2 = S_ext_diag_i[i2]; jj2 < S_ext_diag_i[i2+1]; jj2++)
+               for (jj2 = S_ext_diag_i[i2]; jj2 < S_ext_diag_i[i2 + 1]; jj2++)
                {
                   i3 = S_ext_diag_j[jj2];
                   if (i3 != ic)
@@ -2543,7 +2628,7 @@ hypre_BoomerAMGCreate2ndSHost( hypre_ParCSRMatrix  *S,
                      }
                   }
                }
-               for (jj2 = S_ext_offd_i[i2]; jj2 < S_ext_offd_i[i2+1]; jj2++)
+               for (jj2 = S_ext_offd_i[i2]; jj2 < S_ext_offd_i[i2 + 1]; jj2++)
                {
                   i3 = S_ext_offd_j[jj2];
                   if (S_marker_offd[i3] < jj_row_begin_offd)
@@ -2579,9 +2664,9 @@ hypre_BoomerAMGCreate2ndSHost( hypre_ParCSRMatrix  *S,
       } /* num_paths > 1 */
 
       hypre_prefix_sum_pair(
-            &num_nonzeros_diag, &C_diag_i[num_coarse],
-            &num_nonzeros_offd, &C_offd_i[num_coarse],
-            prefix_sum_workspace);
+         &num_nonzeros_diag, &C_diag_i[num_coarse],
+         &num_nonzeros_offd, &C_offd_i[num_coarse],
+         prefix_sum_workspace);
 
       for (i1 = 0; i1 < num_coarse; i1++)
       {
@@ -2593,8 +2678,8 @@ hypre_BoomerAMGCreate2ndSHost( hypre_ParCSRMatrix  *S,
       }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
-#pragma omp master
+      #pragma omp barrier
+      #pragma omp master
 #endif
       {
          if (C_diag_i[num_coarse])
@@ -2607,13 +2692,15 @@ hypre_BoomerAMGCreate2ndSHost( hypre_ParCSRMatrix  *S,
          }
       }
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
 
       for (ic = ic_begin; ic < ic_end - 1; ic++)
       {
-         if (C_diag_i[ic+1] == C_diag_i[ic] && C_offd_i[ic+1] == C_offd_i[ic])
+         if (C_diag_i[ic + 1] == C_diag_i[ic] && C_offd_i[ic + 1] == C_offd_i[ic])
+         {
             CF_marker[coarse_to_fine[ic]] = 2;
+         }
 
          C_diag_i[ic] += num_nonzeros_diag;
          C_offd_i[ic] += num_nonzeros_offd;
@@ -2623,11 +2710,13 @@ hypre_BoomerAMGCreate2ndSHost( hypre_ParCSRMatrix  *S,
          C_diag_i[ic] += num_nonzeros_diag;
          C_offd_i[ic] += num_nonzeros_offd;
 
-         HYPRE_Int next_C_diag_i = prefix_sum_workspace[2*(my_thread_num + 1)];
-         HYPRE_Int next_C_offd_i = prefix_sum_workspace[2*(my_thread_num + 1) + 1];
+         HYPRE_Int next_C_diag_i = prefix_sum_workspace[2 * (my_thread_num + 1)];
+         HYPRE_Int next_C_offd_i = prefix_sum_workspace[2 * (my_thread_num + 1) + 1];
 
          if (next_C_diag_i == C_diag_i[ic] && next_C_offd_i == C_offd_i[ic])
+         {
             CF_marker[coarse_to_fine[ic]] = 2;
+         }
       }
 
       if (num_paths == 1)
@@ -2643,7 +2732,7 @@ hypre_BoomerAMGCreate2ndSHost( hypre_ParCSRMatrix  *S,
             HYPRE_Int jj_row_begin_diag = num_nonzeros_diag;
             HYPRE_Int jj_row_begin_offd = num_nonzeros_offd;
 
-            for (jj1 = S_diag_i[i1]; jj1 < S_diag_i[i1+1]; jj1++)
+            for (jj1 = S_diag_i[i1]; jj1 < S_diag_i[i1 + 1]; jj1++)
             {
                i2 = S_diag_j[jj1];
                if (CF_marker[i2] > 0)
@@ -2656,7 +2745,7 @@ hypre_BoomerAMGCreate2ndSHost( hypre_ParCSRMatrix  *S,
                      num_nonzeros_diag++;
                   }
                }
-               for (jj2 = S_diag_i[i2]; jj2 < S_diag_i[i2+1]; jj2++)
+               for (jj2 = S_diag_i[i2]; jj2 < S_diag_i[i2 + 1]; jj2++)
                {
                   i3 = S_diag_j[jj2];
                   if (CF_marker[i3] > 0)
@@ -2670,7 +2759,7 @@ hypre_BoomerAMGCreate2ndSHost( hypre_ParCSRMatrix  *S,
                      }
                   }
                }
-               for (jj2 = S_offd_i[i2]; jj2 < S_offd_i[i2+1]; jj2++)
+               for (jj2 = S_offd_i[i2]; jj2 < S_offd_i[i2 + 1]; jj2++)
                {
                   i3 = S_offd_j[jj2];
                   if (CF_marker_offd[i3] > 0)
@@ -2685,7 +2774,7 @@ hypre_BoomerAMGCreate2ndSHost( hypre_ParCSRMatrix  *S,
                   }
                }
             }
-            for (jj1 = S_offd_i[i1]; jj1 < S_offd_i[i1+1]; jj1++)
+            for (jj1 = S_offd_i[i1]; jj1 < S_offd_i[i1 + 1]; jj1++)
             {
                i2 = S_offd_j[jj1];
                if (CF_marker_offd[i2] > 0)
@@ -2698,7 +2787,7 @@ hypre_BoomerAMGCreate2ndSHost( hypre_ParCSRMatrix  *S,
                      num_nonzeros_offd++;
                   }
                }
-               for (jj2 = S_ext_diag_i[i2]; jj2 < S_ext_diag_i[i2+1]; jj2++)
+               for (jj2 = S_ext_diag_i[i2]; jj2 < S_ext_diag_i[i2 + 1]; jj2++)
                {
                   i3 = S_ext_diag_j[jj2];
                   if (i3 != ic && S_marker[i3] < jj_row_begin_diag)
@@ -2708,7 +2797,7 @@ hypre_BoomerAMGCreate2ndSHost( hypre_ParCSRMatrix  *S,
                      num_nonzeros_diag++;
                   }
                }
-               for (jj2 = S_ext_offd_i[i2]; jj2 < S_ext_offd_i[i2+1]; jj2++)
+               for (jj2 = S_ext_offd_i[i2]; jj2 < S_ext_offd_i[i2 + 1]; jj2++)
                {
                   i3 = S_ext_offd_j[jj2];
                   if (S_marker_offd[i3] < jj_row_begin_offd)
@@ -2738,7 +2827,7 @@ hypre_BoomerAMGCreate2ndSHost( hypre_ParCSRMatrix  *S,
             HYPRE_Int jj_row_begin_diag = jj_count_diag;
             HYPRE_Int jj_row_begin_offd = jj_count_offd;
 
-            for (jj1 = S_diag_i[i1]; jj1 < S_diag_i[i1+1]; jj1++)
+            for (jj1 = S_diag_i[i1]; jj1 < S_diag_i[i1 + 1]; jj1++)
             {
                i2 = S_diag_j[jj1];
                if (CF_marker[i2] > 0)
@@ -2756,7 +2845,7 @@ hypre_BoomerAMGCreate2ndSHost( hypre_ParCSRMatrix  *S,
                      C_temp_diag_data[S_marker[index] - jj_row_begin_diag] += 2;
                   }
                }
-               for (jj2 = S_diag_i[i2]; jj2 < S_diag_i[i2+1]; jj2++)
+               for (jj2 = S_diag_i[i2]; jj2 < S_diag_i[i2 + 1]; jj2++)
                {
                   i3 = S_diag_j[jj2];
                   if (CF_marker[i3] > 0 && fine_to_coarse[i3] != ic)
@@ -2775,7 +2864,7 @@ hypre_BoomerAMGCreate2ndSHost( hypre_ParCSRMatrix  *S,
                      }
                   }
                }
-               for (jj2 = S_offd_i[i2]; jj2 < S_offd_i[i2+1]; jj2++)
+               for (jj2 = S_offd_i[i2]; jj2 < S_offd_i[i2 + 1]; jj2++)
                {
                   i3 = S_offd_j[jj2];
                   if (CF_marker_offd[i3] > 0)
@@ -2795,7 +2884,7 @@ hypre_BoomerAMGCreate2ndSHost( hypre_ParCSRMatrix  *S,
                   }
                }
             }
-            for (jj1 = S_offd_i[i1]; jj1 < S_offd_i[i1+1]; jj1++)
+            for (jj1 = S_offd_i[i1]; jj1 < S_offd_i[i1 + 1]; jj1++)
             {
                i2 = S_offd_j[jj1];
                if (CF_marker_offd[i2] > 0)
@@ -2813,7 +2902,7 @@ hypre_BoomerAMGCreate2ndSHost( hypre_ParCSRMatrix  *S,
                      C_temp_offd_data[S_marker_offd[index] - jj_row_begin_offd] += 2;
                   }
                }
-               for (jj2 = S_ext_diag_i[i2]; jj2 < S_ext_diag_i[i2+1]; jj2++)
+               for (jj2 = S_ext_diag_i[i2]; jj2 < S_ext_diag_i[i2 + 1]; jj2++)
                {
                   i3 = S_ext_diag_j[jj2];
                   if (i3 != ic)
@@ -2831,7 +2920,7 @@ hypre_BoomerAMGCreate2ndSHost( hypre_ParCSRMatrix  *S,
                      }
                   }
                }
-               for (jj2 = S_ext_offd_i[i2]; jj2 < S_ext_offd_i[i2+1]; jj2++)
+               for (jj2 = S_ext_offd_i[i2]; jj2 < S_ext_offd_i[i2 + 1]; jj2++)
                {
                   i3 = S_ext_offd_j[jj2];
                   if (S_marker_offd[i3] < jj_row_begin_offd)
@@ -2869,12 +2958,12 @@ hypre_BoomerAMGCreate2ndSHost( hypre_ParCSRMatrix  *S,
    } /* omp parallel */
 
    S2 = hypre_ParCSRMatrixCreate(comm, global_num_coarse,
-         global_num_coarse, coarse_row_starts,
-         coarse_row_starts, num_cols_offd_C, C_diag_i[num_coarse], C_offd_i[num_coarse]);
+                                 global_num_coarse, coarse_row_starts,
+                                 coarse_row_starts, num_cols_offd_C, C_diag_i[num_coarse], C_offd_i[num_coarse]);
 
    C_diag = hypre_ParCSRMatrixDiag(S2);
    hypre_CSRMatrixI(C_diag) = C_diag_i;
-   if (C_diag_i[num_coarse]) hypre_CSRMatrixJ(C_diag) = C_diag_j;
+   if (C_diag_i[num_coarse]) { hypre_CSRMatrixJ(C_diag) = C_diag_j; }
 
    C_offd = hypre_ParCSRMatrixOffd(S2);
    hypre_CSRMatrixI(C_offd) = C_offd_i;
@@ -2882,7 +2971,7 @@ hypre_BoomerAMGCreate2ndSHost( hypre_ParCSRMatrix  *S,
 
    if (num_cols_offd_C)
    {
-      if (C_offd_i[num_coarse]) hypre_CSRMatrixJ(C_offd) = C_offd_j;
+      if (C_offd_i[num_coarse]) { hypre_CSRMatrixJ(C_offd) = C_offd_j; }
       hypre_ParCSRMatrixColMapOffd(S2) = col_map_offd_C;
    }
 
@@ -2942,13 +3031,11 @@ hypre_BoomerAMGCreate2ndS( hypre_ParCSRMatrix  *S,
                            HYPRE_BigInt        *coarse_row_starts,
                            hypre_ParCSRMatrix **C_ptr)
 {
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    hypre_GpuProfilingPushRange("Create2ndS");
-#endif
 
    HYPRE_Int ierr = 0;
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
    HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_ParCSRMatrixMemoryLocation(S) );
 
    if (exec == HYPRE_EXEC_DEVICE)
@@ -2961,9 +3048,7 @@ hypre_BoomerAMGCreate2ndS( hypre_ParCSRMatrix  *S,
       ierr = hypre_BoomerAMGCreate2ndSHost( S, CF_marker, num_paths, coarse_row_starts, C_ptr );
    }
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    hypre_GpuProfilingPopRange();
-#endif
 
    return ierr;
 }
@@ -2978,12 +3063,19 @@ hypre_BoomerAMGCorrectCFMarkerHost(hypre_IntArray *CF_marker, hypre_IntArray *ne
    HYPRE_Int i, cnt;
 
    cnt = 0;
-   for (i=0; i < hypre_IntArraySize(CF_marker); i++)
+   for (i = 0; i < hypre_IntArraySize(CF_marker); i++)
    {
       if (hypre_IntArrayData(CF_marker)[i] > 0 )
       {
-         if (hypre_IntArrayData(CF_marker)[i] == 1) hypre_IntArrayData(CF_marker)[i] = hypre_IntArrayData(new_CF_marker)[cnt++];
-         else { hypre_IntArrayData(CF_marker)[i] = 1; cnt++;}
+         if (hypre_IntArrayData(CF_marker)[i] == 1)
+         {
+            hypre_IntArrayData(CF_marker)[i] = hypre_IntArrayData(new_CF_marker)[cnt++];
+         }
+         else
+         {
+            hypre_IntArrayData(CF_marker)[i] = 1;
+            cnt++;
+         }
       }
    }
 
@@ -2999,12 +3091,18 @@ hypre_BoomerAMGCorrectCFMarker2Host(hypre_IntArray *CF_marker, hypre_IntArray *n
    HYPRE_Int i, cnt;
 
    cnt = 0;
-   for (i=0; i < hypre_IntArraySize(CF_marker); i++)
+   for (i = 0; i < hypre_IntArraySize(CF_marker); i++)
    {
       if (hypre_IntArrayData(CF_marker)[i] > 0 )
       {
-         if (hypre_IntArrayData(new_CF_marker)[cnt] == -1) hypre_IntArrayData(CF_marker)[i] = -2;
-         else hypre_IntArrayData(CF_marker)[i] = 1;
+         if (hypre_IntArrayData(new_CF_marker)[cnt] == -1)
+         {
+            hypre_IntArrayData(CF_marker)[i] = -2;
+         }
+         else
+         {
+            hypre_IntArrayData(CF_marker)[i] = 1;
+         }
          cnt++;
       }
    }
@@ -3019,11 +3117,9 @@ HYPRE_Int
 hypre_BoomerAMGCorrectCFMarker(hypre_IntArray *CF_marker, hypre_IntArray *new_CF_marker)
 {
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    hypre_GpuProfilingPushRange("CorrectCFMarker");
-#endif
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
    HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy2( hypre_IntArrayMemoryLocation(CF_marker),
                                                       hypre_IntArrayMemoryLocation(new_CF_marker));
 
@@ -3037,9 +3133,7 @@ hypre_BoomerAMGCorrectCFMarker(hypre_IntArray *CF_marker, hypre_IntArray *new_CF
       hypre_BoomerAMGCorrectCFMarkerHost(CF_marker, new_CF_marker);
    }
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    hypre_GpuProfilingPopRange();
-#endif
 
    return hypre_error_flag;
 }
@@ -3051,11 +3145,9 @@ HYPRE_Int
 hypre_BoomerAMGCorrectCFMarker2(hypre_IntArray *CF_marker, hypre_IntArray *new_CF_marker)
 {
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    hypre_GpuProfilingPushRange("CorrectCFMarker2");
-#endif
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
    HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy2( hypre_IntArrayMemoryLocation(CF_marker),
                                                       hypre_IntArrayMemoryLocation(new_CF_marker));
 
@@ -3069,9 +3161,7 @@ hypre_BoomerAMGCorrectCFMarker2(hypre_IntArray *CF_marker, hypre_IntArray *new_C
       hypre_BoomerAMGCorrectCFMarker2Host(CF_marker, new_CF_marker);
    }
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    hypre_GpuProfilingPopRange();
-#endif
 
    return hypre_error_flag;
 }
diff --git a/external/hypre/src/parcsr_ls/par_strength2nd_device.c b/external/hypre/src/parcsr_ls/par_strength2nd_device.c
index 87f28e30..d2db35d4 100644
--- a/external/hypre/src/parcsr_ls/par_strength2nd_device.c
+++ b/external/hypre/src/parcsr_ls/par_strength2nd_device.c
@@ -1,10 +1,11 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
  ******************************************************************************/
 
+#include "_hypre_onedpl.hpp"
 #include "HYPRE.h"
 #include "HYPRE_parcsr_mv.h"
 #include "HYPRE_IJ_mv.h"
@@ -16,12 +17,12 @@
 #include "_hypre_parcsr_mv.h"
 #include "HYPRE_utilities.h"
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
 
 //-----------------------------------------------------------------------
 HYPRE_Int
 hypre_BoomerAMGCreate2ndSDevice( hypre_ParCSRMatrix  *S,
-                                 HYPRE_Int           *CF_marker_host,
+                                 HYPRE_Int           *CF_marker,
                                  HYPRE_Int            num_paths,
                                  HYPRE_BigInt        *coarse_row_starts,
                                  hypre_ParCSRMatrix **S2_ptr)
@@ -31,10 +32,9 @@ hypre_BoomerAMGCreate2ndSDevice( hypre_ParCSRMatrix  *S,
    hypre_CSRMatrix    *S_offd     = hypre_ParCSRMatrixOffd(S);
    HYPRE_Int           S_diag_nnz = hypre_CSRMatrixNumNonzeros(S_diag);
    HYPRE_Int           S_offd_nnz = hypre_CSRMatrixNumNonzeros(S_offd);
-   hypre_ParCSRMatrix *SI         = hypre_CTAlloc(hypre_ParCSRMatrix, 1, HYPRE_MEMORY_HOST);
    hypre_CSRMatrix    *Id, *SI_diag;
    hypre_ParCSRMatrix *S_XC, *S_CX, *S2;
-   HYPRE_Int          *CF_marker, *new_end;
+   HYPRE_Int          *new_end;
    HYPRE_Complex       coeff = 2.0;
 
    /*
@@ -44,29 +44,27 @@ hypre_BoomerAMGCreate2ndSDevice( hypre_ParCSRMatrix  *S,
    hypre_MPI_Comm_rank(comm, &myid);
    */
 
-   CF_marker = hypre_TAlloc(HYPRE_Int, S_nr_local, HYPRE_MEMORY_DEVICE);
-   hypre_TMemcpy(CF_marker, CF_marker_host, HYPRE_Int, S_nr_local, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
-
    /* 1. Create new matrix with added diagonal */
    hypre_GpuProfilingPushRange("Setup");
 
    /* give S data arrays */
    hypre_CSRMatrixData(S_diag) = hypre_TAlloc(HYPRE_Complex, S_diag_nnz, HYPRE_MEMORY_DEVICE );
-   HYPRE_THRUST_CALL( fill,
-                      hypre_CSRMatrixData(S_diag),
-                      hypre_CSRMatrixData(S_diag) + S_diag_nnz,
-                      1.0 );
+   hypreDevice_ComplexFilln( hypre_CSRMatrixData(S_diag),
+                             S_diag_nnz,
+                             1.0 );
 
    hypre_CSRMatrixData(S_offd) = hypre_TAlloc(HYPRE_Complex, S_offd_nnz, HYPRE_MEMORY_DEVICE );
-   HYPRE_THRUST_CALL( fill,
-                      hypre_CSRMatrixData(S_offd),
-                      hypre_CSRMatrixData(S_offd) + S_offd_nnz,
-                      1.0 );
+   hypreDevice_ComplexFilln( hypre_CSRMatrixData(S_offd),
+                             S_offd_nnz,
+                             1.0 );
 
-   hypre_MatvecCommPkgCreate(S);
+   if (!hypre_ParCSRMatrixCommPkg(S))
+   {
+      hypre_MatvecCommPkgCreate(S);
+   }
 
    /* S(C, :) and S(:, C) */
-   hypre_ParCSRMatrixGenerate1DCFDevice(S, CF_marker_host, coarse_row_starts, NULL, &S_CX, &S_XC);
+   hypre_ParCSRMatrixGenerate1DCFDevice(S, CF_marker, coarse_row_starts, NULL, &S_CX, &S_XC);
 
    hypre_assert(S_nr_local == hypre_ParCSRMatrixNumCols(S_CX));
 
@@ -77,6 +75,18 @@ hypre_BoomerAMGCreate2ndSDevice( hypre_ParCSRMatrix  *S,
 
    hypre_CSRMatrixInitialize_v2(Id, 0, HYPRE_MEMORY_DEVICE);
 
+#if defined(HYPRE_USING_SYCL)
+   hypreSycl_sequence( hypre_CSRMatrixI(Id),
+                       hypre_CSRMatrixI(Id) + hypre_ParCSRMatrixNumRows(S_CX) + 1,
+                       0 );
+
+   oneapi::dpl::counting_iterator<HYPRE_Int> count(0);
+   new_end = hypreSycl_copy_if( count,
+                                count + hypre_ParCSRMatrixNumCols(S_CX),
+                                CF_marker,
+                                hypre_CSRMatrixJ(Id),
+                                is_nonnegative<HYPRE_Int>()  );
+#else
    HYPRE_THRUST_CALL( sequence,
                       hypre_CSRMatrixI(Id),
                       hypre_CSRMatrixI(Id) + hypre_ParCSRMatrixNumRows(S_CX) + 1,
@@ -88,15 +98,13 @@ hypre_BoomerAMGCreate2ndSDevice( hypre_ParCSRMatrix  *S,
                                 CF_marker,
                                 hypre_CSRMatrixJ(Id),
                                 is_nonnegative<HYPRE_Int>()  );
+#endif
 
    hypre_assert(new_end - hypre_CSRMatrixJ(Id) == hypre_ParCSRMatrixNumRows(S_CX));
 
-   hypre_TFree(CF_marker, HYPRE_MEMORY_DEVICE);
-
-   HYPRE_THRUST_CALL( fill,
-                      hypre_CSRMatrixData(Id),
-                      hypre_CSRMatrixData(Id) + hypre_ParCSRMatrixNumRows(S_CX),
-                      coeff );
+   hypreDevice_ComplexFilln( hypre_CSRMatrixData(Id),
+                             hypre_ParCSRMatrixNumRows(S_CX),
+                             coeff );
 
    SI_diag = hypre_CSRMatrixAddDevice(1.0, hypre_ParCSRMatrixDiag(S_CX), 1.0, Id);
 
@@ -144,4 +152,4 @@ hypre_BoomerAMGCreate2ndSDevice( hypre_ParCSRMatrix  *S,
    return 0;
 }
 
-#endif /* #if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP) */
+#endif /* #if defined(HYPRE_USING_GPU) */
diff --git a/external/hypre/src/parcsr_ls/par_strength_device.c b/external/hypre/src/parcsr_ls/par_strength_device.c
index 196ebd00..7bc351bb 100644
--- a/external/hypre/src/parcsr_ls/par_strength_device.c
+++ b/external/hypre/src/parcsr_ls/par_strength_device.c
@@ -1,23 +1,26 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
  ******************************************************************************/
 
+#include "_hypre_onedpl.hpp"
 #include "_hypre_parcsr_ls.h"
 #include "_hypre_utilities.hpp"
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
 
-__global__ void hypre_BoomerAMGCreateS_rowcount( HYPRE_Int nr_of_rows,
+__global__ void hypre_BoomerAMGCreateS_rowcount( hypre_DeviceItem &item,
+                                                 HYPRE_Int nr_of_rows,
                                                  HYPRE_Real max_row_sum, HYPRE_Real strength_threshold,
                                                  HYPRE_Real* A_diag_data, HYPRE_Int* A_diag_i, HYPRE_Int* A_diag_j,
                                                  HYPRE_Real* A_offd_data, HYPRE_Int* A_offd_i, HYPRE_Int* A_offd_j,
                                                  HYPRE_Int* S_temp_diag_j, HYPRE_Int* S_temp_offd_j,
                                                  HYPRE_Int num_functions, HYPRE_Int* dof_func, HYPRE_Int* dof_func_offd,
                                                  HYPRE_Int* jS_diag, HYPRE_Int* jS_offd );
-__global__ void hypre_BoomerAMGCreateSabs_rowcount( HYPRE_Int nr_of_rows,
+__global__ void hypre_BoomerAMGCreateSabs_rowcount( hypre_DeviceItem &item,
+                                                    HYPRE_Int nr_of_rows,
                                                     HYPRE_Real max_row_sum, HYPRE_Real strength_threshold,
                                                     HYPRE_Real* A_diag_data, HYPRE_Int* A_diag_i, HYPRE_Int* A_diag_j,
                                                     HYPRE_Real* A_offd_data, HYPRE_Int* A_offd_i, HYPRE_Int* A_offd_j,
@@ -53,7 +56,7 @@ hypre_BoomerAMGCreateSDevice(hypre_ParCSRMatrix    *A,
    HYPRE_Int               *A_offd_j        = hypre_CSRMatrixJ(A_offd);
    HYPRE_BigInt            *row_starts      = hypre_ParCSRMatrixRowStarts(A);
    HYPRE_Int                num_variables   = hypre_CSRMatrixNumRows(A_diag);
-   HYPRE_Int                global_num_vars = hypre_ParCSRMatrixGlobalNumRows(A);
+   HYPRE_BigInt             global_num_vars = hypre_ParCSRMatrixGlobalNumRows(A);
    HYPRE_Int                num_nonzeros_diag;
    HYPRE_Int                num_nonzeros_offd;
    HYPRE_Int                num_cols_offd = hypre_CSRMatrixNumCols(A_offd);
@@ -93,8 +96,8 @@ hypre_BoomerAMGCreateSDevice(hypre_ParCSRMatrix    *A,
    num_nonzeros_diag = hypre_CSRMatrixNumNonzeros(A_diag);
    num_nonzeros_offd = hypre_CSRMatrixNumNonzeros(A_offd);
 
-   S_diag_i = hypre_TAlloc(HYPRE_Int, num_variables+1, memory_location);
-   S_offd_i = hypre_TAlloc(HYPRE_Int, num_variables+1, memory_location);
+   S_diag_i = hypre_TAlloc(HYPRE_Int, num_variables + 1, memory_location);
+   S_offd_i = hypre_TAlloc(HYPRE_Int, num_variables + 1, memory_location);
    S_temp_diag_j = hypre_TAlloc(HYPRE_Int, num_nonzeros_diag, HYPRE_MEMORY_DEVICE);
    S_temp_offd_j = hypre_TAlloc(HYPRE_Int, num_nonzeros_offd, HYPRE_MEMORY_DEVICE);
 
@@ -103,9 +106,9 @@ hypre_BoomerAMGCreateSDevice(hypre_ParCSRMatrix    *A,
       dof_func_offd_dev = hypre_TAlloc(HYPRE_Int, num_cols_offd, HYPRE_MEMORY_DEVICE);
    }
 
-  /*-------------------------------------------------------------------
-    * Get the dof_func data for the off-processor columns
-    *-------------------------------------------------------------------*/
+   /*-------------------------------------------------------------------
+     * Get the dof_func data for the off-processor columns
+     *-------------------------------------------------------------------*/
    if (!comm_pkg)
    {
       hypre_MatvecCommPkgCreate(A);
@@ -116,15 +119,32 @@ hypre_BoomerAMGCreateSDevice(hypre_ParCSRMatrix    *A,
 
    if (num_functions > 1)
    {
-      HYPRE_Int *int_buf_data = hypre_TAlloc(HYPRE_Int, hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends), HYPRE_MEMORY_DEVICE);
+      HYPRE_Int *int_buf_data = hypre_TAlloc(HYPRE_Int, hypre_ParCSRCommPkgSendMapStart(comm_pkg,
+                                                                                        num_sends), HYPRE_MEMORY_DEVICE);
 
       hypre_ParCSRCommPkgCopySendMapElmtsToDevice(comm_pkg);
+#if defined(HYPRE_USING_SYCL)
+      hypreSycl_gather( hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg),
+                        hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg) +
+                        hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                        dof_func,
+                        int_buf_data );
+#else
       HYPRE_THRUST_CALL( gather,
                          hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg),
                          hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg) +
                          hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
                          dof_func,
                          int_buf_data );
+#endif
+
+#if defined(HYPRE_USING_THRUST_NOSYNC)
+      /* RL: make sure int_buf_data is ready before issuing GPU-GPU MPI */
+      if (hypre_GetGpuAwareMPI())
+      {
+         hypre_ForceSyncComputeStream();
+      }
+#endif
 
       comm_handle = hypre_ParCSRCommHandleCreate_v2(11, comm_pkg, HYPRE_MEMORY_DEVICE, int_buf_data,
                                                     HYPRE_MEMORY_DEVICE, dof_func_offd_dev);
@@ -134,46 +154,63 @@ hypre_BoomerAMGCreateSDevice(hypre_ParCSRMatrix    *A,
    }
 
    /* count the row nnz of S */
-   dim3 bDim = hypre_GetDefaultCUDABlockDimension();
-   dim3 gDim = hypre_GetDefaultCUDAGridDimension(num_variables, "warp", bDim);
+   dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+   dim3 gDim = hypre_GetDefaultDeviceGridDimension(num_variables, "warp", bDim);
 
    if (abs_soc)
    {
-      HYPRE_CUDA_LAUNCH( hypre_BoomerAMGCreateSabs_rowcount, gDim, bDim,
-                         num_variables, max_row_sum, strength_threshold,
-                         A_diag_data, A_diag_i, A_diag_j,
-                         A_offd_data, A_offd_i, A_offd_j,
-                         S_temp_diag_j, S_temp_offd_j,
-                         num_functions, dof_func, dof_func_offd_dev,
-                         S_diag_i, S_offd_i );
+      HYPRE_GPU_LAUNCH( hypre_BoomerAMGCreateSabs_rowcount, gDim, bDim,
+                        num_variables, max_row_sum, strength_threshold,
+                        A_diag_data, A_diag_i, A_diag_j,
+                        A_offd_data, A_offd_i, A_offd_j,
+                        S_temp_diag_j, S_temp_offd_j,
+                        num_functions, dof_func, dof_func_offd_dev,
+                        S_diag_i, S_offd_i );
    }
    else
    {
-      HYPRE_CUDA_LAUNCH( hypre_BoomerAMGCreateS_rowcount, gDim, bDim,
-                         num_variables, max_row_sum, strength_threshold,
-                         A_diag_data, A_diag_i, A_diag_j,
-                         A_offd_data, A_offd_i, A_offd_j,
-                         S_temp_diag_j, S_temp_offd_j,
-                         num_functions, dof_func, dof_func_offd_dev,
-                         S_diag_i, S_offd_i );
+      HYPRE_GPU_LAUNCH( hypre_BoomerAMGCreateS_rowcount, gDim, bDim,
+                        num_variables, max_row_sum, strength_threshold,
+                        A_diag_data, A_diag_i, A_diag_j,
+                        A_offd_data, A_offd_i, A_offd_j,
+                        S_temp_diag_j, S_temp_offd_j,
+                        num_functions, dof_func, dof_func_offd_dev,
+                        S_diag_i, S_offd_i );
    }
 
+   hypre_Memset(S_diag_i + num_variables, 0, sizeof(HYPRE_Int), HYPRE_MEMORY_DEVICE);
+   hypre_Memset(S_offd_i + num_variables, 0, sizeof(HYPRE_Int), HYPRE_MEMORY_DEVICE);
+
    hypreDevice_IntegerExclusiveScan(num_variables + 1, S_diag_i);
    hypreDevice_IntegerExclusiveScan(num_variables + 1, S_offd_i);
 
    HYPRE_Int *tmp, S_num_nonzeros_diag, S_num_nonzeros_offd;
 
-   hypre_TMemcpy(&S_num_nonzeros_diag, &S_diag_i[num_variables], HYPRE_Int, 1, HYPRE_MEMORY_HOST, memory_location);
-   hypre_TMemcpy(&S_num_nonzeros_offd, &S_offd_i[num_variables], HYPRE_Int, 1, HYPRE_MEMORY_HOST, memory_location);
+   hypre_TMemcpy(&S_num_nonzeros_diag, &S_diag_i[num_variables], HYPRE_Int, 1, HYPRE_MEMORY_HOST,
+                 memory_location);
+   hypre_TMemcpy(&S_num_nonzeros_offd, &S_offd_i[num_variables], HYPRE_Int, 1, HYPRE_MEMORY_HOST,
+                 memory_location);
 
    S_diag_j = hypre_TAlloc(HYPRE_Int, S_num_nonzeros_diag, memory_location);
    S_offd_j = hypre_TAlloc(HYPRE_Int, S_num_nonzeros_offd, memory_location);
 
-   tmp = HYPRE_THRUST_CALL(copy_if, S_temp_diag_j, S_temp_diag_j + num_nonzeros_diag, S_diag_j, is_nonnegative<HYPRE_Int>());
+#if defined(HYPRE_USING_SYCL)
+   tmp = HYPRE_ONEDPL_CALL(std::copy_if, S_temp_diag_j, S_temp_diag_j + num_nonzeros_diag, S_diag_j,
+                           is_nonnegative<HYPRE_Int>());
+#else
+   tmp = HYPRE_THRUST_CALL(copy_if, S_temp_diag_j, S_temp_diag_j + num_nonzeros_diag, S_diag_j,
+                           is_nonnegative<HYPRE_Int>());
+#endif
 
    hypre_assert(S_num_nonzeros_diag == tmp - S_diag_j);
 
-   tmp = HYPRE_THRUST_CALL(copy_if, S_temp_offd_j, S_temp_offd_j + num_nonzeros_offd, S_offd_j, is_nonnegative<HYPRE_Int>());
+#if defined(HYPRE_USING_SYCL)
+   tmp = HYPRE_ONEDPL_CALL(std::copy_if, S_temp_offd_j, S_temp_offd_j + num_nonzeros_offd, S_offd_j,
+                           is_nonnegative<HYPRE_Int>());
+#else
+   tmp = HYPRE_THRUST_CALL(copy_if, S_temp_offd_j, S_temp_offd_j + num_nonzeros_offd, S_offd_j,
+                           is_nonnegative<HYPRE_Int>());
+#endif
 
    hypre_assert(S_num_nonzeros_offd == tmp - S_offd_j);
 
@@ -217,22 +254,23 @@ hypre_BoomerAMGCreateSDevice(hypre_ParCSRMatrix    *A,
 }
 
 /*-----------------------------------------------------------------------*/
- __global__ void hypre_BoomerAMGCreateS_rowcount( HYPRE_Int   nr_of_rows,
-                                                  HYPRE_Real  max_row_sum,
-                                                  HYPRE_Real  strength_threshold,
-                                                  HYPRE_Real *A_diag_data,
-                                                  HYPRE_Int  *A_diag_i,
-                                                  HYPRE_Int  *A_diag_j,
-                                                  HYPRE_Real *A_offd_data,
-                                                  HYPRE_Int  *A_offd_i,
-                                                  HYPRE_Int  *A_offd_j,
-                                                  HYPRE_Int  *S_temp_diag_j,
-                                                  HYPRE_Int  *S_temp_offd_j,
-                                                  HYPRE_Int   num_functions,
-                                                  HYPRE_Int  *dof_func,
-                                                  HYPRE_Int  *dof_func_offd,
-                                                  HYPRE_Int  *jS_diag,
-                                                  HYPRE_Int  *jS_offd )
+__global__ void hypre_BoomerAMGCreateS_rowcount( hypre_DeviceItem &item,
+                                                 HYPRE_Int   nr_of_rows,
+                                                 HYPRE_Real  max_row_sum,
+                                                 HYPRE_Real  strength_threshold,
+                                                 HYPRE_Real *A_diag_data,
+                                                 HYPRE_Int  *A_diag_i,
+                                                 HYPRE_Int  *A_diag_j,
+                                                 HYPRE_Real *A_offd_data,
+                                                 HYPRE_Int  *A_offd_i,
+                                                 HYPRE_Int  *A_offd_j,
+                                                 HYPRE_Int  *S_temp_diag_j,
+                                                 HYPRE_Int  *S_temp_offd_j,
+                                                 HYPRE_Int   num_functions,
+                                                 HYPRE_Int  *dof_func,
+                                                 HYPRE_Int  *dof_func_offd,
+                                                 HYPRE_Int  *jS_diag,
+                                                 HYPRE_Int  *jS_offd )
 {
    /*-----------------------------------------------------------------------*/
    /*
@@ -255,45 +293,42 @@ hypre_BoomerAMGCreateSDevice(hypre_ParCSRMatrix    *A,
    HYPRE_Real row_scale = 0.0, row_sum = 0.0, row_max = 0.0, row_min = 0.0, diag = 0.0;
    HYPRE_Int row_nnz_diag = 0, row_nnz_offd = 0, diag_pos = -1;
 
-   HYPRE_Int row = hypre_cuda_get_grid_warp_id<1,1>();
+   HYPRE_Int row = hypre_gpu_get_grid_warp_id<1, 1>(item);
 
    if (row >= nr_of_rows)
    {
       return;
    }
 
-   HYPRE_Int lane = hypre_cuda_get_lane_id<1>();
-   HYPRE_Int p_diag, q_diag, p_offd, q_offd;
+   HYPRE_Int lane = hypre_gpu_get_lane_id<1>(item);
+   HYPRE_Int p_diag = 0, q_diag, p_offd = 0, q_offd;
 
    /* diag part */
    if (lane < 2)
    {
       p_diag = read_only_load(A_diag_i + row + lane);
    }
-   q_diag = __shfl_sync(HYPRE_WARP_FULL_MASK, p_diag, 1);
-   p_diag = __shfl_sync(HYPRE_WARP_FULL_MASK, p_diag, 0);
+   q_diag = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_diag, 1);
+   p_diag = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_diag, 0);
 
-   for (HYPRE_Int i = p_diag + lane; __any_sync(HYPRE_WARP_FULL_MASK, i < q_diag); i += HYPRE_WARP_SIZE)
+   for (HYPRE_Int i = p_diag + lane; i < q_diag; i += HYPRE_WARP_SIZE)
    {
-      if (i < q_diag)
-      {
-         const HYPRE_Int col = read_only_load(&A_diag_j[i]);
+      const HYPRE_Int col = read_only_load(&A_diag_j[i]);
 
-         if ( num_functions == 1 || row == col ||
-              read_only_load(&dof_func[row]) == read_only_load(&dof_func[col]) )
+      if ( num_functions == 1 || row == col ||
+           read_only_load(&dof_func[row]) == read_only_load(&dof_func[col]) )
+      {
+         const HYPRE_Real v = read_only_load(&A_diag_data[i]);
+         row_sum += v;
+         if (row == col)
+         {
+            diag = v;
+            diag_pos = i;
+         }
+         else
          {
-            const HYPRE_Real v = read_only_load(&A_diag_data[i]);
-            row_sum += v;
-            if (row == col)
-            {
-               diag = v;
-               diag_pos = i;
-            }
-            else
-            {
-               row_max = hypre_max(row_max, v);
-               row_min = hypre_min(row_min, v);
-            }
+            row_max = hypre_max(row_max, v);
+            row_min = hypre_min(row_min, v);
          }
       }
    }
@@ -303,56 +338,50 @@ hypre_BoomerAMGCreateSDevice(hypre_ParCSRMatrix    *A,
    {
       p_offd = read_only_load(A_offd_i + row + lane);
    }
-   q_offd = __shfl_sync(HYPRE_WARP_FULL_MASK, p_offd, 1);
-   p_offd = __shfl_sync(HYPRE_WARP_FULL_MASK, p_offd, 0);
+   q_offd = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_offd, 1);
+   p_offd = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_offd, 0);
 
-   for (HYPRE_Int i = p_offd + lane; __any_sync(HYPRE_WARP_FULL_MASK, i < q_offd); i += HYPRE_WARP_SIZE)
+   for (HYPRE_Int i = p_offd + lane; i < q_offd; i += HYPRE_WARP_SIZE)
    {
-      if (i < q_offd)
+      if ( num_functions == 1 ||
+           read_only_load(&dof_func[row]) == read_only_load(&dof_func_offd[read_only_load(&A_offd_j[i])]) )
       {
-         if ( num_functions == 1 ||
-              read_only_load(&dof_func[row]) == read_only_load(&dof_func_offd[read_only_load(&A_offd_j[i])]) )
-         {
-            const HYPRE_Real v = read_only_load(&A_offd_data[i]);
-            row_sum += v;
-            row_max = hypre_max(row_max, v);
-            row_min = hypre_min(row_min, v);
-         }
+         const HYPRE_Real v = read_only_load(&A_offd_data[i]);
+         row_sum += v;
+         row_max = hypre_max(row_max, v);
+         row_min = hypre_min(row_min, v);
       }
    }
 
-   diag = warp_allreduce_sum(diag);
+   diag = warp_allreduce_sum(item, diag);
 
    /* sign of diag */
    const HYPRE_Int sdiag = diag > 0.0 ? 1 : -1;
 
    /* compute scaling factor and row sum */
-   row_sum = warp_allreduce_sum(row_sum);
+   row_sum = warp_allreduce_sum(item, row_sum);
 
    if (diag > 0.0)
    {
-      row_scale = warp_allreduce_min(row_min);
+      row_scale = warp_allreduce_min(item, row_min);
    }
    else
    {
-      row_scale = warp_allreduce_max(row_max);
+      row_scale = warp_allreduce_max(item, row_max);
    }
 
    /* compute row of S */
-   HYPRE_Int all_weak = max_row_sum < 1.0 && fabs(row_sum) > fabs(diag) * max_row_sum;
+   HYPRE_Int all_weak = max_row_sum < 1.0 && hypre_abs(row_sum) > hypre_abs(diag) * max_row_sum;
    const HYPRE_Real thresh = sdiag * strength_threshold * row_scale;
 
-   for (HYPRE_Int i = p_diag + lane; __any_sync(HYPRE_WARP_FULL_MASK, i < q_diag); i += HYPRE_WARP_SIZE)
+   for (HYPRE_Int i = p_diag + lane; i < q_diag; i += HYPRE_WARP_SIZE)
    {
-      if (i < q_diag)
-      {
-         const HYPRE_Int cond = all_weak == 0 && diag_pos != i &&
-                                ( num_functions == 1 || read_only_load(&dof_func[row]) ==
-                                                        read_only_load(&dof_func[read_only_load(&A_diag_j[i])]) ) &&
-                                sdiag * read_only_load(&A_diag_data[i]) < thresh;
-         S_temp_diag_j[i] = cond * (1 + read_only_load(&A_diag_j[i])) - 1;
-         row_nnz_diag += cond;
-      }
+      const HYPRE_Int cond = all_weak == 0 && diag_pos != i &&
+                             ( num_functions == 1 || read_only_load(&dof_func[row]) ==
+                               read_only_load(&dof_func[read_only_load(&A_diag_j[i])]) ) &&
+                             sdiag * read_only_load(&A_diag_data[i]) < thresh;
+      S_temp_diag_j[i] = cond * (1 + read_only_load(&A_diag_j[i])) - 1;
+      row_nnz_diag += cond;
    }
 
    /* !!! mark diagonal as -2 !!! */
@@ -361,21 +390,18 @@ hypre_BoomerAMGCreateSDevice(hypre_ParCSRMatrix    *A,
       S_temp_diag_j[diag_pos] = -2;
    }
 
-   for (HYPRE_Int i = p_offd + lane; __any_sync(HYPRE_WARP_FULL_MASK, i < q_offd); i += HYPRE_WARP_SIZE)
+   for (HYPRE_Int i = p_offd + lane; i < q_offd; i += HYPRE_WARP_SIZE)
    {
-      if (i < q_offd)
-      {
-         const HYPRE_Int cond = all_weak == 0 &&
-                                ( num_functions == 1 || read_only_load(&dof_func[row]) ==
-                                                        read_only_load(&dof_func_offd[read_only_load(&A_offd_j[i])]) ) &&
-                                sdiag * read_only_load(&A_offd_data[i]) < thresh;
-         S_temp_offd_j[i] = cond * (1 + read_only_load(&A_offd_j[i])) - 1;
-         row_nnz_offd += cond;
-      }
+      const HYPRE_Int cond = all_weak == 0 &&
+                             ( num_functions == 1 || read_only_load(&dof_func[row]) ==
+                               read_only_load(&dof_func_offd[read_only_load(&A_offd_j[i])]) ) &&
+                             sdiag * read_only_load(&A_offd_data[i]) < thresh;
+      S_temp_offd_j[i] = cond * (1 + read_only_load(&A_offd_j[i])) - 1;
+      row_nnz_offd += cond;
    }
 
-   row_nnz_diag = warp_reduce_sum(row_nnz_diag);
-   row_nnz_offd = warp_reduce_sum(row_nnz_offd);
+   row_nnz_diag = warp_reduce_sum(item, row_nnz_diag);
+   row_nnz_offd = warp_reduce_sum(item, row_nnz_offd);
 
    if (0 == lane)
    {
@@ -412,22 +438,23 @@ hypre_BoomerAMGMakeSocFromSDevice( hypre_ParCSRMatrix *A,
 }
 
 /*-----------------------------------------------------------------------*/
- __global__ void hypre_BoomerAMGCreateSabs_rowcount( HYPRE_Int   nr_of_rows,
-                                                     HYPRE_Real  max_row_sum,
-                                                     HYPRE_Real  strength_threshold,
-                                                     HYPRE_Real *A_diag_data,
-                                                     HYPRE_Int  *A_diag_i,
-                                                     HYPRE_Int  *A_diag_j,
-                                                     HYPRE_Real *A_offd_data,
-                                                     HYPRE_Int  *A_offd_i,
-                                                     HYPRE_Int  *A_offd_j,
-                                                     HYPRE_Int  *S_temp_diag_j,
-                                                     HYPRE_Int  *S_temp_offd_j,
-                                                     HYPRE_Int   num_functions,
-                                                     HYPRE_Int  *dof_func,
-                                                     HYPRE_Int  *dof_func_offd,
-                                                     HYPRE_Int  *jS_diag,
-                                                     HYPRE_Int  *jS_offd )
+__global__ void hypre_BoomerAMGCreateSabs_rowcount( hypre_DeviceItem &item,
+                                                    HYPRE_Int   nr_of_rows,
+                                                    HYPRE_Real  max_row_sum,
+                                                    HYPRE_Real  strength_threshold,
+                                                    HYPRE_Real *A_diag_data,
+                                                    HYPRE_Int  *A_diag_i,
+                                                    HYPRE_Int  *A_diag_j,
+                                                    HYPRE_Real *A_offd_data,
+                                                    HYPRE_Int  *A_offd_i,
+                                                    HYPRE_Int  *A_offd_j,
+                                                    HYPRE_Int  *S_temp_diag_j,
+                                                    HYPRE_Int  *S_temp_offd_j,
+                                                    HYPRE_Int   num_functions,
+                                                    HYPRE_Int  *dof_func,
+                                                    HYPRE_Int  *dof_func_offd,
+                                                    HYPRE_Int  *jS_diag,
+                                                    HYPRE_Int  *jS_offd )
 {
    /*-----------------------------------------------------------------------*/
    /*
@@ -450,44 +477,41 @@ hypre_BoomerAMGMakeSocFromSDevice( hypre_ParCSRMatrix *A,
    HYPRE_Real row_scale = 0.0, row_sum = 0.0, diag = 0.0;
    HYPRE_Int row_nnz_diag = 0, row_nnz_offd = 0, diag_pos = -1;
 
-   HYPRE_Int row = hypre_cuda_get_grid_warp_id<1,1>();
+   HYPRE_Int row = hypre_gpu_get_grid_warp_id<1, 1>(item);
 
    if (row >= nr_of_rows)
    {
       return;
    }
 
-   HYPRE_Int lane = hypre_cuda_get_lane_id<1>();
-   HYPRE_Int p_diag, q_diag, p_offd, q_offd;
+   HYPRE_Int lane = hypre_gpu_get_lane_id<1>(item);
+   HYPRE_Int p_diag = 0, q_diag, p_offd = 0, q_offd;
 
    /* diag part */
    if (lane < 2)
    {
       p_diag = read_only_load(A_diag_i + row + lane);
    }
-   q_diag = __shfl_sync(HYPRE_WARP_FULL_MASK, p_diag, 1);
-   p_diag = __shfl_sync(HYPRE_WARP_FULL_MASK, p_diag, 0);
+   q_diag = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_diag, 1);
+   p_diag = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_diag, 0);
 
-   for (HYPRE_Int i = p_diag + lane; __any_sync(HYPRE_WARP_FULL_MASK, i < q_diag); i += HYPRE_WARP_SIZE)
+   for (HYPRE_Int i = p_diag + lane; i < q_diag; i += HYPRE_WARP_SIZE)
    {
-      if (i < q_diag)
-      {
-         const HYPRE_Int col = read_only_load(&A_diag_j[i]);
+      const HYPRE_Int col = read_only_load(&A_diag_j[i]);
 
-         if ( num_functions == 1 || row == col ||
-              read_only_load(&dof_func[row]) == read_only_load(&dof_func[col]) )
+      if ( num_functions == 1 || row == col ||
+           read_only_load(&dof_func[row]) == read_only_load(&dof_func[col]) )
+      {
+         const HYPRE_Real v = hypre_cabs( read_only_load(&A_diag_data[i]) );
+         row_sum += v;
+         if (row == col)
          {
-            const HYPRE_Real v = hypre_cabs( read_only_load(&A_diag_data[i]) );
-            row_sum += v;
-            if (row == col)
-            {
-               diag = v;
-               diag_pos = i;
-            }
-            else
-            {
-               row_scale = hypre_max(row_scale, v);
-            }
+            diag = v;
+            diag_pos = i;
+         }
+         else
+         {
+            row_scale = hypre_max(row_scale, v);
          }
       }
    }
@@ -497,44 +521,40 @@ hypre_BoomerAMGMakeSocFromSDevice( hypre_ParCSRMatrix *A,
    {
       p_offd = read_only_load(A_offd_i + row + lane);
    }
-   q_offd = __shfl_sync(HYPRE_WARP_FULL_MASK, p_offd, 1);
-   p_offd = __shfl_sync(HYPRE_WARP_FULL_MASK, p_offd, 0);
+   q_offd = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_offd, 1);
+   p_offd = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_offd, 0);
 
-   for (HYPRE_Int i = p_offd + lane; __any_sync(HYPRE_WARP_FULL_MASK, i < q_offd); i += HYPRE_WARP_SIZE)
+   for (HYPRE_Int i = p_offd + lane; i < q_offd; i += HYPRE_WARP_SIZE)
    {
-      if (i < q_offd)
+      if ( num_functions == 1 ||
+           read_only_load(&dof_func[row]) == read_only_load(&dof_func_offd[read_only_load(&A_offd_j[i])]) )
       {
-         if ( num_functions == 1 ||
-              read_only_load(&dof_func[row]) == read_only_load(&dof_func_offd[read_only_load(&A_offd_j[i])]) )
-         {
-            const HYPRE_Real v = hypre_cabs( read_only_load(&A_offd_data[i]) );
-            row_sum += v;
-            row_scale = hypre_max(row_scale, v);
-         }
+         const HYPRE_Real v = hypre_cabs( read_only_load(&A_offd_data[i]) );
+         row_sum += v;
+         row_scale = hypre_max(row_scale, v);
       }
    }
 
-   diag = warp_allreduce_sum(diag);
+   diag = warp_allreduce_sum(item, diag);
 
    /* compute scaling factor and row sum */
-   row_sum = warp_allreduce_sum(row_sum);
-   row_scale = warp_allreduce_max(row_scale);
+   row_sum = warp_allreduce_sum(item, row_sum);
+   row_scale = warp_allreduce_max(item, row_scale);
 
    /* compute row of S */
-   HYPRE_Int all_weak = max_row_sum < 1.0 && fabs(row_sum) < fabs(diag) * (2.0 - max_row_sum);
+   HYPRE_Int all_weak = max_row_sum < 1.0 &&
+                        hypre_abs(row_sum) < hypre_abs(diag) * (2.0 - max_row_sum);
    const HYPRE_Real thresh = strength_threshold * row_scale;
 
-   for (HYPRE_Int i = p_diag + lane; __any_sync(HYPRE_WARP_FULL_MASK, i < q_diag); i += HYPRE_WARP_SIZE)
+   for (HYPRE_Int i = p_diag + lane; i < q_diag;
+        i += HYPRE_WARP_SIZE)
    {
-      if (i < q_diag)
-      {
-         const HYPRE_Int cond = all_weak == 0 && diag_pos != i &&
-                                ( num_functions == 1 || read_only_load(&dof_func[row]) ==
-                                                        read_only_load(&dof_func[read_only_load(&A_diag_j[i])]) ) &&
-                                hypre_cabs( read_only_load(&A_diag_data[i]) ) > thresh;
-         S_temp_diag_j[i] = cond * (1 + read_only_load(&A_diag_j[i])) - 1;
-         row_nnz_diag += cond;
-      }
+      const HYPRE_Int cond = all_weak == 0 && diag_pos != i &&
+                             ( num_functions == 1 || read_only_load(&dof_func[row]) ==
+                               read_only_load(&dof_func[read_only_load(&A_diag_j[i])]) ) &&
+                             hypre_cabs( read_only_load(&A_diag_data[i]) ) > thresh;
+      S_temp_diag_j[i] = cond * (1 + read_only_load(&A_diag_j[i])) - 1;
+      row_nnz_diag += cond;
    }
 
    /* !!! mark diagonal as -2 !!! */
@@ -543,21 +563,18 @@ hypre_BoomerAMGMakeSocFromSDevice( hypre_ParCSRMatrix *A,
       S_temp_diag_j[diag_pos] = -2;
    }
 
-   for (HYPRE_Int i = p_offd + lane; __any_sync(HYPRE_WARP_FULL_MASK, i < q_offd); i += HYPRE_WARP_SIZE)
+   for (HYPRE_Int i = p_offd + lane; i < q_offd; i += HYPRE_WARP_SIZE)
    {
-      if (i < q_offd)
-      {
-         const HYPRE_Int cond = all_weak == 0 &&
-                                ( num_functions == 1 || read_only_load(&dof_func[row]) ==
-                                                        read_only_load(&dof_func_offd[read_only_load(&A_offd_j[i])]) ) &&
-                                hypre_cabs( read_only_load(&A_offd_data[i]) ) > thresh;
-         S_temp_offd_j[i] = cond * (1 + read_only_load(&A_offd_j[i])) - 1;
-         row_nnz_offd += cond;
-      }
+      const HYPRE_Int cond = all_weak == 0 &&
+                             ( num_functions == 1 || read_only_load(&dof_func[row]) ==
+                               read_only_load(&dof_func_offd[read_only_load(&A_offd_j[i])]) ) &&
+                             hypre_cabs( read_only_load(&A_offd_data[i]) ) > thresh;
+      S_temp_offd_j[i] = cond * (1 + read_only_load(&A_offd_j[i])) - 1;
+      row_nnz_offd += cond;
    }
 
-   row_nnz_diag = warp_reduce_sum(row_nnz_diag);
-   row_nnz_offd = warp_reduce_sum(row_nnz_offd);
+   row_nnz_diag = warp_reduce_sum(item, row_nnz_diag);
+   row_nnz_offd = warp_reduce_sum(item, row_nnz_offd);
 
    if (0 == lane)
    {
@@ -579,7 +596,34 @@ hypre_BoomerAMGCorrectCFMarkerDevice(hypre_IntArray *CF_marker, hypre_IntArray *
    HYPRE_Int *indices   = hypre_CTAlloc(HYPRE_Int, n_coarse, HYPRE_MEMORY_DEVICE);
    HYPRE_Int *CF_C      = hypre_CTAlloc(HYPRE_Int, n_coarse, HYPRE_MEMORY_DEVICE);
 
+#if defined(HYPRE_USING_SYCL)
+   /* save CF_marker values at C points in CF_C and C point indices */
+   HYPRE_ONEDPL_CALL( std::copy_if,
+                      hypre_IntArrayData(CF_marker),
+                      hypre_IntArrayData(CF_marker) + n_fine,
+                      CF_C,
+                      is_positive<HYPRE_Int>() );
+   hypreSycl_copy_if( oneapi::dpl::counting_iterator<HYPRE_Int>(0),
+                      oneapi::dpl::counting_iterator<HYPRE_Int>(n_fine),
+                      hypre_IntArrayData(CF_marker),
+                      indices,
+                      is_positive<HYPRE_Int>() );
+
+   /* replace CF_marker at C points with 1 */
+   HYPRE_ONEDPL_CALL( std::replace_if,
+                      hypre_IntArrayData(CF_marker),
+                      hypre_IntArrayData(CF_marker) + n_fine,
+                      is_positive<HYPRE_Int>(),
+                      1 );
 
+   /* update with new_CF_marker wherever C point value was initially 1 */
+   hypreSycl_scatter_if( hypre_IntArrayData(new_CF_marker),
+                         hypre_IntArrayData(new_CF_marker) + n_coarse,
+                         indices,
+                         CF_C,
+                         hypre_IntArrayData(CF_marker),
+                         equal<HYPRE_Int>(1) );
+#else
    /* save CF_marker values at C points in CF_C and C point indices */
    HYPRE_THRUST_CALL( copy_if,
                       hypre_IntArrayData(CF_marker),
@@ -608,6 +652,7 @@ hypre_BoomerAMGCorrectCFMarkerDevice(hypre_IntArray *CF_marker, hypre_IntArray *
                       CF_C,
                       hypre_IntArrayData(CF_marker),
                       equal<HYPRE_Int>(1) );
+#endif
 
    hypre_TFree(indices, HYPRE_MEMORY_DEVICE);
    hypre_TFree(CF_C, HYPRE_MEMORY_DEVICE);
@@ -627,6 +672,30 @@ hypre_BoomerAMGCorrectCFMarker2Device(hypre_IntArray *CF_marker, hypre_IntArray
 
    HYPRE_Int *indices   = hypre_CTAlloc(HYPRE_Int, n_coarse, HYPRE_MEMORY_DEVICE);
 
+#if defined(HYPRE_USING_SYCL)
+   /* save C point indices */
+   hypreSycl_copy_if( oneapi::dpl::counting_iterator<HYPRE_Int>(0),
+                      oneapi::dpl::counting_iterator<HYPRE_Int>(n_fine),
+                      hypre_IntArrayData(CF_marker),
+                      indices,
+                      is_positive<HYPRE_Int>() );
+
+   /* replace CF_marker at C points with 1 */
+   HYPRE_ONEDPL_CALL( std::replace_if,
+                      hypre_IntArrayData(CF_marker),
+                      hypre_IntArrayData(CF_marker) + n_fine,
+                      is_positive<HYPRE_Int>(),
+                      1 );
+
+   /* update values in CF_marker to -2 wherever new_CF_marker == -1 */
+   hypreSycl_transform_if( oneapi::dpl::make_permutation_iterator(hypre_IntArrayData(CF_marker),
+                                                                  indices),
+                           oneapi::dpl::make_permutation_iterator(hypre_IntArrayData(CF_marker), indices) + n_coarse,
+                           hypre_IntArrayData(new_CF_marker),
+                           oneapi::dpl::make_permutation_iterator(hypre_IntArrayData(CF_marker), indices),
+   [] (const auto & x) { return -2; },
+   equal<HYPRE_Int>(-1) );
+#else
    /* save C point indices */
    HYPRE_THRUST_CALL( copy_if,
                       thrust::counting_iterator<HYPRE_Int>(0),
@@ -650,10 +719,11 @@ hypre_BoomerAMGCorrectCFMarker2Device(hypre_IntArray *CF_marker, hypre_IntArray
                       hypre_IntArrayData(new_CF_marker),
                       hypre_IntArrayData(CF_marker),
                       equal<HYPRE_Int>(-1) );
+#endif
 
    hypre_TFree(indices, HYPRE_MEMORY_DEVICE);
 
    return 0;
 }
 
-#endif /* #if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP) */
+#endif /* #if defined(HYPRE_USING_GPU) */
diff --git a/external/hypre/src/parcsr_ls/par_sv_interp.c b/external/hypre/src/parcsr_ls/par_sv_interp.c
index 80b73feb..50759176 100644
--- a/external/hypre/src/parcsr_ls/par_sv_interp.c
+++ b/external/hypre/src/parcsr_ls/par_sv_interp.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -22,18 +22,20 @@
 *******************************************************************************/
 
 HYPRE_Int hypre_BoomerAMGSmoothInterpVectors(hypre_ParCSRMatrix *A,
-                                       HYPRE_Int num_smooth_vecs,
-                                       hypre_ParVector **smooth_vecs,
-                                       HYPRE_Int smooth_steps)
+                                             HYPRE_Int num_smooth_vecs,
+                                             hypre_ParVector **smooth_vecs,
+                                             HYPRE_Int smooth_steps)
 
 {
-   HYPRE_Int i,j;
+   HYPRE_Int i, j;
 
    hypre_ParVector *f, *v, *z;
    hypre_ParVector *new_vector;
 
    if (num_smooth_vecs == 0)
+   {
       return hypre_error_flag;
+   }
 
    if (smooth_steps)
    {
@@ -107,7 +109,9 @@ hypre_BoomerAMGCoarsenInterpVectors( hypre_ParCSRMatrix *P,
    hypre_ParVector **new_vector_array;
 
    if (num_smooth_vecs == 0)
+   {
       return hypre_error_flag;
+   }
 
    new_vector_array = hypre_CTAlloc(hypre_ParVector*,  num_smooth_vecs, HYPRE_MEMORY_HOST);
 
@@ -133,20 +137,24 @@ hypre_BoomerAMGCoarsenInterpVectors( hypre_ParCSRMatrix *P,
          orig_nf = num_functions - num_smooth_vecs;
          /*  nodal coarsening, so just check the first dof in each
              node, i.e. loop through nodes */
-         for (j = 0; j < n_old_local; j+=orig_nf)
+         for (j = 0; j < n_old_local; j += orig_nf)
          {
-            if (CF_marker[j]>= 0)
+            if (CF_marker[j] >= 0)
             {
-               for (k=0; k < orig_nf; k++) /* orig dofs */
+               for (k = 0; k < orig_nf; k++) /* orig dofs */
                {
-                  new_vector_data[counter++] = old_vector_data[j+k];
+                  new_vector_data[counter++] = old_vector_data[j + k];
                }
-               for (k=0; k< num_smooth_vecs; k++ ) /* new dofs */
+               for (k = 0; k < num_smooth_vecs; k++ ) /* new dofs */
                {
                   if (k == i)
+                  {
                      new_vector_data[counter++] = 1.0;
+                  }
                   else
+                  {
                      new_vector_data[counter++] = 0.0;
+                  }
                   /* there is nothing to copy, so just put a 1.0 or 0.0 here
                      - then the next level works
                      correctly - this value not used anyhow - but now it is nice
@@ -157,10 +165,12 @@ hypre_BoomerAMGCoarsenInterpVectors( hypre_ParCSRMatrix *P,
       }
       else /* normal level */
       {
-         for (j=0; j < n_old_local; j++)
+         for (j = 0; j < n_old_local; j++)
          {
-            if (CF_marker[j]>= 0)
+            if (CF_marker[j] >= 0)
+            {
                new_vector_data[counter++] = old_vector_data[j];
+            }
          }
       }
 
@@ -228,7 +238,7 @@ hypre_BoomerAMG_GMExpandInterp( hypre_ParCSRMatrix *A,
                                 HYPRE_Int interp_vec_first_level)
 {
 
-   HYPRE_Int i,j, k;
+   HYPRE_Int i, j, k;
 
    hypre_ParCSRMatrix *new_P;
 
@@ -284,7 +294,7 @@ hypre_BoomerAMG_GMExpandInterp( hypre_ParCSRMatrix *A,
    HYPRE_Real      *offd_vec_data;
 
    HYPRE_Int        orig_nf;
-   HYPRE_BigInt    *new_col_starts;
+   HYPRE_BigInt     new_col_starts[2];
    HYPRE_Int        num_functions = *nf;
    HYPRE_Int       *c_dof_func = hypre_IntArrayData(*coarse_dof_func);
    HYPRE_Int        modify = 0;
@@ -293,7 +303,7 @@ hypre_BoomerAMG_GMExpandInterp( hypre_ParCSRMatrix *A,
    HYPRE_Real       value;
    HYPRE_Real       trunc_value = 0.0;
    HYPRE_Real       theta_2D[] = {.5, .5};
-   HYPRE_Real       theta_3D[] = {1.0/3.0, 1.0/3.0, 1.0/3.0};
+   HYPRE_Real       theta_3D[] = {1.0 / 3.0, 1.0 / 3.0, 1.0 / 3.0};
 
    HYPRE_Real      *theta;
 
@@ -304,7 +314,7 @@ hypre_BoomerAMG_GMExpandInterp( hypre_ParCSRMatrix *A,
    HYPRE_Real      *q_trunc_data = NULL;
 
    HYPRE_Int       *is_q = NULL;
-   HYPRE_Int        q_alloc= 0;
+   HYPRE_Int        q_alloc = 0;
    HYPRE_BigInt    *aux_j = NULL;
    HYPRE_Real      *aux_data = NULL;
    HYPRE_Int       *is_diag = NULL;
@@ -312,7 +322,8 @@ hypre_BoomerAMG_GMExpandInterp( hypre_ParCSRMatrix *A,
    HYPRE_Int       *col_map;
    HYPRE_Int       *coarse_to_fine;
    HYPRE_Int        coarse_counter;
-   HYPRE_Int        fine_index, index;
+   HYPRE_Int        fine_index = 0;
+   HYPRE_Int        index;
    HYPRE_BigInt     big_index, big_new_col, cur_col, g_nc;
    HYPRE_Int        new_col;
 
@@ -322,15 +333,17 @@ hypre_BoomerAMG_GMExpandInterp( hypre_ParCSRMatrix *A,
    HYPRE_Real *lost_value_sv = NULL;
    HYPRE_Real *q_dist_value_sv = NULL;
 
-
+   HYPRE_MemoryLocation memory_location_P = hypre_ParCSRMatrixMemoryLocation(A);
 
    /* only doing 2 variants */
    if (variant < 1 || variant > 2)
+   {
       variant = 2;
+   }
 
 
- /* variant 2 needs off proc sv data (Variant 1 needs it if we
-  * use_truc_data = 1 )*/
+   /* variant 2 needs off proc sv data (Variant 1 needs it if we
+    * use_truc_data = 1 )*/
 
    if (!comm_pkg)
    {
@@ -355,25 +368,29 @@ hypre_BoomerAMG_GMExpandInterp( hypre_ParCSRMatrix *A,
 
       if (!myid)
       {
-         hypre_sprintf(new_file,"%s.level.%d","P_new_orig", level );
+         hypre_sprintf(new_file, "%s.level.%d", "P_new_orig", level );
          if (P_CSR)
+         {
             hypre_CSRMatrixPrint(P_CSR, new_file);
+         }
 
       }
 
       hypre_CSRMatrixDestroy(P_CSR);
 
-      if (level ==interp_vec_first_level || variant == 2)
+      if (level == interp_vec_first_level || variant == 2)
       {
-         for (i=0; i < num_smooth_vecs; i++)
+         for (i = 0; i < num_smooth_vecs; i++)
          {
             sv = hypre_ParVectorToVectorAll(smooth_vecs[i]);
 
             if (!myid)
             {
-               hypre_sprintf(new_file,"%s.%d.level.%d","smoothvec", i, level );
+               hypre_sprintf(new_file, "%s.%d.level.%d", "smoothvec", i, level );
                if (sv)
+               {
                   hypre_SeqVectorPrint(sv, new_file);
+               }
             }
 
             hypre_SeqVectorDestroy(sv);
@@ -384,9 +401,11 @@ hypre_BoomerAMG_GMExpandInterp( hypre_ParCSRMatrix *A,
       P_CSR = hypre_ParCSRMatrixToCSRMatrixAll(A);
       if (!myid)
       {
-         hypre_sprintf(new_file,"%s.level.%d","A", level );
+         hypre_sprintf(new_file, "%s.level.%d", "A", level );
          if (P_CSR)
+         {
             hypre_CSRMatrixPrint(P_CSR, new_file);
+         }
       }
 
       hypre_CSRMatrixDestroy(P_CSR);
@@ -404,13 +423,17 @@ hypre_BoomerAMG_GMExpandInterp( hypre_ParCSRMatrix *A,
 
    /* add Q? */
    /* only on first level for variants other than 2 */
-   if (variant ==2 || level == interp_vec_first_level)
+   if (variant == 2 || level == interp_vec_first_level)
+   {
       add_q = 1;
+   }
 
 
    /* modify P_s? */
    if (variant == 2)
+   {
       modify = 1;
+   }
 
    /* use different values to truncate? */
    if (variant == 1 )
@@ -423,7 +446,7 @@ hypre_BoomerAMG_GMExpandInterp( hypre_ParCSRMatrix *A,
    /* First we need to make room for the new entries to P*/
 
    /*number of coarse variables for each unknown */
-   ncv_peru = ncv/num_functions;
+   ncv_peru = ncv / num_functions;
 
    if (level == interp_vec_first_level)
    {
@@ -443,9 +466,13 @@ hypre_BoomerAMG_GMExpandInterp( hypre_ParCSRMatrix *A,
       if (weights == NULL)
       {
          if (orig_nf == 2)
+         {
             theta = theta_2D;
+         }
          else
+         {
             theta = theta_3D;
+         }
       }
       else
       {
@@ -454,8 +481,8 @@ hypre_BoomerAMG_GMExpandInterp( hypre_ParCSRMatrix *A,
    }
 
 
-    /* if level = first_level, we need to fix the col numbering to leave
-    * space for the new unknowns */
+   /* if level = first_level, we need to fix the col numbering to leave
+   * space for the new unknowns */
 
    col_map = hypre_CTAlloc(HYPRE_Int,  ncv, HYPRE_MEMORY_HOST);
 
@@ -465,7 +492,7 @@ hypre_BoomerAMG_GMExpandInterp( hypre_ParCSRMatrix *A,
       {
          /* map from old col number to new col number (leave spaces
           * for new unknowns to be interleaved */
-         col_map[i] = i + (i/num_functions) * num_smooth_vecs;
+         col_map[i] = i + (i / num_functions) * num_smooth_vecs;
       }
    }
    else
@@ -481,23 +508,27 @@ hypre_BoomerAMG_GMExpandInterp( hypre_ParCSRMatrix *A,
    /* new number of nonzeros  - these are overestimates if level > first_level*/
 
    /* we will have the same sparsity in Q as in P */
-   new_nnz_diag = nnz_diag + nnz_diag*num_smooth_vecs;
-   new_nnz_offd = nnz_offd + nnz_offd*num_smooth_vecs;
+   new_nnz_diag = nnz_diag + nnz_diag * num_smooth_vecs;
+   new_nnz_offd = nnz_offd + nnz_offd * num_smooth_vecs;
 
    /* new number of coarse variables */
    if (level == interp_vec_first_level )
-      new_ncv = ncv + ncv_peru*num_smooth_vecs;
+   {
+      new_ncv = ncv + ncv_peru * num_smooth_vecs;
+   }
    else
-      new_ncv = ncv; /* unchanged on level > 0 */
+   {
+      new_ncv = ncv;   /* unchanged on level > 0 */
+   }
 
-   P_diag_j_new    = hypre_CTAlloc(HYPRE_Int,  new_nnz_diag, HYPRE_MEMORY_DEVICE);
-   P_diag_data_new = hypre_CTAlloc(HYPRE_Real, new_nnz_diag, HYPRE_MEMORY_DEVICE);
-   P_diag_i_new    = hypre_CTAlloc(HYPRE_Int,  nv + 1,       HYPRE_MEMORY_DEVICE);
+   P_diag_j_new    = hypre_CTAlloc(HYPRE_Int,  new_nnz_diag, memory_location_P);
+   P_diag_data_new = hypre_CTAlloc(HYPRE_Real, new_nnz_diag, memory_location_P);
+   P_diag_i_new    = hypre_CTAlloc(HYPRE_Int,  nv + 1,       memory_location_P);
 
    P_offd_j_big    = hypre_CTAlloc(HYPRE_BigInt, new_nnz_offd, HYPRE_MEMORY_HOST);
-   P_offd_j_new    = hypre_CTAlloc(HYPRE_Int,    new_nnz_offd, HYPRE_MEMORY_DEVICE);
-   P_offd_data_new = hypre_CTAlloc(HYPRE_Real,   new_nnz_offd, HYPRE_MEMORY_DEVICE);
-   P_offd_i_new    = hypre_CTAlloc(HYPRE_Int,    nv + 1,       HYPRE_MEMORY_DEVICE);
+   P_offd_j_new    = hypre_CTAlloc(HYPRE_Int,    new_nnz_offd, memory_location_P);
+   P_offd_data_new = hypre_CTAlloc(HYPRE_Real,   new_nnz_offd, memory_location_P);
+   P_offd_i_new    = hypre_CTAlloc(HYPRE_Int,    nv + 1,       memory_location_P);
 
    P_diag_i_new[0] = P_diag_i[0];
    P_offd_i_new[0] = P_offd_i[0];
@@ -509,28 +540,30 @@ hypre_BoomerAMG_GMExpandInterp( hypre_ParCSRMatrix *A,
       {
          /* what is max elements per row? */
          q_count = 0;
-         for (i=0; i < num_rows_P; i++)
+         for (i = 0; i < num_rows_P; i++)
          {
-            num_elements = P_diag_i[i+1]-P_diag_i[i];
-            num_elements += (P_offd_i[i+1]-P_offd_i[i]);
+            num_elements = P_diag_i[i + 1] - P_diag_i[i];
+            num_elements += (P_offd_i[i + 1] - P_offd_i[i]);
 
-            if (num_elements > q_count) q_count = num_elements;
+            if (num_elements > q_count) { q_count = num_elements; }
          }
 
-         q_alloc =  q_count*(num_smooth_vecs + 1);
-         q_data = hypre_CTAlloc(HYPRE_Real,  q_alloc , HYPRE_MEMORY_HOST);
-         q_trunc_data = hypre_CTAlloc(HYPRE_Real,  q_alloc , HYPRE_MEMORY_HOST);
-         is_q = hypre_CTAlloc(HYPRE_Int,  q_alloc , HYPRE_MEMORY_HOST);
+         q_alloc =  q_count * (num_smooth_vecs + 1);
+         q_data = hypre_CTAlloc(HYPRE_Real,  q_alloc, HYPRE_MEMORY_HOST);
+         q_trunc_data = hypre_CTAlloc(HYPRE_Real,  q_alloc, HYPRE_MEMORY_HOST);
+         is_q = hypre_CTAlloc(HYPRE_Int,  q_alloc, HYPRE_MEMORY_HOST);
          aux_data = hypre_CTAlloc(HYPRE_Real,  q_alloc, HYPRE_MEMORY_HOST);
          aux_j = hypre_CTAlloc(HYPRE_BigInt,  q_alloc, HYPRE_MEMORY_HOST);
-         is_diag = hypre_CTAlloc(HYPRE_Int,  q_alloc , HYPRE_MEMORY_HOST);
+         is_diag = hypre_CTAlloc(HYPRE_Int,  q_alloc, HYPRE_MEMORY_HOST);
 
 
          /* for truncation routines */
-         q_count_sv = hypre_CTAlloc(HYPRE_Int,  num_smooth_vecs, HYPRE_MEMORY_HOST); /* number of new q entries for each smoothvec */
+         q_count_sv = hypre_CTAlloc(HYPRE_Int,  num_smooth_vecs,
+                                    HYPRE_MEMORY_HOST); /* number of new q entries for each smoothvec */
          num_lost_sv = hypre_CTAlloc(HYPRE_Int,  num_smooth_vecs, HYPRE_MEMORY_HOST); /* value dropped */
          lost_counter_q_sv = hypre_CTAlloc(HYPRE_Int,  num_smooth_vecs, HYPRE_MEMORY_HOST);
-         lost_value_sv = hypre_CTAlloc(HYPRE_Real,  num_smooth_vecs, HYPRE_MEMORY_HOST); /* how many to drop */
+         lost_value_sv = hypre_CTAlloc(HYPRE_Real,  num_smooth_vecs,
+                                       HYPRE_MEMORY_HOST); /* how many to drop */
          q_dist_value_sv = hypre_CTAlloc(HYPRE_Real,  num_smooth_vecs, HYPRE_MEMORY_HOST); ;
       }
    }
@@ -538,7 +571,7 @@ hypre_BoomerAMG_GMExpandInterp( hypre_ParCSRMatrix *A,
    /* create the coarse to fine*/
    coarse_to_fine = hypre_CTAlloc(HYPRE_Int,  ncv, HYPRE_MEMORY_HOST);
    coarse_counter = 0;
-   for (i=0; i < num_rows_P; i++)
+   for (i = 0; i < num_rows_P; i++)
    {
       if (CF_marker[i] >= 0)
       {
@@ -554,10 +587,10 @@ hypre_BoomerAMG_GMExpandInterp( hypre_ParCSRMatrix *A,
       HYPRE_Int start, c_index;
       hypre_ParCSRCommHandle  *comm_handle;
 
-      smooth_vec_offd =  hypre_CTAlloc(HYPRE_Real,  num_cols_P_offd*num_smooth_vecs, HYPRE_MEMORY_HOST);
+      smooth_vec_offd =  hypre_CTAlloc(HYPRE_Real,  num_cols_P_offd * num_smooth_vecs, HYPRE_MEMORY_HOST);
 
       /* for now, do a seperate comm for each smooth vector */
-      for (k = 0; k< num_smooth_vecs; k++)
+      for (k = 0; k < num_smooth_vecs; k++)
       {
 
          vector = smooth_vecs[k];
@@ -565,23 +598,22 @@ hypre_BoomerAMG_GMExpandInterp( hypre_ParCSRMatrix *A,
 
          num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
          dbl_buf_data = hypre_CTAlloc(HYPRE_Real,  hypre_ParCSRCommPkgSendMapStart(comm_pkg,
-                                                                              num_sends), HYPRE_MEMORY_HOST);
+                                                                                   num_sends), HYPRE_MEMORY_HOST);
          /* point into smooth_vec_offd */
-         offd_vec_data =  smooth_vec_offd + k*num_cols_P_offd;
+         offd_vec_data =  smooth_vec_offd + k * num_cols_P_offd;
 
          index = 0;
          for (i = 0; i < num_sends; i++)
          {
             start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-            for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+            for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
             {
                /* we need to do the coarse/fine conversion here */
-               c_index = hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j);
+               c_index = hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j);
                fine_index = coarse_to_fine[c_index];
 
                dbl_buf_data[index++] = vec_data[fine_index];
             }
-
          }
 
          comm_handle = hypre_ParCSRCommHandleCreate( 1, comm_pkg, dbl_buf_data,
@@ -602,13 +634,13 @@ hypre_BoomerAMG_GMExpandInterp( hypre_ParCSRMatrix *A,
    orig_diag_start = 0;
    orig_offd_start = 0;
 
-   for (i=0; i < num_rows_P; i++)
+   for (i = 0; i < num_rows_P; i++)
    {
 
       q_count = 0; /* number of entries of q added for this row */
 
       /* zero entries */
-      for (j = 0; j< q_alloc; j++)
+      for (j = 0; j < q_alloc; j++)
       {
          is_q[j] = 0;
          q_data[j] = 0.0;
@@ -619,11 +651,14 @@ hypre_BoomerAMG_GMExpandInterp( hypre_ParCSRMatrix *A,
       fcn_num = (HYPRE_Int) fmod(i, num_functions);
 
       if (fcn_num != dof_func[i])
-         hypre_error_w_msg(HYPRE_ERROR_GENERIC,"WARNING - ROWS incorrectly ordered in hypre_BoomerAMG_GMExpandInterp!\n");
+      {
+         hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                           "WARNING - ROWS incorrectly ordered in hypre_BoomerAMG_GMExpandInterp!\n");
+      }
 
       /* number of elements in row */
-      num_diag_elements = P_diag_i[i+1] - orig_diag_start;
-      num_offd_elements = P_offd_i[i+1] - orig_offd_start;
+      num_diag_elements = P_diag_i[i + 1] - orig_diag_start;
+      num_offd_elements = P_offd_i[i + 1] - orig_offd_start;
 
       /* loop through elements - copy each to new_P and create Q corresp to
          each smooth vec for the orig functions */
@@ -634,35 +669,37 @@ hypre_BoomerAMG_GMExpandInterp( hypre_ParCSRMatrix *A,
       if (fcn_num < orig_nf)
       {
 
-
+         row_sum = 1.0;
          if ((variant == 1 || variant == 2) && add_q)
          {
             /* calc. row sum */
             row_sum = 0.0;
-            for (j=0; j < num_diag_elements; j++)
+            for (j = 0; j < num_diag_elements; j++)
             {
-               row_sum +=  P_diag_data[orig_diag_start+j];
+               row_sum +=  P_diag_data[orig_diag_start + j];
             }
-            for (j=0; j < num_offd_elements; j++)
+            for (j = 0; j < num_offd_elements; j++)
             {
-               row_sum +=  P_offd_data[orig_offd_start+j];
+               row_sum +=  P_offd_data[orig_offd_start + j];
             }
 
             num_elements = num_diag_elements + num_offd_elements;
 
-            if (num_elements && fabs(row_sum) < 1e-15)
+            if (num_elements && hypre_abs(row_sum) < 1e-15)
+            {
                row_sum = 1.0;
+            }
          }
 
          /**** first do diag elements *****/
-         for (j=0; j < num_diag_elements; j++)
+         for (j = 0; j < num_diag_elements; j++)
          {
 
             /* first copy original entry corresponding to P */
-            new_col = col_map[P_diag_j[orig_diag_start+j]];
+            new_col = col_map[P_diag_j[orig_diag_start + j]];
 
             P_diag_j_new[j_diag_pos] = new_col;
-            P_diag_data_new[j_diag_pos] = P_diag_data[orig_diag_start+j];
+            P_diag_data_new[j_diag_pos] = P_diag_data[orig_diag_start + j];
             j_diag_pos++;
             p_count_diag++;
 
@@ -685,49 +722,54 @@ hypre_BoomerAMG_GMExpandInterp( hypre_ParCSRMatrix *A,
                   new_col = cur_col + (HYPRE_BigInt)((orig_nf - fcn_num) + k);
 
                   /* Determine the Q entry value*/
-                  if (variant == 2 )
+                  if (variant == 2)
                   {
                      /*HYPRE_Real dt;*/
                      /* Q: P_ij(v_i/row_sum - vc_j) - ** notice we use fine and coarse smooth vecs */
-
-                     index = P_diag_j[orig_diag_start+j]; /* don't want to use col_map here
+                     index = P_diag_j[orig_diag_start + j]; /* don't want to use col_map here
                                                              because we will index into
                                                              the smooth vector */
                      fine_index = coarse_to_fine[index];
 
                      /*dt =  P_diag_data[orig_diag_start+j];
                      dt = (vec_data[i]/row_sum - vec_data[fine_index]);*/
-                     value  = P_diag_data[orig_diag_start+j]*(vec_data[i]/row_sum - vec_data[fine_index]);
-
+                     value = P_diag_data[orig_diag_start + j] *
+                             (vec_data[i] / row_sum - vec_data[fine_index]);
                   }
 
                   else /* variant 1 */
                   {
                      /* create new entry for Q: P_ij*v_i /sum(P_ij)*/
-                     value = (P_diag_data[orig_diag_start+j]*vec_data[i])/row_sum;
+                     value = (P_diag_data[orig_diag_start + j] * vec_data[i]) / row_sum;
 
                      if (abs_trunc > 0.0  && use_trunc_data )
                      {
-                        fine_index = P_diag_j[orig_diag_start+j];
+                        fine_index = P_diag_j[orig_diag_start + j];
                         fine_index = coarse_to_fine[fine_index];
 
-
-                        /* this is Tzanios's suggestion */
+                        /* this is Tzanio's suggestion */
                         if (vec_data[fine_index] != 0.0 )
-                           trunc_value =  P_diag_data[orig_diag_start+j]*(vec_data[i])/(vec_data[fine_index]);
+                        {
+                           trunc_value = P_diag_data[orig_diag_start + j] * (vec_data[i]) /
+                                         (vec_data[fine_index]);
+                        }
                         else
-                           trunc_value =  P_diag_data[orig_diag_start+j]*(vec_data[i]);
+                        {
+                           trunc_value = P_diag_data[orig_diag_start + j] * (vec_data[i]);
+                        }
                      }
 
                   } /* end of var 2 */
 
                   /* add the new entry to to P */
-                  if (fabs(value) > 0.0)
+                  if (hypre_abs(value) > 0.0)
                   {
                      if (q_max > 0 || abs_trunc > 0.0)
                      {
                         if (use_trunc_data)
-                           q_trunc_data[p_count_diag] = trunc_value; /* note that this goes in the p_count entry to line
+                        {
+                           q_trunc_data[p_count_diag] = trunc_value;
+                        } /* note that this goes in the p_count entry to line
                                                                         up with is_q */
                         is_q[p_count_diag] = k + 1; /* so we know which k*/
                         q_data[q_count++] = value;
@@ -743,12 +785,12 @@ hypre_BoomerAMG_GMExpandInterp( hypre_ParCSRMatrix *A,
 
          /**** now do offd elements *****/
          p_count_offd = p_count_diag;
-         for (j=0; j < num_offd_elements; j++)
+         for (j = 0; j < num_offd_elements; j++)
          {
             /* first copy original entry corresponding to P (but j
                needs to go back to regular numbering - will be
                compressed later when col_map_offd is generated*/
-            index = P_offd_j[orig_offd_start+j];
+            index = P_offd_j[orig_offd_start + j];
 
             /* convert to the global col number using col_map_offd */
             big_index = col_map_offd_P[index];
@@ -757,7 +799,7 @@ hypre_BoomerAMG_GMExpandInterp( hypre_ParCSRMatrix *A,
              * use col_map[index]*/
             if (num_smooth_vecs && (level == interp_vec_first_level))
             {
-               big_new_col = big_index + (big_index/(HYPRE_BigInt)num_functions) * (HYPRE_BigInt)num_smooth_vecs;
+               big_new_col = big_index + (big_index / (HYPRE_BigInt)num_functions) * (HYPRE_BigInt)num_smooth_vecs;
             }
             else /* no adjustment */
             {
@@ -765,7 +807,7 @@ hypre_BoomerAMG_GMExpandInterp( hypre_ParCSRMatrix *A,
             }
 
             P_offd_j_big[j_offd_pos] = big_new_col;
-            P_offd_data_new[j_offd_pos] = P_offd_data[orig_offd_start+j];
+            P_offd_data_new[j_offd_pos] = P_offd_data[orig_offd_start + j];
             j_offd_pos++;
             p_count_offd++;
 
@@ -784,7 +826,7 @@ hypre_BoomerAMG_GMExpandInterp( hypre_ParCSRMatrix *A,
                   vec_data = hypre_VectorData(hypre_ParVectorLocalVector(vector));
 
                   /* point to the offd smooth vector */
-                  offd_vec_data = smooth_vec_offd + k*num_cols_P_offd;
+                  offd_vec_data = smooth_vec_offd + k * num_cols_P_offd;
 
                   /* add an entry */
 
@@ -797,7 +839,7 @@ hypre_BoomerAMG_GMExpandInterp( hypre_ParCSRMatrix *A,
                      /*HYPRE_Real dt;*/
                      /* Q: P_ij(v_i/row_sum - vc_j) - * notice we use fine and coarse smooth vecs */
 
-                     index = P_offd_j[orig_offd_start+j]; /* don't want to use col_map here
+                     index = P_offd_j[orig_offd_start + j]; /* don't want to use col_map here
                                                              because we will index into
                                                              the smooth vector */
 
@@ -806,7 +848,7 @@ hypre_BoomerAMG_GMExpandInterp( hypre_ParCSRMatrix *A,
                      /*dt =  P_offd_data[orig_offd_start+j];
                      dt = (vec_data[i]/row_sum - offd_vec_data[index]);*/
 
-                     value  = P_offd_data[orig_offd_start+j]*(vec_data[i]/row_sum - offd_vec_data[index]);
+                     value  = P_offd_data[orig_offd_start + j] * (vec_data[i] / row_sum - offd_vec_data[index]);
 
 
                      /* dt = (vec_data[i]/row_sum - c_vec_data[cur_col]);
@@ -817,29 +859,35 @@ hypre_BoomerAMG_GMExpandInterp( hypre_ParCSRMatrix *A,
                   else /* variant 1 */
                   {
                      /* create new entry for Q: P_ij*v_i /sum(P_ij)*/
-                     value = (P_offd_data[orig_offd_start+j]*vec_data[i])/row_sum;
+                     value = (P_offd_data[orig_offd_start + j] * vec_data[i]) / row_sum;
 
                      if (abs_trunc > 0.0  && use_trunc_data )
                      {
-                        index = P_offd_j[orig_offd_start+j];
-
+                        index = P_offd_j[orig_offd_start + j];
 
-                        /* this is Tzanios's suggestion */
+                        /* this is Tzanio's suggestion */
                         if (offd_vec_data[fine_index] != 0.0 )
-                           trunc_value =  P_offd_data[orig_offd_start+j]*(vec_data[i])/(offd_vec_data[index]);
+                        {
+                           trunc_value = P_offd_data[orig_offd_start + j] * (vec_data[i]) /
+                                         (offd_vec_data[index]);
+                        }
                         else
-                           trunc_value =  P_offd_data[orig_offd_start+j]*(vec_data[i]);
+                        {
+                           trunc_value =  P_offd_data[orig_offd_start + j] * (vec_data[i]);
+                        }
                      }
 
                   } /* end of var 2 */
 
                   /* add the new entry to to P */
-                  if (fabs(value) > 0.0)
+                  if (hypre_abs(value) > 0.0)
                   {
                      if (q_max > 0 || abs_trunc > 0.0)
                      {
                         if (use_trunc_data)
-                           q_trunc_data[p_count_offd] = trunc_value; /* note that this goes in the p_count entry to line
+                        {
+                           q_trunc_data[p_count_offd] = trunc_value;
+                        } /* note that this goes in the p_count entry to line
                                                                         up with is_q */
                         is_q[p_count_offd] = k + 1; /* so we know which k*/
                         q_data[q_count++] = value;
@@ -866,18 +914,18 @@ hypre_BoomerAMG_GMExpandInterp( hypre_ParCSRMatrix *A,
             /*HYPRE_Real tmp;*/
 
             /**** first do diag elements *****/
-            for (j=0; j < num_diag_elements; j++)
+            for (j = 0; j < num_diag_elements; j++)
             {
                m_val = 0.0;
-               for (m = 0; m< orig_nf; m++)
+               for (m = 0; m < orig_nf; m++)
                {
-                  m_pos = P_diag_i[i - (fcn_num - m)]+ j; /* recall - nodal coarsening */
+                  m_pos = P_diag_i[i - (fcn_num - m)] + j; /* recall - nodal coarsening */
                   /*tmp = P_diag_data[m_pos];*/
-                  m_val += theta[m]*P_diag_data[m_pos];
+                  m_val += theta[m] * P_diag_data[m_pos];
                }
 
                /*m_val = m_val/orig_nf;*/
-               P_diag_j_new[j_diag_pos] = P_diag_j[orig_diag_start+j];
+               P_diag_j_new[j_diag_pos] = P_diag_j[orig_diag_start + j];
                P_diag_data_new[j_diag_pos++] = m_val;
                p_count_diag++;
             }
@@ -886,18 +934,18 @@ hypre_BoomerAMG_GMExpandInterp( hypre_ParCSRMatrix *A,
                will be compressed later when col_map_offd is
                generated*/
             p_count_offd = p_count_diag;
-            for (j=0; j < num_offd_elements; j++)
+            for (j = 0; j < num_offd_elements; j++)
             {
                m_val = 0.0;
-               for (m = 0; m< orig_nf; m++)
+               for (m = 0; m < orig_nf; m++)
                {
-                  m_pos = P_offd_i[i - (fcn_num - m)]+ j; /* recall - nodal coarsening */
+                  m_pos = P_offd_i[i - (fcn_num - m)] + j; /* recall - nodal coarsening */
                   /*tmp = P_offd_data[m_pos];*/
-                  m_val += theta[m]*P_offd_data[m_pos];
+                  m_val += theta[m] * P_offd_data[m_pos];
                }
 
                /*m_val = m_val/orig_nf;*/
-               index = P_offd_j[orig_offd_start+j];
+               index = P_offd_j[orig_offd_start + j];
                big_index = col_map_offd_P[index];
 
                P_offd_j_big[j_offd_pos] = big_index;
@@ -909,10 +957,10 @@ hypre_BoomerAMG_GMExpandInterp( hypre_ParCSRMatrix *A,
                  unk-based interp on new dof */
          {
             /**** first do diag elements *****/
-            for (j=0; j < num_diag_elements; j++)
+            for (j = 0; j < num_diag_elements; j++)
             {
-               P_diag_j_new[j_diag_pos] = P_diag_j[orig_diag_start+j];
-               P_diag_data_new[j_diag_pos++] = P_diag_data[orig_diag_start+j];
+               P_diag_j_new[j_diag_pos] = P_diag_j[orig_diag_start + j];
+               P_diag_data_new[j_diag_pos++] = P_diag_data[orig_diag_start + j];
                p_count_diag++;
             }
             /**** now offd elements *****/
@@ -920,13 +968,13 @@ hypre_BoomerAMG_GMExpandInterp( hypre_ParCSRMatrix *A,
                will be compressed later when col_map_offd is
                generated*/
             p_count_offd = p_count_diag;
-            for (j=0; j < num_offd_elements; j++)
+            for (j = 0; j < num_offd_elements; j++)
             {
-               index = P_offd_j[orig_offd_start+j];
+               index = P_offd_j[orig_offd_start + j];
                big_index = col_map_offd_P[index];
 
                P_offd_j_big[j_offd_pos] = big_index;
-               P_offd_data_new[j_offd_pos++] = P_offd_data[orig_offd_start+j];
+               P_offd_data_new[j_offd_pos++] = P_offd_data[orig_offd_start + j];
                p_count_offd++;
             }
 
@@ -970,7 +1018,7 @@ hypre_BoomerAMG_GMExpandInterp( hypre_ParCSRMatrix *A,
             j_counter = 0;
 
             /* diag loop */
-            for(j =  P_diag_i_new[i]; j <  P_diag_i_new[i] + p_count_diag; j++)
+            for (j =  P_diag_i_new[i]; j <  P_diag_i_new[i] + p_count_diag; j++)
             {
                if (is_q[j_counter]) /* if > 0 then belongs to q */
                {
@@ -978,9 +1026,13 @@ hypre_BoomerAMG_GMExpandInterp( hypre_ParCSRMatrix *A,
                   q_count_sv[which_q]++;
 
                   if (!use_trunc_data)
-                     value = fabs(P_diag_data_new[j]);
+                  {
+                     value = hypre_abs(P_diag_data_new[j]);
+                  }
                   else
-                     value = fabs(q_trunc_data[j_counter]);
+                  {
+                     value = hypre_abs(q_trunc_data[j_counter]);
+                  }
 
                   if (value < abs_trunc )
                   {
@@ -991,7 +1043,7 @@ hypre_BoomerAMG_GMExpandInterp( hypre_ParCSRMatrix *A,
                j_counter++;
             }
             /* offd loop  - don't reset j_counter*/
-            for(j =  P_offd_i_new[i]; j <  P_offd_i_new[i] + p_count_offd; j++)
+            for (j =  P_offd_i_new[i]; j <  P_offd_i_new[i] + p_count_offd; j++)
             {
                if (is_q[j_counter]) /* if > 0 then belongs to q */
                {
@@ -999,9 +1051,13 @@ hypre_BoomerAMG_GMExpandInterp( hypre_ParCSRMatrix *A,
                   q_count_sv[which_q]++;
 
                   if (!use_trunc_data)
-                     value = fabs(P_offd_data_new[j]);
+                  {
+                     value = hypre_abs(P_offd_data_new[j]);
+                  }
                   else
-                     value = fabs(q_trunc_data[j_counter]);
+                  {
+                     value = hypre_abs(q_trunc_data[j_counter]);
+                  }
 
                   if (value < abs_trunc )
                   {
@@ -1031,7 +1087,7 @@ hypre_BoomerAMG_GMExpandInterp( hypre_ParCSRMatrix *A,
                {
                   if ((q_count_sv[j] - num_lost_sv[j]) > 0)
                   {
-                     q_dist_value_sv[j] = lost_value_sv[j]/(q_count_sv[j] - num_lost_sv[j]);
+                     q_dist_value_sv[j] = lost_value_sv[j] / (q_count_sv[j] - num_lost_sv[j]);
                   }
                }
 
@@ -1040,12 +1096,16 @@ hypre_BoomerAMG_GMExpandInterp( hypre_ParCSRMatrix *A,
 
                /* diag entries  */
                new_diag_pos =  P_diag_i_new[i];
-               for(j =  P_diag_i_new[i]; j <  P_diag_i_new[i] + p_count_diag; j++)
+               for (j =  P_diag_i_new[i]; j <  P_diag_i_new[i] + p_count_diag; j++)
                {
                   if (!use_trunc_data)
-                     value = fabs(P_diag_data_new[j]);
+                  {
+                     value = hypre_abs(P_diag_data_new[j]);
+                  }
                   else
-                     value = fabs(q_trunc_data[j_counter]);
+                  {
+                     value = hypre_abs(q_trunc_data[j_counter]);
+                  }
 
                   if ( is_q[j_counter] && (value < abs_trunc) )
                   {
@@ -1076,12 +1136,16 @@ hypre_BoomerAMG_GMExpandInterp( hypre_ParCSRMatrix *A,
 
                /* offd entries */
                new_offd_pos =  P_offd_i_new[i];
-               for(j =  P_offd_i_new[i]; j <  P_offd_i_new[i] + p_count_offd; j++)
+               for (j =  P_offd_i_new[i]; j <  P_offd_i_new[i] + p_count_offd; j++)
                {
                   if (!use_trunc_data)
-                     value = fabs(P_offd_data_new[j]);
+                  {
+                     value = hypre_abs(P_offd_data_new[j]);
+                  }
                   else
-                     value = fabs(q_trunc_data[j_counter]);
+                  {
+                     value = hypre_abs(q_trunc_data[j_counter]);
+                  }
 
 
                   if ( is_q[j_counter] && (value < abs_trunc) )
@@ -1120,7 +1184,9 @@ hypre_BoomerAMG_GMExpandInterp( hypre_ParCSRMatrix *A,
 
 
                if (tot_num_lost != (lost_counter_diag + lost_counter_offd))
-                  hypre_error_w_msg(HYPRE_ERROR_GENERIC,"hypre_BoomerAMG_GMExpandInterp: 1st Truncation error \n");
+               {
+                  hypre_error_w_msg(HYPRE_ERROR_GENERIC, "hypre_BoomerAMG_GMExpandInterp: 1st Truncation error \n");
+               }
 
             }/* end of num_lost */
 
@@ -1157,7 +1223,7 @@ hypre_BoomerAMG_GMExpandInterp( hypre_ParCSRMatrix *A,
                j_counter++;
             }
             /* offd loop  - don't reset j_counter*/
-            for(j =  P_offd_i_new[i]; j <  P_offd_i_new[i] + p_count_offd; j++)
+            for (j =  P_offd_i_new[i]; j <  P_offd_i_new[i] + p_count_offd; j++)
             {
                if (is_q[j_counter]) /* if > 0 then belongs to q */
                {
@@ -1182,7 +1248,9 @@ hypre_BoomerAMG_GMExpandInterp( hypre_ParCSRMatrix *A,
                num_lost_sv[j] =  q_count_sv[j] - q_max;;
                /* don't want num_lost to be negative */
                if (num_lost_sv[j] < 0)
+               {
                   num_lost_sv[j] = 0;
+               }
                tot_num_lost +=  num_lost_sv[j];
             }
 
@@ -1192,7 +1260,7 @@ hypre_BoomerAMG_GMExpandInterp( hypre_ParCSRMatrix *A,
                p_count_tot = p_count_diag + p_count_offd;
 
                /* only keep q_max elements - get rid of smallest */
-               hypre_BigQsort4_abs(aux_data, aux_j, is_q, is_diag, 0 , p_count_tot -1);
+               hypre_BigQsort4_abs(aux_data, aux_j, is_q, is_diag, 0, p_count_tot - 1);
 
                lost_counter_diag = 0;
                lost_counter_offd = 0;
@@ -1203,7 +1271,7 @@ hypre_BoomerAMG_GMExpandInterp( hypre_ParCSRMatrix *A,
                new_j_counter = 0;
 
                /* have to do diag and offd together because of sorting*/
-               for(j =  0; j < p_count_tot; j++)
+               for (j =  0; j < p_count_tot; j++)
                {
 
                   which_q = 0;
@@ -1231,7 +1299,7 @@ hypre_BoomerAMG_GMExpandInterp( hypre_ParCSRMatrix *A,
                      }
 
                      /* technically only need to do this the last time */
-                     q_dist_value_sv[which_q] = lost_value_sv[which_q]/q_max;
+                     q_dist_value_sv[which_q] = lost_value_sv[which_q] / q_max;
                   }
                   else
                   {
@@ -1279,20 +1347,22 @@ hypre_BoomerAMG_GMExpandInterp( hypre_ParCSRMatrix *A,
       }/* end of TRUNCATION */
 
       /* modify i */
-      orig_diag_start = P_diag_i[i+1];
-      orig_offd_start = P_offd_i[i+1];
+      orig_diag_start = P_diag_i[i + 1];
+      orig_offd_start = P_offd_i[i + 1];
 
-      P_diag_i_new[i+1] = P_diag_i_new[i] + p_count_diag;
-      P_offd_i_new[i+1] = P_offd_i_new[i] + p_count_offd;
+      P_diag_i_new[i + 1] = P_diag_i_new[i] + p_count_diag;
+      P_offd_i_new[i + 1] = P_offd_i_new[i] + p_count_offd;
 
 
-      if (j_diag_pos != P_diag_i_new[i+1])
+      if (j_diag_pos != P_diag_i_new[i + 1])
       {
-         hypre_error_w_msg(HYPRE_ERROR_GENERIC,"Warning - diag Row Problem in hypre_BoomerAMG_GMExpandInterp!\n");
+         hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                           "Warning - diag Row Problem in hypre_BoomerAMG_GMExpandInterp!\n");
       }
-      if (j_offd_pos != P_offd_i_new[i+1])
+      if (j_offd_pos != P_offd_i_new[i + 1])
       {
-         hypre_error_w_msg(HYPRE_ERROR_GENERIC,"Warning - off-diag Row Problem in hypre_BoomerAMG_GMExpandInterp!\n");
+         hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                           "Warning - off-diag Row Problem in hypre_BoomerAMG_GMExpandInterp!\n");
 
       }
 
@@ -1302,18 +1372,19 @@ hypre_BoomerAMG_GMExpandInterp( hypre_ParCSRMatrix *A,
    /* Done looping through rows - NOW FINISH THINGS UP! */
 
    /* if level = first_level , we need to update the number of
-  * funcs and the dof_func */
+   * funcs and the dof_func */
 
    if (level == interp_vec_first_level )
    {
       HYPRE_Int spot;
 
-      c_dof_func = hypre_TReAlloc_v2(c_dof_func,  HYPRE_Int, hypre_IntArraySize(*coarse_dof_func), HYPRE_Int,  new_ncv, hypre_IntArrayMemoryLocation(*coarse_dof_func));
+      c_dof_func = hypre_TReAlloc_v2(c_dof_func,  HYPRE_Int, hypre_IntArraySize(*coarse_dof_func),
+                                     HYPRE_Int,  new_ncv, hypre_IntArrayMemoryLocation(*coarse_dof_func));
       spot = 0;
 
       for (i = 0; i < ncv_peru; i++)
       {
-         for (k = 0; k< num_functions + num_smooth_vecs; k++)
+         for (k = 0; k < num_functions + num_smooth_vecs; k++)
          {
             c_dof_func[spot++] = k;
          }
@@ -1331,12 +1402,11 @@ hypre_BoomerAMG_GMExpandInterp( hypre_ParCSRMatrix *A,
 
       /* assumes that unknowns are together on a procsessor with
        * nodal coarsening  */
-      new_col_starts =  hypre_CTAlloc(HYPRE_BigInt, 2, HYPRE_MEMORY_HOST);
-      new_col_starts[0] = (col_starts[0]/(HYPRE_BigInt)num_functions)*(HYPRE_BigInt)new_nf ;
-      new_col_starts[1] = (col_starts[1]/(HYPRE_BigInt)num_functions)*(HYPRE_BigInt)new_nf;
+      new_col_starts[0] = (col_starts[0] / (HYPRE_BigInt)num_functions) * (HYPRE_BigInt)new_nf ;
+      new_col_starts[1] = (col_starts[1] / (HYPRE_BigInt)num_functions) * (HYPRE_BigInt)new_nf;
 
-      if (myid == (num_procs -1)) g_nc = new_col_starts[1];
-      hypre_MPI_Bcast(&g_nc, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
+      if (myid == (num_procs - 1)) { g_nc = new_col_starts[1]; }
+      hypre_MPI_Bcast(&g_nc, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
    }
    else /* not first level */
    {
@@ -1344,7 +1414,6 @@ hypre_BoomerAMG_GMExpandInterp( hypre_ParCSRMatrix *A,
       g_nc = hypre_ParCSRMatrixGlobalNumCols(*P);
 
       /* copy col starts */
-      new_col_starts =  hypre_CTAlloc(HYPRE_BigInt, 2, HYPRE_MEMORY_HOST);
       new_col_starts[0] = col_starts[0];
       new_col_starts[1] = col_starts[1];
    }
@@ -1373,8 +1442,6 @@ hypre_BoomerAMG_GMExpandInterp( hypre_ParCSRMatrix *A,
    hypre_CSRMatrixData(P_offd) = P_offd_data_new;
    hypre_CSRMatrixI(P_offd) = P_offd_i_new;
 
-   hypre_TFree(new_col_starts, HYPRE_MEMORY_HOST);
-
    /* If parallel we need to do the col map offd! */
    if (num_procs > 1)
    {
@@ -1392,16 +1459,18 @@ hypre_BoomerAMG_GMExpandInterp( hypre_ParCSRMatrix *A,
 
          /*first copy the j entries (these are GLOBAL numbers) */
          j_copy = hypre_CTAlloc(HYPRE_BigInt,  P_offd_new_size, HYPRE_MEMORY_HOST);
-         for (i=0; i < P_offd_new_size; i++)
+         for (i = 0; i < P_offd_new_size; i++)
+         {
             j_copy[i] = P_offd_j_big[i];
+         }
 
          /* now sort them */
-         hypre_BigQsort0(j_copy, 0, P_offd_new_size-1);
+         hypre_BigQsort0(j_copy, 0, P_offd_new_size - 1);
 
          /* now copy to col_map offd - but only each col once */
          new_col_map_offd_P[0] = j_copy[0];
          count = 0;
-         for (i=0; i < P_offd_new_size; i++)
+         for (i = 0; i < P_offd_new_size; i++)
          {
             if (j_copy[i] > new_col_map_offd_P[count])
             {
@@ -1412,10 +1481,10 @@ hypre_BoomerAMG_GMExpandInterp( hypre_ParCSRMatrix *A,
          num_cols_P_offd = count + 1;
 
          /* reset the j entries to be local */
-         for (i=0; i < P_offd_new_size; i++)
+         for (i = 0; i < P_offd_new_size; i++)
             P_offd_j_new[i] = hypre_BigBinarySearch(new_col_map_offd_P,
-                                                 P_offd_j_big[i],
-                                                 num_cols_P_offd);
+                                                    P_offd_j_big[i],
+                                                    num_cols_P_offd);
          hypre_TFree(j_copy, HYPRE_MEMORY_HOST);
       }
 
@@ -1439,9 +1508,11 @@ hypre_BoomerAMG_GMExpandInterp( hypre_ParCSRMatrix *A,
 
       if (!myid)
       {
-         hypre_sprintf(new_file,"%s.level.%d","P_new_new", level );
+         hypre_sprintf(new_file, "%s.level.%d", "P_new_new", level );
          if (P_CSR)
+         {
             hypre_CSRMatrixPrint(P_CSR, new_file);
+         }
       }
 
       hypre_CSRMatrixDestroy(P_CSR);
@@ -1494,9 +1565,9 @@ hypre_BoomerAMGRefineInterp( hypre_ParCSRMatrix *A,
                              HYPRE_Int *CF_marker,
                              HYPRE_Int level)
 {
-   HYPRE_Int i,j, k, pp;
+   HYPRE_UNUSED_VAR(level);
 
-   //printf(" hypre_BoomerAMGRefineInterp \n");
+   HYPRE_Int        i, j, k, pp;
    hypre_CSRMatrix *A_diag = hypre_ParCSRMatrixDiag(A);
    HYPRE_Real      *A_diag_data = hypre_CSRMatrixData(A_diag);
    HYPRE_Int       *A_diag_i = hypre_CSRMatrixI(A_diag);
@@ -1565,11 +1636,10 @@ hypre_BoomerAMGRefineInterp( hypre_ParCSRMatrix *A,
    HYPRE_Int       use_alt_w, kk, kk_count, cur_spot;
    HYPRE_Int       dist_coarse;
 
-   hypre_CSRMatrix *P_ext;
-
-   HYPRE_Real      *P_ext_data;
-   HYPRE_Int       *P_ext_i;
-   HYPRE_BigInt    *P_ext_j;
+   hypre_CSRMatrix *P_ext = NULL;
+   HYPRE_Real      *P_ext_data = NULL;
+   HYPRE_Int       *P_ext_i = NULL;
+   HYPRE_BigInt    *P_ext_j = NULL;
 
    HYPRE_Int        num_sends_A, index, start;
    HYPRE_Int        myid = 0, num_procs = 1;
@@ -1579,15 +1649,12 @@ hypre_BoomerAMGRefineInterp( hypre_ParCSRMatrix *A,
    HYPRE_Int       *int_buf_data = NULL;
    HYPRE_BigInt    *big_buf_data = NULL;
 
-
    if (!comm_pkg_P)
    {
-      hypre_MatvecCommPkgCreate ( P );
+      hypre_MatvecCommPkgCreate (P);
       comm_pkg_P = hypre_ParCSRMatrixCommPkg(P);
-
    }
-
-   comm   = hypre_ParCSRCommPkgComm(comm_pkg_A);
+   comm = hypre_ParCSRCommPkgComm(comm_pkg_A);
 
    hypre_MPI_Comm_size(comm, &num_procs);
    hypre_MPI_Comm_rank(comm, &myid);
@@ -1601,9 +1668,11 @@ hypre_BoomerAMGRefineInterp( hypre_ParCSRMatrix *A,
       P_CSR = hypre_ParCSRMatrixToCSRMatrixAll(P);
       if (!myid)
       {
-      hypre_sprintf(new_file,"%s.level.%d","P_new_orig", level );
-      if (P_CSR)
-         hypre_CSRMatrixPrint(P_CSR, new_file);
+         hypre_sprintf(new_file, "%s.level.%d", "P_new_orig", level );
+         if (P_CSR)
+         {
+            hypre_CSRMatrixPrint(P_CSR, new_file);
+         }
       }
 
       hypre_CSRMatrixDestroy(P_CSR);
@@ -1612,9 +1681,11 @@ hypre_BoomerAMGRefineInterp( hypre_ParCSRMatrix *A,
       P_CSR = hypre_ParCSRMatrixToCSRMatrixAll(A);
       if (!myid)
       {
-         hypre_sprintf(new_file,"%s.level.%d","A", level );
+         hypre_sprintf(new_file, "%s.level.%d", "A", level );
          if (P_CSR)
+         {
             hypre_CSRMatrixPrint(P_CSR, new_file);
+         }
       }
 
       hypre_CSRMatrixDestroy(P_CSR);
@@ -1626,14 +1697,14 @@ hypre_BoomerAMGRefineInterp( hypre_ParCSRMatrix *A,
 
    num_sends_A = hypre_ParCSRCommPkgNumSends(comm_pkg_A);
    big_buf_data = hypre_CTAlloc(HYPRE_BigInt, hypre_ParCSRCommPkgSendMapStart(comm_pkg_A,
-                                        num_sends_A), HYPRE_MEMORY_HOST);
+                                                                              num_sends_A), HYPRE_MEMORY_HOST);
    int_buf_data = hypre_CTAlloc(HYPRE_Int, hypre_ParCSRCommPkgSendMapStart(comm_pkg_A,
-                                        num_sends_A), HYPRE_MEMORY_HOST);
+                                                                           num_sends_A), HYPRE_MEMORY_HOST);
 
 
-/*-----------------------------------------------------------------------
- *  Send and receive fine_to_coarse info.
- *-----------------------------------------------------------------------*/
+   /*-----------------------------------------------------------------------
+    *  Send and receive fine_to_coarse info.
+    *-----------------------------------------------------------------------*/
    {
       HYPRE_BigInt my_first_cpt;
       HYPRE_Int tmp_i;
@@ -1642,10 +1713,10 @@ hypre_BoomerAMGRefineInterp( hypre_ParCSRMatrix *A,
 
       /* need a fine-to-coarse mapping (num row P = num rows A)*/
       fine_to_coarse = hypre_CTAlloc(HYPRE_Int,  num_rows_P, HYPRE_MEMORY_HOST);
-      for (i = 0; i < num_rows_P; i++) fine_to_coarse[i] = -1;
+      for (i = 0; i < num_rows_P; i++) { fine_to_coarse[i] = -1; }
 
       coarse_counter = 0;
-      for (i=0; i < num_rows_P; i++)
+      for (i = 0; i < num_rows_P; i++)
       {
          if (CF_marker[i] >= 0)
          {
@@ -1661,10 +1732,10 @@ hypre_BoomerAMGRefineInterp( hypre_ParCSRMatrix *A,
       for (i = 0; i < num_sends_A; i++)
       {
          start = hypre_ParCSRCommPkgSendMapStart(comm_pkg_A, i);
-         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg_A, i+1); j++)
+         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg_A, i + 1); j++)
          {
 
-            tmp_i = fine_to_coarse[hypre_ParCSRCommPkgSendMapElmt(comm_pkg_A,j)];
+            tmp_i = fine_to_coarse[hypre_ParCSRCommPkgSendMapElmt(comm_pkg_A, j)];
             big_buf_data[index++] = (HYPRE_BigInt)tmp_i + my_first_cpt; /* makes it global */
          }
 
@@ -1684,18 +1755,22 @@ hypre_BoomerAMGRefineInterp( hypre_ParCSRMatrix *A,
    {
 
       if (num_cols_A_offd)
+      {
          CF_marker_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_A_offd, HYPRE_MEMORY_HOST);
+      }
 
       if (num_functions > 1 && num_cols_A_offd)
+      {
          dof_func_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_A_offd, HYPRE_MEMORY_HOST);
+      }
 
       index = 0;
       for (i = 0; i < num_sends_A; i++)
       {
          start = hypre_ParCSRCommPkgSendMapStart(comm_pkg_A, i);
-         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg_A, i+1); j++)
+         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg_A, i + 1); j++)
          {
-            int_buf_data[index++] = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg_A,j)];
+            int_buf_data[index++] = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg_A, j)];
          }
 
       }
@@ -1710,10 +1785,10 @@ hypre_BoomerAMGRefineInterp( hypre_ParCSRMatrix *A,
          for (i = 0; i < num_sends_A; i++)
          {
             start = hypre_ParCSRCommPkgSendMapStart(comm_pkg_A, i);
-            for (j=start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg_A, i+1); j++)
+            for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg_A, i + 1); j++)
             {
                int_buf_data[index++]
-                  = dof_func[hypre_ParCSRCommPkgSendMapElmt(comm_pkg_A,j)];
+                  = dof_func[hypre_ParCSRCommPkgSendMapElmt(comm_pkg_A, j)];
             }
 
          }
@@ -1740,7 +1815,7 @@ hypre_BoomerAMGRefineInterp( hypre_ParCSRMatrix *A,
       {
          /* need the rows of P on other processors associated with
             the offd cols of A */
-         P_ext      = hypre_ParCSRMatrixExtractBExt(P,A,1);
+         P_ext      = hypre_ParCSRMatrixExtractBExt(P, A, 1);
          P_ext_i    = hypre_CSRMatrixI(P_ext);
          P_ext_j    = hypre_CSRMatrixBigJ(P_ext);
          P_ext_data = hypre_CSRMatrixData(P_ext);
@@ -1748,9 +1823,9 @@ hypre_BoomerAMGRefineInterp( hypre_ParCSRMatrix *A,
 
       index = 0;
       /* now check whether each col is in the diag of offd part of P)*/
-      for (i=0; i < num_cols_A_offd; i++)
+      for (i = 0; i < num_cols_A_offd; i++)
       {
-         for (j=P_ext_i[i]; j < P_ext_i[i+1]; j++)
+         for (j = P_ext_i[i]; j < P_ext_i[i + 1]; j++)
          {
             big_k = P_ext_j[j];
             /* is it in the diag ?*/
@@ -1762,12 +1837,12 @@ hypre_BoomerAMGRefineInterp( hypre_ParCSRMatrix *A,
             else
             {
                /* off diag entry */
-               kc = hypre_BigBinarySearch(col_map_offd_P, big_k ,num_cols_P_offd);
+               kc = hypre_BigBinarySearch(col_map_offd_P, big_k, num_cols_P_offd);
                /* now this corresponds to the location in the col_map_offd
                 ( so it is a local column number */
                if (kc > -1)
                {
-                  P_ext_j[index] = (HYPRE_BigInt)(-kc-1); /* make negative */
+                  P_ext_j[index] = (HYPRE_BigInt)(-kc - 1); /* make negative */
                   P_ext_data[index++] = P_ext_data[j];
                }
             }
@@ -1775,537 +1850,546 @@ hypre_BoomerAMGRefineInterp( hypre_ParCSRMatrix *A,
          P_ext_i[i] = index;
       }
       for (i = num_cols_A_offd; i > 0; i--)
-         P_ext_i[i] = P_ext_i[i-1];
+      {
+         P_ext_i[i] = P_ext_i[i - 1];
+      }
 
-      if (num_procs > 1) P_ext_i[0] = 0;
+      if (num_procs > 1) { P_ext_i[0] = 0; }
 
 
    } /* end of ghost rows */
 
 
-    /* initialized to zero */
-    P_diag_data_new = hypre_CTAlloc(HYPRE_Real,  P_diag_size, HYPRE_MEMORY_DEVICE);
-    P_offd_data_new = hypre_CTAlloc(HYPRE_Real,  P_offd_size, HYPRE_MEMORY_DEVICE);
-
-    j_diag_pos = 0;
-    j_offd_pos = 0;
-
-    /*-------------------------------------------------------------------
-     *loop through rows
-     *-------------------------------------------------------------------*/
-    for (i=0; i < num_rows_P; i++)
-    {
-       new_row_sum = 0.0;
-       use_alt_w = 0;
-       scale_row = 0;
-       orig_row_sum = 0.0;
-
-       fcn_num = (HYPRE_Int) fmod(i, num_functions);
-       if (fcn_num != dof_func[i])
-         hypre_error_w_msg(HYPRE_ERROR_GENERIC,"WARNING - ROWS incorrectly ordered in hypre_BoomerAMGRefineInterp!\n");
-
-       /* number of elements in row of p*/
-       orig_diag_start =  P_diag_i[i];
-       orig_offd_start =  P_offd_i[i];
-
-       /* number of elements in row */
-       p_num_diag_elements = P_diag_i[i+1] - orig_diag_start;
-       p_num_offd_elements = P_offd_i[i+1] - orig_offd_start;
-
-       if (CF_marker[i] >= 0) /* row corres. to coarse point - just copy orig */
-       {
-          /* diag */
-          for (j=0; j < p_num_diag_elements; j++)
-          {
-             P_diag_data_new[j_diag_pos++] = P_diag_data[orig_diag_start + j];
-          }
-          /*offd */
-          for (j=0; j < p_num_offd_elements; j++)
-          {
-             P_offd_data_new[j_offd_pos++] = P_offd_data[orig_offd_start + j];
-          }
-       }
-       else /* row is for fine point  - make new interpolation*/
-       {
-          /* make orig entries zero*/
-          for (j=0; j < p_num_diag_elements; j++)
-          {
-             orig_row_sum +=  P_diag_data[orig_diag_start + j];
-             P_diag_data_new[j_diag_pos++] = 0.0;
-          }
-           for (j=0; j < p_num_offd_elements; j++)
-          {
-             orig_row_sum +=  P_offd_data[orig_offd_start + j];
-             P_offd_data_new[j_offd_pos++] = 0.0;
-          }
-
-          /*get diagonal of A */
-          diagonal = A_diag_data[A_diag_i[i]];
-
-          /* loop over elements in row i of A (except diagonal element)*/
-          /* diag*/
-          for (j = A_diag_i[i]+1; j < A_diag_i[i+1]; j++)
-          {
-             j_point = A_diag_j[j];
-
-             /* only want like unknowns */
-             if (fcn_num != dof_func[j_point])
-                continue;
-
-             dist_coarse = 0;
-             a_ij = A_diag_data[j];
-
-             found = 0;
-             if (CF_marker[j_point] >= 0) /*coarse*/
-             {
-                j_point_c = fine_to_coarse[j_point];
-
-                /* find P(i,j_c) and put value there (there may not be
-                   an entry in P if this coarse connection was not a
-                   strong connection */
-
-                /* we are looping in the diag of this row, so we only
-                 * need to look in P_diag */
-                for (k = P_diag_i[i]; k < P_diag_i[i+1]; k ++)
-                {
-                   if (P_diag_j[k] == j_point_c)
-                   {
-                      P_diag_data_new[k] += a_ij;
-                      found = 1;
-                      break;
-                   }
-                }
-                if (!found)
-                {
-                   /*this is a weakly connected c-point - does
-                     not contribute - so no error - but this messes up row sum*/
-                   /* we need to distribute this */
-                   dist_coarse = 1;
-                }
-             }
-             else /*fine connection  */
-             {
-
-                sum = 0.0;
-
-                /*loop over diag and offd of row of P for j_point and
-                  get the sum of the connections to c-points of i
-                  (diag and offd)*/
-                /*diag*/
-                for (pp = P_diag_i[j_point]; pp < P_diag_i[j_point+1]; pp++)
-                {
-                   p_point = P_diag_j[pp];/* this is a coarse index */
-                   /* is p_point in row i also ?  check the diag part*/
-                   for (k = P_diag_i[i]; k < P_diag_i[i+1]; k ++)
-                   {
-                      k_point = P_diag_j[k]; /* this is a coarse index */
-                      if (p_point == k_point)
-                      {
-                         /* add p_jk to sum */
-                         sum += P_diag_data[pp];
-
-                      break;
-                      }
-                   }/* end loop k over row i */
-
-                } /* end loop pp over row j_point for diag */
-                /* now offd */
-                for (pp = P_offd_i[j_point]; pp < P_offd_i[j_point+1]; pp++)
-                {
-                   p_point = P_offd_j[pp];/* this is a coarse index */
-                   /* is p_point in row i also ? check the offd part*/
-                   for (k = P_offd_i[i]; k < P_offd_i[i+1]; k ++)
-                   {
-                      k_point = P_offd_j[k]; /* this is a coarse index */
-                      if (p_point == k_point)
-                      {
-                         /* add p_jk to sum */
-                         sum += P_offd_data[pp];
-
-                      break;
-                      }
-                   }/* end loop k over row i */
-
-                } /* end loop pp over row j_point */
-
-                if (fabs(sum) < 1e-12)
-                {
-                   sum = 1.0;
-                   use_alt_w = 1;
-                }
-
-                if (use_alt_w)
-                {
-                   /* distribute a_ij equally among coarse points */
-                   aw =  a_ij/(p_num_diag_elements + p_num_offd_elements);
-                   kk_count = 0;
-                   /* loop through row i of orig p*/
-                   /* diag */
-                   for (kk = P_diag_i[i]; kk < P_diag_i[i+1]; kk++)
-                   {
-                      cur_spot =  P_diag_i[i] + kk_count;
-                      P_diag_data_new[cur_spot] += aw;
-
-                      kk_count++;
-                   }
-                   /* offd */
-                   kk_count = 0;
-                   for (kk = P_offd_i[i]; kk < P_offd_i[i+1]; kk++)
-                   {
-                      cur_spot =  P_offd_i[i] + kk_count;
-                      P_offd_data_new[cur_spot] += aw;
-
-                      kk_count++;
-                   }
-                   /* did each element of p */
-
-                   /* skip out to next jj of A */
-                   continue;
-
-                }/* end of alt w */
-
-                /* Now we need to do the distributing  */
-
-                /* loop through row i (diag and offd )of p*/
-                /* first diag part */
-                for (k = P_diag_i[i]; k < P_diag_i[i+1]; k ++)
-                {
-                   k_point = P_diag_j[k]; /* this is a coarse index */
-                   /* now is there an entry for P(j_point, k_point)?
-                    - need to look through row j_point (on -proc since
-                    j came from A_diag */
-                   for (pp = P_diag_i[j_point]; pp < P_diag_i[j_point+1]; pp++)
-                   {
-                      if (P_diag_j[pp] == k_point)
-                      {
-                         /* a_ij*w_jk */
-                         aw =  a_ij*P_diag_data[pp];
-                         aw = aw/sum;
-
-                         P_diag_data_new[k] += aw;
-                         break;
-                      }
-                   } /* end loop pp over row j_point */
-                } /* end loop k over diag row i of P */
-                for (k = P_offd_i[i]; k < P_offd_i[i+1]; k ++)
-                {
-                   k_point = P_offd_j[k]; /* this is a coarse index */
-                   /* now is there an entry for P(j_point, k_point)?
-                    - need to look through offd part of row j_point
-                    (this is on -proc since j came from A_diag */
-                   for (pp = P_offd_i[j_point]; pp < P_offd_i[j_point+1]; pp++)
-                   {
-                      if (P_offd_j[pp] == k_point)
-                      {
-                         /* a_ij*w_jk */
-                         aw =  a_ij*P_offd_data[pp];
-                         aw = aw/sum;
-
-                         P_offd_data_new[k] += aw;
-                         break;
-                      }
-                   } /* end loop pp over row j_point */
-                } /* end loop k over row i of P */
-
-             } /* end of fine connection in row of A*/
-
-             if (dist_coarse)
-             {
-                /* coarse not in orig interp.(weakly connected) */
-                /* distribute a_ij equally among coarse points */
-                aw =  a_ij/(p_num_diag_elements + p_num_offd_elements);
-                kk_count = 0;
-                /* loop through row i of orig p*/
-                for (kk = P_diag_i[i]; kk < P_diag_i[i+1]; kk++)
-                {
-                   cur_spot =  P_diag_i[i] + kk_count;
-                   P_diag_data_new[cur_spot] += aw;
-
-                   kk_count++;
-                }
-                kk_count = 0;
-                for (kk = P_offd_i[i]; kk < P_offd_i[i+1]; kk++)
-                {
-                   cur_spot =  P_offd_i[i] + kk_count;
-                   P_offd_data_new[cur_spot] += aw;
-
-                   kk_count++;
-                }
-             }
-
-          }/* end loop j over row i of A_diag */
-
-          /* loop over offd of A */
+   /* initialized to zero */
+   P_diag_data_new = hypre_CTAlloc(HYPRE_Real, P_diag_size, memory_location);
+   P_offd_data_new = hypre_CTAlloc(HYPRE_Real, P_offd_size, memory_location);
+
+   j_diag_pos = 0;
+   j_offd_pos = 0;
+
+   /*-------------------------------------------------------------------
+    *loop through rows
+    *-------------------------------------------------------------------*/
+   for (i = 0; i < num_rows_P; i++)
+   {
+      new_row_sum = 0.0;
+      use_alt_w = 0;
+      scale_row = 0;
+      orig_row_sum = 0.0;
+
+      fcn_num = (HYPRE_Int) fmod(i, num_functions);
+      if (fcn_num != dof_func[i])
+      {
+         hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                           "WARNING - ROWS incorrectly ordered in hypre_BoomerAMGRefineInterp!\n");
+      }
+
+      /* number of elements in row of p*/
+      orig_diag_start =  P_diag_i[i];
+      orig_offd_start =  P_offd_i[i];
+
+      /* number of elements in row */
+      p_num_diag_elements = P_diag_i[i + 1] - orig_diag_start;
+      p_num_offd_elements = P_offd_i[i + 1] - orig_offd_start;
+
+      if (CF_marker[i] >= 0) /* row corres. to coarse point - just copy orig */
+      {
+         /* diag */
+         for (j = 0; j < p_num_diag_elements; j++)
+         {
+            P_diag_data_new[j_diag_pos++] = P_diag_data[orig_diag_start + j];
+         }
+         /*offd */
+         for (j = 0; j < p_num_offd_elements; j++)
+         {
+            P_offd_data_new[j_offd_pos++] = P_offd_data[orig_offd_start + j];
+         }
+      }
+      else /* row is for fine point  - make new interpolation*/
+      {
+         /* make orig entries zero*/
+         for (j = 0; j < p_num_diag_elements; j++)
+         {
+            orig_row_sum +=  P_diag_data[orig_diag_start + j];
+            P_diag_data_new[j_diag_pos++] = 0.0;
+         }
+         for (j = 0; j < p_num_offd_elements; j++)
+         {
+            orig_row_sum +=  P_offd_data[orig_offd_start + j];
+            P_offd_data_new[j_offd_pos++] = 0.0;
+         }
+
+         /*get diagonal of A */
+         diagonal = A_diag_data[A_diag_i[i]];
+
+         /* loop over elements in row i of A (except diagonal element)*/
+         /* diag*/
+         for (j = A_diag_i[i] + 1; j < A_diag_i[i + 1]; j++)
+         {
+            j_point = A_diag_j[j];
+
+            /* only want like unknowns */
+            if (fcn_num != dof_func[j_point])
+            {
+               continue;
+            }
+
+            dist_coarse = 0;
+            a_ij = A_diag_data[j];
+
+            found = 0;
+            if (CF_marker[j_point] >= 0) /*coarse*/
+            {
+               j_point_c = fine_to_coarse[j_point];
+
+               /* find P(i,j_c) and put value there (there may not be
+                  an entry in P if this coarse connection was not a
+                  strong connection */
+
+               /* we are looping in the diag of this row, so we only
+                * need to look in P_diag */
+               for (k = P_diag_i[i]; k < P_diag_i[i + 1]; k ++)
+               {
+                  if (P_diag_j[k] == j_point_c)
+                  {
+                     P_diag_data_new[k] += a_ij;
+                     found = 1;
+                     break;
+                  }
+               }
+               if (!found)
+               {
+                  /*this is a weakly connected c-point - does
+                    not contribute - so no error - but this messes up row sum*/
+                  /* we need to distribute this */
+                  dist_coarse = 1;
+               }
+            }
+            else /*fine connection  */
+            {
+
+               sum = 0.0;
+
+               /*loop over diag and offd of row of P for j_point and
+                 get the sum of the connections to c-points of i
+                 (diag and offd)*/
+               /*diag*/
+               for (pp = P_diag_i[j_point]; pp < P_diag_i[j_point + 1]; pp++)
+               {
+                  p_point = P_diag_j[pp];/* this is a coarse index */
+                  /* is p_point in row i also ?  check the diag part*/
+                  for (k = P_diag_i[i]; k < P_diag_i[i + 1]; k ++)
+                  {
+                     k_point = P_diag_j[k]; /* this is a coarse index */
+                     if (p_point == k_point)
+                     {
+                        /* add p_jk to sum */
+                        sum += P_diag_data[pp];
+
+                        break;
+                     }
+                  }/* end loop k over row i */
+
+               } /* end loop pp over row j_point for diag */
+               /* now offd */
+               for (pp = P_offd_i[j_point]; pp < P_offd_i[j_point + 1]; pp++)
+               {
+                  p_point = P_offd_j[pp];/* this is a coarse index */
+                  /* is p_point in row i also ? check the offd part*/
+                  for (k = P_offd_i[i]; k < P_offd_i[i + 1]; k ++)
+                  {
+                     k_point = P_offd_j[k]; /* this is a coarse index */
+                     if (p_point == k_point)
+                     {
+                        /* add p_jk to sum */
+                        sum += P_offd_data[pp];
+
+                        break;
+                     }
+                  }/* end loop k over row i */
+
+               } /* end loop pp over row j_point */
+
+               if (hypre_abs(sum) < 1e-12)
+               {
+                  sum = 1.0;
+                  use_alt_w = 1;
+               }
+
+               if (use_alt_w)
+               {
+                  /* distribute a_ij equally among coarse points */
+                  aw =  a_ij / (p_num_diag_elements + p_num_offd_elements);
+                  kk_count = 0;
+                  /* loop through row i of orig p*/
+                  /* diag */
+                  for (kk = P_diag_i[i]; kk < P_diag_i[i + 1]; kk++)
+                  {
+                     cur_spot =  P_diag_i[i] + kk_count;
+                     P_diag_data_new[cur_spot] += aw;
+
+                     kk_count++;
+                  }
+                  /* offd */
+                  kk_count = 0;
+                  for (kk = P_offd_i[i]; kk < P_offd_i[i + 1]; kk++)
+                  {
+                     cur_spot =  P_offd_i[i] + kk_count;
+                     P_offd_data_new[cur_spot] += aw;
+
+                     kk_count++;
+                  }
+                  /* did each element of p */
+
+                  /* skip out to next jj of A */
+                  continue;
+
+               }/* end of alt w */
+
+               /* Now we need to do the distributing  */
+
+               /* loop through row i (diag and offd )of p*/
+               /* first diag part */
+               for (k = P_diag_i[i]; k < P_diag_i[i + 1]; k ++)
+               {
+                  k_point = P_diag_j[k]; /* this is a coarse index */
+                  /* now is there an entry for P(j_point, k_point)?
+                   - need to look through row j_point (on -proc since
+                   j came from A_diag */
+                  for (pp = P_diag_i[j_point]; pp < P_diag_i[j_point + 1]; pp++)
+                  {
+                     if (P_diag_j[pp] == k_point)
+                     {
+                        /* a_ij*w_jk */
+                        aw =  a_ij * P_diag_data[pp];
+                        aw = aw / sum;
+
+                        P_diag_data_new[k] += aw;
+                        break;
+                     }
+                  } /* end loop pp over row j_point */
+               } /* end loop k over diag row i of P */
+               for (k = P_offd_i[i]; k < P_offd_i[i + 1]; k ++)
+               {
+                  k_point = P_offd_j[k]; /* this is a coarse index */
+                  /* now is there an entry for P(j_point, k_point)?
+                   - need to look through offd part of row j_point
+                   (this is on -proc since j came from A_diag */
+                  for (pp = P_offd_i[j_point]; pp < P_offd_i[j_point + 1]; pp++)
+                  {
+                     if (P_offd_j[pp] == k_point)
+                     {
+                        /* a_ij*w_jk */
+                        aw =  a_ij * P_offd_data[pp];
+                        aw = aw / sum;
+
+                        P_offd_data_new[k] += aw;
+                        break;
+                     }
+                  } /* end loop pp over row j_point */
+               } /* end loop k over row i of P */
+
+            } /* end of fine connection in row of A*/
+
+            if (dist_coarse)
+            {
+               /* coarse not in orig interp.(weakly connected) */
+               /* distribute a_ij equally among coarse points */
+               aw =  a_ij / (p_num_diag_elements + p_num_offd_elements);
+               kk_count = 0;
+               /* loop through row i of orig p*/
+               for (kk = P_diag_i[i]; kk < P_diag_i[i + 1]; kk++)
+               {
+                  cur_spot =  P_diag_i[i] + kk_count;
+                  P_diag_data_new[cur_spot] += aw;
+
+                  kk_count++;
+               }
+               kk_count = 0;
+               for (kk = P_offd_i[i]; kk < P_offd_i[i + 1]; kk++)
+               {
+                  cur_spot =  P_offd_i[i] + kk_count;
+                  P_offd_data_new[cur_spot] += aw;
+
+                  kk_count++;
+               }
+            }
+
+         }/* end loop j over row i of A_diag */
+
+         /* loop over offd of A */
 
          /* loop over elements in row i of A_offd )*/
-          for (j = A_offd_i[i]; j < A_offd_i[i+1]; j++)
-          {
-             j_point = A_offd_j[j];
-
-             /* only want like unknowns  - check the offd dof func*/
-             if (fcn_num != dof_func_offd[j_point])
-                continue;
-
-             dist_coarse = 0;
-             a_ij = A_offd_data[j];
-
-             found = 0;
-
-             if (CF_marker_offd[j_point] >= 0) /*check the offd marker*/
-             {
-                /* coarse */
-                big_j_point_c = fine_to_coarse_offd[j_point]; /* now its global!! */
-
-                /* find P(i,j_c) and put value there (there may not be
-                   an entry in P if this coarse connection was not a
-                   strong connection */
-
-                /* we are looping in the off diag of this row, so we only
-                 * need to look in P_offd */
-                for (k = P_offd_i[i]; k < P_offd_i[i+1]; k ++)
-                {
-                   index = P_offd_j[k]; /* local number */
-                   big_index = col_map_offd_P[index]; /*global number
+         for (j = A_offd_i[i]; j < A_offd_i[i + 1]; j++)
+         {
+            j_point = A_offd_j[j];
+
+            /* only want like unknowns  - check the offd dof func*/
+            if (fcn_num != dof_func_offd[j_point])
+            {
+               continue;
+            }
+
+            dist_coarse = 0;
+            a_ij = A_offd_data[j];
+
+            found = 0;
+
+            if (CF_marker_offd[j_point] >= 0) /*check the offd marker*/
+            {
+               /* coarse */
+               big_j_point_c = fine_to_coarse_offd[j_point]; /* now its global!! */
+
+               /* find P(i,j_c) and put value there (there may not be
+                  an entry in P if this coarse connection was not a
+                  strong connection */
+
+               /* we are looping in the off diag of this row, so we only
+                * need to look in P_offd */
+               for (k = P_offd_i[i]; k < P_offd_i[i + 1]; k ++)
+               {
+                  index = P_offd_j[k]; /* local number */
+                  big_index = col_map_offd_P[index]; /*global number
                                                    * (becuz j_point_c
                                                    * is global */
 
 
-                   /* if (P_offd_j[k] == j_point_c)*/
-                   if (big_index == big_j_point_c)
-                   {
-                      P_offd_data_new[k] += a_ij;
-                      found = 1;
-                      break;
-                   }
-                }
-                if (!found)
-                {
-                   /*this is a weakly connected c-point - does
-                     not contribute - so no error - but this messes up row sum*/
-                   /* we need to distribute this */
-                   dist_coarse = 1;
-                }
-             }
-             else /*fine connection  */
-             {
-
-                sum = 0.0;
-
-                /*loop over row of P for j_point and get the sum of
-                  the connections to c-points of i (diag and offd) -
-                  now the row for j_point is on another processor -
-                  and j_point is an index of A - need to convert it to
-                  corresponding index of P */
-
-                /* j_point is an index of A_off d - so */
-                /* now this is the row in P, but these are stored in
-                 * P_ext according to offd of A */
-                j_ext_index = j_point;
-
-                for (pp = P_ext_i[j_ext_index]; pp < P_ext_i[j_ext_index+1]; pp++)
-                {
-                   p_point = (HYPRE_Int)P_ext_j[pp];/* this is a coarse index */
-                   /* is p_point in row i of P also ?  check the diag and
-                      offd part or row i of P */
-
-                   if (p_point > -1) /* in diag part */
-                   {
-                      for (k = P_diag_i[i]; k < P_diag_i[i+1]; k ++)
-                      {
-                         k_point = P_diag_j[k]; /* this is a coarse index */
-                         if (p_point == k_point)
-                         {
-                            /* add p_jk to sum */
-                            sum += P_ext_data[pp];
-
-                            break;
-                         }
-                      }/* end loop k over row i */
-                   }
-                   else /* in offd diag part */
-                   {
-                      p_point = -p_point-1;
-                      /* p_point is a local col number for P now */
-                      for (k = P_offd_i[i]; k < P_offd_i[i+1]; k ++)
-                      {
-                         k_point = P_offd_j[k]; /* this is a coarse index */
-                         if (p_point == k_point)
-                         {
-                            /* add p_jk to sum */
-                            sum += P_ext_data[pp];
-
-                            break;
-                         }
-                      }/* end loop k over row i */
-                   }/* end diag or offd */
-                }/* end loop over row P for j_point */
-
-                if (fabs(sum) < 1e-12)
-                {
-                   sum = 1.0;
-                   use_alt_w = 1;
-                }
-
-                if (use_alt_w)
-                {
-                   /* distribute a_ij equally among coarse points */
-                   aw =  a_ij/(p_num_diag_elements + p_num_offd_elements);
-                   kk_count = 0;
-                   /* loop through row i of orig p*/
-                   /* diag */
-                   for (kk = P_diag_i[i]; kk < P_diag_i[i+1]; kk++)
-                   {
-                      cur_spot =  P_diag_i[i] + kk_count;
-                      P_diag_data_new[cur_spot] += aw;
-
-                      kk_count++;
-                   }
-                   /* offd */
-                   kk_count = 0;
-                   for (kk = P_offd_i[i]; kk < P_offd_i[i+1]; kk++)
-                   {
-                      cur_spot =  P_offd_i[i] + kk_count;
-                      P_offd_data_new[cur_spot] += aw;
-
-                      kk_count++;
-                   }
-                   /* did each element of p */
-
-                   /* skip out to next jj of A */
-                   continue;
-
-                }/* end of alt w */
-
-                /* Now we need to do the distributing  */
-
-                /* loop through row i (diag and offd )of p*/
-                /* first diag part */
-                for (k = P_diag_i[i]; k < P_diag_i[i+1]; k ++)
-                {
-                   k_point = P_diag_j[k]; /* this is a coarse index */
-                   /* now is there an entry for P(j_point, k_point)?
-                      - need to look through row j_point  - this will
-                      be off-proc */
-
-                   for (pp = P_ext_i[j_ext_index]; pp < P_ext_i[j_ext_index+1]; pp++)
-                   {
-                      p_point  = (HYPRE_Int)P_ext_j[pp];
-                      if (p_point > -1) /* diag part */
-                      {
-                         if (p_point == k_point)
-                         {
-                            /* a_ij*w_jk */
-                            aw =  a_ij*P_ext_data[pp];
-                            aw = aw/sum;
-
-                            P_diag_data_new[k] += aw;
-                            break;
-                         }
-                      }
-
-                   } /* end loop pp over row j_point */
-                } /* end loop k over diag row i of P */
-                for (k = P_offd_i[i]; k < P_offd_i[i+1]; k ++)
-                {
-                   k_point = P_offd_j[k]; /* this is a coarse index */
-                   /* now is there an entry for P(j_point, k_point)?
+                  /* if (P_offd_j[k] == j_point_c)*/
+                  if (big_index == big_j_point_c)
+                  {
+                     P_offd_data_new[k] += a_ij;
+                     found = 1;
+                     break;
+                  }
+               }
+               if (!found)
+               {
+                  /*this is a weakly connected c-point - does
+                    not contribute - so no error - but this messes up row sum*/
+                  /* we need to distribute this */
+                  dist_coarse = 1;
+               }
+            }
+            else /*fine connection  */
+            {
+
+               sum = 0.0;
+
+               /*loop over row of P for j_point and get the sum of
+                 the connections to c-points of i (diag and offd) -
+                 now the row for j_point is on another processor -
+                 and j_point is an index of A - need to convert it to
+                 corresponding index of P */
+
+               /* j_point is an index of A_off d - so */
+               /* now this is the row in P, but these are stored in
+                * P_ext according to offd of A */
+               j_ext_index = j_point;
+
+               for (pp = P_ext_i[j_ext_index]; pp < P_ext_i[j_ext_index + 1]; pp++)
+               {
+                  p_point = (HYPRE_Int)P_ext_j[pp];/* this is a coarse index */
+                  /* is p_point in row i of P also ?  check the diag and
+                     offd part or row i of P */
+
+                  if (p_point > -1) /* in diag part */
+                  {
+                     for (k = P_diag_i[i]; k < P_diag_i[i + 1]; k ++)
+                     {
+                        k_point = P_diag_j[k]; /* this is a coarse index */
+                        if (p_point == k_point)
+                        {
+                           /* add p_jk to sum */
+                           sum += P_ext_data[pp];
+
+                           break;
+                        }
+                     }/* end loop k over row i */
+                  }
+                  else /* in offd diag part */
+                  {
+                     p_point = -p_point - 1;
+                     /* p_point is a local col number for P now */
+                     for (k = P_offd_i[i]; k < P_offd_i[i + 1]; k ++)
+                     {
+                        k_point = P_offd_j[k]; /* this is a coarse index */
+                        if (p_point == k_point)
+                        {
+                           /* add p_jk to sum */
+                           sum += P_ext_data[pp];
+
+                           break;
+                        }
+                     }/* end loop k over row i */
+                  }/* end diag or offd */
+               }/* end loop over row P for j_point */
+
+               if (hypre_abs(sum) < 1e-12)
+               {
+                  sum = 1.0;
+                  use_alt_w = 1;
+               }
+
+               if (use_alt_w)
+               {
+                  /* distribute a_ij equally among coarse points */
+                  aw =  a_ij / (p_num_diag_elements + p_num_offd_elements);
+                  kk_count = 0;
+                  /* loop through row i of orig p*/
+                  /* diag */
+                  for (kk = P_diag_i[i]; kk < P_diag_i[i + 1]; kk++)
+                  {
+                     cur_spot =  P_diag_i[i] + kk_count;
+                     P_diag_data_new[cur_spot] += aw;
+
+                     kk_count++;
+                  }
+                  /* offd */
+                  kk_count = 0;
+                  for (kk = P_offd_i[i]; kk < P_offd_i[i + 1]; kk++)
+                  {
+                     cur_spot =  P_offd_i[i] + kk_count;
+                     P_offd_data_new[cur_spot] += aw;
+
+                     kk_count++;
+                  }
+                  /* did each element of p */
+
+                  /* skip out to next jj of A */
+                  continue;
+
+               }/* end of alt w */
+
+               /* Now we need to do the distributing  */
+
+               /* loop through row i (diag and offd )of p*/
+               /* first diag part */
+               for (k = P_diag_i[i]; k < P_diag_i[i + 1]; k ++)
+               {
+                  k_point = P_diag_j[k]; /* this is a coarse index */
+                  /* now is there an entry for P(j_point, k_point)?
                      - need to look through row j_point  - this will
-                      be off-proc */
-                   for (pp = P_ext_i[j_ext_index]; pp < P_ext_i[j_ext_index+1]; pp++)
-                   {
-                      p_point = (HYPRE_Int) P_ext_j[pp];
-                      if (p_point < 0) /* in offd part */
-                      {
-                         p_point = - p_point - 1;
-                         if (p_point == k_point)
-                         {
-                            /* a_ij*w_jk */
-                            aw =  a_ij*P_ext_data[pp];
-                            aw = aw/sum;
+                     be off-proc */
+
+                  for (pp = P_ext_i[j_ext_index]; pp < P_ext_i[j_ext_index + 1]; pp++)
+                  {
+                     p_point = (HYPRE_Int) P_ext_j[pp];
+                     if (p_point > -1) /* diag part */
+                     {
+                        if (p_point == k_point)
+                        {
+                           /* a_ij*w_jk */
+                           aw =  a_ij * P_ext_data[pp];
+                           aw = aw / sum;
+
+                           P_diag_data_new[k] += aw;
+                           break;
+                        }
+                     }
 
-                            P_offd_data_new[k] += aw;
-                            break;
-                         }
-                      }
+                  } /* end loop pp over row j_point */
+               } /* end loop k over diag row i of P */
+               for (k = P_offd_i[i]; k < P_offd_i[i + 1]; k ++)
+               {
+                  k_point = P_offd_j[k]; /* this is a coarse index */
+                  /* now is there an entry for P(j_point, k_point)?
+                    - need to look through row j_point  - this will
+                     be off-proc */
+                  for (pp = P_ext_i[j_ext_index]; pp < P_ext_i[j_ext_index + 1]; pp++)
+                  {
+                     p_point = (HYPRE_Int) P_ext_j[pp];
+                     if (p_point < 0) /* in offd part */
+                     {
+                        p_point = - p_point - 1;
+                        if (p_point == k_point)
+                        {
+                           /* a_ij*w_jk */
+                           aw =  a_ij * P_ext_data[pp];
+                           aw = aw / sum;
+
+                           P_offd_data_new[k] += aw;
+                           break;
+                        }
+                     }
 
-                   } /* end loop pp over row j_point */
+                  } /* end loop pp over row j_point */
 
-                } /* end loop k over row i of P */
+               } /* end loop k over row i of P */
 
-             } /* end of fine connection in row of A*/
+            } /* end of fine connection in row of A*/
 
-             if (dist_coarse)
-             {
-                /* coarse not in orig interp.(weakly connected) */
-                /* distribute a_ij equally among coarse points */
-                aw =  a_ij/(p_num_diag_elements + p_num_offd_elements);
-                kk_count = 0;
-                /* loop through row i of orig p*/
-                for (kk = P_diag_i[i]; kk < P_diag_i[i+1]; kk++)
-                {
-                   cur_spot =  P_diag_i[i] + kk_count;
-                   P_diag_data_new[cur_spot] += aw;
+            if (dist_coarse)
+            {
+               /* coarse not in orig interp.(weakly connected) */
+               /* distribute a_ij equally among coarse points */
+               aw =  a_ij / (p_num_diag_elements + p_num_offd_elements);
+               kk_count = 0;
+               /* loop through row i of orig p*/
+               for (kk = P_diag_i[i]; kk < P_diag_i[i + 1]; kk++)
+               {
+                  cur_spot =  P_diag_i[i] + kk_count;
+                  P_diag_data_new[cur_spot] += aw;
 
-                   kk_count++;
-                }
-                kk_count = 0;
-                for (kk = P_offd_i[i]; kk < P_offd_i[i+1]; kk++)
-                {
-                   cur_spot =  P_offd_i[i] + kk_count;
-                   P_offd_data_new[cur_spot] += aw;
+                  kk_count++;
+               }
+               kk_count = 0;
+               for (kk = P_offd_i[i]; kk < P_offd_i[i + 1]; kk++)
+               {
+                  cur_spot =  P_offd_i[i] + kk_count;
+                  P_offd_data_new[cur_spot] += aw;
 
-                   kk_count++;
-                }
-             }
+                  kk_count++;
+               }
+            }
 
-          }/* end loop j over row i of A_offd */
+         }/* end loop j over row i of A_offd */
 
-          /* now divide by the diagonal and we are finished with this row!*/
-          if (fabs(diagonal) > 0.0)
-          {
-             for (k = P_diag_i[i] ; k < P_diag_i[i+1]; k++)
-             {
-                P_diag_data_new[k] /= -(diagonal);
-                new_row_sum +=  P_diag_data_new[k];
+         /* now divide by the diagonal and we are finished with this row!*/
+         if (hypre_abs(diagonal) > 0.0)
+         {
+            for (k = P_diag_i[i] ; k < P_diag_i[i + 1]; k++)
+            {
+               P_diag_data_new[k] /= -(diagonal);
+               new_row_sum +=  P_diag_data_new[k];
 
-             }
-             for (k = P_offd_i[i] ; k < P_offd_i[i+1]; k++)
-             {
-                P_offd_data_new[k] /= -(diagonal);
-                new_row_sum +=  P_offd_data_new[k];
+            }
+            for (k = P_offd_i[i] ; k < P_offd_i[i + 1]; k++)
+            {
+               P_offd_data_new[k] /= -(diagonal);
+               new_row_sum +=  P_offd_data_new[k];
 
-             }
+            }
 
-             /* now re-scale */
-             if (scale_row)
-             {
+            /* now re-scale */
+            if (scale_row)
+            {
 
-                for (k = P_diag_i[i] ; k < P_diag_i[i+1]; k++)
-                {
-                   P_diag_data_new[k] *= (orig_row_sum/new_row_sum);
+               for (k = P_diag_i[i] ; k < P_diag_i[i + 1]; k++)
+               {
+                  P_diag_data_new[k] *= (orig_row_sum / new_row_sum);
 
-                }
-                  for (k = P_offd_i[i] ; k < P_offd_i[i+1]; k++)
-                {
-                   P_offd_data_new[k] *= (orig_row_sum/new_row_sum);
+               }
+               for (k = P_offd_i[i] ; k < P_offd_i[i + 1]; k++)
+               {
+                  P_offd_data_new[k] *= (orig_row_sum / new_row_sum);
 
-                }
+               }
 
 
-             }
+            }
 
-          }
+         }
 
-       } /* end of row of P is fine point - build interp */
+      } /* end of row of P is fine point - build interp */
 
-    } /* end of i loop throw rows */
+   } /* end of i loop throw rows */
 
-    /* modify P - only need to replace the data (i and j are the same)*/
-    hypre_TFree(P_diag_data, memory_location);
-    hypre_TFree(P_offd_data, memory_location);
+   /* modify P - only need to replace the data (i and j are the same)*/
+   hypre_TFree(P_diag_data, memory_location);
+   hypre_TFree(P_offd_data, memory_location);
 
-    hypre_CSRMatrixData(P_diag) = P_diag_data_new;
-    hypre_CSRMatrixData(P_offd) = P_offd_data_new;
+   hypre_CSRMatrixData(P_diag) = P_diag_data_new;
+   hypre_CSRMatrixData(P_offd) = P_offd_data_new;
 
 
 #if SV_DEBUG
@@ -2317,9 +2401,11 @@ hypre_BoomerAMGRefineInterp( hypre_ParCSRMatrix *A,
 
       if (!myid)
       {
-         hypre_sprintf(new_file,"%s.level.%d","P_new_new", level );
+         hypre_sprintf(new_file, "%s.level.%d", "P_new_new", level );
          if (P_CSR)
+         {
             hypre_CSRMatrixPrint(P_CSR, new_file);
+         }
       }
 
       hypre_CSRMatrixDestroy(P_CSR);
@@ -2327,15 +2413,14 @@ hypre_BoomerAMGRefineInterp( hypre_ParCSRMatrix *A,
 
 #endif
 
-    /* clean up */
-    hypre_TFree(CF_marker_offd, HYPRE_MEMORY_HOST);
-    hypre_TFree(dof_func_offd, HYPRE_MEMORY_HOST);
-    hypre_TFree(fine_to_coarse, HYPRE_MEMORY_HOST);
-    hypre_TFree(fine_to_coarse_offd, HYPRE_MEMORY_HOST);
-    hypre_TFree(int_buf_data, HYPRE_MEMORY_HOST);
-    hypre_TFree(big_buf_data, HYPRE_MEMORY_HOST);
-
-    if (num_procs > 1) hypre_CSRMatrixDestroy(P_ext);
+   /* clean up */
+   hypre_TFree(CF_marker_offd, HYPRE_MEMORY_HOST);
+   hypre_TFree(dof_func_offd, HYPRE_MEMORY_HOST);
+   hypre_TFree(fine_to_coarse, HYPRE_MEMORY_HOST);
+   hypre_TFree(fine_to_coarse_offd, HYPRE_MEMORY_HOST);
+   hypre_TFree(int_buf_data, HYPRE_MEMORY_HOST);
+   hypre_TFree(big_buf_data, HYPRE_MEMORY_HOST);
+   hypre_CSRMatrixDestroy(P_ext);
 
-    return hypre_error_flag;
+   return hypre_error_flag;
 }
diff --git a/external/hypre/src/parcsr_ls/par_sv_interp_ln.c b/external/hypre/src/parcsr_ls/par_sv_interp_ln.c
index c0d5288b..336fd2e2 100644
--- a/external/hypre/src/parcsr_ls/par_sv_interp_ln.c
+++ b/external/hypre/src/parcsr_ls/par_sv_interp_ln.c
@@ -1,7 +1,7 @@
 /******************************************************************************
 
    *dof_func_ptr = dof_func;
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -31,21 +31,21 @@
 ******************************************************************************/
 
 HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
-                                    hypre_ParCSRMatrix **P,
-                                    HYPRE_BigInt *num_cpts_global,
-                                    HYPRE_Int *nf,
-                                    HYPRE_Int *dof_func,
-                                    hypre_IntArray **coarse_dof_func,
-                                    HYPRE_Int *CF_marker,
-                                    HYPRE_Int level,
-                                    HYPRE_Real *weights,
-                                    HYPRE_Int num_smooth_vecs,
-                                    hypre_ParVector **smooth_vecs,
-                                    HYPRE_Real abs_trunc, HYPRE_Int q_max,
-                                    HYPRE_Int interp_vec_first_level  )
+                                          hypre_ParCSRMatrix **P,
+                                          HYPRE_BigInt *num_cpts_global,
+                                          HYPRE_Int *nf,
+                                          HYPRE_Int *dof_func,
+                                          hypre_IntArray **coarse_dof_func,
+                                          HYPRE_Int *CF_marker,
+                                          HYPRE_Int level,
+                                          HYPRE_Real *weights,
+                                          HYPRE_Int num_smooth_vecs,
+                                          hypre_ParVector **smooth_vecs,
+                                          HYPRE_Real abs_trunc, HYPRE_Int q_max,
+                                          HYPRE_Int interp_vec_first_level  )
 {
 
-   HYPRE_Int                i,j, k,kk, pp, jj;
+   HYPRE_Int                i, j, k, kk, pp, jj;
 
    hypre_ParCSRMatrix *new_P;
 
@@ -83,7 +83,8 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
 
    HYPRE_BigInt    *new_col_map_offd_P = NULL;
 
-   HYPRE_Real       orig_row_sum, new_row_sum, gm_row_sum;
+   /* HYPRE_Real       orig_row_sum, new_row_sum; */
+   HYPRE_Real       gm_row_sum = 1.0;
 
    HYPRE_Int        orig_diag_start, orig_offd_start, j_offd_pos, j_diag_pos;
    HYPRE_Int        new_nnz_diag, new_nnz_offd;
@@ -146,12 +147,12 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
    HYPRE_Int       *col_map;
    HYPRE_Int       *coarse_to_fine;
 
-   HYPRE_BigInt    *new_col_starts;
+   HYPRE_BigInt     new_col_starts[2];
 
    HYPRE_Real       af_sum;
 
    HYPRE_Real       theta_2D[] = {.5, .5};
-   HYPRE_Real       theta_3D[] = {1.0/3.0, 1.0/3.0, 1.0/3.0};
+   HYPRE_Real       theta_3D[] = {1.0 / 3.0, 1.0 / 3.0, 1.0 / 3.0};
 
    HYPRE_Real      *theta;
 
@@ -168,16 +169,16 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
    HYPRE_Int       *dof_func_offd = NULL;
    HYPRE_BigInt    *fine_to_coarse_offd;
 
-   hypre_CSRMatrix *P_ext;
-   HYPRE_Real      *P_ext_data;
-   HYPRE_Int       *P_ext_i;
-   HYPRE_BigInt    *P_ext_j;
+   hypre_CSRMatrix *P_ext = NULL;
+   HYPRE_Real      *P_ext_data = NULL;
+   HYPRE_Int       *P_ext_i = NULL;
+   HYPRE_BigInt    *P_ext_j = NULL;
    HYPRE_Int        num_sends_A, index, start;
    HYPRE_Int        myid = 0, num_procs = 1;
 
    /* truncation */
    HYPRE_Int *is_q = NULL;
-   HYPRE_Int q_alloc= 0;
+   HYPRE_Int q_alloc = 0;
    HYPRE_BigInt *aux_j = NULL;
    HYPRE_Real *aux_data = NULL;
    HYPRE_Int  *is_diag = NULL;
@@ -193,19 +194,21 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
    HYPRE_BigInt *big_buf_data = NULL;
    HYPRE_Real *dbl_buf_data = NULL;
 
-   HYPRE_Int g_nc;
+   HYPRE_BigInt g_nc;
+
+   HYPRE_MemoryLocation memory_location_P = hypre_ParCSRMatrixMemoryLocation(A);
 
 
 #if SV_DEBUG
    {
       char new_file[80];
 
-      hypre_sprintf(new_file,"%s.level.%d","P_orig", level);
+      hypre_sprintf(new_file, "%s.level.%d", "P_orig", level);
       hypre_ParCSRMatrixPrint(*P, new_file);
 
-      for (i=0; i < num_smooth_vecs; i++)
+      for (i = 0; i < num_smooth_vecs; i++)
       {
-         hypre_sprintf(new_file,"%s.%d.level.%d","smoothvec", i, level );
+         hypre_sprintf(new_file, "%s.%d.level.%d", "smoothvec", i, level );
          hypre_ParVectorPrint(smooth_vecs[i], new_file);
       }
    }
@@ -233,23 +236,27 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
 
       if (!myid)
       {
-         hypre_sprintf(new_file,"%s.level.%d","P_new_orig", level );
+         hypre_sprintf(new_file, "%s.level.%d", "P_new_orig", level );
          if (P_CSR)
+         {
             hypre_CSRMatrixPrint(P_CSR, new_file);
+         }
 
       }
 
       hypre_CSRMatrixDestroy(P_CSR);
 
-      for (i=0; i < num_smooth_vecs; i++)
+      for (i = 0; i < num_smooth_vecs; i++)
       {
          sv = hypre_ParVectorToVectorAll(smooth_vecs[i]);
 
          if (!myid)
          {
-            hypre_sprintf(new_file,"%s.%d.level.%d","smoothvec", i, level );
+            hypre_sprintf(new_file, "%s.%d.level.%d", "smoothvec", i, level );
             if (sv)
+            {
                hypre_SeqVectorPrint(sv, new_file);
+            }
          }
 
          hypre_SeqVectorDestroy(sv);
@@ -259,9 +266,11 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
       P_CSR = hypre_ParCSRMatrixToCSRMatrixAll(A);
       if (!myid)
       {
-         hypre_sprintf(new_file,"%s.level.%d","A", level );
+         hypre_sprintf(new_file, "%s.level.%d", "A", level );
          if (P_CSR)
+         {
             hypre_CSRMatrixPrint(P_CSR, new_file);
+         }
       }
 
       hypre_CSRMatrixDestroy(P_CSR);
@@ -279,7 +288,7 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
    nnz_offd = P_offd_size;
 
    /*number of coarse variables for each unknown */
-   ncv_peru = ncv/num_functions;
+   ncv_peru = ncv / num_functions;
 
    if (level == interp_vec_first_level)
    {
@@ -293,15 +302,19 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
       /*orig_ncv = ncv - ncv_peru*num_smooth_vecs;*/
    }
 
-  /*weights for P_s */
+   /*weights for P_s */
    if (modify)
    {
       if (weights == NULL)
       {
          if (orig_nf == 2)
+         {
             theta = theta_2D;
+         }
          else
+         {
             theta = theta_3D;
+         }
       }
       else
       {
@@ -311,11 +324,12 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
 
    /* for communication */
    num_sends_A = hypre_ParCSRCommPkgNumSends(comm_pkg_A);
-   int_buf_data = hypre_CTAlloc(HYPRE_Int, hypre_ParCSRCommPkgSendMapStart(comm_pkg_A,
-                                      num_sends_A), HYPRE_MEMORY_HOST);
-   big_buf_data = hypre_CTAlloc(HYPRE_BigInt, hypre_ParCSRCommPkgSendMapStart(comm_pkg_A,
-                                      num_sends_A), HYPRE_MEMORY_HOST);
-
+   int_buf_data = hypre_CTAlloc(HYPRE_Int,
+                                hypre_ParCSRCommPkgSendMapStart(comm_pkg_A, num_sends_A),
+                                HYPRE_MEMORY_HOST);
+   big_buf_data = hypre_CTAlloc(HYPRE_BigInt,
+                                hypre_ParCSRCommPkgSendMapStart(comm_pkg_A, num_sends_A),
+                                HYPRE_MEMORY_HOST);
 
    /*-----------------------------------------------------------------------
     *  create and send and receive fine_to_coarse info.
@@ -325,17 +339,19 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
       HYPRE_BigInt my_first_cpt;
       HYPRE_Int tmp_i;
 
-
       my_first_cpt = num_cpts_global[0];
 
-      /* create the fine to coarse and coarse to fine*/
-      fine_to_coarse = hypre_CTAlloc(HYPRE_Int,  num_rows_P, HYPRE_MEMORY_HOST);
-      for (i = 0; i < num_rows_P; i++) fine_to_coarse[i] = -1;
+      /* create the fine to coarse and coarse to fine */
+      fine_to_coarse = hypre_CTAlloc(HYPRE_Int, num_rows_P, HYPRE_MEMORY_HOST);
+      for (i = 0; i < num_rows_P; i++)
+      {
+         fine_to_coarse[i] = -1;
+      }
 
-      coarse_to_fine = hypre_CTAlloc(HYPRE_Int,  ncv, HYPRE_MEMORY_HOST);
+      coarse_to_fine = hypre_CTAlloc(HYPRE_Int, ncv, HYPRE_MEMORY_HOST);
 
       coarse_counter = 0;
-      for (i=0; i < num_rows_P; i++)
+      for (i = 0; i < num_rows_P; i++)
       {
          if (CF_marker[i] >= 0)
          {
@@ -352,17 +368,15 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
       for (i = 0; i < num_sends_A; i++)
       {
          start = hypre_ParCSRCommPkgSendMapStart(comm_pkg_A, i);
-         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg_A, i+1); j++)
+         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg_A, i + 1); j++)
          {
-
-            tmp_i = fine_to_coarse[hypre_ParCSRCommPkgSendMapElmt(comm_pkg_A,j)];
+            tmp_i = fine_to_coarse[hypre_ParCSRCommPkgSendMapElmt(comm_pkg_A, j)];
             big_buf_data[index++] = (HYPRE_BigInt)tmp_i + my_first_cpt; /* makes it global*/
          }
-
       }
 
-      comm_handle = hypre_ParCSRCommHandleCreate( 21, comm_pkg_A, big_buf_data,
-                                                  fine_to_coarse_offd);
+      comm_handle = hypre_ParCSRCommHandleCreate(21, comm_pkg_A, big_buf_data,
+                                                 fine_to_coarse_offd);
 
       hypre_ParCSRCommHandleDestroy(comm_handle);
    } /* end fine to coarse {} */
@@ -371,25 +385,28 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
    * Get the CF_marker data for the off-processor columns of A
    *-------------------------------------------------------------------*/
    {
-
       if (num_cols_A_offd)
+      {
          CF_marker_offd = hypre_CTAlloc(HYPRE_Int, num_cols_A_offd, HYPRE_MEMORY_HOST);
+      }
 
       if (num_functions > 1 && num_cols_A_offd)
+      {
          dof_func_offd = hypre_CTAlloc(HYPRE_Int, num_cols_A_offd, HYPRE_MEMORY_HOST);
+      }
 
       index = 0;
       for (i = 0; i < num_sends_A; i++)
       {
          start = hypre_ParCSRCommPkgSendMapStart(comm_pkg_A, i);
-         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg_A, i+1); j++)
+         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg_A, i + 1); j++)
          {
-            int_buf_data[index++] = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg_A,j)];
+            int_buf_data[index++] = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg_A, j)];
          }
       }
 
-      comm_handle = hypre_ParCSRCommHandleCreate( 11, comm_pkg_A, int_buf_data,
-                                                  CF_marker_offd);
+      comm_handle = hypre_ParCSRCommHandleCreate(11, comm_pkg_A, int_buf_data,
+                                                 CF_marker_offd);
 
       hypre_ParCSRCommHandleDestroy(comm_handle);
       if (num_functions > 1)
@@ -398,15 +415,15 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
          for (i = 0; i < num_sends_A; i++)
          {
             start = hypre_ParCSRCommPkgSendMapStart(comm_pkg_A, i);
-            for (j=start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg_A, i+1); j++)
+            for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg_A, i + 1); j++)
             {
                int_buf_data[index++]
-                  = dof_func[hypre_ParCSRCommPkgSendMapElmt(comm_pkg_A,j)];
+                  = dof_func[hypre_ParCSRCommPkgSendMapElmt(comm_pkg_A, j)];
             }
          }
 
-         comm_handle = hypre_ParCSRCommHandleCreate( 11, comm_pkg_A, int_buf_data,
-                                                     dof_func_offd);
+         comm_handle = hypre_ParCSRCommHandleCreate(11, comm_pkg_A, int_buf_data,
+                                                    dof_func_offd);
 
          hypre_ParCSRCommHandleDestroy(comm_handle);
       }
@@ -416,17 +433,17 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
    /*-------------------------------------------------------------------
     * Get the ghost rows of P
     *-------------------------------------------------------------------*/
-  {
+   {
 
       HYPRE_Int kc;
       HYPRE_BigInt col_1 = hypre_ParCSRMatrixFirstColDiag(*P);
-      HYPRE_BigInt col_n = col_1 + (HYPRE_BigInt)hypre_CSRMatrixNumCols(P_diag);
+      HYPRE_BigInt col_n = col_1 + (HYPRE_BigInt) hypre_CSRMatrixNumCols(P_diag);
 
       if (num_procs > 1)
       {
          /* need the rows of P on other processors associated with
             the offd cols of A */
-         P_ext      = hypre_ParCSRMatrixExtractBExt(*P,A,1);
+         P_ext      = hypre_ParCSRMatrixExtractBExt(*P, A, 1);
          P_ext_i    = hypre_CSRMatrixI(P_ext);
          P_ext_j    = hypre_CSRMatrixBigJ(P_ext);
          P_ext_data = hypre_CSRMatrixData(P_ext);
@@ -434,9 +451,9 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
 
       index = 0;
       /* now check whether each col is in the diag of offd part of P)*/
-      for (i=0; i < num_cols_A_offd; i++)
+      for (i = 0; i < num_cols_A_offd; i++)
       {
-         for (j=P_ext_i[i]; j < P_ext_i[i+1]; j++)
+         for (j = P_ext_i[i]; j < P_ext_i[i + 1]; j++)
          {
             big_k = P_ext_j[j];
             /* is it in the diag ?*/
@@ -448,12 +465,12 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
             else
             {
                /* off diag entry */
-               kc = hypre_BigBinarySearch(col_map_offd_P, big_k ,num_cols_P_offd);
+               kc = hypre_BigBinarySearch(col_map_offd_P, big_k, num_cols_P_offd);
                /* now this corresponds to the location in the col_map_offd
                 ( so it is a local column number */
                if (kc > -1)
                {
-                  P_ext_j[index] = (HYPRE_BigInt)(-kc-1); /* make negative */
+                  P_ext_j[index] = (HYPRE_BigInt)(-kc - 1); /* make negative */
                   P_ext_data[index++] = P_ext_data[j];
                }
             }
@@ -461,11 +478,14 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
          P_ext_i[i] = index;
       }
       for (i = num_cols_A_offd; i > 0; i--)
-         P_ext_i[i] = P_ext_i[i-1];
-
-      if (num_procs > 1) P_ext_i[0] = 0;
-
+      {
+         P_ext_i[i] = P_ext_i[i - 1];
+      }
 
+      if (num_procs > 1)
+      {
+         P_ext_i[0] = 0;
+      }
    } /* end of ghost rows */
 
    /*-------------------------------------------------------------------
@@ -474,7 +494,7 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
 
    /* if level = first_level, we need to fix the col numbering to leave
     * space for the new unknowns */
-   col_map = hypre_CTAlloc(HYPRE_Int,  ncv, HYPRE_MEMORY_HOST);
+   col_map = hypre_CTAlloc(HYPRE_Int, ncv, HYPRE_MEMORY_HOST);
 
    if (num_smooth_vecs && level == interp_vec_first_level)
    {
@@ -482,7 +502,7 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
       {
          /* map from old col number to new col number (leave spaces
           * for new unknowns to be interleaved */
-         col_map[i] = i + (i/num_functions) * num_smooth_vecs;
+         col_map[i] = i + (i / num_functions) * num_smooth_vecs;
       }
    }
    else
@@ -495,46 +515,47 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
    }
 
    /* we will have the same sparsity in Q as in P */
-   new_nnz_diag = nnz_diag + nnz_diag*num_smooth_vecs;
-   new_nnz_offd = nnz_offd + nnz_offd*num_smooth_vecs;
-
+   new_nnz_diag = nnz_diag + nnz_diag * num_smooth_vecs;
+   new_nnz_offd = nnz_offd + nnz_offd * num_smooth_vecs;
 
    /* new number of coarse variables */
    if (level == interp_vec_first_level )
-      new_ncv = ncv + ncv_peru*num_smooth_vecs;
+   {
+      new_ncv = ncv + ncv_peru * num_smooth_vecs;
+   }
    else
-      new_ncv = ncv; /* unchanged on level > first_level */
-
+   {
+      new_ncv = ncv;   /* unchanged on level > first_level */
+   }
 
    /* allocations */
-   P_diag_j_new = hypre_CTAlloc(HYPRE_Int,  new_nnz_diag, HYPRE_MEMORY_DEVICE);
-   P_diag_data_new = hypre_CTAlloc(HYPRE_Real,  new_nnz_diag, HYPRE_MEMORY_DEVICE);
-   P_diag_i_new = hypre_CTAlloc(HYPRE_Int,  num_rows_P + 1, HYPRE_MEMORY_DEVICE);
+   P_diag_j_new = hypre_CTAlloc(HYPRE_Int,  new_nnz_diag, memory_location_P);
+   P_diag_data_new = hypre_CTAlloc(HYPRE_Real,  new_nnz_diag, memory_location_P);
+   P_diag_i_new = hypre_CTAlloc(HYPRE_Int,  num_rows_P + 1, memory_location_P);
 
    P_offd_j_big = hypre_CTAlloc(HYPRE_BigInt,  new_nnz_offd, HYPRE_MEMORY_HOST);
-   P_offd_j_new = hypre_CTAlloc(HYPRE_Int,  new_nnz_offd, HYPRE_MEMORY_DEVICE);
-   P_offd_data_new = hypre_CTAlloc(HYPRE_Real,  new_nnz_offd, HYPRE_MEMORY_DEVICE);
-   P_offd_i_new = hypre_CTAlloc(HYPRE_Int,  num_rows_P + 1, HYPRE_MEMORY_DEVICE);
+   P_offd_j_new = hypre_CTAlloc(HYPRE_Int,  new_nnz_offd, memory_location_P);
+   P_offd_data_new = hypre_CTAlloc(HYPRE_Real,  new_nnz_offd, memory_location_P);
+   P_offd_i_new = hypre_CTAlloc(HYPRE_Int,  num_rows_P + 1, memory_location_P);
 
    P_diag_i_new[0] = P_diag_i[0];
    P_offd_i_new[0] = P_offd_i[0];
 
-
    /* doing truncation? if so, need some more allocations*/
    if (q_max > 0 || abs_trunc > 0.0)
    {
       q_count = 0;
-      for (i=0; i < num_rows_P; i++)
+      for (i = 0; i < num_rows_P; i++)
       {
-         p_num_elements = P_diag_i[i+1]-P_diag_i[i];
-         p_num_elements += (P_offd_i[i+1]-P_offd_i[i]);
-         if (p_num_elements > q_count) q_count = p_num_elements;
+         p_num_elements = P_diag_i[i + 1] - P_diag_i[i];
+         p_num_elements += (P_offd_i[i + 1] - P_offd_i[i]);
+         if (p_num_elements > q_count) { q_count = p_num_elements; }
       }
-      q_alloc =  q_count*(num_smooth_vecs + 1);
-      is_q = hypre_CTAlloc(HYPRE_Int,  q_alloc , HYPRE_MEMORY_HOST);
+      q_alloc =  q_count * (num_smooth_vecs + 1);
+      is_q = hypre_CTAlloc(HYPRE_Int,  q_alloc, HYPRE_MEMORY_HOST);
       aux_data = hypre_CTAlloc(HYPRE_Real,  q_alloc, HYPRE_MEMORY_HOST);
       aux_j = hypre_CTAlloc(HYPRE_BigInt,  q_alloc, HYPRE_MEMORY_HOST);
-      is_diag = hypre_CTAlloc(HYPRE_Int,  q_alloc , HYPRE_MEMORY_HOST);
+      is_diag = hypre_CTAlloc(HYPRE_Int,  q_alloc, HYPRE_MEMORY_HOST);
    }
 
    /*-------------------------------------------------------------------
@@ -544,107 +565,106 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
    {
       HYPRE_Int fine_index;
 
-      smooth_vec_offd =  hypre_CTAlloc(HYPRE_Real,  num_cols_A_offd*num_smooth_vecs, HYPRE_MEMORY_HOST);
+      smooth_vec_offd = hypre_CTAlloc(HYPRE_Real,
+                                      num_cols_A_offd * num_smooth_vecs,
+                                      HYPRE_MEMORY_HOST);
 
       /* for now, do a seperate comm for each smooth vector */
-      for (k = 0; k< num_smooth_vecs; k++)
+      for (k = 0; k < num_smooth_vecs; k++)
       {
 
          vector = smooth_vecs[k];
          vec_data = hypre_VectorData(hypre_ParVectorLocalVector(vector));
 
-         dbl_buf_data = hypre_CTAlloc(HYPRE_Real,  hypre_ParCSRCommPkgSendMapStart(comm_pkg_A,
-                                                                              num_sends_A), HYPRE_MEMORY_HOST);
+         dbl_buf_data = hypre_CTAlloc(HYPRE_Real,
+                                      hypre_ParCSRCommPkgSendMapStart(comm_pkg_A, num_sends_A),
+                                      HYPRE_MEMORY_HOST);
+
          /* point into smooth_vec_offd */
-         offd_vec_data =  smooth_vec_offd + k*num_cols_A_offd;
+         offd_vec_data =  smooth_vec_offd + k * num_cols_A_offd;
 
          index = 0;
          for (i = 0; i < num_sends_A; i++)
          {
             start = hypre_ParCSRCommPkgSendMapStart(comm_pkg_A, i);
-            for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg_A, i+1); j++)
+            for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg_A, i + 1); j++)
             {
-
-               fine_index = hypre_ParCSRCommPkgSendMapElmt(comm_pkg_A,j);
+               fine_index = hypre_ParCSRCommPkgSendMapElmt(comm_pkg_A, j);
 
                dbl_buf_data[index++] = vec_data[fine_index];
             }
-
          }
 
-         comm_handle = hypre_ParCSRCommHandleCreate( 1, comm_pkg_A, dbl_buf_data,
-                                                     offd_vec_data);
+         comm_handle = hypre_ParCSRCommHandleCreate(1, comm_pkg_A, dbl_buf_data, offd_vec_data);
          hypre_ParCSRCommHandleDestroy(comm_handle);
 
          hypre_TFree(dbl_buf_data, HYPRE_MEMORY_HOST);
       } /* end of smooth vecs */
    }/*end num procs > 1 */
 
-
-    /*-------------------------------------------------------------------
-     * Get smooth vec components for the off-processor columns of P
-     *  TO Do: would be less storage to get the offd coarse to fine
-     *  instead of this...
-     *-------------------------------------------------------------------*/
+   /*-------------------------------------------------------------------
+    * Get smooth vec components for the off-processor columns of P
+    *  TO Do: would be less storage to get the offd coarse to fine
+    *  instead of this...
+    *-------------------------------------------------------------------*/
 
    if (num_procs > 1)
    {
       HYPRE_Int c_index, fine_index;
-      smooth_vec_offd_P =  hypre_CTAlloc(HYPRE_Real,  num_cols_P_offd*num_smooth_vecs, HYPRE_MEMORY_HOST);
+      smooth_vec_offd_P = hypre_CTAlloc(HYPRE_Real,
+                                        num_cols_P_offd * num_smooth_vecs,
+                                        HYPRE_MEMORY_HOST);
 
       /* for now, do a seperate comm for each smooth vector */
-      for (k = 0; k< num_smooth_vecs; k++)
+      for (k = 0; k < num_smooth_vecs; k++)
       {
-
          vector = smooth_vecs[k];
          vec_data = hypre_VectorData(hypre_ParVectorLocalVector(vector));
 
          num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg_P);
-         dbl_buf_data = hypre_CTAlloc(HYPRE_Real,  hypre_ParCSRCommPkgSendMapStart(comm_pkg_P,
-                                                      num_sends), HYPRE_MEMORY_HOST);
+         dbl_buf_data = hypre_CTAlloc(HYPRE_Real,
+                                      hypre_ParCSRCommPkgSendMapStart(comm_pkg_P, num_sends),
+                                      HYPRE_MEMORY_HOST);
+
          /* point into smooth_vec_offd_P */
-         offd_vec_data_P =  smooth_vec_offd_P + k*num_cols_P_offd;
+         offd_vec_data_P =  smooth_vec_offd_P + k * num_cols_P_offd;
 
          index = 0;
          for (i = 0; i < num_sends; i++)
          {
             start = hypre_ParCSRCommPkgSendMapStart(comm_pkg_P, i);
-            for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg_P, i+1); j++)
+            for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg_P, i + 1); j++)
             {
                /* we need to do the coarse/fine conversion here */
-               c_index = hypre_ParCSRCommPkgSendMapElmt(comm_pkg_P,j);
+               c_index = hypre_ParCSRCommPkgSendMapElmt(comm_pkg_P, j);
                fine_index = coarse_to_fine[c_index];
                dbl_buf_data[index++] = vec_data[fine_index];
             }
-
          }
 
-         comm_handle = hypre_ParCSRCommHandleCreate( 1, comm_pkg_P, dbl_buf_data,
-                                                     offd_vec_data_P);
+         comm_handle = hypre_ParCSRCommHandleCreate(1, comm_pkg_P, dbl_buf_data,
+                                                    offd_vec_data_P);
          hypre_ParCSRCommHandleDestroy(comm_handle);
 
          hypre_TFree(dbl_buf_data, HYPRE_MEMORY_HOST);
       }
-
-   }/*end num procs > 1 */
-
+   } /*end num procs > 1 */
 
    /*-------------------------------------------------------------------
     * Main loop!
     *-------------------------------------------------------------------*/
 
-
-    /******** loop through rows - only operate on rows of original functions******/
+   /******** loop through rows - only operate on rows of original functions******/
 
    j_diag_pos = 0;
    j_offd_pos = 0;
    orig_diag_start = 0;
    orig_offd_start = 0;
 
-   for (i=0; i < num_rows_P; i++)
+   for (i = 0; i < num_rows_P; i++)
    {
-      orig_row_sum = 0.0;
-      new_row_sum = 0.0;
+      /* orig_row_sum = 0.0; */
+      /* new_row_sum = 0.0; */
       num_new_p_diag = 0;
       num_new_p_offd = 0;
 
@@ -653,18 +673,21 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
       p_count_diag = 0;/* number of entries of p added */
       p_count_offd = 0;
       q_count = 0; /* number of entries of q added */
-      for (j = 0; j< q_alloc; j++)
+      for (j = 0; j < q_alloc; j++)
       {
          is_q[j] = 0;
       }
 
-      fcn_num = (HYPRE_Int) fmod(i, num_functions);
+      fcn_num = (HYPRE_Int) hypre_fmod(i, num_functions);
       if (fcn_num != dof_func[i])
-         hypre_error_w_msg(HYPRE_ERROR_GENERIC,"WARNING - ROWS incorrectly ordered in hypre_BoomerAMG_LNExpandInterp!\n");
+      {
+         hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                           "WARNING - ROWS incorrectly ordered in hypre_BoomerAMG_LNExpandInterp!\n");
+      }
 
       /* number of elements in row of p*/
-      p_num_diag_elements = P_diag_i[i+1] - P_diag_i[i];
-      p_num_offd_elements = P_offd_i[i+1] - P_offd_i[i];
+      p_num_diag_elements = P_diag_i[i + 1] - P_diag_i[i];
+      p_num_offd_elements = P_offd_i[i + 1] - P_offd_i[i];
 
       num_new_p_diag = p_num_diag_elements;
       num_new_p_offd = p_num_offd_elements;
@@ -672,26 +695,28 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
       orig_diag_start =  P_diag_i[i];
       orig_offd_start =  P_offd_i[i];
 
-
       /* if original function dofs? or a new one that we don't want
        * to modify*/
       if (fcn_num < orig_nf || modify == 0 )
       {
-
          /* for this row, will we add q entries ? */
          if (fcn_num < orig_nf && num_smooth_vecs)
+         {
             add_q = 1;
+         }
          else
+         {
             add_q = 0;
+         }
 
          if (CF_marker[i] >= 0) /* row corres. to coarse point - just copy orig */
          {
             /* diag elements */
-            for (j=0; j < p_num_diag_elements; j++)
+            for (j = 0; j < p_num_diag_elements; j++)
             {
-               P_diag_data_new[j_diag_pos] = P_diag_data[orig_diag_start+j];
+               P_diag_data_new[j_diag_pos] = P_diag_data[orig_diag_start + j];
 
-               new_col = col_map[ P_diag_j[orig_diag_start+j]];
+               new_col = col_map[ P_diag_j[orig_diag_start + j]];
                P_diag_j_new[j_diag_pos] = new_col;
 
                j_diag_pos++;
@@ -701,14 +726,14 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
 
             /* offd elements */
             p_count_offd = p_count_diag;
-            for (j=0; j < p_num_offd_elements; j++)
+            for (j = 0; j < p_num_offd_elements; j++)
             {
-               P_offd_data_new[j_diag_pos] = P_offd_data[orig_offd_start+j];
+               P_offd_data_new[j_diag_pos] = P_offd_data[orig_offd_start + j];
 
                /* note that even though we are copying, j
                   needs to go back to regular numbering - will be
                   compressed later when col_map_offd is generated*/
-               index = P_offd_j[orig_offd_start+j];
+               index = P_offd_j[orig_offd_start + j];
 
                /* convert to the global col number using col_map_offd */
                big_index = col_map_offd_P[index];
@@ -717,7 +742,9 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
                 * use col_map[index]*/
                if (num_smooth_vecs && (level == interp_vec_first_level))
                {
-                  big_new_col = big_index + (big_index/(HYPRE_BigInt)num_functions) * (HYPRE_BigInt)num_smooth_vecs;
+                  big_new_col = big_index +
+                                (big_index / (HYPRE_BigInt)num_functions) *
+                                (HYPRE_BigInt)num_smooth_vecs;
                }
                else /* no adjustment */
                {
@@ -736,18 +763,20 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
               entries of q */
 
             /* diag entries */
-            for (j=0; j < p_num_diag_elements; j++)
+            for (j = 0; j < p_num_diag_elements; j++)
             {
-               orig_row_sum +=  P_diag_data[orig_diag_start+j];
+               /* orig_row_sum +=  P_diag_data[orig_diag_start + j]; */
                P_diag_data_new[j_diag_pos] = 0.0;
 
-               new_col = col_map[ P_diag_j[orig_diag_start+j]];
+               new_col = col_map[P_diag_j[orig_diag_start + j]];
                P_diag_j_new[j_diag_pos] = new_col;
 
                j_diag_pos++;
 
                if (q_alloc)
-                  is_q[p_count_diag] = 0; /* this entry is for orig p*/
+               {
+                  is_q[p_count_diag] = 0;   /* this entry is for orig p*/
+               }
                p_count_diag++;
                if (add_q)
                {
@@ -760,25 +789,27 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
                      j_diag_pos++;
 
                      if (q_alloc)
-                        is_q[p_count_diag] = k+1; /* this entry is for smoothvec k*/
+                     {
+                        is_q[p_count_diag] = k + 1;   /* this entry is for smoothvec k*/
+                     }
 
                      num_new_p_diag++;
                      q_count++;
                      p_count_diag++;
-
                   }
                }
             }
+
             /* offd */
             p_count_offd = p_count_diag; /* for indexing into is_q*/
-            for (j=0; j < p_num_offd_elements; j++)
+            for (j = 0; j < p_num_offd_elements; j++)
             {
-               orig_row_sum +=  P_offd_data[orig_offd_start+j];
+               /* orig_row_sum +=  P_offd_data[orig_offd_start + j]; */
                P_offd_data_new[j_offd_pos] = 0.0;
 
                /* j needs to go back to regular numbering - will be
                   compressed later when col_map_offd is generated*/
-               index = P_offd_j[orig_offd_start+j];
+               index = P_offd_j[orig_offd_start + j];
 
                /* convert to the global col number using col_map_offd */
                big_index = col_map_offd_P[index];
@@ -787,7 +818,8 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
                 * use col_map[index]*/
                if (num_smooth_vecs && (level == interp_vec_first_level))
                {
-                  big_new_col = big_index + (big_index/(HYPRE_BigInt) num_functions) * (HYPRE_BigInt)num_smooth_vecs;
+                  big_new_col = big_index + (big_index / (HYPRE_BigInt) num_functions) *
+                                (HYPRE_BigInt)num_smooth_vecs;
                }
                else /* no adjustment */
                {
@@ -799,7 +831,9 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
                j_offd_pos++;
 
                if (q_alloc)
-                  is_q[p_count_offd] = 0; /* this entry is for orig p*/
+               {
+                  is_q[p_count_offd] = 0;   /* this entry is for orig p*/
+               }
 
                p_count_offd++;
                if (add_q)
@@ -813,12 +847,13 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
                      j_offd_pos++;
 
                      if (q_alloc)
-                        is_q[p_count_offd] = k+1; /* this entry is for smoothvec k*/
+                     {
+                        is_q[p_count_offd] = k + 1;   /* this entry is for smoothvec k*/
+                     }
 
                      num_new_p_offd++;
                      q_count++;
                      p_count_offd++;
-
                   }
                }
             }
@@ -834,51 +869,56 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
                for (k = 0; k < num_smooth_vecs; k++)
                {
                   vector = smooth_vecs[k];
-                   vec_data = hypre_VectorData(hypre_ParVectorLocalVector(vector));
-
-                   for (jj = A_diag_i[i]; jj < A_diag_i[i+1]; jj++)
-                   {
+                  vec_data = hypre_VectorData(hypre_ParVectorLocalVector(vector));
 
-                      i1 = A_diag_j[jj];
-                      if (dof_func[i1] == fcn_num)
-                         r_extra[k] += A_diag_data[jj]*vec_data[i1];
+                  for (jj = A_diag_i[i]; jj < A_diag_i[i + 1]; jj++)
+                  {
 
-                   }
+                     i1 = A_diag_j[jj];
+                     if (dof_func[i1] == fcn_num)
+                     {
+                        r_extra[k] += A_diag_data[jj] * vec_data[i1];
+                     }
+                  }
 
-                   offd_vec_data =  smooth_vec_offd + k*num_cols_A_offd;
+                  offd_vec_data =  smooth_vec_offd + k * num_cols_A_offd;
 
-                   for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
-                   {
+                  for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
+                  {
 
-                      i1 = A_offd_j[jj];
-                      if (dof_func_offd[i1] == fcn_num)
-                         r_extra[k] += A_offd_data[jj]*offd_vec_data[i1];
+                     i1 = A_offd_j[jj];
+                     if (dof_func_offd[i1] == fcn_num)
+                     {
+                        r_extra[k] += A_offd_data[jj] * offd_vec_data[i1];
+                     }
 
-                   }
+                  }
                }
                /*find sum(a_if) */
                af_sum = 0.0;
 
-               for (jj = A_diag_i[i]+1; jj < A_diag_i[i+1]; jj++)
+               for (jj = A_diag_i[i] + 1; jj < A_diag_i[i + 1]; jj++)
                {
                   i1 = A_diag_j[jj];
                   if (dof_func[i1] == fcn_num && CF_marker[i1] < 0)
+                  {
                      af_sum +=  A_diag_data[jj];
-
+                  }
                }
-               for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+               for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
                {
                   i1 = A_offd_j[jj];
                   if (dof_func_offd[i1] == fcn_num && CF_marker_offd[i1] < 0)
+                  {
                      af_sum +=  A_offd_data[jj];
-
+                  }
                }
 
                if (af_sum != 0.0)
                {
                   for (k = 0; k < num_smooth_vecs; k++)
                   {
-                     adj[k] = r_extra[k]/af_sum;
+                     adj[k] = r_extra[k] / af_sum;
                   }
                }
                else /* there are no fine connections */
@@ -887,24 +927,27 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
                }
                /* now we will use the adjustment later */
 
-
                /* now if we have any coarse connections with no
                   corresponding point in orig p, then these we have to
                   distibute and treat as fine, basically*/
 
                /* diag first */
-               for (jj = A_diag_i[i]+ 1; jj < A_diag_i[i+1]; jj++)
+               for (jj = A_diag_i[i] + 1; jj < A_diag_i[i + 1]; jj++)
                {
                   found = 0;
                   jj_point = A_diag_j[jj]; /* fine index */
 
                   /* only want like unknowns */
                   if (fcn_num != dof_func[jj_point])
+                  {
                      continue;
+                  }
 
                   /*only look at coarse connections */
                   if (CF_marker[jj_point] < 0) /*fine*/
+                  {
                      continue;
+                  }
 
                   a_ij = A_diag_data[jj];
 
@@ -928,31 +971,37 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
                      {
                         for (k = 0; k < num_smooth_vecs; k++)
                         {
-                           adj[k] = r_extra[k]/af_sum;
+                           adj[k] = r_extra[k] / af_sum;
                         }
                      }
                   }
                } /* end diag loop */
+
                /* now offd loop */
-               for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+               for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
                {
                   found = 0;
                   jj_point = A_offd_j[jj]; /* fine index */
 
                   /* only want like unknowns */
                   if (fcn_num != dof_func_offd[jj_point])
+                  {
                      continue;
+                  }
 
                   /*only look at coarse connections */
                   if (CF_marker_offd[jj_point] < 0) /*fine*/
+                  {
                      continue;
+                  }
 
                   a_ij = A_offd_data[jj];
 
                   big_jj_point_c = fine_to_coarse_offd[jj_point]; /* now global num */
                   /* now need to adjust for new cols */
                   /* TO DO:  VERIFY THIS! */
-                  big_jj_point_c  = big_jj_point_c + (big_jj_point_c/(HYPRE_BigInt)num_functions) * (HYPRE_BigInt)num_smooth_vecs;
+                  big_jj_point_c  = big_jj_point_c + (big_jj_point_c / (HYPRE_BigInt)num_functions) *
+                                    (HYPRE_BigInt)num_smooth_vecs;
 
                   /* is there a P(i,jj_c)? */
                   for (kk = P_offd_i_new[i]; kk < P_offd_i_new[i] + num_new_p_offd; kk ++)
@@ -976,7 +1025,7 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
                      {
                         for (k = 0; k < num_smooth_vecs; k++)
                         {
-                           adj[k] = r_extra[k]/af_sum;
+                           adj[k] = r_extra[k] / af_sum;
                         }
                      }
                   }
@@ -1004,16 +1053,18 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
                      rows! (var 6 )*/
                   gm_row_sum = 0.0;
 
-                  for (j=0; j < p_num_diag_elements; j++)
+                  for (j = 0; j < p_num_diag_elements; j++)
                   {
-                     gm_row_sum +=  P_diag_data[orig_diag_start+j];
+                     gm_row_sum +=  P_diag_data[orig_diag_start + j];
                   }
-                  for (j=0; j < p_num_offd_elements; j++)
+                  for (j = 0; j < p_num_offd_elements; j++)
                   {
-                     gm_row_sum +=  P_offd_data[orig_offd_start+j];
+                     gm_row_sum +=  P_offd_data[orig_offd_start + j];
                   }
-                  if( (p_num_diag_elements+p_num_offd_elements) && (fabs(gm_row_sum) < 1e-15))
+                  if ( (p_num_diag_elements + p_num_offd_elements) && (hypre_abs(gm_row_sum) < 1e-15))
+                  {
                      gm_row_sum = 1.0;
+                  }
 
                }
 
@@ -1027,13 +1078,15 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
 
             /* FIRST LOOP OVER DIAG ELEMENTS */
             /* loop over elements in row i of A (except diagonal)*/
-            for (jj = A_diag_i[i]+1; jj < A_diag_i[i+1]; jj++)
+            for (jj = A_diag_i[i] + 1; jj < A_diag_i[i + 1]; jj++)
             {
                jj_point = A_diag_j[jj]; /* fine index */
 
                /* only want like unknowns */
                if (fcn_num != dof_func[jj_point])
+               {
                   continue;
+               }
 
                dist_coarse = 0;
                a_ij = A_diag_data[jj];
@@ -1042,7 +1095,6 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
                /* if (a_ij*d_sign > 0)
                   continue;*/
 
-
                found = 0;
                if (CF_marker[jj_point] >= 0) /*coarse*/
                {
@@ -1074,7 +1126,7 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
                      /*hypre_printf("dist coarse in i = %d\n", i);*/
                      dist_coarse = 1;
                   }
-                }
+               }
                else /*fine connection */
                {
                   use_alt_w = 0;
@@ -1084,12 +1136,12 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
                     ( need to do diag and offd) */
 
                   /* diag */
-                  for (pp = P_diag_i[jj_point]; pp < P_diag_i[jj_point+1]; pp++)
+                  for (pp = P_diag_i[jj_point]; pp < P_diag_i[jj_point + 1]; pp++)
                   {
 
                      p_point = P_diag_j[pp];/* this is a coarse index */
                      /* is p_point in row i also ? */
-                     for (kk = P_diag_i[i]; kk < P_diag_i[i+1]; kk ++)
+                     for (kk = P_diag_i[i]; kk < P_diag_i[i + 1]; kk ++)
                      {
                         kk_point = P_diag_j[kk]; /* this is a coarse index */
                         if (p_point == kk_point)
@@ -1102,12 +1154,12 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
                      }/* end loop kk over row i */
                   } /* end diag (end loop pp over row jj_point) */
                   /* offd */
-                  for (pp = P_offd_i[jj_point]; pp < P_offd_i[jj_point+1]; pp++)
+                  for (pp = P_offd_i[jj_point]; pp < P_offd_i[jj_point + 1]; pp++)
                   {
                      p_point = P_offd_j[pp];/* this is a coarse index */
 
                      /* is p_point in row i also ? check the offd part*/
-                     for (kk = P_offd_i[i]; kk < P_offd_i[i+1]; kk ++)
+                     for (kk = P_offd_i[i]; kk < P_offd_i[i + 1]; kk ++)
                      {
                         kk_point = P_offd_j[kk]; /* this is a coarse index */
                         if (p_point == kk_point)
@@ -1120,7 +1172,7 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
                      }/* end loop kk over row i */
                   } /* end offd */
 
-                  if (fabs(sum) < 1e-12)
+                  if (hypre_abs(sum) < 1e-12)
                   {
                      sum = 1.0;
                      use_alt_w = 1;
@@ -1129,20 +1181,22 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
                   if (use_alt_w)
                   {
                      /* distribute a_ij equally among coarse points */
-                     aw =  a_ij/( p_num_diag_elements + p_num_offd_elements);
+                     aw =  a_ij / ( p_num_diag_elements + p_num_offd_elements);
                      kk_count = 0;
                      /* loop through row i of orig p*/
                      /* diag first */
-                     for (kk = P_diag_i[i]; kk < P_diag_i[i+1]; kk++)
+                     for (kk = P_diag_i[i]; kk < P_diag_i[i + 1]; kk++)
                      {
                         kk_point = P_diag_j[kk]; /* this is a coarse index */
 
                         if (add_q)
                         {
-                           cur_spot =   P_diag_i_new[i] + kk_count*(num_smooth_vecs+1);
+                           cur_spot = P_diag_i_new[i] + kk_count * (num_smooth_vecs + 1);
                         }
                         else
-                           cur_spot =  P_diag_i_new[i] + kk_count;
+                        {
+                           cur_spot = P_diag_i_new[i] + kk_count;
+                        }
 
                         P_diag_data_new[cur_spot] += aw;
 
@@ -1159,22 +1213,21 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
                               fine_kk = coarse_to_fine[kk_point];
                               tmp_d1 = vec_data[jj_point] - adj[k];
                               tmp_d2 = vec_data[fine_kk];
-                              q_val =  aw*(tmp_d1 - tmp_d2);
+                              q_val =  aw * (tmp_d1 - tmp_d2);
 
-                              P_diag_data_new[cur_spot + k + 1]+= q_val;
+                              P_diag_data_new[cur_spot + k + 1] += q_val;
                            }
-
                         }
                         kk_count++;
                      } /* did each element of p_diag */
                      /* now do offd */
                      kk_count = 0;
-                     for (kk = P_offd_i[i]; kk < P_offd_i[i+1]; kk++)
+                     for (kk = P_offd_i[i]; kk < P_offd_i[i + 1]; kk++)
                      {
                         kk_point = P_offd_j[kk]; /* this is a coarse index */
                         if (add_q)
                         {
-                           cur_spot =   P_offd_i_new[i] + kk_count*(num_smooth_vecs+1);
+                           cur_spot =   P_offd_i_new[i] + kk_count * (num_smooth_vecs + 1);
                         }
                         else
                         {
@@ -1190,7 +1243,7 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
                               vector = smooth_vecs[k];
                               vec_data = hypre_VectorData(hypre_ParVectorLocalVector(vector));
                               /* alias the offd smooth vector */
-                              offd_vec_data_P = smooth_vec_offd_P + k*num_cols_P_offd;
+                              offd_vec_data_P = smooth_vec_offd_P + k * num_cols_P_offd;
 
                               /* q_val = a_ij* w_jk*[s(j) - s(k)] */
 
@@ -1200,8 +1253,8 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
                               tmp_d1 = vec_data[jj_point] - adj[k];
                               tmp_d2 = offd_vec_data_P[kk_point];
 
-                              q_val =  aw*(tmp_d1 - tmp_d2);
-                              P_offd_data_new[cur_spot + k + 1]+= q_val;
+                              q_val =  aw * (tmp_d1 - tmp_d2);
+                              P_offd_data_new[cur_spot + k + 1] += q_val;
                            }
                         }
 
@@ -1213,13 +1266,13 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
 
                   }/* end of alt w */
 
-                    /* Now we need to do the distributing (THIS COULD BE CODED MORE
-                       EFFICIENTLY (like classical interp )*/
+                  /* Now we need to do the distributing (THIS COULD BE CODED MORE
+                     EFFICIENTLY (like classical interp )*/
 
                   /* loop through row i (diag and off d) of orig p*/
                   /* first the diag part */
                   kk_count = 0;
-                  for (kk = P_diag_i[i]; kk < P_diag_i[i+1]; kk++)
+                  for (kk = P_diag_i[i]; kk < P_diag_i[i + 1]; kk++)
                   {
 
                      kk_point = P_diag_j[kk]; /* this is a coarse index */
@@ -1228,21 +1281,23 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
                         j came from A_diag */
 
                      found = 0;
-                     for (pp = P_diag_i[jj_point]; pp < P_diag_i[jj_point+1]; pp++)
+                     for (pp = P_diag_i[jj_point]; pp < P_diag_i[jj_point + 1]; pp++)
                      {
                         if (P_diag_j[pp] == kk_point)
                         {
                            found = 1;
                            /* a_ij*w_jk */
-                           aw =  a_ij*P_diag_data[pp];
-                           aw = aw/sum;
+                           aw =  a_ij * P_diag_data[pp];
+                           aw = aw / sum;
                            /* loc in new P */
                            if (add_q)
                            {
-                              cur_spot =   P_diag_i_new[i] + kk_count*(num_smooth_vecs+1);
+                              cur_spot =   P_diag_i_new[i] + kk_count * (num_smooth_vecs + 1);
                            }
                            else
+                           {
                               cur_spot =  P_diag_i_new[i] + kk_count;
+                           }
                            /* P_diag_data_new[k] += aw; */
                            P_diag_data_new[cur_spot] += aw;
 
@@ -1259,9 +1314,9 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
                                  fine_kk = coarse_to_fine[kk_point];
                                  tmp_d1 = vec_data[jj_point] - adj[k];
                                  tmp_d2 = vec_data[fine_kk];
-                                 q_val =  aw*(tmp_d1 - tmp_d2);
+                                 q_val =  aw * (tmp_d1 - tmp_d2);
 
-                                 P_diag_data_new[cur_spot + k + 1]+= q_val;
+                                 P_diag_data_new[cur_spot + k + 1] += q_val;
                               }
                            }
                            break;
@@ -1273,23 +1328,23 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
                   } /* end loop kk over row i of Pdiag */
                   /* now do the offd part */
                   kk_count = 0;
-                  for (kk = P_offd_i[i]; kk < P_offd_i[i+1]; kk++)
+                  for (kk = P_offd_i[i]; kk < P_offd_i[i + 1]; kk++)
                   {
                      kk_point = P_offd_j[kk]; /* this is a coarse index */
                      found = 0;
-                     for (pp = P_offd_i[jj_point]; pp < P_offd_i[jj_point+1]; pp++)
+                     for (pp = P_offd_i[jj_point]; pp < P_offd_i[jj_point + 1]; pp++)
                      {
                         if (P_offd_j[pp] == kk_point)
                         {
                            found = 1;
                            /* a_ij*w_jk */
-                           aw =  a_ij*P_offd_data[pp];
-                           aw = aw/sum;
+                           aw =  a_ij * P_offd_data[pp];
+                           aw = aw / sum;
 
                            /* loc in new P */
                            if (add_q)
                            {
-                              cur_spot =   P_offd_i_new[i] + kk_count*(num_smooth_vecs+1);
+                              cur_spot =   P_offd_i_new[i] + kk_count * (num_smooth_vecs + 1);
                            }
                            else
                            {
@@ -1305,16 +1360,16 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
                                  vec_data = hypre_VectorData(hypre_ParVectorLocalVector(vector));
 
                                  /* alias the offd smooth vector */
-                                 offd_vec_data_P = smooth_vec_offd_P + k*num_cols_P_offd;
+                                 offd_vec_data_P = smooth_vec_offd_P + k * num_cols_P_offd;
 
                                  /* jj_point is a fine index and kk_point is
                                     a coarse index that is offd */
                                  /* q_val = a_ij* w_jk*[s(j) - s(k)] */
                                  tmp_d1 = vec_data[jj_point] - adj[k]; /* jj point is in diag */
                                  tmp_d2 = offd_vec_data_P[kk_point];
-                                 q_val =  aw*(tmp_d1 - tmp_d2);
+                                 q_val =  aw * (tmp_d1 - tmp_d2);
 
-                                 P_offd_data_new[cur_spot + k + 1]+= q_val;
+                                 P_offd_data_new[cur_spot + k + 1] += q_val;
                               }
                            }/* end of add_q */
                            break;
@@ -1330,17 +1385,17 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
                {
                   /* coarse not in orig interp (weakly connected) */
                   /* distribute a_ij equally among coarse points */
-                  aw =  a_ij/(p_num_diag_elements + p_num_offd_elements);
+                  aw =  a_ij / (p_num_diag_elements + p_num_offd_elements);
                   kk_count = 0;
                   /* loop through row i of orig p (diag and offd)*/
                   /* diag */
-                  for (kk = P_diag_i[i]; kk < P_diag_i[i+1]; kk++)
+                  for (kk = P_diag_i[i]; kk < P_diag_i[i + 1]; kk++)
                   {
                      kk_point = P_diag_j[kk]; /* this is a coarse index */
 
                      if (add_q)
                      {
-                        cur_spot =   P_diag_i_new[i] + kk_count*(num_smooth_vecs+1);
+                        cur_spot =   P_diag_i_new[i] + kk_count * (num_smooth_vecs + 1);
                      }
                      else
                      {
@@ -1361,21 +1416,21 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
                            fine_kk = coarse_to_fine[kk_point];
                            tmp_d1 = vec_data[jj_point] - adj[k];
                            tmp_d2 = vec_data[fine_kk];
-                           q_val =  aw*(tmp_d1 - tmp_d2);
+                           q_val =  aw * (tmp_d1 - tmp_d2);
 
-                            P_diag_data_new[cur_spot + k + 1]+= q_val;
+                           P_diag_data_new[cur_spot + k + 1] += q_val;
                         }
                      }
                      kk_count++;
                   } /* did each diag element of p */
                   /* now off diag */
                   kk_count = 0;
-                  for (kk = P_offd_i[i]; kk < P_offd_i[i+1]; kk++)
+                  for (kk = P_offd_i[i]; kk < P_offd_i[i + 1]; kk++)
                   {
                      kk_point = P_offd_j[kk]; /* this is a coarse index */
                      if (add_q)
                      {
-                        cur_spot =   P_offd_i_new[i] + kk_count*(num_smooth_vecs+1);
+                        cur_spot =   P_offd_i_new[i] + kk_count * (num_smooth_vecs + 1);
                      }
                      else
                      {
@@ -1387,12 +1442,12 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
                      {
                         for (k = 0; k < num_smooth_vecs; k++)
                         {
-                            /* point to the smooth vector */
+                           /* point to the smooth vector */
                            vector = smooth_vecs[k];
                            vec_data = hypre_VectorData(hypre_ParVectorLocalVector(vector));
 
                            /* alias the offd smooth vector */
-                           offd_vec_data_P = smooth_vec_offd_P + k*num_cols_P_offd;
+                           offd_vec_data_P = smooth_vec_offd_P + k * num_cols_P_offd;
 
                            /* q_val = a_ij* w_jk*[s(j) - s(k)] */
 
@@ -1402,8 +1457,8 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
                            tmp_d1 = vec_data[jj_point] - adj[k];
                            tmp_d2 = offd_vec_data_P[kk_point];
 
-                           q_val =  aw*(tmp_d1 - tmp_d2);
-                           P_offd_data_new[cur_spot + k + 1]+= q_val;
+                           q_val =  aw * (tmp_d1 - tmp_d2);
+                           P_offd_data_new[cur_spot + k + 1] += q_val;
                         }
                      }
                      kk_count++;
@@ -1412,9 +1467,9 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
             }/* end loop jj over row i (diag part) of A */
 
 
-             /* Still looping over ith row of A - NOW LOOP OVER OFFD! */
+            /* Still looping over ith row of A - NOW LOOP OVER OFFD! */
 
-            for (jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+            for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
             {
 
                jj_point = A_offd_j[jj]; /* fine index */
@@ -1422,7 +1477,9 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
                /* only want like unknowns */
 
                if (fcn_num != dof_func_offd[jj_point])
+               {
                   continue;
+               }
 
                dist_coarse = 0;
                a_ij = A_offd_data[jj];
@@ -1435,13 +1492,13 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
 
                   /* CHECK THIS - changed on 11/24!! */
 
-                   /* find P(i,j_c) and put value there (there may not be
-                      an entry in P if this coarse connection was not a
-                      strong connection */
+                  /* find P(i,j_c) and put value there (there may not be
+                     an entry in P if this coarse connection was not a
+                     strong connection */
 
-                   /* we are looping in the off diag of this row, so we only
-                    * need to look in P_offd  - look in orig P*/
-                  for (kk = P_offd_i[i]; kk < P_offd_i[i+1]; kk ++)
+                  /* we are looping in the off diag of this row, so we only
+                   * need to look in P_offd  - look in orig P*/
+                  for (kk = P_offd_i[i]; kk < P_offd_i[i + 1]; kk ++)
                   {
                      index = P_offd_j[kk]; /* local number */
 
@@ -1455,7 +1512,8 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
                          * into account the new unknowns*/
                         if (num_smooth_vecs && (level == interp_vec_first_level))
                         {
-                           big_new_col = big_jj_point_c + (big_jj_point_c/(HYPRE_BigInt)num_functions) * (HYPRE_BigInt)num_smooth_vecs;
+                           big_new_col = big_jj_point_c + (big_jj_point_c / (HYPRE_BigInt)num_functions) *
+                                         (HYPRE_BigInt)num_smooth_vecs;
                         }
                         else /* no adjustment */
                         {
@@ -1499,14 +1557,14 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
                   /* now this is the row in P, but these are stored in P_ext according to offd of A */
                   j_ext_index = jj_point;
 
-                  for (pp = P_ext_i[j_ext_index]; pp < P_ext_i[j_ext_index+1]; pp++)
+                  for (pp = P_ext_i[j_ext_index]; pp < P_ext_i[j_ext_index + 1]; pp++)
                   {
                      p_point = (HYPRE_Int)P_ext_j[pp];/* this is a coarse index */
                      /* is p_point in row i also ?  check the diag of
                         offd part*/
                      if (p_point > -1) /* in diag part */
                      {
-                        for (kk = P_diag_i[i]; kk < P_diag_i[i+1]; kk++)
+                        for (kk = P_diag_i[i]; kk < P_diag_i[i + 1]; kk++)
                         {
                            kk_point = P_diag_j[kk]; /* this is a coarse index */
                            if (p_point == kk_point)
@@ -1520,9 +1578,9 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
                      }
                      else /* in offd diag part */
                      {
-                        p_point = -p_point-1;
+                        p_point = -p_point - 1;
                         /* p_point is a local col number for P now */
-                        for (kk = P_offd_i[i]; kk < P_offd_i[i+1]; kk ++)
+                        for (kk = P_offd_i[i]; kk < P_offd_i[i + 1]; kk ++)
                         {
                            kk_point = P_offd_j[kk]; /* this is a coarse index */
                            if (p_point == kk_point)
@@ -1536,7 +1594,7 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
                      }/* end if diag or offd */
 
                   }/* end loop over pp for j_ext_index */
-                  if (fabs(sum) < 1e-12)
+                  if (hypre_abs(sum) < 1e-12)
                   {
                      sum = 1.0;
                      use_alt_w = 1;
@@ -1544,21 +1602,23 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
                   if (use_alt_w)
                   {
                      /* distribute a_ij equally among coarse points */
-                     aw =  a_ij/( p_num_diag_elements + p_num_offd_elements);
+                     aw =  a_ij / ( p_num_diag_elements + p_num_offd_elements);
                      kk_count = 0;
 
                      /* loop through row i of orig p*/
                      /* diag first */
-                     for (kk = P_diag_i[i]; kk < P_diag_i[i+1]; kk++)
+                     for (kk = P_diag_i[i]; kk < P_diag_i[i + 1]; kk++)
                      {
                         kk_point = P_diag_j[kk]; /* this is a coarse index */
 
                         if (add_q)
                         {
-                           cur_spot =   P_diag_i_new[i] + kk_count*(num_smooth_vecs+1);
+                           cur_spot =   P_diag_i_new[i] + kk_count * (num_smooth_vecs + 1);
                         }
                         else
+                        {
                            cur_spot =  P_diag_i_new[i] + kk_count;
+                        }
 
                         P_diag_data_new[cur_spot] += aw;
 
@@ -1570,15 +1630,15 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
                               /* point to the smooth vector */
                               vector = smooth_vecs[k];
                               vec_data = hypre_VectorData(hypre_ParVectorLocalVector(vector));
-                              offd_vec_data = smooth_vec_offd + k*num_cols_A_offd;
+                              offd_vec_data = smooth_vec_offd + k * num_cols_A_offd;
 
                               /* q_val = a_ij* w_jk*[s(j) - s(k)] */
                               fine_kk = coarse_to_fine[kk_point];  /** kk point is a diag index */
                               tmp_d1 = offd_vec_data[jj_point] - adj[k]; /* jj_point is an offd index */
                               tmp_d2 = vec_data[fine_kk];
-                              q_val =  aw*(tmp_d1 - tmp_d2);
+                              q_val =  aw * (tmp_d1 - tmp_d2);
 
-                              P_diag_data_new[cur_spot + k + 1]+= q_val;
+                              P_diag_data_new[cur_spot + k + 1] += q_val;
                            }
 
                         }
@@ -1586,12 +1646,12 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
                      } /* did each element of p_diag */
                      /* now do offd */
                      kk_count = 0;
-                     for (kk = P_offd_i[i]; kk < P_offd_i[i+1]; kk++)
+                     for (kk = P_offd_i[i]; kk < P_offd_i[i + 1]; kk++)
                      {
                         kk_point = P_offd_j[kk]; /* this is a coarse index */
                         if (add_q)
                         {
-                           cur_spot =   P_offd_i_new[i] + kk_count*(num_smooth_vecs+1);
+                           cur_spot =   P_offd_i_new[i] + kk_count * (num_smooth_vecs + 1);
                         }
                         else
                         {
@@ -1604,8 +1664,8 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
                            for (k = 0; k < num_smooth_vecs; k++)
                            {
                               /* alias the offd smooth vector */
-                              offd_vec_data = smooth_vec_offd + k*num_cols_A_offd;
-                              offd_vec_data_P = smooth_vec_offd_P + k*num_cols_P_offd;
+                              offd_vec_data = smooth_vec_offd + k * num_cols_A_offd;
+                              offd_vec_data_P = smooth_vec_offd_P + k * num_cols_P_offd;
 
                               /* q_val = a_ij* w_jk*[s(j) - s(k)] */
 
@@ -1615,8 +1675,8 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
                               tmp_d1 = offd_vec_data[jj_point] - adj[k];
                               tmp_d2 = offd_vec_data_P[kk_point];
 
-                              q_val =  aw*(tmp_d1 - tmp_d2);
-                              P_offd_data_new[cur_spot + k + 1]+= q_val;
+                              q_val =  aw * (tmp_d1 - tmp_d2);
+                              P_offd_data_new[cur_spot + k + 1] += q_val;
                            }
                         }
 
@@ -1632,31 +1692,33 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
                   /* loop through row i (diag and off d) of orig p*/
                   /* first the diag part */
                   kk_count = 0;
-                  for (kk = P_diag_i[i]; kk < P_diag_i[i+1]; kk++)
+                  for (kk = P_diag_i[i]; kk < P_diag_i[i + 1]; kk++)
                   {
                      kk_point = P_diag_j[kk]; /* this is a coarse index */
                      /* now is there an entry for P(jj_point, kk_point)?  -
                         need to look through row jj_point (now off-proc since
                         jj came from A_offd */
                      found = 0;
-                     for (pp = P_ext_i[j_ext_index]; pp < P_ext_i[j_ext_index+1]; pp++)
+                     for (pp = P_ext_i[j_ext_index]; pp < P_ext_i[j_ext_index + 1]; pp++)
                      {
-                        p_point  = (HYPRE_Int)P_ext_j[pp];
+                        p_point = (HYPRE_Int) P_ext_j[pp];
                         if (p_point > -1) /* diag part */
                         {
                            if (p_point == kk_point)
                            {
                               found = 1;
                               /* a_ij*w_jk */
-                              aw =  a_ij*P_ext_data[pp];
-                              aw = aw/sum;
+                              aw =  a_ij * P_ext_data[pp];
+                              aw = aw / sum;
                               /* loc in new P */
                               if (add_q)
                               {
-                                 cur_spot =   P_diag_i_new[i] + kk_count*(num_smooth_vecs+1);
+                                 cur_spot =   P_diag_i_new[i] + kk_count * (num_smooth_vecs + 1);
                               }
                               else
+                              {
                                  cur_spot =  P_diag_i_new[i] + kk_count;
+                              }
                               /* P_diag_data_new[k] += aw; */
                               P_diag_data_new[cur_spot] += aw;
 
@@ -1668,15 +1730,15 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
                                     /* point to the smooth vector */
                                     vector = smooth_vecs[k];
                                     vec_data = hypre_VectorData(hypre_ParVectorLocalVector(vector));
-                                    offd_vec_data = smooth_vec_offd + k*num_cols_A_offd;
+                                    offd_vec_data = smooth_vec_offd + k * num_cols_A_offd;
 
                                     /* q_val = a_ij* w_jk*[s(j) - s(k)] */
                                     fine_kk = coarse_to_fine[kk_point]; /** kk point is a diag index */
                                     tmp_d1 = offd_vec_data[jj_point] - adj[k];/* jj_point is an offd index */
                                     tmp_d2 = vec_data[fine_kk];
-                                    q_val =  aw*(tmp_d1 - tmp_d2);
+                                    q_val =  aw * (tmp_d1 - tmp_d2);
 
-                                    P_diag_data_new[cur_spot + k + 1]+= q_val;
+                                    P_diag_data_new[cur_spot + k + 1] += q_val;
                                  }
 
                               }/* end addq */
@@ -1686,16 +1748,16 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
                      } /* end loop pp over P_ext_i[jj_point]*/
                      kk_count++;
                   } /* end loop kk over row i of Pdiag */
-                    /* now do the offd part */
+                  /* now do the offd part */
                   kk_count = 0;
-                  for (kk = P_offd_i[i]; kk < P_offd_i[i+1]; kk++)
+                  for (kk = P_offd_i[i]; kk < P_offd_i[i + 1]; kk++)
                   {
                      kk_point = P_offd_j[kk]; /* this is a coarse index */
                      found = 0;
                      /* now is there an entry for P(jj_point, kk_point)?  -
                         need to look through row j_point (on offproc since
                         jj came from A_offd */
-                     for (pp = P_ext_i[j_ext_index]; pp < P_ext_i[j_ext_index+1]; pp++)
+                     for (pp = P_ext_i[j_ext_index]; pp < P_ext_i[j_ext_index + 1]; pp++)
                      {
                         p_point  = (HYPRE_Int)P_ext_j[pp];
                         if (p_point < 0) /* in offd part */
@@ -1705,13 +1767,13 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
                            {
                               found = 1;
                               /* a_ij*w_jk */
-                              aw =  a_ij*P_ext_data[pp];
-                              aw = aw/sum;
+                              aw =  a_ij * P_ext_data[pp];
+                              aw = aw / sum;
 
                               /* loc in new P */
                               if (add_q)
                               {
-                                 cur_spot =   P_offd_i_new[i] + kk_count*(num_smooth_vecs+1);
+                                 cur_spot =   P_offd_i_new[i] + kk_count * (num_smooth_vecs + 1);
                               }
                               else
                               {
@@ -1724,17 +1786,17 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
                                  {
 
                                     /* alias the offd smooth vector */
-                                    offd_vec_data = smooth_vec_offd + k*num_cols_A_offd;
-                                    offd_vec_data_P = smooth_vec_offd_P + k*num_cols_P_offd;
+                                    offd_vec_data = smooth_vec_offd + k * num_cols_A_offd;
+                                    offd_vec_data_P = smooth_vec_offd_P + k * num_cols_P_offd;
 
                                     /* jj_point is a fine index and kk_point is
                                        a coarse index */
                                     /* q_val = a_ij* w_jk*[s(j) - s(k)] */
                                     tmp_d1 = offd_vec_data[jj_point] - adj[k];
                                     tmp_d2 = offd_vec_data_P[kk_point];
-                                    q_val =  aw*(tmp_d1 - tmp_d2);
+                                    q_val =  aw * (tmp_d1 - tmp_d2);
 
-                                    P_offd_data_new[cur_spot + k + 1]+= q_val;
+                                    P_offd_data_new[cur_spot + k + 1] += q_val;
                                  }
                               }/* end of add_q */
                               break;
@@ -1750,17 +1812,17 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
                {
                   /* coarse not in orig interp (weakly connected) */
                   /* distribute a_ij equally among coarse points */
-                  aw =  a_ij/(p_num_diag_elements + p_num_offd_elements);
+                  aw =  a_ij / (p_num_diag_elements + p_num_offd_elements);
                   kk_count = 0;
                   /* loop through row i of orig p (diag and offd)*/
                   /* diag */
-                  for (kk = P_diag_i[i]; kk < P_diag_i[i+1]; kk++)
+                  for (kk = P_diag_i[i]; kk < P_diag_i[i + 1]; kk++)
                   {
                      kk_point = P_diag_j[kk]; /* this is a coarse index */
 
                      if (add_q)
                      {
-                        cur_spot =   P_diag_i_new[i] + kk_count*(num_smooth_vecs+1);
+                        cur_spot =   P_diag_i_new[i] + kk_count * (num_smooth_vecs + 1);
                      }
                      else
                      {
@@ -1768,7 +1830,7 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
                      }
                      P_diag_data_new[cur_spot] += aw;
 
-                      /*add q? */
+                     /*add q? */
                      if (add_q)
                      {
                         for (k = 0; k < num_smooth_vecs; k++)
@@ -1776,29 +1838,29 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
                            /* point to the smooth vector */
                            vector = smooth_vecs[k];
                            vec_data = hypre_VectorData(hypre_ParVectorLocalVector(vector));
-                            offd_vec_data = smooth_vec_offd + k*num_cols_A_offd;
+                           offd_vec_data = smooth_vec_offd + k * num_cols_A_offd;
 
                            /* q_val = a_ij* w_jk*[s(j) - s(k)] */
                            fine_kk = coarse_to_fine[kk_point];/** kk point is a diag index */
                            tmp_d1 = offd_vec_data[jj_point] - adj[k];/* jj_point is an offd index */
                            tmp_d2 = vec_data[fine_kk];
-                           q_val =  aw*(tmp_d1 - tmp_d2);
+                           q_val =  aw * (tmp_d1 - tmp_d2);
 
 
-                           P_diag_data_new[cur_spot + k + 1]+= q_val;
+                           P_diag_data_new[cur_spot + k + 1] += q_val;
                         }
 
                      }
                      kk_count++;
                   } /* did each diag element of p */
-                   /* now off-diag */
+                  /* now off-diag */
                   kk_count = 0;
-                  for (kk = P_offd_i[i]; kk < P_offd_i[i+1]; kk++)
+                  for (kk = P_offd_i[i]; kk < P_offd_i[i + 1]; kk++)
                   {
                      kk_point = P_offd_j[kk]; /* this is a coarse index */
                      if (add_q)
                      {
-                        cur_spot =   P_offd_i_new[i] + kk_count*(num_smooth_vecs+1);
+                        cur_spot =   P_offd_i_new[i] + kk_count * (num_smooth_vecs + 1);
                      }
                      else
                      {
@@ -1811,8 +1873,8 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
                         for (k = 0; k < num_smooth_vecs; k++)
                         {
                            /* alias the offd smooth vector */
-                           offd_vec_data = smooth_vec_offd + k*num_cols_A_offd;
-                           offd_vec_data_P = smooth_vec_offd_P + k*num_cols_P_offd;
+                           offd_vec_data = smooth_vec_offd + k * num_cols_A_offd;
+                           offd_vec_data_P = smooth_vec_offd_P + k * num_cols_P_offd;
 
                            /* q_val = a_ij* w_jk*[s(j) - s(k)] */
 
@@ -1822,8 +1884,8 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
                            tmp_d1 = offd_vec_data[jj_point] - adj[k];
                            tmp_d2 = offd_vec_data_P[kk_point];
 
-                           q_val =  aw*(tmp_d1 - tmp_d2);
-                           P_offd_data_new[cur_spot + k + 1]+= q_val;
+                           q_val =  aw * (tmp_d1 - tmp_d2);
+                           P_offd_data_new[cur_spot + k + 1] += q_val;
                         }
                      }
                      kk_count++;
@@ -1834,7 +1896,7 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
             } /* end of jj loop over offd of A */
 
             /* now divide by the diagonal and we are finished with this row!*/
-            if (fabs(diagonal) > 0.0)
+            if (hypre_abs(diagonal) > 0.0)
             {
                for (kk = P_diag_i_new[i] ; kk <  P_diag_i_new[i] + num_new_p_diag; kk++)
                {
@@ -1842,13 +1904,18 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
                   /* want new_row_sum only to be orig p elements (not q) */
                   new_col =  P_diag_j_new[kk];
                   if (level == interp_vec_first_level)
-                     fcn_num = (HYPRE_Int) fmod(new_col, num_functions + num_smooth_vecs);
+                  {
+                     fcn_num = (HYPRE_Int) hypre_fmod(new_col, num_functions + num_smooth_vecs);
+                  }
                   else
-                     fcn_num = (HYPRE_Int) fmod(new_col, num_functions);
-
-                  if (fcn_num < orig_nf)
-                     new_row_sum +=  P_diag_data_new[kk];
+                  {
+                     fcn_num = (HYPRE_Int) hypre_fmod(new_col, num_functions);
+                  }
 
+                  /* if (fcn_num < orig_nf) */
+                  /* { */
+                  /*    new_row_sum +=  P_diag_data_new[kk]; */
+                  /* } */
                }
                for (kk = P_offd_i_new[i] ; kk <  P_offd_i_new[i] + num_new_p_offd; kk++)
                {
@@ -1856,13 +1923,18 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
                   /* want new_row_sum only to be orig p elements (not q) */
                   big_new_col =  P_offd_j_big[kk];
                   if (level == interp_vec_first_level)
-                     fcn_num = (HYPRE_Int) fmod((HYPRE_Real)big_new_col, num_functions + num_smooth_vecs);
+                  {
+                     fcn_num = (HYPRE_Int) hypre_fmod((HYPRE_Real)big_new_col, num_functions + num_smooth_vecs);
+                  }
                   else
-                     fcn_num = (HYPRE_Int) fmod((HYPRE_Real)big_new_col, num_functions);
-
-                  if (fcn_num < orig_nf)
-                     new_row_sum +=  P_offd_data_new[kk];
+                  {
+                     fcn_num = (HYPRE_Int) hypre_fmod((HYPRE_Real)big_new_col, num_functions);
+                  }
 
+                  /* if (fcn_num < orig_nf) */
+                  /* { */
+                  /*    new_row_sum +=  P_offd_data_new[kk]; */
+                  /* } */
                }
             }
             /* if we had no fc, then the Q entries are zero - let's do
@@ -1877,19 +1949,27 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
                {
                   new_col =  P_diag_j_new[kk];
                   if (level == interp_vec_first_level)
+                  {
                      num_f = num_functions + num_smooth_vecs;
+                  }
                   else
+                  {
                      num_f = num_functions;
+                  }
 
-                  fcn_num = (HYPRE_Int) fmod(new_col, num_f);
+                  fcn_num = (HYPRE_Int) hypre_fmod(new_col, num_f);
 
                   if (fcn_num < orig_nf)
                   {
                      /* get the old col number back to index into vector */
                      if (level == interp_vec_first_level )
-                        c_col = new_col - (HYPRE_Int) floor((HYPRE_Real) new_col/ (HYPRE_Real) num_f);
+                     {
+                        c_col = new_col - (HYPRE_Int) hypre_floor((HYPRE_Real) new_col / (HYPRE_Real) num_f);
+                     }
                      else
+                     {
                         c_col = new_col;
+                     }
 
                      c_col = coarse_to_fine[c_col];
 
@@ -1900,7 +1980,7 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
                         vec_data = hypre_VectorData(hypre_ParVectorLocalVector(vector));
                         /*dt =  P_diag_data_new[kk];
                         dt = (vec_data[i]/gm_row_sum - vec_data[c_col]);*/
-                        value  = P_diag_data_new[kk]*(vec_data[i]/gm_row_sum - vec_data[c_col]);
+                        value  = P_diag_data_new[kk] * (vec_data[i] / gm_row_sum - vec_data[c_col]);
                         P_diag_data_new[kk + k + 1] = value;
                      }
 
@@ -1911,18 +1991,27 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
                {
                   big_new_col =  P_offd_j_big[kk];
                   if (level == interp_vec_first_level)
+                  {
                      num_f = num_functions + num_smooth_vecs;
+                  }
                   else
+                  {
                      num_f = num_functions;
-                  fcn_num = (HYPRE_Int) fmod((HYPRE_Real)big_new_col, num_f);
+                  }
+                  fcn_num = (HYPRE_Int) hypre_fmod((HYPRE_Real)big_new_col, num_f);
 
                   if (fcn_num < orig_nf)
                   {
                      if (level == interp_vec_first_level )
                         /* get the old col number back to index into vector */
-                        c_col = (HYPRE_Int) big_new_col - floor((HYPRE_Real) big_new_col/ (HYPRE_Real) num_f);
+                     {
+                        c_col = (HYPRE_Int)((HYPRE_Int) big_new_col - hypre_floor((HYPRE_Real) big_new_col /
+                                                                                  (HYPRE_Real) num_f));
+                     }
                      else
+                     {
                         c_col = (HYPRE_Int) big_new_col;
+                     }
 
                      for (k = 0; k < num_smooth_vecs; k++)
                      {
@@ -1930,11 +2019,11 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
                         vec_data = hypre_VectorData(hypre_ParVectorLocalVector(vector));
 
                         /* alias the offd smooth vector */
-                        offd_vec_data_P = smooth_vec_offd_P + k*num_cols_P_offd;
+                        offd_vec_data_P = smooth_vec_offd_P + k * num_cols_P_offd;
 
                         /*dt =  P_offd_data_new[kk];
                         dt = (vec_data[i]/gm_row_sum - offd_vec_data_P[c_col]);*/
-                        value  = P_offd_data_new[kk]*(vec_data[i]/gm_row_sum - offd_vec_data_P[c_col]);
+                        value  = P_offd_data_new[kk] * (vec_data[i] / gm_row_sum - offd_vec_data_P[c_col]);
                         P_offd_data_new[kk + k + 1] = value;
 
                      }
@@ -1951,26 +2040,26 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
          if (CF_marker[i] >= 0) /* row corres. to coarse point - just copy orig */
          {
             /* diag */
-            for (j=0; j < p_num_diag_elements; j++)
+            for (j = 0; j < p_num_diag_elements; j++)
             {
-               P_diag_data_new[j_diag_pos] = P_diag_data[orig_diag_start+j];
+               P_diag_data_new[j_diag_pos] = P_diag_data[orig_diag_start + j];
 
-               new_col = col_map[ P_diag_j[orig_diag_start+j]];
-               P_diag_j_new[j_diag_pos] =new_col;
+               new_col = col_map[ P_diag_j[orig_diag_start + j]];
+               P_diag_j_new[j_diag_pos] = new_col;
 
                j_diag_pos++;
                p_count_diag++;
             }
             /* offd elements */
             p_count_offd = p_count_diag;
-            for (j=0; j < p_num_offd_elements; j++)
+            for (j = 0; j < p_num_offd_elements; j++)
             {
-               P_offd_data_new[j_offd_pos] = P_offd_data[orig_offd_start+j];
+               P_offd_data_new[j_offd_pos] = P_offd_data[orig_offd_start + j];
 
                /* note that even though we are copying, j
                   needs to go back to regular numbering - will be
                   compressed later when col_map_offd is generated*/
-               index = P_offd_j[orig_offd_start+j];
+               index = P_offd_j[orig_offd_start + j];
 
                /* convert to the global col number using col_map_offd */
                big_index = col_map_offd_P[index];
@@ -1979,7 +2068,7 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
                 * use col_map[index]*/
                if (num_smooth_vecs && (level == interp_vec_first_level))
                {
-                  big_new_col = big_index + (big_index/(HYPRE_BigInt)num_functions) * (HYPRE_BigInt)num_smooth_vecs;
+                  big_new_col = big_index + (big_index / (HYPRE_BigInt)num_functions) * (HYPRE_BigInt)num_smooth_vecs;
                }
                else /* no adjustment */
                {
@@ -2002,31 +2091,31 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
 
             /* replace each element of P*/
             /* DIAG */
-            for (j=0; j < p_num_diag_elements; j++)
+            for (j = 0; j < p_num_diag_elements; j++)
             {
                m_val = 0.0;
 
-               for (m = 0; m< orig_nf; m++)
+               for (m = 0; m < orig_nf; m++)
                {
-                  m_pos = P_diag_i[i - (fcn_num - m)]+ j; /* recall - nodal coarsening */
-                  m_val += theta[m]*P_diag_data[m_pos];
+                  m_pos = P_diag_i[i - (fcn_num - m)] + j; /* recall - nodal coarsening */
+                  m_val += theta[m] * P_diag_data[m_pos];
                }
-               P_diag_j_new[j_diag_pos] = P_diag_j[orig_diag_start+j];
+               P_diag_j_new[j_diag_pos] = P_diag_j[orig_diag_start + j];
                P_diag_data_new[j_diag_pos] = m_val;
                j_diag_pos++;
                p_count_diag++;
             }
             /* OFF-DIAG */
             p_count_offd = p_count_diag;
-            for (j=0; j < p_num_offd_elements; j++)
+            for (j = 0; j < p_num_offd_elements; j++)
             {
                m_val = 0.0;
-               for (m = 0; m< orig_nf; m++)
+               for (m = 0; m < orig_nf; m++)
                {
-                  m_pos = P_offd_i[i - (fcn_num - m)]+ j; /* recall - nodal coarsening */
-                  m_val += theta[m]*P_offd_data[m_pos];
+                  m_pos = P_offd_i[i - (fcn_num - m)] + j; /* recall - nodal coarsening */
+                  m_val += theta[m] * P_offd_data[m_pos];
                }
-               index = P_offd_j[orig_offd_start+j];
+               index = P_offd_j[orig_offd_start + j];
                /* convert to the global col number using col_map_offd */
                big_index = col_map_offd_P[index];
 
@@ -2038,319 +2127,322 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
 
       }/*end of modify */
 
-       /* update i */
-      P_diag_i_new[i+1] = P_diag_i_new[i] + num_new_p_diag;
-      P_offd_i_new[i+1] = P_offd_i_new[i] + num_new_p_offd;
-
+      /* update i */
+      P_diag_i_new[i + 1] = P_diag_i_new[i] + num_new_p_diag;
+      P_offd_i_new[i + 1] = P_offd_i_new[i] + num_new_p_offd;
 
       /* adjust p_count_offd to not include diag*/
       p_count_offd = p_count_offd - p_count_diag;
 
-
       if (p_count_diag != num_new_p_diag)
-         hypre_error_w_msg(HYPRE_ERROR_GENERIC,"Error diag p_count in hypre_BoomerAMG_LNExpandInterp!\n");
+      {
+         hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Error diag p_count in hypre_BoomerAMG_LNExpandInterp!\n");
+      }
 
       if (p_count_offd != num_new_p_offd)
-         hypre_error_w_msg(HYPRE_ERROR_GENERIC,"Error offd p_count in hypre_BoomerAMG_LNExpandInterp!\n");
-
-
-       /* NOW TRUNCATE Q ?*/
-       if ( add_q && q_count > 0  && (q_max > 0 || abs_trunc > 0.0))
-       {
-          HYPRE_Real value, lost_value, q_dist_value;
-          HYPRE_Int q_count_k, num_lost, p_count_tot;
-          HYPRE_Int lost_counter_diag, lost_counter_offd, j_counter;
-          HYPRE_Int new_num_q, new_j_counter, new_diag_pos, new_offd_pos;
-          HYPRE_Int i_qmax, lost_counter_q;
-          /* loop through the smooth vectors - we have to do the q
-             with each smooth vec separately
-             TO DO: re-write to not have this outter loop (like the GM
-             interpolation.)  I am not doing this now as we may change
-             the LN truncation strategy entirely :)
-          */
-          for (k = 0; k < num_smooth_vecs; k++)
-          {
-             q_count_k = 0;
-             lost_value = 0.0;
-             num_lost = 0;
-             i_qmax = 0;
-
-             /* first do absolute truncation */
-             if (abs_trunc > 0.0)
-             {
-                /* find out if any will be dropped */
-                j_counter = 0;
-                /* diag loop */
-                for(j =  P_diag_i_new[i]; j <  P_diag_i_new[i] + p_count_diag; j++)
-                {
-                   if (is_q[j_counter] == (k+1))
-                   {
-                      q_count_k++;
-                      value = fabs(P_diag_data_new[j]);
-                      if (value < abs_trunc)
-                      {
-                         num_lost ++;
-                         lost_value += P_diag_data_new[j];
-                      }
-                   }
-                   j_counter++;
-                }
-                /* offd loop  - don't reset j_counter*/
-                for(j =  P_offd_i_new[i]; j <  P_offd_i_new[i] + p_count_offd; j++)
-                {
-                   if (is_q[j_counter] == (k+1))
-                   {
-                      q_count_k++;
-                      value = fabs(P_offd_data_new[j]);
-                      if (value < abs_trunc)
-                      {
-                         num_lost ++;
-                         lost_value += P_offd_data_new[j];
-                      }
-                   }
-                   j_counter++;
-                }
-                /* now drop and adjust values of other entries in Q */
-                if (num_lost)
-                {
-                   if ((q_count_k - num_lost) > 0)
-                   {
-                      q_dist_value = lost_value/(q_count_k - num_lost);
-                   }
-                   else
-                   {
-                      /* originall had this, but this makes it
-                       * imposssible to get low complexities */
-                      /* i_qmax = 1;
-                         num_lost = 0;
-                         hypre_printf("Warning: dropping all of Q; level = %d, i = %d, num = %d\n", level, i, num_lost);*/
-                   }
-                }
-                if (num_lost)
-                {
-
-                   new_j_counter = 0;
-                   lost_counter_diag = 0;
-                   q_dist_value = 0.0;
-
-                   /* diag */
-                   new_diag_pos =  P_diag_i_new[i];
-                   j_counter = 0;
-                   for(j =  P_diag_i_new[i]; j < P_diag_i_new[i] + p_count_diag  ; j++)
-                   {
-
-                      value = fabs(P_diag_data_new[j]);
-
-                      if ( is_q[j_counter] == (k+1) && (value < abs_trunc) )
-                      {
-                         /* drop */
-                         lost_counter_diag++;
-                      }
-                      else /* keep */
-                      {
-                         /* for k, keep this q and add the q_dist (also copy the
-                          * orig. p and other q not corres to this
-                          * k) */
-                         value =  P_diag_data_new[j];
-                         if (is_q[j_counter] == (k+1))
-                         {
-                            value += q_dist_value;
-                         }
-                         P_diag_data_new[new_diag_pos] = value;
-                         P_diag_j_new[new_diag_pos] = P_diag_j_new[j];
-                         new_diag_pos++;
-
-                         is_q[new_j_counter] = is_q[j_counter];
-                         new_j_counter++;
-
-                      }
-                      j_counter++;
-                   } /* end loop though j */
-
-                   p_count_diag -= lost_counter_diag;
-                   j_diag_pos -= lost_counter_diag;
-
-                   /* offd */
-                   lost_counter_offd = 0;
-                   new_offd_pos =  P_offd_i_new[i];
-                   for(j =  P_offd_i_new[i]; j < P_offd_i_new[i] + p_count_offd  ; j++)
-                   {
-                      value = fabs(P_offd_data_new[j]);
-
-                      if ( is_q[j_counter] == (k+1) && (value < abs_trunc) )
-                      {
-                         /* drop */
-                         lost_counter_offd++;
-                      }
-                      else /* keep */
-                      {
-                         /* for k, keep this q and add the q_dist (also copy the
-                          * orig. p and other q not corres to this
-                          * k) */
-                         value =  P_offd_data_new[j];
-                         if (is_q[j_counter] == (k+1))
-                         {
-                            value += q_dist_value;
-                         }
-                         P_offd_data_new[new_offd_pos] = value;
-                         P_offd_j_big[new_offd_pos] = P_offd_j_big[j];
-                         new_offd_pos++;
-
-                         is_q[new_j_counter] = is_q[j_counter];
-                         new_j_counter++;
-
-                      }
-                      j_counter++;
-                   } /* end loop though j */
-
-                   p_count_offd -= lost_counter_offd;
-                   j_offd_pos -= lost_counter_offd;
-
-                } /* end if num_lost */
-             }
-
-             /* now max num elements truncation */
-             if (i_qmax)
-                loop_q_max = 1; /* not used currently */
-             else
-                loop_q_max = q_max;
-
-             if (loop_q_max > 0)
-             {
-                /* copy all elements for the row and count the q's for
-                 * this smoothvec*/
-                q_count_k = 0;
-                j_counter = 0;
-                for (j = P_diag_i_new[i]; j < P_diag_i_new[i]+ p_count_diag; j++)
-                {
-                   if (is_q[j_counter] == (k+1))
-                      q_count_k++;
-
-                   aux_j[j_counter] = (HYPRE_BigInt)P_diag_j_new[j];
-                   aux_data[j_counter] = P_diag_data_new[j];
-                   is_diag[j_counter] = 1;
-                   j_counter++;
-
-                }
-
-
-                /* offd loop  - don't reset j_counter*/
-                for (j = P_offd_i_new[i]; j < P_offd_i_new[i]+ p_count_offd; j++)
-                {
-                   if (is_q[j_counter] == (k+1))
-                      q_count_k++;
-
-                   aux_j[j_counter] = P_offd_j_big[j];
-                   aux_data[j_counter] = P_offd_data_new[j];
-                   is_diag[j_counter] = 0;
-                   j_counter++;
-
-                }
-
-                new_num_q = q_count_k;
-                num_lost = q_count_k - loop_q_max;
-
-                if (num_lost > 0)
-                {
-
-                   p_count_tot = p_count_diag + p_count_offd;
-
-                   /* only keep loop_q_max elements - get rid of smallest */
-                   hypre_BigQsort4_abs(aux_data, aux_j, is_q, is_diag, 0 , p_count_tot -1);
-
-                   lost_value = 0.0;
-                   lost_counter_q = 0;
-                   lost_counter_diag = 0;
-                   lost_counter_offd = 0;
-
-                   j_counter = 0;
-
-                   new_diag_pos =  P_diag_i_new[i];
-                   new_offd_pos =  P_offd_i_new[i];
-
-                   new_j_counter = 0;
-
-                   /* have to do diag and offd together because of sorting*/
-                   for(j =  0; j < p_count_tot; j++)
-                   {
-
-                      if ((is_q[j_counter] == (k+1)) && (lost_counter_q < num_lost))
-                      {
-
-                         /*drop*/
-                         lost_value += aux_data[j_counter];
-                         lost_counter_q++;
-
-                         /* check whether this is diag or offd element */
-                         if (is_diag[j])
-                         {
-                            lost_counter_diag++;
-                         }
-                         else
-                         {
-                            lost_counter_offd++;
-                         }
-                         new_num_q--;
-
-                         /* technically only need to do this the last time */
-                         q_dist_value = lost_value/loop_q_max;
-                      }
-                      else
-                      {
-                         /* keep and add to the q values (copy q)*/
-                         value =  aux_data[j_counter];
-                         if (is_q[j_counter] == (k+1))
-                            value += q_dist_value;
-
-                         if (is_diag[j])
-                         {
-                            P_diag_data_new[new_diag_pos] = value;
-                            P_diag_j_new[new_diag_pos] = aux_j[j_counter];
-                            new_diag_pos++;
-
-                            is_q[new_j_counter] = is_q[j_counter];
-                            new_j_counter++;
-                         }
-                         else
-                         {
-                            P_offd_data_new[new_offd_pos] = value;
-                            P_offd_j_big[new_offd_pos] = aux_j[j];
-                            new_offd_pos++;
-                            is_q[new_j_counter] = is_q[j];
-                            new_j_counter++;
-                         }
-                      }
-                      j_counter++;
+      {
+         hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Error offd p_count in hypre_BoomerAMG_LNExpandInterp!\n");
+      }
 
-                   }/* end element loop */
-                   /* adjust p_count and j_pos */
-                   p_count_diag -= lost_counter_diag;
-                   p_count_offd -= lost_counter_offd;
+      /* NOW TRUNCATE Q ?*/
+      if (add_q && q_count > 0  && (q_max > 0 || abs_trunc > 0.0))
+      {
+         HYPRE_Real value, lost_value, q_dist_value = 0.0;
+         HYPRE_Int q_count_k, num_lost, p_count_tot;
+         HYPRE_Int lost_counter_diag, lost_counter_offd, j_counter;
+         HYPRE_Int new_j_counter, new_diag_pos, new_offd_pos;
+         //HYPRE_Int new_num_q;
+         HYPRE_Int i_qmax, lost_counter_q;
+         /* loop through the smooth vectors - we have to do the q
+            with each smooth vec separately
+            TO DO: re-write to not have this outter loop (like the GM
+            interpolation.)  I am not doing this now as we may change
+            the LN truncation strategy entirely :)
+         */
+         for (k = 0; k < num_smooth_vecs; k++)
+         {
+            q_count_k = 0;
+            lost_value = 0.0;
+            num_lost = 0;
+            i_qmax = 0;
 
-                   j_diag_pos -= lost_counter_diag;
-                   j_offd_pos -= lost_counter_offd;
+            /* first do absolute truncation */
+            if (abs_trunc > 0.0)
+            {
+               /* find out if any will be dropped */
+               j_counter = 0;
 
+               /* diag loop */
+               for (j =  P_diag_i_new[i]; j <  P_diag_i_new[i] + p_count_diag; j++)
+               {
+                  if (is_q[j_counter] == (k + 1))
+                  {
+                     q_count_k++;
+                     value = hypre_abs(P_diag_data_new[j]);
+                     if (value < abs_trunc)
+                     {
+                        num_lost ++;
+                        lost_value += P_diag_data_new[j];
+                     }
+                  }
+                  j_counter++;
+               }
 
-                } /* end num lost > 0 */
+               /* offd loop  - don't reset j_counter*/
+               for (j =  P_offd_i_new[i]; j <  P_offd_i_new[i] + p_count_offd; j++)
+               {
+                  if (is_q[j_counter] == (k + 1))
+                  {
+                     q_count_k++;
+                     value = hypre_abs(P_offd_data_new[j]);
+                     if (value < abs_trunc)
+                     {
+                        num_lost ++;
+                        lost_value += P_offd_data_new[j];
+                     }
+                  }
+                  j_counter++;
+               }
 
-             } /* end loop_q_max > 0  - element truncation */
-
-
-          }/* end of loop through smoothvecs */
+               /* now drop and adjust values of other entries in Q */
+               if (num_lost)
+               {
+                  if ((q_count_k - num_lost) > 0)
+                  {
+                     q_dist_value = lost_value / (q_count_k - num_lost);
+                  }
+                  else
+                  {
+                     /* originall had this, but this makes it
+                      * imposssible to get low complexities */
+                     /* i_qmax = 1;
+                        num_lost = 0;
+                        hypre_printf("Warning: dropping all of Q; level = %d, i = %d, num = %d\n", level, i, num_lost);*/
+                  }
+               }
 
-          P_diag_i_new[i+1] = P_diag_i_new[i] + p_count_diag;
-          P_offd_i_new[i+1] = P_offd_i_new[i] + p_count_offd;
-
-       }/* end of truncation*/
+               if (num_lost)
+               {
+                  new_j_counter = 0;
+                  lost_counter_diag = 0;
+                  q_dist_value = 0.0;
 
-       if (j_diag_pos != P_diag_i_new[i+1])
-       {
-          hypre_error_w_msg(HYPRE_ERROR_GENERIC,"Warning - diag Row Problem in hypre_BoomerAMG_LNExpandInterp!\n");
-       }
-       if (j_offd_pos != P_offd_i_new[i+1])
-       {
-          hypre_error_w_msg(HYPRE_ERROR_GENERIC,"Warning - off-diag Row Problem in hypre_BoomerAMG_LNExpandInterp!\n");
-       }
+                  /* diag */
+                  new_diag_pos =  P_diag_i_new[i];
+                  j_counter = 0;
+                  for (j =  P_diag_i_new[i]; j < P_diag_i_new[i] + p_count_diag  ; j++)
+                  {
+
+                     value = hypre_abs(P_diag_data_new[j]);
+
+                     if ( is_q[j_counter] == (k + 1) && (value < abs_trunc) )
+                     {
+                        /* drop */
+                        lost_counter_diag++;
+                     }
+                     else /* keep */
+                     {
+                        /* for k, keep this q and add the q_dist (also copy the
+                         * orig. p and other q not corres to this
+                         * k) */
+                        value =  P_diag_data_new[j];
+                        if (is_q[j_counter] == (k + 1))
+                        {
+                           value += q_dist_value;
+                        }
+                        P_diag_data_new[new_diag_pos] = value;
+                        P_diag_j_new[new_diag_pos] = P_diag_j_new[j];
+                        new_diag_pos++;
+
+                        is_q[new_j_counter] = is_q[j_counter];
+                        new_j_counter++;
+
+                     }
+                     j_counter++;
+                  } /* end loop though j */
+
+                  p_count_diag -= lost_counter_diag;
+                  j_diag_pos -= lost_counter_diag;
+
+                  /* offd */
+                  lost_counter_offd = 0;
+                  new_offd_pos =  P_offd_i_new[i];
+                  for (j =  P_offd_i_new[i]; j < P_offd_i_new[i] + p_count_offd  ; j++)
+                  {
+                     value = hypre_abs(P_offd_data_new[j]);
+
+                     if ( is_q[j_counter] == (k + 1) && (value < abs_trunc) )
+                     {
+                        /* drop */
+                        lost_counter_offd++;
+                     }
+                     else /* keep */
+                     {
+                        /* for k, keep this q and add the q_dist (also copy the
+                         * orig. p and other q not corres to this
+                         * k) */
+                        value =  P_offd_data_new[j];
+                        if (is_q[j_counter] == (k + 1))
+                        {
+                           value += q_dist_value;
+                        }
+                        P_offd_data_new[new_offd_pos] = value;
+                        P_offd_j_big[new_offd_pos] = P_offd_j_big[j];
+                        new_offd_pos++;
+
+                        is_q[new_j_counter] = is_q[j_counter];
+                        new_j_counter++;
+
+                     }
+                     j_counter++;
+                  } /* end loop though j */
+
+                  p_count_offd -= lost_counter_offd;
+                  j_offd_pos -= lost_counter_offd;
+               } /* end if num_lost */
+            }
+
+            /* now max num elements truncation */
+            if (i_qmax)
+            {
+               loop_q_max = 1;   /* not used currently */
+            }
+            else
+            {
+               loop_q_max = q_max;
+            }
+
+            if (loop_q_max > 0)
+            {
+               /* copy all elements for the row and count the q's for
+                * this smoothvec*/
+               q_count_k = 0;
+               j_counter = 0;
+               for (j = P_diag_i_new[i]; j < P_diag_i_new[i] + p_count_diag; j++)
+               {
+                  if (is_q[j_counter] == (k + 1))
+                  {
+                     q_count_k++;
+                  }
+
+                  aux_j[j_counter] = (HYPRE_BigInt)P_diag_j_new[j];
+                  aux_data[j_counter] = P_diag_data_new[j];
+                  is_diag[j_counter] = 1;
+                  j_counter++;
+               }
+
+               /* offd loop  - don't reset j_counter*/
+               for (j = P_offd_i_new[i]; j < P_offd_i_new[i] + p_count_offd; j++)
+               {
+                  if (is_q[j_counter] == (k + 1))
+                  {
+                     q_count_k++;
+                  }
+
+                  aux_j[j_counter] = P_offd_j_big[j];
+                  aux_data[j_counter] = P_offd_data_new[j];
+                  is_diag[j_counter] = 0;
+                  j_counter++;
+               }
+
+               //new_num_q = q_count_k;
+               num_lost = q_count_k - loop_q_max;
+
+               if (num_lost > 0)
+               {
+                  p_count_tot = p_count_diag + p_count_offd;
+
+                  /* only keep loop_q_max elements - get rid of smallest */
+                  hypre_BigQsort4_abs(aux_data, aux_j, is_q, is_diag, 0, p_count_tot - 1);
+
+                  lost_value = 0.0;
+                  lost_counter_q = 0;
+                  lost_counter_diag = 0;
+                  lost_counter_offd = 0;
+
+                  j_counter = 0;
+
+                  new_diag_pos =  P_diag_i_new[i];
+                  new_offd_pos =  P_offd_i_new[i];
+
+                  new_j_counter = 0;
+
+                  /* have to do diag and offd together because of sorting*/
+                  for (j =  0; j < p_count_tot; j++)
+                  {
+                     if ((is_q[j_counter] == (k + 1)) && (lost_counter_q < num_lost))
+                     {
+                        /* drop */
+                        lost_value += aux_data[j_counter];
+                        lost_counter_q++;
+
+                        /* check whether this is diag or offd element */
+                        if (is_diag[j])
+                        {
+                           lost_counter_diag++;
+                        }
+                        else
+                        {
+                           lost_counter_offd++;
+                        }
+                        //new_num_q--;
+
+                        /* technically only need to do this the last time */
+                        q_dist_value = lost_value / loop_q_max;
+                     }
+                     else
+                     {
+                        /* keep and add to the q values (copy q)*/
+                        value =  aux_data[j_counter];
+                        if (is_q[j_counter] == (k + 1))
+                        {
+                           value += q_dist_value;
+                        }
+
+                        if (is_diag[j])
+                        {
+                           P_diag_data_new[new_diag_pos] = value;
+                           P_diag_j_new[new_diag_pos] = aux_j[j_counter];
+                           new_diag_pos++;
+
+                           is_q[new_j_counter] = is_q[j_counter];
+                           new_j_counter++;
+                        }
+                        else
+                        {
+                           P_offd_data_new[new_offd_pos] = value;
+                           P_offd_j_big[new_offd_pos] = aux_j[j];
+                           new_offd_pos++;
+                           is_q[new_j_counter] = is_q[j];
+                           new_j_counter++;
+                        }
+                     }
+                     j_counter++;
+                  }/* end element loop */
+                  /* adjust p_count and j_pos */
+                  p_count_diag -= lost_counter_diag;
+                  p_count_offd -= lost_counter_offd;
+
+                  j_diag_pos -= lost_counter_diag;
+                  j_offd_pos -= lost_counter_offd;
+               } /* end num lost > 0 */
+            } /* end loop_q_max > 0  - element truncation */
+         } /* end of loop through smoothvecs */
+
+         P_diag_i_new[i + 1] = P_diag_i_new[i] + p_count_diag;
+         P_offd_i_new[i + 1] = P_offd_i_new[i] + p_count_offd;
+      } /* end of truncation*/
+
+      if (j_diag_pos != P_diag_i_new[i + 1])
+      {
+         hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                           "Warning - diag Row Problem in hypre_BoomerAMG_LNExpandInterp!\n");
+      }
+      if (j_offd_pos != P_offd_i_new[i + 1])
+      {
+         hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                           "Warning - off-diag Row Problem in hypre_BoomerAMG_LNExpandInterp!\n");
+      }
 
    }
    /* end of MAIN LOOP i loop through rows of P*/
@@ -2364,11 +2456,13 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
    {
       HYPRE_Int new_nf;
 
-      c_dof_func = hypre_TReAlloc_v2(c_dof_func,  HYPRE_Int, hypre_IntArraySize(*coarse_dof_func), HYPRE_Int,  new_ncv, hypre_IntArrayMemoryLocation(*coarse_dof_func));
+      c_dof_func = hypre_TReAlloc_v2(c_dof_func, HYPRE_Int, hypre_IntArraySize(*coarse_dof_func),
+                                     HYPRE_Int, new_ncv,
+                                     hypre_IntArrayMemoryLocation(*coarse_dof_func));
       cur_spot = 0;
       for (i = 0; i < ncv_peru; i++)
       {
-         for (k = 0; k< num_functions + num_smooth_vecs; k++)
+         for (k = 0; k < num_functions + num_smooth_vecs; k++)
          {
             c_dof_func[cur_spot++] = k;
          }
@@ -2379,17 +2473,18 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
       hypre_IntArrayData(*coarse_dof_func) = c_dof_func;
       hypre_IntArraySize(*coarse_dof_func) = new_ncv;
 
-
       /* also we need to update the col starts and global num columns*/
 
       /* assumes that unknowns are together on a procsessor with
        * nodal coarsening  */
-      new_col_starts =  hypre_CTAlloc(HYPRE_BigInt, 2, HYPRE_MEMORY_HOST);
-      new_col_starts[0] = (col_starts[0]/(HYPRE_BigInt)num_functions)*(HYPRE_BigInt)new_nf ;
-      new_col_starts[1] = (col_starts[1]/(HYPRE_BigInt)num_functions)*(HYPRE_BigInt)new_nf;
+      new_col_starts[0] = (col_starts[0] / (HYPRE_BigInt) num_functions) * (HYPRE_BigInt) new_nf;
+      new_col_starts[1] = (col_starts[1] / (HYPRE_BigInt) num_functions) * (HYPRE_BigInt) new_nf;
 
-      if (myid == (num_procs -1)) g_nc = new_col_starts[1];
-      hypre_MPI_Bcast(&g_nc, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
+      if (myid == (num_procs - 1))
+      {
+         g_nc = new_col_starts[1];
+      }
+      hypre_MPI_Bcast(&g_nc, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
    }
    else /* not first level */
    {
@@ -2397,10 +2492,9 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
       g_nc = hypre_ParCSRMatrixGlobalNumCols(*P);
 
       /* copy col starts */
-      new_col_starts =  hypre_CTAlloc(HYPRE_BigInt, 2, HYPRE_MEMORY_HOST);
       new_col_starts[0] = col_starts[0];
       new_col_starts[1] = col_starts[1];
-    }
+   }
 
    /* modify P - now P has more entries and possibly more cols */
    new_P = hypre_ParCSRMatrixCreate(comm,
@@ -2424,8 +2518,6 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
    hypre_CSRMatrixI(P_offd) = P_offd_i_new;
    hypre_CSRMatrixJ(P_offd) = P_offd_j_new;
 
-   hypre_TFree(new_col_starts, HYPRE_MEMORY_HOST);
-
    /* If parallel we need to do the col map offd! */
    if (num_procs > 1)
    {
@@ -2443,16 +2535,18 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
 
          /*first copy the j entries (these are GLOBAL numbers) */
          j_copy = hypre_CTAlloc(HYPRE_BigInt, P_offd_new_size, HYPRE_MEMORY_HOST);
-         for (i=0; i < P_offd_new_size; i++)
+         for (i = 0; i < P_offd_new_size; i++)
+         {
             j_copy[i] = P_offd_j_big[i];
+         }
 
          /* now sort them */
-         hypre_BigQsort0(j_copy, 0, P_offd_new_size-1);
+         hypre_BigQsort0(j_copy, 0, P_offd_new_size - 1);
 
          /* now copy to col_map offd - but only each col once */
          new_col_map_offd_P[0] = j_copy[0];
          count = 0;
-         for (i=0; i < P_offd_new_size; i++)
+         for (i = 0; i < P_offd_new_size; i++)
          {
             if (j_copy[i] > new_col_map_offd_P[count])
             {
@@ -2463,10 +2557,10 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
          num_cols_P_offd = count + 1;
 
          /* reset the j entries to be local */
-         for (i=0; i < P_offd_new_size; i++)
+         for (i = 0; i < P_offd_new_size; i++)
             P_offd_j_new[i] = hypre_BigBinarySearch(new_col_map_offd_P,
-                                                 P_offd_j_big[i],
-                                                 num_cols_P_offd);
+                                                    P_offd_j_big[i],
+                                                    num_cols_P_offd);
          hypre_TFree(j_copy, HYPRE_MEMORY_HOST);
       }
 
@@ -2495,16 +2589,18 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
 
       if (!myid)
       {
-         hypre_sprintf(new_file,"%s.level.%d","P_new_new", level );
+         hypre_sprintf(new_file, "%s.level.%d", "P_new_new", level );
          if (P_CSR)
+         {
             hypre_CSRMatrixPrint(P_CSR, new_file);
+         }
       }
 
       hypre_CSRMatrixDestroy(P_CSR);
    }
 #endif
 
-    /* clean */
+   /* clean */
    hypre_TFree(coarse_to_fine, HYPRE_MEMORY_HOST);
    hypre_TFree(fine_to_coarse, HYPRE_MEMORY_HOST);
    hypre_TFree(fine_to_coarse_offd, HYPRE_MEMORY_HOST);
@@ -2519,7 +2615,7 @@ HYPRE_Int hypre_BoomerAMG_LNExpandInterp( hypre_ParCSRMatrix *A,
    hypre_TFree(smooth_vec_offd, HYPRE_MEMORY_HOST);
    hypre_TFree(smooth_vec_offd_P, HYPRE_MEMORY_HOST);
 
-   if (num_procs > 1) hypre_CSRMatrixDestroy(P_ext);
+   hypre_CSRMatrixDestroy(P_ext);
 
    return hypre_error_flag;
 }
diff --git a/external/hypre/src/parcsr_ls/par_sv_interp_lsfit.c b/external/hypre/src/parcsr_ls/par_sv_interp_lsfit.c
index aeae201e..c22f7d3b 100644
--- a/external/hypre/src/parcsr_ls/par_sv_interp_lsfit.c
+++ b/external/hypre/src/parcsr_ls/par_sv_interp_lsfit.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -47,16 +47,16 @@ HYPRE_Int hypre_BoomerAMGFitInterpVectors( hypre_ParCSRMatrix *A,
                                            hypre_ParVector **smooth_vecs,
                                            hypre_ParVector **coarse_smooth_vecs,
                                            HYPRE_Real delta,
-                                           HYPRE_Int num_functions, 
+                                           HYPRE_Int num_functions,
                                            HYPRE_Int *dof_func,
-                                           HYPRE_Int *CF_marker, 
-                                           HYPRE_Int max_elmts, 
-                                           HYPRE_Real trunc_factor, 
-                                           HYPRE_Int variant, HYPRE_Int level) 
+                                           HYPRE_Int *CF_marker,
+                                           HYPRE_Int max_elmts,
+                                           HYPRE_Real trunc_factor,
+                                           HYPRE_Int variant, HYPRE_Int level)
 {
-   
-   HYPRE_Int  i,j, k;
-   
+
+   HYPRE_Int  i, j, k;
+
    HYPRE_Int  one_i = 1;
    HYPRE_Int  info;
    HYPRE_Int  coarse_index;;
@@ -76,7 +76,7 @@ HYPRE_Int hypre_BoomerAMGFitInterpVectors( hypre_ParCSRMatrix *A,
    HYPRE_Real *w;
    HYPRE_Real *w_old;
    HYPRE_Real *B_s;
-  
+
    HYPRE_Real tmp_double;
    HYPRE_Real one = 1.0;
    HYPRE_Real mone = -1.0;;
@@ -90,7 +90,7 @@ HYPRE_Int hypre_BoomerAMGFitInterpVectors( hypre_ParCSRMatrix *A,
    HYPRE_Real      *P_offd_data = hypre_CSRMatrixData(P_offd);
    HYPRE_Int       *P_offd_i = hypre_CSRMatrixI(P_offd);
    HYPRE_Int       *P_offd_j = hypre_CSRMatrixJ(P_offd);
-   HYPRE_Int	    num_rows_P = hypre_CSRMatrixNumRows(P_diag);
+   HYPRE_Int       num_rows_P = hypre_CSRMatrixNumRows(P_diag);
    HYPRE_Int        P_diag_size = P_diag_i[num_rows_P];
    HYPRE_Int        P_offd_size = P_offd_i[num_rows_P];
    HYPRE_Int        num_cols_P_offd = hypre_CSRMatrixNumCols(P_offd);
@@ -102,64 +102,70 @@ HYPRE_Int hypre_BoomerAMGFitInterpVectors( hypre_ParCSRMatrix *A,
    hypre_ParCSRCommPkg     *comm_pkg = hypre_ParCSRMatrixCommPkg(*P);
    hypre_ParCSRCommHandle  *comm_handle;
    MPI_Comm                 comm;
-   
+
 
    HYPRE_Real  *dbl_buf_data;
    HYPRE_Real  *smooth_vec_offd = NULL;
    HYPRE_Real  *offd_vec_data;
-   
+
    HYPRE_Int   index, start;
    HYPRE_Int  *P_marker;
    HYPRE_Int   num_procs;
- 
+
    hypre_ParVector *vector;
-  
+
    HYPRE_Int   new_nnz, orig_start, j_pos, fcn_num, num_elements;
    HYPRE_Int  *P_diag_j_new;
    HYPRE_Real *P_diag_data_new;
    HYPRE_Int   adjust_3D[] = {1, 2, -1, 1, -2, -1};
    HYPRE_Int   adjust_2D[] = {1, -1};
    HYPRE_Int  *adjust_list;
-  
-   if (variant ==1 && num_functions > 1)
+
+   if (variant == 1 && num_functions > 1)
    {
-      /* First add new entries to P with value 0.0 corresponding to weights from 
+      /* First add new entries to P with value 0.0 corresponding to weights from
          other unknowns on the same grid point */
       /* Loop through each row */
-  
-      new_nnz = P_diag_size*num_functions; /* this is an over-estimate */
+
+      new_nnz = P_diag_size * num_functions; /* this is an over-estimate */
       P_diag_j_new = hypre_CTAlloc(HYPRE_Int,  new_nnz, HYPRE_MEMORY_HOST);
       P_diag_data_new = hypre_CTAlloc(HYPRE_Real,  new_nnz, HYPRE_MEMORY_HOST);
-      
 
-      if (num_functions ==2)
+
+      if (num_functions == 2)
+      {
          adjust_list = adjust_2D;
-      else if (num_functions ==3)
+      }
+      else if (num_functions == 3)
+      {
          adjust_list = adjust_3D;
-  
+      }
+
       j_pos = 0;
       orig_start = 0;
       /* loop through rows */
-      for (i=0; i < num_rows_P; i++)
+      for (i = 0; i < num_rows_P; i++)
       {
          fcn_num = (HYPRE_Int) fmod(i, num_functions);
-         if (fcn_num != dof_func[i]) 
+         if (fcn_num != dof_func[i])
+         {
             printf("WARNING - ROWS incorrectly ordered!\n");
-         
+         }
+
          /* loop through elements */
-         num_elements = P_diag_i[i+1] - orig_start;
-         
+         num_elements = P_diag_i[i + 1] - orig_start;
+
          /* add zeros corrresponding to other unknowns */
          if (num_elements > 1)
          {
-            for (j=0; j < num_elements; j++)
+            for (j = 0; j < num_elements; j++)
             {
-               P_diag_j_new[j_pos] = P_diag_j[orig_start+j];
-               P_diag_data_new[j_pos++] = P_diag_data[orig_start+j];
-               
-               for (k=0; k < num_functions-1; k++)
+               P_diag_j_new[j_pos] = P_diag_j[orig_start + j];
+               P_diag_data_new[j_pos++] = P_diag_data[orig_start + j];
+
+               for (k = 0; k < num_functions - 1; k++)
                {
-                  P_diag_j_new[j_pos] = P_diag_j[orig_start+j]+ ADJUST(fcn_num,k);
+                  P_diag_j_new[j_pos] = P_diag_j[orig_start + j] + ADJUST(fcn_num, k);
                   P_diag_data_new[j_pos++] = 0.0;
                }
             }
@@ -169,14 +175,18 @@ HYPRE_Int hypre_BoomerAMGFitInterpVectors( hypre_ParCSRMatrix *A,
             P_diag_j_new[j_pos] = P_diag_j[orig_start];
             P_diag_data_new[j_pos++] = P_diag_data[orig_start];
          }
-         orig_start = P_diag_i[i+1];
+         orig_start = P_diag_i[i + 1];
          if (num_elements > 1)
-            P_diag_i[i+1] =  P_diag_i[i] + num_elements*num_functions;
+         {
+            P_diag_i[i + 1] =  P_diag_i[i] + num_elements * num_functions;
+         }
          else
-            P_diag_i[i+1] = P_diag_i[i] + num_elements;
+         {
+            P_diag_i[i + 1] = P_diag_i[i] + num_elements;
+         }
+
+         if (j_pos != P_diag_i[i + 1]) { printf("Problem!\n"); }
 
-         if (j_pos != P_diag_i[i+1]) printf("Problem!\n");
-         
 
       }/* end loop through rows */
 
@@ -188,21 +198,21 @@ HYPRE_Int hypre_BoomerAMGFitInterpVectors( hypre_ParCSRMatrix *A,
       hypre_CSRMatrixNumNonzeros(P_diag) = P_diag_i[num_rows_P];
       P_diag_j = P_diag_j_new;
       P_diag_data = P_diag_data_new;
-      
+
       /* check if there is already a comm pkg - if so, destroy*/
       if (comm_pkg)
       {
-          hypre_MatvecCommPkgDestroy(comm_pkg );
-          comm_pkg = NULL;
-          
+         hypre_MatvecCommPkgDestroy(comm_pkg );
+         comm_pkg = NULL;
+
       }
-      
+
 
    } /* end variant == 1 and num functions > 0 */
 
 
 
-   /* For each row, we are updating the weights by 
+   /* For each row, we are updating the weights by
       solving w = w_old + (delta)(Beta^T)Bs^(-1)(alpha - (Beta)w_old).
       let s = num_smooth_vectors
       let k = # of interp points for fine point i
@@ -222,143 +232,151 @@ HYPRE_Int hypre_BoomerAMGFitInterpVectors( hypre_ParCSRMatrix *A,
    {
       char new_file[80];
 
-      for (i=0; i < num_smooth_vecs; i++)
+      for (i = 0; i < num_smooth_vecs; i++)
       {
-         sprintf(new_file,"%s.%d.level.%d","smoothvec", i, level );
-         hypre_ParVectorPrint(smooth_vecs[i], new_file); 
+         sprintf(new_file, "%s.%d.level.%d", "smoothvec", i, level );
+         hypre_ParVectorPrint(smooth_vecs[i], new_file);
       }
    }
-   
+
 #endif
 
    /*initial*/
    if (num_smooth_vecs == 0)
+   {
       return hypre_error_flag;
+   }
 
    if (!comm_pkg)
    {
       hypre_MatvecCommPkgCreate ( *P );
       comm_pkg = hypre_ParCSRMatrixCommPkg(*P);
    }
-   
+
 
    comm      = hypre_ParCSRCommPkgComm(comm_pkg);
 
    hypre_MPI_Comm_size(comm, &num_procs);
 
    num_nonzeros = hypre_CSRMatrixNumNonzeros(P_diag)
-      + hypre_CSRMatrixNumNonzeros(P_offd);
-  
+                  + hypre_CSRMatrixNumNonzeros(P_offd);
+
    /* number of coarse points = number of cols */
    coarse_points = hypre_CSRMatrixNumCols(P_diag) + hypre_CSRMatrixNumCols(P_offd);
 
    /* allocate */
    alpha = hypre_CTAlloc(HYPRE_Real,  num_smooth_vecs, HYPRE_MEMORY_HOST);
    piv = hypre_CTAlloc(HYPRE_Int,  num_smooth_vecs, HYPRE_MEMORY_HOST);
-   B_s = hypre_CTAlloc(HYPRE_Real,  num_smooth_vecs*num_smooth_vecs, HYPRE_MEMORY_HOST);
+   B_s = hypre_CTAlloc(HYPRE_Real,  num_smooth_vecs * num_smooth_vecs, HYPRE_MEMORY_HOST);
 
    /*estimate the max number of weights per row (coarse points only have one weight)*/
-   k_alloc = (num_nonzeros - coarse_points)/(num_rows_P - coarse_points);
+   k_alloc = (num_nonzeros - coarse_points) / (num_rows_P - coarse_points);
    k_alloc += 5;
 
-   Beta = hypre_CTAlloc(HYPRE_Real,  k_alloc*num_smooth_vecs, HYPRE_MEMORY_HOST);
-   w = hypre_CTAlloc(HYPRE_Real,  k_alloc, HYPRE_MEMORY_HOST);                                             
-   w_old = hypre_CTAlloc(HYPRE_Real,  k_alloc, HYPRE_MEMORY_HOST);  
+   Beta = hypre_CTAlloc(HYPRE_Real,  k_alloc * num_smooth_vecs, HYPRE_MEMORY_HOST);
+   w = hypre_CTAlloc(HYPRE_Real,  k_alloc, HYPRE_MEMORY_HOST);
+   w_old = hypre_CTAlloc(HYPRE_Real,  k_alloc, HYPRE_MEMORY_HOST);
 
    /* Get smooth vec components for the off-processor columns */
 
    if (num_procs > 1)
    {
-      
-      smooth_vec_offd =  hypre_CTAlloc(HYPRE_Real,  num_cols_P_offd*num_smooth_vecs, HYPRE_MEMORY_HOST);
-      
+
+      smooth_vec_offd =  hypre_CTAlloc(HYPRE_Real,  num_cols_P_offd * num_smooth_vecs, HYPRE_MEMORY_HOST);
+
       /* for now, do a seperate comm for each smooth vector */
-      for (k = 0; k< num_smooth_vecs; k++)
+      for (k = 0; k < num_smooth_vecs; k++)
       {
-         
+
          vector = smooth_vecs[k];
          vec_data = hypre_VectorData(hypre_ParVectorLocalVector(vector));
-         
+
          num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
-         dbl_buf_data = hypre_CTAlloc(HYPRE_Real,  hypre_ParCSRCommPkgSendMapStart(comm_pkg, 
-                                                                              num_sends), HYPRE_MEMORY_HOST);
+         dbl_buf_data = hypre_CTAlloc(HYPRE_Real,  hypre_ParCSRCommPkgSendMapStart(comm_pkg,
+                                                                                   num_sends), HYPRE_MEMORY_HOST);
          /* point into smooth_vec_offd */
-         offd_vec_data =  smooth_vec_offd + k*num_cols_P_offd;
-         
+         offd_vec_data =  smooth_vec_offd + k * num_cols_P_offd;
+
          index = 0;
          for (i = 0; i < num_sends; i++)
          {
             start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-            for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
-               dbl_buf_data[index++] 
-                  = vec_data[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+            for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
+               dbl_buf_data[index++]
+                  = vec_data[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
          }
-         
-         comm_handle = hypre_ParCSRCommHandleCreate( 1, comm_pkg, dbl_buf_data, 
+
+         comm_handle = hypre_ParCSRCommHandleCreate( 1, comm_pkg, dbl_buf_data,
                                                      offd_vec_data);
-         
-         hypre_ParCSRCommHandleDestroy(comm_handle); 
-         
+
+         hypre_ParCSRCommHandleDestroy(comm_handle);
+
          hypre_TFree(dbl_buf_data, HYPRE_MEMORY_HOST);
       }
    }/*end num procs > 1 */
    /* now off-proc smooth vec data is in smoothvec_offd */
 
    /* Loop through each row */
-   for (i=0; i < num_rows_P; i++)
+   for (i = 0; i < num_rows_P; i++)
    {
 
       /* only need to modify rows belonging to fine points */
       if (CF_marker[i] >= 0) /* coarse */
+      {
          continue;
+      }
 
-      num_coarse_diag = P_diag_i[i+1] - P_diag_i[i];
-      num_coarse_offd =  P_offd_i[i+1] - P_offd_i[i];
+      num_coarse_diag = P_diag_i[i + 1] - P_diag_i[i];
+      num_coarse_offd =  P_offd_i[i + 1] - P_offd_i[i];
 
       k_size = num_coarse_diag + num_coarse_offd;
-      
+
 
       /* only need to modify rows that interpolate from coarse points */
       if (k_size == 0)
+      {
          continue;
+      }
 
 #if 0
       /* only change the weights if we have at least as many coarse points
          as smooth vectors - do we want to do this? NO */
-    
+
       too_few = 0;
       if (k_size < num_smooth_vecs)
       {
          too_few++;
          continue;
       }
-#endif      
+#endif
 
       /*verify that we have enough space allocated */
       if (k_size > k_alloc)
       {
          k_alloc = k_size + 2;
 
-         Beta = hypre_TReAlloc(Beta,  HYPRE_Real,  k_alloc*num_smooth_vecs, HYPRE_MEMORY_HOST);
+         Beta = hypre_TReAlloc(Beta,  HYPRE_Real,  k_alloc * num_smooth_vecs, HYPRE_MEMORY_HOST);
          w = hypre_TReAlloc(w,  HYPRE_Real,  k_alloc, HYPRE_MEMORY_HOST);
          w_old = hypre_TReAlloc(w_old,  HYPRE_Real,  k_alloc, HYPRE_MEMORY_HOST);
       }
 
       /* put current weights into w*/
       counter = 0;
-      for (j=P_diag_i[i];j <  P_diag_i[i+1]; j++)
+      for (j = P_diag_i[i]; j <  P_diag_i[i + 1]; j++)
       {
          w[counter++] = P_diag_data[j];
       }
-      for (j=P_offd_i[i];j <  P_offd_i[i+1]; j++)
+      for (j = P_offd_i[i]; j <  P_offd_i[i + 1]; j++)
       {
          w[counter++] = P_offd_data[j];
       }
 
       /* copy w to w_old */
-      for (j=0; j< k_size; j++)
+      for (j = 0; j < k_size; j++)
+      {
          w_old[j] = w[j];
-            
+      }
+
       /* get alpha and Beta */
       /* alpha is the smooth vector values at fine point i */
       /* Beta is the smooth vector values at the points that
@@ -367,34 +385,34 @@ HYPRE_Int hypre_BoomerAMGFitInterpVectors( hypre_ParCSRMatrix *A,
       /* Note - for using BLAS/LAPACK - need to store Beta in
        * column-major order */
 
-      for (j = 0; j< num_smooth_vecs; j++)
+      for (j = 0; j < num_smooth_vecs; j++)
       {
          vector = smooth_vecs[j];
          vec_data = hypre_VectorData(hypre_ParVectorLocalVector(vector));
          /* point into smooth_vec_offd */
-         offd_vec_data = smooth_vec_offd + j*num_cols_P_offd;
+         offd_vec_data = smooth_vec_offd + j * num_cols_P_offd;
 
          alpha[j] = vec_data[i];
-         
+
          vector = coarse_smooth_vecs[j];
          vec_data = hypre_VectorData(hypre_ParVectorLocalVector(vector));
          /* on processor */
          counter = 0;
-         
-         for (k = P_diag_i[i]; k <  P_diag_i[i+1]; k++)
+
+         for (k = P_diag_i[i]; k <  P_diag_i[i + 1]; k++)
          {
             coarse_index = P_diag_j[k];
             /*Beta(j, counter) */
-            Beta[counter*num_smooth_vecs + j] = vec_data[coarse_index];
+            Beta[counter * num_smooth_vecs + j] = vec_data[coarse_index];
             counter++;
          }
          /* off-processor */
-         for (k = P_offd_i[i];k <  P_offd_i[i+1]; k++)
+         for (k = P_offd_i[i]; k <  P_offd_i[i + 1]; k++)
          {
             coarse_index = P_offd_j[k];
-            Beta[counter*num_smooth_vecs + j] = offd_vec_data[coarse_index];
+            Beta[counter * num_smooth_vecs + j] = offd_vec_data[coarse_index];
             counter++;
-            
+
          }
 
       }
@@ -403,57 +421,61 @@ HYPRE_Int hypre_BoomerAMGFitInterpVectors( hypre_ParCSRMatrix *A,
 
       /* first B_s <- (1-delta)*I_s */
       tmp_double = 1.0 - delta;
-      for (j = 0; j < num_smooth_vecs*num_smooth_vecs; j++)
+      for (j = 0; j < num_smooth_vecs * num_smooth_vecs; j++)
+      {
          B_s[j] = 0.0;
-       for (j = 0; j < num_smooth_vecs; j++)
-          B_s[j*num_smooth_vecs + j] = tmp_double;
-       
-       /* now  B_s <-delta*Beta*Beta^T + B_s */ 
-       /* usage: DGEMM(TRANSA,TRANSB,M,N,K,ALPHA,A,LDA,B,LDB,BETA,C,LDC)
-                 C := alpha*op( A )*op( B ) + beta*C */
-       hypre_dgemm("N", "T", &num_smooth_vecs, 
-                   &num_smooth_vecs, &k_size, 
-                   &delta, Beta, &num_smooth_vecs, Beta, 
-                   &num_smooth_vecs, &one, B_s, &num_smooth_vecs);
-       
-       /* now do alpha <- (alpha - beta*w)*/
-       /* usage: DGEMV(TRANS,M,N,ALPHA,A,LDA,X,INCX,BETA,Y,INCY)
-                 y := alpha*A*x + beta*y */
-       hypre_dgemv("N", &num_smooth_vecs, &k_size, &mone, 
-                   Beta, &num_smooth_vecs, w_old, &one_i, 
-                   &one, alpha, &one_i);
-      
-       /* now get alpha <- inv(B_s)*alpha */
-       /*write over B_s with LU */
-       hypre_dgetrf(&num_smooth_vecs, &num_smooth_vecs, 
-                    B_s, &num_smooth_vecs, piv, &info);
-       
-       /*now get alpha  */
-       hypre_dgetrs("N", &num_smooth_vecs, &one_i, B_s, 
-                    &num_smooth_vecs, piv, alpha, 
-                    &num_smooth_vecs, &info);
-
-       /* now w <- w + (delta)*(Beta)^T*(alpha) */
-       hypre_dgemv("T", &num_smooth_vecs, &k_size, &delta, 
-                   Beta, &num_smooth_vecs, alpha, &one_i, 
-                   &one, w, &one_i);
-       
-       /* note:we have w_old still, but we don't need it unless we
-        * want to use it in the future for something */
-
-       /* now update the weights in P*/
-       counter = 0;
-       for (j=P_diag_i[i];j <  P_diag_i[i+1]; j++)
-       {
-          P_diag_data[j] = w[counter++];
-       }
-       for (j=P_offd_i[i];j <  P_offd_i[i+1]; j++)
-       {
-          P_offd_data[j] = w[counter++];
-       }
+      }
+      for (j = 0; j < num_smooth_vecs; j++)
+      {
+         B_s[j * num_smooth_vecs + j] = tmp_double;
+      }
+
+      /* now  B_s <-delta*Beta*Beta^T + B_s */
+      /* usage: DGEMM(TRANSA,TRANSB,M,N,K,ALPHA,A,LDA,B,LDB,BETA,C,LDC)
+                C := alpha*op( A )*op( B ) + beta*C */
+      hypre_dgemm("N", "T", &num_smooth_vecs,
+                  &num_smooth_vecs, &k_size,
+                  &delta, Beta, &num_smooth_vecs, Beta,
+                  &num_smooth_vecs, &one, B_s, &num_smooth_vecs);
+
+      /* now do alpha <- (alpha - beta*w)*/
+      /* usage: DGEMV(TRANS,M,N,ALPHA,A,LDA,X,INCX,BETA,Y,INCY)
+                y := alpha*A*x + beta*y */
+      hypre_dgemv("N", &num_smooth_vecs, &k_size, &mone,
+                  Beta, &num_smooth_vecs, w_old, &one_i,
+                  &one, alpha, &one_i);
+
+      /* now get alpha <- inv(B_s)*alpha */
+      /*write over B_s with LU */
+      hypre_dgetrf(&num_smooth_vecs, &num_smooth_vecs,
+                   B_s, &num_smooth_vecs, piv, &info);
+
+      /*now get alpha  */
+      hypre_dgetrs("N", &num_smooth_vecs, &one_i, B_s,
+                   &num_smooth_vecs, piv, alpha,
+                   &num_smooth_vecs, &info);
+
+      /* now w <- w + (delta)*(Beta)^T*(alpha) */
+      hypre_dgemv("T", &num_smooth_vecs, &k_size, &delta,
+                  Beta, &num_smooth_vecs, alpha, &one_i,
+                  &one, w, &one_i);
+
+      /* note:we have w_old still, but we don't need it unless we
+       * want to use it in the future for something */
+
+      /* now update the weights in P*/
+      counter = 0;
+      for (j = P_diag_i[i]; j <  P_diag_i[i + 1]; j++)
+      {
+         P_diag_data[j] = w[counter++];
+      }
+      for (j = P_offd_i[i]; j <  P_offd_i[i + 1]; j++)
+      {
+         P_offd_data[j] = w[counter++];
+      }
    }/* end of loop through each row */
-                       
-                                              
+
+
    /* clean up from L.S. fitting*/
    hypre_TFree(alpha, HYPRE_MEMORY_HOST);
    hypre_TFree(Beta, HYPRE_MEMORY_HOST);
@@ -462,11 +484,11 @@ HYPRE_Int hypre_BoomerAMGFitInterpVectors( hypre_ParCSRMatrix *A,
    hypre_TFree(piv, HYPRE_MEMORY_HOST);
    hypre_TFree(B_s, HYPRE_MEMORY_HOST);
    hypre_TFree(smooth_vec_offd, HYPRE_MEMORY_HOST);
-   
+
    /* Now we truncate here (instead of after forming the interp matrix) */
 
    /* SAME code as in othr interp routines:
-      Compress P, removing coefficients smaller than trunc_factor * Max , 
+      Compress P, removing coefficients smaller than trunc_factor * Max ,
       or when there are more than max_elements*/
 
    if (trunc_factor != 0.0 || max_elmts > 0)
@@ -475,7 +497,7 @@ HYPRE_Int hypre_BoomerAMGFitInterpVectors( hypre_ParCSRMatrix *A,
       /* To DO: THIS HAS A BUG IN PARALLEL! */
 
       tmp_int =  P_offd_size;
-      
+
       hypre_BoomerAMGInterpTruncation(*P, trunc_factor, max_elmts);
       P_diag_data = hypre_CSRMatrixData(P_diag);
       P_diag_i = hypre_CSRMatrixI(P_diag);
@@ -484,22 +506,24 @@ HYPRE_Int hypre_BoomerAMGFitInterpVectors( hypre_ParCSRMatrix *A,
       P_offd_i = hypre_CSRMatrixI(P_offd);
       P_offd_j = hypre_CSRMatrixJ(P_offd);
       P_diag_size = P_diag_i[num_rows_P];
-      
+
       P_offd_size = P_offd_i[num_rows_P];
 
-   
+
       /* if truncation occurred, we need to re-do the col_map_offd... */
       if (tmp_int != P_offd_size)
       {
-         HYPRE_Int *tmp_map_offd; 
+         HYPRE_Int *tmp_map_offd;
          num_cols_P_offd = 0;
          P_marker = hypre_CTAlloc(HYPRE_Int,  num_cols_A_offd, HYPRE_MEMORY_HOST);
 
-         for (i=0; i < num_cols_A_offd; i++)
+         for (i = 0; i < num_cols_A_offd; i++)
+         {
             P_marker[i] = 0;
+         }
 
          num_cols_P_offd = 0;
-         for (i=0; i < P_offd_size; i++)
+         for (i = 0; i < P_offd_size; i++)
          {
             index = P_offd_j[i];
             if (!P_marker[index])
@@ -513,16 +537,16 @@ HYPRE_Int hypre_BoomerAMGFitInterpVectors( hypre_ParCSRMatrix *A,
          tmp_map_offd = hypre_CTAlloc(HYPRE_Int, num_cols_P_offd, HYPRE_MEMORY_HOST);
 
          index = 0;
-         for (i=0; i < num_cols_P_offd; i++)
+         for (i = 0; i < num_cols_P_offd; i++)
          {
-            while (P_marker[index]==0) index++;
+            while (P_marker[index] == 0) { index++; }
             tmp_map_offd[i] = index++;
          }
-         for (i=0; i < P_offd_size; i++)
+         for (i = 0; i < P_offd_size; i++)
             P_offd_j[i] = hypre_BinarySearch(tmp_map_offd,
                                              P_offd_j[i],
                                              num_cols_P_offd);
-         hypre_TFree(P_marker, HYPRE_MEMORY_HOST); 
+         hypre_TFree(P_marker, HYPRE_MEMORY_HOST);
          hypre_TFree( hypre_ParCSRMatrixColMapOffd(*P), HYPRE_MEMORY_HOST);
 
          /* assign new col map */
@@ -536,10 +560,10 @@ HYPRE_Int hypre_BoomerAMGFitInterpVectors( hypre_ParCSRMatrix *A,
          hypre_TFree(tmp_map_offd);
 
       }/*end re-do col_map_offd */
-      
+
    }/*end trucation */
-   
+
    return hypre_error_flag;
-   
-   
+
+
 }
diff --git a/external/hypre/src/parcsr_ls/par_vardifconv.c b/external/hypre/src/parcsr_ls/par_vardifconv.c
index f0483b8e..2ec17846 100644
--- a/external/hypre/src/parcsr_ls/par_vardifconv.c
+++ b/external/hypre/src/parcsr_ls/par_vardifconv.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -36,10 +36,10 @@ GenerateVarDifConv( MPI_Comm         comm,
    HYPRE_Int          *diag_j;
    HYPRE_Real         *diag_data;
 
-   HYPRE_Int          *offd_i;
-   HYPRE_Int          *offd_j;
-   HYPRE_BigInt       *big_offd_j;
-   HYPRE_Real         *offd_data;
+   HYPRE_Int          *offd_i = NULL;
+   HYPRE_Int          *offd_j = NULL;
+   HYPRE_BigInt       *big_offd_j = NULL;
+   HYPRE_Real         *offd_data = NULL;
 
    HYPRE_BigInt        global_part[2];
    HYPRE_BigInt        ix, iy, iz;
@@ -47,7 +47,7 @@ GenerateVarDifConv( MPI_Comm         comm,
    HYPRE_Int           local_num_rows;
    HYPRE_BigInt       *col_map_offd;
    HYPRE_Int           row_index;
-   HYPRE_Int           i,j;
+   HYPRE_Int           i, j;
 
    HYPRE_Int           nx_local, ny_local, nz_local;
    HYPRE_Int           num_cols_offd;
@@ -64,62 +64,64 @@ GenerateVarDifConv( MPI_Comm         comm,
    HYPRE_Real          xx, yy, zz;
    HYPRE_Real          afp, afm, bfp, bfm, cfp, cfm, df, ef, ff, gf;
 
-   hypre_MPI_Comm_size(comm,&num_procs);
+   hypre_MPI_Comm_size(comm, &num_procs);
 
-   grid_size = nx*ny*nz;
+   grid_size = nx * ny * nz;
 
-   hypre_GeneratePartitioning(nx,P,&nx_part);
-   hypre_GeneratePartitioning(ny,Q,&ny_part);
-   hypre_GeneratePartitioning(nz,R,&nz_part);
+   hypre_GeneratePartitioning(nx, P, &nx_part);
+   hypre_GeneratePartitioning(ny, Q, &ny_part);
+   hypre_GeneratePartitioning(nz, R, &nz_part);
 
-   nx_local = (HYPRE_Int)(nx_part[p+1] - nx_part[p]);
-   ny_local = (HYPRE_Int)(ny_part[q+1] - ny_part[q]);
-   nz_local = (HYPRE_Int)(nz_part[r+1] - nz_part[r]);
+   nx_local = (HYPRE_Int)(nx_part[p + 1] - nx_part[p]);
+   ny_local = (HYPRE_Int)(ny_part[q + 1] - ny_part[q]);
+   nz_local = (HYPRE_Int)(nz_part[r + 1] - nz_part[r]);
 
-   local_num_rows = nx_local*ny_local*nz_local;
+   local_num_rows = nx_local * ny_local * nz_local;
 
-   global_part[0] = nz_part[r]*nx*ny+(ny_part[q]*nx+nx_part[p]*ny_local)*nz_local;
+   global_part[0] = nz_part[r] * nx * ny + (ny_part[q] * nx + nx_part[p] * ny_local) * nz_local;
    global_part[1] = global_part[0] + (HYPRE_BigInt)local_num_rows;
 
-   diag_i   = hypre_CTAlloc(HYPRE_Int,  local_num_rows+1, HYPRE_MEMORY_HOST);
-   offd_i   = hypre_CTAlloc(HYPRE_Int,  local_num_rows+1, HYPRE_MEMORY_HOST);
+   diag_i   = hypre_CTAlloc(HYPRE_Int,  local_num_rows + 1, HYPRE_MEMORY_HOST);
+   offd_i   = hypre_CTAlloc(HYPRE_Int,  local_num_rows + 1, HYPRE_MEMORY_HOST);
    rhs_data = hypre_CTAlloc(HYPRE_Real, local_num_rows,   HYPRE_MEMORY_HOST);
 
-   P_busy = hypre_min(nx,P);
-   Q_busy = hypre_min(ny,Q);
-   R_busy = hypre_min(nz,R);
+   P_busy = hypre_min(nx, P);
+   Q_busy = hypre_min(ny, Q);
+   R_busy = hypre_min(nz, R);
 
    num_cols_offd = 0;
-   if (p) num_cols_offd += ny_local*nz_local;
-   if (p < P_busy-1) num_cols_offd += ny_local*nz_local;
-   if (q) num_cols_offd += nx_local*nz_local;
-   if (q < Q_busy-1) num_cols_offd += nx_local*nz_local;
-   if (r) num_cols_offd += nx_local*ny_local;
-   if (r < R_busy-1) num_cols_offd += nx_local*ny_local;
+   if (p) { num_cols_offd += ny_local * nz_local; }
+   if (p < P_busy - 1) { num_cols_offd += ny_local * nz_local; }
+   if (q) { num_cols_offd += nx_local * nz_local; }
+   if (q < Q_busy - 1) { num_cols_offd += nx_local * nz_local; }
+   if (r) { num_cols_offd += nx_local * ny_local; }
+   if (r < R_busy - 1) { num_cols_offd += nx_local * ny_local; }
 
-   if (!local_num_rows) num_cols_offd = 0;
+   if (!local_num_rows) { num_cols_offd = 0; }
 
    col_map_offd = hypre_CTAlloc(HYPRE_BigInt,  num_cols_offd, HYPRE_MEMORY_HOST);
 
-   hhx = 1.0/(HYPRE_Real)(nx+1);
-   hhy = 1.0/(HYPRE_Real)(ny+1);
-   hhz = 1.0/(HYPRE_Real)(nz+1);
+   hhx = 1.0 / (HYPRE_Real)(nx + 1);
+   hhy = 1.0 / (HYPRE_Real)(ny + 1);
+   hhz = 1.0 / (HYPRE_Real)(nz + 1);
 
    cnt = 1;
    o_cnt = 1;
    diag_i[0] = 0;
    offd_i[0] = 0;
-   for (iz = nz_part[r]; iz < nz_part[r+1]; iz++)
+   for (iz = nz_part[r]; iz < nz_part[r + 1]; iz++)
    {
-      for (iy = ny_part[q];  iy < ny_part[q+1]; iy++)
+      for (iy = ny_part[q];  iy < ny_part[q + 1]; iy++)
       {
-         for (ix = nx_part[p]; ix < nx_part[p+1]; ix++)
+         for (ix = nx_part[p]; ix < nx_part[p + 1]; ix++)
          {
-            diag_i[cnt] = diag_i[cnt-1];
-            offd_i[o_cnt] = offd_i[o_cnt-1];
+            diag_i[cnt] = diag_i[cnt - 1];
+            offd_i[o_cnt] = offd_i[o_cnt - 1];
             diag_i[cnt]++;
             if (iz > nz_part[r])
+            {
                diag_i[cnt]++;
+            }
             else
             {
                if (iz)
@@ -128,7 +130,9 @@ GenerateVarDifConv( MPI_Comm         comm,
                }
             }
             if (iy > ny_part[q])
+            {
                diag_i[cnt]++;
+            }
             else
             {
                if (iy)
@@ -137,7 +141,9 @@ GenerateVarDifConv( MPI_Comm         comm,
                }
             }
             if (ix > nx_part[p])
+            {
                diag_i[cnt]++;
+            }
             else
             {
                if (ix)
@@ -145,29 +151,35 @@ GenerateVarDifConv( MPI_Comm         comm,
                   offd_i[o_cnt]++;
                }
             }
-            if (ix+1 < nx_part[p+1])
+            if (ix + 1 < nx_part[p + 1])
+            {
                diag_i[cnt]++;
+            }
             else
             {
-               if (ix+1 < nx)
+               if (ix + 1 < nx)
                {
                   offd_i[o_cnt]++;
                }
             }
-            if (iy+1 < ny_part[q+1])
+            if (iy + 1 < ny_part[q + 1])
+            {
                diag_i[cnt]++;
+            }
             else
             {
-               if (iy+1 < ny)
+               if (iy + 1 < ny)
                {
                   offd_i[o_cnt]++;
                }
             }
-            if (iz+1 < nz_part[r+1])
+            if (iz + 1 < nz_part[r + 1])
+            {
                diag_i[cnt]++;
+            }
             else
             {
-               if (iz+1 < nz)
+               if (iz + 1 < nz)
                {
                   offd_i[o_cnt]++;
                }
@@ -191,116 +203,116 @@ GenerateVarDifConv( MPI_Comm         comm,
    row_index = 0;
    cnt = 0;
    o_cnt = 0;
-   for (iz = nz_part[r]; iz < nz_part[r+1]; iz++)
+   for (iz = nz_part[r]; iz < nz_part[r + 1]; iz++)
    {
-      zz = (HYPRE_Real)(iz+1)*hhz;
-      for (iy = ny_part[q];  iy < ny_part[q+1]; iy++)
+      zz = (HYPRE_Real)(iz + 1) * hhz;
+      for (iy = ny_part[q];  iy < ny_part[q + 1]; iy++)
       {
-         yy = (HYPRE_Real)(iy+1)*hhy;
-         for (ix = nx_part[p]; ix < nx_part[p+1]; ix++)
+         yy = (HYPRE_Real)(iy + 1) * hhy;
+         for (ix = nx_part[p]; ix < nx_part[p + 1]; ix++)
          {
-            xx = (HYPRE_Real)(ix+1)*hhx;
-            afp = eps*afun(xx+0.5*hhx,yy,zz)/hhx/hhx;
-            afm = eps*afun(xx-0.5*hhx,yy,zz)/hhx/hhx;
-            bfp = eps*bfun(xx,yy+0.5*hhy,zz)/hhy/hhy;
-            bfm = eps*bfun(xx,yy-0.5*hhy,zz)/hhy/hhy;
-            cfp = eps*cfun(xx,yy,zz+0.5*hhz)/hhz/hhz;
-            cfm = eps*cfun(xx,yy,zz-0.5*hhz)/hhz/hhz;
-            df = dfun(xx,yy,zz)/hhx;
-            ef = efun(xx,yy,zz)/hhy;
-            ff = ffun(xx,yy,zz)/hhz;
-            gf = gfun(xx,yy,zz);
+            xx = (HYPRE_Real)(ix + 1) * hhx;
+            afp = eps * afun(xx + 0.5 * hhx, yy, zz) / hhx / hhx;
+            afm = eps * afun(xx - 0.5 * hhx, yy, zz) / hhx / hhx;
+            bfp = eps * bfun(xx, yy + 0.5 * hhy, zz) / hhy / hhy;
+            bfm = eps * bfun(xx, yy - 0.5 * hhy, zz) / hhy / hhy;
+            cfp = eps * cfun(xx, yy, zz + 0.5 * hhz) / hhz / hhz;
+            cfm = eps * cfun(xx, yy, zz - 0.5 * hhz) / hhz / hhz;
+            df = dfun(xx, yy, zz) / hhx;
+            ef = efun(xx, yy, zz) / hhy;
+            ff = ffun(xx, yy, zz) / hhz;
+            gf = gfun(xx, yy, zz);
             diag_j[cnt] = row_index;
-            diag_data[cnt++] = afp+afm+bfp+bfm+cfp+cfm+gf-df-ef-ff;
-            rhs_data[row_index] = rfun(xx,yy,zz);
-            if (ix == 0) rhs_data[row_index] += afm*bndfun(0,yy,zz);
-            if (iy == 0) rhs_data[row_index] += bfm*bndfun(xx,0,zz);
-            if (iz == 0) rhs_data[row_index] += cfm*bndfun(xx,yy,0);
-            if (ix+1 == nx) rhs_data[row_index] += (afp-df)*bndfun(1.0,yy,zz);
-            if (iy+1 == ny) rhs_data[row_index] += (bfp-ef)*bndfun(xx,1.0,zz);
-            if (iz+1 == nz) rhs_data[row_index] += (cfp-ff)*bndfun(xx,yy,1.0);
+            diag_data[cnt++] = afp + afm + bfp + bfm + cfp + cfm + gf - df - ef - ff;
+            rhs_data[row_index] = rfun(xx, yy, zz);
+            if (ix == 0) { rhs_data[row_index] += afm * bndfun(0, yy, zz); }
+            if (iy == 0) { rhs_data[row_index] += bfm * bndfun(xx, 0, zz); }
+            if (iz == 0) { rhs_data[row_index] += cfm * bndfun(xx, yy, 0); }
+            if (ix + 1 == nx) { rhs_data[row_index] += (afp - df) * bndfun(1.0, yy, zz); }
+            if (iy + 1 == ny) { rhs_data[row_index] += (bfp - ef) * bndfun(xx, 1.0, zz); }
+            if (iz + 1 == nz) { rhs_data[row_index] += (cfp - ff) * bndfun(xx, yy, 1.0); }
             if (iz > nz_part[r])
             {
-               diag_j[cnt] = row_index-nx_local*ny_local;
+               diag_j[cnt] = row_index - nx_local * ny_local;
                diag_data[cnt++] = -cfm;
             }
             else
             {
                if (iz)
                {
-                  big_offd_j[o_cnt] = hypre_map(ix,iy,iz-1,p,q,r-1,nx,ny,
-                        nx_part,ny_part,nz_part);
+                  big_offd_j[o_cnt] = hypre_map(ix, iy, iz - 1, p, q, r - 1, nx, ny,
+                                                nx_part, ny_part, nz_part);
                   offd_data[o_cnt++] = -cfm;
                }
             }
             if (iy > ny_part[q])
             {
-               diag_j[cnt] = row_index-nx_local;
+               diag_j[cnt] = row_index - nx_local;
                diag_data[cnt++] = -bfm;
             }
             else
             {
                if (iy)
                {
-                  big_offd_j[o_cnt] = hypre_map(ix,iy-1,iz,p,q-1,r,nx,ny,
-                        nx_part,ny_part,nz_part);
+                  big_offd_j[o_cnt] = hypre_map(ix, iy - 1, iz, p, q - 1, r, nx, ny,
+                                                nx_part, ny_part, nz_part);
                   offd_data[o_cnt++] = -bfm;
                }
             }
             if (ix > nx_part[p])
             {
-               diag_j[cnt] = row_index-1;
+               diag_j[cnt] = row_index - 1;
                diag_data[cnt++] = -afm;
             }
             else
             {
                if (ix)
                {
-                  big_offd_j[o_cnt] = hypre_map(ix-1,iy,iz,p-1,q,r,nx,ny,
-                        nx_part,ny_part,nz_part);
+                  big_offd_j[o_cnt] = hypre_map(ix - 1, iy, iz, p - 1, q, r, nx, ny,
+                                                nx_part, ny_part, nz_part);
                   offd_data[o_cnt++] = -afm;
                }
             }
-            if (ix+1 < nx_part[p+1])
+            if (ix + 1 < nx_part[p + 1])
             {
-               diag_j[cnt] = row_index+1;
-               diag_data[cnt++] = -afp+df;
+               diag_j[cnt] = row_index + 1;
+               diag_data[cnt++] = -afp + df;
             }
             else
             {
-               if (ix+1 < nx)
+               if (ix + 1 < nx)
                {
-                  big_offd_j[o_cnt] = hypre_map(ix+1,iy,iz,p+1,q,r,nx,ny,
-                        nx_part,ny_part,nz_part);
-                  offd_data[o_cnt++] = -afp+df;
+                  big_offd_j[o_cnt] = hypre_map(ix + 1, iy, iz, p + 1, q, r, nx, ny,
+                                                nx_part, ny_part, nz_part);
+                  offd_data[o_cnt++] = -afp + df;
                }
             }
-            if (iy+1 < ny_part[q+1])
+            if (iy + 1 < ny_part[q + 1])
             {
-               diag_j[cnt] = row_index+nx_local;
-               diag_data[cnt++] = -bfp +ef;
+               diag_j[cnt] = row_index + nx_local;
+               diag_data[cnt++] = -bfp + ef;
             }
             else
             {
-               if (iy+1 < ny)
+               if (iy + 1 < ny)
                {
-                  big_offd_j[o_cnt] = hypre_map(ix,iy+1,iz,p,q+1,r,nx,ny,
-                        nx_part,ny_part,nz_part);
-                  offd_data[o_cnt++] = -bfp+ef;
+                  big_offd_j[o_cnt] = hypre_map(ix, iy + 1, iz, p, q + 1, r, nx, ny,
+                                                nx_part, ny_part, nz_part);
+                  offd_data[o_cnt++] = -bfp + ef;
                }
             }
-            if (iz+1 < nz_part[r+1])
+            if (iz + 1 < nz_part[r + 1])
             {
-               diag_j[cnt] = row_index+nx_local*ny_local;
-               diag_data[cnt++] = -cfp+ff;
+               diag_j[cnt] = row_index + nx_local * ny_local;
+               diag_data[cnt++] = -cfp + ff;
             }
             else
             {
-               if (iz+1 < nz)
+               if (iz + 1 < nz)
                {
-                  big_offd_j[o_cnt] = hypre_map(ix,iy,iz+1,p,q,r+1,nx,ny,
-                        nx_part,ny_part,nz_part);
-                  offd_data[o_cnt++] = -cfp+ff;
+                  big_offd_j[o_cnt] = hypre_map(ix, iy, iz + 1, p, q, r + 1, nx, ny,
+                                                nx_part, ny_part, nz_part);
+                  offd_data[o_cnt++] = -cfp + ff;
                }
             }
             row_index++;
@@ -310,13 +322,15 @@ GenerateVarDifConv( MPI_Comm         comm,
 
    if (num_procs > 1)
    {
-      for (i=0; i < num_cols_offd; i++)
+      for (i = 0; i < num_cols_offd; i++)
+      {
          col_map_offd[i] = big_offd_j[i];
+      }
 
-      hypre_BigQsort0(col_map_offd, 0, num_cols_offd-1);
+      hypre_BigQsort0(col_map_offd, 0, num_cols_offd - 1);
 
-      for (i=0; i < num_cols_offd; i++)
-         for (j=0; j < num_cols_offd; j++)
+      for (i = 0; i < num_cols_offd; i++)
+         for (j = 0; j < num_cols_offd; j++)
             if (big_offd_j[i] == col_map_offd[j])
             {
                offd_j[i] = j;
@@ -368,56 +382,68 @@ GenerateVarDifConv( MPI_Comm         comm,
 HYPRE_Real afun(HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz)
 {
    HYPRE_Real value;
-   /* value = 1.0 + 1000.0*fabs(xx-yy); */
+   /* value = 1.0 + 1000.0*hypre_abs(xx-yy); */
    if ((xx < 0.1 && yy < 0.1 && zz < 0.1)
-      || (xx < 0.1 && yy < 0.1 && zz > 0.9)
-      || (xx < 0.1 && yy > 0.9 && zz < 0.1)
-      || (xx > 0.9 && yy < 0.1 && zz < 0.1)
-      || (xx > 0.9 && yy > 0.9 && zz < 0.1)
-      || (xx > 0.9 && yy < 0.1 && zz > 0.9)
-      || (xx < 0.1 && yy > 0.9 && zz > 0.9)
-      || (xx > 0.9 && yy > 0.9 && zz > 0.9))
+       || (xx < 0.1 && yy < 0.1 && zz > 0.9)
+       || (xx < 0.1 && yy > 0.9 && zz < 0.1)
+       || (xx > 0.9 && yy < 0.1 && zz < 0.1)
+       || (xx > 0.9 && yy > 0.9 && zz < 0.1)
+       || (xx > 0.9 && yy < 0.1 && zz > 0.9)
+       || (xx < 0.1 && yy > 0.9 && zz > 0.9)
+       || (xx > 0.9 && yy > 0.9 && zz > 0.9))
+   {
       value = 0.01;
+   }
    else if (xx >= 0.1 && xx <= 0.9
-         && yy >= 0.1 && yy <= 0.9
-         && zz >= 0.1 && zz <= 0.9)
+            && yy >= 0.1 && yy <= 0.9
+            && zz >= 0.1 && zz <= 0.9)
+   {
       value = 1000.0;
+   }
    else
+   {
       value = 1.0 ;
+   }
    /* HYPRE_Real value, pi;
-   pi = 4.0 * atan(1.0);
-   value = cos(pi*xx)*cos(pi*yy); */
+   pi = 4.0 * hypre_atan(1.0);
+   value = hypre_cos(pi*xx)*hypre_cos(pi*yy); */
    return value;
 }
 
 HYPRE_Real bfun(HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz)
 {
    HYPRE_Real value;
-   /* value = 1.0 + 1000.0*fabs(xx-yy); */
+   /* value = 1.0 + 1000.0*hypre_abs(xx-yy); */
    if ((xx < 0.1 && yy < 0.1 && zz < 0.1)
-      || (xx < 0.1 && yy < 0.1 && zz > 0.9)
-      || (xx < 0.1 && yy > 0.9 && zz < 0.1)
-      || (xx > 0.9 && yy < 0.1 && zz < 0.1)
-      || (xx > 0.9 && yy > 0.9 && zz < 0.1)
-      || (xx > 0.9 && yy < 0.1 && zz > 0.9)
-      || (xx < 0.1 && yy > 0.9 && zz > 0.9)
-      || (xx > 0.9 && yy > 0.9 && zz > 0.9))
+       || (xx < 0.1 && yy < 0.1 && zz > 0.9)
+       || (xx < 0.1 && yy > 0.9 && zz < 0.1)
+       || (xx > 0.9 && yy < 0.1 && zz < 0.1)
+       || (xx > 0.9 && yy > 0.9 && zz < 0.1)
+       || (xx > 0.9 && yy < 0.1 && zz > 0.9)
+       || (xx < 0.1 && yy > 0.9 && zz > 0.9)
+       || (xx > 0.9 && yy > 0.9 && zz > 0.9))
+   {
       value = 0.01;
+   }
    else if (xx >= 0.1 && xx <= 0.9
-         && yy >= 0.1 && yy <= 0.9
-         && zz >= 0.1 && zz <= 0.9)
+            && yy >= 0.1 && yy <= 0.9
+            && zz >= 0.1 && zz <= 0.9)
+   {
       value = 1000.0;
+   }
    else
+   {
       value = 1.0 ;
+   }
    /* HYPRE_Real value, pi;
-   pi = 4.0 * atan(1.0);
+   pi = 4.0 * hypre_atan(1.0);
    value = 1.0 - 2.0*xx;
-   value = cos(pi*xx)*cos(pi*yy); */
+   value = hypre_cos(pi*xx)*hypre_cos(pi*yy); */
    /* HYPRE_Real value;
-   value = 1.0 + 1000.0 * fabs(xx-yy);
+   value = 1.0 + 1000.0 * hypre_abs(xx-yy);
    HYPRE_Real value, x0, y0;
-   x0 = fabs(xx - 0.5);
-   y0 = fabs(yy - 0.5);
+   x0 = hypre_abs(xx - 0.5);
+   y0 = hypre_abs(yy - 0.5);
    if (y0 > x0) x0 = y0;
    if (x0 >= 0.125 && x0 <= 0.25)
       value = 1.0;
@@ -430,20 +456,26 @@ HYPRE_Real cfun(HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz)
 {
    HYPRE_Real value;
    if ((xx < 0.1 && yy < 0.1 && zz < 0.1)
-      || (xx < 0.1 && yy < 0.1 && zz > 0.9)
-      || (xx < 0.1 && yy > 0.9 && zz < 0.1)
-      || (xx > 0.9 && yy < 0.1 && zz < 0.1)
-      || (xx > 0.9 && yy > 0.9 && zz < 0.1)
-      || (xx > 0.9 && yy < 0.1 && zz > 0.9)
-      || (xx < 0.1 && yy > 0.9 && zz > 0.9)
-      || (xx > 0.9 && yy > 0.9 && zz > 0.9))
+       || (xx < 0.1 && yy < 0.1 && zz > 0.9)
+       || (xx < 0.1 && yy > 0.9 && zz < 0.1)
+       || (xx > 0.9 && yy < 0.1 && zz < 0.1)
+       || (xx > 0.9 && yy > 0.9 && zz < 0.1)
+       || (xx > 0.9 && yy < 0.1 && zz > 0.9)
+       || (xx < 0.1 && yy > 0.9 && zz > 0.9)
+       || (xx > 0.9 && yy > 0.9 && zz > 0.9))
+   {
       value = 0.01;
+   }
    else if (xx >= 0.1 && xx <= 0.9
-         && yy >= 0.1 && yy <= 0.9
-         && zz >= 0.1 && zz <= 0.9)
+            && yy >= 0.1 && yy <= 0.9
+            && zz >= 0.1 && zz <= 0.9)
+   {
       value = 1000.0;
+   }
    else
+   {
       value = 1.0 ;
+   }
    /*if (xx <= 0.75 && yy <= 0.75 && zz <= 0.75)
       value = 0.1;
    else if (xx > 0.75 && yy > 0.75 && zz > 0.75)
@@ -455,26 +487,38 @@ HYPRE_Real cfun(HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz)
 
 HYPRE_Real dfun(HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz)
 {
+   HYPRE_UNUSED_VAR(xx);
+   HYPRE_UNUSED_VAR(yy);
+   HYPRE_UNUSED_VAR(zz);
+
    HYPRE_Real value;
    /*HYPRE_Real pi;
-   pi = 4.0 * atan(1.0);
-   value = -sin(pi*xx)*cos(pi*yy);*/
+   pi = 4.0 * hypre_atan(1.0);
+   value = -hypre_sin(pi*xx)*hypre_cos(pi*yy);*/
    value = 0;
    return value;
 }
 
 HYPRE_Real efun(HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz)
 {
+   HYPRE_UNUSED_VAR(xx);
+   HYPRE_UNUSED_VAR(yy);
+   HYPRE_UNUSED_VAR(zz);
+
    HYPRE_Real value;
    /*HYPRE_Real pi;
-   pi = 4.0 * atan(1.0);
-   value = sin(pi*yy)*cos(pi*xx);*/
+   pi = 4.0 * hypre_atan(1.0);
+   value = hypre_sin(pi*yy)*hypre_cos(pi*xx);*/
    value = 0;
    return value;
 }
 
 HYPRE_Real ffun(HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz)
 {
+   HYPRE_UNUSED_VAR(xx);
+   HYPRE_UNUSED_VAR(yy);
+   HYPRE_UNUSED_VAR(zz);
+
    HYPRE_Real value;
    value = 0.0;
    return value;
@@ -482,6 +526,10 @@ HYPRE_Real ffun(HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz)
 
 HYPRE_Real gfun(HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz)
 {
+   HYPRE_UNUSED_VAR(xx);
+   HYPRE_UNUSED_VAR(yy);
+   HYPRE_UNUSED_VAR(zz);
+
    HYPRE_Real value;
    value = 0.0;
    return value;
@@ -489,9 +537,13 @@ HYPRE_Real gfun(HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz)
 
 HYPRE_Real rfun(HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz)
 {
+   HYPRE_UNUSED_VAR(xx);
+   HYPRE_UNUSED_VAR(yy);
+   HYPRE_UNUSED_VAR(zz);
+
    /* HYPRE_Real value, pi;
-   pi = 4.0 * atan(1.0);
-   value = -4.0*pi*pi*sin(pi*xx)*sin(pi*yy)*cos(pi*xx)*cos(pi*yy); */
+   pi = 4.0 * hypre_atan(1.0);
+   value = -4.0*pi*pi*hypre_sin(pi*xx)*hypre_sin(pi*yy)*hypre_cos(pi*xx)*hypre_cos(pi*yy); */
    HYPRE_Real value;
    /* value = xx*(1.0-xx)*yy*(1.0-yy); */
    value = 1.0;
@@ -500,10 +552,14 @@ HYPRE_Real rfun(HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz)
 
 HYPRE_Real bndfun(HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz)
 {
+   HYPRE_UNUSED_VAR(xx);
+   HYPRE_UNUSED_VAR(yy);
+   HYPRE_UNUSED_VAR(zz);
+
    HYPRE_Real value;
    /*HYPRE_Real pi;
    pi = 4.0 * atan(1.0);
-   value = sin(pi*xx)+sin(13*pi*xx)+sin(pi*yy)+sin(13*pi*yy);*/
+   value = hypre_sin(pi*xx)+hypre_sin(13*pi*xx)+hypre_sin(pi*yy)+hypre_sin(13*pi*yy);*/
    value = 0.0;
    return value;
 }
diff --git a/external/hypre/src/parcsr_ls/par_vardifconv_rs.c b/external/hypre/src/parcsr_ls/par_vardifconv_rs.c
index 5e5cb20b..6a9a1d11 100644
--- a/external/hypre/src/parcsr_ls/par_vardifconv_rs.c
+++ b/external/hypre/src/parcsr_ls/par_vardifconv_rs.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -21,19 +21,19 @@ static HYPRE_Real rs_l = 3.0;
  *--------------------------------------------------------------------------*/
 
 HYPRE_ParCSRMatrix
-GenerateRSVarDifConv( MPI_Comm comm,
-                 HYPRE_BigInt   nx,
-                 HYPRE_BigInt   ny,
-                 HYPRE_BigInt   nz,
-                 HYPRE_Int      P,
-                 HYPRE_Int      Q,
-                 HYPRE_Int      R,
-                 HYPRE_Int      p,
-                 HYPRE_Int      q,
-                 HYPRE_Int      r,
-                 HYPRE_Real eps,
-		 HYPRE_ParVector *rhs_ptr,
-                 HYPRE_Int type)
+GenerateRSVarDifConv( MPI_Comm         comm,
+                      HYPRE_BigInt     nx,
+                      HYPRE_BigInt     ny,
+                      HYPRE_BigInt     nz,
+                      HYPRE_Int        P,
+                      HYPRE_Int        Q,
+                      HYPRE_Int        R,
+                      HYPRE_Int        p,
+                      HYPRE_Int        q,
+                      HYPRE_Int        r,
+                      HYPRE_Real       eps,
+                      HYPRE_ParVector *rhs_ptr,
+                      HYPRE_Int        type)
 {
    hypre_ParCSRMatrix *A;
    hypre_CSRMatrix *diag;
@@ -46,18 +46,18 @@ GenerateRSVarDifConv( MPI_Comm comm,
    HYPRE_Int    *diag_j;
    HYPRE_Real *diag_data;
 
-   HYPRE_Int    *offd_i;
-   HYPRE_Int    *offd_j;
-   HYPRE_BigInt *big_offd_j;
-   HYPRE_Real *offd_data;
+   HYPRE_Int    *offd_i = NULL;
+   HYPRE_Int    *offd_j = NULL;
+   HYPRE_BigInt *big_offd_j = NULL;
+   HYPRE_Real   *offd_data = NULL;
 
-   HYPRE_BigInt *global_part;
+   HYPRE_BigInt global_part[2];
    HYPRE_BigInt ix, iy, iz;
    HYPRE_Int cnt, o_cnt;
    HYPRE_Int local_num_rows;
    HYPRE_BigInt *col_map_offd;
    HYPRE_Int row_index;
-   HYPRE_Int i,j;
+   HYPRE_Int i, j;
 
    HYPRE_Int nx_local, ny_local, nz_local;
    HYPRE_Int num_cols_offd;
@@ -76,70 +76,70 @@ GenerateRSVarDifConv( MPI_Comm comm,
    HYPRE_Real afp, afm, bfp, bfm, cfp, cfm, di, ai, mux, ei, bi,
               muy, fi, ci, muz, dfm, dfp, efm, efp, ffm, ffp, gi;
 
-   hypre_MPI_Comm_size(comm,&num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_size(comm, &num_procs);
+   hypre_MPI_Comm_rank(comm, &my_id);
 
    if (type >= 1 && type <= 3)
    {
-     rs_example = type;
+      rs_example = type;
    }
 
-   grid_size = nx*ny*nz;
+   grid_size = nx * ny * nz;
 
-   hypre_GeneratePartitioning(nx,P,&nx_part);
-   hypre_GeneratePartitioning(ny,Q,&ny_part);
-   hypre_GeneratePartitioning(nz,R,&nz_part);
+   hypre_GeneratePartitioning(nx, P, &nx_part);
+   hypre_GeneratePartitioning(ny, Q, &ny_part);
+   hypre_GeneratePartitioning(nz, R, &nz_part);
 
-   nx_local = (HYPRE_Int)(nx_part[p+1] - nx_part[p]);
-   ny_local = (HYPRE_Int)(ny_part[q+1] - ny_part[q]);
-   nz_local = (HYPRE_Int)(nz_part[r+1] - nz_part[r]);
+   nx_local = (HYPRE_Int)(nx_part[p + 1] - nx_part[p]);
+   ny_local = (HYPRE_Int)(ny_part[q + 1] - ny_part[q]);
+   nz_local = (HYPRE_Int)(nz_part[r + 1] - nz_part[r]);
 
-   local_num_rows = nx_local*ny_local*nz_local;
+   local_num_rows = nx_local * ny_local * nz_local;
 
-
-   global_part = hypre_CTAlloc(HYPRE_BigInt,2,HYPRE_MEMORY_HOST);
-   global_part[0] = nz_part[r]*nx*ny+(ny_part[q]*nx+nx_part[p]*ny_local)*nz_local;
+   global_part[0] = nz_part[r] * nx * ny + (ny_part[q] * nx + nx_part[p] * ny_local) * nz_local;
    global_part[1] = global_part[0] + (HYPRE_BigInt)local_num_rows;
 
-   diag_i = hypre_CTAlloc(HYPRE_Int,  local_num_rows+1, HYPRE_MEMORY_HOST);
-   offd_i = hypre_CTAlloc(HYPRE_Int,  local_num_rows+1, HYPRE_MEMORY_HOST);
+   diag_i = hypre_CTAlloc(HYPRE_Int,  local_num_rows + 1, HYPRE_MEMORY_HOST);
+   offd_i = hypre_CTAlloc(HYPRE_Int,  local_num_rows + 1, HYPRE_MEMORY_HOST);
    rhs_data = hypre_CTAlloc(HYPRE_Real,  local_num_rows, HYPRE_MEMORY_HOST);
 
-   P_busy = hypre_min(nx,P);
-   Q_busy = hypre_min(ny,Q);
-   R_busy = hypre_min(nz,R);
+   P_busy = hypre_min(nx, P);
+   Q_busy = hypre_min(ny, Q);
+   R_busy = hypre_min(nz, R);
 
    num_cols_offd = 0;
-   if (p) num_cols_offd += ny_local*nz_local;
-   if (p < P_busy-1) num_cols_offd += ny_local*nz_local;
-   if (q) num_cols_offd += nx_local*nz_local;
-   if (q < Q_busy-1) num_cols_offd += nx_local*nz_local;
-   if (r) num_cols_offd += nx_local*ny_local;
-   if (r < R_busy-1) num_cols_offd += nx_local*ny_local;
+   if (p) { num_cols_offd += ny_local * nz_local; }
+   if (p < P_busy - 1) { num_cols_offd += ny_local * nz_local; }
+   if (q) { num_cols_offd += nx_local * nz_local; }
+   if (q < Q_busy - 1) { num_cols_offd += nx_local * nz_local; }
+   if (r) { num_cols_offd += nx_local * ny_local; }
+   if (r < R_busy - 1) { num_cols_offd += nx_local * ny_local; }
 
-   if (!local_num_rows) num_cols_offd = 0;
+   if (!local_num_rows) { num_cols_offd = 0; }
 
    col_map_offd = hypre_CTAlloc(HYPRE_BigInt,  num_cols_offd, HYPRE_MEMORY_HOST);
 
-   hhx = 1.0/(HYPRE_Real)(nx+1);
-   hhy = 1.0/(HYPRE_Real)(ny+1);
-   hhz = 1.0/(HYPRE_Real)(nz+1);
+   hhx = 1.0 / (HYPRE_Real)(nx + 1);
+   hhy = 1.0 / (HYPRE_Real)(ny + 1);
+   hhz = 1.0 / (HYPRE_Real)(nz + 1);
 
    cnt = 1;
    o_cnt = 1;
    diag_i[0] = 0;
    offd_i[0] = 0;
-   for (iz = nz_part[r]; iz < nz_part[r+1]; iz++)
+   for (iz = nz_part[r]; iz < nz_part[r + 1]; iz++)
    {
-      for (iy = ny_part[q];  iy < ny_part[q+1]; iy++)
+      for (iy = ny_part[q];  iy < ny_part[q + 1]; iy++)
       {
-         for (ix = nx_part[p]; ix < nx_part[p+1]; ix++)
+         for (ix = nx_part[p]; ix < nx_part[p + 1]; ix++)
          {
-            diag_i[cnt] = diag_i[cnt-1];
-            offd_i[o_cnt] = offd_i[o_cnt-1];
+            diag_i[cnt] = diag_i[cnt - 1];
+            offd_i[o_cnt] = offd_i[o_cnt - 1];
             diag_i[cnt]++;
             if (iz > nz_part[r])
+            {
                diag_i[cnt]++;
+            }
             else
             {
                if (iz)
@@ -148,7 +148,9 @@ GenerateRSVarDifConv( MPI_Comm comm,
                }
             }
             if (iy > ny_part[q])
+            {
                diag_i[cnt]++;
+            }
             else
             {
                if (iy)
@@ -157,7 +159,9 @@ GenerateRSVarDifConv( MPI_Comm comm,
                }
             }
             if (ix > nx_part[p])
+            {
                diag_i[cnt]++;
+            }
             else
             {
                if (ix)
@@ -165,29 +169,35 @@ GenerateRSVarDifConv( MPI_Comm comm,
                   offd_i[o_cnt]++;
                }
             }
-            if (ix+1 < nx_part[p+1])
+            if (ix + 1 < nx_part[p + 1])
+            {
                diag_i[cnt]++;
+            }
             else
             {
-               if (ix+1 < nx)
+               if (ix + 1 < nx)
                {
                   offd_i[o_cnt]++;
                }
             }
-            if (iy+1 < ny_part[q+1])
+            if (iy + 1 < ny_part[q + 1])
+            {
                diag_i[cnt]++;
+            }
             else
             {
-               if (iy+1 < ny)
+               if (iy + 1 < ny)
                {
                   offd_i[o_cnt]++;
                }
             }
-            if (iz+1 < nz_part[r+1])
+            if (iz + 1 < nz_part[r + 1])
+            {
                diag_i[cnt]++;
+            }
             else
             {
-               if (iz+1 < nz)
+               if (iz + 1 < nz)
                {
                   offd_i[o_cnt]++;
                }
@@ -211,100 +221,100 @@ GenerateRSVarDifConv( MPI_Comm comm,
    row_index = 0;
    cnt = 0;
    o_cnt = 0;
-   for (iz = nz_part[r]; iz < nz_part[r+1]; iz++)
+   for (iz = nz_part[r]; iz < nz_part[r + 1]; iz++)
    {
-      zz = (HYPRE_Real)(iz+1)*hhz;
-      for (iy = ny_part[q]; iy < ny_part[q+1]; iy++)
+      zz = (HYPRE_Real)(iz + 1) * hhz;
+      for (iy = ny_part[q]; iy < ny_part[q + 1]; iy++)
       {
-         yy = (HYPRE_Real)(iy+1)*hhy;
-         for (ix = nx_part[p]; ix < nx_part[p+1]; ix++)
+         yy = (HYPRE_Real)(iy + 1) * hhy;
+         for (ix = nx_part[p]; ix < nx_part[p + 1]; ix++)
          {
-            xx = (HYPRE_Real)(ix+1)*hhx;
-	    afp = -eps*afun_rs(xx+0.5*hhx,yy,zz)/hhx/hhx;
-	    afm = -eps*afun_rs(xx-0.5*hhx,yy,zz)/hhx/hhx;
-	    bfp = -eps*bfun_rs(xx,yy+0.5*hhy,zz)/hhy/hhy;
-	    bfm = -eps*bfun_rs(xx,yy-0.5*hhy,zz)/hhy/hhy;
-	    cfp = -eps*cfun_rs(xx,yy,zz+0.5*hhz)/hhz/hhz;
-	    cfm = -eps*cfun_rs(xx,yy,zz-0.5*hhz)/hhz/hhz;
+            xx = (HYPRE_Real)(ix + 1) * hhx;
+            afp = -eps * afun_rs(xx + 0.5 * hhx, yy, zz) / hhx / hhx;
+            afm = -eps * afun_rs(xx - 0.5 * hhx, yy, zz) / hhx / hhx;
+            bfp = -eps * bfun_rs(xx, yy + 0.5 * hhy, zz) / hhy / hhy;
+            bfm = -eps * bfun_rs(xx, yy - 0.5 * hhy, zz) / hhy / hhy;
+            cfp = -eps * cfun_rs(xx, yy, zz + 0.5 * hhz) / hhz / hhz;
+            cfm = -eps * cfun_rs(xx, yy, zz - 0.5 * hhz) / hhz / hhz;
             /* first order terms */
             /* x-direction */
             di = dfun_rs(xx, yy, zz);
             ai = afun_rs(xx, yy, zz);
             if (di * hhx > eps * ai)
             {
-              mux = eps * ai / (2.0 * di * hhx);
+               mux = eps * ai / (2.0 * di * hhx);
             }
             else if (di * hhx < -eps * ai)
             {
-              mux = 1.0 + eps * ai / (2.0 * di * hhx);
+               mux = 1.0 + eps * ai / (2.0 * di * hhx);
             }
             else
             {
-              mux = 0.5;
+               mux = 0.5;
             }
             /* y-direction */
             ei = efun_rs(xx, yy, zz);
             bi = bfun_rs(xx, yy, zz);
             if (ei * hhy > eps * bi)
             {
-              muy = eps * bi / (2.0 * ei * hhy);
+               muy = eps * bi / (2.0 * ei * hhy);
             }
             else if (ei * hhy < -eps * bi)
             {
-              muy = 1.0 + eps * bi / (2.0 * ei * hhy);
+               muy = 1.0 + eps * bi / (2.0 * ei * hhy);
             }
             else
             {
-              muy = 0.5;
+               muy = 0.5;
             }
             /* z-direction */
             fi = ffun_rs(xx, yy, zz);
             ci = cfun_rs(xx, yy, zz);
             if (fi * hhz > eps * ci)
             {
-              muz = eps * ci / (2.0 * fi * hhz);
+               muz = eps * ci / (2.0 * fi * hhz);
             }
             else if (fi * hhz < -eps * ci)
             {
-              muz = 1.0 + eps * ci / (2.0 * fi * hhz);
+               muz = 1.0 + eps * ci / (2.0 * fi * hhz);
             }
             else
             {
-              muz = 0.5;
+               muz = 0.5;
             }
 
-	    dfm = di * (mux - 1.0) / hhx;
+            dfm = di * (mux - 1.0) / hhx;
             dfp = di * mux / hhx;
-	    efm = ei * (muy - 1.0) / hhy;
+            efm = ei * (muy - 1.0) / hhy;
             efp = ei * muy / hhy;
             ffm = fi * (muz - 1.0) / hhz;
-	    ffp = fi * muz / hhz;
-	    gi = gfun_rs(xx, yy, zz);
+            ffp = fi * muz / hhz;
+            gi = gfun_rs(xx, yy, zz);
             /* stencil: center */
             diag_j[cnt] = row_index;
             diag_data[cnt++] = -(afp + afm + bfp + bfm + cfp + cfm  +
                                  dfp + dfm + efp + efm + ffp + ffm) + gi;
             /* rhs vector */
-	    rhs_data[row_index] = rfun_rs(xx,yy,zz);
-	    /* apply boundary conditions */
-            if (ix == 0)    rhs_data[row_index] -= (afm+dfm) * bndfun_rs(0,yy,zz);
-	    if (iy == 0)    rhs_data[row_index] -= (bfm+efm) * bndfun_rs(xx,0,zz);
-	    if (iz == 0)    rhs_data[row_index] -= (cfm+ffm) * bndfun_rs(xx,yy,0);
-	    if (ix+1 == nx) rhs_data[row_index] -= (afp+dfp) * bndfun_rs(1.0,yy,zz);
-	    if (iy+1 == ny) rhs_data[row_index] -= (bfp+efp) * bndfun_rs(xx,1.0,zz);
-	    if (iz+1 == nz) rhs_data[row_index] -= (cfp+ffp) * bndfun_rs(xx,yy,1.0);
+            rhs_data[row_index] = rfun_rs(xx, yy, zz);
+            /* apply boundary conditions */
+            if (ix == 0) { rhs_data[row_index] -= (afm + dfm) * bndfun_rs(0, yy, zz); }
+            if (iy == 0) { rhs_data[row_index] -= (bfm + efm) * bndfun_rs(xx, 0, zz); }
+            if (iz == 0) { rhs_data[row_index] -= (cfm + ffm) * bndfun_rs(xx, yy, 0); }
+            if (ix + 1 == nx) { rhs_data[row_index] -= (afp + dfp) * bndfun_rs(1.0, yy, zz); }
+            if (iy + 1 == ny) { rhs_data[row_index] -= (bfp + efp) * bndfun_rs(xx, 1.0, zz); }
+            if (iz + 1 == nz) { rhs_data[row_index] -= (cfp + ffp) * bndfun_rs(xx, yy, 1.0); }
             /* stencil: z- */
             if (iz > nz_part[r])
             {
-               diag_j[cnt] = row_index - nx_local*ny_local;
+               diag_j[cnt] = row_index - nx_local * ny_local;
                diag_data[cnt++] = cfm + ffm;
             }
             else
             {
                if (iz)
                {
-                  big_offd_j[o_cnt] = hypre_map(ix,iy,iz-1,p,q,r-1,nx,ny,
-                                            nx_part,ny_part,nz_part);
+                  big_offd_j[o_cnt] = hypre_map(ix, iy, iz - 1, p, q, r - 1, nx, ny,
+                                                nx_part, ny_part, nz_part);
                   offd_data[o_cnt++] = cfm + ffm;
                }
             }
@@ -318,8 +328,8 @@ GenerateRSVarDifConv( MPI_Comm comm,
             {
                if (iy)
                {
-                  big_offd_j[o_cnt] = hypre_map(ix,iy-1,iz,p,q-1,r,nx,ny,
-                                            nx_part,ny_part,nz_part);
+                  big_offd_j[o_cnt] = hypre_map(ix, iy - 1, iz, p, q - 1, r, nx, ny,
+                                                nx_part, ny_part, nz_part);
                   offd_data[o_cnt++] = bfm + efm;
                }
             }
@@ -333,53 +343,53 @@ GenerateRSVarDifConv( MPI_Comm comm,
             {
                if (ix)
                {
-                  big_offd_j[o_cnt] = hypre_map(ix-1,iy,iz,p-1,q,r,nx,ny,
-                                            nx_part,ny_part,nz_part);
+                  big_offd_j[o_cnt] = hypre_map(ix - 1, iy, iz, p - 1, q, r, nx, ny,
+                                                nx_part, ny_part, nz_part);
                   offd_data[o_cnt++] = afm + dfm;
                }
             }
             /* stencil: x+ */
-            if (ix+1 < nx_part[p+1])
+            if (ix + 1 < nx_part[p + 1])
             {
                diag_j[cnt] = row_index + 1;
                diag_data[cnt++] = afp + dfp;
             }
             else
             {
-               if (ix+1 < nx)
+               if (ix + 1 < nx)
                {
-                  big_offd_j[o_cnt] = hypre_map(ix+1,iy,iz,p+1,q,r,nx,ny,
-                                            nx_part,ny_part,nz_part);
+                  big_offd_j[o_cnt] = hypre_map(ix + 1, iy, iz, p + 1, q, r, nx, ny,
+                                                nx_part, ny_part, nz_part);
                   offd_data[o_cnt++] = afp + dfp;
                }
             }
             /* stencil: y+ */
-            if (iy+1 < ny_part[q+1])
+            if (iy + 1 < ny_part[q + 1])
             {
                diag_j[cnt] = row_index + nx_local;
                diag_data[cnt++] = bfp + efp;
             }
             else
             {
-               if (iy+1 < ny)
+               if (iy + 1 < ny)
                {
-                  big_offd_j[o_cnt] = hypre_map(ix,iy+1,iz,p,q+1,r,nx,ny,
-                                            nx_part,ny_part,nz_part);
+                  big_offd_j[o_cnt] = hypre_map(ix, iy + 1, iz, p, q + 1, r, nx, ny,
+                                                nx_part, ny_part, nz_part);
                   offd_data[o_cnt++] = bfp + efp;
                }
             }
             /* stencil: z+ */
-            if (iz+1 < nz_part[r+1])
+            if (iz + 1 < nz_part[r + 1])
             {
-               diag_j[cnt] = row_index + nx_local*ny_local;
+               diag_j[cnt] = row_index + nx_local * ny_local;
                diag_data[cnt++] = cfp + ffp;
             }
             else
             {
-               if (iz+1 < nz)
+               if (iz + 1 < nz)
                {
-                  big_offd_j[o_cnt] = hypre_map(ix,iy,iz+1,p,q,r+1,nx,ny,
-                                            nx_part,ny_part,nz_part);
+                  big_offd_j[o_cnt] = hypre_map(ix, iy, iz + 1, p, q, r + 1, nx, ny,
+                                                nx_part, ny_part, nz_part);
                   offd_data[o_cnt++] = cfp + ffp;
                }
             }
@@ -391,13 +401,15 @@ GenerateRSVarDifConv( MPI_Comm comm,
 
    if (num_procs > 1)
    {
-      for (i=0; i < num_cols_offd; i++)
+      for (i = 0; i < num_cols_offd; i++)
+      {
          col_map_offd[i] = big_offd_j[i];
+      }
 
-      hypre_BigQsort0(col_map_offd, 0, num_cols_offd-1);
+      hypre_BigQsort0(col_map_offd, 0, num_cols_offd - 1);
 
-      for (i=0; i < num_cols_offd; i++)
-         for (j=0; j < num_cols_offd; j++)
+      for (i = 0; i < num_cols_offd; i++)
+         for (j = 0; j < num_cols_offd; j++)
             if (big_offd_j[i] == col_map_offd[j])
             {
                offd_j[i] = j;
@@ -441,6 +453,10 @@ GenerateRSVarDifConv( MPI_Comm comm,
 
 HYPRE_Real afun_rs(HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz)
 {
+   HYPRE_UNUSED_VAR(xx);
+   HYPRE_UNUSED_VAR(yy);
+   HYPRE_UNUSED_VAR(zz);
+
    HYPRE_Real value;
    value = 1.0;
    return value;
@@ -448,6 +464,10 @@ HYPRE_Real afun_rs(HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz)
 
 HYPRE_Real bfun_rs(HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz)
 {
+   HYPRE_UNUSED_VAR(xx);
+   HYPRE_UNUSED_VAR(yy);
+   HYPRE_UNUSED_VAR(zz);
+
    HYPRE_Real value;
    value = 1.0;
    return value;
@@ -455,6 +475,10 @@ HYPRE_Real bfun_rs(HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz)
 
 HYPRE_Real cfun_rs(HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz)
 {
+   HYPRE_UNUSED_VAR(xx);
+   HYPRE_UNUSED_VAR(yy);
+   HYPRE_UNUSED_VAR(zz);
+
    HYPRE_Real value;
    value = 1.0;
    return value;
@@ -462,36 +486,40 @@ HYPRE_Real cfun_rs(HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz)
 
 HYPRE_Real dfun_rs(HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz)
 {
+   HYPRE_UNUSED_VAR(zz);
+
    HYPRE_Real value;
    if (rs_example == 1)
    {
-     value = sin(rs_l*M_PI/8.0);
+      value = hypre_sin(rs_l * M_PI / 8.0);
    }
    else if (rs_example == 2)
    {
-     value = (2.0*yy-1.0)*(1.0-xx*xx);
+      value = (2.0 * yy - 1.0) * (1.0 - xx * xx);
    }
    else
    {
-     value = 4.0*xx*(xx-1.0)*(1.0-2.0*yy);
+      value = 4.0 * xx * (xx - 1.0) * (1.0 - 2.0 * yy);
    }
    return value;
 }
 
 HYPRE_Real efun_rs(HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz)
 {
+   HYPRE_UNUSED_VAR(zz);
+
    HYPRE_Real value;
    if (rs_example == 1)
    {
-     value = cos(rs_l*M_PI/8.0);
+      value = hypre_cos(rs_l * M_PI / 8.0);
    }
    else if (rs_example == 2)
    {
-     value = 2.0*xx*yy*(yy-1.0);
+      value = 2.0 * xx * yy * (yy - 1.0);
    }
    else
    {
-     value = -4.0*yy*(yy-1.0)*(1.0-2.0*xx);
+      value = -4.0 * yy * (yy - 1.0) * (1.0 - 2.0 * xx);
    }
    return value;
 }
@@ -505,6 +533,10 @@ HYPRE_Real ffun_rs(HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz)
 
 HYPRE_Real gfun_rs(HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz)
 {
+   HYPRE_UNUSED_VAR(xx);
+   HYPRE_UNUSED_VAR(yy);
+   HYPRE_UNUSED_VAR(zz);
+
    HYPRE_Real value;
    value = 0.0;
    return value;
@@ -512,6 +544,10 @@ HYPRE_Real gfun_rs(HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz)
 
 HYPRE_Real rfun_rs(HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz)
 {
+   HYPRE_UNUSED_VAR(xx);
+   HYPRE_UNUSED_VAR(yy);
+   HYPRE_UNUSED_VAR(zz);
+
    HYPRE_Real value;
    value = 1.0;
    return value;
@@ -519,6 +555,10 @@ HYPRE_Real rfun_rs(HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz)
 
 HYPRE_Real bndfun_rs(HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz)
 {
+   HYPRE_UNUSED_VAR(xx);
+   HYPRE_UNUSED_VAR(yy);
+   HYPRE_UNUSED_VAR(zz);
+
    HYPRE_Real value;
    value = 0.0;
    return value;
diff --git a/external/hypre/src/parcsr_ls/partial.c b/external/hypre/src/parcsr_ls/partial.c
index 8aa42b69..ec763ed0 100644
--- a/external/hypre/src/parcsr_ls/partial.c
+++ b/external/hypre/src/parcsr_ls/partial.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -13,12 +13,17 @@
  *  Comment:
  *--------------------------------------------------------------------------*/
 HYPRE_Int
-hypre_BoomerAMGBuildPartialExtPIInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
-                                       hypre_ParCSRMatrix   *S, HYPRE_BigInt *num_cpts_global,
-                                       HYPRE_BigInt *num_old_cpts_global,
-                                       HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int debug_flag,
-                                       HYPRE_Real trunc_factor, HYPRE_Int max_elmts,
-                                       hypre_ParCSRMatrix  **P_ptr)
+hypre_BoomerAMGBuildPartialExtPIInterp(hypre_ParCSRMatrix  *A,
+                                       HYPRE_Int           *CF_marker,
+                                       hypre_ParCSRMatrix  *S,
+                                       HYPRE_BigInt        *num_cpts_global,
+                                       HYPRE_BigInt        *num_old_cpts_global,
+                                       HYPRE_Int            num_functions,
+                                       HYPRE_Int           *dof_func,
+                                       HYPRE_Int            debug_flag,
+                                       HYPRE_Real           trunc_factor,
+                                       HYPRE_Int            max_elmts,
+                                       hypre_ParCSRMatrix **P_ptr)
 {
 #ifdef HYPRE_PROFILE
    hypre_profile_times[HYPRE_TIMER_ID_PARTIAL_INTERP] -= hypre_MPI_Wtime();
@@ -79,10 +84,10 @@ hypre_BoomerAMGBuildPartialExtPIInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_mark
    HYPRE_Int       *dof_func_offd = NULL;
 
    /* Full row information for columns of A that are off diag*/
-   hypre_CSRMatrix *A_ext;
-   HYPRE_Real      *A_ext_data;
-   HYPRE_Int       *A_ext_i;
-   HYPRE_BigInt    *A_ext_j;
+   hypre_CSRMatrix *A_ext      = NULL;
+   HYPRE_Real      *A_ext_data = NULL;
+   HYPRE_Int       *A_ext_i    = NULL;
+   HYPRE_BigInt    *A_ext_j    = NULL;
 
    HYPRE_Int       *fine_to_coarse = NULL;
    HYPRE_BigInt    *fine_to_coarse_offd = NULL;
@@ -90,9 +95,9 @@ hypre_BoomerAMGBuildPartialExtPIInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_mark
 
    HYPRE_Int        full_off_procNodes;
 
-   hypre_CSRMatrix *Sop;
-   HYPRE_Int       *Sop_i;
-   HYPRE_BigInt    *Sop_j;
+   hypre_CSRMatrix *Sop   = NULL;
+   HYPRE_Int       *Sop_i = NULL;
+   HYPRE_BigInt    *Sop_j = NULL;
 
    HYPRE_Int        sgn;
 
@@ -127,24 +132,24 @@ hypre_BoomerAMGBuildPartialExtPIInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_mark
 
    hypre_ParCSRCommPkg   *extend_comm_pkg = NULL;
 
-   if (debug_flag==4) wall_time = time_getWallclockSeconds();
+   if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
 
    /* BEGIN */
    hypre_MPI_Comm_size(comm, &num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_rank(comm, &my_id);
    max_num_threads = hypre_NumThreads();
 
    my_first_cpt = num_cpts_global[0];
    /*my_first_old_cpt = num_old_cpts_global[0];*/
    n_coarse_old = (HYPRE_Int)(num_old_cpts_global[1] - num_old_cpts_global[0]);
    /*n_coarse = num_cpts_global[1] - num_cpts_global[0];*/
-   if (my_id == (num_procs -1))
+   if (my_id == (num_procs - 1))
    {
       total_global_cpts = num_cpts_global[1];
       total_old_global_cpts = num_old_cpts_global[1];
    }
-   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
-   hypre_MPI_Bcast(&total_old_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
+   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
+   hypre_MPI_Bcast(&total_old_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
 
    if (!comm_pkg)
    {
@@ -183,8 +188,8 @@ hypre_BoomerAMGBuildPartialExtPIInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_mark
    /*-----------------------------------------------------------------------
     *  Intialize counters and allocate mapping vector.
     *-----------------------------------------------------------------------*/
-   P_diag_i    = hypre_CTAlloc(HYPRE_Int,  n_coarse_old+1, HYPRE_MEMORY_HOST);
-   P_offd_i    = hypre_CTAlloc(HYPRE_Int,  n_coarse_old+1, HYPRE_MEMORY_HOST);
+   P_diag_i    = hypre_CTAlloc(HYPRE_Int,  n_coarse_old + 1, HYPRE_MEMORY_HOST);
+   P_offd_i    = hypre_CTAlloc(HYPRE_Int,  n_coarse_old + 1, HYPRE_MEMORY_HOST);
 
    if (n_fine)
    {
@@ -204,7 +209,7 @@ hypre_BoomerAMGBuildPartialExtPIInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_mark
      fine_to_coarse_offd, P_marker, P_marker_offd,
      tmp_CF_marker_offd);*/
 
-   for (i=0; i < full_off_procNodes; i++)
+   for (i = 0; i < full_off_procNodes; i++)
    {
       fine_to_coarse_offd[i] = -1;
       tmp_CF_marker_offd[i] = -1;
@@ -226,13 +231,13 @@ hypre_BoomerAMGBuildPartialExtPIInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_mark
       }
    }
 
-   P_diag_array = hypre_CTAlloc(HYPRE_Int,  max_num_threads+1, HYPRE_MEMORY_HOST);
-   P_offd_array = hypre_CTAlloc(HYPRE_Int,  max_num_threads+1, HYPRE_MEMORY_HOST);
+   P_diag_array = hypre_CTAlloc(HYPRE_Int,  max_num_threads + 1, HYPRE_MEMORY_HOST);
+   P_offd_array = hypre_CTAlloc(HYPRE_Int,  max_num_threads + 1, HYPRE_MEMORY_HOST);
    /*-----------------------------------------------------------------------
     *  Loop over fine grid.
     *-----------------------------------------------------------------------*/
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel private(i, diagonal, distribute, sgn, sum)
+   #pragma omp parallel private(i, diagonal, distribute, sgn, sum)
 #endif
    {
       HYPRE_Int ii, jj_counter, jj_counter_offd, jj, kk, i1, i2, k1, jj1;
@@ -248,26 +253,30 @@ hypre_BoomerAMGBuildPartialExtPIInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_mark
       num_threads = hypre_NumActiveThreads();
       my_thread_num = hypre_GetThreadNum();
 
-      size = n_coarse_old/num_threads;
-      rest = n_coarse_old - size*num_threads;
+      size = n_coarse_old / num_threads;
+      rest = n_coarse_old - size * num_threads;
 
       if (my_thread_num < rest)
       {
-         ns = my_thread_num*(size+1);
-         ne = (my_thread_num+1)*(size+1);
+         ns = my_thread_num * (size + 1);
+         ne = (my_thread_num + 1) * (size + 1);
       }
       else
       {
-         ns = my_thread_num*size+rest;
-         ne = (my_thread_num+1)*size+rest;
+         ns = my_thread_num * size + rest;
+         ne = (my_thread_num + 1) * size + rest;
       }
 
-      if (n_fine)  P_marker = hypre_CTAlloc(HYPRE_Int,  n_fine, HYPRE_MEMORY_HOST);
-      for (ii=0; ii < n_fine; ii++)
+      if (n_fine) { P_marker = hypre_CTAlloc(HYPRE_Int,  n_fine, HYPRE_MEMORY_HOST); }
+      for (ii = 0; ii < n_fine; ii++)
+      {
          P_marker[ii] = -1;
-      if (full_off_procNodes) P_marker_offd = hypre_CTAlloc(HYPRE_Int,  full_off_procNodes, HYPRE_MEMORY_HOST);
-      for (ii=0; ii < full_off_procNodes; ii++)
+      }
+      if (full_off_procNodes) { P_marker_offd = hypre_CTAlloc(HYPRE_Int,  full_off_procNodes, HYPRE_MEMORY_HOST); }
+      for (ii = 0; ii < full_off_procNodes; ii++)
+      {
          P_marker_offd[ii] = -1;
+      }
 
       /*coarse_counter = 0;
         coarse_counter_offd = 0;*/
@@ -296,11 +305,12 @@ hypre_BoomerAMGBuildPartialExtPIInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_mark
           *--------------------------------------------------------------------*/
          else if (CF_marker[i] == -2)
          {
-            for (jj = S_diag_i[i]; jj < S_diag_i[i+1]; jj++)
+            for (jj = S_diag_i[i]; jj < S_diag_i[i + 1]; jj++)
             {
                i1 = S_diag_j[jj];
                if (CF_marker[i1] > 0)
-               { /* i1 is a C point */
+               {
+                  /* i1 is a C point */
                   if (P_marker[i1] < jj_begin_row)
                   {
                      P_marker[i1] = jj_counter;
@@ -308,27 +318,28 @@ hypre_BoomerAMGBuildPartialExtPIInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_mark
                   }
                }
                else if (CF_marker[i1] != -3)
-               { /* i1 is a F point, loop through it's strong neighbors */
-                  for (kk = S_diag_i[i1]; kk < S_diag_i[i1+1]; kk++)
+               {
+                  /* i1 is a F point, loop through it's strong neighbors */
+                  for (kk = S_diag_i[i1]; kk < S_diag_i[i1 + 1]; kk++)
                   {
                      k1 = S_diag_j[kk];
                      if (CF_marker[k1] > 0)
                      {
-                        if(P_marker[k1] < jj_begin_row)
+                        if (P_marker[k1] < jj_begin_row)
                         {
                            P_marker[k1] = jj_counter;
                            jj_counter++;
                         }
                      }
                   }
-                  if(num_procs > 1)
+                  if (num_procs > 1)
                   {
-                     for (kk = S_offd_i[i1]; kk < S_offd_i[i1+1]; kk++)
+                     for (kk = S_offd_i[i1]; kk < S_offd_i[i1 + 1]; kk++)
                      {
                         k1 = S_offd_j[kk];
                         if (CF_marker_offd[k1] > 0)
                         {
-                           if(P_marker_offd[k1] < jj_begin_row_offd)
+                           if (P_marker_offd[k1] < jj_begin_row_offd)
                            {
                               tmp_CF_marker_offd[k1] = 1;
                               P_marker_offd[k1] = jj_counter_offd;
@@ -342,12 +353,12 @@ hypre_BoomerAMGBuildPartialExtPIInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_mark
             /* Look at off diag strong connections of i */
             if (num_procs > 1)
             {
-               for (jj = S_offd_i[i]; jj < S_offd_i[i+1]; jj++)
+               for (jj = S_offd_i[i]; jj < S_offd_i[i + 1]; jj++)
                {
                   i1 = S_offd_j[jj];
                   if (CF_marker_offd[i1] > 0)
                   {
-                     if(P_marker_offd[i1] < jj_begin_row_offd)
+                     if (P_marker_offd[i1] < jj_begin_row_offd)
                      {
                         tmp_CF_marker_offd[i1] = 1;
                         P_marker_offd[i1] = jj_counter_offd;
@@ -355,16 +366,18 @@ hypre_BoomerAMGBuildPartialExtPIInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_mark
                      }
                   }
                   else if (CF_marker_offd[i1] != -3)
-                  { /* F point; look at neighbors of i1. Sop contains global col
-                     * numbers and entries that could be in S_diag or S_offd or
-                     * neither. */
-                     for(kk = Sop_i[i1]; kk < Sop_i[i1+1]; kk++)
+                  {
+                     /* F point; look at neighbors of i1. Sop contains global col
+                      * numbers and entries that could be in S_diag or S_offd or
+                      * neither. */
+                     for (kk = Sop_i[i1]; kk < Sop_i[i1 + 1]; kk++)
                      {
                         big_k1 = Sop_j[kk];
-                        if(big_k1 >= col_1 && big_k1 < col_n)
-                        { /* In S_diag */
-                           loc_col = (HYPRE_Int)(big_k1-col_1);
-                           if(P_marker[loc_col] < jj_begin_row)
+                        if (big_k1 >= col_1 && big_k1 < col_n)
+                        {
+                           /* In S_diag */
+                           loc_col = (HYPRE_Int)(big_k1 - col_1);
+                           if (P_marker[loc_col] < jj_begin_row)
                            {
                               P_marker[loc_col] = jj_counter;
                               jj_counter++;
@@ -373,7 +386,7 @@ hypre_BoomerAMGBuildPartialExtPIInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_mark
                         else
                         {
                            loc_col = -(HYPRE_Int)big_k1 - 1;
-                           if(P_marker_offd[loc_col] < jj_begin_row_offd)
+                           if (P_marker_offd[loc_col] < jj_begin_row_offd)
                            {
                               P_marker_offd[loc_col] = jj_counter_offd;
                               tmp_CF_marker_offd[loc_col] = 1;
@@ -389,12 +402,12 @@ hypre_BoomerAMGBuildPartialExtPIInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_mark
          P_offd_array[my_thread_num] = jj_counter_offd;
       }
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
 
       if (my_thread_num == 0)
       {
-         if (debug_flag==4)
+         if (debug_flag == 4)
          {
             wall_time = time_getWallclockSeconds() - wall_time;
             hypre_printf("Proc = %d     determine structure    %f\n",
@@ -405,12 +418,12 @@ hypre_BoomerAMGBuildPartialExtPIInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_mark
           *  Allocate  arrays.
           *-----------------------------------------------------------------------*/
 
-         if (debug_flag== 4) wall_time = time_getWallclockSeconds();
+         if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
 
-         for (i=0; i < max_num_threads; i++)
+         for (i = 0; i < max_num_threads; i++)
          {
-            P_diag_array[i+1] += P_diag_array[i];
-            P_offd_array[i+1] += P_offd_array[i];
+            P_diag_array[i + 1] += P_diag_array[i];
+            P_offd_array[i + 1] += P_offd_array[i];
          }
          P_diag_size = P_diag_array[max_num_threads];
          P_offd_size = P_offd_array[max_num_threads];
@@ -431,7 +444,7 @@ hypre_BoomerAMGBuildPartialExtPIInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_mark
          P_offd_i[n_coarse_old] = P_offd_size;
 
          /* Fine to coarse mapping */
-         if(num_procs > 1)
+         if (num_procs > 1)
          {
             hypre_big_insert_new_nodes(comm_pkg, extend_comm_pkg, fine_to_coarse,
                                        full_off_procNodes, my_first_cpt,
@@ -440,20 +453,24 @@ hypre_BoomerAMGBuildPartialExtPIInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_mark
       }
 
       for (i = 0; i < n_fine; i++)
+      {
          P_marker[i] = -1;
+      }
 
       for (i = 0; i < full_off_procNodes; i++)
+      {
          P_marker_offd[i] = -1;
+      }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
       jj_counter = start_indexing;
       jj_counter_offd = start_indexing;
       if (my_thread_num)
       {
-         jj_counter = P_diag_array[my_thread_num-1];
-         jj_counter_offd = P_offd_array[my_thread_num-1];
+         jj_counter = P_diag_array[my_thread_num - 1];
+         jj_counter_offd = P_offd_array[my_thread_num - 1];
       }
       /*-----------------------------------------------------------------------
        *  Loop over fine grid points.
@@ -483,7 +500,7 @@ hypre_BoomerAMGBuildPartialExtPIInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_mark
          else if (CF_marker[i] == -2)
          {
             strong_f_marker--;
-            for (jj = S_diag_i[i]; jj < S_diag_i[i+1]; jj++)
+            for (jj = S_diag_i[i]; jj < S_diag_i[i + 1]; jj++)
             {
                i1 = S_diag_j[jj];
 
@@ -505,12 +522,12 @@ hypre_BoomerAMGBuildPartialExtPIInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_mark
                else  if (CF_marker[i1] != -3)
                {
                   P_marker[i1] = strong_f_marker;
-                  for (kk = S_diag_i[i1]; kk < S_diag_i[i1+1]; kk++)
+                  for (kk = S_diag_i[i1]; kk < S_diag_i[i1 + 1]; kk++)
                   {
                      k1 = S_diag_j[kk];
                      if (CF_marker[k1] >= 0)
                      {
-                        if(P_marker[k1] < jj_begin_row)
+                        if (P_marker[k1] < jj_begin_row)
                         {
                            P_marker[k1] = jj_counter;
                            P_diag_j[jj_counter] = fine_to_coarse[k1];
@@ -519,14 +536,14 @@ hypre_BoomerAMGBuildPartialExtPIInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_mark
                         }
                      }
                   }
-                  if(num_procs > 1)
+                  if (num_procs > 1)
                   {
-                     for (kk = S_offd_i[i1]; kk < S_offd_i[i1+1]; kk++)
+                     for (kk = S_offd_i[i1]; kk < S_offd_i[i1 + 1]; kk++)
                      {
                         k1 = S_offd_j[kk];
-                        if(CF_marker_offd[k1] >= 0)
+                        if (CF_marker_offd[k1] >= 0)
                         {
-                           if(P_marker_offd[k1] < jj_begin_row_offd)
+                           if (P_marker_offd[k1] < jj_begin_row_offd)
                            {
                               P_marker_offd[k1] = jj_counter_offd;
                               P_offd_j[jj_counter_offd] = k1;
@@ -541,12 +558,12 @@ hypre_BoomerAMGBuildPartialExtPIInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_mark
 
             if ( num_procs > 1)
             {
-               for (jj=S_offd_i[i]; jj < S_offd_i[i+1]; jj++)
+               for (jj = S_offd_i[i]; jj < S_offd_i[i + 1]; jj++)
                {
                   i1 = S_offd_j[jj];
                   if ( CF_marker_offd[i1] >= 0)
                   {
-                     if(P_marker_offd[i1] < jj_begin_row_offd)
+                     if (P_marker_offd[i1] < jj_begin_row_offd)
                      {
                         P_marker_offd[i1] = jj_counter_offd;
                         P_offd_j[jj_counter_offd] = i1;
@@ -557,14 +574,14 @@ hypre_BoomerAMGBuildPartialExtPIInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_mark
                   else if (CF_marker_offd[i1] != -3)
                   {
                      P_marker_offd[i1] = strong_f_marker;
-                     for(kk = Sop_i[i1]; kk < Sop_i[i1+1]; kk++)
+                     for (kk = Sop_i[i1]; kk < Sop_i[i1 + 1]; kk++)
                      {
                         big_k1 = Sop_j[kk];
                         /* Find local col number */
-                        if(big_k1 >= col_1 && big_k1 < col_n)
+                        if (big_k1 >= col_1 && big_k1 < col_n)
                         {
-                           loc_col = (HYPRE_Int)(big_k1-col_1);
-                           if(P_marker[loc_col] < jj_begin_row)
+                           loc_col = (HYPRE_Int)(big_k1 - col_1);
+                           if (P_marker[loc_col] < jj_begin_row)
                            {
                               P_marker[loc_col] = jj_counter;
                               P_diag_j[jj_counter] = fine_to_coarse[loc_col];
@@ -575,10 +592,10 @@ hypre_BoomerAMGBuildPartialExtPIInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_mark
                         else
                         {
                            loc_col = -(HYPRE_Int)big_k1 - 1;
-                           if(P_marker_offd[loc_col] < jj_begin_row_offd)
+                           if (P_marker_offd[loc_col] < jj_begin_row_offd)
                            {
                               P_marker_offd[loc_col] = jj_counter_offd;
-                              P_offd_j[jj_counter_offd]=loc_col;
+                              P_offd_j[jj_counter_offd] = loc_col;
                               P_offd_data[jj_counter_offd] = zero;
                               jj_counter_offd++;
                            }
@@ -593,59 +610,66 @@ hypre_BoomerAMGBuildPartialExtPIInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_mark
 
             diagonal = A_diag_data[A_diag_i[i]];
 
-            for (jj = A_diag_i[i]+1; jj < A_diag_i[i+1]; jj++)
-            { /* i1 is a c-point and strongly influences i, accumulate
-               * a_(i,i1) into interpolation weight */
+            for (jj = A_diag_i[i] + 1; jj < A_diag_i[i + 1]; jj++)
+            {
+               /* i1 is a c-point and strongly influences i, accumulate
+                * a_(i,i1) into interpolation weight */
                i1 = A_diag_j[jj];
                if (P_marker[i1] >= jj_begin_row)
                {
                   P_diag_data[P_marker[i1]] += A_diag_data[jj];
                }
-               else if(P_marker[i1] == strong_f_marker)
+               else if (P_marker[i1] == strong_f_marker)
                {
                   sum = zero;
                   sgn = 1;
-                  if(A_diag_data[A_diag_i[i1]] < 0) sgn = -1;
+                  if (A_diag_data[A_diag_i[i1]] < 0) { sgn = -1; }
                   /* Loop over row of A for point i1 and calculate the sum
                    * of the connections to c-points that strongly incluence i. */
-                  for(jj1 = A_diag_i[i1]+1; jj1 < A_diag_i[i1+1]; jj1++)
+                  for (jj1 = A_diag_i[i1] + 1; jj1 < A_diag_i[i1 + 1]; jj1++)
                   {
                      i2 = A_diag_j[jj1];
-                     if((P_marker[i2] >= jj_begin_row || i2 == i) && (sgn*A_diag_data[jj1]) < 0)
+                     if ((P_marker[i2] >= jj_begin_row || i2 == i) && (sgn * A_diag_data[jj1]) < 0)
+                     {
                         sum += A_diag_data[jj1];
+                     }
                   }
-                  if(num_procs > 1)
+                  if (num_procs > 1)
                   {
-                     for(jj1 = A_offd_i[i1]; jj1< A_offd_i[i1+1]; jj1++)
+                     for (jj1 = A_offd_i[i1]; jj1 < A_offd_i[i1 + 1]; jj1++)
                      {
                         i2 = A_offd_j[jj1];
-                        if(P_marker_offd[i2] >= jj_begin_row_offd &&
-                           (sgn*A_offd_data[jj1]) < 0)
+                        if (P_marker_offd[i2] >= jj_begin_row_offd &&
+                            (sgn * A_offd_data[jj1]) < 0)
+                        {
                            sum += A_offd_data[jj1];
+                        }
                      }
                   }
-                  if(sum != 0)
+                  if (sum != 0)
                   {
-                     distribute = A_diag_data[jj]/sum;
+                     distribute = A_diag_data[jj] / sum;
                      /* Loop over row of A for point i1 and do the distribution */
-                     for(jj1 = A_diag_i[i1]+1; jj1 < A_diag_i[i1+1]; jj1++)
+                     for (jj1 = A_diag_i[i1] + 1; jj1 < A_diag_i[i1 + 1]; jj1++)
                      {
                         i2 = A_diag_j[jj1];
-                        if(P_marker[i2] >= jj_begin_row && (sgn*A_diag_data[jj1]) < 0)
+                        if (P_marker[i2] >= jj_begin_row && (sgn * A_diag_data[jj1]) < 0)
                            P_diag_data[P_marker[i2]] +=
-                              distribute*A_diag_data[jj1];
-                        if(i2 == i && (sgn*A_diag_data[jj1]) < 0)
-                           diagonal += distribute*A_diag_data[jj1];
+                              distribute * A_diag_data[jj1];
+                        if (i2 == i && (sgn * A_diag_data[jj1]) < 0)
+                        {
+                           diagonal += distribute * A_diag_data[jj1];
+                        }
                      }
-                     if(num_procs > 1)
+                     if (num_procs > 1)
                      {
-                        for(jj1 = A_offd_i[i1]; jj1 < A_offd_i[i1+1]; jj1++)
+                        for (jj1 = A_offd_i[i1]; jj1 < A_offd_i[i1 + 1]; jj1++)
                         {
                            i2 = A_offd_j[jj1];
-                           if(P_marker_offd[i2] >= jj_begin_row_offd &&
-                              (sgn*A_offd_data[jj1]) < 0)
+                           if (P_marker_offd[i2] >= jj_begin_row_offd &&
+                               (sgn * A_offd_data[jj1]) < 0)
                               P_offd_data[P_marker_offd[i2]] +=
-                                 distribute*A_offd_data[jj1];
+                                 distribute * A_offd_data[jj1];
                         }
                      }
                   }
@@ -658,57 +682,69 @@ hypre_BoomerAMGBuildPartialExtPIInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_mark
                 * diagonal */
                else if (CF_marker[i1] != -3)
                {
-                  if(num_functions == 1 || dof_func[i] == dof_func[i1])
+                  if (num_functions == 1 || dof_func[i] == dof_func[i1])
+                  {
                      diagonal += A_diag_data[jj];
+                  }
                }
             }
-            if(num_procs > 1)
+            if (num_procs > 1)
             {
-               for(jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+               for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
                {
                   i1 = A_offd_j[jj];
-                  if(P_marker_offd[i1] >= jj_begin_row_offd)
+                  if (P_marker_offd[i1] >= jj_begin_row_offd)
+                  {
                      P_offd_data[P_marker_offd[i1]] += A_offd_data[jj];
-                  else if(P_marker_offd[i1] == strong_f_marker)
+                  }
+                  else if (P_marker_offd[i1] == strong_f_marker)
                   {
                      sum = zero;
-                     for(jj1 = A_ext_i[i1]; jj1 < A_ext_i[i1+1]; jj1++)
+                     for (jj1 = A_ext_i[i1]; jj1 < A_ext_i[i1 + 1]; jj1++)
                      {
                         big_k1 = A_ext_j[jj1];
-                        if(big_k1 >= col_1 && big_k1 < col_n)
-                        { /* diag */
+                        if (big_k1 >= col_1 && big_k1 < col_n)
+                        {
+                           /* diag */
                            loc_col = (HYPRE_Int)(big_k1 - col_1);
-                           if(P_marker[loc_col] >= jj_begin_row || loc_col == i)
+                           if (P_marker[loc_col] >= jj_begin_row || loc_col == i)
+                           {
                               sum += A_ext_data[jj1];
+                           }
                         }
                         else
                         {
                            loc_col = -(HYPRE_Int)big_k1 - 1;
-                           if(P_marker_offd[loc_col] >= jj_begin_row_offd)
+                           if (P_marker_offd[loc_col] >= jj_begin_row_offd)
+                           {
                               sum += A_ext_data[jj1];
+                           }
                         }
                      }
-                     if(sum != 0)
+                     if (sum != 0)
                      {
                         distribute = A_offd_data[jj] / sum;
-                        for(jj1 = A_ext_i[i1]; jj1 < A_ext_i[i1+1]; jj1++)
+                        for (jj1 = A_ext_i[i1]; jj1 < A_ext_i[i1 + 1]; jj1++)
                         {
                            big_k1 = A_ext_j[jj1];
-                           if(big_k1 >= col_1 && big_k1 < col_n)
-                           { /* diag */
+                           if (big_k1 >= col_1 && big_k1 < col_n)
+                           {
+                              /* diag */
                               loc_col = (HYPRE_Int)(big_k1 - col_1);
-                              if(P_marker[loc_col] >= jj_begin_row)
-                                 P_diag_data[P_marker[loc_col]] += distribute*
-                                    A_ext_data[jj1];
-                              if(loc_col == i)
-                                 diagonal += distribute*A_ext_data[jj1];
+                              if (P_marker[loc_col] >= jj_begin_row)
+                                 P_diag_data[P_marker[loc_col]] += distribute *
+                                                                   A_ext_data[jj1];
+                              if (loc_col == i)
+                              {
+                                 diagonal += distribute * A_ext_data[jj1];
+                              }
                            }
                            else
                            {
                               loc_col = -(HYPRE_Int)big_k1 - 1;
-                              if(P_marker_offd[loc_col] >= jj_begin_row_offd)
-                                 P_offd_data[P_marker_offd[loc_col]] += distribute*
-                                    A_ext_data[jj1];
+                              if (P_marker_offd[loc_col] >= jj_begin_row_offd)
+                                 P_offd_data[P_marker_offd[loc_col]] += distribute *
+                                                                        A_ext_data[jj1];
                            }
                         }
                      }
@@ -719,17 +755,23 @@ hypre_BoomerAMGBuildPartialExtPIInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_mark
                   }
                   else if (CF_marker_offd[i1] != -3)
                   {
-                     if(num_functions == 1 || dof_func[i] == dof_func_offd[i1])
+                     if (num_functions == 1 || dof_func[i] == dof_func_offd[i1])
+                     {
                         diagonal += A_offd_data[jj];
+                     }
                   }
                }
             }
             if (diagonal)
             {
-               for(jj = jj_begin_row; jj < jj_end_row; jj++)
+               for (jj = jj_begin_row; jj < jj_end_row; jj++)
+               {
                   P_diag_data[jj] /= -diagonal;
-               for(jj = jj_begin_row_offd; jj < jj_end_row_offd; jj++)
+               }
+               for (jj = jj_begin_row_offd; jj < jj_end_row_offd; jj++)
+               {
                   P_offd_data[jj] /= -diagonal;
+               }
             }
          }
          strong_f_marker--;
@@ -738,7 +780,7 @@ hypre_BoomerAMGBuildPartialExtPIInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_mark
       hypre_TFree(P_marker_offd, HYPRE_MEMORY_HOST);
    } /* end parallel region */
 
-   if (debug_flag==4)
+   if (debug_flag == 4)
    {
       wall_time = time_getWallclockSeconds() - wall_time;
       hypre_printf("Proc = %d     fill structure    %f\n",
@@ -786,15 +828,15 @@ hypre_BoomerAMGBuildPartialExtPIInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_mark
 
    /* This builds col_map, col_map should be monotone increasing and contain
     * global numbers. */
-   if(P_offd_size)
+   if (P_offd_size)
    {
       hypre_build_interp_colmap(P, full_off_procNodes, tmp_CF_marker_offd, fine_to_coarse_offd);
    }
 
    hypre_MatvecCommPkgCreate(P);
 
-   for (i=0; i < n_fine; i++)
-      if (CF_marker[i] < -1) CF_marker[i] = -1;
+   for (i = 0; i < n_fine; i++)
+      if (CF_marker[i] < -1) { CF_marker[i] = -1; }
 
    *P_ptr = P;
 
@@ -811,8 +853,10 @@ hypre_BoomerAMGBuildPartialExtPIInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_mark
       hypre_TFree(fine_to_coarse_offd, HYPRE_MEMORY_HOST);
       hypre_TFree(CF_marker_offd, HYPRE_MEMORY_HOST);
       hypre_TFree(tmp_CF_marker_offd, HYPRE_MEMORY_HOST);
-      if(num_functions > 1)
+      if (num_functions > 1)
+      {
          hypre_TFree(dof_func_offd, HYPRE_MEMORY_HOST);
+      }
 
 
       hypre_MatvecCommPkgDestroy(extend_comm_pkg);
@@ -835,18 +879,23 @@ hypre_BoomerAMGBuildPartialExtPIInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_mark
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_BoomerAMGBuildPartialStdInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
-                                     hypre_ParCSRMatrix   *S, HYPRE_BigInt *num_cpts_global,
-                                     HYPRE_BigInt *num_old_cpts_global,
-                                     HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int debug_flag,
-                                     HYPRE_Real trunc_factor, HYPRE_Int max_elmts,
-                                     HYPRE_Int sep_weight,
-                                     hypre_ParCSRMatrix  **P_ptr)
+hypre_BoomerAMGBuildPartialStdInterp(hypre_ParCSRMatrix  *A,
+                                     HYPRE_Int           *CF_marker,
+                                     hypre_ParCSRMatrix  *S,
+                                     HYPRE_BigInt        *num_cpts_global,
+                                     HYPRE_BigInt        *num_old_cpts_global,
+                                     HYPRE_Int            num_functions,
+                                     HYPRE_Int           *dof_func,
+                                     HYPRE_Int            debug_flag,
+                                     HYPRE_Real           trunc_factor,
+                                     HYPRE_Int            max_elmts,
+                                     HYPRE_Int            sep_weight,
+                                     hypre_ParCSRMatrix **P_ptr)
 {
    /* Communication Variables */
    MPI_Comm                 comm = hypre_ParCSRMatrixComm(A);
    hypre_ParCSRCommPkg     *comm_pkg = hypre_ParCSRMatrixCommPkg(A);
-   HYPRE_Int              my_id, num_procs;
+   HYPRE_Int                my_id, num_procs;
 
    /* Variables to store input variables */
    hypre_CSRMatrix *A_diag = hypre_ParCSRMatrixDiag(A);
@@ -896,10 +945,10 @@ hypre_BoomerAMGBuildPartialStdInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
    HYPRE_Int       *dof_func_offd = NULL;
 
    /* Full row information for columns of A that are off diag*/
-   hypre_CSRMatrix *A_ext;
-   HYPRE_Real      *A_ext_data;
-   HYPRE_Int       *A_ext_i;
-   HYPRE_BigInt    *A_ext_j;
+   hypre_CSRMatrix *A_ext = NULL;
+   HYPRE_Real      *A_ext_data = NULL;
+   HYPRE_Int       *A_ext_i = NULL;
+   HYPRE_BigInt    *A_ext_j = NULL;
 
    HYPRE_Int       *fine_to_coarse = NULL;
    HYPRE_BigInt    *fine_to_coarse_offd = NULL;
@@ -908,16 +957,16 @@ hypre_BoomerAMGBuildPartialStdInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
    HYPRE_Int        loc_col;
    HYPRE_Int        full_off_procNodes;
 
-   hypre_CSRMatrix *Sop;
-   HYPRE_Int       *Sop_i;
-   HYPRE_BigInt    *Sop_j;
+   hypre_CSRMatrix *Sop   = NULL;
+   HYPRE_Int       *Sop_i = NULL;
+   HYPRE_BigInt    *Sop_j = NULL;
 
    /* Variables to keep count of interpolatory points */
    HYPRE_Int        jj_counter, jj_counter_offd;
    HYPRE_Int        jj_begin_row, jj_end_row;
    HYPRE_Int        jj_begin_row_offd = 0;
    HYPRE_Int        jj_end_row_offd = 0;
-   HYPRE_Int        coarse_counter;
+   //HYPRE_Int        coarse_counter;
    HYPRE_Int        n_coarse_old;
    HYPRE_BigInt     total_old_global_cpts;
 
@@ -932,7 +981,7 @@ hypre_BoomerAMGBuildPartialStdInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
    HYPRE_Real      *ahat_offd = NULL;
    HYPRE_Real       sum_pos, sum_pos_C, sum_neg, sum_neg_C, sum, sum_C;
    HYPRE_Real       diagonal, distribute;
-   HYPRE_Real       alfa, beta;
+   HYPRE_Real       alpha, beta;
 
    /* Loop variables */
    /*HYPRE_Int              index;*/
@@ -945,32 +994,31 @@ hypre_BoomerAMGBuildPartialStdInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
    /* Definitions */
    HYPRE_Real       zero = 0.0;
    HYPRE_Real       one  = 1.0;
-   HYPRE_Real       wall_time;
-   HYPRE_Real       wall_1 = 0;
-   HYPRE_Real       wall_2 = 0;
-   HYPRE_Real       wall_3 = 0;
-
+   HYPRE_Real       wall_time = 0.0;
+   HYPRE_Real       wall_1 = 0.0;
+   HYPRE_Real       wall_2 = 0.0;
+   HYPRE_Real       wall_3 = 0.0;
 
    hypre_ParCSRCommPkg   *extend_comm_pkg = NULL;
 
-   if (debug_flag== 4) wall_time = time_getWallclockSeconds();
+   if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
 
    /* BEGIN */
    hypre_MPI_Comm_size(comm, &num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_rank(comm, &my_id);
 
    my_first_cpt = num_cpts_global[0];
    /*my_first_old_cpt = num_old_cpts_global[0];*/
    n_coarse_old = (HYPRE_Int)(num_old_cpts_global[1] - num_old_cpts_global[0]);
    /*n_coarse = num_cpts_global[1] - num_cpts_global[0];*/
 
-   if (my_id == (num_procs -1))
+   if (my_id == (num_procs - 1))
    {
       total_global_cpts = num_cpts_global[1];
       total_old_global_cpts = num_old_cpts_global[1];
    }
-   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
-   hypre_MPI_Bcast(&total_old_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
+   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
+   hypre_MPI_Bcast(&total_old_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
 
    if (!comm_pkg)
    {
@@ -1009,8 +1057,8 @@ hypre_BoomerAMGBuildPartialStdInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
    /*-----------------------------------------------------------------------
     *  Intialize counters and allocate mapping vector.
     *-----------------------------------------------------------------------*/
-   P_diag_i    = hypre_CTAlloc(HYPRE_Int,  n_coarse_old+1, HYPRE_MEMORY_HOST);
-   P_offd_i    = hypre_CTAlloc(HYPRE_Int,  n_coarse_old+1, HYPRE_MEMORY_HOST);
+   P_diag_i    = hypre_CTAlloc(HYPRE_Int,  n_coarse_old + 1, HYPRE_MEMORY_HOST);
+   P_offd_i    = hypre_CTAlloc(HYPRE_Int,  n_coarse_old + 1, HYPRE_MEMORY_HOST);
 
    if (n_fine)
    {
@@ -1032,7 +1080,7 @@ hypre_BoomerAMGBuildPartialStdInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
 
    jj_counter = start_indexing;
    jj_counter_offd = start_indexing;
-   coarse_counter = 0;
+   //coarse_counter = 0;
 
    cnt = 0;
    old_cnt = 0;
@@ -1057,13 +1105,15 @@ hypre_BoomerAMGBuildPartialStdInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
    {
       P_diag_i[ii] = jj_counter;
       if (num_procs > 1)
+      {
          P_offd_i[ii] = jj_counter_offd;
+      }
 
       i = old_coarse_to_fine[ii];
       if (CF_marker[i] > 0)
       {
          jj_counter++;
-         coarse_counter++;
+         //coarse_counter++;
       }
 
       /*--------------------------------------------------------------------
@@ -1073,11 +1123,12 @@ hypre_BoomerAMGBuildPartialStdInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
        *--------------------------------------------------------------------*/
       else if (CF_marker[i] == -2)
       {
-         for (jj = S_diag_i[i]; jj < S_diag_i[i+1]; jj++)
+         for (jj = S_diag_i[i]; jj < S_diag_i[i + 1]; jj++)
          {
             i1 = S_diag_j[jj];
             if (CF_marker[i1] > 0)
-            { /* i1 is a C point */
+            {
+               /* i1 is a C point */
                if (P_marker[i1] < P_diag_i[ii])
                {
                   P_marker[i1] = jj_counter;
@@ -1085,27 +1136,28 @@ hypre_BoomerAMGBuildPartialStdInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
                }
             }
             else if (CF_marker[i1] != -3)
-            { /* i1 is a F point, loop through it's strong neighbors */
-               for (kk = S_diag_i[i1]; kk < S_diag_i[i1+1]; kk++)
+            {
+               /* i1 is a F point, loop through it's strong neighbors */
+               for (kk = S_diag_i[i1]; kk < S_diag_i[i1 + 1]; kk++)
                {
                   k1 = S_diag_j[kk];
                   if (CF_marker[k1] > 0)
                   {
-                     if(P_marker[k1] < P_diag_i[ii])
+                     if (P_marker[k1] < P_diag_i[ii])
                      {
                         P_marker[k1] = jj_counter;
                         jj_counter++;
                      }
                   }
                }
-               if(num_procs > 1)
+               if (num_procs > 1)
                {
-                  for (kk = S_offd_i[i1]; kk < S_offd_i[i1+1]; kk++)
+                  for (kk = S_offd_i[i1]; kk < S_offd_i[i1 + 1]; kk++)
                   {
                      k1 = S_offd_j[kk];
                      if (CF_marker_offd[k1] > 0)
                      {
-                        if(P_marker_offd[k1] < P_offd_i[ii])
+                        if (P_marker_offd[k1] < P_offd_i[ii])
                         {
                            tmp_CF_marker_offd[k1] = 1;
                            P_marker_offd[k1] = jj_counter_offd;
@@ -1119,12 +1171,12 @@ hypre_BoomerAMGBuildPartialStdInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
          /* Look at off diag strong connections of i */
          if (num_procs > 1)
          {
-            for (jj = S_offd_i[i]; jj < S_offd_i[i+1]; jj++)
+            for (jj = S_offd_i[i]; jj < S_offd_i[i + 1]; jj++)
             {
                i1 = S_offd_j[jj];
                if (CF_marker_offd[i1] > 0)
                {
-                  if(P_marker_offd[i1] < P_offd_i[ii])
+                  if (P_marker_offd[i1] < P_offd_i[ii])
                   {
                      tmp_CF_marker_offd[i1] = 1;
                      P_marker_offd[i1] = jj_counter_offd;
@@ -1132,18 +1184,20 @@ hypre_BoomerAMGBuildPartialStdInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
                   }
                }
                else if (CF_marker_offd[i1] != -3)
-               { /* F point; look at neighbors of i1. Sop contains global col
-                  * numbers and entries that could be in S_diag or S_offd or
-                  * neither. */
-                  for(kk = Sop_i[i1]; kk < Sop_i[i1+1]; kk++)
+               {
+                  /* F point; look at neighbors of i1. Sop contains global col
+                   * numbers and entries that could be in S_diag or S_offd or
+                   * neither. */
+                  for (kk = Sop_i[i1]; kk < Sop_i[i1 + 1]; kk++)
                   {
                      big_k1 = Sop_j[kk];
-                     if(big_k1 >= col_1 && big_k1 < col_n)
-                     { /* In S_diag */
-                        loc_col = (HYPRE_Int)(big_k1-col_1);
-                        if(CF_marker[loc_col] >= 0)
+                     if (big_k1 >= col_1 && big_k1 < col_n)
+                     {
+                        /* In S_diag */
+                        loc_col = (HYPRE_Int)(big_k1 - col_1);
+                        if (CF_marker[loc_col] >= 0)
                         {
-                           if(P_marker[loc_col] < P_diag_i[ii])
+                           if (P_marker[loc_col] < P_diag_i[ii])
                            {
                               P_marker[loc_col] = jj_counter;
                               jj_counter++;
@@ -1153,9 +1207,9 @@ hypre_BoomerAMGBuildPartialStdInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
                      else
                      {
                         loc_col = -(HYPRE_Int)big_k1 - 1;
-                        if(CF_marker_offd[loc_col] >= 0)
+                        if (CF_marker_offd[loc_col] >= 0)
                         {
-                           if(P_marker_offd[loc_col] < P_offd_i[ii])
+                           if (P_marker_offd[loc_col] < P_offd_i[ii])
                            {
                               P_marker_offd[loc_col] = jj_counter_offd;
                               tmp_CF_marker_offd[loc_col] = 1;
@@ -1170,7 +1224,7 @@ hypre_BoomerAMGBuildPartialStdInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
       }
    }
 
-   if (debug_flag==4)
+   if (debug_flag == 4)
    {
       wall_time = time_getWallclockSeconds() - wall_time;
       hypre_printf("Proc = %d     determine structure    %f\n",
@@ -1205,7 +1259,7 @@ hypre_BoomerAMGBuildPartialStdInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
    jj_counter_offd = start_indexing;
 
    /* Fine to coarse mapping */
-   if(num_procs > 1)
+   if (num_procs > 1)
    {
       hypre_big_insert_new_nodes(comm_pkg, extend_comm_pkg, fine_to_coarse,
                                  full_off_procNodes, my_first_cpt,
@@ -1266,9 +1320,9 @@ hypre_BoomerAMGBuildPartialStdInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
 
       else if (CF_marker[i] == -2)
       {
-         if (debug_flag==4) wall_time = time_getWallclockSeconds();
+         if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
          strong_f_marker--;
-         for (jj = S_diag_i[i]; jj < S_diag_i[i+1]; jj++)
+         for (jj = S_diag_i[i]; jj < S_diag_i[i + 1]; jj++)
          {
             i1 = S_diag_j[jj];
 
@@ -1290,12 +1344,12 @@ hypre_BoomerAMGBuildPartialStdInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
             else  if (CF_marker[i1] != -3)
             {
                P_marker[i1] = strong_f_marker;
-               for (kk = S_diag_i[i1]; kk < S_diag_i[i1+1]; kk++)
+               for (kk = S_diag_i[i1]; kk < S_diag_i[i1 + 1]; kk++)
                {
                   k1 = S_diag_j[kk];
                   if (CF_marker[k1] > 0)
                   {
-                     if(P_marker[k1] < jj_begin_row)
+                     if (P_marker[k1] < jj_begin_row)
                      {
                         P_marker[k1] = jj_counter;
                         P_diag_j[jj_counter] = k1;
@@ -1304,14 +1358,14 @@ hypre_BoomerAMGBuildPartialStdInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
                      }
                   }
                }
-               if(num_procs > 1)
+               if (num_procs > 1)
                {
-                  for (kk = S_offd_i[i1]; kk < S_offd_i[i1+1]; kk++)
+                  for (kk = S_offd_i[i1]; kk < S_offd_i[i1 + 1]; kk++)
                   {
                      k1 = S_offd_j[kk];
-                     if(CF_marker_offd[k1] > 0)
+                     if (CF_marker_offd[k1] > 0)
                      {
-                        if(P_marker_offd[k1] < jj_begin_row_offd)
+                        if (P_marker_offd[k1] < jj_begin_row_offd)
                         {
                            P_marker_offd[k1] = jj_counter_offd;
                            P_offd_j[jj_counter_offd] = k1;
@@ -1326,15 +1380,15 @@ hypre_BoomerAMGBuildPartialStdInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
 
          if ( num_procs > 1)
          {
-            for (jj=S_offd_i[i]; jj < S_offd_i[i+1]; jj++)
+            for (jj = S_offd_i[i]; jj < S_offd_i[i + 1]; jj++)
             {
                i1 = S_offd_j[jj];
                if ( CF_marker_offd[i1] > 0)
                {
-                  if(P_marker_offd[i1] < jj_begin_row_offd)
+                  if (P_marker_offd[i1] < jj_begin_row_offd)
                   {
                      P_marker_offd[i1] = jj_counter_offd;
-                     P_offd_j[jj_counter_offd]=i1;
+                     P_offd_j[jj_counter_offd] = i1;
                      P_offd_data[jj_counter_offd] = zero;
                      jj_counter_offd++;
                   }
@@ -1342,15 +1396,15 @@ hypre_BoomerAMGBuildPartialStdInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
                else if (CF_marker_offd[i1] != -3)
                {
                   P_marker_offd[i1] = strong_f_marker;
-                  for(kk = Sop_i[i1]; kk < Sop_i[i1+1]; kk++)
+                  for (kk = Sop_i[i1]; kk < Sop_i[i1 + 1]; kk++)
                   {
                      big_k1 = Sop_j[kk];
-                     if(big_k1 >= col_1 && big_k1 < col_n)
+                     if (big_k1 >= col_1 && big_k1 < col_n)
                      {
-                        loc_col = (HYPRE_Int)(big_k1-col_1);
-                        if(CF_marker[loc_col] > 0)
+                        loc_col = (HYPRE_Int)(big_k1 - col_1);
+                        if (CF_marker[loc_col] > 0)
                         {
-                           if(P_marker[loc_col] < jj_begin_row)
+                           if (P_marker[loc_col] < jj_begin_row)
                            {
                               P_marker[loc_col] = jj_counter;
                               P_diag_j[jj_counter] = loc_col;
@@ -1362,12 +1416,12 @@ hypre_BoomerAMGBuildPartialStdInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
                      else
                      {
                         loc_col = -(HYPRE_Int)big_k1 - 1;
-                        if(CF_marker_offd[loc_col] > 0)
+                        if (CF_marker_offd[loc_col] > 0)
                         {
-                           if(P_marker_offd[loc_col] < jj_begin_row_offd)
+                           if (P_marker_offd[loc_col] < jj_begin_row_offd)
                            {
                               P_marker_offd[loc_col] = jj_counter_offd;
-                              P_offd_j[jj_counter_offd]=loc_col;
+                              P_offd_j[jj_counter_offd] = loc_col;
                               P_offd_data[jj_counter_offd] = zero;
                               jj_counter_offd++;
                            }
@@ -1381,28 +1435,31 @@ hypre_BoomerAMGBuildPartialStdInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
          jj_end_row = jj_counter;
          jj_end_row_offd = jj_counter_offd;
 
-         if (debug_flag==4)
+         if (debug_flag == 4)
          {
             wall_time = time_getWallclockSeconds() - wall_time;
             wall_1 += wall_time;
             fflush(NULL);
          }
-         if (debug_flag==4) wall_time = time_getWallclockSeconds();
+         if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
          cnt_c = 0;
-         cnt_f = jj_end_row-jj_begin_row;
+         cnt_f = jj_end_row - jj_begin_row;
          cnt_c_offd = 0;
-         cnt_f_offd = jj_end_row_offd-jj_begin_row_offd;
+         cnt_f_offd = jj_end_row_offd - jj_begin_row_offd;
          ihat[i] = cnt_f;
          ipnt[cnt_f] = i;
          ahat[cnt_f++] = A_diag_data[A_diag_i[i]];
-         for (jj = A_diag_i[i]+1; jj < A_diag_i[i+1]; jj++)
-         { /* i1 is direct neighbor */
+         for (jj = A_diag_i[i] + 1; jj < A_diag_i[i + 1]; jj++)
+         {
+            /* i1 is direct neighbor */
             i1 = A_diag_j[jj];
             if (P_marker[i1] != strong_f_marker)
             {
                indx = ihat[i1];
                if (indx > -1)
+               {
                   ahat[indx] += A_diag_data[jj];
+               }
                else if (P_marker[i1] >= jj_begin_row)
                {
                   ihat[i1] = cnt_c;
@@ -1418,49 +1475,53 @@ hypre_BoomerAMGBuildPartialStdInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
             }
             else
             {
-               if(num_functions == 1 || dof_func[i] == dof_func[i1])
+               if (num_functions == 1 || dof_func[i] == dof_func[i1])
                {
-                  distribute = A_diag_data[jj]/A_diag_data[A_diag_i[i1]];
-                  for (kk = A_diag_i[i1]+1; kk < A_diag_i[i1+1]; kk++)
+                  distribute = A_diag_data[jj] / A_diag_data[A_diag_i[i1]];
+                  for (kk = A_diag_i[i1] + 1; kk < A_diag_i[i1 + 1]; kk++)
                   {
                      k1 = A_diag_j[kk];
                      indx = ihat[k1];
                      if (indx > -1)
-                        ahat[indx] -= A_diag_data[kk]*distribute;
+                     {
+                        ahat[indx] -= A_diag_data[kk] * distribute;
+                     }
                      else if (P_marker[k1] >= jj_begin_row)
                      {
                         ihat[k1] = cnt_c;
                         ipnt[cnt_c] = k1;
-                        ahat[cnt_c++] -= A_diag_data[kk]*distribute;
+                        ahat[cnt_c++] -= A_diag_data[kk] * distribute;
                      }
                      else
                      {
                         ihat[k1] = cnt_f;
                         ipnt[cnt_f] = k1;
-                        ahat[cnt_f++] -= A_diag_data[kk]*distribute;
+                        ahat[cnt_f++] -= A_diag_data[kk] * distribute;
                      }
                   }
-                  if(num_procs > 1)
+                  if (num_procs > 1)
                   {
-                     for (kk = A_offd_i[i1]; kk < A_offd_i[i1+1]; kk++)
+                     for (kk = A_offd_i[i1]; kk < A_offd_i[i1 + 1]; kk++)
                      {
                         k1 = A_offd_j[kk];
                         indx = ihat_offd[k1];
-                        if(num_functions == 1 || dof_func[i1] == dof_func_offd[k1])
+                        if (num_functions == 1 || dof_func[i1] == dof_func_offd[k1])
                         {
                            if (indx > -1)
-                              ahat_offd[indx] -= A_offd_data[kk]*distribute;
+                           {
+                              ahat_offd[indx] -= A_offd_data[kk] * distribute;
+                           }
                            else if (P_marker_offd[k1] >= jj_begin_row_offd)
                            {
                               ihat_offd[k1] = cnt_c_offd;
                               ipnt_offd[cnt_c_offd] = k1;
-                              ahat_offd[cnt_c_offd++] -= A_offd_data[kk]*distribute;
+                              ahat_offd[cnt_c_offd++] -= A_offd_data[kk] * distribute;
                            }
                            else
                            {
                               ihat_offd[k1] = cnt_f_offd;
                               ipnt_offd[cnt_f_offd] = k1;
-                              ahat_offd[cnt_f_offd++] -= A_offd_data[kk]*distribute;
+                              ahat_offd[cnt_f_offd++] -= A_offd_data[kk] * distribute;
                            }
                         }
                      }
@@ -1468,16 +1529,18 @@ hypre_BoomerAMGBuildPartialStdInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
                }
             }
          }
-         if(num_procs > 1)
+         if (num_procs > 1)
          {
-            for(jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+            for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
             {
                i1 = A_offd_j[jj];
-               if(P_marker_offd[i1] != strong_f_marker)
+               if (P_marker_offd[i1] != strong_f_marker)
                {
                   indx = ihat_offd[i1];
                   if (indx > -1)
+                  {
                      ahat_offd[indx] += A_offd_data[jj];
+                  }
                   else if (P_marker_offd[i1] >= jj_begin_row_offd)
                   {
                      ihat_offd[i1] = cnt_c_offd;
@@ -1493,51 +1556,56 @@ hypre_BoomerAMGBuildPartialStdInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
                }
                else
                {
-                  if(num_functions == 1 || dof_func[i] == dof_func_offd[i1])
+                  if (num_functions == 1 || dof_func[i] == dof_func_offd[i1])
                   {
-                     distribute = A_offd_data[jj]/A_ext_data[A_ext_i[i1]];
-                     for (kk = A_ext_i[i1]+1; kk < A_ext_i[i1+1]; kk++)
+                     distribute = A_offd_data[jj] / A_ext_data[A_ext_i[i1]];
+                     for (kk = A_ext_i[i1] + 1; kk < A_ext_i[i1 + 1]; kk++)
                      {
                         big_k1 = A_ext_j[kk];
-                        if(big_k1 >= col_1 && big_k1 < col_n)
-                        { /*diag*/
+                        if (big_k1 >= col_1 && big_k1 < col_n)
+                        {
+                           /*diag*/
                            loc_col = (HYPRE_Int)(big_k1 - col_1);
                            indx = ihat[loc_col];
                            if (indx > -1)
-                              ahat[indx] -= A_ext_data[kk]*distribute;
+                           {
+                              ahat[indx] -= A_ext_data[kk] * distribute;
+                           }
                            else if (P_marker[loc_col] >= jj_begin_row)
                            {
                               ihat[loc_col] = cnt_c;
                               ipnt[cnt_c] = loc_col;
-                              ahat[cnt_c++] -= A_ext_data[kk]*distribute;
+                              ahat[cnt_c++] -= A_ext_data[kk] * distribute;
                            }
                            else
                            {
                               ihat[loc_col] = cnt_f;
                               ipnt[cnt_f] = loc_col;
-                              ahat[cnt_f++] -= A_ext_data[kk]*distribute;
+                              ahat[cnt_f++] -= A_ext_data[kk] * distribute;
                            }
                         }
                         else
                         {
                            loc_col = -(HYPRE_Int)big_k1 - 1;
-                           if(num_functions == 1 ||
-                              dof_func_offd[loc_col] == dof_func_offd[i1])
+                           if (num_functions == 1 ||
+                               dof_func_offd[loc_col] == dof_func_offd[i1])
                            {
                               indx = ihat_offd[loc_col];
                               if (indx > -1)
-                                 ahat_offd[indx] -= A_ext_data[kk]*distribute;
-                              else if(P_marker_offd[loc_col] >= jj_begin_row_offd)
+                              {
+                                 ahat_offd[indx] -= A_ext_data[kk] * distribute;
+                              }
+                              else if (P_marker_offd[loc_col] >= jj_begin_row_offd)
                               {
                                  ihat_offd[loc_col] = cnt_c_offd;
                                  ipnt_offd[cnt_c_offd] = loc_col;
-                                 ahat_offd[cnt_c_offd++] -= A_ext_data[kk]*distribute;
+                                 ahat_offd[cnt_c_offd++] -= A_ext_data[kk] * distribute;
                               }
                               else
                               {
                                  ihat_offd[loc_col] = cnt_f_offd;
                                  ipnt_offd[cnt_f_offd] = loc_col;
-                                 ahat_offd[cnt_f_offd++] -= A_ext_data[kk]*distribute;
+                                 ahat_offd[cnt_f_offd++] -= A_ext_data[kk] * distribute;
                               }
                            }
                         }
@@ -1546,14 +1614,14 @@ hypre_BoomerAMGBuildPartialStdInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
                }
             }
          }
-         if (debug_flag==4)
+         if (debug_flag == 4)
          {
             wall_time = time_getWallclockSeconds() - wall_time;
             wall_2 += wall_time;
             fflush(NULL);
          }
 
-         if (debug_flag==4) wall_time = time_getWallclockSeconds();
+         if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
          diagonal = ahat[cnt_c];
          ahat[cnt_c] = 0;
          sum_pos = 0;
@@ -1562,9 +1630,9 @@ hypre_BoomerAMGBuildPartialStdInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
          sum_neg_C = 0;
          sum = 0;
          sum_C = 0;
-         if(sep_weight == 1)
+         if (sep_weight == 1)
          {
-            for (jj=0; jj < cnt_c; jj++)
+            for (jj = 0; jj < cnt_c; jj++)
             {
                if (ahat[jj] > 0)
                {
@@ -1575,9 +1643,9 @@ hypre_BoomerAMGBuildPartialStdInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
                   sum_neg_C += ahat[jj];
                }
             }
-            if(num_procs > 1)
+            if (num_procs > 1)
             {
-               for (jj=0; jj < cnt_c_offd; jj++)
+               for (jj = 0; jj < cnt_c_offd; jj++)
                {
                   if (ahat_offd[jj] > 0)
                   {
@@ -1591,7 +1659,7 @@ hypre_BoomerAMGBuildPartialStdInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
             }
             sum_pos = sum_pos_C;
             sum_neg = sum_neg_C;
-            for (jj=cnt_c+1; jj < cnt_f; jj++)
+            for (jj = cnt_c + 1; jj < cnt_f; jj++)
             {
                if (ahat[jj] > 0)
                {
@@ -1603,9 +1671,10 @@ hypre_BoomerAMGBuildPartialStdInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
                }
                ahat[jj] = 0;
             }
-            if(num_procs > 1)
+
+            if (num_procs > 1)
             {
-               for (jj=cnt_c_offd; jj < cnt_f_offd; jj++)
+               for (jj = cnt_c_offd; jj < cnt_f_offd; jj++)
                {
                   if (ahat_offd[jj] > 0)
                   {
@@ -1618,8 +1687,9 @@ hypre_BoomerAMGBuildPartialStdInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
                   ahat_offd[jj] = 0;
                }
             }
-            if (sum_neg_C*diagonal != 0.0) alfa = sum_neg/sum_neg_C/diagonal;
-            if (sum_pos_C*diagonal != 0.0) beta = sum_pos/sum_pos_C/diagonal;
+
+            alpha = (sum_neg_C * diagonal != 0.0) ? (sum_neg / sum_neg_C / diagonal) : 1.0;
+            beta  = (sum_pos_C * diagonal != 0.0) ? (sum_pos / sum_pos_C / diagonal) : 1.0;
 
             /*-----------------------------------------------------------------
              * Set interpolation weight by dividing by the diagonal.
@@ -1629,59 +1699,71 @@ hypre_BoomerAMGBuildPartialStdInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
             {
                j1 = ihat[P_diag_j[jj]];
                if (ahat[j1] > 0)
-                  P_diag_data[jj] = -beta*ahat[j1];
+               {
+                  P_diag_data[jj] = -beta * ahat[j1];
+               }
                else
-                  P_diag_data[jj] = -alfa*ahat[j1];
+               {
+                  P_diag_data[jj] = -alpha * ahat[j1];
+               }
 
                P_diag_j[jj] = fine_to_coarse[P_diag_j[jj]];
                ahat[j1] = 0;
             }
-            for (jj=0; jj < cnt_f; jj++)
+            for (jj = 0; jj < cnt_f; jj++)
+            {
                ihat[ipnt[jj]] = -1;
-            if(num_procs > 1)
+            }
+            if (num_procs > 1)
             {
                for (jj = jj_begin_row_offd; jj < jj_end_row_offd; jj++)
                {
                   j1 = ihat_offd[P_offd_j[jj]];
                   if (ahat_offd[j1] > 0)
-                     P_offd_data[jj] = -beta*ahat_offd[j1];
+                  {
+                     P_offd_data[jj] = - beta * ahat_offd[j1];
+                  }
                   else
-                     P_offd_data[jj] = -alfa*ahat_offd[j1];
+                  {
+                     P_offd_data[jj] = - alpha * ahat_offd[j1];
+                  }
 
                   ahat_offd[j1] = 0;
                }
-               for (jj=0; jj < cnt_f_offd; jj++)
+               for (jj = 0; jj < cnt_f_offd; jj++)
+               {
                   ihat_offd[ipnt_offd[jj]] = -1;
+               }
             }
          }
          else
          {
-            for (jj=0; jj < cnt_c; jj++)
+            for (jj = 0; jj < cnt_c; jj++)
             {
                sum_C += ahat[jj];
             }
-            if(num_procs > 1)
+            if (num_procs > 1)
             {
-               for (jj=0; jj < cnt_c_offd; jj++)
+               for (jj = 0; jj < cnt_c_offd; jj++)
                {
                   sum_C += ahat_offd[jj];
                }
             }
             sum = sum_C;
-            for (jj=cnt_c+1; jj < cnt_f; jj++)
+            for (jj = cnt_c + 1; jj < cnt_f; jj++)
             {
                sum += ahat[jj];
                ahat[jj] = 0;
             }
-            if(num_procs > 1)
+            if (num_procs > 1)
             {
-               for (jj=cnt_c_offd; jj < cnt_f_offd; jj++)
+               for (jj = cnt_c_offd; jj < cnt_f_offd; jj++)
                {
                   sum += ahat_offd[jj];
                   ahat_offd[jj] = 0;
                }
             }
-            if (sum_C*diagonal != 0.0) alfa = sum/sum_C/diagonal;
+            alpha = (sum_C * diagonal != 0.0) ? (sum / sum_C / diagonal) : 1.0;
 
             /*-----------------------------------------------------------------
              * Set interpolation weight by dividing by the diagonal.
@@ -1690,25 +1772,29 @@ hypre_BoomerAMGBuildPartialStdInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
             for (jj = jj_begin_row; jj < jj_end_row; jj++)
             {
                j1 = ihat[P_diag_j[jj]];
-               P_diag_data[jj] = -alfa*ahat[j1];
+               P_diag_data[jj] = - alpha * ahat[j1];
                P_diag_j[jj] = fine_to_coarse[P_diag_j[jj]];
                ahat[j1] = 0;
             }
-            for (jj=0; jj < cnt_f; jj++)
+            for (jj = 0; jj < cnt_f; jj++)
+            {
                ihat[ipnt[jj]] = -1;
-            if(num_procs > 1)
+            }
+            if (num_procs > 1)
             {
                for (jj = jj_begin_row_offd; jj < jj_end_row_offd; jj++)
                {
                   j1 = ihat_offd[P_offd_j[jj]];
-                  P_offd_data[jj] = -alfa*ahat_offd[j1];
+                  P_offd_data[jj] = - alpha * ahat_offd[j1];
                   ahat_offd[j1] = 0;
                }
-               for (jj=0; jj < cnt_f_offd; jj++)
+               for (jj = 0; jj < cnt_f_offd; jj++)
+               {
                   ihat_offd[ipnt_offd[jj]] = -1;
+               }
             }
          }
-         if (debug_flag==4)
+         if (debug_flag == 4)
          {
             wall_time = time_getWallclockSeconds() - wall_time;
             wall_3 += wall_time;
@@ -1717,7 +1803,7 @@ hypre_BoomerAMGBuildPartialStdInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
       }
    }
 
-   if (debug_flag==4)
+   if (debug_flag == 4)
    {
       hypre_printf("Proc = %d fill part 1 %f part 2 %f  part 3 %f\n",
                    my_id, wall_1, wall_2, wall_3);
@@ -1760,15 +1846,15 @@ hypre_BoomerAMGBuildPartialStdInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
 
    /* This builds col_map, col_map should be monotone increasing and contain
     * global numbers. */
-   if(P_offd_size)
+   if (P_offd_size)
    {
       hypre_build_interp_colmap(P, full_off_procNodes, tmp_CF_marker_offd, fine_to_coarse_offd);
    }
 
    hypre_MatvecCommPkgCreate(P);
 
-   for (i=0; i < n_fine; i++)
-      if (CF_marker[i] < -1) CF_marker[i] = -1;
+   for (i = 0; i < n_fine; i++)
+      if (CF_marker[i] < -1) { CF_marker[i] = -1; }
 
    *P_ptr = P;
 
@@ -1795,8 +1881,10 @@ hypre_BoomerAMGBuildPartialStdInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
       hypre_TFree(CF_marker_offd, HYPRE_MEMORY_HOST);
       hypre_TFree(tmp_CF_marker_offd, HYPRE_MEMORY_HOST);
 
-      if(num_functions > 1)
+      if (num_functions > 1)
+      {
          hypre_TFree(dof_func_offd, HYPRE_MEMORY_HOST);
+      }
 
       hypre_MatvecCommPkgDestroy(extend_comm_pkg);
 
@@ -1873,10 +1961,10 @@ hypre_BoomerAMGBuildPartialExtInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
    HYPRE_Int       *dof_func_offd = NULL;
 
    /* Full row information for columns of A that are off diag*/
-   hypre_CSRMatrix *A_ext;
-   HYPRE_Real      *A_ext_data;
-   HYPRE_Int       *A_ext_i;
-   HYPRE_BigInt    *A_ext_j;
+   hypre_CSRMatrix *A_ext      = NULL;
+   HYPRE_Real      *A_ext_data = NULL;
+   HYPRE_Int       *A_ext_i    = NULL;
+   HYPRE_BigInt    *A_ext_j    = NULL;
 
    HYPRE_Int       *fine_to_coarse = NULL;
    HYPRE_BigInt    *fine_to_coarse_offd = NULL;
@@ -1885,9 +1973,9 @@ hypre_BoomerAMGBuildPartialExtInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
    HYPRE_Int        loc_col;
    HYPRE_Int        full_off_procNodes;
 
-   hypre_CSRMatrix *Sop;
-   HYPRE_Int       *Sop_i;
-   HYPRE_BigInt    *Sop_j;
+   hypre_CSRMatrix *Sop   = NULL;
+   HYPRE_Int       *Sop_i = NULL;
+   HYPRE_BigInt    *Sop_j = NULL;
 
    HYPRE_Int        sgn;
 
@@ -1896,7 +1984,7 @@ hypre_BoomerAMGBuildPartialExtInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
    HYPRE_Int        jj_begin_row, jj_end_row;
    HYPRE_Int        jj_begin_row_offd = 0;
    HYPRE_Int        jj_end_row_offd = 0;
-   HYPRE_Int        coarse_counter;
+   //HYPRE_Int        coarse_counter;
    HYPRE_Int        n_coarse_old;
    HYPRE_BigInt     total_old_global_cpts;
 
@@ -1914,28 +2002,27 @@ hypre_BoomerAMGBuildPartialExtInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
    /* Definitions */
    HYPRE_Real       zero = 0.0;
    HYPRE_Real       one  = 1.0;
-   HYPRE_Real       wall_time;
-
+   HYPRE_Real       wall_time = 0.0;
 
    hypre_ParCSRCommPkg   *extend_comm_pkg = NULL;
 
-   if (debug_flag==4) wall_time = time_getWallclockSeconds();
+   if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
 
    /* BEGIN */
    hypre_MPI_Comm_size(comm, &num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_rank(comm, &my_id);
 
    my_first_cpt = num_cpts_global[0];
    /*my_first_old_cpt = num_old_cpts_global[0];*/
    n_coarse_old = (HYPRE_Int)(num_old_cpts_global[1] - num_old_cpts_global[0]);
    /*n_coarse = num_cpts_global[1] - num_cpts_global[0];*/
-   if (my_id == (num_procs -1))
+   if (my_id == (num_procs - 1))
    {
       total_global_cpts = num_cpts_global[1];
       total_old_global_cpts = num_old_cpts_global[1];
    }
-   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
-   hypre_MPI_Bcast(&total_old_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
+   hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
+   hypre_MPI_Bcast(&total_old_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
 
    if (!comm_pkg)
    {
@@ -1974,8 +2061,8 @@ hypre_BoomerAMGBuildPartialExtInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
    /*-----------------------------------------------------------------------
     *  Intialize counters and allocate mapping vector.
     *-----------------------------------------------------------------------*/
-   P_diag_i    = hypre_CTAlloc(HYPRE_Int,  n_coarse_old+1, HYPRE_MEMORY_HOST);
-   P_offd_i    = hypre_CTAlloc(HYPRE_Int,  n_coarse_old+1, HYPRE_MEMORY_HOST);
+   P_diag_i    = hypre_CTAlloc(HYPRE_Int,  n_coarse_old + 1, HYPRE_MEMORY_HOST);
+   P_offd_i    = hypre_CTAlloc(HYPRE_Int,  n_coarse_old + 1, HYPRE_MEMORY_HOST);
 
    if (n_fine)
    {
@@ -1997,7 +2084,7 @@ hypre_BoomerAMGBuildPartialExtInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
 
    jj_counter = start_indexing;
    jj_counter_offd = start_indexing;
-   coarse_counter = 0;
+   //coarse_counter = 0;
 
    cnt = 0;
    old_cnt = 0;
@@ -2022,13 +2109,15 @@ hypre_BoomerAMGBuildPartialExtInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
    {
       P_diag_i[ii] = jj_counter;
       if (num_procs > 1)
+      {
          P_offd_i[ii] = jj_counter_offd;
+      }
 
       i = old_coarse_to_fine[ii];
       if (CF_marker[i] > 0)
       {
          jj_counter++;
-         coarse_counter++;
+         //coarse_counter++;
       }
 
       /*--------------------------------------------------------------------
@@ -2038,11 +2127,12 @@ hypre_BoomerAMGBuildPartialExtInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
        *--------------------------------------------------------------------*/
       else if (CF_marker[i] == -2)
       {
-         for (jj = S_diag_i[i]; jj < S_diag_i[i+1]; jj++)
+         for (jj = S_diag_i[i]; jj < S_diag_i[i + 1]; jj++)
          {
             i1 = S_diag_j[jj];
             if (CF_marker[i1] > 0)
-            { /* i1 is a C point */
+            {
+               /* i1 is a C point */
                if (P_marker[i1] < P_diag_i[ii])
                {
                   P_marker[i1] = jj_counter;
@@ -2050,27 +2140,28 @@ hypre_BoomerAMGBuildPartialExtInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
                }
             }
             else if (CF_marker[i1] != -3)
-            { /* i1 is a F point, loop through it's strong neighbors */
-               for (kk = S_diag_i[i1]; kk < S_diag_i[i1+1]; kk++)
+            {
+               /* i1 is a F point, loop through it's strong neighbors */
+               for (kk = S_diag_i[i1]; kk < S_diag_i[i1 + 1]; kk++)
                {
                   k1 = S_diag_j[kk];
                   if (CF_marker[k1] > 0)
                   {
-                     if(P_marker[k1] < P_diag_i[ii])
+                     if (P_marker[k1] < P_diag_i[ii])
                      {
                         P_marker[k1] = jj_counter;
                         jj_counter++;
                      }
                   }
                }
-               if(num_procs > 1)
+               if (num_procs > 1)
                {
-                  for (kk = S_offd_i[i1]; kk < S_offd_i[i1+1]; kk++)
+                  for (kk = S_offd_i[i1]; kk < S_offd_i[i1 + 1]; kk++)
                   {
                      k1 = S_offd_j[kk];
                      if (CF_marker_offd[k1] > 0)
                      {
-                        if(P_marker_offd[k1] < P_offd_i[ii])
+                        if (P_marker_offd[k1] < P_offd_i[ii])
                         {
                            tmp_CF_marker_offd[k1] = 1;
                            P_marker_offd[k1] = jj_counter_offd;
@@ -2084,12 +2175,12 @@ hypre_BoomerAMGBuildPartialExtInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
          /* Look at off diag strong connections of i */
          if (num_procs > 1)
          {
-            for (jj = S_offd_i[i]; jj < S_offd_i[i+1]; jj++)
+            for (jj = S_offd_i[i]; jj < S_offd_i[i + 1]; jj++)
             {
                i1 = S_offd_j[jj];
                if (CF_marker_offd[i1] > 0)
                {
-                  if(P_marker_offd[i1] < P_offd_i[ii])
+                  if (P_marker_offd[i1] < P_offd_i[ii])
                   {
                      tmp_CF_marker_offd[i1] = 1;
                      P_marker_offd[i1] = jj_counter_offd;
@@ -2097,16 +2188,18 @@ hypre_BoomerAMGBuildPartialExtInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
                   }
                }
                else if (CF_marker_offd[i1] != -3)
-               { /* F point; look at neighbors of i1. Sop contains global col
-                  * numbers and entries that could be in S_diag or S_offd or
-                  * neither. */
-                  for(kk = Sop_i[i1]; kk < Sop_i[i1+1]; kk++)
+               {
+                  /* F point; look at neighbors of i1. Sop contains global col
+                   * numbers and entries that could be in S_diag or S_offd or
+                   * neither. */
+                  for (kk = Sop_i[i1]; kk < Sop_i[i1 + 1]; kk++)
                   {
                      big_k1 = Sop_j[kk];
-                     if(big_k1 >= col_1 && big_k1 < col_n)
-                     { /* In S_diag */
-                        loc_col = (HYPRE_Int)(big_k1-col_1);
-                        if(P_marker[loc_col] < P_diag_i[ii])
+                     if (big_k1 >= col_1 && big_k1 < col_n)
+                     {
+                        /* In S_diag */
+                        loc_col = (HYPRE_Int)(big_k1 - col_1);
+                        if (P_marker[loc_col] < P_diag_i[ii])
                         {
                            P_marker[loc_col] = jj_counter;
                            jj_counter++;
@@ -2115,7 +2208,7 @@ hypre_BoomerAMGBuildPartialExtInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
                      else
                      {
                         loc_col = -(HYPRE_Int)big_k1 - 1;
-                        if(P_marker_offd[loc_col] < P_offd_i[ii])
+                        if (P_marker_offd[loc_col] < P_offd_i[ii])
                         {
                            P_marker_offd[loc_col] = jj_counter_offd;
                            tmp_CF_marker_offd[loc_col] = 1;
@@ -2129,7 +2222,7 @@ hypre_BoomerAMGBuildPartialExtInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
       }
    }
 
-   if (debug_flag==4)
+   if (debug_flag == 4)
    {
       wall_time = time_getWallclockSeconds() - wall_time;
       hypre_printf("Proc = %d     determine structure    %f\n",
@@ -2140,7 +2233,7 @@ hypre_BoomerAMGBuildPartialExtInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
     *  Allocate  arrays.
     *-----------------------------------------------------------------------*/
 
-   if (debug_flag== 4) wall_time = time_getWallclockSeconds();
+   if (debug_flag == 4) { wall_time = time_getWallclockSeconds(); }
 
    P_diag_size = jj_counter;
    P_offd_size = jj_counter_offd;
@@ -2164,7 +2257,7 @@ hypre_BoomerAMGBuildPartialExtInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
    jj_counter_offd = start_indexing;
 
    /* Fine to coarse mapping */
-   if(num_procs > 1)
+   if (num_procs > 1)
    {
       hypre_big_insert_new_nodes(comm_pkg, extend_comm_pkg, fine_to_coarse,
                                  full_off_procNodes, my_first_cpt,
@@ -2172,10 +2265,14 @@ hypre_BoomerAMGBuildPartialExtInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
    }
 
    for (i = 0; i < n_fine; i++)
+   {
       P_marker[i] = -1;
+   }
 
    for (i = 0; i < full_off_procNodes; i++)
+   {
       P_marker_offd[i] = -1;
+   }
 
    /*-----------------------------------------------------------------------
     *  Loop over fine grid points.
@@ -2203,7 +2300,7 @@ hypre_BoomerAMGBuildPartialExtInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
       else if (CF_marker[i] == -2)
       {
          strong_f_marker--;
-         for (jj = S_diag_i[i]; jj < S_diag_i[i+1]; jj++)
+         for (jj = S_diag_i[i]; jj < S_diag_i[i + 1]; jj++)
          {
             i1 = S_diag_j[jj];
 
@@ -2225,12 +2322,12 @@ hypre_BoomerAMGBuildPartialExtInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
             else  if (CF_marker[i1] != -3)
             {
                P_marker[i1] = strong_f_marker;
-               for (kk = S_diag_i[i1]; kk < S_diag_i[i1+1]; kk++)
+               for (kk = S_diag_i[i1]; kk < S_diag_i[i1 + 1]; kk++)
                {
                   k1 = S_diag_j[kk];
                   if (CF_marker[k1] >= 0)
                   {
-                     if(P_marker[k1] < jj_begin_row)
+                     if (P_marker[k1] < jj_begin_row)
                      {
                         P_marker[k1] = jj_counter;
                         P_diag_j[jj_counter] = fine_to_coarse[k1];
@@ -2239,14 +2336,14 @@ hypre_BoomerAMGBuildPartialExtInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
                      }
                   }
                }
-               if(num_procs > 1)
+               if (num_procs > 1)
                {
-                  for (kk = S_offd_i[i1]; kk < S_offd_i[i1+1]; kk++)
+                  for (kk = S_offd_i[i1]; kk < S_offd_i[i1 + 1]; kk++)
                   {
                      k1 = S_offd_j[kk];
-                     if(CF_marker_offd[k1] >= 0)
+                     if (CF_marker_offd[k1] >= 0)
                      {
-                        if(P_marker_offd[k1] < jj_begin_row_offd)
+                        if (P_marker_offd[k1] < jj_begin_row_offd)
                         {
                            P_marker_offd[k1] = jj_counter_offd;
                            P_offd_j[jj_counter_offd] = k1;
@@ -2261,12 +2358,12 @@ hypre_BoomerAMGBuildPartialExtInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
 
          if ( num_procs > 1)
          {
-            for (jj=S_offd_i[i]; jj < S_offd_i[i+1]; jj++)
+            for (jj = S_offd_i[i]; jj < S_offd_i[i + 1]; jj++)
             {
                i1 = S_offd_j[jj];
                if ( CF_marker_offd[i1] >= 0)
                {
-                  if(P_marker_offd[i1] < jj_begin_row_offd)
+                  if (P_marker_offd[i1] < jj_begin_row_offd)
                   {
                      P_marker_offd[i1] = jj_counter_offd;
                      P_offd_j[jj_counter_offd] = i1;
@@ -2277,14 +2374,14 @@ hypre_BoomerAMGBuildPartialExtInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
                else if (CF_marker_offd[i1] != -3)
                {
                   P_marker_offd[i1] = strong_f_marker;
-                  for(kk = Sop_i[i1]; kk < Sop_i[i1+1]; kk++)
+                  for (kk = Sop_i[i1]; kk < Sop_i[i1 + 1]; kk++)
                   {
                      big_k1 = Sop_j[kk];
                      /* Find local col number */
-                     if(big_k1 >= col_1 && big_k1 < col_n)
+                     if (big_k1 >= col_1 && big_k1 < col_n)
                      {
-                        loc_col = (HYPRE_Int)(big_k1-col_1);
-                        if(P_marker[loc_col] < jj_begin_row)
+                        loc_col = (HYPRE_Int)(big_k1 - col_1);
+                        if (P_marker[loc_col] < jj_begin_row)
                         {
                            P_marker[loc_col] = jj_counter;
                            P_diag_j[jj_counter] = fine_to_coarse[loc_col];
@@ -2295,10 +2392,10 @@ hypre_BoomerAMGBuildPartialExtInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
                      else
                      {
                         loc_col = -(HYPRE_Int)big_k1 - 1;
-                        if(P_marker_offd[loc_col] < jj_begin_row_offd)
+                        if (P_marker_offd[loc_col] < jj_begin_row_offd)
                         {
                            P_marker_offd[loc_col] = jj_counter_offd;
-                           P_offd_j[jj_counter_offd]=loc_col;
+                           P_offd_j[jj_counter_offd] = loc_col;
                            P_offd_data[jj_counter_offd] = zero;
                            jj_counter_offd++;
                         }
@@ -2313,57 +2410,62 @@ hypre_BoomerAMGBuildPartialExtInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
 
          diagonal = A_diag_data[A_diag_i[i]];
 
-         for (jj = A_diag_i[i]+1; jj < A_diag_i[i+1]; jj++)
-         { /* i1 is a c-point and strongly influences i, accumulate
-            * a_(i,i1) into interpolation weight */
+         for (jj = A_diag_i[i] + 1; jj < A_diag_i[i + 1]; jj++)
+         {
+            /* i1 is a c-point and strongly influences i, accumulate
+             * a_(i,i1) into interpolation weight */
             i1 = A_diag_j[jj];
             if (P_marker[i1] >= jj_begin_row)
             {
                P_diag_data[P_marker[i1]] += A_diag_data[jj];
             }
-            else if(P_marker[i1] == strong_f_marker)
+            else if (P_marker[i1] == strong_f_marker)
             {
                sum = zero;
                sgn = 1;
-               if(A_diag_data[A_diag_i[i1]] < 0) sgn = -1;
+               if (A_diag_data[A_diag_i[i1]] < 0) { sgn = -1; }
                /* Loop over row of A for point i1 and calculate the sum
                 * of the connections to c-points that strongly incluence i. */
-               for(jj1 = A_diag_i[i1]+1; jj1 < A_diag_i[i1+1]; jj1++)
+               for (jj1 = A_diag_i[i1] + 1; jj1 < A_diag_i[i1 + 1]; jj1++)
                {
                   i2 = A_diag_j[jj1];
-                  if((P_marker[i2] >= jj_begin_row) && (sgn*A_diag_data[jj1]) < 0)
+                  if ((P_marker[i2] >= jj_begin_row) && (sgn * A_diag_data[jj1]) < 0)
+                  {
                      sum += A_diag_data[jj1];
+                  }
                }
-               if(num_procs > 1)
+               if (num_procs > 1)
                {
-                  for(jj1 = A_offd_i[i1]; jj1< A_offd_i[i1+1]; jj1++)
+                  for (jj1 = A_offd_i[i1]; jj1 < A_offd_i[i1 + 1]; jj1++)
                   {
                      i2 = A_offd_j[jj1];
-                     if(P_marker_offd[i2] >= jj_begin_row_offd &&
-                        (sgn*A_offd_data[jj1]) < 0)
+                     if (P_marker_offd[i2] >= jj_begin_row_offd &&
+                         (sgn * A_offd_data[jj1]) < 0)
+                     {
                         sum += A_offd_data[jj1];
+                     }
                   }
                }
-               if(sum != 0)
+               if (sum != 0)
                {
-                  distribute = A_diag_data[jj]/sum;
+                  distribute = A_diag_data[jj] / sum;
                   /* Loop over row of A for point i1 and do the distribution */
-                  for(jj1 = A_diag_i[i1]+1; jj1 < A_diag_i[i1+1]; jj1++)
+                  for (jj1 = A_diag_i[i1] + 1; jj1 < A_diag_i[i1 + 1]; jj1++)
                   {
                      i2 = A_diag_j[jj1];
-                     if(P_marker[i2] >= jj_begin_row && (sgn*A_diag_data[jj1]) < 0)
+                     if (P_marker[i2] >= jj_begin_row && (sgn * A_diag_data[jj1]) < 0)
                         P_diag_data[P_marker[i2]] +=
-                           distribute*A_diag_data[jj1];
+                           distribute * A_diag_data[jj1];
                   }
-                  if(num_procs > 1)
+                  if (num_procs > 1)
                   {
-                     for(jj1 = A_offd_i[i1]; jj1 < A_offd_i[i1+1]; jj1++)
+                     for (jj1 = A_offd_i[i1]; jj1 < A_offd_i[i1 + 1]; jj1++)
                      {
                         i2 = A_offd_j[jj1];
-                        if(P_marker_offd[i2] >= jj_begin_row_offd &&
-                           (sgn*A_offd_data[jj1]) < 0)
+                        if (P_marker_offd[i2] >= jj_begin_row_offd &&
+                            (sgn * A_offd_data[jj1]) < 0)
                            P_offd_data[P_marker_offd[i2]] +=
-                              distribute*A_offd_data[jj1];
+                              distribute * A_offd_data[jj1];
                      }
                   }
                }
@@ -2376,57 +2478,67 @@ hypre_BoomerAMGBuildPartialExtInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
              * diagonal */
             else if (CF_marker[i1] != -3)
             {
-               if(num_functions == 1 || dof_func[i] == dof_func[i1])
+               if (num_functions == 1 || dof_func[i] == dof_func[i1])
+               {
                   diagonal += A_diag_data[jj];
+               }
             }
          }
-         if(num_procs > 1)
+         if (num_procs > 1)
          {
-            for(jj = A_offd_i[i]; jj < A_offd_i[i+1]; jj++)
+            for (jj = A_offd_i[i]; jj < A_offd_i[i + 1]; jj++)
             {
                i1 = A_offd_j[jj];
-               if(P_marker_offd[i1] >= jj_begin_row_offd)
+               if (P_marker_offd[i1] >= jj_begin_row_offd)
+               {
                   P_offd_data[P_marker_offd[i1]] += A_offd_data[jj];
-               else if(P_marker_offd[i1] == strong_f_marker)
+               }
+               else if (P_marker_offd[i1] == strong_f_marker)
                {
                   sum = zero;
                   sgn = 1;
-                  for(jj1 = A_ext_i[i1]; jj1 < A_ext_i[i1+1]; jj1++)
+                  for (jj1 = A_ext_i[i1]; jj1 < A_ext_i[i1 + 1]; jj1++)
                   {
                      big_k1 = A_ext_j[jj1];
-                     if(big_k1 >= col_1 && big_k1 < col_n)
-                     { /* diag */
+                     if (big_k1 >= col_1 && big_k1 < col_n)
+                     {
+                        /* diag */
                         loc_col = (HYPRE_Int)(big_k1 - col_1);
-                        if(P_marker[loc_col] >= jj_begin_row )
+                        if (P_marker[loc_col] >= jj_begin_row )
+                        {
                            sum += A_ext_data[jj1];
+                        }
                      }
                      else
                      {
                         loc_col = -(HYPRE_Int)big_k1 - 1;
-                        if(P_marker_offd[loc_col] >= jj_begin_row_offd &&
-                           (sgn*A_ext_data[jj1]) < 0)
+                        if (P_marker_offd[loc_col] >= jj_begin_row_offd &&
+                            (sgn * A_ext_data[jj1]) < 0)
+                        {
                            sum += A_ext_data[jj1];
+                        }
                      }
                   }
-                  if(sum != 0)
+                  if (sum != 0)
                   {
                      distribute = A_offd_data[jj] / sum;
-                     for(jj1 = A_ext_i[i1]; jj1 < A_ext_i[i1+1]; jj1++)
+                     for (jj1 = A_ext_i[i1]; jj1 < A_ext_i[i1 + 1]; jj1++)
                      {
                         big_k1 = A_ext_j[jj1];
-                        if(big_k1 >= col_1 && big_k1 < col_n)
-                        { /* diag */
+                        if (big_k1 >= col_1 && big_k1 < col_n)
+                        {
+                           /* diag */
                            loc_col = (HYPRE_Int)(big_k1 - col_1);
-                           if(P_marker[loc_col] >= jj_begin_row)
-                              P_diag_data[P_marker[loc_col]] += distribute*
-                                 A_ext_data[jj1];
+                           if (P_marker[loc_col] >= jj_begin_row)
+                              P_diag_data[P_marker[loc_col]] += distribute *
+                                                                A_ext_data[jj1];
                         }
                         else
                         {
                            loc_col = -(HYPRE_Int)big_k1 - 1;
-                           if(P_marker_offd[loc_col] >= jj_begin_row_offd)
-                              P_offd_data[P_marker_offd[loc_col]] += distribute*
-                                 A_ext_data[jj1];
+                           if (P_marker_offd[loc_col] >= jj_begin_row_offd)
+                              P_offd_data[P_marker_offd[loc_col]] += distribute *
+                                                                     A_ext_data[jj1];
                         }
                      }
                   }
@@ -2437,23 +2549,29 @@ hypre_BoomerAMGBuildPartialExtInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
                }
                else if (CF_marker_offd[i1] != -3)
                {
-                  if(num_functions == 1 || dof_func[i] == dof_func_offd[i1])
+                  if (num_functions == 1 || dof_func[i] == dof_func_offd[i1])
+                  {
                      diagonal += A_offd_data[jj];
+                  }
                }
             }
          }
          if (diagonal)
          {
-            for(jj = jj_begin_row; jj < jj_end_row; jj++)
+            for (jj = jj_begin_row; jj < jj_end_row; jj++)
+            {
                P_diag_data[jj] /= -diagonal;
-            for(jj = jj_begin_row_offd; jj < jj_end_row_offd; jj++)
+            }
+            for (jj = jj_begin_row_offd; jj < jj_end_row_offd; jj++)
+            {
                P_offd_data[jj] /= -diagonal;
+            }
          }
       }
       strong_f_marker--;
    }
 
-   if (debug_flag==4)
+   if (debug_flag == 4)
    {
       wall_time = time_getWallclockSeconds() - wall_time;
       hypre_printf("Proc = %d     fill structure    %f\n",
@@ -2501,15 +2619,15 @@ hypre_BoomerAMGBuildPartialExtInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
 
    /* This builds col_map, col_map should be monotone increasing and contain
     * global numbers. */
-   if(P_offd_size)
+   if (P_offd_size)
    {
       hypre_build_interp_colmap(P, full_off_procNodes, tmp_CF_marker_offd, fine_to_coarse_offd);
    }
 
    hypre_MatvecCommPkgCreate(P);
 
-   for (i=0; i < n_fine; i++)
-      if (CF_marker[i] < -1) CF_marker[i] = -1;
+   for (i = 0; i < n_fine; i++)
+      if (CF_marker[i] < -1) { CF_marker[i] = -1; }
 
    *P_ptr = P;
 
@@ -2526,8 +2644,10 @@ hypre_BoomerAMGBuildPartialExtInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker
       hypre_TFree(P_marker_offd, HYPRE_MEMORY_HOST);
       hypre_TFree(CF_marker_offd, HYPRE_MEMORY_HOST);
       hypre_TFree(tmp_CF_marker_offd, HYPRE_MEMORY_HOST);
-      if(num_functions > 1)
+      if (num_functions > 1)
+      {
          hypre_TFree(dof_func_offd, HYPRE_MEMORY_HOST);
+      }
 
       hypre_MatvecCommPkgDestroy(extend_comm_pkg);
    }
diff --git a/external/hypre/src/parcsr_ls/protos.h b/external/hypre/src/parcsr_ls/protos.h
index 2df4bfa6..09642cc4 100644
--- a/external/hypre/src/parcsr_ls/protos.h
+++ b/external/hypre/src/parcsr_ls/protos.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -8,756 +8,1004 @@
 /* ads.c */
 void *hypre_ADSCreate ( void );
 HYPRE_Int hypre_ADSDestroy ( void *solver );
-HYPRE_Int hypre_ADSSetDiscreteCurl ( void *solver , hypre_ParCSRMatrix *C );
-HYPRE_Int hypre_ADSSetDiscreteGradient ( void *solver , hypre_ParCSRMatrix *G );
-HYPRE_Int hypre_ADSSetCoordinateVectors ( void *solver , hypre_ParVector *x , hypre_ParVector *y , hypre_ParVector *z );
-HYPRE_Int hypre_ADSSetInterpolations ( void *solver , hypre_ParCSRMatrix *RT_Pi , hypre_ParCSRMatrix *RT_Pix , hypre_ParCSRMatrix *RT_Piy , hypre_ParCSRMatrix *RT_Piz , hypre_ParCSRMatrix *ND_Pi , hypre_ParCSRMatrix *ND_Pix , hypre_ParCSRMatrix *ND_Piy , hypre_ParCSRMatrix *ND_Piz );
-HYPRE_Int hypre_ADSSetMaxIter ( void *solver , HYPRE_Int maxit );
-HYPRE_Int hypre_ADSSetTol ( void *solver , HYPRE_Real tol );
-HYPRE_Int hypre_ADSSetCycleType ( void *solver , HYPRE_Int cycle_type );
-HYPRE_Int hypre_ADSSetPrintLevel ( void *solver , HYPRE_Int print_level );
-HYPRE_Int hypre_ADSSetSmoothingOptions ( void *solver , HYPRE_Int A_relax_type , HYPRE_Int A_relax_times , HYPRE_Real A_relax_weight , HYPRE_Real A_omega );
-HYPRE_Int hypre_ADSSetChebySmoothingOptions ( void *solver , HYPRE_Int A_cheby_order , HYPRE_Int A_cheby_fraction );
-HYPRE_Int hypre_ADSSetAMSOptions ( void *solver , HYPRE_Int B_C_cycle_type , HYPRE_Int B_C_coarsen_type , HYPRE_Int B_C_agg_levels , HYPRE_Int B_C_relax_type , HYPRE_Real B_C_theta , HYPRE_Int B_C_interp_type , HYPRE_Int B_C_Pmax );
-HYPRE_Int hypre_ADSSetAMGOptions ( void *solver , HYPRE_Int B_Pi_coarsen_type , HYPRE_Int B_Pi_agg_levels , HYPRE_Int B_Pi_relax_type , HYPRE_Real B_Pi_theta , HYPRE_Int B_Pi_interp_type , HYPRE_Int B_Pi_Pmax );
-HYPRE_Int hypre_ADSComputePi ( hypre_ParCSRMatrix *A , hypre_ParCSRMatrix *C , hypre_ParCSRMatrix *G , hypre_ParVector *x , hypre_ParVector *y , hypre_ParVector *z , hypre_ParCSRMatrix *PiNDx , hypre_ParCSRMatrix *PiNDy , hypre_ParCSRMatrix *PiNDz , hypre_ParCSRMatrix **Pi_ptr );
-HYPRE_Int hypre_ADSComputePixyz ( hypre_ParCSRMatrix *A , hypre_ParCSRMatrix *C , hypre_ParCSRMatrix *G , hypre_ParVector *x , hypre_ParVector *y , hypre_ParVector *z , hypre_ParCSRMatrix *PiNDx , hypre_ParCSRMatrix *PiNDy , hypre_ParCSRMatrix *PiNDz , hypre_ParCSRMatrix **Pix_ptr , hypre_ParCSRMatrix **Piy_ptr , hypre_ParCSRMatrix **Piz_ptr );
-HYPRE_Int hypre_ADSSetup ( void *solver , hypre_ParCSRMatrix *A , hypre_ParVector *b , hypre_ParVector *x );
-HYPRE_Int hypre_ADSSolve ( void *solver , hypre_ParCSRMatrix *A , hypre_ParVector *b , hypre_ParVector *x );
-HYPRE_Int hypre_ADSGetNumIterations ( void *solver , HYPRE_Int *num_iterations );
-HYPRE_Int hypre_ADSGetFinalRelativeResidualNorm ( void *solver , HYPRE_Real *rel_resid_norm );
+HYPRE_Int hypre_ADSSetDiscreteCurl ( void *solver, hypre_ParCSRMatrix *C );
+HYPRE_Int hypre_ADSSetDiscreteGradient ( void *solver, hypre_ParCSRMatrix *G );
+HYPRE_Int hypre_ADSSetCoordinateVectors ( void *solver, hypre_ParVector *x, hypre_ParVector *y,
+                                          hypre_ParVector *z );
+HYPRE_Int hypre_ADSSetInterpolations ( void *solver, hypre_ParCSRMatrix *RT_Pi,
+                                       hypre_ParCSRMatrix *RT_Pix, hypre_ParCSRMatrix *RT_Piy,
+                                       hypre_ParCSRMatrix *RT_Piz, hypre_ParCSRMatrix *ND_Pi,
+                                       hypre_ParCSRMatrix *ND_Pix, hypre_ParCSRMatrix *ND_Piy,
+                                       hypre_ParCSRMatrix *ND_Piz );
+HYPRE_Int hypre_ADSSetMaxIter ( void *solver, HYPRE_Int maxit );
+HYPRE_Int hypre_ADSSetTol ( void *solver, HYPRE_Real tol );
+HYPRE_Int hypre_ADSSetCycleType ( void *solver, HYPRE_Int cycle_type );
+HYPRE_Int hypre_ADSSetPrintLevel ( void *solver, HYPRE_Int print_level );
+HYPRE_Int hypre_ADSSetSmoothingOptions ( void *solver, HYPRE_Int A_relax_type,
+                                         HYPRE_Int A_relax_times, HYPRE_Real A_relax_weight, HYPRE_Real A_omega );
+HYPRE_Int hypre_ADSSetChebySmoothingOptions ( void *solver, HYPRE_Int A_cheby_order,
+                                              HYPRE_Real A_cheby_fraction );
+HYPRE_Int hypre_ADSSetAMSOptions ( void *solver, HYPRE_Int B_C_cycle_type,
+                                   HYPRE_Int B_C_coarsen_type, HYPRE_Int B_C_agg_levels, HYPRE_Int B_C_relax_type,
+                                   HYPRE_Real B_C_theta, HYPRE_Int B_C_interp_type, HYPRE_Int B_C_Pmax );
+HYPRE_Int hypre_ADSSetAMGOptions ( void *solver, HYPRE_Int B_Pi_coarsen_type,
+                                   HYPRE_Int B_Pi_agg_levels, HYPRE_Int B_Pi_relax_type, HYPRE_Real B_Pi_theta,
+                                   HYPRE_Int B_Pi_interp_type, HYPRE_Int B_Pi_Pmax );
+HYPRE_Int hypre_ADSComputePi ( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *C, hypre_ParCSRMatrix *G,
+                               hypre_ParVector *x, hypre_ParVector *y, hypre_ParVector *z, hypre_ParCSRMatrix *PiNDx,
+                               hypre_ParCSRMatrix *PiNDy, hypre_ParCSRMatrix *PiNDz, hypre_ParCSRMatrix **Pi_ptr );
+HYPRE_Int hypre_ADSComputePixyz ( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *C,
+                                  hypre_ParCSRMatrix *G, hypre_ParVector *x, hypre_ParVector *y, hypre_ParVector *z,
+                                  hypre_ParCSRMatrix *PiNDx, hypre_ParCSRMatrix *PiNDy, hypre_ParCSRMatrix *PiNDz,
+                                  hypre_ParCSRMatrix **Pix_ptr, hypre_ParCSRMatrix **Piy_ptr, hypre_ParCSRMatrix **Piz_ptr );
+HYPRE_Int hypre_ADSSetup ( void *solver, hypre_ParCSRMatrix *A, hypre_ParVector *b,
+                           hypre_ParVector *x );
+HYPRE_Int hypre_ADSSolve ( void *solver, hypre_ParCSRMatrix *A, hypre_ParVector *b,
+                           hypre_ParVector *x );
+HYPRE_Int hypre_ADSGetNumIterations ( void *solver, HYPRE_Int *num_iterations );
+HYPRE_Int hypre_ADSGetFinalRelativeResidualNorm ( void *solver, HYPRE_Real *rel_resid_norm );
 
 /* ame.c */
 void *hypre_AMECreate ( void );
 HYPRE_Int hypre_AMEDestroy ( void *esolver );
-HYPRE_Int hypre_AMESetAMSSolver ( void *esolver , void *ams_solver );
-HYPRE_Int hypre_AMESetMassMatrix ( void *esolver , hypre_ParCSRMatrix *M );
-HYPRE_Int hypre_AMESetBlockSize ( void *esolver , HYPRE_Int block_size );
-HYPRE_Int hypre_AMESetMaxIter ( void *esolver , HYPRE_Int maxit );
-HYPRE_Int hypre_AMESetTol ( void *esolver , HYPRE_Real tol );
-HYPRE_Int hypre_AMESetRTol ( void *esolver , HYPRE_Real tol );
-HYPRE_Int hypre_AMESetPrintLevel ( void *esolver , HYPRE_Int print_level );
+HYPRE_Int hypre_AMESetAMSSolver ( void *esolver, void *ams_solver );
+HYPRE_Int hypre_AMESetMassMatrix ( void *esolver, hypre_ParCSRMatrix *M );
+HYPRE_Int hypre_AMESetBlockSize ( void *esolver, HYPRE_Int block_size );
+HYPRE_Int hypre_AMESetMaxIter ( void *esolver, HYPRE_Int maxit );
+HYPRE_Int hypre_AMESetMaxPCGIter ( void *esolver, HYPRE_Int maxit );
+HYPRE_Int hypre_AMESetTol ( void *esolver, HYPRE_Real tol );
+HYPRE_Int hypre_AMESetRTol ( void *esolver, HYPRE_Real tol );
+HYPRE_Int hypre_AMESetPrintLevel ( void *esolver, HYPRE_Int print_level );
 HYPRE_Int hypre_AMESetup ( void *esolver );
-HYPRE_Int hypre_AMEDiscrDivFreeComponent ( void *esolver , hypre_ParVector *b );
-void hypre_AMEOperatorA ( void *data , void *x , void *y );
-void hypre_AMEMultiOperatorA ( void *data , void *x , void *y );
-void hypre_AMEOperatorM ( void *data , void *x , void *y );
-void hypre_AMEMultiOperatorM ( void *data , void *x , void *y );
-void hypre_AMEOperatorB ( void *data , void *x , void *y );
-void hypre_AMEMultiOperatorB ( void *data , void *x , void *y );
+HYPRE_Int hypre_AMEDiscrDivFreeComponent ( void *esolver, hypre_ParVector *b );
+void hypre_AMEOperatorA ( void *data, void *x, void *y );
+void hypre_AMEMultiOperatorA ( void *data, void *x, void *y );
+void hypre_AMEOperatorM ( void *data, void *x, void *y );
+void hypre_AMEMultiOperatorM ( void *data, void *x, void *y );
+void hypre_AMEOperatorB ( void *data, void *x, void *y );
+void hypre_AMEMultiOperatorB ( void *data, void *x, void *y );
 HYPRE_Int hypre_AMESolve ( void *esolver );
-HYPRE_Int hypre_AMEGetEigenvectors ( void *esolver , HYPRE_ParVector **eigenvectors_ptr );
-HYPRE_Int hypre_AMEGetEigenvalues ( void *esolver , HYPRE_Real **eigenvalues_ptr );
+HYPRE_Int hypre_AMEGetEigenvectors ( void *esolver, HYPRE_ParVector **eigenvectors_ptr );
+HYPRE_Int hypre_AMEGetEigenvalues ( void *esolver, HYPRE_Real **eigenvalues_ptr );
 
 /* amg_hybrid.c */
 void *hypre_AMGHybridCreate ( void );
 HYPRE_Int hypre_AMGHybridDestroy ( void *AMGhybrid_vdata );
-HYPRE_Int hypre_AMGHybridSetTol ( void *AMGhybrid_vdata , HYPRE_Real tol );
-HYPRE_Int hypre_AMGHybridSetAbsoluteTol ( void *AMGhybrid_vdata , HYPRE_Real a_tol );
-HYPRE_Int hypre_AMGHybridSetConvergenceTol ( void *AMGhybrid_vdata , HYPRE_Real cf_tol );
-HYPRE_Int hypre_AMGHybridSetNonGalerkinTol ( void *AMGhybrid_vdata , HYPRE_Int nongalerk_num_tol, HYPRE_Real *nongalerkin_tol );
-HYPRE_Int hypre_AMGHybridSetDSCGMaxIter ( void *AMGhybrid_vdata , HYPRE_Int dscg_max_its );
-HYPRE_Int hypre_AMGHybridSetPCGMaxIter ( void *AMGhybrid_vdata , HYPRE_Int pcg_max_its );
-HYPRE_Int hypre_AMGHybridSetSetupType ( void *AMGhybrid_vdata , HYPRE_Int setup_type );
-HYPRE_Int hypre_AMGHybridSetSolverType ( void *AMGhybrid_vdata , HYPRE_Int solver_type );
-HYPRE_Int hypre_AMGHybridSetRecomputeResidual ( void *AMGhybrid_vdata , HYPRE_Int recompute_residual );
-HYPRE_Int hypre_AMGHybridGetRecomputeResidual ( void *AMGhybrid_vdata , HYPRE_Int *recompute_residual );
-HYPRE_Int hypre_AMGHybridSetRecomputeResidualP ( void *AMGhybrid_vdata , HYPRE_Int recompute_residual_p );
-HYPRE_Int hypre_AMGHybridGetRecomputeResidualP ( void *AMGhybrid_vdata , HYPRE_Int *recompute_residual_p );
-HYPRE_Int hypre_AMGHybridSetKDim ( void *AMGhybrid_vdata , HYPRE_Int k_dim );
-HYPRE_Int hypre_AMGHybridSetStopCrit ( void *AMGhybrid_vdata , HYPRE_Int stop_crit );
-HYPRE_Int hypre_AMGHybridSetTwoNorm ( void *AMGhybrid_vdata , HYPRE_Int two_norm );
-HYPRE_Int hypre_AMGHybridSetRelChange ( void *AMGhybrid_vdata , HYPRE_Int rel_change );
-HYPRE_Int hypre_AMGHybridSetPrecond ( void *pcg_vdata , HYPRE_Int (*pcg_precond_solve )(void*,void*,void*,void*), HYPRE_Int (*pcg_precond_setup )(void*,void*,void*,void*), void *pcg_precond );
-HYPRE_Int hypre_AMGHybridSetLogging ( void *AMGhybrid_vdata , HYPRE_Int logging );
-HYPRE_Int hypre_AMGHybridSetPrintLevel ( void *AMGhybrid_vdata , HYPRE_Int print_level );
-HYPRE_Int hypre_AMGHybridSetStrongThreshold ( void *AMGhybrid_vdata , HYPRE_Real strong_threshold );
-HYPRE_Int hypre_AMGHybridSetMaxRowSum ( void *AMGhybrid_vdata , HYPRE_Real max_row_sum );
-HYPRE_Int hypre_AMGHybridSetTruncFactor ( void *AMGhybrid_vdata , HYPRE_Real trunc_factor );
-HYPRE_Int hypre_AMGHybridSetPMaxElmts ( void *AMGhybrid_vdata , HYPRE_Int P_max_elmts );
-HYPRE_Int hypre_AMGHybridSetMaxLevels ( void *AMGhybrid_vdata , HYPRE_Int max_levels );
-HYPRE_Int hypre_AMGHybridSetMeasureType ( void *AMGhybrid_vdata , HYPRE_Int measure_type );
-HYPRE_Int hypre_AMGHybridSetCoarsenType ( void *AMGhybrid_vdata , HYPRE_Int coarsen_type );
-HYPRE_Int hypre_AMGHybridSetInterpType ( void *AMGhybrid_vdata , HYPRE_Int interp_type );
-HYPRE_Int hypre_AMGHybridSetCycleType ( void *AMGhybrid_vdata , HYPRE_Int cycle_type );
-HYPRE_Int hypre_AMGHybridSetNumSweeps ( void *AMGhybrid_vdata , HYPRE_Int num_sweeps );
-HYPRE_Int hypre_AMGHybridSetCycleNumSweeps ( void *AMGhybrid_vdata , HYPRE_Int num_sweeps , HYPRE_Int k );
-HYPRE_Int hypre_AMGHybridSetRelaxType ( void *AMGhybrid_vdata , HYPRE_Int relax_type );
-HYPRE_Int hypre_AMGHybridSetKeepTranspose ( void *AMGhybrid_vdata , HYPRE_Int keepT );
-HYPRE_Int hypre_AMGHybridSetSplittingStrategy( void *AMGhybrid_vdata , HYPRE_Int splitting_strategy );
-HYPRE_Int hypre_AMGHybridSetCycleRelaxType ( void *AMGhybrid_vdata , HYPRE_Int relax_type , HYPRE_Int k );
-HYPRE_Int hypre_AMGHybridSetRelaxOrder ( void *AMGhybrid_vdata , HYPRE_Int relax_order );
-HYPRE_Int hypre_AMGHybridSetMaxCoarseSize ( void *AMGhybrid_vdata , HYPRE_Int max_coarse_size );
-HYPRE_Int hypre_AMGHybridSetMinCoarseSize ( void *AMGhybrid_vdata , HYPRE_Int min_coarse_size );
-HYPRE_Int hypre_AMGHybridSetSeqThreshold ( void *AMGhybrid_vdata , HYPRE_Int seq_threshold );
-HYPRE_Int hypre_AMGHybridSetNumGridSweeps ( void *AMGhybrid_vdata , HYPRE_Int *num_grid_sweeps );
-HYPRE_Int hypre_AMGHybridSetGridRelaxType ( void *AMGhybrid_vdata , HYPRE_Int *grid_relax_type );
-HYPRE_Int hypre_AMGHybridSetGridRelaxPoints ( void *AMGhybrid_vdata , HYPRE_Int **grid_relax_points );
-HYPRE_Int hypre_AMGHybridSetRelaxWeight ( void *AMGhybrid_vdata , HYPRE_Real *relax_weight );
-HYPRE_Int hypre_AMGHybridSetOmega ( void *AMGhybrid_vdata , HYPRE_Real *omega );
-HYPRE_Int hypre_AMGHybridSetRelaxWt ( void *AMGhybrid_vdata , HYPRE_Real relax_wt );
-HYPRE_Int hypre_AMGHybridSetLevelRelaxWt ( void *AMGhybrid_vdata , HYPRE_Real relax_wt , HYPRE_Int level );
-HYPRE_Int hypre_AMGHybridSetOuterWt ( void *AMGhybrid_vdata , HYPRE_Real outer_wt );
-HYPRE_Int hypre_AMGHybridSetLevelOuterWt ( void *AMGhybrid_vdata , HYPRE_Real outer_wt , HYPRE_Int level );
-HYPRE_Int hypre_AMGHybridSetNumPaths ( void *AMGhybrid_vdata , HYPRE_Int num_paths );
-HYPRE_Int hypre_AMGHybridSetDofFunc ( void *AMGhybrid_vdata , HYPRE_Int *dof_func );
-HYPRE_Int hypre_AMGHybridSetAggNumLevels ( void *AMGhybrid_vdata , HYPRE_Int agg_num_levels );
-HYPRE_Int hypre_AMGHybridSetAggInterpType ( void *AMGhybrid_vdata , HYPRE_Int agg_interp_type );
-HYPRE_Int hypre_AMGHybridSetNumFunctions ( void *AMGhybrid_vdata , HYPRE_Int num_functions );
-HYPRE_Int hypre_AMGHybridSetNodal ( void *AMGhybrid_vdata , HYPRE_Int nodal );
+HYPRE_Int hypre_AMGHybridSetTol ( void *AMGhybrid_vdata, HYPRE_Real tol );
+HYPRE_Int hypre_AMGHybridSetAbsoluteTol ( void *AMGhybrid_vdata, HYPRE_Real a_tol );
+HYPRE_Int hypre_AMGHybridSetConvergenceTol ( void *AMGhybrid_vdata, HYPRE_Real cf_tol );
+HYPRE_Int hypre_AMGHybridSetNonGalerkinTol ( void *AMGhybrid_vdata, HYPRE_Int nongalerk_num_tol,
+                                             HYPRE_Real *nongalerkin_tol );
+HYPRE_Int hypre_AMGHybridSetDSCGMaxIter ( void *AMGhybrid_vdata, HYPRE_Int dscg_max_its );
+HYPRE_Int hypre_AMGHybridSetPCGMaxIter ( void *AMGhybrid_vdata, HYPRE_Int pcg_max_its );
+HYPRE_Int hypre_AMGHybridSetSetupType ( void *AMGhybrid_vdata, HYPRE_Int setup_type );
+HYPRE_Int hypre_AMGHybridSetSolverType ( void *AMGhybrid_vdata, HYPRE_Int solver_type );
+HYPRE_Int hypre_AMGHybridSetRecomputeResidual ( void *AMGhybrid_vdata,
+                                                HYPRE_Int recompute_residual );
+HYPRE_Int hypre_AMGHybridGetRecomputeResidual ( void *AMGhybrid_vdata,
+                                                HYPRE_Int *recompute_residual );
+HYPRE_Int hypre_AMGHybridSetRecomputeResidualP ( void *AMGhybrid_vdata,
+                                                 HYPRE_Int recompute_residual_p );
+HYPRE_Int hypre_AMGHybridGetRecomputeResidualP ( void *AMGhybrid_vdata,
+                                                 HYPRE_Int *recompute_residual_p );
+HYPRE_Int hypre_AMGHybridSetKDim ( void *AMGhybrid_vdata, HYPRE_Int k_dim );
+HYPRE_Int hypre_AMGHybridSetStopCrit ( void *AMGhybrid_vdata, HYPRE_Int stop_crit );
+HYPRE_Int hypre_AMGHybridSetTwoNorm ( void *AMGhybrid_vdata, HYPRE_Int two_norm );
+HYPRE_Int hypre_AMGHybridSetRelChange ( void *AMGhybrid_vdata, HYPRE_Int rel_change );
+HYPRE_Int hypre_AMGHybridSetPrecond ( void *pcg_vdata, HYPRE_Int (*pcg_precond_solve )(void*, void*,
+                                                                                       void*, void*), HYPRE_Int (*pcg_precond_setup )(void*, void*, void*, void*), void *pcg_precond );
+HYPRE_Int hypre_AMGHybridSetLogging ( void *AMGhybrid_vdata, HYPRE_Int logging );
+HYPRE_Int hypre_AMGHybridSetPrintLevel ( void *AMGhybrid_vdata, HYPRE_Int print_level );
+HYPRE_Int hypre_AMGHybridSetStrongThreshold ( void *AMGhybrid_vdata, HYPRE_Real strong_threshold );
+HYPRE_Int hypre_AMGHybridSetMaxRowSum ( void *AMGhybrid_vdata, HYPRE_Real max_row_sum );
+HYPRE_Int hypre_AMGHybridSetTruncFactor ( void *AMGhybrid_vdata, HYPRE_Real trunc_factor );
+HYPRE_Int hypre_AMGHybridSetPMaxElmts ( void *AMGhybrid_vdata, HYPRE_Int P_max_elmts );
+HYPRE_Int hypre_AMGHybridSetMaxLevels ( void *AMGhybrid_vdata, HYPRE_Int max_levels );
+HYPRE_Int hypre_AMGHybridSetMeasureType ( void *AMGhybrid_vdata, HYPRE_Int measure_type );
+HYPRE_Int hypre_AMGHybridSetCoarsenType ( void *AMGhybrid_vdata, HYPRE_Int coarsen_type );
+HYPRE_Int hypre_AMGHybridSetInterpType ( void *AMGhybrid_vdata, HYPRE_Int interp_type );
+HYPRE_Int hypre_AMGHybridSetCycleType ( void *AMGhybrid_vdata, HYPRE_Int cycle_type );
+HYPRE_Int hypre_AMGHybridSetNumSweeps ( void *AMGhybrid_vdata, HYPRE_Int num_sweeps );
+HYPRE_Int hypre_AMGHybridSetCycleNumSweeps ( void *AMGhybrid_vdata, HYPRE_Int num_sweeps,
+                                             HYPRE_Int k );
+HYPRE_Int hypre_AMGHybridSetRelaxType ( void *AMGhybrid_vdata, HYPRE_Int relax_type );
+HYPRE_Int hypre_AMGHybridSetKeepTranspose ( void *AMGhybrid_vdata, HYPRE_Int keepT );
+HYPRE_Int hypre_AMGHybridSetSplittingStrategy( void *AMGhybrid_vdata,
+                                               HYPRE_Int splitting_strategy );
+HYPRE_Int hypre_AMGHybridSetCycleRelaxType ( void *AMGhybrid_vdata, HYPRE_Int relax_type,
+                                             HYPRE_Int k );
+HYPRE_Int hypre_AMGHybridSetRelaxOrder ( void *AMGhybrid_vdata, HYPRE_Int relax_order );
+HYPRE_Int hypre_AMGHybridSetMaxCoarseSize ( void *AMGhybrid_vdata, HYPRE_Int max_coarse_size );
+HYPRE_Int hypre_AMGHybridSetMinCoarseSize ( void *AMGhybrid_vdata, HYPRE_Int min_coarse_size );
+HYPRE_Int hypre_AMGHybridSetSeqThreshold ( void *AMGhybrid_vdata, HYPRE_Int seq_threshold );
+HYPRE_Int hypre_AMGHybridSetNumGridSweeps ( void *AMGhybrid_vdata, HYPRE_Int *num_grid_sweeps );
+HYPRE_Int hypre_AMGHybridSetGridRelaxType ( void *AMGhybrid_vdata, HYPRE_Int *grid_relax_type );
+HYPRE_Int hypre_AMGHybridSetGridRelaxPoints ( void *AMGhybrid_vdata,
+                                              HYPRE_Int **grid_relax_points );
+HYPRE_Int hypre_AMGHybridSetRelaxWeight ( void *AMGhybrid_vdata, HYPRE_Real *relax_weight );
+HYPRE_Int hypre_AMGHybridSetOmega ( void *AMGhybrid_vdata, HYPRE_Real *omega );
+HYPRE_Int hypre_AMGHybridSetRelaxWt ( void *AMGhybrid_vdata, HYPRE_Real relax_wt );
+HYPRE_Int hypre_AMGHybridSetLevelRelaxWt ( void *AMGhybrid_vdata, HYPRE_Real relax_wt,
+                                           HYPRE_Int level );
+HYPRE_Int hypre_AMGHybridSetOuterWt ( void *AMGhybrid_vdata, HYPRE_Real outer_wt );
+HYPRE_Int hypre_AMGHybridSetLevelOuterWt ( void *AMGhybrid_vdata, HYPRE_Real outer_wt,
+                                           HYPRE_Int level );
+HYPRE_Int hypre_AMGHybridSetNumPaths ( void *AMGhybrid_vdata, HYPRE_Int num_paths );
+HYPRE_Int hypre_AMGHybridSetDofFunc ( void *AMGhybrid_vdata, HYPRE_Int *dof_func );
+HYPRE_Int hypre_AMGHybridSetAggNumLevels ( void *AMGhybrid_vdata, HYPRE_Int agg_num_levels );
+HYPRE_Int hypre_AMGHybridSetAggInterpType ( void *AMGhybrid_vdata, HYPRE_Int agg_interp_type );
+HYPRE_Int hypre_AMGHybridSetNumFunctions ( void *AMGhybrid_vdata, HYPRE_Int num_functions );
+HYPRE_Int hypre_AMGHybridSetNodal ( void *AMGhybrid_vdata, HYPRE_Int nodal );
 HYPRE_Int hypre_AMGHybridGetSetupSolveTime( void *AMGhybrid_vdata, HYPRE_Real *time );
-HYPRE_Int hypre_AMGHybridGetNumIterations ( void *AMGhybrid_vdata , HYPRE_Int *num_its );
-HYPRE_Int hypre_AMGHybridGetDSCGNumIterations ( void *AMGhybrid_vdata , HYPRE_Int *dscg_num_its );
-HYPRE_Int hypre_AMGHybridGetPCGNumIterations ( void *AMGhybrid_vdata , HYPRE_Int *pcg_num_its );
-HYPRE_Int hypre_AMGHybridGetFinalRelativeResidualNorm ( void *AMGhybrid_vdata , HYPRE_Real *final_rel_res_norm );
-HYPRE_Int hypre_AMGHybridSetup ( void *AMGhybrid_vdata , hypre_ParCSRMatrix *A , hypre_ParVector *b , hypre_ParVector *x );
-HYPRE_Int hypre_AMGHybridSolve ( void *AMGhybrid_vdata , hypre_ParCSRMatrix *A , hypre_ParVector *b , hypre_ParVector *x );
+HYPRE_Int hypre_AMGHybridGetNumIterations ( void *AMGhybrid_vdata, HYPRE_Int *num_its );
+HYPRE_Int hypre_AMGHybridGetDSCGNumIterations ( void *AMGhybrid_vdata, HYPRE_Int *dscg_num_its );
+HYPRE_Int hypre_AMGHybridGetPCGNumIterations ( void *AMGhybrid_vdata, HYPRE_Int *pcg_num_its );
+HYPRE_Int hypre_AMGHybridGetFinalRelativeResidualNorm ( void *AMGhybrid_vdata,
+                                                        HYPRE_Real *final_rel_res_norm );
+HYPRE_Int hypre_AMGHybridSetup ( void *AMGhybrid_vdata, hypre_ParCSRMatrix *A, hypre_ParVector *b,
+                                 hypre_ParVector *x );
+HYPRE_Int hypre_AMGHybridSolve ( void *AMGhybrid_vdata, hypre_ParCSRMatrix *A, hypre_ParVector *b,
+                                 hypre_ParVector *x );
 
 /* ams.c */
-HYPRE_Int hypre_ParCSRRelax ( hypre_ParCSRMatrix *A , hypre_ParVector *f , HYPRE_Int relax_type , HYPRE_Int relax_times , HYPRE_Real *l1_norms , HYPRE_Real relax_weight , HYPRE_Real omega , HYPRE_Real max_eig_est , HYPRE_Real min_eig_est , HYPRE_Int cheby_order , HYPRE_Real cheby_fraction , hypre_ParVector *u , hypre_ParVector *v , hypre_ParVector *z );
+HYPRE_Int hypre_ParCSRRelax ( hypre_ParCSRMatrix *A, hypre_ParVector *f, HYPRE_Int relax_type,
+                              HYPRE_Int relax_times, HYPRE_Real *l1_norms, HYPRE_Real relax_weight, HYPRE_Real omega,
+                              HYPRE_Real max_eig_est, HYPRE_Real min_eig_est, HYPRE_Int cheby_order, HYPRE_Real cheby_fraction,
+                              hypre_ParVector *u, hypre_ParVector *v, hypre_ParVector *z );
 hypre_ParVector *hypre_ParVectorInRangeOf ( hypre_ParCSRMatrix *A );
 hypre_ParVector *hypre_ParVectorInDomainOf ( hypre_ParCSRMatrix *A );
-HYPRE_Int hypre_ParVectorBlockSplit ( hypre_ParVector *x , hypre_ParVector *x_ [3 ], HYPRE_Int dim );
-HYPRE_Int hypre_ParVectorBlockGather ( hypre_ParVector *x , hypre_ParVector *x_ [3 ], HYPRE_Int dim );
-HYPRE_Int hypre_BoomerAMGBlockSolve ( void *B , hypre_ParCSRMatrix *A , hypre_ParVector *b , hypre_ParVector *x );
+HYPRE_Int hypre_ParVectorBlockSplit ( hypre_ParVector *x, hypre_ParVector *x_ [3 ], HYPRE_Int dim );
+HYPRE_Int hypre_ParVectorBlockGather ( hypre_ParVector *x, hypre_ParVector *x_ [3 ],
+                                       HYPRE_Int dim );
+HYPRE_Int hypre_BoomerAMGBlockSolve ( void *B, hypre_ParCSRMatrix *A, hypre_ParVector *b,
+                                      hypre_ParVector *x );
 HYPRE_Int hypre_ParCSRMatrixFixZeroRows ( hypre_ParCSRMatrix *A );
-HYPRE_Int hypre_ParCSRComputeL1Norms ( hypre_ParCSRMatrix *A , HYPRE_Int option , HYPRE_Int *cf_marker , HYPRE_Real **l1_norm_ptr );
-HYPRE_Int hypre_ParCSRMatrixSetDiagRows ( hypre_ParCSRMatrix *A , HYPRE_Real d );
+HYPRE_Int hypre_ParCSRComputeL1Norms ( hypre_ParCSRMatrix *A, HYPRE_Int option,
+                                       HYPRE_Int *cf_marker, HYPRE_Real **l1_norm_ptr );
+HYPRE_Int hypre_ParCSRMatrixSetDiagRows ( hypre_ParCSRMatrix *A, HYPRE_Real d );
 void *hypre_AMSCreate ( void );
 HYPRE_Int hypre_AMSDestroy ( void *solver );
-HYPRE_Int hypre_AMSSetDimension ( void *solver , HYPRE_Int dim );
-HYPRE_Int hypre_AMSSetDiscreteGradient ( void *solver , hypre_ParCSRMatrix *G );
-HYPRE_Int hypre_AMSSetCoordinateVectors ( void *solver , hypre_ParVector *x , hypre_ParVector *y , hypre_ParVector *z );
-HYPRE_Int hypre_AMSSetEdgeConstantVectors ( void *solver , hypre_ParVector *Gx , hypre_ParVector *Gy , hypre_ParVector *Gz );
-HYPRE_Int hypre_AMSSetInterpolations ( void *solver , hypre_ParCSRMatrix *Pi , hypre_ParCSRMatrix *Pix , hypre_ParCSRMatrix *Piy , hypre_ParCSRMatrix *Piz );
-HYPRE_Int hypre_AMSSetAlphaPoissonMatrix ( void *solver , hypre_ParCSRMatrix *A_Pi );
-HYPRE_Int hypre_AMSSetBetaPoissonMatrix ( void *solver , hypre_ParCSRMatrix *A_G );
-HYPRE_Int hypre_AMSSetInteriorNodes ( void *solver , hypre_ParVector *interior_nodes );
-HYPRE_Int hypre_AMSSetProjectionFrequency ( void *solver , HYPRE_Int projection_frequency );
-HYPRE_Int hypre_AMSSetMaxIter ( void *solver , HYPRE_Int maxit );
-HYPRE_Int hypre_AMSSetTol ( void *solver , HYPRE_Real tol );
-HYPRE_Int hypre_AMSSetCycleType ( void *solver , HYPRE_Int cycle_type );
-HYPRE_Int hypre_AMSSetPrintLevel ( void *solver , HYPRE_Int print_level );
-HYPRE_Int hypre_AMSSetSmoothingOptions ( void *solver , HYPRE_Int A_relax_type , HYPRE_Int A_relax_times , HYPRE_Real A_relax_weight , HYPRE_Real A_omega );
-HYPRE_Int hypre_AMSSetChebySmoothingOptions ( void *solver , HYPRE_Int A_cheby_order , HYPRE_Int A_cheby_fraction );
-HYPRE_Int hypre_AMSSetAlphaAMGOptions ( void *solver , HYPRE_Int B_Pi_coarsen_type , HYPRE_Int B_Pi_agg_levels , HYPRE_Int B_Pi_relax_type , HYPRE_Real B_Pi_theta , HYPRE_Int B_Pi_interp_type , HYPRE_Int B_Pi_Pmax );
-HYPRE_Int hypre_AMSSetAlphaAMGCoarseRelaxType ( void *solver , HYPRE_Int B_Pi_coarse_relax_type );
-HYPRE_Int hypre_AMSSetBetaAMGOptions ( void *solver , HYPRE_Int B_G_coarsen_type , HYPRE_Int B_G_agg_levels , HYPRE_Int B_G_relax_type , HYPRE_Real B_G_theta , HYPRE_Int B_G_interp_type , HYPRE_Int B_G_Pmax );
-HYPRE_Int hypre_AMSSetBetaAMGCoarseRelaxType ( void *solver , HYPRE_Int B_G_coarse_relax_type );
-HYPRE_Int hypre_AMSComputePi ( hypre_ParCSRMatrix *A , hypre_ParCSRMatrix *G , hypre_ParVector *Gx , hypre_ParVector *Gy , hypre_ParVector *Gz , HYPRE_Int dim , hypre_ParCSRMatrix **Pi_ptr );
-HYPRE_Int hypre_AMSComputePixyz ( hypre_ParCSRMatrix *A , hypre_ParCSRMatrix *G , hypre_ParVector *Gx , hypre_ParVector *Gy , hypre_ParVector *Gz , HYPRE_Int dim , hypre_ParCSRMatrix **Pix_ptr , hypre_ParCSRMatrix **Piy_ptr , hypre_ParCSRMatrix **Piz_ptr );
-HYPRE_Int hypre_AMSComputeGPi ( hypre_ParCSRMatrix *A , hypre_ParCSRMatrix *G , hypre_ParVector *Gx , hypre_ParVector *Gy , hypre_ParVector *Gz , HYPRE_Int dim , hypre_ParCSRMatrix **GPi_ptr );
-HYPRE_Int hypre_AMSSetup ( void *solver , hypre_ParCSRMatrix *A , hypre_ParVector *b , hypre_ParVector *x );
-HYPRE_Int hypre_AMSSolve ( void *solver , hypre_ParCSRMatrix *A , hypre_ParVector *b , hypre_ParVector *x );
-HYPRE_Int hypre_ParCSRSubspacePrec ( hypre_ParCSRMatrix *A0 , HYPRE_Int A0_relax_type , HYPRE_Int A0_relax_times , HYPRE_Real *A0_l1_norms , HYPRE_Real A0_relax_weight , HYPRE_Real A0_omega , HYPRE_Real A0_max_eig_est , HYPRE_Real A0_min_eig_est , HYPRE_Int A0_cheby_order , HYPRE_Real A0_cheby_fraction , hypre_ParCSRMatrix **A , HYPRE_Solver *B , HYPRE_PtrToSolverFcn *HB , hypre_ParCSRMatrix **P , hypre_ParVector **r , hypre_ParVector **g , hypre_ParVector *x , hypre_ParVector *y , hypre_ParVector *r0 , hypre_ParVector *g0 , char *cycle , hypre_ParVector *z );
-HYPRE_Int hypre_AMSGetNumIterations ( void *solver , HYPRE_Int *num_iterations );
-HYPRE_Int hypre_AMSGetFinalRelativeResidualNorm ( void *solver , HYPRE_Real *rel_resid_norm );
-HYPRE_Int hypre_AMSProjectOutGradients ( void *solver , hypre_ParVector *x );
-HYPRE_Int hypre_AMSConstructDiscreteGradient ( hypre_ParCSRMatrix *A , hypre_ParVector *x_coord , HYPRE_BigInt *edge_vertex , HYPRE_Int edge_orientation , hypre_ParCSRMatrix **G_ptr );
-HYPRE_Int hypre_AMSFEISetup ( void *solver , hypre_ParCSRMatrix *A , hypre_ParVector *b , hypre_ParVector *x , HYPRE_Int num_vert , HYPRE_Int num_local_vert , HYPRE_BigInt *vert_number , HYPRE_Real *vert_coord , HYPRE_Int num_edges , HYPRE_BigInt *edge_vertex );
+HYPRE_Int hypre_AMSSetDimension ( void *solver, HYPRE_Int dim );
+HYPRE_Int hypre_AMSSetDiscreteGradient ( void *solver, hypre_ParCSRMatrix *G );
+HYPRE_Int hypre_AMSSetCoordinateVectors ( void *solver, hypre_ParVector *x, hypre_ParVector *y,
+                                          hypre_ParVector *z );
+HYPRE_Int hypre_AMSSetEdgeConstantVectors ( void *solver, hypre_ParVector *Gx, hypre_ParVector *Gy,
+                                            hypre_ParVector *Gz );
+HYPRE_Int hypre_AMSSetInterpolations ( void *solver, hypre_ParCSRMatrix *Pi,
+                                       hypre_ParCSRMatrix *Pix, hypre_ParCSRMatrix *Piy, hypre_ParCSRMatrix *Piz );
+HYPRE_Int hypre_AMSSetAlphaPoissonMatrix ( void *solver, hypre_ParCSRMatrix *A_Pi );
+HYPRE_Int hypre_AMSSetBetaPoissonMatrix ( void *solver, hypre_ParCSRMatrix *A_G );
+HYPRE_Int hypre_AMSSetInteriorNodes ( void *solver, hypre_ParVector *interior_nodes );
+HYPRE_Int hypre_AMSSetProjectionFrequency ( void *solver, HYPRE_Int projection_frequency );
+HYPRE_Int hypre_AMSSetMaxIter ( void *solver, HYPRE_Int maxit );
+HYPRE_Int hypre_AMSSetTol ( void *solver, HYPRE_Real tol );
+HYPRE_Int hypre_AMSSetCycleType ( void *solver, HYPRE_Int cycle_type );
+HYPRE_Int hypre_AMSSetPrintLevel ( void *solver, HYPRE_Int print_level );
+HYPRE_Int hypre_AMSSetSmoothingOptions ( void *solver, HYPRE_Int A_relax_type,
+                                         HYPRE_Int A_relax_times, HYPRE_Real A_relax_weight, HYPRE_Real A_omega );
+HYPRE_Int hypre_AMSSetChebySmoothingOptions ( void *solver, HYPRE_Int A_cheby_order,
+                                              HYPRE_Real A_cheby_fraction );
+HYPRE_Int hypre_AMSSetAlphaAMGOptions ( void *solver, HYPRE_Int B_Pi_coarsen_type,
+                                        HYPRE_Int B_Pi_agg_levels, HYPRE_Int B_Pi_relax_type, HYPRE_Real B_Pi_theta,
+                                        HYPRE_Int B_Pi_interp_type, HYPRE_Int B_Pi_Pmax );
+HYPRE_Int hypre_AMSSetAlphaAMGCoarseRelaxType ( void *solver, HYPRE_Int B_Pi_coarse_relax_type );
+HYPRE_Int hypre_AMSSetBetaAMGOptions ( void *solver, HYPRE_Int B_G_coarsen_type,
+                                       HYPRE_Int B_G_agg_levels, HYPRE_Int B_G_relax_type, HYPRE_Real B_G_theta, HYPRE_Int B_G_interp_type,
+                                       HYPRE_Int B_G_Pmax );
+HYPRE_Int hypre_AMSSetBetaAMGCoarseRelaxType ( void *solver, HYPRE_Int B_G_coarse_relax_type );
+HYPRE_Int hypre_AMSComputePi ( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *G, hypre_ParVector *Gx,
+                               hypre_ParVector *Gy, hypre_ParVector *Gz, HYPRE_Int dim, hypre_ParCSRMatrix **Pi_ptr );
+HYPRE_Int hypre_AMSComputePixyz ( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *G, hypre_ParVector *Gx,
+                                  hypre_ParVector *Gy, hypre_ParVector *Gz, HYPRE_Int dim, hypre_ParCSRMatrix **Pix_ptr,
+                                  hypre_ParCSRMatrix **Piy_ptr, hypre_ParCSRMatrix **Piz_ptr );
+HYPRE_Int hypre_AMSComputeGPi ( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *G, hypre_ParVector *Gx,
+                                hypre_ParVector *Gy, hypre_ParVector *Gz, HYPRE_Int dim, hypre_ParCSRMatrix **GPi_ptr );
+HYPRE_Int hypre_AMSSetup ( void *solver, hypre_ParCSRMatrix *A, hypre_ParVector *b,
+                           hypre_ParVector *x );
+HYPRE_Int hypre_AMSSolve ( void *solver, hypre_ParCSRMatrix *A, hypre_ParVector *b,
+                           hypre_ParVector *x );
+HYPRE_Int hypre_ParCSRSubspacePrec ( hypre_ParCSRMatrix *A0, HYPRE_Int A0_relax_type,
+                                     HYPRE_Int A0_relax_times, HYPRE_Real *A0_l1_norms, HYPRE_Real A0_relax_weight, HYPRE_Real A0_omega,
+                                     HYPRE_Real A0_max_eig_est, HYPRE_Real A0_min_eig_est, HYPRE_Int A0_cheby_order,
+                                     HYPRE_Real A0_cheby_fraction, hypre_ParCSRMatrix **A, HYPRE_Solver *B, HYPRE_PtrToSolverFcn *HB,
+                                     hypre_ParCSRMatrix **P, hypre_ParVector **r, hypre_ParVector **g, hypre_ParVector *x,
+                                     hypre_ParVector *y, hypre_ParVector *r0, hypre_ParVector *g0, char *cycle, hypre_ParVector *z );
+HYPRE_Int hypre_AMSGetNumIterations ( void *solver, HYPRE_Int *num_iterations );
+HYPRE_Int hypre_AMSGetFinalRelativeResidualNorm ( void *solver, HYPRE_Real *rel_resid_norm );
+HYPRE_Int hypre_AMSProjectOutGradients ( void *solver, hypre_ParVector *x );
+HYPRE_Int hypre_AMSConstructDiscreteGradient ( hypre_ParCSRMatrix *A, hypre_ParVector *x_coord,
+                                               HYPRE_BigInt *edge_vertex, HYPRE_Int edge_orientation, hypre_ParCSRMatrix **G_ptr );
+HYPRE_Int hypre_AMSFEISetup ( void *solver, hypre_ParCSRMatrix *A, hypre_ParVector *b,
+                              hypre_ParVector *x, HYPRE_Int num_vert, HYPRE_Int num_local_vert, HYPRE_BigInt *vert_number,
+                              HYPRE_Real *vert_coord, HYPRE_Int num_edges, HYPRE_BigInt *edge_vertex );
 HYPRE_Int hypre_AMSFEIDestroy ( void *solver );
-HYPRE_Int hypre_ParCSRComputeL1NormsThreads ( hypre_ParCSRMatrix *A , HYPRE_Int option , HYPRE_Int num_threads , HYPRE_Int *cf_marker , HYPRE_Real **l1_norm_ptr );
+HYPRE_Int hypre_ParCSRComputeL1NormsThreads ( hypre_ParCSRMatrix *A, HYPRE_Int option,
+                                              HYPRE_Int num_threads, HYPRE_Int *cf_marker, HYPRE_Real **l1_norm_ptr );
 
 /* aux_interp.c */
-HYPRE_Int hypre_alt_insert_new_nodes ( hypre_ParCSRCommPkg *comm_pkg , hypre_ParCSRCommPkg *extend_comm_pkg , HYPRE_Int *IN_marker , HYPRE_Int full_off_procNodes , HYPRE_Int *OUT_marker );
-HYPRE_Int hypre_big_insert_new_nodes ( hypre_ParCSRCommPkg *comm_pkg , hypre_ParCSRCommPkg *extend_comm_pkg , HYPRE_Int *IN_marker , HYPRE_Int full_off_procNodes , HYPRE_BigInt offset , HYPRE_BigInt *OUT_marker );
-HYPRE_Int hypre_ssort ( HYPRE_BigInt *data , HYPRE_Int n );
-HYPRE_Int hypre_index_of_minimum ( HYPRE_BigInt *data , HYPRE_Int n );
-void hypre_swap_int ( HYPRE_BigInt *data , HYPRE_Int a , HYPRE_Int b );
-void hypre_initialize_vecs ( HYPRE_Int diag_n , HYPRE_Int offd_n , HYPRE_Int *diag_ftc , HYPRE_BigInt *offd_ftc , HYPRE_Int *diag_pm , HYPRE_Int *offd_pm , HYPRE_Int *tmp_CF );
+HYPRE_Int hypre_alt_insert_new_nodes ( hypre_ParCSRCommPkg *comm_pkg,
+                                       hypre_ParCSRCommPkg *extend_comm_pkg, HYPRE_Int *IN_marker, HYPRE_Int full_off_procNodes,
+                                       HYPRE_Int *OUT_marker );
+HYPRE_Int hypre_big_insert_new_nodes ( hypre_ParCSRCommPkg *comm_pkg,
+                                       hypre_ParCSRCommPkg *extend_comm_pkg, HYPRE_Int *IN_marker, HYPRE_Int full_off_procNodes,
+                                       HYPRE_BigInt offset, HYPRE_BigInt *OUT_marker );
+HYPRE_Int hypre_ssort ( HYPRE_BigInt *data, HYPRE_Int n );
+HYPRE_Int hypre_index_of_minimum ( HYPRE_BigInt *data, HYPRE_Int n );
+void hypre_swap_int ( HYPRE_BigInt *data, HYPRE_Int a, HYPRE_Int b );
+void hypre_initialize_vecs ( HYPRE_Int diag_n, HYPRE_Int offd_n, HYPRE_Int *diag_ftc,
+                             HYPRE_BigInt *offd_ftc, HYPRE_Int *diag_pm, HYPRE_Int *offd_pm, HYPRE_Int *tmp_CF );
 /*HYPRE_Int hypre_new_offd_nodes(HYPRE_Int **found , HYPRE_Int num_cols_A_offd , HYPRE_Int *A_ext_i , HYPRE_Int *A_ext_j, HYPRE_Int num_cols_S_offd, HYPRE_Int *col_map_offd, HYPRE_Int col_1, HYPRE_Int col_n, HYPRE_Int *Sop_i, HYPRE_Int *Sop_j, HYPRE_Int *CF_marker_offd );*/
-HYPRE_Int hypre_exchange_marker(hypre_ParCSRCommPkg *comm_pkg, HYPRE_Int *IN_marker, HYPRE_Int *OUT_marker);
-HYPRE_Int hypre_exchange_interp_data( HYPRE_Int **CF_marker_offd, HYPRE_Int **dof_func_offd, hypre_CSRMatrix **A_ext, HYPRE_Int *full_off_procNodes, hypre_CSRMatrix **Sop, hypre_ParCSRCommPkg **extend_comm_pkg, hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker, hypre_ParCSRMatrix *S, HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int skip_fine_or_same_sign);
-void hypre_build_interp_colmap(hypre_ParCSRMatrix *P, HYPRE_Int full_off_procNodes, HYPRE_Int *tmp_CF_marker_offd, HYPRE_BigInt *fine_to_coarse_offd);
+HYPRE_Int hypre_exchange_marker(hypre_ParCSRCommPkg *comm_pkg, HYPRE_Int *IN_marker,
+                                HYPRE_Int *OUT_marker);
+HYPRE_Int hypre_exchange_interp_data( HYPRE_Int **CF_marker_offd, HYPRE_Int **dof_func_offd,
+                                      hypre_CSRMatrix **A_ext, HYPRE_Int *full_off_procNodes, hypre_CSRMatrix **Sop,
+                                      hypre_ParCSRCommPkg **extend_comm_pkg, hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                      hypre_ParCSRMatrix *S, HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                      HYPRE_Int skip_fine_or_same_sign);
+void hypre_build_interp_colmap(hypre_ParCSRMatrix *P, HYPRE_Int full_off_procNodes,
+                               HYPRE_Int *tmp_CF_marker_offd, HYPRE_BigInt *fine_to_coarse_offd);
 
 /* block_tridiag.c */
 void *hypre_BlockTridiagCreate ( void );
 HYPRE_Int hypre_BlockTridiagDestroy ( void *data );
-HYPRE_Int hypre_BlockTridiagSetup ( void *data , hypre_ParCSRMatrix *A , hypre_ParVector *b , hypre_ParVector *x );
-HYPRE_Int hypre_BlockTridiagSolve ( void *data , hypre_ParCSRMatrix *A , hypre_ParVector *b , hypre_ParVector *x );
-HYPRE_Int hypre_BlockTridiagSetIndexSet ( void *data , HYPRE_Int n , HYPRE_Int *inds );
-HYPRE_Int hypre_BlockTridiagSetAMGStrengthThreshold ( void *data , HYPRE_Real thresh );
-HYPRE_Int hypre_BlockTridiagSetAMGNumSweeps ( void *data , HYPRE_Int nsweeps );
-HYPRE_Int hypre_BlockTridiagSetAMGRelaxType ( void *data , HYPRE_Int relax_type );
-HYPRE_Int hypre_BlockTridiagSetPrintLevel ( void *data , HYPRE_Int print_level );
+HYPRE_Int hypre_BlockTridiagSetup ( void *data, hypre_ParCSRMatrix *A, hypre_ParVector *b,
+                                    hypre_ParVector *x );
+HYPRE_Int hypre_BlockTridiagSolve ( void *data, hypre_ParCSRMatrix *A, hypre_ParVector *b,
+                                    hypre_ParVector *x );
+HYPRE_Int hypre_BlockTridiagSetIndexSet ( void *data, HYPRE_Int n, HYPRE_Int *inds );
+HYPRE_Int hypre_BlockTridiagSetAMGStrengthThreshold ( void *data, HYPRE_Real thresh );
+HYPRE_Int hypre_BlockTridiagSetAMGNumSweeps ( void *data, HYPRE_Int nsweeps );
+HYPRE_Int hypre_BlockTridiagSetAMGRelaxType ( void *data, HYPRE_Int relax_type );
+HYPRE_Int hypre_BlockTridiagSetPrintLevel ( void *data, HYPRE_Int print_level );
 
 /* driver.c */
-HYPRE_Int BuildParFromFile ( HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix *A_ptr );
-HYPRE_Int BuildParLaplacian ( HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix *A_ptr );
-HYPRE_Int BuildParDifConv ( HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix *A_ptr );
-HYPRE_Int BuildParFromOneFile ( HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix *A_ptr );
-HYPRE_Int BuildRhsParFromOneFile ( HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix A , HYPRE_ParVector *b_ptr );
-HYPRE_Int BuildParLaplacian9pt ( HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix *A_ptr );
-HYPRE_Int BuildParLaplacian27pt ( HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix *A_ptr );
+HYPRE_Int BuildParFromFile ( HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                             HYPRE_ParCSRMatrix *A_ptr );
+HYPRE_Int BuildParLaplacian ( HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                              HYPRE_ParCSRMatrix *A_ptr );
+HYPRE_Int BuildParDifConv ( HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                            HYPRE_ParCSRMatrix *A_ptr );
+HYPRE_Int BuildParFromOneFile ( HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                                HYPRE_ParCSRMatrix *A_ptr );
+HYPRE_Int BuildRhsParFromOneFile ( HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                                   HYPRE_ParCSRMatrix A, HYPRE_ParVector *b_ptr );
+HYPRE_Int BuildParLaplacian9pt ( HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                                 HYPRE_ParCSRMatrix *A_ptr );
+HYPRE_Int BuildParLaplacian27pt ( HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                                  HYPRE_ParCSRMatrix *A_ptr );
 
 /* gen_redcs_mat.c */
-HYPRE_Int hypre_seqAMGSetup ( hypre_ParAMGData *amg_data , HYPRE_Int p_level , HYPRE_Int coarse_threshold );
-HYPRE_Int hypre_seqAMGCycle ( hypre_ParAMGData *amg_data , HYPRE_Int p_level , hypre_ParVector **Par_F_array , hypre_ParVector **Par_U_array );
-HYPRE_Int hypre_GenerateSubComm ( MPI_Comm comm , HYPRE_Int participate , MPI_Comm *new_comm_ptr );
-void hypre_merge_lists ( HYPRE_Int *list1 , HYPRE_Int *list2 , hypre_int *np1 , hypre_MPI_Datatype *dptr );
+HYPRE_Int hypre_seqAMGSetup ( hypre_ParAMGData *amg_data, HYPRE_Int p_level,
+                              HYPRE_Int coarse_threshold );
+HYPRE_Int hypre_seqAMGCycle ( hypre_ParAMGData *amg_data, HYPRE_Int p_level,
+                              hypre_ParVector **Par_F_array, hypre_ParVector **Par_U_array );
+HYPRE_Int hypre_GenerateSubComm ( MPI_Comm comm, HYPRE_Int participate, MPI_Comm *new_comm_ptr );
+void hypre_merge_lists ( HYPRE_Int *list1, HYPRE_Int *list2, hypre_int *np1,
+                         hypre_MPI_Datatype *dptr );
 
 /* HYPRE_ads.c */
 HYPRE_Int HYPRE_ADSCreate ( HYPRE_Solver *solver );
 HYPRE_Int HYPRE_ADSDestroy ( HYPRE_Solver solver );
-HYPRE_Int HYPRE_ADSSetup ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_ADSSolve ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_ADSSetDiscreteCurl ( HYPRE_Solver solver , HYPRE_ParCSRMatrix C );
-HYPRE_Int HYPRE_ADSSetDiscreteGradient ( HYPRE_Solver solver , HYPRE_ParCSRMatrix G );
-HYPRE_Int HYPRE_ADSSetCoordinateVectors ( HYPRE_Solver solver , HYPRE_ParVector x , HYPRE_ParVector y , HYPRE_ParVector z );
-HYPRE_Int HYPRE_ADSSetInterpolations ( HYPRE_Solver solver , HYPRE_ParCSRMatrix RT_Pi , HYPRE_ParCSRMatrix RT_Pix , HYPRE_ParCSRMatrix RT_Piy , HYPRE_ParCSRMatrix RT_Piz , HYPRE_ParCSRMatrix ND_Pi , HYPRE_ParCSRMatrix ND_Pix , HYPRE_ParCSRMatrix ND_Piy , HYPRE_ParCSRMatrix ND_Piz );
-HYPRE_Int HYPRE_ADSSetMaxIter ( HYPRE_Solver solver , HYPRE_Int maxit );
-HYPRE_Int HYPRE_ADSSetTol ( HYPRE_Solver solver , HYPRE_Real tol );
-HYPRE_Int HYPRE_ADSSetCycleType ( HYPRE_Solver solver , HYPRE_Int cycle_type );
-HYPRE_Int HYPRE_ADSSetPrintLevel ( HYPRE_Solver solver , HYPRE_Int print_level );
-HYPRE_Int HYPRE_ADSSetSmoothingOptions ( HYPRE_Solver solver , HYPRE_Int relax_type , HYPRE_Int relax_times , HYPRE_Real relax_weight , HYPRE_Real omega );
-HYPRE_Int HYPRE_ADSSetChebySmoothingOptions ( HYPRE_Solver solver , HYPRE_Int cheby_order , HYPRE_Int cheby_fraction );
-HYPRE_Int HYPRE_ADSSetAMSOptions ( HYPRE_Solver solver , HYPRE_Int cycle_type , HYPRE_Int coarsen_type , HYPRE_Int agg_levels , HYPRE_Int relax_type , HYPRE_Real strength_threshold , HYPRE_Int interp_type , HYPRE_Int Pmax );
-HYPRE_Int HYPRE_ADSSetAMGOptions ( HYPRE_Solver solver , HYPRE_Int coarsen_type , HYPRE_Int agg_levels , HYPRE_Int relax_type , HYPRE_Real strength_threshold , HYPRE_Int interp_type , HYPRE_Int Pmax );
-HYPRE_Int HYPRE_ADSGetNumIterations ( HYPRE_Solver solver , HYPRE_Int *num_iterations );
-HYPRE_Int HYPRE_ADSGetFinalRelativeResidualNorm ( HYPRE_Solver solver , HYPRE_Real *rel_resid_norm );
+HYPRE_Int HYPRE_ADSSetup ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                           HYPRE_ParVector x );
+HYPRE_Int HYPRE_ADSSolve ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                           HYPRE_ParVector x );
+HYPRE_Int HYPRE_ADSSetDiscreteCurl ( HYPRE_Solver solver, HYPRE_ParCSRMatrix C );
+HYPRE_Int HYPRE_ADSSetDiscreteGradient ( HYPRE_Solver solver, HYPRE_ParCSRMatrix G );
+HYPRE_Int HYPRE_ADSSetCoordinateVectors ( HYPRE_Solver solver, HYPRE_ParVector x, HYPRE_ParVector y,
+                                          HYPRE_ParVector z );
+HYPRE_Int HYPRE_ADSSetInterpolations ( HYPRE_Solver solver, HYPRE_ParCSRMatrix RT_Pi,
+                                       HYPRE_ParCSRMatrix RT_Pix, HYPRE_ParCSRMatrix RT_Piy, HYPRE_ParCSRMatrix RT_Piz,
+                                       HYPRE_ParCSRMatrix ND_Pi, HYPRE_ParCSRMatrix ND_Pix, HYPRE_ParCSRMatrix ND_Piy,
+                                       HYPRE_ParCSRMatrix ND_Piz );
+HYPRE_Int HYPRE_ADSSetMaxIter ( HYPRE_Solver solver, HYPRE_Int maxit );
+HYPRE_Int HYPRE_ADSSetTol ( HYPRE_Solver solver, HYPRE_Real tol );
+HYPRE_Int HYPRE_ADSSetCycleType ( HYPRE_Solver solver, HYPRE_Int cycle_type );
+HYPRE_Int HYPRE_ADSSetPrintLevel ( HYPRE_Solver solver, HYPRE_Int print_level );
+HYPRE_Int HYPRE_ADSSetSmoothingOptions ( HYPRE_Solver solver, HYPRE_Int relax_type,
+                                         HYPRE_Int relax_times, HYPRE_Real relax_weight, HYPRE_Real omega );
+HYPRE_Int HYPRE_ADSSetChebySmoothingOptions ( HYPRE_Solver solver, HYPRE_Int cheby_order,
+                                              HYPRE_Real cheby_fraction );
+HYPRE_Int HYPRE_ADSSetAMSOptions ( HYPRE_Solver solver, HYPRE_Int cycle_type,
+                                   HYPRE_Int coarsen_type, HYPRE_Int agg_levels, HYPRE_Int relax_type, HYPRE_Real strength_threshold,
+                                   HYPRE_Int interp_type, HYPRE_Int Pmax );
+HYPRE_Int HYPRE_ADSSetAMGOptions ( HYPRE_Solver solver, HYPRE_Int coarsen_type,
+                                   HYPRE_Int agg_levels, HYPRE_Int relax_type, HYPRE_Real strength_threshold, HYPRE_Int interp_type,
+                                   HYPRE_Int Pmax );
+HYPRE_Int HYPRE_ADSGetNumIterations ( HYPRE_Solver solver, HYPRE_Int *num_iterations );
+HYPRE_Int HYPRE_ADSGetFinalRelativeResidualNorm ( HYPRE_Solver solver, HYPRE_Real *rel_resid_norm );
 
 /* HYPRE_ame.c */
 HYPRE_Int HYPRE_AMECreate ( HYPRE_Solver *esolver );
 HYPRE_Int HYPRE_AMEDestroy ( HYPRE_Solver esolver );
 HYPRE_Int HYPRE_AMESetup ( HYPRE_Solver esolver );
 HYPRE_Int HYPRE_AMESolve ( HYPRE_Solver esolver );
-HYPRE_Int HYPRE_AMESetAMSSolver ( HYPRE_Solver esolver , HYPRE_Solver ams_solver );
-HYPRE_Int HYPRE_AMESetMassMatrix ( HYPRE_Solver esolver , HYPRE_ParCSRMatrix M );
-HYPRE_Int HYPRE_AMESetBlockSize ( HYPRE_Solver esolver , HYPRE_Int block_size );
-HYPRE_Int HYPRE_AMESetMaxIter ( HYPRE_Solver esolver , HYPRE_Int maxit );
-HYPRE_Int HYPRE_AMESetTol ( HYPRE_Solver esolver , HYPRE_Real tol );
-HYPRE_Int HYPRE_AMESetRTol ( HYPRE_Solver esolver , HYPRE_Real tol );
-HYPRE_Int HYPRE_AMESetPrintLevel ( HYPRE_Solver esolver , HYPRE_Int print_level );
-HYPRE_Int HYPRE_AMEGetEigenvalues ( HYPRE_Solver esolver , HYPRE_Real **eigenvalues );
-HYPRE_Int HYPRE_AMEGetEigenvectors ( HYPRE_Solver esolver , HYPRE_ParVector **eigenvectors );
+HYPRE_Int HYPRE_AMESetAMSSolver ( HYPRE_Solver esolver, HYPRE_Solver ams_solver );
+HYPRE_Int HYPRE_AMESetMassMatrix ( HYPRE_Solver esolver, HYPRE_ParCSRMatrix M );
+HYPRE_Int HYPRE_AMESetBlockSize ( HYPRE_Solver esolver, HYPRE_Int block_size );
+HYPRE_Int HYPRE_AMESetMaxIter ( HYPRE_Solver esolver, HYPRE_Int maxit );
+HYPRE_Int HYPRE_AMESetMaxPCGIter ( HYPRE_Solver esolver, HYPRE_Int maxit );
+HYPRE_Int HYPRE_AMESetTol ( HYPRE_Solver esolver, HYPRE_Real tol );
+HYPRE_Int HYPRE_AMESetRTol ( HYPRE_Solver esolver, HYPRE_Real tol );
+HYPRE_Int HYPRE_AMESetPrintLevel ( HYPRE_Solver esolver, HYPRE_Int print_level );
+HYPRE_Int HYPRE_AMEGetEigenvalues ( HYPRE_Solver esolver, HYPRE_Real **eigenvalues );
+HYPRE_Int HYPRE_AMEGetEigenvectors ( HYPRE_Solver esolver, HYPRE_ParVector **eigenvectors );
 
 /* HYPRE_ams.c */
 HYPRE_Int HYPRE_AMSCreate ( HYPRE_Solver *solver );
 HYPRE_Int HYPRE_AMSDestroy ( HYPRE_Solver solver );
-HYPRE_Int HYPRE_AMSSetup ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_AMSSolve ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_AMSSetDimension ( HYPRE_Solver solver , HYPRE_Int dim );
-HYPRE_Int HYPRE_AMSSetDiscreteGradient ( HYPRE_Solver solver , HYPRE_ParCSRMatrix G );
-HYPRE_Int HYPRE_AMSSetCoordinateVectors ( HYPRE_Solver solver , HYPRE_ParVector x , HYPRE_ParVector y , HYPRE_ParVector z );
-HYPRE_Int HYPRE_AMSSetEdgeConstantVectors ( HYPRE_Solver solver , HYPRE_ParVector Gx , HYPRE_ParVector Gy , HYPRE_ParVector Gz );
-HYPRE_Int HYPRE_AMSSetInterpolations ( HYPRE_Solver solver , HYPRE_ParCSRMatrix Pi , HYPRE_ParCSRMatrix Pix , HYPRE_ParCSRMatrix Piy , HYPRE_ParCSRMatrix Piz );
-HYPRE_Int HYPRE_AMSSetAlphaPoissonMatrix ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A_alpha );
-HYPRE_Int HYPRE_AMSSetBetaPoissonMatrix ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A_beta );
-HYPRE_Int HYPRE_AMSSetInteriorNodes ( HYPRE_Solver solver , HYPRE_ParVector interior_nodes );
-HYPRE_Int HYPRE_AMSSetProjectionFrequency ( HYPRE_Solver solver , HYPRE_Int projection_frequency );
-HYPRE_Int HYPRE_AMSSetMaxIter ( HYPRE_Solver solver , HYPRE_Int maxit );
-HYPRE_Int HYPRE_AMSSetTol ( HYPRE_Solver solver , HYPRE_Real tol );
-HYPRE_Int HYPRE_AMSSetCycleType ( HYPRE_Solver solver , HYPRE_Int cycle_type );
-HYPRE_Int HYPRE_AMSSetPrintLevel ( HYPRE_Solver solver , HYPRE_Int print_level );
-HYPRE_Int HYPRE_AMSSetSmoothingOptions ( HYPRE_Solver solver , HYPRE_Int relax_type , HYPRE_Int relax_times , HYPRE_Real relax_weight , HYPRE_Real omega );
-HYPRE_Int HYPRE_AMSSetChebySmoothingOptions ( HYPRE_Solver solver , HYPRE_Int cheby_order , HYPRE_Int cheby_fraction );
-HYPRE_Int HYPRE_AMSSetAlphaAMGOptions ( HYPRE_Solver solver , HYPRE_Int alpha_coarsen_type , HYPRE_Int alpha_agg_levels , HYPRE_Int alpha_relax_type , HYPRE_Real alpha_strength_threshold , HYPRE_Int alpha_interp_type , HYPRE_Int alpha_Pmax );
-HYPRE_Int HYPRE_AMSSetAlphaAMGCoarseRelaxType ( HYPRE_Solver solver , HYPRE_Int alpha_coarse_relax_type );
-HYPRE_Int HYPRE_AMSSetBetaAMGOptions ( HYPRE_Solver solver , HYPRE_Int beta_coarsen_type , HYPRE_Int beta_agg_levels , HYPRE_Int beta_relax_type , HYPRE_Real beta_strength_threshold , HYPRE_Int beta_interp_type , HYPRE_Int beta_Pmax );
-HYPRE_Int HYPRE_AMSSetBetaAMGCoarseRelaxType ( HYPRE_Solver solver , HYPRE_Int beta_coarse_relax_type );
-HYPRE_Int HYPRE_AMSGetNumIterations ( HYPRE_Solver solver , HYPRE_Int *num_iterations );
-HYPRE_Int HYPRE_AMSGetFinalRelativeResidualNorm ( HYPRE_Solver solver , HYPRE_Real *rel_resid_norm );
-HYPRE_Int HYPRE_AMSProjectOutGradients ( HYPRE_Solver solver , HYPRE_ParVector x );
-HYPRE_Int HYPRE_AMSConstructDiscreteGradient ( HYPRE_ParCSRMatrix A , HYPRE_ParVector x_coord , HYPRE_BigInt *edge_vertex , HYPRE_Int edge_orientation , HYPRE_ParCSRMatrix *G );
-HYPRE_Int HYPRE_AMSFEISetup ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x , HYPRE_BigInt *EdgeNodeList_ , HYPRE_BigInt *NodeNumbers_ , HYPRE_Int numEdges_ , HYPRE_Int numLocalNodes_ , HYPRE_Int numNodes_ , HYPRE_Real *NodalCoord_ );
+HYPRE_Int HYPRE_AMSSetup ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                           HYPRE_ParVector x );
+HYPRE_Int HYPRE_AMSSolve ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                           HYPRE_ParVector x );
+HYPRE_Int HYPRE_AMSSetDimension ( HYPRE_Solver solver, HYPRE_Int dim );
+HYPRE_Int HYPRE_AMSSetDiscreteGradient ( HYPRE_Solver solver, HYPRE_ParCSRMatrix G );
+HYPRE_Int HYPRE_AMSSetCoordinateVectors ( HYPRE_Solver solver, HYPRE_ParVector x, HYPRE_ParVector y,
+                                          HYPRE_ParVector z );
+HYPRE_Int HYPRE_AMSSetEdgeConstantVectors ( HYPRE_Solver solver, HYPRE_ParVector Gx,
+                                            HYPRE_ParVector Gy, HYPRE_ParVector Gz );
+HYPRE_Int HYPRE_AMSSetInterpolations ( HYPRE_Solver solver, HYPRE_ParCSRMatrix Pi,
+                                       HYPRE_ParCSRMatrix Pix, HYPRE_ParCSRMatrix Piy, HYPRE_ParCSRMatrix Piz );
+HYPRE_Int HYPRE_AMSSetAlphaPoissonMatrix ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A_alpha );
+HYPRE_Int HYPRE_AMSSetBetaPoissonMatrix ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A_beta );
+HYPRE_Int HYPRE_AMSSetInteriorNodes ( HYPRE_Solver solver, HYPRE_ParVector interior_nodes );
+HYPRE_Int HYPRE_AMSSetProjectionFrequency ( HYPRE_Solver solver, HYPRE_Int projection_frequency );
+HYPRE_Int HYPRE_AMSSetMaxIter ( HYPRE_Solver solver, HYPRE_Int maxit );
+HYPRE_Int HYPRE_AMSSetTol ( HYPRE_Solver solver, HYPRE_Real tol );
+HYPRE_Int HYPRE_AMSSetCycleType ( HYPRE_Solver solver, HYPRE_Int cycle_type );
+HYPRE_Int HYPRE_AMSSetPrintLevel ( HYPRE_Solver solver, HYPRE_Int print_level );
+HYPRE_Int HYPRE_AMSSetSmoothingOptions ( HYPRE_Solver solver, HYPRE_Int relax_type,
+                                         HYPRE_Int relax_times, HYPRE_Real relax_weight, HYPRE_Real omega );
+HYPRE_Int HYPRE_AMSSetChebySmoothingOptions ( HYPRE_Solver solver, HYPRE_Int cheby_order,
+                                              HYPRE_Real cheby_fraction );
+HYPRE_Int HYPRE_AMSSetAlphaAMGOptions ( HYPRE_Solver solver, HYPRE_Int alpha_coarsen_type,
+                                        HYPRE_Int alpha_agg_levels, HYPRE_Int alpha_relax_type, HYPRE_Real alpha_strength_threshold,
+                                        HYPRE_Int alpha_interp_type, HYPRE_Int alpha_Pmax );
+HYPRE_Int HYPRE_AMSSetAlphaAMGCoarseRelaxType ( HYPRE_Solver solver,
+                                                HYPRE_Int alpha_coarse_relax_type );
+HYPRE_Int HYPRE_AMSSetBetaAMGOptions ( HYPRE_Solver solver, HYPRE_Int beta_coarsen_type,
+                                       HYPRE_Int beta_agg_levels, HYPRE_Int beta_relax_type, HYPRE_Real beta_strength_threshold,
+                                       HYPRE_Int beta_interp_type, HYPRE_Int beta_Pmax );
+HYPRE_Int HYPRE_AMSSetBetaAMGCoarseRelaxType ( HYPRE_Solver solver,
+                                               HYPRE_Int beta_coarse_relax_type );
+HYPRE_Int HYPRE_AMSGetNumIterations ( HYPRE_Solver solver, HYPRE_Int *num_iterations );
+HYPRE_Int HYPRE_AMSGetFinalRelativeResidualNorm ( HYPRE_Solver solver, HYPRE_Real *rel_resid_norm );
+HYPRE_Int HYPRE_AMSProjectOutGradients ( HYPRE_Solver solver, HYPRE_ParVector x );
+HYPRE_Int HYPRE_AMSConstructDiscreteGradient ( HYPRE_ParCSRMatrix A, HYPRE_ParVector x_coord,
+                                               HYPRE_BigInt *edge_vertex, HYPRE_Int edge_orientation, HYPRE_ParCSRMatrix *G );
+HYPRE_Int HYPRE_AMSFEISetup ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                              HYPRE_ParVector x, HYPRE_BigInt *EdgeNodeList_, HYPRE_BigInt *NodeNumbers_, HYPRE_Int numEdges_,
+                              HYPRE_Int numLocalNodes_, HYPRE_Int numNodes_, HYPRE_Real *NodalCoord_ );
 HYPRE_Int HYPRE_AMSFEIDestroy ( HYPRE_Solver solver );
 
 /* HYPRE_parcsr_amg.c */
 HYPRE_Int HYPRE_BoomerAMGCreate ( HYPRE_Solver *solver );
 HYPRE_Int HYPRE_BoomerAMGDestroy ( HYPRE_Solver solver );
-HYPRE_Int HYPRE_BoomerAMGSetup ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_BoomerAMGSolve ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_BoomerAMGSolveT ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_BoomerAMGSetRestriction ( HYPRE_Solver solver , HYPRE_Int restr_par );
-HYPRE_Int HYPRE_BoomerAMGSetIsTriangular ( HYPRE_Solver solver , HYPRE_Int is_triangular );
-HYPRE_Int HYPRE_BoomerAMGSetGMRESSwitchR ( HYPRE_Solver solver , HYPRE_Int gmres_switch );
-HYPRE_Int HYPRE_BoomerAMGSetMaxLevels ( HYPRE_Solver solver , HYPRE_Int max_levels );
-HYPRE_Int HYPRE_BoomerAMGGetMaxLevels ( HYPRE_Solver solver , HYPRE_Int *max_levels );
-HYPRE_Int HYPRE_BoomerAMGSetMaxCoarseSize ( HYPRE_Solver solver , HYPRE_Int max_coarse_size );
-HYPRE_Int HYPRE_BoomerAMGGetMaxCoarseSize ( HYPRE_Solver solver , HYPRE_Int *max_coarse_size );
-HYPRE_Int HYPRE_BoomerAMGSetMinCoarseSize ( HYPRE_Solver solver , HYPRE_Int min_coarse_size );
-HYPRE_Int HYPRE_BoomerAMGGetMinCoarseSize ( HYPRE_Solver solver , HYPRE_Int *min_coarse_size );
-HYPRE_Int HYPRE_BoomerAMGSetSeqThreshold ( HYPRE_Solver solver , HYPRE_Int seq_threshold );
-HYPRE_Int HYPRE_BoomerAMGGetSeqThreshold ( HYPRE_Solver solver , HYPRE_Int *seq_threshold );
-HYPRE_Int HYPRE_BoomerAMGSetRedundant ( HYPRE_Solver solver , HYPRE_Int redundant );
-HYPRE_Int HYPRE_BoomerAMGGetRedundant ( HYPRE_Solver solver , HYPRE_Int *redundant );
+HYPRE_Int HYPRE_BoomerAMGSetup ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                                 HYPRE_ParVector x );
+HYPRE_Int HYPRE_BoomerAMGSolve ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                                 HYPRE_ParVector x );
+HYPRE_Int HYPRE_BoomerAMGSolveT ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                                  HYPRE_ParVector x );
+HYPRE_Int HYPRE_BoomerAMGSetRestriction ( HYPRE_Solver solver, HYPRE_Int restr_par );
+HYPRE_Int HYPRE_BoomerAMGSetIsTriangular ( HYPRE_Solver solver, HYPRE_Int is_triangular );
+HYPRE_Int HYPRE_BoomerAMGSetGMRESSwitchR ( HYPRE_Solver solver, HYPRE_Int gmres_switch );
+HYPRE_Int HYPRE_BoomerAMGSetMaxLevels ( HYPRE_Solver solver, HYPRE_Int max_levels );
+HYPRE_Int HYPRE_BoomerAMGGetMaxLevels ( HYPRE_Solver solver, HYPRE_Int *max_levels );
+HYPRE_Int HYPRE_BoomerAMGSetMaxCoarseSize ( HYPRE_Solver solver, HYPRE_Int max_coarse_size );
+HYPRE_Int HYPRE_BoomerAMGGetMaxCoarseSize ( HYPRE_Solver solver, HYPRE_Int *max_coarse_size );
+HYPRE_Int HYPRE_BoomerAMGSetMinCoarseSize ( HYPRE_Solver solver, HYPRE_Int min_coarse_size );
+HYPRE_Int HYPRE_BoomerAMGGetMinCoarseSize ( HYPRE_Solver solver, HYPRE_Int *min_coarse_size );
+HYPRE_Int HYPRE_BoomerAMGSetSeqThreshold ( HYPRE_Solver solver, HYPRE_Int seq_threshold );
+HYPRE_Int HYPRE_BoomerAMGGetSeqThreshold ( HYPRE_Solver solver, HYPRE_Int *seq_threshold );
+HYPRE_Int HYPRE_BoomerAMGSetRedundant ( HYPRE_Solver solver, HYPRE_Int redundant );
+HYPRE_Int HYPRE_BoomerAMGGetRedundant ( HYPRE_Solver solver, HYPRE_Int *redundant );
 HYPRE_Int HYPRE_BoomerAMGSetCoarsenCutFactor( HYPRE_Solver solver, HYPRE_Int coarsen_cut_factor );
 HYPRE_Int HYPRE_BoomerAMGGetCoarsenCutFactor( HYPRE_Solver solver, HYPRE_Int *coarsen_cut_factor );
-HYPRE_Int HYPRE_BoomerAMGSetStrongThreshold ( HYPRE_Solver solver , HYPRE_Real strong_threshold );
-HYPRE_Int HYPRE_BoomerAMGGetStrongThreshold ( HYPRE_Solver solver , HYPRE_Real *strong_threshold );
-HYPRE_Int HYPRE_BoomerAMGSetStrongThresholdR ( HYPRE_Solver solver , HYPRE_Real strong_threshold );
-HYPRE_Int HYPRE_BoomerAMGGetStrongThresholdR ( HYPRE_Solver solver , HYPRE_Real *strong_threshold );
-HYPRE_Int HYPRE_BoomerAMGSetFilterThresholdR ( HYPRE_Solver solver , HYPRE_Real filter_threshold );
-HYPRE_Int HYPRE_BoomerAMGGetFilterThresholdR ( HYPRE_Solver solver , HYPRE_Real *filter_threshold );
-HYPRE_Int HYPRE_BoomerAMGSetGMRESSwitchR ( HYPRE_Solver solver , HYPRE_Int gmres_switch );
-HYPRE_Int HYPRE_BoomerAMGSetSabs ( HYPRE_Solver solver , HYPRE_Int Sabs );
-HYPRE_Int HYPRE_BoomerAMGSetMaxRowSum ( HYPRE_Solver solver , HYPRE_Real max_row_sum );
-HYPRE_Int HYPRE_BoomerAMGGetMaxRowSum ( HYPRE_Solver solver , HYPRE_Real *max_row_sum );
-HYPRE_Int HYPRE_BoomerAMGSetTruncFactor ( HYPRE_Solver solver , HYPRE_Real trunc_factor );
-HYPRE_Int HYPRE_BoomerAMGGetTruncFactor ( HYPRE_Solver solver , HYPRE_Real *trunc_factor );
-HYPRE_Int HYPRE_BoomerAMGSetPMaxElmts ( HYPRE_Solver solver , HYPRE_Int P_max_elmts );
-HYPRE_Int HYPRE_BoomerAMGGetPMaxElmts ( HYPRE_Solver solver , HYPRE_Int *P_max_elmts );
-HYPRE_Int HYPRE_BoomerAMGSetJacobiTruncThreshold ( HYPRE_Solver solver , HYPRE_Real jacobi_trunc_threshold );
-HYPRE_Int HYPRE_BoomerAMGGetJacobiTruncThreshold ( HYPRE_Solver solver , HYPRE_Real *jacobi_trunc_threshold );
-HYPRE_Int HYPRE_BoomerAMGSetPostInterpType ( HYPRE_Solver solver , HYPRE_Int post_interp_type );
-HYPRE_Int HYPRE_BoomerAMGGetPostInterpType ( HYPRE_Solver solver , HYPRE_Int *post_interp_type );
-HYPRE_Int HYPRE_BoomerAMGSetSCommPkgSwitch ( HYPRE_Solver solver , HYPRE_Real S_commpkg_switch );
-HYPRE_Int HYPRE_BoomerAMGSetInterpType ( HYPRE_Solver solver , HYPRE_Int interp_type );
-HYPRE_Int HYPRE_BoomerAMGSetSepWeight ( HYPRE_Solver solver , HYPRE_Int sep_weight );
-HYPRE_Int HYPRE_BoomerAMGSetMinIter ( HYPRE_Solver solver , HYPRE_Int min_iter );
-HYPRE_Int HYPRE_BoomerAMGSetMaxIter ( HYPRE_Solver solver , HYPRE_Int max_iter );
-HYPRE_Int HYPRE_BoomerAMGGetMaxIter ( HYPRE_Solver solver , HYPRE_Int *max_iter );
-HYPRE_Int HYPRE_BoomerAMGSetCoarsenType ( HYPRE_Solver solver , HYPRE_Int coarsen_type );
-HYPRE_Int HYPRE_BoomerAMGGetCoarsenType ( HYPRE_Solver solver , HYPRE_Int *coarsen_type );
-HYPRE_Int HYPRE_BoomerAMGSetMeasureType ( HYPRE_Solver solver , HYPRE_Int measure_type );
-HYPRE_Int HYPRE_BoomerAMGGetMeasureType ( HYPRE_Solver solver , HYPRE_Int *measure_type );
-HYPRE_Int HYPRE_BoomerAMGSetSetupType ( HYPRE_Solver solver , HYPRE_Int setup_type );
+HYPRE_Int HYPRE_BoomerAMGSetStrongThreshold ( HYPRE_Solver solver, HYPRE_Real strong_threshold );
+HYPRE_Int HYPRE_BoomerAMGGetStrongThreshold ( HYPRE_Solver solver, HYPRE_Real *strong_threshold );
+HYPRE_Int HYPRE_BoomerAMGSetStrongThresholdR ( HYPRE_Solver solver, HYPRE_Real strong_threshold );
+HYPRE_Int HYPRE_BoomerAMGGetStrongThresholdR ( HYPRE_Solver solver, HYPRE_Real *strong_threshold );
+HYPRE_Int HYPRE_BoomerAMGSetFilterThresholdR ( HYPRE_Solver solver, HYPRE_Real filter_threshold );
+HYPRE_Int HYPRE_BoomerAMGGetFilterThresholdR ( HYPRE_Solver solver, HYPRE_Real *filter_threshold );
+HYPRE_Int HYPRE_BoomerAMGSetGMRESSwitchR ( HYPRE_Solver solver, HYPRE_Int gmres_switch );
+HYPRE_Int HYPRE_BoomerAMGSetSabs ( HYPRE_Solver solver, HYPRE_Int Sabs );
+HYPRE_Int HYPRE_BoomerAMGSetMaxRowSum ( HYPRE_Solver solver, HYPRE_Real max_row_sum );
+HYPRE_Int HYPRE_BoomerAMGGetMaxRowSum ( HYPRE_Solver solver, HYPRE_Real *max_row_sum );
+HYPRE_Int HYPRE_BoomerAMGSetTruncFactor ( HYPRE_Solver solver, HYPRE_Real trunc_factor );
+HYPRE_Int HYPRE_BoomerAMGGetTruncFactor ( HYPRE_Solver solver, HYPRE_Real *trunc_factor );
+HYPRE_Int HYPRE_BoomerAMGSetPMaxElmts ( HYPRE_Solver solver, HYPRE_Int P_max_elmts );
+HYPRE_Int HYPRE_BoomerAMGGetPMaxElmts ( HYPRE_Solver solver, HYPRE_Int *P_max_elmts );
+HYPRE_Int HYPRE_BoomerAMGSetJacobiTruncThreshold ( HYPRE_Solver solver,
+                                                   HYPRE_Real jacobi_trunc_threshold );
+HYPRE_Int HYPRE_BoomerAMGGetJacobiTruncThreshold ( HYPRE_Solver solver,
+                                                   HYPRE_Real *jacobi_trunc_threshold );
+HYPRE_Int HYPRE_BoomerAMGSetPostInterpType ( HYPRE_Solver solver, HYPRE_Int post_interp_type );
+HYPRE_Int HYPRE_BoomerAMGGetPostInterpType ( HYPRE_Solver solver, HYPRE_Int *post_interp_type );
+HYPRE_Int HYPRE_BoomerAMGSetSCommPkgSwitch ( HYPRE_Solver solver, HYPRE_Real S_commpkg_switch );
+HYPRE_Int HYPRE_BoomerAMGSetInterpType ( HYPRE_Solver solver, HYPRE_Int interp_type );
+HYPRE_Int HYPRE_BoomerAMGSetSepWeight ( HYPRE_Solver solver, HYPRE_Int sep_weight );
+HYPRE_Int HYPRE_BoomerAMGSetMinIter ( HYPRE_Solver solver, HYPRE_Int min_iter );
+HYPRE_Int HYPRE_BoomerAMGSetMaxIter ( HYPRE_Solver solver, HYPRE_Int max_iter );
+HYPRE_Int HYPRE_BoomerAMGGetMaxIter ( HYPRE_Solver solver, HYPRE_Int *max_iter );
+HYPRE_Int HYPRE_BoomerAMGSetCoarsenType ( HYPRE_Solver solver, HYPRE_Int coarsen_type );
+HYPRE_Int HYPRE_BoomerAMGGetCoarsenType ( HYPRE_Solver solver, HYPRE_Int *coarsen_type );
+HYPRE_Int HYPRE_BoomerAMGSetMeasureType ( HYPRE_Solver solver, HYPRE_Int measure_type );
+HYPRE_Int HYPRE_BoomerAMGGetMeasureType ( HYPRE_Solver solver, HYPRE_Int *measure_type );
+HYPRE_Int HYPRE_BoomerAMGSetSetupType ( HYPRE_Solver solver, HYPRE_Int setup_type );
 HYPRE_Int HYPRE_BoomerAMGSetOldDefault ( HYPRE_Solver solver );
-HYPRE_Int HYPRE_BoomerAMGSetFCycle ( HYPRE_Solver solver , HYPRE_Int fcycle );
-HYPRE_Int HYPRE_BoomerAMGGetFCycle ( HYPRE_Solver solver , HYPRE_Int *fcycle );
-HYPRE_Int HYPRE_BoomerAMGSetCycleType ( HYPRE_Solver solver , HYPRE_Int cycle_type );
-HYPRE_Int HYPRE_BoomerAMGGetCycleType ( HYPRE_Solver solver , HYPRE_Int *cycle_type );
-HYPRE_Int HYPRE_BoomerAMGSetConvergeType ( HYPRE_Solver solver , HYPRE_Int type );
-HYPRE_Int HYPRE_BoomerAMGGetConvergeType ( HYPRE_Solver solver , HYPRE_Int *type );
-HYPRE_Int HYPRE_BoomerAMGSetTol ( HYPRE_Solver solver , HYPRE_Real tol );
-HYPRE_Int HYPRE_BoomerAMGGetTol ( HYPRE_Solver solver , HYPRE_Real *tol );
-HYPRE_Int HYPRE_BoomerAMGSetNumGridSweeps ( HYPRE_Solver solver , HYPRE_Int *num_grid_sweeps );
-HYPRE_Int HYPRE_BoomerAMGSetNumSweeps ( HYPRE_Solver solver , HYPRE_Int num_sweeps );
-HYPRE_Int HYPRE_BoomerAMGSetCycleNumSweeps ( HYPRE_Solver solver , HYPRE_Int num_sweeps , HYPRE_Int k );
-HYPRE_Int HYPRE_BoomerAMGGetCycleNumSweeps ( HYPRE_Solver solver , HYPRE_Int *num_sweeps , HYPRE_Int k );
-HYPRE_Int HYPRE_BoomerAMGInitGridRelaxation ( HYPRE_Int **num_grid_sweeps_ptr , HYPRE_Int **grid_relax_type_ptr , HYPRE_Int ***grid_relax_points_ptr , HYPRE_Int coarsen_type , HYPRE_Real **relax_weights_ptr , HYPRE_Int max_levels );
-HYPRE_Int HYPRE_BoomerAMGSetGridRelaxType ( HYPRE_Solver solver , HYPRE_Int *grid_relax_type );
-HYPRE_Int HYPRE_BoomerAMGSetRelaxType ( HYPRE_Solver solver , HYPRE_Int relax_type );
-HYPRE_Int HYPRE_BoomerAMGSetCycleRelaxType ( HYPRE_Solver solver , HYPRE_Int relax_type , HYPRE_Int k );
-HYPRE_Int HYPRE_BoomerAMGGetCycleRelaxType ( HYPRE_Solver solver , HYPRE_Int *relax_type , HYPRE_Int k );
-HYPRE_Int HYPRE_BoomerAMGSetRelaxOrder ( HYPRE_Solver solver , HYPRE_Int relax_order );
-HYPRE_Int HYPRE_BoomerAMGSetGridRelaxPoints ( HYPRE_Solver solver , HYPRE_Int **grid_relax_points );
-HYPRE_Int HYPRE_BoomerAMGSetRelaxWeight ( HYPRE_Solver solver , HYPRE_Real *relax_weight );
-HYPRE_Int HYPRE_BoomerAMGSetRelaxWt ( HYPRE_Solver solver , HYPRE_Real relax_wt );
-HYPRE_Int HYPRE_BoomerAMGSetLevelRelaxWt ( HYPRE_Solver solver , HYPRE_Real relax_wt , HYPRE_Int level );
-HYPRE_Int HYPRE_BoomerAMGSetOmega ( HYPRE_Solver solver , HYPRE_Real *omega );
-HYPRE_Int HYPRE_BoomerAMGSetOuterWt ( HYPRE_Solver solver , HYPRE_Real outer_wt );
-HYPRE_Int HYPRE_BoomerAMGSetLevelOuterWt ( HYPRE_Solver solver , HYPRE_Real outer_wt , HYPRE_Int level );
-HYPRE_Int HYPRE_BoomerAMGSetSmoothType ( HYPRE_Solver solver , HYPRE_Int smooth_type );
-HYPRE_Int HYPRE_BoomerAMGGetSmoothType ( HYPRE_Solver solver , HYPRE_Int *smooth_type );
-HYPRE_Int HYPRE_BoomerAMGSetSmoothNumLevels ( HYPRE_Solver solver , HYPRE_Int smooth_num_levels );
-HYPRE_Int HYPRE_BoomerAMGGetSmoothNumLevels ( HYPRE_Solver solver , HYPRE_Int *smooth_num_levels );
-HYPRE_Int HYPRE_BoomerAMGSetSmoothNumSweeps ( HYPRE_Solver solver , HYPRE_Int smooth_num_sweeps );
-HYPRE_Int HYPRE_BoomerAMGGetSmoothNumSweeps ( HYPRE_Solver solver , HYPRE_Int *smooth_num_sweeps );
-HYPRE_Int HYPRE_BoomerAMGSetLogging ( HYPRE_Solver solver , HYPRE_Int logging );
-HYPRE_Int HYPRE_BoomerAMGGetLogging ( HYPRE_Solver solver , HYPRE_Int *logging );
-HYPRE_Int HYPRE_BoomerAMGSetPrintLevel ( HYPRE_Solver solver , HYPRE_Int print_level );
-HYPRE_Int HYPRE_BoomerAMGGetPrintLevel ( HYPRE_Solver solver , HYPRE_Int *print_level );
-HYPRE_Int HYPRE_BoomerAMGSetPrintFileName ( HYPRE_Solver solver , const char *print_file_name );
-HYPRE_Int HYPRE_BoomerAMGSetDebugFlag ( HYPRE_Solver solver , HYPRE_Int debug_flag );
-HYPRE_Int HYPRE_BoomerAMGGetDebugFlag ( HYPRE_Solver solver , HYPRE_Int *debug_flag );
-HYPRE_Int HYPRE_BoomerAMGGetNumIterations ( HYPRE_Solver solver , HYPRE_Int *num_iterations );
-HYPRE_Int HYPRE_BoomerAMGGetCumNumIterations ( HYPRE_Solver solver , HYPRE_Int *cum_num_iterations );
-HYPRE_Int HYPRE_BoomerAMGGetResidual ( HYPRE_Solver solver , HYPRE_ParVector *residual );
-HYPRE_Int HYPRE_BoomerAMGGetFinalRelativeResidualNorm ( HYPRE_Solver solver , HYPRE_Real *rel_resid_norm );
-HYPRE_Int HYPRE_BoomerAMGSetVariant ( HYPRE_Solver solver , HYPRE_Int variant );
-HYPRE_Int HYPRE_BoomerAMGGetVariant ( HYPRE_Solver solver , HYPRE_Int *variant );
-HYPRE_Int HYPRE_BoomerAMGSetOverlap ( HYPRE_Solver solver , HYPRE_Int overlap );
-HYPRE_Int HYPRE_BoomerAMGGetOverlap ( HYPRE_Solver solver , HYPRE_Int *overlap );
-HYPRE_Int HYPRE_BoomerAMGSetDomainType ( HYPRE_Solver solver , HYPRE_Int domain_type );
-HYPRE_Int HYPRE_BoomerAMGGetDomainType ( HYPRE_Solver solver , HYPRE_Int *domain_type );
-HYPRE_Int HYPRE_BoomerAMGSetSchwarzRlxWeight ( HYPRE_Solver solver , HYPRE_Real schwarz_rlx_weight );
-HYPRE_Int HYPRE_BoomerAMGGetSchwarzRlxWeight ( HYPRE_Solver solver , HYPRE_Real *schwarz_rlx_weight );
-HYPRE_Int HYPRE_BoomerAMGSetSchwarzUseNonSymm ( HYPRE_Solver solver , HYPRE_Int use_nonsymm );
-HYPRE_Int HYPRE_BoomerAMGSetSym ( HYPRE_Solver solver , HYPRE_Int sym );
-HYPRE_Int HYPRE_BoomerAMGSetLevel ( HYPRE_Solver solver , HYPRE_Int level );
-HYPRE_Int HYPRE_BoomerAMGSetThreshold ( HYPRE_Solver solver , HYPRE_Real threshold );
-HYPRE_Int HYPRE_BoomerAMGSetFilter ( HYPRE_Solver solver , HYPRE_Real filter );
-HYPRE_Int HYPRE_BoomerAMGSetDropTol ( HYPRE_Solver solver , HYPRE_Real drop_tol );
-HYPRE_Int HYPRE_BoomerAMGSetMaxNzPerRow ( HYPRE_Solver solver , HYPRE_Int max_nz_per_row );
-HYPRE_Int HYPRE_BoomerAMGSetEuclidFile ( HYPRE_Solver solver , char *euclidfile );
-HYPRE_Int HYPRE_BoomerAMGSetEuLevel ( HYPRE_Solver solver , HYPRE_Int eu_level );
-HYPRE_Int HYPRE_BoomerAMGSetEuSparseA ( HYPRE_Solver solver , HYPRE_Real eu_sparse_A );
-HYPRE_Int HYPRE_BoomerAMGSetEuBJ ( HYPRE_Solver solver , HYPRE_Int eu_bj );
+HYPRE_Int HYPRE_BoomerAMGSetFCycle ( HYPRE_Solver solver, HYPRE_Int fcycle );
+HYPRE_Int HYPRE_BoomerAMGGetFCycle ( HYPRE_Solver solver, HYPRE_Int *fcycle );
+HYPRE_Int HYPRE_BoomerAMGSetCycleType ( HYPRE_Solver solver, HYPRE_Int cycle_type );
+HYPRE_Int HYPRE_BoomerAMGGetCycleType ( HYPRE_Solver solver, HYPRE_Int *cycle_type );
+HYPRE_Int HYPRE_BoomerAMGSetConvergeType ( HYPRE_Solver solver, HYPRE_Int type );
+HYPRE_Int HYPRE_BoomerAMGGetConvergeType ( HYPRE_Solver solver, HYPRE_Int *type );
+HYPRE_Int HYPRE_BoomerAMGSetTol ( HYPRE_Solver solver, HYPRE_Real tol );
+HYPRE_Int HYPRE_BoomerAMGGetTol ( HYPRE_Solver solver, HYPRE_Real *tol );
+HYPRE_Int HYPRE_BoomerAMGSetNumGridSweeps ( HYPRE_Solver solver, HYPRE_Int *num_grid_sweeps );
+HYPRE_Int HYPRE_BoomerAMGSetNumSweeps ( HYPRE_Solver solver, HYPRE_Int num_sweeps );
+HYPRE_Int HYPRE_BoomerAMGSetCycleNumSweeps ( HYPRE_Solver solver, HYPRE_Int num_sweeps,
+                                             HYPRE_Int k );
+HYPRE_Int HYPRE_BoomerAMGGetCycleNumSweeps ( HYPRE_Solver solver, HYPRE_Int *num_sweeps,
+                                             HYPRE_Int k );
+HYPRE_Int HYPRE_BoomerAMGInitGridRelaxation ( HYPRE_Int **num_grid_sweeps_ptr,
+                                              HYPRE_Int **grid_relax_type_ptr, HYPRE_Int ***grid_relax_points_ptr, HYPRE_Int coarsen_type,
+                                              HYPRE_Real **relax_weights_ptr, HYPRE_Int max_levels );
+HYPRE_Int HYPRE_BoomerAMGSetGridRelaxType ( HYPRE_Solver solver, HYPRE_Int *grid_relax_type );
+HYPRE_Int HYPRE_BoomerAMGSetRelaxType ( HYPRE_Solver solver, HYPRE_Int relax_type );
+HYPRE_Int HYPRE_BoomerAMGSetCycleRelaxType ( HYPRE_Solver solver, HYPRE_Int relax_type,
+                                             HYPRE_Int k );
+HYPRE_Int HYPRE_BoomerAMGGetCycleRelaxType ( HYPRE_Solver solver, HYPRE_Int *relax_type,
+                                             HYPRE_Int k );
+HYPRE_Int HYPRE_BoomerAMGSetRelaxOrder ( HYPRE_Solver solver, HYPRE_Int relax_order );
+HYPRE_Int HYPRE_BoomerAMGSetGridRelaxPoints ( HYPRE_Solver solver, HYPRE_Int **grid_relax_points );
+HYPRE_Int HYPRE_BoomerAMGSetRelaxWeight ( HYPRE_Solver solver, HYPRE_Real *relax_weight );
+HYPRE_Int HYPRE_BoomerAMGSetRelaxWt ( HYPRE_Solver solver, HYPRE_Real relax_wt );
+HYPRE_Int HYPRE_BoomerAMGSetLevelRelaxWt ( HYPRE_Solver solver, HYPRE_Real relax_wt,
+                                           HYPRE_Int level );
+HYPRE_Int HYPRE_BoomerAMGSetOmega ( HYPRE_Solver solver, HYPRE_Real *omega );
+HYPRE_Int HYPRE_BoomerAMGSetOuterWt ( HYPRE_Solver solver, HYPRE_Real outer_wt );
+HYPRE_Int HYPRE_BoomerAMGSetLevelOuterWt ( HYPRE_Solver solver, HYPRE_Real outer_wt,
+                                           HYPRE_Int level );
+HYPRE_Int HYPRE_BoomerAMGSetSmoothType ( HYPRE_Solver solver, HYPRE_Int smooth_type );
+HYPRE_Int HYPRE_BoomerAMGGetSmoothType ( HYPRE_Solver solver, HYPRE_Int *smooth_type );
+HYPRE_Int HYPRE_BoomerAMGSetSmoothNumLevels ( HYPRE_Solver solver, HYPRE_Int smooth_num_levels );
+HYPRE_Int HYPRE_BoomerAMGGetSmoothNumLevels ( HYPRE_Solver solver, HYPRE_Int *smooth_num_levels );
+HYPRE_Int HYPRE_BoomerAMGSetSmoothNumSweeps ( HYPRE_Solver solver, HYPRE_Int smooth_num_sweeps );
+HYPRE_Int HYPRE_BoomerAMGGetSmoothNumSweeps ( HYPRE_Solver solver, HYPRE_Int *smooth_num_sweeps );
+HYPRE_Int HYPRE_BoomerAMGSetLogging ( HYPRE_Solver solver, HYPRE_Int logging );
+HYPRE_Int HYPRE_BoomerAMGGetLogging ( HYPRE_Solver solver, HYPRE_Int *logging );
+HYPRE_Int HYPRE_BoomerAMGSetPrintLevel ( HYPRE_Solver solver, HYPRE_Int print_level );
+HYPRE_Int HYPRE_BoomerAMGGetPrintLevel ( HYPRE_Solver solver, HYPRE_Int *print_level );
+HYPRE_Int HYPRE_BoomerAMGSetPrintFileName ( HYPRE_Solver solver, const char *print_file_name );
+HYPRE_Int HYPRE_BoomerAMGSetDebugFlag ( HYPRE_Solver solver, HYPRE_Int debug_flag );
+HYPRE_Int HYPRE_BoomerAMGGetDebugFlag ( HYPRE_Solver solver, HYPRE_Int *debug_flag );
+HYPRE_Int HYPRE_BoomerAMGGetNumIterations ( HYPRE_Solver solver, HYPRE_Int *num_iterations );
+HYPRE_Int HYPRE_BoomerAMGGetCumNumIterations ( HYPRE_Solver solver, HYPRE_Int *cum_num_iterations );
+HYPRE_Int HYPRE_BoomerAMGGetResidual ( HYPRE_Solver solver, HYPRE_ParVector *residual );
+HYPRE_Int HYPRE_BoomerAMGGetFinalRelativeResidualNorm ( HYPRE_Solver solver,
+                                                        HYPRE_Real *rel_resid_norm );
+HYPRE_Int HYPRE_BoomerAMGSetVariant ( HYPRE_Solver solver, HYPRE_Int variant );
+HYPRE_Int HYPRE_BoomerAMGGetVariant ( HYPRE_Solver solver, HYPRE_Int *variant );
+HYPRE_Int HYPRE_BoomerAMGSetOverlap ( HYPRE_Solver solver, HYPRE_Int overlap );
+HYPRE_Int HYPRE_BoomerAMGGetOverlap ( HYPRE_Solver solver, HYPRE_Int *overlap );
+HYPRE_Int HYPRE_BoomerAMGSetDomainType ( HYPRE_Solver solver, HYPRE_Int domain_type );
+HYPRE_Int HYPRE_BoomerAMGGetDomainType ( HYPRE_Solver solver, HYPRE_Int *domain_type );
+HYPRE_Int HYPRE_BoomerAMGSetSchwarzRlxWeight ( HYPRE_Solver solver, HYPRE_Real schwarz_rlx_weight );
+HYPRE_Int HYPRE_BoomerAMGGetSchwarzRlxWeight ( HYPRE_Solver solver,
+                                               HYPRE_Real *schwarz_rlx_weight );
+HYPRE_Int HYPRE_BoomerAMGSetSchwarzUseNonSymm ( HYPRE_Solver solver, HYPRE_Int use_nonsymm );
+HYPRE_Int HYPRE_BoomerAMGSetSym ( HYPRE_Solver solver, HYPRE_Int sym );
+HYPRE_Int HYPRE_BoomerAMGSetLevel ( HYPRE_Solver solver, HYPRE_Int level );
+HYPRE_Int HYPRE_BoomerAMGSetThreshold ( HYPRE_Solver solver, HYPRE_Real threshold );
+HYPRE_Int HYPRE_BoomerAMGSetFilter ( HYPRE_Solver solver, HYPRE_Real filter );
+HYPRE_Int HYPRE_BoomerAMGSetDropTol ( HYPRE_Solver solver, HYPRE_Real drop_tol );
+HYPRE_Int HYPRE_BoomerAMGSetMaxNzPerRow ( HYPRE_Solver solver, HYPRE_Int max_nz_per_row );
+HYPRE_Int HYPRE_BoomerAMGSetEuclidFile ( HYPRE_Solver solver, char *euclidfile );
+HYPRE_Int HYPRE_BoomerAMGSetEuLevel ( HYPRE_Solver solver, HYPRE_Int eu_level );
+HYPRE_Int HYPRE_BoomerAMGSetEuSparseA ( HYPRE_Solver solver, HYPRE_Real eu_sparse_A );
+HYPRE_Int HYPRE_BoomerAMGSetEuBJ ( HYPRE_Solver solver, HYPRE_Int eu_bj );
 HYPRE_Int HYPRE_BoomerAMGSetILUType( HYPRE_Solver solver, HYPRE_Int ilu_type);
 HYPRE_Int HYPRE_BoomerAMGSetILULevel( HYPRE_Solver solver, HYPRE_Int ilu_lfil);
 HYPRE_Int HYPRE_BoomerAMGSetILUMaxRowNnz( HYPRE_Solver  solver, HYPRE_Int ilu_max_row_nnz);
 HYPRE_Int HYPRE_BoomerAMGSetILUMaxIter( HYPRE_Solver solver, HYPRE_Int ilu_max_iter);
 HYPRE_Int HYPRE_BoomerAMGSetILUDroptol( HYPRE_Solver solver, HYPRE_Real ilu_droptol);
+HYPRE_Int HYPRE_BoomerAMGSetILUTriSolve( HYPRE_Solver solver, HYPRE_Int ilu_tri_solve);
+HYPRE_Int HYPRE_BoomerAMGSetILULowerJacobiIters( HYPRE_Solver solver,
+                                                 HYPRE_Int ilu_lower_jacobi_iters);
+HYPRE_Int HYPRE_BoomerAMGSetILUUpperJacobiIters( HYPRE_Solver solver,
+                                                 HYPRE_Int ilu_upper_jacobi_iters);
 HYPRE_Int HYPRE_BoomerAMGSetILULocalReordering( HYPRE_Solver solver, HYPRE_Int ilu_reordering_type);
-HYPRE_Int HYPRE_BoomerAMGSetNumFunctions ( HYPRE_Solver solver , HYPRE_Int num_functions );
-HYPRE_Int HYPRE_BoomerAMGGetNumFunctions ( HYPRE_Solver solver , HYPRE_Int *num_functions );
-HYPRE_Int HYPRE_BoomerAMGSetNodal ( HYPRE_Solver solver , HYPRE_Int nodal );
-HYPRE_Int HYPRE_BoomerAMGSetNodalLevels ( HYPRE_Solver solver , HYPRE_Int nodal_levels );
-HYPRE_Int HYPRE_BoomerAMGSetNodalDiag ( HYPRE_Solver solver , HYPRE_Int nodal );
-HYPRE_Int HYPRE_BoomerAMGSetKeepSameSign ( HYPRE_Solver solver , HYPRE_Int keep_same_sign );
-HYPRE_Int HYPRE_BoomerAMGSetDofFunc ( HYPRE_Solver solver , HYPRE_Int *dof_func );
-HYPRE_Int HYPRE_BoomerAMGSetNumPaths ( HYPRE_Solver solver , HYPRE_Int num_paths );
-HYPRE_Int HYPRE_BoomerAMGSetAggNumLevels ( HYPRE_Solver solver , HYPRE_Int agg_num_levels );
-HYPRE_Int HYPRE_BoomerAMGSetAggInterpType ( HYPRE_Solver solver , HYPRE_Int agg_interp_type );
-HYPRE_Int HYPRE_BoomerAMGSetAggTruncFactor ( HYPRE_Solver solver , HYPRE_Real agg_trunc_factor );
-HYPRE_Int HYPRE_BoomerAMGSetAddTruncFactor ( HYPRE_Solver solver , HYPRE_Real add_trunc_factor );
-HYPRE_Int HYPRE_BoomerAMGSetMultAddTruncFactor ( HYPRE_Solver solver , HYPRE_Real add_trunc_factor );
-HYPRE_Int HYPRE_BoomerAMGSetAggP12TruncFactor ( HYPRE_Solver solver , HYPRE_Real agg_P12_trunc_factor );
-HYPRE_Int HYPRE_BoomerAMGSetAggPMaxElmts ( HYPRE_Solver solver , HYPRE_Int agg_P_max_elmts );
-HYPRE_Int HYPRE_BoomerAMGSetAddPMaxElmts ( HYPRE_Solver solver , HYPRE_Int add_P_max_elmts );
-HYPRE_Int HYPRE_BoomerAMGSetMultAddPMaxElmts ( HYPRE_Solver solver , HYPRE_Int add_P_max_elmts );
-HYPRE_Int HYPRE_BoomerAMGSetAddRelaxType ( HYPRE_Solver solver , HYPRE_Int add_rlx_type );
-HYPRE_Int HYPRE_BoomerAMGSetAddRelaxWt ( HYPRE_Solver solver , HYPRE_Real add_rlx_wt );
-HYPRE_Int HYPRE_BoomerAMGSetAggP12MaxElmts ( HYPRE_Solver solver , HYPRE_Int agg_P12_max_elmts );
-HYPRE_Int HYPRE_BoomerAMGSetNumCRRelaxSteps ( HYPRE_Solver solver , HYPRE_Int num_CR_relax_steps );
-HYPRE_Int HYPRE_BoomerAMGSetCRRate ( HYPRE_Solver solver , HYPRE_Real CR_rate );
-HYPRE_Int HYPRE_BoomerAMGSetCRStrongTh ( HYPRE_Solver solver , HYPRE_Real CR_strong_th );
+HYPRE_Int HYPRE_BoomerAMGSetFSAIAlgoType ( HYPRE_Solver solver, HYPRE_Int algo_type );
+HYPRE_Int HYPRE_BoomerAMGSetFSAILocalSolveType ( HYPRE_Solver solver, HYPRE_Int local_solve_type );
+HYPRE_Int HYPRE_BoomerAMGSetFSAIMaxSteps ( HYPRE_Solver solver, HYPRE_Int max_steps );
+HYPRE_Int HYPRE_BoomerAMGSetFSAIMaxStepSize ( HYPRE_Solver solver, HYPRE_Int max_step_size );
+HYPRE_Int HYPRE_BoomerAMGSetFSAIMaxNnzRow ( HYPRE_Solver solver, HYPRE_Int max_nnz_row );
+HYPRE_Int HYPRE_BoomerAMGSetFSAINumLevels ( HYPRE_Solver solver, HYPRE_Int num_levels );
+HYPRE_Int HYPRE_BoomerAMGSetFSAIEigMaxIters ( HYPRE_Solver solver, HYPRE_Int eig_max_iters );
+HYPRE_Int HYPRE_BoomerAMGSetFSAIThreshold ( HYPRE_Solver solver, HYPRE_Real threshold );
+HYPRE_Int HYPRE_BoomerAMGSetFSAIKapTolerance ( HYPRE_Solver solver, HYPRE_Real kap_tolerance );
+HYPRE_Int HYPRE_BoomerAMGSetNumFunctions ( HYPRE_Solver solver, HYPRE_Int num_functions );
+HYPRE_Int HYPRE_BoomerAMGGetNumFunctions ( HYPRE_Solver solver, HYPRE_Int *num_functions );
+HYPRE_Int HYPRE_BoomerAMGSetFilterFunctions ( HYPRE_Solver solver, HYPRE_Int filter_functions );
+HYPRE_Int HYPRE_BoomerAMGGetFilterFunctions ( HYPRE_Solver solver, HYPRE_Int *filter_functions );
+HYPRE_Int HYPRE_BoomerAMGSetNodal ( HYPRE_Solver solver, HYPRE_Int nodal );
+HYPRE_Int HYPRE_BoomerAMGSetNodalLevels ( HYPRE_Solver solver, HYPRE_Int nodal_levels );
+HYPRE_Int HYPRE_BoomerAMGSetNodalDiag ( HYPRE_Solver solver, HYPRE_Int nodal );
+HYPRE_Int HYPRE_BoomerAMGSetKeepSameSign ( HYPRE_Solver solver, HYPRE_Int keep_same_sign );
+HYPRE_Int HYPRE_BoomerAMGSetDofFunc ( HYPRE_Solver solver, HYPRE_Int *dof_func );
+HYPRE_Int HYPRE_BoomerAMGSetNumPaths ( HYPRE_Solver solver, HYPRE_Int num_paths );
+HYPRE_Int HYPRE_BoomerAMGSetAggNumLevels ( HYPRE_Solver solver, HYPRE_Int agg_num_levels );
+HYPRE_Int HYPRE_BoomerAMGSetAggInterpType ( HYPRE_Solver solver, HYPRE_Int agg_interp_type );
+HYPRE_Int HYPRE_BoomerAMGSetAggTruncFactor ( HYPRE_Solver solver, HYPRE_Real agg_trunc_factor );
+HYPRE_Int HYPRE_BoomerAMGSetAddTruncFactor ( HYPRE_Solver solver, HYPRE_Real add_trunc_factor );
+HYPRE_Int HYPRE_BoomerAMGSetMultAddTruncFactor ( HYPRE_Solver solver, HYPRE_Real add_trunc_factor );
+HYPRE_Int HYPRE_BoomerAMGSetAggP12TruncFactor ( HYPRE_Solver solver,
+                                                HYPRE_Real agg_P12_trunc_factor );
+HYPRE_Int HYPRE_BoomerAMGSetAggPMaxElmts ( HYPRE_Solver solver, HYPRE_Int agg_P_max_elmts );
+HYPRE_Int HYPRE_BoomerAMGSetAddPMaxElmts ( HYPRE_Solver solver, HYPRE_Int add_P_max_elmts );
+HYPRE_Int HYPRE_BoomerAMGSetMultAddPMaxElmts ( HYPRE_Solver solver, HYPRE_Int add_P_max_elmts );
+HYPRE_Int HYPRE_BoomerAMGSetAddRelaxType ( HYPRE_Solver solver, HYPRE_Int add_rlx_type );
+HYPRE_Int HYPRE_BoomerAMGSetAddRelaxWt ( HYPRE_Solver solver, HYPRE_Real add_rlx_wt );
+HYPRE_Int HYPRE_BoomerAMGSetAggP12MaxElmts ( HYPRE_Solver solver, HYPRE_Int agg_P12_max_elmts );
+HYPRE_Int HYPRE_BoomerAMGSetNumCRRelaxSteps ( HYPRE_Solver solver, HYPRE_Int num_CR_relax_steps );
+HYPRE_Int HYPRE_BoomerAMGSetCRRate ( HYPRE_Solver solver, HYPRE_Real CR_rate );
+HYPRE_Int HYPRE_BoomerAMGSetCRStrongTh ( HYPRE_Solver solver, HYPRE_Real CR_strong_th );
 HYPRE_Int HYPRE_BoomerAMGSetADropTol( HYPRE_Solver solver, HYPRE_Real A_drop_tol  );
 HYPRE_Int HYPRE_BoomerAMGSetADropType( HYPRE_Solver solver, HYPRE_Int A_drop_type  );
-HYPRE_Int HYPRE_BoomerAMGSetISType ( HYPRE_Solver solver , HYPRE_Int IS_type );
-HYPRE_Int HYPRE_BoomerAMGSetCRUseCG ( HYPRE_Solver solver , HYPRE_Int CR_use_CG );
-HYPRE_Int HYPRE_BoomerAMGSetGSMG ( HYPRE_Solver solver , HYPRE_Int gsmg );
-HYPRE_Int HYPRE_BoomerAMGSetNumSamples ( HYPRE_Solver solver , HYPRE_Int gsmg );
-HYPRE_Int HYPRE_BoomerAMGSetCGCIts ( HYPRE_Solver solver , HYPRE_Int its );
-HYPRE_Int HYPRE_BoomerAMGSetPlotGrids ( HYPRE_Solver solver , HYPRE_Int plotgrids );
-HYPRE_Int HYPRE_BoomerAMGSetPlotFileName ( HYPRE_Solver solver , const char *plotfilename );
-HYPRE_Int HYPRE_BoomerAMGSetCoordDim ( HYPRE_Solver solver , HYPRE_Int coorddim );
-HYPRE_Int HYPRE_BoomerAMGSetCoordinates ( HYPRE_Solver solver , float *coordinates );
+HYPRE_Int HYPRE_BoomerAMGSetISType ( HYPRE_Solver solver, HYPRE_Int IS_type );
+HYPRE_Int HYPRE_BoomerAMGSetCRUseCG ( HYPRE_Solver solver, HYPRE_Int CR_use_CG );
+HYPRE_Int HYPRE_BoomerAMGSetGSMG ( HYPRE_Solver solver, HYPRE_Int gsmg );
+HYPRE_Int HYPRE_BoomerAMGSetNumSamples ( HYPRE_Solver solver, HYPRE_Int gsmg );
+HYPRE_Int HYPRE_BoomerAMGSetCGCIts ( HYPRE_Solver solver, HYPRE_Int its );
+HYPRE_Int HYPRE_BoomerAMGSetPlotGrids ( HYPRE_Solver solver, HYPRE_Int plotgrids );
+HYPRE_Int HYPRE_BoomerAMGSetPlotFileName ( HYPRE_Solver solver, const char *plotfilename );
+HYPRE_Int HYPRE_BoomerAMGSetCoordDim ( HYPRE_Solver solver, HYPRE_Int coorddim );
+HYPRE_Int HYPRE_BoomerAMGSetCoordinates ( HYPRE_Solver solver, float *coordinates );
 HYPRE_Int HYPRE_BoomerAMGGetGridHierarchy(HYPRE_Solver solver, HYPRE_Int *cgrid );
-HYPRE_Int HYPRE_BoomerAMGSetChebyOrder ( HYPRE_Solver solver , HYPRE_Int order );
-HYPRE_Int HYPRE_BoomerAMGSetChebyFraction ( HYPRE_Solver solver , HYPRE_Real ratio );
-HYPRE_Int HYPRE_BoomerAMGSetChebyEigEst ( HYPRE_Solver solver , HYPRE_Int eig_est );
-HYPRE_Int HYPRE_BoomerAMGSetChebyVariant ( HYPRE_Solver solver , HYPRE_Int variant );
-HYPRE_Int HYPRE_BoomerAMGSetChebyScale ( HYPRE_Solver solver , HYPRE_Int scale );
-HYPRE_Int HYPRE_BoomerAMGSetInterpVectors ( HYPRE_Solver solver , HYPRE_Int num_vectors , HYPRE_ParVector *vectors );
-HYPRE_Int HYPRE_BoomerAMGSetInterpVecVariant ( HYPRE_Solver solver , HYPRE_Int num );
-HYPRE_Int HYPRE_BoomerAMGSetInterpVecQMax ( HYPRE_Solver solver , HYPRE_Int q_max );
-HYPRE_Int HYPRE_BoomerAMGSetInterpVecAbsQTrunc ( HYPRE_Solver solver , HYPRE_Real q_trunc );
-HYPRE_Int HYPRE_BoomerAMGSetSmoothInterpVectors ( HYPRE_Solver solver , HYPRE_Int smooth_interp_vectors );
-HYPRE_Int HYPRE_BoomerAMGSetInterpRefine ( HYPRE_Solver solver , HYPRE_Int num_refine );
-HYPRE_Int HYPRE_BoomerAMGSetInterpVecFirstLevel ( HYPRE_Solver solver , HYPRE_Int level );
-HYPRE_Int HYPRE_BoomerAMGSetAdditive ( HYPRE_Solver solver , HYPRE_Int additive );
-HYPRE_Int HYPRE_BoomerAMGGetAdditive ( HYPRE_Solver solver , HYPRE_Int *additive );
-HYPRE_Int HYPRE_BoomerAMGSetMultAdditive ( HYPRE_Solver solver , HYPRE_Int mult_additive );
-HYPRE_Int HYPRE_BoomerAMGGetMultAdditive ( HYPRE_Solver solver , HYPRE_Int *mult_additive );
-HYPRE_Int HYPRE_BoomerAMGSetSimple ( HYPRE_Solver solver , HYPRE_Int simple );
-HYPRE_Int HYPRE_BoomerAMGGetSimple ( HYPRE_Solver solver , HYPRE_Int *simple );
-HYPRE_Int HYPRE_BoomerAMGSetAddLastLvl ( HYPRE_Solver solver , HYPRE_Int add_last_lvl );
-HYPRE_Int HYPRE_BoomerAMGSetNonGalerkinTol ( HYPRE_Solver solver , HYPRE_Real nongalerkin_tol );
-HYPRE_Int HYPRE_BoomerAMGSetLevelNonGalerkinTol ( HYPRE_Solver solver , HYPRE_Real nongalerkin_tol , HYPRE_Int level );
-HYPRE_Int HYPRE_BoomerAMGSetNonGalerkTol ( HYPRE_Solver solver , HYPRE_Int nongalerk_num_tol , HYPRE_Real *nongalerk_tol );
-HYPRE_Int HYPRE_BoomerAMGSetRAP2 ( HYPRE_Solver solver , HYPRE_Int rap2 );
-HYPRE_Int HYPRE_BoomerAMGSetModuleRAP2 ( HYPRE_Solver solver , HYPRE_Int mod_rap2 );
-HYPRE_Int HYPRE_BoomerAMGSetKeepTranspose ( HYPRE_Solver solver , HYPRE_Int keepTranspose );
+HYPRE_Int HYPRE_BoomerAMGSetChebyOrder ( HYPRE_Solver solver, HYPRE_Int order );
+HYPRE_Int HYPRE_BoomerAMGSetChebyFraction ( HYPRE_Solver solver, HYPRE_Real ratio );
+HYPRE_Int HYPRE_BoomerAMGSetChebyEigEst ( HYPRE_Solver solver, HYPRE_Int eig_est );
+HYPRE_Int HYPRE_BoomerAMGSetChebyVariant ( HYPRE_Solver solver, HYPRE_Int variant );
+HYPRE_Int HYPRE_BoomerAMGSetChebyScale ( HYPRE_Solver solver, HYPRE_Int scale );
+HYPRE_Int HYPRE_BoomerAMGSetInterpVectors ( HYPRE_Solver solver, HYPRE_Int num_vectors,
+                                            HYPRE_ParVector *vectors );
+HYPRE_Int HYPRE_BoomerAMGSetInterpVecVariant ( HYPRE_Solver solver, HYPRE_Int num );
+HYPRE_Int HYPRE_BoomerAMGSetInterpVecQMax ( HYPRE_Solver solver, HYPRE_Int q_max );
+HYPRE_Int HYPRE_BoomerAMGSetInterpVecAbsQTrunc ( HYPRE_Solver solver, HYPRE_Real q_trunc );
+HYPRE_Int HYPRE_BoomerAMGSetSmoothInterpVectors ( HYPRE_Solver solver,
+                                                  HYPRE_Int smooth_interp_vectors );
+HYPRE_Int HYPRE_BoomerAMGSetInterpRefine ( HYPRE_Solver solver, HYPRE_Int num_refine );
+HYPRE_Int HYPRE_BoomerAMGSetInterpVecFirstLevel ( HYPRE_Solver solver, HYPRE_Int level );
+HYPRE_Int HYPRE_BoomerAMGSetAdditive ( HYPRE_Solver solver, HYPRE_Int additive );
+HYPRE_Int HYPRE_BoomerAMGGetAdditive ( HYPRE_Solver solver, HYPRE_Int *additive );
+HYPRE_Int HYPRE_BoomerAMGSetMultAdditive ( HYPRE_Solver solver, HYPRE_Int mult_additive );
+HYPRE_Int HYPRE_BoomerAMGGetMultAdditive ( HYPRE_Solver solver, HYPRE_Int *mult_additive );
+HYPRE_Int HYPRE_BoomerAMGSetSimple ( HYPRE_Solver solver, HYPRE_Int simple );
+HYPRE_Int HYPRE_BoomerAMGGetSimple ( HYPRE_Solver solver, HYPRE_Int *simple );
+HYPRE_Int HYPRE_BoomerAMGSetAddLastLvl ( HYPRE_Solver solver, HYPRE_Int add_last_lvl );
+HYPRE_Int HYPRE_BoomerAMGSetNonGalerkinTol ( HYPRE_Solver solver, HYPRE_Real nongalerkin_tol );
+HYPRE_Int HYPRE_BoomerAMGSetLevelNonGalerkinTol ( HYPRE_Solver solver, HYPRE_Real nongalerkin_tol,
+                                                  HYPRE_Int level );
+HYPRE_Int HYPRE_BoomerAMGSetNonGalerkTol ( HYPRE_Solver solver, HYPRE_Int nongalerk_num_tol,
+                                           HYPRE_Real *nongalerk_tol );
+HYPRE_Int HYPRE_BoomerAMGSetRAP2 ( HYPRE_Solver solver, HYPRE_Int rap2 );
+HYPRE_Int HYPRE_BoomerAMGSetModuleRAP2 ( HYPRE_Solver solver, HYPRE_Int mod_rap2 );
+HYPRE_Int HYPRE_BoomerAMGSetKeepTranspose ( HYPRE_Solver solver, HYPRE_Int keepTranspose );
 #ifdef HYPRE_USING_DSUPERLU
-HYPRE_Int HYPRE_BoomerAMGSetDSLUThreshold ( HYPRE_Solver solver , HYPRE_Int slu_threshold );
+HYPRE_Int HYPRE_BoomerAMGSetDSLUThreshold ( HYPRE_Solver solver, HYPRE_Int slu_threshold );
 #endif
-HYPRE_Int HYPRE_BoomerAMGSetCpointsToKeep( HYPRE_Solver solver, HYPRE_Int cpt_coarse_level, HYPRE_Int num_cpt_coarse, HYPRE_BigInt *cpt_coarse_index);
-HYPRE_Int HYPRE_BoomerAMGSetCPoints( HYPRE_Solver solver, HYPRE_Int cpt_coarse_level, HYPRE_Int num_cpt_coarse, HYPRE_BigInt *cpt_coarse_index);
-HYPRE_Int HYPRE_BoomerAMGSetIsolatedFPoints( HYPRE_Solver solver, HYPRE_Int num_isolated_fpt, HYPRE_BigInt *isolated_fpt_index );
-HYPRE_Int HYPRE_BoomerAMGSetFPoints( HYPRE_Solver solver, HYPRE_Int num_fpt, HYPRE_BigInt *fpt_index );
+HYPRE_Int HYPRE_BoomerAMGSetCpointsToKeep( HYPRE_Solver solver, HYPRE_Int cpt_coarse_level,
+                                           HYPRE_Int num_cpt_coarse, HYPRE_BigInt *cpt_coarse_index);
+HYPRE_Int HYPRE_BoomerAMGSetCPoints( HYPRE_Solver solver, HYPRE_Int cpt_coarse_level,
+                                     HYPRE_Int num_cpt_coarse, HYPRE_BigInt *cpt_coarse_index);
+HYPRE_Int HYPRE_BoomerAMGSetIsolatedFPoints( HYPRE_Solver solver, HYPRE_Int num_isolated_fpt,
+                                             HYPRE_BigInt *isolated_fpt_index );
+HYPRE_Int HYPRE_BoomerAMGSetFPoints( HYPRE_Solver solver, HYPRE_Int num_fpt,
+                                     HYPRE_BigInt *fpt_index );
+HYPRE_Int HYPRE_BoomerAMGSetCumNnzAP ( HYPRE_Solver solver, HYPRE_Real cum_nnz_AP );
+HYPRE_Int HYPRE_BoomerAMGGetCumNnzAP ( HYPRE_Solver solver, HYPRE_Real *cum_nnz_AP );
 
 /* HYPRE_parcsr_amgdd.c */
-HYPRE_Int HYPRE_BoomerAMGDDSetup ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b, HYPRE_ParVector x );
-HYPRE_Int HYPRE_BoomerAMGDDSolve ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b, HYPRE_ParVector x );
-HYPRE_Int HYPRE_BoomerAMGDDSetStartLevel ( HYPRE_Solver solver , HYPRE_Int start_level );
-HYPRE_Int HYPRE_BoomerAMGDDGetStartLevel ( HYPRE_Solver solver , HYPRE_Int *start_level );
-HYPRE_Int HYPRE_BoomerAMGDDSetFACNumCycles ( HYPRE_Solver solver , HYPRE_Int fac_num_cycles );
-HYPRE_Int HYPRE_BoomerAMGDDGetFACNumCycles ( HYPRE_Solver solver , HYPRE_Int *fac_num_cycles );
-HYPRE_Int HYPRE_BoomerAMGDDSetFACCycleType ( HYPRE_Solver solver , HYPRE_Int fac_cycle_type );
-HYPRE_Int HYPRE_BoomerAMGDDGetFACCycleType ( HYPRE_Solver solver , HYPRE_Int *fac_cycle_type );
-HYPRE_Int HYPRE_BoomerAMGDDSetFACNumRelax ( HYPRE_Solver solver , HYPRE_Int fac_num_relax );
-HYPRE_Int HYPRE_BoomerAMGDDGetFACNumRelax ( HYPRE_Solver solver , HYPRE_Int *fac_num_relax );
-HYPRE_Int HYPRE_BoomerAMGDDSetFACRelaxType ( HYPRE_Solver solver , HYPRE_Int fac_relax_type );
-HYPRE_Int HYPRE_BoomerAMGDDGetFACRelaxType ( HYPRE_Solver solver , HYPRE_Int *fac_relax_type );
-HYPRE_Int HYPRE_BoomerAMGDDSetFACRelaxWeight ( HYPRE_Solver solver , HYPRE_Real fac_relax_weight );
-HYPRE_Int HYPRE_BoomerAMGDDGetFACRelaxWeight ( HYPRE_Solver solver , HYPRE_Real *fac_relax_weight );
-HYPRE_Int HYPRE_BoomerAMGDDSetPadding ( HYPRE_Solver solver , HYPRE_Int padding );
-HYPRE_Int HYPRE_BoomerAMGDDGetPadding ( HYPRE_Solver solver , HYPRE_Int *padding );
-HYPRE_Int HYPRE_BoomerAMGDDSetNumGhostLayers ( HYPRE_Solver solver , HYPRE_Int num_ghost_layers );
-HYPRE_Int HYPRE_BoomerAMGDDGetNumGhostLayers ( HYPRE_Solver solver , HYPRE_Int *num_ghost_layers );
-HYPRE_Int HYPRE_BoomerAMGDDSetUserFACRelaxation( HYPRE_Solver solver, HYPRE_Int (*userFACRelaxation)( void *amgdd_vdata, HYPRE_Int level, HYPRE_Int cycle_param ) );
-HYPRE_Int HYPRE_BoomerAMGDDGetAMG ( HYPRE_Solver solver , HYPRE_Solver *amg_solver );
+HYPRE_Int HYPRE_BoomerAMGDDSetup ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                                   HYPRE_ParVector x );
+HYPRE_Int HYPRE_BoomerAMGDDSolve ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                                   HYPRE_ParVector x );
+HYPRE_Int HYPRE_BoomerAMGDDSetStartLevel ( HYPRE_Solver solver, HYPRE_Int start_level );
+HYPRE_Int HYPRE_BoomerAMGDDGetStartLevel ( HYPRE_Solver solver, HYPRE_Int *start_level );
+HYPRE_Int HYPRE_BoomerAMGDDSetFACNumCycles ( HYPRE_Solver solver, HYPRE_Int fac_num_cycles );
+HYPRE_Int HYPRE_BoomerAMGDDGetFACNumCycles ( HYPRE_Solver solver, HYPRE_Int *fac_num_cycles );
+HYPRE_Int HYPRE_BoomerAMGDDSetFACCycleType ( HYPRE_Solver solver, HYPRE_Int fac_cycle_type );
+HYPRE_Int HYPRE_BoomerAMGDDGetFACCycleType ( HYPRE_Solver solver, HYPRE_Int *fac_cycle_type );
+HYPRE_Int HYPRE_BoomerAMGDDSetFACNumRelax ( HYPRE_Solver solver, HYPRE_Int fac_num_relax );
+HYPRE_Int HYPRE_BoomerAMGDDGetFACNumRelax ( HYPRE_Solver solver, HYPRE_Int *fac_num_relax );
+HYPRE_Int HYPRE_BoomerAMGDDSetFACRelaxType ( HYPRE_Solver solver, HYPRE_Int fac_relax_type );
+HYPRE_Int HYPRE_BoomerAMGDDGetFACRelaxType ( HYPRE_Solver solver, HYPRE_Int *fac_relax_type );
+HYPRE_Int HYPRE_BoomerAMGDDSetFACRelaxWeight ( HYPRE_Solver solver, HYPRE_Real fac_relax_weight );
+HYPRE_Int HYPRE_BoomerAMGDDGetFACRelaxWeight ( HYPRE_Solver solver, HYPRE_Real *fac_relax_weight );
+HYPRE_Int HYPRE_BoomerAMGDDSetPadding ( HYPRE_Solver solver, HYPRE_Int padding );
+HYPRE_Int HYPRE_BoomerAMGDDGetPadding ( HYPRE_Solver solver, HYPRE_Int *padding );
+HYPRE_Int HYPRE_BoomerAMGDDSetNumGhostLayers ( HYPRE_Solver solver, HYPRE_Int num_ghost_layers );
+HYPRE_Int HYPRE_BoomerAMGDDGetNumGhostLayers ( HYPRE_Solver solver, HYPRE_Int *num_ghost_layers );
+HYPRE_Int HYPRE_BoomerAMGDDSetUserFACRelaxation( HYPRE_Solver solver,
+                                                 HYPRE_Int (*userFACRelaxation)( void *amgdd_vdata, HYPRE_Int level, HYPRE_Int cycle_param ) );
+HYPRE_Int HYPRE_BoomerAMGDDGetAMG ( HYPRE_Solver solver, HYPRE_Solver *amg_solver );
 
 /* HYPRE_parcsr_bicgstab.c */
-HYPRE_Int HYPRE_ParCSRBiCGSTABCreate ( MPI_Comm comm , HYPRE_Solver *solver );
+HYPRE_Int HYPRE_ParCSRBiCGSTABCreate ( MPI_Comm comm, HYPRE_Solver *solver );
 HYPRE_Int HYPRE_ParCSRBiCGSTABDestroy ( HYPRE_Solver solver );
-HYPRE_Int HYPRE_ParCSRBiCGSTABSetup ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_ParCSRBiCGSTABSolve ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_ParCSRBiCGSTABSetTol ( HYPRE_Solver solver , HYPRE_Real tol );
-HYPRE_Int HYPRE_ParCSRBiCGSTABSetAbsoluteTol ( HYPRE_Solver solver , HYPRE_Real a_tol );
-HYPRE_Int HYPRE_ParCSRBiCGSTABSetMinIter ( HYPRE_Solver solver , HYPRE_Int min_iter );
-HYPRE_Int HYPRE_ParCSRBiCGSTABSetMaxIter ( HYPRE_Solver solver , HYPRE_Int max_iter );
-HYPRE_Int HYPRE_ParCSRBiCGSTABSetStopCrit ( HYPRE_Solver solver , HYPRE_Int stop_crit );
-HYPRE_Int HYPRE_ParCSRBiCGSTABSetPrecond ( HYPRE_Solver solver , HYPRE_PtrToParSolverFcn precond , HYPRE_PtrToParSolverFcn precond_setup , HYPRE_Solver precond_solver );
-HYPRE_Int HYPRE_ParCSRBiCGSTABGetPrecond ( HYPRE_Solver solver , HYPRE_Solver *precond_data_ptr );
-HYPRE_Int HYPRE_ParCSRBiCGSTABSetLogging ( HYPRE_Solver solver , HYPRE_Int logging );
-HYPRE_Int HYPRE_ParCSRBiCGSTABSetPrintLevel ( HYPRE_Solver solver , HYPRE_Int print_level );
-HYPRE_Int HYPRE_ParCSRBiCGSTABGetNumIterations ( HYPRE_Solver solver , HYPRE_Int *num_iterations );
-HYPRE_Int HYPRE_ParCSRBiCGSTABGetFinalRelativeResidualNorm ( HYPRE_Solver solver , HYPRE_Real *norm );
-HYPRE_Int HYPRE_ParCSRBiCGSTABGetResidual ( HYPRE_Solver solver , HYPRE_ParVector *residual );
+HYPRE_Int HYPRE_ParCSRBiCGSTABSetup ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                                      HYPRE_ParVector x );
+HYPRE_Int HYPRE_ParCSRBiCGSTABSolve ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                                      HYPRE_ParVector x );
+HYPRE_Int HYPRE_ParCSRBiCGSTABSetTol ( HYPRE_Solver solver, HYPRE_Real tol );
+HYPRE_Int HYPRE_ParCSRBiCGSTABSetAbsoluteTol ( HYPRE_Solver solver, HYPRE_Real a_tol );
+HYPRE_Int HYPRE_ParCSRBiCGSTABSetMinIter ( HYPRE_Solver solver, HYPRE_Int min_iter );
+HYPRE_Int HYPRE_ParCSRBiCGSTABSetMaxIter ( HYPRE_Solver solver, HYPRE_Int max_iter );
+HYPRE_Int HYPRE_ParCSRBiCGSTABSetStopCrit ( HYPRE_Solver solver, HYPRE_Int stop_crit );
+HYPRE_Int HYPRE_ParCSRBiCGSTABSetPrecond ( HYPRE_Solver solver, HYPRE_PtrToParSolverFcn precond,
+                                           HYPRE_PtrToParSolverFcn precond_setup, HYPRE_Solver precond_solver );
+HYPRE_Int HYPRE_ParCSRBiCGSTABGetPrecond ( HYPRE_Solver solver, HYPRE_Solver *precond_data_ptr );
+HYPRE_Int HYPRE_ParCSRBiCGSTABSetLogging ( HYPRE_Solver solver, HYPRE_Int logging );
+HYPRE_Int HYPRE_ParCSRBiCGSTABSetPrintLevel ( HYPRE_Solver solver, HYPRE_Int print_level );
+HYPRE_Int HYPRE_ParCSRBiCGSTABGetNumIterations ( HYPRE_Solver solver, HYPRE_Int *num_iterations );
+HYPRE_Int HYPRE_ParCSRBiCGSTABGetFinalRelativeResidualNorm ( HYPRE_Solver solver,
+                                                             HYPRE_Real *norm );
+HYPRE_Int HYPRE_ParCSRBiCGSTABGetResidual ( HYPRE_Solver solver, HYPRE_ParVector *residual );
 
 /* HYPRE_parcsr_block.c */
 HYPRE_Int HYPRE_BlockTridiagCreate ( HYPRE_Solver *solver );
 HYPRE_Int HYPRE_BlockTridiagDestroy ( HYPRE_Solver solver );
-HYPRE_Int HYPRE_BlockTridiagSetup ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_BlockTridiagSolve ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_BlockTridiagSetIndexSet ( HYPRE_Solver solver , HYPRE_Int n , HYPRE_Int *inds );
-HYPRE_Int HYPRE_BlockTridiagSetAMGStrengthThreshold ( HYPRE_Solver solver , HYPRE_Real thresh );
-HYPRE_Int HYPRE_BlockTridiagSetAMGNumSweeps ( HYPRE_Solver solver , HYPRE_Int num_sweeps );
-HYPRE_Int HYPRE_BlockTridiagSetAMGRelaxType ( HYPRE_Solver solver , HYPRE_Int relax_type );
-HYPRE_Int HYPRE_BlockTridiagSetPrintLevel ( HYPRE_Solver solver , HYPRE_Int print_level );
+HYPRE_Int HYPRE_BlockTridiagSetup ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                                    HYPRE_ParVector x );
+HYPRE_Int HYPRE_BlockTridiagSolve ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                                    HYPRE_ParVector x );
+HYPRE_Int HYPRE_BlockTridiagSetIndexSet ( HYPRE_Solver solver, HYPRE_Int n, HYPRE_Int *inds );
+HYPRE_Int HYPRE_BlockTridiagSetAMGStrengthThreshold ( HYPRE_Solver solver, HYPRE_Real thresh );
+HYPRE_Int HYPRE_BlockTridiagSetAMGNumSweeps ( HYPRE_Solver solver, HYPRE_Int num_sweeps );
+HYPRE_Int HYPRE_BlockTridiagSetAMGRelaxType ( HYPRE_Solver solver, HYPRE_Int relax_type );
+HYPRE_Int HYPRE_BlockTridiagSetPrintLevel ( HYPRE_Solver solver, HYPRE_Int print_level );
 
 /* HYPRE_parcsr_cgnr.c */
-HYPRE_Int HYPRE_ParCSRCGNRCreate ( MPI_Comm comm , HYPRE_Solver *solver );
+HYPRE_Int HYPRE_ParCSRCGNRCreate ( MPI_Comm comm, HYPRE_Solver *solver );
 HYPRE_Int HYPRE_ParCSRCGNRDestroy ( HYPRE_Solver solver );
-HYPRE_Int HYPRE_ParCSRCGNRSetup ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_ParCSRCGNRSolve ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_ParCSRCGNRSetTol ( HYPRE_Solver solver , HYPRE_Real tol );
-HYPRE_Int HYPRE_ParCSRCGNRSetMinIter ( HYPRE_Solver solver , HYPRE_Int min_iter );
-HYPRE_Int HYPRE_ParCSRCGNRSetMaxIter ( HYPRE_Solver solver , HYPRE_Int max_iter );
-HYPRE_Int HYPRE_ParCSRCGNRSetStopCrit ( HYPRE_Solver solver , HYPRE_Int stop_crit );
-HYPRE_Int HYPRE_ParCSRCGNRSetPrecond ( HYPRE_Solver solver , HYPRE_PtrToParSolverFcn precond , HYPRE_PtrToParSolverFcn precondT , HYPRE_PtrToParSolverFcn precond_setup , HYPRE_Solver precond_solver );
-HYPRE_Int HYPRE_ParCSRCGNRGetPrecond ( HYPRE_Solver solver , HYPRE_Solver *precond_data_ptr );
-HYPRE_Int HYPRE_ParCSRCGNRSetLogging ( HYPRE_Solver solver , HYPRE_Int logging );
-HYPRE_Int HYPRE_ParCSRCGNRGetNumIterations ( HYPRE_Solver solver , HYPRE_Int *num_iterations );
-HYPRE_Int HYPRE_ParCSRCGNRGetFinalRelativeResidualNorm ( HYPRE_Solver solver , HYPRE_Real *norm );
+HYPRE_Int HYPRE_ParCSRCGNRSetup ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                                  HYPRE_ParVector x );
+HYPRE_Int HYPRE_ParCSRCGNRSolve ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                                  HYPRE_ParVector x );
+HYPRE_Int HYPRE_ParCSRCGNRSetTol ( HYPRE_Solver solver, HYPRE_Real tol );
+HYPRE_Int HYPRE_ParCSRCGNRSetMinIter ( HYPRE_Solver solver, HYPRE_Int min_iter );
+HYPRE_Int HYPRE_ParCSRCGNRSetMaxIter ( HYPRE_Solver solver, HYPRE_Int max_iter );
+HYPRE_Int HYPRE_ParCSRCGNRSetStopCrit ( HYPRE_Solver solver, HYPRE_Int stop_crit );
+HYPRE_Int HYPRE_ParCSRCGNRSetPrecond ( HYPRE_Solver solver, HYPRE_PtrToParSolverFcn precond,
+                                       HYPRE_PtrToParSolverFcn precondT, HYPRE_PtrToParSolverFcn precond_setup,
+                                       HYPRE_Solver precond_solver );
+HYPRE_Int HYPRE_ParCSRCGNRGetPrecond ( HYPRE_Solver solver, HYPRE_Solver *precond_data_ptr );
+HYPRE_Int HYPRE_ParCSRCGNRSetLogging ( HYPRE_Solver solver, HYPRE_Int logging );
+HYPRE_Int HYPRE_ParCSRCGNRGetNumIterations ( HYPRE_Solver solver, HYPRE_Int *num_iterations );
+HYPRE_Int HYPRE_ParCSRCGNRGetFinalRelativeResidualNorm ( HYPRE_Solver solver, HYPRE_Real *norm );
 
 /* HYPRE_parcsr_Euclid.c */
-HYPRE_Int HYPRE_EuclidCreate ( MPI_Comm comm , HYPRE_Solver *solver );
+HYPRE_Int HYPRE_EuclidCreate ( MPI_Comm comm, HYPRE_Solver *solver );
 HYPRE_Int HYPRE_EuclidDestroy ( HYPRE_Solver solver );
-HYPRE_Int HYPRE_EuclidSetup ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_EuclidSolve ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector bb , HYPRE_ParVector xx );
-HYPRE_Int HYPRE_EuclidSetParams ( HYPRE_Solver solver , HYPRE_Int argc , char *argv []);
-HYPRE_Int HYPRE_EuclidSetParamsFromFile ( HYPRE_Solver solver , char *filename );
-HYPRE_Int HYPRE_EuclidSetLevel ( HYPRE_Solver solver , HYPRE_Int level );
-HYPRE_Int HYPRE_EuclidSetBJ ( HYPRE_Solver solver , HYPRE_Int bj );
-HYPRE_Int HYPRE_EuclidSetStats ( HYPRE_Solver solver , HYPRE_Int eu_stats );
-HYPRE_Int HYPRE_EuclidSetMem ( HYPRE_Solver solver , HYPRE_Int eu_mem );
-HYPRE_Int HYPRE_EuclidSetSparseA ( HYPRE_Solver solver , HYPRE_Real sparse_A );
-HYPRE_Int HYPRE_EuclidSetRowScale ( HYPRE_Solver solver , HYPRE_Int row_scale );
-HYPRE_Int HYPRE_EuclidSetILUT ( HYPRE_Solver solver , HYPRE_Real ilut );
+HYPRE_Int HYPRE_EuclidSetup ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                              HYPRE_ParVector x );
+HYPRE_Int HYPRE_EuclidSolve ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector bb,
+                              HYPRE_ParVector xx );
+HYPRE_Int HYPRE_EuclidSetParams ( HYPRE_Solver solver, HYPRE_Int argc, char *argv []);
+HYPRE_Int HYPRE_EuclidSetParamsFromFile ( HYPRE_Solver solver, char *filename );
+HYPRE_Int HYPRE_EuclidSetLevel ( HYPRE_Solver solver, HYPRE_Int level );
+HYPRE_Int HYPRE_EuclidSetBJ ( HYPRE_Solver solver, HYPRE_Int bj );
+HYPRE_Int HYPRE_EuclidSetStats ( HYPRE_Solver solver, HYPRE_Int eu_stats );
+HYPRE_Int HYPRE_EuclidSetMem ( HYPRE_Solver solver, HYPRE_Int eu_mem );
+HYPRE_Int HYPRE_EuclidSetSparseA ( HYPRE_Solver solver, HYPRE_Real sparse_A );
+HYPRE_Int HYPRE_EuclidSetRowScale ( HYPRE_Solver solver, HYPRE_Int row_scale );
+HYPRE_Int HYPRE_EuclidSetILUT ( HYPRE_Solver solver, HYPRE_Real ilut );
 
 /* HYPRE_parcsr_flexgmres.c */
-HYPRE_Int HYPRE_ParCSRFlexGMRESCreate ( MPI_Comm comm , HYPRE_Solver *solver );
+HYPRE_Int HYPRE_ParCSRFlexGMRESCreate ( MPI_Comm comm, HYPRE_Solver *solver );
 HYPRE_Int HYPRE_ParCSRFlexGMRESDestroy ( HYPRE_Solver solver );
-HYPRE_Int HYPRE_ParCSRFlexGMRESSetup ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_ParCSRFlexGMRESSolve ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_ParCSRFlexGMRESSetKDim ( HYPRE_Solver solver , HYPRE_Int k_dim );
-HYPRE_Int HYPRE_ParCSRFlexGMRESSetTol ( HYPRE_Solver solver , HYPRE_Real tol );
-HYPRE_Int HYPRE_ParCSRFlexGMRESSetAbsoluteTol ( HYPRE_Solver solver , HYPRE_Real a_tol );
-HYPRE_Int HYPRE_ParCSRFlexGMRESSetMinIter ( HYPRE_Solver solver , HYPRE_Int min_iter );
-HYPRE_Int HYPRE_ParCSRFlexGMRESSetMaxIter ( HYPRE_Solver solver , HYPRE_Int max_iter );
-HYPRE_Int HYPRE_ParCSRFlexGMRESSetPrecond ( HYPRE_Solver solver , HYPRE_PtrToParSolverFcn precond , HYPRE_PtrToParSolverFcn precond_setup , HYPRE_Solver precond_solver );
-HYPRE_Int HYPRE_ParCSRFlexGMRESGetPrecond ( HYPRE_Solver solver , HYPRE_Solver *precond_data_ptr );
-HYPRE_Int HYPRE_ParCSRFlexGMRESSetLogging ( HYPRE_Solver solver , HYPRE_Int logging );
-HYPRE_Int HYPRE_ParCSRFlexGMRESSetPrintLevel ( HYPRE_Solver solver , HYPRE_Int print_level );
-HYPRE_Int HYPRE_ParCSRFlexGMRESGetNumIterations ( HYPRE_Solver solver , HYPRE_Int *num_iterations );
-HYPRE_Int HYPRE_ParCSRFlexGMRESGetFinalRelativeResidualNorm ( HYPRE_Solver solver , HYPRE_Real *norm );
-HYPRE_Int HYPRE_ParCSRFlexGMRESGetResidual ( HYPRE_Solver solver , HYPRE_ParVector *residual );
-HYPRE_Int HYPRE_ParCSRFlexGMRESSetModifyPC ( HYPRE_Solver solver , HYPRE_PtrToModifyPCFcn modify_pc );
+HYPRE_Int HYPRE_ParCSRFlexGMRESSetup ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                                       HYPRE_ParVector x );
+HYPRE_Int HYPRE_ParCSRFlexGMRESSolve ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                                       HYPRE_ParVector x );
+HYPRE_Int HYPRE_ParCSRFlexGMRESSetKDim ( HYPRE_Solver solver, HYPRE_Int k_dim );
+HYPRE_Int HYPRE_ParCSRFlexGMRESSetTol ( HYPRE_Solver solver, HYPRE_Real tol );
+HYPRE_Int HYPRE_ParCSRFlexGMRESSetAbsoluteTol ( HYPRE_Solver solver, HYPRE_Real a_tol );
+HYPRE_Int HYPRE_ParCSRFlexGMRESSetMinIter ( HYPRE_Solver solver, HYPRE_Int min_iter );
+HYPRE_Int HYPRE_ParCSRFlexGMRESSetMaxIter ( HYPRE_Solver solver, HYPRE_Int max_iter );
+HYPRE_Int HYPRE_ParCSRFlexGMRESSetPrecond ( HYPRE_Solver solver, HYPRE_PtrToParSolverFcn precond,
+                                            HYPRE_PtrToParSolverFcn precond_setup, HYPRE_Solver precond_solver );
+HYPRE_Int HYPRE_ParCSRFlexGMRESGetPrecond ( HYPRE_Solver solver, HYPRE_Solver *precond_data_ptr );
+HYPRE_Int HYPRE_ParCSRFlexGMRESSetLogging ( HYPRE_Solver solver, HYPRE_Int logging );
+HYPRE_Int HYPRE_ParCSRFlexGMRESSetPrintLevel ( HYPRE_Solver solver, HYPRE_Int print_level );
+HYPRE_Int HYPRE_ParCSRFlexGMRESGetNumIterations ( HYPRE_Solver solver, HYPRE_Int *num_iterations );
+HYPRE_Int HYPRE_ParCSRFlexGMRESGetFinalRelativeResidualNorm ( HYPRE_Solver solver,
+                                                              HYPRE_Real *norm );
+HYPRE_Int HYPRE_ParCSRFlexGMRESGetResidual ( HYPRE_Solver solver, HYPRE_ParVector *residual );
+HYPRE_Int HYPRE_ParCSRFlexGMRESSetModifyPC ( HYPRE_Solver solver,
+                                             HYPRE_PtrToModifyPCFcn modify_pc );
 
 /* HYPRE_parcsr_gmres.c */
-HYPRE_Int HYPRE_ParCSRGMRESCreate ( MPI_Comm comm , HYPRE_Solver *solver );
+HYPRE_Int HYPRE_ParCSRGMRESCreate ( MPI_Comm comm, HYPRE_Solver *solver );
 HYPRE_Int HYPRE_ParCSRGMRESDestroy ( HYPRE_Solver solver );
-HYPRE_Int HYPRE_ParCSRGMRESSetup ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_ParCSRGMRESSolve ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_ParCSRGMRESSetKDim ( HYPRE_Solver solver , HYPRE_Int k_dim );
-HYPRE_Int HYPRE_ParCSRGMRESSetTol ( HYPRE_Solver solver , HYPRE_Real tol );
-HYPRE_Int HYPRE_ParCSRGMRESSetAbsoluteTol ( HYPRE_Solver solver , HYPRE_Real a_tol );
-HYPRE_Int HYPRE_ParCSRGMRESSetMinIter ( HYPRE_Solver solver , HYPRE_Int min_iter );
-HYPRE_Int HYPRE_ParCSRGMRESSetMaxIter ( HYPRE_Solver solver , HYPRE_Int max_iter );
-HYPRE_Int HYPRE_ParCSRGMRESSetStopCrit ( HYPRE_Solver solver , HYPRE_Int stop_crit );
-HYPRE_Int HYPRE_ParCSRGMRESSetPrecond ( HYPRE_Solver solver , HYPRE_PtrToParSolverFcn precond , HYPRE_PtrToParSolverFcn precond_setup , HYPRE_Solver precond_solver );
-HYPRE_Int HYPRE_ParCSRGMRESGetPrecond ( HYPRE_Solver solver , HYPRE_Solver *precond_data_ptr );
-HYPRE_Int HYPRE_ParCSRGMRESSetLogging ( HYPRE_Solver solver , HYPRE_Int logging );
-HYPRE_Int HYPRE_ParCSRGMRESSetPrintLevel ( HYPRE_Solver solver , HYPRE_Int print_level );
-HYPRE_Int HYPRE_ParCSRGMRESGetNumIterations ( HYPRE_Solver solver , HYPRE_Int *num_iterations );
-HYPRE_Int HYPRE_ParCSRGMRESGetFinalRelativeResidualNorm ( HYPRE_Solver solver , HYPRE_Real *norm );
-HYPRE_Int HYPRE_ParCSRGMRESGetResidual ( HYPRE_Solver solver , HYPRE_ParVector *residual );
+HYPRE_Int HYPRE_ParCSRGMRESSetup ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                                   HYPRE_ParVector x );
+HYPRE_Int HYPRE_ParCSRGMRESSolve ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                                   HYPRE_ParVector x );
+HYPRE_Int HYPRE_ParCSRGMRESSetKDim ( HYPRE_Solver solver, HYPRE_Int k_dim );
+HYPRE_Int HYPRE_ParCSRGMRESSetTol ( HYPRE_Solver solver, HYPRE_Real tol );
+HYPRE_Int HYPRE_ParCSRGMRESSetAbsoluteTol ( HYPRE_Solver solver, HYPRE_Real a_tol );
+HYPRE_Int HYPRE_ParCSRGMRESSetMinIter ( HYPRE_Solver solver, HYPRE_Int min_iter );
+HYPRE_Int HYPRE_ParCSRGMRESSetMaxIter ( HYPRE_Solver solver, HYPRE_Int max_iter );
+HYPRE_Int HYPRE_ParCSRGMRESSetStopCrit ( HYPRE_Solver solver, HYPRE_Int stop_crit );
+HYPRE_Int HYPRE_ParCSRGMRESSetPrecond ( HYPRE_Solver solver, HYPRE_PtrToParSolverFcn precond,
+                                        HYPRE_PtrToParSolverFcn precond_setup, HYPRE_Solver precond_solver );
+HYPRE_Int HYPRE_ParCSRGMRESGetPrecond ( HYPRE_Solver solver, HYPRE_Solver *precond_data_ptr );
+HYPRE_Int HYPRE_ParCSRGMRESSetLogging ( HYPRE_Solver solver, HYPRE_Int logging );
+HYPRE_Int HYPRE_ParCSRGMRESSetPrintLevel ( HYPRE_Solver solver, HYPRE_Int print_level );
+HYPRE_Int HYPRE_ParCSRGMRESGetNumIterations ( HYPRE_Solver solver, HYPRE_Int *num_iterations );
+HYPRE_Int HYPRE_ParCSRGMRESGetFinalRelativeResidualNorm ( HYPRE_Solver solver, HYPRE_Real *norm );
+HYPRE_Int HYPRE_ParCSRGMRESGetResidual ( HYPRE_Solver solver, HYPRE_ParVector *residual );
 
 
 /*HYPRE_parcsr_cogmres.c*/
-HYPRE_Int HYPRE_ParCSRCOGMRESCreate ( MPI_Comm comm , HYPRE_Solver *solver );
+HYPRE_Int HYPRE_ParCSRCOGMRESCreate ( MPI_Comm comm, HYPRE_Solver *solver );
 HYPRE_Int HYPRE_ParCSRCOGMRESDestroy ( HYPRE_Solver solver );
-HYPRE_Int HYPRE_ParCSRCOGMRESSetup ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_ParCSRCOGMRESSolve ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_ParCSRCOGMRESSetKDim ( HYPRE_Solver solver , HYPRE_Int k_dim );
-HYPRE_Int HYPRE_ParCSRCOGMRESSetCGS2 ( HYPRE_Solver solver , HYPRE_Int cgs2 );
-HYPRE_Int HYPRE_ParCSRCOGMRESSetTol ( HYPRE_Solver solver , HYPRE_Real tol );
-HYPRE_Int HYPRE_ParCSRCOGMRESSetAbsoluteTol ( HYPRE_Solver solver , HYPRE_Real a_tol );
-HYPRE_Int HYPRE_ParCSRCOGMRESSetMinIter ( HYPRE_Solver solver , HYPRE_Int min_iter );
-HYPRE_Int HYPRE_ParCSRCOGMRESSetMaxIter ( HYPRE_Solver solver , HYPRE_Int max_iter );
-HYPRE_Int HYPRE_ParCSRCOGMRESSetPrecond ( HYPRE_Solver solver , HYPRE_PtrToParSolverFcn precond , HYPRE_PtrToParSolverFcn precond_setup , HYPRE_Solver precond_solver );
-HYPRE_Int HYPRE_ParCSRCOGMRESGetPrecond ( HYPRE_Solver solver , HYPRE_Solver *precond_data_ptr );
-HYPRE_Int HYPRE_ParCSRCOGMRESSetLogging ( HYPRE_Solver solver , HYPRE_Int logging );
-HYPRE_Int HYPRE_ParCSRCOGMRESSetPrintLevel ( HYPRE_Solver solver , HYPRE_Int print_level );
-HYPRE_Int HYPRE_ParCSRCOGMRESGetNumIterations ( HYPRE_Solver solver , HYPRE_Int *num_iterations );
-HYPRE_Int HYPRE_ParCSRCOGMRESGetFinalRelativeResidualNorm ( HYPRE_Solver solver , HYPRE_Real *norm );
-HYPRE_Int HYPRE_ParCSRCOGMRESGetResidual ( HYPRE_Solver solver , HYPRE_ParVector *residual );
+HYPRE_Int HYPRE_ParCSRCOGMRESSetup ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                                     HYPRE_ParVector x );
+HYPRE_Int HYPRE_ParCSRCOGMRESSolve ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                                     HYPRE_ParVector x );
+HYPRE_Int HYPRE_ParCSRCOGMRESSetKDim ( HYPRE_Solver solver, HYPRE_Int k_dim );
+HYPRE_Int HYPRE_ParCSRCOGMRESSetCGS2 ( HYPRE_Solver solver, HYPRE_Int cgs2 );
+HYPRE_Int HYPRE_ParCSRCOGMRESSetTol ( HYPRE_Solver solver, HYPRE_Real tol );
+HYPRE_Int HYPRE_ParCSRCOGMRESSetAbsoluteTol ( HYPRE_Solver solver, HYPRE_Real a_tol );
+HYPRE_Int HYPRE_ParCSRCOGMRESSetMinIter ( HYPRE_Solver solver, HYPRE_Int min_iter );
+HYPRE_Int HYPRE_ParCSRCOGMRESSetMaxIter ( HYPRE_Solver solver, HYPRE_Int max_iter );
+HYPRE_Int HYPRE_ParCSRCOGMRESSetPrecond ( HYPRE_Solver solver, HYPRE_PtrToParSolverFcn precond,
+                                          HYPRE_PtrToParSolverFcn precond_setup, HYPRE_Solver precond_solver );
+HYPRE_Int HYPRE_ParCSRCOGMRESGetPrecond ( HYPRE_Solver solver, HYPRE_Solver *precond_data_ptr );
+HYPRE_Int HYPRE_ParCSRCOGMRESSetLogging ( HYPRE_Solver solver, HYPRE_Int logging );
+HYPRE_Int HYPRE_ParCSRCOGMRESSetPrintLevel ( HYPRE_Solver solver, HYPRE_Int print_level );
+HYPRE_Int HYPRE_ParCSRCOGMRESGetNumIterations ( HYPRE_Solver solver, HYPRE_Int *num_iterations );
+HYPRE_Int HYPRE_ParCSRCOGMRESGetFinalRelativeResidualNorm ( HYPRE_Solver solver, HYPRE_Real *norm );
+HYPRE_Int HYPRE_ParCSRCOGMRESGetResidual ( HYPRE_Solver solver, HYPRE_ParVector *residual );
 
 
 
 /* HYPRE_parcsr_hybrid.c */
 HYPRE_Int HYPRE_ParCSRHybridCreate ( HYPRE_Solver *solver );
 HYPRE_Int HYPRE_ParCSRHybridDestroy ( HYPRE_Solver solver );
-HYPRE_Int HYPRE_ParCSRHybridSetup ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_ParCSRHybridSolve ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_ParCSRHybridSetTol ( HYPRE_Solver solver , HYPRE_Real tol );
-HYPRE_Int HYPRE_ParCSRHybridSetAbsoluteTol ( HYPRE_Solver solver , HYPRE_Real tol );
-HYPRE_Int HYPRE_ParCSRHybridSetConvergenceTol ( HYPRE_Solver solver , HYPRE_Real cf_tol );
-HYPRE_Int HYPRE_ParCSRHybridSetDSCGMaxIter ( HYPRE_Solver solver , HYPRE_Int dscg_max_its );
-HYPRE_Int HYPRE_ParCSRHybridSetPCGMaxIter ( HYPRE_Solver solver , HYPRE_Int pcg_max_its );
-HYPRE_Int HYPRE_ParCSRHybridSetSetupType ( HYPRE_Solver solver , HYPRE_Int setup_type );
-HYPRE_Int HYPRE_ParCSRHybridSetSolverType ( HYPRE_Solver solver , HYPRE_Int solver_type );
-HYPRE_Int HYPRE_ParCSRHybridSetKDim ( HYPRE_Solver solver , HYPRE_Int k_dim );
-HYPRE_Int HYPRE_ParCSRHybridSetTwoNorm ( HYPRE_Solver solver , HYPRE_Int two_norm );
-HYPRE_Int HYPRE_ParCSRHybridSetStopCrit ( HYPRE_Solver solver , HYPRE_Int stop_crit );
-HYPRE_Int HYPRE_ParCSRHybridSetRelChange ( HYPRE_Solver solver , HYPRE_Int rel_change );
-HYPRE_Int HYPRE_ParCSRHybridSetPrecond ( HYPRE_Solver solver , HYPRE_PtrToParSolverFcn precond , HYPRE_PtrToParSolverFcn precond_setup , HYPRE_Solver precond_solver );
-HYPRE_Int HYPRE_ParCSRHybridSetLogging ( HYPRE_Solver solver , HYPRE_Int logging );
-HYPRE_Int HYPRE_ParCSRHybridSetPrintLevel ( HYPRE_Solver solver , HYPRE_Int print_level );
-HYPRE_Int HYPRE_ParCSRHybridSetStrongThreshold ( HYPRE_Solver solver , HYPRE_Real strong_threshold );
-HYPRE_Int HYPRE_ParCSRHybridSetMaxRowSum ( HYPRE_Solver solver , HYPRE_Real max_row_sum );
-HYPRE_Int HYPRE_ParCSRHybridSetTruncFactor ( HYPRE_Solver solver , HYPRE_Real trunc_factor );
-HYPRE_Int HYPRE_ParCSRHybridSetPMaxElmts ( HYPRE_Solver solver , HYPRE_Int p_max );
-HYPRE_Int HYPRE_ParCSRHybridSetMaxLevels ( HYPRE_Solver solver , HYPRE_Int max_levels );
-HYPRE_Int HYPRE_ParCSRHybridSetMeasureType ( HYPRE_Solver solver , HYPRE_Int measure_type );
-HYPRE_Int HYPRE_ParCSRHybridSetCoarsenType ( HYPRE_Solver solver , HYPRE_Int coarsen_type );
-HYPRE_Int HYPRE_ParCSRHybridSetInterpType ( HYPRE_Solver solver , HYPRE_Int interp_type );
-HYPRE_Int HYPRE_ParCSRHybridSetCycleType ( HYPRE_Solver solver , HYPRE_Int cycle_type );
-HYPRE_Int HYPRE_ParCSRHybridSetNumGridSweeps ( HYPRE_Solver solver , HYPRE_Int *num_grid_sweeps );
-HYPRE_Int HYPRE_ParCSRHybridSetGridRelaxType ( HYPRE_Solver solver , HYPRE_Int *grid_relax_type );
-HYPRE_Int HYPRE_ParCSRHybridSetGridRelaxPoints ( HYPRE_Solver solver , HYPRE_Int **grid_relax_points );
-HYPRE_Int HYPRE_ParCSRHybridSetNumSweeps ( HYPRE_Solver solver , HYPRE_Int num_sweeps );
-HYPRE_Int HYPRE_ParCSRHybridSetCycleNumSweeps ( HYPRE_Solver solver , HYPRE_Int num_sweeps , HYPRE_Int k );
-HYPRE_Int HYPRE_ParCSRHybridSetRelaxType ( HYPRE_Solver solver , HYPRE_Int relax_type );
-HYPRE_Int HYPRE_ParCSRHybridSetKeepTranspose ( HYPRE_Solver solver , HYPRE_Int keepT );
-HYPRE_Int HYPRE_ParCSRHybridSetCycleRelaxType ( HYPRE_Solver solver , HYPRE_Int relax_type , HYPRE_Int k );
-HYPRE_Int HYPRE_ParCSRHybridSetRelaxOrder ( HYPRE_Solver solver , HYPRE_Int relax_order );
-HYPRE_Int HYPRE_ParCSRHybridSetMaxCoarseSize ( HYPRE_Solver solver , HYPRE_Int max_coarse_size );
-HYPRE_Int HYPRE_ParCSRHybridSetMinCoarseSize ( HYPRE_Solver solver , HYPRE_Int min_coarse_size );
-HYPRE_Int HYPRE_ParCSRHybridSetSeqThreshold ( HYPRE_Solver solver , HYPRE_Int seq_threshold );
-HYPRE_Int HYPRE_ParCSRHybridSetRelaxWt ( HYPRE_Solver solver , HYPRE_Real relax_wt );
-HYPRE_Int HYPRE_ParCSRHybridSetLevelRelaxWt ( HYPRE_Solver solver , HYPRE_Real relax_wt , HYPRE_Int level );
-HYPRE_Int HYPRE_ParCSRHybridSetOuterWt ( HYPRE_Solver solver , HYPRE_Real outer_wt );
-HYPRE_Int HYPRE_ParCSRHybridSetLevelOuterWt ( HYPRE_Solver solver , HYPRE_Real outer_wt , HYPRE_Int level );
-HYPRE_Int HYPRE_ParCSRHybridSetRelaxWeight ( HYPRE_Solver solver , HYPRE_Real *relax_weight );
-HYPRE_Int HYPRE_ParCSRHybridSetOmega ( HYPRE_Solver solver , HYPRE_Real *omega );
-HYPRE_Int HYPRE_ParCSRHybridSetAggNumLevels ( HYPRE_Solver solver , HYPRE_Int agg_num_levels );
-HYPRE_Int HYPRE_ParCSRHybridSetNumPaths ( HYPRE_Solver solver , HYPRE_Int num_paths );
-HYPRE_Int HYPRE_ParCSRHybridSetNumFunctions ( HYPRE_Solver solver , HYPRE_Int num_functions );
-HYPRE_Int HYPRE_ParCSRHybridSetNodal ( HYPRE_Solver solver , HYPRE_Int nodal );
-HYPRE_Int HYPRE_ParCSRHybridSetDofFunc ( HYPRE_Solver solver , HYPRE_Int *dof_func );
-HYPRE_Int HYPRE_ParCSRHybridSetNonGalerkinTol ( HYPRE_Solver solver , HYPRE_Int nongalerk_num_tol, HYPRE_Real *nongalerkin_tol );
-HYPRE_Int HYPRE_ParCSRHybridGetNumIterations ( HYPRE_Solver solver , HYPRE_Int *num_its );
-HYPRE_Int HYPRE_ParCSRHybridGetDSCGNumIterations ( HYPRE_Solver solver , HYPRE_Int *dscg_num_its );
-HYPRE_Int HYPRE_ParCSRHybridGetPCGNumIterations ( HYPRE_Solver solver , HYPRE_Int *pcg_num_its );
-HYPRE_Int HYPRE_ParCSRHybridGetFinalRelativeResidualNorm ( HYPRE_Solver solver , HYPRE_Real *norm );
+HYPRE_Int HYPRE_ParCSRHybridSetup ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                                    HYPRE_ParVector x );
+HYPRE_Int HYPRE_ParCSRHybridSolve ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                                    HYPRE_ParVector x );
+HYPRE_Int HYPRE_ParCSRHybridSetTol ( HYPRE_Solver solver, HYPRE_Real tol );
+HYPRE_Int HYPRE_ParCSRHybridSetAbsoluteTol ( HYPRE_Solver solver, HYPRE_Real tol );
+HYPRE_Int HYPRE_ParCSRHybridSetConvergenceTol ( HYPRE_Solver solver, HYPRE_Real cf_tol );
+HYPRE_Int HYPRE_ParCSRHybridSetDSCGMaxIter ( HYPRE_Solver solver, HYPRE_Int dscg_max_its );
+HYPRE_Int HYPRE_ParCSRHybridSetPCGMaxIter ( HYPRE_Solver solver, HYPRE_Int pcg_max_its );
+HYPRE_Int HYPRE_ParCSRHybridSetSetupType ( HYPRE_Solver solver, HYPRE_Int setup_type );
+HYPRE_Int HYPRE_ParCSRHybridSetSolverType ( HYPRE_Solver solver, HYPRE_Int solver_type );
+HYPRE_Int HYPRE_ParCSRHybridSetKDim ( HYPRE_Solver solver, HYPRE_Int k_dim );
+HYPRE_Int HYPRE_ParCSRHybridSetTwoNorm ( HYPRE_Solver solver, HYPRE_Int two_norm );
+HYPRE_Int HYPRE_ParCSRHybridSetStopCrit ( HYPRE_Solver solver, HYPRE_Int stop_crit );
+HYPRE_Int HYPRE_ParCSRHybridSetRelChange ( HYPRE_Solver solver, HYPRE_Int rel_change );
+HYPRE_Int HYPRE_ParCSRHybridSetPrecond ( HYPRE_Solver solver, HYPRE_PtrToParSolverFcn precond,
+                                         HYPRE_PtrToParSolverFcn precond_setup, HYPRE_Solver precond_solver );
+HYPRE_Int HYPRE_ParCSRHybridSetLogging ( HYPRE_Solver solver, HYPRE_Int logging );
+HYPRE_Int HYPRE_ParCSRHybridSetPrintLevel ( HYPRE_Solver solver, HYPRE_Int print_level );
+HYPRE_Int HYPRE_ParCSRHybridSetStrongThreshold ( HYPRE_Solver solver, HYPRE_Real strong_threshold );
+HYPRE_Int HYPRE_ParCSRHybridSetMaxRowSum ( HYPRE_Solver solver, HYPRE_Real max_row_sum );
+HYPRE_Int HYPRE_ParCSRHybridSetTruncFactor ( HYPRE_Solver solver, HYPRE_Real trunc_factor );
+HYPRE_Int HYPRE_ParCSRHybridSetPMaxElmts ( HYPRE_Solver solver, HYPRE_Int p_max );
+HYPRE_Int HYPRE_ParCSRHybridSetMaxLevels ( HYPRE_Solver solver, HYPRE_Int max_levels );
+HYPRE_Int HYPRE_ParCSRHybridSetMeasureType ( HYPRE_Solver solver, HYPRE_Int measure_type );
+HYPRE_Int HYPRE_ParCSRHybridSetCoarsenType ( HYPRE_Solver solver, HYPRE_Int coarsen_type );
+HYPRE_Int HYPRE_ParCSRHybridSetInterpType ( HYPRE_Solver solver, HYPRE_Int interp_type );
+HYPRE_Int HYPRE_ParCSRHybridSetCycleType ( HYPRE_Solver solver, HYPRE_Int cycle_type );
+HYPRE_Int HYPRE_ParCSRHybridSetNumGridSweeps ( HYPRE_Solver solver, HYPRE_Int *num_grid_sweeps );
+HYPRE_Int HYPRE_ParCSRHybridSetGridRelaxType ( HYPRE_Solver solver, HYPRE_Int *grid_relax_type );
+HYPRE_Int HYPRE_ParCSRHybridSetGridRelaxPoints ( HYPRE_Solver solver,
+                                                 HYPRE_Int **grid_relax_points );
+HYPRE_Int HYPRE_ParCSRHybridSetNumSweeps ( HYPRE_Solver solver, HYPRE_Int num_sweeps );
+HYPRE_Int HYPRE_ParCSRHybridSetCycleNumSweeps ( HYPRE_Solver solver, HYPRE_Int num_sweeps,
+                                                HYPRE_Int k );
+HYPRE_Int HYPRE_ParCSRHybridSetRelaxType ( HYPRE_Solver solver, HYPRE_Int relax_type );
+HYPRE_Int HYPRE_ParCSRHybridSetKeepTranspose ( HYPRE_Solver solver, HYPRE_Int keepT );
+HYPRE_Int HYPRE_ParCSRHybridSetCycleRelaxType ( HYPRE_Solver solver, HYPRE_Int relax_type,
+                                                HYPRE_Int k );
+HYPRE_Int HYPRE_ParCSRHybridSetRelaxOrder ( HYPRE_Solver solver, HYPRE_Int relax_order );
+HYPRE_Int HYPRE_ParCSRHybridSetMaxCoarseSize ( HYPRE_Solver solver, HYPRE_Int max_coarse_size );
+HYPRE_Int HYPRE_ParCSRHybridSetMinCoarseSize ( HYPRE_Solver solver, HYPRE_Int min_coarse_size );
+HYPRE_Int HYPRE_ParCSRHybridSetSeqThreshold ( HYPRE_Solver solver, HYPRE_Int seq_threshold );
+HYPRE_Int HYPRE_ParCSRHybridSetRelaxWt ( HYPRE_Solver solver, HYPRE_Real relax_wt );
+HYPRE_Int HYPRE_ParCSRHybridSetLevelRelaxWt ( HYPRE_Solver solver, HYPRE_Real relax_wt,
+                                              HYPRE_Int level );
+HYPRE_Int HYPRE_ParCSRHybridSetOuterWt ( HYPRE_Solver solver, HYPRE_Real outer_wt );
+HYPRE_Int HYPRE_ParCSRHybridSetLevelOuterWt ( HYPRE_Solver solver, HYPRE_Real outer_wt,
+                                              HYPRE_Int level );
+HYPRE_Int HYPRE_ParCSRHybridSetRelaxWeight ( HYPRE_Solver solver, HYPRE_Real *relax_weight );
+HYPRE_Int HYPRE_ParCSRHybridSetOmega ( HYPRE_Solver solver, HYPRE_Real *omega );
+HYPRE_Int HYPRE_ParCSRHybridSetAggNumLevels ( HYPRE_Solver solver, HYPRE_Int agg_num_levels );
+HYPRE_Int HYPRE_ParCSRHybridSetNumPaths ( HYPRE_Solver solver, HYPRE_Int num_paths );
+HYPRE_Int HYPRE_ParCSRHybridSetNumFunctions ( HYPRE_Solver solver, HYPRE_Int num_functions );
+HYPRE_Int HYPRE_ParCSRHybridSetNodal ( HYPRE_Solver solver, HYPRE_Int nodal );
+HYPRE_Int HYPRE_ParCSRHybridSetDofFunc ( HYPRE_Solver solver, HYPRE_Int *dof_func );
+HYPRE_Int HYPRE_ParCSRHybridSetNonGalerkinTol ( HYPRE_Solver solver, HYPRE_Int nongalerk_num_tol,
+                                                HYPRE_Real *nongalerkin_tol );
+HYPRE_Int HYPRE_ParCSRHybridGetNumIterations ( HYPRE_Solver solver, HYPRE_Int *num_its );
+HYPRE_Int HYPRE_ParCSRHybridGetDSCGNumIterations ( HYPRE_Solver solver, HYPRE_Int *dscg_num_its );
+HYPRE_Int HYPRE_ParCSRHybridGetPCGNumIterations ( HYPRE_Solver solver, HYPRE_Int *pcg_num_its );
+HYPRE_Int HYPRE_ParCSRHybridGetFinalRelativeResidualNorm ( HYPRE_Solver solver, HYPRE_Real *norm );
 HYPRE_Int HYPRE_ParCSRHybridGetSetupSolveTime( HYPRE_Solver solver, HYPRE_Real *time );
 
 /* HYPRE_parcsr_int.c */
-HYPRE_Int hypre_ParSetRandomValues ( void *v , HYPRE_Int seed );
-HYPRE_Int hypre_ParPrintVector ( void *v , const char *file );
-void *hypre_ParReadVector ( MPI_Comm comm , const char *file );
+HYPRE_Int hypre_ParSetRandomValues ( void *v, HYPRE_Int seed );
+HYPRE_Int hypre_ParPrintVector ( void *v, const char *file );
+void *hypre_ParReadVector ( MPI_Comm comm, const char *file );
 HYPRE_Int hypre_ParVectorSize ( void *x );
-HYPRE_Int HYPRE_ParCSRMultiVectorPrint ( void *x_ , const char *fileName );
-void *HYPRE_ParCSRMultiVectorRead ( MPI_Comm comm , void *ii_ , const char *fileName );
-HYPRE_Int aux_maskCount ( HYPRE_Int n , HYPRE_Int *mask );
-void aux_indexFromMask ( HYPRE_Int n , HYPRE_Int *mask , HYPRE_Int *index );
+HYPRE_Int HYPRE_ParCSRMultiVectorPrint ( void *x_, const char *fileName );
+void *HYPRE_ParCSRMultiVectorRead ( MPI_Comm comm, void *ii_, const char *fileName );
+HYPRE_Int aux_maskCount ( HYPRE_Int n, HYPRE_Int *mask );
+void aux_indexFromMask ( HYPRE_Int n, HYPRE_Int *mask, HYPRE_Int *index );
 HYPRE_Int HYPRE_TempParCSRSetupInterpreter ( mv_InterfaceInterpreter *i );
 HYPRE_Int HYPRE_ParCSRSetupInterpreter ( mv_InterfaceInterpreter *i );
 HYPRE_Int HYPRE_ParCSRSetupMatvec ( HYPRE_MatvecFunctions *mv );
 
 /* HYPRE_parcsr_lgmres.c */
-HYPRE_Int HYPRE_ParCSRLGMRESCreate ( MPI_Comm comm , HYPRE_Solver *solver );
+HYPRE_Int HYPRE_ParCSRLGMRESCreate ( MPI_Comm comm, HYPRE_Solver *solver );
 HYPRE_Int HYPRE_ParCSRLGMRESDestroy ( HYPRE_Solver solver );
-HYPRE_Int HYPRE_ParCSRLGMRESSetup ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_ParCSRLGMRESSolve ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_ParCSRLGMRESSetKDim ( HYPRE_Solver solver , HYPRE_Int k_dim );
-HYPRE_Int HYPRE_ParCSRLGMRESSetAugDim ( HYPRE_Solver solver , HYPRE_Int aug_dim );
-HYPRE_Int HYPRE_ParCSRLGMRESSetTol ( HYPRE_Solver solver , HYPRE_Real tol );
-HYPRE_Int HYPRE_ParCSRLGMRESSetAbsoluteTol ( HYPRE_Solver solver , HYPRE_Real a_tol );
-HYPRE_Int HYPRE_ParCSRLGMRESSetMinIter ( HYPRE_Solver solver , HYPRE_Int min_iter );
-HYPRE_Int HYPRE_ParCSRLGMRESSetMaxIter ( HYPRE_Solver solver , HYPRE_Int max_iter );
-HYPRE_Int HYPRE_ParCSRLGMRESSetPrecond ( HYPRE_Solver solver , HYPRE_PtrToParSolverFcn precond , HYPRE_PtrToParSolverFcn precond_setup , HYPRE_Solver precond_solver );
-HYPRE_Int HYPRE_ParCSRLGMRESGetPrecond ( HYPRE_Solver solver , HYPRE_Solver *precond_data_ptr );
-HYPRE_Int HYPRE_ParCSRLGMRESSetLogging ( HYPRE_Solver solver , HYPRE_Int logging );
-HYPRE_Int HYPRE_ParCSRLGMRESSetPrintLevel ( HYPRE_Solver solver , HYPRE_Int print_level );
-HYPRE_Int HYPRE_ParCSRLGMRESGetNumIterations ( HYPRE_Solver solver , HYPRE_Int *num_iterations );
-HYPRE_Int HYPRE_ParCSRLGMRESGetFinalRelativeResidualNorm ( HYPRE_Solver solver , HYPRE_Real *norm );
-HYPRE_Int HYPRE_ParCSRLGMRESGetResidual ( HYPRE_Solver solver , HYPRE_ParVector *residual );
+HYPRE_Int HYPRE_ParCSRLGMRESSetup ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                                    HYPRE_ParVector x );
+HYPRE_Int HYPRE_ParCSRLGMRESSolve ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                                    HYPRE_ParVector x );
+HYPRE_Int HYPRE_ParCSRLGMRESSetKDim ( HYPRE_Solver solver, HYPRE_Int k_dim );
+HYPRE_Int HYPRE_ParCSRLGMRESSetAugDim ( HYPRE_Solver solver, HYPRE_Int aug_dim );
+HYPRE_Int HYPRE_ParCSRLGMRESSetTol ( HYPRE_Solver solver, HYPRE_Real tol );
+HYPRE_Int HYPRE_ParCSRLGMRESSetAbsoluteTol ( HYPRE_Solver solver, HYPRE_Real a_tol );
+HYPRE_Int HYPRE_ParCSRLGMRESSetMinIter ( HYPRE_Solver solver, HYPRE_Int min_iter );
+HYPRE_Int HYPRE_ParCSRLGMRESSetMaxIter ( HYPRE_Solver solver, HYPRE_Int max_iter );
+HYPRE_Int HYPRE_ParCSRLGMRESSetPrecond ( HYPRE_Solver solver, HYPRE_PtrToParSolverFcn precond,
+                                         HYPRE_PtrToParSolverFcn precond_setup, HYPRE_Solver precond_solver );
+HYPRE_Int HYPRE_ParCSRLGMRESGetPrecond ( HYPRE_Solver solver, HYPRE_Solver *precond_data_ptr );
+HYPRE_Int HYPRE_ParCSRLGMRESSetLogging ( HYPRE_Solver solver, HYPRE_Int logging );
+HYPRE_Int HYPRE_ParCSRLGMRESSetPrintLevel ( HYPRE_Solver solver, HYPRE_Int print_level );
+HYPRE_Int HYPRE_ParCSRLGMRESGetNumIterations ( HYPRE_Solver solver, HYPRE_Int *num_iterations );
+HYPRE_Int HYPRE_ParCSRLGMRESGetFinalRelativeResidualNorm ( HYPRE_Solver solver, HYPRE_Real *norm );
+HYPRE_Int HYPRE_ParCSRLGMRESGetResidual ( HYPRE_Solver solver, HYPRE_ParVector *residual );
 
 /* HYPRE_parcsr_ParaSails.c */
-HYPRE_Int HYPRE_ParCSRParaSailsCreate ( MPI_Comm comm , HYPRE_Solver *solver );
+HYPRE_Int HYPRE_ParCSRParaSailsCreate ( MPI_Comm comm, HYPRE_Solver *solver );
 HYPRE_Int HYPRE_ParCSRParaSailsDestroy ( HYPRE_Solver solver );
-HYPRE_Int HYPRE_ParCSRParaSailsSetup ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_ParCSRParaSailsSolve ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_ParCSRParaSailsSetParams ( HYPRE_Solver solver , HYPRE_Real thresh , HYPRE_Int nlevels );
-HYPRE_Int HYPRE_ParCSRParaSailsSetFilter ( HYPRE_Solver solver , HYPRE_Real filter );
-HYPRE_Int HYPRE_ParCSRParaSailsGetFilter ( HYPRE_Solver solver , HYPRE_Real *filter );
-HYPRE_Int HYPRE_ParCSRParaSailsSetSym ( HYPRE_Solver solver , HYPRE_Int sym );
-HYPRE_Int HYPRE_ParCSRParaSailsSetLoadbal ( HYPRE_Solver solver , HYPRE_Real loadbal );
-HYPRE_Int HYPRE_ParCSRParaSailsGetLoadbal ( HYPRE_Solver solver , HYPRE_Real *loadbal );
-HYPRE_Int HYPRE_ParCSRParaSailsSetReuse ( HYPRE_Solver solver , HYPRE_Int reuse );
-HYPRE_Int HYPRE_ParCSRParaSailsSetLogging ( HYPRE_Solver solver , HYPRE_Int logging );
-HYPRE_Int HYPRE_ParaSailsCreate ( MPI_Comm comm , HYPRE_Solver *solver );
+HYPRE_Int HYPRE_ParCSRParaSailsSetup ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                                       HYPRE_ParVector x );
+HYPRE_Int HYPRE_ParCSRParaSailsSolve ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                                       HYPRE_ParVector x );
+HYPRE_Int HYPRE_ParCSRParaSailsSetParams ( HYPRE_Solver solver, HYPRE_Real thresh,
+                                           HYPRE_Int nlevels );
+HYPRE_Int HYPRE_ParCSRParaSailsSetFilter ( HYPRE_Solver solver, HYPRE_Real filter );
+HYPRE_Int HYPRE_ParCSRParaSailsGetFilter ( HYPRE_Solver solver, HYPRE_Real *filter );
+HYPRE_Int HYPRE_ParCSRParaSailsSetSym ( HYPRE_Solver solver, HYPRE_Int sym );
+HYPRE_Int HYPRE_ParCSRParaSailsSetLoadbal ( HYPRE_Solver solver, HYPRE_Real loadbal );
+HYPRE_Int HYPRE_ParCSRParaSailsGetLoadbal ( HYPRE_Solver solver, HYPRE_Real *loadbal );
+HYPRE_Int HYPRE_ParCSRParaSailsSetReuse ( HYPRE_Solver solver, HYPRE_Int reuse );
+HYPRE_Int HYPRE_ParCSRParaSailsSetLogging ( HYPRE_Solver solver, HYPRE_Int logging );
+HYPRE_Int HYPRE_ParaSailsCreate ( MPI_Comm comm, HYPRE_Solver *solver );
 HYPRE_Int HYPRE_ParaSailsDestroy ( HYPRE_Solver solver );
-HYPRE_Int HYPRE_ParaSailsSetup ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_ParaSailsSolve ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_ParaSailsSetParams ( HYPRE_Solver solver , HYPRE_Real thresh , HYPRE_Int nlevels );
-HYPRE_Int HYPRE_ParaSailsSetThresh ( HYPRE_Solver solver , HYPRE_Real thresh );
-HYPRE_Int HYPRE_ParaSailsGetThresh ( HYPRE_Solver solver , HYPRE_Real *thresh );
-HYPRE_Int HYPRE_ParaSailsSetNlevels ( HYPRE_Solver solver , HYPRE_Int nlevels );
-HYPRE_Int HYPRE_ParaSailsGetNlevels ( HYPRE_Solver solver , HYPRE_Int *nlevels );
-HYPRE_Int HYPRE_ParaSailsSetFilter ( HYPRE_Solver solver , HYPRE_Real filter );
-HYPRE_Int HYPRE_ParaSailsGetFilter ( HYPRE_Solver solver , HYPRE_Real *filter );
-HYPRE_Int HYPRE_ParaSailsSetSym ( HYPRE_Solver solver , HYPRE_Int sym );
-HYPRE_Int HYPRE_ParaSailsGetSym ( HYPRE_Solver solver , HYPRE_Int *sym );
-HYPRE_Int HYPRE_ParaSailsSetLoadbal ( HYPRE_Solver solver , HYPRE_Real loadbal );
-HYPRE_Int HYPRE_ParaSailsGetLoadbal ( HYPRE_Solver solver , HYPRE_Real *loadbal );
-HYPRE_Int HYPRE_ParaSailsSetReuse ( HYPRE_Solver solver , HYPRE_Int reuse );
-HYPRE_Int HYPRE_ParaSailsGetReuse ( HYPRE_Solver solver , HYPRE_Int *reuse );
-HYPRE_Int HYPRE_ParaSailsSetLogging ( HYPRE_Solver solver , HYPRE_Int logging );
-HYPRE_Int HYPRE_ParaSailsGetLogging ( HYPRE_Solver solver , HYPRE_Int *logging );
-HYPRE_Int HYPRE_ParaSailsBuildIJMatrix ( HYPRE_Solver solver , HYPRE_IJMatrix *pij_A );
+HYPRE_Int HYPRE_ParaSailsSetup ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                                 HYPRE_ParVector x );
+HYPRE_Int HYPRE_ParaSailsSolve ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                                 HYPRE_ParVector x );
+HYPRE_Int HYPRE_ParaSailsSetParams ( HYPRE_Solver solver, HYPRE_Real thresh, HYPRE_Int nlevels );
+HYPRE_Int HYPRE_ParaSailsSetThresh ( HYPRE_Solver solver, HYPRE_Real thresh );
+HYPRE_Int HYPRE_ParaSailsGetThresh ( HYPRE_Solver solver, HYPRE_Real *thresh );
+HYPRE_Int HYPRE_ParaSailsSetNlevels ( HYPRE_Solver solver, HYPRE_Int nlevels );
+HYPRE_Int HYPRE_ParaSailsGetNlevels ( HYPRE_Solver solver, HYPRE_Int *nlevels );
+HYPRE_Int HYPRE_ParaSailsSetFilter ( HYPRE_Solver solver, HYPRE_Real filter );
+HYPRE_Int HYPRE_ParaSailsGetFilter ( HYPRE_Solver solver, HYPRE_Real *filter );
+HYPRE_Int HYPRE_ParaSailsSetSym ( HYPRE_Solver solver, HYPRE_Int sym );
+HYPRE_Int HYPRE_ParaSailsGetSym ( HYPRE_Solver solver, HYPRE_Int *sym );
+HYPRE_Int HYPRE_ParaSailsSetLoadbal ( HYPRE_Solver solver, HYPRE_Real loadbal );
+HYPRE_Int HYPRE_ParaSailsGetLoadbal ( HYPRE_Solver solver, HYPRE_Real *loadbal );
+HYPRE_Int HYPRE_ParaSailsSetReuse ( HYPRE_Solver solver, HYPRE_Int reuse );
+HYPRE_Int HYPRE_ParaSailsGetReuse ( HYPRE_Solver solver, HYPRE_Int *reuse );
+HYPRE_Int HYPRE_ParaSailsSetLogging ( HYPRE_Solver solver, HYPRE_Int logging );
+HYPRE_Int HYPRE_ParaSailsGetLogging ( HYPRE_Solver solver, HYPRE_Int *logging );
+HYPRE_Int HYPRE_ParaSailsBuildIJMatrix ( HYPRE_Solver solver, HYPRE_IJMatrix *pij_A );
+
+/* HYPRE_parcsr_fsai.c */
+HYPRE_Int HYPRE_FSAICreate ( HYPRE_Solver *solver);
+HYPRE_Int HYPRE_FSAIDestroy ( HYPRE_Solver solver );
+HYPRE_Int HYPRE_FSAISetup ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                            HYPRE_ParVector x );
+HYPRE_Int HYPRE_FSAISolve ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                            HYPRE_ParVector x );
+HYPRE_Int HYPRE_FSAISetAlgoType ( HYPRE_Solver solver, HYPRE_Int algo_type );
+HYPRE_Int HYPRE_FSAIGetAlgoType ( HYPRE_Solver solver, HYPRE_Int *algo_type );
+HYPRE_Int HYPRE_FSAISetLocalSolveType ( HYPRE_Solver solver, HYPRE_Int local_solve_type );
+HYPRE_Int HYPRE_FSAIGetLocalSolveType ( HYPRE_Solver solver, HYPRE_Int *local_solve_type );
+HYPRE_Int HYPRE_FSAISetMaxSteps ( HYPRE_Solver solver, HYPRE_Int max_steps );
+HYPRE_Int HYPRE_FSAIGetMaxSteps ( HYPRE_Solver solver, HYPRE_Int *max_steps );
+HYPRE_Int HYPRE_FSAISetMaxStepSize ( HYPRE_Solver solver, HYPRE_Int max_step_size );
+HYPRE_Int HYPRE_FSAIGetMaxStepSize ( HYPRE_Solver solver, HYPRE_Int *max_step_size );
+HYPRE_Int HYPRE_FSAISetMaxNnzRow ( HYPRE_Solver solver, HYPRE_Int max_nnz_row );
+HYPRE_Int HYPRE_FSAIGetMaxNnzRow ( HYPRE_Solver solver, HYPRE_Int *max_nnz_row );
+HYPRE_Int HYPRE_FSAISetNumLevels ( HYPRE_Solver solver, HYPRE_Int num_levels );
+HYPRE_Int HYPRE_FSAIGetNumLevels ( HYPRE_Solver solver, HYPRE_Int *num_levels );
+HYPRE_Int HYPRE_FSAISetThreshold ( HYPRE_Solver solver, HYPRE_Real threshold );
+HYPRE_Int HYPRE_FSAIGetThreshold ( HYPRE_Solver solver, HYPRE_Real *threshold );
+HYPRE_Int HYPRE_FSAISetKapTolerance ( HYPRE_Solver solver, HYPRE_Real kap_tolerance );
+HYPRE_Int HYPRE_FSAIGetKapTolerance ( HYPRE_Solver solver, HYPRE_Real *kap_tolerance );
+HYPRE_Int HYPRE_FSAISetTolerance ( HYPRE_Solver solver, HYPRE_Real tolerance );
+HYPRE_Int HYPRE_FSAIGetTolerance ( HYPRE_Solver solver, HYPRE_Real *tolerance );
+HYPRE_Int HYPRE_FSAISetOmega ( HYPRE_Solver solver, HYPRE_Real omega );
+HYPRE_Int HYPRE_FSAIGetOmega ( HYPRE_Solver solver, HYPRE_Real *omega );
+HYPRE_Int HYPRE_FSAISetMaxIterations ( HYPRE_Solver solver, HYPRE_Int max_iterations );
+HYPRE_Int HYPRE_FSAIGetMaxIterations ( HYPRE_Solver solver, HYPRE_Int *max_iterations );
+HYPRE_Int HYPRE_FSAISetEigMaxIters ( HYPRE_Solver solver, HYPRE_Int eig_max_iters );
+HYPRE_Int HYPRE_FSAIGetEigMaxIters ( HYPRE_Solver solver, HYPRE_Int *eig_max_iters );
+HYPRE_Int HYPRE_FSAISetZeroGuess ( HYPRE_Solver solver, HYPRE_Int zero_guess );
+HYPRE_Int HYPRE_FSAIGetZeroGuess ( HYPRE_Solver solver, HYPRE_Int *zero_guess );
+HYPRE_Int HYPRE_FSAISetPrintLevel ( HYPRE_Solver solver, HYPRE_Int print_level );
+HYPRE_Int HYPRE_FSAIGetPrintLevel ( HYPRE_Solver solver, HYPRE_Int *print_level );
 
 /* HYPRE_parcsr_pcg.c */
-HYPRE_Int HYPRE_ParCSRPCGCreate ( MPI_Comm comm , HYPRE_Solver *solver );
+HYPRE_Int HYPRE_ParCSRPCGCreate ( MPI_Comm comm, HYPRE_Solver *solver );
 HYPRE_Int HYPRE_ParCSRPCGDestroy ( HYPRE_Solver solver );
-HYPRE_Int HYPRE_ParCSRPCGSetup ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_ParCSRPCGSolve ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_ParCSRPCGSetTol ( HYPRE_Solver solver , HYPRE_Real tol );
-HYPRE_Int HYPRE_ParCSRPCGSetAbsoluteTol ( HYPRE_Solver solver , HYPRE_Real a_tol );
-HYPRE_Int HYPRE_ParCSRPCGSetMaxIter ( HYPRE_Solver solver , HYPRE_Int max_iter );
-HYPRE_Int HYPRE_ParCSRPCGSetStopCrit ( HYPRE_Solver solver , HYPRE_Int stop_crit );
-HYPRE_Int HYPRE_ParCSRPCGSetTwoNorm ( HYPRE_Solver solver , HYPRE_Int two_norm );
-HYPRE_Int HYPRE_ParCSRPCGSetRelChange ( HYPRE_Solver solver , HYPRE_Int rel_change );
-HYPRE_Int HYPRE_ParCSRPCGSetPrecond ( HYPRE_Solver solver , HYPRE_PtrToParSolverFcn precond , HYPRE_PtrToParSolverFcn precond_setup , HYPRE_Solver precond_solver );
-HYPRE_Int HYPRE_ParCSRPCGGetPrecond ( HYPRE_Solver solver , HYPRE_Solver *precond_data_ptr );
-HYPRE_Int HYPRE_ParCSRPCGSetPrintLevel ( HYPRE_Solver solver , HYPRE_Int level );
-HYPRE_Int HYPRE_ParCSRPCGSetLogging ( HYPRE_Solver solver , HYPRE_Int level );
-HYPRE_Int HYPRE_ParCSRPCGGetNumIterations ( HYPRE_Solver solver , HYPRE_Int *num_iterations );
-HYPRE_Int HYPRE_ParCSRPCGGetFinalRelativeResidualNorm ( HYPRE_Solver solver , HYPRE_Real *norm );
-HYPRE_Int HYPRE_ParCSRPCGGetResidual ( HYPRE_Solver solver , HYPRE_ParVector *residual );
-HYPRE_Int HYPRE_ParCSRDiagScaleSetup ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector y , HYPRE_ParVector x );
-HYPRE_Int HYPRE_ParCSRDiagScale ( HYPRE_Solver solver , HYPRE_ParCSRMatrix HA , HYPRE_ParVector Hy , HYPRE_ParVector Hx );
-HYPRE_Int HYPRE_ParCSROnProcTriSetup ( HYPRE_Solver solver , HYPRE_ParCSRMatrix HA , HYPRE_ParVector Hy , HYPRE_ParVector Hx );
-HYPRE_Int HYPRE_ParCSROnProcTriSolve ( HYPRE_Solver solver , HYPRE_ParCSRMatrix HA , HYPRE_ParVector Hy , HYPRE_ParVector Hx );
+HYPRE_Int HYPRE_ParCSRPCGSetup ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                                 HYPRE_ParVector x );
+HYPRE_Int HYPRE_ParCSRPCGSolve ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                                 HYPRE_ParVector x );
+HYPRE_Int HYPRE_ParCSRPCGSetTol ( HYPRE_Solver solver, HYPRE_Real tol );
+HYPRE_Int HYPRE_ParCSRPCGSetAbsoluteTol ( HYPRE_Solver solver, HYPRE_Real a_tol );
+HYPRE_Int HYPRE_ParCSRPCGSetMaxIter ( HYPRE_Solver solver, HYPRE_Int max_iter );
+HYPRE_Int HYPRE_ParCSRPCGSetStopCrit ( HYPRE_Solver solver, HYPRE_Int stop_crit );
+HYPRE_Int HYPRE_ParCSRPCGSetTwoNorm ( HYPRE_Solver solver, HYPRE_Int two_norm );
+HYPRE_Int HYPRE_ParCSRPCGSetRelChange ( HYPRE_Solver solver, HYPRE_Int rel_change );
+HYPRE_Int HYPRE_ParCSRPCGSetPrecond ( HYPRE_Solver solver, HYPRE_PtrToParSolverFcn precond,
+                                      HYPRE_PtrToParSolverFcn precond_setup, HYPRE_Solver precond_solver );
+HYPRE_Int HYPRE_ParCSRPCGGetPrecond ( HYPRE_Solver solver, HYPRE_Solver *precond_data_ptr );
+HYPRE_Int HYPRE_ParCSRPCGSetPrintLevel ( HYPRE_Solver solver, HYPRE_Int level );
+HYPRE_Int HYPRE_ParCSRPCGSetLogging ( HYPRE_Solver solver, HYPRE_Int level );
+HYPRE_Int HYPRE_ParCSRPCGGetNumIterations ( HYPRE_Solver solver, HYPRE_Int *num_iterations );
+HYPRE_Int HYPRE_ParCSRPCGGetFinalRelativeResidualNorm ( HYPRE_Solver solver, HYPRE_Real *norm );
+HYPRE_Int HYPRE_ParCSRPCGGetResidual ( HYPRE_Solver solver, HYPRE_ParVector *residual );
+HYPRE_Int HYPRE_ParCSRDiagScaleSetup ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector y,
+                                       HYPRE_ParVector x );
+HYPRE_Int HYPRE_ParCSRDiagScale ( HYPRE_Solver solver, HYPRE_ParCSRMatrix HA, HYPRE_ParVector Hy,
+                                  HYPRE_ParVector Hx );
+HYPRE_Int HYPRE_ParCSROnProcTriSetup ( HYPRE_Solver solver, HYPRE_ParCSRMatrix HA,
+                                       HYPRE_ParVector Hy, HYPRE_ParVector Hx );
+HYPRE_Int HYPRE_ParCSROnProcTriSolve ( HYPRE_Solver solver, HYPRE_ParCSRMatrix HA,
+                                       HYPRE_ParVector Hy, HYPRE_ParVector Hx );
 
 /* HYPRE_parcsr_pilut.c */
-HYPRE_Int HYPRE_ParCSRPilutCreate ( MPI_Comm comm , HYPRE_Solver *solver );
+HYPRE_Int HYPRE_ParCSRPilutCreate ( MPI_Comm comm, HYPRE_Solver *solver );
 HYPRE_Int HYPRE_ParCSRPilutDestroy ( HYPRE_Solver solver );
-HYPRE_Int HYPRE_ParCSRPilutSetup ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_ParCSRPilutSolve ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_ParCSRPilutSetMaxIter ( HYPRE_Solver solver , HYPRE_Int max_iter );
-HYPRE_Int HYPRE_ParCSRPilutSetDropTolerance ( HYPRE_Solver solver , HYPRE_Real tol );
-HYPRE_Int HYPRE_ParCSRPilutSetFactorRowSize ( HYPRE_Solver solver , HYPRE_Int size );
+HYPRE_Int HYPRE_ParCSRPilutSetup ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                                   HYPRE_ParVector x );
+HYPRE_Int HYPRE_ParCSRPilutSolve ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                                   HYPRE_ParVector x );
+HYPRE_Int HYPRE_ParCSRPilutSetMaxIter ( HYPRE_Solver solver, HYPRE_Int max_iter );
+HYPRE_Int HYPRE_ParCSRPilutSetDropTolerance ( HYPRE_Solver solver, HYPRE_Real tol );
+HYPRE_Int HYPRE_ParCSRPilutSetFactorRowSize ( HYPRE_Solver solver, HYPRE_Int size );
 
 /* HYPRE_parcsr_schwarz.c */
 HYPRE_Int HYPRE_SchwarzCreate ( HYPRE_Solver *solver );
 HYPRE_Int HYPRE_SchwarzDestroy ( HYPRE_Solver solver );
-HYPRE_Int HYPRE_SchwarzSetup ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_SchwarzSolve ( HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x );
-HYPRE_Int HYPRE_SchwarzSetVariant ( HYPRE_Solver solver , HYPRE_Int variant );
-HYPRE_Int HYPRE_SchwarzSetOverlap ( HYPRE_Solver solver , HYPRE_Int overlap );
-HYPRE_Int HYPRE_SchwarzSetDomainType ( HYPRE_Solver solver , HYPRE_Int domain_type );
-HYPRE_Int HYPRE_SchwarzSetDomainStructure ( HYPRE_Solver solver , HYPRE_CSRMatrix domain_structure );
-HYPRE_Int HYPRE_SchwarzSetNumFunctions ( HYPRE_Solver solver , HYPRE_Int num_functions );
-HYPRE_Int HYPRE_SchwarzSetNonSymm ( HYPRE_Solver solver , HYPRE_Int use_nonsymm );
-HYPRE_Int HYPRE_SchwarzSetRelaxWeight ( HYPRE_Solver solver , HYPRE_Real relax_weight );
-HYPRE_Int HYPRE_SchwarzSetDofFunc ( HYPRE_Solver solver , HYPRE_Int *dof_func );
+HYPRE_Int HYPRE_SchwarzSetup ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                               HYPRE_ParVector x );
+HYPRE_Int HYPRE_SchwarzSolve ( HYPRE_Solver solver, HYPRE_ParCSRMatrix A, HYPRE_ParVector b,
+                               HYPRE_ParVector x );
+HYPRE_Int HYPRE_SchwarzSetVariant ( HYPRE_Solver solver, HYPRE_Int variant );
+HYPRE_Int HYPRE_SchwarzSetOverlap ( HYPRE_Solver solver, HYPRE_Int overlap );
+HYPRE_Int HYPRE_SchwarzSetDomainType ( HYPRE_Solver solver, HYPRE_Int domain_type );
+HYPRE_Int HYPRE_SchwarzSetDomainStructure ( HYPRE_Solver solver, HYPRE_CSRMatrix domain_structure );
+HYPRE_Int HYPRE_SchwarzSetNumFunctions ( HYPRE_Solver solver, HYPRE_Int num_functions );
+HYPRE_Int HYPRE_SchwarzSetNonSymm ( HYPRE_Solver solver, HYPRE_Int use_nonsymm );
+HYPRE_Int HYPRE_SchwarzSetRelaxWeight ( HYPRE_Solver solver, HYPRE_Real relax_weight );
+HYPRE_Int HYPRE_SchwarzSetDofFunc ( HYPRE_Solver solver, HYPRE_Int *dof_func );
 
 /* par_add_cycle.c */
 HYPRE_Int hypre_BoomerAMGAdditiveCycle ( void *amg_vdata );
@@ -767,596 +1015,1082 @@ HYPRE_Int hypre_CreateDinv ( void *amg_vdata );
 /* par_amg.c */
 void *hypre_BoomerAMGCreate ( void );
 HYPRE_Int hypre_BoomerAMGDestroy ( void *data );
-HYPRE_Int hypre_BoomerAMGSetRestriction ( void *data , HYPRE_Int restr_par );
-HYPRE_Int hypre_BoomerAMGSetIsTriangular ( void *data , HYPRE_Int is_triangular );
-HYPRE_Int hypre_BoomerAMGSetGMRESSwitchR ( void *data , HYPRE_Int gmres_switch );
-HYPRE_Int hypre_BoomerAMGSetMaxLevels ( void *data , HYPRE_Int max_levels );
-HYPRE_Int hypre_BoomerAMGGetMaxLevels ( void *data , HYPRE_Int *max_levels );
-HYPRE_Int hypre_BoomerAMGSetMaxCoarseSize ( void *data , HYPRE_Int max_coarse_size );
-HYPRE_Int hypre_BoomerAMGGetMaxCoarseSize ( void *data , HYPRE_Int *max_coarse_size );
-HYPRE_Int hypre_BoomerAMGSetMinCoarseSize ( void *data , HYPRE_Int min_coarse_size );
-HYPRE_Int hypre_BoomerAMGGetMinCoarseSize ( void *data , HYPRE_Int *min_coarse_size );
-HYPRE_Int hypre_BoomerAMGSetSeqThreshold ( void *data , HYPRE_Int seq_threshold );
-HYPRE_Int hypre_BoomerAMGGetSeqThreshold ( void *data , HYPRE_Int *seq_threshold );
+HYPRE_Int hypre_BoomerAMGSetRestriction ( void *data, HYPRE_Int restr_par );
+HYPRE_Int hypre_BoomerAMGSetIsTriangular ( void *data, HYPRE_Int is_triangular );
+HYPRE_Int hypre_BoomerAMGSetGMRESSwitchR ( void *data, HYPRE_Int gmres_switch );
+HYPRE_Int hypre_BoomerAMGSetMaxLevels ( void *data, HYPRE_Int max_levels );
+HYPRE_Int hypre_BoomerAMGGetMaxLevels ( void *data, HYPRE_Int *max_levels );
+HYPRE_Int hypre_BoomerAMGSetMaxCoarseSize ( void *data, HYPRE_Int max_coarse_size );
+HYPRE_Int hypre_BoomerAMGGetMaxCoarseSize ( void *data, HYPRE_Int *max_coarse_size );
+HYPRE_Int hypre_BoomerAMGSetMinCoarseSize ( void *data, HYPRE_Int min_coarse_size );
+HYPRE_Int hypre_BoomerAMGGetMinCoarseSize ( void *data, HYPRE_Int *min_coarse_size );
+HYPRE_Int hypre_BoomerAMGSetSeqThreshold ( void *data, HYPRE_Int seq_threshold );
+HYPRE_Int hypre_BoomerAMGGetSeqThreshold ( void *data, HYPRE_Int *seq_threshold );
 HYPRE_Int hypre_BoomerAMGSetCoarsenCutFactor( void *data, HYPRE_Int coarsen_cut_factor );
 HYPRE_Int hypre_BoomerAMGGetCoarsenCutFactor( void *data, HYPRE_Int *coarsen_cut_factor );
-HYPRE_Int hypre_BoomerAMGSetRedundant ( void *data , HYPRE_Int redundant );
-HYPRE_Int hypre_BoomerAMGGetRedundant ( void *data , HYPRE_Int *redundant );
-HYPRE_Int hypre_BoomerAMGSetStrongThreshold ( void *data , HYPRE_Real strong_threshold );
-HYPRE_Int hypre_BoomerAMGGetStrongThreshold ( void *data , HYPRE_Real *strong_threshold );
-HYPRE_Int hypre_BoomerAMGSetStrongThresholdR ( void *data , HYPRE_Real strong_threshold );
-HYPRE_Int hypre_BoomerAMGGetStrongThresholdR ( void *data , HYPRE_Real *strong_threshold );
-HYPRE_Int hypre_BoomerAMGSetFilterThresholdR ( void *data , HYPRE_Real filter_threshold );
-HYPRE_Int hypre_BoomerAMGGetFilterThresholdR ( void *data , HYPRE_Real *filter_threshold );
-HYPRE_Int hypre_BoomerAMGSetSabs ( void *data , HYPRE_Int Sabs );
-HYPRE_Int hypre_BoomerAMGSetMaxRowSum ( void *data , HYPRE_Real max_row_sum );
-HYPRE_Int hypre_BoomerAMGGetMaxRowSum ( void *data , HYPRE_Real *max_row_sum );
-HYPRE_Int hypre_BoomerAMGSetTruncFactor ( void *data , HYPRE_Real trunc_factor );
-HYPRE_Int hypre_BoomerAMGGetTruncFactor ( void *data , HYPRE_Real *trunc_factor );
-HYPRE_Int hypre_BoomerAMGSetPMaxElmts ( void *data , HYPRE_Int P_max_elmts );
-HYPRE_Int hypre_BoomerAMGGetPMaxElmts ( void *data , HYPRE_Int *P_max_elmts );
-HYPRE_Int hypre_BoomerAMGSetJacobiTruncThreshold ( void *data , HYPRE_Real jacobi_trunc_threshold );
-HYPRE_Int hypre_BoomerAMGGetJacobiTruncThreshold ( void *data , HYPRE_Real *jacobi_trunc_threshold );
-HYPRE_Int hypre_BoomerAMGSetPostInterpType ( void *data , HYPRE_Int post_interp_type );
-HYPRE_Int hypre_BoomerAMGGetPostInterpType ( void *data , HYPRE_Int *post_interp_type );
-HYPRE_Int hypre_BoomerAMGSetInterpType ( void *data , HYPRE_Int interp_type );
-HYPRE_Int hypre_BoomerAMGGetInterpType ( void *data , HYPRE_Int *interp_type );
-HYPRE_Int hypre_BoomerAMGSetSepWeight ( void *data , HYPRE_Int sep_weight );
-HYPRE_Int hypre_BoomerAMGSetMinIter ( void *data , HYPRE_Int min_iter );
-HYPRE_Int hypre_BoomerAMGGetMinIter ( void *data , HYPRE_Int *min_iter );
-HYPRE_Int hypre_BoomerAMGSetMaxIter ( void *data , HYPRE_Int max_iter );
-HYPRE_Int hypre_BoomerAMGGetMaxIter ( void *data , HYPRE_Int *max_iter );
-HYPRE_Int hypre_BoomerAMGSetCoarsenType ( void *data , HYPRE_Int coarsen_type );
-HYPRE_Int hypre_BoomerAMGGetCoarsenType ( void *data , HYPRE_Int *coarsen_type );
-HYPRE_Int hypre_BoomerAMGSetMeasureType ( void *data , HYPRE_Int measure_type );
-HYPRE_Int hypre_BoomerAMGGetMeasureType ( void *data , HYPRE_Int *measure_type );
-HYPRE_Int hypre_BoomerAMGSetSetupType ( void *data , HYPRE_Int setup_type );
-HYPRE_Int hypre_BoomerAMGGetSetupType ( void *data , HYPRE_Int *setup_type );
-HYPRE_Int hypre_BoomerAMGSetFCycle ( void *data , HYPRE_Int fcycle );
-HYPRE_Int hypre_BoomerAMGGetFCycle ( void *data , HYPRE_Int *fcycle );
-HYPRE_Int hypre_BoomerAMGSetCycleType ( void *data , HYPRE_Int cycle_type );
-HYPRE_Int hypre_BoomerAMGGetCycleType ( void *data , HYPRE_Int *cycle_type );
-HYPRE_Int hypre_BoomerAMGSetConvergeType ( void *data , HYPRE_Int type );
-HYPRE_Int hypre_BoomerAMGGetConvergeType ( void *data , HYPRE_Int *type );
-HYPRE_Int hypre_BoomerAMGSetTol ( void *data , HYPRE_Real tol );
-HYPRE_Int hypre_BoomerAMGGetTol ( void *data , HYPRE_Real *tol );
-HYPRE_Int hypre_BoomerAMGSetNumSweeps ( void *data , HYPRE_Int num_sweeps );
-HYPRE_Int hypre_BoomerAMGSetCycleNumSweeps ( void *data , HYPRE_Int num_sweeps , HYPRE_Int k );
-HYPRE_Int hypre_BoomerAMGGetCycleNumSweeps ( void *data , HYPRE_Int *num_sweeps , HYPRE_Int k );
-HYPRE_Int hypre_BoomerAMGSetNumGridSweeps ( void *data , HYPRE_Int *num_grid_sweeps );
-HYPRE_Int hypre_BoomerAMGGetNumGridSweeps ( void *data , HYPRE_Int **num_grid_sweeps );
-HYPRE_Int hypre_BoomerAMGSetRelaxType ( void *data , HYPRE_Int relax_type );
-HYPRE_Int hypre_BoomerAMGSetCycleRelaxType ( void *data , HYPRE_Int relax_type , HYPRE_Int k );
-HYPRE_Int hypre_BoomerAMGGetCycleRelaxType ( void *data , HYPRE_Int *relax_type , HYPRE_Int k );
-HYPRE_Int hypre_BoomerAMGSetRelaxOrder ( void *data , HYPRE_Int relax_order );
-HYPRE_Int hypre_BoomerAMGGetRelaxOrder ( void *data , HYPRE_Int *relax_order );
-HYPRE_Int hypre_BoomerAMGSetGridRelaxType ( void *data , HYPRE_Int *grid_relax_type );
-HYPRE_Int hypre_BoomerAMGGetGridRelaxType ( void *data , HYPRE_Int **grid_relax_type );
-HYPRE_Int hypre_BoomerAMGSetGridRelaxPoints ( void *data , HYPRE_Int **grid_relax_points );
-HYPRE_Int hypre_BoomerAMGGetGridRelaxPoints ( void *data , HYPRE_Int ***grid_relax_points );
-HYPRE_Int hypre_BoomerAMGSetRelaxWeight ( void *data , HYPRE_Real *relax_weight );
-HYPRE_Int hypre_BoomerAMGGetRelaxWeight ( void *data , HYPRE_Real **relax_weight );
-HYPRE_Int hypre_BoomerAMGSetRelaxWt ( void *data , HYPRE_Real relax_weight );
-HYPRE_Int hypre_BoomerAMGSetLevelRelaxWt ( void *data , HYPRE_Real relax_weight , HYPRE_Int level );
-HYPRE_Int hypre_BoomerAMGGetLevelRelaxWt ( void *data , HYPRE_Real *relax_weight , HYPRE_Int level );
-HYPRE_Int hypre_BoomerAMGSetOmega ( void *data , HYPRE_Real *omega );
-HYPRE_Int hypre_BoomerAMGGetOmega ( void *data , HYPRE_Real **omega );
-HYPRE_Int hypre_BoomerAMGSetOuterWt ( void *data , HYPRE_Real omega );
-HYPRE_Int hypre_BoomerAMGSetLevelOuterWt ( void *data , HYPRE_Real omega , HYPRE_Int level );
-HYPRE_Int hypre_BoomerAMGGetLevelOuterWt ( void *data , HYPRE_Real *omega , HYPRE_Int level );
-HYPRE_Int hypre_BoomerAMGSetSmoothType ( void *data , HYPRE_Int smooth_type );
-HYPRE_Int hypre_BoomerAMGGetSmoothType ( void *data , HYPRE_Int *smooth_type );
-HYPRE_Int hypre_BoomerAMGSetSmoothNumLevels ( void *data , HYPRE_Int smooth_num_levels );
-HYPRE_Int hypre_BoomerAMGGetSmoothNumLevels ( void *data , HYPRE_Int *smooth_num_levels );
-HYPRE_Int hypre_BoomerAMGSetSmoothNumSweeps ( void *data , HYPRE_Int smooth_num_sweeps );
-HYPRE_Int hypre_BoomerAMGGetSmoothNumSweeps ( void *data , HYPRE_Int *smooth_num_sweeps );
-HYPRE_Int hypre_BoomerAMGSetLogging ( void *data , HYPRE_Int logging );
-HYPRE_Int hypre_BoomerAMGGetLogging ( void *data , HYPRE_Int *logging );
-HYPRE_Int hypre_BoomerAMGSetPrintLevel ( void *data , HYPRE_Int print_level );
-HYPRE_Int hypre_BoomerAMGGetPrintLevel ( void *data , HYPRE_Int *print_level );
-HYPRE_Int hypre_BoomerAMGSetPrintFileName ( void *data , const char *print_file_name );
-HYPRE_Int hypre_BoomerAMGGetPrintFileName ( void *data , char **print_file_name );
-HYPRE_Int hypre_BoomerAMGSetNumIterations ( void *data , HYPRE_Int num_iterations );
-HYPRE_Int hypre_BoomerAMGSetDebugFlag ( void *data , HYPRE_Int debug_flag );
-HYPRE_Int hypre_BoomerAMGGetDebugFlag ( void *data , HYPRE_Int *debug_flag );
-HYPRE_Int hypre_BoomerAMGSetGSMG ( void *data , HYPRE_Int par );
-HYPRE_Int hypre_BoomerAMGSetNumSamples ( void *data , HYPRE_Int par );
-HYPRE_Int hypre_BoomerAMGSetCGCIts ( void *data , HYPRE_Int its );
-HYPRE_Int hypre_BoomerAMGSetPlotGrids ( void *data , HYPRE_Int plotgrids );
-HYPRE_Int hypre_BoomerAMGSetPlotFileName ( void *data , const char *plot_file_name );
-HYPRE_Int hypre_BoomerAMGSetCoordDim ( void *data , HYPRE_Int coorddim );
-HYPRE_Int hypre_BoomerAMGSetCoordinates ( void *data , float *coordinates );
+HYPRE_Int hypre_BoomerAMGSetRedundant ( void *data, HYPRE_Int redundant );
+HYPRE_Int hypre_BoomerAMGGetRedundant ( void *data, HYPRE_Int *redundant );
+HYPRE_Int hypre_BoomerAMGSetStrongThreshold ( void *data, HYPRE_Real strong_threshold );
+HYPRE_Int hypre_BoomerAMGGetStrongThreshold ( void *data, HYPRE_Real *strong_threshold );
+HYPRE_Int hypre_BoomerAMGSetStrongThresholdR ( void *data, HYPRE_Real strong_threshold );
+HYPRE_Int hypre_BoomerAMGGetStrongThresholdR ( void *data, HYPRE_Real *strong_threshold );
+HYPRE_Int hypre_BoomerAMGSetFilterThresholdR ( void *data, HYPRE_Real filter_threshold );
+HYPRE_Int hypre_BoomerAMGGetFilterThresholdR ( void *data, HYPRE_Real *filter_threshold );
+HYPRE_Int hypre_BoomerAMGSetSabs ( void *data, HYPRE_Int Sabs );
+HYPRE_Int hypre_BoomerAMGSetMaxRowSum ( void *data, HYPRE_Real max_row_sum );
+HYPRE_Int hypre_BoomerAMGGetMaxRowSum ( void *data, HYPRE_Real *max_row_sum );
+HYPRE_Int hypre_BoomerAMGSetTruncFactor ( void *data, HYPRE_Real trunc_factor );
+HYPRE_Int hypre_BoomerAMGGetTruncFactor ( void *data, HYPRE_Real *trunc_factor );
+HYPRE_Int hypre_BoomerAMGSetPMaxElmts ( void *data, HYPRE_Int P_max_elmts );
+HYPRE_Int hypre_BoomerAMGGetPMaxElmts ( void *data, HYPRE_Int *P_max_elmts );
+HYPRE_Int hypre_BoomerAMGSetJacobiTruncThreshold ( void *data, HYPRE_Real jacobi_trunc_threshold );
+HYPRE_Int hypre_BoomerAMGGetJacobiTruncThreshold ( void *data, HYPRE_Real *jacobi_trunc_threshold );
+HYPRE_Int hypre_BoomerAMGSetPostInterpType ( void *data, HYPRE_Int post_interp_type );
+HYPRE_Int hypre_BoomerAMGGetPostInterpType ( void *data, HYPRE_Int *post_interp_type );
+HYPRE_Int hypre_BoomerAMGSetInterpType ( void *data, HYPRE_Int interp_type );
+HYPRE_Int hypre_BoomerAMGGetInterpType ( void *data, HYPRE_Int *interp_type );
+HYPRE_Int hypre_BoomerAMGSetSepWeight ( void *data, HYPRE_Int sep_weight );
+HYPRE_Int hypre_BoomerAMGSetMinIter ( void *data, HYPRE_Int min_iter );
+HYPRE_Int hypre_BoomerAMGGetMinIter ( void *data, HYPRE_Int *min_iter );
+HYPRE_Int hypre_BoomerAMGSetMaxIter ( void *data, HYPRE_Int max_iter );
+HYPRE_Int hypre_BoomerAMGGetMaxIter ( void *data, HYPRE_Int *max_iter );
+HYPRE_Int hypre_BoomerAMGSetCoarsenType ( void *data, HYPRE_Int coarsen_type );
+HYPRE_Int hypre_BoomerAMGGetCoarsenType ( void *data, HYPRE_Int *coarsen_type );
+HYPRE_Int hypre_BoomerAMGSetMeasureType ( void *data, HYPRE_Int measure_type );
+HYPRE_Int hypre_BoomerAMGGetMeasureType ( void *data, HYPRE_Int *measure_type );
+HYPRE_Int hypre_BoomerAMGSetSetupType ( void *data, HYPRE_Int setup_type );
+HYPRE_Int hypre_BoomerAMGGetSetupType ( void *data, HYPRE_Int *setup_type );
+HYPRE_Int hypre_BoomerAMGSetFCycle ( void *data, HYPRE_Int fcycle );
+HYPRE_Int hypre_BoomerAMGGetFCycle ( void *data, HYPRE_Int *fcycle );
+HYPRE_Int hypre_BoomerAMGSetCycleType ( void *data, HYPRE_Int cycle_type );
+HYPRE_Int hypre_BoomerAMGGetCycleType ( void *data, HYPRE_Int *cycle_type );
+HYPRE_Int hypre_BoomerAMGSetConvergeType ( void *data, HYPRE_Int type );
+HYPRE_Int hypre_BoomerAMGGetConvergeType ( void *data, HYPRE_Int *type );
+HYPRE_Int hypre_BoomerAMGSetTol ( void *data, HYPRE_Real tol );
+HYPRE_Int hypre_BoomerAMGGetTol ( void *data, HYPRE_Real *tol );
+HYPRE_Int hypre_BoomerAMGSetNumSweeps ( void *data, HYPRE_Int num_sweeps );
+HYPRE_Int hypre_BoomerAMGSetCycleNumSweeps ( void *data, HYPRE_Int num_sweeps, HYPRE_Int k );
+HYPRE_Int hypre_BoomerAMGGetCycleNumSweeps ( void *data, HYPRE_Int *num_sweeps, HYPRE_Int k );
+HYPRE_Int hypre_BoomerAMGSetNumGridSweeps ( void *data, HYPRE_Int *num_grid_sweeps );
+HYPRE_Int hypre_BoomerAMGGetNumGridSweeps ( void *data, HYPRE_Int **num_grid_sweeps );
+HYPRE_Int hypre_BoomerAMGSetRelaxType ( void *data, HYPRE_Int relax_type );
+HYPRE_Int hypre_BoomerAMGSetCycleRelaxType ( void *data, HYPRE_Int relax_type, HYPRE_Int k );
+HYPRE_Int hypre_BoomerAMGGetCycleRelaxType ( void *data, HYPRE_Int *relax_type, HYPRE_Int k );
+HYPRE_Int hypre_BoomerAMGSetRelaxOrder ( void *data, HYPRE_Int relax_order );
+HYPRE_Int hypre_BoomerAMGGetRelaxOrder ( void *data, HYPRE_Int *relax_order );
+HYPRE_Int hypre_BoomerAMGSetGridRelaxType ( void *data, HYPRE_Int *grid_relax_type );
+HYPRE_Int hypre_BoomerAMGGetGridRelaxType ( void *data, HYPRE_Int **grid_relax_type );
+HYPRE_Int hypre_BoomerAMGSetGridRelaxPoints ( void *data, HYPRE_Int **grid_relax_points );
+HYPRE_Int hypre_BoomerAMGGetGridRelaxPoints ( void *data, HYPRE_Int ***grid_relax_points );
+HYPRE_Int hypre_BoomerAMGSetRelaxWeight ( void *data, HYPRE_Real *relax_weight );
+HYPRE_Int hypre_BoomerAMGGetRelaxWeight ( void *data, HYPRE_Real **relax_weight );
+HYPRE_Int hypre_BoomerAMGSetRelaxWt ( void *data, HYPRE_Real relax_weight );
+HYPRE_Int hypre_BoomerAMGSetLevelRelaxWt ( void *data, HYPRE_Real relax_weight, HYPRE_Int level );
+HYPRE_Int hypre_BoomerAMGGetLevelRelaxWt ( void *data, HYPRE_Real *relax_weight, HYPRE_Int level );
+HYPRE_Int hypre_BoomerAMGSetOmega ( void *data, HYPRE_Real *omega );
+HYPRE_Int hypre_BoomerAMGGetOmega ( void *data, HYPRE_Real **omega );
+HYPRE_Int hypre_BoomerAMGSetOuterWt ( void *data, HYPRE_Real omega );
+HYPRE_Int hypre_BoomerAMGSetLevelOuterWt ( void *data, HYPRE_Real omega, HYPRE_Int level );
+HYPRE_Int hypre_BoomerAMGGetLevelOuterWt ( void *data, HYPRE_Real *omega, HYPRE_Int level );
+HYPRE_Int hypre_BoomerAMGSetSmoothType ( void *data, HYPRE_Int smooth_type );
+HYPRE_Int hypre_BoomerAMGGetSmoothType ( void *data, HYPRE_Int *smooth_type );
+HYPRE_Int hypre_BoomerAMGSetSmoothNumLevels ( void *data, HYPRE_Int smooth_num_levels );
+HYPRE_Int hypre_BoomerAMGGetSmoothNumLevels ( void *data, HYPRE_Int *smooth_num_levels );
+HYPRE_Int hypre_BoomerAMGSetSmoothNumSweeps ( void *data, HYPRE_Int smooth_num_sweeps );
+HYPRE_Int hypre_BoomerAMGGetSmoothNumSweeps ( void *data, HYPRE_Int *smooth_num_sweeps );
+HYPRE_Int hypre_BoomerAMGSetLogging ( void *data, HYPRE_Int logging );
+HYPRE_Int hypre_BoomerAMGGetLogging ( void *data, HYPRE_Int *logging );
+HYPRE_Int hypre_BoomerAMGSetPrintLevel ( void *data, HYPRE_Int print_level );
+HYPRE_Int hypre_BoomerAMGGetPrintLevel ( void *data, HYPRE_Int *print_level );
+HYPRE_Int hypre_BoomerAMGSetPrintFileName ( void *data, const char *print_file_name );
+HYPRE_Int hypre_BoomerAMGGetPrintFileName ( void *data, char **print_file_name );
+HYPRE_Int hypre_BoomerAMGSetNumIterations ( void *data, HYPRE_Int num_iterations );
+HYPRE_Int hypre_BoomerAMGSetDebugFlag ( void *data, HYPRE_Int debug_flag );
+HYPRE_Int hypre_BoomerAMGGetDebugFlag ( void *data, HYPRE_Int *debug_flag );
+HYPRE_Int hypre_BoomerAMGSetGSMG ( void *data, HYPRE_Int par );
+HYPRE_Int hypre_BoomerAMGSetNumSamples ( void *data, HYPRE_Int par );
+HYPRE_Int hypre_BoomerAMGSetCGCIts ( void *data, HYPRE_Int its );
+HYPRE_Int hypre_BoomerAMGSetPlotGrids ( void *data, HYPRE_Int plotgrids );
+HYPRE_Int hypre_BoomerAMGSetPlotFileName ( void *data, const char *plot_file_name );
+HYPRE_Int hypre_BoomerAMGSetCoordDim ( void *data, HYPRE_Int coorddim );
+HYPRE_Int hypre_BoomerAMGSetCoordinates ( void *data, float *coordinates );
 HYPRE_Int hypre_BoomerAMGGetGridHierarchy(void *data, HYPRE_Int *cgrid );
-HYPRE_Int hypre_BoomerAMGSetNumFunctions ( void *data , HYPRE_Int num_functions );
-HYPRE_Int hypre_BoomerAMGGetNumFunctions ( void *data , HYPRE_Int *num_functions );
-HYPRE_Int hypre_BoomerAMGSetNodal ( void *data , HYPRE_Int nodal );
-HYPRE_Int hypre_BoomerAMGSetNodalLevels ( void *data , HYPRE_Int nodal_levels );
-HYPRE_Int hypre_BoomerAMGSetNodalDiag ( void *data , HYPRE_Int nodal );
-HYPRE_Int hypre_BoomerAMGSetKeepSameSign ( void *data , HYPRE_Int keep_same_sign );
-HYPRE_Int hypre_BoomerAMGSetNumPaths ( void *data , HYPRE_Int num_paths );
-HYPRE_Int hypre_BoomerAMGSetAggNumLevels ( void *data , HYPRE_Int agg_num_levels );
-HYPRE_Int hypre_BoomerAMGSetAggInterpType ( void *data , HYPRE_Int agg_interp_type );
-HYPRE_Int hypre_BoomerAMGSetAggPMaxElmts ( void *data , HYPRE_Int agg_P_max_elmts );
-HYPRE_Int hypre_BoomerAMGSetMultAddPMaxElmts ( void *data , HYPRE_Int add_P_max_elmts );
-HYPRE_Int hypre_BoomerAMGSetAddRelaxType ( void *data , HYPRE_Int add_rlx_type );
-HYPRE_Int hypre_BoomerAMGSetAddRelaxWt ( void *data , HYPRE_Real add_rlx_wt );
-HYPRE_Int hypre_BoomerAMGSetAggP12MaxElmts ( void *data , HYPRE_Int agg_P12_max_elmts );
-HYPRE_Int hypre_BoomerAMGSetAggTruncFactor ( void *data , HYPRE_Real agg_trunc_factor );
-HYPRE_Int hypre_BoomerAMGSetMultAddTruncFactor ( void *data , HYPRE_Real add_trunc_factor );
-HYPRE_Int hypre_BoomerAMGSetAggP12TruncFactor ( void *data , HYPRE_Real agg_P12_trunc_factor );
-HYPRE_Int hypre_BoomerAMGSetNumCRRelaxSteps ( void *data , HYPRE_Int num_CR_relax_steps );
-HYPRE_Int hypre_BoomerAMGSetCRRate ( void *data , HYPRE_Real CR_rate );
-HYPRE_Int hypre_BoomerAMGSetCRStrongTh ( void *data , HYPRE_Real CR_strong_th );
+HYPRE_Int hypre_BoomerAMGSetNumFunctions ( void *data, HYPRE_Int num_functions );
+HYPRE_Int hypre_BoomerAMGGetNumFunctions ( void *data, HYPRE_Int *num_functions );
+HYPRE_Int hypre_BoomerAMGSetFilterFunctions ( void *data, HYPRE_Int filter_functions );
+HYPRE_Int hypre_BoomerAMGGetFilterFunctions ( void *data, HYPRE_Int *filter_functions );
+HYPRE_Int hypre_BoomerAMGSetNodal ( void *data, HYPRE_Int nodal );
+HYPRE_Int hypre_BoomerAMGSetNodalLevels ( void *data, HYPRE_Int nodal_levels );
+HYPRE_Int hypre_BoomerAMGSetNodalDiag ( void *data, HYPRE_Int nodal );
+HYPRE_Int hypre_BoomerAMGSetKeepSameSign ( void *data, HYPRE_Int keep_same_sign );
+HYPRE_Int hypre_BoomerAMGSetNumPaths ( void *data, HYPRE_Int num_paths );
+HYPRE_Int hypre_BoomerAMGSetAggNumLevels ( void *data, HYPRE_Int agg_num_levels );
+HYPRE_Int hypre_BoomerAMGSetAggInterpType ( void *data, HYPRE_Int agg_interp_type );
+HYPRE_Int hypre_BoomerAMGSetAggPMaxElmts ( void *data, HYPRE_Int agg_P_max_elmts );
+HYPRE_Int hypre_BoomerAMGSetMultAddPMaxElmts ( void *data, HYPRE_Int add_P_max_elmts );
+HYPRE_Int hypre_BoomerAMGSetAddRelaxType ( void *data, HYPRE_Int add_rlx_type );
+HYPRE_Int hypre_BoomerAMGSetAddRelaxWt ( void *data, HYPRE_Real add_rlx_wt );
+HYPRE_Int hypre_BoomerAMGSetAggP12MaxElmts ( void *data, HYPRE_Int agg_P12_max_elmts );
+HYPRE_Int hypre_BoomerAMGSetAggTruncFactor ( void *data, HYPRE_Real agg_trunc_factor );
+HYPRE_Int hypre_BoomerAMGSetMultAddTruncFactor ( void *data, HYPRE_Real add_trunc_factor );
+HYPRE_Int hypre_BoomerAMGSetAggP12TruncFactor ( void *data, HYPRE_Real agg_P12_trunc_factor );
+HYPRE_Int hypre_BoomerAMGSetNumCRRelaxSteps ( void *data, HYPRE_Int num_CR_relax_steps );
+HYPRE_Int hypre_BoomerAMGSetCRRate ( void *data, HYPRE_Real CR_rate );
+HYPRE_Int hypre_BoomerAMGSetCRStrongTh ( void *data, HYPRE_Real CR_strong_th );
 HYPRE_Int hypre_BoomerAMGSetADropTol( void     *data, HYPRE_Real  A_drop_tol );
 HYPRE_Int hypre_BoomerAMGSetADropType( void     *data, HYPRE_Int  A_drop_type );
-HYPRE_Int hypre_BoomerAMGSetISType ( void *data , HYPRE_Int IS_type );
-HYPRE_Int hypre_BoomerAMGSetCRUseCG ( void *data , HYPRE_Int CR_use_CG );
-HYPRE_Int hypre_BoomerAMGSetNumPoints ( void *data , HYPRE_Int num_points );
-HYPRE_Int hypre_BoomerAMGSetDofFunc ( void *data , HYPRE_Int *dof_func );
-HYPRE_Int hypre_BoomerAMGSetPointDofMap ( void *data , HYPRE_Int *point_dof_map );
-HYPRE_Int hypre_BoomerAMGSetDofPoint ( void *data , HYPRE_Int *dof_point );
-HYPRE_Int hypre_BoomerAMGGetNumIterations ( void *data , HYPRE_Int *num_iterations );
-HYPRE_Int hypre_BoomerAMGGetCumNumIterations ( void *data , HYPRE_Int *cum_num_iterations );
-HYPRE_Int hypre_BoomerAMGGetResidual ( void *data , hypre_ParVector **resid );
-HYPRE_Int hypre_BoomerAMGGetRelResidualNorm ( void *data , HYPRE_Real *rel_resid_norm );
-HYPRE_Int hypre_BoomerAMGSetVariant ( void *data , HYPRE_Int variant );
-HYPRE_Int hypre_BoomerAMGGetVariant ( void *data , HYPRE_Int *variant );
-HYPRE_Int hypre_BoomerAMGSetOverlap ( void *data , HYPRE_Int overlap );
-HYPRE_Int hypre_BoomerAMGGetOverlap ( void *data , HYPRE_Int *overlap );
-HYPRE_Int hypre_BoomerAMGSetDomainType ( void *data , HYPRE_Int domain_type );
-HYPRE_Int hypre_BoomerAMGGetDomainType ( void *data , HYPRE_Int *domain_type );
-HYPRE_Int hypre_BoomerAMGSetSchwarzRlxWeight ( void *data , HYPRE_Real schwarz_rlx_weight );
-HYPRE_Int hypre_BoomerAMGGetSchwarzRlxWeight ( void *data , HYPRE_Real *schwarz_rlx_weight );
-HYPRE_Int hypre_BoomerAMGSetSchwarzUseNonSymm ( void *data , HYPRE_Int use_nonsymm );
-HYPRE_Int hypre_BoomerAMGSetSym ( void *data , HYPRE_Int sym );
-HYPRE_Int hypre_BoomerAMGSetLevel ( void *data , HYPRE_Int level );
-HYPRE_Int hypre_BoomerAMGSetThreshold ( void *data , HYPRE_Real thresh );
-HYPRE_Int hypre_BoomerAMGSetFilter ( void *data , HYPRE_Real filter );
-HYPRE_Int hypre_BoomerAMGSetDropTol ( void *data , HYPRE_Real drop_tol );
-HYPRE_Int hypre_BoomerAMGSetMaxNzPerRow ( void *data , HYPRE_Int max_nz_per_row );
-HYPRE_Int hypre_BoomerAMGSetEuclidFile ( void *data , char *euclidfile );
-HYPRE_Int hypre_BoomerAMGSetEuLevel ( void *data , HYPRE_Int eu_level );
-HYPRE_Int hypre_BoomerAMGSetEuSparseA ( void *data , HYPRE_Real eu_sparse_A );
-HYPRE_Int hypre_BoomerAMGSetEuBJ ( void *data , HYPRE_Int eu_bj );
-HYPRE_Int hypre_BoomerAMGSetILUType( void *data, HYPRE_Int ilu_type);
-HYPRE_Int hypre_BoomerAMGSetILULevel( void *data, HYPRE_Int ilu_lfil);
-HYPRE_Int hypre_BoomerAMGSetILUDroptol( void *data, HYPRE_Real ilu_droptol);
-HYPRE_Int hypre_BoomerAMGSetILUMaxIter( void *data, HYPRE_Int ilu_max_iter);
-HYPRE_Int hypre_BoomerAMGSetILUMaxRowNnz( void *data, HYPRE_Int ilu_max_row_nnz);
-HYPRE_Int hypre_BoomerAMGSetILULocalReordering( void *data, HYPRE_Int ilu_reordering_type);
-HYPRE_Int hypre_BoomerAMGSetChebyOrder ( void *data , HYPRE_Int order );
-HYPRE_Int hypre_BoomerAMGSetChebyFraction ( void *data , HYPRE_Real ratio );
-HYPRE_Int hypre_BoomerAMGSetChebyEigEst ( void *data , HYPRE_Int eig_est );
-HYPRE_Int hypre_BoomerAMGSetChebyVariant ( void *data , HYPRE_Int variant );
-HYPRE_Int hypre_BoomerAMGSetChebyScale ( void *data , HYPRE_Int scale );
-HYPRE_Int hypre_BoomerAMGSetInterpVectors ( void *solver , HYPRE_Int num_vectors , hypre_ParVector **interp_vectors );
-HYPRE_Int hypre_BoomerAMGSetInterpVecVariant ( void *solver , HYPRE_Int var );
-HYPRE_Int hypre_BoomerAMGSetInterpVecQMax ( void *data , HYPRE_Int q_max );
-HYPRE_Int hypre_BoomerAMGSetInterpVecAbsQTrunc ( void *data , HYPRE_Real q_trunc );
-HYPRE_Int hypre_BoomerAMGSetSmoothInterpVectors ( void *solver , HYPRE_Int smooth_interp_vectors );
-HYPRE_Int hypre_BoomerAMGSetInterpRefine ( void *data , HYPRE_Int num_refine );
-HYPRE_Int hypre_BoomerAMGSetInterpVecFirstLevel ( void *data , HYPRE_Int level );
-HYPRE_Int hypre_BoomerAMGSetAdditive ( void *data , HYPRE_Int additive );
-HYPRE_Int hypre_BoomerAMGGetAdditive ( void *data , HYPRE_Int *additive );
-HYPRE_Int hypre_BoomerAMGSetMultAdditive ( void *data , HYPRE_Int mult_additive );
-HYPRE_Int hypre_BoomerAMGGetMultAdditive ( void *data , HYPRE_Int *mult_additive );
-HYPRE_Int hypre_BoomerAMGSetSimple ( void *data , HYPRE_Int simple );
-HYPRE_Int hypre_BoomerAMGGetSimple ( void *data , HYPRE_Int *simple );
-HYPRE_Int hypre_BoomerAMGSetAddLastLvl ( void *data , HYPRE_Int add_last_lvl );
-HYPRE_Int hypre_BoomerAMGSetNonGalerkinTol ( void *data , HYPRE_Real nongalerkin_tol );
-HYPRE_Int hypre_BoomerAMGSetLevelNonGalerkinTol ( void *data , HYPRE_Real nongalerkin_tol , HYPRE_Int level );
-HYPRE_Int hypre_BoomerAMGSetNonGalerkTol ( void *data , HYPRE_Int nongalerk_num_tol , HYPRE_Real *nongalerk_tol );
-HYPRE_Int hypre_BoomerAMGSetRAP2 ( void *data , HYPRE_Int rap2 );
-HYPRE_Int hypre_BoomerAMGSetModuleRAP2 ( void *data , HYPRE_Int mod_rap2 );
-HYPRE_Int hypre_BoomerAMGSetKeepTranspose ( void *data , HYPRE_Int keepTranspose );
+HYPRE_Int hypre_BoomerAMGSetISType ( void *data, HYPRE_Int IS_type );
+HYPRE_Int hypre_BoomerAMGSetCRUseCG ( void *data, HYPRE_Int CR_use_CG );
+HYPRE_Int hypre_BoomerAMGSetNumPoints ( void *data, HYPRE_Int num_points );
+HYPRE_Int hypre_BoomerAMGSetDofFunc ( void *data, HYPRE_Int *dof_func );
+HYPRE_Int hypre_BoomerAMGSetPointDofMap ( void *data, HYPRE_Int *point_dof_map );
+HYPRE_Int hypre_BoomerAMGSetDofPoint ( void *data, HYPRE_Int *dof_point );
+HYPRE_Int hypre_BoomerAMGGetNumIterations ( void *data, HYPRE_Int *num_iterations );
+HYPRE_Int hypre_BoomerAMGGetCumNumIterations ( void *data, HYPRE_Int *cum_num_iterations );
+HYPRE_Int hypre_BoomerAMGGetResidual ( void *data, hypre_ParVector **resid );
+HYPRE_Int hypre_BoomerAMGGetRelResidualNorm ( void *data, HYPRE_Real *rel_resid_norm );
+HYPRE_Int hypre_BoomerAMGSetVariant ( void *data, HYPRE_Int variant );
+HYPRE_Int hypre_BoomerAMGGetVariant ( void *data, HYPRE_Int *variant );
+HYPRE_Int hypre_BoomerAMGSetOverlap ( void *data, HYPRE_Int overlap );
+HYPRE_Int hypre_BoomerAMGGetOverlap ( void *data, HYPRE_Int *overlap );
+HYPRE_Int hypre_BoomerAMGSetDomainType ( void *data, HYPRE_Int domain_type );
+HYPRE_Int hypre_BoomerAMGGetDomainType ( void *data, HYPRE_Int *domain_type );
+HYPRE_Int hypre_BoomerAMGSetSchwarzRlxWeight ( void *data, HYPRE_Real schwarz_rlx_weight );
+HYPRE_Int hypre_BoomerAMGGetSchwarzRlxWeight ( void *data, HYPRE_Real *schwarz_rlx_weight );
+HYPRE_Int hypre_BoomerAMGSetSchwarzUseNonSymm ( void *data, HYPRE_Int use_nonsymm );
+HYPRE_Int hypre_BoomerAMGSetSym ( void *data, HYPRE_Int sym );
+HYPRE_Int hypre_BoomerAMGSetLevel ( void *data, HYPRE_Int level );
+HYPRE_Int hypre_BoomerAMGSetThreshold ( void *data, HYPRE_Real thresh );
+HYPRE_Int hypre_BoomerAMGSetFilter ( void *data, HYPRE_Real filter );
+HYPRE_Int hypre_BoomerAMGSetDropTol ( void *data, HYPRE_Real drop_tol );
+HYPRE_Int hypre_BoomerAMGSetMaxNzPerRow ( void *data, HYPRE_Int max_nz_per_row );
+HYPRE_Int hypre_BoomerAMGSetEuclidFile ( void *data, char *euclidfile );
+HYPRE_Int hypre_BoomerAMGSetEuLevel ( void *data, HYPRE_Int eu_level );
+HYPRE_Int hypre_BoomerAMGSetEuSparseA ( void *data, HYPRE_Real eu_sparse_A );
+HYPRE_Int hypre_BoomerAMGSetEuBJ ( void *data, HYPRE_Int eu_bj );
+HYPRE_Int hypre_BoomerAMGSetILUType( void *data, HYPRE_Int ilu_type );
+HYPRE_Int hypre_BoomerAMGSetILULevel( void *data, HYPRE_Int ilu_lfil );
+HYPRE_Int hypre_BoomerAMGSetILUDroptol( void *data, HYPRE_Real ilu_droptol );
+HYPRE_Int hypre_BoomerAMGSetILUTriSolve( void *data, HYPRE_Int ilu_tri_solve );
+HYPRE_Int hypre_BoomerAMGSetILULowerJacobiIters( void *data, HYPRE_Int ilu_lower_jacobi_iters );
+HYPRE_Int hypre_BoomerAMGSetILUUpperJacobiIters( void *data, HYPRE_Int ilu_upper_jacobi_iters );
+HYPRE_Int hypre_BoomerAMGSetILUMaxIter( void *data, HYPRE_Int ilu_max_iter );
+HYPRE_Int hypre_BoomerAMGSetILUMaxRowNnz( void *data, HYPRE_Int ilu_max_row_nnz );
+HYPRE_Int hypre_BoomerAMGSetILULocalReordering( void *data, HYPRE_Int ilu_reordering_type );
+HYPRE_Int hypre_BoomerAMGSetILUIterSetupType( void *data, HYPRE_Int ilu_iter_setup_type );
+HYPRE_Int hypre_BoomerAMGSetILUIterSetupOption( void *data, HYPRE_Int ilu_iter_setup_option );
+HYPRE_Int hypre_BoomerAMGSetILUIterSetupMaxIter( void *data, HYPRE_Int ilu_iter_setup_max_iter );
+HYPRE_Int hypre_BoomerAMGSetILUIterSetupTolerance( void *data,
+                                                   HYPRE_Real ilu_iter_setup_tolerance );
+HYPRE_Int hypre_BoomerAMGSetFSAIAlgoType ( void *data, HYPRE_Int fsai_algo_type );
+HYPRE_Int hypre_BoomerAMGSetFSAILocalSolveType ( void *data, HYPRE_Int local_solve_type );
+HYPRE_Int hypre_BoomerAMGSetFSAIMaxSteps ( void *data, HYPRE_Int fsai_max_steps );
+HYPRE_Int hypre_BoomerAMGSetFSAIMaxStepSize ( void *data, HYPRE_Int fsai_max_step_size );
+HYPRE_Int hypre_BoomerAMGSetFSAIMaxNnzRow ( void *data, HYPRE_Int fsai_max_nnz_row );
+HYPRE_Int hypre_BoomerAMGSetFSAINumLevels ( void *data, HYPRE_Int fsai_num_levels );
+HYPRE_Int hypre_BoomerAMGSetFSAIEigMaxIters ( void *data, HYPRE_Int fsai_eig_max_iters );
+HYPRE_Int hypre_BoomerAMGSetFSAIThreshold ( void *data, HYPRE_Real fsai_threshold );
+HYPRE_Int hypre_BoomerAMGSetFSAIKapTolerance ( void *data, HYPRE_Real fsai_kap_tolerance );
+HYPRE_Int hypre_BoomerAMGSetChebyOrder ( void *data, HYPRE_Int order );
+HYPRE_Int hypre_BoomerAMGSetChebyFraction ( void *data, HYPRE_Real ratio );
+HYPRE_Int hypre_BoomerAMGSetChebyEigEst ( void *data, HYPRE_Int eig_est );
+HYPRE_Int hypre_BoomerAMGSetChebyVariant ( void *data, HYPRE_Int variant );
+HYPRE_Int hypre_BoomerAMGSetChebyScale ( void *data, HYPRE_Int scale );
+HYPRE_Int hypre_BoomerAMGSetInterpVectors ( void *solver, HYPRE_Int num_vectors,
+                                            hypre_ParVector **interp_vectors );
+HYPRE_Int hypre_BoomerAMGSetInterpVecVariant ( void *solver, HYPRE_Int var );
+HYPRE_Int hypre_BoomerAMGSetInterpVecQMax ( void *data, HYPRE_Int q_max );
+HYPRE_Int hypre_BoomerAMGSetInterpVecAbsQTrunc ( void *data, HYPRE_Real q_trunc );
+HYPRE_Int hypre_BoomerAMGSetSmoothInterpVectors ( void *solver, HYPRE_Int smooth_interp_vectors );
+HYPRE_Int hypre_BoomerAMGSetInterpRefine ( void *data, HYPRE_Int num_refine );
+HYPRE_Int hypre_BoomerAMGSetInterpVecFirstLevel ( void *data, HYPRE_Int level );
+HYPRE_Int hypre_BoomerAMGSetAdditive ( void *data, HYPRE_Int additive );
+HYPRE_Int hypre_BoomerAMGGetAdditive ( void *data, HYPRE_Int *additive );
+HYPRE_Int hypre_BoomerAMGSetMultAdditive ( void *data, HYPRE_Int mult_additive );
+HYPRE_Int hypre_BoomerAMGGetMultAdditive ( void *data, HYPRE_Int *mult_additive );
+HYPRE_Int hypre_BoomerAMGSetSimple ( void *data, HYPRE_Int simple );
+HYPRE_Int hypre_BoomerAMGGetSimple ( void *data, HYPRE_Int *simple );
+HYPRE_Int hypre_BoomerAMGSetAddLastLvl ( void *data, HYPRE_Int add_last_lvl );
+HYPRE_Int hypre_BoomerAMGSetNonGalerkinTol ( void *data, HYPRE_Real nongalerkin_tol );
+HYPRE_Int hypre_BoomerAMGSetLevelNonGalerkinTol ( void *data, HYPRE_Real nongalerkin_tol,
+                                                  HYPRE_Int level );
+HYPRE_Int hypre_BoomerAMGSetNonGalerkTol ( void *data, HYPRE_Int nongalerk_num_tol,
+                                           HYPRE_Real *nongalerk_tol );
+HYPRE_Int hypre_BoomerAMGSetRAP2 ( void *data, HYPRE_Int rap2 );
+HYPRE_Int hypre_BoomerAMGSetModuleRAP2 ( void *data, HYPRE_Int mod_rap2 );
+HYPRE_Int hypre_BoomerAMGSetKeepTranspose ( void *data, HYPRE_Int keepTranspose );
 #ifdef HYPRE_USING_DSUPERLU
-HYPRE_Int hypre_BoomerAMGSetDSLUThreshold ( void *data , HYPRE_Int slu_threshold );
+HYPRE_Int hypre_BoomerAMGSetDSLUThreshold ( void *data, HYPRE_Int slu_threshold );
 #endif
-HYPRE_Int hypre_BoomerAMGSetCPoints( void *data, HYPRE_Int cpt_coarse_level, HYPRE_Int  num_cpt_coarse, HYPRE_BigInt *cpt_coarse_index );
-HYPRE_Int hypre_BoomerAMGSetFPoints( void *data, HYPRE_Int isolated, HYPRE_Int num_points, HYPRE_BigInt *indices );
+HYPRE_Int hypre_BoomerAMGSetCPoints( void *data, HYPRE_Int cpt_coarse_level,
+                                     HYPRE_Int  num_cpt_coarse, HYPRE_BigInt *cpt_coarse_index );
+HYPRE_Int hypre_BoomerAMGSetFPoints( void *data, HYPRE_Int isolated, HYPRE_Int num_points,
+                                     HYPRE_BigInt *indices );
+HYPRE_Int hypre_BoomerAMGSetCumNnzAP ( void *data, HYPRE_Real cum_nnz_AP );
+HYPRE_Int hypre_BoomerAMGGetCumNnzAP ( void *data, HYPRE_Real *cum_nnz_AP );
 
 /* par_amg_setup.c */
-HYPRE_Int hypre_BoomerAMGSetup ( void *amg_vdata , hypre_ParCSRMatrix *A , hypre_ParVector *f , hypre_ParVector *u );
+HYPRE_Int hypre_BoomerAMGSetup ( void *amg_vdata, hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                 hypre_ParVector *u );
 
 /* par_amg_solve.c */
-HYPRE_Int hypre_BoomerAMGSolve ( void *amg_vdata , hypre_ParCSRMatrix *A , hypre_ParVector *f , hypre_ParVector *u );
+HYPRE_Int hypre_BoomerAMGSolve ( void *amg_vdata, hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                 hypre_ParVector *u );
 
 /* par_amg_solveT.c */
-HYPRE_Int hypre_BoomerAMGSolveT ( void *amg_vdata , hypre_ParCSRMatrix *A , hypre_ParVector *f , hypre_ParVector *u );
-HYPRE_Int hypre_BoomerAMGCycleT ( void *amg_vdata , hypre_ParVector **F_array , hypre_ParVector **U_array );
-HYPRE_Int hypre_BoomerAMGRelaxT ( hypre_ParCSRMatrix *A , hypre_ParVector *f , HYPRE_Int *cf_marker , HYPRE_Int relax_type , HYPRE_Int relax_points , HYPRE_Real relax_weight , hypre_ParVector *u , hypre_ParVector *Vtemp );
+HYPRE_Int hypre_BoomerAMGSolveT ( void *amg_vdata, hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                  hypre_ParVector *u );
+HYPRE_Int hypre_BoomerAMGCycleT ( void *amg_vdata, hypre_ParVector **F_array,
+                                  hypre_ParVector **U_array );
+HYPRE_Int hypre_BoomerAMGRelaxT ( hypre_ParCSRMatrix *A, hypre_ParVector *f, HYPRE_Int *cf_marker,
+                                  HYPRE_Int relax_type, HYPRE_Int relax_points, HYPRE_Real relax_weight, hypre_ParVector *u,
+                                  hypre_ParVector *Vtemp );
 
 /* par_cgc_coarsen.c */
-HYPRE_Int hypre_BoomerAMGCoarsenCGCb ( hypre_ParCSRMatrix *S , hypre_ParCSRMatrix *A , HYPRE_Int measure_type , HYPRE_Int coarsen_type , HYPRE_Int cgc_its , HYPRE_Int debug_flag , hypre_IntArray **CF_marker_ptr );
-HYPRE_Int hypre_BoomerAMGCoarsenCGC ( hypre_ParCSRMatrix *S , HYPRE_Int numberofgrids , HYPRE_Int coarsen_type , HYPRE_Int *CF_marker );
-HYPRE_Int hypre_AmgCGCPrepare ( hypre_ParCSRMatrix *S , HYPRE_Int nlocal , HYPRE_Int *CF_marker , HYPRE_Int **CF_marker_offd , HYPRE_Int coarsen_type , HYPRE_Int **vrange );
+HYPRE_Int hypre_BoomerAMGCoarsenCGCb ( hypre_ParCSRMatrix *S, hypre_ParCSRMatrix *A,
+                                       HYPRE_Int measure_type, HYPRE_Int coarsen_type, HYPRE_Int cgc_its, HYPRE_Int debug_flag,
+                                       hypre_IntArray **CF_marker_ptr );
+HYPRE_Int hypre_BoomerAMGCoarsenCGC ( hypre_ParCSRMatrix *S, HYPRE_Int numberofgrids,
+                                      HYPRE_Int coarsen_type, HYPRE_Int *CF_marker );
+HYPRE_Int hypre_AmgCGCPrepare ( hypre_ParCSRMatrix *S, HYPRE_Int nlocal, HYPRE_Int *CF_marker,
+                                HYPRE_Int **CF_marker_offd, HYPRE_Int coarsen_type, HYPRE_Int **vrange );
 //HYPRE_Int hypre_AmgCGCPrepare ( hypre_ParCSRMatrix *S , HYPRE_Int nlocal , HYPRE_Int *CF_marker , HYPRE_BigInt **CF_marker_offd , HYPRE_Int coarsen_type , HYPRE_BigInt **vrange );
-HYPRE_Int hypre_AmgCGCGraphAssemble ( hypre_ParCSRMatrix *S , HYPRE_Int *vertexrange , HYPRE_Int *CF_marker, HYPRE_Int *CF_marker_offd , HYPRE_Int coarsen_type , HYPRE_IJMatrix *ijG );
-HYPRE_Int hypre_AmgCGCChoose ( hypre_CSRMatrix *G , HYPRE_Int *vertexrange , HYPRE_Int mpisize , HYPRE_Int **coarse );
-HYPRE_Int hypre_AmgCGCBoundaryFix ( hypre_ParCSRMatrix *S , HYPRE_Int *CF_marker , HYPRE_Int *CF_marker_offd );
+HYPRE_Int hypre_AmgCGCGraphAssemble ( hypre_ParCSRMatrix *S, HYPRE_Int *vertexrange,
+                                      HYPRE_Int *CF_marker, HYPRE_Int *CF_marker_offd, HYPRE_Int coarsen_type, HYPRE_IJMatrix *ijG );
+HYPRE_Int hypre_AmgCGCChoose ( hypre_CSRMatrix *G, HYPRE_Int *vertexrange, HYPRE_Int mpisize,
+                               HYPRE_Int **coarse );
+HYPRE_Int hypre_AmgCGCBoundaryFix ( hypre_ParCSRMatrix *S, HYPRE_Int *CF_marker,
+                                    HYPRE_Int *CF_marker_offd );
 
 /* par_cg_relax_wt.c */
-HYPRE_Int hypre_BoomerAMGCGRelaxWt ( void *amg_vdata , HYPRE_Int level , HYPRE_Int num_cg_sweeps , HYPRE_Real *rlx_wt_ptr );
-HYPRE_Int hypre_Bisection ( HYPRE_Int n , HYPRE_Real *diag , HYPRE_Real *offd , HYPRE_Real y , HYPRE_Real z , HYPRE_Real tol , HYPRE_Int k , HYPRE_Real *ev_ptr );
+HYPRE_Int hypre_BoomerAMGCGRelaxWt ( void *amg_vdata, HYPRE_Int level, HYPRE_Int num_cg_sweeps,
+                                     HYPRE_Real *rlx_wt_ptr );
+HYPRE_Int hypre_Bisection ( HYPRE_Int n, HYPRE_Real *diag, HYPRE_Real *offd, HYPRE_Real y,
+                            HYPRE_Real z, HYPRE_Real tol, HYPRE_Int k, HYPRE_Real *ev_ptr );
 
 /* par_cheby.c */
-HYPRE_Int hypre_ParCSRRelax_Cheby_Setup ( hypre_ParCSRMatrix *A , HYPRE_Real max_eig , HYPRE_Real min_eig , HYPRE_Real fraction , HYPRE_Int order , HYPRE_Int scale , HYPRE_Int variant , HYPRE_Real **coefs_ptr , HYPRE_Real **ds_ptr );
-HYPRE_Int hypre_ParCSRRelax_Cheby_Solve ( hypre_ParCSRMatrix *A , hypre_ParVector *f , HYPRE_Real *ds_data , HYPRE_Real *coefs , HYPRE_Int order , HYPRE_Int scale , HYPRE_Int variant , hypre_ParVector *u , hypre_ParVector *v , hypre_ParVector *r , hypre_ParVector *orig_u_vec, hypre_ParVector *tmp_vec);
-
-HYPRE_Int hypre_ParCSRRelax_Cheby_SolveHost ( hypre_ParCSRMatrix *A , hypre_ParVector *f , HYPRE_Real *ds_data , HYPRE_Real *coefs , HYPRE_Int order , HYPRE_Int scale , HYPRE_Int variant , hypre_ParVector *u , hypre_ParVector *v , hypre_ParVector *r, hypre_ParVector *orig_u_vec, hypre_ParVector *tmp_vec);
+HYPRE_Int hypre_ParCSRRelax_Cheby_Setup ( hypre_ParCSRMatrix *A, HYPRE_Real max_eig,
+                                          HYPRE_Real min_eig, HYPRE_Real fraction, HYPRE_Int order, HYPRE_Int scale, HYPRE_Int variant,
+                                          HYPRE_Real **coefs_ptr, HYPRE_Real **ds_ptr );
+HYPRE_Int hypre_ParCSRRelax_Cheby_Solve ( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                          HYPRE_Real *ds_data, HYPRE_Real *coefs, HYPRE_Int order, HYPRE_Int scale, HYPRE_Int variant,
+                                          hypre_ParVector *u, hypre_ParVector *v, hypre_ParVector *r, hypre_ParVector *orig_u_vec,
+                                          hypre_ParVector *tmp_vec);
+
+HYPRE_Int hypre_ParCSRRelax_Cheby_SolveHost ( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                              HYPRE_Real *ds_data, HYPRE_Real *coefs, HYPRE_Int order, HYPRE_Int scale, HYPRE_Int variant,
+                                              hypre_ParVector *u, hypre_ParVector *v, hypre_ParVector *r, hypre_ParVector *orig_u_vec,
+                                              hypre_ParVector *tmp_vec);
 
 /* par_cheby_device.c */
-HYPRE_Int hypre_ParCSRRelax_Cheby_SolveDevice ( hypre_ParCSRMatrix *A , hypre_ParVector *f , HYPRE_Real *ds_data , HYPRE_Real *coefs , HYPRE_Int order , HYPRE_Int scale , HYPRE_Int variant , hypre_ParVector *u , hypre_ParVector *v , hypre_ParVector *r, hypre_ParVector *orig_u_vec, hypre_ParVector *tmp_vec);
+HYPRE_Int hypre_ParCSRRelax_Cheby_SolveDevice ( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                                HYPRE_Real *ds_data, HYPRE_Real *coefs, HYPRE_Int order, HYPRE_Int scale, HYPRE_Int variant,
+                                                hypre_ParVector *u, hypre_ParVector *v, hypre_ParVector *r, hypre_ParVector *orig_u_vec,
+                                                hypre_ParVector *tmp_vec);
 
 /* par_coarsen.c */
-HYPRE_Int hypre_BoomerAMGCoarsen ( hypre_ParCSRMatrix *S , hypre_ParCSRMatrix *A , HYPRE_Int CF_init , HYPRE_Int debug_flag , hypre_IntArray **CF_marker_ptr );
-HYPRE_Int hypre_BoomerAMGCoarsenRuge ( hypre_ParCSRMatrix *S , hypre_ParCSRMatrix *A , HYPRE_Int measure_type , HYPRE_Int coarsen_type , HYPRE_Int cut_factor , HYPRE_Int debug_flag , hypre_IntArray **CF_marker_ptr );
-HYPRE_Int hypre_BoomerAMGCoarsenFalgout ( hypre_ParCSRMatrix *S , hypre_ParCSRMatrix *A , HYPRE_Int measure_type , HYPRE_Int cut_factor , HYPRE_Int debug_flag , hypre_IntArray **CF_marker_ptr );
-HYPRE_Int hypre_BoomerAMGCoarsenHMIS ( hypre_ParCSRMatrix *S , hypre_ParCSRMatrix *A , HYPRE_Int measure_type , HYPRE_Int cut_factor , HYPRE_Int debug_flag , hypre_IntArray **CF_marker_ptr );
-HYPRE_Int hypre_BoomerAMGCoarsenPMIS ( hypre_ParCSRMatrix *S , hypre_ParCSRMatrix *A , HYPRE_Int CF_init , HYPRE_Int debug_flag , hypre_IntArray **CF_marker_ptr );
-HYPRE_Int hypre_BoomerAMGCoarsenPMISHost ( hypre_ParCSRMatrix *S , hypre_ParCSRMatrix *A , HYPRE_Int CF_init , HYPRE_Int debug_flag , hypre_IntArray **CF_marker_ptr );
-
-HYPRE_Int hypre_BoomerAMGCoarsenPMISDevice( hypre_ParCSRMatrix *S, hypre_ParCSRMatrix *A, HYPRE_Int CF_init, HYPRE_Int debug_flag, hypre_IntArray **CF_marker_ptr );
+HYPRE_Int hypre_BoomerAMGCoarsen ( hypre_ParCSRMatrix *S, hypre_ParCSRMatrix *A, HYPRE_Int CF_init,
+                                   HYPRE_Int debug_flag, hypre_IntArray **CF_marker_ptr );
+HYPRE_Int hypre_BoomerAMGCoarsenRuge ( hypre_ParCSRMatrix *S, hypre_ParCSRMatrix *A,
+                                       HYPRE_Int measure_type, HYPRE_Int coarsen_type, HYPRE_Int cut_factor, HYPRE_Int debug_flag,
+                                       hypre_IntArray **CF_marker_ptr );
+HYPRE_Int hypre_BoomerAMGCoarsenFalgout ( hypre_ParCSRMatrix *S, hypre_ParCSRMatrix *A,
+                                          HYPRE_Int measure_type, HYPRE_Int cut_factor, HYPRE_Int debug_flag,
+                                          hypre_IntArray **CF_marker_ptr );
+HYPRE_Int hypre_BoomerAMGCoarsenHMIS ( hypre_ParCSRMatrix *S, hypre_ParCSRMatrix *A,
+                                       HYPRE_Int measure_type, HYPRE_Int cut_factor, HYPRE_Int debug_flag,
+                                       hypre_IntArray **CF_marker_ptr );
+HYPRE_Int hypre_BoomerAMGCoarsenPMIS ( hypre_ParCSRMatrix *S, hypre_ParCSRMatrix *A,
+                                       HYPRE_Int CF_init, HYPRE_Int debug_flag, hypre_IntArray **CF_marker_ptr );
+HYPRE_Int hypre_BoomerAMGCoarsenPMISHost ( hypre_ParCSRMatrix *S, hypre_ParCSRMatrix *A,
+                                           HYPRE_Int CF_init, HYPRE_Int debug_flag, hypre_IntArray **CF_marker_ptr );
+
+HYPRE_Int hypre_BoomerAMGCoarsenPMISDevice( hypre_ParCSRMatrix *S, hypre_ParCSRMatrix *A,
+                                            HYPRE_Int CF_init, HYPRE_Int debug_flag, hypre_IntArray **CF_marker_ptr );
 
 /* par_coarsen_device.c */
-HYPRE_Int hypre_GetGlobalMeasureDevice( hypre_ParCSRMatrix *S, hypre_ParCSRCommPkg *comm_pkg, HYPRE_Int CF_init, HYPRE_Int aug_rand, HYPRE_Real *measure_diag, HYPRE_Real *measure_offd, HYPRE_Real *real_send_buf );
+HYPRE_Int hypre_GetGlobalMeasureDevice( hypre_ParCSRMatrix *S, hypre_ParCSRCommPkg *comm_pkg,
+                                        HYPRE_Int CF_init, HYPRE_Int aug_rand, HYPRE_Real *measure_diag, HYPRE_Real *measure_offd,
+                                        HYPRE_Real *real_send_buf );
 
 /* par_coarse_parms.c */
-HYPRE_Int hypre_BoomerAMGCoarseParms ( MPI_Comm comm , HYPRE_Int local_num_variables , HYPRE_Int num_functions , hypre_IntArray *dof_func , hypre_IntArray *CF_marker , hypre_IntArray **coarse_dof_func_ptr , HYPRE_BigInt **coarse_pnts_global_ptr );
-HYPRE_Int hypre_BoomerAMGCoarseParmsHost ( MPI_Comm comm , HYPRE_Int local_num_variables , HYPRE_Int num_functions , hypre_IntArray *dof_func , hypre_IntArray *CF_marker , hypre_IntArray **coarse_dof_func_ptr , HYPRE_BigInt **coarse_pnts_global_ptr );
-HYPRE_Int hypre_BoomerAMGCoarseParmsDevice ( MPI_Comm comm , HYPRE_Int local_num_variables , HYPRE_Int num_functions , hypre_IntArray *dof_func , hypre_IntArray *CF_marker , hypre_IntArray **coarse_dof_func_ptr , HYPRE_BigInt **coarse_pnts_global_ptr );
-HYPRE_Int hypre_BoomerAMGInitDofFuncDevice( HYPRE_Int *dof_func, HYPRE_Int local_size, HYPRE_Int offset, HYPRE_Int num_functions );
+HYPRE_Int hypre_BoomerAMGCoarseParms ( MPI_Comm comm, HYPRE_Int local_num_variables,
+                                       HYPRE_Int num_functions, hypre_IntArray *dof_func, hypre_IntArray *CF_marker,
+                                       hypre_IntArray **coarse_dof_func_ptr, HYPRE_BigInt *coarse_pnts_global );
+HYPRE_Int hypre_BoomerAMGCoarseParmsHost ( MPI_Comm comm, HYPRE_Int local_num_variables,
+                                           HYPRE_Int num_functions, hypre_IntArray *dof_func, hypre_IntArray *CF_marker,
+                                           hypre_IntArray **coarse_dof_func_ptr, HYPRE_BigInt *coarse_pnts_global );
+HYPRE_Int hypre_BoomerAMGCoarseParmsDevice ( MPI_Comm comm, HYPRE_Int local_num_variables,
+                                             HYPRE_Int num_functions, hypre_IntArray *dof_func, hypre_IntArray *CF_marker,
+                                             hypre_IntArray **coarse_dof_func_ptr, HYPRE_BigInt *coarse_pnts_global );
+HYPRE_Int hypre_BoomerAMGInitDofFuncDevice( HYPRE_Int *dof_func, HYPRE_Int local_size,
+                                            HYPRE_Int offset, HYPRE_Int num_functions );
 
 /* par_coordinates.c */
-float *GenerateCoordinates ( MPI_Comm comm , HYPRE_BigInt nx , HYPRE_BigInt ny , HYPRE_BigInt nz , HYPRE_Int P , HYPRE_Int Q , HYPRE_Int R , HYPRE_Int p , HYPRE_Int q , HYPRE_Int r , HYPRE_Int coorddim );
+float *hypre_GenerateCoordinates ( MPI_Comm comm, HYPRE_BigInt nx, HYPRE_BigInt ny,
+                                   HYPRE_BigInt nz, HYPRE_Int P, HYPRE_Int Q, HYPRE_Int R,
+                                   HYPRE_Int p, HYPRE_Int q, HYPRE_Int r, HYPRE_Int coorddim );
 
 /* par_cr.c */
-HYPRE_Int hypre_BoomerAMGCoarsenCR1 ( hypre_ParCSRMatrix *A , hypre_IntArray **CF_marker_ptr , HYPRE_BigInt *coarse_size_ptr , HYPRE_Int num_CR_relax_steps , HYPRE_Int IS_type , HYPRE_Int CRaddCpoints );
-HYPRE_Int hypre_cr ( HYPRE_Int *A_i , HYPRE_Int *A_j , HYPRE_Real *A_data , HYPRE_Int n , HYPRE_Int *cf , HYPRE_Int rlx , HYPRE_Real omega , HYPRE_Real tg , HYPRE_Int mu );
-HYPRE_Int hypre_GraphAdd ( Link *list , HYPRE_Int *head , HYPRE_Int *tail , HYPRE_Int index , HYPRE_Int istack );
-HYPRE_Int hypre_GraphRemove ( Link *list , HYPRE_Int *head , HYPRE_Int *tail , HYPRE_Int index );
-HYPRE_Int hypre_IndepSetGreedy ( HYPRE_Int *A_i , HYPRE_Int *A_j , HYPRE_Int n , HYPRE_Int *cf );
-HYPRE_Int hypre_IndepSetGreedyS ( HYPRE_Int *A_i , HYPRE_Int *A_j , HYPRE_Int n , HYPRE_Int *cf );
-HYPRE_Int hypre_fptjaccr ( HYPRE_Int *cf , HYPRE_Int *A_i , HYPRE_Int *A_j , HYPRE_Real *A_data , HYPRE_Int n , HYPRE_Real *e0 , HYPRE_Real omega , HYPRE_Real *e1 );
-HYPRE_Int hypre_fptgscr ( HYPRE_Int *cf , HYPRE_Int *A_i , HYPRE_Int *A_j , HYPRE_Real *A_data , HYPRE_Int n , HYPRE_Real *e0 , HYPRE_Real *e1 );
-HYPRE_Int hypre_formu ( HYPRE_Int *cf , HYPRE_Int n , HYPRE_Real *e1 , HYPRE_Int *A_i , HYPRE_Real rho );
-HYPRE_Int hypre_BoomerAMGIndepRS ( hypre_ParCSRMatrix *S , HYPRE_Int measure_type , HYPRE_Int debug_flag , HYPRE_Int *CF_marker );
-HYPRE_Int hypre_BoomerAMGIndepRSa ( hypre_ParCSRMatrix *S , HYPRE_Int measure_type , HYPRE_Int debug_flag , HYPRE_Int *CF_marker );
-HYPRE_Int hypre_BoomerAMGIndepHMIS ( hypre_ParCSRMatrix *S , HYPRE_Int measure_type , HYPRE_Int debug_flag , HYPRE_Int *CF_marker );
-HYPRE_Int hypre_BoomerAMGIndepHMISa ( hypre_ParCSRMatrix *S , HYPRE_Int measure_type , HYPRE_Int debug_flag , HYPRE_Int *CF_marker );
-HYPRE_Int hypre_BoomerAMGIndepPMIS ( hypre_ParCSRMatrix *S , HYPRE_Int CF_init , HYPRE_Int debug_flag , HYPRE_Int *CF_marker );
-HYPRE_Int hypre_BoomerAMGIndepPMISa ( hypre_ParCSRMatrix *S , HYPRE_Int CF_init , HYPRE_Int debug_flag , HYPRE_Int *CF_marker );
-HYPRE_Int hypre_BoomerAMGCoarsenCR ( hypre_ParCSRMatrix *A , hypre_IntArray **CF_marker_ptr , HYPRE_BigInt *coarse_size_ptr , HYPRE_Int num_CR_relax_steps , HYPRE_Int IS_type , HYPRE_Int num_functions , HYPRE_Int rlx_type , HYPRE_Real relax_weight , HYPRE_Real omega , HYPRE_Real theta , HYPRE_Solver smoother , hypre_ParCSRMatrix *AN , HYPRE_Int useCG , hypre_ParCSRMatrix *S );
+HYPRE_Int hypre_BoomerAMGCoarsenCR1 ( hypre_ParCSRMatrix *A, hypre_IntArray **CF_marker_ptr,
+                                      HYPRE_BigInt *coarse_size_ptr, HYPRE_Int num_CR_relax_steps, HYPRE_Int IS_type,
+                                      HYPRE_Int CRaddCpoints );
+HYPRE_Int hypre_cr ( HYPRE_Int *A_i, HYPRE_Int *A_j, HYPRE_Real *A_data, HYPRE_Int n, HYPRE_Int *cf,
+                     HYPRE_Int rlx, HYPRE_Real omega, HYPRE_Real tg, HYPRE_Int mu );
+HYPRE_Int hypre_GraphAdd ( Link *list, HYPRE_Int *head, HYPRE_Int *tail, HYPRE_Int index,
+                           HYPRE_Int istack );
+HYPRE_Int hypre_GraphRemove ( Link *list, HYPRE_Int *head, HYPRE_Int *tail, HYPRE_Int index );
+HYPRE_Int hypre_IndepSetGreedy ( HYPRE_Int *A_i, HYPRE_Int *A_j, HYPRE_Int n, HYPRE_Int *cf );
+HYPRE_Int hypre_IndepSetGreedyS ( HYPRE_Int *A_i, HYPRE_Int *A_j, HYPRE_Int n, HYPRE_Int *cf );
+HYPRE_Int hypre_fptjaccr ( HYPRE_Int *cf, HYPRE_Int *A_i, HYPRE_Int *A_j, HYPRE_Real *A_data,
+                           HYPRE_Int n, HYPRE_Real *e0, HYPRE_Real omega, HYPRE_Real *e1 );
+HYPRE_Int hypre_fptgscr ( HYPRE_Int *cf, HYPRE_Int *A_i, HYPRE_Int *A_j, HYPRE_Real *A_data,
+                          HYPRE_Int n, HYPRE_Real *e0, HYPRE_Real *e1 );
+HYPRE_Int hypre_formu ( HYPRE_Int *cf, HYPRE_Int n, HYPRE_Real *e1, HYPRE_Int *A_i,
+                        HYPRE_Real rho );
+HYPRE_Int hypre_BoomerAMGIndepRS ( hypre_ParCSRMatrix *S, HYPRE_Int measure_type,
+                                   HYPRE_Int debug_flag, HYPRE_Int *CF_marker );
+HYPRE_Int hypre_BoomerAMGIndepRSa ( hypre_ParCSRMatrix *S, HYPRE_Int measure_type,
+                                    HYPRE_Int debug_flag, HYPRE_Int *CF_marker );
+HYPRE_Int hypre_BoomerAMGIndepHMIS ( hypre_ParCSRMatrix *S, HYPRE_Int measure_type,
+                                     HYPRE_Int debug_flag, HYPRE_Int *CF_marker );
+HYPRE_Int hypre_BoomerAMGIndepHMISa ( hypre_ParCSRMatrix *S, HYPRE_Int measure_type,
+                                      HYPRE_Int debug_flag, HYPRE_Int *CF_marker );
+HYPRE_Int hypre_BoomerAMGIndepPMIS ( hypre_ParCSRMatrix *S, HYPRE_Int CF_init, HYPRE_Int debug_flag,
+                                     HYPRE_Int *CF_marker );
+HYPRE_Int hypre_BoomerAMGIndepPMISa ( hypre_ParCSRMatrix *S, HYPRE_Int CF_init,
+                                      HYPRE_Int debug_flag, HYPRE_Int *CF_marker );
+HYPRE_Int hypre_BoomerAMGCoarsenCR ( hypre_ParCSRMatrix *A, hypre_IntArray **CF_marker_ptr,
+                                     HYPRE_BigInt *coarse_size_ptr, HYPRE_Int num_CR_relax_steps, HYPRE_Int IS_type,
+                                     HYPRE_Int num_functions, HYPRE_Int rlx_type, HYPRE_Real relax_weight, HYPRE_Real omega,
+                                     HYPRE_Real theta, HYPRE_Solver smoother, hypre_ParCSRMatrix *AN, HYPRE_Int useCG,
+                                     hypre_ParCSRMatrix *S );
 
 /* par_cycle.c */
-HYPRE_Int hypre_BoomerAMGCycle ( void *amg_vdata , hypre_ParVector **F_array , hypre_ParVector **U_array );
+HYPRE_Int hypre_BoomerAMGCycle ( void *amg_vdata, hypre_ParVector **F_array,
+                                 hypre_ParVector **U_array );
 
 /* par_difconv.c */
-HYPRE_ParCSRMatrix GenerateDifConv ( MPI_Comm comm , HYPRE_BigInt nx , HYPRE_BigInt ny , HYPRE_BigInt nz , HYPRE_Int P , HYPRE_Int Q , HYPRE_Int R , HYPRE_Int p , HYPRE_Int q , HYPRE_Int r , HYPRE_Real *value );
+HYPRE_ParCSRMatrix GenerateDifConv ( MPI_Comm comm, HYPRE_BigInt nx, HYPRE_BigInt ny,
+                                     HYPRE_BigInt nz, HYPRE_Int P, HYPRE_Int Q, HYPRE_Int R, HYPRE_Int p, HYPRE_Int q, HYPRE_Int r,
+                                     HYPRE_Real *value );
 
 /* par_gsmg.c */
-HYPRE_Int hypre_ParCSRMatrixFillSmooth ( HYPRE_Int nsamples , HYPRE_Real *samples , hypre_ParCSRMatrix *S , hypre_ParCSRMatrix *A , HYPRE_Int num_functions , HYPRE_Int *dof_func );
+HYPRE_Int hypre_ParCSRMatrixFillSmooth ( HYPRE_Int nsamples, HYPRE_Real *samples,
+                                         hypre_ParCSRMatrix *S, hypre_ParCSRMatrix *A, HYPRE_Int num_functions, HYPRE_Int *dof_func );
 HYPRE_Real hypre_ParCSRMatrixChooseThresh ( hypre_ParCSRMatrix *S );
-HYPRE_Int hypre_ParCSRMatrixThreshold ( hypre_ParCSRMatrix *A , HYPRE_Real thresh );
-HYPRE_Int hypre_BoomerAMGCreateSmoothVecs ( void *data , hypre_ParCSRMatrix *A , HYPRE_Int num_sweeps , HYPRE_Int level , HYPRE_Real **SmoothVecs_p );
-HYPRE_Int hypre_BoomerAMGCreateSmoothDirs ( void *data , hypre_ParCSRMatrix *A , HYPRE_Real *SmoothVecs , HYPRE_Real thresh , HYPRE_Int num_functions , HYPRE_Int *dof_func , hypre_ParCSRMatrix **S_ptr );
-HYPRE_Int hypre_BoomerAMGNormalizeVecs ( HYPRE_Int n , HYPRE_Int num , HYPRE_Real *V );
-HYPRE_Int hypre_BoomerAMGFitVectors ( HYPRE_Int ip , HYPRE_Int n , HYPRE_Int num , const HYPRE_Real *V , HYPRE_Int nc , const HYPRE_Int *ind , HYPRE_Real *val );
-HYPRE_Int hypre_BoomerAMGBuildInterpLS ( hypre_ParCSRMatrix *A , HYPRE_Int *CF_marker , hypre_ParCSRMatrix *S , HYPRE_BigInt *num_cpts_global , HYPRE_Int num_functions , HYPRE_Int *dof_func , HYPRE_Int debug_flag , HYPRE_Real trunc_factor , HYPRE_Int num_smooth , HYPRE_Real *SmoothVecs , hypre_ParCSRMatrix **P_ptr );
-HYPRE_Int hypre_BoomerAMGBuildInterpGSMG ( hypre_ParCSRMatrix *A , HYPRE_Int *CF_marker , hypre_ParCSRMatrix *S , HYPRE_BigInt *num_cpts_global , HYPRE_Int num_functions , HYPRE_Int *dof_func , HYPRE_Int debug_flag , HYPRE_Real trunc_factor , hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_ParCSRMatrixThreshold ( hypre_ParCSRMatrix *A, HYPRE_Real thresh );
+HYPRE_Int hypre_BoomerAMGCreateSmoothVecs ( void *data, hypre_ParCSRMatrix *A, HYPRE_Int num_sweeps,
+                                            HYPRE_Int level, HYPRE_Real **SmoothVecs_p );
+HYPRE_Int hypre_BoomerAMGCreateSmoothDirs ( void *data, hypre_ParCSRMatrix *A,
+                                            HYPRE_Real *SmoothVecs, HYPRE_Real thresh, HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                            hypre_ParCSRMatrix **S_ptr );
+HYPRE_Int hypre_BoomerAMGNormalizeVecs ( HYPRE_Int n, HYPRE_Int num, HYPRE_Real *V );
+HYPRE_Int hypre_BoomerAMGFitVectors ( HYPRE_Int ip, HYPRE_Int n, HYPRE_Int num, const HYPRE_Real *V,
+                                      HYPRE_Int nc, const HYPRE_Int *ind, HYPRE_Real *val );
+HYPRE_Int hypre_BoomerAMGBuildInterpLS ( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                         hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                         HYPRE_Int debug_flag, HYPRE_Real trunc_factor, HYPRE_Int num_smooth, HYPRE_Real *SmoothVecs,
+                                         hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_BoomerAMGBuildInterpGSMG ( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                           hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                           HYPRE_Int debug_flag, HYPRE_Real trunc_factor, hypre_ParCSRMatrix **P_ptr );
 
 /* par_indepset.c */
-HYPRE_Int hypre_BoomerAMGIndepSetInit ( hypre_ParCSRMatrix *S , HYPRE_Real *measure_array , HYPRE_Int seq_rand );
-HYPRE_Int hypre_BoomerAMGIndepSet ( hypre_ParCSRMatrix *S , HYPRE_Real *measure_array , HYPRE_Int *graph_array , HYPRE_Int graph_array_size , HYPRE_Int *graph_array_offd , HYPRE_Int graph_array_offd_size , HYPRE_Int *IS_marker , HYPRE_Int *IS_marker_offd );
+HYPRE_Int hypre_BoomerAMGIndepSetInit ( hypre_ParCSRMatrix *S, HYPRE_Real *measure_array,
+                                        HYPRE_Int seq_rand );
+HYPRE_Int hypre_BoomerAMGIndepSet ( hypre_ParCSRMatrix *S, HYPRE_Real *measure_array,
+                                    HYPRE_Int *graph_array, HYPRE_Int graph_array_size, HYPRE_Int *graph_array_offd,
+                                    HYPRE_Int graph_array_offd_size, HYPRE_Int *IS_marker, HYPRE_Int *IS_marker_offd );
 
-HYPRE_Int hypre_BoomerAMGIndepSetInitDevice( hypre_ParCSRMatrix *S, HYPRE_Real *measure_array, HYPRE_Int aug_rand);
+HYPRE_Int hypre_BoomerAMGIndepSetInitDevice( hypre_ParCSRMatrix *S, HYPRE_Real *measure_array,
+                                             HYPRE_Int aug_rand);
 
-HYPRE_Int hypre_BoomerAMGIndepSetDevice( hypre_ParCSRMatrix *S, HYPRE_Real *measure_diag, HYPRE_Real *measure_offd, HYPRE_Int graph_diag_size, HYPRE_Int *graph_diag, HYPRE_Int *IS_marker_diag, HYPRE_Int *IS_marker_offd, hypre_ParCSRCommPkg *comm_pkg, HYPRE_Int *int_send_buf );
+HYPRE_Int hypre_BoomerAMGIndepSetDevice( hypre_ParCSRMatrix *S, HYPRE_Real *measure_diag,
+                                         HYPRE_Real *measure_offd, HYPRE_Int graph_diag_size, HYPRE_Int *graph_diag,
+                                         HYPRE_Int *IS_marker_diag, HYPRE_Int *IS_marker_offd, hypre_ParCSRCommPkg *comm_pkg,
+                                         HYPRE_Int *int_send_buf );
 
 /* par_interp.c */
-HYPRE_Int hypre_BoomerAMGBuildInterp ( hypre_ParCSRMatrix *A , HYPRE_Int *CF_marker , hypre_ParCSRMatrix *S , HYPRE_BigInt *num_cpts_global , HYPRE_Int num_functions , HYPRE_Int *dof_func , HYPRE_Int debug_flag , HYPRE_Real trunc_factor , HYPRE_Int max_elmts , hypre_ParCSRMatrix **P_ptr );
-HYPRE_Int hypre_BoomerAMGBuildInterpHE ( hypre_ParCSRMatrix *A , HYPRE_Int *CF_marker , hypre_ParCSRMatrix *S , HYPRE_BigInt *num_cpts_global , HYPRE_Int num_functions , HYPRE_Int *dof_func , HYPRE_Int debug_flag , HYPRE_Real trunc_factor , HYPRE_Int max_elmts , hypre_ParCSRMatrix **P_ptr );
-HYPRE_Int hypre_BoomerAMGBuildDirInterp ( hypre_ParCSRMatrix *A , HYPRE_Int *CF_marker , hypre_ParCSRMatrix *S , HYPRE_BigInt *num_cpts_global , HYPRE_Int num_functions , HYPRE_Int *dof_func , HYPRE_Int debug_flag , HYPRE_Real trunc_factor , HYPRE_Int max_elmts , HYPRE_Int interp_type, hypre_ParCSRMatrix **P_ptr );
-HYPRE_Int hypre_BoomerAMGBuildDirInterpDevice( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker , hypre_ParCSRMatrix *S , HYPRE_BigInt *num_cpts_global , HYPRE_Int num_functions , HYPRE_Int *dof_func , HYPRE_Int debug_flag , HYPRE_Real trunc_factor , HYPRE_Int max_elmts , HYPRE_Int interp_type, hypre_ParCSRMatrix **P_ptr );
-
-HYPRE_Int hypre_BoomerAMGInterpTruncation ( hypre_ParCSRMatrix *P, HYPRE_Real trunc_factor, HYPRE_Int max_elmts );
-HYPRE_Int hypre_BoomerAMGInterpTruncationDevice( hypre_ParCSRMatrix *P, HYPRE_Real trunc_factor, HYPRE_Int max_elmts );
-
-HYPRE_Int hypre_BoomerAMGBuildInterpModUnk ( hypre_ParCSRMatrix *A , HYPRE_Int *CF_marker , hypre_ParCSRMatrix *S , HYPRE_BigInt *num_cpts_global , HYPRE_Int num_functions , HYPRE_Int *dof_func , HYPRE_Int debug_flag , HYPRE_Real trunc_factor , HYPRE_Int max_elmts , hypre_ParCSRMatrix **P_ptr );
-HYPRE_Int hypre_BoomerAMGTruncandBuild ( hypre_ParCSRMatrix *P , HYPRE_Real trunc_factor , HYPRE_Int max_elmts );
-hypre_ParCSRMatrix *hypre_CreateC ( hypre_ParCSRMatrix *A , HYPRE_Real w );
-
-HYPRE_Int hypre_BoomerAMGBuildInterpOnePntHost( hypre_ParCSRMatrix  *A, HYPRE_Int *CF_marker, hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int debug_flag, hypre_ParCSRMatrix **P_ptr);
-HYPRE_Int hypre_BoomerAMGBuildInterpOnePntDevice( hypre_ParCSRMatrix  *A, HYPRE_Int *CF_marker, hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int debug_flag, hypre_ParCSRMatrix **P_ptr);
-HYPRE_Int hypre_BoomerAMGBuildInterpOnePnt( hypre_ParCSRMatrix  *A, HYPRE_Int *CF_marker, hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int debug_flag, hypre_ParCSRMatrix **P_ptr);
+HYPRE_Int hypre_BoomerAMGBuildInterp ( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                       hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                       HYPRE_Int debug_flag, HYPRE_Real trunc_factor, HYPRE_Int max_elmts, hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_BoomerAMGBuildInterpHE ( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                         hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                         HYPRE_Int debug_flag, HYPRE_Real trunc_factor, HYPRE_Int max_elmts, hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_BoomerAMGBuildDirInterp ( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                          hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                          HYPRE_Int debug_flag, HYPRE_Real trunc_factor, HYPRE_Int max_elmts, HYPRE_Int interp_type,
+                                          hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_BoomerAMGBuildDirInterpDevice( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                               hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                               HYPRE_Int debug_flag, HYPRE_Real trunc_factor, HYPRE_Int max_elmts, HYPRE_Int interp_type,
+                                               hypre_ParCSRMatrix **P_ptr );
+
+HYPRE_Int hypre_BoomerAMGInterpTruncation ( hypre_ParCSRMatrix *P, HYPRE_Real trunc_factor,
+                                            HYPRE_Int max_elmts );
+HYPRE_Int hypre_BoomerAMGInterpTruncationDevice( hypre_ParCSRMatrix *P, HYPRE_Real trunc_factor,
+                                                 HYPRE_Int max_elmts );
+
+HYPRE_Int hypre_BoomerAMGBuildInterpModUnk ( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                             hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                             HYPRE_Int debug_flag, HYPRE_Real trunc_factor, HYPRE_Int max_elmts, hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_BoomerAMGTruncandBuild ( hypre_ParCSRMatrix *P, HYPRE_Real trunc_factor,
+                                         HYPRE_Int max_elmts );
+hypre_ParCSRMatrix *hypre_CreateC ( hypre_ParCSRMatrix *A, HYPRE_Real w );
+
+HYPRE_Int hypre_BoomerAMGBuildInterpOnePntHost( hypre_ParCSRMatrix  *A, HYPRE_Int *CF_marker,
+                                                hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                                HYPRE_Int debug_flag, hypre_ParCSRMatrix **P_ptr);
+HYPRE_Int hypre_BoomerAMGBuildInterpOnePntDevice( hypre_ParCSRMatrix  *A, HYPRE_Int *CF_marker,
+                                                  hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                                  HYPRE_Int debug_flag, hypre_ParCSRMatrix **P_ptr);
+HYPRE_Int hypre_BoomerAMGBuildInterpOnePnt( hypre_ParCSRMatrix  *A, HYPRE_Int *CF_marker,
+                                            hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                            HYPRE_Int debug_flag, hypre_ParCSRMatrix **P_ptr);
 
 /* par_jacobi_interp.c */
-void hypre_BoomerAMGJacobiInterp ( hypre_ParCSRMatrix *A , hypre_ParCSRMatrix **P , hypre_ParCSRMatrix *S , HYPRE_Int num_functions , HYPRE_Int *dof_func , HYPRE_Int *CF_marker , HYPRE_Int level , HYPRE_Real truncation_threshold , HYPRE_Real truncation_threshold_minus );
-void hypre_BoomerAMGJacobiInterp_1 ( hypre_ParCSRMatrix *A , hypre_ParCSRMatrix **P , hypre_ParCSRMatrix *S , HYPRE_Int *CF_marker , HYPRE_Int level , HYPRE_Real truncation_threshold , HYPRE_Real truncation_threshold_minus , HYPRE_Int *dof_func , HYPRE_Int *dof_func_offd , HYPRE_Real weight_AF );
-void hypre_BoomerAMGTruncateInterp ( hypre_ParCSRMatrix *P , HYPRE_Real eps , HYPRE_Real dlt , HYPRE_Int *CF_marker );
-HYPRE_Int hypre_ParCSRMatrix_dof_func_offd ( hypre_ParCSRMatrix *A , HYPRE_Int num_functions , HYPRE_Int *dof_func , HYPRE_Int **dof_func_offd );
+void hypre_BoomerAMGJacobiInterp ( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix **P,
+                                   hypre_ParCSRMatrix *S, HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int *CF_marker,
+                                   HYPRE_Int level, HYPRE_Real truncation_threshold, HYPRE_Real truncation_threshold_minus );
+void hypre_BoomerAMGJacobiInterp_1 ( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix **P,
+                                     hypre_ParCSRMatrix *S, HYPRE_Int *CF_marker, HYPRE_Int level, HYPRE_Real truncation_threshold,
+                                     HYPRE_Real truncation_threshold_minus, HYPRE_Int *dof_func, HYPRE_Int *dof_func_offd,
+                                     HYPRE_Real weight_AF );
+void hypre_BoomerAMGTruncateInterp ( hypre_ParCSRMatrix *P, HYPRE_Real eps, HYPRE_Real dlt,
+                                     HYPRE_Int *CF_marker );
+HYPRE_Int hypre_ParCSRMatrix_dof_func_offd ( hypre_ParCSRMatrix *A, HYPRE_Int num_functions,
+                                             HYPRE_Int *dof_func, HYPRE_Int **dof_func_offd );
 
 /* par_laplace_27pt.c */
-HYPRE_ParCSRMatrix GenerateLaplacian27pt ( MPI_Comm comm , HYPRE_BigInt nx , HYPRE_BigInt ny , HYPRE_BigInt nz , HYPRE_Int P , HYPRE_Int Q , HYPRE_Int R , HYPRE_Int p , HYPRE_Int q , HYPRE_Int r , HYPRE_Real *value );
-HYPRE_Int hypre_map3 ( HYPRE_BigInt ix , HYPRE_BigInt iy , HYPRE_BigInt iz , HYPRE_Int p , HYPRE_Int q , HYPRE_Int r , HYPRE_Int P , HYPRE_Int Q , HYPRE_Int R , HYPRE_BigInt *nx_part , HYPRE_BigInt *ny_part , HYPRE_BigInt *nz_part );
+HYPRE_ParCSRMatrix GenerateLaplacian27pt ( MPI_Comm comm, HYPRE_BigInt nx, HYPRE_BigInt ny,
+                                           HYPRE_BigInt nz, HYPRE_Int P, HYPRE_Int Q, HYPRE_Int R, HYPRE_Int p, HYPRE_Int q, HYPRE_Int r,
+                                           HYPRE_Real *value );
+HYPRE_Int hypre_map3 ( HYPRE_BigInt ix, HYPRE_BigInt iy, HYPRE_BigInt iz, HYPRE_Int p, HYPRE_Int q,
+                       HYPRE_Int r, HYPRE_Int P, HYPRE_Int Q, HYPRE_Int R, HYPRE_BigInt *nx_part, HYPRE_BigInt *ny_part,
+                       HYPRE_BigInt *nz_part );
 
 /* par_laplace_9pt.c */
-HYPRE_ParCSRMatrix GenerateLaplacian9pt ( MPI_Comm comm , HYPRE_BigInt nx , HYPRE_BigInt ny , HYPRE_Int P , HYPRE_Int Q , HYPRE_Int p , HYPRE_Int q , HYPRE_Real *value );
-HYPRE_BigInt hypre_map2 ( HYPRE_BigInt ix , HYPRE_BigInt iy , HYPRE_Int p , HYPRE_Int q , HYPRE_BigInt nx , HYPRE_BigInt *nx_part , HYPRE_BigInt *ny_part );
+HYPRE_ParCSRMatrix GenerateLaplacian9pt ( MPI_Comm comm, HYPRE_BigInt nx, HYPRE_BigInt ny,
+                                          HYPRE_Int P, HYPRE_Int Q, HYPRE_Int p, HYPRE_Int q, HYPRE_Real *value );
+HYPRE_BigInt hypre_map2 ( HYPRE_BigInt ix, HYPRE_BigInt iy, HYPRE_Int p, HYPRE_Int q,
+                          HYPRE_BigInt nx, HYPRE_BigInt *nx_part, HYPRE_BigInt *ny_part );
 
 /* par_laplace.c */
-HYPRE_ParCSRMatrix GenerateLaplacian ( MPI_Comm comm , HYPRE_BigInt ix , HYPRE_BigInt ny , HYPRE_BigInt nz , HYPRE_Int P , HYPRE_Int Q , HYPRE_Int R , HYPRE_Int p , HYPRE_Int q , HYPRE_Int r , HYPRE_Real *value );
-HYPRE_BigInt hypre_map ( HYPRE_BigInt ix , HYPRE_BigInt iy , HYPRE_BigInt iz , HYPRE_Int p, HYPRE_Int q, HYPRE_Int r, HYPRE_BigInt nx , HYPRE_BigInt ny, HYPRE_BigInt *nx_part, HYPRE_BigInt *ny_part, HYPRE_BigInt *nz_part );
-HYPRE_ParCSRMatrix GenerateSysLaplacian ( MPI_Comm comm , HYPRE_BigInt nx , HYPRE_BigInt ny , HYPRE_BigInt nz , HYPRE_Int P , HYPRE_Int Q , HYPRE_Int R , HYPRE_Int p , HYPRE_Int q , HYPRE_Int r , HYPRE_Int num_fun , HYPRE_Real *mtrx , HYPRE_Real *value );
-HYPRE_ParCSRMatrix GenerateSysLaplacianVCoef ( MPI_Comm comm , HYPRE_BigInt nx , HYPRE_BigInt ny , HYPRE_BigInt nz , HYPRE_Int P , HYPRE_Int Q , HYPRE_Int R , HYPRE_Int p , HYPRE_Int q , HYPRE_Int r , HYPRE_Int num_fun , HYPRE_Real *mtrx , HYPRE_Real *value );
+HYPRE_ParCSRMatrix GenerateLaplacian ( MPI_Comm comm, HYPRE_BigInt ix, HYPRE_BigInt ny,
+                                       HYPRE_BigInt nz, HYPRE_Int P, HYPRE_Int Q, HYPRE_Int R, HYPRE_Int p, HYPRE_Int q, HYPRE_Int r,
+                                       HYPRE_Real *value );
+HYPRE_BigInt hypre_map ( HYPRE_BigInt ix, HYPRE_BigInt iy, HYPRE_BigInt iz, HYPRE_Int p,
+                         HYPRE_Int q, HYPRE_Int r, HYPRE_BigInt nx, HYPRE_BigInt ny, HYPRE_BigInt *nx_part,
+                         HYPRE_BigInt *ny_part, HYPRE_BigInt *nz_part );
+HYPRE_ParCSRMatrix GenerateSysLaplacian ( MPI_Comm comm, HYPRE_BigInt nx, HYPRE_BigInt ny,
+                                          HYPRE_BigInt nz, HYPRE_Int P, HYPRE_Int Q, HYPRE_Int R, HYPRE_Int p, HYPRE_Int q, HYPRE_Int r,
+                                          HYPRE_Int num_fun, HYPRE_Real *mtrx, HYPRE_Real *value );
+HYPRE_ParCSRMatrix GenerateSysLaplacianVCoef ( MPI_Comm comm, HYPRE_BigInt nx, HYPRE_BigInt ny,
+                                               HYPRE_BigInt nz, HYPRE_Int P, HYPRE_Int Q, HYPRE_Int R, HYPRE_Int p, HYPRE_Int q, HYPRE_Int r,
+                                               HYPRE_Int num_fun, HYPRE_Real *mtrx, HYPRE_Real *value );
 
 /* par_lr_interp.c */
-HYPRE_Int hypre_BoomerAMGBuildStdInterp ( hypre_ParCSRMatrix *A , HYPRE_Int *CF_marker , hypre_ParCSRMatrix *S , HYPRE_BigInt *num_cpts_global , HYPRE_Int num_functions , HYPRE_Int *dof_func , HYPRE_Int debug_flag , HYPRE_Real trunc_factor , HYPRE_Int max_elmts , HYPRE_Int sep_weight , hypre_ParCSRMatrix **P_ptr );
-HYPRE_Int hypre_BoomerAMGBuildExtPIInterp ( hypre_ParCSRMatrix *A , HYPRE_Int *CF_marker , hypre_ParCSRMatrix *S , HYPRE_BigInt *num_cpts_global , HYPRE_Int num_functions , HYPRE_Int *dof_func , HYPRE_Int debug_flag , HYPRE_Real trunc_factor , HYPRE_Int max_elmts , hypre_ParCSRMatrix **P_ptr );
-HYPRE_Int hypre_BoomerAMGBuildExtPIInterpHost ( hypre_ParCSRMatrix *A , HYPRE_Int *CF_marker , hypre_ParCSRMatrix *S , HYPRE_BigInt *num_cpts_global , HYPRE_Int num_functions , HYPRE_Int *dof_func , HYPRE_Int debug_flag , HYPRE_Real trunc_factor , HYPRE_Int max_elmts , hypre_ParCSRMatrix **P_ptr );
-HYPRE_Int hypre_BoomerAMGBuildExtPICCInterp ( hypre_ParCSRMatrix *A , HYPRE_Int *CF_marker , hypre_ParCSRMatrix *S , HYPRE_BigInt *num_cpts_global , HYPRE_Int num_functions , HYPRE_Int *dof_func , HYPRE_Int debug_flag , HYPRE_Real trunc_factor , HYPRE_Int max_elmts , hypre_ParCSRMatrix **P_ptr );
-HYPRE_Int hypre_BoomerAMGBuildFFInterp ( hypre_ParCSRMatrix *A , HYPRE_Int *CF_marker , hypre_ParCSRMatrix *S , HYPRE_BigInt *num_cpts_global , HYPRE_Int num_functions , HYPRE_Int *dof_func , HYPRE_Int debug_flag , HYPRE_Real trunc_factor , HYPRE_Int max_elmts , hypre_ParCSRMatrix **P_ptr );
-HYPRE_Int hypre_BoomerAMGBuildFF1Interp ( hypre_ParCSRMatrix *A , HYPRE_Int *CF_marker , hypre_ParCSRMatrix *S , HYPRE_BigInt *num_cpts_global , HYPRE_Int num_functions , HYPRE_Int *dof_func , HYPRE_Int debug_flag , HYPRE_Real trunc_factor , HYPRE_Int max_elmts , hypre_ParCSRMatrix **P_ptr );
-HYPRE_Int hypre_BoomerAMGBuildExtInterp ( hypre_ParCSRMatrix *A , HYPRE_Int *CF_marker , hypre_ParCSRMatrix *S , HYPRE_BigInt *num_cpts_global , HYPRE_Int num_functions , HYPRE_Int *dof_func , HYPRE_Int debug_flag , HYPRE_Real trunc_factor , HYPRE_Int max_elmts , hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypreDevice_extendWtoP ( HYPRE_Int P_nr_of_rows, HYPRE_Int W_nr_of_rows,
+                                   HYPRE_Int W_nr_of_cols, HYPRE_Int *CF_marker,
+                                   HYPRE_Int  W_diag_nnz, HYPRE_Int *W_diag_i,
+                                   HYPRE_Int *W_diag_j, HYPRE_Complex *W_diag_data,
+                                   HYPRE_Int *P_diag_i, HYPRE_Int *P_diag_j,
+                                   HYPRE_Complex *P_diag_data, HYPRE_Int *W_offd_i,
+                                   HYPRE_Int *P_offd_i );
+HYPRE_Int hypre_BoomerAMGBuildStdInterp ( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                          hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global,
+                                          HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                          HYPRE_Int debug_flag, HYPRE_Real trunc_factor,
+                                          HYPRE_Int max_elmts, HYPRE_Int sep_weight,
+                                          hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_BoomerAMGBuildExtPIInterp ( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                            hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global,
+                                            HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                            HYPRE_Int debug_flag, HYPRE_Real trunc_factor,
+                                            HYPRE_Int max_elmts, hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_BoomerAMGBuildExtPIInterpHost ( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                                hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global,
+                                                HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                                HYPRE_Int debug_flag, HYPRE_Real trunc_factor,
+                                                HYPRE_Int max_elmts, hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_BoomerAMGBuildExtPICCInterp ( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                              hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global,
+                                              HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                              HYPRE_Int debug_flag, HYPRE_Real trunc_factor,
+                                              HYPRE_Int max_elmts, hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_BoomerAMGBuildFFInterp ( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                         hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global,
+                                         HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                         HYPRE_Int debug_flag, HYPRE_Real trunc_factor,
+                                         HYPRE_Int max_elmts, hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_BoomerAMGBuildFF1Interp ( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                          hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global,
+                                          HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                          HYPRE_Int debug_flag, HYPRE_Real trunc_factor,
+                                          HYPRE_Int max_elmts, hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_BoomerAMGBuildExtInterp ( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                          hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global,
+                                          HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                          HYPRE_Int debug_flag, HYPRE_Real trunc_factor,
+                                          HYPRE_Int max_elmts, hypre_ParCSRMatrix **P_ptr );
 
 /* par_lr_interp_device.c */
-HYPRE_Int hypre_BoomerAMGBuildExtInterpDevice(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker, hypre_ParCSRMatrix   *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int debug_flag, HYPRE_Real trunc_factor, HYPRE_Int max_elmts, hypre_ParCSRMatrix  **P_ptr);
-HYPRE_Int hypre_BoomerAMGBuildExtPIInterpDevice( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker, hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int debug_flag, HYPRE_Real trunc_factor, HYPRE_Int max_elmts, hypre_ParCSRMatrix **P_ptr);
-HYPRE_Int hypre_BoomerAMGBuildExtPEInterpDevice(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker, hypre_ParCSRMatrix   *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int debug_flag, HYPRE_Real trunc_factor, HYPRE_Int max_elmts, hypre_ParCSRMatrix  **P_ptr);
+HYPRE_Int hypre_BoomerAMGBuildExtInterpDevice(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                              hypre_ParCSRMatrix   *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions,
+                                              HYPRE_Int *dof_func, HYPRE_Int debug_flag, HYPRE_Real trunc_factor, HYPRE_Int max_elmts,
+                                              hypre_ParCSRMatrix  **P_ptr);
+HYPRE_Int hypre_BoomerAMGBuildExtPIInterpDevice( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                                 hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                                 HYPRE_Int debug_flag, HYPRE_Real trunc_factor, HYPRE_Int max_elmts, hypre_ParCSRMatrix **P_ptr);
+HYPRE_Int hypre_BoomerAMGBuildExtPEInterpDevice(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                                hypre_ParCSRMatrix   *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions,
+                                                HYPRE_Int *dof_func, HYPRE_Int debug_flag, HYPRE_Real trunc_factor, HYPRE_Int max_elmts,
+                                                hypre_ParCSRMatrix  **P_ptr);
 
 /* par_mod_lr_interp.c */
-HYPRE_Int hypre_BoomerAMGBuildModExtInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker, hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int debug_flag, HYPRE_Real trunc_factor, HYPRE_Int max_elmts, hypre_ParCSRMatrix  **P_ptr);
-HYPRE_Int hypre_BoomerAMGBuildModExtPIInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker, hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int debug_flag, HYPRE_Real trunc_factor, HYPRE_Int max_elmts, hypre_ParCSRMatrix  **P_ptr);
-HYPRE_Int hypre_BoomerAMGBuildModExtPEInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker, hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int debug_flag, HYPRE_Real trunc_factor, HYPRE_Int max_elmts, hypre_ParCSRMatrix **P_ptr);
+HYPRE_Int hypre_BoomerAMGBuildModExtInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                           hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                           HYPRE_Int debug_flag, HYPRE_Real trunc_factor, HYPRE_Int max_elmts, hypre_ParCSRMatrix  **P_ptr);
+HYPRE_Int hypre_BoomerAMGBuildModExtPIInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                             hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                             HYPRE_Int debug_flag, HYPRE_Real trunc_factor, HYPRE_Int max_elmts, hypre_ParCSRMatrix  **P_ptr);
+HYPRE_Int hypre_BoomerAMGBuildModExtPEInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                             hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                             HYPRE_Int debug_flag, HYPRE_Real trunc_factor, HYPRE_Int max_elmts, hypre_ParCSRMatrix **P_ptr);
 
 /* par_2s_interp.c */
-HYPRE_Int hypre_BoomerAMGBuildModPartialExtInterpHost ( hypre_ParCSRMatrix *A , HYPRE_Int *CF_marker , hypre_ParCSRMatrix *S , HYPRE_BigInt *num_cpts_global , HYPRE_BigInt *num_old_cpts_global , HYPRE_Int num_functions , HYPRE_Int *dof_func , HYPRE_Int debug_flag , HYPRE_Real trunc_factor , HYPRE_Int max_elmts , hypre_ParCSRMatrix **P_ptr );
-HYPRE_Int hypre_BoomerAMGBuildModPartialExtInterpDevice ( hypre_ParCSRMatrix *A , HYPRE_Int *CF_marker , hypre_ParCSRMatrix *S , HYPRE_BigInt *num_cpts_global , HYPRE_BigInt *num_old_cpts_global , HYPRE_Int debug_flag , HYPRE_Real trunc_factor , HYPRE_Int max_elmts , hypre_ParCSRMatrix **P_ptr );
-HYPRE_Int hypre_BoomerAMGBuildModPartialExtInterp ( hypre_ParCSRMatrix *A , HYPRE_Int *CF_marker , hypre_ParCSRMatrix *S , HYPRE_BigInt *num_cpts_global , HYPRE_BigInt *num_old_cpts_global , HYPRE_Int num_functions , HYPRE_Int *dof_func , HYPRE_Int debug_flag , HYPRE_Real trunc_factor , HYPRE_Int max_elmts , hypre_ParCSRMatrix **P_ptr );
-HYPRE_Int hypre_BoomerAMGBuildModPartialExtPEInterpHost ( hypre_ParCSRMatrix *A , HYPRE_Int *CF_marker , hypre_ParCSRMatrix *S , HYPRE_BigInt *num_cpts_global , HYPRE_BigInt *num_old_cpts_global , HYPRE_Int num_functions , HYPRE_Int *dof_func , HYPRE_Int debug_flag , HYPRE_Real trunc_factor , HYPRE_Int max_elmts , hypre_ParCSRMatrix **P_ptr );
-HYPRE_Int hypre_BoomerAMGBuildModPartialExtPEInterpDevice ( hypre_ParCSRMatrix *A , HYPRE_Int *CF_marker , hypre_ParCSRMatrix *S , HYPRE_BigInt *num_cpts_global , HYPRE_BigInt *num_old_cpts_global , HYPRE_Int debug_flag , HYPRE_Real trunc_factor , HYPRE_Int max_elmts , hypre_ParCSRMatrix **P_ptr );
-HYPRE_Int hypre_BoomerAMGBuildModPartialExtPEInterp ( hypre_ParCSRMatrix *A , HYPRE_Int *CF_marker , hypre_ParCSRMatrix *S , HYPRE_BigInt *num_cpts_global , HYPRE_BigInt *num_old_cpts_global , HYPRE_Int num_functions , HYPRE_Int *dof_func , HYPRE_Int debug_flag , HYPRE_Real trunc_factor , HYPRE_Int max_elmts , hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_BoomerAMGBuildModPartialExtInterpHost ( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                                        hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_BigInt *num_old_cpts_global,
+                                                        HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int debug_flag, HYPRE_Real trunc_factor,
+                                                        HYPRE_Int max_elmts, hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_BoomerAMGBuildModPartialExtInterpDevice ( hypre_ParCSRMatrix *A,
+                                                          HYPRE_Int *CF_marker, hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global,
+                                                          HYPRE_BigInt *num_old_cpts_global, HYPRE_Int debug_flag, HYPRE_Real trunc_factor,
+                                                          HYPRE_Int max_elmts, hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_BoomerAMGBuildModPartialExtInterp ( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                                    hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_BigInt *num_old_cpts_global,
+                                                    HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int debug_flag, HYPRE_Real trunc_factor,
+                                                    HYPRE_Int max_elmts, hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_BoomerAMGBuildModPartialExtPEInterpHost ( hypre_ParCSRMatrix *A,
+                                                          HYPRE_Int *CF_marker, hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global,
+                                                          HYPRE_BigInt *num_old_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                                          HYPRE_Int debug_flag, HYPRE_Real trunc_factor, HYPRE_Int max_elmts, hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_BoomerAMGBuildModPartialExtPEInterpDevice ( hypre_ParCSRMatrix *A,
+                                                            HYPRE_Int *CF_marker, hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global,
+                                                            HYPRE_BigInt *num_old_cpts_global, HYPRE_Int debug_flag, HYPRE_Real trunc_factor,
+                                                            HYPRE_Int max_elmts, hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_BoomerAMGBuildModPartialExtPEInterp ( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                                      hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_BigInt *num_old_cpts_global,
+                                                      HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int debug_flag, HYPRE_Real trunc_factor,
+                                                      HYPRE_Int max_elmts, hypre_ParCSRMatrix **P_ptr );
+
+/* par_mod_multi_interp.c */
+HYPRE_Int hypre_BoomerAMGBuildModMultipass ( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                             hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Real trunc_factor,
+                                             HYPRE_Int P_max_elmts, HYPRE_Int interp_type, HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                             hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_BoomerAMGBuildModMultipassHost ( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                                 hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Real trunc_factor,
+                                                 HYPRE_Int P_max_elmts, HYPRE_Int interp_type, HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                                 hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_GenerateMultipassPi ( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *S,
+                                      HYPRE_BigInt *c_pts_starts, HYPRE_Int *pass_order, HYPRE_Int *pass_marker,
+                                      HYPRE_Int *pass_marker_offd, HYPRE_Int num_points, HYPRE_Int color, HYPRE_Real *row_sums,
+                                      hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_GenerateMultiPi ( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *S,
+                                  hypre_ParCSRMatrix *P, HYPRE_BigInt *c_pts_starts, HYPRE_Int *pass_order, HYPRE_Int *pass_marker,
+                                  HYPRE_Int *pass_marker_offd, HYPRE_Int num_points, HYPRE_Int color, HYPRE_Int num_functions,
+                                  HYPRE_Int *dof_func, HYPRE_Int *dof_func_offd, hypre_ParCSRMatrix **Pi_ptr );
+HYPRE_Int hypre_BoomerAMGBuildModMultipassDevice ( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                                   hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Real trunc_factor,
+                                                   HYPRE_Int P_max_elmts, HYPRE_Int interp_type, HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                                   hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_GenerateMultipassPiDevice ( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *S,
+                                            HYPRE_BigInt *c_pts_starts, HYPRE_Int *pass_order, HYPRE_Int *pass_marker,
+                                            HYPRE_Int *pass_marker_offd, HYPRE_Int num_points, HYPRE_Int color, HYPRE_Real *row_sums,
+                                            hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_GenerateMultiPiDevice ( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *S,
+                                        hypre_ParCSRMatrix *P, HYPRE_BigInt *c_pts_starts, HYPRE_Int *pass_order, HYPRE_Int *pass_marker,
+                                        HYPRE_Int *pass_marker_offd, HYPRE_Int num_points, HYPRE_Int color, HYPRE_Int num_functions,
+                                        HYPRE_Int *dof_func, HYPRE_Int *dof_func_offd, hypre_ParCSRMatrix **Pi_ptr );
 
 /* par_multi_interp.c */
-HYPRE_Int hypre_BoomerAMGBuildMultipass ( hypre_ParCSRMatrix *A , HYPRE_Int *CF_marker , hypre_ParCSRMatrix *S , HYPRE_BigInt *num_cpts_global , HYPRE_Int num_functions , HYPRE_Int *dof_func , HYPRE_Int debug_flag , HYPRE_Real trunc_factor , HYPRE_Int P_max_elmts , HYPRE_Int weight_option , hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_BoomerAMGBuildMultipass ( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                          hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                          HYPRE_Int debug_flag, HYPRE_Real trunc_factor, HYPRE_Int P_max_elmts, HYPRE_Int weight_option,
+                                          hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_BoomerAMGBuildMultipassHost ( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                              hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                              HYPRE_Int debug_flag, HYPRE_Real trunc_factor, HYPRE_Int P_max_elmts, HYPRE_Int weight_option,
+                                              hypre_ParCSRMatrix **P_ptr );
 
 /* par_nodal_systems.c */
-HYPRE_Int hypre_BoomerAMGCreateNodalA ( hypre_ParCSRMatrix *A , HYPRE_Int num_functions , HYPRE_Int *dof_func , HYPRE_Int option , HYPRE_Int diag_option , hypre_ParCSRMatrix **AN_ptr );
-HYPRE_Int hypre_BoomerAMGCreateScalarCFS ( hypre_ParCSRMatrix *SN , hypre_ParCSRMatrix *A , HYPRE_Int *CFN_marker , HYPRE_Int num_functions , HYPRE_Int nodal , HYPRE_Int keep_same_sign , hypre_IntArray **dof_func_ptr , hypre_IntArray **CF_marker_ptr , hypre_ParCSRMatrix **S_ptr );
-HYPRE_Int hypre_BoomerAMGCreateScalarCF ( HYPRE_Int *CFN_marker , HYPRE_Int num_functions , HYPRE_Int num_nodes , hypre_IntArray **dof_func_ptr , hypre_IntArray **CF_marker_ptr );
+HYPRE_Int hypre_BoomerAMGCreateNodalA ( hypre_ParCSRMatrix *A, HYPRE_Int num_functions,
+                                        HYPRE_Int *dof_func, HYPRE_Int option, HYPRE_Int diag_option, hypre_ParCSRMatrix **AN_ptr );
+HYPRE_Int hypre_BoomerAMGCreateScalarCFS ( hypre_ParCSRMatrix *SN, hypre_ParCSRMatrix *A,
+                                           HYPRE_Int *CFN_marker, HYPRE_Int num_functions, HYPRE_Int nodal, HYPRE_Int keep_same_sign,
+                                           hypre_IntArray **dof_func_ptr, hypre_IntArray **CF_marker_ptr, hypre_ParCSRMatrix **S_ptr );
+HYPRE_Int hypre_BoomerAMGCreateScalarCF ( HYPRE_Int *CFN_marker, HYPRE_Int num_functions,
+                                          HYPRE_Int num_nodes, hypre_IntArray **dof_func_ptr, hypre_IntArray **CF_marker_ptr );
 
 /* par_nongalerkin.c */
-HYPRE_Int hypre_GrabSubArray ( HYPRE_Int *indices , HYPRE_Int start , HYPRE_Int end , HYPRE_BigInt *array , HYPRE_BigInt *output );
-HYPRE_Int hypre_IntersectTwoArrays ( HYPRE_Int *x , HYPRE_Real *x_data , HYPRE_Int x_length , HYPRE_Int *y , HYPRE_Int y_length , HYPRE_Int *z , HYPRE_Real *output_x_data , HYPRE_Int *intersect_length );
-HYPRE_Int hypre_IntersectTwoBigArrays ( HYPRE_BigInt *x , HYPRE_Real *x_data , HYPRE_Int x_length , HYPRE_BigInt *y , HYPRE_Int y_length , HYPRE_BigInt *z , HYPRE_Real *output_x_data , HYPRE_Int *intersect_length );
-HYPRE_Int hypre_SortedCopyParCSRData ( hypre_ParCSRMatrix *A , hypre_ParCSRMatrix *B );
-HYPRE_Int hypre_BoomerAMG_MyCreateS ( hypre_ParCSRMatrix *A , HYPRE_Real strength_threshold , HYPRE_Real max_row_sum , HYPRE_Int num_functions , HYPRE_Int *dof_func , hypre_ParCSRMatrix **S_ptr );
-HYPRE_Int hypre_BoomerAMGCreateSFromCFMarker(hypre_ParCSRMatrix    *A, HYPRE_Real strength_threshold, HYPRE_Real max_row_sum, HYPRE_Int *CF_marker, HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int SMRK, hypre_ParCSRMatrix    **S_ptr);
-HYPRE_Int hypre_NonGalerkinIJBufferInit ( HYPRE_Int *ijbuf_cnt , HYPRE_Int *ijbuf_rowcounter , HYPRE_Int *ijbuf_numcols );
-HYPRE_Int hypre_NonGalerkinIJBigBufferInit ( HYPRE_Int *ijbuf_cnt , HYPRE_Int *ijbuf_rowcounter , HYPRE_BigInt *ijbuf_numcols );
-HYPRE_Int hypre_NonGalerkinIJBufferNewRow ( HYPRE_BigInt *ijbuf_rownums , HYPRE_Int *ijbuf_numcols , HYPRE_Int *ijbuf_rowcounter , HYPRE_BigInt new_row );
-HYPRE_Int hypre_NonGalerkinIJBufferCompressRow ( HYPRE_Int *ijbuf_cnt , HYPRE_Int ijbuf_rowcounter , HYPRE_Real *ijbuf_data , HYPRE_BigInt *ijbuf_cols , HYPRE_BigInt *ijbuf_rownums , HYPRE_Int *ijbuf_numcols );
-HYPRE_Int hypre_NonGalerkinIJBufferCompress ( HYPRE_Int ijbuf_size , HYPRE_Int *ijbuf_cnt , HYPRE_Int *ijbuf_rowcounter , HYPRE_Real **ijbuf_data , HYPRE_BigInt **ijbuf_cols , HYPRE_BigInt **ijbuf_rownums , HYPRE_Int **ijbuf_numcols );
-HYPRE_Int hypre_NonGalerkinIJBufferWrite ( HYPRE_IJMatrix B , HYPRE_Int *ijbuf_cnt , HYPRE_Int ijbuf_size , HYPRE_Int *ijbuf_rowcounter , HYPRE_Real **ijbuf_data , HYPRE_BigInt **ijbuf_cols , HYPRE_BigInt **ijbuf_rownums , HYPRE_Int **ijbuf_numcols , HYPRE_BigInt row_to_write , HYPRE_BigInt col_to_write , HYPRE_Real val_to_write );
-HYPRE_Int hypre_NonGalerkinIJBufferEmpty ( HYPRE_IJMatrix B , HYPRE_Int ijbuf_size , HYPRE_Int *ijbuf_cnt , HYPRE_Int ijbuf_rowcounter , HYPRE_Real **ijbuf_data , HYPRE_BigInt **ijbuf_cols , HYPRE_BigInt **ijbuf_rownums , HYPRE_Int **ijbuf_numcols );
-hypre_ParCSRMatrix * hypre_NonGalerkinSparsityPattern(hypre_ParCSRMatrix *R_IAP, hypre_ParCSRMatrix *RAP, HYPRE_Int * CF_marker, HYPRE_Real droptol, HYPRE_Int sym_collapse, HYPRE_Int collapse_beta );
-HYPRE_Int hypre_BoomerAMGBuildNonGalerkinCoarseOperator( hypre_ParCSRMatrix **RAP_ptr, hypre_ParCSRMatrix *AP, HYPRE_Real strong_threshold, HYPRE_Real max_row_sum, HYPRE_Int num_functions, HYPRE_Int * dof_func_value, HYPRE_Int * CF_marker, HYPRE_Real droptol, HYPRE_Int sym_collapse, HYPRE_Real lump_percent, HYPRE_Int collapse_beta );
+HYPRE_Int hypre_GrabSubArray ( HYPRE_Int *indices, HYPRE_Int start, HYPRE_Int end,
+                               HYPRE_BigInt *array, HYPRE_BigInt *output );
+HYPRE_Int hypre_IntersectTwoArrays ( HYPRE_Int *x, HYPRE_Real *x_data, HYPRE_Int x_length,
+                                     HYPRE_Int *y, HYPRE_Int y_length, HYPRE_Int *z, HYPRE_Real *output_x_data,
+                                     HYPRE_Int *intersect_length );
+HYPRE_Int hypre_IntersectTwoBigArrays ( HYPRE_BigInt *x, HYPRE_Real *x_data, HYPRE_Int x_length,
+                                        HYPRE_BigInt *y, HYPRE_Int y_length, HYPRE_BigInt *z, HYPRE_Real *output_x_data,
+                                        HYPRE_Int *intersect_length );
+HYPRE_Int hypre_SortedCopyParCSRData ( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *B );
+HYPRE_Int hypre_BoomerAMG_MyCreateS ( hypre_ParCSRMatrix *A, HYPRE_Real strength_threshold,
+                                      HYPRE_Real max_row_sum, HYPRE_Int num_functions, HYPRE_Int *dof_func, hypre_ParCSRMatrix **S_ptr );
+HYPRE_Int hypre_BoomerAMGCreateSFromCFMarker(hypre_ParCSRMatrix    *A,
+                                             HYPRE_Real strength_threshold, HYPRE_Real max_row_sum, HYPRE_Int *CF_marker,
+                                             HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int SMRK, hypre_ParCSRMatrix    **S_ptr);
+HYPRE_Int hypre_NonGalerkinIJBufferInit ( HYPRE_Int *ijbuf_cnt, HYPRE_Int *ijbuf_rowcounter,
+                                          HYPRE_Int *ijbuf_numcols );
+HYPRE_Int hypre_NonGalerkinIJBigBufferInit ( HYPRE_Int *ijbuf_cnt, HYPRE_Int *ijbuf_rowcounter,
+                                             HYPRE_BigInt *ijbuf_numcols );
+HYPRE_Int hypre_NonGalerkinIJBufferNewRow ( HYPRE_BigInt *ijbuf_rownums, HYPRE_Int *ijbuf_numcols,
+                                            HYPRE_Int *ijbuf_rowcounter, HYPRE_BigInt new_row );
+HYPRE_Int hypre_NonGalerkinIJBufferCompressRow ( HYPRE_Int *ijbuf_cnt, HYPRE_Int ijbuf_rowcounter,
+                                                 HYPRE_Real *ijbuf_data, HYPRE_BigInt *ijbuf_cols, HYPRE_BigInt *ijbuf_rownums,
+                                                 HYPRE_Int *ijbuf_numcols );
+HYPRE_Int hypre_NonGalerkinIJBufferCompress ( HYPRE_MemoryLocation memory_location,
+                                              HYPRE_Int ijbuf_size, HYPRE_Int *ijbuf_cnt,
+                                              HYPRE_Int *ijbuf_rowcounter, HYPRE_Real **ijbuf_data, HYPRE_BigInt **ijbuf_cols,
+                                              HYPRE_BigInt **ijbuf_rownums, HYPRE_Int **ijbuf_numcols );
+HYPRE_Int hypre_NonGalerkinIJBufferWrite ( HYPRE_IJMatrix B, HYPRE_Int *ijbuf_cnt,
+                                           HYPRE_Int ijbuf_size, HYPRE_Int *ijbuf_rowcounter, HYPRE_Real **ijbuf_data,
+                                           HYPRE_BigInt **ijbuf_cols, HYPRE_BigInt **ijbuf_rownums, HYPRE_Int **ijbuf_numcols,
+                                           HYPRE_BigInt row_to_write, HYPRE_BigInt col_to_write, HYPRE_Real val_to_write );
+HYPRE_Int hypre_NonGalerkinIJBufferEmpty ( HYPRE_IJMatrix B, HYPRE_Int ijbuf_size,
+                                           HYPRE_Int *ijbuf_cnt, HYPRE_Int ijbuf_rowcounter, HYPRE_Real **ijbuf_data,
+                                           HYPRE_BigInt **ijbuf_cols, HYPRE_BigInt **ijbuf_rownums, HYPRE_Int **ijbuf_numcols );
+hypre_ParCSRMatrix * hypre_NonGalerkinSparsityPattern(hypre_ParCSRMatrix *R_IAP,
+                                                      hypre_ParCSRMatrix *RAP, HYPRE_Int * CF_marker, HYPRE_Real droptol, HYPRE_Int sym_collapse,
+                                                      HYPRE_Int collapse_beta );
+HYPRE_Int hypre_BoomerAMGBuildNonGalerkinCoarseOperator( hypre_ParCSRMatrix **RAP_ptr,
+                                                         hypre_ParCSRMatrix *AP, HYPRE_Real strong_threshold, HYPRE_Real max_row_sum,
+                                                         HYPRE_Int num_functions, HYPRE_Int * dof_func_value, HYPRE_Int * CF_marker, HYPRE_Real droptol,
+                                                         HYPRE_Int sym_collapse, HYPRE_Real lump_percent, HYPRE_Int collapse_beta );
 
 /* par_rap.c */
-HYPRE_Int hypre_BoomerAMGBuildCoarseOperator ( hypre_ParCSRMatrix *RT , hypre_ParCSRMatrix *A , hypre_ParCSRMatrix *P , hypre_ParCSRMatrix **RAP_ptr );
-HYPRE_Int hypre_BoomerAMGBuildCoarseOperatorKT ( hypre_ParCSRMatrix *RT , hypre_ParCSRMatrix *A , hypre_ParCSRMatrix *P , HYPRE_Int keepTranspose, hypre_ParCSRMatrix **RAP_ptr );
+HYPRE_Int hypre_BoomerAMGBuildCoarseOperator ( hypre_ParCSRMatrix *RT, hypre_ParCSRMatrix *A,
+                                               hypre_ParCSRMatrix *P, hypre_ParCSRMatrix **RAP_ptr );
+HYPRE_Int hypre_BoomerAMGBuildCoarseOperatorKT ( hypre_ParCSRMatrix *RT, hypre_ParCSRMatrix *A,
+                                                 hypre_ParCSRMatrix *P, HYPRE_Int keepTranspose, hypre_ParCSRMatrix **RAP_ptr );
 
 /* par_rap_communication.c */
-HYPRE_Int hypre_GetCommPkgRTFromCommPkgA ( hypre_ParCSRMatrix *RT , hypre_ParCSRMatrix *A , HYPRE_Int *fine_to_coarse, HYPRE_Int *tmp_map_offd );
-HYPRE_Int hypre_GenerateSendMapAndCommPkg ( MPI_Comm comm , HYPRE_Int num_sends , HYPRE_Int num_recvs , HYPRE_Int *recv_procs , HYPRE_Int *send_procs , HYPRE_Int *recv_vec_starts , hypre_ParCSRMatrix *A );
+HYPRE_Int hypre_GetCommPkgRTFromCommPkgA ( hypre_ParCSRMatrix *RT, hypre_ParCSRMatrix *A,
+                                           HYPRE_Int *fine_to_coarse, HYPRE_Int *tmp_map_offd );
+HYPRE_Int hypre_GenerateSendMapAndCommPkg ( MPI_Comm comm, HYPRE_Int num_sends, HYPRE_Int num_recvs,
+                                            HYPRE_Int *recv_procs, HYPRE_Int *send_procs, HYPRE_Int *recv_vec_starts, hypre_ParCSRMatrix *A );
+
+/* par_ge_device.c */
+HYPRE_Int hypre_GaussElimSetupDevice ( hypre_ParAMGData *amg_data, HYPRE_Int level,
+                                       HYPRE_Int solver_type );
+HYPRE_Int hypre_GaussElimSolveDevice ( hypre_ParAMGData *amg_data, HYPRE_Int level,
+                                       HYPRE_Int solver_type );
+
+/* par_gauss_elim.c */
+HYPRE_Int hypre_GaussElimSetup ( hypre_ParAMGData *amg_data, HYPRE_Int level,
+                                 HYPRE_Int solver_type );
+HYPRE_Int hypre_GaussElimSolve ( hypre_ParAMGData *amg_data, HYPRE_Int level,
+                                 HYPRE_Int solver_type );
 
 /* par_relax.c */
-HYPRE_Int hypre_BoomerAMGRelax ( hypre_ParCSRMatrix *A , hypre_ParVector *f , HYPRE_Int *cf_marker , HYPRE_Int relax_type , HYPRE_Int relax_points , HYPRE_Real relax_weight , HYPRE_Real omega , HYPRE_Real *l1_norms , hypre_ParVector *u , hypre_ParVector *Vtemp , hypre_ParVector *Ztemp );
-HYPRE_Int hypre_GaussElimSetup ( hypre_ParAMGData *amg_data , HYPRE_Int level , HYPRE_Int relax_type );
-HYPRE_Int hypre_GaussElimSolve ( hypre_ParAMGData *amg_data , HYPRE_Int level , HYPRE_Int relax_type );
-HYPRE_Int hypre_BoomerAMGRelaxHybridGaussSeidel_core( hypre_ParCSRMatrix *A, hypre_ParVector *f, HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, HYPRE_Real omega, HYPRE_Real *l1_norms, hypre_ParVector *u, hypre_ParVector *Vtemp, hypre_ParVector *Ztemp, HYPRE_Int GS_order, HYPRE_Int Symm, HYPRE_Int Skip_diag, HYPRE_Int forced_seq, HYPRE_Int Topo_order );
-HYPRE_Int hypre_BoomerAMGRelax0WeightedJacobi( hypre_ParCSRMatrix *A, hypre_ParVector *f, HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, hypre_ParVector *u, hypre_ParVector *Vtemp );
-
-HYPRE_Int hypre_BoomerAMGRelax1GaussSeidel( hypre_ParCSRMatrix *A, hypre_ParVector *f, HYPRE_Int *cf_marker, HYPRE_Int relax_points, hypre_ParVector *u );
-
-HYPRE_Int hypre_BoomerAMGRelax2GaussSeidel( hypre_ParCSRMatrix *A, hypre_ParVector *f, HYPRE_Int *cf_marker, HYPRE_Int relax_points, hypre_ParVector *u );
-
-HYPRE_Int hypre_BoomerAMGRelax5ChaoticHybridGaussSeidel( hypre_ParCSRMatrix *A, hypre_ParVector *f, HYPRE_Int *cf_marker, HYPRE_Int relax_points, hypre_ParVector *u );
-
-HYPRE_Int hypre_BoomerAMGRelax3HybridGaussSeidel( hypre_ParCSRMatrix *A, hypre_ParVector *f, HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, HYPRE_Real omega, hypre_ParVector *u, hypre_ParVector *Vtemp, hypre_ParVector *Ztemp );
-
-HYPRE_Int hypre_BoomerAMGRelax4HybridGaussSeidel( hypre_ParCSRMatrix *A, hypre_ParVector *f, HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, HYPRE_Real omega, hypre_ParVector *u, hypre_ParVector *Vtemp, hypre_ParVector *Ztemp );
-
-HYPRE_Int hypre_BoomerAMGRelax6HybridSSOR( hypre_ParCSRMatrix *A, hypre_ParVector *f, HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, HYPRE_Real omega, hypre_ParVector *u, hypre_ParVector *Vtemp, hypre_ParVector *Ztemp );
-
-HYPRE_Int hypre_BoomerAMGRelax7Jacobi( hypre_ParCSRMatrix *A, hypre_ParVector *f, HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, HYPRE_Real *l1_norms, hypre_ParVector *u, hypre_ParVector *Vtemp );
-
-HYPRE_Int hypre_BoomerAMGRelax8HybridL1SSOR( hypre_ParCSRMatrix *A, hypre_ParVector *f, HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, HYPRE_Real omega, HYPRE_Real *l1_norms, hypre_ParVector *u, hypre_ParVector *Vtemp, hypre_ParVector *Ztemp );
-
-HYPRE_Int hypre_BoomerAMGRelax10TopoOrderedGaussSeidel( hypre_ParCSRMatrix *A, hypre_ParVector *f, HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, HYPRE_Real omega, hypre_ParVector *u, hypre_ParVector *Vtemp, hypre_ParVector *Ztemp );
-
-HYPRE_Int hypre_BoomerAMGRelax13HybridL1GaussSeidel( hypre_ParCSRMatrix *A, hypre_ParVector *f, HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, HYPRE_Real omega, HYPRE_Real *l1_norms, hypre_ParVector *u, hypre_ParVector *Vtemp, hypre_ParVector *Ztemp );
-
-HYPRE_Int hypre_BoomerAMGRelax14HybridL1GaussSeidel( hypre_ParCSRMatrix *A, hypre_ParVector *f, HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, HYPRE_Real omega, HYPRE_Real *l1_norms, hypre_ParVector *u, hypre_ParVector *Vtemp, hypre_ParVector *Ztemp );
-
-HYPRE_Int hypre_BoomerAMGRelax18WeightedL1Jacobi( hypre_ParCSRMatrix *A, hypre_ParVector *f, HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, HYPRE_Real *l1_norms, hypre_ParVector *u, hypre_ParVector *Vtemp );
-
-HYPRE_Int hypre_BoomerAMGRelax19GaussElim( hypre_ParCSRMatrix *A, hypre_ParVector *f, hypre_ParVector *u );
-
-HYPRE_Int hypre_BoomerAMGRelax98GaussElimPivot( hypre_ParCSRMatrix *A, hypre_ParVector *f, hypre_ParVector *u );
-
-HYPRE_Int hypre_BoomerAMGRelaxKaczmarz( hypre_ParCSRMatrix *A, hypre_ParVector *f, HYPRE_Real omega, HYPRE_Real *l1_norms, hypre_ParVector *u );
-
-HYPRE_Int hypre_BoomerAMGRelaxTwoStageGaussSeidelDevice ( hypre_ParCSRMatrix *A, hypre_ParVector *f, HYPRE_Real relax_weight, HYPRE_Real omega, hypre_ParVector *u, hypre_ParVector *r, hypre_ParVector *z, HYPRE_Int choice);
-
-HYPRE_Int hypre_BoomerAMGRelaxTwoStageGaussSeidel( hypre_ParCSRMatrix *A, hypre_ParVector *f, HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, HYPRE_Real omega, hypre_ParVector *u, hypre_ParVector *Vtemp, hypre_ParVector *Ztemp, HYPRE_Int num_inner_iters );
-
-HYPRE_Int hypre_BoomerAMGRelax11TwoStageGaussSeidel( hypre_ParCSRMatrix *A, hypre_ParVector *f, HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, HYPRE_Real omega, hypre_ParVector *u, hypre_ParVector *Vtemp, hypre_ParVector *Ztemp );
-
-HYPRE_Int hypre_BoomerAMGRelax12TwoStageGaussSeidel( hypre_ParCSRMatrix *A, hypre_ParVector *f, HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, HYPRE_Real omega, hypre_ParVector *u, hypre_ParVector *Vtemp, hypre_ParVector *Ztemp );
-
-/* par_realx_device.c */
-HYPRE_Int hypre_BoomerAMGRelaxHybridGaussSeidelDevice( hypre_ParCSRMatrix *A, hypre_ParVector *f, HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, HYPRE_Real omega, HYPRE_Real *l1_norms, hypre_ParVector *u, hypre_ParVector *Vtemp, hypre_ParVector *Ztemp, HYPRE_Int GS_order, HYPRE_Int Symm );
+HYPRE_Int hypre_BoomerAMGRelax ( hypre_ParCSRMatrix *A, hypre_ParVector *f, HYPRE_Int *cf_marker,
+                                 HYPRE_Int relax_type, HYPRE_Int relax_points, HYPRE_Real relax_weight, HYPRE_Real omega,
+                                 HYPRE_Real *l1_norms, hypre_ParVector *u, hypre_ParVector *Vtemp, hypre_ParVector *Ztemp );
+HYPRE_Int hypre_BoomerAMGRelaxHybridGaussSeidel_core( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                                      HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, HYPRE_Real omega,
+                                                      HYPRE_Real *l1_norms, hypre_ParVector *u, hypre_ParVector *Vtemp, hypre_ParVector *Ztemp,
+                                                      HYPRE_Int GS_order, HYPRE_Int Symm, HYPRE_Int Skip_diag, HYPRE_Int forced_seq,
+                                                      HYPRE_Int Topo_order );
+HYPRE_Int hypre_BoomerAMGRelax0WeightedJacobi( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                               HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, hypre_ParVector *u,
+                                               hypre_ParVector *Vtemp );
+
+HYPRE_Int hypre_BoomerAMGRelaxHybridSOR( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                         HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, HYPRE_Real omega,
+                                         HYPRE_Real *l1_norms, hypre_ParVector *u, hypre_ParVector *Vtemp, hypre_ParVector *Ztemp,
+                                         HYPRE_Int direction, HYPRE_Int symm, HYPRE_Int skip_diag, HYPRE_Int force_seq );
+
+HYPRE_Int hypre_BoomerAMGRelax1GaussSeidel( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                            HYPRE_Int *cf_marker, HYPRE_Int relax_points, hypre_ParVector *u );
+
+HYPRE_Int hypre_BoomerAMGRelax2GaussSeidel( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                            HYPRE_Int *cf_marker, HYPRE_Int relax_points, hypre_ParVector *u );
+
+HYPRE_Int hypre_BoomerAMGRelax5ChaoticHybridGaussSeidel( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                                         HYPRE_Int *cf_marker, HYPRE_Int relax_points, hypre_ParVector *u );
+
+HYPRE_Int hypre_BoomerAMGRelax3HybridGaussSeidel( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                                  HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, HYPRE_Real omega,
+                                                  hypre_ParVector *u, hypre_ParVector *Vtemp, hypre_ParVector *Ztemp );
+
+HYPRE_Int hypre_BoomerAMGRelax4HybridGaussSeidel( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                                  HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, HYPRE_Real omega,
+                                                  hypre_ParVector *u, hypre_ParVector *Vtemp, hypre_ParVector *Ztemp );
+
+HYPRE_Int hypre_BoomerAMGRelax6HybridSSOR( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                           HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, HYPRE_Real omega,
+                                           hypre_ParVector *u, hypre_ParVector *Vtemp, hypre_ParVector *Ztemp );
+
+HYPRE_Int hypre_BoomerAMGRelax7Jacobi( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                       HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, HYPRE_Real *l1_norms,
+                                       hypre_ParVector *u, hypre_ParVector *Vtemp );
+
+HYPRE_Int hypre_BoomerAMGRelax8HybridL1SSOR( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                             HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, HYPRE_Real omega,
+                                             HYPRE_Real *l1_norms, hypre_ParVector *u, hypre_ParVector *Vtemp, hypre_ParVector *Ztemp );
+
+HYPRE_Int hypre_BoomerAMGRelax10TopoOrderedGaussSeidel( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                                        HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, HYPRE_Real omega,
+                                                        hypre_ParVector *u, hypre_ParVector *Vtemp, hypre_ParVector *Ztemp );
+
+HYPRE_Int hypre_BoomerAMGRelax13HybridL1GaussSeidel( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                                     HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, HYPRE_Real omega,
+                                                     HYPRE_Real *l1_norms, hypre_ParVector *u, hypre_ParVector *Vtemp, hypre_ParVector *Ztemp );
+
+HYPRE_Int hypre_BoomerAMGRelax14HybridL1GaussSeidel( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                                     HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, HYPRE_Real omega,
+                                                     HYPRE_Real *l1_norms, hypre_ParVector *u, hypre_ParVector *Vtemp, hypre_ParVector *Ztemp );
+
+HYPRE_Int hypre_BoomerAMGRelax88HybridL1SSOR( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                              HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, HYPRE_Real omega,
+                                              HYPRE_Real *l1_norms, hypre_ParVector *u, hypre_ParVector *Vtemp, hypre_ParVector *Ztemp );
+
+HYPRE_Int hypre_BoomerAMGRelax89HybridL1SSOR( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                              HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, HYPRE_Real omega,
+                                              HYPRE_Real *l1_norms, hypre_ParVector *u, hypre_ParVector *Vtemp, hypre_ParVector *Ztemp );
+
+HYPRE_Int hypre_BoomerAMGRelax18WeightedL1Jacobi( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                                  HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, HYPRE_Real *l1_norms,
+                                                  hypre_ParVector *u, hypre_ParVector *Vtemp );
+
+HYPRE_Int hypre_BoomerAMGRelaxKaczmarz( hypre_ParCSRMatrix *A, hypre_ParVector *f, HYPRE_Real omega,
+                                        HYPRE_Real *l1_norms, hypre_ParVector *u );
+
+HYPRE_Int hypre_BoomerAMGRelaxTwoStageGaussSeidelDevice ( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                                          HYPRE_Real relax_weight, HYPRE_Real omega,
+                                                          HYPRE_Real *A_diag_diag, hypre_ParVector *u,
+                                                          hypre_ParVector *r, hypre_ParVector *z,
+                                                          HYPRE_Int choice );
+
+HYPRE_Int hypre_BoomerAMGRelax11TwoStageGaussSeidel( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                                     HYPRE_Int *cf_marker, HYPRE_Int relax_points,
+                                                     HYPRE_Real relax_weight, HYPRE_Real omega,
+                                                     HYPRE_Real *A_diag_diag, hypre_ParVector *u,
+                                                     hypre_ParVector *Vtemp, hypre_ParVector *Ztemp );
+
+HYPRE_Int hypre_BoomerAMGRelax12TwoStageGaussSeidel( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                                     HYPRE_Int *cf_marker, HYPRE_Int relax_points,
+                                                     HYPRE_Real relax_weight, HYPRE_Real omega,
+                                                     HYPRE_Real *A_diag_diag, hypre_ParVector *u,
+                                                     hypre_ParVector *Vtemp, hypre_ParVector *Ztemp );
+
+HYPRE_Int hypre_BoomerAMGRelaxComputeL1Norms( hypre_ParCSRMatrix *A, HYPRE_Int relax_type,
+                                              HYPRE_Int relax_order, HYPRE_Int coarsest_lvl,
+                                              hypre_IntArray *CF_marker,
+                                              HYPRE_Real **l1_norms_data_ptr );
+
+/* par_relax_device.c */
+HYPRE_Int hypre_BoomerAMGRelaxHybridGaussSeidelDevice( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                                       HYPRE_Int *cf_marker, HYPRE_Int relax_points,
+                                                       HYPRE_Real relax_weight, HYPRE_Real omega,
+                                                       HYPRE_Real *l1_norms, hypre_ParVector *u,
+                                                       hypre_ParVector *Vtemp, hypre_ParVector *Ztemp,
+                                                       HYPRE_Int GS_order, HYPRE_Int Symm );
 
 /* par_relax_interface.c */
-HYPRE_Int hypre_BoomerAMGRelaxIF ( hypre_ParCSRMatrix *A , hypre_ParVector *f , HYPRE_Int *cf_marker , HYPRE_Int relax_type , HYPRE_Int relax_order , HYPRE_Int cycle_type , HYPRE_Real relax_weight , HYPRE_Real omega , HYPRE_Real *l1_norms , hypre_ParVector *u , hypre_ParVector *Vtemp , hypre_ParVector *Ztemp );
+HYPRE_Int hypre_BoomerAMGRelaxIF ( hypre_ParCSRMatrix *A, hypre_ParVector *f, HYPRE_Int *cf_marker,
+                                   HYPRE_Int relax_type, HYPRE_Int relax_order, HYPRE_Int cycle_type, HYPRE_Real relax_weight,
+                                   HYPRE_Real omega, HYPRE_Real *l1_norms, hypre_ParVector *u, hypre_ParVector *Vtemp,
+                                   hypre_ParVector *Ztemp );
 
 /* par_relax_more.c */
-HYPRE_Int hypre_ParCSRMaxEigEstimate ( hypre_ParCSRMatrix *A , HYPRE_Int scale , HYPRE_Real *max_eig, HYPRE_Real *min_eig );
-HYPRE_Int hypre_ParCSRMaxEigEstimateHost ( hypre_ParCSRMatrix *A , HYPRE_Int scale , HYPRE_Real *max_eig, HYPRE_Real *min_eig );
-HYPRE_Int hypre_ParCSRMaxEigEstimateCG ( hypre_ParCSRMatrix *A , HYPRE_Int scale , HYPRE_Int max_iter , HYPRE_Real *max_eig , HYPRE_Real *min_eig );
-HYPRE_Int hypre_ParCSRMaxEigEstimateCGHost ( hypre_ParCSRMatrix *A , HYPRE_Int scale , HYPRE_Int max_iter , HYPRE_Real *max_eig , HYPRE_Real *min_eig );
-HYPRE_Int hypre_ParCSRRelax_Cheby ( hypre_ParCSRMatrix *A , hypre_ParVector *f , HYPRE_Real max_eig , HYPRE_Real min_eig , HYPRE_Real fraction , HYPRE_Int order , HYPRE_Int scale , HYPRE_Int variant , hypre_ParVector *u , hypre_ParVector *v , hypre_ParVector *r );
-HYPRE_Int hypre_BoomerAMGRelax_FCFJacobi ( hypre_ParCSRMatrix *A , hypre_ParVector *f , HYPRE_Int *cf_marker , HYPRE_Real relax_weight , hypre_ParVector *u , hypre_ParVector *Vtemp );
-HYPRE_Int hypre_ParCSRRelax_CG ( HYPRE_Solver solver , hypre_ParCSRMatrix *A , hypre_ParVector *f , hypre_ParVector *u , HYPRE_Int num_its );
-HYPRE_Int hypre_LINPACKcgtql1 ( HYPRE_Int *n , HYPRE_Real *d , HYPRE_Real *e , HYPRE_Int *ierr );
-HYPRE_Real hypre_LINPACKcgpthy ( HYPRE_Real *a , HYPRE_Real *b );
-HYPRE_Int hypre_ParCSRRelax_L1_Jacobi ( hypre_ParCSRMatrix *A , hypre_ParVector *f , HYPRE_Int *cf_marker , HYPRE_Int relax_points , HYPRE_Real relax_weight , HYPRE_Real *l1_norms , hypre_ParVector *u , hypre_ParVector *Vtemp );
-HYPRE_Int hypre_LINPACKcgtql1(HYPRE_Int*,HYPRE_Real *,HYPRE_Real *,HYPRE_Int *);
+HYPRE_Int hypre_ParCSRMaxEigEstimate ( hypre_ParCSRMatrix *A, HYPRE_Int scale, HYPRE_Real *max_eig,
+                                       HYPRE_Real *min_eig );
+HYPRE_Int hypre_ParCSRMaxEigEstimateHost ( hypre_ParCSRMatrix *A, HYPRE_Int scale,
+                                           HYPRE_Real *max_eig, HYPRE_Real *min_eig );
+HYPRE_Int hypre_ParCSRMaxEigEstimateCG ( hypre_ParCSRMatrix *A, HYPRE_Int scale, HYPRE_Int max_iter,
+                                         HYPRE_Real *max_eig, HYPRE_Real *min_eig );
+HYPRE_Int hypre_ParCSRMaxEigEstimateCGHost ( hypre_ParCSRMatrix *A, HYPRE_Int scale,
+                                             HYPRE_Int max_iter, HYPRE_Real *max_eig, HYPRE_Real *min_eig );
+HYPRE_Int hypre_ParCSRRelax_Cheby ( hypre_ParCSRMatrix *A, hypre_ParVector *f, HYPRE_Real max_eig,
+                                    HYPRE_Real min_eig, HYPRE_Real fraction, HYPRE_Int order, HYPRE_Int scale, HYPRE_Int variant,
+                                    hypre_ParVector *u, hypre_ParVector *v, hypre_ParVector *r );
+HYPRE_Int hypre_BoomerAMGRelax_FCFJacobi ( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                           HYPRE_Int *cf_marker, HYPRE_Real relax_weight,
+                                           hypre_ParVector *u, hypre_ParVector *Vtemp );
+HYPRE_Int hypre_ParCSRRelax_CG ( HYPRE_Solver solver, hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                 hypre_ParVector *u, HYPRE_Int num_its );
+HYPRE_Int hypre_LINPACKcgtql1 ( HYPRE_Int *n, HYPRE_Real *d, HYPRE_Real *e, HYPRE_Int *ierr );
+HYPRE_Real hypre_LINPACKcgpthy ( HYPRE_Real *a, HYPRE_Real *b );
+HYPRE_Int hypre_ParCSRRelax_L1_Jacobi ( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                        HYPRE_Int *cf_marker, HYPRE_Int relax_points, HYPRE_Real relax_weight, HYPRE_Real *l1_norms,
+                                        hypre_ParVector *u, hypre_ParVector *Vtemp );
+HYPRE_Int hypre_LINPACKcgtql1(HYPRE_Int*, HYPRE_Real *, HYPRE_Real *, HYPRE_Int *);
 HYPRE_Real hypre_LINPACKcgpthy(HYPRE_Real*, HYPRE_Real*);
 
 /* par_relax_more_device.c */
-HYPRE_Int hypre_ParCSRMaxEigEstimateDevice ( hypre_ParCSRMatrix *A , HYPRE_Int scale , HYPRE_Real *max_eig , HYPRE_Real *min_eig );
-HYPRE_Int hypre_ParCSRMaxEigEstimateCGDevice ( hypre_ParCSRMatrix *A , HYPRE_Int scale , HYPRE_Int max_iter , HYPRE_Real *max_eig , HYPRE_Real *min_eig );
+HYPRE_Int hypre_ParCSRMaxEigEstimateDevice ( hypre_ParCSRMatrix *A, HYPRE_Int scale,
+                                             HYPRE_Real *max_eig, HYPRE_Real *min_eig );
+HYPRE_Int hypre_ParCSRMaxEigEstimateCGDevice ( hypre_ParCSRMatrix *A, HYPRE_Int scale,
+                                               HYPRE_Int max_iter, HYPRE_Real *max_eig, HYPRE_Real *min_eig );
 
 /* par_rotate_7pt.c */
-HYPRE_ParCSRMatrix GenerateRotate7pt ( MPI_Comm comm , HYPRE_BigInt nx , HYPRE_BigInt ny , HYPRE_Int P , HYPRE_Int Q , HYPRE_Int p , HYPRE_Int q , HYPRE_Real alpha , HYPRE_Real eps );
+HYPRE_ParCSRMatrix GenerateRotate7pt ( MPI_Comm comm, HYPRE_BigInt nx, HYPRE_BigInt ny, HYPRE_Int P,
+                                       HYPRE_Int Q, HYPRE_Int p, HYPRE_Int q, HYPRE_Real alpha, HYPRE_Real eps );
 
 /* par_scaled_matnorm.c */
-HYPRE_Int hypre_ParCSRMatrixScaledNorm ( hypre_ParCSRMatrix *A , HYPRE_Real *scnorm );
+HYPRE_Int hypre_ParCSRMatrixScaledNorm ( hypre_ParCSRMatrix *A, HYPRE_Real *scnorm );
 
 /* par_schwarz.c */
 void *hypre_SchwarzCreate ( void );
 HYPRE_Int hypre_SchwarzDestroy ( void *data );
-HYPRE_Int hypre_SchwarzSetup ( void *schwarz_vdata , hypre_ParCSRMatrix *A , hypre_ParVector *f , hypre_ParVector *u );
-HYPRE_Int hypre_SchwarzSolve ( void *schwarz_vdata , hypre_ParCSRMatrix *A , hypre_ParVector *f , hypre_ParVector *u );
-HYPRE_Int hypre_SchwarzCFSolve ( void *schwarz_vdata , hypre_ParCSRMatrix *A , hypre_ParVector *f , hypre_ParVector *u , HYPRE_Int *CF_marker , HYPRE_Int rlx_pt );
-HYPRE_Int hypre_SchwarzSetVariant ( void *data , HYPRE_Int variant );
-HYPRE_Int hypre_SchwarzSetDomainType ( void *data , HYPRE_Int domain_type );
-HYPRE_Int hypre_SchwarzSetOverlap ( void *data , HYPRE_Int overlap );
-HYPRE_Int hypre_SchwarzSetNumFunctions ( void *data , HYPRE_Int num_functions );
-HYPRE_Int hypre_SchwarzSetNonSymm ( void *data , HYPRE_Int value );
-HYPRE_Int hypre_SchwarzSetRelaxWeight ( void *data , HYPRE_Real relax_weight );
-HYPRE_Int hypre_SchwarzSetDomainStructure ( void *data , hypre_CSRMatrix *domain_structure );
-HYPRE_Int hypre_SchwarzSetScale ( void *data , HYPRE_Real *scale );
-HYPRE_Int hypre_SchwarzReScale ( void *data , HYPRE_Int size , HYPRE_Real value );
-HYPRE_Int hypre_SchwarzSetDofFunc ( void *data , HYPRE_Int *dof_func );
+HYPRE_Int hypre_SchwarzSetup ( void *schwarz_vdata, hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                               hypre_ParVector *u );
+HYPRE_Int hypre_SchwarzSolve ( void *schwarz_vdata, hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                               hypre_ParVector *u );
+HYPRE_Int hypre_SchwarzCFSolve ( void *schwarz_vdata, hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                 hypre_ParVector *u, HYPRE_Int *CF_marker, HYPRE_Int rlx_pt );
+HYPRE_Int hypre_SchwarzSetVariant ( void *data, HYPRE_Int variant );
+HYPRE_Int hypre_SchwarzSetDomainType ( void *data, HYPRE_Int domain_type );
+HYPRE_Int hypre_SchwarzSetOverlap ( void *data, HYPRE_Int overlap );
+HYPRE_Int hypre_SchwarzSetNumFunctions ( void *data, HYPRE_Int num_functions );
+HYPRE_Int hypre_SchwarzSetNonSymm ( void *data, HYPRE_Int value );
+HYPRE_Int hypre_SchwarzSetRelaxWeight ( void *data, HYPRE_Real relax_weight );
+HYPRE_Int hypre_SchwarzSetDomainStructure ( void *data, hypre_CSRMatrix *domain_structure );
+HYPRE_Int hypre_SchwarzSetScale ( void *data, HYPRE_Real *scale );
+HYPRE_Int hypre_SchwarzReScale ( void *data, HYPRE_Int size, HYPRE_Real value );
+HYPRE_Int hypre_SchwarzSetDofFunc ( void *data, HYPRE_Int *dof_func );
 
 /* par_stats.c */
-HYPRE_Int hypre_BoomerAMGSetupStats ( void *amg_vdata , hypre_ParCSRMatrix *A );
+HYPRE_Int hypre_BoomerAMGSetupStats ( void *amg_vdata, hypre_ParCSRMatrix *A );
 HYPRE_Int hypre_BoomerAMGWriteSolverParams ( void *data );
+const char* hypre_BoomerAMGGetProlongationName( hypre_ParAMGData *amg_data );
+const char* hypre_BoomerAMGGetAggProlongationName( hypre_ParAMGData *amg_data );
+const char* hypre_BoomerAMGGetCoarseningName( hypre_ParAMGData *amg_data );
+const char* hypre_BoomerAMGGetCycleName( hypre_ParAMGData *amg_data );
+HYPRE_Int hypre_BoomerAMGPrintGeneralInfo( hypre_ParAMGData *amg_data, HYPRE_Int shift );
 
 /* par_strength.c */
-HYPRE_Int hypre_BoomerAMGCreateS ( hypre_ParCSRMatrix *A , HYPRE_Real strength_threshold , HYPRE_Real max_row_sum , HYPRE_Int num_functions , HYPRE_Int *dof_func , hypre_ParCSRMatrix **S_ptr );
-HYPRE_Int hypre_BoomerAMGCreateSabs ( hypre_ParCSRMatrix *A , HYPRE_Real strength_threshold , HYPRE_Real max_row_sum , HYPRE_Int num_functions , HYPRE_Int *dof_func , hypre_ParCSRMatrix **S_ptr );
-HYPRE_Int hypre_BoomerAMGCreateSCommPkg ( hypre_ParCSRMatrix *A , hypre_ParCSRMatrix *S , HYPRE_Int **col_offd_S_to_A_ptr );
-HYPRE_Int hypre_BoomerAMGCreate2ndS ( hypre_ParCSRMatrix *S , HYPRE_Int *CF_marker , HYPRE_Int num_paths , HYPRE_BigInt *coarse_row_starts , hypre_ParCSRMatrix **C_ptr );
-HYPRE_Int hypre_BoomerAMGCorrectCFMarker ( hypre_IntArray *CF_marker , hypre_IntArray *new_CF_marker );
-HYPRE_Int hypre_BoomerAMGCorrectCFMarkerHost ( hypre_IntArray *CF_marker , hypre_IntArray *new_CF_marker );
-HYPRE_Int hypre_BoomerAMGCorrectCFMarkerDevice ( hypre_IntArray *CF_marker , hypre_IntArray *new_CF_marker );
-HYPRE_Int hypre_BoomerAMGCorrectCFMarker2 ( hypre_IntArray *CF_marker , hypre_IntArray *new_CF_marker );
-HYPRE_Int hypre_BoomerAMGCorrectCFMarker2Host ( hypre_IntArray *CF_marker , hypre_IntArray *new_CF_marker );
-HYPRE_Int hypre_BoomerAMGCorrectCFMarker2Device ( hypre_IntArray *CF_marker , hypre_IntArray *new_CF_marker );
-HYPRE_Int hypre_BoomerAMGCreateSHost(hypre_ParCSRMatrix *A, HYPRE_Real strength_threshold, HYPRE_Real max_row_sum, HYPRE_Int num_functions, HYPRE_Int *dof_func, hypre_ParCSRMatrix **S_ptr);
-HYPRE_Int hypre_BoomerAMGCreateSDevice(hypre_ParCSRMatrix *A, HYPRE_Int abs_soc, HYPRE_Real strength_threshold, HYPRE_Real max_row_sum, HYPRE_Int num_functions, HYPRE_Int *dof_func, hypre_ParCSRMatrix **S_ptr);
-HYPRE_Int hypre_BoomerAMGCreateSabsHost ( hypre_ParCSRMatrix *A , HYPRE_Real strength_threshold , HYPRE_Real max_row_sum , HYPRE_Int num_functions , HYPRE_Int *dof_func , hypre_ParCSRMatrix **S_ptr );
-HYPRE_Int hypre_BoomerAMGCreate2ndSDevice( hypre_ParCSRMatrix *S, HYPRE_Int *CF_marker, HYPRE_Int num_paths, HYPRE_BigInt *coarse_row_starts, hypre_ParCSRMatrix **C_ptr);
+HYPRE_Int hypre_BoomerAMGCreateS ( hypre_ParCSRMatrix *A, HYPRE_Real strength_threshold,
+                                   HYPRE_Real max_row_sum, HYPRE_Int num_functions, HYPRE_Int *dof_func, hypre_ParCSRMatrix **S_ptr );
+HYPRE_Int hypre_BoomerAMGCreateSabs ( hypre_ParCSRMatrix *A, HYPRE_Real strength_threshold,
+                                      HYPRE_Real max_row_sum, HYPRE_Int num_functions, HYPRE_Int *dof_func, hypre_ParCSRMatrix **S_ptr );
+HYPRE_Int hypre_BoomerAMGCreateSCommPkg ( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *S,
+                                          HYPRE_Int **col_offd_S_to_A_ptr );
+HYPRE_Int hypre_BoomerAMGCreate2ndS ( hypre_ParCSRMatrix *S, HYPRE_Int *CF_marker,
+                                      HYPRE_Int num_paths, HYPRE_BigInt *coarse_row_starts, hypre_ParCSRMatrix **C_ptr );
+HYPRE_Int hypre_BoomerAMGCorrectCFMarker ( hypre_IntArray *CF_marker,
+                                           hypre_IntArray *new_CF_marker );
+HYPRE_Int hypre_BoomerAMGCorrectCFMarkerHost ( hypre_IntArray *CF_marker,
+                                               hypre_IntArray *new_CF_marker );
+HYPRE_Int hypre_BoomerAMGCorrectCFMarkerDevice ( hypre_IntArray *CF_marker,
+                                                 hypre_IntArray *new_CF_marker );
+HYPRE_Int hypre_BoomerAMGCorrectCFMarker2 ( hypre_IntArray *CF_marker,
+                                            hypre_IntArray *new_CF_marker );
+HYPRE_Int hypre_BoomerAMGCorrectCFMarker2Host ( hypre_IntArray *CF_marker,
+                                                hypre_IntArray *new_CF_marker );
+HYPRE_Int hypre_BoomerAMGCorrectCFMarker2Device ( hypre_IntArray *CF_marker,
+                                                  hypre_IntArray *new_CF_marker );
+HYPRE_Int hypre_BoomerAMGCreateSHost(hypre_ParCSRMatrix *A, HYPRE_Real strength_threshold,
+                                     HYPRE_Real max_row_sum, HYPRE_Int num_functions, HYPRE_Int *dof_func, hypre_ParCSRMatrix **S_ptr);
+HYPRE_Int hypre_BoomerAMGCreateSDevice(hypre_ParCSRMatrix *A, HYPRE_Int abs_soc,
+                                       HYPRE_Real strength_threshold, HYPRE_Real max_row_sum, HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                       hypre_ParCSRMatrix **S_ptr);
+HYPRE_Int hypre_BoomerAMGCreateSabsHost ( hypre_ParCSRMatrix *A, HYPRE_Real strength_threshold,
+                                          HYPRE_Real max_row_sum, HYPRE_Int num_functions, HYPRE_Int *dof_func, hypre_ParCSRMatrix **S_ptr );
+HYPRE_Int hypre_BoomerAMGCreate2ndSDevice( hypre_ParCSRMatrix *S, HYPRE_Int *CF_marker,
+                                           HYPRE_Int num_paths, HYPRE_BigInt *coarse_row_starts, hypre_ParCSRMatrix **C_ptr);
 HYPRE_Int hypre_BoomerAMGMakeSocFromSDevice( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *S);
 
 
 /* par_sv_interp.c */
-HYPRE_Int hypre_BoomerAMGSmoothInterpVectors ( hypre_ParCSRMatrix *A , HYPRE_Int num_smooth_vecs , hypre_ParVector **smooth_vecs , HYPRE_Int smooth_steps );
-HYPRE_Int hypre_BoomerAMGCoarsenInterpVectors ( hypre_ParCSRMatrix *P , HYPRE_Int num_smooth_vecs , hypre_ParVector **smooth_vecs , HYPRE_Int *CF_marker , hypre_ParVector ***new_smooth_vecs , HYPRE_Int expand_level , HYPRE_Int num_functions );
-HYPRE_Int hypre_BoomerAMG_GMExpandInterp ( hypre_ParCSRMatrix *A , hypre_ParCSRMatrix **P , HYPRE_Int num_smooth_vecs , hypre_ParVector **smooth_vecs , HYPRE_Int *nf , HYPRE_Int *dof_func , hypre_IntArray **coarse_dof_func , HYPRE_Int variant , HYPRE_Int level , HYPRE_Real abs_trunc , HYPRE_Real *weights , HYPRE_Int q_max , HYPRE_Int *CF_marker , HYPRE_Int interp_vec_first_level );
-HYPRE_Int hypre_BoomerAMGRefineInterp ( hypre_ParCSRMatrix *A , hypre_ParCSRMatrix *P , HYPRE_BigInt *num_cpts_global , HYPRE_Int *nf , HYPRE_Int *dof_func , HYPRE_Int *CF_marker , HYPRE_Int level );
+HYPRE_Int hypre_BoomerAMGSmoothInterpVectors ( hypre_ParCSRMatrix *A, HYPRE_Int num_smooth_vecs,
+                                               hypre_ParVector **smooth_vecs, HYPRE_Int smooth_steps );
+HYPRE_Int hypre_BoomerAMGCoarsenInterpVectors ( hypre_ParCSRMatrix *P, HYPRE_Int num_smooth_vecs,
+                                                hypre_ParVector **smooth_vecs, HYPRE_Int *CF_marker, hypre_ParVector ***new_smooth_vecs,
+                                                HYPRE_Int expand_level, HYPRE_Int num_functions );
+HYPRE_Int hypre_BoomerAMG_GMExpandInterp ( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix **P,
+                                           HYPRE_Int num_smooth_vecs, hypre_ParVector **smooth_vecs, HYPRE_Int *nf, HYPRE_Int *dof_func,
+                                           hypre_IntArray **coarse_dof_func, HYPRE_Int variant, HYPRE_Int level, HYPRE_Real abs_trunc,
+                                           HYPRE_Real *weights, HYPRE_Int q_max, HYPRE_Int *CF_marker, HYPRE_Int interp_vec_first_level );
+HYPRE_Int hypre_BoomerAMGRefineInterp ( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *P,
+                                        HYPRE_BigInt *num_cpts_global, HYPRE_Int *nf, HYPRE_Int *dof_func, HYPRE_Int *CF_marker,
+                                        HYPRE_Int level );
 
 /* par_sv_interp_ln.c */
-HYPRE_Int hypre_BoomerAMG_LNExpandInterp ( hypre_ParCSRMatrix *A , hypre_ParCSRMatrix **P , HYPRE_BigInt *num_cpts_global , HYPRE_Int *nf , HYPRE_Int *dof_func , hypre_IntArray **coarse_dof_func , HYPRE_Int *CF_marker , HYPRE_Int level , HYPRE_Real *weights , HYPRE_Int num_smooth_vecs , hypre_ParVector **smooth_vecs , HYPRE_Real abs_trunc , HYPRE_Int q_max , HYPRE_Int interp_vec_first_level );
+HYPRE_Int hypre_BoomerAMG_LNExpandInterp ( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix **P,
+                                           HYPRE_BigInt *num_cpts_global, HYPRE_Int *nf, HYPRE_Int *dof_func, hypre_IntArray **coarse_dof_func,
+                                           HYPRE_Int *CF_marker, HYPRE_Int level, HYPRE_Real *weights, HYPRE_Int num_smooth_vecs,
+                                           hypre_ParVector **smooth_vecs, HYPRE_Real abs_trunc, HYPRE_Int q_max,
+                                           HYPRE_Int interp_vec_first_level );
 
 /* par_sv_interp_lsfit.c */
-HYPRE_Int hypre_BoomerAMGFitInterpVectors ( hypre_ParCSRMatrix *A , hypre_ParCSRMatrix **P , HYPRE_Int num_smooth_vecs , hypre_ParVector **smooth_vecs , hypre_ParVector **coarse_smooth_vecs , HYPRE_Real delta , HYPRE_Int num_functions , HYPRE_Int *dof_func , HYPRE_Int *CF_marker , HYPRE_Int max_elmts , HYPRE_Real trunc_factor , HYPRE_Int variant , HYPRE_Int level );
+HYPRE_Int hypre_BoomerAMGFitInterpVectors ( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix **P,
+                                            HYPRE_Int num_smooth_vecs, hypre_ParVector **smooth_vecs, hypre_ParVector **coarse_smooth_vecs,
+                                            HYPRE_Real delta, HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int *CF_marker,
+                                            HYPRE_Int max_elmts, HYPRE_Real trunc_factor, HYPRE_Int variant, HYPRE_Int level );
 
 /* partial.c */
-HYPRE_Int hypre_BoomerAMGBuildPartialExtPIInterp ( hypre_ParCSRMatrix *A , HYPRE_Int *CF_marker , hypre_ParCSRMatrix *S , HYPRE_BigInt *num_cpts_global , HYPRE_BigInt *num_old_cpts_global , HYPRE_Int num_functions , HYPRE_Int *dof_func , HYPRE_Int debug_flag , HYPRE_Real trunc_factor , HYPRE_Int max_elmts , hypre_ParCSRMatrix **P_ptr );
-HYPRE_Int hypre_BoomerAMGBuildPartialStdInterp ( hypre_ParCSRMatrix *A , HYPRE_Int *CF_marker , hypre_ParCSRMatrix *S , HYPRE_BigInt *num_cpts_global , HYPRE_BigInt *num_old_cpts_global , HYPRE_Int num_functions , HYPRE_Int *dof_func , HYPRE_Int debug_flag , HYPRE_Real trunc_factor , HYPRE_Int max_elmts , HYPRE_Int sep_weight , hypre_ParCSRMatrix **P_ptr );
-HYPRE_Int hypre_BoomerAMGBuildPartialExtInterp ( hypre_ParCSRMatrix *A , HYPRE_Int *CF_marker , hypre_ParCSRMatrix *S , HYPRE_BigInt *num_cpts_global , HYPRE_BigInt *num_old_cpts_global , HYPRE_Int num_functions , HYPRE_Int *dof_func , HYPRE_Int debug_flag , HYPRE_Real trunc_factor , HYPRE_Int max_elmts , hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_BoomerAMGBuildPartialExtPIInterp ( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                                   hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_BigInt *num_old_cpts_global,
+                                                   HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int debug_flag, HYPRE_Real trunc_factor,
+                                                   HYPRE_Int max_elmts, hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_BoomerAMGBuildPartialStdInterp ( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                                 hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_BigInt *num_old_cpts_global,
+                                                 HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int debug_flag, HYPRE_Real trunc_factor,
+                                                 HYPRE_Int max_elmts, HYPRE_Int sep_weight, hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_BoomerAMGBuildPartialExtInterp ( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                                 hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_BigInt *num_old_cpts_global,
+                                                 HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int debug_flag, HYPRE_Real trunc_factor,
+                                                 HYPRE_Int max_elmts, hypre_ParCSRMatrix **P_ptr );
 
 /* par_vardifconv.c */
-HYPRE_ParCSRMatrix GenerateVarDifConv ( MPI_Comm comm , HYPRE_BigInt nx , HYPRE_BigInt ny , HYPRE_BigInt nz , HYPRE_Int P , HYPRE_Int Q , HYPRE_Int R , HYPRE_Int p , HYPRE_Int q , HYPRE_Int r , HYPRE_Real eps , HYPRE_ParVector *rhs_ptr );
-HYPRE_Real afun ( HYPRE_Real xx , HYPRE_Real yy , HYPRE_Real zz );
-HYPRE_Real bfun ( HYPRE_Real xx , HYPRE_Real yy , HYPRE_Real zz );
-HYPRE_Real cfun ( HYPRE_Real xx , HYPRE_Real yy , HYPRE_Real zz );
-HYPRE_Real dfun ( HYPRE_Real xx , HYPRE_Real yy , HYPRE_Real zz );
-HYPRE_Real efun ( HYPRE_Real xx , HYPRE_Real yy , HYPRE_Real zz );
-HYPRE_Real ffun ( HYPRE_Real xx , HYPRE_Real yy , HYPRE_Real zz );
-HYPRE_Real gfun ( HYPRE_Real xx , HYPRE_Real yy , HYPRE_Real zz );
-HYPRE_Real rfun ( HYPRE_Real xx , HYPRE_Real yy , HYPRE_Real zz );
-HYPRE_Real bndfun ( HYPRE_Real xx , HYPRE_Real yy , HYPRE_Real zz );
+HYPRE_ParCSRMatrix GenerateVarDifConv ( MPI_Comm comm, HYPRE_BigInt nx, HYPRE_BigInt ny,
+                                        HYPRE_BigInt nz, HYPRE_Int P, HYPRE_Int Q, HYPRE_Int R, HYPRE_Int p, HYPRE_Int q, HYPRE_Int r,
+                                        HYPRE_Real eps, HYPRE_ParVector *rhs_ptr );
+HYPRE_Real afun ( HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz );
+HYPRE_Real bfun ( HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz );
+HYPRE_Real cfun ( HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz );
+HYPRE_Real dfun ( HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz );
+HYPRE_Real efun ( HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz );
+HYPRE_Real ffun ( HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz );
+HYPRE_Real gfun ( HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz );
+HYPRE_Real rfun ( HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz );
+HYPRE_Real bndfun ( HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz );
 
 /* par_vardifconv_rs.c */
-HYPRE_ParCSRMatrix GenerateRSVarDifConv ( MPI_Comm comm , HYPRE_BigInt nx , HYPRE_BigInt ny , HYPRE_BigInt nz , HYPRE_Int P , HYPRE_Int Q , HYPRE_Int R , HYPRE_Int p , HYPRE_Int q , HYPRE_Int r , HYPRE_Real eps , HYPRE_ParVector *rhs_ptr, HYPRE_Int type );
-HYPRE_Real afun_rs ( HYPRE_Real xx , HYPRE_Real yy , HYPRE_Real zz );
-HYPRE_Real bfun_rs ( HYPRE_Real xx , HYPRE_Real yy , HYPRE_Real zz );
-HYPRE_Real cfun_rs ( HYPRE_Real xx , HYPRE_Real yy , HYPRE_Real zz );
-HYPRE_Real dfun_rs ( HYPRE_Real xx , HYPRE_Real yy , HYPRE_Real zz );
-HYPRE_Real efun_rs ( HYPRE_Real xx , HYPRE_Real yy , HYPRE_Real zz );
-HYPRE_Real ffun_rs ( HYPRE_Real xx , HYPRE_Real yy , HYPRE_Real zz );
-HYPRE_Real gfun_rs ( HYPRE_Real xx , HYPRE_Real yy , HYPRE_Real zz );
-HYPRE_Real rfun_rs ( HYPRE_Real xx , HYPRE_Real yy , HYPRE_Real zz );
-HYPRE_Real bndfun_rs ( HYPRE_Real xx , HYPRE_Real yy , HYPRE_Real zz );
+HYPRE_ParCSRMatrix GenerateRSVarDifConv ( MPI_Comm comm, HYPRE_BigInt nx, HYPRE_BigInt ny,
+                                          HYPRE_BigInt nz, HYPRE_Int P, HYPRE_Int Q, HYPRE_Int R, HYPRE_Int p, HYPRE_Int q, HYPRE_Int r,
+                                          HYPRE_Real eps, HYPRE_ParVector *rhs_ptr, HYPRE_Int type );
+HYPRE_Real afun_rs ( HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz );
+HYPRE_Real bfun_rs ( HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz );
+HYPRE_Real cfun_rs ( HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz );
+HYPRE_Real dfun_rs ( HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz );
+HYPRE_Real efun_rs ( HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz );
+HYPRE_Real ffun_rs ( HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz );
+HYPRE_Real gfun_rs ( HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz );
+HYPRE_Real rfun_rs ( HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz );
+HYPRE_Real bndfun_rs ( HYPRE_Real xx, HYPRE_Real yy, HYPRE_Real zz );
 
 
 /* pcg_par.c */
-void *hypre_ParKrylovCAlloc ( size_t count , size_t elt_size, HYPRE_MemoryLocation location );
+void *hypre_ParKrylovCAlloc ( size_t count, size_t elt_size, HYPRE_MemoryLocation location );
 HYPRE_Int hypre_ParKrylovFree ( void *ptr );
 void *hypre_ParKrylovCreateVector ( void *vvector );
-void *hypre_ParKrylovCreateVectorArray ( HYPRE_Int n , void *vvector );
+void *hypre_ParKrylovCreateVectorArray ( HYPRE_Int n, void *vvector );
 HYPRE_Int hypre_ParKrylovDestroyVector ( void *vvector );
-void *hypre_ParKrylovMatvecCreate ( void *A , void *x );
-HYPRE_Int hypre_ParKrylovMatvec ( void *matvec_data , HYPRE_Complex alpha , void *A , void *x , HYPRE_Complex beta , void *y );
-HYPRE_Int hypre_ParKrylovMatvecT ( void *matvec_data , HYPRE_Complex alpha , void *A , void *x , HYPRE_Complex beta , void *y );
+void *hypre_ParKrylovMatvecCreate ( void *A, void *x );
+HYPRE_Int hypre_ParKrylovMatvec ( void *matvec_data, HYPRE_Complex alpha, void *A, void *x,
+                                  HYPRE_Complex beta, void *y );
+HYPRE_Int hypre_ParKrylovMatvecT ( void *matvec_data, HYPRE_Complex alpha, void *A, void *x,
+                                   HYPRE_Complex beta, void *y );
 HYPRE_Int hypre_ParKrylovMatvecDestroy ( void *matvec_data );
-HYPRE_Real hypre_ParKrylovInnerProd ( void *x , void *y );
-HYPRE_Int hypre_ParKrylovMassInnerProd ( void *x , void **y, HYPRE_Int k, HYPRE_Int unroll, void *result );
-HYPRE_Int hypre_ParKrylovMassDotpTwo ( void *x , void *y , void **z, HYPRE_Int k, HYPRE_Int unroll, void *result_x, void *result_y );
-HYPRE_Int hypre_ParKrylovMassAxpy( HYPRE_Complex *alpha, void **x, void *y, HYPRE_Int k, HYPRE_Int unroll);
-HYPRE_Int hypre_ParKrylovCopyVector ( void *x , void *y );
+HYPRE_Real hypre_ParKrylovInnerProd ( void *x, void *y );
+HYPRE_Int hypre_ParKrylovMassInnerProd ( void *x, void **y, HYPRE_Int k, HYPRE_Int unroll,
+                                         void *result );
+HYPRE_Int hypre_ParKrylovMassDotpTwo ( void *x, void *y, void **z, HYPRE_Int k, HYPRE_Int unroll,
+                                       void *result_x, void *result_y );
+HYPRE_Int hypre_ParKrylovMassAxpy( HYPRE_Complex *alpha, void **x, void *y, HYPRE_Int k,
+                                   HYPRE_Int unroll);
+HYPRE_Int hypre_ParKrylovCopyVector ( void *x, void *y );
 HYPRE_Int hypre_ParKrylovClearVector ( void *x );
-HYPRE_Int hypre_ParKrylovScaleVector ( HYPRE_Complex alpha , void *x );
-HYPRE_Int hypre_ParKrylovAxpy ( HYPRE_Complex alpha , void *x , void *y );
-HYPRE_Int hypre_ParKrylovCommInfo ( void *A , HYPRE_Int *my_id , HYPRE_Int *num_procs );
-HYPRE_Int hypre_ParKrylovIdentitySetup ( void *vdata , void *A , void *b , void *x );
-HYPRE_Int hypre_ParKrylovIdentity ( void *vdata , void *A , void *b , void *x );
+HYPRE_Int hypre_ParKrylovScaleVector ( HYPRE_Complex alpha, void *x );
+HYPRE_Int hypre_ParKrylovAxpy ( HYPRE_Complex alpha, void *x, void *y );
+HYPRE_Int hypre_ParKrylovCommInfo ( void *A, HYPRE_Int *my_id, HYPRE_Int *num_procs );
+HYPRE_Int hypre_ParKrylovIdentitySetup ( void *vdata, void *A, void *b, void *x );
+HYPRE_Int hypre_ParKrylovIdentity ( void *vdata, void *A, void *b, void *x );
 
 /* schwarz.c */
-HYPRE_Int hypre_AMGNodalSchwarzSmoother ( hypre_CSRMatrix *A , HYPRE_Int num_functions , HYPRE_Int option , hypre_CSRMatrix **domain_structure_pointer );
-HYPRE_Int hypre_ParMPSchwarzSolve ( hypre_ParCSRMatrix *par_A , hypre_CSRMatrix *A_boundary , hypre_ParVector *rhs_vector , hypre_CSRMatrix *domain_structure , hypre_ParVector *par_x , HYPRE_Real relax_wt , HYPRE_Real *scale , hypre_ParVector *Vtemp , HYPRE_Int *pivots , HYPRE_Int use_nonsymm );
-HYPRE_Int hypre_MPSchwarzSolve ( hypre_ParCSRMatrix *par_A , hypre_Vector *rhs_vector , hypre_CSRMatrix *domain_structure , hypre_ParVector *par_x , HYPRE_Real relax_wt , hypre_Vector *aux_vector , HYPRE_Int *pivots , HYPRE_Int use_nonsymm );
-HYPRE_Int hypre_MPSchwarzCFSolve ( hypre_ParCSRMatrix *par_A , hypre_Vector *rhs_vector , hypre_CSRMatrix *domain_structure , hypre_ParVector *par_x , HYPRE_Real relax_wt , hypre_Vector *aux_vector , HYPRE_Int *CF_marker , HYPRE_Int rlx_pt , HYPRE_Int *pivots , HYPRE_Int use_nonsymm );
-HYPRE_Int hypre_MPSchwarzFWSolve ( hypre_ParCSRMatrix *par_A , hypre_Vector *rhs_vector , hypre_CSRMatrix *domain_structure , hypre_ParVector *par_x , HYPRE_Real relax_wt , hypre_Vector *aux_vector , HYPRE_Int *pivots , HYPRE_Int use_nonsymm );
-HYPRE_Int hypre_MPSchwarzCFFWSolve ( hypre_ParCSRMatrix *par_A , hypre_Vector *rhs_vector , hypre_CSRMatrix *domain_structure , hypre_ParVector *par_x , HYPRE_Real relax_wt , hypre_Vector *aux_vector , HYPRE_Int *CF_marker , HYPRE_Int rlx_pt , HYPRE_Int *pivots , HYPRE_Int use_nonsymm );
-HYPRE_Int transpose_matrix_create ( HYPRE_Int **i_face_element_pointer , HYPRE_Int **j_face_element_pointer , HYPRE_Int *i_element_face , HYPRE_Int *j_element_face , HYPRE_Int num_elements , HYPRE_Int num_faces );
-HYPRE_Int matrix_matrix_product ( HYPRE_Int **i_element_edge_pointer , HYPRE_Int **j_element_edge_pointer , HYPRE_Int *i_element_face , HYPRE_Int *j_element_face , HYPRE_Int *i_face_edge , HYPRE_Int *j_face_edge , HYPRE_Int num_elements , HYPRE_Int num_faces , HYPRE_Int num_edges );
-HYPRE_Int hypre_AMGCreateDomainDof ( hypre_CSRMatrix *A , HYPRE_Int domain_type , HYPRE_Int overlap , HYPRE_Int num_functions , HYPRE_Int *dof_func , hypre_CSRMatrix **domain_structure_pointer , HYPRE_Int **piv_pointer , HYPRE_Int use_nonsymm );
-HYPRE_Int hypre_AMGeAgglomerate ( HYPRE_Int *i_AE_element , HYPRE_Int *j_AE_element , HYPRE_Int *i_face_face , HYPRE_Int *j_face_face , HYPRE_Int *w_face_face , HYPRE_Int *i_face_element , HYPRE_Int *j_face_element , HYPRE_Int *i_element_face , HYPRE_Int *j_element_face , HYPRE_Int *i_face_to_prefer_weight , HYPRE_Int *i_face_weight , HYPRE_Int num_faces , HYPRE_Int num_elements , HYPRE_Int *num_AEs_pointer );
-HYPRE_Int hypre_update_entry ( HYPRE_Int weight , HYPRE_Int *weight_max , HYPRE_Int *previous , HYPRE_Int *next , HYPRE_Int *first , HYPRE_Int *last , HYPRE_Int head , HYPRE_Int tail , HYPRE_Int i );
-HYPRE_Int hypre_remove_entry ( HYPRE_Int weight , HYPRE_Int *weight_max , HYPRE_Int *previous , HYPRE_Int *next , HYPRE_Int *first , HYPRE_Int *last , HYPRE_Int head , HYPRE_Int tail , HYPRE_Int i );
-HYPRE_Int hypre_move_entry ( HYPRE_Int weight , HYPRE_Int *weight_max , HYPRE_Int *previous , HYPRE_Int *next , HYPRE_Int *first , HYPRE_Int *last , HYPRE_Int head , HYPRE_Int tail , HYPRE_Int i );
-HYPRE_Int hypre_matinv ( HYPRE_Real *x , HYPRE_Real *a , HYPRE_Int k );
-HYPRE_Int hypre_parCorrRes ( hypre_ParCSRMatrix *A , hypre_ParVector *x , hypre_Vector *rhs , hypre_Vector **tmp_ptr );
-HYPRE_Int hypre_AdSchwarzSolve ( hypre_ParCSRMatrix *par_A , hypre_ParVector *par_rhs , hypre_CSRMatrix *domain_structure , HYPRE_Real *scale , hypre_ParVector *par_x , hypre_ParVector *par_aux , HYPRE_Int *pivots , HYPRE_Int use_nonsymm );
-HYPRE_Int hypre_AdSchwarzCFSolve ( hypre_ParCSRMatrix *par_A , hypre_ParVector *par_rhs , hypre_CSRMatrix *domain_structure , HYPRE_Real *scale , hypre_ParVector *par_x , hypre_ParVector *par_aux , HYPRE_Int *CF_marker , HYPRE_Int rlx_pt , HYPRE_Int *pivots , HYPRE_Int use_nonsymm );
-HYPRE_Int hypre_GenerateScale ( hypre_CSRMatrix *domain_structure , HYPRE_Int num_variables , HYPRE_Real relaxation_weight , HYPRE_Real **scale_pointer );
-HYPRE_Int hypre_ParAdSchwarzSolve ( hypre_ParCSRMatrix *A , hypre_ParVector *F , hypre_CSRMatrix *domain_structure , HYPRE_Real *scale , hypre_ParVector *X , hypre_ParVector *Vtemp , HYPRE_Int *pivots , HYPRE_Int use_nonsymm );
-HYPRE_Int hypre_ParAMGCreateDomainDof ( hypre_ParCSRMatrix *A , HYPRE_Int domain_type , HYPRE_Int overlap , HYPRE_Int num_functions , HYPRE_Int *dof_func , hypre_CSRMatrix **domain_structure_pointer , HYPRE_Int **piv_pointer , HYPRE_Int use_nonsymm );
-HYPRE_Int hypre_ParGenerateScale ( hypre_ParCSRMatrix *A , hypre_CSRMatrix *domain_structure , HYPRE_Real relaxation_weight , HYPRE_Real **scale_pointer );
-HYPRE_Int hypre_ParGenerateHybridScale ( hypre_ParCSRMatrix *A , hypre_CSRMatrix *domain_structure , hypre_CSRMatrix **A_boundary_pointer , HYPRE_Real **scale_pointer );
+HYPRE_Int hypre_AMGNodalSchwarzSmoother ( hypre_CSRMatrix *A, HYPRE_Int num_functions,
+                                          HYPRE_Int option, hypre_CSRMatrix **domain_structure_pointer );
+HYPRE_Int hypre_ParMPSchwarzSolve ( hypre_ParCSRMatrix *par_A, hypre_CSRMatrix *A_boundary,
+                                    hypre_ParVector *rhs_vector, hypre_CSRMatrix *domain_structure, hypre_ParVector *par_x,
+                                    HYPRE_Real relax_wt, HYPRE_Real *scale, hypre_ParVector *Vtemp, HYPRE_Int *pivots,
+                                    HYPRE_Int use_nonsymm );
+HYPRE_Int hypre_MPSchwarzSolve ( hypre_ParCSRMatrix *par_A, hypre_Vector *rhs_vector,
+                                 hypre_CSRMatrix *domain_structure, hypre_ParVector *par_x, HYPRE_Real relax_wt,
+                                 hypre_Vector *aux_vector, HYPRE_Int *pivots, HYPRE_Int use_nonsymm );
+HYPRE_Int hypre_MPSchwarzCFSolve ( hypre_ParCSRMatrix *par_A, hypre_Vector *rhs_vector,
+                                   hypre_CSRMatrix *domain_structure, hypre_ParVector *par_x, HYPRE_Real relax_wt,
+                                   hypre_Vector *aux_vector, HYPRE_Int *CF_marker, HYPRE_Int rlx_pt, HYPRE_Int *pivots,
+                                   HYPRE_Int use_nonsymm );
+HYPRE_Int hypre_MPSchwarzFWSolve ( hypre_ParCSRMatrix *par_A, hypre_Vector *rhs_vector,
+                                   hypre_CSRMatrix *domain_structure, hypre_ParVector *par_x, HYPRE_Real relax_wt,
+                                   hypre_Vector *aux_vector, HYPRE_Int *pivots, HYPRE_Int use_nonsymm );
+HYPRE_Int hypre_MPSchwarzCFFWSolve ( hypre_ParCSRMatrix *par_A, hypre_Vector *rhs_vector,
+                                     hypre_CSRMatrix *domain_structure, hypre_ParVector *par_x, HYPRE_Real relax_wt,
+                                     hypre_Vector *aux_vector, HYPRE_Int *CF_marker, HYPRE_Int rlx_pt, HYPRE_Int *pivots,
+                                     HYPRE_Int use_nonsymm );
+HYPRE_Int transpose_matrix_create ( HYPRE_Int **i_face_element_pointer,
+                                    HYPRE_Int **j_face_element_pointer, HYPRE_Int *i_element_face, HYPRE_Int *j_element_face,
+                                    HYPRE_Int num_elements, HYPRE_Int num_faces );
+HYPRE_Int matrix_matrix_product ( HYPRE_Int **i_element_edge_pointer,
+                                  HYPRE_Int **j_element_edge_pointer, HYPRE_Int *i_element_face, HYPRE_Int *j_element_face,
+                                  HYPRE_Int *i_face_edge, HYPRE_Int *j_face_edge, HYPRE_Int num_elements, HYPRE_Int num_faces,
+                                  HYPRE_Int num_edges );
+HYPRE_Int hypre_AMGCreateDomainDof ( hypre_CSRMatrix *A, HYPRE_Int domain_type, HYPRE_Int overlap,
+                                     HYPRE_Int num_functions, HYPRE_Int *dof_func, hypre_CSRMatrix **domain_structure_pointer,
+                                     HYPRE_Int **piv_pointer, HYPRE_Int use_nonsymm );
+HYPRE_Int hypre_AMGeAgglomerate ( HYPRE_Int *i_AE_element, HYPRE_Int *j_AE_element,
+                                  HYPRE_Int *i_face_face, HYPRE_Int *j_face_face, HYPRE_Int *w_face_face, HYPRE_Int *i_face_element,
+                                  HYPRE_Int *j_face_element, HYPRE_Int *i_element_face, HYPRE_Int *j_element_face,
+                                  HYPRE_Int *i_face_to_prefer_weight, HYPRE_Int *i_face_weight, HYPRE_Int num_faces,
+                                  HYPRE_Int num_elements, HYPRE_Int *num_AEs_pointer );
+HYPRE_Int hypre_update_entry ( HYPRE_Int weight, HYPRE_Int *weight_max, HYPRE_Int *previous,
+                               HYPRE_Int *next, HYPRE_Int *first, HYPRE_Int *last, HYPRE_Int head, HYPRE_Int tail, HYPRE_Int i );
+HYPRE_Int hypre_remove_entry ( HYPRE_Int weight, HYPRE_Int *weight_max, HYPRE_Int *previous,
+                               HYPRE_Int *next, HYPRE_Int *first, HYPRE_Int *last, HYPRE_Int head, HYPRE_Int tail, HYPRE_Int i );
+HYPRE_Int hypre_move_entry ( HYPRE_Int weight, HYPRE_Int *weight_max, HYPRE_Int *previous,
+                             HYPRE_Int *next, HYPRE_Int *first, HYPRE_Int *last, HYPRE_Int head, HYPRE_Int tail, HYPRE_Int i );
+HYPRE_Int hypre_matinv ( HYPRE_Real *x, HYPRE_Real *a, HYPRE_Int k );
+HYPRE_Int hypre_parCorrRes ( hypre_ParCSRMatrix *A, hypre_ParVector *x, hypre_Vector *rhs,
+                             hypre_Vector **tmp_ptr );
+HYPRE_Int hypre_AdSchwarzSolve ( hypre_ParCSRMatrix *par_A, hypre_ParVector *par_rhs,
+                                 hypre_CSRMatrix *domain_structure, HYPRE_Real *scale, hypre_ParVector *par_x,
+                                 hypre_ParVector *par_aux, HYPRE_Int *pivots, HYPRE_Int use_nonsymm );
+HYPRE_Int hypre_AdSchwarzCFSolve ( hypre_ParCSRMatrix *par_A, hypre_ParVector *par_rhs,
+                                   hypre_CSRMatrix *domain_structure, HYPRE_Real *scale, hypre_ParVector *par_x,
+                                   hypre_ParVector *par_aux, HYPRE_Int *CF_marker, HYPRE_Int rlx_pt, HYPRE_Int *pivots,
+                                   HYPRE_Int use_nonsymm );
+HYPRE_Int hypre_GenerateScale ( hypre_CSRMatrix *domain_structure, HYPRE_Int num_variables,
+                                HYPRE_Real relaxation_weight, HYPRE_Real **scale_pointer );
+HYPRE_Int hypre_ParAdSchwarzSolve ( hypre_ParCSRMatrix *A, hypre_ParVector *F,
+                                    hypre_CSRMatrix *domain_structure, HYPRE_Real *scale, hypre_ParVector *X, hypre_ParVector *Vtemp,
+                                    HYPRE_Int *pivots, HYPRE_Int use_nonsymm );
+HYPRE_Int hypre_ParAMGCreateDomainDof ( hypre_ParCSRMatrix *A, HYPRE_Int domain_type,
+                                        HYPRE_Int overlap, HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                        hypre_CSRMatrix **domain_structure_pointer, HYPRE_Int **piv_pointer, HYPRE_Int use_nonsymm );
+HYPRE_Int hypre_ParGenerateScale ( hypre_ParCSRMatrix *A, hypre_CSRMatrix *domain_structure,
+                                   HYPRE_Real relaxation_weight, HYPRE_Real **scale_pointer );
+HYPRE_Int hypre_ParGenerateHybridScale ( hypre_ParCSRMatrix *A, hypre_CSRMatrix *domain_structure,
+                                         hypre_CSRMatrix **A_boundary_pointer, HYPRE_Real **scale_pointer );
 
 /* par_restr.c,  par_lr_restr.c */
-HYPRE_Int hypre_BoomerAMGBuildRestrAIR( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker, hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Real filter_thresholdR, HYPRE_Int debug_flag, hypre_ParCSRMatrix **R_ptr, HYPRE_Int is_triangular, HYPRE_Int gmres_switch);
-HYPRE_Int hypre_BoomerAMGBuildRestrDist2AIR( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker, hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Real filter_thresholdR, HYPRE_Int debug_flag, hypre_ParCSRMatrix **R_ptr, HYPRE_Int AIR1_5, HYPRE_Int is_triangular, HYPRE_Int gmres_switch);
-HYPRE_Int hypre_BoomerAMGBuildRestrNeumannAIR( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int NeumannDeg, HYPRE_Real strong_thresholdR, HYPRE_Real filter_thresholdR, HYPRE_Int debug_flag, hypre_ParCSRMatrix **R_ptr);
-HYPRE_Int hypre_BoomerAMGBuildRestrNeumannAIRDevice( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int NeumannDeg, HYPRE_Real strong_thresholdR, HYPRE_Real filter_thresholdR, HYPRE_Int debug_flag, hypre_ParCSRMatrix **R_ptr);
+HYPRE_Int hypre_BoomerAMGBuildRestrAIR( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                        hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                        HYPRE_Real filter_thresholdR, HYPRE_Int debug_flag, hypre_ParCSRMatrix **R_ptr,
+                                        HYPRE_Int is_triangular, HYPRE_Int gmres_switch);
+HYPRE_Int hypre_BoomerAMGBuildRestrDist2AIR( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                             hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                                             HYPRE_Real filter_thresholdR, HYPRE_Int debug_flag, hypre_ParCSRMatrix **R_ptr, HYPRE_Int AIR1_5,
+                                             HYPRE_Int is_triangular, HYPRE_Int gmres_switch);
+HYPRE_Int hypre_BoomerAMGBuildRestrNeumannAIR( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                               HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int NeumannDeg,
+                                               HYPRE_Real strong_thresholdR, HYPRE_Real filter_thresholdR, HYPRE_Int debug_flag,
+                                               hypre_ParCSRMatrix **R_ptr);
+HYPRE_Int hypre_BoomerAMGBuildRestrNeumannAIRDevice( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                                     HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int NeumannDeg,
+                                                     HYPRE_Real strong_thresholdR, HYPRE_Real filter_thresholdR, HYPRE_Int debug_flag,
+                                                     hypre_ParCSRMatrix **R_ptr);
 HYPRE_Int hypre_BoomerAMGCFMarkerTo1minus1Device( HYPRE_Int *CF_marker, HYPRE_Int size );
 
 #ifdef HYPRE_USING_DSUPERLU
@@ -1370,46 +2104,101 @@ HYPRE_Int hypre_SLUDistDestroy( void* solver);
 void *hypre_MGRCreate ( void );
 HYPRE_Int hypre_MGRDestroy ( void *mgr_vdata );
 HYPRE_Int hypre_MGRCycle( void *mgr_vdata, hypre_ParVector **F_array, hypre_ParVector **U_array );
-void *hypre_MGRCreateFrelaxVcycleData();
+void *hypre_MGRCreateFrelaxVcycleData( void );
 HYPRE_Int hypre_MGRDestroyFrelaxVcycleData( void *mgr_vdata );
-HYPRE_Int hypre_MGRSetupFrelaxVcycleData( void *mgr_vdata, hypre_ParCSRMatrix *A, hypre_ParVector *f, hypre_ParVector *u, HYPRE_Int level);
+void *hypre_MGRCreateGSElimData( void );
+HYPRE_Int hypre_MGRDestroyGSElimData( void *mgr_vdata );
+HYPRE_Int hypre_MGRSetupFrelaxVcycleData( void *mgr_vdata, hypre_ParCSRMatrix *A,
+                                          hypre_ParVector *f, hypre_ParVector *u,
+                                          HYPRE_Int level );
 HYPRE_Int hypre_MGRFrelaxVcycle ( void *mgr_vdata, hypre_ParVector *f, hypre_ParVector *u );
-HYPRE_Int hypre_MGRSetCpointsByBlock( void *mgr_vdata, HYPRE_Int  block_size, HYPRE_Int  max_num_levels, HYPRE_Int *block_num_coarse_points, HYPRE_Int  **block_coarse_indexes);
-HYPRE_Int hypre_MGRSetCpointsByContiguousBlock( void *mgr_vdata, HYPRE_Int  block_size, HYPRE_Int  max_num_levels, HYPRE_BigInt *begin_idx_array, HYPRE_Int *block_num_coarse_points, HYPRE_Int  **block_coarse_indexes);
-HYPRE_Int hypre_MGRSetCpointsByPointMarkerArray( void *mgr_vdata, HYPRE_Int  block_size, HYPRE_Int  max_num_levels, HYPRE_Int *block_num_coarse_points, HYPRE_Int  **block_coarse_indexes, HYPRE_Int *point_marker_array);
-HYPRE_Int hypre_MGRCoarsen(hypre_ParCSRMatrix *S,  hypre_ParCSRMatrix *A,HYPRE_Int final_coarse_size,HYPRE_Int *final_coarse_indexes,HYPRE_Int debug_flag,hypre_IntArray **CF_marker,HYPRE_Int last_level);
-HYPRE_Int hypre_MGRSetReservedCoarseNodes(void      *mgr_vdata, HYPRE_Int reserved_coarse_size, HYPRE_BigInt *reserved_coarse_nodes);
-HYPRE_Int hypre_MGRSetReservedCpointsLevelToKeep( void      *mgr_vdata, HYPRE_Int level);
-HYPRE_Int hypre_MGRSetMaxGlobalsmoothIters( void *mgr_vdata, HYPRE_Int max_iter );
-HYPRE_Int hypre_MGRSetGlobalsmoothType( void *mgr_vdata, HYPRE_Int iter_type );
-HYPRE_Int hypre_MGRSetNonCpointsToFpoints( void      *mgr_vdata, HYPRE_Int nonCptToFptFlag);
-
+HYPRE_Int hypre_MGRSetCpointsByBlock( void *mgr_vdata, HYPRE_Int  block_size,
+                                      HYPRE_Int  max_num_levels,
+                                      HYPRE_Int *block_num_coarse_points,
+                                      HYPRE_Int  **block_coarse_indexes );
+HYPRE_Int hypre_MGRSetCpointsByContiguousBlock( void *mgr_vdata, HYPRE_Int block_size,
+                                                HYPRE_Int  max_num_levels,
+                                                HYPRE_BigInt *begin_idx_array,
+                                                HYPRE_Int *block_num_coarse_points,
+                                                HYPRE_Int **block_coarse_indexes );
+HYPRE_Int hypre_MGRSetCpointsByPointMarkerArray( void *mgr_vdata, HYPRE_Int block_size,
+                                                 HYPRE_Int  max_num_levels,
+                                                 HYPRE_Int *block_num_coarse_points,
+                                                 HYPRE_Int **block_coarse_indexes,
+                                                 HYPRE_Int *point_marker_array );
+HYPRE_Int hypre_MGRCoarsen( hypre_ParCSRMatrix *S, hypre_ParCSRMatrix *A,
+                            HYPRE_Int final_coarse_size, HYPRE_Int *final_coarse_indexes,
+                            HYPRE_Int debug_flag, hypre_IntArray **CF_marker,
+                            HYPRE_Int last_level );
+HYPRE_Int hypre_MGRSetReservedCoarseNodes( void *mgr_vdata, HYPRE_Int reserved_coarse_size,
+                                           HYPRE_BigInt *reserved_coarse_nodes );
+HYPRE_Int hypre_MGRSetReservedCpointsLevelToKeep( void *mgr_vdata, HYPRE_Int level );
+HYPRE_Int hypre_MGRSetMaxGlobalSmoothIters( void *mgr_vdata, HYPRE_Int max_iter );
+HYPRE_Int hypre_MGRSetGlobalSmoothType( void *mgr_vdata, HYPRE_Int iter_type );
+HYPRE_Int hypre_MGRSetNonCpointsToFpoints( void *mgr_vdata, HYPRE_Int nonCptToFptFlag );
 //HYPRE_Int hypre_MGRInitCFMarker(HYPRE_Int num_variables, HYPRE_Int *CF_marker, HYPRE_Int initial_coarse_size,HYPRE_Int *initial_coarse_indexes);
 //HYPRE_Int hypre_MGRUpdateCoarseIndexes(HYPRE_Int num_variables, HYPRE_Int *CF_marker, HYPRE_Int initial_coarse_size,HYPRE_Int *initial_coarse_indexes);
-HYPRE_Int hypre_MGRBuildInterp(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker, hypre_ParCSRMatrix *S, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int debug_flag, HYPRE_Real trunc_factor, HYPRE_Int max_elmts, hypre_ParCSRMatrix  **P, HYPRE_Int method, HYPRE_Int numsweeps);
-HYPRE_Int hypre_MGRBuildRestrict(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker, HYPRE_BigInt *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int *dof_func, HYPRE_Int debug_flag, HYPRE_Real trunc_factor, HYPRE_Int max_elmts, HYPRE_Real strong_threshold, HYPRE_Real max_row_sum, hypre_ParCSRMatrix  **RT, HYPRE_Int method, HYPRE_Int numsweeps);
-//HYPRE_Int hypre_MGRBuildRestrictionToper(hypre_ParCSRMatrix *AT, HYPRE_Int *CF_marker, hypre_ParCSRMatrix *ST, HYPRE_Int *num_cpts_global,HYPRE_Int num_functions,HYPRE_Int *dof_func,HYPRE_Int debug_flag,HYPRE_Real trunc_factor, HYPRE_Int max_elmts, hypre_ParCSRMatrix  **RT,HYPRE_Int last_level,HYPRE_Int level, HYPRE_Int numsweeps);
-//HYPRE_Int hypre_BoomerAMGBuildInjectionInterp( hypre_ParCSRMatrix   *A, HYPRE_Int *CF_marker, HYPRE_Int *num_cpts_global, HYPRE_Int num_functions, HYPRE_Int debug_flag,HYPRE_Int init_data,hypre_ParCSRMatrix  **P_ptr);
-HYPRE_Int hypre_MGRSetCoarseSolver( void  *mgr_vdata, HYPRE_Int  (*coarse_grid_solver_solve)(void*,void*,void*,void*), HYPRE_Int  (*coarse_grid_solver_setup)(void*,void*,void*,void*), void  *coarse_grid_solver );
-HYPRE_Int hypre_MGRSetFSolver( void  *mgr_vdata, HYPRE_Int  (*fine_grid_solver_solve)(void*,void*,void*,void*), HYPRE_Int  (*fine_grid_solver_setup)(void*,void*,void*,void*), void  *fsolver );
-HYPRE_Int hypre_MGRSetup( void *mgr_vdata, hypre_ParCSRMatrix *A, hypre_ParVector    *f, hypre_ParVector    *u );
-HYPRE_Int hypre_MGRSolve( void *mgr_vdata, hypre_ParCSRMatrix *A, hypre_ParVector *f, hypre_ParVector  *u );
-HYPRE_Int hypre_block_jacobi_scaling(hypre_ParCSRMatrix *A,hypre_ParCSRMatrix **B_ptr,void               *mgr_vdata,HYPRE_Int             debug_flag);
-HYPRE_Int hypre_blockRelax_solve(hypre_ParCSRMatrix *A, hypre_ParVector *f, hypre_ParVector *u, HYPRE_Real blk_size, HYPRE_Int n_block, HYPRE_Int left_size, HYPRE_Int method, HYPRE_Real *diaginv, hypre_ParVector *Vtemp);
-HYPRE_Int hypre_blockRelax_setup(hypre_ParCSRMatrix *A,HYPRE_Int blk_size, HYPRE_Int reserved_coarse_size, HYPRE_Real **diaginvptr);
-HYPRE_Int hypre_blockRelax(hypre_ParCSRMatrix *A, hypre_ParVector *f, hypre_ParVector *u, HYPRE_Int blk_size, HYPRE_Int reserved_coarse_size, HYPRE_Int method, hypre_ParVector *Vtemp, hypre_ParVector *Ztemp);
-
+HYPRE_Int hypre_ParCSRMatrixExtractBlockDiagHost( hypre_ParCSRMatrix *par_A, HYPRE_Int blk_size,
+                                                  HYPRE_Int num_points, HYPRE_Int point_type,
+                                                  HYPRE_Int *CF_marker, HYPRE_Int diag_size,
+                                                  HYPRE_Int diag_type, HYPRE_Real *diag_data );
+HYPRE_Int hypre_ParCSRMatrixBlockDiagMatrix( hypre_ParCSRMatrix *A, HYPRE_Int blk_size,
+                                             HYPRE_Int point_type, HYPRE_Int *CF_marker,
+                                             HYPRE_Int diag_type, hypre_ParCSRMatrix **B_ptr );
+HYPRE_Int hypre_ParCSRMatrixBlockDiagMatrixHost( hypre_ParCSRMatrix *A, HYPRE_Int blk_size,
+                                                 HYPRE_Int point_type, HYPRE_Int *CF_marker,
+                                                 HYPRE_Int diag_type,
+                                                 hypre_ParCSRMatrix **B_ptr );
+HYPRE_Int hypre_MGRSetCoarseSolver( void *mgr_vdata,
+                                    HYPRE_Int (*cgrid_solver_solve)(void*, void*, void*, void*),
+                                    HYPRE_Int (*cgrid_solver_setup)(void*, void*, void*, void*),
+                                    void *coarse_grid_solver );
+HYPRE_Int hypre_MGRSetFSolver( void *mgr_vdata,
+                               HYPRE_Int (*fine_grid_solver_solve)(void*, void*, void*, void*),
+                               HYPRE_Int (*fine_grid_solver_setup)(void*, void*, void*, void*),
+                               void *fsolver );
+HYPRE_Int hypre_MGRSetFSolverAtLevel( void *mgr_vdata, void *fsolver, HYPRE_Int level );
+HYPRE_Int hypre_MGRSetup( void *mgr_vdata, hypre_ParCSRMatrix *A,
+                          hypre_ParVector *f, hypre_ParVector *u );
+HYPRE_Int hypre_MGRSolve( void *mgr_vdata, hypre_ParCSRMatrix *A,
+                          hypre_ParVector *f, hypre_ParVector  *u );
+HYPRE_Int hypre_block_jacobi_scaling( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix **B_ptr,
+                                      void *mgr_vdata, HYPRE_Int debug_flag );
+HYPRE_Int hypre_MGRBlockRelaxSolveDevice( hypre_ParCSRMatrix *B, hypre_ParCSRMatrix *A,
+                                          hypre_ParVector *f, hypre_ParVector *u,
+                                          hypre_ParVector *Vtemp, HYPRE_Real relax_weight );
+HYPRE_Int hypre_MGRBlockRelaxSolve( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                    hypre_ParVector *u, HYPRE_Int blk_size,
+                                    HYPRE_Int n_block, HYPRE_Int left_size,
+                                    HYPRE_Int method, HYPRE_Real *diaginv,
+                                    hypre_ParVector *Vtemp );
+HYPRE_Int hypre_BlockDiagInvLapack( HYPRE_Real *diag, HYPRE_Int N, HYPRE_Int blk_size );
+HYPRE_Int hypre_MGRBlockRelaxSetup( hypre_ParCSRMatrix *A, HYPRE_Int blk_size,
+                                    HYPRE_Real **diaginvptr );
+//HYPRE_Int hypre_blockRelax(hypre_ParCSRMatrix *A, hypre_ParVector *f, hypre_ParVector *u,
+//                           HYPRE_Int blk_size, HYPRE_Int reserved_coarse_size, HYPRE_Int method, hypre_ParVector *Vtemp,
+//                           hypre_ParVector *Ztemp);
+HYPRE_Int hypre_block_jacobi_solve( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                    hypre_ParVector *u, HYPRE_Int blk_size,
+                                    HYPRE_Int method, HYPRE_Real *diaginv,
+                                    hypre_ParVector *Vtemp );
 //HYPRE_Int hypre_MGRBuildAffRAP( MPI_Comm comm, HYPRE_Int local_num_variables, HYPRE_Int num_functions,
 //HYPRE_Int *dof_func, HYPRE_Int *CF_marker, HYPRE_Int **coarse_dof_func_ptr, HYPRE_BigInt **coarse_pnts_global_ptr,
 //hypre_ParCSRMatrix *A, HYPRE_Int debug_flag, hypre_ParCSRMatrix **P_f_ptr, hypre_ParCSRMatrix **A_ff_ptr );
-HYPRE_Int hypre_MGRGetSubBlock( hypre_ParCSRMatrix *A, HYPRE_Int *row_cf_marker, HYPRE_Int *col_cf_marker, HYPRE_Int debug_flag, hypre_ParCSRMatrix **A_ff_ptr );
-HYPRE_Int hypre_MGRBuildAff( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker, HYPRE_Int debug_flag, hypre_ParCSRMatrix **A_ff_ptr );
-HYPRE_Int hypre_MGRApproximateInverse(hypre_ParCSRMatrix *A, hypre_ParCSRMatrix **A_inv);
-HYPRE_Int hypre_MGRAddVectorP ( HYPRE_Int  *CF_marker, HYPRE_Int point_type, HYPRE_Real a, hypre_ParVector *fromVector, HYPRE_Real b, hypre_ParVector **toVector );
-HYPRE_Int hypre_MGRAddVectorR ( HYPRE_Int  *CF_marker, HYPRE_Int point_type, HYPRE_Real a, hypre_ParVector *fromVector, HYPRE_Real b, hypre_ParVector **toVector );
-HYPRE_Int hypre_MGRComputeNonGalerkinCoarseGrid(hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *P, hypre_ParCSRMatrix *RT, HYPRE_Int bsize, HYPRE_Int ordering, HYPRE_Int method, HYPRE_Int Pmax, HYPRE_Int keep_stencil, HYPRE_Int *CF_marker, hypre_ParCSRMatrix **A_h_ptr);
-
-HYPRE_Int hypre_MGRWriteSolverParams(void *mgr_vdata);
+HYPRE_Int hypre_MGRGetSubBlock( hypre_ParCSRMatrix *A, HYPRE_Int *row_cf_marker,
+                                HYPRE_Int *col_cf_marker, HYPRE_Int debug_flag,
+                                hypre_ParCSRMatrix **A_ff_ptr );
+HYPRE_Int hypre_MGRBuildAff( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker, HYPRE_Int debug_flag,
+                             hypre_ParCSRMatrix **A_ff_ptr );
+HYPRE_Int hypre_MGRApproximateInverse( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix **A_inv );
+HYPRE_Int hypre_MGRAddVectorP( hypre_IntArray *CF_marker, HYPRE_Int point_type, HYPRE_Real a,
+                               hypre_ParVector *fromVector, HYPRE_Real b,
+                               hypre_ParVector **toVector );
+HYPRE_Int hypre_MGRAddVectorR( hypre_IntArray *CF_marker, HYPRE_Int point_type, HYPRE_Real a,
+                               hypre_ParVector *fromVector, HYPRE_Real b,
+                               hypre_ParVector **toVector );
+HYPRE_Int hypre_MGRTruncateAcfCPRDevice( hypre_ParCSRMatrix  *A_CF,
+                                         hypre_ParCSRMatrix **A_CF_new_ptr );
 HYPRE_Int hypre_MGRSetAffSolverType( void *systg_vdata, HYPRE_Int *aff_solver_type );
 HYPRE_Int hypre_MGRSetCoarseSolverType( void *systg_vdata, HYPRE_Int coarse_solver_type );
 HYPRE_Int hypre_MGRSetCoarseSolverIter( void *systg_vdata, HYPRE_Int coarse_solver_iter );
@@ -1418,30 +2207,43 @@ HYPRE_Int hypre_MGRSetFineSolverMaxLevels( void *systg_vdata, HYPRE_Int fine_sol
 HYPRE_Int hypre_MGRSetMaxCoarseLevels( void *mgr_vdata, HYPRE_Int maxlev );
 HYPRE_Int hypre_MGRSetBlockSize( void *mgr_vdata, HYPRE_Int bsize );
 HYPRE_Int hypre_MGRSetRelaxType( void *mgr_vdata, HYPRE_Int relax_type );
-HYPRE_Int hypre_MGRSetFRelaxMethod( void *mgr_vdata, HYPRE_Int relax_method);
-HYPRE_Int hypre_MGRSetLevelFRelaxMethod( void *mgr_vdata, HYPRE_Int *relax_method);
-HYPRE_Int hypre_MGRSetLevelFRelaxNumFunctions( void *mgr_vdata, HYPRE_Int *num_functions);
-HYPRE_Int hypre_MGRSetCoarseGridMethod( void *mgr_vdata, HYPRE_Int *cg_method);
-HYPRE_Int hypre_MGRSetRestrictType( void *mgr_vdata, HYPRE_Int restrictType);
-HYPRE_Int hypre_MGRSetLevelRestrictType( void *mgr_vdata, HYPRE_Int *restrictType);
-HYPRE_Int hypre_MGRSetInterpType( void *mgr_vdata, HYPRE_Int interpType);
-HYPRE_Int hypre_MGRSetLevelInterpType( void *mgr_vdata, HYPRE_Int *interpType);
+HYPRE_Int hypre_MGRSetFRelaxMethod( void *mgr_vdata, HYPRE_Int relax_method );
+HYPRE_Int hypre_MGRSetLevelFRelaxMethod( void *mgr_vdata, HYPRE_Int *relax_method );
+HYPRE_Int hypre_MGRSetLevelFRelaxType( void *mgr_vdata, HYPRE_Int *relax_type );
+HYPRE_Int hypre_MGRSetLevelFRelaxNumFunctions( void *mgr_vdata, HYPRE_Int *num_functions );
+HYPRE_Int hypre_MGRSetCoarseGridMethod( void *mgr_vdata, HYPRE_Int *cg_method );
+HYPRE_Int hypre_MGRSetNonGalerkinMaxElmts( void *mgr_vdata, HYPRE_Int max_elmts );
+HYPRE_Int hypre_MGRSetLevelNonGalerkinMaxElmts( void *mgr_vdata, HYPRE_Int *max_elmts );
+HYPRE_Int hypre_MGRSetRestrictType( void *mgr_vdata, HYPRE_Int restrictType );
+HYPRE_Int hypre_MGRSetLevelRestrictType( void *mgr_vdata, HYPRE_Int *restrictType );
+HYPRE_Int hypre_MGRSetInterpType( void *mgr_vdata, HYPRE_Int interpType );
+HYPRE_Int hypre_MGRSetLevelInterpType( void *mgr_vdata, HYPRE_Int *interpType );
 HYPRE_Int hypre_MGRSetNumRelaxSweeps( void *mgr_vdata, HYPRE_Int nsweeps );
+HYPRE_Int hypre_MGRSetLevelNumRelaxSweeps( void *mgr_vdata, HYPRE_Int *nsweeps );
 HYPRE_Int hypre_MGRSetNumInterpSweeps( void *mgr_vdata, HYPRE_Int nsweeps );
 HYPRE_Int hypre_MGRSetNumRestrictSweeps( void *mgr_vdata, HYPRE_Int nsweeps );
+HYPRE_Int hypre_MGRSetLevelSmoothType( void *mgr_vdata, HYPRE_Int *level_smooth_type );
+HYPRE_Int hypre_MGRSetLevelSmoothIters( void *mgr_vdata, HYPRE_Int *level_smooth_iters );
+HYPRE_Int hypre_MGRSetGlobalSmoothCycle( void *mgr_vdata, HYPRE_Int global_smooth_cycle );
+HYPRE_Int hypre_MGRSetGlobalSmootherAtLevel( void *mgr_vdata, HYPRE_Solver smoother,
+                                             HYPRE_Int level );
 HYPRE_Int hypre_MGRSetPrintLevel( void *mgr_vdata, HYPRE_Int print_level );
 HYPRE_Int hypre_MGRSetFrelaxPrintLevel( void *mgr_vdata, HYPRE_Int print_level );
 HYPRE_Int hypre_MGRSetCoarseGridPrintLevel( void *mgr_vdata, HYPRE_Int print_level );
-HYPRE_Int hypre_MGRSetTruncateCoarseGridThreshold( void *mgr_vdata, HYPRE_Real threshold);
+HYPRE_Int hypre_MGRSetTruncateCoarseGridThreshold( void *mgr_vdata, HYPRE_Real threshold );
+HYPRE_Int hypre_MGRSetBlockJacobiBlockSize( void *mgr_vdata, HYPRE_Int blk_size );
 HYPRE_Int hypre_MGRSetLogging( void *mgr_vdata, HYPRE_Int logging );
 HYPRE_Int hypre_MGRSetMaxIter( void *mgr_vdata, HYPRE_Int max_iter );
-HYPRE_Int hypre_MGRSetPMaxElmts( void *mgr_vdata, HYPRE_Int P_max_elmts);
+HYPRE_Int hypre_MGRSetPMaxElmts( void *mgr_vdata, HYPRE_Int P_max_elmts );
+HYPRE_Int hypre_MGRSetLevelPMaxElmts( void *mgr_vdata, HYPRE_Int *P_max_elmts );
 HYPRE_Int hypre_MGRSetTol( void *mgr_vdata, HYPRE_Real tol );
-HYPRE_Int hypre_MGRSetAffInv( void *mgr_vdata, hypre_ParCSRMatrix *A_ff_inv);
+HYPRE_Int hypre_MGRDataPrint(void *mgr_vdata);
 #ifdef HYPRE_USING_DSUPERLU
 void *hypre_MGRDirectSolverCreate( void );
-HYPRE_Int hypre_MGRDirectSolverSetup( void *solver, hypre_ParCSRMatrix *A, hypre_ParVector *f, hypre_ParVector *u);
-HYPRE_Int hypre_MGRDirectSolverSolve( void *solver, hypre_ParCSRMatrix *A, hypre_ParVector *f, hypre_ParVector *u);
+HYPRE_Int hypre_MGRDirectSolverSetup( void *solver, hypre_ParCSRMatrix *A,
+                                      hypre_ParVector *f, hypre_ParVector *u );
+HYPRE_Int hypre_MGRDirectSolverSolve( void *solver, hypre_ParCSRMatrix *A,
+                                      hypre_ParVector *f, hypre_ParVector *u );
 HYPRE_Int hypre_MGRDirectSolverDestroy( void *solver );
 #endif
 // Accessor functions
@@ -1449,6 +2251,89 @@ HYPRE_Int hypre_MGRGetNumIterations( void *mgr_vdata, HYPRE_Int *num_iterations
 HYPRE_Int hypre_MGRGetFinalRelativeResidualNorm( void *mgr_vdata, HYPRE_Real *res_norm );
 HYPRE_Int hypre_MGRGetCoarseGridConvergenceFactor( void *mgr_data, HYPRE_Real *conv_factor );
 
+/* par_mgr_interp.c */
+HYPRE_Int hypre_MGRBuildInterp( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *A_FF,
+                                hypre_ParCSRMatrix *A_FC, hypre_ParCSRMatrix *S,
+                                hypre_IntArray *CF_marker, HYPRE_BigInt *num_cpts_global,
+                                HYPRE_Real trunc_factor, HYPRE_Int max_elmts,
+                                HYPRE_Int block_jacobi_bsize, HYPRE_Int method,
+                                HYPRE_Int num_sweeps_post, hypre_ParCSRMatrix **Wp_ptr,
+                                hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_MGRBuildRestrict( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *A_FF,
+                                  hypre_ParCSRMatrix *A_FC, hypre_ParCSRMatrix *A_CF,
+                                  hypre_IntArray *CF_marker, HYPRE_BigInt *num_cpts_global,
+                                  HYPRE_Real trunc_factor, HYPRE_Int max_elmts,
+                                  HYPRE_Real strong_threshold, HYPRE_Real max_row_sum,
+                                  HYPRE_Int blk_size, HYPRE_Int method,
+                                  hypre_ParCSRMatrix **W_ptr, hypre_ParCSRMatrix **R_ptr,
+                                  hypre_ParCSRMatrix **RT_ptr );
+HYPRE_Int hypre_MGRBuildPFromWp( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *Wp,
+                                 HYPRE_Int *CF_marker, hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_MGRBuildPFromWpHost( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *Wp,
+                                     HYPRE_Int *CF_marker, hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_MGRBuildBlockJacobiWp( hypre_ParCSRMatrix *A_FF, hypre_ParCSRMatrix *A_FC,
+                                       HYPRE_Int blk_size, hypre_ParCSRMatrix **Wp_ptr );
+HYPRE_Int hypre_MGRBuildBlockJacobiP( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *A_FF,
+                                      hypre_ParCSRMatrix *A_FC, hypre_ParCSRMatrix *Wp,
+                                      HYPRE_Int blk_size, HYPRE_Int *CF_marker,
+                                      hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_MGRBuildP( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                           HYPRE_BigInt *num_cpts_global, HYPRE_Int method,
+                           HYPRE_Int debug_flag, hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_MGRBuildPHost( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *A_FF,
+                               hypre_ParCSRMatrix *A_FC, HYPRE_Int *CF_marker,
+                               HYPRE_BigInt *num_cpts_global, HYPRE_Int method,
+                               hypre_ParCSRMatrix **Wp_ptr, hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_MGRBuildInterpApproximateInverse( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                                  HYPRE_BigInt *num_cpts_global,
+                                                  hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_MGRTruncateAcfCPR( hypre_ParCSRMatrix *A_CF, hypre_ParCSRMatrix **A_CF_new_ptr );
+HYPRE_Int hypre_MGRBuildRFromWr( hypre_IntArray *C_map, hypre_IntArray *F_map,
+                                 HYPRE_BigInt global_num_rows_R, HYPRE_BigInt global_num_cols_R,
+                                 HYPRE_BigInt *row_starts_R, HYPRE_BigInt *col_starts_R,
+                                 hypre_ParCSRMatrix *Wr, hypre_ParCSRMatrix **R_ptr );
+HYPRE_Int hypre_MGRBlockColLumpedRestrict( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *A_FF,
+                                           hypre_ParCSRMatrix *A_CF, hypre_IntArray *CF_marker,
+                                           HYPRE_Int blk_dim, hypre_ParCSRMatrix **Wr_ptr,
+                                           hypre_ParCSRMatrix **R_ptr);
+HYPRE_Int hypre_MGRColLumpedRestrict(hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *A_FF,
+                                     hypre_ParCSRMatrix *A_CF, hypre_IntArray *CF_marker,
+                                     hypre_ParCSRMatrix **Wr_ptr, hypre_ParCSRMatrix **R_ptr);
+
+/* par_mgr_rap.c */
+HYPRE_Int hypre_MGRBuildCoarseOperator(void *mgr_data, hypre_ParCSRMatrix *A_FF,
+                                       hypre_ParCSRMatrix *A_FC, hypre_ParCSRMatrix *A_CF,
+                                       hypre_ParCSRMatrix **A_CC_ptr, hypre_ParCSRMatrix *Wp,
+                                       hypre_ParCSRMatrix *Wr, HYPRE_Int level);
+
+/* par_mgr_coarsen.c */
+HYPRE_Int hypre_MGRCoarseParms( MPI_Comm comm, HYPRE_Int num_rows, hypre_IntArray *CF_marker,
+                                HYPRE_BigInt *row_starts_cpts, HYPRE_BigInt *row_starts_fpts );
+
+/* par_mgr_device.c */
+HYPRE_Int hypre_MGRRelaxL1JacobiDevice( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                        HYPRE_Int *CF_marker_host, HYPRE_Int relax_points,
+                                        HYPRE_Real relax_weight, HYPRE_Real *l1_norms,
+                                        hypre_ParVector *u, hypre_ParVector *Vtemp );
+HYPRE_Int hypre_MGRBuildPFromWpDevice( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *Wp,
+                                       HYPRE_Int *CF_marker, hypre_ParCSRMatrix **P_ptr);
+HYPRE_Int hypre_MGRBuildPDevice( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                 HYPRE_BigInt *num_cpts_global, HYPRE_Int method,
+                                 hypre_ParCSRMatrix **P_ptr );
+HYPRE_Int hypre_ParCSRMatrixExtractBlockDiagDevice( hypre_ParCSRMatrix *A, HYPRE_Int blk_size,
+                                                    HYPRE_Int num_points, HYPRE_Int point_type,
+                                                    HYPRE_Int *CF_marker, HYPRE_Int diag_size,
+                                                    HYPRE_Int diag_type, HYPRE_Int *B_diag_i,
+                                                    HYPRE_Int *B_diag_j,
+                                                    HYPRE_Complex *B_diag_data );
+HYPRE_Int hypre_ParCSRMatrixBlockDiagMatrixDevice( hypre_ParCSRMatrix *A, HYPRE_Int blk_size,
+                                                   HYPRE_Int point_type, HYPRE_Int *CF_marker,
+                                                   HYPRE_Int diag_type,
+                                                   hypre_ParCSRMatrix **B_ptr );
+
+/* par_mgr_stats.c */
+HYPRE_Int hypre_MGRSetupStats( void *mgr_vdata );
+
 /* par_ilu.c */
 void *hypre_ILUCreate ( void );
 HYPRE_Int hypre_ILUDestroy ( void *ilu_vdata );
@@ -1459,12 +2344,18 @@ HYPRE_Int hypre_ILUSetDropThresholdArray( void *ilu_vdata, HYPRE_Real *threshold
 HYPRE_Int hypre_ILUSetType( void *ilu_vdata, HYPRE_Int ilu_type );
 HYPRE_Int hypre_ILUSetMaxIter( void *ilu_vdata, HYPRE_Int max_iter );
 HYPRE_Int hypre_ILUSetTol( void *ilu_vdata, HYPRE_Real tol );
-HYPRE_Int hypre_ILUSetup( void *ilu_vdata, hypre_ParCSRMatrix *A, hypre_ParVector    *f, hypre_ParVector    *u );
-HYPRE_Int hypre_ILUSolve( void *ilu_vdata, hypre_ParCSRMatrix *A, hypre_ParVector *f, hypre_ParVector  *u );
+HYPRE_Int hypre_ILUSetIterativeSetupType( void *ilu_vdata, HYPRE_Int iter_setup_type );
+HYPRE_Int hypre_ILUSetIterativeSetupOption( void *ilu_vdata, HYPRE_Int iter_setup_option );
+HYPRE_Int hypre_ILUSetIterativeSetupMaxIter( void *ilu_vdata, HYPRE_Int iter_setup_max_iter );
+HYPRE_Int hypre_ILUSetIterativeSetupTolerance( void *ilu_vdata, HYPRE_Real iter_setup_tolerance );
+HYPRE_Int hypre_ILUGetIterativeSetupHistory( void *ilu_vdata,
+                                             HYPRE_Complex **iter_setup_history );
+HYPRE_Int hypre_ILUSetTriSolve( void *ilu_vdata, HYPRE_Int tri_solve );
+HYPRE_Int hypre_ILUSetLowerJacobiIters( void *ilu_vdata, HYPRE_Int lower_jacobi_iters );
+HYPRE_Int hypre_ILUSetUpperJacobiIters( void *ilu_vdata, HYPRE_Int upper_jacobi_iters );
 HYPRE_Int hypre_ILUSetPrintLevel( void *ilu_vdata, HYPRE_Int print_level );
 HYPRE_Int hypre_ILUSetLogging( void *ilu_vdata, HYPRE_Int logging );
 HYPRE_Int hypre_ILUSetLocalReordering( void *ilu_vdata, HYPRE_Int ordering_type );
-HYPRE_Int hypre_ILUSetSchurSolverKDIM( void *ilu_vdata, HYPRE_Int ss_kDim );
 HYPRE_Int hypre_ILUSetSchurSolverMaxIter( void *ilu_vdata, HYPRE_Int ss_max_iter );
 HYPRE_Int hypre_ILUSetSchurSolverTol( void *ilu_vdata, HYPRE_Real ss_tol );
 HYPRE_Int hypre_ILUSetSchurSolverAbsoluteTol( void *ilu_vdata, HYPRE_Real ss_absolute_tol );
@@ -1473,70 +2364,98 @@ HYPRE_Int hypre_ILUSetSchurSolverPrintLevel( void *ilu_vdata, HYPRE_Int ss_print
 HYPRE_Int hypre_ILUSetSchurSolverRelChange( void *ilu_vdata, HYPRE_Int ss_rel_change );
 HYPRE_Int hypre_ILUSetSchurPrecondILUType( void *ilu_vdata, HYPRE_Int sp_ilu_type );
 HYPRE_Int hypre_ILUSetSchurPrecondILULevelOfFill( void *ilu_vdata, HYPRE_Int sp_ilu_lfil );
-HYPRE_Int hypre_ILUSetSchurPrecondILUMaxNnzPerRow( void *ilu_vdata, HYPRE_Int sp_ilu_max_row_nnz );
+HYPRE_Int hypre_ILUSetSchurPrecondILUMaxNnzPerRow( void *ilu_vdata,
+                                                   HYPRE_Int sp_ilu_max_row_nnz );
 HYPRE_Int hypre_ILUSetSchurPrecondILUDropThreshold( void *ilu_vdata, HYPRE_Real sp_ilu_droptol );
-HYPRE_Int hypre_ILUSetSchurPrecondILUDropThresholdArray( void *ilu_vdata, HYPRE_Real *sp_ilu_droptol );
+HYPRE_Int hypre_ILUSetSchurPrecondILUDropThresholdArray( void *ilu_vdata,
+                                                         HYPRE_Real *sp_ilu_droptol );
 HYPRE_Int hypre_ILUSetSchurPrecondPrintLevel( void *ilu_vdata, HYPRE_Int sp_print_level );
 HYPRE_Int hypre_ILUSetSchurPrecondMaxIter( void *ilu_vdata, HYPRE_Int sp_max_iter );
+HYPRE_Int hypre_ILUSetSchurPrecondTriSolve( void *ilu_vdata, HYPRE_Int sp_tri_solve );
+HYPRE_Int hypre_ILUSetSchurPrecondLowerJacobiIters( void *ilu_vdata,
+                                                    HYPRE_Int sp_lower_jacobi_iters );
+HYPRE_Int hypre_ILUSetSchurPrecondUpperJacobiIters( void *ilu_vdata,
+                                                    HYPRE_Int sp_upper_jacobi_iters );
 HYPRE_Int hypre_ILUSetSchurPrecondTol( void *ilu_vdata, HYPRE_Int sp_tol );
-HYPRE_Int hypre_ILUMinHeapAddI(HYPRE_Int *heap, HYPRE_Int len);
-HYPRE_Int hypre_ILUMinHeapAddIIIi(HYPRE_Int *heap, HYPRE_Int *I1, HYPRE_Int *Ii1, HYPRE_Int len);
-HYPRE_Int hypre_ILUMinHeapAddIRIi(HYPRE_Int *heap, HYPRE_Real *I1, HYPRE_Int *Ii1, HYPRE_Int len);
-HYPRE_Int hypre_ILUMaxHeapAddRabsIIi(HYPRE_Real *heap, HYPRE_Int *I1, HYPRE_Int *Ii1, HYPRE_Int len);
-HYPRE_Int hypre_ILUMaxrHeapAddRabsI(HYPRE_Real *heap, HYPRE_Int *I1, HYPRE_Int len);
-HYPRE_Int hypre_ILUMinHeapRemoveI(HYPRE_Int *heap, HYPRE_Int len);
-HYPRE_Int hypre_ILUMinHeapRemoveIIIi(HYPRE_Int *heap, HYPRE_Int *I1, HYPRE_Int *Ii1, HYPRE_Int len);
-HYPRE_Int hypre_ILUMinHeapRemoveIRIi(HYPRE_Int *heap, HYPRE_Real *I1, HYPRE_Int *Ii1, HYPRE_Int len);
-HYPRE_Int hypre_ILUMaxHeapRemoveRabsIIi(HYPRE_Real *heap, HYPRE_Int *I1, HYPRE_Int *Ii1, HYPRE_Int len);
-HYPRE_Int hypre_ILUMaxrHeapRemoveRabsI(HYPRE_Real *heap, HYPRE_Int *I1, HYPRE_Int len);
-HYPRE_Int hypre_ILUMaxQSplitRI(HYPRE_Real *array, HYPRE_Int *I1, HYPRE_Int left, HYPRE_Int bound, HYPRE_Int right);
-HYPRE_Int hypre_ILUMaxQSplitRabsI(HYPRE_Real *array, HYPRE_Int *I1, HYPRE_Int left, HYPRE_Int bound, HYPRE_Int right);
-//HYPRE_Int hypre_quickSortIR (HYPRE_Int *a, HYPRE_Real *b, HYPRE_Int *iw, const HYPRE_Int lo, const HYPRE_Int hi);
-HYPRE_Int hypre_ILUSortOffdColmap(hypre_ParCSRMatrix *A);
-HYPRE_Int hypre_ILUMaxRabs(HYPRE_Real *array_data, HYPRE_Int *array_j, HYPRE_Int start, HYPRE_Int end, HYPRE_Int nLU, HYPRE_Int *rperm, HYPRE_Real *value, HYPRE_Int *index, HYPRE_Real *l1_norm, HYPRE_Int *nnz);
-HYPRE_Int hypre_ILUGetPermddPQPre(HYPRE_Int n, HYPRE_Int nLU, HYPRE_Int *A_diag_i, HYPRE_Int *A_diag_j, HYPRE_Real *A_diag_data, HYPRE_Real tol, HYPRE_Int *perm, HYPRE_Int *rperm, HYPRE_Int *pperm_pre, HYPRE_Int *qperm_pre, HYPRE_Int *nB);
-HYPRE_Int hypre_ILUGetPermddPQ(hypre_ParCSRMatrix *A, HYPRE_Int **pperm, HYPRE_Int **qperm, HYPRE_Real tol, HYPRE_Int *nB, HYPRE_Int *nI, HYPRE_Int reordering_type);
-HYPRE_Int hypre_ILUGetInteriorExteriorPerm(hypre_ParCSRMatrix *A, HYPRE_Int **perm, HYPRE_Int *nLU, HYPRE_Int reordering_type);
-HYPRE_Int hypre_ILUGetLocalPerm(hypre_ParCSRMatrix *A, HYPRE_Int **perm, HYPRE_Int *nLU, HYPRE_Int reordering_type);
-HYPRE_Int hypre_ILUWriteSolverParams(void *ilu_vdata);
-HYPRE_Int hypre_ILUBuildRASExternalMatrix(hypre_ParCSRMatrix *A, HYPRE_Int *rperm, HYPRE_Int **E_i, HYPRE_Int **E_j, HYPRE_Real **E_data);
-HYPRE_Int hypre_ILUSetupILU0(hypre_ParCSRMatrix *A, HYPRE_Int *perm, HYPRE_Int *qperm, HYPRE_Int nLU, HYPRE_Int nI, hypre_ParCSRMatrix **Lptr, HYPRE_Real** Dptr, hypre_ParCSRMatrix **Uptr, hypre_ParCSRMatrix **Sptr, HYPRE_Int **u_end);
-HYPRE_Int hypre_ILUSetupMILU0(hypre_ParCSRMatrix *A, HYPRE_Int *permp, HYPRE_Int *qpermp, HYPRE_Int nLU, HYPRE_Int nI, hypre_ParCSRMatrix **Lptr, HYPRE_Real** Dptr, hypre_ParCSRMatrix **Uptr, hypre_ParCSRMatrix **Sptr, HYPRE_Int **u_end, HYPRE_Int modified);
-HYPRE_Int hypre_ILUSetupILUK(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *permp, HYPRE_Int *qpermp, HYPRE_Int nLU, HYPRE_Int nI, hypre_ParCSRMatrix **Lptr, HYPRE_Real** Dptr, hypre_ParCSRMatrix **Uptr, hypre_ParCSRMatrix **Sptr, HYPRE_Int **u_end);
-HYPRE_Int hypre_ILUSetupILUKSymbolic(HYPRE_Int n, HYPRE_Int *A_diag_i, HYPRE_Int *A_diag_j, HYPRE_Int lfil, HYPRE_Int *perm, HYPRE_Int *rperm, HYPRE_Int *iw, HYPRE_Int nLU, HYPRE_Int *L_diag_i, HYPRE_Int *U_diag_i, HYPRE_Int *S_diag_i, HYPRE_Int **L_diag_j, HYPRE_Int **U_diag_j, HYPRE_Int **S_diag_j, HYPRE_Int **u_end);
-HYPRE_Int hypre_ILUSetupILUT(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol, HYPRE_Int *permp, HYPRE_Int *qpermp, HYPRE_Int nLU, HYPRE_Int nI, hypre_ParCSRMatrix **Lptr, HYPRE_Real** Dptr, hypre_ParCSRMatrix **Uptr, hypre_ParCSRMatrix **Sptr, HYPRE_Int **u_end);
-HYPRE_Int hypre_ILUSetupILU0RAS(hypre_ParCSRMatrix *A, HYPRE_Int *perm, HYPRE_Int nLU, hypre_ParCSRMatrix **Lptr, HYPRE_Real** Dptr, hypre_ParCSRMatrix **Uptr);
-HYPRE_Int hypre_ILUSetupILUKRASSymbolic(HYPRE_Int n, HYPRE_Int *A_diag_i, HYPRE_Int *A_diag_j, HYPRE_Int *A_offd_i, HYPRE_Int *A_offd_j, HYPRE_Int *E_i, HYPRE_Int *E_j, HYPRE_Int ext, HYPRE_Int lfil, HYPRE_Int *perm, HYPRE_Int *rperm, HYPRE_Int *iw, HYPRE_Int nLU, HYPRE_Int *L_diag_i, HYPRE_Int *U_diag_i, HYPRE_Int **L_diag_j, HYPRE_Int **U_diag_j);
-HYPRE_Int hypre_ILUSetupILUKRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *perm, HYPRE_Int nLU, hypre_ParCSRMatrix **Lptr, HYPRE_Real** Dptr, hypre_ParCSRMatrix **Uptr);
-HYPRE_Int hypre_ILUSetupILUTRAS(hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol, HYPRE_Int *perm, HYPRE_Int nLU, hypre_ParCSRMatrix **Lptr, HYPRE_Real** Dptr, hypre_ParCSRMatrix **Uptr);
-HYPRE_Int hypre_ILUSolveLU(hypre_ParCSRMatrix *A, hypre_ParVector *f, hypre_ParVector *u, HYPRE_Int *perm, HYPRE_Int nLU, hypre_ParCSRMatrix *L, HYPRE_Real* D, hypre_ParCSRMatrix *U, hypre_ParVector *utemp, hypre_ParVector *ftemp);
-HYPRE_Int hypre_ILUSolveSchurGMRES(hypre_ParCSRMatrix *A, hypre_ParVector *f, hypre_ParVector *u, HYPRE_Int *perm, HYPRE_Int *qperm, HYPRE_Int nLU, hypre_ParCSRMatrix *L, HYPRE_Real* D, hypre_ParCSRMatrix *U, hypre_ParCSRMatrix *S, hypre_ParVector *ftemp, hypre_ParVector *utemp, HYPRE_Solver schur_solver, HYPRE_Solver schur_precond, hypre_ParVector *rhs, hypre_ParVector *x, HYPRE_Int *u_end);
-HYPRE_Int hypre_ILUSolveSchurNSH(hypre_ParCSRMatrix *A, hypre_ParVector *f, hypre_ParVector *u, HYPRE_Int *perm, HYPRE_Int nLU, hypre_ParCSRMatrix *L, HYPRE_Real* D, hypre_ParCSRMatrix *U, hypre_ParCSRMatrix *S, hypre_ParVector *ftemp, hypre_ParVector *utemp, HYPRE_Solver schur_solver, hypre_ParVector *rhs, hypre_ParVector *x, HYPRE_Int *u_end);
-HYPRE_Int hypre_ILUSolveLURAS(hypre_ParCSRMatrix *A, hypre_ParVector *f, hypre_ParVector *u, HYPRE_Int *perm, hypre_ParCSRMatrix *L, HYPRE_Real* D, hypre_ParCSRMatrix *U, hypre_ParVector *ftemp, hypre_ParVector *utemp, HYPRE_Real *fext, HYPRE_Real *uext);
-HYPRE_Int hypre_ILUSetSchurNSHDropThreshold( void *ilu_vdata, HYPRE_Real threshold);
-HYPRE_Int hypre_ILUSetSchurNSHDropThresholdArray( void *ilu_vdata, HYPRE_Real *threshold);
-HYPRE_Int hypre_ILUSetupRAPILU0(hypre_ParCSRMatrix *A, HYPRE_Int *perm, HYPRE_Int n, HYPRE_Int nLU, hypre_ParCSRMatrix **Lptr, HYPRE_Real **Dptr, hypre_ParCSRMatrix **Uptr, hypre_ParCSRMatrix **mLptr, HYPRE_Real **mDptr, hypre_ParCSRMatrix **mUptr, HYPRE_Int **u_end);
-HYPRE_Int hypre_ILUSolveRAPGMRESHOST(hypre_ParCSRMatrix *A, hypre_ParVector *f, hypre_ParVector *u, HYPRE_Int *perm, HYPRE_Int nLU, hypre_ParCSRMatrix *L, HYPRE_Real *D, hypre_ParCSRMatrix *U, hypre_ParCSRMatrix *mL, HYPRE_Real *mD, hypre_ParCSRMatrix *mU, hypre_ParVector *ftemp, hypre_ParVector *utemp,hypre_ParVector *xtemp, hypre_ParVector *ytemp, HYPRE_Solver schur_solver, HYPRE_Solver schur_precond, hypre_ParVector *rhs, hypre_ParVector *x, HYPRE_Int *u_end);
-HYPRE_Int hypre_ParILURAPSchurGMRESSolveH( void *ilu_vdata, void *ilu_vdata2, hypre_ParVector *f, hypre_ParVector *u );
-HYPRE_Int hypre_ParILURAPSchurGMRESDummySetupH(void *a, void *b, void *c, void *d);
-HYPRE_Int hypre_ParILURAPSchurGMRESCommInfoH( void *ilu_vdata, HYPRE_Int *my_id, HYPRE_Int *num_procs);
-void *hypre_ParILURAPSchurGMRESMatvecCreateH(void *ilu_vdata, void *x);
-HYPRE_Int hypre_ParILURAPSchurGMRESMatvecH(void *matvec_data, HYPRE_Complex alpha, void *ilu_vdata, void *x, HYPRE_Complex beta, void *y);
-HYPRE_Int hypre_ParILURAPSchurGMRESMatvecDestroyH(void *matvec_data );
-HYPRE_Int hypre_ILULocalRCM( hypre_CSRMatrix *A, HYPRE_Int start, HYPRE_Int end, HYPRE_Int **permp, HYPRE_Int **qpermp, HYPRE_Int sym);
-HYPRE_Int hypre_ILULocalRCMNumbering(hypre_CSRMatrix *A, HYPRE_Int root, HYPRE_Int *marker, HYPRE_Int *perm, HYPRE_Int *current_nump);
-HYPRE_Int hypre_ILULocalRCMFindPPNode( hypre_CSRMatrix *A, HYPRE_Int *rootp, HYPRE_Int *marker);
-HYPRE_Int hypre_ILULocalRCMMindegree(HYPRE_Int n, HYPRE_Int *degree, HYPRE_Int *marker, HYPRE_Int *rootp);
-HYPRE_Int hypre_ILULocalRCMOrder( hypre_CSRMatrix *A, HYPRE_Int *perm);
-HYPRE_Int hypre_ILULocalRCMBuildLevel(hypre_CSRMatrix *A, HYPRE_Int root, HYPRE_Int *marker, HYPRE_Int *level_i, HYPRE_Int *level_j, HYPRE_Int *nlevp);
-HYPRE_Int hypre_ILULocalRCMQsort(HYPRE_Int *perm, HYPRE_Int start, HYPRE_Int end, HYPRE_Int *degree);
-HYPRE_Int hypre_ILULocalRCMReverse(HYPRE_Int *perm, HYPRE_Int start, HYPRE_Int end);
-// Newton-Schultz-Hotelling (NSH) functions
-void * hypre_NSHCreate();
+HYPRE_Int hypre_ILUSetSchurNSHDropThreshold( void *ilu_vdata, HYPRE_Real threshold );
+HYPRE_Int hypre_ILUSetSchurNSHDropThresholdArray( void *ilu_vdata, HYPRE_Real *threshold );
+HYPRE_Int hypre_ILUGetNumIterations( void *ilu_vdata, HYPRE_Int *num_iterations );
+HYPRE_Int hypre_ILUGetFinalRelativeResidualNorm( void *ilu_vdata, HYPRE_Real *res_norm );
+HYPRE_Int hypre_ILUWriteSolverParams( void *ilu_vdata );
+
+HYPRE_Int hypre_ILUMinHeapAddI( HYPRE_Int *heap, HYPRE_Int len );
+HYPRE_Int hypre_ILUMinHeapAddIIIi( HYPRE_Int *heap, HYPRE_Int *I1,
+                                   HYPRE_Int *Ii1, HYPRE_Int len );
+HYPRE_Int hypre_ILUMinHeapAddIRIi( HYPRE_Int *heap, HYPRE_Real *I1,
+                                   HYPRE_Int *Ii1, HYPRE_Int len );
+HYPRE_Int hypre_ILUMaxrHeapAddRabsI( HYPRE_Real *heap, HYPRE_Int *I1, HYPRE_Int len );
+HYPRE_Int hypre_ILUMinHeapRemoveI( HYPRE_Int *heap, HYPRE_Int len );
+HYPRE_Int hypre_ILUMinHeapRemoveIIIi( HYPRE_Int *heap, HYPRE_Int *I1,
+                                      HYPRE_Int *Ii1, HYPRE_Int len );
+HYPRE_Int hypre_ILUMinHeapRemoveIRIi( HYPRE_Int *heap, HYPRE_Real *I1,
+                                      HYPRE_Int *Ii1, HYPRE_Int len );
+HYPRE_Int hypre_ILUMaxrHeapRemoveRabsI( HYPRE_Real *heap, HYPRE_Int *I1, HYPRE_Int len );
+HYPRE_Int hypre_ILUMaxQSplitRabsI( HYPRE_Real *arrayR, HYPRE_Int *arrayI, HYPRE_Int left,
+                                   HYPRE_Int bound, HYPRE_Int right );
+HYPRE_Int hypre_ILUMaxRabs( HYPRE_Real *array_data, HYPRE_Int *array_j, HYPRE_Int start,
+                            HYPRE_Int end, HYPRE_Int nLU, HYPRE_Int *rperm, HYPRE_Real *value,
+                            HYPRE_Int *index, HYPRE_Real *l1_norm, HYPRE_Int *nnz );
+
+HYPRE_Int hypre_ILUGetPermddPQPre( HYPRE_Int n, HYPRE_Int nLU, HYPRE_Int *A_diag_i,
+                                   HYPRE_Int *A_diag_j, HYPRE_Real *A_diag_data,
+                                   HYPRE_Real tol, HYPRE_Int *perm, HYPRE_Int *rperm,
+                                   HYPRE_Int *pperm_pre, HYPRE_Int *qperm_pre, HYPRE_Int *nB );
+HYPRE_Int hypre_ILUGetPermddPQ( hypre_ParCSRMatrix *A, HYPRE_Int **io_pperm, HYPRE_Int **io_qperm,
+                                HYPRE_Real tol, HYPRE_Int *nB, HYPRE_Int *nI,
+                                HYPRE_Int reordering_type );
+HYPRE_Int hypre_ILUGetInteriorExteriorPerm( hypre_ParCSRMatrix *A,
+                                            HYPRE_MemoryLocation memory_location,
+                                            HYPRE_Int **perm, HYPRE_Int *nLU,
+                                            HYPRE_Int reordering_type );
+HYPRE_Int hypre_ILUGetLocalPerm( hypre_ParCSRMatrix *A, HYPRE_Int **perm_ptr,
+                                 HYPRE_Int *nLU, HYPRE_Int reordering_type );
+HYPRE_Int hypre_ILUBuildRASExternalMatrix( hypre_ParCSRMatrix *A, HYPRE_Int *rperm,
+                                           HYPRE_Int **E_i, HYPRE_Int **E_j, HYPRE_Real **E_data );
+HYPRE_Int hypre_ILUSortOffdColmap( hypre_ParCSRMatrix *A );
+HYPRE_Int hypre_ILULocalRCMBuildFinalPerm( HYPRE_Int start, HYPRE_Int end,
+                                           HYPRE_Int * G_perm, HYPRE_Int *perm, HYPRE_Int *qperm,
+                                           HYPRE_Int **permp, HYPRE_Int **qpermp );
+HYPRE_Int hypre_ILULocalRCM( hypre_CSRMatrix *A, HYPRE_Int start, HYPRE_Int end,
+                             HYPRE_Int **permp, HYPRE_Int **qpermp, HYPRE_Int sym );
+HYPRE_Int hypre_ILULocalRCMMindegree( HYPRE_Int n, HYPRE_Int *degree,
+                                      HYPRE_Int *marker, HYPRE_Int *rootp );
+HYPRE_Int hypre_ILULocalRCMOrder( hypre_CSRMatrix *A, HYPRE_Int *perm );
+HYPRE_Int hypre_ILULocalRCMFindPPNode( hypre_CSRMatrix *A, HYPRE_Int *rootp, HYPRE_Int *marker );
+HYPRE_Int hypre_ILULocalRCMBuildLevel( hypre_CSRMatrix *A, HYPRE_Int root, HYPRE_Int *marker,
+                                       HYPRE_Int *level_i, HYPRE_Int *level_j, HYPRE_Int *nlevp );
+HYPRE_Int hypre_ILULocalRCMNumbering( hypre_CSRMatrix *A, HYPRE_Int root, HYPRE_Int *marker,
+                                      HYPRE_Int *perm, HYPRE_Int *current_nump );
+HYPRE_Int hypre_ILULocalRCMQsort( HYPRE_Int *perm, HYPRE_Int start, HYPRE_Int end,
+                                  HYPRE_Int *degree );
+HYPRE_Int hypre_ILULocalRCMReverse( HYPRE_Int *perm, HYPRE_Int start, HYPRE_Int end );
+
+#if defined(HYPRE_USING_GPU)
+HYPRE_Int hypre_ParILUSchurGMRESDummySolveDevice( void *ilu_vdata, void *ilu_vdata2,
+                                                  hypre_ParVector *f, hypre_ParVector *u );
+HYPRE_Int hypre_ParILUSchurGMRESCommInfoDevice( void *ilu_vdata, HYPRE_Int *my_id,
+                                                HYPRE_Int *num_procs );
+HYPRE_Int hypre_ParILURAPSchurGMRESSolveDevice( void *ilu_vdata, void *ilu_vdata2,
+                                                hypre_ParVector *par_f, hypre_ParVector *par_u );
+HYPRE_Int hypre_ParILURAPSchurGMRESMatvecDevice( void *matvec_data, HYPRE_Complex alpha,
+                                                 void *ilu_vdata, void *x,
+                                                 HYPRE_Complex beta, void *y );
+#endif
+HYPRE_Int hypre_ParILURAPSchurGMRESCommInfoHost( void *ilu_vdata, HYPRE_Int *my_id,
+                                                 HYPRE_Int *num_procs );
+HYPRE_Int hypre_ParILURAPSchurGMRESSolveHost( void *ilu_vdata, void *ilu_vdata2,
+                                              hypre_ParVector *f, hypre_ParVector *u );
+HYPRE_Int hypre_ParILURAPSchurGMRESMatvecHost( void *matvec_data, HYPRE_Complex alpha,
+                                               void *ilu_vdata, void *x,
+                                               HYPRE_Complex beta, void *y );
+
+void * hypre_NSHCreate( void );
 HYPRE_Int hypre_NSHDestroy( void *data );
-HYPRE_Int hypre_NSHSetup( void *nsh_vdata, hypre_ParCSRMatrix *A, hypre_ParVector *f, hypre_ParVector *u );
-HYPRE_Int hypre_NSHSolve( void *nsh_vdata, hypre_ParCSRMatrix *A, hypre_ParVector *f, hypre_ParVector *u );
-HYPRE_Int hypre_NSHWriteSolverParams(void *nsh_vdata);
+HYPRE_Int hypre_NSHWriteSolverParams( void *nsh_vdata );
 HYPRE_Int hypre_NSHSetPrintLevel( void *nsh_vdata, HYPRE_Int print_level );
 HYPRE_Int hypre_NSHSetLogging( void *nsh_vdata, HYPRE_Int logging );
 HYPRE_Int hypre_NSHSetMaxIter( void *nsh_vdata, HYPRE_Int max_iter );
@@ -1551,109 +2470,425 @@ HYPRE_Int hypre_NSHSetColVersion( void *nsh_vdata, HYPRE_Int mr_col_version );
 HYPRE_Int hypre_NSHSetNSHMaxIter( void *nsh_vdata, HYPRE_Int nsh_max_iter );
 HYPRE_Int hypre_NSHSetNSHTol( void *nsh_vdata, HYPRE_Real nsh_tol );
 HYPRE_Int hypre_NSHSetNSHMaxRowNnz( void *nsh_vdata, HYPRE_Int nsh_max_row_nnz );
-HYPRE_Int hypre_CSRMatrixNormFro(hypre_CSRMatrix *A, HYPRE_Real *norm_io);
-HYPRE_Int hypre_CSRMatrixResNormFro(hypre_CSRMatrix *A, HYPRE_Real *norm_io);
-HYPRE_Int hypre_ParCSRMatrixNormFro(hypre_ParCSRMatrix *A, HYPRE_Real *norm_io);
-HYPRE_Int hypre_ParCSRMatrixResNormFro(hypre_ParCSRMatrix *A, HYPRE_Real *norm_io);
-HYPRE_Int hypre_CSRMatrixTrace(hypre_CSRMatrix *A, HYPRE_Real *trace_io);
-HYPRE_Int hypre_CSRMatrixDropInplace(hypre_CSRMatrix *A, HYPRE_Real droptol, HYPRE_Int max_row_nnz);
-HYPRE_Int hypre_ILUCSRMatrixInverseSelfPrecondMRGlobal(hypre_CSRMatrix *matA, hypre_CSRMatrix **M, HYPRE_Real droptol, HYPRE_Real tol, HYPRE_Real eps_tol, HYPRE_Int max_row_nnz, HYPRE_Int max_iter, HYPRE_Int print_level );
-HYPRE_Int hypre_ILUParCSRInverseNSH(hypre_ParCSRMatrix *A, hypre_ParCSRMatrix **M, HYPRE_Real *droptol, HYPRE_Real mr_tol, HYPRE_Real nsh_tol, HYPRE_Real eps_tol, HYPRE_Int mr_max_row_nnz, HYPRE_Int nsh_max_row_nnz, HYPRE_Int mr_max_iter, HYPRE_Int nsh_max_iter, HYPRE_Int mr_col_version, HYPRE_Int print_level);
-HYPRE_Int hypre_NSHSolveInverse(hypre_ParCSRMatrix *A, hypre_ParVector *f, hypre_ParVector *u, hypre_ParCSRMatrix *M, hypre_ParVector *ftemp, hypre_ParVector *utemp);
-// Accessor functions
-HYPRE_Int hypre_ILUGetNumIterations( void *ilu_vdata, HYPRE_Int *num_iterations );
-HYPRE_Int hypre_ILUGetFinalRelativeResidualNorm( void *ilu_vdata, HYPRE_Real *res_norm );
+HYPRE_Int hypre_CSRMatrixNormFro( hypre_CSRMatrix *A, HYPRE_Real *norm_io);
+HYPRE_Int hypre_CSRMatrixResNormFro( hypre_CSRMatrix *A, HYPRE_Real *norm_io);
+HYPRE_Int hypre_ParCSRMatrixNormFro( hypre_ParCSRMatrix *A, HYPRE_Real *norm_io);
+HYPRE_Int hypre_ParCSRMatrixResNormFro( hypre_ParCSRMatrix *A, HYPRE_Real *norm_io);
+HYPRE_Int hypre_CSRMatrixTrace( hypre_CSRMatrix *A, HYPRE_Real *trace_io);
+HYPRE_Int hypre_CSRMatrixDropInplace( hypre_CSRMatrix *A, HYPRE_Real droptol,
+                                      HYPRE_Int max_row_nnz );
+HYPRE_Int hypre_ILUCSRMatrixInverseSelfPrecondMRGlobal( hypre_CSRMatrix *matA,
+                                                        hypre_CSRMatrix **M,
+                                                        HYPRE_Real droptol, HYPRE_Real tol,
+                                                        HYPRE_Real eps_tol, HYPRE_Int max_row_nnz,
+                                                        HYPRE_Int max_iter,
+                                                        HYPRE_Int print_level );
+HYPRE_Int hypre_ILUParCSRInverseNSH( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix **M,
+                                     HYPRE_Real *droptol, HYPRE_Real mr_tol,
+                                     HYPRE_Real nsh_tol, HYPRE_Real eps_tol,
+                                     HYPRE_Int mr_max_row_nnz, HYPRE_Int nsh_max_row_nnz,
+                                     HYPRE_Int mr_max_iter, HYPRE_Int nsh_max_iter,
+                                     HYPRE_Int mr_col_version, HYPRE_Int print_level );
+
+/* par_ilu_setup.c */
+HYPRE_Int hypre_ILUSetup( void *ilu_vdata, hypre_ParCSRMatrix *A,
+                          hypre_ParVector *f, hypre_ParVector *u );
+HYPRE_Int hypre_ParILUExtractEBFC( hypre_CSRMatrix *A_diag, HYPRE_Int nLU,
+                                   hypre_CSRMatrix **Bp, hypre_CSRMatrix **Cp,
+                                   hypre_CSRMatrix **Ep, hypre_CSRMatrix **Fp );
+HYPRE_Int hypre_ParILURAPReorder( hypre_ParCSRMatrix *A, HYPRE_Int *perm,
+                                  HYPRE_Int *rqperm, hypre_ParCSRMatrix **A_pq );
+HYPRE_Int hypre_ILUSetupLDUtoCusparse( hypre_ParCSRMatrix *L, HYPRE_Real *D,
+                                       hypre_ParCSRMatrix  *U, hypre_ParCSRMatrix **LDUp );
+HYPRE_Int hypre_ILUSetupRAPMILU0( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix **ALUp,
+                                  HYPRE_Int modified );
+HYPRE_Int hypre_ILUSetupRAPILU0Device( hypre_ParCSRMatrix *A, HYPRE_Int *perm, HYPRE_Int n,
+                                       HYPRE_Int nLU, hypre_ParCSRMatrix **Apermptr,
+                                       hypre_ParCSRMatrix **matSptr, hypre_CSRMatrix **ALUptr,
+                                       hypre_CSRMatrix **BLUptr, hypre_CSRMatrix **CLUptr,
+                                       hypre_CSRMatrix **Eptr, hypre_CSRMatrix **Fptr,
+                                       HYPRE_Int test_opt );
+HYPRE_Int hypre_ILUSetupRAPILU0( hypre_ParCSRMatrix *A, HYPRE_Int *perm, HYPRE_Int n,
+                                 HYPRE_Int nLU, hypre_ParCSRMatrix **Lptr, HYPRE_Real **Dptr,
+                                 hypre_ParCSRMatrix **Uptr, hypre_ParCSRMatrix **mLptr,
+                                 HYPRE_Real **mDptr, hypre_ParCSRMatrix **mUptr,
+                                 HYPRE_Int **u_end );
+HYPRE_Int hypre_ILUSetupILU0( hypre_ParCSRMatrix  *A, HYPRE_Int *perm, HYPRE_Int *qperm,
+                              HYPRE_Int nLU, HYPRE_Int nI, hypre_ParCSRMatrix **Lptr,
+                              HYPRE_Real **Dptr, hypre_ParCSRMatrix **Uptr,
+                              hypre_ParCSRMatrix **Sptr, HYPRE_Int **u_end );
+HYPRE_Int hypre_ILUSetupMILU0( hypre_ParCSRMatrix *A, HYPRE_Int *permp,
+                               HYPRE_Int *qpermp, HYPRE_Int nLU, HYPRE_Int nI,
+                               hypre_ParCSRMatrix **Lptr, HYPRE_Real **Dptr,
+                               hypre_ParCSRMatrix **Uptr, hypre_ParCSRMatrix **Sptr,
+                               HYPRE_Int **u_end, HYPRE_Int modified );
+HYPRE_Int hypre_ILUSetupILUKSymbolic( HYPRE_Int n, HYPRE_Int *A_diag_i, HYPRE_Int *A_diag_j,
+                                      HYPRE_Int lfil, HYPRE_Int *perm, HYPRE_Int *rperm,
+                                      HYPRE_Int *iw, HYPRE_Int nLU, HYPRE_Int *L_diag_i,
+                                      HYPRE_Int *U_diag_i, HYPRE_Int *S_diag_i,
+                                      HYPRE_Int **L_diag_j, HYPRE_Int **U_diag_j,
+                                      HYPRE_Int **S_diag_j, HYPRE_Int **u_end );
+HYPRE_Int hypre_ILUSetupILUK( hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *permp,
+                              HYPRE_Int *qpermp, HYPRE_Int nLU, HYPRE_Int nI,
+                              hypre_ParCSRMatrix **Lptr, HYPRE_Real **Dptr,
+                              hypre_ParCSRMatrix **Uptr, hypre_ParCSRMatrix **Sptr,
+                              HYPRE_Int **u_end );
+HYPRE_Int hypre_ILUSetupILUT( hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Real *tol,
+                              HYPRE_Int *permp, HYPRE_Int *qpermp, HYPRE_Int nLU,
+                              HYPRE_Int nI, hypre_ParCSRMatrix **Lptr, HYPRE_Real **Dptr,
+                              hypre_ParCSRMatrix **Uptr, hypre_ParCSRMatrix **Sptr,
+                              HYPRE_Int **u_end );
+HYPRE_Int hypre_NSHSetup( void *nsh_vdata, hypre_ParCSRMatrix *A,
+                          hypre_ParVector *f, hypre_ParVector *u );
+HYPRE_Int hypre_ILUSetupILU0RAS( hypre_ParCSRMatrix *A, HYPRE_Int *perm,
+                                 HYPRE_Int nLU, hypre_ParCSRMatrix **Lptr,
+                                 HYPRE_Real **Dptr, hypre_ParCSRMatrix **Uptr );
+HYPRE_Int hypre_ILUSetupILUKRASSymbolic( HYPRE_Int n, HYPRE_Int *A_diag_i, HYPRE_Int *A_diag_j,
+                                         HYPRE_Int *A_offd_i, HYPRE_Int *A_offd_j,
+                                         HYPRE_Int *E_i, HYPRE_Int *E_j, HYPRE_Int ext,
+                                         HYPRE_Int lfil, HYPRE_Int *perm, HYPRE_Int *rperm,
+                                         HYPRE_Int *iw, HYPRE_Int nLU, HYPRE_Int *L_diag_i,
+                                         HYPRE_Int *U_diag_i, HYPRE_Int **L_diag_j,
+                                         HYPRE_Int **U_diag_j );
+HYPRE_Int hypre_ILUSetupILUKRAS( hypre_ParCSRMatrix *A, HYPRE_Int lfil, HYPRE_Int *perm,
+                                 HYPRE_Int nLU, hypre_ParCSRMatrix **Lptr,
+                                 HYPRE_Real **Dptr, hypre_ParCSRMatrix **Uptr );
+HYPRE_Int hypre_ILUSetupILUTRAS( hypre_ParCSRMatrix *A, HYPRE_Int lfil,
+                                 HYPRE_Real *tol, HYPRE_Int *perm, HYPRE_Int nLU,
+                                 hypre_ParCSRMatrix **Lptr, HYPRE_Real **Dptr,
+                                 hypre_ParCSRMatrix **Uptr );
+
+/* par_ilu_setup_device.c */
+#if defined(HYPRE_USING_GPU)
+HYPRE_Int hypre_ILUSetupDevice(hypre_ParILUData *ilu_data, hypre_ParCSRMatrix *A,
+                               HYPRE_Int *perm_data, HYPRE_Int *qperm_data,
+                               HYPRE_Int n, HYPRE_Int nLU, hypre_CSRMatrix **BLUptr,
+                               hypre_ParCSRMatrix **matSptr, hypre_CSRMatrix **Eptr,
+                               hypre_CSRMatrix **Fptr);
+HYPRE_Int hypre_ILUSetupIterativeILU0Device( hypre_CSRMatrix *A, HYPRE_Int type,
+                                             HYPRE_Int option, HYPRE_Int max_iter,
+                                             HYPRE_Real tolerance, HYPRE_Int *num_iter_ptr,
+                                             HYPRE_Real **history_ptr );
+#endif
+
+/* par_ilu_solve.c */
+HYPRE_Int hypre_ILUSolve( void *ilu_vdata, hypre_ParCSRMatrix *A,
+                          hypre_ParVector *f, hypre_ParVector *u );
+HYPRE_Int hypre_ILUSolveSchurGMRES( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                    hypre_ParVector *u, HYPRE_Int *perm,
+                                    HYPRE_Int *qperm, HYPRE_Int nLU,
+                                    hypre_ParCSRMatrix *L, HYPRE_Real *D,
+                                    hypre_ParCSRMatrix *U, hypre_ParCSRMatrix *S,
+                                    hypre_ParVector *ftemp, hypre_ParVector *utemp,
+                                    HYPRE_Solver schur_solver, HYPRE_Solver schur_precond,
+                                    hypre_ParVector *rhs, hypre_ParVector *x, HYPRE_Int *u_end );
+HYPRE_Int hypre_ILUSolveSchurNSH( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                  hypre_ParVector *u, HYPRE_Int *perm, HYPRE_Int nLU,
+                                  hypre_ParCSRMatrix *L, HYPRE_Real *D,
+                                  hypre_ParCSRMatrix *U, hypre_ParCSRMatrix *S,
+                                  hypre_ParVector *ftemp, hypre_ParVector *utemp,
+                                  HYPRE_Solver schur_solver, hypre_ParVector *rhs,
+                                  hypre_ParVector *x, HYPRE_Int *u_end );
+HYPRE_Int hypre_ILUSolveLU( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                            hypre_ParVector *u, HYPRE_Int *perm, HYPRE_Int nLU,
+                            hypre_ParCSRMatrix *L, HYPRE_Real *D, hypre_ParCSRMatrix *U,
+                            hypre_ParVector *ftemp, hypre_ParVector *utemp );
+HYPRE_Int hypre_ILUSolveLUIter( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                hypre_ParVector *u, HYPRE_Int *perm, HYPRE_Int nLU,
+                                hypre_ParCSRMatrix *L, HYPRE_Real *D, hypre_ParCSRMatrix *U,
+                                hypre_ParVector *ftemp, hypre_ParVector *utemp,
+                                HYPRE_Int lower_jacobi_iters, HYPRE_Int upper_jacobi_iters );
+HYPRE_Int hypre_ILUSolveLURAS( hypre_ParCSRMatrix *A, hypre_ParVector *f, hypre_ParVector *u,
+                               HYPRE_Int *perm, hypre_ParCSRMatrix *L, HYPRE_Real *D,
+                               hypre_ParCSRMatrix *U, hypre_ParVector *ftemp,
+                               hypre_ParVector *utemp, HYPRE_Real *fext, HYPRE_Real *uext );
+HYPRE_Int hypre_ILUSolveRAPGMRESHost( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                      hypre_ParVector *u, HYPRE_Int *perm, HYPRE_Int nLU,
+                                      hypre_ParCSRMatrix *L, HYPRE_Real *D, hypre_ParCSRMatrix *U,
+                                      hypre_ParCSRMatrix *mL, HYPRE_Real *mD,
+                                      hypre_ParCSRMatrix *mU, hypre_ParVector *ftemp,
+                                      hypre_ParVector *utemp, hypre_ParVector *xtemp,
+                                      hypre_ParVector *ytemp, HYPRE_Solver schur_solver,
+                                      HYPRE_Solver schur_precond, hypre_ParVector *rhs,
+                                      hypre_ParVector *x, HYPRE_Int *u_end );
+HYPRE_Int hypre_NSHSolve( void *nsh_vdata, hypre_ParCSRMatrix *A,
+                          hypre_ParVector *f, hypre_ParVector *u );
+HYPRE_Int hypre_NSHSolveInverse( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                 hypre_ParVector *u, hypre_ParCSRMatrix *M,
+                                 hypre_ParVector *ftemp, hypre_ParVector *utemp );
+
+/* par_ilu_solve_device.c */
+#if defined(HYPRE_USING_GPU)
+HYPRE_Int hypre_ILUSolveLUDevice( hypre_ParCSRMatrix *A, hypre_CSRMatrix *matLU_d,
+                                  hypre_ParVector *f, hypre_ParVector *u,
+                                  HYPRE_Int *perm, hypre_ParVector *ftemp,
+                                  hypre_ParVector *utemp );
+HYPRE_Int hypre_ILUApplyLowerJacIterDevice( hypre_CSRMatrix *A, hypre_Vector *input,
+                                            hypre_Vector *work, hypre_Vector *output,
+                                            HYPRE_Int lower_jacobi_iters );
+HYPRE_Int hypre_ILUApplyUpperJacIterDevice( hypre_CSRMatrix *A, hypre_Vector *input,
+                                            hypre_Vector *work, hypre_Vector *output,
+                                            hypre_Vector *diag, HYPRE_Int upper_jacobi_iters );
+HYPRE_Int hypre_ILUApplyLowerUpperJacIterDevice( hypre_CSRMatrix *A, hypre_Vector *work1,
+                                                 hypre_Vector *work2, hypre_Vector *inout,
+                                                 hypre_Vector *diag, HYPRE_Int lower_jacobi_iters,
+                                                 HYPRE_Int upper_jacobi_iters );
+HYPRE_Int hypre_ILUSolveLUIterDevice( hypre_ParCSRMatrix *A, hypre_CSRMatrix *matLU,
+                                      hypre_ParVector *f, hypre_ParVector *u,
+                                      HYPRE_Int *perm, hypre_ParVector *ftemp,
+                                      hypre_ParVector *utemp, hypre_ParVector *xtemp,
+                                      hypre_Vector **diag_ptr, HYPRE_Int lower_jacobi_iters,
+                                      HYPRE_Int upper_jacobi_iters );
+HYPRE_Int hypre_ParILUSchurGMRESMatvecDevice( void *matvec_data, HYPRE_Complex alpha,
+                                              void *ilu_vdata, void *x,
+                                              HYPRE_Complex beta, void *y );
+HYPRE_Int hypre_ILUSolveSchurGMRESDevice( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                          hypre_ParVector *u, HYPRE_Int *perm,
+                                          HYPRE_Int nLU, hypre_ParCSRMatrix *S,
+                                          hypre_ParVector *ftemp, hypre_ParVector *utemp,
+                                          HYPRE_Solver schur_solver, HYPRE_Solver schur_precond,
+                                          hypre_ParVector *rhs, hypre_ParVector *x,
+                                          HYPRE_Int *u_end, hypre_CSRMatrix *matBLU_d,
+                                          hypre_CSRMatrix *matE_d, hypre_CSRMatrix *matF_d );
+HYPRE_Int hypre_ILUSolveSchurGMRESJacIterDevice( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                                 hypre_ParVector *u, HYPRE_Int *perm,
+                                                 HYPRE_Int nLU, hypre_ParCSRMatrix *S,
+                                                 hypre_ParVector *ftemp, hypre_ParVector *utemp,
+                                                 HYPRE_Solver schur_solver,
+                                                 HYPRE_Solver schur_precond,
+                                                 hypre_ParVector *rhs, hypre_ParVector *x,
+                                                 HYPRE_Int *u_end, hypre_CSRMatrix *matBLU_d,
+                                                 hypre_CSRMatrix *matE_d, hypre_CSRMatrix *matF_d,
+                                                 hypre_ParVector *ztemp,
+                                                 hypre_Vector **Adiag_diag,
+                                                 hypre_Vector **Sdiag_diag,
+                                                 HYPRE_Int lower_jacobi_iters,
+                                                 HYPRE_Int upper_jacobi_iters );
+HYPRE_Int hypre_ParILUSchurGMRESMatvecJacIterDevice( void *matvec_data, HYPRE_Complex alpha,
+                                                     void *ilu_vdata, void *x, HYPRE_Complex beta,
+                                                     void *y );
+HYPRE_Int hypre_ILUSolveRAPGMRESDevice( hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                                        hypre_ParVector *u, HYPRE_Int *perm, HYPRE_Int nLU,
+                                        hypre_ParCSRMatrix *S, hypre_ParVector *ftemp,
+                                        hypre_ParVector *utemp, hypre_ParVector *xtemp,
+                                        hypre_ParVector *ytemp, HYPRE_Solver schur_solver,
+                                        HYPRE_Solver schur_precond, hypre_ParVector *rhs,
+                                        hypre_ParVector *x, HYPRE_Int *u_end,
+                                        hypre_ParCSRMatrix *Aperm, hypre_CSRMatrix *matALU_d,
+                                        hypre_CSRMatrix *matBLU_d, hypre_CSRMatrix *matE_d,
+                                        hypre_CSRMatrix *matF_d, HYPRE_Int test_opt );
+#endif
 
 /* par_amgdd.c */
 void *hypre_BoomerAMGDDCreate ( void );
 HYPRE_Int hypre_BoomerAMGDDDestroy ( void *data );
-HYPRE_Int hypre_BoomerAMGDDSetStartLevel ( void *data , HYPRE_Int start_level );
-HYPRE_Int hypre_BoomerAMGDDGetStartLevel ( void *data , HYPRE_Int *start_level );
-HYPRE_Int hypre_BoomerAMGDDSetFACNumCycles ( void *data , HYPRE_Int fac_num_cycles );
-HYPRE_Int hypre_BoomerAMGDDGetFACNumCycles ( void *data , HYPRE_Int *fac_num_cycles );
-HYPRE_Int hypre_BoomerAMGDDSetFACCycleType ( void *data , HYPRE_Int fac_cycle_type );
-HYPRE_Int hypre_BoomerAMGDDGetFACCycleType ( void *data , HYPRE_Int *fac_cycle_type );
-HYPRE_Int hypre_BoomerAMGDDSetFACNumRelax ( void *data , HYPRE_Int fac_num_relax );
-HYPRE_Int hypre_BoomerAMGDDGetFACNumRelax ( void *data , HYPRE_Int *fac_num_relax );
-HYPRE_Int hypre_BoomerAMGDDSetFACRelaxType ( void *data , HYPRE_Int fac_relax_type );
-HYPRE_Int hypre_BoomerAMGDDGetFACRelaxType ( void *data , HYPRE_Int *fac_relax_type );
-HYPRE_Int hypre_BoomerAMGDDSetFACRelaxWeight ( void *data , HYPRE_Real fac_relax_weight );
-HYPRE_Int hypre_BoomerAMGDDGetFACRelaxWeight ( void *data , HYPRE_Real *fac_relax_weight );
-HYPRE_Int hypre_BoomerAMGDDSetPadding ( void *data , HYPRE_Int padding );
-HYPRE_Int hypre_BoomerAMGDDGetPadding ( void *data , HYPRE_Int *padding );
-HYPRE_Int hypre_BoomerAMGDDSetNumGhostLayers ( void *data , HYPRE_Int num_ghost_layers );
-HYPRE_Int hypre_BoomerAMGDDGetNumGhostLayers ( void *data , HYPRE_Int *num_ghost_layers );
-HYPRE_Int hypre_BoomerAMGDDSetUserFACRelaxation( void *data , HYPRE_Int (*userFACRelaxation)( void *amgdd_vdata, HYPRE_Int level, HYPRE_Int cycle_param ) );
-HYPRE_Int hypre_BoomerAMGDDGetAMG ( void *data , void **amg_solver );
+HYPRE_Int hypre_BoomerAMGDDSetStartLevel ( void *data, HYPRE_Int start_level );
+HYPRE_Int hypre_BoomerAMGDDGetStartLevel ( void *data, HYPRE_Int *start_level );
+HYPRE_Int hypre_BoomerAMGDDSetFACNumCycles ( void *data, HYPRE_Int fac_num_cycles );
+HYPRE_Int hypre_BoomerAMGDDGetFACNumCycles ( void *data, HYPRE_Int *fac_num_cycles );
+HYPRE_Int hypre_BoomerAMGDDSetFACCycleType ( void *data, HYPRE_Int fac_cycle_type );
+HYPRE_Int hypre_BoomerAMGDDGetFACCycleType ( void *data, HYPRE_Int *fac_cycle_type );
+HYPRE_Int hypre_BoomerAMGDDSetFACNumRelax ( void *data, HYPRE_Int fac_num_relax );
+HYPRE_Int hypre_BoomerAMGDDGetFACNumRelax ( void *data, HYPRE_Int *fac_num_relax );
+HYPRE_Int hypre_BoomerAMGDDSetFACRelaxType ( void *data, HYPRE_Int fac_relax_type );
+HYPRE_Int hypre_BoomerAMGDDGetFACRelaxType ( void *data, HYPRE_Int *fac_relax_type );
+HYPRE_Int hypre_BoomerAMGDDSetFACRelaxWeight ( void *data, HYPRE_Real fac_relax_weight );
+HYPRE_Int hypre_BoomerAMGDDGetFACRelaxWeight ( void *data, HYPRE_Real *fac_relax_weight );
+HYPRE_Int hypre_BoomerAMGDDSetPadding ( void *data, HYPRE_Int padding );
+HYPRE_Int hypre_BoomerAMGDDGetPadding ( void *data, HYPRE_Int *padding );
+HYPRE_Int hypre_BoomerAMGDDSetNumGhostLayers ( void *data, HYPRE_Int num_ghost_layers );
+HYPRE_Int hypre_BoomerAMGDDGetNumGhostLayers ( void *data, HYPRE_Int *num_ghost_layers );
+HYPRE_Int hypre_BoomerAMGDDSetUserFACRelaxation( void *data,
+                                                 HYPRE_Int (*userFACRelaxation)( void *amgdd_vdata, HYPRE_Int level, HYPRE_Int cycle_param ) );
+HYPRE_Int hypre_BoomerAMGDDGetAMG ( void *data, void **amg_solver );
 
 /* par_amgdd_solve.c */
-HYPRE_Int hypre_BoomerAMGDDSolve ( void *solver, hypre_ParCSRMatrix *A, hypre_ParVector *b,hypre_ParVector *x );
+HYPRE_Int hypre_BoomerAMGDDSolve ( void *solver, hypre_ParCSRMatrix *A, hypre_ParVector *b,
+                                   hypre_ParVector *x );
 HYPRE_Int hypre_BoomerAMGDD_Cycle ( hypre_ParAMGDDData *amgdd_data );
 HYPRE_Int hypre_BoomerAMGDD_ResidualCommunication ( hypre_ParAMGDDData *amgdd_data );
-HYPRE_Complex* hypre_BoomerAMGDD_PackResidualBuffer ( hypre_AMGDDCompGrid **compGrid, hypre_AMGDDCommPkg *compGridCommPkg, HYPRE_Int current_level, HYPRE_Int proc );
-HYPRE_Int hypre_BoomerAMGDD_UnpackResidualBuffer ( HYPRE_Complex *buffer, hypre_AMGDDCompGrid **compGrid, hypre_AMGDDCommPkg *compGridCommPkg, HYPRE_Int current_level, HYPRE_Int proc );
+HYPRE_Complex* hypre_BoomerAMGDD_PackResidualBuffer ( hypre_AMGDDCompGrid **compGrid,
+                                                      hypre_AMGDDCommPkg *compGridCommPkg, HYPRE_Int current_level, HYPRE_Int proc );
+HYPRE_Int hypre_BoomerAMGDD_UnpackResidualBuffer ( HYPRE_Complex *buffer,
+                                                   hypre_AMGDDCompGrid **compGrid, hypre_AMGDDCommPkg *compGridCommPkg, HYPRE_Int current_level,
+                                                   HYPRE_Int proc );
 
 /* par_amgdd_setup.c */
-HYPRE_Int hypre_BoomerAMGDDSetup ( void *amgdd_vdata, hypre_ParCSRMatrix *A, hypre_ParVector *b, hypre_ParVector *x );
+HYPRE_Int hypre_BoomerAMGDDSetup ( void *amgdd_vdata, hypre_ParCSRMatrix *A, hypre_ParVector *b,
+                                   hypre_ParVector *x );
 
 /* par_amgdd_fac_cycle.c */
 HYPRE_Int hypre_BoomerAMGDD_FAC ( void *amgdd_vdata, HYPRE_Int first_iteration );
-HYPRE_Int hypre_BoomerAMGDD_FAC_Cycle ( void *amgdd_vdata, HYPRE_Int level, HYPRE_Int cycle_type, HYPRE_Int first_iteration );
+HYPRE_Int hypre_BoomerAMGDD_FAC_Cycle ( void *amgdd_vdata, HYPRE_Int level, HYPRE_Int cycle_type,
+                                        HYPRE_Int first_iteration );
 HYPRE_Int hypre_BoomerAMGDD_FAC_FCycle ( void *amgdd_vdata, HYPRE_Int first_iteration );
-HYPRE_Int hypre_BoomerAMGDD_FAC_Interpolate ( hypre_AMGDDCompGrid *compGrid_f, hypre_AMGDDCompGrid *compGrid_c );
-HYPRE_Int hypre_BoomerAMGDD_FAC_Restrict ( hypre_AMGDDCompGrid *compGrid_f, hypre_AMGDDCompGrid *compGrid_c, HYPRE_Int first_iteration );
+HYPRE_Int hypre_BoomerAMGDD_FAC_Interpolate ( hypre_AMGDDCompGrid *compGrid_f,
+                                              hypre_AMGDDCompGrid *compGrid_c );
+HYPRE_Int hypre_BoomerAMGDD_FAC_Restrict ( hypre_AMGDDCompGrid *compGrid_f,
+                                           hypre_AMGDDCompGrid *compGrid_c, HYPRE_Int first_iteration );
 HYPRE_Int hypre_BoomerAMGDD_FAC_Relax ( void *amgdd_vdata, HYPRE_Int level, HYPRE_Int cycle_param );
-HYPRE_Int hypre_BoomerAMGDD_FAC_CFL1JacobiHost ( void *amgdd_vdata, HYPRE_Int level, HYPRE_Int relax_set );
-HYPRE_Int hypre_BoomerAMGDD_FAC_Jacobi ( void *amgdd_vdata, HYPRE_Int level, HYPRE_Int cycle_param );
+HYPRE_Int hypre_BoomerAMGDD_FAC_CFL1JacobiHost ( void *amgdd_vdata, HYPRE_Int level,
+                                                 HYPRE_Int relax_set );
+HYPRE_Int hypre_BoomerAMGDD_FAC_Jacobi ( void *amgdd_vdata, HYPRE_Int level,
+                                         HYPRE_Int cycle_param );
 HYPRE_Int hypre_BoomerAMGDD_FAC_JacobiHost ( void *amgdd_vdata, HYPRE_Int level );
-HYPRE_Int hypre_BoomerAMGDD_FAC_GaussSeidel ( void *amgdd_vdata, HYPRE_Int level, HYPRE_Int cycle_param );
-HYPRE_Int hypre_BoomerAMGDD_FAC_CFL1Jacobi ( void *amgdd_vdata, HYPRE_Int level, HYPRE_Int cycle_param );
-HYPRE_Int hypre_BoomerAMGDD_FAC_OrderedGaussSeidel ( void *amgdd_vdata, HYPRE_Int level, HYPRE_Int cycle_param );
+HYPRE_Int hypre_BoomerAMGDD_FAC_GaussSeidel ( void *amgdd_vdata, HYPRE_Int level,
+                                              HYPRE_Int cycle_param );
+HYPRE_Int hypre_BoomerAMGDD_FAC_CFL1Jacobi ( void *amgdd_vdata, HYPRE_Int level,
+                                             HYPRE_Int cycle_param );
+HYPRE_Int hypre_BoomerAMGDD_FAC_OrderedGaussSeidel ( void *amgdd_vdata, HYPRE_Int level,
+                                                     HYPRE_Int cycle_param );
 
 /* par_amgdd_fac_cycles_device.c */
 HYPRE_Int hypre_BoomerAMGDD_FAC_JacobiDevice ( void *amgdd_vdata, HYPRE_Int level );
-HYPRE_Int hypre_BoomerAMGDD_FAC_CFL1JacobiDevice ( void *amgdd_vdata, HYPRE_Int level, HYPRE_Int relax_set );
+HYPRE_Int hypre_BoomerAMGDD_FAC_CFL1JacobiDevice ( void *amgdd_vdata, HYPRE_Int level,
+                                                   HYPRE_Int relax_set );
 
 /* par_amgdd_comp_grid.c */
-hypre_AMGDDCompGridMatrix* hypre_AMGDDCompGridMatrixCreate();
+hypre_AMGDDCompGridMatrix* hypre_AMGDDCompGridMatrixCreate( void );
 HYPRE_Int hypre_AMGDDCompGridMatrixDestroy ( hypre_AMGDDCompGridMatrix *matrix );
-HYPRE_Int hypre_AMGDDCompGridMatvec ( HYPRE_Complex alpha, hypre_AMGDDCompGridMatrix *A, hypre_AMGDDCompGridVector *x, HYPRE_Complex beta, hypre_AMGDDCompGridVector *y );
-HYPRE_Int hypre_AMGDDCompGridRealMatvec ( HYPRE_Complex alpha, hypre_AMGDDCompGridMatrix *A, hypre_AMGDDCompGridVector *x, HYPRE_Complex beta, hypre_AMGDDCompGridVector *y );
-hypre_AMGDDCompGridVector* hypre_AMGDDCompGridVectorCreate();
-HYPRE_Int hypre_AMGDDCompGridVectorInitialize ( hypre_AMGDDCompGridVector *vector, HYPRE_Int num_owned, HYPRE_Int num_nonowned, HYPRE_Int num_real );
+HYPRE_Int hypre_AMGDDCompGridMatvec ( HYPRE_Complex alpha, hypre_AMGDDCompGridMatrix *A,
+                                      hypre_AMGDDCompGridVector *x, HYPRE_Complex beta, hypre_AMGDDCompGridVector *y );
+HYPRE_Int hypre_AMGDDCompGridRealMatvec ( HYPRE_Complex alpha, hypre_AMGDDCompGridMatrix *A,
+                                          hypre_AMGDDCompGridVector *x, HYPRE_Complex beta, hypre_AMGDDCompGridVector *y );
+hypre_AMGDDCompGridVector* hypre_AMGDDCompGridVectorCreate( void );
+HYPRE_Int hypre_AMGDDCompGridVectorInitialize ( hypre_AMGDDCompGridVector *vector,
+                                                HYPRE_Int num_owned, HYPRE_Int num_nonowned, HYPRE_Int num_real );
 HYPRE_Int hypre_AMGDDCompGridVectorDestroy ( hypre_AMGDDCompGridVector *vector );
-HYPRE_Real hypre_AMGDDCompGridVectorInnerProd ( hypre_AMGDDCompGridVector *x, hypre_AMGDDCompGridVector *y );
-HYPRE_Real hypre_AMGDDCompGridVectorRealInnerProd ( hypre_AMGDDCompGridVector *x, hypre_AMGDDCompGridVector *y );
+HYPRE_Real hypre_AMGDDCompGridVectorInnerProd ( hypre_AMGDDCompGridVector *x,
+                                                hypre_AMGDDCompGridVector *y );
+HYPRE_Real hypre_AMGDDCompGridVectorRealInnerProd ( hypre_AMGDDCompGridVector *x,
+                                                    hypre_AMGDDCompGridVector *y );
 HYPRE_Int hypre_AMGDDCompGridVectorScale ( HYPRE_Complex alpha, hypre_AMGDDCompGridVector *x );
 HYPRE_Int hypre_AMGDDCompGridVectorRealScale ( HYPRE_Complex alpha, hypre_AMGDDCompGridVector *x );
-HYPRE_Int hypre_AMGDDCompGridVectorAxpy ( HYPRE_Complex alpha, hypre_AMGDDCompGridVector *x, hypre_AMGDDCompGridVector *y );
-HYPRE_Int hypre_AMGDDCompGridVectorRealAxpy ( HYPRE_Complex alpha, hypre_AMGDDCompGridVector *x, hypre_AMGDDCompGridVector *y );
-HYPRE_Int hypre_AMGDDCompGridVectorSetConstantValues ( hypre_AMGDDCompGridVector *vector, HYPRE_Complex value );
-HYPRE_Int hypre_AMGDDCompGridVectorRealSetConstantValues ( hypre_AMGDDCompGridVector *vector, HYPRE_Complex value );
-HYPRE_Int hypre_AMGDDCompGridVectorCopy ( hypre_AMGDDCompGridVector *x, hypre_AMGDDCompGridVector *y );
-HYPRE_Int hypre_AMGDDCompGridVectorRealCopy ( hypre_AMGDDCompGridVector *x, hypre_AMGDDCompGridVector *y );
-hypre_AMGDDCompGrid *hypre_AMGDDCompGridCreate();
+HYPRE_Int hypre_AMGDDCompGridVectorAxpy ( HYPRE_Complex alpha, hypre_AMGDDCompGridVector *x,
+                                          hypre_AMGDDCompGridVector *y );
+HYPRE_Int hypre_AMGDDCompGridVectorRealAxpy ( HYPRE_Complex alpha, hypre_AMGDDCompGridVector *x,
+                                              hypre_AMGDDCompGridVector *y );
+HYPRE_Int hypre_AMGDDCompGridVectorSetConstantValues ( hypre_AMGDDCompGridVector *vector,
+                                                       HYPRE_Complex value );
+HYPRE_Int hypre_AMGDDCompGridVectorRealSetConstantValues ( hypre_AMGDDCompGridVector *vector,
+                                                           HYPRE_Complex value );
+HYPRE_Int hypre_AMGDDCompGridVectorCopy ( hypre_AMGDDCompGridVector *x,
+                                          hypre_AMGDDCompGridVector *y );
+HYPRE_Int hypre_AMGDDCompGridVectorRealCopy ( hypre_AMGDDCompGridVector *x,
+                                              hypre_AMGDDCompGridVector *y );
+hypre_AMGDDCompGrid *hypre_AMGDDCompGridCreate( void );
 HYPRE_Int hypre_AMGDDCompGridDestroy ( hypre_AMGDDCompGrid *compGrid );
-HYPRE_Int hypre_AMGDDCompGridInitialize ( hypre_ParAMGDDData *amgdd_data, HYPRE_Int padding, HYPRE_Int level );
+HYPRE_Int hypre_AMGDDCompGridInitialize ( hypre_ParAMGDDData *amgdd_data, HYPRE_Int padding,
+                                          HYPRE_Int level );
 HYPRE_Int hypre_AMGDDCompGridSetupRelax ( hypre_ParAMGDDData *amgdd_data );
 HYPRE_Int hypre_AMGDDCompGridFinalize ( hypre_ParAMGDDData *amgdd_data );
-HYPRE_Int hypre_AMGDDCompGridSetupRealDofMarker ( hypre_AMGDDCompGrid **compGrid, HYPRE_Int num_levels, HYPRE_Int num_ghost_layers );
-HYPRE_Int hypre_AMGDDCompGridResize ( hypre_AMGDDCompGrid *compGrid, HYPRE_Int new_size, HYPRE_Int need_coarse_info );
-HYPRE_Int hypre_AMGDDCompGridSetupLocalIndices ( hypre_AMGDDCompGrid **compGrid, HYPRE_Int *num_added_nodes, HYPRE_Int ****recv_map, HYPRE_Int num_recv_procs, HYPRE_Int **A_tmp_info, HYPRE_Int start_level, HYPRE_Int num_levels );
+HYPRE_Int hypre_AMGDDCompGridSetupRealDofMarker ( hypre_AMGDDCompGrid **compGrid,
+                                                  HYPRE_Int num_levels, HYPRE_Int num_ghost_layers );
+HYPRE_Int hypre_AMGDDCompGridResize ( hypre_AMGDDCompGrid *compGrid, HYPRE_Int new_size,
+                                      HYPRE_Int need_coarse_info );
+HYPRE_Int hypre_AMGDDCompGridSetupLocalIndices ( hypre_AMGDDCompGrid **compGrid,
+                                                 HYPRE_Int *num_added_nodes, HYPRE_Int ****recv_map, HYPRE_Int num_recv_procs,
+                                                 HYPRE_Int **A_tmp_info, HYPRE_Int start_level, HYPRE_Int num_levels );
 HYPRE_Int hypre_AMGDDCompGridSetupLocalIndicesP ( hypre_ParAMGDDData *amgdd_data );
 hypre_AMGDDCommPkg *hypre_AMGDDCommPkgCreate ( HYPRE_Int num_levels );
-HYPRE_Int hypre_AMGDDCommPkgSendLevelDestroy ( hypre_AMGDDCommPkg *amgddCommPkg, HYPRE_Int level, HYPRE_Int proc );
-HYPRE_Int hypre_AMGDDCommPkgRecvLevelDestroy ( hypre_AMGDDCommPkg *amgddCommPkg, HYPRE_Int level, HYPRE_Int proc );
+HYPRE_Int hypre_AMGDDCommPkgSendLevelDestroy ( hypre_AMGDDCommPkg *amgddCommPkg, HYPRE_Int level,
+                                               HYPRE_Int proc );
+HYPRE_Int hypre_AMGDDCommPkgRecvLevelDestroy ( hypre_AMGDDCommPkg *amgddCommPkg, HYPRE_Int level,
+                                               HYPRE_Int proc );
 HYPRE_Int hypre_AMGDDCommPkgDestroy ( hypre_AMGDDCommPkg *compGridCommPkg );
-HYPRE_Int hypre_AMGDDCommPkgFinalize ( hypre_ParAMGData* amg_data, hypre_AMGDDCommPkg *compGridCommPkg, hypre_AMGDDCompGrid **compGrid );
+HYPRE_Int hypre_AMGDDCommPkgFinalize ( hypre_ParAMGData* amg_data,
+                                       hypre_AMGDDCommPkg *compGridCommPkg, hypre_AMGDDCompGrid **compGrid );
 
 /* par_amgdd_helpers.c */
-HYPRE_Int hypre_BoomerAMGDD_SetupNearestProcessorNeighbors ( hypre_ParCSRMatrix *A, hypre_AMGDDCommPkg *compGridCommPkg, HYPRE_Int level, HYPRE_Int *padding, HYPRE_Int num_ghost_layers );
-HYPRE_Int hypre_BoomerAMGDD_RecursivelyBuildPsiComposite ( HYPRE_Int node, HYPRE_Int m, hypre_AMGDDCompGrid *compGrid, HYPRE_Int *add_flag, HYPRE_Int use_sort );
-HYPRE_Int hypre_BoomerAMGDD_MarkCoarse ( HYPRE_Int *list, HYPRE_Int *marker, HYPRE_Int *owned_coarse_indices, HYPRE_Int *nonowned_coarse_indices, HYPRE_Int *sort_map, HYPRE_Int num_owned, HYPRE_Int total_num_nodes, HYPRE_Int num_owned_coarse, HYPRE_Int list_size, HYPRE_Int dist, HYPRE_Int use_sort, HYPRE_Int *nodes_to_add );
-HYPRE_Int hypre_BoomerAMGDD_UnpackRecvBuffer ( hypre_ParAMGDDData *amgdd_data, HYPRE_Int *recv_buffer, HYPRE_Int **A_tmp_info, HYPRE_Int *recv_map_send_buffer_size, HYPRE_Int *nodes_added_on_level, HYPRE_Int current_level, HYPRE_Int buffer_number );
-HYPRE_Int* hypre_BoomerAMGDD_PackSendBuffer ( hypre_ParAMGDDData *amgdd_data, HYPRE_Int proc, HYPRE_Int current_level, HYPRE_Int *padding, HYPRE_Int *send_flag_buffer_size );
-HYPRE_Int hypre_BoomerAMGDD_PackRecvMapSendBuffer ( HYPRE_Int *recv_map_send_buffer, HYPRE_Int **recv_red_marker, HYPRE_Int *num_recv_nodes, HYPRE_Int *recv_buffer_size, HYPRE_Int current_level, HYPRE_Int num_levels );
-HYPRE_Int hypre_BoomerAMGDD_UnpackSendFlagBuffer ( hypre_AMGDDCompGrid **compGrid, HYPRE_Int *send_flag_buffer, HYPRE_Int **send_flag, HYPRE_Int *num_send_nodes, HYPRE_Int *send_buffer_size, HYPRE_Int current_level, HYPRE_Int num_levels );
+HYPRE_Int hypre_BoomerAMGDD_SetupNearestProcessorNeighbors ( hypre_ParCSRMatrix *A,
+                                                             hypre_AMGDDCommPkg *compGridCommPkg, HYPRE_Int level, HYPRE_Int *padding,
+                                                             HYPRE_Int num_ghost_layers );
+HYPRE_Int hypre_BoomerAMGDD_RecursivelyBuildPsiComposite ( HYPRE_Int node, HYPRE_Int m,
+                                                           hypre_AMGDDCompGrid *compGrid, HYPRE_Int *add_flag, HYPRE_Int use_sort );
+HYPRE_Int hypre_BoomerAMGDD_MarkCoarse ( HYPRE_Int *list, HYPRE_Int *marker,
+                                         HYPRE_Int *owned_coarse_indices, HYPRE_Int *nonowned_coarse_indices, HYPRE_Int *sort_map,
+                                         HYPRE_Int num_owned, HYPRE_Int total_num_nodes, HYPRE_Int num_owned_coarse, HYPRE_Int list_size,
+                                         HYPRE_Int dist, HYPRE_Int use_sort, HYPRE_Int *nodes_to_add );
+HYPRE_Int hypre_BoomerAMGDD_UnpackRecvBuffer ( hypre_ParAMGDDData *amgdd_data,
+                                               HYPRE_Int *recv_buffer, HYPRE_Int **A_tmp_info, HYPRE_Int *recv_map_send_buffer_size,
+                                               HYPRE_Int *nodes_added_on_level, HYPRE_Int current_level, HYPRE_Int buffer_number );
+HYPRE_Int* hypre_BoomerAMGDD_PackSendBuffer ( hypre_ParAMGDDData *amgdd_data, HYPRE_Int proc,
+                                              HYPRE_Int current_level, HYPRE_Int *padding, HYPRE_Int *send_flag_buffer_size );
+HYPRE_Int hypre_BoomerAMGDD_PackRecvMapSendBuffer ( HYPRE_Int *recv_map_send_buffer,
+                                                    HYPRE_Int **recv_red_marker, HYPRE_Int *num_recv_nodes, HYPRE_Int *recv_buffer_size,
+                                                    HYPRE_Int current_level, HYPRE_Int num_levels );
+HYPRE_Int hypre_BoomerAMGDD_UnpackSendFlagBuffer ( hypre_AMGDDCompGrid **compGrid,
+                                                   HYPRE_Int *send_flag_buffer, HYPRE_Int **send_flag, HYPRE_Int *num_send_nodes,
+                                                   HYPRE_Int *send_buffer_size, HYPRE_Int current_level, HYPRE_Int num_levels );
 HYPRE_Int hypre_BoomerAMGDD_CommunicateRemainingMatrixInfo ( hypre_ParAMGDDData* amgdd_data );
-HYPRE_Int hypre_BoomerAMGDD_FixUpRecvMaps ( hypre_AMGDDCompGrid **compGrid, hypre_AMGDDCommPkg *compGridCommPkg, HYPRE_Int start_level, HYPRE_Int num_levels );
+HYPRE_Int hypre_BoomerAMGDD_FixUpRecvMaps ( hypre_AMGDDCompGrid **compGrid,
+                                            hypre_AMGDDCommPkg *compGridCommPkg, HYPRE_Int start_level, HYPRE_Int num_levels );
+
+/* par_fsai.c */
+void* hypre_FSAICreate( void );
+HYPRE_Int hypre_FSAIDestroy ( void *data );
+HYPRE_Int hypre_FSAISetAlgoType ( void *data, HYPRE_Int algo_type );
+HYPRE_Int hypre_FSAISetLocalSolveType ( void *data, HYPRE_Int local_solve_type );
+HYPRE_Int hypre_FSAISetMaxSteps ( void *data, HYPRE_Int max_steps );
+HYPRE_Int hypre_FSAISetMaxStepSize ( void *data, HYPRE_Int max_step_size );
+HYPRE_Int hypre_FSAISetMaxNnzRow ( void *data, HYPRE_Int max_nnz_row );
+HYPRE_Int hypre_FSAISetNumLevels ( void *data, HYPRE_Int num_levels );
+HYPRE_Int hypre_FSAISetThreshold ( void *data, HYPRE_Real threshold );
+HYPRE_Int hypre_FSAISetKapTolerance ( void *data, HYPRE_Real kap_tolerance );
+HYPRE_Int hypre_FSAISetMaxIterations ( void *data, HYPRE_Int max_iterations );
+HYPRE_Int hypre_FSAISetEigMaxIters ( void *data, HYPRE_Int eig_max_iters );
+HYPRE_Int hypre_FSAISetZeroGuess ( void *data, HYPRE_Int zero_guess );
+HYPRE_Int hypre_FSAISetTolerance ( void *data, HYPRE_Real tolerance );
+HYPRE_Int hypre_FSAISetOmega ( void *data, HYPRE_Real omega );
+HYPRE_Int hypre_FSAISetLogging ( void *data, HYPRE_Int logging );
+HYPRE_Int hypre_FSAISetNumIterations ( void *data, HYPRE_Int num_iterations );
+HYPRE_Int hypre_FSAISetPrintLevel ( void *data, HYPRE_Int print_level );
+HYPRE_Int hypre_FSAIGetAlgoType ( void *data, HYPRE_Int *algo_type );
+HYPRE_Int hypre_FSAIGetLocalSolveType ( void *data, HYPRE_Int *local_solve_type );
+HYPRE_Int hypre_FSAIGetMaxSteps ( void *data, HYPRE_Int *max_steps );
+HYPRE_Int hypre_FSAIGetMaxStepSize ( void *data, HYPRE_Int *max_step_size );
+HYPRE_Int hypre_FSAIGetMaxNnzRow ( void *data, HYPRE_Int *max_nnz_row );
+HYPRE_Int hypre_FSAIGetNumLevels ( void *data, HYPRE_Int *num_levels );
+HYPRE_Int hypre_FSAIGetThreshold ( void *data, HYPRE_Real *threshold );
+HYPRE_Int hypre_FSAIGetKapTolerance ( void *data, HYPRE_Real *kap_tolerance );
+HYPRE_Int hypre_FSAIGetMaxIterations ( void *data, HYPRE_Int *max_iterations );
+HYPRE_Int hypre_FSAIGetEigMaxIters ( void *data, HYPRE_Int *eig_max_iters );
+HYPRE_Int hypre_FSAIGetZeroGuess ( void *data, HYPRE_Int *zero_guess );
+HYPRE_Int hypre_FSAIGetTolerance ( void *data, HYPRE_Real *tolerance );
+HYPRE_Int hypre_FSAIGetOmega ( void *data, HYPRE_Real *omega );
+HYPRE_Int hypre_FSAIGetLogging ( void *data, HYPRE_Int *logging );
+HYPRE_Int hypre_FSAIGetNumIterations ( void *data, HYPRE_Int *num_iterations );
+HYPRE_Int hypre_FSAIGetPrintLevel ( void *data, HYPRE_Int *print_level );
+
+/* par_fsai_setup.c */
+HYPRE_Int hypre_CSRMatrixExtractDenseMat ( hypre_CSRMatrix *A, hypre_Vector *A_sub,
+                                           HYPRE_Int *S_Pattern, HYPRE_Int S_nnz,
+                                           HYPRE_Int *marker );
+HYPRE_Int hypre_CSRMatrixExtractDenseRow ( hypre_CSRMatrix *A, hypre_Vector *A_subrow,
+                                           HYPRE_Int *marker, HYPRE_Int row_num );
+HYPRE_Int hypre_FindKapGrad ( hypre_CSRMatrix *A_diag, hypre_Vector *kaporin_gradient,
+                              HYPRE_Int *kap_grad_nonzeros, hypre_Vector *G_temp,
+                              HYPRE_Int *S_Pattern, HYPRE_Int S_nnz,
+                              HYPRE_Int max_row_size, HYPRE_Int row_num, HYPRE_Int *kg_marker );
+HYPRE_Int hypre_AddToPattern ( hypre_Vector *kaporin_gradient, HYPRE_Int *kap_grad_nonzeros,
+                               HYPRE_Int *S_Pattern, HYPRE_Int *S_nnz, HYPRE_Int *kg_marker,
+                               HYPRE_Int max_step_size );
+HYPRE_Int hypre_FSAISetup ( void *fsai_vdata, hypre_ParCSRMatrix *A, hypre_ParVector *f,
+                            hypre_ParVector *u );
+HYPRE_Int hypre_FSAISetupNative ( void *fsai_vdata, hypre_ParCSRMatrix *A,
+                                  hypre_ParVector *f, hypre_ParVector *u );
+HYPRE_Int hypre_FSAISetupOMPDyn ( void *fsai_vdata, hypre_ParCSRMatrix *A,
+                                  hypre_ParVector *f, hypre_ParVector *u );
+HYPRE_Int hypre_FSAIPrintStats ( void *fsai_vdata, hypre_ParCSRMatrix *A );
+HYPRE_Int hypre_FSAIComputeOmega ( void *fsai_vdata, hypre_ParCSRMatrix *A );
+void hypre_swap2_ci ( HYPRE_Complex *v, HYPRE_Int *w, HYPRE_Int i, HYPRE_Int j );
+void hypre_qsort2_ci ( HYPRE_Complex *v, HYPRE_Int *w, HYPRE_Int left, HYPRE_Int right );
+HYPRE_Int hypre_FSAIDumpLocalLSDense ( void *fsai_vdata, const char *filename,
+                                       hypre_ParCSRMatrix *A );
+
+/* par_fsai_solve.c */
+HYPRE_Int hypre_FSAISolve ( void *fsai_vdata, hypre_ParCSRMatrix *A, hypre_ParVector *b,
+                            hypre_ParVector *x );
+HYPRE_Int hypre_FSAIApply ( void *fsai_vdata, HYPRE_Complex alpha, hypre_ParVector *b,
+                            hypre_ParVector *x );
+
+/* par_fsai_device.c */
+HYPRE_Int hypre_FSAISetupDevice( void *fsai_vdata, hypre_ParCSRMatrix *A,
+                                 hypre_ParVector *f, hypre_ParVector *u );
diff --git a/external/hypre/src/parcsr_ls/schwarz.c b/external/hypre/src/parcsr_ls/schwarz.c
index c68ed892..c3645ea7 100644
--- a/external/hypre/src/parcsr_ls/schwarz.c
+++ b/external/hypre/src/parcsr_ls/schwarz.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -25,10 +25,10 @@
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_AMGNodalSchwarzSmoother( hypre_CSRMatrix    *A,
-                               HYPRE_Int                 num_functions,
-                               HYPRE_Int                   option,
-                               hypre_CSRMatrix   **domain_structure_pointer)
+hypre_AMGNodalSchwarzSmoother( hypre_CSRMatrix  *A,
+                               HYPRE_Int         num_functions,
+                               HYPRE_Int         option,
+                               hypre_CSRMatrix **domain_structure_pointer)
 {
    /*  option =      0: nodal symGS;
        1: next to nodal symGS (overlapping Schwarz) */
@@ -54,7 +54,7 @@ hypre_AMGNodalSchwarzSmoother( hypre_CSRMatrix    *A,
 
 
    HYPRE_Int ierr = 0;
-   HYPRE_Int i,j,k, l_loc, i_loc, j_loc;
+   HYPRE_Int i, j, k, l_loc, i_loc, j_loc;
    HYPRE_Int i_dof, j_dof;
    HYPRE_Int *i_local_to_global;
    HYPRE_Int *i_global_to_local;
@@ -62,7 +62,7 @@ hypre_AMGNodalSchwarzSmoother( hypre_CSRMatrix    *A,
    HYPRE_Int *i_int;
    HYPRE_Int *i_int_to_local;
 
-   HYPRE_Int int_dof_counter, local_dof_counter, max_local_dof_counter=0;
+   HYPRE_Int int_dof_counter, local_dof_counter, max_local_dof_counter = 0;
 
    HYPRE_Int domain_dof_counter = 0, domain_matrixinverse_counter = 0;
 
@@ -72,13 +72,6 @@ hypre_AMGNodalSchwarzSmoother( hypre_CSRMatrix    *A,
 
    HYPRE_Int cnt;
 
-   /* PCG arrays: ---------------------------------------------------
-      HYPRE_Real *x, *rhs, *v, *w, *d, *aux;
-
-      HYPRE_Int max_iter;
-
-      ------------------------------------------------------------------ */
-
    /* build dof_node graph: ----------------------------------------- */
 
    num_nodes = num_dofs / num_functions;
@@ -86,15 +79,21 @@ hypre_AMGNodalSchwarzSmoother( hypre_CSRMatrix    *A,
    /*hypre_printf("\nnum_nodes: %d, num_dofs: %d = %d x %d\n", num_nodes, num_dofs,
      num_nodes, num_functions);*/
 
-   i_dof_node = hypre_CTAlloc(HYPRE_Int,  num_dofs+1, HYPRE_MEMORY_HOST);
-   j_dof_node = hypre_CTAlloc(HYPRE_Int,  num_dofs, HYPRE_MEMORY_HOST);
+   i_dof_node = hypre_CTAlloc(HYPRE_Int, num_dofs + 1, HYPRE_MEMORY_HOST);
+   j_dof_node = hypre_CTAlloc(HYPRE_Int, num_dofs, HYPRE_MEMORY_HOST);
 
-   for (i=0; i < num_dofs+1; i++)
+   for (i = 0; i < num_dofs + 1; i++)
+   {
       i_dof_node[i] = i;
+   }
 
    for (j = 0; j < num_nodes; j++)
+   {
       for (k = 0; k < num_functions; k++)
-         j_dof_node[j*num_functions+k] = j;
+      {
+         j_dof_node[j * num_functions + k] = j;
+      }
+   }
 
    /* build node_dof graph: ----------------------------------------- */
 
@@ -125,18 +124,20 @@ hypre_AMGNodalSchwarzSmoother( hypre_CSRMatrix    *A,
 
    i_global_to_local = i_dof_node;
 
-   for (i_dof =0; i_dof < num_dofs; i_dof++)
+   for (i_dof = 0; i_dof < num_dofs; i_dof++)
+   {
       i_global_to_local[i_dof] = -1;
+   }
 
    domain_matrixinverse_counter = 0;
    domain_dof_counter = 0;
-   for (i=0; i < num_nodes; i++)
+   for (i = 0; i < num_nodes; i++)
    {
       local_dof_counter = 0;
 
-      for (j=i_node_node[i]; j < i_node_node[i+1]; j++)
-         for (k=i_node_dof[j_node_node[j]];
-              k<i_node_dof[j_node_node[j]+1]; k++)
+      for (j = i_node_node[i]; j < i_node_node[i + 1]; j++)
+      {
+         for (k = i_node_dof[j_node_node[j]]; k < i_node_dof[j_node_node[j] + 1]; k++)
          {
             j_dof = j_node_dof[k];
 
@@ -145,55 +146,60 @@ hypre_AMGNodalSchwarzSmoother( hypre_CSRMatrix    *A,
                i_global_to_local[j_dof] = local_dof_counter;
                local_dof_counter++;
             }
-
          }
-      domain_matrixinverse_counter += local_dof_counter*local_dof_counter;
+      }
+      domain_matrixinverse_counter += local_dof_counter * local_dof_counter;
       domain_dof_counter += local_dof_counter;
 
       if (local_dof_counter > max_local_dof_counter)
+      {
          max_local_dof_counter = local_dof_counter;
+      }
 
-      for (j=i_node_node[i]; j < i_node_node[i+1]; j++)
-         for (k=i_node_dof[j_node_node[j]];
-              k<i_node_dof[j_node_node[j]+1]; k++)
+      for (j = i_node_node[i]; j < i_node_node[i + 1]; j++)
+      {
+         for (k = i_node_dof[j_node_node[j]]; k < i_node_dof[j_node_node[j] + 1]; k++)
          {
             j_dof = j_node_dof[k];
             i_global_to_local[j_dof] = -1;
          }
+      }
    }
 
-   num_domains = num_nodes;
-
-   i_domain_dof = hypre_CTAlloc(HYPRE_Int,  num_domains+1, HYPRE_MEMORY_HOST);
-
+   num_domains  = num_nodes;
+   i_domain_dof = hypre_CTAlloc(HYPRE_Int,  num_domains + 1, HYPRE_MEMORY_HOST);
    if (option == 1)
-      j_domain_dof = hypre_CTAlloc(HYPRE_Int,  domain_dof_counter, HYPRE_MEMORY_HOST);
-   else
-      j_domain_dof = hypre_CTAlloc(HYPRE_Int,  num_dofs, HYPRE_MEMORY_HOST);
-
-   if (option == 1)
-      domain_matrixinverse = hypre_CTAlloc(HYPRE_Real,  domain_matrixinverse_counter, HYPRE_MEMORY_HOST);
+   {
+      j_domain_dof         = hypre_CTAlloc(HYPRE_Int,  domain_dof_counter, HYPRE_MEMORY_HOST);
+      domain_matrixinverse = hypre_CTAlloc(HYPRE_Real, domain_matrixinverse_counter,
+                                           HYPRE_MEMORY_HOST);
+   }
    else
-      domain_matrixinverse = hypre_CTAlloc(HYPRE_Real,  num_dofs * num_functions, HYPRE_MEMORY_HOST);
-
-   i_local_to_global = hypre_CTAlloc(HYPRE_Int,  max_local_dof_counter, HYPRE_MEMORY_HOST);
+   {
+      j_domain_dof         = hypre_CTAlloc(HYPRE_Int,  num_dofs, HYPRE_MEMORY_HOST);
+      domain_matrixinverse = hypre_CTAlloc(HYPRE_Real, num_dofs * num_functions,
+                                           HYPRE_MEMORY_HOST);
+   }
 
-   i_int_to_local = hypre_CTAlloc(HYPRE_Int,  max_local_dof_counter, HYPRE_MEMORY_HOST);
-   i_int          = hypre_CTAlloc(HYPRE_Int,  max_local_dof_counter, HYPRE_MEMORY_HOST);
+   i_local_to_global = hypre_CTAlloc(HYPRE_Int, max_local_dof_counter, HYPRE_MEMORY_HOST);
+   i_int_to_local    = hypre_CTAlloc(HYPRE_Int, max_local_dof_counter, HYPRE_MEMORY_HOST);
+   i_int             = hypre_CTAlloc(HYPRE_Int, max_local_dof_counter, HYPRE_MEMORY_HOST);
 
-   for (l_loc=0; l_loc < max_local_dof_counter; l_loc++)
+   for (l_loc = 0; l_loc < max_local_dof_counter; l_loc++)
+   {
       i_int[l_loc] = -1;
+   }
 
    domain_dof_counter = 0;
    domain_matrixinverse_counter = 0;
-   for (i=0; i < num_nodes; i++)
+   for (i = 0; i < num_nodes; i++)
    {
       i_domain_dof[i] = domain_dof_counter;
       local_dof_counter = 0;
 
-      for (j=i_node_node[i]; j < i_node_node[i+1]; j++)
-         for (k=i_node_dof[j_node_node[j]];
-              k<i_node_dof[j_node_node[j]+1]; k++)
+      for (j = i_node_node[i]; j < i_node_node[i + 1]; j++)
+      {
+         for (k = i_node_dof[j_node_node[j]]; k < i_node_dof[j_node_node[j] + 1]; k++)
          {
             j_dof = j_node_dof[k];
 
@@ -203,16 +209,22 @@ hypre_AMGNodalSchwarzSmoother( hypre_CSRMatrix    *A,
                i_local_to_global[local_dof_counter] = j_dof;
                local_dof_counter++;
             }
-
          }
+      }
 
-      for (j=i_node_dof[i]; j < i_node_dof[i+1]; j++)
-         for (k=i_dof_dof[j_node_dof[j]]; k < i_dof_dof[j_node_dof[j]+1]; k++)
+      for (j = i_node_dof[i]; j < i_node_dof[i + 1]; j++)
+      {
+         for (k = i_dof_dof[j_node_dof[j]]; k < i_dof_dof[j_node_dof[j] + 1]; k++)
+         {
             if (i_global_to_local[j_dof_dof[k]] < 0)
-               hypre_error_w_msg(HYPRE_ERROR_GENERIC,"WRONG local indexing: ====================== \n");
+            {
+               hypre_error_w_msg(HYPRE_ERROR_GENERIC, "WRONG local indexing: ===============\n");
+            }
+         }
+      }
 
       int_dof_counter = 0;
-      for (k=i_node_dof[i]; k < i_node_dof[i+1]; k++)
+      for (k = i_node_dof[i]; k < i_node_dof[i + 1]; k++)
       {
          i_dof = j_node_dof[k];
          i_loc = i_global_to_local[i_dof];
@@ -222,86 +234,104 @@ hypre_AMGNodalSchwarzSmoother( hypre_CSRMatrix    *A,
       }
 
       /* get local matrix AE: ======================================== */
-
       if (option == 1)
       {
          AE = &domain_matrixinverse[domain_matrixinverse_counter];
          cnt = 0;
-         for (i_loc=0; i_loc < local_dof_counter; i_loc++)
-            for (j_loc=0; j_loc < local_dof_counter; j_loc++)
+         for (i_loc = 0; i_loc < local_dof_counter; i_loc++)
+         {
+            for (j_loc = 0; j_loc < local_dof_counter; j_loc++)
+            {
                AE[cnt++] = 0.e0;
+            }
+         }
 
-         for (i_loc=0; i_loc < local_dof_counter; i_loc++)
+         for (i_loc = 0; i_loc < local_dof_counter; i_loc++)
          {
             i_dof = i_local_to_global[i_loc];
-            for (j=i_dof_dof[i_dof]; j < i_dof_dof[i_dof+1]; j++)
+            for (j = i_dof_dof[i_dof]; j < i_dof_dof[i_dof + 1]; j++)
             {
                j_loc = i_global_to_local[j_dof_dof[j]];
-               if (j_loc >=0)
+               if (j_loc >= 0)
+               {
                   AE[i_loc + j_loc * local_dof_counter] = a_dof_dof[j];
+               }
             }
          }
 
          /* get block for Schwarz smoother: ============================= */
          /* ierr = hypre_matinv(XE, AE, local_dof_counter); */
          /* hypre_printf("ierr_AE_inv: %d\n", ierr); */
-         hypre_dpotrf(&uplo, &local_dof_counter, AE,
-                      &local_dof_counter, &ierr);
-         if (ierr == 1) hypre_error_w_msg(HYPRE_ERROR_GENERIC,"Error! Matrix not SPD\n");
+         hypre_dpotrf(&uplo, &local_dof_counter, AE, &local_dof_counter, &ierr);
+         if (ierr == 1)
+         {
+            hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Error! Matrix not SPD\n");
+         }
 
-         for (i_loc=0; i_loc < local_dof_counter; i_loc++)
-            j_domain_dof[domain_dof_counter+i_loc]
-               = i_local_to_global[i_loc];
+         for (i_loc = 0; i_loc < local_dof_counter; i_loc++)
+         {
+            j_domain_dof[domain_dof_counter + i_loc] = i_local_to_global[i_loc];
+         }
       }
 
       if (option == 0)
       {
          AE = &domain_matrixinverse[domain_matrixinverse_counter];
-         for (i_loc=0; i_loc < int_dof_counter; i_loc++)
-            for (j_loc=0; j_loc < int_dof_counter; j_loc++)
+         for (i_loc = 0; i_loc < int_dof_counter; i_loc++)
+         {
+            for (j_loc = 0; j_loc < int_dof_counter; j_loc++)
+            {
                AE[i_loc + j_loc * int_dof_counter] = 0.e0;
+            }
+         }
 
-         for (l_loc=0; l_loc < int_dof_counter; l_loc++)
+         for (l_loc = 0; l_loc < int_dof_counter; l_loc++)
          {
             i_loc = i_int_to_local[l_loc];
             i_dof = i_local_to_global[i_loc];
-            for (j=i_dof_dof[i_dof]; j < i_dof_dof[i_dof+1]; j++)
+            for (j = i_dof_dof[i_dof]; j < i_dof_dof[i_dof + 1]; j++)
             {
                j_loc = i_global_to_local[j_dof_dof[j]];
-               if (j_loc >=0)
-                  if (i_int[j_loc] >=0)
-                     AE[i_loc + i_int[j_loc] * int_dof_counter]
-                        = a_dof_dof[j];
+               if (j_loc >= 0)
+               {
+                  if (i_int[j_loc] >= 0)
+                  {
+                     AE[i_loc + i_int[j_loc] * int_dof_counter] = a_dof_dof[j];
+                  }
+               }
             }
          }
 
          /* ierr = hypre_matinv(XE, AE, int_dof_counter); */
-         hypre_dpotrf(&uplo, &local_dof_counter, AE,
-                      &local_dof_counter, &ierr);
-
-         if (ierr) hypre_error_w_msg(HYPRE_ERROR_GENERIC," error in dpotrf !!!\n");
+         hypre_dpotrf(&uplo, &local_dof_counter, AE, &local_dof_counter, &ierr);
+         if (ierr)
+         {
+            hypre_error_w_msg(HYPRE_ERROR_GENERIC, " error in dpotrf !!!\n");
+         }
 
-         for (i_loc=0; i_loc < int_dof_counter; i_loc++)
+         for (i_loc = 0; i_loc < int_dof_counter; i_loc++)
          {
             j_domain_dof[domain_dof_counter + i_loc] =
                i_local_to_global[i_int_to_local[i_loc]];
 
-            for (j_loc=0; j_loc < int_dof_counter; j_loc++)
+            for (j_loc = 0; j_loc < int_dof_counter; j_loc++)
+            {
                domain_matrixinverse[domain_matrixinverse_counter
                                     + i_loc + j_loc * int_dof_counter]
                   = AE[i_loc + j_loc * int_dof_counter];
+            }
          }
 
-         domain_dof_counter+=int_dof_counter;
-         domain_matrixinverse_counter+=int_dof_counter*int_dof_counter;
+         domain_dof_counter += int_dof_counter;
+         domain_matrixinverse_counter += int_dof_counter * int_dof_counter;
       }
       else
       {
-         domain_dof_counter+=local_dof_counter;
-         domain_matrixinverse_counter+=local_dof_counter*local_dof_counter;
+         domain_dof_counter += local_dof_counter;
+         domain_matrixinverse_counter += local_dof_counter * local_dof_counter;
       }
 
-      for (l_loc=0; l_loc < local_dof_counter; l_loc++)
+      for (l_loc = 0; l_loc < local_dof_counter; l_loc++)
       {
          i_int[l_loc] = -1;
          i_global_to_local[i_local_to_global[l_loc]] = -1;
@@ -312,7 +342,6 @@ hypre_AMGNodalSchwarzSmoother( hypre_CSRMatrix    *A,
 
    hypre_TFree(i_dof_node, HYPRE_MEMORY_HOST);
    hypre_TFree(j_dof_node, HYPRE_MEMORY_HOST);
-
    hypre_TFree(i_node_dof, HYPRE_MEMORY_HOST);
    hypre_TFree(j_node_dof, HYPRE_MEMORY_HOST);
    hypre_TFree(i_node_node, HYPRE_MEMORY_HOST);
@@ -320,7 +349,6 @@ hypre_AMGNodalSchwarzSmoother( hypre_CSRMatrix    *A,
 
    hypre_TFree(i_int, HYPRE_MEMORY_HOST);
    hypre_TFree(i_int_to_local, HYPRE_MEMORY_HOST);
-
    hypre_TFree(i_local_to_global, HYPRE_MEMORY_HOST);
 
    domain_structure = hypre_CSRMatrixCreate(num_domains, max_local_dof_counter,
@@ -334,15 +362,17 @@ hypre_AMGNodalSchwarzSmoother( hypre_CSRMatrix    *A,
    return hypre_error_flag;
 }
 
-HYPRE_Int hypre_ParMPSchwarzSolve(hypre_ParCSRMatrix *par_A,
-                                  hypre_CSRMatrix *A_boundary,
-                                  hypre_ParVector *rhs_vector,
-                                  hypre_CSRMatrix *domain_structure,
-                                  hypre_ParVector *par_x,
-                                  HYPRE_Real relax_wt,
-                                  HYPRE_Real *scale,
-                                  hypre_ParVector *Vtemp, HYPRE_Int *pivots,
-                                  HYPRE_Int use_nonsymm)
+HYPRE_Int
+hypre_ParMPSchwarzSolve(hypre_ParCSRMatrix  *par_A,
+                        hypre_CSRMatrix     *A_boundary,
+                        hypre_ParVector     *rhs_vector,
+                        hypre_CSRMatrix     *domain_structure,
+                        hypre_ParVector     *par_x,
+                        HYPRE_Real           relax_wt,
+                        HYPRE_Real          *scale,
+                        hypre_ParVector     *Vtemp,
+                        HYPRE_Int           *pivots,
+                        HYPRE_Int            use_nonsymm)
 {
    hypre_ParCSRCommPkg *comm_pkg = hypre_ParCSRMatrixCommPkg(par_A);
    HYPRE_Int num_sends = 0;
@@ -358,27 +388,27 @@ HYPRE_Int hypre_ParMPSchwarzSolve(hypre_ParCSRMatrix *par_A,
    HYPRE_Int *A_diag_j;
    HYPRE_Real *A_diag_data;
    hypre_CSRMatrix *A_offd;
-   HYPRE_Int *A_offd_i;
-   HYPRE_Int *A_offd_j;
-   HYPRE_Real *A_offd_data;
+   HYPRE_Int *A_offd_i = NULL;
+   HYPRE_Int *A_offd_j = NULL;
+   HYPRE_Real *A_offd_data = NULL;
    HYPRE_Real *x;
-   HYPRE_Real *x_ext;
-   HYPRE_Real *x_ext_old;
+   HYPRE_Real *x_ext = NULL;
+   HYPRE_Real *x_ext_old = NULL;
    HYPRE_Real *rhs;
-   HYPRE_Real *rhs_ext;
+   HYPRE_Real *rhs_ext = NULL;
    HYPRE_Real *vtemp_data;
    HYPRE_Real *aux;
-   HYPRE_Real *buf_data;
-/*hypre_Vector *x_vector;*/
+   HYPRE_Real *buf_data = NULL;
+   /*hypre_Vector *x_vector;*/
    MPI_Comm comm = hypre_ParCSRMatrixComm(par_A);
    HYPRE_Int num_domains = hypre_CSRMatrixNumRows(domain_structure);
    HYPRE_Int max_domain_size = hypre_CSRMatrixNumCols(domain_structure);
    HYPRE_Int *i_domain_dof = hypre_CSRMatrixI(domain_structure);
    HYPRE_Int *j_domain_dof = hypre_CSRMatrixJ(domain_structure);
    HYPRE_Real *domain_matrixinverse = hypre_CSRMatrixData(domain_structure);
-   HYPRE_Int *A_boundary_i;
-   HYPRE_Int *A_boundary_j;
-   HYPRE_Real *A_boundary_data;
+   HYPRE_Int *A_boundary_i = NULL;
+   HYPRE_Int *A_boundary_j = NULL;
+   HYPRE_Real *A_boundary_data = NULL;
    HYPRE_Int num_variables;
    HYPRE_Int num_cols_offd;
 
@@ -386,14 +416,14 @@ HYPRE_Int hypre_ParMPSchwarzSolve(hypre_ParCSRMatrix *par_A,
    HYPRE_Int one = 1;
    char uplo = 'L';
 
-   HYPRE_Int jj,i,j,k, j_loc, k_loc;
+   HYPRE_Int jj, i, j, k, j_loc, k_loc;
    HYPRE_Int index;
 
    HYPRE_Int matrix_size, matrix_size_counter = 0;
 
    HYPRE_Int num_procs;
 
-   hypre_MPI_Comm_size(comm,&num_procs);
+   hypre_MPI_Comm_size(comm, &num_procs);
 
    /* initiate:      ----------------------------------------------- */
    /* num_dofs = hypre_CSRMatrixNumRows(A); */
@@ -407,7 +437,9 @@ HYPRE_Int hypre_ParMPSchwarzSolve(hypre_ParCSRMatrix *par_A,
    rhs = hypre_VectorData(hypre_ParVectorLocalVector(rhs_vector));
 
    if (use_nonsymm)
+   {
       uplo = 'N';
+   }
 
    /*x_vector = hypre_ParVectorLocalVector(par_x);*/
    A_diag_i = hypre_CSRMatrixI(A_diag);
@@ -424,8 +456,8 @@ HYPRE_Int hypre_ParMPSchwarzSolve(hypre_ParCSRMatrix *par_A,
    }
    aux = hypre_CTAlloc(HYPRE_Real,  max_domain_size, HYPRE_MEMORY_HOST);
 
-   hypre_ParVectorCopy(rhs_vector,Vtemp);
-   hypre_ParCSRMatrixMatvec(-1.0,par_A,par_x,1.0,Vtemp);
+   hypre_ParVectorCopy(rhs_vector, Vtemp);
+   hypre_ParCSRMatrixMatvec(-1.0, par_A, par_x, 1.0, Vtemp);
 
    if (comm_pkg)
    {
@@ -439,76 +471,95 @@ HYPRE_Int hypre_ParMPSchwarzSolve(hypre_ParCSRMatrix *par_A,
       rhs_ext = hypre_CTAlloc(HYPRE_Real,  num_cols_offd, HYPRE_MEMORY_HOST);
 
       index = 0;
-      for (i=0; i < num_sends; i++)
+      for (i = 0; i < num_sends; i++)
       {
-         for (j = send_map_starts[i]; j < send_map_starts[i+1]; j++)
+         for (j = send_map_starts[i]; j < send_map_starts[i + 1]; j++)
+         {
             buf_data[index++] = vtemp_data[send_map_elmts[j]];
+         }
       }
 
-      comm_handle = hypre_ParCSRCommHandleCreate(1,comm_pkg,buf_data,
+      comm_handle = hypre_ParCSRCommHandleCreate(1, comm_pkg, buf_data,
                                                  rhs_ext);
       hypre_ParCSRCommHandleDestroy(comm_handle);
       comm_handle = NULL;
 
       index = 0;
-      for (i=0; i < num_sends; i++)
+      for (i = 0; i < num_sends; i++)
       {
-         for (j = send_map_starts[i]; j < send_map_starts[i+1]; j++)
+         for (j = send_map_starts[i]; j < send_map_starts[i + 1]; j++)
+         {
             buf_data[index++] = x[send_map_elmts[j]];
+         }
       }
 
-      comm_handle = hypre_ParCSRCommHandleCreate(1,comm_pkg,buf_data,x_ext);
+      comm_handle = hypre_ParCSRCommHandleCreate(1, comm_pkg, buf_data, x_ext);
       hypre_ParCSRCommHandleDestroy(comm_handle);
       comm_handle = NULL;
    }
 
    /* correction of residual for exterior points to be updated locally */
-   for (i=0; i < num_cols_offd; i++)
+   for (i = 0; i < num_cols_offd; i++)
    {
       x_ext_old[i] = x_ext[i];
-      for (j = A_boundary_i[i]; j < A_boundary_i[i+1]; j++)
+      for (j = A_boundary_i[i]; j < A_boundary_i[i + 1]; j++)
       {
          k_loc = A_boundary_j[j];
          if (k_loc < num_variables)
-            rhs_ext[i] += A_boundary_data[j]*x[k_loc];
+         {
+            rhs_ext[i] += A_boundary_data[j] * x[k_loc];
+         }
          else
-            rhs_ext[i] += A_boundary_data[j]*x_ext[k_loc-num_variables];
+         {
+            rhs_ext[i] += A_boundary_data[j] * x_ext[k_loc - num_variables];
+         }
       }
    }
-   /* forward solve: ----------------------------------------------- */
 
+   /* forward solve: ----------------------------------------------- */
    matrix_size_counter = 0;
-   for (i=0; i < num_domains; i++)
+   for (i = 0; i < num_domains; i++)
    {
-      matrix_size = i_domain_dof[i+1] - i_domain_dof[i];
+      matrix_size = i_domain_dof[i + 1] - i_domain_dof[i];
 
       /* compute residual: ---------------------------------------- */
-
       jj = 0;
-      for (j=i_domain_dof[i]; j < i_domain_dof[i+1]; j++)
+      for (j = i_domain_dof[i]; j < i_domain_dof[i + 1]; j++)
       {
          j_loc = j_domain_dof[j];
          if (j_loc < num_variables)
          {
             aux[jj] = rhs[j_loc];
-            for (k=A_diag_i[j_loc]; k<A_diag_i[j_loc+1]; k++)
+            for (k = A_diag_i[j_loc]; k < A_diag_i[j_loc + 1]; k++)
+            {
                aux[jj] -= A_diag_data[k] * x[A_diag_j[k]];
-            for (k=A_offd_i[j_loc]; k<A_offd_i[j_loc+1]; k++)
+            }
+            for (k = A_offd_i[j_loc]; k < A_offd_i[j_loc + 1]; k++)
+            {
                aux[jj] -= A_offd_data[k] * x_ext[A_offd_j[k]];
+            }
          }
          else
          {
             j_loc -= num_variables;
             aux[jj] = rhs_ext[j_loc];
-            for (k=A_boundary_i[j_loc]; k<A_boundary_i[j_loc+1]; k++)
+            for (k = A_boundary_i[j_loc]; k < A_boundary_i[j_loc + 1]; k++)
+            {
                k_loc = A_boundary_j[k];
-            if (k_loc < num_variables)
-               aux[jj] -= A_boundary_data[k] * x[k_loc];
-            else
-               aux[jj] -= A_boundary_data[k] * x_ext[k_loc-num_variables];
+
+               if (k_loc < num_variables)
+               {
+                  aux[jj] -= A_boundary_data[k] * x[k_loc];
+               }
+               else
+               {
+                  aux[jj] -= A_boundary_data[k] * x_ext[k_loc - num_variables];
+               }
+            }
          }
          jj++;
       }
+
       /* solve for correction: ------------------------------------- */
       if (use_nonsymm)
       {
@@ -524,115 +575,130 @@ HYPRE_Int hypre_ParMPSchwarzSolve(hypre_ParCSRMatrix *par_A,
                       &matrix_size, aux,
                       &matrix_size, &ierr);
       }
-      if (ierr)  hypre_error(HYPRE_ERROR_GENERIC);
+
+      if (ierr) { hypre_error(HYPRE_ERROR_GENERIC); }
       jj = 0;
-      for (j=i_domain_dof[i]; j < i_domain_dof[i+1]; j++)
+      for (j = i_domain_dof[i]; j < i_domain_dof[i + 1]; j++)
       {
          j_loc = j_domain_dof[j];
          if (j_loc < num_variables)
-            x[j_loc] +=  relax_wt*aux[jj++];
+         {
+            x[j_loc] +=  relax_wt * aux[jj++];
+         }
          else
-            x_ext[j_loc-num_variables] +=  relax_wt*aux[jj++];
+         {
+            x_ext[j_loc - num_variables] +=  relax_wt * aux[jj++];
+         }
       }
       matrix_size_counter += matrix_size * matrix_size;
       piv_counter += matrix_size;
+   }
 
+   /*
+     for (i=0; i < num_cols_offd; i++)
+     x_ext[i] -= x_ext_old[i];
 
-   }
-/*
-  for (i=0; i < num_cols_offd; i++)
-  x_ext[i] -= x_ext_old[i];
-
-  if (comm_pkg)
-  {
-  comm_handle=hypre_ParCSRCommHandleCreate (2,comm_pkg,x_ext,buf_data);
-
-  hypre_ParCSRCommHandleDestroy(comm_handle);
-  comm_handle = NULL;
-
-  index = 0;
-  for (i=0; i < num_sends; i++)
-  {
-  for (j = send_map_starts[i]; j < send_map_starts[i+1]; j++)
-  x[send_map_elmts[j]] += buf_data[index++];
-  }
-  }
-  for (i=0; i < num_variables; i++)
-  x[i] *= scale[i];
-
-  hypre_ParVectorCopy(rhs_vector,Vtemp);
-  hypre_ParCSRMatrixMatvec(-1.0,par_A,par_x,1.0,Vtemp);
-
-  if (comm_pkg)
-  {
-  index = 0;
-  for (i=0; i < num_sends; i++)
-  {
-  for (j = send_map_starts[i]; j < send_map_starts[i+1]; j++)
-  buf_data[index++] = vtemp_data[send_map_elmts[j]];
-  }
-
-  comm_handle = hypre_ParCSRCommHandleCreate(1,comm_pkg,buf_data,
-  rhs_ext);
-  hypre_ParCSRCommHandleDestroy(comm_handle);
-  comm_handle = NULL;
-
-  index = 0;
-  for (i=0; i < num_sends; i++)
-  {
-  for (j = send_map_starts[i]; j < send_map_starts[i+1]; j++)
-  buf_data[index++] = x[send_map_elmts[j]];
-  }
-
-  comm_handle = hypre_ParCSRCommHandleCreate(1,comm_pkg,buf_data,x_ext);
-  hypre_ParCSRCommHandleDestroy(comm_handle);
-  comm_handle = NULL;
-  }
-*/
-   /* correction of residual for exterior points to be updated locally */
-/*   for (i=0; i < num_cols_offd; i++)
+     if (comm_pkg)
      {
-     x_ext_old[i] = x_ext[i];
-     for (j = A_boundary_i[i]; j < A_boundary_i[i+1]; j++)
+     comm_handle=hypre_ParCSRCommHandleCreate (2,comm_pkg,x_ext,buf_data);
+
+     hypre_ParCSRCommHandleDestroy(comm_handle);
+     comm_handle = NULL;
+
+     index = 0;
+     for (i=0; i < num_sends; i++)
      {
-     k_loc = A_boundary_j[j];
-     if (k_loc < num_variables)
-     rhs_ext[i] += A_boundary_i[k]*x[k_loc];
-     else
-     rhs_ext[i] += A_boundary_i[k]*x_ext[k_loc-num_variables];
+     for (j = send_map_starts[i]; j < send_map_starts[i+1]; j++)
+     x[send_map_elmts[j]] += buf_data[index++];
      }
      }
-*/
+     for (i=0; i < num_variables; i++)
+     x[i] *= scale[i];
+
+     hypre_ParVectorCopy(rhs_vector,Vtemp);
+     hypre_ParCSRMatrixMatvec(-1.0,par_A,par_x,1.0,Vtemp);
+
+     if (comm_pkg)
+     {
+     index = 0;
+     for (i=0; i < num_sends; i++)
+     {
+     for (j = send_map_starts[i]; j < send_map_starts[i+1]; j++)
+     buf_data[index++] = vtemp_data[send_map_elmts[j]];
+     }
+
+     comm_handle = hypre_ParCSRCommHandleCreate(1,comm_pkg,buf_data,
+     rhs_ext);
+     hypre_ParCSRCommHandleDestroy(comm_handle);
+     comm_handle = NULL;
+
+     index = 0;
+     for (i=0; i < num_sends; i++)
+     {
+     for (j = send_map_starts[i]; j < send_map_starts[i+1]; j++)
+     buf_data[index++] = x[send_map_elmts[j]];
+     }
+
+     comm_handle = hypre_ParCSRCommHandleCreate(1,comm_pkg,buf_data,x_ext);
+     hypre_ParCSRCommHandleDestroy(comm_handle);
+     comm_handle = NULL;
+     }
+   */
+   /* correction of residual for exterior points to be updated locally */
+   /*   for (i=0; i < num_cols_offd; i++)
+        {
+        x_ext_old[i] = x_ext[i];
+        for (j = A_boundary_i[i]; j < A_boundary_i[i+1]; j++)
+        {
+        k_loc = A_boundary_j[j];
+        if (k_loc < num_variables)
+        rhs_ext[i] += A_boundary_i[k]*x[k_loc];
+        else
+        rhs_ext[i] += A_boundary_i[k]*x_ext[k_loc-num_variables];
+        }
+        }
+   */
    /* backward solve: ------------------------------------------------ */
-   for (i=num_domains-1; i > -1; i--)
+   for (i = num_domains - 1; i > -1; i--)
    {
-      matrix_size = i_domain_dof[i+1] - i_domain_dof[i];
+      matrix_size = i_domain_dof[i + 1] - i_domain_dof[i];
       matrix_size_counter -= matrix_size * matrix_size;
       piv_counter -= matrix_size;
 
       /* compute residual: ---------------------------------------- */
       jj = 0;
-      for (j=i_domain_dof[i]; j < i_domain_dof[i+1]; j++)
+      for (j = i_domain_dof[i]; j < i_domain_dof[i + 1]; j++)
       {
          j_loc = j_domain_dof[j];
          if (j_loc < num_variables)
          {
             aux[jj] = rhs[j_loc];
-            for (k=A_diag_i[j_loc]; k<A_diag_i[j_loc+1]; k++)
+            for (k = A_diag_i[j_loc]; k < A_diag_i[j_loc + 1]; k++)
+            {
                aux[jj] -= A_diag_data[k] * x[A_diag_j[k]];
-            for (k=A_offd_i[j_loc]; k<A_offd_i[j_loc+1]; k++)
+            }
+            for (k = A_offd_i[j_loc]; k < A_offd_i[j_loc + 1]; k++)
+            {
                aux[jj] -= A_offd_data[k] * x_ext[A_offd_j[k]];
+            }
          }
          else
          {
             j_loc -= num_variables;
             aux[jj] = rhs_ext[j_loc];
-            for (k=A_boundary_i[j_loc]; k<A_boundary_i[j_loc+1]; k++)
+            for (k = A_boundary_i[j_loc]; k < A_boundary_i[j_loc + 1]; k++)
+            {
                k_loc = A_boundary_j[k];
-            if (k_loc < num_variables)
-               aux[jj] -= A_boundary_data[k] * x[k_loc];
-            else
-               aux[jj] -= A_boundary_data[k] * x_ext[k_loc-num_variables];
+
+               if (k_loc < num_variables)
+               {
+                  aux[jj] -= A_boundary_data[k] * x[k_loc];
+               }
+               else
+               {
+                  aux[jj] -= A_boundary_data[k] * x_ext[k_loc - num_variables];
+               }
+            }
          }
          jj++;
       }
@@ -653,33 +719,41 @@ HYPRE_Int hypre_ParMPSchwarzSolve(hypre_ParCSRMatrix *par_A,
                       &matrix_size, &ierr);
       }
 
-      if (ierr)  hypre_error(HYPRE_ERROR_GENERIC);
+      if (ierr) { hypre_error(HYPRE_ERROR_GENERIC); }
       jj = 0;
-      for (j=i_domain_dof[i]; j < i_domain_dof[i+1]; j++)
+      for (j = i_domain_dof[i]; j < i_domain_dof[i + 1]; j++)
       {
          j_loc = j_domain_dof[j];
          if (j_loc < num_variables)
-            x[j_loc] +=  relax_wt*aux[jj++];
+         {
+            x[j_loc] +=  relax_wt * aux[jj++];
+         }
          else
-            x_ext[j_loc-num_variables] +=  relax_wt*aux[jj++];
+         {
+            x_ext[j_loc - num_variables] +=  relax_wt * aux[jj++];
+         }
       }
    }
 
-   for (i=0; i < num_cols_offd; i++)
+   for (i = 0; i < num_cols_offd; i++)
+   {
       x_ext[i] -= x_ext_old[i];
+   }
 
    if (comm_pkg)
    {
-      comm_handle=hypre_ParCSRCommHandleCreate (2,comm_pkg,x_ext,buf_data);
+      comm_handle = hypre_ParCSRCommHandleCreate(2, comm_pkg, x_ext, buf_data);
 
       hypre_ParCSRCommHandleDestroy(comm_handle);
       comm_handle = NULL;
 
       index = 0;
-      for (i=0; i < num_sends; i++)
+      for (i = 0; i < num_sends; i++)
       {
-         for (j = send_map_starts[i]; j < send_map_starts[i+1]; j++)
+         for (j = send_map_starts[i]; j < send_map_starts[i + 1]; j++)
+         {
             x[send_map_elmts[j]] += buf_data[index++];
+         }
       }
 
       hypre_TFree(buf_data, HYPRE_MEMORY_HOST);
@@ -687,22 +761,26 @@ HYPRE_Int hypre_ParMPSchwarzSolve(hypre_ParCSRMatrix *par_A,
       hypre_TFree(x_ext_old, HYPRE_MEMORY_HOST);
       hypre_TFree(rhs_ext, HYPRE_MEMORY_HOST);
    }
-   for (i=0; i < num_variables; i++)
+
+   for (i = 0; i < num_variables; i++)
+   {
       x[i] *= scale[i];
+   }
 
    hypre_TFree(aux, HYPRE_MEMORY_HOST);
 
    return hypre_error_flag;
-
 }
 
-HYPRE_Int hypre_MPSchwarzSolve(hypre_ParCSRMatrix *par_A,
-                               hypre_Vector *rhs_vector,
-                               hypre_CSRMatrix *domain_structure,
-                               hypre_ParVector *par_x,
-                               HYPRE_Real relax_wt,
-                               hypre_Vector *aux_vector, HYPRE_Int *pivots,
-                               HYPRE_Int use_nonsymm)
+HYPRE_Int
+hypre_MPSchwarzSolve(hypre_ParCSRMatrix *par_A,
+                     hypre_Vector       *rhs_vector,
+                     hypre_CSRMatrix    *domain_structure,
+                     hypre_ParVector    *par_x,
+                     HYPRE_Real          relax_wt,
+                     hypre_Vector       *aux_vector,
+                     HYPRE_Int          *pivots,
+                     HYPRE_Int           use_nonsymm)
 {
    HYPRE_Int ierr = 0;
    /* HYPRE_Int num_dofs; */
@@ -724,14 +802,14 @@ HYPRE_Int hypre_MPSchwarzSolve(hypre_ParCSRMatrix *par_A,
    HYPRE_Int one = 1;
    char uplo = 'L';
 
-   HYPRE_Int jj,i,j,k; /*, j_loc, k_loc;*/
+   HYPRE_Int jj, i, j, k; /*, j_loc, k_loc;*/
 
 
    HYPRE_Int matrix_size, matrix_size_counter = 0;
 
    HYPRE_Int num_procs;
 
-   hypre_MPI_Comm_size(comm,&num_procs);
+   hypre_MPI_Comm_size(comm, &num_procs);
 
    /* initiate:      ----------------------------------------------- */
    /* num_dofs = hypre_CSRMatrixNumRows(A); */
@@ -746,8 +824,9 @@ HYPRE_Int hypre_MPSchwarzSolve(hypre_ParCSRMatrix *par_A,
       x[i] = 0.e0; */
 
    if (use_nonsymm)
+   {
       uplo = 'N';
-
+   }
 
    if (num_procs > 1)
    {
@@ -759,23 +838,24 @@ HYPRE_Int hypre_MPSchwarzSolve(hypre_ParCSRMatrix *par_A,
    }
 
    /* forward solve: ----------------------------------------------- */
-
    matrix_size_counter = 0;
-   for (i=0; i < num_domains; i++)
+   for (i = 0; i < num_domains; i++)
    {
-      matrix_size = i_domain_dof[i+1] - i_domain_dof[i];
+      matrix_size = i_domain_dof[i + 1] - i_domain_dof[i];
 
       /* compute residual: ---------------------------------------- */
-
       jj = 0;
-      for (j=i_domain_dof[i]; j < i_domain_dof[i+1]; j++)
+      for (j = i_domain_dof[i]; j < i_domain_dof[i + 1]; j++)
       {
          aux[jj] = hypre_VectorData(rhs)[j_domain_dof[j]];
-         for (k=i_dof_dof[j_domain_dof[j]];
-              k<i_dof_dof[j_domain_dof[j]+1]; k++)
+         for (k = i_dof_dof[j_domain_dof[j]];
+              k < i_dof_dof[j_domain_dof[j] + 1]; k++)
+         {
             aux[jj] -= a_dof_dof[k] * x[j_dof_dof[k]];
+         }
          jj++;
       }
+
       /* solve for correction: ------------------------------------- */
       if (use_nonsymm)
       {
@@ -792,37 +872,37 @@ HYPRE_Int hypre_MPSchwarzSolve(hypre_ParCSRMatrix *par_A,
                       &matrix_size, &ierr);
       }
 
-      if (ierr) hypre_error(HYPRE_ERROR_GENERIC);
+      if (ierr) { hypre_error(HYPRE_ERROR_GENERIC); }
       jj = 0;
-      for (j=i_domain_dof[i]; j < i_domain_dof[i+1]; j++)
+      for (j = i_domain_dof[i]; j < i_domain_dof[i + 1]; j++)
       {
-         x[j_domain_dof[j]]+=  relax_wt * aux[jj++];
+         x[j_domain_dof[j]] +=  relax_wt * aux[jj++];
       }
       matrix_size_counter += matrix_size * matrix_size;
       piv_counter += matrix_size;
    }
 
    /* backward solve: ------------------------------------------------ */
-   for (i=num_domains-1; i > -1; i--)
+   for (i = num_domains - 1; i > -1; i--)
    {
-      matrix_size = i_domain_dof[i+1] - i_domain_dof[i];
+      matrix_size = i_domain_dof[i + 1] - i_domain_dof[i];
       matrix_size_counter -= matrix_size * matrix_size;
       piv_counter -= matrix_size;
 
       /* compute residual: ---------------------------------------- */
-
       jj = 0;
-      for (j=i_domain_dof[i]; j < i_domain_dof[i+1]; j++)
+      for (j = i_domain_dof[i]; j < i_domain_dof[i + 1]; j++)
       {
          aux[jj] = hypre_VectorData(rhs)[j_domain_dof[j]];
-         for (k=i_dof_dof[j_domain_dof[j]];
-              k<i_dof_dof[j_domain_dof[j]+1]; k++)
+         for (k = i_dof_dof[j_domain_dof[j]];
+              k < i_dof_dof[j_domain_dof[j] + 1]; k++)
+         {
             aux[jj] -= a_dof_dof[k] * x[j_dof_dof[k]];
+         }
          jj++;
       }
 
       /* solve for correction: ------------------------------------- */
-
       if (use_nonsymm)
       {
          hypre_dgetrs(&uplo, &matrix_size, &one,
@@ -838,11 +918,11 @@ HYPRE_Int hypre_MPSchwarzSolve(hypre_ParCSRMatrix *par_A,
                       &matrix_size, &ierr);
       }
 
-      if (ierr)  hypre_error(HYPRE_ERROR_GENERIC);
+      if (ierr) { hypre_error(HYPRE_ERROR_GENERIC); }
       jj = 0;
-      for (j=i_domain_dof[i]; j < i_domain_dof[i+1]; j++)
+      for (j = i_domain_dof[i]; j < i_domain_dof[i + 1]; j++)
       {
-         x[j_domain_dof[j]] += relax_wt*aux[jj++];
+         x[j_domain_dof[j]] += relax_wt * aux[jj++];
       }
    }
 
@@ -854,15 +934,17 @@ HYPRE_Int hypre_MPSchwarzSolve(hypre_ParCSRMatrix *par_A,
    return hypre_error_flag;
 }
 
-HYPRE_Int hypre_MPSchwarzCFSolve(hypre_ParCSRMatrix *par_A,
-                                 hypre_Vector *rhs_vector,
-                                 hypre_CSRMatrix *domain_structure,
-                                 hypre_ParVector *par_x,
-                                 HYPRE_Real relax_wt,
-                                 hypre_Vector *aux_vector,
-                                 HYPRE_Int *CF_marker,
-                                 HYPRE_Int rlx_pt, HYPRE_Int *pivots,
-                                 HYPRE_Int use_nonsymm)
+HYPRE_Int
+hypre_MPSchwarzCFSolve(hypre_ParCSRMatrix *par_A,
+                       hypre_Vector       *rhs_vector,
+                       hypre_CSRMatrix    *domain_structure,
+                       hypre_ParVector    *par_x,
+                       HYPRE_Real          relax_wt,
+                       hypre_Vector       *aux_vector,
+                       HYPRE_Int          *CF_marker,
+                       HYPRE_Int           rlx_pt,
+                       HYPRE_Int          *pivots,
+                       HYPRE_Int           use_nonsymm)
 {
    HYPRE_Int ierr = 0;
    /* HYPRE_Int num_dofs; */
@@ -883,13 +965,13 @@ HYPRE_Int hypre_MPSchwarzCFSolve(hypre_ParCSRMatrix *par_A,
    HYPRE_Int piv_counter = 0;
    HYPRE_Int one = 1;
    char uplo = 'L';
-   HYPRE_Int jj,i,j,k; /*, j_loc, k_loc;*/
+   HYPRE_Int jj, i, j, k; /*, j_loc, k_loc;*/
 
    HYPRE_Int matrix_size, matrix_size_counter = 0;
 
    HYPRE_Int num_procs;
 
-   hypre_MPI_Comm_size(comm,&num_procs);
+   hypre_MPI_Comm_size(comm, &num_procs);
 
    /* initiate:      ----------------------------------------------- */
    /* num_dofs = hypre_CSRMatrixNumRows(A); */
@@ -904,7 +986,9 @@ HYPRE_Int hypre_MPSchwarzCFSolve(hypre_ParCSRMatrix *par_A,
       x[i] = 0.e0; */
 
    if (use_nonsymm)
+   {
       uplo = 'N';
+   }
 
    if (num_procs > 1)
    {
@@ -916,28 +1000,29 @@ HYPRE_Int hypre_MPSchwarzCFSolve(hypre_ParCSRMatrix *par_A,
    }
 
    /* forward solve: ----------------------------------------------- */
-
    matrix_size_counter = 0;
-   for (i=0; i < num_domains; i++)
+   for (i = 0; i < num_domains; i++)
    {
       if (CF_marker[i] == rlx_pt)
       {
-         matrix_size = i_domain_dof[i+1] - i_domain_dof[i];
+         matrix_size = i_domain_dof[i + 1] - i_domain_dof[i];
 
          /* compute residual: ---------------------------------------- */
-
          jj = 0;
-         for (j=i_domain_dof[i]; j < i_domain_dof[i+1]; j++)
+         for (j = i_domain_dof[i]; j < i_domain_dof[i + 1]; j++)
          {
             aux[jj] = hypre_VectorData(rhs)[j_domain_dof[j]];
             if (CF_marker[j_domain_dof[j]] == rlx_pt)
             {
-               for (k=i_dof_dof[j_domain_dof[j]];
-                    k<i_dof_dof[j_domain_dof[j]+1]; k++)
+               for (k = i_dof_dof[j_domain_dof[j]];
+                    k < i_dof_dof[j_domain_dof[j] + 1]; k++)
+               {
                   aux[jj] -= a_dof_dof[k] * x[j_dof_dof[k]];
+               }
             }
             jj++;
          }
+
          /* solve for correction: ------------------------------------- */
          if (use_nonsymm)
          {
@@ -954,11 +1039,11 @@ HYPRE_Int hypre_MPSchwarzCFSolve(hypre_ParCSRMatrix *par_A,
                          &matrix_size, &ierr);
          }
 
-         if (ierr)  hypre_error(HYPRE_ERROR_GENERIC);
+         if (ierr) { hypre_error(HYPRE_ERROR_GENERIC); }
          jj = 0;
-         for (j=i_domain_dof[i]; j < i_domain_dof[i+1]; j++)
+         for (j = i_domain_dof[i]; j < i_domain_dof[i + 1]; j++)
          {
-            x[j_domain_dof[j]]+=  relax_wt * aux[jj++];
+            x[j_domain_dof[j]] +=  relax_wt * aux[jj++];
          }
          matrix_size_counter += matrix_size * matrix_size;
          piv_counter += matrix_size;
@@ -966,24 +1051,26 @@ HYPRE_Int hypre_MPSchwarzCFSolve(hypre_ParCSRMatrix *par_A,
    }
 
    /* backward solve: ------------------------------------------------ */
-   for (i=num_domains-1; i > -1; i--)
+   for (i = num_domains - 1; i > -1; i--)
    {
       if (CF_marker[i] == rlx_pt)
       {
-         matrix_size = i_domain_dof[i+1] - i_domain_dof[i];
+         matrix_size = i_domain_dof[i + 1] - i_domain_dof[i];
          matrix_size_counter -= matrix_size * matrix_size;
          piv_counter -= matrix_size;
 
          /* compute residual: ---------------------------------------- */
          jj = 0;
-         for (j=i_domain_dof[i]; j < i_domain_dof[i+1]; j++)
+         for (j = i_domain_dof[i]; j < i_domain_dof[i + 1]; j++)
          {
             aux[jj] = hypre_VectorData(rhs)[j_domain_dof[j]];
             if (CF_marker[j_domain_dof[j]] == rlx_pt)
             {
-               for (k=i_dof_dof[j_domain_dof[j]];
-                    k<i_dof_dof[j_domain_dof[j]+1]; k++)
+               for (k = i_dof_dof[j_domain_dof[j]];
+                    k < i_dof_dof[j_domain_dof[j] + 1]; k++)
+               {
                   aux[jj] -= a_dof_dof[k] * x[j_dof_dof[k]];
+               }
             }
             jj++;
          }
@@ -1004,11 +1091,11 @@ HYPRE_Int hypre_MPSchwarzCFSolve(hypre_ParCSRMatrix *par_A,
                          &matrix_size, &ierr);
          }
 
-         if (ierr)  hypre_error(HYPRE_ERROR_GENERIC);
+         if (ierr) { hypre_error(HYPRE_ERROR_GENERIC); }
          jj = 0;
-         for (j=i_domain_dof[i]; j < i_domain_dof[i+1]; j++)
+         for (j = i_domain_dof[i]; j < i_domain_dof[i + 1]; j++)
          {
-            x[j_domain_dof[j]]+=  relax_wt*aux[jj++];
+            x[j_domain_dof[j]] +=  relax_wt * aux[jj++];
          }
       }
    }
@@ -1021,13 +1108,15 @@ HYPRE_Int hypre_MPSchwarzCFSolve(hypre_ParCSRMatrix *par_A,
    return hypre_error_flag;
 }
 
-HYPRE_Int hypre_MPSchwarzFWSolve(hypre_ParCSRMatrix *par_A,
-                                 hypre_Vector *rhs_vector,
-                                 hypre_CSRMatrix *domain_structure,
-                                 hypre_ParVector *par_x,
-                                 HYPRE_Real relax_wt,
-                                 hypre_Vector *aux_vector, HYPRE_Int *pivots,
-                                 HYPRE_Int use_nonsymm)
+HYPRE_Int
+hypre_MPSchwarzFWSolve(hypre_ParCSRMatrix *par_A,
+                       hypre_Vector       *rhs_vector,
+                       hypre_CSRMatrix    *domain_structure,
+                       hypre_ParVector    *par_x,
+                       HYPRE_Real          relax_wt,
+                       hypre_Vector       *aux_vector,
+                       HYPRE_Int          *pivots,
+                       HYPRE_Int           use_nonsymm)
 {
    HYPRE_Int ierr = 0;
    /* HYPRE_Int num_dofs; */
@@ -1045,18 +1134,15 @@ HYPRE_Int hypre_MPSchwarzFWSolve(hypre_ParCSRMatrix *par_A,
    HYPRE_Int *j_domain_dof = hypre_CSRMatrixJ(domain_structure);
    HYPRE_Real *domain_matrixinverse = hypre_CSRMatrixData(domain_structure);
 
-
    HYPRE_Int piv_counter = 0;
    HYPRE_Int one = 1;
    char uplo = 'L';
-   HYPRE_Int jj,i,j,k; /*, j_loc, k_loc;*/
-
+   HYPRE_Int jj, i, j, k; /*, j_loc, k_loc;*/
 
    HYPRE_Int matrix_size, matrix_size_counter = 0;
-
    HYPRE_Int num_procs;
 
-   hypre_MPI_Comm_size(comm,&num_procs);
+   hypre_MPI_Comm_size(comm, &num_procs);
 
    /* initiate:      ----------------------------------------------- */
    /* num_dofs = hypre_CSRMatrixNumRows(A); */
@@ -1080,23 +1166,24 @@ HYPRE_Int hypre_MPSchwarzFWSolve(hypre_ParCSRMatrix *par_A,
    }
 
    /* forward solve: ----------------------------------------------- */
-
    matrix_size_counter = 0;
-   for (i=0; i < num_domains; i++)
+   for (i = 0; i < num_domains; i++)
    {
-      matrix_size = i_domain_dof[i+1] - i_domain_dof[i];
+      matrix_size = i_domain_dof[i + 1] - i_domain_dof[i];
 
       /* compute residual: ---------------------------------------- */
-
       jj = 0;
-      for (j=i_domain_dof[i]; j < i_domain_dof[i+1]; j++)
+      for (j = i_domain_dof[i]; j < i_domain_dof[i + 1]; j++)
       {
          aux[jj] = hypre_VectorData(rhs)[j_domain_dof[j]];
-         for (k=i_dof_dof[j_domain_dof[j]];
-              k<i_dof_dof[j_domain_dof[j]+1]; k++)
+         for (k = i_dof_dof[j_domain_dof[j]];
+              k < i_dof_dof[j_domain_dof[j] + 1]; k++)
+         {
             aux[jj] -= a_dof_dof[k] * x[j_dof_dof[k]];
+         }
          jj++;
       }
+
       /* solve for correction: ------------------------------------- */
       if (use_nonsymm)
       {
@@ -1114,11 +1201,11 @@ HYPRE_Int hypre_MPSchwarzFWSolve(hypre_ParCSRMatrix *par_A,
       }
 
 
-      if (ierr)   hypre_error(HYPRE_ERROR_GENERIC);
+      if (ierr) { hypre_error(HYPRE_ERROR_GENERIC); }
       jj = 0;
-      for (j=i_domain_dof[i]; j < i_domain_dof[i+1]; j++)
+      for (j = i_domain_dof[i]; j < i_domain_dof[i + 1]; j++)
       {
-         x[j_domain_dof[j]]+=  relax_wt * aux[jj++];
+         x[j_domain_dof[j]] +=  relax_wt * aux[jj++];
       }
       matrix_size_counter += matrix_size * matrix_size;
       piv_counter += matrix_size;
@@ -1132,15 +1219,17 @@ HYPRE_Int hypre_MPSchwarzFWSolve(hypre_ParCSRMatrix *par_A,
    return hypre_error_flag;
 }
 
-HYPRE_Int hypre_MPSchwarzCFFWSolve(hypre_ParCSRMatrix *par_A,
-                                   hypre_Vector *rhs_vector,
-                                   hypre_CSRMatrix *domain_structure,
-                                   hypre_ParVector *par_x,
-                                   HYPRE_Real relax_wt,
-                                   hypre_Vector *aux_vector,
-                                   HYPRE_Int *CF_marker,
-                                   HYPRE_Int rlx_pt, HYPRE_Int *pivots,
-                                   HYPRE_Int use_nonsymm)
+HYPRE_Int
+hypre_MPSchwarzCFFWSolve(hypre_ParCSRMatrix *par_A,
+                         hypre_Vector       *rhs_vector,
+                         hypre_CSRMatrix    *domain_structure,
+                         hypre_ParVector    *par_x,
+                         HYPRE_Real          relax_wt,
+                         hypre_Vector       *aux_vector,
+                         HYPRE_Int          *CF_marker,
+                         HYPRE_Int           rlx_pt,
+                         HYPRE_Int          *pivots,
+                         HYPRE_Int           use_nonsymm)
 {
    HYPRE_Int ierr = 0;
    /* HYPRE_Int num_dofs; */
@@ -1162,14 +1251,14 @@ HYPRE_Int hypre_MPSchwarzCFFWSolve(hypre_ParCSRMatrix *par_A,
    HYPRE_Int one = 1;
 
    char uplo = 'L';
-   HYPRE_Int jj,i,j,k; /*, j_loc, k_loc;*/
+   HYPRE_Int jj, i, j, k; /*, j_loc, k_loc;*/
 
 
    HYPRE_Int matrix_size, matrix_size_counter = 0;
 
    HYPRE_Int num_procs;
 
-   hypre_MPI_Comm_size(comm,&num_procs);
+   hypre_MPI_Comm_size(comm, &num_procs);
 
    /* initiate:      ----------------------------------------------- */
    /* num_dofs = hypre_CSRMatrixNumRows(A); */
@@ -1184,7 +1273,9 @@ HYPRE_Int hypre_MPSchwarzCFFWSolve(hypre_ParCSRMatrix *par_A,
       x[i] = 0.e0; */
 
    if (use_nonsymm)
+   {
       uplo = 'N';
+   }
 
    if (num_procs > 1)
    {
@@ -1198,26 +1289,28 @@ HYPRE_Int hypre_MPSchwarzCFFWSolve(hypre_ParCSRMatrix *par_A,
    /* forward solve: ----------------------------------------------- */
 
    matrix_size_counter = 0;
-   for (i=0; i < num_domains; i++)
+   for (i = 0; i < num_domains; i++)
    {
       if (CF_marker[i] == rlx_pt)
       {
-         matrix_size = i_domain_dof[i+1] - i_domain_dof[i];
+         matrix_size = i_domain_dof[i + 1] - i_domain_dof[i];
 
          /* compute residual: ---------------------------------------- */
-
          jj = 0;
-         for (j=i_domain_dof[i]; j < i_domain_dof[i+1]; j++)
+         for (j = i_domain_dof[i]; j < i_domain_dof[i + 1]; j++)
          {
             aux[jj] = hypre_VectorData(rhs)[j_domain_dof[j]];
             if (CF_marker[j_domain_dof[j]] == rlx_pt)
             {
-               for (k=i_dof_dof[j_domain_dof[j]];
-                    k<i_dof_dof[j_domain_dof[j]+1]; k++)
+               for (k = i_dof_dof[j_domain_dof[j]];
+                    k < i_dof_dof[j_domain_dof[j] + 1]; k++)
+               {
                   aux[jj] -= a_dof_dof[k] * x[j_dof_dof[k]];
+               }
             }
             jj++;
          }
+
          /* solve for correction: ------------------------------------- */
          if (use_nonsymm)
          {
@@ -1235,11 +1328,11 @@ HYPRE_Int hypre_MPSchwarzCFFWSolve(hypre_ParCSRMatrix *par_A,
                          &matrix_size, &ierr);
          }
 
-         if (ierr)  hypre_error(HYPRE_ERROR_GENERIC);
+         if (ierr) { hypre_error(HYPRE_ERROR_GENERIC); }
          jj = 0;
-         for (j=i_domain_dof[i]; j < i_domain_dof[i+1]; j++)
+         for (j = i_domain_dof[i]; j < i_domain_dof[i + 1]; j++)
          {
-            x[j_domain_dof[j]]+=  relax_wt * aux[jj++];
+            x[j_domain_dof[j]] +=  relax_wt * aux[jj++];
          }
          matrix_size_counter += matrix_size * matrix_size;
          piv_counter += matrix_size;
@@ -1255,45 +1348,52 @@ HYPRE_Int hypre_MPSchwarzCFFWSolve(hypre_ParCSRMatrix *par_A,
 }
 
 HYPRE_Int
-transpose_matrix_create(  HYPRE_Int **i_face_element_pointer,
-                          HYPRE_Int **j_face_element_pointer,
-                          HYPRE_Int *i_element_face, HYPRE_Int *j_element_face,
-                          HYPRE_Int num_elements, HYPRE_Int num_faces)
+transpose_matrix_create(HYPRE_Int **i_face_element_pointer,
+                        HYPRE_Int **j_face_element_pointer,
+                        HYPRE_Int  *i_element_face,
+                        HYPRE_Int  *j_element_face,
+                        HYPRE_Int   num_elements,
+                        HYPRE_Int   num_faces)
 {
    /* FILE *f; */
-   HYPRE_Int i, j;
-
+   HYPRE_Int  i, j;
    HYPRE_Int *i_face_element, *j_face_element;
 
    /* ======================================================================
       first create face_element graph: -------------------------------------
       ====================================================================== */
 
-   i_face_element = hypre_TAlloc(HYPRE_Int, (num_faces+1) , HYPRE_MEMORY_HOST);
-   j_face_element = hypre_TAlloc(HYPRE_Int, i_element_face[num_elements] , HYPRE_MEMORY_HOST);
-
-
-   for (i=0; i < num_faces; i++)
-      i_face_element[i] = 0;
+   i_face_element = hypre_CTAlloc(HYPRE_Int, (num_faces + 1), HYPRE_MEMORY_HOST);
+   j_face_element = hypre_TAlloc(HYPRE_Int, i_element_face[num_elements], HYPRE_MEMORY_HOST);
 
-   for (i=0; i < num_elements; i++)
-      for (j=i_element_face[i]; j < i_element_face[i+1]; j++)
+   for (i = 0; i < num_elements; i++)
+   {
+      for (j = i_element_face[i]; j < i_element_face[i + 1]; j++)
+      {
          i_face_element[j_element_face[j]]++;
+      }
+   }
 
    i_face_element[num_faces] = i_element_face[num_elements];
 
-   for (i=num_faces-1; i > -1; i--)
-      i_face_element[i] = i_face_element[i+1] - i_face_element[i];
+   for (i = num_faces - 1; i > -1; i--)
+   {
+      i_face_element[i] = i_face_element[i + 1] - i_face_element[i];
+   }
 
-   for (i=0; i < num_elements; i++)
-      for (j=i_element_face[i]; j < i_element_face[i+1]; j++)
+   for (i = 0; i < num_elements; i++)
+   {
+      for (j = i_element_face[i]; j < i_element_face[i + 1]; j++)
       {
          j_face_element[i_face_element[j_element_face[j]]] = i;
          i_face_element[j_element_face[j]]++;
       }
+   }
 
-   for (i=num_faces-1; i > -1; i--)
-      i_face_element[i+1] = i_face_element[i];
+   for (i = num_faces - 1; i > -1; i--)
+   {
+      i_face_element[i + 1] = i_face_element[i];
+   }
 
    i_face_element[0] = 0;
 
@@ -1305,15 +1405,21 @@ transpose_matrix_create(  HYPRE_Int **i_face_element_pointer,
    *j_face_element_pointer = j_face_element;
 
    return 0;
-
 }
+
 HYPRE_Int
-matrix_matrix_product(    HYPRE_Int **i_element_edge_pointer,
-                          HYPRE_Int **j_element_edge_pointer,
-                          HYPRE_Int *i_element_face, HYPRE_Int *j_element_face,
-                          HYPRE_Int *i_face_edge, HYPRE_Int *j_face_edge,
-                          HYPRE_Int num_elements, HYPRE_Int num_faces, HYPRE_Int num_edges)
+matrix_matrix_product(HYPRE_Int **i_element_edge_pointer,
+                      HYPRE_Int **j_element_edge_pointer,
+                      HYPRE_Int  *i_element_face,
+                      HYPRE_Int  *j_element_face,
+                      HYPRE_Int  *i_face_edge,
+                      HYPRE_Int  *j_face_edge,
+                      HYPRE_Int   num_elements,
+                      HYPRE_Int   num_faces,
+                      HYPRE_Int   num_edges)
 {
+   HYPRE_UNUSED_VAR(num_faces);
+
    /* FILE *f; */
    HYPRE_Int i, j, k, l, m;
 
@@ -1323,21 +1429,22 @@ matrix_matrix_product(    HYPRE_Int **i_element_edge_pointer,
 
    HYPRE_Int *i_element_edge, *j_element_edge;
 
-   j_local_element_edge = hypre_TAlloc(HYPRE_Int, (num_edges+1) , HYPRE_MEMORY_HOST);
+   j_local_element_edge = hypre_TAlloc(HYPRE_Int, (num_edges + 1), HYPRE_MEMORY_HOST);
+   i_element_edge = hypre_TAlloc(HYPRE_Int, (num_elements + 1), HYPRE_MEMORY_HOST);
 
-   i_element_edge = hypre_TAlloc(HYPRE_Int, (num_elements+1) , HYPRE_MEMORY_HOST);
-
-   for (i=0; i < num_elements+1; i++)
+   for (i = 0; i < num_elements + 1; i++)
+   {
       i_element_edge[i] = 0;
+   }
 
-   for (i=0; i < num_elements; i++)
+   for (i = 0; i < num_elements; i++)
    {
       local_element_edge_counter = 0;
-      for (j=i_element_face[i]; j < i_element_face[i+1]; j++)
+      for (j = i_element_face[i]; j < i_element_face[i + 1]; j++)
       {
          k = j_element_face[j];
 
-         for (l=i_face_edge[k]; l < i_face_edge[k+1]; l++)
+         for (l = i_face_edge[k]; l < i_face_edge[k + 1]; l++)
          {
             /* element i  and edge j_face_edge[l] are connected */
 
@@ -1345,18 +1452,19 @@ matrix_matrix_product(    HYPRE_Int **i_element_edge_pointer,
                i, j_face_edge[l]);  */
 
             i_edge_on_local_list = -1;
-            for (m=0; m < local_element_edge_counter; m++)
+            for (m = 0; m < local_element_edge_counter; m++)
+            {
                if (j_local_element_edge[m] == j_face_edge[l])
                {
                   i_edge_on_local_list++;
                   break;
                }
+            }
 
             if (i_edge_on_local_list == -1)
             {
                i_element_edge[i]++;
-               j_local_element_edge[local_element_edge_counter]=
-                  j_face_edge[l];
+               j_local_element_edge[local_element_edge_counter] = j_face_edge[l];
                local_element_edge_counter++;
             }
          }
@@ -1365,55 +1473,55 @@ matrix_matrix_product(    HYPRE_Int **i_element_edge_pointer,
 
    hypre_TFree(j_local_element_edge, HYPRE_MEMORY_HOST);
 
-   for (i=0; i < num_elements; i++)
-      i_element_edge[i+1] += i_element_edge[i];
+   for (i = 0; i < num_elements; i++)
+   {
+      i_element_edge[i + 1] += i_element_edge[i];
+   }
 
-   for (i=num_elements; i>0; i--)
-      i_element_edge[i] = i_element_edge[i-1];
+   for (i = num_elements; i > 0; i--)
+   {
+      i_element_edge[i] = i_element_edge[i - 1];
+   }
 
    i_element_edge[0] = 0;
-
-   j_element_edge = hypre_TAlloc(HYPRE_Int, i_element_edge[num_elements]
-                                         , HYPRE_MEMORY_HOST);
+   j_element_edge = hypre_TAlloc(HYPRE_Int, i_element_edge[num_elements], HYPRE_MEMORY_HOST);
 
    /* fill--in the actual j_element_edge array: --------------------- */
 
    element_edge_counter = 0;
-   for (i=0; i < num_elements; i++)
+   for (i = 0; i < num_elements; i++)
    {
       i_element_edge[i] = element_edge_counter;
-      for (j=i_element_face[i]; j < i_element_face[i+1]; j++)
+      for (j = i_element_face[i]; j < i_element_face[i + 1]; j++)
       {
-         for (k=i_face_edge[j_element_face[j]];
-              k<i_face_edge[j_element_face[j]+1];k++)
+         for (k = i_face_edge[j_element_face[j]]; k < i_face_edge[j_element_face[j] + 1]; k++)
          {
             /* check if edge j_face_edge[k] is already on list ***/
 
             i_edge_on_list = -1;
-            for (l=i_element_edge[i];
-                 l<element_edge_counter; l++)
+            for (l = i_element_edge[i]; l < element_edge_counter; l++)
+            {
                if (j_element_edge[l] == j_face_edge[k])
                {
                   i_edge_on_list++;
                   break;
                }
+            }
 
             if (i_edge_on_list == -1)
             {
                if (element_edge_counter >=
                    i_element_edge[num_elements])
                {
-                  hypre_error_w_msg(HYPRE_ERROR_GENERIC,"error in j_element_edge size: \n");
+                  hypre_error_w_msg(HYPRE_ERROR_GENERIC, "error in j_element_edge size: \n");
                   break;
                }
 
-               j_element_edge[element_edge_counter] =
-                  j_face_edge[k];
+               j_element_edge[element_edge_counter] = j_face_edge[k];
                element_edge_counter++;
             }
          }
       }
-
    }
 
    i_element_edge[num_elements] = element_edge_counter;
@@ -1456,12 +1564,16 @@ matrix_matrix_product(    HYPRE_Int **i_element_edge_pointer,
  *
  *****************************************************************************/
 HYPRE_Int
-hypre_AMGCreateDomainDof(hypre_CSRMatrix     *A,
-                         HYPRE_Int domain_type, HYPRE_Int overlap,
-                         HYPRE_Int num_functions, HYPRE_Int *dof_func,
-                         hypre_CSRMatrix    **domain_structure_pointer,
-                         HYPRE_Int **piv_pointer, HYPRE_Int use_nonsymm)
+hypre_AMGCreateDomainDof(hypre_CSRMatrix  *A,
+                         HYPRE_Int         domain_type,
+                         HYPRE_Int         overlap,
+                         HYPRE_Int         num_functions,
+                         HYPRE_Int        *dof_func,
+                         hypre_CSRMatrix **domain_structure_pointer,
+                         HYPRE_Int       **piv_pointer,
+                         HYPRE_Int         use_nonsymm)
 {
+   HYPRE_UNUSED_VAR(dof_func);
 
    HYPRE_Int *i_domain_dof, *j_domain_dof;
    HYPRE_Real *domain_matrixinverse;
@@ -1475,18 +1587,18 @@ hypre_AMGCreateDomainDof(hypre_CSRMatrix     *A,
 
    /* HYPRE_Int *i_dof_to_accept_weight; */
    HYPRE_Int *i_dof_to_prefer_weight,
-      *w_dof_dof, *i_dof_weight;
+             *w_dof_dof, *i_dof_weight;
    HYPRE_Int *i_dof_to_aggregate, *i_aggregate_dof, *j_aggregate_dof;
 
    HYPRE_Int *i_dof_index;
 
    HYPRE_Int ierr = 0;
-   HYPRE_Int i,j,k,  l_loc, i_loc, j_loc;
+   HYPRE_Int i, j, k,  l_loc, i_loc, j_loc;
    HYPRE_Int i_dof;
    HYPRE_Int *i_local_to_global;
    HYPRE_Int *i_global_to_local;
 
-   HYPRE_Int local_dof_counter, max_local_dof_counter=0;
+   HYPRE_Int local_dof_counter, max_local_dof_counter = 0;
 
    HYPRE_Int domain_dof_counter = 0, domain_matrixinverse_counter = 0;
    HYPRE_Int nf;
@@ -1511,14 +1623,13 @@ hypre_AMGCreateDomainDof(hypre_CSRMatrix     *A,
    if (num_dofs == 0)
    {
       *domain_structure_pointer = domain_structure;
-
       *piv_pointer = piv;
 
       return hypre_error_flag;
    }
 
-   i_aggregate_dof = hypre_CTAlloc(HYPRE_Int, num_dofs+1, HYPRE_MEMORY_HOST);
-   j_aggregate_dof= hypre_CTAlloc(HYPRE_Int, num_dofs, HYPRE_MEMORY_HOST);
+   i_aggregate_dof = hypre_CTAlloc(HYPRE_Int, num_dofs + 1, HYPRE_MEMORY_HOST);
+   j_aggregate_dof = hypre_CTAlloc(HYPRE_Int, num_dofs, HYPRE_MEMORY_HOST);
 
    if (domain_type == 2)
    {
@@ -1526,14 +1637,20 @@ hypre_AMGCreateDomainDof(hypre_CSRMatrix     *A,
       w_dof_dof = hypre_CTAlloc(HYPRE_Int, i_dof_dof[num_dofs], HYPRE_MEMORY_HOST);
       i_dof_weight = hypre_CTAlloc(HYPRE_Int, num_dofs, HYPRE_MEMORY_HOST);
 
-      for (i=0; i<num_dofs; i++)
-         for (j=i_dof_dof[i]; j< i_dof_dof[i+1]; j++)
+      for (i = 0; i < num_dofs; i++)
+      {
+         for (j = i_dof_dof[i]; j < i_dof_dof[i + 1]; j++)
          {
             if (j_dof_dof[j] == i)
-               w_dof_dof[j]=0;
+            {
+               w_dof_dof[j] = 0;
+            }
             else
-               w_dof_dof[j]=1;
+            {
+               w_dof_dof[j] = 1;
+            }
          }
+      }
 
       /*hypre_printf("end computing weights for agglomeration procedure: --------\n");
        */
@@ -1552,15 +1669,14 @@ hypre_AMGCreateDomainDof(hypre_CSRMatrix     *A,
    }
    else
    {
-      nf = 1;
-      if (domain_type == 1) nf = num_functions;
+      nf = (domain_type == 1) ? num_functions : 1;
 
-      num_domains = num_dofs/nf;
-      for (i=0; i < num_domains+1; i++)
+      num_domains = num_dofs / nf;
+      for (i = 0; i < num_domains + 1; i++)
       {
-         i_aggregate_dof[i] = nf*i;
+         i_aggregate_dof[i] = nf * i;
       }
-      for (i=0; i < num_dofs; i++)
+      for (i = 0; i < num_dofs; i++)
       {
          j_aggregate_dof[i] = i;
       }
@@ -1588,58 +1704,73 @@ hypre_AMGCreateDomainDof(hypre_CSRMatrix     *A,
 
    if (overlap == 1)
    {
-      i_domain_dof = hypre_CTAlloc(HYPRE_Int,  num_domains+1, HYPRE_MEMORY_HOST);
+      i_domain_dof = hypre_CTAlloc(HYPRE_Int, num_domains + 1, HYPRE_MEMORY_HOST);
+      i_dof_index  = hypre_CTAlloc(HYPRE_Int, num_dofs, HYPRE_MEMORY_HOST);
 
-      i_dof_index = hypre_CTAlloc(HYPRE_Int,  num_dofs, HYPRE_MEMORY_HOST);
-
-      for (i=0; i < num_dofs; i++)
+      for (i = 0; i < num_dofs; i++)
+      {
          i_dof_index[i] = -1;
+      }
 
       i_dof_to_aggregate = hypre_CTAlloc(HYPRE_Int,  num_dofs, HYPRE_MEMORY_HOST);
-      for (i=0; i < num_domains; i++)
-         for (j=i_aggregate_dof[i]; j < i_aggregate_dof[i+1]; j++)
+      for (i = 0; i < num_domains; i++)
+      {
+         for (j = i_aggregate_dof[i]; j < i_aggregate_dof[i + 1]; j++)
+         {
             i_dof_to_aggregate[j_aggregate_dof[j]] = i;
+         }
+      }
 
-      domain_dof_counter=0;
-      for (i=0; i < num_domains; i++)
+      domain_dof_counter = 0;
+      for (i = 0; i < num_domains; i++)
       {
          i_domain_dof[i] =  domain_dof_counter;
-         for (j=i_aggregate_dof[i]; j < i_aggregate_dof[i+1]; j++)
-            i_dof_index[j_aggregate_dof[j]]=-1;
-
-         for (j=i_aggregate_dof[i]; j < i_aggregate_dof[i+1]; j++)
-            for (k=i_dof_dof[j_aggregate_dof[j]];
-                 k<i_dof_dof[j_aggregate_dof[j]+1]; k++)
-               if (i_dof_to_aggregate[j_dof_dof[k]] >= i
-                   && i_dof_index[j_dof_dof[k]]==-1)
+         for (j = i_aggregate_dof[i]; j < i_aggregate_dof[i + 1]; j++)
+         {
+            i_dof_index[j_aggregate_dof[j]] = -1;
+         }
+
+         for (j = i_aggregate_dof[i]; j < i_aggregate_dof[i + 1]; j++)
+         {
+            for (k = i_dof_dof[j_aggregate_dof[j]]; k < i_dof_dof[j_aggregate_dof[j] + 1]; k++)
+            {
+               if (i_dof_to_aggregate[j_dof_dof[k]] >= i && i_dof_index[j_dof_dof[k]] == -1)
                {
                   i_dof_index[j_dof_dof[k]]++;
                   domain_dof_counter++;
                }
+            }
+         }
       }
 
       i_domain_dof[num_domains] =  domain_dof_counter;
       j_domain_dof = hypre_CTAlloc(HYPRE_Int, domain_dof_counter, HYPRE_MEMORY_HOST);
 
-      for (i=0; i < num_dofs; i++)
+      for (i = 0; i < num_dofs; i++)
+      {
          i_dof_index[i] = -1;
+      }
 
-      domain_dof_counter=0;
-      for (i=0; i < num_domains; i++)
+      domain_dof_counter = 0;
+      for (i = 0; i < num_domains; i++)
       {
-         for (j=i_aggregate_dof[i]; j < i_aggregate_dof[i+1]; j++)
-            i_dof_index[j_aggregate_dof[j]]=-1;
+         for (j = i_aggregate_dof[i]; j < i_aggregate_dof[i + 1]; j++)
+         {
+            i_dof_index[j_aggregate_dof[j]] = -1;
+         }
 
-         for (j=i_aggregate_dof[i]; j < i_aggregate_dof[i+1]; j++)
-            for (k=i_dof_dof[j_aggregate_dof[j]];
-                 k<i_dof_dof[j_aggregate_dof[j]+1]; k++)
-               if (i_dof_to_aggregate[j_dof_dof[k]] >= i
-                   && i_dof_index[j_dof_dof[k]]==-1)
+         for (j = i_aggregate_dof[i]; j < i_aggregate_dof[i + 1]; j++)
+         {
+            for (k = i_dof_dof[j_aggregate_dof[j]]; k < i_dof_dof[j_aggregate_dof[j] + 1]; k++)
+            {
+               if (i_dof_to_aggregate[j_dof_dof[k]] >= i && i_dof_index[j_dof_dof[k]] == -1)
                {
                   i_dof_index[j_dof_dof[k]]++;
                   j_domain_dof[domain_dof_counter] = j_dof_dof[k];
                   domain_dof_counter++;
                }
+            }
+         }
       }
 
       hypre_TFree(i_aggregate_dof, HYPRE_MEMORY_HOST);
@@ -1649,56 +1780,73 @@ hypre_AMGCreateDomainDof(hypre_CSRMatrix     *A,
    }
    else if (overlap == 2)
    {
-      i_domain_dof = hypre_CTAlloc(HYPRE_Int,  num_domains+1, HYPRE_MEMORY_HOST);
+      i_domain_dof = hypre_CTAlloc(HYPRE_Int,  num_domains + 1, HYPRE_MEMORY_HOST);
 
       i_dof_index = hypre_CTAlloc(HYPRE_Int,  num_dofs, HYPRE_MEMORY_HOST);
 
-      for (i=0; i < num_dofs; i++)
+      for (i = 0; i < num_dofs; i++)
+      {
          i_dof_index[i] = -1;
+      }
 
-      domain_dof_counter=0;
-      for (i=0; i < num_domains; i++)
+      domain_dof_counter = 0;
+      for (i = 0; i < num_domains; i++)
       {
          i_domain_dof[i] =  domain_dof_counter;
-         for (j=i_aggregate_dof[i]; j < i_aggregate_dof[i+1]; j++)
-            for (k=i_dof_dof[j_aggregate_dof[j]];
-                 k<i_dof_dof[j_aggregate_dof[j]+1]; k++)
-               if (i_dof_index[j_dof_dof[k]]==-1)
+         for (j = i_aggregate_dof[i]; j < i_aggregate_dof[i + 1]; j++)
+         {
+            for (k = i_dof_dof[j_aggregate_dof[j]]; k < i_dof_dof[j_aggregate_dof[j] + 1]; k++)
+            {
+               if (i_dof_index[j_dof_dof[k]] == -1)
                {
                   i_dof_index[j_dof_dof[k]]++;
                   domain_dof_counter++;
                }
+            }
+         }
 
-         for (j=i_aggregate_dof[i]; j < i_aggregate_dof[i+1]; j++)
-            for (k=i_dof_dof[j_aggregate_dof[j]];
-                 k<i_dof_dof[j_aggregate_dof[j]+1]; k++)
-               i_dof_index[j_dof_dof[k]]=-1;
-
+         for (j = i_aggregate_dof[i]; j < i_aggregate_dof[i + 1]; j++)
+         {
+            for (k = i_dof_dof[j_aggregate_dof[j]];
+                 k < i_dof_dof[j_aggregate_dof[j] + 1]; k++)
+            {
+               i_dof_index[j_dof_dof[k]] = -1;
+            }
+         }
       }
 
-      for (i=0; i < num_dofs; i++)
+      for (i = 0; i < num_dofs; i++)
+      {
          i_dof_index[i] = -1;
+      }
 
       i_domain_dof[num_domains] =  domain_dof_counter;
       j_domain_dof = hypre_CTAlloc(HYPRE_Int, domain_dof_counter, HYPRE_MEMORY_HOST);
 
-      domain_dof_counter=0;
-      for (i=0; i < num_domains; i++)
+      domain_dof_counter = 0;
+      for (i = 0; i < num_domains; i++)
       {
-         for (j=i_aggregate_dof[i]; j < i_aggregate_dof[i+1]; j++)
-            for (k=i_dof_dof[j_aggregate_dof[j]];
-                 k<i_dof_dof[j_aggregate_dof[j]+1]; k++)
-               if ( i_dof_index[j_dof_dof[k]]==-1)
+         for (j = i_aggregate_dof[i]; j < i_aggregate_dof[i + 1]; j++)
+         {
+            for (k = i_dof_dof[j_aggregate_dof[j]]; k < i_dof_dof[j_aggregate_dof[j] + 1]; k++)
+            {
+               if ( i_dof_index[j_dof_dof[k]] == -1)
                {
                   i_dof_index[j_dof_dof[k]]++;
                   j_domain_dof[domain_dof_counter] = j_dof_dof[k];
                   domain_dof_counter++;
                }
+            }
+         }
 
-         for (j=i_aggregate_dof[i]; j < i_aggregate_dof[i+1]; j++)
-            for (k=i_dof_dof[j_aggregate_dof[j]];
-                 k<i_dof_dof[j_aggregate_dof[j]+1]; k++)
-               i_dof_index[j_dof_dof[k]]=-1;
+         for (j = i_aggregate_dof[i]; j < i_aggregate_dof[i + 1]; j++)
+         {
+            for (k = i_dof_dof[j_aggregate_dof[j]];
+                 k < i_dof_dof[j_aggregate_dof[j] + 1]; k++)
+            {
+               i_dof_index[j_dof_dof[k]] = -1;
+            }
+         }
       }
 
       hypre_TFree(i_aggregate_dof, HYPRE_MEMORY_HOST);
@@ -1717,33 +1865,39 @@ hypre_AMGCreateDomainDof(hypre_CSRMatrix     *A,
    local_dof_counter = 0;
    piv_counter = 0;
 
-   for (i=0; i < num_domains; i++)
+   for (i = 0; i < num_domains; i++)
    {
-      local_dof_counter = i_domain_dof[i+1]-i_domain_dof[i];
-      domain_matrixinverse_counter+= local_dof_counter * local_dof_counter;
+      local_dof_counter = i_domain_dof[i + 1] - i_domain_dof[i];
+      domain_matrixinverse_counter += local_dof_counter * local_dof_counter;
       piv_counter += local_dof_counter;
 
       if (local_dof_counter > max_local_dof_counter)
+      {
          max_local_dof_counter = local_dof_counter;
+      }
    }
 
-   domain_matrixinverse = hypre_CTAlloc(HYPRE_Real,  domain_matrixinverse_counter, HYPRE_MEMORY_HOST);
+   domain_matrixinverse = hypre_CTAlloc(HYPRE_Real,  domain_matrixinverse_counter,
+                                        HYPRE_MEMORY_HOST);
    if (use_nonsymm)
+   {
       piv = hypre_CTAlloc(HYPRE_Int,  piv_counter, HYPRE_MEMORY_HOST);
+   }
 
    i_local_to_global = hypre_CTAlloc(HYPRE_Int,  max_local_dof_counter, HYPRE_MEMORY_HOST);
-
    i_global_to_local = hypre_CTAlloc(HYPRE_Int, num_dofs, HYPRE_MEMORY_HOST);
 
-   for (i=0; i < num_dofs; i++)
+   for (i = 0; i < num_dofs; i++)
+   {
       i_global_to_local[i] = -1;
+   }
 
    piv_counter = 0;
    domain_matrixinverse_counter = 0;
-   for (i=0; i < num_domains; i++)
+   for (i = 0; i < num_domains; i++)
    {
       local_dof_counter = 0;
-      for (j=i_domain_dof[i]; j < i_domain_dof[i+1]; j++)
+      for (j = i_domain_dof[i]; j < i_domain_dof[i + 1]; j++)
       {
          i_global_to_local[j_domain_dof[j]] = local_dof_counter;
          i_local_to_global[local_dof_counter] = j_domain_dof[j];
@@ -1755,18 +1909,24 @@ hypre_AMGCreateDomainDof(hypre_CSRMatrix     *A,
 
       AE = &domain_matrixinverse[domain_matrixinverse_counter];
       ipiv = &piv[piv_counter];
-      for (i_loc=0; i_loc < local_dof_counter; i_loc++)
-         for (j_loc=0; j_loc < local_dof_counter; j_loc++)
+      for (i_loc = 0; i_loc < local_dof_counter; i_loc++)
+      {
+         for (j_loc = 0; j_loc < local_dof_counter; j_loc++)
+         {
             AE[cnt++] = 0.e0;
+         }
+      }
 
-      for (i_loc=0; i_loc < local_dof_counter; i_loc++)
+      for (i_loc = 0; i_loc < local_dof_counter; i_loc++)
       {
          i_dof = i_local_to_global[i_loc];
-         for (j=i_dof_dof[i_dof]; j < i_dof_dof[i_dof+1]; j++)
+         for (j = i_dof_dof[i_dof]; j < i_dof_dof[i_dof + 1]; j++)
          {
             j_loc = i_global_to_local[j_dof_dof[j]];
-            if (j_loc >=0)
+            if (j_loc >= 0)
+            {
                AE[i_loc + j_loc * local_dof_counter] = a_dof_dof[j];
+            }
          }
       }
 
@@ -1775,20 +1935,20 @@ hypre_AMGCreateDomainDof(hypre_CSRMatrix     *A,
          hypre_dgetrf(&local_dof_counter,
                       &local_dof_counter, AE,
                       &local_dof_counter, ipiv, &ierr);
-         piv_counter +=local_dof_counter;
+         piv_counter += local_dof_counter;
       }
-
       else
       {
-         hypre_dpotrf(&uplo,&local_dof_counter, AE,
+         hypre_dpotrf(&uplo, &local_dof_counter, AE,
                       &local_dof_counter, &ierr);
       }
 
-      domain_matrixinverse_counter+=local_dof_counter*local_dof_counter;
+      domain_matrixinverse_counter += local_dof_counter * local_dof_counter;
 
-      for (l_loc=0; l_loc < local_dof_counter; l_loc++)
+      for (l_loc = 0; l_loc < local_dof_counter; l_loc++)
+      {
          i_global_to_local[i_local_to_global[l_loc]] = -1;
-
+      }
    }
 
    hypre_TFree(i_local_to_global, HYPRE_MEMORY_HOST);
@@ -1812,14 +1972,21 @@ hypre_AMGCreateDomainDof(hypre_CSRMatrix     *A,
 
 /* unacceptable faces: i_face_to_prefer_weight[] = -1; ------------------*/
 
-HYPRE_Int hypre_AMGeAgglomerate(HYPRE_Int *i_AE_element, HYPRE_Int *j_AE_element,
-                                HYPRE_Int *i_face_face, HYPRE_Int *j_face_face, HYPRE_Int *w_face_face,
-                                HYPRE_Int *i_face_element, HYPRE_Int *j_face_element,
-                                HYPRE_Int *i_element_face, HYPRE_Int *j_element_face,
-                                HYPRE_Int *i_face_to_prefer_weight,
-                                HYPRE_Int *i_face_weight,
-                                HYPRE_Int num_faces, HYPRE_Int num_elements,
-                                HYPRE_Int *num_AEs_pointer)
+HYPRE_Int
+hypre_AMGeAgglomerate(HYPRE_Int *i_AE_element,
+                      HYPRE_Int *j_AE_element,
+                      HYPRE_Int *i_face_face,
+                      HYPRE_Int *j_face_face,
+                      HYPRE_Int *w_face_face,
+                      HYPRE_Int *i_face_element,
+                      HYPRE_Int *j_face_element,
+                      HYPRE_Int *i_element_face,
+                      HYPRE_Int *j_element_face,
+                      HYPRE_Int *i_face_to_prefer_weight,
+                      HYPRE_Int *i_face_weight,
+                      HYPRE_Int  num_faces,
+                      HYPRE_Int  num_elements,
+                      HYPRE_Int *num_AEs_pointer)
 {
    HYPRE_Int ierr = 0;
    HYPRE_Int i, j, k, l;
@@ -1827,7 +1994,7 @@ HYPRE_Int hypre_AMGeAgglomerate(HYPRE_Int *i_AE_element, HYPRE_Int *j_AE_element
    HYPRE_Int face_to_eliminate;
    HYPRE_Int max_weight_old, max_weight;
 
-   HYPRE_Int AE_counter=0, AE_element_counter=0;
+   HYPRE_Int AE_counter = 0, AE_element_counter = 0;
 
    /* HYPRE_Int i_element_face_counter; */
 
@@ -1841,34 +2008,40 @@ HYPRE_Int hypre_AMGeAgglomerate(HYPRE_Int *i_AE_element, HYPRE_Int *j_AE_element
    HYPRE_Int weight, weight_max;
 
    max_weight = 1;
-   for (i=0; i < num_faces; i++)
+   for (i = 0; i < num_faces; i++)
    {
       weight = 1;
-      for (j=i_face_face[i]; j < i_face_face[i+1]; j++)
-         weight+= w_face_face[j];
-      if (max_weight < weight) max_weight = weight;
-   }
-
-   first = hypre_CTAlloc(HYPRE_Int,  max_weight+1, HYPRE_MEMORY_HOST);
+      for (j = i_face_face[i]; j < i_face_face[i + 1]; j++)
+      {
+         weight += w_face_face[j];
+      }
 
-   next = hypre_CTAlloc(HYPRE_Int,  num_faces, HYPRE_MEMORY_HOST);
+      if (max_weight < weight)
+      {
+         max_weight = weight;
+      }
+   }
 
-   previous = hypre_CTAlloc(HYPRE_Int,  num_faces+1, HYPRE_MEMORY_HOST);
+   first    = hypre_CTAlloc(HYPRE_Int, max_weight + 1, HYPRE_MEMORY_HOST);
+   next     = hypre_CTAlloc(HYPRE_Int, num_faces, HYPRE_MEMORY_HOST);
+   previous = hypre_CTAlloc(HYPRE_Int, num_faces + 1, HYPRE_MEMORY_HOST);
 
    tail = num_faces;
    head = -1;
 
-   for (i=0; i < num_faces; i++)
+   for (i = 0; i < num_faces; i++)
    {
-      next[i] = i+1;
-      previous[i] = i-1;
+      next[i] = i + 1;
+      previous[i] = i - 1;
    }
 
-   last = num_faces-1;
+   last = num_faces - 1;
    previous[tail] = last;
 
-   for (weight=1; weight <= max_weight; weight++)
+   for (weight = 1; weight <= max_weight; weight++)
+   {
       first[weight] = tail;
+   }
 
    i_element_to_AE = hypre_CTAlloc(HYPRE_Int,  num_elements, HYPRE_MEMORY_HOST);
 
@@ -1876,11 +2049,15 @@ HYPRE_Int hypre_AMGeAgglomerate(HYPRE_Int *i_AE_element, HYPRE_Int *j_AE_element
      AGGLOMERATION PROCEDURE:
      ======================================================================= */
 
-   for (k=0; k < num_elements; k++)
+   for (k = 0; k < num_elements; k++)
+   {
       i_element_to_AE[k] = -1;
+   }
 
-   for (k=0; k < num_faces; k++)
+   for (k = 0; k < num_faces; k++)
+   {
       i_face_weight[k] = 1;
+   }
 
    first[0] = 0;
    first[1] = 0;
@@ -1890,14 +2067,16 @@ HYPRE_Int hypre_AMGeAgglomerate(HYPRE_Int *i_AE_element, HYPRE_Int *j_AE_element
 
    k = last;
    face_max_weight = -1;
-   while (k!= head)
+   while (k != head)
    {
       if (i_face_to_prefer_weight[k] > -1)
+      {
          face_max_weight = k;
+      }
 
-      if (face_max_weight > -1) break;
+      if (face_max_weight > -1) { break; }
 
-      k=previous[k];
+      k = previous[k];
    }
 
    /* this will be used if the faces have been sorted: *****************
@@ -1953,12 +2132,13 @@ HYPRE_Int hypre_AMGeAgglomerate(HYPRE_Int *i_AE_element, HYPRE_Int *j_AE_element
 
    if (face_max_weight == -1)
    {
-      hypre_error_w_msg(HYPRE_ERROR_GENERIC,"all faces are unacceptable, i.e., no faces to eliminate !\n");
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                        "all faces are unacceptable, i.e., no faces to eliminate !\n");
 
       *num_AEs_pointer = 1;
 
       i_AE_element[0] = 0;
-      for (i=0; i < num_elements; i++)
+      for (i = 0; i < num_elements; i++)
       {
          i_element_to_AE[i] = 0;
          j_AE_element[i] = i;
@@ -1969,14 +2149,18 @@ HYPRE_Int hypre_AMGeAgglomerate(HYPRE_Int *i_AE_element, HYPRE_Int *j_AE_element
       return hypre_error_flag;
    }
 
-   for (k=0; k < num_faces; k++)
+   for (k = 0; k < num_faces; k++)
+   {
       if (i_face_to_prefer_weight[k] > i_face_to_prefer_weight[face_max_weight])
+      {
          face_max_weight = k;
+      }
+   }
 
    max_weight = i_face_weight[face_max_weight];
 
-   AE_counter=0;
-   AE_element_counter=0;
+   AE_counter = 0;
+   AE_element_counter = 0;
 
    i_AE_element[AE_counter] = AE_element_counter;
 
@@ -1984,17 +2168,14 @@ HYPRE_Int hypre_AMGeAgglomerate(HYPRE_Int *i_AE_element, HYPRE_Int *j_AE_element
 
    face_local_max_weight = face_max_weight;
 
-  eliminate_face:
+eliminate_face:
 
    face_to_eliminate = face_local_max_weight;
 
    max_weight = i_face_weight[face_to_eliminate];
 
    last = previous[tail];
-   if (last == head)
-      weight_max = 0;
-   else
-      weight_max = i_face_weight[last];
+   weight_max = (last == head) ? 0 : i_face_weight[last];
 
    ierr = hypre_remove_entry(max_weight, &weight_max,
                              previous, next, first, &last,
@@ -2010,11 +2191,9 @@ HYPRE_Int hypre_AMGeAgglomerate(HYPRE_Int *i_AE_element, HYPRE_Int *j_AE_element
     *  that share face "face_to_eliminate";
     *----------------------------------------------------------*/
 
-   for (k = i_face_element[face_to_eliminate];
-        k < i_face_element[face_to_eliminate+1]; k++)
+   for (k = i_face_element[face_to_eliminate]; k < i_face_element[face_to_eliminate + 1]; k++)
    {
       /* check if element j_face_element[k] is already on the list: */
-
       if (j_face_element[k] < num_elements)
       {
          if (i_element_to_AE[j_face_element[k]] == -1)
@@ -2028,35 +2207,27 @@ HYPRE_Int hypre_AMGeAgglomerate(HYPRE_Int *i_AE_element, HYPRE_Int *j_AE_element
 
    /* local update & search:==================================== */
 
-   for (j=i_face_face[face_to_eliminate];
-        j<i_face_face[face_to_eliminate+1]; j++)
+   for (j = i_face_face[face_to_eliminate]; j < i_face_face[face_to_eliminate + 1]; j++)
+   {
       if (i_face_weight[j_face_face[j]] > 0)
       {
-         weight = i_face_weight[j_face_face[j]];
-
-
-         last = previous[tail];
-         if (last == head)
-            weight_max = 0;
-         else
-            weight_max = i_face_weight[last];
+         weight     = i_face_weight[j_face_face[j]];
+         last       = previous[tail];
+         weight_max = (last == head) ? 0 : i_face_weight[last];
 
          ierr = hypre_move_entry(weight, &weight_max,
                                  previous, next, first, &last,
                                  head, tail,
                                  j_face_face[j]);
 
-         i_face_weight[j_face_face[j]]+=w_face_face[j];
+         i_face_weight[j_face_face[j]] += w_face_face[j];
 
          weight = i_face_weight[j_face_face[j]];
 
          /* hypre_printf("update entry: %d\n", j_face_face[j]);  */
 
          last = previous[tail];
-         if (last == head)
-            weight_max = 0;
-         else
-            weight_max = i_face_weight[last];
+         weight_max = (last == head) ? 0 : i_face_weight[last];
 
          ierr = hypre_update_entry(weight, &weight_max,
                                    previous, next, first, &last,
@@ -2065,29 +2236,30 @@ HYPRE_Int hypre_AMGeAgglomerate(HYPRE_Int *i_AE_element, HYPRE_Int *j_AE_element
 
          last = previous[tail];
          if (last == head)
+         {
             weight_max = 0;
+         }
          else
+         {
             weight_max = i_face_weight[last];
+         }
       }
+   }
 
    /* find a face of the elements that have already been agglomerated
       with a maximal weight: ====================================== */
 
    max_weight_old = max_weight;
-
    face_local_max_weight = -1;
    preferred_weight = -1;
 
-   for (l = i_AE_element[AE_counter];
-        l < AE_element_counter; l++)
+   for (l = i_AE_element[AE_counter]; l < AE_element_counter; l++)
    {
-      for (j=i_element_face[j_AE_element[l]];
-           j<i_element_face[j_AE_element[l]+1]; j++)
+      for (j = i_element_face[j_AE_element[l]]; j < i_element_face[j_AE_element[l] + 1]; j++)
       {
          i = j_element_face[j];
 
-         if (max_weight_old > 1 && i_face_weight[i] > 0 &&
-             i_face_to_prefer_weight[i] > -1)
+         if (max_weight_old > 1 && i_face_weight[i] > 0 && i_face_to_prefer_weight[i] > -1)
          {
             if ( max_weight < i_face_weight[i])
             {
@@ -2096,8 +2268,7 @@ HYPRE_Int hypre_AMGeAgglomerate(HYPRE_Int *i_AE_element, HYPRE_Int *j_AE_element
                preferred_weight = i_face_to_prefer_weight[i];
             }
 
-            if ( max_weight == i_face_weight[i]
-                 && i_face_to_prefer_weight[i] > preferred_weight)
+            if ( max_weight == i_face_weight[i] && i_face_to_prefer_weight[i] > preferred_weight)
             {
                face_local_max_weight = i;
                preferred_weight = i_face_to_prefer_weight[i];
@@ -2106,7 +2277,10 @@ HYPRE_Int hypre_AMGeAgglomerate(HYPRE_Int *i_AE_element, HYPRE_Int *j_AE_element
       }
    }
 
-   if (face_local_max_weight > -1) goto eliminate_face;
+   if (face_local_max_weight > -1)
+   {
+      goto eliminate_face;
+   }
 
    /* ----------------------------------------------------------------
     * eliminate and label with i_face_weight[ ] = -1
@@ -2118,17 +2292,20 @@ HYPRE_Int hypre_AMGeAgglomerate(HYPRE_Int *i_AE_element, HYPRE_Int *j_AE_element
    for (k = i_AE_element[AE_counter]; k < AE_element_counter; k++)
    {
       for (j = i_element_face[j_AE_element[k]];
-           j < i_element_face[j_AE_element[k]+1]; j++)
+           j < i_element_face[j_AE_element[k] + 1]; j++)
       {
          if (i_face_weight[j_element_face[j]] > 0)
          {
             weight = i_face_weight[j_element_face[j]];
             last = previous[tail];
             if (last == head)
+            {
                weight_max = 0;
+            }
             else
+            {
                weight_max = i_face_weight[last];
-
+            }
 
             ierr = hypre_remove_entry(weight, &weight_max,
                                       previous, next, first, &last,
@@ -2136,7 +2313,6 @@ HYPRE_Int hypre_AMGeAgglomerate(HYPRE_Int *i_AE_element, HYPRE_Int *j_AE_element
                                       j_element_face[j]);
 
             i_face_weight[j_element_face[j]] = -1;
-
          }
       }
    }
@@ -2153,7 +2329,10 @@ HYPRE_Int hypre_AMGeAgglomerate(HYPRE_Int *i_AE_element, HYPRE_Int *j_AE_element
    /* find a face with maximal weight: ---------------------------*/
 
    last = previous[tail];
-   if (last == head) goto end_agglomerate;
+   if (last == head)
+   {
+      goto end_agglomerate;
+   }
 
    weight_max = i_face_weight[last];
 
@@ -2165,7 +2344,9 @@ HYPRE_Int hypre_AMGeAgglomerate(HYPRE_Int *i_AE_element, HYPRE_Int *j_AE_element
    while (k != head)
    {
       if (i_face_to_prefer_weight[k] > -1)
+      {
          face_max_weight = k;
+      }
 
       if (face_max_weight > -1)
       {
@@ -2174,69 +2355,74 @@ HYPRE_Int hypre_AMGeAgglomerate(HYPRE_Int *i_AE_element, HYPRE_Int *j_AE_element
 
          while (previous[l] != head)
          {
-
             if (i_face_weight[previous[l]] < max_weight)
+            {
                break;
+            }
+            else if (i_face_to_prefer_weight[previous[l]] >
+                     i_face_to_prefer_weight[face_max_weight])
+            {
+               l = previous[l];
+               face_max_weight = l;
+            }
             else
-               if (i_face_to_prefer_weight[previous[l]] >
-                   i_face_to_prefer_weight[face_max_weight])
-               {
-                  l = previous[l];
-                  face_max_weight = l;
-               }
-               else
-                  l = previous[l];
+            {
+               l = previous[l];
+            }
          }
 
          break;
       }
 
-      l =previous[k];
+      l = previous[k];
       /* remove face k: ---------------------------------------*/
 
-      weight = i_face_weight[k];
-      last = previous[tail];
-      if (last == head)
-         weight_max = 0;
-      else
-         weight_max = i_face_weight[last];
-
+      weight     = i_face_weight[k];
+      last       = previous[tail];
+      weight_max = (last == head) ? 0 : i_face_weight[last];
 
       ierr = hypre_remove_entry(weight, &weight_max,
                                 previous, next, first, &last,
                                 head, tail,
                                 k);
-
       /* i_face_weight[k] = -1; */
 
-      k=l;
+      k = l;
    }
 
-   if (face_max_weight == -1) goto end_agglomerate;
+   if (face_max_weight == -1)
+   {
+      goto end_agglomerate;
+   }
 
    max_weight = i_face_weight[face_max_weight];
-
    face_local_max_weight = face_max_weight;
 
    goto eliminate_face;
 
-  end_agglomerate:
+end_agglomerate:
 
    /* eliminate isolated elements: ----------------------------------*/
 
-   for (i=0; i<num_elements; i++)
+   for (i = 0; i < num_elements; i++)
    {
-
       if (i_element_to_AE[i] == -1)
       {
-         for (j=i_element_face[i]; j < i_element_face[i+1]
-                 && i_element_to_AE[i] == -1; j++)
+         for (j = i_element_face[i]; j < i_element_face[i + 1] && i_element_to_AE[i] == -1; j++)
+         {
             if (i_face_to_prefer_weight[j_element_face[j]] > -1)
-               for (k=i_face_element[j_element_face[j]];
-                    k<i_face_element[j_element_face[j]+1]
-                       && i_element_to_AE[i] == -1; k++)
+            {
+               for (k = i_face_element[j_element_face[j]];
+                    k < i_face_element[j_element_face[j] + 1]
+                    && i_element_to_AE[i] == -1; k++)
+               {
                   if (i_element_to_AE[j_face_element[k]] != -1)
+                  {
                      i_element_to_AE[i] = i_element_to_AE[j_face_element[k]];
+                  }
+               }
+            }
+         }
       }
 
       /*
@@ -2270,35 +2456,46 @@ HYPRE_Int hypre_AMGeAgglomerate(HYPRE_Int *i_AE_element, HYPRE_Int *j_AE_element
 
    /* compute adjoint graph: -------------------------------------------*/
 
-   for (i=0; i < AE_counter; i++)
+   for (i = 0; i < AE_counter; i++)
+   {
       i_AE_element[i] = 0;
+   }
 
-   for (i=0; i < num_elements; i++)
+   for (i = 0; i < num_elements; i++)
+   {
       i_AE_element[i_element_to_AE[i]]++;
+   }
 
    i_AE_element[AE_counter] = num_elements;
 
-   for (i=AE_counter-1; i > -1; i--)
-      i_AE_element[i] = i_AE_element[i+1] - i_AE_element[i];
+   for (i = AE_counter - 1; i > -1; i--)
+   {
+      i_AE_element[i] = i_AE_element[i + 1] - i_AE_element[i];
+   }
 
-   for (i=0; i < num_elements; i++)
+   for (i = 0; i < num_elements; i++)
    {
       j_AE_element[i_AE_element[i_element_to_AE[i]]] = i;
       i_AE_element[i_element_to_AE[i]]++;
    }
 
-   for (i=AE_counter-1; i > -1; i--)
-      i_AE_element[i+1] = i_AE_element[i];
+   for (i = AE_counter - 1; i > -1; i--)
+   {
+      i_AE_element[i + 1] = i_AE_element[i];
+   }
 
    i_AE_element[0] = 0;
 
    /*--------------------------------------------------------------------*/
-   for (i=0; i < num_faces; i++)
-      if (i_face_to_prefer_weight[i] == -1) i_face_weight[i] = -1;
-
+   for (i = 0; i < num_faces; i++)
+   {
+      if (i_face_to_prefer_weight[i] == -1)
+      {
+         i_face_weight[i] = -1;
+      }
+   }
 
    hypre_TFree(i_element_to_AE, HYPRE_MEMORY_HOST);
-
    hypre_TFree(previous, HYPRE_MEMORY_HOST);
    hypre_TFree(next, HYPRE_MEMORY_HOST);
    hypre_TFree(first, HYPRE_MEMORY_HOST);
@@ -2306,15 +2503,23 @@ HYPRE_Int hypre_AMGeAgglomerate(HYPRE_Int *i_AE_element, HYPRE_Int *j_AE_element
    return ierr;
 }
 
-HYPRE_Int hypre_update_entry(HYPRE_Int weight, HYPRE_Int *weight_max,
-                             HYPRE_Int *previous, HYPRE_Int *next, HYPRE_Int *first, HYPRE_Int *last,
-                             HYPRE_Int head, HYPRE_Int tail,
-                             HYPRE_Int i)
+HYPRE_Int
+hypre_update_entry(HYPRE_Int  weight,
+                   HYPRE_Int *weight_max,
+                   HYPRE_Int *previous,
+                   HYPRE_Int *next,
+                   HYPRE_Int *first,
+                   HYPRE_Int *last,
+                   HYPRE_Int  head,
+                   HYPRE_Int  tail,
+                   HYPRE_Int  i)
 
 {
+   HYPRE_UNUSED_VAR(last);
+
    HYPRE_Int weight0;
 
-   if (previous[i] != head) next[previous[i]] = next[i];
+   if (previous[i] != head) { next[previous[i]] = next[i]; }
    previous[next[i]] = previous[i];
 
    if (first[weight] == tail)
@@ -2326,7 +2531,7 @@ HYPRE_Int hypre_update_entry(HYPRE_Int weight, HYPRE_Int *weight_max,
                       weight, weight_max[0]);
          return -1;
       }
-      for (weight0=weight_max[0]+1; weight0 <= weight; weight0++)
+      for (weight0 = weight_max[0] + 1; weight0 <= weight; weight0++)
       {
          first[weight0] = i;
          /* hypre_printf("create first[%d] = %d\n", weight0, i); */
@@ -2335,7 +2540,9 @@ HYPRE_Int hypre_update_entry(HYPRE_Int weight, HYPRE_Int *weight_max,
       previous[i] = previous[tail];
       next[i] = tail;
       if (previous[tail] > head)
+      {
          next[previous[tail]] = i;
+      }
       previous[tail] = i;
 
    }
@@ -2346,30 +2553,48 @@ HYPRE_Int hypre_update_entry(HYPRE_Int weight, HYPRE_Int *weight_max,
       next[i] = first[weight];
 
       if (previous[first[weight]] != head)
+      {
          next[previous[first[weight]]] = i;
+      }
 
       previous[first[weight]] = i;
 
-      for (weight0=1; weight0 <= weight; weight0++)
+      for (weight0 = 1; weight0 <= weight; weight0++)
+      {
          if (first[weight0] == first[weight])
+         {
             first[weight0] = i;
-
+         }
+      }
    }
 
    return 0;
 }
 
-HYPRE_Int hypre_remove_entry(HYPRE_Int weight, HYPRE_Int *weight_max,
-                             HYPRE_Int *previous, HYPRE_Int *next, HYPRE_Int *first, HYPRE_Int *last,
-                             HYPRE_Int head, HYPRE_Int tail,
-                             HYPRE_Int i)
+HYPRE_Int
+hypre_remove_entry(HYPRE_Int  weight,
+                   HYPRE_Int *weight_max,
+                   HYPRE_Int *previous,
+                   HYPRE_Int *next,
+                   HYPRE_Int *first,
+                   HYPRE_Int *last,
+                   HYPRE_Int  head,
+                   HYPRE_Int  tail,
+                   HYPRE_Int  i)
 {
+   HYPRE_UNUSED_VAR(weight);
+   HYPRE_UNUSED_VAR(last);
+   HYPRE_UNUSED_VAR(tail);
+
    HYPRE_Int weight0;
 
-   if (previous[i] != head) next[previous[i]] = next[i];
+   if (previous[i] != head)
+   {
+      next[previous[i]] = next[i];
+   }
    previous[next[i]] = previous[i];
 
-   for (weight0=1; weight0 <= weight_max[0]; weight0++)
+   for (weight0 = 1; weight0 <= weight_max[0]; weight0++)
    {
       /* hypre_printf("first[%d}: %d\n", weight0,  first[weight0]); */
       if (first[weight0] == i)
@@ -2388,20 +2613,35 @@ HYPRE_Int hypre_remove_entry(HYPRE_Int weight, HYPRE_Int *weight_max,
    return 0;
 }
 
-HYPRE_Int hypre_move_entry(HYPRE_Int weight, HYPRE_Int *weight_max,
-                           HYPRE_Int *previous, HYPRE_Int *next, HYPRE_Int *first, HYPRE_Int *last,
-                           HYPRE_Int head, HYPRE_Int tail,
-                           HYPRE_Int i)
+HYPRE_Int
+hypre_move_entry(HYPRE_Int  weight,
+                 HYPRE_Int *weight_max,
+                 HYPRE_Int *previous,
+                 HYPRE_Int *next,
+                 HYPRE_Int *first,
+                 HYPRE_Int *last,
+                 HYPRE_Int  head,
+                 HYPRE_Int  tail,
+                 HYPRE_Int  i)
 {
+   HYPRE_UNUSED_VAR(weight);
+   HYPRE_UNUSED_VAR(last);
+   HYPRE_UNUSED_VAR(tail);
+
    HYPRE_Int  weight0;
 
-   if (previous[i] != head) next[previous[i]] = next[i];
+   if (previous[i] != head)
+   {
+      next[previous[i]] = next[i];
+   }
    previous[next[i]] = previous[i];
 
-   for (weight0=1; weight0 <= weight_max[0]; weight0++)
+   for (weight0 = 1; weight0 <= weight_max[0]; weight0++)
    {
       if (first[weight0] == i)
+      {
          first[weight0] = next[i];
+      }
    }
 
    return 0;
@@ -2411,15 +2651,18 @@ HYPRE_Int hypre_move_entry(HYPRE_Int weight, HYPRE_Int *weight_max,
   hypre_matinv:  X <--  A**(-1) ;  A IS POSITIVE DEFINITE (non--symmetric);
   ---------------------------------------------------------------------*/
 
-HYPRE_Int hypre_matinv(HYPRE_Real *x, HYPRE_Real *a, HYPRE_Int k)
+HYPRE_Int
+hypre_matinv(HYPRE_Real *x,
+             HYPRE_Real *a,
+             HYPRE_Int   k)
 {
-   HYPRE_Int i,j,l, ierr =0;
+   HYPRE_Int i, j, l, ierr = 0;
 
-   for (i=0; i < k; i++)
+   for (i = 0; i < k; i++)
    {
-      if (a[i+i*k] <= 0.e0)
+      if (a[i + i * k] <= 0.e0)
       {
-         if (i < k-1)
+         if (i < k - 1)
          {
             /*********
                       hypre_printf("indefinite singular matrix in *** matinv ***:\n");
@@ -2428,47 +2671,49 @@ HYPRE_Int hypre_matinv(HYPRE_Real *x, HYPRE_Real *a, HYPRE_Int k)
             ierr = -1;
          }
 
-         a[i+i*k] = 0.e0;
+         a[i + i * k] = 0.e0;
       }
       else
-         a[i+k*i] = 1.0 / a[i+i*k];
+      {
+         a[i + k * i] = 1.0 / a[i + i * k];
+      }
 
-      for (j=1; j < k-i; j++)
+      for (j = 1; j < k - i; j++)
       {
-         for (l=1; l < k-i; l++)
+         for (l = 1; l < k - i; l++)
          {
-            a[i+l+k*(i+j)] -= a[i+l+k*i] * a[i+k*i] * a[i+k*(i+j)];
+            a[i + l + k * (i + j)] -= a[i + l + k * i] * a[i + k * i] * a[i + k * (i + j)];
          }
       }
 
-      for (j=1; j < k-i; j++)
+      for (j = 1; j < k - i; j++)
       {
-         a[i+j+k*i] = a[i+j+k*i] * a[i+k*i];
-         a[i+k*(i+j)] = a[i+k*(i+j)] * a[i+k*i];
+         a[i + j + k * i] = a[i + j + k * i] * a[i + k * i];
+         a[i + k * (i + j)] = a[i + k * (i + j)] * a[i + k * i];
       }
    }
 
    /* FULL INVERSION: --------------------------------------------*/
 
-   x[k*k-1] = a[k*k-1];
-   for (i=k-1; i > -1; i--)
+   x[k * k - 1] = a[k * k - 1];
+   for (i = k - 1; i > -1; i--)
    {
-      for (j=1; j < k-i; j++)
+      for (j = 1; j < k - i; j++)
       {
-         x[i+j+k*i] =0;
-         x[i+k*(i+j)] =0;
+         x[i + j + k * i] = 0;
+         x[i + k * (i + j)] = 0;
 
-         for (l=1; l< k-i; l++)
+         for (l = 1; l < k - i; l++)
          {
-            x[i+j+k*i] -= x[i+j+k*(i+l)] * a[i+l+k*i];
-            x[i+k*(i+j)] -= a[i+k*(i+l)] * x[i+l+k*(i+j)];
+            x[i + j + k * i] -= x[i + j + k * (i + l)] * a[i + l + k * i];
+            x[i + k * (i + j)] -= a[i + k * (i + l)] * x[i + l + k * (i + j)];
          }
       }
 
-      x[i+k*i] = a[i+k*i];
-      for (j=1; j<k-i; j++)
+      x[i + k * i] = a[i + k * i];
+      for (j = 1; j < k - i; j++)
       {
-         x[i+k*i] -= x[i+k*(i+j)] * a[i+j+k*i];
+         x[i + k * i] -= x[i + k * (i + j)] * a[i + j + k * i];
       }
    }
 
@@ -2485,6 +2730,7 @@ hypre_parCorrRes( hypre_ParCSRMatrix *A,
    HYPRE_Int num_sends, num_cols_offd;
    HYPRE_Int local_size;
    HYPRE_Real *x_buf_data, *x_tmp_data, *x_local_data;
+   HYPRE_MemoryLocation memory_location = hypre_ParCSRMatrixMemoryLocation(A);
 
    hypre_ParCSRCommPkg *comm_pkg;
    hypre_CSRMatrix *offd;
@@ -2503,28 +2749,29 @@ hypre_parCorrRes( hypre_ParCSRMatrix *A,
    {
       num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
       x_buf_data = hypre_CTAlloc(HYPRE_Real,
-            hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends), HYPRE_MEMORY_HOST);
-
+                                 hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                                 HYPRE_MEMORY_HOST);
       index = 0;
       for (i = 0; i < num_sends; i++)
       {
          start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-         for (j=start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
+         {
             x_buf_data[index++]
-               = x_local_data[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+               = x_local_data[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
+         }
       }
 
       x_tmp = hypre_SeqVectorCreate(num_cols_offd);
-      hypre_SeqVectorInitialize(x_tmp);
+      hypre_SeqVectorInitialize_v2(x_tmp, memory_location);
       x_tmp_data = hypre_VectorData(x_tmp);
 
       comm_handle = hypre_ParCSRCommHandleCreate( 1, comm_pkg, x_buf_data,
                                                   x_tmp_data);
 
       tmp_vector = hypre_SeqVectorCreate(local_size);
-      hypre_VectorMemoryLocation(tmp_vector) = HYPRE_MEMORY_DEVICE;
-      hypre_SeqVectorInitialize(tmp_vector);
-      hypre_SeqVectorCopy(rhs,tmp_vector);
+      hypre_SeqVectorInitialize_v2(tmp_vector, memory_location);
+      hypre_SeqVectorCopy(rhs, tmp_vector);
 
       hypre_ParCSRCommHandleDestroy(comm_handle);
       comm_handle = NULL;
@@ -2537,24 +2784,24 @@ hypre_parCorrRes( hypre_ParCSRMatrix *A,
    else
    {
       tmp_vector = hypre_SeqVectorCreate(local_size);
-      hypre_VectorMemoryLocation(tmp_vector) = HYPRE_MEMORY_DEVICE;
-      hypre_SeqVectorInitialize(tmp_vector);
-      hypre_SeqVectorCopy(rhs,tmp_vector);
+      hypre_SeqVectorInitialize_v2(tmp_vector, memory_location);
+      hypre_SeqVectorCopy(rhs, tmp_vector);
    }
 
    *tmp_ptr = tmp_vector;
 
-   return 0;
+   return hypre_error_flag;
 }
 
-
-HYPRE_Int hypre_AdSchwarzSolve(hypre_ParCSRMatrix *par_A,
-                               hypre_ParVector *par_rhs,
-                               hypre_CSRMatrix *domain_structure,
-                               HYPRE_Real *scale,
-                               hypre_ParVector *par_x,
-                               hypre_ParVector *par_aux, HYPRE_Int *pivots,
-                               HYPRE_Int use_nonsymm)
+HYPRE_Int
+hypre_AdSchwarzSolve(hypre_ParCSRMatrix *par_A,
+                     hypre_ParVector    *par_rhs,
+                     hypre_CSRMatrix    *domain_structure,
+                     HYPRE_Real         *scale,
+                     hypre_ParVector    *par_x,
+                     hypre_ParVector    *par_aux,
+                     HYPRE_Int          *pivots,
+                     HYPRE_Int           use_nonsymm)
 {
    HYPRE_Int ierr = 0;
    HYPRE_Real *x;
@@ -2573,14 +2820,14 @@ HYPRE_Int hypre_AdSchwarzSolve(hypre_ParCSRMatrix *par_A,
    HYPRE_Int one = 1;
    char uplo = 'L';
 
-   HYPRE_Int jj,i,j; /*, j_loc, k_loc;*/
+   HYPRE_Int jj, i, j; /*, j_loc, k_loc;*/
 
 
    HYPRE_Int matrix_size, matrix_size_counter = 0;
 
    HYPRE_Int num_procs;
 
-   hypre_MPI_Comm_size(comm,&num_procs);
+   hypre_MPI_Comm_size(comm, &num_procs);
 
    /* initiate:      ----------------------------------------------- */
    x_vector = hypre_ParVectorLocalVector(par_x);
@@ -2594,23 +2841,24 @@ HYPRE_Int hypre_AdSchwarzSolve(hypre_ParCSRMatrix *par_A,
    domain_matrixinverse = hypre_CSRMatrixData(domain_structure);
 
    if (use_nonsymm)
+   {
       uplo = 'N';
+   }
 
-   hypre_ParVectorCopy(par_rhs,par_aux);
-   hypre_ParCSRMatrixMatvec(-1.0,par_A,par_x,1.0,par_aux);
+   hypre_ParVectorCopy(par_rhs, par_aux);
+   hypre_ParCSRMatrixMatvec(-1.0, par_A, par_x, 1.0, par_aux);
    tmp = hypre_CTAlloc(HYPRE_Real, max_domain_size, HYPRE_MEMORY_HOST);
 
    /* forward solve: ----------------------------------------------- */
 
    matrix_size_counter = 0;
-   for (i=0; i < num_domains; i++)
+   for (i = 0; i < num_domains; i++)
    {
-      matrix_size = i_domain_dof[i+1] - i_domain_dof[i];
+      matrix_size = i_domain_dof[i + 1] - i_domain_dof[i];
 
       /* compute residual: ---------------------------------------- */
-
       jj = 0;
-      for (j=i_domain_dof[i]; j < i_domain_dof[i+1]; j++)
+      for (j = i_domain_dof[i]; j < i_domain_dof[i + 1]; j++)
       {
          tmp[jj] = aux[j_domain_dof[j]];
          jj++;
@@ -2631,15 +2879,14 @@ HYPRE_Int hypre_AdSchwarzSolve(hypre_ParCSRMatrix *par_A,
                       &matrix_size, &ierr);
       }
 
-      if (ierr)  hypre_error(HYPRE_ERROR_GENERIC);
+      if (ierr) { hypre_error(HYPRE_ERROR_GENERIC); }
       jj = 0;
-      for (j=i_domain_dof[i]; j < i_domain_dof[i+1]; j++)
+      for (j = i_domain_dof[i]; j < i_domain_dof[i + 1]; j++)
       {
-         x[j_domain_dof[j]]+=  scale[j_domain_dof[j]]*tmp[jj++];
+         x[j_domain_dof[j]] += scale[j_domain_dof[j]] * tmp[jj++];
       }
       matrix_size_counter += matrix_size * matrix_size;
       piv_counter += matrix_size;
-
    }
 
    hypre_TFree(tmp, HYPRE_MEMORY_HOST);
@@ -2647,15 +2894,17 @@ HYPRE_Int hypre_AdSchwarzSolve(hypre_ParCSRMatrix *par_A,
    return hypre_error_flag;
 }
 
-HYPRE_Int hypre_AdSchwarzCFSolve(hypre_ParCSRMatrix *par_A,
-                                 hypre_ParVector *par_rhs,
-                                 hypre_CSRMatrix *domain_structure,
-                                 HYPRE_Real *scale,
-                                 hypre_ParVector *par_x,
-                                 hypre_ParVector *par_aux,
-                                 HYPRE_Int *CF_marker,
-                                 HYPRE_Int rlx_pt, HYPRE_Int *pivots,
-                                 HYPRE_Int use_nonsymm)
+HYPRE_Int
+hypre_AdSchwarzCFSolve(hypre_ParCSRMatrix  *par_A,
+                       hypre_ParVector     *par_rhs,
+                       hypre_CSRMatrix     *domain_structure,
+                       HYPRE_Real          *scale,
+                       hypre_ParVector     *par_x,
+                       hypre_ParVector     *par_aux,
+                       HYPRE_Int           *CF_marker,
+                       HYPRE_Int            rlx_pt,
+                       HYPRE_Int           *pivots,
+                       HYPRE_Int            use_nonsymm)
 {
    HYPRE_Int ierr = 0;
    HYPRE_Real *x;
@@ -2674,13 +2923,13 @@ HYPRE_Int hypre_AdSchwarzCFSolve(hypre_ParCSRMatrix *par_A,
    HYPRE_Int one = 1;
 
    char uplo = 'L';
-   HYPRE_Int jj,i,j; /*, j_loc, k_loc;*/
+   HYPRE_Int jj, i, j; /*, j_loc, k_loc;*/
 
    HYPRE_Int matrix_size, matrix_size_counter = 0;
 
    HYPRE_Int num_procs;
 
-   hypre_MPI_Comm_size(comm,&num_procs);
+   hypre_MPI_Comm_size(comm, &num_procs);
 
    /* initiate:      ----------------------------------------------- */
    x_vector = hypre_ParVectorLocalVector(par_x);
@@ -2694,25 +2943,27 @@ HYPRE_Int hypre_AdSchwarzCFSolve(hypre_ParCSRMatrix *par_A,
    domain_matrixinverse = hypre_CSRMatrixData(domain_structure);
 
    if (use_nonsymm)
+   {
       uplo = 'N';
+   }
 
-   hypre_ParVectorCopy(par_rhs,par_aux);
-   hypre_ParCSRMatrixMatvec(-1.0,par_A,par_x,1.0,par_aux);
+   hypre_ParVectorCopy(par_rhs, par_aux);
+   hypre_ParCSRMatrixMatvec(-1.0, par_A, par_x, 1.0, par_aux);
    tmp = hypre_CTAlloc(HYPRE_Real, max_domain_size, HYPRE_MEMORY_HOST);
 
    /* forward solve: ----------------------------------------------- */
 
    matrix_size_counter = 0;
-   for (i=0; i < num_domains; i++)
+   for (i = 0; i < num_domains; i++)
    {
       if (CF_marker[i] == rlx_pt)
       {
-         matrix_size = i_domain_dof[i+1] - i_domain_dof[i];
+         matrix_size = i_domain_dof[i + 1] - i_domain_dof[i];
 
          /* compute residual: ---------------------------------------- */
 
          jj = 0;
-         for (j=i_domain_dof[i]; j < i_domain_dof[i+1]; j++)
+         for (j = i_domain_dof[i]; j < i_domain_dof[i + 1]; j++)
          {
             tmp[jj] = aux[j_domain_dof[j]];
             jj++;
@@ -2734,11 +2985,11 @@ HYPRE_Int hypre_AdSchwarzCFSolve(hypre_ParCSRMatrix *par_A,
                          &matrix_size, &ierr);
          }
 
-         if (ierr)  hypre_error(HYPRE_ERROR_GENERIC);
+         if (ierr) { hypre_error(HYPRE_ERROR_GENERIC); }
          jj = 0;
-         for (j=i_domain_dof[i]; j < i_domain_dof[i+1]; j++)
+         for (j = i_domain_dof[i]; j < i_domain_dof[i + 1]; j++)
          {
-            x[j_domain_dof[j]]+=  scale[j_domain_dof[j]]*tmp[jj++];
+            x[j_domain_dof[j]] +=  scale[j_domain_dof[j]] * tmp[jj++];
          }
          matrix_size_counter += matrix_size * matrix_size;
          piv_counter += matrix_size;
@@ -2751,39 +3002,46 @@ HYPRE_Int hypre_AdSchwarzCFSolve(hypre_ParCSRMatrix *par_A,
 }
 
 HYPRE_Int
-hypre_GenerateScale(hypre_CSRMatrix *domain_structure,
-                    HYPRE_Int              num_variables,
-                    HYPRE_Real       relaxation_weight,
-                    HYPRE_Real     **scale_pointer)
+hypre_GenerateScale(hypre_CSRMatrix  *domain_structure,
+                    HYPRE_Int         num_variables,
+                    HYPRE_Real        relaxation_weight,
+                    HYPRE_Real      **scale_pointer)
 {
-   HYPRE_Int num_domains = hypre_CSRMatrixNumRows(domain_structure);
-   HYPRE_Int *i_domain_dof = hypre_CSRMatrixI(domain_structure);
-   HYPRE_Int *j_domain_dof = hypre_CSRMatrixJ(domain_structure);
-   HYPRE_Int i, j;
-   HYPRE_Real *scale;
+   HYPRE_Int    num_domains  = hypre_CSRMatrixNumRows(domain_structure);
+   HYPRE_Int   *i_domain_dof = hypre_CSRMatrixI(domain_structure);
+   HYPRE_Int   *j_domain_dof = hypre_CSRMatrixJ(domain_structure);
+   HYPRE_Int    i, j;
+   HYPRE_Real  *scale;
 
-   scale = hypre_CTAlloc(HYPRE_Real,  num_variables, HYPRE_MEMORY_HOST);
+   scale = hypre_CTAlloc(HYPRE_Real, num_variables, HYPRE_MEMORY_HOST);
 
-   for (i=0; i < num_domains; i++)
-      for (j = i_domain_dof[i]; j < i_domain_dof[i+1]; j++)
+   for (i = 0; i < num_domains; i++)
+   {
+      for (j = i_domain_dof[i]; j < i_domain_dof[i + 1]; j++)
+      {
          scale[j_domain_dof[j]] += 1.0;
+      }
+   }
 
-   for (i=0; i < num_variables; i++)
-      scale[i] = relaxation_weight/scale[i];
+   for (i = 0; i < num_variables; i++)
+   {
+      scale[i] = relaxation_weight / scale[i];
+   }
 
    *scale_pointer = scale;
 
    return hypre_error_flag;
 }
 
-HYPRE_Int hypre_ParAdSchwarzSolve(hypre_ParCSRMatrix *A,
-                                  hypre_ParVector *F,
-                                  hypre_CSRMatrix *domain_structure,
-                                  HYPRE_Real *scale,
-                                  hypre_ParVector *X,
-                                  hypre_ParVector *Vtemp,
-                                  HYPRE_Int *pivots,
-                                  HYPRE_Int use_nonsymm)
+HYPRE_Int
+hypre_ParAdSchwarzSolve(hypre_ParCSRMatrix *A,
+                        hypre_ParVector    *F,
+                        hypre_CSRMatrix    *domain_structure,
+                        HYPRE_Real         *scale,
+                        hypre_ParVector    *X,
+                        hypre_ParVector    *Vtemp,
+                        HYPRE_Int          *pivots,
+                        HYPRE_Int           use_nonsymm)
 {
    hypre_ParCSRCommPkg *comm_pkg = hypre_ParCSRMatrixCommPkg(A);
    HYPRE_Int num_sends = 0;
@@ -2794,10 +3052,10 @@ HYPRE_Int hypre_ParAdSchwarzSolve(hypre_ParCSRMatrix *A,
 
    HYPRE_Int ierr = 0;
    HYPRE_Real *x_data;
-   HYPRE_Real *x_ext_data;
+   HYPRE_Real *x_ext_data = NULL;
    HYPRE_Real *aux;
    HYPRE_Real *vtemp_data;
-   HYPRE_Real *vtemp_ext_data;
+   HYPRE_Real *vtemp_ext_data = NULL;
    HYPRE_Int num_domains, max_domain_size;
    HYPRE_Int *i_domain_dof;
    HYPRE_Int *j_domain_dof;
@@ -2805,15 +3063,15 @@ HYPRE_Int hypre_ParAdSchwarzSolve(hypre_ParCSRMatrix *A,
    hypre_CSRMatrix *A_diag = hypre_ParCSRMatrixDiag(A);
    HYPRE_Int num_variables;
    HYPRE_Int num_cols_offd;
-   HYPRE_Real *scale_ext;
-   HYPRE_Real *buf_data;
+   HYPRE_Real *scale_ext = NULL;
+   HYPRE_Real *buf_data = NULL;
    HYPRE_Int index;
 
    HYPRE_Int piv_counter = 0;
    HYPRE_Int one = 1;
 
    char uplo = 'L';
-   HYPRE_Int jj,i,j, j_loc; /*, j_loc, k_loc;*/
+   HYPRE_Int jj, i, j, j_loc; /*, j_loc, k_loc;*/
 
    HYPRE_Int matrix_size, matrix_size_counter = 0;
 
@@ -2824,10 +3082,12 @@ HYPRE_Int hypre_ParAdSchwarzSolve(hypre_ParCSRMatrix *A,
    vtemp_data = hypre_VectorData(hypre_ParVectorLocalVector(Vtemp));
 
    if (use_nonsymm)
+   {
       uplo = 'N';
+   }
 
-   hypre_ParVectorCopy(F,Vtemp);
-   hypre_ParCSRMatrixMatvec(-1.0,A,X,1.0,Vtemp);
+   hypre_ParVectorCopy(F, Vtemp);
+   hypre_ParCSRMatrixMatvec(-1.0, A, X, 1.0, Vtemp);
 
    /* forward solve: ----------------------------------------------- */
 
@@ -2850,47 +3110,52 @@ HYPRE_Int hypre_ParAdSchwarzSolve(hypre_ParCSRMatrix *A,
       scale_ext = hypre_CTAlloc(HYPRE_Real,  num_cols_offd, HYPRE_MEMORY_HOST);
 
       index = 0;
-      for (i=0; i < num_sends; i++)
+      for (i = 0; i < num_sends; i++)
       {
-         for (j = send_map_starts[i]; j < send_map_starts[i+1]; j++)
+         for (j = send_map_starts[i]; j < send_map_starts[i + 1]; j++)
+         {
             buf_data[index++] = vtemp_data[send_map_elmts[j]];
+         }
       }
 
-      comm_handle = hypre_ParCSRCommHandleCreate(1,comm_pkg,buf_data,
+      comm_handle = hypre_ParCSRCommHandleCreate(1, comm_pkg, buf_data,
                                                  vtemp_ext_data);
       hypre_ParCSRCommHandleDestroy(comm_handle);
       comm_handle = NULL;
 
       index = 0;
-      for (i=0; i < num_sends; i++)
+      for (i = 0; i < num_sends; i++)
       {
-         for (j = send_map_starts[i]; j < send_map_starts[i+1]; j++)
+         for (j = send_map_starts[i]; j < send_map_starts[i + 1]; j++)
+         {
             buf_data[index++] = scale[send_map_elmts[j]];
+         }
       }
 
-      comm_handle = hypre_ParCSRCommHandleCreate(1,comm_pkg,buf_data,scale_ext);
+      comm_handle = hypre_ParCSRCommHandleCreate(1, comm_pkg, buf_data, scale_ext);
       hypre_ParCSRCommHandleDestroy(comm_handle);
       comm_handle = NULL;
    }
 
-   for (i=0; i < num_cols_offd; i++)
-      x_ext_data[i] = 0.0;
-
    matrix_size_counter = 0;
-   for (i=0; i < num_domains; i++)
+   for (i = 0; i < num_domains; i++)
    {
-      matrix_size = i_domain_dof[i+1] - i_domain_dof[i];
+      matrix_size = i_domain_dof[i + 1] - i_domain_dof[i];
 
       /* copy data contiguously into aux  --------------------------- */
 
       jj = 0;
-      for (j=i_domain_dof[i]; j < i_domain_dof[i+1]; j++)
+      for (j = i_domain_dof[i]; j < i_domain_dof[i + 1]; j++)
       {
          j_loc = j_domain_dof[j];
          if (j_loc < num_variables)
+         {
             aux[jj] = vtemp_data[j_loc];
+         }
          else
-            aux[jj] = vtemp_ext_data[j_loc-num_variables];
+         {
+            aux[jj] = vtemp_ext_data[j_loc - num_variables];
+         }
          jj++;
       }
       /* solve for correction: ------------------------------------- */
@@ -2909,13 +3174,15 @@ HYPRE_Int hypre_ParAdSchwarzSolve(hypre_ParCSRMatrix *A,
                       &matrix_size, &ierr);
       }
 
-      if (ierr)  hypre_error(HYPRE_ERROR_GENERIC);
+      if (ierr) { hypre_error(HYPRE_ERROR_GENERIC); }
       jj = 0;
-      for (j=i_domain_dof[i]; j < i_domain_dof[i+1]; j++)
+      for (j = i_domain_dof[i]; j < i_domain_dof[i + 1]; j++)
       {
          j_loc = j_domain_dof[j];
          if (j_loc < num_variables)
-            x_data[j_loc]+= scale[j_loc] * aux[jj++];
+         {
+            x_data[j_loc] += scale[j_loc] * aux[jj++];
+         }
          else
          {
             j_loc -= num_variables;
@@ -2928,16 +3195,18 @@ HYPRE_Int hypre_ParAdSchwarzSolve(hypre_ParCSRMatrix *A,
 
    if (comm_pkg)
    {
-      comm_handle=hypre_ParCSRCommHandleCreate (2,comm_pkg,x_ext_data,buf_data);
+      comm_handle = hypre_ParCSRCommHandleCreate(2, comm_pkg, x_ext_data, buf_data);
 
       hypre_ParCSRCommHandleDestroy(comm_handle);
       comm_handle = NULL;
 
       index = 0;
-      for (i=0; i < num_sends; i++)
+      for (i = 0; i < num_sends; i++)
       {
-         for (j = send_map_starts[i]; j < send_map_starts[i+1]; j++)
+         for (j = send_map_starts[i]; j < send_map_starts[i + 1]; j++)
+         {
             x_data[send_map_elmts[j]] += buf_data[index++];
+         }
       }
 
       hypre_TFree(buf_data, HYPRE_MEMORY_HOST);
@@ -2964,12 +3233,17 @@ HYPRE_Int hypre_ParAdSchwarzSolve(hypre_ParCSRMatrix *A,
  *****************************************************************************/
 HYPRE_Int
 hypre_ParAMGCreateDomainDof(hypre_ParCSRMatrix   *A,
-                            HYPRE_Int domain_type, HYPRE_Int overlap,
-                            HYPRE_Int num_functions, HYPRE_Int *dof_func,
+                            HYPRE_Int             domain_type,
+                            HYPRE_Int             overlap,
+                            HYPRE_Int             num_functions,
+                            HYPRE_Int            *dof_func,
                             hypre_CSRMatrix     **domain_structure_pointer,
-                            HYPRE_Int **piv_pointer, HYPRE_Int use_nonsymm)
+                            HYPRE_Int           **piv_pointer,
+                            HYPRE_Int             use_nonsymm)
 
 {
+   HYPRE_UNUSED_VAR(dof_func);
+
    hypre_CSRMatrix *domain_structure = NULL;
    HYPRE_Int *i_domain_dof, *j_domain_dof;
    HYPRE_Real *domain_matrixinverse;
@@ -2981,7 +3255,7 @@ hypre_ParAMGCreateDomainDof(hypre_ParCSRMatrix   *A,
    HYPRE_Real *a_diag_data = hypre_CSRMatrixData(A_diag);
    HYPRE_Int num_variables = hypre_CSRMatrixNumRows(A_diag);
    HYPRE_BigInt first_col_diag = hypre_ParCSRMatrixFirstColDiag(A);
-   HYPRE_BigInt col_0 = first_col_diag -1 ;
+   HYPRE_BigInt col_0 = first_col_diag - 1 ;
    HYPRE_BigInt col_n = first_col_diag + (HYPRE_BigInt)num_variables;
 
    hypre_CSRMatrix *A_offd = hypre_ParCSRMatrixOffd(A);
@@ -2991,14 +3265,14 @@ hypre_ParAMGCreateDomainDof(hypre_ParCSRMatrix   *A,
    HYPRE_Int num_cols_offd = hypre_CSRMatrixNumCols(A_offd);
    HYPRE_BigInt *col_map_offd = hypre_ParCSRMatrixColMapOffd(A);
 
-   hypre_CSRMatrix *A_ext;
-   HYPRE_Int *a_ext_i;
-   HYPRE_BigInt *a_ext_j;
-   HYPRE_Real *a_ext_data;
+   hypre_CSRMatrix *A_ext = NULL;
+   HYPRE_Int *a_ext_i = NULL;
+   HYPRE_BigInt *a_ext_j = NULL;
+   HYPRE_Real *a_ext_data = NULL;
 
    /* HYPRE_Int *i_dof_to_accept_weight; */
    HYPRE_Int *i_dof_to_prefer_weight,
-      *w_dof_dof, *i_dof_weight;
+             *w_dof_dof, *i_dof_weight;
    HYPRE_Int *i_dof_to_aggregate, *i_aggregate_dof, *j_aggregate_dof;
 
    HYPRE_Int *i_dof_index;
@@ -3010,13 +3284,13 @@ hypre_ParAMGCreateDomainDof(hypre_ParCSRMatrix   *A,
    HYPRE_Int *recv_vec_starts = NULL;
 
    HYPRE_Int ierr = 0;
-   HYPRE_Int i,j,k, l_loc, i_loc, j_loc;
+   HYPRE_Int i, j, k, l_loc, i_loc, j_loc;
    HYPRE_Int i_dof;
    HYPRE_Int nf;
    HYPRE_Int *i_local_to_global;
    HYPRE_Int *i_global_to_local;
 
-   HYPRE_Int local_dof_counter, max_local_dof_counter=0;
+   HYPRE_Int local_dof_counter, max_local_dof_counter = 0;
 
    HYPRE_Int domain_dof_counter = 0, domain_matrixinverse_counter = 0;
 
@@ -3034,14 +3308,13 @@ hypre_ParAMGCreateDomainDof(hypre_ParCSRMatrix   *A,
    if (num_variables == 0)
    {
       *domain_structure_pointer = domain_structure;
-
       *piv_pointer = piv;
 
       return hypre_error_flag;
    }
 
-   hypre_MPI_Comm_size(hypre_ParCSRMatrixComm(A),&num_procs);
-   hypre_MPI_Comm_size(hypre_ParCSRMatrixComm(A),&my_id);
+   hypre_MPI_Comm_size(hypre_ParCSRMatrixComm(A), &num_procs);
+   hypre_MPI_Comm_size(hypre_ParCSRMatrixComm(A), &my_id);
 
    /* --------------------------------------------------------------------- */
 
@@ -3051,7 +3324,7 @@ hypre_ParAMGCreateDomainDof(hypre_ParCSRMatrix   *A,
 
    /*hypre_printf("----------- create artificials domain by agglomeration;  ======\n");
     */
-   i_aggregate_dof = hypre_CTAlloc(HYPRE_Int, num_variables+1, HYPRE_MEMORY_HOST);
+   i_aggregate_dof = hypre_CTAlloc(HYPRE_Int, num_variables + 1, HYPRE_MEMORY_HOST);
    j_aggregate_dof = hypre_CTAlloc(HYPRE_Int, num_variables, HYPRE_MEMORY_HOST);
 
    if (domain_type == 2)
@@ -3059,14 +3332,13 @@ hypre_ParAMGCreateDomainDof(hypre_ParCSRMatrix   *A,
       i_dof_to_prefer_weight = hypre_CTAlloc(HYPRE_Int,  num_variables, HYPRE_MEMORY_HOST);
       w_dof_dof = hypre_CTAlloc(HYPRE_Int,  a_diag_i[num_variables], HYPRE_MEMORY_HOST);
 
-      for (i=0; i<num_variables; i++)
-         for (j=a_diag_i[i]; j< a_diag_i[i+1]; j++)
+      for (i = 0; i < num_variables; i++)
+      {
+         for (j = a_diag_i[i]; j < a_diag_i[i + 1]; j++)
          {
-            if (a_diag_j[j] == i)
-               w_dof_dof[j]=0;
-            else
-               w_dof_dof[j]=1;
+            w_dof_dof[j] = (a_diag_j[j] == i) ? 0 : 1;
          }
+      }
 
       /*hypre_printf("end computing weights for agglomeration procedure: --------\n");
        */
@@ -3087,34 +3359,34 @@ hypre_ParAMGCreateDomainDof(hypre_ParCSRMatrix   *A,
    }
    else
    {
-      nf = 1;
-      if (domain_type == 1) nf = num_functions;
+      nf = (domain_type == 1) ? num_functions : 1;
 
-      num_domains = num_variables/nf;
-      for (i=0; i < num_domains+1; i++)
+      num_domains = num_variables / nf;
+      for (i = 0; i < num_domains + 1; i++)
       {
-         i_aggregate_dof[i] = nf*i;
+         i_aggregate_dof[i] = nf * i;
       }
-      for (i=0; i < num_variables; i++)
+      for (i = 0; i < num_variables; i++)
       {
          j_aggregate_dof[i] = i;
       }
    }
+
    /*hypre_printf("num_variables: %d, num_domains: %d\n", num_variables, num_domains);
     */
    if (overlap == 1)
    {
-      i_domain_dof = hypre_CTAlloc(HYPRE_Int,  num_domains+1, HYPRE_MEMORY_HOST);
+      i_domain_dof       = hypre_CTAlloc(HYPRE_Int, num_domains + 1, HYPRE_MEMORY_HOST);
+      i_dof_to_aggregate = hypre_CTAlloc(HYPRE_Int, num_variables, HYPRE_MEMORY_HOST);
+      i_proc             = hypre_CTAlloc(HYPRE_Int, num_cols_offd, HYPRE_MEMORY_HOST);
 
-      i_dof_to_aggregate = hypre_CTAlloc(HYPRE_Int,  num_variables, HYPRE_MEMORY_HOST);
-      for (i=0; i < num_domains; i++)
-         for (j=i_aggregate_dof[i]; j < i_aggregate_dof[i+1]; j++)
+      for (i = 0; i < num_domains; i++)
+      {
+         for (j = i_aggregate_dof[i]; j < i_aggregate_dof[i + 1]; j++)
+         {
             i_dof_to_aggregate[j_aggregate_dof[j]] = i;
-
-      i_proc = hypre_CTAlloc(HYPRE_Int,  num_cols_offd, HYPRE_MEMORY_HOST);
-
-      for (i=0; i < num_cols_offd; i++)
-         i_proc[i] = 0;
+         }
+      }
 
       if (comm_pkg)
       {
@@ -3123,7 +3395,6 @@ hypre_ParAMGCreateDomainDof(hypre_ParCSRMatrix   *A,
       }
       else if (num_procs > 1)
       {
-
          hypre_MatvecCommPkgCreate(A);
 
          comm_pkg = hypre_ParCSRMatrixCommPkg(A);
@@ -3131,87 +3402,108 @@ hypre_ParAMGCreateDomainDof(hypre_ParCSRMatrix   *A,
          recv_vec_starts = hypre_ParCSRCommPkgRecvVecStarts(comm_pkg);
       }
 
-      for (i=0; i < num_recvs; i++)
-         for (indx=recv_vec_starts[i]; indx < recv_vec_starts[i+1]; indx++)
+      for (i = 0; i < num_recvs; i++)
+      {
+         for (indx = recv_vec_starts[i]; indx < recv_vec_starts[i + 1]; indx++)
+         {
             i_proc[indx] = i;
+         }
+      }
 
       /* make domains from aggregates: *********************************/
 
-      i_dof_index = hypre_CTAlloc(HYPRE_Int,  num_variables, HYPRE_MEMORY_HOST);
+      i_dof_index      = hypre_CTAlloc(HYPRE_Int, num_variables, HYPRE_MEMORY_HOST);
+      i_dof_index_offd = hypre_CTAlloc(HYPRE_Int, num_cols_offd, HYPRE_MEMORY_HOST);
 
-      i_dof_index_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_offd, HYPRE_MEMORY_HOST);
-
-      for (i=0; i < num_variables; i++)
+      for (i = 0; i < num_variables; i++)
+      {
          i_dof_index[i] = -1;
+      }
 
-      for (i=0; i < num_cols_offd; i++)
+      for (i = 0; i < num_cols_offd; i++)
+      {
          i_dof_index_offd[i] = -1;
+      }
 
-      domain_dof_counter=0;
-      for (i=0; i < num_domains; i++)
+      domain_dof_counter = 0;
+      for (i = 0; i < num_domains; i++)
       {
          i_domain_dof[i] =  domain_dof_counter;
-         for (j=i_aggregate_dof[i]; j < i_aggregate_dof[i+1]; j++)
+         for (j = i_aggregate_dof[i]; j < i_aggregate_dof[i + 1]; j++)
          {
-            i_dof_index[j_aggregate_dof[j]]=-1;
+            i_dof_index[j_aggregate_dof[j]] = -1;
          }
-         for (j=i_aggregate_dof[i]; j < i_aggregate_dof[i+1]; j++)
+         for (j = i_aggregate_dof[i]; j < i_aggregate_dof[i + 1]; j++)
          {
-            for (k=a_diag_i[j_aggregate_dof[j]];
-                 k<a_diag_i[j_aggregate_dof[j]+1]; k++)
+            for (k = a_diag_i[j_aggregate_dof[j]];
+                 k < a_diag_i[j_aggregate_dof[j] + 1]; k++)
+            {
                if (i_dof_to_aggregate[a_diag_j[k]] >= i
-                   && i_dof_index[a_diag_j[k]]==-1)
+                   && i_dof_index[a_diag_j[k]] == -1)
                {
                   i_dof_index[a_diag_j[k]]++;
                   domain_dof_counter++;
                }
-            for (k=a_offd_i[j_aggregate_dof[j]];
-                 k<a_offd_i[j_aggregate_dof[j]+1]; k++)
+            }
+
+            for (k = a_offd_i[j_aggregate_dof[j]];
+                 k < a_offd_i[j_aggregate_dof[j] + 1]; k++)
+            {
                if (i_proc[a_offd_j[k]] > my_id
-                   && i_dof_index_offd[a_offd_j[k]]==-1)
+                   && i_dof_index_offd[a_offd_j[k]] == -1)
                {
                   i_dof_index_offd[a_offd_j[k]]++;
                   domain_dof_counter++;
                }
+            }
          }
       }
 
-      for (i=0; i < num_variables; i++)
+      for (i = 0; i < num_variables; i++)
+      {
          i_dof_index[i] = -1;
+      }
 
-      for (i=0; i < num_cols_offd; i++)
+      for (i = 0; i < num_cols_offd; i++)
+      {
          i_dof_index_offd[i] = -1;
+      }
 
-      i_domain_dof[num_domains] =  domain_dof_counter;
-      j_domain_dof = hypre_CTAlloc(HYPRE_Int,  domain_dof_counter, HYPRE_MEMORY_HOST);
+      i_domain_dof[num_domains] = domain_dof_counter;
+      j_domain_dof = hypre_CTAlloc(HYPRE_Int, domain_dof_counter, HYPRE_MEMORY_HOST);
 
-      domain_dof_counter=0;
-      for (i=0; i < num_domains; i++)
+      domain_dof_counter = 0;
+      for (i = 0; i < num_domains; i++)
       {
-         for (j=i_aggregate_dof[i]; j < i_aggregate_dof[i+1]; j++)
+         for (j = i_aggregate_dof[i]; j < i_aggregate_dof[i + 1]; j++)
          {
-            i_dof_index[j_aggregate_dof[j]]=-1;
+            i_dof_index[j_aggregate_dof[j]] = -1;
          }
-         for (j=i_aggregate_dof[i]; j < i_aggregate_dof[i+1]; j++)
+         for (j = i_aggregate_dof[i]; j < i_aggregate_dof[i + 1]; j++)
          {
-            for (k=a_diag_i[j_aggregate_dof[j]];
-                 k<a_diag_i[j_aggregate_dof[j]+1]; k++)
-               if (i_dof_to_aggregate[a_diag_j[k]] >= i
-                   && i_dof_index[a_diag_j[k]]==-1)
+            for (k = a_diag_i[j_aggregate_dof[j]];
+                 k < a_diag_i[j_aggregate_dof[j] + 1]; k++)
+            {
+               if ( (i_dof_to_aggregate[a_diag_j[k]] >= i) &&
+                    (i_dof_index[a_diag_j[k]] == -1) )
                {
                   i_dof_index[a_diag_j[k]]++;
                   j_domain_dof[domain_dof_counter] = a_diag_j[k];
                   domain_dof_counter++;
                }
-            for (k=a_offd_i[j_aggregate_dof[j]];
-                 k<a_offd_i[j_aggregate_dof[j]+1]; k++)
-               if (i_proc[a_offd_j[k]] > my_id
-                   && i_dof_index_offd[a_offd_j[k]]==-1)
+            }
+
+            for (k = a_offd_i[j_aggregate_dof[j]];
+                 k < a_offd_i[j_aggregate_dof[j] + 1]; k++)
+            {
+               if ( (i_proc[a_offd_j[k]] > my_id) &&
+                    (i_dof_index_offd[a_offd_j[k]] == -1) )
                {
                   i_dof_index_offd[a_offd_j[k]]++;
-                  j_domain_dof[domain_dof_counter] = a_offd_j[k]+num_variables;
+                  j_domain_dof[domain_dof_counter] = a_offd_j[k] + num_variables;
                   domain_dof_counter++;
                }
+            }
          }
       }
 
@@ -3224,97 +3516,126 @@ hypre_ParAMGCreateDomainDof(hypre_ParCSRMatrix   *A,
    }
    else if (overlap == 2)
    {
-      i_domain_dof = hypre_CTAlloc(HYPRE_Int,  num_domains+1, HYPRE_MEMORY_HOST);
+      i_domain_dof       = hypre_CTAlloc(HYPRE_Int, num_domains + 1, HYPRE_MEMORY_HOST);
+      i_dof_to_aggregate = hypre_CTAlloc(HYPRE_Int, num_variables, HYPRE_MEMORY_HOST);
 
-      i_dof_to_aggregate = hypre_CTAlloc(HYPRE_Int,  num_variables, HYPRE_MEMORY_HOST);
-      for (i=0; i < num_domains; i++)
-         for (j=i_aggregate_dof[i]; j < i_aggregate_dof[i+1]; j++)
+      for (i = 0; i < num_domains; i++)
+      {
+         for (j = i_aggregate_dof[i]; j < i_aggregate_dof[i + 1]; j++)
+         {
             i_dof_to_aggregate[j_aggregate_dof[j]] = i;
+         }
+      }
 
       /* make domains from aggregates: *********************************/
 
-      i_dof_index = hypre_CTAlloc(HYPRE_Int,  num_variables, HYPRE_MEMORY_HOST);
+      i_dof_index = hypre_CTAlloc(HYPRE_Int, num_variables, HYPRE_MEMORY_HOST);
+      i_dof_index_offd = hypre_CTAlloc(HYPRE_Int, num_cols_offd, HYPRE_MEMORY_HOST);
 
-      i_dof_index_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_offd, HYPRE_MEMORY_HOST);
-
-      for (i=0; i < num_variables; i++)
+      for (i = 0; i < num_variables; i++)
+      {
          i_dof_index[i] = -1;
+      }
 
-      for (i=0; i < num_cols_offd; i++)
+      for (i = 0; i < num_cols_offd; i++)
+      {
          i_dof_index_offd[i] = -1;
+      }
 
-      domain_dof_counter=0;
-      for (i=0; i < num_domains; i++)
+      domain_dof_counter = 0;
+      for (i = 0; i < num_domains; i++)
       {
          i_domain_dof[i] =  domain_dof_counter;
-         for (j=i_aggregate_dof[i]; j < i_aggregate_dof[i+1]; j++)
+         for (j = i_aggregate_dof[i]; j < i_aggregate_dof[i + 1]; j++)
          {
-            for (k=a_diag_i[j_aggregate_dof[j]];
-                 k<a_diag_i[j_aggregate_dof[j]+1]; k++)
-               if ( i_dof_index[a_diag_j[k]]==-1)
+            for (k = a_diag_i[j_aggregate_dof[j]];
+                 k < a_diag_i[j_aggregate_dof[j] + 1]; k++)
+            {
+               if ( i_dof_index[a_diag_j[k]] == -1)
                {
                   i_dof_index[a_diag_j[k]]++;
                   domain_dof_counter++;
                }
-            for (k=a_offd_i[j_aggregate_dof[j]];
-                 k<a_offd_i[j_aggregate_dof[j]+1]; k++)
-               if ( i_dof_index_offd[a_offd_j[k]]==-1)
+            }
+
+            for (k = a_offd_i[j_aggregate_dof[j]];
+                 k < a_offd_i[j_aggregate_dof[j] + 1]; k++)
+            {
+               if ( i_dof_index_offd[a_offd_j[k]] == -1)
                {
                   i_dof_index_offd[a_offd_j[k]]++;
                   domain_dof_counter++;
                }
+            }
          }
-         for (j=i_aggregate_dof[i]; j < i_aggregate_dof[i+1]; j++)
+         for (j = i_aggregate_dof[i]; j < i_aggregate_dof[i + 1]; j++)
          {
-            for (k=a_diag_i[j_aggregate_dof[j]];
-                 k<a_diag_i[j_aggregate_dof[j]+1]; k++)
-               i_dof_index[a_diag_j[k]]=-1;
-            for (k=a_offd_i[j_aggregate_dof[j]];
-                 k<a_offd_i[j_aggregate_dof[j]+1]; k++)
-               i_dof_index_offd[a_offd_j[k]]=-1;
+            for (k = a_diag_i[j_aggregate_dof[j]];
+                 k < a_diag_i[j_aggregate_dof[j] + 1]; k++)
+            {
+               i_dof_index[a_diag_j[k]] = -1;
+            }
+            for (k = a_offd_i[j_aggregate_dof[j]];
+                 k < a_offd_i[j_aggregate_dof[j] + 1]; k++)
+            {
+               i_dof_index_offd[a_offd_j[k]] = -1;
+            }
          }
       }
 
-      for (i=0; i < num_variables; i++)
+      for (i = 0; i < num_variables; i++)
+      {
          i_dof_index[i] = -1;
+      }
 
-      for (i=0; i < num_cols_offd; i++)
+      for (i = 0; i < num_cols_offd; i++)
+      {
          i_dof_index_offd[i] = -1;
+      }
 
-      i_domain_dof[num_domains] =  domain_dof_counter;
+      i_domain_dof[num_domains] = domain_dof_counter;
       j_domain_dof = hypre_CTAlloc(HYPRE_Int,  domain_dof_counter, HYPRE_MEMORY_HOST);
 
-      domain_dof_counter=0;
-      for (i=0; i < num_domains; i++)
+      domain_dof_counter = 0;
+      for (i = 0; i < num_domains; i++)
       {
-         for (j=i_aggregate_dof[i]; j < i_aggregate_dof[i+1]; j++)
+         for (j = i_aggregate_dof[i]; j < i_aggregate_dof[i + 1]; j++)
          {
-            for (k=a_diag_i[j_aggregate_dof[j]];
-                 k<a_diag_i[j_aggregate_dof[j]+1]; k++)
-               if ( i_dof_index[a_diag_j[k]]==-1)
+            for (k = a_diag_i[j_aggregate_dof[j]];
+                 k < a_diag_i[j_aggregate_dof[j] + 1]; k++)
+            {
+               if ( i_dof_index[a_diag_j[k]] == -1)
                {
                   i_dof_index[a_diag_j[k]]++;
                   j_domain_dof[domain_dof_counter] = a_diag_j[k];
                   domain_dof_counter++;
                }
-            for (k=a_offd_i[j_aggregate_dof[j]];
-                 k<a_offd_i[j_aggregate_dof[j]+1]; k++)
-               if ( i_dof_index_offd[a_offd_j[k]]==-1)
+            }
+
+            for (k = a_offd_i[j_aggregate_dof[j]];
+                 k < a_offd_i[j_aggregate_dof[j] + 1]; k++)
+            {
+               if ( i_dof_index_offd[a_offd_j[k]] == -1)
                {
                   i_dof_index_offd[a_offd_j[k]]++;
-                  j_domain_dof[domain_dof_counter] = a_offd_j[k]+num_variables;
+                  j_domain_dof[domain_dof_counter] = a_offd_j[k] + num_variables;
                   domain_dof_counter++;
                }
+            }
          }
 
-         for (j=i_aggregate_dof[i]; j < i_aggregate_dof[i+1]; j++)
+         for (j = i_aggregate_dof[i]; j < i_aggregate_dof[i + 1]; j++)
          {
-            for (k=a_diag_i[j_aggregate_dof[j]];
-                 k<a_diag_i[j_aggregate_dof[j]+1]; k++)
-               i_dof_index[a_diag_j[k]]=-1;
-            for (k=a_offd_i[j_aggregate_dof[j]];
-                 k<a_offd_i[j_aggregate_dof[j]+1]; k++)
-               i_dof_index_offd[a_offd_j[k]]=-1;
+            for (k = a_diag_i[j_aggregate_dof[j]];
+                 k < a_diag_i[j_aggregate_dof[j] + 1]; k++)
+            {
+               i_dof_index[a_diag_j[k]] = -1;
+            }
+            for (k = a_offd_i[j_aggregate_dof[j]];
+                 k < a_offd_i[j_aggregate_dof[j] + 1]; k++)
+            {
+               i_dof_index_offd[a_offd_j[k]] = -1;
+            }
          }
       }
 
@@ -3336,43 +3657,51 @@ hypre_ParAMGCreateDomainDof(hypre_ParCSRMatrix   *A,
    local_dof_counter = 0;
    piv_counter = 0;
 
-   for (i=0; i < num_domains; i++)
+   for (i = 0; i < num_domains; i++)
    {
-      local_dof_counter = i_domain_dof[i+1]-i_domain_dof[i];
-      domain_matrixinverse_counter+= local_dof_counter * local_dof_counter;
+      local_dof_counter = i_domain_dof[i + 1] - i_domain_dof[i];
+      domain_matrixinverse_counter += local_dof_counter * local_dof_counter;
       piv_counter += local_dof_counter;
 
       if (local_dof_counter > max_local_dof_counter)
+      {
          max_local_dof_counter = local_dof_counter;
+      }
    }
 
-   domain_matrixinverse = hypre_CTAlloc(HYPRE_Real,  domain_matrixinverse_counter, HYPRE_MEMORY_HOST);
+   domain_matrixinverse = hypre_CTAlloc(HYPRE_Real, domain_matrixinverse_counter,
+                                        HYPRE_MEMORY_HOST);
    if (use_nonsymm)
-      piv = hypre_CTAlloc(HYPRE_Int,  piv_counter, HYPRE_MEMORY_HOST);
+   {
+      piv = hypre_CTAlloc(HYPRE_Int, piv_counter, HYPRE_MEMORY_HOST);
+   }
 
    if (num_procs > 1)
    {
-      A_ext = hypre_ParCSRMatrixExtractBExt(A,A,1);
+      A_ext = hypre_ParCSRMatrixExtractBExt(A, A, 1);
       a_ext_i = hypre_CSRMatrixI(A_ext);
       a_ext_j = hypre_CSRMatrixBigJ(A_ext);
       a_ext_data = hypre_CSRMatrixData(A_ext);
    }
    else
+   {
       A_ext = NULL;
+   }
 
-   i_local_to_global = hypre_CTAlloc(HYPRE_Int,  max_local_dof_counter, HYPRE_MEMORY_HOST);
-
-   i_global_to_local = hypre_CTAlloc(HYPRE_Int,  num_variables+num_cols_offd, HYPRE_MEMORY_HOST);
+   i_local_to_global = hypre_CTAlloc(HYPRE_Int, max_local_dof_counter, HYPRE_MEMORY_HOST);
+   i_global_to_local = hypre_CTAlloc(HYPRE_Int, num_variables + num_cols_offd, HYPRE_MEMORY_HOST);
 
-   for (i=0; i < num_variables+num_cols_offd; i++)
+   for (i = 0; i < num_variables + num_cols_offd; i++)
+   {
       i_global_to_local[i] = -1;
+   }
 
    piv_counter = 0;
    domain_matrixinverse_counter = 0;
-   for (i=0; i < num_domains; i++)
+   for (i = 0; i < num_domains; i++)
    {
       local_dof_counter = 0;
-      for (j=i_domain_dof[i]; j < i_domain_dof[i+1]; j++)
+      for (j = i_domain_dof[i]; j < i_domain_dof[i + 1]; j++)
       {
          i_global_to_local[j_domain_dof[j]] = local_dof_counter;
          i_local_to_global[local_dof_counter] = j_domain_dof[j];
@@ -3385,26 +3714,34 @@ hypre_ParAMGCreateDomainDof(hypre_ParCSRMatrix   *A,
       ipiv = &piv[piv_counter];
 
       cnt = 0;
-      for (i_loc=0; i_loc < local_dof_counter; i_loc++)
-         for (j_loc=0; j_loc < local_dof_counter; j_loc++)
+      for (i_loc = 0; i_loc < local_dof_counter; i_loc++)
+      {
+         for (j_loc = 0; j_loc < local_dof_counter; j_loc++)
+         {
             AE[cnt++] = 0.e0;
+         }
+      }
 
-      for (i_loc=0; i_loc < local_dof_counter; i_loc++)
+      for (i_loc = 0; i_loc < local_dof_counter; i_loc++)
       {
          i_dof = i_local_to_global[i_loc];
          if (i_dof < num_variables)
          {
-            for (j=a_diag_i[i_dof]; j < a_diag_i[i_dof+1]; j++)
+            for (j = a_diag_i[i_dof]; j < a_diag_i[i_dof + 1]; j++)
             {
                j_loc = i_global_to_local[a_diag_j[j]];
-               if (j_loc >=0)
+               if (j_loc >= 0)
+               {
                   AE[i_loc + j_loc * local_dof_counter] = a_diag_data[j];
+               }
             }
-            for (j=a_offd_i[i_dof]; j < a_offd_i[i_dof+1]; j++)
+            for (j = a_offd_i[i_dof]; j < a_offd_i[i_dof + 1]; j++)
             {
-               j_loc = i_global_to_local[a_offd_j[j]+num_variables];
-               if (j_loc >=0)
+               j_loc = i_global_to_local[a_offd_j[j] + num_variables];
+               if (j_loc >= 0)
+               {
                   AE[i_loc + j_loc * local_dof_counter] = a_offd_data[j];
+               }
             }
          }
          else
@@ -3412,7 +3749,7 @@ hypre_ParAMGCreateDomainDof(hypre_ParCSRMatrix   *A,
             HYPRE_BigInt jj;
             HYPRE_Int j2;
             i_dof -= num_variables;
-            for (j=a_ext_i[i_dof]; j < a_ext_i[i_dof+1]; j++)
+            for (j = a_ext_i[i_dof]; j < a_ext_i[i_dof + 1]; j++)
             {
                jj = a_ext_j[j];
                if (jj > col_0 && jj < col_n)
@@ -3421,14 +3758,16 @@ hypre_ParAMGCreateDomainDof(hypre_ParCSRMatrix   *A,
                }
                else
                {
-                  j2 = hypre_BigBinarySearch(col_map_offd,jj,num_cols_offd);
-                  if (j2 > -1) j2 += num_variables;
+                  j2 = hypre_BigBinarySearch(col_map_offd, jj, num_cols_offd);
+                  if (j2 > -1) { j2 += num_variables; }
                }
                if (j2 > -1)
                {
                   j_loc = i_global_to_local[j2];
-                  if (j_loc >=0)
+                  if (j_loc >= 0)
+                  {
                      AE[i_loc + j_loc * local_dof_counter] = a_ext_data[j];
+                  }
                }
             }
          }
@@ -3439,22 +3778,20 @@ hypre_ParAMGCreateDomainDof(hypre_ParCSRMatrix   *A,
          hypre_dgetrf(&local_dof_counter,
                       &local_dof_counter, AE,
                       &local_dof_counter, ipiv, &ierr);
-         piv_counter +=local_dof_counter;
+         piv_counter += local_dof_counter;
       }
-
       else
       {
-         hypre_dpotrf(&uplo,&local_dof_counter, AE,
+         hypre_dpotrf(&uplo, &local_dof_counter, AE,
                       &local_dof_counter, &ierr);
       }
 
-      domain_matrixinverse_counter+=local_dof_counter*local_dof_counter;
-
+      domain_matrixinverse_counter += local_dof_counter * local_dof_counter;
 
-
-      for (l_loc=0; l_loc < local_dof_counter; l_loc++)
+      for (l_loc = 0; l_loc < local_dof_counter; l_loc++)
+      {
          i_global_to_local[i_local_to_global[l_loc]] = -1;
-
+      }
    }
 
    hypre_TFree(i_local_to_global, HYPRE_MEMORY_HOST);
@@ -3474,27 +3811,26 @@ hypre_ParAMGCreateDomainDof(hypre_ParCSRMatrix   *A,
 }
 
 HYPRE_Int
-hypre_ParGenerateScale(hypre_ParCSRMatrix *A,
-                       hypre_CSRMatrix *domain_structure,
-                       HYPRE_Real       relaxation_weight,
-                       HYPRE_Real     **scale_pointer)
+hypre_ParGenerateScale(hypre_ParCSRMatrix  *A,
+                       hypre_CSRMatrix     *domain_structure,
+                       HYPRE_Real           relaxation_weight,
+                       HYPRE_Real         **scale_pointer)
 {
-   HYPRE_Int num_domains = hypre_CSRMatrixNumRows(domain_structure);
-   HYPRE_Int *i_domain_dof = hypre_CSRMatrixI(domain_structure);
-   HYPRE_Int *j_domain_dof = hypre_CSRMatrixJ(domain_structure);
-   HYPRE_Int i, j;
-   HYPRE_Real *scale;
-   HYPRE_Real *scale_ext;
-   HYPRE_Real *scale_int;
+   HYPRE_Int    num_domains = hypre_CSRMatrixNumRows(domain_structure);
+   HYPRE_Int   *i_domain_dof = hypre_CSRMatrixI(domain_structure);
+   HYPRE_Int   *j_domain_dof = hypre_CSRMatrixJ(domain_structure);
+   HYPRE_Real  *scale = NULL;
+   HYPRE_Real  *scale_ext = NULL;
+   HYPRE_Real  *scale_int = NULL;
 
    hypre_ParCSRCommPkg *comm_pkg = hypre_ParCSRMatrixCommPkg(A);
-   HYPRE_Int num_sends = 0;
-   HYPRE_Int *send_map_starts;
-   HYPRE_Int *send_map_elmts;
+   HYPRE_Int    num_sends = 0;
+   HYPRE_Int   *send_map_starts = NULL;
+   HYPRE_Int   *send_map_elmts = NULL;
 
-   HYPRE_Int num_variables = hypre_ParCSRMatrixNumRows(A);
-   HYPRE_Int num_cols_offd = hypre_CSRMatrixNumCols(hypre_ParCSRMatrixOffd(A));
-   HYPRE_Int j_loc, index, start;
+   HYPRE_Int    num_variables = hypre_ParCSRMatrixNumRows(A);
+   HYPRE_Int    num_cols_offd = hypre_CSRMatrixNumCols(hypre_ParCSRMatrixOffd(A));
+   HYPRE_Int    i, j, j_loc, index, start;
 
    hypre_ParCSRCommHandle *comm_handle;
 
@@ -3505,42 +3841,51 @@ hypre_ParGenerateScale(hypre_ParCSRMatrix *A,
       send_map_elmts = hypre_ParCSRCommPkgSendMapElmts(comm_pkg);
    }
 
-   scale = hypre_CTAlloc(HYPRE_Real,  num_variables, HYPRE_MEMORY_HOST);
-   if (num_cols_offd) scale_ext = hypre_CTAlloc(HYPRE_Real, num_cols_offd, HYPRE_MEMORY_HOST);
+   scale     = hypre_CTAlloc(HYPRE_Real, num_variables, HYPRE_MEMORY_HOST);
+   scale_ext = hypre_CTAlloc(HYPRE_Real, num_cols_offd, HYPRE_MEMORY_HOST);
 
-   for (i=0; i < num_domains; i++)
+   for (i = 0; i < num_domains; i++)
    {
-      for (j=i_domain_dof[i]; j < i_domain_dof[i+1]; j++)
+      for (j = i_domain_dof[i]; j < i_domain_dof[i + 1]; j++)
       {
          j_loc = j_domain_dof[j];
          if (j_loc < num_variables)
+         {
             scale[j_loc] += 1.0;
+         }
          else
-            scale_ext[j_loc-num_variables] += 1.0;
+         {
+            scale_ext[j_loc - num_variables] += 1.0;
+         }
       }
    }
+
    if (comm_pkg)
    {
-      scale_int = hypre_CTAlloc(HYPRE_Real,  send_map_starts[num_sends], HYPRE_MEMORY_HOST);
-      comm_handle = hypre_ParCSRCommHandleCreate (2,comm_pkg,scale_ext,scale_int);
+      scale_int = hypre_CTAlloc(HYPRE_Real, send_map_starts[num_sends], HYPRE_MEMORY_HOST);
+      comm_handle = hypre_ParCSRCommHandleCreate (2, comm_pkg, scale_ext, scale_int);
 
       hypre_ParCSRCommHandleDestroy(comm_handle);
       comm_handle = NULL;
    }
 
    index = 0;
-   for (i=0; i < num_sends; i++)
+   for (i = 0; i < num_sends; i++)
    {
       start = send_map_starts[i];
-      for (j=start; j < send_map_starts[i+1]; j++)
+      for (j = start; j < send_map_starts[i + 1]; j++)
+      {
          scale[send_map_elmts[j]] += scale_int[index++];
+      }
    }
 
-   if (comm_pkg) hypre_TFree(scale_int, HYPRE_MEMORY_HOST);
-   if (num_cols_offd) hypre_TFree(scale_ext, HYPRE_MEMORY_HOST);
+   hypre_TFree(scale_int, HYPRE_MEMORY_HOST);
+   hypre_TFree(scale_ext, HYPRE_MEMORY_HOST);
 
-   for (i=0; i < num_variables; i++)
-      scale[i] = relaxation_weight/scale[i];
+   for (i = 0; i < num_variables; i++)
+   {
+      scale[i] = relaxation_weight / scale[i];
+   }
 
    *scale_pointer = scale;
 
@@ -3568,14 +3913,14 @@ hypre_ParGenerateHybridScale(hypre_ParCSRMatrix *A,
    HYPRE_Int *j_domain_dof = hypre_CSRMatrixJ(domain_structure);
    HYPRE_Int i, j, jj;
    HYPRE_Real *scale;
-   HYPRE_Real *scale_ext;
-   HYPRE_Real *scale_int;
+   HYPRE_Real *scale_ext = NULL;
+   HYPRE_Real *scale_int = NULL;
 
    hypre_ParCSRCommPkg *comm_pkg = hypre_ParCSRMatrixCommPkg(A);
    HYPRE_Int num_sends = 0;
    HYPRE_Int *send_map_starts;
    HYPRE_Int *send_map_elmts;
-   HYPRE_Int *index_ext;
+   HYPRE_Int *index_ext = NULL;
 
    HYPRE_Int num_variables = hypre_ParCSRMatrixNumRows(A);
    HYPRE_Int num_cols_offd = hypre_CSRMatrixNumCols(hypre_ParCSRMatrixOffd(A));
@@ -3585,8 +3930,8 @@ hypre_ParGenerateHybridScale(hypre_ParCSRMatrix *A,
 
    hypre_ParCSRCommHandle *comm_handle;
 
-   col_0 = hypre_ParCSRMatrixFirstColDiag(A)-1;
-   col_n = col_0+(HYPRE_Int)num_variables;
+   col_0 = hypre_ParCSRMatrixFirstColDiag(A) - 1;
+   col_n = col_0 + (HYPRE_Int)num_variables;
 
    A_boundary = NULL;
 
@@ -3604,15 +3949,19 @@ hypre_ParGenerateHybridScale(hypre_ParCSRMatrix *A,
       index_ext = hypre_CTAlloc(HYPRE_Int, num_cols_offd, HYPRE_MEMORY_HOST);
    }
 
-   for (i=0; i < num_variables; i++)
+   for (i = 0; i < num_variables; i++)
+   {
       scale[i] = 1;
+   }
 
-   for (i=0; i < num_cols_offd; i++)
+   for (i = 0; i < num_cols_offd; i++)
+   {
       index_ext[i] = -1;
+   }
 
-   for (i=0; i < num_domains; i++)
+   for (i = 0; i < num_domains; i++)
    {
-      for (j=i_domain_dof[i]; j < i_domain_dof[i+1]; j++)
+      for (j = i_domain_dof[i]; j < i_domain_dof[i + 1]; j++)
       {
          j_loc = j_domain_dof[j];
          if (j_loc >= num_variables)
@@ -3626,39 +3975,41 @@ hypre_ParGenerateHybridScale(hypre_ParCSRMatrix *A,
          }
       }
    }
+
    if (comm_pkg)
    {
-      scale_int = hypre_CTAlloc(HYPRE_Real,  send_map_starts[num_sends], HYPRE_MEMORY_HOST);
-      comm_handle=hypre_ParCSRCommHandleCreate(2,comm_pkg,scale_ext,scale_int);
+      scale_int = hypre_CTAlloc(HYPRE_Real, send_map_starts[num_sends], HYPRE_MEMORY_HOST);
+      comm_handle = hypre_ParCSRCommHandleCreate(2, comm_pkg, scale_ext, scale_int);
 
       hypre_ParCSRCommHandleDestroy(comm_handle);
       comm_handle = NULL;
-      A_ext = hypre_ParCSRMatrixExtractBExt(A,A,1);
+      A_ext = hypre_ParCSRMatrixExtractBExt(A, A, 1);
       A_ext_i = hypre_CSRMatrixI(A_ext);
-      A_boundary_i = hypre_CTAlloc(HYPRE_Int, num_cols_offd+1, HYPRE_MEMORY_HOST);
+      A_boundary_i = hypre_CTAlloc(HYPRE_Int, num_cols_offd + 1, HYPRE_MEMORY_HOST);
       A_ext_j = hypre_CSRMatrixBigJ(A_ext);
       A_ext_data = hypre_CSRMatrixData(A_ext);
+
       /* compress A_ext to contain only local data and
          necessary boundary points*/
       index = 0;
-      for (i=0; i < num_cols_offd; i++)
+      for (i = 0; i < num_cols_offd; i++)
       {
          A_boundary_i[i] = index;
-         for (j = A_ext_i[i]; j < A_ext_i[i+1]; j++)
+         for (j = A_ext_i[i]; j < A_ext_i[i + 1]; j++)
          {
             HYPRE_BigInt j_col;
             j_col = A_ext_j[j];
             if (j_col > col_0 && j_col < col_n)
             {
-               A_ext_j[j] = j_col-col_0;
+               A_ext_j[j] = j_col - col_0;
                index++;
             }
             else
             {
-               jj = hypre_BigBinarySearch(col_map_offd,j_col,num_cols_offd);
+               jj = hypre_BigBinarySearch(col_map_offd, j_col, num_cols_offd);
                if (jj > -1 && (scale_ext[jj] > 0))
                {
-                  A_ext_j[j] = num_variables+jj;
+                  A_ext_j[j] = num_variables + jj;
                   index++;
                }
                else
@@ -3669,7 +4020,6 @@ hypre_ParGenerateHybridScale(hypre_ParCSRMatrix *A,
          }
       }
       A_boundary_i[num_cols_offd] = index;
-
       A_boundary_j = NULL;
       A_boundary_data = NULL;
 
@@ -3680,16 +4030,16 @@ hypre_ParGenerateHybridScale(hypre_ParCSRMatrix *A,
       }
 
       index = 0;
-      for (i=0; i < A_ext_i[num_cols_offd]; i++)
+      for (i = 0; i < A_ext_i[num_cols_offd]; i++)
       {
          if (A_ext_j[i] > -1)
          {
-            A_boundary_j[index] = (HYPRE_Int)A_ext_j[i];
+            A_boundary_j[index] = (HYPRE_Int) A_ext_j[i];
             A_boundary_data[index] = A_ext_data[i];
             index++;
          }
       }
-      A_boundary = hypre_CSRMatrixCreate(num_cols_offd,num_variables, index);
+      A_boundary = hypre_CSRMatrixCreate(num_cols_offd, num_variables, index);
       hypre_CSRMatrixI(A_boundary) = A_boundary_i;
       hypre_CSRMatrixJ(A_boundary) = A_boundary_j;
       hypre_CSRMatrixData(A_boundary) = A_boundary_data;
@@ -3697,26 +4047,26 @@ hypre_ParGenerateHybridScale(hypre_ParCSRMatrix *A,
    }
 
    index = 0;
-   for (i=0; i < num_sends; i++)
+   for (i = 0; i < num_sends; i++)
    {
       start = send_map_starts[i];
-      for (j=start; j < send_map_starts[i+1]; j++)
+      for (j = start; j < send_map_starts[i + 1]; j++)
+      {
          scale[send_map_elmts[j]] += scale_int[index++];
+      }
    }
 
-   if (comm_pkg) hypre_TFree(scale_int, HYPRE_MEMORY_HOST);
-   if (num_cols_offd)
+   hypre_TFree(scale_int, HYPRE_MEMORY_HOST);
+   hypre_TFree(scale_ext, HYPRE_MEMORY_HOST);
+   hypre_TFree(index_ext, HYPRE_MEMORY_HOST);
+
+   for (i = 0; i < num_variables; i++)
    {
-      hypre_TFree(scale_ext, HYPRE_MEMORY_HOST);
-      hypre_TFree(index_ext, HYPRE_MEMORY_HOST);
+      scale[i] = 1.0 / scale[i];
    }
 
-   for (i=0; i < num_variables; i++)
-      scale[i] = 1.0/scale[i];
-
    *scale_pointer = scale;
    *A_boundary_pointer = A_boundary;
 
    return hypre_error_flag;
 }
-
diff --git a/external/hypre/src/parcsr_ls/schwarz.h b/external/hypre/src/parcsr_ls/schwarz.h
index 63a8c5b9..e7a751dd 100644
--- a/external/hypre/src/parcsr_ls/schwarz.h
+++ b/external/hypre/src/parcsr_ls/schwarz.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -18,7 +18,7 @@ typedef struct
    HYPRE_Int      domain_type;
    HYPRE_Int      overlap;
    HYPRE_Int      num_functions;
-   HYPRE_Int      use_nonsymm;  
+   HYPRE_Int      use_nonsymm;
    HYPRE_Real   relax_weight;
 
    hypre_CSRMatrix *domain_structure;
@@ -27,8 +27,8 @@ typedef struct
    HYPRE_Real  *scale;
    HYPRE_Int     *dof_func;
    HYPRE_Int     *pivots;
-   
-   
+
+
 
 } hypre_SchwarzData;
 
diff --git a/external/hypre/src/parcsr_mv/CMakeLists.txt b/external/hypre/src/parcsr_mv/CMakeLists.txt
index 6c40d366..68bfb287 100644
--- a/external/hypre/src/parcsr_mv/CMakeLists.txt
+++ b/external/hypre/src/parcsr_mv/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -24,10 +24,16 @@ set(SRCS
   par_csr_bool_matop.c
   par_csr_bool_matrix.c
   par_csr_communication.c
+  par_csr_filter.c
+  par_csr_filter_device.c
   par_csr_matop.c
   par_csr_matrix.c
+  par_csr_matrix_stats.c
+  par_csr_matmat.c
+  par_csr_matmat_device.c
   par_csr_matop_marked.c
   par_csr_matvec.c
+  par_csr_matvec_device.c
   par_vector.c
   par_vector_batched.c
   par_make_system.c
@@ -43,16 +49,18 @@ target_sources(${PROJECT_NAME}
           ${HDRS}
 )
 
-if (HYPRE_USING_CUDA)
-  set(CUDA_SRCS
-    par_csr_matvec.c
+if (HYPRE_USING_GPU)
+  set(GPU_SRCS
+    par_csr_matmat_device.c
+    par_csr_matvec_device.c
     par_csr_fffc_device.c
+    par_csr_filter_device.c
     par_csr_matop_device.c
     par_csr_triplemat_device.c
     par_vector_device.c
   )
-  convert_filenames_to_full_paths(CUDA_SRCS)
-  set(HYPRE_CUDA_SOURCES ${HYPRE_CUDA_SOURCES} ${CUDA_SRCS} PARENT_SCOPE)
+  convert_filenames_to_full_paths(GPU_SRCS)
+  set(HYPRE_GPU_SOURCES ${HYPRE_GPU_SOURCES} ${GPU_SRCS} PARENT_SCOPE)
 endif ()
 
 convert_filenames_to_full_paths(HDRS)
diff --git a/external/hypre/src/parcsr_mv/F90_HYPRE_parcsr_matrix.c b/external/hypre/src/parcsr_mv/F90_HYPRE_parcsr_matrix.c
index c4cd01c1..5849ff6b 100644
--- a/external/hypre/src/parcsr_mv/F90_HYPRE_parcsr_matrix.c
+++ b/external/hypre/src/parcsr_mv/F90_HYPRE_parcsr_matrix.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -17,49 +17,49 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-    
+
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRMatrixCreate
  *--------------------------------------------------------------------------*/
-    
+
 void
 hypre_F90_IFACE(hypre_parcsrmatrixcreate, HYPRE_PARCSRMATRIXCREATE)
-   ( hypre_F90_Comm *comm,
-     hypre_F90_BigInt *global_num_rows,
-     hypre_F90_BigInt *global_num_cols,
-     hypre_F90_BigIntArray *row_starts,
-     hypre_F90_BigIntArray *col_starts,
-     hypre_F90_Int *num_cols_offd,
-     hypre_F90_Int *num_nonzeros_diag,
-     hypre_F90_Int *num_nonzeros_offd,
-     hypre_F90_Obj *matrix,
-     hypre_F90_Int *ierr               )
+( hypre_F90_Comm *comm,
+  hypre_F90_BigInt *global_num_rows,
+  hypre_F90_BigInt *global_num_cols,
+  hypre_F90_BigIntArray *row_starts,
+  hypre_F90_BigIntArray *col_starts,
+  hypre_F90_Int *num_cols_offd,
+  hypre_F90_Int *num_nonzeros_diag,
+  hypre_F90_Int *num_nonzeros_offd,
+  hypre_F90_Obj *matrix,
+  hypre_F90_Int *ierr               )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRMatrixCreate(
-           hypre_F90_PassComm (comm),
-           hypre_F90_PassBigInt (global_num_rows),
-           hypre_F90_PassBigInt (global_num_cols),
-           hypre_F90_PassBigIntArray (row_starts),
-           hypre_F90_PassBigIntArray (col_starts),
-           hypre_F90_PassInt (num_cols_offd),
-           hypre_F90_PassInt (num_nonzeros_diag),
-           hypre_F90_PassInt (num_nonzeros_offd),
-           hypre_F90_PassObjRef (HYPRE_ParCSRMatrix, matrix)  ) );
+           ( HYPRE_ParCSRMatrixCreate(
+                hypre_F90_PassComm (comm),
+                hypre_F90_PassBigInt (global_num_rows),
+                hypre_F90_PassBigInt (global_num_cols),
+                hypre_F90_PassBigIntArray (row_starts),
+                hypre_F90_PassBigIntArray (col_starts),
+                hypre_F90_PassInt (num_cols_offd),
+                hypre_F90_PassInt (num_nonzeros_diag),
+                hypre_F90_PassInt (num_nonzeros_offd),
+                hypre_F90_PassObjRef (HYPRE_ParCSRMatrix, matrix)  ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRMatrixDestroy
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_parcsrmatrixdestroy, HYPRE_PARCSRMATRIXDESTROY)
-   ( hypre_F90_Obj *matrix,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *matrix,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRMatrixDestroy(
-           hypre_F90_PassObj (HYPRE_ParCSRMatrix, matrix) ) );
+           ( HYPRE_ParCSRMatrixDestroy(
+                hypre_F90_PassObj (HYPRE_ParCSRMatrix, matrix) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -68,30 +68,30 @@ hypre_F90_IFACE(hypre_parcsrmatrixdestroy, HYPRE_PARCSRMATRIXDESTROY)
 
 void
 hypre_F90_IFACE(hypre_parcsrmatrixinitialize, HYPRE_PARCSRMATRIXINITIALIZE)
-   ( hypre_F90_Obj *matrix,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *matrix,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRMatrixInitialize(
-           hypre_F90_PassObj (HYPRE_ParCSRMatrix, matrix) ) );
+           ( HYPRE_ParCSRMatrixInitialize(
+                hypre_F90_PassObj (HYPRE_ParCSRMatrix, matrix) ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRMatrixRead
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_parcsrmatrixread, HYPRE_PARCSRMATRIXREAD)
-   ( hypre_F90_Comm *comm,
-     char     *file_name,
-     hypre_F90_Obj *matrix,
-     hypre_F90_Int *ierr       )
+( hypre_F90_Comm *comm,
+  char     *file_name,
+  hypre_F90_Obj *matrix,
+  hypre_F90_Int *ierr       )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRMatrixRead(
-           hypre_F90_PassComm (comm),
-           (char *)    file_name,
-           hypre_F90_PassObjRef (HYPRE_ParCSRMatrix, matrix) ) );
+           ( HYPRE_ParCSRMatrixRead(
+                hypre_F90_PassComm (comm),
+                (char *)    file_name,
+                hypre_F90_PassObjRef (HYPRE_ParCSRMatrix, matrix) ) );
 
 }
 
@@ -101,10 +101,10 @@ hypre_F90_IFACE(hypre_parcsrmatrixread, HYPRE_PARCSRMATRIXREAD)
 
 void
 hypre_F90_IFACE(hypre_parcsrmatrixprint, HYPRE_PARCSRMATRIXPRINT)
-   ( hypre_F90_Obj *matrix,
-     char     *fort_file_name,
-     hypre_F90_Int *fort_file_name_size,
-     hypre_F90_Int *ierr       )
+( hypre_F90_Obj *matrix,
+  char     *fort_file_name,
+  hypre_F90_Int *fort_file_name_size,
+  hypre_F90_Int *ierr       )
 {
    HYPRE_Int i;
    char *c_file_name;
@@ -117,9 +117,9 @@ hypre_F90_IFACE(hypre_parcsrmatrixprint, HYPRE_PARCSRMATRIXPRINT)
    }
 
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRMatrixPrint(
-           hypre_F90_PassObj (HYPRE_ParCSRMatrix, matrix),
-           (char *)              c_file_name ) );
+           ( HYPRE_ParCSRMatrixPrint(
+                hypre_F90_PassObj (HYPRE_ParCSRMatrix, matrix),
+                (char *)              c_file_name ) );
 
    hypre_TFree(c_file_name, HYPRE_MEMORY_HOST);
 
@@ -129,51 +129,51 @@ hypre_F90_IFACE(hypre_parcsrmatrixprint, HYPRE_PARCSRMATRIXPRINT)
  * HYPRE_ParCSRMatrixGetComm
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_parcsrmatrixgetcomm, HYPRE_PARCSRMATRIXGETCOMM)
-   ( hypre_F90_Obj *matrix,
-     hypre_F90_Comm *comm,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *matrix,
+  hypre_F90_Comm *comm,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRMatrixGetComm(
-           hypre_F90_PassObj (HYPRE_ParCSRMatrix, matrix),
-           (MPI_Comm *)          comm    ) );
+           ( HYPRE_ParCSRMatrixGetComm(
+                hypre_F90_PassObj (HYPRE_ParCSRMatrix, matrix),
+                (MPI_Comm *)          comm    ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRMatrixGetDims
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_parcsrmatrixgetdims, HYPRE_PARCSRMATRIXGETDIMS)
-   ( hypre_F90_Obj *matrix,
-     hypre_F90_BigInt *M,
-     hypre_F90_BigInt *N,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *matrix,
+  hypre_F90_BigInt *M,
+  hypre_F90_BigInt *N,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRMatrixGetDims(
-           hypre_F90_PassObj (HYPRE_ParCSRMatrix, matrix),
-           hypre_F90_PassBigIntRef (M),
-           hypre_F90_PassBigIntRef (N)       ) );
+           ( HYPRE_ParCSRMatrixGetDims(
+                hypre_F90_PassObj (HYPRE_ParCSRMatrix, matrix),
+                hypre_F90_PassBigIntRef (M),
+                hypre_F90_PassBigIntRef (N)       ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRMatrixGetRowPartitioning
  *--------------------------------------------------------------------------*/
- 
+
 void
 hypre_F90_IFACE(hypre_parcsrmatrixgetrowpartiti, HYPRE_PARCSRMATRIXGETROWPARTITI)
-   ( hypre_F90_Obj *matrix,
-     hypre_F90_Obj *row_partitioning_ptr,
-     hypre_F90_Int *ierr )
+( hypre_F90_Obj *matrix,
+  hypre_F90_Obj *row_partitioning_ptr,
+  hypre_F90_Int *ierr )
 {
    HYPRE_Int *row_partitioning;
 
    *ierr = (hypre_F90_Int) HYPRE_ParCSRMatrixGetRowPartitioning(
-      hypre_F90_PassObj (HYPRE_ParCSRMatrix, matrix),
-      (HYPRE_BigInt **)    &row_partitioning  );
+              hypre_F90_PassObj (HYPRE_ParCSRMatrix, matrix),
+              (HYPRE_BigInt **)    &row_partitioning  );
 
    *row_partitioning_ptr = (hypre_F90_Obj) row_partitioning;
 }
@@ -181,18 +181,18 @@ hypre_F90_IFACE(hypre_parcsrmatrixgetrowpartiti, HYPRE_PARCSRMATRIXGETROWPARTITI
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRMatrixGetColPartitioning
  *--------------------------------------------------------------------------*/
- 
+
 void
 hypre_F90_IFACE(hypre_parcsrmatrixgetcolpartiti, HYPRE_PARCSRMATRIXGETCOLPARTITI)
-   ( hypre_F90_Obj *matrix,
-     hypre_F90_Obj *col_partitioning_ptr,
-     hypre_F90_Int *ierr )
+( hypre_F90_Obj *matrix,
+  hypre_F90_Obj *col_partitioning_ptr,
+  hypre_F90_Int *ierr )
 {
    HYPRE_Int *col_partitioning;
 
    *ierr = (hypre_F90_Int) HYPRE_ParCSRMatrixGetColPartitioning(
-      hypre_F90_PassObj (HYPRE_ParCSRMatrix, matrix),
-      (HYPRE_BigInt **)    &col_partitioning  );
+              hypre_F90_PassObj (HYPRE_ParCSRMatrix, matrix),
+              (HYPRE_BigInt **)    &col_partitioning  );
 
    *col_partitioning_ptr = (hypre_F90_Obj) col_partitioning;
 }
@@ -201,46 +201,46 @@ hypre_F90_IFACE(hypre_parcsrmatrixgetcolpartiti, HYPRE_PARCSRMATRIXGETCOLPARTITI
  * HYPRE_ParCSRMatrixGetLocalRange
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_parcsrmatrixgetlocalrange, HYPRE_PARCSRMATRIXGETLOCALRANGE)
-   ( hypre_F90_Obj *matrix,
-     hypre_F90_BigInt *row_start,
-     hypre_F90_BigInt *row_end,
-     hypre_F90_BigInt *col_start,
-     hypre_F90_BigInt *col_end,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *matrix,
+  hypre_F90_BigInt *row_start,
+  hypre_F90_BigInt *row_end,
+  hypre_F90_BigInt *col_start,
+  hypre_F90_BigInt *col_end,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRMatrixGetLocalRange(
-           hypre_F90_PassObj (HYPRE_ParCSRMatrix, matrix),
-           hypre_F90_PassBigIntRef (row_start),
-           hypre_F90_PassBigIntRef (row_end),
-           hypre_F90_PassBigIntRef (col_start),
-           hypre_F90_PassBigIntRef (col_end)) );
+           ( HYPRE_ParCSRMatrixGetLocalRange(
+                hypre_F90_PassObj (HYPRE_ParCSRMatrix, matrix),
+                hypre_F90_PassBigIntRef (row_start),
+                hypre_F90_PassBigIntRef (row_end),
+                hypre_F90_PassBigIntRef (col_start),
+                hypre_F90_PassBigIntRef (col_end)) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_ParCSRMatrixGetRow
  *--------------------------------------------------------------------------*/
- 
+
 void
 hypre_F90_IFACE(hypre_parcsrmatrixgetrow, HYPRE_PARCSRMATRIXGETROW)
-   ( hypre_F90_Obj *matrix,
-     hypre_F90_BigInt *row,
-     hypre_F90_Int *size,
-     hypre_F90_Obj *col_ind_ptr,
-     hypre_F90_Obj *values_ptr,
-     hypre_F90_Int *ierr )
+( hypre_F90_Obj *matrix,
+  hypre_F90_BigInt *row,
+  hypre_F90_Int *size,
+  hypre_F90_Obj *col_ind_ptr,
+  hypre_F90_Obj *values_ptr,
+  hypre_F90_Int *ierr )
 {
    HYPRE_Int *col_ind;
    HYPRE_Complex    *values;
 
    *ierr = (hypre_F90_Int) HYPRE_ParCSRMatrixGetRow(
-      hypre_F90_PassObj      (HYPRE_ParCSRMatrix, matrix),
-      hypre_F90_PassBigInt      (row),
-      hypre_F90_PassIntRef (size),
-      (HYPRE_BigInt **)         &col_ind,
-      (HYPRE_Complex **)            &values );
+              hypre_F90_PassObj      (HYPRE_ParCSRMatrix, matrix),
+              hypre_F90_PassBigInt      (row),
+              hypre_F90_PassIntRef (size),
+              (HYPRE_BigInt **)         &col_ind,
+              (HYPRE_Complex **)            &values );
 
    *col_ind_ptr = (hypre_F90_Obj) col_ind;
    *values_ptr  = (hypre_F90_Obj) values;
@@ -252,22 +252,22 @@ hypre_F90_IFACE(hypre_parcsrmatrixgetrow, HYPRE_PARCSRMATRIXGETROW)
 
 void
 hypre_F90_IFACE(hypre_parcsrmatrixrestorerow, HYPRE_PARCSRMATRIXRESTOREROW)
-   ( hypre_F90_Obj *matrix,
-     hypre_F90_BigInt *row,
-     hypre_F90_Int *size,
-     hypre_F90_Obj *col_ind_ptr,
-     hypre_F90_Obj *values_ptr,
-     hypre_F90_Int *ierr )
+( hypre_F90_Obj *matrix,
+  hypre_F90_BigInt *row,
+  hypre_F90_Int *size,
+  hypre_F90_Obj *col_ind_ptr,
+  hypre_F90_Obj *values_ptr,
+  hypre_F90_Int *ierr )
 {
-   HYPRE_Int *col_ind;  
+   HYPRE_Int *col_ind;
    HYPRE_Complex    *values;
 
    *ierr = (hypre_F90_Int) HYPRE_ParCSRMatrixRestoreRow(
-      hypre_F90_PassObj      (HYPRE_ParCSRMatrix, matrix),
-      hypre_F90_PassBigInt      (row),
-      hypre_F90_PassIntRef (size),
-      (HYPRE_BigInt **)         &col_ind,
-      (HYPRE_Complex **)            &values );
+              hypre_F90_PassObj      (HYPRE_ParCSRMatrix, matrix),
+              hypre_F90_PassBigInt      (row),
+              hypre_F90_PassIntRef (size),
+              (HYPRE_BigInt **)         &col_ind,
+              (HYPRE_Complex **)            &values );
 
    *col_ind_ptr = (hypre_F90_Obj) col_ind;
    *values_ptr  = (hypre_F90_Obj) values;
@@ -279,21 +279,21 @@ hypre_F90_IFACE(hypre_parcsrmatrixrestorerow, HYPRE_PARCSRMATRIXRESTOREROW)
 
 void
 hypre_F90_IFACE(hypre_csrmatrixtoparcsrmatrix, HYPRE_CSRMATRIXTOPARCSRMATRIX)
-   (hypre_F90_Comm *comm,
-    hypre_F90_Obj *A_CSR,
-    hypre_F90_BigIntArray *row_partitioning,  
-    hypre_F90_BigIntArray *col_partitioning,  
-    hypre_F90_Obj *matrix,
-    hypre_F90_Int *ierr   )
+(hypre_F90_Comm *comm,
+ hypre_F90_Obj *A_CSR,
+ hypre_F90_BigIntArray *row_partitioning,
+ hypre_F90_BigIntArray *col_partitioning,
+ hypre_F90_Obj *matrix,
+ hypre_F90_Int *ierr   )
 {
 
    *ierr = (hypre_F90_Int)
-      ( HYPRE_CSRMatrixToParCSRMatrix(
-           hypre_F90_PassComm (comm),
-           hypre_F90_PassObj (HYPRE_CSRMatrix, A_CSR),
-           hypre_F90_PassBigIntArray (row_partitioning),
-           hypre_F90_PassBigIntArray (col_partitioning),
-           hypre_F90_PassObjRef (HYPRE_ParCSRMatrix, matrix) ) );
+           ( HYPRE_CSRMatrixToParCSRMatrix(
+                hypre_F90_PassComm (comm),
+                hypre_F90_PassObj (HYPRE_CSRMatrix, A_CSR),
+                hypre_F90_PassBigIntArray (row_partitioning),
+                hypre_F90_PassBigIntArray (col_partitioning),
+                hypre_F90_PassObjRef (HYPRE_ParCSRMatrix, matrix) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -301,18 +301,19 @@ hypre_F90_IFACE(hypre_csrmatrixtoparcsrmatrix, HYPRE_CSRMATRIXTOPARCSRMATRIX)
  *--------------------------------------------------------------------------*/
 
 void
-hypre_F90_IFACE(hypre_csrmatrixtoparcsrmatrix_withnewpartitioning, HYPRE_CSRMATRIXTOPARCSRMATRIX_WITHNEWPARTITIONING)
-   (hypre_F90_Comm *comm,
-    hypre_F90_Obj *A_CSR,
-    hypre_F90_Obj *matrix,
-    hypre_F90_Int *ierr   )
+hypre_F90_IFACE(hypre_csrmatrixtoparcsrmatrix_withnewpartitioning,
+                HYPRE_CSRMATRIXTOPARCSRMATRIX_WITHNEWPARTITIONING)
+(hypre_F90_Comm *comm,
+ hypre_F90_Obj *A_CSR,
+ hypre_F90_Obj *matrix,
+ hypre_F90_Int *ierr   )
 {
 
    *ierr = (hypre_F90_Int)
-      ( HYPRE_CSRMatrixToParCSRMatrix_WithNewPartitioning(
-           hypre_F90_PassComm (comm),
-           hypre_F90_PassObj (HYPRE_CSRMatrix, A_CSR),
-           hypre_F90_PassObjRef (HYPRE_ParCSRMatrix, matrix) ) );
+           ( HYPRE_CSRMatrixToParCSRMatrix_WithNewPartitioning(
+                hypre_F90_PassComm (comm),
+                hypre_F90_PassObj (HYPRE_CSRMatrix, A_CSR),
+                hypre_F90_PassObjRef (HYPRE_ParCSRMatrix, matrix) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -321,21 +322,21 @@ hypre_F90_IFACE(hypre_csrmatrixtoparcsrmatrix_withnewpartitioning, HYPRE_CSRMATR
 
 void
 hypre_F90_IFACE(hypre_parcsrmatrixmatvec, HYPRE_PARCSRMATRIXMATVEC)
-   ( hypre_F90_Complex *alpha,
-     hypre_F90_Obj *A,
-     hypre_F90_Obj *x,
-     hypre_F90_Complex *beta,
-     hypre_F90_Obj *y,  
-     hypre_F90_Int *ierr   )
+( hypre_F90_Complex *alpha,
+  hypre_F90_Obj *A,
+  hypre_F90_Obj *x,
+  hypre_F90_Complex *beta,
+  hypre_F90_Obj *y,
+  hypre_F90_Int *ierr   )
 {
 
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRMatrixMatvec(
-           hypre_F90_PassComplex (alpha),
-           hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
-           hypre_F90_PassObj (HYPRE_ParVector, x),
-           hypre_F90_PassComplex (beta),
-           hypre_F90_PassObj (HYPRE_ParVector, y)      ) );
+           ( HYPRE_ParCSRMatrixMatvec(
+                hypre_F90_PassComplex (alpha),
+                hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
+                hypre_F90_PassObj (HYPRE_ParVector, x),
+                hypre_F90_PassComplex (beta),
+                hypre_F90_PassObj (HYPRE_ParVector, y)      ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -344,23 +345,23 @@ hypre_F90_IFACE(hypre_parcsrmatrixmatvec, HYPRE_PARCSRMATRIXMATVEC)
 
 void
 hypre_F90_IFACE(hypre_parcsrmatrixmatvect, HYPRE_PARCSRMATRIXMATVECT)
-   ( hypre_F90_Complex *alpha,
-     hypre_F90_Obj *A,
-     hypre_F90_Obj *x,
-     hypre_F90_Complex *beta,
-     hypre_F90_Obj *y,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Complex *alpha,
+  hypre_F90_Obj *A,
+  hypre_F90_Obj *x,
+  hypre_F90_Complex *beta,
+  hypre_F90_Obj *y,
+  hypre_F90_Int *ierr    )
 {
 
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParCSRMatrixMatvecT(
-           hypre_F90_PassComplex (alpha),
-           hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
-           hypre_F90_PassObj (HYPRE_ParVector, x),
-           hypre_F90_PassComplex (beta),
-           hypre_F90_PassObj (HYPRE_ParVector, y)      ) );
+           ( HYPRE_ParCSRMatrixMatvecT(
+                hypre_F90_PassComplex (alpha),
+                hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
+                hypre_F90_PassObj (HYPRE_ParVector, x),
+                hypre_F90_PassComplex (beta),
+                hypre_F90_PassObj (HYPRE_ParVector, y)      ) );
 }
-    
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/external/hypre/src/parcsr_mv/F90_HYPRE_parcsr_vector.c b/external/hypre/src/parcsr_mv/F90_HYPRE_parcsr_vector.c
index 8ceaf63a..2bbc952b 100644
--- a/external/hypre/src/parcsr_mv/F90_HYPRE_parcsr_vector.c
+++ b/external/hypre/src/parcsr_mv/F90_HYPRE_parcsr_vector.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -17,24 +17,24 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-    
+
 /*--------------------------------------------------------------------------
  * HYPRE_ParVectorCreate
  *--------------------------------------------------------------------------*/
 
 void
 hypre_F90_IFACE(hypre_parvectorcreate, HYPRE_PARVECTORCREATE)
-   ( hypre_F90_Comm *comm,
-     hypre_F90_BigInt *global_size,
-     hypre_F90_BigIntArray *partitioning,
-     hypre_F90_Obj *vector,
-     hypre_F90_Int *ierr )
+( hypre_F90_Comm *comm,
+  hypre_F90_BigInt *global_size,
+  hypre_F90_BigIntArray *partitioning,
+  hypre_F90_Obj *vector,
+  hypre_F90_Int *ierr )
 {
    *ierr = (hypre_F90_Int) HYPRE_ParVectorCreate(
-      hypre_F90_PassComm (comm),
-      hypre_F90_PassBigInt (global_size),
-      hypre_F90_PassBigIntArray (partitioning),
-      hypre_F90_PassObjRef (HYPRE_ParVector, vector) );
+              hypre_F90_PassComm (comm),
+              hypre_F90_PassBigInt (global_size),
+              hypre_F90_PassBigIntArray (partitioning),
+              hypre_F90_PassObjRef (HYPRE_ParVector, vector) );
 
 }
 
@@ -44,19 +44,19 @@ hypre_F90_IFACE(hypre_parvectorcreate, HYPRE_PARVECTORCREATE)
 
 void
 hypre_F90_IFACE(hypre_parmultivectorcreate, HYPRE_PARMULTIVECTORCREATE)
-   ( hypre_F90_Comm *comm,
-     hypre_F90_BigInt *global_size,
-     hypre_F90_BigIntArray *partitioning,
-     hypre_F90_Int *number_vectors,
-     hypre_F90_Obj *vector,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Comm *comm,
+  hypre_F90_BigInt *global_size,
+  hypre_F90_BigIntArray *partitioning,
+  hypre_F90_Int *number_vectors,
+  hypre_F90_Obj *vector,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int) HYPRE_ParMultiVectorCreate(
-      hypre_F90_PassComm (comm),
-      hypre_F90_PassBigInt (global_size),
-      hypre_F90_PassBigIntArray (partitioning),
-      hypre_F90_PassInt (number_vectors),
-      hypre_F90_PassObjRef (HYPRE_ParVector, vector) );
+              hypre_F90_PassComm (comm),
+              hypre_F90_PassBigInt (global_size),
+              hypre_F90_PassBigIntArray (partitioning),
+              hypre_F90_PassInt (number_vectors),
+              hypre_F90_PassObjRef (HYPRE_ParVector, vector) );
 
 }
 
@@ -64,14 +64,14 @@ hypre_F90_IFACE(hypre_parmultivectorcreate, HYPRE_PARMULTIVECTORCREATE)
  * HYPRE_ParVectorDestroy
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_parvectordestroy, HYPRE_PARVECTORDESTROY)
-   ( hypre_F90_Obj *vector,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *vector,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParVectorDestroy(
-           hypre_F90_PassObj (HYPRE_ParVector, vector) ) );
+           ( HYPRE_ParVectorDestroy(
+                hypre_F90_PassObj (HYPRE_ParVector, vector) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -80,30 +80,30 @@ hypre_F90_IFACE(hypre_parvectordestroy, HYPRE_PARVECTORDESTROY)
 
 void
 hypre_F90_IFACE(hypre_parvectorinitialize, HYPRE_PARVECTORINITIALIZE)
-   ( hypre_F90_Obj *vector,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *vector,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParVectorInitialize(
-           hypre_F90_PassObj (HYPRE_ParVector, vector) ) );
+           ( HYPRE_ParVectorInitialize(
+                hypre_F90_PassObj (HYPRE_ParVector, vector) ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_ParVectorRead
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_parvectorread, HYPRE_PARVECTORREAD)
-   ( hypre_F90_Comm *comm,
-     hypre_F90_Obj *vector,
-     char     *file_name,
-     hypre_F90_Int *ierr       )
+( hypre_F90_Comm *comm,
+  hypre_F90_Obj *vector,
+  char     *file_name,
+  hypre_F90_Int *ierr       )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParVectorRead(
-           hypre_F90_PassComm (comm),
-           (char *)    file_name,
-           hypre_F90_PassObjRef (HYPRE_ParVector, vector) ) );
+           ( HYPRE_ParVectorRead(
+                hypre_F90_PassComm (comm),
+                (char *)    file_name,
+                hypre_F90_PassObjRef (HYPRE_ParVector, vector) ) );
 
 }
 
@@ -113,10 +113,10 @@ hypre_F90_IFACE(hypre_parvectorread, HYPRE_PARVECTORREAD)
 
 void
 hypre_F90_IFACE(hypre_parvectorprint, HYPRE_PARVECTORPRINT)
-   ( hypre_F90_Obj *vector,
-     char     *fort_file_name,
-     hypre_F90_Int *fort_file_name_size,
-     hypre_F90_Int *ierr       )
+( hypre_F90_Obj *vector,
+  char     *fort_file_name,
+  hypre_F90_Int *fort_file_name_size,
+  hypre_F90_Int *ierr       )
 {
    HYPRE_Int i;
    char *c_file_name;
@@ -129,9 +129,9 @@ hypre_F90_IFACE(hypre_parvectorprint, HYPRE_PARVECTORPRINT)
    }
 
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParVectorPrint(
-           hypre_F90_PassObj (HYPRE_ParVector, vector),
-           (char *)           c_file_name ) );
+           ( HYPRE_ParVectorPrint(
+                hypre_F90_PassObj (HYPRE_ParVector, vector),
+                (char *)           c_file_name ) );
 
    hypre_TFree(c_file_name, HYPRE_MEMORY_HOST);
 
@@ -143,14 +143,14 @@ hypre_F90_IFACE(hypre_parvectorprint, HYPRE_PARVECTORPRINT)
 
 void
 hypre_F90_IFACE(hypre_parvectorsetconstantvalue, HYPRE_PARVECTORSETCONSTANTVALUE)
-   ( hypre_F90_Obj *vector,
-     hypre_F90_Complex *value,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *vector,
+  hypre_F90_Complex *value,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParVectorSetConstantValues(
-           hypre_F90_PassObj (HYPRE_ParVector, vector),
-           hypre_F90_PassComplex (value)) );
+           ( HYPRE_ParVectorSetConstantValues(
+                hypre_F90_PassObj (HYPRE_ParVector, vector),
+                hypre_F90_PassComplex (value)) );
 }
 
 /*--------------------------------------------------------------------------
@@ -159,14 +159,14 @@ hypre_F90_IFACE(hypre_parvectorsetconstantvalue, HYPRE_PARVECTORSETCONSTANTVALUE
 
 void
 hypre_F90_IFACE(hypre_parvectorsetrandomvalues, HYPRE_PARVECTORSETRANDOMVALUES)
-   ( hypre_F90_Obj *vector,
-     hypre_F90_Int *seed,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *vector,
+  hypre_F90_Int *seed,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParVectorSetRandomValues(
-           hypre_F90_PassObj (HYPRE_ParVector, vector),
-           hypre_F90_PassInt (seed)) );
+           ( HYPRE_ParVectorSetRandomValues(
+                hypre_F90_PassObj (HYPRE_ParVector, vector),
+                hypre_F90_PassInt (seed)) );
 }
 
 /*--------------------------------------------------------------------------
@@ -175,14 +175,14 @@ hypre_F90_IFACE(hypre_parvectorsetrandomvalues, HYPRE_PARVECTORSETRANDOMVALUES)
 
 void
 hypre_F90_IFACE(hypre_parvectorcopy, HYPRE_PARVECTORCOPY)
-   ( hypre_F90_Obj *x,
-     hypre_F90_Obj *y,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *x,
+  hypre_F90_Obj *y,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParVectorCopy(
-           hypre_F90_PassObj (HYPRE_ParVector, x),
-           hypre_F90_PassObj (HYPRE_ParVector, y)) );
+           ( HYPRE_ParVectorCopy(
+                hypre_F90_PassObj (HYPRE_ParVector, x),
+                hypre_F90_PassObj (HYPRE_ParVector, y)) );
 }
 
 /*--------------------------------------------------------------------------
@@ -191,13 +191,13 @@ hypre_F90_IFACE(hypre_parvectorcopy, HYPRE_PARVECTORCOPY)
 
 void
 hypre_F90_IFACE(hypre_parvectorcloneshallow, HYPRE_PARVECTORCLONESHALLOW)
-   ( hypre_F90_Obj *x,
-     hypre_F90_Obj *xclone,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *x,
+  hypre_F90_Obj *xclone,
+  hypre_F90_Int *ierr    )
 {
    *xclone = (hypre_F90_Obj)
-      ( HYPRE_ParVectorCloneShallow(
-           hypre_F90_PassObj (HYPRE_ParVector, x) ) );
+             ( HYPRE_ParVectorCloneShallow(
+                  hypre_F90_PassObj (HYPRE_ParVector, x) ) );
    *ierr = 0;
 }
 
@@ -207,14 +207,14 @@ hypre_F90_IFACE(hypre_parvectorcloneshallow, HYPRE_PARVECTORCLONESHALLOW)
 
 void
 hypre_F90_IFACE(hypre_parvectorscale, HYPRE_PARVECTORSCALE)
-   ( hypre_F90_Complex *value,
-     hypre_F90_Obj *x,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Complex *value,
+  hypre_F90_Obj *x,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParVectorScale(
-           hypre_F90_PassComplex (value),
-           hypre_F90_PassObj (HYPRE_ParVector, x) ) );
+           ( HYPRE_ParVectorScale(
+                hypre_F90_PassComplex (value),
+                hypre_F90_PassObj (HYPRE_ParVector, x) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -223,16 +223,16 @@ hypre_F90_IFACE(hypre_parvectorscale, HYPRE_PARVECTORSCALE)
 
 void
 hypre_F90_IFACE(hypre_parvectoraxpy, HYPRE_PARVECTORAXPY)
-   ( hypre_F90_Complex *value,
-     hypre_F90_Obj *x,
-     hypre_F90_Obj *y,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Complex *value,
+  hypre_F90_Obj *x,
+  hypre_F90_Obj *y,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParVectorAxpy(
-           hypre_F90_PassComplex (value),
-           hypre_F90_PassObj (HYPRE_ParVector, x),
-           hypre_F90_PassObj (HYPRE_ParVector, y) ) );
+           ( HYPRE_ParVectorAxpy(
+                hypre_F90_PassComplex (value),
+                hypre_F90_PassObj (HYPRE_ParVector, x),
+                hypre_F90_PassObj (HYPRE_ParVector, y) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -241,18 +241,18 @@ hypre_F90_IFACE(hypre_parvectoraxpy, HYPRE_PARVECTORAXPY)
 
 void
 hypre_F90_IFACE(hypre_parvectorinnerprod, HYPRE_PARVECTORINNERPROD)
-   (hypre_F90_Obj *x,
-    hypre_F90_Obj *y,
-    hypre_F90_Complex *prod,
-    hypre_F90_Int *ierr    )
+(hypre_F90_Obj *x,
+ hypre_F90_Obj *y,
+ hypre_F90_Complex *prod,
+ hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_ParVectorInnerProd(
-           hypre_F90_PassObj (HYPRE_ParVector, x),
-           hypre_F90_PassObj (HYPRE_ParVector, y),
-           hypre_F90_PassRealRef (prod) ) );
+           ( HYPRE_ParVectorInnerProd(
+                hypre_F90_PassObj (HYPRE_ParVector, x),
+                hypre_F90_PassObj (HYPRE_ParVector, y),
+                hypre_F90_PassRealRef (prod) ) );
 }
-    
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/external/hypre/src/parcsr_mv/F90_par_vector.c b/external/hypre/src/parcsr_mv/F90_par_vector.c
index 15b9d714..bb8f2c5b 100644
--- a/external/hypre/src/parcsr_mv/F90_par_vector.c
+++ b/external/hypre/src/parcsr_mv/F90_par_vector.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -24,14 +24,14 @@ extern "C" {
 
 void
 hypre_F90_IFACE(hypre_setparvectordataowner, HYPRE_SETPARVECTORDATAOWNER)
-   ( hypre_F90_Obj *vector,
-     hypre_F90_Int *owns_data,
-     hypre_F90_Int *ierr       )
+( hypre_F90_Obj *vector,
+  hypre_F90_Int *owns_data,
+  hypre_F90_Int *ierr       )
 {
    *ierr = (hypre_F90_Int)
-      ( hypre_ParVectorSetDataOwner(
-           (hypre_ParVector *) *vector,
-           hypre_F90_PassInt (owns_data) ) );
+           ( hypre_ParVectorSetDataOwner(
+                (hypre_ParVector *) *vector,
+                hypre_F90_PassInt (owns_data) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -40,14 +40,14 @@ hypre_F90_IFACE(hypre_setparvectordataowner, HYPRE_SETPARVECTORDATAOWNER)
 
 void
 hypre_F90_IFACE(hypre_setparvectorconstantvalue, HYPRE_SETPARVECTORCONSTANTVALUE)
-   ( hypre_F90_Obj *vector,
-     hypre_F90_Complex *value,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *vector,
+  hypre_F90_Complex *value,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( hypre_ParVectorSetConstantValues(
-           (hypre_ParVector *) *vector,
-           hypre_F90_PassComplex (value)   ) );
+           ( hypre_ParVectorSetConstantValues(
+                (hypre_ParVector *) *vector,
+                hypre_F90_PassComplex (value)   ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -56,14 +56,14 @@ hypre_F90_IFACE(hypre_setparvectorconstantvalue, HYPRE_SETPARVECTORCONSTANTVALUE
 
 void
 hypre_F90_IFACE(hypre_setparvectorrandomvalues, HYPRE_SETPARVECTORRANDOMVALUES)
-   ( hypre_F90_Obj *vector,
-     hypre_F90_Int *seed,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *vector,
+  hypre_F90_Int *seed,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( hypre_ParVectorSetRandomValues(
-           (hypre_ParVector *) *vector,
-           hypre_F90_PassInt (seed)    ) );
+           ( hypre_ParVectorSetRandomValues(
+                (hypre_ParVector *) *vector,
+                hypre_F90_PassInt (seed)    ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -72,14 +72,14 @@ hypre_F90_IFACE(hypre_setparvectorrandomvalues, HYPRE_SETPARVECTORRANDOMVALUES)
 
 void
 hypre_F90_IFACE(hypre_copyparvector, HYPRE_COPYPARVECTOR)
-   ( hypre_F90_Obj *x,
-     hypre_F90_Obj *y,
-     hypre_F90_Int *ierr )
+( hypre_F90_Obj *x,
+  hypre_F90_Obj *y,
+  hypre_F90_Int *ierr )
 {
    *ierr = (hypre_F90_Int)
-      ( hypre_ParVectorCopy(
-           (hypre_ParVector *) *x,
-           (hypre_ParVector *) *y  ) );
+           ( hypre_ParVectorCopy(
+                (hypre_ParVector *) *x,
+                (hypre_ParVector *) *y  ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -88,14 +88,14 @@ hypre_F90_IFACE(hypre_copyparvector, HYPRE_COPYPARVECTOR)
 
 void
 hypre_F90_IFACE(hypre_scaleparvector, HYPRE_SCALEPARVECTOR)
-   ( hypre_F90_Obj *vector,
-     hypre_F90_Complex *scale,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *vector,
+  hypre_F90_Complex *scale,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( hypre_ParVectorScale(
-           hypre_F90_PassComplex (scale),
-           (hypre_ParVector *) *vector ) );
+           ( hypre_ParVectorScale(
+                hypre_F90_PassComplex (scale),
+                (hypre_ParVector *) *vector ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -104,16 +104,16 @@ hypre_F90_IFACE(hypre_scaleparvector, HYPRE_SCALEPARVECTOR)
 
 void
 hypre_F90_IFACE(hypre_paraxpy, HYPRE_PARAXPY)
-   ( hypre_F90_Complex *a,
-     hypre_F90_Obj *x,
-     hypre_F90_Obj *y,
-     hypre_F90_Int *ierr )
+( hypre_F90_Complex *a,
+  hypre_F90_Obj *x,
+  hypre_F90_Obj *y,
+  hypre_F90_Int *ierr )
 {
    *ierr = (hypre_F90_Int)
-      ( hypre_ParVectorAxpy(
-           hypre_F90_PassComplex (a),
-           (hypre_ParVector *) *x,
-           (hypre_ParVector *) *y  ) );
+           ( hypre_ParVectorAxpy(
+                hypre_F90_PassComplex (a),
+                (hypre_ParVector *) *x,
+                (hypre_ParVector *) *y  ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -122,15 +122,15 @@ hypre_F90_IFACE(hypre_paraxpy, HYPRE_PARAXPY)
 
 void
 hypre_F90_IFACE(hypre_parinnerprod, HYPRE_PARINNERPROD)
-   ( hypre_F90_Obj *x,
-     hypre_F90_Obj *y,
-     hypre_F90_Complex *inner_prod,
-     hypre_F90_Int *ierr           )
+( hypre_F90_Obj *x,
+  hypre_F90_Obj *y,
+  hypre_F90_Complex *inner_prod,
+  hypre_F90_Int *ierr           )
 {
    *inner_prod = (hypre_F90_Complex)
-      ( hypre_ParVectorInnerProd(
-           (hypre_ParVector *) *x,
-           (hypre_ParVector *) *y  ) );
+                 ( hypre_ParVectorInnerProd(
+                      (hypre_ParVector *) *x,
+                      (hypre_ParVector *) *y  ) );
 
    *ierr = 0;
 }
@@ -141,17 +141,17 @@ hypre_F90_IFACE(hypre_parinnerprod, HYPRE_PARINNERPROD)
 
 void
 hypre_F90_IFACE(hypre_vectortoparvector, HYPRE_VECTORTOPARVECTOR)
-   ( hypre_F90_Comm *comm,
-     hypre_F90_Obj *vector,
-     hypre_F90_BigIntArray *vec_starts,
-     hypre_F90_Obj *par_vector,
-     hypre_F90_Int *ierr        )
+( hypre_F90_Comm *comm,
+  hypre_F90_Obj *vector,
+  hypre_F90_BigIntArray *vec_starts,
+  hypre_F90_Obj *par_vector,
+  hypre_F90_Int *ierr        )
 {
    *par_vector = (hypre_F90_Obj)
-      ( hypre_VectorToParVector(
-           hypre_F90_PassComm (comm),
-           (hypre_Vector *) *vector,
-           hypre_F90_PassBigIntArray (vec_starts) ) );
+                 ( hypre_VectorToParVector(
+                      hypre_F90_PassComm (comm),
+                      (hypre_Vector *) *vector,
+                      hypre_F90_PassBigIntArray (vec_starts) ) );
 
    *ierr = 0;
 }
@@ -162,13 +162,13 @@ hypre_F90_IFACE(hypre_vectortoparvector, HYPRE_VECTORTOPARVECTOR)
 
 void
 hypre_F90_IFACE(hypre_parvectortovectorall, HYPRE_PARVECTORTOVECTORALL)
-   ( hypre_F90_Obj *par_vector,
-     hypre_F90_Obj *vector,
-     hypre_F90_Int *ierr        )
+( hypre_F90_Obj *par_vector,
+  hypre_F90_Obj *vector,
+  hypre_F90_Int *ierr        )
 {
    *vector = (hypre_F90_Obj)(
-      hypre_ParVectorToVectorAll
-      ( (hypre_ParVector *) *par_vector ) );
+                hypre_ParVectorToVectorAll
+                ( (hypre_ParVector *) *par_vector ));
 
    *ierr = 0;
 }
diff --git a/external/hypre/src/parcsr_mv/F90_parcsr_matrix.c b/external/hypre/src/parcsr_mv/F90_parcsr_matrix.c
index fd55c806..b446c5b5 100644
--- a/external/hypre/src/parcsr_mv/F90_parcsr_matrix.c
+++ b/external/hypre/src/parcsr_mv/F90_parcsr_matrix.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -17,20 +17,20 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-    
+
 /*--------------------------------------------------------------------------
  * hypre_ParCSRMatrixGlobalNumRows
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_parcsrmatrixglobalnumrows, HYPRE_PARCSRMATRIXGLOBALNUMROWS)
-   ( hypre_F90_Obj *matrix,
-     hypre_F90_BigInt *num_rows,
-     hypre_F90_Int *ierr      )
+( hypre_F90_Obj *matrix,
+  hypre_F90_BigInt *num_rows,
+  hypre_F90_Int *ierr      )
 {
    *num_rows = (hypre_F90_BigInt)
-      ( hypre_ParCSRMatrixGlobalNumRows(
-           (hypre_ParCSRMatrix *) *matrix ) );
+               ( hypre_ParCSRMatrixGlobalNumRows(
+                    (hypre_ParCSRMatrix *) *matrix ) );
 
    *ierr = 0;
 }
@@ -39,15 +39,15 @@ hypre_F90_IFACE(hypre_parcsrmatrixglobalnumrows, HYPRE_PARCSRMATRIXGLOBALNUMROWS
  * hypre_ParCSRMatrixRowStarts
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_parcsrmatrixrowstarts, HYPRE_PARCSRMATRIXROWSTARTS)
-   ( hypre_F90_Obj *matrix,
-     hypre_F90_Obj *row_starts,
-     hypre_F90_Int *ierr      )
+( hypre_F90_Obj *matrix,
+  hypre_F90_Obj *row_starts,
+  hypre_F90_Int *ierr      )
 {
    *row_starts = (hypre_F90_Obj)
-      ( hypre_ParCSRMatrixRowStarts(
-           (hypre_ParCSRMatrix *) *matrix ) );
+                 ( hypre_ParCSRMatrixRowStarts(
+                      (hypre_ParCSRMatrix *) *matrix ) );
 
    *ierr = 0;
 }
diff --git a/external/hypre/src/parcsr_mv/HYPRE_parcsr_matrix.c b/external/hypre/src/parcsr_mv/HYPRE_parcsr_matrix.c
index 5805b864..1595425d 100644
--- a/external/hypre/src/parcsr_mv/HYPRE_parcsr_matrix.c
+++ b/external/hypre/src/parcsr_mv/HYPRE_parcsr_matrix.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -35,9 +35,9 @@ HYPRE_ParCSRMatrixCreate( MPI_Comm            comm,
    }
 
    *matrix = (HYPRE_ParCSRMatrix)
-      hypre_ParCSRMatrixCreate(comm, global_num_rows, global_num_cols,
-                               row_starts, col_starts, num_cols_offd,
-                               num_nonzeros_diag, num_nonzeros_offd);
+             hypre_ParCSRMatrixCreate(comm, global_num_rows, global_num_cols,
+                                      row_starts, col_starts, num_cols_offd,
+                                      num_nonzeros_diag, num_nonzeros_offd);
 
    return hypre_error_flag;
 }
@@ -49,7 +49,7 @@ HYPRE_ParCSRMatrixCreate( MPI_Comm            comm,
 HYPRE_Int
 HYPRE_ParCSRMatrixDestroy( HYPRE_ParCSRMatrix matrix )
 {
-   return( hypre_ParCSRMatrixDestroy( (hypre_ParCSRMatrix *) matrix ) );
+   return ( hypre_ParCSRMatrixDestroy( (hypre_ParCSRMatrix *) matrix ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -150,10 +150,12 @@ HYPRE_ParCSRMatrixGetRowPartitioning( HYPRE_ParCSRMatrix   matrix,
    hypre_MPI_Comm_size(hypre_ParCSRMatrixComm((hypre_ParCSRMatrix *) matrix),
                        &num_procs);
    row_starts = hypre_ParCSRMatrixRowStarts((hypre_ParCSRMatrix *) matrix);
-   if (!row_starts) return -1;
-   row_partitioning = hypre_CTAlloc(HYPRE_BigInt,  num_procs+1, HYPRE_MEMORY_HOST);
-   for (i=0; i < num_procs + 1; i++)
+   if (!row_starts) { return -1; }
+   row_partitioning = hypre_CTAlloc(HYPRE_BigInt,  num_procs + 1, HYPRE_MEMORY_HOST);
+   for (i = 0; i < num_procs + 1; i++)
+   {
       row_partitioning[i] = row_starts[i];
+   }
 
    *row_partitioning_ptr = row_partitioning;
    return hypre_error_flag;
@@ -186,7 +188,7 @@ HYPRE_ParCSRMatrixGetGlobalRowPartitioning( HYPRE_ParCSRMatrix   matrix,
    hypre_MPI_Comm_size(comm, &num_procs);
    if (my_id == 0 || all_procs)
    {
-      row_partitioning = hypre_CTAlloc(HYPRE_BigInt, num_procs+1, HYPRE_MEMORY_HOST);
+      row_partitioning = hypre_CTAlloc(HYPRE_BigInt, num_procs + 1, HYPRE_MEMORY_HOST);
    }
 
    row_start = hypre_ParCSRMatrixFirstRowIndex((hypre_ParCSRMatrix *) matrix);
@@ -231,10 +233,12 @@ HYPRE_ParCSRMatrixGetColPartitioning( HYPRE_ParCSRMatrix   matrix,
    hypre_MPI_Comm_size(hypre_ParCSRMatrixComm((hypre_ParCSRMatrix *) matrix),
                        &num_procs);
    col_starts = hypre_ParCSRMatrixColStarts((hypre_ParCSRMatrix *) matrix);
-   if (!col_starts) return -1;
-   col_partitioning = hypre_CTAlloc(HYPRE_BigInt,  num_procs+1, HYPRE_MEMORY_HOST);
-   for (i=0; i < num_procs + 1; i++)
+   if (!col_starts) { return -1; }
+   col_partitioning = hypre_CTAlloc(HYPRE_BigInt,  num_procs + 1, HYPRE_MEMORY_HOST);
+   for (i = 0; i < num_procs + 1; i++)
+   {
       col_partitioning[i] = col_starts[i];
+   }
 
    *col_partitioning_ptr = col_partitioning;
    return hypre_error_flag;
@@ -345,8 +349,8 @@ HYPRE_CSRMatrixToParCSRMatrix( MPI_Comm            comm,
       return hypre_error_flag;
    }
    *matrix = (HYPRE_ParCSRMatrix)
-      hypre_CSRMatrixToParCSRMatrix( comm, (hypre_CSRMatrix *) A_CSR,
-                                     row_partitioning, col_partitioning) ;
+             hypre_CSRMatrixToParCSRMatrix( comm, (hypre_CSRMatrix *) A_CSR,
+                                            row_partitioning, col_partitioning) ;
    return hypre_error_flag;
 }
 
@@ -369,7 +373,7 @@ HYPRE_CSRMatrixToParCSRMatrix_WithNewPartitioning(
       return hypre_error_flag;
    }
    *matrix = (HYPRE_ParCSRMatrix)
-      hypre_CSRMatrixToParCSRMatrix( comm, (hypre_CSRMatrix *) A_CSR, NULL, NULL ) ;
+             hypre_CSRMatrixToParCSRMatrix( comm, (hypre_CSRMatrix *) A_CSR, NULL, NULL ) ;
    return hypre_error_flag;
 }
 
diff --git a/external/hypre/src/parcsr_mv/HYPRE_parcsr_mv.h b/external/hypre/src/parcsr_mv/HYPRE_parcsr_mv.h
index a9927a08..807f81f0 100644
--- a/external/hypre/src/parcsr_mv/HYPRE_parcsr_mv.h
+++ b/external/hypre/src/parcsr_mv/HYPRE_parcsr_mv.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -35,39 +35,54 @@ typedef struct hypre_ParVector_struct *HYPRE_ParVector;
  *--------------------------------------------------------------------------*/
 
 /* HYPRE_parcsr_matrix.c */
-HYPRE_Int HYPRE_ParCSRMatrixCreate( MPI_Comm comm , HYPRE_BigInt global_num_rows , HYPRE_BigInt global_num_cols , HYPRE_BigInt *row_starts , HYPRE_BigInt *col_starts , HYPRE_Int num_cols_offd , HYPRE_Int num_nonzeros_diag , HYPRE_Int num_nonzeros_offd , HYPRE_ParCSRMatrix *matrix );
+HYPRE_Int HYPRE_ParCSRMatrixCreate( MPI_Comm comm, HYPRE_BigInt global_num_rows,
+                                    HYPRE_BigInt global_num_cols, HYPRE_BigInt *row_starts, HYPRE_BigInt *col_starts,
+                                    HYPRE_Int num_cols_offd, HYPRE_Int num_nonzeros_diag, HYPRE_Int num_nonzeros_offd,
+                                    HYPRE_ParCSRMatrix *matrix );
 HYPRE_Int HYPRE_ParCSRMatrixDestroy( HYPRE_ParCSRMatrix matrix );
 HYPRE_Int HYPRE_ParCSRMatrixInitialize( HYPRE_ParCSRMatrix matrix );
-HYPRE_Int HYPRE_ParCSRMatrixRead( MPI_Comm comm , const char *file_name , HYPRE_ParCSRMatrix *matrix );
-HYPRE_Int HYPRE_ParCSRMatrixPrint( HYPRE_ParCSRMatrix matrix , const char *file_name );
-HYPRE_Int HYPRE_ParCSRMatrixGetComm( HYPRE_ParCSRMatrix matrix , MPI_Comm *comm );
-HYPRE_Int HYPRE_ParCSRMatrixGetDims( HYPRE_ParCSRMatrix matrix , HYPRE_BigInt *M , HYPRE_BigInt *N );
-HYPRE_Int HYPRE_ParCSRMatrixGetRowPartitioning( HYPRE_ParCSRMatrix matrix , HYPRE_BigInt **row_partitioning_ptr );
-HYPRE_Int HYPRE_ParCSRMatrixGetColPartitioning( HYPRE_ParCSRMatrix matrix , HYPRE_BigInt **col_partitioning_ptr );
-HYPRE_Int HYPRE_ParCSRMatrixGetLocalRange( HYPRE_ParCSRMatrix matrix , HYPRE_BigInt *row_start , HYPRE_BigInt *row_end , HYPRE_BigInt *col_start , HYPRE_BigInt *col_end );
-HYPRE_Int HYPRE_ParCSRMatrixGetRow( HYPRE_ParCSRMatrix matrix , HYPRE_BigInt row , HYPRE_Int *size , HYPRE_BigInt **col_ind , HYPRE_Complex **values );
-HYPRE_Int HYPRE_ParCSRMatrixRestoreRow( HYPRE_ParCSRMatrix matrix , HYPRE_BigInt row , HYPRE_Int *size , HYPRE_BigInt **col_ind , HYPRE_Complex **values );
-HYPRE_Int HYPRE_CSRMatrixToParCSRMatrix( MPI_Comm comm , HYPRE_CSRMatrix A_CSR , HYPRE_BigInt *row_partitioning , HYPRE_BigInt *col_partitioning , HYPRE_ParCSRMatrix *matrix );
-HYPRE_Int HYPRE_ParCSRMatrixMatvec( HYPRE_Complex alpha , HYPRE_ParCSRMatrix A , HYPRE_ParVector x , HYPRE_Complex beta , HYPRE_ParVector y );
-HYPRE_Int HYPRE_ParCSRMatrixMatvecT( HYPRE_Complex alpha , HYPRE_ParCSRMatrix A , HYPRE_ParVector x , HYPRE_Complex beta , HYPRE_ParVector y );
+HYPRE_Int HYPRE_ParCSRMatrixRead( MPI_Comm comm, const char *file_name,
+                                  HYPRE_ParCSRMatrix *matrix );
+HYPRE_Int HYPRE_ParCSRMatrixPrint( HYPRE_ParCSRMatrix matrix, const char *file_name );
+HYPRE_Int HYPRE_ParCSRMatrixGetComm( HYPRE_ParCSRMatrix matrix, MPI_Comm *comm );
+HYPRE_Int HYPRE_ParCSRMatrixGetDims( HYPRE_ParCSRMatrix matrix, HYPRE_BigInt *M, HYPRE_BigInt *N );
+HYPRE_Int HYPRE_ParCSRMatrixGetRowPartitioning( HYPRE_ParCSRMatrix matrix,
+                                                HYPRE_BigInt **row_partitioning_ptr );
+HYPRE_Int HYPRE_ParCSRMatrixGetColPartitioning( HYPRE_ParCSRMatrix matrix,
+                                                HYPRE_BigInt **col_partitioning_ptr );
+HYPRE_Int HYPRE_ParCSRMatrixGetLocalRange( HYPRE_ParCSRMatrix matrix, HYPRE_BigInt *row_start,
+                                           HYPRE_BigInt *row_end, HYPRE_BigInt *col_start, HYPRE_BigInt *col_end );
+HYPRE_Int HYPRE_ParCSRMatrixGetRow( HYPRE_ParCSRMatrix matrix, HYPRE_BigInt row, HYPRE_Int *size,
+                                    HYPRE_BigInt **col_ind, HYPRE_Complex **values );
+HYPRE_Int HYPRE_ParCSRMatrixRestoreRow( HYPRE_ParCSRMatrix matrix, HYPRE_BigInt row,
+                                        HYPRE_Int *size, HYPRE_BigInt **col_ind, HYPRE_Complex **values );
+HYPRE_Int HYPRE_CSRMatrixToParCSRMatrix( MPI_Comm comm, HYPRE_CSRMatrix A_CSR,
+                                         HYPRE_BigInt *row_partitioning, HYPRE_BigInt *col_partitioning, HYPRE_ParCSRMatrix *matrix );
+HYPRE_Int HYPRE_ParCSRMatrixMatvec( HYPRE_Complex alpha, HYPRE_ParCSRMatrix A, HYPRE_ParVector x,
+                                    HYPRE_Complex beta, HYPRE_ParVector y );
+HYPRE_Int HYPRE_ParCSRMatrixMatvecT( HYPRE_Complex alpha, HYPRE_ParCSRMatrix A, HYPRE_ParVector x,
+                                     HYPRE_Complex beta, HYPRE_ParVector y );
 
 /* HYPRE_parcsr_vector.c */
-HYPRE_Int HYPRE_ParVectorCreate( MPI_Comm comm , HYPRE_BigInt global_size , HYPRE_BigInt *partitioning , HYPRE_ParVector *vector );
+HYPRE_Int HYPRE_ParVectorCreate( MPI_Comm comm, HYPRE_BigInt global_size,
+                                 HYPRE_BigInt *partitioning, HYPRE_ParVector *vector );
 HYPRE_Int HYPRE_ParVectorDestroy( HYPRE_ParVector vector );
 HYPRE_Int HYPRE_ParVectorInitialize( HYPRE_ParVector vector );
-HYPRE_Int HYPRE_ParVectorRead( MPI_Comm comm , const char *file_name , HYPRE_ParVector *vector );
-HYPRE_Int HYPRE_ParVectorPrint( HYPRE_ParVector vector , const char *file_name );
-HYPRE_Int HYPRE_ParVectorSetConstantValues( HYPRE_ParVector vector , HYPRE_Complex value );
-HYPRE_Int HYPRE_ParVectorSetRandomValues( HYPRE_ParVector vector , HYPRE_Int seed );
-HYPRE_Int HYPRE_ParVectorCopy( HYPRE_ParVector x , HYPRE_ParVector y );
-HYPRE_Int HYPRE_ParVectorScale( HYPRE_Complex value , HYPRE_ParVector x );
-HYPRE_Int HYPRE_ParVectorInnerProd( HYPRE_ParVector x , HYPRE_ParVector y , HYPRE_Real *prod );
-HYPRE_Int HYPRE_VectorToParVector( MPI_Comm comm , HYPRE_Vector b , HYPRE_BigInt *partitioning , HYPRE_ParVector *vector );
-HYPRE_Int HYPRE_ParVectorGetValues( HYPRE_ParVector vector , HYPRE_Int num_values , HYPRE_BigInt *indices, HYPRE_Complex *values );
+HYPRE_Int HYPRE_ParVectorRead( MPI_Comm comm, const char *file_name, HYPRE_ParVector *vector );
+HYPRE_Int HYPRE_ParVectorPrint( HYPRE_ParVector vector, const char *file_name );
+HYPRE_Int HYPRE_ParVectorPrintBinaryIJ( HYPRE_ParVector vector, const char *file_name );
+HYPRE_Int HYPRE_ParVectorSetConstantValues( HYPRE_ParVector vector, HYPRE_Complex value );
+HYPRE_Int HYPRE_ParVectorSetRandomValues( HYPRE_ParVector vector, HYPRE_Int seed );
+HYPRE_Int HYPRE_ParVectorCopy( HYPRE_ParVector x, HYPRE_ParVector y );
+HYPRE_Int HYPRE_ParVectorScale( HYPRE_Complex value, HYPRE_ParVector x );
+HYPRE_Int HYPRE_ParVectorInnerProd( HYPRE_ParVector x, HYPRE_ParVector y, HYPRE_Real *prod );
+HYPRE_Int HYPRE_VectorToParVector( MPI_Comm comm, HYPRE_Vector b, HYPRE_BigInt *partitioning,
+                                   HYPRE_ParVector *vector );
+HYPRE_Int HYPRE_ParVectorGetValues( HYPRE_ParVector vector, HYPRE_Int num_values,
+                                    HYPRE_BigInt *indices, HYPRE_Complex *values );
 
 #ifdef __cplusplus
 }
 #endif
 
 #endif
-
diff --git a/external/hypre/src/parcsr_mv/HYPRE_parcsr_vector.c b/external/hypre/src/parcsr_mv/HYPRE_parcsr_vector.c
index 748aa73e..083847ca 100644
--- a/external/hypre/src/parcsr_mv/HYPRE_parcsr_vector.c
+++ b/external/hypre/src/parcsr_mv/HYPRE_parcsr_vector.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -29,7 +29,7 @@ HYPRE_ParVectorCreate( MPI_Comm         comm,
       return hypre_error_flag;
    }
    *vector = (HYPRE_ParVector)
-      hypre_ParVectorCreate(comm, global_size, partitioning) ;
+             hypre_ParVectorCreate(comm, global_size, partitioning) ;
    return hypre_error_flag;
 }
 
@@ -50,7 +50,7 @@ HYPRE_ParMultiVectorCreate( MPI_Comm         comm,
       return hypre_error_flag;
    }
    *vector = (HYPRE_ParVector)
-      hypre_ParMultiVectorCreate( comm, global_size, partitioning, number_vectors );
+             hypre_ParMultiVectorCreate( comm, global_size, partitioning, number_vectors );
    return hypre_error_flag;
 }
 
@@ -104,6 +104,18 @@ HYPRE_ParVectorPrint( HYPRE_ParVector  vector,
                                   file_name ) );
 }
 
+/*--------------------------------------------------------------------------
+ * HYPRE_ParVectorPrintBinaryIJ
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_ParVectorPrintBinaryIJ( HYPRE_ParVector  vector,
+                              const char      *file_name )
+{
+   return ( hypre_ParVectorPrintBinaryIJ( (hypre_ParVector *) vector,
+                                          file_name ) );
+}
+
 /*--------------------------------------------------------------------------
  * HYPRE_ParVectorSetConstantValues
  *--------------------------------------------------------------------------*/
@@ -165,6 +177,7 @@ HYPRE_ParVectorScale( HYPRE_Complex   value,
 /*--------------------------------------------------------------------------
  * HYPRE_ParVectorAxpy
  *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 HYPRE_ParVectorAxpy( HYPRE_Complex   alpha,
                      HYPRE_ParVector x,
@@ -215,7 +228,7 @@ HYPRE_VectorToParVector( MPI_Comm         comm,
       return hypre_error_flag;
    }
    *vector = (HYPRE_ParVector)
-      hypre_VectorToParVector (comm, (hypre_Vector *) b, partitioning);
+             hypre_VectorToParVector (comm, (hypre_Vector *) b, partitioning);
    return hypre_error_flag;
 }
 
diff --git a/external/hypre/src/parcsr_mv/_hypre_parcsr_mv.h b/external/hypre/src/parcsr_mv/_hypre_parcsr_mv.h
index 358313cb..b920dc4f 100644
--- a/external/hypre/src/parcsr_mv/_hypre_parcsr_mv.h
+++ b/external/hypre/src/parcsr_mv/_hypre_parcsr_mv.h
@@ -7,6 +7,7 @@
 #include <HYPRE_config.h>
 #include "HYPRE_parcsr_mv.h"
 #include "_hypre_utilities.h"
+#include "_hypre_seq_block_mv.h"
 #include "seq_mv.h"
 
 #ifdef __cplusplus
@@ -14,7 +15,7 @@ extern "C" {
 #endif
 
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -65,31 +66,27 @@ typedef hypre_ParCSRCommHandle hypre_ParCSRPersistentCommHandle;
 
 typedef struct _hypre_ParCSRCommPkg
 {
-   MPI_Comm                     comm;
-
-   HYPRE_Int                    num_sends;
-   HYPRE_Int                   *send_procs;
-   HYPRE_Int                   *send_map_starts;
-   HYPRE_Int                   *send_map_elmts;
-   HYPRE_Int                   *device_send_map_elmts;
-
-   HYPRE_Int                    num_recvs;
-   HYPRE_Int                   *recv_procs;
-   HYPRE_Int                   *recv_vec_starts;
-
+   MPI_Comm                          comm;
+   HYPRE_Int                         num_components;
+   HYPRE_Int                         num_sends;
+   HYPRE_Int                        *send_procs;
+   HYPRE_Int                        *send_map_starts;
+   HYPRE_Int                        *send_map_elmts;
+   HYPRE_Int                        *device_send_map_elmts;
+   HYPRE_Int                         num_recvs;
+   HYPRE_Int                        *recv_procs;
+   HYPRE_Int                        *recv_vec_starts;
    /* remote communication information */
-   hypre_MPI_Datatype          *send_mpi_types;
-   hypre_MPI_Datatype          *recv_mpi_types;
-
+   hypre_MPI_Datatype               *send_mpi_types;
+   hypre_MPI_Datatype               *recv_mpi_types;
 #ifdef HYPRE_USING_PERSISTENT_COMM
    hypre_ParCSRPersistentCommHandle *persistent_comm_handles[NUM_OF_COMM_PKG_JOB_TYPE];
 #endif
-
+#if defined(HYPRE_USING_GPU) || defined(HYPRE_USING_DEVICE_OPENMP)
    /* temporary memory for matvec. cudaMalloc is expensive. alloc once and reuse */
-#if defined(HYPRE_USING_GPU)
-   HYPRE_Complex *tmp_data;
-   HYPRE_Complex *buf_data;
-   char          *work_space;
+   HYPRE_Complex                    *tmp_data;
+   HYPRE_Complex                    *buf_data;
+   hypre_CSRMatrix                  *matrix_E; /* for matvecT */
 #endif
 } hypre_ParCSRCommPkg;
 
@@ -98,6 +95,7 @@ typedef struct _hypre_ParCSRCommPkg
  *--------------------------------------------------------------------------*/
 
 #define hypre_ParCSRCommPkgComm(comm_pkg)                (comm_pkg -> comm)
+#define hypre_ParCSRCommPkgNumComponents(comm_pkg)       (comm_pkg -> num_components)
 #define hypre_ParCSRCommPkgNumSends(comm_pkg)            (comm_pkg -> num_sends)
 #define hypre_ParCSRCommPkgSendProcs(comm_pkg)           (comm_pkg -> send_procs)
 #define hypre_ParCSRCommPkgSendProc(comm_pkg, i)         (comm_pkg -> send_procs[i])
@@ -117,25 +115,34 @@ typedef struct _hypre_ParCSRCommPkg
 #define hypre_ParCSRCommPkgRecvMPITypes(comm_pkg)        (comm_pkg -> recv_mpi_types)
 #define hypre_ParCSRCommPkgRecvMPIType(comm_pkg,i)       (comm_pkg -> recv_mpi_types[i])
 
-#if defined(HYPRE_USING_GPU)
+#if defined(HYPRE_USING_GPU) || defined(HYPRE_USING_DEVICE_OPENMP)
 #define hypre_ParCSRCommPkgTmpData(comm_pkg)             ((comm_pkg) -> tmp_data)
 #define hypre_ParCSRCommPkgBufData(comm_pkg)             ((comm_pkg) -> buf_data)
-#define hypre_ParCSRCommPkgWorkSpace(comm_pkg)           ((comm_pkg) -> work_space)
+#define hypre_ParCSRCommPkgMatrixE(comm_pkg)             ((comm_pkg) -> matrix_E)
 #endif
 
-static inline void
+static inline HYPRE_MAYBE_UNUSED_FUNC void
 hypre_ParCSRCommPkgCopySendMapElmtsToDevice(hypre_ParCSRCommPkg *comm_pkg)
 {
-#if defined(HYPRE_USING_GPU)
+#if defined(HYPRE_USING_GPU) || defined(HYPRE_USING_DEVICE_OPENMP)
+   HYPRE_Int num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
+
    if (hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg) == NULL)
    {
       hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg) =
-         hypre_TAlloc(HYPRE_Int, hypre_ParCSRCommPkgSendMapStart(comm_pkg, hypre_ParCSRCommPkgNumSends(comm_pkg)), HYPRE_MEMORY_DEVICE);
-
-      hypre_TMemcpy(hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg), hypre_ParCSRCommPkgSendMapElmts(comm_pkg),
-                    HYPRE_Int, hypre_ParCSRCommPkgSendMapStart(comm_pkg, hypre_ParCSRCommPkgNumSends(comm_pkg)),
-                    HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
+         hypre_TAlloc(HYPRE_Int,
+                      hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                      HYPRE_MEMORY_DEVICE);
+
+      hypre_TMemcpy(hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg),
+                    hypre_ParCSRCommPkgSendMapElmts(comm_pkg),
+                    HYPRE_Int,
+                    hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                    HYPRE_MEMORY_DEVICE,
+                    HYPRE_MEMORY_HOST);
    }
+#else
+   HYPRE_UNUSED_VAR(comm_pkg);
 #endif
 }
 
@@ -158,7 +165,7 @@ hypre_ParCSRCommPkgCopySendMapElmtsToDevice(hypre_ParCSRCommPkg *comm_pkg)
 
 #endif /* HYPRE_PAR_CSR_COMMUNICATION_HEADER */
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -181,7 +188,7 @@ typedef struct
 #endif /* hypre_PARCSR_ASSUMED_PART */
 
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -204,7 +211,7 @@ typedef struct
 #endif /* hypre_NEW_COMMPKG */
 
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -242,6 +249,8 @@ typedef struct hypre_ParVector_struct
 
    /* Does the Vector create/destroy `data'? */
    HYPRE_Int             owns_data;
+   /* If the vector is all zeros */
+   HYPRE_Int             all_zeros;
 
    hypre_IJAssumedPart  *assumed_partition; /* only populated if this partition needed
                                               (for setting off-proc elements, for example)*/
@@ -257,13 +266,19 @@ typedef struct hypre_ParVector_struct
 #define hypre_ParVectorLastIndex(vector)        ((vector) -> last_index)
 #define hypre_ParVectorPartitioning(vector)     ((vector) -> partitioning)
 #define hypre_ParVectorActualLocalSize(vector)  ((vector) -> actual_local_size)
-#define hypre_ParVectorLocalVector(vector)      ((vector) -> local_vector)
 #define hypre_ParVectorOwnsData(vector)         ((vector) -> owns_data)
-#define hypre_ParVectorNumVectors(vector)       (hypre_VectorNumVectors(hypre_ParVectorLocalVector(vector)))
+#define hypre_ParVectorAllZeros(vector)         ((vector) -> all_zeros)
+#define hypre_ParVectorLocalVector(vector)      ((vector) -> local_vector)
+#define hypre_ParVectorLocalSize(vector)        ((vector) -> local_vector -> size)
+#define hypre_ParVectorLocalData(vector)        ((vector) -> local_vector -> data)
+#define hypre_ParVectorLocalStorage(vector)     ((vector) -> local_vector -> multivec_storage_method)
+#define hypre_ParVectorNumVectors(vector)       ((vector) -> local_vector -> num_vectors)
+#define hypre_ParVectorEntryI(vector, i)        (hypre_VectorEntryI((vector) -> local_vector, i))
+#define hypre_ParVectorEntryIJ(vector, i, j)    (hypre_VectorEntryIJ((vector) -> local_vector, i, j))
 
 #define hypre_ParVectorAssumedPartition(vector) ((vector) -> assumed_partition)
 
-static inline HYPRE_MemoryLocation
+static inline HYPRE_MAYBE_UNUSED_FUNC HYPRE_MemoryLocation
 hypre_ParVectorMemoryLocation(hypre_ParVector *vector)
 {
    return hypre_VectorMemoryLocation(hypre_ParVectorLocalVector(vector));
@@ -271,7 +286,7 @@ hypre_ParVectorMemoryLocation(hypre_ParVector *vector)
 
 #endif
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -303,6 +318,9 @@ typedef struct hypre_ParCSRMatrix_struct
    HYPRE_BigInt          global_num_rows;
    HYPRE_BigInt          global_num_cols;
    HYPRE_BigInt          global_num_rownnz;
+   HYPRE_BigInt          num_nonzeros;
+   HYPRE_Real            d_num_nonzeros;
+
    HYPRE_BigInt          first_row_index;
    HYPRE_BigInt          first_col_diag;
    /* need to know entire local range in case row_starts and col_starts
@@ -330,9 +348,6 @@ typedef struct hypre_ParCSRMatrix_struct
    /* Does the ParCSRMatrix create/destroy `diag', `offd', `col_map_offd'? */
    HYPRE_Int             owns_data;
 
-   HYPRE_BigInt          num_nonzeros;
-   HYPRE_Real            d_num_nonzeros;
-
    /* Buffers used by GetRow to hold row currently being accessed. AJC, 4/99 */
    HYPRE_BigInt         *rowindices;
    HYPRE_Complex        *rowvalues;
@@ -349,7 +364,7 @@ typedef struct hypre_ParCSRMatrix_struct
    HYPRE_Complex        *bdiaginv;
    hypre_ParCSRCommPkg  *bdiaginv_comm_pkg;
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
    /* these two arrays are reserveed for SoC matrices on GPUs to help build interpolation */
    HYPRE_Int            *soc_diag_j;
    HYPRE_Int            *soc_offd_j;
@@ -365,6 +380,8 @@ typedef struct hypre_ParCSRMatrix_struct
 #define hypre_ParCSRMatrixGlobalNumRows(matrix)          ((matrix) -> global_num_rows)
 #define hypre_ParCSRMatrixGlobalNumCols(matrix)          ((matrix) -> global_num_cols)
 #define hypre_ParCSRMatrixGlobalNumRownnz(matrix)        ((matrix) -> global_num_rownnz)
+#define hypre_ParCSRMatrixNumNonzeros(matrix)            ((matrix) -> num_nonzeros)
+#define hypre_ParCSRMatrixDNumNonzeros(matrix)           ((matrix) -> d_num_nonzeros)
 #define hypre_ParCSRMatrixFirstRowIndex(matrix)          ((matrix) -> first_row_index)
 #define hypre_ParCSRMatrixFirstColDiag(matrix)           ((matrix) -> first_col_diag)
 #define hypre_ParCSRMatrixLastRowIndex(matrix)           ((matrix) -> last_row_index)
@@ -380,15 +397,13 @@ typedef struct hypre_ParCSRMatrix_struct
 #define hypre_ParCSRMatrixCommPkg(matrix)                ((matrix) -> comm_pkg)
 #define hypre_ParCSRMatrixCommPkgT(matrix)               ((matrix) -> comm_pkgT)
 #define hypre_ParCSRMatrixOwnsData(matrix)               ((matrix) -> owns_data)
-#define hypre_ParCSRMatrixNumNonzeros(matrix)            ((matrix) -> num_nonzeros)
-#define hypre_ParCSRMatrixDNumNonzeros(matrix)           ((matrix) -> d_num_nonzeros)
 #define hypre_ParCSRMatrixRowindices(matrix)             ((matrix) -> rowindices)
 #define hypre_ParCSRMatrixRowvalues(matrix)              ((matrix) -> rowvalues)
 #define hypre_ParCSRMatrixGetrowactive(matrix)           ((matrix) -> getrowactive)
 #define hypre_ParCSRMatrixAssumedPartition(matrix)       ((matrix) -> assumed_partition)
 #define hypre_ParCSRMatrixOwnsAssumedPartition(matrix)   ((matrix) -> owns_assumed_partition)
 #define hypre_ParCSRMatrixProcOrdering(matrix)           ((matrix) -> proc_ordering)
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
 #define hypre_ParCSRMatrixSocDiagJ(matrix)               ((matrix) -> soc_diag_j)
 #define hypre_ParCSRMatrixSocOffdJ(matrix)               ((matrix) -> soc_offd_j)
 #endif
@@ -396,18 +411,38 @@ typedef struct hypre_ParCSRMatrix_struct
 #define hypre_ParCSRMatrixNumRows(matrix) hypre_CSRMatrixNumRows(hypre_ParCSRMatrixDiag(matrix))
 #define hypre_ParCSRMatrixNumCols(matrix) hypre_CSRMatrixNumCols(hypre_ParCSRMatrixDiag(matrix))
 
-static inline HYPRE_MemoryLocation
+static inline HYPRE_MAYBE_UNUSED_FUNC HYPRE_MemoryLocation
 hypre_ParCSRMatrixMemoryLocation(hypre_ParCSRMatrix *matrix)
 {
-   HYPRE_MemoryLocation memory_diag = hypre_CSRMatrixMemoryLocation(hypre_ParCSRMatrixDiag(matrix));
-   HYPRE_MemoryLocation memory_offd = hypre_CSRMatrixMemoryLocation(hypre_ParCSRMatrixOffd(matrix));
+   if (!matrix) { return HYPRE_MEMORY_UNDEFINED; }
 
-   if (memory_diag != memory_offd)
+   hypre_CSRMatrix *diag = hypre_ParCSRMatrixDiag(matrix);
+   hypre_CSRMatrix *offd = hypre_ParCSRMatrixOffd(matrix);
+   HYPRE_MemoryLocation memory_diag = diag ? hypre_CSRMatrixMemoryLocation(
+                                         diag) : HYPRE_MEMORY_UNDEFINED;
+   HYPRE_MemoryLocation memory_offd = offd ? hypre_CSRMatrixMemoryLocation(
+                                         offd) : HYPRE_MEMORY_UNDEFINED;
+
+   if (diag && offd)
    {
-      hypre_printf("Warning: ParCSRMatrix Memory Location Diag (%d) != Offd (%d)\n", memory_diag, memory_offd);
-      hypre_assert(0);
+      if (memory_diag != memory_offd)
+      {
+         char err_msg[1024];
+         hypre_sprintf(err_msg, "Error: ParCSRMatrix Memory Location Diag (%d) != Offd (%d)\n", memory_diag,
+                       memory_offd);
+         hypre_error_w_msg(HYPRE_ERROR_MEMORY, err_msg);
+         hypre_assert(0);
+
+         return HYPRE_MEMORY_UNDEFINED;
+      }
+
+      return memory_diag;
    }
-   return memory_diag;
+
+   if (diag) { return memory_diag; }
+   if (offd) { return memory_offd; }
+
+   return HYPRE_MEMORY_UNDEFINED;
 }
 
 /*--------------------------------------------------------------------------
@@ -469,7 +504,7 @@ typedef struct
 
 #endif
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -515,7 +550,7 @@ typedef struct hypre_NumbersNode
 #endif
 
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -606,7 +641,7 @@ typedef struct
 #endif
 
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -625,16 +660,25 @@ typedef struct
 #endif /* hypre_PAR_MAKE_SYSTEM */
 
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
  ******************************************************************************/
 
 /* communicationT.c */
-void hypre_RowsWithColumn_original ( HYPRE_Int *rowmin , HYPRE_Int *rowmax , HYPRE_BigInt column , hypre_ParCSRMatrix *A );
-void hypre_RowsWithColumn ( HYPRE_Int *rowmin , HYPRE_Int *rowmax , HYPRE_BigInt column , HYPRE_Int num_rows_diag , HYPRE_BigInt firstColDiag , HYPRE_BigInt *colMapOffd , HYPRE_Int *mat_i_diag , HYPRE_Int *mat_j_diag , HYPRE_Int *mat_i_offd , HYPRE_Int *mat_j_offd );
-void hypre_MatTCommPkgCreate_core ( MPI_Comm comm , HYPRE_BigInt *col_map_offd , HYPRE_BigInt first_col_diag , HYPRE_BigInt *col_starts , HYPRE_Int num_rows_diag , HYPRE_Int num_cols_diag , HYPRE_Int num_cols_offd , HYPRE_BigInt *row_starts , HYPRE_BigInt firstColDiag , HYPRE_BigInt *colMapOffd , HYPRE_Int *mat_i_diag , HYPRE_Int *mat_j_diag , HYPRE_Int *mat_i_offd , HYPRE_Int *mat_j_offd , HYPRE_Int data , HYPRE_Int *p_num_recvs , HYPRE_Int **p_recv_procs , HYPRE_Int **p_recv_vec_starts , HYPRE_Int *p_num_sends , HYPRE_Int **p_send_procs , HYPRE_Int **p_send_map_starts , HYPRE_Int **p_send_map_elmts );
+void hypre_RowsWithColumn_original ( HYPRE_Int *rowmin, HYPRE_Int *rowmax, HYPRE_BigInt column,
+                                     hypre_ParCSRMatrix *A );
+void hypre_RowsWithColumn ( HYPRE_Int *rowmin, HYPRE_Int *rowmax, HYPRE_BigInt column,
+                            HYPRE_Int num_rows_diag, HYPRE_BigInt firstColDiag, HYPRE_BigInt *colMapOffd, HYPRE_Int *mat_i_diag,
+                            HYPRE_Int *mat_j_diag, HYPRE_Int *mat_i_offd, HYPRE_Int *mat_j_offd );
+void hypre_MatTCommPkgCreate_core ( MPI_Comm comm, HYPRE_BigInt *col_map_offd,
+                                    HYPRE_BigInt first_col_diag, HYPRE_BigInt *col_starts, HYPRE_Int num_rows_diag,
+                                    HYPRE_Int num_cols_diag, HYPRE_Int num_cols_offd, HYPRE_BigInt *row_starts,
+                                    HYPRE_BigInt firstColDiag, HYPRE_BigInt *colMapOffd, HYPRE_Int *mat_i_diag, HYPRE_Int *mat_j_diag,
+                                    HYPRE_Int *mat_i_offd, HYPRE_Int *mat_j_offd, HYPRE_Int data, HYPRE_Int *p_num_recvs,
+                                    HYPRE_Int **p_recv_procs, HYPRE_Int **p_recv_vec_starts, HYPRE_Int *p_num_sends,
+                                    HYPRE_Int **p_send_procs, HYPRE_Int **p_send_map_starts, HYPRE_Int **p_send_map_elmts );
 HYPRE_Int hypre_MatTCommPkgCreate ( hypre_ParCSRMatrix *A );
 
 /* driver_aat.c */
@@ -654,293 +698,626 @@ HYPRE_Int hypre_MatTCommPkgCreate ( hypre_ParCSRMatrix *A );
 /* driver_multivec.c */
 
 /* HYPRE_parcsr_matrix.c */
-HYPRE_Int HYPRE_ParCSRMatrixCreate ( MPI_Comm comm , HYPRE_BigInt global_num_rows , HYPRE_BigInt global_num_cols , HYPRE_BigInt *row_starts , HYPRE_BigInt *col_starts , HYPRE_Int num_cols_offd , HYPRE_Int num_nonzeros_diag , HYPRE_Int num_nonzeros_offd , HYPRE_ParCSRMatrix *matrix );
+HYPRE_Int HYPRE_ParCSRMatrixCreate ( MPI_Comm comm, HYPRE_BigInt global_num_rows,
+                                     HYPRE_BigInt global_num_cols, HYPRE_BigInt *row_starts, HYPRE_BigInt *col_starts,
+                                     HYPRE_Int num_cols_offd, HYPRE_Int num_nonzeros_diag, HYPRE_Int num_nonzeros_offd,
+                                     HYPRE_ParCSRMatrix *matrix );
 HYPRE_Int HYPRE_ParCSRMatrixDestroy ( HYPRE_ParCSRMatrix matrix );
 HYPRE_Int HYPRE_ParCSRMatrixInitialize ( HYPRE_ParCSRMatrix matrix );
 HYPRE_Int HYPRE_ParCSRMatrixBigInitialize ( HYPRE_ParCSRMatrix matrix );
-HYPRE_Int HYPRE_ParCSRMatrixRead ( MPI_Comm comm , const char *file_name , HYPRE_ParCSRMatrix *matrix );
-HYPRE_Int HYPRE_ParCSRMatrixPrint ( HYPRE_ParCSRMatrix matrix , const char *file_name );
-HYPRE_Int HYPRE_ParCSRMatrixGetComm ( HYPRE_ParCSRMatrix matrix , MPI_Comm *comm );
-HYPRE_Int HYPRE_ParCSRMatrixGetDims ( HYPRE_ParCSRMatrix matrix , HYPRE_BigInt *M , HYPRE_BigInt *N );
-HYPRE_Int HYPRE_ParCSRMatrixGetRowPartitioning ( HYPRE_ParCSRMatrix matrix , HYPRE_BigInt **row_partitioning_ptr );
-HYPRE_Int HYPRE_ParCSRMatrixGetGlobalRowPartitioning ( HYPRE_ParCSRMatrix matrix , HYPRE_Int all_procs, HYPRE_BigInt **row_partitioning_ptr );
-HYPRE_Int HYPRE_ParCSRMatrixGetColPartitioning ( HYPRE_ParCSRMatrix matrix , HYPRE_BigInt **col_partitioning_ptr );
-HYPRE_Int HYPRE_ParCSRMatrixGetLocalRange ( HYPRE_ParCSRMatrix matrix , HYPRE_BigInt *row_start , HYPRE_BigInt *row_end , HYPRE_BigInt *col_start , HYPRE_BigInt *col_end );
-HYPRE_Int HYPRE_ParCSRMatrixGetRow ( HYPRE_ParCSRMatrix matrix , HYPRE_BigInt row , HYPRE_Int *size , HYPRE_BigInt **col_ind , HYPRE_Complex **values );
-HYPRE_Int HYPRE_ParCSRMatrixRestoreRow ( HYPRE_ParCSRMatrix matrix , HYPRE_BigInt row , HYPRE_Int *size , HYPRE_BigInt **col_ind , HYPRE_Complex **values );
-HYPRE_Int HYPRE_CSRMatrixToParCSRMatrix ( MPI_Comm comm , HYPRE_CSRMatrix A_CSR , HYPRE_BigInt *row_partitioning , HYPRE_BigInt *col_partitioning , HYPRE_ParCSRMatrix *matrix );
-HYPRE_Int HYPRE_CSRMatrixToParCSRMatrix_WithNewPartitioning ( MPI_Comm comm , HYPRE_CSRMatrix A_CSR , HYPRE_ParCSRMatrix *matrix );
-HYPRE_Int HYPRE_ParCSRMatrixMatvec ( HYPRE_Complex alpha , HYPRE_ParCSRMatrix A , HYPRE_ParVector x , HYPRE_Complex beta , HYPRE_ParVector y );
-HYPRE_Int HYPRE_ParCSRMatrixMatvecT ( HYPRE_Complex alpha , HYPRE_ParCSRMatrix A , HYPRE_ParVector x , HYPRE_Complex beta , HYPRE_ParVector y );
-HYPRE_Int hypre_ParCSRMatrixTruncate(hypre_ParCSRMatrix *A, HYPRE_Real tol, HYPRE_Int max_row_elmts, HYPRE_Int rescale, HYPRE_Int nrm_type);
+HYPRE_Int HYPRE_ParCSRMatrixRead ( MPI_Comm comm, const char *file_name,
+                                   HYPRE_ParCSRMatrix *matrix );
+HYPRE_Int HYPRE_ParCSRMatrixPrint ( HYPRE_ParCSRMatrix matrix, const char *file_name );
+HYPRE_Int HYPRE_ParCSRMatrixGetComm ( HYPRE_ParCSRMatrix matrix, MPI_Comm *comm );
+HYPRE_Int HYPRE_ParCSRMatrixGetDims ( HYPRE_ParCSRMatrix matrix, HYPRE_BigInt *M, HYPRE_BigInt *N );
+HYPRE_Int HYPRE_ParCSRMatrixGetRowPartitioning ( HYPRE_ParCSRMatrix matrix,
+                                                 HYPRE_BigInt **row_partitioning_ptr );
+HYPRE_Int HYPRE_ParCSRMatrixGetGlobalRowPartitioning ( HYPRE_ParCSRMatrix matrix,
+                                                       HYPRE_Int all_procs, HYPRE_BigInt **row_partitioning_ptr );
+HYPRE_Int HYPRE_ParCSRMatrixGetColPartitioning ( HYPRE_ParCSRMatrix matrix,
+                                                 HYPRE_BigInt **col_partitioning_ptr );
+HYPRE_Int HYPRE_ParCSRMatrixGetLocalRange ( HYPRE_ParCSRMatrix matrix, HYPRE_BigInt *row_start,
+                                            HYPRE_BigInt *row_end, HYPRE_BigInt *col_start, HYPRE_BigInt *col_end );
+HYPRE_Int HYPRE_ParCSRMatrixGetRow ( HYPRE_ParCSRMatrix matrix, HYPRE_BigInt row, HYPRE_Int *size,
+                                     HYPRE_BigInt **col_ind, HYPRE_Complex **values );
+HYPRE_Int HYPRE_ParCSRMatrixRestoreRow ( HYPRE_ParCSRMatrix matrix, HYPRE_BigInt row,
+                                         HYPRE_Int *size, HYPRE_BigInt **col_ind, HYPRE_Complex **values );
+HYPRE_Int HYPRE_CSRMatrixToParCSRMatrix ( MPI_Comm comm, HYPRE_CSRMatrix A_CSR,
+                                          HYPRE_BigInt *row_partitioning, HYPRE_BigInt *col_partitioning, HYPRE_ParCSRMatrix *matrix );
+HYPRE_Int HYPRE_CSRMatrixToParCSRMatrix_WithNewPartitioning ( MPI_Comm comm, HYPRE_CSRMatrix A_CSR,
+                                                              HYPRE_ParCSRMatrix *matrix );
+HYPRE_Int HYPRE_ParCSRMatrixMatvec ( HYPRE_Complex alpha, HYPRE_ParCSRMatrix A, HYPRE_ParVector x,
+                                     HYPRE_Complex beta, HYPRE_ParVector y );
+HYPRE_Int HYPRE_ParCSRMatrixMatvecT ( HYPRE_Complex alpha, HYPRE_ParCSRMatrix A, HYPRE_ParVector x,
+                                      HYPRE_Complex beta, HYPRE_ParVector y );
+
 /* HYPRE_parcsr_vector.c */
-HYPRE_Int HYPRE_ParVectorCreate ( MPI_Comm comm , HYPRE_BigInt global_size , HYPRE_BigInt *partitioning , HYPRE_ParVector *vector );
-HYPRE_Int HYPRE_ParMultiVectorCreate ( MPI_Comm comm , HYPRE_BigInt global_size , HYPRE_BigInt *partitioning , HYPRE_Int number_vectors , HYPRE_ParVector *vector );
+HYPRE_Int HYPRE_ParVectorCreate ( MPI_Comm comm, HYPRE_BigInt global_size,
+                                  HYPRE_BigInt *partitioning, HYPRE_ParVector *vector );
+HYPRE_Int HYPRE_ParMultiVectorCreate ( MPI_Comm comm, HYPRE_BigInt global_size,
+                                       HYPRE_BigInt *partitioning, HYPRE_Int number_vectors, HYPRE_ParVector *vector );
 HYPRE_Int HYPRE_ParVectorDestroy ( HYPRE_ParVector vector );
 HYPRE_Int HYPRE_ParVectorInitialize ( HYPRE_ParVector vector );
-HYPRE_Int HYPRE_ParVectorRead ( MPI_Comm comm , const char *file_name , HYPRE_ParVector *vector );
-HYPRE_Int HYPRE_ParVectorPrint ( HYPRE_ParVector vector , const char *file_name );
-HYPRE_Int HYPRE_ParVectorSetConstantValues ( HYPRE_ParVector vector , HYPRE_Complex value );
-HYPRE_Int HYPRE_ParVectorSetRandomValues ( HYPRE_ParVector vector , HYPRE_Int seed );
-HYPRE_Int HYPRE_ParVectorCopy ( HYPRE_ParVector x , HYPRE_ParVector y );
+HYPRE_Int HYPRE_ParVectorRead ( MPI_Comm comm, const char *file_name, HYPRE_ParVector *vector );
+HYPRE_Int HYPRE_ParVectorPrint ( HYPRE_ParVector vector, const char *file_name );
+HYPRE_Int HYPRE_ParVectorPrintBinaryIJ ( HYPRE_ParVector vector, const char *file_name );
+HYPRE_Int HYPRE_ParVectorSetConstantValues ( HYPRE_ParVector vector, HYPRE_Complex value );
+HYPRE_Int HYPRE_ParVectorSetRandomValues ( HYPRE_ParVector vector, HYPRE_Int seed );
+HYPRE_Int HYPRE_ParVectorCopy ( HYPRE_ParVector x, HYPRE_ParVector y );
+HYPRE_Int hypre_ParVectorStridedCopy( hypre_ParVector *x, HYPRE_Int istride, HYPRE_Int ostride,
+                                      HYPRE_Int size, HYPRE_Complex *data );
 HYPRE_ParVector HYPRE_ParVectorCloneShallow ( HYPRE_ParVector x );
-HYPRE_Int HYPRE_ParVectorScale ( HYPRE_Complex value , HYPRE_ParVector x );
-HYPRE_Int HYPRE_ParVectorAxpy ( HYPRE_Complex alpha , HYPRE_ParVector x , HYPRE_ParVector y );
-HYPRE_Int HYPRE_ParVectorInnerProd ( HYPRE_ParVector x , HYPRE_ParVector y , HYPRE_Real *prod );
-HYPRE_Int HYPRE_VectorToParVector ( MPI_Comm comm , HYPRE_Vector b , HYPRE_BigInt *partitioning , HYPRE_ParVector *vector );
-HYPRE_Int HYPRE_ParVectorGetValues ( HYPRE_ParVector vector, HYPRE_Int num_values, HYPRE_BigInt *indices , HYPRE_Complex *values);
-
-/*gen_fffc.c */
-HYPRE_Int hypre_ParCSRMatrixGenerateFFFC(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker , HYPRE_BigInt *cpts_starts , hypre_ParCSRMatrix *S, hypre_ParCSRMatrix **A_FC_ptr , hypre_ParCSRMatrix **A_FF_ptr ) ;
-HYPRE_Int hypre_ParCSRMatrixGenerateFFFC3(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker , HYPRE_BigInt *cpts_starts , hypre_ParCSRMatrix *S, hypre_ParCSRMatrix **A_FC_ptr , hypre_ParCSRMatrix **A_FF_ptr ) ;
-HYPRE_Int hypre_ParCSRMatrixGenerateFFFCD3(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker , HYPRE_BigInt *cpts_starts , hypre_ParCSRMatrix *S, hypre_ParCSRMatrix **A_FC_ptr , hypre_ParCSRMatrix **A_FF_ptr , HYPRE_Real **D_lambda_ptr ) ;
-HYPRE_Int hypre_ParCSRMatrixGenerateFFFC3Device(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker , HYPRE_BigInt *cpts_starts , hypre_ParCSRMatrix *S, hypre_ParCSRMatrix **A_FC_ptr , hypre_ParCSRMatrix **A_FF_ptr ) ;
-HYPRE_Int hypre_ParCSRMatrixGenerateCFDevice( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker_host, HYPRE_BigInt *cpts_starts, hypre_ParCSRMatrix *S, hypre_ParCSRMatrix **ACF_ptr) ;
-HYPRE_Int hypre_ParCSRMatrixGenerateCCDevice( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker_host, HYPRE_BigInt *cpts_starts, hypre_ParCSRMatrix *S, hypre_ParCSRMatrix **ACC_ptr) ;
-HYPRE_Int hypre_ParCSRMatrixGenerate1DCFDevice( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker_host, HYPRE_BigInt *cpts_starts, hypre_ParCSRMatrix *S, hypre_ParCSRMatrix **ACX_ptr, hypre_ParCSRMatrix **AXC_ptr ) ;
+HYPRE_Int HYPRE_ParVectorScale ( HYPRE_Complex value, HYPRE_ParVector x );
+HYPRE_Int HYPRE_ParVectorAxpy ( HYPRE_Complex alpha, HYPRE_ParVector x, HYPRE_ParVector y );
+HYPRE_Int HYPRE_ParVectorInnerProd ( HYPRE_ParVector x, HYPRE_ParVector y, HYPRE_Real *prod );
+HYPRE_Int HYPRE_VectorToParVector ( MPI_Comm comm, HYPRE_Vector b, HYPRE_BigInt *partitioning,
+                                    HYPRE_ParVector *vector );
+HYPRE_Int HYPRE_ParVectorGetValues ( HYPRE_ParVector vector, HYPRE_Int num_values,
+                                     HYPRE_BigInt *indices, HYPRE_Complex *values);
+
+/* gen_fffc.c */
+HYPRE_Int hypre_ParCSRMatrixGenerateFFFCHost( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                              HYPRE_BigInt *cpts_starts, hypre_ParCSRMatrix *S,
+                                              hypre_ParCSRMatrix **A_FC_ptr,
+                                              hypre_ParCSRMatrix **A_FF_ptr ) ;
+HYPRE_Int hypre_ParCSRMatrixGenerateFFFC( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                          HYPRE_BigInt *cpts_starts, hypre_ParCSRMatrix *S,
+                                          hypre_ParCSRMatrix **A_FC_ptr,
+                                          hypre_ParCSRMatrix **A_FF_ptr ) ;
+HYPRE_Int hypre_ParCSRMatrixGenerateFFFC3(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                          HYPRE_BigInt *cpts_starts, hypre_ParCSRMatrix *S, hypre_ParCSRMatrix **A_FC_ptr,
+                                          hypre_ParCSRMatrix **A_FF_ptr ) ;
+HYPRE_Int hypre_ParCSRMatrixGenerateFFFCD3(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                           HYPRE_BigInt *cpts_starts, hypre_ParCSRMatrix *S, hypre_ParCSRMatrix **A_FC_ptr,
+                                           hypre_ParCSRMatrix **A_FF_ptr, HYPRE_Real **D_lambda_ptr ) ;
+HYPRE_Int hypre_ParCSRMatrixGenerateFFFC3Device(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                                HYPRE_BigInt *cpts_starts, hypre_ParCSRMatrix *S, hypre_ParCSRMatrix **A_FC_ptr,
+                                                hypre_ParCSRMatrix **A_FF_ptr ) ;
+HYPRE_Int hypre_ParCSRMatrixGenerateCFDevice( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                              HYPRE_BigInt *cpts_starts, hypre_ParCSRMatrix *S, hypre_ParCSRMatrix **ACF_ptr) ;
+HYPRE_Int hypre_ParCSRMatrixGenerateCCDevice( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                              HYPRE_BigInt *cpts_starts, hypre_ParCSRMatrix *S, hypre_ParCSRMatrix **ACC_ptr) ;
+HYPRE_Int hypre_ParCSRMatrixGenerate1DCFDevice( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                                HYPRE_BigInt *cpts_starts, hypre_ParCSRMatrix *S, hypre_ParCSRMatrix **ACX_ptr,
+                                                hypre_ParCSRMatrix **AXC_ptr ) ;
 
 /* new_commpkg.c */
-HYPRE_Int hypre_PrintCommpkg ( hypre_ParCSRMatrix *A , const char *file_name );
-HYPRE_Int hypre_ParCSRCommPkgCreateApart_core ( MPI_Comm comm , HYPRE_BigInt *col_map_off_d , HYPRE_BigInt first_col_diag , HYPRE_Int num_cols_off_d , HYPRE_BigInt global_num_cols , HYPRE_Int *p_num_recvs , HYPRE_Int **p_recv_procs , HYPRE_Int **p_recv_vec_starts , HYPRE_Int *p_num_sends , HYPRE_Int **p_send_procs , HYPRE_Int **p_send_map_starts , HYPRE_Int **p_send_map_elements , hypre_IJAssumedPart *apart );
-HYPRE_Int hypre_ParCSRCommPkgCreateApart ( MPI_Comm  comm, HYPRE_BigInt *col_map_off_d, HYPRE_BigInt  first_col_diag, HYPRE_Int  num_cols_off_d, HYPRE_BigInt  global_num_cols, hypre_IJAssumedPart *apart, hypre_ParCSRCommPkg *comm_pkg );
+HYPRE_Int hypre_PrintCommpkg ( hypre_ParCSRMatrix *A, const char *file_name );
+HYPRE_Int hypre_ParCSRCommPkgCreateApart_core ( MPI_Comm comm, HYPRE_BigInt *col_map_off_d,
+                                                HYPRE_BigInt first_col_diag, HYPRE_Int num_cols_off_d, HYPRE_BigInt global_num_cols,
+                                                HYPRE_Int *p_num_recvs, HYPRE_Int **p_recv_procs, HYPRE_Int **p_recv_vec_starts,
+                                                HYPRE_Int *p_num_sends, HYPRE_Int **p_send_procs, HYPRE_Int **p_send_map_starts,
+                                                HYPRE_Int **p_send_map_elements, hypre_IJAssumedPart *apart );
+HYPRE_Int hypre_ParCSRCommPkgCreateApart ( MPI_Comm  comm, HYPRE_BigInt *col_map_off_d,
+                                           HYPRE_BigInt  first_col_diag, HYPRE_Int  num_cols_off_d, HYPRE_BigInt  global_num_cols,
+                                           hypre_IJAssumedPart *apart, hypre_ParCSRCommPkg *comm_pkg );
 HYPRE_Int hypre_NewCommPkgDestroy ( hypre_ParCSRMatrix *parcsr_A );
-HYPRE_Int hypre_RangeFillResponseIJDetermineRecvProcs ( void *p_recv_contact_buf , HYPRE_Int contact_size , HYPRE_Int contact_proc , void *ro , MPI_Comm comm , void **p_send_response_buf , HYPRE_Int *response_message_size );
-HYPRE_Int hypre_FillResponseIJDetermineSendProcs ( void *p_recv_contact_buf , HYPRE_Int contact_size , HYPRE_Int contact_proc , void *ro , MPI_Comm comm , void **p_send_response_buf , HYPRE_Int *response_message_size );
+HYPRE_Int hypre_RangeFillResponseIJDetermineRecvProcs ( void *p_recv_contact_buf,
+                                                        HYPRE_Int contact_size, HYPRE_Int contact_proc, void *ro, MPI_Comm comm, void **p_send_response_buf,
+                                                        HYPRE_Int *response_message_size );
+HYPRE_Int hypre_FillResponseIJDetermineSendProcs ( void *p_recv_contact_buf, HYPRE_Int contact_size,
+                                                   HYPRE_Int contact_proc, void *ro, MPI_Comm comm, void **p_send_response_buf,
+                                                   HYPRE_Int *response_message_size );
 
 /* numbers.c */
 hypre_NumbersNode *hypre_NumbersNewNode ( void );
 void hypre_NumbersDeleteNode ( hypre_NumbersNode *node );
-HYPRE_Int hypre_NumbersEnter ( hypre_NumbersNode *node , const HYPRE_Int n );
+HYPRE_Int hypre_NumbersEnter ( hypre_NumbersNode *node, const HYPRE_Int n );
 HYPRE_Int hypre_NumbersNEntered ( hypre_NumbersNode *node );
-HYPRE_Int hypre_NumbersQuery ( hypre_NumbersNode *node , const HYPRE_Int n );
+HYPRE_Int hypre_NumbersQuery ( hypre_NumbersNode *node, const HYPRE_Int n );
 HYPRE_Int *hypre_NumbersArray ( hypre_NumbersNode *node );
 
 /* parchord_to_parcsr.c */
-void hypre_ParChordMatrix_RowStarts ( hypre_ParChordMatrix *Ac , MPI_Comm comm , HYPRE_BigInt **row_starts , HYPRE_BigInt *global_num_cols );
-HYPRE_Int hypre_ParChordMatrixToParCSRMatrix ( hypre_ParChordMatrix *Ac , MPI_Comm comm , hypre_ParCSRMatrix **pAp );
-HYPRE_Int hypre_ParCSRMatrixToParChordMatrix ( hypre_ParCSRMatrix *Ap , MPI_Comm comm , hypre_ParChordMatrix **pAc );
+void hypre_ParChordMatrix_RowStarts ( hypre_ParChordMatrix *Ac, MPI_Comm comm,
+                                      HYPRE_BigInt **row_starts, HYPRE_BigInt *global_num_cols );
+HYPRE_Int hypre_ParChordMatrixToParCSRMatrix ( hypre_ParChordMatrix *Ac, MPI_Comm comm,
+                                               hypre_ParCSRMatrix **pAp );
+HYPRE_Int hypre_ParCSRMatrixToParChordMatrix ( hypre_ParCSRMatrix *Ap, MPI_Comm comm,
+                                               hypre_ParChordMatrix **pAc );
 
 /* par_csr_aat.c */
-void hypre_ParAat_RowSizes ( HYPRE_Int **C_diag_i , HYPRE_Int **C_offd_i , HYPRE_Int *B_marker , HYPRE_Int *A_diag_i , HYPRE_Int *A_diag_j , HYPRE_Int *A_offd_i , HYPRE_Int *A_offd_j , HYPRE_BigInt *A_col_map_offd , HYPRE_Int *A_ext_i , HYPRE_BigInt *A_ext_j , HYPRE_BigInt *A_ext_row_map , HYPRE_Int *C_diag_size , HYPRE_Int *C_offd_size , HYPRE_Int num_rows_diag_A , HYPRE_Int num_cols_offd_A , HYPRE_Int num_rows_A_ext , HYPRE_BigInt first_col_diag_A , HYPRE_BigInt first_row_index_A );
+void hypre_ParAat_RowSizes ( HYPRE_Int **C_diag_i, HYPRE_Int **C_offd_i, HYPRE_Int *B_marker,
+                             HYPRE_Int *A_diag_i, HYPRE_Int *A_diag_j, HYPRE_Int *A_offd_i, HYPRE_Int *A_offd_j,
+                             HYPRE_BigInt *A_col_map_offd, HYPRE_Int *A_ext_i, HYPRE_BigInt *A_ext_j,
+                             HYPRE_BigInt *A_ext_row_map, HYPRE_Int *C_diag_size, HYPRE_Int *C_offd_size,
+                             HYPRE_Int num_rows_diag_A, HYPRE_Int num_cols_offd_A, HYPRE_Int num_rows_A_ext,
+                             HYPRE_BigInt first_col_diag_A, HYPRE_BigInt first_row_index_A );
 hypre_ParCSRMatrix *hypre_ParCSRAAt ( hypre_ParCSRMatrix *A );
-hypre_CSRMatrix *hypre_ParCSRMatrixExtractAExt ( hypre_ParCSRMatrix *A , HYPRE_Int data , HYPRE_BigInt **pA_ext_row_map );
+hypre_CSRMatrix *hypre_ParCSRMatrixExtractAExt ( hypre_ParCSRMatrix *A, HYPRE_Int data,
+                                                 HYPRE_BigInt **pA_ext_row_map );
 
 /* par_csr_assumed_part.c */
-HYPRE_Int hypre_LocateAssumedPartition ( MPI_Comm comm , HYPRE_BigInt row_start , HYPRE_BigInt row_end , HYPRE_BigInt global_first_row , HYPRE_BigInt global_num_rows , hypre_IJAssumedPart *part , HYPRE_Int myid );
-hypre_IJAssumedPart *hypre_AssumedPartitionCreate ( MPI_Comm comm , HYPRE_BigInt global_num , HYPRE_BigInt start , HYPRE_BigInt end );
+HYPRE_Int hypre_LocateAssumedPartition ( MPI_Comm comm, HYPRE_BigInt row_start,
+                                         HYPRE_BigInt row_end, HYPRE_BigInt global_first_row, HYPRE_BigInt global_num_rows,
+                                         hypre_IJAssumedPart *part, HYPRE_Int myid );
+hypre_IJAssumedPart *hypre_AssumedPartitionCreate ( MPI_Comm comm, HYPRE_BigInt global_num,
+                                                    HYPRE_BigInt start, HYPRE_BigInt end );
 HYPRE_Int hypre_ParCSRMatrixCreateAssumedPartition ( hypre_ParCSRMatrix *matrix );
 HYPRE_Int hypre_AssumedPartitionDestroy ( hypre_IJAssumedPart *apart );
-HYPRE_Int hypre_GetAssumedPartitionProcFromRow ( MPI_Comm comm , HYPRE_BigInt row , HYPRE_BigInt global_first_row , HYPRE_BigInt global_num_rows , HYPRE_Int *proc_id );
-HYPRE_Int hypre_GetAssumedPartitionRowRange ( MPI_Comm comm , HYPRE_Int proc_id , HYPRE_BigInt global_first_row , HYPRE_BigInt global_num_rows , HYPRE_BigInt *row_start , HYPRE_BigInt *row_end );
+HYPRE_Int hypre_GetAssumedPartitionProcFromRow ( MPI_Comm comm, HYPRE_BigInt row,
+                                                 HYPRE_BigInt global_first_row, HYPRE_BigInt global_num_rows, HYPRE_Int *proc_id );
+HYPRE_Int hypre_GetAssumedPartitionRowRange ( MPI_Comm comm, HYPRE_Int proc_id,
+                                              HYPRE_BigInt global_first_row, HYPRE_BigInt global_num_rows, HYPRE_BigInt *row_start,
+                                              HYPRE_BigInt *row_end );
 HYPRE_Int hypre_ParVectorCreateAssumedPartition ( hypre_ParVector *vector );
 
 /* par_csr_bool_matop.c */
-hypre_ParCSRBooleanMatrix *hypre_ParBooleanMatmul ( hypre_ParCSRBooleanMatrix *A , hypre_ParCSRBooleanMatrix *B );
-hypre_CSRBooleanMatrix *hypre_ParCSRBooleanMatrixExtractBExt ( hypre_ParCSRBooleanMatrix *B , hypre_ParCSRBooleanMatrix *A );
-hypre_CSRBooleanMatrix *hypre_ParCSRBooleanMatrixExtractAExt ( hypre_ParCSRBooleanMatrix *A , HYPRE_BigInt **pA_ext_row_map );
+hypre_ParCSRBooleanMatrix *hypre_ParBooleanMatmul ( hypre_ParCSRBooleanMatrix *A,
+                                                    hypre_ParCSRBooleanMatrix *B );
+hypre_CSRBooleanMatrix *hypre_ParCSRBooleanMatrixExtractBExt ( hypre_ParCSRBooleanMatrix *B,
+                                                               hypre_ParCSRBooleanMatrix *A );
+hypre_CSRBooleanMatrix *hypre_ParCSRBooleanMatrixExtractAExt ( hypre_ParCSRBooleanMatrix *A,
+                                                               HYPRE_BigInt **pA_ext_row_map );
 hypre_ParCSRBooleanMatrix *hypre_ParBooleanAAt ( hypre_ParCSRBooleanMatrix *A );
 HYPRE_Int hypre_BooleanMatTCommPkgCreate ( hypre_ParCSRBooleanMatrix *A );
 HYPRE_Int hypre_BooleanMatvecCommPkgCreate ( hypre_ParCSRBooleanMatrix *A );
 
 /* par_csr_bool_matrix.c */
-hypre_CSRBooleanMatrix *hypre_CSRBooleanMatrixCreate ( HYPRE_Int num_rows , HYPRE_Int num_cols , HYPRE_Int num_nonzeros );
+hypre_CSRBooleanMatrix *hypre_CSRBooleanMatrixCreate ( HYPRE_Int num_rows, HYPRE_Int num_cols,
+                                                       HYPRE_Int num_nonzeros );
 HYPRE_Int hypre_CSRBooleanMatrixDestroy ( hypre_CSRBooleanMatrix *matrix );
 HYPRE_Int hypre_CSRBooleanMatrixInitialize ( hypre_CSRBooleanMatrix *matrix );
 HYPRE_Int hypre_CSRBooleanMatrixBigInitialize ( hypre_CSRBooleanMatrix *matrix );
-HYPRE_Int hypre_CSRBooleanMatrixSetDataOwner ( hypre_CSRBooleanMatrix *matrix , HYPRE_Int owns_data );
-HYPRE_Int hypre_CSRBooleanMatrixSetBigDataOwner ( hypre_CSRBooleanMatrix *matrix , HYPRE_Int owns_data );
+HYPRE_Int hypre_CSRBooleanMatrixSetDataOwner ( hypre_CSRBooleanMatrix *matrix,
+                                               HYPRE_Int owns_data );
+HYPRE_Int hypre_CSRBooleanMatrixSetBigDataOwner ( hypre_CSRBooleanMatrix *matrix,
+                                                  HYPRE_Int owns_data );
 hypre_CSRBooleanMatrix *hypre_CSRBooleanMatrixRead ( const char *file_name );
-HYPRE_Int hypre_CSRBooleanMatrixPrint ( hypre_CSRBooleanMatrix *matrix , const char *file_name );
-hypre_ParCSRBooleanMatrix *hypre_ParCSRBooleanMatrixCreate ( MPI_Comm comm , HYPRE_BigInt global_num_rows , HYPRE_BigInt global_num_cols , HYPRE_BigInt *row_starts , HYPRE_BigInt *col_starts , HYPRE_Int num_cols_offd , HYPRE_Int num_nonzeros_diag , HYPRE_Int num_nonzeros_offd );
+HYPRE_Int hypre_CSRBooleanMatrixPrint ( hypre_CSRBooleanMatrix *matrix, const char *file_name );
+hypre_ParCSRBooleanMatrix *hypre_ParCSRBooleanMatrixCreate ( MPI_Comm comm,
+                                                             HYPRE_BigInt global_num_rows, HYPRE_BigInt global_num_cols, HYPRE_BigInt *row_starts,
+                                                             HYPRE_BigInt *col_starts, HYPRE_Int num_cols_offd, HYPRE_Int num_nonzeros_diag,
+                                                             HYPRE_Int num_nonzeros_offd );
 HYPRE_Int hypre_ParCSRBooleanMatrixDestroy ( hypre_ParCSRBooleanMatrix *matrix );
 HYPRE_Int hypre_ParCSRBooleanMatrixInitialize ( hypre_ParCSRBooleanMatrix *matrix );
 HYPRE_Int hypre_ParCSRBooleanMatrixSetNNZ ( hypre_ParCSRBooleanMatrix *matrix );
-HYPRE_Int hypre_ParCSRBooleanMatrixSetDataOwner ( hypre_ParCSRBooleanMatrix *matrix , HYPRE_Int owns_data );
-HYPRE_Int hypre_ParCSRBooleanMatrixSetRowStartsOwner ( hypre_ParCSRBooleanMatrix *matrix , HYPRE_Int owns_row_starts );
-HYPRE_Int hypre_ParCSRBooleanMatrixSetColStartsOwner ( hypre_ParCSRBooleanMatrix *matrix , HYPRE_Int owns_col_starts );
-hypre_ParCSRBooleanMatrix *hypre_ParCSRBooleanMatrixRead ( MPI_Comm comm , const char *file_name );
-HYPRE_Int hypre_ParCSRBooleanMatrixPrint ( hypre_ParCSRBooleanMatrix *matrix , const char *file_name );
-HYPRE_Int hypre_ParCSRBooleanMatrixPrintIJ ( hypre_ParCSRBooleanMatrix *matrix , const char *filename );
-HYPRE_Int hypre_ParCSRBooleanMatrixGetLocalRange ( hypre_ParCSRBooleanMatrix *matrix , HYPRE_BigInt *row_start , HYPRE_BigInt *row_end , HYPRE_BigInt *col_start , HYPRE_BigInt *col_end );
-HYPRE_Int hypre_ParCSRBooleanMatrixGetRow ( hypre_ParCSRBooleanMatrix *mat , HYPRE_BigInt row , HYPRE_Int *size , HYPRE_BigInt **col_ind );
-HYPRE_Int hypre_ParCSRBooleanMatrixRestoreRow ( hypre_ParCSRBooleanMatrix *matrix , HYPRE_BigInt row , HYPRE_Int *size , HYPRE_BigInt **col_ind );
-HYPRE_Int hypre_BuildCSRBooleanMatrixMPIDataType ( HYPRE_Int num_nonzeros , HYPRE_Int num_rows , HYPRE_Int *a_i , HYPRE_Int *a_j , hypre_MPI_Datatype *csr_matrix_datatype );
-hypre_ParCSRBooleanMatrix *hypre_CSRBooleanMatrixToParCSRBooleanMatrix ( MPI_Comm comm , hypre_CSRBooleanMatrix *A , HYPRE_BigInt *row_starts , HYPRE_BigInt *col_starts );
-HYPRE_Int hypre_BooleanGenerateDiagAndOffd ( hypre_CSRBooleanMatrix *A , hypre_ParCSRBooleanMatrix *matrix , HYPRE_BigInt first_col_diag , HYPRE_BigInt last_col_diag );
+HYPRE_Int hypre_ParCSRBooleanMatrixSetDataOwner ( hypre_ParCSRBooleanMatrix *matrix,
+                                                  HYPRE_Int owns_data );
+HYPRE_Int hypre_ParCSRBooleanMatrixSetRowStartsOwner ( hypre_ParCSRBooleanMatrix *matrix,
+                                                       HYPRE_Int owns_row_starts );
+HYPRE_Int hypre_ParCSRBooleanMatrixSetColStartsOwner ( hypre_ParCSRBooleanMatrix *matrix,
+                                                       HYPRE_Int owns_col_starts );
+hypre_ParCSRBooleanMatrix *hypre_ParCSRBooleanMatrixRead ( MPI_Comm comm, const char *file_name );
+HYPRE_Int hypre_ParCSRBooleanMatrixPrint ( hypre_ParCSRBooleanMatrix *matrix,
+                                           const char *file_name );
+HYPRE_Int hypre_ParCSRBooleanMatrixPrintIJ ( hypre_ParCSRBooleanMatrix *matrix,
+                                             const char *filename );
+HYPRE_Int hypre_ParCSRBooleanMatrixGetLocalRange ( hypre_ParCSRBooleanMatrix *matrix,
+                                                   HYPRE_BigInt *row_start, HYPRE_BigInt *row_end, HYPRE_BigInt *col_start, HYPRE_BigInt *col_end );
+HYPRE_Int hypre_ParCSRBooleanMatrixGetRow ( hypre_ParCSRBooleanMatrix *mat, HYPRE_BigInt row,
+                                            HYPRE_Int *size, HYPRE_BigInt **col_ind );
+HYPRE_Int hypre_ParCSRBooleanMatrixRestoreRow ( hypre_ParCSRBooleanMatrix *matrix, HYPRE_BigInt row,
+                                                HYPRE_Int *size, HYPRE_BigInt **col_ind );
+HYPRE_Int hypre_BuildCSRBooleanMatrixMPIDataType ( HYPRE_Int num_nonzeros, HYPRE_Int num_rows,
+                                                   HYPRE_Int *a_i, HYPRE_Int *a_j, hypre_MPI_Datatype *csr_matrix_datatype );
+hypre_ParCSRBooleanMatrix *hypre_CSRBooleanMatrixToParCSRBooleanMatrix ( MPI_Comm comm,
+                                                                         hypre_CSRBooleanMatrix *A, HYPRE_BigInt *row_starts, HYPRE_BigInt *col_starts );
+HYPRE_Int hypre_BooleanGenerateDiagAndOffd ( hypre_CSRBooleanMatrix *A,
+                                             hypre_ParCSRBooleanMatrix *matrix, HYPRE_BigInt first_col_diag, HYPRE_BigInt last_col_diag );
 
 /* par_csr_communication.c */
-hypre_ParCSRCommHandle *hypre_ParCSRCommHandleCreate ( HYPRE_Int job , hypre_ParCSRCommPkg *comm_pkg , void *send_data , void *recv_data );
-hypre_ParCSRCommHandle *hypre_ParCSRCommHandleCreate_v2 ( HYPRE_Int job, hypre_ParCSRCommPkg *comm_pkg, HYPRE_MemoryLocation send_memory_location, void *send_data_in, HYPRE_MemoryLocation recv_memory_location, void *recv_data_in );
+hypre_ParCSRCommHandle *hypre_ParCSRCommHandleCreate ( HYPRE_Int job, hypre_ParCSRCommPkg *comm_pkg,
+                                                       void *send_data, void *recv_data );
+hypre_ParCSRCommHandle *hypre_ParCSRCommHandleCreate_v2 ( HYPRE_Int job,
+                                                          hypre_ParCSRCommPkg *comm_pkg,
+                                                          HYPRE_MemoryLocation send_memory_location,
+                                                          void *send_data_in,
+                                                          HYPRE_MemoryLocation recv_memory_location,
+                                                          void *recv_data_in );
 HYPRE_Int hypre_ParCSRCommHandleDestroy ( hypre_ParCSRCommHandle *comm_handle );
-void hypre_ParCSRCommPkgCreate_core ( MPI_Comm comm , HYPRE_BigInt *col_map_offd , HYPRE_BigInt first_col_diag , HYPRE_BigInt *col_starts , HYPRE_Int num_cols_diag , HYPRE_Int num_cols_offd , HYPRE_Int *p_num_recvs , HYPRE_Int **p_recv_procs , HYPRE_Int **p_recv_vec_starts , HYPRE_Int *p_num_sends , HYPRE_Int **p_send_procs , HYPRE_Int **p_send_map_starts , HYPRE_Int **p_send_map_elmts );
-HYPRE_Int
-hypre_ParCSRCommPkgCreate(MPI_Comm comm, HYPRE_BigInt *col_map_offd, HYPRE_BigInt first_col_diag, HYPRE_BigInt *col_starts, HYPRE_Int num_cols_diag, HYPRE_Int num_cols_offd, hypre_ParCSRCommPkg *comm_pkg);
+void hypre_ParCSRCommPkgCreate_core ( MPI_Comm comm, HYPRE_BigInt *col_map_offd,
+                                      HYPRE_BigInt first_col_diag, HYPRE_BigInt *col_starts, HYPRE_Int num_cols_diag,
+                                      HYPRE_Int num_cols_offd, HYPRE_Int *p_num_recvs, HYPRE_Int **p_recv_procs,
+                                      HYPRE_Int **p_recv_vec_starts, HYPRE_Int *p_num_sends, HYPRE_Int **p_send_procs,
+                                      HYPRE_Int **p_send_map_starts, HYPRE_Int **p_send_map_elmts );
+HYPRE_Int hypre_ParCSRCommPkgCreate(MPI_Comm comm, HYPRE_BigInt *col_map_offd,
+                                    HYPRE_BigInt first_col_diag, HYPRE_BigInt *col_starts,
+                                    HYPRE_Int num_cols_diag, HYPRE_Int num_cols_offd,
+                                    hypre_ParCSRCommPkg *comm_pkg);
+HYPRE_Int hypre_ParCSRCommPkgCreateAndFill ( MPI_Comm comm, HYPRE_Int num_recvs,
+                                             HYPRE_Int *recv_procs, HYPRE_Int *recv_vec_starts,
+                                             HYPRE_Int num_sends, HYPRE_Int *send_procs,
+                                             HYPRE_Int *send_map_starts, HYPRE_Int *send_map_elmts,
+                                             hypre_ParCSRCommPkg **comm_pkg_ptr );
+HYPRE_Int hypre_ParCSRCommPkgUpdateVecStarts ( hypre_ParCSRCommPkg *comm_pkg,
+                                               HYPRE_Int num_components_in,
+                                               HYPRE_Int vecstride, HYPRE_Int idxstride );
 HYPRE_Int hypre_MatvecCommPkgCreate ( hypre_ParCSRMatrix *A );
 HYPRE_Int hypre_MatvecCommPkgDestroy ( hypre_ParCSRCommPkg *comm_pkg );
-HYPRE_Int hypre_BuildCSRMatrixMPIDataType ( HYPRE_Int num_nonzeros , HYPRE_Int num_rows , HYPRE_Complex *a_data , HYPRE_Int *a_i , HYPRE_Int *a_j , hypre_MPI_Datatype *csr_matrix_datatype );
-HYPRE_Int hypre_BuildCSRJDataType ( HYPRE_Int num_nonzeros , HYPRE_Complex *a_data , HYPRE_Int *a_j , hypre_MPI_Datatype *csr_jdata_datatype );
-HYPRE_Int hypre_ParCSRFindExtendCommPkg(MPI_Comm comm, HYPRE_BigInt global_num_cols, HYPRE_BigInt first_col_diag, HYPRE_Int num_cols_diag, HYPRE_BigInt *col_starts, hypre_IJAssumedPart *apart, HYPRE_Int indices_len, HYPRE_BigInt *indices, hypre_ParCSRCommPkg **extend_comm_pkg);
+HYPRE_Int hypre_BuildCSRMatrixMPIDataType ( HYPRE_Int num_nonzeros, HYPRE_Int num_rows,
+                                            HYPRE_Complex *a_data, HYPRE_Int *a_i, HYPRE_Int *a_j,
+                                            hypre_MPI_Datatype *csr_matrix_datatype );
+HYPRE_Int hypre_BuildCSRJDataType ( HYPRE_Int num_nonzeros, HYPRE_Complex *a_data, HYPRE_Int *a_j,
+                                    hypre_MPI_Datatype *csr_jdata_datatype );
+HYPRE_Int hypre_ParCSRFindExtendCommPkg(MPI_Comm comm, HYPRE_BigInt global_num_cols,
+                                        HYPRE_BigInt first_col_diag, HYPRE_Int num_cols_diag, HYPRE_BigInt *col_starts,
+                                        hypre_IJAssumedPart *apart, HYPRE_Int indices_len, HYPRE_BigInt *indices,
+                                        hypre_ParCSRCommPkg **extend_comm_pkg);
+
+/* par_csr_filter.c */
+HYPRE_Int hypre_ParCSRMatrixBlkFilter(hypre_ParCSRMatrix *A,
+                                      HYPRE_Int block_size, hypre_ParCSRMatrix **B_ptr);
 
 /* par_csr_matop.c */
 HYPRE_Int hypre_ParCSRMatrixScale(hypre_ParCSRMatrix *A, HYPRE_Complex scalar);
-void hypre_ParMatmul_RowSizes ( HYPRE_MemoryLocation memory_location , HYPRE_Int **C_diag_i , HYPRE_Int **C_offd_i , HYPRE_Int *rownnz_A , HYPRE_Int *A_diag_i , HYPRE_Int *A_diag_j , HYPRE_Int *A_offd_i , HYPRE_Int *A_offd_j , HYPRE_Int *B_diag_i , HYPRE_Int *B_diag_j , HYPRE_Int *B_offd_i , HYPRE_Int *B_offd_j , HYPRE_Int *B_ext_diag_i , HYPRE_Int *B_ext_diag_j , HYPRE_Int *B_ext_offd_i , HYPRE_Int *B_ext_offd_j , HYPRE_Int *map_B_to_C , HYPRE_Int *C_diag_size , HYPRE_Int *C_offd_size , HYPRE_Int num_rownnz_A , HYPRE_Int num_rows_diag_A , HYPRE_Int num_cols_offd_A , HYPRE_Int  allsquare , HYPRE_Int num_cols_diag_B , HYPRE_Int num_cols_offd_B , HYPRE_Int num_cols_offd_C );
-hypre_ParCSRMatrix *hypre_ParMatmul ( hypre_ParCSRMatrix *A , hypre_ParCSRMatrix *B );
-void hypre_ParCSRMatrixExtractBExt_Arrays ( HYPRE_Int **pB_ext_i , HYPRE_BigInt **pB_ext_j , HYPRE_Complex **pB_ext_data , HYPRE_BigInt **pB_ext_row_map , HYPRE_Int *num_nonzeros , HYPRE_Int data , HYPRE_Int find_row_map , MPI_Comm comm , hypre_ParCSRCommPkg *comm_pkg , HYPRE_Int num_cols_B , HYPRE_Int num_recvs , HYPRE_Int num_sends , HYPRE_BigInt first_col_diag , HYPRE_BigInt *row_starts , HYPRE_Int *recv_vec_starts , HYPRE_Int *send_map_starts , HYPRE_Int *send_map_elmts , HYPRE_Int *diag_i , HYPRE_Int *diag_j , HYPRE_Int *offd_i , HYPRE_Int *offd_j , HYPRE_BigInt *col_map_offd , HYPRE_Real *diag_data , HYPRE_Real *offd_data );
-void hypre_ParCSRMatrixExtractBExt_Arrays_Overlap ( HYPRE_Int **pB_ext_i , HYPRE_BigInt **pB_ext_j , HYPRE_Complex **pB_ext_data , HYPRE_BigInt **pB_ext_row_map , HYPRE_Int *num_nonzeros , HYPRE_Int data , HYPRE_Int find_row_map , MPI_Comm comm , hypre_ParCSRCommPkg *comm_pkg , HYPRE_Int num_cols_B , HYPRE_Int num_recvs , HYPRE_Int num_sends , HYPRE_BigInt first_col_diag , HYPRE_BigInt *row_starts , HYPRE_Int *recv_vec_starts , HYPRE_Int *send_map_starts , HYPRE_Int *send_map_elmts , HYPRE_Int *diag_i , HYPRE_Int *diag_j , HYPRE_Int *offd_i , HYPRE_Int *offd_j , HYPRE_BigInt *col_map_offd , HYPRE_Real *diag_data , HYPRE_Real *offd_data, hypre_ParCSRCommHandle **comm_handle_idx, hypre_ParCSRCommHandle **comm_handle_data, HYPRE_Int *CF_marker, HYPRE_Int *CF_marker_offd, HYPRE_Int skip_fine, HYPRE_Int skip_same_sign );
-hypre_CSRMatrix *hypre_ParCSRMatrixExtractBExt ( hypre_ParCSRMatrix *B , hypre_ParCSRMatrix *A , HYPRE_Int data );
-hypre_CSRMatrix *hypre_ParCSRMatrixExtractBExt_Overlap ( hypre_ParCSRMatrix *B , hypre_ParCSRMatrix *A , HYPRE_Int data, hypre_ParCSRCommHandle **comm_handle_idx, hypre_ParCSRCommHandle **comm_handle_data, HYPRE_Int *CF_marker, HYPRE_Int *CF_marker_offd, HYPRE_Int skip_fine, HYPRE_Int skip_same_sign );
-HYPRE_Int hypre_ParCSRMatrixExtractBExtDeviceInit( hypre_ParCSRMatrix *B, hypre_ParCSRMatrix *A, HYPRE_Int want_data, void **request_ptr);
+void hypre_ParMatmul_RowSizes ( HYPRE_MemoryLocation memory_location, HYPRE_Int **C_diag_i,
+                                HYPRE_Int **C_offd_i, HYPRE_Int *rownnz_A, HYPRE_Int *A_diag_i, HYPRE_Int *A_diag_j,
+                                HYPRE_Int *A_offd_i, HYPRE_Int *A_offd_j, HYPRE_Int *B_diag_i, HYPRE_Int *B_diag_j,
+                                HYPRE_Int *B_offd_i, HYPRE_Int *B_offd_j, HYPRE_Int *B_ext_diag_i, HYPRE_Int *B_ext_diag_j,
+                                HYPRE_Int *B_ext_offd_i, HYPRE_Int *B_ext_offd_j, HYPRE_Int *map_B_to_C, HYPRE_Int *C_diag_size,
+                                HYPRE_Int *C_offd_size, HYPRE_Int num_rownnz_A, HYPRE_Int num_rows_diag_A,
+                                HYPRE_Int num_cols_offd_A, HYPRE_Int  allsquare, HYPRE_Int num_cols_diag_B,
+                                HYPRE_Int num_cols_offd_B, HYPRE_Int num_cols_offd_C );
+hypre_ParCSRMatrix *hypre_ParMatmul ( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *B );
+void hypre_ParCSRMatrixExtractBExt_Arrays ( HYPRE_Int **pB_ext_i, HYPRE_BigInt **pB_ext_j,
+                                            HYPRE_Complex **pB_ext_data, HYPRE_BigInt **pB_ext_row_map, HYPRE_Int *num_nonzeros, HYPRE_Int data,
+                                            HYPRE_Int find_row_map, MPI_Comm comm, hypre_ParCSRCommPkg *comm_pkg, HYPRE_Int num_cols_B,
+                                            HYPRE_Int num_recvs, HYPRE_Int num_sends, HYPRE_BigInt first_col_diag, HYPRE_BigInt *row_starts,
+                                            HYPRE_Int *recv_vec_starts, HYPRE_Int *send_map_starts, HYPRE_Int *send_map_elmts,
+                                            HYPRE_Int *diag_i, HYPRE_Int *diag_j, HYPRE_Int *offd_i, HYPRE_Int *offd_j,
+                                            HYPRE_BigInt *col_map_offd, HYPRE_Real *diag_data, HYPRE_Real *offd_data );
+void hypre_ParCSRMatrixExtractBExt_Arrays_Overlap ( HYPRE_Int **pB_ext_i, HYPRE_BigInt **pB_ext_j,
+                                                    HYPRE_Complex **pB_ext_data, HYPRE_BigInt **pB_ext_row_map, HYPRE_Int *num_nonzeros, HYPRE_Int data,
+                                                    HYPRE_Int find_row_map, MPI_Comm comm, hypre_ParCSRCommPkg *comm_pkg, HYPRE_Int num_cols_B,
+                                                    HYPRE_Int num_recvs, HYPRE_Int num_sends, HYPRE_BigInt first_col_diag, HYPRE_BigInt *row_starts,
+                                                    HYPRE_Int *recv_vec_starts, HYPRE_Int *send_map_starts, HYPRE_Int *send_map_elmts,
+                                                    HYPRE_Int *diag_i, HYPRE_Int *diag_j, HYPRE_Int *offd_i, HYPRE_Int *offd_j,
+                                                    HYPRE_BigInt *col_map_offd, HYPRE_Real *diag_data, HYPRE_Real *offd_data,
+                                                    hypre_ParCSRCommHandle **comm_handle_idx, hypre_ParCSRCommHandle **comm_handle_data,
+                                                    HYPRE_Int *CF_marker, HYPRE_Int *CF_marker_offd, HYPRE_Int skip_fine, HYPRE_Int skip_same_sign );
+hypre_CSRMatrix *hypre_ParCSRMatrixExtractBExt ( hypre_ParCSRMatrix *B, hypre_ParCSRMatrix *A,
+                                                 HYPRE_Int data );
+hypre_CSRMatrix *hypre_ParCSRMatrixExtractBExt_Overlap ( hypre_ParCSRMatrix *B,
+                                                         hypre_ParCSRMatrix *A, HYPRE_Int data, hypre_ParCSRCommHandle **comm_handle_idx,
+                                                         hypre_ParCSRCommHandle **comm_handle_data, HYPRE_Int *CF_marker, HYPRE_Int *CF_marker_offd,
+                                                         HYPRE_Int skip_fine, HYPRE_Int skip_same_sign );
+HYPRE_Int hypre_ParCSRMatrixExtractBExtDeviceInit( hypre_ParCSRMatrix *B, hypre_ParCSRMatrix *A,
+                                                   HYPRE_Int want_data, void **request_ptr);
 hypre_CSRMatrix* hypre_ParCSRMatrixExtractBExtDeviceWait(void *request);
-hypre_CSRMatrix* hypre_ParCSRMatrixExtractBExtDevice( hypre_ParCSRMatrix *B, hypre_ParCSRMatrix *A, HYPRE_Int want_data );
-HYPRE_Int hypre_ParCSRMatrixTranspose ( hypre_ParCSRMatrix *A , hypre_ParCSRMatrix **AT_ptr , HYPRE_Int data );
-HYPRE_Int hypre_ParCSRMatrixTransposeHost ( hypre_ParCSRMatrix *A , hypre_ParCSRMatrix **AT_ptr , HYPRE_Int data );
-HYPRE_Int hypre_ParCSRMatrixTransposeDevice ( hypre_ParCSRMatrix *A , hypre_ParCSRMatrix **AT_ptr , HYPRE_Int data );
-void hypre_ParCSRMatrixGenSpanningTree ( hypre_ParCSRMatrix *G_csr , HYPRE_Int **indices , HYPRE_Int G_type );
-void hypre_ParCSRMatrixExtractSubmatrices ( hypre_ParCSRMatrix *A_csr , HYPRE_Int *indices2 , hypre_ParCSRMatrix ***submatrices );
-void hypre_ParCSRMatrixExtractRowSubmatrices ( hypre_ParCSRMatrix *A_csr , HYPRE_Int *indices2 , hypre_ParCSRMatrix ***submatrices );
+hypre_CSRMatrix* hypre_ParCSRMatrixExtractBExtDevice( hypre_ParCSRMatrix *B, hypre_ParCSRMatrix *A,
+                                                      HYPRE_Int want_data );
+HYPRE_Int hypre_ParCSRMatrixLocalTranspose( hypre_ParCSRMatrix  *A );
+HYPRE_Int hypre_ParCSRMatrixTranspose ( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix **AT_ptr,
+                                        HYPRE_Int data );
+HYPRE_Int hypre_ParCSRMatrixTransposeHost ( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix **AT_ptr,
+                                            HYPRE_Int data );
+HYPRE_Int hypre_ParCSRMatrixTransposeDevice ( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix **AT_ptr,
+                                              HYPRE_Int data );
+void hypre_ParCSRMatrixGenSpanningTree ( hypre_ParCSRMatrix *G_csr, HYPRE_Int **indices,
+                                         HYPRE_Int G_type );
+void hypre_ParCSRMatrixExtractSubmatrices ( hypre_ParCSRMatrix *A_csr, HYPRE_Int *indices2,
+                                            hypre_ParCSRMatrix ***submatrices );
+void hypre_ParCSRMatrixExtractRowSubmatrices ( hypre_ParCSRMatrix *A_csr, HYPRE_Int *indices2,
+                                               hypre_ParCSRMatrix ***submatrices );
 HYPRE_Complex hypre_ParCSRMatrixLocalSumElts ( hypre_ParCSRMatrix *A );
-HYPRE_Int hypre_ParCSRMatrixAminvDB ( hypre_ParCSRMatrix *A , hypre_ParCSRMatrix *B , HYPRE_Complex *d , hypre_ParCSRMatrix **C_ptr );
-hypre_ParCSRMatrix *hypre_ParTMatmul ( hypre_ParCSRMatrix *A , hypre_ParCSRMatrix *B );
+HYPRE_Int hypre_ParCSRMatrixAminvDB ( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *B,
+                                      HYPRE_Complex *d, hypre_ParCSRMatrix **C_ptr );
+hypre_ParCSRMatrix *hypre_ParTMatmul ( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *B );
 HYPRE_Real hypre_ParCSRMatrixFnorm( hypre_ParCSRMatrix *A );
-HYPRE_Int hypre_ParCSRMatrixInfNorm ( hypre_ParCSRMatrix *A , HYPRE_Real *norm );
-HYPRE_Int hypre_ExchangeExternalRowsInit( hypre_CSRMatrix *B_ext, hypre_ParCSRCommPkg *comm_pkg_A, void **request_ptr);
+HYPRE_Int hypre_ParCSRMatrixInfNorm ( hypre_ParCSRMatrix *A, HYPRE_Real *norm );
+HYPRE_Int hypre_ExchangeExternalRowsInit( hypre_CSRMatrix *B_ext, hypre_ParCSRCommPkg *comm_pkg_A,
+                                          void **request_ptr);
 hypre_CSRMatrix* hypre_ExchangeExternalRowsWait(void *vequest);
-HYPRE_Int hypre_ExchangeExternalRowsDeviceInit( hypre_CSRMatrix *B_ext, hypre_ParCSRCommPkg *comm_pkg_A, HYPRE_Int want_data, void **request_ptr);
+HYPRE_Int hypre_ExchangeExternalRowsDeviceInit( hypre_CSRMatrix *B_ext,
+                                                hypre_ParCSRCommPkg *comm_pkg_A, HYPRE_Int want_data, void **request_ptr);
 hypre_CSRMatrix* hypre_ExchangeExternalRowsDeviceWait(void *vrequest);
-HYPRE_Int hypre_ParCSRMatrixGenerateFFFCDevice( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker_host, HYPRE_BigInt *cpts_starts, hypre_ParCSRMatrix *S, hypre_ParCSRMatrix **A_FC_ptr, hypre_ParCSRMatrix **A_FF_ptr );
-HYPRE_Int hypre_ParCSRMatrixGenerateFFCFDevice( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker_host, HYPRE_BigInt *cpts_starts, hypre_ParCSRMatrix *S, hypre_ParCSRMatrix **A_CF_ptr, hypre_ParCSRMatrix **A_FF_ptr );
+HYPRE_Int hypre_ParCSRMatrixGenerateFFFCDevice( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                                HYPRE_BigInt *cpts_starts, hypre_ParCSRMatrix *S,
+                                                hypre_ParCSRMatrix **A_FC_ptr,
+                                                hypre_ParCSRMatrix **A_FF_ptr );
+HYPRE_Int hypre_ParCSRMatrixGenerateFFCFDevice( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                                HYPRE_BigInt *cpts_starts, hypre_ParCSRMatrix *S,
+                                                hypre_ParCSRMatrix **A_CF_ptr,
+                                                hypre_ParCSRMatrix **A_FF_ptr );
+HYPRE_Int hypre_ParCSRMatrixGenerateCCCFDevice( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                                HYPRE_BigInt *cpts_starts, hypre_ParCSRMatrix *S,
+                                                hypre_ParCSRMatrix **A_CF_ptr,
+                                                hypre_ParCSRMatrix **A_CC_ptr );
 hypre_CSRMatrix* hypre_ConcatDiagAndOffdDevice(hypre_ParCSRMatrix *A);
-HYPRE_Int hypre_ConcatDiagOffdAndExtDevice(hypre_ParCSRMatrix *A, hypre_CSRMatrix *E, hypre_CSRMatrix **B_ptr, HYPRE_Int *num_cols_offd_ptr, HYPRE_BigInt **cols_map_offd_ptr);
-HYPRE_Int hypre_ParCSRMatrixGetRowDevice( hypre_ParCSRMatrix *mat, HYPRE_BigInt row, HYPRE_Int *size, HYPRE_BigInt **col_ind, HYPRE_Complex **values );
-HYPRE_Int hypre_ParCSRDiagScale( HYPRE_ParCSRMatrix HA, HYPRE_ParVector Hy, HYPRE_ParVector Hx );
-HYPRE_Int hypre_ParCSRMatrixDropSmallEntries( hypre_ParCSRMatrix *A, HYPRE_Real tol, HYPRE_Int type);
-HYPRE_Int hypre_ParCSRMatrixDropSmallEntriesHost( hypre_ParCSRMatrix *A, HYPRE_Real tol, HYPRE_Int type);
-HYPRE_Int hypre_ParCSRMatrixDropSmallEntriesDevice( hypre_ParCSRMatrix *A, HYPRE_Complex tol, HYPRE_Int type);
+HYPRE_Int hypre_ConcatDiagOffdAndExtDevice(hypre_ParCSRMatrix *A, hypre_CSRMatrix *E,
+                                           hypre_CSRMatrix **B_ptr, HYPRE_Int *num_cols_offd_ptr, HYPRE_BigInt **cols_map_offd_ptr);
+HYPRE_Int hypre_ParCSRMatrixGetRowDevice( hypre_ParCSRMatrix *mat, HYPRE_BigInt row,
+                                          HYPRE_Int *size, HYPRE_BigInt **col_ind, HYPRE_Complex **values );
+HYPRE_Int hypre_ParCSRDiagScaleVector( hypre_ParCSRMatrix *par_A, hypre_ParVector *par_y,
+                                       hypre_ParVector *par_x );
+HYPRE_Int hypre_ParCSRDiagScaleVectorHost( hypre_ParCSRMatrix *par_A, hypre_ParVector *par_y,
+                                           hypre_ParVector *par_x );
+HYPRE_Int hypre_ParCSRDiagScaleVectorDevice( hypre_ParCSRMatrix *par_A, hypre_ParVector *par_y,
+                                             hypre_ParVector *par_x );
+HYPRE_Int hypre_ParCSRMatrixDropSmallEntries( hypre_ParCSRMatrix *A, HYPRE_Real tol,
+                                              HYPRE_Int type);
+HYPRE_Int hypre_ParCSRMatrixDropSmallEntriesHost( hypre_ParCSRMatrix *A, HYPRE_Real tol,
+                                                  HYPRE_Int type);
+HYPRE_Int hypre_ParCSRMatrixDropSmallEntriesDevice( hypre_ParCSRMatrix *A, HYPRE_Complex tol,
+                                                    HYPRE_Int type);
+
+HYPRE_Int hypre_ParCSRCommPkgCreateMatrixE( hypre_ParCSRCommPkg *comm_pkg, HYPRE_Int local_ncols );
 
 #ifdef HYPRE_USING_PERSISTENT_COMM
-hypre_ParCSRPersistentCommHandle* hypre_ParCSRPersistentCommHandleCreate(HYPRE_Int job, hypre_ParCSRCommPkg *comm_pkg);
-hypre_ParCSRPersistentCommHandle* hypre_ParCSRCommPkgGetPersistentCommHandle(HYPRE_Int job, hypre_ParCSRCommPkg *comm_pkg);
+hypre_ParCSRPersistentCommHandle* hypre_ParCSRPersistentCommHandleCreate(HYPRE_Int job,
+                                                                         hypre_ParCSRCommPkg *comm_pkg);
+hypre_ParCSRPersistentCommHandle* hypre_ParCSRCommPkgGetPersistentCommHandle(HYPRE_Int job,
+                                                                             hypre_ParCSRCommPkg *comm_pkg);
 void hypre_ParCSRPersistentCommHandleDestroy(hypre_ParCSRPersistentCommHandle *comm_handle);
-void hypre_ParCSRPersistentCommHandleStart(hypre_ParCSRPersistentCommHandle *comm_handle, HYPRE_MemoryLocation send_memory_location, void *send_data);
-void hypre_ParCSRPersistentCommHandleWait(hypre_ParCSRPersistentCommHandle *comm_handle, HYPRE_MemoryLocation recv_memory_location, void *recv_data);
+void hypre_ParCSRPersistentCommHandleStart(hypre_ParCSRPersistentCommHandle *comm_handle,
+                                           HYPRE_MemoryLocation send_memory_location, void *send_data);
+void hypre_ParCSRPersistentCommHandleWait(hypre_ParCSRPersistentCommHandle *comm_handle,
+                                          HYPRE_MemoryLocation recv_memory_location, void *recv_data);
 #endif
 
-HYPRE_Int hypre_ParcsrGetExternalRowsInit( hypre_ParCSRMatrix *A, HYPRE_Int indices_len, HYPRE_BigInt *indices, hypre_ParCSRCommPkg *comm_pkg, HYPRE_Int want_data, void **request_ptr);
+HYPRE_Int hypre_ParcsrGetExternalRowsInit( hypre_ParCSRMatrix *A, HYPRE_Int indices_len,
+                                           HYPRE_BigInt *indices, hypre_ParCSRCommPkg *comm_pkg, HYPRE_Int want_data, void **request_ptr);
 hypre_CSRMatrix* hypre_ParcsrGetExternalRowsWait(void *vrequest);
-HYPRE_Int hypre_ParcsrGetExternalRowsDeviceInit( hypre_ParCSRMatrix *A, HYPRE_Int indices_len, HYPRE_BigInt *indices, hypre_ParCSRCommPkg *comm_pkg, HYPRE_Int want_data, void **request_ptr);
+HYPRE_Int hypre_ParcsrGetExternalRowsDeviceInit( hypre_ParCSRMatrix *A, HYPRE_Int indices_len,
+                                                 HYPRE_BigInt *indices, hypre_ParCSRCommPkg *comm_pkg, HYPRE_Int want_data, void **request_ptr);
 hypre_CSRMatrix* hypre_ParcsrGetExternalRowsDeviceWait(void *vrequest);
 
-HYPRE_Int hypre_ParvecBdiagInvScal( hypre_ParVector *b, HYPRE_Int blockSize, hypre_ParVector **bs, hypre_ParCSRMatrix *A);
+HYPRE_Int hypre_ParvecBdiagInvScal( hypre_ParVector *b, HYPRE_Int blockSize, hypre_ParVector **bs,
+                                    hypre_ParCSRMatrix *A);
 
-HYPRE_Int hypre_ParcsrBdiagInvScal( hypre_ParCSRMatrix *A, HYPRE_Int blockSize, hypre_ParCSRMatrix **As);
+HYPRE_Int hypre_ParcsrBdiagInvScal( hypre_ParCSRMatrix *A, HYPRE_Int blockSize,
+                                    hypre_ParCSRMatrix **As);
 
-HYPRE_Int hypre_ParCSRMatrixExtractSubmatrixFC( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker, HYPRE_BigInt *cpts_starts, const char *job, hypre_ParCSRMatrix **B_ptr, HYPRE_Real strength_thresh);
+HYPRE_Int hypre_ParCSRMatrixExtractSubmatrixFC( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                                HYPRE_BigInt *cpts_starts, const char *job,
+                                                hypre_ParCSRMatrix **B_ptr,
+                                                HYPRE_Real strength_thresh);
+HYPRE_Int hypre_ParCSRMatrixDiagScale( hypre_ParCSRMatrix *par_A, hypre_ParVector *par_ld,
+                                       hypre_ParVector *par_rd );
 HYPRE_Int hypre_ParCSRMatrixReorder ( hypre_ParCSRMatrix *A );
-HYPRE_Int hypre_ParCSRMatrixAdd( HYPRE_Complex alpha, hypre_ParCSRMatrix *A, HYPRE_Complex beta, hypre_ParCSRMatrix *B, hypre_ParCSRMatrix **Cout);
-HYPRE_Int hypre_ParCSRMatrixAddHost( HYPRE_Complex alpha, hypre_ParCSRMatrix *A, HYPRE_Complex beta, hypre_ParCSRMatrix *B, hypre_ParCSRMatrix **Cout);
-HYPRE_Int hypre_ParCSRMatrixAddDevice( HYPRE_Complex alpha, hypre_ParCSRMatrix *A, HYPRE_Complex beta, hypre_ParCSRMatrix *B, hypre_ParCSRMatrix **Cout);
+HYPRE_Int hypre_ParCSRMatrixAdd( HYPRE_Complex alpha, hypre_ParCSRMatrix *A, HYPRE_Complex beta,
+                                 hypre_ParCSRMatrix *B, hypre_ParCSRMatrix **Cout);
+HYPRE_Int hypre_ParCSRMatrixAddHost( HYPRE_Complex alpha, hypre_ParCSRMatrix *A,
+                                     HYPRE_Complex beta, hypre_ParCSRMatrix *B,
+                                     hypre_ParCSRMatrix **Cout);
+HYPRE_Int hypre_ParCSRMatrixAddDevice( HYPRE_Complex alpha, hypre_ParCSRMatrix *A,
+                                       HYPRE_Complex beta, hypre_ParCSRMatrix *B,
+                                       hypre_ParCSRMatrix **Cout);
+HYPRE_Int hypre_ParCSRMatrixBlockColSum( hypre_ParCSRMatrix *A, HYPRE_Int row_major,
+                                         HYPRE_Int num_rows_block, HYPRE_Int num_cols_block,
+                                         hypre_DenseBlockMatrix **B_ptr );
+HYPRE_Int hypre_ParCSRMatrixColSum( hypre_ParCSRMatrix *A, hypre_ParVector **B_ptr );
+
+/* par_csr_filter_device.c */
+HYPRE_Int hypre_ParCSRMatrixBlkFilterDevice(hypre_ParCSRMatrix *A, HYPRE_Int block_size,
+                                            hypre_ParCSRMatrix **B_ptr);
+
+/* par_csr_matop_device.c */
+HYPRE_Int hypre_ParCSRMatrixDiagScaleDevice ( hypre_ParCSRMatrix *par_A, hypre_ParVector *par_ld,
+                                              hypre_ParVector *par_rd );
+HYPRE_Int hypre_ParCSRMatrixCompressOffdMapDevice(hypre_ParCSRMatrix *A);
+HYPRE_Int hypre_ParCSRMatrixCompressOffdMap(hypre_ParCSRMatrix *A);
 
 /* par_csr_matop_marked.c */
-void hypre_ParMatmul_RowSizes_Marked ( HYPRE_Int **C_diag_i , HYPRE_Int **C_offd_i , HYPRE_Int **B_marker , HYPRE_Int *A_diag_i , HYPRE_Int *A_diag_j , HYPRE_Int *A_offd_i , HYPRE_Int *A_offd_j , HYPRE_Int *B_diag_i , HYPRE_Int *B_diag_j , HYPRE_Int *B_offd_i , HYPRE_Int *B_offd_j , HYPRE_Int *B_ext_diag_i , HYPRE_Int *B_ext_diag_j , HYPRE_Int *B_ext_offd_i , HYPRE_Int *B_ext_offd_j , HYPRE_Int *map_B_to_C , HYPRE_Int *C_diag_size , HYPRE_Int *C_offd_size , HYPRE_Int num_rows_diag_A , HYPRE_Int num_cols_offd_A , HYPRE_Int allsquare , HYPRE_Int num_cols_diag_B , HYPRE_Int num_cols_offd_B , HYPRE_Int num_cols_offd_C , HYPRE_Int *CF_marker , HYPRE_Int *dof_func , HYPRE_Int *dof_func_offd );
-hypre_ParCSRMatrix *hypre_ParMatmul_FC ( hypre_ParCSRMatrix *A , hypre_ParCSRMatrix *P , HYPRE_Int *CF_marker , HYPRE_Int *dof_func , HYPRE_Int *dof_func_offd );
-void hypre_ParMatScaleDiagInv_F ( hypre_ParCSRMatrix *C , hypre_ParCSRMatrix *A , HYPRE_Complex weight , HYPRE_Int *CF_marker );
-hypre_ParCSRMatrix *hypre_ParMatMinus_F ( hypre_ParCSRMatrix *P , hypre_ParCSRMatrix *C , HYPRE_Int *CF_marker );
-void hypre_ParCSRMatrixZero_F ( hypre_ParCSRMatrix *P , HYPRE_Int *CF_marker );
-void hypre_ParCSRMatrixCopy_C ( hypre_ParCSRMatrix *P , hypre_ParCSRMatrix *C , HYPRE_Int *CF_marker );
-void hypre_ParCSRMatrixDropEntries ( hypre_ParCSRMatrix *C , hypre_ParCSRMatrix *P , HYPRE_Int *CF_marker );
+void hypre_ParMatmul_RowSizes_Marked ( HYPRE_Int **C_diag_i, HYPRE_Int **C_offd_i,
+                                       HYPRE_Int **B_marker, HYPRE_Int *A_diag_i,
+                                       HYPRE_Int *A_diag_j, HYPRE_Int *A_offd_i,
+                                       HYPRE_Int *A_offd_j, HYPRE_Int *B_diag_i,
+                                       HYPRE_Int *B_diag_j, HYPRE_Int *B_offd_i,
+                                       HYPRE_Int *B_offd_j, HYPRE_Int *B_ext_diag_i,
+                                       HYPRE_Int *B_ext_diag_j, HYPRE_Int *B_ext_offd_i,
+                                       HYPRE_Int *B_ext_offd_j, HYPRE_Int *map_B_to_C,
+                                       HYPRE_Int *C_diag_size, HYPRE_Int *C_offd_size,
+                                       HYPRE_Int num_rows_diag_A, HYPRE_Int num_cols_offd_A,
+                                       HYPRE_Int allsquare, HYPRE_Int num_cols_diag_B,
+                                       HYPRE_Int num_cols_offd_B, HYPRE_Int num_cols_offd_C,
+                                       HYPRE_Int *CF_marker, HYPRE_Int *dof_func,
+                                       HYPRE_Int *dof_func_offd );
+hypre_ParCSRMatrix *hypre_ParMatmul_FC ( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *P,
+                                         HYPRE_Int *CF_marker, HYPRE_Int *dof_func,
+                                         HYPRE_Int *dof_func_offd );
+void hypre_ParMatScaleDiagInv_F ( hypre_ParCSRMatrix *C, hypre_ParCSRMatrix *A,
+                                  HYPRE_Complex weight, HYPRE_Int *CF_marker );
+hypre_ParCSRMatrix *hypre_ParMatMinus_F ( hypre_ParCSRMatrix *P, hypre_ParCSRMatrix *C,
+                                          HYPRE_Int *CF_marker );
+void hypre_ParCSRMatrixZero_F ( hypre_ParCSRMatrix *P, HYPRE_Int *CF_marker );
+void hypre_ParCSRMatrixCopy_C ( hypre_ParCSRMatrix *P, hypre_ParCSRMatrix *C,
+                                HYPRE_Int *CF_marker );
+void hypre_ParCSRMatrixDropEntries ( hypre_ParCSRMatrix *C, hypre_ParCSRMatrix *P,
+                                     HYPRE_Int *CF_marker );
 
 /* par_csr_matrix.c */
-hypre_ParCSRMatrix *hypre_ParCSRMatrixCreate ( MPI_Comm comm , HYPRE_BigInt global_num_rows , HYPRE_BigInt global_num_cols , HYPRE_BigInt *row_starts_in , HYPRE_BigInt *col_starts_in , HYPRE_Int num_cols_offd , HYPRE_Int num_nonzeros_diag , HYPRE_Int num_nonzeros_offd );
+hypre_ParCSRMatrix *hypre_ParCSRMatrixCreate ( MPI_Comm comm, HYPRE_BigInt global_num_rows,
+                                               HYPRE_BigInt global_num_cols,
+                                               HYPRE_BigInt *row_starts_in,
+                                               HYPRE_BigInt *col_starts_in,
+                                               HYPRE_Int num_cols_offd,
+                                               HYPRE_Int num_nonzeros_diag,
+                                               HYPRE_Int num_nonzeros_offd );
 HYPRE_Int hypre_ParCSRMatrixDestroy ( hypre_ParCSRMatrix *matrix );
-HYPRE_Int hypre_ParCSRMatrixInitialize_v2( hypre_ParCSRMatrix *matrix, HYPRE_MemoryLocation memory_location );
+HYPRE_Int hypre_ParCSRMatrixInitialize_v2( hypre_ParCSRMatrix *matrix,
+                                           HYPRE_MemoryLocation memory_location );
 HYPRE_Int hypre_ParCSRMatrixInitialize ( hypre_ParCSRMatrix *matrix );
 HYPRE_Int hypre_ParCSRMatrixSetNumNonzeros ( hypre_ParCSRMatrix *matrix );
 HYPRE_Int hypre_ParCSRMatrixSetDNumNonzeros ( hypre_ParCSRMatrix *matrix );
 HYPRE_Int hypre_ParCSRMatrixSetNumRownnz ( hypre_ParCSRMatrix *matrix );
-HYPRE_Int hypre_ParCSRMatrixSetDataOwner ( hypre_ParCSRMatrix *matrix , HYPRE_Int owns_data );
-hypre_ParCSRMatrix *hypre_ParCSRMatrixRead ( MPI_Comm comm , const char *file_name );
-HYPRE_Int hypre_ParCSRMatrixPrint ( hypre_ParCSRMatrix *matrix , const char *file_name );
-HYPRE_Int hypre_ParCSRMatrixPrintIJ ( const hypre_ParCSRMatrix *matrix , const HYPRE_Int base_i , const HYPRE_Int base_j , const char *filename );
-HYPRE_Int hypre_ParCSRMatrixReadIJ ( MPI_Comm comm , const char *filename , HYPRE_Int *base_i_ptr , HYPRE_Int *base_j_ptr , hypre_ParCSRMatrix **matrix_ptr );
-HYPRE_Int hypre_ParCSRMatrixGetLocalRange ( hypre_ParCSRMatrix *matrix , HYPRE_BigInt *row_start , HYPRE_BigInt *row_end , HYPRE_BigInt *col_start , HYPRE_BigInt *col_end );
-HYPRE_Int hypre_ParCSRMatrixGetRow ( hypre_ParCSRMatrix *mat , HYPRE_BigInt row , HYPRE_Int *size , HYPRE_BigInt **col_ind , HYPRE_Complex **values );
-HYPRE_Int hypre_ParCSRMatrixRestoreRow ( hypre_ParCSRMatrix *matrix , HYPRE_BigInt row , HYPRE_Int *size , HYPRE_BigInt **col_ind , HYPRE_Complex **values );
-hypre_ParCSRMatrix *hypre_CSRMatrixToParCSRMatrix ( MPI_Comm comm , hypre_CSRMatrix *A , HYPRE_BigInt *row_starts , HYPRE_BigInt *col_starts );
-HYPRE_Int GenerateDiagAndOffd ( hypre_CSRMatrix *A , hypre_ParCSRMatrix *matrix , HYPRE_BigInt first_col_diag , HYPRE_BigInt last_col_diag );
+HYPRE_Int hypre_ParCSRMatrixSetDataOwner ( hypre_ParCSRMatrix *matrix, HYPRE_Int owns_data );
+HYPRE_Int hypre_ParCSRMatrixSetPatternOnly( hypre_ParCSRMatrix *matrix, HYPRE_Int pattern_only);
+hypre_ParCSRMatrix* hypre_ParCSRMatrixCreateFromDenseBlockMatrix(MPI_Comm comm,
+                                                                 HYPRE_BigInt global_num_rows,
+                                                                 HYPRE_BigInt global_num_cols,
+                                                                 HYPRE_BigInt *row_starts,
+                                                                 HYPRE_BigInt *col_starts,
+                                                                 hypre_DenseBlockMatrix *B);
+hypre_ParCSRMatrix* hypre_ParCSRMatrixCreateFromParVector(hypre_ParVector *b,
+                                                          HYPRE_BigInt global_num_rows,
+                                                          HYPRE_BigInt global_num_cols,
+                                                          HYPRE_BigInt *row_starts,
+                                                          HYPRE_BigInt *col_starts);
+hypre_ParCSRMatrix *hypre_ParCSRMatrixRead ( MPI_Comm comm, const char *file_name );
+HYPRE_Int hypre_ParCSRMatrixPrint ( hypre_ParCSRMatrix *matrix, const char *file_name );
+HYPRE_Int hypre_ParCSRMatrixPrintIJ ( const hypre_ParCSRMatrix *matrix, const HYPRE_Int base_i,
+                                      const HYPRE_Int base_j, const char *filename );
+HYPRE_Int hypre_ParCSRMatrixPrintBinaryIJ ( hypre_ParCSRMatrix *matrix, HYPRE_Int base_i,
+                                            HYPRE_Int base_j, const char *filename );
+HYPRE_Int hypre_ParCSRMatrixReadIJ ( MPI_Comm comm, const char *filename, HYPRE_Int *base_i_ptr,
+                                     HYPRE_Int *base_j_ptr, hypre_ParCSRMatrix **matrix_ptr );
+HYPRE_Int hypre_ParCSRMatrixGetLocalRange ( hypre_ParCSRMatrix *matrix, HYPRE_BigInt *row_start,
+                                            HYPRE_BigInt *row_end, HYPRE_BigInt *col_start, HYPRE_BigInt *col_end );
+HYPRE_Int hypre_ParCSRMatrixGetRow ( hypre_ParCSRMatrix *mat, HYPRE_BigInt row, HYPRE_Int *size,
+                                     HYPRE_BigInt **col_ind, HYPRE_Complex **values );
+HYPRE_Int hypre_ParCSRMatrixRestoreRow ( hypre_ParCSRMatrix *matrix, HYPRE_BigInt row,
+                                         HYPRE_Int *size, HYPRE_BigInt **col_ind, HYPRE_Complex **values );
+hypre_ParCSRMatrix *hypre_CSRMatrixToParCSRMatrix ( MPI_Comm comm, hypre_CSRMatrix *A,
+                                                    HYPRE_BigInt *row_starts, HYPRE_BigInt *col_starts );
+HYPRE_Int GenerateDiagAndOffd ( hypre_CSRMatrix *A, hypre_ParCSRMatrix *matrix,
+                                HYPRE_BigInt first_col_diag, HYPRE_BigInt last_col_diag );
 hypre_CSRMatrix *hypre_MergeDiagAndOffd ( hypre_ParCSRMatrix *par_matrix );
 hypre_CSRMatrix *hypre_MergeDiagAndOffdDevice ( hypre_ParCSRMatrix *par_matrix );
 hypre_CSRMatrix *hypre_ParCSRMatrixToCSRMatrixAll ( hypre_ParCSRMatrix *par_matrix );
-HYPRE_Int hypre_ParCSRMatrixCopy ( hypre_ParCSRMatrix *A , hypre_ParCSRMatrix *B , HYPRE_Int copy_data );
-HYPRE_Int hypre_FillResponseParToCSRMatrix ( void *p_recv_contact_buf , HYPRE_Int contact_size , HYPRE_Int contact_proc , void *ro , MPI_Comm comm , void **p_send_response_buf , HYPRE_Int *response_message_size );
-hypre_ParCSRMatrix *hypre_ParCSRMatrixUnion ( hypre_ParCSRMatrix *A , hypre_ParCSRMatrix *B );
+hypre_CSRMatrix *hypre_ParCSRMatrixToCSRMatrixAll_v2 ( hypre_ParCSRMatrix *par_matrix,
+                                                       HYPRE_MemoryLocation memory_location );
+HYPRE_Int hypre_ParCSRMatrixCopy ( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *B,
+                                   HYPRE_Int copy_data );
+HYPRE_Int hypre_FillResponseParToCSRMatrix ( void *p_recv_contact_buf, HYPRE_Int contact_size,
+                                             HYPRE_Int contact_proc, void *ro, MPI_Comm comm, void **p_send_response_buf,
+                                             HYPRE_Int *response_message_size );
+hypre_ParCSRMatrix *hypre_ParCSRMatrixUnion ( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *B );
 hypre_ParCSRMatrix* hypre_ParCSRMatrixClone ( hypre_ParCSRMatrix *A, HYPRE_Int copy_data );
 #define hypre_ParCSRMatrixCompleteClone(A) hypre_ParCSRMatrixClone(A,0)
-hypre_ParCSRMatrix* hypre_ParCSRMatrixClone_v2 ( hypre_ParCSRMatrix *A, HYPRE_Int copy_data, HYPRE_MemoryLocation memory_location );
+hypre_ParCSRMatrix* hypre_ParCSRMatrixClone_v2 ( hypre_ParCSRMatrix *A, HYPRE_Int copy_data,
+                                                 HYPRE_MemoryLocation memory_location );
+HYPRE_Int hypre_ParCSRMatrixTruncate(hypre_ParCSRMatrix *A, HYPRE_Real tol,
+                                     HYPRE_Int max_row_elmts, HYPRE_Int rescale,
+                                     HYPRE_Int nrm_type);
 HYPRE_Int hypre_ParCSRMatrixMigrate(hypre_ParCSRMatrix *A, HYPRE_MemoryLocation memory_location);
 HYPRE_Int hypre_ParCSRMatrixSetConstantValues( hypre_ParCSRMatrix *A, HYPRE_Complex value );
 void hypre_ParCSRMatrixCopyColMapOffdToDevice(hypre_ParCSRMatrix *A);
+void hypre_ParCSRMatrixCopyColMapOffdToHost(hypre_ParCSRMatrix *A);
+
+/* par_csr_matrix_stats.c */
+HYPRE_Int hypre_ParCSRMatrixStatsArrayCompute( HYPRE_Int num_matrices,
+                                               hypre_ParCSRMatrix **matrices,
+                                               hypre_MatrixStatsArray *stats_array );
+
+/* par_csr_matmat_device.c */
+HYPRE_Int hypre_ParCSRMatMatDiagDevice( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *BT,
+                                        hypre_ParCSRMatrix *C );
+
+/* par_csr_matmat.c */
+HYPRE_Int hypre_ParCSRMatMatDiag( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *B,
+                                  hypre_ParCSRMatrix **C_ptr );
 
 /* par_csr_matvec.c */
 // y = alpha*A*x + beta*b
-HYPRE_Int hypre_ParCSRMatrixMatvecOutOfPlace ( HYPRE_Complex alpha , hypre_ParCSRMatrix *A , hypre_ParVector *x , HYPRE_Complex beta , hypre_ParVector *b, hypre_ParVector *y );
+HYPRE_Int hypre_ParCSRMatrixMatvecOutOfPlace ( HYPRE_Complex alpha, hypre_ParCSRMatrix *A,
+                                               hypre_ParVector *x, HYPRE_Complex beta,
+                                               hypre_ParVector *b, hypre_ParVector *y );
+HYPRE_Int hypre_ParCSRMatrixMatvecOutOfPlaceDevice ( HYPRE_Complex alpha, hypre_ParCSRMatrix *A,
+                                                     hypre_ParVector *x, HYPRE_Complex beta,
+                                                     hypre_ParVector *b, hypre_ParVector *y );
 // y = alpha*A*x + beta*y
-HYPRE_Int hypre_ParCSRMatrixMatvec ( HYPRE_Complex alpha , hypre_ParCSRMatrix *A , hypre_ParVector *x , HYPRE_Complex beta , hypre_ParVector *y );
-HYPRE_Int hypre_ParCSRMatrixMatvecT ( HYPRE_Complex alpha , hypre_ParCSRMatrix *A , hypre_ParVector *x , HYPRE_Complex beta , hypre_ParVector *y );
-HYPRE_Int hypre_ParCSRMatrixMatvec_FF ( HYPRE_Complex alpha , hypre_ParCSRMatrix *A , hypre_ParVector *x , HYPRE_Complex beta , hypre_ParVector *y , HYPRE_Int *CF_marker , HYPRE_Int fpt );
+HYPRE_Int hypre_ParCSRMatrixMatvec ( HYPRE_Complex alpha, hypre_ParCSRMatrix *A, hypre_ParVector *x,
+                                     HYPRE_Complex beta, hypre_ParVector *y );
+HYPRE_Int hypre_ParCSRMatrixMatvecT ( HYPRE_Complex alpha, hypre_ParCSRMatrix *A,
+                                      hypre_ParVector *x, HYPRE_Complex beta, hypre_ParVector *y );
+HYPRE_Int hypre_ParCSRMatrixMatvecTDevice ( HYPRE_Complex alpha, hypre_ParCSRMatrix *A,
+                                            hypre_ParVector *x, HYPRE_Complex beta,
+                                            hypre_ParVector *y );
+HYPRE_Int hypre_ParCSRMatrixMatvecT_unpack( hypre_ParCSRCommPkg *comm_pkg, HYPRE_Int num_cols,
+                                            HYPRE_Complex *recv_data, HYPRE_Complex *local_data );
+HYPRE_Int hypre_ParCSRMatrixMatvec_FF ( HYPRE_Complex alpha, hypre_ParCSRMatrix *A,
+                                        hypre_ParVector *x, HYPRE_Complex beta, hypre_ParVector *y,
+                                        HYPRE_Int *CF_marker, HYPRE_Int fpt );
 
 /* par_csr_triplemat.c */
+HYPRE_Int hypre_ParCSRTMatMatPartialAddDevice( hypre_ParCSRCommPkg *comm_pkg_A,
+                                               HYPRE_Int num_cols_A, HYPRE_Int num_cols_B, HYPRE_BigInt first_col_diag_B,
+                                               HYPRE_BigInt last_col_diag_B, HYPRE_Int num_cols_offd_B, HYPRE_BigInt *col_map_offd_B,
+                                               HYPRE_Int local_nnz_Cbar, hypre_CSRMatrix *Cbar, hypre_CSRMatrix *Cext,
+                                               hypre_CSRMatrix **C_diag_ptr, hypre_CSRMatrix **C_offd_ptr, HYPRE_Int *num_cols_offd_C_ptr,
+                                               HYPRE_BigInt **col_map_offd_C_ptr );
 hypre_ParCSRMatrix *hypre_ParCSRMatMat( hypre_ParCSRMatrix  *A, hypre_ParCSRMatrix  *B );
 hypre_ParCSRMatrix *hypre_ParCSRMatMatHost( hypre_ParCSRMatrix  *A, hypre_ParCSRMatrix  *B );
 hypre_ParCSRMatrix *hypre_ParCSRMatMatDevice( hypre_ParCSRMatrix  *A, hypre_ParCSRMatrix  *B );
-
-hypre_ParCSRMatrix *hypre_ParCSRTMatMatKTHost( hypre_ParCSRMatrix  *A, hypre_ParCSRMatrix  *B, HYPRE_Int keep_transpose);
-hypre_ParCSRMatrix *hypre_ParCSRTMatMatKTDevice( hypre_ParCSRMatrix  *A, hypre_ParCSRMatrix  *B, HYPRE_Int keep_transpose);
-hypre_ParCSRMatrix *hypre_ParCSRTMatMatKT( hypre_ParCSRMatrix  *A, hypre_ParCSRMatrix  *B, HYPRE_Int keep_transpose);
+hypre_ParCSRMatrix *hypre_ParCSRTMatMatKTHost( hypre_ParCSRMatrix  *A, hypre_ParCSRMatrix  *B,
+                                               HYPRE_Int keep_transpose);
+hypre_ParCSRMatrix *hypre_ParCSRTMatMatKTDevice( hypre_ParCSRMatrix  *A, hypre_ParCSRMatrix  *B,
+                                                 HYPRE_Int keep_transpose);
+hypre_ParCSRMatrix *hypre_ParCSRTMatMatKT( hypre_ParCSRMatrix  *A, hypre_ParCSRMatrix  *B,
+                                           HYPRE_Int keep_transpose);
 hypre_ParCSRMatrix *hypre_ParCSRTMatMat( hypre_ParCSRMatrix  *A, hypre_ParCSRMatrix  *B);
-hypre_ParCSRMatrix *hypre_ParCSRMatrixRAPKT( hypre_ParCSRMatrix *R, hypre_ParCSRMatrix  *A, hypre_ParCSRMatrix  *P , HYPRE_Int keepTranspose );
-hypre_ParCSRMatrix *hypre_ParCSRMatrixRAP( hypre_ParCSRMatrix *R, hypre_ParCSRMatrix  *A, hypre_ParCSRMatrix  *P );
-hypre_ParCSRMatrix* hypre_ParCSRMatrixRAPKTDevice( hypre_ParCSRMatrix *R, hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *P, HYPRE_Int keep_transpose );
-hypre_ParCSRMatrix* hypre_ParCSRMatrixRAPKTHost( hypre_ParCSRMatrix *R, hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *P, HYPRE_Int keep_transpose );
+hypre_ParCSRMatrix *hypre_ParCSRMatrixRAPKT( hypre_ParCSRMatrix *R, hypre_ParCSRMatrix  *A,
+                                             hypre_ParCSRMatrix  *P, HYPRE_Int keepTranspose );
+hypre_ParCSRMatrix *hypre_ParCSRMatrixRAP( hypre_ParCSRMatrix *R, hypre_ParCSRMatrix  *A,
+                                           hypre_ParCSRMatrix  *P );
+hypre_ParCSRMatrix* hypre_ParCSRMatrixRAPKTDevice( hypre_ParCSRMatrix *R, hypre_ParCSRMatrix *A,
+                                                   hypre_ParCSRMatrix *P, HYPRE_Int keep_transpose );
+hypre_ParCSRMatrix* hypre_ParCSRMatrixRAPKTHost( hypre_ParCSRMatrix *R, hypre_ParCSRMatrix *A,
+                                                 hypre_ParCSRMatrix *P, HYPRE_Int keep_transpose );
 
 /* par_make_system.c */
-HYPRE_ParCSR_System_Problem *HYPRE_Generate2DSystem ( HYPRE_ParCSRMatrix H_L1 , HYPRE_ParCSRMatrix H_L2 , HYPRE_ParVector H_b1 , HYPRE_ParVector H_b2 , HYPRE_ParVector H_x1 , HYPRE_ParVector H_x2 , HYPRE_Complex *M_vals );
+HYPRE_ParCSR_System_Problem *HYPRE_Generate2DSystem ( HYPRE_ParCSRMatrix H_L1,
+                                                      HYPRE_ParCSRMatrix H_L2, HYPRE_ParVector H_b1, HYPRE_ParVector H_b2, HYPRE_ParVector H_x1,
+                                                      HYPRE_ParVector H_x2, HYPRE_Complex *M_vals );
 HYPRE_Int HYPRE_Destroy2DSystem ( HYPRE_ParCSR_System_Problem *sys_prob );
 
 /* par_vector.c */
-hypre_ParVector *hypre_ParVectorCreate ( MPI_Comm comm , HYPRE_BigInt global_size , HYPRE_BigInt *partitioning_in );
-hypre_ParVector *hypre_ParMultiVectorCreate ( MPI_Comm comm , HYPRE_BigInt global_size , HYPRE_BigInt *partitioning , HYPRE_Int num_vectors );
+hypre_ParVector *hypre_ParVectorCreate ( MPI_Comm comm, HYPRE_BigInt global_size,
+                                         HYPRE_BigInt *partitioning_in );
+hypre_ParVector *hypre_ParMultiVectorCreate ( MPI_Comm comm, HYPRE_BigInt global_size,
+                                              HYPRE_BigInt *partitioning, HYPRE_Int num_vectors );
 HYPRE_Int hypre_ParVectorDestroy ( hypre_ParVector *vector );
+HYPRE_Int hypre_ParVectorInitializeShell( hypre_ParVector *vector );
+HYPRE_Int hypre_ParVectorSetData( hypre_ParVector *vector, HYPRE_Complex *data );
 HYPRE_Int hypre_ParVectorInitialize ( hypre_ParVector *vector );
-HYPRE_Int hypre_ParVectorInitialize_v2( hypre_ParVector *vector, HYPRE_MemoryLocation memory_location );
-HYPRE_Int hypre_ParVectorSetDataOwner ( hypre_ParVector *vector , HYPRE_Int owns_data );
-HYPRE_Int hypre_ParVectorSetNumVectors ( hypre_ParVector *vector , HYPRE_Int num_vectors );
-hypre_ParVector *hypre_ParVectorRead ( MPI_Comm comm , const char *file_name );
-HYPRE_Int hypre_ParVectorPrint ( hypre_ParVector *vector , const char *file_name );
-HYPRE_Int hypre_ParVectorSetConstantValues ( hypre_ParVector *v , HYPRE_Complex value );
-HYPRE_Int hypre_ParVectorSetRandomValues ( hypre_ParVector *v , HYPRE_Int seed );
-HYPRE_Int hypre_ParVectorCopy ( hypre_ParVector *x , hypre_ParVector *y );
+HYPRE_Int hypre_ParVectorInitialize_v2( hypre_ParVector *vector,
+                                        HYPRE_MemoryLocation memory_location );
+HYPRE_Int hypre_ParVectorSetDataOwner ( hypre_ParVector *vector, HYPRE_Int owns_data );
+HYPRE_Int hypre_ParVectorSetLocalSize ( hypre_ParVector *vector, HYPRE_Int local_size );
+HYPRE_Int hypre_ParVectorSetNumVectors ( hypre_ParVector *vector, HYPRE_Int num_vectors );
+HYPRE_Int hypre_ParVectorSetComponent ( hypre_ParVector *vector, HYPRE_Int component );
+HYPRE_Int hypre_ParVectorResize ( hypre_ParVector *vector, HYPRE_Int num_vectors );
+hypre_ParVector *hypre_ParVectorRead ( MPI_Comm comm, const char *file_name );
+HYPRE_Int hypre_ParVectorSetConstantValues ( hypre_ParVector *v, HYPRE_Complex value );
+HYPRE_Int hypre_ParVectorSetZeros( hypre_ParVector *v );
+HYPRE_Int hypre_ParVectorSetRandomValues ( hypre_ParVector *v, HYPRE_Int seed );
+HYPRE_Int hypre_ParVectorCopy ( hypre_ParVector *x, hypre_ParVector *y );
 hypre_ParVector *hypre_ParVectorCloneShallow ( hypre_ParVector *x );
-hypre_ParVector *hypre_ParVectorCloneDeep_v2( hypre_ParVector *x, HYPRE_MemoryLocation memory_location );
+hypre_ParVector *hypre_ParVectorCloneDeep_v2( hypre_ParVector *x,
+                                              HYPRE_MemoryLocation memory_location );
 HYPRE_Int hypre_ParVectorMigrate(hypre_ParVector *x, HYPRE_MemoryLocation memory_location);
-HYPRE_Int hypre_ParVectorScale ( HYPRE_Complex alpha , hypre_ParVector *y );
-HYPRE_Int hypre_ParVectorAxpy ( HYPRE_Complex alpha , hypre_ParVector *x , hypre_ParVector *y );
-HYPRE_Int hypre_ParVectorMassAxpy ( HYPRE_Complex *alpha, hypre_ParVector **x, hypre_ParVector *y, HYPRE_Int k, HYPRE_Int unroll);
-HYPRE_Real hypre_ParVectorInnerProd ( hypre_ParVector *x , hypre_ParVector *y );
-HYPRE_Int hypre_ParVectorMassInnerProd ( hypre_ParVector *x , hypre_ParVector **y , HYPRE_Int k, HYPRE_Int unroll, HYPRE_Real *prod );
-HYPRE_Int hypre_ParVectorMassDotpTwo ( hypre_ParVector *x , hypre_ParVector *y , hypre_ParVector **z, HYPRE_Int k, HYPRE_Int unroll, HYPRE_Real *prod_x , HYPRE_Real *prod_y );
-hypre_ParVector *hypre_VectorToParVector ( MPI_Comm comm , hypre_Vector *v , HYPRE_BigInt *vec_starts );
+HYPRE_Int hypre_ParVectorScale ( HYPRE_Complex alpha, hypre_ParVector *y );
+HYPRE_Int hypre_ParVectorAxpy ( HYPRE_Complex alpha, hypre_ParVector *x, hypre_ParVector *y );
+HYPRE_Int hypre_ParVectorAxpyz ( HYPRE_Complex alpha, hypre_ParVector *x,
+                                 HYPRE_Complex beta, hypre_ParVector *y,
+                                 hypre_ParVector *z );
+HYPRE_Int hypre_ParVectorMassAxpy ( HYPRE_Complex *alpha, hypre_ParVector **x, hypre_ParVector *y,
+                                    HYPRE_Int k, HYPRE_Int unroll);
+HYPRE_Real hypre_ParVectorInnerProd ( hypre_ParVector *x, hypre_ParVector *y );
+HYPRE_Int hypre_ParVectorMassInnerProd ( hypre_ParVector *x, hypre_ParVector **y, HYPRE_Int k,
+                                         HYPRE_Int unroll, HYPRE_Real *prod );
+HYPRE_Int hypre_ParVectorMassDotpTwo ( hypre_ParVector *x, hypre_ParVector *y, hypre_ParVector **z,
+                                       HYPRE_Int k, HYPRE_Int unroll, HYPRE_Real *prod_x, HYPRE_Real *prod_y );
+hypre_ParVector *hypre_VectorToParVector ( MPI_Comm comm, hypre_Vector *v,
+                                           HYPRE_BigInt *vec_starts );
 hypre_Vector *hypre_ParVectorToVectorAll ( hypre_ParVector *par_v );
-HYPRE_Int hypre_ParVectorPrintIJ ( hypre_ParVector *vector , HYPRE_Int base_j , const char *filename );
-HYPRE_Int hypre_ParVectorReadIJ ( MPI_Comm comm , const char *filename , HYPRE_Int *base_j_ptr , hypre_ParVector **vector_ptr );
-HYPRE_Int hypre_FillResponseParToVectorAll ( void *p_recv_contact_buf , HYPRE_Int contact_size , HYPRE_Int contact_proc , void *ro , MPI_Comm comm , void **p_send_response_buf , HYPRE_Int *response_message_size );
+hypre_Vector *hypre_ParVectorToVectorAll_v2 ( hypre_ParVector *par_v,
+                                              HYPRE_MemoryLocation memory_location );
+HYPRE_Int hypre_ParVectorPrint ( hypre_ParVector *vector, const char *file_name );
+HYPRE_Int hypre_ParVectorPrintIJ ( hypre_ParVector *vector, HYPRE_Int base_j,
+                                   const char *filename );
+HYPRE_Int hypre_ParVectorPrintBinaryIJ ( hypre_ParVector *par_vector, const char *filename );
+HYPRE_Int hypre_ParVectorReadIJ ( MPI_Comm comm, const char *filename, HYPRE_Int *base_j_ptr,
+                                  hypre_ParVector **vector_ptr );
+HYPRE_Int hypre_FillResponseParToVectorAll ( void *p_recv_contact_buf, HYPRE_Int contact_size,
+                                             HYPRE_Int contact_proc, void *ro, MPI_Comm comm, void **p_send_response_buf,
+                                             HYPRE_Int *response_message_size );
 HYPRE_Complex hypre_ParVectorLocalSumElts ( hypre_ParVector *vector );
-HYPRE_Int hypre_ParVectorGetValues ( hypre_ParVector *vector, HYPRE_Int num_values, HYPRE_BigInt *indices , HYPRE_Complex *values);
-HYPRE_Int hypre_ParVectorGetValues2( hypre_ParVector *vector, HYPRE_Int num_values, HYPRE_BigInt *indices, HYPRE_BigInt base, HYPRE_Complex *values );
-HYPRE_Int hypre_ParVectorGetValuesHost(hypre_ParVector *vector, HYPRE_Int num_values, HYPRE_BigInt *indices, HYPRE_BigInt base, HYPRE_Complex *values);
+HYPRE_Int hypre_ParVectorGetValues ( hypre_ParVector *vector, HYPRE_Int num_values,
+                                     HYPRE_BigInt *indices, HYPRE_Complex *values);
+HYPRE_Int hypre_ParVectorGetValues2( hypre_ParVector *vector, HYPRE_Int num_values,
+                                     HYPRE_BigInt *indices, HYPRE_BigInt base, HYPRE_Complex *values );
+HYPRE_Int hypre_ParVectorGetValuesHost(hypre_ParVector *vector, HYPRE_Int num_values,
+                                       HYPRE_BigInt *indices, HYPRE_BigInt base, HYPRE_Complex *values);
 HYPRE_Int hypre_ParVectorElmdivpy( hypre_ParVector *x, hypre_ParVector *b, hypre_ParVector *y );
-HYPRE_Int hypre_ParVectorElmdivpyMarked( hypre_ParVector *x, hypre_ParVector *b, hypre_ParVector *y, HYPRE_Int *marker, HYPRE_Int marker_val );
+HYPRE_Int hypre_ParVectorElmdivpyMarked( hypre_ParVector *x, hypre_ParVector *b,
+                                         hypre_ParVector *y, HYPRE_Int *marker,
+                                         HYPRE_Int marker_val );
 /* par_vector_device.c */
-HYPRE_Int hypre_ParVectorGetValuesDevice(hypre_ParVector *vector, HYPRE_Int num_values, HYPRE_BigInt *indices, HYPRE_BigInt base, HYPRE_Complex *values);
+HYPRE_Int hypre_ParVectorGetValuesDevice(hypre_ParVector *vector, HYPRE_Int num_values,
+                                         HYPRE_BigInt *indices, HYPRE_BigInt base,
+                                         HYPRE_Complex *values);
 
 #ifdef __cplusplus
 }
diff --git a/external/hypre/src/parcsr_mv/communicationT.c b/external/hypre/src/parcsr_mv/communicationT.c
index 2c9fff18..f9436d88 100644
--- a/external/hypre/src/parcsr_mv/communicationT.c
+++ b/external/hypre/src/parcsr_mv/communicationT.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -27,13 +27,16 @@ void hypre_RowsWithColumn_original
    *rowmin = num_rows;
    *rowmax = -1;
 
-   for ( i=0; i<num_rows; ++i ) {
+   for ( i = 0; i < num_rows; ++i )
+   {
       /* global number: row = i + firstRowIndex;*/
-      for ( j=mat_i[i]; j<mat_i[i+1]; ++j ) {
-         if ( (HYPRE_BigInt)mat_j[j]+firstColDiag==column ) {
+      for ( j = mat_i[i]; j < mat_i[i + 1]; ++j )
+      {
+         if ( (HYPRE_BigInt)mat_j[j] + firstColDiag == column )
+         {
             /* row i (local row number) has column mat_j[j] (local column number) */
-            *rowmin = i<*rowmin ? i : *rowmin;
-            *rowmax = i>*rowmax ? i : *rowmax;
+            *rowmin = i < *rowmin ? i : *rowmin;
+            *rowmax = i > *rowmax ? i : *rowmax;
             break;
          }
       }
@@ -42,22 +45,25 @@ void hypre_RowsWithColumn_original
    mat_j = hypre_CSRMatrixJ(offd);
    num_rows = hypre_CSRMatrixNumRows(offd);
    colMapOffd = hypre_ParCSRMatrixColMapOffd(A);
-   for ( i=0; i<num_rows; ++i ) {
+   for ( i = 0; i < num_rows; ++i )
+   {
       /* global number: row = i + firstRowIndex;*/
-      for ( j=mat_i[i]; j<mat_i[i+1]; ++j ) {
-         if ( colMapOffd[ mat_j[j] ]==column ) {
+      for ( j = mat_i[i]; j < mat_i[i + 1]; ++j )
+      {
+         if ( colMapOffd[ mat_j[j] ] == column )
+         {
             /* row i (local row number) has column mat_j[j] (local column number) */
-            *rowmin = i<*rowmin ? i : *rowmin;
-            *rowmax = i>*rowmax ? i : *rowmax;
+            *rowmin = i < *rowmin ? i : *rowmin;
+            *rowmax = i > *rowmax ? i : *rowmax;
             break;
          }
       }
    }
 
-/*      global col no.:  mat_j[j]+hypre_ParCSRMatrixFirstColDiag(A)
-                      or hypre_ParCSRMatrixColMapOffd(A)[ mat_j[j] ]
-        global row no.: i + hypre_ParCSRMatrixFirstRowIndex(A)
-*/
+   /*      global col no.:  mat_j[j]+hypre_ParCSRMatrixFirstColDiag(A)
+                         or hypre_ParCSRMatrixColMapOffd(A)[ mat_j[j] ]
+           global row no.: i + hypre_ParCSRMatrixFirstRowIndex(A)
+   */
 
 }
 
@@ -83,33 +89,39 @@ void hypre_RowsWithColumn
    *rowmin = num_rows_diag;
    *rowmax = -1;
 
-   for ( i=0; i<num_rows_diag; ++i ) {
+   for ( i = 0; i < num_rows_diag; ++i )
+   {
       /* global number: row = i + firstRowIndex;*/
-      for ( j=mat_i_diag[i]; j<mat_i_diag[i+1]; ++j ) {
-         if ( (HYPRE_BigInt)mat_j_diag[j]+firstColDiag==column ) {
+      for ( j = mat_i_diag[i]; j < mat_i_diag[i + 1]; ++j )
+      {
+         if ( (HYPRE_BigInt)mat_j_diag[j] + firstColDiag == column )
+         {
             /* row i (local row number) has column mat_j[j] (local column number) */
-            *rowmin = i<*rowmin ? i : *rowmin;
-            *rowmax = i>*rowmax ? i : *rowmax;
+            *rowmin = i < *rowmin ? i : *rowmin;
+            *rowmax = i > *rowmax ? i : *rowmax;
             break;
          }
       }
    }
-   for ( i=0; i<num_rows_diag; ++i ) {
+   for ( i = 0; i < num_rows_diag; ++i )
+   {
       /* global number: row = i + firstRowIndex;*/
-      for ( j=mat_i_offd[i]; j<mat_i_offd[i+1]; ++j ) {
-         if ( colMapOffd[ mat_j_offd[j] ]==column ) {
+      for ( j = mat_i_offd[i]; j < mat_i_offd[i + 1]; ++j )
+      {
+         if ( colMapOffd[ mat_j_offd[j] ] == column )
+         {
             /* row i (local row number) has column mat_j[j] (local column number) */
-            *rowmin = i<*rowmin ? i : *rowmin;
-            *rowmax = i>*rowmax ? i : *rowmax;
+            *rowmin = i < *rowmin ? i : *rowmin;
+            *rowmax = i > *rowmax ? i : *rowmax;
             break;
          }
       }
    }
 
-/*      global col no.:  mat_j[j]+hypre_ParCSRMatrixFirstColDiag(A)
-                      or hypre_ParCSRMatrixColMapOffd(A)[ mat_j[j] ]
-        global row no.: i + hypre_ParCSRMatrixFirstRowIndex(A)
-*/
+   /*      global col no.:  mat_j[j]+hypre_ParCSRMatrixFirstColDiag(A)
+                         or hypre_ParCSRMatrixColMapOffd(A)[ mat_j[j] ]
+           global row no.: i + hypre_ParCSRMatrixFirstRowIndex(A)
+   */
 
 }
 
@@ -124,7 +136,7 @@ void hypre_RowsWithColumn
 void
 hypre_MatTCommPkgCreate_core (
 
-/* input args: */
+   /* input args: */
    MPI_Comm comm, HYPRE_BigInt * col_map_offd, HYPRE_BigInt first_col_diag, HYPRE_BigInt *col_starts,
    HYPRE_Int num_rows_diag, HYPRE_Int num_cols_diag, HYPRE_Int num_cols_offd, HYPRE_BigInt *row_starts,
    HYPRE_BigInt firstColDiag, HYPRE_BigInt *colMapOffd,
@@ -132,25 +144,27 @@ hypre_MatTCommPkgCreate_core (
 
    HYPRE_Int data,  /* = 1 for a matrix with floating-point data, =0 for Boolean matrix */
 
-/* pointers to output args: */
+   /* pointers to output args: */
    HYPRE_Int * p_num_recvs, HYPRE_Int ** p_recv_procs, HYPRE_Int ** p_recv_vec_starts,
    HYPRE_Int * p_num_sends, HYPRE_Int ** p_send_procs, HYPRE_Int ** p_send_map_starts,
    HYPRE_Int ** p_send_map_elmts
 
-   )
+)
 {
-   HYPRE_Int			num_sends;
-   HYPRE_Int			*send_procs;
-   HYPRE_Int			*send_map_starts;
-   HYPRE_Int			*send_map_elmts;
-   HYPRE_Int			num_recvs;
-   HYPRE_Int			*recv_procs;
-   HYPRE_Int			*recv_vec_starts;
-   HYPRE_Int	i, j, j2, k, ir, rowmin, rowmax;
-   HYPRE_BigInt	*tmp, *recv_buf;
-   HYPRE_Int	*displs, *info, *send_buf, *all_num_sends3;
-   HYPRE_Int	num_procs, my_id, num_elmts;
-   HYPRE_Int	local_info, index, index2;
+   HYPRE_UNUSED_VAR(data);
+
+   HYPRE_Int         num_sends;
+   HYPRE_Int         *send_procs;
+   HYPRE_Int         *send_map_starts;
+   HYPRE_Int         *send_map_elmts;
+   HYPRE_Int         num_recvs;
+   HYPRE_Int         *recv_procs;
+   HYPRE_Int         *recv_vec_starts;
+   HYPRE_Int   i, j, j2, k, ir, rowmin, rowmax;
+   HYPRE_BigInt   *tmp, *recv_buf;
+   HYPRE_Int   *displs, *info, *send_buf, *all_num_sends3;
+   HYPRE_Int   num_procs, my_id, num_elmts;
+   HYPRE_Int   local_info, index, index2;
    HYPRE_Int pmatch, p;
    HYPRE_BigInt col, kc;
    HYPRE_Int * recv_sz_buf;
@@ -161,143 +175,153 @@ hypre_MatTCommPkgCreate_core (
 
    info = hypre_CTAlloc(HYPRE_Int,  num_procs, HYPRE_MEMORY_HOST);
 
-/* ----------------------------------------------------------------------
- * determine which processors to receive from (set proc_mark) and num_recvs,
- * at the end of the loop proc_mark[i] contains the number of elements to be
- * received from Proc. i
- *
- * - For A*b or A*B: for each off-diagonal column i of A, you want to identify
- * the processor which has the corresponding element i of b (row i of B)
- * (columns in the local diagonal block, just multiply local rows of B).
- * You do it by finding the processor which has that column of A in its
- * _diagonal_ block - assuming b or B is distributed the same, which I believe
- * is evenly among processors, by row.  There is a unique solution because
- * the diag/offd blocking is defined by which processor owns which rows of A.
- *
- * - For A*A^T: A^T is not distributed by rows as B or any 'normal' matrix is.
- * For each off-diagonal row,column k,i element of A, you want to identify
- * the processors which have the corresponding row,column i,j elements of A^T
- * i.e., row,column j,i elements of A (all i,j,k for which these entries are
- * nonzero, row k of A lives on this processor, and row j of A lives on
- * a different processor).  So, given a column i in the local A-offd or A-diag,
- * we want to find all the processors which have column i, in diag or offd
- * blocks.  Unlike the A*B case, I don't think you can eliminate looking at
- * any class of blocks.
- * ---------------------------------------------------------------------*/
-
-/* The algorithm for A*B was:
-   For each of my columns i (in offd block), use known information on data
-   distribution of columns in _diagonal_ blocks to find the processor p which
-   owns row i. (Note that for i in diag block, I own the row, nothing to do.)
-   Count up such i's for each processor in proc_mark.  Construct a data
-   structure, recv_buf, made by appending a structure tmp from each processor.
-   The data structure tmp looks like (p, no. of i's, i1, i2,...) (p=0,...) .
-   There are two communication steps: gather size information (local_info) from
-   all processors (into info), then gather the data (tmp) from all processors
-   (into recv_buf).  Then you go through recv_buf.  For each (sink) processor p
-   you search for for the appearance of my (source) processor number
-   (most of recv_buf pertains to other processors and is ignored).
-   When you find the appropriate section, pull out the i's, count them and
-   save them, in send_map_elmts, and save p in send_procs and index information
-   in send_map_starts.
-*/
-/* The algorithm for A*A^T:
-   [ Originally I had planned to figure out approximately which processors
-   had the information (for A*B it could be done exactly) to save on
-   communication.  But even for A*B where the data owner is known, all data is
-   sent to all processors, so that's not worth worrying about on the first cut.
-   One consequence is that proc_mark is not needed.]
-   Construct a data structure, recv_buf, made by appending a structure tmp for
-   each processor.  It simply consists of (no. of i's, i1, i2,...) where i is
-   the global number of a column in the offd block.  There are still two
-   communication steps: gather size information (local_info) from all processors
-   (into info), then gather the data (tmp) from all processors (into recv_buf).
-   Then you go through recv_buf.  For each (sink) processor p you go through
-   all its column numbers in recv_buf.  Check each one for whether you have
-   data in that column.  If so, put in in send_map_elmts, p in send_procs,
-   and update the index information in send_map_starts.  Note that these
-   arrays don't mean quite the same thing as for A*B.
-*/
-
-   num_recvs=num_procs-1;
+   /* ----------------------------------------------------------------------
+    * determine which processors to receive from (set proc_mark) and num_recvs,
+    * at the end of the loop proc_mark[i] contains the number of elements to be
+    * received from Proc. i
+    *
+    * - For A*b or A*B: for each off-diagonal column i of A, you want to identify
+    * the processor which has the corresponding element i of b (row i of B)
+    * (columns in the local diagonal block, just multiply local rows of B).
+    * You do it by finding the processor which has that column of A in its
+    * _diagonal_ block - assuming b or B is distributed the same, which I believe
+    * is evenly among processors, by row.  There is a unique solution because
+    * the diag/offd blocking is defined by which processor owns which rows of A.
+    *
+    * - For A*A^T: A^T is not distributed by rows as B or any 'normal' matrix is.
+    * For each off-diagonal row,column k,i element of A, you want to identify
+    * the processors which have the corresponding row,column i,j elements of A^T
+    * i.e., row,column j,i elements of A (all i,j,k for which these entries are
+    * nonzero, row k of A lives on this processor, and row j of A lives on
+    * a different processor).  So, given a column i in the local A-offd or A-diag,
+    * we want to find all the processors which have column i, in diag or offd
+    * blocks.  Unlike the A*B case, I don't think you can eliminate looking at
+    * any class of blocks.
+    * ---------------------------------------------------------------------*/
+
+   /* The algorithm for A*B was:
+      For each of my columns i (in offd block), use known information on data
+      distribution of columns in _diagonal_ blocks to find the processor p which
+      owns row i. (Note that for i in diag block, I own the row, nothing to do.)
+      Count up such i's for each processor in proc_mark.  Construct a data
+      structure, recv_buf, made by appending a structure tmp from each processor.
+      The data structure tmp looks like (p, no. of i's, i1, i2,...) (p=0,...) .
+      There are two communication steps: gather size information (local_info) from
+      all processors (into info), then gather the data (tmp) from all processors
+      (into recv_buf).  Then you go through recv_buf.  For each (sink) processor p
+      you search for for the appearance of my (source) processor number
+      (most of recv_buf pertains to other processors and is ignored).
+      When you find the appropriate section, pull out the i's, count them and
+      save them, in send_map_elmts, and save p in send_procs and index information
+      in send_map_starts.
+   */
+   /* The algorithm for A*A^T:
+      [ Originally I had planned to figure out approximately which processors
+      had the information (for A*B it could be done exactly) to save on
+      communication.  But even for A*B where the data owner is known, all data is
+      sent to all processors, so that's not worth worrying about on the first cut.
+      One consequence is that proc_mark is not needed.]
+      Construct a data structure, recv_buf, made by appending a structure tmp for
+      each processor.  It simply consists of (no. of i's, i1, i2,...) where i is
+      the global number of a column in the offd block.  There are still two
+      communication steps: gather size information (local_info) from all processors
+      (into info), then gather the data (tmp) from all processors (into recv_buf).
+      Then you go through recv_buf.  For each (sink) processor p you go through
+      all its column numbers in recv_buf.  Check each one for whether you have
+      data in that column.  If so, put in in send_map_elmts, p in send_procs,
+      and update the index information in send_map_starts.  Note that these
+      arrays don't mean quite the same thing as for A*B.
+   */
+
+   num_recvs = num_procs - 1;
    local_info = num_procs + num_cols_offd + num_cols_diag;
 
    hypre_MPI_Allgather(&local_info, 1, HYPRE_MPI_INT, info, 1, HYPRE_MPI_INT, comm);
 
-/* ----------------------------------------------------------------------
- * generate information to be send: tmp contains for each recv_proc:
- * {deleted: id of recv_procs}, number of elements to be received for this processor,
- * indices of elements (in this order)
- * ---------------------------------------------------------------------*/
+   /* ----------------------------------------------------------------------
+    * generate information to be send: tmp contains for each recv_proc:
+    * {deleted: id of recv_procs}, number of elements to be received for this processor,
+    * indices of elements (in this order)
+    * ---------------------------------------------------------------------*/
 
-   displs = hypre_CTAlloc(HYPRE_Int,  num_procs+1, HYPRE_MEMORY_HOST);
+   displs = hypre_CTAlloc(HYPRE_Int,  num_procs + 1, HYPRE_MEMORY_HOST);
    displs[0] = 0;
-   for (i=1; i < num_procs+1; i++)
-	displs[i] = displs[i-1]+info[i-1];
+   for (i = 1; i < num_procs + 1; i++)
+   {
+      displs[i] = displs[i - 1] + info[i - 1];
+   }
    recv_buf = hypre_CTAlloc(HYPRE_BigInt,  displs[num_procs], HYPRE_MEMORY_HOST);
    tmp = hypre_CTAlloc(HYPRE_BigInt,  local_info, HYPRE_MEMORY_HOST);
 
    j = 0;
-   for (i=0; i < num_procs; i++) {
+   for (i = 0; i < num_procs; i++)
+   {
       j2 = j++;
       tmp[j2] = 0;
-      for (k=0; k < num_cols_offd; k++)
+      for (k = 0; k < num_cols_offd; k++)
          if (col_map_offd[k] >= col_starts[i] &&
-             col_map_offd[k] < col_starts[i+1]) {
+             col_map_offd[k] < col_starts[i + 1])
+         {
             tmp[j++] = col_map_offd[k];
             ++(tmp[j2]);
          };
-      for (k=0; k < num_cols_diag; k++)
-         if ( (HYPRE_BigInt)k+first_col_diag >= col_starts[i] &&
-              (HYPRE_BigInt)k+first_col_diag < col_starts[i+1] ) {
+      for (k = 0; k < num_cols_diag; k++)
+         if ( (HYPRE_BigInt)k + first_col_diag >= col_starts[i] &&
+              (HYPRE_BigInt)k + first_col_diag < col_starts[i + 1] )
+         {
             tmp[j++] = (HYPRE_BigInt)k + first_col_diag;
             ++(tmp[j2]);
          }
    }
 
-   hypre_MPI_Allgatherv(tmp,local_info,HYPRE_MPI_BIG_INT,recv_buf,info,displs,HYPRE_MPI_INT,comm);
-
-
-/* ----------------------------------------------------------------------
- * determine send_procs and actual elements to be send (in send_map_elmts)
- * and send_map_starts whose i-th entry points to the beginning of the
- * elements to be send to proc. i
- * ---------------------------------------------------------------------*/
-/* Meanings of arrays being set here, more verbosely stated:
-   send_procs: processors p to send to
-   send_map_starts: for each p, gives range of indices in send_map_elmts;
-   send_map_elmts:  Each element is a send_map_elmts[i], with i in a range given
-     by send_map_starts[p..p+1], for some p. This element is is the global
-     column number for a column in the offd block of p which is to be multiplied
-     by data from this processor.
-     For A*B, send_map_elmts[i] is therefore a row of B belonging to this
-     processor, to be sent to p.  For A*A^T, send_map_elmts[i] is a row of A
-     belonging to this processor, to be sent to p; this row was selected
-     because it has a nonzero on a _column_ needed by p.
-*/
+   hypre_MPI_Allgatherv(tmp, local_info, HYPRE_MPI_BIG_INT,
+                        recv_buf, info, displs, HYPRE_MPI_BIG_INT,
+                        comm);
+
+   /* ----------------------------------------------------------------------
+    * determine send_procs and actual elements to be send (in send_map_elmts)
+    * and send_map_starts whose i-th entry points to the beginning of the
+    * elements to be send to proc. i
+    * ---------------------------------------------------------------------*/
+   /* Meanings of arrays being set here, more verbosely stated:
+      send_procs: processors p to send to
+      send_map_starts: for each p, gives range of indices in send_map_elmts;
+      send_map_elmts:  Each element is a send_map_elmts[i], with i in a range given
+        by send_map_starts[p..p+1], for some p. This element is is the global
+        column number for a column in the offd block of p which is to be multiplied
+        by data from this processor.
+        For A*B, send_map_elmts[i] is therefore a row of B belonging to this
+        processor, to be sent to p.  For A*A^T, send_map_elmts[i] is a row of A
+        belonging to this processor, to be sent to p; this row was selected
+        because it has a nonzero on a _column_ needed by p.
+   */
    num_sends = num_procs;   /* may turn out to be less, but we can't know yet */
-   num_elmts = (num_procs-1)*num_rows_diag;
+   num_elmts = (num_procs - 1) * num_rows_diag;
    /* ... a crude upper bound; should try to do better even if more comm required */
    send_procs = hypre_CTAlloc(HYPRE_Int,  num_sends, HYPRE_MEMORY_HOST);
-   send_map_starts = hypre_CTAlloc(HYPRE_Int,  num_sends+1, HYPRE_MEMORY_HOST);
+   send_map_starts = hypre_CTAlloc(HYPRE_Int,  num_sends + 1, HYPRE_MEMORY_HOST);
    send_map_elmts = hypre_CTAlloc(HYPRE_Int,  num_elmts, HYPRE_MEMORY_HOST);
    row_marker = hypre_CTAlloc(HYPRE_Int, num_rows_diag, HYPRE_MEMORY_HOST);
 
    index = 0;
    index2 = 0;
    send_map_starts[0] = 0;
-   for (i=0; i < num_procs; i++) {
-      send_map_starts[index+1] = send_map_starts[index];
+   for (i = 0; i < num_procs; i++)
+   {
+      send_map_starts[index + 1] = send_map_starts[index];
       j = displs[i];
       pmatch = 0;
-      for ( ir=0; ir<num_rows_diag; ++ir ) row_marker[ir] = 0;
-      while ( j < displs[i+1])
+      for ( ir = 0; ir < num_rows_diag; ++ir ) { row_marker[ir] = 0; }
+      while ( j < displs[i + 1])
       {
          num_elmts = recv_buf[j++];  /* no. of columns proc. i wants */
-         for ( k=0; k<num_elmts; k++ ) {
+         for ( k = 0; k < num_elmts; k++ )
+         {
             col = recv_buf[j++]; /* a global column no. at proc. i */
-            for ( kc=0; kc<num_cols_offd; kc++ ) {
-               if ( col_map_offd[kc]==col && i!=my_id ) {
+            for ( kc = 0; kc < num_cols_offd; kc++ )
+            {
+               if ( col_map_offd[kc] == col && i != my_id )
+               {
                   /* this processor has the same column as proc. i (but is different) */
                   pmatch = 1;
                   send_procs[index] = i;
@@ -307,51 +331,57 @@ hypre_MatTCommPkgCreate_core (
                      send_map_elmts[index2++] = col - offset; */
                   /* Plan to send all of my rows which use this column... */
                   hypre_RowsWithColumn( &rowmin, &rowmax, col,
-                                  num_rows_diag,
-                                  firstColDiag, colMapOffd,
-                                  mat_i_diag, mat_j_diag, mat_i_offd, mat_j_offd
-                     );
-                  for ( ir=rowmin; ir<=rowmax; ++ir ) {
-                     if ( row_marker[ir]==0 ) {
+                                        num_rows_diag,
+                                        firstColDiag, colMapOffd,
+                                        mat_i_diag, mat_j_diag, mat_i_offd, mat_j_offd
+                                      );
+                  for ( ir = rowmin; ir <= rowmax; ++ir )
+                  {
+                     if ( row_marker[ir] == 0 )
+                     {
                         row_marker[ir] = 1;
-                        ++send_map_starts[index+1];
+                        ++send_map_starts[index + 1];
                         send_map_elmts[index2++] = ir;
                      }
                   }
                }
             }
-/* alternative way of doing the following for-loop:
-            for ( kc=0; kc<num_cols_diag; kc++ ) {
-               if ( kc+first_col_diag==col && i!=my_id ) {
-               / * this processor has the same column as proc. i (but is different) * /
-                  pmatch = 1;
-/ * this would be right if we could send columns, but we can't ... * /
-                  send_procs[index] = i;
-                  ++send_map_starts[index+1];
-                  send_map_elmts[index2++] = col - offset;
-                  / * Plan to send all of my rows which use this column... * /
-                  / * NOT DONE * /
-               }
-            }
-*/
-            for ( kc=row_starts[my_id]; kc<row_starts[my_id+1]; kc++ ) {
-               if ( kc==col && i!=my_id ) {
+            /* alternative way of doing the following for-loop:
+                        for ( kc=0; kc<num_cols_diag; kc++ ) {
+                           if ( kc+first_col_diag==col && i!=my_id ) {
+                           / * this processor has the same column as proc. i (but is different) * /
+                              pmatch = 1;
+            / * this would be right if we could send columns, but we can't ... * /
+                              send_procs[index] = i;
+                              ++send_map_starts[index+1];
+                              send_map_elmts[index2++] = col - offset;
+                              / * Plan to send all of my rows which use this column... * /
+                              / * NOT DONE * /
+                           }
+                        }
+            */
+            for ( kc = row_starts[my_id]; kc < row_starts[my_id + 1]; kc++ )
+            {
+               if ( kc == col && i != my_id )
+               {
                   /* this processor has the same column as proc. i (but is different) */
                   pmatch = 1;
                   send_procs[index] = i;
-/* this would be right if we could send columns, but we can't ...
-                  ++send_map_starts[index+1];
-                  send_map_elmts[index2++] = col - offset;*/
+                  /* this would be right if we could send columns, but we can't ...
+                                    ++send_map_starts[index+1];
+                                    send_map_elmts[index2++] = col - offset;*/
                   /* Plan to send all of my rows which use this column... */
                   hypre_RowsWithColumn( &rowmin, &rowmax, col,
-                                  num_rows_diag,
-                                  firstColDiag, colMapOffd,
-                                  mat_i_diag, mat_j_diag, mat_i_offd, mat_j_offd
-                     );
-                  for ( ir=rowmin; ir<=rowmax; ++ir ) {
-                     if ( row_marker[ir]==0 ) {
+                                        num_rows_diag,
+                                        firstColDiag, colMapOffd,
+                                        mat_i_diag, mat_j_diag, mat_i_offd, mat_j_offd
+                                      );
+                  for ( ir = rowmin; ir <= rowmax; ++ir )
+                  {
+                     if ( row_marker[ir] == 0 )
+                     {
                         row_marker[ir] = 1;
-                        ++send_map_starts[index+1];
+                        ++send_map_starts[index + 1];
                         send_map_elmts[index2++] = ir;
                      }
                   }
@@ -359,91 +389,96 @@ hypre_MatTCommPkgCreate_core (
             }
          }
       }
-      if ( pmatch ) index++;
+      if ( pmatch ) { index++; }
    }
    num_sends = index;  /* no. of proc. rows will be sent to */
 
-/* Compute receive arrays recv_procs, recv_vec_starts ... */
+   /* Compute receive arrays recv_procs, recv_vec_starts ... */
    recv_procs = hypre_CTAlloc(HYPRE_Int,  num_recvs, HYPRE_MEMORY_HOST);
-   recv_vec_starts = hypre_CTAlloc(HYPRE_Int,  num_recvs+1, HYPRE_MEMORY_HOST);
+   recv_vec_starts = hypre_CTAlloc(HYPRE_Int,  num_recvs + 1, HYPRE_MEMORY_HOST);
    j2 = 0;
-   for (i=0; i < num_procs; i++) {
-      if ( i!=my_id ) { recv_procs[j2] = i; j2++; };
+   for (i = 0; i < num_procs; i++)
+   {
+      if ( i != my_id ) { recv_procs[j2] = i; j2++; };
    };
 
-/* Compute recv_vec_starts.
-   The real job is, for each processor p, to figure out how many rows
-   p will send to me (me=this processor).  I now know how many (and which)
-   rows I will send to each p.  Indeed, if send_procs[index]=p, then the
-   number is send_map_starts[index+1]-send_map_starts[index].
-   More communication is needed.
-   options:
-   hypre_MPI_Allgather of communication sizes. <--- my choice, for now
-     good: simple   bad: send num_procs*num_sends data, only need num_procs
-                    but: not that much data compared to previous communication
-   hypre_MPI_Allgatherv of communication sizes, only for pairs of procs. that communicate
-     good: less data than above   bad: need extra commun. step to get recvcounts
-   hypre_MPI_ISend,hypre_MPI_IRecv of each size, separately between each pair of procs.
-     good: no excess data sent   bad: lots of little messages
-                                 but: Allgather might be done the same under the hood
-     may be much slower than Allgather or may be a bit faster depending on
-     implementations
-*/
-   send_buf = hypre_CTAlloc( HYPRE_Int,  3*num_sends , HYPRE_MEMORY_HOST);
-   all_num_sends3 = hypre_CTAlloc( HYPRE_Int,  num_procs , HYPRE_MEMORY_HOST);
+   /* Compute recv_vec_starts.
+      The real job is, for each processor p, to figure out how many rows
+      p will send to me (me=this processor).  I now know how many (and which)
+      rows I will send to each p.  Indeed, if send_procs[index]=p, then the
+      number is send_map_starts[index+1]-send_map_starts[index].
+      More communication is needed.
+      options:
+      hypre_MPI_Allgather of communication sizes. <--- my choice, for now
+        good: simple   bad: send num_procs*num_sends data, only need num_procs
+                       but: not that much data compared to previous communication
+      hypre_MPI_Allgatherv of communication sizes, only for pairs of procs. that communicate
+        good: less data than above   bad: need extra commun. step to get recvcounts
+      hypre_MPI_ISend,hypre_MPI_IRecv of each size, separately between each pair of procs.
+        good: no excess data sent   bad: lots of little messages
+                                    but: Allgather might be done the same under the hood
+        may be much slower than Allgather or may be a bit faster depending on
+        implementations
+   */
+   send_buf = hypre_CTAlloc( HYPRE_Int,  3 * num_sends, HYPRE_MEMORY_HOST);
+   all_num_sends3 = hypre_CTAlloc( HYPRE_Int,  num_procs, HYPRE_MEMORY_HOST);
 
    /* scatter-gather num_sends, to set up the size for the main comm. step */
-   i = 3*num_sends;
+   i = 3 * num_sends;
    hypre_MPI_Allgather( &i, 1, HYPRE_MPI_INT, all_num_sends3, 1, HYPRE_MPI_INT, comm );
    displs[0] = 0;
-   for ( p=0; p<num_procs; ++p ) {
-      displs[p+1] = displs[p] + all_num_sends3[p];
+   for ( p = 0; p < num_procs; ++p )
+   {
+      displs[p + 1] = displs[p] + all_num_sends3[p];
    };
-   recv_sz_buf = hypre_CTAlloc( HYPRE_Int,  displs[num_procs] , HYPRE_MEMORY_HOST);
+   recv_sz_buf = hypre_CTAlloc( HYPRE_Int,  displs[num_procs], HYPRE_MEMORY_HOST);
 
    /* scatter-gather size of row info to send, and proc. to send to */
    index = 0;
-   for ( i=0; i<num_sends; ++i ) {
+   for ( i = 0; i < num_sends; ++i )
+   {
       send_buf[index++] = send_procs[i];   /* processor to send to */
       send_buf[index++] = my_id;
-      send_buf[index++] = send_map_starts[i+1] - send_map_starts[i];
+      send_buf[index++] = send_map_starts[i + 1] - send_map_starts[i];
       /* ... sizes of info to send */
    };
 
-   hypre_MPI_Allgatherv( send_buf, 3*num_sends, HYPRE_MPI_INT,
-                   recv_sz_buf, all_num_sends3, displs, HYPRE_MPI_INT, comm);
+   hypre_MPI_Allgatherv( send_buf, 3 * num_sends, HYPRE_MPI_INT,
+                         recv_sz_buf, all_num_sends3, displs, HYPRE_MPI_INT, comm);
 
    recv_vec_starts[0] = 0;
    j2 = 0;  j = 0;
-   for ( i=0; i<displs[num_procs]; i=i+3 ) {
+   for ( i = 0; i < displs[num_procs]; i = i + 3 )
+   {
       j = i;
-      if ( recv_sz_buf[j++]==my_id ) {
+      if ( recv_sz_buf[j++] == my_id )
+      {
          recv_procs[j2] = recv_sz_buf[j++];
-         recv_vec_starts[j2+1] = recv_vec_starts[j2] + recv_sz_buf[j++];
+         recv_vec_starts[j2 + 1] = recv_vec_starts[j2] + recv_sz_buf[j++];
          j2++;
       }
    }
    num_recvs = j2;
 
 #if 0
-   hypre_printf("num_procs=%i send_map_starts (%i):",num_procs,num_sends+1);
-   for( i=0; i<=num_sends; ++i ) hypre_printf(" %i", send_map_starts[i] );
-   hypre_printf("  send_procs (%i):",num_sends);
-   for( i=0; i<num_sends; ++i ) hypre_printf(" %i", send_procs[i] );
+   hypre_printf("num_procs=%i send_map_starts (%i):", num_procs, num_sends + 1);
+   for ( i = 0; i <= num_sends; ++i ) { hypre_printf(" %i", send_map_starts[i] ); }
+   hypre_printf("  send_procs (%i):", num_sends);
+   for ( i = 0; i < num_sends; ++i ) { hypre_printf(" %i", send_procs[i] ); }
    hypre_printf("\n");
    hypre_printf("my_id=%i num_sends=%i send_buf[0,1,2]=%i %i %i",
-          my_id, num_sends, send_buf[0], send_buf[1], send_buf[2] );
+                my_id, num_sends, send_buf[0], send_buf[1], send_buf[2] );
    hypre_printf(" all_num_sends3[0,1]=%i %i\n", all_num_sends3[0], all_num_sends3[1] );
    hypre_printf("my_id=%i rcv_sz_buf (%i):", my_id, displs[num_procs] );
-   for( i=0; i<displs[num_procs]; ++i ) hypre_printf(" %i", recv_sz_buf[i] );
+   for ( i = 0; i < displs[num_procs]; ++i ) { hypre_printf(" %i", recv_sz_buf[i] ); }
    hypre_printf("\n");
-   hypre_printf("my_id=%i recv_vec_starts (%i):",my_id,num_recvs+1);
-   for( i=0; i<=num_recvs; ++i ) hypre_printf(" %i", recv_vec_starts[i] );
-   hypre_printf("  recv_procs (%i):",num_recvs);
-   for( i=0; i<num_recvs; ++i ) hypre_printf(" %i", recv_procs[i] );
+   hypre_printf("my_id=%i recv_vec_starts (%i):", my_id, num_recvs + 1);
+   for ( i = 0; i <= num_recvs; ++i ) { hypre_printf(" %i", recv_vec_starts[i] ); }
+   hypre_printf("  recv_procs (%i):", num_recvs);
+   for ( i = 0; i < num_recvs; ++i ) { hypre_printf(" %i", recv_procs[i] ); }
    hypre_printf("\n");
    hypre_printf("my_id=%i num_recvs=%i recv_sz_buf[0,1,2]=%i %i %i\n",
-          my_id, num_recvs, recv_sz_buf[0], recv_sz_buf[1], recv_sz_buf[2] );
+                my_id, num_recvs, recv_sz_buf[0], recv_sz_buf[1], recv_sz_buf[2] );
 #endif
 
    hypre_TFree(send_buf, HYPRE_MEMORY_HOST);
@@ -478,58 +513,47 @@ hypre_MatTCommPkgCreate_core (
 HYPRE_Int
 hypre_MatTCommPkgCreate ( hypre_ParCSRMatrix *A)
 {
-   hypre_ParCSRCommPkg	*comm_pkg;
-
-   MPI_Comm             comm = hypre_ParCSRMatrixComm(A);
-/*   hypre_MPI_Datatype         *recv_mpi_types;
-   hypre_MPI_Datatype         *send_mpi_types;
-*/
-   HYPRE_Int			num_sends;
-   HYPRE_Int			*send_procs;
-   HYPRE_Int			*send_map_starts;
-   HYPRE_Int			*send_map_elmts;
-   HYPRE_Int			num_recvs;
-   HYPRE_Int			*recv_procs;
-   HYPRE_Int			*recv_vec_starts;
-
-   HYPRE_BigInt  *col_map_offd = hypre_ParCSRMatrixColMapOffd(A);
-   HYPRE_BigInt  first_col_diag = hypre_ParCSRMatrixFirstColDiag(A);
-   HYPRE_BigInt  *col_starts = hypre_ParCSRMatrixColStarts(A);
-
-   HYPRE_Int	ierr = 0;
-   HYPRE_Int	num_rows_diag = hypre_CSRMatrixNumRows(hypre_ParCSRMatrixDiag(A));
-   HYPRE_Int	num_cols_diag = hypre_CSRMatrixNumCols(hypre_ParCSRMatrixDiag(A));
-   HYPRE_Int	num_cols_offd = hypre_CSRMatrixNumCols(hypre_ParCSRMatrixOffd(A));
-   HYPRE_BigInt * row_starts = hypre_ParCSRMatrixRowStarts(A);
+   MPI_Comm          comm           = hypre_ParCSRMatrixComm(A);
+   HYPRE_BigInt     *col_map_offd   = hypre_ParCSRMatrixColMapOffd(A);
+   HYPRE_BigInt      first_col_diag = hypre_ParCSRMatrixFirstColDiag(A);
+   HYPRE_BigInt     *row_starts     = hypre_ParCSRMatrixRowStarts(A);
+   HYPRE_BigInt     *col_starts     = hypre_ParCSRMatrixColStarts(A);
+   HYPRE_Int         num_rows_diag  = hypre_CSRMatrixNumRows(hypre_ParCSRMatrixDiag(A));
+   HYPRE_Int         num_cols_diag  = hypre_CSRMatrixNumCols(hypre_ParCSRMatrixDiag(A));
+   HYPRE_Int         num_cols_offd  = hypre_CSRMatrixNumCols(hypre_ParCSRMatrixOffd(A));
+
+   HYPRE_Int         num_sends;
+   HYPRE_Int        *send_procs;
+   HYPRE_Int        *send_map_starts;
+   HYPRE_Int        *send_map_elmts;
+   HYPRE_Int         num_recvs;
+   HYPRE_Int        *recv_procs;
+   HYPRE_Int        *recv_vec_starts;
+
+   hypre_ParCSRCommPkg  *comm_pkg = NULL;
 
    hypre_MatTCommPkgCreate_core (
       comm, col_map_offd, first_col_diag, col_starts,
       num_rows_diag, num_cols_diag, num_cols_offd, row_starts,
-                                  hypre_ParCSRMatrixFirstColDiag(A),
-                                  hypre_ParCSRMatrixColMapOffd(A),
-                                  hypre_CSRMatrixI( hypre_ParCSRMatrixDiag(A) ),
-                                  hypre_CSRMatrixJ( hypre_ParCSRMatrixDiag(A) ),
-                                  hypre_CSRMatrixI( hypre_ParCSRMatrixOffd(A) ),
+      first_col_diag, col_map_offd,
+      hypre_CSRMatrixI( hypre_ParCSRMatrixDiag(A) ),
+      hypre_CSRMatrixJ( hypre_ParCSRMatrixDiag(A) ),
+      hypre_CSRMatrixI( hypre_ParCSRMatrixOffd(A) ),
       hypre_CSRMatrixJ( hypre_ParCSRMatrixOffd(A) ),
       1,
       &num_recvs, &recv_procs, &recv_vec_starts,
       &num_sends, &send_procs, &send_map_starts,
       &send_map_elmts
-      );
-
-   comm_pkg = hypre_CTAlloc(hypre_ParCSRCommPkg,  1, HYPRE_MEMORY_HOST);
-
-   hypre_ParCSRCommPkgComm(comm_pkg) = comm;
+   );
 
-   hypre_ParCSRCommPkgNumRecvs(comm_pkg) = num_recvs;
-   hypre_ParCSRCommPkgRecvProcs(comm_pkg) = recv_procs;
-   hypre_ParCSRCommPkgRecvVecStarts(comm_pkg) = recv_vec_starts;
-   hypre_ParCSRCommPkgNumSends(comm_pkg) = num_sends;
-   hypre_ParCSRCommPkgSendProcs(comm_pkg) = send_procs;
-   hypre_ParCSRCommPkgSendMapStarts(comm_pkg) = send_map_starts;
-   hypre_ParCSRCommPkgSendMapElmts(comm_pkg) = send_map_elmts;
+   /* Fill the communication package */
+   hypre_ParCSRCommPkgCreateAndFill(comm,
+                                    num_recvs, recv_procs, recv_vec_starts,
+                                    num_sends, send_procs, send_map_starts,
+                                    send_map_elmts,
+                                    &comm_pkg);
 
    hypre_ParCSRMatrixCommPkgT(A) = comm_pkg;
 
-   return ierr;
+   return hypre_error_flag;
 }
diff --git a/external/hypre/src/parcsr_mv/driver.c b/external/hypre/src/parcsr_mv/driver.c
index 70bf9aea..c0cc5af2 100644
--- a/external/hypre/src/parcsr_mv/driver.c
+++ b/external/hypre/src/parcsr_mv/driver.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -20,13 +20,13 @@ main( HYPRE_Int   argc,
    hypre_ParVector   *tmp_vector;
 
    HYPRE_Int          num_procs, my_id;
-   HYPRE_BigInt 	global_size = 20;
-   HYPRE_Int		local_size;
-   HYPRE_BigInt		first_index;
-   HYPRE_Int 		i;
-   HYPRE_BigInt 	*partitioning;
-   HYPRE_Complex	prod;
-   HYPRE_Complex 	*data, *data2;
+   HYPRE_BigInt   global_size = 20;
+   HYPRE_Int      local_size;
+   HYPRE_BigInt      first_index;
+   HYPRE_Int      i;
+   HYPRE_BigInt   *partitioning;
+   HYPRE_Complex  prod;
+   HYPRE_Complex  *data, *data2;
    hypre_Vector *vector;
    hypre_Vector *local_vector;
    hypre_Vector *local_vector2;
@@ -40,7 +40,7 @@ main( HYPRE_Int   argc,
    hypre_printf(" my_id: %d num_procs: %d\n", my_id, num_procs);
 
    partitioning = NULL;
-   vector1 = hypre_ParVectorCreate(hypre_MPI_COMM_WORLD,global_size,partitioning);
+   vector1 = hypre_ParVectorCreate(hypre_MPI_COMM_WORLD, global_size, partitioning);
    partitioning = hypre_ParVectorPartitioning(vector1);
    hypre_ParVectorInitialize(vector1);
    local_vector = hypre_ParVectorLocalVector(vector1);
@@ -48,24 +48,28 @@ main( HYPRE_Int   argc,
    local_size = hypre_VectorSize(local_vector);
    first_index = partitioning[my_id];
 
-   for (i=0; i < local_size; i++)
-   	data[i] = first_index+i;
-/*
-   hypre_ParVectorPrint(vector1, "Vector");
-*/
+   for (i = 0; i < local_size; i++)
+   {
+      data[i] = first_index + i;
+   }
+   /*
+      hypre_ParVectorPrint(vector1, "Vector");
+   */
    local_vector2 = hypre_SeqVectorCreate(global_size);
    hypre_SeqVectorInitialize(local_vector2);
    data2 = hypre_VectorData(local_vector2);
-   for (i=0; i < global_size; i++)
-	data2[i] = i+1;
-
-/*   partitioning = hypre_CTAlloc(HYPRE_Int,4);
-   partitioning[0] = 0;
-   partitioning[1] = 10;
-   partitioning[2] = 10;
-   partitioning[3] = 20;
-*/
-   vector2 = hypre_VectorToParVector(hypre_MPI_COMM_WORLD,local_vector2,partitioning);
+   for (i = 0; i < global_size; i++)
+   {
+      data2[i] = i + 1;
+   }
+
+   /*   partitioning = hypre_CTAlloc(HYPRE_Int,4);
+      partitioning[0] = 0;
+      partitioning[1] = 10;
+      partitioning[2] = 10;
+      partitioning[3] = 20;
+   */
+   vector2 = hypre_VectorToParVector(hypre_MPI_COMM_WORLD, local_vector2, partitioning);
 
    hypre_ParVectorPrint(vector2, "Convert");
 
@@ -76,29 +80,29 @@ main( HYPRE_Int   argc,
     *-----------------------------------------------------------*/
 
    tmp_vector = hypre_ParVectorRead(hypre_MPI_COMM_WORLD, "Convert");
-/*
-   tmp_vector = hypre_ParVectorCreate(hypre_MPI_COMM_WORLD,global_size,partitioning);
-   hypre_ParVectorInitialize(tmp_vector);
-   hypre_ParVectorCopy(vector1, tmp_vector);
+   /*
+      tmp_vector = hypre_ParVectorCreate(hypre_MPI_COMM_WORLD,global_size,partitioning);
+      hypre_ParVectorInitialize(tmp_vector);
+      hypre_ParVectorCopy(vector1, tmp_vector);
 
-   hypre_ParVectorPrint(tmp_vector,"Copy");
-*/
+      hypre_ParVectorPrint(tmp_vector,"Copy");
+   */
    /*-----------------------------------------------------------
     * Scale tmp_vector
     *-----------------------------------------------------------*/
 
    hypre_ParVectorScale(2.0, tmp_vector);
-/*
-   hypre_ParVectorPrint(tmp_vector,"Scale");
-*/
+   /*
+      hypre_ParVectorPrint(tmp_vector,"Scale");
+   */
    /*-----------------------------------------------------------
     * Do an Axpy (2*vector - vector) = vector
     *-----------------------------------------------------------*/
 
    hypre_ParVectorAxpy(-1.0, vector1, tmp_vector);
-/*
-   hypre_ParVectorPrint(tmp_vector,"Axpy");
-*/
+   /*
+      hypre_ParVectorPrint(tmp_vector,"Axpy");
+   */
    /*-----------------------------------------------------------
     * Do an inner product vector* tmp_vector
     *-----------------------------------------------------------*/
@@ -115,7 +119,7 @@ main( HYPRE_Int   argc,
    hypre_ParVectorDestroy(vector2);
    hypre_ParVectorDestroy(tmp_vector);
    hypre_SeqVectorDestroy(local_vector2);
-   if (vector) hypre_SeqVectorDestroy(vector);
+   if (vector) { hypre_SeqVectorDestroy(vector); }
 
    /* Finalize MPI */
    hypre_MPI_Finalize();
diff --git a/external/hypre/src/parcsr_mv/driver_aat.c b/external/hypre/src/parcsr_mv/driver_aat.c
index f2cd2672..091c3c3f 100644
--- a/external/hypre/src/parcsr_mv/driver_aat.c
+++ b/external/hypre/src/parcsr_mv/driver_aat.c
@@ -1,16 +1,16 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
  ******************************************************************************/
 
-#include "_hypre_parcsr_mv.h" 
- 
+#include "_hypre_parcsr_mv.h"
+
 /*--------------------------------------------------------------------------
  * Test driver for unstructured matrix interface , A * A^T
  *--------------------------------------------------------------------------*/
- 
+
 HYPRE_Int
 main( HYPRE_Int   argc,
       char *argv[] )
@@ -24,18 +24,18 @@ main( HYPRE_Int   argc,
    /* Initialize MPI */
    hypre_MPI_Init(&argc, &argv);
 
-   hypre_MPI_Comm_size(hypre_MPI_COMM_WORLD,&num_procs);
-   hypre_MPI_Comm_rank(hypre_MPI_COMM_WORLD,&my_id);
+   hypre_MPI_Comm_size(hypre_MPI_COMM_WORLD, &num_procs);
+   hypre_MPI_Comm_rank(hypre_MPI_COMM_WORLD, &my_id);
    row_starts = NULL;
    col_starts = NULL;
 
    if (my_id == 0)
    {
-   	As = hypre_CSRMatrixRead("inpr");
-   	hypre_printf(" read input A\n");
+      As = hypre_CSRMatrixRead("inpr");
+      hypre_printf(" read input A\n");
    }
    A = hypre_CSRMatrixToParCSRMatrix(hypre_MPI_COMM_WORLD, As, row_starts,
-	col_starts);
+                                     col_starts);
    row_starts = hypre_ParCSRMatrixRowStarts(A);
    col_starts = hypre_ParCSRMatrixColStarts(A);
 
@@ -47,7 +47,7 @@ main( HYPRE_Int   argc,
 
    if (my_id == 0)
    {
-	hypre_CSRMatrixDestroy(As);
+      hypre_CSRMatrixDestroy(As);
    }
    hypre_ParCSRMatrixDestroy(A);
    hypre_ParCSRMatrixDestroy(C);
diff --git a/external/hypre/src/parcsr_mv/driver_boolaat.c b/external/hypre/src/parcsr_mv/driver_boolaat.c
index a75d35f5..361cc2d0 100644
--- a/external/hypre/src/parcsr_mv/driver_boolaat.c
+++ b/external/hypre/src/parcsr_mv/driver_boolaat.c
@@ -1,16 +1,16 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
  ******************************************************************************/
 
-#include "_hypre_parcsr_mv.h" 
- 
+#include "_hypre_parcsr_mv.h"
+
 /*--------------------------------------------------------------------------
  * Test driver for unstructured Boolean matrix interface , A * A^T
  *--------------------------------------------------------------------------*/
- 
+
 HYPRE_Int
 main( HYPRE_Int   argc,
       char *argv[] )
@@ -24,18 +24,18 @@ main( HYPRE_Int   argc,
    /* Initialize MPI */
    hypre_MPI_Init(&argc, &argv);
 
-   hypre_MPI_Comm_size(hypre_MPI_COMM_WORLD,&num_procs);
-   hypre_MPI_Comm_rank(hypre_MPI_COMM_WORLD,&my_id);
+   hypre_MPI_Comm_size(hypre_MPI_COMM_WORLD, &num_procs);
+   hypre_MPI_Comm_rank(hypre_MPI_COMM_WORLD, &my_id);
    row_starts = NULL;
    col_starts = NULL;
 
    if (my_id == 0)
    {
-   	As = hypre_CSRBooleanMatrixRead("inpr");
-   	hypre_printf(" read input A\n");
+      As = hypre_CSRBooleanMatrixRead("inpr");
+      hypre_printf(" read input A\n");
    }
    A = hypre_CSRBooleanMatrixToParCSRBooleanMatrix(hypre_MPI_COMM_WORLD, As, row_starts,
-                                                 col_starts);
+                                                   col_starts);
    row_starts = hypre_ParCSRBooleanMatrix_Get_RowStarts(A);
    col_starts = hypre_ParCSRBooleanMatrix_Get_ColStarts(A);
 
@@ -47,7 +47,7 @@ main( HYPRE_Int   argc,
 
    if (my_id == 0)
    {
-	hypre_CSRBooleanMatrixDestroy(As);
+      hypre_CSRBooleanMatrixDestroy(As);
    }
    hypre_ParCSRBooleanMatrixDestroy(A);
    hypre_ParCSRBooleanMatrixDestroy(C);
diff --git a/external/hypre/src/parcsr_mv/driver_boolmatmul.c b/external/hypre/src/parcsr_mv/driver_boolmatmul.c
index ffdc7461..bbff858d 100644
--- a/external/hypre/src/parcsr_mv/driver_boolmatmul.c
+++ b/external/hypre/src/parcsr_mv/driver_boolmatmul.c
@@ -1,16 +1,16 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
  ******************************************************************************/
 
 #include "_hypre_parcsr_mv.h"
- 
+
 /*--------------------------------------------------------------------------
- * Test driver for Boolean matrix multiplication, C=A*B . 
+ * Test driver for Boolean matrix multiplication, C=A*B .
  *--------------------------------------------------------------------------*/
- 
+
 HYPRE_Int
 main( HYPRE_Int   argc,
       char *argv[] )
@@ -27,37 +27,38 @@ main( HYPRE_Int   argc,
    /* Initialize MPI */
    hypre_MPI_Init(&argc, &argv);
 
-   hypre_MPI_Comm_size(hypre_MPI_COMM_WORLD,&num_procs);
-   hypre_MPI_Comm_rank(hypre_MPI_COMM_WORLD,&my_id);
+   hypre_MPI_Comm_size(hypre_MPI_COMM_WORLD, &num_procs);
+   hypre_MPI_Comm_rank(hypre_MPI_COMM_WORLD, &my_id);
    row_starts = NULL;
    col_starts = NULL;
 
    if (my_id == 0)
    {
-   	As = hypre_CSRBooleanMatrixRead("inpr");
-        a_nrows = hypre_CSRBooleanMatrix_Get_NRows( As );
-        a_ncols = hypre_CSRBooleanMatrix_Get_NCols( As );
-   	hypre_printf(" read input A(%i,%i)\n",a_nrows,a_ncols);
-   	Bs = hypre_CSRBooleanMatrixRead("input");
-        b_nrows = hypre_CSRBooleanMatrix_Get_NRows( Bs );
-        b_ncols = hypre_CSRBooleanMatrix_Get_NCols( Bs );
-   	hypre_printf(" read input B(%i,%i)\n",b_nrows,b_ncols);
-        if ( a_ncols != b_nrows ) {
-           hypre_printf( "incompatible matrix dimensions! (%i,%i)*(%i,%i)\n",
-                   a_nrows,a_ncols,b_nrows,b_ncols );
-           exit(1);
-        }
-        
+      As = hypre_CSRBooleanMatrixRead("inpr");
+      a_nrows = hypre_CSRBooleanMatrix_Get_NRows( As );
+      a_ncols = hypre_CSRBooleanMatrix_Get_NCols( As );
+      hypre_printf(" read input A(%i,%i)\n", a_nrows, a_ncols);
+      Bs = hypre_CSRBooleanMatrixRead("input");
+      b_nrows = hypre_CSRBooleanMatrix_Get_NRows( Bs );
+      b_ncols = hypre_CSRBooleanMatrix_Get_NCols( Bs );
+      hypre_printf(" read input B(%i,%i)\n", b_nrows, b_ncols);
+      if ( a_ncols != b_nrows )
+      {
+         hypre_printf( "incompatible matrix dimensions! (%i,%i)*(%i,%i)\n",
+                       a_nrows, a_ncols, b_nrows, b_ncols );
+         exit(1);
+      }
+
    }
    A = hypre_CSRBooleanMatrixToParCSRBooleanMatrix
-      (hypre_MPI_COMM_WORLD, As, row_starts, col_starts);
+       (hypre_MPI_COMM_WORLD, As, row_starts, col_starts);
    row_starts = hypre_ParCSRBooleanMatrix_Get_RowStarts(A);
    col_starts = hypre_ParCSRBooleanMatrix_Get_ColStarts(A);
    B = hypre_CSRBooleanMatrixToParCSRBooleanMatrix
-      (hypre_MPI_COMM_WORLD, Bs, col_starts, row_starts);
-   hypre_ParCSRBooleanMatrixSetRowStartsOwner(B,0);
-   hypre_ParCSRBooleanMatrixSetColStartsOwner(B,0);
-   C = hypre_ParBooleanMatmul(A,B);
+       (hypre_MPI_COMM_WORLD, Bs, col_starts, row_starts);
+   hypre_ParCSRBooleanMatrixSetRowStartsOwner(B, 0);
+   hypre_ParCSRBooleanMatrixSetColStartsOwner(B, 0);
+   C = hypre_ParBooleanMatmul(A, B);
    hypre_ParCSRBooleanMatrixPrint(A, "echo_A" );
    hypre_ParCSRBooleanMatrixPrint(B, "echo_B" );
    hypre_ParCSRBooleanMatrixPrint(C, "result");
@@ -65,8 +66,8 @@ main( HYPRE_Int   argc,
 
    if (my_id == 0)
    {
-	hypre_CSRBooleanMatrixDestroy(As);
-   	hypre_CSRBooleanMatrixDestroy(Bs);
+      hypre_CSRBooleanMatrixDestroy(As);
+      hypre_CSRBooleanMatrixDestroy(Bs);
    }
    hypre_ParCSRBooleanMatrixDestroy(A);
    hypre_ParCSRBooleanMatrixDestroy(B);
diff --git a/external/hypre/src/parcsr_mv/driver_mat_multivec.c b/external/hypre/src/parcsr_mv/driver_mat_multivec.c
index 63dabe30..80013600 100644
--- a/external/hypre/src/parcsr_mv/driver_mat_multivec.c
+++ b/external/hypre/src/parcsr_mv/driver_mat_multivec.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -32,7 +32,7 @@ main( HYPRE_Int   argc,
    HYPRE_Int          num_vectors;
    HYPRE_BigInt         global_num_rows, global_num_cols;
    HYPRE_BigInt         first_index;
-   HYPRE_Int            i, j, ierr=0;
+   HYPRE_Int            i, j, ierr = 0;
    HYPRE_Complex        *data, *data2;
    HYPRE_BigInt         *row_starts, *col_starts;
    char         file_name[80];
@@ -46,25 +46,25 @@ main( HYPRE_Int   argc,
 
    if (my_id == 0)
    {
-        matrix = hypre_CSRMatrixRead("input");
-        hypre_printf(" read input\n");
+      matrix = hypre_CSRMatrixRead("input");
+      hypre_printf(" read input\n");
    }
    row_starts = NULL;
    col_starts = NULL;
    par_matrix = hypre_CSRMatrixToParCSRMatrix(hypre_MPI_COMM_WORLD, matrix,
-                row_starts, col_starts);
+                                              row_starts, col_starts);
    hypre_printf(" converted\n");
 
    matrix1 = hypre_ParCSRMatrixToCSRMatrixAll(par_matrix);
 
-   hypre_sprintf(file_name,"matrix1.%d",my_id);
+   hypre_sprintf(file_name, "matrix1.%d", my_id);
 
-   if (matrix1) hypre_CSRMatrixPrint(matrix1, file_name);
+   if (matrix1) { hypre_CSRMatrixPrint(matrix1, file_name); }
 
-   hypre_ParCSRMatrixPrint(par_matrix,"matrix");
-   hypre_ParCSRMatrixPrintIJ(par_matrix,0,0,"matrixIJ");
+   hypre_ParCSRMatrixPrint(par_matrix, "matrix");
+   hypre_ParCSRMatrixPrintIJ(par_matrix, 0, 0, "matrixIJ");
 
-   par_matrix = hypre_ParCSRMatrixRead(hypre_MPI_COMM_WORLD,"matrix");
+   par_matrix = hypre_ParCSRMatrixRead(hypre_MPI_COMM_WORLD, "matrix");
 
    global_num_cols = hypre_ParCSRMatrixGlobalNumCols(par_matrix);
    hypre_printf(" global_num_cols %d\n", global_num_cols);
@@ -72,29 +72,31 @@ main( HYPRE_Int   argc,
 
    col_starts = hypre_ParCSRMatrixColStarts(par_matrix);
    first_index = col_starts[my_id];
-   local_size = col_starts[my_id+1] - first_index;
+   local_size = col_starts[my_id + 1] - first_index;
 
    num_vectors = 3;
 
    x = hypre_ParMultiVectorCreate( hypre_MPI_COMM_WORLD, global_num_cols,
-                                         col_starts, num_vectors );
+                                   col_starts, num_vectors );
    hypre_ParVectorInitialize(x);
    x_local = hypre_ParVectorLocalVector(x);
    data = hypre_VectorData(x_local);
    vecstride_x = hypre_VectorVectorStride(x_local);
    idxstride_x = hypre_VectorIndexStride(x_local);
-   for ( j=0; j<num_vectors; ++j )
-      for (i=0; i < local_size; i++)
-         data[i*idxstride_x + j*vecstride_x] = (HYPRE_Int)first_index+i+1 + 100*j;
+   for ( j = 0; j < num_vectors; ++j )
+      for (i = 0; i < local_size; i++)
+      {
+         data[i * idxstride_x + j * vecstride_x] = (HYPRE_Int)first_index + i + 1 + 100 * j;
+      }
 
    x2 = hypre_ParMultiVectorCreate( hypre_MPI_COMM_WORLD, global_num_cols,
                                     col_starts, num_vectors );
    hypre_ParVectorInitialize(x2);
-   hypre_ParVectorSetConstantValues(x2,2.0);
+   hypre_ParVectorSetConstantValues(x2, 2.0);
 
    row_starts = hypre_ParCSRMatrixRowStarts(par_matrix);
    first_index = row_starts[my_id];
-   local_size = (HYPRE_Int)(row_starts[my_id+1] - first_index);
+   local_size = (HYPRE_Int)(row_starts[my_id + 1] - first_index);
    y = hypre_ParMultiVectorCreate( hypre_MPI_COMM_WORLD, global_num_rows,
                                    row_starts, num_vectors );
    hypre_ParVectorInitialize(y);
@@ -108,11 +110,13 @@ main( HYPRE_Int   argc,
    vecstride_y = hypre_VectorVectorStride(y2_local);
    idxstride_y = hypre_VectorIndexStride(y2_local);
 
-   for ( j=0; j<num_vectors; ++j )
-      for (i=0; i < local_size; i++)
-         data2[i*idxstride_y+j*vecstride_y] = (HYPRE_Int)first_index+i+1 + 100*j;
+   for ( j = 0; j < num_vectors; ++j )
+      for (i = 0; i < local_size; i++)
+      {
+         data2[i * idxstride_y + j * vecstride_y] = (HYPRE_Int)first_index + i + 1 + 100 * j;
+      }
 
-   hypre_ParVectorSetConstantValues(y,1.0);
+   hypre_ParVectorSetConstantValues(y, 1.0);
    hypre_printf(" initialized vectors, first_index=%i\n", first_index);
 
    hypre_ParVectorPrint(x, "vectorx");
@@ -135,8 +139,8 @@ main( HYPRE_Int   argc,
    hypre_ParVectorDestroy(x2);
    hypre_ParVectorDestroy(y);
    hypre_ParVectorDestroy(y2);
-   if (my_id == 0) hypre_CSRMatrixDestroy(matrix);
-   if (matrix1) hypre_CSRMatrixDestroy(matrix1);
+   if (my_id == 0) { hypre_CSRMatrixDestroy(matrix); }
+   if (matrix1) { hypre_CSRMatrixDestroy(matrix1); }
 
    /* Finalize MPI */
    hypre_MPI_Finalize();
diff --git a/external/hypre/src/parcsr_mv/driver_matmul.c b/external/hypre/src/parcsr_mv/driver_matmul.c
index 3ce6e5e9..8e1e7bf6 100644
--- a/external/hypre/src/parcsr_mv/driver_matmul.c
+++ b/external/hypre/src/parcsr_mv/driver_matmul.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -26,33 +26,33 @@ main( HYPRE_Int   argc,
    /* Initialize MPI */
    hypre_MPI_Init(&argc, &argv);
 
-   hypre_MPI_Comm_size(hypre_MPI_COMM_WORLD,&num_procs);
-   hypre_MPI_Comm_rank(hypre_MPI_COMM_WORLD,&my_id);
+   hypre_MPI_Comm_size(hypre_MPI_COMM_WORLD, &num_procs);
+   hypre_MPI_Comm_rank(hypre_MPI_COMM_WORLD, &my_id);
    row_starts = NULL;
    col_starts = NULL;
 
    if (my_id == 0)
    {
-   	As = hypre_CSRMatrixRead("inpr");
-   	hypre_printf(" read input A\n");
-   	Bs = hypre_CSRMatrixRead("input");
-   	hypre_printf(" read input B\n");
+      As = hypre_CSRMatrixRead("inpr");
+      hypre_printf(" read input A\n");
+      Bs = hypre_CSRMatrixRead("input");
+      hypre_printf(" read input B\n");
    }
    A = hypre_CSRMatrixToParCSRMatrix(hypre_MPI_COMM_WORLD, As, row_starts,
-	col_starts);
+                                     col_starts);
    row_starts = hypre_ParCSRMatrixRowStarts(A);
    col_starts = hypre_ParCSRMatrixColStarts(A);
    B = hypre_CSRMatrixToParCSRMatrix(hypre_MPI_COMM_WORLD, Bs, col_starts,
-	row_starts);
-   C = hypre_ParMatmul(B,A);
+                                     row_starts);
+   C = hypre_ParMatmul(B, A);
    hypre_ParCSRMatrixPrint(B, "echo_B" );
    hypre_ParCSRMatrixPrint(A, "echo_A" );
    hypre_ParCSRMatrixPrint(C, "result");
 
    if (my_id == 0)
    {
-	hypre_CSRMatrixDestroy(As);
-   	hypre_CSRMatrixDestroy(Bs);
+      hypre_CSRMatrixDestroy(As);
+      hypre_CSRMatrixDestroy(Bs);
    }
    hypre_ParCSRMatrixDestroy(A);
    hypre_ParCSRMatrixDestroy(B);
diff --git a/external/hypre/src/parcsr_mv/driver_matvec.c b/external/hypre/src/parcsr_mv/driver_matvec.c
index b8435fd2..2ae86e8f 100644
--- a/external/hypre/src/parcsr_mv/driver_matvec.c
+++ b/external/hypre/src/parcsr_mv/driver_matvec.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -27,14 +27,14 @@ main( HYPRE_Int   argc,
    hypre_ParVector     *y2;
 
    HYPRE_Int          num_procs, my_id;
-   HYPRE_Int		local_size;
-   HYPRE_BigInt		global_num_rows;
-   HYPRE_BigInt		global_num_cols;
-   HYPRE_BigInt		first_index;
-   HYPRE_Int 		i, ierr=0;
-   HYPRE_Complex 	*data, *data2;
-   HYPRE_BigInt		*row_starts, *col_starts;
-   char		file_name[80];
+   HYPRE_Int      local_size;
+   HYPRE_BigInt      global_num_rows;
+   HYPRE_BigInt      global_num_cols;
+   HYPRE_BigInt      first_index;
+   HYPRE_Int      i, ierr = 0;
+   HYPRE_Complex  *data, *data2;
+   HYPRE_BigInt      *row_starts, *col_starts;
+   char     file_name[80];
    /* Initialize MPI */
    hypre_MPI_Init(&argc, &argv);
 
@@ -45,35 +45,35 @@ main( HYPRE_Int   argc,
 
    if (my_id == 0)
    {
-	matrix = hypre_CSRMatrixRead("input");
-   	hypre_printf(" read input\n");
+      matrix = hypre_CSRMatrixRead("input");
+      hypre_printf(" read input\n");
    }
-/*   row_starts = hypre_CTAlloc(HYPRE_Int,4);
-   col_starts = hypre_CTAlloc(HYPRE_Int, 4, HYPRE_MEMORY_HOST);
-   row_starts[0] = 0;
-   row_starts[1] = 3;
-   row_starts[2] = 3;
-   row_starts[3] = 7;
-   col_starts[0] = 0;
-   col_starts[1] = 3;
-   col_starts[2] = 3;
-   col_starts[3] = 9;
-*/
+   /*   row_starts = hypre_CTAlloc(HYPRE_Int,4);
+      col_starts = hypre_CTAlloc(HYPRE_Int, 4, HYPRE_MEMORY_HOST);
+      row_starts[0] = 0;
+      row_starts[1] = 3;
+      row_starts[2] = 3;
+      row_starts[3] = 7;
+      col_starts[0] = 0;
+      col_starts[1] = 3;
+      col_starts[2] = 3;
+      col_starts[3] = 9;
+   */
    row_starts = NULL;
    col_starts = NULL;
    par_matrix = hypre_CSRMatrixToParCSRMatrix(hypre_MPI_COMM_WORLD, matrix,
-		row_starts, col_starts);
+                                              row_starts, col_starts);
    hypre_printf(" converted\n");
 
    matrix1 = hypre_ParCSRMatrixToCSRMatrixAll(par_matrix);
 
-   hypre_sprintf(file_name,"matrix1.%d",my_id);
+   hypre_sprintf(file_name, "matrix1.%d", my_id);
 
-   if (matrix1) hypre_CSRMatrixPrint(matrix1, file_name);
+   if (matrix1) { hypre_CSRMatrixPrint(matrix1, file_name); }
 
-   hypre_ParCSRMatrixPrint(par_matrix,"matrix");
+   hypre_ParCSRMatrixPrint(par_matrix, "matrix");
 
-   par_matrix = hypre_ParCSRMatrixRead(hypre_MPI_COMM_WORLD,"matrix");
+   par_matrix = hypre_ParCSRMatrixRead(hypre_MPI_COMM_WORLD, "matrix");
 
    global_num_cols = hypre_ParCSRMatrixGlobalNumCols(par_matrix);
    hypre_printf(" global_num_cols %d\n", global_num_cols);
@@ -81,35 +81,39 @@ main( HYPRE_Int   argc,
 
    col_starts = hypre_ParCSRMatrixColStarts(par_matrix);
    first_index = col_starts[my_id];
-   local_size = (HYPRE_Int)(col_starts[my_id+1] - first_index);
+   local_size = (HYPRE_Int)(col_starts[my_id + 1] - first_index);
 
-   x = hypre_ParVectorCreate(hypre_MPI_COMM_WORLD,global_num_cols,col_starts);
+   x = hypre_ParVectorCreate(hypre_MPI_COMM_WORLD, global_num_cols, col_starts);
    hypre_ParVectorInitialize(x);
    x_local = hypre_ParVectorLocalVector(x);
    data = hypre_VectorData(x_local);
 
-   for (i=0; i < local_size; i++)
-        data[i] = (HYPRE_Int)first_index+i+1;
-   x2 = hypre_ParVectorCreate(hypre_MPI_COMM_WORLD,global_num_cols,col_starts);
+   for (i = 0; i < local_size; i++)
+   {
+      data[i] = (HYPRE_Int)first_index + i + 1;
+   }
+   x2 = hypre_ParVectorCreate(hypre_MPI_COMM_WORLD, global_num_cols, col_starts);
    hypre_ParVectorInitialize(x2);
-   hypre_ParVectorSetConstantValues(x2,2.0);
+   hypre_ParVectorSetConstantValues(x2, 2.0);
 
    row_starts = hypre_ParCSRMatrixRowStarts(par_matrix);
    first_index = row_starts[my_id];
-   local_size = (HYPRE_Int)(row_starts[my_id+1] - first_index);
-   y = hypre_ParVectorCreate(hypre_MPI_COMM_WORLD,global_num_rows,row_starts);
+   local_size = (HYPRE_Int)(row_starts[my_id + 1] - first_index);
+   y = hypre_ParVectorCreate(hypre_MPI_COMM_WORLD, global_num_rows, row_starts);
    hypre_ParVectorInitialize(y);
    y_local = hypre_ParVectorLocalVector(y);
 
-   y2 = hypre_ParVectorCreate(hypre_MPI_COMM_WORLD,global_num_rows,row_starts);
+   y2 = hypre_ParVectorCreate(hypre_MPI_COMM_WORLD, global_num_rows, row_starts);
    hypre_ParVectorInitialize(y2);
    y2_local = hypre_ParVectorLocalVector(y2);
    data2 = hypre_VectorData(y2_local);
 
-   for (i=0; i < local_size; i++)
-        data2[i] = (HYPRE_Int)first_index+i+1;
+   for (i = 0; i < local_size; i++)
+   {
+      data2[i] = (HYPRE_Int)first_index + i + 1;
+   }
 
-   hypre_ParVectorSetConstantValues(y,1.0);
+   hypre_ParVectorSetConstantValues(y, 1.0);
    hypre_printf(" initialized vectors\n");
 
    hypre_MatvecCommPkgCreate(par_matrix);
@@ -129,8 +133,8 @@ main( HYPRE_Int   argc,
    hypre_ParVectorDestroy(x2);
    hypre_ParVectorDestroy(y);
    hypre_ParVectorDestroy(y2);
-   if (my_id == 0) hypre_CSRMatrixDestroy(matrix);
-   if (matrix1) hypre_CSRMatrixDestroy(matrix1);
+   if (my_id == 0) { hypre_CSRMatrixDestroy(matrix); }
+   if (matrix1) { hypre_CSRMatrixDestroy(matrix1); }
 
    /* Finalize MPI */
    hypre_MPI_Finalize();
diff --git a/external/hypre/src/parcsr_mv/driver_multivec.c b/external/hypre/src/parcsr_mv/driver_multivec.c
index f0d640c7..aa978629 100644
--- a/external/hypre/src/parcsr_mv/driver_multivec.c
+++ b/external/hypre/src/parcsr_mv/driver_multivec.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -43,7 +43,7 @@ main( HYPRE_Int   argc,
    partitioning = NULL;
    num_vectors = 3;
    vector1 = hypre_ParMultiVectorCreate
-      ( hypre_MPI_COMM_WORLD, global_size, partitioning, num_vectors );
+             ( hypre_MPI_COMM_WORLD, global_size, partitioning, num_vectors );
    partitioning = hypre_ParVectorPartitioning(vector1);
 
    hypre_ParVectorInitialize(vector1);
@@ -55,10 +55,12 @@ main( HYPRE_Int   argc,
    first_index = partitioning[my_id];
 
    hypre_printf("vecstride=%i idxstride=%i local_size=%i num_vectors=%i",
-          vecstride, idxstride, local_size, num_vectors );
-   for (j=0; j<num_vectors; ++j )
-      for (i=0; i < local_size; i++)
-         data[ j*vecstride + i*idxstride ] = (HYPRE_Int)first_index+i + 100*j;
+                vecstride, idxstride, local_size, num_vectors );
+   for (j = 0; j < num_vectors; ++j )
+      for (i = 0; i < local_size; i++)
+      {
+         data[ j * vecstride + i * idxstride ] = (HYPRE_Int)first_index + i + 100 * j;
+      }
 
    hypre_ParVectorPrint(vector1, "Vector");
 
@@ -67,20 +69,22 @@ main( HYPRE_Int   argc,
    data2 = hypre_VectorData(local_vector2);
    vecstride = hypre_VectorVectorStride(local_vector2);
    idxstride = hypre_VectorIndexStride(local_vector2);
-   for (j=0; j<num_vectors; ++j )
-      for (i=0; i < global_size; i++)
-         data2[ j*vecstride + i*idxstride ] = i + 100*j;
-
-/*   partitioning = hypre_CTAlloc(HYPRE_Int,4);
-   partitioning[0] = 0;
-   partitioning[1] = 10;
-   partitioning[2] = 10;
-   partitioning[3] = 20;
-*/
-   partitioning = hypre_CTAlloc(HYPRE_BigInt, 1+num_procs, HYPRE_MEMORY_HOST);
+   for (j = 0; j < num_vectors; ++j )
+      for (i = 0; i < global_size; i++)
+      {
+         data2[ j * vecstride + i * idxstride ] = i + 100 * j;
+      }
+
+   /*   partitioning = hypre_CTAlloc(HYPRE_Int,4);
+      partitioning[0] = 0;
+      partitioning[1] = 10;
+      partitioning[2] = 10;
+      partitioning[3] = 20;
+   */
+   partitioning = hypre_CTAlloc(HYPRE_BigInt, 1 + num_procs, HYPRE_MEMORY_HOST);
    hypre_GeneratePartitioning( global_size, num_procs, &partitioning );
 
-   vector2 = hypre_VectorToParVector(hypre_MPI_COMM_WORLD,local_vector2,partitioning);
+   vector2 = hypre_VectorToParVector(hypre_MPI_COMM_WORLD, local_vector2, partitioning);
 
    hypre_ParVectorPrint(vector2, "Convert");
 
@@ -90,32 +94,32 @@ main( HYPRE_Int   argc,
     * Copy the vector into tmp_vector
     *-----------------------------------------------------------*/
 
-/* Read doesn't work for multivectors yet...
-   tmp_vector = hypre_ParVectorRead(hypre_MPI_COMM_WORLD, "Convert");*/
+   /* Read doesn't work for multivectors yet...
+      tmp_vector = hypre_ParVectorRead(hypre_MPI_COMM_WORLD, "Convert");*/
    tmp_vector = hypre_ParMultiVectorCreate
-      ( hypre_MPI_COMM_WORLD, global_size, partitioning, num_vectors );
+                ( hypre_MPI_COMM_WORLD, global_size, partitioning, num_vectors );
    hypre_ParVectorInitialize( tmp_vector );
    hypre_ParVectorCopy( vector2, tmp_vector );
-/*
-   tmp_vector = hypre_ParVectorCreate(hypre_MPI_COMM_WORLD,global_size,partitioning);
-   hypre_ParVectorInitialize(tmp_vector);
-   hypre_ParVectorCopy(vector1, tmp_vector);
+   /*
+      tmp_vector = hypre_ParVectorCreate(hypre_MPI_COMM_WORLD,global_size,partitioning);
+      hypre_ParVectorInitialize(tmp_vector);
+      hypre_ParVectorCopy(vector1, tmp_vector);
 
-   hypre_ParVectorPrint(tmp_vector,"Copy");
-*/
+      hypre_ParVectorPrint(tmp_vector,"Copy");
+   */
    /*-----------------------------------------------------------
     * Scale tmp_vector
     *-----------------------------------------------------------*/
 
    hypre_ParVectorScale(2.0, tmp_vector);
-   hypre_ParVectorPrint(tmp_vector,"Scale");
+   hypre_ParVectorPrint(tmp_vector, "Scale");
 
    /*-----------------------------------------------------------
     * Do an Axpy (2*vector - vector) = vector
     *-----------------------------------------------------------*/
 
    hypre_ParVectorAxpy(-1.0, vector1, tmp_vector);
-   hypre_ParVectorPrint(tmp_vector,"Axpy");
+   hypre_ParVectorPrint(tmp_vector, "Axpy");
 
    /*-----------------------------------------------------------
     * Do an inner product vector* tmp_vector
@@ -133,7 +137,7 @@ main( HYPRE_Int   argc,
    hypre_ParVectorDestroy(vector2);
    hypre_ParVectorDestroy(tmp_vector);
    hypre_SeqVectorDestroy(local_vector2);
-   if (vector) hypre_SeqVectorDestroy(vector);
+   if (vector) { hypre_SeqVectorDestroy(vector); }
 
    /* Finalize MPI */
    hypre_MPI_Finalize();
diff --git a/external/hypre/src/parcsr_mv/gen_fffc.c b/external/hypre/src/parcsr_mv/gen_fffc.c
index 374523af..62772e66 100644
--- a/external/hypre/src/parcsr_mv/gen_fffc.c
+++ b/external/hypre/src/parcsr_mv/gen_fffc.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -10,20 +10,24 @@
 #include "_hypre_lapack.h"
 #include "_hypre_blas.h"
 
-/* -----------------------------------------------------------------------------
- * generate AFF or AFC
- * ----------------------------------------------------------------------------- */
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixGenerateFFFCHost
+ *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_ParCSRMatrixGenerateFFFC( hypre_ParCSRMatrix  *A,
-                                HYPRE_Int           *CF_marker,
-                                HYPRE_BigInt        *cpts_starts,
-                                hypre_ParCSRMatrix  *S,
-                                hypre_ParCSRMatrix **A_FC_ptr,
-                                hypre_ParCSRMatrix **A_FF_ptr)
+hypre_ParCSRMatrixGenerateFFFCHost( hypre_ParCSRMatrix  *A,
+                                    HYPRE_Int           *CF_marker,
+                                    HYPRE_BigInt        *cpts_starts,
+                                    hypre_ParCSRMatrix  *S,
+                                    hypre_ParCSRMatrix **A_FC_ptr,
+                                    hypre_ParCSRMatrix **A_FF_ptr)
 {
    MPI_Comm                 comm     = hypre_ParCSRMatrixComm(A);
    HYPRE_MemoryLocation memory_location_P = hypre_ParCSRMatrixMemoryLocation(A);
+   if (!hypre_ParCSRMatrixCommPkg(A))
+   {
+      hypre_MatvecCommPkgCreate(A);
+   }
    hypre_ParCSRCommPkg     *comm_pkg = hypre_ParCSRMatrixCommPkg(A);
    hypre_ParCSRCommHandle  *comm_handle;
 
@@ -42,18 +46,19 @@ hypre_ParCSRMatrixGenerateFFFC( hypre_ParCSRMatrix  *A,
    HYPRE_Int           num_cols_A_offd = hypre_CSRMatrixNumCols(A_offd);
 
    /* diag part of S */
-   hypre_CSRMatrix    *S_diag   = hypre_ParCSRMatrixDiag(S);
+   hypre_CSRMatrix    *S_diag   = S ? hypre_ParCSRMatrixDiag(S) : A_diag;
    HYPRE_Int          *S_diag_i = hypre_CSRMatrixI(S_diag);
    HYPRE_Int          *S_diag_j = hypre_CSRMatrixJ(S_diag);
+   HYPRE_Int           skip_diag = S ? 0 : 1;
    /* off-diag part of S */
-   hypre_CSRMatrix    *S_offd   = hypre_ParCSRMatrixOffd(S);
+   hypre_CSRMatrix    *S_offd   = S ? hypre_ParCSRMatrixOffd(S) : A_offd;
    HYPRE_Int          *S_offd_i = hypre_CSRMatrixI(S_offd);
    HYPRE_Int          *S_offd_j = hypre_CSRMatrixJ(S_offd);
 
    hypre_ParCSRMatrix *A_FC;
    hypre_CSRMatrix    *A_FC_diag, *A_FC_offd;
-   HYPRE_Int          *A_FC_diag_i, *A_FC_diag_j, *A_FC_offd_i, *A_FC_offd_j=NULL;
-   HYPRE_Complex      *A_FC_diag_data, *A_FC_offd_data=NULL;
+   HYPRE_Int          *A_FC_diag_i, *A_FC_diag_j, *A_FC_offd_i, *A_FC_offd_j = NULL;
+   HYPRE_Complex      *A_FC_diag_data, *A_FC_offd_data = NULL;
    HYPRE_Int           num_cols_offd_A_FC;
    HYPRE_BigInt       *col_map_offd_A_FC = NULL;
 
@@ -72,13 +77,13 @@ hypre_ParCSRMatrixGenerateFFFC( hypre_ParCSRMatrix  *A,
    HYPRE_Int           i, j, jj;
    HYPRE_Int           startc, index;
    HYPRE_Int           cpt, fpt, row;
-   HYPRE_Int          *CF_marker_offd = NULL, *marker_offd=NULL;
+   HYPRE_Int          *CF_marker_offd = NULL, *marker_offd = NULL;
    HYPRE_Int          *int_buf_data = NULL;
    HYPRE_BigInt       *big_convert;
    HYPRE_BigInt       *big_convert_offd = NULL;
    HYPRE_BigInt       *big_buf_data = NULL;
 
-   HYPRE_BigInt        total_global_fpts, total_global_cpts, *fpts_starts;
+   HYPRE_BigInt        total_global_fpts, total_global_cpts, fpts_starts[2];
    HYPRE_Int           my_id, num_procs, num_sends;
    HYPRE_Int           d_count_FF, d_count_FC, o_count_FF, o_count_FC;
    HYPRE_Int           n_Fpts;
@@ -96,53 +101,53 @@ hypre_ParCSRMatrixGenerateFFFC( hypre_ParCSRMatrix  *A,
    fine_to_fine = hypre_CTAlloc(HYPRE_Int, n_fine, HYPRE_MEMORY_HOST);
    big_convert = hypre_CTAlloc(HYPRE_BigInt, n_fine, HYPRE_MEMORY_HOST);
 
-   cpt_array = hypre_CTAlloc(HYPRE_Int, num_threads+1, HYPRE_MEMORY_HOST);
-   fpt_array = hypre_CTAlloc(HYPRE_Int, num_threads+1, HYPRE_MEMORY_HOST);
+   cpt_array = hypre_CTAlloc(HYPRE_Int, num_threads + 1, HYPRE_MEMORY_HOST);
+   fpt_array = hypre_CTAlloc(HYPRE_Int, num_threads + 1, HYPRE_MEMORY_HOST);
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel private(i,j,jj,start,stop,row,cpt,fpt,d_count_FC,d_count_FF,o_count_FC,o_count_FF)
+   #pragma omp parallel private(i,j,jj,start,stop,row,cpt,fpt,d_count_FC,d_count_FF,o_count_FC,o_count_FF)
 #endif
    {
       HYPRE_Int my_thread_num = hypre_GetThreadNum();
 
-      start = (n_fine/num_threads)*my_thread_num;
-      if (my_thread_num == num_threads-1)
+      start = (n_fine / num_threads) * my_thread_num;
+      if (my_thread_num == num_threads - 1)
       {
          stop = n_fine;
       }
       else
       {
-         stop = (n_fine/num_threads)*(my_thread_num+1);
+         stop = (n_fine / num_threads) * (my_thread_num + 1);
       }
-      for (i=start; i < stop; i++)
+      for (i = start; i < stop; i++)
       {
          if (CF_marker[i] > 0)
          {
-            cpt_array[my_thread_num+1]++;
+            cpt_array[my_thread_num + 1]++;
          }
          else
          {
-            fpt_array[my_thread_num+1]++;
+            fpt_array[my_thread_num + 1]++;
          }
       }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
       if (my_thread_num == 0)
       {
-         for (i=1; i < num_threads; i++)
+         for (i = 1; i < num_threads; i++)
          {
-            cpt_array[i+1] += cpt_array[i];
-            fpt_array[i+1] += fpt_array[i];
+            cpt_array[i + 1] += cpt_array[i];
+            fpt_array[i + 1] += fpt_array[i];
          }
       }
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
 
       cpt = cpt_array[my_thread_num];
       fpt = fpt_array[my_thread_num];
-      for (i=start; i < stop; i++)
+      for (i = start; i < stop; i++)
       {
          if (CF_marker[i] > 0)
          {
@@ -156,7 +161,7 @@ hypre_ParCSRMatrixGenerateFFFC( hypre_ParCSRMatrix  *A,
          }
       }
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
 
       if (my_thread_num == 0)
@@ -165,22 +170,21 @@ hypre_ParCSRMatrixGenerateFFFC( hypre_ParCSRMatrix  *A,
          n_Fpts = fpt_array[num_threads];
          big_Fpts = n_Fpts;
 
-         fpts_starts = hypre_CTAlloc(HYPRE_BigInt, 2, HYPRE_MEMORY_HOST);
-         hypre_MPI_Scan(&big_Fpts, fpts_starts+1, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
+         hypre_MPI_Scan(&big_Fpts, fpts_starts + 1, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
          fpts_starts[0] = fpts_starts[1] - big_Fpts;
          if (my_id == num_procs - 1)
          {
             total_global_fpts = fpts_starts[1];
             total_global_cpts = cpts_starts[1];
          }
-         hypre_MPI_Bcast(&total_global_fpts, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
-         hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
+         hypre_MPI_Bcast(&total_global_fpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
+         hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
       }
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
 
-      for (i=start; i < stop; i++)
+      for (i = start; i < stop; i++)
       {
          if (CF_marker[i] > 0)
          {
@@ -193,7 +197,7 @@ hypre_ParCSRMatrixGenerateFFFC( hypre_ParCSRMatrix  *A,
       }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
       if (my_thread_num == 0)
       {
@@ -206,15 +210,17 @@ hypre_ParCSRMatrixGenerateFFFC( hypre_ParCSRMatrix  *A,
          }
          index = 0;
          num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
-         int_buf_data = hypre_CTAlloc(HYPRE_Int,  hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends), HYPRE_MEMORY_HOST);
-         big_buf_data = hypre_CTAlloc(HYPRE_BigInt,  hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends), HYPRE_MEMORY_HOST);
+         int_buf_data = hypre_CTAlloc(HYPRE_Int,  hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                                      HYPRE_MEMORY_HOST);
+         big_buf_data = hypre_CTAlloc(HYPRE_BigInt,  hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                                      HYPRE_MEMORY_HOST);
          for (i = 0; i < num_sends; i++)
          {
             startc = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-            for (j = startc; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+            for (j = startc; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
             {
-               int_buf_data[index] = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
-               big_buf_data[index++] = big_convert[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+               int_buf_data[index] = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
+               big_buf_data[index++] = big_convert[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
             }
          }
 
@@ -231,7 +237,7 @@ hypre_ParCSRMatrixGenerateFFFC( hypre_ParCSRMatrix  *A,
          {
             if (CF_marker[i] < 0)
             {
-               for (j = S_offd_i[i]; j < S_offd_i[i+1]; j++)
+               for (j = S_offd_i[i]; j < S_offd_i[i + 1]; j++)
                {
                   marker_offd[S_offd_j[j]] = 1;
                }
@@ -242,7 +248,7 @@ hypre_ParCSRMatrixGenerateFFFC( hypre_ParCSRMatrix  *A,
          num_cols_offd_A_FF = 0;
          if (num_cols_A_offd)
          {
-            for (i=0; i < num_cols_A_offd; i++)
+            for (i = 0; i < num_cols_A_offd; i++)
             {
                if (CF_marker_offd[i] > 0 && marker_offd[i] > 0)
                {
@@ -261,7 +267,7 @@ hypre_ParCSRMatrixGenerateFFFC( hypre_ParCSRMatrix  *A,
 
             cpt = 0;
             fpt = 0;
-            for (i=0; i < num_cols_A_offd; i++)
+            for (i = 0; i < num_cols_A_offd; i++)
             {
                if (CF_marker_offd[i] > 0 && marker_offd[i] > 0)
                {
@@ -274,43 +280,51 @@ hypre_ParCSRMatrixGenerateFFFC( hypre_ParCSRMatrix  *A,
             }
          }
 
-         A_FF_diag_i = hypre_CTAlloc(HYPRE_Int,n_Fpts+1, memory_location_P);
-         A_FC_diag_i = hypre_CTAlloc(HYPRE_Int,n_Fpts+1, memory_location_P);
-         A_FF_offd_i = hypre_CTAlloc(HYPRE_Int,n_Fpts+1, memory_location_P);
-         A_FC_offd_i = hypre_CTAlloc(HYPRE_Int,n_Fpts+1, memory_location_P);
+         A_FF_diag_i = hypre_CTAlloc(HYPRE_Int, n_Fpts + 1, memory_location_P);
+         A_FC_diag_i = hypre_CTAlloc(HYPRE_Int, n_Fpts + 1, memory_location_P);
+         A_FF_offd_i = hypre_CTAlloc(HYPRE_Int, n_Fpts + 1, memory_location_P);
+         A_FC_offd_i = hypre_CTAlloc(HYPRE_Int, n_Fpts + 1, memory_location_P);
       }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
       d_count_FC = 0;
       d_count_FF = 0;
       o_count_FC = 0;
       o_count_FF = 0;
       row = fpt_array[my_thread_num];
-      for (i=start; i < stop; i++)
+      for (i = start; i < stop; i++)
       {
          if (CF_marker[i] < 0)
          {
             row++;
             d_count_FF++; /* account for diagonal element */
-            for (j = S_diag_i[i]; j < S_diag_i[i+1]; j++)
+            for (j = S_diag_i[i] + skip_diag; j < S_diag_i[i + 1]; j++)
             {
                jj = S_diag_j[j];
                if (CF_marker[jj] > 0)
+               {
                   d_count_FC++;
+               }
                else
+               {
                   d_count_FF++;
+               }
             }
             A_FF_diag_i[row] = d_count_FF;
             A_FC_diag_i[row] = d_count_FC;
-            for (j = S_offd_i[i]; j < S_offd_i[i+1]; j++)
+            for (j = S_offd_i[i]; j < S_offd_i[i + 1]; j++)
             {
                jj = S_offd_j[j];
                if (CF_marker_offd[jj] > 0)
+               {
                   o_count_FC++;
+               }
                else
+               {
                   o_count_FF++;
+               }
             }
             A_FF_offd_i[row] = o_count_FF;
             A_FC_offd_i[row] = o_count_FC;
@@ -318,15 +332,15 @@ hypre_ParCSRMatrixGenerateFFFC( hypre_ParCSRMatrix  *A,
       }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
       if (my_thread_num == 0)
       {
          HYPRE_Int fpt2;
-         for (i=1; i<num_threads+1; i++)
+         for (i = 1; i < num_threads + 1; i++)
          {
             fpt = fpt_array[i];
-            fpt2 = fpt_array[i-1];
+            fpt2 = fpt_array[i - 1];
 
             if (fpt == fpt2)
             {
@@ -343,25 +357,25 @@ hypre_ParCSRMatrixGenerateFFFC( hypre_ParCSRMatrix  *A,
          d_count_FF = A_FF_diag_i[row];
          o_count_FC = A_FC_offd_i[row];
          o_count_FF = A_FF_offd_i[row];
-         A_FF_diag_j = hypre_CTAlloc(HYPRE_Int,d_count_FF, memory_location_P);
-         A_FC_diag_j = hypre_CTAlloc(HYPRE_Int,d_count_FC, memory_location_P);
-         A_FF_offd_j = hypre_CTAlloc(HYPRE_Int,o_count_FF, memory_location_P);
-         A_FC_offd_j = hypre_CTAlloc(HYPRE_Int,o_count_FC, memory_location_P);
-         A_FF_diag_data = hypre_CTAlloc(HYPRE_Real,d_count_FF, memory_location_P);
-         A_FC_diag_data = hypre_CTAlloc(HYPRE_Real,d_count_FC, memory_location_P);
-         A_FF_offd_data = hypre_CTAlloc(HYPRE_Real,o_count_FF, memory_location_P);
-         A_FC_offd_data = hypre_CTAlloc(HYPRE_Real,o_count_FC, memory_location_P);
+         A_FF_diag_j = hypre_CTAlloc(HYPRE_Int, d_count_FF, memory_location_P);
+         A_FC_diag_j = hypre_CTAlloc(HYPRE_Int, d_count_FC, memory_location_P);
+         A_FF_offd_j = hypre_CTAlloc(HYPRE_Int, o_count_FF, memory_location_P);
+         A_FC_offd_j = hypre_CTAlloc(HYPRE_Int, o_count_FC, memory_location_P);
+         A_FF_diag_data = hypre_CTAlloc(HYPRE_Real, d_count_FF, memory_location_P);
+         A_FC_diag_data = hypre_CTAlloc(HYPRE_Real, d_count_FC, memory_location_P);
+         A_FF_offd_data = hypre_CTAlloc(HYPRE_Real, o_count_FF, memory_location_P);
+         A_FC_offd_data = hypre_CTAlloc(HYPRE_Real, o_count_FC, memory_location_P);
       }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
       row = fpt_array[my_thread_num];
       d_count_FC = A_FC_diag_i[row];
       d_count_FF = A_FF_diag_i[row];
       o_count_FC = A_FC_offd_i[row];
       o_count_FF = A_FF_offd_i[row];
-      for (i=start; i < stop; i++)
+      for (i = start; i < stop; i++)
       {
          if (CF_marker[i] < 0)
          {
@@ -370,11 +384,11 @@ hypre_ParCSRMatrixGenerateFFFC( hypre_ParCSRMatrix  *A,
             jA = A_diag_i[i];
             A_FF_diag_j[d_count_FF] = fine_to_fine[A_diag_j[jA]];
             A_FF_diag_data[d_count_FF++] = A_diag_data[jA++];
-            for (j = S_diag_i[i]; j < S_diag_i[i+1]; j++)
+            for (j = S_diag_i[i] + skip_diag; j < S_diag_i[i + 1]; j++)
             {
-               jA = A_diag_i[i]+1;
+               jA = A_diag_i[i] + 1;
                jS = S_diag_j[j];
-               while (A_diag_j[jA] != jS) jA++;
+               while (A_diag_j[jA] != jS) { jA++; }
                if (CF_marker[S_diag_j[j]] > 0)
                {
                   A_FC_diag_j[d_count_FC] = fine_to_coarse[A_diag_j[jA]];
@@ -388,11 +402,11 @@ hypre_ParCSRMatrixGenerateFFFC( hypre_ParCSRMatrix  *A,
             }
             A_FF_diag_i[row] = d_count_FF;
             A_FC_diag_i[row] = d_count_FC;
-            for (j = S_offd_i[i]; j < S_offd_i[i+1]; j++)
+            for (j = S_offd_i[i]; j < S_offd_i[i + 1]; j++)
             {
                jA = A_offd_i[i];
                jS = S_offd_j[j];
-               while (jS != A_offd_j[jA]) jA++;
+               while (jS != A_offd_j[jA]) { jA++; }
                if (CF_marker_offd[S_offd_j[j]] > 0)
                {
                   A_FC_offd_j[o_count_FC] = fine_to_coarse_offd[A_offd_j[jA]];
@@ -411,22 +425,22 @@ hypre_ParCSRMatrixGenerateFFFC( hypre_ParCSRMatrix  *A,
    } /*end parallel region */
 
    A_FC = hypre_ParCSRMatrixCreate(comm,
-            total_global_fpts,
-            total_global_cpts,
-            fpts_starts,
-            cpts_starts,
-            num_cols_offd_A_FC,
-            A_FC_diag_i[n_Fpts],
-            A_FC_offd_i[n_Fpts]);
+                                   total_global_fpts,
+                                   total_global_cpts,
+                                   fpts_starts,
+                                   cpts_starts,
+                                   num_cols_offd_A_FC,
+                                   A_FC_diag_i[n_Fpts],
+                                   A_FC_offd_i[n_Fpts]);
 
    A_FF = hypre_ParCSRMatrixCreate(comm,
-            total_global_fpts,
-            total_global_fpts,
-            fpts_starts,
-            fpts_starts,
-            num_cols_offd_A_FF,
-            A_FF_diag_i[n_Fpts],
-            A_FF_offd_i[n_Fpts]);
+                                   total_global_fpts,
+                                   total_global_fpts,
+                                   fpts_starts,
+                                   fpts_starts,
+                                   num_cols_offd_A_FF,
+                                   A_FF_diag_i[n_Fpts],
+                                   A_FF_offd_i[n_Fpts]);
 
    A_FC_diag = hypre_ParCSRMatrixDiag(A_FC);
    hypre_CSRMatrixData(A_FC_diag) = A_FC_diag_data;
@@ -466,7 +480,6 @@ hypre_ParCSRMatrixGenerateFFFC( hypre_ParCSRMatrix  *A,
    hypre_TFree(marker_offd, HYPRE_MEMORY_HOST);
    hypre_TFree(cpt_array, HYPRE_MEMORY_HOST);
    hypre_TFree(fpt_array, HYPRE_MEMORY_HOST);
-   hypre_TFree(fpts_starts, HYPRE_MEMORY_HOST);
 
    *A_FC_ptr = A_FC;
    *A_FF_ptr = A_FF;
@@ -474,9 +487,45 @@ hypre_ParCSRMatrixGenerateFFFC( hypre_ParCSRMatrix  *A,
    return hypre_error_flag;
 }
 
-/* -----------------------------------------------------------------------------
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixGenerateFFFC
+ *
+ * Generate AFF or AFC
+ *
+ * TODO (VPM): build the communication package of the resulting matrices
+ * (A_FF and A_FC) from the communication package of the original matrix
+ * without doing MPI calls.
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ParCSRMatrixGenerateFFFC( hypre_ParCSRMatrix  *A,
+                                HYPRE_Int           *CF_marker,
+                                HYPRE_BigInt        *cpts_starts,
+                                hypre_ParCSRMatrix  *S,
+                                hypre_ParCSRMatrix **A_FC_ptr,
+                                hypre_ParCSRMatrix **A_FF_ptr)
+{
+#if defined(HYPRE_USING_GPU)
+   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_ParCSRMatrixMemoryLocation(A) );
+
+   if (exec == HYPRE_EXEC_DEVICE)
+   {
+      hypre_ParCSRMatrixGenerateFFFCDevice(A, CF_marker, cpts_starts, S, A_FC_ptr, A_FF_ptr);
+   }
+   else
+#endif
+   {
+      hypre_ParCSRMatrixGenerateFFFCHost(A, CF_marker, cpts_starts, S, A_FC_ptr, A_FF_ptr);
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixGenerateFFFC3
+ *
  * generate AFF, AFC, for 2 stage extended interpolation
- * ----------------------------------------------------------------------------- */
+ *--------------------------------------------------------------------------*/
 
 HYPRE_Int
 hypre_ParCSRMatrixGenerateFFFC3( hypre_ParCSRMatrix  *A,
@@ -496,6 +545,7 @@ hypre_ParCSRMatrixGenerateFFFC3( hypre_ParCSRMatrix  *A,
    HYPRE_Complex      *A_diag_data = hypre_CSRMatrixData(A_diag);
    HYPRE_Int          *A_diag_i = hypre_CSRMatrixI(A_diag);
    HYPRE_Int          *A_diag_j = hypre_CSRMatrixJ(A_diag);
+
    /* off-diag part of A */
    hypre_CSRMatrix    *A_offd   = hypre_ParCSRMatrixOffd(A);
    HYPRE_Complex      *A_offd_data = hypre_CSRMatrixData(A_offd);
@@ -509,6 +559,7 @@ hypre_ParCSRMatrixGenerateFFFC3( hypre_ParCSRMatrix  *A,
    hypre_CSRMatrix    *S_diag   = hypre_ParCSRMatrixDiag(S);
    HYPRE_Int          *S_diag_i = hypre_CSRMatrixI(S_diag);
    HYPRE_Int          *S_diag_j = hypre_CSRMatrixJ(S_diag);
+
    /* off-diag part of S */
    hypre_CSRMatrix    *S_offd   = hypre_ParCSRMatrixOffd(S);
    HYPRE_Int          *S_offd_i = hypre_CSRMatrixI(S_offd);
@@ -516,8 +567,8 @@ hypre_ParCSRMatrixGenerateFFFC3( hypre_ParCSRMatrix  *A,
 
    hypre_ParCSRMatrix *A_FC;
    hypre_CSRMatrix    *A_FC_diag, *A_FC_offd;
-   HYPRE_Int          *A_FC_diag_i, *A_FC_diag_j, *A_FC_offd_i, *A_FC_offd_j=NULL;
-   HYPRE_Complex      *A_FC_diag_data, *A_FC_offd_data=NULL;
+   HYPRE_Int          *A_FC_diag_i, *A_FC_diag_j, *A_FC_offd_i, *A_FC_offd_j = NULL;
+   HYPRE_Complex      *A_FC_diag_data, *A_FC_offd_data = NULL;
    HYPRE_Int           num_cols_offd_A_FC;
    HYPRE_BigInt       *col_map_offd_A_FC = NULL;
 
@@ -543,7 +594,7 @@ hypre_ParCSRMatrixGenerateFFFC3( hypre_ParCSRMatrix  *A,
    HYPRE_BigInt       *big_buf_data = NULL;
 
    HYPRE_BigInt        total_global_fpts, total_global_cpts, total_global_new_fpts;
-   HYPRE_BigInt       *fpts_starts, *new_fpts_starts;
+   HYPRE_BigInt        fpts_starts[2], new_fpts_starts[2];
    HYPRE_Int           my_id, num_procs, num_sends;
    HYPRE_Int           d_count_FF, d_count_FC, o_count_FF, o_count_FC;
    HYPRE_Int           n_Fpts;
@@ -562,60 +613,60 @@ hypre_ParCSRMatrixGenerateFFFC3( hypre_ParCSRMatrix  *A,
    fine_to_fine = hypre_CTAlloc(HYPRE_Int, n_fine, HYPRE_MEMORY_HOST);
    big_convert = hypre_CTAlloc(HYPRE_BigInt, n_fine, HYPRE_MEMORY_HOST);
 
-   cpt_array = hypre_CTAlloc(HYPRE_Int, num_threads+1, HYPRE_MEMORY_HOST);
-   fpt_array = hypre_CTAlloc(HYPRE_Int, num_threads+1, HYPRE_MEMORY_HOST);
-   new_fpt_array = hypre_CTAlloc(HYPRE_Int, num_threads+1, HYPRE_MEMORY_HOST);
+   cpt_array = hypre_CTAlloc(HYPRE_Int, num_threads + 1, HYPRE_MEMORY_HOST);
+   fpt_array = hypre_CTAlloc(HYPRE_Int, num_threads + 1, HYPRE_MEMORY_HOST);
+   new_fpt_array = hypre_CTAlloc(HYPRE_Int, num_threads + 1, HYPRE_MEMORY_HOST);
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel private(i,j,jj,start,stop,row,rowc,cpt,new_fpt,fpt,d_count_FC,d_count_FF,o_count_FC,o_count_FF)
+   #pragma omp parallel private(i,j,jj,start,stop,row,rowc,cpt,new_fpt,fpt,d_count_FC,d_count_FF,o_count_FC,o_count_FF)
 #endif
    {
       HYPRE_Int my_thread_num = hypre_GetThreadNum();
 
-      start = (n_fine/num_threads)*my_thread_num;
-      if (my_thread_num == num_threads-1)
+      start = (n_fine / num_threads) * my_thread_num;
+      if (my_thread_num == num_threads - 1)
       {
          stop = n_fine;
       }
       else
       {
-         stop = (n_fine/num_threads)*(my_thread_num+1);
+         stop = (n_fine / num_threads) * (my_thread_num + 1);
       }
-      for (i=start; i < stop; i++)
+      for (i = start; i < stop; i++)
       {
          if (CF_marker[i] > 0)
          {
-            cpt_array[my_thread_num+1]++;
+            cpt_array[my_thread_num + 1]++;
          }
          else if (CF_marker[i] == -2)
          {
-            new_fpt_array[my_thread_num+1]++;
-            fpt_array[my_thread_num+1]++;
+            new_fpt_array[my_thread_num + 1]++;
+            fpt_array[my_thread_num + 1]++;
          }
          else
          {
-            fpt_array[my_thread_num+1]++;
+            fpt_array[my_thread_num + 1]++;
          }
       }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
       if (my_thread_num == 0)
       {
-         for (i=1; i < num_threads; i++)
+         for (i = 1; i < num_threads; i++)
          {
-            cpt_array[i+1] += cpt_array[i];
-            fpt_array[i+1] += fpt_array[i];
-            new_fpt_array[i+1] += new_fpt_array[i];
+            cpt_array[i + 1] += cpt_array[i];
+            fpt_array[i + 1] += fpt_array[i];
+            new_fpt_array[i + 1] += new_fpt_array[i];
          }
       }
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
 
       cpt = cpt_array[my_thread_num];
       fpt = fpt_array[my_thread_num];
-      for (i=start; i < stop; i++)
+      for (i = start; i < stop; i++)
       {
          if (CF_marker[i] > 0)
          {
@@ -629,7 +680,7 @@ hypre_ParCSRMatrixGenerateFFFC3( hypre_ParCSRMatrix  *A,
          }
       }
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
 
       if (my_thread_num == 0)
@@ -640,10 +691,8 @@ hypre_ParCSRMatrixGenerateFFFC3( hypre_ParCSRMatrix  *A,
          big_Fpts = n_Fpts;
          big_new_Fpts = n_new_Fpts;
 
-         fpts_starts = hypre_CTAlloc(HYPRE_BigInt, 2, HYPRE_MEMORY_HOST);
-         new_fpts_starts = hypre_CTAlloc(HYPRE_BigInt, 2, HYPRE_MEMORY_HOST);
-         hypre_MPI_Scan(&big_Fpts, fpts_starts+1, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
-         hypre_MPI_Scan(&big_new_Fpts, new_fpts_starts+1, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
+         hypre_MPI_Scan(&big_Fpts, fpts_starts + 1, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
+         hypre_MPI_Scan(&big_new_Fpts, new_fpts_starts + 1, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
          fpts_starts[0] = fpts_starts[1] - big_Fpts;
          new_fpts_starts[0] = new_fpts_starts[1] - big_new_Fpts;
          if (my_id == num_procs - 1)
@@ -652,15 +701,15 @@ hypre_ParCSRMatrixGenerateFFFC3( hypre_ParCSRMatrix  *A,
             total_global_fpts = fpts_starts[1];
             total_global_cpts = cpts_starts[1];
          }
-         hypre_MPI_Bcast(&total_global_new_fpts, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
-         hypre_MPI_Bcast(&total_global_fpts, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
-         hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
+         hypre_MPI_Bcast(&total_global_new_fpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
+         hypre_MPI_Bcast(&total_global_fpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
+         hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
       }
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
 
-      for (i=start; i < stop; i++)
+      for (i = start; i < stop; i++)
       {
          if (CF_marker[i] > 0)
          {
@@ -673,7 +722,7 @@ hypre_ParCSRMatrixGenerateFFFC3( hypre_ParCSRMatrix  *A,
       }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
       if (my_thread_num == 0)
       {
@@ -686,15 +735,19 @@ hypre_ParCSRMatrixGenerateFFFC3( hypre_ParCSRMatrix  *A,
          }
          index = 0;
          num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
-         int_buf_data = hypre_CTAlloc(HYPRE_Int,  hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends), HYPRE_MEMORY_HOST);
-         big_buf_data = hypre_CTAlloc(HYPRE_BigInt,  hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends), HYPRE_MEMORY_HOST);
+         int_buf_data = hypre_CTAlloc(HYPRE_Int,
+                                      hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                                      HYPRE_MEMORY_HOST);
+         big_buf_data = hypre_CTAlloc(HYPRE_BigInt,
+                                      hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                                      HYPRE_MEMORY_HOST);
          for (i = 0; i < num_sends; i++)
          {
             startc = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-            for (j = startc; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+            for (j = startc; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
             {
-               int_buf_data[index] = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
-               big_buf_data[index++] = big_convert[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+               int_buf_data[index] = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
+               big_buf_data[index++] = big_convert[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
             }
          }
 
@@ -702,7 +755,7 @@ hypre_ParCSRMatrixGenerateFFFC3( hypre_ParCSRMatrix  *A,
 
          hypre_ParCSRCommHandleDestroy(comm_handle);
 
-         comm_handle = hypre_ParCSRCommHandleCreate( 21, comm_pkg, big_buf_data, big_convert_offd);
+         comm_handle = hypre_ParCSRCommHandleCreate(21, comm_pkg, big_buf_data, big_convert_offd);
 
          hypre_ParCSRCommHandleDestroy(comm_handle);
 
@@ -710,7 +763,7 @@ hypre_ParCSRMatrixGenerateFFFC3( hypre_ParCSRMatrix  *A,
          num_cols_offd_A_FF = 0;
          if (num_cols_A_offd)
          {
-            for (i=0; i < num_cols_A_offd; i++)
+            for (i = 0; i < num_cols_A_offd; i++)
             {
                if (CF_marker_offd[i] > 0)
                {
@@ -729,7 +782,7 @@ hypre_ParCSRMatrixGenerateFFFC3( hypre_ParCSRMatrix  *A,
 
             cpt = 0;
             fpt = 0;
-            for (i=0; i < num_cols_A_offd; i++)
+            for (i = 0; i < num_cols_A_offd; i++)
             {
                if (CF_marker_offd[i] > 0)
                {
@@ -737,19 +790,19 @@ hypre_ParCSRMatrixGenerateFFFC3( hypre_ParCSRMatrix  *A,
                }
                else
                {
-                   col_map_offd_A_FF[fpt++] = big_convert_offd[i];
+                  col_map_offd_A_FF[fpt++] = big_convert_offd[i];
                }
             }
          }
 
-         A_FF_diag_i = hypre_CTAlloc(HYPRE_Int,n_new_Fpts+1, memory_location_P);
-         A_FC_diag_i = hypre_CTAlloc(HYPRE_Int,n_Fpts+1, memory_location_P);
-         A_FF_offd_i = hypre_CTAlloc(HYPRE_Int,n_new_Fpts+1, memory_location_P);
-         A_FC_offd_i = hypre_CTAlloc(HYPRE_Int,n_Fpts+1, memory_location_P);
+         A_FF_diag_i = hypre_CTAlloc(HYPRE_Int, n_new_Fpts + 1, memory_location_P);
+         A_FC_diag_i = hypre_CTAlloc(HYPRE_Int, n_Fpts + 1, memory_location_P);
+         A_FF_offd_i = hypre_CTAlloc(HYPRE_Int, n_new_Fpts + 1, memory_location_P);
+         A_FC_offd_i = hypre_CTAlloc(HYPRE_Int, n_Fpts + 1, memory_location_P);
       }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
       d_count_FC = 0;
       d_count_FF = 0;
@@ -757,30 +810,38 @@ hypre_ParCSRMatrixGenerateFFFC3( hypre_ParCSRMatrix  *A,
       o_count_FF = 0;
       row = new_fpt_array[my_thread_num];
       rowc = fpt_array[my_thread_num];
-      for (i=start; i < stop; i++)
+      for (i = start; i < stop; i++)
       {
          if (CF_marker[i] == -2)
          {
             row++;
             rowc++;
             d_count_FF++; /* account for diagonal element */
-            for (j = S_diag_i[i]; j < S_diag_i[i+1]; j++)
+            for (j = S_diag_i[i]; j < S_diag_i[i + 1]; j++)
             {
                jj = S_diag_j[j];
                if (CF_marker[jj] > 0)
+               {
                   d_count_FC++;
+               }
                else
+               {
                   d_count_FF++;
+               }
             }
             A_FF_diag_i[row] = d_count_FF;
             A_FC_diag_i[rowc] = d_count_FC;
-            for (j = S_offd_i[i]; j < S_offd_i[i+1]; j++)
+            for (j = S_offd_i[i]; j < S_offd_i[i + 1]; j++)
             {
                jj = S_offd_j[j];
                if (CF_marker_offd[jj] > 0)
+               {
                   o_count_FC++;
+               }
                else
+               {
                   o_count_FF++;
+               }
             }
             A_FF_offd_i[row] = o_count_FF;
             A_FC_offd_i[rowc] = o_count_FC;
@@ -788,35 +849,39 @@ hypre_ParCSRMatrixGenerateFFFC3( hypre_ParCSRMatrix  *A,
          else if (CF_marker[i] < 0)
          {
             rowc++;
-            for (j = S_diag_i[i]; j < S_diag_i[i+1]; j++)
+            for (j = S_diag_i[i]; j < S_diag_i[i + 1]; j++)
             {
                jj = S_diag_j[j];
                if (CF_marker[jj] > 0)
+               {
                   d_count_FC++;
+               }
             }
             A_FC_diag_i[rowc] = d_count_FC;
-            for (j = S_offd_i[i]; j < S_offd_i[i+1]; j++)
+            for (j = S_offd_i[i]; j < S_offd_i[i + 1]; j++)
             {
                jj = S_offd_j[j];
                if (CF_marker_offd[jj] > 0)
+               {
                   o_count_FC++;
+               }
             }
             A_FC_offd_i[rowc] = o_count_FC;
          }
       }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
       if (my_thread_num == 0)
       {
          HYPRE_Int fpt2, new_fpt2;
-         for (i=1; i<num_threads+1; i++)
+         for (i = 1; i < num_threads + 1; i++)
          {
             fpt = fpt_array[i];
             new_fpt = new_fpt_array[i];
-            fpt2 = fpt_array[i-1];
-            new_fpt2 = new_fpt_array[i-1];
+            fpt2 = fpt_array[i - 1];
+            new_fpt2 = new_fpt_array[i - 1];
             if (new_fpt != new_fpt2)
             {
                A_FF_diag_i[new_fpt] += A_FF_diag_i[new_fpt2];
@@ -834,18 +899,18 @@ hypre_ParCSRMatrixGenerateFFFC3( hypre_ParCSRMatrix  *A,
          d_count_FF = A_FF_diag_i[row];
          o_count_FC = A_FC_offd_i[rowc];
          o_count_FF = A_FF_offd_i[row];
-         A_FF_diag_j = hypre_CTAlloc(HYPRE_Int,d_count_FF, memory_location_P);
-         A_FC_diag_j = hypre_CTAlloc(HYPRE_Int,d_count_FC, memory_location_P);
-         A_FF_offd_j = hypre_CTAlloc(HYPRE_Int,o_count_FF, memory_location_P);
-         A_FC_offd_j = hypre_CTAlloc(HYPRE_Int,o_count_FC, memory_location_P);
-         A_FF_diag_data = hypre_CTAlloc(HYPRE_Real,d_count_FF, memory_location_P);
-         A_FC_diag_data = hypre_CTAlloc(HYPRE_Real,d_count_FC, memory_location_P);
-         A_FF_offd_data = hypre_CTAlloc(HYPRE_Real,o_count_FF, memory_location_P);
-         A_FC_offd_data = hypre_CTAlloc(HYPRE_Real,o_count_FC, memory_location_P);
+         A_FF_diag_j = hypre_CTAlloc(HYPRE_Int, d_count_FF, memory_location_P);
+         A_FC_diag_j = hypre_CTAlloc(HYPRE_Int, d_count_FC, memory_location_P);
+         A_FF_offd_j = hypre_CTAlloc(HYPRE_Int, o_count_FF, memory_location_P);
+         A_FC_offd_j = hypre_CTAlloc(HYPRE_Int, o_count_FC, memory_location_P);
+         A_FF_diag_data = hypre_CTAlloc(HYPRE_Real, d_count_FF, memory_location_P);
+         A_FC_diag_data = hypre_CTAlloc(HYPRE_Real, d_count_FC, memory_location_P);
+         A_FF_offd_data = hypre_CTAlloc(HYPRE_Real, o_count_FF, memory_location_P);
+         A_FC_offd_data = hypre_CTAlloc(HYPRE_Real, o_count_FC, memory_location_P);
       }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
       row = new_fpt_array[my_thread_num];
       rowc = fpt_array[my_thread_num];
@@ -853,7 +918,7 @@ hypre_ParCSRMatrixGenerateFFFC3( hypre_ParCSRMatrix  *A,
       d_count_FF = A_FF_diag_i[row];
       o_count_FC = A_FC_offd_i[rowc];
       o_count_FF = A_FF_offd_i[row];
-      for (i=start; i < stop; i++)
+      for (i = start; i < stop; i++)
       {
          if (CF_marker[i] == -2)
          {
@@ -863,11 +928,11 @@ hypre_ParCSRMatrixGenerateFFFC3( hypre_ParCSRMatrix  *A,
             jA = A_diag_i[i];
             A_FF_diag_j[d_count_FF] = fine_to_fine[A_diag_j[jA]];
             A_FF_diag_data[d_count_FF++] = A_diag_data[jA++];
-            for (j = S_diag_i[i]; j < S_diag_i[i+1]; j++)
+            for (j = S_diag_i[i]; j < S_diag_i[i + 1]; j++)
             {
-               jA = A_diag_i[i]+1;
+               jA = A_diag_i[i] + 1;
                jS = S_diag_j[j];
-               while (A_diag_j[jA] != jS) jA++;
+               while (A_diag_j[jA] != jS) { jA++; }
                if (CF_marker[S_diag_j[j]] > 0)
                {
                   A_FC_diag_j[d_count_FC] = fine_to_coarse[A_diag_j[jA]];
@@ -881,11 +946,11 @@ hypre_ParCSRMatrixGenerateFFFC3( hypre_ParCSRMatrix  *A,
             }
             A_FF_diag_i[row] = d_count_FF;
             A_FC_diag_i[rowc] = d_count_FC;
-            for (j = S_offd_i[i]; j < S_offd_i[i+1]; j++)
+            for (j = S_offd_i[i]; j < S_offd_i[i + 1]; j++)
             {
                jA = A_offd_i[i];
                jS = S_offd_j[j];
-               while (jS != A_offd_j[jA]) jA++;
+               while (jS != A_offd_j[jA]) { jA++; }
                if (CF_marker_offd[S_offd_j[j]] > 0)
                {
                   A_FC_offd_j[o_count_FC] = fine_to_coarse_offd[A_offd_j[jA]];
@@ -904,11 +969,11 @@ hypre_ParCSRMatrixGenerateFFFC3( hypre_ParCSRMatrix  *A,
          {
             HYPRE_Int jS, jA;
             rowc++;
-            for (j = S_diag_i[i]; j < S_diag_i[i+1]; j++)
+            for (j = S_diag_i[i]; j < S_diag_i[i + 1]; j++)
             {
-               jA = A_diag_i[i]+1;
+               jA = A_diag_i[i] + 1;
                jS = S_diag_j[j];
-               while (A_diag_j[jA] != jS) jA++;
+               while (A_diag_j[jA] != jS) { jA++; }
                if (CF_marker[S_diag_j[j]] > 0)
                {
                   A_FC_diag_j[d_count_FC] = fine_to_coarse[A_diag_j[jA]];
@@ -916,11 +981,11 @@ hypre_ParCSRMatrixGenerateFFFC3( hypre_ParCSRMatrix  *A,
                }
             }
             A_FC_diag_i[rowc] = d_count_FC;
-            for (j = S_offd_i[i]; j < S_offd_i[i+1]; j++)
+            for (j = S_offd_i[i]; j < S_offd_i[i + 1]; j++)
             {
                jA = A_offd_i[i];
                jS = S_offd_j[j];
-               while (jS != A_offd_j[jA]) jA++;
+               while (jS != A_offd_j[jA]) { jA++; }
                if (CF_marker_offd[S_offd_j[j]] > 0)
                {
                   A_FC_offd_j[o_count_FC] = fine_to_coarse_offd[A_offd_j[jA]];
@@ -933,22 +998,22 @@ hypre_ParCSRMatrixGenerateFFFC3( hypre_ParCSRMatrix  *A,
    } /*end parallel region */
 
    A_FC = hypre_ParCSRMatrixCreate(comm,
-            total_global_fpts,
-            total_global_cpts,
-            fpts_starts,
-            cpts_starts,
-            num_cols_offd_A_FC,
-            A_FC_diag_i[n_Fpts],
-            A_FC_offd_i[n_Fpts]);
+                                   total_global_fpts,
+                                   total_global_cpts,
+                                   fpts_starts,
+                                   cpts_starts,
+                                   num_cols_offd_A_FC,
+                                   A_FC_diag_i[n_Fpts],
+                                   A_FC_offd_i[n_Fpts]);
 
    A_FF = hypre_ParCSRMatrixCreate(comm,
-            total_global_new_fpts,
-            total_global_fpts,
-            new_fpts_starts,
-            fpts_starts,
-            num_cols_offd_A_FF,
-            A_FF_diag_i[n_new_Fpts],
-            A_FF_offd_i[n_new_Fpts]);
+                                   total_global_new_fpts,
+                                   total_global_fpts,
+                                   new_fpts_starts,
+                                   fpts_starts,
+                                   num_cols_offd_A_FF,
+                                   A_FF_diag_i[n_new_Fpts],
+                                   A_FF_offd_i[n_new_Fpts]);
 
    A_FC_diag = hypre_ParCSRMatrixDiag(A_FC);
    hypre_CSRMatrixData(A_FC_diag) = A_FC_diag_data;
@@ -989,17 +1054,18 @@ hypre_ParCSRMatrixGenerateFFFC3( hypre_ParCSRMatrix  *A,
    hypre_TFree(cpt_array, HYPRE_MEMORY_HOST);
    hypre_TFree(fpt_array, HYPRE_MEMORY_HOST);
    hypre_TFree(new_fpt_array, HYPRE_MEMORY_HOST);
-   hypre_TFree(fpts_starts, HYPRE_MEMORY_HOST);
-   hypre_TFree(new_fpts_starts, HYPRE_MEMORY_HOST);
 
    *A_FC_ptr = A_FC;
    *A_FF_ptr = A_FF;
 
    return hypre_error_flag;
 }
-/* -----------------------------------------------------------------------------
- * generate AFF, AFC, AFFC for 2 stage extended+i(e)interpolation
- * ----------------------------------------------------------------------------- */
+
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixGenerateFFFCD3
+ *
+ * Generate AFF, AFC, AFFC for 2 stage extended+i(e)interpolation
+ *--------------------------------------------------------------------------*/
 
 HYPRE_Int
 hypre_ParCSRMatrixGenerateFFFCD3( hypre_ParCSRMatrix *A,
@@ -1041,8 +1107,8 @@ hypre_ParCSRMatrixGenerateFFFCD3( hypre_ParCSRMatrix *A,
    HYPRE_Real         *D_lambda;
    hypre_ParCSRMatrix *A_FC;
    hypre_CSRMatrix    *A_FC_diag, *A_FC_offd;
-   HYPRE_Int          *A_FC_diag_i, *A_FC_diag_j, *A_FC_offd_i, *A_FC_offd_j=NULL;
-   HYPRE_Complex      *A_FC_diag_data, *A_FC_offd_data=NULL;
+   HYPRE_Int          *A_FC_diag_i, *A_FC_diag_j, *A_FC_offd_i, *A_FC_offd_j = NULL;
+   HYPRE_Complex      *A_FC_diag_data, *A_FC_offd_data = NULL;
    HYPRE_Int           num_cols_offd_A_FC;
    HYPRE_BigInt       *col_map_offd_A_FC = NULL;
 
@@ -1068,7 +1134,7 @@ hypre_ParCSRMatrixGenerateFFFCD3( hypre_ParCSRMatrix *A,
    HYPRE_BigInt       *big_buf_data = NULL;
 
    HYPRE_BigInt        total_global_fpts, total_global_cpts, total_global_new_fpts;
-   HYPRE_BigInt       *fpts_starts, *new_fpts_starts;
+   HYPRE_BigInt        fpts_starts[2], new_fpts_starts[2];
    HYPRE_Int           my_id, num_procs, num_sends;
    HYPRE_Int           d_count_FF, d_count_FC, o_count_FF, o_count_FC;
    HYPRE_Int           n_Fpts;
@@ -1087,60 +1153,60 @@ hypre_ParCSRMatrixGenerateFFFCD3( hypre_ParCSRMatrix *A,
    fine_to_fine = hypre_CTAlloc(HYPRE_Int, n_fine, HYPRE_MEMORY_HOST);
    big_convert = hypre_CTAlloc(HYPRE_BigInt, n_fine, HYPRE_MEMORY_HOST);
 
-   cpt_array = hypre_CTAlloc(HYPRE_Int, num_threads+1, HYPRE_MEMORY_HOST);
-   fpt_array = hypre_CTAlloc(HYPRE_Int, num_threads+1, HYPRE_MEMORY_HOST);
-   new_fpt_array = hypre_CTAlloc(HYPRE_Int, num_threads+1, HYPRE_MEMORY_HOST);
+   cpt_array = hypre_CTAlloc(HYPRE_Int, num_threads + 1, HYPRE_MEMORY_HOST);
+   fpt_array = hypre_CTAlloc(HYPRE_Int, num_threads + 1, HYPRE_MEMORY_HOST);
+   new_fpt_array = hypre_CTAlloc(HYPRE_Int, num_threads + 1, HYPRE_MEMORY_HOST);
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel private(i,j,jj,start,stop,row,rowc,cpt,new_fpt,fpt,d_count_FC,d_count_FF,o_count_FC,o_count_FF)
+   #pragma omp parallel private(i,j,jj,start,stop,row,rowc,cpt,new_fpt,fpt,d_count_FC,d_count_FF,o_count_FC,o_count_FF)
 #endif
    {
       HYPRE_Int my_thread_num = hypre_GetThreadNum();
 
-      start = (n_fine/num_threads)*my_thread_num;
-      if (my_thread_num == num_threads-1)
+      start = (n_fine / num_threads) * my_thread_num;
+      if (my_thread_num == num_threads - 1)
       {
          stop = n_fine;
       }
       else
       {
-         stop = (n_fine/num_threads)*(my_thread_num+1);
+         stop = (n_fine / num_threads) * (my_thread_num + 1);
       }
-      for (i=start; i < stop; i++)
+      for (i = start; i < stop; i++)
       {
          if (CF_marker[i] > 0)
          {
-            cpt_array[my_thread_num+1]++;
+            cpt_array[my_thread_num + 1]++;
          }
          else if (CF_marker[i] == -2)
          {
-            new_fpt_array[my_thread_num+1]++;
-            fpt_array[my_thread_num+1]++;
+            new_fpt_array[my_thread_num + 1]++;
+            fpt_array[my_thread_num + 1]++;
          }
          else
          {
-            fpt_array[my_thread_num+1]++;
+            fpt_array[my_thread_num + 1]++;
          }
       }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
       if (my_thread_num == 0)
       {
-         for (i=1; i < num_threads; i++)
+         for (i = 1; i < num_threads; i++)
          {
-            cpt_array[i+1] += cpt_array[i];
-            fpt_array[i+1] += fpt_array[i];
-            new_fpt_array[i+1] += new_fpt_array[i];
+            cpt_array[i + 1] += cpt_array[i];
+            fpt_array[i + 1] += fpt_array[i];
+            new_fpt_array[i + 1] += new_fpt_array[i];
          }
       }
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
 
       cpt = cpt_array[my_thread_num];
       fpt = fpt_array[my_thread_num];
-      for (i=start; i < stop; i++)
+      for (i = start; i < stop; i++)
       {
          if (CF_marker[i] > 0)
          {
@@ -1154,7 +1220,7 @@ hypre_ParCSRMatrixGenerateFFFCD3( hypre_ParCSRMatrix *A,
          }
       }
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
 
       if (my_thread_num == 0)
@@ -1165,10 +1231,9 @@ hypre_ParCSRMatrixGenerateFFFCD3( hypre_ParCSRMatrix *A,
          big_Fpts = n_Fpts;
          big_new_Fpts = n_new_Fpts;
 
-         fpts_starts = hypre_CTAlloc(HYPRE_BigInt, 2, HYPRE_MEMORY_HOST);
-         new_fpts_starts = hypre_CTAlloc(HYPRE_BigInt, 2, HYPRE_MEMORY_HOST);
-         hypre_MPI_Scan(&big_Fpts, fpts_starts+1, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
-         hypre_MPI_Scan(&big_new_Fpts, new_fpts_starts+1, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
+         hypre_MPI_Scan(&big_Fpts, fpts_starts + 1, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
+         hypre_MPI_Scan(&big_new_Fpts, new_fpts_starts + 1, 1, HYPRE_MPI_BIG_INT,
+                        hypre_MPI_SUM, comm);
          fpts_starts[0] = fpts_starts[1] - big_Fpts;
          new_fpts_starts[0] = new_fpts_starts[1] - big_new_Fpts;
          if (my_id == num_procs - 1)
@@ -1177,15 +1242,15 @@ hypre_ParCSRMatrixGenerateFFFCD3( hypre_ParCSRMatrix *A,
             total_global_fpts = fpts_starts[1];
             total_global_cpts = cpts_starts[1];
          }
-         hypre_MPI_Bcast(&total_global_new_fpts, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
-         hypre_MPI_Bcast(&total_global_fpts, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
-         hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
+         hypre_MPI_Bcast(&total_global_new_fpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
+         hypre_MPI_Bcast(&total_global_fpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
+         hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
       }
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
 
-      for (i=start; i < stop; i++)
+      for (i = start; i < stop; i++)
       {
          if (CF_marker[i] > 0)
          {
@@ -1198,7 +1263,7 @@ hypre_ParCSRMatrixGenerateFFFCD3( hypre_ParCSRMatrix *A,
       }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
       if (my_thread_num == 0)
       {
@@ -1211,23 +1276,27 @@ hypre_ParCSRMatrixGenerateFFFCD3( hypre_ParCSRMatrix *A,
          }
          index = 0;
          num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
-         int_buf_data = hypre_CTAlloc(HYPRE_Int,  hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends), HYPRE_MEMORY_HOST);
-         big_buf_data = hypre_CTAlloc(HYPRE_BigInt,  hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends), HYPRE_MEMORY_HOST);
+         int_buf_data = hypre_CTAlloc(HYPRE_Int,
+                                      hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                                      HYPRE_MEMORY_HOST);
+         big_buf_data = hypre_CTAlloc(HYPRE_BigInt,
+                                      hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                                      HYPRE_MEMORY_HOST);
          for (i = 0; i < num_sends; i++)
          {
             startc = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-            for (j = startc; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+            for (j = startc; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
             {
-               int_buf_data[index] = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
-               big_buf_data[index++] = big_convert[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+               int_buf_data[index] = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
+               big_buf_data[index++] = big_convert[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
             }
          }
 
-         comm_handle = hypre_ParCSRCommHandleCreate( 11, comm_pkg, int_buf_data, CF_marker_offd);
+         comm_handle = hypre_ParCSRCommHandleCreate(11, comm_pkg, int_buf_data, CF_marker_offd);
 
          hypre_ParCSRCommHandleDestroy(comm_handle);
 
-         comm_handle = hypre_ParCSRCommHandleCreate( 21, comm_pkg, big_buf_data, big_convert_offd);
+         comm_handle = hypre_ParCSRCommHandleCreate(21, comm_pkg, big_buf_data, big_convert_offd);
 
          hypre_ParCSRCommHandleDestroy(comm_handle);
 
@@ -1235,7 +1304,7 @@ hypre_ParCSRMatrixGenerateFFFCD3( hypre_ParCSRMatrix *A,
          num_cols_offd_A_FF = 0;
          if (num_cols_A_offd)
          {
-            for (i=0; i < num_cols_A_offd; i++)
+            for (i = 0; i < num_cols_A_offd; i++)
             {
                if (CF_marker_offd[i] > 0)
                {
@@ -1254,7 +1323,7 @@ hypre_ParCSRMatrixGenerateFFFCD3( hypre_ParCSRMatrix *A,
 
             cpt = 0;
             fpt = 0;
-            for (i=0; i < num_cols_A_offd; i++)
+            for (i = 0; i < num_cols_A_offd; i++)
             {
                if (CF_marker_offd[i] > 0)
                {
@@ -1262,20 +1331,20 @@ hypre_ParCSRMatrixGenerateFFFCD3( hypre_ParCSRMatrix *A,
                }
                else
                {
-                   col_map_offd_A_FF[fpt++] = big_convert_offd[i];
+                  col_map_offd_A_FF[fpt++] = big_convert_offd[i];
                }
             }
          }
 
-         A_FF_diag_i = hypre_CTAlloc(HYPRE_Int,n_new_Fpts+1, memory_location_P);
-         A_FC_diag_i = hypre_CTAlloc(HYPRE_Int,n_Fpts+1, memory_location_P);
-         A_FF_offd_i = hypre_CTAlloc(HYPRE_Int,n_new_Fpts+1, memory_location_P);
-         A_FC_offd_i = hypre_CTAlloc(HYPRE_Int,n_Fpts+1, memory_location_P);
+         A_FF_diag_i = hypre_CTAlloc(HYPRE_Int, n_new_Fpts + 1, memory_location_P);
+         A_FC_diag_i = hypre_CTAlloc(HYPRE_Int, n_Fpts + 1, memory_location_P);
+         A_FF_offd_i = hypre_CTAlloc(HYPRE_Int, n_new_Fpts + 1, memory_location_P);
+         A_FC_offd_i = hypre_CTAlloc(HYPRE_Int, n_Fpts + 1, memory_location_P);
          D_lambda = hypre_CTAlloc(HYPRE_Real, n_Fpts, memory_location_P);
       }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
       d_count_FC = 0;
       d_count_FF = 0;
@@ -1283,30 +1352,38 @@ hypre_ParCSRMatrixGenerateFFFCD3( hypre_ParCSRMatrix *A,
       o_count_FF = 0;
       row = new_fpt_array[my_thread_num];
       rowc = fpt_array[my_thread_num];
-      for (i=start; i < stop; i++)
+      for (i = start; i < stop; i++)
       {
          if (CF_marker[i] == -2)
          {
             row++;
             rowc++;
             d_count_FF++; /* account for diagonal element */
-            for (j = S_diag_i[i]; j < S_diag_i[i+1]; j++)
+            for (j = S_diag_i[i]; j < S_diag_i[i + 1]; j++)
             {
                jj = S_diag_j[j];
                if (CF_marker[jj] > 0)
+               {
                   d_count_FC++;
+               }
                else
+               {
                   d_count_FF++;
+               }
             }
             A_FF_diag_i[row] = d_count_FF;
             A_FC_diag_i[rowc] = d_count_FC;
-            for (j = S_offd_i[i]; j < S_offd_i[i+1]; j++)
+            for (j = S_offd_i[i]; j < S_offd_i[i + 1]; j++)
             {
                jj = S_offd_j[j];
                if (CF_marker_offd[jj] > 0)
+               {
                   o_count_FC++;
+               }
                else
+               {
                   o_count_FF++;
+               }
             }
             A_FF_offd_i[row] = o_count_FF;
             A_FC_offd_i[rowc] = o_count_FC;
@@ -1314,35 +1391,39 @@ hypre_ParCSRMatrixGenerateFFFCD3( hypre_ParCSRMatrix *A,
          else if (CF_marker[i] < 0)
          {
             rowc++;
-            for (j = S_diag_i[i]; j < S_diag_i[i+1]; j++)
+            for (j = S_diag_i[i]; j < S_diag_i[i + 1]; j++)
             {
                jj = S_diag_j[j];
                if (CF_marker[jj] > 0)
+               {
                   d_count_FC++;
+               }
             }
             A_FC_diag_i[rowc] = d_count_FC;
-            for (j = S_offd_i[i]; j < S_offd_i[i+1]; j++)
+            for (j = S_offd_i[i]; j < S_offd_i[i + 1]; j++)
             {
                jj = S_offd_j[j];
                if (CF_marker_offd[jj] > 0)
+               {
                   o_count_FC++;
+               }
             }
             A_FC_offd_i[rowc] = o_count_FC;
          }
       }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
       if (my_thread_num == 0)
       {
          HYPRE_Int fpt2, new_fpt2;
-         for (i=1; i<num_threads+1; i++)
+         for (i = 1; i < num_threads + 1; i++)
          {
             fpt = fpt_array[i];
             new_fpt = new_fpt_array[i];
-            fpt2 = fpt_array[i-1];
-            new_fpt2 = new_fpt_array[i-1];
+            fpt2 = fpt_array[i - 1];
+            new_fpt2 = new_fpt_array[i - 1];
             if (fpt != fpt2)
             {
                A_FC_diag_i[fpt] += A_FC_diag_i[fpt2];
@@ -1360,18 +1441,18 @@ hypre_ParCSRMatrixGenerateFFFCD3( hypre_ParCSRMatrix *A,
          d_count_FF = A_FF_diag_i[row];
          o_count_FC = A_FC_offd_i[rowc];
          o_count_FF = A_FF_offd_i[row];
-         A_FF_diag_j = hypre_CTAlloc(HYPRE_Int,d_count_FF, memory_location_P);
-         A_FC_diag_j = hypre_CTAlloc(HYPRE_Int,d_count_FC, memory_location_P);
-         A_FF_offd_j = hypre_CTAlloc(HYPRE_Int,o_count_FF, memory_location_P);
-         A_FC_offd_j = hypre_CTAlloc(HYPRE_Int,o_count_FC, memory_location_P);
-         A_FF_diag_data = hypre_CTAlloc(HYPRE_Real,d_count_FF, memory_location_P);
-         A_FC_diag_data = hypre_CTAlloc(HYPRE_Real,d_count_FC, memory_location_P);
-         A_FF_offd_data = hypre_CTAlloc(HYPRE_Real,o_count_FF, memory_location_P);
-         A_FC_offd_data = hypre_CTAlloc(HYPRE_Real,o_count_FC, memory_location_P);
+         A_FF_diag_j = hypre_CTAlloc(HYPRE_Int, d_count_FF, memory_location_P);
+         A_FC_diag_j = hypre_CTAlloc(HYPRE_Int, d_count_FC, memory_location_P);
+         A_FF_offd_j = hypre_CTAlloc(HYPRE_Int, o_count_FF, memory_location_P);
+         A_FC_offd_j = hypre_CTAlloc(HYPRE_Int, o_count_FC, memory_location_P);
+         A_FF_diag_data = hypre_CTAlloc(HYPRE_Real, d_count_FF, memory_location_P);
+         A_FC_diag_data = hypre_CTAlloc(HYPRE_Real, d_count_FC, memory_location_P);
+         A_FF_offd_data = hypre_CTAlloc(HYPRE_Real, o_count_FF, memory_location_P);
+         A_FC_offd_data = hypre_CTAlloc(HYPRE_Real, o_count_FC, memory_location_P);
       }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
       row = new_fpt_array[my_thread_num];
       rowc = fpt_array[my_thread_num];
@@ -1379,7 +1460,7 @@ hypre_ParCSRMatrixGenerateFFFCD3( hypre_ParCSRMatrix *A,
       d_count_FF = A_FF_diag_i[row];
       o_count_FC = A_FC_offd_i[rowc];
       o_count_FF = A_FF_offd_i[row];
-      for (i=start; i < stop; i++)
+      for (i = start; i < stop; i++)
       {
          if (CF_marker[i] == -2)
          {
@@ -1389,11 +1470,11 @@ hypre_ParCSRMatrixGenerateFFFCD3( hypre_ParCSRMatrix *A,
             jA = A_diag_i[i];
             A_FF_diag_j[d_count_FF] = fine_to_fine[A_diag_j[jA]];
             A_FF_diag_data[d_count_FF++] = A_diag_data[jA++];
-            for (j = S_diag_i[i]; j < S_diag_i[i+1]; j++)
+            for (j = S_diag_i[i]; j < S_diag_i[i + 1]; j++)
             {
-               jA = A_diag_i[i]+1;
+               jA = A_diag_i[i] + 1;
                jS = S_diag_j[j];
-               while (A_diag_j[jA] != jS) jA++;
+               while (A_diag_j[jA] != jS) { jA++; }
                if (CF_marker[S_diag_j[j]] > 0)
                {
                   A_FC_diag_j[d_count_FC] = fine_to_coarse[A_diag_j[jA]];
@@ -1407,11 +1488,11 @@ hypre_ParCSRMatrixGenerateFFFCD3( hypre_ParCSRMatrix *A,
                   A_FF_diag_data[d_count_FF++] = A_diag_data[jA++];
                }
             }
-            for (j = S_offd_i[i]; j < S_offd_i[i+1]; j++)
+            for (j = S_offd_i[i]; j < S_offd_i[i + 1]; j++)
             {
                jA = A_offd_i[i];
                jS = S_offd_j[j];
-               while (jS != A_offd_j[jA]) jA++;
+               while (jS != A_offd_j[jA]) { jA++; }
                if (CF_marker_offd[S_offd_j[j]] > 0)
                {
                   A_FC_offd_j[o_count_FC] = fine_to_coarse_offd[A_offd_j[jA]];
@@ -1425,7 +1506,7 @@ hypre_ParCSRMatrixGenerateFFFCD3( hypre_ParCSRMatrix *A,
                   A_FF_offd_data[o_count_FF++] = A_offd_data[jA++];
                }
             }
-            if (sum) D_lambda[rowc] = D_lambda[rowc]/sum;
+            if (sum) { D_lambda[rowc] = D_lambda[rowc] / sum; }
             rowc++;
             A_FF_diag_i[row] = d_count_FF;
             A_FC_diag_i[rowc] = d_count_FC;
@@ -1436,11 +1517,11 @@ hypre_ParCSRMatrixGenerateFFFCD3( hypre_ParCSRMatrix *A,
          {
             HYPRE_Int jS, jA;
             HYPRE_Real sum = 0;
-            for (j = S_diag_i[i]; j < S_diag_i[i+1]; j++)
+            for (j = S_diag_i[i]; j < S_diag_i[i + 1]; j++)
             {
-               jA = A_diag_i[i]+1;
+               jA = A_diag_i[i] + 1;
                jS = S_diag_j[j];
-               while (A_diag_j[jA] != jS) jA++;
+               while (A_diag_j[jA] != jS) { jA++; }
                if (CF_marker[S_diag_j[j]] > 0)
                {
                   A_FC_diag_j[d_count_FC] = fine_to_coarse[A_diag_j[jA]];
@@ -1452,11 +1533,11 @@ hypre_ParCSRMatrixGenerateFFFCD3( hypre_ParCSRMatrix *A,
                   D_lambda[rowc] += A_diag_data[jA];
                }
             }
-            for (j = S_offd_i[i]; j < S_offd_i[i+1]; j++)
+            for (j = S_offd_i[i]; j < S_offd_i[i + 1]; j++)
             {
                jA = A_offd_i[i];
                jS = S_offd_j[j];
-               while (jS != A_offd_j[jA]) jA++;
+               while (jS != A_offd_j[jA]) { jA++; }
                if (CF_marker_offd[S_offd_j[j]] > 0)
                {
                   A_FC_offd_j[o_count_FC] = fine_to_coarse_offd[A_offd_j[jA]];
@@ -1468,7 +1549,7 @@ hypre_ParCSRMatrixGenerateFFFCD3( hypre_ParCSRMatrix *A,
                   D_lambda[rowc] += A_offd_data[jA];
                }
             }
-            if (sum) D_lambda[rowc] = D_lambda[rowc]/sum;
+            if (sum) { D_lambda[rowc] = D_lambda[rowc] / sum; }
             rowc++;
             A_FC_diag_i[rowc] = d_count_FC;
             A_FC_offd_i[rowc] = o_count_FC;
@@ -1477,22 +1558,22 @@ hypre_ParCSRMatrixGenerateFFFCD3( hypre_ParCSRMatrix *A,
    } /*end parallel region */
 
    A_FC = hypre_ParCSRMatrixCreate(comm,
-            total_global_fpts,
-            total_global_cpts,
-            fpts_starts,
-            cpts_starts,
-            num_cols_offd_A_FC,
-            A_FC_diag_i[n_Fpts],
-            A_FC_offd_i[n_Fpts]);
+                                   total_global_fpts,
+                                   total_global_cpts,
+                                   fpts_starts,
+                                   cpts_starts,
+                                   num_cols_offd_A_FC,
+                                   A_FC_diag_i[n_Fpts],
+                                   A_FC_offd_i[n_Fpts]);
 
    A_FF = hypre_ParCSRMatrixCreate(comm,
-            total_global_new_fpts,
-            total_global_fpts,
-            new_fpts_starts,
-            fpts_starts,
-            num_cols_offd_A_FF,
-            A_FF_diag_i[n_new_Fpts],
-            A_FF_offd_i[n_new_Fpts]);
+                                   total_global_new_fpts,
+                                   total_global_fpts,
+                                   new_fpts_starts,
+                                   fpts_starts,
+                                   num_cols_offd_A_FF,
+                                   A_FF_diag_i[n_new_Fpts],
+                                   A_FF_offd_i[n_new_Fpts]);
 
    A_FC_diag = hypre_ParCSRMatrixDiag(A_FC);
    hypre_CSRMatrixData(A_FC_diag) = A_FC_diag_data;
@@ -1533,8 +1614,6 @@ hypre_ParCSRMatrixGenerateFFFCD3( hypre_ParCSRMatrix *A,
    hypre_TFree(cpt_array, HYPRE_MEMORY_HOST);
    hypre_TFree(fpt_array, HYPRE_MEMORY_HOST);
    hypre_TFree(new_fpt_array, HYPRE_MEMORY_HOST);
-   hypre_TFree(fpts_starts, HYPRE_MEMORY_HOST);
-   hypre_TFree(new_fpts_starts, HYPRE_MEMORY_HOST);
 
    *A_FC_ptr = A_FC;
    *A_FF_ptr = A_FF;
diff --git a/external/hypre/src/parcsr_mv/headers b/external/hypre/src/parcsr_mv/headers
old mode 100644
new mode 100755
index 1fd98021..dd9a4351
--- a/external/hypre/src/parcsr_mv/headers
+++ b/external/hypre/src/parcsr_mv/headers
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -20,6 +20,7 @@ cat > $INTERNAL_HEADER <<@
 #include <HYPRE_config.h>
 #include "HYPRE_parcsr_mv.h"
 #include "_hypre_utilities.h"
+#include "_hypre_seq_block_mv.h"
 #include "seq_mv.h"
 
 #ifdef __cplusplus
@@ -57,4 +58,3 @@ cat >> $INTERNAL_HEADER <<@
 #endif
 
 @
-
diff --git a/external/hypre/src/parcsr_mv/new_commpkg.c b/external/hypre/src/parcsr_mv/new_commpkg.c
index 74e1eb43..f835fa3e 100644
--- a/external/hypre/src/parcsr_mv/new_commpkg.c
+++ b/external/hypre/src/parcsr_mv/new_commpkg.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -17,32 +17,25 @@
 
 /*==========================================================================*/
 
-
-
-HYPRE_Int hypre_PrintCommpkg(hypre_ParCSRMatrix *A, const char *file_name)
+HYPRE_Int
+hypre_PrintCommpkg(hypre_ParCSRMatrix *A, const char *file_name)
 {
-
-   HYPRE_Int num_sends, num_recvs;
+   HYPRE_Int  num_components, num_sends, num_recvs;
 
    HYPRE_Int *recv_vec_starts, *recv_procs;
    HYPRE_Int *send_map_starts, *send_map_elements, *send_procs;
 
-   HYPRE_Int i;
-   HYPRE_Int my_id;
-
-   MPI_Comm comm;
-
+   HYPRE_Int  i;
+   HYPRE_Int  my_id;
+   MPI_Comm   comm;
    hypre_ParCSRCommPkg *comm_pkg;
 
-
    char   new_file[80];
    FILE *fp;
 
-   comm_pkg =  hypre_ParCSRMatrixCommPkg(A);
-
-
-   comm =  hypre_ParCSRCommPkgComm(comm_pkg);
-
+   comm_pkg = hypre_ParCSRMatrixCommPkg(A);
+   comm = hypre_ParCSRCommPkgComm(comm_pkg);
+   num_components = hypre_ParCSRCommPkgNumComponents(comm_pkg);
    num_recvs = hypre_ParCSRCommPkgNumRecvs(comm_pkg);
    recv_procs = hypre_ParCSRCommPkgRecvProcs(comm_pkg);
    recv_vec_starts = hypre_ParCSRCommPkgRecvVecStarts(comm_pkg);
@@ -51,25 +44,27 @@ HYPRE_Int hypre_PrintCommpkg(hypre_ParCSRMatrix *A, const char *file_name)
    send_map_starts = hypre_ParCSRCommPkgSendMapStarts(comm_pkg);
    send_map_elements = hypre_ParCSRCommPkgSendMapElmts(comm_pkg);
 
-
    hypre_MPI_Comm_rank(comm, &my_id);
 
-   hypre_sprintf(new_file,"%s.%d",file_name,my_id);
+   hypre_sprintf(new_file, "%s.%d", file_name, my_id);
 
    fp = fopen(new_file, "w");
+   hypre_fprintf(fp, "num_components = %d\n", num_components);
    hypre_fprintf(fp, "num_recvs = %d\n", num_recvs);
-   for (i=0; i < num_recvs; i++)
+   for (i = 0; i < num_recvs; i++)
    {
-      hypre_fprintf(fp, "recv_proc [start, end] = %d [%d, %d] \n", recv_procs[i], recv_vec_starts[i], recv_vec_starts[i+1]-1);
+      hypre_fprintf(fp, "recv_proc [start, end] = %d [%d, %d] \n", recv_procs[i], recv_vec_starts[i],
+                    recv_vec_starts[i + 1] - 1);
    }
 
    hypre_fprintf(fp, "num_sends = %d\n", num_sends);
-   for (i=0; i < num_sends; i++)
+   for (i = 0; i < num_sends; i++)
    {
-      hypre_fprintf(fp, "send_proc [start, end] = %d [%d, %d] \n", send_procs[i], send_map_starts[i], send_map_starts[i+1]-1);
+      hypre_fprintf(fp, "send_proc [start, end] = %d [%d, %d] \n", send_procs[i], send_map_starts[i],
+                    send_map_starts[i + 1] - 1);
    }
 
-   for (i = 0; i< send_map_starts[num_sends]; i++)
+   for (i = 0; i < send_map_starts[num_sends]; i++)
    {
       hypre_fprintf(fp, "send_map_elements (%d) = %d\n", i, send_map_elements[i]);
    }
@@ -77,18 +72,14 @@ HYPRE_Int hypre_PrintCommpkg(hypre_ParCSRMatrix *A, const char *file_name)
    fclose(fp);
 
    return hypre_error_flag;
-
-
-
 }
 
-
-/*------------------------------------------------------------------
+/*------------------------------------------------------------------------------
  * hypre_ParCSRCommPkgCreateApart_core
  *
  * This does the work for  hypre_ParCSRCommPkgCreateApart - we have to split it
  * off so that it can also be used for block matrices.
- *--------------------------------------------------------------------------*/
+ *------------------------------------------------------------------------------*/
 
 HYPRE_Int
 hypre_ParCSRCommPkgCreateApart_core(
@@ -108,7 +99,6 @@ hypre_ParCSRCommPkgCreateApart_core(
    HYPRE_Int **p_send_map_elements,
    /* additional input assumed part */
    hypre_IJAssumedPart *apart)
-
 {
    HYPRE_Int        num_procs, myid;
    HYPRE_Int        j, i;
@@ -118,20 +108,20 @@ hypre_ParCSRCommPkgCreateApart_core(
    HYPRE_Int        size;
    HYPRE_Int        count;
 
-   HYPRE_Int        num_recvs, *recv_procs = NULL, *recv_vec_starts=NULL;
+   HYPRE_Int        num_recvs, *recv_procs = NULL, *recv_vec_starts = NULL;
    HYPRE_Int        tmp_id, prev_id;
 
    HYPRE_Int        num_sends;
 
-   HYPRE_Int        ex_num_contacts, *ex_contact_procs=NULL, *ex_contact_vec_starts=NULL;
-   HYPRE_BigInt     *ex_contact_buf=NULL;
+   HYPRE_Int        ex_num_contacts, *ex_contact_procs = NULL, *ex_contact_vec_starts = NULL;
+   HYPRE_BigInt     *ex_contact_buf = NULL;
 
    HYPRE_Int        num_ranges;
    HYPRE_BigInt     upper_bound;
 
 
    HYPRE_BigInt     *response_buf = NULL;
-   HYPRE_Int        *response_buf_starts=NULL;
+   HYPRE_Int        *response_buf_starts = NULL;
 
    HYPRE_Int        max_response_size;
 
@@ -148,21 +138,20 @@ hypre_ParCSRCommPkgCreateApart_core(
 
 #if mydebug
 
-    hypre_printf("myid = %i, my assumed local range: [%i, %i]\n", myid,
-                         apart->row_start, apart->row_end);
+   hypre_printf("myid = %i, my assumed local range: [%i, %i]\n", myid,
+                apart->row_start, apart->row_end);
 
-      for (i=0; i<apart.length; i++)
-      {
-        hypre_printf("myid = %d, proc %d owns assumed partition range = [%d, %d]\n",
-                myid, apart->proc_list[i], apart->row_start_list[i],
-                apart->row_end_list[i]);
-      }
+   for (i = 0; i < apart.length; i++)
+   {
+      hypre_printf("myid = %d, proc %d owns assumed partition range = [%d, %d]\n",
+                   myid, apart->proc_list[i], apart->row_start_list[i],
+                   apart->row_end_list[i]);
+   }
 
-      hypre_printf("myid = %d, length of apart = %d\n", myid, apart->length);
+   hypre_printf("myid = %d, length of apart = %d\n", myid, apart->length);
 
 #endif
 
-
    /*-----------------------------------------------------------
     *  Everyone knows where their assumed range is located
     * (because of the assumed partition object (apart).
@@ -174,16 +163,14 @@ hypre_ParCSRCommPkgCreateApart_core(
     *  entries in its rows. Each proc should know this from the user.
     *-----------------------------------------------------------*/
 
-
    /*------------------------------------------------------------
     *  First, get the receive processors
     *  each par_csr matrix will have a certain number of columns
     *  (num_cols_off_d) given in col_map_offd[] for which it needs
     *  data from another processor.
-    *
     *------------------------------------------------------------*/
 
-    /*calculate the assumed receive processors*/
+   /*calculate the assumed receive processors*/
 
    /* need to populate num_recvs, *recv_procs, and *recv_vec_starts
       (correlates to starts in col_map_off_d for recv_procs) for
@@ -197,68 +184,70 @@ hypre_ParCSRCommPkgCreateApart_core(
    /*estimate the storage needed*/
    if (num_cols_off_d > 0 && (apart->row_end - apart->row_start) > 0  )
    {
-      big_size = col_map_off_d[num_cols_off_d-1] - col_map_off_d[0];
+      big_size = col_map_off_d[num_cols_off_d - 1] - col_map_off_d[0];
 
-      size = (HYPRE_Int)(big_size/(apart->row_end - apart->row_start)) + 2;
+      size = (HYPRE_Int)(big_size / (apart->row_end - apart->row_start)) + 2;
    }
    else
    {
       size = 0;
    }
 
-
    /*we will contact each with a range of cols that we need*/
    /* it is ok to contact yourself - because then there doesn't
       need to be separate code */
 
    ex_contact_procs = hypre_CTAlloc(HYPRE_Int,  size, HYPRE_MEMORY_HOST);
-   ex_contact_vec_starts =  hypre_CTAlloc(HYPRE_Int,  size+1, HYPRE_MEMORY_HOST);
-   ex_contact_buf =  hypre_CTAlloc(HYPRE_BigInt,  size*2, HYPRE_MEMORY_HOST);
+   ex_contact_vec_starts =  hypre_CTAlloc(HYPRE_Int,  size + 1, HYPRE_MEMORY_HOST);
+   ex_contact_buf =  hypre_CTAlloc(HYPRE_BigInt,  size * 2, HYPRE_MEMORY_HOST);
 
    range_end = -1;
-   for (i=0; i< num_cols_off_d; i++)
+   for (i = 0; i < num_cols_off_d; i++)
    {
       if (col_map_off_d[i] > range_end)
       {
-
-
          hypre_GetAssumedPartitionProcFromRow(comm, col_map_off_d[i],
                                               0, global_num_cols, &tmp_id);
 
          if (ex_num_contacts == size) /*need more space? */
          {
-           size += 20;
-           ex_contact_procs = hypre_TReAlloc(ex_contact_procs,  HYPRE_Int,  size, HYPRE_MEMORY_HOST);
-           ex_contact_vec_starts = hypre_TReAlloc(ex_contact_vec_starts,  HYPRE_Int,  size+1, HYPRE_MEMORY_HOST);
-           ex_contact_buf = hypre_TReAlloc(ex_contact_buf,  HYPRE_BigInt,  size*2, HYPRE_MEMORY_HOST);
+            size += 20;
+            ex_contact_procs = hypre_TReAlloc(ex_contact_procs, HYPRE_Int, size, HYPRE_MEMORY_HOST);
+            ex_contact_vec_starts = hypre_TReAlloc(ex_contact_vec_starts,  HYPRE_Int,  size + 1,
+                                                   HYPRE_MEMORY_HOST);
+            ex_contact_buf = hypre_TReAlloc(ex_contact_buf,  HYPRE_BigInt,  size * 2,
+                                            HYPRE_MEMORY_HOST);
          }
 
          /* end of prev. range */
-         if (ex_num_contacts > 0)  ex_contact_buf[ex_num_contacts*2 - 1] = col_map_off_d[i-1];
-
-        /*start new range*/
-    	 ex_contact_procs[ex_num_contacts] = tmp_id;
-         ex_contact_vec_starts[ex_num_contacts] = ex_num_contacts*2;
-         ex_contact_buf[ex_num_contacts*2] =  col_map_off_d[i];
+         if (ex_num_contacts > 0)
+         {
+            ex_contact_buf[ex_num_contacts * 2 - 1] = col_map_off_d[i - 1];
+         }
 
+         /*start new range*/
+         ex_contact_procs[ex_num_contacts] = tmp_id;
+         ex_contact_vec_starts[ex_num_contacts] = ex_num_contacts * 2;
+         ex_contact_buf[ex_num_contacts * 2] =  col_map_off_d[i];
 
          ex_num_contacts++;
 
          hypre_GetAssumedPartitionRowRange(comm, tmp_id, 0, global_num_cols,
                                            &range_start, &range_end);
-
       }
    }
 
    /*finish the starts*/
-   ex_contact_vec_starts[ex_num_contacts] =  ex_num_contacts*2;
-   /*finish the last range*/
-   if (ex_num_contacts > 0)  ex_contact_buf[ex_num_contacts*2 - 1] = col_map_off_d[num_cols_off_d-1];
+   ex_contact_vec_starts[ex_num_contacts] =  ex_num_contacts * 2;
 
+   /*finish the last range*/
+   if (ex_num_contacts > 0)
+   {
+      ex_contact_buf[ex_num_contacts * 2 - 1] = col_map_off_d[num_cols_off_d - 1];
+   }
 
    /*don't allocate space for responses */
 
-
    /*create response object*/
    response_obj1.fill_response = hypre_RangeFillResponseIJDetermineRecvProcs;
    response_obj1.data1 =  apart; /* this is necessary so we can fill responses*/
@@ -266,41 +255,36 @@ hypre_ParCSRCommPkgCreateApart_core(
 
    max_response_size = 6;  /* 6 means we can fit 3 ranges*/
 
-
    hypre_DataExchangeList(ex_num_contacts, ex_contact_procs,
                           ex_contact_buf, ex_contact_vec_starts, sizeof(HYPRE_BigInt),
                           sizeof(HYPRE_BigInt), &response_obj1, max_response_size, 1,
                           comm, (void**) &response_buf, &response_buf_starts);
 
-
-
    /*now create recv_procs[] and recv_vec_starts[] and num_recvs
      from the complete data in response_buf - this array contains
      a proc_id followed by an upper bound for the range.  */
 
-
    /*initialize */
    num_recvs = 0;
-   size  = ex_num_contacts+20; /* num of recv procs should be roughly similar size
+   size  = ex_num_contacts + 20; /* num of recv procs should be roughly similar size
                                  to number of contacts  - add a buffer of 20*/
 
-
    recv_procs = hypre_CTAlloc(HYPRE_Int,  size, HYPRE_MEMORY_HOST);
-   recv_vec_starts =  hypre_CTAlloc(HYPRE_Int,  size+1, HYPRE_MEMORY_HOST);
+   recv_vec_starts =  hypre_CTAlloc(HYPRE_Int,  size + 1, HYPRE_MEMORY_HOST);
    recv_vec_starts[0] = 0;
 
    /*how many ranges were returned?*/
    num_ranges = response_buf_starts[ex_num_contacts];
-   num_ranges = num_ranges/2;
+   num_ranges = num_ranges / 2;
 
    prev_id = -1;
    j = 0;
    count = 0;
 
    /* loop through ranges */
-   for (i=0; i<num_ranges; i++)
+   for (i = 0; i < num_ranges; i++)
    {
-      upper_bound = response_buf[i*2+1];
+      upper_bound = response_buf[i * 2 + 1];
       count = 0;
       /* loop through off_d entries - counting how many are in the range */
       while (j < num_cols_off_d && col_map_off_d[j] <= upper_bound)
@@ -311,7 +295,7 @@ hypre_ParCSRCommPkgCreateApart_core(
       if (count > 0)
       {
          /*add the range if the proc id != myid*/
-         tmp_id = response_buf[i*2];
+         tmp_id = response_buf[i * 2];
          if (tmp_id != myid)
          {
             if (tmp_id != prev_id) /*increment the number of recvs */
@@ -319,15 +303,15 @@ hypre_ParCSRCommPkgCreateApart_core(
                /*check size of recv buffers*/
                if (num_recvs == size)
                {
-                  size+=20;
+                  size += 20;
                   recv_procs = hypre_TReAlloc(recv_procs, HYPRE_Int,  size, HYPRE_MEMORY_HOST);
-                  recv_vec_starts =  hypre_TReAlloc(recv_vec_starts, HYPRE_Int,  size+1, HYPRE_MEMORY_HOST);
+                  recv_vec_starts = hypre_TReAlloc(recv_vec_starts, HYPRE_Int,
+                                                   size + 1, HYPRE_MEMORY_HOST);
                }
 
-               recv_vec_starts[num_recvs+1] = j; /*the new start is at this element*/
+               recv_vec_starts[num_recvs + 1] = j; /*the new start is at this element*/
                recv_procs[num_recvs] =  tmp_id; /*add the new processor*/
                num_recvs++;
-
             }
             else
             {
@@ -336,28 +320,21 @@ hypre_ParCSRCommPkgCreateApart_core(
             }
          }
          prev_id = tmp_id;
-
       }
-
    }
 
-
-
-
 #if mydebug
-      for (i=0; i < num_recvs; i++)
-      {
-          hypre_printf("myid = %d, recv proc = %d, vec_starts = [%d : %d]\n",
-                  myid, recv_procs[i], recv_vec_starts[i],recv_vec_starts[i+1]-1);
-      }
+   for (i = 0; i < num_recvs; i++)
+   {
+      hypre_printf("myid = %d, recv proc = %d, vec_starts = [%d : %d]\n",
+                   myid, recv_procs[i], recv_vec_starts[i], recv_vec_starts[i + 1] - 1);
+   }
 #endif
 
-
    /*------------------------------------------------------------
     *  determine the send processors
     *  each processor contacts its recv procs to let them
     *  know they are a send processor
-    *
     *-------------------------------------------------------------*/
 
    /* the contact information is the recv_processor infomation - so
@@ -375,10 +352,12 @@ hypre_ParCSRCommPkgCreateApart_core(
    send_proc_obj.length = 0;
    send_proc_obj.storage_length = num_recvs + 5;
    send_proc_obj.id = hypre_CTAlloc(HYPRE_Int,  send_proc_obj.storage_length, HYPRE_MEMORY_HOST);
-   send_proc_obj.vec_starts = hypre_CTAlloc(HYPRE_Int,  send_proc_obj.storage_length + 1, HYPRE_MEMORY_HOST);
+   send_proc_obj.vec_starts = hypre_CTAlloc(HYPRE_Int,  send_proc_obj.storage_length + 1,
+                                            HYPRE_MEMORY_HOST);
    send_proc_obj.vec_starts[0] = 0;
    send_proc_obj.element_storage_length = num_cols_off_d;
-   send_proc_obj.elements = hypre_CTAlloc(HYPRE_BigInt,  send_proc_obj.element_storage_length, HYPRE_MEMORY_HOST);
+   send_proc_obj.elements = hypre_CTAlloc(HYPRE_BigInt,  send_proc_obj.element_storage_length,
+                                          HYPRE_MEMORY_HOST);
 
    response_obj2.fill_response = hypre_FillResponseIJDetermineSendProcs;
    response_obj2.data1 = NULL;
@@ -386,15 +365,11 @@ hypre_ParCSRCommPkgCreateApart_core(
 
    max_response_size = 0;
 
-
-
    hypre_DataExchangeList(num_recvs, recv_procs,
                           col_map_off_d, recv_vec_starts, sizeof(HYPRE_BigInt),
                           sizeof(HYPRE_BigInt), &response_obj2, max_response_size, 2,
                           comm,  (void **) &response_buf, &response_buf_starts);
 
-
-
    num_sends = send_proc_obj.length;
 
    /*send procs are in send_proc_object.id */
@@ -402,14 +377,14 @@ hypre_ParCSRCommPkgCreateApart_core(
 
 #if mydebug
    hypre_printf("myid = %d, num_sends = %d\n", myid, num_sends);
-   for (i=0; i < num_sends; i++)
+   for (i = 0; i < num_sends; i++)
    {
-      tmp_int = send_proc_obj.vec_starts[i+1] - send_proc_obj.vec_starts[i];
+      tmp_int = send_proc_obj.vec_starts[i + 1] - send_proc_obj.vec_starts[i];
       index = send_proc_obj.vec_starts[i];
-      for (j=0; j< tmp_int; j++)
+      for (j = 0; j < tmp_int; j++)
       {
-         hypre_printf("myid = %d, send proc = %d, send element = %d\n",myid,
-                send_proc_obj.id[i],send_proc_obj.elements[index+j]);
+         hypre_printf("myid = %d, send proc = %d, send element = %d\n", myid,
+                      send_proc_obj.id[i], send_proc_obj.elements[index + j]);
       }
    }
 #endif
@@ -428,33 +403,34 @@ hypre_ParCSRCommPkgCreateApart_core(
       HYPRE_Int  ct, sz, pos;
 
       orig_order = hypre_CTAlloc(HYPRE_Int,  num_sends, HYPRE_MEMORY_HOST);
-      orig_send_map_starts = hypre_CTAlloc(HYPRE_Int,  num_sends+1, HYPRE_MEMORY_HOST);
-      orig_send_elements = hypre_CTAlloc(HYPRE_BigInt,  send_proc_obj.vec_starts[num_sends], HYPRE_MEMORY_HOST);
+      orig_send_map_starts = hypre_CTAlloc(HYPRE_Int,  num_sends + 1, HYPRE_MEMORY_HOST);
+      orig_send_elements = hypre_CTAlloc(HYPRE_BigInt,  send_proc_obj.vec_starts[num_sends],
+                                         HYPRE_MEMORY_HOST);
 
       orig_send_map_starts[0] = 0;
       /* copy send map starts and elements */
-      for (i=0; i< num_sends; i++)
+      for (i = 0; i < num_sends; i++)
       {
          orig_order[i] = i;
-         orig_send_map_starts[i+1] = send_proc_obj.vec_starts[i+1];
+         orig_send_map_starts[i + 1] = send_proc_obj.vec_starts[i + 1];
       }
-      for (i=0; i< send_proc_obj.vec_starts[num_sends]; i++)
+      for (i = 0; i < send_proc_obj.vec_starts[num_sends]; i++)
       {
          orig_send_elements[i] = send_proc_obj.elements[i];
       }
       /* sort processor ids - keep track of original order */
-      hypre_qsort2i( send_proc_obj.id, orig_order, 0, num_sends-1 );
+      hypre_qsort2i( send_proc_obj.id, orig_order, 0, num_sends - 1 );
 
       /* now rearrange vec starts and send elements to correspond to proc ids */
       ct = 0;
-      for (i=0; i< num_sends; i++)
+      for (i = 0; i < num_sends; i++)
       {
          pos = orig_order[i];
          sz = orig_send_map_starts[pos + 1] - orig_send_map_starts[pos];
-         send_proc_obj.vec_starts[i+1] =  ct + sz;
-         for (j = 0; j< sz; j++)
+         send_proc_obj.vec_starts[i + 1] =  ct + sz;
+         for (j = 0; j < sz; j++)
          {
-            send_proc_obj.elements[ct +j] = orig_send_elements[orig_send_map_starts[pos]+j];
+            send_proc_obj.elements[ct + j] = orig_send_elements[orig_send_map_starts[pos] + j];
          }
          ct += sz;
       }
@@ -464,7 +440,6 @@ hypre_ParCSRCommPkgCreateApart_core(
       hypre_TFree(orig_send_map_starts, HYPRE_MEMORY_HOST);
    }
 
-
    /*-----------------------------------------------------------
     *  Return output info for setting up the comm package
     *-----------------------------------------------------------*/
@@ -480,7 +455,6 @@ hypre_ParCSRCommPkgCreateApart_core(
       send_proc_obj.id = NULL;
    }
 
-
    *p_num_recvs = num_recvs;
    *p_recv_procs = recv_procs;
    *p_recv_vec_starts = recv_vec_starts;
@@ -488,14 +462,14 @@ hypre_ParCSRCommPkgCreateApart_core(
    *p_send_procs = send_proc_obj.id;
    *p_send_map_starts = send_proc_obj.vec_starts;
 
-
    /*send map elements have global index - need local instead*/
    /*need to fix this !!! */
 
    if (num_sends)
    {
-      HYPRE_Int *tmp_elements = hypre_CTAlloc(HYPRE_Int, send_proc_obj.vec_starts[num_sends], HYPRE_MEMORY_HOST);
-      for (i=0; i<send_proc_obj.vec_starts[num_sends]; i++)
+      HYPRE_Int *tmp_elements = hypre_CTAlloc(HYPRE_Int, send_proc_obj.vec_starts[num_sends],
+                                              HYPRE_MEMORY_HOST);
+      for (i = 0; i < send_proc_obj.vec_starts[num_sends]; i++)
       {
          //send_proc_obj.elements[i] -= first_col_diag;
          tmp_elements[i] = (HYPRE_Int)(send_proc_obj.elements[i] - first_col_diag);
@@ -509,34 +483,26 @@ hypre_ParCSRCommPkgCreateApart_core(
    {
       hypre_TFree(send_proc_obj.elements, HYPRE_MEMORY_HOST);
       send_proc_obj.elements = NULL;
-     *p_send_map_elements =  NULL;
+      *p_send_map_elements =  NULL;
    }
 
    //*p_send_map_elements =  send_proc_obj.elements;
 
-
-
    /*-----------------------------------------------------------
     *  Clean up
     *-----------------------------------------------------------*/
 
-
-   if(ex_contact_procs)      hypre_TFree(ex_contact_procs, HYPRE_MEMORY_HOST);
-   if(ex_contact_vec_starts) hypre_TFree(ex_contact_vec_starts, HYPRE_MEMORY_HOST);
+   hypre_TFree(ex_contact_procs, HYPRE_MEMORY_HOST);
+   hypre_TFree(ex_contact_vec_starts, HYPRE_MEMORY_HOST);
    hypre_TFree(ex_contact_buf, HYPRE_MEMORY_HOST);
-
-
-   if(response_buf)        hypre_TFree(response_buf, HYPRE_MEMORY_HOST);
-   if(response_buf_starts) hypre_TFree(response_buf_starts, HYPRE_MEMORY_HOST);
-
+   hypre_TFree(response_buf, HYPRE_MEMORY_HOST);
+   hypre_TFree(response_buf_starts, HYPRE_MEMORY_HOST);
 
    /* don't free send_proc_obj.id,send_proc_obj.vec_starts,send_proc_obj.elements;
       recv_procs, recv_vec_starts.  These are aliased to the comm package and
       will be destroyed there */
 
-
    return hypre_error_flag;
-
 }
 
 /*------------------------------------------------------------------
@@ -560,9 +526,9 @@ hypre_ParCSRCommPkgCreateApart
    hypre_ParCSRCommPkg *comm_pkg
 )
 {
-
-   HYPRE_Int num_sends, *send_procs, *send_map_starts,
-             num_recvs, *recv_procs, *recv_vec_starts, *send_map_elmts;
+   HYPRE_Int  num_sends, *send_procs, *send_map_starts;
+   HYPRE_Int  num_recvs, *recv_procs, *recv_vec_starts;
+   HYPRE_Int *send_map_elmts;
 
    /*-----------------------------------------------------------
     * get commpkg info information
@@ -574,36 +540,27 @@ hypre_ParCSRCommPkgCreateApart
                                         &num_sends, &send_procs, &send_map_starts,
                                         &send_map_elmts, apart);
 
-
-   hypre_ParCSRCommPkgComm         (comm_pkg) = comm;
-   hypre_ParCSRCommPkgNumRecvs     (comm_pkg) = num_recvs;
-   hypre_ParCSRCommPkgRecvProcs    (comm_pkg) = recv_procs;
-   hypre_ParCSRCommPkgRecvVecStarts(comm_pkg) = recv_vec_starts;
-   hypre_ParCSRCommPkgNumSends     (comm_pkg) = num_sends;
-   hypre_ParCSRCommPkgSendProcs    (comm_pkg) = send_procs;
-   hypre_ParCSRCommPkgSendMapStarts(comm_pkg) = send_map_starts;
-   hypre_ParCSRCommPkgSendMapElmts (comm_pkg) = send_map_elmts;
+   /* Fill the communication package */
+   hypre_ParCSRCommPkgCreateAndFill(comm,
+                                    num_recvs, recv_procs, recv_vec_starts,
+                                    num_sends, send_procs, send_map_starts,
+                                    send_map_elmts,
+                                    &comm_pkg);
 
    return hypre_error_flag;
-
-
 }
 
-
 /*------------------------------------------------------------------
- *  hypre_NewCommPkgDestroy
- *  Destroy the comm package
+ * hypre_NewCommPkgDestroy
+ *
+ * Destroy the comm package
  *------------------------------------------------------------------*/
 
-
 HYPRE_Int
-hypre_NewCommPkgDestroy(hypre_ParCSRMatrix *parcsr_A)
+hypre_NewCommPkgDestroy( hypre_ParCSRMatrix *parcsr_A )
 {
-
-
    hypre_ParCSRCommPkg *comm_pkg = hypre_ParCSRMatrixCommPkg(parcsr_A);
 
-
    /*even if num_sends and num_recvs  = 0, storage may have been allocated */
 
    if (hypre_ParCSRCommPkgSendProcs(comm_pkg))
@@ -628,28 +585,31 @@ hypre_NewCommPkgDestroy(hypre_ParCSRMatrix *parcsr_A)
    }
 
    hypre_TFree(comm_pkg, HYPRE_MEMORY_HOST);
-   hypre_ParCSRMatrixCommPkg(parcsr_A) = NULL;  /*this gets freed again in destroy
-                                                  parscr since there are two comm
-                                                  packages now*/
+   hypre_ParCSRMatrixCommPkg(parcsr_A) = NULL;
 
    return hypre_error_flag;
 }
 
-
-
-
 /*--------------------------------------------------------------------
  * hypre_RangeFillResponseIJDetermineRecvProcs
+ *
  * Fill response function for determining the recv. processors
  * data exchange
  *--------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_RangeFillResponseIJDetermineRecvProcs(void *p_recv_contact_buf,
-                                      HYPRE_Int contact_size, HYPRE_Int contact_proc, void *ro,
-                                      MPI_Comm comm, void **p_send_response_buf,
-                                      HYPRE_Int *response_message_size)
+hypre_RangeFillResponseIJDetermineRecvProcs( void      *p_recv_contact_buf,
+                                             HYPRE_Int  contact_size,
+                                             HYPRE_Int  contact_proc,
+                                             void      *ro,
+                                             MPI_Comm   comm,
+                                             void     **p_send_response_buf,
+                                             HYPRE_Int *response_message_size )
 {
+   HYPRE_UNUSED_VAR(contact_size);
+   HYPRE_UNUSED_VAR(contact_proc);
+   HYPRE_UNUSED_VAR(p_send_response_buf);
+
    HYPRE_Int    myid, tmp_id;
    HYPRE_BigInt row_end;
    HYPRE_Int    j;
@@ -671,8 +631,7 @@ hypre_RangeFillResponseIJDetermineRecvProcs(void *p_recv_contact_buf,
     * with format [proc_id end_row  proc_id #end_row  proc_id #end_row etc...].
     *----------------------------------------------------------------------*/
 
-   hypre_MPI_Comm_rank(comm, &myid );
-
+   hypre_MPI_Comm_rank(comm, &myid);
 
    /* populate send_response_buf */
 
@@ -681,21 +640,21 @@ hypre_RangeFillResponseIJDetermineRecvProcs(void *p_recv_contact_buf,
    j = 0; /*marks which partition of the assumed partition we are in */
    row_val = recv_contact_buf[0]; /*beginning of range*/
    row_end = part->row_end_list[part->sort_index[j]];
-   tmp_id = part->proc_list[part->sort_index[j]];
+   tmp_id  = part->proc_list[part->sort_index[j]];
 
    /*check storage in send_buf for adding the ranges */
-   size = 2*(part->length);
+   size = 2 * (part->length);
 
-   if ( response_obj->send_response_storage  < size  )
+   if (response_obj->send_response_storage < size)
    {
 
       response_obj->send_response_storage =  hypre_max(size, 20);
-      send_response_buf = hypre_TReAlloc( send_response_buf,  HYPRE_BigInt,
-                                         response_obj->send_response_storage + overhead , HYPRE_MEMORY_HOST);
+      send_response_buf = hypre_TReAlloc(send_response_buf, HYPRE_BigInt,
+                                         response_obj->send_response_storage + overhead,
+                                         HYPRE_MEMORY_HOST);
       *p_send_response_buf = send_response_buf;    /* needed when using ReAlloc */
    }
 
-
    while (row_val > row_end) /*which partition to start in */
    {
       j++;
@@ -709,43 +668,43 @@ hypre_RangeFillResponseIJDetermineRecvProcs(void *p_recv_contact_buf,
 
    j++; /*increase j to look in next partition */
 
-
    /*any more?  - now compare with end of range value*/
    row_val = recv_contact_buf[1]; /*end of range*/
-   while ( j < part->length && row_val > row_end  )
+   while (j < part->length && row_val > row_end )
    {
       row_end = part->row_end_list[part->sort_index[j]];
       tmp_id = part->proc_list[part->sort_index[j]];
 
-      send_response_buf[index++] = (HYPRE_BigInt)tmp_id;
+      send_response_buf[index++] = (HYPRE_BigInt) tmp_id;
       send_response_buf[index++] = row_end;
 
       j++;
-
    }
 
-
    *response_message_size = index;
    *p_send_response_buf = send_response_buf;
 
    return hypre_error_flag;
-
 }
 
-
-
 /*--------------------------------------------------------------------
  * hypre_FillResponseIJDetermineSendProcs
+ *
  * Fill response function for determining the send processors
  * data exchange
  *--------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_FillResponseIJDetermineSendProcs(void *p_recv_contact_buf,
-                                 HYPRE_Int contact_size, HYPRE_Int contact_proc, void *ro,
-                                 MPI_Comm comm, void **p_send_response_buf,
-                                 HYPRE_Int *response_message_size )
+hypre_FillResponseIJDetermineSendProcs(void       *p_recv_contact_buf,
+                                       HYPRE_Int   contact_size,
+                                       HYPRE_Int   contact_proc,
+                                       void       *ro,
+                                       MPI_Comm    comm,
+                                       void      **p_send_response_buf,
+                                       HYPRE_Int  *response_message_size )
 {
+   HYPRE_UNUSED_VAR(p_send_response_buf);
+
    HYPRE_Int    myid;
    HYPRE_Int    i, index, count, elength;
 
@@ -758,15 +717,15 @@ hypre_FillResponseIJDetermineSendProcs(void *p_recv_contact_buf,
 
    hypre_MPI_Comm_rank(comm, &myid );
 
-
    /*check to see if we need to allocate more space in send_proc_obj for ids*/
    if (send_proc_obj->length == send_proc_obj->storage_length)
    {
-      send_proc_obj->storage_length +=20; /*add space for 20 more processors*/
+      send_proc_obj->storage_length += 20; /*add space for 20 more processors*/
       send_proc_obj->id = hypre_TReAlloc(send_proc_obj->id, HYPRE_Int,
                                          send_proc_obj->storage_length, HYPRE_MEMORY_HOST);
       send_proc_obj->vec_starts = hypre_TReAlloc(send_proc_obj->vec_starts, HYPRE_Int,
-                                  send_proc_obj->storage_length + 1, HYPRE_MEMORY_HOST);
+                                                 send_proc_obj->storage_length + 1,
+                                                 HYPRE_MEMORY_HOST);
    }
 
    /*initialize*/
@@ -777,7 +736,7 @@ hypre_FillResponseIJDetermineSendProcs(void *p_recv_contact_buf,
    send_proc_obj->id[count] = contact_proc;
 
    /*do we need more storage for the elements?*/
-     if (send_proc_obj->element_storage_length < index + contact_size)
+   if (send_proc_obj->element_storage_length < index + contact_size)
    {
       elength = hypre_max(contact_size, 50);
       elength += index;
@@ -786,18 +745,15 @@ hypre_FillResponseIJDetermineSendProcs(void *p_recv_contact_buf,
       send_proc_obj->element_storage_length = elength;
    }
    /*populate send_proc_obj*/
-   for (i=0; i< contact_size; i++)
+   for (i = 0; i < contact_size; i++)
    {
       send_proc_obj->elements[index++] = recv_contact_buf[i];
    }
-   send_proc_obj->vec_starts[count+1] = index;
+   send_proc_obj->vec_starts[count + 1] = index;
    send_proc_obj->length++;
 
-
-  /*output - no message to return (confirmation) */
+   /*output - no message to return (confirmation) */
    *response_message_size = 0;
 
    return hypre_error_flag;
-
 }
-
diff --git a/external/hypre/src/parcsr_mv/new_commpkg.h b/external/hypre/src/parcsr_mv/new_commpkg.h
index af851319..0712be29 100644
--- a/external/hypre/src/parcsr_mv/new_commpkg.h
+++ b/external/hypre/src/parcsr_mv/new_commpkg.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/parcsr_mv/numbers.c b/external/hypre/src/parcsr_mv/numbers.c
index 61429da7..ac6fb868 100644
--- a/external/hypre/src/parcsr_mv/numbers.c
+++ b/external/hypre/src/parcsr_mv/numbers.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -11,12 +11,12 @@
 
 #include "_hypre_parcsr_mv.h"
 
-hypre_NumbersNode * hypre_NumbersNewNode()
+hypre_NumbersNode * hypre_NumbersNewNode( void )
 /* makes a new node for a tree representing numbers */
 {
    HYPRE_Int i;
-   hypre_NumbersNode * newnode = hypre_CTAlloc( hypre_NumbersNode,  1 , HYPRE_MEMORY_HOST);
-   for ( i=0; i<=10; ++i ) newnode->digit[i] = NULL;
+   hypre_NumbersNode * newnode = hypre_CTAlloc( hypre_NumbersNode,  1, HYPRE_MEMORY_HOST);
+   for ( i = 0; i <= 10; ++i ) { newnode->digit[i] = NULL; }
    return newnode;
 }
 
@@ -24,29 +24,35 @@ void hypre_NumbersDeleteNode( hypre_NumbersNode * node )
 /* deletes a node and the tree of which it is root */
 {
    HYPRE_Int i;
-   for ( i=0; i<=10; ++i ) if ( node->digit[i] != NULL ) {
-      hypre_NumbersDeleteNode( node->digit[i] );
-      node->digit[i] = NULL;
-   };
-   hypre_TFree( node , HYPRE_MEMORY_HOST);
+   for ( i = 0; i <= 10; ++i ) if ( node->digit[i] != NULL )
+      {
+         hypre_NumbersDeleteNode( node->digit[i] );
+         node->digit[i] = NULL;
+      };
+   hypre_TFree( node, HYPRE_MEMORY_HOST);
 }
 
 HYPRE_Int hypre_NumbersEnter( hypre_NumbersNode * node, const HYPRE_Int n )
 /* enters a number in the tree starting with 'node'. */
 {
    HYPRE_Int newN = 0;
-   HYPRE_Int q = n/10;
-   HYPRE_Int r = n%10;
-   hypre_assert( n>=0 );
-   if ( node->digit[r] == NULL ) {
+   HYPRE_Int q = n / 10;
+   HYPRE_Int r = n % 10;
+   hypre_assert( n >= 0 );
+   if ( node->digit[r] == NULL )
+   {
       node->digit[r] = hypre_NumbersNewNode();
       newN = 1;
    };
-   if ( q<10 ) {  /* q is a one-digit number; point to terminal object */
+   if ( q < 10 )  /* q is a one-digit number; point to terminal object */
+   {
       if ( (node->digit[r])->digit[10] == NULL )
+      {
          (node->digit[r])->digit[10] = hypre_NumbersNewNode();
+      }
    }
-   else {  /* multidigit number; place for this digit points to next node */
+   else    /* multidigit number; place for this digit points to next node */
+   {
       newN = hypre_NumbersEnter(node->digit[r], q );
    }
    return newN;
@@ -57,29 +63,38 @@ HYPRE_Int hypre_NumbersNEntered( hypre_NumbersNode * node )
 {
    HYPRE_Int i;
    HYPRE_Int count = 0;
-   if ( node==NULL ) return 0;
-   for ( i=0; i<10; ++i ) if ( node->digit[i] != NULL )
-      count += hypre_NumbersNEntered( node->digit[i] );
-   if ( node->digit[10] != NULL ) ++count;
+   if ( node == NULL ) { return 0; }
+   for ( i = 0; i < 10; ++i ) if ( node->digit[i] != NULL )
+      {
+         count += hypre_NumbersNEntered( node->digit[i] );
+      }
+   if ( node->digit[10] != NULL ) { ++count; }
    return count;
 }
 
 HYPRE_Int hypre_NumbersQuery( hypre_NumbersNode * node, const HYPRE_Int n )
 /* returns 1 if n is on the tree with root 'node', 0 otherwise */
 {
-   HYPRE_Int q = n/10;
-   HYPRE_Int r = n%10;
-   hypre_assert( n>=0 );
-   if ( node->digit[r] == NULL ) { /* low order digit of n not on tree */
+   HYPRE_Int q = n / 10;
+   HYPRE_Int r = n % 10;
+   hypre_assert( n >= 0 );
+   if ( node->digit[r] == NULL )   /* low order digit of n not on tree */
+   {
       return 0;
    }
-   else if ( q<10 ) { /* q is a one-digit number; check terminal object */
+   else if ( q < 10 ) /* q is a one-digit number; check terminal object */
+   {
       if ( (node->digit[r])->digit[10] == NULL )
+      {
          return 0;
+      }
       else
+      {
          return 1;
+      }
    }
-   else {  /* look for higher order digits of n on tree of its low order digit r */
+   else    /* look for higher order digits of n on tree of its low order digit r */
+   {
       return hypre_NumbersQuery( node->digit[r], q );
    }
 }
@@ -93,16 +108,19 @@ HYPRE_Int * hypre_NumbersArray( hypre_NumbersNode * node )
    HYPRE_Int k = 0;
    HYPRE_Int N = hypre_NumbersNEntered(node);
    HYPRE_Int * array, * temp;
-   array = hypre_CTAlloc( HYPRE_Int,  N , HYPRE_MEMORY_HOST);
-   if ( node==NULL ) return array;
-   for ( i=0; i<10; ++i ) if ( node->digit[i] != NULL ) {
-      Ntemp = hypre_NumbersNEntered( node->digit[i] );
-      temp = hypre_NumbersArray( node->digit[i] );
-      for ( j=0; j<Ntemp; ++j )
-         array[k++] = temp[j]*10 + i;
-      hypre_TFree(temp, HYPRE_MEMORY_HOST);
-   }
-   if ( node->digit[10] != NULL ) array[k++] = 0;
-   hypre_assert( k==N );
+   array = hypre_CTAlloc( HYPRE_Int,  N, HYPRE_MEMORY_HOST);
+   if ( node == NULL ) { return array; }
+   for ( i = 0; i < 10; ++i ) if ( node->digit[i] != NULL )
+      {
+         Ntemp = hypre_NumbersNEntered( node->digit[i] );
+         temp = hypre_NumbersArray( node->digit[i] );
+         for ( j = 0; j < Ntemp; ++j )
+         {
+            array[k++] = temp[j] * 10 + i;
+         }
+         hypre_TFree(temp, HYPRE_MEMORY_HOST);
+      }
+   if ( node->digit[10] != NULL ) { array[k++] = 0; }
+   hypre_assert( k == N );
    return array;
 }
diff --git a/external/hypre/src/parcsr_mv/numbers.h b/external/hypre/src/parcsr_mv/numbers.h
index fcb32b75..b9cd913f 100644
--- a/external/hypre/src/parcsr_mv/numbers.h
+++ b/external/hypre/src/parcsr_mv/numbers.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/parcsr_mv/par_chord_matrix.h b/external/hypre/src/parcsr_mv/par_chord_matrix.h
index 6360839b..1080b0ca 100644
--- a/external/hypre/src/parcsr_mv/par_chord_matrix.h
+++ b/external/hypre/src/parcsr_mv/par_chord_matrix.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/parcsr_mv/par_csr_aat.c b/external/hypre/src/parcsr_mv/par_csr_aat.c
index 0d648ce3..3375a535 100644
--- a/external/hypre/src/parcsr_mv/par_csr_aat.c
+++ b/external/hypre/src/parcsr_mv/par_csr_aat.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -34,7 +34,7 @@ void hypre_ParAat_RowSizes(
    HYPRE_Int num_rows_A_ext,
    HYPRE_BigInt first_col_diag_A,
    HYPRE_BigInt first_row_index_A
-   )
+)
 /* computes the sizes of the rows of C = A * A^T.
    Out: HYPRE_Int** C_diag_i, C_offd_i
    Workspace provided: HYPRE_Int * B_marker
@@ -52,17 +52,17 @@ void hypre_ParAat_RowSizes(
    HYPRE_Int i1, i3, jj2, jj3;
    HYPRE_BigInt big_i2;
    HYPRE_Int jj_count_diag, jj_count_offd, jj_row_begin_diag, jj_row_begin_offd;
-   HYPRE_Int last_col_diag_C;
+   HYPRE_BigInt last_col_diag_C;
    HYPRE_Int start_indexing = 0; /* start indexing for C_data at 0 */
 
-   *C_diag_i = hypre_CTAlloc(HYPRE_Int,  num_rows_diag_A+1, HYPRE_MEMORY_HOST);
-   *C_offd_i = hypre_CTAlloc(HYPRE_Int,  num_rows_diag_A+1, HYPRE_MEMORY_HOST);
+   *C_diag_i = hypre_CTAlloc(HYPRE_Int, num_rows_diag_A + 1, HYPRE_MEMORY_HOST);
+   *C_offd_i = hypre_CTAlloc(HYPRE_Int, num_rows_diag_A + 1, HYPRE_MEMORY_HOST);
 
-   last_col_diag_C = first_row_index_A + num_rows_diag_A - 1;
+   last_col_diag_C = first_row_index_A + (HYPRE_BigInt) num_rows_diag_A - 1;
 
    jj_count_diag = start_indexing;
    jj_count_offd = start_indexing;
-   for (i1 = 0; i1 < num_rows_diag_A+num_rows_A_ext; i1++)
+   for (i1 = 0; i1 < num_rows_diag_A + num_rows_A_ext; i1++)
    {
       B_marker[i1] = -1;
    }
@@ -92,7 +92,7 @@ void hypre_ParAat_RowSizes(
 
       if (num_cols_offd_A)
       {
-         for (jj2 = A_offd_i[i1]; jj2 < A_offd_i[i1+1]; jj2++)
+         for (jj2 = A_offd_i[i1]; jj2 < A_offd_i[i1 + 1]; jj2++)
          {
             big_i2 = A_col_map_offd[ A_offd_j[jj2] ];
 
@@ -106,9 +106,12 @@ void hypre_ParAat_RowSizes(
              *  as a potential nonzero.
              *-----------------------------------------------------------*/
 
-            for ( i3=0; i3<num_rows_A_ext; i3++ ) {
-               for ( jj3=A_ext_i[i3]; jj3<A_ext_i[i3+1]; jj3++ ) {
-                  if ( A_ext_j[jj3]==big_i2 ) {
+            for ( i3 = 0; i3 < num_rows_A_ext; i3++ )
+            {
+               for ( jj3 = A_ext_i[i3]; jj3 < A_ext_i[i3 + 1]; jj3++ )
+               {
+                  if ( A_ext_j[jj3] == big_i2 )
+                  {
                      /* row i3, column i2 of A_ext; or,
                         row i2, column i3 of (A_ext)^T */
 
@@ -119,15 +122,19 @@ void hypre_ParAat_RowSizes(
                       *--------------------------------------------------------*/
 
                      if ( A_ext_row_map[i3] < first_row_index_A ||
-                          A_ext_row_map[i3] > last_col_diag_C ) { /* offd */
-                        if (B_marker[i3+num_rows_diag_A] < jj_row_begin_offd) {
-                           B_marker[i3+num_rows_diag_A] = jj_count_offd;
+                          A_ext_row_map[i3] > last_col_diag_C )   /* offd */
+                     {
+                        if (B_marker[i3 + num_rows_diag_A] < jj_row_begin_offd)
+                        {
+                           B_marker[i3 + num_rows_diag_A] = jj_count_offd;
                            jj_count_offd++;
                         }
                      }
-                     else {                                              /* diag */
-                        if (B_marker[i3+num_rows_diag_A] < jj_row_begin_diag) {
-                           B_marker[i3+num_rows_diag_A] = jj_count_diag;
+                     else                                                /* diag */
+                     {
+                        if (B_marker[i3 + num_rows_diag_A] < jj_row_begin_diag)
+                        {
+                           B_marker[i3 + num_rows_diag_A] = jj_count_diag;
                            jj_count_diag++;
                         }
                      }
@@ -146,10 +153,13 @@ void hypre_ParAat_RowSizes(
              *  as a potential nonzero.
              *-----------------------------------------------------------*/
 
-            for ( i3=0; i3<num_rows_diag_A; i3++ ) {
+            for ( i3 = 0; i3 < num_rows_diag_A; i3++ )
+            {
                /* ... note that num_rows_diag_A == num_rows_offd_A */
-               for ( jj3=A_offd_i[i3]; jj3<A_offd_i[i3+1]; jj3++ ) {
-                  if ( A_col_map_offd[ A_offd_j[jj3] ]==big_i2 ) {
+               for ( jj3 = A_offd_i[i3]; jj3 < A_offd_i[i3 + 1]; jj3++ )
+               {
+                  if ( A_col_map_offd[ A_offd_j[jj3] ] == big_i2 )
+                  {
                      /* row i3, column i2 of A; or,
                         row i2, column i3 of A^T */
                      /*--------------------------------------------------------
@@ -177,7 +187,7 @@ void hypre_ParAat_RowSizes(
        *  which live on other processors.
        *-----------------------------------------------------------------*/
 
-      for (jj2 = A_diag_i[i1]; jj2 < A_diag_i[i1+1]; jj2++)
+      for (jj2 = A_diag_i[i1]; jj2 < A_diag_i[i1 + 1]; jj2++)
       {
          big_i2 = (HYPRE_BigInt)A_diag_j[jj2] + first_col_diag_A ;
 
@@ -191,9 +201,12 @@ void hypre_ParAat_RowSizes(
           *  as a potential nonzero.
           *-----------------------------------------------------------*/
 
-         for ( i3=0; i3<num_rows_A_ext; i3++ ) {
-            for ( jj3=A_ext_i[i3]; jj3<A_ext_i[i3+1]; jj3++ ) {
-               if ( A_ext_j[jj3]==big_i2 ) {
+         for ( i3 = 0; i3 < num_rows_A_ext; i3++ )
+         {
+            for ( jj3 = A_ext_i[i3]; jj3 < A_ext_i[i3 + 1]; jj3++ )
+            {
+               if ( A_ext_j[jj3] == big_i2 )
+               {
                   /* row i3, column i2 of A_ext; or,
                      row i2, column i3 of (A_ext)^T */
 
@@ -203,15 +216,19 @@ void hypre_ParAat_RowSizes(
                    *  counter.
                    *--------------------------------------------------------*/
                   if ( A_ext_row_map[i3] < first_row_index_A ||
-                       A_ext_row_map[i3] > last_col_diag_C ) { /* offd */
-                     if (B_marker[i3+num_rows_diag_A] < jj_row_begin_offd) {
-                        B_marker[i3+num_rows_diag_A] = jj_count_offd;
+                       A_ext_row_map[i3] > last_col_diag_C )   /* offd */
+                  {
+                     if (B_marker[i3 + num_rows_diag_A] < jj_row_begin_offd)
+                     {
+                        B_marker[i3 + num_rows_diag_A] = jj_count_offd;
                         jj_count_offd++;
                      }
                   }
-                  else {                                              /* diag */
-                     if (B_marker[i3+num_rows_diag_A] < jj_row_begin_diag) {
-                        B_marker[i3+num_rows_diag_A] = jj_count_diag;
+                  else                                                /* diag */
+                  {
+                     if (B_marker[i3 + num_rows_diag_A] < jj_row_begin_diag)
+                     {
+                        B_marker[i3 + num_rows_diag_A] = jj_count_diag;
                         jj_count_diag++;
                      }
                   }
@@ -228,7 +245,7 @@ void hypre_ParAat_RowSizes(
        *  on this processor.
        *-----------------------------------------------------------------*/
 
-      for (jj2 = A_diag_i[i1]; jj2 < A_diag_i[i1+1]; jj2++)
+      for (jj2 = A_diag_i[i1]; jj2 < A_diag_i[i1 + 1]; jj2++)
       {
          big_i2 = (HYPRE_BigInt)A_diag_j[jj2] + first_col_diag_A ;
 
@@ -242,9 +259,12 @@ void hypre_ParAat_RowSizes(
           *  For each entry (i2,i3) of A^T, mark C(i1,i3)
           *  as a potential nonzero.
           *-----------------------------------------------------------*/
-         for ( i3=0; i3<num_rows_diag_A; i3++ ) {
-            for ( jj3=A_diag_i[i3]; jj3<A_diag_i[i3+1]; jj3++ ) {
-               if ( (HYPRE_BigInt)A_diag_j[jj3]+first_col_diag_A == big_i2 ) {
+         for ( i3 = 0; i3 < num_rows_diag_A; i3++ )
+         {
+            for ( jj3 = A_diag_i[i3]; jj3 < A_diag_i[i3 + 1]; jj3++ )
+            {
+               if ( (HYPRE_BigInt)A_diag_j[jj3] + first_col_diag_A == big_i2 )
+               {
                   /* row i3, column i2 of A; or,
                      row i2, column i3 of A^T */
                   /*--------------------------------------------------------
@@ -296,7 +316,8 @@ void hypre_ParAat_RowSizes(
    going on, nothing is being done to take advantage of symmetry, and probably
    more things. */
 
-hypre_ParCSRMatrix *hypre_ParCSRAAt( hypre_ParCSRMatrix  *A )
+hypre_ParCSRMatrix*
+hypre_ParCSRAAt(hypre_ParCSRMatrix  *A)
 {
    MPI_Comm         comm = hypre_ParCSRMatrixComm(A);
 
@@ -329,22 +350,22 @@ hypre_ParCSRMatrix *hypre_ParCSRAAt( hypre_ParCSRMatrix  *A )
 
    hypre_CSRMatrix *C_offd;
 
-   HYPRE_Complex   *C_offd_data=NULL;
-   HYPRE_Int       *C_offd_i=NULL;
-   HYPRE_Int       *C_offd_j=NULL;
+   HYPRE_Complex   *C_offd_data = NULL;
+   HYPRE_Int       *C_offd_i = NULL;
+   HYPRE_Int       *C_offd_j = NULL;
    HYPRE_Int       *new_C_offd_j;
 
    HYPRE_Int        C_diag_size;
    HYPRE_Int        C_offd_size;
-   HYPRE_Int        last_col_diag_C;
+   HYPRE_BigInt     last_col_diag_C;
    HYPRE_Int        num_cols_offd_C;
 
-   hypre_CSRMatrix *A_ext;
+   hypre_CSRMatrix *A_ext = NULL;
 
-   HYPRE_Complex   *A_ext_data;
-   HYPRE_Int       *A_ext_i;
-   HYPRE_BigInt    *A_ext_j;
-   HYPRE_Int        num_rows_A_ext=0;
+   HYPRE_Complex   *A_ext_data = NULL;
+   HYPRE_Int       *A_ext_i = NULL;
+   HYPRE_BigInt    *A_ext_j = NULL;
+   HYPRE_Int        num_rows_A_ext = 0;
 
    HYPRE_BigInt     first_row_index_A = hypre_ParCSRMatrixFirstRowIndex(A);
    HYPRE_BigInt     first_col_diag_A = hypre_ParCSRMatrixFirstColDiag(A);
@@ -370,7 +391,7 @@ hypre_ParCSRMatrix *hypre_ParCSRAAt( hypre_ParCSRMatrix  *A )
 
    if (n_cols_A != n_rows_A)
    {
-      hypre_error_w_msg(HYPRE_ERROR_GENERIC," Error! Incompatible matrix dimensions!\n");
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, " Error! Incompatible matrix dimensions!\n");
       return NULL;
    }
    /*-----------------------------------------------------------------------
@@ -399,13 +420,13 @@ hypre_ParCSRMatrix *hypre_ParCSRAAt( hypre_ParCSRMatrix  *A )
     *  Allocate marker array.
     *-----------------------------------------------------------------------*/
 
-   B_marker = hypre_CTAlloc(HYPRE_Int,  num_rows_diag_A+num_rows_A_ext , HYPRE_MEMORY_HOST);
+   B_marker = hypre_CTAlloc(HYPRE_Int,  num_rows_diag_A + num_rows_A_ext, HYPRE_MEMORY_HOST);
 
    /*-----------------------------------------------------------------------
     *  Initialize some stuff.
     *-----------------------------------------------------------------------*/
 
-   for ( i1=0; i1<num_rows_diag_A+num_rows_A_ext; ++i1 )
+   for ( i1 = 0; i1 < num_rows_diag_A + num_rows_A_ext; ++i1 )
    {
       B_marker[i1] = -1;
    }
@@ -420,16 +441,16 @@ hypre_ParCSRMatrix *hypre_ParCSRAAt( hypre_ParCSRMatrix  *A )
       num_rows_diag_A, num_cols_offd_A,
       num_rows_A_ext,
       first_col_diag_A, first_row_index_A
-      );
+   );
 
 #if 0
-/* debugging output: */
-   hypre_printf("A_ext_row_map (%i):",num_rows_A_ext);
-   for ( i1=0; i1<num_rows_A_ext; ++i1 ) hypre_printf(" %i",A_ext_row_map[i1] );
-   hypre_printf("\nC_diag_i (%i):",C_diag_size);
-   for ( i1=0; i1<=num_rows_diag_A; ++i1 ) hypre_printf(" %i",C_diag_i[i1] );
-   hypre_printf("\nC_offd_i (%i):",C_offd_size);
-   for ( i1=0; i1<=num_rows_diag_A; ++i1 ) hypre_printf(" %i",C_offd_i[i1] );
+   /* debugging output: */
+   hypre_printf("A_ext_row_map (%i):", num_rows_A_ext);
+   for ( i1 = 0; i1 < num_rows_A_ext; ++i1 ) { hypre_printf(" %i", A_ext_row_map[i1] ); }
+   hypre_printf("\nC_diag_i (%i):", C_diag_size);
+   for ( i1 = 0; i1 <= num_rows_diag_A; ++i1 ) { hypre_printf(" %i", C_diag_i[i1] ); }
+   hypre_printf("\nC_offd_i (%i):", C_offd_size);
+   for ( i1 = 0; i1 <= num_rows_diag_A; ++i1 ) { hypre_printf(" %i", C_offd_i[i1] ); }
    hypre_printf("\n");
 #endif
 
@@ -438,14 +459,11 @@ hypre_ParCSRMatrix *hypre_ParCSRAAt( hypre_ParCSRMatrix  *A )
     *  Allocate C_offd_data and C_offd_j arrays.
     *-----------------------------------------------------------------------*/
 
-   last_col_diag_C = first_row_index_A + (HYPRE_BigInt)num_rows_diag_A - 1;
-   C_diag_data = hypre_CTAlloc(HYPRE_Complex,  C_diag_size, HYPRE_MEMORY_HOST);
-   C_diag_j    = hypre_CTAlloc(HYPRE_Int,  C_diag_size, HYPRE_MEMORY_HOST);
-   if (C_offd_size)
-   {
-      C_offd_data = hypre_CTAlloc(HYPRE_Complex,  C_offd_size, HYPRE_MEMORY_HOST);
-      C_offd_j    = hypre_CTAlloc(HYPRE_Int,  C_offd_size, HYPRE_MEMORY_HOST);
-   }
+   last_col_diag_C = first_row_index_A + (HYPRE_BigInt) num_rows_diag_A - 1;
+   C_diag_data = hypre_CTAlloc(HYPRE_Complex, C_diag_size, HYPRE_MEMORY_HOST);
+   C_diag_j    = hypre_CTAlloc(HYPRE_Int, C_diag_size, HYPRE_MEMORY_HOST);
+   C_offd_data = hypre_CTAlloc(HYPRE_Complex, C_offd_size, HYPRE_MEMORY_HOST);
+   C_offd_j    = hypre_CTAlloc(HYPRE_Int, C_offd_size, HYPRE_MEMORY_HOST);
 
    /*-----------------------------------------------------------------------
     *  Second Pass: Fill in C_diag_data and C_diag_j.
@@ -458,7 +476,7 @@ hypre_ParCSRMatrix *hypre_ParCSRAAt( hypre_ParCSRMatrix  *A )
 
    jj_count_diag = start_indexing;
    jj_count_offd = start_indexing;
-   for ( i1=0; i1<num_rows_diag_A+num_rows_A_ext; ++i1 )
+   for ( i1 = 0; i1 < num_rows_diag_A + num_rows_A_ext; ++i1 )
    {
       B_marker[i1] = -1;
    }
@@ -492,7 +510,7 @@ hypre_ParCSRMatrix *hypre_ParCSRAAt( hypre_ParCSRMatrix  *A )
          diag*ext, offd*ext, diag*diag, and offd*offd.
       */
 
-      for (jj2 = A_diag_i[i1]; jj2 < A_diag_i[i1+1]; jj2++)
+      for (jj2 = A_diag_i[i1]; jj2 < A_diag_i[i1 + 1]; jj2++)
       {
          i2 = A_diag_j[jj2];
          a_entry = A_diag_data[jj2];
@@ -508,9 +526,12 @@ hypre_ParCSRMatrix *hypre_ParCSRAAt( hypre_ParCSRMatrix  *A )
           *  blocks of C.
           *-----------------------------------------------------------*/
 
-         for ( i3=0; i3<num_rows_A_ext; i3++ ) {
-            for ( jj3=A_ext_i[i3]; jj3<A_ext_i[i3+1]; jj3++ ) {
-               if ( A_ext_j[jj3]==(HYPRE_BigInt)i2+first_col_diag_A ) {
+         for ( i3 = 0; i3 < num_rows_A_ext; i3++ )
+         {
+            for ( jj3 = A_ext_i[i3]; jj3 < A_ext_i[i3 + 1]; jj3++ )
+            {
+               if ( A_ext_j[jj3] == (HYPRE_BigInt)i2 + first_col_diag_A )
+               {
                   /* row i3, column i2 of A_ext; or,
                      row i2, column i3 of (A_ext)^T */
 
@@ -523,25 +544,33 @@ hypre_ParCSRMatrix *hypre_ParCSRAAt( hypre_ParCSRMatrix  *A )
                    *--------------------------------------------------------*/
 
                   if ( A_ext_row_map[i3] < first_row_index_A ||
-                       A_ext_row_map[i3] > last_col_diag_C ) { /* offd */
-                     if (B_marker[i3+num_rows_diag_A] < jj_row_begin_offd) {
-                        B_marker[i3+num_rows_diag_A] = jj_count_offd;
+                       A_ext_row_map[i3] > last_col_diag_C )   /* offd */
+                  {
+                     if (B_marker[i3 + num_rows_diag_A] < jj_row_begin_offd)
+                     {
+                        B_marker[i3 + num_rows_diag_A] = jj_count_offd;
                         C_offd_data[jj_count_offd] = a_b_product;
                         C_offd_j[jj_count_offd] = i3;
                         jj_count_offd++;
                      }
                      else
-                        C_offd_data[B_marker[i3+num_rows_diag_A]] += a_b_product;
+                     {
+                        C_offd_data[B_marker[i3 + num_rows_diag_A]] += a_b_product;
+                     }
                   }
-                  else {                                              /* diag */
-                     if (B_marker[i3+num_rows_diag_A] < jj_row_begin_diag) {
-                        B_marker[i3+num_rows_diag_A] = jj_count_diag;
+                  else                                                /* diag */
+                  {
+                     if (B_marker[i3 + num_rows_diag_A] < jj_row_begin_diag)
+                     {
+                        B_marker[i3 + num_rows_diag_A] = jj_count_diag;
                         C_diag_data[jj_count_diag] = a_b_product;
-                        C_diag_j[jj_count_diag] = (HYPRE_Int)(i3-first_col_diag_A);
+                        C_diag_j[jj_count_diag] = (HYPRE_Int)(i3 - first_col_diag_A);
                         jj_count_diag++;
                      }
                      else
-                        C_diag_data[B_marker[i3+num_rows_diag_A]] += a_b_product;
+                     {
+                        C_diag_data[B_marker[i3 + num_rows_diag_A]] += a_b_product;
+                     }
                   }
                }
             }
@@ -550,7 +579,7 @@ hypre_ParCSRMatrix *hypre_ParCSRAAt( hypre_ParCSRMatrix  *A )
 
       if (num_cols_offd_A)
       {
-         for (jj2 = A_offd_i[i1]; jj2 < A_offd_i[i1+1]; jj2++)
+         for (jj2 = A_offd_i[i1]; jj2 < A_offd_i[i1 + 1]; jj2++)
          {
             i2 = A_offd_j[jj2];
             a_entry = A_offd_data[jj2];
@@ -566,9 +595,12 @@ hypre_ParCSRMatrix *hypre_ParCSRAAt( hypre_ParCSRMatrix  *A )
              *  blocks of C.
              *-----------------------------------------------------------*/
 
-            for ( i3=0; i3<num_rows_A_ext; i3++ ) {
-               for ( jj3=A_ext_i[i3]; jj3<A_ext_i[i3+1]; jj3++ ) {
-                  if ( A_ext_j[jj3]==A_col_map_offd[i2] ) {
+            for ( i3 = 0; i3 < num_rows_A_ext; i3++ )
+            {
+               for ( jj3 = A_ext_i[i3]; jj3 < A_ext_i[i3 + 1]; jj3++ )
+               {
+                  if ( A_ext_j[jj3] == A_col_map_offd[i2] )
+                  {
                      /* row i3, column i2 of A_ext; or,
                         row i2, column i3 of (A_ext)^T */
 
@@ -581,25 +613,33 @@ hypre_ParCSRMatrix *hypre_ParCSRAAt( hypre_ParCSRMatrix  *A )
                       *--------------------------------------------------------*/
 
                      if ( A_ext_row_map[i3] < first_row_index_A ||
-                          A_ext_row_map[i3] > last_col_diag_C ) { /* offd */
-                        if (B_marker[i3+num_rows_diag_A] < jj_row_begin_offd) {
-                           B_marker[i3+num_rows_diag_A] = jj_count_offd;
+                          A_ext_row_map[i3] > last_col_diag_C )   /* offd */
+                     {
+                        if (B_marker[i3 + num_rows_diag_A] < jj_row_begin_offd)
+                        {
+                           B_marker[i3 + num_rows_diag_A] = jj_count_offd;
                            C_offd_data[jj_count_offd] = a_b_product;
                            C_offd_j[jj_count_offd] = i3;
                            jj_count_offd++;
                         }
                         else
-                           C_offd_data[B_marker[i3+num_rows_diag_A]] += a_b_product;
+                        {
+                           C_offd_data[B_marker[i3 + num_rows_diag_A]] += a_b_product;
+                        }
                      }
-                     else {                                              /* diag */
-                        if (B_marker[i3+num_rows_diag_A] < jj_row_begin_diag) {
-                           B_marker[i3+num_rows_diag_A] = jj_count_diag;
+                     else                                                /* diag */
+                     {
+                        if (B_marker[i3 + num_rows_diag_A] < jj_row_begin_diag)
+                        {
+                           B_marker[i3 + num_rows_diag_A] = jj_count_diag;
                            C_diag_data[jj_count_diag] = a_b_product;
-                           C_diag_j[jj_count_diag] = (HYPRE_Int)(i3-first_row_index_A);
+                           C_diag_j[jj_count_diag] = (HYPRE_Int)(i3 - first_row_index_A);
                            jj_count_diag++;
                         }
                         else
-                           C_diag_data[B_marker[i3+num_rows_diag_A]] += a_b_product;
+                        {
+                           C_diag_data[B_marker[i3 + num_rows_diag_A]] += a_b_product;
+                        }
                      }
                   }
                }
@@ -616,7 +656,7 @@ hypre_ParCSRMatrix *hypre_ParCSRAAt( hypre_ParCSRMatrix  *A )
        *  on this processor.
        *-----------------------------------------------------------------*/
 
-      for (jj2 = A_diag_i[i1]; jj2 < A_diag_i[i1+1]; jj2++)
+      for (jj2 = A_diag_i[i1]; jj2 < A_diag_i[i1 + 1]; jj2++)
       {
          i2 = A_diag_j[jj2];
          a_entry = A_diag_data[jj2];
@@ -631,9 +671,12 @@ hypre_ParCSRMatrix *hypre_ParCSRAAt( hypre_ParCSRMatrix  *A )
           *  For each entry (i2,i3) of A^T,  add A(i1,i2)*A(i3,i2)
           *  to C(i1,i3)
           *-----------------------------------------------------------*/
-         for ( i3=0; i3<num_rows_diag_A; i3++ ) {
-            for ( jj3=A_diag_i[i3]; jj3<A_diag_i[i3+1]; jj3++ ) {
-               if ( A_diag_j[jj3]==i2 ) {
+         for ( i3 = 0; i3 < num_rows_diag_A; i3++ )
+         {
+            for ( jj3 = A_diag_i[i3]; jj3 < A_diag_i[i3 + 1]; jj3++ )
+            {
+               if ( A_diag_j[jj3] == i2 )
+               {
                   /* row i3, column i2 of A; or,
                      row i2, column i3 of A^T */
                   a_b_product = a_entry * A_diag_data[jj3];
@@ -670,17 +713,21 @@ hypre_ParCSRMatrix *hypre_ParCSRAAt( hypre_ParCSRMatrix  *A )
        *  It contributes to the diag block of C.
        *  For each entry (i2,i3) of A^T, add A*A^T to C
        *-----------------------------------------------------------*/
-      if (num_cols_offd_A) {
+      if (num_cols_offd_A)
+      {
 
-         for (jj2 = A_offd_i[i1]; jj2 < A_offd_i[i1+1]; jj2++)
+         for (jj2 = A_offd_i[i1]; jj2 < A_offd_i[i1 + 1]; jj2++)
          {
             i2 = A_offd_j[jj2];
             a_entry = A_offd_data[jj2];
 
-            for ( i3=0; i3<num_rows_diag_A; i3++ ) {
+            for ( i3 = 0; i3 < num_rows_diag_A; i3++ )
+            {
                /* ... note that num_rows_diag_A == num_rows_offd_A */
-               for ( jj3=A_offd_i[i3]; jj3<A_offd_i[i3+1]; jj3++ ) {
-                  if ( A_offd_j[jj3]==i2 ) {
+               for ( jj3 = A_offd_i[i3]; jj3 < A_offd_i[i3 + 1]; jj3++ )
+               {
+                  if ( A_offd_j[jj3] == i2 )
+                  {
                      /* row i3, column i2 of A; or,
                         row i2, column i3 of A^T */
                      a_b_product = a_entry * A_offd_data[jj3];
@@ -711,18 +758,20 @@ hypre_ParCSRMatrix *hypre_ParCSRAAt( hypre_ParCSRMatrix  *A )
 #if 0          /* debugging printout */
       hypre_printf("end of i1 loop: i1=%i jj_count_diag=%i\n", i1, jj_count_diag );
       hypre_printf("  C_diag_j=");
-      for ( jj3=0; jj3<jj_count_diag; ++jj3) hypre_printf("%i ",C_diag_j[jj3]);
+      for ( jj3 = 0; jj3 < jj_count_diag; ++jj3) { hypre_printf("%i ", C_diag_j[jj3]); }
       hypre_printf("  C_diag_data=");
-      for ( jj3=0; jj3<jj_count_diag; ++jj3) hypre_printf("%f ",C_diag_data[jj3]);
+      for ( jj3 = 0; jj3 < jj_count_diag; ++jj3) { hypre_printf("%f ", C_diag_data[jj3]); }
       hypre_printf("\n");
       hypre_printf("  C_offd_j=");
-      for ( jj3=0; jj3<jj_count_offd; ++jj3) hypre_printf("%i ",C_offd_j[jj3]);
+      for ( jj3 = 0; jj3 < jj_count_offd; ++jj3) { hypre_printf("%i ", C_offd_j[jj3]); }
       hypre_printf("  C_offd_data=");
-      for ( jj3=0; jj3<jj_count_offd; ++jj3) hypre_printf("%f ",C_offd_data[jj3]);
+      for ( jj3 = 0; jj3 < jj_count_offd; ++jj3) { hypre_printf("%f ", C_offd_data[jj3]); }
       hypre_printf("\n");
       hypre_printf( "  B_marker =" );
-      for ( it=0; it<num_rows_diag_A+num_rows_A_ext; ++it )
+      for ( it = 0; it < num_rows_diag_A + num_rows_A_ext; ++it )
+      {
          hypre_printf(" %i", B_marker[it] );
+      }
       hypre_printf( "\n" );
 #endif
    }           /* end of i1 loop */
@@ -733,28 +782,36 @@ hypre_ParCSRMatrix *hypre_ParCSRAAt( hypre_ParCSRMatrix  *A )
     *  block) col_map_offd_C[i3]==A_ext_row_map[i3].
     *-----------------------------------------------------------------------*/
 
-   for ( i=0; i<num_rows_diag_A+num_rows_A_ext; ++i )
+   for ( i = 0; i < num_rows_diag_A + num_rows_A_ext; ++i )
+   {
       B_marker[i] = -1;
-   for ( i=0; i<C_offd_size; i++ )
+   }
+   for ( i = 0; i < C_offd_size; i++ )
+   {
       B_marker[ C_offd_j[i] ] = -2;
+   }
 
    count = 0;
-   for (i=0; i < num_rows_diag_A + num_rows_A_ext; i++) {
-      if (B_marker[i] == -2) {
+   for (i = 0; i < num_rows_diag_A + num_rows_A_ext; i++)
+   {
+      if (B_marker[i] == -2)
+      {
          B_marker[i] = count;
          count++;
       }
    }
    num_cols_offd_C = count;
 
-   if (num_cols_offd_C) {
+   if (num_cols_offd_C)
+   {
       col_map_offd_C = hypre_CTAlloc(HYPRE_BigInt, num_cols_offd_C, HYPRE_MEMORY_HOST);
       new_C_offd_j = hypre_CTAlloc(HYPRE_Int, C_offd_size, HYPRE_MEMORY_HOST);
       /* ... a bit big, but num_cols_offd_C is too small.  It might be worth
          computing the correct size, which is sum( no. columns in row i, over all rows i )
       */
 
-      for (i=0; i < C_offd_size; i++) {
+      for (i = 0; i < C_offd_size; i++)
+      {
          new_C_offd_j[i] = B_marker[C_offd_j[i]];
          col_map_offd_C[ new_C_offd_j[i] ] = A_ext_row_map[ C_offd_j[i] ];
       }
@@ -785,10 +842,11 @@ hypre_ParCSRMatrix *hypre_ParCSRAAt( hypre_ParCSRMatrix  *A )
       hypre_CSRMatrixJ(C_offd) = C_offd_j;
       hypre_ParCSRMatrixOffd(C) = C_offd;
       hypre_ParCSRMatrixColMapOffd(C) = col_map_offd_C;
-
    }
    else
+   {
       hypre_TFree(C_offd_i, HYPRE_MEMORY_HOST);
+   }
 
    /*-----------------------------------------------------------------------
     *  Free B_ext and marker array.
@@ -801,13 +859,13 @@ hypre_ParCSRMatrix *hypre_ParCSRAAt( hypre_ParCSRMatrix  *A )
    }
    hypre_TFree(B_marker, HYPRE_MEMORY_HOST);
    if ( num_rows_diag_A != n_rows_A )
+   {
       hypre_TFree(A_ext_row_map, HYPRE_MEMORY_HOST);
+   }
 
    return C;
-
 }
 
-
 /*--------------------------------------------------------------------------
  * hypre_ParCSRMatrixExtractAExt : extracts rows from A which are located on other
  * processors and needed for multiplying A^T with the local part of A. The rows
@@ -865,20 +923,20 @@ hypre_ParCSRMatrixExtractAExt( hypre_ParCSRMatrix *A,
    num_rows_A_ext = recv_vec_starts[num_recvs];
 
    hypre_ParCSRMatrixExtractBExt_Arrays
-      ( &A_ext_i, &A_ext_j, &A_ext_data, pA_ext_row_map,
-        &num_nonzeros,
-        data, 1, comm, comm_pkg,
-        num_cols_A, num_recvs, num_sends,
-        first_col_diag, A->row_starts,
-        recv_vec_starts, send_map_starts, send_map_elmts,
-        diag_i, diag_j, offd_i, offd_j, col_map_offd,
-        diag_data, offd_data
-         );
-
-   A_ext = hypre_CSRMatrixCreate(num_rows_A_ext,num_cols_A,num_nonzeros);
+   ( &A_ext_i, &A_ext_j, &A_ext_data, pA_ext_row_map,
+     &num_nonzeros,
+     data, 1, comm, comm_pkg,
+     num_cols_A, num_recvs, num_sends,
+     first_col_diag, A->row_starts,
+     recv_vec_starts, send_map_starts, send_map_elmts,
+     diag_i, diag_j, offd_i, offd_j, col_map_offd,
+     diag_data, offd_data
+   );
+
+   A_ext = hypre_CSRMatrixCreate(num_rows_A_ext, num_cols_A, num_nonzeros);
    hypre_CSRMatrixI(A_ext) = A_ext_i;
    hypre_CSRMatrixBigJ(A_ext) = A_ext_j;
-   if (data) hypre_CSRMatrixData(A_ext) = A_ext_data;
+   if (data) { hypre_CSRMatrixData(A_ext) = A_ext_data; }
 
    return A_ext;
 }
diff --git a/external/hypre/src/parcsr_mv/par_csr_assumed_part.c b/external/hypre/src/parcsr_mv/par_csr_assumed_part.c
index e0ee4438..7356168d 100644
--- a/external/hypre/src/parcsr_mv/par_csr_assumed_part.c
+++ b/external/hypre/src/parcsr_mv/par_csr_assumed_part.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -57,16 +57,18 @@ hypre_LocateAssumedPartition(MPI_Comm comm, HYPRE_BigInt row_start, HYPRE_BigInt
     *  which rows do I have that others are assumed responsible for?
     *  (at most two ranges - maybe none)
     *-----------------------------------------------------------*/
-   contact_row_start[0]=0;
-   contact_row_end[0]=0;
-   contact_row_start[1]=0;
-   contact_row_end[1]=0;
+   contact_row_start[0] = 0;
+   contact_row_end[0] = 0;
+   contact_row_start[1] = 0;
+   contact_row_end[1] = 0;
    contact_ranges = 0;
 
    if (row_start <= row_end )
-   { /*must own at least one row*/
+   {
+      /*must own at least one row*/
       if ( part->row_end < row_start  || row_end < part->row_start  )
-      {  /*no overlap - so all of my rows and only one range*/
+      {
+         /*no overlap - so all of my rows and only one range*/
          contact_row_start[0] = row_start;
          contact_row_end[0] = row_end;
          contact_ranges++;
@@ -84,12 +86,12 @@ hypre_LocateAssumedPartition(MPI_Comm comm, HYPRE_BigInt row_start, HYPRE_BigInt
          {
             if (contact_ranges) /* already found one range */
             {
-               contact_row_start[1] = part->row_end +1;
+               contact_row_start[1] = part->row_end + 1;
                contact_row_end[1] = row_end;
             }
             else
             {
-               contact_row_start[0] =  part->row_end +1;
+               contact_row_start[0] =  part->row_end + 1;
                contact_row_end[0] = row_end;
             }
             contact_ranges++;
@@ -106,16 +108,17 @@ hypre_LocateAssumedPartition(MPI_Comm comm, HYPRE_BigInt row_start, HYPRE_BigInt
 
    contact_list_length = 0;
    contact_list_storage = 5;
-   contact_list = hypre_TAlloc(HYPRE_BigInt,  contact_list_storage*3, HYPRE_MEMORY_HOST); /*each contact needs 3 ints */
+   contact_list = hypre_TAlloc(HYPRE_BigInt,  contact_list_storage * 3,
+                               HYPRE_MEMORY_HOST); /*each contact needs 3 ints */
 
-   for (i=0; i<contact_ranges; i++)
+   for (i = 0; i < contact_ranges; i++)
    {
 
       /*get start and end row owners */
       hypre_GetAssumedPartitionProcFromRow(comm, contact_row_start[i], global_first_row,
-            global_num_rows, &owner_start);
+                                           global_num_rows, &owner_start);
       hypre_GetAssumedPartitionProcFromRow(comm, contact_row_end[i], global_first_row,
-            global_num_rows, &owner_end);
+                                           global_num_rows, &owner_end);
 
       if (owner_start == owner_end) /* same processor owns the whole range */
       {
@@ -124,7 +127,8 @@ hypre_LocateAssumedPartition(MPI_Comm comm, HYPRE_BigInt row_start, HYPRE_BigInt
          {
             /*allocate more space*/
             contact_list_storage += 5;
-            contact_list = hypre_TReAlloc(contact_list,  HYPRE_BigInt,  (contact_list_storage*3), HYPRE_MEMORY_HOST);
+            contact_list = hypre_TReAlloc(contact_list,  HYPRE_BigInt,  (contact_list_storage * 3),
+                                          HYPRE_MEMORY_HOST);
          }
          CONTACT(contact_list_length, 0) = (HYPRE_BigInt) owner_start;   /*proc #*/
          CONTACT(contact_list_length, 1) = contact_row_start[i];  /* start row */
@@ -133,11 +137,11 @@ hypre_LocateAssumedPartition(MPI_Comm comm, HYPRE_BigInt row_start, HYPRE_BigInt
       }
       else
       {
-        complete = 0;
-        while (!complete)
-        {
+         complete = 0;
+         while (!complete)
+         {
             hypre_GetAssumedPartitionRowRange(comm, owner_start, global_first_row,
-                  global_num_rows, &tmp_row_start, &tmp_row_end);
+                                              global_num_rows, &tmp_row_start, &tmp_row_end);
 
             if (tmp_row_end >= contact_row_end[i])
             {
@@ -154,7 +158,8 @@ hypre_LocateAssumedPartition(MPI_Comm comm, HYPRE_BigInt row_start, HYPRE_BigInt
             {
                /*allocate more space*/
                contact_list_storage += 5;
-               contact_list = hypre_TReAlloc(contact_list,  HYPRE_BigInt,  (contact_list_storage*3), HYPRE_MEMORY_HOST);
+               contact_list = hypre_TReAlloc(contact_list,  HYPRE_BigInt,  (contact_list_storage * 3),
+                                             HYPRE_MEMORY_HOST);
             }
 
 
@@ -163,7 +168,7 @@ hypre_LocateAssumedPartition(MPI_Comm comm, HYPRE_BigInt row_start, HYPRE_BigInt
             CONTACT(contact_list_length, 2) = tmp_row_end;  /*end row */
             contact_list_length++;
             owner_start++; /*processors are seqential */
-        }
+         }
       }
    }
 
@@ -171,11 +176,11 @@ hypre_LocateAssumedPartition(MPI_Comm comm, HYPRE_BigInt row_start, HYPRE_BigInt
    statuses = hypre_CTAlloc(hypre_MPI_Status,  contact_list_length, HYPRE_MEMORY_HOST);
 
    /*send out messages */
-   for (i=0; i< contact_list_length; i++)
+   for (i = 0; i < contact_list_length; i++)
    {
-      hypre_MPI_Isend(&CONTACT(i,1) ,2, HYPRE_MPI_BIG_INT, CONTACT(i,0), flag1 ,
-                 comm, &requests[i]);
-                 /*hypre_MPI_COMM_WORLD, &requests[i]);*/
+      hypre_MPI_Isend(&CONTACT(i, 1), 2, HYPRE_MPI_BIG_INT, CONTACT(i, 0), flag1,
+                      comm, &requests[i]);
+      /*hypre_MPI_COMM_WORLD, &requests[i]);*/
    }
 
    /*-----------------------------------------------------------
@@ -194,7 +199,7 @@ hypre_LocateAssumedPartition(MPI_Comm comm, HYPRE_BigInt row_start, HYPRE_BigInt
    /*locate_ranges = 0;*/
 
    if (part->row_end < row_start  || row_end < part->row_start  )
-   /*no overlap - so all of my assumed rows */
+      /*no overlap - so all of my assumed rows */
    {
       /*locate_row_start[0] = part->row_start;*/
       /*locate_ranges++;*/
@@ -203,10 +208,11 @@ hypre_LocateAssumedPartition(MPI_Comm comm, HYPRE_BigInt row_start, HYPRE_BigInt
    else /* the two regions overlap */
    {
       if (part->row_start < row_start)
-      {/* check for locate rows on the low end of the local range */
+      {
+         /* check for locate rows on the low end of the local range */
          /*locate_row_start[0] = part->row_start;*/
          /*locate_ranges++;*/
-         locate_row_count += (row_start-1) - part->row_start + 1;
+         locate_row_count += (row_start - 1) - part->row_start + 1;
       }
       if (row_end < part->row_end) /* check the high end */
       {
@@ -224,15 +230,15 @@ hypre_LocateAssumedPartition(MPI_Comm comm, HYPRE_BigInt row_start, HYPRE_BigInt
    }
 
 
-    /*-----------------------------------------------------------
-     * Receive messages from other procs telling us where
-     * all our  locate rows actually reside
-     *-----------------------------------------------------------*/
+   /*-----------------------------------------------------------
+    * Receive messages from other procs telling us where
+    * all our  locate rows actually reside
+    *-----------------------------------------------------------*/
 
 
-    /* we will keep a partition of our assumed partition - list ourselves
-       first.  We will sort later with an additional index.
-       In practice, this should only contain a few processors */
+   /* we will keep a partition of our assumed partition - list ourselves
+      first.  We will sort later with an additional index.
+      In practice, this should only contain a few processors */
 
    /*which part do I own?*/
    tmp_row_start = hypre_max(part->row_start, row_start);
@@ -254,43 +260,46 @@ hypre_LocateAssumedPartition(MPI_Comm comm, HYPRE_BigInt row_start, HYPRE_BigInt
 
    while (rows_found != locate_row_count)
    {
-      hypre_MPI_Recv( tmp_range, 2 , HYPRE_MPI_BIG_INT, hypre_MPI_ANY_SOURCE,
-                      flag1 , comm, &status0);
-                      /*flag1 , hypre_MPI_COMM_WORLD, &status0);*/
+      hypre_MPI_Recv( tmp_range, 2, HYPRE_MPI_BIG_INT, hypre_MPI_ANY_SOURCE,
+                      flag1, comm, &status0);
+      /*flag1 , hypre_MPI_COMM_WORLD, &status0);*/
 
-      if (part->length==part->storage_length)
+      if (part->length == part->storage_length)
       {
-         part->storage_length+=10;
-         part->proc_list = hypre_TReAlloc(part->proc_list,  HYPRE_Int,  part->storage_length, HYPRE_MEMORY_HOST);
-         part->row_start_list = hypre_TReAlloc(part->row_start_list,  HYPRE_BigInt,  part->storage_length, HYPRE_MEMORY_HOST);
-         part->row_end_list = hypre_TReAlloc(part->row_end_list,  HYPRE_BigInt,  part->storage_length, HYPRE_MEMORY_HOST);
+         part->storage_length += 10;
+         part->proc_list = hypre_TReAlloc(part->proc_list,  HYPRE_Int,  part->storage_length,
+                                          HYPRE_MEMORY_HOST);
+         part->row_start_list = hypre_TReAlloc(part->row_start_list,  HYPRE_BigInt,  part->storage_length,
+                                               HYPRE_MEMORY_HOST);
+         part->row_end_list = hypre_TReAlloc(part->row_end_list,  HYPRE_BigInt,  part->storage_length,
+                                             HYPRE_MEMORY_HOST);
 
       }
       part->row_start_list[part->length] = tmp_range[0];
       part->row_end_list[part->length] = tmp_range[1];
 
       part->proc_list[part->length] = status0.hypre_MPI_SOURCE;
-      rows_found += tmp_range[1]- tmp_range[0] + 1;
+      rows_found += tmp_range[1] - tmp_range[0] + 1;
 
       part->length++;
    }
 
    /*In case the partition of the assumed partition is longish,
      we would like to know the sorted order */
-   si= hypre_CTAlloc(HYPRE_Int,  part->length, HYPRE_MEMORY_HOST);
+   si = hypre_CTAlloc(HYPRE_Int,  part->length, HYPRE_MEMORY_HOST);
    sortme = hypre_CTAlloc(HYPRE_BigInt,  part->length, HYPRE_MEMORY_HOST);
 
-   for (i=0; i<part->length; i++)
+   for (i = 0; i < part->length; i++)
    {
-       si[i] = i;
-       sortme[i] = part->row_start_list[i];
+      si[i] = i;
+      sortme[i] = part->row_start_list[i];
    }
-   hypre_BigQsortbi( sortme, si, 0, (part->length)-1);
+   hypre_BigQsortbi( sortme, si, 0, (part->length) - 1);
    part->sort_index = si;
 
    /*free the requests */
    hypre_MPI_Waitall(contact_list_length, requests,
-                    statuses);
+                     statuses);
 
    hypre_TFree(statuses, HYPRE_MEMORY_HOST);
    hypre_TFree(requests, HYPRE_MEMORY_HOST);
@@ -348,7 +357,7 @@ hypre_ParCSRMatrixCreateAssumedPartition( hypre_ParCSRMatrix *matrix)
 {
    HYPRE_BigInt global_num_cols;
    /* HYPRE_Int myid; */
-   HYPRE_BigInt  row_start=0, row_end=0, col_start = 0, col_end = 0;
+   HYPRE_BigInt  row_start = 0, row_end = 0, col_start = 0, col_end = 0;
 
    MPI_Comm   comm;
 
@@ -417,16 +426,16 @@ hypre_GetAssumedPartitionProcFromRow( MPI_Comm comm, HYPRE_BigInt row,
       errors make this difficult!!!!! */
 
    size = global_num_rows / (HYPRE_BigInt)num_procs;
-   extra = global_num_rows - size*(HYPRE_BigInt)num_procs;
-   switch_row = global_first_row + (size + 1)*extra;
+   extra = global_num_rows - size * (HYPRE_BigInt)num_procs;
+   switch_row = global_first_row + (size + 1) * extra;
 
    if (row >= switch_row)
    {
-      *proc_id = (HYPRE_Int)(extra + (row - switch_row)/size);
+      *proc_id = (HYPRE_Int)(extra + (row - switch_row) / size);
    }
    else
    {
-      *proc_id = (HYPRE_Int)((row - global_first_row)/(size+1));
+      *proc_id = (HYPRE_Int)((row - global_first_row) / (size + 1));
    }
 
 
@@ -452,19 +461,19 @@ hypre_GetAssumedPartitionRowRange( MPI_Comm comm, HYPRE_Int proc_id, HYPRE_BigIn
    /*hypre_MPI_Comm_size(hypre_MPI_COMM_WORLD, &num_procs );*/
 
 
-  /* this may look non-intuitive, but we have to be very careful that
-      this function and the next are inverses - and avoiding overflow and
-      rounding errors makes this difficult! */
+   /* this may look non-intuitive, but we have to be very careful that
+       this function and the next are inverses - and avoiding overflow and
+       rounding errors makes this difficult! */
 
    size = global_num_rows / (HYPRE_BigInt)num_procs;
-   extra = (HYPRE_Int)(global_num_rows - size*(HYPRE_BigInt)num_procs);
+   extra = (HYPRE_Int)(global_num_rows - size * (HYPRE_BigInt)num_procs);
 
-   *row_start = global_first_row + size*(HYPRE_BigInt)proc_id;
+   *row_start = global_first_row + size * (HYPRE_BigInt)proc_id;
    *row_start += (HYPRE_BigInt) hypre_min(proc_id, extra);
 
 
-   *row_end =  global_first_row + size*(HYPRE_BigInt)(proc_id+1);
-   *row_end += (HYPRE_BigInt)hypre_min(proc_id+1, extra);
+   *row_end =  global_first_row + size * (HYPRE_BigInt)(proc_id + 1);
+   *row_end += (HYPRE_BigInt)hypre_min(proc_id + 1, extra);
    *row_end = *row_end - 1;
 
 
@@ -488,7 +497,7 @@ hypre_ParVectorCreateAssumedPartition( hypre_ParVector *vector)
 {
    HYPRE_BigInt global_num;
    HYPRE_Int myid;
-   HYPRE_BigInt  start=0, end=0;
+   HYPRE_BigInt  start = 0, end = 0;
 
    MPI_Comm   comm;
 
@@ -509,7 +518,7 @@ hypre_ParVectorCreateAssumedPartition( hypre_ParVector *vector)
    /* get my assumed partitioning  - we want partitioning of the vector that the
       matrix multiplies - so we use the col start and end */
    hypre_GetAssumedPartitionRowRange( comm, myid, 0, global_num, &(apart->row_start),
-                                             &(apart->row_end));
+                                      &(apart->row_end));
 
    /*allocate some space for the partition of the assumed partition */
    apart->length = 0;
diff --git a/external/hypre/src/parcsr_mv/par_csr_assumed_part.h b/external/hypre/src/parcsr_mv/par_csr_assumed_part.h
index fde9ac93..ea877d44 100644
--- a/external/hypre/src/parcsr_mv/par_csr_assumed_part.h
+++ b/external/hypre/src/parcsr_mv/par_csr_assumed_part.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/parcsr_mv/par_csr_bool_matop.c b/external/hypre/src/parcsr_mv/par_csr_bool_matop.c
index a452ac0f..87026046 100644
--- a/external/hypre/src/parcsr_mv/par_csr_bool_matop.c
+++ b/external/hypre/src/parcsr_mv/par_csr_bool_matop.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -11,7 +11,7 @@ hypre_ParCSRBooleanMatrix*
 hypre_ParBooleanMatmul( hypre_ParCSRBooleanMatrix *A,
                         hypre_ParCSRBooleanMatrix *B )
 {
-   MPI_Comm 	   comm = hypre_ParCSRBooleanMatrix_Get_Comm(A);
+   MPI_Comm       comm = hypre_ParCSRBooleanMatrix_Get_Comm(A);
 
    hypre_CSRBooleanMatrix *A_diag = hypre_ParCSRBooleanMatrix_Get_Diag(A);
    HYPRE_Int              *A_diag_i = hypre_CSRBooleanMatrix_Get_I(A_diag);
@@ -22,57 +22,57 @@ hypre_ParBooleanMatmul( hypre_ParCSRBooleanMatrix *A,
    HYPRE_Int              *A_offd_j = hypre_CSRBooleanMatrix_Get_J(A_offd);
 
    HYPRE_BigInt *row_starts_A = hypre_ParCSRBooleanMatrix_Get_RowStarts(A);
-   HYPRE_Int	num_rows_diag_A = hypre_CSRBooleanMatrix_Get_NRows(A_diag);
-   HYPRE_Int	num_cols_diag_A = hypre_CSRBooleanMatrix_Get_NCols(A_diag);
-   HYPRE_Int	num_cols_offd_A = hypre_CSRBooleanMatrix_Get_NCols(A_offd);
+   HYPRE_Int   num_rows_diag_A = hypre_CSRBooleanMatrix_Get_NRows(A_diag);
+   HYPRE_Int   num_cols_diag_A = hypre_CSRBooleanMatrix_Get_NCols(A_diag);
+   HYPRE_Int   num_cols_offd_A = hypre_CSRBooleanMatrix_Get_NCols(A_offd);
 
    hypre_CSRBooleanMatrix *B_diag = hypre_ParCSRBooleanMatrix_Get_Diag(B);
    HYPRE_Int              *B_diag_i = hypre_CSRBooleanMatrix_Get_I(B_diag);
    HYPRE_Int              *B_diag_j = hypre_CSRBooleanMatrix_Get_J(B_diag);
 
    hypre_CSRBooleanMatrix *B_offd = hypre_ParCSRBooleanMatrix_Get_Offd(B);
-   HYPRE_BigInt		  *col_map_offd_B = hypre_ParCSRBooleanMatrix_Get_ColMapOffd(B);
+   HYPRE_BigInt        *col_map_offd_B = hypre_ParCSRBooleanMatrix_Get_ColMapOffd(B);
    HYPRE_Int              *B_offd_i = hypre_CSRBooleanMatrix_Get_I(B_offd);
    HYPRE_Int              *B_offd_j = hypre_CSRBooleanMatrix_Get_J(B_offd);
 
-   HYPRE_BigInt	first_col_diag_B = hypre_ParCSRBooleanMatrix_Get_FirstColDiag(B);
-   HYPRE_BigInt	last_col_diag_B;
+   HYPRE_BigInt   first_col_diag_B = hypre_ParCSRBooleanMatrix_Get_FirstColDiag(B);
+   HYPRE_BigInt   last_col_diag_B;
    HYPRE_BigInt *col_starts_B = hypre_ParCSRBooleanMatrix_Get_ColStarts(B);
-   HYPRE_Int	num_rows_diag_B = hypre_CSRBooleanMatrix_Get_NRows(B_diag);
-   HYPRE_Int	num_cols_diag_B = hypre_CSRBooleanMatrix_Get_NCols(B_diag);
-   HYPRE_Int	num_cols_offd_B = hypre_CSRBooleanMatrix_Get_NCols(B_offd);
+   HYPRE_Int   num_rows_diag_B = hypre_CSRBooleanMatrix_Get_NRows(B_diag);
+   HYPRE_Int   num_cols_diag_B = hypre_CSRBooleanMatrix_Get_NCols(B_diag);
+   HYPRE_Int   num_cols_offd_B = hypre_CSRBooleanMatrix_Get_NCols(B_offd);
 
    hypre_ParCSRBooleanMatrix *C;
-   HYPRE_BigInt		      *col_map_offd_C;
-   HYPRE_Int		      *map_B_to_C=NULL;
+   HYPRE_BigInt            *col_map_offd_C = NULL;
+   HYPRE_Int            *map_B_to_C = NULL;
 
    hypre_CSRBooleanMatrix *C_diag;
    HYPRE_Int             *C_diag_i;
    HYPRE_Int             *C_diag_j;
 
    hypre_CSRBooleanMatrix *C_offd;
-   HYPRE_Int             *C_offd_i=NULL;
-   HYPRE_Int             *C_offd_j=NULL;
+   HYPRE_Int             *C_offd_i = NULL;
+   HYPRE_Int             *C_offd_j = NULL;
 
    HYPRE_Int              C_diag_size;
    HYPRE_Int              C_offd_size;
-   HYPRE_Int		    num_cols_offd_C = 0;
+   HYPRE_Int          num_cols_offd_C = 0;
 
-   hypre_CSRBooleanMatrix *Bs_ext;
-   HYPRE_Int             *Bs_ext_i;
-   HYPRE_BigInt          *Bs_ext_j;
+   hypre_CSRBooleanMatrix *Bs_ext = NULL;
+   HYPRE_Int             *Bs_ext_i = NULL;
+   HYPRE_BigInt          *Bs_ext_j = NULL;
 
-   HYPRE_Int             *B_ext_diag_i;
-   HYPRE_Int             *B_ext_diag_j;
-   HYPRE_Int 		  B_ext_diag_size;
+   HYPRE_Int             *B_ext_diag_i = NULL;
+   HYPRE_Int             *B_ext_diag_j = NULL;
+   HYPRE_Int        B_ext_diag_size;
 
-   HYPRE_Int             *B_ext_offd_i;
-   HYPRE_Int             *B_ext_offd_j;
-   HYPRE_BigInt          *B_tmp_offd_j;
-   HYPRE_Int 		  B_ext_offd_size;
+   HYPRE_Int             *B_ext_offd_i = NULL;
+   HYPRE_Int             *B_ext_offd_j = NULL;
+   HYPRE_BigInt          *B_tmp_offd_j = NULL;
+   HYPRE_Int        B_ext_offd_size;
 
-   HYPRE_Int		 *B_marker;
-   HYPRE_BigInt		 *temp;
+   HYPRE_Int       *B_marker;
+   HYPRE_BigInt       *temp;
 
    HYPRE_Int              i, j;
    HYPRE_Int              i1, i2, i3;
@@ -81,12 +81,12 @@ hypre_ParBooleanMatmul( hypre_ParCSRBooleanMatrix *A,
    HYPRE_Int              jj_count_diag, jj_count_offd;
    HYPRE_Int              jj_row_begin_diag, jj_row_begin_offd;
    HYPRE_Int              start_indexing = 0; /* start indexing for C_data at 0 */
-   HYPRE_BigInt		  n_rows_A, n_cols_A;
-   HYPRE_BigInt		  n_rows_B, n_cols_B;
+   HYPRE_BigInt        n_rows_A, n_cols_A;
+   HYPRE_BigInt        n_rows_B, n_cols_B;
    HYPRE_Int              allsquare = 0;
    HYPRE_Int              cnt, cnt_offd, cnt_diag;
    HYPRE_Int              num_procs;
-   HYPRE_Int              value;
+   HYPRE_BigInt           value;
 
    n_rows_A = hypre_ParCSRBooleanMatrix_Get_GlobalNRows(A);
    n_cols_A = hypre_ParCSRBooleanMatrix_Get_GlobalNCols(A);
@@ -95,10 +95,10 @@ hypre_ParBooleanMatmul( hypre_ParCSRBooleanMatrix *A,
 
    if (n_cols_A != n_rows_B || num_cols_diag_A != num_rows_diag_B)
    {
-	hypre_error_w_msg(HYPRE_ERROR_GENERIC," Error! Incompatible matrix dimensions!\n");
-	return NULL;
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, " Error! Incompatible matrix dimensions!\n");
+      return NULL;
    }
-   if ( num_rows_diag_A==num_cols_diag_B ) allsquare = 1;
+   if ( num_rows_diag_A == num_cols_diag_B ) { allsquare = 1; }
 
    /*-----------------------------------------------------------------------
     *  Extract B_ext, i.e. portion of B that is stored on neighbor procs
@@ -109,39 +109,45 @@ hypre_ParBooleanMatmul( hypre_ParCSRBooleanMatrix *A,
 
    if (num_procs > 1)
    {
-       /*---------------------------------------------------------------------
-    	* If there exists no CommPkg for A, a CommPkg is generated using
-    	* equally load balanced partitionings
-    	*--------------------------------------------------------------------*/
-   	if (!hypre_ParCSRBooleanMatrix_Get_CommPkg(A))
-   	{
-        	hypre_BooleanMatvecCommPkgCreate(A);
-   	}
-
-   	Bs_ext = hypre_ParCSRBooleanMatrixExtractBExt(B,A);
-   	Bs_ext_i    = hypre_CSRBooleanMatrix_Get_I(Bs_ext);
-   	Bs_ext_j    = hypre_CSRBooleanMatrix_Get_BigJ(Bs_ext);
+      /*---------------------------------------------------------------------
+      * If there exists no CommPkg for A, a CommPkg is generated using
+      * equally load balanced partitionings
+      *--------------------------------------------------------------------*/
+      if (!hypre_ParCSRBooleanMatrix_Get_CommPkg(A))
+      {
+         hypre_BooleanMatvecCommPkgCreate(A);
+      }
+
+      Bs_ext = hypre_ParCSRBooleanMatrixExtractBExt(B, A);
+      Bs_ext_i    = hypre_CSRBooleanMatrix_Get_I(Bs_ext);
+      Bs_ext_j    = hypre_CSRBooleanMatrix_Get_BigJ(Bs_ext);
    }
 
-   B_ext_diag_i = hypre_CTAlloc(HYPRE_Int,  num_cols_offd_A+1, HYPRE_MEMORY_HOST);
-   B_ext_offd_i = hypre_CTAlloc(HYPRE_Int,  num_cols_offd_A+1, HYPRE_MEMORY_HOST);
+   B_ext_diag_i = hypre_CTAlloc(HYPRE_Int,  num_cols_offd_A + 1, HYPRE_MEMORY_HOST);
+   B_ext_offd_i = hypre_CTAlloc(HYPRE_Int,  num_cols_offd_A + 1, HYPRE_MEMORY_HOST);
    B_ext_diag_size = 0;
    B_ext_offd_size = 0;
-   last_col_diag_B = first_col_diag_B + num_cols_diag_B -1;
+   last_col_diag_B = first_col_diag_B + num_cols_diag_B - 1;
 
-   for (i=0; i < num_cols_offd_A; i++)
+   for (i = 0; i < num_cols_offd_A; i++)
    {
-      for (j=Bs_ext_i[i]; j < Bs_ext_i[i+1]; j++)
+      for (j = Bs_ext_i[i]; j < Bs_ext_i[i + 1]; j++)
          if (Bs_ext_j[j] < first_col_diag_B || Bs_ext_j[j] > last_col_diag_B)
+         {
             B_ext_offd_size++;
+         }
          else
+         {
             B_ext_diag_size++;
-      B_ext_diag_i[i+1] = B_ext_diag_size;
-      B_ext_offd_i[i+1] = B_ext_offd_size;
+         }
+      B_ext_diag_i[i + 1] = B_ext_diag_size;
+      B_ext_offd_i[i + 1] = B_ext_offd_size;
    }
 
    if (B_ext_diag_size)
+   {
       B_ext_diag_j = hypre_CTAlloc(HYPRE_Int,  B_ext_diag_size, HYPRE_MEMORY_HOST);
+   }
 
    if (B_ext_offd_size)
    {
@@ -151,9 +157,9 @@ hypre_ParBooleanMatmul( hypre_ParCSRBooleanMatrix *A,
 
    cnt_offd = 0;
    cnt_diag = 0;
-   for (i=0; i < num_cols_offd_A; i++)
+   for (i = 0; i < num_cols_offd_A; i++)
    {
-      for (j=Bs_ext_i[i]; j < Bs_ext_i[i+1]; j++)
+      for (j = Bs_ext_i[i]; j < Bs_ext_i[i + 1]; j++)
          if (Bs_ext_j[j] < first_col_diag_B || Bs_ext_j[j] > last_col_diag_B)
          {
             B_tmp_offd_j[cnt_offd++] = Bs_ext_j[j];
@@ -174,20 +180,24 @@ hypre_ParBooleanMatmul( hypre_ParCSRBooleanMatrix *A,
    cnt = 0;
    if (B_ext_offd_size || num_cols_offd_B)
    {
-      temp = hypre_CTAlloc(HYPRE_BigInt,  B_ext_offd_size+num_cols_offd_B, HYPRE_MEMORY_HOST);
-      for (i=0; i < B_ext_offd_size; i++)
+      temp = hypre_CTAlloc(HYPRE_BigInt,  B_ext_offd_size + num_cols_offd_B, HYPRE_MEMORY_HOST);
+      for (i = 0; i < B_ext_offd_size; i++)
+      {
          temp[i] = B_tmp_offd_j[i];
+      }
       cnt = B_ext_offd_size;
-      for (i=0; i < num_cols_offd_B; i++)
+      for (i = 0; i < num_cols_offd_B; i++)
+      {
          temp[cnt++] = col_map_offd_B[i];
+      }
    }
    if (cnt)
    {
-      hypre_BigQsort0(temp, 0, cnt-1);
+      hypre_BigQsort0(temp, 0, cnt - 1);
 
       num_cols_offd_C = 1;
       value = temp[0];
-      for (i=1; i < cnt; i++)
+      for (i = 1; i < cnt; i++)
       {
          if (temp[i] > value)
          {
@@ -198,37 +208,46 @@ hypre_ParBooleanMatmul( hypre_ParCSRBooleanMatrix *A,
    }
 
    if (num_cols_offd_C)
-        col_map_offd_C = hypre_CTAlloc(HYPRE_BigInt, num_cols_offd_C, HYPRE_MEMORY_HOST);
+   {
+      col_map_offd_C = hypre_CTAlloc(HYPRE_BigInt, num_cols_offd_C, HYPRE_MEMORY_HOST);
+   }
 
-   for (i=0; i < num_cols_offd_C; i++)
+   for (i = 0; i < num_cols_offd_C; i++)
+   {
       col_map_offd_C[i] = temp[i];
+   }
 
    if (B_ext_offd_size || num_cols_offd_B)
+   {
       hypre_TFree(temp, HYPRE_MEMORY_HOST);
+   }
 
-   for (i=0 ; i < B_ext_offd_size; i++)
+   for (i = 0 ; i < B_ext_offd_size; i++)
       B_ext_offd_j[i] = hypre_BigBinarySearch(col_map_offd_C,
-                                           B_tmp_offd_j[i],
-                                           num_cols_offd_C);
+                                              B_tmp_offd_j[i],
+                                              num_cols_offd_C);
    if (B_ext_offd_size)
+   {
       hypre_TFree(B_tmp_offd_j, HYPRE_MEMORY_HOST);
+   }
 
    if (num_cols_offd_B)
    {
       map_B_to_C = hypre_CTAlloc(HYPRE_Int, num_cols_offd_B, HYPRE_MEMORY_HOST);
 
       cnt = 0;
-      for (i=0; i < num_cols_offd_C; i++)
+      for (i = 0; i < num_cols_offd_C; i++)
          if (col_map_offd_C[i] == col_map_offd_B[cnt])
          {
             map_B_to_C[cnt++] = i;
-            if (cnt == num_cols_offd_B) break;
+            if (cnt == num_cols_offd_B) { break; }
          }
    }
 
    hypre_ParMatmul_RowSizes(
       /*&C_diag_i, &C_offd_i, &B_marker,*/
-      HYPRE_MEMORY_DEVICE, /* RL: XXX */
+      /* BooleanMatrix only uses HOST memory for now */
+      HYPRE_MEMORY_HOST,
       &C_diag_i, &C_offd_i, NULL,
       A_diag_i, A_diag_j, A_offd_i, A_offd_j,
       B_diag_i, B_diag_j, B_offd_i, B_offd_j,
@@ -239,7 +258,7 @@ hypre_ParBooleanMatmul( hypre_ParCSRBooleanMatrix *A,
       num_cols_offd_A, allsquare,
       num_cols_diag_B, num_cols_offd_B,
       num_cols_offd_C
-      );
+   );
 
 
    /*-----------------------------------------------------------------------
@@ -251,7 +270,7 @@ hypre_ParBooleanMatmul( hypre_ParCSRBooleanMatrix *A,
    C_diag_j    = hypre_CTAlloc(HYPRE_Int,  C_diag_size, HYPRE_MEMORY_HOST);
    if (C_offd_size)
    {
-   	C_offd_j    = hypre_CTAlloc(HYPRE_Int,  C_offd_size, HYPRE_MEMORY_HOST);
+      C_offd_j    = hypre_CTAlloc(HYPRE_Int,  C_offd_size, HYPRE_MEMORY_HOST);
    }
 
 
@@ -264,7 +283,7 @@ hypre_ParBooleanMatmul( hypre_ParCSRBooleanMatrix *A,
    *  Allocate marker array.
     *-----------------------------------------------------------------------*/
 
-   B_marker = hypre_CTAlloc(HYPRE_Int,  num_cols_diag_B+num_cols_offd_C, HYPRE_MEMORY_HOST);
+   B_marker = hypre_CTAlloc(HYPRE_Int,  num_cols_diag_B + num_cols_offd_C, HYPRE_MEMORY_HOST);
 
    /*-----------------------------------------------------------------------
     *  Initialize some stuff.
@@ -272,7 +291,7 @@ hypre_ParBooleanMatmul( hypre_ParCSRBooleanMatrix *A,
 
    jj_count_diag = start_indexing;
    jj_count_offd = start_indexing;
-   for (i1 = 0; i1 < num_cols_diag_B+num_cols_offd_C; i1++)
+   for (i1 = 0; i1 < num_cols_diag_B + num_cols_offd_C; i1++)
    {
       B_marker[i1] = -1;
    }
@@ -290,114 +309,115 @@ hypre_ParBooleanMatmul( hypre_ParCSRBooleanMatrix *A,
 
       jj_row_begin_diag = jj_count_diag;
       jj_row_begin_offd = jj_count_offd;
-      if ( allsquare ) {
+      if ( allsquare )
+      {
          B_marker[i1] = jj_count_diag;
          C_diag_j[jj_count_diag] = i1;
          jj_count_diag++;
       }
 
-         /*-----------------------------------------------------------------
-          *  Loop over entries in row i1 of A_offd.
-          *-----------------------------------------------------------------*/
+      /*-----------------------------------------------------------------
+       *  Loop over entries in row i1 of A_offd.
+       *-----------------------------------------------------------------*/
 
-	 if (num_cols_offd_A)
-	 {
-	  for (jj2 = A_offd_i[i1]; jj2 < A_offd_i[i1+1]; jj2++)
-          {
+      if (num_cols_offd_A)
+      {
+         for (jj2 = A_offd_i[i1]; jj2 < A_offd_i[i1 + 1]; jj2++)
+         {
             i2 = A_offd_j[jj2];
 
-               /*-----------------------------------------------------------
-                *  Loop over entries in row i2 of B_ext.
-                *-----------------------------------------------------------*/
+            /*-----------------------------------------------------------
+             *  Loop over entries in row i2 of B_ext.
+             *-----------------------------------------------------------*/
 
-               for (jj3 = B_ext_offd_i[i2]; jj3 < B_ext_offd_i[i2+1]; jj3++)
-               {
-                  i3 = num_cols_diag_B+B_ext_offd_j[jj3];
+            for (jj3 = B_ext_offd_i[i2]; jj3 < B_ext_offd_i[i2 + 1]; jj3++)
+            {
+               i3 = num_cols_diag_B + B_ext_offd_j[jj3];
 
-                  /*--------------------------------------------------------
-                   *  Check B_marker to see that C_{i1,i3} has not already
-                   *  been accounted for. If it has not, create a new entry.
-                   *  If it has, add new contribution.
-                   *--------------------------------------------------------*/
-                  if (B_marker[i3] < jj_row_begin_offd)
-                  {
-                     	B_marker[i3] = jj_count_offd;
-                     	C_offd_j[jj_count_offd] = i3-num_cols_diag_B;
-                     	jj_count_offd++;
-		  }
-               }
-               for (jj3 = B_ext_diag_i[i2]; jj3 < B_ext_diag_i[i2+1]; jj3++)
+               /*--------------------------------------------------------
+                *  Check B_marker to see that C_{i1,i3} has not already
+                *  been accounted for. If it has not, create a new entry.
+                *  If it has, add new contribution.
+                *--------------------------------------------------------*/
+               if (B_marker[i3] < jj_row_begin_offd)
                {
-                  i3 = B_ext_diag_j[jj3];
+                  B_marker[i3] = jj_count_offd;
+                  C_offd_j[jj_count_offd] = i3 - num_cols_diag_B;
+                  jj_count_offd++;
+               }
+            }
+            for (jj3 = B_ext_diag_i[i2]; jj3 < B_ext_diag_i[i2 + 1]; jj3++)
+            {
+               i3 = B_ext_diag_j[jj3];
 
-                  if (B_marker[i3] < jj_row_begin_diag)
-                  {
-                     	B_marker[i3] = jj_count_diag;
-                     	C_diag_j[jj_count_diag] = i3;
-                     	jj_count_diag++;
-                  }
+               if (B_marker[i3] < jj_row_begin_diag)
+               {
+                  B_marker[i3] = jj_count_diag;
+                  C_diag_j[jj_count_diag] = i3;
+                  jj_count_diag++;
                }
             }
          }
+      }
 
-         /*-----------------------------------------------------------------
-          *  Loop over entries in row i1 of A_diag.
-          *-----------------------------------------------------------------*/
-
-         for (jj2 = A_diag_i[i1]; jj2 < A_diag_i[i1+1]; jj2++)
-         {
-            i2 = A_diag_j[jj2];
+      /*-----------------------------------------------------------------
+       *  Loop over entries in row i1 of A_diag.
+       *-----------------------------------------------------------------*/
 
-               /*-----------------------------------------------------------
-                *  Loop over entries in row i2 of B_diag.
-                *-----------------------------------------------------------*/
+      for (jj2 = A_diag_i[i1]; jj2 < A_diag_i[i1 + 1]; jj2++)
+      {
+         i2 = A_diag_j[jj2];
 
-               for (jj3 = B_diag_i[i2]; jj3 < B_diag_i[i2+1]; jj3++)
-               {
-                  i3 = B_diag_j[jj3];
+         /*-----------------------------------------------------------
+          *  Loop over entries in row i2 of B_diag.
+          *-----------------------------------------------------------*/
 
-                  /*--------------------------------------------------------
-                   *  Check B_marker to see that C_{i1,i3} has not already
-                   *  been accounted for. If it has not, create a new entry.
-                   *  If it has, add new contribution.
-                   *--------------------------------------------------------*/
+         for (jj3 = B_diag_i[i2]; jj3 < B_diag_i[i2 + 1]; jj3++)
+         {
+            i3 = B_diag_j[jj3];
+
+            /*--------------------------------------------------------
+             *  Check B_marker to see that C_{i1,i3} has not already
+             *  been accounted for. If it has not, create a new entry.
+             *  If it has, add new contribution.
+             *--------------------------------------------------------*/
+
+            if (B_marker[i3] < jj_row_begin_diag)
+            {
+               B_marker[i3] = jj_count_diag;
+               C_diag_j[jj_count_diag] = i3;
+               jj_count_diag++;
+            }
+         }
+         if (num_cols_offd_B)
+         {
+            for (jj3 = B_offd_i[i2]; jj3 < B_offd_i[i2 + 1]; jj3++)
+            {
+               i3 = num_cols_diag_B + map_B_to_C[B_offd_j[jj3]];
 
-                  if (B_marker[i3] < jj_row_begin_diag)
-                  {
-                     B_marker[i3] = jj_count_diag;
-                     C_diag_j[jj_count_diag] = i3;
-                     jj_count_diag++;
-                  }
-               }
-               if (num_cols_offd_B)
-	       {
-		for (jj3 = B_offd_i[i2]; jj3 < B_offd_i[i2+1]; jj3++)
-                {
-                  i3 = num_cols_diag_B+map_B_to_C[B_offd_j[jj3]];
+               /*--------------------------------------------------------
+                *  Check B_marker to see that C_{i1,i3} has not already
+                *  been accounted for. If it has not, create a new entry.
+                *  If it has, add new contribution.
+                *--------------------------------------------------------*/
 
-                  /*--------------------------------------------------------
-                   *  Check B_marker to see that C_{i1,i3} has not already
-                   *  been accounted for. If it has not, create a new entry.
-                   *  If it has, add new contribution.
-                   *--------------------------------------------------------*/
-
-                  if (B_marker[i3] < jj_row_begin_offd)
-                  {
-                     B_marker[i3] = jj_count_offd;
-                     C_offd_j[jj_count_offd] = i3-num_cols_diag_B;
-                     jj_count_offd++;
-                  }
-                }
+               if (B_marker[i3] < jj_row_begin_offd)
+               {
+                  B_marker[i3] = jj_count_offd;
+                  C_offd_j[jj_count_offd] = i3 - num_cols_diag_B;
+                  jj_count_offd++;
                }
+            }
          }
+      }
    }
 
    C = hypre_ParCSRBooleanMatrixCreate(comm, n_rows_A, n_cols_B, row_starts_A,
-	col_starts_B, num_cols_offd_C, C_diag_size, C_offd_size);
+                                       col_starts_B, num_cols_offd_C, C_diag_size, C_offd_size);
 
-/* Note that C does not own the partitionings */
-   hypre_ParCSRBooleanMatrixSetRowStartsOwner(C,0);
-   hypre_ParCSRBooleanMatrixSetColStartsOwner(C,0);
+   /* Note that C does not own the partitionings */
+   hypre_ParCSRBooleanMatrixSetRowStartsOwner(C, 0);
+   hypre_ParCSRBooleanMatrixSetColStartsOwner(C, 0);
 
    C_diag = hypre_ParCSRBooleanMatrix_Get_Diag(C);
    hypre_CSRBooleanMatrix_Get_I(C_diag) = C_diag_i;
@@ -420,11 +440,15 @@ hypre_ParBooleanMatmul( hypre_ParCSRBooleanMatrix *A,
    hypre_TFree(B_marker, HYPRE_MEMORY_HOST);
    hypre_TFree(B_ext_diag_i, HYPRE_MEMORY_HOST);
    if (B_ext_diag_size)
+   {
       hypre_TFree(B_ext_diag_j, HYPRE_MEMORY_HOST);
+   }
    hypre_TFree(B_ext_offd_i, HYPRE_MEMORY_HOST);
    if (B_ext_offd_size)
+   {
       hypre_TFree(B_ext_offd_j, HYPRE_MEMORY_HOST);
-   if (num_cols_offd_B) hypre_TFree(map_B_to_C, HYPRE_MEMORY_HOST);
+   }
+   if (num_cols_offd_B) { hypre_TFree(map_B_to_C, HYPRE_MEMORY_HOST); }
 
    return C;
 
@@ -470,25 +494,25 @@ hypre_ParCSRBooleanMatrixExtractBExt
    HYPRE_Int *B_ext_i;
    HYPRE_BigInt *B_ext_j;
 
-   HYPRE_Complex *B_ext_data=NULL, *diag_data=NULL, *offd_data=NULL;
-   HYPRE_BigInt *B_ext_row_map=NULL;
+   HYPRE_Complex *B_ext_data = NULL, *diag_data = NULL, *offd_data = NULL;
+   HYPRE_BigInt *B_ext_row_map = NULL;
    /* ... not referenced, but needed for function call */
 
    num_cols_B = hypre_ParCSRBooleanMatrix_Get_GlobalNCols(B);
    num_rows_B_ext = recv_vec_starts[num_recvs];
 
    hypre_ParCSRMatrixExtractBExt_Arrays
-      ( &B_ext_i, &B_ext_j, &B_ext_data, &B_ext_row_map,
-        &num_nonzeros,
-        0, 0, comm, comm_pkg,
-        num_cols_B, num_recvs, num_sends,
-        first_col_diag, B->row_starts,
-        recv_vec_starts, send_map_starts, send_map_elmts,
-        diag_i, diag_j, offd_i, offd_j, col_map_offd,
-        diag_data, offd_data
-         );
-
-   B_ext = hypre_CSRBooleanMatrixCreate(num_rows_B_ext,num_cols_B,num_nonzeros);
+   ( &B_ext_i, &B_ext_j, &B_ext_data, &B_ext_row_map,
+     &num_nonzeros,
+     0, 0, comm, comm_pkg,
+     num_cols_B, num_recvs, num_sends,
+     first_col_diag, B->row_starts,
+     recv_vec_starts, send_map_starts, send_map_elmts,
+     diag_i, diag_j, offd_i, offd_j, col_map_offd,
+     diag_data, offd_data
+   );
+
+   B_ext = hypre_CSRBooleanMatrixCreate(num_rows_B_ext, num_cols_B, num_nonzeros);
    hypre_CSRBooleanMatrix_Get_I(B_ext) = B_ext_i;
    hypre_CSRBooleanMatrix_Get_BigJ(B_ext) = B_ext_j;
 
@@ -504,7 +528,7 @@ hypre_ParCSRBooleanMatrixExtractBExt
 
 hypre_CSRBooleanMatrix *
 hypre_ParCSRBooleanMatrixExtractAExt( hypre_ParCSRBooleanMatrix *A,
-                                    HYPRE_BigInt ** pA_ext_row_map )
+                                      HYPRE_BigInt ** pA_ext_row_map )
 {
    /* Note that A's role as the first factor in A*A^T is used only
       through ...CommPkgT(A), which basically says which rows of A
@@ -545,24 +569,24 @@ hypre_ParCSRBooleanMatrixExtractAExt( hypre_ParCSRBooleanMatrix *A,
    HYPRE_BigInt *A_ext_j;
 
    HYPRE_Int data = 0;
-   HYPRE_Complex *A_ext_data = NULL, *diag_data=NULL, *offd_data=NULL;
+   HYPRE_Complex *A_ext_data = NULL, *diag_data = NULL, *offd_data = NULL;
    /* ... not referenced, but needed for function call */
 
    num_cols_A = hypre_ParCSRBooleanMatrix_Get_GlobalNCols(A);
    num_rows_A_ext = recv_vec_starts[num_recvs];
 
    hypre_ParCSRMatrixExtractBExt_Arrays
-      ( &A_ext_i, &A_ext_j, &A_ext_data, pA_ext_row_map,
-        &num_nonzeros,
-        data, 1, comm, comm_pkg,
-        num_cols_A, num_recvs, num_sends,
-        first_col_diag, A->row_starts,
-        recv_vec_starts, send_map_starts, send_map_elmts,
-        diag_i, diag_j, offd_i, offd_j, col_map_offd,
-        diag_data, offd_data
-         );
-
-   A_ext = hypre_CSRBooleanMatrixCreate(num_rows_A_ext,num_cols_A,num_nonzeros);
+   ( &A_ext_i, &A_ext_j, &A_ext_data, pA_ext_row_map,
+     &num_nonzeros,
+     data, 1, comm, comm_pkg,
+     num_cols_A, num_recvs, num_sends,
+     first_col_diag, A->row_starts,
+     recv_vec_starts, send_map_starts, send_map_elmts,
+     diag_i, diag_j, offd_i, offd_j, col_map_offd,
+     diag_data, offd_data
+   );
+
+   A_ext = hypre_CSRBooleanMatrixCreate(num_rows_A_ext, num_cols_A, num_nonzeros);
    hypre_CSRBooleanMatrix_Get_I(A_ext) = A_ext_i;
    hypre_CSRBooleanMatrix_Get_BigJ(A_ext) = A_ext_j;
 
@@ -576,9 +600,10 @@ hypre_ParCSRBooleanMatrixExtractAExt( hypre_ParCSRBooleanMatrix *A,
  * This is based on hypre_ParCSRAAt.
  *--------------------------------------------------------------------------*/
 
-hypre_ParCSRBooleanMatrix * hypre_ParBooleanAAt( hypre_ParCSRBooleanMatrix  * A )
+hypre_ParCSRBooleanMatrix*
+hypre_ParBooleanAAt(hypre_ParCSRBooleanMatrix  *A)
 {
-   MPI_Comm 	   comm = hypre_ParCSRBooleanMatrix_Get_Comm(A);
+   MPI_Comm       comm = hypre_ParCSRBooleanMatrix_Get_Comm(A);
 
    hypre_CSRBooleanMatrix *A_diag = hypre_ParCSRBooleanMatrix_Get_Diag(A);
 
@@ -593,11 +618,11 @@ hypre_ParCSRBooleanMatrix * hypre_ParBooleanAAt( hypre_ParCSRBooleanMatrix  * A
    HYPRE_BigInt          *A_ext_row_map;
 
    HYPRE_BigInt *row_starts_A = hypre_ParCSRBooleanMatrix_Get_RowStarts(A);
-   HYPRE_Int	num_rows_diag_A = hypre_CSRBooleanMatrix_Get_NRows(A_diag);
-   HYPRE_Int	num_cols_offd_A = hypre_CSRBooleanMatrix_Get_NCols(A_offd);
+   HYPRE_Int   num_rows_diag_A = hypre_CSRBooleanMatrix_Get_NRows(A_diag);
+   HYPRE_Int   num_cols_offd_A = hypre_CSRBooleanMatrix_Get_NCols(A_offd);
 
    hypre_ParCSRBooleanMatrix *C;
-   HYPRE_BigInt		      *col_map_offd_C;
+   HYPRE_BigInt            *col_map_offd_C;
 
    hypre_CSRBooleanMatrix *C_diag;
 
@@ -606,24 +631,24 @@ hypre_ParCSRBooleanMatrix * hypre_ParBooleanAAt( hypre_ParCSRBooleanMatrix  * A
 
    hypre_CSRBooleanMatrix *C_offd;
 
-   HYPRE_Int             *C_offd_i=NULL;
-   HYPRE_Int             *C_offd_j=NULL;
+   HYPRE_Int             *C_offd_i = NULL;
+   HYPRE_Int             *C_offd_j = NULL;
    HYPRE_Int             *new_C_offd_j;
 
    HYPRE_Int              C_diag_size;
    HYPRE_Int              C_offd_size;
-   HYPRE_Int		    last_col_diag_C;
-   HYPRE_Int		    num_cols_offd_C;
+   HYPRE_BigInt           last_col_diag_C;
+   HYPRE_Int              num_cols_offd_C;
 
-   hypre_CSRBooleanMatrix *A_ext;
+   hypre_CSRBooleanMatrix *A_ext = NULL;
 
-   HYPRE_Int             *A_ext_i;
-   HYPRE_BigInt          *A_ext_j;
-   HYPRE_Int             num_rows_A_ext=0;
+   HYPRE_Int             *A_ext_i = NULL;
+   HYPRE_BigInt          *A_ext_j = NULL;
+   HYPRE_Int             num_rows_A_ext = 0;
 
-   HYPRE_BigInt	first_row_index_A = hypre_ParCSRBooleanMatrix_Get_FirstRowIndex(A);
-   HYPRE_BigInt	first_col_diag_A = hypre_ParCSRBooleanMatrix_Get_FirstColDiag(A);
-   HYPRE_Int		   *B_marker;
+   HYPRE_BigInt   first_row_index_A = hypre_ParCSRBooleanMatrix_Get_FirstRowIndex(A);
+   HYPRE_BigInt   first_col_diag_A = hypre_ParCSRBooleanMatrix_Get_FirstColDiag(A);
+   HYPRE_Int         *B_marker;
 
    HYPRE_Int              i;
    HYPRE_Int              i1, i2, i3;
@@ -632,16 +657,16 @@ hypre_ParCSRBooleanMatrix * hypre_ParBooleanAAt( hypre_ParCSRBooleanMatrix  * A
    HYPRE_Int              jj_count_diag, jj_count_offd;
    HYPRE_Int              jj_row_begin_diag, jj_row_begin_offd;
    HYPRE_Int              start_indexing = 0; /* start indexing for C_data at 0 */
-   HYPRE_Int		    count;
-   HYPRE_BigInt		    n_rows_A, n_cols_A;
+   HYPRE_Int          count;
+   HYPRE_BigInt          n_rows_A, n_cols_A;
 
    n_rows_A = hypre_ParCSRBooleanMatrix_Get_GlobalNRows(A);
    n_cols_A = hypre_ParCSRBooleanMatrix_Get_GlobalNCols(A);
 
    if (n_cols_A != n_rows_A)
    {
-	hypre_error_w_msg(HYPRE_ERROR_GENERIC," Error! Incompatible matrix dimensions!\n");
-	return NULL;
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, " Error! Incompatible matrix dimensions!\n");
+      return NULL;
    }
    /*-----------------------------------------------------------------------
     *  Extract A_ext, i.e. portion of A that is stored on neighbor procs
@@ -650,31 +675,31 @@ hypre_ParCSRBooleanMatrix * hypre_ParBooleanAAt( hypre_ParCSRBooleanMatrix  * A
 
    if ((HYPRE_BigInt)num_rows_diag_A != n_rows_A)
    {
-       /*---------------------------------------------------------------------
-    	* If there exists no CommPkg for A, a CommPkg is generated using
-    	* equally load balanced partitionings
-    	*--------------------------------------------------------------------*/
-   	if (!hypre_ParCSRBooleanMatrix_Get_CommPkg(A))
-   	{
-        	hypre_BooleanMatTCommPkgCreate(A);
-   	}
-
-   	A_ext = hypre_ParCSRBooleanMatrixExtractAExt( A, &A_ext_row_map );
-   	A_ext_i    = hypre_CSRBooleanMatrix_Get_I(A_ext);
-   	A_ext_j    = hypre_CSRBooleanMatrix_Get_BigJ(A_ext);
-        num_rows_A_ext = hypre_CSRBooleanMatrix_Get_NRows(A_ext);
+      /*---------------------------------------------------------------------
+      * If there exists no CommPkg for A, a CommPkg is generated using
+      * equally load balanced partitionings
+      *--------------------------------------------------------------------*/
+      if (!hypre_ParCSRBooleanMatrix_Get_CommPkg(A))
+      {
+         hypre_BooleanMatTCommPkgCreate(A);
+      }
+
+      A_ext = hypre_ParCSRBooleanMatrixExtractAExt( A, &A_ext_row_map );
+      A_ext_i    = hypre_CSRBooleanMatrix_Get_I(A_ext);
+      A_ext_j    = hypre_CSRBooleanMatrix_Get_BigJ(A_ext);
+      num_rows_A_ext = hypre_CSRBooleanMatrix_Get_NRows(A_ext);
    }
    /*-----------------------------------------------------------------------
    *  Allocate marker array.
     *-----------------------------------------------------------------------*/
 
-   B_marker = hypre_CTAlloc(HYPRE_Int,  num_rows_diag_A+num_rows_A_ext , HYPRE_MEMORY_HOST);
+   B_marker = hypre_CTAlloc(HYPRE_Int,  num_rows_diag_A + num_rows_A_ext, HYPRE_MEMORY_HOST);
 
    /*-----------------------------------------------------------------------
     *  Initialize some stuff.
     *-----------------------------------------------------------------------*/
 
-   for ( i1=0; i1<num_rows_diag_A+num_rows_A_ext; ++i1 )
+   for ( i1 = 0; i1 < num_rows_diag_A + num_rows_A_ext; ++i1 )
    {
       B_marker[i1] = -1;
    }
@@ -689,16 +714,16 @@ hypre_ParCSRBooleanMatrix * hypre_ParBooleanAAt( hypre_ParCSRBooleanMatrix  * A
       num_rows_diag_A, num_cols_offd_A,
       num_rows_A_ext,
       first_col_diag_A, first_row_index_A
-      );
+   );
 
 #if 0
-/* debugging output: */
-   hypre_printf("A_ext_row_map (%i):",num_rows_A_ext);
-   for ( i1=0; i1<num_rows_A_ext; ++i1 ) hypre_printf(" %i",A_ext_row_map[i1] );
-   hypre_printf("\nC_diag_i (%i):",C_diag_size);
-   for ( i1=0; i1<=num_rows_diag_A; ++i1 ) hypre_printf(" %i",C_diag_i[i1] );
-   hypre_printf("\nC_offd_i (%i):",C_offd_size);
-   for ( i1=0; i1<=num_rows_diag_A; ++i1 ) hypre_printf(" %i",C_offd_i[i1] );
+   /* debugging output: */
+   hypre_printf("A_ext_row_map (%i):", num_rows_A_ext);
+   for ( i1 = 0; i1 < num_rows_A_ext; ++i1 ) { hypre_printf(" %i", A_ext_row_map[i1] ); }
+   hypre_printf("\nC_diag_i (%i):", C_diag_size);
+   for ( i1 = 0; i1 <= num_rows_diag_A; ++i1 ) { hypre_printf(" %i", C_diag_i[i1] ); }
+   hypre_printf("\nC_offd_i (%i):", C_offd_size);
+   for ( i1 = 0; i1 <= num_rows_diag_A; ++i1 ) { hypre_printf(" %i", C_offd_i[i1] ); }
    hypre_printf("\n");
 #endif
 
@@ -711,7 +736,7 @@ hypre_ParCSRBooleanMatrix * hypre_ParBooleanAAt( hypre_ParCSRBooleanMatrix  * A
    C_diag_j    = hypre_CTAlloc(HYPRE_Int,  C_diag_size, HYPRE_MEMORY_HOST);
    if (C_offd_size)
    {
-   	C_offd_j    = hypre_CTAlloc(HYPRE_Int,  C_offd_size, HYPRE_MEMORY_HOST);
+      C_offd_j    = hypre_CTAlloc(HYPRE_Int,  C_offd_size, HYPRE_MEMORY_HOST);
    }
 
 
@@ -726,7 +751,7 @@ hypre_ParCSRBooleanMatrix * hypre_ParBooleanAAt( hypre_ParCSRBooleanMatrix  * A
 
    jj_count_diag = start_indexing;
    jj_count_offd = start_indexing;
-   for ( i1=0; i1<num_rows_diag_A+num_rows_A_ext; ++i1 )
+   for ( i1 = 0; i1 < num_rows_diag_A + num_rows_A_ext; ++i1 )
    {
       B_marker[i1] = -1;
    }
@@ -759,7 +784,7 @@ hypre_ParCSRBooleanMatrix * hypre_ParBooleanAAt( hypre_ParCSRBooleanMatrix  * A
          diag*ext, offd*ext, diag*diag, and offd*offd.
       */
 
-      for (jj2 = A_diag_i[i1]; jj2 < A_diag_i[i1+1]; jj2++)
+      for (jj2 = A_diag_i[i1]; jj2 < A_diag_i[i1 + 1]; jj2++)
       {
          i2 = A_diag_j[jj2];
 
@@ -774,9 +799,12 @@ hypre_ParCSRBooleanMatrix * hypre_ParBooleanAAt( hypre_ParCSRBooleanMatrix  * A
           *  blocks of C.
           *-----------------------------------------------------------*/
 
-         for ( i3=0; i3<num_rows_A_ext; i3++ ) {
-            for ( jj3=A_ext_i[i3]; jj3<A_ext_i[i3+1]; jj3++ ) {
-               if ( A_ext_j[jj3]==(HYPRE_BigInt)i2+first_col_diag_A ) {
+         for ( i3 = 0; i3 < num_rows_A_ext; i3++ )
+         {
+            for ( jj3 = A_ext_i[i3]; jj3 < A_ext_i[i3 + 1]; jj3++ )
+            {
+               if ( A_ext_j[jj3] == (HYPRE_BigInt)i2 + first_col_diag_A )
+               {
                   /* row i3, column i2 of A_ext; or,
                      row i2, column i3 of (A_ext)^T */
 
@@ -786,17 +814,21 @@ hypre_ParCSRBooleanMatrix * hypre_ParBooleanAAt( hypre_ParCSRBooleanMatrix  * A
                    *--------------------------------------------------------*/
 
                   if ( A_ext_row_map[i3] < first_row_index_A ||
-                       A_ext_row_map[i3] > last_col_diag_C ) { /* offd */
-                     if (B_marker[i3+num_rows_diag_A] < jj_row_begin_offd) {
-                        B_marker[i3+num_rows_diag_A] = jj_count_offd;
+                       A_ext_row_map[i3] > last_col_diag_C )   /* offd */
+                  {
+                     if (B_marker[i3 + num_rows_diag_A] < jj_row_begin_offd)
+                     {
+                        B_marker[i3 + num_rows_diag_A] = jj_count_offd;
                         C_offd_j[jj_count_offd] = i3;
                         jj_count_offd++;
                      }
                   }
-                  else {                                              /* diag */
-                     if (B_marker[i3+num_rows_diag_A] < jj_row_begin_diag) {
-                        B_marker[i3+num_rows_diag_A] = jj_count_diag;
-                        C_diag_j[jj_count_diag] = i3-(HYPRE_Int)first_col_diag_A;
+                  else                                                /* diag */
+                  {
+                     if (B_marker[i3 + num_rows_diag_A] < jj_row_begin_diag)
+                     {
+                        B_marker[i3 + num_rows_diag_A] = jj_count_diag;
+                        C_diag_j[jj_count_diag] = i3 - (HYPRE_Int)first_col_diag_A;
                         jj_count_diag++;
                      }
                   }
@@ -807,7 +839,7 @@ hypre_ParCSRBooleanMatrix * hypre_ParBooleanAAt( hypre_ParCSRBooleanMatrix  * A
 
       if (num_cols_offd_A)
       {
-         for (jj2 = A_offd_i[i1]; jj2 < A_offd_i[i1+1]; jj2++)
+         for (jj2 = A_offd_i[i1]; jj2 < A_offd_i[i1 + 1]; jj2++)
          {
             i2 = A_offd_j[jj2];
 
@@ -822,9 +854,12 @@ hypre_ParCSRBooleanMatrix * hypre_ParBooleanAAt( hypre_ParCSRBooleanMatrix  * A
              *  blocks of C.
              *-----------------------------------------------------------*/
 
-            for ( i3=0; i3<num_rows_A_ext; i3++ ) {
-               for ( jj3=A_ext_i[i3]; jj3<A_ext_i[i3+1]; jj3++ ) {
-                  if ( A_ext_j[jj3]==A_col_map_offd[i2] ) {
+            for ( i3 = 0; i3 < num_rows_A_ext; i3++ )
+            {
+               for ( jj3 = A_ext_i[i3]; jj3 < A_ext_i[i3 + 1]; jj3++ )
+               {
+                  if ( A_ext_j[jj3] == A_col_map_offd[i2] )
+                  {
                      /* row i3, column i2 of A_ext; or,
                         row i2, column i3 of (A_ext)^T */
 
@@ -835,17 +870,21 @@ hypre_ParCSRBooleanMatrix * hypre_ParBooleanAAt( hypre_ParCSRBooleanMatrix  * A
                       *--------------------------------------------------------*/
 
                      if ( A_ext_row_map[i3] < first_row_index_A ||
-                          A_ext_row_map[i3] > last_col_diag_C ) { /* offd */
-                        if (B_marker[i3+num_rows_diag_A] < jj_row_begin_offd) {
-                           B_marker[i3+num_rows_diag_A] = jj_count_offd;
+                          A_ext_row_map[i3] > last_col_diag_C )   /* offd */
+                     {
+                        if (B_marker[i3 + num_rows_diag_A] < jj_row_begin_offd)
+                        {
+                           B_marker[i3 + num_rows_diag_A] = jj_count_offd;
                            C_offd_j[jj_count_offd] = i3;
                            jj_count_offd++;
                         }
                      }
-                     else {                                              /* diag */
-                        if (B_marker[i3+num_rows_diag_A] < jj_row_begin_diag) {
-                           B_marker[i3+num_rows_diag_A] = jj_count_diag;
-                           C_diag_j[jj_count_diag] = i3-(HYPRE_Int)first_row_index_A;
+                     else                                                /* diag */
+                     {
+                        if (B_marker[i3 + num_rows_diag_A] < jj_row_begin_diag)
+                        {
+                           B_marker[i3 + num_rows_diag_A] = jj_count_diag;
+                           C_diag_j[jj_count_diag] = i3 - (HYPRE_Int)first_row_index_A;
                            jj_count_diag++;
                         }
                      }
@@ -864,7 +903,7 @@ hypre_ParCSRBooleanMatrix * hypre_ParBooleanAAt( hypre_ParCSRBooleanMatrix  * A
        *  on this processor.
        *-----------------------------------------------------------------*/
 
-      for (jj2 = A_diag_i[i1]; jj2 < A_diag_i[i1+1]; jj2++)
+      for (jj2 = A_diag_i[i1]; jj2 < A_diag_i[i1 + 1]; jj2++)
       {
          i2 = A_diag_j[jj2];
 
@@ -878,9 +917,12 @@ hypre_ParCSRBooleanMatrix * hypre_ParBooleanAAt( hypre_ParCSRBooleanMatrix  * A
           *  For each entry (i2,i3) of A^T, A(i1,i2)*A(i3,i2) defines
           *  to C(i1,i3)
           *-----------------------------------------------------------*/
-         for ( i3=0; i3<num_rows_diag_A; i3++ ) {
-            for ( jj3=A_diag_i[i3]; jj3<A_diag_i[i3+1]; jj3++ ) {
-               if ( A_diag_j[jj3]==i2 ) {
+         for ( i3 = 0; i3 < num_rows_diag_A; i3++ )
+         {
+            for ( jj3 = A_diag_i[i3]; jj3 < A_diag_i[i3 + 1]; jj3++ )
+            {
+               if ( A_diag_j[jj3] == i2 )
+               {
                   /* row i3, column i2 of A; or,
                      row i2, column i3 of A^T */
 
@@ -901,27 +943,31 @@ hypre_ParCSRBooleanMatrix * hypre_ParBooleanAAt( hypre_ParCSRBooleanMatrix  * A
       } /* end of third i2 loop */
 
 
-         /* offd * offd */
-         /*-----------------------------------------------------------
-          *  Loop over offd columns i2 of A in A*A^T.  Then
-          *  loop over offd entries (columns) i3 in row i2 of A^T
-          *  That is, rows i3 having a column i2 of A (local part).
-          *  For now, for each row i3 of A we crudely check _all_
-          *  columns to see whether one matches i2.
-          *  This i3-loop is for the off-diagonal block of A.
-          *  It contributes to the diag block of C.
-          *  For each entry (i2,i3) of A^T, A*A^T defines C
-          *-----------------------------------------------------------*/
-      if (num_cols_offd_A) {
+      /* offd * offd */
+      /*-----------------------------------------------------------
+       *  Loop over offd columns i2 of A in A*A^T.  Then
+       *  loop over offd entries (columns) i3 in row i2 of A^T
+       *  That is, rows i3 having a column i2 of A (local part).
+       *  For now, for each row i3 of A we crudely check _all_
+       *  columns to see whether one matches i2.
+       *  This i3-loop is for the off-diagonal block of A.
+       *  It contributes to the diag block of C.
+       *  For each entry (i2,i3) of A^T, A*A^T defines C
+       *-----------------------------------------------------------*/
+      if (num_cols_offd_A)
+      {
 
-         for (jj2 = A_offd_i[i1]; jj2 < A_offd_i[i1+1]; jj2++)
+         for (jj2 = A_offd_i[i1]; jj2 < A_offd_i[i1 + 1]; jj2++)
          {
             i2 = A_offd_j[jj2];
 
-            for ( i3=0; i3<num_rows_diag_A; i3++ ) {
+            for ( i3 = 0; i3 < num_rows_diag_A; i3++ )
+            {
                /* ... note that num_rows_diag_A == num_rows_offd_A */
-               for ( jj3=A_offd_i[i3]; jj3<A_offd_i[i3+1]; jj3++ ) {
-                     if ( A_offd_j[jj3]==i2 ) {
+               for ( jj3 = A_offd_i[i3]; jj3 < A_offd_i[i3 + 1]; jj3++ )
+               {
+                  if ( A_offd_j[jj3] == i2 )
+                  {
                      /* row i3, column i2 of A; or,
                         row i2, column i3 of A^T */
 
@@ -944,17 +990,19 @@ hypre_ParCSRBooleanMatrix * hypre_ParBooleanAAt( hypre_ParCSRBooleanMatrix  * A
 
       }        /* end of fourth and last i2 loop */
 #if 0          /* debugging printout */
-         hypre_printf("end of i1 loop: i1=%i jj_count_diag=%i\n", i1, jj_count_diag );
-         hypre_printf("  C_diag_j=");
-         for ( jj3=0; jj3<jj_count_diag; ++jj3) hypre_printf("%i ",C_diag_j[jj3]);
-         hypre_printf("\n");
-         hypre_printf("  C_offd_j=");
-         for ( jj3=0; jj3<jj_count_offd; ++jj3) hypre_printf("%i ",C_offd_j[jj3]);
-         hypre_printf("\n");
-         hypre_printf( "  B_marker =" );
-         for ( it=0; it<num_rows_diag_A+num_rows_A_ext; ++it )
-            hypre_printf(" %i", B_marker[it] );
-         hypre_printf( "\n" );
+      hypre_printf("end of i1 loop: i1=%i jj_count_diag=%i\n", i1, jj_count_diag );
+      hypre_printf("  C_diag_j=");
+      for ( jj3 = 0; jj3 < jj_count_diag; ++jj3) { hypre_printf("%i ", C_diag_j[jj3]); }
+      hypre_printf("\n");
+      hypre_printf("  C_offd_j=");
+      for ( jj3 = 0; jj3 < jj_count_offd; ++jj3) { hypre_printf("%i ", C_offd_j[jj3]); }
+      hypre_printf("\n");
+      hypre_printf( "  B_marker =" );
+      for ( it = 0; it < num_rows_diag_A + num_rows_A_ext; ++it )
+      {
+         hypre_printf(" %i", B_marker[it] );
+      }
+      hypre_printf( "\n" );
 #endif
    }           /* end of i1 loop */
 
@@ -964,28 +1012,36 @@ hypre_ParCSRBooleanMatrix * hypre_ParBooleanAAt( hypre_ParCSRBooleanMatrix  * A
     *  block) col_map_offd_C[i3]==A_ext_row_map[i3].
     *-----------------------------------------------------------------------*/
 
-   for ( i=0; i<num_rows_diag_A+num_rows_A_ext; ++i )
+   for ( i = 0; i < num_rows_diag_A + num_rows_A_ext; ++i )
+   {
       B_marker[i] = -1;
-   for ( i=0; i<C_offd_size; i++ )
+   }
+   for ( i = 0; i < C_offd_size; i++ )
+   {
       B_marker[ C_offd_j[i] ] = -2;
+   }
 
    count = 0;
-   for (i=0; i < num_rows_diag_A + num_rows_A_ext; i++) {
-      if (B_marker[i] == -2) {
+   for (i = 0; i < num_rows_diag_A + num_rows_A_ext; i++)
+   {
+      if (B_marker[i] == -2)
+      {
          B_marker[i] = count;
          count++;
       }
    }
    num_cols_offd_C = count;
 
-   if (num_cols_offd_C) {
+   if (num_cols_offd_C)
+   {
       col_map_offd_C = hypre_CTAlloc(HYPRE_BigInt, num_cols_offd_C, HYPRE_MEMORY_HOST);
       new_C_offd_j = hypre_CTAlloc(HYPRE_Int, C_offd_size, HYPRE_MEMORY_HOST);
       /* ... a bit big, but num_cols_offd_C is too small.  It might be worth
          computing the correct size, which is sum( no. columns in row i, over all rows i )
       */
 
-      for (i=0; i < C_offd_size; i++) {
+      for (i = 0; i < C_offd_size; i++)
+      {
          new_C_offd_j[i] = B_marker[C_offd_j[i]];
          col_map_offd_C[ new_C_offd_j[i] ] = A_ext_row_map[ C_offd_j[i] ];
       }
@@ -1000,11 +1056,11 @@ hypre_ParCSRBooleanMatrix * hypre_ParBooleanAAt( hypre_ParCSRBooleanMatrix  * A
     *----------------------------------------------------------------*/
 
    C = hypre_ParCSRBooleanMatrixCreate(comm, n_rows_A, n_rows_A, row_starts_A,
-	row_starts_A, num_cols_offd_C, C_diag_size, C_offd_size);
+                                       row_starts_A, num_cols_offd_C, C_diag_size, C_offd_size);
 
-/* Note that C does not own the partitionings */
-   hypre_ParCSRBooleanMatrixSetRowStartsOwner(C,0);
-   hypre_ParCSRBooleanMatrixSetColStartsOwner(C,0);
+   /* Note that C does not own the partitionings */
+   hypre_ParCSRBooleanMatrixSetRowStartsOwner(C, 0);
+   hypre_ParCSRBooleanMatrixSetColStartsOwner(C, 0);
 
    C_diag = hypre_ParCSRBooleanMatrix_Get_Diag(C);
    hypre_CSRBooleanMatrix_Get_I(C_diag) = C_diag_i;
@@ -1020,7 +1076,9 @@ hypre_ParCSRBooleanMatrix * hypre_ParBooleanAAt( hypre_ParCSRBooleanMatrix  * A
 
    }
    else
- hypre_TFree(C_offd_i, HYPRE_MEMORY_HOST);
+   {
+      hypre_TFree(C_offd_i, HYPRE_MEMORY_HOST);
+   }
 
    /*-----------------------------------------------------------------------
     *  Free B_ext and marker array.
@@ -1033,7 +1091,9 @@ hypre_ParCSRBooleanMatrix * hypre_ParBooleanAAt( hypre_ParCSRBooleanMatrix  * A
    }
    hypre_TFree(B_marker, HYPRE_MEMORY_HOST);
    if ( num_rows_diag_A != n_rows_A )
+   {
       hypre_TFree(A_ext_row_map, HYPRE_MEMORY_HOST);
+   }
 
    return C;
 
@@ -1051,29 +1111,27 @@ hypre_ParCSRBooleanMatrix * hypre_ParBooleanAAt( hypre_ParCSRBooleanMatrix  * A
 HYPRE_Int
 hypre_BooleanMatTCommPkgCreate ( hypre_ParCSRBooleanMatrix *A)
 {
-   hypre_ParCSRCommPkg	*comm_pkg;
-
-   MPI_Comm             comm = hypre_ParCSRBooleanMatrix_Get_Comm(A);
-/*   hypre_MPI_Datatype         *recv_mpi_types;
-   hypre_MPI_Datatype         *send_mpi_types;
-*/
-   HYPRE_Int			num_sends;
-   HYPRE_Int			*send_procs;
-   HYPRE_Int			*send_map_starts;
-   HYPRE_Int			*send_map_elmts;
-   HYPRE_Int			num_recvs;
-   HYPRE_Int			*recv_procs;
-   HYPRE_Int			*recv_vec_starts;
-
+   MPI_Comm       comm = hypre_ParCSRBooleanMatrix_Get_Comm(A);
    HYPRE_BigInt  *col_map_offd = hypre_ParCSRBooleanMatrix_Get_ColMapOffd(A);
-   HYPRE_BigInt  first_col_diag = hypre_ParCSRBooleanMatrix_Get_FirstColDiag(A);
+   HYPRE_BigInt   first_col_diag = hypre_ParCSRBooleanMatrix_Get_FirstColDiag(A);
    HYPRE_BigInt  *col_starts = hypre_ParCSRBooleanMatrix_Get_ColStarts(A);
-
-   HYPRE_Int	ierr = 0;
-   HYPRE_Int	num_rows_diag = hypre_CSRBooleanMatrix_Get_NRows(hypre_ParCSRBooleanMatrix_Get_Diag(A));
-   HYPRE_Int	num_cols_diag = hypre_CSRBooleanMatrix_Get_NCols(hypre_ParCSRBooleanMatrix_Get_Diag(A));
-   HYPRE_Int	num_cols_offd = hypre_CSRBooleanMatrix_Get_NCols(hypre_ParCSRBooleanMatrix_Get_Offd(A));
-   HYPRE_BigInt * row_starts = hypre_ParCSRBooleanMatrix_Get_RowStarts(A);
+   HYPRE_Int      num_rows_diag = hypre_CSRBooleanMatrix_Get_NRows(hypre_ParCSRBooleanMatrix_Get_Diag(
+                                                                      A));
+   HYPRE_Int      num_cols_diag = hypre_CSRBooleanMatrix_Get_NCols(hypre_ParCSRBooleanMatrix_Get_Diag(
+                                                                      A));
+   HYPRE_Int      num_cols_offd = hypre_CSRBooleanMatrix_Get_NCols(hypre_ParCSRBooleanMatrix_Get_Offd(
+                                                                      A));
+   HYPRE_BigInt  *row_starts = hypre_ParCSRBooleanMatrix_Get_RowStarts(A);
+
+   HYPRE_Int      num_sends;
+   HYPRE_Int     *send_procs;
+   HYPRE_Int     *send_map_starts;
+   HYPRE_Int     *send_map_elmts;
+   HYPRE_Int      num_recvs;
+   HYPRE_Int     *recv_procs;
+   HYPRE_Int     *recv_vec_starts;
+
+   hypre_ParCSRCommPkg  *comm_pkg = NULL;
 
    hypre_MatTCommPkgCreate_core (
       comm, col_map_offd, first_col_diag, col_starts,
@@ -1088,26 +1146,20 @@ hypre_BooleanMatTCommPkgCreate ( hypre_ParCSRBooleanMatrix *A)
       &num_recvs, &recv_procs, &recv_vec_starts,
       &num_sends, &send_procs, &send_map_starts,
       &send_map_elmts
-      );
-
-   comm_pkg = hypre_CTAlloc(hypre_ParCSRCommPkg,  1, HYPRE_MEMORY_HOST);
-
-   hypre_ParCSRCommPkgComm(comm_pkg) = comm;
+   );
 
-   hypre_ParCSRCommPkgNumRecvs(comm_pkg) = num_recvs;
-   hypre_ParCSRCommPkgRecvProcs(comm_pkg) = recv_procs;
-   hypre_ParCSRCommPkgRecvVecStarts(comm_pkg) = recv_vec_starts;
-   hypre_ParCSRCommPkgNumSends(comm_pkg) = num_sends;
-   hypre_ParCSRCommPkgSendProcs(comm_pkg) = send_procs;
-   hypre_ParCSRCommPkgSendMapStarts(comm_pkg) = send_map_starts;
-   hypre_ParCSRCommPkgSendMapElmts(comm_pkg) = send_map_elmts;
+   /* Create communication package */
+   hypre_ParCSRCommPkgCreateAndFill(comm,
+                                    num_recvs, recv_procs, recv_vec_starts,
+                                    num_sends, send_procs, send_map_starts,
+                                    send_map_elmts,
+                                    &comm_pkg);
 
    hypre_ParCSRBooleanMatrix_Get_CommPkgT(A) = comm_pkg;
 
-   return ierr;
+   return hypre_error_flag;
 }
 
-
 /* ----------------------------------------------------------------------
  * hypre_BooleanMatvecCommPkgCreate
  * generates the comm_pkg for a Boolean matrix A , to be used for A*B.
@@ -1118,27 +1170,24 @@ hypre_BooleanMatTCommPkgCreate ( hypre_ParCSRBooleanMatrix *A)
 HYPRE_Int
 hypre_BooleanMatvecCommPkgCreate ( hypre_ParCSRBooleanMatrix *A)
 {
-   hypre_ParCSRCommPkg	*comm_pkg;
-
-   MPI_Comm             comm = hypre_ParCSRBooleanMatrix_Get_Comm(A);
-/*   hypre_MPI_Datatype         *recv_mpi_types;
-   hypre_MPI_Datatype         *send_mpi_types;
-*/
-   HYPRE_Int			num_sends;
-   HYPRE_Int			*send_procs;
-   HYPRE_Int			*send_map_starts;
-   HYPRE_Int			*send_map_elmts;
-   HYPRE_Int			num_recvs;
-   HYPRE_Int			*recv_procs;
-   HYPRE_Int			*recv_vec_starts;
-
-   HYPRE_BigInt  *col_map_offd = hypre_ParCSRBooleanMatrix_Get_ColMapOffd(A);
-   HYPRE_BigInt  first_col_diag = hypre_ParCSRBooleanMatrix_Get_FirstColDiag(A);
-   HYPRE_BigInt  *col_starts = hypre_ParCSRBooleanMatrix_Get_ColStarts(A);
-
-   HYPRE_Int	ierr = 0;
-   HYPRE_Int	num_cols_diag = hypre_CSRBooleanMatrix_Get_NCols(hypre_ParCSRBooleanMatrix_Get_Diag(A));
-   HYPRE_Int	num_cols_offd = hypre_CSRBooleanMatrix_Get_NCols(hypre_ParCSRBooleanMatrix_Get_Offd(A));
+   MPI_Comm        comm = hypre_ParCSRBooleanMatrix_Get_Comm(A);
+   HYPRE_BigInt   *col_map_offd = hypre_ParCSRBooleanMatrix_Get_ColMapOffd(A);
+   HYPRE_BigInt    first_col_diag = hypre_ParCSRBooleanMatrix_Get_FirstColDiag(A);
+   HYPRE_BigInt   *col_starts = hypre_ParCSRBooleanMatrix_Get_ColStarts(A);
+   HYPRE_Int       num_cols_diag = hypre_CSRBooleanMatrix_Get_NCols(hypre_ParCSRBooleanMatrix_Get_Diag(
+                                                                       A));
+   HYPRE_Int       num_cols_offd = hypre_CSRBooleanMatrix_Get_NCols(hypre_ParCSRBooleanMatrix_Get_Offd(
+                                                                       A));
+
+   HYPRE_Int       num_sends;
+   HYPRE_Int      *send_procs;
+   HYPRE_Int      *send_map_starts;
+   HYPRE_Int      *send_map_elmts;
+   HYPRE_Int       num_recvs;
+   HYPRE_Int      *recv_procs;
+   HYPRE_Int      *recv_vec_starts;
+
+   hypre_ParCSRCommPkg  *comm_pkg = NULL;
 
    hypre_ParCSRCommPkgCreate_core
    (
@@ -1149,22 +1198,14 @@ hypre_BooleanMatvecCommPkgCreate ( hypre_ParCSRBooleanMatrix *A)
       &send_map_elmts
    );
 
-   comm_pkg = hypre_CTAlloc(hypre_ParCSRCommPkg,  1, HYPRE_MEMORY_HOST);
-
-   hypre_ParCSRCommPkgComm(comm_pkg) = comm;
-
-   hypre_ParCSRCommPkgNumRecvs(comm_pkg) = num_recvs;
-   hypre_ParCSRCommPkgRecvProcs(comm_pkg) = recv_procs;
-   hypre_ParCSRCommPkgRecvVecStarts(comm_pkg) = recv_vec_starts;
-   /* hypre_ParCSRCommPkgRecvMPITypes(comm_pkg) = recv_mpi_types; */
-
-   hypre_ParCSRCommPkgNumSends(comm_pkg) = num_sends;
-   hypre_ParCSRCommPkgSendProcs(comm_pkg) = send_procs;
-   hypre_ParCSRCommPkgSendMapStarts(comm_pkg) = send_map_starts;
-   hypre_ParCSRCommPkgSendMapElmts(comm_pkg) = send_map_elmts;
-   /* hypre_ParCSRCommPkgSendMPITypes(comm_pkg) = send_mpi_types; */
+   /* Create communication package */
+   hypre_ParCSRCommPkgCreateAndFill(comm,
+                                    num_recvs, recv_procs, recv_vec_starts,
+                                    num_sends, send_procs, send_map_starts,
+                                    send_map_elmts,
+                                    &comm_pkg);
 
    hypre_ParCSRBooleanMatrix_Get_CommPkg(A) = comm_pkg;
 
-   return ierr;
+   return hypre_error_flag;
 }
diff --git a/external/hypre/src/parcsr_mv/par_csr_bool_matrix.c b/external/hypre/src/parcsr_mv/par_csr_bool_matrix.c
index 3149177d..45657bb6 100644
--- a/external/hypre/src/parcsr_mv/par_csr_bool_matrix.c
+++ b/external/hypre/src/parcsr_mv/par_csr_bool_matrix.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -17,8 +17,8 @@
  * hypre_CSRBooleanMatrixCreate
  *--------------------------------------------------------------------------*/
 
-hypre_CSRBooleanMatrix *hypre_CSRBooleanMatrixCreate(HYPRE_Int num_rows,HYPRE_Int num_cols,
-                                                 HYPRE_Int num_nonzeros )
+hypre_CSRBooleanMatrix *hypre_CSRBooleanMatrixCreate(HYPRE_Int num_rows, HYPRE_Int num_cols,
+                                                     HYPRE_Int num_nonzeros )
 {
    hypre_CSRBooleanMatrix *matrix;
 
@@ -64,9 +64,13 @@ HYPRE_Int hypre_CSRBooleanMatrixInitialize( hypre_CSRBooleanMatrix *matrix )
    HYPRE_Int  num_nonzeros = hypre_CSRBooleanMatrix_Get_NNZ(matrix);
 
    if ( ! hypre_CSRBooleanMatrix_Get_I(matrix) )
+   {
       hypre_CSRBooleanMatrix_Get_I(matrix) = hypre_CTAlloc(HYPRE_Int,  num_rows + 1, HYPRE_MEMORY_HOST);
+   }
    if ( ! hypre_CSRBooleanMatrix_Get_J(matrix) )
+   {
       hypre_CSRBooleanMatrix_Get_J(matrix) = hypre_CTAlloc(HYPRE_Int,  num_nonzeros, HYPRE_MEMORY_HOST);
+   }
 
    return 0;
 }
@@ -81,9 +85,14 @@ HYPRE_Int hypre_CSRBooleanMatrixBigInitialize( hypre_CSRBooleanMatrix *matrix )
    HYPRE_Int  num_nonzeros = hypre_CSRBooleanMatrix_Get_NNZ(matrix);
 
    if ( ! hypre_CSRBooleanMatrix_Get_I(matrix) )
+   {
       hypre_CSRBooleanMatrix_Get_I(matrix) = hypre_CTAlloc(HYPRE_Int,  num_rows + 1, HYPRE_MEMORY_HOST);
+   }
    if ( ! hypre_CSRBooleanMatrix_Get_BigJ(matrix) )
-      hypre_CSRBooleanMatrix_Get_BigJ(matrix) = hypre_CTAlloc(HYPRE_BigInt,  num_nonzeros, HYPRE_MEMORY_HOST);
+   {
+      hypre_CSRBooleanMatrix_Get_BigJ(matrix) = hypre_CTAlloc(HYPRE_BigInt,  num_nonzeros,
+                                                              HYPRE_MEMORY_HOST);
+   }
 
    return 0;
 }
@@ -93,7 +102,7 @@ HYPRE_Int hypre_CSRBooleanMatrixBigInitialize( hypre_CSRBooleanMatrix *matrix )
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int hypre_CSRBooleanMatrixSetDataOwner( hypre_CSRBooleanMatrix *matrix,
-                                      HYPRE_Int owns_data )
+                                              HYPRE_Int owns_data )
 {
    hypre_CSRBooleanMatrix_Get_OwnsData(matrix) = owns_data;
    return 0;
@@ -117,7 +126,7 @@ hypre_CSRBooleanMatrixRead( const char *file_name )
    HYPRE_Int      max_col = 0;
 
    HYPRE_Int      file_base = 1;
-   
+
    HYPRE_Int      j;
 
    /*----------------------------------------------------------
@@ -129,7 +138,7 @@ hypre_CSRBooleanMatrixRead( const char *file_name )
    hypre_fscanf(fp, "%d", &num_rows);
 
    matrix_i = hypre_CTAlloc(HYPRE_Int,  num_rows + 1, HYPRE_MEMORY_HOST);
-   for (j = 0; j < num_rows+1; j++)
+   for (j = 0; j < num_rows + 1; j++)
    {
       hypre_fscanf(fp, "%d", &matrix_i[j]);
       matrix_i[j] -= file_base;
@@ -174,9 +183,9 @@ hypre_CSRBooleanMatrixPrint( hypre_CSRBooleanMatrix *matrix,
    HYPRE_Int     *matrix_i;
    HYPRE_Int     *matrix_j;
    HYPRE_Int      num_rows;
-   
+
    HYPRE_Int      file_base = 1;
-   
+
    HYPRE_Int      j;
 
    HYPRE_Int      ierr = 0;
@@ -213,49 +222,49 @@ hypre_CSRBooleanMatrixPrint( hypre_CSRBooleanMatrix *matrix,
  *--------------------------------------------------------------------------*/
 
 hypre_ParCSRBooleanMatrix *hypre_ParCSRBooleanMatrixCreate( MPI_Comm comm,
-                               HYPRE_BigInt global_num_rows, HYPRE_BigInt global_num_cols,
-                               HYPRE_BigInt *row_starts, HYPRE_BigInt *col_starts,
-                               HYPRE_Int num_cols_offd, HYPRE_Int num_nonzeros_diag,
-                               HYPRE_Int num_nonzeros_offd)
+                                                            HYPRE_BigInt global_num_rows, HYPRE_BigInt global_num_cols,
+                                                            HYPRE_BigInt *row_starts, HYPRE_BigInt *col_starts,
+                                                            HYPRE_Int num_cols_offd, HYPRE_Int num_nonzeros_diag,
+                                                            HYPRE_Int num_nonzeros_offd)
 {
    hypre_ParCSRBooleanMatrix *matrix;
    HYPRE_Int                     num_procs, my_id;
    HYPRE_Int                     local_num_rows, local_num_cols;
    HYPRE_BigInt                  first_row_index, first_col_diag;
-   
+
    matrix = hypre_CTAlloc(hypre_ParCSRBooleanMatrix,  1, HYPRE_MEMORY_HOST);
 
-   hypre_MPI_Comm_rank(comm,&my_id);
-   hypre_MPI_Comm_size(comm,&num_procs);
+   hypre_MPI_Comm_rank(comm, &my_id);
+   hypre_MPI_Comm_size(comm, &num_procs);
 
    if (!row_starts)
    {
-      hypre_GeneratePartitioning(global_num_rows,num_procs,&row_starts);
+      hypre_GeneratePartitioning(global_num_rows, num_procs, &row_starts);
    }
 
    if (!col_starts)
    {
       if (global_num_rows == global_num_cols)
       {
-        col_starts = row_starts;
+         col_starts = row_starts;
       }
       else
       {
-        hypre_GeneratePartitioning(global_num_cols,num_procs,&col_starts);
+         hypre_GeneratePartitioning(global_num_cols, num_procs, &col_starts);
       }
    }
 
    first_row_index = row_starts[my_id];
-   local_num_rows = row_starts[my_id+1]-first_row_index;
+   local_num_rows = row_starts[my_id + 1] - first_row_index;
    first_col_diag = col_starts[my_id];
-   local_num_cols = col_starts[my_id+1]-first_col_diag;
+   local_num_cols = col_starts[my_id + 1] - first_col_diag;
    hypre_ParCSRBooleanMatrix_Get_Comm(matrix) = comm;
-   hypre_ParCSRBooleanMatrix_Get_Diag(matrix) = 
-          hypre_CSRBooleanMatrixCreate(local_num_rows, local_num_cols,
-                                     num_nonzeros_diag);
-   hypre_ParCSRBooleanMatrix_Get_Offd(matrix) = 
-          hypre_CSRBooleanMatrixCreate(local_num_rows, num_cols_offd,
-                                     num_nonzeros_offd);
+   hypre_ParCSRBooleanMatrix_Get_Diag(matrix) =
+      hypre_CSRBooleanMatrixCreate(local_num_rows, local_num_cols,
+                                   num_nonzeros_diag);
+   hypre_ParCSRBooleanMatrix_Get_Offd(matrix) =
+      hypre_CSRBooleanMatrixCreate(local_num_rows, num_cols_offd,
+                                   num_nonzeros_offd);
    hypre_ParCSRBooleanMatrix_Get_GlobalNRows(matrix) = global_num_rows;
    hypre_ParCSRBooleanMatrix_Get_GlobalNCols(matrix) = global_num_cols;
    hypre_ParCSRBooleanMatrix_Get_StartRow(matrix) = first_row_index;
@@ -269,7 +278,9 @@ hypre_ParCSRBooleanMatrix *hypre_ParCSRBooleanMatrixCreate( MPI_Comm comm,
    hypre_ParCSRBooleanMatrix_Get_OwnsRowStarts(matrix) = 1;
    hypre_ParCSRBooleanMatrix_Get_OwnsColStarts(matrix) = 1;
    if (row_starts == col_starts)
+   {
       hypre_ParCSRBooleanMatrix_Get_OwnsColStarts(matrix) = 0;
+   }
 
    hypre_ParCSRBooleanMatrix_Get_Rowindices(matrix)   = NULL;
    hypre_ParCSRBooleanMatrix_Get_Getrowactive(matrix) = 0;
@@ -283,7 +294,7 @@ hypre_ParCSRBooleanMatrix *hypre_ParCSRBooleanMatrixCreate( MPI_Comm comm,
 
 HYPRE_Int hypre_ParCSRBooleanMatrixDestroy( hypre_ParCSRBooleanMatrix *matrix )
 {
-   HYPRE_Int  ierr=0;
+   HYPRE_Int  ierr = 0;
 
    if (matrix)
    {
@@ -292,14 +303,22 @@ HYPRE_Int hypre_ParCSRBooleanMatrixDestroy( hypre_ParCSRBooleanMatrix *matrix )
          hypre_CSRBooleanMatrixDestroy(hypre_ParCSRBooleanMatrix_Get_Diag(matrix));
          hypre_CSRBooleanMatrixDestroy(hypre_ParCSRBooleanMatrix_Get_Offd(matrix));
          if (hypre_ParCSRBooleanMatrix_Get_ColMapOffd(matrix))
+         {
             hypre_TFree(hypre_ParCSRBooleanMatrix_Get_ColMapOffd(matrix), HYPRE_MEMORY_HOST);
+         }
          if (hypre_ParCSRBooleanMatrix_Get_CommPkg(matrix))
+         {
             hypre_MatvecCommPkgDestroy(hypre_ParCSRBooleanMatrix_Get_CommPkg(matrix));
+         }
       }
       if ( hypre_ParCSRBooleanMatrix_Get_OwnsRowStarts(matrix) )
+      {
          hypre_TFree(hypre_ParCSRBooleanMatrix_Get_RowStarts(matrix), HYPRE_MEMORY_HOST);
+      }
       if ( hypre_ParCSRBooleanMatrix_Get_OwnsColStarts(matrix) )
+      {
          hypre_TFree(hypre_ParCSRBooleanMatrix_Get_ColStarts(matrix), HYPRE_MEMORY_HOST);
+      }
 
       hypre_TFree(hypre_ParCSRBooleanMatrix_Get_Rowindices(matrix), HYPRE_MEMORY_HOST);
 
@@ -315,13 +334,13 @@ HYPRE_Int hypre_ParCSRBooleanMatrixDestroy( hypre_ParCSRBooleanMatrix *matrix )
 
 HYPRE_Int hypre_ParCSRBooleanMatrixInitialize( hypre_ParCSRBooleanMatrix *matrix )
 {
-   HYPRE_Int  ierr=0;
+   HYPRE_Int  ierr = 0;
 
    hypre_CSRBooleanMatrixInitialize(hypre_ParCSRBooleanMatrix_Get_Diag(matrix));
    hypre_CSRBooleanMatrixInitialize(hypre_ParCSRBooleanMatrix_Get_Offd(matrix));
-   hypre_ParCSRBooleanMatrix_Get_ColMapOffd(matrix) = 
-                hypre_CTAlloc(HYPRE_BigInt, hypre_CSRBooleanMatrix_Get_NCols(
-                hypre_ParCSRBooleanMatrix_Get_Offd(matrix)), HYPRE_MEMORY_HOST);
+   hypre_ParCSRBooleanMatrix_Get_ColMapOffd(matrix) =
+      hypre_CTAlloc(HYPRE_BigInt, hypre_CSRBooleanMatrix_Get_NCols(
+                       hypre_ParCSRBooleanMatrix_Get_Offd(matrix)), HYPRE_MEMORY_HOST);
    return ierr;
 }
 
@@ -343,7 +362,7 @@ HYPRE_Int hypre_ParCSRBooleanMatrixSetNNZ( hypre_ParCSRBooleanMatrix *matrix)
 
    local_num_nonzeros = diag_i[local_num_rows] + offd_i[local_num_rows];
    hypre_MPI_Allreduce(&local_num_nonzeros, &total_num_nonzeros, 1, HYPRE_MPI_INT,
-        hypre_MPI_SUM, comm);
+                       hypre_MPI_SUM, comm);
    hypre_ParCSRBooleanMatrix_Get_NNZ(matrix) = total_num_nonzeros;
    return ierr;
 }
@@ -353,7 +372,7 @@ HYPRE_Int hypre_ParCSRBooleanMatrixSetNNZ( hypre_ParCSRBooleanMatrix *matrix)
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int hypre_ParCSRBooleanMatrixSetDataOwner(hypre_ParCSRBooleanMatrix *matrix,
-                                        HYPRE_Int owns_data )
+                                                HYPRE_Int owns_data )
 {
    hypre_ParCSRBooleanMatrix_Get_OwnsData(matrix) = owns_data;
    return 0;
@@ -364,7 +383,7 @@ HYPRE_Int hypre_ParCSRBooleanMatrixSetDataOwner(hypre_ParCSRBooleanMatrix *matri
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int hypre_ParCSRBooleanMatrixSetRowStartsOwner(hypre_ParCSRBooleanMatrix *matrix,
-                                             HYPRE_Int owns_row_starts )
+                                                     HYPRE_Int owns_row_starts )
 {
    hypre_ParCSRBooleanMatrix_Get_OwnsRowStarts(matrix) = owns_row_starts;
    return 0;
@@ -375,7 +394,7 @@ HYPRE_Int hypre_ParCSRBooleanMatrixSetRowStartsOwner(hypre_ParCSRBooleanMatrix *
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int hypre_ParCSRBooleanMatrixSetColStartsOwner(hypre_ParCSRBooleanMatrix *matrix,
-                                             HYPRE_Int owns_col_starts )
+                                                     HYPRE_Int owns_col_starts )
 {
    hypre_ParCSRBooleanMatrix_Get_OwnsColStarts(matrix) = owns_col_starts;
    return 0;
@@ -402,53 +421,59 @@ hypre_ParCSRBooleanMatrixRead( MPI_Comm comm, const char *file_name )
    FILE *fp;
    HYPRE_Int equal = 1;
 
-   hypre_MPI_Comm_rank(comm,&my_id);
-   hypre_MPI_Comm_size(comm,&num_procs);
-   row_starts = hypre_CTAlloc(HYPRE_BigInt,  num_procs+1, HYPRE_MEMORY_HOST);
-   col_starts = hypre_CTAlloc(HYPRE_BigInt,  num_procs+1, HYPRE_MEMORY_HOST);
-   hypre_sprintf(new_file_d,"%s.D.%d",file_name,my_id);
-   hypre_sprintf(new_file_o,"%s.O.%d",file_name,my_id);
-   hypre_sprintf(new_file_info,"%s.INFO.%d",file_name,my_id);
+   hypre_MPI_Comm_rank(comm, &my_id);
+   hypre_MPI_Comm_size(comm, &num_procs);
+   row_starts = hypre_CTAlloc(HYPRE_BigInt,  num_procs + 1, HYPRE_MEMORY_HOST);
+   col_starts = hypre_CTAlloc(HYPRE_BigInt,  num_procs + 1, HYPRE_MEMORY_HOST);
+   hypre_sprintf(new_file_d, "%s.D.%d", file_name, my_id);
+   hypre_sprintf(new_file_o, "%s.O.%d", file_name, my_id);
+   hypre_sprintf(new_file_info, "%s.INFO.%d", file_name, my_id);
    fp = fopen(new_file_info, "r");
    hypre_fscanf(fp, "%b", &global_num_rows);
    hypre_fscanf(fp, "%b", &global_num_cols);
    hypre_fscanf(fp, "%d", &num_cols_offd);
-   for (i=0; i < num_procs; i++)
-           hypre_fscanf(fp, "%b %b", &row_starts[i], &col_starts[i]);
+   for (i = 0; i < num_procs; i++)
+   {
+      hypre_fscanf(fp, "%b %b", &row_starts[i], &col_starts[i]);
+   }
    row_starts[num_procs] = global_num_rows;
    col_starts[num_procs] = global_num_cols;
    col_map_offd = hypre_CTAlloc(HYPRE_BigInt,  num_cols_offd, HYPRE_MEMORY_HOST);
-   for (i=0; i < num_cols_offd; i++)
-        hypre_fscanf(fp, "%b", &col_map_offd[i]);
-        
+   for (i = 0; i < num_cols_offd; i++)
+   {
+      hypre_fscanf(fp, "%b", &col_map_offd[i]);
+   }
+
    fclose(fp);
 
-   for (i=num_procs; i >= 0; i--)
-        if (row_starts[i] != col_starts[i])
-        {
-                equal = 0;
-                break;
-        }
+   for (i = num_procs; i >= 0; i--)
+      if (row_starts[i] != col_starts[i])
+      {
+         equal = 0;
+         break;
+      }
 
    if (equal)
    {
-        hypre_TFree(col_starts, HYPRE_MEMORY_HOST);
-        col_starts = row_starts;
+      hypre_TFree(col_starts, HYPRE_MEMORY_HOST);
+      col_starts = row_starts;
    }
-   
+
    diag = hypre_CSRBooleanMatrixRead(new_file_d);
    local_num_rows = hypre_CSRBooleanMatrix_Get_NRows(diag);
 
    if (num_cols_offd)
    {
-        offd = hypre_CSRBooleanMatrixRead(new_file_o);
+      offd = hypre_CSRBooleanMatrixRead(new_file_o);
    }
    else
-        offd = hypre_CSRBooleanMatrixCreate(local_num_rows,0,0);
+   {
+      offd = hypre_CSRBooleanMatrixCreate(local_num_rows, 0, 0);
+   }
+
 
-        
    matrix = hypre_CTAlloc(hypre_ParCSRBooleanMatrix,  1, HYPRE_MEMORY_HOST);
-   
+
    hypre_ParCSRBooleanMatrix_Get_Comm(matrix) = comm;
    hypre_ParCSRBooleanMatrix_Get_GlobalNRows(matrix) = global_num_rows;
    hypre_ParCSRBooleanMatrix_Get_GlobalNCols(matrix) = global_num_cols;
@@ -463,14 +488,20 @@ hypre_ParCSRBooleanMatrixRead( MPI_Comm comm, const char *file_name )
    hypre_ParCSRBooleanMatrix_Get_OwnsRowStarts(matrix) = 1;
    hypre_ParCSRBooleanMatrix_Get_OwnsColStarts(matrix) = 1;
    if (row_starts == col_starts)
-        hypre_ParCSRBooleanMatrix_Get_OwnsColStarts(matrix) = 0;
+   {
+      hypre_ParCSRBooleanMatrix_Get_OwnsColStarts(matrix) = 0;
+   }
 
    hypre_ParCSRBooleanMatrix_Get_Diag(matrix) = diag;
    hypre_ParCSRBooleanMatrix_Get_Offd(matrix) = offd;
    if (num_cols_offd)
-        hypre_ParCSRBooleanMatrix_Get_ColMapOffd(matrix) = col_map_offd;
+   {
+      hypre_ParCSRBooleanMatrix_Get_ColMapOffd(matrix) = col_map_offd;
+   }
    else
-        hypre_ParCSRBooleanMatrix_Get_ColMapOffd(matrix) = NULL;
+   {
+      hypre_ParCSRBooleanMatrix_Get_ColMapOffd(matrix) = NULL;
+   }
 
    return matrix;
 }
@@ -479,8 +510,8 @@ hypre_ParCSRBooleanMatrixRead( MPI_Comm comm, const char *file_name )
  * hypre_ParCSRBooleanMatrixPrint
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int hypre_ParCSRBooleanMatrixPrint( hypre_ParCSRBooleanMatrix *matrix, 
-                                    const char                *file_name )
+HYPRE_Int hypre_ParCSRBooleanMatrixPrint( hypre_ParCSRBooleanMatrix *matrix,
+                                          const char                *file_name )
 {
    MPI_Comm comm = hypre_ParCSRBooleanMatrix_Get_Comm(matrix);
    HYPRE_BigInt global_num_rows = hypre_ParCSRBooleanMatrix_Get_GlobalNRows(matrix);
@@ -494,28 +525,32 @@ HYPRE_Int hypre_ParCSRBooleanMatrixPrint( hypre_ParCSRBooleanMatrix *matrix,
    FILE *fp;
    HYPRE_Int  num_cols_offd = 0;
 
-   if (hypre_ParCSRBooleanMatrix_Get_Offd(matrix)) num_cols_offd = 
-      hypre_CSRBooleanMatrix_Get_NCols(hypre_ParCSRBooleanMatrix_Get_Offd(matrix));
+   if (hypre_ParCSRBooleanMatrix_Get_Offd(matrix)) num_cols_offd =
+         hypre_CSRBooleanMatrix_Get_NCols(hypre_ParCSRBooleanMatrix_Get_Offd(matrix));
 
    hypre_MPI_Comm_rank(comm, &my_id);
    hypre_MPI_Comm_size(comm, &num_procs);
-   
-   hypre_sprintf(new_file_d,"%s.D.%d",file_name,my_id);
-   hypre_sprintf(new_file_o,"%s.O.%d",file_name,my_id);
-   hypre_sprintf(new_file_info,"%s.INFO.%d",file_name,my_id);
-   hypre_CSRBooleanMatrixPrint(hypre_ParCSRBooleanMatrix_Get_Diag(matrix),new_file_d);
+
+   hypre_sprintf(new_file_d, "%s.D.%d", file_name, my_id);
+   hypre_sprintf(new_file_o, "%s.O.%d", file_name, my_id);
+   hypre_sprintf(new_file_info, "%s.INFO.%d", file_name, my_id);
+   hypre_CSRBooleanMatrixPrint(hypre_ParCSRBooleanMatrix_Get_Diag(matrix), new_file_d);
    if (num_cols_offd != 0)
       hypre_CSRBooleanMatrixPrint(hypre_ParCSRBooleanMatrix_Get_Offd(matrix),
-                                new_file_o);
-  
+                                  new_file_o);
+
    fp = fopen(new_file_info, "w");
    hypre_fprintf(fp, "%b\n", global_num_rows);
    hypre_fprintf(fp, "%b\n", global_num_cols);
    hypre_fprintf(fp, "%d\n", num_cols_offd);
-   for (i=0; i < num_procs; i++)
+   for (i = 0; i < num_procs; i++)
+   {
       hypre_fprintf(fp, "%b %b\n", row_starts[i], col_starts[i]);
-   for (i=0; i < num_cols_offd; i++)
+   }
+   for (i = 0; i < num_cols_offd; i++)
+   {
       hypre_fprintf(fp, "%b\n", col_map_offd[i]);
+   }
    fclose(fp);
 
    return ierr;
@@ -525,8 +560,9 @@ HYPRE_Int hypre_ParCSRBooleanMatrixPrint( hypre_ParCSRBooleanMatrix *matrix,
  * hypre_ParCSRBooleanMatrixPrintIJ
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int hypre_ParCSRBooleanMatrixPrintIJ( hypre_ParCSRBooleanMatrix *matrix, 
-                                      const char                *filename )
+HYPRE_Int
+hypre_ParCSRBooleanMatrixPrintIJ( hypre_ParCSRBooleanMatrix *matrix,
+                                  const char                *filename )
 {
    MPI_Comm comm = hypre_ParCSRBooleanMatrix_Get_Comm(matrix);
    HYPRE_BigInt      global_num_rows = hypre_ParCSRBooleanMatrix_Get_GlobalNRows(matrix);
@@ -537,8 +573,8 @@ HYPRE_Int hypre_ParCSRBooleanMatrixPrintIJ( hypre_ParCSRBooleanMatrix *matrix,
    HYPRE_Int      num_rows        = hypre_ParCSRBooleanMatrix_Get_NRows(matrix);
    HYPRE_Int     *diag_i;
    HYPRE_Int     *diag_j;
-   HYPRE_Int     *offd_i;
-   HYPRE_Int     *offd_j;
+   HYPRE_Int     *offd_i = NULL;
+   HYPRE_Int     *offd_j = NULL;
    HYPRE_Int      myid, i, j;
    HYPRE_BigInt   I, J;
    HYPRE_Int      ierr = 0;
@@ -548,12 +584,12 @@ HYPRE_Int hypre_ParCSRBooleanMatrixPrintIJ( hypre_ParCSRBooleanMatrix *matrix,
    hypre_CSRBooleanMatrix *offd = hypre_ParCSRBooleanMatrix_Get_Offd(matrix);
    HYPRE_Int  num_cols_offd = 0;
 
-   if (offd) num_cols_offd = 
-      hypre_CSRBooleanMatrix_Get_NCols(hypre_ParCSRBooleanMatrix_Get_Offd(matrix));
+   if (offd) num_cols_offd =
+         hypre_CSRBooleanMatrix_Get_NCols(hypre_ParCSRBooleanMatrix_Get_Offd(matrix));
 
    hypre_MPI_Comm_rank(comm, &myid);
-   
-   hypre_sprintf(new_filename,"%s.%05d", filename, myid);
+
+   hypre_sprintf(new_filename, "%s.%05d", filename, myid);
 
    if ((file = fopen(new_filename, "w")) == NULL)
    {
@@ -576,7 +612,7 @@ HYPRE_Int hypre_ParCSRBooleanMatrixPrintIJ( hypre_ParCSRBooleanMatrix *matrix,
       I = first_row_index + i;
 
       /* print diag columns */
-      for (j = diag_i[i]; j < diag_i[i+1]; j++)
+      for (j = diag_i[i]; j < diag_i[i + 1]; j++)
       {
          J = first_col_diag + diag_j[j];
          hypre_fprintf(file, "%b, %b\n", I, J );
@@ -585,7 +621,7 @@ HYPRE_Int hypre_ParCSRBooleanMatrixPrintIJ( hypre_ParCSRBooleanMatrix *matrix,
       /* print offd columns */
       if (num_cols_offd)
       {
-         for (j = offd_i[i]; j < offd_i[i+1]; j++)
+         for (j = offd_i[i]; j < offd_i[i + 1]; j++)
          {
             J = col_map_offd[offd_j[j]];
             hypre_fprintf(file, "%b, %b \n", I, J);
@@ -605,20 +641,20 @@ HYPRE_Int hypre_ParCSRBooleanMatrixPrintIJ( hypre_ParCSRBooleanMatrix *matrix,
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int hypre_ParCSRBooleanMatrixGetLocalRange(hypre_ParCSRBooleanMatrix *matrix,
-                                         HYPRE_BigInt *row_start, HYPRE_BigInt *row_end,
-                                         HYPRE_BigInt *col_start, HYPRE_BigInt *col_end )
-{  
-   HYPRE_Int ierr=0;
+                                                 HYPRE_BigInt *row_start, HYPRE_BigInt *row_end,
+                                                 HYPRE_BigInt *col_start, HYPRE_BigInt *col_end )
+{
+   HYPRE_Int ierr = 0;
    HYPRE_Int my_id;
 
    hypre_MPI_Comm_rank( hypre_ParCSRBooleanMatrix_Get_Comm(matrix), &my_id );
 
    *row_start = hypre_ParCSRBooleanMatrix_Get_RowStarts(matrix)[ my_id ];
-   *row_end   = hypre_ParCSRBooleanMatrix_Get_RowStarts(matrix)[ my_id + 1 ]-1;
+   *row_end   = hypre_ParCSRBooleanMatrix_Get_RowStarts(matrix)[ my_id + 1 ] - 1;
    *col_start = hypre_ParCSRBooleanMatrix_Get_ColStarts(matrix)[ my_id ];
-   *col_end   = hypre_ParCSRBooleanMatrix_Get_ColStarts(matrix)[ my_id + 1 ]-1;
+   *col_end   = hypre_ParCSRBooleanMatrix_Get_ColStarts(matrix)[ my_id + 1 ] - 1;
 
-   return( ierr );
+   return ( ierr );
 }
 
 /*--------------------------------------------------------------------------
@@ -629,8 +665,8 @@ HYPRE_Int hypre_ParCSRBooleanMatrixGetLocalRange(hypre_ParCSRBooleanMatrix *matr
  * store the local data, storing them in the hypre_ParCSRBooleanMatrix structure.
  * Only a single row can be accessed via this function at any one time; the
  * corresponding RestoreRow function must be called, to avoid bleeding memory,
- * and to be able to look at another row.  All indices are returned in 0-based 
- * indexing, no matter what is used under the hood. 
+ * and to be able to look at another row.  All indices are returned in 0-based
+ * indexing, no matter what is used under the hood.
  * EXCEPTION: currently this only works if the local CSR matrices
  * use 0-based indexing.
  * This code, semantics, implementation, etc., are all based on PETSc's hypre_MPI_AIJ
@@ -639,19 +675,19 @@ HYPRE_Int hypre_ParCSRBooleanMatrixGetLocalRange(hypre_ParCSRBooleanMatrix *matr
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int hypre_ParCSRBooleanMatrixGetRow(hypre_ParCSRBooleanMatrix  *mat,
-                                  HYPRE_BigInt row, HYPRE_Int *size, HYPRE_BigInt **col_ind)
-{  
-   HYPRE_Int    i, m, ierr=0, max=1, tmp, my_id;
+                                          HYPRE_BigInt row, HYPRE_Int *size, HYPRE_BigInt **col_ind)
+{
+   HYPRE_Int    i, m, ierr = 0, max = 1, tmp, my_id;
    HYPRE_BigInt row_start, row_end, cstart;
-   HYPRE_Int    *cworkA, *cworkB; 
+   HYPRE_Int    *cworkA, *cworkB;
    HYPRE_Int    nztot, nzA, nzB, lrow;
    HYPRE_BigInt    *cmap, *idx_p;
    hypre_CSRBooleanMatrix *Aa, *Ba;
 
    Aa = (hypre_CSRBooleanMatrix *) hypre_ParCSRBooleanMatrix_Get_Diag(mat);
    Ba = (hypre_CSRBooleanMatrix *) hypre_ParCSRBooleanMatrix_Get_Offd(mat);
-   
-   if (hypre_ParCSRBooleanMatrix_Get_Getrowactive(mat)) return(-1);
+
+   if (hypre_ParCSRBooleanMatrix_Get_Getrowactive(mat)) { return (-1); }
 
    hypre_MPI_Comm_rank( hypre_ParCSRBooleanMatrix_Get_Comm(mat), &my_id );
 
@@ -661,83 +697,90 @@ HYPRE_Int hypre_ParCSRBooleanMatrixGetRow(hypre_ParCSRBooleanMatrix  *mat,
    row_start = hypre_ParCSRBooleanMatrix_Get_RowStarts(mat)[ my_id ];
    lrow      = (HYPRE_Int)(row - row_start);
 
-   if (row < row_start || row >= row_end) return(-1);
+   if (row < row_start || row >= row_end) { return (-1); }
 
-   if ( col_ind ) 
+   if ( col_ind )
    {
-      m = (HYPRE_Int)(row_end-row_start);
-      for ( i=0; i<m; i++ ) 
+      m = (HYPRE_Int)(row_end - row_start);
+      for ( i = 0; i < m; i++ )
       {
-        tmp = hypre_CSRBooleanMatrix_Get_I(Aa)[i+1] - 
-              hypre_CSRBooleanMatrix_Get_I(Aa)[i] + 
-              hypre_CSRBooleanMatrix_Get_I(Ba)[i+1] - 
-              hypre_CSRBooleanMatrix_Get_I(Ba)[i];
-        if (max < tmp) { max = tmp; }
+         tmp = hypre_CSRBooleanMatrix_Get_I(Aa)[i + 1] -
+               hypre_CSRBooleanMatrix_Get_I(Aa)[i] +
+               hypre_CSRBooleanMatrix_Get_I(Ba)[i + 1] -
+               hypre_CSRBooleanMatrix_Get_I(Ba)[i];
+         if (max < tmp) { max = tmp; }
       }
-      hypre_ParCSRBooleanMatrix_Get_Rowindices(mat) = (HYPRE_BigInt *) hypre_CTAlloc(HYPRE_BigInt, max, HYPRE_MEMORY_HOST); 
+      hypre_ParCSRBooleanMatrix_Get_Rowindices(mat) = (HYPRE_BigInt *) hypre_CTAlloc(HYPRE_BigInt, max,
+                                                                                     HYPRE_MEMORY_HOST);
    }
 
    cstart = hypre_ParCSRBooleanMatrix_Get_FirstColDiag(mat);
 
-   nzA = hypre_CSRBooleanMatrix_Get_I(Aa)[lrow+1] -
+   nzA = hypre_CSRBooleanMatrix_Get_I(Aa)[lrow + 1] -
          hypre_CSRBooleanMatrix_Get_I(Aa)[lrow];
-   cworkA= &(hypre_CSRBooleanMatrix_Get_J(Aa)[hypre_CSRBooleanMatrix_Get_I(Aa)[lrow]]);
+   cworkA = &(hypre_CSRBooleanMatrix_Get_J(Aa)[hypre_CSRBooleanMatrix_Get_I(Aa)[lrow]]);
 
-   nzB = hypre_CSRBooleanMatrix_Get_I(Ba)[lrow+1] -
+   nzB = hypre_CSRBooleanMatrix_Get_I(Ba)[lrow + 1] -
          hypre_CSRBooleanMatrix_Get_I(Ba)[lrow];
-   cworkB= &(hypre_CSRBooleanMatrix_Get_J(Ba)[hypre_CSRBooleanMatrix_Get_I(Ba)[lrow]]);
+   cworkB = &(hypre_CSRBooleanMatrix_Get_J(Ba)[hypre_CSRBooleanMatrix_Get_I(Ba)[lrow]]);
 
    nztot = nzA + nzB;
 
    cmap  = hypre_ParCSRBooleanMatrix_Get_ColMapOffd(mat);
 
-   if (col_ind) 
+   if (col_ind)
    {
-      if (nztot) 
+      if (nztot)
       {
          HYPRE_Int imark = -1;
-         if (col_ind) 
+         if (col_ind)
          {
             *col_ind = idx_p = hypre_ParCSRBooleanMatrix_Get_Rowindices(mat);
-            if (imark > -1) 
+            if (imark > -1)
             {
-               for ( i=0; i<imark; i++ ) idx_p[i] = cmap[cworkB[i]];
-            } 
-            else 
+               for ( i = 0; i < imark; i++ ) { idx_p[i] = cmap[cworkB[i]]; }
+            }
+            else
             {
-               for ( i=0; i<nzB; i++ ) 
+               for ( i = 0; i < nzB; i++ )
                {
-                  if (cmap[cworkB[i]] < cstart) idx_p[i] = cmap[cworkB[i]];
-                  else break;
+                  if (cmap[cworkB[i]] < cstart) { idx_p[i] = cmap[cworkB[i]]; }
+                  else { break; }
                }
                imark = i;
             }
-            for ( i=0; i<nzA; i++ )     idx_p[imark+i] = cstart + (HYPRE_BigInt)cworkA[i];
-            for ( i=imark; i<nzB; i++ ) idx_p[nzA+i]   = cmap[cworkB[i]];
-         } 
-      } 
-      else 
+            for ( i = 0; i < nzA; i++ ) { idx_p[imark + i] = cstart + (HYPRE_BigInt)cworkA[i]; }
+            for ( i = imark; i < nzB; i++ ) { idx_p[nzA + i]   = cmap[cworkB[i]]; }
+         }
+      }
+      else
       {
-         if (col_ind) *col_ind = 0; 
+         if (col_ind) { *col_ind = 0; }
       }
    }
    *size = nztot;
-   return( ierr );
+   return ( ierr );
 }
 
 /*--------------------------------------------------------------------------
  * hypre_ParCSRBooleanMatrixRestoreRow
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int hypre_ParCSRBooleanMatrixRestoreRow( hypre_ParCSRBooleanMatrix *matrix,
-                                       HYPRE_BigInt row, HYPRE_Int *size, HYPRE_BigInt **col_ind)
-{  
+HYPRE_Int
+hypre_ParCSRBooleanMatrixRestoreRow( hypre_ParCSRBooleanMatrix *matrix,
+                                     HYPRE_BigInt               row,
+                                     HYPRE_Int                 *size,
+                                     HYPRE_BigInt             **col_ind )
+{
+   HYPRE_UNUSED_VAR(row);
+   HYPRE_UNUSED_VAR(size);
+   HYPRE_UNUSED_VAR(col_ind);
 
-   if (!hypre_ParCSRBooleanMatrix_Get_Getrowactive(matrix)) return( -1 );
+   if (!hypre_ParCSRBooleanMatrix_Get_Getrowactive(matrix)) { return ( -1 ); }
 
    hypre_ParCSRBooleanMatrix_Get_Getrowactive(matrix) = 0;
 
-   return( 0 );
+   return ( 0 );
 }
 
 
@@ -747,15 +790,15 @@ HYPRE_Int hypre_ParCSRBooleanMatrixRestoreRow( hypre_ParCSRBooleanMatrix *matrix
 
 HYPRE_Int
 hypre_BuildCSRBooleanMatrixMPIDataType(
-   HYPRE_Int num_nonzeros, HYPRE_Int num_rows, HYPRE_Int *a_i, HYPRE_Int *a_j, 
+   HYPRE_Int num_nonzeros, HYPRE_Int num_rows, HYPRE_Int *a_i, HYPRE_Int *a_j,
    hypre_MPI_Datatype *csr_matrix_datatype )
 {
-   HYPRE_Int		block_lens[2];
-   hypre_MPI_Aint	displ[2];
-   hypre_MPI_Datatype	types[2];
-   HYPRE_Int		ierr = 0;
+   HYPRE_Int      block_lens[2];
+   hypre_MPI_Aint displ[2];
+   hypre_MPI_Datatype   types[2];
+   HYPRE_Int      ierr = 0;
 
-   block_lens[0] = num_rows+1;
+   block_lens[0] = num_rows + 1;
    block_lens[1] = num_nonzeros;
 
    types[0] = HYPRE_MPI_INT;
@@ -763,7 +806,7 @@ hypre_BuildCSRBooleanMatrixMPIDataType(
 
    hypre_MPI_Address(a_i, &displ[0]);
    hypre_MPI_Address(a_j, &displ[1]);
-   hypre_MPI_Type_struct(2,block_lens,displ,types,csr_matrix_datatype);
+   hypre_MPI_Type_struct(2, block_lens, displ, types, csr_matrix_datatype);
    hypre_MPI_Type_commit(csr_matrix_datatype);
 
    return ierr;
@@ -776,9 +819,10 @@ hypre_BuildCSRBooleanMatrixMPIDataType(
  *--------------------------------------------------------------------------*/
 
 hypre_ParCSRBooleanMatrix *
-hypre_CSRBooleanMatrixToParCSRBooleanMatrix
-( MPI_Comm comm, hypre_CSRBooleanMatrix *A,
-  HYPRE_BigInt *row_starts, HYPRE_BigInt *col_starts )
+hypre_CSRBooleanMatrixToParCSRBooleanMatrix( MPI_Comm comm,
+                                             hypre_CSRBooleanMatrix *A,
+                                             HYPRE_BigInt *row_starts,
+                                             HYPRE_BigInt *col_starts )
 {
    HYPRE_BigInt       global_data[2];
    HYPRE_BigInt       global_num_rows;
@@ -786,12 +830,12 @@ hypre_CSRBooleanMatrixToParCSRBooleanMatrix
    HYPRE_Int          *local_num_rows;
 
    HYPRE_Int          num_procs, my_id;
-   HYPRE_Int          *local_num_nonzeros=NULL;
+   HYPRE_Int          *local_num_nonzeros = NULL;
    HYPRE_Int          num_nonzeros;
-  
-   HYPRE_Int          *a_i;
-   HYPRE_Int          *a_j;
-  
+
+   HYPRE_Int          *a_i = NULL;
+   HYPRE_Int          *a_j = NULL;
+
    hypre_CSRBooleanMatrix *local_A;
 
    hypre_MPI_Request  *requests;
@@ -802,20 +846,20 @@ hypre_CSRBooleanMatrixToParCSRBooleanMatrix
 
    HYPRE_BigInt       first_col_diag;
    HYPRE_BigInt       last_col_diag;
- 
+
    HYPRE_Int i, j, ind;
 
    hypre_MPI_Comm_rank(comm, &my_id);
    hypre_MPI_Comm_size(comm, &num_procs);
 
-   if (my_id == 0) 
+   if (my_id == 0)
    {
-        global_data[0] = (HYPRE_BigInt)hypre_CSRBooleanMatrix_Get_NRows(A);
-        global_data[1] = (HYPRE_BigInt)hypre_CSRBooleanMatrix_Get_NCols(A);
-        a_i = hypre_CSRBooleanMatrix_Get_I(A);
-        a_j = hypre_CSRBooleanMatrix_Get_J(A);
+      global_data[0] = (HYPRE_BigInt)hypre_CSRBooleanMatrix_Get_NRows(A);
+      global_data[1] = (HYPRE_BigInt)hypre_CSRBooleanMatrix_Get_NCols(A);
+      a_i = hypre_CSRBooleanMatrix_Get_I(A);
+      a_j = hypre_CSRBooleanMatrix_Get_J(A);
    }
-   hypre_MPI_Bcast(global_data,2,HYPRE_MPI_INT,0,comm);
+   hypre_MPI_Bcast(global_data, 2, HYPRE_MPI_BIG_INT, 0, comm);
    global_num_rows = global_data[0];
    global_num_cols = global_data[1];
 
@@ -823,76 +867,78 @@ hypre_CSRBooleanMatrixToParCSRBooleanMatrix
    csr_matrix_datatypes = hypre_CTAlloc(hypre_MPI_Datatype,  num_procs, HYPRE_MEMORY_HOST);
 
    par_matrix = hypre_ParCSRBooleanMatrixCreate (comm, global_num_rows,
-        global_num_cols,row_starts,col_starts,0,0,0);
+                                                 global_num_cols, row_starts, col_starts, 0, 0, 0);
 
    row_starts = hypre_ParCSRBooleanMatrix_Get_RowStarts(par_matrix);
    col_starts = hypre_ParCSRBooleanMatrix_Get_ColStarts(par_matrix);
 
-   for (i=0; i < num_procs; i++)
-         local_num_rows[i] = (HYPRE_Int)(row_starts[i+1] - row_starts[i]);
+   for (i = 0; i < num_procs; i++)
+   {
+      local_num_rows[i] = (HYPRE_Int)(row_starts[i + 1] - row_starts[i]);
+   }
 
    if (my_id == 0)
    {
-        local_num_nonzeros = hypre_CTAlloc(HYPRE_Int,  num_procs, HYPRE_MEMORY_HOST);
-        for (i=0; i < num_procs-1; i++)
-                local_num_nonzeros[i] = a_i[(HYPRE_Int)row_starts[i+1]] 
-                                - a_i[(HYPRE_Int)row_starts[i]];
-        local_num_nonzeros[num_procs-1] = a_i[(HYPRE_Int)global_num_rows] 
-                                - a_i[(HYPRE_Int)row_starts[num_procs-1]];
+      local_num_nonzeros = hypre_CTAlloc(HYPRE_Int,  num_procs, HYPRE_MEMORY_HOST);
+      for (i = 0; i < num_procs - 1; i++)
+         local_num_nonzeros[i] = a_i[(HYPRE_Int)row_starts[i + 1]]
+                                 - a_i[(HYPRE_Int)row_starts[i]];
+      local_num_nonzeros[num_procs - 1] = a_i[(HYPRE_Int)global_num_rows]
+                                          - a_i[(HYPRE_Int)row_starts[num_procs - 1]];
    }
-   hypre_MPI_Scatter(local_num_nonzeros,1,HYPRE_MPI_INT,&num_nonzeros,1,HYPRE_MPI_INT,0,comm);
+   hypre_MPI_Scatter(local_num_nonzeros, 1, HYPRE_MPI_INT, &num_nonzeros, 1, HYPRE_MPI_INT, 0, comm);
 
-   if (my_id == 0) num_nonzeros = local_num_nonzeros[0];
+   if (my_id == 0) { num_nonzeros = local_num_nonzeros[0]; }
 
    local_A = hypre_CSRBooleanMatrixCreate(local_num_rows[my_id], (HYPRE_Int)global_num_cols,
-                num_nonzeros);
+                                          num_nonzeros);
    if (my_id == 0)
    {
-        requests = hypre_CTAlloc(hypre_MPI_Request,  num_procs-1, HYPRE_MEMORY_HOST);
-        status = hypre_CTAlloc(hypre_MPI_Status,  num_procs-1, HYPRE_MEMORY_HOST);
-        j=0;
-        for (i=1; i < num_procs; i++)
-        {
-                ind = a_i[(HYPRE_Int)row_starts[i]];
-                hypre_BuildCSRBooleanMatrixMPIDataType(local_num_nonzeros[i], 
-                        local_num_rows[i],
-                        &a_i[(HYPRE_Int)row_starts[i]],
-                        &a_j[ind],
-                        &csr_matrix_datatypes[i]);
-                hypre_MPI_Isend(hypre_MPI_BOTTOM, 1, csr_matrix_datatypes[i], i, 0, comm,
-                        &requests[j++]);
-                hypre_MPI_Type_free(&csr_matrix_datatypes[i]);
-        }
-        hypre_CSRBooleanMatrix_Get_I(local_A) = a_i;
-        hypre_CSRBooleanMatrix_Get_J(local_A) = a_j;
-        hypre_MPI_Waitall(num_procs-1,requests,status);
-        hypre_TFree(requests, HYPRE_MEMORY_HOST);
-        hypre_TFree(status, HYPRE_MEMORY_HOST);
-        hypre_TFree(local_num_nonzeros, HYPRE_MEMORY_HOST);
-    }
+      requests = hypre_CTAlloc(hypre_MPI_Request,  num_procs - 1, HYPRE_MEMORY_HOST);
+      status = hypre_CTAlloc(hypre_MPI_Status,  num_procs - 1, HYPRE_MEMORY_HOST);
+      j = 0;
+      for (i = 1; i < num_procs; i++)
+      {
+         ind = a_i[(HYPRE_Int)row_starts[i]];
+         hypre_BuildCSRBooleanMatrixMPIDataType(local_num_nonzeros[i],
+                                                local_num_rows[i],
+                                                &a_i[(HYPRE_Int)row_starts[i]],
+                                                &a_j[ind],
+                                                &csr_matrix_datatypes[i]);
+         hypre_MPI_Isend(hypre_MPI_BOTTOM, 1, csr_matrix_datatypes[i], i, 0, comm,
+                         &requests[j++]);
+         hypre_MPI_Type_free(&csr_matrix_datatypes[i]);
+      }
+      hypre_CSRBooleanMatrix_Get_I(local_A) = a_i;
+      hypre_CSRBooleanMatrix_Get_J(local_A) = a_j;
+      hypre_MPI_Waitall(num_procs - 1, requests, status);
+      hypre_TFree(requests, HYPRE_MEMORY_HOST);
+      hypre_TFree(status, HYPRE_MEMORY_HOST);
+      hypre_TFree(local_num_nonzeros, HYPRE_MEMORY_HOST);
+   }
    else
    {
-        hypre_CSRBooleanMatrixInitialize(local_A);
-        hypre_BuildCSRBooleanMatrixMPIDataType(num_nonzeros, 
-                        local_num_rows[my_id],
-                        hypre_CSRBooleanMatrix_Get_I(local_A),
-                        hypre_CSRBooleanMatrix_Get_J(local_A),
-                        csr_matrix_datatypes);
-        hypre_MPI_Recv(hypre_MPI_BOTTOM,1,csr_matrix_datatypes[0],0,0,comm,&status0);
-        hypre_MPI_Type_free(csr_matrix_datatypes);
+      hypre_CSRBooleanMatrixInitialize(local_A);
+      hypre_BuildCSRBooleanMatrixMPIDataType(num_nonzeros,
+                                             local_num_rows[my_id],
+                                             hypre_CSRBooleanMatrix_Get_I(local_A),
+                                             hypre_CSRBooleanMatrix_Get_J(local_A),
+                                             csr_matrix_datatypes);
+      hypre_MPI_Recv(hypre_MPI_BOTTOM, 1, csr_matrix_datatypes[0], 0, 0, comm, &status0);
+      hypre_MPI_Type_free(csr_matrix_datatypes);
    }
 
    first_col_diag = col_starts[my_id];
-   last_col_diag = col_starts[my_id+1]-1;
+   last_col_diag = col_starts[my_id + 1] - 1;
 
    hypre_BooleanGenerateDiagAndOffd(local_A, par_matrix, first_col_diag, last_col_diag);
 
    /* set pointers back to NULL before destroying */
    if (my_id == 0)
-   {      
+   {
       hypre_CSRBooleanMatrix_Get_I(local_A) = NULL;
-      hypre_CSRBooleanMatrix_Get_J(local_A) = NULL; 
-   }      
+      hypre_CSRBooleanMatrix_Get_J(local_A) = NULL;
+   }
    hypre_CSRBooleanMatrixDestroy(local_A);
    hypre_TFree(local_num_rows, HYPRE_MEMORY_HOST);
    hypre_TFree(csr_matrix_datatypes, HYPRE_MEMORY_HOST);
@@ -902,9 +948,9 @@ hypre_CSRBooleanMatrixToParCSRBooleanMatrix
 
 HYPRE_Int
 hypre_BooleanGenerateDiagAndOffd(hypre_CSRBooleanMatrix *A,
-                    hypre_ParCSRBooleanMatrix *matrix,
-                    HYPRE_BigInt first_col_diag,
-                    HYPRE_BigInt last_col_diag)
+                                 hypre_ParCSRBooleanMatrix *matrix,
+                                 HYPRE_BigInt first_col_diag,
+                                 HYPRE_BigInt last_col_diag)
 {
    HYPRE_Int  i, j;
    HYPRE_Int  jo, jd;
@@ -920,115 +966,115 @@ hypre_BooleanGenerateDiagAndOffd(hypre_CSRBooleanMatrix *A,
    HYPRE_BigInt  *col_map_offd;
 
    HYPRE_Int  *diag_i, *offd_i;
-   HYPRE_Int  *diag_j, *offd_j;
+   HYPRE_Int  *diag_j, *offd_j = NULL;
    HYPRE_Int  *marker;
    HYPRE_Int num_cols_diag, num_cols_offd;
    HYPRE_Int first_elmt = a_i[0];
-   HYPRE_Int num_nonzeros = a_i[num_rows]-first_elmt;
+   HYPRE_Int num_nonzeros = a_i[num_rows] - first_elmt;
    HYPRE_Int counter;
 
-   num_cols_diag = (HYPRE_Int)(last_col_diag - first_col_diag +1);
+   num_cols_diag = (HYPRE_Int)(last_col_diag - first_col_diag + 1);
    num_cols_offd = 0;
 
    if (num_cols - num_cols_diag)
    {
-        hypre_CSRBooleanMatrixInitialize(diag);
-        diag_i = hypre_CSRBooleanMatrix_Get_I(diag);
-
-        hypre_CSRBooleanMatrixInitialize(offd);
-        offd_i = hypre_CSRBooleanMatrix_Get_I(offd);
-        marker = hypre_CTAlloc(HYPRE_Int, num_cols, HYPRE_MEMORY_HOST);
-
-        for (i=0; i < num_cols; i++)
-                marker[i] = 0;
-        
-        jo = 0;
-        jd = 0;
-        for (i=0; i < num_rows; i++)
-        {
-            offd_i[i] = jo;
-            diag_i[i] = jd;
-   
-            for (j=a_i[i]-first_elmt; j < a_i[i+1]-first_elmt; j++)
-                if (a_j[j] < (HYPRE_Int)first_col_diag || a_j[j] > (HYPRE_Int)last_col_diag)
-                {
-                        if (!marker[a_j[j]])
-                        {
-                                marker[a_j[j]] = 1;
-                                num_cols_offd++;
-                        }
-                        jo++;
-                }
-                else
-                {
-                        jd++;
-                }
-        }
-        offd_i[num_rows] = jo;
-        diag_i[num_rows] = jd;
-
-        hypre_ParCSRBooleanMatrix_Get_ColMapOffd(matrix) =
-           hypre_CTAlloc(HYPRE_BigInt, num_cols_offd, HYPRE_MEMORY_HOST);
-        col_map_offd = hypre_ParCSRBooleanMatrix_Get_ColMapOffd(matrix);
-
-        counter = 0;
-        for (i=0; i < num_cols; i++)
-                if (marker[i])
-                {
-                        col_map_offd[counter] = (HYPRE_BigInt)i;
-                        marker[i] = counter;
-                        counter++;
-                }
-
-        hypre_CSRBooleanMatrix_Get_NNZ(diag) = jd;
-        hypre_CSRBooleanMatrixInitialize(diag);
-        diag_j = hypre_CSRBooleanMatrix_Get_J(diag);
-
-        hypre_CSRBooleanMatrix_Get_NNZ(offd) = jo;
-        hypre_CSRBooleanMatrix_Get_NCols(offd) = num_cols_offd;
-        hypre_CSRBooleanMatrixInitialize(offd);
-        offd_j = hypre_CSRBooleanMatrix_Get_J(offd);
-
-        jo = 0;
-        jd = 0;
-        for (i=0; i < num_rows; i++)
-        {
-            for (j=a_i[i]-first_elmt; j < a_i[i+1]-first_elmt; j++)
-                if (a_j[j] < first_col_diag || a_j[j] > last_col_diag)
-                {
-                        offd_j[jo++] = marker[a_j[j]];
-                }
-                else
-                {
-                        diag_j[jd++] = a_j[j]-(HYPRE_Int)first_col_diag;
-                }
-        }
-        hypre_TFree(marker, HYPRE_MEMORY_HOST);
+      hypre_CSRBooleanMatrixInitialize(diag);
+      diag_i = hypre_CSRBooleanMatrix_Get_I(diag);
+
+      hypre_CSRBooleanMatrixInitialize(offd);
+      offd_i = hypre_CSRBooleanMatrix_Get_I(offd);
+      marker = hypre_CTAlloc(HYPRE_Int, num_cols, HYPRE_MEMORY_HOST);
+
+      for (i = 0; i < num_cols; i++)
+      {
+         marker[i] = 0;
+      }
+
+      jo = 0;
+      jd = 0;
+      for (i = 0; i < num_rows; i++)
+      {
+         offd_i[i] = jo;
+         diag_i[i] = jd;
+
+         for (j = a_i[i] - first_elmt; j < a_i[i + 1] - first_elmt; j++)
+            if (a_j[j] < (HYPRE_Int)first_col_diag || a_j[j] > (HYPRE_Int)last_col_diag)
+            {
+               if (!marker[a_j[j]])
+               {
+                  marker[a_j[j]] = 1;
+                  num_cols_offd++;
+               }
+               jo++;
+            }
+            else
+            {
+               jd++;
+            }
+      }
+      offd_i[num_rows] = jo;
+      diag_i[num_rows] = jd;
+
+      hypre_ParCSRBooleanMatrix_Get_ColMapOffd(matrix) =
+         hypre_CTAlloc(HYPRE_BigInt, num_cols_offd, HYPRE_MEMORY_HOST);
+      col_map_offd = hypre_ParCSRBooleanMatrix_Get_ColMapOffd(matrix);
+
+      counter = 0;
+      for (i = 0; i < num_cols; i++)
+         if (marker[i])
+         {
+            col_map_offd[counter] = (HYPRE_BigInt)i;
+            marker[i] = counter;
+            counter++;
+         }
+
+      hypre_CSRBooleanMatrix_Get_NNZ(diag) = jd;
+      hypre_CSRBooleanMatrixInitialize(diag);
+      diag_j = hypre_CSRBooleanMatrix_Get_J(diag);
+
+      hypre_CSRBooleanMatrix_Get_NNZ(offd) = jo;
+      hypre_CSRBooleanMatrix_Get_NCols(offd) = num_cols_offd;
+      hypre_CSRBooleanMatrixInitialize(offd);
+      offd_j = hypre_CSRBooleanMatrix_Get_J(offd);
+
+      jo = 0;
+      jd = 0;
+      for (i = 0; i < num_rows; i++)
+      {
+         for (j = a_i[i] - first_elmt; j < a_i[i + 1] - first_elmt; j++)
+            if (a_j[j] < first_col_diag || a_j[j] > last_col_diag)
+            {
+               offd_j[jo++] = marker[a_j[j]];
+            }
+            else
+            {
+               diag_j[jd++] = a_j[j] - (HYPRE_Int)first_col_diag;
+            }
+      }
+      hypre_TFree(marker, HYPRE_MEMORY_HOST);
    }
-   else 
+   else
    {
-        hypre_CSRBooleanMatrix_Get_NNZ(diag) = num_nonzeros;
-        hypre_CSRBooleanMatrixInitialize(diag);
-        diag_i = hypre_CSRBooleanMatrix_Get_I(diag);
-        diag_j = hypre_CSRBooleanMatrix_Get_J(diag);
-
-        for (i=0; i < num_nonzeros; i++)
-        {
-                diag_j[i] = a_j[i];
-        }
-        offd_i = hypre_CTAlloc(HYPRE_Int,  num_rows+1, HYPRE_MEMORY_HOST);
-
-        for (i=0; i < num_rows+1; i++)
-        {
-                diag_i[i] = a_i[i];
-                offd_i[i] = 0;
-        }
-
-        hypre_CSRBooleanMatrix_Get_NCols(offd) = 0;
-        hypre_CSRBooleanMatrix_Get_I(offd) = offd_i;
+      hypre_CSRBooleanMatrix_Get_NNZ(diag) = num_nonzeros;
+      hypre_CSRBooleanMatrixInitialize(diag);
+      diag_i = hypre_CSRBooleanMatrix_Get_I(diag);
+      diag_j = hypre_CSRBooleanMatrix_Get_J(diag);
+
+      for (i = 0; i < num_nonzeros; i++)
+      {
+         diag_j[i] = a_j[i];
+      }
+      offd_i = hypre_CTAlloc(HYPRE_Int,  num_rows + 1, HYPRE_MEMORY_HOST);
+
+      for (i = 0; i < num_rows + 1; i++)
+      {
+         diag_i[i] = a_i[i];
+         offd_i[i] = 0;
+      }
+
+      hypre_CSRBooleanMatrix_Get_NCols(offd) = 0;
+      hypre_CSRBooleanMatrix_Get_I(offd) = offd_i;
    }
-   
+
    return ierr;
 }
-
-
diff --git a/external/hypre/src/parcsr_mv/par_csr_communication.c b/external/hypre/src/parcsr_mv/par_csr_communication.c
index 8b1f773e..d28ea322 100644
--- a/external/hypre/src/parcsr_mv/par_csr_communication.c
+++ b/external/hypre/src/parcsr_mv/par_csr_communication.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -38,17 +38,21 @@ static CommPkgJobType getJobTypeOf(HYPRE_Int job)
    return job_type;
 }
 
-/**
- * When send_data and recv_data are NULL, buffers are internally allocated
- * and CommHandle owns the buffer
- */
+/*------------------------------------------------------------------
+ * hypre_ParCSRPersistentCommHandleCreate
+ *
+ * When send_data and recv_data are NULL, buffers are internally
+ * allocated and CommHandle owns the buffer
+ *------------------------------------------------------------------*/
+
 hypre_ParCSRPersistentCommHandle*
 hypre_ParCSRPersistentCommHandleCreate( HYPRE_Int job, hypre_ParCSRCommPkg *comm_pkg )
 {
    HYPRE_Int i;
    size_t num_bytes_send, num_bytes_recv;
 
-   hypre_ParCSRPersistentCommHandle *comm_handle = hypre_CTAlloc(hypre_ParCSRPersistentCommHandle, 1, HYPRE_MEMORY_HOST);
+   hypre_ParCSRPersistentCommHandle *comm_handle = hypre_CTAlloc(hypre_ParCSRPersistentCommHandle, 1,
+                                                                 HYPRE_MEMORY_HOST);
 
    CommPkgJobType job_type = getJobTypeOf(job);
 
@@ -69,15 +73,17 @@ hypre_ParCSRPersistentCommHandleCreate( HYPRE_Int job, hypre_ParCSRCommPkg *comm
       case HYPRE_COMM_PKG_JOB_COMPLEX:
          num_bytes_send = sizeof(HYPRE_Complex) * hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends);
          num_bytes_recv = sizeof(HYPRE_Complex) * hypre_ParCSRCommPkgRecvVecStart(comm_pkg, num_recvs);
-         send_buff = hypre_TAlloc(HYPRE_Complex, hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends), HYPRE_MEMORY_HOST);
-         recv_buff = hypre_TAlloc(HYPRE_Complex, hypre_ParCSRCommPkgRecvVecStart(comm_pkg, num_recvs), HYPRE_MEMORY_HOST);
+         send_buff = hypre_TAlloc(HYPRE_Complex, hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                                  HYPRE_MEMORY_HOST);
+         recv_buff = hypre_TAlloc(HYPRE_Complex, hypre_ParCSRCommPkgRecvVecStart(comm_pkg, num_recvs),
+                                  HYPRE_MEMORY_HOST);
          for (i = 0; i < num_recvs; ++i)
          {
             HYPRE_Int ip = hypre_ParCSRCommPkgRecvProc(comm_pkg, i);
             HYPRE_Int vec_start = hypre_ParCSRCommPkgRecvVecStart(comm_pkg, i);
             HYPRE_Int vec_len = hypre_ParCSRCommPkgRecvVecStart(comm_pkg, i + 1) - vec_start;
             hypre_MPI_Recv_init( (HYPRE_Complex *)recv_buff + vec_start, vec_len, HYPRE_MPI_COMPLEX,
-                                  ip, 0, comm, requests + i );
+                                 ip, 0, comm, requests + i );
          }
          for (i = 0; i < num_sends; ++i)
          {
@@ -92,8 +98,10 @@ hypre_ParCSRPersistentCommHandleCreate( HYPRE_Int job, hypre_ParCSRCommPkg *comm
       case HYPRE_COMM_PKG_JOB_COMPLEX_TRANSPOSE:
          num_bytes_recv = sizeof(HYPRE_Complex) * hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends);
          num_bytes_send = sizeof(HYPRE_Complex) * hypre_ParCSRCommPkgRecvVecStart(comm_pkg, num_recvs);
-         recv_buff = hypre_TAlloc(HYPRE_Complex, hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends), HYPRE_MEMORY_HOST);
-         send_buff = hypre_TAlloc(HYPRE_Complex, hypre_ParCSRCommPkgRecvVecStart(comm_pkg, num_recvs), HYPRE_MEMORY_HOST);
+         recv_buff = hypre_TAlloc(HYPRE_Complex, hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                                  HYPRE_MEMORY_HOST);
+         send_buff = hypre_TAlloc(HYPRE_Complex, hypre_ParCSRCommPkgRecvVecStart(comm_pkg, num_recvs),
+                                  HYPRE_MEMORY_HOST);
          for (i = 0; i < num_sends; ++i)
          {
             HYPRE_Int ip = hypre_ParCSRCommPkgSendProc(comm_pkg, i);
@@ -115,8 +123,10 @@ hypre_ParCSRPersistentCommHandleCreate( HYPRE_Int job, hypre_ParCSRCommPkg *comm
       case HYPRE_COMM_PKG_JOB_INT:
          num_bytes_send = sizeof(HYPRE_Int) * hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends);
          num_bytes_recv = sizeof(HYPRE_Int) * hypre_ParCSRCommPkgRecvVecStart(comm_pkg, num_recvs);
-         send_buff = hypre_TAlloc(HYPRE_Int, hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends), HYPRE_MEMORY_HOST);
-         recv_buff = hypre_TAlloc(HYPRE_Int, hypre_ParCSRCommPkgRecvVecStart(comm_pkg, num_recvs), HYPRE_MEMORY_HOST);
+         send_buff = hypre_TAlloc(HYPRE_Int, hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                                  HYPRE_MEMORY_HOST);
+         recv_buff = hypre_TAlloc(HYPRE_Int, hypre_ParCSRCommPkgRecvVecStart(comm_pkg, num_recvs),
+                                  HYPRE_MEMORY_HOST);
          for (i = 0; i < num_recvs; ++i)
          {
             HYPRE_Int ip = hypre_ParCSRCommPkgRecvProc(comm_pkg, i);
@@ -138,8 +148,10 @@ hypre_ParCSRPersistentCommHandleCreate( HYPRE_Int job, hypre_ParCSRCommPkg *comm
       case HYPRE_COMM_PKG_JOB_INT_TRANSPOSE:
          num_bytes_recv = sizeof(HYPRE_Int) * hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends);
          num_bytes_send = sizeof(HYPRE_Int) * hypre_ParCSRCommPkgRecvVecStart(comm_pkg, num_recvs);
-         recv_buff = hypre_TAlloc(HYPRE_Int, hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends), HYPRE_MEMORY_HOST);
-         send_buff = hypre_TAlloc(HYPRE_Int, hypre_ParCSRCommPkgRecvVecStart(comm_pkg, num_recvs), HYPRE_MEMORY_HOST);
+         recv_buff = hypre_TAlloc(HYPRE_Int, hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                                  HYPRE_MEMORY_HOST);
+         send_buff = hypre_TAlloc(HYPRE_Int, hypre_ParCSRCommPkgRecvVecStart(comm_pkg, num_recvs),
+                                  HYPRE_MEMORY_HOST);
          for (i = 0; i < num_sends; ++i)
          {
             HYPRE_Int ip = hypre_ParCSRCommPkgSendProc(comm_pkg, i);
@@ -161,14 +173,17 @@ hypre_ParCSRPersistentCommHandleCreate( HYPRE_Int job, hypre_ParCSRCommPkg *comm
       case HYPRE_COMM_PKG_JOB_BIGINT:
          num_bytes_send = sizeof(HYPRE_BigInt) * hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends);
          num_bytes_recv = sizeof(HYPRE_BigInt) * hypre_ParCSRCommPkgRecvVecStart(comm_pkg, num_recvs);
-         send_buff = hypre_TAlloc(HYPRE_BigInt, hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends), HYPRE_MEMORY_HOST);
-         recv_buff = hypre_TAlloc(HYPRE_BigInt, hypre_ParCSRCommPkgRecvVecStart(comm_pkg, num_recvs), HYPRE_MEMORY_HOST);
+         send_buff = hypre_TAlloc(HYPRE_BigInt, hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                                  HYPRE_MEMORY_HOST);
+         recv_buff = hypre_TAlloc(HYPRE_BigInt, hypre_ParCSRCommPkgRecvVecStart(comm_pkg, num_recvs),
+                                  HYPRE_MEMORY_HOST);
          for (i = 0; i < num_recvs; ++i)
          {
             HYPRE_Int ip = hypre_ParCSRCommPkgRecvProc(comm_pkg, i);
             HYPRE_Int vec_start = hypre_ParCSRCommPkgRecvVecStart(comm_pkg, i);
             HYPRE_Int vec_len = hypre_ParCSRCommPkgRecvVecStart(comm_pkg, i + 1) - vec_start;
-            hypre_MPI_Recv_init( (HYPRE_BigInt *)recv_buff + (HYPRE_BigInt)vec_start, vec_len, HYPRE_MPI_BIG_INT,
+            hypre_MPI_Recv_init( (HYPRE_BigInt *)recv_buff + (HYPRE_BigInt)vec_start, vec_len,
+                                 HYPRE_MPI_BIG_INT,
                                  ip, 0, comm, requests + i );
          }
          for (i = 0; i < num_sends; ++i)
@@ -176,7 +191,8 @@ hypre_ParCSRPersistentCommHandleCreate( HYPRE_Int job, hypre_ParCSRCommPkg *comm
             HYPRE_Int ip = hypre_ParCSRCommPkgSendProc(comm_pkg, i);
             HYPRE_Int vec_start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
             HYPRE_Int vec_len = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1) - vec_start;
-            hypre_MPI_Send_init( (HYPRE_BigInt *)send_buff + (HYPRE_BigInt)vec_start, vec_len, HYPRE_MPI_BIG_INT,
+            hypre_MPI_Send_init( (HYPRE_BigInt *)send_buff + (HYPRE_BigInt)vec_start, vec_len,
+                                 HYPRE_MPI_BIG_INT,
                                  ip, 0, comm, requests + num_recvs + i);
          }
          break;
@@ -184,14 +200,17 @@ hypre_ParCSRPersistentCommHandleCreate( HYPRE_Int job, hypre_ParCSRCommPkg *comm
       case HYPRE_COMM_PKG_JOB_BIGINT_TRANSPOSE:
          num_bytes_recv = sizeof(HYPRE_BigInt) * hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends);
          num_bytes_send = sizeof(HYPRE_BigInt) * hypre_ParCSRCommPkgRecvVecStart(comm_pkg, num_recvs);
-         recv_buff = hypre_TAlloc(HYPRE_BigInt, hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends), HYPRE_MEMORY_HOST);
-         send_buff = hypre_TAlloc(HYPRE_BigInt, hypre_ParCSRCommPkgRecvVecStart(comm_pkg, num_recvs), HYPRE_MEMORY_HOST);
+         recv_buff = hypre_TAlloc(HYPRE_BigInt, hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                                  HYPRE_MEMORY_HOST);
+         send_buff = hypre_TAlloc(HYPRE_BigInt, hypre_ParCSRCommPkgRecvVecStart(comm_pkg, num_recvs),
+                                  HYPRE_MEMORY_HOST);
          for (i = 0; i < num_sends; ++i)
          {
             HYPRE_Int ip = hypre_ParCSRCommPkgSendProc(comm_pkg, i);
             HYPRE_Int vec_start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
             HYPRE_Int vec_len = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1) - vec_start;
-            hypre_MPI_Recv_init( (HYPRE_BigInt *)recv_buff + (HYPRE_BigInt)vec_start, vec_len, HYPRE_MPI_BIG_INT,
+            hypre_MPI_Recv_init( (HYPRE_BigInt *)recv_buff + (HYPRE_BigInt)vec_start, vec_len,
+                                 HYPRE_MPI_BIG_INT,
                                  ip, 0, comm, requests + i );
          }
          for (i = 0; i < num_recvs; ++i)
@@ -200,7 +219,8 @@ hypre_ParCSRPersistentCommHandleCreate( HYPRE_Int job, hypre_ParCSRCommPkg *comm
             HYPRE_Int vec_start = hypre_ParCSRCommPkgRecvVecStart(comm_pkg, i);
             HYPRE_Int vec_len = hypre_ParCSRCommPkgRecvVecStart(comm_pkg, i + 1) - vec_start;
 
-            hypre_MPI_Send_init( (HYPRE_BigInt *)send_buff + (HYPRE_BigInt)vec_start, vec_len, HYPRE_MPI_BIG_INT,
+            hypre_MPI_Send_init( (HYPRE_BigInt *)send_buff + (HYPRE_BigInt)vec_start, vec_len,
+                                 HYPRE_MPI_BIG_INT,
                                  ip, 0, comm, requests + num_sends + i);
          }
          break;
@@ -217,6 +237,9 @@ hypre_ParCSRPersistentCommHandleCreate( HYPRE_Int job, hypre_ParCSRCommPkg *comm
    return ( comm_handle );
 }
 
+/*------------------------------------------------------------------
+ * hypre_ParCSRCommPkgGetPersistentCommHandle
+ *------------------------------------------------------------------*/
 
 hypre_ParCSRPersistentCommHandle*
 hypre_ParCSRCommPkgGetPersistentCommHandle( HYPRE_Int job, hypre_ParCSRCommPkg *comm_pkg )
@@ -225,24 +248,38 @@ hypre_ParCSRCommPkgGetPersistentCommHandle( HYPRE_Int job, hypre_ParCSRCommPkg *
    if (!comm_pkg->persistent_comm_handles[type])
    {
       /* data is owned by persistent comm handle */
-      comm_pkg->persistent_comm_handles[type] = hypre_ParCSRPersistentCommHandleCreate(job, comm_pkg);
+      comm_pkg->persistent_comm_handles[type] =
+         hypre_ParCSRPersistentCommHandleCreate(job, comm_pkg);
    }
 
    return comm_pkg->persistent_comm_handles[type];
 }
 
+/*------------------------------------------------------------------
+ * hypre_ParCSRPersistentCommHandleDestroy
+ *------------------------------------------------------------------*/
+
 void
 hypre_ParCSRPersistentCommHandleDestroy( hypre_ParCSRPersistentCommHandle *comm_handle )
 {
-   hypre_TFree(hypre_ParCSRCommHandleSendDataBuffer(comm_handle), HYPRE_MEMORY_HOST);
-   hypre_TFree(hypre_ParCSRCommHandleRecvDataBuffer(comm_handle), HYPRE_MEMORY_HOST);
-   hypre_TFree(comm_handle->requests, HYPRE_MEMORY_HOST);
-   hypre_TFree(comm_handle, HYPRE_MEMORY_HOST);
+   if (comm_handle)
+   {
+      hypre_TFree(hypre_ParCSRCommHandleSendDataBuffer(comm_handle), HYPRE_MEMORY_HOST);
+      hypre_TFree(hypre_ParCSRCommHandleRecvDataBuffer(comm_handle), HYPRE_MEMORY_HOST);
+      hypre_TFree(comm_handle->requests, HYPRE_MEMORY_HOST);
+
+      hypre_TFree(comm_handle, HYPRE_MEMORY_HOST);
+   }
 }
 
-void hypre_ParCSRPersistentCommHandleStart( hypre_ParCSRPersistentCommHandle *comm_handle,
-                                            HYPRE_MemoryLocation              send_memory_location,
-                                            void                             *send_data )
+/*------------------------------------------------------------------
+ * hypre_ParCSRPersistentCommHandleStart
+ *------------------------------------------------------------------*/
+
+void
+hypre_ParCSRPersistentCommHandleStart( hypre_ParCSRPersistentCommHandle *comm_handle,
+                                       HYPRE_MemoryLocation              send_memory_location,
+                                       void                             *send_data )
 {
    hypre_ParCSRCommHandleSendData(comm_handle) = send_data;
    hypre_ParCSRCommHandleSendMemoryLocation(comm_handle) = send_memory_location;
@@ -260,15 +297,20 @@ void hypre_ParCSRPersistentCommHandleStart( hypre_ParCSRPersistentCommHandle *co
                                          hypre_ParCSRCommHandleRequests(comm_handle));
       if (hypre_MPI_SUCCESS != ret)
       {
-         hypre_error_w_msg(HYPRE_ERROR_GENERIC,"MPI error\n");
+         hypre_error_w_msg(HYPRE_ERROR_GENERIC, "MPI error\n");
          /*hypre_printf("MPI error %d in %s (%s, line %u)\n", ret, __FUNCTION__, __FILE__, __LINE__);*/
       }
    }
 }
 
-void hypre_ParCSRPersistentCommHandleWait( hypre_ParCSRPersistentCommHandle *comm_handle,
-                                           HYPRE_MemoryLocation              recv_memory_location,
-                                           void                             *recv_data )
+/*------------------------------------------------------------------
+ * hypre_ParCSRPersistentCommHandleWait
+ *------------------------------------------------------------------*/
+
+void
+hypre_ParCSRPersistentCommHandleWait( hypre_ParCSRPersistentCommHandle *comm_handle,
+                                      HYPRE_MemoryLocation              recv_memory_location,
+                                      void                             *recv_data )
 {
    hypre_ParCSRCommHandleRecvData(comm_handle) = recv_data;
    hypre_ParCSRCommHandleRecvMemoryLocation(comm_handle) = recv_memory_location;
@@ -280,7 +322,7 @@ void hypre_ParCSRPersistentCommHandleWait( hypre_ParCSRPersistentCommHandle *com
                                         hypre_MPI_STATUSES_IGNORE);
       if (hypre_MPI_SUCCESS != ret)
       {
-         hypre_error_w_msg(HYPRE_ERROR_GENERIC,"MPI error\n");
+         hypre_error_w_msg(HYPRE_ERROR_GENERIC, "MPI error\n");
          /*hypre_printf("MPI error %d in %s (%s, line %u)\n", ret, __FUNCTION__, __FILE__, __LINE__);*/
       }
 
@@ -294,6 +336,10 @@ void hypre_ParCSRPersistentCommHandleWait( hypre_ParCSRPersistentCommHandle *com
 }
 #endif // HYPRE_USING_PERSISTENT_COMM
 
+/*------------------------------------------------------------------
+ * hypre_ParCSRCommHandleCreate
+ *------------------------------------------------------------------*/
+
 hypre_ParCSRCommHandle*
 hypre_ParCSRCommHandleCreate ( HYPRE_Int            job,
                                hypre_ParCSRCommPkg *comm_pkg,
@@ -304,6 +350,10 @@ hypre_ParCSRCommHandleCreate ( HYPRE_Int            job,
                                           HYPRE_MEMORY_HOST, recv_data);
 }
 
+/*------------------------------------------------------------------
+ * hypre_ParCSRCommHandleCreate_v2
+ *------------------------------------------------------------------*/
+
 hypre_ParCSRCommHandle*
 hypre_ParCSRCommHandleCreate_v2 ( HYPRE_Int            job,
                                   hypre_ParCSRCommPkg *comm_pkg,
@@ -312,6 +362,8 @@ hypre_ParCSRCommHandleCreate_v2 ( HYPRE_Int            job,
                                   HYPRE_MemoryLocation recv_memory_location,
                                   void                *recv_data_in )
 {
+   hypre_GpuProfilingPushRange("hypre_ParCSRCommHandleCreate_v2");
+
    HYPRE_Int                  num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
    HYPRE_Int                  num_recvs = hypre_ParCSRCommPkgNumRecvs(comm_pkg);
    MPI_Comm                   comm      = hypre_ParCSRCommPkgComm(comm_pkg);
@@ -356,66 +408,72 @@ hypre_ParCSRCommHandleCreate_v2 ( HYPRE_Int            job,
     *           datatypes need to point to absolute
     *           addresses, e.g. generated using hypre_MPI_Address .
     *--------------------------------------------------------------------*/
-#ifndef HYPRE_WITH_GPU_AWARE_MPI
-   switch (job)
+
+   if (!hypre_GetGpuAwareMPI())
    {
-      case 1:
-         num_send_bytes = hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends) * sizeof(HYPRE_Complex);
-         num_recv_bytes = hypre_ParCSRCommPkgRecvVecStart(comm_pkg, num_recvs) * sizeof(HYPRE_Complex);
-         break;
-      case 2:
-         num_send_bytes = hypre_ParCSRCommPkgRecvVecStart(comm_pkg, num_recvs) * sizeof(HYPRE_Complex);
-         num_recv_bytes = hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends) * sizeof(HYPRE_Complex);
-         break;
-      case 11:
-         num_send_bytes = hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends) * sizeof(HYPRE_Int);
-         num_recv_bytes = hypre_ParCSRCommPkgRecvVecStart(comm_pkg, num_recvs) * sizeof(HYPRE_Int);
-         break;
-      case 12:
-         num_send_bytes = hypre_ParCSRCommPkgRecvVecStart(comm_pkg, num_recvs) * sizeof(HYPRE_Int);
-         num_recv_bytes = hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends) * sizeof(HYPRE_Int);
-         break;
-      case 21:
-         num_send_bytes = hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends) * sizeof(HYPRE_BigInt);
-         num_recv_bytes = hypre_ParCSRCommPkgRecvVecStart(comm_pkg, num_recvs) * sizeof(HYPRE_BigInt);
-         break;
-      case 22:
-         num_send_bytes = hypre_ParCSRCommPkgRecvVecStart(comm_pkg, num_recvs) * sizeof(HYPRE_BigInt);
-         num_recv_bytes = hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends) * sizeof(HYPRE_BigInt);
-         break;
-   }
+      switch (job)
+      {
+         case 1:
+            num_send_bytes = hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends) * sizeof(HYPRE_Complex);
+            num_recv_bytes = hypre_ParCSRCommPkgRecvVecStart(comm_pkg, num_recvs) * sizeof(HYPRE_Complex);
+            break;
+         case 2:
+            num_send_bytes = hypre_ParCSRCommPkgRecvVecStart(comm_pkg, num_recvs) * sizeof(HYPRE_Complex);
+            num_recv_bytes = hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends) * sizeof(HYPRE_Complex);
+            break;
+         case 11:
+            num_send_bytes = hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends) * sizeof(HYPRE_Int);
+            num_recv_bytes = hypre_ParCSRCommPkgRecvVecStart(comm_pkg, num_recvs) * sizeof(HYPRE_Int);
+            break;
+         case 12:
+            num_send_bytes = hypre_ParCSRCommPkgRecvVecStart(comm_pkg, num_recvs) * sizeof(HYPRE_Int);
+            num_recv_bytes = hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends) * sizeof(HYPRE_Int);
+            break;
+         case 21:
+            num_send_bytes = hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends) * sizeof(HYPRE_BigInt);
+            num_recv_bytes = hypre_ParCSRCommPkgRecvVecStart(comm_pkg, num_recvs) * sizeof(HYPRE_BigInt);
+            break;
+         case 22:
+            num_send_bytes = hypre_ParCSRCommPkgRecvVecStart(comm_pkg, num_recvs) * sizeof(HYPRE_BigInt);
+            num_recv_bytes = hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends) * sizeof(HYPRE_BigInt);
+            break;
+      }
 
-   hypre_MemoryLocation act_send_memory_location = hypre_GetActualMemLocation(send_memory_location);
+      hypre_MemoryLocation act_send_memory_location = hypre_GetActualMemLocation(send_memory_location);
 
-   if ( act_send_memory_location == hypre_MEMORY_DEVICE || act_send_memory_location == hypre_MEMORY_UNIFIED )
-   {
-      //send_data = _hypre_TAlloc(char, num_send_bytes, hypre_MEMORY_HOST_PINNED);
-      send_data = hypre_TAlloc(char, num_send_bytes, HYPRE_MEMORY_HOST);
-      hypre_TMemcpy(send_data, send_data_in, char, num_send_bytes, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
-   }
-   else
-   {
-      send_data = send_data_in;
-   }
+      if ( act_send_memory_location == hypre_MEMORY_DEVICE ||
+           act_send_memory_location == hypre_MEMORY_UNIFIED )
+      {
+         //send_data = _hypre_TAlloc(char, num_send_bytes, hypre_MEMORY_HOST_PINNED);
+         send_data = hypre_TAlloc(char, num_send_bytes, HYPRE_MEMORY_HOST);
+         hypre_GpuProfilingPushRange("MPI-D2H");
+         hypre_TMemcpy(send_data, send_data_in, char, num_send_bytes, HYPRE_MEMORY_HOST,
+                       HYPRE_MEMORY_DEVICE);
+         hypre_GpuProfilingPopRange();
+      }
+      else
+      {
+         send_data = send_data_in;
+      }
 
-   hypre_MemoryLocation act_recv_memory_location = hypre_GetActualMemLocation(recv_memory_location);
+      hypre_MemoryLocation act_recv_memory_location = hypre_GetActualMemLocation(recv_memory_location);
 
-   if ( act_recv_memory_location == hypre_MEMORY_DEVICE || act_recv_memory_location == hypre_MEMORY_UNIFIED )
-   {
-      //recv_data = hypre_TAlloc(char, num_recv_bytes, hypre_MEMORY_HOST_PINNED);
-      recv_data = hypre_TAlloc(char, num_recv_bytes, HYPRE_MEMORY_HOST);
+      if ( act_recv_memory_location == hypre_MEMORY_DEVICE ||
+           act_recv_memory_location == hypre_MEMORY_UNIFIED )
+      {
+         //recv_data = hypre_TAlloc(char, num_recv_bytes, hypre_MEMORY_HOST_PINNED);
+         recv_data = hypre_TAlloc(char, num_recv_bytes, HYPRE_MEMORY_HOST);
+      }
+      else
+      {
+         recv_data = recv_data_in;
+      }
    }
    else
    {
+      send_data = send_data_in;
       recv_data = recv_data_in;
    }
-#else /* #ifndef HYPRE_WITH_GPU_AWARE_MPI */
-   send_data = send_data_in;
-   recv_data = recv_data_in;
-   // TODO RL: it seems that we need to sync the CUDA stream before doing GPU-GPU MPI.
-   // Need to check MPI documentation whether this is acutally true
-   hypre_SyncCudaComputeStream(hypre_handle());
-#endif
 
    num_requests = num_sends + num_recvs;
    requests = hypre_CTAlloc(hypre_MPI_Request, num_requests, HYPRE_MEMORY_HOST);
@@ -433,8 +491,8 @@ hypre_ParCSRCommHandleCreate_v2 ( HYPRE_Int            job,
          for (i = 0; i < num_recvs; i++)
          {
             ip = hypre_ParCSRCommPkgRecvProc(comm_pkg, i);
-            vec_start = hypre_ParCSRCommPkgRecvVecStart(comm_pkg,i);
-            vec_len = hypre_ParCSRCommPkgRecvVecStart(comm_pkg,i+1)-vec_start;
+            vec_start = hypre_ParCSRCommPkgRecvVecStart(comm_pkg, i);
+            vec_len = hypre_ParCSRCommPkgRecvVecStart(comm_pkg, i + 1) - vec_start;
             hypre_MPI_Irecv(&d_recv_data[vec_start], vec_len, HYPRE_MPI_COMPLEX,
                             ip, 0, comm, &requests[j++]);
          }
@@ -442,7 +500,7 @@ hypre_ParCSRCommHandleCreate_v2 ( HYPRE_Int            job,
          {
             ip = hypre_ParCSRCommPkgSendProc(comm_pkg, i);
             vec_start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-            vec_len = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1)-vec_start;
+            vec_len = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1) - vec_start;
             hypre_MPI_Isend(&d_send_data[vec_start], vec_len, HYPRE_MPI_COMPLEX,
                             ip, 0, comm, &requests[j++]);
          }
@@ -456,15 +514,15 @@ hypre_ParCSRCommHandleCreate_v2 ( HYPRE_Int            job,
          {
             ip = hypre_ParCSRCommPkgSendProc(comm_pkg, i);
             vec_start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-            vec_len = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1) - vec_start;
+            vec_len = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1) - vec_start;
             hypre_MPI_Irecv(&d_recv_data[vec_start], vec_len, HYPRE_MPI_COMPLEX,
                             ip, 0, comm, &requests[j++]);
          }
          for (i = 0; i < num_recvs; i++)
          {
             ip = hypre_ParCSRCommPkgRecvProc(comm_pkg, i);
-            vec_start = hypre_ParCSRCommPkgRecvVecStart(comm_pkg,i);
-            vec_len = hypre_ParCSRCommPkgRecvVecStart(comm_pkg,i+1)-vec_start;
+            vec_start = hypre_ParCSRCommPkgRecvVecStart(comm_pkg, i);
+            vec_len = hypre_ParCSRCommPkgRecvVecStart(comm_pkg, i + 1) - vec_start;
             hypre_MPI_Isend(&d_send_data[vec_start], vec_len, HYPRE_MPI_COMPLEX,
                             ip, 0, comm, &requests[j++]);
          }
@@ -477,8 +535,8 @@ hypre_ParCSRCommHandleCreate_v2 ( HYPRE_Int            job,
          for (i = 0; i < num_recvs; i++)
          {
             ip = hypre_ParCSRCommPkgRecvProc(comm_pkg, i);
-            vec_start = hypre_ParCSRCommPkgRecvVecStart(comm_pkg,i);
-            vec_len = hypre_ParCSRCommPkgRecvVecStart(comm_pkg,i+1)-vec_start;
+            vec_start = hypre_ParCSRCommPkgRecvVecStart(comm_pkg, i);
+            vec_len = hypre_ParCSRCommPkgRecvVecStart(comm_pkg, i + 1) - vec_start;
             hypre_MPI_Irecv(&i_recv_data[vec_start], vec_len, HYPRE_MPI_INT,
                             ip, 0, comm, &requests[j++]);
          }
@@ -486,7 +544,7 @@ hypre_ParCSRCommHandleCreate_v2 ( HYPRE_Int            job,
          {
             ip = hypre_ParCSRCommPkgSendProc(comm_pkg, i);
             vec_start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-            vec_len = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1)-vec_start;
+            vec_len = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1) - vec_start;
             hypre_MPI_Isend(&i_send_data[vec_start], vec_len, HYPRE_MPI_INT,
                             ip, 0, comm, &requests[j++]);
          }
@@ -500,15 +558,15 @@ hypre_ParCSRCommHandleCreate_v2 ( HYPRE_Int            job,
          {
             ip = hypre_ParCSRCommPkgSendProc(comm_pkg, i);
             vec_start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-            vec_len = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1) - vec_start;
+            vec_len = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1) - vec_start;
             hypre_MPI_Irecv(&i_recv_data[vec_start], vec_len, HYPRE_MPI_INT,
                             ip, 0, comm, &requests[j++]);
          }
          for (i = 0; i < num_recvs; i++)
          {
             ip = hypre_ParCSRCommPkgRecvProc(comm_pkg, i);
-            vec_start = hypre_ParCSRCommPkgRecvVecStart(comm_pkg,i);
-            vec_len = hypre_ParCSRCommPkgRecvVecStart(comm_pkg,i+1)-vec_start;
+            vec_start = hypre_ParCSRCommPkgRecvVecStart(comm_pkg, i);
+            vec_len = hypre_ParCSRCommPkgRecvVecStart(comm_pkg, i + 1) - vec_start;
             hypre_MPI_Isend(&i_send_data[vec_start], vec_len, HYPRE_MPI_INT,
                             ip, 0, comm, &requests[j++]);
          }
@@ -521,15 +579,15 @@ hypre_ParCSRCommHandleCreate_v2 ( HYPRE_Int            job,
          for (i = 0; i < num_recvs; i++)
          {
             ip = hypre_ParCSRCommPkgRecvProc(comm_pkg, i);
-            vec_start = hypre_ParCSRCommPkgRecvVecStart(comm_pkg,i);
-            vec_len = hypre_ParCSRCommPkgRecvVecStart(comm_pkg,i+1)-vec_start;
+            vec_start = hypre_ParCSRCommPkgRecvVecStart(comm_pkg, i);
+            vec_len = hypre_ParCSRCommPkgRecvVecStart(comm_pkg, i + 1) - vec_start;
             hypre_MPI_Irecv(&i_recv_data[vec_start], vec_len, HYPRE_MPI_BIG_INT,
                             ip, 0, comm, &requests[j++]);
          }
          for (i = 0; i < num_sends; i++)
          {
             vec_start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-            vec_len = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1)-vec_start;
+            vec_len = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1) - vec_start;
             ip = hypre_ParCSRCommPkgSendProc(comm_pkg, i);
             hypre_MPI_Isend(&i_send_data[vec_start], vec_len, HYPRE_MPI_BIG_INT,
                             ip, 0, comm, &requests[j++]);
@@ -543,7 +601,7 @@ hypre_ParCSRCommHandleCreate_v2 ( HYPRE_Int            job,
          for (i = 0; i < num_sends; i++)
          {
             vec_start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-            vec_len = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1) - vec_start;
+            vec_len = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1) - vec_start;
             ip = hypre_ParCSRCommPkgSendProc(comm_pkg, i);
             hypre_MPI_Irecv(&i_recv_data[vec_start], vec_len, HYPRE_MPI_BIG_INT,
                             ip, 0, comm, &requests[j++]);
@@ -551,8 +609,8 @@ hypre_ParCSRCommHandleCreate_v2 ( HYPRE_Int            job,
          for (i = 0; i < num_recvs; i++)
          {
             ip = hypre_ParCSRCommPkgRecvProc(comm_pkg, i);
-            vec_start = hypre_ParCSRCommPkgRecvVecStart(comm_pkg,i);
-            vec_len = hypre_ParCSRCommPkgRecvVecStart(comm_pkg,i+1)-vec_start;
+            vec_start = hypre_ParCSRCommPkgRecvVecStart(comm_pkg, i);
+            vec_len = hypre_ParCSRCommPkgRecvVecStart(comm_pkg, i + 1) - vec_start;
             hypre_MPI_Isend(&i_send_data[vec_start], vec_len, HYPRE_MPI_BIG_INT,
                             ip, 0, comm, &requests[j++]);
          }
@@ -577,9 +635,15 @@ hypre_ParCSRCommHandleCreate_v2 ( HYPRE_Int            job,
    hypre_ParCSRCommHandleNumRequests(comm_handle)        = num_requests;
    hypre_ParCSRCommHandleRequests(comm_handle)           = requests;
 
+   hypre_GpuProfilingPopRange();
+
    return ( comm_handle );
 }
 
+/*------------------------------------------------------------------
+ * hypre_ParCSRCommHandleDestroy
+ *------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_ParCSRCommHandleDestroy( hypre_ParCSRCommHandle *comm_handle )
 {
@@ -588,51 +652,69 @@ hypre_ParCSRCommHandleDestroy( hypre_ParCSRCommHandle *comm_handle )
       return hypre_error_flag;
    }
 
+   hypre_GpuProfilingPushRange("hypre_ParCSRCommHandleDestroy");
+
    if (hypre_ParCSRCommHandleNumRequests(comm_handle))
    {
       hypre_MPI_Status *status0;
       status0 = hypre_CTAlloc(hypre_MPI_Status,
                               hypre_ParCSRCommHandleNumRequests(comm_handle), HYPRE_MEMORY_HOST);
+      hypre_GpuProfilingPushRange("hypre_MPI_Waitall");
       hypre_MPI_Waitall(hypre_ParCSRCommHandleNumRequests(comm_handle),
                         hypre_ParCSRCommHandleRequests(comm_handle), status0);
+      hypre_GpuProfilingPopRange();
       hypre_TFree(status0, HYPRE_MEMORY_HOST);
    }
 
-#ifndef HYPRE_WITH_GPU_AWARE_MPI
-   hypre_MemoryLocation act_send_memory_location = hypre_GetActualMemLocation(hypre_ParCSRCommHandleSendMemoryLocation(comm_handle));
-   if ( act_send_memory_location == hypre_MEMORY_DEVICE || act_send_memory_location == hypre_MEMORY_UNIFIED )
+   if (!hypre_GetGpuAwareMPI())
    {
-      //hypre_HostPinnedFree(hypre_ParCSRCommHandleSendDataBuffer(comm_handle));
-      hypre_TFree(hypre_ParCSRCommHandleSendDataBuffer(comm_handle), HYPRE_MEMORY_HOST);
-   }
+      hypre_MemoryLocation act_send_memory_location =
+         hypre_GetActualMemLocation(hypre_ParCSRCommHandleSendMemoryLocation(comm_handle));
 
-   hypre_MemoryLocation act_recv_memory_location = hypre_GetActualMemLocation(hypre_ParCSRCommHandleRecvMemoryLocation(comm_handle));
-   if ( act_recv_memory_location == hypre_MEMORY_DEVICE || act_recv_memory_location == hypre_MEMORY_UNIFIED )
-   {
-      hypre_TMemcpy( hypre_ParCSRCommHandleRecvData(comm_handle),
-                     hypre_ParCSRCommHandleRecvDataBuffer(comm_handle),
-                     char,
-                     hypre_ParCSRCommHandleNumRecvBytes(comm_handle),
-                     HYPRE_MEMORY_DEVICE,
-                     HYPRE_MEMORY_HOST );
+      if ( act_send_memory_location == hypre_MEMORY_DEVICE ||
+           act_send_memory_location == hypre_MEMORY_UNIFIED )
+      {
+         //hypre_HostPinnedFree(hypre_ParCSRCommHandleSendDataBuffer(comm_handle));
+         hypre_TFree(hypre_ParCSRCommHandleSendDataBuffer(comm_handle), HYPRE_MEMORY_HOST);
+      }
 
-      //hypre_HostPinnedFree(hypre_ParCSRCommHandleRecvDataBuffer(comm_handle));
-      hypre_TFree(hypre_ParCSRCommHandleRecvDataBuffer(comm_handle), HYPRE_MEMORY_HOST);
+      hypre_MemoryLocation act_recv_memory_location =
+         hypre_GetActualMemLocation(hypre_ParCSRCommHandleRecvMemoryLocation(comm_handle));
+
+      if ( act_recv_memory_location == hypre_MEMORY_DEVICE ||
+           act_recv_memory_location == hypre_MEMORY_UNIFIED )
+      {
+         hypre_GpuProfilingPushRange("MPI-H2D");
+         hypre_TMemcpy( hypre_ParCSRCommHandleRecvData(comm_handle),
+                        hypre_ParCSRCommHandleRecvDataBuffer(comm_handle),
+                        char,
+                        hypre_ParCSRCommHandleNumRecvBytes(comm_handle),
+                        HYPRE_MEMORY_DEVICE,
+                        HYPRE_MEMORY_HOST );
+         hypre_GpuProfilingPopRange();
+         //hypre_HostPinnedFree(hypre_ParCSRCommHandleRecvDataBuffer(comm_handle));
+         hypre_TFree(hypre_ParCSRCommHandleRecvDataBuffer(comm_handle), HYPRE_MEMORY_HOST);
+      }
    }
-#endif
 
    hypre_TFree(hypre_ParCSRCommHandleRequests(comm_handle), HYPRE_MEMORY_HOST);
    hypre_TFree(comm_handle, HYPRE_MEMORY_HOST);
 
+   hypre_GpuProfilingPopRange();
+
    return hypre_error_flag;
 }
 
-
-/* hypre_MatCommPkgCreate_core does all the communications and computations for
-   hypre_MatCommPkgCreate ( hypre_ParCSRMatrix *A) and
-   hypre_BoolMatCommPkgCreate ( hypre_ParCSRBooleanMatrix *A) To support both
-   data types, it has hardly any data structures other than HYPRE_Int*.
-*/
+/*------------------------------------------------------------------
+ * hypre_ParCSRCommPkgCreate_core
+ *
+ * This function does all the communications and computations for
+ * hypre_ParCSRCommPkgCreate(hypre_ParCSRMatrix *A) and
+ * hypre_BooleanMatvecCommPkgCreate(hypre_ParCSRBooleanMatrix *A)
+ *
+ * To support both data types, it has hardly any data structures
+ * other than HYPRE_Int*.
+ *------------------------------------------------------------------*/
 
 void
 hypre_ParCSRCommPkgCreate_core(
@@ -651,7 +733,7 @@ hypre_ParCSRCommPkgCreate_core(
    HYPRE_Int **p_send_procs,
    HYPRE_Int **p_send_map_starts,
    HYPRE_Int **p_send_map_elmts
-   )
+)
 {
    HYPRE_Int    i, j;
    HYPRE_Int    num_procs, my_id, proc_num, num_elmts;
@@ -664,8 +746,8 @@ hypre_ParCSRCommPkgCreate_core(
    HYPRE_Int  num_sends, *send_procs, *send_map_starts, *send_map_elmts;
    HYPRE_Int  ip, vec_start, vec_len, num_requests;
 
-   hypre_MPI_Request *requests;
-   hypre_MPI_Status *status;
+   hypre_MPI_Request *requests = NULL;
+   hypre_MPI_Status *status = NULL;
 
    hypre_MPI_Comm_size(comm, &num_procs);
    hypre_MPI_Comm_rank(comm, &my_id);
@@ -680,27 +762,36 @@ hypre_ParCSRCommPkgCreate_core(
     * received from Proc. i
     * ---------------------------------------------------------------------*/
 
-   for (i=0; i < num_procs; i++)
-      proc_add[i] = 0;
-
    proc_num = 0;
-   if (num_cols_offd) offd_col = col_map_offd[0];
-   num_recvs=0;
-   j = 0;
-   for (i=0; i < num_cols_offd; i++)
+   if (num_cols_offd)
+   {
+      offd_col = col_map_offd[0];
+   }
+
+   num_recvs = 0;
+   for (i = 0; i < num_cols_offd; i++)
    {
       if (num_cols_diag)
-         proc_num = hypre_min(num_procs-1, (HYPRE_Int)(offd_col / (HYPRE_BigInt)num_cols_diag));
+      {
+         proc_num = hypre_min(num_procs - 1, (HYPRE_Int)(offd_col / (HYPRE_BigInt)num_cols_diag));
+      }
+
       while (col_starts[proc_num] > offd_col )
-         proc_num = proc_num-1;
-      while (col_starts[proc_num+1]-1 < offd_col )
-         proc_num = proc_num+1;
+      {
+         proc_num = proc_num - 1;
+      }
+
+      while (col_starts[proc_num + 1] - 1 < offd_col )
+      {
+         proc_num = proc_num + 1;
+      }
+
       proc_mark[num_recvs] = proc_num;
       j = i;
-      while (col_starts[proc_num+1] > offd_col)
+      while (col_starts[proc_num + 1] > offd_col)
       {
          proc_add[num_recvs]++;
-         if (j < num_cols_offd-1)
+         if (j < num_cols_offd - 1)
          {
             j++;
             offd_col = col_map_offd[j];
@@ -712,11 +803,11 @@ hypre_ParCSRCommPkgCreate_core(
          }
       }
       num_recvs++;
-      if (j < num_cols_offd) i = j-1;
-      else i=j;
+
+      i = (j < num_cols_offd) ? (j - 1) : j;
    }
 
-   local_info = 2*num_recvs;
+   local_info = 2 * num_recvs;
 
    hypre_MPI_Allgather(&local_info, 1, HYPRE_MPI_INT, info, 1, HYPRE_MPI_INT, comm);
 
@@ -726,10 +817,11 @@ hypre_ParCSRCommPkgCreate_core(
     * indices of elements (in this order)
     * ---------------------------------------------------------------------*/
 
-   displs = hypre_CTAlloc(HYPRE_Int,  num_procs+1, HYPRE_MEMORY_HOST);
-   displs[0] = 0;
-   for (i=1; i < num_procs+1; i++)
-      displs[i] = displs[i-1]+info[i-1];
+   displs = hypre_CTAlloc(HYPRE_Int,  num_procs + 1, HYPRE_MEMORY_HOST);
+   for (i = 1; i < num_procs + 1; i++)
+   {
+      displs[i] = displs[i - 1] + info[i - 1];
+   }
    recv_buf = hypre_CTAlloc(HYPRE_Int,  displs[num_procs], HYPRE_MEMORY_HOST);
 
    recv_procs = NULL;
@@ -739,21 +831,20 @@ hypre_ParCSRCommPkgCreate_core(
       recv_procs = hypre_CTAlloc(HYPRE_Int,  num_recvs, HYPRE_MEMORY_HOST);
       tmp = hypre_CTAlloc(HYPRE_Int,  local_info, HYPRE_MEMORY_HOST);
    }
-   recv_vec_starts = hypre_CTAlloc(HYPRE_Int,  num_recvs+1, HYPRE_MEMORY_HOST);
+   recv_vec_starts = hypre_CTAlloc(HYPRE_Int,  num_recvs + 1, HYPRE_MEMORY_HOST);
 
    j = 0;
-   if (num_recvs) recv_vec_starts[0] = 0;
-   for (i=0; i < num_recvs; i++)
+   for (i = 0; i < num_recvs; i++)
    {
       num_elmts = proc_add[i];
       recv_procs[i] = proc_mark[i];
-      recv_vec_starts[i+1] = recv_vec_starts[i]+num_elmts;
+      recv_vec_starts[i + 1] = recv_vec_starts[i] + num_elmts;
       tmp[j++] = proc_mark[i];
       tmp[j++] = num_elmts;
    }
 
-   hypre_MPI_Allgatherv(tmp,local_info,HYPRE_MPI_INT,recv_buf,info,
-                        displs,HYPRE_MPI_INT,comm);
+   hypre_MPI_Allgatherv(tmp, local_info, HYPRE_MPI_INT, recv_buf, info,
+                        displs, HYPRE_MPI_INT, comm);
 
    /* ----------------------------------------------------------------------
     * determine num_sends and number of elements to be sent
@@ -762,16 +853,16 @@ hypre_ParCSRCommPkgCreate_core(
    num_sends = 0;
    num_elmts = 0;
    proc_add[0] = 0;
-   for (i=0; i < num_procs; i++)
+   for (i = 0; i < num_procs; i++)
    {
       j = displs[i];
-      while ( j < displs[i+1])
+      while ( j < displs[i + 1])
       {
          if (recv_buf[j++] == my_id)
          {
             proc_mark[num_sends] = i;
             num_sends++;
-            proc_add[num_sends] = proc_add[num_sends-1]+recv_buf[j];
+            proc_add[num_sends] = proc_add[num_sends - 1] + recv_buf[j];
             break;
          }
          j++;
@@ -793,34 +884,33 @@ hypre_ParCSRCommPkgCreate_core(
       send_map_elmts = hypre_CTAlloc(HYPRE_Int,  proc_add[num_sends], HYPRE_MEMORY_HOST);
       big_buf_data = hypre_CTAlloc(HYPRE_BigInt,  proc_add[num_sends], HYPRE_MEMORY_HOST);
    }
-   send_map_starts = hypre_CTAlloc(HYPRE_Int,  num_sends+1, HYPRE_MEMORY_HOST);
-   num_requests = num_recvs+num_sends;
+   send_map_starts = hypre_CTAlloc(HYPRE_Int,  num_sends + 1, HYPRE_MEMORY_HOST);
+   num_requests = num_recvs + num_sends;
    if (num_requests)
    {
       requests = hypre_CTAlloc(hypre_MPI_Request,  num_requests, HYPRE_MEMORY_HOST);
       status = hypre_CTAlloc(hypre_MPI_Status,  num_requests, HYPRE_MEMORY_HOST);
    }
 
-   if (num_sends) send_map_starts[0] = 0;
-   for (i=0; i < num_sends; i++)
+   for (i = 0; i < num_sends; i++)
    {
-      send_map_starts[i+1] = proc_add[i+1];
+      send_map_starts[i + 1] = proc_add[i + 1];
       send_procs[i] = proc_mark[i];
    }
 
-   j=0;
-   for (i=0; i < num_sends; i++)
+   j = 0;
+   for (i = 0; i < num_sends; i++)
    {
       vec_start = send_map_starts[i];
-      vec_len = send_map_starts[i+1] - vec_start;
+      vec_len = send_map_starts[i + 1] - vec_start;
       ip = send_procs[i];
       hypre_MPI_Irecv(&big_buf_data[vec_start], vec_len, HYPRE_MPI_BIG_INT,
                       ip, 0, comm, &requests[j++]);
    }
-   for (i=0; i < num_recvs; i++)
+   for (i = 0; i < num_recvs; i++)
    {
       vec_start = recv_vec_starts[i];
-      vec_len = recv_vec_starts[i+1] - vec_start;
+      vec_len = recv_vec_starts[i + 1] - vec_start;
       ip = recv_procs[i];
       hypre_MPI_Isend(&col_map_offd[vec_start], vec_len, HYPRE_MPI_BIG_INT,
                       ip, 0, comm, &requests[j++]);
@@ -835,8 +925,10 @@ hypre_ParCSRCommPkgCreate_core(
 
    if (num_sends)
    {
-      for (i=0; i<send_map_starts[num_sends]; i++)
-         send_map_elmts[i] = (HYPRE_Int)(big_buf_data[i]-first_col_diag);
+      for (i = 0; i < send_map_starts[num_sends]; i++)
+      {
+         send_map_elmts[i] = (HYPRE_Int)(big_buf_data[i] - first_col_diag);
+      }
    }
 
    hypre_TFree(proc_add, HYPRE_MEMORY_HOST);
@@ -857,20 +949,24 @@ hypre_ParCSRCommPkgCreate_core(
    *p_send_map_elmts = send_map_elmts;
 }
 
+/*------------------------------------------------------------------
+ * hypre_ParCSRCommPkgCreate
+ *
+ * Creates the communication package with MPI collectives calls.
+ *
+ * Notes:
+ *    1) This version does not use the assumed partition.
+ *    2) comm_pkg must be allocated outside of this function
+ *------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_ParCSRCommPkgCreate
-(
-   /* inputs */
-   MPI_Comm   comm,
-   HYPRE_BigInt *col_map_offd,
-   HYPRE_BigInt  first_col_diag,
-   HYPRE_BigInt *col_starts,
-   HYPRE_Int  num_cols_diag,
-   HYPRE_Int  num_cols_offd,
-   /* output */
-   hypre_ParCSRCommPkg *comm_pkg
-)
+hypre_ParCSRCommPkgCreate( MPI_Comm             comm,
+                           HYPRE_BigInt        *col_map_offd,
+                           HYPRE_BigInt         first_col_diag,
+                           HYPRE_BigInt        *col_starts,
+                           HYPRE_Int            num_cols_diag,
+                           HYPRE_Int            num_cols_offd,
+                           hypre_ParCSRCommPkg *comm_pkg )
 {
    HYPRE_Int  num_sends;
    HYPRE_Int *send_procs;
@@ -881,31 +977,194 @@ hypre_ParCSRCommPkgCreate
    HYPRE_Int *recv_procs;
    HYPRE_Int *recv_vec_starts;
 
-   hypre_ParCSRCommPkgCreate_core
-      ( comm, col_map_offd, first_col_diag, col_starts,
-        num_cols_diag, num_cols_offd,
-        &num_recvs, &recv_procs, &recv_vec_starts,
-        &num_sends, &send_procs, &send_map_starts,
-        &send_map_elmts );
+   hypre_ParCSRCommPkgCreate_core(comm, col_map_offd, first_col_diag,
+                                  col_starts, num_cols_diag, num_cols_offd,
+                                  &num_recvs, &recv_procs, &recv_vec_starts,
+                                  &num_sends, &send_procs, &send_map_starts,
+                                  &send_map_elmts);
+
+   /* Fill the communication package */
+   hypre_ParCSRCommPkgCreateAndFill(comm,
+                                    num_recvs, recv_procs, recv_vec_starts,
+                                    num_sends, send_procs, send_map_starts,
+                                    send_map_elmts,
+                                    &comm_pkg);
+
+   return hypre_error_flag;
+}
+
+/*------------------------------------------------------------------
+ * hypre_ParCSRCommPkgCreateAndFill
+ *------------------------------------------------------------------*/
 
-   hypre_ParCSRCommPkgComm         (comm_pkg) = comm;
-   hypre_ParCSRCommPkgNumRecvs     (comm_pkg) = num_recvs;
-   hypre_ParCSRCommPkgRecvProcs    (comm_pkg) = recv_procs;
+HYPRE_Int
+hypre_ParCSRCommPkgCreateAndFill( MPI_Comm              comm,
+                                  HYPRE_Int             num_recvs,
+                                  HYPRE_Int            *recv_procs,
+                                  HYPRE_Int            *recv_vec_starts,
+                                  HYPRE_Int             num_sends,
+                                  HYPRE_Int            *send_procs,
+                                  HYPRE_Int            *send_map_starts,
+                                  HYPRE_Int            *send_map_elmts,
+                                  hypre_ParCSRCommPkg **comm_pkg_ptr )
+{
+   hypre_ParCSRCommPkg  *comm_pkg;
+
+   /* Allocate memory for comm_pkg if needed */
+   if (*comm_pkg_ptr == NULL)
+   {
+      comm_pkg = hypre_TAlloc(hypre_ParCSRCommPkg, 1, HYPRE_MEMORY_HOST);
+   }
+   else
+   {
+      comm_pkg = *comm_pkg_ptr;
+   }
+
+   /* Set default info */
+   hypre_ParCSRCommPkgNumComponents(comm_pkg)      = 1;
+   hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg) = NULL;
+#if defined(HYPRE_USING_GPU) || defined(HYPRE_USING_DEVICE_OPENMP)
+   hypre_ParCSRCommPkgTmpData(comm_pkg)            = NULL;
+   hypre_ParCSRCommPkgBufData(comm_pkg)            = NULL;
+   hypre_ParCSRCommPkgMatrixE(comm_pkg)            = NULL;
+#endif
+#if defined(HYPRE_USING_PERSISTENT_COMM)
+   HYPRE_Int i;
+
+   for (i = 0; i < NUM_OF_COMM_PKG_JOB_TYPE; i++)
+   {
+      comm_pkg->persistent_comm_handles[i] = NULL;
+   }
+#endif
+
+   /* Set input info */
+   hypre_ParCSRCommPkgComm(comm_pkg)          = comm;
+   hypre_ParCSRCommPkgNumRecvs(comm_pkg)      = num_recvs;
+   hypre_ParCSRCommPkgRecvProcs(comm_pkg)     = recv_procs;
    hypre_ParCSRCommPkgRecvVecStarts(comm_pkg) = recv_vec_starts;
-   hypre_ParCSRCommPkgNumSends     (comm_pkg) = num_sends;
-   hypre_ParCSRCommPkgSendProcs    (comm_pkg) = send_procs;
+   hypre_ParCSRCommPkgNumSends(comm_pkg)      = num_sends;
+   hypre_ParCSRCommPkgSendProcs(comm_pkg)     = send_procs;
    hypre_ParCSRCommPkgSendMapStarts(comm_pkg) = send_map_starts;
-   hypre_ParCSRCommPkgSendMapElmts (comm_pkg) = send_map_elmts;
+   hypre_ParCSRCommPkgSendMapElmts(comm_pkg)  = send_map_elmts;
+
+   /* Set output pointer */
+   *comm_pkg_ptr = comm_pkg;
+
+   return hypre_error_flag;
+}
+
+/*------------------------------------------------------------------
+ * hypre_ParCSRCommPkgUpdateVecStarts
+ *------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ParCSRCommPkgUpdateVecStarts( hypre_ParCSRCommPkg *comm_pkg,
+                                    HYPRE_Int            num_components_in,
+                                    HYPRE_Int            vecstride,
+                                    HYPRE_Int            idxstride )
+{
+   HYPRE_Int     num_components  = hypre_ParCSRCommPkgNumComponents(comm_pkg);
+   HYPRE_Int     num_sends       = hypre_ParCSRCommPkgNumSends(comm_pkg);
+   HYPRE_Int     num_recvs       = hypre_ParCSRCommPkgNumRecvs(comm_pkg);
+   HYPRE_Int    *recv_vec_starts = hypre_ParCSRCommPkgRecvVecStarts(comm_pkg);
+   HYPRE_Int    *send_map_starts = hypre_ParCSRCommPkgSendMapStarts(comm_pkg);
+   HYPRE_Int    *send_map_elmts  = hypre_ParCSRCommPkgSendMapElmts(comm_pkg);
+
+   HYPRE_Int    *send_map_elmts_new;
+
+   HYPRE_Int     i, j;
+
+   hypre_assert(num_components > 0);
+
+   if (num_components_in != num_components)
+   {
+      /* Update number of components in the communication package */
+      hypre_ParCSRCommPkgNumComponents(comm_pkg) = num_components_in;
+
+      /* Allocate send_maps_elmts */
+      send_map_elmts_new = hypre_CTAlloc(HYPRE_Int,
+                                         send_map_starts[num_sends] * num_components_in,
+                                         HYPRE_MEMORY_HOST);
+
+      /* Update send_maps_elmts */
+      if (num_components_in > num_components)
+      {
+         if (num_components == 1)
+         {
+            for (i = 0; i < send_map_starts[num_sends]; i++)
+            {
+               for (j = 0; j < num_components_in; j++)
+               {
+                  send_map_elmts_new[i * num_components_in + j] = send_map_elmts[i] * idxstride +
+                                                                  j * vecstride;
+               }
+            }
+         }
+         else
+         {
+            for (i = 0; i < send_map_starts[num_sends]; i++)
+            {
+               for (j = 0; j < num_components_in; j++)
+               {
+                  send_map_elmts_new[i * num_components_in + j] =
+                     send_map_elmts[i * num_components] * idxstride + j * vecstride;
+               }
+            }
+         }
+      }
+      else
+      {
+         /* num_components_in < num_components */
+         if (num_components_in == 1)
+         {
+            for (i = 0; i < send_map_starts[num_sends]; i++)
+            {
+               send_map_elmts_new[i] = send_map_elmts[i * num_components];
+            }
+         }
+         else
+         {
+            for (i = 0; i < send_map_starts[num_sends]; i++)
+            {
+               for (j = 0; j < num_components_in; j++)
+               {
+                  send_map_elmts_new[i * num_components_in + j] =
+                     send_map_elmts[i * num_components + j];
+               }
+            }
+         }
+      }
+      hypre_ParCSRCommPkgSendMapElmts(comm_pkg) = send_map_elmts_new;
+
+      /* Free memory */
+      hypre_TFree(send_map_elmts, HYPRE_MEMORY_HOST);
+      hypre_TFree(hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg), HYPRE_MEMORY_DEVICE);
+#if defined(HYPRE_USING_GPU) || defined(HYPRE_USING_DEVICE_OPENMP)
+      hypre_CSRMatrixDestroy(hypre_ParCSRCommPkgMatrixE(comm_pkg));
+      hypre_ParCSRCommPkgMatrixE(comm_pkg) = NULL;
+#endif
+
+      /* Update send_map_starts */
+      for (i = 0; i < num_sends + 1; i++)
+      {
+         send_map_starts[i] *= num_components_in / num_components;
+      }
+
+      /* Update recv_vec_starts */
+      for (i = 0; i < num_recvs + 1; i++)
+      {
+         recv_vec_starts[i] *= num_components_in / num_components;
+      }
+   }
 
    return hypre_error_flag;
 }
 
-/* ----------------------------------------------------------------------
+/*------------------------------------------------------------------
  * hypre_MatvecCommPkgCreate
- * generates the comm_pkg for A
- * if no row and/or column partitioning is given, the routine determines
- * them with MPE_Decomp1d
- * ---------------------------------------------------------------------*/
+ *
+ * Generates the communication package for A using assumed partition
+ *------------------------------------------------------------------*/
 
 HYPRE_Int
 hypre_MatvecCommPkgCreate ( hypre_ParCSRMatrix *A )
@@ -932,7 +1191,8 @@ hypre_MatvecCommPkgCreate ( hypre_ParCSRMatrix *A )
    /*-----------------------------------------------------------
     * setup commpkg
     *----------------------------------------------------------*/
-   comm_pkg = hypre_CTAlloc(hypre_ParCSRCommPkg, 1, HYPRE_MEMORY_HOST);
+
+   comm_pkg = hypre_TAlloc(hypre_ParCSRCommPkg, 1, HYPRE_MEMORY_HOST);
    hypre_ParCSRMatrixCommPkg(A) = comm_pkg;
    hypre_ParCSRCommPkgCreateApart( comm, col_map_offd, first_col_diag,
                                    num_cols_offd, global_num_cols,
@@ -944,6 +1204,10 @@ hypre_MatvecCommPkgCreate ( hypre_ParCSRMatrix *A )
    return hypre_error_flag;
 }
 
+/*------------------------------------------------------------------
+ * hypre_MatvecCommPkgDestroy
+ *------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_MatvecCommPkgDestroy( hypre_ParCSRCommPkg *comm_pkg )
 {
@@ -975,12 +1239,10 @@ hypre_MatvecCommPkgDestroy( hypre_ParCSRCommPkg *comm_pkg )
    /* if (hypre_ParCSRCommPkgRecvMPITypes(comm_pkg))
       hypre_TFree(hypre_ParCSRCommPkgRecvMPITypes(comm_pkg), HYPRE_MEMORY_HOST); */
 
-#if defined(HYPRE_USING_GPU)
-   hypre_TFree(hypre_ParCSRCommPkgTmpData(comm_pkg),   HYPRE_MEMORY_DEVICE);
-   hypre_TFree(hypre_ParCSRCommPkgBufData(comm_pkg),   HYPRE_MEMORY_DEVICE);
-   //_hypre_TFree(hypre_ParCSRCommPkgTmpData(comm_pkg), hypre_MEMORY_DEVICE);
-   //_hypre_TFree(hypre_ParCSRCommPkgBufData(comm_pkg), hypre_MEMORY_DEVICE);
-   hypre_TFree(hypre_ParCSRCommPkgWorkSpace(comm_pkg), HYPRE_MEMORY_DEVICE);
+#if defined(HYPRE_USING_GPU) || defined(HYPRE_USING_DEVICE_OPENMP)
+   hypre_TFree(hypre_ParCSRCommPkgTmpData(comm_pkg), HYPRE_MEMORY_DEVICE);
+   hypre_TFree(hypre_ParCSRCommPkgBufData(comm_pkg), HYPRE_MEMORY_DEVICE);
+   hypre_CSRMatrixDestroy(hypre_ParCSRCommPkgMatrixE(comm_pkg));
 #endif
 
    hypre_TFree(comm_pkg, HYPRE_MEMORY_HOST);
@@ -988,11 +1250,16 @@ hypre_MatvecCommPkgDestroy( hypre_ParCSRCommPkg *comm_pkg )
    return hypre_error_flag;
 }
 
-/* AHB 11/06 : alternate to the extend function below - creates a
+/*------------------------------------------------------------------
+ * hypre_ParCSRFindExtendCommPkg
+ *
+ * AHB 11/06 : alternate to the extend function below - creates a
  * second comm pkg based on indices - this makes it easier to use the
  * global partition
+ *
  * RL: renamed and moved it here
- */
+ *------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_ParCSRFindExtendCommPkg(MPI_Comm              comm,
                               HYPRE_BigInt          global_num,
@@ -1004,19 +1271,23 @@ hypre_ParCSRFindExtendCommPkg(MPI_Comm              comm,
                               HYPRE_BigInt         *indices,
                               hypre_ParCSRCommPkg **extend_comm_pkg)
 {
-   /*-----------------------------------------------------------
-    * setup commpkg
-    *----------------------------------------------------------*/
-   hypre_ParCSRCommPkg *new_comm_pkg = hypre_CTAlloc(hypre_ParCSRCommPkg, 1, HYPRE_MEMORY_HOST);
-   *extend_comm_pkg = new_comm_pkg;
+   HYPRE_UNUSED_VAR(local_num);
+   HYPRE_UNUSED_VAR(starts);
+
+   hypre_ParCSRCommPkg *new_comm_pkg = hypre_TAlloc(hypre_ParCSRCommPkg, 1, HYPRE_MEMORY_HOST);
 
    hypre_assert(apart != NULL);
-   hypre_ParCSRCommPkgCreateApart ( comm, indices, my_first, indices_len, global_num, apart,
-                                    new_comm_pkg );
+   hypre_ParCSRCommPkgCreateApart(comm, indices, my_first, indices_len,
+                                  global_num, apart, new_comm_pkg);
+
+   *extend_comm_pkg = new_comm_pkg;
 
    return hypre_error_flag;
 }
 
+/*------------------------------------------------------------------
+ * hypre_BuildCSRMatrixMPIDataType
+ *------------------------------------------------------------------*/
 
 HYPRE_Int
 hypre_BuildCSRMatrixMPIDataType( HYPRE_Int num_nonzeros,
@@ -1031,7 +1302,7 @@ hypre_BuildCSRMatrixMPIDataType( HYPRE_Int num_nonzeros,
    hypre_MPI_Datatype   types[3];
 
    block_lens[0] = num_nonzeros;
-   block_lens[1] = num_rows+1;
+   block_lens[1] = num_rows + 1;
    block_lens[2] = num_nonzeros;
 
    types[0] = HYPRE_MPI_COMPLEX;
@@ -1041,12 +1312,16 @@ hypre_BuildCSRMatrixMPIDataType( HYPRE_Int num_nonzeros,
    hypre_MPI_Address(a_data, &displ[0]);
    hypre_MPI_Address(a_i, &displ[1]);
    hypre_MPI_Address(a_j, &displ[2]);
-   hypre_MPI_Type_struct(3,block_lens,displ,types,csr_matrix_datatype);
+   hypre_MPI_Type_struct(3, block_lens, displ, types, csr_matrix_datatype);
    hypre_MPI_Type_commit(csr_matrix_datatype);
 
    return hypre_error_flag;
 }
 
+/*------------------------------------------------------------------
+ * hypre_BuildCSRMatrixMPIDataType
+ *------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_BuildCSRJDataType( HYPRE_Int num_nonzeros,
                          HYPRE_Complex *a_data,
@@ -1066,7 +1341,7 @@ hypre_BuildCSRJDataType( HYPRE_Int num_nonzeros,
    hypre_MPI_Address(a_data, &displs[0]);
    hypre_MPI_Address(a_j, &displs[1]);
 
-   hypre_MPI_Type_struct(2,block_lens,displs,types,csr_jdata_datatype);
+   hypre_MPI_Type_struct(2, block_lens, displs, types, csr_jdata_datatype);
    hypre_MPI_Type_commit(csr_jdata_datatype);
 
    return hypre_error_flag;
diff --git a/external/hypre/src/parcsr_mv/par_csr_communication.h b/external/hypre/src/parcsr_mv/par_csr_communication.h
index 47b07ec9..50fa4cb4 100644
--- a/external/hypre/src/parcsr_mv/par_csr_communication.h
+++ b/external/hypre/src/parcsr_mv/par_csr_communication.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -50,31 +50,27 @@ typedef hypre_ParCSRCommHandle hypre_ParCSRPersistentCommHandle;
 
 typedef struct _hypre_ParCSRCommPkg
 {
-   MPI_Comm                     comm;
-
-   HYPRE_Int                    num_sends;
-   HYPRE_Int                   *send_procs;
-   HYPRE_Int                   *send_map_starts;
-   HYPRE_Int                   *send_map_elmts;
-   HYPRE_Int                   *device_send_map_elmts;
-
-   HYPRE_Int                    num_recvs;
-   HYPRE_Int                   *recv_procs;
-   HYPRE_Int                   *recv_vec_starts;
-
+   MPI_Comm                          comm;
+   HYPRE_Int                         num_components;
+   HYPRE_Int                         num_sends;
+   HYPRE_Int                        *send_procs;
+   HYPRE_Int                        *send_map_starts;
+   HYPRE_Int                        *send_map_elmts;
+   HYPRE_Int                        *device_send_map_elmts;
+   HYPRE_Int                         num_recvs;
+   HYPRE_Int                        *recv_procs;
+   HYPRE_Int                        *recv_vec_starts;
    /* remote communication information */
-   hypre_MPI_Datatype          *send_mpi_types;
-   hypre_MPI_Datatype          *recv_mpi_types;
-
+   hypre_MPI_Datatype               *send_mpi_types;
+   hypre_MPI_Datatype               *recv_mpi_types;
 #ifdef HYPRE_USING_PERSISTENT_COMM
    hypre_ParCSRPersistentCommHandle *persistent_comm_handles[NUM_OF_COMM_PKG_JOB_TYPE];
 #endif
-
+#if defined(HYPRE_USING_GPU) || defined(HYPRE_USING_DEVICE_OPENMP)
    /* temporary memory for matvec. cudaMalloc is expensive. alloc once and reuse */
-#if defined(HYPRE_USING_GPU)
-   HYPRE_Complex *tmp_data;
-   HYPRE_Complex *buf_data;
-   char          *work_space;
+   HYPRE_Complex                    *tmp_data;
+   HYPRE_Complex                    *buf_data;
+   hypre_CSRMatrix                  *matrix_E; /* for matvecT */
 #endif
 } hypre_ParCSRCommPkg;
 
@@ -83,6 +79,7 @@ typedef struct _hypre_ParCSRCommPkg
  *--------------------------------------------------------------------------*/
 
 #define hypre_ParCSRCommPkgComm(comm_pkg)                (comm_pkg -> comm)
+#define hypre_ParCSRCommPkgNumComponents(comm_pkg)       (comm_pkg -> num_components)
 #define hypre_ParCSRCommPkgNumSends(comm_pkg)            (comm_pkg -> num_sends)
 #define hypre_ParCSRCommPkgSendProcs(comm_pkg)           (comm_pkg -> send_procs)
 #define hypre_ParCSRCommPkgSendProc(comm_pkg, i)         (comm_pkg -> send_procs[i])
@@ -102,25 +99,34 @@ typedef struct _hypre_ParCSRCommPkg
 #define hypre_ParCSRCommPkgRecvMPITypes(comm_pkg)        (comm_pkg -> recv_mpi_types)
 #define hypre_ParCSRCommPkgRecvMPIType(comm_pkg,i)       (comm_pkg -> recv_mpi_types[i])
 
-#if defined(HYPRE_USING_GPU)
+#if defined(HYPRE_USING_GPU) || defined(HYPRE_USING_DEVICE_OPENMP)
 #define hypre_ParCSRCommPkgTmpData(comm_pkg)             ((comm_pkg) -> tmp_data)
 #define hypre_ParCSRCommPkgBufData(comm_pkg)             ((comm_pkg) -> buf_data)
-#define hypre_ParCSRCommPkgWorkSpace(comm_pkg)           ((comm_pkg) -> work_space)
+#define hypre_ParCSRCommPkgMatrixE(comm_pkg)             ((comm_pkg) -> matrix_E)
 #endif
 
-static inline void
+static inline HYPRE_MAYBE_UNUSED_FUNC void
 hypre_ParCSRCommPkgCopySendMapElmtsToDevice(hypre_ParCSRCommPkg *comm_pkg)
 {
-#if defined(HYPRE_USING_GPU)
+#if defined(HYPRE_USING_GPU) || defined(HYPRE_USING_DEVICE_OPENMP)
+   HYPRE_Int num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
+
    if (hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg) == NULL)
    {
       hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg) =
-         hypre_TAlloc(HYPRE_Int, hypre_ParCSRCommPkgSendMapStart(comm_pkg, hypre_ParCSRCommPkgNumSends(comm_pkg)), HYPRE_MEMORY_DEVICE);
-
-      hypre_TMemcpy(hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg), hypre_ParCSRCommPkgSendMapElmts(comm_pkg),
-                    HYPRE_Int, hypre_ParCSRCommPkgSendMapStart(comm_pkg, hypre_ParCSRCommPkgNumSends(comm_pkg)),
-                    HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
+         hypre_TAlloc(HYPRE_Int,
+                      hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                      HYPRE_MEMORY_DEVICE);
+
+      hypre_TMemcpy(hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg),
+                    hypre_ParCSRCommPkgSendMapElmts(comm_pkg),
+                    HYPRE_Int,
+                    hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                    HYPRE_MEMORY_DEVICE,
+                    HYPRE_MEMORY_HOST);
    }
+#else
+   HYPRE_UNUSED_VAR(comm_pkg);
 #endif
 }
 
diff --git a/external/hypre/src/parcsr_mv/par_csr_fffc_device.c b/external/hypre/src/parcsr_mv/par_csr_fffc_device.c
index 83f1f0e4..8ab72672 100644
--- a/external/hypre/src/parcsr_mv/par_csr_fffc_device.c
+++ b/external/hypre/src/parcsr_mv/par_csr_fffc_device.c
@@ -1,23 +1,31 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
  ******************************************************************************/
 
+#include "_hypre_onedpl.hpp"
 #include "_hypre_utilities.h"
 #include "_hypre_parcsr_mv.h"
 #include "_hypre_utilities.hpp"
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
+
+#if defined(HYPRE_USING_SYCL)
+namespace thrust = std;
+#endif
 
 typedef thrust::tuple<HYPRE_Int, HYPRE_Int> Tuple;
-//typedef thrust::tuple<HYPRE_Int, HYPRE_Int, HYPRe_Int> Tuple3;
 
 /* transform from local F/C index to global F/C index,
  * where F index "x" are saved as "-x-1"
  */
+#if (defined(THRUST_VERSION) && THRUST_VERSION < 101000)
 struct FFFC_functor : public thrust::unary_function<Tuple, HYPRE_BigInt>
+#else
+struct FFFC_functor
+#endif
 {
    HYPRE_BigInt CF_first[2];
 
@@ -33,14 +41,18 @@ struct FFFC_functor : public thrust::unary_function<Tuple, HYPRE_BigInt>
       const HYPRE_Int local_idx = thrust::get<0>(t);
       const HYPRE_Int cf_marker = thrust::get<1>(t);
       const HYPRE_Int s = cf_marker < 0;
-      const HYPRE_Int m = 1 - 2*s;
-      return m*(local_idx + CF_first[s] + s);
+      const HYPRE_Int m = 1 - 2 * s;
+      return m * (local_idx + CF_first[s] + s);
    }
 };
 
 /* this predicate selects A^s_{FF} */
 template<typename T>
+#if (defined(THRUST_VERSION) && THRUST_VERSION < 101000)
 struct FF_pred : public thrust::unary_function<Tuple, bool>
+#else
+struct FF_pred
+#endif
 {
    HYPRE_Int  option;
    HYPRE_Int *row_CF_marker;
@@ -62,19 +74,23 @@ struct FF_pred : public thrust::unary_function<Tuple, bool>
       if (option == 1)
       {
          /* A_{F,F} */
-         return row_CF_marker[i] <   0 && (j == -2 || j >= 0 && col_CF_marker[j] < 0);
+         return row_CF_marker[i] <   0 && (j == -2 || (j >= 0 && col_CF_marker[j] < 0));
       }
       else
       {
          /* A_{F2, F} */
-         return row_CF_marker[i] == -2 && (j == -2 || j >= 0 && col_CF_marker[j] < 0);
+         return row_CF_marker[i] == -2 && (j == -2 || (j >= 0 && col_CF_marker[j] < 0));
       }
    }
 };
 
 /* this predicate selects A^s_{FC} */
 template<typename T>
+#if (defined(THRUST_VERSION) && THRUST_VERSION < 101000)
+struct FC_pred
+#else
 struct FC_pred : public thrust::unary_function<Tuple, bool>
+#endif
 {
    HYPRE_Int *row_CF_marker;
    T         *col_CF_marker;
@@ -97,7 +113,11 @@ struct FC_pred : public thrust::unary_function<Tuple, bool>
 
 /* this predicate selects A^s_{CF} */
 template<typename T>
+#if (defined(THRUST_VERSION) && THRUST_VERSION < 101000)
 struct CF_pred : public thrust::unary_function<Tuple, bool>
+#else
+struct CF_pred
+#endif
 {
    HYPRE_Int *row_CF_marker;
    T         *col_CF_marker;
@@ -120,7 +140,11 @@ struct CF_pred : public thrust::unary_function<Tuple, bool>
 
 /* this predicate selects A^s_{CC} */
 template<typename T>
+#if (defined(THRUST_VERSION) && THRUST_VERSION < 101000)
 struct CC_pred : public thrust::unary_function<Tuple, bool>
+#else
+struct CC_pred
+#endif
 {
    HYPRE_Int *row_CF_marker;
    T         *col_CF_marker;
@@ -137,12 +161,16 @@ struct CC_pred : public thrust::unary_function<Tuple, bool>
       const HYPRE_Int i = thrust::get<0>(t);
       const HYPRE_Int j = thrust::get<1>(t);
 
-      return row_CF_marker[i] >= 0 && (j == -2 || j >= 0 && col_CF_marker[j] >= 0);
+      return row_CF_marker[i] >= 0 && (j == -2 || (j >= 0 && col_CF_marker[j] >= 0));
    }
 };
 
 /* this predicate selects A^s_{C,:} */
+#if (defined(THRUST_VERSION) && THRUST_VERSION < 101000)
 struct CX_pred : public thrust::unary_function<Tuple, bool>
+#else
+struct CX_pred
+#endif
 {
    HYPRE_Int *row_CF_marker;
 
@@ -163,7 +191,11 @@ struct CX_pred : public thrust::unary_function<Tuple, bool>
 
 /* this predicate selects A^s_{:,C} */
 template<typename T>
+#if (defined(THRUST_VERSION) && THRUST_VERSION < 101000)
 struct XC_pred : public thrust::unary_function<Tuple, bool>
+#else
+struct XC_pred
+#endif
 {
    T         *col_CF_marker;
 
@@ -211,6 +243,10 @@ hypre_ParCSRMatrixGenerateFFFCDevice_core( hypre_ParCSRMatrix  *A,
                                            HYPRE_Int            option )
 {
    MPI_Comm                 comm     = hypre_ParCSRMatrixComm(A);
+   if (!hypre_ParCSRMatrixCommPkg(A))
+   {
+      hypre_MatvecCommPkgCreate(A);
+   }
    hypre_ParCSRCommPkg     *comm_pkg = hypre_ParCSRMatrixCommPkg(A);
    hypre_ParCSRCommHandle  *comm_handle;
    HYPRE_Int                num_sends     = hypre_ParCSRCommPkgNumSends(comm_pkg);
@@ -236,26 +272,27 @@ hypre_ParCSRMatrixGenerateFFFCDevice_core( hypre_ParCSRMatrix  *A,
    HYPRE_Int           my_id, num_procs;
    /* nF and nC */
    HYPRE_Int           n_local, nF_local, nC_local, nF2_local = 0;
-   HYPRE_BigInt       *fpts_starts, *row_starts, *f2pts_starts = NULL;
+   HYPRE_BigInt        fpts_starts[2], *row_starts, f2pts_starts[2];
    HYPRE_BigInt        nF_global, nC_global, nF2_global = 0;
    HYPRE_BigInt        F_first, C_first;
    /* work arrays */
    HYPRE_Int          *map2FC, *map2F2 = NULL, *itmp, *A_diag_ii, *A_offd_ii, *offd_mark;
    HYPRE_BigInt       *send_buf, *recv_buf;
 
+   hypre_GpuProfilingPushRange("ParCSRMatrixGenerateFFFC");
+
    hypre_MPI_Comm_size(comm, &num_procs);
    hypre_MPI_Comm_rank(comm, &my_id);
 
    n_local    = hypre_ParCSRMatrixNumRows(A);
    row_starts = hypre_ParCSRMatrixRowStarts(A);
 
-   if (my_id == (num_procs -1))
+   if (my_id == (num_procs - 1))
    {
       nC_global = cpts_starts[1];
    }
-   hypre_MPI_Bcast(&nC_global, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
+   hypre_MPI_Bcast(&nC_global, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
    nC_local = (HYPRE_Int) (cpts_starts[1] - cpts_starts[0]);
-   fpts_starts = hypre_TAlloc(HYPRE_BigInt, 2, HYPRE_MEMORY_HOST);
    fpts_starts[0] = row_starts[0] - cpts_starts[0];
    fpts_starts[1] = row_starts[1] - cpts_starts[1];
    F_first = fpts_starts[0];
@@ -269,24 +306,50 @@ hypre_ParCSRMatrixGenerateFFFCDevice_core( hypre_ParCSRMatrix  *A,
 
    if (option == 2)
    {
+#if defined(HYPRE_USING_SYCL)
+      nF2_local = HYPRE_ONEDPL_CALL( std::count,
+                                     CF_marker,
+                                     CF_marker + n_local,
+                                     -2 );
+#else
       nF2_local = HYPRE_THRUST_CALL( count,
                                      CF_marker,
                                      CF_marker + n_local,
                                      -2 );
+#endif
 
       HYPRE_BigInt nF2_local_big = nF2_local;
 
-      f2pts_starts = hypre_TAlloc(HYPRE_BigInt, 2, HYPRE_MEMORY_HOST);
       hypre_MPI_Scan(&nF2_local_big, f2pts_starts + 1, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
       f2pts_starts[0] = f2pts_starts[1] - nF2_local_big;
-      if (my_id == (num_procs -1))
+      if (my_id == (num_procs - 1))
       {
          nF2_global = f2pts_starts[1];
       }
-      hypre_MPI_Bcast(&nF2_global, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
+      hypre_MPI_Bcast(&nF2_global, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
    }
 
    /* map from all points (i.e, F+C) to F/C indices */
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_ONEDPL_CALL( std::exclusive_scan,
+                      oneapi::dpl::make_transform_iterator(CF_marker,           is_negative<HYPRE_Int>()),
+                      oneapi::dpl::make_transform_iterator(CF_marker + n_local, is_negative<HYPRE_Int>()),
+                      map2FC, /* F */
+                      HYPRE_Int(0) );
+
+   HYPRE_ONEDPL_CALL( std::exclusive_scan,
+                      oneapi::dpl::make_transform_iterator(CF_marker,           is_nonnegative<HYPRE_Int>()),
+                      oneapi::dpl::make_transform_iterator(CF_marker + n_local, is_nonnegative<HYPRE_Int>()),
+                      itmp, /* C */
+                      HYPRE_Int(0) );
+
+   hypreSycl_scatter_if( itmp,
+                         itmp + n_local,
+                         oneapi::dpl::counting_iterator<HYPRE_Int>(0),
+                         CF_marker,
+                         map2FC,
+                         is_nonnegative<HYPRE_Int>() ); /* FC combined */
+#else
    HYPRE_THRUST_CALL( exclusive_scan,
                       thrust::make_transform_iterator(CF_marker,           is_negative<HYPRE_Int>()),
                       thrust::make_transform_iterator(CF_marker + n_local, is_negative<HYPRE_Int>()),
@@ -305,17 +368,26 @@ hypre_ParCSRMatrixGenerateFFFCDevice_core( hypre_ParCSRMatrix  *A,
                       thrust::counting_iterator<HYPRE_Int>(0),
                       thrust::make_transform_iterator(CF_marker, is_nonnegative<HYPRE_Int>()),
                       map2FC ); /* FC combined */
+#endif
 
    hypre_TFree(itmp, HYPRE_MEMORY_DEVICE);
 
    if (option == 2)
    {
       map2F2 = hypre_TAlloc(HYPRE_Int, n_local, HYPRE_MEMORY_DEVICE);
+#if defined(HYPRE_USING_SYCL)
+      HYPRE_ONEDPL_CALL( std::exclusive_scan,
+                         oneapi::dpl::make_transform_iterator(CF_marker,           equal<HYPRE_Int>(-2)),
+                         oneapi::dpl::make_transform_iterator(CF_marker + n_local, equal<HYPRE_Int>(-2)),
+                         map2F2, /* F2 */
+                         HYPRE_Int(0) ); /* *MUST* pass init value since input and output types diff. */
+#else
       HYPRE_THRUST_CALL( exclusive_scan,
                          thrust::make_transform_iterator(CF_marker,           equal<HYPRE_Int>(-2)),
                          thrust::make_transform_iterator(CF_marker + n_local, equal<HYPRE_Int>(-2)),
                          map2F2, /* F2 */
                          HYPRE_Int(0) ); /* *MUST* pass init value since input and output types diff. */
+#endif
    }
 
    /* send_buf: global F/C indices. Note F-pts "x" are saved as "-x-1" */
@@ -324,19 +396,35 @@ hypre_ParCSRMatrixGenerateFFFCDevice_core( hypre_ParCSRMatrix  *A,
    hypre_ParCSRCommPkgCopySendMapElmtsToDevice(comm_pkg);
 
    FFFC_functor functor(F_first, C_first);
+#if defined(HYPRE_USING_SYCL)
+   hypreSycl_gather( hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg),
+                     hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg) + num_elem_send,
+                     oneapi::dpl::make_transform_iterator(
+                        oneapi::dpl::make_zip_iterator(map2FC, CF_marker), functor),
+                     send_buf );
+#else
    HYPRE_THRUST_CALL( gather,
                       hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg),
                       hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg) + num_elem_send,
-                      thrust::make_transform_iterator(thrust::make_zip_iterator(thrust::make_tuple(map2FC, CF_marker)), functor),
+                      thrust::make_transform_iterator(thrust::make_zip_iterator(thrust::make_tuple(map2FC, CF_marker)),
+                                                      functor),
                       send_buf );
+#endif
 
-   comm_handle = hypre_ParCSRCommHandleCreate_v2(21, comm_pkg, HYPRE_MEMORY_DEVICE, send_buf, HYPRE_MEMORY_DEVICE, recv_buf);
+#if defined(HYPRE_USING_THRUST_NOSYNC)
+   /* RL: make sure send_buf is ready before issuing GPU-GPU MPI */
+   if (hypre_GetGpuAwareMPI())
+   {
+      hypre_ForceSyncComputeStream();
+   }
+#endif
+
+   comm_handle = hypre_ParCSRCommHandleCreate_v2(21, comm_pkg, HYPRE_MEMORY_DEVICE, send_buf,
+                                                 HYPRE_MEMORY_DEVICE, recv_buf);
    hypre_ParCSRCommHandleDestroy(comm_handle);
 
    hypre_TFree(send_buf, HYPRE_MEMORY_DEVICE);
 
-   thrust::zip_iterator< thrust::tuple<HYPRE_Int*, HYPRE_Int*, HYPRE_Complex*> > new_end;
-
    A_diag_ii = hypre_TAlloc(HYPRE_Int, A_diag_nnz,      HYPRE_MEMORY_DEVICE);
    A_offd_ii = hypre_TAlloc(HYPRE_Int, A_offd_nnz,      HYPRE_MEMORY_DEVICE);
    offd_mark = hypre_TAlloc(HYPRE_Int, num_cols_A_offd, HYPRE_MEMORY_DEVICE);
@@ -358,22 +446,50 @@ hypre_ParCSRMatrixGenerateFFFCDevice_core( hypre_ParCSRMatrix  *A,
 
       /* AFF Diag */
       FF_pred<HYPRE_Int> AFF_pred_diag(option, CF_marker, CF_marker);
+#if defined(HYPRE_USING_SYCL)
+      AFF_diag_nnz = HYPRE_ONEDPL_CALL( std::count_if,
+                                        oneapi::dpl::make_zip_iterator(A_diag_ii, Soc_diag_j),
+                                        oneapi::dpl::make_zip_iterator(A_diag_ii, Soc_diag_j) + A_diag_nnz,
+                                        AFF_pred_diag );
+#else
       AFF_diag_nnz = HYPRE_THRUST_CALL( count_if,
                                         thrust::make_zip_iterator(thrust::make_tuple(A_diag_ii, Soc_diag_j)),
                                         thrust::make_zip_iterator(thrust::make_tuple(A_diag_ii, Soc_diag_j)) + A_diag_nnz,
                                         AFF_pred_diag );
+#endif
 
       AFF_diag_ii = hypre_TAlloc(HYPRE_Int,     AFF_diag_nnz, HYPRE_MEMORY_DEVICE);
       AFF_diag_j  = hypre_TAlloc(HYPRE_Int,     AFF_diag_nnz, HYPRE_MEMORY_DEVICE);
       AFF_diag_a  = hypre_TAlloc(HYPRE_Complex, AFF_diag_nnz, HYPRE_MEMORY_DEVICE);
 
+#if defined(HYPRE_USING_SYCL)
       /* Notice that we cannot use Soc_diag_j in the first two arguments since the diagonal is marked as -2 */
-      new_end = HYPRE_THRUST_CALL( copy_if,
-                                   thrust::make_zip_iterator(thrust::make_tuple(A_diag_ii, A_diag_j, A_diag_a)),
-                                   thrust::make_zip_iterator(thrust::make_tuple(A_diag_ii, A_diag_j, A_diag_a)) + A_diag_nnz,
-                                   thrust::make_zip_iterator(thrust::make_tuple(A_diag_ii, Soc_diag_j)),
-                                   thrust::make_zip_iterator(thrust::make_tuple(AFF_diag_ii, AFF_diag_j, AFF_diag_a)),
-                                   AFF_pred_diag );
+      auto new_end = hypreSycl_copy_if( oneapi::dpl::make_zip_iterator(A_diag_ii, A_diag_j, A_diag_a),
+                                        oneapi::dpl::make_zip_iterator(A_diag_ii, A_diag_j, A_diag_a) + A_diag_nnz,
+                                        oneapi::dpl::make_zip_iterator(A_diag_ii, Soc_diag_j),
+                                        oneapi::dpl::make_zip_iterator(AFF_diag_ii, AFF_diag_j, AFF_diag_a),
+                                        AFF_pred_diag );
+
+      hypre_assert( std::get<0>(new_end.base()) == AFF_diag_ii + AFF_diag_nnz );
+
+      hypreSycl_gather( AFF_diag_j,
+                        AFF_diag_j + AFF_diag_nnz,
+                        map2FC,
+                        AFF_diag_j );
+
+      hypreSycl_gather( AFF_diag_ii,
+                        AFF_diag_ii + AFF_diag_nnz,
+                        option == 1 ? map2FC : map2F2,
+                        AFF_diag_ii );
+
+#else
+      /* Notice that we cannot use Soc_diag_j in the first two arguments since the diagonal is marked as -2 */
+      auto new_end = HYPRE_THRUST_CALL( copy_if,
+                                        thrust::make_zip_iterator(thrust::make_tuple(A_diag_ii, A_diag_j, A_diag_a)),
+                                        thrust::make_zip_iterator(thrust::make_tuple(A_diag_ii, A_diag_j, A_diag_a)) + A_diag_nnz,
+                                        thrust::make_zip_iterator(thrust::make_tuple(A_diag_ii, Soc_diag_j)),
+                                        thrust::make_zip_iterator(thrust::make_tuple(AFF_diag_ii, AFF_diag_j, AFF_diag_a)),
+                                        AFF_pred_diag );
 
       hypre_assert( thrust::get<0>(new_end.get_iterator_tuple()) == AFF_diag_ii + AFF_diag_nnz );
 
@@ -388,21 +504,44 @@ hypre_ParCSRMatrixGenerateFFFCDevice_core( hypre_ParCSRMatrix  *A,
                           AFF_diag_ii + AFF_diag_nnz,
                           option == 1 ? map2FC : map2F2,
                           AFF_diag_ii );
+#endif
 
-      AFF_diag_i = hypreDevice_CsrRowIndicesToPtrs(option == 1 ? nF_local : nF2_local, AFF_diag_nnz, AFF_diag_ii);
+      AFF_diag_i = hypreDevice_CsrRowIndicesToPtrs(option == 1 ? nF_local : nF2_local, AFF_diag_nnz,
+                                                   AFF_diag_ii);
       hypre_TFree(AFF_diag_ii, HYPRE_MEMORY_DEVICE);
 
       /* AFF Offd */
       FF_pred<HYPRE_BigInt> AFF_pred_offd(option, CF_marker, recv_buf);
+#if defined(HYPRE_USING_SYCL)
+      AFF_offd_nnz = HYPRE_ONEDPL_CALL( std::count_if,
+                                        oneapi::dpl::make_zip_iterator(A_offd_ii, Soc_offd_j),
+                                        oneapi::dpl::make_zip_iterator(A_offd_ii, Soc_offd_j) + A_offd_nnz,
+                                        AFF_pred_offd );
+#else
       AFF_offd_nnz = HYPRE_THRUST_CALL( count_if,
                                         thrust::make_zip_iterator(thrust::make_tuple(A_offd_ii, Soc_offd_j)),
                                         thrust::make_zip_iterator(thrust::make_tuple(A_offd_ii, Soc_offd_j)) + A_offd_nnz,
                                         AFF_pred_offd );
+#endif
 
       AFF_offd_ii = hypre_TAlloc(HYPRE_Int,     AFF_offd_nnz, HYPRE_MEMORY_DEVICE);
       AFF_offd_j  = hypre_TAlloc(HYPRE_Int,     AFF_offd_nnz, HYPRE_MEMORY_DEVICE);
       AFF_offd_a  = hypre_TAlloc(HYPRE_Complex, AFF_offd_nnz, HYPRE_MEMORY_DEVICE);
 
+#if defined(HYPRE_USING_SYCL)
+      new_end = hypreSycl_copy_if( oneapi::dpl::make_zip_iterator(A_offd_ii, Soc_offd_j, A_offd_a),
+                                   oneapi::dpl::make_zip_iterator(A_offd_ii, Soc_offd_j, A_offd_a) + A_offd_nnz,
+                                   oneapi::dpl::make_zip_iterator(A_offd_ii, Soc_offd_j),
+                                   oneapi::dpl::make_zip_iterator(AFF_offd_ii, AFF_offd_j, AFF_offd_a),
+                                   AFF_pred_offd );
+
+      hypre_assert( std::get<0>(new_end.base()) == AFF_offd_ii + AFF_offd_nnz );
+
+      hypreSycl_gather( AFF_offd_ii,
+                        AFF_offd_ii + AFF_offd_nnz,
+                        option == 1 ? map2FC : map2F2,
+                        AFF_offd_ii );
+#else
       new_end = HYPRE_THRUST_CALL( copy_if,
                                    thrust::make_zip_iterator(thrust::make_tuple(A_offd_ii, Soc_offd_j, A_offd_a)),
                                    thrust::make_zip_iterator(thrust::make_tuple(A_offd_ii, Soc_offd_j, A_offd_a)) + A_offd_nnz,
@@ -417,25 +556,60 @@ hypre_ParCSRMatrixGenerateFFFCDevice_core( hypre_ParCSRMatrix  *A,
                           AFF_offd_ii + AFF_offd_nnz,
                           option == 1 ? map2FC : map2F2,
                           AFF_offd_ii );
+#endif
 
-      AFF_offd_i = hypreDevice_CsrRowIndicesToPtrs(option == 1 ? nF_local : nF2_local, AFF_offd_nnz, AFF_offd_ii);
+      AFF_offd_i = hypreDevice_CsrRowIndicesToPtrs(option == 1 ? nF_local : nF2_local, AFF_offd_nnz,
+                                                   AFF_offd_ii);
       hypre_TFree(AFF_offd_ii, HYPRE_MEMORY_DEVICE);
 
       /* col_map_offd_AFF */
-      HYPRE_Int *tmp_j = hypre_TAlloc(HYPRE_Int, hypre_max(AFF_offd_nnz, num_cols_A_offd), HYPRE_MEMORY_DEVICE);
+      HYPRE_Int *tmp_j = hypre_TAlloc(HYPRE_Int, hypre_max(AFF_offd_nnz, num_cols_A_offd),
+                                      HYPRE_MEMORY_DEVICE);
       hypre_TMemcpy(tmp_j, AFF_offd_j, HYPRE_Int, AFF_offd_nnz, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
-      HYPRE_THRUST_CALL( sort,
+#if defined(HYPRE_USING_SYCL)
+      HYPRE_ONEDPL_CALL( std::sort,
                          tmp_j,
                          tmp_j + AFF_offd_nnz );
-      HYPRE_Int *tmp_end = HYPRE_THRUST_CALL( unique,
+      HYPRE_Int *tmp_end = HYPRE_ONEDPL_CALL( std::unique,
                                               tmp_j,
                                               tmp_j + AFF_offd_nnz );
       num_cols_AFF_offd = tmp_end - tmp_j;
-      HYPRE_THRUST_CALL( fill_n,
+      HYPRE_ONEDPL_CALL( std::fill_n,
                          offd_mark,
                          num_cols_A_offd,
                          0 );
-      hypreDevice_ScatterConstant(offd_mark, num_cols_AFF_offd, tmp_j, 1);
+      hypreDevice_ScatterConstant(offd_mark, num_cols_AFF_offd, tmp_j, (HYPRE_Int) 1);
+      HYPRE_ONEDPL_CALL( std::exclusive_scan,
+                         offd_mark,
+                         offd_mark + num_cols_A_offd,
+                         tmp_j,
+                         0 );
+      hypreSycl_gather( AFF_offd_j,
+                        AFF_offd_j + AFF_offd_nnz,
+                        tmp_j,
+                        AFF_offd_j );
+      col_map_offd_AFF = hypre_TAlloc(HYPRE_BigInt, num_cols_AFF_offd, HYPRE_MEMORY_DEVICE);
+      HYPRE_BigInt *tmp_end_big = hypreSycl_copy_if( recv_buf,
+                                                     recv_buf + num_cols_A_offd,
+                                                     offd_mark,
+                                                     col_map_offd_AFF,
+      [] (const auto & x) {return x;} );
+      HYPRE_ONEDPL_CALL( std::transform,
+                         col_map_offd_AFF,
+                         col_map_offd_AFF + num_cols_AFF_offd,
+                         col_map_offd_AFF,
+      [] (auto const & x) { return -x - 1; } );
+      hypre_assert(tmp_end_big - col_map_offd_AFF == num_cols_AFF_offd);
+#else
+      HYPRE_THRUST_CALL( sort,
+                         tmp_j,
+                         tmp_j + AFF_offd_nnz );
+      HYPRE_Int *tmp_end = HYPRE_THRUST_CALL( unique,
+                                              tmp_j,
+                                              tmp_j + AFF_offd_nnz );
+      num_cols_AFF_offd = tmp_end - tmp_j;
+      hypreDevice_IntFilln( offd_mark, num_cols_A_offd, 0 );
+      hypreDevice_ScatterConstant(offd_mark, num_cols_AFF_offd, tmp_j, (HYPRE_Int) 1);
       HYPRE_THRUST_CALL( exclusive_scan,
                          offd_mark,
                          offd_mark + num_cols_A_offd,
@@ -447,12 +621,13 @@ hypre_ParCSRMatrixGenerateFFFCDevice_core( hypre_ParCSRMatrix  *A,
                          AFF_offd_j );
       col_map_offd_AFF = hypre_TAlloc(HYPRE_BigInt, num_cols_AFF_offd, HYPRE_MEMORY_DEVICE);
       HYPRE_BigInt *tmp_end_big = HYPRE_THRUST_CALL( copy_if,
-                                                     thrust::make_transform_iterator(recv_buf, -_1-1),
-                                                     thrust::make_transform_iterator(recv_buf, -_1-1) + num_cols_A_offd,
+                                                     thrust::make_transform_iterator(recv_buf, -_1 - 1),
+                                                     thrust::make_transform_iterator(recv_buf, -_1 - 1) + num_cols_A_offd,
                                                      offd_mark,
                                                      col_map_offd_AFF,
                                                      thrust::identity<HYPRE_Int>() );
       hypre_assert(tmp_end_big - col_map_offd_AFF == num_cols_AFF_offd);
+#endif
       hypre_TFree(tmp_j, HYPRE_MEMORY_DEVICE);
 
       AFF = hypre_ParCSRMatrixCreate(comm,
@@ -478,7 +653,8 @@ hypre_ParCSRMatrixGenerateFFFCDevice_core( hypre_ParCSRMatrix  *A,
       hypre_CSRMatrixMemoryLocation(AFF_offd) = HYPRE_MEMORY_DEVICE;
 
       hypre_ParCSRMatrixDeviceColMapOffd(AFF) = col_map_offd_AFF;
-      hypre_ParCSRMatrixColMapOffd(AFF) = hypre_TAlloc(HYPRE_BigInt, num_cols_AFF_offd, HYPRE_MEMORY_HOST);
+      hypre_ParCSRMatrixColMapOffd(AFF) = hypre_TAlloc(HYPRE_BigInt, num_cols_AFF_offd,
+                                                       HYPRE_MEMORY_HOST);
       hypre_TMemcpy(hypre_ParCSRMatrixColMapOffd(AFF), col_map_offd_AFF, HYPRE_BigInt, num_cols_AFF_offd,
                     HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
 
@@ -503,21 +679,47 @@ hypre_ParCSRMatrixGenerateFFFCDevice_core( hypre_ParCSRMatrix  *A,
 
       /* AFC Diag */
       FC_pred<HYPRE_Int> AFC_pred_diag(CF_marker, CF_marker);
+#if defined(HYPRE_USING_SYCL)
+      AFC_diag_nnz = HYPRE_ONEDPL_CALL( std::count_if,
+                                        oneapi::dpl::make_zip_iterator(A_diag_ii, Soc_diag_j),
+                                        oneapi::dpl::make_zip_iterator(A_diag_ii, Soc_diag_j) + A_diag_nnz,
+                                        AFC_pred_diag );
+#else
       AFC_diag_nnz = HYPRE_THRUST_CALL( count_if,
                                         thrust::make_zip_iterator(thrust::make_tuple(A_diag_ii, Soc_diag_j)),
                                         thrust::make_zip_iterator(thrust::make_tuple(A_diag_ii, Soc_diag_j)) + A_diag_nnz,
                                         AFC_pred_diag );
+#endif
 
       AFC_diag_ii = hypre_TAlloc(HYPRE_Int,     AFC_diag_nnz, HYPRE_MEMORY_DEVICE);
       AFC_diag_j  = hypre_TAlloc(HYPRE_Int,     AFC_diag_nnz, HYPRE_MEMORY_DEVICE);
       AFC_diag_a  = hypre_TAlloc(HYPRE_Complex, AFC_diag_nnz, HYPRE_MEMORY_DEVICE);
 
-      new_end = HYPRE_THRUST_CALL( copy_if,
-                                   thrust::make_zip_iterator(thrust::make_tuple(A_diag_ii, Soc_diag_j, A_diag_a)),
-                                   thrust::make_zip_iterator(thrust::make_tuple(A_diag_ii, Soc_diag_j, A_diag_a)) + A_diag_nnz,
-                                   thrust::make_zip_iterator(thrust::make_tuple(A_diag_ii, Soc_diag_j)),
-                                   thrust::make_zip_iterator(thrust::make_tuple(AFC_diag_ii, AFC_diag_j, AFC_diag_a)),
-                                   AFC_pred_diag );
+#if defined(HYPRE_USING_SYCL)
+      auto new_end = hypreSycl_copy_if( oneapi::dpl::make_zip_iterator(A_diag_ii, Soc_diag_j, A_diag_a),
+                                        oneapi::dpl::make_zip_iterator(A_diag_ii, Soc_diag_j, A_diag_a) + A_diag_nnz,
+                                        oneapi::dpl::make_zip_iterator(A_diag_ii, Soc_diag_j),
+                                        oneapi::dpl::make_zip_iterator(AFC_diag_ii, AFC_diag_j, AFC_diag_a),
+                                        AFC_pred_diag );
+
+      hypre_assert( std::get<0>(new_end.base()) == AFC_diag_ii + AFC_diag_nnz );
+
+      hypreSycl_gather( AFC_diag_j,
+                        AFC_diag_j + AFC_diag_nnz,
+                        map2FC,
+                        AFC_diag_j );
+
+      hypreSycl_gather( AFC_diag_ii,
+                        AFC_diag_ii + AFC_diag_nnz,
+                        map2FC,
+                        AFC_diag_ii );
+#else
+      auto new_end = HYPRE_THRUST_CALL( copy_if,
+                                        thrust::make_zip_iterator(thrust::make_tuple(A_diag_ii, Soc_diag_j, A_diag_a)),
+                                        thrust::make_zip_iterator(thrust::make_tuple(A_diag_ii, Soc_diag_j, A_diag_a)) + A_diag_nnz,
+                                        thrust::make_zip_iterator(thrust::make_tuple(A_diag_ii, Soc_diag_j)),
+                                        thrust::make_zip_iterator(thrust::make_tuple(AFC_diag_ii, AFC_diag_j, AFC_diag_a)),
+                                        AFC_pred_diag );
 
       hypre_assert( thrust::get<0>(new_end.get_iterator_tuple()) == AFC_diag_ii + AFC_diag_nnz );
 
@@ -532,21 +734,43 @@ hypre_ParCSRMatrixGenerateFFFCDevice_core( hypre_ParCSRMatrix  *A,
                           AFC_diag_ii + AFC_diag_nnz,
                           map2FC,
                           AFC_diag_ii );
+#endif
 
       AFC_diag_i = hypreDevice_CsrRowIndicesToPtrs(nF_local, AFC_diag_nnz, AFC_diag_ii);
       hypre_TFree(AFC_diag_ii, HYPRE_MEMORY_DEVICE);
 
       /* AFC Offd */
       FC_pred<HYPRE_BigInt> AFC_pred_offd(CF_marker, recv_buf);
+#if defined(HYPRE_USING_SYCL)
+      AFC_offd_nnz = HYPRE_ONEDPL_CALL( std::count_if,
+                                        oneapi::dpl::make_zip_iterator(A_offd_ii, Soc_offd_j),
+                                        oneapi::dpl::make_zip_iterator(A_offd_ii, Soc_offd_j) + A_offd_nnz,
+                                        AFC_pred_offd );
+#else
       AFC_offd_nnz = HYPRE_THRUST_CALL( count_if,
                                         thrust::make_zip_iterator(thrust::make_tuple(A_offd_ii, Soc_offd_j)),
                                         thrust::make_zip_iterator(thrust::make_tuple(A_offd_ii, Soc_offd_j)) + A_offd_nnz,
                                         AFC_pred_offd );
+#endif
 
       AFC_offd_ii = hypre_TAlloc(HYPRE_Int,     AFC_offd_nnz, HYPRE_MEMORY_DEVICE);
       AFC_offd_j  = hypre_TAlloc(HYPRE_Int,     AFC_offd_nnz, HYPRE_MEMORY_DEVICE);
       AFC_offd_a  = hypre_TAlloc(HYPRE_Complex, AFC_offd_nnz, HYPRE_MEMORY_DEVICE);
 
+#if defined(HYPRE_USING_SYCL)
+      new_end = hypreSycl_copy_if( oneapi::dpl::make_zip_iterator(A_offd_ii, Soc_offd_j, A_offd_a),
+                                   oneapi::dpl::make_zip_iterator(A_offd_ii, Soc_offd_j, A_offd_a) + A_offd_nnz,
+                                   oneapi::dpl::make_zip_iterator(A_offd_ii, Soc_offd_j),
+                                   oneapi::dpl::make_zip_iterator(AFC_offd_ii, AFC_offd_j, AFC_offd_a),
+                                   AFC_pred_offd );
+
+      hypre_assert( std::get<0>(new_end.base()) == AFC_offd_ii + AFC_offd_nnz );
+
+      hypreSycl_gather( AFC_offd_ii,
+                        AFC_offd_ii + AFC_offd_nnz,
+                        map2FC,
+                        AFC_offd_ii );
+#else
       new_end = HYPRE_THRUST_CALL( copy_if,
                                    thrust::make_zip_iterator(thrust::make_tuple(A_offd_ii, Soc_offd_j, A_offd_a)),
                                    thrust::make_zip_iterator(thrust::make_tuple(A_offd_ii, Soc_offd_j, A_offd_a)) + A_offd_nnz,
@@ -561,25 +785,53 @@ hypre_ParCSRMatrixGenerateFFFCDevice_core( hypre_ParCSRMatrix  *A,
                           AFC_offd_ii + AFC_offd_nnz,
                           map2FC,
                           AFC_offd_ii );
+#endif
 
       AFC_offd_i = hypreDevice_CsrRowIndicesToPtrs(nF_local, AFC_offd_nnz, AFC_offd_ii);
       hypre_TFree(AFC_offd_ii, HYPRE_MEMORY_DEVICE);
 
       /* col_map_offd_AFC */
-      HYPRE_Int *tmp_j = hypre_TAlloc(HYPRE_Int, hypre_max(AFC_offd_nnz, num_cols_A_offd), HYPRE_MEMORY_DEVICE);
+      HYPRE_Int *tmp_j = hypre_TAlloc(HYPRE_Int, hypre_max(AFC_offd_nnz, num_cols_A_offd),
+                                      HYPRE_MEMORY_DEVICE);
       hypre_TMemcpy(tmp_j, AFC_offd_j, HYPRE_Int, AFC_offd_nnz, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
-      HYPRE_THRUST_CALL( sort,
+#if defined(HYPRE_USING_SYCL)
+      HYPRE_ONEDPL_CALL( std::sort,
                          tmp_j,
                          tmp_j + AFC_offd_nnz );
-      HYPRE_Int *tmp_end = HYPRE_THRUST_CALL( unique,
+      HYPRE_Int *tmp_end = HYPRE_ONEDPL_CALL( std::unique,
                                               tmp_j,
                                               tmp_j + AFC_offd_nnz );
       num_cols_AFC_offd = tmp_end - tmp_j;
-      HYPRE_THRUST_CALL( fill_n,
+      HYPRE_ONEDPL_CALL( std::fill_n,
                          offd_mark,
                          num_cols_A_offd,
                          0 );
-      hypreDevice_ScatterConstant(offd_mark, num_cols_AFC_offd, tmp_j, 1);
+      hypreDevice_ScatterConstant(offd_mark, num_cols_AFC_offd, tmp_j, (HYPRE_Int) 1);
+      HYPRE_ONEDPL_CALL( std::exclusive_scan,
+                         offd_mark,
+                         offd_mark + num_cols_A_offd,
+                         tmp_j,
+                         0);
+      hypreSycl_gather( AFC_offd_j,
+                        AFC_offd_j + AFC_offd_nnz,
+                        tmp_j,
+                        AFC_offd_j );
+      col_map_offd_AFC = hypre_TAlloc(HYPRE_BigInt, num_cols_AFC_offd, HYPRE_MEMORY_DEVICE);
+      HYPRE_BigInt *tmp_end_big = hypreSycl_copy_if( recv_buf,
+                                                     recv_buf + num_cols_A_offd,
+                                                     offd_mark,
+                                                     col_map_offd_AFC,
+      [] (const auto & x) {return x;});
+#else
+      HYPRE_THRUST_CALL( sort,
+                         tmp_j,
+                         tmp_j + AFC_offd_nnz );
+      HYPRE_Int *tmp_end = HYPRE_THRUST_CALL( unique,
+                                              tmp_j,
+                                              tmp_j + AFC_offd_nnz );
+      num_cols_AFC_offd = tmp_end - tmp_j;
+      hypreDevice_IntFilln( offd_mark, num_cols_A_offd, 0 );
+      hypreDevice_ScatterConstant(offd_mark, num_cols_AFC_offd, tmp_j, (HYPRE_Int) 1);
       HYPRE_THRUST_CALL( exclusive_scan,
                          offd_mark,
                          offd_mark + num_cols_A_offd,
@@ -596,6 +848,7 @@ hypre_ParCSRMatrixGenerateFFFCDevice_core( hypre_ParCSRMatrix  *A,
                                                      offd_mark,
                                                      col_map_offd_AFC,
                                                      thrust::identity<HYPRE_Int>());
+#endif
       hypre_assert(tmp_end_big - col_map_offd_AFC == num_cols_AFC_offd);
       hypre_TFree(tmp_j, HYPRE_MEMORY_DEVICE);
 
@@ -623,7 +876,8 @@ hypre_ParCSRMatrixGenerateFFFCDevice_core( hypre_ParCSRMatrix  *A,
       hypre_CSRMatrixMemoryLocation(AFC_offd) = HYPRE_MEMORY_DEVICE;
 
       hypre_ParCSRMatrixDeviceColMapOffd(AFC) = col_map_offd_AFC;
-      hypre_ParCSRMatrixColMapOffd(AFC) = hypre_TAlloc(HYPRE_BigInt, num_cols_AFC_offd, HYPRE_MEMORY_HOST);
+      hypre_ParCSRMatrixColMapOffd(AFC) = hypre_TAlloc(HYPRE_BigInt, num_cols_AFC_offd,
+                                                       HYPRE_MEMORY_HOST);
       hypre_TMemcpy(hypre_ParCSRMatrixColMapOffd(AFC), col_map_offd_AFC, HYPRE_BigInt, num_cols_AFC_offd,
                     HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
 
@@ -648,21 +902,47 @@ hypre_ParCSRMatrixGenerateFFFCDevice_core( hypre_ParCSRMatrix  *A,
 
       /* ACF Diag */
       CF_pred<HYPRE_Int> ACF_pred_diag(CF_marker, CF_marker);
+#if defined(HYPRE_USING_SYCL)
+      ACF_diag_nnz = HYPRE_ONEDPL_CALL( std::count_if,
+                                        oneapi::dpl::make_zip_iterator(A_diag_ii, Soc_diag_j),
+                                        oneapi::dpl::make_zip_iterator(A_diag_ii, Soc_diag_j) + A_diag_nnz,
+                                        ACF_pred_diag );
+#else
       ACF_diag_nnz = HYPRE_THRUST_CALL( count_if,
                                         thrust::make_zip_iterator(thrust::make_tuple(A_diag_ii, Soc_diag_j)),
                                         thrust::make_zip_iterator(thrust::make_tuple(A_diag_ii, Soc_diag_j)) + A_diag_nnz,
                                         ACF_pred_diag );
+#endif
 
       ACF_diag_ii = hypre_TAlloc(HYPRE_Int,     ACF_diag_nnz, HYPRE_MEMORY_DEVICE);
       ACF_diag_j  = hypre_TAlloc(HYPRE_Int,     ACF_diag_nnz, HYPRE_MEMORY_DEVICE);
       ACF_diag_a  = hypre_TAlloc(HYPRE_Complex, ACF_diag_nnz, HYPRE_MEMORY_DEVICE);
 
-      new_end = HYPRE_THRUST_CALL( copy_if,
-                                   thrust::make_zip_iterator(thrust::make_tuple(A_diag_ii, Soc_diag_j, A_diag_a)),
-                                   thrust::make_zip_iterator(thrust::make_tuple(A_diag_ii, Soc_diag_j, A_diag_a)) + A_diag_nnz,
-                                   thrust::make_zip_iterator(thrust::make_tuple(A_diag_ii, Soc_diag_j)),
-                                   thrust::make_zip_iterator(thrust::make_tuple(ACF_diag_ii, ACF_diag_j, ACF_diag_a)),
-                                   ACF_pred_diag );
+#if defined(HYPRE_USING_SYCL)
+      auto new_end = hypreSycl_copy_if( oneapi::dpl::make_zip_iterator(A_diag_ii, Soc_diag_j, A_diag_a),
+                                        oneapi::dpl::make_zip_iterator(A_diag_ii, Soc_diag_j, A_diag_a) + A_diag_nnz,
+                                        oneapi::dpl::make_zip_iterator(A_diag_ii, Soc_diag_j),
+                                        oneapi::dpl::make_zip_iterator(ACF_diag_ii, ACF_diag_j, ACF_diag_a),
+                                        ACF_pred_diag );
+
+      hypre_assert( std::get<0>(new_end.base()) == ACF_diag_ii + ACF_diag_nnz );
+
+      hypreSycl_gather( ACF_diag_j,
+                        ACF_diag_j + ACF_diag_nnz,
+                        map2FC,
+                        ACF_diag_j );
+
+      hypreSycl_gather( ACF_diag_ii,
+                        ACF_diag_ii + ACF_diag_nnz,
+                        map2FC,
+                        ACF_diag_ii );
+#else
+      auto new_end = HYPRE_THRUST_CALL( copy_if,
+                                        thrust::make_zip_iterator(thrust::make_tuple(A_diag_ii, Soc_diag_j, A_diag_a)),
+                                        thrust::make_zip_iterator(thrust::make_tuple(A_diag_ii, Soc_diag_j, A_diag_a)) + A_diag_nnz,
+                                        thrust::make_zip_iterator(thrust::make_tuple(A_diag_ii, Soc_diag_j)),
+                                        thrust::make_zip_iterator(thrust::make_tuple(ACF_diag_ii, ACF_diag_j, ACF_diag_a)),
+                                        ACF_pred_diag );
 
       hypre_assert( thrust::get<0>(new_end.get_iterator_tuple()) == ACF_diag_ii + ACF_diag_nnz );
 
@@ -677,21 +957,43 @@ hypre_ParCSRMatrixGenerateFFFCDevice_core( hypre_ParCSRMatrix  *A,
                           ACF_diag_ii + ACF_diag_nnz,
                           map2FC,
                           ACF_diag_ii );
+#endif
 
       ACF_diag_i = hypreDevice_CsrRowIndicesToPtrs(nC_local, ACF_diag_nnz, ACF_diag_ii);
       hypre_TFree(ACF_diag_ii, HYPRE_MEMORY_DEVICE);
 
       /* ACF Offd */
       CF_pred<HYPRE_BigInt> ACF_pred_offd(CF_marker, recv_buf);
+#if defined(HYPRE_USING_SYCL)
+      ACF_offd_nnz = HYPRE_ONEDPL_CALL( std::count_if,
+                                        oneapi::dpl::make_zip_iterator(A_offd_ii, Soc_offd_j),
+                                        oneapi::dpl::make_zip_iterator(A_offd_ii, Soc_offd_j) + A_offd_nnz,
+                                        ACF_pred_offd );
+#else
       ACF_offd_nnz = HYPRE_THRUST_CALL( count_if,
                                         thrust::make_zip_iterator(thrust::make_tuple(A_offd_ii, Soc_offd_j)),
                                         thrust::make_zip_iterator(thrust::make_tuple(A_offd_ii, Soc_offd_j)) + A_offd_nnz,
                                         ACF_pred_offd );
+#endif
 
       ACF_offd_ii = hypre_TAlloc(HYPRE_Int,     ACF_offd_nnz, HYPRE_MEMORY_DEVICE);
       ACF_offd_j  = hypre_TAlloc(HYPRE_Int,     ACF_offd_nnz, HYPRE_MEMORY_DEVICE);
       ACF_offd_a  = hypre_TAlloc(HYPRE_Complex, ACF_offd_nnz, HYPRE_MEMORY_DEVICE);
 
+#if defined(HYPRE_USING_SYCL)
+      new_end = hypreSycl_copy_if( oneapi::dpl::make_zip_iterator(A_offd_ii, Soc_offd_j, A_offd_a),
+                                   oneapi::dpl::make_zip_iterator(A_offd_ii, Soc_offd_j, A_offd_a) + A_offd_nnz,
+                                   oneapi::dpl::make_zip_iterator(A_offd_ii, Soc_offd_j),
+                                   oneapi::dpl::make_zip_iterator(ACF_offd_ii, ACF_offd_j, ACF_offd_a),
+                                   ACF_pred_offd );
+
+      hypre_assert( std::get<0>(new_end.base()) == ACF_offd_ii + ACF_offd_nnz );
+
+      hypreSycl_gather( ACF_offd_ii,
+                        ACF_offd_ii + ACF_offd_nnz,
+                        map2FC,
+                        ACF_offd_ii );
+#else
       new_end = HYPRE_THRUST_CALL( copy_if,
                                    thrust::make_zip_iterator(thrust::make_tuple(A_offd_ii, Soc_offd_j, A_offd_a)),
                                    thrust::make_zip_iterator(thrust::make_tuple(A_offd_ii, Soc_offd_j, A_offd_a)) + A_offd_nnz,
@@ -706,25 +1008,58 @@ hypre_ParCSRMatrixGenerateFFFCDevice_core( hypre_ParCSRMatrix  *A,
                           ACF_offd_ii + ACF_offd_nnz,
                           map2FC,
                           ACF_offd_ii );
+#endif
 
       ACF_offd_i = hypreDevice_CsrRowIndicesToPtrs(nC_local, ACF_offd_nnz, ACF_offd_ii);
       hypre_TFree(ACF_offd_ii, HYPRE_MEMORY_DEVICE);
 
       /* col_map_offd_ACF */
-      HYPRE_Int *tmp_j = hypre_TAlloc(HYPRE_Int, hypre_max(ACF_offd_nnz, num_cols_A_offd), HYPRE_MEMORY_DEVICE);
+      HYPRE_Int *tmp_j = hypre_TAlloc(HYPRE_Int, hypre_max(ACF_offd_nnz, num_cols_A_offd),
+                                      HYPRE_MEMORY_DEVICE);
       hypre_TMemcpy(tmp_j, ACF_offd_j, HYPRE_Int, ACF_offd_nnz, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
-      HYPRE_THRUST_CALL( sort,
+#if defined(HYPRE_USING_SYCL)
+      HYPRE_ONEDPL_CALL( std::sort,
                          tmp_j,
                          tmp_j + ACF_offd_nnz );
-      HYPRE_Int *tmp_end = HYPRE_THRUST_CALL( unique,
+      HYPRE_Int *tmp_end = HYPRE_ONEDPL_CALL( std::unique,
                                               tmp_j,
                                               tmp_j + ACF_offd_nnz );
       num_cols_ACF_offd = tmp_end - tmp_j;
-      HYPRE_THRUST_CALL( fill_n,
+      HYPRE_ONEDPL_CALL( std::fill_n,
                          offd_mark,
                          num_cols_A_offd,
                          0 );
-      hypreDevice_ScatterConstant(offd_mark, num_cols_ACF_offd, tmp_j, 1);
+      hypreDevice_ScatterConstant(offd_mark, num_cols_ACF_offd, tmp_j, (HYPRE_Int) 1);
+      HYPRE_ONEDPL_CALL( std::exclusive_scan,
+                         offd_mark,
+                         offd_mark + num_cols_A_offd,
+                         tmp_j,
+                         0);
+      hypreSycl_gather( ACF_offd_j,
+                        ACF_offd_j + ACF_offd_nnz,
+                        tmp_j,
+                        ACF_offd_j );
+      col_map_offd_ACF = hypre_TAlloc(HYPRE_BigInt, num_cols_ACF_offd, HYPRE_MEMORY_DEVICE);
+      HYPRE_BigInt *tmp_end_big = hypreSycl_copy_if( recv_buf,
+                                                     recv_buf + num_cols_A_offd,
+                                                     offd_mark,
+                                                     col_map_offd_ACF,
+      [] (const auto & x) {return x;} );
+      HYPRE_ONEDPL_CALL( std::transform,
+                         col_map_offd_ACF,
+                         col_map_offd_ACF + num_cols_ACF_offd,
+                         col_map_offd_ACF,
+      [] (const auto & x) {return -x - 1;} );
+#else
+      HYPRE_THRUST_CALL( sort,
+                         tmp_j,
+                         tmp_j + ACF_offd_nnz );
+      HYPRE_Int *tmp_end = HYPRE_THRUST_CALL( unique,
+                                              tmp_j,
+                                              tmp_j + ACF_offd_nnz );
+      num_cols_ACF_offd = tmp_end - tmp_j;
+      hypreDevice_IntFilln( offd_mark, num_cols_A_offd, 0 );
+      hypreDevice_ScatterConstant(offd_mark, num_cols_ACF_offd, tmp_j, (HYPRE_Int) 1);
       HYPRE_THRUST_CALL( exclusive_scan,
                          offd_mark,
                          offd_mark + num_cols_A_offd,
@@ -736,11 +1071,12 @@ hypre_ParCSRMatrixGenerateFFFCDevice_core( hypre_ParCSRMatrix  *A,
                          ACF_offd_j );
       col_map_offd_ACF = hypre_TAlloc(HYPRE_BigInt, num_cols_ACF_offd, HYPRE_MEMORY_DEVICE);
       HYPRE_BigInt *tmp_end_big = HYPRE_THRUST_CALL( copy_if,
-                                                     thrust::make_transform_iterator(recv_buf, -_1-1),
-                                                     thrust::make_transform_iterator(recv_buf, -_1-1) + num_cols_A_offd,
+                                                     thrust::make_transform_iterator(recv_buf, -_1 - 1),
+                                                     thrust::make_transform_iterator(recv_buf, -_1 - 1) + num_cols_A_offd,
                                                      offd_mark,
                                                      col_map_offd_ACF,
                                                      thrust::identity<HYPRE_Int>());
+#endif
       hypre_assert(tmp_end_big - col_map_offd_ACF == num_cols_ACF_offd);
       hypre_TFree(tmp_j, HYPRE_MEMORY_DEVICE);
 
@@ -768,7 +1104,8 @@ hypre_ParCSRMatrixGenerateFFFCDevice_core( hypre_ParCSRMatrix  *A,
       hypre_CSRMatrixMemoryLocation(ACF_offd) = HYPRE_MEMORY_DEVICE;
 
       hypre_ParCSRMatrixDeviceColMapOffd(ACF) = col_map_offd_ACF;
-      hypre_ParCSRMatrixColMapOffd(ACF) = hypre_TAlloc(HYPRE_BigInt, num_cols_ACF_offd, HYPRE_MEMORY_HOST);
+      hypre_ParCSRMatrixColMapOffd(ACF) = hypre_TAlloc(HYPRE_BigInt, num_cols_ACF_offd,
+                                                       HYPRE_MEMORY_HOST);
       hypre_TMemcpy(hypre_ParCSRMatrixColMapOffd(ACF), col_map_offd_ACF, HYPRE_BigInt, num_cols_ACF_offd,
                     HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
 
@@ -793,22 +1130,48 @@ hypre_ParCSRMatrixGenerateFFFCDevice_core( hypre_ParCSRMatrix  *A,
 
       /* ACC Diag */
       CC_pred<HYPRE_Int> ACC_pred_diag(CF_marker, CF_marker);
+#if defined(HYPRE_USING_SYCL)
+      ACC_diag_nnz = HYPRE_ONEDPL_CALL( std::count_if,
+                                        oneapi::dpl::make_zip_iterator(A_diag_ii, Soc_diag_j),
+                                        oneapi::dpl::make_zip_iterator(A_diag_ii, Soc_diag_j) + A_diag_nnz,
+                                        ACC_pred_diag );
+#else
       ACC_diag_nnz = HYPRE_THRUST_CALL( count_if,
                                         thrust::make_zip_iterator(thrust::make_tuple(A_diag_ii, Soc_diag_j)),
                                         thrust::make_zip_iterator(thrust::make_tuple(A_diag_ii, Soc_diag_j)) + A_diag_nnz,
                                         ACC_pred_diag );
+#endif
 
       ACC_diag_ii = hypre_TAlloc(HYPRE_Int,     ACC_diag_nnz, HYPRE_MEMORY_DEVICE);
       ACC_diag_j  = hypre_TAlloc(HYPRE_Int,     ACC_diag_nnz, HYPRE_MEMORY_DEVICE);
       ACC_diag_a  = hypre_TAlloc(HYPRE_Complex, ACC_diag_nnz, HYPRE_MEMORY_DEVICE);
 
       /* Notice that we cannot use Soc_diag_j in the first two arguments since the diagonal is marked as -2 */
-      new_end = HYPRE_THRUST_CALL( copy_if,
-                                   thrust::make_zip_iterator(thrust::make_tuple(A_diag_ii, A_diag_j, A_diag_a)),
-                                   thrust::make_zip_iterator(thrust::make_tuple(A_diag_ii, A_diag_j, A_diag_a)) + A_diag_nnz,
-                                   thrust::make_zip_iterator(thrust::make_tuple(A_diag_ii, Soc_diag_j)),
-                                   thrust::make_zip_iterator(thrust::make_tuple(ACC_diag_ii, ACC_diag_j, ACC_diag_a)),
-                                   ACC_pred_diag );
+#if defined(HYPRE_USING_SYCL)
+      auto new_end = hypreSycl_copy_if( oneapi::dpl::make_zip_iterator(A_diag_ii, A_diag_j, A_diag_a),
+                                        oneapi::dpl::make_zip_iterator(A_diag_ii, A_diag_j, A_diag_a) + A_diag_nnz,
+                                        oneapi::dpl::make_zip_iterator(A_diag_ii, Soc_diag_j),
+                                        oneapi::dpl::make_zip_iterator(ACC_diag_ii, ACC_diag_j, ACC_diag_a),
+                                        ACC_pred_diag );
+
+      hypre_assert( std::get<0>(new_end.base()) == ACC_diag_ii + ACC_diag_nnz );
+
+      hypreSycl_gather( ACC_diag_j,
+                        ACC_diag_j + ACC_diag_nnz,
+                        map2FC,
+                        ACC_diag_j );
+
+      hypreSycl_gather( ACC_diag_ii,
+                        ACC_diag_ii + ACC_diag_nnz,
+                        map2FC,
+                        ACC_diag_ii );
+#else
+      auto new_end = HYPRE_THRUST_CALL( copy_if,
+                                        thrust::make_zip_iterator(thrust::make_tuple(A_diag_ii, A_diag_j, A_diag_a)),
+                                        thrust::make_zip_iterator(thrust::make_tuple(A_diag_ii, A_diag_j, A_diag_a)) + A_diag_nnz,
+                                        thrust::make_zip_iterator(thrust::make_tuple(A_diag_ii, Soc_diag_j)),
+                                        thrust::make_zip_iterator(thrust::make_tuple(ACC_diag_ii, ACC_diag_j, ACC_diag_a)),
+                                        ACC_pred_diag );
 
       hypre_assert( thrust::get<0>(new_end.get_iterator_tuple()) == ACC_diag_ii + ACC_diag_nnz );
 
@@ -823,21 +1186,43 @@ hypre_ParCSRMatrixGenerateFFFCDevice_core( hypre_ParCSRMatrix  *A,
                           ACC_diag_ii + ACC_diag_nnz,
                           map2FC,
                           ACC_diag_ii );
+#endif
 
       ACC_diag_i = hypreDevice_CsrRowIndicesToPtrs(nC_local, ACC_diag_nnz, ACC_diag_ii);
       hypre_TFree(ACC_diag_ii, HYPRE_MEMORY_DEVICE);
 
       /* ACC Offd */
       CC_pred<HYPRE_BigInt> ACC_pred_offd(CF_marker, recv_buf);
+#if defined(HYPRE_USING_SYCL)
+      ACC_offd_nnz = HYPRE_ONEDPL_CALL( std::count_if,
+                                        oneapi::dpl::make_zip_iterator(A_offd_ii, Soc_offd_j),
+                                        oneapi::dpl::make_zip_iterator(A_offd_ii, Soc_offd_j) + A_offd_nnz,
+                                        ACC_pred_offd );
+#else
       ACC_offd_nnz = HYPRE_THRUST_CALL( count_if,
                                         thrust::make_zip_iterator(thrust::make_tuple(A_offd_ii, Soc_offd_j)),
                                         thrust::make_zip_iterator(thrust::make_tuple(A_offd_ii, Soc_offd_j)) + A_offd_nnz,
                                         ACC_pred_offd );
+#endif
 
       ACC_offd_ii = hypre_TAlloc(HYPRE_Int,     ACC_offd_nnz, HYPRE_MEMORY_DEVICE);
       ACC_offd_j  = hypre_TAlloc(HYPRE_Int,     ACC_offd_nnz, HYPRE_MEMORY_DEVICE);
       ACC_offd_a  = hypre_TAlloc(HYPRE_Complex, ACC_offd_nnz, HYPRE_MEMORY_DEVICE);
 
+#if defined(HYPRE_USING_SYCL)
+      new_end = hypreSycl_copy_if( oneapi::dpl::make_zip_iterator(A_offd_ii, Soc_offd_j, A_offd_a),
+                                   oneapi::dpl::make_zip_iterator(A_offd_ii, Soc_offd_j, A_offd_a) + A_offd_nnz,
+                                   oneapi::dpl::make_zip_iterator(A_offd_ii, Soc_offd_j),
+                                   oneapi::dpl::make_zip_iterator(ACC_offd_ii, ACC_offd_j, ACC_offd_a),
+                                   ACC_pred_offd );
+
+      hypre_assert( std::get<0>(new_end.base()) == ACC_offd_ii + ACC_offd_nnz );
+
+      hypreSycl_gather( ACC_offd_ii,
+                        ACC_offd_ii + ACC_offd_nnz,
+                        map2FC,
+                        ACC_offd_ii );
+#else
       new_end = HYPRE_THRUST_CALL( copy_if,
                                    thrust::make_zip_iterator(thrust::make_tuple(A_offd_ii, Soc_offd_j, A_offd_a)),
                                    thrust::make_zip_iterator(thrust::make_tuple(A_offd_ii, Soc_offd_j, A_offd_a)) + A_offd_nnz,
@@ -852,25 +1237,53 @@ hypre_ParCSRMatrixGenerateFFFCDevice_core( hypre_ParCSRMatrix  *A,
                           ACC_offd_ii + ACC_offd_nnz,
                           map2FC,
                           ACC_offd_ii );
+#endif
 
       ACC_offd_i = hypreDevice_CsrRowIndicesToPtrs(nC_local, ACC_offd_nnz, ACC_offd_ii);
       hypre_TFree(ACC_offd_ii, HYPRE_MEMORY_DEVICE);
 
       /* col_map_offd_ACC */
-      HYPRE_Int *tmp_j = hypre_TAlloc(HYPRE_Int, hypre_max(ACC_offd_nnz, num_cols_A_offd), HYPRE_MEMORY_DEVICE);
+      HYPRE_Int *tmp_j = hypre_TAlloc(HYPRE_Int, hypre_max(ACC_offd_nnz, num_cols_A_offd),
+                                      HYPRE_MEMORY_DEVICE);
       hypre_TMemcpy(tmp_j, ACC_offd_j, HYPRE_Int, ACC_offd_nnz, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
-      HYPRE_THRUST_CALL( sort,
+#if defined(HYPRE_USING_SYCL)
+      HYPRE_ONEDPL_CALL( std::sort,
                          tmp_j,
                          tmp_j + ACC_offd_nnz );
-      HYPRE_Int *tmp_end = HYPRE_THRUST_CALL( unique,
+      HYPRE_Int *tmp_end = HYPRE_ONEDPL_CALL( std::unique,
                                               tmp_j,
                                               tmp_j + ACC_offd_nnz );
       num_cols_ACC_offd = tmp_end - tmp_j;
-      HYPRE_THRUST_CALL( fill_n,
+      HYPRE_ONEDPL_CALL( std::fill_n,
                          offd_mark,
                          num_cols_A_offd,
                          0 );
-      hypreDevice_ScatterConstant(offd_mark, num_cols_ACC_offd, tmp_j, 1);
+      hypreDevice_ScatterConstant(offd_mark, num_cols_ACC_offd, tmp_j, (HYPRE_Int) 1);
+      HYPRE_ONEDPL_CALL( std::exclusive_scan,
+                         offd_mark,
+                         offd_mark + num_cols_A_offd,
+                         tmp_j,
+                         0);
+      hypreSycl_gather( ACC_offd_j,
+                        ACC_offd_j + ACC_offd_nnz,
+                        tmp_j,
+                        ACC_offd_j );
+      col_map_offd_ACC = hypre_TAlloc(HYPRE_BigInt, num_cols_ACC_offd, HYPRE_MEMORY_DEVICE);
+      HYPRE_BigInt *tmp_end_big = hypreSycl_copy_if( recv_buf,
+                                                     recv_buf + num_cols_A_offd,
+                                                     offd_mark,
+                                                     col_map_offd_ACC,
+      [] (const auto & x) {return x;} );
+#else
+      HYPRE_THRUST_CALL( sort,
+                         tmp_j,
+                         tmp_j + ACC_offd_nnz );
+      HYPRE_Int *tmp_end = HYPRE_THRUST_CALL( unique,
+                                              tmp_j,
+                                              tmp_j + ACC_offd_nnz );
+      num_cols_ACC_offd = tmp_end - tmp_j;
+      hypreDevice_IntFilln( offd_mark, num_cols_A_offd, 0 );
+      hypreDevice_ScatterConstant(offd_mark, num_cols_ACC_offd, tmp_j, (HYPRE_Int) 1);
       HYPRE_THRUST_CALL( exclusive_scan,
                          offd_mark,
                          offd_mark + num_cols_A_offd,
@@ -887,6 +1300,7 @@ hypre_ParCSRMatrixGenerateFFFCDevice_core( hypre_ParCSRMatrix  *A,
                                                      offd_mark,
                                                      col_map_offd_ACC,
                                                      thrust::identity<HYPRE_Int>());
+#endif
       hypre_assert(tmp_end_big - col_map_offd_ACC == num_cols_ACC_offd);
       hypre_TFree(tmp_j, HYPRE_MEMORY_DEVICE);
 
@@ -914,7 +1328,8 @@ hypre_ParCSRMatrixGenerateFFFCDevice_core( hypre_ParCSRMatrix  *A,
       hypre_CSRMatrixMemoryLocation(ACC_offd) = HYPRE_MEMORY_DEVICE;
 
       hypre_ParCSRMatrixDeviceColMapOffd(ACC) = col_map_offd_ACC;
-      hypre_ParCSRMatrixColMapOffd(ACC) = hypre_TAlloc(HYPRE_BigInt, num_cols_ACC_offd, HYPRE_MEMORY_HOST);
+      hypre_ParCSRMatrixColMapOffd(ACC) = hypre_TAlloc(HYPRE_BigInt, num_cols_ACC_offd,
+                                                       HYPRE_MEMORY_HOST);
       hypre_TMemcpy(hypre_ParCSRMatrixColMapOffd(ACC), col_map_offd_ACC, HYPRE_BigInt, num_cols_ACC_offd,
                     HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
 
@@ -932,9 +1347,15 @@ hypre_ParCSRMatrixGenerateFFFCDevice_core( hypre_ParCSRMatrix  *A,
    hypre_TFree(map2F2,    HYPRE_MEMORY_DEVICE);
    hypre_TFree(recv_buf,  HYPRE_MEMORY_DEVICE);
 
+   hypre_GpuProfilingPopRange();
+
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixGenerateFFFCDevice
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_ParCSRMatrixGenerateFFFCDevice( hypre_ParCSRMatrix  *A,
                                       HYPRE_Int           *CF_marker,
@@ -943,9 +1364,15 @@ hypre_ParCSRMatrixGenerateFFFCDevice( hypre_ParCSRMatrix  *A,
                                       hypre_ParCSRMatrix **AFC_ptr,
                                       hypre_ParCSRMatrix **AFF_ptr )
 {
-   return hypre_ParCSRMatrixGenerateFFFCDevice_core(A, CF_marker, cpts_starts, S, AFC_ptr, AFF_ptr, NULL, NULL, 1);
+   return hypre_ParCSRMatrixGenerateFFFCDevice_core(A, CF_marker, cpts_starts, S,
+                                                    AFC_ptr, AFF_ptr,
+                                                    NULL, NULL, 1);
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixGenerateFFFC3Device
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_ParCSRMatrixGenerateFFFC3Device( hypre_ParCSRMatrix  *A,
                                        HYPRE_Int           *CF_marker,
@@ -954,9 +1381,15 @@ hypre_ParCSRMatrixGenerateFFFC3Device( hypre_ParCSRMatrix  *A,
                                        hypre_ParCSRMatrix **AFC_ptr,
                                        hypre_ParCSRMatrix **AFF_ptr)
 {
-   return hypre_ParCSRMatrixGenerateFFFCDevice_core(A, CF_marker, cpts_starts, S, AFC_ptr, AFF_ptr, NULL, NULL, 2);
+   return hypre_ParCSRMatrixGenerateFFFCDevice_core(A, CF_marker, cpts_starts, S,
+                                                    AFC_ptr, AFF_ptr,
+                                                    NULL, NULL, 2);
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixGenerateFFCFDevice
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_ParCSRMatrixGenerateFFCFDevice( hypre_ParCSRMatrix  *A,
                                       HYPRE_Int           *CF_marker,
@@ -965,9 +1398,14 @@ hypre_ParCSRMatrixGenerateFFCFDevice( hypre_ParCSRMatrix  *A,
                                       hypre_ParCSRMatrix **ACF_ptr,
                                       hypre_ParCSRMatrix **AFF_ptr )
 {
-   return hypre_ParCSRMatrixGenerateFFFCDevice_core(A, CF_marker, cpts_starts, S, NULL, AFF_ptr, ACF_ptr, NULL, 1);
+   return hypre_ParCSRMatrixGenerateFFFCDevice_core(A, CF_marker, cpts_starts, S,
+                                                    NULL, AFF_ptr,
+                                                    ACF_ptr, NULL, 1);
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixGenerateCFDevice
+ *--------------------------------------------------------------------------*/
 
 HYPRE_Int
 hypre_ParCSRMatrixGenerateCFDevice( hypre_ParCSRMatrix  *A,
@@ -976,9 +1414,15 @@ hypre_ParCSRMatrixGenerateCFDevice( hypre_ParCSRMatrix  *A,
                                     hypre_ParCSRMatrix  *S,
                                     hypre_ParCSRMatrix **ACF_ptr)
 {
-   return hypre_ParCSRMatrixGenerateFFFCDevice_core(A, CF_marker, cpts_starts, S, NULL, NULL, ACF_ptr, NULL, 1);
+   return hypre_ParCSRMatrixGenerateFFFCDevice_core(A, CF_marker, cpts_starts, S,
+                                                    NULL, NULL,
+                                                    ACF_ptr, NULL, 1);
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixGenerateCCDevice
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_ParCSRMatrixGenerateCCDevice( hypre_ParCSRMatrix  *A,
                                     HYPRE_Int           *CF_marker,
@@ -986,9 +1430,32 @@ hypre_ParCSRMatrixGenerateCCDevice( hypre_ParCSRMatrix  *A,
                                     hypre_ParCSRMatrix  *S,
                                     hypre_ParCSRMatrix **ACC_ptr)
 {
-   return hypre_ParCSRMatrixGenerateFFFCDevice_core(A, CF_marker, cpts_starts, S, NULL, NULL, NULL, ACC_ptr, 1);
+   return hypre_ParCSRMatrixGenerateFFFCDevice_core(A, CF_marker, cpts_starts, S,
+                                                    NULL, NULL,
+                                                    NULL, ACC_ptr, 1);
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixGenerateCCCFDevice
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ParCSRMatrixGenerateCCCFDevice( hypre_ParCSRMatrix  *A,
+                                      HYPRE_Int           *CF_marker,
+                                      HYPRE_BigInt        *cpts_starts,
+                                      hypre_ParCSRMatrix  *S,
+                                      hypre_ParCSRMatrix **ACF_ptr,
+                                      hypre_ParCSRMatrix **ACC_ptr)
+{
+   return hypre_ParCSRMatrixGenerateFFFCDevice_core(A, CF_marker, cpts_starts, S,
+                                                    NULL, NULL,
+                                                    ACF_ptr, ACC_ptr, 1);
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixGenerate1DCFDevice
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_ParCSRMatrixGenerate1DCFDevice( hypre_ParCSRMatrix  *A,
                                       HYPRE_Int           *CF_marker,
@@ -1024,7 +1491,7 @@ hypre_ParCSRMatrixGenerate1DCFDevice( hypre_ParCSRMatrix  *A,
    HYPRE_Int           my_id, num_procs;
    /* nF and nC */
    HYPRE_Int           n_local, /*nF_local,*/ nC_local;
-   HYPRE_BigInt       *fpts_starts, *row_starts;
+   HYPRE_BigInt        fpts_starts[2], *row_starts;
    HYPRE_BigInt        /*nF_global,*/ nC_global;
    HYPRE_BigInt        F_first, C_first;
    /* work arrays */
@@ -1045,13 +1512,12 @@ hypre_ParCSRMatrixGenerate1DCFDevice( hypre_ParCSRMatrix  *A,
       hypre_ParCSRMatrixDeviceColMapOffd(A) = col_map_offd_A;
    }
 
-   if (my_id == (num_procs -1))
+   if (my_id == (num_procs - 1))
    {
       nC_global = cpts_starts[1];
    }
-   hypre_MPI_Bcast(&nC_global, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
+   hypre_MPI_Bcast(&nC_global, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
    nC_local = (HYPRE_Int) (cpts_starts[1] - cpts_starts[0]);
-   fpts_starts = hypre_TAlloc(HYPRE_BigInt, 2, HYPRE_MEMORY_HOST);
    fpts_starts[0] = row_starts[0] - cpts_starts[0];
    fpts_starts[1] = row_starts[1] - cpts_starts[1];
    F_first = fpts_starts[0];
@@ -1065,6 +1531,27 @@ hypre_ParCSRMatrixGenerate1DCFDevice( hypre_ParCSRMatrix  *A,
    itmp       = hypre_TAlloc(HYPRE_Int,    n_local,         HYPRE_MEMORY_DEVICE);
    recv_buf   = hypre_TAlloc(HYPRE_BigInt, num_cols_A_offd, HYPRE_MEMORY_DEVICE);
 
+#if defined(HYPRE_USING_SYCL)
+   /* map from all points (i.e, F+C) to F/C indices */
+   HYPRE_ONEDPL_CALL( std::exclusive_scan,
+                      oneapi::dpl::make_transform_iterator(CF_marker,           is_negative<HYPRE_Int>()),
+                      oneapi::dpl::make_transform_iterator(CF_marker + n_local, is_negative<HYPRE_Int>()),
+                      map2FC, /* F */
+                      HYPRE_Int(0) ); /* *MUST* pass init value since input and output types diff. */
+
+   HYPRE_ONEDPL_CALL( std::exclusive_scan,
+                      oneapi::dpl::make_transform_iterator(CF_marker,           is_nonnegative<HYPRE_Int>()),
+                      oneapi::dpl::make_transform_iterator(CF_marker + n_local, is_nonnegative<HYPRE_Int>()),
+                      itmp, /* C */
+                      HYPRE_Int(0) ); /* *MUST* pass init value since input and output types diff. */
+
+   hypreSycl_scatter_if( itmp,
+                         itmp + n_local,
+                         oneapi::dpl::counting_iterator<HYPRE_Int>(0),
+                         CF_marker,
+                         map2FC, /* FC combined */
+                         is_nonnegative<HYPRE_Int>() );
+#else
    /* map from all points (i.e, F+C) to F/C indices */
    HYPRE_THRUST_CALL( exclusive_scan,
                       thrust::make_transform_iterator(CF_marker,           is_negative<HYPRE_Int>()),
@@ -1084,6 +1571,7 @@ hypre_ParCSRMatrixGenerate1DCFDevice( hypre_ParCSRMatrix  *A,
                       thrust::counting_iterator<HYPRE_Int>(0),
                       thrust::make_transform_iterator(CF_marker, is_nonnegative<HYPRE_Int>()),
                       map2FC ); /* FC combined */
+#endif
 
    hypre_TFree(itmp, HYPRE_MEMORY_DEVICE);
 
@@ -1093,19 +1581,35 @@ hypre_ParCSRMatrixGenerate1DCFDevice( hypre_ParCSRMatrix  *A,
    hypre_ParCSRCommPkgCopySendMapElmtsToDevice(comm_pkg);
 
    FFFC_functor functor(F_first, C_first);
+#if defined(HYPRE_USING_SYCL)
+   auto zip = oneapi::dpl::make_zip_iterator(map2FC, CF_marker);
+   hypreSycl_gather( hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg),
+                     hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg) + num_elem_send,
+                     oneapi::dpl::make_transform_iterator(zip, functor),
+                     send_buf );
+#else
    HYPRE_THRUST_CALL( gather,
                       hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg),
                       hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg) + num_elem_send,
-                      thrust::make_transform_iterator(thrust::make_zip_iterator(thrust::make_tuple(map2FC, CF_marker)), functor),
+                      thrust::make_transform_iterator(thrust::make_zip_iterator(thrust::make_tuple(map2FC, CF_marker)),
+                                                      functor),
                       send_buf );
+#endif
+
+#if defined(HYPRE_USING_THRUST_NOSYNC)
+   /* RL: make sure send_buf is ready before issuing GPU-GPU MPI */
+   if (hypre_GetGpuAwareMPI())
+   {
+      hypre_ForceSyncComputeStream();
+   }
+#endif
 
-   comm_handle = hypre_ParCSRCommHandleCreate_v2(21, comm_pkg, HYPRE_MEMORY_DEVICE, send_buf, HYPRE_MEMORY_DEVICE, recv_buf);
+   comm_handle = hypre_ParCSRCommHandleCreate_v2(21, comm_pkg, HYPRE_MEMORY_DEVICE, send_buf,
+                                                 HYPRE_MEMORY_DEVICE, recv_buf);
    hypre_ParCSRCommHandleDestroy(comm_handle);
 
    hypre_TFree(send_buf, HYPRE_MEMORY_DEVICE);
 
-   thrust::zip_iterator< thrust::tuple<HYPRE_Int*, HYPRE_Int*, HYPRE_Complex*> > new_end;
-
    A_diag_ii = hypre_TAlloc(HYPRE_Int, A_diag_nnz,      HYPRE_MEMORY_DEVICE);
    A_offd_ii = hypre_TAlloc(HYPRE_Int, A_offd_nnz,      HYPRE_MEMORY_DEVICE);
    offd_mark = hypre_TAlloc(HYPRE_Int, num_cols_A_offd, HYPRE_MEMORY_DEVICE);
@@ -1127,22 +1631,43 @@ hypre_ParCSRMatrixGenerate1DCFDevice( hypre_ParCSRMatrix  *A,
 
       /* ACX Diag */
       CX_pred ACX_pred(CF_marker);
+#if defined(HYPRE_USING_SYCL)
+      ACX_diag_nnz = HYPRE_ONEDPL_CALL( std::count_if,
+                                        oneapi::dpl::make_zip_iterator(A_diag_ii, Soc_diag_j),
+                                        oneapi::dpl::make_zip_iterator(A_diag_ii, Soc_diag_j) + A_diag_nnz,
+                                        ACX_pred );
+#else
       ACX_diag_nnz = HYPRE_THRUST_CALL( count_if,
                                         thrust::make_zip_iterator(thrust::make_tuple(A_diag_ii, Soc_diag_j)),
                                         thrust::make_zip_iterator(thrust::make_tuple(A_diag_ii, Soc_diag_j)) + A_diag_nnz,
                                         ACX_pred );
+#endif
 
       ACX_diag_ii = hypre_TAlloc(HYPRE_Int,     ACX_diag_nnz, HYPRE_MEMORY_DEVICE);
       ACX_diag_j  = hypre_TAlloc(HYPRE_Int,     ACX_diag_nnz, HYPRE_MEMORY_DEVICE);
       ACX_diag_a  = hypre_TAlloc(HYPRE_Complex, ACX_diag_nnz, HYPRE_MEMORY_DEVICE);
 
       /* Notice that we cannot use Soc_diag_j in the first two arguments since the diagonal is marked as -2 */
-      new_end = HYPRE_THRUST_CALL( copy_if,
-                                   thrust::make_zip_iterator(thrust::make_tuple(A_diag_ii, A_diag_j, A_diag_a)),
-                                   thrust::make_zip_iterator(thrust::make_tuple(A_diag_ii, A_diag_j, A_diag_a)) + A_diag_nnz,
-                                   thrust::make_zip_iterator(thrust::make_tuple(A_diag_ii, Soc_diag_j)),
-                                   thrust::make_zip_iterator(thrust::make_tuple(ACX_diag_ii, ACX_diag_j, ACX_diag_a)),
-                                   ACX_pred );
+#if defined(HYPRE_USING_SYCL)
+      auto new_end = hypreSycl_copy_if( oneapi::dpl::make_zip_iterator(A_diag_ii, A_diag_j, A_diag_a),
+                                        oneapi::dpl::make_zip_iterator(A_diag_ii, A_diag_j, A_diag_a) + A_diag_nnz,
+                                        oneapi::dpl::make_zip_iterator(A_diag_ii, Soc_diag_j),
+                                        oneapi::dpl::make_zip_iterator(ACX_diag_ii, ACX_diag_j, ACX_diag_a),
+                                        ACX_pred );
+
+      hypre_assert( std::get<0>(new_end.base()) == ACX_diag_ii + ACX_diag_nnz );
+
+      hypreSycl_gather( ACX_diag_ii,
+                        ACX_diag_ii + ACX_diag_nnz,
+                        map2FC,
+                        ACX_diag_ii );
+#else
+      auto new_end = HYPRE_THRUST_CALL( copy_if,
+                                        thrust::make_zip_iterator(thrust::make_tuple(A_diag_ii, A_diag_j, A_diag_a)),
+                                        thrust::make_zip_iterator(thrust::make_tuple(A_diag_ii, A_diag_j, A_diag_a)) + A_diag_nnz,
+                                        thrust::make_zip_iterator(thrust::make_tuple(A_diag_ii, Soc_diag_j)),
+                                        thrust::make_zip_iterator(thrust::make_tuple(ACX_diag_ii, ACX_diag_j, ACX_diag_a)),
+                                        ACX_pred );
 
       hypre_assert( thrust::get<0>(new_end.get_iterator_tuple()) == ACX_diag_ii + ACX_diag_nnz );
 
@@ -1151,20 +1676,42 @@ hypre_ParCSRMatrixGenerate1DCFDevice( hypre_ParCSRMatrix  *A,
                           ACX_diag_ii + ACX_diag_nnz,
                           map2FC,
                           ACX_diag_ii );
+#endif
 
       ACX_diag_i = hypreDevice_CsrRowIndicesToPtrs(nC_local, ACX_diag_nnz, ACX_diag_ii);
       hypre_TFree(ACX_diag_ii, HYPRE_MEMORY_DEVICE);
 
       /* ACX Offd */
+#if defined(HYPRE_USING_SYCL)
+      ACX_offd_nnz = HYPRE_ONEDPL_CALL( std::count_if,
+                                        oneapi::dpl::make_zip_iterator(A_offd_ii, Soc_offd_j),
+                                        oneapi::dpl::make_zip_iterator(A_offd_ii, Soc_offd_j) + A_offd_nnz,
+                                        ACX_pred );
+#else
       ACX_offd_nnz = HYPRE_THRUST_CALL( count_if,
                                         thrust::make_zip_iterator(thrust::make_tuple(A_offd_ii, Soc_offd_j)),
                                         thrust::make_zip_iterator(thrust::make_tuple(A_offd_ii, Soc_offd_j)) + A_offd_nnz,
                                         ACX_pred );
+#endif
 
       ACX_offd_ii = hypre_TAlloc(HYPRE_Int,     ACX_offd_nnz, HYPRE_MEMORY_DEVICE);
       ACX_offd_j  = hypre_TAlloc(HYPRE_Int,     ACX_offd_nnz, HYPRE_MEMORY_DEVICE);
       ACX_offd_a  = hypre_TAlloc(HYPRE_Complex, ACX_offd_nnz, HYPRE_MEMORY_DEVICE);
 
+#if defined(HYPRE_USING_SYCL)
+      new_end = hypreSycl_copy_if( oneapi::dpl::make_zip_iterator(A_offd_ii, Soc_offd_j, A_offd_a),
+                                   oneapi::dpl::make_zip_iterator(A_offd_ii, Soc_offd_j, A_offd_a) + A_offd_nnz,
+                                   oneapi::dpl::make_zip_iterator(A_offd_ii, Soc_offd_j),
+                                   oneapi::dpl::make_zip_iterator(ACX_offd_ii, ACX_offd_j, ACX_offd_a),
+                                   ACX_pred );
+
+      hypre_assert( std::get<0>(new_end.base()) == ACX_offd_ii + ACX_offd_nnz );
+
+      hypreSycl_gather( ACX_offd_ii,
+                        ACX_offd_ii + ACX_offd_nnz,
+                        map2FC,
+                        ACX_offd_ii );
+#else
       new_end = HYPRE_THRUST_CALL( copy_if,
                                    thrust::make_zip_iterator(thrust::make_tuple(A_offd_ii, Soc_offd_j, A_offd_a)),
                                    thrust::make_zip_iterator(thrust::make_tuple(A_offd_ii, Soc_offd_j, A_offd_a)) + A_offd_nnz,
@@ -1179,25 +1726,50 @@ hypre_ParCSRMatrixGenerate1DCFDevice( hypre_ParCSRMatrix  *A,
                           ACX_offd_ii + ACX_offd_nnz,
                           map2FC,
                           ACX_offd_ii );
+#endif
 
       ACX_offd_i = hypreDevice_CsrRowIndicesToPtrs(nC_local, ACX_offd_nnz, ACX_offd_ii);
       hypre_TFree(ACX_offd_ii, HYPRE_MEMORY_DEVICE);
 
       /* col_map_offd_ACX */
-      HYPRE_Int *tmp_j = hypre_TAlloc(HYPRE_Int, hypre_max(ACX_offd_nnz, num_cols_A_offd), HYPRE_MEMORY_DEVICE);
+      HYPRE_Int *tmp_j = hypre_TAlloc(HYPRE_Int, hypre_max(ACX_offd_nnz, num_cols_A_offd),
+                                      HYPRE_MEMORY_DEVICE);
       hypre_TMemcpy(tmp_j, ACX_offd_j, HYPRE_Int, ACX_offd_nnz, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+#if defined(HYPRE_USING_SYCL)
+      HYPRE_ONEDPL_CALL( std::sort,
+                         tmp_j,
+                         tmp_j + ACX_offd_nnz );
+      HYPRE_Int *tmp_end = HYPRE_ONEDPL_CALL( std::unique,
+                                              tmp_j,
+                                              tmp_j + ACX_offd_nnz );
+#else
       HYPRE_THRUST_CALL( sort,
                          tmp_j,
                          tmp_j + ACX_offd_nnz );
       HYPRE_Int *tmp_end = HYPRE_THRUST_CALL( unique,
                                               tmp_j,
                                               tmp_j + ACX_offd_nnz );
+#endif
       num_cols_ACX_offd = tmp_end - tmp_j;
-      HYPRE_THRUST_CALL( fill_n,
+      hypreDevice_IntFilln( offd_mark, num_cols_A_offd, 0 );
+      hypreDevice_ScatterConstant(offd_mark, num_cols_ACX_offd, tmp_j, (HYPRE_Int) 1);
+#if defined(HYPRE_USING_SYCL)
+      HYPRE_ONEDPL_CALL( std::exclusive_scan,
                          offd_mark,
-                         num_cols_A_offd,
+                         offd_mark + num_cols_A_offd,
+                         tmp_j,
                          0 );
-      hypreDevice_ScatterConstant(offd_mark, num_cols_ACX_offd, tmp_j, 1);
+      hypreSycl_gather( ACX_offd_j,
+                        ACX_offd_j + ACX_offd_nnz,
+                        tmp_j,
+                        ACX_offd_j );
+      col_map_offd_ACX = hypre_TAlloc(HYPRE_BigInt, num_cols_ACX_offd, HYPRE_MEMORY_DEVICE);
+      HYPRE_BigInt *tmp_end_big = hypreSycl_copy_if( col_map_offd_A,
+                                                     col_map_offd_A + num_cols_A_offd,
+                                                     offd_mark,
+                                                     col_map_offd_ACX,
+      [] (const auto & x) {return x;} );
+#else
       HYPRE_THRUST_CALL( exclusive_scan,
                          offd_mark,
                          offd_mark + num_cols_A_offd,
@@ -1214,6 +1786,7 @@ hypre_ParCSRMatrixGenerate1DCFDevice( hypre_ParCSRMatrix  *A,
                                                      offd_mark,
                                                      col_map_offd_ACX,
                                                      thrust::identity<HYPRE_Int>());
+#endif
       hypre_assert(tmp_end_big - col_map_offd_ACX == num_cols_ACX_offd);
       hypre_TFree(tmp_j, HYPRE_MEMORY_DEVICE);
 
@@ -1241,7 +1814,8 @@ hypre_ParCSRMatrixGenerate1DCFDevice( hypre_ParCSRMatrix  *A,
       hypre_CSRMatrixMemoryLocation(ACX_offd) = HYPRE_MEMORY_DEVICE;
 
       hypre_ParCSRMatrixDeviceColMapOffd(ACX) = col_map_offd_ACX;
-      hypre_ParCSRMatrixColMapOffd(ACX) = hypre_TAlloc(HYPRE_BigInt, num_cols_ACX_offd, HYPRE_MEMORY_HOST);
+      hypre_ParCSRMatrixColMapOffd(ACX) = hypre_TAlloc(HYPRE_BigInt, num_cols_ACX_offd,
+                                                       HYPRE_MEMORY_HOST);
       hypre_TMemcpy(hypre_ParCSRMatrixColMapOffd(ACX), col_map_offd_ACX, HYPRE_BigInt, num_cols_ACX_offd,
                     HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
 
@@ -1266,22 +1840,43 @@ hypre_ParCSRMatrixGenerate1DCFDevice( hypre_ParCSRMatrix  *A,
 
       /* AXC Diag */
       XC_pred<HYPRE_Int> AXC_pred_diag(CF_marker);
+#if defined(HYPRE_USING_SYCL)
+      AXC_diag_nnz = HYPRE_ONEDPL_CALL( std::count_if,
+                                        oneapi::dpl::make_zip_iterator(A_diag_ii, Soc_diag_j),
+                                        oneapi::dpl::make_zip_iterator(A_diag_ii, Soc_diag_j) + A_diag_nnz,
+                                        AXC_pred_diag );
+#else
       AXC_diag_nnz = HYPRE_THRUST_CALL( count_if,
                                         thrust::make_zip_iterator(thrust::make_tuple(A_diag_ii, Soc_diag_j)),
                                         thrust::make_zip_iterator(thrust::make_tuple(A_diag_ii, Soc_diag_j)) + A_diag_nnz,
                                         AXC_pred_diag );
+#endif
 
       AXC_diag_ii = hypre_TAlloc(HYPRE_Int,     AXC_diag_nnz, HYPRE_MEMORY_DEVICE);
       AXC_diag_j  = hypre_TAlloc(HYPRE_Int,     AXC_diag_nnz, HYPRE_MEMORY_DEVICE);
       AXC_diag_a  = hypre_TAlloc(HYPRE_Complex, AXC_diag_nnz, HYPRE_MEMORY_DEVICE);
 
       /* Notice that we cannot use Soc_diag_j in the first two arguments since the diagonal is marked as -2 */
-      new_end = HYPRE_THRUST_CALL( copy_if,
-                                   thrust::make_zip_iterator(thrust::make_tuple(A_diag_ii, A_diag_j, A_diag_a)),
-                                   thrust::make_zip_iterator(thrust::make_tuple(A_diag_ii, A_diag_j, A_diag_a)) + A_diag_nnz,
-                                   thrust::make_zip_iterator(thrust::make_tuple(A_diag_ii, Soc_diag_j)),
-                                   thrust::make_zip_iterator(thrust::make_tuple(AXC_diag_ii, AXC_diag_j, AXC_diag_a)),
-                                   AXC_pred_diag );
+#if defined(HYPRE_USING_SYCL)
+      auto new_end = hypreSycl_copy_if( oneapi::dpl::make_zip_iterator(A_diag_ii, A_diag_j, A_diag_a),
+                                        oneapi::dpl::make_zip_iterator(A_diag_ii, A_diag_j, A_diag_a) + A_diag_nnz,
+                                        oneapi::dpl::make_zip_iterator(A_diag_ii, Soc_diag_j),
+                                        oneapi::dpl::make_zip_iterator(AXC_diag_ii, AXC_diag_j, AXC_diag_a),
+                                        AXC_pred_diag );
+
+      hypre_assert( std::get<0>(new_end.base()) == AXC_diag_ii + AXC_diag_nnz );
+
+      hypreSycl_gather( AXC_diag_j,
+                        AXC_diag_j + AXC_diag_nnz,
+                        map2FC,
+                        AXC_diag_j );
+#else
+      auto new_end = HYPRE_THRUST_CALL( copy_if,
+                                        thrust::make_zip_iterator(thrust::make_tuple(A_diag_ii, A_diag_j, A_diag_a)),
+                                        thrust::make_zip_iterator(thrust::make_tuple(A_diag_ii, A_diag_j, A_diag_a)) + A_diag_nnz,
+                                        thrust::make_zip_iterator(thrust::make_tuple(A_diag_ii, Soc_diag_j)),
+                                        thrust::make_zip_iterator(thrust::make_tuple(AXC_diag_ii, AXC_diag_j, AXC_diag_a)),
+                                        AXC_pred_diag );
 
       hypre_assert( thrust::get<0>(new_end.get_iterator_tuple()) == AXC_diag_ii + AXC_diag_nnz );
 
@@ -1290,21 +1885,38 @@ hypre_ParCSRMatrixGenerate1DCFDevice( hypre_ParCSRMatrix  *A,
                           AXC_diag_j + AXC_diag_nnz,
                           map2FC,
                           AXC_diag_j );
+#endif
 
       AXC_diag_i = hypreDevice_CsrRowIndicesToPtrs(n_local, AXC_diag_nnz, AXC_diag_ii);
       hypre_TFree(AXC_diag_ii, HYPRE_MEMORY_DEVICE);
 
       /* AXC Offd */
       XC_pred<HYPRE_BigInt> AXC_pred_offd(recv_buf);
+#if defined(HYPRE_USING_SYCL)
+      AXC_offd_nnz = HYPRE_ONEDPL_CALL( std::count_if,
+                                        oneapi::dpl::make_zip_iterator(A_offd_ii, Soc_offd_j),
+                                        oneapi::dpl::make_zip_iterator(A_offd_ii, Soc_offd_j) + A_offd_nnz,
+                                        AXC_pred_offd );
+#else
       AXC_offd_nnz = HYPRE_THRUST_CALL( count_if,
                                         thrust::make_zip_iterator(thrust::make_tuple(A_offd_ii, Soc_offd_j)),
                                         thrust::make_zip_iterator(thrust::make_tuple(A_offd_ii, Soc_offd_j)) + A_offd_nnz,
                                         AXC_pred_offd );
+#endif
 
       AXC_offd_ii = hypre_TAlloc(HYPRE_Int,     AXC_offd_nnz, HYPRE_MEMORY_DEVICE);
       AXC_offd_j  = hypre_TAlloc(HYPRE_Int,     AXC_offd_nnz, HYPRE_MEMORY_DEVICE);
       AXC_offd_a  = hypre_TAlloc(HYPRE_Complex, AXC_offd_nnz, HYPRE_MEMORY_DEVICE);
 
+#if defined(HYPRE_USING_SYCL)
+      new_end = hypreSycl_copy_if( oneapi::dpl::make_zip_iterator(A_offd_ii, Soc_offd_j, A_offd_a),
+                                   oneapi::dpl::make_zip_iterator(A_offd_ii, Soc_offd_j, A_offd_a) + A_offd_nnz,
+                                   oneapi::dpl::make_zip_iterator(A_offd_ii, Soc_offd_j),
+                                   oneapi::dpl::make_zip_iterator(AXC_offd_ii, AXC_offd_j, AXC_offd_a),
+                                   AXC_pred_offd );
+
+      hypre_assert( std::get<0>(new_end.base()) == AXC_offd_ii + AXC_offd_nnz );
+#else
       new_end = HYPRE_THRUST_CALL( copy_if,
                                    thrust::make_zip_iterator(thrust::make_tuple(A_offd_ii, Soc_offd_j, A_offd_a)),
                                    thrust::make_zip_iterator(thrust::make_tuple(A_offd_ii, Soc_offd_j, A_offd_a)) + A_offd_nnz,
@@ -1313,25 +1925,50 @@ hypre_ParCSRMatrixGenerate1DCFDevice( hypre_ParCSRMatrix  *A,
                                    AXC_pred_offd );
 
       hypre_assert( thrust::get<0>(new_end.get_iterator_tuple()) == AXC_offd_ii + AXC_offd_nnz );
+#endif
 
       AXC_offd_i = hypreDevice_CsrRowIndicesToPtrs(n_local, AXC_offd_nnz, AXC_offd_ii);
       hypre_TFree(AXC_offd_ii, HYPRE_MEMORY_DEVICE);
 
       /* col_map_offd_AXC */
-      HYPRE_Int *tmp_j = hypre_TAlloc(HYPRE_Int, hypre_max(AXC_offd_nnz, num_cols_A_offd), HYPRE_MEMORY_DEVICE);
+      HYPRE_Int *tmp_j = hypre_TAlloc(HYPRE_Int, hypre_max(AXC_offd_nnz, num_cols_A_offd),
+                                      HYPRE_MEMORY_DEVICE);
       hypre_TMemcpy(tmp_j, AXC_offd_j, HYPRE_Int, AXC_offd_nnz, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+#if defined(HYPRE_USING_SYCL)
+      HYPRE_ONEDPL_CALL( std::sort,
+                         tmp_j,
+                         tmp_j + AXC_offd_nnz );
+      HYPRE_Int *tmp_end = HYPRE_ONEDPL_CALL( std::unique,
+                                              tmp_j,
+                                              tmp_j + AXC_offd_nnz );
+#else
       HYPRE_THRUST_CALL( sort,
                          tmp_j,
                          tmp_j + AXC_offd_nnz );
       HYPRE_Int *tmp_end = HYPRE_THRUST_CALL( unique,
                                               tmp_j,
                                               tmp_j + AXC_offd_nnz );
+#endif
       num_cols_AXC_offd = tmp_end - tmp_j;
-      HYPRE_THRUST_CALL( fill_n,
+      hypreDevice_IntFilln( offd_mark, num_cols_A_offd, 0 );
+      hypreDevice_ScatterConstant(offd_mark, num_cols_AXC_offd, tmp_j, (HYPRE_Int) 1);
+#if defined(HYPRE_USING_SYCL)
+      HYPRE_ONEDPL_CALL( std::exclusive_scan,
                          offd_mark,
-                         num_cols_A_offd,
+                         offd_mark + num_cols_A_offd,
+                         tmp_j,
                          0 );
-      hypreDevice_ScatterConstant(offd_mark, num_cols_AXC_offd, tmp_j, 1);
+      hypreSycl_gather( AXC_offd_j,
+                        AXC_offd_j + AXC_offd_nnz,
+                        tmp_j,
+                        AXC_offd_j );
+      col_map_offd_AXC = hypre_TAlloc(HYPRE_BigInt, num_cols_AXC_offd, HYPRE_MEMORY_DEVICE);
+      HYPRE_BigInt *tmp_end_big = hypreSycl_copy_if( recv_buf,
+                                                     recv_buf + num_cols_A_offd,
+                                                     offd_mark,
+                                                     col_map_offd_AXC,
+      [] (const auto & x) {return x;} );
+#else
       HYPRE_THRUST_CALL( exclusive_scan,
                          offd_mark,
                          offd_mark + num_cols_A_offd,
@@ -1348,6 +1985,7 @@ hypre_ParCSRMatrixGenerate1DCFDevice( hypre_ParCSRMatrix  *A,
                                                      offd_mark,
                                                      col_map_offd_AXC,
                                                      thrust::identity<HYPRE_Int>());
+#endif
       hypre_assert(tmp_end_big - col_map_offd_AXC == num_cols_AXC_offd);
       hypre_TFree(tmp_j, HYPRE_MEMORY_DEVICE);
 
@@ -1375,7 +2013,8 @@ hypre_ParCSRMatrixGenerate1DCFDevice( hypre_ParCSRMatrix  *A,
       hypre_CSRMatrixMemoryLocation(AXC_offd) = HYPRE_MEMORY_DEVICE;
 
       hypre_ParCSRMatrixDeviceColMapOffd(AXC) = col_map_offd_AXC;
-      hypre_ParCSRMatrixColMapOffd(AXC) = hypre_TAlloc(HYPRE_BigInt, num_cols_AXC_offd, HYPRE_MEMORY_HOST);
+      hypre_ParCSRMatrixColMapOffd(AXC) = hypre_TAlloc(HYPRE_BigInt, num_cols_AXC_offd,
+                                                       HYPRE_MEMORY_HOST);
       hypre_TMemcpy(hypre_ParCSRMatrixColMapOffd(AXC), col_map_offd_AXC, HYPRE_BigInt, num_cols_AXC_offd,
                     HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
 
@@ -1395,4 +2034,4 @@ hypre_ParCSRMatrixGenerate1DCFDevice( hypre_ParCSRMatrix  *A,
    return hypre_error_flag;
 }
 
-#endif // #if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#endif // #if defined(HYPRE_USING_GPU)
diff --git a/external/hypre/src/parcsr_mv/par_csr_filter.c b/external/hypre/src/parcsr_mv/par_csr_filter.c
new file mode 100644
index 00000000..ae433d63
--- /dev/null
+++ b/external/hypre/src/parcsr_mv/par_csr_filter.c
@@ -0,0 +1,218 @@
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ * Member functions for hypre_ParCSRMatrix class.
+ *
+ *****************************************************************************/
+
+#include "_hypre_parcsr_mv.h"
+
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixBlkFilterHost
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ParCSRMatrixBlkFilterHost( hypre_ParCSRMatrix  *A,
+                                 HYPRE_Int            block_size,
+                                 hypre_ParCSRMatrix **B_ptr )
+{
+   MPI_Comm             comm              = hypre_ParCSRMatrixComm(A);
+   HYPRE_BigInt         global_num_rows   = hypre_ParCSRMatrixGlobalNumRows(A);
+   HYPRE_BigInt         global_num_cols   = hypre_ParCSRMatrixGlobalNumCols(A);
+   HYPRE_BigInt        *row_starts        = hypre_ParCSRMatrixRowStarts(A);
+   HYPRE_BigInt        *col_starts        = hypre_ParCSRMatrixColStarts(A);
+   HYPRE_BigInt        *col_map_offd_A    = hypre_ParCSRMatrixColMapOffd(A);
+   HYPRE_MemoryLocation memory_location   = hypre_ParCSRMatrixMemoryLocation(A);
+
+   hypre_CSRMatrix     *A_diag            = hypre_ParCSRMatrixDiag(A);
+   HYPRE_Int            num_rows          = hypre_CSRMatrixNumRows(A_diag);
+   HYPRE_Int           *A_diag_i          = hypre_CSRMatrixI(A_diag);
+   HYPRE_Int           *A_diag_j          = hypre_CSRMatrixJ(A_diag);
+   HYPRE_Complex       *A_diag_a          = hypre_CSRMatrixData(A_diag);
+
+   hypre_CSRMatrix     *A_offd            = hypre_ParCSRMatrixOffd(A);
+   HYPRE_Int           *A_offd_i          = hypre_CSRMatrixI(A_offd);
+   HYPRE_Int           *A_offd_j          = hypre_CSRMatrixJ(A_offd);
+   HYPRE_Complex       *A_offd_a          = hypre_CSRMatrixData(A_offd);
+   HYPRE_Int            num_cols_offd_A   = hypre_CSRMatrixNumCols(A_offd);
+
+   /* Output matrix variables */
+   hypre_ParCSRMatrix  *B;
+   hypre_CSRMatrix     *B_diag, *B_offd;
+   HYPRE_Int           *B_diag_i, *B_offd_i;
+   HYPRE_Int           *B_diag_j, *B_offd_j;
+   HYPRE_Complex       *B_diag_a, *B_offd_a;
+   HYPRE_BigInt        *col_map_offd_B;
+   HYPRE_Int            num_cols_offd_B;
+   HYPRE_Int            B_diag_nnz, B_offd_nnz;
+
+   /* Local variables */
+   HYPRE_BigInt         big_block_size    = (HYPRE_BigInt) block_size;
+   HYPRE_Int            i, j, c;
+   HYPRE_Int           *marker;
+
+   /*-----------------------------------------------------------------------
+    *  Sanity checks
+    *-----------------------------------------------------------------------*/
+
+   if (block_size < 1)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "block size must be greater than one!\n");
+      return hypre_error_flag;
+   }
+
+   if (global_num_rows % big_block_size)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "block size is not a divisor of the number of rows!\n");
+      return hypre_error_flag;
+   }
+
+   if (row_starts[0] % big_block_size)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "block size is not a divisor of the first global row!\n");
+      return hypre_error_flag;
+   }
+
+   if (global_num_rows != global_num_cols)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Function not implemented for rectangular matrices!\n");
+      return hypre_error_flag;
+   }
+
+   /*-----------------------------------------------------------------------
+    *  First pass: compute nonzero counts of B
+    *-----------------------------------------------------------------------*/
+
+   B_diag_nnz = B_offd_nnz = 0;
+   for (i = 0; i < num_rows; i++)
+   {
+      c = i % block_size;
+
+      for (j = A_diag_i[i]; j < A_diag_i[i + 1]; j++)
+      {
+         if (c == (A_diag_j[j] % block_size))
+         {
+            B_diag_nnz++;
+         }
+      }
+
+      for (j = A_offd_i[i]; j < A_offd_i[i + 1]; j++)
+      {
+         if (c == (HYPRE_Int) (col_map_offd_A[A_offd_j[j]] % big_block_size))
+         {
+            B_offd_nnz++;
+         }
+      }
+   }
+
+   /*-----------------------------------------------------------------------
+    *  Create and initialize output matrix
+    *-----------------------------------------------------------------------*/
+
+   B = hypre_ParCSRMatrixCreate(comm, global_num_rows, global_num_cols,
+                                row_starts, col_starts, num_cols_offd_A,
+                                B_diag_nnz, B_offd_nnz);
+
+   hypre_ParCSRMatrixInitialize_v2(B, memory_location);
+
+   B_diag   = hypre_ParCSRMatrixDiag(B);
+   B_diag_i = hypre_CSRMatrixI(B_diag);
+   B_diag_j = hypre_CSRMatrixJ(B_diag);
+   B_diag_a = hypre_CSRMatrixData(B_diag);
+
+   B_offd   = hypre_ParCSRMatrixOffd(B);
+   B_offd_i = hypre_CSRMatrixI(B_offd);
+   B_offd_j = hypre_CSRMatrixJ(B_offd);
+   B_offd_a = hypre_CSRMatrixData(B_offd);
+
+   col_map_offd_B = hypre_ParCSRMatrixColMapOffd(B);
+
+   /*-----------------------------------------------------------------------
+    *  Second pass: Fill entries of B
+    *-----------------------------------------------------------------------*/
+
+   marker = hypre_CTAlloc(HYPRE_Int, num_cols_offd_A, HYPRE_MEMORY_HOST);
+
+   for (i = 0; i < num_rows; i++)
+   {
+      c = i % block_size;
+
+      B_diag_i[i + 1] = B_diag_i[i];
+      for (j = A_diag_i[i]; j < A_diag_i[i + 1]; j++)
+      {
+         if (c == (A_diag_j[j] % block_size))
+         {
+            B_diag_j[B_diag_i[i + 1]] = A_diag_j[j];
+            B_diag_a[B_diag_i[i + 1]] = A_diag_a[j];
+            B_diag_i[i + 1]++;
+         }
+      }
+
+      B_offd_i[i + 1] = B_offd_i[i];
+      for (j = A_offd_i[i]; j < A_offd_i[i + 1]; j++)
+      {
+         if (c == (HYPRE_Int) (col_map_offd_A[A_offd_j[j]] % big_block_size))
+         {
+            B_offd_j[B_offd_i[i + 1]] = A_offd_j[j];
+            B_offd_a[B_offd_i[i + 1]] = A_offd_a[j];
+            B_offd_i[i + 1]++;
+            marker[A_offd_j[j]] = 1;
+         }
+      }
+   }
+
+   /* Update col_map array */
+   num_cols_offd_B = 0;
+   for (i = 0; i < num_cols_offd_A; i++)
+   {
+      if (marker[i])
+      {
+         col_map_offd_B[num_cols_offd_B++] = col_map_offd_A[i];
+      }
+   }
+   hypre_CSRMatrixNumCols(B_offd) = num_cols_offd_B;
+   hypre_TFree(marker, HYPRE_MEMORY_HOST);
+
+   /* Update global nonzeros */
+   hypre_ParCSRMatrixSetDNumNonzeros(B);
+   hypre_ParCSRMatrixNumNonzeros(B) = (HYPRE_BigInt) hypre_ParCSRMatrixDNumNonzeros(B);
+   hypre_MatvecCommPkgCreate(B);
+
+   /* Set output pointer */
+   *B_ptr = B;
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixBlkFilter
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ParCSRMatrixBlkFilter( hypre_ParCSRMatrix  *A,
+                             HYPRE_Int            block_size,
+                             hypre_ParCSRMatrix **B_ptr )
+{
+   HYPRE_ANNOTATE_FUNC_BEGIN;
+
+#if defined(HYPRE_USING_GPU)
+   if (hypre_GetExecPolicy1(hypre_ParCSRMatrixMemoryLocation(A)) == HYPRE_EXEC_DEVICE)
+   {
+      hypre_ParCSRMatrixBlkFilterDevice(A, block_size, B_ptr);
+   }
+   else
+#endif
+   {
+      hypre_ParCSRMatrixBlkFilterHost(A, block_size, B_ptr);
+   }
+
+   HYPRE_ANNOTATE_FUNC_END;
+
+   return hypre_error_flag;
+}
diff --git a/external/hypre/src/parcsr_mv/par_csr_filter_device.c b/external/hypre/src/parcsr_mv/par_csr_filter_device.c
new file mode 100644
index 00000000..30316b2a
--- /dev/null
+++ b/external/hypre/src/parcsr_mv/par_csr_filter_device.c
@@ -0,0 +1,358 @@
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+#include "_hypre_onedpl.hpp"
+#include "_hypre_parcsr_mv.h"
+#include "_hypre_utilities.hpp"
+
+#if defined(HYPRE_USING_GPU)
+
+/*--------------------------------------------------------------------------
+ * hypreGPUKernel_ParCSRMatrixBlkFilterCount
+ *--------------------------------------------------------------------------*/
+
+__global__ void
+hypreGPUKernel_ParCSRMatrixBlkFilterCount(hypre_DeviceItem  &item,
+                                          HYPRE_Int          num_rows,
+                                          HYPRE_Int          block_size,
+                                          HYPRE_Int         *A_diag_i,
+                                          HYPRE_Int         *A_diag_j,
+                                          HYPRE_Int         *A_offd_i,
+                                          HYPRE_Int         *A_offd_j,
+                                          HYPRE_BigInt      *A_col_map_offd,
+                                          HYPRE_Int         *B_diag_i,
+                                          HYPRE_Int         *B_offd_i)
+{
+   HYPRE_Int    row  = hypre_gpu_get_grid_warp_id<1, 1>(item);
+   HYPRE_Int    lane = hypre_gpu_get_lane_id<1>(item);
+   HYPRE_BigInt big_block_size = (HYPRE_BigInt) block_size;
+
+   if (row < num_rows)
+   {
+      HYPRE_Int p = 0, q = 0, pA, qA;
+
+      if (lane < 2)
+      {
+         p = read_only_load(A_diag_i + row + lane);
+         q = read_only_load(A_offd_i + row + lane);
+      }
+      pA = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 1);
+      p  = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 0);
+      qA = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, q, 1);
+      q  = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, q, 0);
+
+      HYPRE_Int diag_count = 0;
+      HYPRE_Int offd_count = 0;
+
+      for (HYPRE_Int j = p + lane;
+           warp_any_sync(item, HYPRE_WARP_FULL_MASK, j < pA);
+           j += HYPRE_WARP_SIZE)
+      {
+         if (j < pA)
+         {
+            const HYPRE_Int col = read_only_load(A_diag_j + j);
+            if ((col % block_size) == (row % block_size))
+            {
+               diag_count++;
+            }
+         }
+      }
+
+      for (HYPRE_Int j = q + lane;
+           warp_any_sync(item, HYPRE_WARP_FULL_MASK, j < qA);
+           j += HYPRE_WARP_SIZE)
+      {
+         if (j < qA)
+         {
+            const HYPRE_Int col = read_only_load(A_offd_j + j);
+            const HYPRE_BigInt global_col = read_only_load(A_col_map_offd + col);
+            if ((HYPRE_Int) (global_col % big_block_size) == (row % block_size))
+            {
+               offd_count++;
+            }
+         }
+      }
+
+      diag_count = warp_reduce_sum(item, diag_count);
+      offd_count = warp_reduce_sum(item, offd_count);
+
+      if (lane == 0)
+      {
+         B_diag_i[row] = diag_count;
+         B_offd_i[row] = offd_count;
+      }
+   }
+}
+
+/*--------------------------------------------------------------------------
+ * hypreGPUKernel_ParCSRMatrixBlkFilterFill
+ *--------------------------------------------------------------------------*/
+
+__global__ void
+hypreGPUKernel_ParCSRMatrixBlkFilterFill(hypre_DeviceItem &item,
+                                         HYPRE_Int         num_rows,
+                                         HYPRE_Int         block_size,
+                                         HYPRE_Int         A_num_cols_offd,
+                                         HYPRE_Int        *A_diag_i,
+                                         HYPRE_Int        *A_diag_j,
+                                         HYPRE_Complex    *A_diag_a,
+                                         HYPRE_Int        *A_offd_i,
+                                         HYPRE_Int        *A_offd_j,
+                                         HYPRE_Complex    *A_offd_a,
+                                         HYPRE_BigInt     *A_col_map_offd,
+                                         HYPRE_Int        *B_diag_i,
+                                         HYPRE_Int        *B_diag_j,
+                                         HYPRE_Complex    *B_diag_a,
+                                         HYPRE_Int        *B_offd_i,
+                                         HYPRE_Int        *B_offd_j,
+                                         HYPRE_Complex    *B_offd_a,
+                                         HYPRE_Int        *col_map_marker)
+{
+   const HYPRE_Int  row = hypre_gpu_get_grid_warp_id<1, 1>(item);
+   const HYPRE_Int  lane = hypre_gpu_get_lane_id<1>(item);
+   HYPRE_Int        p = 0, q = 0, pA, qA;
+   HYPRE_BigInt     big_block_size = (HYPRE_BigInt) block_size;
+
+   if (row >= num_rows)
+   {
+      return;
+   }
+
+   if (lane < 2)
+   {
+      p = read_only_load(A_diag_i + row + lane);
+      q = read_only_load(A_offd_i + row + lane);
+   }
+   pA = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 1);
+   p  = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 0);
+   qA = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, q, 1);
+   q  = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, q, 0);
+
+   HYPRE_Int diag_offset = B_diag_i[row];
+   for (HYPRE_Int j = p + lane;
+        warp_any_sync(item, HYPRE_WARP_FULL_MASK, j < pA);
+        j += HYPRE_WARP_SIZE)
+   {
+      const HYPRE_Int col     = (j < pA) ? read_only_load(A_diag_j + j) : 0;
+      HYPRE_Int       write   = (j < pA && (col % block_size) == (row % block_size));
+      hypre_mask      ballot  = hypre_ballot_sync(item, HYPRE_WARP_FULL_MASK, write);
+      HYPRE_Int       laneoff = hypre_popc(ballot & ((hypre_mask_one << lane) - 1));
+
+      if (write)
+      {
+         HYPRE_Int idx = diag_offset + laneoff;
+         B_diag_j[idx] = col;
+         B_diag_a[idx] = A_diag_a[j];
+      }
+
+      diag_offset += hypre_popc(ballot);
+   }
+
+   if (col_map_marker)
+   {
+      HYPRE_Int offd_offset = B_offd_i[row];
+      for (HYPRE_Int j = q + lane;
+           warp_any_sync(item, HYPRE_WARP_FULL_MASK, j < qA);
+           j += HYPRE_WARP_SIZE)
+      {
+         const HYPRE_Int    col        = (j < qA) ? read_only_load(A_offd_j + j) : 0;
+         const HYPRE_BigInt global_col = (j < qA) ? read_only_load(A_col_map_offd + col) : 0;
+         HYPRE_Int          write      = (j < qA) &&
+                                         (HYPRE_Int) (global_col % big_block_size) == (row % block_size);
+         hypre_mask         ballot     = hypre_ballot_sync(item, HYPRE_WARP_FULL_MASK, write);
+         HYPRE_Int          laneoff    = hypre_popc(ballot & ((hypre_mask_one << lane) - 1));
+
+         if (write)
+         {
+            HYPRE_Int idx = offd_offset + laneoff;
+            B_offd_j[idx] = col;
+            B_offd_a[idx] = A_offd_a[j];
+
+            if (col < A_num_cols_offd)
+            {
+               col_map_marker[col] = 1;
+            }
+         }
+
+         offd_offset += hypre_popc(ballot);
+      }
+   }
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixBlkFilterDevice
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ParCSRMatrixBlkFilterDevice(hypre_ParCSRMatrix  *A,
+                                  HYPRE_Int            block_size,
+                                  hypre_ParCSRMatrix **B_ptr)
+{
+   MPI_Comm             comm            = hypre_ParCSRMatrixComm(A);
+   HYPRE_BigInt         global_num_rows = hypre_ParCSRMatrixGlobalNumRows(A);
+   HYPRE_BigInt         global_num_cols = hypre_ParCSRMatrixGlobalNumCols(A);
+   HYPRE_BigInt        *row_starts      = hypre_ParCSRMatrixRowStarts(A);
+   HYPRE_BigInt        *col_starts      = hypre_ParCSRMatrixColStarts(A);
+   HYPRE_BigInt        *A_col_map_offd  = hypre_ParCSRMatrixDeviceColMapOffd(A);
+   HYPRE_MemoryLocation memory_location = hypre_ParCSRMatrixMemoryLocation(A);
+
+   hypre_CSRMatrix     *A_diag          = hypre_ParCSRMatrixDiag(A);
+   HYPRE_Int            num_rows        = hypre_CSRMatrixNumRows(A_diag);
+   HYPRE_Int           *A_diag_i        = hypre_CSRMatrixI(A_diag);
+   HYPRE_Int           *A_diag_j        = hypre_CSRMatrixJ(A_diag);
+   HYPRE_Complex       *A_diag_a        = hypre_CSRMatrixData(A_diag);
+
+   hypre_CSRMatrix     *A_offd          = hypre_ParCSRMatrixOffd(A);
+   HYPRE_Int           *A_offd_i        = hypre_CSRMatrixI(A_offd);
+   HYPRE_Int           *A_offd_j        = hypre_CSRMatrixJ(A_offd);
+   HYPRE_Complex       *A_offd_a        = hypre_CSRMatrixData(A_offd);
+   HYPRE_Int            num_cols_offd   = hypre_CSRMatrixNumCols(A_offd);
+
+   hypre_ParCSRMatrix  *B;
+   hypre_CSRMatrix     *B_diag;
+   hypre_CSRMatrix     *B_offd;
+   HYPRE_Int           *B_diag_i;
+   HYPRE_Int           *B_diag_j;
+   HYPRE_Complex       *B_diag_a;
+   HYPRE_Int           *B_offd_i;
+   HYPRE_Int           *B_offd_j;
+   HYPRE_Complex       *B_offd_a;
+
+   HYPRE_Int            B_diag_nnz, B_offd_nnz;
+   HYPRE_BigInt        *B_col_map_offd;
+   HYPRE_Int           *col_map_marker;
+   HYPRE_BigInt        *col_map_end;
+
+   const dim3           bDim = hypre_GetDefaultDeviceBlockDimension();
+   const dim3           gDim = hypre_GetDefaultDeviceGridDimension(num_rows,
+                                                                   "w", bDim);
+
+   hypre_GpuProfilingPushRange("ParCSRMatrixBlkFilter");
+
+   /* Create A's device column map */
+   if (!hypre_ParCSRMatrixDeviceColMapOffd(A) &&
+       hypre_ParCSRMatrixColMapOffd(A))
+   {
+      hypre_ParCSRMatrixCopyColMapOffdToDevice(A);
+      A_col_map_offd = hypre_ParCSRMatrixDeviceColMapOffd(A);
+   }
+
+   /* Create and initialize output matrix B */
+   B = hypre_ParCSRMatrixCreate(comm, global_num_rows, global_num_cols,
+                                row_starts, col_starts, num_cols_offd,
+                                0, 0);
+   hypre_ParCSRMatrixInitialize_v2(B, memory_location);
+
+   B_diag = hypre_ParCSRMatrixDiag(B);
+   B_offd = hypre_ParCSRMatrixOffd(B);
+
+   B_diag_i = hypre_CSRMatrixI(B_diag);
+   B_offd_i = hypre_CSRMatrixI(B_offd);
+
+   /* First pass: count nonzeros */
+   HYPRE_GPU_LAUNCH( hypreGPUKernel_ParCSRMatrixBlkFilterCount, gDim, bDim,
+                     num_rows, block_size,
+                     A_diag_i, A_diag_j,
+                     A_offd_i, A_offd_j,
+                     A_col_map_offd,
+                     B_diag_i, B_offd_i );
+
+   /* Compute row pointers and get total number of nonzeros */
+   hypreDevice_IntegerExclusiveScan(num_rows + 1, B_diag_i);
+   hypreDevice_IntegerExclusiveScan(num_rows + 1, B_offd_i);
+   hypre_TMemcpy(&B_diag_nnz, B_diag_i + num_rows, HYPRE_Int, 1,
+                 HYPRE_MEMORY_HOST, memory_location);
+   hypre_TMemcpy(&B_offd_nnz, B_offd_i + num_rows, HYPRE_Int, 1,
+                 HYPRE_MEMORY_HOST, memory_location);
+
+   /* Allocate memory for B */
+   B_diag_j = hypre_TAlloc(HYPRE_Int, B_diag_nnz, memory_location);
+   B_offd_j = hypre_TAlloc(HYPRE_Int, B_offd_nnz, memory_location);
+   B_diag_a = hypre_TAlloc(HYPRE_Complex, B_diag_nnz, memory_location);
+   B_offd_a = hypre_TAlloc(HYPRE_Complex, B_offd_nnz, memory_location);
+
+   /* Create a marker for used columns */
+   if (num_cols_offd > 0)
+   {
+      col_map_marker = hypre_CTAlloc(HYPRE_Int, num_cols_offd, memory_location);
+   }
+   else
+   {
+      col_map_marker = NULL;
+   }
+
+   /* Second pass: fill B */
+   HYPRE_GPU_LAUNCH( hypreGPUKernel_ParCSRMatrixBlkFilterFill, gDim, bDim,
+                     num_rows, block_size, num_cols_offd,
+                     A_diag_i, A_diag_j, A_diag_a,
+                     A_offd_i, A_offd_j, A_offd_a,
+                     A_col_map_offd,
+                     B_diag_i, B_diag_j, B_diag_a,
+                     B_offd_i, B_offd_j, B_offd_a,
+                     col_map_marker );
+
+   /* Update CSR matrix structures */
+   hypre_CSRMatrixJ(B_diag)           = B_diag_j;
+   hypre_CSRMatrixData(B_diag)        = B_diag_a;
+   hypre_CSRMatrixNumNonzeros(B_diag) = B_diag_nnz;
+   hypre_CSRMatrixJ(B_offd)           = B_offd_j;
+   hypre_CSRMatrixData(B_offd)        = B_offd_a;
+   hypre_CSRMatrixNumNonzeros(B_offd) = B_offd_nnz;
+
+   /* Set up B's col_map_offd */
+   if (B_offd_nnz > 0)
+   {
+      /* Create B's device column map */
+      hypre_ParCSRMatrixDeviceColMapOffd(B) = hypre_CTAlloc(HYPRE_BigInt,
+                                                            num_cols_offd,
+                                                            HYPRE_MEMORY_DEVICE);
+      B_col_map_offd = hypre_ParCSRMatrixDeviceColMapOffd(B);
+
+#if defined(HYPRE_USING_SYCL)
+      /* Copy used columns to B's col_map_offd */
+      col_map_end = hypreSycl_copy_if(A_col_map_offd,
+                                      A_col_map_offd + num_cols_offd,
+                                      col_map_marker,
+                                      B_col_map_offd,
+      [] (const auto & x) {return x;} );
+#else
+      /* Copy used columns to B's col_map_offd */
+      col_map_end = HYPRE_THRUST_CALL(copy_if,
+                                      A_col_map_offd,
+                                      A_col_map_offd + num_cols_offd,
+                                      col_map_marker,
+                                      B_col_map_offd,
+                                      thrust::identity<HYPRE_Int>());
+#endif
+
+      hypre_CSRMatrixNumCols(B_offd) = (HYPRE_Int) (col_map_end - B_col_map_offd);
+
+      /* Copy B's column map to host */
+      hypre_TMemcpy(hypre_ParCSRMatrixColMapOffd(B),
+                    hypre_ParCSRMatrixDeviceColMapOffd(B),
+                    HYPRE_BigInt,
+                    hypre_CSRMatrixNumCols(B_offd),
+                    HYPRE_MEMORY_HOST,
+                    HYPRE_MEMORY_DEVICE);
+   }
+
+   /* Update global nonzeros */
+   hypre_ParCSRMatrixSetDNumNonzeros(B);
+   hypre_ParCSRMatrixNumNonzeros(B) = (HYPRE_BigInt) hypre_ParCSRMatrixDNumNonzeros(B);
+
+   /* TODO (VPM): compute B's commpkg directly from A's commpkg */
+   hypre_MatvecCommPkgCreate(B);
+
+   /* Set output pointer */
+   *B_ptr = B;
+
+   hypre_TFree(col_map_marker, memory_location);
+   hypre_GpuProfilingPopRange();
+   return hypre_error_flag;
+}
+
+#endif /* if defined(HYPRE_USING_GPU) */
diff --git a/external/hypre/src/parcsr_mv/par_csr_matmat.c b/external/hypre/src/parcsr_mv/par_csr_matmat.c
new file mode 100644
index 00000000..4fa407cf
--- /dev/null
+++ b/external/hypre/src/parcsr_mv/par_csr_matmat.c
@@ -0,0 +1,159 @@
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+#include "_hypre_parcsr_mv.h"
+
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatMatDiagHost
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ParCSRMatMatDiagHost(hypre_ParCSRMatrix  *A,
+                           hypre_ParCSRMatrix  *BT,
+                           hypre_ParCSRMatrix  *C)
+{
+   HYPRE_Int             num_rows        = hypre_ParCSRMatrixNumRows(A);
+   hypre_CSRMatrix      *A_diag          = hypre_ParCSRMatrixDiag(A);
+   hypre_CSRMatrix      *A_offd          = hypre_ParCSRMatrixOffd(A);
+
+   hypre_CSRMatrix      *BT_diag, *BT_offd, *C_diag;
+   HYPRE_Int            *A_diag_i, *BT_diag_i, *C_diag_i;
+   HYPRE_Int            *A_offd_i, *BT_offd_i;
+   HYPRE_Int            *A_diag_j, *BT_diag_j, *C_diag_j;
+   HYPRE_Int            *A_offd_j, *BT_offd_j;
+   HYPRE_Complex        *A_diag_a, *BT_diag_a, *C_diag_a;
+   HYPRE_Complex        *A_offd_a, *BT_offd_a;
+   HYPRE_BigInt         *A_col_map_offd;
+   HYPRE_BigInt         *BT_col_map_offd;
+
+   HYPRE_Int             i, kA, kB;
+   HYPRE_Complex         diag;
+
+   /* Load pointers */
+   BT_diag   = hypre_ParCSRMatrixDiag(BT);
+   BT_offd   = hypre_ParCSRMatrixOffd(BT);
+   BT_diag_i = hypre_CSRMatrixI(BT_diag);
+   BT_offd_i = hypre_CSRMatrixI(BT_offd);
+   BT_diag_j = hypre_CSRMatrixJ(BT_diag);
+   BT_offd_j = hypre_CSRMatrixJ(BT_offd);
+   BT_diag_a = hypre_CSRMatrixData(BT_diag);
+   BT_offd_a = hypre_CSRMatrixData(BT_offd);
+   A_diag_i  = hypre_CSRMatrixI(A_diag);
+   A_offd_i  = hypre_CSRMatrixI(A_offd);
+   A_diag_j  = hypre_CSRMatrixJ(A_diag);
+   A_offd_j  = hypre_CSRMatrixJ(A_offd);
+   A_diag_a  = hypre_CSRMatrixData(A_diag);
+   A_offd_a  = hypre_CSRMatrixData(A_offd);
+   C_diag    = hypre_ParCSRMatrixDiag(C);
+   C_diag_i  = hypre_CSRMatrixI(C_diag);
+   C_diag_j  = hypre_CSRMatrixJ(C_diag);
+   C_diag_a  = hypre_CSRMatrixData(C_diag);
+
+   BT_col_map_offd = hypre_ParCSRMatrixColMapOffd(BT);
+   A_col_map_offd  = hypre_ParCSRMatrixColMapOffd(A);
+
+   /* Compute C = diag(A .* BT) */
+#ifdef HYPRE_USING_OPENMP
+   #pragma omp parallel for private(i, kA, kB, diag)
+#endif
+   for (i = 0; i < num_rows; i++)
+   {
+      /* Compute diagonal matrix contributions */
+      diag = 0.0;
+      for (kA = A_diag_i[i], kB = BT_diag_i[i];
+           kA < A_diag_i[i + 1] && kB < BT_diag_i[i + 1];)
+      {
+         if (A_diag_j[kA] < BT_diag_j[kB])
+         {
+            kA++;
+         }
+         else if (A_diag_j[kA] > BT_diag_j[kB])
+         {
+            kB++;
+         }
+         else
+         {
+            diag += A_diag_a[kA] * BT_diag_a[kB];
+            kA++; kB++;
+         }
+      }
+
+      /* Compute off-diagonal matrix contributions */
+      for (kA = A_offd_i[i], kB = BT_offd_i[i];
+           kA < A_offd_i[i + 1] && kB < BT_offd_i[i + 1];)
+      {
+         if (A_col_map_offd[A_offd_j[kA]] < BT_col_map_offd[BT_offd_j[kB]])
+         {
+            kA++;
+         }
+         else if (A_col_map_offd[A_offd_j[kA]] > BT_col_map_offd[BT_offd_j[kB]])
+         {
+            kB++;
+         }
+         else
+         {
+            diag += A_offd_a[kA] * BT_offd_a[kB];
+            kA++; kB++;
+         }
+      }
+
+      C_diag_a[i] = diag;
+      C_diag_j[i] = i;
+      C_diag_i[i + 1] = i + 1;
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatMatDiag
+ *
+ * Computes C = diag(A * B)
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ParCSRMatMatDiag(hypre_ParCSRMatrix  *A,
+                       hypre_ParCSRMatrix  *B,
+                       hypre_ParCSRMatrix **C_ptr)
+{
+   MPI_Comm              comm            = hypre_ParCSRMatrixComm(A);
+   HYPRE_BigInt          global_num_rows = hypre_ParCSRMatrixGlobalNumRows(A);
+   HYPRE_BigInt          global_num_cols = hypre_ParCSRMatrixGlobalNumCols(B);
+   HYPRE_Int             num_rows        = hypre_ParCSRMatrixNumRows(A);
+   HYPRE_BigInt         *row_starts      = hypre_ParCSRMatrixRowStarts(A);
+   HYPRE_MemoryLocation  memory_location = hypre_ParCSRMatrixMemoryLocation(A);
+   hypre_ParCSRMatrix   *C, *BT;
+
+   /* Create and initialize output matrix C */
+   C = hypre_ParCSRMatrixCreate(comm, global_num_rows, global_num_cols,
+                                row_starts, row_starts, 0, num_rows, 0);
+   hypre_ParCSRMatrixInitialize_v2(C, memory_location);
+
+   /* Transpose B for easier multiplication with A */
+   hypre_ParCSRMatrixTranspose(B, &BT, 1);
+
+#if defined(HYPRE_USING_GPU)
+   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy2(hypre_ParCSRMatrixMemoryLocation(A),
+                                                     hypre_ParCSRMatrixMemoryLocation(BT));
+   if (exec == HYPRE_EXEC_DEVICE)
+   {
+      hypre_ParCSRMatMatDiagDevice(A, BT, C);
+   }
+   else
+#endif
+   {
+      hypre_ParCSRMatMatDiagHost(A, BT, C);
+   }
+
+   /* Output pointer */
+   *C_ptr = C;
+
+   /* Free memory */
+   hypre_ParCSRMatrixDestroy(BT);
+
+   return hypre_error_flag;
+}
diff --git a/external/hypre/src/parcsr_mv/par_csr_matmat_device.c b/external/hypre/src/parcsr_mv/par_csr_matmat_device.c
new file mode 100644
index 00000000..df65d5cd
--- /dev/null
+++ b/external/hypre/src/parcsr_mv/par_csr_matmat_device.c
@@ -0,0 +1,152 @@
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+#include "_hypre_onedpl.hpp"
+#include "_hypre_parcsr_mv.h"
+#include "_hypre_utilities.hpp"
+
+#if defined(HYPRE_USING_GPU)
+
+/*--------------------------------------------------------------------------
+ * hypreGPUKernel_ParCSRMatMatDiag
+ *--------------------------------------------------------------------------*/
+
+__global__ void
+hypreGPUKernel_ParCSRMatMatDiag(hypre_DeviceItem &item,
+                                HYPRE_Int         num_rows,
+                                HYPRE_Int        *A_diag_i,
+                                HYPRE_Int        *A_diag_j,
+                                HYPRE_Complex    *A_diag_data,
+                                HYPRE_Int        *A_offd_i,
+                                HYPRE_Int        *A_offd_j,
+                                HYPRE_Complex    *A_offd_data,
+                                HYPRE_Int        *BT_diag_i,
+                                HYPRE_Int        *BT_diag_j,
+                                HYPRE_Complex    *BT_diag_data,
+                                HYPRE_Int        *BT_offd_i,
+                                HYPRE_Int        *BT_offd_j,
+                                HYPRE_Complex    *BT_offd_data,
+                                HYPRE_BigInt     *A_col_map_offd,
+                                HYPRE_BigInt     *BT_col_map_offd,
+                                HYPRE_Complex    *C_diag_data)
+{
+   const HYPRE_Int row = hypre_gpu_get_thread_id<1>(item);
+
+   if (row < num_rows)
+   {
+      HYPRE_Complex sum = 0.0;
+
+      /* Process diagonal part of A */
+      HYPRE_Int kA = A_diag_i[row];
+      HYPRE_Int kB = BT_diag_i[row];
+      while (kA < A_diag_i[row + 1] && kB < BT_diag_i[row + 1])
+      {
+         if (A_diag_j[kA] < BT_diag_j[kB])
+         {
+            kA++;
+         }
+         else if (A_diag_j[kA] > BT_diag_j[kB])
+         {
+            kB++;
+         }
+         else
+         {
+            sum += A_diag_data[kA] * BT_diag_data[kB];
+            kA++;
+            kB++;
+         }
+      }
+
+      /* Process off-diagonal part of A */
+      kA = A_offd_i[row];
+      kB = BT_offd_i[row];
+      while (kA < A_offd_i[row + 1] && kB < BT_offd_i[row + 1])
+      {
+         HYPRE_BigInt col_A = A_col_map_offd[A_offd_j[kA]];
+         HYPRE_BigInt col_B = BT_col_map_offd[BT_offd_j[kB]];
+         if (col_A < col_B)
+         {
+            kA++;
+         }
+         else if (col_A > col_B)
+         {
+            kB++;
+         }
+         else
+         {
+            sum += A_offd_data[kA] * BT_offd_data[kB];
+            kA++;
+            kB++;
+         }
+      }
+
+      C_diag_data[row] = sum;
+   }
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatMatDiagDevice
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ParCSRMatMatDiagDevice(hypre_ParCSRMatrix  *A,
+                             hypre_ParCSRMatrix  *BT,
+                             hypre_ParCSRMatrix  *C)
+{
+   HYPRE_Int             num_rows        = hypre_ParCSRMatrixNumRows(A);
+   hypre_CSRMatrix      *A_diag          = hypre_ParCSRMatrixDiag(A);
+   hypre_CSRMatrix      *A_offd          = hypre_ParCSRMatrixOffd(A);
+   hypre_CSRMatrix      *BT_diag         = hypre_ParCSRMatrixDiag(BT);
+   hypre_CSRMatrix      *BT_offd         = hypre_ParCSRMatrixOffd(BT);
+   hypre_CSRMatrix      *C_diag          = hypre_ParCSRMatrixDiag(C);
+
+   HYPRE_Int            *C_diag_i        = hypre_CSRMatrixI(C_diag);
+   HYPRE_Int            *C_diag_j        = hypre_CSRMatrixJ(C_diag);
+
+   hypre_GpuProfilingPushRange("ParCSRMatMatDiag");
+
+   /* Set up C_diag_i and C_diag_j */
+#if defined(HYPRE_USING_SYCL)
+   hypreSycl_sequence(C_diag_i, C_diag_i + num_rows + 1, 0);
+   hypreSycl_sequence(C_diag_j, C_diag_j + num_rows, 0);
+#else
+   HYPRE_THRUST_CALL(sequence, C_diag_i, C_diag_i + num_rows + 1, 0);
+   HYPRE_THRUST_CALL(sequence, C_diag_j, C_diag_j + num_rows, 0);
+#endif
+
+   /* Update device column maps if needed */
+   hypre_ParCSRMatrixCopyColMapOffdToDevice(A);
+   hypre_ParCSRMatrixCopyColMapOffdToDevice(BT);
+
+   /* Launch GPU kernel */
+   const dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+   const dim3 gDim = hypre_GetDefaultDeviceGridDimension(num_rows, "threads", bDim);
+
+   HYPRE_GPU_LAUNCH( hypreGPUKernel_ParCSRMatMatDiag, gDim, bDim,
+                     num_rows,
+                     hypre_CSRMatrixI(A_diag),
+                     hypre_CSRMatrixJ(A_diag),
+                     hypre_CSRMatrixData(A_diag),
+                     hypre_CSRMatrixI(A_offd),
+                     hypre_CSRMatrixJ(A_offd),
+                     hypre_CSRMatrixData(A_offd),
+                     hypre_CSRMatrixI(BT_diag),
+                     hypre_CSRMatrixJ(BT_diag),
+                     hypre_CSRMatrixData(BT_diag),
+                     hypre_CSRMatrixI(BT_offd),
+                     hypre_CSRMatrixJ(BT_offd),
+                     hypre_CSRMatrixData(BT_offd),
+                     hypre_ParCSRMatrixDeviceColMapOffd(A),
+                     hypre_ParCSRMatrixDeviceColMapOffd(BT),
+                     hypre_CSRMatrixData(C_diag) );
+
+   hypre_GpuProfilingPopRange();
+
+   return hypre_error_flag;
+}
+
+#endif /* if defined(HYPRE_USING_GPU) */
diff --git a/external/hypre/src/parcsr_mv/par_csr_matop.c b/external/hypre/src/parcsr_mv/par_csr_matop.c
index 096d8957..24a8939c 100644
--- a/external/hypre/src/parcsr_mv/par_csr_matop.c
+++ b/external/hypre/src/parcsr_mv/par_csr_matop.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -70,8 +70,8 @@ hypre_ParMatmul_RowSizes( HYPRE_MemoryLocation memory_location,
    HYPRE_Int  start_indexing = 0; /* start indexing for C_data at 0 */
    HYPRE_Int  num_threads = hypre_NumThreads();
 
-   *C_diag_i = hypre_CTAlloc(HYPRE_Int, num_rows_diag_A+1, memory_location);
-   *C_offd_i = hypre_CTAlloc(HYPRE_Int, num_rows_diag_A+1, memory_location);
+   *C_diag_i = hypre_CTAlloc(HYPRE_Int, num_rows_diag_A + 1, memory_location);
+   *C_offd_i = hypre_CTAlloc(HYPRE_Int, num_rows_diag_A + 1, memory_location);
 
    jj_count_diag_array = hypre_CTAlloc(HYPRE_Int, num_threads, HYPRE_MEMORY_HOST);
    jj_count_offd_array = hypre_CTAlloc(HYPRE_Int, num_threads, HYPRE_MEMORY_HOST);
@@ -80,7 +80,7 @@ hypre_ParMatmul_RowSizes( HYPRE_MemoryLocation memory_location,
     *  Loop over rows of A
     *-----------------------------------------------------------------------*/
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel
+   #pragma omp parallel
 #endif
    {
       HYPRE_Int  *B_marker = NULL;
@@ -91,19 +91,19 @@ hypre_ParMatmul_RowSizes( HYPRE_MemoryLocation memory_location,
       HYPRE_Int   ii, ns, ne;
 
       num_threads = hypre_NumActiveThreads();
-      size = num_rownnz_A/num_threads;
-      rest = num_rownnz_A - size*num_threads;
+      size = num_rownnz_A / num_threads;
+      rest = num_rownnz_A - size * num_threads;
 
       ii = hypre_GetThreadNum();
       if (ii < rest)
       {
-         ns = ii*size+ii;
-         ne = (ii+1)*size+ii+1;
+         ns = ii * size + ii;
+         ne = (ii + 1) * size + ii + 1;
       }
       else
       {
-         ns = ii*size+rest;
-         ne = (ii+1)*size+rest;
+         ns = ii * size + rest;
+         ne = (ii + 1) * size + rest;
       }
       jj_count_diag = start_indexing;
       jj_count_offd = start_indexing;
@@ -147,7 +147,7 @@ hypre_ParMatmul_RowSizes( HYPRE_MemoryLocation memory_location,
 
          if (num_cols_offd_A)
          {
-            for (jj2 = A_offd_i[ii1]; jj2 < A_offd_i[ii1+1]; jj2++)
+            for (jj2 = A_offd_i[ii1]; jj2 < A_offd_i[ii1 + 1]; jj2++)
             {
                i2 = A_offd_j[jj2];
 
@@ -155,9 +155,9 @@ hypre_ParMatmul_RowSizes( HYPRE_MemoryLocation memory_location,
                 *  Loop over entries in row i2 of B_ext.
                 *-----------------------------------------------------------*/
 
-               for (jj3 = B_ext_offd_i[i2]; jj3 < B_ext_offd_i[i2+1]; jj3++)
+               for (jj3 = B_ext_offd_i[i2]; jj3 < B_ext_offd_i[i2 + 1]; jj3++)
                {
-                  i3 = num_cols_diag_B+B_ext_offd_j[jj3];
+                  i3 = num_cols_diag_B + B_ext_offd_j[jj3];
 
                   /*--------------------------------------------------------
                    *  Check B_marker to see that C_{ii1,i3} has not already
@@ -172,7 +172,7 @@ hypre_ParMatmul_RowSizes( HYPRE_MemoryLocation memory_location,
                   }
                }
 
-               for (jj3 = B_ext_diag_i[i2]; jj3 < B_ext_diag_i[i2+1]; jj3++)
+               for (jj3 = B_ext_diag_i[i2]; jj3 < B_ext_diag_i[i2 + 1]; jj3++)
                {
                   i3 = B_ext_diag_j[jj3];
 
@@ -189,7 +189,7 @@ hypre_ParMatmul_RowSizes( HYPRE_MemoryLocation memory_location,
           *  Loop over entries in row ii1 of A_diag.
           *-----------------------------------------------------------------*/
 
-         for (jj2 = A_diag_i[ii1]; jj2 < A_diag_i[ii1+1]; jj2++)
+         for (jj2 = A_diag_i[ii1]; jj2 < A_diag_i[ii1 + 1]; jj2++)
          {
             i2 = A_diag_j[jj2];
 
@@ -197,7 +197,7 @@ hypre_ParMatmul_RowSizes( HYPRE_MemoryLocation memory_location,
              *  Loop over entries in row i2 of B_diag.
              *-----------------------------------------------------------*/
 
-            for (jj3 = B_diag_i[i2]; jj3 < B_diag_i[i2+1]; jj3++)
+            for (jj3 = B_diag_i[i2]; jj3 < B_diag_i[i2 + 1]; jj3++)
             {
                i3 = B_diag_j[jj3];
 
@@ -220,9 +220,9 @@ hypre_ParMatmul_RowSizes( HYPRE_MemoryLocation memory_location,
 
             if (num_cols_offd_B)
             {
-               for (jj3 = B_offd_i[i2]; jj3 < B_offd_i[i2+1]; jj3++)
+               for (jj3 = B_offd_i[i2]; jj3 < B_offd_i[i2 + 1]; jj3++)
                {
-                  i3 = num_cols_diag_B+map_B_to_C[B_offd_j[jj3]];
+                  i3 = num_cols_diag_B + map_B_to_C[B_offd_j[jj3]];
 
                   /*--------------------------------------------------------
                    *  Check B_marker to see that C_{ii1,i3} has not already
@@ -252,7 +252,7 @@ hypre_ParMatmul_RowSizes( HYPRE_MemoryLocation memory_location,
 
       hypre_TFree(B_marker, HYPRE_MEMORY_HOST);
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
 
       /* Correct diag_i and offd_i - phase 1 */
@@ -288,20 +288,20 @@ hypre_ParMatmul_RowSizes( HYPRE_MemoryLocation memory_location,
       if (rownnz_A != NULL)
       {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+         #pragma omp barrier
 #endif
-         for (i1 = ns; i1 < (ne-1); i1++)
+         for (i1 = ns; i1 < (ne - 1); i1++)
          {
-            for (ii1 = rownnz_A[i1] + 1; ii1 < rownnz_A[i1+1]; ii1++)
+            for (ii1 = rownnz_A[i1] + 1; ii1 < rownnz_A[i1 + 1]; ii1++)
             {
-               (*C_diag_i)[ii1] = (*C_diag_i)[rownnz_A[i1+1]];
-               (*C_offd_i)[ii1] = (*C_offd_i)[rownnz_A[i1+1]];
+               (*C_diag_i)[ii1] = (*C_diag_i)[rownnz_A[i1 + 1]];
+               (*C_offd_i)[ii1] = (*C_offd_i)[rownnz_A[i1 + 1]];
             }
          }
 
          if (ii < (num_threads - 1))
          {
-            for (ii1 = rownnz_A[ne-1] + 1; ii1 < rownnz_A[ne]; ii1++)
+            for (ii1 = rownnz_A[ne - 1] + 1; ii1 < rownnz_A[ne]; ii1++)
             {
                (*C_diag_i)[ii1] = (*C_diag_i)[rownnz_A[ne]];
                (*C_offd_i)[ii1] = (*C_offd_i)[rownnz_A[ne]];
@@ -309,7 +309,7 @@ hypre_ParMatmul_RowSizes( HYPRE_MemoryLocation memory_location,
          }
          else
          {
-            for (ii1 = rownnz_A[ne-1] + 1; ii1 < num_rows_diag_A; ii1++)
+            for (ii1 = rownnz_A[ne - 1] + 1; ii1 < num_rows_diag_A; ii1++)
             {
                (*C_diag_i)[ii1] = (*C_diag_i)[num_rows_diag_A];
                (*C_offd_i)[ii1] = (*C_offd_i)[num_rows_diag_A];
@@ -326,8 +326,8 @@ hypre_ParMatmul_RowSizes( HYPRE_MemoryLocation memory_location,
 
    for (i = 0; i < num_rows_diag_A; i++)
    {
-      hypre_assert((*C_diag_i)[i] <= (*C_diag_i)[i+1]);
-      hypre_assert((*C_offd_i)[i] <= (*C_offd_i)[i+1]);
+      hypre_assert((*C_diag_i)[i] <= (*C_diag_i)[i + 1]);
+      hypre_assert((*C_offd_i)[i] <= (*C_offd_i)[i + 1]);
    }
 #endif
 
@@ -405,7 +405,7 @@ hypre_ParMatmul( hypre_ParCSRMatrix  *A,
 
    /* ParCSRMatrix C */
    hypre_ParCSRMatrix *C;
-   HYPRE_BigInt       *col_map_offd_C;
+   HYPRE_BigInt       *col_map_offd_C = NULL;
    HYPRE_Int          *map_B_to_C = NULL;
 
    /* C_diag */
@@ -424,17 +424,17 @@ hypre_ParMatmul( hypre_ParCSRMatrix  *A,
    HYPRE_Int           C_diag_size;
 
    /* Bs_ext */
-   hypre_CSRMatrix    *Bs_ext;
-   HYPRE_Complex      *Bs_ext_data;
-   HYPRE_Int          *Bs_ext_i;
-   HYPRE_BigInt       *Bs_ext_j;
-   HYPRE_Complex      *B_ext_diag_data;
+   hypre_CSRMatrix    *Bs_ext = NULL;
+   HYPRE_Complex      *Bs_ext_data = NULL;
+   HYPRE_Int          *Bs_ext_i = NULL;
+   HYPRE_BigInt       *Bs_ext_j = NULL;
+   HYPRE_Complex      *B_ext_diag_data = NULL;
    HYPRE_Int          *B_ext_diag_i;
-   HYPRE_Int          *B_ext_diag_j;
+   HYPRE_Int          *B_ext_diag_j = NULL;
    HYPRE_Int           B_ext_diag_size;
-   HYPRE_Complex      *B_ext_offd_data;
+   HYPRE_Complex      *B_ext_offd_data = NULL;
    HYPRE_Int          *B_ext_offd_i;
-   HYPRE_Int          *B_ext_offd_j;
+   HYPRE_Int          *B_ext_offd_j = NULL;
    HYPRE_BigInt       *B_big_offd_j = NULL;
    HYPRE_Int           B_ext_offd_size;
 
@@ -467,7 +467,7 @@ hypre_ParMatmul( hypre_ParCSRMatrix  *A,
 
    if (ncols_A != nrows_B || num_cols_diag_A != num_rows_diag_B)
    {
-      hypre_error_w_msg(HYPRE_ERROR_GENERIC," Error! Incompatible matrix dimensions!\n");
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, " Error! Incompatible matrix dimensions!\n");
 
       HYPRE_ANNOTATE_FUNC_END;
       return NULL;
@@ -483,9 +483,20 @@ hypre_ParMatmul( hypre_ParCSRMatrix  *A,
    if (num_rownnz_diag_A != num_rows_diag_A &&
        num_rownnz_offd_A != num_rows_offd_A )
    {
-      hypre_MergeOrderedArrays(num_rownnz_diag_A, A_diag_ir,
-                               num_rownnz_offd_A, A_offd_ir,
-                               &num_rownnz_A, &rownnz_A);
+      hypre_IntArray arr_diag;
+      hypre_IntArray arr_offd;
+      hypre_IntArray arr_rownnz;
+
+      hypre_IntArrayData(&arr_diag) = A_diag_ir;
+      hypre_IntArrayData(&arr_offd) = A_offd_ir;
+      hypre_IntArraySize(&arr_diag) = num_rownnz_diag_A;
+      hypre_IntArraySize(&arr_offd) = num_rownnz_offd_A;
+      hypre_IntArrayMemoryLocation(&arr_rownnz) = memory_location_A;
+
+      hypre_IntArrayMergeOrdered(&arr_diag, &arr_offd, &arr_rownnz);
+
+      num_rownnz_A = hypre_IntArraySize(&arr_rownnz);
+      rownnz_A     = hypre_IntArrayData(&arr_rownnz);
    }
    else
    {
@@ -510,13 +521,13 @@ hypre_ParMatmul( hypre_ParCSRMatrix  *A,
        * equally load balanced partitionings within
        * hypre_ParCSRMatrixExtractBExt
        *--------------------------------------------------------------------*/
-      Bs_ext      = hypre_ParCSRMatrixExtractBExt(B,A,1);
+      Bs_ext      = hypre_ParCSRMatrixExtractBExt(B, A, 1);
       Bs_ext_data = hypre_CSRMatrixData(Bs_ext);
       Bs_ext_i    = hypre_CSRMatrixI(Bs_ext);
       Bs_ext_j    = hypre_CSRMatrixBigJ(Bs_ext);
    }
-   B_ext_diag_i = hypre_CTAlloc(HYPRE_Int, num_cols_offd_A+1, HYPRE_MEMORY_HOST);
-   B_ext_offd_i = hypre_CTAlloc(HYPRE_Int, num_cols_offd_A+1, HYPRE_MEMORY_HOST);
+   B_ext_diag_i = hypre_CTAlloc(HYPRE_Int, num_cols_offd_A + 1, HYPRE_MEMORY_HOST);
+   B_ext_offd_i = hypre_CTAlloc(HYPRE_Int, num_cols_offd_A + 1, HYPRE_MEMORY_HOST);
    B_ext_diag_size = 0;
    B_ext_offd_size = 0;
    last_col_diag_B = first_col_diag_B + (HYPRE_BigInt) num_cols_diag_B - 1;
@@ -524,7 +535,7 @@ hypre_ParMatmul( hypre_ParCSRMatrix  *A,
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
    hypre_UnorderedBigIntSet set;
 
-#pragma omp parallel
+   #pragma omp parallel
    {
       HYPRE_Int size, rest, ii;
       HYPRE_Int ns, ne;
@@ -533,18 +544,18 @@ hypre_ParMatmul( hypre_ParCSRMatrix  *A,
       HYPRE_Int cnt_offd, cnt_diag;
       HYPRE_Int num_threads = hypre_NumActiveThreads();
 
-      size = num_cols_offd_A/num_threads;
-      rest = num_cols_offd_A - size*num_threads;
+      size = num_cols_offd_A / num_threads;
+      rest = num_cols_offd_A - size * num_threads;
       ii = hypre_GetThreadNum();
       if (ii < rest)
       {
-         ns = ii*size+ii;
-         ne = (ii+1)*size+ii+1;
+         ns = ii * size + ii;
+         ne = (ii + 1) * size + ii + 1;
       }
       else
       {
-         ns = ii*size+rest;
-         ne = (ii+1)*size+rest;
+         ns = ii * size + rest;
+         ne = (ii + 1) * size + rest;
       }
 
       my_diag_size = 0;
@@ -553,7 +564,7 @@ hypre_ParMatmul( hypre_ParCSRMatrix  *A,
       {
          B_ext_diag_i[i] = my_diag_size;
          B_ext_offd_i[i] = my_offd_size;
-         for (j = Bs_ext_i[i]; j < Bs_ext_i[i+1]; j++)
+         for (j = Bs_ext_i[i]; j < Bs_ext_i[i + 1]; j++)
          {
             if (Bs_ext_j[j] < first_col_diag_B ||
                 Bs_ext_j[j] > last_col_diag_B)
@@ -569,7 +580,7 @@ hypre_ParMatmul( hypre_ParCSRMatrix  *A,
       my_diag_array[ii] = my_diag_size;
       my_offd_array[ii] = my_offd_size;
 
-#pragma omp barrier
+      #pragma omp barrier
 
       if (ii)
       {
@@ -610,17 +621,17 @@ hypre_ParMatmul( hypre_ParCSRMatrix  *A,
             B_big_offd_j = hypre_CTAlloc(HYPRE_BigInt, B_ext_offd_size, HYPRE_MEMORY_HOST);
             B_ext_offd_data = hypre_CTAlloc(HYPRE_Complex, B_ext_offd_size, HYPRE_MEMORY_HOST);
          }
-         hypre_UnorderedBigIntSetCreate(&set, B_ext_offd_size + num_cols_offd_B, 16*hypre_NumThreads());
+         hypre_UnorderedBigIntSetCreate(&set, B_ext_offd_size + num_cols_offd_B, 16 * hypre_NumThreads());
       }
 
 
-#pragma omp barrier
+      #pragma omp barrier
 
       cnt_offd = B_ext_offd_i[ns];
       cnt_diag = B_ext_diag_i[ns];
       for (i = ns; i < ne; i++)
       {
-         for (j = Bs_ext_i[i]; j < Bs_ext_i[i+1]; j++)
+         for (j = Bs_ext_i[i]; j < Bs_ext_i[i + 1]; j++)
          {
             if (Bs_ext_j[j] < first_col_diag_B ||
                 Bs_ext_j[j] > last_col_diag_B)
@@ -655,10 +666,10 @@ hypre_ParMatmul( hypre_ParCSRMatrix  *A,
                                          &col_map_offd_C_inverse);
 
    HYPRE_Int i, j;
-#pragma omp parallel for private(j) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(j) HYPRE_SMP_SCHEDULE
    for (i = 0; i < num_cols_offd_A; i++)
    {
-      for (j = B_ext_offd_i[i]; j < B_ext_offd_i[i+1]; j++)
+      for (j = B_ext_offd_i[i]; j < B_ext_offd_i[i + 1]; j++)
       {
          //B_ext_offd_j[j] = hypre_UnorderedIntMapGet(&col_map_offd_C_inverse, B_ext_offd_j[j]);
          B_ext_offd_j[j] = hypre_UnorderedBigIntMapGet(&col_map_offd_C_inverse, B_big_offd_j[j]);
@@ -678,12 +689,12 @@ hypre_ParMatmul( hypre_ParCSRMatrix  *A,
       HYPRE_Int i;
       map_B_to_C = hypre_CTAlloc(HYPRE_Int, num_cols_offd_B, HYPRE_MEMORY_HOST);
 
-#pragma omp parallel private(i)
+      #pragma omp parallel private(i)
       {
          HYPRE_Int i_begin, i_end;
          hypre_GetSimpleThreadPartition(&i_begin, &i_end, num_cols_offd_C);
 
-         HYPRE_Int cnt;
+         HYPRE_Int cnt = 0;
          if (i_end > i_begin)
          {
             cnt = hypre_BigLowerBound(col_map_offd_B,
@@ -708,9 +719,9 @@ hypre_ParMatmul( hypre_ParCSRMatrix  *A,
 
 #else /* !HYPRE_CONCURRENT_HOPSCOTCH */
 
-   HYPRE_BigInt *temp;
+   HYPRE_BigInt *temp = NULL;
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel
+   #pragma omp parallel
 #endif
    {
       HYPRE_Int size, rest, ii;
@@ -721,18 +732,18 @@ hypre_ParMatmul( hypre_ParCSRMatrix  *A,
 
       HYPRE_Int num_threads = hypre_NumActiveThreads();
 
-      size = num_cols_offd_A/num_threads;
-      rest = num_cols_offd_A - size*num_threads;
+      size = num_cols_offd_A / num_threads;
+      rest = num_cols_offd_A - size * num_threads;
       ii = hypre_GetThreadNum();
       if (ii < rest)
       {
-         ns = ii*size+ii;
-         ne = (ii+1)*size+ii+1;
+         ns = ii * size + ii;
+         ne = (ii + 1) * size + ii + 1;
       }
       else
       {
-         ns = ii*size+rest;
-         ne = (ii+1)*size+rest;
+         ns = ii * size + rest;
+         ne = (ii + 1) * size + rest;
       }
 
       my_diag_size = 0;
@@ -741,7 +752,7 @@ hypre_ParMatmul( hypre_ParCSRMatrix  *A,
       {
          B_ext_diag_i[i] = my_diag_size;
          B_ext_offd_i[i] = my_offd_size;
-         for (j = Bs_ext_i[i]; j < Bs_ext_i[i+1]; j++)
+         for (j = Bs_ext_i[i]; j < Bs_ext_i[i + 1]; j++)
          {
             if (Bs_ext_j[j] < first_col_diag_B ||
                 Bs_ext_j[j] > last_col_diag_B)
@@ -758,7 +769,7 @@ hypre_ParMatmul( hypre_ParCSRMatrix  *A,
       my_offd_array[ii] = my_offd_size;
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
 
       if (ii)
@@ -804,19 +815,19 @@ hypre_ParMatmul( hypre_ParCSRMatrix  *A,
 
          if (B_ext_offd_size || num_cols_offd_B)
          {
-            temp = hypre_CTAlloc(HYPRE_BigInt, B_ext_offd_size+num_cols_offd_B, HYPRE_MEMORY_HOST);
+            temp = hypre_CTAlloc(HYPRE_BigInt, B_ext_offd_size + num_cols_offd_B, HYPRE_MEMORY_HOST);
          }
       }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
 
       cnt_offd = B_ext_offd_i[ns];
       cnt_diag = B_ext_diag_i[ns];
       for (i = ns; i < ne; i++)
       {
-         for (j = Bs_ext_i[i]; j < Bs_ext_i[i+1]; j++)
+         for (j = Bs_ext_i[i]; j < Bs_ext_i[i + 1]; j++)
          {
             if (Bs_ext_j[j] < first_col_diag_B ||
                 Bs_ext_j[j] > last_col_diag_B)
@@ -835,7 +846,7 @@ hypre_ParMatmul( hypre_ParCSRMatrix  *A,
       }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
 
       if (ii == 0)
@@ -861,7 +872,7 @@ hypre_ParMatmul( hypre_ParCSRMatrix  *A,
             {
                HYPRE_BigInt value;
 
-               hypre_BigQsort0(temp, 0, cnt-1);
+               hypre_BigQsort0(temp, 0, cnt - 1);
                num_cols_offd_C = 1;
                value = temp[0];
                for (i = 1; i < cnt; i++)
@@ -890,16 +901,16 @@ hypre_ParMatmul( hypre_ParCSRMatrix  *A,
 
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
 
       for (i = ns; i < ne; i++)
       {
-         for (j = B_ext_offd_i[i]; j < B_ext_offd_i[i+1]; j++)
+         for (j = B_ext_offd_i[i]; j < B_ext_offd_i[i + 1]; j++)
          {
             B_ext_offd_j[j] = hypre_BigBinarySearch(col_map_offd_C, B_big_offd_j[j],
-            //B_ext_offd_j[j] = hypre_BigBinarySearch(col_map_offd_C, Bs_ext_j[j],
-                                                 num_cols_offd_C);
+                                                    //B_ext_offd_j[j] = hypre_BigBinarySearch(col_map_offd_C, Bs_ext_j[j],
+                                                    num_cols_offd_C);
          }
       }
 
@@ -920,7 +931,7 @@ hypre_ParMatmul( hypre_ParCSRMatrix  *A,
          if (col_map_offd_C[i] == col_map_offd_B[cnt])
          {
             map_B_to_C[cnt++] = i;
-            if (cnt == num_cols_offd_B) break;
+            if (cnt == num_cols_offd_B) { break; }
          }
       }
    }
@@ -967,7 +978,7 @@ hypre_ParMatmul( hypre_ParCSRMatrix  *A,
    HYPRE_ANNOTATE_REGION_BEGIN("%s", "Second pass");
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel
+   #pragma omp parallel
 #endif
    {
       HYPRE_Int     *B_marker = NULL;
@@ -979,19 +990,19 @@ hypre_ParMatmul( hypre_ParCSRMatrix  *A,
       HYPRE_Complex  a_entry; /*, a_b_product;*/
 
       num_threads = hypre_NumActiveThreads();
-      size = num_rownnz_A/num_threads;
-      rest = num_rownnz_A - size*num_threads;
+      size = num_rownnz_A / num_threads;
+      rest = num_rownnz_A - size * num_threads;
 
       ii = hypre_GetThreadNum();
       if (ii < rest)
       {
-         ns = ii*size+ii;
-         ne = (ii+1)*size+ii+1;
+         ns = ii * size + ii;
+         ne = (ii + 1) * size + ii + 1;
       }
       else
       {
-         ns = ii*size+rest;
-         ne = (ii+1)*size+rest;
+         ns = ii * size + rest;
+         ne = (ii + 1) * size + rest;
       }
       jj_count_diag = C_diag_i[rownnz_A ? rownnz_A[ns] : ns];
       jj_count_offd = C_offd_i[rownnz_A ? rownnz_A[ns] : ns];
@@ -1040,7 +1051,7 @@ hypre_ParMatmul( hypre_ParCSRMatrix  *A,
 
          if (num_cols_offd_A)
          {
-            for (jj2 = A_offd_i[ii1]; jj2 < A_offd_i[ii1+1]; jj2++)
+            for (jj2 = A_offd_i[ii1]; jj2 < A_offd_i[ii1 + 1]; jj2++)
             {
                i2 = A_offd_j[jj2];
                a_entry = A_offd_data[jj2];
@@ -1049,9 +1060,9 @@ hypre_ParMatmul( hypre_ParCSRMatrix  *A,
                 *  Loop over entries in row i2 of B_ext.
                 *-----------------------------------------------------------*/
 
-               for (jj3 = B_ext_offd_i[i2]; jj3 < B_ext_offd_i[i2+1]; jj3++)
+               for (jj3 = B_ext_offd_i[i2]; jj3 < B_ext_offd_i[i2 + 1]; jj3++)
                {
-                  i3 = num_cols_diag_B+B_ext_offd_j[jj3];
+                  i3 = num_cols_diag_B + B_ext_offd_j[jj3];
 
                   /*--------------------------------------------------------
                    *  Check B_marker to see that C_{ii1,i3} has not already
@@ -1062,28 +1073,28 @@ hypre_ParMatmul( hypre_ParCSRMatrix  *A,
                   if (B_marker[i3] < jj_row_begin_offd)
                   {
                      B_marker[i3] = jj_count_offd;
-                     C_offd_data[jj_count_offd] = a_entry*B_ext_offd_data[jj3];
-                     C_offd_j[jj_count_offd] = i3-num_cols_diag_B;
+                     C_offd_data[jj_count_offd] = a_entry * B_ext_offd_data[jj3];
+                     C_offd_j[jj_count_offd] = i3 - num_cols_diag_B;
                      jj_count_offd++;
                   }
                   else
                   {
-                     C_offd_data[B_marker[i3]] += a_entry*B_ext_offd_data[jj3];
+                     C_offd_data[B_marker[i3]] += a_entry * B_ext_offd_data[jj3];
                   }
                }
-               for (jj3 = B_ext_diag_i[i2]; jj3 < B_ext_diag_i[i2+1]; jj3++)
+               for (jj3 = B_ext_diag_i[i2]; jj3 < B_ext_diag_i[i2 + 1]; jj3++)
                {
                   i3 = B_ext_diag_j[jj3];
                   if (B_marker[i3] < jj_row_begin_diag)
                   {
                      B_marker[i3] = jj_count_diag;
-                     C_diag_data[jj_count_diag] = a_entry*B_ext_diag_data[jj3];
+                     C_diag_data[jj_count_diag] = a_entry * B_ext_diag_data[jj3];
                      C_diag_j[jj_count_diag] = i3;
                      jj_count_diag++;
                   }
                   else
                   {
-                     C_diag_data[B_marker[i3]] += a_entry*B_ext_diag_data[jj3];
+                     C_diag_data[B_marker[i3]] += a_entry * B_ext_diag_data[jj3];
                   }
                }
             }
@@ -1093,7 +1104,7 @@ hypre_ParMatmul( hypre_ParCSRMatrix  *A,
           *  Loop over entries in row ii1 of A_diag.
           *-----------------------------------------------------------------*/
 
-         for (jj2 = A_diag_i[ii1]; jj2 < A_diag_i[ii1+1]; jj2++)
+         for (jj2 = A_diag_i[ii1]; jj2 < A_diag_i[ii1 + 1]; jj2++)
          {
             i2 = A_diag_j[jj2];
             a_entry = A_diag_data[jj2];
@@ -1102,7 +1113,7 @@ hypre_ParMatmul( hypre_ParCSRMatrix  *A,
              *  Loop over entries in row i2 of B_diag.
              *-----------------------------------------------------------*/
 
-            for (jj3 = B_diag_i[i2]; jj3 < B_diag_i[i2+1]; jj3++)
+            for (jj3 = B_diag_i[i2]; jj3 < B_diag_i[i2 + 1]; jj3++)
             {
                i3 = B_diag_j[jj3];
 
@@ -1115,20 +1126,20 @@ hypre_ParMatmul( hypre_ParCSRMatrix  *A,
                if (B_marker[i3] < jj_row_begin_diag)
                {
                   B_marker[i3] = jj_count_diag;
-                  C_diag_data[jj_count_diag] = a_entry*B_diag_data[jj3];
+                  C_diag_data[jj_count_diag] = a_entry * B_diag_data[jj3];
                   C_diag_j[jj_count_diag] = i3;
                   jj_count_diag++;
                }
                else
                {
-                  C_diag_data[B_marker[i3]] += a_entry*B_diag_data[jj3];
+                  C_diag_data[B_marker[i3]] += a_entry * B_diag_data[jj3];
                }
             }
             if (num_cols_offd_B)
             {
-               for (jj3 = B_offd_i[i2]; jj3 < B_offd_i[i2+1]; jj3++)
+               for (jj3 = B_offd_i[i2]; jj3 < B_offd_i[i2 + 1]; jj3++)
                {
-                  i3 = num_cols_diag_B+map_B_to_C[B_offd_j[jj3]];
+                  i3 = num_cols_diag_B + map_B_to_C[B_offd_j[jj3]];
 
                   /*--------------------------------------------------------
                    *  Check B_marker to see that C_{ii1,i3} has not already
@@ -1139,13 +1150,13 @@ hypre_ParMatmul( hypre_ParCSRMatrix  *A,
                   if (B_marker[i3] < jj_row_begin_offd)
                   {
                      B_marker[i3] = jj_count_offd;
-                     C_offd_data[jj_count_offd] = a_entry*B_offd_data[jj3];
-                     C_offd_j[jj_count_offd] = i3-num_cols_diag_B;
+                     C_offd_data[jj_count_offd] = a_entry * B_offd_data[jj3];
+                     C_offd_j[jj_count_offd] = i3 - num_cols_diag_B;
                      jj_count_offd++;
                   }
                   else
                   {
-                     C_offd_data[B_marker[i3]] += a_entry*B_offd_data[jj3];
+                     C_offd_data[B_marker[i3]] += a_entry * B_offd_data[jj3];
                   }
                }
             }
@@ -1164,6 +1175,7 @@ hypre_ParMatmul( hypre_ParCSRMatrix  *A,
    hypre_CSRMatrixData(C_diag) = C_diag_data;
    hypre_CSRMatrixI(C_diag)    = C_diag_i;
    hypre_CSRMatrixJ(C_diag)    = C_diag_j;
+   hypre_CSRMatrixMemoryLocation(C_diag) = memory_location_C;
    hypre_CSRMatrixSetRownnz(C_diag);
 
    C_offd = hypre_ParCSRMatrixOffd(C);
@@ -1175,10 +1187,9 @@ hypre_ParMatmul( hypre_ParCSRMatrix  *A,
       hypre_CSRMatrixJ(C_offd)        = C_offd_j;
       hypre_ParCSRMatrixColMapOffd(C) = col_map_offd_C;
    }
+   hypre_CSRMatrixMemoryLocation(C_offd) = memory_location_C;
    hypre_CSRMatrixSetRownnz(C_offd);
 
-   hypre_CSRMatrixMemoryLocation(C_diag) = memory_location_C;
-   hypre_CSRMatrixMemoryLocation(C_offd) = memory_location_C;
 
    /*-----------------------------------------------------------------------
     *  Free various arrays
@@ -1199,7 +1210,7 @@ hypre_ParMatmul( hypre_ParCSRMatrix  *A,
    {
       hypre_TFree(map_B_to_C, HYPRE_MEMORY_HOST);
    }
-   hypre_TFree(rownnz_A, HYPRE_MEMORY_HOST);
+   hypre_TFree(rownnz_A, memory_location_A);
 
 #ifdef HYPRE_PROFILE
    hypre_profile_times[HYPRE_TIMER_ID_MATMUL] += hypre_MPI_Wtime();
@@ -1210,14 +1221,17 @@ hypre_ParMatmul( hypre_ParCSRMatrix  *A,
    return C;
 }
 
-/* The following function was formerly part of hypre_ParCSRMatrixExtractBExt
-   but the code was removed so it can be used for a corresponding function
-   for Boolean matrices
-
-   JSP: to allow communication overlapping, it returns comm_handle_idx and
-   comm_handle_data. Before accessing B, they should be destroyed (including
-   send_data contained in the comm_handle).
-*/
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixExtractBExt_Arrays_Overlap
+ *
+ * The following function was formerly part of hypre_ParCSRMatrixExtractBExt
+ * but the code was removed so it can be used for a corresponding function
+ * for Boolean matrices
+ *
+ * JSP: to allow communication overlapping, it returns comm_handle_idx and
+ * comm_handle_data. Before accessing B, they should be destroyed (including
+ * send_data contained in the comm_handle).
+ *--------------------------------------------------------------------------*/
 
 void hypre_ParCSRMatrixExtractBExt_Arrays_Overlap(
    HYPRE_Int ** pB_ext_i,
@@ -1251,18 +1265,20 @@ void hypre_ParCSRMatrixExtractBExt_Arrays_Overlap(
    HYPRE_Int skip_same_sign /* 1 if only points that have the same sign are needed */
    // extended based long range interpolation: skip_fine = 1, skip_same_sign = 0 for S matrix, skip_fine = 1, skip_same_sign = 1 for A matrix
    // other interpolation: skip_fine = 0, skip_same_sign = 0
-   )
+)
 {
+   HYPRE_UNUSED_VAR(num_cols_B);
+
    hypre_ParCSRCommHandle *comm_handle, *row_map_comm_handle = NULL;
-   hypre_ParCSRCommPkg *tmp_comm_pkg;
+   hypre_ParCSRCommPkg *tmp_comm_pkg = NULL;
    HYPRE_Int *B_int_i;
    HYPRE_BigInt *B_int_j;
    HYPRE_Int *B_ext_i;
    HYPRE_BigInt * B_ext_j;
-   HYPRE_Complex * B_ext_data;
-   HYPRE_Complex * B_int_data;
-   HYPRE_BigInt * B_int_row_map;
-   HYPRE_BigInt * B_ext_row_map;
+   HYPRE_Complex * B_ext_data = NULL;
+   HYPRE_Complex * B_int_data = NULL;
+   HYPRE_BigInt * B_int_row_map = NULL;
+   HYPRE_BigInt * B_ext_row_map = NULL;
    HYPRE_Int num_procs, my_id;
    HYPRE_Int *jdata_recv_vec_starts;
    HYPRE_Int *jdata_send_map_starts;
@@ -1273,26 +1289,28 @@ void hypre_ParCSRMatrixExtractBExt_Arrays_Overlap(
    HYPRE_Int num_rows_B_ext;
    HYPRE_Int *prefix_sum_workspace;
 
-   hypre_MPI_Comm_size(comm,&num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_size(comm, &num_procs);
+   hypre_MPI_Comm_rank(comm, &my_id);
 
    HYPRE_BigInt first_row_index = row_starts[0];
 
    num_rows_B_ext = recv_vec_starts[num_recvs];
-   if ( num_rows_B_ext < 0 ) {  /* no B_ext, no communication */
+   if ( num_rows_B_ext < 0 )    /* no B_ext, no communication */
+   {
       *pB_ext_i = NULL;
       *pB_ext_j = NULL;
-      if ( data ) *pB_ext_data = NULL;
-      if ( find_row_map ) *pB_ext_row_map = NULL;
+      if ( data ) { *pB_ext_data = NULL; }
+      if ( find_row_map ) { *pB_ext_row_map = NULL; }
       *num_nonzeros = 0;
       return;
    };
-   B_int_i = hypre_CTAlloc(HYPRE_Int,  send_map_starts[num_sends]+1, HYPRE_MEMORY_HOST);
-   B_ext_i = hypre_CTAlloc(HYPRE_Int,  num_rows_B_ext+1, HYPRE_MEMORY_HOST);
+   B_int_i = hypre_CTAlloc(HYPRE_Int,  send_map_starts[num_sends] + 1, HYPRE_MEMORY_HOST);
+   B_ext_i = hypre_CTAlloc(HYPRE_Int,  num_rows_B_ext + 1, HYPRE_MEMORY_HOST);
    *pB_ext_i = B_ext_i;
-   if ( find_row_map ) {
-      B_int_row_map = hypre_CTAlloc( HYPRE_BigInt,  send_map_starts[num_sends]+1 , HYPRE_MEMORY_HOST);
-      B_ext_row_map = hypre_CTAlloc( HYPRE_BigInt,  num_rows_B_ext+1 , HYPRE_MEMORY_HOST);
+   if ( find_row_map )
+   {
+      B_int_row_map = hypre_CTAlloc( HYPRE_BigInt,  send_map_starts[num_sends] + 1, HYPRE_MEMORY_HOST);
+      B_ext_row_map = hypre_CTAlloc( HYPRE_BigInt,  num_rows_B_ext + 1, HYPRE_MEMORY_HOST);
       *pB_ext_row_map = B_ext_row_map;
    };
 
@@ -1302,21 +1320,22 @@ void hypre_ParCSRMatrixExtractBExt_Arrays_Overlap(
     * a row j (which is determined through send_map_elmts)
     *--------------------------------------------------------------------------*/
 
-   jdata_send_map_starts = hypre_CTAlloc(HYPRE_Int,  num_sends+1, HYPRE_MEMORY_HOST);
-   jdata_recv_vec_starts = hypre_CTAlloc(HYPRE_Int,  num_recvs+1, HYPRE_MEMORY_HOST);
+   jdata_send_map_starts = hypre_CTAlloc(HYPRE_Int,  num_sends + 1, HYPRE_MEMORY_HOST);
+   jdata_recv_vec_starts = hypre_CTAlloc(HYPRE_Int,  num_recvs + 1, HYPRE_MEMORY_HOST);
    jdata_send_map_starts[0] = B_int_i[0] = 0;
 
    /*HYPRE_Int prefix_sum_workspace[(hypre_NumThreads() + 1)*num_sends];*/
-   prefix_sum_workspace = hypre_TAlloc(HYPRE_Int,  (hypre_NumThreads() + 1)*num_sends, HYPRE_MEMORY_HOST);
+   prefix_sum_workspace = hypre_TAlloc(HYPRE_Int,  (hypre_NumThreads() + 1) * num_sends,
+                                       HYPRE_MEMORY_HOST);
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel private(i,j,k)
+   #pragma omp parallel private(i,j,k)
 #endif
    {
       /*HYPRE_Int counts[num_sends];*/
       HYPRE_Int *counts;
       counts = hypre_TAlloc(HYPRE_Int,  num_sends, HYPRE_MEMORY_HOST);
-      for (i=0; i < num_sends; i++)
+      for (i = 0; i < num_sends; i++)
       {
          HYPRE_Int j_begin, j_end;
          hypre_GetSimpleThreadPartition(&j_begin, &j_end, send_map_starts[i + 1] - send_map_starts[i]);
@@ -1335,22 +1354,22 @@ void hypre_ParCSRMatrixExtractBExt_Arrays_Overlap(
                {
                   for (k = diag_i[jrow] + 1; k < diag_i[jrow + 1]; k++)
                   {
-                     if (diag_data[k] < 0 && CF_marker[diag_j[k]] >= 0) len++;
+                     if (diag_data[k] < 0 && CF_marker[diag_j[k]] >= 0) { len++; }
                   }
                   for (k = offd_i[jrow]; k < offd_i[jrow + 1]; k++)
                   {
-                     if (offd_data[k] < 0) len++;
+                     if (offd_data[k] < 0) { len++; }
                   }
                }
                else
                {
                   for (k = diag_i[jrow] + 1; k < diag_i[jrow + 1]; k++)
                   {
-                     if (diag_data[k] > 0 && CF_marker[diag_j[k]] >= 0) len++;
+                     if (diag_data[k] > 0 && CF_marker[diag_j[k]] >= 0) { len++; }
                   }
                   for (k = offd_i[jrow]; k < offd_i[jrow + 1]; k++)
                   {
-                     if (offd_data[k] > 0) len++;
+                     if (offd_data[k] > 0) { len++; }
                   }
                }
 
@@ -1367,11 +1386,11 @@ void hypre_ParCSRMatrixExtractBExt_Arrays_Overlap(
 
                for (k = diag_i[jrow]; k < diag_i[jrow + 1]; k++)
                {
-                  if (CF_marker[diag_j[k]] >= 0) len++;
+                  if (CF_marker[diag_j[k]] >= 0) { len++; }
                }
                for (k = offd_i[jrow]; k < offd_i[jrow + 1]; k++)
                {
-                  if (CF_marker_offd[offd_j[k]] >= 0) len++;
+                  if (CF_marker_offd[offd_j[k]] >= 0) { len++; }
                }
 
                B_int_i[j + 1] = len;
@@ -1405,7 +1424,7 @@ void hypre_ParCSRMatrixExtractBExt_Arrays_Overlap(
       hypre_prefix_sum_multiple(counts, jdata_send_map_starts + 1, num_sends, prefix_sum_workspace);
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp master
+      #pragma omp master
 #endif
       {
          for (i = 1; i < num_sends; i++)
@@ -1417,20 +1436,20 @@ void hypre_ParCSRMatrixExtractBExt_Arrays_Overlap(
           * initialize communication
           *--------------------------------------------------------------------------*/
 
-         comm_handle = hypre_ParCSRCommHandleCreate(11,comm_pkg,
-                                                    &B_int_i[1],&(B_ext_i[1]) );
+         comm_handle = hypre_ParCSRCommHandleCreate(11, comm_pkg,
+                                                    &B_int_i[1], &(B_ext_i[1]) );
          if ( find_row_map )
          {
             /* scatter/gather B_int row numbers to form array of B_ext row numbers */
             row_map_comm_handle = hypre_ParCSRCommHandleCreate
-               (21,comm_pkg, B_int_row_map, B_ext_row_map );
+                                  (21, comm_pkg, B_int_row_map, B_ext_row_map );
          }
 
          B_int_j = hypre_TAlloc(HYPRE_BigInt,  jdata_send_map_starts[num_sends], HYPRE_MEMORY_HOST);
-         if (data) B_int_data = hypre_TAlloc(HYPRE_Complex,  jdata_send_map_starts[num_sends], HYPRE_MEMORY_HOST);
+         if (data) { B_int_data = hypre_TAlloc(HYPRE_Complex,  jdata_send_map_starts[num_sends], HYPRE_MEMORY_HOST); }
       }
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
 
       for (i = 0; i < num_sends; i++)
@@ -1457,7 +1476,7 @@ void hypre_ParCSRMatrixExtractBExt_Arrays_Overlap(
                      {
                         if (diag_data[k] < 0 && CF_marker[diag_j[k]] >= 0)
                         {
-                           B_int_j[count] = (HYPRE_BigInt)diag_j[k]+first_col_diag;
+                           B_int_j[count] = (HYPRE_BigInt)diag_j[k] + first_col_diag;
                            B_int_data[count] = diag_data[k];
                            count++;
                         }
@@ -1480,7 +1499,7 @@ void hypre_ParCSRMatrixExtractBExt_Arrays_Overlap(
                      {
                         if (diag_data[k] > 0 && CF_marker[diag_j[k]] >= 0)
                         {
-                           B_int_j[count] = (HYPRE_BigInt)diag_j[k]+first_col_diag;
+                           B_int_j[count] = (HYPRE_BigInt)diag_j[k] + first_col_diag;
                            B_int_data[count] = diag_data[k];
                            count++;
                         }
@@ -1501,15 +1520,16 @@ void hypre_ParCSRMatrixExtractBExt_Arrays_Overlap(
             }
             else
             {
-               for (j = j_begin; j < j_end; ++j) {
+               for (j = j_begin; j < j_end; ++j)
+               {
                   HYPRE_Int jrow = send_map_elmts[j];
-                  for (k = diag_i[jrow]; k < diag_i[jrow+1]; k++)
+                  for (k = diag_i[jrow]; k < diag_i[jrow + 1]; k++)
                   {
-                     B_int_j[count] = (HYPRE_BigInt)diag_j[k]+first_col_diag;
+                     B_int_j[count] = (HYPRE_BigInt)diag_j[k] + first_col_diag;
                      B_int_data[count] = diag_data[k];
                      count++;
                   }
-                  for (k = offd_i[jrow]; k < offd_i[jrow+1]; k++)
+                  for (k = offd_i[jrow]; k < offd_i[jrow + 1]; k++)
                   {
                      B_int_j[count] = col_map_offd[offd_j[k]];
                      B_int_data[count] = offd_data[k];
@@ -1545,14 +1565,15 @@ void hypre_ParCSRMatrixExtractBExt_Arrays_Overlap(
             }
             else
             {
-               for (j = j_begin; j < j_end; ++j) {
+               for (j = j_begin; j < j_end; ++j)
+               {
                   HYPRE_Int jrow = send_map_elmts[j];
-                  for (k = diag_i[jrow]; k < diag_i[jrow+1]; k++)
+                  for (k = diag_i[jrow]; k < diag_i[jrow + 1]; k++)
                   {
-                     B_int_j[count] = (HYPRE_BigInt)diag_j[k]+first_col_diag;
+                     B_int_j[count] = (HYPRE_BigInt)diag_j[k] + first_col_diag;
                      count++;
                   }
-                  for (k = offd_i[jrow]; k < offd_i[jrow+1]; k++)
+                  for (k = offd_i[jrow]; k < offd_i[jrow + 1]; k++)
                   {
                      B_int_j[count] = col_map_offd[offd_j[k]];
                      count++;
@@ -1565,15 +1586,16 @@ void hypre_ParCSRMatrixExtractBExt_Arrays_Overlap(
    } /* omp parallel. JSP: this takes most of time in this function */
    hypre_TFree(prefix_sum_workspace, HYPRE_MEMORY_HOST);
 
-   tmp_comm_pkg = hypre_CTAlloc(hypre_ParCSRCommPkg, 1, HYPRE_MEMORY_HOST);
-   hypre_ParCSRCommPkgComm(tmp_comm_pkg) = comm;
-   hypre_ParCSRCommPkgNumSends(tmp_comm_pkg) = num_sends;
-   hypre_ParCSRCommPkgNumRecvs(tmp_comm_pkg) = num_recvs;
-   hypre_ParCSRCommPkgSendProcs(tmp_comm_pkg) =
-      hypre_ParCSRCommPkgSendProcs(comm_pkg);
-   hypre_ParCSRCommPkgRecvProcs(tmp_comm_pkg) =
-      hypre_ParCSRCommPkgRecvProcs(comm_pkg);
-   hypre_ParCSRCommPkgSendMapStarts(tmp_comm_pkg) = jdata_send_map_starts;
+   /* Create temporary communication package */
+   hypre_ParCSRCommPkgCreateAndFill(comm,
+                                    num_recvs,
+                                    hypre_ParCSRCommPkgRecvProcs(comm_pkg),
+                                    jdata_recv_vec_starts,
+                                    num_sends,
+                                    hypre_ParCSRCommPkgSendProcs(comm_pkg),
+                                    jdata_send_map_starts,
+                                    NULL,
+                                    &tmp_comm_pkg);
 
    hypre_ParCSRCommHandleDestroy(comm_handle);
    comm_handle = NULL;
@@ -1586,9 +1608,9 @@ void hypre_ParCSRMatrixExtractBExt_Arrays_Overlap(
 
    for (i = 0; i < num_recvs; i++)
    {
-      for (j = recv_vec_starts[i]; j < recv_vec_starts[i+1]; j++)
+      for (j = recv_vec_starts[i]; j < recv_vec_starts[i + 1]; j++)
       {
-         B_ext_i[j+1] += B_ext_i[j];
+         B_ext_i[j + 1] += B_ext_i[j];
       }
    }
 
@@ -1605,34 +1627,39 @@ void hypre_ParCSRMatrixExtractBExt_Arrays_Overlap(
    for (i = 0; i < num_recvs; i++)
    {
       start_index = B_ext_i[recv_vec_starts[i]];
-      *num_nonzeros = B_ext_i[recv_vec_starts[i+1]]-start_index;
-      jdata_recv_vec_starts[i+1] = B_ext_i[recv_vec_starts[i+1]];
+      *num_nonzeros = B_ext_i[recv_vec_starts[i + 1]] - start_index;
+      jdata_recv_vec_starts[i + 1] = B_ext_i[recv_vec_starts[i + 1]];
    }
 
-   hypre_ParCSRCommPkgRecvVecStarts(tmp_comm_pkg) = jdata_recv_vec_starts;
-
-   *comm_handle_idx = hypre_ParCSRCommHandleCreate(21,tmp_comm_pkg,B_int_j,B_ext_j);
+   *comm_handle_idx = hypre_ParCSRCommHandleCreate(21, tmp_comm_pkg, B_int_j, B_ext_j);
    if (data)
    {
-      *comm_handle_data = hypre_ParCSRCommHandleCreate(1,tmp_comm_pkg,B_int_data,
+      *comm_handle_data = hypre_ParCSRCommHandleCreate(1, tmp_comm_pkg, B_int_data,
                                                        B_ext_data);
    }
 
+   /* Free memory */
+   hypre_TFree(jdata_send_map_starts, HYPRE_MEMORY_HOST);
+   hypre_TFree(jdata_recv_vec_starts, HYPRE_MEMORY_HOST);
+   hypre_TFree(tmp_comm_pkg, HYPRE_MEMORY_HOST);
    if (row_map_comm_handle)
    {
       hypre_ParCSRCommHandleDestroy(row_map_comm_handle);
       row_map_comm_handle = NULL;
    }
-
-   hypre_TFree(jdata_send_map_starts, HYPRE_MEMORY_HOST);
-   hypre_TFree(jdata_recv_vec_starts, HYPRE_MEMORY_HOST);
-   hypre_TFree(tmp_comm_pkg, HYPRE_MEMORY_HOST);
+   if (find_row_map)
+   {
+      hypre_TFree(B_int_row_map, HYPRE_MEMORY_HOST);
+   }
    hypre_TFree(B_int_i, HYPRE_MEMORY_HOST);
-   if ( find_row_map ) hypre_TFree(B_int_row_map, HYPRE_MEMORY_HOST);
 
    /* end generic part */
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixExtractBExt_Arrays
+ *--------------------------------------------------------------------------*/
+
 void hypre_ParCSRMatrixExtractBExt_Arrays(
    HYPRE_Int ** pB_ext_i,
    HYPRE_BigInt ** pB_ext_j,
@@ -1658,7 +1685,7 @@ void hypre_ParCSRMatrixExtractBExt_Arrays(
    HYPRE_BigInt * col_map_offd,
    HYPRE_Real * diag_data,
    HYPRE_Real * offd_data
-   )
+)
 {
    hypre_ParCSRCommHandle *comm_handle_idx, *comm_handle_data;
 
@@ -1753,24 +1780,24 @@ hypre_ParCSRMatrixExtractBExt_Overlap( hypre_ParCSRMatrix *B,
    num_rows_B_ext = recv_vec_starts[num_recvs];
 
    hypre_ParCSRMatrixExtractBExt_Arrays_Overlap
-      ( &B_ext_i, &B_ext_j, &B_ext_data, &idummy,
-        &num_nonzeros,
-        data, 0, comm, comm_pkg,
-        num_cols_B, num_recvs, num_sends,
-        first_col_diag, B->row_starts,
-        recv_vec_starts, send_map_starts, send_map_elmts,
-        diag_i, diag_j, offd_i, offd_j, col_map_offd,
-        diag_data, offd_data,
-        comm_handle_idx, comm_handle_data,
-        CF_marker, CF_marker_offd,
-        skip_fine, skip_same_sign
-         );
-
-   B_ext = hypre_CSRMatrixCreate(num_rows_B_ext,num_cols_B,num_nonzeros);
+   ( &B_ext_i, &B_ext_j, &B_ext_data, &idummy,
+     &num_nonzeros,
+     data, 0, comm, comm_pkg,
+     num_cols_B, num_recvs, num_sends,
+     first_col_diag, B->row_starts,
+     recv_vec_starts, send_map_starts, send_map_elmts,
+     diag_i, diag_j, offd_i, offd_j, col_map_offd,
+     diag_data, offd_data,
+     comm_handle_idx, comm_handle_data,
+     CF_marker, CF_marker_offd,
+     skip_fine, skip_same_sign
+   );
+
+   B_ext = hypre_CSRMatrixCreate(num_rows_B_ext, num_cols_B, num_nonzeros);
    hypre_CSRMatrixMemoryLocation(B_ext) = HYPRE_MEMORY_HOST;
    hypre_CSRMatrixI(B_ext) = B_ext_i;
    hypre_CSRMatrixBigJ(B_ext) = B_ext_j;
-   if (data) hypre_CSRMatrixData(B_ext) = B_ext_data;
+   if (data) { hypre_CSRMatrixData(B_ext) = B_ext_data; }
 
    return B_ext;
 }
@@ -1783,7 +1810,8 @@ hypre_ParCSRMatrixExtractBExt( hypre_ParCSRMatrix *B,
 #if 0
    hypre_ParCSRCommHandle *comm_handle_idx, *comm_handle_data;
 
-   hypre_CSRMatrix *B_ext = hypre_ParCSRMatrixExtractBExt_Overlap(B, A, want_data, &comm_handle_idx, &comm_handle_data, NULL, NULL, 0, 0);
+   hypre_CSRMatrix *B_ext = hypre_ParCSRMatrixExtractBExt_Overlap(B, A, want_data, &comm_handle_idx,
+                                                                  &comm_handle_data, NULL, NULL, 0, 0);
 
    HYPRE_Int *send_idx = (HYPRE_Int *)comm_handle_idx->send_data;
    hypre_ParCSRCommHandleDestroy(comm_handle_idx);
@@ -1839,7 +1867,7 @@ hypre_ParCSRMatrixTransposeHost( hypre_ParCSRMatrix  *A,
    HYPRE_BigInt            *col_starts = hypre_ParCSRMatrixColStarts(A);
 
    HYPRE_Int                num_cols_offd = hypre_CSRMatrixNumCols(A_offd);
-   HYPRE_Int                num_sends, num_recvs, num_cols_offd_AT;
+   HYPRE_Int                num_sends = 0, num_recvs = 0, num_cols_offd_AT;
    HYPRE_Int                i, j, k, index, counter, j_row;
    HYPRE_BigInt             value;
 
@@ -1854,11 +1882,11 @@ hypre_ParCSRMatrixTransposeHost( hypre_ParCSRMatrix  *A,
    HYPRE_Int               *AT_tmp_i;
    HYPRE_Int               *AT_tmp_j;
    HYPRE_BigInt            *AT_big_j = NULL;
-   HYPRE_Complex           *AT_tmp_data;
+   HYPRE_Complex           *AT_tmp_data = NULL;
 
-   HYPRE_Int               *AT_buf_i;
-   HYPRE_BigInt            *AT_buf_j;
-   HYPRE_Complex           *AT_buf_data;
+   HYPRE_Int               *AT_buf_i = NULL;
+   HYPRE_BigInt            *AT_buf_j = NULL;
+   HYPRE_Complex           *AT_buf_data = NULL;
 
    HYPRE_Int               *AT_offd_i;
    HYPRE_Int               *AT_offd_j;
@@ -1869,17 +1897,18 @@ hypre_ParCSRMatrixTransposeHost( hypre_ParCSRMatrix  *A,
 
    HYPRE_Int                num_procs, my_id;
 
-   HYPRE_Int               *recv_procs, *send_procs;
-   HYPRE_Int               *recv_vec_starts;
-   HYPRE_Int               *send_map_starts;
-   HYPRE_Int               *send_map_elmts;
+   HYPRE_Int               *recv_procs = NULL;
+   HYPRE_Int               *send_procs = NULL;
+   HYPRE_Int               *recv_vec_starts = NULL;
+   HYPRE_Int               *send_map_starts = NULL;
+   HYPRE_Int               *send_map_elmts = NULL;
    HYPRE_Int               *tmp_recv_vec_starts;
    HYPRE_Int               *tmp_send_map_starts;
-   hypre_ParCSRCommPkg     *tmp_comm_pkg;
-   hypre_ParCSRCommHandle  *comm_handle;
+   hypre_ParCSRCommPkg     *tmp_comm_pkg = NULL;
+   hypre_ParCSRCommHandle  *comm_handle = NULL;
 
-   hypre_MPI_Comm_size(comm,&num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_size(comm, &num_procs);
+   hypre_MPI_Comm_rank(comm, &my_id);
 
    num_cols_offd_AT = 0;
    counter = 0;
@@ -1928,12 +1957,12 @@ hypre_ParCSRMatrixTransposeHost( hypre_ParCSRMatrix  *A,
       for (i = 0; i < AT_tmp_i[num_cols_offd]; i++)
       {
          //AT_tmp_j[i] += first_row_index;
-         AT_big_j[i] = (HYPRE_BigInt)AT_tmp_j[i]+first_row_index;
+         AT_big_j[i] = (HYPRE_BigInt)AT_tmp_j[i] + first_row_index;
       }
 
       for (i = 0; i < num_cols_offd; i++)
       {
-         AT_tmp_i[i] = AT_tmp_i[i+1]-AT_tmp_i[i];
+         AT_tmp_i[i] = AT_tmp_i[i + 1] - AT_tmp_i[i];
       }
 
       comm_handle = hypre_ParCSRCommHandleCreate(12, comm_pkg, AT_tmp_i, AT_buf_i);
@@ -1941,49 +1970,47 @@ hypre_ParCSRMatrixTransposeHost( hypre_ParCSRMatrix  *A,
 
    hypre_CSRMatrixTranspose(A_diag, &AT_diag, data);
 
-   AT_offd_i = hypre_CTAlloc(HYPRE_Int, num_cols+1, memory_location);
+   AT_offd_i = hypre_CTAlloc(HYPRE_Int, num_cols + 1, memory_location);
 
    if (num_procs > 1)
    {
       hypre_ParCSRCommHandleDestroy(comm_handle);
       comm_handle = NULL;
 
-      tmp_send_map_starts = hypre_CTAlloc(HYPRE_Int, num_sends+1, HYPRE_MEMORY_HOST);
-      tmp_recv_vec_starts = hypre_CTAlloc(HYPRE_Int, num_recvs+1, HYPRE_MEMORY_HOST);
+      tmp_send_map_starts = hypre_CTAlloc(HYPRE_Int, num_sends + 1, HYPRE_MEMORY_HOST);
+      tmp_recv_vec_starts = hypre_CTAlloc(HYPRE_Int, num_recvs + 1, HYPRE_MEMORY_HOST);
 
       tmp_send_map_starts[0] = send_map_starts[0];
       for (i = 0; i < num_sends; i++)
       {
-         tmp_send_map_starts[i+1] = tmp_send_map_starts[i];
-         for (j = send_map_starts[i]; j < send_map_starts[i+1]; j++)
+         tmp_send_map_starts[i + 1] = tmp_send_map_starts[i];
+         for (j = send_map_starts[i]; j < send_map_starts[i + 1]; j++)
          {
-            tmp_send_map_starts[i+1] += AT_buf_i[j];
-            AT_offd_i[send_map_elmts[j]+1] += AT_buf_i[j];
+            tmp_send_map_starts[i + 1] += AT_buf_i[j];
+            AT_offd_i[send_map_elmts[j] + 1] += AT_buf_i[j];
          }
       }
       for (i = 0; i < num_cols; i++)
       {
-         AT_offd_i[i+1] += AT_offd_i[i];
+         AT_offd_i[i + 1] += AT_offd_i[i];
       }
 
       tmp_recv_vec_starts[0] = recv_vec_starts[0];
       for (i = 0; i < num_recvs; i++)
       {
-         tmp_recv_vec_starts[i+1] = tmp_recv_vec_starts[i];
-         for (j = recv_vec_starts[i]; j < recv_vec_starts[i+1]; j++)
+         tmp_recv_vec_starts[i + 1] = tmp_recv_vec_starts[i];
+         for (j = recv_vec_starts[i]; j < recv_vec_starts[i + 1]; j++)
          {
-            tmp_recv_vec_starts[i+1] +=  AT_tmp_i[j];
+            tmp_recv_vec_starts[i + 1] +=  AT_tmp_i[j];
          }
       }
 
-      tmp_comm_pkg = hypre_CTAlloc(hypre_ParCSRCommPkg, 1, HYPRE_MEMORY_HOST);
-      hypre_ParCSRCommPkgComm(tmp_comm_pkg) = comm;
-      hypre_ParCSRCommPkgNumSends(tmp_comm_pkg) = num_sends;
-      hypre_ParCSRCommPkgNumRecvs(tmp_comm_pkg) = num_recvs;
-      hypre_ParCSRCommPkgRecvProcs(tmp_comm_pkg) = recv_procs;
-      hypre_ParCSRCommPkgSendProcs(tmp_comm_pkg) = send_procs;
-      hypre_ParCSRCommPkgRecvVecStarts(tmp_comm_pkg) = tmp_recv_vec_starts;
-      hypre_ParCSRCommPkgSendMapStarts(tmp_comm_pkg) = tmp_send_map_starts;
+      /* Create temporary communication package */
+      hypre_ParCSRCommPkgCreateAndFill(comm,
+                                       num_recvs, recv_procs, tmp_recv_vec_starts,
+                                       num_sends, send_procs, tmp_send_map_starts,
+                                       NULL,
+                                       &tmp_comm_pkg);
 
       AT_buf_j = hypre_CTAlloc(HYPRE_BigInt, tmp_send_map_starts[num_sends], HYPRE_MEMORY_HOST);
       comm_handle = hypre_ParCSRCommHandleCreate(22, tmp_comm_pkg, AT_big_j,
@@ -1995,7 +2022,7 @@ hypre_ParCSRMatrixTransposeHost( hypre_ParCSRMatrix  *A,
       if (data)
       {
          AT_buf_data = hypre_CTAlloc(HYPRE_Complex, tmp_send_map_starts[num_sends], HYPRE_MEMORY_HOST);
-         comm_handle = hypre_ParCSRCommHandleCreate(2,tmp_comm_pkg,AT_tmp_data,
+         comm_handle = hypre_ParCSRCommHandleCreate(2, tmp_comm_pkg, AT_tmp_data,
                                                     AT_buf_data);
          hypre_ParCSRCommHandleDestroy(comm_handle);
          comm_handle = NULL;
@@ -2024,7 +2051,7 @@ hypre_ParCSRMatrixTransposeHost( hypre_ParCSRMatrix  *A,
       counter = 0;
       for (i = 0; i < num_sends; i++)
       {
-         for (j = send_map_starts[i]; j < send_map_starts[i+1]; j++)
+         for (j = send_map_starts[i]; j < send_map_starts[i + 1]; j++)
          {
             j_row = send_map_elmts[j];
             index = AT_offd_i[j_row];
@@ -2041,13 +2068,13 @@ hypre_ParCSRMatrixTransposeHost( hypre_ParCSRMatrix  *A,
       }
       for (i = num_cols; i > 0; i--)
       {
-         AT_offd_i[i] = AT_offd_i[i-1];
+         AT_offd_i[i] = AT_offd_i[i - 1];
       }
       AT_offd_i[0] = 0;
 
       if (counter)
       {
-         hypre_BigQsort0(AT_buf_j,0,counter-1);
+         hypre_BigQsort0(AT_buf_j, 0, counter - 1);
          num_cols_offd_AT = 1;
          value = AT_buf_j[0];
          for (i = 1; i < counter; i++)
@@ -2082,7 +2109,7 @@ hypre_ParCSRMatrixTransposeHost( hypre_ParCSRMatrix  *A,
 
       for (i = 0; i < counter; i++)
       {
-         AT_offd_j[i] = hypre_BigBinarySearch(col_map_offd_AT,AT_big_j[i],
+         AT_offd_j[i] = hypre_BigBinarySearch(col_map_offd_AT, AT_big_j[i],
                                               num_cols_offd_AT);
       }
       hypre_TFree(AT_big_j, HYPRE_MEMORY_HOST);
@@ -2103,8 +2130,8 @@ hypre_ParCSRMatrixTransposeHost( hypre_ParCSRMatrix  *A,
    first_row_index_AT = row_starts_AT[0];
    first_col_diag_AT  = col_starts_AT[0];
 
-   local_num_rows_AT = (HYPRE_Int)(row_starts_AT[1]-first_row_index_AT );
-   local_num_cols_AT = (HYPRE_Int)(col_starts_AT[1]-first_col_diag_AT);
+   local_num_rows_AT = (HYPRE_Int)(row_starts_AT[1] - first_row_index_AT );
+   local_num_cols_AT = (HYPRE_Int)(col_starts_AT[1] - first_col_diag_AT);
 
    AT = hypre_CTAlloc(hypre_ParCSRMatrix, 1, HYPRE_MEMORY_HOST);
    hypre_ParCSRMatrixComm(AT) = comm;
@@ -2148,11 +2175,9 @@ hypre_ParCSRMatrixTranspose( hypre_ParCSRMatrix  *A,
                              hypre_ParCSRMatrix **AT_ptr,
                              HYPRE_Int            data )
 {
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    hypre_GpuProfilingPushRange("ParCSRMatrixTranspose");
-#endif
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
    HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_ParCSRMatrixMemoryLocation(A) );
 
    if (exec == HYPRE_EXEC_DEVICE)
@@ -2165,17 +2190,49 @@ hypre_ParCSRMatrixTranspose( hypre_ParCSRMatrix  *A,
       hypre_ParCSRMatrixTransposeHost(A, AT_ptr, data);
    }
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    hypre_GpuProfilingPopRange();
-#endif
 
    return hypre_error_flag;
 }
 
-/* -----------------------------------------------------------------------------
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixLocalTranspose
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ParCSRMatrixLocalTranspose( hypre_ParCSRMatrix  *A )
+{
+   if (!hypre_ParCSRMatrixDiagT(A))
+   {
+      hypre_CSRMatrix *A_diag = hypre_ParCSRMatrixDiag(A);
+      if (A_diag)
+      {
+         hypre_CSRMatrix *AT_diag = NULL;
+         hypre_CSRMatrixTranspose(A_diag, &AT_diag, 1);
+         hypre_ParCSRMatrixDiagT(A) = AT_diag;
+      }
+   }
+
+   if (!hypre_ParCSRMatrixOffdT(A))
+   {
+      hypre_CSRMatrix *A_offd = hypre_ParCSRMatrixOffd(A);
+      if (A_offd)
+      {
+         hypre_CSRMatrix *AT_offd = NULL;
+         hypre_CSRMatrixTranspose(A_offd, &AT_offd, 1);
+         hypre_ParCSRMatrixOffdT(A) = AT_offd;
+      }
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixGenSpanningTree
+ *
  * generate a parallel spanning tree (for Maxwell Equation)
  * G_csr is the node to edge connectivity matrix
- * ----------------------------------------------------------------------------- */
+ *--------------------------------------------------------------------------*/
 
 void
 hypre_ParCSRMatrixGenSpanningTree( hypre_ParCSRMatrix *G_csr,
@@ -2210,16 +2267,16 @@ hypre_ParCSRMatrixGenSpanningTree( hypre_ParCSRMatrix *G_csr,
       G_diag = hypre_ParCSRMatrixDiag(G_csr);
       T_diag_i = hypre_CSRMatrixI(G_diag);
       T_diag_j = hypre_CSRMatrixJ(G_diag);
-      counts = hypre_TAlloc(HYPRE_Int, nrows_G , HYPRE_MEMORY_HOST);
-      for (i = 0; i < nrows_G; i++) counts[i] = 0;
-      for (i = 0; i < T_diag_i[ncols_G]; i++) counts[T_diag_j[i]]++;
-      G_diag_i = hypre_TAlloc(HYPRE_Int, (nrows_G+1) , HYPRE_MEMORY_HOST);
-      G_diag_j = hypre_TAlloc(HYPRE_Int, T_diag_i[ncols_G] , HYPRE_MEMORY_HOST);
+      counts = hypre_TAlloc(HYPRE_Int, nrows_G, HYPRE_MEMORY_HOST);
+      for (i = 0; i < nrows_G; i++) { counts[i] = 0; }
+      for (i = 0; i < T_diag_i[ncols_G]; i++) { counts[T_diag_j[i]]++; }
+      G_diag_i = hypre_TAlloc(HYPRE_Int, (nrows_G + 1), HYPRE_MEMORY_HOST);
+      G_diag_j = hypre_TAlloc(HYPRE_Int, T_diag_i[ncols_G], HYPRE_MEMORY_HOST);
       G_diag_i[0] = 0;
-      for (i = 1; i <= nrows_G; i++) G_diag_i[i] = G_diag_i[i-1] + counts[i-1];
+      for (i = 1; i <= nrows_G; i++) { G_diag_i[i] = G_diag_i[i - 1] + counts[i - 1]; }
       for (i = 0; i < ncols_G; i++)
       {
-         for (j = T_diag_i[i]; j < T_diag_i[i+1]; j++)
+         for (j = T_diag_i[i]; j < T_diag_i[i + 1]; j++)
          {
             k = T_diag_j[j];
             offset = G_diag_i[k]++;
@@ -2229,49 +2286,49 @@ hypre_ParCSRMatrixGenSpanningTree( hypre_ParCSRMatrix *G_csr,
       G_diag_i[0] = 0;
       for (i = 1; i <= nrows_G; i++)
       {
-         G_diag_i[i] = G_diag_i[i-1] + counts[i-1];
+         G_diag_i[i] = G_diag_i[i - 1] + counts[i - 1];
       }
       hypre_TFree(counts, HYPRE_MEMORY_HOST);
    }
 
    /* form G transpose in special form (2 nodes per edge max) */
 
-   GT_diag_mat = hypre_TAlloc(HYPRE_Int, 2 * ncols_G , HYPRE_MEMORY_HOST);
-   for (i = 0; i < 2 * ncols_G; i++) GT_diag_mat[i] = -1;
+   GT_diag_mat = hypre_TAlloc(HYPRE_Int, 2 * ncols_G, HYPRE_MEMORY_HOST);
+   for (i = 0; i < 2 * ncols_G; i++) { GT_diag_mat[i] = -1; }
    for (i = 0; i < nrows_G; i++)
    {
-      for (j = G_diag_i[i]; j < G_diag_i[i+1]; j++)
+      for (j = G_diag_i[i]; j < G_diag_i[i + 1]; j++)
       {
          edge = G_diag_j[j];
-         if (GT_diag_mat[edge*2] == -1) GT_diag_mat[edge*2] = i;
-         else                           GT_diag_mat[edge*2+1] = i;
+         if (GT_diag_mat[edge * 2] == -1) { GT_diag_mat[edge * 2] = i; }
+         else { GT_diag_mat[edge * 2 + 1] = i; }
       }
    }
 
    /* BFS on the local matrix graph to find tree */
 
-   nodes_marked = hypre_TAlloc(HYPRE_Int, nrows_G , HYPRE_MEMORY_HOST);
-   edges_marked = hypre_TAlloc(HYPRE_Int, ncols_G , HYPRE_MEMORY_HOST);
-   for (i = 0; i < nrows_G; i++) nodes_marked[i] = 0;
-   for (i = 0; i < ncols_G; i++) edges_marked[i] = 0;
-   queue = hypre_TAlloc(HYPRE_Int, nrows_G , HYPRE_MEMORY_HOST);
+   nodes_marked = hypre_TAlloc(HYPRE_Int, nrows_G, HYPRE_MEMORY_HOST);
+   edges_marked = hypre_TAlloc(HYPRE_Int, ncols_G, HYPRE_MEMORY_HOST);
+   for (i = 0; i < nrows_G; i++) { nodes_marked[i] = 0; }
+   for (i = 0; i < ncols_G; i++) { edges_marked[i] = 0; }
+   queue = hypre_TAlloc(HYPRE_Int, nrows_G, HYPRE_MEMORY_HOST);
    queue_head = 0;
    queue_tail = 1;
    queue[0] = 0;
    nodes_marked[0] = 1;
-   while ((queue_tail-queue_head) > 0)
+   while ((queue_tail - queue_head) > 0)
    {
-      node = queue[queue_tail-1];
+      node = queue[queue_tail - 1];
       queue_tail--;
-      for (i = G_diag_i[node]; i < G_diag_i[node+1]; i++)
+      for (i = G_diag_i[node]; i < G_diag_i[node + 1]; i++)
       {
          edge = G_diag_j[i];
          if (edges_marked[edge] == 0)
          {
-            if (GT_diag_mat[2*edge+1] != -1)
+            if (GT_diag_mat[2 * edge + 1] != -1)
             {
-               node2 = GT_diag_mat[2*edge];
-               if (node2 == node) node2 = GT_diag_mat[2*edge+1];
+               node2 = GT_diag_mat[2 * edge];
+               if (node2 == node) { node2 = GT_diag_mat[2 * edge + 1]; }
                if (nodes_marked[node2] == 0)
                {
                   nodes_marked[node2] = 1;
@@ -2313,44 +2370,48 @@ hypre_ParCSRMatrixGenSpanningTree( hypre_ParCSRMatrix *G_csr,
       nrecvs     = hypre_ParCSRCommPkgNumRecvs(comm_pkg);
       recv_procs = hypre_ParCSRCommPkgRecvProcs(comm_pkg);
       proc_array = NULL;
-      if ((nsends+nrecvs) > 0)
+      if ((nsends + nrecvs) > 0)
       {
          n_proc_array = 0;
-         proc_array = hypre_TAlloc(HYPRE_Int, (nsends+nrecvs) , HYPRE_MEMORY_HOST);
-         for (i = 0; i < nsends; i++) proc_array[i] = send_procs[i];
-         for (i = 0; i < nrecvs; i++) proc_array[nsends+i] = recv_procs[i];
-         hypre_qsort0(proc_array, 0, nsends+nrecvs-1);
+         proc_array = hypre_TAlloc(HYPRE_Int, (nsends + nrecvs), HYPRE_MEMORY_HOST);
+         for (i = 0; i < nsends; i++) { proc_array[i] = send_procs[i]; }
+         for (i = 0; i < nrecvs; i++) { proc_array[nsends + i] = recv_procs[i]; }
+         hypre_qsort0(proc_array, 0, nsends + nrecvs - 1);
          n_proc_array = 1;
-         for (i = 1; i < nrecvs+nsends; i++)
+         for (i = 1; i < nrecvs + nsends; i++)
             if (proc_array[i] != proc_array[n_proc_array])
+            {
                proc_array[n_proc_array++] = proc_array[i];
+            }
       }
-      pgraph_i = hypre_TAlloc(HYPRE_Int, (nprocs+1) , HYPRE_MEMORY_HOST);
-      recv_cnts = hypre_TAlloc(HYPRE_Int, nprocs , HYPRE_MEMORY_HOST);
+      pgraph_i = hypre_TAlloc(HYPRE_Int, (nprocs + 1), HYPRE_MEMORY_HOST);
+      recv_cnts = hypre_TAlloc(HYPRE_Int, nprocs, HYPRE_MEMORY_HOST);
       hypre_MPI_Allgather(&n_proc_array, 1, HYPRE_MPI_INT, recv_cnts, 1,
                           HYPRE_MPI_INT, comm);
       pgraph_i[0] = 0;
       for (i = 1; i <= nprocs; i++)
-         pgraph_i[i] = pgraph_i[i-1] + recv_cnts[i-1];
-      pgraph_j = hypre_TAlloc(HYPRE_Int, pgraph_i[nprocs] , HYPRE_MEMORY_HOST);
+      {
+         pgraph_i[i] = pgraph_i[i - 1] + recv_cnts[i - 1];
+      }
+      pgraph_j = hypre_TAlloc(HYPRE_Int, pgraph_i[nprocs], HYPRE_MEMORY_HOST);
       hypre_MPI_Allgatherv(proc_array, n_proc_array, HYPRE_MPI_INT, pgraph_j,
                            recv_cnts, pgraph_i, HYPRE_MPI_INT, comm);
       hypre_TFree(recv_cnts, HYPRE_MEMORY_HOST);
 
       /* BFS on the processor graph to determine parent and children */
 
-      nodes_marked = hypre_TAlloc(HYPRE_Int, nprocs , HYPRE_MEMORY_HOST);
-      for (i = 0; i < nprocs; i++) nodes_marked[i] = -1;
-      queue = hypre_TAlloc(HYPRE_Int, nprocs , HYPRE_MEMORY_HOST);
+      nodes_marked = hypre_TAlloc(HYPRE_Int, nprocs, HYPRE_MEMORY_HOST);
+      for (i = 0; i < nprocs; i++) { nodes_marked[i] = -1; }
+      queue = hypre_TAlloc(HYPRE_Int, nprocs, HYPRE_MEMORY_HOST);
       queue_head = 0;
       queue_tail = 1;
       node = 0;
       queue[0] = node;
-      while ((queue_tail-queue_head) > 0)
+      while ((queue_tail - queue_head) > 0)
       {
-         proc = queue[queue_tail-1];
+         proc = queue[queue_tail - 1];
          queue_tail--;
-         for (i = pgraph_i[proc]; i < pgraph_i[proc+1]; i++)
+         for (i = pgraph_i[proc]; i < pgraph_i[proc + 1]; i++)
          {
             proc2 = pgraph_j[i];
             if (nodes_marked[proc2] < 0)
@@ -2363,14 +2424,14 @@ hypre_ParCSRMatrixGenSpanningTree( hypre_ParCSRMatrix *G_csr,
       }
       parent = nodes_marked[mypid];
       n_children = 0;
-      for (i = 0; i < nprocs; i++) if (nodes_marked[i] == mypid) n_children++;
+      for (i = 0; i < nprocs; i++) if (nodes_marked[i] == mypid) { n_children++; }
       if (n_children == 0) {n_children = 0; children = NULL;}
       else
       {
-         children = hypre_TAlloc(HYPRE_Int, n_children , HYPRE_MEMORY_HOST);
+         children = hypre_TAlloc(HYPRE_Int, n_children, HYPRE_MEMORY_HOST);
          n_children = 0;
          for (i = 0; i < nprocs; i++)
-            if (nodes_marked[i] == mypid) children[n_children++] = i;
+            if (nodes_marked[i] == mypid) { children[n_children++] = i; }
       }
       hypre_TFree(nodes_marked, HYPRE_MEMORY_HOST);
       hypre_TFree(queue, HYPRE_MEMORY_HOST);
@@ -2402,8 +2463,8 @@ hypre_ParCSRMatrixGenSpanningTree( hypre_ParCSRMatrix *G_csr,
          proc = hypre_ParCSRCommPkgSendProc(comm_pkg, i);
          if (proc == parent)
          {
-            k = hypre_ParCSRCommPkgSendMapStart(comm_pkg,i);
-            edge = hypre_ParCSRCommPkgSendMapElmt(comm_pkg,k);
+            k = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
+            edge = hypre_ParCSRCommPkgSendMapElmt(comm_pkg, k);
             edges_marked[edge] = 1;
             break;
          }
@@ -2422,8 +2483,8 @@ hypre_ParCSRMatrixGenSpanningTree( hypre_ParCSRMatrix *G_csr,
          proc2 = hypre_ParCSRCommPkgSendProc(comm_pkg, i);
          if (proc == proc2)
          {
-            k = hypre_ParCSRCommPkgSendMapStart(comm_pkg,i);
-            edge = hypre_ParCSRCommPkgSendMapElmt(comm_pkg,k);
+            k = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
+            edge = hypre_ParCSRCommPkgSendMapElmt(comm_pkg, k);
             edges_marked[edge] = 1;
             break;
          }
@@ -2438,12 +2499,12 @@ hypre_ParCSRMatrixGenSpanningTree( hypre_ParCSRMatrix *G_csr,
 
    tree_size = 0;
    for (i = 0; i < ncols_G; i++)
-      if (edges_marked[i] == 1) tree_size++;
-   t_indices = hypre_TAlloc(HYPRE_Int, (tree_size+1) , HYPRE_MEMORY_HOST);
+      if (edges_marked[i] == 1) { tree_size++; }
+   t_indices = hypre_TAlloc(HYPRE_Int, (tree_size + 1), HYPRE_MEMORY_HOST);
    t_indices[0] = tree_size;
    tree_size = 1;
    for (i = 0; i < ncols_G; i++)
-      if (edges_marked[i] == 1) t_indices[tree_size++] = i;
+      if (edges_marked[i] == 1) { t_indices[tree_size++] = i; }
    (*indices) = t_indices;
    hypre_TFree(edges_marked, HYPRE_MEMORY_HOST);
    if (G_type != 0)
@@ -2479,7 +2540,7 @@ void hypre_ParCSRMatrixExtractSubmatrices( hypre_ParCSRMatrix *A_csr,
 
    nindices = indices2[0];
    indices  = &(indices2[1]);
-   hypre_qsort0(indices, 0, nindices-1);
+   hypre_qsort0(indices, 0, nindices - 1);
 
    /* -----------------------------------------------------
     * fetch matrix information
@@ -2495,7 +2556,7 @@ void hypre_ParCSRMatrixExtractSubmatrices( hypre_ParCSRMatrix *A_csr,
    hypre_MPI_Comm_size(comm, &nprocs);
    if (nprocs > 1)
    {
-      hypre_error_w_msg(HYPRE_ERROR_GENERIC,"ExtractSubmatrices: cannot handle nprocs > 1 yet.\n");
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "ExtractSubmatrices: cannot handle nprocs > 1 yet.\n");
       exit(1);
    }
 
@@ -2503,8 +2564,8 @@ void hypre_ParCSRMatrixExtractSubmatrices( hypre_ParCSRMatrix *A_csr,
     * compute new matrix dimensions
     * ----------------------------------------------------- */
 
-   proc_offsets1 = hypre_TAlloc(HYPRE_Int, (nprocs+1) , HYPRE_MEMORY_HOST);
-   proc_offsets2 = hypre_TAlloc(HYPRE_Int, (nprocs+1) , HYPRE_MEMORY_HOST);
+   proc_offsets1 = hypre_TAlloc(HYPRE_Int, (nprocs + 1), HYPRE_MEMORY_HOST);
+   proc_offsets2 = hypre_TAlloc(HYPRE_Int, (nprocs + 1), HYPRE_MEMORY_HOST);
    hypre_MPI_Allgather(&nindices, 1, HYPRE_MPI_INT, proc_offsets1, 1,
                        HYPRE_MPI_INT, comm);
    k = 0;
@@ -2525,14 +2586,14 @@ void hypre_ParCSRMatrixExtractSubmatrices( hypre_ParCSRMatrix *A_csr,
     * assign id's to row and col for later processing
     * ----------------------------------------------------- */
 
-   exp_indices = hypre_TAlloc(HYPRE_Int, nrows_A , HYPRE_MEMORY_HOST);
-   for (i = 0; i < nrows_A; i++) exp_indices[i] = -1;
+   exp_indices = hypre_TAlloc(HYPRE_Int, nrows_A, HYPRE_MEMORY_HOST);
+   for (i = 0; i < nrows_A; i++) { exp_indices[i] = -1; }
    for (i = 0; i < nindices; i++)
    {
-      if (exp_indices[indices[i]] == -1) exp_indices[indices[i]] = i;
+      if (exp_indices[indices[i]] == -1) { exp_indices[indices[i]] = i; }
       else
       {
-         hypre_error_w_msg(HYPRE_ERROR_GENERIC,"ExtractSubmatrices: wrong index %d %d\n");
+         hypre_error_w_msg(HYPRE_ERROR_GENERIC, "ExtractSubmatrices: wrong index %d %d\n");
          exit(1);
       }
    }
@@ -2555,20 +2616,20 @@ void hypre_ParCSRMatrixExtractSubmatrices( hypre_ParCSRMatrix *A_csr,
    {
       if (exp_indices[i] >= 0)
       {
-         for (j = A_diag_i[i]; j < A_diag_i[i+1]; j++)
+         for (j = A_diag_i[i]; j < A_diag_i[i + 1]; j++)
          {
             col = A_diag_j[j];
-            if (exp_indices[col] >= 0) nnz11++;
-            else                       nnz12++;
+            if (exp_indices[col] >= 0) { nnz11++; }
+            else { nnz12++; }
          }
       }
       else
       {
-         for (j = A_diag_i[i]; j < A_diag_i[i+1]; j++)
+         for (j = A_diag_i[i]; j < A_diag_i[i + 1]; j++)
          {
             col = A_diag_j[j];
-            if (exp_indices[col] >= 0) nnz21++;
-            else                       nnz22++;
+            if (exp_indices[col] >= 0) { nnz21++; }
+            else { nnz22++; }
          }
       }
    }
@@ -2589,7 +2650,7 @@ void hypre_ParCSRMatrixExtractSubmatrices( hypre_ParCSRMatrix *A_csr,
                                       row_starts, col_starts, ncols_offd,
                                       nnz_diag, nnz_offd);
    nrows = nindices;
-   diag_i = hypre_CTAlloc(HYPRE_Int,  nrows+1, HYPRE_MEMORY_HOST);
+   diag_i = hypre_CTAlloc(HYPRE_Int,  nrows + 1, HYPRE_MEMORY_HOST);
    diag_j = hypre_CTAlloc(HYPRE_Int,  nnz_diag, HYPRE_MEMORY_HOST);
    diag_a = hypre_CTAlloc(HYPRE_Complex,  nnz_diag, HYPRE_MEMORY_HOST);
    nnz = 0;
@@ -2599,7 +2660,7 @@ void hypre_ParCSRMatrixExtractSubmatrices( hypre_ParCSRMatrix *A_csr,
    {
       if (exp_indices[i] >= 0)
       {
-         for (j = A_diag_i[i]; j < A_diag_i[i+1]; j++)
+         for (j = A_diag_i[i]; j < A_diag_i[i + 1]; j++)
          {
             col = A_diag_j[j];
             if (exp_indices[col] >= 0)
@@ -2617,8 +2678,8 @@ void hypre_ParCSRMatrixExtractSubmatrices( hypre_ParCSRMatrix *A_csr,
    hypre_CSRMatrixJ(diag) = diag_j;
    hypre_CSRMatrixData(diag) = diag_a;
 
-   offd_i = hypre_CTAlloc(HYPRE_Int,  nrows+1, HYPRE_MEMORY_HOST);
-   for (i = 0; i <= nrows; i++) offd_i[i] = 0;
+   offd_i = hypre_CTAlloc(HYPRE_Int,  nrows + 1, HYPRE_MEMORY_HOST);
+   for (i = 0; i <= nrows; i++) { offd_i[i] = 0; }
    offd = hypre_ParCSRMatrixOffd(A11_csr);
    hypre_CSRMatrixI(offd) = offd_i;
    hypre_CSRMatrixJ(offd) = NULL;
@@ -2633,8 +2694,8 @@ void hypre_ParCSRMatrixExtractSubmatrices( hypre_ParCSRMatrix *A_csr,
    nnz_diag   = nnz12;
    global_nrows = (HYPRE_BigInt)proc_offsets1[nprocs];
    global_ncols = (HYPRE_BigInt)proc_offsets2[nprocs];
-   row_starts = hypre_CTAlloc(HYPRE_BigInt,  nprocs+1, HYPRE_MEMORY_HOST);
-   col_starts = hypre_CTAlloc(HYPRE_BigInt,  nprocs+1, HYPRE_MEMORY_HOST);
+   row_starts = hypre_CTAlloc(HYPRE_BigInt,  nprocs + 1, HYPRE_MEMORY_HOST);
+   col_starts = hypre_CTAlloc(HYPRE_BigInt,  nprocs + 1, HYPRE_MEMORY_HOST);
    for (i = 0; i <= nprocs; i++)
    {
       row_starts[i] = (HYPRE_BigInt)proc_offsets1[i];
@@ -2644,7 +2705,7 @@ void hypre_ParCSRMatrixExtractSubmatrices( hypre_ParCSRMatrix *A_csr,
                                       row_starts, col_starts, ncols_offd,
                                       nnz_diag, nnz_offd);
    nrows = nindices;
-   diag_i = hypre_CTAlloc(HYPRE_Int,  nrows+1, HYPRE_MEMORY_HOST);
+   diag_i = hypre_CTAlloc(HYPRE_Int,  nrows + 1, HYPRE_MEMORY_HOST);
    diag_j = hypre_CTAlloc(HYPRE_Int,  nnz_diag, HYPRE_MEMORY_HOST);
    diag_a = hypre_CTAlloc(HYPRE_Complex,  nnz_diag, HYPRE_MEMORY_HOST);
    nnz = 0;
@@ -2654,7 +2715,7 @@ void hypre_ParCSRMatrixExtractSubmatrices( hypre_ParCSRMatrix *A_csr,
    {
       if (exp_indices[i] >= 0)
       {
-         for (j = A_diag_i[i]; j < A_diag_i[i+1]; j++)
+         for (j = A_diag_i[i]; j < A_diag_i[i + 1]; j++)
          {
             col = A_diag_j[j];
             if (exp_indices[col] < 0)
@@ -2679,8 +2740,8 @@ void hypre_ParCSRMatrixExtractSubmatrices( hypre_ParCSRMatrix *A_csr,
    hypre_CSRMatrixJ(diag) = diag_j;
    hypre_CSRMatrixData(diag) = diag_a;
 
-   offd_i = hypre_CTAlloc(HYPRE_Int,  nrows+1, HYPRE_MEMORY_HOST);
-   for (i = 0; i <= nrows; i++) offd_i[i] = 0;
+   offd_i = hypre_CTAlloc(HYPRE_Int,  nrows + 1, HYPRE_MEMORY_HOST);
+   for (i = 0; i <= nrows; i++) { offd_i[i] = 0; }
    offd = hypre_ParCSRMatrixOffd(A12_csr);
    hypre_CSRMatrixI(offd) = offd_i;
    hypre_CSRMatrixJ(offd) = NULL;
@@ -2697,8 +2758,8 @@ void hypre_ParCSRMatrixExtractSubmatrices( hypre_ParCSRMatrix *A_csr,
    nnz_diag   = nnz21;
    global_nrows = (HYPRE_BigInt)proc_offsets2[nprocs];
    global_ncols = (HYPRE_BigInt)proc_offsets1[nprocs];
-   row_starts = hypre_CTAlloc(HYPRE_BigInt,  nprocs+1, HYPRE_MEMORY_HOST);
-   col_starts = hypre_CTAlloc(HYPRE_BigInt,  nprocs+1, HYPRE_MEMORY_HOST);
+   row_starts = hypre_CTAlloc(HYPRE_BigInt,  nprocs + 1, HYPRE_MEMORY_HOST);
+   col_starts = hypre_CTAlloc(HYPRE_BigInt,  nprocs + 1, HYPRE_MEMORY_HOST);
    for (i = 0; i <= nprocs; i++)
    {
       row_starts[i] = (HYPRE_BigInt)proc_offsets2[i];
@@ -2708,7 +2769,7 @@ void hypre_ParCSRMatrixExtractSubmatrices( hypre_ParCSRMatrix *A_csr,
                                       row_starts, col_starts, ncols_offd,
                                       nnz_diag, nnz_offd);
    nrows = nrows_A - nindices;
-   diag_i = hypre_CTAlloc(HYPRE_Int,  nrows+1, HYPRE_MEMORY_HOST);
+   diag_i = hypre_CTAlloc(HYPRE_Int,  nrows + 1, HYPRE_MEMORY_HOST);
    diag_j = hypre_CTAlloc(HYPRE_Int,  nnz_diag, HYPRE_MEMORY_HOST);
    diag_a = hypre_CTAlloc(HYPRE_Complex,  nnz_diag, HYPRE_MEMORY_HOST);
    nnz = 0;
@@ -2718,7 +2779,7 @@ void hypre_ParCSRMatrixExtractSubmatrices( hypre_ParCSRMatrix *A_csr,
    {
       if (exp_indices[i] < 0)
       {
-         for (j = A_diag_i[i]; j < A_diag_i[i+1]; j++)
+         for (j = A_diag_i[i]; j < A_diag_i[i + 1]; j++)
          {
             col = A_diag_j[j];
             if (exp_indices[col] >= 0)
@@ -2736,8 +2797,8 @@ void hypre_ParCSRMatrixExtractSubmatrices( hypre_ParCSRMatrix *A_csr,
    hypre_CSRMatrixJ(diag) = diag_j;
    hypre_CSRMatrixData(diag) = diag_a;
 
-   offd_i = hypre_CTAlloc(HYPRE_Int,  nrows+1, HYPRE_MEMORY_HOST);
-   for (i = 0; i <= nrows; i++) offd_i[i] = 0;
+   offd_i = hypre_CTAlloc(HYPRE_Int,  nrows + 1, HYPRE_MEMORY_HOST);
+   for (i = 0; i <= nrows; i++) { offd_i[i] = 0; }
    offd = hypre_ParCSRMatrixOffd(A21_csr);
    hypre_CSRMatrixI(offd) = offd_i;
    hypre_CSRMatrixJ(offd) = NULL;
@@ -2754,8 +2815,8 @@ void hypre_ParCSRMatrixExtractSubmatrices( hypre_ParCSRMatrix *A_csr,
    nnz_diag   = nnz22;
    global_nrows = (HYPRE_BigInt)proc_offsets2[nprocs];
    global_ncols = (HYPRE_BigInt)proc_offsets2[nprocs];
-   row_starts = hypre_CTAlloc(HYPRE_BigInt,  nprocs+1, HYPRE_MEMORY_HOST);
-   col_starts = hypre_CTAlloc(HYPRE_BigInt,  nprocs+1, HYPRE_MEMORY_HOST);
+   row_starts = hypre_CTAlloc(HYPRE_BigInt,  nprocs + 1, HYPRE_MEMORY_HOST);
+   col_starts = hypre_CTAlloc(HYPRE_BigInt,  nprocs + 1, HYPRE_MEMORY_HOST);
    for (i = 0; i <= nprocs; i++)
    {
       row_starts[i] = (HYPRE_BigInt)proc_offsets2[i];
@@ -2765,7 +2826,7 @@ void hypre_ParCSRMatrixExtractSubmatrices( hypre_ParCSRMatrix *A_csr,
                                       row_starts, col_starts, ncols_offd,
                                       nnz_diag, nnz_offd);
    nrows = nrows_A - nindices;
-   diag_i = hypre_CTAlloc(HYPRE_Int,  nrows+1, HYPRE_MEMORY_HOST);
+   diag_i = hypre_CTAlloc(HYPRE_Int,  nrows + 1, HYPRE_MEMORY_HOST);
    diag_j = hypre_CTAlloc(HYPRE_Int,  nnz_diag, HYPRE_MEMORY_HOST);
    diag_a = hypre_CTAlloc(HYPRE_Complex,  nnz_diag, HYPRE_MEMORY_HOST);
    nnz = 0;
@@ -2775,7 +2836,7 @@ void hypre_ParCSRMatrixExtractSubmatrices( hypre_ParCSRMatrix *A_csr,
    {
       if (exp_indices[i] < 0)
       {
-         for (j = A_diag_i[i]; j < A_diag_i[i+1]; j++)
+         for (j = A_diag_i[i]; j < A_diag_i[i + 1]; j++)
          {
             col = A_diag_j[j];
             if (exp_indices[col] < 0)
@@ -2793,8 +2854,8 @@ void hypre_ParCSRMatrixExtractSubmatrices( hypre_ParCSRMatrix *A_csr,
    hypre_CSRMatrixJ(diag) = diag_j;
    hypre_CSRMatrixData(diag) = diag_a;
 
-   offd_i = hypre_CTAlloc(HYPRE_Int,  nrows+1, HYPRE_MEMORY_HOST);
-   for (i = 0; i <= nrows; i++) offd_i[i] = 0;
+   offd_i = hypre_CTAlloc(HYPRE_Int,  nrows + 1, HYPRE_MEMORY_HOST);
+   for (i = 0; i <= nrows; i++) { offd_i[i] = 0; }
    offd = hypre_ParCSRMatrixOffd(A22_csr);
    hypre_CSRMatrixI(offd) = offd_i;
    hypre_CSRMatrixJ(offd) = NULL;
@@ -2841,7 +2902,7 @@ void hypre_ParCSRMatrixExtractRowSubmatrices( hypre_ParCSRMatrix *A_csr,
 
    nindices = indices2[0];
    indices  = &(indices2[1]);
-   hypre_qsort0(indices, 0, nindices-1);
+   hypre_qsort0(indices, 0, nindices - 1);
 
    /* -----------------------------------------------------
     * fetch matrix information
@@ -2863,8 +2924,8 @@ void hypre_ParCSRMatrixExtractRowSubmatrices( hypre_ParCSRMatrix *A_csr,
     * compute new matrix dimensions
     * ----------------------------------------------------- */
 
-   proc_offsets1 = hypre_TAlloc(HYPRE_Int, (nprocs+1) , HYPRE_MEMORY_HOST);
-   proc_offsets2 = hypre_TAlloc(HYPRE_Int, (nprocs+1) , HYPRE_MEMORY_HOST);
+   proc_offsets1 = hypre_TAlloc(HYPRE_Int, (nprocs + 1), HYPRE_MEMORY_HOST);
+   proc_offsets2 = hypre_TAlloc(HYPRE_Int, (nprocs + 1), HYPRE_MEMORY_HOST);
    hypre_MPI_Allgather(&nindices, 1, HYPRE_MPI_INT, proc_offsets1, 1,
                        HYPRE_MPI_INT, comm);
    k = 0;
@@ -2877,20 +2938,22 @@ void hypre_ParCSRMatrixExtractRowSubmatrices( hypre_ParCSRMatrix *A_csr,
    proc_offsets1[nprocs] = k;
    itmp_array = hypre_ParCSRMatrixRowStarts(A_csr);
    for (i = 0; i <= nprocs; i++)
+   {
       proc_offsets2[i] = (HYPRE_Int)(itmp_array[i] - proc_offsets1[i]);
+   }
 
    /* -----------------------------------------------------
     * assign id's to row and col for later processing
     * ----------------------------------------------------- */
 
-   exp_indices = hypre_TAlloc(HYPRE_Int, nrows_A , HYPRE_MEMORY_HOST);
-   for (i = 0; i < nrows_A; i++) exp_indices[i] = -1;
+   exp_indices = hypre_TAlloc(HYPRE_Int, nrows_A, HYPRE_MEMORY_HOST);
+   for (i = 0; i < nrows_A; i++) { exp_indices[i] = -1; }
    for (i = 0; i < nindices; i++)
    {
-      if (exp_indices[indices[i]] == -1) exp_indices[indices[i]] = i;
+      if (exp_indices[indices[i]] == -1) { exp_indices[indices[i]] = i; }
       else
       {
-         hypre_error_w_msg(HYPRE_ERROR_GENERIC,"ExtractRowSubmatrices: wrong index %d %d\n");
+         hypre_error_w_msg(HYPRE_ERROR_GENERIC, "ExtractRowSubmatrices: wrong index %d %d\n");
          exit(1);
       }
    }
@@ -2913,21 +2976,21 @@ void hypre_ParCSRMatrixExtractRowSubmatrices( hypre_ParCSRMatrix *A_csr,
    {
       if (exp_indices[i] >= 0)
       {
-         for (j = A_diag_i[i]; j < A_diag_i[i+1]; j++)
+         for (j = A_diag_i[i]; j < A_diag_i[i + 1]; j++)
          {
             col = A_diag_j[j];
-            if (exp_indices[col] >= 0) nnz11++;
+            if (exp_indices[col] >= 0) { nnz11++; }
          }
-         nnz11_offd += A_offd_i[i+1] - A_offd_i[i];
+         nnz11_offd += A_offd_i[i + 1] - A_offd_i[i];
       }
       else
       {
-         for (j = A_diag_i[i]; j < A_diag_i[i+1]; j++)
+         for (j = A_diag_i[i]; j < A_diag_i[i + 1]; j++)
          {
             col = A_diag_j[j];
-            if (exp_indices[col] < 0) nnz21++;
+            if (exp_indices[col] < 0) { nnz21++; }
          }
-         nnz21_offd += A_offd_i[i+1] - A_offd_i[i];
+         nnz21_offd += A_offd_i[i + 1] - A_offd_i[i];
       }
    }
 
@@ -2942,8 +3005,8 @@ void hypre_ParCSRMatrixExtractRowSubmatrices( hypre_ParCSRMatrix *A_csr,
    global_nrows = (HYPRE_BigInt)proc_offsets1[nprocs];
    itmp_array   = hypre_ParCSRMatrixColStarts(A_csr);
    global_ncols = itmp_array[nprocs];
-   row_starts = hypre_CTAlloc(HYPRE_BigInt,  nprocs+1, HYPRE_MEMORY_HOST);
-   col_starts = hypre_CTAlloc(HYPRE_BigInt,  nprocs+1, HYPRE_MEMORY_HOST);
+   row_starts = hypre_CTAlloc(HYPRE_BigInt,  nprocs + 1, HYPRE_MEMORY_HOST);
+   col_starts = hypre_CTAlloc(HYPRE_BigInt,  nprocs + 1, HYPRE_MEMORY_HOST);
    for (i = 0; i <= nprocs; i++)
    {
       row_starts[i] = (HYPRE_BigInt)proc_offsets1[i];
@@ -2953,7 +3016,7 @@ void hypre_ParCSRMatrixExtractRowSubmatrices( hypre_ParCSRMatrix *A_csr,
                                       row_starts, col_starts, ncols_offd,
                                       nnz_diag, nnz_offd);
    nrows = nindices;
-   diag_i = hypre_CTAlloc(HYPRE_Int,  nrows+1, HYPRE_MEMORY_HOST);
+   diag_i = hypre_CTAlloc(HYPRE_Int,  nrows + 1, HYPRE_MEMORY_HOST);
    diag_j = hypre_CTAlloc(HYPRE_Int,  nnz_diag, HYPRE_MEMORY_HOST);
    diag_a = hypre_CTAlloc(HYPRE_Complex,  nnz_diag, HYPRE_MEMORY_HOST);
    nnz = 0;
@@ -2963,7 +3026,7 @@ void hypre_ParCSRMatrixExtractRowSubmatrices( hypre_ParCSRMatrix *A_csr,
    {
       if (exp_indices[i] >= 0)
       {
-         for (j = A_diag_i[i]; j < A_diag_i[i+1]; j++)
+         for (j = A_diag_i[i]; j < A_diag_i[i + 1]; j++)
          {
             col = A_diag_j[j];
             if (exp_indices[col] >= 0)
@@ -2981,7 +3044,7 @@ void hypre_ParCSRMatrixExtractRowSubmatrices( hypre_ParCSRMatrix *A_csr,
    hypre_CSRMatrixJ(diag) = diag_j;
    hypre_CSRMatrixData(diag) = diag_a;
 
-   offd_i = hypre_CTAlloc(HYPRE_Int,  nrows+1, HYPRE_MEMORY_HOST);
+   offd_i = hypre_CTAlloc(HYPRE_Int,  nrows + 1, HYPRE_MEMORY_HOST);
    offd_j = hypre_CTAlloc(HYPRE_Int,  nnz_offd, HYPRE_MEMORY_HOST);
    offd_a = hypre_CTAlloc(HYPRE_Complex,  nnz_offd, HYPRE_MEMORY_HOST);
    nnz = 0;
@@ -2991,7 +3054,7 @@ void hypre_ParCSRMatrixExtractRowSubmatrices( hypre_ParCSRMatrix *A_csr,
    {
       if (exp_indices[i] >= 0)
       {
-         for (j = A_offd_i[i]; j < A_offd_i[i+1]; j++)
+         for (j = A_offd_i[i]; j < A_offd_i[i + 1]; j++)
          {
             offd_j[nnz] = A_offd_j[j];
             offd_a[nnz++] = A_diag_a[j];
@@ -3017,8 +3080,8 @@ void hypre_ParCSRMatrixExtractRowSubmatrices( hypre_ParCSRMatrix *A_csr,
    global_nrows = (HYPRE_BigInt)proc_offsets2[nprocs];
    itmp_array   = hypre_ParCSRMatrixColStarts(A_csr);
    global_ncols = itmp_array[nprocs];
-   row_starts = hypre_CTAlloc(HYPRE_BigInt,  nprocs+1, HYPRE_MEMORY_HOST);
-   col_starts = hypre_CTAlloc(HYPRE_BigInt,  nprocs+1, HYPRE_MEMORY_HOST);
+   row_starts = hypre_CTAlloc(HYPRE_BigInt,  nprocs + 1, HYPRE_MEMORY_HOST);
+   col_starts = hypre_CTAlloc(HYPRE_BigInt,  nprocs + 1, HYPRE_MEMORY_HOST);
    for (i = 0; i <= nprocs; i++)
    {
       row_starts[i] = (HYPRE_BigInt)proc_offsets2[i];
@@ -3028,7 +3091,7 @@ void hypre_ParCSRMatrixExtractRowSubmatrices( hypre_ParCSRMatrix *A_csr,
                                       row_starts, col_starts, ncols_offd,
                                       nnz_diag, nnz_offd);
    nrows = nrows_A - nindices;
-   diag_i = hypre_CTAlloc(HYPRE_Int,  nrows+1, HYPRE_MEMORY_HOST);
+   diag_i = hypre_CTAlloc(HYPRE_Int,  nrows + 1, HYPRE_MEMORY_HOST);
    diag_j = hypre_CTAlloc(HYPRE_Int,  nnz_diag, HYPRE_MEMORY_HOST);
    diag_a = hypre_CTAlloc(HYPRE_Complex,  nnz_diag, HYPRE_MEMORY_HOST);
    nnz = 0;
@@ -3038,7 +3101,7 @@ void hypre_ParCSRMatrixExtractRowSubmatrices( hypre_ParCSRMatrix *A_csr,
    {
       if (exp_indices[i] < 0)
       {
-         for (j = A_diag_i[i]; j < A_diag_i[i+1]; j++)
+         for (j = A_diag_i[i]; j < A_diag_i[i + 1]; j++)
          {
             diag_j[nnz] = A_diag_j[j];
             diag_a[nnz++] = A_diag_a[j];
@@ -3052,7 +3115,7 @@ void hypre_ParCSRMatrixExtractRowSubmatrices( hypre_ParCSRMatrix *A_csr,
    hypre_CSRMatrixJ(diag) = diag_j;
    hypre_CSRMatrixData(diag) = diag_a;
 
-   offd_i = hypre_CTAlloc(HYPRE_Int,  nrows+1, HYPRE_MEMORY_HOST);
+   offd_i = hypre_CTAlloc(HYPRE_Int,  nrows + 1, HYPRE_MEMORY_HOST);
    offd_j = hypre_CTAlloc(HYPRE_Int,  nnz_offd, HYPRE_MEMORY_HOST);
    offd_a = hypre_CTAlloc(HYPRE_Complex,  nnz_offd, HYPRE_MEMORY_HOST);
    nnz = 0;
@@ -3062,7 +3125,7 @@ void hypre_ParCSRMatrixExtractRowSubmatrices( hypre_ParCSRMatrix *A_csr,
    {
       if (exp_indices[i] < 0)
       {
-         for (j = A_offd_i[i]; j < A_offd_i[i+1]; j++)
+         for (j = A_offd_i[i]; j < A_offd_i[i + 1]; j++)
          {
             offd_j[nnz] = A_offd_j[j];
             offd_a[nnz++] = A_diag_a[j];
@@ -3108,76 +3171,73 @@ HYPRE_Complex hypre_ParCSRMatrixLocalSumElts( hypre_ParCSRMatrix * A )
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_ParCSRMatrixAminvDB( hypre_ParCSRMatrix *A,
-                           hypre_ParCSRMatrix *B,
-                           HYPRE_Complex *d,
+hypre_ParCSRMatrixAminvDB( hypre_ParCSRMatrix  *A,
+                           hypre_ParCSRMatrix  *B,
+                           HYPRE_Complex       *d,
                            hypre_ParCSRMatrix **C_ptr)
 {
-   MPI_Comm comm = hypre_ParCSRMatrixComm(B);
-   hypre_CSRMatrix      *A_diag   = hypre_ParCSRMatrixDiag(A);
-   hypre_CSRMatrix      *A_offd   = hypre_ParCSRMatrixOffd(A);
-   hypre_ParCSRMatrix  *C = NULL;
-   HYPRE_Int          num_cols_offd_A = hypre_CSRMatrixNumCols(A_offd);
-
-   hypre_ParCSRCommPkg  *comm_pkg_B = hypre_ParCSRMatrixCommPkg(B);
-   hypre_CSRMatrix      *B_diag   = hypre_ParCSRMatrixDiag(B);
-   hypre_CSRMatrix      *B_offd   = hypre_ParCSRMatrixOffd(B);
-   HYPRE_Int          num_cols_offd_B = hypre_CSRMatrixNumCols(B_offd);
-   HYPRE_Int          num_sends_B, num_recvs_B;
-   HYPRE_Int          i, j, cnt;
-
-   HYPRE_Int *A_diag_i = hypre_CSRMatrixI(A_diag);
-   HYPRE_Int *A_diag_j = hypre_CSRMatrixJ(A_diag);
-   HYPRE_Complex *A_diag_data = hypre_CSRMatrixData(A_diag);
-   HYPRE_Int *A_offd_i = hypre_CSRMatrixI(A_offd);
-   HYPRE_Int *A_offd_j = hypre_CSRMatrixJ(A_offd);
-   HYPRE_Complex *A_offd_data = hypre_CSRMatrixData(A_offd);
-   HYPRE_BigInt *col_map_offd_A = hypre_ParCSRMatrixColMapOffd(A);
-
-   HYPRE_Int num_rows = hypre_CSRMatrixNumRows(B_diag);
-   HYPRE_Int *B_diag_i = hypre_CSRMatrixI(B_diag);
-   HYPRE_Int *B_diag_j = hypre_CSRMatrixJ(B_diag);
-   HYPRE_Complex *B_diag_data = hypre_CSRMatrixData(B_diag);
-   HYPRE_Int *B_offd_i = hypre_CSRMatrixI(B_offd);
-   HYPRE_Int *B_offd_j = hypre_CSRMatrixJ(B_offd);
-   HYPRE_Complex *B_offd_data = hypre_CSRMatrixData(B_offd);
-   HYPRE_BigInt *col_map_offd_B = hypre_ParCSRMatrixColMapOffd(B);
-
-   hypre_CSRMatrix      *C_diag   = NULL;
-   hypre_CSRMatrix      *C_offd   = NULL;
-   HYPRE_Int *C_diag_i = NULL;
-   HYPRE_Int *C_diag_j = NULL;
-   HYPRE_Complex *C_diag_data = NULL;
-   HYPRE_Int *C_offd_i = NULL;
-   HYPRE_Int *C_offd_j = NULL;
-   HYPRE_Complex *C_offd_data = NULL;
-
-   HYPRE_Int num_procs, my_id;
+   MPI_Comm              comm            = hypre_ParCSRMatrixComm(B);
+   hypre_CSRMatrix      *A_diag          = hypre_ParCSRMatrixDiag(A);
+   hypre_CSRMatrix      *A_offd          = hypre_ParCSRMatrixOffd(A);
+   HYPRE_Int             num_cols_offd_A = hypre_CSRMatrixNumCols(A_offd);
+
+   hypre_ParCSRCommPkg  *comm_pkg_B      = hypre_ParCSRMatrixCommPkg(B);
+   hypre_CSRMatrix      *B_diag          = hypre_ParCSRMatrixDiag(B);
+   hypre_CSRMatrix      *B_offd          = hypre_ParCSRMatrixOffd(B);
+   HYPRE_Int             num_cols_offd_B = hypre_CSRMatrixNumCols(B_offd);
+   HYPRE_Int             num_sends_B;
+   HYPRE_Int             num_recvs_B;
+   HYPRE_Int             i, j, cnt;
+
+   HYPRE_Int            *A_diag_i       = hypre_CSRMatrixI(A_diag);
+   HYPRE_Int            *A_diag_j       = hypre_CSRMatrixJ(A_diag);
+   HYPRE_Complex        *A_diag_data    = hypre_CSRMatrixData(A_diag);
+
+   HYPRE_Int            *A_offd_i       = hypre_CSRMatrixI(A_offd);
+   HYPRE_Int            *A_offd_j       = hypre_CSRMatrixJ(A_offd);
+   HYPRE_Complex        *A_offd_data    = hypre_CSRMatrixData(A_offd);
+   HYPRE_BigInt         *col_map_offd_A = hypre_ParCSRMatrixColMapOffd(A);
+
+   HYPRE_Int             num_rows       = hypre_CSRMatrixNumRows(B_diag);
+   HYPRE_Int            *B_diag_i       = hypre_CSRMatrixI(B_diag);
+   HYPRE_Int            *B_diag_j       = hypre_CSRMatrixJ(B_diag);
+   HYPRE_Complex        *B_diag_data    = hypre_CSRMatrixData(B_diag);
+
+   HYPRE_Int            *B_offd_i       = hypre_CSRMatrixI(B_offd);
+   HYPRE_Int            *B_offd_j       = hypre_CSRMatrixJ(B_offd);
+   HYPRE_Complex        *B_offd_data    = hypre_CSRMatrixData(B_offd);
+   HYPRE_BigInt         *col_map_offd_B = hypre_ParCSRMatrixColMapOffd(B);
+
+   hypre_ParCSRMatrix   *C           = NULL;
+   hypre_CSRMatrix      *C_diag      = NULL;
+   hypre_CSRMatrix      *C_offd      = NULL;
+   HYPRE_Int            *C_diag_i    = NULL;
+   HYPRE_Int            *C_diag_j    = NULL;
+   HYPRE_Complex        *C_diag_data = NULL;
+   HYPRE_Int            *C_offd_i    = NULL;
+   HYPRE_Int            *C_offd_j    = NULL;
+   HYPRE_Complex        *C_offd_data = NULL;
+
+   HYPRE_Int             num_procs, my_id;
+   HYPRE_Int            *recv_procs_B;
+   HYPRE_Int            *send_procs_B;
+   HYPRE_Int            *recv_vec_starts_B;
+   HYPRE_Int            *send_map_starts_B;
+   HYPRE_Int            *send_map_elmts_B;
+   hypre_ParCSRCommPkg  *comm_pkg_C = NULL;
+   HYPRE_Int            *recv_procs_C;
+   HYPRE_Int            *send_procs_C;
+   HYPRE_Int            *recv_vec_starts_C;
+   HYPRE_Int            *send_map_starts_C;
+   HYPRE_Int            *send_map_elmts_C;
+   HYPRE_Int            *map_to_B = NULL;
+   HYPRE_Complex        *D_tmp;
+   HYPRE_Int             size, rest, num_threads, ii;
 
-   HYPRE_Int *recv_procs_B;
-   HYPRE_Int *send_procs_B;
-   HYPRE_Int *recv_vec_starts_B;
-   HYPRE_Int *send_map_starts_B;
-   HYPRE_Int *send_map_elmts_B;
-   hypre_ParCSRCommPkg *comm_pkg_C;
-   HYPRE_Int *recv_procs_C;
-   HYPRE_Int *send_procs_C;
-   HYPRE_Int *recv_vec_starts_C;
-   HYPRE_Int *send_map_starts_C;
-   HYPRE_Int *send_map_elmts_C;
-   HYPRE_Int *map_to_B;
-
-   /*HYPRE_Int *C_diag_array;
-     HYPRE_Int *C_offd_array;*/
-   HYPRE_Complex *D_tmp;
-   HYPRE_Int size, rest, num_threads, ii;
-
-   hypre_MPI_Comm_size(comm,&num_procs);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_size(comm, &num_procs);
+   hypre_MPI_Comm_rank(comm, &my_id);
 
    num_threads = hypre_NumThreads();
-   /*C_diag_array = hypre_CTAlloc(HYPRE_Int, num_threads);
-     C_offd_array = hypre_CTAlloc(HYPRE_Int,  num_threads, HYPRE_MEMORY_HOST);*/
 
    /*---------------------------------------------------------------------
     * If there exists no CommPkg for B, a CommPkg is generated
@@ -3201,8 +3261,8 @@ hypre_ParCSRMatrixAminvDB( hypre_ParCSRMatrix *A,
    C_offd_j = hypre_CSRMatrixJ(C_offd);
    C_offd_data = hypre_CSRMatrixData(C_offd);
 
-   size = num_rows/num_threads;
-   rest = num_rows - size*num_threads;
+   size = num_rows / num_threads;
+   rest = num_rows - size * num_threads;
 
    D_tmp = hypre_CTAlloc(HYPRE_Complex, num_rows, HYPRE_MEMORY_HOST);
 
@@ -3222,21 +3282,21 @@ hypre_ParCSRMatrixAminvDB( hypre_ParCSRMatrix *A,
    }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(ii, i, j)
+   #pragma omp parallel for private(ii, i, j)
 #endif
-   for (ii=0; ii < num_threads; ii++)
+   for (ii = 0; ii < num_threads; ii++)
    {
       HYPRE_Int *A_marker = NULL;
       HYPRE_Int ns, ne, A_col, num_cols, nmax;
       if (ii < rest)
       {
-         ns = ii*size+ii;
-         ne = (ii+1)*size+ii+1;
+         ns = ii * size + ii;
+         ne = (ii + 1) * size + ii + 1;
       }
       else
       {
-         ns = ii*size+rest;
-         ne = (ii+1)*size+rest;
+         ns = ii * size + rest;
+         ne = (ii + 1) * size + rest;
       }
       nmax = hypre_max(num_rows, num_cols_offd_B);
       A_marker = hypre_CTAlloc(HYPRE_Int,  nmax, HYPRE_MEMORY_HOST);
@@ -3248,13 +3308,13 @@ hypre_ParCSRMatrixAminvDB( hypre_ParCSRMatrix *A,
 
       for (i = ns; i < ne; i++)
       {
-         D_tmp[i] = 1.0/d[i];
+         D_tmp[i] = 1.0 / d[i];
       }
 
       num_cols = C_diag_i[ns];
       for (i = ns; i < ne; i++)
       {
-         for (j = A_diag_i[i]; j < A_diag_i[i+1]; j++)
+         for (j = A_diag_i[i]; j < A_diag_i[i + 1]; j++)
          {
             A_col = A_diag_j[j];
             if (A_marker[A_col] < C_diag_i[i])
@@ -3269,19 +3329,19 @@ hypre_ParCSRMatrixAminvDB( hypre_ParCSRMatrix *A,
                C_diag_data[A_marker[A_col]] += A_diag_data[j];
             }
          }
-         for (j = B_diag_i[i]; j < B_diag_i[i+1]; j++)
+         for (j = B_diag_i[i]; j < B_diag_i[i + 1]; j++)
          {
             A_col = B_diag_j[j];
             if (A_marker[A_col] < C_diag_i[i])
             {
                A_marker[A_col] = num_cols;
                C_diag_j[num_cols] = A_col;
-               C_diag_data[num_cols] = -D_tmp[i]*B_diag_data[j];
+               C_diag_data[num_cols] = -D_tmp[i] * B_diag_data[j];
                num_cols++;
             }
             else
             {
-               C_diag_data[A_marker[A_col]] -= D_tmp[i]*B_diag_data[j];
+               C_diag_data[A_marker[A_col]] -= D_tmp[i] * B_diag_data[j];
             }
          }
       }
@@ -3294,7 +3354,7 @@ hypre_ParCSRMatrixAminvDB( hypre_ParCSRMatrix *A,
       num_cols = C_offd_i[ns];
       for (i = ns; i < ne; i++)
       {
-         for (j = A_offd_i[i]; j < A_offd_i[i+1]; j++)
+         for (j = A_offd_i[i]; j < A_offd_i[i + 1]; j++)
          {
             A_col = map_to_B[A_offd_j[j]];
             if (A_marker[A_col] < B_offd_i[i])
@@ -3309,19 +3369,19 @@ hypre_ParCSRMatrixAminvDB( hypre_ParCSRMatrix *A,
                C_offd_data[A_marker[A_col]] += A_offd_data[j];
             }
          }
-         for (j = B_offd_i[i]; j < B_offd_i[i+1]; j++)
+         for (j = B_offd_i[i]; j < B_offd_i[i + 1]; j++)
          {
             A_col = B_offd_j[j];
             if (A_marker[A_col] < B_offd_i[i])
             {
                A_marker[A_col] = num_cols;
                C_offd_j[num_cols] = A_col;
-               C_offd_data[num_cols] = -D_tmp[i]*B_offd_data[j];
+               C_offd_data[num_cols] = -D_tmp[i] * B_offd_data[j];
                num_cols++;
             }
             else
             {
-               C_offd_data[A_marker[A_col]] -= D_tmp[i]*B_offd_data[j];
+               C_offd_data[A_marker[A_col]] -= D_tmp[i] * B_offd_data[j];
             }
          }
       }
@@ -3332,49 +3392,59 @@ hypre_ParCSRMatrixAminvDB( hypre_ParCSRMatrix *A,
    /*for (i=0; i < num_cols_offd_B; i++)
      col_map_offd_C[i] = col_map_offd_B[i]; */
 
-   num_sends_B = hypre_ParCSRCommPkgNumSends(comm_pkg_B);
-   num_recvs_B = hypre_ParCSRCommPkgNumRecvs(comm_pkg_B);
-   recv_procs_B = hypre_ParCSRCommPkgRecvProcs(comm_pkg_B);
+   num_sends_B       = hypre_ParCSRCommPkgNumSends(comm_pkg_B);
+   num_recvs_B       = hypre_ParCSRCommPkgNumRecvs(comm_pkg_B);
+   recv_procs_B      = hypre_ParCSRCommPkgRecvProcs(comm_pkg_B);
    recv_vec_starts_B = hypre_ParCSRCommPkgRecvVecStarts(comm_pkg_B);
-   send_procs_B = hypre_ParCSRCommPkgSendProcs(comm_pkg_B);
+   send_procs_B      = hypre_ParCSRCommPkgSendProcs(comm_pkg_B);
    send_map_starts_B = hypre_ParCSRCommPkgSendMapStarts(comm_pkg_B);
-   send_map_elmts_B = hypre_ParCSRCommPkgSendMapElmts(comm_pkg_B);
+   send_map_elmts_B  = hypre_ParCSRCommPkgSendMapElmts(comm_pkg_B);
 
-   recv_procs_C = hypre_CTAlloc(HYPRE_Int,  num_recvs_B, HYPRE_MEMORY_HOST);
-   recv_vec_starts_C = hypre_CTAlloc(HYPRE_Int,  num_recvs_B+1, HYPRE_MEMORY_HOST);
-   send_procs_C = hypre_CTAlloc(HYPRE_Int,  num_sends_B, HYPRE_MEMORY_HOST);
-   send_map_starts_C = hypre_CTAlloc(HYPRE_Int,  num_sends_B+1, HYPRE_MEMORY_HOST);
-   send_map_elmts_C = hypre_CTAlloc(HYPRE_Int,  send_map_starts_B[num_sends_B], HYPRE_MEMORY_HOST);
+   recv_procs_C      = hypre_CTAlloc(HYPRE_Int, num_recvs_B, HYPRE_MEMORY_HOST);
+   recv_vec_starts_C = hypre_CTAlloc(HYPRE_Int, num_recvs_B + 1, HYPRE_MEMORY_HOST);
+   send_procs_C      = hypre_CTAlloc(HYPRE_Int, num_sends_B, HYPRE_MEMORY_HOST);
+   send_map_starts_C = hypre_CTAlloc(HYPRE_Int, num_sends_B + 1, HYPRE_MEMORY_HOST);
+   send_map_elmts_C  = hypre_CTAlloc(HYPRE_Int, send_map_starts_B[num_sends_B], HYPRE_MEMORY_HOST);
 
-   for (i=0; i < num_recvs_B; i++)
+   for (i = 0; i < num_recvs_B; i++)
+   {
       recv_procs_C[i] = recv_procs_B[i];
-   for (i=0; i < num_recvs_B+1; i++)
+   }
+   for (i = 0; i < num_recvs_B + 1; i++)
+   {
       recv_vec_starts_C[i] = recv_vec_starts_B[i];
-   for (i=0; i < num_sends_B; i++)
+   }
+   for (i = 0; i < num_sends_B; i++)
+   {
       send_procs_C[i] = send_procs_B[i];
-   for (i=0; i < num_sends_B+1; i++)
+   }
+   for (i = 0; i < num_sends_B + 1; i++)
+   {
       send_map_starts_C[i] = send_map_starts_B[i];
-   for (i=0; i < send_map_starts_B[num_sends_B]; i++)
+   }
+   for (i = 0; i < send_map_starts_B[num_sends_B]; i++)
+   {
       send_map_elmts_C[i] = send_map_elmts_B[i];
+   }
 
-   comm_pkg_C = hypre_CTAlloc(hypre_ParCSRCommPkg, 1, HYPRE_MEMORY_HOST);
-   hypre_ParCSRCommPkgComm(comm_pkg_C) = comm;
-   hypre_ParCSRCommPkgNumRecvs(comm_pkg_C) = num_recvs_B;
-   hypre_ParCSRCommPkgRecvProcs(comm_pkg_C) = recv_procs_C;
-   hypre_ParCSRCommPkgRecvVecStarts(comm_pkg_C) = recv_vec_starts_C;
-   hypre_ParCSRCommPkgNumSends(comm_pkg_C) = num_sends_B;
-   hypre_ParCSRCommPkgSendProcs(comm_pkg_C) = send_procs_C;
-   hypre_ParCSRCommPkgSendMapStarts(comm_pkg_C) = send_map_starts_C;
-   hypre_ParCSRCommPkgSendMapElmts(comm_pkg_C) = send_map_elmts_C;
+   /* Create communication package */
+   hypre_ParCSRCommPkgCreateAndFill(comm,
+                                    num_recvs_B, recv_procs_C, recv_vec_starts_C,
+                                    num_sends_B, send_procs_C, send_map_starts_C,
+                                    send_map_elmts_C,
+                                    &comm_pkg_C);
 
    hypre_ParCSRMatrixCommPkg(C) = comm_pkg_C;
 
    hypre_TFree(D_tmp, HYPRE_MEMORY_HOST);
-   if (num_cols_offd_A) hypre_TFree(map_to_B, HYPRE_MEMORY_HOST);
+   if (num_cols_offd_A)
+   {
+      hypre_TFree(map_to_B, HYPRE_MEMORY_HOST);
+   }
 
    *C_ptr = C;
 
-   return (hypre_error_flag);
+   return hypre_error_flag;
 }
 
 /*--------------------------------------------------------------------------
@@ -3417,7 +3487,7 @@ hypre_ParTMatmul( hypre_ParCSRMatrix  *A,
 
    hypre_ParCSRMatrix *C;
    HYPRE_BigInt       *col_map_offd_C = NULL;
-   HYPRE_Int          *map_B_to_C;
+   HYPRE_Int          *map_B_to_C = NULL;
 
    hypre_CSRMatrix *C_diag = NULL;
    hypre_CSRMatrix *C_tmp_diag = NULL;
@@ -3432,34 +3502,34 @@ hypre_ParTMatmul( hypre_ParCSRMatrix  *A,
    hypre_CSRMatrix *C_tmp_offd = NULL;
    hypre_CSRMatrix *C_int = NULL;
    hypre_CSRMatrix *C_ext = NULL;
-   HYPRE_Int   *C_ext_i;
-   HYPRE_BigInt   *C_ext_j;
-   HYPRE_Complex   *C_ext_data;
-   HYPRE_Int   *C_ext_diag_i;
-   HYPRE_Int   *C_ext_diag_j;
-   HYPRE_Complex   *C_ext_diag_data;
-   HYPRE_Int   *C_ext_offd_i;
-   HYPRE_Int   *C_ext_offd_j;
-   HYPRE_Complex   *C_ext_offd_data;
+   HYPRE_Int   *C_ext_i = NULL;
+   HYPRE_BigInt   *C_ext_j = NULL;
+   HYPRE_Complex   *C_ext_data = NULL;
+   HYPRE_Int   *C_ext_diag_i = NULL;
+   HYPRE_Int   *C_ext_diag_j = NULL;
+   HYPRE_Complex   *C_ext_diag_data = NULL;
+   HYPRE_Int   *C_ext_offd_i = NULL;
+   HYPRE_Int   *C_ext_offd_j = NULL;
+   HYPRE_Complex   *C_ext_offd_data = NULL;
    HYPRE_Int    C_ext_size = 0;
    HYPRE_Int    C_ext_diag_size = 0;
    HYPRE_Int    C_ext_offd_size = 0;
 
    HYPRE_Int   *C_tmp_diag_i;
-   HYPRE_Int   *C_tmp_diag_j;
-   HYPRE_Complex   *C_tmp_diag_data;
-   HYPRE_Int   *C_tmp_offd_i;
-   HYPRE_Int   *C_tmp_offd_j;
-   HYPRE_Complex   *C_tmp_offd_data;
+   HYPRE_Int   *C_tmp_diag_j = NULL;
+   HYPRE_Complex   *C_tmp_diag_data = NULL;
+   HYPRE_Int   *C_tmp_offd_i = NULL;
+   HYPRE_Int   *C_tmp_offd_j = NULL;
+   HYPRE_Complex   *C_tmp_offd_data = NULL;
 
-   HYPRE_Complex   *C_offd_data=NULL;
-   HYPRE_Int       *C_offd_i=NULL;
-   HYPRE_Int       *C_offd_j=NULL;
+   HYPRE_Complex   *C_offd_data = NULL;
+   HYPRE_Int       *C_offd_i = NULL;
+   HYPRE_Int       *C_offd_j = NULL;
 
    HYPRE_BigInt    *temp;
-   HYPRE_Int       *send_map_starts_A;
-   HYPRE_Int       *send_map_elmts_A;
-   HYPRE_Int        num_sends_A;
+   HYPRE_Int       *send_map_starts_A = NULL;
+   HYPRE_Int       *send_map_elmts_A = NULL;
+   HYPRE_Int        num_sends_A = 0;
 
    HYPRE_Int        num_cols_offd_C = 0;
 
@@ -3486,13 +3556,13 @@ hypre_ParTMatmul( hypre_ParCSRMatrix  *A,
    nrows_B = hypre_ParCSRMatrixGlobalNumRows(B);
    ncols_B = hypre_ParCSRMatrixGlobalNumCols(B);
 
-   hypre_MPI_Comm_size(comm,&num_procs);
+   hypre_MPI_Comm_size(comm, &num_procs);
    hypre_MPI_Comm_rank(comm, &my_id);
    max_num_threads = hypre_NumThreads();
 
    if (nrows_A != nrows_B || num_rows_diag_A != num_rows_diag_B)
    {
-      hypre_error_w_msg(HYPRE_ERROR_GENERIC," Error! Incompatible matrix dimensions!\n");
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, " Error! Incompatible matrix dimensions!\n");
       return NULL;
    }
 
@@ -3583,14 +3653,14 @@ hypre_ParTMatmul( hypre_ParCSRMatrix  *A,
       send_map_elmts_A = hypre_ParCSRCommPkgSendMapElmts(comm_pkg_A);
       C_ext_num_rows =  send_map_starts_A[num_sends_A];
 
-      C_ext_diag_i = hypre_CTAlloc(HYPRE_Int,  C_ext_num_rows+1, HYPRE_MEMORY_HOST);
-      C_ext_offd_i = hypre_CTAlloc(HYPRE_Int,  C_ext_num_rows+1, HYPRE_MEMORY_HOST);
-      temp = hypre_CTAlloc(HYPRE_BigInt,  C_ext_size+num_cols_offd_B, HYPRE_MEMORY_HOST);
+      C_ext_diag_i = hypre_CTAlloc(HYPRE_Int,  C_ext_num_rows + 1, HYPRE_MEMORY_HOST);
+      C_ext_offd_i = hypre_CTAlloc(HYPRE_Int,  C_ext_num_rows + 1, HYPRE_MEMORY_HOST);
+      temp = hypre_CTAlloc(HYPRE_BigInt,  C_ext_size + num_cols_offd_B, HYPRE_MEMORY_HOST);
       C_ext_diag_size = 0;
       C_ext_offd_size = 0;
       for (i = 0; i < C_ext_num_rows; i++)
       {
-         for (j = C_ext_i[i]; j < C_ext_i[i+1]; j++)
+         for (j = C_ext_i[i]; j < C_ext_i[i + 1]; j++)
          {
             if (C_ext_j[j] < first_col_diag_C ||
                 C_ext_j[j] > last_col_diag_C)
@@ -3602,8 +3672,8 @@ hypre_ParTMatmul( hypre_ParCSRMatrix  *A,
                C_ext_diag_size++;
             }
          }
-         C_ext_diag_i[i+1] = C_ext_diag_size;
-         C_ext_offd_i[i+1] = C_ext_offd_size;
+         C_ext_diag_i[i + 1] = C_ext_diag_size;
+         C_ext_offd_i[i + 1] = C_ext_offd_size;
       }
       cnt = C_ext_offd_size;
       for (i = 0; i < num_cols_offd_B; i++)
@@ -3613,7 +3683,7 @@ hypre_ParTMatmul( hypre_ParCSRMatrix  *A,
 
       if (cnt)
       {
-         hypre_BigQsort0(temp,0,cnt-1);
+         hypre_BigQsort0(temp, 0, cnt - 1);
          value = temp[0];
          num_cols_offd_C = 1;
          for (i = 1; i < cnt; i++)
@@ -3659,7 +3729,7 @@ hypre_ParTMatmul( hypre_ParCSRMatrix  *A,
       cnt_diag = 0;
       for (i = 0; i < C_ext_num_rows; i++)
       {
-         for (j = C_ext_i[i]; j < C_ext_i[i+1]; j++)
+         for (j = C_ext_i[i]; j < C_ext_i[i + 1]; j++)
          {
             if (C_ext_j[j] < first_col_diag_C ||
                 C_ext_j[j] > last_col_diag_C)
@@ -3694,7 +3764,7 @@ hypre_ParTMatmul( hypre_ParCSRMatrix  *A,
          if (col_map_offd_C[i] == col_map_offd_B[cnt])
          {
             map_B_to_C[cnt++] = i;
-            if (cnt == num_cols_offd_B) break;
+            if (cnt == num_cols_offd_B) { break; }
          }
       }
       for (i = 0; i < hypre_CSRMatrixI(C_tmp_offd)[hypre_CSRMatrixNumRows(C_tmp_offd)]; i++)
@@ -3714,14 +3784,14 @@ hypre_ParTMatmul( hypre_ParCSRMatrix  *A,
 
    if (C_ext_size || num_cols_offd_B)
    {
-      C_diag_i = hypre_CTAlloc(HYPRE_Int, num_cols_diag_A+1, memory_location_C);
-      C_offd_i = hypre_CTAlloc(HYPRE_Int, num_cols_diag_A+1, memory_location_C);
+      C_diag_i = hypre_CTAlloc(HYPRE_Int, num_cols_diag_A + 1, memory_location_C);
+      C_offd_i = hypre_CTAlloc(HYPRE_Int, num_cols_diag_A + 1, memory_location_C);
 
       C_diag_array = hypre_CTAlloc(HYPRE_Int,  max_num_threads, HYPRE_MEMORY_HOST);
       C_offd_array = hypre_CTAlloc(HYPRE_Int,  max_num_threads, HYPRE_MEMORY_HOST);
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel
+      #pragma omp parallel
 #endif
       {
          HYPRE_Int *B_marker = NULL;
@@ -3731,18 +3801,18 @@ hypre_ParTMatmul( hypre_ParCSRMatrix  *A,
          HYPRE_Int rest, size;
          HYPRE_Int num_threads = hypre_NumActiveThreads();
 
-         size = num_cols_diag_A/num_threads;
-         rest = num_cols_diag_A - size*num_threads;
+         size = num_cols_diag_A / num_threads;
+         rest = num_cols_diag_A - size * num_threads;
          ii = hypre_GetThreadNum();
          if (ii < rest)
          {
-            ns = ii*size+ii;
-            ne = (ii+1)*size+ii+1;
+            ns = ii * size + ii;
+            ne = (ii + 1) * size + ii + 1;
          }
          else
          {
-            ns = ii*size+rest;
-            ne = (ii+1)*size+rest;
+            ns = ii * size + rest;
+            ne = (ii + 1) * size + rest;
          }
 
          B_marker = hypre_CTAlloc(HYPRE_Int,  num_cols_diag_B, HYPRE_MEMORY_HOST);
@@ -3762,14 +3832,14 @@ hypre_ParTMatmul( hypre_ParCSRMatrix  *A,
          nnz_o = 0;
          for (ik = ns; ik < ne; ik++)
          {
-            for (jk = C_tmp_diag_i[ik]; jk < C_tmp_diag_i[ik+1]; jk++)
+            for (jk = C_tmp_diag_i[ik]; jk < C_tmp_diag_i[ik + 1]; jk++)
             {
                jcol = C_tmp_diag_j[jk];
                B_marker[jcol] = ik;
                nnz_d++;
             }
 
-            for (jk = C_tmp_offd_i[ik]; jk < C_tmp_offd_i[ik+1]; jk++)
+            for (jk = C_tmp_offd_i[ik]; jk < C_tmp_offd_i[ik + 1]; jk++)
             {
                jcol = C_tmp_offd_j[jk];
                B_marker_offd[jcol] = ik;
@@ -3778,11 +3848,11 @@ hypre_ParTMatmul( hypre_ParCSRMatrix  *A,
 
             for (jk = 0; jk < num_sends_A; jk++)
             {
-               for (j1 = send_map_starts_A[jk]; j1 < send_map_starts_A[jk+1]; j1++)
+               for (j1 = send_map_starts_A[jk]; j1 < send_map_starts_A[jk + 1]; j1++)
                {
                   if (send_map_elmts_A[j1] == ik)
                   {
-                     for (j2 = C_ext_diag_i[j1]; j2 < C_ext_diag_i[j1+1]; j2++)
+                     for (j2 = C_ext_diag_i[j1]; j2 < C_ext_diag_i[j1 + 1]; j2++)
                      {
                         jcol = C_ext_diag_j[j2];
                         if (B_marker[jcol] < ik)
@@ -3791,7 +3861,7 @@ hypre_ParTMatmul( hypre_ParCSRMatrix  *A,
                            nnz_d++;
                         }
                      }
-                     for (j2 = C_ext_offd_i[j1]; j2 < C_ext_offd_i[j1+1]; j2++)
+                     for (j2 = C_ext_offd_i[j1]; j2 < C_ext_offd_i[j1 + 1]; j2++)
                      {
                         jcol = C_ext_offd_j[j2];
                         if (B_marker_offd[jcol] < ik)
@@ -3808,20 +3878,20 @@ hypre_ParTMatmul( hypre_ParCSRMatrix  *A,
             C_offd_array[ii] = nnz_o;
          }
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+         #pragma omp barrier
 #endif
 
          if (ii == 0)
          {
             nnz_d = 0;
             nnz_o = 0;
-            for (ik = 0; ik < num_threads-1; ik++)
+            for (ik = 0; ik < num_threads - 1; ik++)
             {
-               C_diag_array[ik+1] += C_diag_array[ik];
-               C_offd_array[ik+1] += C_offd_array[ik];
+               C_diag_array[ik + 1] += C_diag_array[ik];
+               C_offd_array[ik + 1] += C_offd_array[ik];
             }
-            nnz_d = C_diag_array[num_threads-1];
-            nnz_o = C_offd_array[num_threads-1];
+            nnz_d = C_diag_array[num_threads - 1];
+            nnz_o = C_offd_array[num_threads - 1];
             C_diag_i[num_cols_diag_A] = nnz_d;
             C_offd_i[num_cols_diag_A] = nnz_o;
 
@@ -3837,7 +3907,7 @@ hypre_ParTMatmul( hypre_ParCSRMatrix  *A,
             C_offd_data = hypre_CSRMatrixData(C_offd);
          }
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+         #pragma omp barrier
 #endif
 
          /*-----------------------------------------------------------------------
@@ -3864,14 +3934,14 @@ hypre_ParTMatmul( hypre_ParCSRMatrix  *A,
          nnz_o = 0;
          if (ii)
          {
-            nnz_d = C_diag_array[ii-1];
-            nnz_o = C_offd_array[ii-1];
+            nnz_d = C_diag_array[ii - 1];
+            nnz_o = C_offd_array[ii - 1];
          }
          for (ik = ns; ik < ne; ik++)
          {
             C_diag_i[ik] = nnz_d;
             C_offd_i[ik] = nnz_o;
-            for (jk = C_tmp_diag_i[ik]; jk < C_tmp_diag_i[ik+1]; jk++)
+            for (jk = C_tmp_diag_i[ik]; jk < C_tmp_diag_i[ik + 1]; jk++)
             {
                jcol = C_tmp_diag_j[jk];
                C_diag_j[nnz_d] = jcol;
@@ -3880,7 +3950,7 @@ hypre_ParTMatmul( hypre_ParCSRMatrix  *A,
                nnz_d++;
             }
 
-            for (jk = C_tmp_offd_i[ik]; jk < C_tmp_offd_i[ik+1]; jk++)
+            for (jk = C_tmp_offd_i[ik]; jk < C_tmp_offd_i[ik + 1]; jk++)
             {
                jcol = C_tmp_offd_j[jk];
                C_offd_j[nnz_o] = jcol;
@@ -3891,11 +3961,11 @@ hypre_ParTMatmul( hypre_ParCSRMatrix  *A,
 
             for (jk = 0; jk < num_sends_A; jk++)
             {
-               for (j1 = send_map_starts_A[jk]; j1 < send_map_starts_A[jk+1]; j1++)
+               for (j1 = send_map_starts_A[jk]; j1 < send_map_starts_A[jk + 1]; j1++)
                {
                   if (send_map_elmts_A[j1] == ik)
                   {
-                     for (j2 = C_ext_diag_i[j1]; j2 < C_ext_diag_i[j1+1]; j2++)
+                     for (j2 = C_ext_diag_i[j1]; j2 < C_ext_diag_i[j1 + 1]; j2++)
                      {
                         jcol = C_ext_diag_j[j2];
                         if (B_marker[jcol] < C_diag_i[ik])
@@ -3910,7 +3980,7 @@ hypre_ParTMatmul( hypre_ParCSRMatrix  *A,
                            C_diag_data[B_marker[jcol]] += C_ext_diag_data[j2];
                         }
                      }
-                     for (j2 = C_ext_offd_i[j1]; j2 < C_ext_offd_i[j1+1]; j2++)
+                     for (j2 = C_ext_offd_i[j1]; j2 < C_ext_offd_i[j1 + 1]; j2++)
                      {
                         jcol = C_ext_offd_j[j2];
                         if (B_marker_offd[jcol] < C_offd_i[ik])
@@ -3947,9 +4017,9 @@ hypre_ParTMatmul( hypre_ParCSRMatrix  *A,
    /* row_starts[0] is start of local rows.  row_starts[1] is start of next
       processor's rows */
    first_row_index = col_starts_A[0];
-   local_num_rows = (HYPRE_Int)(col_starts_A[1]-first_row_index );
+   local_num_rows = (HYPRE_Int)(col_starts_A[1] - first_row_index );
    first_col_diag = col_starts_B[0];
-   local_num_cols = (HYPRE_Int)(col_starts_B[1]-first_col_diag);
+   local_num_cols = (HYPRE_Int)(col_starts_B[1] - first_col_diag);
 
    C = hypre_CTAlloc(hypre_ParCSRMatrix, 1, HYPRE_MEMORY_HOST);
    hypre_ParCSRMatrixComm(C) = comm;
@@ -3996,8 +4066,8 @@ hypre_ParTMatmul( hypre_ParCSRMatrix  *A,
       hypre_ParCSRMatrixOffd(C) = C_tmp_offd;
    }
 
-   hypre_CSRMatrixMemoryLocation(hypre_ParCSRMatrixDiag(C)) = memory_location_C;
-   hypre_CSRMatrixMemoryLocation(hypre_ParCSRMatrixOffd(C)) = memory_location_C;
+   hypre_assert(hypre_CSRMatrixMemoryLocation(hypre_ParCSRMatrixDiag(C)) == memory_location_C);
+   hypre_assert(hypre_CSRMatrixMemoryLocation(hypre_ParCSRMatrixOffd(C)) == memory_location_C);
 
    if (num_cols_offd_C)
    {
@@ -4084,14 +4154,14 @@ hypre_ParTMatmul( hypre_ParCSRMatrix  *A,
 
    if (C_offd)
    {
-     hypre_CSRMatrixDestroy(C_tmp_offd);
+      hypre_CSRMatrixDestroy(C_tmp_offd);
    }
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
    if ( hypre_GetExecPolicy2(memory_location_A, memory_location_B) == HYPRE_EXEC_DEVICE )
    {
       hypre_CSRMatrixMoveDiagFirstDevice(hypre_ParCSRMatrixDiag(C));
-      hypre_SyncCudaComputeStream(hypre_handle());
+      hypre_SyncComputeStream();
    }
 #endif
 
@@ -4115,13 +4185,15 @@ hypre_ParvecBdiagInvScal( hypre_ParVector     *b,
    hypre_MPI_Comm_rank(comm, &my_id);
    hypre_MPI_Comm_size(comm, &num_procs);
 
-   HYPRE_Int i, j, s, block_start, block_end;
+   HYPRE_Int    i, j, s;
+   HYPRE_BigInt block_start, block_end;
    HYPRE_BigInt nrow_global = hypre_ParVectorGlobalSize(b);
    HYPRE_BigInt first_row   = hypre_ParVectorFirstIndex(b);
    HYPRE_BigInt last_row    = hypre_ParVectorLastIndex(b);
    HYPRE_BigInt end_row     = last_row + 1; /* one past-the-last */
    HYPRE_BigInt first_row_block = first_row / (HYPRE_BigInt)(blockSize) * (HYPRE_BigInt)blockSize;
-   HYPRE_BigInt end_row_block   = hypre_min( (last_row / (HYPRE_BigInt)blockSize + 1) * (HYPRE_BigInt)blockSize, nrow_global );
+   HYPRE_BigInt end_row_block   = hypre_min( (last_row / (HYPRE_BigInt)blockSize + 1) *
+                                             (HYPRE_BigInt)blockSize, nrow_global );
 
    hypre_assert(blockSize == A->bdiag_size);
    HYPRE_Complex *bdiaginv = A->bdiaginv;
@@ -4145,12 +4217,9 @@ hypre_ParvecBdiagInvScal( hypre_ParVector     *b,
    HYPRE_Int num_rows_recv = hypre_ParCSRCommPkgRecvVecStart(comm_pkg, num_recvs);
    hypre_ParCSRCommHandle  *comm_handle;
 
-   HYPRE_BigInt *part = hypre_TAlloc(HYPRE_BigInt, 2, HYPRE_MEMORY_HOST);
-   hypre_TMemcpy(part, hypre_ParVectorPartitioning(b), HYPRE_BigInt, 2,
-                 HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
-
    hypre_ParVector *bnew = hypre_ParVectorCreate( hypre_ParVectorComm(b),
-                                                  hypre_ParVectorGlobalSize(b), part );
+                                                  hypre_ParVectorGlobalSize(b),
+                                                  hypre_ParVectorPartitioning(b) );
    hypre_ParVectorInitialize(bnew);
    hypre_Vector    *bnew_local      = hypre_ParVectorLocalVector(bnew);
    HYPRE_Complex   *bnew_local_data = hypre_VectorData(bnew_local);
@@ -4188,7 +4257,7 @@ hypre_ParvecBdiagInvScal( hypre_ParVector     *b,
          for (j = 0; j < s; j++)
          {
             HYPRE_BigInt global_rid = block_start + (HYPRE_BigInt)j;
-            HYPRE_Complex val = dense[block_i + j*blockSize];
+            HYPRE_Complex val = dense[block_i + j * blockSize];
             if (val == 0.0)
             {
                continue;
@@ -4224,14 +4293,12 @@ hypre_ParvecBdiagInvScal( hypre_ParVector     *b,
    return hypre_error_flag;
 }
 
-/**
- * @brief Compute As = B^{-1}*A, where B is the block diagonal of A
- * @param[in]  A        :
- * @param[in]  blockSize:    block size
- * @param[out] B        :
- * @return
- * @warning
- */
+/*--------------------------------------------------------------------------
+ * hypre_ParcsrBdiagInvScal
+ *
+ * Compute As = B^{-1}*A, where B is the block diagonal of A.
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_ParcsrBdiagInvScal( hypre_ParCSRMatrix   *A,
                           HYPRE_Int             blockSize,
@@ -4276,7 +4343,7 @@ hypre_ParcsrBdiagInvScal( hypre_ParCSRMatrix   *A,
 
    /* if square globally and locally */
    HYPRE_Int square2 = (nrow_global == ncol_global) && (nrow_local == ncol_local) &&
-      (first_row == first_col);
+                       (first_row == first_col);
 
    if (nrow_global != ncol_global)
    {
@@ -4286,8 +4353,10 @@ hypre_ParcsrBdiagInvScal( hypre_ParCSRMatrix   *A,
 
    /* in block diagonals, row range of the blocks this proc span */
    HYPRE_BigInt first_row_block = first_row / (HYPRE_BigInt)blockSize * (HYPRE_BigInt)blockSize;
-   HYPRE_BigInt end_row_block   = hypre_min( (last_row / (HYPRE_BigInt)blockSize + 1) * (HYPRE_BigInt)blockSize, nrow_global );
-   HYPRE_Int num_blocks = (HYPRE_Int)(last_row / (HYPRE_BigInt)blockSize + 1 - first_row / (HYPRE_BigInt)blockSize);
+   HYPRE_BigInt end_row_block   = hypre_min( (last_row / (HYPRE_BigInt)blockSize + 1) *
+                                             (HYPRE_BigInt)blockSize, nrow_global );
+   HYPRE_Int num_blocks = (HYPRE_Int)(last_row / (HYPRE_BigInt)blockSize + 1 - first_row /
+                                      (HYPRE_BigInt)blockSize);
 
    //for (i=first_row_block; i < end_row; i+=blockSize) ;
    //printf("===[%d %d), [ %d %d ) %d === \n", first_row, end_row, first_row_block, end_row_block, i);
@@ -4303,7 +4372,8 @@ hypre_ParcsrBdiagInvScal( hypre_ParCSRMatrix   *A,
    HYPRE_Int       *A_ext_i = NULL;
    HYPRE_BigInt    *A_ext_j = NULL;
 
-   HYPRE_Real *dense_all = hypre_CTAlloc(HYPRE_Complex, num_blocks*blockSize*blockSize, HYPRE_MEMORY_HOST);
+   HYPRE_Real *dense_all = hypre_CTAlloc(HYPRE_Complex, num_blocks * blockSize * blockSize,
+                                         HYPRE_MEMORY_HOST);
    HYPRE_Real *dense = dense_all;
    HYPRE_Int *IPIV  = hypre_TAlloc(HYPRE_Int, blockSize, HYPRE_MEMORY_HOST);
    HYPRE_Complex *dgetri_work = NULL;
@@ -4380,10 +4450,10 @@ hypre_ParcsrBdiagInvScal( hypre_ParCSRMatrix   *A,
       }
    }
    /* remove duplicates after sorting (TODO better ways?) */
-   hypre_BigQsort0(ext_offd, 0, j-1);
+   hypre_BigQsort0(ext_offd, 0, j - 1);
    for (i = 0, k = 0; i < j; i++)
    {
-      if (i == 0 || ext_offd[i] != ext_offd[i-1])
+      if (i == 0 || ext_offd[i] != ext_offd[i - 1])
       {
          ext_offd[k++] = ext_offd[i];
       }
@@ -4433,7 +4503,8 @@ hypre_ParcsrBdiagInvScal( hypre_ParCSRMatrix   *A,
    }
 
    /* outer most loop for blocks */
-   for (block_start = first_row_block; block_start < end_row_block; block_start += (HYPRE_BigInt)blockSize)
+   for (block_start = first_row_block; block_start < end_row_block;
+        block_start += (HYPRE_BigInt)blockSize)
    {
       HYPRE_BigInt big_i;
       block_end = hypre_min(block_start + (HYPRE_BigInt)blockSize, nrow_global);
@@ -4450,22 +4521,22 @@ hypre_ParcsrBdiagInvScal( hypre_ParCSRMatrix   *A,
          {
             /* is a local row */
             j = (HYPRE_Int)(big_i - first_row);
-            for (k = A_diag_i[j]; k < A_diag_i[j+1]; k++)
+            for (k = A_diag_i[j]; k < A_diag_i[j + 1]; k++)
             {
                HYPRE_BigInt cid = (HYPRE_BigInt)A_diag_j[k] + first_col;
                if (cid >= block_start && cid < block_end)
                {
-                  dense[block_i + (HYPRE_Int)(cid-block_start)*blockSize] = A_diag_a[k];
+                  dense[block_i + (HYPRE_Int)(cid - block_start)*blockSize] = A_diag_a[k];
                }
             }
             if (num_cols_A_offd)
             {
-               for (k = A_offd_i[j]; k < A_offd_i[j+1]; k++)
+               for (k = A_offd_i[j]; k < A_offd_i[j + 1]; k++)
                {
                   HYPRE_BigInt cid = col_map_offd_A[A_offd_j[k]];
                   if (cid >= block_start && cid < block_end)
                   {
-                     dense[block_i + (HYPRE_Int)(cid-block_start)*blockSize] = A_offd_a[k];
+                     dense[block_i + (HYPRE_Int)(cid - block_start)*blockSize] = A_offd_a[k];
                   }
                }
             }
@@ -4481,14 +4552,14 @@ hypre_ParcsrBdiagInvScal( hypre_ParCSRMatrix   *A,
             {
                j = (HYPRE_Int)(first_row - first_row_block + big_i - end_row);
             }
-            for (k = A_ext_i[j]; k < A_ext_i[j+1]; k++)
+            for (k = A_ext_i[j]; k < A_ext_i[j + 1]; k++)
             {
                HYPRE_BigInt cid = A_ext_j[k];
                /* recover the global index */
-               cid = cid < (HYPRE_BigInt)ncol_local ? cid + first_col : col_map_offd_A_new[cid-ncol_local];
+               cid = cid < (HYPRE_BigInt)ncol_local ? cid + first_col : col_map_offd_A_new[cid - ncol_local];
                if (cid >= block_start && cid < block_end)
                {
-                  dense[block_i + (HYPRE_Int)(cid-block_start)*blockSize] = A_ext_a[k];
+                  dense[block_i + (HYPRE_Int)(cid - block_start)*blockSize] = A_ext_a[k];
                }
             }
          }
@@ -4510,7 +4581,7 @@ hypre_ParcsrBdiagInvScal( hypre_ParCSRMatrix   *A,
 
          if (lwork_opt > dgetri_lwork)
          {
-            dgetri_lwork = lwork_opt;
+            dgetri_lwork = (HYPRE_Int)lwork_opt;
             dgetri_work = hypre_TReAlloc(dgetri_work, HYPRE_Complex, dgetri_lwork, HYPRE_MEMORY_HOST);
          }
 
@@ -4525,20 +4596,20 @@ hypre_ParcsrBdiagInvScal( hypre_ParCSRMatrix   *A,
       {
          for (j = 0; j < s; j++)
          {
-            HYPRE_Complex t = dense[j+i*blockSize];
+            HYPRE_Complex t = dense[j + i * blockSize];
             Fnorm += t * t;
          }
       }
 
-      Fnorm = sqrt(Fnorm);
+      Fnorm = hypre_sqrt(Fnorm);
 
       for (i = 0; i < s; i++)
       {
          for (j = 0; j < s; j++)
          {
-            if ( hypre_abs(dense[j+i*blockSize]) < eps * Fnorm )
+            if ( hypre_abs(dense[j + i * blockSize]) < eps * Fnorm )
             {
-               dense[j+i*blockSize] = 0.0;
+               dense[j + i * blockSize] = 0.0;
             }
          }
       }
@@ -4581,7 +4652,7 @@ hypre_ParcsrBdiagInvScal( hypre_ParCSRMatrix   *A,
             /* row to combine: global row id */
             HYPRE_BigInt global_rid = block_start + (HYPRE_BigInt)j;
             /* the multipiler */
-            HYPRE_Complex val = dense[block_i + j*blockSize];
+            HYPRE_Complex val = dense[block_i + j * blockSize];
 
             if (val == 0.0)
             {
@@ -4594,7 +4665,7 @@ hypre_ParcsrBdiagInvScal( hypre_ParCSRMatrix   *A,
                HYPRE_Int rid = (HYPRE_Int)(global_rid - first_row);
                HYPRE_Int ii;
 
-               for (ii = A_diag_i[rid]; ii < A_diag_i[rid+1]; ii++)
+               for (ii = A_diag_i[rid]; ii < A_diag_i[rid + 1]; ii++)
                {
                   HYPRE_Int col = A_diag_j[ii];
                   HYPRE_Complex vv = A_diag_a[ii];
@@ -4624,7 +4695,7 @@ hypre_ParcsrBdiagInvScal( hypre_ParCSRMatrix   *A,
                   }
                }
 
-               for (ii = A_offd_i[rid]; ii < A_offd_i[rid+1]; ii++)
+               for (ii = A_offd_i[rid]; ii < A_offd_i[rid + 1]; ii++)
                {
                   HYPRE_Int col = A_offd_j[ii];
                   /* use the mapper to map to new offd */
@@ -4670,7 +4741,7 @@ hypre_ParcsrBdiagInvScal( hypre_ParCSRMatrix   *A,
                   rid = (HYPRE_Int)(first_row - first_row_block + global_rid - end_row);
                }
 
-               for (ii = A_ext_i[rid]; ii < A_ext_i[rid+1]; ii++)
+               for (ii = A_ext_i[rid]; ii < A_ext_i[rid + 1]; ii++)
                {
                   HYPRE_Int col = (HYPRE_Int)A_ext_j[ii];
                   HYPRE_Complex vv = A_ext_a[ii];
@@ -4848,35 +4919,36 @@ hypre_ParcsrGetExternalRowsInit( hypre_ParCSRMatrix   *A,
                                  HYPRE_Int             want_data,
                                  void                **request_ptr)
 {
-   HYPRE_Int i, j, k;
-   HYPRE_Int num_sends, num_rows_send, num_nnz_send, *send_i,
-             num_recvs, num_rows_recv, num_nnz_recv, *recv_i,
-            *send_jstarts, *recv_jstarts, *send_i_offset;
-   HYPRE_BigInt *send_j, *recv_j;
-   HYPRE_Complex *send_a = NULL, *recv_a = NULL;
-   hypre_ParCSRCommPkg     *comm_pkg_j;
-   hypre_ParCSRCommHandle  *comm_handle, *comm_handle_j, *comm_handle_a;
-   /* HYPRE_Int global_num_rows = hypre_ParCSRMatrixGlobalNumRows(A); */
+   HYPRE_UNUSED_VAR(indices);
+
+   MPI_Comm                 comm           = hypre_ParCSRMatrixComm(A);
+   HYPRE_BigInt             first_col      = hypre_ParCSRMatrixFirstColDiag(A);
+   HYPRE_BigInt            *col_map_offd_A = hypre_ParCSRMatrixColMapOffd(A);
+
    /* diag part of A */
-   hypre_CSRMatrix *A_diag   = hypre_ParCSRMatrixDiag(A);
-   HYPRE_Real      *A_diag_a = hypre_CSRMatrixData(A_diag);
-   HYPRE_Int       *A_diag_i = hypre_CSRMatrixI(A_diag);
-   HYPRE_Int       *A_diag_j = hypre_CSRMatrixJ(A_diag);
-   /* HYPRE_Int local_num_rows  = hypre_CSRMatrixNumRows(A_diag); */
+   hypre_CSRMatrix         *A_diag    = hypre_ParCSRMatrixDiag(A);
+   HYPRE_Real              *A_diag_a  = hypre_CSRMatrixData(A_diag);
+   HYPRE_Int               *A_diag_i  = hypre_CSRMatrixI(A_diag);
+   HYPRE_Int               *A_diag_j  = hypre_CSRMatrixJ(A_diag);
+
    /* off-diag part of A */
-   hypre_CSRMatrix *A_offd   = hypre_ParCSRMatrixOffd(A);
-   HYPRE_Real      *A_offd_a = hypre_CSRMatrixData(A_offd);
-   HYPRE_Int       *A_offd_i = hypre_CSRMatrixI(A_offd);
-   HYPRE_Int       *A_offd_j = hypre_CSRMatrixJ(A_offd);
-   /* HYPRE_BigInt *row_starts      = hypre_ParCSRMatrixRowStarts(A); */
-   /* HYPRE_BigInt  first_row       = hypre_ParCSRMatrixFirstRowIndex(A); */
-   HYPRE_BigInt     first_col       = hypre_ParCSRMatrixFirstColDiag(A);
-   HYPRE_BigInt    *col_map_offd_A  = hypre_ParCSRMatrixColMapOffd(A);
-   MPI_Comm         comm = hypre_ParCSRMatrixComm(A);
-   HYPRE_Int        num_procs;
-   HYPRE_Int        my_id;
-   void           **vrequest;
-   hypre_CSRMatrix *A_ext;
+   hypre_CSRMatrix         *A_offd    = hypre_ParCSRMatrixOffd(A);
+   HYPRE_Real              *A_offd_a  = hypre_CSRMatrixData(A_offd);
+   HYPRE_Int               *A_offd_i  = hypre_CSRMatrixI(A_offd);
+   HYPRE_Int               *A_offd_j  = hypre_CSRMatrixJ(A_offd);
+
+   hypre_CSRMatrix         *A_ext;
+   HYPRE_Int                num_procs, my_id;
+   void                   **vrequest;
+
+   HYPRE_Int                i, j, k;
+   HYPRE_Int                num_sends, num_rows_send, num_nnz_send, *send_i;
+   HYPRE_Int                num_recvs, num_rows_recv, num_nnz_recv, *recv_i;
+   HYPRE_Int               *send_jstarts, *recv_jstarts, *send_i_offset;
+   HYPRE_BigInt            *send_j, *recv_j;
+   HYPRE_Complex           *send_a = NULL, *recv_a = NULL;
+   hypre_ParCSRCommPkg     *comm_pkg_j = NULL;
+   hypre_ParCSRCommHandle  *comm_handle, *comm_handle_j, *comm_handle_a;
 
    hypre_MPI_Comm_size(comm, &num_procs);
    hypre_MPI_Comm_rank(comm, &my_id);
@@ -4902,12 +4974,12 @@ hypre_ParcsrGetExternalRowsInit( hypre_ParCSRMatrix   *A,
    {
       /* j: row index to send */
       j = hypre_ParCSRCommPkgSendMapElmt(comm_pkg, i);
-      send_i[i] = A_diag_i[j+1] - A_diag_i[j] + A_offd_i[j+1] - A_offd_i[j];
+      send_i[i] = A_diag_i[j + 1] - A_diag_i[j] + A_offd_i[j + 1] - A_offd_i[j];
       num_nnz_send += send_i[i];
    }
 
    /* send this array out: note the shift in recv_i by one (async) */
-   comm_handle = hypre_ParCSRCommHandleCreate(11, comm_pkg, send_i, recv_i+1);
+   comm_handle = hypre_ParCSRCommHandleCreate(11, comm_pkg, send_i, recv_i + 1);
 
    /* prepare data to send out. overlap with the above commmunication */
    send_j = hypre_TAlloc(HYPRE_BigInt, num_nnz_send, HYPRE_MEMORY_HOST);
@@ -4923,14 +4995,14 @@ hypre_ParcsrGetExternalRowsInit( hypre_ParCSRMatrix   *A,
    /* prefix sum. TODO: OMP parallelization */
    for (i = 1; i <= num_rows_send; i++)
    {
-      send_i_offset[i] += send_i_offset[i-1];
+      send_i_offset[i] += send_i_offset[i - 1];
    }
    hypre_assert(send_i_offset[num_rows_send] == num_nnz_send);
 
    /* pointers to each proc in send_j */
    send_jstarts = hypre_TAlloc(HYPRE_Int, num_sends + 1, HYPRE_MEMORY_HOST);
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for HYPRE_SMP_SCHEDULE
 #endif
    for (i = 0; i <= num_sends; i++)
    {
@@ -4940,35 +5012,35 @@ hypre_ParcsrGetExternalRowsInit( hypre_ParCSRMatrix   *A,
 
    /* fill the CSR matrix: j and a */
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for HYPRE_SMP_SCHEDULE private(i,j,k)
+   #pragma omp parallel for HYPRE_SMP_SCHEDULE private(i,j,k)
 #endif
    for (i = 0; i < num_rows_send; i++)
    {
       HYPRE_Int i1 = send_i_offset[i];
       j = hypre_ParCSRCommPkgSendMapElmt(comm_pkg, i);
       /* open row j and fill ja and a to send */
-      for (k = A_diag_i[j]; k < A_diag_i[j+1]; k++)
+      for (k = A_diag_i[j]; k < A_diag_i[j + 1]; k++)
       {
          send_j[i1] = first_col + A_diag_j[k];
          if (want_data)
          {
             send_a[i1] = A_diag_a[k];
          }
-            i1++;
-         }
-         if (num_procs > 1)
+         i1++;
+      }
+      if (num_procs > 1)
+      {
+         for (k = A_offd_i[j]; k < A_offd_i[j + 1]; k++)
          {
-         for (k = A_offd_i[j]; k < A_offd_i[j+1]; k++)
-            {
-               send_j[i1] = col_map_offd_A[A_offd_j[k]];
+            send_j[i1] = col_map_offd_A[A_offd_j[k]];
             if (want_data)
             {
                send_a[i1] = A_offd_a[k];
             }
-               i1++;
-            }
+            i1++;
          }
-      hypre_assert(send_i_offset[i+1] == i1);
+      }
+      hypre_assert(send_i_offset[i + 1] == i1);
    }
 
    /* finish the above communication: send_i/recv_i */
@@ -4977,7 +5049,7 @@ hypre_ParcsrGetExternalRowsInit( hypre_ParCSRMatrix   *A,
    /* adjust recv_i to ptrs */
    for (i = 1; i <= num_rows_recv; i++)
    {
-      recv_i[i] += recv_i[i-1];
+      recv_i[i] += recv_i[i - 1];
    }
    num_nnz_recv = recv_i[num_rows_recv];
    recv_j = hypre_CTAlloc(HYPRE_BigInt, num_nnz_recv, HYPRE_MEMORY_HOST);
@@ -4992,15 +5064,16 @@ hypre_ParcsrGetExternalRowsInit( hypre_ParCSRMatrix   *A,
       recv_jstarts[i] = recv_i[j];
    }
 
-   /* ready to send and recv: create a communication package for data */
-   comm_pkg_j = hypre_CTAlloc(hypre_ParCSRCommPkg, 1, HYPRE_MEMORY_HOST);
-   hypre_ParCSRCommPkgComm         (comm_pkg_j) = comm;
-   hypre_ParCSRCommPkgNumSends     (comm_pkg_j) = num_sends;
-   hypre_ParCSRCommPkgSendProcs    (comm_pkg_j) = hypre_ParCSRCommPkgSendProcs(comm_pkg);
-   hypre_ParCSRCommPkgSendMapStarts(comm_pkg_j) = send_jstarts;
-   hypre_ParCSRCommPkgNumRecvs     (comm_pkg_j) = num_recvs;
-   hypre_ParCSRCommPkgRecvProcs    (comm_pkg_j) = hypre_ParCSRCommPkgRecvProcs(comm_pkg);
-   hypre_ParCSRCommPkgRecvVecStarts(comm_pkg_j) = recv_jstarts;
+   /* Create communication package */
+   hypre_ParCSRCommPkgCreateAndFill(comm,
+                                    num_recvs,
+                                    hypre_ParCSRCommPkgRecvProcs(comm_pkg),
+                                    recv_jstarts,
+                                    num_sends,
+                                    hypre_ParCSRCommPkgSendProcs(comm_pkg),
+                                    send_jstarts,
+                                    NULL,
+                                    &comm_pkg_j);
 
    /* init communication */
    /* ja */
@@ -5038,6 +5111,10 @@ hypre_ParcsrGetExternalRowsInit( hypre_ParCSRMatrix   *A,
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_ParcsrGetExternalRowsWait
+ *--------------------------------------------------------------------------*/
+
 hypre_CSRMatrix*
 hypre_ParcsrGetExternalRowsWait(void *vrequest)
 {
@@ -5047,7 +5124,8 @@ hypre_ParcsrGetExternalRowsWait(void *vrequest)
    hypre_ParCSRCommHandle *comm_handle_a = (hypre_ParCSRCommHandle *) request[1];
    hypre_CSRMatrix        *A_ext         = (hypre_CSRMatrix *)        request[2];
    hypre_ParCSRCommPkg    *comm_pkg_j    = (hypre_ParCSRCommPkg *)    request[3];
-   HYPRE_BigInt           *send_j        = (HYPRE_BigInt *) hypre_ParCSRCommHandleSendData(comm_handle_j);
+   HYPRE_BigInt           *send_j        = (HYPRE_BigInt *) hypre_ParCSRCommHandleSendData(
+                                              comm_handle_j);
 
    if (comm_handle_a)
    {
@@ -5069,10 +5147,11 @@ hypre_ParcsrGetExternalRowsWait(void *vrequest)
 }
 
 /*--------------------------------------------------------------------------
- * hypre_ParCSRMatrixAdd: performs C = alpha*A + beta*B
+ * hypre_ParCSRMatrixAddHost
  *
- * A and B are assumed to have the same row and column partitionings
+ * Host (CPU) version of hypre_ParCSRMatrixAdd
  *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_ParCSRMatrixAddHost( HYPRE_Complex        alpha,
                            hypre_ParCSRMatrix  *A,
@@ -5169,9 +5248,20 @@ hypre_ParCSRMatrixAddHost( HYPRE_Complex        alpha,
    if ((num_rownnz_diag_A < num_rows_diag_A) &&
        (num_rownnz_diag_B < num_rows_diag_B))
    {
-      hypre_MergeOrderedArrays( num_rownnz_diag_A,  rownnz_diag_A,
-                                num_rownnz_diag_B,  rownnz_diag_B,
-                               &num_rownnz_diag_C, &rownnz_diag_C);
+      hypre_IntArray arr_diagA;
+      hypre_IntArray arr_diagB;
+      hypre_IntArray arr_diagC;
+
+      hypre_IntArrayData(&arr_diagA) = rownnz_diag_A;
+      hypre_IntArrayData(&arr_diagB) = rownnz_diag_B;
+      hypre_IntArraySize(&arr_diagA) = num_rownnz_diag_A;
+      hypre_IntArraySize(&arr_diagB) = num_rownnz_diag_B;
+      hypre_IntArrayMemoryLocation(&arr_diagC) = memory_location_C;
+
+      hypre_IntArrayMergeOrdered(&arr_diagA, &arr_diagB, &arr_diagC);
+
+      num_rownnz_diag_C = hypre_IntArraySize(&arr_diagC);
+      rownnz_diag_C     = hypre_IntArrayData(&arr_diagC);
    }
 
    /* Set nonzero rows data of offd_C */
@@ -5179,14 +5269,25 @@ hypre_ParCSRMatrixAddHost( HYPRE_Complex        alpha,
    if ((num_rownnz_offd_A < num_rows_offd_A) &&
        (num_rownnz_offd_B < num_rows_offd_B))
    {
-      hypre_MergeOrderedArrays( num_rownnz_offd_A,  rownnz_offd_A,
-                                num_rownnz_offd_B,  rownnz_offd_B,
-                               &num_rownnz_offd_C, &rownnz_offd_C);
+      hypre_IntArray arr_offdA;
+      hypre_IntArray arr_offdB;
+      hypre_IntArray arr_offdC;
+
+      hypre_IntArrayData(&arr_offdA) = rownnz_offd_A;
+      hypre_IntArrayData(&arr_offdB) = rownnz_offd_B;
+      hypre_IntArraySize(&arr_offdA) = num_rownnz_offd_A;
+      hypre_IntArraySize(&arr_offdB) = num_rownnz_offd_B;
+      hypre_IntArrayMemoryLocation(&arr_offdC) = memory_location_C;
+
+      hypre_IntArrayMergeOrdered(&arr_offdA, &arr_offdB, &arr_offdC);
+
+      num_rownnz_offd_C = hypre_IntArraySize(&arr_offdC);
+      rownnz_offd_C     = hypre_IntArrayData(&arr_offdC);
    }
 
    /* Set diag_C */
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel
+   #pragma omp parallel
 #endif
    {
       HYPRE_Int   ii, num_threads;
@@ -5197,21 +5298,21 @@ hypre_ParCSRMatrixAddHost( HYPRE_Complex        alpha,
       ii = hypre_GetThreadNum();
       num_threads = hypre_NumActiveThreads();
 
-     /*-----------------------------------------------------------------------
-      *  Compute C_diag = alpha*A_diag + beta*B_diag
-      *-----------------------------------------------------------------------*/
+      /*-----------------------------------------------------------------------
+       *  Compute C_diag = alpha*A_diag + beta*B_diag
+       *-----------------------------------------------------------------------*/
 
-      size = num_rownnz_diag_C/num_threads;
-      rest = num_rownnz_diag_C - size*num_threads;
+      size = num_rownnz_diag_C / num_threads;
+      rest = num_rownnz_diag_C - size * num_threads;
       if (ii < rest)
       {
-         ns = ii*size+ii;
-         ne = (ii+1)*size+ii+1;
+         ns = ii * size + ii;
+         ne = (ii + 1) * size + ii + 1;
       }
       else
       {
-         ns = ii*size+rest;
-         ne = (ii+1)*size+rest;
+         ns = ii * size + rest;
+         ne = (ii + 1) * size + rest;
       }
 
       marker_diag = hypre_TAlloc(HYPRE_Int, num_cols_diag_A, HYPRE_MEMORY_HOST);
@@ -5220,26 +5321,26 @@ hypre_ParCSRMatrixAddHost( HYPRE_Complex        alpha,
                                   num_rows_diag_C, num_rownnz_diag_C,
                                   num_cols_diag_C, rownnz_diag_C,
                                   memory_location_C, C_diag_i, &C_diag);
-      hypre_CSRMatrixAddSecondPass(ns, ne, twspace, marker_diag,
+      hypre_CSRMatrixAddSecondPass(ns, ne, marker_diag,
                                    NULL, NULL, rownnz_diag_C,
                                    alpha, beta, A_diag, B_diag, C_diag);
       hypre_TFree(marker_diag, HYPRE_MEMORY_HOST);
 
-     /*-----------------------------------------------------------------------
-      *  Compute C_offd = alpha*A_offd + beta*B_offd
-      *-----------------------------------------------------------------------*/
+      /*-----------------------------------------------------------------------
+       *  Compute C_offd = alpha*A_offd + beta*B_offd
+       *-----------------------------------------------------------------------*/
 
-      size = num_rownnz_offd_C/num_threads;
-      rest = num_rownnz_offd_C - size*num_threads;
+      size = num_rownnz_offd_C / num_threads;
+      rest = num_rownnz_offd_C - size * num_threads;
       if (ii < rest)
       {
-         ns = ii*size+ii;
-         ne = (ii+1)*size+ii+1;
+         ns = ii * size + ii;
+         ne = (ii + 1) * size + ii + 1;
       }
       else
       {
-         ns = ii*size+rest;
-         ne = (ii+1)*size+rest;
+         ns = ii * size + rest;
+         ne = (ii + 1) * size + rest;
       }
 
       marker_offd = hypre_TAlloc(HYPRE_Int, num_cols_offd_C, HYPRE_MEMORY_HOST);
@@ -5248,7 +5349,7 @@ hypre_ParCSRMatrixAddHost( HYPRE_Complex        alpha,
                                   num_rows_offd_C, num_rownnz_offd_C,
                                   num_cols_offd_C, rownnz_offd_C,
                                   memory_location_C, C_offd_i, &C_offd);
-      hypre_CSRMatrixAddSecondPass(ns, ne, twspace, marker_offd,
+      hypre_CSRMatrixAddSecondPass(ns, ne, marker_offd,
                                    A2C_offd, B2C_offd, rownnz_offd_C,
                                    alpha, beta, A_offd, B_offd, C_offd);
       hypre_TFree(marker_offd, HYPRE_MEMORY_HOST);
@@ -5287,6 +5388,14 @@ hypre_ParCSRMatrixAddHost( HYPRE_Complex        alpha,
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixAdd
+ *
+ * Interface for Host/Device functions for computing C = alpha*A + beta*B
+ *
+ * A and B are assumed to have the same row and column partitionings
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_ParCSRMatrixAdd( HYPRE_Complex        alpha,
                        hypre_ParCSRMatrix  *A,
@@ -5299,7 +5408,7 @@ hypre_ParCSRMatrixAdd( HYPRE_Complex        alpha,
    hypre_assert(hypre_ParCSRMatrixNumRows(A) == hypre_ParCSRMatrixNumRows(B));
    hypre_assert(hypre_ParCSRMatrixNumCols(A) == hypre_ParCSRMatrixNumCols(B));
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
    if ( hypre_GetExecPolicy2( hypre_ParCSRMatrixMemoryLocation(A),
                               hypre_ParCSRMatrixMemoryLocation(B) ) == HYPRE_EXEC_DEVICE )
    {
@@ -5330,7 +5439,7 @@ hypre_ParCSRMatrixFnorm( hypre_ParCSRMatrix *A )
 
    hypre_MPI_Allreduce(&local_result, &result, 1, HYPRE_MPI_REAL, hypre_MPI_SUM, comm);
 
-   return sqrt(result);
+   return hypre_sqrt(result);
 }
 
 /*--------------------------------------------------------------------------
@@ -5365,23 +5474,23 @@ hypre_ParCSRMatrixInfNorm( hypre_ParCSRMatrix  *A,
 
 #ifdef _MSC_VER
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel private(i,j,rowsum)
+   #pragma omp parallel private(i,j,rowsum)
 #endif
    {
       HYPRE_Real maxsum_local;
 
       maxsum_local = 0.0;
 #ifdef HYPRE_USING_OPENMP
-#pragma omp for HYPRE_SMP_SCHEDULE
+      #pragma omp for HYPRE_SMP_SCHEDULE
 #endif
       for (i = 0; i < num_rows_diag_A; i++)
       {
          rowsum = 0.0;
-         for (j = A_diag_i[i]; j < A_diag_i[i+1]; j++)
+         for (j = A_diag_i[i]; j < A_diag_i[i + 1]; j++)
          {
             rowsum += hypre_cabs(A_diag_a[j]);
          }
-         for (j = A_offd_i[i]; j < A_offd_i[i+1]; j++)
+         for (j = A_offd_i[i]; j < A_offd_i[i + 1]; j++)
          {
             rowsum += hypre_cabs(A_offd_a[j]);
          }
@@ -5390,7 +5499,7 @@ hypre_ParCSRMatrixInfNorm( hypre_ParCSRMatrix  *A,
       }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp critical
+      #pragma omp critical
 #endif
       {
          maxsum = hypre_max(maxsum, maxsum_local);
@@ -5398,16 +5507,16 @@ hypre_ParCSRMatrixInfNorm( hypre_ParCSRMatrix  *A,
    }
 #else
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i,j,rowsum) reduction(max:maxsum) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i,j,rowsum) reduction(max:maxsum) HYPRE_SMP_SCHEDULE
 #endif
    for (i = 0; i < num_rows_diag_A; i++)
    {
       rowsum = 0.0;
-      for (j = A_diag_i[i]; j < A_diag_i[i+1]; j++)
+      for (j = A_diag_i[i]; j < A_diag_i[i + 1]; j++)
       {
          rowsum += hypre_cabs(A_diag_a[j]);
       }
-      for (j = A_offd_i[i]; j < A_offd_i[i+1]; j++)
+      for (j = A_offd_i[i]; j < A_offd_i[i + 1]; j++)
       {
          rowsum += hypre_cabs(A_offd_a[j]);
       }
@@ -5460,7 +5569,7 @@ hypre_ExchangeExternalRowsInit( hypre_CSRMatrix      *B_ext,
    HYPRE_Int        B_int_nnz;
 
    hypre_ParCSRCommHandle *comm_handle, *comm_handle_j, *comm_handle_a;
-   hypre_ParCSRCommPkg    *comm_pkg_j;
+   hypre_ParCSRCommPkg    *comm_pkg_j = NULL;
 
    HYPRE_Int *jdata_recv_vec_starts;
    HYPRE_Int *jdata_send_map_starts;
@@ -5471,7 +5580,7 @@ hypre_ExchangeExternalRowsInit( hypre_CSRMatrix      *B_ext,
 
    hypre_MPI_Comm_size(comm, &num_procs);
 
-   jdata_send_map_starts = hypre_TAlloc(HYPRE_Int, num_sends+1, HYPRE_MEMORY_HOST);
+   jdata_send_map_starts = hypre_TAlloc(HYPRE_Int, num_sends + 1, HYPRE_MEMORY_HOST);
 
    /*--------------------------------------------------------------------------
     * B_ext_rownnz contains the number of elements of row j
@@ -5479,7 +5588,7 @@ hypre_ExchangeExternalRowsInit( hypre_CSRMatrix      *B_ext,
     *--------------------------------------------------------------------------*/
    for (i = 0; i < B_ext_nrows; i++)
    {
-      B_ext_rownnz[i] = B_ext_i[i+1] - B_ext_i[i];
+      B_ext_rownnz[i] = B_ext_i[i + 1] - B_ext_i[i];
    }
 
    /*--------------------------------------------------------------------------
@@ -5495,12 +5604,12 @@ hypre_ExchangeExternalRowsInit( hypre_CSRMatrix      *B_ext,
       jdata_recv_vec_starts[i] = B_ext_i[recv_vec_starts[i]];
    }
 
-   comm_pkg_j = hypre_CTAlloc(hypre_ParCSRCommPkg, 1, HYPRE_MEMORY_HOST);
-   hypre_ParCSRCommPkgComm(comm_pkg_j)      = comm;
-   hypre_ParCSRCommPkgNumSends(comm_pkg_j)  = num_recvs;
-   hypre_ParCSRCommPkgNumRecvs(comm_pkg_j)  = num_sends;
-   hypre_ParCSRCommPkgSendProcs(comm_pkg_j) = recv_procs;
-   hypre_ParCSRCommPkgRecvProcs(comm_pkg_j) = send_procs;
+   /* Create communication package -  note the order of send/recv is reversed */
+   hypre_ParCSRCommPkgCreateAndFill(comm,
+                                    num_sends, send_procs, jdata_send_map_starts,
+                                    num_recvs, recv_procs, jdata_recv_vec_starts,
+                                    NULL,
+                                    &comm_pkg_j);
 
    hypre_ParCSRCommHandleDestroy(comm_handle);
 
@@ -5510,7 +5619,7 @@ hypre_ExchangeExternalRowsInit( hypre_CSRMatrix      *B_ext,
    B_int_i[0] = 0;
    for (i = 1; i <= B_int_nrows; i++)
    {
-      B_int_i[i] += B_int_i[i-1];
+      B_int_i[i] += B_int_i[i - 1];
    }
 
    B_int_nnz = B_int_i[B_int_nrows];
@@ -5523,10 +5632,6 @@ hypre_ExchangeExternalRowsInit( hypre_CSRMatrix      *B_ext,
       jdata_send_map_starts[i] = B_int_i[send_map_starts[i]];
    }
 
-   /* note the order of send/recv is reversed */
-   hypre_ParCSRCommPkgRecvVecStarts(comm_pkg_j) = jdata_send_map_starts;
-   hypre_ParCSRCommPkgSendMapStarts(comm_pkg_j) = jdata_recv_vec_starts;
-
    /* send/recv CSR rows */
    comm_handle_a = hypre_ParCSRCommHandleCreate( 1, comm_pkg_j, B_ext_data, B_int_data);
    comm_handle_j = hypre_ParCSRCommHandleCreate(21, comm_pkg_j, B_ext_j, B_int_j);
@@ -5579,18 +5684,19 @@ hypre_ExchangeExternalRowsWait(void *vrequest)
    return B_int;
 }
 
-
 /*--------------------------------------------------------------------------
  * hypre_ParCSRMatrixExtractSubmatrixFC
  *
  * extract submatrix A_{FF}, A_{FC}, A_{CF} or A_{CC}
  * char job[2] = "FF", "FC", "CF" or "CC"
+ *
+ * TODO (VPM): Can we do the same with hypre_ParCSRMatrixGenerateFFFC?
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
 hypre_ParCSRMatrixExtractSubmatrixFC( hypre_ParCSRMatrix  *A,
                                       HYPRE_Int           *CF_marker,
-                                      HYPRE_BigInt        *cpts_starts_in,
+                                      HYPRE_BigInt        *cpts_starts,
                                       const char          *job,
                                       hypre_ParCSRMatrix **B_ptr,
                                       HYPRE_Real           strength_thresh)
@@ -5625,8 +5731,8 @@ hypre_ParCSRMatrixExtractSubmatrixFC( hypre_ParCSRMatrix  *A,
    HYPRE_BigInt        B_nrow_global, B_ncol_global;
    HYPRE_Int           A_nlocal, B_nrow_local, B_ncol_local,
                        B_nnz_diag, B_nnz_offd;
-   HYPRE_BigInt        total_global_fpts, total_global_cpts, *fpts_starts, *cpts_starts;
-   HYPRE_Int           nf_local, nc_local;
+   HYPRE_BigInt        total_global_fpts, total_global_cpts, fpts_starts[2];
+   HYPRE_Int           nf_local, nc_local = 0;
    HYPRE_BigInt        big_nf_local;
    HYPRE_Int           row_set, col_set;
    HYPRE_BigInt       *B_row_starts, *B_col_starts, B_first_col;
@@ -5649,18 +5755,11 @@ hypre_ParCSRMatrixExtractSubmatrixFC( hypre_ParCSRMatrix  *A,
     *               assuming cpts_starts is given */
    if (row_set == 1 || col_set == 1)
    {
-      /* copy cpts_starts first */
-      HYPRE_Int len;
-      len = 2;
-      cpts_starts = hypre_TAlloc(HYPRE_BigInt, len, HYPRE_MEMORY_HOST);
-      hypre_TMemcpy(cpts_starts, cpts_starts_in, HYPRE_BigInt, len,
-                    HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
-
-      if (my_id == (num_procs -1))
+      if (my_id == (num_procs - 1))
       {
          total_global_cpts = cpts_starts[1];
       }
-      hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
+      hypre_MPI_Bcast(&total_global_cpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
       nc_local = (HYPRE_Int)(cpts_starts[1] - cpts_starts[0]);
    }
 
@@ -5676,14 +5775,13 @@ hypre_ParCSRMatrixExtractSubmatrixFC( hypre_ParCSRMatrix  *A,
          }
       }
       big_nf_local = (HYPRE_BigInt) nf_local;
-      fpts_starts = hypre_TAlloc(HYPRE_BigInt, 2, HYPRE_MEMORY_HOST);
-      hypre_MPI_Scan(&big_nf_local, fpts_starts+1, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
+      hypre_MPI_Scan(&big_nf_local, fpts_starts + 1, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
       fpts_starts[0] = fpts_starts[1] - nf_local;
       if (my_id == num_procs - 1)
       {
          total_global_fpts = fpts_starts[1];
       }
-      hypre_MPI_Bcast(&total_global_fpts, 1, HYPRE_MPI_BIG_INT, num_procs-1, comm);
+      hypre_MPI_Bcast(&total_global_fpts, 1, HYPRE_MPI_BIG_INT, num_procs - 1, comm);
    }
 
    if (row_set == -1 && col_set == -1)
@@ -5750,14 +5848,15 @@ hypre_ParCSRMatrixExtractSubmatrixFC( hypre_ParCSRMatrix  *A,
    hypre_assert(k == B_ncol_local);
 
    num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
-   send_buf_data = hypre_TAlloc(HYPRE_BigInt, hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+   send_buf_data = hypre_TAlloc(HYPRE_BigInt,
+                                hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
                                 HYPRE_MEMORY_HOST);
    k = 0;
    for (i = 0; i < num_sends; i++)
    {
       /* start pos of elements sent to send_proc[i] */
       HYPRE_Int si = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-      HYPRE_Int ei = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1);
+      HYPRE_Int ei = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1);
       /* loop through all elems to send_proc[i] */
       for (j = si; j < ei; j++)
       {
@@ -5803,8 +5902,8 @@ hypre_ParCSRMatrixExtractSubmatrixFC( hypre_ParCSRMatrix  *A,
    /* count nnz and set ia */
    B_nnz_diag = B_nnz_offd = 0;
    B_maxel_row = hypre_TAlloc(HYPRE_Real, B_nrow_local, HYPRE_MEMORY_HOST);
-   B_diag_i = hypre_TAlloc(HYPRE_Int, B_nrow_local+1, HYPRE_MEMORY_HOST);
-   B_offd_i = hypre_TAlloc(HYPRE_Int, B_nrow_local+1, HYPRE_MEMORY_HOST);
+   B_diag_i = hypre_TAlloc(HYPRE_Int, B_nrow_local + 1, HYPRE_MEMORY_HOST);
+   B_offd_i = hypre_TAlloc(HYPRE_Int, B_nrow_local + 1, HYPRE_MEMORY_HOST);
    B_diag_i[0] = B_offd_i[0] = 0;
 
    for (i = 0, k = 0; i < A_nlocal; i++)
@@ -5818,15 +5917,16 @@ hypre_ParCSRMatrixExtractSubmatrixFC( hypre_ParCSRMatrix  *A,
 
       // Get max abs-value element of this row
       HYPRE_Real temp_max = 0;
-      if (strength_thresh > 0) {
-         for (j = A_diag_i[i]+1; j < A_diag_i[i+1]; j++)
+      if (strength_thresh > 0)
+      {
+         for (j = A_diag_i[i] + 1; j < A_diag_i[i + 1]; j++)
          {
             if (hypre_cabs(A_diag_a[j]) > temp_max)
             {
                temp_max = hypre_cabs(A_diag_a[j]);
             }
          }
-         for (j = A_offd_i[i]; j < A_offd_i[i+1]; j++)
+         for (j = A_offd_i[i]; j < A_offd_i[i + 1]; j++)
          {
             if (hypre_cabs(A_offd_a[j]) > temp_max)
             {
@@ -5834,7 +5934,7 @@ hypre_ParCSRMatrixExtractSubmatrixFC( hypre_ParCSRMatrix  *A,
             }
          }
       }
-      B_maxel_row[k-1] = temp_max;
+      B_maxel_row[k - 1] = temp_max;
 
       // add one for diagonal element
       j = A_diag_i[i];
@@ -5844,18 +5944,18 @@ hypre_ParCSRMatrixExtractSubmatrixFC( hypre_ParCSRMatrix  *A,
       }
 
       // Count nnzs larger than tolerance times max row element
-      for (j = A_diag_i[i]+1; j < A_diag_i[i+1]; j++)
+      for (j = A_diag_i[i] + 1; j < A_diag_i[i + 1]; j++)
       {
          if ( (sub_idx_diag[A_diag_j[j]] != -1) &&
-              (hypre_cabs(A_diag_a[j]) > (strength_thresh*temp_max)) )
+              (hypre_cabs(A_diag_a[j]) > (strength_thresh * temp_max)) )
          {
             B_nnz_diag++;
          }
       }
-      for (j = A_offd_i[i]; j < A_offd_i[i+1]; j++)
+      for (j = A_offd_i[i]; j < A_offd_i[i + 1]; j++)
       {
          if ( (sub_idx_offd[A_offd_j[j]] != -1) &&
-              (hypre_cabs(A_offd_a[j]) > (strength_thresh*temp_max)) )
+              (hypre_cabs(A_offd_a[j]) > (strength_thresh * temp_max)) )
          {
             B_nnz_offd++;
          }
@@ -5871,7 +5971,7 @@ hypre_ParCSRMatrixExtractSubmatrixFC( hypre_ParCSRMatrix  *A,
    B_offd_j = hypre_TAlloc(HYPRE_Int,     B_nnz_offd, HYPRE_MEMORY_HOST);
    B_offd_a = hypre_TAlloc(HYPRE_Complex, B_nnz_offd, HYPRE_MEMORY_HOST);
 
-   for (i = 0, k=0, k1 = 0, k2 = 0; i < A_nlocal; i++)
+   for (i = 0, k = 0, k1 = 0, k2 = 0; i < A_nlocal; i++)
    {
       HYPRE_Int CF_i = CF_marker[i] > 0 ? 1 : -1;
       if (CF_i != row_set)
@@ -5881,20 +5981,20 @@ hypre_ParCSRMatrixExtractSubmatrixFC( hypre_ParCSRMatrix  *A,
       HYPRE_Real maxel = B_maxel_row[k];
       k++;
 
-      for (j = A_diag_i[i]; j < A_diag_i[i+1]; j++)
+      for (j = A_diag_i[i]; j < A_diag_i[i + 1]; j++)
       {
          HYPRE_Int j1 = sub_idx_diag[A_diag_j[j]];
-         if ( (j1 != -1) && ( (hypre_cabs(A_diag_a[j]) > (strength_thresh*maxel)) || j==A_diag_i[i] ) )
+         if ( (j1 != -1) && ( (hypre_cabs(A_diag_a[j]) > (strength_thresh * maxel)) || j == A_diag_i[i] ) )
          {
             B_diag_j[k1] = j1;
             B_diag_a[k1] = A_diag_a[j];
             k1++;
          }
       }
-      for (j = A_offd_i[i]; j < A_offd_i[i+1]; j++)
+      for (j = A_offd_i[i]; j < A_offd_i[i + 1]; j++)
       {
-         HYPRE_Int j1 = sub_idx_offd[A_offd_j[j]];
-         if ((j1 != -1) && (hypre_cabs(A_offd_a[j]) > (strength_thresh*maxel)))
+         HYPRE_Int j1 = (HYPRE_Int) sub_idx_offd[A_offd_j[j]];
+         if ((j1 != -1) && (hypre_cabs(A_offd_a[j]) > (strength_thresh * maxel)))
          {
             hypre_assert(j1 >= 0 && j1 < num_cols_B_offd);
             B_offd_j[k2] = j1;
@@ -5937,15 +6037,6 @@ hypre_ParCSRMatrixExtractSubmatrixFC( hypre_ParCSRMatrix  *A,
 
    *B_ptr = B;
 
-   if (B_row_starts == B_col_starts)
-   {
-      hypre_TFree(B_row_starts, HYPRE_MEMORY_HOST);
-   }
-   else
-   {
-      hypre_TFree(B_row_starts, HYPRE_MEMORY_HOST);
-      hypre_TFree(B_col_starts, HYPRE_MEMORY_HOST);
-   }
    hypre_TFree(B_maxel_row, HYPRE_MEMORY_HOST);
    hypre_TFree(send_buf_data, HYPRE_MEMORY_HOST);
    hypre_TFree(sub_idx_diag, HYPRE_MEMORY_HOST);
@@ -5954,11 +6045,16 @@ hypre_ParCSRMatrixExtractSubmatrixFC( hypre_ParCSRMatrix  *A,
    return hypre_error_flag;
 }
 
-/* drop the entries that are not on the diagonal and smaller than:
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixDropSmallEntriesHost
+ *
+ * drop the entries that are not on the diagonal and smaller than:
  *    type 0: tol (TODO)
  *    type 1: tol*(1-norm of row)
  *    type 2: tol*(2-norm of row)
- *    type -1: tol*(infinity norm of row) */
+ *    type -1: tol*(infinity norm of row)
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_ParCSRMatrixDropSmallEntriesHost( hypre_ParCSRMatrix *A,
                                         HYPRE_Real          tol,
@@ -5985,6 +6081,7 @@ hypre_ParCSRMatrixDropSmallEntriesHost( hypre_ParCSRMatrix *A,
    HYPRE_BigInt first_row  = hypre_ParCSRMatrixFirstRowIndex(A);
    HYPRE_Int nrow_local = hypre_CSRMatrixNumRows(A_diag);
    HYPRE_Int my_id, num_procs;
+
    /* MPI size and rank*/
    hypre_MPI_Comm_size(comm, &num_procs);
    hypre_MPI_Comm_rank(comm, &my_id);
@@ -5996,53 +6093,53 @@ hypre_ParCSRMatrixDropSmallEntriesHost( hypre_ParCSRMatrix *A,
    {
       /* compute row norm */
       HYPRE_Real row_nrm = 0.0;
-      for (j = A_diag_i_i; j < A_diag_i[i+1]; j++)
+      for (j = A_diag_i_i; j < A_diag_i[i + 1]; j++)
       {
          HYPRE_Complex v = A_diag_a[j];
          if (type == 1)
          {
-            row_nrm += fabs(v);
+            row_nrm += hypre_cabs(v);
          }
          else if (type == 2)
          {
-            row_nrm += v*v;
+            row_nrm += v * v;
          }
          else
          {
-            row_nrm = hypre_max(row_nrm, fabs(v));
+            row_nrm = hypre_max(row_nrm, hypre_cabs(v));
          }
       }
       if (num_procs > 1)
       {
-         for (j = A_offd_i_i; j < A_offd_i[i+1]; j++)
+         for (j = A_offd_i_i; j < A_offd_i[i + 1]; j++)
          {
             HYPRE_Complex v = A_offd_a[j];
             if (type == 1)
             {
-               row_nrm += fabs(v);
+               row_nrm += hypre_cabs(v);
             }
             else if (type == 2)
             {
-               row_nrm += v*v;
+               row_nrm += v * v;
             }
             else
             {
-               row_nrm = hypre_max(row_nrm, fabs(v));
+               row_nrm = hypre_max(row_nrm, hypre_cabs(v));
             }
          }
       }
 
       if (type == 2)
       {
-         row_nrm = sqrt(row_nrm);
+         row_nrm = hypre_sqrt(row_nrm);
       }
 
       /* drop small entries based on tol and row norm */
-      for (j = A_diag_i_i; j < A_diag_i[i+1]; j++)
+      for (j = A_diag_i_i; j < A_diag_i[i + 1]; j++)
       {
          HYPRE_Int     col = A_diag_j[j];
          HYPRE_Complex val = A_diag_a[j];
-         if (i == col || fabs(val) >= tol * row_nrm)
+         if (i == col || hypre_cabs(val) >= tol * row_nrm)
          {
             A_diag_j[nnz_diag] = col;
             A_diag_a[nnz_diag] = val;
@@ -6051,13 +6148,13 @@ hypre_ParCSRMatrixDropSmallEntriesHost( hypre_ParCSRMatrix *A,
       }
       if (num_procs > 1)
       {
-         for (j = A_offd_i_i; j < A_offd_i[i+1]; j++)
+         for (j = A_offd_i_i; j < A_offd_i[i + 1]; j++)
          {
             HYPRE_Int     col = A_offd_j[j];
             HYPRE_Complex val = A_offd_a[j];
             /* in normal cases: diagonal entry should not
              * appear in A_offd (but this can still be possible) */
-            if (i + first_row == col_map_offd_A[col] || fabs(val) >= tol * row_nrm)
+            if (i + first_row == col_map_offd_A[col] || hypre_cabs(val) >= tol * row_nrm)
             {
                if (0 == marker_offd[col])
                {
@@ -6069,10 +6166,10 @@ hypre_ParCSRMatrixDropSmallEntriesHost( hypre_ParCSRMatrix *A,
             }
          }
       }
-      A_diag_i_i = A_diag_i[i+1];
-      A_offd_i_i = A_offd_i[i+1];
-      A_diag_i[i+1] = nnz_diag;
-      A_offd_i[i+1] = nnz_offd;
+      A_diag_i_i = A_diag_i[i + 1];
+      A_offd_i_i = A_offd_i[i + 1];
+      A_diag_i[i + 1] = nnz_diag;
+      A_offd_i[i + 1] = nnz_offd;
    }
 
    hypre_CSRMatrixNumNonzeros(A_diag) = nnz_diag;
@@ -6106,12 +6203,17 @@ hypre_ParCSRMatrixDropSmallEntriesHost( hypre_ParCSRMatrix *A,
    return hypre_error_flag;
 }
 
-/* drop the entries that are not on the diagonal and smaller than
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixDropSmallEntries
+ *
+ * drop the entries that are not on the diagonal and smaller than
  *    type 0: tol
  *    type 1: tol*(1-norm of row)
  *    type 2: tol*(2-norm of row)
  *    type -1: tol*(infinity norm of row)
- *    NOTE: some type options above unavailable on either host or device */
+ *    NOTE: some type options above unavailable on either host or device
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_ParCSRMatrixDropSmallEntries( hypre_ParCSRMatrix *A,
                                     HYPRE_Real          tol,
@@ -6122,36 +6224,28 @@ hypre_ParCSRMatrixDropSmallEntries( hypre_ParCSRMatrix *A,
       return hypre_error_flag;
    }
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-   hypre_GpuProfilingPushRange("ParCSRMatrixDropSmallEntries");
-#endif
-
-   HYPRE_Int ierr = 0;
-
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
    HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_ParCSRMatrixMemoryLocation(A) );
 
    if (exec == HYPRE_EXEC_DEVICE)
    {
-      ierr = hypre_ParCSRMatrixDropSmallEntriesDevice(A, tol, type);
+      hypre_ParCSRMatrixDropSmallEntriesDevice(A, tol, type);
    }
    else
 #endif
    {
-      ierr = hypre_ParCSRMatrixDropSmallEntriesHost(A, tol, type);
+      hypre_ParCSRMatrixDropSmallEntriesHost(A, tol, type);
    }
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-   hypre_GpuProfilingPopRange();
-#endif
-
-   return ierr;
+   return hypre_error_flag;
 }
 
-/* Scale ParCSR matrix A = scalar * A
- * A: the target CSR matrix
- * scalar: real number
- */
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixScale
+ *
+ * Computes A = scalar * A
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_ParCSRMatrixScale(hypre_ParCSRMatrix *A,
                         HYPRE_Complex       scalar)
@@ -6166,26 +6260,796 @@ hypre_ParCSRMatrixScale(hypre_ParCSRMatrix *A,
 }
 
 /*--------------------------------------------------------------------------
- * hypre_ParCSRMatrixReorder:
+ * hypre_ParCSRMatrixDiagScaleHost
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ParCSRMatrixDiagScaleHost( hypre_ParCSRMatrix *par_A,
+                                 hypre_ParVector    *par_ld,
+                                 hypre_ParVector    *par_rd )
+{
+   /* Input variables */
+   hypre_ParCSRCommPkg   *comm_pkg  = hypre_ParCSRMatrixCommPkg(par_A);
+   HYPRE_Int              num_sends;
+   HYPRE_Int             *send_map_elmts;
+   HYPRE_Int             *send_map_starts;
+
+   hypre_CSRMatrix       *A_diag        = hypre_ParCSRMatrixDiag(par_A);
+   hypre_CSRMatrix       *A_offd        = hypre_ParCSRMatrixOffd(par_A);
+   HYPRE_Int              num_cols_offd = hypre_CSRMatrixNumCols(A_offd);
+
+   hypre_Vector          *ld            = (par_ld) ? hypre_ParVectorLocalVector(par_ld) : NULL;
+   hypre_Vector          *rd            = hypre_ParVectorLocalVector(par_rd);
+   HYPRE_Complex         *rd_data       = hypre_VectorData(rd);
+
+   /* Local variables */
+   HYPRE_Int              i;
+   hypre_Vector          *rdbuf;
+   HYPRE_Complex         *recv_rdbuf_data;
+   HYPRE_Complex         *send_rdbuf_data;
+
+   /*---------------------------------------------------------------------
+    * Communication phase
+    *--------------------------------------------------------------------*/
+
+   /* Create buffer vectors */
+   rdbuf = hypre_SeqVectorCreate(num_cols_offd);
+
+   /* If there exists no CommPkg for A, create it. */
+   if (!comm_pkg)
+   {
+      hypre_MatvecCommPkgCreate(par_A);
+      comm_pkg = hypre_ParCSRMatrixCommPkg(par_A);
+   }
+   num_sends       = hypre_ParCSRCommPkgNumSends(comm_pkg);
+   send_map_elmts  = hypre_ParCSRCommPkgSendMapElmts(comm_pkg);
+   send_map_starts = hypre_ParCSRCommPkgSendMapStarts(comm_pkg);
+
+#if defined(HYPRE_USING_PERSISTENT_COMM)
+   hypre_ParCSRPersistentCommHandle *comm_handle =
+      hypre_ParCSRCommPkgGetPersistentCommHandle(1, comm_pkg);
+
+   hypre_VectorData(rdbuf) = (HYPRE_Complex *)
+                             hypre_ParCSRCommHandleRecvDataBuffer(comm_handle);
+   hypre_SeqVectorSetDataOwner(rdbuf, 0);
+
+#else
+   hypre_ParCSRCommHandle *comm_handle;
+#endif
+
+   /* Initialize rdbuf */
+   hypre_SeqVectorInitialize_v2(rdbuf, HYPRE_MEMORY_HOST);
+   recv_rdbuf_data = hypre_VectorData(rdbuf);
+
+   /* Allocate send buffer for rdbuf */
+#if defined(HYPRE_USING_PERSISTENT_COMM)
+   send_rdbuf_data = (HYPRE_Complex *) hypre_ParCSRCommHandleSendDataBuffer(comm_handle);
+#else
+   send_rdbuf_data = hypre_TAlloc(HYPRE_Complex, send_map_starts[num_sends], HYPRE_MEMORY_HOST);
+#endif
+
+   /* Pack send data */
+#if defined(HYPRE_USING_OPENMP)
+   #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+#endif
+   for (i = send_map_starts[0]; i < send_map_starts[num_sends]; i++)
+   {
+      send_rdbuf_data[i] = rd_data[send_map_elmts[i]];
+   }
+
+   /* Non-blocking communication starts */
+#ifdef HYPRE_USING_PERSISTENT_COMM
+   hypre_ParCSRPersistentCommHandleStart(comm_handle, HYPRE_MEMORY_HOST, send_rdbuf_data);
+
+#else
+   comm_handle = hypre_ParCSRCommHandleCreate_v2(1, comm_pkg,
+                                                 HYPRE_MEMORY_HOST, send_rdbuf_data,
+                                                 HYPRE_MEMORY_HOST, recv_rdbuf_data);
+#endif
+
+   /*---------------------------------------------------------------------
+    * Computation phase
+    *--------------------------------------------------------------------*/
+
+   /* A_diag = diag(ld) * A_diag * diag(rd) */
+   hypre_CSRMatrixDiagScale(A_diag, ld, rd);
+
+   /* Non-blocking communication ends */
+#ifdef HYPRE_USING_PERSISTENT_COMM
+   hypre_ParCSRPersistentCommHandleWait(comm_handle, HYPRE_MEMORY_HOST, recv_rdbuf_data);
+#else
+   hypre_ParCSRCommHandleDestroy(comm_handle);
+#endif
+
+   /* A_offd = diag(ld) * A_offd * diag(rd) */
+   hypre_CSRMatrixDiagScale(A_offd, ld, rdbuf);
+
+   /* Free memory */
+   hypre_SeqVectorDestroy(rdbuf);
+#if !defined(HYPRE_USING_PERSISTENT_COMM)
+   hypre_TFree(send_rdbuf_data, HYPRE_MEMORY_HOST);
+#endif
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixDiagScale
  *
- * Reorders the column and data arrays of a the diagonal component of a square
- * ParCSR matrix, such that the first entry in each row is the diagonal one.
+ * Computes A = diag(ld) * A * diag(rd), where the diagonal matrices
+ * "diag(ld)" and "diag(rd)" are stored as distributed vectors.
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_ParCSRMatrixReorder(hypre_ParCSRMatrix *A)
+hypre_ParCSRMatrixDiagScale( hypre_ParCSRMatrix *par_A,
+                             hypre_ParVector    *par_ld,
+                             hypre_ParVector    *par_rd )
 {
-   HYPRE_BigInt      nrows_A = hypre_ParCSRMatrixGlobalNumRows(A);
-   HYPRE_BigInt      ncols_A = hypre_ParCSRMatrixGlobalNumCols(A);
-   hypre_CSRMatrix  *A_diag  = hypre_ParCSRMatrixDiag(A);
+   /* Input variables */
+   hypre_CSRMatrix    *A_diag = hypre_ParCSRMatrixDiag(par_A);
+   hypre_CSRMatrix    *A_offd = hypre_ParCSRMatrixOffd(par_A);
+   hypre_Vector       *ld;
 
-   if (nrows_A != ncols_A)
+   /* Sanity check */
+   if (!par_rd && !par_ld)
    {
-      hypre_error_w_msg(HYPRE_ERROR_GENERIC," Error! Matrix should be square!\n");
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Scaling matrices are not set!\n");
       return hypre_error_flag;
    }
 
-   hypre_CSRMatrixReorder(A_diag);
+   /* Perform row scaling only (no communication) */
+   if (!par_rd && par_ld)
+   {
+      ld = hypre_ParVectorLocalVector(par_ld);
+
+      hypre_CSRMatrixDiagScale(A_diag, ld, NULL);
+      hypre_CSRMatrixDiagScale(A_offd, ld, NULL);
+
+      return hypre_error_flag;
+   }
+
+#if defined(HYPRE_USING_GPU)
+   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_ParCSRMatrixMemoryLocation(par_A) );
+
+   if (exec == HYPRE_EXEC_DEVICE)
+   {
+      hypre_ParCSRMatrixDiagScaleDevice(par_A, par_ld, par_rd);
+   }
+   else
+#endif
+   {
+      hypre_ParCSRMatrixDiagScaleHost(par_A, par_ld, par_rd);
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixReorder:
+ *
+ * Reorders the column and data arrays of a the diagonal component of a square
+ * ParCSR matrix, such that the first entry in each row is the diagonal one.
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ParCSRMatrixReorder(hypre_ParCSRMatrix *A)
+{
+   HYPRE_BigInt      nrows_A = hypre_ParCSRMatrixGlobalNumRows(A);
+   HYPRE_BigInt      ncols_A = hypre_ParCSRMatrixGlobalNumCols(A);
+   hypre_CSRMatrix  *A_diag  = hypre_ParCSRMatrixDiag(A);
+
+   if (nrows_A != ncols_A)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, " Error! Matrix should be square!\n");
+      return hypre_error_flag;
+   }
+
+   hypre_CSRMatrixReorder(A_diag);
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixCompressOffdMap
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ParCSRMatrixCompressOffdMap(hypre_ParCSRMatrix *A)
+{
+#if defined(HYPRE_USING_GPU)
+   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_ParCSRMatrixMemoryLocation(A) );
+
+   if (exec == HYPRE_EXEC_DEVICE)
+   {
+      hypre_ParCSRMatrixCompressOffdMapDevice(A);
+   }
+#else
+   // RL: I guess it's not needed for the host code [?]
+   HYPRE_UNUSED_VAR(A);
+#endif
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_ParCSRDiagScaleVectorHost
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ParCSRDiagScaleVectorHost( hypre_ParCSRMatrix *par_A,
+                                 hypre_ParVector    *par_y,
+                                 hypre_ParVector    *par_x )
+{
+   /* Local Matrix and Vectors */
+   hypre_CSRMatrix    *A_diag        = hypre_ParCSRMatrixDiag(par_A);
+   hypre_Vector       *x             = hypre_ParVectorLocalVector(par_x);
+   hypre_Vector       *y             = hypre_ParVectorLocalVector(par_y);
+
+   /* Local vector x info */
+   HYPRE_Complex      *x_data        = hypre_VectorData(x);
+   HYPRE_Int           x_num_vectors = hypre_VectorNumVectors(x);
+   HYPRE_Int           x_vecstride   = hypre_VectorVectorStride(x);
+
+   /* Local vector y info */
+   HYPRE_Complex      *y_data        = hypre_VectorData(y);
+   HYPRE_Int           y_vecstride   = hypre_VectorVectorStride(y);
+
+   /* Local matrix A info */
+   HYPRE_Complex      *A_data        = hypre_CSRMatrixData(A_diag);
+   HYPRE_Int          *A_i           = hypre_CSRMatrixI(A_diag);
+   HYPRE_Int           num_rows      = hypre_CSRMatrixNumRows(A_diag);
+
+   /* Local variables */
+   HYPRE_Int           i, k;
+   HYPRE_Complex       coef;
+
+   switch (x_num_vectors)
+   {
+      case 1:
+#if defined(HYPRE_USING_OPENMP)
+         #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+#endif
+         for (i = 0; i < num_rows; i++)
+         {
+            x_data[i] = y_data[i] / A_data[A_i[i]];
+         }
+         break;
+
+      case 2:
+#if defined(HYPRE_USING_OPENMP)
+         #pragma omp parallel for private(i, coef) HYPRE_SMP_SCHEDULE
+#endif
+         for (i = 0; i < num_rows; i++)
+         {
+            coef = 1.0 / A_data[A_i[i]];
+
+            x_data[i] = y_data[i] * coef;
+            x_data[i + x_vecstride] = y_data[i + y_vecstride] * coef;
+         }
+         break;
+
+      case 3:
+#if defined(HYPRE_USING_OPENMP)
+         #pragma omp parallel for private(i, coef) HYPRE_SMP_SCHEDULE
+#endif
+         for (i = 0; i < num_rows; i++)
+         {
+            coef = 1.0 / A_data[A_i[i]];
+
+            x_data[i] = y_data[i] * coef;
+            x_data[i +     x_vecstride] = y_data[i +     y_vecstride] * coef;
+            x_data[i + 2 * x_vecstride] = y_data[i + 2 * y_vecstride] * coef;
+         }
+         break;
+
+      case 4:
+#if defined(HYPRE_USING_OPENMP)
+         #pragma omp parallel for private(i, coef) HYPRE_SMP_SCHEDULE
+#endif
+         for (i = 0; i < num_rows; i++)
+         {
+            coef = 1.0 / A_data[A_i[i]];
+
+            x_data[i] = y_data[i] * coef;
+            x_data[i +     x_vecstride] = y_data[i +     y_vecstride] * coef;
+            x_data[i + 2 * x_vecstride] = y_data[i + 2 * y_vecstride] * coef;
+            x_data[i + 3 * x_vecstride] = y_data[i + 3 * y_vecstride] * coef;
+         }
+         break;
+
+      default:
+#if defined(HYPRE_USING_OPENMP)
+         #pragma omp parallel for private(i, k, coef) HYPRE_SMP_SCHEDULE
+#endif
+         for (i = 0; i < num_rows; i++)
+         {
+            coef = 1.0 / A_data[A_i[i]];
+
+            for (k = 0; k < x_num_vectors; k++)
+            {
+               x_data[i + k * x_vecstride] = y_data[i + k * y_vecstride] * coef;
+            }
+         }
+         break;
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRDiagScaleVector
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ParCSRDiagScaleVector( hypre_ParCSRMatrix *par_A,
+                             hypre_ParVector    *par_y,
+                             hypre_ParVector    *par_x )
+{
+   /* Local Matrix and Vectors */
+   hypre_CSRMatrix    *A_diag        = hypre_ParCSRMatrixDiag(par_A);
+   hypre_Vector       *x             = hypre_ParVectorLocalVector(par_x);
+   hypre_Vector       *y             = hypre_ParVectorLocalVector(par_y);
+
+   /* Local vector x info */
+   HYPRE_Int           x_size        = hypre_VectorSize(x);
+   HYPRE_Int           x_num_vectors = hypre_VectorNumVectors(x);
+   HYPRE_Int           x_vecstride   = hypre_VectorVectorStride(x);
+
+   /* Local vector y info */
+   HYPRE_Int           y_size        = hypre_VectorSize(y);
+   HYPRE_Int           y_num_vectors = hypre_VectorNumVectors(y);
+   HYPRE_Int           y_vecstride   = hypre_VectorVectorStride(y);
+
+   /* Local matrix A info */
+   HYPRE_Int           num_rows      = hypre_CSRMatrixNumRows(A_diag);
+
+   /*---------------------------------------------
+    * Sanity checks
+    *---------------------------------------------*/
+
+   if (x_num_vectors != y_num_vectors)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Error! incompatible number of vectors!\n");
+      return hypre_error_flag;
+   }
+
+   if (num_rows != x_size)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Error! incompatible x size!\n");
+      return hypre_error_flag;
+   }
+
+   if (x_size > 0 && x_vecstride <= 0)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Error! non-positive x vector stride!\n");
+      return hypre_error_flag;
+   }
+
+   if (y_size > 0 && y_vecstride <= 0)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Error! non-positive y vector stride!\n");
+      return hypre_error_flag;
+   }
+
+   if (num_rows != y_size)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Error! incompatible y size!\n");
+      return hypre_error_flag;
+   }
+
+   /*---------------------------------------------
+    * Computation
+    *---------------------------------------------*/
+
+#if defined(HYPRE_USING_GPU)
+   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_ParCSRMatrixMemoryLocation(par_A) );
+
+   if (exec == HYPRE_EXEC_DEVICE)
+   {
+      hypre_ParCSRDiagScaleVectorDevice(par_A, par_y, par_x);
+   }
+   else
+#endif
+   {
+      hypre_ParCSRDiagScaleVectorHost(par_A, par_y, par_x);
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixBlockColSumHost
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ParCSRMatrixBlockColSumHost( hypre_ParCSRMatrix     *A,
+                                   hypre_DenseBlockMatrix *B )
+{
+   /* ParCSRMatrix A */
+   HYPRE_MemoryLocation    memory_location   = hypre_ParCSRMatrixMemoryLocation(A);
+
+   /* A_diag */
+   hypre_CSRMatrix        *A_diag            = hypre_ParCSRMatrixDiag(A);
+   HYPRE_Complex          *A_diag_data       = hypre_CSRMatrixData(A_diag);
+   HYPRE_Int              *A_diag_i          = hypre_CSRMatrixI(A_diag);
+   HYPRE_Int              *A_diag_j          = hypre_CSRMatrixJ(A_diag);
+   HYPRE_Int               num_rows_diag_A   = hypre_CSRMatrixNumRows(A_diag);
+
+   /* A_offd */
+   hypre_CSRMatrix        *A_offd            = hypre_ParCSRMatrixOffd(A);
+   HYPRE_Complex          *A_offd_data       = hypre_CSRMatrixData(A_offd);
+   HYPRE_Int              *A_offd_i          = hypre_CSRMatrixI(A_offd);
+   HYPRE_Int              *A_offd_j          = hypre_CSRMatrixJ(A_offd);
+   HYPRE_Int               num_rows_offd_A   = hypre_CSRMatrixNumRows(A_offd);
+   HYPRE_Int               num_cols_offd_A   = hypre_CSRMatrixNumCols(A_offd);
+
+   /* Output vector variables */
+   HYPRE_Int               num_rows_block_B  = hypre_DenseBlockMatrixNumRowsBlock(B);
+   HYPRE_Int               num_cols_block_B  = hypre_DenseBlockMatrixNumColsBlock(B);
+
+   /* Local variables */
+   HYPRE_Int               i, j, col;
+   HYPRE_Int               ib, ir, jr;
+   HYPRE_Complex          *recv_data;
+   HYPRE_Complex          *send_data;
+
+   /* Communication variables */
+   hypre_ParCSRCommPkg    *comm_pkg          = hypre_ParCSRMatrixCommPkg(A);
+   HYPRE_Int               num_sends         = hypre_ParCSRCommPkgNumSends(comm_pkg);
+   HYPRE_Int              *send_map_elmts;
+   HYPRE_Int              *send_map_starts;
+#if defined(HYPRE_USING_PERSISTENT_COMM)
+   hypre_ParCSRPersistentCommHandle *comm_handle;
+#else
+   hypre_ParCSRCommHandle           *comm_handle;
+#endif
+
+   /* Update commpkg offsets */
+   hypre_ParCSRCommPkgUpdateVecStarts(comm_pkg, 1, 0, 1);
+   send_map_elmts  = hypre_ParCSRCommPkgSendMapElmts(comm_pkg);
+   send_map_starts = hypre_ParCSRCommPkgSendMapStarts(comm_pkg);
+
+   /* Allocate the recv and send buffers  */
+#if defined(HYPRE_USING_PERSISTENT_COMM)
+   comm_handle = hypre_ParCSRCommPkgGetPersistentCommHandle(HYPRE_COMM_PKG_JOB_COMPLEX, comm_pkg);
+   recv_data = (HYPRE_Complex *) hypre_ParCSRCommHandleRecvDataBuffer(comm_handle);
+   send_data = (HYPRE_Complex *) hypre_ParCSRCommHandleSendDataBuffer(comm_handle);
+   send_data = hypre_Memset((void *) send_data, 0,
+                            (size_t) (num_cols_offd_A) * sizeof(HYPRE_Complex),
+                            memory_location);
+#else
+   send_data = hypre_CTAlloc(HYPRE_Complex, num_cols_offd_A, memory_location);
+   recv_data = hypre_TAlloc(HYPRE_Complex, send_map_starts[num_sends], memory_location);
+#endif
+
+   /* Pack send data */
+   if (A_offd_i[num_rows_offd_A] - A_offd_i[0] > 0)
+   {
+      for (i = 0; i < num_rows_offd_A; i++)
+      {
+         for (j = A_offd_i[i]; j < A_offd_i[i + 1]; j++)
+         {
+            col = A_offd_j[j];
+            send_data[col] += A_offd_data[j];
+         }
+      }
+   }
+
+   /* Non-blocking communication starts */
+#if defined(HYPRE_USING_PERSISTENT_COMM)
+   hypre_ParCSRPersistentCommHandleStart(comm_handle, memory_location, send_data);
+
+#else
+   comm_handle = hypre_ParCSRCommHandleCreate_v2(2, comm_pkg,
+                                                 memory_location, send_data,
+                                                 memory_location, recv_data);
+#endif
+
+   /* Overlapped local computation. */
+   for (i = 0; i < num_rows_diag_A; i++)
+   {
+      ir = i % num_rows_block_B;
+      for (j = A_diag_i[i]; j < A_diag_i[i + 1]; j++)
+      {
+         col = A_diag_j[j];
+         ib  = col / num_cols_block_B;
+         jr  = col % num_cols_block_B;
+
+         hypre_assert(hypre_DenseBlockMatrixNumNonzerosBlock(B) * ib +
+                      hypre_DenseBlockMatrixRowStride(B) * ir +
+                      hypre_DenseBlockMatrixColStride(B) * jr <
+                      hypre_DenseBlockMatrixNumNonzeros(B));
+
+         hypre_DenseBlockMatrixDataBIJ(B, ib, ir, jr) += A_diag_data[j];
+      }
+   }
+
+   /* Non-blocking communication ends */
+#if defined(HYPRE_USING_PERSISTENT_COMM)
+   hypre_ParCSRPersistentCommHandleWait(comm_handle, memory_location, recv_data);
+#else
+   hypre_ParCSRCommHandleDestroy(comm_handle);
+#endif
+
+   /* Unpack recv data */
+   for (i = send_map_starts[0]; i < send_map_starts[num_sends]; i++)
+   {
+      col = send_map_elmts[i];
+      ib  = col / num_cols_block_B;
+      ir  = col % num_rows_block_B;
+      jr  = col % num_cols_block_B;
+
+      hypre_assert(hypre_DenseBlockMatrixNumNonzerosBlock(B) * ib +
+                   hypre_DenseBlockMatrixRowStride(B) * ir +
+                   hypre_DenseBlockMatrixColStride(B) * jr <
+                   hypre_DenseBlockMatrixNumNonzeros(B));
+
+      hypre_DenseBlockMatrixDataBIJ(B, ib, ir, jr) += recv_data[i];
+   }
+
+   /* Free memory */
+#if !defined(HYPRE_USING_PERSISTENT_COMM)
+   hypre_TFree(send_data, memory_location);
+   hypre_TFree(recv_data, memory_location);
+#endif
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixBlockColSum
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ParCSRMatrixBlockColSum( hypre_ParCSRMatrix      *A,
+                               HYPRE_Int                row_major,
+                               HYPRE_Int                num_rows_block,
+                               HYPRE_Int                num_cols_block,
+                               hypre_DenseBlockMatrix **B_ptr )
+{
+   HYPRE_MemoryLocation     memory_location = hypre_ParCSRMatrixMemoryLocation(A);
+   HYPRE_BigInt             num_rows_A      = hypre_ParCSRMatrixGlobalNumRows(A);
+   HYPRE_BigInt             num_cols_A      = hypre_ParCSRMatrixGlobalNumCols(A);
+
+   hypre_CSRMatrix         *A_diag          = hypre_ParCSRMatrixDiag(A);
+   HYPRE_Int                num_rows_diag_A = hypre_CSRMatrixNumRows(A_diag);
+   HYPRE_Int                num_cols_diag_A = hypre_CSRMatrixNumCols(A_diag);
+
+   hypre_DenseBlockMatrix  *B;
+
+   /*---------------------------------------------
+    * Sanity checks
+    *---------------------------------------------*/
+
+   if (num_rows_block < 1 || num_cols_block < 1)
+   {
+      *B_ptr = NULL;
+      return hypre_error_flag;
+   }
+
+   if (num_rows_A % ((HYPRE_BigInt) num_rows_block))
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                        "Global number of rows is not divisable by the block dimension");
+      return hypre_error_flag;
+   }
+
+   if (num_cols_A % ((HYPRE_BigInt) num_cols_block))
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                        "Global number of columns is not divisable by the block dimension");
+      return hypre_error_flag;
+   }
+
+   HYPRE_ANNOTATE_FUNC_BEGIN;
+   if (!hypre_ParCSRMatrixCommPkg(A))
+   {
+      hypre_MatvecCommPkgCreate(A);
+   }
+
+   /*---------------------------------------------
+    * Compute block column sum matrix
+    *---------------------------------------------*/
+
+   /* Create output matrix */
+   B = hypre_DenseBlockMatrixCreate(row_major,
+                                    num_rows_diag_A, num_cols_diag_A,
+                                    num_rows_block, num_cols_block);
+
+   /* Initialize the output matrix */
+   hypre_DenseBlockMatrixInitializeOn(B, memory_location);
+
+#if defined(HYPRE_USING_GPU)
+   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1(memory_location);
+
+   if (exec == HYPRE_EXEC_DEVICE)
+   {
+      /* TODO (VPM): hypre_ParCSRMatrixColSumReduceDevice */
+      hypre_ParCSRMatrixMigrate(A, HYPRE_MEMORY_HOST);
+      hypre_ParCSRMatrixBlockColSumHost(A, B);
+      hypre_ParCSRMatrixMigrate(A, HYPRE_MEMORY_DEVICE);
+      hypre_DenseBlockMatrixMigrate(B, HYPRE_MEMORY_DEVICE);
+   }
+   else
+#endif
+   {
+      hypre_ParCSRMatrixBlockColSumHost(A, B);
+   }
+
+   /* Set output pointer */
+   *B_ptr = B;
+
+   HYPRE_ANNOTATE_FUNC_END;
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixColSumHost
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ParCSRMatrixColSumHost( hypre_ParCSRMatrix *A,
+                              hypre_ParVector    *b )
+{
+   /* ParCSRMatrix A */
+   HYPRE_MemoryLocation    memory_location   = hypre_ParCSRMatrixMemoryLocation(A);
+
+   /* A_diag */
+   hypre_CSRMatrix        *A_diag            = hypre_ParCSRMatrixDiag(A);
+   HYPRE_Complex          *A_diag_data       = hypre_CSRMatrixData(A_diag);
+   HYPRE_Int              *A_diag_i          = hypre_CSRMatrixI(A_diag);
+   HYPRE_Int              *A_diag_j          = hypre_CSRMatrixJ(A_diag);
+   HYPRE_Int               num_rows_diag_A   = hypre_CSRMatrixNumRows(A_diag);
+
+   /* A_offd */
+   hypre_CSRMatrix        *A_offd            = hypre_ParCSRMatrixOffd(A);
+   HYPRE_Complex          *A_offd_data       = hypre_CSRMatrixData(A_offd);
+   HYPRE_Int              *A_offd_i          = hypre_CSRMatrixI(A_offd);
+   HYPRE_Int              *A_offd_j          = hypre_CSRMatrixJ(A_offd);
+   HYPRE_Int               num_rows_offd_A   = hypre_CSRMatrixNumRows(A_offd);
+   HYPRE_Int               num_cols_offd_A   = hypre_CSRMatrixNumCols(A_offd);
+
+   /* Local variables */
+   HYPRE_Int               i, j, col;
+   HYPRE_Complex          *recv_data;
+   HYPRE_Complex          *send_data;
+
+   /* Communication variables */
+   hypre_ParCSRCommPkg    *comm_pkg          = hypre_ParCSRMatrixCommPkg(A);
+   HYPRE_Int               num_sends         = hypre_ParCSRCommPkgNumSends(comm_pkg);
+   HYPRE_Int              *send_map_elmts;
+   HYPRE_Int              *send_map_starts;
+#if defined(HYPRE_USING_PERSISTENT_COMM)
+   hypre_ParCSRPersistentCommHandle *comm_handle;
+#else
+   hypre_ParCSRCommHandle           *comm_handle;
+#endif
+
+   /* Update commpkg offsets */
+   hypre_ParCSRCommPkgUpdateVecStarts(comm_pkg, 1, 0, 1);
+   send_map_elmts  = hypre_ParCSRCommPkgSendMapElmts(comm_pkg);
+   send_map_starts = hypre_ParCSRCommPkgSendMapStarts(comm_pkg);
+
+   /* Allocate the recv and send buffers  */
+#if defined(HYPRE_USING_PERSISTENT_COMM)
+   comm_handle = hypre_ParCSRCommPkgGetPersistentCommHandle(HYPRE_COMM_PKG_JOB_COMPLEX, comm_pkg);
+   recv_data = (HYPRE_Complex *) hypre_ParCSRCommHandleRecvDataBuffer(comm_handle);
+   send_data = (HYPRE_Complex *) hypre_ParCSRCommHandleSendDataBuffer(comm_handle);
+   send_data = hypre_Memset((void *) send_data, 0,
+                            (size_t) (num_cols_offd_A) * sizeof(HYPRE_Complex),
+                            memory_location);
+#else
+   send_data = hypre_CTAlloc(HYPRE_Complex, num_cols_offd_A, memory_location);
+   recv_data = hypre_TAlloc(HYPRE_Complex, send_map_starts[num_sends], memory_location);
+#endif
+
+   /* Pack send data */
+   for (i = 0; i < num_rows_offd_A; i++)
+   {
+      for (j = A_offd_i[i]; j < A_offd_i[i + 1]; j++)
+      {
+         col = A_offd_j[j];
+         send_data[col] += A_offd_data[j];
+      }
+   }
+
+   /* Non-blocking communication starts */
+#if defined(HYPRE_USING_PERSISTENT_COMM)
+   hypre_ParCSRPersistentCommHandleStart(comm_handle, memory_location, send_data);
+
+#else
+   comm_handle = hypre_ParCSRCommHandleCreate_v2(2, comm_pkg,
+                                                 memory_location, send_data,
+                                                 memory_location, recv_data);
+#endif
+
+   /* Overlapped local computation. */
+   for (i = 0; i < num_rows_diag_A; i++)
+   {
+      for (j = A_diag_i[i]; j < A_diag_i[i + 1]; j++)
+      {
+         col = A_diag_j[j];
+         hypre_ParVectorEntryI(b, col) += A_diag_data[j];
+      }
+   }
+
+   /* Non-blocking communication ends */
+#if defined(HYPRE_USING_PERSISTENT_COMM)
+   hypre_ParCSRPersistentCommHandleWait(comm_handle, memory_location, recv_data);
+#else
+   hypre_ParCSRCommHandleDestroy(comm_handle);
+#endif
+
+   /* Unpack recv data */
+   for (i = send_map_starts[0]; i < send_map_starts[num_sends]; i++)
+   {
+      col = send_map_elmts[i];
+      hypre_ParVectorEntryI(b, col) += recv_data[i];
+   }
+
+   /* Free memory */
+#if !defined(HYPRE_USING_PERSISTENT_COMM)
+   hypre_TFree(send_data, memory_location);
+   hypre_TFree(recv_data, memory_location);
+#endif
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixColSum
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ParCSRMatrixColSum( hypre_ParCSRMatrix   *A,
+                          hypre_ParVector     **b_ptr )
+{
+   MPI_Comm                 comm            = hypre_ParCSRMatrixComm(A);
+   HYPRE_BigInt             global_num_cols = hypre_ParCSRMatrixGlobalNumCols(A);
+   HYPRE_BigInt            *col_starts      = hypre_ParCSRMatrixColStarts(A);
+   HYPRE_MemoryLocation     memory_location = hypre_ParCSRMatrixMemoryLocation(A);
+
+   hypre_ParVector         *b;
+
+   HYPRE_ANNOTATE_FUNC_BEGIN;
+   if (!hypre_ParCSRMatrixCommPkg(A))
+   {
+      hypre_MatvecCommPkgCreate(A);
+   }
+
+   /* Create output vector */
+   b = hypre_ParVectorCreate(comm, global_num_cols, col_starts);
+
+   /* Initialize the output vector */
+   hypre_ParVectorInitialize_v2(b, memory_location);
+
+   /*---------------------------------------------
+    * Compute column sum vector
+    *---------------------------------------------*/
+
+#if defined(HYPRE_USING_GPU)
+   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1(memory_location);
+
+   if (exec == HYPRE_EXEC_DEVICE)
+   {
+      /* TODO (VPM): hypre_ParCSRMatrixColSumDevice */
+      hypre_ParCSRMatrixMigrate(A, HYPRE_MEMORY_HOST);
+      hypre_ParVectorMigrate(b, HYPRE_MEMORY_HOST);
+      hypre_ParCSRMatrixColSumHost(A, b);
+      hypre_ParCSRMatrixMigrate(A, HYPRE_MEMORY_DEVICE);
+      hypre_ParVectorMigrate(b, HYPRE_MEMORY_DEVICE);
+   }
+   else
+#endif
+   {
+      hypre_ParCSRMatrixColSumHost(A, b);
+   }
+
+   /* Set output pointer */
+   *b_ptr = b;
+
+   HYPRE_ANNOTATE_FUNC_END;
 
    return hypre_error_flag;
 }
diff --git a/external/hypre/src/parcsr_mv/par_csr_matop_device.c b/external/hypre/src/parcsr_mv/par_csr_matop_device.c
index c0d44f3d..77fdd650 100644
--- a/external/hypre/src/parcsr_mv/par_csr_matop_device.c
+++ b/external/hypre/src/parcsr_mv/par_csr_matop_device.c
@@ -1,311 +1,449 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
  ******************************************************************************/
 
+#include "_hypre_onedpl.hpp"
 #include "_hypre_utilities.h"
 #include "_hypre_parcsr_mv.h"
 #include "_hypre_utilities.hpp"
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
 
-HYPRE_Int
-hypre_ParcsrGetExternalRowsDeviceInit( hypre_ParCSRMatrix   *A,
-                                       HYPRE_Int             indices_len,
-                                       HYPRE_BigInt         *indices,
-                                       hypre_ParCSRCommPkg  *comm_pkg,
-                                       HYPRE_Int             want_data,
-                                       void                **request_ptr)
+/* return B = [Adiag, Aoffd] */
+#if 1
+__global__ void
+hypreGPUKernel_ConcatDiagAndOffd( hypre_DeviceItem &item,
+                                  HYPRE_Int  nrows,    HYPRE_Int  diag_ncol,
+                                  HYPRE_Int *d_diag_i, HYPRE_Int *d_diag_j, HYPRE_Complex *d_diag_a,
+                                  HYPRE_Int *d_offd_i, HYPRE_Int *d_offd_j, HYPRE_Complex *d_offd_a,
+                                  HYPRE_Int *cols_offd_map,
+                                  HYPRE_Int *d_ib,     HYPRE_Int *d_jb,     HYPRE_Complex *d_ab)
 {
-   HYPRE_Int      i, j;
-   HYPRE_Int      num_sends, num_rows_send, num_nnz_send, num_recvs, num_rows_recv, num_nnz_recv;
-   HYPRE_Int     *d_send_i, *send_i, *d_send_map, *d_recv_i, *recv_i;
-   HYPRE_BigInt  *d_send_j, *d_recv_j;
-   HYPRE_Int     *send_jstarts, *recv_jstarts;
-   HYPRE_Complex *d_send_a = NULL, *d_recv_a = NULL;
-   hypre_ParCSRCommPkg     *comm_pkg_j;
-   hypre_ParCSRCommHandle  *comm_handle, *comm_handle_j, *comm_handle_a;
-   /* HYPRE_Int global_num_rows = hypre_ParCSRMatrixGlobalNumRows(A); */
-   /* diag part of A */
-   hypre_CSRMatrix *A_diag   = hypre_ParCSRMatrixDiag(A);
-   HYPRE_Complex   *A_diag_a = hypre_CSRMatrixData(A_diag);
-   HYPRE_Int       *A_diag_i = hypre_CSRMatrixI(A_diag);
-   HYPRE_Int       *A_diag_j = hypre_CSRMatrixJ(A_diag);
-   /* HYPRE_Int local_num_rows  = hypre_CSRMatrixNumRows(A_diag); */
-   /* off-diag part of A */
-   hypre_CSRMatrix *A_offd   = hypre_ParCSRMatrixOffd(A);
-   HYPRE_Complex   *A_offd_a = hypre_CSRMatrixData(A_offd);
-   HYPRE_Int       *A_offd_i = hypre_CSRMatrixI(A_offd);
-   HYPRE_Int       *A_offd_j = hypre_CSRMatrixJ(A_offd);
-
-   /* HYPRE_Int       *row_starts      = hypre_ParCSRMatrixRowStarts(A); */
-   /* HYPRE_Int        first_row       = hypre_ParCSRMatrixFirstRowIndex(A); */
-   HYPRE_Int        first_col        = hypre_ParCSRMatrixFirstColDiag(A);
-   HYPRE_BigInt    *col_map_offd_A   = hypre_ParCSRMatrixColMapOffd(A);
-   HYPRE_Int        num_cols_A_offd  = hypre_CSRMatrixNumCols(A_offd);
-   HYPRE_BigInt    *d_col_map_offd_A = hypre_ParCSRMatrixDeviceColMapOffd(A);
-
-   MPI_Comm         comm  = hypre_ParCSRMatrixComm(A);
-
-   HYPRE_Int        num_procs;
-   HYPRE_Int        my_id;
-   void           **vrequest;
-
-   hypre_CSRMatrix *A_ext;
-
-   hypre_MPI_Comm_size(comm, &num_procs);
-   hypre_MPI_Comm_rank(comm, &my_id);
-
-   /* number of sends (#procs) */
-   num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
-   /* number of rows to send */
-   num_rows_send = hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends);
-   /* number of recvs (#procs) */
-   num_recvs = hypre_ParCSRCommPkgNumRecvs(comm_pkg);
-   /* number of rows to recv */
-   num_rows_recv = hypre_ParCSRCommPkgRecvVecStart(comm_pkg, num_recvs);
-
-   /* must be true if indices contains proper offd indices */
-   hypre_assert(indices_len == num_rows_recv);
-
-   /* send_i/recv_i:
-    * the arrays to send and recv: we first send and recv the row lengths */
-   d_send_i   = hypre_TAlloc(HYPRE_Int, num_rows_send + 1, HYPRE_MEMORY_DEVICE);
-   d_send_map = hypre_TAlloc(HYPRE_Int, num_rows_send,     HYPRE_MEMORY_DEVICE);
-   send_i     = hypre_TAlloc(HYPRE_Int, num_rows_send,     HYPRE_MEMORY_HOST);
-   recv_i     = hypre_TAlloc(HYPRE_Int, num_rows_recv + 1, HYPRE_MEMORY_HOST);
-   d_recv_i   = hypre_TAlloc(HYPRE_Int, num_rows_recv + 1, HYPRE_MEMORY_DEVICE);
-
-   /* fill the send array with row lengths */
-   hypre_TMemcpy(d_send_map, hypre_ParCSRCommPkgSendMapElmts(comm_pkg), HYPRE_Int,
-                 num_rows_send, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
-
-   hypre_Memset(d_send_i, 0, sizeof(HYPRE_Int), HYPRE_MEMORY_DEVICE);
-   hypreDevice_GetRowNnz(num_rows_send, d_send_map, A_diag_i, A_offd_i, d_send_i+1);
-
-   /* send array send_i out: deviceTohost first and MPI (async)
-    * note the shift in recv_i by one */
-   hypre_TMemcpy(send_i, d_send_i+1, HYPRE_Int, num_rows_send, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
-
-   comm_handle = hypre_ParCSRCommHandleCreate(11, comm_pkg, send_i, recv_i+1);
+   const HYPRE_Int row = hypre_gpu_get_grid_warp_id<1, 1>(item);
 
-   hypreDevice_IntegerInclusiveScan(num_rows_send + 1, d_send_i);
-
-   /* total number of nnz to send */
-   hypre_TMemcpy(&num_nnz_send, d_send_i+num_rows_send, HYPRE_Int, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
-
-   /* prepare data to send out. overlap with the above commmunication */
-   d_send_j = hypre_TAlloc(HYPRE_BigInt, num_nnz_send, HYPRE_MEMORY_DEVICE);
-   if (want_data)
-   {
-      d_send_a = hypre_TAlloc(HYPRE_Complex, num_nnz_send, HYPRE_MEMORY_DEVICE);
-   }
-
-   if (d_col_map_offd_A == NULL)
+   if (row >= nrows)
    {
-      d_col_map_offd_A = hypre_TAlloc(HYPRE_BigInt, num_cols_A_offd, HYPRE_MEMORY_DEVICE);
-      hypre_TMemcpy(d_col_map_offd_A, col_map_offd_A, HYPRE_BigInt, num_cols_A_offd,
-                    HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
-      hypre_ParCSRMatrixDeviceColMapOffd(A) = d_col_map_offd_A;
+      return;
    }
 
-   /* job == 2, d_send_i is input that contains row ptrs (length num_rows_send) */
-   hypreDevice_CopyParCSRRows(num_rows_send, d_send_map, 2, num_procs > 1,
-                              first_col, d_col_map_offd_A,
-                              A_diag_i, A_diag_j, A_diag_a,
-                              A_offd_i, A_offd_j, A_offd_a,
-                              d_send_i, d_send_j, d_send_a);
+   /* lane id inside the warp */
+   const HYPRE_Int lane_id = hypre_gpu_get_lane_id<1>(item);
+   HYPRE_Int i, j = 0, k = 0, p, istart, iend, bstart;
 
-   /* pointers to each proc in send_j */
-   send_jstarts = hypre_TAlloc(HYPRE_Int, num_sends + 1, HYPRE_MEMORY_HOST);
-   send_jstarts[0] = 0;
-   for (i = 1; i <= num_sends; i++)
+   /* diag part */
+   if (lane_id < 2)
    {
-      send_jstarts[i] = send_jstarts[i-1];
-      for ( j = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i-1);
-            j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-            j++ )
-      {
-         send_jstarts[i] += send_i[j];
-      }
+      j = read_only_load(d_diag_i + row + lane_id);
    }
-   hypre_assert(send_jstarts[num_sends] == num_nnz_send);
-
-   /* finish the above communication: send_i/recv_i */
-   hypre_ParCSRCommHandleDestroy(comm_handle);
-
-   /* adjust recv_i to ptrs */
-   recv_i[0] = 0;
-   for (i = 1; i <= num_rows_recv; i++)
+   if (lane_id == 0)
    {
-      recv_i[i] += recv_i[i-1];
+      k = read_only_load(d_ib + row);
    }
-   num_nnz_recv = recv_i[num_rows_recv];
+   istart = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, j, 0);
+   iend   = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, j, 1);
+   bstart = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, k, 0);
 
-   /* allocate device memory for j and a */
-   d_recv_j = hypre_TAlloc(HYPRE_BigInt, num_nnz_recv, HYPRE_MEMORY_DEVICE);
-   if (want_data)
+   p = bstart - istart;
+   for (i = istart + lane_id; i < iend; i += HYPRE_WARP_SIZE)
    {
-      d_recv_a = hypre_TAlloc(HYPRE_Complex, num_nnz_recv, HYPRE_MEMORY_DEVICE);
+      d_jb[p + i] = read_only_load(d_diag_j + i);
+      d_ab[p + i] = read_only_load(d_diag_a + i);
    }
 
-   recv_jstarts = hypre_TAlloc(HYPRE_Int, num_recvs + 1, HYPRE_MEMORY_HOST);
-   recv_jstarts[0] = 0;
-   for (i = 1; i <= num_recvs; i++)
+   /* offd part */
+   if (lane_id < 2)
    {
-      j = hypre_ParCSRCommPkgRecvVecStart(comm_pkg, i);
-      recv_jstarts[i] = recv_i[j];
+      j = read_only_load(d_offd_i + row + lane_id);
    }
+   bstart += iend - istart;
+   istart = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, j, 0);
+   iend   = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, j, 1);
 
-   /* ready to send and recv: create a communication package for data */
-   comm_pkg_j = hypre_CTAlloc(hypre_ParCSRCommPkg, 1, HYPRE_MEMORY_HOST);
-   hypre_ParCSRCommPkgComm         (comm_pkg_j) = comm;
-   hypre_ParCSRCommPkgNumSends     (comm_pkg_j) = num_sends;
-   hypre_ParCSRCommPkgSendProcs    (comm_pkg_j) = hypre_ParCSRCommPkgSendProcs(comm_pkg);
-   hypre_ParCSRCommPkgSendMapStarts(comm_pkg_j) = send_jstarts;
-   hypre_ParCSRCommPkgNumRecvs     (comm_pkg_j) = num_recvs;
-   hypre_ParCSRCommPkgRecvProcs    (comm_pkg_j) = hypre_ParCSRCommPkgRecvProcs(comm_pkg);
-   hypre_ParCSRCommPkgRecvVecStarts(comm_pkg_j) = recv_jstarts;
-
-   /* init communication */
-   /* ja */
-   comm_handle_j = hypre_ParCSRCommHandleCreate_v2(21, comm_pkg_j,
-                                                   HYPRE_MEMORY_DEVICE, d_send_j,
-                                                   HYPRE_MEMORY_DEVICE, d_recv_j);
-   if (want_data)
-   {
-      /* a */
-      comm_handle_a = hypre_ParCSRCommHandleCreate_v2(1, comm_pkg_j,
-                                                      HYPRE_MEMORY_DEVICE, d_send_a,
-                                                      HYPRE_MEMORY_DEVICE, d_recv_a);
-   }
-   else
+   p = bstart - istart;
+   for (i = istart + lane_id; i < iend; i += HYPRE_WARP_SIZE)
    {
-      comm_handle_a = NULL;
+      const HYPRE_Int t = read_only_load(d_offd_j + i);
+      d_jb[p + i] = (cols_offd_map ? read_only_load(&cols_offd_map[t]) : t) + diag_ncol;
+      d_ab[p + i] = read_only_load(d_offd_a + i);
    }
-
-   hypre_TMemcpy(d_recv_i, recv_i, HYPRE_Int, num_rows_recv+1, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
-
-   /* create A_ext: on device */
-   A_ext = hypre_CSRMatrixCreate(num_rows_recv, hypre_ParCSRMatrixGlobalNumCols(A), num_nnz_recv);
-   hypre_CSRMatrixI   (A_ext) = d_recv_i;
-   hypre_CSRMatrixBigJ(A_ext) = d_recv_j;
-   hypre_CSRMatrixData(A_ext) = d_recv_a;
-   hypre_CSRMatrixMemoryLocation(A_ext) = HYPRE_MEMORY_DEVICE;
-
-   /* output */
-   vrequest = hypre_TAlloc(void *, 3, HYPRE_MEMORY_HOST);
-   vrequest[0] = (void *) comm_handle_j;
-   vrequest[1] = (void *) comm_handle_a;
-   vrequest[2] = (void *) A_ext;
-
-   *request_ptr = (void *) vrequest;
-
-   /* free */
-   hypre_TFree(send_i,     HYPRE_MEMORY_HOST);
-   hypre_TFree(recv_i,     HYPRE_MEMORY_HOST);
-   hypre_TFree(d_send_i,   HYPRE_MEMORY_DEVICE);
-   hypre_TFree(d_send_map, HYPRE_MEMORY_DEVICE);
-
-   hypre_TFree(hypre_ParCSRCommPkgSendMapStarts(comm_pkg_j), HYPRE_MEMORY_HOST);
-   hypre_TFree(hypre_ParCSRCommPkgRecvVecStarts(comm_pkg_j), HYPRE_MEMORY_HOST);
-   hypre_TFree(comm_pkg_j, HYPRE_MEMORY_HOST);
-
-   return hypre_error_flag;
 }
 
 hypre_CSRMatrix*
-hypre_ParcsrGetExternalRowsDeviceWait(void *vrequest)
+hypre_ConcatDiagAndOffdDevice(hypre_ParCSRMatrix *A)
 {
-   void **request = (void **) vrequest;
+   hypre_GpuProfilingPushRange("ConcatDiagAndOffdDevice");
 
-   hypre_ParCSRCommHandle *comm_handle_j = (hypre_ParCSRCommHandle *) request[0];
-   hypre_ParCSRCommHandle *comm_handle_a = (hypre_ParCSRCommHandle *) request[1];
-   hypre_CSRMatrix        *A_ext         = (hypre_CSRMatrix *)        request[2];
-   HYPRE_BigInt           *send_j        = comm_handle_j ? (HYPRE_BigInt *)  hypre_ParCSRCommHandleSendData(comm_handle_j) : NULL;
-   HYPRE_Complex          *send_a        = comm_handle_a ? (HYPRE_Complex *) hypre_ParCSRCommHandleSendData(comm_handle_a) : NULL;
+   hypre_CSRMatrix *A_diag = hypre_ParCSRMatrixDiag(A);
+   hypre_CSRMatrix *A_offd = hypre_ParCSRMatrixOffd(A);
 
-   hypre_ParCSRCommHandleDestroy(comm_handle_j);
-   hypre_ParCSRCommHandleDestroy(comm_handle_a);
+   hypre_CSRMatrix *B = hypre_CSRMatrixCreate( hypre_CSRMatrixNumRows(A_diag),
+                                               hypre_CSRMatrixNumCols(A_diag) + hypre_CSRMatrixNumCols(A_offd),
+                                               hypre_CSRMatrixNumNonzeros(A_diag) + hypre_CSRMatrixNumNonzeros(A_offd) );
 
-   hypre_TFree(send_j, HYPRE_MEMORY_DEVICE);
-   hypre_TFree(send_a, HYPRE_MEMORY_DEVICE);
+   hypre_CSRMatrixInitialize_v2(B, 0, HYPRE_MEMORY_DEVICE);
 
-   hypre_TFree(request, HYPRE_MEMORY_HOST);
+   hypreDevice_GetRowNnz(hypre_CSRMatrixNumRows(B), NULL, hypre_CSRMatrixI(A_diag),
+                         hypre_CSRMatrixI(A_offd), hypre_CSRMatrixI(B));
+
+   hypreDevice_IntegerExclusiveScan(hypre_CSRMatrixNumRows(B) + 1, hypre_CSRMatrixI(B));
+
+   const dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+   const dim3 gDim = hypre_GetDefaultDeviceGridDimension(hypre_CSRMatrixNumRows(A_diag), "warp", bDim);
+
+   HYPRE_Int  nrows = hypre_CSRMatrixNumRows(A_diag);
+   HYPRE_Int  diag_ncol = hypre_CSRMatrixNumCols(A_diag);
+   HYPRE_Int *d_diag_i = hypre_CSRMatrixI(A_diag);
+   HYPRE_Int *d_diag_j = hypre_CSRMatrixJ(A_diag);
+   HYPRE_Complex *d_diag_a = hypre_CSRMatrixData(A_diag);
+   HYPRE_Int *d_offd_i = hypre_CSRMatrixI(A_offd);
+   HYPRE_Int *d_offd_j = hypre_CSRMatrixJ(A_offd);
+   HYPRE_Complex *d_offd_a = hypre_CSRMatrixData(A_offd);
+   HYPRE_Int *cols_offd_map = NULL;
+   HYPRE_Int *d_ib = hypre_CSRMatrixI(B);
+   HYPRE_Int *d_jb = hypre_CSRMatrixJ(B);
+   HYPRE_Complex *d_ab = hypre_CSRMatrixData(B);
+   HYPRE_GPU_LAUNCH( hypreGPUKernel_ConcatDiagAndOffd,
+                     gDim, bDim,
+                     nrows,
+                     diag_ncol,
+                     d_diag_i,
+                     d_diag_j,
+                     d_diag_a,
+                     d_offd_i,
+                     d_offd_j,
+                     d_offd_a,
+                     cols_offd_map,
+                     d_ib,
+                     d_jb,
+                     d_ab );
+
+   hypre_GpuProfilingPopRange();
 
-   return A_ext;
+   return B;
 }
-
+#else
 hypre_CSRMatrix*
-hypre_MergeDiagAndOffdDevice(hypre_ParCSRMatrix *A)
+hypre_ConcatDiagAndOffdDevice(hypre_ParCSRMatrix *A)
 {
-   MPI_Comm         comm     = hypre_ParCSRMatrixComm(A);
-   hypre_CSRMatrix *A_diag   = hypre_ParCSRMatrixDiag(A);
-   HYPRE_Complex   *A_diag_a = hypre_CSRMatrixData(A_diag);
-   HYPRE_Int       *A_diag_i = hypre_CSRMatrixI(A_diag);
-   HYPRE_Int       *A_diag_j = hypre_CSRMatrixJ(A_diag);
-   hypre_CSRMatrix *A_offd   = hypre_ParCSRMatrixOffd(A);
-   HYPRE_Complex   *A_offd_a = hypre_CSRMatrixData(A_offd);
-   HYPRE_Int       *A_offd_i = hypre_CSRMatrixI(A_offd);
-   HYPRE_Int       *A_offd_j = hypre_CSRMatrixJ(A_offd);
-
-   HYPRE_Int        local_num_rows   = hypre_CSRMatrixNumRows(A_diag);
-   HYPRE_BigInt     glbal_num_cols   = hypre_ParCSRMatrixGlobalNumCols(A);
-   HYPRE_BigInt     first_col        = hypre_ParCSRMatrixFirstColDiag(A);
-   HYPRE_Int        num_cols_A_offd  = hypre_CSRMatrixNumCols(A_offd);
-   HYPRE_BigInt    *col_map_offd_A   = hypre_ParCSRMatrixColMapOffd(A);
-   HYPRE_BigInt    *d_col_map_offd_A = hypre_ParCSRMatrixDeviceColMapOffd(A);
+   hypre_CSRMatrix *A_diag     = hypre_ParCSRMatrixDiag(A);
+   HYPRE_Int       *A_diag_i   = hypre_CSRMatrixI(A_diag);
+   HYPRE_Int       *A_diag_j   = hypre_CSRMatrixJ(A_diag);
+   HYPRE_Complex   *A_diag_a   = hypre_CSRMatrixData(A_diag);
+   HYPRE_Int        A_diag_nnz = hypre_CSRMatrixNumNonzeros(A_diag);
+   hypre_CSRMatrix *A_offd     = hypre_ParCSRMatrixOffd(A);
+   HYPRE_Int       *A_offd_i   = hypre_CSRMatrixI(A_offd);
+   HYPRE_Int       *A_offd_j   = hypre_CSRMatrixJ(A_offd);
+   HYPRE_Complex   *A_offd_a   = hypre_CSRMatrixData(A_offd);
+   HYPRE_Int        A_offd_nnz = hypre_CSRMatrixNumNonzeros(A_offd);
 
    hypre_CSRMatrix *B;
-   HYPRE_Int        B_nrows = local_num_rows;
-   HYPRE_BigInt     B_ncols = glbal_num_cols;
-   HYPRE_Int       *B_i = hypre_TAlloc(HYPRE_Int, B_nrows + 1, HYPRE_MEMORY_DEVICE);
-   HYPRE_BigInt    *B_j;
-   HYPRE_Complex   *B_a;
-   HYPRE_Int        B_nnz;
-
-   HYPRE_Int        num_procs;
-
-   hypre_MPI_Comm_size(comm, &num_procs);
+   HYPRE_Int        B_nrows = hypre_CSRMatrixNumRows(A_diag);
+   HYPRE_Int        B_ncols = hypre_CSRMatrixNumCols(A_diag) + hypre_CSRMatrixNumCols(A_offd);
+   HYPRE_Int        B_nnz   = A_diag_nnz + A_offd_nnz;
+   HYPRE_Int       *B_ii = hypre_TAlloc(HYPRE_Int,     B_nnz, HYPRE_MEMORY_DEVICE);
+   HYPRE_Int       *B_j  = hypre_TAlloc(HYPRE_Int,     B_nnz, HYPRE_MEMORY_DEVICE);
+   HYPRE_Complex   *B_a  = hypre_TAlloc(HYPRE_Complex, B_nnz, HYPRE_MEMORY_DEVICE);
 
-   hypre_Memset(B_i, 0, sizeof(HYPRE_Int), HYPRE_MEMORY_DEVICE);
+   // Adiag
+   HYPRE_Int *A_diag_ii = hypreDevice_CsrRowPtrsToIndices(B_nrows, A_diag_nnz, A_diag_i);
+   HYPRE_THRUST_CALL( copy_n,
+                      thrust::make_zip_iterator(thrust::make_tuple(A_diag_ii, A_diag_j, A_diag_a)),
+                      A_diag_nnz,
+                      thrust::make_zip_iterator(thrust::make_tuple(B_ii, B_j, B_a)) );
+   hypre_TFree(A_diag_ii, HYPRE_MEMORY_DEVICE);
 
-   hypreDevice_GetRowNnz(B_nrows, NULL, A_diag_i, A_offd_i, B_i+1);
+   // Aoffd
+   HYPRE_Int *A_offd_ii = hypreDevice_CsrRowPtrsToIndices(B_nrows, A_offd_nnz, A_offd_i);
+   HYPRE_THRUST_CALL( copy_n,
+                      thrust::make_zip_iterator(thrust::make_tuple(A_offd_ii, A_offd_a)),
+                      A_offd_nnz,
+                      thrust::make_zip_iterator(thrust::make_tuple(B_ii, B_a)) + A_diag_nnz );
+   hypre_TFree(A_offd_ii, HYPRE_MEMORY_DEVICE);
 
-   hypreDevice_IntegerInclusiveScan(B_nrows+1, B_i);
+   HYPRE_THRUST_CALL( transform,
+                      A_offd_j,
+                      A_offd_j + A_offd_nnz,
+                      thrust::make_constant_iterator(hypre_CSRMatrixNumCols(A_diag)),
+                      B_j + A_diag_nnz,
+                      thrust::plus<HYPRE_Int>() );
 
-   /* total number of nnz */
-   hypre_TMemcpy(&B_nnz, B_i+B_nrows, HYPRE_Int, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
+   // B
+   HYPRE_THRUST_CALL( stable_sort_by_key,
+                      B_ii,
+                      B_ii + B_nnz,
+                      thrust::make_zip_iterator(thrust::make_tuple(B_j, B_a)) );
 
-   B_j = hypre_TAlloc(HYPRE_BigInt,  B_nnz, HYPRE_MEMORY_DEVICE);
-   B_a = hypre_TAlloc(HYPRE_Complex, B_nnz, HYPRE_MEMORY_DEVICE);
+   HYPRE_Int *B_i = hypreDevice_CsrRowIndicesToPtrs(B_nrows, B_nnz, B_ii);
+   hypre_TFree(B_ii, HYPRE_MEMORY_DEVICE);
 
-   if (d_col_map_offd_A == NULL)
-   {
-      d_col_map_offd_A = hypre_TAlloc(HYPRE_BigInt, num_cols_A_offd, HYPRE_MEMORY_DEVICE);
-      hypre_TMemcpy(d_col_map_offd_A, col_map_offd_A, HYPRE_BigInt, num_cols_A_offd,
-                    HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
-      hypre_ParCSRMatrixDeviceColMapOffd(A) = d_col_map_offd_A;
-   }
+   B = hypre_CSRMatrixCreate(B_nrows, B_ncols, B_nnz);
+   hypre_CSRMatrixI(B) = B_i;
+   hypre_CSRMatrixJ(B) = B_j;
+   hypre_CSRMatrixData(B) = B_a;
+   hypre_CSRMatrixMemoryLocation(B) = HYPRE_MEMORY_DEVICE;
 
-   hypreDevice_CopyParCSRRows(B_nrows, NULL, 2, num_procs > 1, first_col, d_col_map_offd_A,
-                              A_diag_i, A_diag_j, A_diag_a, A_offd_i, A_offd_j, A_offd_a,
-                              B_i, B_j, B_a);
+   return B;
+}
+#endif
 
-   /* output */
-   B = hypre_CSRMatrixCreate(B_nrows, B_ncols, B_nnz);
-   hypre_CSRMatrixI   (B) = B_i;
-   hypre_CSRMatrixBigJ(B) = B_j;
+/* return B = [Adiag, Aoffd; E] */
+#if 1
+HYPRE_Int
+hypre_ConcatDiagOffdAndExtDevice(hypre_ParCSRMatrix *A,
+                                 hypre_CSRMatrix    *E,
+                                 hypre_CSRMatrix   **B_ptr,
+                                 HYPRE_Int          *num_cols_offd_ptr,
+                                 HYPRE_BigInt      **cols_map_offd_ptr)
+{
+   hypre_CSRMatrix *A_diag = hypre_ParCSRMatrixDiag(A);
+   hypre_CSRMatrix *A_offd = hypre_ParCSRMatrixOffd(A);
+   hypre_CSRMatrix *E_diag, *E_offd, *B;
+   HYPRE_Int       *cols_offd_map, num_cols_offd;
+   HYPRE_BigInt    *cols_map_offd;
+
+   hypre_CSRMatrixSplitDevice(E, hypre_ParCSRMatrixFirstColDiag(A), hypre_ParCSRMatrixLastColDiag(A),
+                              hypre_CSRMatrixNumCols(A_offd), hypre_ParCSRMatrixDeviceColMapOffd(A),
+                              &cols_offd_map, &num_cols_offd, &cols_map_offd, &E_diag, &E_offd);
+
+   B = hypre_CSRMatrixCreate(hypre_ParCSRMatrixNumRows(A) + hypre_CSRMatrixNumRows(E),
+                             hypre_ParCSRMatrixNumCols(A) + num_cols_offd,
+                             hypre_CSRMatrixNumNonzeros(A_diag) + hypre_CSRMatrixNumNonzeros(A_offd) +
+                             hypre_CSRMatrixNumNonzeros(E));
+
+   hypre_CSRMatrixInitialize_v2(B, 0, HYPRE_MEMORY_DEVICE);
+
+   hypreDevice_GetRowNnz(hypre_ParCSRMatrixNumRows(A), NULL, hypre_CSRMatrixI(A_diag),
+                         hypre_CSRMatrixI(A_offd), hypre_CSRMatrixI(B));
+   hypreDevice_IntegerExclusiveScan(hypre_ParCSRMatrixNumRows(A) + 1, hypre_CSRMatrixI(B));
+
+   dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+   dim3 gDim = hypre_GetDefaultDeviceGridDimension(hypre_ParCSRMatrixNumRows(A), "warp", bDim);
+
+   HYPRE_Int  nrows = hypre_CSRMatrixNumRows(A_diag);
+   HYPRE_Int  diag_ncol = hypre_CSRMatrixNumCols(A_diag);
+   HYPRE_Int *d_diag_i = hypre_CSRMatrixI(A_diag);
+   HYPRE_Int *d_diag_j = hypre_CSRMatrixJ(A_diag);
+   HYPRE_Complex *d_diag_a = hypre_CSRMatrixData(A_diag);
+   HYPRE_Int *d_offd_i = hypre_CSRMatrixI(A_offd);
+   HYPRE_Int *d_offd_j = hypre_CSRMatrixJ(A_offd);
+   HYPRE_Complex *d_offd_a = hypre_CSRMatrixData(A_offd);
+   HYPRE_Int *d_ib = hypre_CSRMatrixI(B);
+   HYPRE_Int *d_jb = hypre_CSRMatrixJ(B);
+   HYPRE_Complex *d_ab = hypre_CSRMatrixData(B);
+   HYPRE_GPU_LAUNCH( hypreGPUKernel_ConcatDiagAndOffd,
+                     gDim, bDim,
+                     nrows,
+                     diag_ncol,
+                     d_diag_i,
+                     d_diag_j,
+                     d_diag_a,
+                     d_offd_i,
+                     d_offd_j,
+                     d_offd_a,
+                     cols_offd_map,
+                     d_ib,
+                     d_jb,
+                     d_ab );
+
+   hypre_TFree(cols_offd_map, HYPRE_MEMORY_DEVICE);
+
+   hypre_TMemcpy(hypre_CSRMatrixI(B) + hypre_ParCSRMatrixNumRows(A) + 1, hypre_CSRMatrixI(E) + 1,
+                 HYPRE_Int, hypre_CSRMatrixNumRows(E),
+                 HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+#ifdef HYPRE_USING_SYCL
+   HYPRE_ONEDPL_CALL( std::transform,
+                      hypre_CSRMatrixI(B) + hypre_ParCSRMatrixNumRows(A) + 1,
+                      hypre_CSRMatrixI(B) + hypre_ParCSRMatrixNumRows(A) + hypre_CSRMatrixNumRows(E) + 1,
+                      hypre_CSRMatrixI(B) + hypre_ParCSRMatrixNumRows(A) + 1,
+                      [const_val = hypre_CSRMatrixNumNonzeros(A_diag) + hypre_CSRMatrixNumNonzeros(A_offd)] (
+   const auto & x) {return x + const_val;} );
+#else
+   HYPRE_THRUST_CALL( transform,
+                      hypre_CSRMatrixI(B) + hypre_ParCSRMatrixNumRows(A) + 1,
+                      hypre_CSRMatrixI(B) + hypre_ParCSRMatrixNumRows(A) + hypre_CSRMatrixNumRows(E) + 1,
+                      thrust::make_constant_iterator(hypre_CSRMatrixNumNonzeros(A_diag) + hypre_CSRMatrixNumNonzeros(
+                                                        A_offd)),
+                      hypre_CSRMatrixI(B) + hypre_ParCSRMatrixNumRows(A) + 1,
+                      thrust::plus<HYPRE_Int>() );
+#endif
+
+   gDim = hypre_GetDefaultDeviceGridDimension(hypre_CSRMatrixNumRows(E), "warp", bDim);
+
+   hypre_assert(hypre_CSRMatrixNumCols(E_diag) == hypre_CSRMatrixNumCols(A_diag));
+
+   nrows = hypre_CSRMatrixNumRows(E_diag);
+   diag_ncol = hypre_CSRMatrixNumCols(E_diag);
+   d_diag_i = hypre_CSRMatrixI(E_diag);
+   d_diag_j = hypre_CSRMatrixJ(E_diag);
+   d_diag_a = hypre_CSRMatrixData(E_diag);
+   d_offd_i = hypre_CSRMatrixI(E_offd);
+   d_offd_j = hypre_CSRMatrixJ(E_offd);
+   d_offd_a = hypre_CSRMatrixData(E_offd);
+   cols_offd_map = NULL;
+   d_ib = hypre_CSRMatrixI(B) + hypre_ParCSRMatrixNumRows(A);
+   d_jb = hypre_CSRMatrixJ(B);
+   d_ab = hypre_CSRMatrixData(B);
+   HYPRE_GPU_LAUNCH( hypreGPUKernel_ConcatDiagAndOffd,
+                     gDim, bDim,
+                     nrows,
+                     diag_ncol,
+                     d_diag_i,
+                     d_diag_j,
+                     d_diag_a,
+                     d_offd_i,
+                     d_offd_j,
+                     d_offd_a,
+                     cols_offd_map,
+                     d_ib,
+                     d_jb,
+                     d_ab );
+
+   hypre_CSRMatrixDestroy(E_diag);
+   hypre_CSRMatrixDestroy(E_offd);
+
+   *B_ptr = B;
+   *num_cols_offd_ptr = num_cols_offd;
+   *cols_map_offd_ptr = cols_map_offd;
+
+   return hypre_error_flag;
+}
+#else
+HYPRE_Int
+hypre_ConcatDiagOffdAndExtDevice(hypre_ParCSRMatrix *A,
+                                 hypre_CSRMatrix    *E,
+                                 hypre_CSRMatrix   **B_ptr,
+                                 HYPRE_Int          *num_cols_offd_ptr,
+                                 HYPRE_BigInt      **cols_map_offd_ptr)
+{
+   hypre_CSRMatrix *A_diag          = hypre_ParCSRMatrixDiag(A);
+   HYPRE_Int        A_nrows         = hypre_CSRMatrixNumRows(A_diag);
+   HYPRE_Int        A_ncols         = hypre_CSRMatrixNumCols(A_diag);
+   HYPRE_Int       *A_diag_i        = hypre_CSRMatrixI(A_diag);
+   HYPRE_Int       *A_diag_j        = hypre_CSRMatrixJ(A_diag);
+   HYPRE_Complex   *A_diag_a        = hypre_CSRMatrixData(A_diag);
+   HYPRE_Int        A_diag_nnz      = hypre_CSRMatrixNumNonzeros(A_diag);
+   hypre_CSRMatrix *A_offd          = hypre_ParCSRMatrixOffd(A);
+   HYPRE_Int       *A_offd_i        = hypre_CSRMatrixI(A_offd);
+   HYPRE_Int       *A_offd_j        = hypre_CSRMatrixJ(A_offd);
+   HYPRE_Complex   *A_offd_a        = hypre_CSRMatrixData(A_offd);
+   HYPRE_Int        A_offd_nnz      = hypre_CSRMatrixNumNonzeros(A_offd);
+   HYPRE_BigInt     first_col_A     = hypre_ParCSRMatrixFirstColDiag(A);
+   HYPRE_BigInt     last_col_A      = hypre_ParCSRMatrixLastColDiag(A);
+   HYPRE_Int        num_cols_offd_A = hypre_CSRMatrixNumCols(A_offd);
+   HYPRE_BigInt    *col_map_offd_A  = hypre_ParCSRMatrixDeviceColMapOffd(A);
+
+   HYPRE_Int       *E_i     = hypre_CSRMatrixI(E);
+   HYPRE_BigInt    *E_bigj  = hypre_CSRMatrixBigJ(E);
+   HYPRE_Complex   *E_a     = hypre_CSRMatrixData(E);
+   HYPRE_Int        E_nrows = hypre_CSRMatrixNumRows(E);
+   HYPRE_Int        E_nnz   = hypre_CSRMatrixNumNonzeros(E);
+   HYPRE_Int        E_diag_nnz, E_offd_nnz;
+
+   hypre_CSRMatrix *B;
+   HYPRE_Int        B_nnz   = A_diag_nnz + A_offd_nnz + E_nnz;
+   HYPRE_Int       *B_ii    = hypre_TAlloc(HYPRE_Int,     B_nnz, HYPRE_MEMORY_DEVICE);
+   HYPRE_Int       *B_j     = hypre_TAlloc(HYPRE_Int,     B_nnz, HYPRE_MEMORY_DEVICE);
+   HYPRE_Complex   *B_a     = hypre_TAlloc(HYPRE_Complex, B_nnz, HYPRE_MEMORY_DEVICE);
+
+   // E
+   hypre_CSRMatrixSplitDevice_core(0, E_nrows, E_nnz, NULL, E_bigj, NULL, NULL, first_col_A,
+                                   last_col_A, num_cols_offd_A,
+                                   NULL, NULL, NULL, NULL, &E_diag_nnz, NULL, NULL, NULL, NULL, &E_offd_nnz,
+                                   NULL, NULL, NULL, NULL);
+
+   HYPRE_Int    *cols_offd_map, num_cols_offd;
+   HYPRE_BigInt *cols_map_offd;
+   HYPRE_Int *E_ii = hypreDevice_CsrRowPtrsToIndices(E_nrows, E_nnz, E_i);
+
+   hypre_CSRMatrixSplitDevice_core(1,
+                                   E_nrows, E_nnz, E_ii, E_bigj, E_a, NULL,
+                                   first_col_A, last_col_A, num_cols_offd_A, col_map_offd_A,
+                                   &cols_offd_map, &num_cols_offd, &cols_map_offd,
+                                   &E_diag_nnz,
+                                   B_ii + A_diag_nnz + A_offd_nnz,
+                                   B_j  + A_diag_nnz + A_offd_nnz,
+                                   B_a  + A_diag_nnz + A_offd_nnz,
+                                   NULL,
+                                   &E_offd_nnz,
+                                   B_ii + A_diag_nnz + A_offd_nnz + E_diag_nnz,
+                                   B_j  + A_diag_nnz + A_offd_nnz + E_diag_nnz,
+                                   B_a  + A_diag_nnz + A_offd_nnz + E_diag_nnz,
+                                   NULL);
+   hypre_TFree(E_ii, HYPRE_MEMORY_DEVICE);
+
+   HYPRE_THRUST_CALL( transform,
+                      B_ii + A_diag_nnz + A_offd_nnz,
+                      B_ii + B_nnz,
+                      thrust::make_constant_iterator(A_nrows),
+                      B_ii + A_diag_nnz + A_offd_nnz,
+                      thrust::plus<HYPRE_Int>() );
+
+   // Adiag
+   HYPRE_Int *A_diag_ii = hypreDevice_CsrRowPtrsToIndices(A_nrows, A_diag_nnz, A_diag_i);
+   HYPRE_THRUST_CALL( copy_n,
+                      thrust::make_zip_iterator(thrust::make_tuple(A_diag_ii, A_diag_j, A_diag_a)),
+                      A_diag_nnz,
+                      thrust::make_zip_iterator(thrust::make_tuple(B_ii, B_j, B_a)) );
+   hypre_TFree(A_diag_ii, HYPRE_MEMORY_DEVICE);
+
+   // Aoffd
+   HYPRE_Int *A_offd_ii = hypreDevice_CsrRowPtrsToIndices(A_nrows, A_offd_nnz, A_offd_i);
+   HYPRE_THRUST_CALL( copy_n,
+                      thrust::make_zip_iterator(thrust::make_tuple(A_offd_ii, A_offd_a)),
+                      A_offd_nnz,
+                      thrust::make_zip_iterator(thrust::make_tuple(B_ii, B_a)) + A_diag_nnz );
+   hypre_TFree(A_offd_ii, HYPRE_MEMORY_DEVICE);
+
+   HYPRE_THRUST_CALL( gather,
+                      A_offd_j,
+                      A_offd_j + A_offd_nnz,
+                      cols_offd_map,
+                      B_j + A_diag_nnz);
+
+   hypre_TFree(cols_offd_map, HYPRE_MEMORY_DEVICE);
+
+   HYPRE_THRUST_CALL( transform,
+                      B_j + A_diag_nnz,
+                      B_j + A_diag_nnz + A_offd_nnz,
+                      thrust::make_constant_iterator(A_ncols),
+                      B_j + A_diag_nnz,
+                      thrust::plus<HYPRE_Int>() );
+
+   HYPRE_THRUST_CALL( transform,
+                      B_j + A_diag_nnz + A_offd_nnz + E_diag_nnz,
+                      B_j + B_nnz,
+                      thrust::make_constant_iterator(A_ncols),
+                      B_j + A_diag_nnz + A_offd_nnz + E_diag_nnz,
+                      thrust::plus<HYPRE_Int>() );
+
+   // B
+   HYPRE_THRUST_CALL( stable_sort_by_key,
+                      B_ii,
+                      B_ii + B_nnz,
+                      thrust::make_zip_iterator(thrust::make_tuple(B_j, B_a)) );
+
+   HYPRE_Int *B_i = hypreDevice_CsrRowIndicesToPtrs(A_nrows + E_nrows, B_nnz, B_ii);
+   hypre_TFree(B_ii, HYPRE_MEMORY_DEVICE);
+
+   B = hypre_CSRMatrixCreate(A_nrows + E_nrows, A_ncols + num_cols_offd, B_nnz);
+   hypre_CSRMatrixI(B) = B_i;
+   hypre_CSRMatrixJ(B) = B_j;
    hypre_CSRMatrixData(B) = B_a;
    hypre_CSRMatrixMemoryLocation(B) = HYPRE_MEMORY_DEVICE;
 
-   hypre_SyncCudaComputeStream(hypre_handle());
+   *B_ptr = B;
+   *num_cols_offd_ptr = num_cols_offd;
+   *cols_map_offd_ptr = cols_map_offd;
 
-   return B;
+   return hypre_error_flag;
 }
+#endif
 
+/* The input B_ext is a BigJ matrix, so is the output */
+/* RL: TODO FIX the num of columns of the output (from B_ext 'big' num cols) */
 HYPRE_Int
 hypre_ExchangeExternalRowsDeviceInit( hypre_CSRMatrix      *B_ext,
                                       hypre_ParCSRCommPkg  *comm_pkg_A,
@@ -346,7 +484,7 @@ hypre_ExchangeExternalRowsDeviceInit( hypre_CSRMatrix      *B_ext,
    HYPRE_Int        B_int_nnz;
 
    hypre_ParCSRCommHandle *comm_handle, *comm_handle_j, *comm_handle_a;
-   hypre_ParCSRCommPkg    *comm_pkg_j;
+   hypre_ParCSRCommPkg    *comm_pkg_j = NULL;
 
    HYPRE_Int *jdata_recv_vec_starts;
    HYPRE_Int *jdata_send_map_starts;
@@ -358,13 +496,17 @@ hypre_ExchangeExternalRowsDeviceInit( hypre_CSRMatrix      *B_ext,
    hypre_MPI_Comm_size(comm, &num_procs);
    hypre_MPI_Comm_rank(comm, &my_id);
 
-   jdata_send_map_starts = hypre_TAlloc(HYPRE_Int, num_sends+1, HYPRE_MEMORY_HOST);
+   jdata_send_map_starts = hypre_TAlloc(HYPRE_Int, num_sends + 1, HYPRE_MEMORY_HOST);
 
    /*--------------------------------------------------------------------------
     * B_ext_rownnz contains the number of elements of row j
     * (to be determined through send_map_elmnts on the receiving end)
     *--------------------------------------------------------------------------*/
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_ONEDPL_CALL(std::adjacent_difference, B_ext_i_d, B_ext_i_d + B_ext_nrows + 1, B_ext_rownnz_d);
+#else
    HYPRE_THRUST_CALL(adjacent_difference, B_ext_i_d, B_ext_i_d + B_ext_nrows + 1, B_ext_rownnz_d);
+#endif
    hypre_TMemcpy(B_ext_rownnz_h, B_ext_rownnz_d + 1, HYPRE_Int, B_ext_nrows,
                  HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
 
@@ -378,10 +520,11 @@ hypre_ExchangeExternalRowsDeviceInit( hypre_CSRMatrix      *B_ext,
    jdata_recv_vec_starts[0] = 0;
 
    B_ext_i_h[0] = 0;
-   hypre_TMemcpy(B_ext_i_h + 1, B_ext_rownnz_h, HYPRE_Int, B_ext_nrows, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
+   hypre_TMemcpy(B_ext_i_h + 1, B_ext_rownnz_h, HYPRE_Int, B_ext_nrows, HYPRE_MEMORY_HOST,
+                 HYPRE_MEMORY_HOST);
    for (i = 1; i <= B_ext_nrows; i++)
    {
-      B_ext_i_h[i] += B_ext_i_h[i-1];
+      B_ext_i_h[i] += B_ext_i_h[i - 1];
    }
 
    hypre_assert(B_ext_i_h[B_ext_nrows] == B_ext_nnz);
@@ -391,12 +534,12 @@ hypre_ExchangeExternalRowsDeviceInit( hypre_CSRMatrix      *B_ext,
       jdata_recv_vec_starts[i] = B_ext_i_h[recv_vec_starts[i]];
    }
 
-   comm_pkg_j = hypre_CTAlloc(hypre_ParCSRCommPkg,  1, HYPRE_MEMORY_HOST);
-   hypre_ParCSRCommPkgComm(comm_pkg_j)      = comm;
-   hypre_ParCSRCommPkgNumSends(comm_pkg_j)  = num_recvs;
-   hypre_ParCSRCommPkgNumRecvs(comm_pkg_j)  = num_sends;
-   hypre_ParCSRCommPkgSendProcs(comm_pkg_j) = recv_procs;
-   hypre_ParCSRCommPkgRecvProcs(comm_pkg_j) = send_procs;
+   /* Create the communication package - note the order of send/recv is reversed */
+   hypre_ParCSRCommPkgCreateAndFill(comm,
+                                    num_sends, send_procs, jdata_send_map_starts,
+                                    num_recvs, recv_procs, jdata_recv_vec_starts,
+                                    NULL,
+                                    &comm_pkg_j);
 
    hypre_ParCSRCommHandleDestroy(comm_handle);
 
@@ -406,12 +549,12 @@ hypre_ExchangeExternalRowsDeviceInit( hypre_CSRMatrix      *B_ext,
    B_int_i_h[0] = 0;
    for (i = 1; i <= B_int_nrows; i++)
    {
-      B_int_i_h[i] += B_int_i_h[i-1];
+      B_int_i_h[i] += B_int_i_h[i - 1];
    }
 
    B_int_nnz = B_int_i_h[B_int_nrows];
 
-   B_int_j_d = hypre_TAlloc(HYPRE_BigInt,  B_int_nnz, HYPRE_MEMORY_DEVICE);
+   B_int_j_d = hypre_TAlloc(HYPRE_BigInt, B_int_nnz, HYPRE_MEMORY_DEVICE);
    if (want_data)
    {
       B_int_a_d = hypre_TAlloc(HYPRE_Complex, B_int_nnz, HYPRE_MEMORY_DEVICE);
@@ -422,10 +565,7 @@ hypre_ExchangeExternalRowsDeviceInit( hypre_CSRMatrix      *B_ext,
       jdata_send_map_starts[i] = B_int_i_h[send_map_starts[i]];
    }
 
-   /* note the order of send/recv is reversed */
-   hypre_ParCSRCommPkgRecvVecStarts(comm_pkg_j) = jdata_send_map_starts;
-   hypre_ParCSRCommPkgSendMapStarts(comm_pkg_j) = jdata_recv_vec_starts;
-
+   /* RL: assume B_ext_a_d and B_ext_j_d are ready at input */
    /* send/recv CSR rows */
    if (want_data)
    {
@@ -442,7 +582,8 @@ hypre_ExchangeExternalRowsDeviceInit( hypre_CSRMatrix      *B_ext,
                                                    HYPRE_MEMORY_DEVICE, B_ext_j_d,
                                                    HYPRE_MEMORY_DEVICE, B_int_j_d );
 
-   hypre_TMemcpy(B_int_i_d, B_int_i_h, HYPRE_Int, B_int_nrows+1, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
+   hypre_TMemcpy(B_int_i_d, B_int_i_h, HYPRE_Int, B_int_nrows + 1, HYPRE_MEMORY_DEVICE,
+                 HYPRE_MEMORY_HOST);
 
    /* create CSR: on device */
    B_int_d = hypre_CSRMatrixCreate(B_int_nrows, B_int_ncols, B_int_nnz);
@@ -490,11 +631,6 @@ hypre_ExchangeExternalRowsDeviceWait(void *vrequest)
    return B_int_d;
 }
 
-
-/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-
 HYPRE_Int
 hypre_ParCSRMatrixExtractBExtDeviceInit( hypre_ParCSRMatrix  *B,
                                          hypre_ParCSRMatrix  *A,
@@ -540,497 +676,367 @@ hypre_ParCSRMatrixExtractBExtDevice( hypre_ParCSRMatrix *B,
    return hypre_ParCSRMatrixExtractBExtDeviceWait(request);
 }
 
-/* return B = [Adiag, Aoffd] */
-#if 1
-__global__ void
-hypreCUDAKernel_ConcatDiagAndOffd(HYPRE_Int  nrows,    HYPRE_Int  diag_ncol,
-                                  HYPRE_Int *d_diag_i, HYPRE_Int *d_diag_j, HYPRE_Complex *d_diag_a,
-                                  HYPRE_Int *d_offd_i, HYPRE_Int *d_offd_j, HYPRE_Complex *d_offd_a,
-                                  HYPRE_Int *cols_offd_map,
-                                  HYPRE_Int *d_ib,     HYPRE_Int *d_jb,     HYPRE_Complex *d_ab)
+HYPRE_Int
+hypre_ParcsrGetExternalRowsDeviceInit( hypre_ParCSRMatrix   *A,
+                                       HYPRE_Int             indices_len,
+                                       HYPRE_BigInt         *indices,
+                                       hypre_ParCSRCommPkg  *comm_pkg,
+                                       HYPRE_Int             want_data,
+                                       void                **request_ptr)
 {
-   const HYPRE_Int row = hypre_cuda_get_grid_warp_id<1,1>();
+   HYPRE_UNUSED_VAR(indices);
+   HYPRE_UNUSED_VAR(indices_len);
 
-   if (row >= nrows)
-   {
-      return;
-   }
-
-   /* lane id inside the warp */
-   const HYPRE_Int lane_id = hypre_cuda_get_lane_id<1>();
-   HYPRE_Int i, j, k, p, istart, iend, bstart;
-
-   /* diag part */
-   if (lane_id < 2)
-   {
-      j = read_only_load(d_diag_i + row + lane_id);
-   }
-   if (lane_id == 0)
-   {
-      k = read_only_load(d_ib + row);
-   }
-   istart = __shfl_sync(HYPRE_WARP_FULL_MASK, j, 0);
-   iend   = __shfl_sync(HYPRE_WARP_FULL_MASK, j, 1);
-   bstart = __shfl_sync(HYPRE_WARP_FULL_MASK, k, 0);
-
-   p = bstart - istart;
-   for (i = istart + lane_id; i < iend; i += HYPRE_WARP_SIZE)
-   {
-      d_jb[p+i] = read_only_load(d_diag_j + i);
-      d_ab[p+i] = read_only_load(d_diag_a + i);
-   }
-
-   /* offd part */
-   if (lane_id < 2)
-   {
-      j = read_only_load(d_offd_i + row + lane_id);
-   }
-   bstart += iend - istart;
-   istart = __shfl_sync(HYPRE_WARP_FULL_MASK, j, 0);
-   iend   = __shfl_sync(HYPRE_WARP_FULL_MASK, j, 1);
-
-   p = bstart - istart;
-   for (i = istart + lane_id; i < iend; i += HYPRE_WARP_SIZE)
-   {
-      const HYPRE_Int t = read_only_load(d_offd_j + i);
-      d_jb[p+i] = (cols_offd_map ? read_only_load(&cols_offd_map[t]) : t) + diag_ncol;
-      d_ab[p+i] = read_only_load(d_offd_a + i);
-   }
-}
-
-hypre_CSRMatrix*
-hypre_ConcatDiagAndOffdDevice(hypre_ParCSRMatrix *A)
-{
-   hypre_CSRMatrix *A_diag = hypre_ParCSRMatrixDiag(A);
-   hypre_CSRMatrix *A_offd = hypre_ParCSRMatrixOffd(A);
-
-   hypre_CSRMatrix *B = hypre_CSRMatrixCreate( hypre_CSRMatrixNumRows(A_diag),
-                                               hypre_CSRMatrixNumCols(A_diag) + hypre_CSRMatrixNumCols(A_offd),
-                                               hypre_CSRMatrixNumNonzeros(A_diag) + hypre_CSRMatrixNumNonzeros(A_offd) );
-
-   hypre_CSRMatrixInitialize_v2(B, 0, HYPRE_MEMORY_DEVICE);
-
-   hypreDevice_GetRowNnz(hypre_CSRMatrixNumRows(B), NULL, hypre_CSRMatrixI(A_diag), hypre_CSRMatrixI(A_offd), hypre_CSRMatrixI(B));
-
-   HYPRE_THRUST_CALL( exclusive_scan,
-                      hypre_CSRMatrixI(B),
-                      hypre_CSRMatrixI(B) + hypre_CSRMatrixNumRows(B) + 1,
-                      hypre_CSRMatrixI(B) );
-
-   const dim3 bDim = hypre_GetDefaultCUDABlockDimension();
-   const dim3 gDim = hypre_GetDefaultCUDAGridDimension(hypre_CSRMatrixNumRows(A_diag), "warp", bDim);
-
-   HYPRE_CUDA_LAUNCH( hypreCUDAKernel_ConcatDiagAndOffd,
-                      gDim, bDim,
-                      hypre_CSRMatrixNumRows(A_diag),
-                      hypre_CSRMatrixNumCols(A_diag),
-                      hypre_CSRMatrixI(A_diag),
-                      hypre_CSRMatrixJ(A_diag),
-                      hypre_CSRMatrixData(A_diag),
-                      hypre_CSRMatrixI(A_offd),
-                      hypre_CSRMatrixJ(A_offd),
-                      hypre_CSRMatrixData(A_offd),
-                      NULL,
-                      hypre_CSRMatrixI(B),
-                      hypre_CSRMatrixJ(B),
-                      hypre_CSRMatrixData(B) );
-
-   return B;
-}
-#else
-hypre_CSRMatrix*
-hypre_ConcatDiagAndOffdDevice(hypre_ParCSRMatrix *A)
-{
-   hypre_CSRMatrix *A_diag     = hypre_ParCSRMatrixDiag(A);
-   HYPRE_Int       *A_diag_i   = hypre_CSRMatrixI(A_diag);
-   HYPRE_Int       *A_diag_j   = hypre_CSRMatrixJ(A_diag);
-   HYPRE_Complex   *A_diag_a   = hypre_CSRMatrixData(A_diag);
-   HYPRE_Int        A_diag_nnz = hypre_CSRMatrixNumNonzeros(A_diag);
-   hypre_CSRMatrix *A_offd     = hypre_ParCSRMatrixOffd(A);
-   HYPRE_Int       *A_offd_i   = hypre_CSRMatrixI(A_offd);
-   HYPRE_Int       *A_offd_j   = hypre_CSRMatrixJ(A_offd);
-   HYPRE_Complex   *A_offd_a   = hypre_CSRMatrixData(A_offd);
-   HYPRE_Int        A_offd_nnz = hypre_CSRMatrixNumNonzeros(A_offd);
-
-   hypre_CSRMatrix *B;
-   HYPRE_Int        B_nrows = hypre_CSRMatrixNumRows(A_diag);
-   HYPRE_Int        B_ncols = hypre_CSRMatrixNumCols(A_diag) + hypre_CSRMatrixNumCols(A_offd);
-   HYPRE_Int        B_nnz   = A_diag_nnz + A_offd_nnz;
-   HYPRE_Int       *B_ii = hypre_TAlloc(HYPRE_Int,     B_nnz, HYPRE_MEMORY_DEVICE);
-   HYPRE_Int       *B_j  = hypre_TAlloc(HYPRE_Int,     B_nnz, HYPRE_MEMORY_DEVICE);
-   HYPRE_Complex   *B_a  = hypre_TAlloc(HYPRE_Complex, B_nnz, HYPRE_MEMORY_DEVICE);
+   HYPRE_Int      i, j;
+   HYPRE_Int      num_sends, num_rows_send, num_nnz_send, num_recvs, num_rows_recv, num_nnz_recv;
+   HYPRE_Int     *d_send_i, *send_i, *d_send_map, *d_recv_i, *recv_i;
+   HYPRE_BigInt  *d_send_j, *d_recv_j;
+   HYPRE_Int     *send_jstarts, *recv_jstarts;
+   HYPRE_Complex *d_send_a = NULL, *d_recv_a = NULL;
+   hypre_ParCSRCommPkg     *comm_pkg_j = NULL;
+   hypre_ParCSRCommHandle  *comm_handle, *comm_handle_j, *comm_handle_a;
+   /* HYPRE_Int global_num_rows = hypre_ParCSRMatrixGlobalNumRows(A); */
+   /* diag part of A */
+   hypre_CSRMatrix *A_diag   = hypre_ParCSRMatrixDiag(A);
+   HYPRE_Complex   *A_diag_a = hypre_CSRMatrixData(A_diag);
+   HYPRE_Int       *A_diag_i = hypre_CSRMatrixI(A_diag);
+   HYPRE_Int       *A_diag_j = hypre_CSRMatrixJ(A_diag);
+   /* HYPRE_Int local_num_rows  = hypre_CSRMatrixNumRows(A_diag); */
+   /* off-diag part of A */
+   hypre_CSRMatrix *A_offd   = hypre_ParCSRMatrixOffd(A);
+   HYPRE_Complex   *A_offd_a = hypre_CSRMatrixData(A_offd);
+   HYPRE_Int       *A_offd_i = hypre_CSRMatrixI(A_offd);
+   HYPRE_Int       *A_offd_j = hypre_CSRMatrixJ(A_offd);
 
-   // Adiag
-   HYPRE_Int *A_diag_ii = hypreDevice_CsrRowPtrsToIndices(B_nrows, A_diag_nnz, A_diag_i);
-   HYPRE_THRUST_CALL( copy_n,
-                      thrust::make_zip_iterator(thrust::make_tuple(A_diag_ii, A_diag_j, A_diag_a)),
-                      A_diag_nnz,
-                      thrust::make_zip_iterator(thrust::make_tuple(B_ii, B_j, B_a)) );
-   hypre_TFree(A_diag_ii, HYPRE_MEMORY_DEVICE);
+   /* HYPRE_Int       *row_starts      = hypre_ParCSRMatrixRowStarts(A); */
+   /* HYPRE_Int        first_row       = hypre_ParCSRMatrixFirstRowIndex(A); */
+   HYPRE_BigInt     first_col        = hypre_ParCSRMatrixFirstColDiag(A);
+   HYPRE_BigInt    *col_map_offd_A   = hypre_ParCSRMatrixColMapOffd(A);
+   HYPRE_Int        num_cols_A_offd  = hypre_CSRMatrixNumCols(A_offd);
+   HYPRE_BigInt    *d_col_map_offd_A = hypre_ParCSRMatrixDeviceColMapOffd(A);
 
-   // Aoffd
-   HYPRE_Int *A_offd_ii = hypreDevice_CsrRowPtrsToIndices(B_nrows, A_offd_nnz, A_offd_i);
-   HYPRE_THRUST_CALL( copy_n,
-                      thrust::make_zip_iterator(thrust::make_tuple(A_offd_ii, A_offd_a)),
-                      A_offd_nnz,
-                      thrust::make_zip_iterator(thrust::make_tuple(B_ii, B_a)) + A_diag_nnz );
-   hypre_TFree(A_offd_ii, HYPRE_MEMORY_DEVICE);
+   MPI_Comm         comm  = hypre_ParCSRMatrixComm(A);
 
-   HYPRE_THRUST_CALL( transform,
-                      A_offd_j,
-                      A_offd_j + A_offd_nnz,
-                      thrust::make_constant_iterator(hypre_CSRMatrixNumCols(A_diag)),
-                      B_j + A_diag_nnz,
-                      thrust::plus<HYPRE_Int>() );
+   HYPRE_Int        num_procs;
+   HYPRE_Int        my_id;
+   void           **vrequest;
 
-   // B
-   HYPRE_THRUST_CALL( stable_sort_by_key,
-                      B_ii,
-                      B_ii + B_nnz,
-                      thrust::make_zip_iterator(thrust::make_tuple(B_j, B_a)) );
+   hypre_CSRMatrix *A_ext;
 
-   HYPRE_Int *B_i = hypreDevice_CsrRowIndicesToPtrs(B_nrows, B_nnz, B_ii);
-   hypre_TFree(B_ii, HYPRE_MEMORY_DEVICE);
+   hypre_MPI_Comm_size(comm, &num_procs);
+   hypre_MPI_Comm_rank(comm, &my_id);
 
-   B = hypre_CSRMatrixCreate(B_nrows, B_ncols, B_nnz);
-   hypre_CSRMatrixI(B) = B_i;
-   hypre_CSRMatrixJ(B) = B_j;
-   hypre_CSRMatrixData(B) = B_a;
-   hypre_CSRMatrixMemoryLocation(B) = HYPRE_MEMORY_DEVICE;
+   /* number of sends (#procs) */
+   num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
+   /* number of rows to send */
+   num_rows_send = hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends);
+   /* number of recvs (#procs) */
+   num_recvs = hypre_ParCSRCommPkgNumRecvs(comm_pkg);
+   /* number of rows to recv */
+   num_rows_recv = hypre_ParCSRCommPkgRecvVecStart(comm_pkg, num_recvs);
 
-   return B;
-}
-#endif
+   /* must be true if indices contains proper offd indices */
+   hypre_assert(indices_len == num_rows_recv);
 
-/* return B = [Adiag, Aoffd; E] */
-#if 1
-HYPRE_Int
-hypre_ConcatDiagOffdAndExtDevice(hypre_ParCSRMatrix *A,
-                                 hypre_CSRMatrix    *E,
-                                 hypre_CSRMatrix   **B_ptr,
-                                 HYPRE_Int          *num_cols_offd_ptr,
-                                 HYPRE_BigInt      **cols_map_offd_ptr)
-{
-   hypre_CSRMatrix *A_diag = hypre_ParCSRMatrixDiag(A);
-   hypre_CSRMatrix *A_offd = hypre_ParCSRMatrixOffd(A);
-   hypre_CSRMatrix *E_diag, *E_offd, *B;
-   HYPRE_Int       *cols_offd_map, num_cols_offd;
-   HYPRE_BigInt    *cols_map_offd;
+   /* send_i/recv_i:
+    * the arrays to send and recv: we first send and recv the row lengths */
+   d_send_i   = hypre_TAlloc(HYPRE_Int, num_rows_send + 1, HYPRE_MEMORY_DEVICE);
+   d_send_map = hypre_TAlloc(HYPRE_Int, num_rows_send,     HYPRE_MEMORY_DEVICE);
+   send_i     = hypre_TAlloc(HYPRE_Int, num_rows_send,     HYPRE_MEMORY_HOST);
+   recv_i     = hypre_TAlloc(HYPRE_Int, num_rows_recv + 1, HYPRE_MEMORY_HOST);
+   d_recv_i   = hypre_TAlloc(HYPRE_Int, num_rows_recv + 1, HYPRE_MEMORY_DEVICE);
 
-   hypre_CSRMatrixSplitDevice(E, hypre_ParCSRMatrixFirstColDiag(A), hypre_ParCSRMatrixLastColDiag(A),
-                              hypre_CSRMatrixNumCols(A_offd), hypre_ParCSRMatrixDeviceColMapOffd(A),
-                              &cols_offd_map, &num_cols_offd, &cols_map_offd, &E_diag, &E_offd);
+   /* fill the send array with row lengths */
+   hypre_TMemcpy(d_send_map, hypre_ParCSRCommPkgSendMapElmts(comm_pkg), HYPRE_Int,
+                 num_rows_send, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
 
-   B = hypre_CSRMatrixCreate(hypre_ParCSRMatrixNumRows(A) + hypre_CSRMatrixNumRows(E),
-                             hypre_ParCSRMatrixNumCols(A) + num_cols_offd,
-                             hypre_CSRMatrixNumNonzeros(A_diag) + hypre_CSRMatrixNumNonzeros(A_offd) + hypre_CSRMatrixNumNonzeros(E));
-   hypre_CSRMatrixInitialize_v2(B, 0, HYPRE_MEMORY_DEVICE);
+   hypre_Memset(d_send_i, 0, sizeof(HYPRE_Int), HYPRE_MEMORY_DEVICE);
+   hypreDevice_GetRowNnz(num_rows_send, d_send_map, A_diag_i, A_offd_i, d_send_i + 1);
 
-   hypreDevice_GetRowNnz(hypre_ParCSRMatrixNumRows(A), NULL, hypre_CSRMatrixI(A_diag), hypre_CSRMatrixI(A_offd), hypre_CSRMatrixI(B));
-   HYPRE_THRUST_CALL( exclusive_scan,
-                      hypre_CSRMatrixI(B),
-                      hypre_CSRMatrixI(B) + hypre_ParCSRMatrixNumRows(A) + 1,
-                      hypre_CSRMatrixI(B) );
-
-   dim3 bDim = hypre_GetDefaultCUDABlockDimension();
-   dim3 gDim = hypre_GetDefaultCUDAGridDimension(hypre_ParCSRMatrixNumRows(A), "warp", bDim);
-
-   HYPRE_CUDA_LAUNCH( hypreCUDAKernel_ConcatDiagAndOffd,
-                      gDim, bDim,
-                      hypre_CSRMatrixNumRows(A_diag),
-                      hypre_CSRMatrixNumCols(A_diag),
-                      hypre_CSRMatrixI(A_diag),
-                      hypre_CSRMatrixJ(A_diag),
-                      hypre_CSRMatrixData(A_diag),
-                      hypre_CSRMatrixI(A_offd),
-                      hypre_CSRMatrixJ(A_offd),
-                      hypre_CSRMatrixData(A_offd),
-                      cols_offd_map,
-                      hypre_CSRMatrixI(B),
-                      hypre_CSRMatrixJ(B),
-                      hypre_CSRMatrixData(B) );
+   /* send array send_i out: deviceTohost first and MPI (async)
+    * note the shift in recv_i by one */
+   hypre_TMemcpy(send_i, d_send_i + 1, HYPRE_Int, num_rows_send, HYPRE_MEMORY_HOST,
+                 HYPRE_MEMORY_DEVICE);
 
-   hypre_TFree(cols_offd_map, HYPRE_MEMORY_DEVICE);
+   comm_handle = hypre_ParCSRCommHandleCreate(11, comm_pkg, send_i, recv_i + 1);
 
-   hypre_TMemcpy(hypre_CSRMatrixI(B) + hypre_ParCSRMatrixNumRows(A) + 1, hypre_CSRMatrixI(E) + 1, HYPRE_Int, hypre_CSRMatrixNumRows(E),
-                 HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
-   HYPRE_THRUST_CALL( transform,
-                      hypre_CSRMatrixI(B) + hypre_ParCSRMatrixNumRows(A) + 1,
-                      hypre_CSRMatrixI(B) + hypre_ParCSRMatrixNumRows(A) + hypre_CSRMatrixNumRows(E) + 1,
-                      thrust::make_constant_iterator(hypre_CSRMatrixNumNonzeros(A_diag) + hypre_CSRMatrixNumNonzeros(A_offd)),
-                      hypre_CSRMatrixI(B) + hypre_ParCSRMatrixNumRows(A) + 1,
-                      thrust::plus<HYPRE_Int>() );
+   hypreDevice_IntegerInclusiveScan(num_rows_send + 1, d_send_i);
 
-   gDim = hypre_GetDefaultCUDAGridDimension(hypre_CSRMatrixNumRows(E), "warp", bDim);
+   /* total number of nnz to send */
+   hypre_TMemcpy(&num_nnz_send, d_send_i + num_rows_send, HYPRE_Int, 1, HYPRE_MEMORY_HOST,
+                 HYPRE_MEMORY_DEVICE);
 
-   hypre_assert(hypre_CSRMatrixNumCols(E_diag) == hypre_CSRMatrixNumCols(A_diag));
+   /* prepare data to send out. overlap with the above commmunication */
+   d_send_j = hypre_TAlloc(HYPRE_BigInt, num_nnz_send, HYPRE_MEMORY_DEVICE);
+   if (want_data)
+   {
+      d_send_a = hypre_TAlloc(HYPRE_Complex, num_nnz_send, HYPRE_MEMORY_DEVICE);
+   }
 
-   HYPRE_CUDA_LAUNCH( hypreCUDAKernel_ConcatDiagAndOffd,
-                      gDim, bDim,
-                      hypre_CSRMatrixNumRows(E_diag),
-                      hypre_CSRMatrixNumCols(E_diag),
-                      hypre_CSRMatrixI(E_diag),
-                      hypre_CSRMatrixJ(E_diag),
-                      hypre_CSRMatrixData(E_diag),
-                      hypre_CSRMatrixI(E_offd),
-                      hypre_CSRMatrixJ(E_offd),
-                      hypre_CSRMatrixData(E_offd),
-                      NULL,
-                      hypre_CSRMatrixI(B) + hypre_ParCSRMatrixNumRows(A),
-                      hypre_CSRMatrixJ(B),
-                      hypre_CSRMatrixData(B) );
+   if (d_col_map_offd_A == NULL)
+   {
+      d_col_map_offd_A = hypre_TAlloc(HYPRE_BigInt, num_cols_A_offd, HYPRE_MEMORY_DEVICE);
+      hypre_TMemcpy(d_col_map_offd_A, col_map_offd_A, HYPRE_BigInt, num_cols_A_offd,
+                    HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
+      hypre_ParCSRMatrixDeviceColMapOffd(A) = d_col_map_offd_A;
+   }
 
-   hypre_CSRMatrixDestroy(E_diag);
-   hypre_CSRMatrixDestroy(E_offd);
+   /* job == 2, d_send_i is input that contains row ptrs (length num_rows_send) */
+   hypreDevice_CopyParCSRRows(num_rows_send, d_send_map, 2, num_procs > 1,
+                              first_col, d_col_map_offd_A,
+                              A_diag_i, A_diag_j, A_diag_a,
+                              A_offd_i, A_offd_j, A_offd_a,
+                              d_send_i, d_send_j, d_send_a);
 
-   *B_ptr = B;
-   *num_cols_offd_ptr = num_cols_offd;
-   *cols_map_offd_ptr = cols_map_offd;
+   /* pointers to each proc in send_j */
+   send_jstarts = hypre_TAlloc(HYPRE_Int, num_sends + 1, HYPRE_MEMORY_HOST);
+   send_jstarts[0] = 0;
+   for (i = 1; i <= num_sends; i++)
+   {
+      send_jstarts[i] = send_jstarts[i - 1];
+      for ( j = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i - 1);
+            j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
+            j++ )
+      {
+         send_jstarts[i] += send_i[j];
+      }
+   }
+   hypre_assert(send_jstarts[num_sends] == num_nnz_send);
 
-   return hypre_error_flag;
-}
-#else
-HYPRE_Int
-hypre_ConcatDiagOffdAndExtDevice(hypre_ParCSRMatrix *A,
-                                 hypre_CSRMatrix    *E,
-                                 hypre_CSRMatrix   **B_ptr,
-                                 HYPRE_Int          *num_cols_offd_ptr,
-                                 HYPRE_BigInt      **cols_map_offd_ptr)
-{
-   hypre_CSRMatrix *A_diag          = hypre_ParCSRMatrixDiag(A);
-   HYPRE_Int        A_nrows         = hypre_CSRMatrixNumRows(A_diag);
-   HYPRE_Int        A_ncols         = hypre_CSRMatrixNumCols(A_diag);
-   HYPRE_Int       *A_diag_i        = hypre_CSRMatrixI(A_diag);
-   HYPRE_Int       *A_diag_j        = hypre_CSRMatrixJ(A_diag);
-   HYPRE_Complex   *A_diag_a        = hypre_CSRMatrixData(A_diag);
-   HYPRE_Int        A_diag_nnz      = hypre_CSRMatrixNumNonzeros(A_diag);
-   hypre_CSRMatrix *A_offd          = hypre_ParCSRMatrixOffd(A);
-   HYPRE_Int       *A_offd_i        = hypre_CSRMatrixI(A_offd);
-   HYPRE_Int       *A_offd_j        = hypre_CSRMatrixJ(A_offd);
-   HYPRE_Complex   *A_offd_a        = hypre_CSRMatrixData(A_offd);
-   HYPRE_Int        A_offd_nnz      = hypre_CSRMatrixNumNonzeros(A_offd);
-   HYPRE_BigInt     first_col_A     = hypre_ParCSRMatrixFirstColDiag(A);
-   HYPRE_BigInt     last_col_A      = hypre_ParCSRMatrixLastColDiag(A);
-   HYPRE_Int        num_cols_offd_A = hypre_CSRMatrixNumCols(A_offd);
-   HYPRE_BigInt    *col_map_offd_A  = hypre_ParCSRMatrixDeviceColMapOffd(A);
+   /* finish the above communication: send_i/recv_i */
+   hypre_ParCSRCommHandleDestroy(comm_handle);
 
-   HYPRE_Int       *E_i     = hypre_CSRMatrixI(E);
-   HYPRE_BigInt    *E_bigj  = hypre_CSRMatrixBigJ(E);
-   HYPRE_Complex   *E_a     = hypre_CSRMatrixData(E);
-   HYPRE_Int        E_nrows = hypre_CSRMatrixNumRows(E);
-   HYPRE_Int        E_nnz   = hypre_CSRMatrixNumNonzeros(E);
-   HYPRE_Int        E_diag_nnz, E_offd_nnz;
+   /* adjust recv_i to ptrs */
+   recv_i[0] = 0;
+   for (i = 1; i <= num_rows_recv; i++)
+   {
+      recv_i[i] += recv_i[i - 1];
+   }
+   num_nnz_recv = recv_i[num_rows_recv];
 
-   hypre_CSRMatrix *B;
-   HYPRE_Int        B_nnz   = A_diag_nnz + A_offd_nnz + E_nnz;
-   HYPRE_Int       *B_ii    = hypre_TAlloc(HYPRE_Int,     B_nnz, HYPRE_MEMORY_DEVICE);
-   HYPRE_Int       *B_j     = hypre_TAlloc(HYPRE_Int,     B_nnz, HYPRE_MEMORY_DEVICE);
-   HYPRE_Complex   *B_a     = hypre_TAlloc(HYPRE_Complex, B_nnz, HYPRE_MEMORY_DEVICE);
+   /* allocate device memory for j and a */
+   d_recv_j = hypre_TAlloc(HYPRE_BigInt, num_nnz_recv, HYPRE_MEMORY_DEVICE);
+   if (want_data)
+   {
+      d_recv_a = hypre_TAlloc(HYPRE_Complex, num_nnz_recv, HYPRE_MEMORY_DEVICE);
+   }
 
-   // E
-   hypre_CSRMatrixSplitDevice_core(0, E_nrows, E_nnz, NULL, E_bigj, NULL, NULL, first_col_A, last_col_A, num_cols_offd_A,
-                                   NULL, NULL, NULL, NULL, &E_diag_nnz, NULL, NULL, NULL, NULL, &E_offd_nnz,
-                                   NULL, NULL, NULL, NULL);
+   recv_jstarts = hypre_TAlloc(HYPRE_Int, num_recvs + 1, HYPRE_MEMORY_HOST);
+   recv_jstarts[0] = 0;
+   for (i = 1; i <= num_recvs; i++)
+   {
+      j = hypre_ParCSRCommPkgRecvVecStart(comm_pkg, i);
+      recv_jstarts[i] = recv_i[j];
+   }
 
-   HYPRE_Int    *cols_offd_map, num_cols_offd;
-   HYPRE_BigInt *cols_map_offd;
-   HYPRE_Int *E_ii = hypreDevice_CsrRowPtrsToIndices(E_nrows, E_nnz, E_i);
+   /* ready to send and recv: create a communication package for data */
+   hypre_ParCSRCommPkgCreateAndFill(comm,
+                                    num_recvs,
+                                    hypre_ParCSRCommPkgRecvProcs(comm_pkg),
+                                    recv_jstarts,
+                                    num_sends,
+                                    hypre_ParCSRCommPkgSendProcs(comm_pkg),
+                                    send_jstarts,
+                                    NULL,
+                                    &comm_pkg_j);
+
+   /* RL: make sure d_send_j/d_send_a is ready before issuing GPU-GPU MPI */
+   if (hypre_GetGpuAwareMPI())
+   {
+      hypre_ForceSyncComputeStream();
+   }
 
-   hypre_CSRMatrixSplitDevice_core(1,
-                                   E_nrows, E_nnz, E_ii, E_bigj, E_a, NULL,
-                                   first_col_A, last_col_A, num_cols_offd_A, col_map_offd_A,
-                                   &cols_offd_map, &num_cols_offd, &cols_map_offd,
-                                   &E_diag_nnz,
-                                   B_ii + A_diag_nnz + A_offd_nnz,
-                                   B_j  + A_diag_nnz + A_offd_nnz,
-                                   B_a  + A_diag_nnz + A_offd_nnz,
-                                   NULL,
-                                   &E_offd_nnz,
-                                   B_ii + A_diag_nnz + A_offd_nnz + E_diag_nnz,
-                                   B_j  + A_diag_nnz + A_offd_nnz + E_diag_nnz,
-                                   B_a  + A_diag_nnz + A_offd_nnz + E_diag_nnz,
-                                   NULL);
-   hypre_TFree(E_ii, HYPRE_MEMORY_DEVICE);
+   /* init communication */
+   /* ja */
+   comm_handle_j = hypre_ParCSRCommHandleCreate_v2(21, comm_pkg_j,
+                                                   HYPRE_MEMORY_DEVICE, d_send_j,
+                                                   HYPRE_MEMORY_DEVICE, d_recv_j);
+   if (want_data)
+   {
+      /* a */
+      comm_handle_a = hypre_ParCSRCommHandleCreate_v2(1, comm_pkg_j,
+                                                      HYPRE_MEMORY_DEVICE, d_send_a,
+                                                      HYPRE_MEMORY_DEVICE, d_recv_a);
+   }
+   else
+   {
+      comm_handle_a = NULL;
+   }
 
-   HYPRE_THRUST_CALL( transform,
-                      B_ii + A_diag_nnz + A_offd_nnz,
-                      B_ii + B_nnz,
-                      thrust::make_constant_iterator(A_nrows),
-                      B_ii + A_diag_nnz + A_offd_nnz,
-                      thrust::plus<HYPRE_Int>() );
+   hypre_TMemcpy(d_recv_i, recv_i, HYPRE_Int, num_rows_recv + 1, HYPRE_MEMORY_DEVICE,
+                 HYPRE_MEMORY_HOST);
 
-   // Adiag
-   HYPRE_Int *A_diag_ii = hypreDevice_CsrRowPtrsToIndices(A_nrows, A_diag_nnz, A_diag_i);
-   HYPRE_THRUST_CALL( copy_n,
-                      thrust::make_zip_iterator(thrust::make_tuple(A_diag_ii, A_diag_j, A_diag_a)),
-                      A_diag_nnz,
-                      thrust::make_zip_iterator(thrust::make_tuple(B_ii, B_j, B_a)) );
-   hypre_TFree(A_diag_ii, HYPRE_MEMORY_DEVICE);
+   /* create A_ext: on device */
+   A_ext = hypre_CSRMatrixCreate(num_rows_recv, hypre_ParCSRMatrixGlobalNumCols(A), num_nnz_recv);
+   hypre_CSRMatrixI   (A_ext) = d_recv_i;
+   hypre_CSRMatrixBigJ(A_ext) = d_recv_j;
+   hypre_CSRMatrixData(A_ext) = d_recv_a;
+   hypre_CSRMatrixMemoryLocation(A_ext) = HYPRE_MEMORY_DEVICE;
 
-   // Aoffd
-   HYPRE_Int *A_offd_ii = hypreDevice_CsrRowPtrsToIndices(A_nrows, A_offd_nnz, A_offd_i);
-   HYPRE_THRUST_CALL( copy_n,
-                      thrust::make_zip_iterator(thrust::make_tuple(A_offd_ii, A_offd_a)),
-                      A_offd_nnz,
-                      thrust::make_zip_iterator(thrust::make_tuple(B_ii, B_a)) + A_diag_nnz );
-   hypre_TFree(A_offd_ii, HYPRE_MEMORY_DEVICE);
+   /* output */
+   vrequest = hypre_TAlloc(void *, 3, HYPRE_MEMORY_HOST);
+   vrequest[0] = (void *) comm_handle_j;
+   vrequest[1] = (void *) comm_handle_a;
+   vrequest[2] = (void *) A_ext;
 
-   HYPRE_THRUST_CALL( gather,
-                      A_offd_j,
-                      A_offd_j + A_offd_nnz,
-                      cols_offd_map,
-                      B_j + A_diag_nnz);
+   *request_ptr = (void *) vrequest;
 
-   hypre_TFree(cols_offd_map, HYPRE_MEMORY_DEVICE);
+   /* free */
+   hypre_TFree(send_i,     HYPRE_MEMORY_HOST);
+   hypre_TFree(recv_i,     HYPRE_MEMORY_HOST);
+   hypre_TFree(d_send_i,   HYPRE_MEMORY_DEVICE);
+   hypre_TFree(d_send_map, HYPRE_MEMORY_DEVICE);
 
-   HYPRE_THRUST_CALL( transform,
-                      B_j + A_diag_nnz,
-                      B_j + A_diag_nnz + A_offd_nnz,
-                      thrust::make_constant_iterator(A_ncols),
-                      B_j + A_diag_nnz,
-                      thrust::plus<HYPRE_Int>() );
+   hypre_TFree(hypre_ParCSRCommPkgSendMapStarts(comm_pkg_j), HYPRE_MEMORY_HOST);
+   hypre_TFree(hypre_ParCSRCommPkgRecvVecStarts(comm_pkg_j), HYPRE_MEMORY_HOST);
+   hypre_TFree(comm_pkg_j, HYPRE_MEMORY_HOST);
 
-   HYPRE_THRUST_CALL( transform,
-                      B_j + A_diag_nnz + A_offd_nnz + E_diag_nnz,
-                      B_j + B_nnz,
-                      thrust::make_constant_iterator(A_ncols),
-                      B_j + A_diag_nnz + A_offd_nnz + E_diag_nnz,
-                      thrust::plus<HYPRE_Int>() );
+   return hypre_error_flag;
+}
 
-   // B
-   HYPRE_THRUST_CALL( stable_sort_by_key,
-                      B_ii,
-                      B_ii + B_nnz,
-                      thrust::make_zip_iterator(thrust::make_tuple(B_j, B_a)) );
+hypre_CSRMatrix*
+hypre_ParcsrGetExternalRowsDeviceWait(void *vrequest)
+{
+   void **request = (void **) vrequest;
 
-   HYPRE_Int *B_i = hypreDevice_CsrRowIndicesToPtrs(A_nrows + E_nrows, B_nnz, B_ii);
-   hypre_TFree(B_ii, HYPRE_MEMORY_DEVICE);
+   hypre_ParCSRCommHandle *comm_handle_j = (hypre_ParCSRCommHandle *) request[0];
+   hypre_ParCSRCommHandle *comm_handle_a = (hypre_ParCSRCommHandle *) request[1];
+   hypre_CSRMatrix        *A_ext         = (hypre_CSRMatrix *)        request[2];
+   HYPRE_BigInt           *send_j        = comm_handle_j ? (HYPRE_BigInt *)
+                                           hypre_ParCSRCommHandleSendData(comm_handle_j) : NULL;
+   HYPRE_Complex          *send_a        = comm_handle_a ? (HYPRE_Complex *)
+                                           hypre_ParCSRCommHandleSendData(comm_handle_a) : NULL;
 
-   B = hypre_CSRMatrixCreate(A_nrows + E_nrows, A_ncols + num_cols_offd, B_nnz);
-   hypre_CSRMatrixI(B) = B_i;
-   hypre_CSRMatrixJ(B) = B_j;
-   hypre_CSRMatrixData(B) = B_a;
-   hypre_CSRMatrixMemoryLocation(B) = HYPRE_MEMORY_DEVICE;
+   hypre_ParCSRCommHandleDestroy(comm_handle_j);
+   hypre_ParCSRCommHandleDestroy(comm_handle_a);
 
-   *B_ptr = B;
-   *num_cols_offd_ptr = num_cols_offd;
-   *cols_map_offd_ptr = cols_map_offd;
+   hypre_TFree(send_j, HYPRE_MEMORY_DEVICE);
+   hypre_TFree(send_a, HYPRE_MEMORY_DEVICE);
 
-   return hypre_error_flag;
+   hypre_TFree(request, HYPRE_MEMORY_HOST);
+
+   return A_ext;
 }
-#endif
 
 HYPRE_Int
-hypre_ParCSRMatrixGetRowDevice( hypre_ParCSRMatrix  *mat,
-                                HYPRE_BigInt         row,
-                                HYPRE_Int           *size,
-                                HYPRE_BigInt       **col_ind,
-                                HYPRE_Complex      **values )
+hypre_ParCSRCommPkgCreateMatrixE( hypre_ParCSRCommPkg  *comm_pkg,
+                                  HYPRE_Int             num_cols )
 {
-   HYPRE_Int nrows, local_row;
-   HYPRE_BigInt row_start, row_end;
-   hypre_CSRMatrix *Aa;
-   hypre_CSRMatrix *Ba;
-
-   if (!mat)
+   /* Input variables */
+   HYPRE_Int        num_sends      = hypre_ParCSRCommPkgNumSends(comm_pkg);
+   HYPRE_Int        num_elements   = hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends);
+   HYPRE_Int        num_components = hypre_ParCSRCommPkgNumComponents(comm_pkg);
+   HYPRE_Int       *send_map       = hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg);
+   HYPRE_Int       *send_map_def;
+
+   /* Local variables */
+   hypre_CSRMatrix *matrix_E;
+   HYPRE_Int       *e_i;
+   HYPRE_Int       *e_ii;
+   HYPRE_Int       *e_j;
+   HYPRE_Int       *new_end;
+   HYPRE_Int        nid;
+
+   /* Update number of elements exchanged when communicating multivectors */
+   num_elements /= num_components;
+
+   /* Create matrix_E */
+   matrix_E = hypre_CSRMatrixCreate(num_cols, num_elements, num_elements);
+   hypre_CSRMatrixMemoryLocation(matrix_E) = HYPRE_MEMORY_DEVICE;
+
+   /* Build default (original) send_map_elements array */
+   if (num_components > 1)
    {
-      hypre_error_in_arg(1);
-      return hypre_error_flag;
+      send_map_def = hypre_TAlloc(HYPRE_Int, num_elements, HYPRE_MEMORY_DEVICE);
+      hypreDevice_IntStridedCopy(num_elements, num_components, send_map, send_map_def);
    }
-
-   Aa = (hypre_CSRMatrix *) hypre_ParCSRMatrixDiag(mat);
-   Ba = (hypre_CSRMatrix *) hypre_ParCSRMatrixOffd(mat);
-
-   if (hypre_ParCSRMatrixGetrowactive(mat))
+   else
    {
-      return(-1);
+      send_map_def = send_map;
    }
 
-   hypre_ParCSRMatrixGetrowactive(mat) = 1;
-
-   row_start = hypre_ParCSRMatrixFirstRowIndex(mat);
-   row_end = hypre_ParCSRMatrixLastRowIndex(mat) + 1;
-   nrows = row_end - row_start;
+   /* Allocate arrays */
+   e_ii = hypre_TAlloc(HYPRE_Int, num_elements, HYPRE_MEMORY_DEVICE);
+   e_j  = hypre_TAlloc(HYPRE_Int, num_elements, HYPRE_MEMORY_DEVICE);
 
-   if (row < row_start || row >= row_end)
-   {
-      return(-1);
-   }
+   /* Build e_ii and e_j */
+   hypre_TMemcpy(e_ii, send_map_def, HYPRE_Int, num_elements,
+                 HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+#if defined(HYPRE_USING_SYCL)
+   hypreSycl_sequence(e_j, e_j + num_elements, 0);
+   hypreSycl_stable_sort_by_key(e_ii, e_ii + num_elements, e_j);
+#else
+   HYPRE_THRUST_CALL(sequence, e_j, e_j + num_elements);
+   HYPRE_THRUST_CALL(stable_sort_by_key, e_ii, e_ii + num_elements, e_j);
+#endif
 
-   local_row = row - row_start;
+   /* Construct row pointers from row indices */
+   e_i = hypreDevice_CsrRowIndicesToPtrs(num_cols, num_elements, e_ii);
 
-   /* if buffer is not allocated and some information is requested, allocate buffer with the max row_nnz */
-   if ( !hypre_ParCSRMatrixRowvalues(mat) && (col_ind || values) )
-   {
-      HYPRE_Int max_row_nnz;
-      HYPRE_Int *row_nnz = hypre_TAlloc(HYPRE_Int, nrows, HYPRE_MEMORY_DEVICE);
+   /* Find row indices with nonzero coefficients */
+#if defined(HYPRE_USING_SYCL)
+   new_end = HYPRE_ONEDPL_CALL(std::unique, e_ii, e_ii + num_elements);
+#else
+   new_end = HYPRE_THRUST_CALL(unique, e_ii, e_ii + num_elements);
+#endif
+   nid = new_end - e_ii;
+   e_ii = hypre_TReAlloc_v2(e_ii, HYPRE_Int, num_elements,
+                            HYPRE_Int, nid, HYPRE_MEMORY_DEVICE);
 
-      hypreDevice_GetRowNnz(nrows, NULL, hypre_CSRMatrixI(Aa), hypre_CSRMatrixI(Ba), row_nnz);
+   /* Set matrix_E pointers */
+   hypre_CSRMatrixI(matrix_E) = e_i;
+   hypre_CSRMatrixJ(matrix_E) = e_j;
+   hypre_CSRMatrixNumRownnz(matrix_E) = nid;
+   hypre_CSRMatrixRownnz(matrix_E) = e_ii;
 
-      hypre_TMemcpy(size, row_nnz + local_row, HYPRE_Int, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
+   /* Set matrix_E */
+   hypre_ParCSRCommPkgMatrixE(comm_pkg) = matrix_E;
 
-      max_row_nnz = HYPRE_THRUST_CALL(reduce, row_nnz, row_nnz + nrows, 0, thrust::maximum<HYPRE_Int>());
+   /* Free memory */
+   if (num_components > 1)
+   {
+      hypre_TFree(send_map_def, HYPRE_MEMORY_DEVICE);
+   }
 
-/*
-      HYPRE_Int *max_row_nnz_d = HYPRE_THRUST_CALL(max_element, row_nnz, row_nnz + nrows);
-      hypre_TMemcpy( &max_row_nnz, max_row_nnz_d,
-                     HYPRE_Int, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE );
-*/
+   return hypre_error_flag;
+}
 
-      hypre_TFree(row_nnz, HYPRE_MEMORY_DEVICE);
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixCompressOffdMapDevice
+ *--------------------------------------------------------------------------*/
 
-      hypre_ParCSRMatrixRowvalues(mat)  =
-         (HYPRE_Complex *) hypre_TAlloc(HYPRE_Complex, max_row_nnz, hypre_ParCSRMatrixMemoryLocation(mat));
-      hypre_ParCSRMatrixRowindices(mat) =
-         (HYPRE_BigInt *)  hypre_TAlloc(HYPRE_BigInt,  max_row_nnz, hypre_ParCSRMatrixMemoryLocation(mat));
-   }
-   else
-   {
-      HYPRE_Int *size_d = hypre_TAlloc(HYPRE_Int, 1, HYPRE_MEMORY_DEVICE);
-      hypreDevice_GetRowNnz(1, NULL, hypre_CSRMatrixI(Aa) + local_row, hypre_CSRMatrixI(Ba) + local_row, size_d);
-      hypre_TMemcpy(size, size_d, HYPRE_Int, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
-      hypre_TFree(size_d, HYPRE_MEMORY_DEVICE);
-   }
+HYPRE_Int
+hypre_ParCSRMatrixCompressOffdMapDevice(hypre_ParCSRMatrix *A)
+{
+   hypre_GpuProfilingPushRange("CompressOffdMap");
+   hypre_ParCSRMatrixCopyColMapOffdToDevice(A);
 
-   if (col_ind || values)
-   {
-      if (hypre_ParCSRMatrixDeviceColMapOffd(mat) == NULL)
-      {
-         hypre_ParCSRMatrixDeviceColMapOffd(mat) =
-            hypre_TAlloc(HYPRE_BigInt, hypre_CSRMatrixNumCols(Ba), HYPRE_MEMORY_DEVICE);
+   hypre_CSRMatrix *A_offd          = hypre_ParCSRMatrixOffd(A);
+   HYPRE_Int        num_cols_A_offd = hypre_CSRMatrixNumCols(A_offd);
+   HYPRE_BigInt    *col_map_offd_A  = hypre_ParCSRMatrixDeviceColMapOffd(A);
+   HYPRE_BigInt    *col_map_offd_A_new;
+   HYPRE_Int        num_cols_A_offd_new;
 
-         hypre_TMemcpy( hypre_ParCSRMatrixDeviceColMapOffd(mat),
-                        hypre_ParCSRMatrixColMapOffd(mat),
-                        HYPRE_BigInt,
-                        hypre_CSRMatrixNumCols(Ba),
-                        HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST );
-      }
+   hypre_CSRMatrixCompressColumnsDevice(A_offd, col_map_offd_A, NULL, &col_map_offd_A_new);
 
-      hypreDevice_CopyParCSRRows( 1, NULL, -1, Ba != NULL,
-                                  hypre_ParCSRMatrixFirstColDiag(mat),
-                                  hypre_ParCSRMatrixDeviceColMapOffd(mat),
-                                  hypre_CSRMatrixI(Aa) + local_row,
-                                  hypre_CSRMatrixJ(Aa),
-                                  hypre_CSRMatrixData(Aa),
-                                  hypre_CSRMatrixI(Ba) + local_row,
-                                  hypre_CSRMatrixJ(Ba),
-                                  hypre_CSRMatrixData(Ba),
-                                  NULL,
-                                  hypre_ParCSRMatrixRowindices(mat),
-                                  hypre_ParCSRMatrixRowvalues(mat) );
-   }
+   num_cols_A_offd_new = hypre_CSRMatrixNumCols(A_offd);
 
-   if (col_ind)
+   if (num_cols_A_offd_new < num_cols_A_offd)
    {
-      *col_ind = hypre_ParCSRMatrixRowindices(mat);
-   }
+      hypre_TFree(col_map_offd_A, HYPRE_MEMORY_DEVICE);
+      hypre_ParCSRMatrixDeviceColMapOffd(A) = col_map_offd_A_new;
 
-   if (values)
-   {
-      *values = hypre_ParCSRMatrixRowvalues(mat);
+      hypre_ParCSRMatrixColMapOffd(A) = hypre_TReAlloc(hypre_ParCSRMatrixColMapOffd(A),
+                                                       HYPRE_BigInt, num_cols_A_offd_new,
+                                                       HYPRE_MEMORY_HOST);
+
+      hypre_TMemcpy(hypre_ParCSRMatrixColMapOffd(A),
+                    hypre_ParCSRMatrixDeviceColMapOffd(A),
+                    HYPRE_BigInt, num_cols_A_offd_new,
+                    HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
    }
 
-   hypre_SyncCudaComputeStream(hypre_handle());
+   hypre_GpuProfilingPopRange();
 
    return hypre_error_flag;
 }
@@ -1046,7 +1052,8 @@ hypre_ParCSRMatrixGetRowDevice( hypre_ParCSRMatrix  *mat,
  */
 template<HYPRE_Int type>
 __global__ void
-hypre_ParCSRMatrixDropSmallEntriesDevice_getElmtTols( HYPRE_Int      nrows,
+hypre_ParCSRMatrixDropSmallEntriesDevice_getElmtTols( hypre_DeviceItem &item,
+                                                      HYPRE_Int      nrows,
                                                       HYPRE_Real     tol,
                                                       HYPRE_Int     *A_diag_i,
                                                       HYPRE_Int     *A_diag_j,
@@ -1056,23 +1063,23 @@ hypre_ParCSRMatrixDropSmallEntriesDevice_getElmtTols( HYPRE_Int      nrows,
                                                       HYPRE_Real     *elmt_tols_diag,
                                                       HYPRE_Real     *elmt_tols_offd)
 {
-   HYPRE_Int row_i = hypre_cuda_get_grid_warp_id<1,1>();
+   HYPRE_Int row_i = hypre_gpu_get_grid_warp_id<1, 1>(item);
 
    if (row_i >= nrows)
    {
       return;
    }
 
-   HYPRE_Int lane = hypre_cuda_get_lane_id<1>();
-   HYPRE_Int p_diag, p_offd, q_diag, q_offd;
+   HYPRE_Int lane = hypre_gpu_get_lane_id<1>(item);
+   HYPRE_Int p_diag = 0, p_offd = 0, q_diag, q_offd;
 
    /* sum row norm over diag part */
    if (lane < 2)
    {
       p_diag = read_only_load(A_diag_i + row_i + lane);
    }
-   q_diag = __shfl_sync(HYPRE_WARP_FULL_MASK, p_diag, 1);
-   p_diag = __shfl_sync(HYPRE_WARP_FULL_MASK, p_diag, 0);
+   q_diag = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_diag, 1);
+   p_diag = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_diag, 0);
 
    HYPRE_Real row_norm_i = 0.0;
 
@@ -1099,8 +1106,8 @@ hypre_ParCSRMatrixDropSmallEntriesDevice_getElmtTols( HYPRE_Int      nrows,
    {
       p_offd = read_only_load(A_offd_i + row_i + lane);
    }
-   q_offd = __shfl_sync(HYPRE_WARP_FULL_MASK, p_offd, 1);
-   p_offd = __shfl_sync(HYPRE_WARP_FULL_MASK, p_offd, 0);
+   q_offd = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_offd, 1);
+   p_offd = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p_offd, 0);
 
    for (HYPRE_Int j = p_offd + lane; j < q_offd; j += HYPRE_WARP_SIZE)
    {
@@ -1120,164 +1127,323 @@ hypre_ParCSRMatrixDropSmallEntriesDevice_getElmtTols( HYPRE_Int      nrows,
       }
    }
 
-   /* allreduce to get the row norm on all threads */
-   if (type == -1)
-   {
-      row_norm_i = warp_allreduce_max(row_norm_i);
-   }
-   else
-   {
-      row_norm_i = warp_allreduce_sum(row_norm_i);
-   }
-   if (type == 2)
+   /* allreduce to get the row norm on all threads */
+   if (type == -1)
+   {
+      row_norm_i = warp_allreduce_max(item, row_norm_i);
+   }
+   else
+   {
+      row_norm_i = warp_allreduce_sum(item, row_norm_i);
+   }
+   if (type == 2)
+   {
+      row_norm_i = hypre_sqrt(row_norm_i);
+   }
+
+   /* set elmt_tols_diag */
+   for (HYPRE_Int j = p_diag + lane; j < q_diag; j += HYPRE_WARP_SIZE)
+   {
+      HYPRE_Int col = A_diag_j[j];
+
+      /* elmt_tol = 0.0 ensures diagonal will be kept */
+      if (col == row_i)
+      {
+         elmt_tols_diag[j] = 0.0;
+      }
+      else
+      {
+         elmt_tols_diag[j] = tol * row_norm_i;
+      }
+   }
+
+   /* set elmt_tols_offd */
+   for (HYPRE_Int j = p_offd + lane; j < q_offd; j += HYPRE_WARP_SIZE)
+   {
+      elmt_tols_offd[j] = tol * row_norm_i;
+   }
+
+}
+
+/* drop the entries that are not on the diagonal and smaller than:
+ *    type 0: tol
+ *    type 1: tol*(1-norm of row)
+ *    type 2: tol*(2-norm of row)
+ *    type -1: tol*(infinity norm of row) */
+HYPRE_Int
+hypre_ParCSRMatrixDropSmallEntriesDevice( hypre_ParCSRMatrix *A,
+                                          HYPRE_Complex       tol,
+                                          HYPRE_Int           type)
+{
+   hypre_CSRMatrix *A_diag   = hypre_ParCSRMatrixDiag(A);
+   hypre_CSRMatrix *A_offd   = hypre_ParCSRMatrixOffd(A);
+   HYPRE_Int        num_cols_A_offd  = hypre_CSRMatrixNumCols(A_offd);
+   HYPRE_BigInt    *h_col_map_offd_A = hypre_ParCSRMatrixColMapOffd(A);
+   HYPRE_BigInt    *col_map_offd_A = hypre_ParCSRMatrixDeviceColMapOffd(A);
+
+   HYPRE_Real      *elmt_tols_diag = NULL;
+   HYPRE_Real      *elmt_tols_offd = NULL;
+
+   /* Exit if tolerance is zero */
+   if (tol < HYPRE_REAL_MIN)
+   {
+      return hypre_error_flag;
+   }
+
+   hypre_GpuProfilingPushRange("ParCSRMatrixDropSmallEntries");
+
+   if (col_map_offd_A == NULL)
+   {
+      col_map_offd_A = hypre_TAlloc(HYPRE_BigInt, num_cols_A_offd, HYPRE_MEMORY_DEVICE);
+      hypre_TMemcpy(col_map_offd_A, h_col_map_offd_A, HYPRE_BigInt, num_cols_A_offd,
+                    HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
+      hypre_ParCSRMatrixDeviceColMapOffd(A) = col_map_offd_A;
+   }
+
+   /* get elmement-wise tolerances if needed */
+   if (type != 0)
+   {
+      elmt_tols_diag = hypre_TAlloc(HYPRE_Real, hypre_CSRMatrixNumNonzeros(A_diag), HYPRE_MEMORY_DEVICE);
+      elmt_tols_offd = hypre_TAlloc(HYPRE_Real, hypre_CSRMatrixNumNonzeros(A_offd), HYPRE_MEMORY_DEVICE);
+   }
+
+   dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+   dim3 gDim = hypre_GetDefaultDeviceGridDimension(hypre_CSRMatrixNumRows(A_diag), "warp", bDim);
+
+   HYPRE_Int A_diag_nrows = hypre_CSRMatrixNumRows(A_diag);
+   HYPRE_Int *A_diag_i = hypre_CSRMatrixI(A_diag);
+   HYPRE_Int *A_diag_j = hypre_CSRMatrixJ(A_diag);
+   HYPRE_Complex *A_diag_data = hypre_CSRMatrixData(A_diag);
+   HYPRE_Int *A_offd_i = hypre_CSRMatrixI(A_offd);
+   HYPRE_Complex *A_offd_data = hypre_CSRMatrixData(A_offd);
+   if (type == -1)
+   {
+      HYPRE_GPU_LAUNCH( hypre_ParCSRMatrixDropSmallEntriesDevice_getElmtTols < -1 >, gDim, bDim,
+                        A_diag_nrows, tol, A_diag_i,
+                        A_diag_j, A_diag_data, A_offd_i,
+                        A_offd_data, elmt_tols_diag, elmt_tols_offd);
+   }
+   if (type == 1)
+   {
+      HYPRE_GPU_LAUNCH( hypre_ParCSRMatrixDropSmallEntriesDevice_getElmtTols<1>, gDim, bDim,
+                        A_diag_nrows, tol, A_diag_i,
+                        A_diag_j, A_diag_data, A_offd_i,
+                        A_offd_data, elmt_tols_diag, elmt_tols_offd);
+   }
+   if (type == 2)
+   {
+      HYPRE_GPU_LAUNCH( hypre_ParCSRMatrixDropSmallEntriesDevice_getElmtTols<2>, gDim, bDim,
+                        A_diag_nrows, tol, A_diag_i,
+                        A_diag_j, A_diag_data, A_offd_i,
+                        A_offd_data, elmt_tols_diag, elmt_tols_offd);
+   }
+
+   /* drop entries from diag and offd CSR matrices */
+   hypre_CSRMatrixDropSmallEntriesDevice(A_diag, tol, elmt_tols_diag);
+   hypre_CSRMatrixDropSmallEntriesDevice(A_offd, tol, elmt_tols_offd);
+
+   hypre_ParCSRMatrixSetNumNonzeros(A);
+   hypre_ParCSRMatrixDNumNonzeros(A) = (HYPRE_Real) hypre_ParCSRMatrixNumNonzeros(A);
+
+   /* squeeze out zero columns of A_offd */
+   hypre_ParCSRMatrixCompressOffdMapDevice(A);
+
+   if (type != 0)
+   {
+      hypre_TFree(elmt_tols_diag, HYPRE_MEMORY_DEVICE);
+      hypre_TFree(elmt_tols_offd, HYPRE_MEMORY_DEVICE);
+   }
+
+   hypre_GpuProfilingPopRange();
+
+   return hypre_error_flag;
+}
+
+hypre_CSRMatrix*
+hypre_MergeDiagAndOffdDevice(hypre_ParCSRMatrix *A)
+{
+   MPI_Comm         comm     = hypre_ParCSRMatrixComm(A);
+   hypre_CSRMatrix *A_diag   = hypre_ParCSRMatrixDiag(A);
+   HYPRE_Complex   *A_diag_a = hypre_CSRMatrixData(A_diag);
+   HYPRE_Int       *A_diag_i = hypre_CSRMatrixI(A_diag);
+   HYPRE_Int       *A_diag_j = hypre_CSRMatrixJ(A_diag);
+   hypre_CSRMatrix *A_offd   = hypre_ParCSRMatrixOffd(A);
+   HYPRE_Complex   *A_offd_a = hypre_CSRMatrixData(A_offd);
+   HYPRE_Int       *A_offd_i = hypre_CSRMatrixI(A_offd);
+   HYPRE_Int       *A_offd_j = hypre_CSRMatrixJ(A_offd);
+
+   HYPRE_Int        local_num_rows   = hypre_CSRMatrixNumRows(A_diag);
+   HYPRE_BigInt     glbal_num_cols   = hypre_ParCSRMatrixGlobalNumCols(A);
+   HYPRE_BigInt     first_col        = hypre_ParCSRMatrixFirstColDiag(A);
+   HYPRE_Int        num_cols_A_offd  = hypre_CSRMatrixNumCols(A_offd);
+   HYPRE_BigInt    *col_map_offd_A   = hypre_ParCSRMatrixColMapOffd(A);
+   HYPRE_BigInt    *d_col_map_offd_A = hypre_ParCSRMatrixDeviceColMapOffd(A);
+
+   hypre_CSRMatrix *B;
+   HYPRE_Int        B_nrows = local_num_rows;
+   HYPRE_BigInt     B_ncols = glbal_num_cols;
+   HYPRE_Int       *B_i = hypre_TAlloc(HYPRE_Int, B_nrows + 1, HYPRE_MEMORY_DEVICE);
+   HYPRE_BigInt    *B_j;
+   HYPRE_Complex   *B_a;
+   HYPRE_Int        B_nnz;
+
+   HYPRE_Int        num_procs;
+
+   hypre_MPI_Comm_size(comm, &num_procs);
+
+   hypre_Memset(B_i, 0, sizeof(HYPRE_Int), HYPRE_MEMORY_DEVICE);
+
+   hypreDevice_GetRowNnz(B_nrows, NULL, A_diag_i, A_offd_i, B_i + 1);
+
+   hypreDevice_IntegerInclusiveScan(B_nrows + 1, B_i);
+
+   /* total number of nnz */
+   hypre_TMemcpy(&B_nnz, B_i + B_nrows, HYPRE_Int, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
+
+   B_j = hypre_TAlloc(HYPRE_BigInt,  B_nnz, HYPRE_MEMORY_DEVICE);
+   B_a = hypre_TAlloc(HYPRE_Complex, B_nnz, HYPRE_MEMORY_DEVICE);
+
+   if (d_col_map_offd_A == NULL)
    {
-      row_norm_i = sqrt(row_norm_i);
+      d_col_map_offd_A = hypre_TAlloc(HYPRE_BigInt, num_cols_A_offd, HYPRE_MEMORY_DEVICE);
+      hypre_TMemcpy(d_col_map_offd_A, col_map_offd_A, HYPRE_BigInt, num_cols_A_offd,
+                    HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
+      hypre_ParCSRMatrixDeviceColMapOffd(A) = d_col_map_offd_A;
    }
 
-   /* set elmt_tols_diag */
-   for (HYPRE_Int j = p_diag + lane; j < q_diag; j += HYPRE_WARP_SIZE)
-   {
-      HYPRE_Int col = A_diag_j[j];
+   hypreDevice_CopyParCSRRows(B_nrows, NULL, 2, num_procs > 1, first_col, d_col_map_offd_A,
+                              A_diag_i, A_diag_j, A_diag_a, A_offd_i, A_offd_j, A_offd_a,
+                              B_i, B_j, B_a);
 
-      /* elmt_tol = 0.0 ensures diagonal will be kept */
-      if (col == row_i)
-      {
-         elmt_tols_diag[j] = 0.0;
-      }
-      else
-      {
-         elmt_tols_diag[j] = tol * row_norm_i;
-      }
-   }
+   /* output */
+   B = hypre_CSRMatrixCreate(B_nrows, B_ncols, B_nnz);
+   hypre_CSRMatrixI   (B) = B_i;
+   hypre_CSRMatrixBigJ(B) = B_j;
+   hypre_CSRMatrixData(B) = B_a;
+   hypre_CSRMatrixMemoryLocation(B) = HYPRE_MEMORY_DEVICE;
 
-   /* set elmt_tols_offd */
-   for (HYPRE_Int j = p_offd + lane; j < q_offd; j += HYPRE_WARP_SIZE)
-   {
-      elmt_tols_offd[j] = tol * row_norm_i;
-   }
+   hypre_SyncComputeStream();
 
+   return B;
 }
 
-/* drop the entries that are not on the diagonal and smaller than:
- *    type 0: tol
- *    type 1: tol*(1-norm of row)
- *    type 2: tol*(2-norm of row)
- *    type -1: tol*(infinity norm of row) */
 HYPRE_Int
-hypre_ParCSRMatrixDropSmallEntriesDevice( hypre_ParCSRMatrix *A,
-                                          HYPRE_Complex       tol,
-                                          HYPRE_Int           type)
+hypre_ParCSRMatrixGetRowDevice( hypre_ParCSRMatrix  *mat,
+                                HYPRE_BigInt         row,
+                                HYPRE_Int           *size,
+                                HYPRE_BigInt       **col_ind,
+                                HYPRE_Complex      **values )
 {
-   hypre_CSRMatrix *A_diag   = hypre_ParCSRMatrixDiag(A);
-   hypre_CSRMatrix *A_offd   = hypre_ParCSRMatrixOffd(A);
-   HYPRE_Int        num_cols_A_offd  = hypre_CSRMatrixNumCols(A_offd);
-   HYPRE_BigInt    *h_col_map_offd_A = hypre_ParCSRMatrixColMapOffd(A);
-   HYPRE_BigInt    *col_map_offd_A = hypre_ParCSRMatrixDeviceColMapOffd(A);
-
-   HYPRE_Real      *elmt_tols_diag = NULL;
-   HYPRE_Real      *elmt_tols_offd = NULL;
+   HYPRE_Int nrows, local_row;
+   HYPRE_BigInt row_start, row_end;
+   hypre_CSRMatrix *Aa;
+   hypre_CSRMatrix *Ba;
 
-   if (col_map_offd_A == NULL)
+   if (!mat)
    {
-      col_map_offd_A = hypre_TAlloc(HYPRE_BigInt, num_cols_A_offd, HYPRE_MEMORY_DEVICE);
-      hypre_TMemcpy(col_map_offd_A, h_col_map_offd_A, HYPRE_BigInt, num_cols_A_offd,
-                    HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
-      hypre_ParCSRMatrixDeviceColMapOffd(A) = col_map_offd_A;
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
    }
 
-   /* get elmement-wise tolerances if needed */
-   if (type != 0)
+   Aa = (hypre_CSRMatrix *) hypre_ParCSRMatrixDiag(mat);
+   Ba = (hypre_CSRMatrix *) hypre_ParCSRMatrixOffd(mat);
+
+   if (hypre_ParCSRMatrixGetrowactive(mat))
    {
-      elmt_tols_diag = hypre_TAlloc(HYPRE_Real, hypre_CSRMatrixNumNonzeros(A_diag), HYPRE_MEMORY_DEVICE);
-      elmt_tols_offd = hypre_TAlloc(HYPRE_Real, hypre_CSRMatrixNumNonzeros(A_offd), HYPRE_MEMORY_DEVICE);
+      return (-1);
    }
 
-   dim3 bDim = hypre_GetDefaultCUDABlockDimension();
-   dim3 gDim = hypre_GetDefaultCUDAGridDimension(hypre_CSRMatrixNumRows(A_diag), "warp", bDim);
+   hypre_ParCSRMatrixGetrowactive(mat) = 1;
 
-   if (type == -1)
-   {
-      HYPRE_CUDA_LAUNCH( hypre_ParCSRMatrixDropSmallEntriesDevice_getElmtTols<-1>, gDim, bDim, 
-                         hypre_CSRMatrixNumRows(A_diag), tol, hypre_CSRMatrixI(A_diag), 
-                         hypre_CSRMatrixJ(A_diag), hypre_CSRMatrixData(A_diag), hypre_CSRMatrixI(A_offd), 
-                         hypre_CSRMatrixData(A_offd), elmt_tols_diag, elmt_tols_offd);
-   }
-   if (type == 1)
+   row_start = hypre_ParCSRMatrixFirstRowIndex(mat);
+   row_end = hypre_ParCSRMatrixLastRowIndex(mat) + 1;
+   nrows = row_end - row_start;
+
+   if (row < row_start || row >= row_end)
    {
-      HYPRE_CUDA_LAUNCH( hypre_ParCSRMatrixDropSmallEntriesDevice_getElmtTols<1>, gDim, bDim, 
-                         hypre_CSRMatrixNumRows(A_diag), tol, hypre_CSRMatrixI(A_diag), 
-                         hypre_CSRMatrixJ(A_diag), hypre_CSRMatrixData(A_diag), hypre_CSRMatrixI(A_offd), 
-                         hypre_CSRMatrixData(A_offd), elmt_tols_diag, elmt_tols_offd);
+      return (-1);
    }
-   if (type == 2)
+
+   local_row = row - row_start;
+
+   /* if buffer is not allocated and some information is requested, allocate buffer with the max row_nnz */
+   if ( !hypre_ParCSRMatrixRowvalues(mat) && (col_ind || values) )
    {
-      HYPRE_CUDA_LAUNCH( hypre_ParCSRMatrixDropSmallEntriesDevice_getElmtTols<2>, gDim, bDim, 
-                         hypre_CSRMatrixNumRows(A_diag), tol, hypre_CSRMatrixI(A_diag), 
-                         hypre_CSRMatrixJ(A_diag), hypre_CSRMatrixData(A_diag), hypre_CSRMatrixI(A_offd), 
-                         hypre_CSRMatrixData(A_offd), elmt_tols_diag, elmt_tols_offd);
-   }
+      HYPRE_Int max_row_nnz;
+      HYPRE_Int *row_nnz = hypre_TAlloc(HYPRE_Int, nrows, HYPRE_MEMORY_DEVICE);
 
-   /* drop entries from diag and offd CSR matrices */
-   hypre_CSRMatrixDropSmallEntriesDevice(A_diag, tol, elmt_tols_diag);
-   hypre_CSRMatrixDropSmallEntriesDevice(A_offd, tol, elmt_tols_offd);
+      hypreDevice_GetRowNnz(nrows, NULL, hypre_CSRMatrixI(Aa), hypre_CSRMatrixI(Ba), row_nnz);
 
-   hypre_ParCSRMatrixSetNumNonzeros(A);
-   hypre_ParCSRMatrixDNumNonzeros(A) = (HYPRE_Real) hypre_ParCSRMatrixNumNonzeros(A);
+      hypre_TMemcpy(size, row_nnz + local_row, HYPRE_Int, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
 
-   /* squeeze out zero columns of A_offd */
-   HYPRE_Int *tmp_j, *tmp_end, num_cols_A_offd_new;
-   tmp_j = hypre_TAlloc(HYPRE_Int, hypre_CSRMatrixNumNonzeros(A_offd), HYPRE_MEMORY_DEVICE);
-   hypre_TMemcpy(tmp_j, hypre_CSRMatrixJ(A_offd), HYPRE_Int, hypre_CSRMatrixNumNonzeros(A_offd),
-                 HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
-   HYPRE_THRUST_CALL( sort,
-                      tmp_j,
-                      tmp_j + hypre_CSRMatrixNumNonzeros(A_offd) );
-   tmp_end = HYPRE_THRUST_CALL( unique,
-                                tmp_j,
-                                tmp_j + hypre_CSRMatrixNumNonzeros(A_offd) );
-   num_cols_A_offd_new = tmp_end - tmp_j;
+#if defined(HYPRE_USING_SYCL)
+      max_row_nnz = HYPRE_ONEDPL_CALL(std::reduce, row_nnz, row_nnz + nrows, 0,
+                                      oneapi::dpl::maximum<HYPRE_Int>());
+#else
+      max_row_nnz = HYPRE_THRUST_CALL(reduce, row_nnz, row_nnz + nrows, 0, thrust::maximum<HYPRE_Int>());
+#endif
 
-   hypre_assert(num_cols_A_offd_new <= num_cols_A_offd);
+      /*
+            HYPRE_Int *max_row_nnz_d = HYPRE_THRUST_CALL(max_element, row_nnz, row_nnz + nrows);
+            hypre_TMemcpy( &max_row_nnz, max_row_nnz_d,
+                           HYPRE_Int, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE );
+      */
 
-   if (num_cols_A_offd_new < num_cols_A_offd)
+      hypre_TFree(row_nnz, HYPRE_MEMORY_DEVICE);
+
+      hypre_ParCSRMatrixRowvalues(mat)  =
+         (HYPRE_Complex *) hypre_TAlloc(HYPRE_Complex, max_row_nnz, hypre_ParCSRMatrixMemoryLocation(mat));
+      hypre_ParCSRMatrixRowindices(mat) =
+         (HYPRE_BigInt *)  hypre_TAlloc(HYPRE_BigInt,  max_row_nnz, hypre_ParCSRMatrixMemoryLocation(mat));
+   }
+   else
    {
-      hypre_CSRMatrixNumCols(A_offd) = num_cols_A_offd_new;
+      HYPRE_Int *size_d = hypre_TAlloc(HYPRE_Int, 1, HYPRE_MEMORY_DEVICE);
+      hypreDevice_GetRowNnz(1, NULL, hypre_CSRMatrixI(Aa) + local_row, hypre_CSRMatrixI(Ba) + local_row,
+                            size_d);
+      hypre_TMemcpy(size, size_d, HYPRE_Int, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
+      hypre_TFree(size_d, HYPRE_MEMORY_DEVICE);
+   }
 
-      HYPRE_Int *offd_mark = hypre_CTAlloc(HYPRE_Int, num_cols_A_offd, HYPRE_MEMORY_DEVICE);
-      HYPRE_BigInt *col_map_offd_A_new = hypre_TAlloc(HYPRE_BigInt, num_cols_A_offd_new, HYPRE_MEMORY_DEVICE);
+   if (col_ind || values)
+   {
+      if (hypre_ParCSRMatrixDeviceColMapOffd(mat) == NULL)
+      {
+         hypre_ParCSRMatrixDeviceColMapOffd(mat) =
+            hypre_TAlloc(HYPRE_BigInt, hypre_CSRMatrixNumCols(Ba), HYPRE_MEMORY_DEVICE);
 
-      HYPRE_THRUST_CALL( scatter,
-                         thrust::counting_iterator<HYPRE_Int>(0),
-                         thrust::counting_iterator<HYPRE_Int>(num_cols_A_offd_new),
-                         tmp_j,
-                         offd_mark );
-      HYPRE_THRUST_CALL( gather,
-                         hypre_CSRMatrixJ(A_offd),
-                         hypre_CSRMatrixJ(A_offd) + hypre_CSRMatrixNumNonzeros(A_offd),
-                         offd_mark,
-                         hypre_CSRMatrixJ(A_offd) );
-      HYPRE_THRUST_CALL( gather,
-                         tmp_j,
-                         tmp_j + num_cols_A_offd_new,
-                         col_map_offd_A,
-                         col_map_offd_A_new );
+         hypre_TMemcpy( hypre_ParCSRMatrixDeviceColMapOffd(mat),
+                        hypre_ParCSRMatrixColMapOffd(mat),
+                        HYPRE_BigInt,
+                        hypre_CSRMatrixNumCols(Ba),
+                        HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST );
+      }
 
-      hypre_TFree(offd_mark, HYPRE_MEMORY_DEVICE);
-      hypre_TFree(col_map_offd_A, HYPRE_MEMORY_DEVICE);
-      hypre_TFree(h_col_map_offd_A, HYPRE_MEMORY_HOST);
+      hypreDevice_CopyParCSRRows( 1, NULL, -1, Ba != NULL,
+                                  hypre_ParCSRMatrixFirstColDiag(mat),
+                                  hypre_ParCSRMatrixDeviceColMapOffd(mat),
+                                  hypre_CSRMatrixI(Aa) + local_row,
+                                  hypre_CSRMatrixJ(Aa),
+                                  hypre_CSRMatrixData(Aa),
+                                  hypre_CSRMatrixI(Ba) + local_row,
+                                  hypre_CSRMatrixJ(Ba),
+                                  hypre_CSRMatrixData(Ba),
+                                  NULL,
+                                  hypre_ParCSRMatrixRowindices(mat),
+                                  hypre_ParCSRMatrixRowvalues(mat) );
+   }
 
-      hypre_ParCSRMatrixDeviceColMapOffd(A) = col_map_offd_A_new;
-      hypre_ParCSRMatrixColMapOffd(A) = hypre_TAlloc(HYPRE_BigInt, num_cols_A_offd_new, HYPRE_MEMORY_HOST);
-      hypre_TMemcpy(hypre_ParCSRMatrixColMapOffd(A), col_map_offd_A_new, HYPRE_BigInt, num_cols_A_offd_new,
-                    HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
+   if (col_ind)
+   {
+      *col_ind = hypre_ParCSRMatrixRowindices(mat);
    }
 
-   if (type != 0)
+   if (values)
    {
-      hypre_TFree(elmt_tols_diag, HYPRE_MEMORY_DEVICE);
-      hypre_TFree(elmt_tols_offd, HYPRE_MEMORY_DEVICE);
+      *values = hypre_ParCSRMatrixRowvalues(mat);
    }
-   hypre_TFree(tmp_j, HYPRE_MEMORY_DEVICE);
+
+   hypre_SyncComputeStream();
 
    return hypre_error_flag;
 }
@@ -1311,14 +1477,31 @@ hypre_ParCSRMatrixTransposeDevice( hypre_ParCSRMatrix  *A,
       HYPRE_BigInt *tmp_bigj;
 
       hypre_CSRMatrixTranspose(A_offd, &A_offdT, data);
-      hypre_CSRMatrixBigJ(A_offdT) = hypre_TAlloc(HYPRE_BigInt, hypre_CSRMatrixNumNonzeros(A_offdT), HYPRE_MEMORY_DEVICE);
+      hypre_CSRMatrixBigJ(A_offdT) = hypre_TAlloc(HYPRE_BigInt, hypre_CSRMatrixNumNonzeros(A_offdT),
+                                                  HYPRE_MEMORY_DEVICE);
 
+#if defined(HYPRE_USING_SYCL)
+      HYPRE_ONEDPL_CALL( std::transform,
+                         hypre_CSRMatrixJ(A_offdT),
+                         hypre_CSRMatrixJ(A_offdT) + hypre_CSRMatrixNumNonzeros(A_offdT),
+                         hypre_CSRMatrixBigJ(A_offdT),
+      [y = hypre_ParCSRMatrixFirstRowIndex(A)] (const auto & x) {return x + y;} );
+#else
       HYPRE_THRUST_CALL( transform,
                          hypre_CSRMatrixJ(A_offdT),
                          hypre_CSRMatrixJ(A_offdT) + hypre_CSRMatrixNumNonzeros(A_offdT),
                          thrust::make_constant_iterator(hypre_ParCSRMatrixFirstRowIndex(A)),
                          hypre_CSRMatrixBigJ(A_offdT),
                          thrust::plus<HYPRE_BigInt>() );
+#endif
+
+#if defined(HYPRE_USING_THRUST_NOSYNC)
+      /* RL: make sure A_offdT is ready before issuing GPU-GPU MPI */
+      if (hypre_GetGpuAwareMPI())
+      {
+         hypre_ForceSyncComputeStream();
+      }
+#endif
 
       if (!hypre_ParCSRMatrixCommPkg(A))
       {
@@ -1335,19 +1518,37 @@ hypre_ParCSRMatrixTransposeDevice( hypre_ParCSRMatrix  *A,
 
       // Aext contains offd of AT
       Aext_nnz = hypre_CSRMatrixNumNonzeros(Aext);
-      Aext_ii = hypreDevice_CsrRowPtrsToIndices(hypre_CSRMatrixNumRows(Aext), Aext_nnz, hypre_CSRMatrixI(Aext));
+      Aext_ii = hypreDevice_CsrRowPtrsToIndices(hypre_CSRMatrixNumRows(Aext), Aext_nnz,
+                                                hypre_CSRMatrixI(Aext));
 
       hypre_ParCSRCommPkgCopySendMapElmtsToDevice(hypre_ParCSRMatrixCommPkg(A));
 
+#if defined(HYPRE_USING_SYCL)
+      hypreSycl_gather( Aext_ii,
+                        Aext_ii + Aext_nnz,
+                        hypre_ParCSRCommPkgDeviceSendMapElmts(hypre_ParCSRMatrixCommPkg(A)),
+                        Aext_ii );
+#else
       HYPRE_THRUST_CALL( gather,
                          Aext_ii,
                          Aext_ii + Aext_nnz,
                          hypre_ParCSRCommPkgDeviceSendMapElmts(hypre_ParCSRMatrixCommPkg(A)),
                          Aext_ii );
+#endif
 
       tmp_bigj = hypre_TAlloc(HYPRE_BigInt, Aext_nnz, HYPRE_MEMORY_DEVICE);
-      hypre_TMemcpy(tmp_bigj, hypre_CSRMatrixBigJ(Aext), HYPRE_BigInt, Aext_nnz, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+      hypre_TMemcpy(tmp_bigj, hypre_CSRMatrixBigJ(Aext), HYPRE_BigInt, Aext_nnz, HYPRE_MEMORY_DEVICE,
+                    HYPRE_MEMORY_DEVICE);
+
+#if defined(HYPRE_USING_SYCL)
+      HYPRE_ONEDPL_CALL( std::sort,
+                         tmp_bigj,
+                         tmp_bigj + Aext_nnz );
 
+      HYPRE_BigInt *new_end = HYPRE_ONEDPL_CALL( std::unique,
+                                                 tmp_bigj,
+                                                 tmp_bigj + Aext_nnz );
+#else
       HYPRE_THRUST_CALL( sort,
                          tmp_bigj,
                          tmp_bigj + Aext_nnz );
@@ -1355,21 +1556,32 @@ hypre_ParCSRMatrixTransposeDevice( hypre_ParCSRMatrix  *A,
       HYPRE_BigInt *new_end = HYPRE_THRUST_CALL( unique,
                                                  tmp_bigj,
                                                  tmp_bigj + Aext_nnz );
+#endif
 
       num_cols_offd_AT = new_end - tmp_bigj;
       col_map_offd_AT = hypre_TAlloc(HYPRE_BigInt, num_cols_offd_AT, HYPRE_MEMORY_DEVICE);
-      hypre_TMemcpy(col_map_offd_AT, tmp_bigj, HYPRE_BigInt, num_cols_offd_AT, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+      hypre_TMemcpy(col_map_offd_AT, tmp_bigj, HYPRE_BigInt, num_cols_offd_AT, HYPRE_MEMORY_DEVICE,
+                    HYPRE_MEMORY_DEVICE);
 
       hypre_TFree(tmp_bigj, HYPRE_MEMORY_DEVICE);
 
       Aext_j = hypre_TAlloc(HYPRE_Int, Aext_nnz, HYPRE_MEMORY_DEVICE);
 
+#if defined(HYPRE_USING_SYCL)
+      HYPRE_ONEDPL_CALL( oneapi::dpl::lower_bound,
+                         col_map_offd_AT,
+                         col_map_offd_AT + num_cols_offd_AT,
+                         hypre_CSRMatrixBigJ(Aext),
+                         hypre_CSRMatrixBigJ(Aext) + Aext_nnz,
+                         Aext_j );
+#else
       HYPRE_THRUST_CALL( lower_bound,
                          col_map_offd_AT,
                          col_map_offd_AT + num_cols_offd_AT,
                          hypre_CSRMatrixBigJ(Aext),
                          hypre_CSRMatrixBigJ(Aext) + Aext_nnz,
                          Aext_j );
+#endif
 
       Aext_data = hypre_CSRMatrixData(Aext);
       hypre_CSRMatrixData(Aext) = NULL;
@@ -1381,16 +1593,24 @@ hypre_ParCSRMatrixTransposeDevice( hypre_ParCSRMatrix  *A,
       }
       else
       {
+#if defined(HYPRE_USING_SYCL)
+         HYPRE_ONEDPL_CALL( std::stable_sort,
+                            oneapi::dpl::make_zip_iterator(Aext_ii, Aext_j),
+                            oneapi::dpl::make_zip_iterator(Aext_ii, Aext_j) + Aext_nnz,
+         [] (const auto & x, const auto & y) {return std::get<0>(x) < std::get<0>(y);} );
+#else
          HYPRE_THRUST_CALL( stable_sort,
                             thrust::make_zip_iterator(thrust::make_tuple(Aext_ii, Aext_j)),
                             thrust::make_zip_iterator(thrust::make_tuple(Aext_ii, Aext_j)) + Aext_nnz );
+#endif
       }
 
       AT_offd = hypre_CSRMatrixCreate(hypre_ParCSRMatrixNumCols(A), num_cols_offd_AT, Aext_nnz);
       hypre_CSRMatrixJ(AT_offd) = Aext_j;
       hypre_CSRMatrixData(AT_offd) = Aext_data;
       hypre_CSRMatrixInitialize_v2(AT_offd, 0, HYPRE_MEMORY_DEVICE);
-      hypreDevice_CsrRowIndicesToPtrs_v2(hypre_CSRMatrixNumRows(AT_offd), Aext_nnz, Aext_ii, hypre_CSRMatrixI(AT_offd));
+      hypreDevice_CsrRowIndicesToPtrs_v2(hypre_CSRMatrixNumRows(AT_offd), Aext_nnz, Aext_ii,
+                                         hypre_CSRMatrixI(AT_offd));
       hypre_TFree(Aext_ii, HYPRE_MEMORY_DEVICE);
    }
    else
@@ -1447,6 +1667,7 @@ hypre_ParCSRMatrixAddDevice( HYPRE_Complex        alpha,
    HYPRE_Int        num_procs;
 
    hypre_MPI_Comm_size(hypre_ParCSRMatrixComm(A), &num_procs);
+   hypre_GpuProfilingPushRange("hypre_ParCSRMatrixAdd");
 
    hypre_CSRMatrix *C_diag = hypre_CSRMatrixAddDevice(alpha, A_diag, beta, B_diag);
    hypre_CSRMatrix *C_offd;
@@ -1457,18 +1678,52 @@ hypre_ParCSRMatrixAddDevice( HYPRE_Complex        alpha,
       hypre_ParCSRMatrixCopyColMapOffdToDevice(A);
       hypre_ParCSRMatrixCopyColMapOffdToDevice(B);
 
-      HYPRE_BigInt *tmp = hypre_TAlloc(HYPRE_BigInt, num_cols_offd_A + num_cols_offd_B, HYPRE_MEMORY_DEVICE);
-      hypre_TMemcpy(tmp,                   hypre_ParCSRMatrixDeviceColMapOffd(A), HYPRE_BigInt, num_cols_offd_A, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
-      hypre_TMemcpy(tmp + num_cols_offd_A, hypre_ParCSRMatrixDeviceColMapOffd(B), HYPRE_BigInt, num_cols_offd_B, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+      HYPRE_BigInt *tmp = hypre_TAlloc(HYPRE_BigInt, num_cols_offd_A + num_cols_offd_B,
+                                       HYPRE_MEMORY_DEVICE);
+
+      hypre_TMemcpy(tmp,                   hypre_ParCSRMatrixDeviceColMapOffd(A), HYPRE_BigInt,
+                    num_cols_offd_A, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+      hypre_TMemcpy(tmp + num_cols_offd_A, hypre_ParCSRMatrixDeviceColMapOffd(B), HYPRE_BigInt,
+                    num_cols_offd_B, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+#if defined(HYPRE_USING_SYCL)
+      HYPRE_ONEDPL_CALL( std::sort, tmp, tmp + num_cols_offd_A + num_cols_offd_B );
+      HYPRE_BigInt *new_end = HYPRE_ONEDPL_CALL( std::unique, tmp,
+                                                 tmp + num_cols_offd_A + num_cols_offd_B );
+#else
       HYPRE_THRUST_CALL( sort, tmp, tmp + num_cols_offd_A + num_cols_offd_B );
-      HYPRE_BigInt *new_end = HYPRE_THRUST_CALL( unique, tmp, tmp + num_cols_offd_A + num_cols_offd_B );
+      HYPRE_BigInt *new_end = HYPRE_THRUST_CALL( unique, tmp,
+                                                 tmp + num_cols_offd_A + num_cols_offd_B );
+#endif
       num_cols_offd_C = new_end - tmp;
       d_col_map_offd_C = hypre_TAlloc(HYPRE_BigInt, num_cols_offd_C, HYPRE_MEMORY_DEVICE);
-      hypre_TMemcpy(d_col_map_offd_C, tmp, HYPRE_BigInt, num_cols_offd_C, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+      hypre_TMemcpy(d_col_map_offd_C, tmp, HYPRE_BigInt, num_cols_offd_C, HYPRE_MEMORY_DEVICE,
+                    HYPRE_MEMORY_DEVICE);
 
       /* reuse memory of tmp */
       HYPRE_Int *offd_A2C = (HYPRE_Int *) tmp;
       HYPRE_Int *offd_B2C = offd_A2C + num_cols_offd_A;
+#if defined(HYPRE_USING_SYCL)
+      /* WM: todo - getting an error when num_cols_offd_A is zero */
+      if (num_cols_offd_A > 0)
+      {
+         HYPRE_ONEDPL_CALL( oneapi::dpl::lower_bound,
+                            d_col_map_offd_C,
+                            d_col_map_offd_C + num_cols_offd_C,
+                            hypre_ParCSRMatrixDeviceColMapOffd(A),
+                            hypre_ParCSRMatrixDeviceColMapOffd(A) + num_cols_offd_A,
+                            offd_A2C );
+      }
+      /* WM: todo - getting an error when num_cols_offd_B is zero */
+      if (num_cols_offd_B > 0)
+      {
+         HYPRE_ONEDPL_CALL( oneapi::dpl::lower_bound,
+                            d_col_map_offd_C,
+                            d_col_map_offd_C + num_cols_offd_C,
+                            hypre_ParCSRMatrixDeviceColMapOffd(B),
+                            hypre_ParCSRMatrixDeviceColMapOffd(B) + num_cols_offd_B,
+                            offd_B2C );
+      }
+#else
       HYPRE_THRUST_CALL( lower_bound,
                          d_col_map_offd_C,
                          d_col_map_offd_C + num_cols_offd_C,
@@ -1481,13 +1736,13 @@ hypre_ParCSRMatrixAddDevice( HYPRE_Complex        alpha,
                          hypre_ParCSRMatrixDeviceColMapOffd(B),
                          hypre_ParCSRMatrixDeviceColMapOffd(B) + num_cols_offd_B,
                          offd_B2C );
+#endif
 
       HYPRE_Int *C_offd_i, *C_offd_j, nnzC_offd;
       HYPRE_Complex *C_offd_a;
 
       hypreDevice_CSRSpAdd( hypre_CSRMatrixNumRows(A_offd),
                             hypre_CSRMatrixNumRows(B_offd),
-                            num_cols_offd_C,
                             hypre_CSRMatrixNumNonzeros(A_offd),
                             hypre_CSRMatrixNumNonzeros(B_offd),
                             hypre_CSRMatrixI(A_offd),
@@ -1521,18 +1776,11 @@ hypre_ParCSRMatrixAddDevice( HYPRE_Complex        alpha,
    }
 
    /* Create ParCSRMatrix C */
-   HYPRE_BigInt *row_starts_C = hypre_TAlloc(HYPRE_BigInt, 2, HYPRE_MEMORY_HOST);
-   HYPRE_BigInt *col_starts_C = hypre_TAlloc(HYPRE_BigInt, 2, HYPRE_MEMORY_HOST);
-   hypre_TMemcpy(row_starts_C, hypre_ParCSRMatrixRowStarts(A), HYPRE_BigInt, 2,
-                 HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
-   hypre_TMemcpy(col_starts_C, hypre_ParCSRMatrixColStarts(A), HYPRE_BigInt, 2,
-                 HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
-
    hypre_ParCSRMatrix *C = hypre_ParCSRMatrixCreate(hypre_ParCSRMatrixComm(A),
                                                     hypre_ParCSRMatrixGlobalNumRows(A),
                                                     hypre_ParCSRMatrixGlobalNumCols(A),
-                                                    row_starts_C,
-                                                    col_starts_C,
+                                                    hypre_ParCSRMatrixRowStarts(A),
+                                                    hypre_ParCSRMatrixColStarts(A),
                                                     num_cols_offd_C,
                                                     hypre_CSRMatrixNumNonzeros(C_diag),
                                                     hypre_CSRMatrixNumNonzeros(C_offd));
@@ -1546,8 +1794,11 @@ hypre_ParCSRMatrixAddDevice( HYPRE_Complex        alpha,
    {
       hypre_ParCSRMatrixDeviceColMapOffd(C) = d_col_map_offd_C;
 
-      hypre_ParCSRMatrixColMapOffd(C) = hypre_TAlloc(HYPRE_BigInt, num_cols_offd_C, HYPRE_MEMORY_HOST);
-      hypre_TMemcpy(hypre_ParCSRMatrixColMapOffd(C), d_col_map_offd_C, HYPRE_BigInt, num_cols_offd_C,
+      hypre_ParCSRMatrixColMapOffd(C) = hypre_TAlloc(HYPRE_BigInt,
+                                                     num_cols_offd_C,
+                                                     HYPRE_MEMORY_HOST);
+      hypre_TMemcpy(hypre_ParCSRMatrixColMapOffd(C), d_col_map_offd_C,
+                    HYPRE_BigInt, num_cols_offd_C,
                     HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
    }
 
@@ -1559,44 +1810,219 @@ hypre_ParCSRMatrixAddDevice( HYPRE_Complex        alpha,
 
    *C_ptr = C;
 
+   hypre_GpuProfilingPopRange();
+
    return hypre_error_flag;
 }
 
-#endif // #if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#endif // #if defined(HYPRE_USING_GPU)
+
+#if defined(HYPRE_USING_GPU) || defined(HYPRE_USING_DEVICE_OPENMP)
 
 /*--------------------------------------------------------------------------
- * HYPRE_ParCSRDiagScale
+ * hypre_ParCSRMatrixDiagScaleDevice
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_ParCSRDiagScale( HYPRE_ParCSRMatrix HA,
-                       HYPRE_ParVector    Hy,
-                       HYPRE_ParVector    Hx )
+hypre_ParCSRMatrixDiagScaleDevice( hypre_ParCSRMatrix *par_A,
+                                   hypre_ParVector    *par_ld,
+                                   hypre_ParVector    *par_rd )
 {
-   hypre_ParCSRMatrix *A = (hypre_ParCSRMatrix *) HA;
-   hypre_ParVector    *y = (hypre_ParVector *) Hy;
-   hypre_ParVector    *x = (hypre_ParVector *) Hx;
-   HYPRE_Real *x_data = hypre_VectorData(hypre_ParVectorLocalVector(x));
-   HYPRE_Real *y_data = hypre_VectorData(hypre_ParVectorLocalVector(y));
-   HYPRE_Real *A_data = hypre_CSRMatrixData(hypre_ParCSRMatrixDiag(A));
-   HYPRE_Int *A_i = hypre_CSRMatrixI(hypre_ParCSRMatrixDiag(A));
-   HYPRE_Int local_size = hypre_VectorSize(hypre_ParVectorLocalVector(x));
-   HYPRE_Int ierr = 0;
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-   hypreDevice_DiagScaleVector(local_size, A_i, A_data, y_data, 0.0, x_data);
-   //hypre_SyncCudaComputeStream(hypre_handle());
-#else /* #if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP) */
-   HYPRE_Int i;
+   /* Input variables */
+   hypre_ParCSRCommPkg    *comm_pkg  = hypre_ParCSRMatrixCommPkg(par_A);
+   hypre_ParCSRCommHandle *comm_handle;
+   HYPRE_Int               num_sends;
+   HYPRE_Int              *d_send_map_elmts;
+   HYPRE_Int               send_map_num_elmts;
+
+   hypre_CSRMatrix        *A_diag        = hypre_ParCSRMatrixDiag(par_A);
+   hypre_CSRMatrix        *A_offd        = hypre_ParCSRMatrixOffd(par_A);
+   HYPRE_Int               num_cols_offd = hypre_CSRMatrixNumCols(A_offd);
+
+   hypre_Vector           *ld            = (par_ld) ? hypre_ParVectorLocalVector(par_ld) : NULL;
+   hypre_Vector           *rd            = hypre_ParVectorLocalVector(par_rd);
+   HYPRE_Complex          *rd_data       = hypre_VectorData(rd);
+
+   /* Local variables */
+   hypre_Vector           *rdbuf;
+   HYPRE_Complex          *recv_rdbuf_data;
+   HYPRE_Complex          *send_rdbuf_data;
+   HYPRE_Int               sync_stream;
+
+   /*---------------------------------------------------------------------
+    * Setup communication info
+    *--------------------------------------------------------------------*/
+
+   hypre_GetSyncCudaCompute(&sync_stream);
+   hypre_SetSyncCudaCompute(0);
+
+   /* Create buffer vectors */
+   rdbuf = hypre_SeqVectorCreate(num_cols_offd);
+
+   /* If there exists no CommPkg for A, create it. */
+   if (!comm_pkg)
+   {
+      hypre_MatvecCommPkgCreate(par_A);
+      comm_pkg = hypre_ParCSRMatrixCommPkg(par_A);
+   }
+
+   /* Communicate a single vector component */
+   hypre_ParCSRCommPkgUpdateVecStarts(comm_pkg,
+                                      hypre_VectorNumVectors(rd),
+                                      hypre_VectorVectorStride(rd),
+                                      hypre_VectorIndexStride(rd));
+
+   /* send_map_elmts on device */
+   hypre_ParCSRCommPkgCopySendMapElmtsToDevice(comm_pkg);
+
+   /* Set variables */
+   num_sends          = hypre_ParCSRCommPkgNumSends(comm_pkg);
+   d_send_map_elmts   = hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg);
+   send_map_num_elmts = hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends);
+
+   /*---------------------------------------------------------------------
+    * Allocate/reuse receive data buffer
+    *--------------------------------------------------------------------*/
+
+   if (!hypre_ParCSRCommPkgTmpData(comm_pkg))
+   {
+      hypre_ParCSRCommPkgTmpData(comm_pkg) = hypre_TAlloc(HYPRE_Complex,
+                                                          num_cols_offd,
+                                                          HYPRE_MEMORY_DEVICE);
+   }
+   hypre_VectorData(rdbuf) = recv_rdbuf_data = hypre_ParCSRCommPkgTmpData(comm_pkg);
+   hypre_SeqVectorSetDataOwner(rdbuf, 0);
+   hypre_SeqVectorInitialize_v2(rdbuf, HYPRE_MEMORY_DEVICE);
+
+   /*---------------------------------------------------------------------
+    * Allocate/reuse send data buffer
+    *--------------------------------------------------------------------*/
+
+   if (!hypre_ParCSRCommPkgBufData(comm_pkg))
+   {
+      hypre_ParCSRCommPkgBufData(comm_pkg) = hypre_TAlloc(HYPRE_Complex,
+                                                          send_map_num_elmts,
+                                                          HYPRE_MEMORY_DEVICE);
+   }
+   send_rdbuf_data = hypre_ParCSRCommPkgBufData(comm_pkg);
+
+   /*---------------------------------------------------------------------
+    * Pack send data
+    *--------------------------------------------------------------------*/
+
 #if defined(HYPRE_USING_DEVICE_OPENMP)
-#pragma omp target teams distribute parallel for private(i) is_device_ptr(x_data,y_data,A_data,A_i)
-#elif defined(HYPRE_USING_OPENMP)
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+   HYPRE_Int  i;
+
+   #pragma omp target teams distribute parallel for private(i) is_device_ptr(send_rdbuf_data, rd_data, d_send_map_elmts)
+   for (i = 0; i < send_map_num_elmts; i++)
+   {
+      send_rdbuf_data[i] = rd_data[d_send_map_elmts[i]];
+   }
+#else
+#if defined(HYPRE_USING_SYCL)
+   auto permuted_source = oneapi::dpl::make_permutation_iterator(rd_data,
+                                                                 d_send_map_elmts);
+   HYPRE_ONEDPL_CALL( std::copy,
+                      permuted_source,
+                      permuted_source + send_map_num_elmts,
+                      send_rdbuf_data );
+#else
+   HYPRE_THRUST_CALL( gather,
+                      d_send_map_elmts,
+                      d_send_map_elmts + send_map_num_elmts,
+                      rd_data,
+                      send_rdbuf_data );
+#endif
+#endif
+
+
+#if defined(HYPRE_USING_THRUST_NOSYNC)
+   /* make sure send_rdbuf_data is ready before issuing GPU-GPU MPI */
+   if (hypre_GetGpuAwareMPI())
+   {
+      hypre_ForceSyncComputeStream();
+   }
 #endif
-   for (i = 0; i < local_size; i++)
+
+   /* A_diag = diag(ld) * A_diag * diag(rd) */
+   hypre_CSRMatrixDiagScale(A_diag, ld, rd);
+
+   /* Communication phase */
+   comm_handle = hypre_ParCSRCommHandleCreate_v2(1, comm_pkg,
+                                                 HYPRE_MEMORY_DEVICE, send_rdbuf_data,
+                                                 HYPRE_MEMORY_DEVICE, recv_rdbuf_data);
+   hypre_ParCSRCommHandleDestroy(comm_handle);
+
+   /* A_offd = diag(ld) * A_offd * diag(rd) */
+   hypre_CSRMatrixDiagScale(A_offd, ld, rdbuf);
+
+#if defined(HYPRE_USING_GPU)
+   /*---------------------------------------------------------------------
+    * Synchronize calls
+    *--------------------------------------------------------------------*/
+   hypre_SetSyncCudaCompute(sync_stream);
+   hypre_SyncComputeStream();
+#endif
+
+   /* Free memory */
+   hypre_SeqVectorDestroy(rdbuf);
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_ParCSRDiagScaleVectorDevice
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ParCSRDiagScaleVectorDevice( hypre_ParCSRMatrix *par_A,
+                                   hypre_ParVector    *par_y,
+                                   hypre_ParVector    *par_x )
+{
+   /* Local Matrix and Vectors */
+   hypre_CSRMatrix    *A_diag        = hypre_ParCSRMatrixDiag(par_A);
+   hypre_Vector       *x             = hypre_ParVectorLocalVector(par_x);
+   hypre_Vector       *y             = hypre_ParVectorLocalVector(par_y);
+
+   /* Local vector x info */
+   HYPRE_Complex      *x_data        = hypre_VectorData(x);
+   HYPRE_Int           x_size        = hypre_VectorSize(x);
+   HYPRE_Int           x_num_vectors = hypre_VectorNumVectors(x);
+   HYPRE_Int           x_vecstride   = hypre_VectorVectorStride(x);
+
+   /* Local vector y info */
+   HYPRE_Complex      *y_data        = hypre_VectorData(y);
+   HYPRE_Int           y_size        = hypre_VectorSize(y);
+   HYPRE_Int           y_num_vectors = hypre_VectorNumVectors(y);
+   HYPRE_Int           y_vecstride   = hypre_VectorVectorStride(y);
+
+   /* Local matrix A info */
+   HYPRE_Int           num_rows      = hypre_CSRMatrixNumRows(A_diag);
+   HYPRE_Int          *A_i           = hypre_CSRMatrixI(A_diag);
+   HYPRE_Complex      *A_data        = hypre_CSRMatrixData(A_diag);
+
+   /* Sanity checks */
+   hypre_assert(x_vecstride == x_size);
+   hypre_assert(y_vecstride == y_size);
+   hypre_assert(x_num_vectors == y_num_vectors);
+
+   hypre_GpuProfilingPushRange("ParCSRDiagScaleVector");
+
+#if defined(HYPRE_USING_DEVICE_OPENMP)
+   HYPRE_Int i;
+
+   #pragma omp target teams distribute parallel for private(i) is_device_ptr(x_data,y_data,A_data,A_i)
+   for (i = 0; i < num_rows; i++)
    {
       x_data[i] = y_data[i] / A_data[A_i[i]];
    }
-#endif /* #if defined(HYPRE_USING_CUDA) */
+#else
+   hypreDevice_DiagScaleVector(x_num_vectors, num_rows, A_i, A_data, y_data, 0.0, x_data);
+#endif // #if defined(HYPRE_USING_DEVICE_OPENMP)
+
+   hypre_GpuProfilingPopRange();
 
-   return ierr;
+   return hypre_error_flag;
 }
+
+#endif // #if defined(HYPRE_USING_GPU) || defined(HYPRE_USING_DEVICE_OPENMP)
diff --git a/external/hypre/src/parcsr_mv/par_csr_matop_marked.c b/external/hypre/src/parcsr_mv/par_csr_matop_marked.c
index b109a7f9..b6c44e70 100644
--- a/external/hypre/src/parcsr_mv/par_csr_matop_marked.c
+++ b/external/hypre/src/parcsr_mv/par_csr_matop_marked.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -23,7 +23,7 @@ void hypre_ParMatmul_RowSizes_Marked(
    HYPRE_Int num_rows_diag_A, HYPRE_Int num_cols_offd_A, HYPRE_Int allsquare,
    HYPRE_Int num_cols_diag_B, HYPRE_Int num_cols_offd_B, HYPRE_Int num_cols_offd_C,
    HYPRE_Int * CF_marker, HYPRE_Int * dof_func, HYPRE_Int * dof_func_offd
-   )
+)
 /* Compute row sizes of result of a matrix multiplication A*B.
    But we only consider rows designated by CF_marker(i)<0 ("Fine" rows).
    This function is the same as hypre_ParMatmul_RowSizes,but with a little code
@@ -49,14 +49,14 @@ void hypre_ParMatmul_RowSizes_Marked(
       first_col_diag_B, n_cols_B, num_cols_offd_B, num_cols_diag_B
    */
 
-   *C_diag_i = hypre_CTAlloc(HYPRE_Int,  num_rows_diag_A+1, HYPRE_MEMORY_HOST);
-   *C_offd_i = hypre_CTAlloc(HYPRE_Int,  num_rows_diag_A+1, HYPRE_MEMORY_HOST);
+   *C_diag_i = hypre_CTAlloc(HYPRE_Int,  num_rows_diag_A + 1, HYPRE_MEMORY_HOST);
+   *C_offd_i = hypre_CTAlloc(HYPRE_Int,  num_rows_diag_A + 1, HYPRE_MEMORY_HOST);
    /* ... CTAlloc initializes to 0, so entries ignored due to CF_marker will be
       returned as 0 */
 
    jj_count_diag = start_indexing;
    jj_count_offd = start_indexing;
-   for (i1 = 0; i1 < num_cols_diag_B+num_cols_offd_C; i1++)
+   for (i1 = 0; i1 < num_cols_diag_B + num_cols_offd_C; i1++)
    {
       (*B_marker)[i1] = -1;
    }
@@ -75,8 +75,8 @@ void hypre_ParMatmul_RowSizes_Marked(
          /* To make the C row i1 the same size as the B row i1: */
          jj_row_begin_diag = jj_count_diag;
          jj_row_begin_offd = jj_count_offd;
-         jj_count_diag += B_diag_i[i1+1] - B_diag_i[i1];
-         jj_count_offd += B_offd_i[i1+1] - B_offd_i[i1];
+         jj_count_diag += B_diag_i[i1 + 1] - B_diag_i[i1];
+         jj_count_offd += B_offd_i[i1 + 1] - B_offd_i[i1];
          (*C_diag_i)[i1] = jj_row_begin_diag;
          (*C_offd_i)[i1] = jj_row_begin_offd;
       }
@@ -92,7 +92,8 @@ void hypre_ParMatmul_RowSizes_Marked(
 
          jj_row_begin_diag = jj_count_diag;
          jj_row_begin_offd = jj_count_offd;
-         if ( allsquare ) {
+         if ( allsquare )
+         {
             (*B_marker)[i1] = jj_count_diag;
             jj_count_diag++;
          }
@@ -103,19 +104,20 @@ void hypre_ParMatmul_RowSizes_Marked(
 
          if (num_cols_offd_A)
          {
-            for (jj2 = A_offd_i[i1]; jj2 < A_offd_i[i1+1]; jj2++)
+            for (jj2 = A_offd_i[i1]; jj2 < A_offd_i[i1 + 1]; jj2++)
             {
                i2 = A_offd_j[jj2];
 
-               if ( dof_func==NULL || dof_func[i1] == dof_func_offd[i2] )
-               {/* interpolate only like "functions" */
+               if ( dof_func == NULL || dof_func[i1] == dof_func_offd[i2] )
+               {
+                  /* interpolate only like "functions" */
                   /*-----------------------------------------------------------
                    *  Loop over entries in row i2 of B_ext.
                    *-----------------------------------------------------------*/
 
-                  for (jj3 = B_ext_offd_i[i2]; jj3 < B_ext_offd_i[i2+1]; jj3++)
+                  for (jj3 = B_ext_offd_i[i2]; jj3 < B_ext_offd_i[i2 + 1]; jj3++)
                   {
-                     i3 = num_cols_diag_B+B_ext_offd_j[jj3];
+                     i3 = num_cols_diag_B + B_ext_offd_j[jj3];
 
                      /*--------------------------------------------------------
                       *  Check B_marker to see that C_{i1,i3} has not already
@@ -129,7 +131,7 @@ void hypre_ParMatmul_RowSizes_Marked(
                         jj_count_offd++;
                      }
                   }
-                  for (jj3 = B_ext_diag_i[i2]; jj3 < B_ext_diag_i[i2+1]; jj3++)
+                  for (jj3 = B_ext_diag_i[i2]; jj3 < B_ext_diag_i[i2 + 1]; jj3++)
                   {
                      i3 = B_ext_diag_j[jj3];
 
@@ -146,17 +148,18 @@ void hypre_ParMatmul_RowSizes_Marked(
           *  Loop over entries in row i1 of A_diag.
           *-----------------------------------------------------------------*/
 
-         for (jj2 = A_diag_i[i1]; jj2 < A_diag_i[i1+1]; jj2++)
+         for (jj2 = A_diag_i[i1]; jj2 < A_diag_i[i1 + 1]; jj2++)
          {
             i2 = A_diag_j[jj2];
 
-            if( dof_func==NULL || dof_func[i1] == dof_func[i2] )
-            { /* interpolate only like "functions" */
+            if ( dof_func == NULL || dof_func[i1] == dof_func[i2] )
+            {
+               /* interpolate only like "functions" */
                /*-----------------------------------------------------------
                 *  Loop over entries in row i2 of B_diag.
                 *-----------------------------------------------------------*/
 
-               for (jj3 = B_diag_i[i2]; jj3 < B_diag_i[i2+1]; jj3++)
+               for (jj3 = B_diag_i[i2]; jj3 < B_diag_i[i2 + 1]; jj3++)
                {
                   i3 = B_diag_j[jj3];
 
@@ -178,9 +181,9 @@ void hypre_ParMatmul_RowSizes_Marked(
 
                if (num_cols_offd_B)
                {
-                  for (jj3 = B_offd_i[i2]; jj3 < B_offd_i[i2+1]; jj3++)
+                  for (jj3 = B_offd_i[i2]; jj3 < B_offd_i[i2 + 1]; jj3++)
                   {
-                     i3 = num_cols_diag_B+map_B_to_C[B_offd_j[jj3]];
+                     i3 = num_cols_diag_B + map_B_to_C[B_offd_j[jj3]];
 
                      /*--------------------------------------------------------
                       *  Check B_marker to see that C_{i1,i3} has not already
@@ -284,7 +287,7 @@ hypre_ParCSRMatrix * hypre_ParMatmul_FC(
 
    hypre_ParCSRMatrix *C;
    HYPRE_BigInt       *col_map_offd_C;
-   HYPRE_Int          *map_P_to_C;
+   HYPRE_Int          *map_P_to_C = NULL;
 
    hypre_CSRMatrix    *C_diag;
 
@@ -294,26 +297,26 @@ hypre_ParCSRMatrix * hypre_ParMatmul_FC(
 
    hypre_CSRMatrix    *C_offd;
 
-   HYPRE_Complex      *C_offd_data=NULL;
-   HYPRE_Int          *C_offd_i=NULL;
-   HYPRE_Int          *C_offd_j=NULL;
+   HYPRE_Complex      *C_offd_data = NULL;
+   HYPRE_Int          *C_offd_i = NULL;
+   HYPRE_Int          *C_offd_j = NULL;
 
    HYPRE_Int           C_diag_size;
    HYPRE_Int           C_offd_size;
    HYPRE_Int           num_cols_offd_C = 0;
 
-   hypre_CSRMatrix    *Ps_ext;
+   hypre_CSRMatrix    *Ps_ext = NULL;
 
-   HYPRE_Complex      *Ps_ext_data;
-   HYPRE_Int          *Ps_ext_i;
-   HYPRE_BigInt       *Ps_ext_j;
+   HYPRE_Complex      *Ps_ext_data = NULL;
+   HYPRE_Int          *Ps_ext_i = NULL;
+   HYPRE_BigInt       *Ps_ext_j = NULL;
 
-   HYPRE_Complex      *P_ext_diag_data;
+   HYPRE_Complex      *P_ext_diag_data = NULL;
    HYPRE_Int          *P_ext_diag_i;
-   HYPRE_Int          *P_ext_diag_j;
+   HYPRE_Int          *P_ext_diag_j = NULL;
    HYPRE_Int           P_ext_diag_size;
 
-   HYPRE_Complex      *P_ext_offd_data;
+   HYPRE_Complex      *P_ext_offd_data = NULL;
    HYPRE_Int          *P_ext_offd_i;
    HYPRE_Int          *P_ext_offd_j = NULL;
    HYPRE_BigInt       *P_ext_tmp_j = NULL;
@@ -365,26 +368,30 @@ hypre_ParCSRMatrix * hypre_ParMatmul_FC(
        * equally load balanced partitionings within
        * hypre_ParCSRMatrixExtractBExt
        *--------------------------------------------------------------------*/
-      Ps_ext = hypre_ParCSRMatrixExtractBExt(P,A,1);
+      Ps_ext = hypre_ParCSRMatrixExtractBExt(P, A, 1);
       Ps_ext_data = hypre_CSRMatrixData(Ps_ext);
       Ps_ext_i    = hypre_CSRMatrixI(Ps_ext);
       Ps_ext_j    = hypre_CSRMatrixBigJ(Ps_ext);
    }
-   P_ext_diag_i = hypre_CTAlloc(HYPRE_Int,  num_cols_offd_A+1, HYPRE_MEMORY_HOST);
-   P_ext_offd_i = hypre_CTAlloc(HYPRE_Int,  num_cols_offd_A+1, HYPRE_MEMORY_HOST);
+   P_ext_diag_i = hypre_CTAlloc(HYPRE_Int,  num_cols_offd_A + 1, HYPRE_MEMORY_HOST);
+   P_ext_offd_i = hypre_CTAlloc(HYPRE_Int,  num_cols_offd_A + 1, HYPRE_MEMORY_HOST);
    P_ext_diag_size = 0;
    P_ext_offd_size = 0;
-   last_col_diag_P = first_col_diag_P + num_cols_diag_P -1;
+   last_col_diag_P = first_col_diag_P + num_cols_diag_P - 1;
 
-   for (i=0; i < num_cols_offd_A; i++)
+   for (i = 0; i < num_cols_offd_A; i++)
    {
-      for (j=Ps_ext_i[i]; j < Ps_ext_i[i+1]; j++)
+      for (j = Ps_ext_i[i]; j < Ps_ext_i[i + 1]; j++)
          if (Ps_ext_j[j] < first_col_diag_P || Ps_ext_j[j] > last_col_diag_P)
+         {
             P_ext_offd_size++;
+         }
          else
+         {
             P_ext_diag_size++;
-      P_ext_diag_i[i+1] = P_ext_diag_size;
-      P_ext_offd_i[i+1] = P_ext_offd_size;
+         }
+      P_ext_diag_i[i + 1] = P_ext_diag_size;
+      P_ext_offd_i[i + 1] = P_ext_offd_size;
    }
 
    if (P_ext_diag_size)
@@ -401,9 +408,9 @@ hypre_ParCSRMatrix * hypre_ParMatmul_FC(
 
    cnt_offd = 0;
    cnt_diag = 0;
-   for (i=0; i < num_cols_offd_A; i++)
+   for (i = 0; i < num_cols_offd_A; i++)
    {
-      for (j=Ps_ext_i[i]; j < Ps_ext_i[i+1]; j++)
+      for (j = Ps_ext_i[i]; j < Ps_ext_i[i + 1]; j++)
          if (Ps_ext_j[j] < first_col_diag_P || Ps_ext_j[j] > last_col_diag_P)
          {
             P_ext_tmp_j[cnt_offd] = Ps_ext_j[j];
@@ -426,20 +433,24 @@ hypre_ParCSRMatrix * hypre_ParMatmul_FC(
    cnt = 0;
    if (P_ext_offd_size || num_cols_offd_P)
    {
-      temp = hypre_CTAlloc(HYPRE_BigInt,  P_ext_offd_size+num_cols_offd_P, HYPRE_MEMORY_HOST);
-      for (i=0; i < P_ext_offd_size; i++)
+      temp = hypre_CTAlloc(HYPRE_BigInt,  P_ext_offd_size + num_cols_offd_P, HYPRE_MEMORY_HOST);
+      for (i = 0; i < P_ext_offd_size; i++)
+      {
          temp[i] = P_ext_offd_j[i];
+      }
       cnt = P_ext_offd_size;
-      for (i=0; i < num_cols_offd_P; i++)
+      for (i = 0; i < num_cols_offd_P; i++)
+      {
          temp[cnt++] = col_map_offd_P[i];
+      }
    }
    if (cnt)
    {
-      hypre_BigQsort0(temp, 0, cnt-1);
+      hypre_BigQsort0(temp, 0, cnt - 1);
 
       num_cols_offd_C = 1;
       value = temp[0];
-      for (i=1; i < cnt; i++)
+      for (i = 1; i < cnt; i++)
       {
          if (temp[i] > value)
          {
@@ -449,45 +460,52 @@ hypre_ParCSRMatrix * hypre_ParMatmul_FC(
       }
    }
 
-   if (num_cols_offd_C)
-      col_map_offd_C = hypre_CTAlloc(HYPRE_BigInt, num_cols_offd_C, HYPRE_MEMORY_HOST);
-
-   for (i=0; i < num_cols_offd_C; i++)
+   col_map_offd_C = hypre_CTAlloc(HYPRE_BigInt, num_cols_offd_C, HYPRE_MEMORY_HOST);
+   for (i = 0; i < num_cols_offd_C; i++)
+   {
       col_map_offd_C[i] = temp[i];
+   }
 
    if (P_ext_offd_size || num_cols_offd_P)
+   {
       hypre_TFree(temp, HYPRE_MEMORY_HOST);
+   }
 
-   for (i=0 ; i < P_ext_offd_size; i++)
+   for (i = 0; i < P_ext_offd_size; i++)
+   {
       P_ext_offd_j[i] = hypre_BigBinarySearch(col_map_offd_C,
-                                           Ps_ext_j[i],
-                                           num_cols_offd_C);
+                                              Ps_ext_j[i],
+                                              num_cols_offd_C);
+   }
+
    if (num_cols_offd_P)
    {
       map_P_to_C = hypre_CTAlloc(HYPRE_Int, num_cols_offd_P, HYPRE_MEMORY_HOST);
 
       cnt = 0;
-      for (i=0; i < num_cols_offd_C; i++)
+      for (i = 0; i < num_cols_offd_C; i++)
+      {
          if (col_map_offd_C[i] == col_map_offd_P[cnt])
          {
             map_P_to_C[cnt++] = i;
-            if (cnt == num_cols_offd_P) break;
+            if (cnt == num_cols_offd_P) { break; }
          }
+      }
    }
 
-   if (num_procs > 1) hypre_CSRMatrixDestroy(Ps_ext);
+   if (num_procs > 1) { hypre_CSRMatrixDestroy(Ps_ext); }
 
    /*-----------------------------------------------------------------------
     *  Allocate marker array.
     *-----------------------------------------------------------------------*/
 
-   P_marker = hypre_CTAlloc(HYPRE_Int,  num_cols_diag_P+num_cols_offd_C, HYPRE_MEMORY_HOST);
+   P_marker = hypre_CTAlloc(HYPRE_Int,  num_cols_diag_P + num_cols_offd_C, HYPRE_MEMORY_HOST);
 
    /*-----------------------------------------------------------------------
     *  Initialize some stuff.
     *-----------------------------------------------------------------------*/
 
-   for (i1 = 0; i1 < num_cols_diag_P+num_cols_offd_C; i1++)
+   for (i1 = 0; i1 < num_cols_diag_P + num_cols_offd_C; i1++)
    {
       P_marker[i1] = -1;
    }
@@ -505,7 +523,7 @@ hypre_ParCSRMatrix * hypre_ParMatmul_FC(
       num_rows_diag_A, num_cols_offd_A, allsquare,
       num_cols_diag_P, num_cols_offd_P,
       num_cols_offd_C, CF_marker, dof_func, dof_func_offd
-      );
+   );
 
    /* The above call of hypre_ParMatmul_RowSizes_Marked computed
       two scalars: C_diag_size, C_offd_size,
@@ -539,7 +557,7 @@ hypre_ParCSRMatrix * hypre_ParMatmul_FC(
 
    jj_count_diag = start_indexing;
    jj_count_offd = start_indexing;
-   for (i1 = 0; i1 < num_cols_diag_P+num_cols_offd_C; i1++)
+   for (i1 = 0; i1 < num_cols_diag_P + num_cols_offd_C; i1++)
    {
       P_marker[i1] = -1;
    }
@@ -570,20 +588,21 @@ hypre_ParCSRMatrix * hypre_ParMatmul_FC(
 
          if (num_cols_offd_A)
          {
-            for (jj2 = A_offd_i[i1]; jj2 < A_offd_i[i1+1]; jj2++)
+            for (jj2 = A_offd_i[i1]; jj2 < A_offd_i[i1 + 1]; jj2++)
             {
                i2 = A_offd_j[jj2];
-               if( dof_func==NULL || dof_func[i1] == dof_func_offd[i2] )
-               {  /* interpolate only like "functions" */
+               if ( dof_func == NULL || dof_func[i1] == dof_func_offd[i2] )
+               {
+                  /* interpolate only like "functions" */
                   a_entry = A_offd_data[jj2];
 
                   /*-----------------------------------------------------------
                    *  Loop over entries in row i2 of P_ext.
                    *-----------------------------------------------------------*/
 
-                  for (jj3 = P_ext_offd_i[i2]; jj3 < P_ext_offd_i[i2+1]; jj3++)
+                  for (jj3 = P_ext_offd_i[i2]; jj3 < P_ext_offd_i[i2 + 1]; jj3++)
                   {
-                     i3 = num_cols_diag_P+P_ext_offd_j[jj3];
+                     i3 = num_cols_diag_P + P_ext_offd_j[jj3];
                      a_b_product = a_entry * P_ext_offd_data[jj3];
 
                      /*--------------------------------------------------------
@@ -595,13 +614,15 @@ hypre_ParCSRMatrix * hypre_ParMatmul_FC(
                      {
                         P_marker[i3] = jj_count_offd;
                         C_offd_data[jj_count_offd] = a_b_product;
-                        C_offd_j[jj_count_offd] = i3-num_cols_diag_P;
+                        C_offd_j[jj_count_offd] = i3 - num_cols_diag_P;
                         jj_count_offd++;
                      }
                      else
+                     {
                         C_offd_data[P_marker[i3]] += a_b_product;
+                     }
                   }
-                  for (jj3 = P_ext_diag_i[i2]; jj3 < P_ext_diag_i[i2+1]; jj3++)
+                  for (jj3 = P_ext_diag_i[i2]; jj3 < P_ext_diag_i[i2 + 1]; jj3++)
                   {
                      i3 = P_ext_diag_j[jj3];
                      a_b_product = a_entry * P_ext_diag_data[jj3];
@@ -614,11 +635,14 @@ hypre_ParCSRMatrix * hypre_ParMatmul_FC(
                         jj_count_diag++;
                      }
                      else
+                     {
                         C_diag_data[P_marker[i3]] += a_b_product;
+                     }
                   }
                }
                else
-               {  /* Interpolation mat should be 0 where i1 and i2 correspond to
+               {
+                  /* Interpolation mat should be 0 where i1 and i2 correspond to
                      different "functions".  As we haven't created an entry for
                      C(i1,i2), nothing needs to be done. */
                }
@@ -630,18 +654,19 @@ hypre_ParCSRMatrix * hypre_ParMatmul_FC(
           *  Loop over entries in row i1 of A_diag.
           *-----------------------------------------------------------------*/
 
-         for (jj2 = A_diag_i[i1]; jj2 < A_diag_i[i1+1]; jj2++)
+         for (jj2 = A_diag_i[i1]; jj2 < A_diag_i[i1 + 1]; jj2++)
          {
             i2 = A_diag_j[jj2];
-            if( dof_func==NULL || dof_func[i1] == dof_func[i2] )
-            {  /* interpolate only like "functions" */
+            if ( dof_func == NULL || dof_func[i1] == dof_func[i2] )
+            {
+               /* interpolate only like "functions" */
                a_entry = A_diag_data[jj2];
 
                /*-----------------------------------------------------------
                 *  Loop over entries in row i2 of P_diag.
                 *-----------------------------------------------------------*/
 
-               for (jj3 = P_diag_i[i2]; jj3 < P_diag_i[i2+1]; jj3++)
+               for (jj3 = P_diag_i[i2]; jj3 < P_diag_i[i2 + 1]; jj3++)
                {
                   i3 = P_diag_j[jj3];
                   a_b_product = a_entry * P_diag_data[jj3];
@@ -666,9 +691,9 @@ hypre_ParCSRMatrix * hypre_ParMatmul_FC(
                }
                if (num_cols_offd_P)
                {
-                  for (jj3 = P_offd_i[i2]; jj3 < P_offd_i[i2+1]; jj3++)
+                  for (jj3 = P_offd_i[i2]; jj3 < P_offd_i[i2 + 1]; jj3++)
                   {
-                     i3 = num_cols_diag_P+map_P_to_C[P_offd_j[jj3]];
+                     i3 = num_cols_diag_P + map_P_to_C[P_offd_j[jj3]];
                      a_b_product = a_entry * P_offd_data[jj3];
 
                      /*--------------------------------------------------------
@@ -681,7 +706,7 @@ hypre_ParCSRMatrix * hypre_ParMatmul_FC(
                      {
                         P_marker[i3] = jj_count_offd;
                         C_offd_data[jj_count_offd] = a_b_product;
-                        C_offd_j[jj_count_offd] = i3-num_cols_diag_P;
+                        C_offd_j[jj_count_offd] = i3 - num_cols_diag_P;
                         jj_count_offd++;
                      }
                      else
@@ -692,7 +717,8 @@ hypre_ParCSRMatrix * hypre_ParMatmul_FC(
                }
             }
             else
-            {  /* Interpolation mat should be 0 where i1 and i2 correspond to
+            {
+               /* Interpolation mat should be 0 where i1 and i2 correspond to
                   different "functions".  As we haven't created an entry for
                   C(i1,i2), nothing needs to be done. */
             }
@@ -704,14 +730,14 @@ hypre_ParCSRMatrix * hypre_ParMatmul_FC(
       {
          if (num_cols_offd_P)
          {
-            for (jj2 = P_offd_i[i1]; jj2 < P_offd_i[i1+1]; jj2++)
+            for (jj2 = P_offd_i[i1]; jj2 < P_offd_i[i1 + 1]; jj2++)
             {
                C_offd_j[jj_count_offd] = P_offd_j[jj_count_offd];
                C_offd_data[jj_count_offd] = P_offd_data[jj_count_offd];
                ++jj_count_offd;
             }
          }
-         for (jj2 = P_diag_i[i1]; jj2 < P_diag_i[i1+1]; jj2++)
+         for (jj2 = P_diag_i[i1]; jj2 < P_diag_i[i1 + 1]; jj2++)
          {
             C_diag_j[jj_count_diag] = P_diag_j[jj2];
             C_diag_data[jj_count_diag] = P_diag_data[jj2];
@@ -721,8 +747,8 @@ hypre_ParCSRMatrix * hypre_ParMatmul_FC(
    }
 
    C = hypre_ParCSRMatrixCreate(
-      comm, n_rows_A_global, n_cols_P_global,
-      row_starts_A, col_starts_P, num_cols_offd_C, C_diag_size, C_offd_size );
+          comm, n_rows_A_global, n_cols_P_global,
+          row_starts_A, col_starts_P, num_cols_offd_C, C_diag_size, C_offd_size );
 
    C_diag = hypre_ParCSRMatrixDiag(C);
    hypre_CSRMatrixData(C_diag) = C_diag_data;
@@ -757,7 +783,7 @@ hypre_ParCSRMatrix * hypre_ParMatmul_FC(
       hypre_TFree(P_ext_offd_j, HYPRE_MEMORY_HOST);
       hypre_TFree(P_ext_offd_data, HYPRE_MEMORY_HOST);
    }
-   if (num_cols_offd_P) hypre_TFree(map_P_to_C, HYPRE_MEMORY_HOST);
+   if (num_cols_offd_P) { hypre_TFree(map_P_to_C, HYPRE_MEMORY_HOST); }
 
    return C;
 
@@ -816,10 +842,10 @@ void hypre_ParMatScaleDiagInv_F(
           *  Loop over A_diag data
           *-----------------------------------------------------------------*/
 
-         for (jj2 = A_diag_i[i1]; jj2 < A_diag_i[i1+1]; jj2++)
+         for (jj2 = A_diag_i[i1]; jj2 < A_diag_i[i1 + 1]; jj2++)
          {
             i2 = A_diag_j[jj2];
-            if ( i1==i2 )  /* diagonal of A only */
+            if ( i1 == i2 ) /* diagonal of A only */
             {
                a_entry = A_diag_data[jj2] * weight;
 
@@ -827,7 +853,7 @@ void hypre_ParMatScaleDiagInv_F(
                 *  Loop over entries in current row of C_diag.
                 *-----------------------------------------------------------*/
 
-               for (jj3 = C_diag_i[i2]; jj3 < C_diag_i[i2+1]; jj3++)
+               for (jj3 = C_diag_i[i2]; jj3 < C_diag_i[i2 + 1]; jj3++)
                {
                   C_diag_data[jj3] = C_diag_data[jj3] / a_entry;
 
@@ -839,7 +865,7 @@ void hypre_ParMatScaleDiagInv_F(
 
                if ( num_cols_offd_C )
                {
-                  for (jj3 = C_offd_i[i2]; jj3 < C_offd_i[i2+1]; jj3++)
+                  for (jj3 = C_offd_i[i2]; jj3 < C_offd_i[i2 + 1]; jj3++)
                   {
                      C_offd_data[jj3] = C_offd_data[jj3] / a_entry;
                   }
@@ -943,35 +969,35 @@ hypre_ParCSRMatrix * hypre_ParMatMinus_F(
       algorithm I'm using for the offd block is really any slower than the more
       complicated "linear" algorithm here. */
    jrange = 0;
-   jrangem1=-1;
+   jrangem1 = -1;
    for ( i1 = 0; i1 < num_rows_diag_C; i1++ )
    {
       /* only Fine rows matter */
-      if ( CF_marker[i1]<0 && hypre_CSRMatrixNumNonzeros(Pnew_diag)>0 )
+      if ( CF_marker[i1] < 0 && hypre_CSRMatrixNumNonzeros(Pnew_diag) > 0 )
       {
          jmin = Pnew_diag_j[ Pnew_diag_i[i1] ];
-         jmax = Pnew_diag_j[ Pnew_diag_i[i1+1]-1 ];
-         jrangem1 = jmax-jmin;
-         jrange = hypre_max(jrange,jrangem1+1);
+         jmax = Pnew_diag_j[ Pnew_diag_i[i1 + 1] - 1 ];
+         jrangem1 = jmax - jmin;
+         jrange = hypre_max(jrange, jrangem1 + 1);
          /* If columns (of a given row) were in increasing order, the above
             would be sufficient.  If not, the following would be necessary (and
             sufficient) */
          jmin = Pnew_diag_j[ Pnew_diag_i[i1] ];
          jmax = Pnew_diag_j[ Pnew_diag_i[i1] ];
-         for ( m=Pnew_diag_i[i1]+1; m<Pnew_diag_i[i1+1]; ++m )
+         for ( m = Pnew_diag_i[i1] + 1; m < Pnew_diag_i[i1 + 1]; ++m )
          {
             j = Pnew_diag_j[m];
             jmin = hypre_min( jmin, j );
             jmax = hypre_max( jmax, j );
          }
-         for ( m=P_diag_i[i1]; m<P_diag_i[i1+1]; ++m )
+         for ( m = P_diag_i[i1]; m < P_diag_i[i1 + 1]; ++m )
          {
             j = P_diag_j[m];
             jmin = hypre_min( jmin, j );
             jmax = hypre_max( jmax, j );
          }
-         jrangem1 = jmax-jmin;
-         jrange = hypre_max(jrange,jrangem1+1);
+         jrangem1 = jmax - jmin;
+         jrange = hypre_max(jrange, jrangem1 + 1);
       }
    }
 
@@ -981,35 +1007,35 @@ hypre_ParCSRMatrix * hypre_ParMatMinus_F(
     *  Pnew_diag_j[ Pnew_j2m[j] ] = j
     *-----------------------------------------------------------------------*/
 
-   Pnew_j2m = hypre_CTAlloc( HYPRE_Int,  jrange , HYPRE_MEMORY_HOST);
+   Pnew_j2m = hypre_CTAlloc( HYPRE_Int,  jrange, HYPRE_MEMORY_HOST);
 
    for ( i1 = 0; i1 < num_rows_diag_C; i1++ )
    {
       /* Fine data only */
-      if ( CF_marker[i1]<0 && hypre_CSRMatrixNumNonzeros(Pnew_diag)>0 )
+      if ( CF_marker[i1] < 0 && hypre_CSRMatrixNumNonzeros(Pnew_diag) > 0 )
       {
          /* just needed for an assertion below... */
-         for ( j=0; j<jrange; ++j ) Pnew_j2m[j] = -1;
+         for ( j = 0; j < jrange; ++j ) { Pnew_j2m[j] = -1; }
          jmin = Pnew_diag_j[ Pnew_diag_i[i1] ];
          /* If columns (of a given row) were in increasing order, the above line
             would be sufficient.  If not, the following loop would have to be
             added (or store the jmin computed above )*/
-         for ( m=Pnew_diag_i[i1]+1; m<Pnew_diag_i[i1+1]; ++m )
+         for ( m = Pnew_diag_i[i1] + 1; m < Pnew_diag_i[i1 + 1]; ++m )
          {
             j = Pnew_diag_j[m];
             jmin = hypre_min( jmin, j );
          }
-         for ( m=P_diag_i[i1]; m<P_diag_i[i1+1]; ++m )
+         for ( m = P_diag_i[i1]; m < P_diag_i[i1 + 1]; ++m )
          {
             j = P_diag_j[m];
             jmin = hypre_min( jmin, j );
          }
-         for ( m = Pnew_diag_i[i1]; m<Pnew_diag_i[i1+1]; ++m )
+         for ( m = Pnew_diag_i[i1]; m < Pnew_diag_i[i1 + 1]; ++m )
          {
             j = Pnew_diag_j[m];
-            hypre_assert( j-jmin>=0 );
-            hypre_assert( j-jmin<jrange );
-            Pnew_j2m[ j-jmin ] = m;
+            hypre_assert( j - jmin >= 0 );
+            hypre_assert( j - jmin < jrange );
+            Pnew_j2m[ j - jmin ] = m;
          }
 
          /*-----------------------------------------------------------------------
@@ -1017,12 +1043,12 @@ hypre_ParCSRMatrix * hypre_ParMatMinus_F(
           *  Subtract each C data entry from the corresponding Pnew entry.
           *-----------------------------------------------------------------------*/
 
-         for ( mc=C_diag_i[i1]; mc<C_diag_i[i1+1]; ++mc )
+         for ( mc = C_diag_i[i1]; mc < C_diag_i[i1 + 1]; ++mc )
          {
             jc = C_diag_j[mc];
             dc = C_diag_data[mc];
-            m = Pnew_j2m[jc-jmin];
-            hypre_assert( m>=0 );
+            m = Pnew_j2m[jc - jmin];
+            hypre_assert( m >= 0 );
             Pnew_diag_data[m] -= dc;
          }
 
@@ -1031,12 +1057,12 @@ hypre_ParCSRMatrix * hypre_ParMatMinus_F(
           *  Add each P data entry from the corresponding Pnew entry.
           *-----------------------------------------------------------------------*/
 
-         for ( mp=P_diag_i[i1]; mp<P_diag_i[i1+1]; ++mp )
+         for ( mp = P_diag_i[i1]; mp < P_diag_i[i1 + 1]; ++mp )
          {
             jp = P_diag_j[mp];
             dp = P_diag_data[mp];
-            m = Pnew_j2m[jp-jmin];
-            hypre_assert( m>=0 );
+            m = Pnew_j2m[jp - jmin];
+            hypre_assert( m >= 0 );
             Pnew_diag_data[m] += dp;
          }
       }
@@ -1049,30 +1075,30 @@ hypre_ParCSRMatrix * hypre_ParMatMinus_F(
    for ( i1 = 0; i1 < num_rows_offd_Pnew; i1++ )
    {
       /* Fine data only */
-      if ( CF_marker[i1]<0 && hypre_CSRMatrixNumNonzeros(Pnew_offd)>0 )
+      if ( CF_marker[i1] < 0 && hypre_CSRMatrixNumNonzeros(Pnew_offd) > 0 )
       {
          if ( num_cols_offd_Pnew )
          {
             /*  This is a simple quadratic algorithm.  If necessary I may try
                 to implement the ideas used on the diag block later. */
-            for ( m = Pnew_offd_i[i1]; m<Pnew_offd_i[i1+1]; ++m )
+            for ( m = Pnew_offd_i[i1]; m < Pnew_offd_i[i1 + 1]; ++m )
             {
                j = Pnew_offd_j[m];
                jg = Pnew_col_map_offd[j];
                Pnew_offd_data[m] = 0;
                if ( num_cols_offd_C )
-                  for ( mc=C_offd_i[i1]; mc<C_offd_i[i1+1]; ++mc )
+                  for ( mc = C_offd_i[i1]; mc < C_offd_i[i1 + 1]; ++mc )
                   {
                      jC = C_offd_j[mc];
                      jCg = C_col_map_offd[jC];
-                     if ( jCg==jg ) Pnew_offd_data[m] -= C_offd_data[mc];
+                     if ( jCg == jg ) { Pnew_offd_data[m] -= C_offd_data[mc]; }
                   }
                if ( num_cols_offd_P )
-                  for ( mp=P_offd_i[i1]; mp<P_offd_i[i1+1]; ++mp )
+                  for ( mp = P_offd_i[i1]; mp < P_offd_i[i1 + 1]; ++mp )
                   {
                      jP = P_offd_j[mp];
                      jPg = P_col_map_offd[jP];
-                     if ( jPg==jg ) Pnew_offd_data[m] += P_offd_data[mp];
+                     if ( jPg == jg ) { Pnew_offd_data[m] += P_offd_data[mp]; }
                   }
             }
          }
@@ -1101,22 +1127,22 @@ void  hypre_ParCSRMatrixZero_F( hypre_ParCSRMatrix * P,
    HYPRE_Int        num_cols_offd_P = hypre_CSRMatrixNumCols(P_offd);
    HYPRE_Int        i1,  m;
 
-   for ( i1= 0; i1 < num_rows_diag_P; i1++ )
+   for ( i1 = 0; i1 < num_rows_diag_P; i1++ )
    {
       if ( CF_marker[i1] < 0 )  /* Fine rows only */
       {
-         for ( m=P_diag_i[i1]; m<P_diag_i[i1+1]; ++m )
+         for ( m = P_diag_i[i1]; m < P_diag_i[i1 + 1]; ++m )
          {
             P_diag_data[m] = 0;
          }
       }
    }
    if ( num_cols_offd_P )
-      for ( i1= 0; i1 < num_rows_offd_P; i1++ )
+      for ( i1 = 0; i1 < num_rows_offd_P; i1++ )
       {
          if ( CF_marker[i1] < 0 )  /* Fine rows only */
          {
-            for ( m=P_offd_i[i1]; m<P_offd_i[i1+1]; ++m )
+            for ( m = P_offd_i[i1]; m < P_offd_i[i1 + 1]; ++m )
             {
                P_offd_data[m] = 0;
             }
@@ -1147,22 +1173,22 @@ void hypre_ParCSRMatrixCopy_C( hypre_ParCSRMatrix * P,
 
    HYPRE_Int i1, m;
 
-   for ( i1= 0; i1 < num_rows_diag_C; i1++ )
+   for ( i1 = 0; i1 < num_rows_diag_C; i1++ )
    {
       if ( CF_marker[i1] >= 0 )  /* Coarse rows only */
       {
-         for ( m=C_diag_i[i1]; m<C_diag_i[i1+1]; ++m )
+         for ( m = C_diag_i[i1]; m < C_diag_i[i1 + 1]; ++m )
          {
             P_diag_data[m] = C_diag_data[m];
          }
       }
    }
    if ( num_cols_offd_C )
-      for ( i1= 0; i1 < num_rows_offd_C; i1++ )
+      for ( i1 = 0; i1 < num_rows_offd_C; i1++ )
       {
          if ( CF_marker[i1] >= 0 )  /* Coarse rows only */
          {
-            for ( m=C_offd_i[i1]; m<C_offd_i[i1+1]; ++m )
+            for ( m = C_offd_i[i1]; m < C_offd_i[i1 + 1]; ++m )
             {
                P_offd_data[m] = C_offd_data[m];
             }
@@ -1213,15 +1239,15 @@ void hypre_ParCSRMatrixDropEntries( hypre_ParCSRMatrix * C,
       Elements of Coarse rows (CF_marker>=0) are always kept.
       The arrays are not re-allocated, so there will generally be unused space
       at the ends of the arrays. */
-   new_C_diag_i = hypre_CTAlloc( HYPRE_Int,  num_rows_diag_C+1 , HYPRE_MEMORY_HOST);
-   new_C_offd_i = hypre_CTAlloc( HYPRE_Int,  num_rows_offd_C+1 , HYPRE_MEMORY_HOST);
+   new_C_diag_i = hypre_CTAlloc( HYPRE_Int,  num_rows_diag_C + 1, HYPRE_MEMORY_HOST);
+   new_C_offd_i = hypre_CTAlloc( HYPRE_Int,  num_rows_offd_C + 1, HYPRE_MEMORY_HOST);
    m1d = C_diag_i[0];
    m1o = C_offd_i[0];
    for ( i1 = 0; i1 < num_rows_diag_C; i1++ )
    {
       old_sum = 0;
       new_sum = 0;
-      for ( m=C_diag_i[i1]; m<C_diag_i[i1+1]; ++m )
+      for ( m = C_diag_i[i1]; m < C_diag_i[i1 + 1]; ++m )
       {
          v = C_diag_data[m];
          jC = C_diag_j[m];
@@ -1231,74 +1257,83 @@ void hypre_ParCSRMatrixDropEntries( hypre_ParCSRMatrix * C,
             ordering or index scheme will be needed for efficiency (worth doing
             iff this function gets called at all ) (may2006: this function is no
             longer called) */
-         keep=0;
-         for ( mP=P_diag_i[i1]; mP<P_diag_i[i1+1]; ++mP )
+         keep = 0;
+         for ( mP = P_diag_i[i1]; mP < P_diag_i[i1 + 1]; ++mP )
          {
-            if ( jC==P_diag_j[m] )
+            if ( jC == P_diag_j[m] )
             {
-               keep=1;
+               keep = 1;
                break;
             }
          }
-         if ( CF_marker[i1]>=0 || keep==1 )
-         {  /* keep v in C */
+         if ( CF_marker[i1] >= 0 || keep == 1 )
+         {
+            /* keep v in C */
             new_sum += v;
             C_diag_j[m1d] = C_diag_j[m];
             C_diag_data[m1d] = C_diag_data[m];
             ++m1d;
          }
          else
-         {  /* discard v */
+         {
+            /* discard v */
             --num_nonzeros_diag;
          }
       }
-      for ( m=C_offd_i[i1]; m<C_offd_i[i1+1]; ++m )
+      for ( m = C_offd_i[i1]; m < C_offd_i[i1 + 1]; ++m )
       {
          v = C_offd_data[m];
          jC = C_diag_j[m];
          old_sum += v;
-         keep=0;
-         for ( mP=P_offd_i[i1]; mP<P_offd_i[i1+1]; ++mP )
+         keep = 0;
+         for ( mP = P_offd_i[i1]; mP < P_offd_i[i1 + 1]; ++mP )
          {
-            if ( jC==P_offd_j[m] )
+            if ( jC == P_offd_j[m] )
             {
-               keep=1;
+               keep = 1;
                break;
             }
          }
-         if ( CF_marker[i1]>=0 || v>=vmax || v<=vmin ) /* RDF: Always true!? */
-         {  /* keep v in C */
+         if ( CF_marker[i1] >= 0 || v >= vmax || v <= vmin ) /* RDF: Always true!? */
+         {
+            /* keep v in C */
             new_sum += v;
             C_offd_j[m1o] = C_offd_j[m];
             C_offd_data[m1o] = C_offd_data[m];
             ++m1o;
          }
          else
-         {  /* discard v */
+         {
+            /* discard v */
             --num_nonzeros_offd;
          }
       }
 
-      new_C_diag_i[i1+1] = m1d;
-      if ( i1<num_rows_offd_C ) new_C_offd_i[i1+1] = m1o;
+      new_C_diag_i[i1 + 1] = m1d;
+      if ( i1 < num_rows_offd_C ) { new_C_offd_i[i1 + 1] = m1o; }
 
       /* rescale to keep row sum the same */
-      if (new_sum!=0) scale = old_sum/new_sum; else scale = 1.0;
-      for ( m=new_C_diag_i[i1]; m<new_C_diag_i[i1+1]; ++m )
+      if (new_sum != 0) { scale = old_sum / new_sum; }
+      else { scale = 1.0; }
+      for ( m = new_C_diag_i[i1]; m < new_C_diag_i[i1 + 1]; ++m )
+      {
          C_diag_data[m] *= scale;
-      if ( i1<num_rows_offd_C ) /* this test fails when there is no offd block */
-         for ( m=new_C_offd_i[i1]; m<new_C_offd_i[i1+1]; ++m )
+      }
+      if ( i1 < num_rows_offd_C ) /* this test fails when there is no offd block */
+         for ( m = new_C_offd_i[i1]; m < new_C_offd_i[i1 + 1]; ++m )
+         {
             C_offd_data[m] *= scale;
+         }
 
    }
 
    for ( i1 = 1; i1 <= num_rows_diag_C; i1++ )
    {
       C_diag_i[i1] = new_C_diag_i[i1];
-      if ( i1<num_rows_offd_C ) C_offd_i[i1] = new_C_offd_i[i1];
+      if ( i1 < num_rows_offd_C ) { C_offd_i[i1] = new_C_offd_i[i1]; }
    }
-   hypre_TFree( new_C_diag_i , HYPRE_MEMORY_HOST);
-   if ( num_rows_offd_C>0 ) hypre_TFree( new_C_offd_i , HYPRE_MEMORY_HOST);
+   hypre_TFree( new_C_diag_i, HYPRE_MEMORY_HOST);
+   if ( num_rows_offd_C > 0 ) { hypre_TFree( new_C_offd_i, HYPRE_MEMORY_HOST); }
 
    hypre_CSRMatrixNumNonzeros(C_diag) = num_nonzeros_diag;
    hypre_CSRMatrixNumNonzeros(C_offd) = num_nonzeros_offd;
diff --git a/external/hypre/src/parcsr_mv/par_csr_matrix.c b/external/hypre/src/parcsr_mv/par_csr_matrix.c
index 34699f0e..620f0c5f 100644
--- a/external/hypre/src/parcsr_mv/par_csr_matrix.c
+++ b/external/hypre/src/parcsr_mv/par_csr_matrix.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -22,7 +22,8 @@
    accessor functions become proper functions at some later date, this will not
    be necessary. AJC 4/99 */
 
-HYPRE_Int hypre_FillResponseParToCSRMatrix(void*, HYPRE_Int, HYPRE_Int, void*, MPI_Comm, void**, HYPRE_Int*);
+HYPRE_Int hypre_FillResponseParToCSRMatrix(void*, HYPRE_Int, HYPRE_Int, void*, MPI_Comm, void**,
+                                           HYPRE_Int*);
 
 /*--------------------------------------------------------------------------
  * hypre_ParCSRMatrixCreate
@@ -52,8 +53,8 @@ hypre_ParCSRMatrixCreate( MPI_Comm      comm,
 
    matrix = hypre_CTAlloc(hypre_ParCSRMatrix, 1, HYPRE_MEMORY_HOST);
 
-   hypre_MPI_Comm_rank(comm,&my_id);
-   hypre_MPI_Comm_size(comm,&num_procs);
+   hypre_MPI_Comm_rank(comm, &my_id);
+   hypre_MPI_Comm_size(comm, &num_procs);
 
    if (!row_starts_in)
    {
@@ -94,6 +95,8 @@ hypre_ParCSRMatrixCreate( MPI_Comm      comm,
    hypre_ParCSRMatrixGlobalNumRows(matrix)   = global_num_rows;
    hypre_ParCSRMatrixGlobalNumCols(matrix)   = global_num_cols;
    hypre_ParCSRMatrixGlobalNumRownnz(matrix) = global_num_rows;
+   hypre_ParCSRMatrixNumNonzeros(matrix)     = -1;   /* Uninitialized */
+   hypre_ParCSRMatrixDNumNonzeros(matrix)    = -1.0; /* Uninitialized */
    hypre_ParCSRMatrixFirstRowIndex(matrix)   = first_row_index;
    hypre_ParCSRMatrixFirstColDiag(matrix)    = first_col_diag;
    hypre_ParCSRMatrixLastRowIndex(matrix) = first_row_index + local_num_rows - 1;
@@ -124,7 +127,7 @@ hypre_ParCSRMatrixCreate( MPI_Comm      comm,
    matrix->bdiaginv_comm_pkg = NULL;
    matrix->bdiag_size = -1;
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
    hypre_ParCSRMatrixSocDiagJ(matrix) = NULL;
    hypre_ParCSRMatrixSocOffdJ(matrix) = NULL;
 #endif
@@ -184,7 +187,8 @@ hypre_ParCSRMatrixDestroy( hypre_ParCSRMatrix *matrix )
       hypre_TFree(hypre_ParCSRMatrixRowindices(matrix), memory_location);
       hypre_TFree(hypre_ParCSRMatrixRowvalues(matrix), memory_location);
 
-      if ( hypre_ParCSRMatrixAssumedPartition(matrix) && hypre_ParCSRMatrixOwnsAssumedPartition(matrix) )
+      if ( hypre_ParCSRMatrixAssumedPartition(matrix) &&
+           hypre_ParCSRMatrixOwnsAssumedPartition(matrix) )
       {
          hypre_AssumedPartitionDestroy(hypre_ParCSRMatrixAssumedPartition(matrix));
       }
@@ -200,7 +204,7 @@ hypre_ParCSRMatrixDestroy( hypre_ParCSRMatrix *matrix )
          hypre_MatvecCommPkgDestroy(matrix->bdiaginv_comm_pkg);
       }
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
       hypre_TFree(hypre_ParCSRMatrixSocDiagJ(matrix), HYPRE_MEMORY_DEVICE);
       hypre_TFree(hypre_ParCSRMatrixSocOffdJ(matrix), HYPRE_MEMORY_DEVICE);
 #endif
@@ -212,11 +216,12 @@ hypre_ParCSRMatrixDestroy( hypre_ParCSRMatrix *matrix )
 }
 
 /*--------------------------------------------------------------------------
- * hypre_ParCSRMatrixInitialize
+ * hypre_ParCSRMatrixInitialize_v2
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_ParCSRMatrixInitialize_v2( hypre_ParCSRMatrix *matrix, HYPRE_MemoryLocation memory_location )
+hypre_ParCSRMatrixInitialize_v2( hypre_ParCSRMatrix   *matrix,
+                                 HYPRE_MemoryLocation  memory_location )
 {
    if (!matrix)
    {
@@ -228,12 +233,17 @@ hypre_ParCSRMatrixInitialize_v2( hypre_ParCSRMatrix *matrix, HYPRE_MemoryLocatio
    hypre_CSRMatrixInitialize_v2(hypre_ParCSRMatrixOffd(matrix), 0, memory_location);
 
    hypre_ParCSRMatrixColMapOffd(matrix) =
-      hypre_CTAlloc(HYPRE_BigInt, hypre_CSRMatrixNumCols(hypre_ParCSRMatrixOffd(matrix)),
+      hypre_CTAlloc(HYPRE_BigInt,
+                    hypre_CSRMatrixNumCols(hypre_ParCSRMatrixOffd(matrix)),
                     HYPRE_MEMORY_HOST);
 
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixInitialize
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_ParCSRMatrixInitialize( hypre_ParCSRMatrix *matrix )
 {
@@ -248,10 +258,14 @@ hypre_ParCSRMatrixInitialize( hypre_ParCSRMatrix *matrix )
  *--------------------------------------------------------------------------*/
 
 hypre_ParCSRMatrix*
-hypre_ParCSRMatrixClone_v2(hypre_ParCSRMatrix *A, HYPRE_Int copy_data, HYPRE_MemoryLocation memory_location)
+hypre_ParCSRMatrixClone_v2(hypre_ParCSRMatrix   *A,
+                           HYPRE_Int             copy_data,
+                           HYPRE_MemoryLocation  memory_location)
 {
    hypre_ParCSRMatrix *S;
 
+   hypre_GpuProfilingPushRange("hypre_ParCSRMatrixClone");
+
    S = hypre_ParCSRMatrixCreate( hypre_ParCSRMatrixComm(A),
                                  hypre_ParCSRMatrixGlobalNumRows(A),
                                  hypre_ParCSRMatrixGlobalNumCols(A),
@@ -268,17 +282,28 @@ hypre_ParCSRMatrixClone_v2(hypre_ParCSRMatrix *A, HYPRE_Int copy_data, HYPRE_Mem
 
    hypre_ParCSRMatrixCopy(A, S, copy_data);
 
+   hypre_GpuProfilingPopRange();
+
    return S;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixClone
+ *--------------------------------------------------------------------------*/
+
 hypre_ParCSRMatrix*
 hypre_ParCSRMatrixClone(hypre_ParCSRMatrix *A, HYPRE_Int copy_data)
 {
    return hypre_ParCSRMatrixClone_v2(A, copy_data, hypre_ParCSRMatrixMemoryLocation(A));
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixMigrate
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_ParCSRMatrixMigrate(hypre_ParCSRMatrix *A, HYPRE_MemoryLocation memory_location)
+hypre_ParCSRMatrixMigrate(hypre_ParCSRMatrix   *A,
+                          HYPRE_MemoryLocation  memory_location)
 {
    if (!A)
    {
@@ -287,30 +312,27 @@ hypre_ParCSRMatrixMigrate(hypre_ParCSRMatrix *A, HYPRE_MemoryLocation memory_loc
 
    HYPRE_MemoryLocation old_memory_location = hypre_ParCSRMatrixMemoryLocation(A);
 
-   if ( hypre_GetActualMemLocation(memory_location) != hypre_GetActualMemLocation(old_memory_location) )
-   {
-      hypre_CSRMatrix *A_diag = hypre_CSRMatrixClone_v2(hypre_ParCSRMatrixDiag(A), 1, memory_location);
-      hypre_CSRMatrixDestroy(hypre_ParCSRMatrixDiag(A));
-      hypre_ParCSRMatrixDiag(A) = A_diag;
-
-      hypre_CSRMatrix *A_offd = hypre_CSRMatrixClone_v2(hypre_ParCSRMatrixOffd(A), 1, memory_location);
-      hypre_CSRMatrixDestroy(hypre_ParCSRMatrixOffd(A));
-      hypre_ParCSRMatrixOffd(A) = A_offd;
+   hypre_CSRMatrixMigrate(hypre_ParCSRMatrixDiag(A), memory_location);
+   hypre_CSRMatrixMigrate(hypre_ParCSRMatrixOffd(A), memory_location);
 
+   /* Free buffers */
+   if ( hypre_GetActualMemLocation(memory_location) !=
+        hypre_GetActualMemLocation(old_memory_location) )
+   {
       hypre_TFree(hypre_ParCSRMatrixRowindices(A), old_memory_location);
       hypre_TFree(hypre_ParCSRMatrixRowvalues(A), old_memory_location);
    }
-   else
-   {
-      hypre_CSRMatrixMemoryLocation(hypre_ParCSRMatrixDiag(A)) = memory_location;
-      hypre_CSRMatrixMemoryLocation(hypre_ParCSRMatrixOffd(A)) = memory_location;
-   }
 
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixSetNumNonzeros_core
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_ParCSRMatrixSetNumNonzeros_core( hypre_ParCSRMatrix *matrix, const char* format )
+hypre_ParCSRMatrixSetNumNonzeros_core( hypre_ParCSRMatrix *matrix,
+                                       const char         *format )
 {
    MPI_Comm comm;
    hypre_CSRMatrix *diag;
@@ -326,9 +348,10 @@ hypre_ParCSRMatrixSetNumNonzeros_core( hypre_ParCSRMatrix *matrix, const char* f
    diag = hypre_ParCSRMatrixDiag(matrix);
    offd = hypre_ParCSRMatrixOffd(matrix);
 
-   /* TODO in HYPRE_DEBUG ? */
+#if defined(HYPRE_DEBUG)
    hypre_CSRMatrixCheckSetNumNonzeros(diag);
    hypre_CSRMatrixCheckSetNumNonzeros(offd);
+#endif
 
    if (format[0] == 'I')
    {
@@ -366,6 +389,7 @@ hypre_ParCSRMatrixSetNumNonzeros_core( hypre_ParCSRMatrix *matrix, const char* f
 /*--------------------------------------------------------------------------
  * hypre_ParCSRMatrixSetNumNonzeros
  *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_ParCSRMatrixSetNumNonzeros( hypre_ParCSRMatrix *matrix )
 {
@@ -437,7 +461,7 @@ hypre_ParCSRMatrixSetNumRownnz( hypre_ParCSRMatrix *matrix )
 
 HYPRE_Int
 hypre_ParCSRMatrixSetDataOwner( hypre_ParCSRMatrix *matrix,
-                                HYPRE_Int              owns_data )
+                                HYPRE_Int           owns_data )
 {
    if (!matrix)
    {
@@ -450,6 +474,246 @@ hypre_ParCSRMatrixSetDataOwner( hypre_ParCSRMatrix *matrix,
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixSetPatternOnly
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ParCSRMatrixSetPatternOnly( hypre_ParCSRMatrix *matrix,
+                                  HYPRE_Int           pattern_only)
+{
+   if (!matrix)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   if (hypre_ParCSRMatrixDiag(matrix))
+   {
+      hypre_CSRMatrixSetPatternOnly(hypre_ParCSRMatrixDiag(matrix), pattern_only);
+   }
+
+   if (hypre_ParCSRMatrixOffd(matrix))
+   {
+      hypre_CSRMatrixSetPatternOnly(hypre_ParCSRMatrixOffd(matrix), pattern_only);
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixCreateFromDenseBlockMatrix
+ *--------------------------------------------------------------------------*/
+
+hypre_ParCSRMatrix*
+hypre_ParCSRMatrixCreateFromDenseBlockMatrix(MPI_Comm                comm,
+                                             HYPRE_BigInt            global_num_rows,
+                                             HYPRE_BigInt            global_num_cols,
+                                             HYPRE_BigInt           *row_starts,
+                                             HYPRE_BigInt           *col_starts,
+                                             hypre_DenseBlockMatrix *B)
+{
+   /* Input matrix variables */
+   HYPRE_Int             num_rows_diag      = hypre_DenseBlockMatrixNumRows(B);
+   HYPRE_Int             num_nonzeros_diag  = hypre_DenseBlockMatrixNumNonzeros(B);
+   HYPRE_Int             num_rows_block     = hypre_DenseBlockMatrixNumRowsBlock(B);
+   HYPRE_Int             num_cols_block     = hypre_DenseBlockMatrixNumColsBlock(B);
+   HYPRE_Int             num_cols_offd      = 0;
+   HYPRE_Int             num_nonzeros_offd  = 0;
+   HYPRE_MemoryLocation  memory_location    = hypre_DenseBlockMatrixMemoryLocation(B);
+
+   /* Output matrix variables */
+   hypre_ParCSRMatrix   *A;
+   hypre_CSRMatrix      *A_diag;
+   hypre_CSRMatrix      *A_offd;
+   HYPRE_Int            *A_diag_i;
+   HYPRE_Int            *A_diag_j;
+
+   /* Local variables */
+   HYPRE_Int             i, j, ib;
+
+   /* Create output matrix */
+   A = hypre_ParCSRMatrixCreate(comm, global_num_rows, global_num_cols,
+                                row_starts, col_starts, num_cols_offd,
+                                num_nonzeros_diag, num_nonzeros_offd);
+   A_diag = hypre_ParCSRMatrixDiag(A);
+   A_offd = hypre_ParCSRMatrixOffd(A);
+
+   /* Set memory locations */
+   hypre_CSRMatrixMemoryLocation(A_diag) = memory_location;
+   hypre_CSRMatrixMemoryLocation(A_offd) = memory_location;
+
+   /* Set diag's data pointer */
+   if (hypre_DenseBlockMatrixOwnsData(B))
+   {
+      hypre_CSRMatrixData(A_diag) = hypre_DenseBlockMatrixData(B);
+   }
+   else
+   {
+      hypre_CSRMatrixData(A_diag) = hypre_CTAlloc(HYPRE_Complex,
+                                                  num_nonzeros_diag,
+                                                  memory_location);
+      hypre_TMemcpy(hypre_CSRMatrixData(A_diag),
+                    hypre_DenseBlockMatrixData(B),
+                    HYPRE_Complex,
+                    num_nonzeros_diag,
+                    memory_location, memory_location);
+   }
+   hypre_DenseBlockMatrixOwnsData(B) = 0;
+
+   /* Set diag's row pointer and column indices */
+   A_diag_i = hypre_CTAlloc(HYPRE_Int, num_rows_diag + 1, HYPRE_MEMORY_HOST);
+   A_diag_j = hypre_CTAlloc(HYPRE_Int, num_nonzeros_diag, HYPRE_MEMORY_HOST);
+
+#ifdef HYPRE_USING_OPENMP
+   #pragma omp parallel for private(i, ib, j) HYPRE_SMP_SCHEDULE
+#endif
+   for (i = 0; i < num_rows_diag; i++)
+   {
+      ib = i / num_rows_block;
+      A_diag_i[i] = i * num_cols_block;
+      for (j = A_diag_i[i]; j < (i + 1) * num_cols_block; j++)
+      {
+         A_diag_j[j] = ib * num_cols_block + (j - A_diag_i[i]);
+      }
+   }
+   A_diag_i[num_rows_diag] = num_rows_diag * num_cols_block;
+
+   /* Migrate to dest. memory location */
+   if (memory_location != HYPRE_MEMORY_HOST)
+   {
+      hypre_CSRMatrixI(A_diag) = hypre_TAlloc(HYPRE_Int, num_rows_diag + 1, memory_location);
+      hypre_CSRMatrixJ(A_diag) = hypre_TAlloc(HYPRE_Int, num_nonzeros_diag, memory_location);
+
+      hypre_TMemcpy(hypre_CSRMatrixI(A_diag), A_diag_i,
+                    HYPRE_Int, num_rows_diag + 1,
+                    memory_location, HYPRE_MEMORY_HOST);
+
+      hypre_TMemcpy(hypre_CSRMatrixJ(A_diag), A_diag_j,
+                    HYPRE_Int, num_nonzeros_diag,
+                    memory_location, HYPRE_MEMORY_HOST);
+   }
+   else
+   {
+      hypre_CSRMatrixI(A_diag) = A_diag_i;
+      hypre_CSRMatrixJ(A_diag) = A_diag_j;
+   }
+
+   return A;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixCreateFromParVector
+ *--------------------------------------------------------------------------*/
+
+hypre_ParCSRMatrix*
+hypre_ParCSRMatrixCreateFromParVector(hypre_ParVector *b,
+                                      HYPRE_BigInt     global_num_rows,
+                                      HYPRE_BigInt     global_num_cols,
+                                      HYPRE_BigInt    *row_starts,
+                                      HYPRE_BigInt    *col_starts)
+{
+   /* Input vector variables */
+   MPI_Comm              comm            = hypre_ParVectorComm(b);
+   hypre_Vector         *local_vector    = hypre_ParVectorLocalVector(b);
+   HYPRE_MemoryLocation  memory_location = hypre_ParVectorMemoryLocation(b);
+
+   /* Auxiliary variables */
+   HYPRE_Int             num_rows        = (HYPRE_Int) row_starts[1] - row_starts[0];
+   HYPRE_Int             num_cols        = (HYPRE_Int) col_starts[1] - col_starts[0];
+   HYPRE_Int             num_nonzeros    = hypre_min(num_rows, num_cols);
+
+   /* Output matrix variables */
+   hypre_ParCSRMatrix   *A;
+   hypre_CSRMatrix      *A_diag;
+   hypre_CSRMatrix      *A_offd;
+   HYPRE_Int            *A_diag_i;
+   HYPRE_Int            *A_diag_j;
+
+   /* Local variables */
+   HYPRE_Int             i;
+
+   /* Sanity check */
+   if (hypre_ParVectorNumVectors(b) > 1)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Not implemented for multi-component vectors");
+      return NULL;
+   }
+
+   /* Create output matrix */
+   A = hypre_ParCSRMatrixCreate(comm, global_num_rows, global_num_cols,
+                                row_starts, col_starts, 0, num_nonzeros, 0);
+   A_diag = hypre_ParCSRMatrixDiag(A);
+   A_offd = hypre_ParCSRMatrixOffd(A);
+
+   /* Set memory locations */
+   hypre_CSRMatrixMemoryLocation(A_diag) = memory_location;
+   hypre_CSRMatrixMemoryLocation(A_offd) = memory_location;
+
+   /* Set diag's data pointer */
+   if (hypre_VectorOwnsData(local_vector))
+   {
+      hypre_CSRMatrixData(A_diag) = hypre_VectorData(local_vector);
+      hypre_VectorOwnsData(local_vector) = 0;
+   }
+   else
+   {
+      hypre_CSRMatrixData(A_diag) = hypre_CTAlloc(HYPRE_Complex, num_nonzeros, memory_location);
+      hypre_TMemcpy(hypre_CSRMatrixData(A_diag),
+                    hypre_VectorData(local_vector),
+                    HYPRE_Complex, num_nonzeros,
+                    memory_location, memory_location);
+   }
+
+   /* Set diag's row pointer and column indices */
+   A_diag_i = hypre_CTAlloc(HYPRE_Int, num_rows + 1, HYPRE_MEMORY_HOST);
+   A_diag_j = hypre_CTAlloc(HYPRE_Int, num_nonzeros, HYPRE_MEMORY_HOST);
+
+#ifdef HYPRE_USING_OPENMP
+   #pragma omp parallel for HYPRE_SMP_SCHEDULE
+#endif
+   for (i = 0; i < num_nonzeros; i++)
+   {
+      A_diag_i[i] = A_diag_j[i] = i;
+   }
+
+#ifdef HYPRE_USING_OPENMP
+   #pragma omp parallel for HYPRE_SMP_SCHEDULE
+#endif
+   for (i = num_nonzeros; i < num_rows + 1; i++)
+   {
+      A_diag_i[i] = num_nonzeros;
+   }
+
+   /* Initialize offd portion */
+   hypre_CSRMatrixInitialize_v2(A_offd, 0, memory_location);
+
+   /* Migrate to dest. memory location */
+   if (memory_location != HYPRE_MEMORY_HOST)
+   {
+      hypre_CSRMatrixI(A_diag) = hypre_TAlloc(HYPRE_Int, num_rows + 1, memory_location);
+      hypre_CSRMatrixJ(A_diag) = hypre_TAlloc(HYPRE_Int, num_nonzeros, memory_location);
+
+      hypre_TMemcpy(hypre_CSRMatrixI(A_diag), A_diag_i,
+                    HYPRE_Int, num_rows + 1,
+                    memory_location, HYPRE_MEMORY_HOST);
+
+      hypre_TMemcpy(hypre_CSRMatrixJ(A_diag), A_diag_j,
+                    HYPRE_Int, num_nonzeros,
+                    memory_location, HYPRE_MEMORY_HOST);
+
+      hypre_TFree(A_diag_i, HYPRE_MEMORY_HOST);
+      hypre_TFree(A_diag_j, HYPRE_MEMORY_HOST);
+   }
+   else
+   {
+      hypre_CSRMatrixI(A_diag) = A_diag_i;
+      hypre_CSRMatrixJ(A_diag) = A_diag_j;
+   }
+
+   return A;
+}
+
 /*--------------------------------------------------------------------------
  * hypre_ParCSRMatrixRead
  *--------------------------------------------------------------------------*/
@@ -473,20 +737,22 @@ hypre_ParCSRMatrixRead( MPI_Comm    comm,
    HYPRE_BigInt         global_num_rows, global_num_cols;
 
    FILE                *fp;
-   char                 new_file_d[80], new_file_o[80], new_file_info[80];
+   char                 new_file_d[HYPRE_MAX_FILE_NAME_LEN];
+   char                 new_file_o[HYPRE_MAX_FILE_NAME_LEN];
+   char                 new_file_info[HYPRE_MAX_FILE_NAME_LEN];
 
-   hypre_MPI_Comm_rank(comm,&my_id);
-   hypre_MPI_Comm_size(comm,&num_procs);
+   hypre_MPI_Comm_rank(comm, &my_id);
+   hypre_MPI_Comm_size(comm, &num_procs);
 
-   hypre_sprintf(new_file_d,"%s.D.%d",file_name,my_id);
-   hypre_sprintf(new_file_o,"%s.O.%d",file_name,my_id);
-   hypre_sprintf(new_file_info,"%s.INFO.%d",file_name,my_id);
+   hypre_sprintf(new_file_d, "%s.D.%d", file_name, my_id);
+   hypre_sprintf(new_file_o, "%s.O.%d", file_name, my_id);
+   hypre_sprintf(new_file_info, "%s.INFO.%d", file_name, my_id);
    fp = fopen(new_file_info, "r");
    hypre_fscanf(fp, "%b", &global_num_rows);
    hypre_fscanf(fp, "%b", &global_num_cols);
    hypre_fscanf(fp, "%d", &num_cols_offd);
    /* the bgl input file should only contain the EXACT range for local processor */
-   hypre_fscanf(fp, "%d %d %d %d", &row_s, &row_e, &col_s, &col_e);
+   hypre_fscanf(fp, "%b %b %b %b", &row_s, &row_e, &col_s, &col_e);
    row_starts[0] = row_s;
    row_starts[1] = row_e;
    col_starts[0] = col_s;
@@ -510,8 +776,8 @@ hypre_ParCSRMatrixRead( MPI_Comm    comm,
    }
    else
    {
-      offd = hypre_CSRMatrixCreate(local_num_rows,0,0);
-      hypre_CSRMatrixInitialize(offd);
+      offd = hypre_CSRMatrixCreate(local_num_rows, 0, 0);
+      hypre_CSRMatrixInitialize_v2(offd, 0, HYPRE_MEMORY_HOST);
    }
 
    matrix = hypre_CTAlloc(hypre_ParCSRMatrix, 1, HYPRE_MEMORY_HOST);
@@ -555,15 +821,19 @@ HYPRE_Int
 hypre_ParCSRMatrixPrint( hypre_ParCSRMatrix *matrix,
                          const char         *file_name )
 {
-   MPI_Comm comm;
-   HYPRE_BigInt global_num_rows;
-   HYPRE_BigInt global_num_cols;
+   MPI_Comm      comm;
+   HYPRE_BigInt  global_num_rows;
+   HYPRE_BigInt  global_num_cols;
    HYPRE_BigInt *col_map_offd;
-   HYPRE_Int  my_id, i, num_procs;
-   char   new_file_d[80], new_file_o[80], new_file_info[80];
-   FILE *fp;
-   HYPRE_Int num_cols_offd = 0;
-   HYPRE_BigInt row_s, row_e, col_s, col_e;
+   HYPRE_Int     my_id, i, num_procs;
+
+   char          new_file_d[HYPRE_MAX_FILE_NAME_LEN];
+   char          new_file_o[HYPRE_MAX_FILE_NAME_LEN];
+   char          new_file_info[HYPRE_MAX_FILE_NAME_LEN];
+   FILE         *fp;
+   HYPRE_Int     num_cols_offd = 0;
+   HYPRE_BigInt  row_s, row_e, col_s, col_e;
+
    if (!matrix)
    {
       hypre_error_in_arg(1);
@@ -574,17 +844,21 @@ hypre_ParCSRMatrixPrint( hypre_ParCSRMatrix *matrix,
    global_num_cols = hypre_ParCSRMatrixGlobalNumCols(matrix);
    col_map_offd = hypre_ParCSRMatrixColMapOffd(matrix);
    if (hypre_ParCSRMatrixOffd(matrix))
+   {
       num_cols_offd = hypre_CSRMatrixNumCols(hypre_ParCSRMatrixOffd(matrix));
+   }
 
    hypre_MPI_Comm_rank(comm, &my_id);
    hypre_MPI_Comm_size(comm, &num_procs);
 
-   hypre_sprintf(new_file_d,"%s.D.%d",file_name,my_id);
-   hypre_sprintf(new_file_o,"%s.O.%d",file_name,my_id);
-   hypre_sprintf(new_file_info,"%s.INFO.%d",file_name,my_id);
-   hypre_CSRMatrixPrint(hypre_ParCSRMatrixDiag(matrix),new_file_d);
+   hypre_sprintf(new_file_d, "%s.D.%d", file_name, my_id);
+   hypre_sprintf(new_file_o, "%s.O.%d", file_name, my_id);
+   hypre_sprintf(new_file_info, "%s.INFO.%d", file_name, my_id);
+   hypre_CSRMatrixPrint(hypre_ParCSRMatrixDiag(matrix), new_file_d);
    if (num_cols_offd != 0)
-      hypre_CSRMatrixPrint(hypre_ParCSRMatrixOffd(matrix),new_file_o);
+   {
+      hypre_CSRMatrixPrint(hypre_ParCSRMatrixOffd(matrix), new_file_o);
+   }
 
    fp = fopen(new_file_info, "w");
    hypre_fprintf(fp, "%b\n", global_num_rows);
@@ -594,10 +868,13 @@ hypre_ParCSRMatrixPrint( hypre_ParCSRMatrix *matrix,
    row_e = hypre_ParCSRMatrixLastRowIndex(matrix);
    col_s =  hypre_ParCSRMatrixFirstColDiag(matrix);
    col_e =  hypre_ParCSRMatrixLastColDiag(matrix);
+
    /* add 1 to the ends because this is a starts partition */
    hypre_fprintf(fp, "%b %b %b %b\n", row_s, row_e + 1, col_s, col_e + 1);
-   for (i=0; i < num_cols_offd; i++)
+   for (i = 0; i < num_cols_offd; i++)
+   {
       hypre_fprintf(fp, "%b\n", col_map_offd[i]);
+   }
    fclose(fp);
 
    return hypre_error_flag;
@@ -613,6 +890,8 @@ hypre_ParCSRMatrixPrintIJ( const hypre_ParCSRMatrix *matrix,
                            const HYPRE_Int           base_j,
                            const char               *filename )
 {
+   hypre_ParCSRMatrix  *h_matrix;
+
    MPI_Comm             comm;
    HYPRE_BigInt         first_row_index;
    HYPRE_BigInt         first_col_diag;
@@ -626,38 +905,51 @@ hypre_ParCSRMatrixPrintIJ( const hypre_ParCSRMatrix *matrix,
    HYPRE_Int           *diag_i;
    HYPRE_Int           *diag_j;
    HYPRE_Complex       *offd_data;
-   HYPRE_Int           *offd_i;
+   HYPRE_Int           *offd_i = NULL;
    HYPRE_Int           *offd_j;
    HYPRE_Int            myid, num_procs, i, j;
    HYPRE_BigInt         I, J;
-   char                 new_filename[255];
+   char                 new_filename[HYPRE_MAX_FILE_NAME_LEN];
    FILE                *file;
    HYPRE_Int            num_nonzeros_offd;
    HYPRE_BigInt         ilower, iupper, jlower, jupper;
 
+   HYPRE_MemoryLocation memory_location =
+      hypre_ParCSRMatrixMemoryLocation((hypre_ParCSRMatrix*) matrix);
+
    if (!matrix)
    {
       hypre_error_in_arg(1);
       return hypre_error_flag;
    }
 
-   comm            = hypre_ParCSRMatrixComm(matrix);
-   first_row_index = hypre_ParCSRMatrixFirstRowIndex(matrix);
-   first_col_diag  = hypre_ParCSRMatrixFirstColDiag(matrix);
-   diag            = hypre_ParCSRMatrixDiag(matrix);
-   offd            = hypre_ParCSRMatrixOffd(matrix);
-   col_map_offd    = hypre_ParCSRMatrixColMapOffd(matrix);
-   num_rows        = hypre_ParCSRMatrixNumRows(matrix);
-   row_starts      = hypre_ParCSRMatrixRowStarts(matrix);
-   col_starts      = hypre_ParCSRMatrixColStarts(matrix);
+   /* Create temporary matrix on host memory if needed */
+   if (hypre_GetActualMemLocation(memory_location) == hypre_MEMORY_HOST)
+   {
+      h_matrix = (hypre_ParCSRMatrix *) matrix;
+   }
+   else
+   {
+      h_matrix = hypre_ParCSRMatrixClone_v2((hypre_ParCSRMatrix *) matrix, 1, HYPRE_MEMORY_HOST);
+   }
+
+   comm            = hypre_ParCSRMatrixComm(h_matrix);
+   first_row_index = hypre_ParCSRMatrixFirstRowIndex(h_matrix);
+   first_col_diag  = hypre_ParCSRMatrixFirstColDiag(h_matrix);
+   diag            = hypre_ParCSRMatrixDiag(h_matrix);
+   offd            = hypre_ParCSRMatrixOffd(h_matrix);
+   col_map_offd    = hypre_ParCSRMatrixColMapOffd(h_matrix);
+   num_rows        = hypre_ParCSRMatrixNumRows(h_matrix);
+   row_starts      = hypre_ParCSRMatrixRowStarts(h_matrix);
+   col_starts      = hypre_ParCSRMatrixColStarts(h_matrix);
    hypre_MPI_Comm_rank(comm, &myid);
    hypre_MPI_Comm_size(comm, &num_procs);
 
-   hypre_sprintf(new_filename,"%s.%05d", filename, myid);
+   hypre_sprintf(new_filename, "%s.%05d", filename, myid);
 
    if ((file = fopen(new_filename, "w")) == NULL)
    {
-      hypre_error_w_msg(HYPRE_ERROR_GENERIC,"Error: can't open output file %s\n");
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Error: can't open output file %s\n");
       return hypre_error_flag;
    }
 
@@ -685,7 +977,7 @@ hypre_ParCSRMatrixPrintIJ( const hypre_ParCSRMatrix *matrix,
       I = first_row_index + (HYPRE_BigInt)(i + base_i);
 
       /* print diag columns */
-      for (j = diag_i[i]; j < diag_i[i+1]; j++)
+      for (j = diag_i[i]; j < diag_i[i + 1]; j++)
       {
          J = first_col_diag + (HYPRE_BigInt)(diag_j[j] + base_j);
          if (diag_data)
@@ -706,7 +998,7 @@ hypre_ParCSRMatrixPrintIJ( const hypre_ParCSRMatrix *matrix,
       /* print offd columns */
       if (num_nonzeros_offd)
       {
-         for (j = offd_i[i]; j < offd_i[i+1]; j++)
+         for (j = offd_i[i]; j < offd_i[i + 1]; j++)
          {
             J = col_map_offd[offd_j[j]] + (HYPRE_BigInt) base_j;
             if (offd_data)
@@ -728,6 +1020,343 @@ hypre_ParCSRMatrixPrintIJ( const hypre_ParCSRMatrix *matrix,
 
    fclose(file);
 
+   /* Free temporary matrix */
+   if (hypre_GetActualMemLocation(memory_location) != hypre_MEMORY_HOST)
+   {
+      hypre_ParCSRMatrixDestroy(h_matrix);
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixPrintBinaryIJ
+ *
+ * Prints a ParCSRMatrix in binary format. The data from each process is
+ * printed to a separate file. Metadata info about the matrix is printed in
+ * the header section of every file, and it is followed by the raw data, i.e.,
+ * row, column, and coefficients.
+ *
+ * The header section is composed by 11 entries stored in 88 bytes (8 bytes
+ * each) and their meanings are:
+ *
+ *    0) Header version
+ *    1) Number of bytes for storing an integer type (row and columns)
+ *    2) Number of bytes for storing a real type (coefficients)
+ *    3) Number of rows in the matrix
+ *    4) Number of columns in the matrix
+ *    5) Number of nonzero coefficients in the matrix
+ *    6) Number of local nonzero coefficients in the current matrix block
+ *    7) Global index of the first row of the current matrix block
+ *    8) Global index of the last row of the current matrix block
+ *    9) Global index of the first column in the diagonal matrix block
+ *   10) Global index of the last column in the diagonal matrix block
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ParCSRMatrixPrintBinaryIJ( hypre_ParCSRMatrix *matrix,
+                                 HYPRE_Int           base_i,
+                                 HYPRE_Int           base_j,
+                                 const char         *filename )
+{
+   MPI_Comm              comm = hypre_ParCSRMatrixComm(matrix);
+   HYPRE_MemoryLocation  memory_location = hypre_ParCSRMatrixMemoryLocation(matrix);
+   hypre_ParCSRMatrix   *h_matrix;
+
+   HYPRE_BigInt          first_row_index;
+   HYPRE_BigInt          first_col_diag;
+   hypre_CSRMatrix      *diag, *offd;
+   HYPRE_BigInt         *col_map_offd;
+   HYPRE_Int             num_rows;
+   HYPRE_BigInt         *row_starts, *col_starts;
+
+   HYPRE_Complex        *diag_data;
+   HYPRE_Int            *diag_i, *diag_j;
+   HYPRE_Int             diag_nnz;
+
+   HYPRE_Complex        *offd_data;
+   HYPRE_Int            *offd_i, *offd_j;
+   HYPRE_Int             offd_nnz;
+
+   /* Local buffers */
+   hypre_uint32         *i32buffer = NULL;
+   hypre_uint64         *i64buffer = NULL;
+   hypre_float          *f32buffer = NULL;
+   hypre_double         *f64buffer = NULL;
+
+   /* Local variables */
+   char                  new_filename[HYPRE_MAX_FILE_NAME_LEN];
+   FILE                 *fp;
+   hypre_uint64          header[11];
+   size_t                count, k;
+   HYPRE_Int             one = 1;
+   HYPRE_Int             myid, i, j;
+   HYPRE_BigInt          bigI, bigJ;
+   HYPRE_BigInt          ilower, iupper, jlower, jupper;
+   HYPRE_Complex         val;
+
+   /* Exit if trying to write from big-endian machine */
+   if ((*(char*)&one) == 0)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Support to big-endian machines is incomplete!\n");
+      return hypre_error_flag;
+   }
+
+   /* MPI variables */
+   hypre_MPI_Comm_rank(comm, &myid);
+
+   /* Create temporary matrix on host memory if needed */
+   h_matrix = (hypre_GetActualMemLocation(memory_location) == hypre_MEMORY_DEVICE) ?
+              hypre_ParCSRMatrixClone_v2(matrix, 1, HYPRE_MEMORY_HOST) : matrix;
+
+   /* Update global number of nonzeros */
+   hypre_ParCSRMatrixSetDNumNonzeros(h_matrix);
+
+   /* Matrix variables */
+   first_row_index = hypre_ParCSRMatrixFirstRowIndex(h_matrix);
+   first_col_diag  = hypre_ParCSRMatrixFirstColDiag(h_matrix);
+   diag            = hypre_ParCSRMatrixDiag(h_matrix);
+   offd            = hypre_ParCSRMatrixOffd(h_matrix);
+   col_map_offd    = hypre_ParCSRMatrixColMapOffd(h_matrix);
+   num_rows        = hypre_ParCSRMatrixNumRows(h_matrix);
+   row_starts      = hypre_ParCSRMatrixRowStarts(h_matrix);
+   col_starts      = hypre_ParCSRMatrixColStarts(h_matrix);
+
+   /* Diagonal matrix variables */
+   diag_nnz  = hypre_CSRMatrixNumNonzeros(diag);
+   diag_data = hypre_CSRMatrixData(diag);
+   diag_i    = hypre_CSRMatrixI(diag);
+   diag_j    = hypre_CSRMatrixJ(diag);
+
+   /* Off-diagonal matrix variables */
+   offd_nnz  = hypre_CSRMatrixNumNonzeros(offd);
+   offd_data = hypre_CSRMatrixData(offd);
+   offd_i    = hypre_CSRMatrixI(offd);
+   offd_j    = hypre_CSRMatrixJ(offd);
+
+   /* Set global matrix bounds */
+   ilower = row_starts[0] + (HYPRE_BigInt) base_i;
+   iupper = row_starts[1] + (HYPRE_BigInt) base_i - 1;
+   jlower = col_starts[0] + (HYPRE_BigInt) base_j;
+   jupper = col_starts[1] + (HYPRE_BigInt) base_j - 1;
+
+   /* Open binary file */
+   hypre_sprintf(new_filename, "%s.%05d.bin", filename, myid);
+   if ((fp = fopen(new_filename, "wb")) == NULL)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Could not open output file!");
+      return hypre_error_flag;
+   }
+
+   /*---------------------------------------------
+    * Write header (88 bytes)
+    *---------------------------------------------*/
+
+   count = 11;
+   header[0]  = (hypre_uint64) 1; /* Header version */
+   header[1]  = (hypre_uint64) sizeof(HYPRE_BigInt);
+   header[2]  = (hypre_uint64) sizeof(HYPRE_Complex);
+   header[3]  = (hypre_uint64) hypre_ParCSRMatrixGlobalNumRows(h_matrix);;
+   header[4]  = (hypre_uint64) hypre_ParCSRMatrixGlobalNumCols(h_matrix);;
+   header[5]  = (hypre_uint64) hypre_ParCSRMatrixDNumNonzeros(h_matrix);
+   header[6]  = (hypre_uint64) diag_nnz + offd_nnz; /* local number of nonzeros*/
+   header[7]  = (hypre_uint64) ilower;
+   header[8]  = (hypre_uint64) iupper;
+   header[9]  = (hypre_uint64) jlower;
+   header[10] = (hypre_uint64) jupper;
+   if (fwrite((const void*) header, sizeof(hypre_uint64), count, fp) != count)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Could not write all header entries\n");
+      return hypre_error_flag;
+   }
+
+   /* Allocate memory for buffers */
+   if (sizeof(HYPRE_BigInt) == sizeof(hypre_uint32))
+   {
+      i32buffer = hypre_TAlloc(hypre_uint32, header[6], HYPRE_MEMORY_HOST);
+   }
+   else if (sizeof(HYPRE_BigInt) == sizeof(hypre_uint64))
+   {
+      i64buffer = hypre_TAlloc(hypre_uint64, header[6], HYPRE_MEMORY_HOST);
+   }
+   else
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Unsupported data type for row/column indices\n");
+      return hypre_error_flag;
+   }
+
+   /* Allocate memory for buffers */
+   if (sizeof(HYPRE_Complex) == sizeof(hypre_float))
+   {
+      f32buffer = hypre_TAlloc(hypre_float, header[6], HYPRE_MEMORY_HOST);
+   }
+   else if (sizeof(HYPRE_Complex) == sizeof(hypre_double))
+   {
+      f64buffer = hypre_TAlloc(hypre_double, header[6], HYPRE_MEMORY_HOST);
+   }
+   else
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Unsupported data type for matrix coefficients\n");
+      return hypre_error_flag;
+   }
+
+   /*---------------------------------------------
+    * Write row indices to file
+    *---------------------------------------------*/
+
+   for (i = 0, k = 0; i < num_rows; i++)
+   {
+      bigI = first_row_index + (HYPRE_BigInt)(i + base_i);
+
+      for (j = 0; j < (diag_i[i + 1] - diag_i[i]) + (offd_i[i + 1] - offd_i[i]); j++)
+      {
+         if (i32buffer)
+         {
+            i32buffer[k++] = (hypre_uint32) bigI;
+         }
+         else
+         {
+            i64buffer[k++] = (hypre_uint64) bigI;
+         }
+      }
+   }
+
+   /* Write buffer */
+   if (i32buffer)
+   {
+      count = fwrite((const void*) i32buffer, sizeof(hypre_uint32), k, fp);
+   }
+   else if (i64buffer)
+   {
+      count = fwrite((const void*) i64buffer, sizeof(hypre_uint64), k, fp);
+   }
+
+   if (count != k)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Could not write all row indices entries\n");
+      return hypre_error_flag;
+   }
+
+   /*---------------------------------------------
+    * Write columns indices to file
+    *---------------------------------------------*/
+
+   for (i = 0, k = 0; i < num_rows; i++)
+   {
+      for (j = diag_i[i]; j < diag_i[i + 1]; j++)
+      {
+         bigJ = first_col_diag + (HYPRE_BigInt)(diag_j[j] + base_j);
+
+         if (i32buffer)
+         {
+            i32buffer[k++] = (hypre_uint32) bigJ;
+         }
+         else
+         {
+            i64buffer[k++] = (hypre_uint64) bigJ;
+         }
+      }
+
+      for (j = offd_i[i]; j < offd_i[i + 1]; j++)
+      {
+         bigJ = col_map_offd[offd_j[j]] + (HYPRE_BigInt) base_j;
+
+         if (i32buffer)
+         {
+            i32buffer[k++] = (hypre_uint32) bigJ;
+         }
+         else
+         {
+            i64buffer[k++] = (hypre_uint64) bigJ;
+         }
+      }
+   }
+
+   /* Write buffer */
+   if (i32buffer)
+   {
+      count = fwrite((const void*) i32buffer, sizeof(hypre_uint32), k, fp);
+   }
+   else if (i64buffer)
+   {
+      count = fwrite((const void*) i64buffer, sizeof(hypre_uint64), k, fp);
+   }
+
+   if (count != k)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Could not write all column indices entries\n");
+      return hypre_error_flag;
+   }
+
+   /*---------------------------------------------
+    * Write coefficients indices to file
+    *---------------------------------------------*/
+
+   if (diag_data)
+   {
+      for (i = 0, k = 0; i < num_rows; i++)
+      {
+         for (j = diag_i[i]; j < diag_i[i + 1]; j++)
+         {
+            val = diag_data[j];
+
+            if (f32buffer)
+            {
+               f32buffer[k++] = (hypre_float) val;
+            }
+            else
+            {
+               f64buffer[k++] = (hypre_double) val;
+            }
+         }
+
+         for (j = offd_i[i]; j < offd_i[i + 1]; j++)
+         {
+            val = offd_data[j];
+
+            if (f32buffer)
+            {
+               f32buffer[k++] = (hypre_float) val;
+            }
+            else
+            {
+               f64buffer[k++] = (hypre_double) val;
+            }
+         }
+      }
+
+      /* Write buffer */
+      if (f32buffer)
+      {
+         count = fwrite((const void*) f32buffer, sizeof(hypre_float), k, fp);
+      }
+      else if (f64buffer)
+      {
+         count = fwrite((const void*) f64buffer, sizeof(hypre_double), k, fp);
+      }
+
+      if (count != k)
+      {
+         hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Could not write all matrix coefficients\n");
+         return hypre_error_flag;
+      }
+   }
+
+   fclose(fp);
+
+   /*---------------------------------------------
+    * Free memory
+    *---------------------------------------------*/
+
+   if (h_matrix != matrix)
+   {
+      hypre_ParCSRMatrixDestroy(h_matrix);
+   }
+   hypre_TFree(i32buffer, HYPRE_MEMORY_HOST);
+   hypre_TFree(i64buffer, HYPRE_MEMORY_HOST);
+   hypre_TFree(f32buffer, HYPRE_MEMORY_HOST);
+   hypre_TFree(f64buffer, HYPRE_MEMORY_HOST);
+
    return hypre_error_flag;
 }
 
@@ -759,14 +1388,14 @@ hypre_ParCSRMatrixReadIJ( MPI_Comm             comm,
    HYPRE_Complex      *diag_data;
    HYPRE_Int          *diag_i;
    HYPRE_Int          *diag_j;
-   HYPRE_Complex      *offd_data;
+   HYPRE_Complex      *offd_data = NULL;
    HYPRE_Int          *offd_i;
-   HYPRE_Int          *offd_j;
-   HYPRE_BigInt       *tmp_j;
+   HYPRE_Int          *offd_j = NULL;
+   HYPRE_BigInt       *tmp_j = NULL;
    HYPRE_BigInt       *aux_offd_j;
    HYPRE_BigInt        I, J;
    HYPRE_Int           myid, num_procs, i, i2, j;
-   char                new_filename[255];
+   char                new_filename[HYPRE_MAX_FILE_NAME_LEN];
    FILE               *file;
    HYPRE_Int           num_cols_offd, num_nonzeros_diag, num_nonzeros_offd;
    HYPRE_Int           i_col, num_cols;
@@ -776,11 +1405,11 @@ hypre_ParCSRMatrixReadIJ( MPI_Comm             comm,
    hypre_MPI_Comm_size(comm, &num_procs);
    hypre_MPI_Comm_rank(comm, &myid);
 
-   hypre_sprintf(new_filename,"%s.%05d", filename, myid);
+   hypre_sprintf(new_filename, "%s.%05d", filename, myid);
 
    if ((file = fopen(new_filename, "r")) == NULL)
    {
-      hypre_error_w_msg(HYPRE_ERROR_GENERIC,"Error: can't open output file %s\n");
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Error: can't open output file %s\n");
       return hypre_error_flag;
    }
 
@@ -816,16 +1445,16 @@ hypre_ParCSRMatrixReadIJ( MPI_Comm             comm,
 
    first_row_index = hypre_ParCSRMatrixFirstRowIndex(matrix);
    first_col_diag = hypre_ParCSRMatrixFirstColDiag(matrix);
-   last_col_diag = first_col_diag+(HYPRE_BigInt)num_cols-1;
+   last_col_diag = first_col_diag + (HYPRE_BigInt)num_cols - 1;
 
    diag_cnt = 0;
    offd_cnt = 0;
    row_cnt = 0;
-   for (i = 0; i < num_nonzeros_diag+num_nonzeros_offd; i++)
+   for (i = 0; i < num_nonzeros_diag + num_nonzeros_offd; i++)
    {
       /* read values */
       hypre_fscanf(file, "%b %b %le", &I, &J, &data);
-      i2 = (HYPRE_Int)(I-big_base_i-first_row_index);
+      i2 = (HYPRE_Int)(I - big_base_i - first_row_index);
       J -= big_base_j;
       if (i2 > row_cnt)
       {
@@ -853,18 +1482,22 @@ hypre_ParCSRMatrixReadIJ( MPI_Comm             comm,
    if (num_nonzeros_offd)
    {
       aux_offd_j = hypre_CTAlloc(HYPRE_BigInt, num_nonzeros_offd, HYPRE_MEMORY_HOST);
-      for (i=0; i < num_nonzeros_offd; i++)
+      for (i = 0; i < num_nonzeros_offd; i++)
+      {
          aux_offd_j[i] = (HYPRE_BigInt)offd_j[i];
-      hypre_BigQsort0(aux_offd_j,0,num_nonzeros_offd-1);
+      }
+      hypre_BigQsort0(aux_offd_j, 0, num_nonzeros_offd - 1);
       col_map_offd = hypre_ParCSRMatrixColMapOffd(matrix);
       col_map_offd[0] = aux_offd_j[0];
       offd_cnt = 0;
-      for (i=1; i < num_nonzeros_offd; i++)
+      for (i = 1; i < num_nonzeros_offd; i++)
       {
          if (aux_offd_j[i] > col_map_offd[offd_cnt])
+         {
             col_map_offd[++offd_cnt] = aux_offd_j[i];
+         }
       }
-      for (i=0; i < num_nonzeros_offd; i++)
+      for (i = 0; i < num_nonzeros_offd; i++)
       {
          offd_j[i] = hypre_BigBinarySearch(col_map_offd, tmp_j[i], num_cols_offd);
       }
@@ -873,10 +1506,10 @@ hypre_ParCSRMatrixReadIJ( MPI_Comm             comm,
    }
 
    /* move diagonal element in first position in each row */
-   for (i=0; i < num_rows; i++)
+   for (i = 0; i < num_rows; i++)
    {
       i_col = diag_i[i];
-      for (j=i_col; j < diag_i[i+1]; j++)
+      for (j = i_col; j < diag_i[i + 1]; j++)
       {
          if (diag_j[j] == i)
          {
@@ -970,7 +1603,7 @@ hypre_ParCSRMatrixGetRowHost( hypre_ParCSRMatrix  *mat,
 
    if (hypre_ParCSRMatrixGetrowactive(mat))
    {
-      return(-1);
+      return (-1);
    }
 
    hypre_MPI_Comm_rank( hypre_ParCSRMatrixComm(mat), &my_id );
@@ -980,7 +1613,7 @@ hypre_ParCSRMatrixGetRowHost( hypre_ParCSRMatrix  *mat,
    row_end = hypre_ParCSRMatrixLastRowIndex(mat) + 1;
    if (row < row_start || row >= row_end)
    {
-      return(-1);
+      return (-1);
    }
 
    /* if buffer is not allocated and some information is requested,
@@ -990,14 +1623,14 @@ hypre_ParCSRMatrixGetRowHost( hypre_ParCSRMatrix  *mat,
       /*
         allocate enough space to hold information from the longest row.
       */
-      HYPRE_Int max = 1,tmp;
+      HYPRE_Int max = 1, tmp;
       HYPRE_Int i;
       HYPRE_Int m = row_end - row_start;
 
       for ( i = 0; i < m; i++ )
       {
-         tmp = hypre_CSRMatrixI(Aa)[i+1] - hypre_CSRMatrixI(Aa)[i] +
-               hypre_CSRMatrixI(Ba)[i+1] - hypre_CSRMatrixI(Ba)[i];
+         tmp = hypre_CSRMatrixI(Aa)[i + 1] - hypre_CSRMatrixI(Aa)[i] +
+               hypre_CSRMatrixI(Ba)[i + 1] - hypre_CSRMatrixI(Ba)[i];
          if (max < tmp)
          {
             max = tmp;
@@ -1015,14 +1648,14 @@ hypre_ParCSRMatrixGetRowHost( hypre_ParCSRMatrix  *mat,
       HYPRE_Complex    *vworkA, *vworkB, *v_p;
       HYPRE_Int        i, *cworkA, *cworkB;
       HYPRE_BigInt     cstart = hypre_ParCSRMatrixFirstColDiag(mat);
-      HYPRE_Int        nztot, nzA, nzB, lrow = (HYPRE_Int)(row-row_start);
+      HYPRE_Int        nztot, nzA, nzB, lrow = (HYPRE_Int)(row - row_start);
       HYPRE_BigInt     *cmap, *idx_p;
 
-      nzA = hypre_CSRMatrixI(Aa)[lrow+1] - hypre_CSRMatrixI(Aa)[lrow];
+      nzA = hypre_CSRMatrixI(Aa)[lrow + 1] - hypre_CSRMatrixI(Aa)[lrow];
       cworkA = &( hypre_CSRMatrixJ(Aa)[ hypre_CSRMatrixI(Aa)[lrow] ] );
       vworkA = &( hypre_CSRMatrixData(Aa)[ hypre_CSRMatrixI(Aa)[lrow] ] );
 
-      nzB = hypre_CSRMatrixI(Ba)[lrow+1] - hypre_CSRMatrixI(Ba)[lrow];
+      nzB = hypre_CSRMatrixI(Ba)[lrow + 1] - hypre_CSRMatrixI(Ba)[lrow];
       cworkB = &( hypre_CSRMatrixJ(Ba)[ hypre_CSRMatrixI(Ba)[lrow] ] );
       vworkB = &( hypre_CSRMatrixData(Ba)[ hypre_CSRMatrixI(Ba)[lrow] ] );
 
@@ -1054,11 +1687,11 @@ hypre_ParCSRMatrixGetRowHost( hypre_ParCSRMatrix  *mat,
                imark = i;
                for ( i = 0; i < nzA; i++ )
                {
-                  v_p[imark+i] = vworkA[i];
+                  v_p[imark + i] = vworkA[i];
                }
                for ( i = imark; i < nzB; i++ )
                {
-                  v_p[nzA+i] = vworkB[i];
+                  v_p[nzA + i] = vworkB[i];
                }
             }
 
@@ -1089,11 +1722,11 @@ hypre_ParCSRMatrixGetRowHost( hypre_ParCSRMatrix  *mat,
                }
                for ( i = 0; i < nzA; i++ )
                {
-                  idx_p[imark+i] = cstart + cworkA[i];
+                  idx_p[imark + i] = cstart + cworkA[i];
                }
                for ( i = imark; i < nzB; i++ )
                {
-                  idx_p[nzA+i] = cmap[cworkB[i]];
+                  idx_p[nzA + i] = cmap[cworkB[i]];
                }
             }
          }
@@ -1124,17 +1757,17 @@ hypre_ParCSRMatrixGetRow( hypre_ParCSRMatrix  *mat,
                           HYPRE_BigInt       **col_ind,
                           HYPRE_Complex      **values )
 {
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
    HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_ParCSRMatrixMemoryLocation(mat) );
 
    if (exec == HYPRE_EXEC_DEVICE)
    {
-      return hypre_ParCSRMatrixGetRowDevice(mat, row, size, col_ind, values);
+      hypre_ParCSRMatrixGetRowDevice(mat, row, size, col_ind, values);
    }
    else
 #endif
    {
-      return hypre_ParCSRMatrixGetRowHost(mat, row, size, col_ind, values);
+      hypre_ParCSRMatrixGetRowHost(mat, row, size, col_ind, values);
    }
 
    return hypre_error_flag;
@@ -1151,6 +1784,11 @@ hypre_ParCSRMatrixRestoreRow( hypre_ParCSRMatrix *matrix,
                               HYPRE_BigInt      **col_ind,
                               HYPRE_Complex     **values )
 {
+   HYPRE_UNUSED_VAR(row);
+   HYPRE_UNUSED_VAR(size);
+   HYPRE_UNUSED_VAR(col_ind);
+   HYPRE_UNUSED_VAR(values);
+
    if (!hypre_ParCSRMatrixGetrowactive(matrix))
    {
       hypre_error(HYPRE_ERROR_GENERIC);
@@ -1186,13 +1824,13 @@ hypre_CSRMatrixToParCSRMatrix( MPI_Comm         comm,
    HYPRE_Int           num_procs, my_id;
    HYPRE_Int          *num_rows_proc;
    HYPRE_Int          *num_nonzeros_proc;
-   HYPRE_BigInt       *row_starts = NULL;
-   HYPRE_BigInt       *col_starts = NULL;
+   HYPRE_BigInt        row_starts[2];
+   HYPRE_BigInt        col_starts[2];
 
    hypre_CSRMatrix    *local_A;
-   HYPRE_Complex      *A_data;
-   HYPRE_Int          *A_i;
-   HYPRE_Int          *A_j;
+   HYPRE_Complex      *A_data = NULL;
+   HYPRE_Int          *A_i = NULL;
+   HYPRE_Int          *A_j = NULL;
 
    hypre_MPI_Request  *requests;
    hypre_MPI_Status   *status, status0;
@@ -1214,7 +1852,7 @@ hypre_CSRMatrixToParCSRMatrix( MPI_Comm         comm,
    total_size = 4;
    if (my_id == 0)
    {
-      total_size += 2*(num_procs + 1);
+      total_size += 2 * (num_procs + 1);
    }
 
    global_data = hypre_CTAlloc(HYPRE_BigInt, total_size, HYPRE_MEMORY_HOST);
@@ -1233,14 +1871,14 @@ hypre_CSRMatrixToParCSRMatrix( MPI_Comm         comm,
                   if 2: both global_row_starts and global_col_starts given
                   if 3: only global_col_starts given, global_row_starts = NULL */
                global_data[3] = 2;
-               global_size += (HYPRE_BigInt) (2*(num_procs + 1) + 1);
+               global_size += (HYPRE_BigInt) (2 * (num_procs + 1) + 1);
                for (i = 0; i < (num_procs + 1); i++)
                {
-                  global_data[i+4] = global_row_starts[i];
+                  global_data[i + 4] = global_row_starts[i];
                }
                for (i = 0; i < (num_procs + 1); i++)
                {
-                  global_data[i+num_procs+5] = global_col_starts[i];
+                  global_data[i + num_procs + 5] = global_col_starts[i];
                }
             }
             else
@@ -1249,7 +1887,7 @@ hypre_CSRMatrixToParCSRMatrix( MPI_Comm         comm,
                global_size += (HYPRE_BigInt) ((num_procs + 1) + 1);
                for (i = 0; i < (num_procs + 1); i++)
                {
-                  global_data[i+4] = global_row_starts[i];
+                  global_data[i + 4] = global_row_starts[i];
                }
             }
          }
@@ -1259,7 +1897,7 @@ hypre_CSRMatrixToParCSRMatrix( MPI_Comm         comm,
             global_size += (HYPRE_BigInt) ((num_procs + 1) + 1);
             for (i = 0; i < (num_procs + 1); i++)
             {
-               global_data[i+4] = global_row_starts[i];
+               global_data[i + 4] = global_row_starts[i];
             }
          }
       }
@@ -1271,7 +1909,7 @@ hypre_CSRMatrixToParCSRMatrix( MPI_Comm         comm,
             global_size += (HYPRE_BigInt) ((num_procs + 1) + 1);
             for (i = 0; i < (num_procs + 1); i++)
             {
-               global_data[i+4] = global_col_starts[i];
+               global_data[i + 4] = global_col_starts[i];
             }
          }
       }
@@ -1294,9 +1932,6 @@ hypre_CSRMatrixToParCSRMatrix( MPI_Comm         comm,
 
       if (global_data[3] == 2)
       {
-         row_starts = hypre_CTAlloc(HYPRE_BigInt, 2, HYPRE_MEMORY_HOST);
-         col_starts = hypre_CTAlloc(HYPRE_BigInt, 2, HYPRE_MEMORY_HOST);
-
          send_start = 4;
          hypre_MPI_Scatter(&global_data[send_start], 1, HYPRE_MPI_BIG_INT,
                            &row_starts[0], 1, HYPRE_MPI_BIG_INT, 0, comm);
@@ -1315,8 +1950,6 @@ hypre_CSRMatrixToParCSRMatrix( MPI_Comm         comm,
       }
       else if ((global_data[3] == 0) || (global_data[3] == 1))
       {
-         row_starts = hypre_CTAlloc(HYPRE_BigInt, 2, HYPRE_MEMORY_HOST);
-
          send_start = 4;
          hypre_MPI_Scatter(&global_data[send_start], 1, HYPRE_MPI_BIG_INT,
                            &row_starts[0], 1, HYPRE_MPI_BIG_INT, 0, comm);
@@ -1327,13 +1960,12 @@ hypre_CSRMatrixToParCSRMatrix( MPI_Comm         comm,
 
          if (global_data[3] == 0)
          {
-            col_starts = row_starts;
+            col_starts[0] = row_starts[0];
+            col_starts[1] = row_starts[1];
          }
       }
       else
       {
-         col_starts = hypre_CTAlloc(HYPRE_BigInt, 2, HYPRE_MEMORY_HOST);
-
          send_start = 4;
          hypre_MPI_Scatter(&global_data[send_start], 1, HYPRE_MPI_BIG_INT,
                            &col_starts[0], 1, HYPRE_MPI_BIG_INT, 0, comm);
@@ -1348,8 +1980,6 @@ hypre_CSRMatrixToParCSRMatrix( MPI_Comm         comm,
    // Create ParCSR matrix
    parcsr_A = hypre_ParCSRMatrixCreate(comm, global_num_rows, global_num_cols,
                                        row_starts, col_starts, 0, 0, 0);
-   hypre_TFree(row_starts, HYPRE_MEMORY_HOST);
-   hypre_TFree(col_starts, HYPRE_MEMORY_HOST);
 
    // Allocate memory for building ParCSR matrix
    num_rows_proc     = hypre_CTAlloc(HYPRE_Int, num_procs, HYPRE_MEMORY_HOST);
@@ -1370,8 +2000,8 @@ hypre_CSRMatrixToParCSRMatrix( MPI_Comm         comm,
 
       for (i = 0; i < num_procs; i++)
       {
-         num_rows_proc[i] = (HYPRE_Int) (global_row_starts[i+1] - global_row_starts[i]);
-         num_nonzeros_proc[i] = A_i[(HYPRE_Int)global_row_starts[i+1]] -
+         num_rows_proc[i] = (HYPRE_Int) (global_row_starts[i + 1] - global_row_starts[i]);
+         num_nonzeros_proc[i] = A_i[(HYPRE_Int)global_row_starts[i + 1]] -
                                 A_i[(HYPRE_Int)global_row_starts[i]];
       }
       //num_nonzeros_proc[num_procs-1] = A_i[(HYPRE_Int)global_num_rows] - A_i[(HYPRE_Int)row_starts[num_procs-1]];
@@ -1385,8 +2015,8 @@ hypre_CSRMatrixToParCSRMatrix( MPI_Comm         comm,
    csr_matrix_datatypes = hypre_CTAlloc(hypre_MPI_Datatype,  num_procs, HYPRE_MEMORY_HOST);
    if (my_id == 0)
    {
-      requests = hypre_CTAlloc(hypre_MPI_Request, num_procs-1, HYPRE_MEMORY_HOST);
-      status = hypre_CTAlloc(hypre_MPI_Status, num_procs-1, HYPRE_MEMORY_HOST);
+      requests = hypre_CTAlloc(hypre_MPI_Request, num_procs - 1, HYPRE_MEMORY_HOST);
+      status = hypre_CTAlloc(hypre_MPI_Status, num_procs - 1, HYPRE_MEMORY_HOST);
       for (i = 1; i < num_procs; i++)
       {
          ind = A_i[(HYPRE_Int) global_row_starts[i]];
@@ -1398,7 +2028,7 @@ hypre_CSRMatrixToParCSRMatrix( MPI_Comm         comm,
                                          &A_j[ind],
                                          &csr_matrix_datatypes[i]);
          hypre_MPI_Isend(hypre_MPI_BOTTOM, 1, csr_matrix_datatypes[i], i, 0, comm,
-                         &requests[i-1]);
+                         &requests[i - 1]);
          hypre_MPI_Type_free(&csr_matrix_datatypes[i]);
       }
       hypre_CSRMatrixData(local_A) = A_data;
@@ -1406,7 +2036,7 @@ hypre_CSRMatrixToParCSRMatrix( MPI_Comm         comm,
       hypre_CSRMatrixJ(local_A) = A_j;
       hypre_CSRMatrixOwnsData(local_A) = 0;
 
-      hypre_MPI_Waitall(num_procs-1, requests, status);
+      hypre_MPI_Waitall(num_procs - 1, requests, status);
 
       hypre_TFree(requests, HYPRE_MEMORY_HOST);
       hypre_TFree(status, HYPRE_MEMORY_HOST);
@@ -1480,10 +2110,10 @@ GenerateDiagAndOffd(hypre_CSRMatrix    *A,
    HYPRE_Int  *marker;
    HYPRE_Int num_cols_diag, num_cols_offd;
    HYPRE_Int first_elmt = a_i[0];
-   HYPRE_Int num_nonzeros = a_i[num_rows]-first_elmt;
+   HYPRE_Int num_nonzeros = a_i[num_rows] - first_elmt;
    HYPRE_Int counter;
 
-   num_cols_diag = (HYPRE_Int)(last_col_diag - first_col_diag +1);
+   num_cols_diag = (HYPRE_Int)(last_col_diag - first_col_diag + 1);
    num_cols_offd = 0;
 
    HYPRE_MemoryLocation memory_location = hypre_CSRMatrixMemoryLocation(A);
@@ -1497,7 +2127,7 @@ GenerateDiagAndOffd(hypre_CSRMatrix    *A,
       offd_i = hypre_CSRMatrixI(offd);
       marker = hypre_CTAlloc(HYPRE_Int, num_cols, HYPRE_MEMORY_HOST);
 
-      for (i=0; i < num_cols; i++)
+      for (i = 0; i < num_cols; i++)
       {
          marker[i] = 0;
       }
@@ -1509,7 +2139,7 @@ GenerateDiagAndOffd(hypre_CSRMatrix    *A,
          offd_i[i] = jo;
          diag_i[i] = jd;
 
-         for (j = a_i[i]-first_elmt; j < a_i[i+1]-first_elmt; j++)
+         for (j = a_i[i] - first_elmt; j < a_i[i + 1] - first_elmt; j++)
          {
             if (a_j[j] < first_col_diag || a_j[j] > last_col_diag)
             {
@@ -1529,7 +2159,8 @@ GenerateDiagAndOffd(hypre_CSRMatrix    *A,
       offd_i[num_rows] = jo;
       diag_i[num_rows] = jd;
 
-      hypre_ParCSRMatrixColMapOffd(matrix) = hypre_CTAlloc(HYPRE_BigInt, num_cols_offd, HYPRE_MEMORY_HOST);
+      hypre_ParCSRMatrixColMapOffd(matrix) = hypre_CTAlloc(HYPRE_BigInt, num_cols_offd,
+                                                           HYPRE_MEMORY_HOST);
       col_map_offd = hypre_ParCSRMatrixColMapOffd(matrix);
 
       counter = 0;
@@ -1556,9 +2187,9 @@ GenerateDiagAndOffd(hypre_CSRMatrix    *A,
 
       jo = 0;
       jd = 0;
-      for (i=0; i < num_rows; i++)
+      for (i = 0; i < num_rows; i++)
       {
-         for (j=a_i[i]-first_elmt; j < a_i[i+1]-first_elmt; j++)
+         for (j = a_i[i] - first_elmt; j < a_i[i + 1] - first_elmt; j++)
          {
             if (a_j[j] < (HYPRE_Int)first_col_diag || a_j[j] > (HYPRE_Int)last_col_diag)
             {
@@ -1568,7 +2199,7 @@ GenerateDiagAndOffd(hypre_CSRMatrix    *A,
             else
             {
                diag_data[jd] = a_data[j];
-               diag_j[jd++] = (HYPRE_Int)(a_j[j]-first_col_diag);
+               diag_j[jd++] = (HYPRE_Int)(a_j[j] - first_col_diag);
             }
          }
       }
@@ -1582,14 +2213,14 @@ GenerateDiagAndOffd(hypre_CSRMatrix    *A,
       diag_i = hypre_CSRMatrixI(diag);
       diag_j = hypre_CSRMatrixJ(diag);
 
-      for (i=0; i < num_nonzeros; i++)
+      for (i = 0; i < num_nonzeros; i++)
       {
          diag_data[i] = a_data[i];
          diag_j[i] = a_j[i];
       }
-      offd_i = hypre_CTAlloc(HYPRE_Int,  num_rows+1, HYPRE_MEMORY_HOST);
+      offd_i = hypre_CTAlloc(HYPRE_Int,  num_rows + 1, HYPRE_MEMORY_HOST);
 
-      for (i=0; i < num_rows+1; i++)
+      for (i = 0; i < num_rows + 1; i++)
       {
          diag_i[i] = a_i[i];
          offd_i[i] = 0;
@@ -1603,7 +2234,7 @@ GenerateDiagAndOffd(hypre_CSRMatrix    *A,
 }
 
 hypre_CSRMatrix *
-hypre_MergeDiagAndOffd(hypre_ParCSRMatrix *par_matrix)
+hypre_MergeDiagAndOffdHost(hypre_ParCSRMatrix *par_matrix)
 {
    hypre_CSRMatrix  *diag = hypre_ParCSRMatrixDiag(par_matrix);
    hypre_CSRMatrix  *offd = hypre_ParCSRMatrixOffd(par_matrix);
@@ -1633,7 +2264,7 @@ hypre_MergeDiagAndOffd(hypre_ParCSRMatrix *par_matrix)
 
    num_nonzeros = diag_i[num_rows] + offd_i[num_rows];
 
-   matrix = hypre_CSRMatrixCreate(num_rows,num_cols,num_nonzeros);
+   matrix = hypre_CSRMatrixCreate(num_rows, num_cols, num_nonzeros);
    hypre_CSRMatrixMemoryLocation(matrix) = memory_location;
    hypre_CSRMatrixBigInitialize(matrix);
 
@@ -1641,35 +2272,35 @@ hypre_MergeDiagAndOffd(hypre_ParCSRMatrix *par_matrix)
    matrix_j = hypre_CSRMatrixBigJ(matrix);
    matrix_data = hypre_CSRMatrixData(matrix);
    num_threads = hypre_NumThreads();
-   size = num_rows/num_threads;
-   rest = num_rows - size*num_threads;
+   size = num_rows / num_threads;
+   rest = num_rows - size * num_threads;
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(ii, i, j, count) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(ii, i, j, count) HYPRE_SMP_SCHEDULE
 #endif
    for (ii = 0; ii < num_threads; ii++)
    {
       HYPRE_Int ns, ne;
       if (ii < rest)
       {
-         ns = ii*size+ii;
-         ne = (ii+1)*size+ii+1;
+         ns = ii * size + ii;
+         ne = (ii + 1) * size + ii + 1;
       }
       else
       {
-         ns = ii*size+rest;
-         ne = (ii+1)*size+rest;
+         ns = ii * size + rest;
+         ne = (ii + 1) * size + rest;
       }
-      count = diag_i[ns]+offd_i[ns];;
+      count = diag_i[ns] + offd_i[ns];;
       for (i = ns; i < ne; i++)
       {
          matrix_i[i] = count;
-         for (j=diag_i[i]; j < diag_i[i+1]; j++)
+         for (j = diag_i[i]; j < diag_i[i + 1]; j++)
          {
             matrix_data[count] = diag_data[j];
-            matrix_j[count++] = (HYPRE_BigInt)diag_j[j]+first_col_diag;
+            matrix_j[count++] = (HYPRE_BigInt)diag_j[j] + first_col_diag;
          }
-         for (j=offd_i[i]; j < offd_i[i+1]; j++)
+         for (j = offd_i[i]; j < offd_i[i + 1]; j++)
          {
             matrix_data[count] = offd_data[j];
             matrix_j[count++] = col_map_offd[offd_j[j]];
@@ -1682,88 +2313,123 @@ hypre_MergeDiagAndOffd(hypre_ParCSRMatrix *par_matrix)
    return matrix;
 }
 
+hypre_CSRMatrix *
+hypre_MergeDiagAndOffd(hypre_ParCSRMatrix *par_matrix)
+{
+#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_ParCSRMatrixMemoryLocation(par_matrix) );
+
+   if (exec == HYPRE_EXEC_DEVICE)
+   {
+      return hypre_MergeDiagAndOffdDevice(par_matrix);
+   }
+   else
+#endif
+   {
+      return hypre_MergeDiagAndOffdHost(par_matrix);
+   }
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixToCSRMatrixAll
+ *
+ * The resulting matrix is stored in the space given by memory_location
+ *--------------------------------------------------------------------------*/
+
+hypre_CSRMatrix*
+hypre_ParCSRMatrixToCSRMatrixAll(hypre_ParCSRMatrix *par_A)
+{
+   return hypre_ParCSRMatrixToCSRMatrixAll_v2(par_A, hypre_ParCSRMatrixMemoryLocation(par_A));
+}
+
 /*--------------------------------------------------------------------------
- * hypre_ParCSRMatrixToCSRMatrixAll:
- * generates a CSRMatrix from a ParCSRMatrix on all processors that have
+ * hypre_ParCSRMatrixToCSRMatrixAll_v2
+ *
+ * Generates a CSRMatrix from a ParCSRMatrix on all processors that have
  * parts of the ParCSRMatrix
- * Warning: this only works for a ParCSRMatrix that is smaller than 2^31-1
+ *
+ * Warning: This only works for a ParCSRMatrix with num_rows < 2,147,483,647
  *--------------------------------------------------------------------------*/
 
-hypre_CSRMatrix *
-hypre_ParCSRMatrixToCSRMatrixAll(hypre_ParCSRMatrix *par_matrix)
+hypre_CSRMatrix*
+hypre_ParCSRMatrixToCSRMatrixAll_v2( hypre_ParCSRMatrix   *par_matrix,
+                                     HYPRE_MemoryLocation  memory_location )
 {
-   MPI_Comm comm = hypre_ParCSRMatrixComm(par_matrix);
-   hypre_CSRMatrix *matrix;
-   hypre_CSRMatrix *local_matrix;
-   HYPRE_Int num_rows = (HYPRE_Int)hypre_ParCSRMatrixGlobalNumRows(par_matrix);
-   HYPRE_Int num_cols = (HYPRE_Int)hypre_ParCSRMatrixGlobalNumCols(par_matrix);
-   HYPRE_Int *matrix_i;
-   HYPRE_Int *matrix_j;
-   HYPRE_Complex *matrix_data;
-
-   HYPRE_Int *local_matrix_i;
-   HYPRE_Int *local_matrix_j;
-   HYPRE_Complex *local_matrix_data;
-
-   HYPRE_Int i, j;
-   HYPRE_Int local_num_rows;
-   HYPRE_Int local_num_nonzeros;
-   HYPRE_Int num_nonzeros;
-   HYPRE_Int num_data;
-   HYPRE_Int num_requests;
-   HYPRE_Int vec_len, offset;
-   HYPRE_Int start_index;
-   HYPRE_Int proc_id;
-   HYPRE_Int num_procs, my_id;
-   HYPRE_Int num_types;
-   HYPRE_Int *used_procs;
-
-   hypre_MPI_Request *requests;
-   hypre_MPI_Status *status;
-
-   HYPRE_Int *new_vec_starts;
-
-   HYPRE_Int num_contacts;
-   HYPRE_Int contact_proc_list[1];
-   HYPRE_Int contact_send_buf[1];
-   HYPRE_Int contact_send_buf_starts[2];
-   HYPRE_Int max_response_size;
-   HYPRE_Int *response_recv_buf=NULL;
-   HYPRE_Int *response_recv_buf_starts = NULL;
+   MPI_Comm                   comm = hypre_ParCSRMatrixComm(par_matrix);
+   HYPRE_Int                  num_rows = (HYPRE_Int) hypre_ParCSRMatrixGlobalNumRows(par_matrix);
+   HYPRE_Int                  num_cols = (HYPRE_Int) hypre_ParCSRMatrixGlobalNumCols(par_matrix);
+   HYPRE_BigInt               first_row_index = hypre_ParCSRMatrixFirstRowIndex(par_matrix);
+   HYPRE_BigInt               last_row_index  = hypre_ParCSRMatrixLastRowIndex(par_matrix);
+
+   hypre_ParCSRMatrix        *par_temp;
+   hypre_CSRMatrix           *matrix;
+   HYPRE_Int                 *matrix_i;
+   HYPRE_Int                 *matrix_j;
+   HYPRE_Complex             *matrix_data;
+
+   hypre_CSRMatrix           *local_matrix;
+   HYPRE_Int                  local_num_rows;
+   HYPRE_Int                  local_num_nonzeros;
+   HYPRE_Int                 *local_matrix_i;
+   HYPRE_Int                 *local_matrix_j;
+   HYPRE_Complex             *local_matrix_data;
+
+   HYPRE_Int                  i, j;
+   HYPRE_Int                  num_nonzeros;
+   HYPRE_Int                  num_data;
+   HYPRE_Int                  num_requests;
+   HYPRE_Int                  vec_len, offset;
+   HYPRE_Int                  start_index;
+   HYPRE_Int                  proc_id;
+   HYPRE_Int                  num_procs, my_id;
+   HYPRE_Int                  num_types;
+   HYPRE_Int                 *used_procs;
+   HYPRE_Int                 *new_vec_starts;
+   hypre_MPI_Request         *requests;
+   hypre_MPI_Status          *status;
+   HYPRE_Int                  num_contacts;
+   HYPRE_Int                  contact_proc_list[1];
+   HYPRE_Int                  contact_send_buf[1];
+   HYPRE_Int                  contact_send_buf_starts[2];
+   HYPRE_Int                  max_response_size;
+   HYPRE_Int                 *response_recv_buf = NULL;
+   HYPRE_Int                 *response_recv_buf_starts = NULL;
    hypre_DataExchangeResponse response_obj;
-   hypre_ProcListElements send_proc_obj;
+   hypre_ProcListElements     send_proc_obj;
 
-   HYPRE_Int *send_info = NULL;
-   hypre_MPI_Status  status1;
-   HYPRE_Int count, tag1 = 11112, tag2 = 22223, tag3 = 33334;
-   HYPRE_Int start;
+   HYPRE_Int                 *send_info = NULL;
+   hypre_MPI_Status           status1;
+   HYPRE_Int                  count, start;
+   HYPRE_Int                  tag1 = 11112, tag2 = 22223, tag3 = 33334;
 
    hypre_MPI_Comm_size(comm, &num_procs);
    hypre_MPI_Comm_rank(comm, &my_id);
 
-   local_num_rows = (HYPRE_Int)(hypre_ParCSRMatrixLastRowIndex(par_matrix)  -
-      hypre_ParCSRMatrixFirstRowIndex(par_matrix) + 1);
+   /* Clone input matrix to host memory */
+   par_temp = hypre_ParCSRMatrixClone_v2(par_matrix, 1, HYPRE_MEMORY_HOST);
+
+   /* Creates local matrix on host memory */
+   local_matrix = hypre_MergeDiagAndOffd(par_temp);
+   hypre_ParCSRMatrixDestroy(par_temp);
 
+   /* copies big_j to j */
+   hypre_CSRMatrixBigJtoJ(local_matrix);
 
-   local_matrix = hypre_MergeDiagAndOffd(par_matrix); /* creates matrix */
-   hypre_CSRMatrixBigJtoJ(local_matrix); /* copies big_j to j */
    local_matrix_i = hypre_CSRMatrixI(local_matrix);
    local_matrix_j = hypre_CSRMatrixJ(local_matrix);
    local_matrix_data = hypre_CSRMatrixData(local_matrix);
-
+   local_num_rows = (HYPRE_Int) (last_row_index - first_row_index + 1);
 
    /* determine procs that have vector data and store their ids in used_procs */
    /* we need to do an exchange data for this.  If I own row then I will contact
       processor 0 with the endpoint of my local range */
-
    if (local_num_rows > 0)
    {
       num_contacts = 1;
       contact_proc_list[0] = 0;
-      contact_send_buf[0] =  (HYPRE_Int)hypre_ParCSRMatrixLastRowIndex(par_matrix);
+      contact_send_buf[0]  = (HYPRE_Int) hypre_ParCSRMatrixLastRowIndex(par_matrix);
       contact_send_buf_starts[0] = 0;
       contact_send_buf_starts[1] = 1;
-
    }
    else
    {
@@ -1775,20 +2441,19 @@ hypre_ParCSRMatrixToCSRMatrixAll(hypre_ParCSRMatrix *par_matrix)
    /*send_proc_obj will  be for saving info from contacts */
    send_proc_obj.length = 0;
    send_proc_obj.storage_length = 10;
-   send_proc_obj.id = hypre_CTAlloc(HYPRE_Int,  send_proc_obj.storage_length, HYPRE_MEMORY_HOST);
-   send_proc_obj.vec_starts =
-      hypre_CTAlloc(HYPRE_Int,  send_proc_obj.storage_length + 1, HYPRE_MEMORY_HOST);
+   send_proc_obj.id = hypre_CTAlloc(HYPRE_Int, send_proc_obj.storage_length, HYPRE_MEMORY_HOST);
+   send_proc_obj.vec_starts = hypre_CTAlloc(HYPRE_Int, send_proc_obj.storage_length + 1,
+                                            HYPRE_MEMORY_HOST);
    send_proc_obj.vec_starts[0] = 0;
    send_proc_obj.element_storage_length = 10;
-   send_proc_obj.elements =
-      hypre_CTAlloc(HYPRE_BigInt,  send_proc_obj.element_storage_length, HYPRE_MEMORY_HOST);
+   send_proc_obj.elements = hypre_CTAlloc(HYPRE_BigInt, send_proc_obj.element_storage_length,
+                                          HYPRE_MEMORY_HOST);
 
    max_response_size = 0; /* each response is null */
    response_obj.fill_response = hypre_FillResponseParToCSRMatrix;
    response_obj.data1 = NULL;
    response_obj.data2 = &send_proc_obj; /*this is where we keep info from contacts*/
 
-
    hypre_DataExchangeList(num_contacts,
                           contact_proc_list, contact_send_buf,
                           contact_send_buf_starts, sizeof(HYPRE_Int),
@@ -1808,21 +2473,21 @@ hypre_ParCSRMatrixToCSRMatrixAll(hypre_ParCSRMatrix *par_matrix)
          hypre_MPI_Probe(0, tag1, comm, &status1);
          hypre_MPI_Get_count(&status1, HYPRE_MPI_INT, &count);
 
-         send_info = hypre_CTAlloc(HYPRE_Int,  count, HYPRE_MEMORY_HOST);
+         send_info = hypre_CTAlloc(HYPRE_Int, count, HYPRE_MEMORY_HOST);
          hypre_MPI_Recv(send_info, count, HYPRE_MPI_INT, 0, tag1, comm, &status1);
 
          /* now unpack */
          num_types = send_info[0];
-         used_procs =  hypre_CTAlloc(HYPRE_Int,  num_types, HYPRE_MEMORY_HOST);
-         new_vec_starts = hypre_CTAlloc(HYPRE_Int,  num_types+1, HYPRE_MEMORY_HOST);
+         used_procs =  hypre_CTAlloc(HYPRE_Int, num_types, HYPRE_MEMORY_HOST);
+         new_vec_starts = hypre_CTAlloc(HYPRE_Int, num_types + 1, HYPRE_MEMORY_HOST);
 
-         for (i=1; i<= num_types; i++)
+         for (i = 1; i <= num_types; i++)
          {
-            used_procs[i-1] = send_info[i];
+            used_procs[i - 1] = send_info[i];
          }
-         for (i=num_types+1; i< count; i++)
+         for (i = num_types + 1; i < count; i++)
          {
-            new_vec_starts[i-num_types-1] = send_info[i] ;
+            new_vec_starts[i - num_types - 1] = send_info[i] ;
          }
       }
       else /* clean up and exit */
@@ -1830,46 +2495,42 @@ hypre_ParCSRMatrixToCSRMatrixAll(hypre_ParCSRMatrix *par_matrix)
          hypre_TFree(send_proc_obj.vec_starts, HYPRE_MEMORY_HOST);
          hypre_TFree(send_proc_obj.id, HYPRE_MEMORY_HOST);
          hypre_TFree(send_proc_obj.elements, HYPRE_MEMORY_HOST);
-         if(response_recv_buf)        hypre_TFree(response_recv_buf, HYPRE_MEMORY_HOST);
-         if(response_recv_buf_starts) hypre_TFree(response_recv_buf_starts, HYPRE_MEMORY_HOST);
-
-
-         if (hypre_CSRMatrixOwnsData(local_matrix))
-            hypre_CSRMatrixDestroy(local_matrix);
-         else
-            hypre_TFree(local_matrix, HYPRE_MEMORY_HOST);
+         hypre_TFree(response_recv_buf, HYPRE_MEMORY_HOST);
+         hypre_TFree(response_recv_buf_starts, HYPRE_MEMORY_HOST);
+         hypre_CSRMatrixDestroy(local_matrix);
 
          return NULL;
       }
    }
    else /* my_id ==0 */
    {
-      num_types = send_proc_obj.length;
-      used_procs =  hypre_CTAlloc(HYPRE_Int,  num_types, HYPRE_MEMORY_HOST);
-      new_vec_starts = hypre_CTAlloc(HYPRE_Int,  num_types+1, HYPRE_MEMORY_HOST);
+      num_types      = send_proc_obj.length;
+      used_procs     = hypre_CTAlloc(HYPRE_Int, num_types, HYPRE_MEMORY_HOST);
+      new_vec_starts = hypre_CTAlloc(HYPRE_Int, num_types + 1, HYPRE_MEMORY_HOST);
 
       new_vec_starts[0] = 0;
-      for (i=0; i< num_types; i++)
+      for (i = 0; i < num_types; i++)
       {
          used_procs[i] = send_proc_obj.id[i];
-         new_vec_starts[i+1] = send_proc_obj.elements[i]+1;
+         new_vec_starts[i + 1] = send_proc_obj.elements[i] + 1;
       }
-      hypre_qsort0(used_procs, 0, num_types-1);
+      hypre_qsort0(used_procs, 0, num_types - 1);
       hypre_qsort0(new_vec_starts, 0, num_types);
-      /*now we need to put into an array to send */
-      count =  2*num_types+2;
-      send_info = hypre_CTAlloc(HYPRE_Int,  count, HYPRE_MEMORY_HOST);
+
+      /* Now we need to put into an array to send */
+      count = 2 * num_types + 2;
+      send_info = hypre_CTAlloc(HYPRE_Int, count, HYPRE_MEMORY_HOST);
       send_info[0] = num_types;
-      for (i=1; i<= num_types; i++)
+      for (i = 1; i <= num_types; i++)
       {
-         send_info[i] = (HYPRE_BigInt)used_procs[i-1];
+         send_info[i] = (HYPRE_BigInt) used_procs[i - 1];
       }
-      for (i=num_types+1; i< count; i++)
+      for (i = num_types + 1; i < count; i++)
       {
-         send_info[i] = new_vec_starts[i-num_types-1];
+         send_info[i] = new_vec_starts[i - num_types - 1];
       }
-      requests = hypre_CTAlloc(hypre_MPI_Request,  num_types, HYPRE_MEMORY_HOST);
-      status =  hypre_CTAlloc(hypre_MPI_Status,  num_types, HYPRE_MEMORY_HOST);
+      requests = hypre_CTAlloc(hypre_MPI_Request, num_types, HYPRE_MEMORY_HOST);
+      status   = hypre_CTAlloc(hypre_MPI_Status, num_types, HYPRE_MEMORY_HOST);
 
       /* don't send to myself  - these are sorted so my id would be first*/
       start = 0;
@@ -1878,32 +2539,29 @@ hypre_ParCSRMatrixToCSRMatrixAll(hypre_ParCSRMatrix *par_matrix)
          start = 1;
       }
 
-      for (i=start; i < num_types; i++)
+      for (i = start; i < num_types; i++)
       {
          hypre_MPI_Isend(send_info, count, HYPRE_MPI_INT, used_procs[i], tag1,
-                         comm, &requests[i-start]);
+                         comm, &requests[i - start]);
       }
-      hypre_MPI_Waitall(num_types-start, requests, status);
+      hypre_MPI_Waitall(num_types - start, requests, status);
 
       hypre_TFree(status, HYPRE_MEMORY_HOST);
       hypre_TFree(requests, HYPRE_MEMORY_HOST);
    }
-   /* clean up */
+
+   /* Clean up */
    hypre_TFree(send_proc_obj.vec_starts, HYPRE_MEMORY_HOST);
    hypre_TFree(send_proc_obj.id, HYPRE_MEMORY_HOST);
    hypre_TFree(send_proc_obj.elements, HYPRE_MEMORY_HOST);
    hypre_TFree(send_info, HYPRE_MEMORY_HOST);
-   if(response_recv_buf)        hypre_TFree(response_recv_buf, HYPRE_MEMORY_HOST);
-   if(response_recv_buf_starts) hypre_TFree(response_recv_buf_starts, HYPRE_MEMORY_HOST);
+   hypre_TFree(response_recv_buf, HYPRE_MEMORY_HOST);
+   hypre_TFree(response_recv_buf_starts, HYPRE_MEMORY_HOST);
 
    /* now proc 0 can exit if it has no rows */
    if (!local_num_rows)
    {
-      if (hypre_CSRMatrixOwnsData(local_matrix))
-         hypre_CSRMatrixDestroy(local_matrix);
-      else
-         hypre_TFree(local_matrix, HYPRE_MEMORY_HOST);
-
+      hypre_CSRMatrixDestroy(local_matrix);
       hypre_TFree(new_vec_starts, HYPRE_MEMORY_HOST);
       hypre_TFree(used_procs, HYPRE_MEMORY_HOST);
 
@@ -1913,20 +2571,19 @@ hypre_ParCSRMatrixToCSRMatrixAll(hypre_ParCSRMatrix *par_matrix)
    /* everyone left has rows and knows: new_vec_starts, num_types, and used_procs */
 
    /* this matrix should be rather small */
-   matrix_i = hypre_CTAlloc(HYPRE_Int,  num_rows+1, HYPRE_MEMORY_HOST);
+   matrix_i = hypre_CTAlloc(HYPRE_Int, num_rows + 1, HYPRE_MEMORY_HOST);
 
-   num_requests = 4*num_types;
-   requests = hypre_CTAlloc(hypre_MPI_Request,  num_requests, HYPRE_MEMORY_HOST);
-   status = hypre_CTAlloc(hypre_MPI_Status,  num_requests, HYPRE_MEMORY_HOST);
+   num_requests = 4 * num_types;
+   requests = hypre_CTAlloc(hypre_MPI_Request, num_requests, HYPRE_MEMORY_HOST);
+   status   = hypre_CTAlloc(hypre_MPI_Status, num_requests, HYPRE_MEMORY_HOST);
 
    /* exchange contents of local_matrix_i - here we are sending to ourself also*/
-
    j = 0;
    for (i = 0; i < num_types; i++)
    {
       proc_id = used_procs[i];
-      vec_len = (HYPRE_Int)(new_vec_starts[i+1] - new_vec_starts[i]);
-      hypre_MPI_Irecv(&matrix_i[new_vec_starts[i]+1], vec_len, HYPRE_MPI_INT,
+      vec_len = (HYPRE_Int)(new_vec_starts[i + 1] - new_vec_starts[i]);
+      hypre_MPI_Irecv(&matrix_i[new_vec_starts[i] + 1], vec_len, HYPRE_MPI_INT,
                       proc_id, tag2, comm, &requests[j++]);
    }
    for (i = 0; i < num_types; i++)
@@ -1935,46 +2592,43 @@ hypre_ParCSRMatrixToCSRMatrixAll(hypre_ParCSRMatrix *par_matrix)
       hypre_MPI_Isend(&local_matrix_i[1], local_num_rows, HYPRE_MPI_INT,
                       proc_id, tag2, comm, &requests[j++]);
    }
-
    hypre_MPI_Waitall(j, requests, status);
 
    /* generate matrix_i from received data */
    /* global numbering?*/
    offset = matrix_i[new_vec_starts[1]];
-   for (i=1; i < num_types; i++)
+   for (i = 1; i < num_types; i++)
    {
-      for (j = new_vec_starts[i]; j < new_vec_starts[i+1]; j++)
-         matrix_i[j+1] += offset;
-      offset = matrix_i[new_vec_starts[i+1]];
+      for (j = new_vec_starts[i]; j < new_vec_starts[i + 1]; j++)
+      {
+         matrix_i[j + 1] += offset;
+      }
+      offset = matrix_i[new_vec_starts[i + 1]];
    }
 
    num_nonzeros = matrix_i[num_rows];
 
    matrix = hypre_CSRMatrixCreate(num_rows, num_cols, num_nonzeros);
-
-   hypre_CSRMatrixMemoryLocation(matrix) = HYPRE_MEMORY_HOST;
-
    hypre_CSRMatrixI(matrix) = matrix_i;
-   hypre_CSRMatrixInitialize(matrix);
+   hypre_CSRMatrixInitialize_v2(matrix, 0, HYPRE_MEMORY_HOST);
    matrix_j = hypre_CSRMatrixJ(matrix);
    matrix_data = hypre_CSRMatrixData(matrix);
 
    /* generate datatypes for further data exchange and exchange remaining
       data, i.e. column info and actual data */
-
    j = 0;
    for (i = 0; i < num_types; i++)
    {
       proc_id = used_procs[i];
       start_index = matrix_i[(HYPRE_Int)new_vec_starts[i]];
-      num_data = matrix_i[(HYPRE_Int)new_vec_starts[i+1]] - start_index;
+      num_data = matrix_i[(HYPRE_Int)new_vec_starts[i + 1]] - start_index;
       hypre_MPI_Irecv(&matrix_data[start_index], num_data, HYPRE_MPI_COMPLEX,
                       used_procs[i], tag1, comm, &requests[j++]);
       hypre_MPI_Irecv(&matrix_j[start_index], num_data, HYPRE_MPI_INT,
                       used_procs[i], tag3, comm, &requests[j++]);
    }
    local_num_nonzeros = local_matrix_i[local_num_rows];
-   for (i=0; i < num_types; i++)
+   for (i = 0; i < num_types; i++)
    {
       hypre_MPI_Isend(local_matrix_data, local_num_nonzeros, HYPRE_MPI_COMPLEX,
                       used_procs[i], tag1, comm, &requests[j++]);
@@ -1982,22 +2636,18 @@ hypre_ParCSRMatrixToCSRMatrixAll(hypre_ParCSRMatrix *par_matrix)
                       used_procs[i], tag3, comm, &requests[j++]);
    }
 
-
    hypre_MPI_Waitall(num_requests, requests, status);
-
    hypre_TFree(new_vec_starts, HYPRE_MEMORY_HOST);
-
-   if (hypre_CSRMatrixOwnsData(local_matrix))
-      hypre_CSRMatrixDestroy(local_matrix);
-   else
-      hypre_TFree(local_matrix, HYPRE_MEMORY_HOST);
-
    if (num_requests)
    {
       hypre_TFree(requests, HYPRE_MEMORY_HOST);
       hypre_TFree(status, HYPRE_MEMORY_HOST);
       hypre_TFree(used_procs, HYPRE_MEMORY_HOST);
    }
+   hypre_CSRMatrixDestroy(local_matrix);
+
+   /* Move resulting matrix to the memory location passed as input */
+   hypre_CSRMatrixMigrate(matrix, memory_location);
 
    return matrix;
 }
@@ -2078,6 +2728,8 @@ hypre_FillResponseParToCSRMatrix( void       *p_recv_contact_buf,
                                   void      **p_send_response_buf,
                                   HYPRE_Int *response_message_size )
 {
+   HYPRE_UNUSED_VAR(p_send_response_buf);
+
    HYPRE_Int    myid;
    HYPRE_Int    i, index, count, elength;
 
@@ -2092,7 +2744,7 @@ hypre_FillResponseParToCSRMatrix( void       *p_recv_contact_buf,
    /*check to see if we need to allocate more space in send_proc_obj for ids*/
    if (send_proc_obj->length == send_proc_obj->storage_length)
    {
-      send_proc_obj->storage_length +=10; /*add space for 10 more processors*/
+      send_proc_obj->storage_length += 10; /*add space for 10 more processors*/
       send_proc_obj->id = hypre_TReAlloc(send_proc_obj->id, HYPRE_Int,
                                          send_proc_obj->storage_length, HYPRE_MEMORY_HOST);
       send_proc_obj->vec_starts =
@@ -2117,11 +2769,11 @@ hypre_FillResponseParToCSRMatrix( void       *p_recv_contact_buf,
       send_proc_obj->element_storage_length = elength;
    }
    /*populate send_proc_obj*/
-   for (i=0; i< contact_size; i++)
+   for (i = 0; i < contact_size; i++)
    {
       send_proc_obj->elements[index++] = recv_contact_buf[i];
    }
-   send_proc_obj->vec_starts[count+1] = index;
+   send_proc_obj->vec_starts[count + 1] = index;
    send_proc_obj->length++;
 
    /*output - no message to return (confirmation) */
@@ -2132,15 +2784,20 @@ hypre_FillResponseParToCSRMatrix( void       *p_recv_contact_buf,
 
 /*--------------------------------------------------------------------------
  * hypre_ParCSRMatrixUnion
+ *
  * Creates and returns a new matrix whose elements are the union of A and B.
  * Data is not copied, only structural information is created.
  * A and B must have the same communicator, numbers and distributions of rows
  * and columns (they can differ in which row-column pairs are nonzero, thus
  * in which columns are in a offd block)
+ *
+ * TODO (VPM): This function should use hypre_ParCSRMatrixCreate to create
+ *             the matrix.
  *--------------------------------------------------------------------------*/
 
-hypre_ParCSRMatrix * hypre_ParCSRMatrixUnion( hypre_ParCSRMatrix * A,
-                                              hypre_ParCSRMatrix * B )
+hypre_ParCSRMatrix*
+hypre_ParCSRMatrixUnion( hypre_ParCSRMatrix *A,
+                         hypre_ParCSRMatrix *B )
 {
    hypre_ParCSRMatrix *C;
    HYPRE_BigInt       *col_map_offd_C = NULL;
@@ -2149,7 +2806,7 @@ hypre_ParCSRMatrix * hypre_ParCSRMatrixUnion( hypre_ParCSRMatrix * A,
 
    hypre_MPI_Comm_rank(comm, &my_id);
 
-   C = hypre_CTAlloc( hypre_ParCSRMatrix,  1 , HYPRE_MEMORY_HOST);
+   C = hypre_CTAlloc( hypre_ParCSRMatrix,  1, HYPRE_MEMORY_HOST);
    hypre_ParCSRMatrixComm( C ) = hypre_ParCSRMatrixComm( A );
    hypre_ParCSRMatrixGlobalNumRows( C ) = hypre_ParCSRMatrixGlobalNumRows( A );
    hypre_ParCSRMatrixGlobalNumCols( C ) = hypre_ParCSRMatrixGlobalNumCols( A );
@@ -2192,20 +2849,27 @@ hypre_ParCSRMatrix * hypre_ParCSRMatrixUnion( hypre_ParCSRMatrix * A,
    return C;
 }
 
-/* Perform dual truncation of ParCSR matrix.
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixTruncate
+ *
+ * Perform dual truncation of ParCSR matrix.
+ *
  * This code is adapted from original BoomerAMGInterpTruncate()
+ *
  * A: parCSR matrix to be modified
  * tol: relative tolerance or truncation factor for dropping small terms
  * max_row_elmts: maximum number of (largest) nonzero elements to keep.
  * rescale: Boolean on whether or not to scale resulting matrix. Scaling for
- * each row satisfies: sum(nonzero values before dropping)/ sum(nonzero values after dropping),
- * this way, the application of the truncated matrix on a constant vector is the same as that of
- * the original matrix.
+ *   each row satisfies: sum(nonzero values before dropping) /
+ *                       sum(nonzero values after dropping),
+ *   this way, the application of the truncated matrix on a constant vector
+ *   is the same as that of the original matrix.
  * nrm_type: type of norm used for dropping with tol.
  * -- 0 = infinity-norm
  * -- 1 = 1-norm
  * -- 2 = 2-norm
-*/
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_ParCSRMatrixTruncate(hypre_ParCSRMatrix *A,
                            HYPRE_Real          tol,
@@ -2238,7 +2902,7 @@ hypre_ParCSRMatrixTruncate(hypre_ParCSRMatrix *A,
    HYPRE_Int next_open;
    HYPRE_Int now_checking;
    HYPRE_Int num_lost;
-   HYPRE_Int num_lost_global=0;
+   HYPRE_Int num_lost_global = 0;
    HYPRE_Int next_open_offd;
    HYPRE_Int now_checking_offd;
    HYPRE_Int num_lost_offd;
@@ -2277,7 +2941,7 @@ hypre_ParCSRMatrixTruncate(hypre_ParCSRMatrix *A,
    }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel private(i,my_thread_num,num_threads,row_nrm, drop_coeff,j,start_j,row_sum,scale,num_lost,now_checking,next_open,num_lost_offd,now_checking_offd,next_open_offd,start,stop,cnt_diag,cnt_offd,num_elmts,cnt)
+   #pragma omp parallel private(i,my_thread_num,num_threads,row_nrm, drop_coeff,j,start_j,row_sum,scale,num_lost,now_checking,next_open,num_lost_offd,now_checking_offd,next_open_offd,start,stop,cnt_diag,cnt_offd,num_elmts,cnt)
 #endif
    {
       my_thread_num = hypre_GetThreadNum();
@@ -2292,7 +2956,7 @@ hypre_ParCSRMatrixTruncate(hypre_ParCSRMatrix *A,
 
       /* my row range */
       start = (n_fine / num_threads) * my_thread_num;
-      if (my_thread_num == num_threads-1)
+      if (my_thread_num == num_threads - 1)
       {
          stop = n_fine;
       }
@@ -2321,43 +2985,43 @@ hypre_ParCSRMatrixTruncate(hypre_ParCSRMatrix *A,
             if (nrm_type == 0)
             {
                /* infty-norm */
-               for (j = A_diag_i[i]; j < A_diag_i[i+1]; j++)
+               for (j = A_diag_i[i]; j < A_diag_i[i + 1]; j++)
                {
-                  row_nrm = (row_nrm < fabs(A_diag_data[j])) ?
-                     fabs(A_diag_data[j]) : row_nrm;
+                  row_nrm = (row_nrm < hypre_cabs(A_diag_data[j])) ?
+                            hypre_cabs(A_diag_data[j]) : row_nrm;
                }
-               for (j = A_offd_i[i]; j < A_offd_i[i+1]; j++)
+               for (j = A_offd_i[i]; j < A_offd_i[i + 1]; j++)
                {
-                  row_nrm = (row_nrm < fabs(A_offd_data[j])) ?
-                     fabs(A_offd_data[j]) : row_nrm;
+                  row_nrm = (row_nrm < hypre_cabs(A_offd_data[j])) ?
+                            hypre_cabs(A_offd_data[j]) : row_nrm;
                }
             }
             if (nrm_type == 1)
             {
                /* 1-norm */
-               for (j = A_diag_i[i]; j < A_diag_i[i+1]; j++)
+               for (j = A_diag_i[i]; j < A_diag_i[i + 1]; j++)
                {
-                  row_nrm += fabs(A_diag_data[j]);
+                  row_nrm += hypre_cabs(A_diag_data[j]);
                }
-               for (j = A_offd_i[i]; j < A_offd_i[i+1]; j++)
+               for (j = A_offd_i[i]; j < A_offd_i[i + 1]; j++)
                {
-                  row_nrm += fabs(A_offd_data[j]);
+                  row_nrm += hypre_cabs(A_offd_data[j]);
                }
             }
             if (nrm_type == 2)
             {
                /* 2-norm */
-               for (j = A_diag_i[i]; j < A_diag_i[i+1]; j++)
+               for (j = A_diag_i[i]; j < A_diag_i[i + 1]; j++)
                {
                   HYPRE_Complex v = A_diag_data[j];
-                  row_nrm += v*v;
+                  row_nrm += v * v;
                }
-               for (j = A_offd_i[i]; j < A_offd_i[i+1]; j++)
+               for (j = A_offd_i[i]; j < A_offd_i[i + 1]; j++)
                {
                   HYPRE_Complex v = A_offd_data[j];
-                  row_nrm += v*v;
+                  row_nrm += v * v;
                }
-               row_nrm  = sqrt(row_nrm);
+               row_nrm  = hypre_sqrt(row_nrm);
             }
             drop_coeff = tol * row_nrm;
 
@@ -2368,10 +3032,10 @@ hypre_ParCSRMatrixTruncate(hypre_ParCSRMatrix *A,
             }
             row_sum = 0;
             scale = 0;
-            for (j = start_j; j < A_diag_i[i+1]; j++)
+            for (j = start_j; j < A_diag_i[i + 1]; j++)
             {
                row_sum += A_diag_data[now_checking];
-               if (fabs(A_diag_data[now_checking]) < drop_coeff)
+               if (hypre_cabs(A_diag_data[now_checking]) < drop_coeff)
                {
                   num_lost++;
                   now_checking++;
@@ -2392,10 +3056,10 @@ hypre_ParCSRMatrixTruncate(hypre_ParCSRMatrix *A,
                A_offd_i[i] -= num_lost_offd;
             }
 
-            for (j = start_j; j < A_offd_i[i+1]; j++)
+            for (j = start_j; j < A_offd_i[i + 1]; j++)
             {
                row_sum += A_offd_data[now_checking_offd];
-               if (fabs(A_offd_data[now_checking_offd]) < drop_coeff)
+               if (hypre_cabs(A_offd_data[now_checking_offd]) < drop_coeff)
                {
                   num_lost_offd++;
                   now_checking_offd++;
@@ -2415,12 +3079,12 @@ hypre_ParCSRMatrixTruncate(hypre_ParCSRMatrix *A,
             {
                if (scale != row_sum)
                {
-                  scale = row_sum/scale;
-                  for (j = A_diag_i[i]; j < (A_diag_i[i+1]-num_lost); j++)
+                  scale = row_sum / scale;
+                  for (j = A_diag_i[i]; j < (A_diag_i[i + 1] - num_lost); j++)
                   {
                      A_diag_data[j] *= scale;
                   }
-                  for (j = A_offd_i[i]; j < (A_offd_i[i+1]-num_lost_offd); j++)
+                  for (j = A_offd_i[i]; j < (A_offd_i[i + 1] - num_lost_offd); j++)
                   {
                      A_offd_data[j] *= scale;
                   }
@@ -2450,18 +3114,18 @@ hypre_ParCSRMatrixTruncate(hypre_ParCSRMatrix *A,
 
          /* find maximum row length locally over this row range */
          A_mxnum = 0;
-         for (i=start; i<stop; i++)
+         for (i = start; i < stop; i++)
          {
             /* Note A_diag_i[stop] is the starting point for the next thread
              * in j and data, not the stop point for this thread */
-            last_index = A_diag_i[i+1];
-            last_index_offd = A_offd_i[i+1];
-            if (i == stop-1)
+            last_index = A_diag_i[i + 1];
+            last_index_offd = A_offd_i[i + 1];
+            if (i == stop - 1)
             {
                last_index -= num_lost_per_thread[my_thread_num];
                last_index_offd -= num_lost_offd_per_thread[my_thread_num];
             }
-            cnt1 = last_index-A_diag_i[i] + last_index_offd-A_offd_i[i];
+            cnt1 = last_index - A_diag_i[i] + last_index_offd - A_offd_i[i];
             if (cnt1 > A_mxnum)
             {
                A_mxnum = cnt1;
@@ -2485,16 +3149,16 @@ hypre_ParCSRMatrixTruncate(hypre_ParCSRMatrix *A,
             {
                /* Note A_diag_i[stop] is the starting point for the next thread
                 * in j and data, not the stop point for this thread */
-               last_index = A_diag_i[i+1];
-               last_index_offd = A_offd_i[i+1];
-               if (i == stop-1)
+               last_index = A_diag_i[i + 1];
+               last_index_offd = A_offd_i[i + 1];
+               if (i == stop - 1)
                {
                   last_index -= num_lost_per_thread[my_thread_num];
                   last_index_offd -= num_lost_offd_per_thread[my_thread_num];
                }
 
                row_sum = 0;
-               num_elmts = last_index-A_diag_i[i] + last_index_offd-A_offd_i[i];
+               num_elmts = last_index - A_diag_i[i] + last_index_offd - A_offd_i[i];
                if (max_row_elmts < num_elmts)
                {
                   /* copy both diagonal and off-diag parts of row i to _aux_ arrays */
@@ -2509,14 +3173,14 @@ hypre_ParCSRMatrixTruncate(hypre_ParCSRMatrix *A,
                   cnt1 = cnt;
                   for (j = A_offd_i[i]; j < last_index_offd; j++)
                   {
-                     A_aux_j[cnt] = A_offd_j[j]+num_cols;
+                     A_aux_j[cnt] = A_offd_j[j] + num_cols;
                      A_aux_data[cnt++] = A_offd_data[j];
                      row_sum += A_offd_data[j];
                   }
-                  num_lost_offd += cnt-cnt1;
+                  num_lost_offd += cnt - cnt1;
 
                   /* sort data */
-                  hypre_qsort2_abs(A_aux_j,A_aux_data,0,cnt-1);
+                  hypre_qsort2_abs(A_aux_j, A_aux_data, 0, cnt - 1);
                   scale = 0;
                   if (i > start)
                   {
@@ -2533,19 +3197,19 @@ hypre_ParCSRMatrixTruncate(hypre_ParCSRMatrix *A,
                      }
                      else
                      {
-                        A_offd_j[cnt_offd] = A_aux_j[j]-num_cols;
+                        A_offd_j[cnt_offd] = A_aux_j[j] - num_cols;
                         A_offd_data[cnt_offd++] = A_aux_data[j];
                      }
                   }
-                  num_lost -= cnt_diag-A_diag_i[i];
-                  num_lost_offd -= cnt_offd-A_offd_i[i];
+                  num_lost -= cnt_diag - A_diag_i[i];
+                  num_lost_offd -= cnt_offd - A_offd_i[i];
 
                   /* scale row of A */
                   if (rescale && (scale != 0.))
                   {
                      if (scale != row_sum)
                      {
-                        scale = row_sum/scale;
+                        scale = row_sum / scale;
                         for (j = A_diag_i[i]; j < cnt_diag; j++)
                         {
                            A_diag_data[j] *= scale;
@@ -2573,7 +3237,7 @@ hypre_ParCSRMatrixTruncate(hypre_ParCSRMatrix *A,
                   }
                   else
                   {
-                     cnt_diag += last_index-A_diag_i[i];
+                     cnt_diag += last_index - A_diag_i[i];
                   }
 
                   if (A_offd_i[i] != cnt_offd)
@@ -2588,7 +3252,7 @@ hypre_ParCSRMatrixTruncate(hypre_ParCSRMatrix *A,
                   }
                   else
                   {
-                     cnt_offd += last_index_offd-A_offd_i[i];
+                     cnt_offd += last_index_offd - A_offd_i[i];
                   }
                }
             } /* end for (i = 0; i < n_fine; i++) */
@@ -2604,7 +3268,7 @@ hypre_ParCSRMatrixTruncate(hypre_ParCSRMatrix *A,
 
       /* Sum up num_lost_global */
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
       if (my_thread_num == 0)
       {
@@ -2617,7 +3281,7 @@ hypre_ParCSRMatrixTruncate(hypre_ParCSRMatrix *A,
          }
       }
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
 
       /*
@@ -2642,7 +3306,7 @@ hypre_ParCSRMatrixTruncate(hypre_ParCSRMatrix *A,
                A_diag_size -= num_lost_per_thread[i];
                if (i > 0)
                {
-                  cum_lost_per_thread[i] = num_lost_per_thread[i] + cum_lost_per_thread[i-1];
+                  cum_lost_per_thread[i] = num_lost_per_thread[i] + cum_lost_per_thread[i - 1];
                }
                else
                {
@@ -2654,7 +3318,7 @@ hypre_ParCSRMatrixTruncate(hypre_ParCSRMatrix *A,
             A_diag_data_new = hypre_CTAlloc(HYPRE_Real, A_diag_size, memory_location_diag);
          }
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+         #pragma omp barrier
 #endif
 
          /* points to next open spot in new data structures for this thread */
@@ -2666,7 +3330,7 @@ hypre_ParCSRMatrixTruncate(hypre_ParCSRMatrix *A,
          {
             /* remember, cum_lost_per_thread[k] stores the num dropped up to and
              * including thread k */
-            next_open = A_diag_i[start] - cum_lost_per_thread[my_thread_num-1];
+            next_open = A_diag_i[start] - cum_lost_per_thread[my_thread_num - 1];
          }
 
          /* copy the j and data arrays over */
@@ -2678,15 +3342,15 @@ hypre_ParCSRMatrixTruncate(hypre_ParCSRMatrix *A,
          }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+         #pragma omp barrier
 #endif
          /* update A_diag_i with number of dropped entries by all lower ranked
           * threads */
          if (my_thread_num > 0)
          {
-            for (i=start; i<stop; i++)
+            for (i = start; i < stop; i++)
             {
-               A_diag_i[i] -= cum_lost_per_thread[my_thread_num-1];
+               A_diag_i[i] -= cum_lost_per_thread[my_thread_num - 1];
             }
          }
 
@@ -2707,7 +3371,7 @@ hypre_ParCSRMatrixTruncate(hypre_ParCSRMatrix *A,
        * Synchronize and create new offd data structures
        */
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
       if (num_lost_global_offd)
       {
@@ -2720,7 +3384,7 @@ hypre_ParCSRMatrixTruncate(hypre_ParCSRMatrix *A,
                A_offd_size -= num_lost_offd_per_thread[i];
                if (i > 0)
                {
-                  cum_lost_per_thread[i] = num_lost_offd_per_thread[i] + cum_lost_per_thread[i-1];
+                  cum_lost_per_thread[i] = num_lost_offd_per_thread[i] + cum_lost_per_thread[i - 1];
                }
                else
                {
@@ -2732,7 +3396,7 @@ hypre_ParCSRMatrixTruncate(hypre_ParCSRMatrix *A,
             A_offd_data_new = hypre_CTAlloc(HYPRE_Real, A_offd_size, memory_location_offd);
          }
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+         #pragma omp barrier
 #endif
 
          /* points to next open spot in new data structures for this thread */
@@ -2744,7 +3408,7 @@ hypre_ParCSRMatrixTruncate(hypre_ParCSRMatrix *A,
          {
             /* remember, cum_lost_per_thread[k] stores the num dropped up to and
              * including thread k */
-            next_open = A_offd_i[start] - cum_lost_per_thread[my_thread_num-1];
+            next_open = A_offd_i[start] - cum_lost_per_thread[my_thread_num - 1];
          }
 
          /* copy the j and data arrays over */
@@ -2756,15 +3420,15 @@ hypre_ParCSRMatrixTruncate(hypre_ParCSRMatrix *A,
          }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+         #pragma omp barrier
 #endif
          /* update A_offd_i with number of dropped entries by all lower ranked
           * threads */
          if (my_thread_num > 0)
          {
-            for (i=start; i<stop; i++)
+            for (i = start; i < stop; i++)
             {
-               A_offd_i[i] -= cum_lost_per_thread[my_thread_num-1];
+               A_offd_i[i] -= cum_lost_per_thread[my_thread_num - 1];
             }
          }
 
@@ -2795,6 +3459,10 @@ hypre_ParCSRMatrixTruncate(hypre_ParCSRMatrix *A,
    return ierr;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixSetConstantValues
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_ParCSRMatrixSetConstantValues( hypre_ParCSRMatrix *A,
                                      HYPRE_Complex       value )
@@ -2805,16 +3473,54 @@ hypre_ParCSRMatrixSetConstantValues( hypre_ParCSRMatrix *A,
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixCopyColMapOffdToDevice
+ *--------------------------------------------------------------------------*/
+
 void
 hypre_ParCSRMatrixCopyColMapOffdToDevice(hypre_ParCSRMatrix *A)
 {
-#if defined(HYPRE_USING_GPU)
+#if defined(HYPRE_USING_GPU) || defined(HYPRE_USING_DEVICE_OPENMP)
    if (hypre_ParCSRMatrixDeviceColMapOffd(A) == NULL)
    {
       const HYPRE_Int num_cols_A_offd = hypre_CSRMatrixNumCols(hypre_ParCSRMatrixOffd(A));
-      hypre_ParCSRMatrixDeviceColMapOffd(A) = hypre_TAlloc(HYPRE_BigInt, num_cols_A_offd, HYPRE_MEMORY_DEVICE);
-      hypre_TMemcpy(hypre_ParCSRMatrixDeviceColMapOffd(A), hypre_ParCSRMatrixColMapOffd(A), HYPRE_BigInt, num_cols_A_offd,
-                    HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
+      hypre_ParCSRMatrixDeviceColMapOffd(A) = hypre_TAlloc(HYPRE_BigInt,
+                                                           num_cols_A_offd,
+                                                           HYPRE_MEMORY_DEVICE);
+      hypre_TMemcpy(hypre_ParCSRMatrixDeviceColMapOffd(A),
+                    hypre_ParCSRMatrixColMapOffd(A),
+                    HYPRE_BigInt,
+                    num_cols_A_offd,
+                    HYPRE_MEMORY_DEVICE,
+                    HYPRE_MEMORY_HOST);
+   }
+#else
+   HYPRE_UNUSED_VAR(A);
+#endif
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixCopyColMapOffdToHost
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_ParCSRMatrixCopyColMapOffdToHost(hypre_ParCSRMatrix *A)
+{
+#if defined(HYPRE_USING_GPU)
+   if (hypre_ParCSRMatrixColMapOffd(A) == NULL)
+   {
+      const HYPRE_Int num_cols_A_offd = hypre_CSRMatrixNumCols(hypre_ParCSRMatrixOffd(A));
+      hypre_ParCSRMatrixColMapOffd(A) = hypre_TAlloc(HYPRE_BigInt,
+                                                     num_cols_A_offd,
+                                                     HYPRE_MEMORY_HOST);
+      hypre_TMemcpy(hypre_ParCSRMatrixColMapOffd(A),
+                    hypre_ParCSRMatrixDeviceColMapOffd(A),
+                    HYPRE_BigInt,
+                    num_cols_A_offd,
+                    HYPRE_MEMORY_HOST,
+                    HYPRE_MEMORY_DEVICE);
    }
+#else
+   HYPRE_UNUSED_VAR(A);
 #endif
 }
diff --git a/external/hypre/src/parcsr_mv/par_csr_matrix.h b/external/hypre/src/parcsr_mv/par_csr_matrix.h
index 689a0771..ddd004c5 100644
--- a/external/hypre/src/parcsr_mv/par_csr_matrix.h
+++ b/external/hypre/src/parcsr_mv/par_csr_matrix.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -31,6 +31,9 @@ typedef struct hypre_ParCSRMatrix_struct
    HYPRE_BigInt          global_num_rows;
    HYPRE_BigInt          global_num_cols;
    HYPRE_BigInt          global_num_rownnz;
+   HYPRE_BigInt          num_nonzeros;
+   HYPRE_Real            d_num_nonzeros;
+
    HYPRE_BigInt          first_row_index;
    HYPRE_BigInt          first_col_diag;
    /* need to know entire local range in case row_starts and col_starts
@@ -58,9 +61,6 @@ typedef struct hypre_ParCSRMatrix_struct
    /* Does the ParCSRMatrix create/destroy `diag', `offd', `col_map_offd'? */
    HYPRE_Int             owns_data;
 
-   HYPRE_BigInt          num_nonzeros;
-   HYPRE_Real            d_num_nonzeros;
-
    /* Buffers used by GetRow to hold row currently being accessed. AJC, 4/99 */
    HYPRE_BigInt         *rowindices;
    HYPRE_Complex        *rowvalues;
@@ -77,7 +77,7 @@ typedef struct hypre_ParCSRMatrix_struct
    HYPRE_Complex        *bdiaginv;
    hypre_ParCSRCommPkg  *bdiaginv_comm_pkg;
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
    /* these two arrays are reserveed for SoC matrices on GPUs to help build interpolation */
    HYPRE_Int            *soc_diag_j;
    HYPRE_Int            *soc_offd_j;
@@ -93,6 +93,8 @@ typedef struct hypre_ParCSRMatrix_struct
 #define hypre_ParCSRMatrixGlobalNumRows(matrix)          ((matrix) -> global_num_rows)
 #define hypre_ParCSRMatrixGlobalNumCols(matrix)          ((matrix) -> global_num_cols)
 #define hypre_ParCSRMatrixGlobalNumRownnz(matrix)        ((matrix) -> global_num_rownnz)
+#define hypre_ParCSRMatrixNumNonzeros(matrix)            ((matrix) -> num_nonzeros)
+#define hypre_ParCSRMatrixDNumNonzeros(matrix)           ((matrix) -> d_num_nonzeros)
 #define hypre_ParCSRMatrixFirstRowIndex(matrix)          ((matrix) -> first_row_index)
 #define hypre_ParCSRMatrixFirstColDiag(matrix)           ((matrix) -> first_col_diag)
 #define hypre_ParCSRMatrixLastRowIndex(matrix)           ((matrix) -> last_row_index)
@@ -108,15 +110,13 @@ typedef struct hypre_ParCSRMatrix_struct
 #define hypre_ParCSRMatrixCommPkg(matrix)                ((matrix) -> comm_pkg)
 #define hypre_ParCSRMatrixCommPkgT(matrix)               ((matrix) -> comm_pkgT)
 #define hypre_ParCSRMatrixOwnsData(matrix)               ((matrix) -> owns_data)
-#define hypre_ParCSRMatrixNumNonzeros(matrix)            ((matrix) -> num_nonzeros)
-#define hypre_ParCSRMatrixDNumNonzeros(matrix)           ((matrix) -> d_num_nonzeros)
 #define hypre_ParCSRMatrixRowindices(matrix)             ((matrix) -> rowindices)
 #define hypre_ParCSRMatrixRowvalues(matrix)              ((matrix) -> rowvalues)
 #define hypre_ParCSRMatrixGetrowactive(matrix)           ((matrix) -> getrowactive)
 #define hypre_ParCSRMatrixAssumedPartition(matrix)       ((matrix) -> assumed_partition)
 #define hypre_ParCSRMatrixOwnsAssumedPartition(matrix)   ((matrix) -> owns_assumed_partition)
 #define hypre_ParCSRMatrixProcOrdering(matrix)           ((matrix) -> proc_ordering)
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
 #define hypre_ParCSRMatrixSocDiagJ(matrix)               ((matrix) -> soc_diag_j)
 #define hypre_ParCSRMatrixSocOffdJ(matrix)               ((matrix) -> soc_offd_j)
 #endif
@@ -124,18 +124,38 @@ typedef struct hypre_ParCSRMatrix_struct
 #define hypre_ParCSRMatrixNumRows(matrix) hypre_CSRMatrixNumRows(hypre_ParCSRMatrixDiag(matrix))
 #define hypre_ParCSRMatrixNumCols(matrix) hypre_CSRMatrixNumCols(hypre_ParCSRMatrixDiag(matrix))
 
-static inline HYPRE_MemoryLocation
+static inline HYPRE_MAYBE_UNUSED_FUNC HYPRE_MemoryLocation
 hypre_ParCSRMatrixMemoryLocation(hypre_ParCSRMatrix *matrix)
 {
-   HYPRE_MemoryLocation memory_diag = hypre_CSRMatrixMemoryLocation(hypre_ParCSRMatrixDiag(matrix));
-   HYPRE_MemoryLocation memory_offd = hypre_CSRMatrixMemoryLocation(hypre_ParCSRMatrixOffd(matrix));
+   if (!matrix) { return HYPRE_MEMORY_UNDEFINED; }
 
-   if (memory_diag != memory_offd)
+   hypre_CSRMatrix *diag = hypre_ParCSRMatrixDiag(matrix);
+   hypre_CSRMatrix *offd = hypre_ParCSRMatrixOffd(matrix);
+   HYPRE_MemoryLocation memory_diag = diag ? hypre_CSRMatrixMemoryLocation(
+                                         diag) : HYPRE_MEMORY_UNDEFINED;
+   HYPRE_MemoryLocation memory_offd = offd ? hypre_CSRMatrixMemoryLocation(
+                                         offd) : HYPRE_MEMORY_UNDEFINED;
+
+   if (diag && offd)
    {
-      hypre_printf("Warning: ParCSRMatrix Memory Location Diag (%d) != Offd (%d)\n", memory_diag, memory_offd);
-      hypre_assert(0);
+      if (memory_diag != memory_offd)
+      {
+         char err_msg[1024];
+         hypre_sprintf(err_msg, "Error: ParCSRMatrix Memory Location Diag (%d) != Offd (%d)\n", memory_diag,
+                       memory_offd);
+         hypre_error_w_msg(HYPRE_ERROR_MEMORY, err_msg);
+         hypre_assert(0);
+
+         return HYPRE_MEMORY_UNDEFINED;
+      }
+
+      return memory_diag;
    }
-   return memory_diag;
+
+   if (diag) { return memory_diag; }
+   if (offd) { return memory_offd; }
+
+   return HYPRE_MEMORY_UNDEFINED;
 }
 
 /*--------------------------------------------------------------------------
diff --git a/external/hypre/src/parcsr_mv/par_csr_matrix_stats.c b/external/hypre/src/parcsr_mv/par_csr_matrix_stats.c
new file mode 100644
index 00000000..6842272a
--- /dev/null
+++ b/external/hypre/src/parcsr_mv/par_csr_matrix_stats.c
@@ -0,0 +1,497 @@
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ * Member functions for matrix statistics specialized to ParCSRMatrix types
+ *
+ *****************************************************************************/
+
+#include "_hypre_parcsr_mv.h"
+
+/* Shortcuts */
+#define sendbuffer(i, j, lda) sendbuffer[i * lda + j]
+#define recvbuffer(i, j, lda) recvbuffer[i * lda + j]
+
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixStatsComputePassOneLocalHost
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ParCSRMatrixStatsComputePassOneLocalHost(hypre_ParCSRMatrix   *A,
+                                               hypre_MatrixStats    *stats)
+{
+   /* Diag matrix data */
+   hypre_CSRMatrix     *diag;
+   HYPRE_Int           *diag_i;
+   HYPRE_Complex       *diag_a;
+
+   /* Offd matrix data */
+   hypre_CSRMatrix     *offd;
+   HYPRE_Int           *offd_i;
+   HYPRE_Complex       *offd_a;
+
+   /* Local arrays */
+   hypre_ulonglongint  *actual_nonzeros;
+   HYPRE_Int           *nnzrow_min;
+   HYPRE_Int           *nnzrow_max;
+   HYPRE_Real          *rowsum_min;
+   HYPRE_Real          *rowsum_max;
+   HYPRE_Real          *rowsum_avg;
+
+   /* Local variables */
+   HYPRE_Int            i, j;
+   HYPRE_Int            num_rows;
+   HYPRE_Int            num_threads = hypre_NumThreads();
+
+   /* Allocate memory */
+   actual_nonzeros = hypre_TAlloc(hypre_ulonglongint, num_threads, HYPRE_MEMORY_HOST);
+   nnzrow_min      = hypre_TAlloc(HYPRE_Int,  num_threads, HYPRE_MEMORY_HOST);
+   nnzrow_max      = hypre_TAlloc(HYPRE_Int,  num_threads, HYPRE_MEMORY_HOST);
+   rowsum_min      = hypre_TAlloc(HYPRE_Real, num_threads, HYPRE_MEMORY_HOST);
+   rowsum_max      = hypre_TAlloc(HYPRE_Real, num_threads, HYPRE_MEMORY_HOST);
+   rowsum_avg      = hypre_TAlloc(HYPRE_Real, num_threads, HYPRE_MEMORY_HOST);
+
+   /* ParCSRMatrix info */
+   num_rows = hypre_ParCSRMatrixNumRows(A);
+
+   /* Diag matrix data */
+   diag   = hypre_ParCSRMatrixDiag(A);
+   diag_i = hypre_CSRMatrixI(diag);
+   diag_a = hypre_CSRMatrixData(diag);
+
+   /* Offd matrix data */
+   offd   = hypre_ParCSRMatrixOffd(A);
+   offd_i = hypre_CSRMatrixI(offd);
+   offd_a = hypre_CSRMatrixData(offd);
+
+   /* Initialize local thread arrays */
+   for (i = 0; i < num_threads; i++)
+   {
+      actual_nonzeros[i] = 0ULL;
+      nnzrow_min[i]      = hypre_pow2(30);
+      nnzrow_max[i]      = 0;
+      rowsum_min[i]      = hypre_pow(2, 100);
+      rowsum_max[i]      = - hypre_pow(2, 100);
+      rowsum_avg[i]      = 0.0;
+   }
+
+#ifdef HYPRE_USING_OPENMP
+   #pragma omp parallel private(i, j)
+#endif
+   {
+      HYPRE_Int   nnzrow, ns, ne;
+      HYPRE_Int   mytid = hypre_GetThreadNum();
+      HYPRE_Real  threshold = hypre_MatrixStatsActualThreshold(stats);
+      HYPRE_Real  rowsum;
+
+      hypre_partition1D(num_rows, hypre_NumActiveThreads(), mytid, &ns, &ne);
+
+      for (i = ns; i < ne; i++)
+      {
+         nnzrow = (diag_i[i + 1] - diag_i[i]) + (offd_i[i + 1] - offd_i[i]);
+
+         rowsum = 0.0;
+         for (j = diag_i[i]; j < diag_i[i + 1]; j++)
+         {
+            actual_nonzeros[mytid] += (hypre_cabs(diag_a[j]) > threshold) ? 1 : 0;
+            rowsum += diag_a[j];
+         }
+
+         for (j = offd_i[i]; j < offd_i[i + 1]; j++)
+         {
+            actual_nonzeros[mytid] += (hypre_cabs(offd_a[j]) > threshold) ? 1 : 0;
+            rowsum += offd_a[j];
+         }
+
+         /* Update sum quantities */
+         rowsum_avg[mytid] += rowsum;
+
+         /* Update min quantities */
+         nnzrow_min[mytid] = (nnzrow_min[mytid] > nnzrow) ? nnzrow : nnzrow_min[mytid];
+         rowsum_min[mytid] = (rowsum_min[mytid] > rowsum) ? rowsum : rowsum_min[mytid];
+
+         /* Update max quantities */
+         nnzrow_max[mytid] = (nnzrow_max[mytid] < nnzrow) ? nnzrow : nnzrow_max[mytid];
+         rowsum_max[mytid] = (rowsum_max[mytid] < rowsum) ? rowsum : rowsum_max[mytid];
+      }
+   } /* end of parallel region */
+
+   /* Reduce along threads */
+   for (i = 1; i < num_threads; i++)
+   {
+      actual_nonzeros[0] += actual_nonzeros[i];
+      rowsum_avg[0]      += rowsum_avg[i];
+
+      nnzrow_min[0]       = hypre_min(nnzrow_min[0], nnzrow_min[i]);
+      nnzrow_max[0]       = hypre_max(nnzrow_max[0], nnzrow_max[i]);
+
+      rowsum_min[0]       = hypre_min(rowsum_min[0], rowsum_min[i]);
+      rowsum_max[0]       = hypre_max(rowsum_max[0], rowsum_max[i]);
+   }
+
+   /* Set output values */
+   hypre_MatrixStatsActualNonzeros(stats) = actual_nonzeros[0];
+
+   hypre_MatrixStatsNnzrowMin(stats)      = nnzrow_min[0];
+   hypre_MatrixStatsNnzrowMax(stats)      = nnzrow_max[0];
+
+   hypre_MatrixStatsRowsumMin(stats)      = rowsum_min[0];
+   hypre_MatrixStatsRowsumMax(stats)      = rowsum_max[0];
+   hypre_MatrixStatsRowsumAvg(stats)      = rowsum_avg[0];
+
+   /* Free memory */
+   hypre_TFree(actual_nonzeros, HYPRE_MEMORY_HOST);
+   hypre_TFree(nnzrow_min, HYPRE_MEMORY_HOST);
+   hypre_TFree(nnzrow_max, HYPRE_MEMORY_HOST);
+   hypre_TFree(rowsum_min, HYPRE_MEMORY_HOST);
+   hypre_TFree(rowsum_max, HYPRE_MEMORY_HOST);
+   hypre_TFree(rowsum_avg, HYPRE_MEMORY_HOST);
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixStatsComputePassTwoLocalHost
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ParCSRMatrixStatsComputePassTwoLocalHost(hypre_ParCSRMatrix  *A,
+                                               hypre_MatrixStats   *stats)
+{
+   /* Diag matrix data */
+   hypre_CSRMatrix     *diag;
+   HYPRE_Int           *diag_i;
+   HYPRE_Complex       *diag_a;
+
+   /* Offd matrix data */
+   hypre_CSRMatrix     *offd;
+   HYPRE_Int           *offd_i;
+   HYPRE_Complex       *offd_a;
+
+   /* Local arrays */
+   HYPRE_Real          *nnzrow_avg;
+   HYPRE_Real          *rowsum_avg;
+   HYPRE_Real          *nnzrow_sqsum;
+   HYPRE_Real          *rowsum_sqsum;
+
+   /* Local variables */
+   HYPRE_Int            i, j;
+   HYPRE_Int            num_rows;
+   HYPRE_Int            num_threads = hypre_NumThreads();
+   HYPRE_Int            nnzrow;
+
+   /* Allocate memory */
+   nnzrow_avg   = hypre_TAlloc(HYPRE_Real, num_threads, HYPRE_MEMORY_HOST);
+   rowsum_avg   = hypre_TAlloc(HYPRE_Real, num_threads, HYPRE_MEMORY_HOST);
+   nnzrow_sqsum = hypre_TAlloc(HYPRE_Real, num_threads, HYPRE_MEMORY_HOST);
+   rowsum_sqsum = hypre_TAlloc(HYPRE_Real, num_threads, HYPRE_MEMORY_HOST);
+
+   /* Initialize matrix variables */
+   diag     = hypre_ParCSRMatrixDiag(A);
+   offd     = hypre_ParCSRMatrixOffd(A);
+   diag_i   = hypre_CSRMatrixI(diag);
+   offd_i   = hypre_CSRMatrixI(offd);
+   diag_a   = hypre_CSRMatrixData(diag);
+   offd_a   = hypre_CSRMatrixData(offd);
+   num_rows = hypre_CSRMatrixNumRows(diag);
+
+   /* Initialize local thread variables */
+   for (i = 0; i < num_threads; i++)
+   {
+      rowsum_avg[i]   = hypre_MatrixStatsRowsumAvg(stats);
+      nnzrow_avg[i]   = hypre_MatrixStatsNnzrowAvg(stats);
+      nnzrow_sqsum[i] = 0.0;
+      rowsum_sqsum[i] = 0.0;
+   }
+
+#ifdef HYPRE_USING_OPENMP
+   #pragma omp parallel private(i, j)
+#endif
+   {
+      HYPRE_Int   ns, ne;
+      HYPRE_Int   mytid = hypre_GetThreadNum();
+      HYPRE_Real  rowsum;
+
+      hypre_partition1D(num_rows, hypre_NumActiveThreads(), mytid, &ns, &ne);
+
+      for (i = ns; i < ne; i++)
+      {
+         nnzrow = (diag_i[i + 1] - diag_i[i]) + (offd_i[i + 1] - offd_i[i]);
+
+         rowsum = 0.0;
+         for (j = diag_i[i]; j < diag_i[i + 1]; j++)
+         {
+            rowsum += diag_a[j];
+         }
+
+         for (j = offd_i[i]; j < offd_i[i + 1]; j++)
+         {
+            rowsum += offd_a[j];
+         }
+
+         /* Update sum quantities */
+         nnzrow_sqsum[mytid] += hypre_squared((HYPRE_Real) nnzrow - nnzrow_avg[mytid]);
+         rowsum_sqsum[mytid] += hypre_squared(rowsum - rowsum_avg[mytid]);
+      }
+   } /* end of parallel region */
+
+   /* Reduce along threads */
+   for (i = 1; i < num_threads; i++)
+   {
+      nnzrow_sqsum[0] += nnzrow_sqsum[i];
+      rowsum_sqsum[0] += rowsum_sqsum[i];
+   }
+
+   /* Set output values */
+   hypre_MatrixStatsNnzrowSqsum(stats) = nnzrow_sqsum[0];
+   hypre_MatrixStatsRowsumSqsum(stats) = rowsum_sqsum[0];
+
+   /* Free memory */
+   hypre_TFree(nnzrow_sqsum, HYPRE_MEMORY_HOST);
+   hypre_TFree(rowsum_sqsum, HYPRE_MEMORY_HOST);
+   hypre_TFree(nnzrow_avg, HYPRE_MEMORY_HOST);
+   hypre_TFree(rowsum_avg, HYPRE_MEMORY_HOST);
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixStatsComputePassOneLocal
+ *
+ * Compute the first pass of matrix statistics locally on a rank consisting
+ * of average (avg), minimum (min) and maximum (max) quantities.
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ParCSRMatrixStatsComputePassOneLocal(hypre_ParCSRMatrix *A,
+                                           hypre_MatrixStats  *stats)
+{
+   /* Call backend implementations */
+#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1(hypre_ParCSRMatrixMemoryLocation(A));
+
+   if (exec == HYPRE_EXEC_DEVICE)
+   {
+      /* TODO (VPM): Implement computation on device */
+      hypre_ParCSRMatrix *h_A = hypre_ParCSRMatrixClone_v2(A, 1, HYPRE_MEMORY_HOST);
+      hypre_ParCSRMatrixStatsComputePassOneLocalHost(h_A, stats);
+      hypre_ParCSRMatrixDestroy(h_A);
+   }
+   else
+#endif
+   {
+      hypre_ParCSRMatrixStatsComputePassOneLocalHost(A, stats);
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixStatsComputePassTwoLocal
+ *
+ * Compute the second pass of matrix statistics locally on a rank consisting
+ * of squared sum (sqsum) and standard deviation (stdev) quantities.
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ParCSRMatrixStatsComputePassTwoLocal(hypre_ParCSRMatrix *A,
+                                           hypre_MatrixStats  *stats)
+{
+   /* Call backend implementations */
+#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1(hypre_ParCSRMatrixMemoryLocation(A));
+
+   if (exec == HYPRE_EXEC_DEVICE)
+   {
+      /* TODO (VPM): Implement computation on device */
+      hypre_ParCSRMatrix *h_A = hypre_ParCSRMatrixClone_v2(A, 1, HYPRE_MEMORY_HOST);
+      hypre_ParCSRMatrixStatsComputePassTwoLocalHost(h_A, stats);
+      hypre_ParCSRMatrixDestroy(h_A);
+   }
+   else
+#endif
+   {
+      hypre_ParCSRMatrixStatsComputePassTwoLocalHost(A, stats);
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixStatsArrayCompute
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ParCSRMatrixStatsArrayCompute(HYPRE_Int                num_matrices,
+                                    hypre_ParCSRMatrix     **matrices,
+                                    hypre_MatrixStatsArray  *stats_array)
+{
+   hypre_MatrixStats     *stats;
+
+   /* MPI buffers */
+   HYPRE_Real            *recvbuffer;
+   HYPRE_Real            *sendbuffer;
+
+   /* Local variables */
+   MPI_Comm               comm;
+   hypre_CSRMatrix       *diag;
+   hypre_CSRMatrix       *offd;
+   HYPRE_Int              i;
+   HYPRE_BigInt           global_num_rows;
+   HYPRE_Real             global_size;
+
+   /* Sanity check */
+   if (num_matrices < 1)
+   {
+      return hypre_error_flag;
+   }
+
+   /* We assume all MPI communicators are equal */
+   comm = hypre_ParCSRMatrixComm(matrices[0]);
+
+   /* Allocate MPI buffers */
+   recvbuffer = hypre_CTAlloc(HYPRE_Real, 4 * num_matrices, HYPRE_MEMORY_HOST);
+   sendbuffer = hypre_CTAlloc(HYPRE_Real, 4 * num_matrices, HYPRE_MEMORY_HOST);
+
+   /* Set matrix dimensions */
+   for (i = 0; i < num_matrices; i++)
+   {
+      stats = hypre_MatrixStatsArrayEntry(stats_array, i);
+
+      hypre_MatrixStatsNumRows(stats) = hypre_ParCSRMatrixGlobalNumRows(matrices[i]);
+      hypre_MatrixStatsNumCols(stats) = hypre_ParCSRMatrixGlobalNumCols(matrices[i]);
+   }
+
+   /*-------------------------------------------------
+    *  First pass for computing statistics
+    *-------------------------------------------------*/
+
+   for (i = 0; i < num_matrices; i++)
+   {
+      stats = hypre_MatrixStatsArrayEntry(stats_array, i);
+
+      hypre_ParCSRMatrixStatsComputePassOneLocal(matrices[i], stats);
+   }
+
+   /*-------------------------------------------------
+    *  Global reduce for min/max quantities
+    *-------------------------------------------------*/
+
+   /* Pack MPI buffers */
+   for (i = 0; i < num_matrices; i++)
+   {
+      stats = hypre_MatrixStatsArrayEntry(stats_array, i);
+
+      sendbuffer(i, 0, 4) = (HYPRE_Real) - hypre_MatrixStatsNnzrowMin(stats);
+      sendbuffer(i, 1, 4) = (HYPRE_Real)   hypre_MatrixStatsNnzrowMax(stats);
+      sendbuffer(i, 2, 4) = (HYPRE_Real) - hypre_MatrixStatsRowsumMin(stats);
+      sendbuffer(i, 3, 4) = (HYPRE_Real)   hypre_MatrixStatsRowsumMax(stats);
+   }
+
+   hypre_MPI_Reduce(sendbuffer, recvbuffer, 4 * num_matrices,
+                    HYPRE_MPI_REAL, hypre_MPI_MAX, 0, comm);
+
+   /* Unpack MPI buffers */
+   for (i = 0; i < num_matrices; i++)
+   {
+      stats = hypre_MatrixStatsArrayEntry(stats_array, i);
+
+      hypre_MatrixStatsNnzrowMin(stats) = (HYPRE_Int)  - recvbuffer(i, 0, 4);
+      hypre_MatrixStatsNnzrowMax(stats) = (HYPRE_Int)    recvbuffer(i, 1, 4);
+      hypre_MatrixStatsRowsumMin(stats) = (HYPRE_Real) - recvbuffer(i, 2, 4);
+      hypre_MatrixStatsRowsumMax(stats) = (HYPRE_Real)   recvbuffer(i, 3, 4);
+   }
+
+   /*-------------------------------------------------
+    *  Global reduce for summation quantities
+    *-------------------------------------------------*/
+
+   /* Pack MPI buffers */
+   for (i = 0; i < num_matrices; i++)
+   {
+      stats = hypre_MatrixStatsArrayEntry(stats_array, i);
+      diag  = hypre_ParCSRMatrixDiag(matrices[i]);
+      offd  = hypre_ParCSRMatrixOffd(matrices[i]);
+
+      sendbuffer(i, 0, 3) = (HYPRE_Real) (hypre_CSRMatrixNumNonzeros(diag) +
+                                          hypre_CSRMatrixNumNonzeros(offd));
+      sendbuffer(i, 1, 3) = (HYPRE_Real)  hypre_MatrixStatsActualNonzeros(stats);
+      sendbuffer(i, 2, 3) = (HYPRE_Real)  hypre_MatrixStatsRowsumAvg(stats);
+   }
+
+   hypre_MPI_Reduce(sendbuffer, recvbuffer, 3 * num_matrices,
+                    HYPRE_MPI_REAL, hypre_MPI_SUM, 0, comm);
+
+   /* Unpack MPI buffers */
+   for (i = 0; i < num_matrices; i++)
+   {
+      stats = hypre_MatrixStatsArrayEntry(stats_array, i);
+      global_num_rows = hypre_ParCSRMatrixGlobalNumRows(matrices[i]);
+      global_size     = hypre_squared((HYPRE_Real) global_num_rows);
+
+      hypre_MatrixStatsNumNonzeros(stats)    = (hypre_ulonglongint) recvbuffer(i, 0, 3);
+      hypre_MatrixStatsActualNonzeros(stats) = (hypre_ulonglongint) recvbuffer(i, 1, 3);
+      hypre_MatrixStatsRowsumAvg(stats)      = (HYPRE_Real)         recvbuffer(i, 2, 3) /
+                                               (HYPRE_Real)         global_num_rows;
+      hypre_MatrixStatsNnzrowAvg(stats)      = (HYPRE_Real)         recvbuffer(i, 0, 3) /
+                                               (HYPRE_Real)         global_num_rows;
+
+      hypre_MatrixStatsSparsity(stats)       = 100.0 * (1.0 - recvbuffer(i, 0, 3) / global_size);
+
+      hypre_ParCSRMatrixNumNonzeros(matrices[i]) = (HYPRE_Int) recvbuffer(i, 0, 3);
+      hypre_ParCSRMatrixDNumNonzeros(matrices[i]) = (HYPRE_Real) recvbuffer(i, 0, 3);
+   }
+
+   /*-------------------------------------------------
+    *  Second pass for computing statistics
+    *-------------------------------------------------*/
+
+   for (i = 0; i < num_matrices; i++)
+   {
+      stats = hypre_MatrixStatsArrayEntry(stats_array, i);
+
+      hypre_ParCSRMatrixStatsComputePassTwoLocal(matrices[i], stats);
+   }
+
+   /*-------------------------------------------------
+    *  Global reduce for summation quantities
+    *-------------------------------------------------*/
+
+   /* Pack MPI buffers */
+   for (i = 0; i < num_matrices; i++)
+   {
+      stats = hypre_MatrixStatsArrayEntry(stats_array, i);
+
+      sendbuffer(i, 0, 2) = hypre_MatrixStatsNnzrowSqsum(stats);
+      sendbuffer(i, 1, 2) = hypre_MatrixStatsRowsumSqsum(stats);
+   }
+
+   hypre_MPI_Reduce(sendbuffer, recvbuffer, 2 * num_matrices,
+                    HYPRE_MPI_REAL, hypre_MPI_SUM, 0, comm);
+
+   /* Unpack MPI buffers */
+   for (i = 0; i < num_matrices; i++)
+   {
+      stats = hypre_MatrixStatsArrayEntry(stats_array, i);
+      global_num_rows = hypre_ParCSRMatrixGlobalNumRows(matrices[i]);
+
+      hypre_MatrixStatsNnzrowSqsum(stats) = recvbuffer(i, 0, 2);
+      hypre_MatrixStatsRowsumSqsum(stats) = recvbuffer(i, 1, 2);
+
+      hypre_MatrixStatsNnzrowStDev(stats) = hypre_sqrt(recvbuffer(i, 0, 2) /
+                                                       (HYPRE_Real) global_num_rows);
+      hypre_MatrixStatsRowsumStDev(stats) = hypre_sqrt(recvbuffer(i, 1, 2) /
+                                                       (HYPRE_Real) global_num_rows);
+   }
+
+   /* Free MPI buffers */
+   hypre_TFree(recvbuffer, HYPRE_MEMORY_HOST);
+   hypre_TFree(sendbuffer, HYPRE_MEMORY_HOST);
+
+   return hypre_error_flag;
+}
diff --git a/external/hypre/src/parcsr_mv/par_csr_matvec.c b/external/hypre/src/parcsr_mv/par_csr_matvec.c
index a2f6ff84..d9ff56f7 100644
--- a/external/hypre/src/parcsr_mv/par_csr_matvec.c
+++ b/external/hypre/src/parcsr_mv/par_csr_matvec.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -12,53 +12,45 @@
  *****************************************************************************/
 
 #include "_hypre_parcsr_mv.h"
-#include "_hypre_utilities.hpp" //RL: TODO par_csr_matvec_device.c, include cuda there
 
 /*--------------------------------------------------------------------------
- * hypre_ParCSRMatrixMatvec
+ * hypre_ParCSRMatrixMatvecOutOfPlaceHost
  *--------------------------------------------------------------------------*/
-// y = alpha*A*x + beta*b
+
 HYPRE_Int
-hypre_ParCSRMatrixMatvecOutOfPlace( HYPRE_Complex       alpha,
-                                    hypre_ParCSRMatrix *A,
-                                    hypre_ParVector    *x,
-                                    HYPRE_Complex       beta,
-                                    hypre_ParVector    *b,
-                                    hypre_ParVector    *y )
+hypre_ParCSRMatrixMatvecOutOfPlaceHost( HYPRE_Complex       alpha,
+                                        hypre_ParCSRMatrix *A,
+                                        hypre_ParVector    *x,
+                                        HYPRE_Complex       beta,
+                                        hypre_ParVector    *b,
+                                        hypre_ParVector    *y )
 {
-   hypre_ParCSRCommHandle **comm_handle;
    hypre_ParCSRCommPkg     *comm_pkg = hypre_ParCSRMatrixCommPkg(A);
 
-   hypre_CSRMatrix *diag = hypre_ParCSRMatrixDiag(A);
-   hypre_CSRMatrix *offd = hypre_ParCSRMatrixOffd(A);
+   hypre_CSRMatrix         *diag = hypre_ParCSRMatrixDiag(A);
+   hypre_CSRMatrix         *offd = hypre_ParCSRMatrixOffd(A);
 
-   hypre_Vector *x_local  = hypre_ParVectorLocalVector(x);
-   hypre_Vector *b_local  = hypre_ParVectorLocalVector(b);
-   hypre_Vector *y_local  = hypre_ParVectorLocalVector(y);
-   hypre_Vector *x_tmp;
+   hypre_Vector            *x_local  = hypre_ParVectorLocalVector(x);
+   hypre_Vector            *b_local  = hypre_ParVectorLocalVector(b);
+   hypre_Vector            *y_local  = hypre_ParVectorLocalVector(y);
+   hypre_Vector            *x_tmp;
 
-   HYPRE_BigInt num_rows = hypre_ParCSRMatrixGlobalNumRows(A);
-   HYPRE_BigInt num_cols = hypre_ParCSRMatrixGlobalNumCols(A);
-   HYPRE_BigInt x_size   = hypre_ParVectorGlobalSize(x);
-   HYPRE_BigInt b_size   = hypre_ParVectorGlobalSize(b);
-   HYPRE_BigInt y_size   = hypre_ParVectorGlobalSize(y);
+   HYPRE_BigInt             num_rows = hypre_ParCSRMatrixGlobalNumRows(A);
+   HYPRE_BigInt             num_cols = hypre_ParCSRMatrixGlobalNumCols(A);
+   HYPRE_BigInt             x_size   = hypre_ParVectorGlobalSize(x);
+   HYPRE_BigInt             b_size   = hypre_ParVectorGlobalSize(b);
+   HYPRE_BigInt             y_size   = hypre_ParVectorGlobalSize(y);
 
-   HYPRE_Int num_vectors   = hypre_VectorNumVectors(x_local);
-   HYPRE_Int num_cols_offd = hypre_CSRMatrixNumCols(offd);
-   HYPRE_Int ierr = 0;
-   HYPRE_Int num_sends, jv;
+   HYPRE_Int                num_cols_offd = hypre_CSRMatrixNumCols(offd);
+   HYPRE_Int                num_recvs, num_sends;
+   HYPRE_Int                ierr = 0;
 
-   HYPRE_Int vecstride = hypre_VectorVectorStride( x_local );
-   HYPRE_Int idxstride = hypre_VectorIndexStride( x_local );
-
-   HYPRE_Complex *x_tmp_data, **x_buf_data;
-   HYPRE_Complex *x_local_data = hypre_VectorData(x_local);
-
-#if defined(HYPRE_USING_GPU)
-   HYPRE_Int sync_stream;
-   hypre_GetSyncCudaCompute(&sync_stream);
-   hypre_SetSyncCudaCompute(0);
-#endif
+   HYPRE_Int                i;
+   HYPRE_Int                idxstride    = hypre_VectorIndexStride(x_local);
+   HYPRE_Int                num_vectors  = hypre_VectorNumVectors(x_local);
+   HYPRE_Complex           *x_local_data = hypre_VectorData(x_local);
+   HYPRE_Complex           *x_tmp_data;
+   HYPRE_Complex           *x_buf_data;
 
    HYPRE_ANNOTATE_FUNC_BEGIN;
 
@@ -72,7 +64,7 @@ hypre_ParCSRMatrixMatvecOutOfPlace( HYPRE_Complex       alpha,
     *  these conditions terminates processing, and the ierr flag
     *  is informational only.
     *--------------------------------------------------------------------*/
-   hypre_assert( idxstride>0 );
+   hypre_assert( idxstride > 0 );
 
    if (num_cols != x_size)
    {
@@ -92,14 +84,15 @@ hypre_ParCSRMatrixMatvecOutOfPlace( HYPRE_Complex       alpha,
    hypre_assert( hypre_VectorNumVectors(b_local) == num_vectors );
    hypre_assert( hypre_VectorNumVectors(y_local) == num_vectors );
 
-   if ( num_vectors == 1 )
+   if (num_vectors == 1)
    {
-      x_tmp = hypre_SeqVectorCreate( num_cols_offd );
+      x_tmp = hypre_SeqVectorCreate(num_cols_offd);
    }
    else
    {
-      hypre_assert( num_vectors > 1 );
-      x_tmp = hypre_SeqMultiVectorCreate( num_cols_offd, num_vectors );
+      hypre_assert(num_vectors > 1);
+      x_tmp = hypre_SeqMultiVectorCreate(num_cols_offd, num_vectors);
+      hypre_VectorMultiVecStorageMethod(x_tmp) = 1;
    }
 
    /*---------------------------------------------------------------------
@@ -112,155 +105,73 @@ hypre_ParCSRMatrixMatvecOutOfPlace( HYPRE_Complex       alpha,
       comm_pkg = hypre_ParCSRMatrixCommPkg(A);
    }
 
+   /* Update send_map_starts, send_map_elmts, and recv_vec_starts when doing
+      sparse matrix/multivector product  */
+   hypre_ParCSRCommPkgUpdateVecStarts(comm_pkg, num_vectors,
+                                      hypre_VectorVectorStride(hypre_ParVectorLocalVector(x)),
+                                      hypre_VectorIndexStride(hypre_ParVectorLocalVector(x)));
+
+   num_recvs = hypre_ParCSRCommPkgNumRecvs(comm_pkg);
    num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
-   hypre_assert( num_cols_offd == hypre_ParCSRCommPkgRecvVecStart(comm_pkg, hypre_ParCSRCommPkgNumRecvs(comm_pkg)) );
+
+   hypre_assert( num_cols_offd * num_vectors ==
+                 hypre_ParCSRCommPkgRecvVecStart(comm_pkg, num_recvs) );
+   hypre_assert( hypre_ParCSRCommPkgRecvVecStart(comm_pkg, 0) == 0 );
    hypre_assert( hypre_ParCSRCommPkgSendMapStart(comm_pkg, 0) == 0 );
 
 #ifdef HYPRE_PROFILE
    hypre_profile_times[HYPRE_TIMER_ID_PACK_UNPACK] -= hypre_MPI_Wtime();
 #endif
 
-   HYPRE_Int use_persistent_comm = 0;
-
-#ifdef HYPRE_USING_PERSISTENT_COMM
-   use_persistent_comm = num_vectors == 1;
-   // JSP TODO: we can use persistent communication for multi-vectors,
-   // but then we need different communication handles for different
-   // num_vectors.
-   hypre_ParCSRPersistentCommHandle *persistent_comm_handle;
+#if defined(HYPRE_USING_PERSISTENT_COMM)
+   hypre_ParCSRPersistentCommHandle *persistent_comm_handle =
+      hypre_ParCSRCommPkgGetPersistentCommHandle(1, comm_pkg);
+#else
+   hypre_ParCSRCommHandle *comm_handle;
 #endif
 
-   if (use_persistent_comm)
-   {
-#ifdef HYPRE_USING_PERSISTENT_COMM
-      persistent_comm_handle = hypre_ParCSRCommPkgGetPersistentCommHandle(1, comm_pkg);
-#endif
-   }
-   else
-   {
-      comm_handle = hypre_CTAlloc(hypre_ParCSRCommHandle*, num_vectors, HYPRE_MEMORY_HOST);
-   }
+   /*---------------------------------------------------------------------
+    * Allocate (during hypre_SeqVectorInitialize_v2) or retrieve
+    * persistent receive data buffer for x_tmp (if persistent is enabled).
+    *--------------------------------------------------------------------*/
 
-   /* x_tmp */
-#if defined(HYPRE_USING_GPU)
-   /* for GPU and single vector, alloc persistent memory for x_tmp (in comm_pkg) and reuse */
-   if (num_vectors == 1)
-   {
-      if (!hypre_ParCSRCommPkgTmpData(comm_pkg))
-      {
-#if 1
-         hypre_ParCSRCommPkgTmpData(comm_pkg) = hypre_TAlloc(HYPRE_Complex, num_cols_offd, HYPRE_MEMORY_DEVICE);
-#else
-         hypre_ParCSRCommPkgTmpData(comm_pkg) = _hypre_TAlloc(HYPRE_Complex, num_cols_offd, hypre_MEMORY_DEVICE);
-#endif
-      }
-      hypre_VectorData(x_tmp) = hypre_ParCSRCommPkgTmpData(comm_pkg);
-      hypre_SeqVectorSetDataOwner(x_tmp, 0);
-   }
-#else
-   if (use_persistent_comm)
-   {
-#ifdef HYPRE_USING_PERSISTENT_COMM
-      hypre_VectorData(x_tmp) = (HYPRE_Complex *) hypre_ParCSRCommHandleRecvDataBuffer(persistent_comm_handle);
-      hypre_SeqVectorSetDataOwner(x_tmp, 0);
-#endif
-   }
+#if defined(HYPRE_USING_PERSISTENT_COMM)
+   hypre_VectorData(x_tmp) = (HYPRE_Complex *)
+                             hypre_ParCSRCommHandleRecvDataBuffer(persistent_comm_handle);
+   hypre_SeqVectorSetDataOwner(x_tmp, 0);
 #endif
 
-   hypre_SeqVectorInitialize_v2(x_tmp, HYPRE_MEMORY_DEVICE);
+   hypre_SeqVectorInitialize_v2(x_tmp, HYPRE_MEMORY_HOST);
    x_tmp_data = hypre_VectorData(x_tmp);
 
-   /* x_buff_data */
-   x_buf_data = hypre_CTAlloc(HYPRE_Complex*, num_vectors, HYPRE_MEMORY_HOST);
+   /*---------------------------------------------------------------------
+    * Allocate data send buffer
+    *--------------------------------------------------------------------*/
+
+#if defined(HYPRE_USING_PERSISTENT_COMM)
+   x_buf_data = (HYPRE_Complex *) hypre_ParCSRCommHandleSendDataBuffer(persistent_comm_handle);
 
-   for (jv = 0; jv < num_vectors; ++jv)
-   {
-#if defined(HYPRE_USING_GPU)
-      if (jv == 0)
-      {
-         if (!hypre_ParCSRCommPkgBufData(comm_pkg))
-         {
-#if 1
-            hypre_ParCSRCommPkgBufData(comm_pkg) = hypre_TAlloc(HYPRE_Complex,
-                                                                hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
-                                                                HYPRE_MEMORY_DEVICE);
 #else
-            hypre_ParCSRCommPkgBufData(comm_pkg) = _hypre_TAlloc(HYPRE_Complex,
-                                                                 hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
-                                                                 hypre_MEMORY_DEVICE);
-#endif
-         }
-         x_buf_data[0] = hypre_ParCSRCommPkgBufData(comm_pkg);
-         continue;
-      }
+   x_buf_data = hypre_TAlloc(HYPRE_Complex,
+                             hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                             HYPRE_MEMORY_HOST);
 #endif
-      if (use_persistent_comm)
-      {
-#ifdef HYPRE_USING_PERSISTENT_COMM
-         x_buf_data[0] = (HYPRE_Complex *) hypre_ParCSRCommHandleSendDataBuffer(persistent_comm_handle);
-         continue;
-#endif
-      }
-
-      x_buf_data[jv] = hypre_TAlloc(HYPRE_Complex,
-                                    hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
-                                    HYPRE_MEMORY_DEVICE);
-   }
-
-   /* The assert is because the following loop only works for 'column'
-      storage of a multivector. This needs to be fixed to work more generally,
-      at least for 'row' storage. This in turn, means either change CommPkg so
-      num_sends is no.zones*no.vectors (not no.zones) or, less dangerously, put
-      a stride in the logic of CommHandleCreate (stride either from a new arg or
-      a new variable inside CommPkg).  Or put the num_vector iteration inside
-      CommHandleCreate (perhaps a new multivector variant of it).
-   */
 
-   hypre_assert( idxstride == 1 );
+   /* The assert is because this code has been tested for column-wise vector storage only. */
+   hypre_assert(idxstride == 1);
 
-   //hypre_SeqVectorPrefetch(x_local, HYPRE_MEMORY_DEVICE);
-
-   /* send_map_elmts on device */
-   hypre_ParCSRCommPkgCopySendMapElmtsToDevice(comm_pkg);
+   /*---------------------------------------------------------------------
+    * Pack send data
+    *--------------------------------------------------------------------*/
 
-   for (jv = 0; jv < num_vectors; ++jv)
-   {
-      HYPRE_Complex *send_data = (HYPRE_Complex *) x_buf_data[jv];
-      HYPRE_Complex *locl_data = x_local_data + jv * vecstride;
-
-      /* if on device, no need to Sync: send_data is on device memory */
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-      /* pack send data on device */
-      HYPRE_THRUST_CALL( gather,
-                         hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg),
-                         hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg) +
-                         hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
-                         locl_data,
-                         send_data );
-#elif defined(HYPRE_USING_DEVICE_OPENMP)
-      /* pack send data on device */
-      HYPRE_Int i;
-      HYPRE_Int *device_send_map_elmts = hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg);
-      HYPRE_Int start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, 0);
-      HYPRE_Int end   = hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends);
-#pragma omp target teams distribute parallel for private(i) is_device_ptr(send_data, locl_data, device_send_map_elmts)
-      for (i = start; i < end; i++)
-      {
-         send_data[i] = locl_data[device_send_map_elmts[i]];
-      }
-#else
-      HYPRE_Int i;
-      /* pack send data on host */
 #if defined(HYPRE_USING_OPENMP)
-#pragma omp parallel for HYPRE_SMP_SCHEDULE
-#endif
-      for (i = hypre_ParCSRCommPkgSendMapStart(comm_pkg, 0);
-           i < hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends);
-           i ++)
-      {
-         send_data[i] = locl_data[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,i)];
-      }
+   #pragma omp parallel for HYPRE_SMP_SCHEDULE
 #endif
+   for (i = hypre_ParCSRCommPkgSendMapStart(comm_pkg, 0);
+        i < hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends);
+        i++)
+   {
+      x_buf_data[i] = x_local_data[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, i)];
    }
 
 #ifdef HYPRE_PROFILE
@@ -268,49 +179,33 @@ hypre_ParCSRMatrixMatvecOutOfPlace( HYPRE_Complex       alpha,
    hypre_profile_times[HYPRE_TIMER_ID_HALO_EXCHANGE] -= hypre_MPI_Wtime();
 #endif
 
-   /* nonblocking communication starts */
-   if (use_persistent_comm)
-   {
+   /* Non-blocking communication starts */
 #ifdef HYPRE_USING_PERSISTENT_COMM
-      hypre_ParCSRPersistentCommHandleStart(persistent_comm_handle, HYPRE_MEMORY_DEVICE, x_buf_data[0]);
+   hypre_ParCSRPersistentCommHandleStart(persistent_comm_handle,
+                                         HYPRE_MEMORY_HOST, x_buf_data);
+#else
+   comm_handle = hypre_ParCSRCommHandleCreate_v2(1, comm_pkg,
+                                                 HYPRE_MEMORY_HOST, x_buf_data,
+                                                 HYPRE_MEMORY_HOST, x_tmp_data);
 #endif
-   }
-   else
-   {
-      for ( jv = 0; jv < num_vectors; ++jv )
-      {
-         comm_handle[jv] = hypre_ParCSRCommHandleCreate_v2( 1, comm_pkg, HYPRE_MEMORY_DEVICE, x_buf_data[jv],
-                                                            HYPRE_MEMORY_DEVICE, &x_tmp_data[jv*num_cols_offd] );
-      }
-   }
 
 #ifdef HYPRE_PROFILE
    hypre_profile_times[HYPRE_TIMER_ID_HALO_EXCHANGE] += hypre_MPI_Wtime();
 #endif
 
    /* overlapped local computation */
-   hypre_CSRMatrixMatvecOutOfPlace( alpha, diag, x_local, beta, b_local, y_local, 0 );
+   hypre_CSRMatrixMatvecOutOfPlace(alpha, diag, x_local, beta, b_local, y_local, 0);
 
 #ifdef HYPRE_PROFILE
    hypre_profile_times[HYPRE_TIMER_ID_HALO_EXCHANGE] -= hypre_MPI_Wtime();
 #endif
 
-   /* nonblocking communication ends */
-   if (use_persistent_comm)
-   {
+   /* Non-blocking communication ends */
 #ifdef HYPRE_USING_PERSISTENT_COMM
-      hypre_ParCSRPersistentCommHandleWait(persistent_comm_handle, HYPRE_MEMORY_DEVICE, x_tmp_data);
+   hypre_ParCSRPersistentCommHandleWait(persistent_comm_handle, HYPRE_MEMORY_HOST, x_tmp_data);
+#else
+   hypre_ParCSRCommHandleDestroy(comm_handle);
 #endif
-   }
-   else
-   {
-      for ( jv = 0; jv < num_vectors; ++jv )
-      {
-         hypre_ParCSRCommHandleDestroy(comm_handle[jv]);
-         comm_handle[jv] = NULL;
-      }
-      hypre_TFree(comm_handle, HYPRE_MEMORY_HOST);
-   }
 
 #ifdef HYPRE_PROFILE
    hypre_profile_times[HYPRE_TIMER_ID_HALO_EXCHANGE] += hypre_MPI_Wtime();
@@ -319,44 +214,62 @@ hypre_ParCSRMatrixMatvecOutOfPlace( HYPRE_Complex       alpha,
    /* computation offd part */
    if (num_cols_offd)
    {
-      hypre_CSRMatrixMatvec( alpha, offd, x_tmp, 1.0, y_local );
+      hypre_CSRMatrixMatvec(alpha, offd, x_tmp, 1.0, y_local);
    }
 
-#ifdef HYPRE_PROFILE
-   hypre_profile_times[HYPRE_TIMER_ID_PACK_UNPACK] -= hypre_MPI_Wtime();
+   /*---------------------------------------------------------------------
+    * Free memory
+    *--------------------------------------------------------------------*/
+   hypre_SeqVectorDestroy(x_tmp);
+
+#if !defined(HYPRE_USING_PERSISTENT_COMM)
+   hypre_TFree(x_buf_data, HYPRE_MEMORY_HOST);
 #endif
 
-   hypre_SeqVectorDestroy(x_tmp);  x_tmp = NULL;
+   HYPRE_ANNOTATE_FUNC_END;
 
-   if (!use_persistent_comm)
-   {
-      for ( jv = 0; jv < num_vectors; ++jv )
-      {
-#if defined(HYPRE_USING_GPU)
-         if (jv == 0)
-         {
-            continue;
-         }
-#endif
-         hypre_TFree(x_buf_data[jv], HYPRE_MEMORY_DEVICE);
-      }
-      hypre_TFree(x_buf_data, HYPRE_MEMORY_HOST);
-   }
+   return ierr;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixMatvecOutOfPlace
+ *
+ * Performs y <- alpha * A * x + beta * b
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ParCSRMatrixMatvecOutOfPlace( HYPRE_Complex       alpha,
+                                    hypre_ParCSRMatrix *A,
+                                    hypre_ParVector    *x,
+                                    HYPRE_Complex       beta,
+                                    hypre_ParVector    *b,
+                                    hypre_ParVector    *y )
+{
+   HYPRE_Int ierr = 0;
 
 #if defined(HYPRE_USING_GPU)
-   hypre_SetSyncCudaCompute(sync_stream);
-   hypre_SyncCudaComputeStream(hypre_handle());
-#endif
+   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy2( hypre_ParCSRMatrixMemoryLocation(A),
+                                                      hypre_ParVectorMemoryLocation(x) );
 
-#ifdef HYPRE_PROFILE
-   hypre_profile_times[HYPRE_TIMER_ID_PACK_UNPACK] += hypre_MPI_Wtime();
+   if (exec == HYPRE_EXEC_DEVICE)
+   {
+      ierr = hypre_ParCSRMatrixMatvecOutOfPlaceDevice(alpha, A, x, beta, b, y);
+   }
+   else
 #endif
-
-   HYPRE_ANNOTATE_FUNC_END;
+   {
+      ierr = hypre_ParCSRMatrixMatvecOutOfPlaceHost(alpha, A, x, beta, b, y);
+   }
 
    return ierr;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixMatvec
+ *
+ * Performs y <- alpha * A * x + beta * y
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_ParCSRMatrixMatvec( HYPRE_Complex       alpha,
                           hypre_ParCSRMatrix *A,
@@ -368,52 +281,42 @@ hypre_ParCSRMatrixMatvec( HYPRE_Complex       alpha,
 }
 
 /*--------------------------------------------------------------------------
- * hypre_ParCSRMatrixMatvecT
- *
- *   Performs y <- alpha * A^T * x + beta * y
- *
+ * hypre_ParCSRMatrixMatvecTHost
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_ParCSRMatrixMatvecT( HYPRE_Complex       alpha,
-                           hypre_ParCSRMatrix *A,
-                           hypre_ParVector    *x,
-                           HYPRE_Complex       beta,
-                           hypre_ParVector    *y )
+hypre_ParCSRMatrixMatvecTHost( HYPRE_Complex       alpha,
+                               hypre_ParCSRMatrix *A,
+                               hypre_ParVector    *x,
+                               HYPRE_Complex       beta,
+                               hypre_ParVector    *y )
 {
-   hypre_ParCSRCommHandle **comm_handle;
-   hypre_ParCSRCommPkg     *comm_pkg = hypre_ParCSRMatrixCommPkg(A);
-
-   hypre_CSRMatrix *diag  = hypre_ParCSRMatrixDiag(A);
-   hypre_CSRMatrix *offd  = hypre_ParCSRMatrixOffd(A);
-   hypre_CSRMatrix *diagT = hypre_ParCSRMatrixDiagT(A);
-   hypre_CSRMatrix *offdT = hypre_ParCSRMatrixOffdT(A);
-
-   hypre_Vector *x_local = hypre_ParVectorLocalVector(x);
-   hypre_Vector *y_local = hypre_ParVectorLocalVector(y);
-   hypre_Vector *y_tmp;
-
-   HYPRE_BigInt num_rows  = hypre_ParCSRMatrixGlobalNumRows(A);
-   HYPRE_BigInt num_cols  = hypre_ParCSRMatrixGlobalNumCols(A);
-   HYPRE_BigInt x_size    = hypre_ParVectorGlobalSize(x);
-   HYPRE_BigInt y_size    = hypre_ParVectorGlobalSize(y);
-
-   HYPRE_Int num_vectors   = hypre_VectorNumVectors(y_local);
-   HYPRE_Int num_cols_offd = hypre_CSRMatrixNumCols(offd);
-   HYPRE_Int ierr = 0;
-   HYPRE_Int num_sends, jv;
-
-   HYPRE_Int vecstride     = hypre_VectorVectorStride(y_local);
-   HYPRE_Int idxstride     = hypre_VectorIndexStride(y_local);
-
-   HYPRE_Complex *y_tmp_data, **y_buf_data;
-   HYPRE_Complex *y_local_data = hypre_VectorData(y_local);
-
-#if defined(HYPRE_USING_GPU)
-   HYPRE_Int sync_stream;
-   hypre_GetSyncCudaCompute(&sync_stream);
-   hypre_SetSyncCudaCompute(0);
-#endif
+   hypre_ParCSRCommPkg     *comm_pkg      = hypre_ParCSRMatrixCommPkg(A);
+
+   hypre_CSRMatrix         *diag          = hypre_ParCSRMatrixDiag(A);
+   hypre_CSRMatrix         *offd          = hypre_ParCSRMatrixOffd(A);
+   hypre_CSRMatrix         *diagT         = hypre_ParCSRMatrixDiagT(A);
+   hypre_CSRMatrix         *offdT         = hypre_ParCSRMatrixOffdT(A);
+
+   hypre_Vector            *x_local       = hypre_ParVectorLocalVector(x);
+   hypre_Vector            *y_local       = hypre_ParVectorLocalVector(y);
+   hypre_Vector            *y_tmp;
+
+   HYPRE_Int                num_cols_offd = hypre_CSRMatrixNumCols(offd);
+   HYPRE_BigInt             num_rows      = hypre_ParCSRMatrixGlobalNumRows(A);
+   HYPRE_BigInt             num_cols      = hypre_ParCSRMatrixGlobalNumCols(A);
+   HYPRE_BigInt             x_size        = hypre_ParVectorGlobalSize(x);
+   HYPRE_BigInt             y_size        = hypre_ParVectorGlobalSize(y);
+
+   HYPRE_Complex           *y_tmp_data;
+   HYPRE_Complex           *y_buf_data;
+   HYPRE_Complex           *y_local_data  = hypre_VectorData(y_local);
+   HYPRE_Int                idxstride     = hypre_VectorIndexStride(y_local);
+   HYPRE_Int                num_vectors   = hypre_VectorNumVectors(y_local);
+   HYPRE_Int                num_sends;
+   HYPRE_Int                num_recvs;
+   HYPRE_Int                i;
+   HYPRE_Int                ierr = 0;
 
    HYPRE_ANNOTATE_FUNC_BEGIN;
 
@@ -445,14 +348,15 @@ hypre_ParCSRMatrixMatvecT( HYPRE_Complex       alpha,
    hypre_assert( hypre_VectorNumVectors(x_local) == num_vectors );
    hypre_assert( hypre_VectorNumVectors(y_local) == num_vectors );
 
-   if ( num_vectors == 1 )
+   if (num_vectors == 1)
    {
       y_tmp = hypre_SeqVectorCreate(num_cols_offd);
    }
    else
    {
-      hypre_assert( num_vectors > 1 );
+      hypre_assert(num_vectors > 1);
       y_tmp = hypre_SeqMultiVectorCreate(num_cols_offd, num_vectors);
+      hypre_VectorMultiVecStorageMethod(y_tmp) = 1;
    }
 
    /*---------------------------------------------------------------------
@@ -465,105 +369,62 @@ hypre_ParCSRMatrixMatvecT( HYPRE_Complex       alpha,
       comm_pkg = hypre_ParCSRMatrixCommPkg(A);
    }
 
+   /* Update send_map_starts, send_map_elmts, and recv_vec_starts for SpMV with multivecs */
+   hypre_ParCSRCommPkgUpdateVecStarts(comm_pkg, num_vectors,
+                                      hypre_VectorVectorStride(hypre_ParVectorLocalVector(y)),
+                                      hypre_VectorIndexStride(hypre_ParVectorLocalVector(y)));
+
+   num_recvs = hypre_ParCSRCommPkgNumRecvs(comm_pkg);
    num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
-   hypre_assert( num_cols_offd == hypre_ParCSRCommPkgRecvVecStart(comm_pkg, hypre_ParCSRCommPkgNumRecvs(comm_pkg)) );
+
+   hypre_assert( num_cols_offd * num_vectors ==
+                 hypre_ParCSRCommPkgRecvVecStart(comm_pkg, num_recvs) );
+   hypre_assert( hypre_ParCSRCommPkgRecvVecStart(comm_pkg, 0) == 0 );
    hypre_assert( hypre_ParCSRCommPkgSendMapStart(comm_pkg, 0) == 0 );
 
 #ifdef HYPRE_PROFILE
    hypre_profile_times[HYPRE_TIMER_ID_PACK_UNPACK] -= hypre_MPI_Wtime();
 #endif
 
-   HYPRE_Int use_persistent_comm = 0;
-
-#ifdef HYPRE_USING_PERSISTENT_COMM
-   use_persistent_comm = num_vectors == 1;
-   // JSP TODO: we can use persistent communication for multi-vectors,
-   // but then we need different communication handles for different
-   // num_vectors.
-   hypre_ParCSRPersistentCommHandle *persistent_comm_handle;
+#if defined(HYPRE_USING_PERSISTENT_COMM)
+   hypre_ParCSRPersistentCommHandle *persistent_comm_handle =
+      hypre_ParCSRCommPkgGetPersistentCommHandle(2, comm_pkg);
+#else
+   hypre_ParCSRCommHandle *comm_handle;
 #endif
 
-   if (use_persistent_comm)
-   {
-#ifdef HYPRE_USING_PERSISTENT_COMM
-      persistent_comm_handle = hypre_ParCSRCommPkgGetPersistentCommHandle(2, comm_pkg);
-#endif
-   }
-   else
-   {
-      comm_handle = hypre_CTAlloc(hypre_ParCSRCommHandle*, num_vectors, HYPRE_MEMORY_HOST);
-   }
+   /*---------------------------------------------------------------------
+    * Allocate (during hypre_SeqVectorInitialize_v2) or retrieve
+    * persistent send data buffer for y_tmp (if persistent is enabled).
+    *--------------------------------------------------------------------*/
 
-   /* y_tmp */
-#if defined(HYPRE_USING_GPU)
-   /* for GPU and single vector, alloc persistent memory for y_tmp (in comm_pkg) and reuse */
-   if (num_vectors == 1)
-   {
-      if (!hypre_ParCSRCommPkgTmpData(comm_pkg))
-      {
-#if 1
-         hypre_ParCSRCommPkgTmpData(comm_pkg) = hypre_TAlloc(HYPRE_Complex, num_cols_offd, HYPRE_MEMORY_DEVICE);
-#else
-         hypre_ParCSRCommPkgTmpData(comm_pkg) = _hypre_TAlloc(HYPRE_Complex, num_cols_offd, hypre_MEMORY_DEVICE);
-#endif
-      }
-      hypre_VectorData(y_tmp) = hypre_ParCSRCommPkgTmpData(comm_pkg);
-      hypre_SeqVectorSetDataOwner(y_tmp, 0);
-   }
-#else
-   if (use_persistent_comm)
-   {
-#ifdef HYPRE_USING_PERSISTENT_COMM
-      hypre_VectorData(y_tmp) = (HYPRE_Complex *) hypre_ParCSRCommHandleSendDataBuffer(persistent_comm_handle);
-      hypre_SeqVectorSetDataOwner(y_tmp, 0);
-#endif
-   }
+#if defined(HYPRE_USING_PERSISTENT_COMM)
+   hypre_VectorData(y_tmp) = (HYPRE_Complex *)
+                             hypre_ParCSRCommHandleSendDataBuffer(persistent_comm_handle);
+   hypre_SeqVectorSetDataOwner(y_tmp, 0);
 #endif
 
-   hypre_SeqVectorInitialize_v2(y_tmp, HYPRE_MEMORY_DEVICE);
+   hypre_SeqVectorInitialize_v2(y_tmp, HYPRE_MEMORY_HOST);
    y_tmp_data = hypre_VectorData(y_tmp);
 
-   /* y_buf_data */
-   y_buf_data = hypre_CTAlloc(HYPRE_Complex*, num_vectors, HYPRE_MEMORY_HOST);
+   /*---------------------------------------------------------------------
+    * Allocate receive data buffer
+    *--------------------------------------------------------------------*/
+
+#if defined(HYPRE_USING_PERSISTENT_COMM)
+   y_buf_data = (HYPRE_Complex *) hypre_ParCSRCommHandleRecvDataBuffer(persistent_comm_handle);
 
-   for (jv = 0; jv < num_vectors; ++jv)
-   {
-#if defined(HYPRE_USING_GPU)
-      if (jv == 0)
-      {
-         if (!hypre_ParCSRCommPkgBufData(comm_pkg))
-         {
-#if 1
-            hypre_ParCSRCommPkgBufData(comm_pkg) = hypre_TAlloc(HYPRE_Complex,
-                                                                hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
-                                                                HYPRE_MEMORY_DEVICE);
 #else
-            hypre_ParCSRCommPkgBufData(comm_pkg) = _hypre_TAlloc(HYPRE_Complex,
-                                                                 hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
-                                                                 hypre_MEMORY_DEVICE);
-#endif
-         }
-         y_buf_data[0] = hypre_ParCSRCommPkgBufData(comm_pkg);
-         continue;
-      }
+   y_buf_data = hypre_TAlloc(HYPRE_Complex,
+                             hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
+                             HYPRE_MEMORY_HOST);
 #endif
-      if (use_persistent_comm)
-      {
-#ifdef HYPRE_USING_PERSISTENT_COMM
-         y_buf_data[0] = (HYPRE_Complex *) hypre_ParCSRCommHandleRecvDataBuffer(persistent_comm_handle);
-         continue;
-#endif
-      }
-
-      y_buf_data[jv] = hypre_TAlloc(HYPRE_Complex,
-                                    hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
-                                    HYPRE_MEMORY_DEVICE);
-   }
 
 #ifdef HYPRE_PROFILE
    hypre_profile_times[HYPRE_TIMER_ID_PACK_UNPACK] += hypre_MPI_Wtime();
 #endif
 
+   /* Compute y_tmp = offd^T * x_local */
    if (num_cols_offd)
    {
       if (offdT)
@@ -581,30 +442,24 @@ hypre_ParCSRMatrixMatvecT( HYPRE_Complex       alpha,
    hypre_profile_times[HYPRE_TIMER_ID_HALO_EXCHANGE] -= hypre_MPI_Wtime();
 #endif
 
-   if (use_persistent_comm)
-   {
-#ifdef HYPRE_USING_PERSISTENT_COMM
-      hypre_ParCSRPersistentCommHandleStart(persistent_comm_handle, HYPRE_MEMORY_DEVICE, y_tmp_data);
+   /* Non-blocking communication starts */
+#if defined(HYPRE_USING_PERSISTENT_COMM)
+   hypre_ParCSRPersistentCommHandleStart(persistent_comm_handle, HYPRE_MEMORY_HOST, y_tmp_data);
+
+#else
+   comm_handle = hypre_ParCSRCommHandleCreate_v2(2, comm_pkg,
+                                                 HYPRE_MEMORY_HOST, y_tmp_data,
+                                                 HYPRE_MEMORY_HOST, y_buf_data );
 #endif
-   }
-   else
-   {
-      for ( jv = 0; jv < num_vectors; ++jv )
-      {
-         /* this is where we assume multivectors are 'column' storage */
-         comm_handle[jv] = hypre_ParCSRCommHandleCreate_v2( 2, comm_pkg, HYPRE_MEMORY_DEVICE, &y_tmp_data[jv*num_cols_offd],
-                                                            HYPRE_MEMORY_DEVICE, y_buf_data[jv] );
-      }
-   }
 
 #ifdef HYPRE_PROFILE
    hypre_profile_times[HYPRE_TIMER_ID_HALO_EXCHANGE] += hypre_MPI_Wtime();
 #endif
 
-   /* overlapped local computation */
+   /* Overlapped local computation.
+      diagT is optional. Used only if it's present. */
    if (diagT)
    {
-      // diagT is optional. Used only if it's present.
       hypre_CSRMatrixMatvec(alpha, diagT, x_local, beta, y_local);
    }
    else
@@ -616,114 +471,76 @@ hypre_ParCSRMatrixMatvecT( HYPRE_Complex       alpha,
    hypre_profile_times[HYPRE_TIMER_ID_HALO_EXCHANGE] -= hypre_MPI_Wtime();
 #endif
 
-   /* nonblocking communication ends */
-   if (use_persistent_comm)
-   {
-#ifdef HYPRE_USING_PERSISTENT_COMM
-      hypre_ParCSRPersistentCommHandleWait(persistent_comm_handle, HYPRE_MEMORY_DEVICE, y_buf_data[0]);
+   /* Non-blocking communication ends */
+#if defined(HYPRE_USING_PERSISTENT_COMM)
+   hypre_ParCSRPersistentCommHandleWait(persistent_comm_handle,
+                                        HYPRE_MEMORY_HOST, y_buf_data);
+#else
+   hypre_ParCSRCommHandleDestroy(comm_handle);
 #endif
-   }
-   else
-   {
-      for ( jv = 0; jv < num_vectors; ++jv )
-      {
-         hypre_ParCSRCommHandleDestroy(comm_handle[jv]);
-         comm_handle[jv] = NULL;
-      }
-      hypre_TFree(comm_handle, HYPRE_MEMORY_HOST);
-   }
 
 #ifdef HYPRE_PROFILE
    hypre_profile_times[HYPRE_TIMER_ID_HALO_EXCHANGE] += hypre_MPI_Wtime();
-   hypre_profile_times[HYPRE_TIMER_ID_PACK_UNPACK] -= hypre_MPI_Wtime();
+   hypre_profile_times[HYPRE_TIMER_ID_PACK_UNPACK]   -= hypre_MPI_Wtime();
 #endif
 
-   /* The assert is because the following loop only works for 'column'
-      storage of a multivector. This needs to be fixed to work more generally,
-      at least for 'row' storage. This in turn, means either change CommPkg so
-      num_sends is no.zones*no.vectors (not no.zones) or, less dangerously, put
-      a stride in the logic of CommHandleCreate (stride either from a new arg or
-      a new variable inside CommPkg).  Or put the num_vector iteration inside
-      CommHandleCreate (perhaps a new multivector variant of it).
-   */
-
-   hypre_assert( idxstride == 1 );
+   /* The assert is here because this code has been tested for column-wise vector storage only. */
+   hypre_assert(idxstride == 1);
 
-   /* send_map_elmts on device */
-   hypre_ParCSRCommPkgCopySendMapElmtsToDevice(comm_pkg);
-
-   for (jv = 0; jv < num_vectors; ++jv)
+   /* unpack recv data on host, TODO OMP? */
+   for (i = hypre_ParCSRCommPkgSendMapStart(comm_pkg, 0);
+        i < hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends);
+        i ++)
    {
-      HYPRE_Complex *recv_data = (HYPRE_Complex *) y_buf_data[jv];
-      HYPRE_Complex *locl_data = y_local_data + jv * vecstride;
-
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-      /* unpack recv data on device */
-      if (!hypre_ParCSRCommPkgWorkSpace(comm_pkg))
-      {
-         hypre_ParCSRCommPkgWorkSpace(comm_pkg) =
-            hypre_TAlloc( char,
-                          (2*sizeof(HYPRE_Int)+sizeof(HYPRE_Real)) * hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
-                          HYPRE_MEMORY_DEVICE );
-      }
-      hypreDevice_GenScatterAdd(locl_data,
-                                hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends),
-                                hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg),
-                                recv_data,
-                                hypre_ParCSRCommPkgWorkSpace(comm_pkg));
-#elif defined(HYPRE_USING_DEVICE_OPENMP)
-      HYPRE_Int i, j;
-      /* unpack recv data on device */
-      for (i = 0; i < num_sends; i++)
-      {
-         HYPRE_Int *device_send_map_elmts = hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg);
-         HYPRE_Int start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-         HYPRE_Int end   = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1);
-#pragma omp target teams distribute parallel for private(j) is_device_ptr(recv_data, locl_data, device_send_map_elmts)
-         for (j = start; j < end; j++)
-         {
-            locl_data[device_send_map_elmts[j]] += recv_data[j];
-         }
-      }
-#else
-      HYPRE_Int i;
-      /* unpack recv data on host, TODO OMP? */
-      for (i = hypre_ParCSRCommPkgSendMapStart(comm_pkg, 0);
-           i < hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends);
-           i ++)
-      {
-         locl_data[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,i)] += recv_data[i];
-      }
-#endif
+      y_local_data[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, i)] += y_buf_data[i];
    }
 
-   hypre_SeqVectorDestroy(y_tmp);  y_tmp = NULL;
+   /*---------------------------------------------------------------------
+    * Free memory
+    *--------------------------------------------------------------------*/
+   hypre_SeqVectorDestroy(y_tmp);
 
-   if (!use_persistent_comm)
-   {
-      for ( jv = 0; jv < num_vectors; ++jv )
-      {
-#if defined(HYPRE_USING_GPU)
-         if (jv == 0)
-         {
-            continue;
-         }
+#if !defined(HYPRE_USING_PERSISTENT_COMM)
+   hypre_TFree(y_buf_data, HYPRE_MEMORY_HOST);
 #endif
-         hypre_TFree(y_buf_data[jv], HYPRE_MEMORY_DEVICE);
-      }
-      hypre_TFree(y_buf_data, HYPRE_MEMORY_HOST);
-   }
 
-#if defined(HYPRE_USING_GPU)
-   hypre_SetSyncCudaCompute(sync_stream);
-   hypre_SyncCudaComputeStream(hypre_handle());
-#endif
+   HYPRE_ANNOTATE_FUNC_END;
 
 #ifdef HYPRE_PROFILE
    hypre_profile_times[HYPRE_TIMER_ID_PACK_UNPACK] += hypre_MPI_Wtime();
 #endif
 
-   HYPRE_ANNOTATE_FUNC_END;
+   return ierr;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixMatvecT
+ *
+ * Performs y <- alpha * A^T * x + beta * y
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ParCSRMatrixMatvecT( HYPRE_Complex       alpha,
+                           hypre_ParCSRMatrix *A,
+                           hypre_ParVector    *x,
+                           HYPRE_Complex       beta,
+                           hypre_ParVector    *y )
+{
+   HYPRE_Int ierr = 0;
+
+#if defined(HYPRE_USING_GPU)
+   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy2( hypre_ParCSRMatrixMemoryLocation(A),
+                                                      hypre_ParVectorMemoryLocation(x) );
+
+   if (exec == HYPRE_EXEC_DEVICE)
+   {
+      ierr = hypre_ParCSRMatrixMatvecTDevice(alpha, A, x, beta, y);
+   }
+   else
+#endif
+   {
+      ierr = hypre_ParCSRMatrixMatvecTHost(alpha, A, x, beta, y);
+   }
 
    return ierr;
 }
@@ -731,6 +548,7 @@ hypre_ParCSRMatrixMatvecT( HYPRE_Complex       alpha,
 /*--------------------------------------------------------------------------
  * hypre_ParCSRMatrixMatvec_FF
  *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_ParCSRMatrixMatvec_FF( HYPRE_Complex       alpha,
                              hypre_ParCSRMatrix *A,
@@ -741,7 +559,7 @@ hypre_ParCSRMatrixMatvec_FF( HYPRE_Complex       alpha,
                              HYPRE_Int           fpt )
 {
    MPI_Comm                comm = hypre_ParCSRMatrixComm(A);
-   hypre_ParCSRCommHandle *comm_handle;
+   hypre_ParCSRCommHandle *comm_handle = NULL;
    hypre_ParCSRCommPkg    *comm_pkg = hypre_ParCSRMatrixCommPkg(A);
    hypre_CSRMatrix        *diag   = hypre_ParCSRMatrixDiag(A);
    hypre_CSRMatrix        *offd   = hypre_ParCSRMatrixOffd(A);
@@ -750,12 +568,12 @@ hypre_ParCSRMatrixMatvec_FF( HYPRE_Complex       alpha,
    HYPRE_BigInt            num_rows = hypre_ParCSRMatrixGlobalNumRows(A);
    HYPRE_BigInt            num_cols = hypre_ParCSRMatrixGlobalNumCols(A);
 
-   hypre_Vector      *x_tmp;
+   hypre_Vector      *x_tmp = NULL;
    HYPRE_BigInt       x_size = hypre_ParVectorGlobalSize(x);
    HYPRE_BigInt       y_size = hypre_ParVectorGlobalSize(y);
    HYPRE_Int          num_cols_offd = hypre_CSRMatrixNumCols(offd);
    HYPRE_Int          ierr = 0;
-   HYPRE_Int          num_sends, i, j, index, start, num_procs;
+   HYPRE_Int          num_sends = 0, i, j, index, start, num_procs;
    HYPRE_Int         *int_buf_data = NULL;
    HYPRE_Int         *CF_marker_offd = NULL;
 
@@ -773,16 +591,22 @@ hypre_ParCSRMatrixMatvec_FF( HYPRE_Complex       alpha,
     *  is informational only.
     *--------------------------------------------------------------------*/
 
-   hypre_MPI_Comm_size(comm,&num_procs);
+   hypre_MPI_Comm_size(comm, &num_procs);
 
    if (num_cols != x_size)
+   {
       ierr = 11;
+   }
 
    if (num_rows != y_size)
+   {
       ierr = 12;
+   }
 
    if (num_cols != x_size && num_rows != y_size)
+   {
       ierr = 13;
+   }
 
    if (num_procs > 1)
    {
@@ -812,9 +636,9 @@ hypre_ParCSRMatrixMatvec_FF( HYPRE_Complex       alpha,
       for (i = 0; i < num_sends; i++)
       {
          start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
             x_buf_data[index++]
-               = x_local_data[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+               = x_local_data[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
       }
       comm_handle =
          hypre_ParCSRCommHandleCreate ( 1, comm_pkg, x_buf_data, x_tmp_data );
@@ -830,23 +654,23 @@ hypre_ParCSRMatrixMatvec_FF( HYPRE_Complex       alpha,
       if (num_sends)
          int_buf_data = hypre_CTAlloc(HYPRE_Int,  hypre_ParCSRCommPkgSendMapStart
                                       (comm_pkg,  num_sends), HYPRE_MEMORY_HOST);
-      if (num_cols_offd) CF_marker_offd = hypre_CTAlloc(HYPRE_Int,  num_cols_offd, HYPRE_MEMORY_HOST);
+      if (num_cols_offd) { CF_marker_offd = hypre_CTAlloc(HYPRE_Int, num_cols_offd, HYPRE_MEMORY_HOST); }
       index = 0;
       for (i = 0; i < num_sends; i++)
       {
          start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
             int_buf_data[index++]
-               = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j)];
+               = CF_marker[hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j)];
       }
       comm_handle =
-         hypre_ParCSRCommHandleCreate(11,comm_pkg,int_buf_data,CF_marker_offd );
+         hypre_ParCSRCommHandleCreate(11, comm_pkg, int_buf_data, CF_marker_offd );
 
       hypre_ParCSRCommHandleDestroy(comm_handle);
       comm_handle = NULL;
 
-      if (num_cols_offd) hypre_CSRMatrixMatvec_FF( alpha, offd, x_tmp, 1.0, y_local,
-                                                   CF_marker, CF_marker_offd, fpt);
+      if (num_cols_offd) hypre_CSRMatrixMatvec_FF(alpha, offd, x_tmp, 1.0, y_local,
+                                                     CF_marker, CF_marker_offd, fpt);
 
       hypre_SeqVectorDestroy(x_tmp);
       x_tmp = NULL;
diff --git a/external/hypre/src/parcsr_mv/par_csr_matvec_device.c b/external/hypre/src/parcsr_mv/par_csr_matvec_device.c
new file mode 100644
index 00000000..e25c7bf7
--- /dev/null
+++ b/external/hypre/src/parcsr_mv/par_csr_matvec_device.c
@@ -0,0 +1,593 @@
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ * Matvec functions for hypre_CSRMatrix class.
+ *
+ *****************************************************************************/
+
+#include "_hypre_onedpl.hpp"
+#include "_hypre_parcsr_mv.h"
+#include "_hypre_utilities.hpp"
+
+#if defined(HYPRE_USING_GPU)
+
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixMatvecOutOfPlaceDevice
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ParCSRMatrixMatvecOutOfPlaceDevice( HYPRE_Complex       alpha,
+                                          hypre_ParCSRMatrix *A,
+                                          hypre_ParVector    *x,
+                                          HYPRE_Complex       beta,
+                                          hypre_ParVector    *b,
+                                          hypre_ParVector    *y )
+{
+   hypre_GpuProfilingPushRange("Matvec");
+
+   hypre_ParCSRCommPkg     *comm_pkg = hypre_ParCSRMatrixCommPkg(A);
+   hypre_ParCSRCommHandle  *comm_handle;
+   HYPRE_Int               *d_send_map_elmts;
+   HYPRE_Int                send_map_num_elmts;
+
+   hypre_CSRMatrix         *diag = hypre_ParCSRMatrixDiag(A);
+   hypre_CSRMatrix         *offd = hypre_ParCSRMatrixOffd(A);
+
+   hypre_Vector            *x_local  = hypre_ParVectorLocalVector(x);
+   hypre_Vector            *b_local  = hypre_ParVectorLocalVector(b);
+   hypre_Vector            *y_local  = hypre_ParVectorLocalVector(y);
+   hypre_Vector            *x_tmp;
+
+   HYPRE_BigInt             num_rows = hypre_ParCSRMatrixGlobalNumRows(A);
+   HYPRE_BigInt             num_cols = hypre_ParCSRMatrixGlobalNumCols(A);
+   HYPRE_BigInt             x_size   = hypre_ParVectorGlobalSize(x);
+   HYPRE_BigInt             b_size   = hypre_ParVectorGlobalSize(b);
+   HYPRE_BigInt             y_size   = hypre_ParVectorGlobalSize(y);
+
+   HYPRE_Int                num_cols_offd = hypre_CSRMatrixNumCols(offd);
+   HYPRE_Int                num_recvs, num_sends;
+   HYPRE_Int                ierr = 0;
+
+   HYPRE_Int                idxstride    = hypre_VectorIndexStride(x_local);
+   HYPRE_Int                num_vectors  = hypre_VectorNumVectors(x_local);
+   HYPRE_Complex           *x_local_data = hypre_VectorData(x_local);
+   HYPRE_Complex           *x_tmp_data;
+   HYPRE_Complex           *x_buf_data;
+
+   HYPRE_Int                sync_stream;
+
+   HYPRE_ANNOTATE_FUNC_BEGIN;
+
+   hypre_GetSyncCudaCompute(&sync_stream);
+   hypre_SetSyncCudaCompute(0);
+
+   /*---------------------------------------------------------------------
+    *  Check for size compatibility.  ParMatvec returns ierr = 11 if
+    *  length of X doesn't equal the number of columns of A,
+    *  ierr = 12 if the length of Y doesn't equal the number of rows
+    *  of A, and ierr = 13 if both are true.
+    *
+    *  Because temporary vectors are often used in ParMatvec, none of
+    *  these conditions terminates processing, and the ierr flag
+    *  is informational only.
+    *--------------------------------------------------------------------*/
+   hypre_assert( idxstride > 0 );
+
+   if (num_cols != x_size)
+   {
+      ierr = 11;
+   }
+
+   if (num_rows != y_size || num_rows != b_size)
+   {
+      ierr = 12;
+   }
+
+   if (num_cols != x_size && (num_rows != y_size || num_rows != b_size))
+   {
+      ierr = 13;
+   }
+
+   hypre_assert( hypre_VectorNumVectors(b_local) == num_vectors );
+   hypre_assert( hypre_VectorNumVectors(y_local) == num_vectors );
+
+   if (num_vectors == 1)
+   {
+      x_tmp = hypre_SeqVectorCreate(num_cols_offd);
+   }
+   else
+   {
+      hypre_assert(num_vectors > 1);
+      x_tmp = hypre_SeqMultiVectorCreate(num_cols_offd, num_vectors);
+      hypre_VectorMultiVecStorageMethod(x_tmp) = 1;
+   }
+
+   /*---------------------------------------------------------------------
+    * If there exists no CommPkg for A, a CommPkg is generated using
+    * equally load balanced partitionings
+    *--------------------------------------------------------------------*/
+   if (!comm_pkg)
+   {
+      hypre_MatvecCommPkgCreate(A);
+      comm_pkg = hypre_ParCSRMatrixCommPkg(A);
+   }
+
+   /* Update send_map_starts, send_map_elmts, and recv_vec_starts when doing
+      sparse matrix/multivector product  */
+   hypre_ParCSRCommPkgUpdateVecStarts(comm_pkg, num_vectors,
+                                      hypre_VectorVectorStride(hypre_ParVectorLocalVector(x)),
+                                      hypre_VectorIndexStride(hypre_ParVectorLocalVector(x)));
+
+   /* Copy send_map_elmts to the device if not already there */
+   hypre_ParCSRCommPkgCopySendMapElmtsToDevice(comm_pkg);
+
+   /* Get information from the communication package*/
+   num_recvs          = hypre_ParCSRCommPkgNumRecvs(comm_pkg);
+   num_sends          = hypre_ParCSRCommPkgNumSends(comm_pkg);
+   d_send_map_elmts   = hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg);
+   send_map_num_elmts = hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends);
+
+   /* Sanity checks */
+   hypre_assert( num_cols_offd * num_vectors ==
+                 hypre_ParCSRCommPkgRecvVecStart(comm_pkg, num_recvs) );
+   hypre_assert( hypre_ParCSRCommPkgRecvVecStart(comm_pkg, 0) == 0 );
+   hypre_assert( hypre_ParCSRCommPkgSendMapStart(comm_pkg, 0) == 0 );
+
+#ifdef HYPRE_PROFILE
+   hypre_profile_times[HYPRE_TIMER_ID_PACK_UNPACK] -= hypre_MPI_Wtime();
+#endif
+
+   /*---------------------------------------------------------------------
+    * Allocate or reuse receive data buffer for x_tmp
+    *--------------------------------------------------------------------*/
+
+   if (!hypre_ParCSRCommPkgTmpData(comm_pkg))
+   {
+      hypre_ParCSRCommPkgTmpData(comm_pkg) = hypre_TAlloc(HYPRE_Complex,
+                                                          num_cols_offd * num_vectors,
+                                                          HYPRE_MEMORY_DEVICE);
+   }
+   hypre_VectorData(x_tmp) = x_tmp_data = hypre_ParCSRCommPkgTmpData(comm_pkg);
+   hypre_SeqVectorSetDataOwner(x_tmp, 0);
+   hypre_SeqVectorInitialize_v2(x_tmp, HYPRE_MEMORY_DEVICE);
+
+   /*---------------------------------------------------------------------
+    * Allocate or reuse send data buffer
+    *--------------------------------------------------------------------*/
+
+   if (!hypre_ParCSRCommPkgBufData(comm_pkg))
+   {
+      hypre_ParCSRCommPkgBufData(comm_pkg) = hypre_TAlloc(HYPRE_Complex,
+                                                          send_map_num_elmts,
+                                                          HYPRE_MEMORY_DEVICE);
+   }
+   x_buf_data = hypre_ParCSRCommPkgBufData(comm_pkg);
+
+   /* The assert is because this code has been tested for column-wise vector storage only. */
+   hypre_assert(idxstride == 1);
+
+   //hypre_SeqVectorPrefetch(x_local, HYPRE_MEMORY_DEVICE);
+
+   /*---------------------------------------------------------------------
+    * Pack send data
+    *--------------------------------------------------------------------*/
+
+#if defined(HYPRE_USING_DEVICE_OPENMP)
+   HYPRE_Int  i;
+
+   #pragma omp target teams distribute parallel for private(i) is_device_ptr(x_buf_data, x_local_data, d_send_map_elmts)
+   for (i = 0; i < send_map_num_elmts; i++)
+   {
+      x_buf_data[i] = x_local_data[d_send_map_elmts[i]];
+   }
+#else
+#if defined(HYPRE_USING_SYCL)
+   auto permuted_source = oneapi::dpl::make_permutation_iterator(x_local_data,
+                                                                 d_send_map_elmts);
+   HYPRE_ONEDPL_CALL( std::copy,
+                      permuted_source,
+                      permuted_source + send_map_num_elmts,
+                      x_buf_data );
+#else
+   HYPRE_THRUST_CALL( gather,
+                      d_send_map_elmts,
+                      d_send_map_elmts + send_map_num_elmts,
+                      x_local_data,
+                      x_buf_data );
+#endif
+#endif
+
+#ifdef HYPRE_PROFILE
+   hypre_profile_times[HYPRE_TIMER_ID_PACK_UNPACK] += hypre_MPI_Wtime();
+#endif
+
+#if defined(HYPRE_USING_THRUST_NOSYNC)
+   /* RL: make sure x_buf_data is ready before issuing GPU-GPU MPI */
+   if (hypre_GetGpuAwareMPI())
+   {
+      hypre_ForceSyncComputeStream();
+   }
+#endif
+
+   /* when using GPUs, start local matvec first in order to overlap with communication */
+   hypre_CSRMatrixMatvecOutOfPlace(alpha, diag, x_local, beta, b_local, y_local, 0);
+
+#ifdef HYPRE_PROFILE
+   hypre_profile_times[HYPRE_TIMER_ID_HALO_EXCHANGE] -= hypre_MPI_Wtime();
+#endif
+
+   /* Non-blocking communication starts */
+   comm_handle = hypre_ParCSRCommHandleCreate_v2(1, comm_pkg,
+                                                 HYPRE_MEMORY_DEVICE, x_buf_data,
+                                                 HYPRE_MEMORY_DEVICE, x_tmp_data);
+
+   /* Non-blocking communication ends */
+   hypre_ParCSRCommHandleDestroy(comm_handle);
+
+#ifdef HYPRE_PROFILE
+   hypre_profile_times[HYPRE_TIMER_ID_HALO_EXCHANGE] += hypre_MPI_Wtime();
+#endif
+
+   /* computation offd part */
+   if (num_cols_offd)
+   {
+      hypre_CSRMatrixMatvec(alpha, offd, x_tmp, 1.0, y_local);
+   }
+
+#ifdef HYPRE_PROFILE
+   hypre_profile_times[HYPRE_TIMER_ID_PACK_UNPACK] -= hypre_MPI_Wtime();
+#endif
+
+   /*---------------------------------------------------------------------
+    * Free memory
+    *--------------------------------------------------------------------*/
+   hypre_SeqVectorDestroy(x_tmp);
+
+   /*---------------------------------------------------------------------
+    * Synchronize calls
+    *--------------------------------------------------------------------*/
+   hypre_SetSyncCudaCompute(sync_stream);
+   hypre_SyncComputeStream();
+
+   /*---------------------------------------------------------------------
+    * Performance profiling
+    *--------------------------------------------------------------------*/
+#ifdef HYPRE_PROFILE
+   hypre_profile_times[HYPRE_TIMER_ID_PACK_UNPACK] += hypre_MPI_Wtime();
+#endif
+
+   HYPRE_ANNOTATE_FUNC_END;
+
+   hypre_GpuProfilingPopRange();
+
+   return ierr;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixMatvecTDevice
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ParCSRMatrixMatvecTDevice( HYPRE_Complex       alpha,
+                                 hypre_ParCSRMatrix *A,
+                                 hypre_ParVector    *x,
+                                 HYPRE_Complex       beta,
+                                 hypre_ParVector    *y )
+{
+   hypre_GpuProfilingPushRange("MatvecT");
+
+   hypre_ParCSRCommPkg     *comm_pkg      = hypre_ParCSRMatrixCommPkg(A);
+   hypre_ParCSRCommHandle  *comm_handle;
+   HYPRE_Int                send_map_num_elmts;
+
+   hypre_CSRMatrix         *diag          = hypre_ParCSRMatrixDiag(A);
+   hypre_CSRMatrix         *offd          = hypre_ParCSRMatrixOffd(A);
+   hypre_CSRMatrix         *diagT         = hypre_ParCSRMatrixDiagT(A);
+   hypre_CSRMatrix         *offdT         = hypre_ParCSRMatrixOffdT(A);
+
+   hypre_Vector            *x_local       = hypre_ParVectorLocalVector(x);
+   hypre_Vector            *y_local       = hypre_ParVectorLocalVector(y);
+   hypre_Vector            *y_tmp;
+
+   HYPRE_Int                num_cols_diag = hypre_CSRMatrixNumCols(diag);
+   HYPRE_Int                num_cols_offd = hypre_CSRMatrixNumCols(offd);
+   HYPRE_BigInt             num_rows      = hypre_ParCSRMatrixGlobalNumRows(A);
+   HYPRE_BigInt             num_cols      = hypre_ParCSRMatrixGlobalNumCols(A);
+   HYPRE_BigInt             x_size        = hypre_ParVectorGlobalSize(x);
+   HYPRE_BigInt             y_size        = hypre_ParVectorGlobalSize(y);
+
+   HYPRE_Complex           *y_tmp_data;
+   HYPRE_Complex           *y_buf_data;
+   HYPRE_Complex           *y_local_data  = hypre_VectorData(y_local);
+   HYPRE_Int                idxstride     = hypre_VectorIndexStride(y_local);
+   HYPRE_Int                num_vectors   = hypre_VectorNumVectors(y_local);
+   HYPRE_Int                num_sends;
+   HYPRE_Int                num_recvs;
+   HYPRE_Int                ierr = 0;
+   HYPRE_Int                sync_stream;
+
+   HYPRE_ANNOTATE_FUNC_BEGIN;
+
+   hypre_GetSyncCudaCompute(&sync_stream);
+   hypre_SetSyncCudaCompute(0);
+
+   /*---------------------------------------------------------------------
+    *  Check for size compatibility.  MatvecT returns ierr = 1 if
+    *  length of X doesn't equal the number of rows of A,
+    *  ierr = 2 if the length of Y doesn't equal the number of
+    *  columns of A, and ierr = 3 if both are true.
+    *
+    *  Because temporary vectors are often used in MatvecT, none of
+    *  these conditions terminates processing, and the ierr flag
+    *  is informational only.
+    *--------------------------------------------------------------------*/
+   if (num_rows != x_size)
+   {
+      ierr = 1;
+   }
+
+   if (num_cols != y_size)
+   {
+      ierr = 2;
+   }
+
+   if (num_rows != x_size && num_cols != y_size)
+   {
+      ierr = 3;
+   }
+
+   hypre_assert( hypre_VectorNumVectors(x_local) == num_vectors );
+   hypre_assert( hypre_VectorNumVectors(y_local) == num_vectors );
+
+   if (num_vectors == 1)
+   {
+      y_tmp = hypre_SeqVectorCreate(num_cols_offd);
+   }
+   else
+   {
+      hypre_assert(num_vectors > 1);
+      y_tmp = hypre_SeqMultiVectorCreate(num_cols_offd, num_vectors);
+      hypre_VectorMultiVecStorageMethod(y_tmp) = 1;
+   }
+
+   /*---------------------------------------------------------------------
+    * If there exists no CommPkg for A, a CommPkg is generated using
+    * equally load balanced partitionings
+    *--------------------------------------------------------------------*/
+   if (!comm_pkg)
+   {
+      hypre_MatvecCommPkgCreate(A);
+      comm_pkg = hypre_ParCSRMatrixCommPkg(A);
+   }
+
+   /* Update send_map_starts, send_map_elmts, and recv_vec_starts for SpMV with multivecs */
+   hypre_ParCSRCommPkgUpdateVecStarts(comm_pkg, num_vectors,
+                                      hypre_VectorVectorStride(hypre_ParVectorLocalVector(y)),
+                                      hypre_VectorIndexStride(hypre_ParVectorLocalVector(y)));
+
+   /* Update send_map_elmts on device */
+   hypre_ParCSRCommPkgCopySendMapElmtsToDevice(comm_pkg);
+
+   /* Get information from the communication package*/
+   num_recvs          = hypre_ParCSRCommPkgNumRecvs(comm_pkg);
+   num_sends          = hypre_ParCSRCommPkgNumSends(comm_pkg);
+   send_map_num_elmts = hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends);
+
+   /* Sanity checks */
+   hypre_assert( num_cols_offd * num_vectors ==
+                 hypre_ParCSRCommPkgRecvVecStart(comm_pkg, num_recvs) );
+   hypre_assert( hypre_ParCSRCommPkgRecvVecStart(comm_pkg, 0) == 0 );
+   hypre_assert( hypre_ParCSRCommPkgSendMapStart(comm_pkg, 0) == 0 );
+
+#ifdef HYPRE_PROFILE
+   hypre_profile_times[HYPRE_TIMER_ID_PACK_UNPACK] -= hypre_MPI_Wtime();
+#endif
+
+   /*---------------------------------------------------------------------
+    * Allocate or reuse send data buffer for y_tmp
+    *--------------------------------------------------------------------*/
+
+   if (!hypre_ParCSRCommPkgTmpData(comm_pkg))
+   {
+      hypre_ParCSRCommPkgTmpData(comm_pkg) = hypre_TAlloc(HYPRE_Complex,
+                                                          num_cols_offd * num_vectors,
+                                                          HYPRE_MEMORY_DEVICE);
+   }
+   hypre_VectorData(y_tmp) = y_tmp_data = hypre_ParCSRCommPkgTmpData(comm_pkg);
+   hypre_SeqVectorSetDataOwner(y_tmp, 0);
+   hypre_SeqVectorInitialize_v2(y_tmp, HYPRE_MEMORY_DEVICE);
+
+   /*---------------------------------------------------------------------
+    * Allocate receive data buffer
+    *--------------------------------------------------------------------*/
+
+   if (!hypre_ParCSRCommPkgBufData(comm_pkg))
+   {
+      hypre_ParCSRCommPkgBufData(comm_pkg) = hypre_TAlloc(HYPRE_Complex,
+                                                          send_map_num_elmts,
+                                                          HYPRE_MEMORY_DEVICE);
+   }
+   y_buf_data = hypre_ParCSRCommPkgBufData(comm_pkg);
+
+#ifdef HYPRE_PROFILE
+   hypre_profile_times[HYPRE_TIMER_ID_PACK_UNPACK] += hypre_MPI_Wtime();
+#endif
+
+   /* Compute y_tmp = offd^T * x_local */
+   if (num_cols_offd)
+   {
+      if (offdT)
+      {
+         // offdT is optional. Used only if it's present
+         hypre_CSRMatrixMatvec(alpha, offdT, x_local, 0.0, y_tmp);
+      }
+      else
+      {
+         hypre_CSRMatrixMatvecT(alpha, offd, x_local, 0.0, y_tmp);
+      }
+   }
+
+   /* RL: make sure y_tmp is ready before issuing GPU-GPU MPI */
+   if (hypre_GetGpuAwareMPI())
+   {
+      hypre_ForceSyncComputeStream();
+   }
+
+   /* when using GPUs, start local matvec first in order to overlap with communication */
+   if (diagT)
+   {
+      // diagT is optional. Used only if it's present.
+      hypre_CSRMatrixMatvec(alpha, diagT, x_local, beta, y_local);
+   }
+   else
+   {
+      hypre_CSRMatrixMatvecT(alpha, diag, x_local, beta, y_local);
+   }
+
+#ifdef HYPRE_PROFILE
+   hypre_profile_times[HYPRE_TIMER_ID_HALO_EXCHANGE] -= hypre_MPI_Wtime();
+#endif
+
+   /* Non-blocking communication starts */
+   comm_handle = hypre_ParCSRCommHandleCreate_v2(2, comm_pkg,
+                                                 HYPRE_MEMORY_DEVICE, y_tmp_data,
+                                                 HYPRE_MEMORY_DEVICE, y_buf_data );
+
+   /* Non-blocking communication ends */
+   hypre_ParCSRCommHandleDestroy(comm_handle);
+
+#ifdef HYPRE_PROFILE
+   hypre_profile_times[HYPRE_TIMER_ID_HALO_EXCHANGE] += hypre_MPI_Wtime();
+   hypre_profile_times[HYPRE_TIMER_ID_PACK_UNPACK]   -= hypre_MPI_Wtime();
+#endif
+
+   /* The assert is here because this code has been tested for column-wise vector storage only. */
+   hypre_assert( idxstride == 1 );
+
+   /*---------------------------------------------------------------------
+    * Unpack receive data
+    *--------------------------------------------------------------------*/
+
+#if defined(HYPRE_USING_DEVICE_OPENMP)
+   HYPRE_Int  *d_send_map_elmts = hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg);
+   HYPRE_Int   i, j;
+
+   for (i = 0; i < num_sends; i++)
+   {
+      HYPRE_Int  start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
+      HYPRE_Int  end   = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1);
+
+      #pragma omp target teams distribute parallel for private(j) is_device_ptr(y_buf_data, y_local_data, d_send_map_elmts)
+      for (j = start; j < end; j++)
+      {
+         y_local_data[d_send_map_elmts[j]] += y_buf_data[j];
+      }
+   }
+#else
+   /* Use SpMV to unpack data */
+   hypre_ParCSRMatrixMatvecT_unpack(comm_pkg, num_cols_diag, y_buf_data, y_local_data);
+#endif
+
+   /*---------------------------------------------------------------------
+    * Free memory
+    *--------------------------------------------------------------------*/
+
+   hypre_SeqVectorDestroy(y_tmp);
+
+   /*---------------------------------------------------------------------
+    * Synchronize when using GPUs
+    *--------------------------------------------------------------------*/
+
+#if defined(HYPRE_USING_GPU)
+   hypre_SetSyncCudaCompute(sync_stream);
+   hypre_SyncComputeStream();
+#endif
+
+   /*---------------------------------------------------------------------
+    * Performance profiling
+    *--------------------------------------------------------------------*/
+
+#ifdef HYPRE_PROFILE
+   hypre_profile_times[HYPRE_TIMER_ID_PACK_UNPACK] += hypre_MPI_Wtime();
+#endif
+
+   HYPRE_ANNOTATE_FUNC_END;
+
+   hypre_GpuProfilingPopRange();
+
+   return ierr;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixMatvecT_unpack
+ *
+ * Computes on the device:
+ *
+ *   local_data[send_map_elmts] += recv_data
+ *
+ * with hypre's internal SpMV.
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ParCSRMatrixMatvecT_unpack( hypre_ParCSRCommPkg *comm_pkg,
+                                  HYPRE_Int            num_cols,
+                                  HYPRE_Complex       *recv_data,
+                                  HYPRE_Complex       *local_data )
+{
+   /* Input variables */
+   hypre_CSRMatrix  *matrix_E       = hypre_ParCSRCommPkgMatrixE(comm_pkg);
+   HYPRE_Int         num_sends      = hypre_ParCSRCommPkgNumSends(comm_pkg);
+   HYPRE_Int         num_elements   = hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends);
+   HYPRE_Int         num_components = hypre_ParCSRCommPkgNumComponents(comm_pkg);
+
+   /* Local variables */
+   hypre_Vector      vec_x;
+   hypre_Vector      vec_y;
+   HYPRE_Int         trans = 0;
+   HYPRE_Int         fill  = 0;
+   HYPRE_Complex     alpha = 1.0;
+   HYPRE_Complex     beta  = 1.0;
+
+   if (num_elements == 0)
+   {
+      return hypre_error_flag;
+   }
+
+   /* Create matrix E if it not exists */
+   if (!matrix_E)
+   {
+      hypre_ParCSRCommPkgCreateMatrixE(comm_pkg, num_cols);
+      matrix_E = hypre_ParCSRCommPkgMatrixE(comm_pkg);
+   }
+
+   /* Set vector x */
+   hypre_VectorData(&vec_x)                  = recv_data;
+   hypre_VectorOwnsData(&vec_x)              = 0;
+   hypre_VectorSize(&vec_x)                  = num_elements / num_components;
+   hypre_VectorVectorStride(&vec_x)          = 1;
+   hypre_VectorIndexStride(&vec_x)           = num_components;
+   hypre_VectorNumVectors(&vec_x)            = num_components;
+   hypre_VectorMultiVecStorageMethod(&vec_x) = 1;
+
+   /* Set vector y */
+   hypre_VectorData(&vec_y)                  = local_data;
+   hypre_VectorOwnsData(&vec_y)              = 0;
+   hypre_VectorSize(&vec_y)                  = num_cols;
+   hypre_VectorVectorStride(&vec_y)          = num_cols;
+   hypre_VectorIndexStride(&vec_y)           = 1;
+   hypre_VectorNumVectors(&vec_y)            = num_components;
+   hypre_VectorMultiVecStorageMethod(&vec_y) = 0;
+
+   /* Compute y += E*x */
+   hypre_CSRMatrixSpMVDevice(trans, alpha, matrix_E, &vec_x, beta, &vec_y, fill);
+
+   return hypre_error_flag;
+}
+
+#endif /* #if defined(HYPRE_USING_GPU) */
diff --git a/external/hypre/src/parcsr_mv/par_csr_triplemat.c b/external/hypre/src/parcsr_mv/par_csr_triplemat.c
index 9f421666..3a230539 100644
--- a/external/hypre/src/parcsr_mv/par_csr_triplemat.c
+++ b/external/hypre/src/parcsr_mv/par_csr_triplemat.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -11,10 +11,9 @@
 #include "../parcsr_mv/_hypre_parcsr_mv.h"
 
 /*--------------------------------------------------------------------------
- * hypre_ParCSRMatMat : multiplies two ParCSRMatrices A and B and returns
- * the product in ParCSRMatrix C
- * Note that C does not own the partitionings since its row_starts
- * is owned by A and col_starts by B.
+ * hypre_ParCSRMatMatHost
+ *
+ * Host implementation of hypre_ParCSRMatMat (C = A * B)
  *--------------------------------------------------------------------------*/
 
 hypre_ParCSRMatrix*
@@ -45,7 +44,7 @@ hypre_ParCSRMatMatHost( hypre_ParCSRMatrix  *A,
 
    hypre_ParCSRMatrix *C;
    HYPRE_BigInt    *col_map_offd_C = NULL;
-   HYPRE_Int       *map_B_to_C=NULL;
+   HYPRE_Int       *map_B_to_C = NULL;
 
    hypre_CSRMatrix *C_diag = NULL;
 
@@ -91,7 +90,7 @@ hypre_ParCSRMatMatHost( hypre_ParCSRMatrix  *A,
 
    hypre_MPI_Comm_size(comm, &num_procs);
    hypre_MPI_Comm_rank(comm, &my_id);
-   last_col_diag_B = first_col_diag_B + num_cols_diag_B -1;
+   last_col_diag_B = first_col_diag_B + num_cols_diag_B - 1;
 
    if (num_procs > 1)
    {
@@ -103,7 +102,6 @@ hypre_ParCSRMatMatHost( hypre_ParCSRMatrix  *A,
       Bs_ext = hypre_ParCSRMatrixExtractBExt(B, A, 1); /* contains communication
                                                           which should be explicitly included to allow for overlap */
 
-
       hypre_CSRMatrixSplit(Bs_ext, first_col_diag_B, last_col_diag_B, num_cols_offd_B, col_map_offd_B,
                            &num_cols_offd_C, &col_map_offd_C, &Bext_diag, &Bext_offd);
 
@@ -122,7 +120,6 @@ hypre_ParCSRMatMatHost( hypre_ParCSRMatrix  *A,
 
       if (num_cols_offd_B)
       {
-         HYPRE_Int i;
          map_B_to_C = hypre_CTAlloc(HYPRE_Int, num_cols_offd_B, HYPRE_MEMORY_HOST);
 
          cnt = 0;
@@ -140,7 +137,7 @@ hypre_ParCSRMatMatHost( hypre_ParCSRMatrix  *A,
       }
       AB_offd_num_nonzeros = hypre_CSRMatrixNumNonzeros(AB_offd);
       AB_offd_j = hypre_CSRMatrixJ(AB_offd);
-      for (i=0; i < AB_offd_num_nonzeros; i++)
+      for (i = 0; i < AB_offd_num_nonzeros; i++)
       {
          AB_offd_j[i] = map_B_to_C[AB_offd_j[i]];
       }
@@ -192,42 +189,45 @@ hypre_ParCSRMatMatHost( hypre_ParCSRMatrix  *A,
    return C;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatMat
+ *
+ * Computes C = A*B
+ *--------------------------------------------------------------------------*/
+
 hypre_ParCSRMatrix*
 hypre_ParCSRMatMat( hypre_ParCSRMatrix  *A,
                     hypre_ParCSRMatrix  *B )
 {
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-   hypre_GpuProfilingPushRange("Mat-Mat");
-#endif
-
    hypre_ParCSRMatrix *C = NULL;
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+   HYPRE_ANNOTATE_FUNC_BEGIN;
+   hypre_GpuProfilingPushRange("Mat-Mat");
+
+#if defined(HYPRE_USING_GPU)
    HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy2( hypre_ParCSRMatrixMemoryLocation(A),
                                                       hypre_ParCSRMatrixMemoryLocation(B) );
 
    if (exec == HYPRE_EXEC_DEVICE)
    {
-      C = hypre_ParCSRMatMatDevice(A,B);
+      C = hypre_ParCSRMatMatDevice(A, B);
    }
    else
 #endif
    {
-      C = hypre_ParCSRMatMatHost(A,B);
+      C = hypre_ParCSRMatMatHost(A, B);
    }
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    hypre_GpuProfilingPopRange();
-#endif
+   HYPRE_ANNOTATE_FUNC_END;
 
    return C;
 }
 
 /*--------------------------------------------------------------------------
- * hypre_ParCSRTMatMatKT : multiplies two ParCSRMatrices transpose(A) and B and returns
- * the product in ParCSRMatrix C
- * Note that C does not own the partitionings since its row_starts
- * is owned by A and col_starts by B.
+ * hypre_ParCSRTMatMatKTHost
+ *
+ * Host implementation of hypre_ParCSRTMatMatKT (C = A^T * B)
  *--------------------------------------------------------------------------*/
 
 hypre_ParCSRMatrix*
@@ -238,56 +238,64 @@ hypre_ParCSRTMatMatKTHost( hypre_ParCSRMatrix  *A,
    MPI_Comm             comm       = hypre_ParCSRMatrixComm(A);
    hypre_ParCSRCommPkg *comm_pkg_A = NULL;
 
-   hypre_CSRMatrix *A_diag  = hypre_ParCSRMatrixDiag(A);
-   hypre_CSRMatrix *A_offd  = hypre_ParCSRMatrixOffd(A);
-   hypre_CSRMatrix *B_diag  = hypre_ParCSRMatrixDiag(B);
-   hypre_CSRMatrix *B_offd  = hypre_ParCSRMatrixOffd(B);
-   hypre_CSRMatrix *AT_diag = NULL;
-
-   HYPRE_Int num_rows_diag_A  = hypre_CSRMatrixNumRows(A_diag);
-   HYPRE_Int num_cols_diag_A  = hypre_CSRMatrixNumCols(A_diag);
-   HYPRE_Int num_rows_diag_B  = hypre_CSRMatrixNumRows(B_diag);
-   HYPRE_Int num_cols_diag_B  = hypre_CSRMatrixNumCols(B_diag);
-   HYPRE_Int num_cols_offd_B  = hypre_CSRMatrixNumCols(B_offd);
-   HYPRE_BigInt first_col_diag_B = hypre_ParCSRMatrixFirstColDiag(B);
-
-   HYPRE_BigInt *col_map_offd_B = hypre_ParCSRMatrixColMapOffd(B);
-
-   HYPRE_BigInt *col_starts_A = hypre_ParCSRMatrixColStarts(A);
-   HYPRE_BigInt *col_starts_B = hypre_ParCSRMatrixColStarts(B);
-
-   hypre_ParCSRMatrix *C;
-   hypre_CSRMatrix *C_diag = NULL;
-   hypre_CSRMatrix *C_offd = NULL;
-
-   HYPRE_BigInt *col_map_offd_C = NULL;
-   HYPRE_Int *map_B_to_C;
-   HYPRE_BigInt  first_col_diag_C;
-   HYPRE_BigInt  last_col_diag_C;
-   HYPRE_Int  num_cols_offd_C = 0;
-
-   HYPRE_BigInt n_rows_A, n_cols_A;
-   HYPRE_BigInt n_rows_B, n_cols_B;
-   HYPRE_Int j_indx, cnt;
-   HYPRE_Int num_procs, my_id;
+   hypre_CSRMatrix     *A_diag  = hypre_ParCSRMatrixDiag(A);
+   hypre_CSRMatrix     *A_offd  = hypre_ParCSRMatrixOffd(A);
+   hypre_CSRMatrix     *B_diag  = hypre_ParCSRMatrixDiag(B);
+   hypre_CSRMatrix     *B_offd  = hypre_ParCSRMatrixOffd(B);
+   hypre_CSRMatrix     *AT_diag;
+   hypre_CSRMatrix     *AT_offd;
+
+   HYPRE_Int            num_rows_diag_A  = hypre_CSRMatrixNumRows(A_diag);
+   HYPRE_Int            num_cols_diag_A  = hypre_CSRMatrixNumCols(A_diag);
+   HYPRE_Int            num_rows_diag_B  = hypre_CSRMatrixNumRows(B_diag);
+   HYPRE_Int            num_cols_diag_B  = hypre_CSRMatrixNumCols(B_diag);
+   HYPRE_Int            num_cols_offd_B  = hypre_CSRMatrixNumCols(B_offd);
+   HYPRE_BigInt         first_col_diag_B = hypre_ParCSRMatrixFirstColDiag(B);
+
+   HYPRE_BigInt        *col_map_offd_B = hypre_ParCSRMatrixColMapOffd(B);
+   HYPRE_BigInt        *col_starts_A   = hypre_ParCSRMatrixColStarts(A);
+   HYPRE_BigInt        *col_starts_B   = hypre_ParCSRMatrixColStarts(B);
+
+   hypre_ParCSRMatrix  *C;
+   hypre_CSRMatrix     *C_diag = NULL;
+   hypre_CSRMatrix     *C_offd = NULL;
+
+   HYPRE_BigInt        *col_map_offd_C = NULL;
+   HYPRE_Int           *map_B_to_C;
+   HYPRE_BigInt         first_col_diag_C;
+   HYPRE_BigInt         last_col_diag_C;
+   HYPRE_Int            num_cols_offd_C = 0;
+
+   HYPRE_BigInt         n_rows_A, n_cols_A;
+   HYPRE_BigInt         n_rows_B, n_cols_B;
+   HYPRE_Int            j_indx, cnt;
+   HYPRE_Int            num_procs, my_id;
 
    n_rows_A = hypre_ParCSRMatrixGlobalNumRows(A);
    n_cols_A = hypre_ParCSRMatrixGlobalNumCols(A);
    n_rows_B = hypre_ParCSRMatrixGlobalNumRows(B);
    n_cols_B = hypre_ParCSRMatrixGlobalNumCols(B);
 
-   hypre_MPI_Comm_size(comm,&num_procs);
+   hypre_MPI_Comm_size(comm, &num_procs);
    hypre_MPI_Comm_rank(comm, &my_id);
 
    if (n_rows_A != n_rows_B || num_rows_diag_A != num_rows_diag_B)
    {
-      hypre_error_w_msg(HYPRE_ERROR_GENERIC," Error! Incompatible matrix dimensions!\n");
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, " Error! Incompatible matrix dimensions!\n");
       return NULL;
    }
 
    /*if (num_cols_diag_A == num_cols_diag_B) allsquare = 1;*/
 
-   hypre_CSRMatrixTranspose(A_diag, &AT_diag, 1);
+   /* Compute AT_diag if necessary */
+   if (!hypre_ParCSRMatrixDiagT(A))
+   {
+      hypre_CSRMatrixTranspose(A_diag, &AT_diag, 1);
+   }
+   else
+   {
+      AT_diag = hypre_ParCSRMatrixDiagT(A);
+   }
 
    if (num_procs == 1)
    {
@@ -295,34 +303,33 @@ hypre_ParCSRTMatMatKTHost( hypre_ParCSRMatrix  *A,
       C_offd = hypre_CSRMatrixCreate(num_cols_diag_A, 0, 0);
       hypre_CSRMatrixInitialize_v2(C_offd, 0, hypre_CSRMatrixMemoryLocation(C_diag));
       hypre_CSRMatrixNumRownnz(C_offd) = 0;
-      if (keep_transpose)
-      {
-         A->diagT = AT_diag;
+   }
+   else
+   {
+      hypre_CSRMatrix  *C_tmp_diag = NULL;
+      hypre_CSRMatrix  *C_tmp_offd = NULL;
+      hypre_CSRMatrix  *C_int      = NULL;
+      hypre_CSRMatrix  *C_ext      = NULL;
+      hypre_CSRMatrix  *C_ext_diag = NULL;
+      hypre_CSRMatrix  *C_ext_offd = NULL;
+      hypre_CSRMatrix  *C_int_diag = NULL;
+      hypre_CSRMatrix  *C_int_offd = NULL;
+
+      HYPRE_Int         i;
+      HYPRE_Int        *C_tmp_offd_i;
+      HYPRE_Int        *C_tmp_offd_j;
+      HYPRE_Int        *send_map_elmts_A;
+      void             *request;
+
+      /* Compute AT_offd if necessary */
+      if (!hypre_ParCSRMatrixOffdT(A))
+      {
+         hypre_CSRMatrixTranspose(A_offd, &AT_offd, 1);
       }
       else
       {
-         hypre_CSRMatrixDestroy(AT_diag);
+         AT_offd = hypre_ParCSRMatrixOffdT(A);
       }
-   }
-   else
-   {
-      hypre_CSRMatrix *AT_offd    = NULL;
-      hypre_CSRMatrix *C_tmp_diag = NULL;
-      hypre_CSRMatrix *C_tmp_offd = NULL;
-      hypre_CSRMatrix *C_int      = NULL;
-      hypre_CSRMatrix *C_ext      = NULL;
-      hypre_CSRMatrix *C_ext_diag = NULL;
-      hypre_CSRMatrix *C_ext_offd = NULL;
-      hypre_CSRMatrix *C_int_diag = NULL;
-      hypre_CSRMatrix *C_int_offd = NULL;
-
-      HYPRE_Int  i;
-      HYPRE_Int *C_tmp_offd_i;
-      HYPRE_Int *C_tmp_offd_j;
-      HYPRE_Int *send_map_elmts_A;
-      void      *request;
-
-      hypre_CSRMatrixTranspose(A_offd, &AT_offd, 1);
 
       C_int_diag = hypre_CSRMatrixMultiplyHost(AT_offd, B_diag);
       C_int_offd = hypre_CSRMatrixMultiplyHost(AT_offd, B_offd);
@@ -352,22 +359,16 @@ hypre_ParCSRTMatMatKTHost( hypre_ParCSRMatrix  *A,
       C_tmp_diag = hypre_CSRMatrixMultiplyHost(AT_diag, B_diag);
       C_tmp_offd = hypre_CSRMatrixMultiplyHost(AT_diag, B_offd);
 
-      if (keep_transpose)
-      {
-        A->diagT = AT_diag;
-      }
-      else
-      {
-        hypre_CSRMatrixDestroy(AT_diag);
-      }
-
-      if (keep_transpose)
+      if (!hypre_ParCSRMatrixOffdT(A))
       {
-        A->offdT = AT_offd;
-      }
-      else
-      {
-        hypre_CSRMatrixDestroy(AT_offd);
+         if (keep_transpose)
+         {
+            hypre_ParCSRMatrixOffdT(A) = AT_offd;
+         }
+         else
+         {
+            hypre_CSRMatrixDestroy(AT_offd);
+         }
       }
 
       /*-----------------------------------------------------------------------
@@ -398,7 +399,7 @@ hypre_ParCSRTMatMatKTHost( hypre_ParCSRMatrix  *A,
          map_B_to_C = hypre_CTAlloc(HYPRE_Int, num_cols_offd_B, HYPRE_MEMORY_HOST);
 
          cnt = 0;
-         for (i=0; i < num_cols_offd_C; i++)
+         for (i = 0; i < num_cols_offd_C; i++)
          {
             if (col_map_offd_C[i] == col_map_offd_B[cnt])
             {
@@ -409,7 +410,7 @@ hypre_ParCSRTMatMatKTHost( hypre_ParCSRMatrix  *A,
                }
             }
          }
-         for (i=0; i < C_tmp_offd_i[hypre_CSRMatrixNumRows(C_tmp_offd)]; i++)
+         for (i = 0; i < C_tmp_offd_i[hypre_CSRMatrixNumRows(C_tmp_offd)]; i++)
          {
             j_indx = C_tmp_offd_j[i];
             C_tmp_offd_j[i] = map_B_to_C[j_indx];
@@ -432,6 +433,18 @@ hypre_ParCSRTMatMatKTHost( hypre_ParCSRMatrix  *A,
       hypre_CSRMatrixDestroy(C_ext_offd);
    }
 
+   if (!hypre_ParCSRMatrixDiagT(A))
+   {
+      if (keep_transpose)
+      {
+         hypre_ParCSRMatrixDiagT(A) = AT_diag;
+      }
+      else
+      {
+         hypre_CSRMatrixDestroy(AT_diag);
+      }
+   }
+
    C = hypre_ParCSRMatrixCreate(comm, n_cols_A, n_cols_B, col_starts_A, col_starts_B,
                                 num_cols_offd_C, C_diag->num_nonzeros, C_offd->num_nonzeros);
 
@@ -446,18 +459,26 @@ hypre_ParCSRTMatMatKTHost( hypre_ParCSRMatrix  *A,
    return C;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRTMatMatKT
+ *
+ * Multiplies two ParCSRMatrices transpose(A) and B and returns
+ * the product in ParCSRMatrix C.
+ *
+ * If either AT_diag or AT_offd don't exist and the flag keep_transpose is
+ * true, these local matrices are saved in the ParCSRMatrix A
+ *--------------------------------------------------------------------------*/
+
 hypre_ParCSRMatrix*
 hypre_ParCSRTMatMatKT( hypre_ParCSRMatrix  *A,
                        hypre_ParCSRMatrix  *B,
                        HYPRE_Int            keep_transpose)
 {
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    hypre_GpuProfilingPushRange("Mat-T-Mat");
-#endif
 
    hypre_ParCSRMatrix *C = NULL;
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
    HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy2( hypre_ParCSRMatrixMemoryLocation(A),
                                                       hypre_ParCSRMatrixMemoryLocation(B) );
 
@@ -471,129 +492,130 @@ hypre_ParCSRTMatMatKT( hypre_ParCSRMatrix  *A,
       C = hypre_ParCSRTMatMatKTHost(A, B, keep_transpose);
    }
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    hypre_GpuProfilingPopRange();
-#endif
 
    return C;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRTMatMat
+ *
+ * Computes "C = A^T * B" and discards the temporary local matrices generated
+ * in the algorithm (keep_transpose = 0).
+ *--------------------------------------------------------------------------*/
+
 hypre_ParCSRMatrix*
 hypre_ParCSRTMatMat( hypre_ParCSRMatrix  *A,
                      hypre_ParCSRMatrix  *B)
 {
-   return hypre_ParCSRTMatMatKT( A, B, 0);
+   return hypre_ParCSRTMatMatKT(A, B, 0);
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixRAPKTHost
+ *
+ * Host implementation of hypre_ParCSRMatrixRAPKT
+ *--------------------------------------------------------------------------*/
+
 hypre_ParCSRMatrix*
 hypre_ParCSRMatrixRAPKTHost( hypre_ParCSRMatrix *R,
                              hypre_ParCSRMatrix *A,
                              hypre_ParCSRMatrix *P,
                              HYPRE_Int           keep_transpose )
 {
-   MPI_Comm         comm = hypre_ParCSRMatrixComm(A);
+   MPI_Comm              comm             = hypre_ParCSRMatrixComm(A);
+
+   hypre_ParCSRCommPkg  *comm_pkg_R       = hypre_ParCSRMatrixCommPkg(R);
+   HYPRE_BigInt          n_rows_R         = hypre_ParCSRMatrixGlobalNumRows(R);
+   HYPRE_BigInt          n_cols_R         = hypre_ParCSRMatrixGlobalNumCols(R);
+   hypre_CSRMatrix      *R_diag           = hypre_ParCSRMatrixDiag(R);
+   hypre_CSRMatrix      *RT_diag          = hypre_ParCSRMatrixDiagT(R);
+   hypre_CSRMatrix      *R_offd           = hypre_ParCSRMatrixOffd(R);
+   hypre_CSRMatrix      *RT_offd          = hypre_ParCSRMatrixOffdT(R);
+
+   HYPRE_Int             num_rows_diag_R  = hypre_CSRMatrixNumRows(R_diag);
+   HYPRE_Int             num_cols_diag_R  = hypre_CSRMatrixNumCols(R_diag);
+   HYPRE_Int             num_cols_offd_R  = hypre_CSRMatrixNumCols(R_offd);
+   HYPRE_BigInt         *col_starts_R     = hypre_ParCSRMatrixColStarts(R);
+
+   hypre_CSRMatrix      *A_diag           = hypre_ParCSRMatrixDiag(A);
+   hypre_CSRMatrix      *A_offd           = hypre_ParCSRMatrixOffd(A);
+   HYPRE_BigInt          n_rows_A         = hypre_ParCSRMatrixGlobalNumRows(A);
+   HYPRE_BigInt          n_cols_A         = hypre_ParCSRMatrixGlobalNumCols(A);
+   HYPRE_BigInt         *row_starts_A     = hypre_ParCSRMatrixRowStarts(A);
+
+   HYPRE_Int             num_rows_diag_A  = hypre_CSRMatrixNumRows(A_diag);
+   HYPRE_Int             num_cols_diag_A  = hypre_CSRMatrixNumCols(A_diag);
+   HYPRE_Int             num_cols_offd_A  = hypre_CSRMatrixNumCols(A_offd);
+
+   HYPRE_BigInt          n_rows_P         = hypre_ParCSRMatrixGlobalNumRows(P);
+   HYPRE_BigInt          n_cols_P         = hypre_ParCSRMatrixGlobalNumCols(P);
+   HYPRE_BigInt         *col_map_offd_P   = hypre_ParCSRMatrixColMapOffd(P);
+   hypre_CSRMatrix      *P_diag           = hypre_ParCSRMatrixDiag(P);
+   hypre_CSRMatrix      *P_offd           = hypre_ParCSRMatrixOffd(P);
+
+   HYPRE_BigInt          first_col_diag_P = hypre_ParCSRMatrixFirstColDiag(P);
+   HYPRE_BigInt         *col_starts_P     = hypre_ParCSRMatrixColStarts(P);
+   HYPRE_Int             num_rows_diag_P  = hypre_CSRMatrixNumRows(P_diag);
+   HYPRE_Int             num_cols_diag_P  = hypre_CSRMatrixNumCols(P_diag);
+   HYPRE_Int             num_cols_offd_P  = hypre_CSRMatrixNumCols(P_offd);
+
+   hypre_ParCSRMatrix   *Q;
+   HYPRE_BigInt         *col_map_offd_Q = NULL;
+   HYPRE_Int            *map_P_to_Q = NULL;
+
+   hypre_CSRMatrix      *Q_diag = NULL;
+   hypre_CSRMatrix      *Q_offd = NULL;
+
+   HYPRE_Int             num_cols_offd_Q = 0;
+
+   hypre_CSRMatrix      *Ps_ext;
+   hypre_CSRMatrix      *Pext_diag;
+   hypre_CSRMatrix      *Pext_offd;
+
+   hypre_CSRMatrix      *AP_diag;
+   hypre_CSRMatrix      *AP_offd;
+   HYPRE_Int             AP_offd_num_nonzeros;
+   HYPRE_Int            *AP_offd_j;
+   hypre_CSRMatrix      *APext_diag = NULL;
+   hypre_CSRMatrix      *APext_offd = NULL;
+
+   hypre_ParCSRMatrix   *C;
+   HYPRE_BigInt         *col_map_offd_C = NULL;
+   HYPRE_Int            *map_Q_to_C;
+   hypre_CSRMatrix      *C_diag = NULL;
+   hypre_CSRMatrix      *C_offd = NULL;
+   HYPRE_BigInt          first_col_diag_C;
+   HYPRE_BigInt          last_col_diag_C;
+
+   HYPRE_Int             num_cols_offd_C = 0;
+   HYPRE_Int             j_indx;
+   HYPRE_Int             num_procs, my_id;
+   HYPRE_Int             cnt, i;
 
-   hypre_CSRMatrix *A_diag = hypre_ParCSRMatrixDiag(A);
-
-   hypre_CSRMatrix *A_offd = hypre_ParCSRMatrixOffd(A);
-
-   HYPRE_BigInt    *row_starts_A = hypre_ParCSRMatrixRowStarts(A);
-   HYPRE_Int        num_rows_diag_A = hypre_CSRMatrixNumRows(A_diag);
-   HYPRE_Int        num_cols_diag_A = hypre_CSRMatrixNumCols(A_diag);
-   HYPRE_Int        num_cols_offd_A = hypre_CSRMatrixNumCols(A_offd);
-
-   hypre_CSRMatrix *P_diag = hypre_ParCSRMatrixDiag(P);
-
-   hypre_CSRMatrix *P_offd = hypre_ParCSRMatrixOffd(P);
-   HYPRE_BigInt    *col_map_offd_P = hypre_ParCSRMatrixColMapOffd(P);
-
-   HYPRE_BigInt     first_col_diag_P = hypre_ParCSRMatrixFirstColDiag(P);
-   HYPRE_BigInt    *col_starts_P = hypre_ParCSRMatrixColStarts(P);
-   HYPRE_Int        num_rows_diag_P = hypre_CSRMatrixNumRows(P_diag);
-   HYPRE_Int        num_cols_diag_P = hypre_CSRMatrixNumCols(P_diag);
-   HYPRE_Int        num_cols_offd_P = hypre_CSRMatrixNumCols(P_offd);
-
-   hypre_ParCSRMatrix *Q;
-   HYPRE_BigInt       *col_map_offd_Q = NULL;
-   HYPRE_Int          *map_P_to_Q=NULL;
-
-   hypre_CSRMatrix *Q_diag = NULL;
-
-   hypre_CSRMatrix *Q_offd = NULL;
-
-   HYPRE_Int        num_cols_offd_Q = 0;
-
-   hypre_CSRMatrix *Ps_ext;
-
-   hypre_CSRMatrix *Pext_diag;
-
-   hypre_CSRMatrix *Pext_offd;
-
-   hypre_CSRMatrix *AP_diag;
-   hypre_CSRMatrix *AP_offd;
-   HYPRE_Int        AP_offd_num_nonzeros;
-   HYPRE_Int       *AP_offd_j;
-   hypre_CSRMatrix *APext_diag;
-   hypre_CSRMatrix *APext_offd;
-
-   hypre_ParCSRCommPkg *comm_pkg_R = hypre_ParCSRMatrixCommPkg(R);
-
-   hypre_CSRMatrix *R_diag = hypre_ParCSRMatrixDiag(R);
-   hypre_CSRMatrix *RT_diag = NULL;
-
-   hypre_CSRMatrix *R_offd = hypre_ParCSRMatrixOffd(R);
-
-   HYPRE_Int    num_rows_diag_R = hypre_CSRMatrixNumRows(R_diag);
-   HYPRE_Int    num_cols_diag_R = hypre_CSRMatrixNumCols(R_diag);
-   HYPRE_Int    num_cols_offd_R = hypre_CSRMatrixNumCols(R_offd);
-
-   HYPRE_BigInt *col_starts_R = hypre_ParCSRMatrixColStarts(R);
-
-   hypre_ParCSRMatrix *C;
-   HYPRE_BigInt       *col_map_offd_C = NULL;
-   HYPRE_Int          *map_Q_to_C;
-
-   hypre_CSRMatrix *C_diag = NULL;
-
-   HYPRE_BigInt    first_col_diag_C;
-   HYPRE_BigInt    last_col_diag_C;
-
-   hypre_CSRMatrix *C_offd = NULL;
-
-   HYPRE_Int        num_cols_offd_C = 0;
-
-   HYPRE_Int        j_indx;
-
-   HYPRE_BigInt     n_rows_R, n_cols_R;
-   HYPRE_Int        num_procs, my_id;
-   HYPRE_BigInt     n_rows_A, n_cols_A;
-   HYPRE_BigInt     n_rows_P, n_cols_P;
-   HYPRE_Int        cnt, i;
-
-   n_rows_R = hypre_ParCSRMatrixGlobalNumRows(R);
-   n_cols_R = hypre_ParCSRMatrixGlobalNumCols(R);
-   n_rows_A = hypre_ParCSRMatrixGlobalNumRows(A);
-   n_cols_A = hypre_ParCSRMatrixGlobalNumCols(A);
-   n_rows_P = hypre_ParCSRMatrixGlobalNumRows(P);
-   n_cols_P = hypre_ParCSRMatrixGlobalNumCols(P);
-
-   hypre_MPI_Comm_size(comm,&num_procs);
+   hypre_MPI_Comm_size(comm, &num_procs);
    hypre_MPI_Comm_rank(comm, &my_id);
 
    if ( n_rows_R != n_rows_A || num_rows_diag_R != num_rows_diag_A ||
         n_cols_A != n_rows_P || num_cols_diag_A != num_rows_diag_P )
    {
-      hypre_error_w_msg(HYPRE_ERROR_GENERIC," Error! Incompatible matrix dimensions!\n");
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, " Error! Incompatible matrix dimensions!\n");
       return NULL;
    }
 
-
-   /*hypre_CSRMatrixTranspose(R_diag, &RT_diag, 1);*/
+   /* Compute RT_diag if necessary */
+   if (!hypre_ParCSRMatrixDiagT(R))
+   {
+      hypre_CSRMatrixTranspose(R_diag, &RT_diag, 1);
+   }
+   else
+   {
+      RT_diag = hypre_ParCSRMatrixDiagT(R);
+   }
 
    if (num_procs > 1)
    {
       HYPRE_BigInt     last_col_diag_P;
-      hypre_CSRMatrix *RT_offd = NULL;
       hypre_CSRMatrix *C_tmp_diag = NULL;
       hypre_CSRMatrix *C_tmp_offd = NULL;
       hypre_CSRMatrix *C_int = NULL;
@@ -603,11 +625,12 @@ hypre_ParCSRMatrixRAPKTHost( hypre_ParCSRMatrix *R,
       hypre_CSRMatrix *C_int_diag = NULL;
       hypre_CSRMatrix *C_int_offd = NULL;
 
-      HYPRE_Int   *C_tmp_offd_i;
-      HYPRE_Int   *C_tmp_offd_j;
+      HYPRE_Int       *C_tmp_offd_i;
+      HYPRE_Int       *C_tmp_offd_j;
+
+      HYPRE_Int       *send_map_elmts_R;
+      void            *request;
 
-      HYPRE_Int   *send_map_elmts_R;
-      void        *request;
       /*---------------------------------------------------------------------
        * If there exists no CommPkg for A, a CommPkg is generated using
        * equally load balanced partitionings within
@@ -617,7 +640,7 @@ hypre_ParCSRMatrixRAPKTHost( hypre_ParCSRMatrix *R,
                                                           which should be explicitly included to allow for overlap */
       if (num_cols_offd_A)
       {
-         last_col_diag_P = first_col_diag_P + num_cols_diag_P -1;
+         last_col_diag_P = first_col_diag_P + num_cols_diag_P - 1;
          hypre_CSRMatrixSplit(Ps_ext, first_col_diag_P, last_col_diag_P, num_cols_offd_P, col_map_offd_P,
                               &num_cols_offd_Q, &col_map_offd_Q, &Pext_diag, &Pext_offd);
          /* These require data from other processes */
@@ -631,25 +654,25 @@ hypre_ParCSRMatrixRAPKTHost( hypre_ParCSRMatrix *R,
       {
          num_cols_offd_Q = num_cols_offd_P;
          col_map_offd_Q = hypre_CTAlloc(HYPRE_BigInt, num_cols_offd_Q, HYPRE_MEMORY_HOST);
-         for (i=0; i < num_cols_offd_P; i++)
+         for (i = 0; i < num_cols_offd_P; i++)
          {
             col_map_offd_Q[i] = col_map_offd_P[i];
          }
       }
       hypre_CSRMatrixDestroy(Ps_ext);
+
       /* These are local and could be overlapped with communication */
       AP_diag = hypre_CSRMatrixMultiplyHost(A_diag, P_diag);
 
       if (num_cols_offd_P)
       {
-         HYPRE_Int i;
          AP_offd = hypre_CSRMatrixMultiplyHost(A_diag, P_offd);
          if (num_cols_offd_Q > num_cols_offd_P)
          {
-            map_P_to_Q = hypre_CTAlloc(HYPRE_Int,num_cols_offd_P, HYPRE_MEMORY_HOST);
+            map_P_to_Q = hypre_CTAlloc(HYPRE_Int, num_cols_offd_P, HYPRE_MEMORY_HOST);
 
             cnt = 0;
-            for (i=0; i < num_cols_offd_Q; i++)
+            for (i = 0; i < num_cols_offd_Q; i++)
             {
                if (col_map_offd_Q[i] == col_map_offd_P[cnt])
                {
@@ -662,7 +685,7 @@ hypre_ParCSRMatrixRAPKTHost( hypre_ParCSRMatrix *R,
             }
             AP_offd_num_nonzeros = hypre_CSRMatrixNumNonzeros(AP_offd);
             AP_offd_j = hypre_CSRMatrixJ(AP_offd);
-            for (i=0; i < AP_offd_num_nonzeros; i++)
+            for (i = 0; i < AP_offd_num_nonzeros; i++)
             {
                AP_offd_j[i] = map_P_to_Q[AP_offd_j[i]];
             }
@@ -712,7 +735,6 @@ hypre_ParCSRMatrixRAPKTHost( hypre_ParCSRMatrix *R,
       hypre_ParCSRMatrixOffd(Q) = Q_offd;
       hypre_ParCSRMatrixColMapOffd(Q) = col_map_offd_Q;
 
-      hypre_CSRMatrixTranspose(R_diag, &RT_diag, 1);
       C_tmp_diag = hypre_CSRMatrixMultiplyHost(RT_diag, Q_diag);
       if (num_cols_offd_Q)
       {
@@ -724,18 +746,18 @@ hypre_ParCSRMatrixRAPKTHost( hypre_ParCSRMatrix *R,
          hypre_CSRMatrixNumRows(C_tmp_offd) = num_cols_diag_R;
       }
 
-      if (keep_transpose)
-      {
-         R->diagT = RT_diag;
-      }
-      else
-      {
-         hypre_CSRMatrixDestroy(RT_diag);
-      }
-
       if (num_cols_offd_R)
       {
-         hypre_CSRMatrixTranspose(R_offd, &RT_offd, 1);
+         /* Compute RT_offd if necessary */
+         if (!hypre_ParCSRMatrixOffdT(R))
+         {
+            hypre_CSRMatrixTranspose(R_offd, &RT_offd, 1);
+         }
+         else
+         {
+            RT_offd = hypre_ParCSRMatrixOffdT(R);
+         }
+
          C_int_diag = hypre_CSRMatrixMultiplyHost(RT_offd, Q_diag);
          C_int_offd = hypre_CSRMatrixMultiplyHost(RT_offd, Q_offd);
 
@@ -747,7 +769,7 @@ hypre_ParCSRMatrixRAPKTHost( hypre_ParCSRMatrix *R,
       }
       else
       {
-         C_int = hypre_CSRMatrixCreate(0,0,0);
+         C_int = hypre_CSRMatrixCreate(0, 0, 0);
          hypre_CSRMatrixInitialize(C_int);
       }
 
@@ -760,13 +782,17 @@ hypre_ParCSRMatrixRAPKTHost( hypre_ParCSRMatrix *R,
       {
          hypre_CSRMatrixDestroy(C_int_diag);
          hypre_CSRMatrixDestroy(C_int_offd);
-         if (keep_transpose)
-         {
-            R->offdT = RT_offd;
-         }
-         else
+
+         if (!hypre_ParCSRMatrixOffdT(R))
          {
-            hypre_CSRMatrixDestroy(RT_offd);
+            if (keep_transpose)
+            {
+               hypre_ParCSRMatrixOffdT(R) = RT_offd;
+            }
+            else
+            {
+               hypre_CSRMatrixDestroy(RT_offd);
+            }
          }
       }
 
@@ -797,10 +823,10 @@ hypre_ParCSRMatrixRAPKTHost( hypre_ParCSRMatrix *R,
          C_tmp_offd_i = hypre_CSRMatrixI(C_tmp_offd);
          C_tmp_offd_j = hypre_CSRMatrixJ(C_tmp_offd);
 
-         map_Q_to_C = hypre_CTAlloc(HYPRE_Int,num_cols_offd_Q, HYPRE_MEMORY_HOST);
+         map_Q_to_C = hypre_CTAlloc(HYPRE_Int, num_cols_offd_Q, HYPRE_MEMORY_HOST);
 
          cnt = 0;
-         for (i=0; i < num_cols_offd_C; i++)
+         for (i = 0; i < num_cols_offd_C; i++)
          {
             if (col_map_offd_C[i] == col_map_offd_Q[cnt])
             {
@@ -811,7 +837,7 @@ hypre_ParCSRMatrixRAPKTHost( hypre_ParCSRMatrix *R,
                }
             }
          }
-         for (i=0; i < C_tmp_offd_i[hypre_CSRMatrixNumRows(C_tmp_offd)]; i++)
+         for (i = 0; i < C_tmp_offd_i[hypre_CSRMatrixNumRows(C_tmp_offd)]; i++)
          {
             j_indx = C_tmp_offd_j[i];
             C_tmp_offd_j[i] = map_Q_to_C[j_indx];
@@ -825,6 +851,7 @@ hypre_ParCSRMatrixRAPKTHost( hypre_ParCSRMatrix *R,
        *  Need to compute C_diag = C_tmp_diag + C_ext_diag
        *  and  C_offd = C_tmp_offd + C_ext_offd   !!!!
        *-----------------------------------------------------------------------*/
+
       send_map_elmts_R = hypre_ParCSRCommPkgSendMapElmts(comm_pkg_R);
       if (C_ext_diag)
       {
@@ -836,6 +863,7 @@ hypre_ParCSRMatrixRAPKTHost( hypre_ParCSRMatrix *R,
       {
          C_diag = C_tmp_diag;
       }
+
       if (C_ext_offd)
       {
          C_offd = hypre_CSRMatrixAddPartial(C_tmp_offd, C_ext_offd, send_map_elmts_R);
@@ -850,19 +878,22 @@ hypre_ParCSRMatrixRAPKTHost( hypre_ParCSRMatrix *R,
    else
    {
       Q_diag = hypre_CSRMatrixMultiplyHost(A_diag, P_diag);
-      hypre_CSRMatrixTranspose(R_diag, &RT_diag, 1);
       C_diag = hypre_CSRMatrixMultiplyHost(RT_diag, Q_diag);
       C_offd = hypre_CSRMatrixCreate(num_cols_diag_R, 0, 0);
       hypre_CSRMatrixInitialize_v2(C_offd, 0, hypre_CSRMatrixMemoryLocation(C_diag));
+      hypre_CSRMatrixDestroy(Q_diag);
+   }
+
+   if (!hypre_ParCSRMatrixDiagT(R))
+   {
       if (keep_transpose)
       {
-         R->diagT = RT_diag;
+         hypre_ParCSRMatrixDiagT(R) = RT_diag;
       }
       else
       {
          hypre_CSRMatrixDestroy(RT_diag);
       }
-      hypre_CSRMatrixDestroy(Q_diag);
    }
 
    C = hypre_ParCSRMatrixCreate(comm, n_cols_R, n_cols_P, col_starts_R,
@@ -894,19 +925,27 @@ hypre_ParCSRMatrixRAPKTHost( hypre_ParCSRMatrix *R,
    return C;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixRAPKT
+ *
+ * Computes "C = R * A * P".
+ *
+ * If either RT_diag or RT_offd don't exist and the flag keep_transpose is
+ * true, these local matrices are saved in the ParCSRMatrix R
+ *--------------------------------------------------------------------------*/
+
 hypre_ParCSRMatrix*
 hypre_ParCSRMatrixRAPKT( hypre_ParCSRMatrix  *R,
                          hypre_ParCSRMatrix  *A,
                          hypre_ParCSRMatrix  *P,
                          HYPRE_Int            keep_transpose)
 {
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-   hypre_GpuProfilingPushRange("TripleMat-RAP");
-#endif
-
    hypre_ParCSRMatrix *C = NULL;
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+   HYPRE_ANNOTATE_FUNC_BEGIN;
+   hypre_GpuProfilingPushRange("TripleMat-RAP");
+
+#if defined(HYPRE_USING_GPU)
    HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy2( hypre_ParCSRMatrixMemoryLocation(R),
                                                       hypre_ParCSRMatrixMemoryLocation(A) );
 
@@ -920,13 +959,19 @@ hypre_ParCSRMatrixRAPKT( hypre_ParCSRMatrix  *R,
       C = hypre_ParCSRMatrixRAPKTHost(R, A, P, keep_transpose);
    }
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    hypre_GpuProfilingPopRange();
-#endif
+   HYPRE_ANNOTATE_FUNC_END;
 
    return C;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_ParCSRMatrixRAP
+ *
+ * Computes "C = R * A * P" and discards the temporary local matrices generated
+ * in the algorithm (keep_transpose = 0).
+ *--------------------------------------------------------------------------*/
+
 hypre_ParCSRMatrix*
 hypre_ParCSRMatrixRAP( hypre_ParCSRMatrix *R,
                        hypre_ParCSRMatrix *A,
diff --git a/external/hypre/src/parcsr_mv/par_csr_triplemat_device.c b/external/hypre/src/parcsr_mv/par_csr_triplemat_device.c
index 7ec3238d..28e7ad86 100644
--- a/external/hypre/src/parcsr_mv/par_csr_triplemat_device.c
+++ b/external/hypre/src/parcsr_mv/par_csr_triplemat_device.c
@@ -1,20 +1,27 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
  ******************************************************************************/
 
+#include "_hypre_onedpl.hpp"
 #include "_hypre_parcsr_mv.h"
 #include "_hypre_utilities.hpp"
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#define PARCSRGEMM_TIMING 0
+
+#if defined(HYPRE_USING_GPU)
 
 /* option == 1, T = HYPRE_BigInt
  * option == 2, T = HYPRE_Int,
  */
 template<HYPRE_Int option, typename T>
+#if (defined(THRUST_VERSION) && THRUST_VERSION < 101000)
 struct RAP_functor : public thrust::unary_function<HYPRE_Int, T>
+#else
+struct RAP_functor
+#endif
 {
    HYPRE_Int num_col;
    T         first_col;
@@ -44,11 +51,11 @@ struct RAP_functor : public thrust::unary_function<HYPRE_Int, T>
 
       if (option == 1)
       {
-         return col_map[x-num_col];
+         return col_map[x - num_col];
       }
       else
       {
-         return col_map[x-num_col] + num_col;
+         return col_map[x - num_col] + num_col;
       }
    }
 };
@@ -65,7 +72,8 @@ hypre_ParCSRMatMatDevice( hypre_ParCSRMatrix  *A,
    HYPRE_BigInt       *col_map_offd_C = NULL;
 
    HYPRE_Int num_procs;
-   hypre_MPI_Comm_size(hypre_ParCSRMatrixComm(A), &num_procs);
+   MPI_Comm comm = hypre_ParCSRMatrixComm(A);
+   hypre_MPI_Comm_size(comm, &num_procs);
 
    if ( hypre_ParCSRMatrixGlobalNumCols(A) != hypre_ParCSRMatrixGlobalNumRows(B) ||
         hypre_ParCSRMatrixNumCols(A)       != hypre_ParCSRMatrixNumRows(B) )
@@ -75,6 +83,15 @@ hypre_ParCSRMatMatDevice( hypre_ParCSRMatrix  *A,
       return NULL;
    }
 
+#if PARCSRGEMM_TIMING > 0
+   HYPRE_Real ta, tb;
+   ta = hypre_MPI_Wtime();
+#endif
+
+#if PARCSRGEMM_TIMING > 1
+   HYPRE_Real t1, t2;
+#endif
+
    /*-----------------------------------------------------------------------
     *  Extract B_ext, i.e. portion of B that is stored on neighbor procs
     *  and needed locally for matrix matrix product
@@ -88,15 +105,50 @@ hypre_ParCSRMatMatDevice( hypre_ParCSRMatrix  *A,
        * equally load balanced partitionings within
        * hypre_ParCSRMatrixExtractBExt
        *--------------------------------------------------------------------*/
+
+#if PARCSRGEMM_TIMING > 1
+      t1 = hypre_MPI_Wtime();
+#endif
       /* contains communication which should be explicitly included to allow for overlap */
       hypre_ParCSRMatrixExtractBExtDeviceInit(B, A, 1, &request);
+#if PARCSRGEMM_TIMING > 1
+      t2 = hypre_MPI_Wtime();
+#endif
       Abar = hypre_ConcatDiagAndOffdDevice(A);
+#if PARCSRGEMM_TIMING > 1
+      hypre_ForceSyncComputeStream();
+      t2 = hypre_MPI_Wtime() - t2;
+      hypre_ParPrintf(comm, "Time Concat %f\n", t2);
+#endif
       Bext = hypre_ParCSRMatrixExtractBExtDeviceWait(request);
-
+#if PARCSRGEMM_TIMING > 1
+      hypre_ForceSyncComputeStream();
+      t2 = hypre_MPI_Wtime() - t1 - t2;
+      hypre_ParPrintf(comm, "Time Bext %f\n", t2);
+      hypre_ParPrintf(comm, "Size Bext %d %d %d\n", hypre_CSRMatrixNumRows(Bext),
+                      hypre_CSRMatrixNumCols(Bext), hypre_CSRMatrixNumNonzeros(Bext));
+#endif
+
+#if PARCSRGEMM_TIMING > 1
+      t1 = hypre_MPI_Wtime();
+#endif
       hypre_ConcatDiagOffdAndExtDevice(B, Bext, &Bbar, &num_cols_offd_C, &col_map_offd_C);
       hypre_CSRMatrixDestroy(Bext);
-
+#if PARCSRGEMM_TIMING > 1
+      hypre_ForceSyncComputeStream();
+      t2 = hypre_MPI_Wtime() - t1;
+      hypre_ParPrintf(comm, "Time Concat %f\n", t2);
+#endif
+
+#if PARCSRGEMM_TIMING > 1
+      t1 = hypre_MPI_Wtime();
+#endif
       Cbar = hypre_CSRMatrixMultiplyDevice(Abar, Bbar);
+#if PARCSRGEMM_TIMING > 1
+      hypre_ForceSyncComputeStream();
+      t2 = hypre_MPI_Wtime() - t1;
+      hypre_ParPrintf(comm, "Time SpGemm %f\n", t2);
+#endif
 
       hypre_CSRMatrixDestroy(Abar);
       hypre_CSRMatrixDestroy(Bbar);
@@ -105,14 +157,25 @@ hypre_ParCSRMatMatDevice( hypre_ParCSRMatrix  *A,
       hypre_assert(hypre_CSRMatrixNumCols(Cbar) == hypre_ParCSRMatrixNumCols(B) + num_cols_offd_C);
 
       // split into diag and offd
+#if PARCSRGEMM_TIMING > 1
+      t1 = hypre_MPI_Wtime();
+#endif
       in_range<HYPRE_Int> pred(0, hypre_ParCSRMatrixNumCols(B) - 1);
+#if defined(HYPRE_USING_SYCL)
+      HYPRE_Int nnz_C_diag = HYPRE_ONEDPL_CALL( std::count_if,
+                                                hypre_CSRMatrixJ(Cbar),
+                                                hypre_CSRMatrixJ(Cbar) + hypre_CSRMatrixNumNonzeros(Cbar),
+                                                pred );
+#else
       HYPRE_Int nnz_C_diag = HYPRE_THRUST_CALL( count_if,
                                                 hypre_CSRMatrixJ(Cbar),
                                                 hypre_CSRMatrixJ(Cbar) + hypre_CSRMatrixNumNonzeros(Cbar),
                                                 pred );
+#endif
       HYPRE_Int nnz_C_offd = hypre_CSRMatrixNumNonzeros(Cbar) - nnz_C_diag;
 
-      C_diag = hypre_CSRMatrixCreate(hypre_ParCSRMatrixNumRows(A), hypre_ParCSRMatrixNumCols(B), nnz_C_diag);
+      C_diag = hypre_CSRMatrixCreate(hypre_ParCSRMatrixNumRows(A), hypre_ParCSRMatrixNumCols(B),
+                                     nnz_C_diag);
       hypre_CSRMatrixInitialize_v2(C_diag, 0, HYPRE_MEMORY_DEVICE);
       HYPRE_Int     *C_diag_ii = hypre_TAlloc(HYPRE_Int, nnz_C_diag, HYPRE_MEMORY_DEVICE);
       HYPRE_Int     *C_diag_j = hypre_CSRMatrixJ(C_diag);
@@ -122,15 +185,29 @@ hypre_ParCSRMatMatDevice( hypre_ParCSRMatrix  *A,
                                                            hypre_CSRMatrixNumNonzeros(Cbar),
                                                            hypre_CSRMatrixI(Cbar));
 
+#if defined(HYPRE_USING_SYCL)
+      auto new_end = hypreSycl_copy_if( oneapi::dpl::make_zip_iterator(Cbar_ii, hypre_CSRMatrixJ(Cbar),
+                                                                       hypre_CSRMatrixData(Cbar)),
+                                        oneapi::dpl::make_zip_iterator(Cbar_ii, hypre_CSRMatrixJ(Cbar),
+                                                                       hypre_CSRMatrixData(Cbar)) + hypre_CSRMatrixNumNonzeros(Cbar),
+                                        hypre_CSRMatrixJ(Cbar),
+                                        oneapi::dpl::make_zip_iterator(C_diag_ii, C_diag_j, C_diag_a),
+                                        pred );
+      hypre_assert( std::get<0>(new_end.base()) == C_diag_ii + nnz_C_diag );
+#else
       auto new_end = HYPRE_THRUST_CALL(
-         copy_if,
-         thrust::make_zip_iterator(thrust::make_tuple(Cbar_ii, hypre_CSRMatrixJ(Cbar), hypre_CSRMatrixData(Cbar))),
-         thrust::make_zip_iterator(thrust::make_tuple(Cbar_ii, hypre_CSRMatrixJ(Cbar), hypre_CSRMatrixData(Cbar))) + hypre_CSRMatrixNumNonzeros(Cbar),
-         hypre_CSRMatrixJ(Cbar),
-         thrust::make_zip_iterator(thrust::make_tuple(C_diag_ii, C_diag_j, C_diag_a)),
-         pred );
+                        copy_if,
+                        thrust::make_zip_iterator(thrust::make_tuple(Cbar_ii, hypre_CSRMatrixJ(Cbar),
+                                                                     hypre_CSRMatrixData(Cbar))),
+                        thrust::make_zip_iterator(thrust::make_tuple(Cbar_ii, hypre_CSRMatrixJ(Cbar),
+                                                                     hypre_CSRMatrixData(Cbar))) + hypre_CSRMatrixNumNonzeros(Cbar),
+                        hypre_CSRMatrixJ(Cbar),
+                        thrust::make_zip_iterator(thrust::make_tuple(C_diag_ii, C_diag_j, C_diag_a)),
+                        pred );
       hypre_assert( thrust::get<0>(new_end.get_iterator_tuple()) == C_diag_ii + nnz_C_diag );
-      hypreDevice_CsrRowIndicesToPtrs_v2(hypre_CSRMatrixNumRows(C_diag), nnz_C_diag, C_diag_ii, hypre_CSRMatrixI(C_diag));
+#endif
+      hypreDevice_CsrRowIndicesToPtrs_v2(hypre_CSRMatrixNumRows(C_diag), nnz_C_diag, C_diag_ii,
+                                         hypre_CSRMatrixI(C_diag));
       hypre_TFree(C_diag_ii, HYPRE_MEMORY_DEVICE);
 
       C_offd = hypre_CSRMatrixCreate(hypre_ParCSRMatrixNumRows(A), num_cols_offd_C, nnz_C_offd);
@@ -138,30 +215,66 @@ hypre_ParCSRMatMatDevice( hypre_ParCSRMatrix  *A,
       HYPRE_Int     *C_offd_ii = hypre_TAlloc(HYPRE_Int, nnz_C_offd, HYPRE_MEMORY_DEVICE);
       HYPRE_Int     *C_offd_j = hypre_CSRMatrixJ(C_offd);
       HYPRE_Complex *C_offd_a = hypre_CSRMatrixData(C_offd);
+#if defined(HYPRE_USING_SYCL)
+      new_end = hypreSycl_copy_if( oneapi::dpl::make_zip_iterator(Cbar_ii, hypre_CSRMatrixJ(Cbar),
+                                                                  hypre_CSRMatrixData(Cbar)),
+                                   oneapi::dpl::make_zip_iterator(Cbar_ii, hypre_CSRMatrixJ(Cbar),
+                                                                  hypre_CSRMatrixData(Cbar)) + hypre_CSRMatrixNumNonzeros(Cbar),
+                                   hypre_CSRMatrixJ(Cbar),
+                                   oneapi::dpl::make_zip_iterator(C_offd_ii, C_offd_j, C_offd_a),
+                                   std::not_fn(pred) );
+      hypre_assert( std::get<0>(new_end.base()) == C_offd_ii + nnz_C_offd );
+#else
       new_end = HYPRE_THRUST_CALL(
-         copy_if,
-         thrust::make_zip_iterator(thrust::make_tuple(Cbar_ii, hypre_CSRMatrixJ(Cbar), hypre_CSRMatrixData(Cbar))),
-         thrust::make_zip_iterator(thrust::make_tuple(Cbar_ii, hypre_CSRMatrixJ(Cbar), hypre_CSRMatrixData(Cbar))) + hypre_CSRMatrixNumNonzeros(Cbar),
-         hypre_CSRMatrixJ(Cbar),
-         thrust::make_zip_iterator(thrust::make_tuple(C_offd_ii, C_offd_j, C_offd_a)),
-         thrust::not1(pred) );
+                   copy_if,
+                   thrust::make_zip_iterator(thrust::make_tuple(Cbar_ii, hypre_CSRMatrixJ(Cbar),
+                                                                hypre_CSRMatrixData(Cbar))),
+                   thrust::make_zip_iterator(thrust::make_tuple(Cbar_ii, hypre_CSRMatrixJ(Cbar),
+                                                                hypre_CSRMatrixData(Cbar))) + hypre_CSRMatrixNumNonzeros(Cbar),
+                   hypre_CSRMatrixJ(Cbar),
+                   thrust::make_zip_iterator(thrust::make_tuple(C_offd_ii, C_offd_j, C_offd_a)),
+                   HYPRE_THRUST_NOT(pred) );
       hypre_assert( thrust::get<0>(new_end.get_iterator_tuple()) == C_offd_ii + nnz_C_offd );
-      hypreDevice_CsrRowIndicesToPtrs_v2(hypre_CSRMatrixNumRows(C_offd), nnz_C_offd, C_offd_ii, hypre_CSRMatrixI(C_offd));
+#endif
+
+      hypreDevice_CsrRowIndicesToPtrs_v2(hypre_CSRMatrixNumRows(C_offd), nnz_C_offd, C_offd_ii,
+                                         hypre_CSRMatrixI(C_offd));
       hypre_TFree(C_offd_ii, HYPRE_MEMORY_DEVICE);
 
+#if defined(HYPRE_USING_SYCL)
+      HYPRE_ONEDPL_CALL( std::transform,
+                         C_offd_j,
+                         C_offd_j + nnz_C_offd,
+                         C_offd_j,
+      [const_val = hypre_ParCSRMatrixNumCols(B)] (const auto & x) {return x - const_val;} );
+#else
       HYPRE_THRUST_CALL( transform,
                          C_offd_j,
                          C_offd_j + nnz_C_offd,
                          thrust::make_constant_iterator(hypre_ParCSRMatrixNumCols(B)),
                          C_offd_j,
                          thrust::minus<HYPRE_Int>() );
+#endif
 
       hypre_TFree(Cbar_ii, HYPRE_MEMORY_DEVICE);
       hypre_CSRMatrixDestroy(Cbar);
+#if PARCSRGEMM_TIMING > 1
+      hypre_ForceSyncComputeStream();
+      t2 = hypre_MPI_Wtime() - t1;
+      hypre_ParPrintf(comm, "Time Split %f\n", t2);
+#endif
    }
    else
    {
+#if PARCSRGEMM_TIMING > 1
+      t1 = hypre_MPI_Wtime();
+#endif
       C_diag = hypre_CSRMatrixMultiplyDevice(hypre_ParCSRMatrixDiag(A), hypre_ParCSRMatrixDiag(B));
+#if PARCSRGEMM_TIMING > 1
+      hypre_ForceSyncComputeStream();
+      t2 = hypre_MPI_Wtime() - t1;
+      hypre_ParPrintf(comm, "Time SpGemm %f\n", t2);
+#endif
       C_offd = hypre_CSRMatrixCreate(hypre_ParCSRMatrixNumRows(A), 0, 0);
       hypre_CSRMatrixInitialize_v2(C_offd, 0, HYPRE_MEMORY_DEVICE);
    }
@@ -184,12 +297,16 @@ hypre_ParCSRMatMatDevice( hypre_ParCSRMatrix  *A,
    if (num_cols_offd_C)
    {
       hypre_ParCSRMatrixDeviceColMapOffd(C) = col_map_offd_C;
-
-      hypre_ParCSRMatrixColMapOffd(C) = hypre_TAlloc(HYPRE_BigInt, num_cols_offd_C, HYPRE_MEMORY_HOST);
-      hypre_TMemcpy(hypre_ParCSRMatrixColMapOffd(C), col_map_offd_C, HYPRE_BigInt, num_cols_offd_C,
-                    HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
    }
 
+   hypre_ParCSRMatrixCopyColMapOffdToHost(C);
+
+#if PARCSRGEMM_TIMING > 0
+   hypre_ForceSyncComputeStream();
+   tb = hypre_MPI_Wtime() - ta;
+   hypre_ParPrintf(comm, "Time hypre_ParCSRMatMatDevice %f\n", tb);
+#endif
+
    return C;
 }
 
@@ -209,17 +326,25 @@ hypre_ParCSRTMatMatKTDevice( hypre_ParCSRMatrix  *A,
    HYPRE_BigInt       *col_map_offd_C = NULL;
 
    HYPRE_Int num_procs;
-   hypre_MPI_Comm_size(hypre_ParCSRMatrixComm(A), &num_procs);
-   //HYPRE_Int my_id;
-   //hypre_MPI_Comm_rank(hypre_ParCSRMatrixComm(A), &my_id);
+   MPI_Comm comm = hypre_ParCSRMatrixComm(A);
+   hypre_MPI_Comm_size(comm, &num_procs);
 
    if (hypre_ParCSRMatrixGlobalNumRows(A) != hypre_ParCSRMatrixGlobalNumRows(B) ||
        hypre_ParCSRMatrixNumRows(A)       != hypre_ParCSRMatrixNumRows(B))
    {
-      hypre_error_w_msg(HYPRE_ERROR_GENERIC," Error! Incompatible matrix dimensions!\n");
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, " Error! Incompatible matrix dimensions!\n");
       return NULL;
    }
 
+#if PARCSRGEMM_TIMING > 0
+   HYPRE_Real ta, tb;
+   ta = hypre_MPI_Wtime();
+#endif
+
+#if PARCSRGEMM_TIMING > 1
+   HYPRE_Real t1, t2;
+#endif
+
    if (num_procs > 1)
    {
       void *request;
@@ -227,31 +352,99 @@ hypre_ParCSRTMatMatKTDevice( hypre_ParCSRMatrix  *A,
       hypre_CSRMatrix *B_offd = hypre_ParCSRMatrixOffd(B);
       HYPRE_Int local_nnz_Cbar;
 
+#if PARCSRGEMM_TIMING > 1
+      t1 = hypre_MPI_Wtime();
+#endif
       Bbar = hypre_ConcatDiagAndOffdDevice(B);
+#if PARCSRGEMM_TIMING > 1
+      hypre_ForceSyncComputeStream();
+      t2 = hypre_MPI_Wtime() - t1;
+      hypre_ParPrintf(comm, "Time Concat %f\n", t2);
+#endif
 
-      hypre_CSRMatrixTranspose(A_diag, &AT_diag, 1);
-      hypre_CSRMatrixTranspose(A_offd, &AT_offd, 1);
-      AbarT = hypre_CSRMatrixStack2Device(AT_diag, AT_offd);
+#if PARCSRGEMM_TIMING > 1
+      t1 = hypre_MPI_Wtime();
+#endif
 
-      if (keep_transpose)
+      if (hypre_ParCSRMatrixDiagT(A))
       {
-         hypre_ParCSRMatrixDiagT(A) = AT_diag;
-         hypre_ParCSRMatrixOffdT(A) = AT_offd;
+         AT_diag = hypre_ParCSRMatrixDiagT(A);
       }
       else
       {
-         hypre_CSRMatrixDestroy(AT_diag);
-         hypre_CSRMatrixDestroy(AT_offd);
+         hypre_CSRMatrixTranspose(A_diag, &AT_diag, 1);
+      }
+
+      if (hypre_ParCSRMatrixOffdT(A))
+      {
+         AT_offd = hypre_ParCSRMatrixOffdT(A);
+      }
+      else
+      {
+         hypre_CSRMatrixTranspose(A_offd, &AT_offd, 1);
       }
 
+#if PARCSRGEMM_TIMING > 1
+      hypre_ForceSyncComputeStream();
+      t2 = hypre_MPI_Wtime() - t1;
+      hypre_ParPrintf(comm, "Time Transpose %f\n", t2);
+#endif
+
+#if PARCSRGEMM_TIMING > 1
+      t1 = hypre_MPI_Wtime();
+#endif
+      AbarT = hypre_CSRMatrixStack2Device(AT_diag, AT_offd);
+#if PARCSRGEMM_TIMING > 1
+      hypre_ForceSyncComputeStream();
+      t2 = hypre_MPI_Wtime() - t1;
+      hypre_ParPrintf(comm, "Time Stack %f\n", t2);
+#endif
+
+      if (!hypre_ParCSRMatrixDiagT(A))
+      {
+         if (keep_transpose)
+         {
+            hypre_ParCSRMatrixDiagT(A) = AT_diag;
+         }
+         else
+         {
+            hypre_CSRMatrixDestroy(AT_diag);
+         }
+      }
+
+      if (!hypre_ParCSRMatrixOffdT(A))
+      {
+         if (keep_transpose)
+         {
+            hypre_ParCSRMatrixOffdT(A) = AT_offd;
+         }
+         else
+         {
+            hypre_CSRMatrixDestroy(AT_offd);
+         }
+      }
+
+#if PARCSRGEMM_TIMING > 1
+      t1 = hypre_MPI_Wtime();
+#endif
       Cbar = hypre_CSRMatrixMultiplyDevice(AbarT, Bbar);
+#if PARCSRGEMM_TIMING > 1
+      hypre_ForceSyncComputeStream();
+      t2 = hypre_MPI_Wtime() - t1;
+      hypre_ParPrintf(comm, "Time SpGemm %f\n", t2);
+#endif
 
       hypre_CSRMatrixDestroy(AbarT);
       hypre_CSRMatrixDestroy(Bbar);
 
-      hypre_assert(hypre_CSRMatrixNumRows(Cbar) == hypre_ParCSRMatrixNumCols(A) + hypre_CSRMatrixNumCols(A_offd));
-      hypre_assert(hypre_CSRMatrixNumCols(Cbar) == hypre_ParCSRMatrixNumCols(B) + hypre_CSRMatrixNumCols(B_offd));
+      hypre_assert(hypre_CSRMatrixNumRows(Cbar) == hypre_ParCSRMatrixNumCols(A) + hypre_CSRMatrixNumCols(
+                      A_offd));
+      hypre_assert(hypre_CSRMatrixNumCols(Cbar) == hypre_ParCSRMatrixNumCols(B) + hypre_CSRMatrixNumCols(
+                      B_offd));
 
+#if PARCSRGEMM_TIMING > 1
+      t1 = hypre_MPI_Wtime();
+#endif
       hypre_TMemcpy(&local_nnz_Cbar, hypre_CSRMatrixI(Cbar) + hypre_ParCSRMatrixNumCols(A), HYPRE_Int, 1,
                     HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
 
@@ -262,26 +455,62 @@ hypre_ParCSRTMatMatKTDevice( hypre_ParCSRMatrix  *A,
       hypre_CSRMatrixOwnsData(Cint) = 0;
 
       hypre_CSRMatrixI(Cint) = hypre_CSRMatrixI(Cbar) + hypre_ParCSRMatrixNumCols(A);
+#if defined(HYPRE_USING_SYCL)
+      HYPRE_ONEDPL_CALL( std::transform,
+                         hypre_CSRMatrixI(Cint),
+                         hypre_CSRMatrixI(Cint) + hypre_CSRMatrixNumRows(Cint) + 1,
+                         hypre_CSRMatrixI(Cint),
+      [const_val = local_nnz_Cbar] (const auto & x) {return x - const_val;} );
+#else
       HYPRE_THRUST_CALL( transform,
                          hypre_CSRMatrixI(Cint),
                          hypre_CSRMatrixI(Cint) + hypre_CSRMatrixNumRows(Cint) + 1,
                          thrust::make_constant_iterator(local_nnz_Cbar),
                          hypre_CSRMatrixI(Cint),
                          thrust::minus<HYPRE_Int>() );
+#endif
 
-      hypre_CSRMatrixBigJ(Cint) = hypre_TAlloc(HYPRE_BigInt, hypre_CSRMatrixNumNonzeros(Cint), HYPRE_MEMORY_DEVICE);
+      // Change Cint into a BigJ matrix
+      // RL: TODO FIX the 'big' num of columns to global size
+      hypre_CSRMatrixBigJ(Cint) = hypre_TAlloc(HYPRE_BigInt, hypre_CSRMatrixNumNonzeros(Cint),
+                                               HYPRE_MEMORY_DEVICE);
 
       RAP_functor<1, HYPRE_BigInt> func1( hypre_ParCSRMatrixNumCols(B),
                                           hypre_ParCSRMatrixFirstColDiag(B),
                                           hypre_ParCSRMatrixDeviceColMapOffd(B) );
+#if defined(HYPRE_USING_SYCL)
+      HYPRE_ONEDPL_CALL( std::transform,
+                         hypre_CSRMatrixJ(Cbar) + local_nnz_Cbar,
+                         hypre_CSRMatrixJ(Cbar) + hypre_CSRMatrixNumNonzeros(Cbar),
+                         hypre_CSRMatrixBigJ(Cint),
+                         func1 );
+#else
       HYPRE_THRUST_CALL( transform,
                          hypre_CSRMatrixJ(Cbar) + local_nnz_Cbar,
                          hypre_CSRMatrixJ(Cbar) + hypre_CSRMatrixNumNonzeros(Cbar),
                          hypre_CSRMatrixBigJ(Cint),
                          func1 );
+#endif
+
+#if defined(HYPRE_USING_THRUST_NOSYNC)
+      /* RL: make sure Cint is ready before issuing GPU-GPU MPI */
+      if (hypre_GetGpuAwareMPI())
+      {
+         hypre_ForceSyncComputeStream();
+      }
+#endif
 
       hypre_CSRMatrixData(Cint) = hypre_CSRMatrixData(Cbar) + local_nnz_Cbar;
 
+#if PARCSRGEMM_TIMING > 1
+      hypre_ForceSyncComputeStream();
+      t2 = hypre_MPI_Wtime() - t1;
+      hypre_ParPrintf(comm, "Time Cint %f\n", t2);
+#endif
+
+#if PARCSRGEMM_TIMING > 1
+      t1 = hypre_MPI_Wtime();
+#endif
       hypre_ExchangeExternalRowsDeviceInit(Cint, hypre_ParCSRMatrixCommPkg(A), 1, &request);
       Cext = hypre_ExchangeExternalRowsDeviceWait(request);
 
@@ -290,156 +519,52 @@ hypre_ParCSRTMatMatKTDevice( hypre_ParCSRMatrix  *A,
 
       hypre_TMemcpy(hypre_CSRMatrixI(Cbar) + hypre_ParCSRMatrixNumCols(A), &local_nnz_Cbar, HYPRE_Int, 1,
                     HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
-
-      // to hold Cbar local and Cext
-      HYPRE_Int      tmp_s = local_nnz_Cbar + hypre_CSRMatrixNumNonzeros(Cext);
-      HYPRE_Int     *tmp_i = hypre_TAlloc(HYPRE_Int,     tmp_s, HYPRE_MEMORY_DEVICE);
-      HYPRE_Int     *tmp_j = hypre_TAlloc(HYPRE_Int,     tmp_s, HYPRE_MEMORY_DEVICE);
-      HYPRE_Complex *tmp_a = hypre_TAlloc(HYPRE_Complex, tmp_s, HYPRE_MEMORY_DEVICE);
-      HYPRE_Int      Cext_diag_nnz, Cext_offd_nnz, *offd_map_to_C;
-
-      hypre_CSRMatrixSplitDevice_core(0,
-                                      hypre_CSRMatrixNumRows(Cext),
-                                      hypre_CSRMatrixNumNonzeros(Cext),
-                                      NULL,
-                                      hypre_CSRMatrixBigJ(Cext), NULL, NULL,
-                                      hypre_ParCSRMatrixFirstColDiag(B),
-                                      hypre_ParCSRMatrixLastColDiag(B),
-                                      hypre_CSRMatrixNumCols(B_offd),
-                                      NULL, NULL, NULL, NULL,
-                                      &Cext_diag_nnz,
-                                      NULL, NULL, NULL, NULL,
-                                      &Cext_offd_nnz,
-                                      NULL, NULL, NULL, NULL);
-
-      HYPRE_Int *Cext_ii = hypreDevice_CsrRowPtrsToIndices(hypre_CSRMatrixNumRows(Cext), hypre_CSRMatrixNumNonzeros(Cext),
-                                                           hypre_CSRMatrixI(Cext));
-
-      hypre_CSRMatrixSplitDevice_core(1,
-                                      hypre_CSRMatrixNumRows(Cext),
-                                      hypre_CSRMatrixNumNonzeros(Cext),
-                                      Cext_ii,
-                                      hypre_CSRMatrixBigJ(Cext),
-                                      hypre_CSRMatrixData(Cext),
-                                      NULL,
-                                      hypre_ParCSRMatrixFirstColDiag(B),
-                                      hypre_ParCSRMatrixLastColDiag(B),
-                                      hypre_CSRMatrixNumCols(B_offd),
-                                      hypre_ParCSRMatrixDeviceColMapOffd(B),
-                                      &offd_map_to_C,
-                                      &num_cols_offd_C,
-                                      &col_map_offd_C,
-                                      &Cext_diag_nnz,
-                                      tmp_i + local_nnz_Cbar,
-                                      tmp_j + local_nnz_Cbar,
-                                      tmp_a + local_nnz_Cbar,
-                                      NULL,
-                                      &Cext_offd_nnz,
-                                      tmp_i + local_nnz_Cbar + Cext_diag_nnz,
-                                      tmp_j + local_nnz_Cbar + Cext_diag_nnz,
-                                      tmp_a + local_nnz_Cbar + Cext_diag_nnz,
-                                      NULL);
-
-      hypre_CSRMatrixDestroy(Cext);
-      hypre_TFree(Cext_ii, HYPRE_MEMORY_DEVICE);
-
-      hypre_ParCSRCommPkgCopySendMapElmtsToDevice(hypre_ParCSRMatrixCommPkg(A));
-
-      HYPRE_THRUST_CALL( gather,
-                         tmp_i + local_nnz_Cbar,
-                         tmp_i + tmp_s,
-                         hypre_ParCSRCommPkgDeviceSendMapElmts(hypre_ParCSRMatrixCommPkg(A)),
-                         tmp_i + local_nnz_Cbar );
-
-      HYPRE_THRUST_CALL( transform,
-                         tmp_j + local_nnz_Cbar + Cext_diag_nnz,
-                         tmp_j + tmp_s,
-                         thrust::make_constant_iterator(hypre_ParCSRMatrixNumCols(B)),
-                         tmp_j + local_nnz_Cbar + Cext_diag_nnz,
-                         thrust::plus<HYPRE_Int>() );
-
-      hypreDevice_CsrRowPtrsToIndices_v2(hypre_ParCSRMatrixNumCols(A), local_nnz_Cbar, hypre_CSRMatrixI(Cbar), tmp_i);
-      hypre_TMemcpy(tmp_a, hypre_CSRMatrixData(Cbar), HYPRE_Complex, local_nnz_Cbar, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
-      RAP_functor<2, HYPRE_Int> func2(hypre_ParCSRMatrixNumCols(B), 0, offd_map_to_C);
-      HYPRE_THRUST_CALL( transform,
-                         hypre_CSRMatrixJ(Cbar),
-                         hypre_CSRMatrixJ(Cbar) + local_nnz_Cbar,
-                         tmp_j,
-                         func2 );
-
-      hypre_CSRMatrixDestroy(Cbar);
-      hypre_TFree(offd_map_to_C, HYPRE_MEMORY_DEVICE);
-
-      // add Cext to Cbar local. Note: type 2, diagonal entries are put at the first in the rows
-      hypreDevice_StableSortByTupleKey(tmp_s, tmp_i, tmp_j, tmp_a, 2);
-
-      HYPRE_Int     *zmp_i = hypre_TAlloc(HYPRE_Int,     tmp_s, HYPRE_MEMORY_DEVICE);
-      HYPRE_Int     *zmp_j = hypre_TAlloc(HYPRE_Int,     tmp_s, HYPRE_MEMORY_DEVICE);
-      HYPRE_Complex *zmp_a = hypre_TAlloc(HYPRE_Complex, tmp_s, HYPRE_MEMORY_DEVICE);
-
-      HYPRE_Int local_nnz_C = hypreDevice_ReduceByTupleKey(tmp_s, tmp_i, tmp_j, tmp_a, zmp_i, zmp_j, zmp_a);
-
-      hypre_TFree(tmp_i, HYPRE_MEMORY_DEVICE);
-      hypre_TFree(tmp_j, HYPRE_MEMORY_DEVICE);
-      hypre_TFree(tmp_a, HYPRE_MEMORY_DEVICE);
-
-      // split into diag and offd
-      in_range<HYPRE_Int> pred(0, hypre_ParCSRMatrixNumCols(B) - 1);
-
-      HYPRE_Int nnz_C_diag = HYPRE_THRUST_CALL( count_if,
-                                                zmp_j,
-                                                zmp_j + local_nnz_C,
-                                                pred );
-      HYPRE_Int nnz_C_offd = local_nnz_C - nnz_C_diag;
-
-      C_diag = hypre_CSRMatrixCreate(hypre_ParCSRMatrixNumCols(A), hypre_ParCSRMatrixNumCols(B), nnz_C_diag);
-      hypre_CSRMatrixInitialize_v2(C_diag, 0, HYPRE_MEMORY_DEVICE);
-      HYPRE_Int     *C_diag_ii = hypre_TAlloc(HYPRE_Int, nnz_C_diag, HYPRE_MEMORY_DEVICE);
-      HYPRE_Int     *C_diag_j = hypre_CSRMatrixJ(C_diag);
-      HYPRE_Complex *C_diag_a = hypre_CSRMatrixData(C_diag);
-
-      auto new_end = HYPRE_THRUST_CALL( copy_if,
-                                        thrust::make_zip_iterator(thrust::make_tuple(zmp_i, zmp_j, zmp_a)),
-                                        thrust::make_zip_iterator(thrust::make_tuple(zmp_i, zmp_j, zmp_a)) + local_nnz_C,
-                                        zmp_j,
-                                        thrust::make_zip_iterator(thrust::make_tuple(C_diag_ii, C_diag_j, C_diag_a)),
-                                        pred );
-      hypre_assert( thrust::get<0>(new_end.get_iterator_tuple()) == C_diag_ii + nnz_C_diag );
-      hypreDevice_CsrRowIndicesToPtrs_v2(hypre_CSRMatrixNumRows(C_diag), nnz_C_diag, C_diag_ii, hypre_CSRMatrixI(C_diag));
-      hypre_TFree(C_diag_ii, HYPRE_MEMORY_DEVICE);
-
-      C_offd = hypre_CSRMatrixCreate(hypre_ParCSRMatrixNumCols(A), num_cols_offd_C, nnz_C_offd);
-      hypre_CSRMatrixInitialize_v2(C_offd, 0, HYPRE_MEMORY_DEVICE);
-      HYPRE_Int     *C_offd_ii = hypre_TAlloc(HYPRE_Int, nnz_C_offd, HYPRE_MEMORY_DEVICE);
-      HYPRE_Int     *C_offd_j = hypre_CSRMatrixJ(C_offd);
-      HYPRE_Complex *C_offd_a = hypre_CSRMatrixData(C_offd);
-      new_end = HYPRE_THRUST_CALL( copy_if,
-                                   thrust::make_zip_iterator(thrust::make_tuple(zmp_i, zmp_j, zmp_a)),
-                                   thrust::make_zip_iterator(thrust::make_tuple(zmp_i, zmp_j, zmp_a)) + local_nnz_C,
-                                   zmp_j,
-                                   thrust::make_zip_iterator(thrust::make_tuple(C_offd_ii, C_offd_j, C_offd_a)),
-                                   thrust::not1(pred) );
-      hypre_assert( thrust::get<0>(new_end.get_iterator_tuple()) == C_offd_ii + nnz_C_offd );
-      hypreDevice_CsrRowIndicesToPtrs_v2(hypre_CSRMatrixNumRows(C_offd), nnz_C_offd, C_offd_ii, hypre_CSRMatrixI(C_offd));
-      hypre_TFree(C_offd_ii, HYPRE_MEMORY_DEVICE);
-
-      HYPRE_THRUST_CALL( transform,
-                         C_offd_j,
-                         C_offd_j + nnz_C_offd,
-                         thrust::make_constant_iterator(hypre_ParCSRMatrixNumCols(B)),
-                         C_offd_j,
-                         thrust::minus<HYPRE_Int>() );
-
-      hypre_TFree(zmp_i, HYPRE_MEMORY_DEVICE);
-      hypre_TFree(zmp_j, HYPRE_MEMORY_DEVICE);
-      hypre_TFree(zmp_a, HYPRE_MEMORY_DEVICE);
+#if PARCSRGEMM_TIMING > 1
+      hypre_ForceSyncComputeStream();
+      t2 = hypre_MPI_Wtime() - t1;
+      hypre_ParPrintf(comm, "Time Cext %f\n", t2);
+      hypre_ParPrintf(comm, "Size Cext %d %d %d\n", hypre_CSRMatrixNumRows(Cext),
+                      hypre_CSRMatrixNumCols(Cext), hypre_CSRMatrixNumNonzeros(Cext));
+#endif
+
+      /* add Cext to local part of Cbar */
+      hypre_ParCSRTMatMatPartialAddDevice(hypre_ParCSRMatrixCommPkg(A),
+                                          hypre_ParCSRMatrixNumCols(A),
+                                          hypre_ParCSRMatrixNumCols(B),
+                                          hypre_ParCSRMatrixFirstColDiag(B),
+                                          hypre_ParCSRMatrixLastColDiag(B),
+                                          hypre_CSRMatrixNumCols(B_offd),
+                                          hypre_ParCSRMatrixDeviceColMapOffd(B),
+                                          local_nnz_Cbar,
+                                          Cbar,
+                                          Cext,
+                                          &C_diag,
+                                          &C_offd,
+                                          &num_cols_offd_C,
+                                          &col_map_offd_C);
    }
    else
    {
       hypre_CSRMatrix *AT_diag;
       hypre_CSRMatrix *B_diag = hypre_ParCSRMatrixDiag(B);
+#if PARCSRGEMM_TIMING > 1
+      t1 = hypre_MPI_Wtime();
+#endif
       hypre_CSRMatrixTransposeDevice(A_diag, &AT_diag, 1);
+#if PARCSRGEMM_TIMING > 1
+      hypre_ForceSyncComputeStream();
+      t2 = hypre_MPI_Wtime() - t1;
+      hypre_ParPrintf(comm, "Time Transpose %f\n", t2);
+#endif
+#if PARCSRGEMM_TIMING > 1
+      t1 = hypre_MPI_Wtime();
+#endif
       C_diag = hypre_CSRMatrixMultiplyDevice(AT_diag, B_diag);
+#if PARCSRGEMM_TIMING > 1
+      hypre_ForceSyncComputeStream();
+      t2 = hypre_MPI_Wtime() - t1;
+      hypre_ParPrintf(comm, "Time SpGemm %f\n", t2);
+#endif
       C_offd = hypre_CSRMatrixCreate(hypre_ParCSRMatrixNumCols(A), 0, 0);
       hypre_CSRMatrixInitialize_v2(C_offd, 0, HYPRE_MEMORY_DEVICE);
       if (keep_transpose)
@@ -450,10 +575,11 @@ hypre_ParCSRTMatMatKTDevice( hypre_ParCSRMatrix  *A,
       {
          hypre_CSRMatrixDestroy(AT_diag);
       }
-      /* Move the diagonal entry to the first of each row */
-      hypre_CSRMatrixMoveDiagFirstDevice(C_diag);
    }
 
+   /* Move the diagonal entry to the first of each row */
+   hypre_CSRMatrixMoveDiagFirstDevice(C_diag);
+
    C = hypre_ParCSRMatrixCreate(hypre_ParCSRMatrixComm(A),
                                 hypre_ParCSRMatrixGlobalNumCols(A),
                                 hypre_ParCSRMatrixGlobalNumCols(B),
@@ -469,23 +595,25 @@ hypre_ParCSRTMatMatKTDevice( hypre_ParCSRMatrix  *A,
    hypre_CSRMatrixDestroy(hypre_ParCSRMatrixOffd(C));
    hypre_ParCSRMatrixOffd(C) = C_offd;
 
-   if (num_cols_offd_C)
-   {
-      hypre_ParCSRMatrixDeviceColMapOffd(C) = col_map_offd_C;
+   hypre_ParCSRMatrixDeviceColMapOffd(C) = col_map_offd_C;
 
-      hypre_ParCSRMatrixColMapOffd(C) = hypre_TAlloc(HYPRE_BigInt, num_cols_offd_C, HYPRE_MEMORY_HOST);
-      hypre_TMemcpy(hypre_ParCSRMatrixColMapOffd(C), col_map_offd_C, HYPRE_BigInt, num_cols_offd_C,
-                    HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
-   }
+   hypre_ParCSRMatrixCompressOffdMapDevice(C);
+
+   hypre_ParCSRMatrixCopyColMapOffdToHost(C);
 
    hypre_assert(!hypre_CSRMatrixCheckDiagFirstDevice(hypre_ParCSRMatrixDiag(C)));
 
-   hypre_SyncCudaComputeStream(hypre_handle());
+   hypre_SyncComputeStream();
+
+#if PARCSRGEMM_TIMING > 0
+   hypre_ForceSyncComputeStream();
+   tb = hypre_MPI_Wtime() - ta;
+   hypre_ParPrintf(comm, "Time hypre_ParCSRTMatMatKTDevice %f\n", tb);
+#endif
 
    return C;
 }
 
-
 /* C = R^{T} * A * P */
 hypre_ParCSRMatrix*
 hypre_ParCSRMatrixRAPKTDevice( hypre_ParCSRMatrix *R,
@@ -493,19 +621,19 @@ hypre_ParCSRMatrixRAPKTDevice( hypre_ParCSRMatrix *R,
                                hypre_ParCSRMatrix *P,
                                HYPRE_Int           keep_transpose )
 {
-   hypre_CSRMatrix *R_diag = hypre_ParCSRMatrixDiag(R);
-   hypre_CSRMatrix *R_offd = hypre_ParCSRMatrixOffd(R);
+   MPI_Comm             comm   = hypre_ParCSRMatrixComm(A);
+   hypre_CSRMatrix     *R_diag = hypre_ParCSRMatrixDiag(R);
+   hypre_CSRMatrix     *R_offd = hypre_ParCSRMatrixOffd(R);
 
-   hypre_ParCSRMatrix *C;
-   hypre_CSRMatrix    *C_diag;
-   hypre_CSRMatrix    *C_offd;
-   HYPRE_Int           num_cols_offd_C = 0;
-   HYPRE_BigInt       *col_map_offd_C = NULL;
+   hypre_ParCSRMatrix  *C;
+   hypre_CSRMatrix     *C_diag;
+   hypre_CSRMatrix     *C_offd;
+   HYPRE_Int            num_cols_offd_C = 0;
+   HYPRE_BigInt        *col_map_offd_C = NULL;
 
-   HYPRE_Int num_procs;
-   hypre_MPI_Comm_size(hypre_ParCSRMatrixComm(A), &num_procs);
-   //HYPRE_Int my_id;
-   //hypre_MPI_Comm_rank(hypre_ParCSRMatrixComm(A), &my_id);
+   HYPRE_Int            num_procs;
+
+   hypre_MPI_Comm_size(comm, &num_procs);
 
    if ( hypre_ParCSRMatrixGlobalNumRows(R) != hypre_ParCSRMatrixGlobalNumRows(A) ||
         hypre_ParCSRMatrixGlobalNumCols(A) != hypre_ParCSRMatrixGlobalNumRows(P) )
@@ -534,19 +662,48 @@ hypre_ParCSRMatrixRAPKTDevice( hypre_ParCSRMatrix *R,
 
       Abar = hypre_ConcatDiagAndOffdDevice(A);
 
-      hypre_CSRMatrixTransposeDevice(R_diag, &R_diagT, 1);
-      hypre_CSRMatrixTransposeDevice(R_offd, &R_offdT, 1);
-      RbarT = hypre_CSRMatrixStack2Device(R_diagT, R_offdT);
+      if (hypre_ParCSRMatrixDiagT(R))
+      {
+         R_diagT = hypre_ParCSRMatrixDiagT(R);
+      }
+      else
+      {
+         hypre_CSRMatrixTransposeDevice(R_diag, &R_diagT, 1);
+      }
 
-      if (keep_transpose)
+      if (hypre_ParCSRMatrixOffdT(R))
       {
-         hypre_ParCSRMatrixDiagT(R) = R_diagT;
-         hypre_ParCSRMatrixOffdT(R) = R_offdT;
+         R_offdT = hypre_ParCSRMatrixOffdT(R);
       }
       else
       {
-         hypre_CSRMatrixDestroy(R_diagT);
-         hypre_CSRMatrixDestroy(R_offdT);
+         hypre_CSRMatrixTransposeDevice(R_offd, &R_offdT, 1);
+      }
+
+      RbarT = hypre_CSRMatrixStack2Device(R_diagT, R_offdT);
+
+      if (!hypre_ParCSRMatrixDiagT(R))
+      {
+         if (keep_transpose)
+         {
+            hypre_ParCSRMatrixDiagT(R) = R_diagT;
+         }
+         else
+         {
+            hypre_CSRMatrixDestroy(R_diagT);
+         }
+      }
+
+      if (!hypre_ParCSRMatrixOffdT(R))
+      {
+         if (keep_transpose)
+         {
+            hypre_ParCSRMatrixOffdT(R) = R_offdT;
+         }
+         else
+         {
+            hypre_CSRMatrixDestroy(R_offdT);
+         }
       }
 
       Pext = hypre_ParCSRMatrixExtractBExtDeviceWait(request);
@@ -559,11 +716,14 @@ hypre_ParCSRMatrixRAPKTDevice( hypre_ParCSRMatrix *R,
       hypre_CSRMatrixDestroy(Abar);
       hypre_CSRMatrixDestroy(Pbar);
 
-      hypre_assert(hypre_CSRMatrixNumRows(Cbar) == hypre_ParCSRMatrixNumCols(R) + hypre_CSRMatrixNumCols(R_offd));
-      hypre_assert(hypre_CSRMatrixNumCols(Cbar) == hypre_ParCSRMatrixNumCols(P) + num_cols_offd);
+      hypre_assert(hypre_CSRMatrixNumRows(Cbar) ==
+                   hypre_ParCSRMatrixNumCols(R) + hypre_CSRMatrixNumCols(R_offd));
+      hypre_assert(hypre_CSRMatrixNumCols(Cbar) ==
+                   hypre_ParCSRMatrixNumCols(P) + num_cols_offd);
 
-      hypre_TMemcpy(&local_nnz_Cbar, hypre_CSRMatrixI(Cbar) + hypre_ParCSRMatrixNumCols(R), HYPRE_Int, 1,
-                    HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
+      hypre_TMemcpy(&local_nnz_Cbar,
+                    hypre_CSRMatrixI(Cbar) + hypre_ParCSRMatrixNumCols(R),
+                    HYPRE_Int, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
 
       // Cint is the bottom part of Cbar
       Cint = hypre_CSRMatrixCreate(hypre_CSRMatrixNumCols(R_offd), hypre_CSRMatrixNumCols(Cbar),
@@ -572,21 +732,51 @@ hypre_ParCSRMatrixRAPKTDevice( hypre_ParCSRMatrix *R,
       hypre_CSRMatrixOwnsData(Cint) = 0;
 
       hypre_CSRMatrixI(Cint) = hypre_CSRMatrixI(Cbar) + hypre_ParCSRMatrixNumCols(R);
+#if defined(HYPRE_USING_SYCL)
+      HYPRE_ONEDPL_CALL( std::transform,
+                         hypre_CSRMatrixI(Cint),
+                         hypre_CSRMatrixI(Cint) + hypre_CSRMatrixNumRows(Cint) + 1,
+                         hypre_CSRMatrixI(Cint),
+      [const_val = local_nnz_Cbar] (const auto & x) {return x - const_val;} );
+#else
       HYPRE_THRUST_CALL( transform,
                          hypre_CSRMatrixI(Cint),
                          hypre_CSRMatrixI(Cint) + hypre_CSRMatrixNumRows(Cint) + 1,
                          thrust::make_constant_iterator(local_nnz_Cbar),
                          hypre_CSRMatrixI(Cint),
                          thrust::minus<HYPRE_Int>() );
-
-      hypre_CSRMatrixBigJ(Cint) = hypre_TAlloc(HYPRE_BigInt, hypre_CSRMatrixNumNonzeros(Cint), HYPRE_MEMORY_DEVICE);
-
-      RAP_functor<1, HYPRE_BigInt> func1(hypre_ParCSRMatrixNumCols(P), hypre_ParCSRMatrixFirstColDiag(P), col_map_offd);
+#endif
+
+      // Change Cint into a BigJ matrix
+      // RL: TODO FIX the 'big' num of columns to global size
+      hypre_CSRMatrixBigJ(Cint) = hypre_TAlloc(HYPRE_BigInt,
+                                               hypre_CSRMatrixNumNonzeros(Cint),
+                                               HYPRE_MEMORY_DEVICE);
+
+      RAP_functor<1, HYPRE_BigInt> func1(hypre_ParCSRMatrixNumCols(P),
+                                         hypre_ParCSRMatrixFirstColDiag(P),
+                                         col_map_offd);
+#if defined(HYPRE_USING_SYCL)
+      HYPRE_ONEDPL_CALL( std::transform,
+                         hypre_CSRMatrixJ(Cbar) + local_nnz_Cbar,
+                         hypre_CSRMatrixJ(Cbar) + hypre_CSRMatrixNumNonzeros(Cbar),
+                         hypre_CSRMatrixBigJ(Cint),
+                         func1 );
+#else
       HYPRE_THRUST_CALL( transform,
                          hypre_CSRMatrixJ(Cbar) + local_nnz_Cbar,
                          hypre_CSRMatrixJ(Cbar) + hypre_CSRMatrixNumNonzeros(Cbar),
                          hypre_CSRMatrixBigJ(Cint),
                          func1 );
+#endif
+
+#if defined(HYPRE_USING_THRUST_NOSYNC)
+      /* RL: make sure Cint is ready before issuing GPU-GPU MPI */
+      if (hypre_GetGpuAwareMPI())
+      {
+         hypre_ForceSyncComputeStream();
+      }
+#endif
 
       hypre_CSRMatrixData(Cint) = hypre_CSRMatrixData(Cbar) + local_nnz_Cbar;
 
@@ -596,172 +786,60 @@ hypre_ParCSRMatrixRAPKTDevice( hypre_ParCSRMatrix *R,
       hypre_TFree(hypre_CSRMatrixBigJ(Cint), HYPRE_MEMORY_DEVICE);
       hypre_TFree(Cint, HYPRE_MEMORY_HOST);
 
-      hypre_TMemcpy(hypre_CSRMatrixI(Cbar) + hypre_ParCSRMatrixNumCols(R), &local_nnz_Cbar, HYPRE_Int, 1,
+      hypre_TMemcpy(hypre_CSRMatrixI(Cbar) + hypre_ParCSRMatrixNumCols(R),
+                    &local_nnz_Cbar, HYPRE_Int, 1,
                     HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
 
-      // to hold Cbar local and Cext
-      HYPRE_Int      tmp_s = local_nnz_Cbar + hypre_CSRMatrixNumNonzeros(Cext);
-      HYPRE_Int     *tmp_i = hypre_TAlloc(HYPRE_Int,     tmp_s, HYPRE_MEMORY_DEVICE);
-      HYPRE_Int     *tmp_j = hypre_TAlloc(HYPRE_Int,     tmp_s, HYPRE_MEMORY_DEVICE);
-      HYPRE_Complex *tmp_a = hypre_TAlloc(HYPRE_Complex, tmp_s, HYPRE_MEMORY_DEVICE);
-      HYPRE_Int      Cext_diag_nnz, Cext_offd_nnz, *offd_map_to_C;
-
-      hypre_CSRMatrixSplitDevice_core(0,
-                                      hypre_CSRMatrixNumRows(Cext),
-                                      hypre_CSRMatrixNumNonzeros(Cext),
-                                      NULL,
-                                      hypre_CSRMatrixBigJ(Cext), NULL, NULL,
-                                      hypre_ParCSRMatrixFirstColDiag(P),
-                                      hypre_ParCSRMatrixLastColDiag(P),
-                                      num_cols_offd,
-                                      NULL, NULL, NULL, NULL,
-                                      &Cext_diag_nnz,
-                                      NULL, NULL, NULL, NULL,
-                                      &Cext_offd_nnz,
-                                      NULL, NULL, NULL, NULL);
-
-      HYPRE_Int *Cext_ii = hypreDevice_CsrRowPtrsToIndices(hypre_CSRMatrixNumRows(Cext), hypre_CSRMatrixNumNonzeros(Cext),
-                                                           hypre_CSRMatrixI(Cext));
-
-      hypre_CSRMatrixSplitDevice_core(1,
-                                      hypre_CSRMatrixNumRows(Cext),
-                                      hypre_CSRMatrixNumNonzeros(Cext),
-                                      Cext_ii,
-                                      hypre_CSRMatrixBigJ(Cext),
-                                      hypre_CSRMatrixData(Cext),
-                                      NULL,
-                                      hypre_ParCSRMatrixFirstColDiag(P),
-                                      hypre_ParCSRMatrixLastColDiag(P),
-                                      num_cols_offd,
-                                      col_map_offd,
-                                      &offd_map_to_C,
-                                      &num_cols_offd_C,
-                                      &col_map_offd_C,
-                                      &Cext_diag_nnz,
-                                      tmp_i + local_nnz_Cbar,
-                                      tmp_j + local_nnz_Cbar,
-                                      tmp_a + local_nnz_Cbar,
-                                      NULL,
-                                      &Cext_offd_nnz,
-                                      tmp_i + local_nnz_Cbar + Cext_diag_nnz,
-                                      tmp_j + local_nnz_Cbar + Cext_diag_nnz,
-                                      tmp_a + local_nnz_Cbar + Cext_diag_nnz,
-                                      NULL);
+      /* add Cext to local part of Cbar */
+      hypre_ParCSRTMatMatPartialAddDevice(hypre_ParCSRMatrixCommPkg(R),
+                                          hypre_ParCSRMatrixNumCols(R),
+                                          hypre_ParCSRMatrixNumCols(P),
+                                          hypre_ParCSRMatrixFirstColDiag(P),
+                                          hypre_ParCSRMatrixLastColDiag(P),
+                                          num_cols_offd,
+                                          col_map_offd,
+                                          local_nnz_Cbar,
+                                          Cbar,
+                                          Cext,
+                                          &C_diag,
+                                          &C_offd,
+                                          &num_cols_offd_C,
+                                          &col_map_offd_C);
 
-      hypre_CSRMatrixDestroy(Cext);
-      hypre_TFree(Cext_ii, HYPRE_MEMORY_DEVICE);
       hypre_TFree(col_map_offd, HYPRE_MEMORY_DEVICE);
-
-      hypre_ParCSRCommPkgCopySendMapElmtsToDevice(hypre_ParCSRMatrixCommPkg(R));
-
-      HYPRE_THRUST_CALL( gather,
-                         tmp_i + local_nnz_Cbar,
-                         tmp_i + tmp_s,
-                         hypre_ParCSRCommPkgDeviceSendMapElmts(hypre_ParCSRMatrixCommPkg(R)),
-                         tmp_i + local_nnz_Cbar );
-
-      HYPRE_THRUST_CALL( transform,
-                         tmp_j + local_nnz_Cbar + Cext_diag_nnz,
-                         tmp_j + tmp_s,
-                         thrust::make_constant_iterator(hypre_ParCSRMatrixNumCols(P)),
-                         tmp_j + local_nnz_Cbar + Cext_diag_nnz,
-                         thrust::plus<HYPRE_Int>() );
-
-      hypreDevice_CsrRowPtrsToIndices_v2(hypre_ParCSRMatrixNumCols(R), local_nnz_Cbar, hypre_CSRMatrixI(Cbar), tmp_i);
-      hypre_TMemcpy(tmp_a, hypre_CSRMatrixData(Cbar), HYPRE_Complex, local_nnz_Cbar, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
-      RAP_functor<2, HYPRE_Int> func2(hypre_ParCSRMatrixNumCols(P), 0, offd_map_to_C);
-      HYPRE_THRUST_CALL( transform,
-                         hypre_CSRMatrixJ(Cbar),
-                         hypre_CSRMatrixJ(Cbar) + local_nnz_Cbar,
-                         tmp_j,
-                         func2 );
-
-      hypre_CSRMatrixDestroy(Cbar);
-      hypre_TFree(offd_map_to_C, HYPRE_MEMORY_DEVICE);
-
-      // add Cext to Cbar local. Note: type 2, diagonal entries are put at the first in the rows
-      hypreDevice_StableSortByTupleKey(tmp_s, tmp_i, tmp_j, tmp_a, 2);
-
-      HYPRE_Int     *zmp_i = hypre_TAlloc(HYPRE_Int,     tmp_s, HYPRE_MEMORY_DEVICE);
-      HYPRE_Int     *zmp_j = hypre_TAlloc(HYPRE_Int,     tmp_s, HYPRE_MEMORY_DEVICE);
-      HYPRE_Complex *zmp_a = hypre_TAlloc(HYPRE_Complex, tmp_s, HYPRE_MEMORY_DEVICE);
-
-      HYPRE_Int local_nnz_C = hypreDevice_ReduceByTupleKey(tmp_s, tmp_i, tmp_j, tmp_a, zmp_i, zmp_j, zmp_a);
-
-      hypre_TFree(tmp_i, HYPRE_MEMORY_DEVICE);
-      hypre_TFree(tmp_j, HYPRE_MEMORY_DEVICE);
-      hypre_TFree(tmp_a, HYPRE_MEMORY_DEVICE);
-
-      // split into diag and offd
-      in_range<HYPRE_Int> pred(0, hypre_ParCSRMatrixNumCols(P) - 1);
-
-      HYPRE_Int nnz_C_diag = HYPRE_THRUST_CALL( count_if,
-                                                zmp_j,
-                                                zmp_j + local_nnz_C,
-                                                pred );
-      HYPRE_Int nnz_C_offd = local_nnz_C - nnz_C_diag;
-
-      C_diag = hypre_CSRMatrixCreate(hypre_ParCSRMatrixNumCols(R), hypre_ParCSRMatrixNumCols(P), nnz_C_diag);
-      hypre_CSRMatrixInitialize_v2(C_diag, 0, HYPRE_MEMORY_DEVICE);
-      HYPRE_Int     *C_diag_ii = hypre_TAlloc(HYPRE_Int, nnz_C_diag, HYPRE_MEMORY_DEVICE);
-      HYPRE_Int     *C_diag_j = hypre_CSRMatrixJ(C_diag);
-      HYPRE_Complex *C_diag_a = hypre_CSRMatrixData(C_diag);
-
-      auto new_end = HYPRE_THRUST_CALL( copy_if,
-                                        thrust::make_zip_iterator(thrust::make_tuple(zmp_i, zmp_j, zmp_a)),
-                                        thrust::make_zip_iterator(thrust::make_tuple(zmp_i, zmp_j, zmp_a)) + local_nnz_C,
-                                        zmp_j,
-                                        thrust::make_zip_iterator(thrust::make_tuple(C_diag_ii, C_diag_j, C_diag_a)),
-                                        pred );
-      hypre_assert( thrust::get<0>(new_end.get_iterator_tuple()) == C_diag_ii + nnz_C_diag );
-      hypreDevice_CsrRowIndicesToPtrs_v2(hypre_CSRMatrixNumRows(C_diag), nnz_C_diag, C_diag_ii, hypre_CSRMatrixI(C_diag));
-      hypre_TFree(C_diag_ii, HYPRE_MEMORY_DEVICE);
-
-      C_offd = hypre_CSRMatrixCreate(hypre_ParCSRMatrixNumCols(R), num_cols_offd_C, nnz_C_offd);
-      hypre_CSRMatrixInitialize_v2(C_offd, 0, HYPRE_MEMORY_DEVICE);
-      HYPRE_Int     *C_offd_ii = hypre_TAlloc(HYPRE_Int, nnz_C_offd, HYPRE_MEMORY_DEVICE);
-      HYPRE_Int     *C_offd_j = hypre_CSRMatrixJ(C_offd);
-      HYPRE_Complex *C_offd_a = hypre_CSRMatrixData(C_offd);
-      new_end = HYPRE_THRUST_CALL( copy_if,
-                                   thrust::make_zip_iterator(thrust::make_tuple(zmp_i, zmp_j, zmp_a)),
-                                   thrust::make_zip_iterator(thrust::make_tuple(zmp_i, zmp_j, zmp_a)) + local_nnz_C,
-                                   zmp_j,
-                                   thrust::make_zip_iterator(thrust::make_tuple(C_offd_ii, C_offd_j, C_offd_a)),
-                                   thrust::not1(pred) );
-      hypre_assert( thrust::get<0>(new_end.get_iterator_tuple()) == C_offd_ii + nnz_C_offd );
-      hypreDevice_CsrRowIndicesToPtrs_v2(hypre_CSRMatrixNumRows(C_offd), nnz_C_offd, C_offd_ii, hypre_CSRMatrixI(C_offd));
-      hypre_TFree(C_offd_ii, HYPRE_MEMORY_DEVICE);
-
-      HYPRE_THRUST_CALL( transform,
-                         C_offd_j,
-                         C_offd_j + nnz_C_offd,
-                         thrust::make_constant_iterator(hypre_ParCSRMatrixNumCols(P)),
-                         C_offd_j,
-                         thrust::minus<HYPRE_Int>() );
-
-      hypre_TFree(zmp_i, HYPRE_MEMORY_DEVICE);
-      hypre_TFree(zmp_j, HYPRE_MEMORY_DEVICE);
-      hypre_TFree(zmp_a, HYPRE_MEMORY_DEVICE);
    }
    else
    {
       hypre_CSRMatrix *R_diagT;
       hypre_CSRMatrix *A_diag = hypre_ParCSRMatrixDiag(A);
       hypre_CSRMatrix *P_diag = hypre_ParCSRMatrixDiag(P);
-      hypre_CSRMatrixTransposeDevice(R_diag, &R_diagT, 1);
-      C_diag = hypre_CSRMatrixTripleMultiplyDevice(R_diagT, A_diag, P_diag);
-      C_offd = hypre_CSRMatrixCreate(hypre_ParCSRMatrixNumCols(R), 0, 0);
-      hypre_CSRMatrixInitialize_v2(C_offd, 0, HYPRE_MEMORY_DEVICE);
-      if (keep_transpose)
+
+      /* Recover or compute transpose of R_diag */
+      if (hypre_ParCSRMatrixDiagT(R))
       {
-         hypre_ParCSRMatrixDiagT(R) = R_diagT;
+         R_diagT = hypre_ParCSRMatrixDiagT(R);
       }
       else
       {
-         hypre_CSRMatrixDestroy(R_diagT);
+         hypre_CSRMatrixTransposeDevice(R_diag, &R_diagT, 1);
+      }
+
+      C_diag = hypre_CSRMatrixTripleMultiplyDevice(R_diagT, A_diag, P_diag);
+      C_offd = hypre_CSRMatrixCreate(hypre_ParCSRMatrixNumCols(R), 0, 0);
+      hypre_CSRMatrixInitialize_v2(C_offd, 0, HYPRE_MEMORY_DEVICE);
+
+      /* Keep or destroy transpose of R_diag */
+      if (!hypre_ParCSRMatrixDiagT(R))
+      {
+         if (keep_transpose)
+         {
+            hypre_ParCSRMatrixDiagT(R) = R_diagT;
+         }
+         else
+         {
+            hypre_CSRMatrixDestroy(R_diagT);
+         }
       }
-      /* Move the diagonal entry to the first of each row */
-      hypre_CSRMatrixMoveDiagFirstDevice(C_diag);
    }
 
    C = hypre_ParCSRMatrixCreate(hypre_ParCSRMatrixComm(A),
@@ -779,20 +857,422 @@ hypre_ParCSRMatrixRAPKTDevice( hypre_ParCSRMatrix *R,
    hypre_CSRMatrixDestroy(hypre_ParCSRMatrixOffd(C));
    hypre_ParCSRMatrixOffd(C) = C_offd;
 
-   if (num_cols_offd_C)
+   hypre_ParCSRMatrixDeviceColMapOffd(C) = col_map_offd_C;
+
+   hypre_ParCSRMatrixCompressOffdMapDevice(C);
+   hypre_ParCSRMatrixCopyColMapOffdToHost(C);
+
+   /* Ensure that the diagonal entries exist in the matrix structure (even if numerically zero) */
+   if (hypre_CSRMatrixCheckForMissingDiagonal(C_diag))
    {
-      hypre_ParCSRMatrixDeviceColMapOffd(C) = col_map_offd_C;
+      hypre_CSRMatrix *zero = hypre_CSRMatrixIdentityDevice(hypre_CSRMatrixNumRows(C_diag), 0.0);
 
-      hypre_ParCSRMatrixColMapOffd(C) = hypre_TAlloc(HYPRE_BigInt, num_cols_offd_C, HYPRE_MEMORY_HOST);
-      hypre_TMemcpy(hypre_ParCSRMatrixColMapOffd(C), col_map_offd_C, HYPRE_BigInt, num_cols_offd_C,
-                    HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
+      hypre_CSRMatrix *C_diag_new = hypre_CSRMatrixAddDevice(1.0, C_diag, 1.0, zero);
+
+      hypre_CSRMatrixDestroy(C_diag);
+      hypre_CSRMatrixDestroy(zero);
+
+      hypre_ParCSRMatrixDiag(C) = C_diag_new;
    }
 
+   /* Move the diagonal entry to the first of each row */
+   hypre_CSRMatrixMoveDiagFirstDevice(hypre_ParCSRMatrixDiag(C));
+
    hypre_assert(!hypre_CSRMatrixCheckDiagFirstDevice(hypre_ParCSRMatrixDiag(C)));
 
-   hypre_SyncCudaComputeStream(hypre_handle());
+   hypre_SyncComputeStream();
 
    return C;
 }
 
-#endif // #if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+HYPRE_Int
+hypre_ParCSRTMatMatPartialAddDevice( hypre_ParCSRCommPkg *comm_pkg,
+                                     HYPRE_Int            num_rows,
+                                     HYPRE_Int            num_cols,
+                                     HYPRE_BigInt         first_col_diag,
+                                     HYPRE_BigInt         last_col_diag,
+                                     HYPRE_Int            num_cols_offd,
+                                     HYPRE_BigInt        *col_map_offd,
+                                     HYPRE_Int            local_nnz_Cbar,
+                                     hypre_CSRMatrix     *Cbar,
+                                     hypre_CSRMatrix     *Cext,
+                                     hypre_CSRMatrix    **C_diag_ptr,
+                                     hypre_CSRMatrix    **C_offd_ptr,
+                                     HYPRE_Int           *num_cols_offd_C_ptr,
+                                     HYPRE_BigInt       **col_map_offd_C_ptr )
+{
+#if PARCSRGEMM_TIMING > 1
+   MPI_Comm comm = hypre_ParCSRCommPkgComm(comm_pkg);
+   HYPRE_Real t1, t2;
+   t1 = hypre_MPI_Wtime();
+#endif
+
+   HYPRE_Int        Cext_nnz = hypre_CSRMatrixNumNonzeros(Cext);
+   HYPRE_Int        num_cols_offd_C;
+   HYPRE_BigInt    *col_map_offd_C;
+   hypre_CSRMatrix *Cz;
+
+   // local part of Cbar
+   hypre_CSRMatrix *Cbar_local = hypre_CSRMatrixCreate(num_rows, hypre_CSRMatrixNumCols(Cbar),
+                                                       local_nnz_Cbar);
+   hypre_CSRMatrixI(Cbar_local) = hypre_CSRMatrixI(Cbar);
+   hypre_CSRMatrixJ(Cbar_local) = hypre_CSRMatrixJ(Cbar);
+   hypre_CSRMatrixData(Cbar_local) = hypre_CSRMatrixData(Cbar);
+   hypre_CSRMatrixOwnsData(Cbar_local) = 0;
+   hypre_CSRMatrixMemoryLocation(Cbar_local) = HYPRE_MEMORY_DEVICE;
+
+   if (!Cext_nnz)
+   {
+      num_cols_offd_C = num_cols_offd;
+      col_map_offd_C = hypre_TAlloc(HYPRE_BigInt, num_cols_offd, HYPRE_MEMORY_DEVICE);
+      hypre_TMemcpy(col_map_offd_C, col_map_offd, HYPRE_BigInt, num_cols_offd,
+                    HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+      Cz = Cbar_local;
+   }
+   else
+   {
+      in_range<HYPRE_BigInt> pred1(first_col_diag, last_col_diag);
+
+      if (!hypre_CSRMatrixJ(Cext))
+      {
+         hypre_CSRMatrixJ(Cext) = hypre_TAlloc(HYPRE_Int, Cext_nnz, HYPRE_MEMORY_DEVICE);
+      }
+
+      HYPRE_BigInt *Cext_bigj = hypre_CSRMatrixBigJ(Cext);
+      HYPRE_BigInt *big_work  = hypre_TAlloc(HYPRE_BigInt, Cext_nnz, HYPRE_MEMORY_DEVICE);
+      HYPRE_Int    *work      = hypre_TAlloc(HYPRE_Int, Cext_nnz, HYPRE_MEMORY_DEVICE);
+      HYPRE_Int    *map_offd_to_C;
+
+      // Convert Cext from BigJ to J
+      // Cext offd
+#if defined(HYPRE_USING_SYCL)
+      auto off_end = hypreSycl_copy_if( oneapi::dpl::make_zip_iterator(oneapi::dpl::counting_iterator(0),
+                                                                       Cext_bigj),
+                                        oneapi::dpl::make_zip_iterator(oneapi::dpl::counting_iterator(0),
+                                                                       Cext_bigj) + Cext_nnz,
+                                        Cext_bigj,
+                                        oneapi::dpl::make_zip_iterator(work, big_work),
+                                        std::not_fn(pred1) );
+
+      HYPRE_Int Cext_offd_nnz = std::get<0>(off_end.base()) - work;
+#else
+      auto off_end = HYPRE_THRUST_CALL( copy_if,
+                                        thrust::make_zip_iterator(thrust::make_tuple(thrust::make_counting_iterator(0), Cext_bigj)),
+                                        thrust::make_zip_iterator(thrust::make_tuple(thrust::make_counting_iterator(0),
+                                                                                     Cext_bigj)) + Cext_nnz,
+                                        Cext_bigj,
+                                        thrust::make_zip_iterator(thrust::make_tuple(work, big_work)),
+                                        HYPRE_THRUST_NOT(pred1) );
+
+      HYPRE_Int Cext_offd_nnz = thrust::get<0>(off_end.get_iterator_tuple()) - work;
+#endif
+
+      hypre_CSRMatrixMergeColMapOffd(num_cols_offd, col_map_offd, Cext_offd_nnz, big_work,
+                                     &num_cols_offd_C, &col_map_offd_C, &map_offd_to_C);
+
+#if defined(HYPRE_USING_SYCL)
+      /* WM: onedpl lower_bound currently does not accept zero length values */
+      if (Cext_offd_nnz > 0)
+      {
+         HYPRE_ONEDPL_CALL( oneapi::dpl::lower_bound,
+                            col_map_offd_C,
+                            col_map_offd_C + num_cols_offd_C,
+                            big_work,
+                            big_work + Cext_offd_nnz,
+                            oneapi::dpl::make_permutation_iterator(hypre_CSRMatrixJ(Cext), work) );
+      }
+
+      HYPRE_ONEDPL_CALL( std::transform,
+                         oneapi::dpl::make_permutation_iterator(hypre_CSRMatrixJ(Cext), work),
+                         oneapi::dpl::make_permutation_iterator(hypre_CSRMatrixJ(Cext), work) + Cext_offd_nnz,
+                         oneapi::dpl::make_permutation_iterator(hypre_CSRMatrixJ(Cext), work),
+      [const_val = num_cols] (const auto & x) {return x + const_val;} );
+#else
+      HYPRE_THRUST_CALL( lower_bound,
+                         col_map_offd_C,
+                         col_map_offd_C + num_cols_offd_C,
+                         big_work,
+                         big_work + Cext_offd_nnz,
+                         thrust::make_permutation_iterator(hypre_CSRMatrixJ(Cext), work) );
+
+      HYPRE_THRUST_CALL( transform,
+                         thrust::make_permutation_iterator(hypre_CSRMatrixJ(Cext), work),
+                         thrust::make_permutation_iterator(hypre_CSRMatrixJ(Cext), work) + Cext_offd_nnz,
+                         thrust::make_constant_iterator(num_cols),
+                         thrust::make_permutation_iterator(hypre_CSRMatrixJ(Cext), work),
+                         thrust::plus<HYPRE_Int>() );
+#endif
+
+      // Cext diag
+#if defined(HYPRE_USING_SYCL)
+      auto dia_end = hypreSycl_copy_if( oneapi::dpl::make_zip_iterator(oneapi::dpl::counting_iterator(0),
+                                                                       Cext_bigj),
+                                        oneapi::dpl::make_zip_iterator(oneapi::dpl::counting_iterator(0),
+                                                                       Cext_bigj) + Cext_nnz,
+                                        Cext_bigj,
+                                        oneapi::dpl::make_zip_iterator(work, big_work),
+                                        pred1 );
+
+      HYPRE_Int Cext_diag_nnz = std::get<0>(dia_end.base()) - work;
+#else
+      auto dia_end = HYPRE_THRUST_CALL( copy_if,
+                                        thrust::make_zip_iterator(thrust::make_tuple(thrust::make_counting_iterator(0), Cext_bigj)),
+                                        thrust::make_zip_iterator(thrust::make_tuple(thrust::make_counting_iterator(0),
+                                                                                     Cext_bigj)) + Cext_nnz,
+                                        Cext_bigj,
+                                        thrust::make_zip_iterator(thrust::make_tuple(work, big_work)),
+                                        pred1 );
+
+      HYPRE_Int Cext_diag_nnz = thrust::get<0>(dia_end.get_iterator_tuple()) - work;
+#endif
+
+      hypre_assert(Cext_diag_nnz + Cext_offd_nnz == Cext_nnz);
+
+#if defined(HYPRE_USING_SYCL)
+      HYPRE_ONEDPL_CALL( std::transform,
+                         big_work,
+                         big_work + Cext_diag_nnz,
+                         oneapi::dpl::make_permutation_iterator(hypre_CSRMatrixJ(Cext), work),
+      [const_val = first_col_diag](const auto & x) {return x - const_val;} );
+#else
+      HYPRE_THRUST_CALL( transform,
+                         big_work,
+                         big_work + Cext_diag_nnz,
+                         thrust::make_constant_iterator(first_col_diag),
+                         thrust::make_permutation_iterator(hypre_CSRMatrixJ(Cext), work),
+                         thrust::minus<HYPRE_BigInt>());
+#endif
+
+      hypre_CSRMatrixNumCols(Cext) = num_cols + num_cols_offd_C;
+
+      // transform Cbar_local J index
+      RAP_functor<2, HYPRE_Int> func2(num_cols, 0, map_offd_to_C);
+#if defined(HYPRE_USING_SYCL)
+      HYPRE_ONEDPL_CALL( std::transform,
+                         hypre_CSRMatrixJ(Cbar_local),
+                         hypre_CSRMatrixJ(Cbar_local) + local_nnz_Cbar,
+                         hypre_CSRMatrixJ(Cbar_local),
+                         func2 );
+#else
+      HYPRE_THRUST_CALL( transform,
+                         hypre_CSRMatrixJ(Cbar_local),
+                         hypre_CSRMatrixJ(Cbar_local) + local_nnz_Cbar,
+                         hypre_CSRMatrixJ(Cbar_local),
+                         func2 );
+#endif
+
+      hypre_CSRMatrixNumCols(Cbar_local) = num_cols + num_cols_offd_C;
+
+      hypre_TFree(big_work,      HYPRE_MEMORY_DEVICE);
+      hypre_TFree(work,          HYPRE_MEMORY_DEVICE);
+      hypre_TFree(map_offd_to_C, HYPRE_MEMORY_DEVICE);
+      hypre_TFree(Cext_bigj,     HYPRE_MEMORY_DEVICE);
+      hypre_CSRMatrixBigJ(Cext) = NULL;
+
+#if PARCSRGEMM_TIMING > 1
+      hypre_ForceSyncComputeStream();
+      t2 = hypre_MPI_Wtime() - t1;
+      hypre_ParPrintf(comm, "Time PartialAdd1 %f\n", t2);
+#endif
+
+#if PARCSRGEMM_TIMING > 1
+      t1 = hypre_MPI_Wtime();
+#endif
+
+      // IE = [I, E]
+      hypre_ParCSRCommPkgCopySendMapElmtsToDevice(comm_pkg);
+
+      HYPRE_Int  num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
+      HYPRE_Int  num_elemt = hypre_ParCSRCommPkgSendMapStart(comm_pkg, num_sends);
+      HYPRE_Int *send_map  = hypre_ParCSRCommPkgDeviceSendMapElmts(comm_pkg);
+
+      hypre_CSRMatrix *IE = hypre_CSRMatrixCreate(num_rows, num_rows + num_elemt,
+                                                  num_rows + num_elemt);
+      hypre_CSRMatrixMemoryLocation(IE) = HYPRE_MEMORY_DEVICE;
+
+      HYPRE_Int     *ie_ii = hypre_TAlloc(HYPRE_Int, num_rows + num_elemt, HYPRE_MEMORY_DEVICE);
+      HYPRE_Int     *ie_j  = hypre_TAlloc(HYPRE_Int, num_rows + num_elemt, HYPRE_MEMORY_DEVICE);
+      HYPRE_Complex *ie_a  = NULL;
+
+      if (hypre_HandleSpgemmUseVendor(hypre_handle()))
+      {
+         ie_a = hypre_TAlloc(HYPRE_Complex, num_rows + num_elemt, HYPRE_MEMORY_DEVICE);
+#if defined(HYPRE_USING_SYCL)
+         HYPRE_ONEDPL_CALL(std::fill, ie_a, ie_a + num_rows + num_elemt, 1.0);
+#else
+         HYPRE_THRUST_CALL(fill, ie_a, ie_a + num_rows + num_elemt, 1.0);
+#endif
+      }
+
+#if defined(HYPRE_USING_SYCL)
+      hypreSycl_sequence(ie_ii, ie_ii + num_rows, 0);
+      HYPRE_ONEDPL_CALL( std::copy, send_map, send_map + num_elemt, ie_ii + num_rows);
+      hypreSycl_sequence(ie_j, ie_j + num_rows + num_elemt, 0);
+      auto zipped_begin = oneapi::dpl::make_zip_iterator(ie_ii, ie_j);
+      HYPRE_ONEDPL_CALL( std::stable_sort, zipped_begin, zipped_begin + num_rows + num_elemt,
+      [](auto lhs, auto rhs) { return std::get<0>(lhs) < std::get<0>(rhs); } );
+#else
+      HYPRE_THRUST_CALL( sequence, ie_ii, ie_ii + num_rows);
+      HYPRE_THRUST_CALL( copy, send_map, send_map + num_elemt, ie_ii + num_rows);
+      HYPRE_THRUST_CALL( sequence, ie_j, ie_j + num_rows + num_elemt);
+      HYPRE_THRUST_CALL( stable_sort_by_key, ie_ii, ie_ii + num_rows + num_elemt, ie_j );
+#endif
+
+      HYPRE_Int *ie_i = hypreDevice_CsrRowIndicesToPtrs(num_rows, num_rows + num_elemt, ie_ii);
+      hypre_TFree(ie_ii, HYPRE_MEMORY_DEVICE);
+
+      hypre_CSRMatrixI(IE)    = ie_i;
+      hypre_CSRMatrixJ(IE)    = ie_j;
+      hypre_CSRMatrixData(IE) = ie_a;
+
+      // CC = [Cbar_local; Cext]
+      hypre_CSRMatrix *CC = hypre_CSRMatrixStack2Device(Cbar_local, Cext);
+      hypre_CSRMatrixDestroy(Cbar);
+      hypre_CSRMatrixDestroy(Cext);
+
+#if PARCSRGEMM_TIMING > 1
+      hypre_ForceSyncComputeStream();
+      t2 = hypre_MPI_Wtime() - t1;
+      hypre_ParPrintf(comm, "Time PartialAdd2 %f\n", t2);
+#endif
+
+      // Cz = IE * CC
+#if PARCSRGEMM_TIMING > 1
+      t1 = hypre_MPI_Wtime();
+#endif
+      Cz = hypre_CSRMatrixMultiplyDevice(IE, CC);
+
+      hypre_CSRMatrixDestroy(IE);
+      hypre_CSRMatrixDestroy(CC);
+
+#if PARCSRGEMM_TIMING > 1
+      hypre_ForceSyncComputeStream();
+      t2 = hypre_MPI_Wtime() - t1;
+      hypre_ParPrintf(comm, "Time PartialAdd-SpGemm %f\n", t2);
+#endif
+   }
+
+#if PARCSRGEMM_TIMING > 1
+   t1 = hypre_MPI_Wtime();
+#endif
+
+   // split into diag and offd
+   HYPRE_Int local_nnz_C = hypre_CSRMatrixNumNonzeros(Cz);
+
+   HYPRE_Int     *zmp_i = hypreDevice_CsrRowPtrsToIndices(num_rows, local_nnz_C, hypre_CSRMatrixI(Cz));
+   HYPRE_Int     *zmp_j = hypre_CSRMatrixJ(Cz);
+   HYPRE_Complex *zmp_a = hypre_CSRMatrixData(Cz);
+
+   in_range<HYPRE_Int> pred(0, num_cols - 1);
+
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_Int nnz_C_diag = HYPRE_ONEDPL_CALL( std::count_if,
+                                             zmp_j,
+                                             zmp_j + local_nnz_C,
+                                             pred );
+#else
+   HYPRE_Int nnz_C_diag = HYPRE_THRUST_CALL( count_if,
+                                             zmp_j,
+                                             zmp_j + local_nnz_C,
+                                             pred );
+#endif
+   HYPRE_Int nnz_C_offd = local_nnz_C - nnz_C_diag;
+
+   // diag
+   hypre_CSRMatrix *C_diag = hypre_CSRMatrixCreate(num_rows, num_cols, nnz_C_diag);
+   hypre_CSRMatrixInitialize_v2(C_diag, 0, HYPRE_MEMORY_DEVICE);
+   HYPRE_Int     *C_diag_ii = hypre_TAlloc(HYPRE_Int, nnz_C_diag, HYPRE_MEMORY_DEVICE);
+   HYPRE_Int     *C_diag_j = hypre_CSRMatrixJ(C_diag);
+   HYPRE_Complex *C_diag_a = hypre_CSRMatrixData(C_diag);
+
+#if defined(HYPRE_USING_SYCL)
+   auto new_end = hypreSycl_copy_if( oneapi::dpl::make_zip_iterator(zmp_i, zmp_j, zmp_a),
+                                     oneapi::dpl::make_zip_iterator(zmp_i, zmp_j, zmp_a) + local_nnz_C,
+                                     zmp_j,
+                                     oneapi::dpl::make_zip_iterator(C_diag_ii, C_diag_j, C_diag_a),
+                                     pred );
+   hypre_assert( std::get<0>(new_end.base()) == C_diag_ii + nnz_C_diag );
+#else
+   auto new_end = HYPRE_THRUST_CALL( copy_if,
+                                     thrust::make_zip_iterator(thrust::make_tuple(zmp_i, zmp_j, zmp_a)),
+                                     thrust::make_zip_iterator(thrust::make_tuple(zmp_i, zmp_j, zmp_a)) + local_nnz_C,
+                                     zmp_j,
+                                     thrust::make_zip_iterator(thrust::make_tuple(C_diag_ii, C_diag_j, C_diag_a)),
+                                     pred );
+   hypre_assert( thrust::get<0>(new_end.get_iterator_tuple()) == C_diag_ii + nnz_C_diag );
+#endif
+   hypreDevice_CsrRowIndicesToPtrs_v2(hypre_CSRMatrixNumRows(C_diag), nnz_C_diag, C_diag_ii,
+                                      hypre_CSRMatrixI(C_diag));
+   hypre_TFree(C_diag_ii, HYPRE_MEMORY_DEVICE);
+
+   // offd
+   hypre_CSRMatrix *C_offd = hypre_CSRMatrixCreate(num_rows, num_cols_offd_C, nnz_C_offd);
+   hypre_CSRMatrixInitialize_v2(C_offd, 0, HYPRE_MEMORY_DEVICE);
+   HYPRE_Int     *C_offd_ii = hypre_TAlloc(HYPRE_Int, nnz_C_offd, HYPRE_MEMORY_DEVICE);
+   HYPRE_Int     *C_offd_j = hypre_CSRMatrixJ(C_offd);
+   HYPRE_Complex *C_offd_a = hypre_CSRMatrixData(C_offd);
+#if defined(HYPRE_USING_SYCL)
+   new_end = hypreSycl_copy_if( oneapi::dpl::make_zip_iterator(zmp_i, zmp_j, zmp_a),
+                                oneapi::dpl::make_zip_iterator(zmp_i, zmp_j, zmp_a) + local_nnz_C,
+                                zmp_j,
+                                oneapi::dpl::make_zip_iterator(C_offd_ii, C_offd_j, C_offd_a),
+                                std::not_fn(pred) );
+   hypre_assert( std::get<0>(new_end.base()) == C_offd_ii + nnz_C_offd );
+#else
+   new_end = HYPRE_THRUST_CALL( copy_if,
+                                thrust::make_zip_iterator(thrust::make_tuple(zmp_i, zmp_j, zmp_a)),
+                                thrust::make_zip_iterator(thrust::make_tuple(zmp_i, zmp_j, zmp_a)) + local_nnz_C,
+                                zmp_j,
+                                thrust::make_zip_iterator(thrust::make_tuple(C_offd_ii, C_offd_j, C_offd_a)),
+                                HYPRE_THRUST_NOT(pred) );
+   hypre_assert( thrust::get<0>(new_end.get_iterator_tuple()) == C_offd_ii + nnz_C_offd );
+#endif
+   hypreDevice_CsrRowIndicesToPtrs_v2(hypre_CSRMatrixNumRows(C_offd), nnz_C_offd, C_offd_ii,
+                                      hypre_CSRMatrixI(C_offd));
+   hypre_TFree(C_offd_ii, HYPRE_MEMORY_DEVICE);
+
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_ONEDPL_CALL( std::transform,
+                      C_offd_j,
+                      C_offd_j + nnz_C_offd,
+                      C_offd_j,
+   [const_val = num_cols] (const auto & x) {return x - const_val;} );
+#else
+   HYPRE_THRUST_CALL( transform,
+                      C_offd_j,
+                      C_offd_j + nnz_C_offd,
+                      thrust::make_constant_iterator(num_cols),
+                      C_offd_j,
+                      thrust::minus<HYPRE_Int>() );
+#endif
+
+   // free
+   hypre_TFree(Cbar_local, HYPRE_MEMORY_HOST);
+   hypre_TFree(zmp_i, HYPRE_MEMORY_DEVICE);
+
+   if (!Cext_nnz)
+   {
+      hypre_CSRMatrixDestroy(Cbar);
+      hypre_CSRMatrixDestroy(Cext);
+   }
+   else
+   {
+      hypre_CSRMatrixDestroy(Cz);
+   }
+
+#if PARCSRGEMM_TIMING > 1
+   hypre_ForceSyncComputeStream();
+   t2 = hypre_MPI_Wtime() - t1;
+   hypre_ParPrintf(comm, "Time Split %f\n", t2);
+#endif
+
+   // output
+   *C_diag_ptr = C_diag;
+   *C_offd_ptr = C_offd;
+   *num_cols_offd_C_ptr = num_cols_offd_C;
+   *col_map_offd_C_ptr = col_map_offd_C;
+
+   return hypre_error_flag;
+}
+
+#endif /* #if defined(HYPRE_USING_GPU) */
diff --git a/external/hypre/src/parcsr_mv/par_make_system.c b/external/hypre/src/parcsr_mv/par_make_system.c
index 7bf70cf0..9da5146d 100644
--- a/external/hypre/src/parcsr_mv/par_make_system.c
+++ b/external/hypre/src/parcsr_mv/par_make_system.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -91,8 +91,8 @@ HYPRE_Generate2DSystem(HYPRE_ParCSRMatrix H_L1, HYPRE_ParCSRMatrix H_L2,
    HYPRE_BigInt *L1_col_map_offd =  hypre_ParCSRMatrixColMapOffd(L1);
    HYPRE_BigInt *L2_col_map_offd =  hypre_ParCSRMatrixColMapOffd(L2);
 
-   HYPRE_BigInt *A_row_starts;
-   HYPRE_BigInt *A_col_starts;
+   HYPRE_BigInt A_row_starts[2];
+   HYPRE_BigInt A_col_starts[2];
 
    HYPRE_BigInt *A_col_map_offd = NULL;
 
@@ -112,15 +112,13 @@ HYPRE_Generate2DSystem(HYPRE_ParCSRMatrix H_L1, HYPRE_ParCSRMatrix H_L2,
    sys_prob = hypre_CTAlloc(HYPRE_ParCSR_System_Problem,  1, HYPRE_MEMORY_HOST);
 
    /* global number of variables */
-   n = L_n*(HYPRE_BigInt)dim;
+   n = L_n * (HYPRE_BigInt)dim;
 
    /* global row/col starts */
-   A_row_starts = hypre_CTAlloc(HYPRE_BigInt,  2, HYPRE_MEMORY_HOST);
-   A_col_starts = hypre_CTAlloc(HYPRE_BigInt,  2, HYPRE_MEMORY_HOST);
-   for(i = 0; i < 2; i++)
+   for (i = 0; i < 2; i++)
    {
-      A_row_starts[i] = L_row_starts[i]*(HYPRE_BigInt)dim;
-      A_col_starts[i] = L_row_starts[i]*(HYPRE_BigInt)dim;
+      A_row_starts[i] = L_row_starts[i] * (HYPRE_BigInt)dim;
+      A_col_starts[i] = L_row_starts[i] * (HYPRE_BigInt)dim;
    }
 
    /***** first we will do the diag part ******/
@@ -135,12 +133,12 @@ HYPRE_Generate2DSystem(HYPRE_ParCSRMatrix H_L1, HYPRE_ParCSRMatrix H_L2,
 
       /* assume m11 and m22 are nonzero */
       A_nnz_diag = L1_nnz_diag + L2_nnz_diag;
-      if (m12) A_nnz_diag +=  L2_nnz_diag;
-      if (m21) A_nnz_diag +=  L1_nnz_diag;
+      if (m12) { A_nnz_diag +=  L2_nnz_diag; }
+      if (m21) { A_nnz_diag +=  L1_nnz_diag; }
 
-      A_diag_i    = hypre_CTAlloc(HYPRE_Int,  A_num_rows +1, HYPRE_MEMORY_HOST);
+      A_diag_i    = hypre_CTAlloc(HYPRE_Int,  A_num_rows + 1, HYPRE_MEMORY_HOST);
       A_diag_j    = hypre_CTAlloc(HYPRE_Int,  A_nnz_diag, HYPRE_MEMORY_HOST);
-      A_diag_data = hypre_CTAlloc(HYPRE_Complex,  A_nnz_diag , HYPRE_MEMORY_HOST);
+      A_diag_data = hypre_CTAlloc(HYPRE_Complex,  A_nnz_diag, HYPRE_MEMORY_HOST);
 
       A_diag_i[0] = 0;
 
@@ -148,38 +146,38 @@ HYPRE_Generate2DSystem(HYPRE_ParCSRMatrix H_L1, HYPRE_ParCSRMatrix H_L2,
       L1_j_count = 0;
       L2_j_count = 0;
 
-      for (i=0; i< L_num_rows; i++)
+      for (i = 0; i < L_num_rows; i++)
       {
-         num1 = L1_diag_i[i+1] - L1_diag_i[i];
-         num2 = (L2_diag_i[i+1] - L2_diag_i[i]);
+         num1 = L1_diag_i[i + 1] - L1_diag_i[i];
+         num2 = (L2_diag_i[i + 1] - L2_diag_i[i]);
 
          /* unknown 1*/
          if (m12 == 0.0)
          {
-            A_diag_i[i*2 + 1] = num1 + A_diag_i[i*2];
+            A_diag_i[i * 2 + 1] = num1 + A_diag_i[i * 2];
 
-            for (k=0; k< num1; k++)
+            for (k = 0; k < num1; k++)
             {
-               A_diag_j[A_j_count + k] = dim*L1_diag_j[L1_j_count + k];
-               A_diag_data[A_j_count + k] = m11*L1_diag_data[L1_j_count + k];
+               A_diag_j[A_j_count + k] = dim * L1_diag_j[L1_j_count + k];
+               A_diag_data[A_j_count + k] = m11 * L1_diag_data[L1_j_count + k];
             }
             A_j_count += num1;
          }
          else /* m12 is nonzero */
          {
-            A_diag_i[i*2 + 1] = num1 + num2 + A_diag_i[i*2];
+            A_diag_i[i * 2 + 1] = num1 + num2 + A_diag_i[i * 2];
 
-            for (k=0; k< num1; k++)
+            for (k = 0; k < num1; k++)
             {
-               A_diag_j[A_j_count + k] = dim*L1_diag_j[L1_j_count + k];
-               A_diag_data[A_j_count + k] = m11*L1_diag_data[L1_j_count + k];
+               A_diag_j[A_j_count + k] = dim * L1_diag_j[L1_j_count + k];
+               A_diag_data[A_j_count + k] = m11 * L1_diag_data[L1_j_count + k];
             }
             A_j_count += num1;
 
-            for (k=0; k< num2; k++)
+            for (k = 0; k < num2; k++)
             {
-               A_diag_j[A_j_count + k] = 1 + dim*L2_diag_j[L2_j_count + k];
-               A_diag_data[A_j_count + k] = m12*L2_diag_data[L2_j_count + k];
+               A_diag_j[A_j_count + k] = 1 + dim * L2_diag_j[L2_j_count + k];
+               A_diag_data[A_j_count + k] = m12 * L2_diag_data[L2_j_count + k];
             }
             A_j_count += num2;
 
@@ -190,38 +188,38 @@ HYPRE_Generate2DSystem(HYPRE_ParCSRMatrix H_L1, HYPRE_ParCSRMatrix H_L2,
          /* unknown 2*/
          if (m21 == 0.0)
          {
-            A_diag_i[i*2 + 2] = num2 + A_diag_i[i*2 + 1];
+            A_diag_i[i * 2 + 2] = num2 + A_diag_i[i * 2 + 1];
 
-            for (k=0; k< num2; k++)
+            for (k = 0; k < num2; k++)
             {
-               A_diag_j[A_j_count + k] = 1 + dim*L2_diag_j[L2_j_count + k];
-               A_diag_data[A_j_count + k] = m22*L2_diag_data[L2_j_count + k];
+               A_diag_j[A_j_count + k] = 1 + dim * L2_diag_j[L2_j_count + k];
+               A_diag_data[A_j_count + k] = m22 * L2_diag_data[L2_j_count + k];
             }
             A_j_count += num2;
          }
          else /* m21 is nonzero */
          {
 
-            A_diag_i[i*2 + 2] = num1 + num2 + A_diag_i[i*2 + 1];
+            A_diag_i[i * 2 + 2] = num1 + num2 + A_diag_i[i * 2 + 1];
 
-            for (k=0; k< num2; k++)
+            for (k = 0; k < num2; k++)
             {
-               A_diag_j[A_j_count+k] = 1 + dim*L2_diag_j[L2_j_count + k];
-               A_diag_data[A_j_count+k] = m22*L2_diag_data[L2_j_count + k];
+               A_diag_j[A_j_count + k] = 1 + dim * L2_diag_j[L2_j_count + k];
+               A_diag_data[A_j_count + k] = m22 * L2_diag_data[L2_j_count + k];
             }
             A_j_count += num2;
 
-            for (k=0; k< num1; k++)
+            for (k = 0; k < num1; k++)
             {
-               A_diag_j[A_j_count+k] = dim*L1_diag_j[L1_j_count + k];
-               A_diag_data[A_j_count+k] = m21*L1_diag_data[L1_j_count + k];
+               A_diag_j[A_j_count + k] = dim * L1_diag_j[L1_j_count + k];
+               A_diag_data[A_j_count + k] = m21 * L1_diag_data[L1_j_count + k];
             }
             A_j_count += num1;
 
 
          } /* end unknown 2 */
 
-         L1_j_count +=num1;
+         L1_j_count += num1;
          L2_j_count += num2;
 
 
@@ -242,14 +240,14 @@ HYPRE_Generate2DSystem(HYPRE_ParCSRMatrix H_L1, HYPRE_ParCSRMatrix H_L2,
       A_num_rows = L_num_rows * dim;
 
       A_nnz_offd = L1_nnz_offd + L2_nnz_offd;
-      if (m12) A_nnz_offd +=  L2_nnz_offd;
-      if (m21) A_nnz_offd +=  L1_nnz_offd;
+      if (m12) { A_nnz_offd +=  L2_nnz_offd; }
+      if (m21) { A_nnz_offd +=  L1_nnz_offd; }
 
       A_num_cols_offd = L1_num_cols_offd + L2_num_cols_offd;
 
-      A_offd_i    = hypre_CTAlloc(HYPRE_Int,  A_num_rows +1, HYPRE_MEMORY_HOST);
+      A_offd_i    = hypre_CTAlloc(HYPRE_Int,  A_num_rows + 1, HYPRE_MEMORY_HOST);
       A_offd_j    = hypre_CTAlloc(HYPRE_Int,  A_nnz_offd, HYPRE_MEMORY_HOST);
-      A_offd_data = hypre_CTAlloc(HYPRE_Complex,  A_nnz_offd , HYPRE_MEMORY_HOST);
+      A_offd_data = hypre_CTAlloc(HYPRE_Complex,  A_nnz_offd, HYPRE_MEMORY_HOST);
 
 
       A_col_map_offd =  hypre_CTAlloc(HYPRE_BigInt,  A_num_cols_offd, HYPRE_MEMORY_HOST);
@@ -270,8 +268,8 @@ HYPRE_Generate2DSystem(HYPRE_ParCSRMatrix H_L1, HYPRE_ParCSRMatrix H_L2,
 
          if (L1_map_count < L1_num_cols_offd && L2_map_count < L2_num_cols_offd)
          {
-            ent1 = L1_col_map_offd[L1_map_count]*2;
-            ent2 = L2_col_map_offd[L2_map_count]*2 + 1;
+            ent1 = L1_col_map_offd[L1_map_count] * 2;
+            ent2 = L2_col_map_offd[L2_map_count] * 2 + 1;
             if (ent1 < ent2)
             {
                A_col_map_offd[i] = ent1;
@@ -285,13 +283,13 @@ HYPRE_Generate2DSystem(HYPRE_ParCSRMatrix H_L1, HYPRE_ParCSRMatrix H_L2,
          }
          else if (L1_map_count >= L1_num_cols_offd)
          {
-            ent2 = L2_col_map_offd[L2_map_count]*2 + 1;
+            ent2 = L2_col_map_offd[L2_map_count] * 2 + 1;
             A_col_map_offd[i] = ent2;
             L2_map_to_new[L2_map_count++] = i;
          }
          else if (L2_map_count >= L2_num_cols_offd)
          {
-            ent1 = L1_col_map_offd[L1_map_count]*2;
+            ent1 = L1_col_map_offd[L1_map_count] * 2;
             A_col_map_offd[i] = ent1;
             L1_map_to_new[L1_map_count++] = i;
          }
@@ -310,21 +308,21 @@ HYPRE_Generate2DSystem(HYPRE_ParCSRMatrix H_L1, HYPRE_ParCSRMatrix H_L2,
       L2_j_count = 0;
 
       A_offd_i[0] = 0;
-      for (i=0; i< L_num_rows; i++)
+      for (i = 0; i < L_num_rows; i++)
       {
-         num1 = L1_offd_i[i+1] - L1_offd_i[i];
-         num2 = (L2_offd_i[i+1] - L2_offd_i[i]);
+         num1 = L1_offd_i[i + 1] - L1_offd_i[i];
+         num2 = (L2_offd_i[i + 1] - L2_offd_i[i]);
 
          /* unknown 1*/
          if (m12 == 0.0)
          {
-            A_offd_i[i*2 + 1] = num1 + A_offd_i[i*2];
+            A_offd_i[i * 2 + 1] = num1 + A_offd_i[i * 2];
 
-            for (k=0; k< num1; k++)
+            for (k = 0; k < num1; k++)
             {
                tmp_i = L1_offd_j[L1_j_count + k];
                A_offd_j[A_j_count + k] = L1_map_to_new[tmp_i];
-               A_offd_data[A_j_count + k] = m11*L1_offd_data[L1_j_count + k];
+               A_offd_data[A_j_count + k] = m11 * L1_offd_data[L1_j_count + k];
             }
             A_j_count += num1;
 
@@ -332,21 +330,21 @@ HYPRE_Generate2DSystem(HYPRE_ParCSRMatrix H_L1, HYPRE_ParCSRMatrix H_L2,
          }
          else /* m12 is nonzero */
          {
-            A_offd_i[i*2 + 1] = num1 + num2 + A_offd_i[i*2];
+            A_offd_i[i * 2 + 1] = num1 + num2 + A_offd_i[i * 2];
 
-            for (k=0; k< num1; k++)
+            for (k = 0; k < num1; k++)
             {
                tmp_i = L1_offd_j[L1_j_count + k];
                A_offd_j[A_j_count + k] = L1_map_to_new[tmp_i];
-               A_offd_data[A_j_count + k] = m11*L1_offd_data[L1_j_count + k];
+               A_offd_data[A_j_count + k] = m11 * L1_offd_data[L1_j_count + k];
             }
             A_j_count += num1;
 
-            for (k=0; k< num2; k++)
+            for (k = 0; k < num2; k++)
             {
                tmp_i = L2_offd_j[L2_j_count + k];
                A_offd_j[A_j_count + k] =  L2_map_to_new[tmp_i];
-               A_offd_data[A_j_count + k] = m12*L2_offd_data[L2_j_count + k];
+               A_offd_data[A_j_count + k] = m12 * L2_offd_data[L2_j_count + k];
             }
             A_j_count += num2;
 
@@ -354,41 +352,41 @@ HYPRE_Generate2DSystem(HYPRE_ParCSRMatrix H_L1, HYPRE_ParCSRMatrix H_L2,
          /* unknown 2*/
          if (m21 == 0.0)
          {
-            A_offd_i[i*2 + 2] = num2 + A_offd_i[i*2 + 1];
+            A_offd_i[i * 2 + 2] = num2 + A_offd_i[i * 2 + 1];
 
-            for (k=0; k< num2; k++)
+            for (k = 0; k < num2; k++)
             {
                tmp_i = L2_offd_j[L2_j_count + k];
                A_offd_j[A_j_count + k] =  L2_map_to_new[tmp_i];
-               A_offd_data[A_j_count + k] = m22*L2_offd_data[L2_j_count + k];
+               A_offd_data[A_j_count + k] = m22 * L2_offd_data[L2_j_count + k];
             }
             A_j_count += num2;
          }
          else /* m21 is nonzero */
          {
 
-             A_offd_i[i*2 + 2] = num1 + num2 + A_offd_i[i*2 + 1];
+            A_offd_i[i * 2 + 2] = num1 + num2 + A_offd_i[i * 2 + 1];
 
-            for (k=0; k< num2; k++)
+            for (k = 0; k < num2; k++)
             {
                tmp_i = L2_offd_j[L2_j_count + k];
                A_offd_j[A_j_count + k] =  L2_map_to_new[tmp_i];
-               A_offd_data[A_j_count + k] = m22*L2_offd_data[L2_j_count + k];
+               A_offd_data[A_j_count + k] = m22 * L2_offd_data[L2_j_count + k];
             }
             A_j_count += num2;
 
-            for (k=0; k< num1; k++)
+            for (k = 0; k < num1; k++)
             {
                tmp_i = L1_offd_j[L1_j_count + k];
                A_offd_j[A_j_count + k] = L1_map_to_new[tmp_i];
-               A_offd_data[A_j_count + k] = m21*L1_offd_data[L1_j_count + k];
+               A_offd_data[A_j_count + k] = m21 * L1_offd_data[L1_j_count + k];
             }
             A_j_count += num1;
 
 
          } /* end unknown 2 */
 
-         L1_j_count +=num1;
+         L1_j_count += num1;
          L2_j_count += num2;
 
 
@@ -435,12 +433,12 @@ HYPRE_Generate2DSystem(HYPRE_ParCSRMatrix H_L1, HYPRE_ParCSRMatrix H_L2,
       HYPRE_Complex  *b1_data = hypre_VectorData(b1_local);
       HYPRE_Complex  *b2_data = hypre_VectorData(b2_local);
 
-      b_data = hypre_CTAlloc(HYPRE_Complex,  size*2, HYPRE_MEMORY_HOST);
+      b_data = hypre_CTAlloc(HYPRE_Complex,  size * 2, HYPRE_MEMORY_HOST);
 
       for (i = 0; i < size; i++)
       {
-         b_data[i*2] = b1_data[i];
-         b_data[i*2+1] = b2_data[i];
+         b_data[i * 2] = b1_data[i];
+         b_data[i * 2 + 1] = b2_data[i];
       }
 
       b = hypre_ParVectorCreate( comm, n, A_row_starts);
@@ -449,7 +447,7 @@ HYPRE_Generate2DSystem(HYPRE_ParCSRMatrix H_L1, HYPRE_ParCSRMatrix H_L2,
       hypre_TFree(hypre_VectorData(hypre_ParVectorLocalVector(b)), HYPRE_MEMORY_HOST);
       hypre_VectorData(hypre_ParVectorLocalVector(b)) = b_data;
 
-      hypre_ParVectorSetDataOwner(b,1);
+      hypre_ParVectorSetDataOwner(b, 1);
    }
 
    /* create x */
@@ -460,12 +458,12 @@ HYPRE_Generate2DSystem(HYPRE_ParCSRMatrix H_L1, HYPRE_ParCSRMatrix H_L2,
       HYPRE_Complex  *x1_data = hypre_VectorData(x1_local);
       HYPRE_Complex  *x2_data = hypre_VectorData(x2_local);
 
-      x_data = hypre_CTAlloc(HYPRE_Complex,  size*2, HYPRE_MEMORY_HOST);
+      x_data = hypre_CTAlloc(HYPRE_Complex,  size * 2, HYPRE_MEMORY_HOST);
 
       for (i = 0; i < size; i++)
       {
-         x_data[i*2] = x1_data[i];
-         x_data[i*2+1] = x2_data[i];
+         x_data[i * 2] = x1_data[i];
+         x_data[i * 2 + 1] = x2_data[i];
       }
 
       x = hypre_ParVectorCreate( comm, n, A_row_starts);
@@ -474,7 +472,7 @@ HYPRE_Generate2DSystem(HYPRE_ParCSRMatrix H_L1, HYPRE_ParCSRMatrix H_L2,
       hypre_TFree(hypre_VectorData(hypre_ParVectorLocalVector(x)), HYPRE_MEMORY_HOST);
       hypre_VectorData(hypre_ParVectorLocalVector(x)) = x_data;
 
-      hypre_ParVectorSetDataOwner(x,1);
+      hypre_ParVectorSetDataOwner(x, 1);
    }
 
    sys_prob->A = A;
diff --git a/external/hypre/src/parcsr_mv/par_make_system.h b/external/hypre/src/parcsr_mv/par_make_system.h
index 93703186..87f2a1d8 100644
--- a/external/hypre/src/parcsr_mv/par_make_system.h
+++ b/external/hypre/src/parcsr_mv/par_make_system.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/parcsr_mv/par_vector.c b/external/hypre/src/parcsr_mv/par_vector.c
index 44908790..32b1907c 100644
--- a/external/hypre/src/parcsr_mv/par_vector.c
+++ b/external/hypre/src/parcsr_mv/par_vector.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -13,16 +13,17 @@
 
 #include "_hypre_parcsr_mv.h"
 
-HYPRE_Int hypre_FillResponseParToVectorAll(void*, HYPRE_Int, HYPRE_Int, void*, MPI_Comm, void**, HYPRE_Int*);
+HYPRE_Int hypre_FillResponseParToVectorAll(void*, HYPRE_Int, HYPRE_Int, void*, MPI_Comm, void**,
+                                           HYPRE_Int*);
 
 /*--------------------------------------------------------------------------
  * hypre_ParVectorCreate
+ *
+ * If create is called and partitioning is NOT null, then it is assumed that it
+ * is array of length 2 containing the start row of the calling processor
+ * followed by the start row of the next processor - AHB 6/05
  *--------------------------------------------------------------------------*/
 
-/* If create is called and partitioning is NOT null, then it is assumed that it
-   is array of length 2 containing the start row of the calling processor
-   followed by the start row of the next processor - AHB 6/05 */
-
 hypre_ParVector *
 hypre_ParVectorCreate( MPI_Comm      comm,
                        HYPRE_BigInt  global_size,
@@ -38,11 +39,12 @@ hypre_ParVectorCreate( MPI_Comm      comm,
       return NULL;
    }
    vector = hypre_CTAlloc(hypre_ParVector, 1, HYPRE_MEMORY_HOST);
-   hypre_MPI_Comm_rank(comm,&my_id);
+
+   hypre_MPI_Comm_rank(comm, &my_id);
 
    if (!partitioning_in)
    {
-      hypre_MPI_Comm_size(comm,&num_procs);
+      hypre_MPI_Comm_size(comm, &num_procs);
       hypre_GenerateLocalPartitioning(global_size, num_procs, my_id, partitioning);
    }
    else
@@ -59,7 +61,7 @@ hypre_ParVectorCreate( MPI_Comm      comm,
    hypre_ParVectorPartitioning(vector)[0] = partitioning[0];
    hypre_ParVectorPartitioning(vector)[1] = partitioning[1];
    hypre_ParVectorFirstIndex(vector)      = hypre_ParVectorPartitioning(vector)[0];
-   hypre_ParVectorLastIndex(vector)       = hypre_ParVectorPartitioning(vector)[1]-1;
+   hypre_ParVectorLastIndex(vector)       = hypre_ParVectorPartitioning(vector)[1] - 1;
    hypre_ParVectorLocalVector(vector)     = hypre_SeqVectorCreate(local_size);
 
    /* set defaults */
@@ -111,30 +113,85 @@ hypre_ParVectorDestroy( hypre_ParVector *vector )
 }
 
 /*--------------------------------------------------------------------------
- * hypre_ParVectorInitialize
+ * hypre_ParVectorInitializeShell
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_ParVectorInitialize_v2( hypre_ParVector *vector, HYPRE_MemoryLocation memory_location )
+hypre_ParVectorInitializeShell(hypre_ParVector *vector)
 {
    if (!vector)
    {
       hypre_error_in_arg(1);
       return hypre_error_flag;
    }
-   hypre_SeqVectorInitialize_v2(hypre_ParVectorLocalVector(vector), memory_location);
 
-   hypre_ParVectorActualLocalSize(vector) = hypre_VectorSize(hypre_ParVectorLocalVector(vector));
+   hypre_Vector *local_vector = hypre_ParVectorLocalVector(vector);
+
+   hypre_SeqVectorInitializeShell(local_vector);
+   hypre_ParVectorActualLocalSize(vector) = hypre_VectorSize(local_vector);
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_ParVectorSetData
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ParVectorSetData(hypre_ParVector *vector,
+                       HYPRE_Complex   *data)
+{
+   hypre_SeqVectorSetData(hypre_ParVectorLocalVector(vector), data);
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_ParVectorInitialize_v2
+ *
+ * Initialize a hypre_ParVector at a given memory location
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ParVectorInitialize_v2( hypre_ParVector      *vector,
+                              HYPRE_MemoryLocation  memory_location )
+{
+   hypre_Vector *local_vector = hypre_ParVectorLocalVector(vector);
+
+   hypre_ParVectorInitializeShell(vector);
+   hypre_SeqVectorInitialize_v2(local_vector, memory_location);
 
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_ParVectorInitialize
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_ParVectorInitialize( hypre_ParVector *vector )
 {
    return hypre_ParVectorInitialize_v2(vector, hypre_ParVectorMemoryLocation(vector));
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_ParVectorSetComponent
+ *
+ * Set the identifier of the active component of a hypre_ParVector for the
+ * purpose of Set/AddTo/Get values functions.
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ParVectorSetComponent( hypre_ParVector *vector,
+                             HYPRE_Int        component )
+{
+   hypre_Vector *local_vector = hypre_ParVectorLocalVector(vector);
+
+   hypre_VectorComponent(local_vector) = component;
+
+   return hypre_error_flag;
+}
+
 /*--------------------------------------------------------------------------
  * hypre_ParVectorSetDataOwner
  *--------------------------------------------------------------------------*/
@@ -153,6 +210,21 @@ hypre_ParVectorSetDataOwner( hypre_ParVector *vector,
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_ParVectorSetLocalSize
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ParVectorSetLocalSize( hypre_ParVector *vector,
+                             HYPRE_Int        local_size )
+{
+   hypre_Vector *local_vector = hypre_ParVectorLocalVector(vector);
+
+   hypre_SeqVectorSetSize(local_vector, local_size);
+
+   return hypre_error_flag;
+}
+
 /*--------------------------------------------------------------------------
  * hypre_ParVectorSetNumVectors
  * call before calling hypre_ParVectorInitialize
@@ -163,7 +235,7 @@ HYPRE_Int
 hypre_ParVectorSetNumVectors( hypre_ParVector *vector,
                               HYPRE_Int        num_vectors )
 {
-   HYPRE_Int    ierr=0;
+   HYPRE_Int    ierr = 0;
    hypre_Vector *local_vector = hypre_ParVectorLocalVector(v);
 
    hypre_SeqVectorSetNumVectors( local_vector, num_vectors );
@@ -172,6 +244,22 @@ hypre_ParVectorSetNumVectors( hypre_ParVector *vector,
 }
 #endif
 
+/*--------------------------------------------------------------------------
+ * hypre_ParVectorResize
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ParVectorResize( hypre_ParVector *vector,
+                       HYPRE_Int        num_vectors )
+{
+   if (vector)
+   {
+      hypre_SeqVectorResize(hypre_ParVectorLocalVector(vector), num_vectors);
+   }
+
+   return hypre_error_flag;
+}
+
 /*--------------------------------------------------------------------------
  * hypre_ParVectorRead
  *--------------------------------------------------------------------------*/
@@ -180,7 +268,7 @@ hypre_ParVector*
 hypre_ParVectorRead( MPI_Comm    comm,
                      const char *file_name )
 {
-   char             new_file_name[80];
+   char             new_file_name[256];
    hypre_ParVector *par_vector;
    HYPRE_Int        my_id;
    HYPRE_BigInt     partitioning[2];
@@ -189,7 +277,7 @@ hypre_ParVectorRead( MPI_Comm    comm,
 
    hypre_MPI_Comm_rank(comm, &my_id);
 
-   hypre_sprintf(new_file_name,"%s.INFO.%d",file_name,my_id);
+   hypre_sprintf(new_file_name, "%s.INFO.%d", file_name, my_id);
    fp = fopen(new_file_name, "r");
    hypre_fscanf(fp, "%b\n", &global_size);
    hypre_fscanf(fp, "%b\n", &partitioning[0]);
@@ -201,14 +289,14 @@ hypre_ParVectorRead( MPI_Comm    comm,
    hypre_ParVectorGlobalSize(par_vector) = global_size;
 
    hypre_ParVectorFirstIndex(par_vector) = partitioning[0];
-   hypre_ParVectorLastIndex(par_vector) = partitioning[1]-1;
+   hypre_ParVectorLastIndex(par_vector) = partitioning[1] - 1;
 
    hypre_ParVectorPartitioning(par_vector)[0] = partitioning[0];
    hypre_ParVectorPartitioning(par_vector)[1] = partitioning[1];
 
    hypre_ParVectorOwnsData(par_vector) = 1;
 
-   hypre_sprintf(new_file_name,"%s.%d",file_name,my_id);
+   hypre_sprintf(new_file_name, "%s.%d", file_name, my_id);
    hypre_ParVectorLocalVector(par_vector) = hypre_SeqVectorRead(new_file_name);
 
    /* multivector code not written yet */
@@ -225,7 +313,7 @@ HYPRE_Int
 hypre_ParVectorPrint( hypre_ParVector  *vector,
                       const char       *file_name )
 {
-   char          new_file_name[80];
+   char          new_file_name[256];
    hypre_Vector *local_vector;
    MPI_Comm      comm;
    HYPRE_Int     my_id;
@@ -244,10 +332,10 @@ hypre_ParVectorPrint( hypre_ParVector  *vector,
    partitioning = hypre_ParVectorPartitioning(vector);
    global_size = hypre_ParVectorGlobalSize(vector);
 
-   hypre_MPI_Comm_rank(comm,&my_id);
-   hypre_sprintf(new_file_name,"%s.%d",file_name,my_id);
-   hypre_SeqVectorPrint(local_vector,new_file_name);
-   hypre_sprintf(new_file_name,"%s.INFO.%d",file_name,my_id);
+   hypre_MPI_Comm_rank(comm, &my_id);
+   hypre_sprintf(new_file_name, "%s.%d", file_name, my_id);
+   hypre_SeqVectorPrint(local_vector, new_file_name);
+   hypre_sprintf(new_file_name, "%s.INFO.%d", file_name, my_id);
    fp = fopen(new_file_name, "w");
    hypre_fprintf(fp, "%b\n", global_size);
    hypre_fprintf(fp, "%b\n", partitioning[0]);
@@ -268,7 +356,19 @@ hypre_ParVectorSetConstantValues( hypre_ParVector *v,
 {
    hypre_Vector *v_local = hypre_ParVectorLocalVector(v);
 
-   return hypre_SeqVectorSetConstantValues(v_local,value);
+   return hypre_SeqVectorSetConstantValues(v_local, value);
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_ParVectorSetZeros
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ParVectorSetZeros( hypre_ParVector *v )
+{
+   hypre_ParVectorAllZeros(v) = 1;
+
+   return hypre_ParVectorSetConstantValues(v, 0.0);
 }
 
 /*--------------------------------------------------------------------------
@@ -283,9 +383,9 @@ hypre_ParVectorSetRandomValues( hypre_ParVector *v,
    hypre_Vector *v_local = hypre_ParVectorLocalVector(v);
 
    MPI_Comm     comm = hypre_ParVectorComm(v);
-   hypre_MPI_Comm_rank(comm,&my_id);
+   hypre_MPI_Comm_rank(comm, &my_id);
 
-   seed *= (my_id+1);
+   seed *= (my_id + 1);
 
    return hypre_SeqVectorSetRandomValues(v_local, seed);
 }
@@ -300,12 +400,30 @@ hypre_ParVectorCopy( hypre_ParVector *x,
 {
    hypre_Vector *x_local = hypre_ParVectorLocalVector(x);
    hypre_Vector *y_local = hypre_ParVectorLocalVector(y);
+
    return hypre_SeqVectorCopy(x_local, y_local);
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_ParVectorStridedCopy
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ParVectorStridedCopy( hypre_ParVector *x,
+                            HYPRE_Int        istride,
+                            HYPRE_Int        ostride,
+                            HYPRE_Int        size,
+                            HYPRE_Complex   *data)
+{
+   hypre_Vector *x_local = hypre_ParVectorLocalVector(x);
+
+   return hypre_SeqVectorStridedCopy(x_local, istride, ostride, size, data);
+}
+
 /*--------------------------------------------------------------------------
  * hypre_ParVectorCloneShallow
- * returns a complete copy of a hypre_ParVector x - a shallow copy, re-using
+ *
+ * Returns a complete copy of a hypre_ParVector x - a shallow copy, re-using
  * the partitioning and data arrays of x
  *--------------------------------------------------------------------------*/
 
@@ -326,6 +444,10 @@ hypre_ParVectorCloneShallow( hypre_ParVector *x )
    return y;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_ParVectorCloneDeep_v2
+ *--------------------------------------------------------------------------*/
+
 hypre_ParVector *
 hypre_ParVectorCloneDeep_v2( hypre_ParVector *x, HYPRE_MemoryLocation memory_location )
 {
@@ -342,6 +464,10 @@ hypre_ParVectorCloneDeep_v2( hypre_ParVector *x, HYPRE_MemoryLocation memory_loc
    return y;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_ParVectorMigrate
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_ParVectorMigrate(hypre_ParVector *x, HYPRE_MemoryLocation memory_location)
 {
@@ -365,7 +491,6 @@ hypre_ParVectorMigrate(hypre_ParVector *x, HYPRE_MemoryLocation memory_location)
    return hypre_error_flag;
 }
 
-
 /*--------------------------------------------------------------------------
  * hypre_ParVectorScale
  *--------------------------------------------------------------------------*/
@@ -376,7 +501,7 @@ hypre_ParVectorScale( HYPRE_Complex    alpha,
 {
    hypre_Vector *y_local = hypre_ParVectorLocalVector(y);
 
-   return hypre_SeqVectorScale( alpha, y_local);
+   return hypre_SeqVectorScale(alpha, y_local);
 }
 
 /*--------------------------------------------------------------------------
@@ -391,7 +516,25 @@ hypre_ParVectorAxpy( HYPRE_Complex    alpha,
    hypre_Vector *x_local = hypre_ParVectorLocalVector(x);
    hypre_Vector *y_local = hypre_ParVectorLocalVector(y);
 
-   return hypre_SeqVectorAxpy( alpha, x_local, y_local);
+   return hypre_SeqVectorAxpy(alpha, x_local, y_local);
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_ParVectorAxpyz
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ParVectorAxpyz( HYPRE_Complex    alpha,
+                      hypre_ParVector *x,
+                      HYPRE_Complex    beta,
+                      hypre_ParVector *y,
+                      hypre_ParVector *z )
+{
+   hypre_Vector *x_local = hypre_ParVectorLocalVector(x);
+   hypre_Vector *y_local = hypre_ParVectorLocalVector(y);
+   hypre_Vector *z_local = hypre_ParVectorLocalVector(z);
+
+   return hypre_SeqVectorAxpyz(alpha, x_local, beta, y_local, z_local);
 }
 
 /*--------------------------------------------------------------------------
@@ -423,6 +566,7 @@ hypre_ParVectorInnerProd( hypre_ParVector *x,
 
 /*--------------------------------------------------------------------------
  * hypre_ParVectorElmdivpy
+ *
  * y = y + x ./ b [MATLAB Notation]
  *--------------------------------------------------------------------------*/
 
@@ -440,7 +584,8 @@ hypre_ParVectorElmdivpy( hypre_ParVector *x,
 
 /*--------------------------------------------------------------------------
  * hypre_ParVectorElmdivpyMarked
- * y[i] += x[i] / b[i] where marker[i] == marker_val 
+ *
+ * y[i] += x[i] / b[i] where marker[i] == marker_val
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
@@ -458,8 +603,9 @@ hypre_ParVectorElmdivpyMarked( hypre_ParVector *x,
 }
 
 /*--------------------------------------------------------------------------
- * hypre_VectorToParVector:
- * generates a ParVector from a Vector on proc 0 and distributes the pieces
+ * hypre_VectorToParVector
+ *
+ * Generates a ParVector from a Vector on proc 0 and distributes the pieces
  * to the other procs in comm
  *--------------------------------------------------------------------------*/
 
@@ -478,7 +624,7 @@ hypre_VectorToParVector ( MPI_Comm      comm,
    HYPRE_Int           global_vecstride, vecstride, idxstride;
    hypre_ParVector    *par_vector;
    hypre_Vector       *local_vector;
-   HYPRE_Complex      *v_data;
+   HYPRE_Complex      *v_data = NULL;
    HYPRE_Complex      *local_data;
    hypre_MPI_Request  *requests;
    hypre_MPI_Status   *status, status0;
@@ -495,11 +641,11 @@ hypre_VectorToParVector ( MPI_Comm      comm,
       global_vecstride = hypre_VectorVectorStride(v);
    }
 
-   hypre_MPI_Bcast(&global_size,1,HYPRE_MPI_INT,0,comm);
-   hypre_MPI_Bcast(&num_vectors,1,HYPRE_MPI_INT,0,comm);
-   hypre_MPI_Bcast(&global_vecstride,1,HYPRE_MPI_INT,0,comm);
+   hypre_MPI_Bcast(&global_size, 1, HYPRE_MPI_BIG_INT, 0, comm);
+   hypre_MPI_Bcast(&num_vectors, 1, HYPRE_MPI_INT, 0, comm);
+   hypre_MPI_Bcast(&global_vecstride, 1, HYPRE_MPI_INT, 0, comm);
 
-   if  (num_vectors == 1)
+   if (num_vectors == 1)
    {
       par_vector = hypre_ParVectorCreate(comm, global_size, vec_starts);
    }
@@ -515,10 +661,10 @@ hypre_VectorToParVector ( MPI_Comm      comm,
 
    if (my_id == 0)
    {
-      global_vec_starts = hypre_CTAlloc(HYPRE_BigInt, num_procs+1, HYPRE_MEMORY_HOST);
+      global_vec_starts = hypre_CTAlloc(HYPRE_BigInt, num_procs + 1, HYPRE_MEMORY_HOST);
    }
    hypre_MPI_Gather(&first_index, 1, HYPRE_MPI_BIG_INT, global_vec_starts,
-                     1, HYPRE_MPI_BIG_INT, 0, comm);
+                    1, HYPRE_MPI_BIG_INT, 0, comm);
    if (my_id == 0)
    {
       global_vec_starts[num_procs] = hypre_ParVectorGlobalSize(par_vector);
@@ -530,42 +676,46 @@ hypre_VectorToParVector ( MPI_Comm      comm,
    vecstride = hypre_VectorVectorStride(local_vector);
    idxstride = hypre_VectorIndexStride(local_vector);
    /* so far the only implemented multivector StorageMethod is 0 */
-   hypre_assert( idxstride==1 );
+   hypre_assert( idxstride == 1 );
 
    if (my_id == 0)
    {
-      requests = hypre_CTAlloc(hypre_MPI_Request, num_vectors*(num_procs-1), HYPRE_MEMORY_HOST);
-      status = hypre_CTAlloc(hypre_MPI_Status, num_vectors*(num_procs-1), HYPRE_MEMORY_HOST);
+      requests = hypre_CTAlloc(hypre_MPI_Request, num_vectors * (num_procs - 1), HYPRE_MEMORY_HOST);
+      status = hypre_CTAlloc(hypre_MPI_Status, num_vectors * (num_procs - 1), HYPRE_MEMORY_HOST);
       k = 0;
-      for (p = 1; p<num_procs; p++)
-         for (j = 0; j<num_vectors; ++j)
+      for (p = 1; p < num_procs; p++)
+         for (j = 0; j < num_vectors; ++j)
          {
-            hypre_MPI_Isend( &v_data[(HYPRE_Int) global_vec_starts[p]] + j*global_vecstride,
-                             (HYPRE_Int)(global_vec_starts[p+1] - global_vec_starts[p]),
+            hypre_MPI_Isend( &v_data[(HYPRE_Int) global_vec_starts[p]] + j * global_vecstride,
+                             (HYPRE_Int)(global_vec_starts[p + 1] - global_vec_starts[p]),
                              HYPRE_MPI_COMPLEX, p, 0, comm, &requests[k++] );
          }
       if (num_vectors == 1)
       {
          for (i = 0; i < local_size; i++)
+         {
             local_data[i] = v_data[i];
+         }
       }
       else
       {
-         for (j = 0; j<num_vectors; ++j)
+         for (j = 0; j < num_vectors; ++j)
          {
             for (i = 0; i < local_size; i++)
-               local_data[i+j*vecstride] = v_data[i+j*global_vecstride];
+            {
+               local_data[i + j * vecstride] = v_data[i + j * global_vecstride];
+            }
          }
       }
-      hypre_MPI_Waitall(num_procs-1,requests, status);
+      hypre_MPI_Waitall(num_procs - 1, requests, status);
       hypre_TFree(requests, HYPRE_MEMORY_HOST);
       hypre_TFree(status, HYPRE_MEMORY_HOST);
    }
    else
    {
-      for ( j=0; j<num_vectors; ++j )
-         hypre_MPI_Recv( local_data+j*vecstride, local_size, HYPRE_MPI_COMPLEX,
-                         0, 0, comm,&status0 );
+      for ( j = 0; j < num_vectors; ++j )
+         hypre_MPI_Recv( local_data + j * vecstride, local_size, HYPRE_MPI_COMPLEX,
+                         0, 0, comm, &status0 );
    }
 
    if (global_vec_starts)
@@ -577,53 +727,78 @@ hypre_VectorToParVector ( MPI_Comm      comm,
 }
 
 /*--------------------------------------------------------------------------
- * hypre_ParVectorToVectorAll:
- * generates a Vector on every proc which has a piece of the data
- * from a ParVector on several procs in comm,
- * vec_starts needs to contain the partitioning across all procs in comm
+ * hypre_ParVectorToVectorAll
  *--------------------------------------------------------------------------*/
 
 hypre_Vector *
 hypre_ParVectorToVectorAll( hypre_ParVector *par_v )
 {
-   MPI_Comm             comm = hypre_ParVectorComm(par_v);
-   HYPRE_BigInt         global_size = hypre_ParVectorGlobalSize(par_v);
-   hypre_Vector        *local_vector = hypre_ParVectorLocalVector(par_v);
-   HYPRE_Int            num_procs, my_id;
-   HYPRE_Int            num_vectors = hypre_ParVectorNumVectors(par_v);
-   hypre_Vector        *vector;
-   HYPRE_Complex       *vector_data;
-   HYPRE_Complex       *local_data;
-   HYPRE_Int            local_size;
-   hypre_MPI_Request   *requests;
-   hypre_MPI_Status    *status;
-   HYPRE_Int            i, j;
-   HYPRE_Int           *used_procs;
-   HYPRE_Int            num_types, num_requests;
-   HYPRE_Int            vec_len, proc_id;
-
-   HYPRE_Int *new_vec_starts;
-
-   HYPRE_Int num_contacts;
-   HYPRE_Int contact_proc_list[1];
-   HYPRE_Int contact_send_buf[1];
-   HYPRE_Int contact_send_buf_starts[2];
-   HYPRE_Int max_response_size;
-   HYPRE_Int *response_recv_buf=NULL;
-   HYPRE_Int *response_recv_buf_starts = NULL;
-   hypre_DataExchangeResponse response_obj;
-   hypre_ProcListElements send_proc_obj;
-
-   HYPRE_Int *send_info = NULL;
-   hypre_MPI_Status  status1;
-   HYPRE_Int count, tag1 = 112, tag2 = 223;
-   HYPRE_Int start;
+   return hypre_ParVectorToVectorAll_v2(par_v, hypre_ParVectorMemoryLocation(par_v));
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_ParVectorToVectorAll_v2
+ *
+ * Generates a Vector on every proc which has a piece of the data
+ * from a ParVector on several procs in comm.
+ * The resulting vector lives in the same memory space as the input vector.
+ * vec_starts needs to contain the partitioning across all procs in comm
+ *--------------------------------------------------------------------------*/
+
+hypre_Vector *
+hypre_ParVectorToVectorAll_v2( hypre_ParVector *par_v,
+                               HYPRE_MemoryLocation memory_location )
+{
+   MPI_Comm                     comm         = hypre_ParVectorComm(par_v);
+   HYPRE_Int                    num_vectors  = hypre_ParVectorNumVectors(par_v);
+   HYPRE_BigInt                 global_size  = hypre_ParVectorGlobalSize(par_v);
+   HYPRE_BigInt                 first_index  = hypre_ParVectorFirstIndex(par_v);
+   HYPRE_BigInt                 last_index   = hypre_ParVectorLastIndex(par_v);
+   hypre_Vector                *local_vector;
+
+   hypre_Vector                *vector;
+   HYPRE_Complex               *vector_data;
+   HYPRE_Complex               *local_data;
+   HYPRE_Int                    local_size;
+   hypre_MPI_Request           *requests;
+   hypre_MPI_Status            *status;
+   HYPRE_Int                    i, j;
+   HYPRE_Int                   *used_procs;
+   HYPRE_Int                    num_types, num_requests;
+   HYPRE_Int                    vec_len;
+
+   HYPRE_Int                   *new_vec_starts;
+
+   HYPRE_Int                    num_contacts;
+   HYPRE_Int                    contact_proc_list[1];
+   HYPRE_Int                    contact_send_buf[1];
+   HYPRE_Int                    contact_send_buf_starts[2];
+   HYPRE_Int                    max_response_size;
+   HYPRE_Int                   *response_recv_buf = NULL;
+   HYPRE_Int                   *response_recv_buf_starts = NULL;
+   hypre_DataExchangeResponse   response_obj;
+   hypre_ProcListElements       send_proc_obj;
+
+   HYPRE_Int                   *send_info = NULL;
+   hypre_MPI_Status             status1;
+   HYPRE_Int                    count, tag1 = 112, tag2 = 223;
+   HYPRE_Int                    start;
+   HYPRE_Int                    num_procs, my_id;
 
    hypre_MPI_Comm_size(comm, &num_procs);
    hypre_MPI_Comm_rank(comm, &my_id);
 
-   local_size = (HYPRE_Int)(hypre_ParVectorLastIndex(par_v) -
-      hypre_ParVectorFirstIndex(par_v) + 1);
+   local_size = (HYPRE_Int)(last_index - first_index + 1);
+   if (hypre_GetActualMemLocation(hypre_ParVectorMemoryLocation(par_v)) !=
+       hypre_GetActualMemLocation(HYPRE_MEMORY_HOST))
+   {
+      local_vector = hypre_SeqVectorCloneDeep_v2(hypre_ParVectorLocalVector(par_v),
+                                                 HYPRE_MEMORY_HOST);
+   }
+   else
+   {
+      local_vector = hypre_ParVectorLocalVector(par_v);
+   }
 
    /* determine procs which hold data of par_v and store ids in used_procs */
    /* we need to do an exchange data for this.  If I own row then I will contact
@@ -633,7 +808,7 @@ hypre_ParVectorToVectorAll( hypre_ParVector *par_v )
    {
       num_contacts = 1;
       contact_proc_list[0] = 0;
-      contact_send_buf[0] =  hypre_ParVectorLastIndex(par_v);
+      contact_send_buf[0]  = last_index;
       contact_send_buf_starts[0] = 0;
       contact_send_buf_starts[1] = 1;
    }
@@ -648,20 +823,19 @@ hypre_ParVectorToVectorAll( hypre_ParVector *par_v )
    /*send_proc_obj will  be for saving info from contacts */
    send_proc_obj.length = 0;
    send_proc_obj.storage_length = 10;
-   send_proc_obj.id = hypre_CTAlloc(HYPRE_Int,  send_proc_obj.storage_length, HYPRE_MEMORY_HOST);
-   send_proc_obj.vec_starts =
-      hypre_CTAlloc(HYPRE_Int,  send_proc_obj.storage_length + 1, HYPRE_MEMORY_HOST);
+   send_proc_obj.id = hypre_CTAlloc(HYPRE_Int, send_proc_obj.storage_length, HYPRE_MEMORY_HOST);
+   send_proc_obj.vec_starts = hypre_CTAlloc(HYPRE_Int, send_proc_obj.storage_length + 1,
+                                            HYPRE_MEMORY_HOST);
    send_proc_obj.vec_starts[0] = 0;
    send_proc_obj.element_storage_length = 10;
-   send_proc_obj.elements =
-      hypre_CTAlloc(HYPRE_BigInt,  send_proc_obj.element_storage_length, HYPRE_MEMORY_HOST);
+   send_proc_obj.elements = hypre_CTAlloc(HYPRE_BigInt, send_proc_obj.element_storage_length,
+                                          HYPRE_MEMORY_HOST);
 
    max_response_size = 0; /* each response is null */
    response_obj.fill_response = hypre_FillResponseParToVectorAll;
    response_obj.data1 = NULL;
    response_obj.data2 = &send_proc_obj; /*this is where we keep info from contacts*/
 
-
    hypre_DataExchangeList(num_contacts,
                           contact_proc_list, contact_send_buf,
                           contact_send_buf_starts, sizeof(HYPRE_Int),
@@ -682,21 +856,21 @@ hypre_ParVectorToVectorAll( hypre_ParVector *par_v )
          hypre_MPI_Probe(0, tag1, comm, &status1);
          hypre_MPI_Get_count(&status1, HYPRE_MPI_INT, &count);
 
-         send_info = hypre_CTAlloc(HYPRE_Int,  count, HYPRE_MEMORY_HOST);
+         send_info = hypre_CTAlloc(HYPRE_Int, count, HYPRE_MEMORY_HOST);
          hypre_MPI_Recv(send_info, count, HYPRE_MPI_INT, 0, tag1, comm, &status1);
 
          /* now unpack */
          num_types = send_info[0];
-         used_procs =  hypre_CTAlloc(HYPRE_Int,  num_types, HYPRE_MEMORY_HOST);
-         new_vec_starts = hypre_CTAlloc(HYPRE_Int,  num_types+1, HYPRE_MEMORY_HOST);
+         used_procs =  hypre_CTAlloc(HYPRE_Int, num_types, HYPRE_MEMORY_HOST);
+         new_vec_starts = hypre_CTAlloc(HYPRE_Int, num_types + 1, HYPRE_MEMORY_HOST);
 
-         for (i=1; i<= num_types; i++)
+         for (i = 1; i <= num_types; i++)
          {
-            used_procs[i-1] = (HYPRE_Int)send_info[i];
+            used_procs[i - 1] = (HYPRE_Int)send_info[i];
          }
-         for (i=num_types+1; i< count; i++)
+         for (i = num_types + 1; i < count; i++)
          {
-            new_vec_starts[i-num_types-1] = send_info[i] ;
+            new_vec_starts[i - num_types - 1] = send_info[i] ;
          }
       }
       else /* clean up and exit */
@@ -704,71 +878,74 @@ hypre_ParVectorToVectorAll( hypre_ParVector *par_v )
          hypre_TFree(send_proc_obj.vec_starts, HYPRE_MEMORY_HOST);
          hypre_TFree(send_proc_obj.id, HYPRE_MEMORY_HOST);
          hypre_TFree(send_proc_obj.elements, HYPRE_MEMORY_HOST);
-         if(response_recv_buf)        hypre_TFree(response_recv_buf, HYPRE_MEMORY_HOST);
-         if(response_recv_buf_starts) hypre_TFree(response_recv_buf_starts, HYPRE_MEMORY_HOST);
+         hypre_TFree(response_recv_buf, HYPRE_MEMORY_HOST);
+         hypre_TFree(response_recv_buf_starts, HYPRE_MEMORY_HOST);
+
          return NULL;
       }
    }
    else /* my_id ==0 */
    {
-      num_types = send_proc_obj.length;
-      used_procs =  hypre_CTAlloc(HYPRE_Int,  num_types, HYPRE_MEMORY_HOST);
-      new_vec_starts = hypre_CTAlloc(HYPRE_Int,  num_types+1, HYPRE_MEMORY_HOST);
+      num_types  = send_proc_obj.length;
+      used_procs = hypre_CTAlloc(HYPRE_Int, num_types, HYPRE_MEMORY_HOST);
+      new_vec_starts = hypre_CTAlloc(HYPRE_Int, num_types + 1, HYPRE_MEMORY_HOST);
 
       new_vec_starts[0] = 0;
-      for (i=0; i< num_types; i++)
+      for (i = 0; i < num_types; i++)
       {
          used_procs[i] = send_proc_obj.id[i];
-         new_vec_starts[i+1] = send_proc_obj.elements[i]+1;
+         new_vec_starts[i + 1] = send_proc_obj.elements[i] + 1;
       }
-      hypre_qsort0(used_procs, 0, num_types-1);
+      hypre_qsort0(used_procs, 0, num_types - 1);
       hypre_qsort0(new_vec_starts, 0, num_types);
+
       /*now we need to put into an array to send */
-      count =  2*num_types+2;
-      send_info = hypre_CTAlloc(HYPRE_Int,  count, HYPRE_MEMORY_HOST);
+      count = 2 * num_types + 2;
+      send_info = hypre_CTAlloc(HYPRE_Int, count, HYPRE_MEMORY_HOST);
       send_info[0] = num_types;
-      for (i=1; i<= num_types; i++)
+      for (i = 1; i <= num_types; i++)
       {
-         send_info[i] = (HYPRE_Int)used_procs[i-1];
+         send_info[i] = (HYPRE_Int) used_procs[i - 1];
       }
-      for (i=num_types+1; i< count; i++)
+      for (i = num_types + 1; i < count; i++)
       {
-         send_info[i] = new_vec_starts[i-num_types-1];
+         send_info[i] = new_vec_starts[i - num_types - 1];
       }
-      requests = hypre_CTAlloc(hypre_MPI_Request,  num_types, HYPRE_MEMORY_HOST);
-      status =  hypre_CTAlloc(hypre_MPI_Status,  num_types, HYPRE_MEMORY_HOST);
+      requests = hypre_CTAlloc(hypre_MPI_Request, num_types, HYPRE_MEMORY_HOST);
+      status   = hypre_CTAlloc(hypre_MPI_Status, num_types, HYPRE_MEMORY_HOST);
 
-      /* don't send to myself  - these are sorted so my id would be first*/
+      /* don't send to myself - these are sorted so my id would be first*/
       start = 0;
       if (used_procs[0] == 0)
       {
          start = 1;
       }
 
-
-      for (i=start; i < num_types; i++)
+      for (i = start; i < num_types; i++)
       {
          hypre_MPI_Isend(send_info, count, HYPRE_MPI_INT, used_procs[i],
-                         tag1, comm, &requests[i-start]);
+                         tag1, comm, &requests[i - start]);
       }
-      hypre_MPI_Waitall(num_types-start, requests, status);
+      hypre_MPI_Waitall(num_types - start, requests, status);
 
       hypre_TFree(status, HYPRE_MEMORY_HOST);
       hypre_TFree(requests, HYPRE_MEMORY_HOST);
    }
 
-   /* clean up */
+   /* Clean up */
    hypre_TFree(send_proc_obj.vec_starts, HYPRE_MEMORY_HOST);
    hypre_TFree(send_proc_obj.id, HYPRE_MEMORY_HOST);
    hypre_TFree(send_proc_obj.elements, HYPRE_MEMORY_HOST);
    hypre_TFree(send_info, HYPRE_MEMORY_HOST);
-   if(response_recv_buf)        hypre_TFree(response_recv_buf, HYPRE_MEMORY_HOST);
-   if(response_recv_buf_starts) hypre_TFree(response_recv_buf_starts, HYPRE_MEMORY_HOST);
+   hypre_TFree(response_recv_buf, HYPRE_MEMORY_HOST);
+   hypre_TFree(response_recv_buf_starts, HYPRE_MEMORY_HOST);
 
    /* now proc 0 can exit if it has no rows */
-   if (!local_size) {
+   if (!local_size)
+   {
       hypre_TFree(used_procs, HYPRE_MEMORY_HOST);
       hypre_TFree(new_vec_starts, HYPRE_MEMORY_HOST);
+
       return NULL;
    }
 
@@ -777,43 +954,44 @@ hypre_ParVectorToVectorAll( hypre_ParVector *par_v )
    /* this vector should be rather small */
 
    local_data = hypre_VectorData(local_vector);
-   vector = hypre_SeqVectorCreate((HYPRE_Int)global_size);
+   vector = hypre_SeqVectorCreate((HYPRE_Int) global_size);
    hypre_VectorNumVectors(vector) = num_vectors;
-   hypre_SeqVectorInitialize(vector);
+   hypre_SeqVectorInitialize_v2(vector, HYPRE_MEMORY_HOST);
    vector_data = hypre_VectorData(vector);
 
-   num_requests = 2*num_types;
+   num_requests = 2 * num_types;
 
-   requests = hypre_CTAlloc(hypre_MPI_Request,  num_requests, HYPRE_MEMORY_HOST);
-   status = hypre_CTAlloc(hypre_MPI_Status,  num_requests, HYPRE_MEMORY_HOST);
+   requests = hypre_CTAlloc(hypre_MPI_Request, num_requests, HYPRE_MEMORY_HOST);
+   status = hypre_CTAlloc(hypre_MPI_Status, num_requests, HYPRE_MEMORY_HOST);
 
    /* initialize data exchange among used_procs and generate vector  - here we
       send to ourself also*/
-
    j = 0;
    for (i = 0; i < num_types; i++)
    {
-      proc_id = used_procs[i];
-      vec_len = (HYPRE_Int)(new_vec_starts[i+1] - new_vec_starts[i]);
-      hypre_MPI_Irecv(&vector_data[(HYPRE_Int)new_vec_starts[i]], num_vectors*vec_len,
-                      HYPRE_MPI_COMPLEX, proc_id, tag2, comm, &requests[j++]);
+      vec_len = (HYPRE_Int) (new_vec_starts[i + 1] - new_vec_starts[i]);
+      hypre_MPI_Irecv(&vector_data[(HYPRE_Int)new_vec_starts[i]], num_vectors * vec_len,
+                      HYPRE_MPI_COMPLEX, used_procs[i], tag2, comm, &requests[j++]);
    }
    for (i = 0; i < num_types; i++)
    {
-      hypre_MPI_Isend(local_data, num_vectors*local_size, HYPRE_MPI_COMPLEX,
+      hypre_MPI_Isend(local_data, num_vectors * local_size, HYPRE_MPI_COMPLEX,
                       used_procs[i], tag2, comm, &requests[j++]);
    }
-
    hypre_MPI_Waitall(num_requests, requests, status);
 
-   if (num_requests)
-   {
-      hypre_TFree(requests, HYPRE_MEMORY_HOST);
-      hypre_TFree(status, HYPRE_MEMORY_HOST);
-      hypre_TFree(used_procs, HYPRE_MEMORY_HOST);
-   }
+   /* Move vector to final destination */
+   hypre_SeqVectorMigrate(vector, memory_location);
 
+   /* Free memory */
+   hypre_TFree(requests, HYPRE_MEMORY_HOST);
+   hypre_TFree(status, HYPRE_MEMORY_HOST);
+   hypre_TFree(used_procs, HYPRE_MEMORY_HOST);
    hypre_TFree(new_vec_starts, HYPRE_MEMORY_HOST);
+   if (local_vector != hypre_ParVectorLocalVector(par_v))
+   {
+      hypre_SeqVectorDestroy(local_vector);
+   }
 
    return vector;
 }
@@ -828,56 +1006,195 @@ hypre_ParVectorPrintIJ( hypre_ParVector *vector,
                         const char      *filename )
 {
    MPI_Comm          comm;
-   HYPRE_BigInt      global_size, j;
    HYPRE_BigInt     *partitioning;
-   HYPRE_Complex    *local_data;
-   HYPRE_Int         myid, num_procs, i, part0;
-   char              new_filename[255];
+   hypre_Vector     *local_vector;
+   HYPRE_Int         local_size;
+   HYPRE_Int         myid, num_procs, i, j;
+   char              new_filename[HYPRE_MAX_FILE_NAME_LEN];
+   char              msg[1024];
    FILE             *file;
+
    if (!vector)
    {
       hypre_error_in_arg(1);
       return hypre_error_flag;
    }
    comm         = hypre_ParVectorComm(vector);
-   global_size  = hypre_ParVectorGlobalSize(vector);
    partitioning = hypre_ParVectorPartitioning(vector);
-
-   /* multivector code not written yet */
-   hypre_assert( hypre_ParVectorNumVectors(vector) == 1 );
-   if ( hypre_ParVectorNumVectors(vector) != 1 ) hypre_error_in_arg(1);
+   local_vector = hypre_ParVectorLocalVector(vector);
+   local_size   = hypre_VectorSize(local_vector);
 
    hypre_MPI_Comm_rank(comm, &myid);
    hypre_MPI_Comm_size(comm, &num_procs);
 
-   hypre_sprintf(new_filename,"%s.%05d", filename, myid);
-
+   hypre_sprintf(new_filename, "%s.%05d", filename, myid);
    if ((file = fopen(new_filename, "w")) == NULL)
    {
-      hypre_error_w_msg(HYPRE_ERROR_GENERIC,"Error: can't open output file %s\n");
+      hypre_sprintf(msg, "Error: cannot open output file: %s", new_filename);
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, msg);
       return hypre_error_flag;
    }
 
-   local_data = hypre_VectorData(hypre_ParVectorLocalVector(vector));
+   /* Write header: global partitioning */
+   hypre_fprintf(file, "%b %b\n", partitioning[0] + base_j, partitioning[1] + base_j - 1);
 
-   hypre_fprintf(file, "%b \n", global_size);
-   for (i=0; i < 2; i++)
+   /* Write additional header line in the case of multi-component vectors */
+   if (hypre_ParVectorNumVectors(vector) > 1)
    {
-      hypre_fprintf(file, "%b ", partitioning[i] + base_j);
+      hypre_fprintf(file, "%d %d %d %d\n",
+                    hypre_VectorNumVectors(local_vector),
+                    hypre_VectorMultiVecStorageMethod(local_vector),
+                    hypre_VectorVectorStride(local_vector),
+                    hypre_VectorIndexStride(local_vector));
    }
-   hypre_fprintf(file, "\n");
 
-   part0 = partitioning[0];
-   for (j = part0; j < partitioning[1]; j++)
+   /* Write coefficients */
+   if (hypre_ParVectorNumVectors(vector) > 1)
    {
-      hypre_fprintf(file, "%b %.14e\n", j + base_j, local_data[(HYPRE_Int)(j-part0)]);
+      /* Multi-component vectors */
+      for (i = 0; i < local_size; i++)
+      {
+         hypre_fprintf(file, "%b", (HYPRE_BigInt) (i + base_j) + partitioning[0]);
+         for (j = 0; j < hypre_VectorNumVectors(local_vector); j++)
+         {
+            hypre_fprintf(file, " %.14e", hypre_VectorEntryIJ(local_vector, i, j));
+         }
+         hypre_fprintf(file, "\n");
+      }
+   }
+   else
+   {
+      /* Single-component (regular) vectors */
+      for (j = 0; j < local_size; j++)
+      {
+         hypre_fprintf(file, "%b %.14e\n",
+                       (HYPRE_BigInt) (j + base_j) + partitioning[0],
+                       hypre_VectorEntryI(local_vector, j));
+      }
    }
-
    fclose(file);
 
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_ParVectorPrintBinaryIJ
+ *
+ * Prints a ParVector in binary format. The data from each process is
+ * printed to a separate file. Metadata info about the vector is printed in
+ * the header section of every file, and followed by the vector entries
+ *
+ * The header section is composed by 8 entries stored in 64 bytes (8 bytes
+ * each) and their meanings are:
+ *
+ *    0) Header version
+ *    1) Number of bytes for storing a real type (vector entries)
+ *    2) Global index of the first vector entry in this process
+ *    3) Global index of the last vector entry in this process
+ *    4) Number of entries of a global vector
+ *    5) Number of entries of a local vector
+ *    6) Number of components of a vector
+ *    7) Storage method for multi-component vectors
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ParVectorPrintBinaryIJ( hypre_ParVector *par_vector,
+                              const char      *filename )
+{
+   MPI_Comm               comm = hypre_ParVectorComm(par_vector);
+   HYPRE_BigInt           global_size = hypre_ParVectorGlobalSize(par_vector);
+   HYPRE_BigInt          *partitioning = hypre_ParVectorPartitioning(par_vector);
+   HYPRE_MemoryLocation   memory_location = hypre_ParVectorMemoryLocation(par_vector);
+
+   hypre_ParVector       *h_parvector;
+   hypre_Vector          *h_vector;
+   HYPRE_Int              size;
+   HYPRE_Int              num_components;
+   HYPRE_Int              storage_method;
+
+   /* Local variables */
+   char                   new_filename[HYPRE_MAX_FILE_NAME_LEN];
+   FILE                  *fp;
+   size_t                 count, total_size;
+   hypre_uint64           header[8];
+   HYPRE_Int              one = 1;
+   HYPRE_Complex         *data;
+   HYPRE_Int              myid;
+
+   /* Exit if trying to write from big-endian machine */
+   if ((*(char*)&one) == 0)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Support to big-endian machines is incomplete!\n");
+      return hypre_error_flag;
+   }
+
+   /* MPI variables */
+   hypre_MPI_Comm_rank(comm, &myid);
+
+   /* Create temporary vector on host memory if needed */
+   h_parvector = (hypre_GetActualMemLocation(memory_location) == hypre_MEMORY_DEVICE) ?
+                 hypre_ParVectorCloneDeep_v2(par_vector, HYPRE_MEMORY_HOST) : par_vector;
+
+
+   /* Local vector variables */
+   h_vector = hypre_ParVectorLocalVector(h_parvector);
+   num_components = hypre_VectorNumVectors(h_vector);
+   storage_method = hypre_VectorMultiVecStorageMethod(h_vector);
+   data = hypre_VectorData(h_vector);
+   size = hypre_VectorSize(h_vector);
+   total_size = size * num_components;
+
+   /* Open binary file */
+   hypre_sprintf(new_filename, "%s.%05d.bin", filename, myid);
+   if ((fp = fopen(new_filename, "wb")) == NULL)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Could not open output file!");
+      return hypre_error_flag;
+   }
+
+   /*---------------------------------------------
+    * Write header (64 bytes)
+    *---------------------------------------------*/
+
+   count = 8;
+   header[0] = (hypre_uint64) 1; /* Header version */
+   header[1] = (hypre_uint64) sizeof(HYPRE_Complex);
+   header[2] = (hypre_uint64) partitioning[0];
+   header[3] = (hypre_uint64) partitioning[1];
+   header[4] = (hypre_uint64) global_size;
+   header[5] = (hypre_uint64) size;
+   header[6] = (hypre_uint64) num_components;
+   header[7] = (hypre_uint64) storage_method;
+   if (fwrite((const void*) header, sizeof(hypre_uint64), count, fp) != count)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Could not write all header entries\n");
+      return hypre_error_flag;
+   }
+
+   /*---------------------------------------------
+    * Write vector coefficients
+    *---------------------------------------------*/
+
+   count = fwrite((const void*) data, sizeof(HYPRE_Complex), total_size, fp);
+   if (count != total_size)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Could not write all entries\n");
+      return hypre_error_flag;
+   }
+
+   /*---------------------------------------------
+    * Finalize
+    *---------------------------------------------*/
+
+   fclose(fp);
+   if (h_parvector != par_vector)
+   {
+      hypre_ParVectorDestroy(h_parvector);
+   }
+
+   return hypre_error_flag;
+}
+
 /*--------------------------------------------------------------------------
  * hypre_ParVectorReadIJ
  * Warning: wrong base for assumed partition if base > 0
@@ -893,44 +1210,40 @@ hypre_ParVectorReadIJ( MPI_Comm          comm,
    hypre_ParVector  *vector;
    hypre_Vector     *local_vector;
    HYPRE_Complex    *local_data;
-   HYPRE_BigInt     *partitioning;
+   HYPRE_BigInt      big_local_size;
+   HYPRE_BigInt      partitioning[2] = {0, 0};
    HYPRE_Int         base_j;
 
-   HYPRE_Int         myid, num_procs, i, j;
-   char              new_filename[255];
+   HYPRE_Int         myid, num_procs, j;
+   char              new_filename[HYPRE_MAX_FILE_NAME_LEN];
    FILE             *file;
 
    hypre_MPI_Comm_size(comm, &num_procs);
    hypre_MPI_Comm_rank(comm, &myid);
 
-   hypre_sprintf(new_filename,"%s.%05d", filename, myid);
+   hypre_sprintf(new_filename, "%s.%05d", filename, myid);
 
    if ((file = fopen(new_filename, "r")) == NULL)
    {
-      hypre_error_w_msg(HYPRE_ERROR_GENERIC,"Error: can't open output file %s\n");
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Error: can't open output file %s\n");
       return hypre_error_flag;
    }
 
-   hypre_fscanf(file, "%b", &global_size);
    /* this may need to be changed so that the base is available in the file! */
-   partitioning = hypre_CTAlloc(HYPRE_BigInt, 2, HYPRE_MEMORY_HOST);
+   hypre_fscanf(file, "%b %b", partitioning[0], partitioning[1]);
+   big_local_size = partitioning[1] - partitioning[0] + 1;
+   hypre_MPI_Allreduce(&big_local_size, &global_size, 1, HYPRE_MPI_BIG_INT,
+                       hypre_MPI_SUM, comm);
 
-   hypre_fscanf(file, "%b", partitioning);
-   for (i = 0; i < 2; i++)
-   {
-      hypre_fscanf(file, "%b", partitioning+i);
-   }
    /* This is not yet implemented correctly! */
    base_j = 0;
-   vector = hypre_ParVectorCreate(comm, global_size,
-                                  partitioning);
-
-   hypre_ParVectorInitialize(vector);
+   vector = hypre_ParVectorCreate(comm, global_size, partitioning);
+   hypre_ParVectorInitialize_v2(vector, HYPRE_MEMORY_HOST);
 
    local_vector = hypre_ParVectorLocalVector(vector);
    local_data   = hypre_VectorData(local_vector);
 
-   for (j = 0; j < (HYPRE_Int)(partitioning[1] - partitioning[0]); j++)
+   for (j = 0; j < (HYPRE_Int) big_local_size; j++)
    {
       hypre_fscanf(file, "%b %le", &J, local_data + j);
    }
@@ -942,7 +1255,7 @@ hypre_ParVectorReadIJ( MPI_Comm          comm,
 
    /* multivector code not written yet */
    hypre_assert( hypre_ParVectorNumVectors(vector) == 1 );
-   if ( hypre_ParVectorNumVectors(vector) != 1 ) hypre_error(HYPRE_ERROR_GENERIC);
+   if ( hypre_ParVectorNumVectors(vector) != 1 ) { hypre_error(HYPRE_ERROR_GENERIC); }
 
    return hypre_error_flag;
 }
@@ -962,6 +1275,8 @@ hypre_FillResponseParToVectorAll( void       *p_recv_contact_buf,
                                   void      **p_send_response_buf,
                                   HYPRE_Int  *response_message_size )
 {
+   HYPRE_UNUSED_VAR(p_send_response_buf);
+
    HYPRE_Int     myid;
    HYPRE_Int     i, index, count, elength;
 
@@ -975,7 +1290,7 @@ hypre_FillResponseParToVectorAll( void       *p_recv_contact_buf,
    /*check to see if we need to allocate more space in send_proc_obj for ids*/
    if (send_proc_obj->length == send_proc_obj->storage_length)
    {
-      send_proc_obj->storage_length +=10; /*add space for 10 more processors*/
+      send_proc_obj->storage_length += 10; /*add space for 10 more processors*/
       send_proc_obj->id = hypre_TReAlloc(send_proc_obj->id, HYPRE_Int,
                                          send_proc_obj->storage_length, HYPRE_MEMORY_HOST);
       send_proc_obj->vec_starts =
@@ -1000,11 +1315,11 @@ hypre_FillResponseParToVectorAll( void       *p_recv_contact_buf,
       send_proc_obj->element_storage_length = elength;
    }
    /*populate send_proc_obj*/
-   for (i=0; i< contact_size; i++)
+   for (i = 0; i < contact_size; i++)
    {
       send_proc_obj->elements[index++] = recv_contact_buf[i];
    }
-   send_proc_obj->vec_starts[count+1] = index;
+   send_proc_obj->vec_starts[count + 1] = index;
    send_proc_obj->length++;
 
    /*output - no message to return (confirmation) */
@@ -1013,15 +1328,22 @@ hypre_FillResponseParToVectorAll( void       *p_recv_contact_buf,
    return hypre_error_flag;
 }
 
-/* -----------------------------------------------------------------------------
- * return the sum of all local elements of the vector
- * ----------------------------------------------------------------------------- */
+/*--------------------------------------------------------------------
+ * hypre_ParVectorLocalSumElts
+ *
+ * Return the sum of all local elements of the vector
+ *--------------------------------------------------------------------*/
 
-HYPRE_Complex hypre_ParVectorLocalSumElts( hypre_ParVector * vector )
+HYPRE_Complex
+hypre_ParVectorLocalSumElts( hypre_ParVector *vector )
 {
    return hypre_SeqVectorSumElts( hypre_ParVectorLocalVector(vector) );
 }
 
+/*--------------------------------------------------------------------
+ * hypre_ParVectorGetValuesHost
+ *--------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_ParVectorGetValuesHost(hypre_ParVector *vector,
                              HYPRE_Int        num_values,
@@ -1029,43 +1351,41 @@ hypre_ParVectorGetValuesHost(hypre_ParVector *vector,
                              HYPRE_BigInt     base,
                              HYPRE_Complex   *values)
 {
-   HYPRE_Int     i, ierr = 0;
-   HYPRE_BigInt  first_index = hypre_ParVectorFirstIndex(vector);
-   HYPRE_BigInt  last_index = hypre_ParVectorLastIndex(vector);
-   hypre_Vector *local_vector = hypre_ParVectorLocalVector(vector);
-   HYPRE_Complex *data = hypre_VectorData(local_vector);
+   HYPRE_BigInt    first_index  = hypre_ParVectorFirstIndex(vector);
+   HYPRE_BigInt    last_index   = hypre_ParVectorLastIndex(vector);
+   hypre_Vector   *local_vector = hypre_ParVectorLocalVector(vector);
 
-   /*
-   if (hypre_VectorOwnsData(local_vector) == 0)
-   {
-      hypre_error_w_msg(HYPRE_ERROR_GENERIC,"Vector does not own data! -- hypre_ParVectorGetValues.");
-      return hypre_error_flag;
-   }
-   */
+   HYPRE_Int       component    = hypre_VectorComponent(local_vector);
+   HYPRE_Int       vecstride    = hypre_VectorVectorStride(local_vector);
+   HYPRE_Int       idxstride    = hypre_VectorIndexStride(local_vector);
+   HYPRE_Complex  *data         = hypre_VectorData(local_vector);
+   HYPRE_Int       vecoffset    = component * vecstride;
+
+   HYPRE_Int       i, ierr = 0;
 
    if (indices)
    {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) reduction(+:ierr) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) reduction(+:ierr) HYPRE_SMP_SCHEDULE
 #endif
       for (i = 0; i < num_values; i++)
       {
          HYPRE_BigInt index = indices[i] - base;
          if (index < first_index || index > last_index)
          {
-            ierr ++;
+            ierr++;
          }
          else
          {
             HYPRE_Int local_index = (HYPRE_Int) (index - first_index);
-            values[i] = data[local_index];
+            values[i] = data[vecoffset + local_index * idxstride];
          }
       }
 
       if (ierr)
       {
          hypre_error_in_arg(3);
-         hypre_error_w_msg(HYPRE_ERROR_GENERIC,"Index out of range! -- hypre_ParVectorGetValues.");
+         hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Index out of range! -- hypre_ParVectorGetValues.");
          hypre_printf("Index out of range! -- hypre_ParVectorGetValues\n");
       }
    }
@@ -1078,17 +1398,21 @@ hypre_ParVectorGetValuesHost(hypre_ParVector *vector,
       }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
       for (i = 0; i < num_values; i++)
       {
-         values[i] = data[i];
+         values[i] = data[vecoffset + i * idxstride];
       }
    }
 
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------
+ * hypre_ParVectorGetValues2
+ *--------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_ParVectorGetValues2(hypre_ParVector *vector,
                           HYPRE_Int        num_values,
@@ -1096,7 +1420,7 @@ hypre_ParVectorGetValues2(hypre_ParVector *vector,
                           HYPRE_BigInt     base,
                           HYPRE_Complex   *values)
 {
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
    if (HYPRE_EXEC_DEVICE == hypre_GetExecPolicy1( hypre_ParVectorMemoryLocation(vector) ))
    {
       hypre_ParVectorGetValuesDevice(vector, num_values, indices, base, values);
@@ -1110,6 +1434,10 @@ hypre_ParVectorGetValues2(hypre_ParVector *vector,
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------
+ * hypre_ParVectorGetValues
+ *--------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_ParVectorGetValues(hypre_ParVector *vector,
                          HYPRE_Int        num_values,
diff --git a/external/hypre/src/parcsr_mv/par_vector.h b/external/hypre/src/parcsr_mv/par_vector.h
index d483a953..cc2316b8 100644
--- a/external/hypre/src/parcsr_mv/par_vector.h
+++ b/external/hypre/src/parcsr_mv/par_vector.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -37,6 +37,8 @@ typedef struct hypre_ParVector_struct
 
    /* Does the Vector create/destroy `data'? */
    HYPRE_Int             owns_data;
+   /* If the vector is all zeros */
+   HYPRE_Int             all_zeros;
 
    hypre_IJAssumedPart  *assumed_partition; /* only populated if this partition needed
                                               (for setting off-proc elements, for example)*/
@@ -52,13 +54,19 @@ typedef struct hypre_ParVector_struct
 #define hypre_ParVectorLastIndex(vector)        ((vector) -> last_index)
 #define hypre_ParVectorPartitioning(vector)     ((vector) -> partitioning)
 #define hypre_ParVectorActualLocalSize(vector)  ((vector) -> actual_local_size)
-#define hypre_ParVectorLocalVector(vector)      ((vector) -> local_vector)
 #define hypre_ParVectorOwnsData(vector)         ((vector) -> owns_data)
-#define hypre_ParVectorNumVectors(vector)       (hypre_VectorNumVectors(hypre_ParVectorLocalVector(vector)))
+#define hypre_ParVectorAllZeros(vector)         ((vector) -> all_zeros)
+#define hypre_ParVectorLocalVector(vector)      ((vector) -> local_vector)
+#define hypre_ParVectorLocalSize(vector)        ((vector) -> local_vector -> size)
+#define hypre_ParVectorLocalData(vector)        ((vector) -> local_vector -> data)
+#define hypre_ParVectorLocalStorage(vector)     ((vector) -> local_vector -> multivec_storage_method)
+#define hypre_ParVectorNumVectors(vector)       ((vector) -> local_vector -> num_vectors)
+#define hypre_ParVectorEntryI(vector, i)        (hypre_VectorEntryI((vector) -> local_vector, i))
+#define hypre_ParVectorEntryIJ(vector, i, j)    (hypre_VectorEntryIJ((vector) -> local_vector, i, j))
 
 #define hypre_ParVectorAssumedPartition(vector) ((vector) -> assumed_partition)
 
-static inline HYPRE_MemoryLocation
+static inline HYPRE_MAYBE_UNUSED_FUNC HYPRE_MemoryLocation
 hypre_ParVectorMemoryLocation(hypre_ParVector *vector)
 {
    return hypre_VectorMemoryLocation(hypre_ParVectorLocalVector(vector));
diff --git a/external/hypre/src/parcsr_mv/par_vector_batched.c b/external/hypre/src/parcsr_mv/par_vector_batched.c
index cf0a6e42..18dc8f80 100644
--- a/external/hypre/src/parcsr_mv/par_vector_batched.c
+++ b/external/hypre/src/parcsr_mv/par_vector_batched.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -29,7 +29,7 @@ hypre_ParVectorMassAxpy( HYPRE_Complex    *alpha,
    hypre_Vector *y_local = hypre_ParVectorLocalVector(y);
    x_local = hypre_TAlloc(hypre_Vector *, k, HYPRE_MEMORY_HOST);
 
-   for (i=0; i < k; i++)
+   for (i = 0; i < k; i++)
    {
       x_local[i] = hypre_ParVectorLocalVector(x[i]);
    }
@@ -59,7 +59,7 @@ hypre_ParVectorMassInnerProd( hypre_ParVector  *x,
    hypre_Vector **y_local;
    y_local = hypre_TAlloc(hypre_Vector *, k, HYPRE_MEMORY_HOST);
 
-   for (i=0; i < k; i++)
+   for (i = 0; i < k; i++)
    {
       y_local[i] = (hypre_Vector *) hypre_ParVectorLocalVector(y[i]);
    }
@@ -104,29 +104,30 @@ hypre_ParVectorMassDotpTwo ( hypre_ParVector  *x,
    hypre_Vector **z_local;
    z_local = hypre_TAlloc(hypre_Vector*, k, HYPRE_MEMORY_HOST);
 
-   for (i=0; i < k; i++)
+   for (i = 0; i < k; i++)
    {
       z_local[i] = (hypre_Vector *) hypre_ParVectorLocalVector(z[i]);
    }
 
-   local_result = hypre_CTAlloc(HYPRE_Real, 2*k, HYPRE_MEMORY_HOST);
-   result = hypre_CTAlloc(HYPRE_Real, 2*k, HYPRE_MEMORY_HOST);
+   local_result = hypre_CTAlloc(HYPRE_Real, 2 * k, HYPRE_MEMORY_HOST);
+   result = hypre_CTAlloc(HYPRE_Real, 2 * k, HYPRE_MEMORY_HOST);
 
-   hypre_SeqVectorMassDotpTwo(x_local, y_local, z_local, k, unroll, &local_result[0], &local_result[k]);
+   hypre_SeqVectorMassDotpTwo(x_local, y_local, z_local, k, unroll, &local_result[0],
+                              &local_result[k]);
 
 #ifdef HYPRE_PROFILE
    hypre_profile_times[HYPRE_TIMER_ID_ALL_REDUCE] -= hypre_MPI_Wtime();
 #endif
-   hypre_MPI_Allreduce(local_result, result, 2*k, HYPRE_MPI_REAL,
+   hypre_MPI_Allreduce(local_result, result, 2 * k, HYPRE_MPI_REAL,
                        hypre_MPI_SUM, comm);
 #ifdef HYPRE_PROFILE
    hypre_profile_times[HYPRE_TIMER_ID_ALL_REDUCE] += hypre_MPI_Wtime();
 #endif
 
-   for (i=0; i < k; i++)
+   for (i = 0; i < k; i++)
    {
       result_x[i] = result[i];
-      result_y[i] = result[k+i];
+      result_y[i] = result[k + i];
    }
    hypre_TFree(z_local, HYPRE_MEMORY_HOST);
    hypre_TFree(local_result, HYPRE_MEMORY_HOST);
diff --git a/external/hypre/src/parcsr_mv/par_vector_device.c b/external/hypre/src/parcsr_mv/par_vector_device.c
index e1b998ee..edd452bc 100644
--- a/external/hypre/src/parcsr_mv/par_vector_device.c
+++ b/external/hypre/src/parcsr_mv/par_vector_device.c
@@ -1,13 +1,14 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
  ******************************************************************************/
+#include "_hypre_onedpl.hpp"
 #include "_hypre_parcsr_mv.h"
 #include "_hypre_utilities.hpp"
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
 
 HYPRE_Int
 hypre_ParVectorGetValuesDevice(hypre_ParVector *vector,
@@ -16,31 +17,70 @@ hypre_ParVectorGetValuesDevice(hypre_ParVector *vector,
                                HYPRE_BigInt     base,
                                HYPRE_Complex   *values)
 {
-   HYPRE_Int     ierr = 0;
-   HYPRE_BigInt  first_index = hypre_ParVectorFirstIndex(vector);
-   HYPRE_BigInt  last_index = hypre_ParVectorLastIndex(vector);
-   hypre_Vector *local_vector = hypre_ParVectorLocalVector(vector);
-   HYPRE_Complex *data = hypre_VectorData(local_vector);
+   HYPRE_BigInt    first_index  = hypre_ParVectorFirstIndex(vector);
+   HYPRE_BigInt    last_index   = hypre_ParVectorLastIndex(vector);
+   hypre_Vector   *local_vector = hypre_ParVectorLocalVector(vector);
+
+   HYPRE_Int       component    = hypre_VectorComponent(local_vector);
+   HYPRE_Int       vecstride    = hypre_VectorVectorStride(local_vector);
+   HYPRE_Int       idxstride    = hypre_VectorIndexStride(local_vector);
+   HYPRE_Complex  *data         = hypre_VectorData(local_vector);
+   HYPRE_Int       vecoffset    = component * vecstride;
+
+   HYPRE_Int       ierr = 0;
+
+   if (idxstride != 1)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                        "hypre_ParVectorGetValuesDevice not implemented for non-columnwise vector storage\n");
+      return hypre_error_flag;
+   }
 
    /* If indices == NULL, assume that num_values components
       are to be retrieved from block starting at vec_start */
    if (indices)
    {
+#if defined(HYPRE_USING_SYCL)
+      ierr = HYPRE_ONEDPL_CALL( std::count_if,
+                                indices,
+                                indices + num_values,
+                                out_of_range<HYPRE_BigInt>(first_index + base, last_index + base) );
+#else
       ierr = HYPRE_THRUST_CALL( count_if,
                                 indices,
                                 indices + num_values,
                                 out_of_range<HYPRE_BigInt>(first_index + base, last_index + base) );
+#endif
       if (ierr)
       {
          hypre_error_in_arg(3);
-         hypre_error_w_msg(HYPRE_ERROR_GENERIC,"Index out of range! -- hypre_ParVectorGetValues.");
+         hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Index out of range! -- hypre_ParVectorGetValues.");
          hypre_printf(" error: %d indices out of range! -- hypre_ParVectorGetValues\n", ierr);
 
+#if defined(HYPRE_USING_SYCL)
+         auto trans_it = oneapi::dpl::make_transform_iterator(indices, [base,
+         first_index] (const auto & x) {return x - base - first_index;} );
+         hypreSycl_gather_if( trans_it,
+                              trans_it + num_values,
+                              indices,
+                              data + vecoffset,
+                              values,
+                              in_range<HYPRE_BigInt>(first_index + base, last_index + base) );
+      }
+      else
+      {
+         auto trans_it = oneapi::dpl::make_transform_iterator(indices, [base,
+         first_index] (const auto & x) {return x - base - first_index;} );
+         hypreSycl_gather( trans_it,
+                           trans_it + num_values,
+                           data + vecoffset,
+                           values);
+#else
          HYPRE_THRUST_CALL( gather_if,
                             thrust::make_transform_iterator(indices, _1 - base - first_index),
                             thrust::make_transform_iterator(indices, _1 - base - first_index) + num_values,
                             indices,
-                            data,
+                            data + vecoffset,
                             values,
                             in_range<HYPRE_BigInt>(first_index + base, last_index + base) );
       }
@@ -49,8 +89,9 @@ hypre_ParVectorGetValuesDevice(hypre_ParVector *vector,
          HYPRE_THRUST_CALL( gather,
                             thrust::make_transform_iterator(indices, _1 - base - first_index),
                             thrust::make_transform_iterator(indices, _1 - base - first_index) + num_values,
-                            data,
+                            data + vecoffset,
                             values);
+#endif
       }
    }
    else
@@ -61,10 +102,11 @@ hypre_ParVectorGetValuesDevice(hypre_ParVector *vector,
          return hypre_error_flag;
       }
 
-      hypre_TMemcpy(values, data, HYPRE_Complex, num_values, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+      hypre_TMemcpy(values, data + vecoffset, HYPRE_Complex, num_values,
+                    HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
    }
 
    return hypre_error_flag;
 }
 
-#endif // #if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#endif // #if defined(HYPRE_USING_GPU)
diff --git a/external/hypre/src/parcsr_mv/parchord_to_parcsr.c b/external/hypre/src/parcsr_mv/parchord_to_parcsr.c
index af08590b..ea023755 100644
--- a/external/hypre/src/parcsr_mv/parchord_to_parcsr.c
+++ b/external/hypre/src/parcsr_mv/parchord_to_parcsr.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -22,37 +22,37 @@
 void hypre_ParChordMatrix_RowStarts(
    hypre_ParChordMatrix *Ac, MPI_Comm comm,
    HYPRE_BigInt ** row_starts, HYPRE_BigInt * global_num_cols )
-   /* This function computes the ParCSRMatrix-style row_starts from a chord matrix.
-      It requires the the idofs of the chord matrix be partitioned among
-      processors, so their numbering is monotonic with the processor number;
-      see below.
-
-      The algorithm: each proc. p knows its min & max global row & col numbers.
-      Mins are first_index_rdof[p], first_index_idof[p]
-      ***IF*** these were in proper order (see below),
-      first_index_rdof[p] is row_starts[p].
-      Add num_rdofs-1 to get the max, i.e. add num_rdofs
-      to get row_starts[p+1] (IF the processors are ordered thus).
-      Compute these, then broadcast to the other processors to form
-      row_starts.
-      (We also could get global_num_rows by an AllReduce num_idofs.)
-      We get global_num_cols by taking the min and max over processors of
-      the min and max col no.s on each processor.
-
-      If the chord matrix is not ordered so the above will work, then we
-      would need to to completely move matrices around sometimes, a very expensive
-      operation.
-      The problem is that the chord matrix format makes no assumptions about
-      processor order, but the ParCSR format assumes that
-      p<q => (local row numbers of p) < (local row numbers of q)
-      Maybe instead I could change the global numbering scheme as part of this
-      conversion.
-      A closely related ordering-type problem to watch for: row_starts must be
-      a partition for a ParCSRMatrix.  In a ChordMatrix, the struct itself
-      makes no guarantees, but Panayot said, in essence, that row_starts will
-      be a partition.
-      col_starts should be NULL; later we shall let the Create function compute one.
-   */
+/* This function computes the ParCSRMatrix-style row_starts from a chord matrix.
+   It requires the the idofs of the chord matrix be partitioned among
+   processors, so their numbering is monotonic with the processor number;
+   see below.
+
+   The algorithm: each proc. p knows its min & max global row & col numbers.
+   Mins are first_index_rdof[p], first_index_idof[p]
+   ***IF*** these were in proper order (see below),
+   first_index_rdof[p] is row_starts[p].
+   Add num_rdofs-1 to get the max, i.e. add num_rdofs
+   to get row_starts[p+1] (IF the processors are ordered thus).
+   Compute these, then broadcast to the other processors to form
+   row_starts.
+   (We also could get global_num_rows by an AllReduce num_idofs.)
+   We get global_num_cols by taking the min and max over processors of
+   the min and max col no.s on each processor.
+
+   If the chord matrix is not ordered so the above will work, then we
+   would need to to completely move matrices around sometimes, a very expensive
+   operation.
+   The problem is that the chord matrix format makes no assumptions about
+   processor order, but the ParCSR format assumes that
+   p<q => (local row numbers of p) < (local row numbers of q)
+   Maybe instead I could change the global numbering scheme as part of this
+   conversion.
+   A closely related ordering-type problem to watch for: row_starts must be
+   a partition for a ParCSRMatrix.  In a ChordMatrix, the struct itself
+   makes no guarantees, but Panayot said, in essence, that row_starts will
+   be a partition.
+   col_starts should be NULL; later we shall let the Create function compute one.
+*/
 {
    HYPRE_BigInt * fis_idof = hypre_ParChordMatrixFirstindexIdof(Ac);
    HYPRE_BigInt * fis_rdof = hypre_ParChordMatrixFirstindexRdof(Ac);
@@ -66,8 +66,8 @@ void hypre_ParChordMatrix_RowStarts(
 
    hypre_MPI_Comm_rank(comm, &my_id);
    hypre_MPI_Comm_size(comm, &num_procs);
-   request = hypre_CTAlloc(hypre_MPI_Request,  1 , HYPRE_MEMORY_HOST);
-   status = hypre_CTAlloc(hypre_MPI_Status,  1 , HYPRE_MEMORY_HOST);
+   request = hypre_CTAlloc(hypre_MPI_Request,  1, HYPRE_MEMORY_HOST);
+   status = hypre_CTAlloc(hypre_MPI_Status,  1, HYPRE_MEMORY_HOST);
 
    min_rdof = fis_rdof[my_id];
    max_rdof = min_rdof + num_rdofs;
@@ -75,32 +75,41 @@ void hypre_ParChordMatrix_RowStarts(
    lens[1] = num_rdofs;
 
    /* row_starts (except last value */
-   *row_starts = hypre_CTAlloc( HYPRE_BigInt,  num_procs+1 , HYPRE_MEMORY_HOST);
-   for ( p=0; p<num_procs; ++p ) {
+   *row_starts = hypre_CTAlloc( HYPRE_BigInt,  num_procs + 1, HYPRE_MEMORY_HOST);
+   for ( p = 0; p < num_procs; ++p )
+   {
       (*row_starts)[p] = fis_idof[p];
    }
 
    /* check that ordering and partitioning of rows is as expected
       (much is missing, and even then not perfect)... */
-   if ( my_id<num_procs-1 )
-      hypre_MPI_Isend( lens, 2, HYPRE_MPI_INT, my_id+1, 0, comm, request );
-   if ( my_id>0 )
-      hypre_MPI_Recv( lastlens, 2, HYPRE_MPI_INT, my_id-1, 0, comm, status );
-   if ( my_id<num_procs-1 )
-	hypre_MPI_Waitall( 1, request, status);
-   if ( my_id>0 )
-      hypre_assert( (*row_starts)[my_id] == (*row_starts)[my_id-1] + (HYPRE_BigInt)lastlens[0] );
-   hypre_TFree( request , HYPRE_MEMORY_HOST);
-   hypre_TFree( status , HYPRE_MEMORY_HOST);
+   if ( my_id < num_procs - 1 )
+   {
+      hypre_MPI_Isend( lens, 2, HYPRE_MPI_INT, my_id + 1, 0, comm, request );
+   }
+   if ( my_id > 0 )
+   {
+      hypre_MPI_Recv( lastlens, 2, HYPRE_MPI_INT, my_id - 1, 0, comm, status );
+   }
+   if ( my_id < num_procs - 1 )
+   {
+      hypre_MPI_Waitall( 1, request, status);
+   }
+   if ( my_id > 0 )
+   {
+      hypre_assert( (*row_starts)[my_id] == (*row_starts)[my_id - 1] + (HYPRE_BigInt)lastlens[0] );
+   }
+   hypre_TFree( request, HYPRE_MEMORY_HOST);
+   hypre_TFree( status, HYPRE_MEMORY_HOST);
 
    /* Get the upper bound for all the rows */
-   hypre_MPI_Bcast( lens, 2, HYPRE_MPI_INT, num_procs-1, comm );
-   (*row_starts)[num_procs] = (*row_starts)[num_procs-1] + (HYPRE_Int)lens[0];
+   hypre_MPI_Bcast( lens, 2, HYPRE_MPI_INT, num_procs - 1, comm );
+   (*row_starts)[num_procs] = (*row_starts)[num_procs - 1] + (HYPRE_Int)lens[0];
 
    /* Global number of columns */
-/*   hypre_MPI_Allreduce( &num_rdofs, global_num_cols, 1, HYPRE_MPI_INT, hypre_MPI_SUM, comm );*/
-   hypre_MPI_Allreduce( &min_rdof, &global_min_rdof, 1, HYPRE_MPI_INT, hypre_MPI_MIN, comm );
-   hypre_MPI_Allreduce( &max_rdof, &global_max_rdof, 1, HYPRE_MPI_INT, hypre_MPI_MAX, comm );
+   /*   hypre_MPI_Allreduce( &num_rdofs, global_num_cols, 1, HYPRE_MPI_INT, hypre_MPI_SUM, comm );*/
+   hypre_MPI_Allreduce( &min_rdof, &global_min_rdof, 1, HYPRE_MPI_BIG_INT, hypre_MPI_MIN, comm );
+   hypre_MPI_Allreduce( &max_rdof, &global_max_rdof, 1, HYPRE_MPI_BIG_INT, hypre_MPI_MAX, comm );
    *global_num_cols = global_max_rdof - global_min_rdof;
 }
 
@@ -118,10 +127,10 @@ hypre_ParChordMatrixToParCSRMatrix(
    HYPRE_Int my_id, num_procs;
    HYPRE_Int num_cols_offd, num_nonzeros_diag, num_nonzeros_offd;
    HYPRE_Int *local_num_rows;
-/* not computed   HYPRE_Int          *local_num_nonzeros; */
+   /* not computed   HYPRE_Int          *local_num_nonzeros; */
    HYPRE_Int num_nonzeros;
    HYPRE_BigInt first_col_diag, last_col_diag;
-   HYPRE_Int i,ic,ij,ir,ilocal,p,r,r_p,r_global,r_local, jlen;
+   HYPRE_Int i, ic, ij, ir, ilocal, p, r, r_p, r_global, r_local, jlen;
    HYPRE_Int *a_i, *a_j, *ilen;
    HYPRE_Int **rdofs, **ps;
    HYPRE_Complex data;
@@ -133,7 +142,7 @@ hypre_ParChordMatrixToParCSRMatrix(
    hypre_MPI_Comm_size(comm, &num_procs);
 
    hypre_ParChordMatrix_RowStarts
-      ( Ac, comm, &row_starts, &global_num_cols );
+   ( Ac, comm, &row_starts, &global_num_cols );
    /* ... this function works correctly only under some assumptions;
       see the function definition for details */
    global_num_rows = row_starts[num_procs] - row_starts[0];
@@ -146,19 +155,22 @@ hypre_ParChordMatrixToParCSRMatrix(
    num_nonzeros_offd = 0;
 
    Ap  = hypre_ParCSRMatrixCreate( comm, global_num_rows, global_num_cols,
-                          row_starts, col_starts,
-                          num_cols_offd, num_nonzeros_diag, num_nonzeros_offd);
+                                   row_starts, col_starts,
+                                   num_cols_offd, num_nonzeros_diag, num_nonzeros_offd);
    *pAp = Ap;
 
    row_starts = hypre_ParCSRMatrixRowStarts(Ap);
    col_starts = hypre_ParCSRMatrixColStarts(Ap);
 
    local_num_rows = hypre_CTAlloc(HYPRE_Int,  num_procs, HYPRE_MEMORY_HOST);
-   for (i=0; i < num_procs; i++)
-         local_num_rows[i] = (HYPRE_Int)(row_starts[i+1] - row_starts[i]);
+   for (i = 0; i < num_procs; i++)
+   {
+      local_num_rows[i] = (HYPRE_Int)(row_starts[i + 1] - row_starts[i]);
+   }
 
    num_nonzeros = 0;
-   for ( p=0; p<hypre_ParChordMatrixNumInprocessors(Ac); ++p ) {
+   for ( p = 0; p < hypre_ParChordMatrixNumInprocessors(Ac); ++p )
+   {
       num_nonzeros += hypre_ParChordMatrixNumInchords(Ac)[p];
    };
 
@@ -167,20 +179,23 @@ hypre_ParChordMatrixToParCSRMatrix(
 
    /* Compute local CSRMatrix-like i,j arrays for this processor. */
 
-   ps = hypre_CTAlloc( HYPRE_Int*,  hypre_ParChordMatrixNumIdofs(Ac) , HYPRE_MEMORY_HOST);
-   rdofs = hypre_CTAlloc( HYPRE_Int*,  hypre_ParChordMatrixNumIdofs(Ac) , HYPRE_MEMORY_HOST);
-   datas = hypre_CTAlloc( HYPRE_Complex*,  hypre_ParChordMatrixNumIdofs(Ac) , HYPRE_MEMORY_HOST);
-   ilen  = hypre_CTAlloc( HYPRE_Int,  hypre_ParChordMatrixNumIdofs(Ac) , HYPRE_MEMORY_HOST);
+   ps = hypre_CTAlloc( HYPRE_Int*,  hypre_ParChordMatrixNumIdofs(Ac), HYPRE_MEMORY_HOST);
+   rdofs = hypre_CTAlloc( HYPRE_Int*,  hypre_ParChordMatrixNumIdofs(Ac), HYPRE_MEMORY_HOST);
+   datas = hypre_CTAlloc( HYPRE_Complex*,  hypre_ParChordMatrixNumIdofs(Ac), HYPRE_MEMORY_HOST);
+   ilen  = hypre_CTAlloc( HYPRE_Int,  hypre_ParChordMatrixNumIdofs(Ac), HYPRE_MEMORY_HOST);
    jlen = 0;
-   for ( i=0; i<hypre_ParChordMatrixNumIdofs(Ac); ++i ) {
+   for ( i = 0; i < hypre_ParChordMatrixNumIdofs(Ac); ++i )
+   {
       ilen[i] = 0;
-      ps[i] = hypre_CTAlloc( HYPRE_Int,  hypre_ParChordMatrixNumRdofs(Ac) , HYPRE_MEMORY_HOST);
-      rdofs[i] = hypre_CTAlloc( HYPRE_Int,  hypre_ParChordMatrixNumRdofs(Ac) , HYPRE_MEMORY_HOST);
-      datas[i] = hypre_CTAlloc( HYPRE_Complex,  hypre_ParChordMatrixNumRdofs(Ac) , HYPRE_MEMORY_HOST);
+      ps[i] = hypre_CTAlloc( HYPRE_Int,  hypre_ParChordMatrixNumRdofs(Ac), HYPRE_MEMORY_HOST);
+      rdofs[i] = hypre_CTAlloc( HYPRE_Int,  hypre_ParChordMatrixNumRdofs(Ac), HYPRE_MEMORY_HOST);
+      datas[i] = hypre_CTAlloc( HYPRE_Complex,  hypre_ParChordMatrixNumRdofs(Ac), HYPRE_MEMORY_HOST);
       /* ... rdofs[i], datas[i] will generally, not always, be much too big */
    }
-   for ( p=0; p<hypre_ParChordMatrixNumInprocessors(Ac); ++p ) {
-      for ( ic=0; ic<hypre_ParChordMatrixNumInchords(Ac)[p]; ++ic ) {
+   for ( p = 0; p < hypre_ParChordMatrixNumInprocessors(Ac); ++p )
+   {
+      for ( ic = 0; ic < hypre_ParChordMatrixNumInchords(Ac)[p]; ++ic )
+      {
          ilocal = hypre_ParChordMatrixInchordIdof(Ac)[p][ic];
          r = hypre_ParChordMatrixInchordRdof(Ac)[p][ic];
          data = hypre_ParChordMatrixInchordData(Ac)[p][ic];
@@ -192,14 +207,16 @@ hypre_ParChordMatrixToParCSRMatrix(
       }
    };
 
-   a_i = hypre_CTAlloc( HYPRE_Int,  hypre_ParChordMatrixNumIdofs(Ac)+1 , HYPRE_MEMORY_HOST);
-   a_j = hypre_CTAlloc( HYPRE_Int,  jlen , HYPRE_MEMORY_HOST);
-   a_data = hypre_CTAlloc( HYPRE_Complex,  jlen , HYPRE_MEMORY_HOST);
+   a_i = hypre_CTAlloc( HYPRE_Int,  hypre_ParChordMatrixNumIdofs(Ac) + 1, HYPRE_MEMORY_HOST);
+   a_j = hypre_CTAlloc( HYPRE_Int,  jlen, HYPRE_MEMORY_HOST);
+   a_data = hypre_CTAlloc( HYPRE_Complex,  jlen, HYPRE_MEMORY_HOST);
    a_i[0] = 0;
-   for ( ilocal=0; ilocal<hypre_ParChordMatrixNumIdofs(Ac); ++ilocal ) {
-      a_i[ilocal+1] = a_i[ilocal] + ilen[ilocal];
+   for ( ilocal = 0; ilocal < hypre_ParChordMatrixNumIdofs(Ac); ++ilocal )
+   {
+      a_i[ilocal + 1] = a_i[ilocal] + ilen[ilocal];
       ir = 0;
-      for ( ij=a_i[ilocal]; ij<a_i[ilocal+1]; ++ij ) {
+      for ( ij = a_i[ilocal]; ij < a_i[ilocal + 1]; ++ij )
+      {
          p = ps[ilocal][ir];
          r_p = rdofs[ilocal][ir];  /* local in proc. p */
          r_global = r_p + hypre_ParChordMatrixFirstindexRdof(Ac)[p];
@@ -210,18 +227,19 @@ hypre_ParChordMatrixToParCSRMatrix(
       };
    };
 
-   for ( i=0; i<hypre_ParChordMatrixNumIdofs(Ac); ++i ) {
-      hypre_TFree( ps[i] , HYPRE_MEMORY_HOST);
-      hypre_TFree( rdofs[i] , HYPRE_MEMORY_HOST);
-      hypre_TFree( datas[i] , HYPRE_MEMORY_HOST);
+   for ( i = 0; i < hypre_ParChordMatrixNumIdofs(Ac); ++i )
+   {
+      hypre_TFree( ps[i], HYPRE_MEMORY_HOST);
+      hypre_TFree( rdofs[i], HYPRE_MEMORY_HOST);
+      hypre_TFree( datas[i], HYPRE_MEMORY_HOST);
    };
-   hypre_TFree( ps , HYPRE_MEMORY_HOST);
-   hypre_TFree( rdofs , HYPRE_MEMORY_HOST);
-   hypre_TFree( datas , HYPRE_MEMORY_HOST);
-   hypre_TFree( ilen , HYPRE_MEMORY_HOST);
+   hypre_TFree( ps, HYPRE_MEMORY_HOST);
+   hypre_TFree( rdofs, HYPRE_MEMORY_HOST);
+   hypre_TFree( datas, HYPRE_MEMORY_HOST);
+   hypre_TFree( ilen, HYPRE_MEMORY_HOST);
 
    first_col_diag = col_starts[my_id];
-   last_col_diag = col_starts[my_id+1]-1;
+   last_col_diag = col_starts[my_id + 1] - 1;
 
    hypre_CSRMatrixData(local_A) = a_data;
    hypre_CSRMatrixI(local_A) = a_i;
@@ -243,7 +261,7 @@ hypre_ParChordMatrixToParCSRMatrix(
    }
    hypre_CSRMatrixDestroy(local_A);
    hypre_TFree(local_num_rows, HYPRE_MEMORY_HOST);
-/*   hypre_TFree(csr_matrix_datatypes);*/
+   /*   hypre_TFree(csr_matrix_datatypes);*/
    return 0;
 }
 
@@ -282,36 +300,39 @@ hypre_ParCSRMatrixToParChordMatrix(
 
    hypre_MPI_Comm_rank(comm, &my_id);
    hypre_MPI_Comm_size(comm, &num_procs);
-   num_idofs = row_starts[my_id+1] - row_starts[my_id];
-   num_rdofs = col_starts[my_id+1] - col_starts[my_id];
+   num_idofs = row_starts[my_id + 1] - row_starts[my_id];
+   num_rdofs = col_starts[my_id + 1] - col_starts[my_id];
 
    hypre_ParChordMatrixCreate( pAc, comm, num_idofs, num_rdofs );
    Ac = *pAc;
 
-/* The following block sets Inprocessor:
-   On each proc. my_id, we find the columns in the offd and diag blocks
-   (global no.s).  The columns are rdofs (contrary to what I wrote in
-   ChordMatrix.txt).
-   For each such col/rdof r, find the proc. p which owns row/idof r.
-   We set the temporary array pcr[p]=1 for such p.
-   An MPI all-to-all will exchange such arrays so my_id's array qcr has
-   qcr[q]=1 iff, on proc. q, pcr[my_id]=1.  In other words, qcr[q]=1 if
-   my_id owns a row/idof i which is the same as a col/rdof owned by q.
-   Collect all such q's into in the array Inprocessor.
-   While constructing pcr, we also construct pj such that for any index jj
-   into offd_j,offd_data, pj[jj] is the processor which owns jj as a row (idof)
-   (the number jj is local to this processor).
-   */
-   pcr = hypre_CTAlloc( HYPRE_Int,  num_procs , HYPRE_MEMORY_HOST);
-   qcr = hypre_CTAlloc( HYPRE_Int,  num_procs , HYPRE_MEMORY_HOST);
-   for ( p=0; p<num_procs; ++p ) pcr[p]=0;
-   for ( jj=0; jj<hypre_CSRMatrixNumNonzeros(offd); ++jj ) {
+   /* The following block sets Inprocessor:
+      On each proc. my_id, we find the columns in the offd and diag blocks
+      (global no.s).  The columns are rdofs (contrary to what I wrote in
+      ChordMatrix.txt).
+      For each such col/rdof r, find the proc. p which owns row/idof r.
+      We set the temporary array pcr[p]=1 for such p.
+      An MPI all-to-all will exchange such arrays so my_id's array qcr has
+      qcr[q]=1 iff, on proc. q, pcr[my_id]=1.  In other words, qcr[q]=1 if
+      my_id owns a row/idof i which is the same as a col/rdof owned by q.
+      Collect all such q's into in the array Inprocessor.
+      While constructing pcr, we also construct pj such that for any index jj
+      into offd_j,offd_data, pj[jj] is the processor which owns jj as a row (idof)
+      (the number jj is local to this processor).
+      */
+   pcr = hypre_CTAlloc( HYPRE_Int,  num_procs, HYPRE_MEMORY_HOST);
+   qcr = hypre_CTAlloc( HYPRE_Int,  num_procs, HYPRE_MEMORY_HOST);
+   for ( p = 0; p < num_procs; ++p ) { pcr[p] = 0; }
+   for ( jj = 0; jj < hypre_CSRMatrixNumNonzeros(offd); ++jj )
+   {
       j_local = offd_j[jj];
       j_global =  col_map_offd[j_local];
-      for ( p=0; p<num_procs; ++p ) {
-         if ( j_global >= row_starts[p] && j_global<row_starts[p+1] ) {
-            pcr[p]=1;
-/* not used yet...            pj[jj] = p;*/
+      for ( p = 0; p < num_procs; ++p )
+      {
+         if ( j_global >= row_starts[p] && j_global < row_starts[p + 1] )
+         {
+            pcr[p] = 1;
+            /* not used yet...            pj[jj] = p;*/
             break;
          }
       }
@@ -321,13 +342,16 @@ hypre_ParCSRMatrixToParChordMatrix(
    /* pcr[my_id] = 1; ...for square matrices (with nonzero diag block)
       this one line  would do the job of the following nested loop.
       For non-square matrices, the data distribution is too arbitrary. */
-   for ( jj=0; jj<hypre_CSRMatrixNumNonzeros(diag); ++jj ) {
+   for ( jj = 0; jj < hypre_CSRMatrixNumNonzeros(diag); ++jj )
+   {
       j_local = diag_j[jj];
       j_global = j_local + first_col_diag;
-      for ( p=0; p<num_procs; ++p ) {
-         if ( j_global >= row_starts[p] && j_global<row_starts[p+1] ) {
-            pcr[p]=1;
-/* not used yet...            pj[jj+jjd] = p;*/
+      for ( p = 0; p < num_procs; ++p )
+      {
+         if ( j_global >= row_starts[p] && j_global < row_starts[p + 1] )
+         {
+            pcr[p] = 1;
+            /* not used yet...            pj[jj+jjd] = p;*/
             break;
          }
       }
@@ -340,21 +364,21 @@ hypre_ParCSRMatrixToParChordMatrix(
     The array of such q's is the array Inprocessor. */
 
    num_inprocessors = 0;
-   for ( q=0; q<num_procs; ++q ) if ( qcr[q]==1 ) ++num_inprocessors;
-   inprocessor = hypre_CTAlloc( HYPRE_Int,  num_inprocessors , HYPRE_MEMORY_HOST);
+   for ( q = 0; q < num_procs; ++q ) if ( qcr[q] == 1 ) { ++num_inprocessors; }
+   inprocessor = hypre_CTAlloc( HYPRE_Int,  num_inprocessors, HYPRE_MEMORY_HOST);
    p = 0;
-   for ( q=0; q<num_procs; ++q ) if ( qcr[q]==1 ) inprocessor[ p++ ] = q;
+   for ( q = 0; q < num_procs; ++q ) if ( qcr[q] == 1 ) { inprocessor[ p++ ] = q; }
    num_toprocessors = 0;
-   for ( q=0; q<num_procs; ++q ) if ( pcr[q]==1 ) ++num_toprocessors;
-   toprocessor = hypre_CTAlloc( HYPRE_Int,  num_toprocessors , HYPRE_MEMORY_HOST);
+   for ( q = 0; q < num_procs; ++q ) if ( pcr[q] == 1 ) { ++num_toprocessors; }
+   toprocessor = hypre_CTAlloc( HYPRE_Int,  num_toprocessors, HYPRE_MEMORY_HOST);
    p = 0;
-   for ( q=0; q<num_procs; ++q ) if ( pcr[q]==1 ) toprocessor[ p++ ] = q;
+   for ( q = 0; q < num_procs; ++q ) if ( pcr[q] == 1 ) { toprocessor[ p++ ] = q; }
 
    hypre_ParChordMatrixNumInprocessors(Ac) = num_inprocessors;
    hypre_ParChordMatrixInprocessor(Ac) = inprocessor;
    hypre_ParChordMatrixNumToprocessors(Ac) = num_toprocessors;
    hypre_ParChordMatrixToprocessor(Ac) = toprocessor;
-   hypre_TFree( qcr , HYPRE_MEMORY_HOST);
+   hypre_TFree( qcr, HYPRE_MEMORY_HOST);
 
    /* FirstIndexIdof[p] is the global index of proc. p's row 0 */
    /* FirstIndexRdof[p] is the global index of proc. p's col 0 */
@@ -365,17 +389,18 @@ hypre_ParCSRMatrixToParChordMatrix(
       index of the first column in p (whether that's in the diag or offd block).
       So it's more involved than row/idof: we also check the offd block, and
       have to do a gather to get first_index_rdof for every proc. on every proc. */
-   first_index_idof = hypre_CTAlloc( HYPRE_Int,  num_procs+1 , HYPRE_MEMORY_HOST);
-   first_index_rdof = hypre_CTAlloc( HYPRE_Int,  num_procs+1 , HYPRE_MEMORY_HOST);
-   for ( p=0; p<=num_procs; ++p ) {
+   first_index_idof = hypre_CTAlloc( HYPRE_Int,  num_procs + 1, HYPRE_MEMORY_HOST);
+   first_index_rdof = hypre_CTAlloc( HYPRE_Int,  num_procs + 1, HYPRE_MEMORY_HOST);
+   for ( p = 0; p <= num_procs; ++p )
+   {
       first_index_idof[p] = row_starts[p];
       first_index_rdof[p] = col_starts[p];
    };
    if ( hypre_CSRMatrixNumRows(offd) > 0  && hypre_CSRMatrixNumCols(offd) > 0 )
       first_index_rdof[my_id] =
-         col_starts[my_id]<col_map_offd[0] ? col_starts[my_id] : col_map_offd[0];
+         col_starts[my_id] < col_map_offd[0] ? col_starts[my_id] : col_map_offd[0];
    hypre_MPI_Allgather( &first_index_rdof[my_id], 1, HYPRE_MPI_INT,
-                  first_index_rdof, 1, HYPRE_MPI_INT, comm );
+                        first_index_rdof, 1, HYPRE_MPI_INT, comm );
 
    /* Set num_inchords: num_inchords[p] is no. chords on my_id connected to p.
       Set each chord (idof,jdof,data).
@@ -384,36 +409,40 @@ hypre_ParCSRMatrixToParChordMatrix(
       inchord_rdof[p], inchord_data[p].
    */
 
-   inchord_idof = hypre_CTAlloc( HYPRE_Int*,  num_inprocessors , HYPRE_MEMORY_HOST);
-   inchord_rdof = hypre_CTAlloc( HYPRE_Int*,  num_inprocessors , HYPRE_MEMORY_HOST);
-   inchord_data = hypre_CTAlloc( HYPRE_Complex*,  num_inprocessors , HYPRE_MEMORY_HOST);
-   num_inchords = hypre_CTAlloc( HYPRE_Int,  num_inprocessors , HYPRE_MEMORY_HOST);
-   chord = hypre_CTAlloc( HYPRE_Int,  num_inprocessors , HYPRE_MEMORY_HOST);
-   chordto = hypre_CTAlloc( HYPRE_Int,  num_toprocessors , HYPRE_MEMORY_HOST);
+   inchord_idof = hypre_CTAlloc( HYPRE_Int*,  num_inprocessors, HYPRE_MEMORY_HOST);
+   inchord_rdof = hypre_CTAlloc( HYPRE_Int*,  num_inprocessors, HYPRE_MEMORY_HOST);
+   inchord_data = hypre_CTAlloc( HYPRE_Complex*,  num_inprocessors, HYPRE_MEMORY_HOST);
+   num_inchords = hypre_CTAlloc( HYPRE_Int,  num_inprocessors, HYPRE_MEMORY_HOST);
+   chord = hypre_CTAlloc( HYPRE_Int,  num_inprocessors, HYPRE_MEMORY_HOST);
+   chordto = hypre_CTAlloc( HYPRE_Int,  num_toprocessors, HYPRE_MEMORY_HOST);
    num_rdofs = 0;
-   for ( q=0; q<num_inprocessors; ++q ) num_inchords[q] = 0;
+   for ( q = 0; q < num_inprocessors; ++q ) { num_inchords[q] = 0; }
    my_q = -1;
-   for ( q=0; q<num_inprocessors; ++q ) if ( inprocessor[q]==my_id ) my_q = q;
-   hypre_assert( my_q>=0 );
+   for ( q = 0; q < num_inprocessors; ++q ) if ( inprocessor[q] == my_id ) { my_q = q; }
+   hypre_assert( my_q >= 0 );
 
    /* diag block: first count chords (from my_id to my_id),
       then set them from diag block's CSR data structure */
    num_idofs = hypre_CSRMatrixNumRows(diag);
    rdofs = hypre_NumbersNewNode();
-   for ( row=0; row<hypre_CSRMatrixNumRows(diag); ++row ) {
-      for ( i=hypre_CSRMatrixI(diag)[row]; i<hypre_CSRMatrixI(diag)[row+1]; ++i ) {
+   for ( row = 0; row < hypre_CSRMatrixNumRows(diag); ++row )
+   {
+      for ( i = hypre_CSRMatrixI(diag)[row]; i < hypre_CSRMatrixI(diag)[row + 1]; ++i )
+      {
          j_local = hypre_CSRMatrixJ(diag)[i];
          hypre_NumbersEnter( rdofs, j_local );
          ++num_inchords[my_q];
       }
    };
    num_rdofs = hypre_NumbersNEntered( rdofs );
-   inchord_idof[my_q] = hypre_CTAlloc( HYPRE_Int,  num_inchords[my_q] , HYPRE_MEMORY_HOST);
-   inchord_rdof[my_q] = hypre_CTAlloc( HYPRE_Int,  num_inchords[my_q] , HYPRE_MEMORY_HOST);
-   inchord_data[my_q] = hypre_CTAlloc( HYPRE_Complex,  num_inchords[my_q] , HYPRE_MEMORY_HOST);
+   inchord_idof[my_q] = hypre_CTAlloc( HYPRE_Int,  num_inchords[my_q], HYPRE_MEMORY_HOST);
+   inchord_rdof[my_q] = hypre_CTAlloc( HYPRE_Int,  num_inchords[my_q], HYPRE_MEMORY_HOST);
+   inchord_data[my_q] = hypre_CTAlloc( HYPRE_Complex,  num_inchords[my_q], HYPRE_MEMORY_HOST);
    chord[0] = 0;
-   for ( row=0; row<hypre_CSRMatrixNumRows(diag); ++row ) {
-      for ( i=hypre_CSRMatrixI(diag)[row]; i<hypre_CSRMatrixI(diag)[row+1]; ++i ) {
+   for ( row = 0; row < hypre_CSRMatrixNumRows(diag); ++row )
+   {
+      for ( i = hypre_CSRMatrixI(diag)[row]; i < hypre_CSRMatrixI(diag)[row + 1]; ++i )
+      {
          j_local = hypre_CSRMatrixJ(diag)[i];
          data = hypre_CSRMatrixData(diag)[i];
          inchord_idof[my_q][chord[0]] = row;
@@ -436,62 +465,74 @@ hypre_ParCSRMatrixToParChordMatrix(
 
    /* offd_cols_me duplicates rdofs */
    offd_cols_me = hypre_NumbersNewNode();
-   for ( row=0; row<hypre_CSRMatrixNumRows(offd); ++row ) {
-      for ( i=hypre_CSRMatrixI(offd)[row]; i<hypre_CSRMatrixI(offd)[row+1]; ++i ) {
+   for ( row = 0; row < hypre_CSRMatrixNumRows(offd); ++row )
+   {
+      for ( i = hypre_CSRMatrixI(offd)[row]; i < hypre_CSRMatrixI(offd)[row + 1]; ++i )
+      {
          j_local = hypre_CSRMatrixJ(offd)[i];
          j_global =  col_map_offd[j_local];
          hypre_NumbersEnter( offd_cols_me, j_global );
       }
    }
-   offd_col_array = hypre_CTAlloc( HYPRE_Int*,  num_inprocessors , HYPRE_MEMORY_HOST);
-   len_offd_col_array = hypre_CTAlloc( HYPRE_Int,  num_inprocessors , HYPRE_MEMORY_HOST);
+   offd_col_array = hypre_CTAlloc( HYPRE_Int*,  num_inprocessors, HYPRE_MEMORY_HOST);
+   len_offd_col_array = hypre_CTAlloc( HYPRE_Int,  num_inprocessors, HYPRE_MEMORY_HOST);
    offd_col_array_me = hypre_NumbersArray( offd_cols_me );
    len_offd_col_array_me = hypre_NumbersNEntered( offd_cols_me );
-   request = hypre_CTAlloc(hypre_MPI_Request,  2*num_procs , HYPRE_MEMORY_HOST);
+   request = hypre_CTAlloc(hypre_MPI_Request,  2 * num_procs, HYPRE_MEMORY_HOST);
    ireq = 0;
-   for ( q=0; q<num_inprocessors; ++q )
+   for ( q = 0; q < num_inprocessors; ++q )
       hypre_MPI_Irecv( &len_offd_col_array[q], 1, HYPRE_MPI_INT,
-                 inprocessor[q], 0, comm, &request[ireq++] );
-   for ( p=0; p<num_procs; ++p ) if ( pcr[p]==1 ) {
-      hypre_MPI_Isend( &len_offd_col_array_me, 1, HYPRE_MPI_INT, p, 0, comm, &request[ireq++] );
-   }
-   status = hypre_CTAlloc(hypre_MPI_Status,  ireq , HYPRE_MEMORY_HOST);
+                       inprocessor[q], 0, comm, &request[ireq++] );
+   for ( p = 0; p < num_procs; ++p ) if ( pcr[p] == 1 )
+      {
+         hypre_MPI_Isend( &len_offd_col_array_me, 1, HYPRE_MPI_INT, p, 0, comm, &request[ireq++] );
+      }
+   status = hypre_CTAlloc(hypre_MPI_Status,  ireq, HYPRE_MEMORY_HOST);
    hypre_MPI_Waitall( ireq, request, status );
    hypre_TFree(status, HYPRE_MEMORY_HOST);
    ireq = 0;
-   for ( q=0; q<num_inprocessors; ++q )
-      offd_col_array[q] = hypre_CTAlloc( HYPRE_Int,  len_offd_col_array[q] , HYPRE_MEMORY_HOST);
-   for ( q=0; q<num_inprocessors; ++q )
-      hypre_MPI_Irecv( offd_col_array[q], len_offd_col_array[q], HYPRE_MPI_INT,
-                 inprocessor[q], 0, comm, &request[ireq++] );
-   for ( p=0; p<num_procs; ++p ) if ( pcr[p]==1 ) {
-      hypre_MPI_Isend( offd_col_array_me, len_offd_col_array_me,
-                 HYPRE_MPI_INT, p, 0, comm, &request[ireq++] );
+   for ( q = 0; q < num_inprocessors; ++q )
+   {
+      offd_col_array[q] = hypre_CTAlloc( HYPRE_Int,  len_offd_col_array[q], HYPRE_MEMORY_HOST);
    }
-   status = hypre_CTAlloc(hypre_MPI_Status,  ireq , HYPRE_MEMORY_HOST);
+   for ( q = 0; q < num_inprocessors; ++q )
+      hypre_MPI_Irecv( offd_col_array[q], len_offd_col_array[q], HYPRE_MPI_INT,
+                       inprocessor[q], 0, comm, &request[ireq++] );
+   for ( p = 0; p < num_procs; ++p ) if ( pcr[p] == 1 )
+      {
+         hypre_MPI_Isend( offd_col_array_me, len_offd_col_array_me,
+                          HYPRE_MPI_INT, p, 0, comm, &request[ireq++] );
+      }
+   status = hypre_CTAlloc(hypre_MPI_Status,  ireq, HYPRE_MEMORY_HOST);
    hypre_MPI_Waitall( ireq, request, status );
    hypre_TFree(request, HYPRE_MEMORY_HOST);
    hypre_TFree(status, HYPRE_MEMORY_HOST);
-   offd_cols = hypre_CTAlloc( hypre_NumbersNode *,  num_inprocessors , HYPRE_MEMORY_HOST);
-   for ( q=0; q<num_inprocessors; ++q ) {
+   offd_cols = hypre_CTAlloc( hypre_NumbersNode *,  num_inprocessors, HYPRE_MEMORY_HOST);
+   for ( q = 0; q < num_inprocessors; ++q )
+   {
       offd_cols[q] = hypre_NumbersNewNode();
-      for ( i=0; i<len_offd_col_array[q]; ++i )
+      for ( i = 0; i < len_offd_col_array[q]; ++i )
+      {
          hypre_NumbersEnter( offd_cols[q], offd_col_array[q][i] );
+      }
    }
 
    len_num_rdofs_toprocessor = 1 + hypre_CSRMatrixI(offd)
-      [hypre_CSRMatrixNumRows(offd)];
-   inproc = hypre_CTAlloc( HYPRE_Int,  len_num_rdofs_toprocessor , HYPRE_MEMORY_HOST);
-   toproc = hypre_CTAlloc( HYPRE_Int,  len_num_rdofs_toprocessor , HYPRE_MEMORY_HOST);
-   num_rdofs_toprocessor = hypre_CTAlloc( HYPRE_Int,  len_num_rdofs_toprocessor , HYPRE_MEMORY_HOST);
-   for ( qto=0; qto<len_num_rdofs_toprocessor; ++qto ) {
+                               [hypre_CSRMatrixNumRows(offd)];
+   inproc = hypre_CTAlloc( HYPRE_Int,  len_num_rdofs_toprocessor, HYPRE_MEMORY_HOST);
+   toproc = hypre_CTAlloc( HYPRE_Int,  len_num_rdofs_toprocessor, HYPRE_MEMORY_HOST);
+   num_rdofs_toprocessor = hypre_CTAlloc( HYPRE_Int,  len_num_rdofs_toprocessor, HYPRE_MEMORY_HOST);
+   for ( qto = 0; qto < len_num_rdofs_toprocessor; ++qto )
+   {
       inproc[qto] = -1;
       toproc[qto] = -1;
       num_rdofs_toprocessor[qto] = 0;
    };
    rdofs = hypre_NumbersNewNode();
-   for ( row=0; row<hypre_CSRMatrixNumRows(offd); ++row ) {
-      for ( i=hypre_CSRMatrixI(offd)[row]; i<hypre_CSRMatrixI(offd)[row+1]; ++i ) {
+   for ( row = 0; row < hypre_CSRMatrixNumRows(offd); ++row )
+   {
+      for ( i = hypre_CSRMatrixI(offd)[row]; i < hypre_CSRMatrixI(offd)[row + 1]; ++i )
+      {
          j_local = hypre_CSRMatrixJ(offd)[i];
          j_global =  col_map_offd[j_local];
          hypre_NumbersEnter( rdofs, j_local );
@@ -504,45 +545,52 @@ hypre_ParCSRMatrixToParChordMatrix(
             an inprocessor (not unique) connected to a chord i.
          */
          inproc[i] = -1;
-         for ( q=0; q<num_inprocessors; ++q ) if (q!=my_q) {
-            p = inprocessor[q];
-            if ( hypre_NumbersQuery( offd_cols[q],
-                                     row+hypre_ParCSRMatrixFirstRowIndex(Ap) )
-                 == 1 ) {
-               /* row is one of the offd columns of p */
-               ++num_inchords[q];
-               inproc[i] = q;
-               break;
+         for ( q = 0; q < num_inprocessors; ++q ) if (q != my_q)
+            {
+               p = inprocessor[q];
+               if ( hypre_NumbersQuery( offd_cols[q],
+                                        row + hypre_ParCSRMatrixFirstRowIndex(Ap) )
+                    == 1 )
+               {
+                  /* row is one of the offd columns of p */
+                  ++num_inchords[q];
+                  inproc[i] = q;
+                  break;
+               }
             }
-         }
-         if ( inproc[i]<0 ) {
+         if ( inproc[i] < 0 )
+         {
             /* For square matrices, we would have found the column in some
                other processor's offd.  But for non-square matrices it could
                exist only in some other processor's diag...*/
             /* Note that all data in a diag block is stored.  We don't check
                whether the value of a data entry is zero. */
-            for ( q=0; q<num_inprocessors; ++q ) if (q!=my_q) {
-               p = inprocessor[q];
-               row_global = row+hypre_ParCSRMatrixFirstRowIndex(Ap);
-               if ( row_global>=col_starts[p] &&
-                    row_global< col_starts[p+1] ) {
-                  /* row is one of the diag columns of p */
-                  ++num_inchords[q];
-                  inproc[i] = q;
-                  break;
+            for ( q = 0; q < num_inprocessors; ++q ) if (q != my_q)
+               {
+                  p = inprocessor[q];
+                  row_global = row + hypre_ParCSRMatrixFirstRowIndex(Ap);
+                  if ( row_global >= col_starts[p] &&
+                       row_global < col_starts[p + 1] )
+                  {
+                     /* row is one of the diag columns of p */
+                     ++num_inchords[q];
+                     inproc[i] = q;
+                     break;
+                  }
                }
-            }
          }
-         hypre_assert( inproc[i]>=0 );
+         hypre_assert( inproc[i] >= 0 );
 
          /* Find the processor pto (local index qto) from the toprocessor list,
             which owns the row(idof) which is the  same as this processor's
             column(rdof) j_global. Update num_rdofs_toprocessor for pto.
             Save pto as toproc[i] for quick recall later. It represents
             the toprocessor connected to a chord i. */
-         for ( qto=0; qto<num_toprocessors; ++qto ) {
+         for ( qto = 0; qto < num_toprocessors; ++qto )
+         {
             pto = toprocessor[qto];
-            if ( j_global >= row_starts[pto] && j_global<row_starts[pto+1] ) {
+            if ( j_global >= row_starts[pto] && j_global < row_starts[pto + 1] )
+            {
                hypre_assert( qto < len_num_rdofs_toprocessor );
                ++num_rdofs_toprocessor[qto];
                /* ... an overestimate, as if two chords share an rdof, that
@@ -557,31 +605,37 @@ hypre_ParCSRMatrixToParChordMatrix(
    num_rdofs += hypre_NumbersNEntered(rdofs);
    hypre_NumbersDeleteNode(rdofs);
 
-   for ( q=0; q<num_inprocessors; ++q ) if (q!=my_q) {
-      inchord_idof[q] = hypre_CTAlloc( HYPRE_Int,  num_inchords[q] , HYPRE_MEMORY_HOST);
-      inchord_rdof[q] = hypre_CTAlloc( HYPRE_Int,  num_inchords[q] , HYPRE_MEMORY_HOST);
-      inchord_data[q] = hypre_CTAlloc( HYPRE_Complex,  num_inchords[q] , HYPRE_MEMORY_HOST);
-      chord[q] = 0;
-   };
-   for ( q=0; q<num_inprocessors; ++q ) if (q!=my_q) {
-      for ( i=0; i<num_inchords[q]; ++i ) {
-         inchord_idof[q][i] = -1;
-      }
-   };
-   rdof_toprocessor = hypre_CTAlloc( HYPRE_Int*,  num_toprocessors , HYPRE_MEMORY_HOST);
-   for ( qto=0; qto<num_toprocessors; ++qto )  /*if (qto!=my_q)*/ {
+   for ( q = 0; q < num_inprocessors; ++q ) if (q != my_q)
+      {
+         inchord_idof[q] = hypre_CTAlloc( HYPRE_Int,  num_inchords[q], HYPRE_MEMORY_HOST);
+         inchord_rdof[q] = hypre_CTAlloc( HYPRE_Int,  num_inchords[q], HYPRE_MEMORY_HOST);
+         inchord_data[q] = hypre_CTAlloc( HYPRE_Complex,  num_inchords[q], HYPRE_MEMORY_HOST);
+         chord[q] = 0;
+      };
+   for ( q = 0; q < num_inprocessors; ++q ) if (q != my_q)
+      {
+         for ( i = 0; i < num_inchords[q]; ++i )
+         {
+            inchord_idof[q][i] = -1;
+         }
+      };
+   rdof_toprocessor = hypre_CTAlloc( HYPRE_Int*,  num_toprocessors, HYPRE_MEMORY_HOST);
+   for ( qto = 0; qto < num_toprocessors; ++qto ) /*if (qto!=my_q)*/
+   {
       hypre_assert( qto < len_num_rdofs_toprocessor );
-      rdof_toprocessor[qto] = hypre_CTAlloc( HYPRE_Int,  num_rdofs_toprocessor[qto] , HYPRE_MEMORY_HOST);
+      rdof_toprocessor[qto] = hypre_CTAlloc( HYPRE_Int,  num_rdofs_toprocessor[qto], HYPRE_MEMORY_HOST);
       chordto[qto] = 0;
    };
-   for ( row=0; row<hypre_CSRMatrixNumRows(offd); ++row ) {
-      for ( i=hypre_CSRMatrixI(offd)[row]; i<hypre_CSRMatrixI(offd)[row+1]; ++i ) {
+   for ( row = 0; row < hypre_CSRMatrixNumRows(offd); ++row )
+   {
+      for ( i = hypre_CSRMatrixI(offd)[row]; i < hypre_CSRMatrixI(offd)[row + 1]; ++i )
+      {
          j_local = hypre_CSRMatrixJ(offd)[i];
          j_global =  col_map_offd[j_local];
          data = hypre_CSRMatrixData(offd)[i];
          qto = toproc[i];
          q = inproc[i];
-         hypre_assert( q!=my_q );
+         hypre_assert( q != my_q );
          hypre_assert( chord[q] < num_inchords[q] );
          inchord_idof[q][chord[q]] = row;
          j = j_global - first_index_rdof[q];
@@ -593,7 +647,8 @@ hypre_ParCSRMatrixToParChordMatrix(
             told about chord matrices. */
          hypre_assert( chord[q] < num_inchords[q] );
          ++chord[q];
-         if ( qto>=0 ) {
+         if ( qto >= 0 )
+         {
             /* There is an rdof processor for this chord */
             rdof_toprocessor[qto][chordto[qto]] = j;
             ++chordto[qto];
@@ -603,22 +658,27 @@ hypre_ParCSRMatrixToParChordMatrix(
    /* fix up overestimate of num_rdofs_toprocessor.  We're not going to
       bother to fix the excessive size which has been allocated to
       rdof_toprocessor... */
-   for ( qto=0; qto<num_toprocessors; ++qto )  /*if (qto!=my_q)*/ {
+   for ( qto = 0; qto < num_toprocessors; ++qto ) /*if (qto!=my_q)*/
+   {
       num_rdofs_toprocessor[qto] = chordto[qto] - 1;
    }
    hypre_NumbersDeleteNode( offd_cols_me );
-   for ( q=0; q<num_inprocessors; ++q )
+   for ( q = 0; q < num_inprocessors; ++q )
+   {
       hypre_NumbersDeleteNode( offd_cols[q]);
-   hypre_TFree( offd_cols , HYPRE_MEMORY_HOST);
-   for ( q=0; q<num_inprocessors; ++q )
-      hypre_TFree( offd_col_array[q] , HYPRE_MEMORY_HOST);
-   hypre_TFree( offd_col_array , HYPRE_MEMORY_HOST);
-   hypre_TFree( len_offd_col_array , HYPRE_MEMORY_HOST);
-   hypre_TFree( chordto , HYPRE_MEMORY_HOST);
-   hypre_TFree( inproc , HYPRE_MEMORY_HOST);
-   hypre_TFree( toproc , HYPRE_MEMORY_HOST);
-   hypre_TFree( chord , HYPRE_MEMORY_HOST);
-   hypre_TFree( pcr , HYPRE_MEMORY_HOST);
+   }
+   hypre_TFree( offd_cols, HYPRE_MEMORY_HOST);
+   for ( q = 0; q < num_inprocessors; ++q )
+   {
+      hypre_TFree( offd_col_array[q], HYPRE_MEMORY_HOST);
+   }
+   hypre_TFree( offd_col_array, HYPRE_MEMORY_HOST);
+   hypre_TFree( len_offd_col_array, HYPRE_MEMORY_HOST);
+   hypre_TFree( chordto, HYPRE_MEMORY_HOST);
+   hypre_TFree( inproc, HYPRE_MEMORY_HOST);
+   hypre_TFree( toproc, HYPRE_MEMORY_HOST);
+   hypre_TFree( chord, HYPRE_MEMORY_HOST);
+   hypre_TFree( pcr, HYPRE_MEMORY_HOST);
 
 
    hypre_ParChordMatrixFirstindexIdof(Ac) = first_index_idof;
@@ -634,13 +694,13 @@ hypre_ParCSRMatrixToParChordMatrix(
    hypre_ParChordMatrixRdofToprocessor(Ac) = rdof_toprocessor;
 
 
-/* >>> to set...
+   /* >>> to set...
 
-   hypre_ParChordMatrixNumIdofsInprocessor(Ac)  (low priority - not used);
-   hypre_ParChordMatrixIdofInprocessor(Ac)  (low priority - not used);
-*/
+      hypre_ParChordMatrixNumIdofsInprocessor(Ac)  (low priority - not used);
+      hypre_ParChordMatrixIdofInprocessor(Ac)  (low priority - not used);
+   */
 
    return 0;
-   }
+}
 
 
diff --git a/external/hypre/src/parcsr_mv/protos.h b/external/hypre/src/parcsr_mv/protos.h
index 28efef93..12749756 100644
--- a/external/hypre/src/parcsr_mv/protos.h
+++ b/external/hypre/src/parcsr_mv/protos.h
@@ -1,14 +1,23 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
  ******************************************************************************/
 
 /* communicationT.c */
-void hypre_RowsWithColumn_original ( HYPRE_Int *rowmin , HYPRE_Int *rowmax , HYPRE_BigInt column , hypre_ParCSRMatrix *A );
-void hypre_RowsWithColumn ( HYPRE_Int *rowmin , HYPRE_Int *rowmax , HYPRE_BigInt column , HYPRE_Int num_rows_diag , HYPRE_BigInt firstColDiag , HYPRE_BigInt *colMapOffd , HYPRE_Int *mat_i_diag , HYPRE_Int *mat_j_diag , HYPRE_Int *mat_i_offd , HYPRE_Int *mat_j_offd );
-void hypre_MatTCommPkgCreate_core ( MPI_Comm comm , HYPRE_BigInt *col_map_offd , HYPRE_BigInt first_col_diag , HYPRE_BigInt *col_starts , HYPRE_Int num_rows_diag , HYPRE_Int num_cols_diag , HYPRE_Int num_cols_offd , HYPRE_BigInt *row_starts , HYPRE_BigInt firstColDiag , HYPRE_BigInt *colMapOffd , HYPRE_Int *mat_i_diag , HYPRE_Int *mat_j_diag , HYPRE_Int *mat_i_offd , HYPRE_Int *mat_j_offd , HYPRE_Int data , HYPRE_Int *p_num_recvs , HYPRE_Int **p_recv_procs , HYPRE_Int **p_recv_vec_starts , HYPRE_Int *p_num_sends , HYPRE_Int **p_send_procs , HYPRE_Int **p_send_map_starts , HYPRE_Int **p_send_map_elmts );
+void hypre_RowsWithColumn_original ( HYPRE_Int *rowmin, HYPRE_Int *rowmax, HYPRE_BigInt column,
+                                     hypre_ParCSRMatrix *A );
+void hypre_RowsWithColumn ( HYPRE_Int *rowmin, HYPRE_Int *rowmax, HYPRE_BigInt column,
+                            HYPRE_Int num_rows_diag, HYPRE_BigInt firstColDiag, HYPRE_BigInt *colMapOffd, HYPRE_Int *mat_i_diag,
+                            HYPRE_Int *mat_j_diag, HYPRE_Int *mat_i_offd, HYPRE_Int *mat_j_offd );
+void hypre_MatTCommPkgCreate_core ( MPI_Comm comm, HYPRE_BigInt *col_map_offd,
+                                    HYPRE_BigInt first_col_diag, HYPRE_BigInt *col_starts, HYPRE_Int num_rows_diag,
+                                    HYPRE_Int num_cols_diag, HYPRE_Int num_cols_offd, HYPRE_BigInt *row_starts,
+                                    HYPRE_BigInt firstColDiag, HYPRE_BigInt *colMapOffd, HYPRE_Int *mat_i_diag, HYPRE_Int *mat_j_diag,
+                                    HYPRE_Int *mat_i_offd, HYPRE_Int *mat_j_offd, HYPRE_Int data, HYPRE_Int *p_num_recvs,
+                                    HYPRE_Int **p_recv_procs, HYPRE_Int **p_recv_vec_starts, HYPRE_Int *p_num_sends,
+                                    HYPRE_Int **p_send_procs, HYPRE_Int **p_send_map_starts, HYPRE_Int **p_send_map_elmts );
 HYPRE_Int hypre_MatTCommPkgCreate ( hypre_ParCSRMatrix *A );
 
 /* driver_aat.c */
@@ -28,290 +37,623 @@ HYPRE_Int hypre_MatTCommPkgCreate ( hypre_ParCSRMatrix *A );
 /* driver_multivec.c */
 
 /* HYPRE_parcsr_matrix.c */
-HYPRE_Int HYPRE_ParCSRMatrixCreate ( MPI_Comm comm , HYPRE_BigInt global_num_rows , HYPRE_BigInt global_num_cols , HYPRE_BigInt *row_starts , HYPRE_BigInt *col_starts , HYPRE_Int num_cols_offd , HYPRE_Int num_nonzeros_diag , HYPRE_Int num_nonzeros_offd , HYPRE_ParCSRMatrix *matrix );
+HYPRE_Int HYPRE_ParCSRMatrixCreate ( MPI_Comm comm, HYPRE_BigInt global_num_rows,
+                                     HYPRE_BigInt global_num_cols, HYPRE_BigInt *row_starts, HYPRE_BigInt *col_starts,
+                                     HYPRE_Int num_cols_offd, HYPRE_Int num_nonzeros_diag, HYPRE_Int num_nonzeros_offd,
+                                     HYPRE_ParCSRMatrix *matrix );
 HYPRE_Int HYPRE_ParCSRMatrixDestroy ( HYPRE_ParCSRMatrix matrix );
 HYPRE_Int HYPRE_ParCSRMatrixInitialize ( HYPRE_ParCSRMatrix matrix );
 HYPRE_Int HYPRE_ParCSRMatrixBigInitialize ( HYPRE_ParCSRMatrix matrix );
-HYPRE_Int HYPRE_ParCSRMatrixRead ( MPI_Comm comm , const char *file_name , HYPRE_ParCSRMatrix *matrix );
-HYPRE_Int HYPRE_ParCSRMatrixPrint ( HYPRE_ParCSRMatrix matrix , const char *file_name );
-HYPRE_Int HYPRE_ParCSRMatrixGetComm ( HYPRE_ParCSRMatrix matrix , MPI_Comm *comm );
-HYPRE_Int HYPRE_ParCSRMatrixGetDims ( HYPRE_ParCSRMatrix matrix , HYPRE_BigInt *M , HYPRE_BigInt *N );
-HYPRE_Int HYPRE_ParCSRMatrixGetRowPartitioning ( HYPRE_ParCSRMatrix matrix , HYPRE_BigInt **row_partitioning_ptr );
-HYPRE_Int HYPRE_ParCSRMatrixGetGlobalRowPartitioning ( HYPRE_ParCSRMatrix matrix , HYPRE_Int all_procs, HYPRE_BigInt **row_partitioning_ptr );
-HYPRE_Int HYPRE_ParCSRMatrixGetColPartitioning ( HYPRE_ParCSRMatrix matrix , HYPRE_BigInt **col_partitioning_ptr );
-HYPRE_Int HYPRE_ParCSRMatrixGetLocalRange ( HYPRE_ParCSRMatrix matrix , HYPRE_BigInt *row_start , HYPRE_BigInt *row_end , HYPRE_BigInt *col_start , HYPRE_BigInt *col_end );
-HYPRE_Int HYPRE_ParCSRMatrixGetRow ( HYPRE_ParCSRMatrix matrix , HYPRE_BigInt row , HYPRE_Int *size , HYPRE_BigInt **col_ind , HYPRE_Complex **values );
-HYPRE_Int HYPRE_ParCSRMatrixRestoreRow ( HYPRE_ParCSRMatrix matrix , HYPRE_BigInt row , HYPRE_Int *size , HYPRE_BigInt **col_ind , HYPRE_Complex **values );
-HYPRE_Int HYPRE_CSRMatrixToParCSRMatrix ( MPI_Comm comm , HYPRE_CSRMatrix A_CSR , HYPRE_BigInt *row_partitioning , HYPRE_BigInt *col_partitioning , HYPRE_ParCSRMatrix *matrix );
-HYPRE_Int HYPRE_CSRMatrixToParCSRMatrix_WithNewPartitioning ( MPI_Comm comm , HYPRE_CSRMatrix A_CSR , HYPRE_ParCSRMatrix *matrix );
-HYPRE_Int HYPRE_ParCSRMatrixMatvec ( HYPRE_Complex alpha , HYPRE_ParCSRMatrix A , HYPRE_ParVector x , HYPRE_Complex beta , HYPRE_ParVector y );
-HYPRE_Int HYPRE_ParCSRMatrixMatvecT ( HYPRE_Complex alpha , HYPRE_ParCSRMatrix A , HYPRE_ParVector x , HYPRE_Complex beta , HYPRE_ParVector y );
-HYPRE_Int hypre_ParCSRMatrixTruncate(hypre_ParCSRMatrix *A, HYPRE_Real tol, HYPRE_Int max_row_elmts, HYPRE_Int rescale, HYPRE_Int nrm_type);
+HYPRE_Int HYPRE_ParCSRMatrixRead ( MPI_Comm comm, const char *file_name,
+                                   HYPRE_ParCSRMatrix *matrix );
+HYPRE_Int HYPRE_ParCSRMatrixPrint ( HYPRE_ParCSRMatrix matrix, const char *file_name );
+HYPRE_Int HYPRE_ParCSRMatrixGetComm ( HYPRE_ParCSRMatrix matrix, MPI_Comm *comm );
+HYPRE_Int HYPRE_ParCSRMatrixGetDims ( HYPRE_ParCSRMatrix matrix, HYPRE_BigInt *M, HYPRE_BigInt *N );
+HYPRE_Int HYPRE_ParCSRMatrixGetRowPartitioning ( HYPRE_ParCSRMatrix matrix,
+                                                 HYPRE_BigInt **row_partitioning_ptr );
+HYPRE_Int HYPRE_ParCSRMatrixGetGlobalRowPartitioning ( HYPRE_ParCSRMatrix matrix,
+                                                       HYPRE_Int all_procs, HYPRE_BigInt **row_partitioning_ptr );
+HYPRE_Int HYPRE_ParCSRMatrixGetColPartitioning ( HYPRE_ParCSRMatrix matrix,
+                                                 HYPRE_BigInt **col_partitioning_ptr );
+HYPRE_Int HYPRE_ParCSRMatrixGetLocalRange ( HYPRE_ParCSRMatrix matrix, HYPRE_BigInt *row_start,
+                                            HYPRE_BigInt *row_end, HYPRE_BigInt *col_start, HYPRE_BigInt *col_end );
+HYPRE_Int HYPRE_ParCSRMatrixGetRow ( HYPRE_ParCSRMatrix matrix, HYPRE_BigInt row, HYPRE_Int *size,
+                                     HYPRE_BigInt **col_ind, HYPRE_Complex **values );
+HYPRE_Int HYPRE_ParCSRMatrixRestoreRow ( HYPRE_ParCSRMatrix matrix, HYPRE_BigInt row,
+                                         HYPRE_Int *size, HYPRE_BigInt **col_ind, HYPRE_Complex **values );
+HYPRE_Int HYPRE_CSRMatrixToParCSRMatrix ( MPI_Comm comm, HYPRE_CSRMatrix A_CSR,
+                                          HYPRE_BigInt *row_partitioning, HYPRE_BigInt *col_partitioning, HYPRE_ParCSRMatrix *matrix );
+HYPRE_Int HYPRE_CSRMatrixToParCSRMatrix_WithNewPartitioning ( MPI_Comm comm, HYPRE_CSRMatrix A_CSR,
+                                                              HYPRE_ParCSRMatrix *matrix );
+HYPRE_Int HYPRE_ParCSRMatrixMatvec ( HYPRE_Complex alpha, HYPRE_ParCSRMatrix A, HYPRE_ParVector x,
+                                     HYPRE_Complex beta, HYPRE_ParVector y );
+HYPRE_Int HYPRE_ParCSRMatrixMatvecT ( HYPRE_Complex alpha, HYPRE_ParCSRMatrix A, HYPRE_ParVector x,
+                                      HYPRE_Complex beta, HYPRE_ParVector y );
+
 /* HYPRE_parcsr_vector.c */
-HYPRE_Int HYPRE_ParVectorCreate ( MPI_Comm comm , HYPRE_BigInt global_size , HYPRE_BigInt *partitioning , HYPRE_ParVector *vector );
-HYPRE_Int HYPRE_ParMultiVectorCreate ( MPI_Comm comm , HYPRE_BigInt global_size , HYPRE_BigInt *partitioning , HYPRE_Int number_vectors , HYPRE_ParVector *vector );
+HYPRE_Int HYPRE_ParVectorCreate ( MPI_Comm comm, HYPRE_BigInt global_size,
+                                  HYPRE_BigInt *partitioning, HYPRE_ParVector *vector );
+HYPRE_Int HYPRE_ParMultiVectorCreate ( MPI_Comm comm, HYPRE_BigInt global_size,
+                                       HYPRE_BigInt *partitioning, HYPRE_Int number_vectors, HYPRE_ParVector *vector );
 HYPRE_Int HYPRE_ParVectorDestroy ( HYPRE_ParVector vector );
 HYPRE_Int HYPRE_ParVectorInitialize ( HYPRE_ParVector vector );
-HYPRE_Int HYPRE_ParVectorRead ( MPI_Comm comm , const char *file_name , HYPRE_ParVector *vector );
-HYPRE_Int HYPRE_ParVectorPrint ( HYPRE_ParVector vector , const char *file_name );
-HYPRE_Int HYPRE_ParVectorSetConstantValues ( HYPRE_ParVector vector , HYPRE_Complex value );
-HYPRE_Int HYPRE_ParVectorSetRandomValues ( HYPRE_ParVector vector , HYPRE_Int seed );
-HYPRE_Int HYPRE_ParVectorCopy ( HYPRE_ParVector x , HYPRE_ParVector y );
+HYPRE_Int HYPRE_ParVectorRead ( MPI_Comm comm, const char *file_name, HYPRE_ParVector *vector );
+HYPRE_Int HYPRE_ParVectorPrint ( HYPRE_ParVector vector, const char *file_name );
+HYPRE_Int HYPRE_ParVectorPrintBinaryIJ ( HYPRE_ParVector vector, const char *file_name );
+HYPRE_Int HYPRE_ParVectorSetConstantValues ( HYPRE_ParVector vector, HYPRE_Complex value );
+HYPRE_Int HYPRE_ParVectorSetRandomValues ( HYPRE_ParVector vector, HYPRE_Int seed );
+HYPRE_Int HYPRE_ParVectorCopy ( HYPRE_ParVector x, HYPRE_ParVector y );
+HYPRE_Int hypre_ParVectorStridedCopy( hypre_ParVector *x, HYPRE_Int istride, HYPRE_Int ostride,
+                                      HYPRE_Int size, HYPRE_Complex *data );
 HYPRE_ParVector HYPRE_ParVectorCloneShallow ( HYPRE_ParVector x );
-HYPRE_Int HYPRE_ParVectorScale ( HYPRE_Complex value , HYPRE_ParVector x );
-HYPRE_Int HYPRE_ParVectorAxpy ( HYPRE_Complex alpha , HYPRE_ParVector x , HYPRE_ParVector y );
-HYPRE_Int HYPRE_ParVectorInnerProd ( HYPRE_ParVector x , HYPRE_ParVector y , HYPRE_Real *prod );
-HYPRE_Int HYPRE_VectorToParVector ( MPI_Comm comm , HYPRE_Vector b , HYPRE_BigInt *partitioning , HYPRE_ParVector *vector );
-HYPRE_Int HYPRE_ParVectorGetValues ( HYPRE_ParVector vector, HYPRE_Int num_values, HYPRE_BigInt *indices , HYPRE_Complex *values);
-
-/*gen_fffc.c */
-HYPRE_Int hypre_ParCSRMatrixGenerateFFFC(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker , HYPRE_BigInt *cpts_starts , hypre_ParCSRMatrix *S, hypre_ParCSRMatrix **A_FC_ptr , hypre_ParCSRMatrix **A_FF_ptr ) ;
-HYPRE_Int hypre_ParCSRMatrixGenerateFFFC3(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker , HYPRE_BigInt *cpts_starts , hypre_ParCSRMatrix *S, hypre_ParCSRMatrix **A_FC_ptr , hypre_ParCSRMatrix **A_FF_ptr ) ;
-HYPRE_Int hypre_ParCSRMatrixGenerateFFFCD3(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker , HYPRE_BigInt *cpts_starts , hypre_ParCSRMatrix *S, hypre_ParCSRMatrix **A_FC_ptr , hypre_ParCSRMatrix **A_FF_ptr , HYPRE_Real **D_lambda_ptr ) ;
-HYPRE_Int hypre_ParCSRMatrixGenerateFFFC3Device(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker , HYPRE_BigInt *cpts_starts , hypre_ParCSRMatrix *S, hypre_ParCSRMatrix **A_FC_ptr , hypre_ParCSRMatrix **A_FF_ptr ) ;
-HYPRE_Int hypre_ParCSRMatrixGenerateCFDevice( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker_host, HYPRE_BigInt *cpts_starts, hypre_ParCSRMatrix *S, hypre_ParCSRMatrix **ACF_ptr) ;
-HYPRE_Int hypre_ParCSRMatrixGenerateCCDevice( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker_host, HYPRE_BigInt *cpts_starts, hypre_ParCSRMatrix *S, hypre_ParCSRMatrix **ACC_ptr) ;
-HYPRE_Int hypre_ParCSRMatrixGenerate1DCFDevice( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker_host, HYPRE_BigInt *cpts_starts, hypre_ParCSRMatrix *S, hypre_ParCSRMatrix **ACX_ptr, hypre_ParCSRMatrix **AXC_ptr ) ;
+HYPRE_Int HYPRE_ParVectorScale ( HYPRE_Complex value, HYPRE_ParVector x );
+HYPRE_Int HYPRE_ParVectorAxpy ( HYPRE_Complex alpha, HYPRE_ParVector x, HYPRE_ParVector y );
+HYPRE_Int HYPRE_ParVectorInnerProd ( HYPRE_ParVector x, HYPRE_ParVector y, HYPRE_Real *prod );
+HYPRE_Int HYPRE_VectorToParVector ( MPI_Comm comm, HYPRE_Vector b, HYPRE_BigInt *partitioning,
+                                    HYPRE_ParVector *vector );
+HYPRE_Int HYPRE_ParVectorGetValues ( HYPRE_ParVector vector, HYPRE_Int num_values,
+                                     HYPRE_BigInt *indices, HYPRE_Complex *values);
+
+/* gen_fffc.c */
+HYPRE_Int hypre_ParCSRMatrixGenerateFFFCHost( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                              HYPRE_BigInt *cpts_starts, hypre_ParCSRMatrix *S,
+                                              hypre_ParCSRMatrix **A_FC_ptr,
+                                              hypre_ParCSRMatrix **A_FF_ptr ) ;
+HYPRE_Int hypre_ParCSRMatrixGenerateFFFC( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                          HYPRE_BigInt *cpts_starts, hypre_ParCSRMatrix *S,
+                                          hypre_ParCSRMatrix **A_FC_ptr,
+                                          hypre_ParCSRMatrix **A_FF_ptr ) ;
+HYPRE_Int hypre_ParCSRMatrixGenerateFFFC3(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                          HYPRE_BigInt *cpts_starts, hypre_ParCSRMatrix *S, hypre_ParCSRMatrix **A_FC_ptr,
+                                          hypre_ParCSRMatrix **A_FF_ptr ) ;
+HYPRE_Int hypre_ParCSRMatrixGenerateFFFCD3(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                           HYPRE_BigInt *cpts_starts, hypre_ParCSRMatrix *S, hypre_ParCSRMatrix **A_FC_ptr,
+                                           hypre_ParCSRMatrix **A_FF_ptr, HYPRE_Real **D_lambda_ptr ) ;
+HYPRE_Int hypre_ParCSRMatrixGenerateFFFC3Device(hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                                HYPRE_BigInt *cpts_starts, hypre_ParCSRMatrix *S, hypre_ParCSRMatrix **A_FC_ptr,
+                                                hypre_ParCSRMatrix **A_FF_ptr ) ;
+HYPRE_Int hypre_ParCSRMatrixGenerateCFDevice( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                              HYPRE_BigInt *cpts_starts, hypre_ParCSRMatrix *S, hypre_ParCSRMatrix **ACF_ptr) ;
+HYPRE_Int hypre_ParCSRMatrixGenerateCCDevice( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                              HYPRE_BigInt *cpts_starts, hypre_ParCSRMatrix *S, hypre_ParCSRMatrix **ACC_ptr) ;
+HYPRE_Int hypre_ParCSRMatrixGenerate1DCFDevice( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                                HYPRE_BigInt *cpts_starts, hypre_ParCSRMatrix *S, hypre_ParCSRMatrix **ACX_ptr,
+                                                hypre_ParCSRMatrix **AXC_ptr ) ;
 
 /* new_commpkg.c */
-HYPRE_Int hypre_PrintCommpkg ( hypre_ParCSRMatrix *A , const char *file_name );
-HYPRE_Int hypre_ParCSRCommPkgCreateApart_core ( MPI_Comm comm , HYPRE_BigInt *col_map_off_d , HYPRE_BigInt first_col_diag , HYPRE_Int num_cols_off_d , HYPRE_BigInt global_num_cols , HYPRE_Int *p_num_recvs , HYPRE_Int **p_recv_procs , HYPRE_Int **p_recv_vec_starts , HYPRE_Int *p_num_sends , HYPRE_Int **p_send_procs , HYPRE_Int **p_send_map_starts , HYPRE_Int **p_send_map_elements , hypre_IJAssumedPart *apart );
-HYPRE_Int hypre_ParCSRCommPkgCreateApart ( MPI_Comm  comm, HYPRE_BigInt *col_map_off_d, HYPRE_BigInt  first_col_diag, HYPRE_Int  num_cols_off_d, HYPRE_BigInt  global_num_cols, hypre_IJAssumedPart *apart, hypre_ParCSRCommPkg *comm_pkg );
+HYPRE_Int hypre_PrintCommpkg ( hypre_ParCSRMatrix *A, const char *file_name );
+HYPRE_Int hypre_ParCSRCommPkgCreateApart_core ( MPI_Comm comm, HYPRE_BigInt *col_map_off_d,
+                                                HYPRE_BigInt first_col_diag, HYPRE_Int num_cols_off_d, HYPRE_BigInt global_num_cols,
+                                                HYPRE_Int *p_num_recvs, HYPRE_Int **p_recv_procs, HYPRE_Int **p_recv_vec_starts,
+                                                HYPRE_Int *p_num_sends, HYPRE_Int **p_send_procs, HYPRE_Int **p_send_map_starts,
+                                                HYPRE_Int **p_send_map_elements, hypre_IJAssumedPart *apart );
+HYPRE_Int hypre_ParCSRCommPkgCreateApart ( MPI_Comm  comm, HYPRE_BigInt *col_map_off_d,
+                                           HYPRE_BigInt  first_col_diag, HYPRE_Int  num_cols_off_d, HYPRE_BigInt  global_num_cols,
+                                           hypre_IJAssumedPart *apart, hypre_ParCSRCommPkg *comm_pkg );
 HYPRE_Int hypre_NewCommPkgDestroy ( hypre_ParCSRMatrix *parcsr_A );
-HYPRE_Int hypre_RangeFillResponseIJDetermineRecvProcs ( void *p_recv_contact_buf , HYPRE_Int contact_size , HYPRE_Int contact_proc , void *ro , MPI_Comm comm , void **p_send_response_buf , HYPRE_Int *response_message_size );
-HYPRE_Int hypre_FillResponseIJDetermineSendProcs ( void *p_recv_contact_buf , HYPRE_Int contact_size , HYPRE_Int contact_proc , void *ro , MPI_Comm comm , void **p_send_response_buf , HYPRE_Int *response_message_size );
+HYPRE_Int hypre_RangeFillResponseIJDetermineRecvProcs ( void *p_recv_contact_buf,
+                                                        HYPRE_Int contact_size, HYPRE_Int contact_proc, void *ro, MPI_Comm comm, void **p_send_response_buf,
+                                                        HYPRE_Int *response_message_size );
+HYPRE_Int hypre_FillResponseIJDetermineSendProcs ( void *p_recv_contact_buf, HYPRE_Int contact_size,
+                                                   HYPRE_Int contact_proc, void *ro, MPI_Comm comm, void **p_send_response_buf,
+                                                   HYPRE_Int *response_message_size );
 
 /* numbers.c */
 hypre_NumbersNode *hypre_NumbersNewNode ( void );
 void hypre_NumbersDeleteNode ( hypre_NumbersNode *node );
-HYPRE_Int hypre_NumbersEnter ( hypre_NumbersNode *node , const HYPRE_Int n );
+HYPRE_Int hypre_NumbersEnter ( hypre_NumbersNode *node, const HYPRE_Int n );
 HYPRE_Int hypre_NumbersNEntered ( hypre_NumbersNode *node );
-HYPRE_Int hypre_NumbersQuery ( hypre_NumbersNode *node , const HYPRE_Int n );
+HYPRE_Int hypre_NumbersQuery ( hypre_NumbersNode *node, const HYPRE_Int n );
 HYPRE_Int *hypre_NumbersArray ( hypre_NumbersNode *node );
 
 /* parchord_to_parcsr.c */
-void hypre_ParChordMatrix_RowStarts ( hypre_ParChordMatrix *Ac , MPI_Comm comm , HYPRE_BigInt **row_starts , HYPRE_BigInt *global_num_cols );
-HYPRE_Int hypre_ParChordMatrixToParCSRMatrix ( hypre_ParChordMatrix *Ac , MPI_Comm comm , hypre_ParCSRMatrix **pAp );
-HYPRE_Int hypre_ParCSRMatrixToParChordMatrix ( hypre_ParCSRMatrix *Ap , MPI_Comm comm , hypre_ParChordMatrix **pAc );
+void hypre_ParChordMatrix_RowStarts ( hypre_ParChordMatrix *Ac, MPI_Comm comm,
+                                      HYPRE_BigInt **row_starts, HYPRE_BigInt *global_num_cols );
+HYPRE_Int hypre_ParChordMatrixToParCSRMatrix ( hypre_ParChordMatrix *Ac, MPI_Comm comm,
+                                               hypre_ParCSRMatrix **pAp );
+HYPRE_Int hypre_ParCSRMatrixToParChordMatrix ( hypre_ParCSRMatrix *Ap, MPI_Comm comm,
+                                               hypre_ParChordMatrix **pAc );
 
 /* par_csr_aat.c */
-void hypre_ParAat_RowSizes ( HYPRE_Int **C_diag_i , HYPRE_Int **C_offd_i , HYPRE_Int *B_marker , HYPRE_Int *A_diag_i , HYPRE_Int *A_diag_j , HYPRE_Int *A_offd_i , HYPRE_Int *A_offd_j , HYPRE_BigInt *A_col_map_offd , HYPRE_Int *A_ext_i , HYPRE_BigInt *A_ext_j , HYPRE_BigInt *A_ext_row_map , HYPRE_Int *C_diag_size , HYPRE_Int *C_offd_size , HYPRE_Int num_rows_diag_A , HYPRE_Int num_cols_offd_A , HYPRE_Int num_rows_A_ext , HYPRE_BigInt first_col_diag_A , HYPRE_BigInt first_row_index_A );
+void hypre_ParAat_RowSizes ( HYPRE_Int **C_diag_i, HYPRE_Int **C_offd_i, HYPRE_Int *B_marker,
+                             HYPRE_Int *A_diag_i, HYPRE_Int *A_diag_j, HYPRE_Int *A_offd_i, HYPRE_Int *A_offd_j,
+                             HYPRE_BigInt *A_col_map_offd, HYPRE_Int *A_ext_i, HYPRE_BigInt *A_ext_j,
+                             HYPRE_BigInt *A_ext_row_map, HYPRE_Int *C_diag_size, HYPRE_Int *C_offd_size,
+                             HYPRE_Int num_rows_diag_A, HYPRE_Int num_cols_offd_A, HYPRE_Int num_rows_A_ext,
+                             HYPRE_BigInt first_col_diag_A, HYPRE_BigInt first_row_index_A );
 hypre_ParCSRMatrix *hypre_ParCSRAAt ( hypre_ParCSRMatrix *A );
-hypre_CSRMatrix *hypre_ParCSRMatrixExtractAExt ( hypre_ParCSRMatrix *A , HYPRE_Int data , HYPRE_BigInt **pA_ext_row_map );
+hypre_CSRMatrix *hypre_ParCSRMatrixExtractAExt ( hypre_ParCSRMatrix *A, HYPRE_Int data,
+                                                 HYPRE_BigInt **pA_ext_row_map );
 
 /* par_csr_assumed_part.c */
-HYPRE_Int hypre_LocateAssumedPartition ( MPI_Comm comm , HYPRE_BigInt row_start , HYPRE_BigInt row_end , HYPRE_BigInt global_first_row , HYPRE_BigInt global_num_rows , hypre_IJAssumedPart *part , HYPRE_Int myid );
-hypre_IJAssumedPart *hypre_AssumedPartitionCreate ( MPI_Comm comm , HYPRE_BigInt global_num , HYPRE_BigInt start , HYPRE_BigInt end );
+HYPRE_Int hypre_LocateAssumedPartition ( MPI_Comm comm, HYPRE_BigInt row_start,
+                                         HYPRE_BigInt row_end, HYPRE_BigInt global_first_row, HYPRE_BigInt global_num_rows,
+                                         hypre_IJAssumedPart *part, HYPRE_Int myid );
+hypre_IJAssumedPart *hypre_AssumedPartitionCreate ( MPI_Comm comm, HYPRE_BigInt global_num,
+                                                    HYPRE_BigInt start, HYPRE_BigInt end );
 HYPRE_Int hypre_ParCSRMatrixCreateAssumedPartition ( hypre_ParCSRMatrix *matrix );
 HYPRE_Int hypre_AssumedPartitionDestroy ( hypre_IJAssumedPart *apart );
-HYPRE_Int hypre_GetAssumedPartitionProcFromRow ( MPI_Comm comm , HYPRE_BigInt row , HYPRE_BigInt global_first_row , HYPRE_BigInt global_num_rows , HYPRE_Int *proc_id );
-HYPRE_Int hypre_GetAssumedPartitionRowRange ( MPI_Comm comm , HYPRE_Int proc_id , HYPRE_BigInt global_first_row , HYPRE_BigInt global_num_rows , HYPRE_BigInt *row_start , HYPRE_BigInt *row_end );
+HYPRE_Int hypre_GetAssumedPartitionProcFromRow ( MPI_Comm comm, HYPRE_BigInt row,
+                                                 HYPRE_BigInt global_first_row, HYPRE_BigInt global_num_rows, HYPRE_Int *proc_id );
+HYPRE_Int hypre_GetAssumedPartitionRowRange ( MPI_Comm comm, HYPRE_Int proc_id,
+                                              HYPRE_BigInt global_first_row, HYPRE_BigInt global_num_rows, HYPRE_BigInt *row_start,
+                                              HYPRE_BigInt *row_end );
 HYPRE_Int hypre_ParVectorCreateAssumedPartition ( hypre_ParVector *vector );
 
 /* par_csr_bool_matop.c */
-hypre_ParCSRBooleanMatrix *hypre_ParBooleanMatmul ( hypre_ParCSRBooleanMatrix *A , hypre_ParCSRBooleanMatrix *B );
-hypre_CSRBooleanMatrix *hypre_ParCSRBooleanMatrixExtractBExt ( hypre_ParCSRBooleanMatrix *B , hypre_ParCSRBooleanMatrix *A );
-hypre_CSRBooleanMatrix *hypre_ParCSRBooleanMatrixExtractAExt ( hypre_ParCSRBooleanMatrix *A , HYPRE_BigInt **pA_ext_row_map );
+hypre_ParCSRBooleanMatrix *hypre_ParBooleanMatmul ( hypre_ParCSRBooleanMatrix *A,
+                                                    hypre_ParCSRBooleanMatrix *B );
+hypre_CSRBooleanMatrix *hypre_ParCSRBooleanMatrixExtractBExt ( hypre_ParCSRBooleanMatrix *B,
+                                                               hypre_ParCSRBooleanMatrix *A );
+hypre_CSRBooleanMatrix *hypre_ParCSRBooleanMatrixExtractAExt ( hypre_ParCSRBooleanMatrix *A,
+                                                               HYPRE_BigInt **pA_ext_row_map );
 hypre_ParCSRBooleanMatrix *hypre_ParBooleanAAt ( hypre_ParCSRBooleanMatrix *A );
 HYPRE_Int hypre_BooleanMatTCommPkgCreate ( hypre_ParCSRBooleanMatrix *A );
 HYPRE_Int hypre_BooleanMatvecCommPkgCreate ( hypre_ParCSRBooleanMatrix *A );
 
 /* par_csr_bool_matrix.c */
-hypre_CSRBooleanMatrix *hypre_CSRBooleanMatrixCreate ( HYPRE_Int num_rows , HYPRE_Int num_cols , HYPRE_Int num_nonzeros );
+hypre_CSRBooleanMatrix *hypre_CSRBooleanMatrixCreate ( HYPRE_Int num_rows, HYPRE_Int num_cols,
+                                                       HYPRE_Int num_nonzeros );
 HYPRE_Int hypre_CSRBooleanMatrixDestroy ( hypre_CSRBooleanMatrix *matrix );
 HYPRE_Int hypre_CSRBooleanMatrixInitialize ( hypre_CSRBooleanMatrix *matrix );
 HYPRE_Int hypre_CSRBooleanMatrixBigInitialize ( hypre_CSRBooleanMatrix *matrix );
-HYPRE_Int hypre_CSRBooleanMatrixSetDataOwner ( hypre_CSRBooleanMatrix *matrix , HYPRE_Int owns_data );
-HYPRE_Int hypre_CSRBooleanMatrixSetBigDataOwner ( hypre_CSRBooleanMatrix *matrix , HYPRE_Int owns_data );
+HYPRE_Int hypre_CSRBooleanMatrixSetDataOwner ( hypre_CSRBooleanMatrix *matrix,
+                                               HYPRE_Int owns_data );
+HYPRE_Int hypre_CSRBooleanMatrixSetBigDataOwner ( hypre_CSRBooleanMatrix *matrix,
+                                                  HYPRE_Int owns_data );
 hypre_CSRBooleanMatrix *hypre_CSRBooleanMatrixRead ( const char *file_name );
-HYPRE_Int hypre_CSRBooleanMatrixPrint ( hypre_CSRBooleanMatrix *matrix , const char *file_name );
-hypre_ParCSRBooleanMatrix *hypre_ParCSRBooleanMatrixCreate ( MPI_Comm comm , HYPRE_BigInt global_num_rows , HYPRE_BigInt global_num_cols , HYPRE_BigInt *row_starts , HYPRE_BigInt *col_starts , HYPRE_Int num_cols_offd , HYPRE_Int num_nonzeros_diag , HYPRE_Int num_nonzeros_offd );
+HYPRE_Int hypre_CSRBooleanMatrixPrint ( hypre_CSRBooleanMatrix *matrix, const char *file_name );
+hypre_ParCSRBooleanMatrix *hypre_ParCSRBooleanMatrixCreate ( MPI_Comm comm,
+                                                             HYPRE_BigInt global_num_rows, HYPRE_BigInt global_num_cols, HYPRE_BigInt *row_starts,
+                                                             HYPRE_BigInt *col_starts, HYPRE_Int num_cols_offd, HYPRE_Int num_nonzeros_diag,
+                                                             HYPRE_Int num_nonzeros_offd );
 HYPRE_Int hypre_ParCSRBooleanMatrixDestroy ( hypre_ParCSRBooleanMatrix *matrix );
 HYPRE_Int hypre_ParCSRBooleanMatrixInitialize ( hypre_ParCSRBooleanMatrix *matrix );
 HYPRE_Int hypre_ParCSRBooleanMatrixSetNNZ ( hypre_ParCSRBooleanMatrix *matrix );
-HYPRE_Int hypre_ParCSRBooleanMatrixSetDataOwner ( hypre_ParCSRBooleanMatrix *matrix , HYPRE_Int owns_data );
-HYPRE_Int hypre_ParCSRBooleanMatrixSetRowStartsOwner ( hypre_ParCSRBooleanMatrix *matrix , HYPRE_Int owns_row_starts );
-HYPRE_Int hypre_ParCSRBooleanMatrixSetColStartsOwner ( hypre_ParCSRBooleanMatrix *matrix , HYPRE_Int owns_col_starts );
-hypre_ParCSRBooleanMatrix *hypre_ParCSRBooleanMatrixRead ( MPI_Comm comm , const char *file_name );
-HYPRE_Int hypre_ParCSRBooleanMatrixPrint ( hypre_ParCSRBooleanMatrix *matrix , const char *file_name );
-HYPRE_Int hypre_ParCSRBooleanMatrixPrintIJ ( hypre_ParCSRBooleanMatrix *matrix , const char *filename );
-HYPRE_Int hypre_ParCSRBooleanMatrixGetLocalRange ( hypre_ParCSRBooleanMatrix *matrix , HYPRE_BigInt *row_start , HYPRE_BigInt *row_end , HYPRE_BigInt *col_start , HYPRE_BigInt *col_end );
-HYPRE_Int hypre_ParCSRBooleanMatrixGetRow ( hypre_ParCSRBooleanMatrix *mat , HYPRE_BigInt row , HYPRE_Int *size , HYPRE_BigInt **col_ind );
-HYPRE_Int hypre_ParCSRBooleanMatrixRestoreRow ( hypre_ParCSRBooleanMatrix *matrix , HYPRE_BigInt row , HYPRE_Int *size , HYPRE_BigInt **col_ind );
-HYPRE_Int hypre_BuildCSRBooleanMatrixMPIDataType ( HYPRE_Int num_nonzeros , HYPRE_Int num_rows , HYPRE_Int *a_i , HYPRE_Int *a_j , hypre_MPI_Datatype *csr_matrix_datatype );
-hypre_ParCSRBooleanMatrix *hypre_CSRBooleanMatrixToParCSRBooleanMatrix ( MPI_Comm comm , hypre_CSRBooleanMatrix *A , HYPRE_BigInt *row_starts , HYPRE_BigInt *col_starts );
-HYPRE_Int hypre_BooleanGenerateDiagAndOffd ( hypre_CSRBooleanMatrix *A , hypre_ParCSRBooleanMatrix *matrix , HYPRE_BigInt first_col_diag , HYPRE_BigInt last_col_diag );
+HYPRE_Int hypre_ParCSRBooleanMatrixSetDataOwner ( hypre_ParCSRBooleanMatrix *matrix,
+                                                  HYPRE_Int owns_data );
+HYPRE_Int hypre_ParCSRBooleanMatrixSetRowStartsOwner ( hypre_ParCSRBooleanMatrix *matrix,
+                                                       HYPRE_Int owns_row_starts );
+HYPRE_Int hypre_ParCSRBooleanMatrixSetColStartsOwner ( hypre_ParCSRBooleanMatrix *matrix,
+                                                       HYPRE_Int owns_col_starts );
+hypre_ParCSRBooleanMatrix *hypre_ParCSRBooleanMatrixRead ( MPI_Comm comm, const char *file_name );
+HYPRE_Int hypre_ParCSRBooleanMatrixPrint ( hypre_ParCSRBooleanMatrix *matrix,
+                                           const char *file_name );
+HYPRE_Int hypre_ParCSRBooleanMatrixPrintIJ ( hypre_ParCSRBooleanMatrix *matrix,
+                                             const char *filename );
+HYPRE_Int hypre_ParCSRBooleanMatrixGetLocalRange ( hypre_ParCSRBooleanMatrix *matrix,
+                                                   HYPRE_BigInt *row_start, HYPRE_BigInt *row_end, HYPRE_BigInt *col_start, HYPRE_BigInt *col_end );
+HYPRE_Int hypre_ParCSRBooleanMatrixGetRow ( hypre_ParCSRBooleanMatrix *mat, HYPRE_BigInt row,
+                                            HYPRE_Int *size, HYPRE_BigInt **col_ind );
+HYPRE_Int hypre_ParCSRBooleanMatrixRestoreRow ( hypre_ParCSRBooleanMatrix *matrix, HYPRE_BigInt row,
+                                                HYPRE_Int *size, HYPRE_BigInt **col_ind );
+HYPRE_Int hypre_BuildCSRBooleanMatrixMPIDataType ( HYPRE_Int num_nonzeros, HYPRE_Int num_rows,
+                                                   HYPRE_Int *a_i, HYPRE_Int *a_j, hypre_MPI_Datatype *csr_matrix_datatype );
+hypre_ParCSRBooleanMatrix *hypre_CSRBooleanMatrixToParCSRBooleanMatrix ( MPI_Comm comm,
+                                                                         hypre_CSRBooleanMatrix *A, HYPRE_BigInt *row_starts, HYPRE_BigInt *col_starts );
+HYPRE_Int hypre_BooleanGenerateDiagAndOffd ( hypre_CSRBooleanMatrix *A,
+                                             hypre_ParCSRBooleanMatrix *matrix, HYPRE_BigInt first_col_diag, HYPRE_BigInt last_col_diag );
 
 /* par_csr_communication.c */
-hypre_ParCSRCommHandle *hypre_ParCSRCommHandleCreate ( HYPRE_Int job , hypre_ParCSRCommPkg *comm_pkg , void *send_data , void *recv_data );
-hypre_ParCSRCommHandle *hypre_ParCSRCommHandleCreate_v2 ( HYPRE_Int job, hypre_ParCSRCommPkg *comm_pkg, HYPRE_MemoryLocation send_memory_location, void *send_data_in, HYPRE_MemoryLocation recv_memory_location, void *recv_data_in );
+hypre_ParCSRCommHandle *hypre_ParCSRCommHandleCreate ( HYPRE_Int job, hypre_ParCSRCommPkg *comm_pkg,
+                                                       void *send_data, void *recv_data );
+hypre_ParCSRCommHandle *hypre_ParCSRCommHandleCreate_v2 ( HYPRE_Int job,
+                                                          hypre_ParCSRCommPkg *comm_pkg,
+                                                          HYPRE_MemoryLocation send_memory_location,
+                                                          void *send_data_in,
+                                                          HYPRE_MemoryLocation recv_memory_location,
+                                                          void *recv_data_in );
 HYPRE_Int hypre_ParCSRCommHandleDestroy ( hypre_ParCSRCommHandle *comm_handle );
-void hypre_ParCSRCommPkgCreate_core ( MPI_Comm comm , HYPRE_BigInt *col_map_offd , HYPRE_BigInt first_col_diag , HYPRE_BigInt *col_starts , HYPRE_Int num_cols_diag , HYPRE_Int num_cols_offd , HYPRE_Int *p_num_recvs , HYPRE_Int **p_recv_procs , HYPRE_Int **p_recv_vec_starts , HYPRE_Int *p_num_sends , HYPRE_Int **p_send_procs , HYPRE_Int **p_send_map_starts , HYPRE_Int **p_send_map_elmts );
-HYPRE_Int
-hypre_ParCSRCommPkgCreate(MPI_Comm comm, HYPRE_BigInt *col_map_offd, HYPRE_BigInt first_col_diag, HYPRE_BigInt *col_starts, HYPRE_Int num_cols_diag, HYPRE_Int num_cols_offd, hypre_ParCSRCommPkg *comm_pkg);
+void hypre_ParCSRCommPkgCreate_core ( MPI_Comm comm, HYPRE_BigInt *col_map_offd,
+                                      HYPRE_BigInt first_col_diag, HYPRE_BigInt *col_starts, HYPRE_Int num_cols_diag,
+                                      HYPRE_Int num_cols_offd, HYPRE_Int *p_num_recvs, HYPRE_Int **p_recv_procs,
+                                      HYPRE_Int **p_recv_vec_starts, HYPRE_Int *p_num_sends, HYPRE_Int **p_send_procs,
+                                      HYPRE_Int **p_send_map_starts, HYPRE_Int **p_send_map_elmts );
+HYPRE_Int hypre_ParCSRCommPkgCreate(MPI_Comm comm, HYPRE_BigInt *col_map_offd,
+                                    HYPRE_BigInt first_col_diag, HYPRE_BigInt *col_starts,
+                                    HYPRE_Int num_cols_diag, HYPRE_Int num_cols_offd,
+                                    hypre_ParCSRCommPkg *comm_pkg);
+HYPRE_Int hypre_ParCSRCommPkgCreateAndFill ( MPI_Comm comm, HYPRE_Int num_recvs,
+                                             HYPRE_Int *recv_procs, HYPRE_Int *recv_vec_starts,
+                                             HYPRE_Int num_sends, HYPRE_Int *send_procs,
+                                             HYPRE_Int *send_map_starts, HYPRE_Int *send_map_elmts,
+                                             hypre_ParCSRCommPkg **comm_pkg_ptr );
+HYPRE_Int hypre_ParCSRCommPkgUpdateVecStarts ( hypre_ParCSRCommPkg *comm_pkg,
+                                               HYPRE_Int num_components_in,
+                                               HYPRE_Int vecstride, HYPRE_Int idxstride );
 HYPRE_Int hypre_MatvecCommPkgCreate ( hypre_ParCSRMatrix *A );
 HYPRE_Int hypre_MatvecCommPkgDestroy ( hypre_ParCSRCommPkg *comm_pkg );
-HYPRE_Int hypre_BuildCSRMatrixMPIDataType ( HYPRE_Int num_nonzeros , HYPRE_Int num_rows , HYPRE_Complex *a_data , HYPRE_Int *a_i , HYPRE_Int *a_j , hypre_MPI_Datatype *csr_matrix_datatype );
-HYPRE_Int hypre_BuildCSRJDataType ( HYPRE_Int num_nonzeros , HYPRE_Complex *a_data , HYPRE_Int *a_j , hypre_MPI_Datatype *csr_jdata_datatype );
-HYPRE_Int hypre_ParCSRFindExtendCommPkg(MPI_Comm comm, HYPRE_BigInt global_num_cols, HYPRE_BigInt first_col_diag, HYPRE_Int num_cols_diag, HYPRE_BigInt *col_starts, hypre_IJAssumedPart *apart, HYPRE_Int indices_len, HYPRE_BigInt *indices, hypre_ParCSRCommPkg **extend_comm_pkg);
+HYPRE_Int hypre_BuildCSRMatrixMPIDataType ( HYPRE_Int num_nonzeros, HYPRE_Int num_rows,
+                                            HYPRE_Complex *a_data, HYPRE_Int *a_i, HYPRE_Int *a_j,
+                                            hypre_MPI_Datatype *csr_matrix_datatype );
+HYPRE_Int hypre_BuildCSRJDataType ( HYPRE_Int num_nonzeros, HYPRE_Complex *a_data, HYPRE_Int *a_j,
+                                    hypre_MPI_Datatype *csr_jdata_datatype );
+HYPRE_Int hypre_ParCSRFindExtendCommPkg(MPI_Comm comm, HYPRE_BigInt global_num_cols,
+                                        HYPRE_BigInt first_col_diag, HYPRE_Int num_cols_diag, HYPRE_BigInt *col_starts,
+                                        hypre_IJAssumedPart *apart, HYPRE_Int indices_len, HYPRE_BigInt *indices,
+                                        hypre_ParCSRCommPkg **extend_comm_pkg);
+
+/* par_csr_filter.c */
+HYPRE_Int hypre_ParCSRMatrixBlkFilter(hypre_ParCSRMatrix *A,
+                                      HYPRE_Int block_size, hypre_ParCSRMatrix **B_ptr);
 
 /* par_csr_matop.c */
 HYPRE_Int hypre_ParCSRMatrixScale(hypre_ParCSRMatrix *A, HYPRE_Complex scalar);
-void hypre_ParMatmul_RowSizes ( HYPRE_MemoryLocation memory_location , HYPRE_Int **C_diag_i , HYPRE_Int **C_offd_i , HYPRE_Int *rownnz_A , HYPRE_Int *A_diag_i , HYPRE_Int *A_diag_j , HYPRE_Int *A_offd_i , HYPRE_Int *A_offd_j , HYPRE_Int *B_diag_i , HYPRE_Int *B_diag_j , HYPRE_Int *B_offd_i , HYPRE_Int *B_offd_j , HYPRE_Int *B_ext_diag_i , HYPRE_Int *B_ext_diag_j , HYPRE_Int *B_ext_offd_i , HYPRE_Int *B_ext_offd_j , HYPRE_Int *map_B_to_C , HYPRE_Int *C_diag_size , HYPRE_Int *C_offd_size , HYPRE_Int num_rownnz_A , HYPRE_Int num_rows_diag_A , HYPRE_Int num_cols_offd_A , HYPRE_Int  allsquare , HYPRE_Int num_cols_diag_B , HYPRE_Int num_cols_offd_B , HYPRE_Int num_cols_offd_C );
-hypre_ParCSRMatrix *hypre_ParMatmul ( hypre_ParCSRMatrix *A , hypre_ParCSRMatrix *B );
-void hypre_ParCSRMatrixExtractBExt_Arrays ( HYPRE_Int **pB_ext_i , HYPRE_BigInt **pB_ext_j , HYPRE_Complex **pB_ext_data , HYPRE_BigInt **pB_ext_row_map , HYPRE_Int *num_nonzeros , HYPRE_Int data , HYPRE_Int find_row_map , MPI_Comm comm , hypre_ParCSRCommPkg *comm_pkg , HYPRE_Int num_cols_B , HYPRE_Int num_recvs , HYPRE_Int num_sends , HYPRE_BigInt first_col_diag , HYPRE_BigInt *row_starts , HYPRE_Int *recv_vec_starts , HYPRE_Int *send_map_starts , HYPRE_Int *send_map_elmts , HYPRE_Int *diag_i , HYPRE_Int *diag_j , HYPRE_Int *offd_i , HYPRE_Int *offd_j , HYPRE_BigInt *col_map_offd , HYPRE_Real *diag_data , HYPRE_Real *offd_data );
-void hypre_ParCSRMatrixExtractBExt_Arrays_Overlap ( HYPRE_Int **pB_ext_i , HYPRE_BigInt **pB_ext_j , HYPRE_Complex **pB_ext_data , HYPRE_BigInt **pB_ext_row_map , HYPRE_Int *num_nonzeros , HYPRE_Int data , HYPRE_Int find_row_map , MPI_Comm comm , hypre_ParCSRCommPkg *comm_pkg , HYPRE_Int num_cols_B , HYPRE_Int num_recvs , HYPRE_Int num_sends , HYPRE_BigInt first_col_diag , HYPRE_BigInt *row_starts , HYPRE_Int *recv_vec_starts , HYPRE_Int *send_map_starts , HYPRE_Int *send_map_elmts , HYPRE_Int *diag_i , HYPRE_Int *diag_j , HYPRE_Int *offd_i , HYPRE_Int *offd_j , HYPRE_BigInt *col_map_offd , HYPRE_Real *diag_data , HYPRE_Real *offd_data, hypre_ParCSRCommHandle **comm_handle_idx, hypre_ParCSRCommHandle **comm_handle_data, HYPRE_Int *CF_marker, HYPRE_Int *CF_marker_offd, HYPRE_Int skip_fine, HYPRE_Int skip_same_sign );
-hypre_CSRMatrix *hypre_ParCSRMatrixExtractBExt ( hypre_ParCSRMatrix *B , hypre_ParCSRMatrix *A , HYPRE_Int data );
-hypre_CSRMatrix *hypre_ParCSRMatrixExtractBExt_Overlap ( hypre_ParCSRMatrix *B , hypre_ParCSRMatrix *A , HYPRE_Int data, hypre_ParCSRCommHandle **comm_handle_idx, hypre_ParCSRCommHandle **comm_handle_data, HYPRE_Int *CF_marker, HYPRE_Int *CF_marker_offd, HYPRE_Int skip_fine, HYPRE_Int skip_same_sign );
-HYPRE_Int hypre_ParCSRMatrixExtractBExtDeviceInit( hypre_ParCSRMatrix *B, hypre_ParCSRMatrix *A, HYPRE_Int want_data, void **request_ptr);
+void hypre_ParMatmul_RowSizes ( HYPRE_MemoryLocation memory_location, HYPRE_Int **C_diag_i,
+                                HYPRE_Int **C_offd_i, HYPRE_Int *rownnz_A, HYPRE_Int *A_diag_i, HYPRE_Int *A_diag_j,
+                                HYPRE_Int *A_offd_i, HYPRE_Int *A_offd_j, HYPRE_Int *B_diag_i, HYPRE_Int *B_diag_j,
+                                HYPRE_Int *B_offd_i, HYPRE_Int *B_offd_j, HYPRE_Int *B_ext_diag_i, HYPRE_Int *B_ext_diag_j,
+                                HYPRE_Int *B_ext_offd_i, HYPRE_Int *B_ext_offd_j, HYPRE_Int *map_B_to_C, HYPRE_Int *C_diag_size,
+                                HYPRE_Int *C_offd_size, HYPRE_Int num_rownnz_A, HYPRE_Int num_rows_diag_A,
+                                HYPRE_Int num_cols_offd_A, HYPRE_Int  allsquare, HYPRE_Int num_cols_diag_B,
+                                HYPRE_Int num_cols_offd_B, HYPRE_Int num_cols_offd_C );
+hypre_ParCSRMatrix *hypre_ParMatmul ( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *B );
+void hypre_ParCSRMatrixExtractBExt_Arrays ( HYPRE_Int **pB_ext_i, HYPRE_BigInt **pB_ext_j,
+                                            HYPRE_Complex **pB_ext_data, HYPRE_BigInt **pB_ext_row_map, HYPRE_Int *num_nonzeros, HYPRE_Int data,
+                                            HYPRE_Int find_row_map, MPI_Comm comm, hypre_ParCSRCommPkg *comm_pkg, HYPRE_Int num_cols_B,
+                                            HYPRE_Int num_recvs, HYPRE_Int num_sends, HYPRE_BigInt first_col_diag, HYPRE_BigInt *row_starts,
+                                            HYPRE_Int *recv_vec_starts, HYPRE_Int *send_map_starts, HYPRE_Int *send_map_elmts,
+                                            HYPRE_Int *diag_i, HYPRE_Int *diag_j, HYPRE_Int *offd_i, HYPRE_Int *offd_j,
+                                            HYPRE_BigInt *col_map_offd, HYPRE_Real *diag_data, HYPRE_Real *offd_data );
+void hypre_ParCSRMatrixExtractBExt_Arrays_Overlap ( HYPRE_Int **pB_ext_i, HYPRE_BigInt **pB_ext_j,
+                                                    HYPRE_Complex **pB_ext_data, HYPRE_BigInt **pB_ext_row_map, HYPRE_Int *num_nonzeros, HYPRE_Int data,
+                                                    HYPRE_Int find_row_map, MPI_Comm comm, hypre_ParCSRCommPkg *comm_pkg, HYPRE_Int num_cols_B,
+                                                    HYPRE_Int num_recvs, HYPRE_Int num_sends, HYPRE_BigInt first_col_diag, HYPRE_BigInt *row_starts,
+                                                    HYPRE_Int *recv_vec_starts, HYPRE_Int *send_map_starts, HYPRE_Int *send_map_elmts,
+                                                    HYPRE_Int *diag_i, HYPRE_Int *diag_j, HYPRE_Int *offd_i, HYPRE_Int *offd_j,
+                                                    HYPRE_BigInt *col_map_offd, HYPRE_Real *diag_data, HYPRE_Real *offd_data,
+                                                    hypre_ParCSRCommHandle **comm_handle_idx, hypre_ParCSRCommHandle **comm_handle_data,
+                                                    HYPRE_Int *CF_marker, HYPRE_Int *CF_marker_offd, HYPRE_Int skip_fine, HYPRE_Int skip_same_sign );
+hypre_CSRMatrix *hypre_ParCSRMatrixExtractBExt ( hypre_ParCSRMatrix *B, hypre_ParCSRMatrix *A,
+                                                 HYPRE_Int data );
+hypre_CSRMatrix *hypre_ParCSRMatrixExtractBExt_Overlap ( hypre_ParCSRMatrix *B,
+                                                         hypre_ParCSRMatrix *A, HYPRE_Int data, hypre_ParCSRCommHandle **comm_handle_idx,
+                                                         hypre_ParCSRCommHandle **comm_handle_data, HYPRE_Int *CF_marker, HYPRE_Int *CF_marker_offd,
+                                                         HYPRE_Int skip_fine, HYPRE_Int skip_same_sign );
+HYPRE_Int hypre_ParCSRMatrixExtractBExtDeviceInit( hypre_ParCSRMatrix *B, hypre_ParCSRMatrix *A,
+                                                   HYPRE_Int want_data, void **request_ptr);
 hypre_CSRMatrix* hypre_ParCSRMatrixExtractBExtDeviceWait(void *request);
-hypre_CSRMatrix* hypre_ParCSRMatrixExtractBExtDevice( hypre_ParCSRMatrix *B, hypre_ParCSRMatrix *A, HYPRE_Int want_data );
-HYPRE_Int hypre_ParCSRMatrixTranspose ( hypre_ParCSRMatrix *A , hypre_ParCSRMatrix **AT_ptr , HYPRE_Int data );
-HYPRE_Int hypre_ParCSRMatrixTransposeHost ( hypre_ParCSRMatrix *A , hypre_ParCSRMatrix **AT_ptr , HYPRE_Int data );
-HYPRE_Int hypre_ParCSRMatrixTransposeDevice ( hypre_ParCSRMatrix *A , hypre_ParCSRMatrix **AT_ptr , HYPRE_Int data );
-void hypre_ParCSRMatrixGenSpanningTree ( hypre_ParCSRMatrix *G_csr , HYPRE_Int **indices , HYPRE_Int G_type );
-void hypre_ParCSRMatrixExtractSubmatrices ( hypre_ParCSRMatrix *A_csr , HYPRE_Int *indices2 , hypre_ParCSRMatrix ***submatrices );
-void hypre_ParCSRMatrixExtractRowSubmatrices ( hypre_ParCSRMatrix *A_csr , HYPRE_Int *indices2 , hypre_ParCSRMatrix ***submatrices );
+hypre_CSRMatrix* hypre_ParCSRMatrixExtractBExtDevice( hypre_ParCSRMatrix *B, hypre_ParCSRMatrix *A,
+                                                      HYPRE_Int want_data );
+HYPRE_Int hypre_ParCSRMatrixLocalTranspose( hypre_ParCSRMatrix  *A );
+HYPRE_Int hypre_ParCSRMatrixTranspose ( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix **AT_ptr,
+                                        HYPRE_Int data );
+HYPRE_Int hypre_ParCSRMatrixTransposeHost ( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix **AT_ptr,
+                                            HYPRE_Int data );
+HYPRE_Int hypre_ParCSRMatrixTransposeDevice ( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix **AT_ptr,
+                                              HYPRE_Int data );
+void hypre_ParCSRMatrixGenSpanningTree ( hypre_ParCSRMatrix *G_csr, HYPRE_Int **indices,
+                                         HYPRE_Int G_type );
+void hypre_ParCSRMatrixExtractSubmatrices ( hypre_ParCSRMatrix *A_csr, HYPRE_Int *indices2,
+                                            hypre_ParCSRMatrix ***submatrices );
+void hypre_ParCSRMatrixExtractRowSubmatrices ( hypre_ParCSRMatrix *A_csr, HYPRE_Int *indices2,
+                                               hypre_ParCSRMatrix ***submatrices );
 HYPRE_Complex hypre_ParCSRMatrixLocalSumElts ( hypre_ParCSRMatrix *A );
-HYPRE_Int hypre_ParCSRMatrixAminvDB ( hypre_ParCSRMatrix *A , hypre_ParCSRMatrix *B , HYPRE_Complex *d , hypre_ParCSRMatrix **C_ptr );
-hypre_ParCSRMatrix *hypre_ParTMatmul ( hypre_ParCSRMatrix *A , hypre_ParCSRMatrix *B );
+HYPRE_Int hypre_ParCSRMatrixAminvDB ( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *B,
+                                      HYPRE_Complex *d, hypre_ParCSRMatrix **C_ptr );
+hypre_ParCSRMatrix *hypre_ParTMatmul ( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *B );
 HYPRE_Real hypre_ParCSRMatrixFnorm( hypre_ParCSRMatrix *A );
-HYPRE_Int hypre_ParCSRMatrixInfNorm ( hypre_ParCSRMatrix *A , HYPRE_Real *norm );
-HYPRE_Int hypre_ExchangeExternalRowsInit( hypre_CSRMatrix *B_ext, hypre_ParCSRCommPkg *comm_pkg_A, void **request_ptr);
+HYPRE_Int hypre_ParCSRMatrixInfNorm ( hypre_ParCSRMatrix *A, HYPRE_Real *norm );
+HYPRE_Int hypre_ExchangeExternalRowsInit( hypre_CSRMatrix *B_ext, hypre_ParCSRCommPkg *comm_pkg_A,
+                                          void **request_ptr);
 hypre_CSRMatrix* hypre_ExchangeExternalRowsWait(void *vequest);
-HYPRE_Int hypre_ExchangeExternalRowsDeviceInit( hypre_CSRMatrix *B_ext, hypre_ParCSRCommPkg *comm_pkg_A, HYPRE_Int want_data, void **request_ptr);
+HYPRE_Int hypre_ExchangeExternalRowsDeviceInit( hypre_CSRMatrix *B_ext,
+                                                hypre_ParCSRCommPkg *comm_pkg_A, HYPRE_Int want_data, void **request_ptr);
 hypre_CSRMatrix* hypre_ExchangeExternalRowsDeviceWait(void *vrequest);
-HYPRE_Int hypre_ParCSRMatrixGenerateFFFCDevice( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker_host, HYPRE_BigInt *cpts_starts, hypre_ParCSRMatrix *S, hypre_ParCSRMatrix **A_FC_ptr, hypre_ParCSRMatrix **A_FF_ptr );
-HYPRE_Int hypre_ParCSRMatrixGenerateFFCFDevice( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker_host, HYPRE_BigInt *cpts_starts, hypre_ParCSRMatrix *S, hypre_ParCSRMatrix **A_CF_ptr, hypre_ParCSRMatrix **A_FF_ptr );
+HYPRE_Int hypre_ParCSRMatrixGenerateFFFCDevice( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                                HYPRE_BigInt *cpts_starts, hypre_ParCSRMatrix *S,
+                                                hypre_ParCSRMatrix **A_FC_ptr,
+                                                hypre_ParCSRMatrix **A_FF_ptr );
+HYPRE_Int hypre_ParCSRMatrixGenerateFFCFDevice( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                                HYPRE_BigInt *cpts_starts, hypre_ParCSRMatrix *S,
+                                                hypre_ParCSRMatrix **A_CF_ptr,
+                                                hypre_ParCSRMatrix **A_FF_ptr );
+HYPRE_Int hypre_ParCSRMatrixGenerateCCCFDevice( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                                HYPRE_BigInt *cpts_starts, hypre_ParCSRMatrix *S,
+                                                hypre_ParCSRMatrix **A_CF_ptr,
+                                                hypre_ParCSRMatrix **A_CC_ptr );
 hypre_CSRMatrix* hypre_ConcatDiagAndOffdDevice(hypre_ParCSRMatrix *A);
-HYPRE_Int hypre_ConcatDiagOffdAndExtDevice(hypre_ParCSRMatrix *A, hypre_CSRMatrix *E, hypre_CSRMatrix **B_ptr, HYPRE_Int *num_cols_offd_ptr, HYPRE_BigInt **cols_map_offd_ptr);
-HYPRE_Int hypre_ParCSRMatrixGetRowDevice( hypre_ParCSRMatrix *mat, HYPRE_BigInt row, HYPRE_Int *size, HYPRE_BigInt **col_ind, HYPRE_Complex **values );
-HYPRE_Int hypre_ParCSRDiagScale( HYPRE_ParCSRMatrix HA, HYPRE_ParVector Hy, HYPRE_ParVector Hx );
-HYPRE_Int hypre_ParCSRMatrixDropSmallEntries( hypre_ParCSRMatrix *A, HYPRE_Real tol, HYPRE_Int type);
-HYPRE_Int hypre_ParCSRMatrixDropSmallEntriesHost( hypre_ParCSRMatrix *A, HYPRE_Real tol, HYPRE_Int type);
-HYPRE_Int hypre_ParCSRMatrixDropSmallEntriesDevice( hypre_ParCSRMatrix *A, HYPRE_Complex tol, HYPRE_Int type);
+HYPRE_Int hypre_ConcatDiagOffdAndExtDevice(hypre_ParCSRMatrix *A, hypre_CSRMatrix *E,
+                                           hypre_CSRMatrix **B_ptr, HYPRE_Int *num_cols_offd_ptr, HYPRE_BigInt **cols_map_offd_ptr);
+HYPRE_Int hypre_ParCSRMatrixGetRowDevice( hypre_ParCSRMatrix *mat, HYPRE_BigInt row,
+                                          HYPRE_Int *size, HYPRE_BigInt **col_ind, HYPRE_Complex **values );
+HYPRE_Int hypre_ParCSRDiagScaleVector( hypre_ParCSRMatrix *par_A, hypre_ParVector *par_y,
+                                       hypre_ParVector *par_x );
+HYPRE_Int hypre_ParCSRDiagScaleVectorHost( hypre_ParCSRMatrix *par_A, hypre_ParVector *par_y,
+                                           hypre_ParVector *par_x );
+HYPRE_Int hypre_ParCSRDiagScaleVectorDevice( hypre_ParCSRMatrix *par_A, hypre_ParVector *par_y,
+                                             hypre_ParVector *par_x );
+HYPRE_Int hypre_ParCSRMatrixDropSmallEntries( hypre_ParCSRMatrix *A, HYPRE_Real tol,
+                                              HYPRE_Int type);
+HYPRE_Int hypre_ParCSRMatrixDropSmallEntriesHost( hypre_ParCSRMatrix *A, HYPRE_Real tol,
+                                                  HYPRE_Int type);
+HYPRE_Int hypre_ParCSRMatrixDropSmallEntriesDevice( hypre_ParCSRMatrix *A, HYPRE_Complex tol,
+                                                    HYPRE_Int type);
+
+HYPRE_Int hypre_ParCSRCommPkgCreateMatrixE( hypre_ParCSRCommPkg *comm_pkg, HYPRE_Int local_ncols );
 
 #ifdef HYPRE_USING_PERSISTENT_COMM
-hypre_ParCSRPersistentCommHandle* hypre_ParCSRPersistentCommHandleCreate(HYPRE_Int job, hypre_ParCSRCommPkg *comm_pkg);
-hypre_ParCSRPersistentCommHandle* hypre_ParCSRCommPkgGetPersistentCommHandle(HYPRE_Int job, hypre_ParCSRCommPkg *comm_pkg);
+hypre_ParCSRPersistentCommHandle* hypre_ParCSRPersistentCommHandleCreate(HYPRE_Int job,
+                                                                         hypre_ParCSRCommPkg *comm_pkg);
+hypre_ParCSRPersistentCommHandle* hypre_ParCSRCommPkgGetPersistentCommHandle(HYPRE_Int job,
+                                                                             hypre_ParCSRCommPkg *comm_pkg);
 void hypre_ParCSRPersistentCommHandleDestroy(hypre_ParCSRPersistentCommHandle *comm_handle);
-void hypre_ParCSRPersistentCommHandleStart(hypre_ParCSRPersistentCommHandle *comm_handle, HYPRE_MemoryLocation send_memory_location, void *send_data);
-void hypre_ParCSRPersistentCommHandleWait(hypre_ParCSRPersistentCommHandle *comm_handle, HYPRE_MemoryLocation recv_memory_location, void *recv_data);
+void hypre_ParCSRPersistentCommHandleStart(hypre_ParCSRPersistentCommHandle *comm_handle,
+                                           HYPRE_MemoryLocation send_memory_location, void *send_data);
+void hypre_ParCSRPersistentCommHandleWait(hypre_ParCSRPersistentCommHandle *comm_handle,
+                                          HYPRE_MemoryLocation recv_memory_location, void *recv_data);
 #endif
 
-HYPRE_Int hypre_ParcsrGetExternalRowsInit( hypre_ParCSRMatrix *A, HYPRE_Int indices_len, HYPRE_BigInt *indices, hypre_ParCSRCommPkg *comm_pkg, HYPRE_Int want_data, void **request_ptr);
+HYPRE_Int hypre_ParcsrGetExternalRowsInit( hypre_ParCSRMatrix *A, HYPRE_Int indices_len,
+                                           HYPRE_BigInt *indices, hypre_ParCSRCommPkg *comm_pkg, HYPRE_Int want_data, void **request_ptr);
 hypre_CSRMatrix* hypre_ParcsrGetExternalRowsWait(void *vrequest);
-HYPRE_Int hypre_ParcsrGetExternalRowsDeviceInit( hypre_ParCSRMatrix *A, HYPRE_Int indices_len, HYPRE_BigInt *indices, hypre_ParCSRCommPkg *comm_pkg, HYPRE_Int want_data, void **request_ptr);
+HYPRE_Int hypre_ParcsrGetExternalRowsDeviceInit( hypre_ParCSRMatrix *A, HYPRE_Int indices_len,
+                                                 HYPRE_BigInt *indices, hypre_ParCSRCommPkg *comm_pkg, HYPRE_Int want_data, void **request_ptr);
 hypre_CSRMatrix* hypre_ParcsrGetExternalRowsDeviceWait(void *vrequest);
 
-HYPRE_Int hypre_ParvecBdiagInvScal( hypre_ParVector *b, HYPRE_Int blockSize, hypre_ParVector **bs, hypre_ParCSRMatrix *A);
+HYPRE_Int hypre_ParvecBdiagInvScal( hypre_ParVector *b, HYPRE_Int blockSize, hypre_ParVector **bs,
+                                    hypre_ParCSRMatrix *A);
 
-HYPRE_Int hypre_ParcsrBdiagInvScal( hypre_ParCSRMatrix *A, HYPRE_Int blockSize, hypre_ParCSRMatrix **As);
+HYPRE_Int hypre_ParcsrBdiagInvScal( hypre_ParCSRMatrix *A, HYPRE_Int blockSize,
+                                    hypre_ParCSRMatrix **As);
 
-HYPRE_Int hypre_ParCSRMatrixExtractSubmatrixFC( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker, HYPRE_BigInt *cpts_starts, const char *job, hypre_ParCSRMatrix **B_ptr, HYPRE_Real strength_thresh);
+HYPRE_Int hypre_ParCSRMatrixExtractSubmatrixFC( hypre_ParCSRMatrix *A, HYPRE_Int *CF_marker,
+                                                HYPRE_BigInt *cpts_starts, const char *job,
+                                                hypre_ParCSRMatrix **B_ptr,
+                                                HYPRE_Real strength_thresh);
+HYPRE_Int hypre_ParCSRMatrixDiagScale( hypre_ParCSRMatrix *par_A, hypre_ParVector *par_ld,
+                                       hypre_ParVector *par_rd );
 HYPRE_Int hypre_ParCSRMatrixReorder ( hypre_ParCSRMatrix *A );
-HYPRE_Int hypre_ParCSRMatrixAdd( HYPRE_Complex alpha, hypre_ParCSRMatrix *A, HYPRE_Complex beta, hypre_ParCSRMatrix *B, hypre_ParCSRMatrix **Cout);
-HYPRE_Int hypre_ParCSRMatrixAddHost( HYPRE_Complex alpha, hypre_ParCSRMatrix *A, HYPRE_Complex beta, hypre_ParCSRMatrix *B, hypre_ParCSRMatrix **Cout);
-HYPRE_Int hypre_ParCSRMatrixAddDevice( HYPRE_Complex alpha, hypre_ParCSRMatrix *A, HYPRE_Complex beta, hypre_ParCSRMatrix *B, hypre_ParCSRMatrix **Cout);
+HYPRE_Int hypre_ParCSRMatrixAdd( HYPRE_Complex alpha, hypre_ParCSRMatrix *A, HYPRE_Complex beta,
+                                 hypre_ParCSRMatrix *B, hypre_ParCSRMatrix **Cout);
+HYPRE_Int hypre_ParCSRMatrixAddHost( HYPRE_Complex alpha, hypre_ParCSRMatrix *A,
+                                     HYPRE_Complex beta, hypre_ParCSRMatrix *B,
+                                     hypre_ParCSRMatrix **Cout);
+HYPRE_Int hypre_ParCSRMatrixAddDevice( HYPRE_Complex alpha, hypre_ParCSRMatrix *A,
+                                       HYPRE_Complex beta, hypre_ParCSRMatrix *B,
+                                       hypre_ParCSRMatrix **Cout);
+HYPRE_Int hypre_ParCSRMatrixBlockColSum( hypre_ParCSRMatrix *A, HYPRE_Int row_major,
+                                         HYPRE_Int num_rows_block, HYPRE_Int num_cols_block,
+                                         hypre_DenseBlockMatrix **B_ptr );
+HYPRE_Int hypre_ParCSRMatrixColSum( hypre_ParCSRMatrix *A, hypre_ParVector **B_ptr );
+
+/* par_csr_filter_device.c */
+HYPRE_Int hypre_ParCSRMatrixBlkFilterDevice(hypre_ParCSRMatrix *A, HYPRE_Int block_size,
+                                            hypre_ParCSRMatrix **B_ptr);
+
+/* par_csr_matop_device.c */
+HYPRE_Int hypre_ParCSRMatrixDiagScaleDevice ( hypre_ParCSRMatrix *par_A, hypre_ParVector *par_ld,
+                                              hypre_ParVector *par_rd );
+HYPRE_Int hypre_ParCSRMatrixCompressOffdMapDevice(hypre_ParCSRMatrix *A);
+HYPRE_Int hypre_ParCSRMatrixCompressOffdMap(hypre_ParCSRMatrix *A);
 
 /* par_csr_matop_marked.c */
-void hypre_ParMatmul_RowSizes_Marked ( HYPRE_Int **C_diag_i , HYPRE_Int **C_offd_i , HYPRE_Int **B_marker , HYPRE_Int *A_diag_i , HYPRE_Int *A_diag_j , HYPRE_Int *A_offd_i , HYPRE_Int *A_offd_j , HYPRE_Int *B_diag_i , HYPRE_Int *B_diag_j , HYPRE_Int *B_offd_i , HYPRE_Int *B_offd_j , HYPRE_Int *B_ext_diag_i , HYPRE_Int *B_ext_diag_j , HYPRE_Int *B_ext_offd_i , HYPRE_Int *B_ext_offd_j , HYPRE_Int *map_B_to_C , HYPRE_Int *C_diag_size , HYPRE_Int *C_offd_size , HYPRE_Int num_rows_diag_A , HYPRE_Int num_cols_offd_A , HYPRE_Int allsquare , HYPRE_Int num_cols_diag_B , HYPRE_Int num_cols_offd_B , HYPRE_Int num_cols_offd_C , HYPRE_Int *CF_marker , HYPRE_Int *dof_func , HYPRE_Int *dof_func_offd );
-hypre_ParCSRMatrix *hypre_ParMatmul_FC ( hypre_ParCSRMatrix *A , hypre_ParCSRMatrix *P , HYPRE_Int *CF_marker , HYPRE_Int *dof_func , HYPRE_Int *dof_func_offd );
-void hypre_ParMatScaleDiagInv_F ( hypre_ParCSRMatrix *C , hypre_ParCSRMatrix *A , HYPRE_Complex weight , HYPRE_Int *CF_marker );
-hypre_ParCSRMatrix *hypre_ParMatMinus_F ( hypre_ParCSRMatrix *P , hypre_ParCSRMatrix *C , HYPRE_Int *CF_marker );
-void hypre_ParCSRMatrixZero_F ( hypre_ParCSRMatrix *P , HYPRE_Int *CF_marker );
-void hypre_ParCSRMatrixCopy_C ( hypre_ParCSRMatrix *P , hypre_ParCSRMatrix *C , HYPRE_Int *CF_marker );
-void hypre_ParCSRMatrixDropEntries ( hypre_ParCSRMatrix *C , hypre_ParCSRMatrix *P , HYPRE_Int *CF_marker );
+void hypre_ParMatmul_RowSizes_Marked ( HYPRE_Int **C_diag_i, HYPRE_Int **C_offd_i,
+                                       HYPRE_Int **B_marker, HYPRE_Int *A_diag_i,
+                                       HYPRE_Int *A_diag_j, HYPRE_Int *A_offd_i,
+                                       HYPRE_Int *A_offd_j, HYPRE_Int *B_diag_i,
+                                       HYPRE_Int *B_diag_j, HYPRE_Int *B_offd_i,
+                                       HYPRE_Int *B_offd_j, HYPRE_Int *B_ext_diag_i,
+                                       HYPRE_Int *B_ext_diag_j, HYPRE_Int *B_ext_offd_i,
+                                       HYPRE_Int *B_ext_offd_j, HYPRE_Int *map_B_to_C,
+                                       HYPRE_Int *C_diag_size, HYPRE_Int *C_offd_size,
+                                       HYPRE_Int num_rows_diag_A, HYPRE_Int num_cols_offd_A,
+                                       HYPRE_Int allsquare, HYPRE_Int num_cols_diag_B,
+                                       HYPRE_Int num_cols_offd_B, HYPRE_Int num_cols_offd_C,
+                                       HYPRE_Int *CF_marker, HYPRE_Int *dof_func,
+                                       HYPRE_Int *dof_func_offd );
+hypre_ParCSRMatrix *hypre_ParMatmul_FC ( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *P,
+                                         HYPRE_Int *CF_marker, HYPRE_Int *dof_func,
+                                         HYPRE_Int *dof_func_offd );
+void hypre_ParMatScaleDiagInv_F ( hypre_ParCSRMatrix *C, hypre_ParCSRMatrix *A,
+                                  HYPRE_Complex weight, HYPRE_Int *CF_marker );
+hypre_ParCSRMatrix *hypre_ParMatMinus_F ( hypre_ParCSRMatrix *P, hypre_ParCSRMatrix *C,
+                                          HYPRE_Int *CF_marker );
+void hypre_ParCSRMatrixZero_F ( hypre_ParCSRMatrix *P, HYPRE_Int *CF_marker );
+void hypre_ParCSRMatrixCopy_C ( hypre_ParCSRMatrix *P, hypre_ParCSRMatrix *C,
+                                HYPRE_Int *CF_marker );
+void hypre_ParCSRMatrixDropEntries ( hypre_ParCSRMatrix *C, hypre_ParCSRMatrix *P,
+                                     HYPRE_Int *CF_marker );
 
 /* par_csr_matrix.c */
-hypre_ParCSRMatrix *hypre_ParCSRMatrixCreate ( MPI_Comm comm , HYPRE_BigInt global_num_rows , HYPRE_BigInt global_num_cols , HYPRE_BigInt *row_starts_in , HYPRE_BigInt *col_starts_in , HYPRE_Int num_cols_offd , HYPRE_Int num_nonzeros_diag , HYPRE_Int num_nonzeros_offd );
+hypre_ParCSRMatrix *hypre_ParCSRMatrixCreate ( MPI_Comm comm, HYPRE_BigInt global_num_rows,
+                                               HYPRE_BigInt global_num_cols,
+                                               HYPRE_BigInt *row_starts_in,
+                                               HYPRE_BigInt *col_starts_in,
+                                               HYPRE_Int num_cols_offd,
+                                               HYPRE_Int num_nonzeros_diag,
+                                               HYPRE_Int num_nonzeros_offd );
 HYPRE_Int hypre_ParCSRMatrixDestroy ( hypre_ParCSRMatrix *matrix );
-HYPRE_Int hypre_ParCSRMatrixInitialize_v2( hypre_ParCSRMatrix *matrix, HYPRE_MemoryLocation memory_location );
+HYPRE_Int hypre_ParCSRMatrixInitialize_v2( hypre_ParCSRMatrix *matrix,
+                                           HYPRE_MemoryLocation memory_location );
 HYPRE_Int hypre_ParCSRMatrixInitialize ( hypre_ParCSRMatrix *matrix );
 HYPRE_Int hypre_ParCSRMatrixSetNumNonzeros ( hypre_ParCSRMatrix *matrix );
 HYPRE_Int hypre_ParCSRMatrixSetDNumNonzeros ( hypre_ParCSRMatrix *matrix );
 HYPRE_Int hypre_ParCSRMatrixSetNumRownnz ( hypre_ParCSRMatrix *matrix );
-HYPRE_Int hypre_ParCSRMatrixSetDataOwner ( hypre_ParCSRMatrix *matrix , HYPRE_Int owns_data );
-hypre_ParCSRMatrix *hypre_ParCSRMatrixRead ( MPI_Comm comm , const char *file_name );
-HYPRE_Int hypre_ParCSRMatrixPrint ( hypre_ParCSRMatrix *matrix , const char *file_name );
-HYPRE_Int hypre_ParCSRMatrixPrintIJ ( const hypre_ParCSRMatrix *matrix , const HYPRE_Int base_i , const HYPRE_Int base_j , const char *filename );
-HYPRE_Int hypre_ParCSRMatrixReadIJ ( MPI_Comm comm , const char *filename , HYPRE_Int *base_i_ptr , HYPRE_Int *base_j_ptr , hypre_ParCSRMatrix **matrix_ptr );
-HYPRE_Int hypre_ParCSRMatrixGetLocalRange ( hypre_ParCSRMatrix *matrix , HYPRE_BigInt *row_start , HYPRE_BigInt *row_end , HYPRE_BigInt *col_start , HYPRE_BigInt *col_end );
-HYPRE_Int hypre_ParCSRMatrixGetRow ( hypre_ParCSRMatrix *mat , HYPRE_BigInt row , HYPRE_Int *size , HYPRE_BigInt **col_ind , HYPRE_Complex **values );
-HYPRE_Int hypre_ParCSRMatrixRestoreRow ( hypre_ParCSRMatrix *matrix , HYPRE_BigInt row , HYPRE_Int *size , HYPRE_BigInt **col_ind , HYPRE_Complex **values );
-hypre_ParCSRMatrix *hypre_CSRMatrixToParCSRMatrix ( MPI_Comm comm , hypre_CSRMatrix *A , HYPRE_BigInt *row_starts , HYPRE_BigInt *col_starts );
-HYPRE_Int GenerateDiagAndOffd ( hypre_CSRMatrix *A , hypre_ParCSRMatrix *matrix , HYPRE_BigInt first_col_diag , HYPRE_BigInt last_col_diag );
+HYPRE_Int hypre_ParCSRMatrixSetDataOwner ( hypre_ParCSRMatrix *matrix, HYPRE_Int owns_data );
+HYPRE_Int hypre_ParCSRMatrixSetPatternOnly( hypre_ParCSRMatrix *matrix, HYPRE_Int pattern_only);
+hypre_ParCSRMatrix* hypre_ParCSRMatrixCreateFromDenseBlockMatrix(MPI_Comm comm,
+                                                                 HYPRE_BigInt global_num_rows,
+                                                                 HYPRE_BigInt global_num_cols,
+                                                                 HYPRE_BigInt *row_starts,
+                                                                 HYPRE_BigInt *col_starts,
+                                                                 hypre_DenseBlockMatrix *B);
+hypre_ParCSRMatrix* hypre_ParCSRMatrixCreateFromParVector(hypre_ParVector *b,
+                                                          HYPRE_BigInt global_num_rows,
+                                                          HYPRE_BigInt global_num_cols,
+                                                          HYPRE_BigInt *row_starts,
+                                                          HYPRE_BigInt *col_starts);
+hypre_ParCSRMatrix *hypre_ParCSRMatrixRead ( MPI_Comm comm, const char *file_name );
+HYPRE_Int hypre_ParCSRMatrixPrint ( hypre_ParCSRMatrix *matrix, const char *file_name );
+HYPRE_Int hypre_ParCSRMatrixPrintIJ ( const hypre_ParCSRMatrix *matrix, const HYPRE_Int base_i,
+                                      const HYPRE_Int base_j, const char *filename );
+HYPRE_Int hypre_ParCSRMatrixPrintBinaryIJ ( hypre_ParCSRMatrix *matrix, HYPRE_Int base_i,
+                                            HYPRE_Int base_j, const char *filename );
+HYPRE_Int hypre_ParCSRMatrixReadIJ ( MPI_Comm comm, const char *filename, HYPRE_Int *base_i_ptr,
+                                     HYPRE_Int *base_j_ptr, hypre_ParCSRMatrix **matrix_ptr );
+HYPRE_Int hypre_ParCSRMatrixGetLocalRange ( hypre_ParCSRMatrix *matrix, HYPRE_BigInt *row_start,
+                                            HYPRE_BigInt *row_end, HYPRE_BigInt *col_start, HYPRE_BigInt *col_end );
+HYPRE_Int hypre_ParCSRMatrixGetRow ( hypre_ParCSRMatrix *mat, HYPRE_BigInt row, HYPRE_Int *size,
+                                     HYPRE_BigInt **col_ind, HYPRE_Complex **values );
+HYPRE_Int hypre_ParCSRMatrixRestoreRow ( hypre_ParCSRMatrix *matrix, HYPRE_BigInt row,
+                                         HYPRE_Int *size, HYPRE_BigInt **col_ind, HYPRE_Complex **values );
+hypre_ParCSRMatrix *hypre_CSRMatrixToParCSRMatrix ( MPI_Comm comm, hypre_CSRMatrix *A,
+                                                    HYPRE_BigInt *row_starts, HYPRE_BigInt *col_starts );
+HYPRE_Int GenerateDiagAndOffd ( hypre_CSRMatrix *A, hypre_ParCSRMatrix *matrix,
+                                HYPRE_BigInt first_col_diag, HYPRE_BigInt last_col_diag );
 hypre_CSRMatrix *hypre_MergeDiagAndOffd ( hypre_ParCSRMatrix *par_matrix );
 hypre_CSRMatrix *hypre_MergeDiagAndOffdDevice ( hypre_ParCSRMatrix *par_matrix );
 hypre_CSRMatrix *hypre_ParCSRMatrixToCSRMatrixAll ( hypre_ParCSRMatrix *par_matrix );
-HYPRE_Int hypre_ParCSRMatrixCopy ( hypre_ParCSRMatrix *A , hypre_ParCSRMatrix *B , HYPRE_Int copy_data );
-HYPRE_Int hypre_FillResponseParToCSRMatrix ( void *p_recv_contact_buf , HYPRE_Int contact_size , HYPRE_Int contact_proc , void *ro , MPI_Comm comm , void **p_send_response_buf , HYPRE_Int *response_message_size );
-hypre_ParCSRMatrix *hypre_ParCSRMatrixUnion ( hypre_ParCSRMatrix *A , hypre_ParCSRMatrix *B );
+hypre_CSRMatrix *hypre_ParCSRMatrixToCSRMatrixAll_v2 ( hypre_ParCSRMatrix *par_matrix,
+                                                       HYPRE_MemoryLocation memory_location );
+HYPRE_Int hypre_ParCSRMatrixCopy ( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *B,
+                                   HYPRE_Int copy_data );
+HYPRE_Int hypre_FillResponseParToCSRMatrix ( void *p_recv_contact_buf, HYPRE_Int contact_size,
+                                             HYPRE_Int contact_proc, void *ro, MPI_Comm comm, void **p_send_response_buf,
+                                             HYPRE_Int *response_message_size );
+hypre_ParCSRMatrix *hypre_ParCSRMatrixUnion ( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *B );
 hypre_ParCSRMatrix* hypre_ParCSRMatrixClone ( hypre_ParCSRMatrix *A, HYPRE_Int copy_data );
 #define hypre_ParCSRMatrixCompleteClone(A) hypre_ParCSRMatrixClone(A,0)
-hypre_ParCSRMatrix* hypre_ParCSRMatrixClone_v2 ( hypre_ParCSRMatrix *A, HYPRE_Int copy_data, HYPRE_MemoryLocation memory_location );
+hypre_ParCSRMatrix* hypre_ParCSRMatrixClone_v2 ( hypre_ParCSRMatrix *A, HYPRE_Int copy_data,
+                                                 HYPRE_MemoryLocation memory_location );
+HYPRE_Int hypre_ParCSRMatrixTruncate(hypre_ParCSRMatrix *A, HYPRE_Real tol,
+                                     HYPRE_Int max_row_elmts, HYPRE_Int rescale,
+                                     HYPRE_Int nrm_type);
 HYPRE_Int hypre_ParCSRMatrixMigrate(hypre_ParCSRMatrix *A, HYPRE_MemoryLocation memory_location);
 HYPRE_Int hypre_ParCSRMatrixSetConstantValues( hypre_ParCSRMatrix *A, HYPRE_Complex value );
 void hypre_ParCSRMatrixCopyColMapOffdToDevice(hypre_ParCSRMatrix *A);
+void hypre_ParCSRMatrixCopyColMapOffdToHost(hypre_ParCSRMatrix *A);
+
+/* par_csr_matrix_stats.c */
+HYPRE_Int hypre_ParCSRMatrixStatsArrayCompute( HYPRE_Int num_matrices,
+                                               hypre_ParCSRMatrix **matrices,
+                                               hypre_MatrixStatsArray *stats_array );
+
+/* par_csr_matmat_device.c */
+HYPRE_Int hypre_ParCSRMatMatDiagDevice( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *BT,
+                                        hypre_ParCSRMatrix *C );
+
+/* par_csr_matmat.c */
+HYPRE_Int hypre_ParCSRMatMatDiag( hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *B,
+                                  hypre_ParCSRMatrix **C_ptr );
 
 /* par_csr_matvec.c */
 // y = alpha*A*x + beta*b
-HYPRE_Int hypre_ParCSRMatrixMatvecOutOfPlace ( HYPRE_Complex alpha , hypre_ParCSRMatrix *A , hypre_ParVector *x , HYPRE_Complex beta , hypre_ParVector *b, hypre_ParVector *y );
+HYPRE_Int hypre_ParCSRMatrixMatvecOutOfPlace ( HYPRE_Complex alpha, hypre_ParCSRMatrix *A,
+                                               hypre_ParVector *x, HYPRE_Complex beta,
+                                               hypre_ParVector *b, hypre_ParVector *y );
+HYPRE_Int hypre_ParCSRMatrixMatvecOutOfPlaceDevice ( HYPRE_Complex alpha, hypre_ParCSRMatrix *A,
+                                                     hypre_ParVector *x, HYPRE_Complex beta,
+                                                     hypre_ParVector *b, hypre_ParVector *y );
 // y = alpha*A*x + beta*y
-HYPRE_Int hypre_ParCSRMatrixMatvec ( HYPRE_Complex alpha , hypre_ParCSRMatrix *A , hypre_ParVector *x , HYPRE_Complex beta , hypre_ParVector *y );
-HYPRE_Int hypre_ParCSRMatrixMatvecT ( HYPRE_Complex alpha , hypre_ParCSRMatrix *A , hypre_ParVector *x , HYPRE_Complex beta , hypre_ParVector *y );
-HYPRE_Int hypre_ParCSRMatrixMatvec_FF ( HYPRE_Complex alpha , hypre_ParCSRMatrix *A , hypre_ParVector *x , HYPRE_Complex beta , hypre_ParVector *y , HYPRE_Int *CF_marker , HYPRE_Int fpt );
+HYPRE_Int hypre_ParCSRMatrixMatvec ( HYPRE_Complex alpha, hypre_ParCSRMatrix *A, hypre_ParVector *x,
+                                     HYPRE_Complex beta, hypre_ParVector *y );
+HYPRE_Int hypre_ParCSRMatrixMatvecT ( HYPRE_Complex alpha, hypre_ParCSRMatrix *A,
+                                      hypre_ParVector *x, HYPRE_Complex beta, hypre_ParVector *y );
+HYPRE_Int hypre_ParCSRMatrixMatvecTDevice ( HYPRE_Complex alpha, hypre_ParCSRMatrix *A,
+                                            hypre_ParVector *x, HYPRE_Complex beta,
+                                            hypre_ParVector *y );
+HYPRE_Int hypre_ParCSRMatrixMatvecT_unpack( hypre_ParCSRCommPkg *comm_pkg, HYPRE_Int num_cols,
+                                            HYPRE_Complex *recv_data, HYPRE_Complex *local_data );
+HYPRE_Int hypre_ParCSRMatrixMatvec_FF ( HYPRE_Complex alpha, hypre_ParCSRMatrix *A,
+                                        hypre_ParVector *x, HYPRE_Complex beta, hypre_ParVector *y,
+                                        HYPRE_Int *CF_marker, HYPRE_Int fpt );
 
 /* par_csr_triplemat.c */
+HYPRE_Int hypre_ParCSRTMatMatPartialAddDevice( hypre_ParCSRCommPkg *comm_pkg_A,
+                                               HYPRE_Int num_cols_A, HYPRE_Int num_cols_B, HYPRE_BigInt first_col_diag_B,
+                                               HYPRE_BigInt last_col_diag_B, HYPRE_Int num_cols_offd_B, HYPRE_BigInt *col_map_offd_B,
+                                               HYPRE_Int local_nnz_Cbar, hypre_CSRMatrix *Cbar, hypre_CSRMatrix *Cext,
+                                               hypre_CSRMatrix **C_diag_ptr, hypre_CSRMatrix **C_offd_ptr, HYPRE_Int *num_cols_offd_C_ptr,
+                                               HYPRE_BigInt **col_map_offd_C_ptr );
 hypre_ParCSRMatrix *hypre_ParCSRMatMat( hypre_ParCSRMatrix  *A, hypre_ParCSRMatrix  *B );
 hypre_ParCSRMatrix *hypre_ParCSRMatMatHost( hypre_ParCSRMatrix  *A, hypre_ParCSRMatrix  *B );
 hypre_ParCSRMatrix *hypre_ParCSRMatMatDevice( hypre_ParCSRMatrix  *A, hypre_ParCSRMatrix  *B );
-
-hypre_ParCSRMatrix *hypre_ParCSRTMatMatKTHost( hypre_ParCSRMatrix  *A, hypre_ParCSRMatrix  *B, HYPRE_Int keep_transpose);
-hypre_ParCSRMatrix *hypre_ParCSRTMatMatKTDevice( hypre_ParCSRMatrix  *A, hypre_ParCSRMatrix  *B, HYPRE_Int keep_transpose);
-hypre_ParCSRMatrix *hypre_ParCSRTMatMatKT( hypre_ParCSRMatrix  *A, hypre_ParCSRMatrix  *B, HYPRE_Int keep_transpose);
+hypre_ParCSRMatrix *hypre_ParCSRTMatMatKTHost( hypre_ParCSRMatrix  *A, hypre_ParCSRMatrix  *B,
+                                               HYPRE_Int keep_transpose);
+hypre_ParCSRMatrix *hypre_ParCSRTMatMatKTDevice( hypre_ParCSRMatrix  *A, hypre_ParCSRMatrix  *B,
+                                                 HYPRE_Int keep_transpose);
+hypre_ParCSRMatrix *hypre_ParCSRTMatMatKT( hypre_ParCSRMatrix  *A, hypre_ParCSRMatrix  *B,
+                                           HYPRE_Int keep_transpose);
 hypre_ParCSRMatrix *hypre_ParCSRTMatMat( hypre_ParCSRMatrix  *A, hypre_ParCSRMatrix  *B);
-hypre_ParCSRMatrix *hypre_ParCSRMatrixRAPKT( hypre_ParCSRMatrix *R, hypre_ParCSRMatrix  *A, hypre_ParCSRMatrix  *P , HYPRE_Int keepTranspose );
-hypre_ParCSRMatrix *hypre_ParCSRMatrixRAP( hypre_ParCSRMatrix *R, hypre_ParCSRMatrix  *A, hypre_ParCSRMatrix  *P );
-hypre_ParCSRMatrix* hypre_ParCSRMatrixRAPKTDevice( hypre_ParCSRMatrix *R, hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *P, HYPRE_Int keep_transpose );
-hypre_ParCSRMatrix* hypre_ParCSRMatrixRAPKTHost( hypre_ParCSRMatrix *R, hypre_ParCSRMatrix *A, hypre_ParCSRMatrix *P, HYPRE_Int keep_transpose );
+hypre_ParCSRMatrix *hypre_ParCSRMatrixRAPKT( hypre_ParCSRMatrix *R, hypre_ParCSRMatrix  *A,
+                                             hypre_ParCSRMatrix  *P, HYPRE_Int keepTranspose );
+hypre_ParCSRMatrix *hypre_ParCSRMatrixRAP( hypre_ParCSRMatrix *R, hypre_ParCSRMatrix  *A,
+                                           hypre_ParCSRMatrix  *P );
+hypre_ParCSRMatrix* hypre_ParCSRMatrixRAPKTDevice( hypre_ParCSRMatrix *R, hypre_ParCSRMatrix *A,
+                                                   hypre_ParCSRMatrix *P, HYPRE_Int keep_transpose );
+hypre_ParCSRMatrix* hypre_ParCSRMatrixRAPKTHost( hypre_ParCSRMatrix *R, hypre_ParCSRMatrix *A,
+                                                 hypre_ParCSRMatrix *P, HYPRE_Int keep_transpose );
 
 /* par_make_system.c */
-HYPRE_ParCSR_System_Problem *HYPRE_Generate2DSystem ( HYPRE_ParCSRMatrix H_L1 , HYPRE_ParCSRMatrix H_L2 , HYPRE_ParVector H_b1 , HYPRE_ParVector H_b2 , HYPRE_ParVector H_x1 , HYPRE_ParVector H_x2 , HYPRE_Complex *M_vals );
+HYPRE_ParCSR_System_Problem *HYPRE_Generate2DSystem ( HYPRE_ParCSRMatrix H_L1,
+                                                      HYPRE_ParCSRMatrix H_L2, HYPRE_ParVector H_b1, HYPRE_ParVector H_b2, HYPRE_ParVector H_x1,
+                                                      HYPRE_ParVector H_x2, HYPRE_Complex *M_vals );
 HYPRE_Int HYPRE_Destroy2DSystem ( HYPRE_ParCSR_System_Problem *sys_prob );
 
 /* par_vector.c */
-hypre_ParVector *hypre_ParVectorCreate ( MPI_Comm comm , HYPRE_BigInt global_size , HYPRE_BigInt *partitioning_in );
-hypre_ParVector *hypre_ParMultiVectorCreate ( MPI_Comm comm , HYPRE_BigInt global_size , HYPRE_BigInt *partitioning , HYPRE_Int num_vectors );
+hypre_ParVector *hypre_ParVectorCreate ( MPI_Comm comm, HYPRE_BigInt global_size,
+                                         HYPRE_BigInt *partitioning_in );
+hypre_ParVector *hypre_ParMultiVectorCreate ( MPI_Comm comm, HYPRE_BigInt global_size,
+                                              HYPRE_BigInt *partitioning, HYPRE_Int num_vectors );
 HYPRE_Int hypre_ParVectorDestroy ( hypre_ParVector *vector );
+HYPRE_Int hypre_ParVectorInitializeShell( hypre_ParVector *vector );
+HYPRE_Int hypre_ParVectorSetData( hypre_ParVector *vector, HYPRE_Complex *data );
 HYPRE_Int hypre_ParVectorInitialize ( hypre_ParVector *vector );
-HYPRE_Int hypre_ParVectorInitialize_v2( hypre_ParVector *vector, HYPRE_MemoryLocation memory_location );
-HYPRE_Int hypre_ParVectorSetDataOwner ( hypre_ParVector *vector , HYPRE_Int owns_data );
-HYPRE_Int hypre_ParVectorSetNumVectors ( hypre_ParVector *vector , HYPRE_Int num_vectors );
-hypre_ParVector *hypre_ParVectorRead ( MPI_Comm comm , const char *file_name );
-HYPRE_Int hypre_ParVectorPrint ( hypre_ParVector *vector , const char *file_name );
-HYPRE_Int hypre_ParVectorSetConstantValues ( hypre_ParVector *v , HYPRE_Complex value );
-HYPRE_Int hypre_ParVectorSetRandomValues ( hypre_ParVector *v , HYPRE_Int seed );
-HYPRE_Int hypre_ParVectorCopy ( hypre_ParVector *x , hypre_ParVector *y );
+HYPRE_Int hypre_ParVectorInitialize_v2( hypre_ParVector *vector,
+                                        HYPRE_MemoryLocation memory_location );
+HYPRE_Int hypre_ParVectorSetDataOwner ( hypre_ParVector *vector, HYPRE_Int owns_data );
+HYPRE_Int hypre_ParVectorSetLocalSize ( hypre_ParVector *vector, HYPRE_Int local_size );
+HYPRE_Int hypre_ParVectorSetNumVectors ( hypre_ParVector *vector, HYPRE_Int num_vectors );
+HYPRE_Int hypre_ParVectorSetComponent ( hypre_ParVector *vector, HYPRE_Int component );
+HYPRE_Int hypre_ParVectorResize ( hypre_ParVector *vector, HYPRE_Int num_vectors );
+hypre_ParVector *hypre_ParVectorRead ( MPI_Comm comm, const char *file_name );
+HYPRE_Int hypre_ParVectorSetConstantValues ( hypre_ParVector *v, HYPRE_Complex value );
+HYPRE_Int hypre_ParVectorSetZeros( hypre_ParVector *v );
+HYPRE_Int hypre_ParVectorSetRandomValues ( hypre_ParVector *v, HYPRE_Int seed );
+HYPRE_Int hypre_ParVectorCopy ( hypre_ParVector *x, hypre_ParVector *y );
 hypre_ParVector *hypre_ParVectorCloneShallow ( hypre_ParVector *x );
-hypre_ParVector *hypre_ParVectorCloneDeep_v2( hypre_ParVector *x, HYPRE_MemoryLocation memory_location );
+hypre_ParVector *hypre_ParVectorCloneDeep_v2( hypre_ParVector *x,
+                                              HYPRE_MemoryLocation memory_location );
 HYPRE_Int hypre_ParVectorMigrate(hypre_ParVector *x, HYPRE_MemoryLocation memory_location);
-HYPRE_Int hypre_ParVectorScale ( HYPRE_Complex alpha , hypre_ParVector *y );
-HYPRE_Int hypre_ParVectorAxpy ( HYPRE_Complex alpha , hypre_ParVector *x , hypre_ParVector *y );
-HYPRE_Int hypre_ParVectorMassAxpy ( HYPRE_Complex *alpha, hypre_ParVector **x, hypre_ParVector *y, HYPRE_Int k, HYPRE_Int unroll);
-HYPRE_Real hypre_ParVectorInnerProd ( hypre_ParVector *x , hypre_ParVector *y );
-HYPRE_Int hypre_ParVectorMassInnerProd ( hypre_ParVector *x , hypre_ParVector **y , HYPRE_Int k, HYPRE_Int unroll, HYPRE_Real *prod );
-HYPRE_Int hypre_ParVectorMassDotpTwo ( hypre_ParVector *x , hypre_ParVector *y , hypre_ParVector **z, HYPRE_Int k, HYPRE_Int unroll, HYPRE_Real *prod_x , HYPRE_Real *prod_y );
-hypre_ParVector *hypre_VectorToParVector ( MPI_Comm comm , hypre_Vector *v , HYPRE_BigInt *vec_starts );
+HYPRE_Int hypre_ParVectorScale ( HYPRE_Complex alpha, hypre_ParVector *y );
+HYPRE_Int hypre_ParVectorAxpy ( HYPRE_Complex alpha, hypre_ParVector *x, hypre_ParVector *y );
+HYPRE_Int hypre_ParVectorAxpyz ( HYPRE_Complex alpha, hypre_ParVector *x,
+                                 HYPRE_Complex beta, hypre_ParVector *y,
+                                 hypre_ParVector *z );
+HYPRE_Int hypre_ParVectorMassAxpy ( HYPRE_Complex *alpha, hypre_ParVector **x, hypre_ParVector *y,
+                                    HYPRE_Int k, HYPRE_Int unroll);
+HYPRE_Real hypre_ParVectorInnerProd ( hypre_ParVector *x, hypre_ParVector *y );
+HYPRE_Int hypre_ParVectorMassInnerProd ( hypre_ParVector *x, hypre_ParVector **y, HYPRE_Int k,
+                                         HYPRE_Int unroll, HYPRE_Real *prod );
+HYPRE_Int hypre_ParVectorMassDotpTwo ( hypre_ParVector *x, hypre_ParVector *y, hypre_ParVector **z,
+                                       HYPRE_Int k, HYPRE_Int unroll, HYPRE_Real *prod_x, HYPRE_Real *prod_y );
+hypre_ParVector *hypre_VectorToParVector ( MPI_Comm comm, hypre_Vector *v,
+                                           HYPRE_BigInt *vec_starts );
 hypre_Vector *hypre_ParVectorToVectorAll ( hypre_ParVector *par_v );
-HYPRE_Int hypre_ParVectorPrintIJ ( hypre_ParVector *vector , HYPRE_Int base_j , const char *filename );
-HYPRE_Int hypre_ParVectorReadIJ ( MPI_Comm comm , const char *filename , HYPRE_Int *base_j_ptr , hypre_ParVector **vector_ptr );
-HYPRE_Int hypre_FillResponseParToVectorAll ( void *p_recv_contact_buf , HYPRE_Int contact_size , HYPRE_Int contact_proc , void *ro , MPI_Comm comm , void **p_send_response_buf , HYPRE_Int *response_message_size );
+hypre_Vector *hypre_ParVectorToVectorAll_v2 ( hypre_ParVector *par_v,
+                                              HYPRE_MemoryLocation memory_location );
+HYPRE_Int hypre_ParVectorPrint ( hypre_ParVector *vector, const char *file_name );
+HYPRE_Int hypre_ParVectorPrintIJ ( hypre_ParVector *vector, HYPRE_Int base_j,
+                                   const char *filename );
+HYPRE_Int hypre_ParVectorPrintBinaryIJ ( hypre_ParVector *par_vector, const char *filename );
+HYPRE_Int hypre_ParVectorReadIJ ( MPI_Comm comm, const char *filename, HYPRE_Int *base_j_ptr,
+                                  hypre_ParVector **vector_ptr );
+HYPRE_Int hypre_FillResponseParToVectorAll ( void *p_recv_contact_buf, HYPRE_Int contact_size,
+                                             HYPRE_Int contact_proc, void *ro, MPI_Comm comm, void **p_send_response_buf,
+                                             HYPRE_Int *response_message_size );
 HYPRE_Complex hypre_ParVectorLocalSumElts ( hypre_ParVector *vector );
-HYPRE_Int hypre_ParVectorGetValues ( hypre_ParVector *vector, HYPRE_Int num_values, HYPRE_BigInt *indices , HYPRE_Complex *values);
-HYPRE_Int hypre_ParVectorGetValues2( hypre_ParVector *vector, HYPRE_Int num_values, HYPRE_BigInt *indices, HYPRE_BigInt base, HYPRE_Complex *values );
-HYPRE_Int hypre_ParVectorGetValuesHost(hypre_ParVector *vector, HYPRE_Int num_values, HYPRE_BigInt *indices, HYPRE_BigInt base, HYPRE_Complex *values);
+HYPRE_Int hypre_ParVectorGetValues ( hypre_ParVector *vector, HYPRE_Int num_values,
+                                     HYPRE_BigInt *indices, HYPRE_Complex *values);
+HYPRE_Int hypre_ParVectorGetValues2( hypre_ParVector *vector, HYPRE_Int num_values,
+                                     HYPRE_BigInt *indices, HYPRE_BigInt base, HYPRE_Complex *values );
+HYPRE_Int hypre_ParVectorGetValuesHost(hypre_ParVector *vector, HYPRE_Int num_values,
+                                       HYPRE_BigInt *indices, HYPRE_BigInt base, HYPRE_Complex *values);
 HYPRE_Int hypre_ParVectorElmdivpy( hypre_ParVector *x, hypre_ParVector *b, hypre_ParVector *y );
-HYPRE_Int hypre_ParVectorElmdivpyMarked( hypre_ParVector *x, hypre_ParVector *b, hypre_ParVector *y, HYPRE_Int *marker, HYPRE_Int marker_val );
+HYPRE_Int hypre_ParVectorElmdivpyMarked( hypre_ParVector *x, hypre_ParVector *b,
+                                         hypre_ParVector *y, HYPRE_Int *marker,
+                                         HYPRE_Int marker_val );
 /* par_vector_device.c */
-HYPRE_Int hypre_ParVectorGetValuesDevice(hypre_ParVector *vector, HYPRE_Int num_values, HYPRE_BigInt *indices, HYPRE_BigInt base, HYPRE_Complex *values);
+HYPRE_Int hypre_ParVectorGetValuesDevice(hypre_ParVector *vector, HYPRE_Int num_values,
+                                         HYPRE_BigInt *indices, HYPRE_BigInt base,
+                                         HYPRE_Complex *values);
diff --git a/external/hypre/src/seq_block_mv/CMakeLists.txt b/external/hypre/src/seq_block_mv/CMakeLists.txt
new file mode 100644
index 00000000..59fbccf7
--- /dev/null
+++ b/external/hypre/src/seq_block_mv/CMakeLists.txt
@@ -0,0 +1,29 @@
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+set(HDRS
+  _hypre_seq_block_mv.h
+)
+
+set(SRCS
+  dense_block_matrix.c
+  dense_block_matmult.c
+)
+
+target_sources(${PROJECT_NAME}
+  PRIVATE ${SRCS}
+          ${HDRS}
+)
+
+# if (HYPRE_USING_GPU)
+#   set(GPU_SRCS
+#      # File name here
+#   )
+#   convert_filenames_to_full_paths(GPU_SRCS)
+#   set(HYPRE_GPU_SOURCES ${HYPRE_GPU_SOURCES} ${GPU_SRCS} PARENT_SCOPE)
+# endif ()
+
+convert_filenames_to_full_paths(HDRS)
+set(HYPRE_HEADERS ${HYPRE_HEADERS} ${HDRS} PARENT_SCOPE)
diff --git a/external/hypre/src/seq_block_mv/_hypre_seq_block_mv.h b/external/hypre/src/seq_block_mv/_hypre_seq_block_mv.h
new file mode 100644
index 00000000..129c54df
--- /dev/null
+++ b/external/hypre/src/seq_block_mv/_hypre_seq_block_mv.h
@@ -0,0 +1,114 @@
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+/*** DO NOT EDIT THIS FILE DIRECTLY (use 'headers' to generate) ***/
+
+#ifndef hypre_SEQ_BLOCK_MV_HEADER
+#define hypre_SEQ_BLOCK_MV_HEADER
+
+#include <HYPRE_config.h>
+#include "seq_mv.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+#ifndef hypre_DENSE_BLOCK_MATRIX_HEADER
+#define hypre_DENSE_BLOCK_MATRIX_HEADER
+
+/*--------------------------------------------------------------------------
+ * Uniformly blocked dense matrix data structure
+ *--------------------------------------------------------------------------*/
+
+typedef struct hypre_DenseBlockMatrix_struct
+{
+   HYPRE_Int             row_major;          /* Flag indicating storage format (false: col major)*/
+   HYPRE_Int             num_rows;           /* Number of rows of entire matrix */
+   HYPRE_Int             num_cols;           /* Number of columns of entire matrix */
+   HYPRE_Int             num_nonzeros;       /* Number of nonzero coefficients of entire matrix */
+   HYPRE_Int             num_blocks;         /* Number of sub-matrices (blocks) */
+
+   /* Local info for a individual block (sub-matrix) */
+   HYPRE_Int             row_stride;         /* Stride for accessing row values */
+   HYPRE_Int             col_stride;         /* Stride for accessing column values */
+   HYPRE_Int             num_rows_block;     /* Number of rows per block */
+   HYPRE_Int             num_cols_block;     /* Number of columns per block */
+   HYPRE_Int             num_nonzeros_block; /* Number of nonzero coefficients per block */
+
+   /* Matrix coefficients array */
+   HYPRE_Int             owns_data;          /* Flag indicating ownership of the data array */
+   HYPRE_Complex        *data;               /* Matrix coefficients */
+   HYPRE_Complex       **data_aop;           /* Array of pointers to data */
+   HYPRE_MemoryLocation  memory_location;    /* Memory location of data array */
+} hypre_DenseBlockMatrix;
+
+/*--------------------------------------------------------------------------
+ * Accessor functions for the uniform batched matrix structure
+ *--------------------------------------------------------------------------*/
+
+#define hypre_DenseBlockMatrixRowMajor(matrix)         ((matrix) -> row_major)
+#define hypre_DenseBlockMatrixNumRows(matrix)          ((matrix) -> num_rows)
+#define hypre_DenseBlockMatrixNumCols(matrix)          ((matrix) -> num_cols)
+#define hypre_DenseBlockMatrixNumNonzeros(matrix)      ((matrix) -> num_nonzeros)
+#define hypre_DenseBlockMatrixNumBlocks(matrix)        ((matrix) -> num_blocks)
+
+#define hypre_DenseBlockMatrixRowStride(matrix)        ((matrix) -> row_stride)
+#define hypre_DenseBlockMatrixColStride(matrix)        ((matrix) -> col_stride)
+#define hypre_DenseBlockMatrixNumRowsBlock(matrix)     ((matrix) -> num_rows_block)
+#define hypre_DenseBlockMatrixNumColsBlock(matrix)     ((matrix) -> num_cols_block)
+#define hypre_DenseBlockMatrixNumNonzerosBlock(matrix) ((matrix) -> num_nonzeros_block)
+
+#define hypre_DenseBlockMatrixOwnsData(matrix)         ((matrix) -> owns_data)
+#define hypre_DenseBlockMatrixData(matrix)             ((matrix) -> data)
+#define hypre_DenseBlockMatrixDataAOP(matrix)          ((matrix) -> data_aop)
+#define hypre_DenseBlockMatrixMemoryLocation(matrix)   ((matrix) -> memory_location)
+#define hypre_DenseBlockMatrixDataIJ(matrix, d, i, j) \
+   (d[(matrix) -> row_stride * i + \
+      (matrix) -> col_stride * j])
+#define hypre_DenseBlockMatrixDataBIJ(matrix, b, i, j) \
+   ((matrix) -> data[(matrix) -> num_nonzeros_block * b + \
+                     (matrix) -> row_stride * i + \
+                     (matrix) -> col_stride * j])
+
+#endif
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+/* dense_block_matrix.c */
+hypre_DenseBlockMatrix* hypre_DenseBlockMatrixCreate(HYPRE_Int, HYPRE_Int, HYPRE_Int,
+                                                     HYPRE_Int, HYPRE_Int);
+hypre_DenseBlockMatrix* hypre_DenseBlockMatrixCreateByBlock(HYPRE_Int, HYPRE_Int,
+                                                            HYPRE_Int, HYPRE_Int);
+hypre_DenseBlockMatrix* hypre_DenseBlockMatrixClone(hypre_DenseBlockMatrix*, HYPRE_Int);
+HYPRE_Int hypre_DenseBlockMatrixDestroy(hypre_DenseBlockMatrix*);
+HYPRE_Int hypre_DenseBlockMatrixInitializeOn(hypre_DenseBlockMatrix*, HYPRE_MemoryLocation);
+HYPRE_Int hypre_DenseBlockMatrixInitialize(hypre_DenseBlockMatrix*);
+HYPRE_Int hypre_DenseBlockMatrixBuildAOP(hypre_DenseBlockMatrix*);
+HYPRE_Int hypre_DenseBlockMatrixCopy(hypre_DenseBlockMatrix*, hypre_DenseBlockMatrix*);
+HYPRE_Int hypre_DenseBlockMatrixMigrate(hypre_DenseBlockMatrix*, HYPRE_MemoryLocation);
+HYPRE_Int hypre_DenseBlockMatrixPrint(MPI_Comm, hypre_DenseBlockMatrix*, const char*);
+
+/* dense_block_matmult.c */
+HYPRE_Int hypre_DenseBlockMatrixMultiply(hypre_DenseBlockMatrix*, hypre_DenseBlockMatrix*,
+                                         hypre_DenseBlockMatrix**);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
diff --git a/external/hypre/src/seq_block_mv/dense_block_matmult.c b/external/hypre/src/seq_block_mv/dense_block_matmult.c
new file mode 100644
index 00000000..46c69475
--- /dev/null
+++ b/external/hypre/src/seq_block_mv/dense_block_matmult.c
@@ -0,0 +1,136 @@
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+#include "_hypre_seq_block_mv.h"
+
+/*--------------------------------------------------------------------------
+ * hypre_DenseBlockMatrixMultiplyHost
+ *
+ * TODO (VPM): implement special cases such as (locally):
+ *    1) A = 1x2 and B = 2x2
+ *    2) A = 1x3 and B = 3x3
+ *    3) A = 1x4 and B = 4x4
+ *
+ * TODO (VPM): use lapack's dgemm for large matrices (local blocks).
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_DenseBlockMatrixMultiplyHost( hypre_DenseBlockMatrix  *A,
+                                    hypre_DenseBlockMatrix  *B,
+                                    hypre_DenseBlockMatrix  *C)
+{
+   HYPRE_Int       num_blocks       = hypre_DenseBlockMatrixNumBlocks(A);
+   HYPRE_Int       num_rows_block_C = hypre_DenseBlockMatrixNumRowsBlock(C);
+   HYPRE_Int       num_cols_block_C = hypre_DenseBlockMatrixNumColsBlock(C);
+   HYPRE_Int       num_rows_block_B = hypre_DenseBlockMatrixNumRowsBlock(B);
+
+   HYPRE_Int       num_nonzeros_block_A = hypre_DenseBlockMatrixNumNonzerosBlock(A);
+   HYPRE_Int       num_nonzeros_block_B = hypre_DenseBlockMatrixNumNonzerosBlock(B);
+   HYPRE_Int       num_nonzeros_block_C = hypre_DenseBlockMatrixNumNonzerosBlock(C);
+
+   HYPRE_Int       ib;
+
+#if defined(HYPRE_USING_OPENMP)
+   #pragma omp parallel for private(ib) HYPRE_SMP_SCHEDULE
+#endif
+   for (ib = 0; ib < num_blocks; ib++)
+   {
+      HYPRE_Int       i, j, k;
+      HYPRE_Complex  *data_A = hypre_DenseBlockMatrixData(A) + ib * num_nonzeros_block_A;
+      HYPRE_Complex  *data_B = hypre_DenseBlockMatrixData(B) + ib * num_nonzeros_block_B;
+      HYPRE_Complex  *data_C = hypre_DenseBlockMatrixData(C) + ib * num_nonzeros_block_C;
+
+      for (i = 0; i < num_rows_block_C; i++)
+      {
+         for (j = 0; j < num_cols_block_C; j++)
+         {
+            for (k = 0; k < num_rows_block_B; k++)
+            {
+               /* C[i][j] += A[i][k] * B[k][j]; */
+               hypre_DenseBlockMatrixDataIJ(C, data_C, i, j) +=
+                  hypre_DenseBlockMatrixDataIJ(A, data_A, i, k) *
+                  hypre_DenseBlockMatrixDataIJ(B, data_B, k, j);
+            }
+         }
+      }
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_DenseBlockMatrixMultiply
+ *
+ * Computes: C = A * B.
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_DenseBlockMatrixMultiply( hypre_DenseBlockMatrix   *A,
+                                hypre_DenseBlockMatrix   *B,
+                                hypre_DenseBlockMatrix  **C_ptr)
+{
+   hypre_DenseBlockMatrix  *C = *C_ptr;
+
+   /* Check if multiplication makes sense */
+   if (hypre_DenseBlockMatrixNumCols(A) != hypre_DenseBlockMatrixNumRows(B))
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "cols(A) != rows(B)");
+      return hypre_error_flag;
+   }
+
+   if (hypre_DenseBlockMatrixNumColsBlock(A) != hypre_DenseBlockMatrixNumRowsBlock(B))
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "local cols(A) != local rows(B)");
+      return hypre_error_flag;
+   }
+
+   /* Create and initialize output matrix if necessary */
+   if (!C)
+   {
+      /* Use same storage layout as A */
+      C = hypre_DenseBlockMatrixCreate(hypre_DenseBlockMatrixRowMajor(A),
+                                       hypre_DenseBlockMatrixNumRows(A),
+                                       hypre_DenseBlockMatrixNumCols(B),
+                                       hypre_DenseBlockMatrixNumRowsBlock(A),
+                                       hypre_DenseBlockMatrixNumColsBlock(B));
+      hypre_DenseBlockMatrixInitializeOn(C, hypre_DenseBlockMatrixMemoryLocation(A));
+   }
+   else
+   {
+      /* Reset output coefficients to zero */
+      hypre_Memset(hypre_DenseBlockMatrixData(C), 0,
+                   hypre_DenseBlockMatrixNumNonzeros(C) * sizeof(HYPRE_Complex),
+                   hypre_DenseBlockMatrixMemoryLocation(C));
+   }
+
+   /* Compute matrix C */
+#if defined(HYPRE_USING_GPU)
+   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy2(hypre_DenseBlockMatrixMemoryLocation(A),
+                                                     hypre_DenseBlockMatrixMemoryLocation(B));
+
+   if (exec == HYPRE_EXEC_DEVICE)
+   {
+      /* TODO (VPM): Implement hypre_DenseBlockMatrixMultiplyDevice */
+      hypre_DenseBlockMatrixMigrate(A, HYPRE_MEMORY_HOST);
+      hypre_DenseBlockMatrixMigrate(B, HYPRE_MEMORY_HOST);
+      hypre_DenseBlockMatrixMigrate(C, HYPRE_MEMORY_HOST);
+      hypre_DenseBlockMatrixMultiplyHost(A, B, C);
+      hypre_DenseBlockMatrixMigrate(A, HYPRE_MEMORY_DEVICE);
+      hypre_DenseBlockMatrixMigrate(B, HYPRE_MEMORY_DEVICE);
+      hypre_DenseBlockMatrixMigrate(C, HYPRE_MEMORY_DEVICE);
+   }
+   else
+#endif
+   {
+      hypre_DenseBlockMatrixMultiplyHost(A, B, C);
+   }
+
+   /* Set output pointer */
+   *C_ptr = C;
+
+   return hypre_error_flag;
+}
diff --git a/external/hypre/src/seq_block_mv/dense_block_matrix.c b/external/hypre/src/seq_block_mv/dense_block_matrix.c
new file mode 100644
index 00000000..cd3c5d6d
--- /dev/null
+++ b/external/hypre/src/seq_block_mv/dense_block_matrix.c
@@ -0,0 +1,335 @@
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ * Member functions for hypre_DenseBlockMatrix class.
+ *
+ *****************************************************************************/
+
+#include "_hypre_seq_block_mv.h"
+
+/*--------------------------------------------------------------------------
+ * hypre_DenseBlockMatrixCreate
+ *--------------------------------------------------------------------------*/
+
+hypre_DenseBlockMatrix *
+hypre_DenseBlockMatrixCreate( HYPRE_Int  row_major,
+                              HYPRE_Int  num_rows,
+                              HYPRE_Int  num_cols,
+                              HYPRE_Int  num_rows_block,
+                              HYPRE_Int  num_cols_block )
+{
+   hypre_DenseBlockMatrix  *A;
+   HYPRE_Int                num_blocks[2];
+
+   /* Compute number of blocks */
+   num_blocks[0] = hypre_ceildiv(num_rows, num_rows_block);
+   num_blocks[1] = hypre_ceildiv(num_cols, num_cols_block);
+   if (num_blocks[0] != num_blocks[1])
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Invalid number of blocks!");
+      return NULL;
+   }
+
+   /* Allocate memory */
+   A = hypre_TAlloc(hypre_DenseBlockMatrix, 1, HYPRE_MEMORY_HOST);
+
+   hypre_DenseBlockMatrixRowMajor(A)         = row_major;
+   hypre_DenseBlockMatrixNumRowsBlock(A)     = num_rows_block;
+   hypre_DenseBlockMatrixNumColsBlock(A)     = num_cols_block;
+   hypre_DenseBlockMatrixNumBlocks(A)        = num_blocks[0];
+   hypre_DenseBlockMatrixNumRows(A)          = num_blocks[0] * hypre_DenseBlockMatrixNumRowsBlock(A);
+   hypre_DenseBlockMatrixNumCols(A)          = num_blocks[0] * hypre_DenseBlockMatrixNumColsBlock(A);
+   hypre_DenseBlockMatrixNumNonzerosBlock(A) = hypre_DenseBlockMatrixNumRowsBlock(A) *
+                                               hypre_DenseBlockMatrixNumColsBlock(A);
+   hypre_DenseBlockMatrixNumNonzeros(A)      = num_blocks[0] *
+                                               hypre_DenseBlockMatrixNumNonzerosBlock(A);
+   hypre_DenseBlockMatrixOwnsData(A)         = 0;
+   hypre_DenseBlockMatrixData(A)             = NULL;
+   hypre_DenseBlockMatrixDataAOP(A)          = NULL;
+   hypre_DenseBlockMatrixMemoryLocation(A)   = hypre_HandleMemoryLocation(hypre_handle());
+
+   if (row_major)
+   {
+      hypre_DenseBlockMatrixRowStride(A)     = 1;
+      hypre_DenseBlockMatrixColStride(A)     = hypre_DenseBlockMatrixNumColsBlock(A);
+   }
+   else
+   {
+      hypre_DenseBlockMatrixRowStride(A)     = hypre_DenseBlockMatrixNumRowsBlock(A);
+      hypre_DenseBlockMatrixColStride(A)     = 1;
+   }
+
+   return A;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_DenseBlockMatrixCreateByBlock
+ *--------------------------------------------------------------------------*/
+
+hypre_DenseBlockMatrix *
+hypre_DenseBlockMatrixCreateByBlock( HYPRE_Int  row_major,
+                                     HYPRE_Int  num_blocks,
+                                     HYPRE_Int  num_rows_block,
+                                     HYPRE_Int  num_cols_block )
+{
+   return hypre_DenseBlockMatrixCreate(row_major,
+                                       num_blocks * num_rows_block,
+                                       num_blocks * num_cols_block,
+                                       num_rows_block,
+                                       num_cols_block);
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_DenseBlockMatrixClone
+ *--------------------------------------------------------------------------*/
+
+hypre_DenseBlockMatrix*
+hypre_DenseBlockMatrixClone( hypre_DenseBlockMatrix *A,
+                             HYPRE_Int               copy_data )
+{
+   HYPRE_Int row_major      = hypre_DenseBlockMatrixRowMajor(A);
+   HYPRE_Int num_rows       = hypre_DenseBlockMatrixNumRows(A);
+   HYPRE_Int num_cols       = hypre_DenseBlockMatrixNumCols(A);
+   HYPRE_Int num_rows_block = hypre_DenseBlockMatrixNumRowsBlock(A);
+   HYPRE_Int num_cols_block = hypre_DenseBlockMatrixNumColsBlock(A);
+
+   hypre_DenseBlockMatrix  *B;
+
+   /* Create new matrix */
+   B = hypre_DenseBlockMatrixCreate(row_major,
+                                    num_rows, num_cols,
+                                    num_rows_block, num_cols_block);
+
+   /* Initialize matrix */
+   hypre_DenseBlockMatrixInitializeOn(B, hypre_DenseBlockMatrixMemoryLocation(A));
+
+   /* Copy data array */
+   if (copy_data)
+   {
+      hypre_DenseBlockMatrixCopy(A, B);
+   }
+
+   return B;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_DenseBlockMatrixDestroy
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_DenseBlockMatrixDestroy( hypre_DenseBlockMatrix *A )
+{
+   if (A)
+   {
+      HYPRE_MemoryLocation memory_location = hypre_DenseBlockMatrixMemoryLocation(A);
+
+      if (hypre_DenseBlockMatrixOwnsData(A))
+      {
+         hypre_TFree(hypre_DenseBlockMatrixData(A), memory_location);
+      }
+
+      /* data_aop is always owned by a hypre_DenseBlockMatrix */
+      hypre_TFree(hypre_DenseBlockMatrixDataAOP(A), memory_location);
+
+      /* Free matrix pointer */
+      hypre_TFree(A, HYPRE_MEMORY_HOST);
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_DenseBlockMatrixInitializeOn
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_DenseBlockMatrixInitializeOn( hypre_DenseBlockMatrix  *A,
+                                    HYPRE_MemoryLocation     memory_location )
+{
+   hypre_DenseBlockMatrixMemoryLocation(A) = memory_location;
+
+   /* Allocate memory for data */
+   if (!hypre_DenseBlockMatrixData(A) && hypre_DenseBlockMatrixNumNonzeros(A))
+   {
+      hypre_DenseBlockMatrixData(A) = hypre_CTAlloc(HYPRE_Complex,
+                                                    hypre_DenseBlockMatrixNumNonzeros(A),
+                                                    memory_location);
+      hypre_DenseBlockMatrixOwnsData(A) = 1;
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_DenseBlockMatrixInitialize
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_DenseBlockMatrixInitialize( hypre_DenseBlockMatrix *A )
+{
+   return hypre_DenseBlockMatrixInitializeOn(A, hypre_DenseBlockMatrixMemoryLocation(A));
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_DenseBlockMatrixBuildAOP
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_DenseBlockMatrixBuildAOP( hypre_DenseBlockMatrix *A )
+{
+   HYPRE_MemoryLocation memory_location = hypre_DenseBlockMatrixMemoryLocation(A);
+
+   /* Allocate memory if we need */
+   if (!hypre_DenseBlockMatrixDataAOP(A))
+   {
+      hypre_DenseBlockMatrixDataAOP(A) = hypre_TAlloc(HYPRE_Complex *,
+                                                      hypre_DenseBlockMatrixNumBlocks(A),
+                                                      memory_location);
+   }
+
+   /* Build array of pointers to the matrix data */
+#if defined(HYPRE_USING_GPU)
+   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1(memory_location);
+
+   if (exec == HYPRE_EXEC_DEVICE)
+   {
+      hypreDevice_ComplexArrayToArrayOfPtrs(hypre_DenseBlockMatrixNumBlocks(A),
+                                            hypre_DenseBlockMatrixNumNonzerosBlock(A),
+                                            hypre_DenseBlockMatrixData(A),
+                                            hypre_DenseBlockMatrixDataAOP(A));
+   }
+#endif
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_DenseBlockMatrixCopy
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_DenseBlockMatrixCopy( hypre_DenseBlockMatrix *A,
+                            hypre_DenseBlockMatrix *B )
+{
+   /* Copy coeficients from matrix A to B */
+   hypre_TMemcpy(hypre_DenseBlockMatrixData(B),
+                 hypre_DenseBlockMatrixData(A),
+                 HYPRE_Complex,
+                 hypre_DenseBlockMatrixNumNonzeros(A),
+                 hypre_DenseBlockMatrixMemoryLocation(B),
+                 hypre_DenseBlockMatrixMemoryLocation(A));
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_DenseBlockMatrixMigrate
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_DenseBlockMatrixMigrate( hypre_DenseBlockMatrix *A,
+                               HYPRE_MemoryLocation    memory_location )
+{
+   /* Input matrix info */
+   HYPRE_MemoryLocation   old_memory_location = hypre_DenseBlockMatrixMemoryLocation(A);
+   HYPRE_Int              num_nonzeros        = hypre_DenseBlockMatrixNumNonzeros(A);
+   HYPRE_Complex         *A_data              = hypre_DenseBlockMatrixData(A);
+
+   /* Output matrix info */
+   HYPRE_Complex         *B_data;
+
+   /* Update A's memory location */
+   hypre_DenseBlockMatrixMemoryLocation(A) = memory_location;
+
+   if ( hypre_GetActualMemLocation(memory_location) !=
+        hypre_GetActualMemLocation(old_memory_location) )
+   {
+      if (A_data)
+      {
+         B_data = hypre_TAlloc(HYPRE_Complex, num_nonzeros, memory_location);
+         hypre_TMemcpy(B_data, A_data, HYPRE_Complex, num_nonzeros,
+                       memory_location, old_memory_location);
+         hypre_TFree(A_data, old_memory_location);
+         hypre_DenseBlockMatrixData(A) = B_data;
+      }
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_DenseBlockMatrixPrint
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_DenseBlockMatrixPrint( MPI_Comm                comm,
+                             hypre_DenseBlockMatrix *A,
+                             const char*             filename )
+{
+   /* Input matrix info */
+   HYPRE_MemoryLocation   memory_location = hypre_DenseBlockMatrixMemoryLocation(A);
+
+   /* Local variables */
+   char                   new_filename[HYPRE_MAX_FILE_NAME_LEN];
+   HYPRE_Int              myid, ib, i, j;
+   FILE                  *file;
+
+   /* Move matrix to host */
+   hypre_DenseBlockMatrixMigrate(A, HYPRE_MEMORY_HOST);
+
+   /* Open file */
+   hypre_MPI_Comm_rank(comm, &myid);
+   hypre_sprintf(new_filename, "%s.%05d", filename, myid);
+   if ((file = fopen(new_filename, "w")) == NULL)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Cannot open output file!");
+      return hypre_error_flag;
+   }
+
+   /*---------------------------------------------
+    * Write the header
+    *---------------------------------------------*/
+
+   /* 1st header line: matrix info */
+   hypre_fprintf(file, "%d %d\n",
+                 hypre_DenseBlockMatrixNumRows(A),
+                 hypre_DenseBlockMatrixNumCols(A));
+
+   /* 2nd header line: local block info */
+   hypre_fprintf(file, "%d %d %d %d\n",
+                 hypre_DenseBlockMatrixRowMajor(A),
+                 hypre_DenseBlockMatrixNumBlocks(A),
+                 hypre_DenseBlockMatrixNumRowsBlock(A),
+                 hypre_DenseBlockMatrixNumColsBlock(A));
+
+   /*---------------------------------------------
+    * Write coefficients
+    *---------------------------------------------*/
+
+   for (ib = 0; ib < hypre_DenseBlockMatrixNumBlocks(A); ib++)
+   {
+      hypre_fprintf(file, "%d\n", ib);
+      for (i = 0; i < hypre_DenseBlockMatrixNumRowsBlock(A); i++)
+      {
+         for (j = 0; j < hypre_DenseBlockMatrixNumColsBlock(A); j++)
+         {
+            hypre_fprintf(file, " %22.15e",
+                          hypre_DenseBlockMatrixDataBIJ(A, ib, i, j));
+         }
+         hypre_fprintf(file, ";\n");
+      }
+   }
+
+   fclose(file);
+
+   /* Move matrix back to original lcoation */
+   hypre_DenseBlockMatrixMigrate(A, memory_location);
+
+   return hypre_error_flag;
+}
diff --git a/external/hypre/src/seq_block_mv/dense_block_matrix.h b/external/hypre/src/seq_block_mv/dense_block_matrix.h
new file mode 100644
index 00000000..75ec0bba
--- /dev/null
+++ b/external/hypre/src/seq_block_mv/dense_block_matrix.h
@@ -0,0 +1,65 @@
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+#ifndef hypre_DENSE_BLOCK_MATRIX_HEADER
+#define hypre_DENSE_BLOCK_MATRIX_HEADER
+
+/*--------------------------------------------------------------------------
+ * Uniformly blocked dense matrix data structure
+ *--------------------------------------------------------------------------*/
+
+typedef struct hypre_DenseBlockMatrix_struct
+{
+   HYPRE_Int             row_major;          /* Flag indicating storage format (false: col major)*/
+   HYPRE_Int             num_rows;           /* Number of rows of entire matrix */
+   HYPRE_Int             num_cols;           /* Number of columns of entire matrix */
+   HYPRE_Int             num_nonzeros;       /* Number of nonzero coefficients of entire matrix */
+   HYPRE_Int             num_blocks;         /* Number of sub-matrices (blocks) */
+
+   /* Local info for a individual block (sub-matrix) */
+   HYPRE_Int             row_stride;         /* Stride for accessing row values */
+   HYPRE_Int             col_stride;         /* Stride for accessing column values */
+   HYPRE_Int             num_rows_block;     /* Number of rows per block */
+   HYPRE_Int             num_cols_block;     /* Number of columns per block */
+   HYPRE_Int             num_nonzeros_block; /* Number of nonzero coefficients per block */
+
+   /* Matrix coefficients array */
+   HYPRE_Int             owns_data;          /* Flag indicating ownership of the data array */
+   HYPRE_Complex        *data;               /* Matrix coefficients */
+   HYPRE_Complex       **data_aop;           /* Array of pointers to data */
+   HYPRE_MemoryLocation  memory_location;    /* Memory location of data array */
+} hypre_DenseBlockMatrix;
+
+/*--------------------------------------------------------------------------
+ * Accessor functions for the uniform batched matrix structure
+ *--------------------------------------------------------------------------*/
+
+#define hypre_DenseBlockMatrixRowMajor(matrix)         ((matrix) -> row_major)
+#define hypre_DenseBlockMatrixNumRows(matrix)          ((matrix) -> num_rows)
+#define hypre_DenseBlockMatrixNumCols(matrix)          ((matrix) -> num_cols)
+#define hypre_DenseBlockMatrixNumNonzeros(matrix)      ((matrix) -> num_nonzeros)
+#define hypre_DenseBlockMatrixNumBlocks(matrix)        ((matrix) -> num_blocks)
+
+#define hypre_DenseBlockMatrixRowStride(matrix)        ((matrix) -> row_stride)
+#define hypre_DenseBlockMatrixColStride(matrix)        ((matrix) -> col_stride)
+#define hypre_DenseBlockMatrixNumRowsBlock(matrix)     ((matrix) -> num_rows_block)
+#define hypre_DenseBlockMatrixNumColsBlock(matrix)     ((matrix) -> num_cols_block)
+#define hypre_DenseBlockMatrixNumNonzerosBlock(matrix) ((matrix) -> num_nonzeros_block)
+
+#define hypre_DenseBlockMatrixOwnsData(matrix)         ((matrix) -> owns_data)
+#define hypre_DenseBlockMatrixData(matrix)             ((matrix) -> data)
+#define hypre_DenseBlockMatrixDataAOP(matrix)          ((matrix) -> data_aop)
+#define hypre_DenseBlockMatrixMemoryLocation(matrix)   ((matrix) -> memory_location)
+#define hypre_DenseBlockMatrixDataIJ(matrix, d, i, j) \
+   (d[(matrix) -> row_stride * i + \
+      (matrix) -> col_stride * j])
+#define hypre_DenseBlockMatrixDataBIJ(matrix, b, i, j) \
+   ((matrix) -> data[(matrix) -> num_nonzeros_block * b + \
+                     (matrix) -> row_stride * i + \
+                     (matrix) -> col_stride * j])
+
+#endif
diff --git a/external/hypre/src/seq_block_mv/headers b/external/hypre/src/seq_block_mv/headers
new file mode 100755
index 00000000..4215eed0
--- /dev/null
+++ b/external/hypre/src/seq_block_mv/headers
@@ -0,0 +1,49 @@
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+INTERNAL_HEADER=_hypre_seq_block_mv.h
+
+#===========================================================================
+# Include guards and other includes
+#===========================================================================
+
+cat > $INTERNAL_HEADER <<@
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+/*** DO NOT EDIT THIS FILE DIRECTLY (use 'headers' to generate) ***/
+
+#ifndef hypre_SEQ_BLOCK_MV_HEADER
+#define hypre_SEQ_BLOCK_MV_HEADER
+
+#include <HYPRE_config.h>
+#include "seq_mv.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+@
+
+cat dense_block_matrix.h >> $INTERNAL_HEADER
+cat protos.h             >> $INTERNAL_HEADER
+
+#===========================================================================
+# Include guards
+#===========================================================================
+
+cat >> $INTERNAL_HEADER <<@
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
+@
diff --git a/external/hypre/src/seq_block_mv/protos.h b/external/hypre/src/seq_block_mv/protos.h
new file mode 100644
index 00000000..799deffa
--- /dev/null
+++ b/external/hypre/src/seq_block_mv/protos.h
@@ -0,0 +1,24 @@
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+/* dense_block_matrix.c */
+hypre_DenseBlockMatrix* hypre_DenseBlockMatrixCreate(HYPRE_Int, HYPRE_Int, HYPRE_Int,
+                                                     HYPRE_Int, HYPRE_Int);
+hypre_DenseBlockMatrix* hypre_DenseBlockMatrixCreateByBlock(HYPRE_Int, HYPRE_Int,
+                                                            HYPRE_Int, HYPRE_Int);
+hypre_DenseBlockMatrix* hypre_DenseBlockMatrixClone(hypre_DenseBlockMatrix*, HYPRE_Int);
+HYPRE_Int hypre_DenseBlockMatrixDestroy(hypre_DenseBlockMatrix*);
+HYPRE_Int hypre_DenseBlockMatrixInitializeOn(hypre_DenseBlockMatrix*, HYPRE_MemoryLocation);
+HYPRE_Int hypre_DenseBlockMatrixInitialize(hypre_DenseBlockMatrix*);
+HYPRE_Int hypre_DenseBlockMatrixBuildAOP(hypre_DenseBlockMatrix*);
+HYPRE_Int hypre_DenseBlockMatrixCopy(hypre_DenseBlockMatrix*, hypre_DenseBlockMatrix*);
+HYPRE_Int hypre_DenseBlockMatrixMigrate(hypre_DenseBlockMatrix*, HYPRE_MemoryLocation);
+HYPRE_Int hypre_DenseBlockMatrixPrint(MPI_Comm, hypre_DenseBlockMatrix*, const char*);
+
+/* dense_block_matmult.c */
+HYPRE_Int hypre_DenseBlockMatrixMultiply(hypre_DenseBlockMatrix*, hypre_DenseBlockMatrix*,
+                                         hypre_DenseBlockMatrix**);
diff --git a/external/hypre/src/seq_mv/.gitignore b/external/hypre/src/seq_mv/.gitignore
new file mode 100644
index 00000000..11ea4d63
--- /dev/null
+++ b/external/hypre/src/seq_mv/.gitignore
@@ -0,0 +1,7 @@
+#####################
+# Autogenerated files
+#####################
+csr_spgemm_device_numer[1-9].c
+csr_spgemm_device_numer10.c
+csr_spgemm_device_symbl[1-9].c
+csr_spgemm_device_symbl10.c
diff --git a/external/hypre/src/seq_mv/CMakeLists.txt b/external/hypre/src/seq_mv/CMakeLists.txt
index 80942d36..c7962b47 100644
--- a/external/hypre/src/seq_mv/CMakeLists.txt
+++ b/external/hypre/src/seq_mv/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -9,61 +9,126 @@ set(HDRS
 )
 
 set(SRCS
+  csr_filter.c
   csr_matop.c
-  csr_matop_device.c
   csr_matrix.c
-  csr_matrix_cuda_utils.c
   csr_matvec.c
+  genpart.c
+  HYPRE_csr_matrix.c
+  HYPRE_mapped_matrix.c
+  HYPRE_multiblock_matrix.c
+  HYPRE_vector.c
+  mapped_matrix.c
+  multiblock_matrix.c
+  vector_batched.c
+  csr_matop_device.c
+  csr_matrix_cuda_utils.c
   csr_matvec_device.c
   csr_matvec_oomp.c
   csr_spadd_device.c
   csr_spgemm_device.c
-  csr_spgemm_device_attempt.c
-  csr_spgemm_device_confident.c
   csr_spgemm_device_cusparse.c
+  csr_spgemm_device_numblocks.c
+  csr_spgemm_device_numer.c
+  csr_spgemm_device_numer1.c
+  csr_spgemm_device_numer2.c
+  csr_spgemm_device_numer3.c
+  csr_spgemm_device_numer4.c
+  csr_spgemm_device_numer5.c
+  csr_spgemm_device_numer6.c
+  csr_spgemm_device_numer7.c
+  csr_spgemm_device_numer8.c
+  csr_spgemm_device_numer9.c
+  csr_spgemm_device_numer10.c
+  csr_spgemm_device_onemklsparse.c
   csr_spgemm_device_rocsparse.c
-  csr_spgemm_device_rowbound.c
   csr_spgemm_device_rowest.c
+  csr_spgemm_device_symbl.c
+  csr_spgemm_device_symbl1.c
+  csr_spgemm_device_symbl2.c
+  csr_spgemm_device_symbl3.c
+  csr_spgemm_device_symbl4.c
+  csr_spgemm_device_symbl5.c
+  csr_spgemm_device_symbl6.c
+  csr_spgemm_device_symbl7.c
+  csr_spgemm_device_symbl8.c
+  csr_spgemm_device_symbl9.c
+  csr_spgemm_device_symbl10.c
   csr_spgemm_device_util.c
   csr_spmv_device.c
   csr_sptrans_device.c
-  genpart.c
-  HYPRE_csr_matrix.c
-  HYPRE_mapped_matrix.c
-  HYPRE_multiblock_matrix.c
-  HYPRE_vector.c
-  mapped_matrix.c
-  multiblock_matrix.c
   vector.c
-  vector_batched.c
+  vector_device.c
 )
 
+# Autogenerate csr_spgemm_device_numer$ files
+file(READ "csr_spgemm_device_numer.in" CONTENTS)
+foreach(number RANGE 1 10)
+  # Check if file exists, then don't recreate
+  set(fn "csr_spgemm_device_numer${number}.c")
+  if (NOT EXISTS ${fn})
+    file(WRITE ${fn} "#define HYPRE_SPGEMM_BIN ${number}")
+    file(APPEND ${fn} "${CONTENTS}")
+  endif (NOT EXISTS ${fn})
+endforeach(number RANGE 1 10)
+
+# Autogenerate csr_spgemm_device_symbl$ files
+file(READ "csr_spgemm_device_symbl.in" CONTENTS)
+foreach(number RANGE 1 10)
+  set(fn "csr_spgemm_device_symbl${number}.c")
+  if (NOT EXISTS ${fn})
+    file(WRITE ${fn} "#define HYPRE_SPGEMM_BIN ${number}")
+    file(APPEND ${fn} "${CONTENTS}")
+  endif (NOT EXISTS ${fn})
+endforeach(number RANGE 1 10)
+
 target_sources(${PROJECT_NAME}
   PRIVATE ${SRCS}
           ${HDRS}
 )
 
-if (HYPRE_USING_CUDA)
-  set(CUDA_SRCS
+if (HYPRE_USING_GPU)
+  set(GPU_SRCS
     csr_matop_device.c
     csr_matrix_cuda_utils.c
     csr_matvec_device.c
     csr_matvec_oomp.c
     csr_spadd_device.c
     csr_spgemm_device.c
-    csr_spgemm_device_attempt.c
-    csr_spgemm_device_confident.c
     csr_spgemm_device_cusparse.c
+    csr_spgemm_device_numblocks.c
+    csr_spgemm_device_numer.c
+    csr_spgemm_device_numer1.c
+    csr_spgemm_device_numer2.c
+    csr_spgemm_device_numer3.c
+    csr_spgemm_device_numer4.c
+    csr_spgemm_device_numer5.c
+    csr_spgemm_device_numer6.c
+    csr_spgemm_device_numer7.c
+    csr_spgemm_device_numer8.c
+    csr_spgemm_device_numer9.c
+    csr_spgemm_device_numer10.c
+    csr_spgemm_device_onemklsparse.c
     csr_spgemm_device_rocsparse.c
-    csr_spgemm_device_rowbound.c
     csr_spgemm_device_rowest.c
+    csr_spgemm_device_symbl.c
+    csr_spgemm_device_symbl1.c
+    csr_spgemm_device_symbl2.c
+    csr_spgemm_device_symbl3.c
+    csr_spgemm_device_symbl4.c
+    csr_spgemm_device_symbl5.c
+    csr_spgemm_device_symbl6.c
+    csr_spgemm_device_symbl7.c
+    csr_spgemm_device_symbl8.c
+    csr_spgemm_device_symbl9.c
+    csr_spgemm_device_symbl10.c
     csr_spgemm_device_util.c
     csr_spmv_device.c
     csr_sptrans_device.c
-    vector.c
+    vector_device.c
   )
-  convert_filenames_to_full_paths(CUDA_SRCS)
-  set(HYPRE_CUDA_SOURCES ${HYPRE_CUDA_SOURCES} ${CUDA_SRCS} PARENT_SCOPE)
+  convert_filenames_to_full_paths(GPU_SRCS)
+  set(HYPRE_GPU_SOURCES ${HYPRE_GPU_SOURCES} ${GPU_SRCS} PARENT_SCOPE)
 endif ()
 
 convert_filenames_to_full_paths(HDRS)
diff --git a/external/hypre/src/seq_mv/HYPRE_csr_matrix.c b/external/hypre/src/seq_mv/HYPRE_csr_matrix.c
index 4e0ecf4e..4fc71515 100644
--- a/external/hypre/src/seq_mv/HYPRE_csr_matrix.c
+++ b/external/hypre/src/seq_mv/HYPRE_csr_matrix.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -30,7 +30,7 @@ HYPRE_CSRMatrixCreate( HYPRE_Int  num_rows,
    matrix_i[0] = 0;
    for (i = 0; i < num_rows; i++)
    {
-      matrix_i[i+1] = matrix_i[i] + row_sizes[i];
+      matrix_i[i + 1] = matrix_i[i] + row_sizes[i];
    }
 
    matrix = hypre_CSRMatrixCreate(num_rows, num_cols, matrix_i[num_rows]);
@@ -46,7 +46,7 @@ HYPRE_CSRMatrixCreate( HYPRE_Int  num_rows,
 HYPRE_Int
 HYPRE_CSRMatrixDestroy( HYPRE_CSRMatrix matrix )
 {
-   return( hypre_CSRMatrixDestroy( (hypre_CSRMatrix *) matrix ) );
+   return ( hypre_CSRMatrixDestroy( (hypre_CSRMatrix *) matrix ) );
 }
 
 /*--------------------------------------------------------------------------
diff --git a/external/hypre/src/seq_mv/HYPRE_mapped_matrix.c b/external/hypre/src/seq_mv/HYPRE_mapped_matrix.c
index 405fd388..24355b32 100644
--- a/external/hypre/src/seq_mv/HYPRE_mapped_matrix.c
+++ b/external/hypre/src/seq_mv/HYPRE_mapped_matrix.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -17,8 +17,8 @@
  * HYPRE_MappedMatrixCreate
  *--------------------------------------------------------------------------*/
 
-HYPRE_MappedMatrix 
-HYPRE_MappedMatrixCreate( )
+HYPRE_MappedMatrix
+HYPRE_MappedMatrixCreate( void )
 {
    return ( (HYPRE_MappedMatrix)
             hypre_MappedMatrixCreate(  ));
@@ -28,20 +28,20 @@ HYPRE_MappedMatrixCreate( )
  * HYPRE_MappedMatrixDestroy
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_MappedMatrixDestroy( HYPRE_MappedMatrix matrix )
 {
-   return( hypre_MappedMatrixDestroy( (hypre_MappedMatrix *) matrix ) );
+   return ( hypre_MappedMatrixDestroy( (hypre_MappedMatrix *) matrix ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_MappedMatrixLimitedDestroy
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_MappedMatrixLimitedDestroy( HYPRE_MappedMatrix matrix )
 {
-   return( hypre_MappedMatrixLimitedDestroy( (hypre_MappedMatrix *) matrix ) );
+   return ( hypre_MappedMatrixLimitedDestroy( (hypre_MappedMatrix *) matrix ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -59,10 +59,10 @@ HYPRE_MappedMatrixInitialize( HYPRE_MappedMatrix matrix )
  * HYPRE_MappedMatrixAssemble
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_MappedMatrixAssemble( HYPRE_MappedMatrix matrix )
 {
-   return( hypre_MappedMatrixAssemble( (hypre_MappedMatrix *) matrix ) );
+   return ( hypre_MappedMatrixAssemble( (hypre_MappedMatrix *) matrix ) );
 }
 
 
@@ -71,7 +71,7 @@ HYPRE_MappedMatrixAssemble( HYPRE_MappedMatrix matrix )
  * HYPRE_MappedMatrixPrint
  *--------------------------------------------------------------------------*/
 
-void 
+void
 HYPRE_MappedMatrixPrint( HYPRE_MappedMatrix matrix )
 {
    hypre_MappedMatrixPrint( (hypre_MappedMatrix *) matrix );
@@ -89,7 +89,7 @@ HYPRE_MappedMatrixPrint( HYPRE_MappedMatrix matrix )
 HYPRE_Int
 HYPRE_MappedMatrixGetColIndex( HYPRE_MappedMatrix matrix, HYPRE_Int j )
 {
-   return( hypre_MappedMatrixGetColIndex( (hypre_MappedMatrix *) matrix, j ));
+   return ( hypre_MappedMatrixGetColIndex( (hypre_MappedMatrix *) matrix, j ));
 }
 
 /*--------------------------------------------------------------------------
@@ -99,7 +99,7 @@ HYPRE_MappedMatrixGetColIndex( HYPRE_MappedMatrix matrix, HYPRE_Int j )
 void *
 HYPRE_MappedMatrixGetMatrix( HYPRE_MappedMatrix matrix )
 {
-   return( hypre_MappedMatrixGetMatrix( (hypre_MappedMatrix *) matrix ));
+   return ( hypre_MappedMatrixGetMatrix( (hypre_MappedMatrix *) matrix ));
 }
 
 /*--------------------------------------------------------------------------
@@ -109,7 +109,7 @@ HYPRE_MappedMatrixGetMatrix( HYPRE_MappedMatrix matrix )
 HYPRE_Int
 HYPRE_MappedMatrixSetMatrix( HYPRE_MappedMatrix matrix, void *matrix_data )
 {
-   return( hypre_MappedMatrixSetMatrix( (hypre_MappedMatrix *) matrix, matrix_data ) );
+   return ( hypre_MappedMatrixSetMatrix( (hypre_MappedMatrix *) matrix, matrix_data ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -119,7 +119,7 @@ HYPRE_MappedMatrixSetMatrix( HYPRE_MappedMatrix matrix, void *matrix_data )
 HYPRE_Int
 HYPRE_MappedMatrixSetColMap( HYPRE_MappedMatrix matrix, HYPRE_Int (*ColMap)(HYPRE_Int, void *) )
 {
-   return( hypre_MappedMatrixSetColMap( (hypre_MappedMatrix *) matrix, ColMap ) );
+   return ( hypre_MappedMatrixSetColMap( (hypre_MappedMatrix *) matrix, ColMap ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -129,5 +129,5 @@ HYPRE_MappedMatrixSetColMap( HYPRE_MappedMatrix matrix, HYPRE_Int (*ColMap)(HYPR
 HYPRE_Int
 HYPRE_MappedMatrixSetMapData( HYPRE_MappedMatrix matrix, void *MapData )
 {
-   return( hypre_MappedMatrixSetMapData( (hypre_MappedMatrix *) matrix, MapData ) );
+   return ( hypre_MappedMatrixSetMapData( (hypre_MappedMatrix *) matrix, MapData ) );
 }
diff --git a/external/hypre/src/seq_mv/HYPRE_multiblock_matrix.c b/external/hypre/src/seq_mv/HYPRE_multiblock_matrix.c
index d5f50173..09c081f2 100644
--- a/external/hypre/src/seq_mv/HYPRE_multiblock_matrix.c
+++ b/external/hypre/src/seq_mv/HYPRE_multiblock_matrix.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -17,8 +17,8 @@
  * HYPRE_MultiblockMatrixCreate
  *--------------------------------------------------------------------------*/
 
-HYPRE_MultiblockMatrix 
-HYPRE_MultiblockMatrixCreate( )
+HYPRE_MultiblockMatrix
+HYPRE_MultiblockMatrixCreate( void )
 {
    return ( (HYPRE_MultiblockMatrix)
             hypre_MultiblockMatrixCreate(  ));
@@ -28,20 +28,20 @@ HYPRE_MultiblockMatrixCreate( )
  * HYPRE_MultiblockMatrixDestroy
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_MultiblockMatrixDestroy( HYPRE_MultiblockMatrix matrix )
 {
-   return( hypre_MultiblockMatrixDestroy( (hypre_MultiblockMatrix *) matrix ) );
+   return ( hypre_MultiblockMatrixDestroy( (hypre_MultiblockMatrix *) matrix ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_MultiblockMatrixLimitedDestroy
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_MultiblockMatrixLimitedDestroy( HYPRE_MultiblockMatrix matrix )
 {
-   return( hypre_MultiblockMatrixLimitedDestroy( (hypre_MultiblockMatrix *) matrix ) );
+   return ( hypre_MultiblockMatrixLimitedDestroy( (hypre_MultiblockMatrix *) matrix ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -59,10 +59,10 @@ HYPRE_MultiblockMatrixInitialize( HYPRE_MultiblockMatrix matrix )
  * HYPRE_MultiblockMatrixAssemble
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_MultiblockMatrixAssemble( HYPRE_MultiblockMatrix matrix )
 {
-   return( hypre_MultiblockMatrixAssemble( (hypre_MultiblockMatrix *) matrix ) );
+   return ( hypre_MultiblockMatrixAssemble( (hypre_MultiblockMatrix *) matrix ) );
 }
 
 
@@ -71,7 +71,7 @@ HYPRE_MultiblockMatrixAssemble( HYPRE_MultiblockMatrix matrix )
  * HYPRE_MultiblockMatrixPrint
  *--------------------------------------------------------------------------*/
 
-void 
+void
 HYPRE_MultiblockMatrixPrint( HYPRE_MultiblockMatrix matrix )
 {
    hypre_MultiblockMatrixPrint( (hypre_MultiblockMatrix *) matrix );
@@ -86,22 +86,22 @@ HYPRE_MultiblockMatrixPrint( HYPRE_MultiblockMatrix matrix )
  * HYPRE_MultiblockMatrixSetNumSubmatrices
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_MultiblockMatrixSetNumSubmatrices( HYPRE_MultiblockMatrix matrix, HYPRE_Int n )
 {
-   return( hypre_MultiblockMatrixSetNumSubmatrices( 
-             (hypre_MultiblockMatrix *) matrix, n ) );
+   return ( hypre_MultiblockMatrixSetNumSubmatrices(
+               (hypre_MultiblockMatrix *) matrix, n ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_MultiblockMatrixSetSubmatrixType
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
-HYPRE_MultiblockMatrixSetSubmatrixType( HYPRE_MultiblockMatrix matrix, 
-                                      HYPRE_Int j,
-                                      HYPRE_Int type )
+HYPRE_Int
+HYPRE_MultiblockMatrixSetSubmatrixType( HYPRE_MultiblockMatrix matrix,
+                                        HYPRE_Int j,
+                                        HYPRE_Int type )
 {
-   return( hypre_MultiblockMatrixSetSubmatrixType( 
-             (hypre_MultiblockMatrix *) matrix, j, type ) );
+   return ( hypre_MultiblockMatrixSetSubmatrixType(
+               (hypre_MultiblockMatrix *) matrix, j, type ) );
 }
diff --git a/external/hypre/src/seq_mv/HYPRE_seq_mv.h b/external/hypre/src/seq_mv/HYPRE_seq_mv.h
index cea9e23f..57e812a8 100644
--- a/external/hypre/src/seq_mv/HYPRE_seq_mv.h
+++ b/external/hypre/src/seq_mv/HYPRE_seq_mv.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -30,23 +30,19 @@ struct hypre_MappedMatrix_struct;
 typedef struct hypre_MappedMatrix_struct *HYPRE_MappedMatrix;
 struct hypre_MultiblockMatrix_struct;
 typedef struct hypre_MultiblockMatrix_struct *HYPRE_MultiblockMatrix;
-#ifndef HYPRE_VECTOR_STRUCT
-#define HYPRE_VECTOR_STRUCT
-struct hypre_Vector_struct;
-typedef struct hypre_Vector_struct *HYPRE_Vector;
-#endif
 
 /*--------------------------------------------------------------------------
  * Prototypes
  *--------------------------------------------------------------------------*/
 
 /* HYPRE_csr_matrix.c */
-HYPRE_CSRMatrix HYPRE_CSRMatrixCreate( HYPRE_Int num_rows , HYPRE_Int num_cols , HYPRE_Int *row_sizes );
+HYPRE_CSRMatrix HYPRE_CSRMatrixCreate( HYPRE_Int num_rows, HYPRE_Int num_cols,
+                                       HYPRE_Int *row_sizes );
 HYPRE_Int HYPRE_CSRMatrixDestroy( HYPRE_CSRMatrix matrix );
 HYPRE_Int HYPRE_CSRMatrixInitialize( HYPRE_CSRMatrix matrix );
 HYPRE_CSRMatrix HYPRE_CSRMatrixRead( char *file_name );
-void HYPRE_CSRMatrixPrint( HYPRE_CSRMatrix matrix , char *file_name );
-HYPRE_Int HYPRE_CSRMatrixGetNumRows( HYPRE_CSRMatrix matrix , HYPRE_Int *num_rows );
+void HYPRE_CSRMatrixPrint( HYPRE_CSRMatrix matrix, char *file_name );
+HYPRE_Int HYPRE_CSRMatrixGetNumRows( HYPRE_CSRMatrix matrix, HYPRE_Int *num_rows );
 
 /* HYPRE_mapped_matrix.c */
 HYPRE_MappedMatrix HYPRE_MappedMatrixCreate( void );
@@ -55,11 +51,12 @@ HYPRE_Int HYPRE_MappedMatrixLimitedDestroy( HYPRE_MappedMatrix matrix );
 HYPRE_Int HYPRE_MappedMatrixInitialize( HYPRE_MappedMatrix matrix );
 HYPRE_Int HYPRE_MappedMatrixAssemble( HYPRE_MappedMatrix matrix );
 void HYPRE_MappedMatrixPrint( HYPRE_MappedMatrix matrix );
-HYPRE_Int HYPRE_MappedMatrixGetColIndex( HYPRE_MappedMatrix matrix , HYPRE_Int j );
+HYPRE_Int HYPRE_MappedMatrixGetColIndex( HYPRE_MappedMatrix matrix, HYPRE_Int j );
 void *HYPRE_MappedMatrixGetMatrix( HYPRE_MappedMatrix matrix );
-HYPRE_Int HYPRE_MappedMatrixSetMatrix( HYPRE_MappedMatrix matrix , void *matrix_data );
-HYPRE_Int HYPRE_MappedMatrixSetColMap( HYPRE_MappedMatrix matrix , HYPRE_Int (*ColMap )(HYPRE_Int ,void *));
-HYPRE_Int HYPRE_MappedMatrixSetMapData( HYPRE_MappedMatrix matrix , void *MapData );
+HYPRE_Int HYPRE_MappedMatrixSetMatrix( HYPRE_MappedMatrix matrix, void *matrix_data );
+HYPRE_Int HYPRE_MappedMatrixSetColMap( HYPRE_MappedMatrix matrix, HYPRE_Int (*ColMap )(HYPRE_Int,
+                                                                                       void *));
+HYPRE_Int HYPRE_MappedMatrixSetMapData( HYPRE_MappedMatrix matrix, void *MapData );
 
 /* HYPRE_multiblock_matrix.c */
 HYPRE_MultiblockMatrix HYPRE_MultiblockMatrixCreate( void );
@@ -68,14 +65,15 @@ HYPRE_Int HYPRE_MultiblockMatrixLimitedDestroy( HYPRE_MultiblockMatrix matrix );
 HYPRE_Int HYPRE_MultiblockMatrixInitialize( HYPRE_MultiblockMatrix matrix );
 HYPRE_Int HYPRE_MultiblockMatrixAssemble( HYPRE_MultiblockMatrix matrix );
 void HYPRE_MultiblockMatrixPrint( HYPRE_MultiblockMatrix matrix );
-HYPRE_Int HYPRE_MultiblockMatrixSetNumSubmatrices( HYPRE_MultiblockMatrix matrix , HYPRE_Int n );
-HYPRE_Int HYPRE_MultiblockMatrixSetSubmatrixType( HYPRE_MultiblockMatrix matrix , HYPRE_Int j , HYPRE_Int type );
+HYPRE_Int HYPRE_MultiblockMatrixSetNumSubmatrices( HYPRE_MultiblockMatrix matrix, HYPRE_Int n );
+HYPRE_Int HYPRE_MultiblockMatrixSetSubmatrixType( HYPRE_MultiblockMatrix matrix, HYPRE_Int j,
+                                                  HYPRE_Int type );
 
 /* HYPRE_vector.c */
 HYPRE_Vector HYPRE_VectorCreate( HYPRE_Int size );
 HYPRE_Int HYPRE_VectorDestroy( HYPRE_Vector vector );
 HYPRE_Int HYPRE_VectorInitialize( HYPRE_Vector vector );
-HYPRE_Int HYPRE_VectorPrint( HYPRE_Vector vector , char *file_name );
+HYPRE_Int HYPRE_VectorPrint( HYPRE_Vector vector, char *file_name );
 HYPRE_Vector HYPRE_VectorRead( char *file_name );
 
 typedef enum HYPRE_TimerID
@@ -122,12 +120,12 @@ typedef enum HYPRE_TimerID
    HYPRE_TIMER_ID_MERGE,
 
    // csr matop
-   HYPRE_TIMER_ID_SPMM_ROWNNZ,
-   HYPRE_TIMER_ID_SPMM_ATTEMPT1,
-   HYPRE_TIMER_ID_SPMM_ATTEMPT2,
-   HYPRE_TIMER_ID_SPMM_SYMBOLIC,
-   HYPRE_TIMER_ID_SPMM_NUMERIC,
-   HYPRE_TIMER_ID_SPMM,
+   HYPRE_TIMER_ID_SPGEMM_ROWNNZ,
+   HYPRE_TIMER_ID_SPGEMM_ATTEMPT1,
+   HYPRE_TIMER_ID_SPGEMM_ATTEMPT2,
+   HYPRE_TIMER_ID_SPGEMM_SYMBOLIC,
+   HYPRE_TIMER_ID_SPGEMM_NUMERIC,
+   HYPRE_TIMER_ID_SPGEMM,
    HYPRE_TIMER_ID_SPADD,
    HYPRE_TIMER_ID_SPTRANS,
 
diff --git a/external/hypre/src/seq_mv/HYPRE_vector.c b/external/hypre/src/seq_mv/HYPRE_vector.c
index c9665c18..fb9f708d 100644
--- a/external/hypre/src/seq_mv/HYPRE_vector.c
+++ b/external/hypre/src/seq_mv/HYPRE_vector.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -27,7 +27,7 @@ HYPRE_VectorCreate( HYPRE_Int size )
  * HYPRE_VectorDestroy
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_VectorDestroy( HYPRE_Vector vector )
 {
    return ( hypre_SeqVectorDestroy( (hypre_Vector *) vector ) );
@@ -37,7 +37,7 @@ HYPRE_VectorDestroy( HYPRE_Vector vector )
  * HYPRE_VectorInitialize
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_VectorInitialize( HYPRE_Vector vector )
 {
    return ( hypre_SeqVectorInitialize( (hypre_Vector *) vector ) );
@@ -52,7 +52,7 @@ HYPRE_VectorPrint( HYPRE_Vector  vector,
                    char         *file_name )
 {
    return ( hypre_SeqVectorPrint( (hypre_Vector *) vector,
-                      file_name ) );
+                                  file_name ) );
 }
 
 /*--------------------------------------------------------------------------
diff --git a/external/hypre/src/seq_mv/MakeIRIX b/external/hypre/src/seq_mv/MakeIRIX
index c9057fee..a6478b10 100644
--- a/external/hypre/src/seq_mv/MakeIRIX
+++ b/external/hypre/src/seq_mv/MakeIRIX
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/seq_mv/csr_filter.c b/external/hypre/src/seq_mv/csr_filter.c
new file mode 100644
index 00000000..af371cc9
--- /dev/null
+++ b/external/hypre/src/seq_mv/csr_filter.c
@@ -0,0 +1,52 @@
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ * Methods for matrix truncation/filtering
+ *
+ *****************************************************************************/
+
+#include "seq_mv.h"
+
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixTruncateDiag
+ *
+ * Truncates the input matrix to its diagonal portion.
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_CSRMatrixTruncateDiag(hypre_CSRMatrix *A)
+{
+   HYPRE_MemoryLocation  memory_location = hypre_CSRMatrixMemoryLocation(A);
+   HYPRE_Int             num_rows        = hypre_CSRMatrixNumRows(A);
+   HYPRE_Complex        *A_a;
+   HYPRE_Int            *A_i, *A_j;
+
+   /* Extract diagonal */
+   A_a = hypre_TAlloc(HYPRE_Complex, num_rows, memory_location);
+   hypre_CSRMatrixExtractDiagonal(A, A_a, 0);
+
+   /* Free old matrix data */
+   hypre_TFree(hypre_CSRMatrixData(A), memory_location);
+   hypre_TFree(hypre_CSRMatrixI(A), memory_location);
+   hypre_TFree(hypre_CSRMatrixJ(A), memory_location);
+
+   /* Update matrix sparsity pattern */
+   A_i = hypre_TAlloc(HYPRE_Int, num_rows + 1, memory_location);
+   A_j = hypre_TAlloc(HYPRE_Int, num_rows, memory_location);
+   hypre_IntSequence(memory_location, num_rows + 1, A_i);
+   hypre_IntSequence(memory_location, num_rows, A_j);
+
+   /* Update matrix pointers and number of nonzero entries */
+   hypre_CSRMatrixNumNonzeros(A) = num_rows;
+   hypre_CSRMatrixI(A) = A_i;
+   hypre_CSRMatrixJ(A) = A_j;
+   hypre_CSRMatrixData(A) = A_a;
+
+   return hypre_error_flag;
+}
diff --git a/external/hypre/src/seq_mv/csr_matop.c b/external/hypre/src/seq_mv/csr_matop.c
index a68b0f96..cbedfb8c 100644
--- a/external/hypre/src/seq_mv/csr_matop.c
+++ b/external/hypre/src/seq_mv/csr_matop.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -73,7 +73,7 @@ hypre_CSRMatrixAddFirstPass( HYPRE_Int              firstrow,
 
       if (map_A2C)
       {
-         for (ia = A_i[iic]; ia < A_i[iic+1]; ia++)
+         for (ia = A_i[iic]; ia < A_i[iic + 1]; ia++)
          {
             jcol = map_A2C[A_j[ia]];
             marker[jcol] = iic;
@@ -82,7 +82,7 @@ hypre_CSRMatrixAddFirstPass( HYPRE_Int              firstrow,
       }
       else
       {
-         for (ia = A_i[iic]; ia < A_i[iic+1]; ia++)
+         for (ia = A_i[iic]; ia < A_i[iic + 1]; ia++)
          {
             jcol = A_j[ia];
             marker[jcol] = iic;
@@ -92,7 +92,7 @@ hypre_CSRMatrixAddFirstPass( HYPRE_Int              firstrow,
 
       if (map_B2C)
       {
-         for (ib = B_i[iic]; ib < B_i[iic+1]; ib++)
+         for (ib = B_i[iic]; ib < B_i[iic + 1]; ib++)
          {
             jcol = map_B2C[B_j[ib]];
             if (marker[jcol] != iic)
@@ -104,7 +104,7 @@ hypre_CSRMatrixAddFirstPass( HYPRE_Int              firstrow,
       }
       else
       {
-         for (ib = B_i[iic]; ib < B_i[iic+1]; ib++)
+         for (ib = B_i[iic]; ib < B_i[iic + 1]; ib++)
          {
             jcol = B_j[ib];
             if (marker[jcol] != iic)
@@ -114,12 +114,12 @@ hypre_CSRMatrixAddFirstPass( HYPRE_Int              firstrow,
             }
          }
       }
-      C_i[iic+1] = num_nonzeros;
+      C_i[iic + 1] = num_nonzeros;
    }
    twspace[ii] = num_nonzeros;
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+   #pragma omp barrier
 #endif
 
    /* Correct C_i - phase 1 */
@@ -134,7 +134,7 @@ hypre_CSRMatrixAddFirstPass( HYPRE_Int              firstrow,
       for (ic = firstrow; ic < lastrow; ic++)
       {
          iic = rownnz_C ? rownnz_C[ic] : ic;
-         C_i[iic+1] += jj;
+         C_i[iic + 1] += jj;
       }
    }
    else
@@ -156,37 +156,37 @@ hypre_CSRMatrixAddFirstPass( HYPRE_Int              firstrow,
    if (rownnz_C != NULL)
    {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
-      for (ic = firstrow; ic < (lastrow-1); ic++)
+      for (ic = firstrow; ic < (lastrow - 1); ic++)
       {
-         for (iic = rownnz_C[ic] + 1; iic < rownnz_C[ic+1]; iic++)
+         for (iic = rownnz_C[ic] + 1; iic < rownnz_C[ic + 1]; iic++)
          {
-            hypre_assert(C_i[iic+1] == 0);
-            C_i[iic+1] = C_i[rownnz_C[ic]+1];
+            hypre_assert(C_i[iic + 1] == 0);
+            C_i[iic + 1] = C_i[rownnz_C[ic] + 1];
          }
       }
 
       if (ii < (num_threads - 1))
       {
-         for (iic = rownnz_C[lastrow-1] + 1; iic < rownnz_C[lastrow]; iic++)
+         for (iic = rownnz_C[lastrow - 1] + 1; iic < rownnz_C[lastrow]; iic++)
          {
-            hypre_assert(C_i[iic+1] == 0);
-            C_i[iic+1] = C_i[rownnz_C[lastrow-1]+1];
+            hypre_assert(C_i[iic + 1] == 0);
+            C_i[iic + 1] = C_i[rownnz_C[lastrow - 1] + 1];
          }
       }
       else
       {
-         for (iic = rownnz_C[lastrow-1] + 1; iic < nrows_C; iic++)
+         for (iic = rownnz_C[lastrow - 1] + 1; iic < nrows_C; iic++)
          {
-            hypre_assert(C_i[iic+1] == 0);
-            C_i[iic+1] = C_i[rownnz_C[lastrow-1]+1];
+            hypre_assert(C_i[iic + 1] == 0);
+            C_i[iic + 1] = C_i[rownnz_C[lastrow - 1] + 1];
          }
       }
    }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+   #pragma omp barrier
 #endif
 
 #ifdef HYPRE_DEBUG
@@ -194,12 +194,12 @@ hypre_CSRMatrixAddFirstPass( HYPRE_Int              firstrow,
    {
       for (i = 0; i < nrows_C; i++)
       {
-         hypre_assert(C_i[i] <= C_i[i+1]);
-         hypre_assert(((A_i[i+1] - A_i[i]) +
-                       (B_i[i+1] - B_i[i])) >=
-                       (C_i[i+1] - C_i[i]));
-         hypre_assert((C_i[i+1] - C_i[i]) >= (A_i[i+1] - A_i[i]));
-         hypre_assert((C_i[i+1] - C_i[i]) >= (B_i[i+1] - B_i[i]));
+         hypre_assert(C_i[i] <= C_i[i + 1]);
+         hypre_assert(((A_i[i + 1] - A_i[i]) +
+                       (B_i[i + 1] - B_i[i])) >=
+                      (C_i[i + 1] - C_i[i]));
+         hypre_assert((C_i[i + 1] - C_i[i]) >= (A_i[i + 1] - A_i[i]));
+         hypre_assert((C_i[i + 1] - C_i[i]) >= (B_i[i + 1] - B_i[i]));
       }
       hypre_assert((C_i[nrows_C] - C_i[0]) == num_nonzeros);
    }
@@ -219,7 +219,6 @@ hypre_CSRMatrixAddFirstPass( HYPRE_Int              firstrow,
 HYPRE_Int
 hypre_CSRMatrixAddSecondPass( HYPRE_Int          firstrow,
                               HYPRE_Int          lastrow,
-                              HYPRE_Int         *twspace,
                               HYPRE_Int         *marker,
                               HYPRE_Int         *map_A2C,
                               HYPRE_Int         *map_B2C,
@@ -266,32 +265,32 @@ hypre_CSRMatrixAddSecondPass( HYPRE_Int          firstrow,
       {
          iic = rownnz_C ? rownnz_C[ic] : ic;
 
-         for (ia = A_i[iic]; ia < A_i[iic+1]; ia++)
+         for (ia = A_i[iic]; ia < A_i[iic + 1]; ia++)
          {
             jcol = map_A2C[A_j[ia]];
             C_j[pos] = jcol;
-            C_data[pos] = alpha*A_data[ia];
+            C_data[pos] = alpha * A_data[ia];
             marker[jcol] = pos;
             pos++;
          }
 
-         for (ib = B_i[iic]; ib < B_i[iic+1]; ib++)
+         for (ib = B_i[iic]; ib < B_i[iic + 1]; ib++)
          {
             jcol = map_B2C[B_j[ib]];
             if (marker[jcol] < C_i[iic])
             {
                C_j[pos] = jcol;
-               C_data[pos] = beta*B_data[ib];
+               C_data[pos] = beta * B_data[ib];
                marker[jcol] = pos;
                pos++;
             }
             else
             {
                hypre_assert(C_j[marker[jcol]] == jcol);
-               C_data[marker[jcol]] += beta*B_data[ib];
+               C_data[marker[jcol]] += beta * B_data[ib];
             }
          }
-         hypre_assert(pos == C_i[iic+1]);
+         hypre_assert(pos == C_i[iic + 1]);
       } /* end for loop */
    }
    else
@@ -300,35 +299,35 @@ hypre_CSRMatrixAddSecondPass( HYPRE_Int          firstrow,
       {
          iic = rownnz_C ? rownnz_C[ic] : ic;
 
-         for (ia = A_i[iic]; ia < A_i[iic+1]; ia++)
+         for (ia = A_i[iic]; ia < A_i[iic + 1]; ia++)
          {
             jcol = A_j[ia];
             C_j[pos] = jcol;
-            C_data[pos] = alpha*A_data[ia];
+            C_data[pos] = alpha * A_data[ia];
             marker[jcol] = pos;
             pos++;
          }
 
-         for (ib = B_i[iic]; ib < B_i[iic+1]; ib++)
+         for (ib = B_i[iic]; ib < B_i[iic + 1]; ib++)
          {
             jcol = B_j[ib];
             if (marker[jcol] < C_i[iic])
             {
                C_j[pos] = jcol;
-               C_data[pos] = beta*B_data[ib];
+               C_data[pos] = beta * B_data[ib];
                marker[jcol] = pos;
                pos++;
             }
             else
             {
                hypre_assert(C_j[marker[jcol]] == jcol);
-               C_data[marker[jcol]] += beta*B_data[ib];
+               C_data[marker[jcol]] += beta * B_data[ib];
             }
          }
-         hypre_assert(pos == C_i[iic+1]);
+         hypre_assert(pos == C_i[iic + 1]);
       } /* end for loop */
    }
-   hypre_assert(pos == C_i[rownnz_C ? rownnz_C[lastrow-1] + 1 : lastrow]);
+   hypre_assert(pos == C_i[rownnz_C ? rownnz_C[lastrow - 1] + 1 : lastrow]);
 
    return hypre_error_flag;
 }
@@ -384,7 +383,7 @@ hypre_CSRMatrixAddHost ( HYPRE_Complex    alpha,
 
    if (nrows_A != nrows_B || ncols_A != ncols_B)
    {
-      hypre_error_w_msg(HYPRE_ERROR_GENERIC,"Warning! incompatible matrix dimensions!\n");
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Warning! incompatible matrix dimensions!\n");
       return NULL;
    }
 
@@ -396,9 +395,20 @@ hypre_CSRMatrixAddHost ( HYPRE_Complex    alpha,
    nnzrows_C = nrows_A;
    if ((nnzrows_A < nrows_A) && (nnzrows_B < nrows_B))
    {
-      hypre_MergeOrderedArrays(nnzrows_A, rownnz_A,
-                               nnzrows_B, rownnz_B,
-                               &nnzrows_C, &rownnz_C);
+      hypre_IntArray arr_A;
+      hypre_IntArray arr_B;
+      hypre_IntArray arr_C;
+
+      hypre_IntArrayData(&arr_A) = rownnz_A;
+      hypre_IntArrayData(&arr_B) = rownnz_B;
+      hypre_IntArraySize(&arr_A) = nnzrows_A;
+      hypre_IntArraySize(&arr_B) = nnzrows_B;
+      hypre_IntArrayMemoryLocation(&arr_C) = memory_location_C;
+
+      hypre_IntArrayMergeOrdered(&arr_A, &arr_B, &arr_C);
+
+      nnzrows_C = hypre_IntArraySize(&arr_C);
+      rownnz_C  = hypre_IntArrayData(&arr_C);
    }
    else
    {
@@ -406,7 +416,7 @@ hypre_CSRMatrixAddHost ( HYPRE_Complex    alpha,
    }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel
+   #pragma omp parallel
 #endif
    {
       HYPRE_Int   ns, ne;
@@ -420,7 +430,7 @@ hypre_CSRMatrixAddHost ( HYPRE_Complex    alpha,
                                   A, B, nrows_A, nnzrows_C, ncols_A, rownnz_C,
                                   memory_location_C, C_i, &C);
 
-      hypre_CSRMatrixAddSecondPass(ns, ne, twspace, marker, NULL, NULL,
+      hypre_CSRMatrixAddSecondPass(ns, ne, marker, NULL, NULL,
                                    rownnz_C, alpha, beta, A, B, C);
 
       hypre_TFree(marker, HYPRE_MEMORY_HOST);
@@ -509,7 +519,7 @@ hypre_CSRMatrixBigAdd( hypre_CSRMatrix *A,
 
    if (nrows_A != nrows_B || ncols_A != ncols_B)
    {
-      hypre_error_w_msg(HYPRE_ERROR_GENERIC,"Warning! incompatible matrix dimensions!\n");
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Warning! incompatible matrix dimensions!\n");
       return NULL;
    }
 
@@ -518,7 +528,7 @@ hypre_CSRMatrixBigAdd( hypre_CSRMatrix *A,
    C_i = hypre_CTAlloc(HYPRE_Int, nrows_A + 1, memory_location_C);
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel
+   #pragma omp parallel
 #endif
    {
       HYPRE_Int     ia, ib, ic, num_nonzeros;
@@ -543,14 +553,14 @@ hypre_CSRMatrixBigAdd( hypre_CSRMatrix *A,
       for (ic = ns; ic < ne; ic++)
       {
          C_i[ic] = num_nonzeros;
-         for (ia = A_i[ic]; ia < A_i[ic+1]; ia++)
+         for (ia = A_i[ic]; ia < A_i[ic + 1]; ia++)
          {
             jcol = A_j[ia];
             marker[jcol] = ic;
             num_nonzeros++;
          }
 
-         for (ib = B_i[ic]; ib < B_i[ic+1]; ib++)
+         for (ib = B_i[ic]; ib < B_i[ic + 1]; ib++)
          {
             jcol = B_j[ib];
             if (marker[jcol] != ic)
@@ -559,12 +569,12 @@ hypre_CSRMatrixBigAdd( hypre_CSRMatrix *A,
                num_nonzeros++;
             }
          }
-         C_i[ic+1] = num_nonzeros;
+         C_i[ic + 1] = num_nonzeros;
       }
       twspace[ii] = num_nonzeros;
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
 
       /* Correct row pointer */
@@ -605,7 +615,7 @@ hypre_CSRMatrixBigAdd( hypre_CSRMatrix *A,
       pos = C_i[ns];
       for (ic = ns; ic < ne; ic++)
       {
-         for (ia = A_i[ic]; ia < A_i[ic+1]; ia++)
+         for (ia = A_i[ic]; ia < A_i[ic + 1]; ia++)
          {
             jcol = A_j[ia];
             C_j[pos] = jcol;
@@ -614,7 +624,7 @@ hypre_CSRMatrixBigAdd( hypre_CSRMatrix *A,
             pos++;
          }
 
-         for (ib = B_i[ic]; ib < B_i[ic+1]; ib++)
+         for (ib = B_i[ic]; ib < B_i[ic + 1]; ib++)
          {
             jcol = B_j[ib];
             if (marker[jcol] < C_i[ic])
@@ -697,7 +707,7 @@ hypre_CSRMatrixMultiplyHost( hypre_CSRMatrix *A,
 
    if (ncols_A != nrows_B)
    {
-      hypre_error_w_msg(HYPRE_ERROR_GENERIC,"Warning! incompatible matrix dimensions!\n");
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Warning! incompatible matrix dimensions!\n");
       return NULL;
    }
 
@@ -717,10 +727,10 @@ hypre_CSRMatrixMultiplyHost( hypre_CSRMatrix *A,
 
    /* Allocate memory */
    twspace = hypre_TAlloc(HYPRE_Int, hypre_NumThreads(), HYPRE_MEMORY_HOST);
-   C_i = hypre_CTAlloc(HYPRE_Int, nrows_A+1, memory_location_C);
+   C_i = hypre_CTAlloc(HYPRE_Int, nrows_A + 1, memory_location_C);
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel private(ia, ib, ic, ja, jb, num_nonzeros, counter, a_entry, b_entry)
+   #pragma omp parallel private(ia, ib, ic, ja, jb, num_nonzeros, counter, a_entry, b_entry)
 #endif
    {
       HYPRE_Int  *B_marker = NULL;
@@ -760,10 +770,10 @@ hypre_CSRMatrixMultiplyHost( hypre_CSRMatrix *A,
             }
          }
 
-         for (ia = A_i[iic]; ia < A_i[iic+1]; ia++)
+         for (ia = A_i[iic]; ia < A_i[iic + 1]; ia++)
          {
             ja = A_j[ia];
-            for (ib = B_i[ja]; ib < B_i[ja+1]; ib++)
+            for (ib = B_i[ja]; ib < B_i[ja + 1]; ib++)
             {
                jb = B_j[ib];
                if (B_marker[jb] != iic)
@@ -777,7 +787,7 @@ hypre_CSRMatrixMultiplyHost( hypre_CSRMatrix *A,
       twspace[ii] = num_nonzeros;
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
 
       /* Correct C_i - phase 1 */
@@ -814,26 +824,26 @@ hypre_CSRMatrixMultiplyHost( hypre_CSRMatrix *A,
       if (rownnz_A != NULL)
       {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+         #pragma omp barrier
 #endif
-         for (ic = ns; ic < (ne-1); ic++)
+         for (ic = ns; ic < (ne - 1); ic++)
          {
-            for (iic = rownnz_A[ic] + 1; iic < rownnz_A[ic+1]; iic++)
+            for (iic = rownnz_A[ic] + 1; iic < rownnz_A[ic + 1]; iic++)
             {
-               C_i[iic] = C_i[rownnz_A[ic+1]];
+               C_i[iic] = C_i[rownnz_A[ic + 1]];
             }
          }
 
          if (ii < (num_threads - 1))
          {
-            for (iic = rownnz_A[ne-1] + 1; iic < rownnz_A[ne]; iic++)
+            for (iic = rownnz_A[ne - 1] + 1; iic < rownnz_A[ne]; iic++)
             {
                C_i[iic] = C_i[rownnz_A[ne]];
             }
          }
          else
          {
-            for (iic = rownnz_A[ne-1] + 1; iic < nrows_A; iic++)
+            for (iic = rownnz_A[ne - 1] + 1; iic < nrows_A; iic++)
             {
                C_i[iic] = C_i[nrows_A];
             }
@@ -843,7 +853,7 @@ hypre_CSRMatrixMultiplyHost( hypre_CSRMatrix *A,
       HYPRE_ANNOTATE_REGION_END("%s", "First pass");
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
 
       /* Second pass: Fill in C_data and C_j. */
@@ -872,11 +882,11 @@ hypre_CSRMatrixMultiplyHost( hypre_CSRMatrix *A,
             }
          }
 
-         for (ia = A_i[iic]; ia < A_i[iic+1]; ia++)
+         for (ia = A_i[iic]; ia < A_i[iic + 1]; ia++)
          {
             ja = A_j[ia];
             a_entry = A_data[ia];
-            for (ib = B_i[ja]; ib < B_i[ja+1]; ib++)
+            for (ib = B_i[ja]; ib < B_i[ja + 1]; ib++)
             {
                jb = B_j[ib];
                b_entry = B_data[ib];
@@ -884,12 +894,12 @@ hypre_CSRMatrixMultiplyHost( hypre_CSRMatrix *A,
                {
                   B_marker[jb] = counter;
                   C_j[B_marker[jb]] = jb;
-                  C_data[B_marker[jb]] = a_entry*b_entry;
+                  C_data[B_marker[jb]] = a_entry * b_entry;
                   counter++;
                }
                else
                {
-                  C_data[B_marker[jb]] += a_entry*b_entry;
+                  C_data[B_marker[jb]] += a_entry * b_entry;
                }
             }
          }
@@ -903,7 +913,7 @@ hypre_CSRMatrixMultiplyHost( hypre_CSRMatrix *A,
 #ifdef HYPRE_DEBUG
    for (ic = 0; ic < nrows_A; ic++)
    {
-      hypre_assert(C_i[ic] <= C_i[ic+1]);
+      hypre_assert(C_i[ic] <= C_i[ic + 1]);
    }
 #endif
 
@@ -922,18 +932,18 @@ hypre_CSRMatrixMultiply( hypre_CSRMatrix *A,
 {
    hypre_CSRMatrix *C = NULL;
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
    HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy2( hypre_CSRMatrixMemoryLocation(A),
-                                                       hypre_CSRMatrixMemoryLocation(B) );
+                                                      hypre_CSRMatrixMemoryLocation(B) );
 
    if (exec == HYPRE_EXEC_DEVICE)
    {
-      C = hypre_CSRMatrixMultiplyDevice(A,B);
+      C = hypre_CSRMatrixMultiplyDevice(A, B);
    }
    else
 #endif
    {
-      C = hypre_CSRMatrixMultiplyHost(A,B);
+      C = hypre_CSRMatrixMultiplyHost(A, B);
    }
 
    return C;
@@ -974,7 +984,7 @@ hypre_CSRMatrixDeleteZeros( hypre_CSRMatrix *A,
 
    if (zeros)
    {
-      B = hypre_CSRMatrixCreate(nrows_A,ncols_A,num_nonzeros-zeros);
+      B = hypre_CSRMatrixCreate(nrows_A, ncols_A, num_nonzeros - zeros);
       hypre_CSRMatrixInitialize(B);
       B_i = hypre_CSRMatrixI(B);
       B_j = hypre_CSRMatrixJ(B);
@@ -983,7 +993,7 @@ hypre_CSRMatrixDeleteZeros( hypre_CSRMatrix *A,
       pos_A = pos_B = 0;
       for (i = 0; i < nrows_A; i++)
       {
-         for (j = A_i[i]; j < A_i[i+1]; j++)
+         for (j = A_i[i]; j < A_i[i + 1]; j++)
          {
             if (hypre_cabs(A_data[j]) <= tol)
             {
@@ -997,7 +1007,7 @@ hypre_CSRMatrixDeleteZeros( hypre_CSRMatrix *A,
                pos_A++;
             }
          }
-         B_i[i+1] = pos_B;
+         B_i[i + 1] = pos_B;
       }
 
       return B;
@@ -1022,7 +1032,7 @@ hypre_CSRMatrixDeleteZeros( hypre_CSRMatrix *A,
 static inline HYPRE_Int
 transpose_idx (HYPRE_Int idx, HYPRE_Int dim1, HYPRE_Int dim2)
 {
-  return idx%dim1*dim2 + idx/dim1;
+   return idx % dim1 * dim2 + idx / dim1;
 }
 
 /*--------------------------------------------------------------------------
@@ -1045,7 +1055,7 @@ hypre_CSRMatrixTransposeHost(hypre_CSRMatrix  *A,
    HYPRE_Int             num_nnzs_A = hypre_CSRMatrixNumNonzeros(A);
    HYPRE_MemoryLocation  memory_location = hypre_CSRMatrixMemoryLocation(A);
 
-   HYPRE_Complex        *AT_data;
+   HYPRE_Complex        *AT_data = NULL;
    HYPRE_Int            *AT_j;
    HYPRE_Int             num_rows_AT;
    HYPRE_Int             num_cols_AT;
@@ -1060,7 +1070,7 @@ hypre_CSRMatrixTransposeHost(hypre_CSRMatrix  *A,
     *--------------------------------------------------------------*/
    HYPRE_ANNOTATE_FUNC_BEGIN;
 
-   if (!num_nnzs_A)
+   if (!num_nnzs_A && A_i)
    {
       num_nnzs_A = A_i[num_rows_A];
    }
@@ -1070,7 +1080,7 @@ hypre_CSRMatrixTransposeHost(hypre_CSRMatrix  *A,
       max_col = -1;
       for (i = 0; i < num_rows_A; ++i)
       {
-         for (j = A_i[i]; j < A_i[i+1]; j++)
+         for (j = A_i[i]; j < A_i[i + 1]; j++)
          {
             if (A_j[j] > max_col)
             {
@@ -1109,11 +1119,11 @@ hypre_CSRMatrixTransposeHost(hypre_CSRMatrix  *A,
    /*-----------------------------------------------------------------
     * Parallel count sort
     *-----------------------------------------------------------------*/
-   HYPRE_Int *bucket = hypre_CTAlloc(HYPRE_Int, (num_cols_A + 1)*hypre_NumThreads(),
+   HYPRE_Int *bucket = hypre_CTAlloc(HYPRE_Int, (num_cols_A + 1) * hypre_NumThreads(),
                                      HYPRE_MEMORY_HOST);
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel
+   #pragma omp parallel
 #endif
    {
       HYPRE_Int   ii, num_threads, ns, ne;
@@ -1137,7 +1147,7 @@ hypre_CSRMatrixTransposeHost(hypre_CSRMatrix  *A,
       {
          for (j = A_i[ns]; j < A_i[ne]; ++j)
          {
-            bucket[ii*num_cols_A + A_j[j]]++;
+            bucket[ii * num_cols_A + A_j[j]]++;
          }
       }
       else
@@ -1145,9 +1155,9 @@ hypre_CSRMatrixTransposeHost(hypre_CSRMatrix  *A,
          for (i = ns; i < ne; i++)
          {
             ir = rownnz_A[i];
-            for (j = A_i[ir]; j < A_i[ir+1]; ++j)
+            for (j = A_i[ir]; j < A_i[ir + 1]; ++j)
             {
-               bucket[ii*num_cols_A + A_j[j]]++;
+               bucket[ii * num_cols_A + A_j[j]]++;
             }
          }
       }
@@ -1157,10 +1167,10 @@ hypre_CSRMatrixTransposeHost(hypre_CSRMatrix  *A,
        * accessed as if it is transposed as HYPRE_Int[num_colsA][num_threads]
        *-----------------------------------------------------------------*/
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
 
-      for (i = ii*num_cols_A + 1; i < (ii + 1)*num_cols_A; ++i)
+      for (i = ii * num_cols_A + 1; i < (ii + 1)*num_cols_A; ++i)
       {
          transpose_i = transpose_idx(i, num_threads, num_cols_A);
          transpose_i_minus_1 = transpose_idx(i - 1, num_threads, num_cols_A);
@@ -1169,14 +1179,14 @@ hypre_CSRMatrixTransposeHost(hypre_CSRMatrix  *A,
       }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
-#pragma omp master
+      #pragma omp barrier
+      #pragma omp master
 #endif
       {
          for (i = 1; i < num_threads; ++i)
          {
-            j0 = num_cols_A*i - 1;
-            j1 = num_cols_A*(i + 1) - 1;
+            j0 = num_cols_A * i - 1;
+            j1 = num_cols_A * (i + 1) - 1;
             transpose_j0 = transpose_idx(j0, num_threads, num_cols_A);
             transpose_j1 = transpose_idx(j1, num_threads, num_cols_A);
 
@@ -1184,15 +1194,15 @@ hypre_CSRMatrixTransposeHost(hypre_CSRMatrix  *A,
          }
       }
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
 
       if (ii > 0)
       {
-         transpose_i0 = transpose_idx(num_cols_A*ii - 1, num_threads, num_cols_A);
+         transpose_i0 = transpose_idx(num_cols_A * ii - 1, num_threads, num_cols_A);
          offset = bucket[transpose_i0];
 
-         for (i = ii*num_cols_A; i < (ii + 1)*num_cols_A - 1; ++i)
+         for (i = ii * num_cols_A; i < (ii + 1)*num_cols_A - 1; ++i)
          {
             transpose_i = transpose_idx(i, num_threads, num_cols_A);
 
@@ -1201,7 +1211,7 @@ hypre_CSRMatrixTransposeHost(hypre_CSRMatrix  *A,
       }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
 
       /*----------------------------------------------------------------
@@ -1216,9 +1226,9 @@ hypre_CSRMatrixTransposeHost(hypre_CSRMatrix  *A,
             for (j = A_i[ir + 1] - 1; j >= A_i[ir]; --j)
             {
                idx = A_j[j];
-               --bucket[ii*num_cols_A + idx];
+               --bucket[ii * num_cols_A + idx];
 
-               offset = bucket[ii*num_cols_A + idx];
+               offset = bucket[ii * num_cols_A + idx];
                AT_data[offset] = A_data[j];
                AT_j[offset] = ir;
             }
@@ -1232,9 +1242,9 @@ hypre_CSRMatrixTransposeHost(hypre_CSRMatrix  *A,
             for (j = A_i[ir + 1] - 1; j >= A_i[ir]; --j)
             {
                idx = A_j[j];
-               --bucket[ii*num_cols_A + idx];
+               --bucket[ii * num_cols_A + idx];
 
-               offset = bucket[ii*num_cols_A + idx];
+               offset = bucket[ii * num_cols_A + idx];
                AT_j[offset] = ir;
             }
          }
@@ -1242,7 +1252,8 @@ hypre_CSRMatrixTransposeHost(hypre_CSRMatrix  *A,
    } /* end parallel region */
 
    hypre_CSRMatrixI(*AT) = hypre_TAlloc(HYPRE_Int, num_cols_A + 1, memory_location);
-   hypre_TMemcpy(hypre_CSRMatrixI(*AT), bucket, HYPRE_Int, num_cols_A + 1, memory_location, HYPRE_MEMORY_HOST);
+   hypre_TMemcpy(hypre_CSRMatrixI(*AT), bucket, HYPRE_Int, num_cols_A + 1, memory_location,
+                 HYPRE_MEMORY_HOST);
    hypre_CSRMatrixI(*AT)[num_cols_A] = num_nnzs_A;
    hypre_TFree(bucket, HYPRE_MEMORY_HOST);
 
@@ -1268,7 +1279,7 @@ hypre_CSRMatrixTranspose(hypre_CSRMatrix  *A,
 {
    HYPRE_Int ierr = 0;
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
    HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_CSRMatrixMemoryLocation(A) );
 
    if (exec == HYPRE_EXEC_DEVICE)
@@ -1281,6 +1292,8 @@ hypre_CSRMatrixTranspose(hypre_CSRMatrix  *A,
       ierr = hypre_CSRMatrixTransposeHost(A, AT, data);
    }
 
+   hypre_CSRMatrixSetPatternOnly(*AT, hypre_CSRMatrixPatternOnly(A));
+
    return ierr;
 }
 
@@ -1289,15 +1302,16 @@ hypre_CSRMatrixTranspose(hypre_CSRMatrix  *A,
  *--------------------------------------------------------------------------*/
 
 /* RL: TODO add memory locations */
-HYPRE_Int hypre_CSRMatrixSplit(hypre_CSRMatrix  *Bs_ext,
-                               HYPRE_BigInt      first_col_diag_B,
-                               HYPRE_BigInt      last_col_diag_B,
-                               HYPRE_Int         num_cols_offd_B,
-                               HYPRE_BigInt     *col_map_offd_B,
-                               HYPRE_Int        *num_cols_offd_C_ptr,
-                               HYPRE_BigInt    **col_map_offd_C_ptr,
-                               hypre_CSRMatrix **Bext_diag_ptr,
-                               hypre_CSRMatrix **Bext_offd_ptr)
+HYPRE_Int
+hypre_CSRMatrixSplit(hypre_CSRMatrix  *Bs_ext,
+                     HYPRE_BigInt      first_col_diag_B,
+                     HYPRE_BigInt      last_col_diag_B,
+                     HYPRE_Int         num_cols_offd_B,
+                     HYPRE_BigInt     *col_map_offd_B,
+                     HYPRE_Int        *num_cols_offd_C_ptr,
+                     HYPRE_BigInt    **col_map_offd_C_ptr,
+                     hypre_CSRMatrix **Bext_diag_ptr,
+                     hypre_CSRMatrix **Bext_offd_ptr)
 {
    HYPRE_Complex   *Bs_ext_data = hypre_CSRMatrixData(Bs_ext);
    HYPRE_Int       *Bs_ext_i    = hypre_CSRMatrixI(Bs_ext);
@@ -1310,10 +1324,11 @@ HYPRE_Int hypre_CSRMatrixSplit(hypre_CSRMatrix  *Bs_ext,
    HYPRE_Complex   *B_ext_diag_data = NULL;
    HYPRE_Int       *B_ext_offd_i = NULL;
    HYPRE_Int       *B_ext_offd_j = NULL;
+   HYPRE_BigInt    *B_ext_offd_bigj = NULL;
    HYPRE_Complex   *B_ext_offd_data = NULL;
    HYPRE_Int       *my_diag_array;
    HYPRE_Int       *my_offd_array;
-   HYPRE_BigInt    *temp;
+   HYPRE_BigInt    *temp = NULL;
    HYPRE_Int        max_num_threads;
    HYPRE_Int        cnt = 0;
    hypre_CSRMatrix *Bext_diag = NULL;
@@ -1321,15 +1336,15 @@ HYPRE_Int hypre_CSRMatrixSplit(hypre_CSRMatrix  *Bs_ext,
    HYPRE_BigInt    *col_map_offd_C = NULL;
    HYPRE_Int        num_cols_offd_C = 0;
 
-   B_ext_diag_i = hypre_CTAlloc(HYPRE_Int, num_rows_Bext+1, HYPRE_MEMORY_HOST);
-   B_ext_offd_i = hypre_CTAlloc(HYPRE_Int, num_rows_Bext+1, HYPRE_MEMORY_HOST);
+   B_ext_diag_i = hypre_CTAlloc(HYPRE_Int, num_rows_Bext + 1, HYPRE_MEMORY_HOST);
+   B_ext_offd_i = hypre_CTAlloc(HYPRE_Int, num_rows_Bext + 1, HYPRE_MEMORY_HOST);
 
    max_num_threads = hypre_NumThreads();
    my_diag_array = hypre_CTAlloc(HYPRE_Int, max_num_threads, HYPRE_MEMORY_HOST);
    my_offd_array = hypre_CTAlloc(HYPRE_Int, max_num_threads, HYPRE_MEMORY_HOST);
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel
+   #pragma omp parallel
 #endif
    {
       HYPRE_Int ns, ne, ii, num_threads;
@@ -1343,11 +1358,11 @@ HYPRE_Int hypre_CSRMatrixSplit(hypre_CSRMatrix  *Bs_ext,
 
       my_diag_size = 0;
       my_offd_size = 0;
-      for (i=ns; i < ne; i++)
+      for (i = ns; i < ne; i++)
       {
          B_ext_diag_i[i] = my_diag_size;
          B_ext_offd_i[i] = my_offd_size;
-         for (j = Bs_ext_i[i]; j < Bs_ext_i[i+1]; j++)
+         for (j = Bs_ext_i[i]; j < Bs_ext_i[i + 1]; j++)
          {
             if (Bs_ext_j[j] < first_col_diag_B || Bs_ext_j[j] > last_col_diag_B)
             {
@@ -1363,7 +1378,7 @@ HYPRE_Int hypre_CSRMatrixSplit(hypre_CSRMatrix  *Bs_ext,
       my_offd_array[ii] = my_offd_size;
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
 
       if (ii)
@@ -1394,41 +1409,37 @@ HYPRE_Int hypre_CSRMatrixSplit(hypre_CSRMatrix  *Bs_ext,
          B_ext_diag_i[num_rows_Bext] = B_ext_diag_size;
          B_ext_offd_i[num_rows_Bext] = B_ext_offd_size;
 
-         if (B_ext_diag_size)
-         {
-            B_ext_diag_j    = hypre_CTAlloc(HYPRE_Int,     B_ext_diag_size, HYPRE_MEMORY_HOST);
-            B_ext_diag_data = hypre_CTAlloc(HYPRE_Complex, B_ext_diag_size, HYPRE_MEMORY_HOST);
-         }
-         if (B_ext_offd_size)
-         {
-            B_ext_offd_j    = hypre_CTAlloc(HYPRE_Int,     B_ext_offd_size, HYPRE_MEMORY_HOST);
-            B_ext_offd_data = hypre_CTAlloc(HYPRE_Complex, B_ext_offd_size, HYPRE_MEMORY_HOST);
-         }
+         B_ext_diag_j    = hypre_CTAlloc(HYPRE_Int,     B_ext_diag_size, HYPRE_MEMORY_HOST);
+         B_ext_diag_data = hypre_CTAlloc(HYPRE_Complex, B_ext_diag_size, HYPRE_MEMORY_HOST);
+         B_ext_offd_j    = hypre_CTAlloc(HYPRE_Int,     B_ext_offd_size, HYPRE_MEMORY_HOST);
+         B_ext_offd_bigj = hypre_CTAlloc(HYPRE_BigInt,  B_ext_offd_size, HYPRE_MEMORY_HOST);
+         B_ext_offd_data = hypre_CTAlloc(HYPRE_Complex, B_ext_offd_size, HYPRE_MEMORY_HOST);
          if (B_ext_offd_size || num_cols_offd_B)
          {
-            temp = hypre_CTAlloc(HYPRE_BigInt, B_ext_offd_size + num_cols_offd_B, HYPRE_MEMORY_HOST);
+            temp = hypre_CTAlloc(HYPRE_BigInt, B_ext_offd_size + num_cols_offd_B,
+                                 HYPRE_MEMORY_HOST);
          }
       }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
 
       cnt_offd = B_ext_offd_i[ns];
       cnt_diag = B_ext_diag_i[ns];
       for (i = ns; i < ne; i++)
       {
-         for (j = Bs_ext_i[i]; j < Bs_ext_i[i+1]; j++)
+         for (j = Bs_ext_i[i]; j < Bs_ext_i[i + 1]; j++)
          {
             if (Bs_ext_j[j] < first_col_diag_B || Bs_ext_j[j] > last_col_diag_B)
             {
                temp[cnt_offd] = Bs_ext_j[j];
-               B_ext_offd_j[cnt_offd] = Bs_ext_j[j];
+               B_ext_offd_bigj[cnt_offd] = Bs_ext_j[j];
                B_ext_offd_data[cnt_offd++] = Bs_ext_data[j];
             }
             else
             {
-               B_ext_diag_j[cnt_diag] = Bs_ext_j[j] - first_col_diag_B;
+               B_ext_diag_j[cnt_diag] = (HYPRE_Int) (Bs_ext_j[j] - first_col_diag_B);
                B_ext_diag_data[cnt_diag++] = Bs_ext_data[j];
             }
          }
@@ -1436,7 +1447,7 @@ HYPRE_Int hypre_CSRMatrixSplit(hypre_CSRMatrix  *Bs_ext,
 
       /* This computes the mappings */
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
 
       if (ii == 0)
@@ -1445,13 +1456,13 @@ HYPRE_Int hypre_CSRMatrixSplit(hypre_CSRMatrix  *Bs_ext,
          if (B_ext_offd_size || num_cols_offd_B)
          {
             cnt = B_ext_offd_size;
-            for (i=0; i < num_cols_offd_B; i++)
+            for (i = 0; i < num_cols_offd_B; i++)
             {
                temp[cnt++] = col_map_offd_B[i];
             }
             if (cnt)
             {
-               hypre_BigQsort0(temp, 0, cnt-1);
+               hypre_BigQsort0(temp, 0, cnt - 1);
                num_cols_offd_C = 1;
                HYPRE_BigInt value = temp[0];
                for (i = 1; i < cnt; i++)
@@ -1479,22 +1490,27 @@ HYPRE_Int hypre_CSRMatrixSplit(hypre_CSRMatrix  *Bs_ext,
       }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+      #pragma omp barrier
 #endif
 
       for (i = ns; i < ne; i++)
       {
-         for (j = B_ext_offd_i[i]; j < B_ext_offd_i[i+1]; j++)
+         for (j = B_ext_offd_i[i]; j < B_ext_offd_i[i + 1]; j++)
          {
-            B_ext_offd_j[j] = hypre_BigBinarySearch(col_map_offd_C, B_ext_offd_j[j], num_cols_offd_C);
+            B_ext_offd_j[j] = hypre_BigBinarySearch(col_map_offd_C,
+                                                    B_ext_offd_bigj[j],
+                                                    num_cols_offd_C);
          }
       }
    } /* end parallel region */
 
    hypre_TFree(my_diag_array, HYPRE_MEMORY_HOST);
    hypre_TFree(my_offd_array, HYPRE_MEMORY_HOST);
+   hypre_TFree(B_ext_offd_bigj, HYPRE_MEMORY_HOST);
 
-   Bext_diag = hypre_CSRMatrixCreate(num_rows_Bext, last_col_diag_B-first_col_diag_B+1, B_ext_diag_size);
+   Bext_diag = hypre_CSRMatrixCreate(num_rows_Bext,
+                                     (HYPRE_Int) (last_col_diag_B - first_col_diag_B + 1),
+                                     B_ext_diag_size);
    hypre_CSRMatrixMemoryLocation(Bext_diag) = HYPRE_MEMORY_HOST;
    Bext_offd = hypre_CSRMatrixCreate(num_rows_Bext, num_cols_offd_C, B_ext_offd_size);
    hypre_CSRMatrixMemoryLocation(Bext_offd) = HYPRE_MEMORY_HOST;
@@ -1537,12 +1553,12 @@ hypre_CSRMatrixReorderHost(hypre_CSRMatrix *A)
    }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i, ii, j) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i, ii, j) HYPRE_SMP_SCHEDULE
 #endif
    for (i = 0; i < nnzrows_A; i++)
    {
       ii = rownnz_A ? rownnz_A[i] : i;
-      for (j = A_i[ii]; j < A_i[ii+1]; j++)
+      for (j = A_i[ii]; j < A_i[ii + 1]; j++)
       {
          if (A_j[j] == ii)
          {
@@ -1571,7 +1587,7 @@ hypre_CSRMatrixReorder(hypre_CSRMatrix *A)
 {
    HYPRE_Int ierr = 0;
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
    HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_CSRMatrixMemoryLocation(A) );
 
    if (exec == HYPRE_EXEC_DEVICE)
@@ -1636,22 +1652,22 @@ hypre_CSRMatrixAddPartial( hypre_CSRMatrix *A,
 
    if (ncols_A != ncols_B)
    {
-      hypre_error_w_msg(HYPRE_ERROR_GENERIC,"Warning! incompatible matrix dimensions!\n");
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Warning! incompatible matrix dimensions!\n");
       return NULL;
    }
 
    map = hypre_CTAlloc(HYPRE_Int, nrows_B, HYPRE_MEMORY_HOST);
    temp = hypre_CTAlloc(HYPRE_Int, nrows_B, HYPRE_MEMORY_HOST);
-   for (i=0; i < nrows_B; i++)
+   for (i = 0; i < nrows_B; i++)
    {
       map[i] = i;
       temp[i] = row_nums[i];
    }
 
-   hypre_qsort2i(temp,map,0,nrows_B-1);
+   hypre_qsort2i(temp, map, 0, nrows_B - 1);
 
    marker = hypre_CTAlloc(HYPRE_Int, ncols_A, HYPRE_MEMORY_HOST);
-   C_i = hypre_CTAlloc(HYPRE_Int, nrows_A+1, memory_location_C);
+   C_i = hypre_CTAlloc(HYPRE_Int, nrows_A + 1, memory_location_C);
 
    for (ia = 0; ia < ncols_A; ia++)
    {
@@ -1663,7 +1679,7 @@ hypre_CSRMatrixAddPartial( hypre_CSRMatrix *A,
    cnt = 0;
    for (ic = 0; ic < nrows_A; ic++)
    {
-      for (ia = A_i[ic]; ia < A_i[ic+1]; ia++)
+      for (ia = A_i[ic]; ia < A_i[ic + 1]; ia++)
       {
          jcol = A_j[ia];
          marker[jcol] = ic;
@@ -1676,7 +1692,7 @@ hypre_CSRMatrixAddPartial( hypre_CSRMatrix *A,
             if (temp[j] == ic)
             {
                i2 = map[cnt++];
-               for (ib = B_i[i2]; ib < B_i[i2+1]; ib++)
+               for (ib = B_i[i2]; ib < B_i[i2 + 1]; ib++)
                {
                   jcol = B_j[ib];
                   if (marker[jcol] != ic)
@@ -1692,7 +1708,7 @@ hypre_CSRMatrixAddPartial( hypre_CSRMatrix *A,
             }
          }
       }
-      C_i[ic+1] = num_nonzeros;
+      C_i[ic + 1] = num_nonzeros;
    }
 
    C = hypre_CSRMatrixCreate(nrows_A, ncols_A, num_nonzeros);
@@ -1710,7 +1726,7 @@ hypre_CSRMatrixAddPartial( hypre_CSRMatrix *A,
    pos = 0;
    for (ic = 0; ic < nrows_A; ic++)
    {
-      for (ia = A_i[ic]; ia < A_i[ic+1]; ia++)
+      for (ia = A_i[ic]; ia < A_i[ic + 1]; ia++)
       {
          jcol = A_j[ia];
          C_j[pos] = jcol;
@@ -1725,7 +1741,7 @@ hypre_CSRMatrixAddPartial( hypre_CSRMatrix *A,
             if (temp[j] == ic)
             {
                i2 = map[cnt++];
-               for (ib = B_i[i2]; ib < B_i[i2+1]; ib++)
+               for (ib = B_i[i2]; ib < B_i[i2 + 1]; ib++)
                {
                   jcol = B_j[ib];
                   if (marker[jcol] < C_i[ic])
@@ -1770,7 +1786,7 @@ hypre_CSRMatrixSumElts( hypre_CSRMatrix *A )
    HYPRE_Int      i;
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) reduction(+:sum) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i) reduction(+:sum) HYPRE_SMP_SCHEDULE
 #endif
    for (i = 0; i < num_nonzeros; i++)
    {
@@ -1797,7 +1813,7 @@ hypre_CSRMatrixFnorm( hypre_CSRMatrix *A )
    hypre_assert(num_nonzeros == A_i[nrows]);
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) reduction(+:sum) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i) reduction(+:sum) HYPRE_SMP_SCHEDULE
 #endif
    for (i = 0; i < num_nonzeros; ++i)
    {
@@ -1805,7 +1821,7 @@ hypre_CSRMatrixFnorm( hypre_CSRMatrix *A )
       sum += v * v;
    }
 
-   return sqrt(sum);
+   return hypre_sqrt(sum);
 }
 
 /*--------------------------------------------------------------------------
@@ -1836,7 +1852,7 @@ hypre_CSRMatrixComputeRowSumHost( hypre_CSRMatrix *A,
    {
       HYPRE_Complex row_sum_i = set_or_add[0] == 's' ? 0.0 : row_sum[i];
 
-      for (j = A_i[i]; j < A_i[i+1]; j++)
+      for (j = A_i[i]; j < A_i[i + 1]; j++)
       {
          if (CF_i && CF_j && CF_i[i] != CF_j[A_j[j]])
          {
@@ -1849,7 +1865,7 @@ hypre_CSRMatrixComputeRowSumHost( hypre_CSRMatrix *A,
          }
          else if (type == 1)
          {
-            row_sum_i += scal * fabs(A_data[j]);
+            row_sum_i += scal * hypre_cabs(A_data[j]);
          }
          else if (type == 2)
          {
@@ -1876,7 +1892,7 @@ hypre_CSRMatrixComputeRowSum( hypre_CSRMatrix *A,
 {
    hypre_assert( (CF_i && CF_j) || (!CF_i && !CF_j) );
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
    HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_CSRMatrixMemoryLocation(A) );
 
    if (exec == HYPRE_EXEC_DEVICE)
@@ -1899,7 +1915,7 @@ hypre_CSRMatrixComputeRowSum( hypre_CSRMatrix *A,
  *      4: abs diag inverse sqrt
  *--------------------------------------------------------------------------*/
 
-void
+HYPRE_Int
 hypre_CSRMatrixExtractDiagonalHost( hypre_CSRMatrix *A,
                                     HYPRE_Complex   *d,
                                     HYPRE_Int        type)
@@ -1910,11 +1926,12 @@ hypre_CSRMatrixExtractDiagonalHost( hypre_CSRMatrix *A,
    HYPRE_Int     *A_j    = hypre_CSRMatrixJ(A);
    HYPRE_Int      i, j;
    HYPRE_Complex  d_i;
+   char           msg[HYPRE_MAX_MSG_LEN];
 
    for (i = 0; i < nrows; i++)
    {
       d_i = 0.0;
-      for (j = A_i[i]; j < A_i[i+1]; j++)
+      for (j = A_i[i]; j < A_i[i + 1]; j++)
       {
          if (A_j[j] == i)
          {
@@ -1924,25 +1941,35 @@ hypre_CSRMatrixExtractDiagonalHost( hypre_CSRMatrix *A,
             }
             else if (type == 1)
             {
-               d_i = fabs(A_data[j]);
+               d_i = hypre_cabs(A_data[j]);
             }
-            else if (type == 2)
-            {
-               d_i = 1.0 /(A_data[j]);
-            }
-            else if (type == 3)
-            {
-               d_i = 1.0 /(sqrt(A_data[j]));
-            }
-            else if (type == 4)
+            else
             {
-               d_i = 1.0 /(sqrt(fabs(A_data[j])));
+               if (A_data[j] == 0.0)
+               {
+                  hypre_sprintf(msg, "Zero diagonal found at row %i!", i);
+                  hypre_error_w_msg(HYPRE_ERROR_GENERIC, msg);
+               }
+               else if (type == 2)
+               {
+                  d_i = 1.0 / A_data[j];
+               }
+               else if (type == 3)
+               {
+                  d_i = 1.0 / hypre_sqrt(A_data[j]);
+               }
+               else if (type == 4)
+               {
+                  d_i = 1.0 / hypre_sqrt(hypre_cabs(A_data[j]));
+               }
             }
             break;
          }
       }
       d[i] = d_i;
    }
+
+   return hypre_error_flag;
 }
 
 /*--------------------------------------------------------------------------
@@ -1954,12 +1981,12 @@ hypre_CSRMatrixExtractDiagonalHost( hypre_CSRMatrix *A,
  *      3: diag inverse sqrt
  *--------------------------------------------------------------------------*/
 
-void
+HYPRE_Int
 hypre_CSRMatrixExtractDiagonal( hypre_CSRMatrix *A,
                                 HYPRE_Complex   *d,
                                 HYPRE_Int        type)
 {
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
    HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_CSRMatrixMemoryLocation(A) );
 
    if (exec == HYPRE_EXEC_DEVICE)
@@ -1971,10 +1998,16 @@ hypre_CSRMatrixExtractDiagonal( hypre_CSRMatrix *A,
    {
       hypre_CSRMatrixExtractDiagonalHost(A, d, type);
    }
+
+   return hypre_error_flag;
 }
 
-/* Scale CSR matrix A = scalar * A
- */
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixScale
+ *
+ * Scales CSR matrix: A = scalar * A.
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_CSRMatrixScale( hypre_CSRMatrix *A,
                       HYPRE_Complex    scalar)
@@ -1983,12 +2016,12 @@ hypre_CSRMatrixScale( hypre_CSRMatrix *A,
    HYPRE_Int      i;
    HYPRE_Int      k = hypre_CSRMatrixNumNonzeros(A);
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
    HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_CSRMatrixMemoryLocation(A) );
 
    if (exec == HYPRE_EXEC_DEVICE)
    {
-      hypreDevice_Scalen(data, k, scalar);
+      hypreDevice_ComplexScalen(data, k, data, scalar);
    }
    else
 #endif
@@ -2002,6 +2035,152 @@ hypre_CSRMatrixScale( hypre_CSRMatrix *A,
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixDiagScaleHost
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_CSRMatrixDiagScaleHost( hypre_CSRMatrix *A,
+                              hypre_Vector    *ld,
+                              hypre_Vector    *rd)
+{
+
+   HYPRE_Int      nrows  = hypre_CSRMatrixNumRows(A);
+   HYPRE_Complex *A_data = hypre_CSRMatrixData(A);
+   HYPRE_Int     *A_i    = hypre_CSRMatrixI(A);
+   HYPRE_Int     *A_j    = hypre_CSRMatrixJ(A);
+
+   HYPRE_Complex *ldata  = ld ? hypre_VectorData(ld) : NULL;
+   HYPRE_Complex *rdata  = rd ? hypre_VectorData(rd) : NULL;
+   HYPRE_Int      lsize  = ld ? hypre_VectorSize(ld) : 0;
+   HYPRE_Int      rsize  = rd ? hypre_VectorSize(rd) : 0;
+
+   HYPRE_Int      i, j;
+   HYPRE_Complex  sl;
+   HYPRE_Complex  sr;
+
+   if (ldata && rdata)
+   {
+#ifdef HYPRE_USING_OPENMP
+      #pragma omp parallel for private(i, j, sl, sr) HYPRE_SMP_SCHEDULE
+#endif
+      for (i = 0; i < nrows; i++)
+      {
+         sl = ldata[i];
+         for (j = A_i[i]; j < A_i[i + 1]; j++)
+         {
+            sr = rdata[A_j[j]];
+            A_data[j] = sl * A_data[j] * sr;
+         }
+      }
+   }
+   else if (ldata && !rdata)
+   {
+#ifdef HYPRE_USING_OPENMP
+      #pragma omp parallel for private(i, j, sl) HYPRE_SMP_SCHEDULE
+#endif
+      for (i = 0; i < nrows; i++)
+      {
+         sl = ldata[i];
+         for (j = A_i[i]; j < A_i[i + 1]; j++)
+         {
+            A_data[j] = sl * A_data[j];
+         }
+      }
+   }
+   else if (!ldata && rdata)
+   {
+#ifdef HYPRE_USING_OPENMP
+      #pragma omp parallel for private(i, j, sr) HYPRE_SMP_SCHEDULE
+#endif
+      for (i = 0; i < nrows; i++)
+      {
+         for (j = A_i[i]; j < A_i[i + 1]; j++)
+         {
+            sr = rdata[A_j[j]];
+            A_data[j] = A_data[j] * sr;
+         }
+      }
+   }
+   else
+   {
+      /* Throw an error if the scaling factors should have a size different than zero */
+      if (lsize || rsize)
+      {
+         hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Scaling matrices are not set!\n");
+      }
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixDiagScale
+ *
+ * Computes A = diag(ld) * A * diag(rd), where the diagonal matrices
+ * "diag(ld)" and "diag(rd)" are stored as local vectors.
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_CSRMatrixDiagScale( hypre_CSRMatrix *A,
+                          hypre_Vector    *ld,
+                          hypre_Vector    *rd)
+{
+   /* Sanity checks */
+   if (ld && hypre_VectorSize(ld) && !hypre_VectorData(ld))
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "ld scaling coefficients are not set\n");
+      return hypre_error_flag;
+   }
+
+   if (rd && hypre_VectorSize(rd) && !hypre_VectorData(rd))
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "rd scaling coefficients are not set\n");
+      return hypre_error_flag;
+   }
+
+   if (!rd && !ld)
+   {
+      return hypre_error_flag;
+   }
+
+#if defined(HYPRE_USING_GPU)
+   HYPRE_ExecutionPolicy exec;
+
+   if (ld && rd)
+   {
+      /* TODO (VPM): replace with GetExecPolicy3 */
+      exec = hypre_GetExecPolicy2(hypre_CSRMatrixMemoryLocation(A),
+                                  hypre_VectorMemoryLocation(ld));
+   }
+   else if (ld)
+   {
+      exec = hypre_GetExecPolicy2(hypre_CSRMatrixMemoryLocation(A),
+                                  hypre_VectorMemoryLocation(ld));
+   }
+   else
+   {
+      exec = hypre_GetExecPolicy2(hypre_CSRMatrixMemoryLocation(A),
+                                  hypre_VectorMemoryLocation(rd));
+   }
+
+   if (exec == HYPRE_EXEC_DEVICE)
+   {
+      hypre_CSRMatrixDiagScaleDevice(A, ld, rd);
+   }
+   else
+#endif
+   {
+      hypre_CSRMatrixDiagScaleHost(A, ld, rd);
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixSetConstantValues
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_CSRMatrixSetConstantValues( hypre_CSRMatrix *A,
                                   HYPRE_Complex    value)
@@ -2014,12 +2193,12 @@ hypre_CSRMatrixSetConstantValues( hypre_CSRMatrix *A,
       hypre_CSRMatrixData(A) = hypre_TAlloc(HYPRE_Complex, nnz, hypre_CSRMatrixMemoryLocation(A));
    }
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
    HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_CSRMatrixMemoryLocation(A) );
 
    if (exec == HYPRE_EXEC_DEVICE)
    {
-      hypreDevice_Filln(hypre_CSRMatrixData(A), nnz, value);
+      hypreDevice_ComplexFilln(hypre_CSRMatrixData(A), nnz, value);
    }
    else
 #endif
@@ -2032,4 +2211,3 @@ hypre_CSRMatrixSetConstantValues( hypre_CSRMatrix *A,
 
    return hypre_error_flag;
 }
-
diff --git a/external/hypre/src/seq_mv/csr_matop_device.c b/external/hypre/src/seq_mv/csr_matop_device.c
index e4a5c98e..3f397b24 100644
--- a/external/hypre/src/seq_mv/csr_matop_device.c
+++ b/external/hypre/src/seq_mv/csr_matop_device.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -11,53 +11,92 @@
  *
  *****************************************************************************/
 
+#include "_hypre_onedpl.hpp"
 #include "seq_mv.h"
 #include "_hypre_utilities.hpp"
 #include "seq_mv.hpp"
 
-#if defined(HYPRE_USING_CUSPARSE) || defined(HYPRE_USING_ROCSPARSE)
+#if defined(HYPRE_USING_CUSPARSE)  ||\
+    defined(HYPRE_USING_ROCSPARSE) ||\
+    defined(HYPRE_USING_ONEMKLSPARSE)
+
+/*--------------------------------------------------------------------------
+ * hypre_CsrsvDataCreate
+ *--------------------------------------------------------------------------*/
+
 hypre_CsrsvData*
 hypre_CsrsvDataCreate()
 {
    hypre_CsrsvData *data = hypre_CTAlloc(hypre_CsrsvData, 1, HYPRE_MEMORY_HOST);
 
+#if defined(HYPRE_USING_CUSPARSE)
+   HYPRE_CUSPARSE_CALL( hypre_cusparseSpSV_createDescr(&hypre_CsrsvDataInfoL(data)) );
+   HYPRE_CUSPARSE_CALL( hypre_cusparseSpSV_createDescr(&hypre_CsrsvDataInfoU(data)) );
+
+#elif defined(HYPRE_USING_ROCSPARSE)
+   HYPRE_ROCSPARSE_CALL( rocsparse_create_mat_info(&(hypre_CsrsvDataInfoL(data)) ) );
+   HYPRE_ROCSPARSE_CALL( rocsparse_create_mat_info(&(hypre_CsrsvDataInfoU(data)) ) );
+#endif
+
+   hypre_CsrsvDataAnalyzedL(data) = 0;
+   hypre_CsrsvDataAnalyzedU(data) = 0;
+
    return data;
 }
 
-void
+/*--------------------------------------------------------------------------
+ * hypre_CsrsvDataDestroy
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
 hypre_CsrsvDataDestroy(hypre_CsrsvData* data)
 {
-   if (!data)
-   {
-      return;
-   }
-
-   if ( hypre_CsrsvDataInfoL(data) )
+   if (data)
    {
+#if !defined(HYPRE_USING_ONEMKLSPARSE)
+      /* Lower matrix info */
+      if (hypre_CsrsvDataInfoL(data))
+      {
 #if defined(HYPRE_USING_CUSPARSE)
-      HYPRE_CUSPARSE_CALL( cusparseDestroyCsrsv2Info( hypre_CsrsvDataInfoL(data) ) );
+         HYPRE_CUSPARSE_CALL( hypre_cusparseSpSV_destroyDescr(hypre_CsrsvDataInfoL(data)) );
+
 #elif defined(HYPRE_USING_ROCSPARSE)
-      HYPRE_ROCSPARSE_CALL( rocsparse_destroy_mat_info( hypre_CsrsvDataInfoL(data) ) );
+         HYPRE_ROCSPARSE_CALL( rocsparse_destroy_mat_info(hypre_CsrsvDataInfoL(data)) );
 #endif
-   }
+      }
 
-   if ( hypre_CsrsvDataInfoU(data) )
-   {
+      /* Upper matrix info */
+      if (hypre_CsrsvDataInfoU(data))
+      {
 #if defined(HYPRE_USING_CUSPARSE)
-      HYPRE_CUSPARSE_CALL( cusparseDestroyCsrsv2Info( hypre_CsrsvDataInfoU(data) ) );
+         HYPRE_CUSPARSE_CALL( hypre_cusparseSpSV_destroyDescr(hypre_CsrsvDataInfoU(data)) );
+
 #elif defined(HYPRE_USING_ROCSPARSE)
-      HYPRE_ROCSPARSE_CALL( rocsparse_destroy_mat_info( hypre_CsrsvDataInfoU(data) ) );
+         HYPRE_ROCSPARSE_CALL( rocsparse_destroy_mat_info(hypre_CsrsvDataInfoU(data)) );
 #endif
-   }
+      }
 
-   if ( hypre_CsrsvDataBuffer(data) )
-   {
+      /* Buffers */
+#if defined(HYPRE_USING_CUSPARSE) && (CUSPARSE_VERSION >= CUSPARSE_SPSV_VERSION)
+      hypre_TFree(hypre_CsrsvDataBufferL(data), HYPRE_MEMORY_DEVICE);
+      hypre_TFree(hypre_CsrsvDataBufferU(data), HYPRE_MEMORY_DEVICE);
+#else
       hypre_TFree(hypre_CsrsvDataBuffer(data), HYPRE_MEMORY_DEVICE);
+#endif
+#endif // #if !defined(HYPRE_USING_ONEMKLSPARSE)
+      hypre_TFree(hypre_CsrsvDataMatData(data), HYPRE_MEMORY_DEVICE);
+
+      /* Free data structure pointer */
+      hypre_TFree(data, HYPRE_MEMORY_HOST);
    }
 
-   hypre_TFree(data, HYPRE_MEMORY_HOST);
+   return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_GpuMatDataCreate
+ *--------------------------------------------------------------------------*/
+
 hypre_GpuMatData *
 hypre_GpuMatDataCreate()
 {
@@ -65,55 +104,109 @@ hypre_GpuMatDataCreate()
 
 #if defined(HYPRE_USING_CUSPARSE)
    cusparseMatDescr_t mat_descr;
+
    HYPRE_CUSPARSE_CALL( cusparseCreateMatDescr(&mat_descr) );
    HYPRE_CUSPARSE_CALL( cusparseSetMatType(mat_descr, CUSPARSE_MATRIX_TYPE_GENERAL) );
    HYPRE_CUSPARSE_CALL( cusparseSetMatIndexBase(mat_descr, CUSPARSE_INDEX_BASE_ZERO) );
-   hypre_GpuMatDataMatDecsr(data) = mat_descr;
-#endif
+   hypre_GpuMatDataMatDescr(data) = mat_descr;
 
-#if defined(HYPRE_USING_ROCSPARSE)
+#elif defined(HYPRE_USING_ROCSPARSE)
    rocsparse_mat_descr mat_descr;
    rocsparse_mat_info  info;
+
    HYPRE_ROCSPARSE_CALL( rocsparse_create_mat_descr(&mat_descr) );
    HYPRE_ROCSPARSE_CALL( rocsparse_set_mat_type(mat_descr, rocsparse_matrix_type_general) );
    HYPRE_ROCSPARSE_CALL( rocsparse_set_mat_index_base(mat_descr, rocsparse_index_base_zero) );
-   hypre_GpuMatDataMatDecsr(data) = mat_descr;
    HYPRE_ROCSPARSE_CALL( rocsparse_create_mat_info(&info) );
+
+   hypre_GpuMatDataMatDescr(data) = mat_descr;
    hypre_GpuMatDataMatInfo(data) = info;
+
+#elif defined(HYPRE_USING_ONEMKLSPARSE)
+   oneapi::mkl::sparse::matrix_handle_t mat_handle;
+   HYPRE_ONEMKL_CALL( oneapi::mkl::sparse::init_matrix_handle(&mat_handle) );
+   hypre_GpuMatDataMatHandle(data) = mat_handle;
 #endif
 
    return data;
 }
 
-void
+/*--------------------------------------------------------------------------
+ * hypre_GPUMatDataSetCSRData
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_GPUMatDataSetCSRData(hypre_CSRMatrix *matrix)
+{
+#if defined(HYPRE_USING_ONEMKLSPARSE)
+#if defined(HYPRE_BIGINT)
+   HYPRE_ONEMKL_CALL( oneapi::mkl::sparse::set_csr_data(*hypre_HandleComputeStream(hypre_handle()),
+                                                        hypre_CSRMatrixGPUMatHandle(matrix),
+                                                        hypre_CSRMatrixNumRows(matrix),
+                                                        hypre_CSRMatrixNumCols(matrix),
+                                                        oneapi::mkl::index_base::zero,
+                                                        reinterpret_cast<std::int64_t*>(hypre_CSRMatrixI(matrix)),
+                                                        reinterpret_cast<std::int64_t*>(hypre_CSRMatrixJ(matrix)),
+                                                        hypre_CSRMatrixData(matrix)) );
+#else
+   HYPRE_ONEMKL_CALL( oneapi::mkl::sparse::set_csr_data(*hypre_HandleComputeStream(hypre_handle()),
+                                                        hypre_CSRMatrixGPUMatHandle(matrix),
+                                                        hypre_CSRMatrixNumRows(matrix),
+                                                        hypre_CSRMatrixNumCols(matrix),
+                                                        oneapi::mkl::index_base::zero,
+                                                        hypre_CSRMatrixI(matrix),
+                                                        hypre_CSRMatrixJ(matrix),
+                                                        hypre_CSRMatrixData(matrix)) );
+#endif
+#else
+   HYPRE_UNUSED_VAR(matrix);
+#endif
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_GpuMatDataDestroy
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
 hypre_GpuMatDataDestroy(hypre_GpuMatData *data)
 {
-   if (!data)
+   if (data)
    {
-      return;
-   }
-
 #if defined(HYPRE_USING_CUSPARSE)
-   HYPRE_CUSPARSE_CALL( cusparseDestroyMatDescr(hypre_GpuMatDataMatDecsr(data)) );
-#endif
+      HYPRE_CUSPARSE_CALL( cusparseDestroyMatDescr(hypre_GpuMatDataMatDescr(data)) );
+      hypre_TFree(hypre_GpuMatDataSpMVBuffer(data), HYPRE_MEMORY_DEVICE);
 
-#if defined(HYPRE_USING_ROCSPARSE)
-   HYPRE_ROCSPARSE_CALL( rocsparse_destroy_mat_descr(hypre_GpuMatDataMatDecsr(data)) );
-   HYPRE_ROCSPARSE_CALL( rocsparse_destroy_mat_info(hypre_GpuMatDataMatInfo(data)) );
+#elif defined(HYPRE_USING_ROCSPARSE)
+      HYPRE_ROCSPARSE_CALL( rocsparse_destroy_mat_descr(hypre_GpuMatDataMatDescr(data)) );
+      HYPRE_ROCSPARSE_CALL( rocsparse_destroy_mat_info(hypre_GpuMatDataMatInfo(data)) );
+
+#elif defined(HYPRE_USING_ONEMKLSPARSE)
+      HYPRE_ONEMKL_CALL( oneapi::mkl::sparse::release_matrix_handle(*hypre_HandleComputeStream(
+                                                                       hypre_handle()),
+                                                                    &hypre_GpuMatDataMatHandle(data)) );
 #endif
+   }
+
+   hypre_TFree(data, HYPRE_MEMORY_HOST);
 
-  hypre_TFree(data, HYPRE_MEMORY_HOST);
+   return hypre_error_flag;
 }
 
-#endif /* #if defined(HYPRE_USING_CUSPARSE) || defined(HYPRE_USING_ROCSPARSE) */
+#endif /* #if defined(HYPRE_USING_CUSPARSE) || defined(HYPRE_USING_ROCSPARSE) || defined(HYPRE_USING_ONEMKLSPARSE) */
+
+#if defined(HYPRE_USING_GPU)
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixAddDevice
+ *--------------------------------------------------------------------------*/
 
 hypre_CSRMatrix*
-hypre_CSRMatrixAddDevice ( HYPRE_Complex    alpha,
-                           hypre_CSRMatrix *A,
-                           HYPRE_Complex    beta,
-                           hypre_CSRMatrix *B     )
+hypre_CSRMatrixAddDevice( HYPRE_Complex    alpha,
+                          hypre_CSRMatrix *A,
+                          HYPRE_Complex    beta,
+                          hypre_CSRMatrix *B )
 {
    HYPRE_Complex    *A_data   = hypre_CSRMatrixData(A);
    HYPRE_Int        *A_i      = hypre_CSRMatrixI(A);
@@ -135,13 +228,14 @@ hypre_CSRMatrixAddDevice ( HYPRE_Complex    alpha,
 
    if (nrows_A != nrows_B || ncols_A != ncols_B)
    {
-      hypre_error_w_msg(HYPRE_ERROR_GENERIC,"Warning! Incompatible matrix dimensions!\n");
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Warning! Incompatible matrix dimensions!\n");
 
       return NULL;
    }
 
-   hypreDevice_CSRSpAdd(nrows_A, nrows_B, ncols_A, nnz_A, nnz_B,
-                        A_i, A_j, alpha, A_data, NULL, B_i, B_j, beta, B_data, NULL, NULL,
+   hypreDevice_CSRSpAdd(nrows_A, nrows_B, nnz_A, nnz_B,
+                        A_i, A_j, alpha, A_data, NULL, B_i, B_j,
+                        beta, B_data, NULL, NULL,
                         &nnzC, &C_i, &C_j, &C_data);
 
    C = hypre_CSRMatrixCreate(nrows_A, ncols_B, nnzC);
@@ -150,14 +244,18 @@ hypre_CSRMatrixAddDevice ( HYPRE_Complex    alpha,
    hypre_CSRMatrixData(C) = C_data;
    hypre_CSRMatrixMemoryLocation(C) = HYPRE_MEMORY_DEVICE;
 
-   hypre_SyncCudaComputeStream(hypre_handle());
+   hypre_SyncComputeStream();
 
    return C;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixMultiplyDevice
+ *--------------------------------------------------------------------------*/
+
 hypre_CSRMatrix*
 hypre_CSRMatrixMultiplyDevice( hypre_CSRMatrix *A,
-                               hypre_CSRMatrix *B)
+                               hypre_CSRMatrix *B )
 {
    HYPRE_Int         ncols_A  = hypre_CSRMatrixNumCols(A);
    HYPRE_Int         nrows_B  = hypre_CSRMatrixNumRows(B);
@@ -166,18 +264,26 @@ hypre_CSRMatrixMultiplyDevice( hypre_CSRMatrix *A,
    if (ncols_A != nrows_B)
    {
       hypre_printf("Warning! incompatible matrix dimensions!\n");
-      hypre_error_w_msg(HYPRE_ERROR_GENERIC,"Warning! incompatible matrix dimensions!\n");
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Warning! incompatible matrix dimensions!\n");
 
       return NULL;
    }
 
+   hypre_GpuProfilingPushRange("CSRMatrixMultiply");
+
    hypreDevice_CSRSpGemm(A, B, &C);
 
-   hypre_SyncCudaComputeStream(hypre_handle());
+   hypre_SyncComputeStream();
+
+   hypre_GpuProfilingPopRange();
 
    return C;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixTripleMultiplyDevice
+ *--------------------------------------------------------------------------*/
+
 hypre_CSRMatrix*
 hypre_CSRMatrixTripleMultiplyDevice ( hypre_CSRMatrix *A,
                                       hypre_CSRMatrix *B,
@@ -191,29 +297,17 @@ hypre_CSRMatrixTripleMultiplyDevice ( hypre_CSRMatrix *A,
    return ABC;
 }
 
-HYPRE_Int
-hypre_CSRMatrixTriLowerUpperSolveDevice(char             uplo,
-                                        hypre_CSRMatrix *A,
-                                        HYPRE_Real      *l1_norms,
-                                        hypre_Vector    *f,
-                                        hypre_Vector    *u )
-{
-#if defined(HYPRE_USING_CUSPARSE)
-   hypre_CSRMatrixTriLowerUpperSolveCusparse(uplo, A, l1_norms, f, u);
-#elif defined(HYPRE_USING_ROCSPARSE)
-   hypre_CSRMatrixTriLowerUpperSolveRocsparse(uplo, A, l1_norms, f, u);
-#else
-   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "hypre_CSRMatrixTriLowerUpperSolveDevice requires configuration with either cusparse or rocsparse\n");
-#endif
-   return hypre_error_flag;
-}
-
-/* split CSR matrix B_ext (extended rows of parcsr B) into diag part and offd part
- * corresponding to B.
- * Input  col_map_offd_B:
- * Output col_map_offd_C: union of col_map_offd_B and offd-indices of Bext_offd
- *        map_B_to_C: mapping from col_map_offd_B to col_map_offd_C
- */
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixSplitDevice
+ *
+ * Split CSR matrix B_ext (extended rows of parcsr B) into diag part and
+ * offd part corresponding to B.
+ *
+ * Input  - col_map_offd_B:
+ * Output - col_map_offd_C: union of col_map_offd_B and offd-indices of
+ *                          Bext_offd
+ *          map_B_to_C: mapping from col_map_offd_B to col_map_offd_C
+ *--------------------------------------------------------------------------*/
 
 HYPRE_Int
 hypre_CSRMatrixSplitDevice( hypre_CSRMatrix  *B_ext,
@@ -305,7 +399,8 @@ hypre_CSRMatrixSplitDevice( hypre_CSRMatrix  *B_ext,
    hypre_TFree(B_ext_offd_ii, HYPRE_MEMORY_DEVICE);
 
    /* create diag and offd CSR */
-   hypre_CSRMatrix *B_ext_diag = hypre_CSRMatrixCreate(num_rows, last_col_diag_B - first_col_diag_B + 1, B_ext_diag_nnz);
+   hypre_CSRMatrix *B_ext_diag = hypre_CSRMatrixCreate(num_rows,
+                                                       last_col_diag_B - first_col_diag_B + 1, B_ext_diag_nnz);
    hypre_CSRMatrix *B_ext_offd = hypre_CSRMatrixCreate(num_rows, *num_cols_offd_C_ptr, B_ext_offd_nnz);
 
    hypre_CSRMatrixI(B_ext_diag) = B_ext_diag_i;
@@ -323,37 +418,137 @@ hypre_CSRMatrixSplitDevice( hypre_CSRMatrix  *B_ext,
    *B_ext_diag_ptr = B_ext_diag;
    *B_ext_offd_ptr = B_ext_offd;
 
-   hypre_SyncCudaComputeStream(hypre_handle());
+   hypre_SyncComputeStream();
 
    return ierr;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixMergeColMapOffd
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_CSRMatrixMergeColMapOffd( HYPRE_Int      num_cols_offd_B,
+                                HYPRE_BigInt  *col_map_offd_B,
+                                HYPRE_Int      B_ext_offd_nnz,
+                                HYPRE_BigInt  *B_ext_offd_bigj,
+                                HYPRE_Int     *num_cols_offd_C_ptr,
+                                HYPRE_BigInt **col_map_offd_C_ptr,
+                                HYPRE_Int    **map_B_to_C_ptr )
+{
+   /* offd map of B_ext_offd Union col_map_offd_B */
+   HYPRE_BigInt *col_map_offd_C = hypre_TAlloc(HYPRE_BigInt, B_ext_offd_nnz + num_cols_offd_B,
+                                               HYPRE_MEMORY_DEVICE);
+
+   hypre_TMemcpy(col_map_offd_C, B_ext_offd_bigj, HYPRE_BigInt, B_ext_offd_nnz,
+                 HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+
+   hypre_TMemcpy(col_map_offd_C + B_ext_offd_nnz, col_map_offd_B, HYPRE_BigInt, num_cols_offd_B,
+                 HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_ONEDPL_CALL( std::sort,
+                      col_map_offd_C,
+                      col_map_offd_C + B_ext_offd_nnz + num_cols_offd_B );
+
+   HYPRE_BigInt *new_end = HYPRE_ONEDPL_CALL( std::unique,
+                                              col_map_offd_C,
+                                              col_map_offd_C + B_ext_offd_nnz + num_cols_offd_B );
+#else
+   HYPRE_THRUST_CALL( sort,
+                      col_map_offd_C,
+                      col_map_offd_C + B_ext_offd_nnz + num_cols_offd_B );
+
+   HYPRE_BigInt *new_end = HYPRE_THRUST_CALL( unique,
+                                              col_map_offd_C,
+                                              col_map_offd_C + B_ext_offd_nnz + num_cols_offd_B );
+#endif
+
+   HYPRE_Int num_cols_offd_C = new_end - col_map_offd_C;
+
+#if 1
+   HYPRE_BigInt *tmp = hypre_TAlloc(HYPRE_BigInt, num_cols_offd_C, HYPRE_MEMORY_DEVICE);
+   hypre_TMemcpy(tmp, col_map_offd_C, HYPRE_BigInt, num_cols_offd_C, HYPRE_MEMORY_DEVICE,
+                 HYPRE_MEMORY_DEVICE);
+   hypre_TFree(col_map_offd_C, HYPRE_MEMORY_DEVICE);
+   col_map_offd_C = tmp;
+#else
+   col_map_offd_C = hypre_TReAlloc_v2(col_map_offd_C, HYPRE_BigInt, B_ext_offd_nnz + num_cols_offd_B,
+                                      HYPRE_Int, num_cols_offd_C, HYPRE_MEMORY_DEVICE);
+#endif
+
+   /* create map from col_map_offd_B */
+   HYPRE_Int *map_B_to_C = hypre_TAlloc(HYPRE_Int, num_cols_offd_B, HYPRE_MEMORY_DEVICE);
+
+   if (num_cols_offd_B)
+   {
+#if defined(HYPRE_USING_SYCL)
+      HYPRE_ONEDPL_CALL( oneapi::dpl::lower_bound,
+                         col_map_offd_C,
+                         col_map_offd_C + num_cols_offd_C,
+                         col_map_offd_B,
+                         col_map_offd_B + num_cols_offd_B,
+                         map_B_to_C );
+#else
+      HYPRE_THRUST_CALL( lower_bound,
+                         col_map_offd_C,
+                         col_map_offd_C + num_cols_offd_C,
+                         col_map_offd_B,
+                         col_map_offd_B + num_cols_offd_B,
+                         map_B_to_C );
+#endif
+   }
+
+   *map_B_to_C_ptr = map_B_to_C;
+   *num_cols_offd_C_ptr = num_cols_offd_C;
+   *col_map_offd_C_ptr  = col_map_offd_C;
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixSplitDevice_core
+ *
+ * job = 0: query B_ext_diag/offd_nnz; 1: real computation
+ *
+ * NOTES:
+ *   B_ext_ii: NOT row pointers of CSR but row indices of COO
+ *   B_ext_bigj: [BigInt] global column indices
+ *   B_ext_xata: companion data with B_ext_data; NULL if none
+ *   B_ext_diag_ii: memory allocated outside
+ *   B_ext_diag_xata: companion with B_ext_diag_data_ptr; NULL if none
+ *   B_ext_offd_ii: memory allocated outside
+ *   B_ext_offd_xata: companion with B_ext_offd_data_ptr; NULL if none
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_CSRMatrixSplitDevice_core( HYPRE_Int         job,                 /* 0: query B_ext_diag_nnz and B_ext_offd_nnz; 1: the real computation */
-                                 HYPRE_Int         num_rows,
-                                 HYPRE_Int         B_ext_nnz,
-                                 HYPRE_Int        *B_ext_ii,            /* Note: this is NOT row pointers as in CSR but row indices as in COO */
-                                 HYPRE_BigInt     *B_ext_bigj,          /* Note: [BigInt] global column indices */
-                                 HYPRE_Complex    *B_ext_data,
-                                 char             *B_ext_xata,          /* companion data with B_ext_data; NULL if none */
-                                 HYPRE_BigInt      first_col_diag_B,
-                                 HYPRE_BigInt      last_col_diag_B,
-                                 HYPRE_Int         num_cols_offd_B,
-                                 HYPRE_BigInt     *col_map_offd_B,
-                                 HYPRE_Int       **map_B_to_C_ptr,
-                                 HYPRE_Int        *num_cols_offd_C_ptr,
-                                 HYPRE_BigInt    **col_map_offd_C_ptr,
-                                 HYPRE_Int        *B_ext_diag_nnz_ptr,
-                                 HYPRE_Int        *B_ext_diag_ii,       /* memory allocated outside */
-                                 HYPRE_Int        *B_ext_diag_j,
-                                 HYPRE_Complex    *B_ext_diag_data,
-                                 char             *B_ext_diag_xata,     /* companion with B_ext_diag_data_ptr; NULL if none */
-                                 HYPRE_Int        *B_ext_offd_nnz_ptr,
-                                 HYPRE_Int        *B_ext_offd_ii,       /* memory allocated outside */
-                                 HYPRE_Int        *B_ext_offd_j,
-                                 HYPRE_Complex    *B_ext_offd_data,
-                                 char             *B_ext_offd_xata      /* companion with B_ext_offd_data_ptr; NULL if none */ )
+hypre_CSRMatrixSplitDevice_core( HYPRE_Int      job,
+                                 HYPRE_Int      num_rows,
+                                 HYPRE_Int      B_ext_nnz,
+                                 HYPRE_Int     *B_ext_ii,
+                                 HYPRE_BigInt  *B_ext_bigj,
+                                 HYPRE_Complex *B_ext_data,
+                                 char          *B_ext_xata,
+                                 HYPRE_BigInt   first_col_diag_B,
+                                 HYPRE_BigInt   last_col_diag_B,
+                                 HYPRE_Int      num_cols_offd_B,
+                                 HYPRE_BigInt  *col_map_offd_B,
+                                 HYPRE_Int    **map_B_to_C_ptr,
+                                 HYPRE_Int     *num_cols_offd_C_ptr,
+                                 HYPRE_BigInt **col_map_offd_C_ptr,
+                                 HYPRE_Int     *B_ext_diag_nnz_ptr,
+                                 HYPRE_Int     *B_ext_diag_ii,
+                                 HYPRE_Int     *B_ext_diag_j,
+                                 HYPRE_Complex *B_ext_diag_data,
+                                 char          *B_ext_diag_xata,
+                                 HYPRE_Int     *B_ext_offd_nnz_ptr,
+                                 HYPRE_Int     *B_ext_offd_ii,
+                                 HYPRE_Int     *B_ext_offd_j,
+                                 HYPRE_Complex *B_ext_offd_data,
+                                 char          *B_ext_offd_xata )
 {
+   HYPRE_UNUSED_VAR(num_rows);
+
    HYPRE_Int      B_ext_diag_nnz;
    HYPRE_Int      B_ext_offd_nnz;
    HYPRE_BigInt  *B_ext_diag_bigj = NULL;
@@ -362,21 +557,32 @@ hypre_CSRMatrixSplitDevice_core( HYPRE_Int         job,                 /* 0: qu
    HYPRE_Int     *map_B_to_C = NULL;
    HYPRE_Int      num_cols_offd_C;
 
+   hypre_GpuProfilingPushRange("CSRMatrixSplitDevice_core");
+
    in_range<HYPRE_BigInt> pred1(first_col_diag_B, last_col_diag_B);
 
    /* get diag and offd nnz */
    if (job == 0)
    {
       /* query the nnz's */
+#if defined(HYPRE_USING_SYCL)
+      B_ext_diag_nnz = HYPRE_ONEDPL_CALL( std::count_if,
+                                          B_ext_bigj,
+                                          B_ext_bigj + B_ext_nnz,
+                                          pred1 );
+#else
       B_ext_diag_nnz = HYPRE_THRUST_CALL( count_if,
                                           B_ext_bigj,
                                           B_ext_bigj + B_ext_nnz,
                                           pred1 );
+#endif
       B_ext_offd_nnz = B_ext_nnz - B_ext_diag_nnz;
 
       *B_ext_diag_nnz_ptr = B_ext_diag_nnz;
       *B_ext_offd_nnz_ptr = B_ext_offd_nnz;
 
+      hypre_GpuProfilingPopRange();
+
       return hypre_error_flag;
    }
    else
@@ -390,36 +596,72 @@ hypre_CSRMatrixSplitDevice_core( HYPRE_Int         job,                 /* 0: qu
 
    if (B_ext_diag_xata)
    {
+#if defined(HYPRE_USING_SYCL)
+      auto first = oneapi::dpl::make_zip_iterator(B_ext_ii, B_ext_bigj, B_ext_data, B_ext_xata);
+      auto new_end = hypreSycl_copy_if(
+                        first,                                                             /* first   */
+                        first + B_ext_nnz,                                                 /* last    */
+                        B_ext_bigj,                                                        /* stencil */
+                        oneapi::dpl::make_zip_iterator(B_ext_diag_ii, B_ext_diag_bigj, B_ext_diag_data,
+                                                       B_ext_diag_xata),                   /* result  */
+                        pred1 );
+      hypre_assert( std::get<0>(new_end.base()) == B_ext_diag_ii + B_ext_diag_nnz );
+#else
       auto new_end = HYPRE_THRUST_CALL(
-         copy_if,
-         thrust::make_zip_iterator(thrust::make_tuple(B_ext_ii,      B_ext_bigj,      B_ext_data,   B_ext_xata)),             /* first */
-         thrust::make_zip_iterator(thrust::make_tuple(B_ext_ii,      B_ext_bigj,      B_ext_data,   B_ext_xata)) + B_ext_nnz, /* last */
-         B_ext_bigj,                                                                                                          /* stencil */
-         thrust::make_zip_iterator(thrust::make_tuple(B_ext_diag_ii, B_ext_diag_bigj, B_ext_diag_data, B_ext_diag_xata)),     /* result */
-         pred1 );
+                        copy_if,
+                        thrust::make_zip_iterator(thrust::make_tuple(B_ext_ii,      B_ext_bigj,      B_ext_data,
+                                                                     B_ext_xata)),             /* first */
+                        thrust::make_zip_iterator(thrust::make_tuple(B_ext_ii,      B_ext_bigj,      B_ext_data,
+                                                                     B_ext_xata)) + B_ext_nnz, /* last */
+                        B_ext_bigj,                                                            /* stencil */
+                        thrust::make_zip_iterator(thrust::make_tuple(B_ext_diag_ii, B_ext_diag_bigj, B_ext_diag_data,
+                                                                     B_ext_diag_xata)),        /* result */
+                        pred1 );
 
       hypre_assert( thrust::get<0>(new_end.get_iterator_tuple()) == B_ext_diag_ii + B_ext_diag_nnz );
+#endif
    }
    else
    {
+#if defined(HYPRE_USING_SYCL)
+      auto first = oneapi::dpl::make_zip_iterator(B_ext_ii, B_ext_bigj, B_ext_data);
+      auto new_end = hypreSycl_copy_if(
+                        first,                                                                /* first   */
+                        first + B_ext_nnz,                                                    /* last    */
+                        B_ext_bigj,                                                           /* stencil */
+                        oneapi::dpl::make_zip_iterator(B_ext_diag_ii, B_ext_diag_bigj, B_ext_diag_data),   /* result  */
+                        pred1 );
+      hypre_assert( std::get<0>(new_end.base()) == B_ext_diag_ii + B_ext_diag_nnz );
+#else
       auto new_end = HYPRE_THRUST_CALL(
-         copy_if,
-         thrust::make_zip_iterator(thrust::make_tuple(B_ext_ii,      B_ext_bigj,      B_ext_data)),             /* first */
-         thrust::make_zip_iterator(thrust::make_tuple(B_ext_ii,      B_ext_bigj,      B_ext_data)) + B_ext_nnz, /* last */
-         B_ext_bigj,                                                                                            /* stencil */
-         thrust::make_zip_iterator(thrust::make_tuple(B_ext_diag_ii, B_ext_diag_bigj, B_ext_diag_data)),        /* result */
-         pred1 );
+                        copy_if,
+                        thrust::make_zip_iterator(thrust::make_tuple(B_ext_ii,      B_ext_bigj,
+                                                                     B_ext_data)),             /* first */
+                        thrust::make_zip_iterator(thrust::make_tuple(B_ext_ii,      B_ext_bigj,
+                                                                     B_ext_data)) + B_ext_nnz, /* last */
+                        B_ext_bigj,                                                            /* stencil */
+                        thrust::make_zip_iterator(thrust::make_tuple(B_ext_diag_ii, B_ext_diag_bigj,
+                                                                     B_ext_diag_data)),        /* result */
+                        pred1 );
 
       hypre_assert( thrust::get<0>(new_end.get_iterator_tuple()) == B_ext_diag_ii + B_ext_diag_nnz );
+#endif
    }
 
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_ONEDPL_CALL( std::transform,
+                      B_ext_diag_bigj,
+                      B_ext_diag_bigj + B_ext_diag_nnz,
+                      B_ext_diag_j,
+   [const_val = first_col_diag_B](const auto & x) {return x - const_val;} );
+#else
    HYPRE_THRUST_CALL( transform,
                       B_ext_diag_bigj,
                       B_ext_diag_bigj + B_ext_diag_nnz,
                       thrust::make_constant_iterator(first_col_diag_B),
                       B_ext_diag_j,
                       thrust::minus<HYPRE_BigInt>());
-
+#endif
    hypre_TFree(B_ext_diag_bigj, HYPRE_MEMORY_DEVICE);
 
    /* copy to offd */
@@ -427,138 +669,338 @@ hypre_CSRMatrixSplitDevice_core( HYPRE_Int         job,                 /* 0: qu
 
    if (B_ext_offd_xata)
    {
+#if defined(HYPRE_USING_SYCL)
+      auto first = oneapi::dpl::make_zip_iterator(B_ext_ii, B_ext_bigj, B_ext_data, B_ext_xata);
+      auto new_end = hypreSycl_copy_if(
+                        first,                                           /* first */
+                        first + B_ext_nnz,                               /* last */
+                        B_ext_bigj,                                      /* stencil */
+                        oneapi::dpl::make_zip_iterator(B_ext_offd_ii, B_ext_offd_bigj, B_ext_offd_data,
+                                                       B_ext_offd_xata), /* result */
+                        std::not_fn(pred1) );
+      hypre_assert( std::get<0>(new_end.base()) == B_ext_offd_ii + B_ext_offd_nnz );
+#else
       auto new_end = HYPRE_THRUST_CALL(
-         copy_if,
-         thrust::make_zip_iterator(thrust::make_tuple(B_ext_ii,      B_ext_bigj,      B_ext_data,   B_ext_xata)),             /* first */
-         thrust::make_zip_iterator(thrust::make_tuple(B_ext_ii,      B_ext_bigj,      B_ext_data,   B_ext_xata)) + B_ext_nnz, /* last */
-         B_ext_bigj,                                                                                                          /* stencil */
-         thrust::make_zip_iterator(thrust::make_tuple(B_ext_offd_ii, B_ext_offd_bigj, B_ext_offd_data, B_ext_offd_xata)),     /* result */
-         thrust::not1(pred1) );
+                        copy_if,
+                        thrust::make_zip_iterator(thrust::make_tuple(B_ext_ii,      B_ext_bigj,      B_ext_data,
+                                                                     B_ext_xata)),             /* first */
+                        thrust::make_zip_iterator(thrust::make_tuple(B_ext_ii,      B_ext_bigj,      B_ext_data,
+                                                                     B_ext_xata)) + B_ext_nnz, /* last */
+                        B_ext_bigj,                                                            /* stencil */
+                        thrust::make_zip_iterator(thrust::make_tuple(B_ext_offd_ii, B_ext_offd_bigj, B_ext_offd_data,
+                                                                     B_ext_offd_xata)),        /* result */
+                        HYPRE_THRUST_NOT(pred1) );
 
       hypre_assert( thrust::get<0>(new_end.get_iterator_tuple()) == B_ext_offd_ii + B_ext_offd_nnz );
+#endif
    }
    else
    {
+#if defined(HYPRE_USING_SYCL)
+      auto first = oneapi::dpl::make_zip_iterator(B_ext_ii, B_ext_bigj, B_ext_data);
+      auto new_end = hypreSycl_copy_if(
+                        first,                                                              /* first   */
+                        first + B_ext_nnz,                                                  /* last    */
+                        B_ext_bigj,                                                         /* stencil */
+                        oneapi::dpl::make_zip_iterator(B_ext_offd_ii, B_ext_offd_bigj, B_ext_offd_data), /* result  */
+                        std::not_fn(pred1) );
+      hypre_assert( std::get<0>(new_end.base()) == B_ext_offd_ii + B_ext_offd_nnz );
+#else
       auto new_end = HYPRE_THRUST_CALL(
-         copy_if,
-         thrust::make_zip_iterator(thrust::make_tuple(B_ext_ii,      B_ext_bigj,      B_ext_data)),             /* first */
-         thrust::make_zip_iterator(thrust::make_tuple(B_ext_ii,      B_ext_bigj,      B_ext_data)) + B_ext_nnz, /* last */
-         B_ext_bigj,                                                                                            /* stencil */
-         thrust::make_zip_iterator(thrust::make_tuple(B_ext_offd_ii, B_ext_offd_bigj, B_ext_offd_data)),        /* result */
-         thrust::not1(pred1) );
+                        copy_if,
+                        thrust::make_zip_iterator(thrust::make_tuple(B_ext_ii,      B_ext_bigj,
+                                                                     B_ext_data)),             /* first */
+                        thrust::make_zip_iterator(thrust::make_tuple(B_ext_ii,      B_ext_bigj,
+                                                                     B_ext_data)) + B_ext_nnz, /* last */
+                        B_ext_bigj,                                                            /* stencil */
+                        thrust::make_zip_iterator(thrust::make_tuple(B_ext_offd_ii, B_ext_offd_bigj,
+                                                                     B_ext_offd_data)),        /* result */
+                        HYPRE_THRUST_NOT(pred1) );
 
       hypre_assert( thrust::get<0>(new_end.get_iterator_tuple()) == B_ext_offd_ii + B_ext_offd_nnz );
+#endif
    }
 
-   /* offd map of B_ext_offd Union col_map_offd_B */
-   col_map_offd_C = hypre_TAlloc(HYPRE_BigInt, B_ext_offd_nnz + num_cols_offd_B, HYPRE_MEMORY_DEVICE);
-   hypre_TMemcpy(col_map_offd_C,                  B_ext_offd_bigj, HYPRE_BigInt, B_ext_offd_nnz,  HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
-   hypre_TMemcpy(col_map_offd_C + B_ext_offd_nnz, col_map_offd_B,  HYPRE_BigInt, num_cols_offd_B, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
-
-   HYPRE_THRUST_CALL( sort,
-                      col_map_offd_C,
-                      col_map_offd_C + B_ext_offd_nnz + num_cols_offd_B );
-
-   HYPRE_BigInt *new_end = HYPRE_THRUST_CALL( unique,
-                                              col_map_offd_C,
-                                              col_map_offd_C + B_ext_offd_nnz + num_cols_offd_B );
-
-   num_cols_offd_C = new_end - col_map_offd_C;
-
-#if 1
-   HYPRE_BigInt *tmp = hypre_TAlloc(HYPRE_BigInt, num_cols_offd_C, HYPRE_MEMORY_DEVICE);
-   hypre_TMemcpy(tmp, col_map_offd_C, HYPRE_BigInt, num_cols_offd_C, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
-   hypre_TFree(col_map_offd_C, HYPRE_MEMORY_DEVICE);
-   col_map_offd_C = tmp;
-#else
-   col_map_offd_C = hypre_TReAlloc_v2(col_map_offd_C, HYPRE_BigInt, B_ext_offd_nnz + num_cols_offd_B, HYPRE_Int, num_cols_offd_C, HYPRE_MEMORY_DEVICE);
-#endif
+   hypre_CSRMatrixMergeColMapOffd(num_cols_offd_B, col_map_offd_B, B_ext_offd_nnz, B_ext_offd_bigj,
+                                  &num_cols_offd_C, &col_map_offd_C, &map_B_to_C);
 
-   /* create map from col_map_offd_B */
-   if (num_cols_offd_B)
+#if defined(HYPRE_USING_SYCL)
+   if (num_cols_offd_C > 0 && B_ext_offd_nnz > 0)
    {
-      map_B_to_C = hypre_TAlloc(HYPRE_Int, num_cols_offd_B, HYPRE_MEMORY_DEVICE);
-      HYPRE_THRUST_CALL( lower_bound,
+      HYPRE_ONEDPL_CALL( oneapi::dpl::lower_bound,
                          col_map_offd_C,
                          col_map_offd_C + num_cols_offd_C,
-                         col_map_offd_B,
-                         col_map_offd_B + num_cols_offd_B,
-                         map_B_to_C );
+                         B_ext_offd_bigj,
+                         B_ext_offd_bigj + B_ext_offd_nnz,
+                         B_ext_offd_j );
    }
-
+#else
    HYPRE_THRUST_CALL( lower_bound,
                       col_map_offd_C,
                       col_map_offd_C + num_cols_offd_C,
                       B_ext_offd_bigj,
                       B_ext_offd_bigj + B_ext_offd_nnz,
                       B_ext_offd_j );
+#endif
 
    hypre_TFree(B_ext_offd_bigj, HYPRE_MEMORY_DEVICE);
 
-   if (map_B_to_C_ptr)
-   {
-      *map_B_to_C_ptr   = map_B_to_C;
-   }
+   *map_B_to_C_ptr = map_B_to_C;
    *num_cols_offd_C_ptr = num_cols_offd_C;
    *col_map_offd_C_ptr  = col_map_offd_C;
 
+   hypre_GpuProfilingPopRange();
+
    return hypre_error_flag;
 }
 
 /*--------------------------------------------------------------------------
- * hypre_CSRMatrixAddPartial:
- * adds matrix rows in the CSR matrix B to the CSR Matrix A, where row_nums[i]
- * defines to which row of A the i-th row of B is added, and returns a CSR Matrix C;
- * Repeated row indices are allowed in row_nums
- * Note: The routine does not check for 0-elements which might be generated
- *       through cancellation of elements in A and B or already contained
- *       in A and B. To remove those, use hypre_CSRMatrixDeleteZeros
+ * hypre_CSRMatrixCompressColumnsDevice
  *--------------------------------------------------------------------------*/
 
-hypre_CSRMatrix*
-hypre_CSRMatrixAddPartialDevice( hypre_CSRMatrix *A,
-                                 hypre_CSRMatrix *B,
-                                 HYPRE_Int       *row_nums)
+HYPRE_Int
+hypre_CSRMatrixCompressColumnsDevice(hypre_CSRMatrix  *A,
+                                     HYPRE_BigInt     *col_map,
+                                     HYPRE_Int       **col_idx_new_ptr,
+                                     HYPRE_BigInt    **col_map_new_ptr)
 {
-   HYPRE_Complex    *A_data   = hypre_CSRMatrixData(A);
-   HYPRE_Int        *A_i      = hypre_CSRMatrixI(A);
-   HYPRE_Int        *A_j      = hypre_CSRMatrixJ(A);
-   HYPRE_Int         nrows_A  = hypre_CSRMatrixNumRows(A);
-   HYPRE_Int         ncols_A  = hypre_CSRMatrixNumCols(A);
-   HYPRE_Int         nnz_A    = hypre_CSRMatrixNumNonzeros(A);
-   HYPRE_Complex    *B_data   = hypre_CSRMatrixData(B);
-   HYPRE_Int        *B_i      = hypre_CSRMatrixI(B);
-   HYPRE_Int        *B_j      = hypre_CSRMatrixJ(B);
-   HYPRE_Int         nrows_B  = hypre_CSRMatrixNumRows(B);
-   HYPRE_Int         ncols_B  = hypre_CSRMatrixNumCols(B);
-   HYPRE_Int         nnz_B    = hypre_CSRMatrixNumNonzeros(B);
-   HYPRE_Complex    *C_data;
-   HYPRE_Int        *C_i;
-   HYPRE_Int        *C_j;
-   HYPRE_Int         nnzC;
-   hypre_CSRMatrix  *C;
+   HYPRE_Int  num_cols = hypre_CSRMatrixNumCols(A);
+   HYPRE_Int  nnz      = hypre_CSRMatrixNumNonzeros(A);
+   HYPRE_Int *A_j      = hypre_CSRMatrixJ(A);
+   HYPRE_Int *tmp_j    = hypre_TAlloc(HYPRE_Int, nnz, HYPRE_MEMORY_DEVICE);
+   HYPRE_Int *tmp_end;
+   HYPRE_Int  num_cols_new;
+
+   hypre_TMemcpy(tmp_j, A_j, HYPRE_Int, nnz, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_ONEDPL_CALL(std::sort, tmp_j, tmp_j + nnz);
+   tmp_end = HYPRE_ONEDPL_CALL(std::unique, tmp_j, tmp_j + nnz);
+#else
+   HYPRE_THRUST_CALL(sort, tmp_j, tmp_j + nnz);
+   tmp_end = HYPRE_THRUST_CALL(unique, tmp_j, tmp_j + nnz);
+#endif
+   num_cols_new = tmp_end - tmp_j;
 
-   if (ncols_A != ncols_B)
+   hypre_assert(num_cols_new <= num_cols);
+
+   if (num_cols_new < num_cols)
    {
-      hypre_error_w_msg(HYPRE_ERROR_GENERIC,"Warning! incompatible matrix dimensions!\n");
+      HYPRE_Int    *offd_mark = NULL;
+      HYPRE_BigInt *col_map_new;
 
-      return NULL;
-   }
+      if (num_cols_new)
+      {
+         offd_mark = hypre_TAlloc(HYPRE_Int, num_cols, HYPRE_MEMORY_DEVICE);
+      }
 
-   hypreDevice_CSRSpAdd(nrows_A, nrows_B, ncols_A, nnz_A, nnz_B, A_i, A_j, 1.0, A_data, NULL, B_i, B_j, 1.0, B_data, NULL, row_nums,
-                        &nnzC, &C_i, &C_j, &C_data);
+      if (col_map_new_ptr)
+      {
+         col_map_new = hypre_TAlloc(HYPRE_BigInt, num_cols_new, HYPRE_MEMORY_DEVICE);
+      }
 
-   C = hypre_CSRMatrixCreate(nrows_A, ncols_B, nnzC);
+#if defined(HYPRE_USING_SYCL)
+      oneapi::dpl::counting_iterator count(0);
+      hypreSycl_scatter( count,
+                         count + num_cols_new,
+                         tmp_j,
+                         offd_mark );
+
+      hypreSycl_gather(A_j, A_j + nnz, offd_mark, A_j);
+
+      if (col_map_new_ptr)
+      {
+         hypreSycl_gather(tmp_j, tmp_j + num_cols_new, col_map, col_map_new);
+      }
+#else
+      HYPRE_THRUST_CALL( scatter,
+                         thrust::counting_iterator<HYPRE_Int>(0),
+                         thrust::counting_iterator<HYPRE_Int>(num_cols_new),
+                         tmp_j,
+                         offd_mark );
+
+      HYPRE_THRUST_CALL(gather, A_j, A_j + nnz, offd_mark, A_j);
+
+      if (col_map_new_ptr)
+      {
+         HYPRE_THRUST_CALL(gather, tmp_j, tmp_j + num_cols_new, col_map, col_map_new);
+      }
+#endif
+
+      hypre_TFree(offd_mark, HYPRE_MEMORY_DEVICE);
+
+      hypre_CSRMatrixNumCols(A) = num_cols_new;
+
+      if (col_idx_new_ptr)
+      {
+         *col_idx_new_ptr = tmp_j;
+      }
+      else
+      {
+         hypre_TFree(tmp_j, HYPRE_MEMORY_DEVICE);
+      }
+
+      if (col_map_new_ptr)
+      {
+         *col_map_new_ptr = col_map_new;
+      }
+   }
+   else
+   {
+      if (col_idx_new_ptr)
+      {
+         *col_idx_new_ptr = NULL;
+      }
+
+      if (col_map_new_ptr)
+      {
+         *col_map_new_ptr = NULL;
+      }
+
+      hypre_TFree(tmp_j, HYPRE_MEMORY_DEVICE);
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixTriLowerUpperSolveDevice_core
+ *
+ * TODO (VPM): The analysis portion (setup phase) of the triangular solve
+ *             is embedded into the vendor libraries wrappers.
+ *             Should we create a separate function "Setup" function?
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_CSRMatrixTriLowerUpperSolveDevice_core(char             uplo,
+                                             HYPRE_Int        unit_diag,
+                                             hypre_CSRMatrix *A,
+                                             HYPRE_Real      *l1_norms,
+                                             hypre_Vector    *f,
+                                             HYPRE_Int        offset_f,
+                                             hypre_Vector    *u,
+                                             HYPRE_Int        offset_u)
+{
+   /* Trivial case: no rows */
+   if (hypre_CSRMatrixNumRows(A) <= 0)
+   {
+      return hypre_error_flag;
+   }
+
+   /* Trivial case: empty rows */
+   if (hypre_CSRMatrixNumNonzeros(A) <= 0)
+   {
+      return hypre_error_flag;
+   }
+
+   /* Sanity check */
+   if (hypre_CSRMatrixNumRows(A) != hypre_CSRMatrixNumCols(A))
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                        "Triangular matrix solver works only for square matrices!");
+      return hypre_error_flag;
+   }
+
+   /* Call vendor specific implementations */
+#if defined(HYPRE_USING_CUSPARSE)
+   hypre_CSRMatrixTriLowerUpperSolveCusparse(uplo, unit_diag, A,
+                                             l1_norms,
+                                             hypre_VectorData(f) + offset_f,
+                                             hypre_VectorData(u) + offset_u);
+#elif defined(HYPRE_USING_ROCSPARSE)
+   hypre_CSRMatrixTriLowerUpperSolveRocsparse(uplo, unit_diag, A,
+                                              l1_norms,
+                                              hypre_VectorData(f) + offset_f,
+                                              hypre_VectorData(u) + offset_u);
+#elif defined(HYPRE_USING_ONEMKLSPARSE)
+   hypre_CSRMatrixTriLowerUpperSolveOnemklsparse(uplo, unit_diag, A,
+                                                 l1_norms,
+                                                 hypre_VectorData(f) + offset_f,
+                                                 hypre_VectorData(u) + offset_u);
+#else
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                     "hypre_CSRMatrixTriLowerUpperSolveDevice requires configuration with either cuSPARSE or rocSPARSE\n");
+#endif
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixTriLowerUpperSolveDevice
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_CSRMatrixTriLowerUpperSolveDevice(char             uplo,
+                                        HYPRE_Int        unit_diag,
+                                        hypre_CSRMatrix *A,
+                                        HYPRE_Real      *l1_norms,
+                                        hypre_Vector    *f,
+                                        hypre_Vector    *u )
+{
+   return hypre_CSRMatrixTriLowerUpperSolveDevice_core(uplo, unit_diag, A, l1_norms, f, 0, u, 0);
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixAddPartial
+ *
+ * Adds matrix rows in the CSR matrix B to the CSR Matrix A, where row_nums[i]
+ * defines to which row of A the i-th row of B is added, and returns a CSR
+ * Matrix C. Repeated row indices are allowed in row_nums
+ *
+ * Note: The routine does not check for 0-elements which might be generated
+ *       through cancellation of elements in A and B or already contained
+ *       in A and B. To remove those, use hypre_CSRMatrixDeleteZeros
+ *--------------------------------------------------------------------------*/
+
+hypre_CSRMatrix*
+hypre_CSRMatrixAddPartialDevice( hypre_CSRMatrix *A,
+                                 hypre_CSRMatrix *B,
+                                 HYPRE_Int       *row_nums)
+{
+   HYPRE_Complex    *A_data   = hypre_CSRMatrixData(A);
+   HYPRE_Int        *A_i      = hypre_CSRMatrixI(A);
+   HYPRE_Int        *A_j      = hypre_CSRMatrixJ(A);
+   HYPRE_Int         nrows_A  = hypre_CSRMatrixNumRows(A);
+   HYPRE_Int         ncols_A  = hypre_CSRMatrixNumCols(A);
+   HYPRE_Int         nnz_A    = hypre_CSRMatrixNumNonzeros(A);
+   HYPRE_Complex    *B_data   = hypre_CSRMatrixData(B);
+   HYPRE_Int        *B_i      = hypre_CSRMatrixI(B);
+   HYPRE_Int        *B_j      = hypre_CSRMatrixJ(B);
+   HYPRE_Int         nrows_B  = hypre_CSRMatrixNumRows(B);
+   HYPRE_Int         ncols_B  = hypre_CSRMatrixNumCols(B);
+   HYPRE_Int         nnz_B    = hypre_CSRMatrixNumNonzeros(B);
+   HYPRE_Complex    *C_data;
+   HYPRE_Int        *C_i;
+   HYPRE_Int        *C_j;
+   HYPRE_Int         nnzC;
+   hypre_CSRMatrix  *C;
+
+   if (ncols_A != ncols_B)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Warning! incompatible matrix dimensions!\n");
+
+      return NULL;
+   }
+
+   hypreDevice_CSRSpAdd(nrows_A, nrows_B, nnz_A, nnz_B,
+                        A_i, A_j, 1.0, A_data, NULL, B_i, B_j,
+                        1.0, B_data, NULL, row_nums,
+                        &nnzC, &C_i, &C_j, &C_data);
+
+   C = hypre_CSRMatrixCreate(nrows_A, ncols_B, nnzC);
    hypre_CSRMatrixI(C) = C_i;
    hypre_CSRMatrixJ(C) = C_j;
    hypre_CSRMatrixData(C) = C_data;
    hypre_CSRMatrixMemoryLocation(C) = HYPRE_MEMORY_DEVICE;
 
-   hypre_SyncCudaComputeStream(hypre_handle());
+   hypre_SyncComputeStream();
 
    return C;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixColNNzRealDevice
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_CSRMatrixColNNzRealDevice( hypre_CSRMatrix  *A,
                                  HYPRE_Real       *colnnz)
@@ -573,58 +1015,86 @@ hypre_CSRMatrixColNNzRealDevice( hypre_CSRMatrix  *A,
 
    A_j_sorted = hypre_TAlloc(HYPRE_Int, nnz_A, HYPRE_MEMORY_DEVICE);
    hypre_TMemcpy(A_j_sorted, A_j, HYPRE_Int, nnz_A, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_ONEDPL_CALL(std::sort, A_j_sorted, A_j_sorted + nnz_A);
+#else
    HYPRE_THRUST_CALL(sort, A_j_sorted, A_j_sorted + nnz_A);
+#endif
 
    reduced_col_indices = hypre_TAlloc(HYPRE_Int, ncols_A, HYPRE_MEMORY_DEVICE);
    reduced_col_nnz     = hypre_TAlloc(HYPRE_Int, ncols_A, HYPRE_MEMORY_DEVICE);
 
-   thrust::pair<HYPRE_Int*, HYPRE_Int*> new_end =
-   HYPRE_THRUST_CALL(reduce_by_key, A_j_sorted, A_j_sorted + nnz_A,
-                     thrust::make_constant_iterator(1),
-                     reduced_col_indices,
-                     reduced_col_nnz);
+#if defined(HYPRE_USING_SYCL)
+   auto new_end = HYPRE_ONEDPL_CALL( oneapi::dpl::reduce_by_segment,
+                                     A_j_sorted,
+                                     A_j_sorted + nnz_A,
+                                     dpct::constant_iterator(1),
+                                     reduced_col_indices,
+                                     reduced_col_nnz);
 
    hypre_assert(new_end.first - reduced_col_indices == new_end.second - reduced_col_nnz);
-
    num_reduced_col_indices = new_end.first - reduced_col_indices;
+#else
+   thrust::pair<HYPRE_Int*, HYPRE_Int*> new_end =
+      HYPRE_THRUST_CALL(reduce_by_key, A_j_sorted, A_j_sorted + nnz_A,
+                        thrust::make_constant_iterator(1),
+                        reduced_col_indices,
+                        reduced_col_nnz);
+   hypre_assert(new_end.first - reduced_col_indices == new_end.second - reduced_col_nnz);
+   num_reduced_col_indices = new_end.first - reduced_col_indices;
+#endif
+
 
    hypre_Memset(colnnz, 0, ncols_A * sizeof(HYPRE_Real), HYPRE_MEMORY_DEVICE);
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_ONEDPL_CALL( std::copy, reduced_col_nnz, reduced_col_nnz + num_reduced_col_indices,
+                      oneapi::dpl::make_permutation_iterator(colnnz, reduced_col_indices) );
+#else
    HYPRE_THRUST_CALL(scatter, reduced_col_nnz, reduced_col_nnz + num_reduced_col_indices,
                      reduced_col_indices, colnnz);
+#endif
 
    hypre_TFree(A_j_sorted,          HYPRE_MEMORY_DEVICE);
    hypre_TFree(reduced_col_indices, HYPRE_MEMORY_DEVICE);
    hypre_TFree(reduced_col_nnz,     HYPRE_MEMORY_DEVICE);
 
-   hypre_SyncCudaComputeStream(hypre_handle());
+   hypre_SyncComputeStream();
 
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ * hypreGPUKernel_CSRMoveDiagFirst
+ *--------------------------------------------------------------------------*/
+
 __global__ void
-hypreCUDAKernel_CSRMoveDiagFirst( HYPRE_Int      nrows,
-                                  HYPRE_Int     *ia,
-                                  HYPRE_Int     *ja,
-                                  HYPRE_Complex *aa )
+hypreGPUKernel_CSRMoveDiagFirst( hypre_DeviceItem    &item,
+                                 HYPRE_Int      nrows,
+                                 HYPRE_Int     *ia,
+                                 HYPRE_Int     *ja,
+                                 HYPRE_Complex *aa )
 {
-   HYPRE_Int row = hypre_cuda_get_grid_warp_id<1,1>();
+   HYPRE_Int row  = hypre_gpu_get_grid_warp_id<1, 1>(item);
+   HYPRE_Int lane = hypre_gpu_get_lane_id<1>(item);
 
    if (row >= nrows)
    {
       return;
    }
 
-   HYPRE_Int lane = hypre_cuda_get_lane_id<1>();
    HYPRE_Int p = 0, q = 0;
 
    if (lane < 2)
    {
       p = read_only_load(ia + row + lane);
    }
-   q = __shfl_sync(HYPRE_WARP_FULL_MASK, p, 1);
-   p = __shfl_sync(HYPRE_WARP_FULL_MASK, p, 0);
 
-   for (HYPRE_Int j = p + lane + 1; __any_sync(HYPRE_WARP_FULL_MASK, j < q); j += HYPRE_WARP_SIZE)
+   q = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 1);
+   p = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 0);
+
+   for (HYPRE_Int j = p + lane + 1; warp_any_sync(item, HYPRE_WARP_FULL_MASK, j < q);
+        j += HYPRE_WARP_SIZE)
    {
       hypre_int find_diag = j < q && ja[j] == row;
 
@@ -637,13 +1107,17 @@ hypreCUDAKernel_CSRMoveDiagFirst( HYPRE_Int      nrows,
          aa[j] = tmp;
       }
 
-      if ( __any_sync(HYPRE_WARP_FULL_MASK, find_diag) )
+      if ( warp_any_sync(item, HYPRE_WARP_FULL_MASK, find_diag) )
       {
          break;
       }
    }
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixMoveDiagFirstDevice
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_CSRMatrixMoveDiagFirstDevice( hypre_CSRMatrix  *A )
 {
@@ -651,178 +1125,637 @@ hypre_CSRMatrixMoveDiagFirstDevice( hypre_CSRMatrix  *A )
    HYPRE_Complex *A_data = hypre_CSRMatrixData(A);
    HYPRE_Int     *A_i    = hypre_CSRMatrixI(A);
    HYPRE_Int     *A_j    = hypre_CSRMatrixJ(A);
-   dim3           bDim, gDim;
 
-   bDim = hypre_GetDefaultCUDABlockDimension();
-   gDim = hypre_GetDefaultCUDAGridDimension(nrows, "warp", bDim);
+   dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+   dim3 gDim = hypre_GetDefaultDeviceGridDimension(nrows, "warp", bDim);
 
-   HYPRE_CUDA_LAUNCH(hypreCUDAKernel_CSRMoveDiagFirst, gDim, bDim,
-                     nrows, A_i, A_j, A_data);
+   HYPRE_GPU_LAUNCH(hypreGPUKernel_CSRMoveDiagFirst, gDim, bDim,
+                    nrows, A_i, A_j, A_data);
 
-   hypre_SyncCudaComputeStream(hypre_handle());
+   hypre_SyncComputeStream();
 
    return hypre_error_flag;
 }
 
-/* check if diagonal entry is the first one at each row
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixStack2Device
+ *
+ * return C = [A; B]
+ *--------------------------------------------------------------------------*/
+
+hypre_CSRMatrix*
+hypre_CSRMatrixStack2Device(hypre_CSRMatrix *A, hypre_CSRMatrix *B)
+{
+   hypre_GpuProfilingPushRange("CSRMatrixStack2");
+
+   hypre_assert( hypre_CSRMatrixNumCols(A) == hypre_CSRMatrixNumCols(B) );
+
+   hypre_CSRMatrix *C = hypre_CSRMatrixCreate( hypre_CSRMatrixNumRows(A) + hypre_CSRMatrixNumRows(B),
+                                               hypre_CSRMatrixNumCols(A),
+                                               hypre_CSRMatrixNumNonzeros(A) + hypre_CSRMatrixNumNonzeros(B) );
+
+   HYPRE_Int     *C_i = hypre_TAlloc(HYPRE_Int,     hypre_CSRMatrixNumRows(C) + 1,
+                                     HYPRE_MEMORY_DEVICE);
+   HYPRE_Int     *C_j = hypre_TAlloc(HYPRE_Int,     hypre_CSRMatrixNumNonzeros(C),
+                                     HYPRE_MEMORY_DEVICE);
+   HYPRE_Complex *C_a = hypre_TAlloc(HYPRE_Complex, hypre_CSRMatrixNumNonzeros(C),
+                                     HYPRE_MEMORY_DEVICE);
+
+   hypre_TMemcpy(C_i, hypre_CSRMatrixI(A), HYPRE_Int, hypre_CSRMatrixNumRows(A) + 1,
+                 HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+   hypre_TMemcpy(C_i + hypre_CSRMatrixNumRows(A) + 1, hypre_CSRMatrixI(B) + 1, HYPRE_Int,
+                 hypre_CSRMatrixNumRows(B),
+                 HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_ONEDPL_CALL( std::transform,
+                      C_i + hypre_CSRMatrixNumRows(A) + 1,
+                      C_i + hypre_CSRMatrixNumRows(C) + 1,
+                      C_i + hypre_CSRMatrixNumRows(A) + 1,
+   [const_val = hypre_CSRMatrixNumNonzeros(A)] (const auto & x) {return x + const_val;} );
+#else
+   HYPRE_THRUST_CALL( transform,
+                      C_i + hypre_CSRMatrixNumRows(A) + 1,
+                      C_i + hypre_CSRMatrixNumRows(C) + 1,
+                      thrust::make_constant_iterator(hypre_CSRMatrixNumNonzeros(A)),
+                      C_i + hypre_CSRMatrixNumRows(A) + 1,
+                      thrust::plus<HYPRE_Int>() );
+#endif
+
+   hypre_TMemcpy(C_j, hypre_CSRMatrixJ(A), HYPRE_Int, hypre_CSRMatrixNumNonzeros(A),
+                 HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+   hypre_TMemcpy(C_j + hypre_CSRMatrixNumNonzeros(A), hypre_CSRMatrixJ(B), HYPRE_Int,
+                 hypre_CSRMatrixNumNonzeros(B),
+                 HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+
+   hypre_TMemcpy(C_a, hypre_CSRMatrixData(A), HYPRE_Complex, hypre_CSRMatrixNumNonzeros(A),
+                 HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+   hypre_TMemcpy(C_a + hypre_CSRMatrixNumNonzeros(A), hypre_CSRMatrixData(B), HYPRE_Complex,
+                 hypre_CSRMatrixNumNonzeros(B),
+                 HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+
+   hypre_CSRMatrixI(C) = C_i;
+   hypre_CSRMatrixJ(C) = C_j;
+   hypre_CSRMatrixData(C) = C_a;
+   hypre_CSRMatrixMemoryLocation(C) = HYPRE_MEMORY_DEVICE;
+
+   hypre_GpuProfilingPopRange();
+
+   return C;
+}
+
+/*--------------------------------------------------------------------------
+ * hypreGPUKernel_CSRRowSum
+ *
+ * type == 0, sum,
+ *         1, abs sum (l-1)
+ *         2, square sum (l-2)
+ *--------------------------------------------------------------------------*/
+
+template<HYPRE_Int type>
+__global__ void
+hypreGPUKernel_CSRRowSum( hypre_DeviceItem    &item,
+                          HYPRE_Int      nrows,
+                          HYPRE_Int     *ia,
+                          HYPRE_Int     *ja,
+                          HYPRE_Complex *aa,
+                          HYPRE_Int     *CF_i,
+                          HYPRE_Int     *CF_j,
+                          HYPRE_Complex *row_sum,
+                          HYPRE_Complex  scal,
+                          HYPRE_Int      set)
+{
+   HYPRE_Int row_i = hypre_gpu_get_grid_warp_id<1, 1>(item);
+
+   if (row_i >= nrows)
+   {
+      return;
+   }
+
+   HYPRE_Int lane = hypre_gpu_get_lane_id<1>(item);
+   HYPRE_Int p = 0, q = 0;
+
+   if (lane < 2)
+   {
+      p = read_only_load(ia + row_i + lane);
+   }
+   q = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 1);
+   p = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 0);
+
+   HYPRE_Complex row_sum_i = 0.0;
+
+   for (HYPRE_Int j = p + lane; j < q; j += HYPRE_WARP_SIZE)
+   {
+      if ( CF_i && CF_j && read_only_load(&CF_i[row_i]) != read_only_load(&CF_j[ja[j]]) )
+      {
+         continue;
+      }
+
+      HYPRE_Complex aii = aa[j];
+
+      if (type == 0)
+      {
+         row_sum_i += aii;
+      }
+      else if (type == 1)
+      {
+         row_sum_i += hypre_abs(aii);
+      }
+      else if (type == 2)
+      {
+         row_sum_i += aii * aii;
+      }
+   }
+
+   row_sum_i = warp_reduce_sum(item, row_sum_i);
+
+   if (lane == 0)
+   {
+      if (set)
+      {
+         row_sum[row_i] = scal * row_sum_i;
+      }
+      else
+      {
+         row_sum[row_i] += scal * row_sum_i;
+      }
+   }
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixComputeRowSumDevice
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_CSRMatrixComputeRowSumDevice( hypre_CSRMatrix *A,
+                                    HYPRE_Int       *CF_i,
+                                    HYPRE_Int       *CF_j,
+                                    HYPRE_Complex   *row_sum,
+                                    HYPRE_Int        type,
+                                    HYPRE_Complex    scal,
+                                    const char      *set_or_add)
+{
+   HYPRE_Int      nrows  = hypre_CSRMatrixNumRows(A);
+   HYPRE_Complex *A_data = hypre_CSRMatrixData(A);
+   HYPRE_Int     *A_i    = hypre_CSRMatrixI(A);
+   HYPRE_Int     *A_j    = hypre_CSRMatrixJ(A);
+
+   dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+   dim3 gDim = hypre_GetDefaultDeviceGridDimension(nrows, "warp", bDim);
+
+   HYPRE_Int set = set_or_add[0] == 's';
+   if (type == 0)
+   {
+      HYPRE_GPU_LAUNCH( hypreGPUKernel_CSRRowSum<0>, gDim, bDim,
+                        nrows, A_i, A_j, A_data,
+                        CF_i, CF_j, row_sum, scal, set );
+   }
+   else if (type == 1)
+   {
+      HYPRE_GPU_LAUNCH( hypreGPUKernel_CSRRowSum<1>, gDim, bDim,
+                        nrows, A_i, A_j, A_data,
+                        CF_i, CF_j, row_sum, scal, set );
+   }
+   else if (type == 2)
+   {
+      HYPRE_GPU_LAUNCH( hypreGPUKernel_CSRRowSum<2>, gDim, bDim,
+                        nrows, A_i, A_j, A_data, CF_i, CF_j,
+                        row_sum, scal, set );
+   }
+
+   hypre_SyncComputeStream();
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypreGPUKernel_CSRMatrixIntersectPattern
+ *
+ * mark is of size nA
+ * diag_option: 1: special treatment for diag entries, mark as -2
+ *--------------------------------------------------------------------------*/
+
+__global__ void
+hypreGPUKernel_CSRMatrixIntersectPattern(hypre_DeviceItem &item,
+                                         HYPRE_Int  n,
+                                         HYPRE_Int  nA,
+                                         HYPRE_Int *rowid,
+                                         HYPRE_Int *colid,
+                                         HYPRE_Int *idx,
+                                         HYPRE_Int *mark,
+                                         HYPRE_Int  diag_option)
+{
+   HYPRE_Int i = hypre_gpu_get_grid_thread_id<1, 1>(item);
+
+   if (i >= n)
+   {
+      return;
+   }
+
+   HYPRE_Int r1 = read_only_load(&rowid[i]);
+   HYPRE_Int c1 = read_only_load(&colid[i]);
+   HYPRE_Int j = read_only_load(&idx[i]);
+
+   if (0 == diag_option)
+   {
+      if (j < nA)
+      {
+         HYPRE_Int r2 = i < n - 1 ? read_only_load(&rowid[i + 1]) : -1;
+         HYPRE_Int c2 = i < n - 1 ? read_only_load(&colid[i + 1]) : -1;
+         if (r1 == r2 && c1 == c2)
+         {
+            mark[j] = c1;
+         }
+         else
+         {
+            mark[j] = -1;
+         }
+      }
+   }
+   else if (1 == diag_option)
+   {
+      if (j < nA)
+      {
+         if (r1 == c1)
+         {
+            mark[j] = -2;
+         }
+         else
+         {
+            HYPRE_Int r2 = i < n - 1 ? read_only_load(&rowid[i + 1]) : -1;
+            HYPRE_Int c2 = i < n - 1 ? read_only_load(&colid[i + 1]) : -1;
+            if (r1 == r2 && c1 == c2)
+            {
+               mark[j] = c1;
+            }
+            else
+            {
+               mark[j] = -1;
+            }
+         }
+      }
+   }
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixIntersectPattern
+ *
+ * markA: array of size nnz(A), for pattern of (A and B), markA is the
+ * column indices as in A_J. Otherwise, mark pattern not in A-B as -1 in markA
+ *
+ * Note the special treatment for diagonal entries of A (marked as -2)
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_CSRMatrixIntersectPattern(hypre_CSRMatrix *A,
+                                hypre_CSRMatrix *B,
+                                HYPRE_Int       *markA,
+                                HYPRE_Int        diag_opt)
+{
+   HYPRE_Int nrows = hypre_CSRMatrixNumRows(A);
+   HYPRE_Int nnzA  = hypre_CSRMatrixNumNonzeros(A);
+   HYPRE_Int nnzB  = hypre_CSRMatrixNumNonzeros(B);
+
+   HYPRE_Int *Cii = hypre_TAlloc(HYPRE_Int, nnzA + nnzB, HYPRE_MEMORY_DEVICE);
+   HYPRE_Int *Cjj = hypre_TAlloc(HYPRE_Int, nnzA + nnzB, HYPRE_MEMORY_DEVICE);
+   HYPRE_Int *idx = hypre_TAlloc(HYPRE_Int, nnzA + nnzB, HYPRE_MEMORY_DEVICE);
+
+   hypreDevice_CsrRowPtrsToIndices_v2(nrows, nnzA, hypre_CSRMatrixI(A), Cii);
+   hypreDevice_CsrRowPtrsToIndices_v2(nrows, nnzB, hypre_CSRMatrixI(B), Cii + nnzA);
+   hypre_TMemcpy(Cjj,        hypre_CSRMatrixJ(A), HYPRE_Int, nnzA, HYPRE_MEMORY_DEVICE,
+                 HYPRE_MEMORY_DEVICE);
+   hypre_TMemcpy(Cjj + nnzA, hypre_CSRMatrixJ(B), HYPRE_Int, nnzB, HYPRE_MEMORY_DEVICE,
+                 HYPRE_MEMORY_DEVICE);
+
+#if defined(HYPRE_USING_SYCL)
+   hypreSycl_sequence(idx, idx + nnzA + nnzB, 0);
+
+   auto zipped_begin = oneapi::dpl::make_zip_iterator(Cii, Cjj, idx);
+   HYPRE_ONEDPL_CALL( std::stable_sort, zipped_begin, zipped_begin + nnzA + nnzB,
+                      [](auto lhs, auto rhs)
+   {
+      if (std::get<0>(lhs) == std::get<0>(rhs))
+      {
+         return std::get<1>(lhs) < std::get<1>(rhs);
+      }
+      else
+      {
+         return std::get<0>(lhs) < std::get<0>(rhs);
+      }
+   } );
+#else
+   HYPRE_THRUST_CALL( sequence, idx, idx + nnzA + nnzB );
+
+   HYPRE_THRUST_CALL( stable_sort_by_key,
+                      thrust::make_zip_iterator(thrust::make_tuple(Cii, Cjj)),
+                      thrust::make_zip_iterator(thrust::make_tuple(Cii, Cjj)) + nnzA + nnzB,
+                      idx );
+#endif
+
+   hypre_TMemcpy(markA, hypre_CSRMatrixJ(A), HYPRE_Int, nnzA, HYPRE_MEMORY_DEVICE,
+                 HYPRE_MEMORY_DEVICE);
+
+   dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+   dim3 gDim = hypre_GetDefaultDeviceGridDimension(nnzA + nnzB, "thread", bDim);
+
+   HYPRE_GPU_LAUNCH( hypreGPUKernel_CSRMatrixIntersectPattern, gDim, bDim,
+                     nnzA + nnzB, nnzA, Cii, Cjj, idx, markA, diag_opt );
+
+   hypre_TFree(Cii, HYPRE_MEMORY_DEVICE);
+   hypre_TFree(Cjj, HYPRE_MEMORY_DEVICE);
+   hypre_TFree(idx, HYPRE_MEMORY_DEVICE);
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypreGPUKernel_CSRExtractDiag
+ *
+ * type 0: diag
+ *      1: abs diag
+ *      2: diag inverse
+ *      3: diag inverse sqrt
+ *      4: abs diag inverse sqrt
+ *--------------------------------------------------------------------------*/
+
+__global__ void
+hypreGPUKernel_CSRExtractDiag( hypre_DeviceItem    &item,
+                               HYPRE_Int      nrows,
+                               HYPRE_Int     *ia,
+                               HYPRE_Int     *ja,
+                               HYPRE_Complex *aa,
+                               HYPRE_Complex *d,
+                               HYPRE_Int      type)
+{
+   HYPRE_Int row = hypre_gpu_get_grid_warp_id<1, 1>(item);
+
+   if (row >= nrows)
+   {
+      return;
+   }
+
+   HYPRE_Int lane = hypre_gpu_get_lane_id<1>(item);
+   HYPRE_Int p = 0, q = 0;
+
+   if (lane < 2)
+   {
+      p = read_only_load(ia + row + lane);
+   }
+   q = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 1);
+   p = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 0);
+
+   HYPRE_Int has_diag = 0;
+
+   for (HYPRE_Int j = p + lane;
+        warp_any_sync(item, HYPRE_WARP_FULL_MASK, j < q);
+        j += HYPRE_WARP_SIZE)
+   {
+      hypre_int find_diag = j < q && ja[j] == row;
+
+      if (find_diag)
+      {
+         if (type == 0)
+         {
+            d[row] = aa[j];
+         }
+         else if (type == 1)
+         {
+            d[row] = hypre_abs(aa[j]);
+         }
+         else
+         {
+            if (aa[j] == 0.0)
+            {
+               d[row] = 0.0;
+            }
+            else if (type == 2)
+            {
+               d[row] = 1.0 / aa[j];
+            }
+            else if (type == 3)
+            {
+               d[row] = 1.0 / hypre_sqrt(aa[j]);
+            }
+            else if (type == 4)
+            {
+               d[row] = 1.0 / hypre_sqrt(hypre_abs(aa[j]));
+            }
+         }
+      }
+
+      if (warp_any_sync(item, HYPRE_WARP_FULL_MASK, find_diag))
+      {
+         has_diag = 1;
+         break;
+      }
+   }
+
+   if (!has_diag && lane == 0)
+   {
+      d[row] = 0.0;
+   }
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixExtractDiagonalDevice
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_CSRMatrixExtractDiagonalDevice( hypre_CSRMatrix *A,
+                                      HYPRE_Complex   *d,
+                                      HYPRE_Int        type)
+{
+   HYPRE_Int      nrows  = hypre_CSRMatrixNumRows(A);
+   HYPRE_Complex *A_data = hypre_CSRMatrixData(A);
+   HYPRE_Int     *A_i    = hypre_CSRMatrixI(A);
+   HYPRE_Int     *A_j    = hypre_CSRMatrixJ(A);
+
+   dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+   dim3 gDim = hypre_GetDefaultDeviceGridDimension(nrows, "warp", bDim);
+
+   HYPRE_GPU_LAUNCH( hypreGPUKernel_CSRExtractDiag, gDim, bDim, nrows,
+                     A_i, A_j, A_data, d, type );
+
+   hypre_SyncComputeStream();
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypreGPUKernel_CSRCheckDiagFirst
+ *
+ * check if diagonal entry is the first one at each row
  * Return: the number of rows that do not have the first entry as diagonal
  * RL: only check if it's a non-empty row
- */
+ *--------------------------------------------------------------------------*/
+
 __global__ void
-hypreCUDAKernel_CSRCheckDiagFirst( HYPRE_Int  nrows,
-                                   HYPRE_Int *ia,
-                                   HYPRE_Int *ja,
-                                   HYPRE_Int *result )
+hypreGPUKernel_CSRCheckDiagFirst( hypre_DeviceItem &item,
+                                  HYPRE_Int  nrows,
+                                  HYPRE_Int *ia,
+                                  HYPRE_Int *ja,
+                                  HYPRE_Int *result )
 {
-   const HYPRE_Int row = hypre_cuda_get_grid_thread_id<1,1>();
+   const HYPRE_Int row = hypre_gpu_get_grid_thread_id<1, 1>(item);
    if (row < nrows)
    {
-      result[row] = (ia[row+1] > ia[row]) && (ja[ia[row]] != row);
+      result[row] = (ia[row + 1] > ia[row]) && (ja[ia[row]] != row);
    }
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixCheckDiagFirstDevice
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_CSRMatrixCheckDiagFirstDevice( hypre_CSRMatrix *A )
 {
+   HYPRE_Int  *A_i      = hypre_CSRMatrixI(A);
+   HYPRE_Int  *A_j      = hypre_CSRMatrixJ(A);
+   HYPRE_Int   num_rows = hypre_CSRMatrixNumRows(A);
+   HYPRE_Int  *result;
+   HYPRE_Int   ierr;
+
+   /* Sanity check */
    if (hypre_CSRMatrixNumRows(A) != hypre_CSRMatrixNumCols(A))
    {
       return 0;
    }
 
-   dim3 bDim = hypre_GetDefaultCUDABlockDimension();
-   dim3 gDim = hypre_GetDefaultCUDAGridDimension(hypre_CSRMatrixNumRows(A), "thread", bDim);
+   dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+   dim3 gDim = hypre_GetDefaultDeviceGridDimension(hypre_CSRMatrixNumRows(A), "thread", bDim);
 
-   HYPRE_Int *result = hypre_TAlloc(HYPRE_Int, hypre_CSRMatrixNumRows(A), HYPRE_MEMORY_DEVICE);
-   HYPRE_CUDA_LAUNCH( hypreCUDAKernel_CSRCheckDiagFirst, gDim, bDim,
-                      hypre_CSRMatrixNumRows(A),
-                      hypre_CSRMatrixI(A), hypre_CSRMatrixJ(A), result );
+   result = hypre_TAlloc(HYPRE_Int, num_rows, HYPRE_MEMORY_DEVICE);
+   HYPRE_GPU_LAUNCH( hypreGPUKernel_CSRCheckDiagFirst, gDim, bDim,
+                     num_rows, A_i, A_j, result );
 
-   HYPRE_Int ierr = HYPRE_THRUST_CALL( reduce,
-                                       result,
-                                       result + hypre_CSRMatrixNumRows(A) );
+   /* Compute number of rows in which the diagonal is not the first entry */
+#if defined(HYPRE_USING_SYCL)
+   ierr = HYPRE_ONEDPL_CALL( std::reduce,
+                             result,
+                             result + hypre_CSRMatrixNumRows(A) );
+#else
+   ierr = HYPRE_THRUST_CALL( reduce,
+                             result,
+                             result + hypre_CSRMatrixNumRows(A) );
+#endif
 
    hypre_TFree(result, HYPRE_MEMORY_DEVICE);
-
-   hypre_SyncCudaComputeStream(hypre_handle());
+   hypre_SyncComputeStream();
 
    return ierr;
 }
 
+/*--------------------------------------------------------------------------
+ * hypreGPUKernel_CSRMatrixCheckForMissingDiagonal
+ *--------------------------------------------------------------------------*/
+
 __global__ void
-hypreCUDAKernel_CSRMatrixFixZeroDiagDevice( HYPRE_Complex  v,
-                                            HYPRE_Int      nrows,
-                                            HYPRE_Int     *ia,
-                                            HYPRE_Int     *ja,
-                                            HYPRE_Complex *data,
-                                            HYPRE_Real     tol,
-                                            HYPRE_Int     *result )
+hypreGPUKernel_CSRMatrixCheckForMissingDiagonal( hypre_DeviceItem    &item,
+                                                 HYPRE_Int      nrows,
+                                                 HYPRE_Int     *ia,
+                                                 HYPRE_Int     *ja,
+                                                 HYPRE_Int     *result )
 {
-   const HYPRE_Int row = hypre_cuda_get_grid_warp_id<1,1>();
+   const HYPRE_Int row = hypre_gpu_get_grid_warp_id<1, 1>(item);
 
    if (row >= nrows)
    {
       return;
    }
 
-   HYPRE_Int lane = hypre_cuda_get_lane_id<1>();
+   HYPRE_Int lane = hypre_gpu_get_lane_id<1>(item);
    HYPRE_Int p = 0, q = 0;
-   bool has_diag = false;
+   bool missing_diagonal = true;
 
    if (lane < 2)
    {
       p = read_only_load(ia + row + lane);
    }
-   q = __shfl_sync(HYPRE_WARP_FULL_MASK, p, 1);
-   p = __shfl_sync(HYPRE_WARP_FULL_MASK, p, 0);
+   q = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 1);
+   p = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 0);
 
-   for (HYPRE_Int j = p + lane; __any_sync(HYPRE_WARP_FULL_MASK, j < q); j += HYPRE_WARP_SIZE)
+   for (HYPRE_Int j = p + lane; warp_any_sync(item, HYPRE_WARP_FULL_MASK, j < q); j += HYPRE_WARP_SIZE)
    {
       hypre_int find_diag = j < q && read_only_load(&ja[j]) == row;
 
-      if (find_diag)
-      {
-         if (fabs(data[j]) <= tol)
-         {
-            data[j] = v;
-         }
-      }
-
-      if ( __any_sync(HYPRE_WARP_FULL_MASK, find_diag) )
+      if ( warp_any_sync(item, HYPRE_WARP_FULL_MASK, find_diag) )
       {
-         has_diag = true;
+         missing_diagonal = false;
          break;
       }
    }
 
-   if (result && !has_diag && lane == 0)
+   if (missing_diagonal && lane == 0)
    {
       result[row] = 1;
    }
 }
 
-/* For square A, find numerical zeros (absolute values <= tol) on its diagonal and replace with v
- * Does NOT assume diagonal is the first entry of each row of A
- * In debug mode:
- *    Returns the number of rows that do not have diag in the pattern
- *    (i.e., structural zeroes on the diagonal)
- */
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixCheckForMissingDiagonal
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_CSRMatrixFixZeroDiagDevice( hypre_CSRMatrix *A,
-                                  HYPRE_Complex    v,
-                                  HYPRE_Real       tol )
+hypre_CSRMatrixCheckForMissingDiagonal( hypre_CSRMatrix *A )
 {
-   HYPRE_Int ierr = 0;
+   HYPRE_Int  *A_i      = hypre_CSRMatrixI(A);
+   HYPRE_Int  *A_j      = hypre_CSRMatrixJ(A);
+   HYPRE_Int   num_rows = hypre_CSRMatrixNumRows(A);
+   HYPRE_Int  *result;
+   HYPRE_Int   ierr;
 
+   /* This test is only for square matrices */
    if (hypre_CSRMatrixNumRows(A) != hypre_CSRMatrixNumCols(A))
    {
-      return ierr;
+      return 0;
    }
 
-   dim3 bDim = hypre_GetDefaultCUDABlockDimension();
-   dim3 gDim = hypre_GetDefaultCUDAGridDimension(hypre_CSRMatrixNumRows(A), "warp", bDim);
-
-#if HYPRE_DEBUG
-   HYPRE_Int *result = hypre_CTAlloc(HYPRE_Int, hypre_CSRMatrixNumRows(A), HYPRE_MEMORY_DEVICE);
-#else
-   HYPRE_Int *result = NULL;
-#endif
+   dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+   dim3 gDim = hypre_GetDefaultDeviceGridDimension(hypre_CSRMatrixNumRows(A), "thread", bDim);
 
-   HYPRE_CUDA_LAUNCH( hypreCUDAKernel_CSRMatrixFixZeroDiagDevice, gDim, bDim,
-                      v, hypre_CSRMatrixNumRows(A),
-                      hypre_CSRMatrixI(A), hypre_CSRMatrixJ(A), hypre_CSRMatrixData(A),
-                      tol, result );
+   result = hypre_CTAlloc(HYPRE_Int, num_rows, HYPRE_MEMORY_DEVICE);
+   HYPRE_GPU_LAUNCH( hypreGPUKernel_CSRMatrixCheckForMissingDiagonal, gDim, bDim,
+                     num_rows, A_i, A_j, result );
 
-#if HYPRE_DEBUG
+   /* Compute number of rows in which the diagonal is not the first entry */
+#if defined(HYPRE_USING_SYCL)
+   ierr = HYPRE_ONEDPL_CALL( std::reduce,
+                             result,
+                             result + hypre_CSRMatrixNumRows(A) );
+#else
    ierr = HYPRE_THRUST_CALL( reduce,
                              result,
                              result + hypre_CSRMatrixNumRows(A) );
-
-   hypre_TFree(result, HYPRE_MEMORY_DEVICE);
 #endif
 
-   hypre_SyncCudaComputeStream(hypre_handle());
+   hypre_TFree(result, HYPRE_MEMORY_DEVICE);
 
    return ierr;
 }
 
+/*--------------------------------------------------------------------------
+ * hypreGPUKernel_CSRMatrixReplaceDiagDevice
+ *--------------------------------------------------------------------------*/
+
 __global__ void
-hypreCUDAKernel_CSRMatrixReplaceDiagDevice( HYPRE_Complex *new_diag,
-                                            HYPRE_Complex  v,
-                                            HYPRE_Int      nrows,
-                                            HYPRE_Int     *ia,
-                                            HYPRE_Int     *ja,
-                                            HYPRE_Complex *data,
-                                            HYPRE_Real     tol,
-                                            HYPRE_Int     *result )
+hypreGPUKernel_CSRMatrixReplaceDiagDevice( hypre_DeviceItem    &item,
+                                           HYPRE_Complex *new_diag,
+                                           HYPRE_Complex  v,
+                                           HYPRE_Int      nrows,
+                                           HYPRE_Int     *ia,
+                                           HYPRE_Int     *ja,
+                                           HYPRE_Complex *data,
+                                           HYPRE_Real     tol,
+                                           HYPRE_Int     *result )
 {
-   const HYPRE_Int row = hypre_cuda_get_grid_warp_id<1,1>();
+   const HYPRE_Int row = hypre_gpu_get_grid_warp_id<1, 1>(item);
 
    if (row >= nrows)
    {
       return;
    }
 
-   HYPRE_Int lane = hypre_cuda_get_lane_id<1>();
+   HYPRE_Int lane = hypre_gpu_get_lane_id<1>(item);
    HYPRE_Int p = 0, q = 0;
    bool has_diag = false;
 
@@ -830,24 +1763,30 @@ hypreCUDAKernel_CSRMatrixReplaceDiagDevice( HYPRE_Complex *new_diag,
    {
       p = read_only_load(ia + row + lane);
    }
-   q = __shfl_sync(HYPRE_WARP_FULL_MASK, p, 1);
-   p = __shfl_sync(HYPRE_WARP_FULL_MASK, p, 0);
+   q = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 1);
+   p = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 0);
 
-   for (HYPRE_Int j = p + lane; __any_sync(HYPRE_WARP_FULL_MASK, j < q); j += HYPRE_WARP_SIZE)
+   for (HYPRE_Int j = p + lane; warp_any_sync(item, HYPRE_WARP_FULL_MASK, j < q); j += HYPRE_WARP_SIZE)
    {
       hypre_int find_diag = j < q && read_only_load(&ja[j]) == row;
 
       if (find_diag)
       {
-         HYPRE_Complex d = read_only_load(&new_diag[row]);
-         if (fabs(d) <= tol)
+         if (new_diag)
+         {
+            HYPRE_Complex d = read_only_load(&new_diag[row]);
+            data[j] = hypre_abs(d) <= tol ? v : d;
+         }
+         else
          {
-            d = v;
+            if (hypre_abs(data[j]) <= tol)
+            {
+               data[j] = v;
+            }
          }
-         data[j] = d;
       }
 
-      if ( __any_sync(HYPRE_WARP_FULL_MASK, find_diag) )
+      if ( warp_any_sync(item, HYPRE_WARP_FULL_MASK, find_diag) )
       {
          has_diag = true;
          break;
@@ -860,21 +1799,23 @@ hypreCUDAKernel_CSRMatrixReplaceDiagDevice( HYPRE_Complex *new_diag,
    }
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixReplaceDiagDevice
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_CSRMatrixReplaceDiagDevice( hypre_CSRMatrix *A,
                                   HYPRE_Complex   *new_diag,
                                   HYPRE_Complex    v,
                                   HYPRE_Real       tol )
 {
-   HYPRE_Int ierr = 0;
-
    if (hypre_CSRMatrixNumRows(A) != hypre_CSRMatrixNumCols(A))
    {
-      return ierr;
+      return hypre_error_flag;
    }
 
-   dim3 bDim = hypre_GetDefaultCUDABlockDimension();
-   dim3 gDim = hypre_GetDefaultCUDAGridDimension(hypre_CSRMatrixNumRows(A), "warp", bDim);
+   dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+   dim3 gDim = hypre_GetDefaultDeviceGridDimension(hypre_CSRMatrixNumRows(A), "warp", bDim);
 
 #if HYPRE_DEBUG
    HYPRE_Int *result = hypre_CTAlloc(HYPRE_Int, hypre_CSRMatrixNumRows(A), HYPRE_MEMORY_DEVICE);
@@ -882,26 +1823,56 @@ hypre_CSRMatrixReplaceDiagDevice( hypre_CSRMatrix *A,
    HYPRE_Int *result = NULL;
 #endif
 
-   HYPRE_CUDA_LAUNCH( hypreCUDAKernel_CSRMatrixReplaceDiagDevice, gDim, bDim,
-                      new_diag, v, hypre_CSRMatrixNumRows(A),
-                      hypre_CSRMatrixI(A), hypre_CSRMatrixJ(A), hypre_CSRMatrixData(A),
-                      tol, result );
+   HYPRE_Int    num_rows = hypre_CSRMatrixNumRows(A);
+   HYPRE_Int        *A_i = hypre_CSRMatrixI(A);
+   HYPRE_Int        *A_j = hypre_CSRMatrixJ(A);
+   HYPRE_Complex *A_data = hypre_CSRMatrixData(A);
+   HYPRE_GPU_LAUNCH( hypreGPUKernel_CSRMatrixReplaceDiagDevice, gDim, bDim,
+                     new_diag, v, num_rows,
+                     A_i, A_j, A_data,
+                     tol, result );
 
 #if HYPRE_DEBUG
-   ierr = HYPRE_THRUST_CALL( reduce,
-                             result,
-                             result + hypre_CSRMatrixNumRows(A) );
+   /* the number of structural zero in A */
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_Int num_zeros = HYPRE_ONEDPL_CALL( std::reduce,
+                                            result,
+                                            result + hypre_CSRMatrixNumRows(A) );
+#else
+   HYPRE_Int num_zeros = HYPRE_THRUST_CALL( reduce,
+                                            result,
+                                            result + hypre_CSRMatrixNumRows(A) );
+#endif
 
    hypre_TFree(result, HYPRE_MEMORY_DEVICE);
+
+   if (num_zeros)
+   {
+      hypre_error_w_msg(num_zeros, "structural zero in hypre_CSRMatrixReplaceDiagDevice");
+   }
 #endif
 
-   hypre_SyncCudaComputeStream(hypre_handle());
+   hypre_SyncComputeStream();
 
-   return ierr;
+   return hypre_error_flag;
 }
 
+#if defined(HYPRE_USING_SYCL)
+typedef std::tuple<HYPRE_Int, HYPRE_Int> Int2;
+struct Int2Unequal
+{
+   bool operator()(const Int2& t) const
+   {
+      return (std::get<0>(t) != std::get<1>(t));
+   }
+};
+#else
 typedef thrust::tuple<HYPRE_Int, HYPRE_Int> Int2;
+#if (defined(THRUST_VERSION) && THRUST_VERSION < 101000)
 struct Int2Unequal : public thrust::unary_function<Int2, bool>
+#else
+struct Int2Unequal
+#endif
 {
    __host__ __device__
    bool operator()(const Int2& t) const
@@ -909,6 +1880,11 @@ struct Int2Unequal : public thrust::unary_function<Int2, bool>
       return (thrust::get<0>(t) != thrust::get<1>(t));
    }
 };
+#endif
+
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixRemoveDiagonalDevice
+ *--------------------------------------------------------------------------*/
 
 HYPRE_Int
 hypre_CSRMatrixRemoveDiagonalDevice(hypre_CSRMatrix *A)
@@ -924,10 +1900,18 @@ hypre_CSRMatrixRemoveDiagonalDevice(hypre_CSRMatrix *A)
    HYPRE_Int     *new_j;
    HYPRE_Complex *new_data;
 
+#if defined(HYPRE_USING_SYCL)
+   auto zip_ij = oneapi::dpl::make_zip_iterator(A_ii, A_j);
+   new_nnz = HYPRE_ONEDPL_CALL( std::count_if,
+                                zip_ij,
+                                zip_ij + nnz,
+                                Int2Unequal() );
+#else
    new_nnz = HYPRE_THRUST_CALL( count_if,
                                 thrust::make_zip_iterator(thrust::make_tuple(A_ii, A_j)),
                                 thrust::make_zip_iterator(thrust::make_tuple(A_ii, A_j)) + nnz,
                                 Int2Unequal() );
+#endif
 
    if (new_nnz == nnz)
    {
@@ -943,31 +1927,51 @@ hypre_CSRMatrixRemoveDiagonalDevice(hypre_CSRMatrix *A)
    {
       new_data = hypre_TAlloc(HYPRE_Complex, new_nnz, HYPRE_MEMORY_DEVICE);
 
-      thrust::zip_iterator< thrust::tuple<HYPRE_Int*, HYPRE_Int*, HYPRE_Complex*> > new_end;
-
-      new_end = HYPRE_THRUST_CALL( copy_if,
-                                   thrust::make_zip_iterator(thrust::make_tuple(A_ii, A_j, A_data)),
-                                   thrust::make_zip_iterator(thrust::make_tuple(A_ii, A_j, A_data)) + nnz,
-                                   thrust::make_zip_iterator(thrust::make_tuple(A_ii, A_j)),
-                                   thrust::make_zip_iterator(thrust::make_tuple(new_ii, new_j, new_data)),
-                                   Int2Unequal() );
+#if defined(HYPRE_USING_SYCL)
+      auto zip_ija = oneapi::dpl::make_zip_iterator(A_ii, A_j, A_data);
+      auto zip_new_ija = oneapi::dpl::make_zip_iterator(new_ii, new_j, new_data);
+      auto new_end = hypreSycl_copy_if(
+                        zip_ija,
+                        zip_ija + nnz,
+                        zip_ij,
+                        zip_new_ija,
+                        Int2Unequal() );
+
+      hypre_assert( std::get<0>(new_end.base()) == new_ii + new_nnz );
+#else
+      auto new_end = HYPRE_THRUST_CALL( copy_if,
+                                        thrust::make_zip_iterator(thrust::make_tuple(A_ii, A_j, A_data)),
+                                        thrust::make_zip_iterator(thrust::make_tuple(A_ii, A_j, A_data)) + nnz,
+                                        thrust::make_zip_iterator(thrust::make_tuple(A_ii, A_j)),
+                                        thrust::make_zip_iterator(thrust::make_tuple(new_ii, new_j, new_data)),
+                                        Int2Unequal() );
 
       hypre_assert( thrust::get<0>(new_end.get_iterator_tuple()) == new_ii + new_nnz );
+#endif
    }
    else
    {
       new_data = NULL;
 
-      thrust::zip_iterator< thrust::tuple<HYPRE_Int*, HYPRE_Int*> > new_end;
+#if defined(HYPRE_USING_SYCL)
+      auto zip_new_ij = oneapi::dpl::make_zip_iterator(new_ii, new_j);
+      auto new_end = hypreSycl_copy_if( zip_ij,
+                                        zip_ij + nnz,
+                                        zip_ij,
+                                        zip_new_ij,
+                                        Int2Unequal() );
 
-      new_end = HYPRE_THRUST_CALL( copy_if,
-                                   thrust::make_zip_iterator(thrust::make_tuple(A_ii, A_j)),
-                                   thrust::make_zip_iterator(thrust::make_tuple(A_ii, A_j)) + nnz,
-                                   thrust::make_zip_iterator(thrust::make_tuple(A_ii, A_j)),
-                                   thrust::make_zip_iterator(thrust::make_tuple(new_ii, new_j)),
-                                   Int2Unequal() );
+      hypre_assert( std::get<0>(new_end.base()) == new_ii + new_nnz );
+#else
+      auto new_end = HYPRE_THRUST_CALL( copy_if,
+                                        thrust::make_zip_iterator(thrust::make_tuple(A_ii, A_j)),
+                                        thrust::make_zip_iterator(thrust::make_tuple(A_ii, A_j)) + nnz,
+                                        thrust::make_zip_iterator(thrust::make_tuple(A_ii, A_j)),
+                                        thrust::make_zip_iterator(thrust::make_tuple(new_ii, new_j)),
+                                        Int2Unequal() );
 
       hypre_assert( thrust::get<0>(new_end.get_iterator_tuple()) == new_ii + new_nnz );
+#endif
    }
 
    hypre_TFree(A_ii,   HYPRE_MEMORY_DEVICE);
@@ -984,281 +1988,117 @@ hypre_CSRMatrixRemoveDiagonalDevice(hypre_CSRMatrix *A)
    return hypre_error_flag;
 }
 
-/* type == 0, sum,
- *         1, abs sum (l-1)
- *         2, square sum (l-2)
- */
-template<HYPRE_Int type>
+/*--------------------------------------------------------------------------
+ * hypreGPUKernel_CSRDiagScale
+ *--------------------------------------------------------------------------*/
+
 __global__ void
-hypreCUDAKernel_CSRRowSum( HYPRE_Int      nrows,
-                           HYPRE_Int     *ia,
-                           HYPRE_Int     *ja,
-                           HYPRE_Complex *aa,
-                           HYPRE_Int     *CF_i,
-                           HYPRE_Int     *CF_j,
-                           HYPRE_Complex *row_sum,
-                           HYPRE_Complex  scal,
-                           HYPRE_Int      set)
+hypreGPUKernel_CSRDiagScale( hypre_DeviceItem    &item,
+                             HYPRE_Int      nrows,
+                             HYPRE_Int     *ia,
+                             HYPRE_Int     *ja,
+                             HYPRE_Complex *aa,
+                             HYPRE_Complex *ld,
+                             HYPRE_Complex *rd)
 {
-   HYPRE_Int row_i = hypre_cuda_get_grid_warp_id<1,1>();
+   HYPRE_Int row = hypre_gpu_get_grid_warp_id<1, 1>(item);
 
-   if (row_i >= nrows)
+   if (row >= nrows)
    {
       return;
    }
 
-   HYPRE_Int lane = hypre_cuda_get_lane_id<1>();
+   HYPRE_Int lane = hypre_gpu_get_lane_id<1>(item);
    HYPRE_Int p = 0, q = 0;
 
    if (lane < 2)
    {
-      p = read_only_load(ia + row_i + lane);
+      p = read_only_load(ia + row + lane);
    }
-   q = __shfl_sync(HYPRE_WARP_FULL_MASK, p, 1);
-   p = __shfl_sync(HYPRE_WARP_FULL_MASK, p, 0);
+   q = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 1);
+   p = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 0);
 
-   HYPRE_Complex row_sum_i = 0.0;
+   HYPRE_Complex sl = 1.0;
 
-   for (HYPRE_Int j = p + lane; __any_sync(HYPRE_WARP_FULL_MASK, j < q); j += HYPRE_WARP_SIZE)
+   if (ld)
    {
-      if ( j >= q || (CF_i && CF_j && read_only_load(&CF_i[row_i]) != read_only_load(&CF_j[ja[j]])) )
-      {
-         continue;
-      }
-
-      HYPRE_Complex aii = aa[j];
-
-      if (type == 0)
-      {
-         row_sum_i += aii;
-      }
-      else if (type == 1)
-      {
-         row_sum_i += fabs(aii);
-      }
-      else if (type == 2)
+      if (!lane)
       {
-         row_sum_i += aii * aii;
+         sl = read_only_load(ld + row);
       }
+      sl = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, sl, 0);
    }
 
-   row_sum_i = warp_reduce_sum(row_sum_i);
-
-   if (lane == 0)
+   if (rd)
    {
-      if (set)
+      for (HYPRE_Int i = p + lane; i < q; i += HYPRE_WARP_SIZE)
       {
-         row_sum[row_i] = scal * row_sum_i;
-      }
-      else
-      {
-         row_sum[row_i] += scal * row_sum_i;
+         const HYPRE_Int col = read_only_load(ja + i);
+         const HYPRE_Complex sr = read_only_load(rd + col);
+         aa[i] = sl * aa[i] * sr;
       }
    }
-}
-
-void
-hypre_CSRMatrixComputeRowSumDevice( hypre_CSRMatrix *A,
-                                    HYPRE_Int       *CF_i,
-                                    HYPRE_Int       *CF_j,
-                                    HYPRE_Complex   *row_sum,
-                                    HYPRE_Int        type,
-                                    HYPRE_Complex    scal,
-                                    const char      *set_or_add)
-{
-   HYPRE_Int      nrows  = hypre_CSRMatrixNumRows(A);
-   HYPRE_Complex *A_data = hypre_CSRMatrixData(A);
-   HYPRE_Int     *A_i    = hypre_CSRMatrixI(A);
-   HYPRE_Int     *A_j    = hypre_CSRMatrixJ(A);
-   dim3           bDim, gDim;
-
-   bDim = hypre_GetDefaultCUDABlockDimension();
-   gDim = hypre_GetDefaultCUDAGridDimension(nrows, "warp", bDim);
-
-   if (type == 0)
-   {
-      HYPRE_CUDA_LAUNCH( hypreCUDAKernel_CSRRowSum<0>, gDim, bDim, nrows, A_i, A_j, A_data, CF_i, CF_j,
-                         row_sum, scal, set_or_add[0] == 's' );
-   }
-   else if (type == 1)
-   {
-      HYPRE_CUDA_LAUNCH( hypreCUDAKernel_CSRRowSum<1>, gDim, bDim, nrows, A_i, A_j, A_data, CF_i, CF_j,
-                         row_sum, scal, set_or_add[0] == 's' );
-   }
-   else if (type == 2)
-   {
-      HYPRE_CUDA_LAUNCH( hypreCUDAKernel_CSRRowSum<2>, gDim, bDim, nrows, A_i, A_j, A_data, CF_i, CF_j,
-                         row_sum, scal, set_or_add[0] == 's' );
-   }
-
-   hypre_SyncCudaComputeStream(hypre_handle());
-}
-
-/* type 0: diag
- *      1: abs diag
- *      2: diag inverse
- *      3: diag inverse sqrt
- *      4: abs diag inverse sqrt
- */
-__global__ void
-hypreCUDAKernel_CSRExtractDiag( HYPRE_Int      nrows,
-                                HYPRE_Int     *ia,
-                                HYPRE_Int     *ja,
-                                HYPRE_Complex *aa,
-                                HYPRE_Complex *d,
-                                HYPRE_Int      type)
-{
-   HYPRE_Int row = hypre_cuda_get_grid_warp_id<1,1>();
-
-   if (row >= nrows)
-   {
-      return;
-   }
-
-   HYPRE_Int lane = hypre_cuda_get_lane_id<1>();
-   HYPRE_Int p = 0, q = 0;
-
-   if (lane < 2)
-   {
-      p = read_only_load(ia + row + lane);
-   }
-   q = __shfl_sync(HYPRE_WARP_FULL_MASK, p, 1);
-   p = __shfl_sync(HYPRE_WARP_FULL_MASK, p, 0);
-
-   HYPRE_Int has_diag = 0;
-
-   for (HYPRE_Int j = p + lane; __any_sync(HYPRE_WARP_FULL_MASK, j < q); j += HYPRE_WARP_SIZE)
+   else if (sl != 1.0)
    {
-      hypre_int find_diag = j < q && ja[j] == row;
-
-      if (find_diag)
-      {
-         if (type == 0)
-         {
-            d[row] = aa[j];
-         }
-         else if (type == 1)
-         {
-            d[row] = fabs(aa[j]);
-         }
-         else if (type == 2)
-         {
-            d[row] = 1.0 / aa[j];
-         }
-         else if (type == 3)
-         {
-            d[row] = 1.0 / sqrt(aa[j]);
-         }
-         else if (type == 4)
-         {
-            d[row] = 1.0 / sqrt(fabs(aa[j]));
-         }
-      }
-
-      if ( __any_sync(HYPRE_WARP_FULL_MASK, find_diag) )
+      for (HYPRE_Int i = p + lane; i < q; i += HYPRE_WARP_SIZE)
       {
-         has_diag = 1;
-         break;
+         aa[i] = sl * aa[i];
       }
    }
-
-   if (!has_diag && lane == 0)
-   {
-      d[row] = 0.0;
-   }
 }
 
-void
-hypre_CSRMatrixExtractDiagonalDevice( hypre_CSRMatrix *A,
-                                      HYPRE_Complex   *d,
-                                      HYPRE_Int        type)
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixDiagScaleDevice
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_CSRMatrixDiagScaleDevice( hypre_CSRMatrix *A,
+                                hypre_Vector    *ld,
+                                hypre_Vector    *rd)
 {
    HYPRE_Int      nrows  = hypre_CSRMatrixNumRows(A);
    HYPRE_Complex *A_data = hypre_CSRMatrixData(A);
    HYPRE_Int     *A_i    = hypre_CSRMatrixI(A);
    HYPRE_Int     *A_j    = hypre_CSRMatrixJ(A);
-   dim3           bDim, gDim;
-
-   bDim = hypre_GetDefaultCUDABlockDimension();
-   gDim = hypre_GetDefaultCUDAGridDimension(nrows, "warp", bDim);
-
-   HYPRE_CUDA_LAUNCH( hypreCUDAKernel_CSRExtractDiag, gDim, bDim, nrows, A_i, A_j, A_data, d, type );
-
-   hypre_SyncCudaComputeStream(hypre_handle());
-}
-
-/* return C = [A; B] */
-hypre_CSRMatrix*
-hypre_CSRMatrixStack2Device(hypre_CSRMatrix *A, hypre_CSRMatrix *B)
-{
-   hypre_assert( hypre_CSRMatrixNumCols(A) == hypre_CSRMatrixNumCols(B) );
-
-   hypre_CSRMatrix *C = hypre_CSRMatrixCreate( hypre_CSRMatrixNumRows(A) + hypre_CSRMatrixNumRows(B),
-                                               hypre_CSRMatrixNumCols(A),
-                                               hypre_CSRMatrixNumNonzeros(A) + hypre_CSRMatrixNumNonzeros(B) );
-
-   HYPRE_Int     *C_i = hypre_TAlloc(HYPRE_Int,     hypre_CSRMatrixNumRows(C) + 1, HYPRE_MEMORY_DEVICE);
-   HYPRE_Int     *C_j = hypre_TAlloc(HYPRE_Int,     hypre_CSRMatrixNumNonzeros(C), HYPRE_MEMORY_DEVICE);
-   HYPRE_Complex *C_a = hypre_TAlloc(HYPRE_Complex, hypre_CSRMatrixNumNonzeros(C), HYPRE_MEMORY_DEVICE);
-
-   hypre_TMemcpy(C_i, hypre_CSRMatrixI(A), HYPRE_Int, hypre_CSRMatrixNumRows(A) + 1,
-                 HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
-   hypre_TMemcpy(C_i + hypre_CSRMatrixNumRows(A) + 1, hypre_CSRMatrixI(B) + 1, HYPRE_Int, hypre_CSRMatrixNumRows(B),
-                 HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
-   HYPRE_THRUST_CALL( transform,
-                      C_i + hypre_CSRMatrixNumRows(A) + 1,
-                      C_i + hypre_CSRMatrixNumRows(C) + 1,
-                      thrust::make_constant_iterator(hypre_CSRMatrixNumNonzeros(A)),
-                      C_i + hypre_CSRMatrixNumRows(A) + 1,
-                      thrust::plus<HYPRE_Int>() );
-
-   hypre_TMemcpy(C_j, hypre_CSRMatrixJ(A), HYPRE_Int, hypre_CSRMatrixNumNonzeros(A),
-                 HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
-   hypre_TMemcpy(C_j + hypre_CSRMatrixNumNonzeros(A), hypre_CSRMatrixJ(B), HYPRE_Int, hypre_CSRMatrixNumNonzeros(B),
-                 HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
-
-   hypre_TMemcpy(C_a, hypre_CSRMatrixData(A), HYPRE_Complex, hypre_CSRMatrixNumNonzeros(A),
-                 HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
-   hypre_TMemcpy(C_a + hypre_CSRMatrixNumNonzeros(A), hypre_CSRMatrixData(B), HYPRE_Complex, hypre_CSRMatrixNumNonzeros(B),
-                 HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
-
-   hypre_CSRMatrixI(C) = C_i;
-   hypre_CSRMatrixJ(C) = C_j;
-   hypre_CSRMatrixData(C) = C_a;
-   hypre_CSRMatrixMemoryLocation(C) = HYPRE_MEMORY_DEVICE;
-
-   return C;
-}
-
-/* A = alp * I */
-hypre_CSRMatrix *
-hypre_CSRMatrixIdentityDevice(HYPRE_Int n, HYPRE_Complex alp)
-{
-   hypre_CSRMatrix *A = hypre_CSRMatrixCreate(n, n, n);
-
-   hypre_CSRMatrixInitialize_v2(A, 0, HYPRE_MEMORY_DEVICE);
-
-   HYPRE_THRUST_CALL( sequence,
-                      hypre_CSRMatrixI(A),
-                      hypre_CSRMatrixI(A) + n + 1,
-                      0  );
-
-   HYPRE_THRUST_CALL( sequence,
-                      hypre_CSRMatrixJ(A),
-                      hypre_CSRMatrixJ(A) + n,
-                      0  );
+   HYPRE_Complex *ldata  = ld ? hypre_VectorData(ld) : NULL;
+   HYPRE_Complex *rdata  = rd ? hypre_VectorData(rd) : NULL;
 
-   HYPRE_THRUST_CALL( fill,
-                      hypre_CSRMatrixData(A),
-                      hypre_CSRMatrixData(A) + n,
-                      alp );
+   dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+   dim3 gDim = hypre_GetDefaultDeviceGridDimension(nrows, "warp", bDim);
 
-   return A;
+   HYPRE_GPU_LAUNCH(hypreGPUKernel_CSRDiagScale, gDim, bDim,
+                    nrows, A_i, A_j, A_data, ldata, rdata);
+
+   hypre_SyncComputeStream();
+
+   return hypre_error_flag;
 }
 
-/* this predicate compares first and second element in a tuple in absolute value */
-/* first is assumed to be complex, second to be real > 0 */
-struct cabsfirst_greaterthan_second_pred : public thrust::unary_function<thrust::tuple<HYPRE_Complex, HYPRE_Real>,bool>
+/*--------------------------------------------------------------------------
+ * cabsfirst_greaterthan_second_pred
+ *
+ * This predicate compares first and second element in a tuple in absolute
+ * value first is assumed to be complex, second to be real > 0
+ *--------------------------------------------------------------------------*/
+
+#if defined(HYPRE_USING_SYCL)
+struct cabsfirst_greaterthan_second_pred
+{
+   bool operator()(const std::tuple<HYPRE_Complex, HYPRE_Real>& t) const
+   {
+      const HYPRE_Complex i = std::get<0>(t);
+      const HYPRE_Real j = std::get<1>(t);
+
+      return hypre_cabs(i) > j;
+   }
+};
+#else
+#if (defined(THRUST_VERSION) && THRUST_VERSION < 101000)
+struct cabsfirst_greaterthan_second_pred : public
+   thrust::unary_function<thrust::tuple<HYPRE_Complex, HYPRE_Real>, bool>
+#else
+struct cabsfirst_greaterthan_second_pred
+#endif
 {
    __host__ __device__
    bool operator()(const thrust::tuple<HYPRE_Complex, HYPRE_Real>& t) const
@@ -1269,10 +2109,16 @@ struct cabsfirst_greaterthan_second_pred : public thrust::unary_function<thrust:
       return hypre_cabs(i) > j;
    }
 };
+#endif
 
-/* drop the entries that are smaller than:
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixDropSmallEntriesDevice
+ *
+ * drop the entries that are smaller than:
  *    tol if elmt_tols == null,
- *    elmt_tols[j] otherwise where j = 0...NumNonzeros(A) */
+ *    elmt_tols[j] otherwise where j = 0...NumNonzeros(A)
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_CSRMatrixDropSmallEntriesDevice( hypre_CSRMatrix *A,
                                        HYPRE_Real       tol,
@@ -1289,12 +2135,28 @@ hypre_CSRMatrixDropSmallEntriesDevice( hypre_CSRMatrix *A,
    HYPRE_Int     *new_j;
    HYPRE_Complex *new_data;
 
+#if defined(HYPRE_USING_SYCL)
+   if (elmt_tols == NULL)
+   {
+      new_nnz = HYPRE_ONEDPL_CALL( std::count_if,
+                                   A_data,
+                                   A_data + nnz,
+      [tol] (const auto & x) {return !(x < tol);} );
+   }
+   else
+   {
+      new_nnz = HYPRE_ONEDPL_CALL( std::count_if,
+                                   oneapi::dpl::make_zip_iterator(A_data, elmt_tols),
+                                   oneapi::dpl::make_zip_iterator(A_data, elmt_tols) + nnz,
+                                   cabsfirst_greaterthan_second_pred() );
+   }
+#else
    if (elmt_tols == NULL)
    {
       new_nnz = HYPRE_THRUST_CALL( count_if,
                                    A_data,
                                    A_data + nnz,
-                                   thrust::not1(less_than<HYPRE_Complex>(tol)) );
+                                   HYPRE_THRUST_NOT(less_than<HYPRE_Complex>(tol)) );
    }
    else
    {
@@ -1303,6 +2165,7 @@ hypre_CSRMatrixDropSmallEntriesDevice( hypre_CSRMatrix *A,
                                    thrust::make_zip_iterator(thrust::make_tuple(A_data, elmt_tols)) + nnz,
                                    cabsfirst_greaterthan_second_pred() );
    }
+#endif
 
    if (new_nnz == nnz)
    {
@@ -1318,28 +2181,52 @@ hypre_CSRMatrixDropSmallEntriesDevice( hypre_CSRMatrix *A,
    new_j = hypre_TAlloc(HYPRE_Int, new_nnz, HYPRE_MEMORY_DEVICE);
    new_data = hypre_TAlloc(HYPRE_Complex, new_nnz, HYPRE_MEMORY_DEVICE);
 
-   thrust::zip_iterator< thrust::tuple<HYPRE_Int*, HYPRE_Int*, HYPRE_Complex*> > new_end;
+#if defined(HYPRE_USING_SYCL)
+   if (elmt_tols == NULL)
+   {
+      auto new_end = hypreSycl_copy_if( oneapi::dpl::make_zip_iterator(A_ii, A_j, A_data),
+                                        oneapi::dpl::make_zip_iterator(A_ii, A_j, A_data) + nnz,
+                                        A_data,
+                                        oneapi::dpl::make_zip_iterator(new_ii, new_j, new_data),
+      [tol] (const auto & x) {return !(x < tol);} );
+
+      hypre_assert( std::get<0>(new_end.base()) == new_ii + new_nnz );
+   }
+   else
+   {
+      auto new_end = hypreSycl_copy_if( oneapi::dpl::make_zip_iterator(A_ii, A_j, A_data),
+                                        oneapi::dpl::make_zip_iterator(A_ii, A_j, A_data) + nnz,
+                                        oneapi::dpl::make_zip_iterator(A_data, elmt_tols),
+                                        oneapi::dpl::make_zip_iterator(new_ii, new_j, new_data),
+                                        cabsfirst_greaterthan_second_pred() );
 
+      hypre_assert( std::get<0>(new_end.base()) == new_ii + new_nnz );
+   }
+#else
    if (elmt_tols == NULL)
    {
-      new_end = HYPRE_THRUST_CALL( copy_if,
-                                   thrust::make_zip_iterator(thrust::make_tuple(A_ii, A_j, A_data)),
-                                   thrust::make_zip_iterator(thrust::make_tuple(A_ii, A_j, A_data)) + nnz,
-                                   A_data,
-                                   thrust::make_zip_iterator(thrust::make_tuple(new_ii, new_j, new_data)),
-                                   thrust::not1(less_than<HYPRE_Complex>(tol)) );
+      auto new_end = HYPRE_THRUST_CALL( copy_if,
+                                        thrust::make_zip_iterator(thrust::make_tuple(A_ii, A_j, A_data)),
+                                        thrust::make_zip_iterator(thrust::make_tuple(A_ii, A_j, A_data)) + nnz,
+                                        A_data,
+                                        thrust::make_zip_iterator(thrust::make_tuple(new_ii, new_j, new_data)),
+                                        HYPRE_THRUST_NOT(less_than<HYPRE_Complex>(tol)) );
+
+      hypre_assert( thrust::get<0>(new_end.get_iterator_tuple()) == new_ii + new_nnz );
    }
    else
    {
-      new_end = HYPRE_THRUST_CALL( copy_if,
-                                   thrust::make_zip_iterator(thrust::make_tuple(A_ii, A_j, A_data)),
-                                   thrust::make_zip_iterator(thrust::make_tuple(A_ii, A_j, A_data)) + nnz,
-                                   thrust::make_zip_iterator(thrust::make_tuple(A_data, elmt_tols)),
-                                   thrust::make_zip_iterator(thrust::make_tuple(new_ii, new_j, new_data)),
-                                   cabsfirst_greaterthan_second_pred() );
+      auto new_end = HYPRE_THRUST_CALL( copy_if,
+                                        thrust::make_zip_iterator(thrust::make_tuple(A_ii, A_j, A_data)),
+                                        thrust::make_zip_iterator(thrust::make_tuple(A_ii, A_j, A_data)) + nnz,
+                                        thrust::make_zip_iterator(thrust::make_tuple(A_data, elmt_tols)),
+                                        thrust::make_zip_iterator(thrust::make_tuple(new_ii, new_j, new_data)),
+                                        cabsfirst_greaterthan_second_pred() );
+
+      hypre_assert( thrust::get<0>(new_end.get_iterator_tuple()) == new_ii + new_nnz );
    }
+#endif
 
-   hypre_assert( thrust::get<0>(new_end.get_iterator_tuple()) == new_ii + new_nnz );
 
    hypre_TFree(A_ii,   HYPRE_MEMORY_DEVICE);
    hypre_TFree(A_i,    HYPRE_MEMORY_DEVICE);
@@ -1355,116 +2242,241 @@ hypre_CSRMatrixDropSmallEntriesDevice( hypre_CSRMatrix *A,
    return hypre_error_flag;
 }
 
-/* mark is of size nA
- * diag_option: 1: special treatment for diag entries, mark as -2
- */
-__global__ void
-hypreCUDAKernel_CSRMatrixIntersectPattern(HYPRE_Int  n,
-                                          HYPRE_Int  nA,
-                                          HYPRE_Int *rowid,
-                                          HYPRE_Int *colid,
-                                          HYPRE_Int *idx,
-                                          HYPRE_Int *mark,
-                                          HYPRE_Int  diag_option)
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixIdentityDevice
+ *
+ * A = alp * I
+ *--------------------------------------------------------------------------*/
+
+hypre_CSRMatrix *
+hypre_CSRMatrixIdentityDevice(HYPRE_Int n, HYPRE_Complex alp)
 {
-   HYPRE_Int i = hypre_cuda_get_grid_thread_id<1,1>();
+   hypre_CSRMatrix *A = hypre_CSRMatrixCreate(n, n, n);
 
-   if (i >= n)
-   {
-      return;
-   }
+   hypre_CSRMatrixInitialize_v2(A, 0, HYPRE_MEMORY_DEVICE);
 
-   HYPRE_Int r1 = read_only_load(&rowid[i]);
-   HYPRE_Int c1 = read_only_load(&colid[i]);
-   HYPRE_Int j = read_only_load(&idx[i]);
+#if defined(HYPRE_USING_SYCL)
+   hypreSycl_sequence( hypre_CSRMatrixI(A),
+                       hypre_CSRMatrixI(A) + n + 1,
+                       0  );
 
-   if (0 == diag_option)
+   hypreSycl_sequence( hypre_CSRMatrixJ(A),
+                       hypre_CSRMatrixJ(A) + n,
+                       0  );
+
+   HYPRE_ONEDPL_CALL( std::fill,
+                      hypre_CSRMatrixData(A),
+                      hypre_CSRMatrixData(A) + n,
+                      alp );
+#else
+   HYPRE_THRUST_CALL( sequence,
+                      hypre_CSRMatrixI(A),
+                      hypre_CSRMatrixI(A) + n + 1,
+                      0  );
+
+   HYPRE_THRUST_CALL( sequence,
+                      hypre_CSRMatrixJ(A),
+                      hypre_CSRMatrixJ(A) + n,
+                      0  );
+
+   HYPRE_THRUST_CALL( fill,
+                      hypre_CSRMatrixData(A),
+                      hypre_CSRMatrixData(A) + n,
+                      alp );
+#endif
+
+   return A;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixDiagMatrixFromVectorDevice
+ *
+ * A = diag(v)
+ *--------------------------------------------------------------------------*/
+
+hypre_CSRMatrix *
+hypre_CSRMatrixDiagMatrixFromVectorDevice(HYPRE_Int n, HYPRE_Complex *v)
+{
+   hypre_CSRMatrix *A = hypre_CSRMatrixCreate(n, n, n);
+
+   hypre_CSRMatrixInitialize_v2(A, 0, HYPRE_MEMORY_DEVICE);
+
+#if defined(HYPRE_USING_SYCL)
+   hypreSycl_sequence( hypre_CSRMatrixI(A),
+                       hypre_CSRMatrixI(A) + n + 1,
+                       0  );
+
+   hypreSycl_sequence( hypre_CSRMatrixJ(A),
+                       hypre_CSRMatrixJ(A) + n,
+                       0  );
+
+   HYPRE_ONEDPL_CALL( std::copy,
+                      v,
+                      v + n,
+                      hypre_CSRMatrixData(A) );
+#else
+   HYPRE_THRUST_CALL( sequence,
+                      hypre_CSRMatrixI(A),
+                      hypre_CSRMatrixI(A) + n + 1,
+                      0  );
+
+   HYPRE_THRUST_CALL( sequence,
+                      hypre_CSRMatrixJ(A),
+                      hypre_CSRMatrixJ(A) + n,
+                      0  );
+
+   HYPRE_THRUST_CALL( copy,
+                      v,
+                      v + n,
+                      hypre_CSRMatrixData(A) );
+#endif
+
+   return A;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixDiagMatrixFromMatrixDevice
+ *
+ * B = diagm(A)
+ *--------------------------------------------------------------------------*/
+
+hypre_CSRMatrix *
+hypre_CSRMatrixDiagMatrixFromMatrixDevice(hypre_CSRMatrix *A, HYPRE_Int type)
+{
+   HYPRE_Int      nrows  = hypre_CSRMatrixNumRows(A);
+   HYPRE_Complex  *diag = hypre_CTAlloc(HYPRE_Complex, nrows, HYPRE_MEMORY_DEVICE);
+   hypre_CSRMatrixExtractDiagonalDevice(A, diag, type);
+
+   hypre_CSRMatrix *diag_mat = hypre_CSRMatrixDiagMatrixFromVectorDevice(nrows, diag);
+
+   hypre_TFree(diag, HYPRE_MEMORY_DEVICE);
+   return diag_mat;
+}
+
+/*--------------------------------------------------------------------------
+ * adj_functor (Used in hypre_CSRMatrixPermuteDevice)
+ *--------------------------------------------------------------------------*/
+
+#if (defined(THRUST_VERSION) && THRUST_VERSION < 101000)
+struct adj_functor : public thrust::unary_function<HYPRE_Int, HYPRE_Int>
+#else
+struct adj_functor
+#endif
+{
+   HYPRE_Int *ia_;
+
+   adj_functor(HYPRE_Int *ia)
    {
-      if (j < nA)
-      {
-         HYPRE_Int r2 = i < n - 1 ? read_only_load(&rowid[i + 1]) : -1;
-         HYPRE_Int c2 = i < n - 1 ? read_only_load(&colid[i + 1]) : -1;
-         if (r1 == r2 && c1 == c2)
-         {
-            mark[j] = c1;
-         }
-         else
-         {
-            mark[j] = -1;
-         }
-      }
+      ia_ = ia;
    }
-   else if (1 == diag_option)
+
+   __host__ __device__ HYPRE_Int operator()(HYPRE_Int i) const
    {
-      if (j < nA)
-      {
-         if (r1 == c1)
-         {
-            mark[j] = -2;
-         }
-         else
-         {
-            HYPRE_Int r2 = i < n - 1 ? read_only_load(&rowid[i + 1]) : -1;
-            HYPRE_Int c2 = i < n - 1 ? read_only_load(&colid[i + 1]) : -1;
-            if (r1 == r2 && c1 == c2)
-            {
-               mark[j] = c1;
-            }
-            else
-            {
-               mark[j] = -1;
-            }
-         }
-      }
+      return ia_[i + 1] - ia_[i];
    }
-}
-
-/* markA: array of size nnz(A), for pattern of (A and B), markA is the column indices as in A_J
- * Otherwise, mark pattern not in A-B as -1 in markA
- * Note the special treatment for diagonal entries of A (marked as -2) */
-HYPRE_Int
-hypre_CSRMatrixIntersectPattern(hypre_CSRMatrix *A,
-                                hypre_CSRMatrix *B,
-                                HYPRE_Int       *markA,
-                                HYPRE_Int        diag_opt)
-{
-   HYPRE_Int nrows = hypre_CSRMatrixNumRows(A);
-   HYPRE_Int nnzA  = hypre_CSRMatrixNumNonzeros(A);
-   HYPRE_Int nnzB  = hypre_CSRMatrixNumNonzeros(B);
+};
 
-   HYPRE_Int *Cii = hypre_TAlloc(HYPRE_Int, nnzA + nnzB, HYPRE_MEMORY_DEVICE);
-   HYPRE_Int *Cjj = hypre_TAlloc(HYPRE_Int, nnzA + nnzB, HYPRE_MEMORY_DEVICE);
-   HYPRE_Int *idx = hypre_TAlloc(HYPRE_Int, nnzA + nnzB, HYPRE_MEMORY_DEVICE);
+/*--------------------------------------------------------------------------
+ * bii_functor (Used in hypre_CSRMatrixPermuteDevice)
+ *--------------------------------------------------------------------------*/
 
-   hypreDevice_CsrRowPtrsToIndices_v2(nrows, nnzA, hypre_CSRMatrixI(A), Cii);
-   hypreDevice_CsrRowPtrsToIndices_v2(nrows, nnzB, hypre_CSRMatrixI(B), Cii + nnzA);
-   hypre_TMemcpy(Cjj,        hypre_CSRMatrixJ(A), HYPRE_Int, nnzA, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
-   hypre_TMemcpy(Cjj + nnzA, hypre_CSRMatrixJ(B), HYPRE_Int, nnzB, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
-   HYPRE_THRUST_CALL( sequence, idx, idx + nnzA + nnzB );
+struct bii_functor
+{
+   HYPRE_Int *p_, *ia_, *ib_, *rb_;
 
-   HYPRE_THRUST_CALL( stable_sort_by_key,
-                      thrust::make_zip_iterator(thrust::make_tuple(Cii, Cjj)),
-                      thrust::make_zip_iterator(thrust::make_tuple(Cii, Cjj)) + nnzA + nnzB,
-                      idx );
+   bii_functor(HYPRE_Int *p, HYPRE_Int *ia, HYPRE_Int *ib, HYPRE_Int *rb)
+   {
+      p_ = p;
+      ia_ = ia;
+      ib_ = ib;
+      rb_ = rb;
+   }
 
-   hypre_TMemcpy(markA, hypre_CSRMatrixJ(A), HYPRE_Int, nnzA, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+   __host__ __device__ void operator()(HYPRE_Int i) const
+   {
+      const HYPRE_Int r = rb_[i];
+      rb_[i] = ia_[p_[r]] + i - ib_[r];
+   }
+};
 
-   dim3 bDim = hypre_GetDefaultCUDABlockDimension();
-   dim3 gDim = hypre_GetDefaultCUDAGridDimension(nnzA + nnzB, "thread", bDim);
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixPermuteDevice
+ *
+ * See hypre_CSRMatrixPermute.
+ *--------------------------------------------------------------------------*/
 
-   HYPRE_CUDA_LAUNCH( hypreCUDAKernel_CSRMatrixIntersectPattern, gDim, bDim,
-                      nnzA + nnzB, nnzA, Cii, Cjj, idx, markA, diag_opt );
+HYPRE_Int
+hypre_CSRMatrixPermuteDevice( hypre_CSRMatrix  *A,
+                              HYPRE_Int        *perm,
+                              HYPRE_Int        *rqperm,
+                              hypre_CSRMatrix  *B )
+{
+   /* Input matrix */
+   HYPRE_Int         num_rows     = hypre_CSRMatrixNumRows(A);
+   HYPRE_Int         num_nonzeros = hypre_CSRMatrixNumNonzeros(A);
+   HYPRE_Int        *A_i          = hypre_CSRMatrixI(A);
+   HYPRE_Int        *A_j          = hypre_CSRMatrixJ(A);
+   HYPRE_Complex    *A_a          = hypre_CSRMatrixData(A);
+   HYPRE_Int        *B_i          = hypre_CSRMatrixI(B);
+   HYPRE_Int        *B_j          = hypre_CSRMatrixJ(B);
+   HYPRE_Complex    *B_a          = hypre_CSRMatrixData(B);
+
+   HYPRE_Int        *B_ii;
+
+   /* Build B_i */
+#if defined(HYPRE_USING_SYCL)
+   oneapi::dpl::counting_iterator count(0);
+   hypreSycl_gather(perm,
+                    perm + num_rows,
+                    oneapi::dpl::make_transform_iterator(count, adj_functor(A_i)),
+                    B_i);
+#else
+   HYPRE_THRUST_CALL(gather,
+                     perm,
+                     perm + num_rows,
+                     thrust::make_transform_iterator(thrust::make_counting_iterator(0), adj_functor(A_i)),
+                     B_i);
+#endif
+   hypreDevice_IntegerExclusiveScan(num_rows + 1, B_i);
+
+   /* Build B_ii (row indices array) */
+   B_ii = hypre_TAlloc(HYPRE_Int, num_nonzeros, HYPRE_MEMORY_DEVICE);
+   hypreDevice_CsrRowPtrsToIndices_v2(num_rows, num_nonzeros, B_i, B_ii);
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_ONEDPL_CALL(std::for_each,
+                     count,
+                     count + num_nonzeros,
+                     bii_functor(perm, A_i, B_i, B_ii));
+
+   /* Build B_j and B_a */
+   hypreSycl_gather( B_ii,
+                     B_ii + num_nonzeros,
+                     oneapi::dpl::make_zip_iterator(oneapi::dpl::make_permutation_iterator(rqperm, A_j), A_a),
+                     oneapi::dpl::make_zip_iterator(B_j, B_a));
+#else
+   HYPRE_THRUST_CALL(for_each,
+                     thrust::make_counting_iterator(0),
+                     thrust::make_counting_iterator(num_nonzeros),
+                     bii_functor(perm, A_i, B_i, B_ii));
+
+   /* Build B_j and B_a */
+   HYPRE_THRUST_CALL(gather,
+                     B_ii,
+                     B_ii + num_nonzeros,
+                     thrust::make_zip_iterator(thrust::make_tuple(
+                                                  thrust::make_permutation_iterator(rqperm, A_j), A_a)),
+                     thrust::make_zip_iterator(thrust::make_tuple(B_j, B_a)));
+#endif
 
-   hypre_TFree(Cii, HYPRE_MEMORY_DEVICE);
-   hypre_TFree(Cjj, HYPRE_MEMORY_DEVICE);
-   hypre_TFree(idx, HYPRE_MEMORY_DEVICE);
+   /* Free memory */
+   hypre_TFree(B_ii, HYPRE_MEMORY_DEVICE);
 
    return hypre_error_flag;
 }
 
-#endif /* HYPRE_USING_CUDA || defined(HYPRE_USING_HIP) */
-
-#if defined(HYPRE_USING_GPU)
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixTransposeDevice
+ *--------------------------------------------------------------------------*/
 
 HYPRE_Int
 hypre_CSRMatrixTransposeDevice(hypre_CSRMatrix  *A,
@@ -1482,6 +2494,8 @@ hypre_CSRMatrixTransposeDevice(hypre_CSRMatrix  *A,
    HYPRE_Int        *C_j;
    hypre_CSRMatrix  *C;
 
+   HYPRE_ANNOTATE_FUNC_BEGIN;
+   hypre_GpuProfilingPushRange("CSRMatrixTranspose");
 
    /* trivial case */
    if (nnz_A == 0)
@@ -1492,13 +2506,24 @@ hypre_CSRMatrixTransposeDevice(hypre_CSRMatrix  *A,
    }
    else
    {
+      if ( !hypre_HandleSpTransUseVendor(hypre_handle()) )
+      {
+#if defined(HYPRE_USING_GPU)
+         hypreDevice_CSRSpTrans(nrows_A, ncols_A, nnz_A, A_i, A_j, A_data, &C_i, &C_j, &C_data, data);
+#endif
+      }
+      else
+      {
 #if defined(HYPRE_USING_CUSPARSE)
-      hypreDevice_CSRSpTransCusparse(nrows_A, ncols_A, nnz_A, A_i, A_j, A_data, &C_i, &C_j, &C_data, data);
+         hypreDevice_CSRSpTransCusparse(nrows_A, ncols_A, nnz_A, A_i, A_j, A_data, &C_i, &C_j, &C_data,
+                                        data);
 #elif defined(HYPRE_USING_ROCSPARSE)
-      hypreDevice_CSRSpTransRocsparse(nrows_A, ncols_A, nnz_A, A_i, A_j, A_data, &C_i, &C_j, &C_data, data);
-#else
-      hypreDevice_CSRSpTrans(nrows_A, ncols_A, nnz_A, A_i, A_j, A_data, &C_i, &C_j, &C_data, data);
+         hypreDevice_CSRSpTransRocsparse(nrows_A, ncols_A, nnz_A, A_i, A_j, A_data, &C_i, &C_j, &C_data,
+                                         data);
+#elif defined(HYPRE_USING_GPU)
+         hypreDevice_CSRSpTrans(nrows_A, ncols_A, nnz_A, A_i, A_j, A_data, &C_i, &C_j, &C_data, data);
 #endif
+      }
    }
 
    C = hypre_CSRMatrixCreate(ncols_A, nrows_A, nnz_A);
@@ -1509,500 +2534,1026 @@ hypre_CSRMatrixTransposeDevice(hypre_CSRMatrix  *A,
 
    *AT_ptr = C;
 
-   hypre_SyncCudaComputeStream(hypre_handle());
+   hypre_SyncComputeStream();
+
+   hypre_GpuProfilingPopRange();
+   HYPRE_ANNOTATE_FUNC_END;
 
    return hypre_error_flag;
 }
 
-#endif /* #if defined(HYPRE_USING_GPU) */
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixSortRow
+ *--------------------------------------------------------------------------*/
 
 HYPRE_Int
 hypre_CSRMatrixSortRow(hypre_CSRMatrix *A)
 {
+   hypre_GpuProfilingPushRange("CSRMatrixSort");
+
 #if defined(HYPRE_USING_CUSPARSE)
-   hypre_SortCSRCusparse(hypre_CSRMatrixNumRows(A), hypre_CSRMatrixNumCols(A), hypre_CSRMatrixNumNonzeros(A), hypre_CSRMatrixGPUMatDescr(A),
+   hypre_SortCSRCusparse(hypre_CSRMatrixNumRows(A), hypre_CSRMatrixNumCols(A),
+                         hypre_CSRMatrixNumNonzeros(A), hypre_CSRMatrixGPUMatDescr(A),
                          hypre_CSRMatrixI(A), hypre_CSRMatrixJ(A), hypre_CSRMatrixData(A));
+
 #elif defined(HYPRE_USING_ROCSPARSE)
-   hypre_SortCSRRocsparse(hypre_CSRMatrixNumRows(A), hypre_CSRMatrixNumCols(A), hypre_CSRMatrixNumNonzeros(A), hypre_CSRMatrixGPUMatDescr(A),
+   hypre_SortCSRRocsparse(hypre_CSRMatrixNumRows(A), hypre_CSRMatrixNumCols(A),
+                          hypre_CSRMatrixNumNonzeros(A), hypre_CSRMatrixGPUMatDescr(A),
                           hypre_CSRMatrixI(A), hypre_CSRMatrixJ(A), hypre_CSRMatrixData(A));
+#elif defined(HYPRE_USING_ONEMKLSPARSE)
+   HYPRE_ONEMKL_CALL( oneapi::mkl::sparse::sort_matrix(*hypre_HandleComputeStream(hypre_handle()),
+                                                       hypre_CSRMatrixGPUMatHandle(A), {}).wait() );
 #else
-   hypre_error_w_msg(HYPRE_ERROR_GENERIC,"hypre_CSRMatrixSortRow only implemented for cuSPARSE/rocSPARSE!\n");
+   HYPRE_UNUSED_VAR(A);
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                     "hypre_CSRMatrixSortRow only implemented for cuSPARSE/rocSPARSE/oneMKLSparse!\n");
 #endif
 
+   hypre_GpuProfilingPopRange();
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixSortRowOutOfPlace
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_CSRMatrixSortRowOutOfPlace(hypre_CSRMatrix *A)
+{
+   HYPRE_Int     *A_j  = hypre_CSRMatrixJ(A);
+   HYPRE_Complex *A_a  = hypre_CSRMatrixData(A);
+   HYPRE_Int      nnzA = hypre_CSRMatrixNumNonzeros(A);
+
+   /* if both exist, we assume A has been sorted */
+   if (hypre_CSRMatrixSortedJ(A) && hypre_CSRMatrixSortedData(A))
+   {
+      return hypre_error_flag;
+   }
+
+   hypre_TFree(hypre_CSRMatrixSortedJ(A), HYPRE_MEMORY_DEVICE);
+   hypre_TFree(hypre_CSRMatrixSortedData(A), HYPRE_MEMORY_DEVICE);
+
+   hypre_CSRMatrixSortedJ(A)    = hypre_TAlloc(HYPRE_Int,     nnzA, HYPRE_MEMORY_DEVICE);
+   hypre_CSRMatrixSortedData(A) = hypre_TAlloc(HYPRE_Complex, nnzA, HYPRE_MEMORY_DEVICE);
+
+   hypre_TMemcpy(hypre_CSRMatrixSortedJ(A), A_j, HYPRE_Int, nnzA,
+                 HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+   hypre_TMemcpy(hypre_CSRMatrixSortedData(A), A_a, HYPRE_Complex, nnzA,
+                 HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+
+   hypre_CSRMatrixJ(A) = hypre_CSRMatrixSortedJ(A);
+   hypre_CSRMatrixData(A) = hypre_CSRMatrixSortedData(A);
+
+   hypre_CSRMatrixSortRow(A);
+
+   hypre_CSRMatrixJ(A)    = A_j;
+   hypre_CSRMatrixData(A) = A_a;
+
    return hypre_error_flag;
 }
 
 #if defined(HYPRE_USING_CUSPARSE)
-/* @brief This functions sorts values and column indices in each row in ascending order INPLACE
- * @param[in] n Number of rows
- * @param[in] m Number of columns
- * @param[in] nnzA Number of nonzeroes
- * @param[in] *d_ia (Unsorted) Row indices
- * @param[in,out] *d_ja_sorted On Start: Unsorted column indices. On return: Sorted column indices
- * @param[in,out] *d_a_sorted On Start: Unsorted values. On Return: Sorted values corresponding with column indices
- */
-void
-hypre_SortCSRCusparse(       HYPRE_Int      n,
-                             HYPRE_Int      m,
-                             HYPRE_Int      nnzA,
-                             cusparseMatDescr_t descrA,
+
+/*--------------------------------------------------------------------------
+ * hypre_SortCSRCusparse
+ *
+ * Sorts values and column indices in each row in ascending order INPLACE
+ *
+ * Parameters:
+ *   n: Number of rows [in]
+ *   m: Number of columns [in]
+ *   nnzA: Number of nonzeros [in]
+ *   d_ia: row pointers [in/out]
+ *   d_ja_sorted: column indices [in/out]
+ *   d_a_sorted: coefficients [in/out]
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_SortCSRCusparse( HYPRE_Int            n,
+                       HYPRE_Int            m,
+                       HYPRE_Int            nnzA,
+                       cusparseMatDescr_t   descrA,
                        const HYPRE_Int     *d_ia,
-                             HYPRE_Int     *d_ja_sorted,
-                             HYPRE_Complex *d_a_sorted )
+                       HYPRE_Int           *d_ja_sorted,
+                       HYPRE_Complex       *d_a_sorted )
 {
-   cusparseHandle_t cusparsehandle = hypre_HandleCusparseHandle(hypre_handle());
+   cusparseHandle_t  cusparsehandle = hypre_HandleCusparseHandle(hypre_handle());
+   size_t            pBufferSizeInBytes = 0;
+   void             *pBuffer = NULL;
+   csru2csrInfo_t    sortInfoA;
 
-   size_t pBufferSizeInBytes = 0;
-   void *pBuffer = NULL;
+   hypre_GpuProfilingPushRange("SortCSRCusparse");
 
-   csru2csrInfo_t sortInfoA;
    HYPRE_CUSPARSE_CALL( cusparseCreateCsru2csrInfo(&sortInfoA) );
+   HYPRE_CUSPARSE_CALL( hypre_cusparse_csru2csr_bufferSizeExt(cusparsehandle,
+                                                              n, m, nnzA,
+                                                              d_a_sorted, d_ia, d_ja_sorted,
+                                                              sortInfoA, &pBufferSizeInBytes) );
 
-   HYPRE_Int isDoublePrecision = sizeof(HYPRE_Complex) == sizeof(hypre_double);
-   HYPRE_Int isSinglePrecision = sizeof(HYPRE_Complex) == sizeof(hypre_double) / 2;
-
-   if (isDoublePrecision)
-   {
-      HYPRE_CUSPARSE_CALL( cusparseDcsru2csr_bufferSizeExt(cusparsehandle,
-                                                           n, m, nnzA, d_a_sorted, d_ia, d_ja_sorted,
-                                                           sortInfoA, &pBufferSizeInBytes) );
-
-      pBuffer = hypre_TAlloc(char, pBufferSizeInBytes, HYPRE_MEMORY_DEVICE);
-
-      HYPRE_CUSPARSE_CALL( cusparseDcsru2csr(cusparsehandle,
-                                             n, m, nnzA, descrA, d_a_sorted, d_ia, d_ja_sorted,
-                                             sortInfoA, pBuffer) );
-   }
-   else if (isSinglePrecision)
-   {
-      HYPRE_CUSPARSE_CALL( cusparseScsru2csr_bufferSizeExt(cusparsehandle,
-                                                           n, m, nnzA, (float *) d_a_sorted, d_ia, d_ja_sorted,
-                                                           sortInfoA, &pBufferSizeInBytes));
-
-      pBuffer = hypre_TAlloc(char, pBufferSizeInBytes, HYPRE_MEMORY_DEVICE);
-
-      HYPRE_CUSPARSE_CALL( cusparseScsru2csr(cusparsehandle,
-                                             n, m, nnzA, descrA, (float *)d_a_sorted, d_ia, d_ja_sorted,
-                                             sortInfoA, pBuffer) );
-   }
+   pBuffer = hypre_TAlloc(char, pBufferSizeInBytes, HYPRE_MEMORY_DEVICE);
+   HYPRE_CUSPARSE_CALL( hypre_cusparse_csru2csr(cusparsehandle,
+                                                n, m, nnzA, descrA,
+                                                d_a_sorted, d_ia, d_ja_sorted,
+                                                sortInfoA, pBuffer) );
 
    hypre_TFree(pBuffer, HYPRE_MEMORY_DEVICE);
    HYPRE_CUSPARSE_CALL(cusparseDestroyCsru2csrInfo(sortInfoA));
+
+   hypre_GpuProfilingPopRange();
+
+   return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixTriLowerUpperSolveCusparse
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_CSRMatrixTriLowerUpperSolveCusparse(char             uplo,
+                                          HYPRE_Int        unit_diag,
                                           hypre_CSRMatrix *A,
                                           HYPRE_Real      *l1_norms,
-                                          hypre_Vector    *f,
-                                          hypre_Vector    *u )
+                                          HYPRE_Complex   *f_data,
+                                          HYPRE_Complex   *u_data )
 {
-   HYPRE_Int      nrow   = hypre_CSRMatrixNumRows(A);
-   HYPRE_Int      ncol   = hypre_CSRMatrixNumCols(A);
-   HYPRE_Int      nnzA   = hypre_CSRMatrixNumNonzeros(A);
-   HYPRE_Int     *A_i    = hypre_CSRMatrixI(A);
-   HYPRE_Int     *A_j    = hypre_CSRMatrixJ(A);
-   HYPRE_Complex *A_a    = hypre_CSRMatrixData(A);
-   HYPRE_Int     *A_sj   = hypre_CSRMatrixSortedJ(A);
-   HYPRE_Complex *A_sa   = hypre_CSRMatrixSortedData(A);
-   HYPRE_Complex *f_data = hypre_VectorData(f);
-   HYPRE_Complex *u_data = hypre_VectorData(u);
-   HYPRE_Complex  alpha  = 1.0;
-   hypre_int      buffer_size;
-   hypre_int      structural_zero;
-
-   if (nrow != ncol)
-   {
-      hypre_assert(0);
-      hypre_error_in_arg(1);
-      return hypre_error_flag;
-   }
+   HYPRE_Int              num_rows     = hypre_CSRMatrixNumRows(A);
+   HYPRE_Int              num_nonzeros = hypre_CSRMatrixNumNonzeros(A);
+   HYPRE_Int             *A_i          = hypre_CSRMatrixI(A);
+   HYPRE_Int             *A_j          = hypre_CSRMatrixJ(A);
+   HYPRE_Complex         *A_a          = hypre_CSRMatrixData(A);
+   hypre_CsrsvData       *csrsv_data   = hypre_CSRMatrixCsrsvData(A);
+   HYPRE_Complex         *A_ma;
+
+   cusparseHandle_t       handle       = hypre_HandleCusparseHandle(hypre_handle());
+   cusparseDiagType_t     diag_type    = unit_diag ? CUSPARSE_DIAG_TYPE_UNIT :
+                                         CUSPARSE_DIAG_TYPE_NON_UNIT;
+   cusparseFillMode_t     fill_mode_L  = CUSPARSE_FILL_MODE_LOWER;
+   cusparseFillMode_t     fill_mode_U  = CUSPARSE_FILL_MODE_UPPER;
+   cusparseOperation_t    operation    = CUSPARSE_OPERATION_NON_TRANSPOSE;
+
+   HYPRE_Complex          alpha        = 1.0;
+
+#if CUSPARSE_VERSION >= CUSPARSE_SPSV_VERSION
+   HYPRE_Int              num_cols     = hypre_CSRMatrixNumCols(A);
+   cusparseSpMatDescr_t   matA;
+   cusparseDnVecDescr_t   vecF;
+   cusparseDnVecDescr_t   vecU;
+
+   cudaDataType           data_type    = hypre_HYPREComplexToCudaDataType();
+   size_t                 buffer_size;
+   char*                  buffer_L;
+   char*                  buffer_U;
+#else
+   cusparseSolvePolicy_t  policy = CUSPARSE_SOLVE_POLICY_USE_LEVEL;
+   cusparseMatDescr_t     descr;
+   cusparseStatus_t       status;
+   HYPRE_Int             *A_sj;
+   hypre_int              buffer_size;
+   char*                  buffer;
+   hypre_int              structural_zero;
+   char                   msg[256];
+
+   /* cuSPARSE's legacy API requires sorted rows. Sort and save in CSR's (sj, sa) */
+   hypre_CSRMatrixSortRowOutOfPlace(A);
+#endif
 
-   if (nrow <= 0)
+   /* setup csrsvdata in CSR: modify the diagonal (once) */
+   if (!csrsv_data)
    {
-      return hypre_error_flag;
-   }
+      hypre_CSRMatrixCsrsvData(A) = hypre_CsrsvDataCreate();
+      csrsv_data = hypre_CSRMatrixCsrsvData(A);
 
-   if (nnzA <= 0)
-   {
-      hypre_assert(0);
-      hypre_error_in_arg(1);
-      return hypre_error_flag;
-   }
+      hypre_CsrsvDataMatData(csrsv_data) = hypre_TAlloc(HYPRE_Complex, num_nonzeros,
+                                                        HYPRE_MEMORY_DEVICE);
+      hypre_CSRMatrixData(A) = hypre_CsrsvDataMatData(csrsv_data);
 
-   cusparseHandle_t handle = hypre_HandleCusparseHandle(hypre_handle());
-   cusparseMatDescr_t descr = hypre_CSRMatrixGPUMatDescr(A);
+#if CUSPARSE_VERSION >= CUSPARSE_SPSV_VERSION
+      hypre_TMemcpy(hypre_CsrsvDataMatData(csrsv_data), A_a, HYPRE_Complex, num_nonzeros,
+                    HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+#else
+      hypre_TMemcpy(hypre_CsrsvDataMatData(csrsv_data), hypre_CSRMatrixSortedData(A),
+                    HYPRE_Complex, num_nonzeros,
+                    HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+      hypre_CSRMatrixJ(A) = hypre_CSRMatrixSortedJ(A);
+#endif
 
-   if ( !A_sj && !A_sa )
-   {
-      hypre_CSRMatrixSortedJ(A) = A_sj = hypre_TAlloc(HYPRE_Int, nnzA, HYPRE_MEMORY_DEVICE);
-      hypre_CSRMatrixSortedData(A) = A_sa = hypre_TAlloc(HYPRE_Complex, nnzA, HYPRE_MEMORY_DEVICE);
-      hypre_TMemcpy(A_sj, A_j, HYPRE_Int, nnzA, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
-      hypre_TMemcpy(A_sa, A_a, HYPRE_Complex, nnzA, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+      /* if (l1_norms), replace A's diag with l1_norm, and
+       * replace zero diag with inf. so as to skip relaxation for this unknown */
+      hypre_CSRMatrixReplaceDiagDevice(A, l1_norms, INFINITY, 0.0);
 
-#if defined(HYPRE_USING_CUDA)
-      hypre_CSRMatrixData(A) = A_sa;
-      HYPRE_Int err = 0;
-      if (l1_norms)
-      {
-         err = hypre_CSRMatrixReplaceDiagDevice(A, l1_norms, INFINITY, 0.0);
-      }
-      else
-      {
-         err = hypre_CSRMatrixFixZeroDiagDevice(A, INFINITY, 0.0);
-      }
       hypre_CSRMatrixData(A) = A_a;
-      if (err)
-      {
-         hypre_error_w_msg(1, "structural zero in hypre_CSRMatrixTriLowerUpperSolveCusparse");
-         //hypre_assert(0);
-      }
+#if CUSPARSE_VERSION < CUSPARSE_SPSV_VERSION
+      hypre_CSRMatrixJ(A) = A_j;
 #endif
-
-      hypre_SortCSRCusparse(nrow, ncol, nnzA, descr, A_i, A_sj, A_sa);
    }
 
-   HYPRE_CUSPARSE_CALL( cusparseSetMatDiagType(descr, CUSPARSE_DIAG_TYPE_NON_UNIT) );
+   /* Analysis and Solve */
+   A_ma = hypre_CsrsvDataMatData(csrsv_data);
 
-   if (!hypre_CSRMatrixCsrsvData(A))
-   {
-      hypre_CSRMatrixCsrsvData(A) = hypre_CsrsvDataCreate();
-   }
-   hypre_CsrsvData *csrsv_data = hypre_CSRMatrixCsrsvData(A);
+#if CUSPARSE_VERSION >= CUSPARSE_SPSV_VERSION
+   matA = hypre_CSRMatrixToCusparseSpMat_core(num_rows, num_cols, 0,
+                                              num_nonzeros, A_i, A_j, A_ma);
+   vecF = hypre_VectorToCusparseDnVec_core(f_data, num_rows);
+   vecU = hypre_VectorToCusparseDnVec_core(u_data, num_cols);
+
+   HYPRE_CUSPARSE_CALL( cusparseSpMatSetAttribute(matA, CUSPARSE_SPMAT_DIAG_TYPE,
+                                                  &diag_type, sizeof(cusparseDiagType_t)) );
+#else
+   A_sj  = hypre_CSRMatrixSortedJ(A);
+   descr = hypre_CSRMatrixGPUMatDescr(A);
+   HYPRE_CUSPARSE_CALL( cusparseSetMatDiagType(descr, diag_type) );
+#endif
 
    if (uplo == 'L')
    {
-      HYPRE_CUSPARSE_CALL( cusparseSetMatFillMode(descr, CUSPARSE_FILL_MODE_LOWER) );
+#if CUSPARSE_VERSION >= CUSPARSE_SPSV_VERSION
+      HYPRE_CUSPARSE_CALL( cusparseSpMatSetAttribute(matA,
+                                                     CUSPARSE_SPMAT_FILL_MODE,
+                                                     &fill_mode_L,
+                                                     sizeof(cusparseFillMode_t)) );
+#else
+      HYPRE_CUSPARSE_CALL( cusparseSetMatFillMode(descr, fill_mode_L) );
+#endif
 
-      if (!hypre_CsrsvDataInfoL(csrsv_data))
+      /* TODO (VPM): move the following block to hypre_CSRMatrixTriSetupCusparse */
+      if (!hypre_CsrsvDataAnalyzedL(csrsv_data))
       {
-         HYPRE_CUSPARSE_CALL( cusparseCreateCsrsv2Info(&hypre_CsrsvDataInfoL(csrsv_data)) );
-
-         HYPRE_CUSPARSE_CALL( cusparseDcsrsv2_bufferSize(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                              nrow, nnzA, descr, A_sa, A_i, A_sj, hypre_CsrsvDataInfoL(csrsv_data), &buffer_size) );
+#if CUSPARSE_VERSION >= CUSPARSE_SPSV_VERSION
+         HYPRE_CUSPARSE_CALL( cusparseSpSV_bufferSize(handle, operation,
+                                                      &alpha, matA, vecF, vecU, data_type,
+                                                      CUSPARSE_SPSV_ALG_DEFAULT,
+                                                      hypre_CsrsvDataInfoL(csrsv_data),
+                                                      &buffer_size) );
+#else
+         HYPRE_CUSPARSE_CALL( hypre_cusparse_csrsv2_bufferSize(handle,
+                                                               operation,
+                                                               num_rows, num_nonzeros, descr,
+                                                               A_ma, A_i, A_sj,
+                                                               hypre_CsrsvDataInfoL(csrsv_data),
+                                                               &buffer_size) );
+#endif
 
+#if CUSPARSE_VERSION >= CUSPARSE_SPSV_VERSION
+         if (hypre_CsrsvDataBufferSizeL(csrsv_data) < buffer_size)
+         {
+            buffer_L = hypre_TReAlloc_v2(hypre_CsrsvDataBufferL(csrsv_data),
+                                         char,
+                                         hypre_CsrsvDataBufferSizeL(csrsv_data),
+                                         char,
+                                         buffer_size,
+                                         HYPRE_MEMORY_DEVICE);
+
+            hypre_CsrsvDataBufferL(csrsv_data)     = buffer_L;
+            hypre_CsrsvDataBufferSizeL(csrsv_data) = buffer_size;
+         }
+#else
          if (hypre_CsrsvDataBufferSize(csrsv_data) < buffer_size)
          {
-            hypre_CsrsvDataBuffer(csrsv_data) = hypre_TReAlloc_v2(hypre_CsrsvDataBuffer(csrsv_data),
-                                                                  char, hypre_CsrsvDataBufferSize(csrsv_data),
-                                                                  char, buffer_size,
-                                                                  HYPRE_MEMORY_DEVICE);
+            buffer = hypre_TReAlloc_v2(hypre_CsrsvDataBuffer(csrsv_data),
+                                       char,
+                                       hypre_CsrsvDataBufferSize(csrsv_data),
+                                       char,
+                                       buffer_size,
+                                       HYPRE_MEMORY_DEVICE);
+
+            hypre_CsrsvDataBuffer(csrsv_data)     = buffer;
             hypre_CsrsvDataBufferSize(csrsv_data) = buffer_size;
          }
+#endif
 
-         HYPRE_CUSPARSE_CALL( cusparseDcsrsv2_analysis(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                       nrow, nnzA, descr, A_sa, A_i, A_sj,
-                                                       hypre_CsrsvDataInfoL(csrsv_data), CUSPARSE_SOLVE_POLICY_USE_LEVEL,
-                                                       hypre_CsrsvDataBuffer(csrsv_data)) );
-
-         cusparseStatus_t status = cusparseXcsrsv2_zeroPivot(handle, hypre_CsrsvDataInfoL(csrsv_data), &structural_zero);
+#if CUSPARSE_VERSION >= CUSPARSE_SPSV_VERSION
+         HYPRE_CUSPARSE_CALL( cusparseSpSV_analysis(handle, operation,
+                                                    &alpha, matA, vecF, vecU, data_type,
+                                                    CUSPARSE_SPSV_ALG_DEFAULT,
+                                                    hypre_CsrsvDataInfoL(csrsv_data),
+                                                    hypre_CsrsvDataBufferL(csrsv_data)) );
+#else
+         HYPRE_CUSPARSE_CALL( hypre_cusparse_csrsv2_analysis(handle,
+                                                             operation,
+                                                             num_rows, num_nonzeros, descr,
+                                                             A_ma, A_i, A_sj,
+                                                             hypre_CsrsvDataInfoL(csrsv_data),
+                                                             policy,
+                                                             hypre_CsrsvDataBuffer(csrsv_data)) );
+
+         status = cusparseXcsrsv2_zeroPivot(handle,
+                                            hypre_CsrsvDataInfoL(csrsv_data),
+                                            &structural_zero);
          if (CUSPARSE_STATUS_ZERO_PIVOT == status)
          {
-            char msg[256];
-            hypre_sprintf(msg, "hypre_CSRMatrixTriLowerUpperSolveCusparse A(%d,%d) is missing\n",
+            hypre_sprintf(msg, "A(%d,%d) is missing\n",
                           structural_zero, structural_zero);
             hypre_error_w_msg(1, msg);
-            //hypre_assert(0);
          }
+#endif
+         hypre_CsrsvDataAnalyzedL(csrsv_data) = 1;
       }
 
-      HYPRE_CUSPARSE_CALL( cusparseDcsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                 nrow, nnzA, &alpha, descr, A_sa, A_i, A_sj,
-                                                 hypre_CsrsvDataInfoL(csrsv_data), f_data, u_data,
-                                                 CUSPARSE_SOLVE_POLICY_USE_LEVEL,
-                                                 hypre_CsrsvDataBuffer(csrsv_data)) );
+#if CUSPARSE_VERSION >= CUSPARSE_SPSV_VERSION
+      HYPRE_CUSPARSE_CALL( cusparseSpSV_solve(handle, operation,
+                                              &alpha, matA, vecF, vecU, data_type,
+                                              CUSPARSE_SPSV_ALG_DEFAULT,
+                                              hypre_CsrsvDataInfoL(csrsv_data)) );
+#else
+      HYPRE_CUSPARSE_CALL( hypre_cusparse_csrsv2_solve(handle, operation,
+                                                       num_rows, num_nonzeros, &alpha, descr,
+                                                       A_ma, A_i, A_sj,
+                                                       hypre_CsrsvDataInfoL(csrsv_data),
+                                                       f_data, u_data, policy,
+                                                       hypre_CsrsvDataBuffer(csrsv_data)) );
+#endif
    }
    else
    {
-      HYPRE_CUSPARSE_CALL( cusparseSetMatFillMode(descr, CUSPARSE_FILL_MODE_UPPER) );
+#if CUSPARSE_VERSION >= CUSPARSE_SPSV_VERSION
+      HYPRE_CUSPARSE_CALL( cusparseSpMatSetAttribute(matA,
+                                                     CUSPARSE_SPMAT_FILL_MODE,
+                                                     &fill_mode_U,
+                                                     sizeof(cusparseFillMode_t)) );
+#else
+      HYPRE_CUSPARSE_CALL( cusparseSetMatFillMode(descr, fill_mode_U) );
+#endif
 
-      if (!hypre_CsrsvDataInfoU(csrsv_data))
+      /* TODO (VPM): move the following block to hypre_CSRMatrixTriSetupCusparse */
+      if (!hypre_CsrsvDataAnalyzedU(csrsv_data))
       {
-         HYPRE_CUSPARSE_CALL( cusparseCreateCsrsv2Info(&hypre_CsrsvDataInfoU(csrsv_data)) );
-
-         HYPRE_CUSPARSE_CALL( cusparseDcsrsv2_bufferSize(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                              nrow, nnzA, descr, A_sa, A_i, A_sj, hypre_CsrsvDataInfoU(csrsv_data), &buffer_size) );
+#if CUSPARSE_VERSION >= CUSPARSE_SPSV_VERSION
+         HYPRE_CUSPARSE_CALL( cusparseSpSV_bufferSize(handle, operation,
+                                                      &alpha, matA, vecF, vecU, data_type,
+                                                      CUSPARSE_SPSV_ALG_DEFAULT,
+                                                      hypre_CsrsvDataInfoU(csrsv_data),
+                                                      &buffer_size) );
+#else
+         HYPRE_CUSPARSE_CALL( hypre_cusparse_csrsv2_bufferSize(handle,
+                                                               operation,
+                                                               num_rows, num_nonzeros, descr,
+                                                               A_ma, A_i, A_sj,
+                                                               hypre_CsrsvDataInfoU(csrsv_data),
+                                                               &buffer_size) );
+#endif
 
+#if CUSPARSE_VERSION >= CUSPARSE_SPSV_VERSION
+         if (hypre_CsrsvDataBufferSizeU(csrsv_data) < buffer_size)
+         {
+            buffer_U = hypre_TReAlloc_v2(hypre_CsrsvDataBufferU(csrsv_data),
+                                         char,
+                                         hypre_CsrsvDataBufferSizeU(csrsv_data),
+                                         char,
+                                         buffer_size,
+                                         HYPRE_MEMORY_DEVICE);
+
+            hypre_CsrsvDataBufferU(csrsv_data)     = buffer_U;
+            hypre_CsrsvDataBufferSizeU(csrsv_data) = buffer_size;
+         }
+#else
          if (hypre_CsrsvDataBufferSize(csrsv_data) < buffer_size)
          {
-            hypre_CsrsvDataBuffer(csrsv_data) = hypre_TReAlloc_v2(hypre_CsrsvDataBuffer(csrsv_data),
-                                                                  char, hypre_CsrsvDataBufferSize(csrsv_data),
-                                                                  char, buffer_size,
-                                                                  HYPRE_MEMORY_DEVICE);
+            buffer = hypre_TReAlloc_v2(hypre_CsrsvDataBuffer(csrsv_data),
+                                       char,
+                                       hypre_CsrsvDataBufferSize(csrsv_data),
+                                       char,
+                                       buffer_size,
+                                       HYPRE_MEMORY_DEVICE);
+
+            hypre_CsrsvDataBuffer(csrsv_data)     = buffer;
             hypre_CsrsvDataBufferSize(csrsv_data) = buffer_size;
          }
+#endif
 
-         HYPRE_CUSPARSE_CALL( cusparseDcsrsv2_analysis(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                       nrow, nnzA, descr, A_sa, A_i, A_sj,
-                                                       hypre_CsrsvDataInfoU(csrsv_data), CUSPARSE_SOLVE_POLICY_USE_LEVEL,
-                                                       hypre_CsrsvDataBuffer(csrsv_data)) );
-
-         cusparseStatus_t status = cusparseXcsrsv2_zeroPivot(handle, hypre_CsrsvDataInfoU(csrsv_data), &structural_zero);
+#if CUSPARSE_VERSION >= CUSPARSE_SPSV_VERSION
+         HYPRE_CUSPARSE_CALL( cusparseSpSV_analysis(handle, operation,
+                                                    &alpha, matA, vecF, vecU, data_type,
+                                                    CUSPARSE_SPSV_ALG_DEFAULT,
+                                                    hypre_CsrsvDataInfoU(csrsv_data),
+                                                    hypre_CsrsvDataBufferU(csrsv_data)) );
+#else
+         HYPRE_CUSPARSE_CALL( hypre_cusparse_csrsv2_analysis(handle,
+                                                             operation,
+                                                             num_rows, num_nonzeros, descr,
+                                                             A_ma, A_i, A_sj,
+                                                             hypre_CsrsvDataInfoU(csrsv_data),
+                                                             policy,
+                                                             hypre_CsrsvDataBuffer(csrsv_data)) );
+
+         status = cusparseXcsrsv2_zeroPivot(handle,
+                                            hypre_CsrsvDataInfoU(csrsv_data),
+                                            &structural_zero);
          if (CUSPARSE_STATUS_ZERO_PIVOT == status)
          {
-            char msg[256];
-            hypre_sprintf(msg, "hypre_CSRMatrixTriLowerUpperSolveCusparse A(%d,%d) is missing\n",
+            hypre_sprintf(msg, "A(%d,%d) is missing\n",
                           structural_zero, structural_zero);
             hypre_error_w_msg(1, msg);
-            //hypre_assert(0);
          }
+#endif
+         hypre_CsrsvDataAnalyzedU(csrsv_data) = 1;
       }
 
-      HYPRE_CUSPARSE_CALL( cusparseDcsrsv2_solve(handle, CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                 nrow, nnzA, &alpha, descr, A_sa, A_i, A_sj,
-                                                 hypre_CsrsvDataInfoU(csrsv_data), f_data, u_data,
-                                                 CUSPARSE_SOLVE_POLICY_USE_LEVEL,
-                                                 hypre_CsrsvDataBuffer(csrsv_data)) );
+#if CUSPARSE_VERSION >= CUSPARSE_SPSV_VERSION
+      HYPRE_CUSPARSE_CALL( cusparseSpSV_solve(handle, operation,
+                                              &alpha, matA, vecF, vecU, data_type,
+                                              CUSPARSE_SPSV_ALG_DEFAULT,
+                                              hypre_CsrsvDataInfoU(csrsv_data)) );
+#else
+      HYPRE_CUSPARSE_CALL( hypre_cusparse_csrsv2_solve(handle,
+                                                       operation,
+                                                       num_rows, num_nonzeros, &alpha,
+                                                       descr, A_ma, A_i, A_sj,
+                                                       hypre_CsrsvDataInfoU(csrsv_data),
+                                                       f_data, u_data, policy,
+                                                       hypre_CsrsvDataBuffer(csrsv_data)) );
+#endif
    }
 
+   /* Free memory */
+#if CUSPARSE_VERSION >= CUSPARSE_SPSV_VERSION
+   HYPRE_CUSPARSE_CALL( cusparseDestroySpMat(matA) );
+   HYPRE_CUSPARSE_CALL( cusparseDestroyDnVec(vecF) );
+   HYPRE_CUSPARSE_CALL( cusparseDestroyDnVec(vecU) );
+#endif
+
    return hypre_error_flag;
 }
 
-#endif /* #if defined(HYPRE_USING_CUSPARSE) */
+#elif defined(HYPRE_USING_ROCSPARSE)
 
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixTriLowerUpperSolveRocsparse
+ *--------------------------------------------------------------------------*/
 
-#if defined(HYPRE_USING_ROCSPARSE)
 HYPRE_Int
 hypre_CSRMatrixTriLowerUpperSolveRocsparse(char              uplo,
-                                           hypre_CSRMatrix * A,
-                                           HYPRE_Real      * l1_norms,
-                                           hypre_Vector    * f,
-                                           hypre_Vector    * u )
+                                           HYPRE_Int         unit_diag,
+                                           hypre_CSRMatrix  *A,
+                                           HYPRE_Real       *l1_norms,
+                                           HYPRE_Complex    *f_data,
+                                           HYPRE_Complex    *u_data )
 {
-   HYPRE_Int      nrow   = hypre_CSRMatrixNumRows(A);
-   HYPRE_Int      ncol   = hypre_CSRMatrixNumCols(A);
-   HYPRE_Int      nnzA   = hypre_CSRMatrixNumNonzeros(A);
-   HYPRE_Int     *A_i    = hypre_CSRMatrixI(A);
-   HYPRE_Int     *A_j    = hypre_CSRMatrixJ(A);
-   HYPRE_Complex *A_a    = hypre_CSRMatrixData(A);
-   HYPRE_Int     *A_sj   = hypre_CSRMatrixSortedJ(A);
-   HYPRE_Complex *A_sa   = hypre_CSRMatrixSortedData(A);
-   HYPRE_Complex *f_data = hypre_VectorData(f);
-   HYPRE_Complex *u_data = hypre_VectorData(u);
-   HYPRE_Complex  alpha  = 1.0;
-   size_t         buffer_size;
-   hypre_int      structural_zero;
-
-   if (nrow != ncol)
-   {
-      hypre_assert(0);
-      hypre_error_in_arg(1);
-      return hypre_error_flag;
-   }
-
-   if (nrow <= 0)
+   HYPRE_Int            num_rows      = hypre_CSRMatrixNumRows(A);
+   HYPRE_Int            num_nonzeros  = hypre_CSRMatrixNumNonzeros(A);
+   HYPRE_Int           *A_i           = hypre_CSRMatrixI(A);
+   HYPRE_Int           *A_j           = hypre_CSRMatrixJ(A);
+   HYPRE_Complex       *A_a           = hypre_CSRMatrixData(A);
+   hypre_CsrsvData     *csrsv_data    = hypre_CSRMatrixCsrsvData(A);
+
+   rocsparse_handle     handle        = hypre_HandleCusparseHandle(hypre_handle());
+   rocsparse_mat_descr  descr         = hypre_CSRMatrixGPUMatDescr(A);
+   HYPRE_Int           *A_sj;
+   HYPRE_Complex       *A_ma;
+
+   rocsparse_status     status;
+   rocsparse_diag_type  diag_type     = unit_diag ? rocsparse_diag_type_unit :
+                                        rocsparse_diag_type_non_unit;
+   HYPRE_Complex        alpha         = 1.0;
+   hypre_int            structural_zero;
+   size_t               buffer_size;
+   char                *buffer;
+   char                 msg[256];
+
+   /* rocSPARSE requires sorted rows. Sort and save in CSR's (sj, sa) */
+   hypre_CSRMatrixSortRowOutOfPlace(A);
+
+   /* Setup csrsvdata in CSR: modify the diagonal (once) */
+   if (!csrsv_data)
    {
-      return hypre_error_flag;
-   }
+      hypre_CSRMatrixCsrsvData(A) = hypre_CsrsvDataCreate();
+      csrsv_data = hypre_CSRMatrixCsrsvData(A);
 
-   if (nnzA <= 0)
-   {
-      hypre_assert(0);
-      hypre_error_in_arg(1);
-      return hypre_error_flag;
-   }
+      hypre_CsrsvDataMatData(csrsv_data) = hypre_TAlloc(HYPRE_Complex,
+                                                        num_nonzeros,
+                                                        HYPRE_MEMORY_DEVICE);
 
-   rocsparse_handle handle = hypre_HandleCusparseHandle(hypre_handle());
-   rocsparse_mat_descr descr = hypre_CSRMatrixGPUMatDescr(A);
+      hypre_CSRMatrixData(A) = hypre_CsrsvDataMatData(csrsv_data);
+      hypre_TMemcpy(hypre_CsrsvDataMatData(csrsv_data), hypre_CSRMatrixSortedData(A),
+                    HYPRE_Complex, num_nonzeros,
+                    HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+      hypre_CSRMatrixJ(A) = hypre_CSRMatrixSortedJ(A);
 
-   if ( !A_sj && !A_sa )
-   {
-      hypre_CSRMatrixSortedJ(A) = A_sj = hypre_TAlloc(HYPRE_Int, nnzA, HYPRE_MEMORY_DEVICE);
-      hypre_CSRMatrixSortedData(A) = A_sa = hypre_TAlloc(HYPRE_Complex, nnzA, HYPRE_MEMORY_DEVICE);
-      hypre_TMemcpy(A_sj, A_j, HYPRE_Int, nnzA, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
-      hypre_TMemcpy(A_sa, A_a, HYPRE_Complex, nnzA, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+      /* if (l1_norms), replace A's diag with l1_norm, and
+       * replace zero diag with inf. so as to skip relaxation for this unknown */
+      hypre_CSRMatrixReplaceDiagDevice(A, l1_norms, INFINITY, 0.0);
 
-#if defined(HYPRE_USING_HIP)
-      hypre_CSRMatrixData(A) = A_sa;
-      HYPRE_Int err = 0;
-      if (l1_norms)
-      {
-         err = hypre_CSRMatrixReplaceDiagDevice(A, l1_norms, INFINITY, 0.0);
-      }
-      else
-      {
-         err = hypre_CSRMatrixFixZeroDiagDevice(A, INFINITY, 0.0);
-      }
       hypre_CSRMatrixData(A) = A_a;
-      if (err)
-      {
-         hypre_error_w_msg(1, "structural zero in hypre_CSRMatrixTriLowerUpperSolveRocsparse");
-         //hypre_assert(0);
-      }
-#endif
-
-      hypre_SortCSRRocsparse(nrow, ncol, nnzA, descr, A_i, A_sj, A_sa);
+      hypre_CSRMatrixJ(A)    = A_j;
    }
 
-   HYPRE_ROCSPARSE_CALL( rocsparse_set_mat_diag_type(descr, rocsparse_diag_type_non_unit) );
+   /* Analysis and Solve */
+   buffer = hypre_CsrsvDataBuffer(csrsv_data);
+   A_ma   = hypre_CsrsvDataMatData(csrsv_data);
+   A_sj   = hypre_CSRMatrixSortedJ(A);
 
-   if (!hypre_CSRMatrixCsrsvData(A))
-   {
-      hypre_CSRMatrixCsrsvData(A) = hypre_CsrsvDataCreate();
-   }
-   hypre_CsrsvData *csrsv_data = hypre_CSRMatrixCsrsvData(A);
+   /* Set matrix diagonal type */
+   HYPRE_ROCSPARSE_CALL( rocsparse_set_mat_diag_type(descr, diag_type) );
 
    if (uplo == 'L')
    {
       HYPRE_ROCSPARSE_CALL( rocsparse_set_mat_fill_mode(descr, rocsparse_fill_mode_lower) );
 
-      if (!hypre_CsrsvDataInfoL(csrsv_data))
+      /* TODO (VPM): move the following block to hypre_CSRMatrixTriSetupRocsparse */
+      if (!hypre_CsrsvDataAnalyzedL(csrsv_data))
       {
-         HYPRE_ROCSPARSE_CALL( rocsparse_create_mat_info(&hypre_CsrsvDataInfoL(csrsv_data)) );
-
-         HYPRE_ROCSPARSE_CALL( rocsparse_dcsrsv_buffer_size(handle, rocsparse_operation_none,
-                               nrow, nnzA, descr, A_sa, A_i, A_sj, hypre_CsrsvDataInfoL(csrsv_data), &buffer_size) );
+         HYPRE_ROCSPARSE_CALL( hypre_rocsparse_csrsv_buffer_size(handle,
+                                                                 rocsparse_operation_none,
+                                                                 num_rows, num_nonzeros, descr,
+                                                                 A_ma, A_i, A_sj,
+                                                                 hypre_CsrsvDataInfoL(csrsv_data),
+                                                                 &buffer_size) );
 
          if (hypre_CsrsvDataBufferSize(csrsv_data) < buffer_size)
          {
-            hypre_CsrsvDataBuffer(csrsv_data) = hypre_TReAlloc_v2(hypre_CsrsvDataBuffer(csrsv_data),
-                                                                  char, hypre_CsrsvDataBufferSize(csrsv_data),
-                                                                  char, buffer_size,
-                                                                  HYPRE_MEMORY_DEVICE);
+            buffer = hypre_TReAlloc_v2(hypre_CsrsvDataBuffer(csrsv_data),
+                                       char, hypre_CsrsvDataBufferSize(csrsv_data),
+                                       char, buffer_size,
+                                       HYPRE_MEMORY_DEVICE);
+
+            hypre_CsrsvDataBuffer(csrsv_data)     = buffer;
             hypre_CsrsvDataBufferSize(csrsv_data) = buffer_size;
          }
 
-         HYPRE_ROCSPARSE_CALL( rocsparse_dcsrsv_analysis(handle, rocsparse_operation_none,
-                                                         nrow, nnzA, descr, A_sa, A_i, A_sj,
-                                                         hypre_CsrsvDataInfoL(csrsv_data), rocsparse_analysis_policy_reuse,
-                                                         rocsparse_solve_policy_auto, hypre_CsrsvDataBuffer(csrsv_data)) );
-
-         rocsparse_status status = rocsparse_csrsv_zero_pivot(handle, descr, hypre_CsrsvDataInfoL(csrsv_data), &structural_zero);
+         HYPRE_ROCSPARSE_CALL( hypre_rocsparse_csrsv_analysis(handle, rocsparse_operation_none,
+                                                              num_rows, num_nonzeros, descr,
+                                                              A_ma, A_i, A_sj,
+                                                              hypre_CsrsvDataInfoL(csrsv_data),
+                                                              rocsparse_analysis_policy_reuse,
+                                                              rocsparse_solve_policy_auto,
+                                                              buffer) );
+
+         status = rocsparse_csrsv_zero_pivot(handle, descr,
+                                             hypre_CsrsvDataInfoL(csrsv_data),
+                                             &structural_zero);
          if (rocsparse_status_zero_pivot == status)
          {
-            char msg[256];
-            hypre_sprintf(msg, "hypre_CSRMatrixTriLowerUpperSolveRocsparse A(%d,%d) is missing\n",
+            hypre_sprintf(msg,
+                          "hypre_CSRMatrixTriLowerUpperSolveRocsparse A(%d,%d) is missing\n",
                           structural_zero, structural_zero);
             hypre_error_w_msg(1, msg);
-            //hypre_assert(0);
          }
+         hypre_CsrsvDataAnalyzedL(csrsv_data) = 1;
       }
 
-      HYPRE_ROCSPARSE_CALL( rocsparse_dcsrsv_solve(handle, rocsparse_operation_none,
-                                                   nrow, nnzA, &alpha, descr, A_sa, A_i, A_sj,
-                                                   hypre_CsrsvDataInfoL(csrsv_data), f_data, u_data,
-                                                   rocsparse_solve_policy_auto,
-                                                   hypre_CsrsvDataBuffer(csrsv_data)) );
+      HYPRE_ROCSPARSE_CALL( hypre_rocsparse_csrsv_solve(handle, rocsparse_operation_none,
+                                                        num_rows, num_nonzeros, &alpha,
+                                                        descr, A_ma, A_i, A_sj,
+                                                        hypre_CsrsvDataInfoL(csrsv_data),
+                                                        f_data, u_data,
+                                                        rocsparse_solve_policy_auto,
+                                                        buffer) );
    }
    else
    {
       HYPRE_ROCSPARSE_CALL( rocsparse_set_mat_fill_mode(descr, rocsparse_fill_mode_upper) );
 
-      if (!hypre_CsrsvDataInfoU(csrsv_data))
+      /* TODO (VPM): move the following block to hypre_CSRMatrixTriSetupRocsparse */
+      if (!hypre_CsrsvDataAnalyzedU(csrsv_data))
       {
-         HYPRE_ROCSPARSE_CALL( rocsparse_create_mat_info(&hypre_CsrsvDataInfoU(csrsv_data)) );
-
-         HYPRE_ROCSPARSE_CALL( rocsparse_dcsrsv_buffer_size(handle, rocsparse_operation_none,
-                               nrow, nnzA, descr, A_sa, A_i, A_sj, hypre_CsrsvDataInfoU(csrsv_data), &buffer_size) );
+         HYPRE_ROCSPARSE_CALL( hypre_rocsparse_csrsv_buffer_size(handle,
+                                                                 rocsparse_operation_none,
+                                                                 num_rows, num_nonzeros, descr,
+                                                                 A_ma, A_i, A_sj,
+                                                                 hypre_CsrsvDataInfoU(csrsv_data),
+                                                                 &buffer_size) );
 
          if (hypre_CsrsvDataBufferSize(csrsv_data) < buffer_size)
          {
-            hypre_CsrsvDataBuffer(csrsv_data) = hypre_TReAlloc_v2(hypre_CsrsvDataBuffer(csrsv_data),
-                                                                  char, hypre_CsrsvDataBufferSize(csrsv_data),
-                                                                  char, buffer_size,
-                                                                  HYPRE_MEMORY_DEVICE);
+            buffer = hypre_TReAlloc_v2(hypre_CsrsvDataBuffer(csrsv_data),
+                                       char, hypre_CsrsvDataBufferSize(csrsv_data),
+                                       char, buffer_size,
+                                       HYPRE_MEMORY_DEVICE);
+
+            hypre_CsrsvDataBuffer(csrsv_data) = buffer;
             hypre_CsrsvDataBufferSize(csrsv_data) = buffer_size;
          }
 
-         HYPRE_ROCSPARSE_CALL( rocsparse_dcsrsv_analysis(handle, rocsparse_operation_none,
-                                                         nrow, nnzA, descr, A_sa, A_i, A_sj,
-                                                         hypre_CsrsvDataInfoU(csrsv_data), rocsparse_analysis_policy_reuse,
-                                                         rocsparse_solve_policy_auto, hypre_CsrsvDataBuffer(csrsv_data)) );
-
-         rocsparse_status status = rocsparse_csrsv_zero_pivot(handle, descr, hypre_CsrsvDataInfoU(csrsv_data), &structural_zero);
+         HYPRE_ROCSPARSE_CALL( hypre_rocsparse_csrsv_analysis(handle, rocsparse_operation_none,
+                                                              num_rows, num_nonzeros, descr,
+                                                              A_ma, A_i, A_sj,
+                                                              hypre_CsrsvDataInfoU(csrsv_data),
+                                                              rocsparse_analysis_policy_reuse,
+                                                              rocsparse_solve_policy_auto,
+                                                              buffer) );
+
+         status = rocsparse_csrsv_zero_pivot(handle, descr,
+                                             hypre_CsrsvDataInfoU(csrsv_data),
+                                             &structural_zero);
          if (rocsparse_status_zero_pivot == status)
          {
-            char msg[256];
-            hypre_sprintf(msg, "hypre_CSRMatrixTriLowerUpperSolveRocsparse A(%d,%d) is missing\n",
+            hypre_sprintf(msg,
+                          "hypre_CSRMatrixTriLowerUpperSolveRocsparse A(%d,%d) is missing\n",
                           structural_zero, structural_zero);
             hypre_error_w_msg(1, msg);
-            //hypre_assert(0);
          }
+         hypre_CsrsvDataAnalyzedU(csrsv_data) = 1;
       }
 
-      HYPRE_ROCSPARSE_CALL( rocsparse_dcsrsv_solve(handle, rocsparse_operation_none,
-                                                   nrow, nnzA, &alpha, descr, A_sa, A_i, A_sj,
-                                                   hypre_CsrsvDataInfoU(csrsv_data), f_data, u_data,
-                                                   rocsparse_solve_policy_auto,
-                                                   hypre_CsrsvDataBuffer(csrsv_data)) );
+      HYPRE_ROCSPARSE_CALL( hypre_rocsparse_csrsv_solve(handle, rocsparse_operation_none,
+                                                        num_rows, num_nonzeros, &alpha, descr,
+                                                        A_ma, A_i, A_sj,
+                                                        hypre_CsrsvDataInfoU(csrsv_data),
+                                                        f_data, u_data,
+                                                        rocsparse_solve_policy_auto,
+                                                        buffer) );
    }
 
    return hypre_error_flag;
 }
 
-/* @brief This functions sorts values and column indices in each row in ascending order OUT-OF-PLACE
+/*--------------------------------------------------------------------------
+ * hypre_SortCSRRocsparse
+ *
+ * @brief This functions sorts values and column indices in each row in
+ *        ascending order OUT-OF-PLACE
+ *
  * @param[in] n Number of rows
  * @param[in] m Number of columns
  * @param[in] nnzA Number of nonzeroes
  * @param[in] *d_ia (Unsorted) Row indices
- * @param[in,out] *d_ja_sorted On Start: Unsorted column indices. On return: Sorted column indices
- * @param[in,out] *d_a_sorted On Start: Unsorted values. On Return: Sorted values corresponding with column indices
- */
-void
-hypre_SortCSRRocsparse(       HYPRE_Int      n,
-                              HYPRE_Int      m,
-                              HYPRE_Int      nnzA,
-                              rocsparse_mat_descr descrA,
+ * @param[in,out] *d_ja_sorted On Start: Unsorted column indices.
+ *                             On return: Sorted column indices
+ * @param[in,out] *d_a_sorted On Start: Unsorted values.
+ *                            On Return: Sorted values corresponding with
+ *                                       column indices
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_SortCSRRocsparse( HYPRE_Int            n,
+                        HYPRE_Int            m,
+                        HYPRE_Int            num_nonzeros,
+                        rocsparse_mat_descr  descrA,
                         const HYPRE_Int     *d_ia,
-                              HYPRE_Int     *d_ja_sorted,
-                              HYPRE_Complex *d_a_sorted )
+                        HYPRE_Int           *d_ja_sorted,
+                        HYPRE_Complex       *d_a_sorted )
 {
-   rocsparse_handle handle = hypre_HandleCusparseHandle(hypre_handle());
-
-   size_t pBufferSizeInBytes = 0;
-   void *pBuffer = NULL;
-   HYPRE_Int *P = NULL;
-
-   HYPRE_Int isDoublePrecision = sizeof(HYPRE_Complex) == sizeof(hypre_double);
-   HYPRE_Int isSinglePrecision = sizeof(HYPRE_Complex) == sizeof(hypre_double) / 2;
+   rocsparse_handle  handle = hypre_HandleCusparseHandle(hypre_handle());
+   size_t            pBufferSizeInBytes = 0;
+   void             *pBuffer = NULL;
+   HYPRE_Int        *P = NULL;
+   HYPRE_Complex    *d_a_tmp;
 
    // FIXME: There is not in-place version of csr sort in rocSPARSE currently, so we make
    //        a temporary copy of the data for gthr, sort that, and then copy the sorted values
    //        back to the array being returned. Where there is an in-place version available,
    //        we should use it.
-   HYPRE_Complex *d_a_tmp;
-   d_a_tmp  = hypre_TAlloc(HYPRE_Complex, nnzA, HYPRE_MEMORY_DEVICE);
+   d_a_tmp  = hypre_TAlloc(HYPRE_Complex, num_nonzeros, HYPRE_MEMORY_DEVICE);
 
-   HYPRE_ROCSPARSE_CALL( rocsparse_csrsort_buffer_size(handle, n, m, nnzA, d_ia, d_ja_sorted, &pBufferSizeInBytes) );
+   HYPRE_ROCSPARSE_CALL( rocsparse_csrsort_buffer_size(handle, n, m, num_nonzeros,
+                                                       d_ia, d_ja_sorted,
+                                                       &pBufferSizeInBytes) );
 
    pBuffer = hypre_TAlloc(char, pBufferSizeInBytes, HYPRE_MEMORY_DEVICE);
-   P       = hypre_TAlloc(HYPRE_Int, nnzA, HYPRE_MEMORY_DEVICE);
+   P       = hypre_TAlloc(HYPRE_Int, num_nonzeros, HYPRE_MEMORY_DEVICE);
+
+   HYPRE_ROCSPARSE_CALL( rocsparse_create_identity_permutation(handle, num_nonzeros, P) );
+   HYPRE_ROCSPARSE_CALL( rocsparse_csrsort(handle, n, m, num_nonzeros, descrA, d_ia,
+                                           d_ja_sorted, P, pBuffer) );
+   HYPRE_ROCSPARSE_CALL( hypre_rocsparse_gthr(handle, num_nonzeros, d_a_sorted, d_a_tmp, P,
+                                              rocsparse_index_base_zero) );
+
+   hypre_TFree(pBuffer, HYPRE_MEMORY_DEVICE);
+   hypre_TFree(P, HYPRE_MEMORY_DEVICE);
+
+   hypre_TMemcpy(d_a_sorted, d_a_tmp, HYPRE_Complex, num_nonzeros,
+                 HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+
+   hypre_TFree(d_a_tmp, HYPRE_MEMORY_DEVICE);
+
+   return hypre_error_flag;
+}
+
+#elif defined(HYPRE_USING_ONEMKLSPARSE)
+
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixTriLowerUpperSolveOnemklsparse
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_CSRMatrixTriLowerUpperSolveOnemklsparse(char              uplo,
+                                              HYPRE_Int         unit_diag,
+                                              hypre_CSRMatrix  *A,
+                                              HYPRE_Real       *l1_norms,
+                                              HYPRE_Complex    *f_data,
+                                              HYPRE_Complex    *u_data )
+{
+   HYPRE_Int                                *A_j = hypre_CSRMatrixJ(A);
+   HYPRE_Complex                            *A_a = hypre_CSRMatrixData(A);
+   oneapi::mkl::sparse::matrix_handle_t handle_A = hypre_CSRMatrixGPUMatHandle(A);
+   hypre_CsrsvData                   *csrsv_data = hypre_CSRMatrixCsrsvData(A);
+
+   /* Generate sorted matrix */
+   hypre_CSRMatrixSortRowOutOfPlace(A);
+
+   /* Generate csrsv data if necessary */
+   if (!csrsv_data)
+   {
+      hypre_CSRMatrixCsrsvData(A) = hypre_CsrsvDataCreate();
+      csrsv_data = hypre_CSRMatrixCsrsvData(A);
+
+      hypre_CsrsvDataMatData(csrsv_data) = hypre_TAlloc(HYPRE_Complex,
+                                                        hypre_CSRMatrixNumNonzeros(A),
+                                                        HYPRE_MEMORY_DEVICE);
+
+      /* Copy the sorted data to csrsv mat data */
+      hypre_TMemcpy(hypre_CsrsvDataMatData(csrsv_data), hypre_CSRMatrixSortedData(A),
+                    HYPRE_Complex, hypre_CSRMatrixNumNonzeros(A),
+                    HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+
+      /* if (l1_norms), replace A's diag with l1_norm, and
+       * replace zero diag with inf. so as to skip relaxation for this unknown */
+      hypre_CSRMatrixData(A) = hypre_CsrsvDataMatData(csrsv_data);
+      hypre_CSRMatrixJ(A) = hypre_CSRMatrixSortedJ(A);
+      hypre_CSRMatrixReplaceDiagDevice(A, l1_norms, INFINITY, 0.0);
+   }
+
+   /* Use sorted column indices and sorted matrix data with modified diagonal */
+   hypre_CSRMatrixJ(A) = hypre_CSRMatrixSortedJ(A);
+   hypre_CSRMatrixData(A) = hypre_CsrsvDataMatData(csrsv_data);
+   hypre_GPUMatDataSetCSRData(A);
+
+   /* Do optimization the first time */
+   if ( (!hypre_CsrsvDataAnalyzedL(csrsv_data) && uplo == 'L') ||
+        (!hypre_CsrsvDataAnalyzedU(csrsv_data) && uplo == 'U') )
+   {
+      HYPRE_ONEMKL_CALL( oneapi::mkl::sparse::optimize_trsv( *hypre_HandleComputeStream(hypre_handle()),
+                                                             (uplo == 'L') ? oneapi::mkl::uplo::L : oneapi::mkl::uplo::U,
+                                                             oneapi::mkl::transpose::N,
+                                                             unit_diag ? oneapi::mkl::diag::U : oneapi::mkl::diag::N,
+                                                             handle_A,
+                                                             {} ).wait() );
+   }
+
+   /* Do the triangular solve */
+   HYPRE_ONEMKL_CALL( oneapi::mkl::sparse::trsv( *hypre_HandleComputeStream(hypre_handle()),
+                                                 (uplo == 'L') ? oneapi::mkl::uplo::L : oneapi::mkl::uplo::U,
+                                                 oneapi::mkl::transpose::N,
+                                                 unit_diag ? oneapi::mkl::diag::U : oneapi::mkl::diag::N,
+                                                 1.0,
+                                                 handle_A,
+                                                 f_data,
+                                                 u_data,
+                                                 {} ).wait() );
+
+   /* Restore the original matrix data */
+   hypre_CSRMatrixJ(A) = A_j;
+   hypre_CSRMatrixData(A) = A_a;
+   hypre_GPUMatDataSetCSRData(A);
+
+   return hypre_error_flag;
+}
+#endif // #if defined(HYPRE_USING_CUSPARSE) #elif defined(HYPRE_USING_ROCSPARSE)
+
+#if defined(HYPRE_USING_CUSPARSE) || defined(HYPRE_USING_ROCSPARSE)
+
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixILU0
+ *
+ * TODO (VPM): Change this function's name to hypre_ILU0SetupDevice?
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_CSRMatrixILU0(hypre_CSRMatrix *A)
+{
+   /* Input matrix data */
+   HYPRE_Int                 num_rows          = hypre_CSRMatrixNumRows(A);
+   HYPRE_Int                 num_cols          = hypre_CSRMatrixNumCols(A);
+   HYPRE_Int                 num_nonzeros      = hypre_CSRMatrixNumNonzeros(A);
+   HYPRE_Int                *A_i               = hypre_CSRMatrixI(A);
+   HYPRE_Int                *A_j               = hypre_CSRMatrixJ(A);
+   HYPRE_Complex            *A_data            = hypre_CSRMatrixData(A);
+
+   /* Vendor math sparse libraries data */
+#if defined(HYPRE_USING_CUSPARSE)
+   csrilu02Info_t            matA_info        = NULL;
+   cusparseHandle_t          handle           = hypre_HandleCusparseHandle(hypre_handle());
+   cusparseMatDescr_t        descr            = hypre_CSRMatrixGPUMatDescr(A);
+   cusparseSolvePolicy_t     analysis_policy  = CUSPARSE_SOLVE_POLICY_USE_LEVEL;
+   cusparseSolvePolicy_t     solve_policy     = CUSPARSE_SOLVE_POLICY_USE_LEVEL;
+   cusparseStatus_t          status;
+   HYPRE_Int                 buffer_size;
+
+#elif defined(HYPRE_USING_ROCSPARSE)
+   rocsparse_mat_info        matA_info        = NULL;
+   rocsparse_handle          handle           = hypre_HandleCusparseHandle(hypre_handle());
+   rocsparse_mat_descr       descr            = hypre_CSRMatrixGPUMatDescr(A);
+   rocsparse_analysis_policy analysis_policy  = rocsparse_analysis_policy_reuse;
+   rocsparse_solve_policy    solve_policy     = rocsparse_solve_policy_auto;
+   rocsparse_status          status;
+   size_t                    buffer_size;
+#endif
+
+   void                     *buffer           = NULL;
+   HYPRE_Int                 zero_pivot;
+   char                      errmsg[1024];
+
+   /* Sanity check */
+   if (num_rows != num_cols)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Not a square matrix!");
+      return hypre_error_flag;
+   }
+
+   HYPRE_ANNOTATE_FUNC_BEGIN;
+   hypre_GpuProfilingPushRange("CSRMatrixILU0");
+
+   /*-------------------------------------------------------------------------------------
+    * 1. Sort columns inside each row first, we can't assume that's sorted
+    *-------------------------------------------------------------------------------------*/
+
+   hypre_CSRMatrixSortRow(A);
+
+   /*-------------------------------------------------------------------------------------
+    * 2. Create info for ilu setup and solve
+    *-------------------------------------------------------------------------------------*/
+
+#if defined(HYPRE_USING_CUSPARSE)
+   HYPRE_CUSPARSE_CALL(cusparseCreateCsrilu02Info(&matA_info));
+
+#elif defined(HYPRE_USING_ROCSPARSE)
+   HYPRE_ROCSPARSE_CALL(rocsparse_create_mat_info(&matA_info));
+
+#endif
+
+   /*-------------------------------------------------------------------------------------
+    * 3. Get work array size
+    *-------------------------------------------------------------------------------------*/
+
+#if defined(HYPRE_USING_CUSPARSE)
+   HYPRE_CUSPARSE_CALL(hypre_cusparse_csrilu02_bufferSize(handle, num_rows, num_nonzeros,
+                                                          descr, A_data, A_i, A_j,
+                                                          matA_info, &buffer_size));
+#elif defined(HYPRE_USING_ROCSPARSE)
+   HYPRE_ROCSPARSE_CALL(hypre_rocsparse_csrilu0_buffer_size(handle, num_rows, num_nonzeros,
+                                                            descr, A_data, A_i, A_j,
+                                                            matA_info, &buffer_size));
+#endif
 
-   HYPRE_ROCSPARSE_CALL( rocsparse_create_identity_permutation(handle, nnzA, P) );
-   HYPRE_ROCSPARSE_CALL( rocsparse_csrsort(handle, n, m, nnzA, descrA, d_ia, d_ja_sorted, P, pBuffer) );
+   /*-------------------------------------------------------------------------------------
+    * 4. Create work array on the device
+    *-------------------------------------------------------------------------------------*/
 
-   if (isDoublePrecision)
+   buffer = hypre_TAlloc(char, buffer_size, HYPRE_MEMORY_DEVICE);
+
+   /*-------------------------------------------------------------------------------------
+    * 5.1 Perform the analysis
+    *-------------------------------------------------------------------------------------*/
+
+   hypre_GpuProfilingPushRange("Analysis");
+#if defined(HYPRE_USING_CUSPARSE)
+   HYPRE_CUSPARSE_CALL(hypre_cusparse_csrilu02_analysis(handle, num_rows, num_nonzeros,
+                                                        descr, A_data, A_i, A_j,
+                                                        matA_info, analysis_policy, buffer));
+
+#elif defined(HYPRE_USING_ROCSPARSE)
+   HYPRE_ROCSPARSE_CALL(hypre_rocsparse_csrilu0_analysis(handle, num_rows, num_nonzeros,
+                                                         descr, A_data, A_i, A_j,
+                                                         matA_info, analysis_policy,
+                                                         solve_policy, buffer));
+#endif
+   hypre_GpuProfilingPopRange();
+
+   /*-------------------------------------------------------------------------------------
+    * 5.2. Check for zero pivots
+    *-------------------------------------------------------------------------------------*/
+
+#if defined(HYPRE_USING_CUSPARSE)
+   status = cusparseXcsrilu02_zeroPivot(handle, matA_info, &zero_pivot);
+   if (status == CUSPARSE_STATUS_ZERO_PIVOT)
    {
-      HYPRE_ROCSPARSE_CALL( rocsparse_dgthr(handle, nnzA, d_a_sorted, d_a_tmp, P, rocsparse_index_base_zero) );
+      hypre_sprintf(errmsg, "hypre_ILU: found zero pivot at A(%d, %d) after analysis\n",
+                    zero_pivot, zero_pivot);
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, errmsg);
+      return hypre_error_flag;
    }
-   else if (isSinglePrecision)
+   else if (status != CUSPARSE_STATUS_SUCCESS)
    {
-      HYPRE_ROCSPARSE_CALL( rocsparse_sgthr(handle, nnzA, (float *) d_a_sorted, (float *) d_a_tmp, P, rocsparse_index_base_zero) );
+      hypre_sprintf(errmsg, "cuSPARSE ERROR (code = %d, %s) at %s:%d\n",
+                    status, cusparseGetErrorString(status), __FILE__, __LINE__);
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, errmsg);
+      return hypre_error_flag;
    }
 
-   hypre_TFree(pBuffer, HYPRE_MEMORY_DEVICE);
-   hypre_TFree(P, HYPRE_MEMORY_DEVICE);
+#elif defined(HYPRE_USING_ROCSPARSE)
+   status = rocsparse_csrsv_zero_pivot(handle, descr, matA_info, &zero_pivot);
+   if (status == rocsparse_status_zero_pivot)
+   {
+      hypre_sprintf(errmsg, "hypre_ILU: found zero pivot at A(%d, %d) after analysis\n",
+                    zero_pivot, zero_pivot);
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, errmsg);
+      return hypre_error_flag;
+   }
+   else if (status != rocsparse_status_success)
+   {
+      hypre_sprintf(errmsg, "rocSPARSE ERROR (code = %d) at %s:%d\n",
+                    status, __FILE__, __LINE__);
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, errmsg);
+      return hypre_error_flag;
+   }
+#endif
 
-   hypre_TMemcpy(d_a_sorted, d_a_tmp, HYPRE_Complex, nnzA, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+   /*-------------------------------------------------------------------------------------
+    * 6.1 Compute the numerical factorization
+    *-------------------------------------------------------------------------------------*/
 
-   hypre_TFree(d_a_tmp, HYPRE_MEMORY_DEVICE);
+   hypre_GpuProfilingPushRange("Factorization");
+#if defined(HYPRE_USING_CUSPARSE)
+   HYPRE_CUSPARSE_CALL(hypre_cusparse_csrilu02(handle, num_rows, num_nonzeros,
+                                               descr, A_data, A_i, A_j,
+                                               matA_info, solve_policy, buffer));
+#elif defined(HYPRE_USING_ROCSPARSE)
+   HYPRE_ROCSPARSE_CALL(hypre_rocsparse_csrilu0(handle, num_rows, num_nonzeros,
+                                                descr, A_data, A_i, A_j,
+                                                matA_info, solve_policy, buffer));
+#endif
+   hypre_GpuProfilingPopRange();
+
+   /*-------------------------------------------------------------------------------------
+    * 6.2 Check for zero pivots
+    *-------------------------------------------------------------------------------------*/
+
+#if defined(HYPRE_USING_CUSPARSE)
+   status = cusparseXcsrilu02_zeroPivot(handle, matA_info, &zero_pivot);
+   if (status == CUSPARSE_STATUS_ZERO_PIVOT)
+   {
+      hypre_sprintf(errmsg, "hypre_ILU: found zero pivot at A(%d, %d) after factorization\n",
+                    zero_pivot, zero_pivot);
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, errmsg);
+      return hypre_error_flag;
+   }
+   else if (status != CUSPARSE_STATUS_SUCCESS)
+   {
+      hypre_sprintf(errmsg, "cuSPARSE ERROR (code = %d, %s) at %s:%d\n",
+                    status, cusparseGetErrorString(status), __FILE__, __LINE__);
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, errmsg);
+      return hypre_error_flag;
+   }
+
+#elif defined(HYPRE_USING_ROCSPARSE)
+   status = rocsparse_csrsv_zero_pivot(handle, descr, matA_info, &zero_pivot);
+   if (status == rocsparse_status_zero_pivot)
+   {
+      hypre_sprintf(errmsg, "hypre_ILU: found zero pivot at A(%d, %d) after factorization\n",
+                    zero_pivot, zero_pivot);
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, errmsg);
+      return hypre_error_flag;
+   }
+   else if (status != rocsparse_status_success)
+   {
+      hypre_sprintf(errmsg, "rocSPARSE ERROR (code = %d) at %s:%d\n",
+                    status, __FILE__, __LINE__);
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, errmsg);
+      return hypre_error_flag;
+   }
+#endif
+
+   /*-------------------------------------------------------------------------------------
+    * 7. Free memory
+    *-------------------------------------------------------------------------------------*/
+
+#if defined(HYPRE_USING_CUSPARSE)
+   HYPRE_CUSPARSE_CALL(cusparseDestroyCsrilu02Info(matA_info));
+
+#elif defined(HYPRE_USING_ROCSPARSE)
+   HYPRE_ROCSPARSE_CALL(rocsparse_destroy_mat_info(matA_info));
+#endif
+
+   /* Free buffer */
+   hypre_TFree(buffer, HYPRE_MEMORY_DEVICE);
+
+   hypre_GpuProfilingPopRange();
+   HYPRE_ANNOTATE_FUNC_END;
+
+   return hypre_error_flag;
 }
-#endif // #if defined(HYPRE_USING_ROCSPARSE)
 
-void hypre_CSRMatrixGpuSpMVAnalysis(hypre_CSRMatrix *matrix)
+#endif /* #if defined(HYPRE_USING_CUSPARSE) || defined(HYPRE_USING_ROCSPARSE) */
+
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixSpMVAnalysisDevice
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_CSRMatrixSpMVAnalysisDevice(hypre_CSRMatrix *matrix)
 {
 #if defined(HYPRE_USING_ROCSPARSE)
+   HYPRE_ExecutionPolicy  exec = hypre_GetExecPolicy1( hypre_CSRMatrixMemoryLocation(matrix) );
+   rocsparse_handle       handle = hypre_HandleCusparseHandle(hypre_handle());
+
+   if (exec == HYPRE_EXEC_DEVICE)
+   {
+      HYPRE_ROCSPARSE_CALL( hypre_rocsparse_csrmv_analysis(handle,
+                                                           rocsparse_operation_none,
+                                                           hypre_CSRMatrixNumRows(matrix),
+                                                           hypre_CSRMatrixNumCols(matrix),
+                                                           hypre_CSRMatrixNumNonzeros(matrix),
+                                                           hypre_CSRMatrixGPUMatDescr(matrix),
+                                                           hypre_CSRMatrixData(matrix),
+                                                           hypre_CSRMatrixI(matrix),
+                                                           hypre_CSRMatrixJ(matrix),
+                                                           hypre_CSRMatrixGPUMatInfo(matrix)) );
+   }
+#else
+   HYPRE_UNUSED_VAR(matrix);
+#endif /* #if defined(HYPRE_USING_ROCSPARSE) */
 
-  HYPRE_ROCSPARSE_CALL( rocsparse_dcsrmv_analysis(hypre_HandleCusparseHandle(hypre_handle()),
-                                                  rocsparse_operation_none,
-                                                  hypre_CSRMatrixNumRows(matrix),
-                                                  hypre_CSRMatrixNumCols(matrix),
-                                                  hypre_CSRMatrixNumNonzeros(matrix),
-                                                  hypre_CSRMatrixGPUMatDescr(matrix),
-                                                  hypre_CSRMatrixData(matrix),
-                                                  hypre_CSRMatrixI(matrix),
-                                                  hypre_CSRMatrixJ(matrix),
-                                                  hypre_CSRMatrixGPUMatInfo(matrix)) );
-
-#endif // #if defined(HYPRE_USING_ROCSPARSE)
+   return hypre_error_flag;
 }
+
+#endif /* #if defined(HYPRE_USING_GPU) */
diff --git a/external/hypre/src/seq_mv/csr_matrix.c b/external/hypre/src/seq_mv/csr_matrix.c
index f387de02..706657b4 100644
--- a/external/hypre/src/seq_mv/csr_matrix.c
+++ b/external/hypre/src/seq_mv/csr_matrix.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -44,7 +44,7 @@ hypre_CSRMatrixCreate( HYPRE_Int num_rows,
    /* set defaults */
    hypre_CSRMatrixOwnsData(matrix)       = 1;
 
-#if defined(HYPRE_USING_CUSPARSE) || defined(HYPRE_USING_ROCSPARSE)
+#if defined(HYPRE_USING_CUSPARSE) || defined(HYPRE_USING_ROCSPARSE) || defined(HYPRE_USING_ONEMKLSPARSE)
    hypre_CSRMatrixSortedJ(matrix)        = NULL;
    hypre_CSRMatrixSortedData(matrix)     = NULL;
    hypre_CSRMatrixCsrsvData(matrix)      = NULL;
@@ -60,14 +60,12 @@ hypre_CSRMatrixCreate( HYPRE_Int num_rows,
 HYPRE_Int
 hypre_CSRMatrixDestroy( hypre_CSRMatrix *matrix )
 {
-   HYPRE_Int ierr = 0;
-
    if (matrix)
    {
       HYPRE_MemoryLocation memory_location = hypre_CSRMatrixMemoryLocation(matrix);
 
       hypre_TFree(hypre_CSRMatrixI(matrix),      memory_location);
-      hypre_TFree(hypre_CSRMatrixRownnz(matrix), HYPRE_MEMORY_HOST);
+      hypre_TFree(hypre_CSRMatrixRownnz(matrix), memory_location);
 
       if ( hypre_CSRMatrixOwnsData(matrix) )
       {
@@ -78,7 +76,7 @@ hypre_CSRMatrixDestroy( hypre_CSRMatrix *matrix )
          hypre_TFree(hypre_CSRMatrixBigJ(matrix), memory_location);
       }
 
-#if defined(HYPRE_USING_CUSPARSE) || defined(HYPRE_USING_ROCSPARSE)
+#if defined(HYPRE_USING_CUSPARSE) || defined(HYPRE_USING_ROCSPARSE) || defined(HYPRE_USING_ONEMKLSPARSE)
       hypre_TFree(hypre_CSRMatrixSortedData(matrix), memory_location);
       hypre_TFree(hypre_CSRMatrixSortedJ(matrix), memory_location);
       hypre_CsrsvDataDestroy(hypre_CSRMatrixCsrsvData(matrix));
@@ -88,7 +86,7 @@ hypre_CSRMatrixDestroy( hypre_CSRMatrix *matrix )
       hypre_TFree(matrix, HYPRE_MEMORY_HOST);
    }
 
-   return ierr;
+   return hypre_error_flag;
 }
 
 /*--------------------------------------------------------------------------
@@ -96,14 +94,14 @@ hypre_CSRMatrixDestroy( hypre_CSRMatrix *matrix )
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_CSRMatrixInitialize_v2( hypre_CSRMatrix *matrix, HYPRE_Int bigInit, HYPRE_MemoryLocation memory_location )
+hypre_CSRMatrixInitialize_v2( hypre_CSRMatrix      *matrix,
+                              HYPRE_Int             bigInit,
+                              HYPRE_MemoryLocation  memory_location )
 {
    HYPRE_Int  num_rows     = hypre_CSRMatrixNumRows(matrix);
    HYPRE_Int  num_nonzeros = hypre_CSRMatrixNumNonzeros(matrix);
    /* HYPRE_Int  num_rownnz = hypre_CSRMatrixNumRownnz(matrix); */
 
-   HYPRE_Int ierr = 0;
-
    hypre_CSRMatrixMemoryLocation(matrix) = memory_location;
 
    /* Caveat: for pre-existing i, j, data, their memory location must be guaranteed to be consistent with `memory_location'
@@ -147,17 +145,17 @@ hypre_CSRMatrixInitialize_v2( hypre_CSRMatrix *matrix, HYPRE_Int bigInit, HYPRE_
       }
    }
 
-   return ierr;
+   return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixInitialize
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_CSRMatrixInitialize( hypre_CSRMatrix *matrix )
 {
-   HYPRE_Int ierr;
-
-   ierr = hypre_CSRMatrixInitialize_v2( matrix, 0, hypre_CSRMatrixMemoryLocation(matrix) );
-
-   return ierr;
+   return hypre_CSRMatrixInitialize_v2( matrix, 0, hypre_CSRMatrixMemoryLocation(matrix) );
 }
 
 /*--------------------------------------------------------------------------
@@ -165,16 +163,20 @@ hypre_CSRMatrixInitialize( hypre_CSRMatrix *matrix )
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_CSRMatrixResize( hypre_CSRMatrix *matrix, HYPRE_Int new_num_rows, HYPRE_Int new_num_cols, HYPRE_Int new_num_nonzeros )
+hypre_CSRMatrixResize( hypre_CSRMatrix *matrix,
+                       HYPRE_Int        new_num_rows,
+                       HYPRE_Int        new_num_cols,
+                       HYPRE_Int        new_num_nonzeros )
 {
-   HYPRE_MemoryLocation memory_location = hypre_CSRMatrixMemoryLocation(matrix);
-   HYPRE_Int old_num_nonzeros = hypre_CSRMatrixNumNonzeros(matrix);
-   HYPRE_Int old_num_rows = hypre_CSRMatrixNumRows(matrix);
+   HYPRE_MemoryLocation memory_location  = hypre_CSRMatrixMemoryLocation(matrix);
+   HYPRE_Int            old_num_nonzeros = hypre_CSRMatrixNumNonzeros(matrix);
+   HYPRE_Int            old_num_rows     = hypre_CSRMatrixNumRows(matrix);
 
    if (!hypre_CSRMatrixOwnsData(matrix))
    {
-      hypre_error_w_msg(HYPRE_ERROR_GENERIC,"Error: called hypre_CSRMatrixResize on a matrix that doesn't own the data\n");
-      return 1;
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                        "Error: called hypre_CSRMatrixResize on a matrix that doesn't own the data\n");
+      return hypre_error_flag;
    }
 
    hypre_CSRMatrixNumCols(matrix) = new_num_cols;
@@ -189,16 +191,32 @@ hypre_CSRMatrixResize( hypre_CSRMatrix *matrix, HYPRE_Int new_num_rows, HYPRE_In
       }
       else
       {
-         hypre_CSRMatrixData(matrix) = hypre_TReAlloc_v2(hypre_CSRMatrixData(matrix), HYPRE_Complex, old_num_nonzeros, HYPRE_Complex, new_num_nonzeros, memory_location);
+         hypre_CSRMatrixData(matrix) = hypre_TReAlloc_v2(hypre_CSRMatrixData(matrix),
+                                                         HYPRE_Complex, old_num_nonzeros,
+                                                         HYPRE_Complex, new_num_nonzeros,
+                                                         memory_location);
       }
 
-      if (!hypre_CSRMatrixJ(matrix))
+      if (hypre_CSRMatrixBigJ(matrix))
       {
-         hypre_CSRMatrixJ(matrix) = hypre_CTAlloc(HYPRE_Int, new_num_nonzeros, memory_location);
+         hypre_CSRMatrixBigJ(matrix) = hypre_TReAlloc_v2(hypre_CSRMatrixBigJ(matrix),
+                                                         HYPRE_BigInt, old_num_nonzeros,
+                                                         HYPRE_BigInt, new_num_nonzeros,
+                                                         memory_location);
       }
       else
       {
-         hypre_CSRMatrixJ(matrix) = hypre_TReAlloc_v2(hypre_CSRMatrixJ(matrix), HYPRE_Int, old_num_nonzeros, HYPRE_Int, new_num_nonzeros, memory_location);
+         if (!hypre_CSRMatrixJ(matrix))
+         {
+            hypre_CSRMatrixJ(matrix) = hypre_CTAlloc(HYPRE_Int, new_num_nonzeros, memory_location);
+         }
+         else
+         {
+            hypre_CSRMatrixJ(matrix) = hypre_TReAlloc_v2(hypre_CSRMatrixJ(matrix),
+                                                         HYPRE_Int, old_num_nonzeros,
+                                                         HYPRE_Int, new_num_nonzeros,
+                                                         memory_location);
+         }
       }
    }
 
@@ -212,7 +230,10 @@ hypre_CSRMatrixResize( hypre_CSRMatrix *matrix, HYPRE_Int new_num_rows, HYPRE_In
       }
       else
       {
-         hypre_CSRMatrixI(matrix) = hypre_TReAlloc_v2(hypre_CSRMatrixI(matrix), HYPRE_Int, old_num_rows + 1, HYPRE_Int, new_num_rows + 1, memory_location);
+         hypre_CSRMatrixI(matrix) = hypre_TReAlloc_v2(hypre_CSRMatrixI(matrix),
+                                                      HYPRE_Int, old_num_rows + 1,
+                                                      HYPRE_Int, new_num_rows + 1,
+                                                      memory_location);
       }
    }
 
@@ -226,11 +247,7 @@ hypre_CSRMatrixResize( hypre_CSRMatrix *matrix, HYPRE_Int new_num_rows, HYPRE_In
 HYPRE_Int
 hypre_CSRMatrixBigInitialize( hypre_CSRMatrix *matrix )
 {
-   HYPRE_Int ierr;
-
-   ierr = hypre_CSRMatrixInitialize_v2( matrix, 1, hypre_CSRMatrixMemoryLocation(matrix) );
-
-   return ierr;
+   return hypre_CSRMatrixInitialize_v2( matrix, 1, hypre_CSRMatrixMemoryLocation(matrix) );
 }
 
 /*--------------------------------------------------------------------------
@@ -307,37 +324,41 @@ HYPRE_Int
 hypre_CSRMatrixSetDataOwner( hypre_CSRMatrix *matrix,
                              HYPRE_Int        owns_data )
 {
-   HYPRE_Int ierr = 0;
-
    hypre_CSRMatrixOwnsData(matrix) = owns_data;
 
-   return ierr;
+   return hypre_error_flag;
 }
 
 /*--------------------------------------------------------------------------
- * hypre_CSRMatrixSetRownnz
- *
- * function to set the substructure rownnz and num_rowsnnz inside the CSRMatrix
- * it needs the A_i substructure of CSRMatrix to find the nonzero rows.
- * It runs after the create CSR and when A_i is known..It does not check for
- * the existence of A_i or of the CSR matrix.
+ * hypre_CSRMatrixSetPatternOnly
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_CSRMatrixSetPatternOnly( hypre_CSRMatrix *matrix,
+                               HYPRE_Int        pattern_only )
+{
+   hypre_CSRMatrixPatternOnly(matrix) = pattern_only;
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixSetRownnzHost
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
 hypre_CSRMatrixSetRownnzHost( hypre_CSRMatrix *matrix )
 {
-   HYPRE_Int  ierr = 0;
-   HYPRE_Int  num_rows = hypre_CSRMatrixNumRows(matrix);
-   HYPRE_Int *A_i = hypre_CSRMatrixI(matrix);
-   HYPRE_Int *Arownnz;
+   HYPRE_MemoryLocation  memory_location = hypre_CSRMatrixMemoryLocation(matrix);
+   HYPRE_Int             num_rows = hypre_CSRMatrixNumRows(matrix);
+   HYPRE_Int            *A_i = hypre_CSRMatrixI(matrix);
+   HYPRE_Int            *Arownnz = hypre_CSRMatrixRownnz(matrix);
 
-   HYPRE_Int i, adiag;
-   HYPRE_Int irownnz = 0;
+   HYPRE_Int             i, irownnz = 0;
 
    for (i = 0; i < num_rows; i++)
    {
-      adiag = A_i[i+1] - A_i[i];
-      if (adiag > 0)
+      if ((A_i[i + 1] - A_i[i]) > 0)
       {
          irownnz++;
       }
@@ -345,18 +366,21 @@ hypre_CSRMatrixSetRownnzHost( hypre_CSRMatrix *matrix )
 
    hypre_CSRMatrixNumRownnz(matrix) = irownnz;
 
+   /* Free old rownnz pointer */
+   hypre_TFree(Arownnz, memory_location);
+
+   /* Set new rownnz pointer */
    if (irownnz == 0 || irownnz == num_rows)
    {
       hypre_CSRMatrixRownnz(matrix) = NULL;
    }
    else
    {
-      Arownnz = hypre_CTAlloc(HYPRE_Int, irownnz, HYPRE_MEMORY_HOST);
+      Arownnz = hypre_CTAlloc(HYPRE_Int, irownnz, memory_location);
       irownnz = 0;
       for (i = 0; i < num_rows; i++)
       {
-         adiag = A_i[i+1] - A_i[i];
-         if (adiag > 0)
+         if ((A_i[i + 1] - A_i[i]) > 0)
          {
             Arownnz[irownnz++] = i;
          }
@@ -364,14 +388,21 @@ hypre_CSRMatrixSetRownnzHost( hypre_CSRMatrix *matrix )
       hypre_CSRMatrixRownnz(matrix) = Arownnz;
    }
 
-   return ierr;
+   return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixSetRownnz
+ *
+ * function to set the substructure rownnz and num_rowsnnz inside the CSRMatrix
+ * it needs the A_i substructure of CSRMatrix to find the nonzero rows.
+ * It runs after the create CSR and when A_i is known..It does not check for
+ * the existence of A_i or of the CSR matrix.
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_CSRMatrixSetRownnz( hypre_CSRMatrix *matrix )
 {
-   HYPRE_Int ierr = 0;
-
 #if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_CSRMatrixMemoryLocation(matrix) );
 
@@ -382,13 +413,18 @@ hypre_CSRMatrixSetRownnz( hypre_CSRMatrix *matrix )
    else
 #endif
    {
-      ierr = hypre_CSRMatrixSetRownnzHost(matrix);
+      hypre_CSRMatrixSetRownnzHost(matrix);
    }
 
-   return ierr;
+   return hypre_error_flag;
 }
 
-/* check if numnonzeros was properly set to be ia[nrow] */
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixCheckSetNumNonzeros
+ *
+ * check if numnonzeros was properly set to be ia[nrow]
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_CSRMatrixCheckSetNumNonzeros( hypre_CSRMatrix *matrix )
 {
@@ -405,7 +441,8 @@ hypre_CSRMatrixCheckSetNumNonzeros( hypre_CSRMatrix *matrix )
    if (hypre_CSRMatrixNumNonzeros(matrix) != nnz)
    {
       ierr = 1;
-      hypre_printf("warning: CSR matrix nnz was not set properly (!= ia[nrow], %d %d)\n", hypre_CSRMatrixNumNonzeros(matrix), nnz );
+      hypre_printf("warning: CSR matrix nnz was not set properly (!= ia[nrow], %d %d)\n",
+                   hypre_CSRMatrixNumNonzeros(matrix), nnz );
       hypre_assert(0);
       hypre_CSRMatrixNumNonzeros(matrix) = nnz;
    }
@@ -443,7 +480,7 @@ hypre_CSRMatrixRead( char *file_name )
    hypre_fscanf(fp, "%d", &num_rows);
 
    matrix_i = hypre_CTAlloc(HYPRE_Int, num_rows + 1, HYPRE_MEMORY_HOST);
-   for (j = 0; j < num_rows+1; j++)
+   for (j = 0; j < num_rows + 1; j++)
    {
       hypre_fscanf(fp, "%d", &matrix_i[j]);
       matrix_i[j] -= file_base;
@@ -477,6 +514,7 @@ hypre_CSRMatrixRead( char *file_name )
 
    hypre_CSRMatrixNumNonzeros(matrix) = num_nonzeros;
    hypre_CSRMatrixNumCols(matrix) = ++max_col;
+   hypre_CSRMatrixSetRownnz(matrix);
 
    return matrix;
 }
@@ -494,6 +532,7 @@ hypre_CSRMatrixPrint( hypre_CSRMatrix *matrix,
    HYPRE_Complex *matrix_data;
    HYPRE_Int     *matrix_i;
    HYPRE_Int     *matrix_j;
+   HYPRE_BigInt  *matrix_bigj;
    HYPRE_Int      num_rows;
 
    HYPRE_Int      file_base = 1;
@@ -509,6 +548,7 @@ hypre_CSRMatrixPrint( hypre_CSRMatrix *matrix,
    matrix_data = hypre_CSRMatrixData(matrix);
    matrix_i    = hypre_CSRMatrixI(matrix);
    matrix_j    = hypre_CSRMatrixJ(matrix);
+   matrix_bigj = hypre_CSRMatrixBigJ(matrix);
    num_rows    = hypre_CSRMatrixNumRows(matrix);
 
    fp = fopen(file_name, "w");
@@ -520,9 +560,20 @@ hypre_CSRMatrixPrint( hypre_CSRMatrix *matrix,
       hypre_fprintf(fp, "%d\n", matrix_i[j] + file_base);
    }
 
-   for (j = 0; j < matrix_i[num_rows]; j++)
+   if (matrix_j)
    {
-      hypre_fprintf(fp, "%d\n", matrix_j[j] + file_base);
+      for (j = 0; j < matrix_i[num_rows]; j++)
+      {
+         hypre_fprintf(fp, "%d\n", matrix_j[j] + file_base);
+      }
+   }
+
+   if (matrix_bigj)
+   {
+      for (j = 0; j < matrix_i[num_rows]; j++)
+      {
+         hypre_fprintf(fp, "%d\n", matrix_bigj[j] + file_base);
+      }
    }
 
    if (matrix_data)
@@ -547,69 +598,154 @@ hypre_CSRMatrixPrint( hypre_CSRMatrix *matrix,
    return ierr;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixPrintIJ
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_CSRMatrixPrintMM( hypre_CSRMatrix *matrix,
-                        HYPRE_Int        basei,
-                        HYPRE_Int        basej,
-                        HYPRE_Int        trans,
-                        const char      *file_name )
+hypre_CSRMatrixPrintIJ( hypre_CSRMatrix  *matrix,
+                        HYPRE_Int         base_i,
+                        HYPRE_Int         base_j,
+                        char             *filename )
 {
-   FILE    *fp;
+   HYPRE_MemoryLocation memory_location = hypre_CSRMatrixMemoryLocation(matrix);
+   hypre_CSRMatrix     *h_matrix;
 
-   HYPRE_Complex *matrix_data;
-   HYPRE_Int     *matrix_i;
-   HYPRE_Int     *matrix_j;
-   HYPRE_Int      num_rows, num_cols;
+   HYPRE_Int            patt_only;
+   HYPRE_Int            num_rows;
+   HYPRE_Int            num_cols;
+   HYPRE_Int           *matrix_i;
+   HYPRE_Int           *matrix_j;
+   HYPRE_BigInt        *matrix_bj;
+   HYPRE_Complex       *matrix_a;
 
-   /* HYPRE_Int      file_base = 1; */
+   HYPRE_Int            i, j, ii, jj;
+   HYPRE_Int            ilower, iupper, jlower, jupper;
+   FILE                *file;
 
-   HYPRE_Int      j,k;
+   if (!matrix)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
 
-   HYPRE_Int      ierr = 0;
+   /* Create temporary matrix on host memory if needed */
+   h_matrix = (hypre_GetActualMemLocation(memory_location) == hypre_MEMORY_DEVICE) ?
+              hypre_CSRMatrixClone_v2(matrix, 1, HYPRE_MEMORY_HOST) : matrix;
 
-   /*----------------------------------------------------------
-    * Print the matrix data
-    *----------------------------------------------------------*/
+   /* Set matrix info */
+   patt_only = hypre_CSRMatrixPatternOnly(h_matrix);
+   num_rows  = hypre_CSRMatrixNumRows(h_matrix);
+   num_cols  = hypre_CSRMatrixNumCols(h_matrix);
+   matrix_i  = hypre_CSRMatrixI(h_matrix);
+   matrix_j  = hypre_CSRMatrixJ(h_matrix);
+   matrix_bj = hypre_CSRMatrixBigJ(h_matrix);
+   matrix_a  = hypre_CSRMatrixData(h_matrix);
 
-   matrix_data = hypre_CSRMatrixData(matrix);
-   matrix_i    = hypre_CSRMatrixI(matrix);
-   matrix_j    = hypre_CSRMatrixJ(matrix);
-   num_rows    = hypre_CSRMatrixNumRows(matrix);
-   num_cols    = hypre_CSRMatrixNumCols(matrix);
+   if ((file = fopen(filename, "w")) == NULL)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Error: can't open output file %s\n");
+      return hypre_error_flag;
+   }
 
-   if (file_name)
+   /* Print matrix bounds */
+   ilower = base_i;
+   iupper = num_rows + base_i - 1;
+   jlower = base_j;
+   jupper = num_cols + base_j - 1;
+   hypre_fprintf(file, "%b %b %b %b\n", ilower, iupper, jlower, jupper);
+
+   for (i = 0; i < num_rows; i++)
    {
-      fp = fopen(file_name, "w");
+      ii = i + base_i;
+
+      /* print diag columns */
+      for (j = matrix_i[i]; j < matrix_i[i + 1]; j++)
+      {
+         jj = (matrix_bj) ? (matrix_bj[j] + base_j) : (matrix_j[j] + base_j);
+
+         if (!patt_only)
+         {
+#ifdef HYPRE_COMPLEX
+            hypre_fprintf(file, "%b %b %.14e , %.14e\n", ii, jj,
+                          hypre_creal(matrix_a[j]), hypre_cimag(matrix_a[j]));
+#else
+            hypre_fprintf(file, "%b %b %.14e\n", ii, jj, matrix_a[j]);
+#endif
+         }
+         else
+         {
+            hypre_fprintf(file, "%b %b\n", ii, jj);
+         }
+      }
    }
-   else
+
+   fclose(file);
+
+   /* Free temporary matrix */
+   if (h_matrix != matrix)
+   {
+      hypre_CSRMatrixDestroy(h_matrix);
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixPrintMM
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_CSRMatrixPrintMM( hypre_CSRMatrix *matrix,
+                        HYPRE_Int        basei,
+                        HYPRE_Int        basej,
+                        HYPRE_Int        trans,
+                        const char      *file_name )
+{
+   FILE *fp = file_name ? fopen(file_name, "w") : stdout;
+
+   if (!fp)
    {
-      fp = stdout;
+      hypre_error_w_msg(1, "Cannot open output file");
+      return hypre_error_flag;
    }
 
-   hypre_fprintf(fp, "%%%%MatrixMarket matrix coordinate real general\n");
+   const HYPRE_Complex *matrix_data = hypre_CSRMatrixData(matrix);
+   const HYPRE_Int     *matrix_i    = hypre_CSRMatrixI(matrix);
+   const HYPRE_Int     *matrix_j    = hypre_CSRMatrixJ(matrix);
 
-   hypre_assert(matrix_i[num_rows] == hypre_CSRMatrixNumNonzeros(matrix));
+   hypre_assert(hypre_CSRMatrixI(matrix)[hypre_CSRMatrixNumRows(matrix)] ==
+                hypre_CSRMatrixNumNonzeros(matrix));
 
-   if (!trans)
+   if (matrix_data)
    {
-      hypre_fprintf(fp, "%d %d %d\n", num_rows, num_cols, hypre_CSRMatrixNumNonzeros(matrix));
+      hypre_fprintf(fp, "%%%%MatrixMarket matrix coordinate real general\n");
    }
    else
    {
-      hypre_fprintf(fp, "%d %d %d\n", num_cols, num_rows, hypre_CSRMatrixNumNonzeros(matrix));
+      hypre_fprintf(fp, "%%%%MatrixMarket matrix coordinate pattern general\n");
    }
 
-   for (j = 0; j < num_rows; j++)
+   hypre_fprintf(fp, "%d %d %d\n",
+                 trans ? hypre_CSRMatrixNumCols(matrix) : hypre_CSRMatrixNumRows(matrix),
+                 trans ? hypre_CSRMatrixNumRows(matrix) : hypre_CSRMatrixNumCols(matrix),
+                 hypre_CSRMatrixNumNonzeros(matrix));
+
+   HYPRE_Int i, j;
+
+   for (i = 0; i < hypre_CSRMatrixNumRows(matrix); i++)
    {
-      for (k = matrix_i[j]; k < matrix_i[j+1]; k++)
+      for (j = matrix_i[i]; j < matrix_i[i + 1]; j++)
       {
-         if (!trans)
+         const HYPRE_Int row = (trans ? matrix_j[j] : i) + basei;
+         const HYPRE_Int col = (trans ? i : matrix_j[j]) + basej;
+         if (matrix_data)
          {
-            hypre_fprintf(fp, "%d %d %.15e\n", j + basei, matrix_j[k] + basej, matrix_data[k]);
+            hypre_fprintf(fp, "%d %d %.15e\n", row, col, matrix_data[j]);
          }
          else
          {
-            hypre_fprintf(fp, "%d %d %.15e\n", matrix_j[k] + basej, j + basei, matrix_data[k]);
+            hypre_fprintf(fp, "%d %d\n", row, col);
          }
       }
    }
@@ -619,18 +755,13 @@ hypre_CSRMatrixPrintMM( hypre_CSRMatrix *matrix,
       fclose(fp);
    }
 
-   return ierr;
-}
-
-HYPRE_Int
-hypre_CSRMatrixPrint2( hypre_CSRMatrix *matrix,
-                       const char      *file_name )
-{
-   return hypre_CSRMatrixPrintMM(matrix, 0, 0, 0, file_name);
+   return hypre_error_flag;
 }
 
 /*--------------------------------------------------------------------------
- * hypre_CSRMatrixPrintHB: print a CSRMatrix in Harwell-Boeing format
+ * hypre_CSRMatrixPrintHB:
+ *
+ * Print a CSRMatrix in Harwell-Boeing format
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
@@ -645,7 +776,6 @@ hypre_CSRMatrixPrintHB( hypre_CSRMatrix *matrix_input,
    HYPRE_Int        num_rows;
    HYPRE_Int        file_base = 1;
    HYPRE_Int        j, totcrd, ptrcrd, indcrd, valcrd, rhscrd;
-   HYPRE_Int        ierr = 0;
 
    /*----------------------------------------------------------
     * Print the matrix data
@@ -704,11 +834,12 @@ hypre_CSRMatrixPrintHB( hypre_CSRMatrix *matrix_input,
 
    hypre_CSRMatrixDestroy(matrix);
 
-   return ierr;
+   return hypre_error_flag;
 }
 
 /*--------------------------------------------------------------------------
  * hypre_CSRMatrixCopy: copy A to B,
+ *
  * if copy_data = 0 only the structure of A is copied to B.
  * the routine does not check if the dimensions/sparsity of A and B match !!!
  *--------------------------------------------------------------------------*/
@@ -716,18 +847,19 @@ hypre_CSRMatrixPrintHB( hypre_CSRMatrix *matrix_input,
 HYPRE_Int
 hypre_CSRMatrixCopy( hypre_CSRMatrix *A, hypre_CSRMatrix *B, HYPRE_Int copy_data )
 {
-   HYPRE_Int ierr = 0;
    HYPRE_Int num_rows = hypre_CSRMatrixNumRows(A);
    HYPRE_Int num_nonzeros = hypre_CSRMatrixNumNonzeros(A);
 
-   HYPRE_Int     *A_i    = hypre_CSRMatrixI(A);
-   HYPRE_Int     *A_j    = hypre_CSRMatrixJ(A);
-   HYPRE_BigInt  *A_bigj = hypre_CSRMatrixBigJ(A);
+   HYPRE_Int     *A_i      = hypre_CSRMatrixI(A);
+   HYPRE_Int     *A_j      = hypre_CSRMatrixJ(A);
+   HYPRE_BigInt  *A_bigj   = hypre_CSRMatrixBigJ(A);
+   HYPRE_Int     *A_rownnz = hypre_CSRMatrixRownnz(A);
    HYPRE_Complex *A_data;
 
-   HYPRE_Int     *B_i    = hypre_CSRMatrixI(B);
-   HYPRE_Int     *B_j    = hypre_CSRMatrixJ(B);
-   HYPRE_BigInt  *B_bigj = hypre_CSRMatrixBigJ(B);
+   HYPRE_Int     *B_i      = hypre_CSRMatrixI(B);
+   HYPRE_Int     *B_j      = hypre_CSRMatrixJ(B);
+   HYPRE_BigInt  *B_bigj   = hypre_CSRMatrixBigJ(B);
+   HYPRE_Int     *B_rownnz = hypre_CSRMatrixRownnz(B);
    HYPRE_Complex *B_data;
 
    HYPRE_MemoryLocation memory_location_A = hypre_CSRMatrixMemoryLocation(A);
@@ -735,6 +867,21 @@ hypre_CSRMatrixCopy( hypre_CSRMatrix *A, hypre_CSRMatrix *B, HYPRE_Int copy_data
 
    hypre_TMemcpy(B_i, A_i, HYPRE_Int, num_rows + 1, memory_location_B, memory_location_A);
 
+   if (A_rownnz)
+   {
+      if (!B_rownnz)
+      {
+         B_rownnz = hypre_TAlloc(HYPRE_Int,
+                                 hypre_CSRMatrixNumRownnz(A),
+                                 memory_location_B);
+         hypre_CSRMatrixRownnz(B) = B_rownnz;
+      }
+      hypre_TMemcpy(B_rownnz, A_rownnz,
+                    HYPRE_Int, hypre_CSRMatrixNumRownnz(A),
+                    memory_location_B, memory_location_A);
+   }
+   hypre_CSRMatrixNumRownnz(B) = hypre_CSRMatrixNumRownnz(A);
+
    if (A_j && B_j)
    {
       hypre_TMemcpy(B_j, A_j, HYPRE_Int, num_nonzeros, memory_location_B, memory_location_A);
@@ -742,34 +889,133 @@ hypre_CSRMatrixCopy( hypre_CSRMatrix *A, hypre_CSRMatrix *B, HYPRE_Int copy_data
 
    if (A_bigj && B_bigj)
    {
-      hypre_TMemcpy(B_bigj, A_bigj, HYPRE_BigInt, num_nonzeros, memory_location_B, memory_location_A);
+      hypre_TMemcpy(B_bigj, A_bigj, HYPRE_BigInt, num_nonzeros,
+                    memory_location_B, memory_location_A);
    }
 
    if (copy_data)
    {
       A_data = hypre_CSRMatrixData(A);
       B_data = hypre_CSRMatrixData(B);
-      hypre_TMemcpy(B_data, A_data, HYPRE_Complex, num_nonzeros, memory_location_B, memory_location_A);
+      hypre_TMemcpy(B_data, A_data, HYPRE_Complex, num_nonzeros,
+                    memory_location_B, memory_location_A);
    }
 
-   return ierr;
+   return hypre_error_flag;
 }
 
 /*--------------------------------------------------------------------------
- * hypre_CSRMatrixClone
- * Creates and returns a new copy of the argument, A.
- * Copying is a deep copy in that no pointers are copied; new arrays are
- * created where necessary.
+ * hypre_CSRMatrixMigrate
+ *
+ * Migrates matrix row pointer, column indices and data to memory_location
+ * if it is different to the current one.
+ *
+ * Note: Does not move rownnz array.
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_CSRMatrixMigrate( hypre_CSRMatrix     *A,
+                        HYPRE_MemoryLocation memory_location )
+{
+   /* Input matrix info */
+   HYPRE_Int       num_rows     = hypre_CSRMatrixNumRows(A);
+   HYPRE_Int       num_nonzeros = hypre_CSRMatrixNumNonzeros(A);
+   HYPRE_Int       num_rownnz   = hypre_CSRMatrixNumRownnz(A);
+   HYPRE_Int      *A_ri         = hypre_CSRMatrixRownnz(A);
+   HYPRE_Int      *A_i          = hypre_CSRMatrixI(A);
+   HYPRE_Int      *A_j          = hypre_CSRMatrixJ(A);
+   HYPRE_BigInt   *A_big_j      = hypre_CSRMatrixBigJ(A);
+   HYPRE_Complex  *A_data       = hypre_CSRMatrixData(A);
+
+   HYPRE_MemoryLocation old_memory_location = hypre_CSRMatrixMemoryLocation(A);
+
+   /* Output matrix info */
+   HYPRE_Int      *B_i;
+   HYPRE_Int      *B_j;
+   HYPRE_BigInt   *B_big_j;
+   HYPRE_Complex  *B_data;
+   HYPRE_Int      *B_ri;
+
+   /* Check pointer locations in debug mode */
+#if defined(HYPRE_DEBUG)
+   hypre_CheckMemoryLocation((void*) A_ri,    hypre_GetActualMemLocation(old_memory_location));
+   hypre_CheckMemoryLocation((void*) A_i,     hypre_GetActualMemLocation(old_memory_location));
+   hypre_CheckMemoryLocation((void*) A_j,     hypre_GetActualMemLocation(old_memory_location));
+   hypre_CheckMemoryLocation((void*) A_big_j, hypre_GetActualMemLocation(old_memory_location));
+   hypre_CheckMemoryLocation((void*) A_data,  hypre_GetActualMemLocation(old_memory_location));
+#endif
+
+   /* Update A's memory location */
+   hypre_CSRMatrixMemoryLocation(A) = memory_location;
+
+   if ( hypre_GetActualMemLocation(memory_location) !=
+        hypre_GetActualMemLocation(old_memory_location) )
+   {
+      if (A_ri)
+      {
+         B_ri = hypre_TAlloc(HYPRE_Int, num_rownnz, memory_location);
+         hypre_TMemcpy(B_ri, A_ri, HYPRE_Int, num_rownnz,
+                       memory_location, old_memory_location);
+         hypre_TFree(A_ri, old_memory_location);
+         hypre_CSRMatrixRownnz(A) = B_ri;
+      }
+
+      if (A_i)
+      {
+         B_i = hypre_TAlloc(HYPRE_Int, num_rows + 1, memory_location);
+         hypre_TMemcpy(B_i, A_i, HYPRE_Int, num_rows + 1,
+                       memory_location, old_memory_location);
+         hypre_TFree(A_i, old_memory_location);
+         hypre_CSRMatrixI(A) = B_i;
+      }
+
+      if (A_j)
+      {
+         B_j = hypre_TAlloc(HYPRE_Int, num_nonzeros, memory_location);
+         hypre_TMemcpy(B_j, A_j, HYPRE_Int, num_nonzeros,
+                       memory_location, old_memory_location);
+         hypre_TFree(A_j, old_memory_location);
+         hypre_CSRMatrixJ(A) = B_j;
+      }
+
+      if (A_big_j)
+      {
+         B_big_j = hypre_TAlloc(HYPRE_BigInt, num_nonzeros, memory_location);
+         hypre_TMemcpy(B_big_j, A_big_j, HYPRE_BigInt, num_nonzeros,
+                       memory_location, old_memory_location);
+         hypre_TFree(A_big_j, old_memory_location);
+         hypre_CSRMatrixBigJ(A) = B_big_j;
+      }
+
+      if (A_data)
+      {
+         B_data = hypre_TAlloc(HYPRE_Complex, num_nonzeros, memory_location);
+         hypre_TMemcpy(B_data, A_data, HYPRE_Complex, num_nonzeros,
+                       memory_location, old_memory_location);
+         hypre_TFree(A_data, old_memory_location);
+         hypre_CSRMatrixData(A) = B_data;
+      }
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixClone_v2
+ *
+ * This function does the same job as hypre_CSRMatrixClone; however, here
+ * the user can specify the memory location of the resulting matrix.
  *--------------------------------------------------------------------------*/
 
 hypre_CSRMatrix*
-hypre_CSRMatrixClone_v2( hypre_CSRMatrix *A, HYPRE_Int copy_data, HYPRE_MemoryLocation memory_location )
+hypre_CSRMatrixClone_v2( hypre_CSRMatrix *A, HYPRE_Int copy_data,
+                         HYPRE_MemoryLocation memory_location )
 {
    HYPRE_Int num_rows = hypre_CSRMatrixNumRows(A);
    HYPRE_Int num_cols = hypre_CSRMatrixNumCols(A);
-   HYPRE_Int num_nonzeros = hypre_CSRMatrixNumNonzeros( A );
+   HYPRE_Int num_nonzeros = hypre_CSRMatrixNumNonzeros(A);
 
-   hypre_CSRMatrix *B = hypre_CSRMatrixCreate( num_rows, num_cols, num_nonzeros );
+   hypre_CSRMatrix *B = hypre_CSRMatrixCreate(num_rows, num_cols, num_nonzeros);
 
    HYPRE_Int bigInit = hypre_CSRMatrixBigJ(A) != NULL;
 
@@ -780,12 +1026,122 @@ hypre_CSRMatrixClone_v2( hypre_CSRMatrix *A, HYPRE_Int copy_data, HYPRE_MemoryLo
    return B;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixClone
+ *
+ * Creates and returns a new copy of the argument, A.
+ * Performs a deep copy of information (no pointers are copied);
+ * New arrays are created where necessary.
+ *--------------------------------------------------------------------------*/
+
 hypre_CSRMatrix*
 hypre_CSRMatrixClone( hypre_CSRMatrix *A, HYPRE_Int copy_data )
 {
    return hypre_CSRMatrixClone_v2(A, copy_data, hypre_CSRMatrixMemoryLocation(A));
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixPermuteHost
+ *
+ * See hypre_CSRMatrixPermute. TODO (VPM): OpenMP implementation
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_CSRMatrixPermuteHost( hypre_CSRMatrix  *A,
+                            HYPRE_Int        *perm,
+                            HYPRE_Int        *rqperm,
+                            hypre_CSRMatrix  *B )
+{
+   /* Input variables */
+   HYPRE_Int         num_rows     = hypre_CSRMatrixNumRows(A);
+   HYPRE_Int         num_nonzeros = hypre_CSRMatrixNumNonzeros(A);
+   HYPRE_Int        *A_i          = hypre_CSRMatrixI(A);
+   HYPRE_Int        *A_j          = hypre_CSRMatrixJ(A);
+   HYPRE_Complex    *A_a          = hypre_CSRMatrixData(A);
+   HYPRE_Int        *B_i          = hypre_CSRMatrixI(B);
+   HYPRE_Int        *B_j          = hypre_CSRMatrixJ(B);
+   HYPRE_Complex    *B_a          = hypre_CSRMatrixData(B);
+
+   /* Local variables */
+   HYPRE_Int         i, j, k;
+
+   /* Build B = A(perm, qperm) */
+   k = 0;
+   for (i = 0; i < num_rows; i++)
+   {
+      B_i[i] = k;
+      for (j = A_i[perm[i]]; j < A_i[perm[i] + 1]; j++)
+      {
+         B_j[k] = rqperm[A_j[j]];
+         B_a[k++] = A_a[j];
+      }
+   }
+   B_i[num_rows] = k;
+   hypre_assert(k == num_nonzeros);
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixPermute
+ *
+ * Reorder a CSRMatrix according to a row-permutation array (perm) and
+ * reverse column-permutation array (rqperm).
+ *
+ * Notes:
+ *  1) This function does not move the diagonal to the first entry of a row
+ *  2) When perm == rqperm == NULL, B is a deep copy of A.
+ *
+ * TODO (VPM): add check for permutation arrays under HYPRE_DEBUG
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_CSRMatrixPermute( hypre_CSRMatrix  *A,
+                        HYPRE_Int        *perm,
+                        HYPRE_Int        *rqperm,
+                        hypre_CSRMatrix **B_ptr )
+{
+   HYPRE_Int          num_rows     = hypre_CSRMatrixNumRows(A);
+   HYPRE_Int          num_cols     = hypre_CSRMatrixNumCols(A);
+   HYPRE_Int          num_nonzeros = hypre_CSRMatrixNumNonzeros(A);
+   hypre_CSRMatrix   *B;
+
+   hypre_GpuProfilingPushRange("CSRMatrixPermute");
+
+   /* Special case: one of the permutation vectors are not provided, then B = A */
+   if (!perm || !rqperm)
+   {
+      *B_ptr = hypre_CSRMatrixClone(A, 1);
+      hypre_GpuProfilingPopRange();
+
+      return hypre_error_flag;
+   }
+
+   /* Create output matrix B */
+   B = hypre_CSRMatrixCreate(num_rows, num_cols, num_nonzeros);
+   hypre_CSRMatrixInitialize_v2(B, 0, hypre_CSRMatrixMemoryLocation(A));
+
+#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_CSRMatrixMemoryLocation(A) );
+
+   if (exec == HYPRE_EXEC_DEVICE)
+   {
+      hypre_CSRMatrixPermuteDevice(A, perm, rqperm, B);
+   }
+   else
+#endif
+   {
+      hypre_CSRMatrixPermuteHost(A, perm, rqperm, B);
+   }
+
+   hypre_GpuProfilingPopRange();
+
+   /* Set output pointer */
+   *B_ptr = B;
+
+   return hypre_error_flag;
+}
+
 /*--------------------------------------------------------------------------
  * hypre_CSRMatrixUnion
  * Creates and returns a matrix whose elements are the union of those of A and B.
@@ -822,7 +1178,7 @@ hypre_CSRMatrixUnion( hypre_CSRMatrix *A,
    HYPRE_Int *C_i;
    HYPRE_Int *C_j;
    HYPRE_Int *jC = NULL;
-   HYPRE_BigInt jBg, big_jA, big_jB;
+   HYPRE_BigInt jBg, big_jA = -1, big_jB = -1;
    HYPRE_Int i, jA, jB;
    HYPRE_Int ma, mb, mc, ma_min, ma_max, match;
    hypre_CSRMatrix* C;
@@ -842,28 +1198,30 @@ hypre_CSRMatrixUnion( hypre_CSRMatrix *A,
    }
 
    /* ==== First, go through the columns of A and B to count the columns of C. */
-   if ( col_map_offd_A==0 )
-   {  /* The matrices are diagonal blocks.
+   if ( col_map_offd_A == 0 )
+   {
+      /* The matrices are diagonal blocks.
          Normally num_cols_A==num_cols_B, col_starts is the same, etc.
       */
       num_cols = hypre_max( num_cols_A, num_cols_B );
    }
    else
-   {  /* The matrices are offdiagonal blocks. */
+   {
+      /* The matrices are offdiagonal blocks. */
       jC = hypre_CTAlloc(HYPRE_Int, num_cols_B, HYPRE_MEMORY_HOST);
       num_cols = num_cols_A;  /* initialization; we'll compute the actual value */
-      for ( jB=0; jB<num_cols_B; ++jB )
+      for ( jB = 0; jB < num_cols_B; ++jB )
       {
          match = 0;
          jBg = col_map_offd_B[jB];
-         for ( ma=0; ma<num_cols_A; ++ma )
+         for ( ma = 0; ma < num_cols_A; ++ma )
          {
-            if ( col_map_offd_A[ma]==jBg )
+            if ( col_map_offd_A[ma] == jBg )
             {
                match = 1;
             }
          }
-         if ( match==0 )
+         if ( match == 0 )
          {
             jC[jB] = num_cols;
             ++num_cols;
@@ -876,22 +1234,22 @@ hypre_CSRMatrixUnion( hypre_CSRMatrix *A,
    if ( col_map_offd_A )
    {
       *col_map_offd_C = hypre_CTAlloc( HYPRE_BigInt, num_cols, HYPRE_MEMORY_HOST);
-      for ( jA=0; jA<num_cols_A; ++jA )
+      for ( jA = 0; jA < num_cols_A; ++jA )
       {
          (*col_map_offd_C)[jA] = col_map_offd_A[jA];
       }
-      for ( jB=0; jB<num_cols_B; ++jB )
+      for ( jB = 0; jB < num_cols_B; ++jB )
       {
          match = 0;
          jBg = col_map_offd_B[jB];
-         for ( ma=0; ma<num_cols_A; ++ma )
+         for ( ma = 0; ma < num_cols_A; ++ma )
          {
-            if ( col_map_offd_A[ma]==jBg )
+            if ( col_map_offd_A[ma] == jBg )
             {
                match = 1;
             }
          }
-         if ( match==0 )
+         if ( match == 0 )
          {
             (*col_map_offd_C)[ jC[jB] ] = jBg;
          }
@@ -902,10 +1260,10 @@ hypre_CSRMatrixUnion( hypre_CSRMatrix *A,
    /* ==== The first run through A and B is to count the number of nonzero elements,
       without HYPRE_Complex-counting duplicates.  Then we can create C. */
    num_nonzeros = hypre_CSRMatrixNumNonzeros(A);
-   for ( i=0; i<num_rows; ++i )
+   for ( i = 0; i < num_rows; ++i )
    {
-      ma_min = A_i[i];  ma_max = A_i[i+1];
-      for ( mb=B_i[i]; mb<B_i[i+1]; ++mb )
+      ma_min = A_i[i];  ma_max = A_i[i + 1];
+      for ( mb = B_i[i]; mb < B_i[i + 1]; ++mb )
       {
          jB = B_j[mb];
          if ( col_map_offd_B )
@@ -913,7 +1271,7 @@ hypre_CSRMatrixUnion( hypre_CSRMatrix *A,
             big_jB = col_map_offd_B[jB];
          }
          match = 0;
-         for ( ma=ma_min; ma<ma_max; ++ma )
+         for ( ma = ma_min; ma < ma_max; ++ma )
          {
             jA = A_j[ma];
             if ( col_map_offd_A )
@@ -923,14 +1281,14 @@ hypre_CSRMatrixUnion( hypre_CSRMatrix *A,
             if ( big_jB == big_jA )
             {
                match = 1;
-               if( ma==ma_min )
+               if ( ma == ma_min )
                {
                   ++ma_min;
                }
                break;
             }
          }
-         if ( match==0 )
+         if ( match == 0 )
          {
             ++num_nonzeros;
          }
@@ -946,16 +1304,16 @@ hypre_CSRMatrixUnion( hypre_CSRMatrix *A,
    C_i[0] = 0;
    C_j = hypre_CSRMatrixJ(C);
    mc = 0;
-   for ( i=0; i<num_rows; ++i )
+   for ( i = 0; i < num_rows; ++i )
    {
       ma_min = A_i[i];
-      ma_max = A_i[i+1];
-      for ( ma=ma_min; ma<ma_max; ++ma )
+      ma_max = A_i[i + 1];
+      for ( ma = ma_min; ma < ma_max; ++ma )
       {
          C_j[mc] = A_j[ma];
          ++mc;
       }
-      for ( mb=B_i[i]; mb<B_i[i+1]; ++mb )
+      for ( mb = B_i[i]; mb < B_i[i + 1]; ++mb )
       {
          jB = B_j[mb];
          if ( col_map_offd_B )
@@ -963,7 +1321,7 @@ hypre_CSRMatrixUnion( hypre_CSRMatrix *A,
             big_jB = col_map_offd_B[jB];
          }
          match = 0;
-         for ( ma=ma_min; ma<ma_max; ++ma )
+         for ( ma = ma_min; ma < ma_max; ++ma )
          {
             jA = A_j[ma];
             if ( col_map_offd_A )
@@ -973,14 +1331,14 @@ hypre_CSRMatrixUnion( hypre_CSRMatrix *A,
             if ( big_jB == big_jA )
             {
                match = 1;
-               if( ma==ma_min )
+               if ( ma == ma_min )
                {
                   ++ma_min;
                }
                break;
             }
          }
-         if ( match==0 )
+         if ( match == 0 )
          {
             if ( col_map_offd_A )
             {
@@ -995,7 +1353,7 @@ hypre_CSRMatrixUnion( hypre_CSRMatrix *A,
             ++mc;
          }
       }
-      C_i[i+1] = mc;
+      C_i[i + 1] = mc;
    }
 
    hypre_assert( mc == num_nonzeros );
@@ -1005,7 +1363,13 @@ hypre_CSRMatrixUnion( hypre_CSRMatrix *A,
    return C;
 }
 
-static HYPRE_Int hypre_CSRMatrixGetLoadBalancedPartitionBoundary(hypre_CSRMatrix *A, HYPRE_Int idx)
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixGetLoadBalancedPartitionBoundary
+ *--------------------------------------------------------------------------*/
+
+static HYPRE_Int
+hypre_CSRMatrixGetLoadBalancedPartitionBoundary(hypre_CSRMatrix *A,
+                                                HYPRE_Int        idx)
 {
    HYPRE_Int num_nonzerosA = hypre_CSRMatrixNumNonzeros(A);
    HYPRE_Int num_rowsA = hypre_CSRMatrixNumRows(A);
@@ -1013,7 +1377,7 @@ static HYPRE_Int hypre_CSRMatrixGetLoadBalancedPartitionBoundary(hypre_CSRMatrix
 
    HYPRE_Int num_threads = hypre_NumActiveThreads();
 
-   HYPRE_Int nonzeros_per_thread = (num_nonzerosA + num_threads - 1)/num_threads;
+   HYPRE_Int nonzeros_per_thread = (num_nonzerosA + num_threads - 1) / num_threads;
 
    if (idx <= 0)
    {
@@ -1025,29 +1389,43 @@ static HYPRE_Int hypre_CSRMatrixGetLoadBalancedPartitionBoundary(hypre_CSRMatrix
    }
    else
    {
-      return (HYPRE_Int)(hypre_LowerBound(A_i, A_i + num_rowsA, nonzeros_per_thread*idx) - A_i);
+      return (HYPRE_Int)(hypre_LowerBound(A_i, A_i + num_rowsA, nonzeros_per_thread * idx) - A_i);
    }
 }
 
-HYPRE_Int hypre_CSRMatrixGetLoadBalancedPartitionBegin(hypre_CSRMatrix *A)
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixGetLoadBalancedPartitionBegin
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_CSRMatrixGetLoadBalancedPartitionBegin(hypre_CSRMatrix *A)
 {
    return hypre_CSRMatrixGetLoadBalancedPartitionBoundary(A, hypre_GetThreadNum());
 }
 
-HYPRE_Int hypre_CSRMatrixGetLoadBalancedPartitionEnd(hypre_CSRMatrix *A)
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixGetLoadBalancedPartitionEnd
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_CSRMatrixGetLoadBalancedPartitionEnd(hypre_CSRMatrix *A)
 {
    return hypre_CSRMatrixGetLoadBalancedPartitionBoundary(A, hypre_GetThreadNum() + 1);
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixPrefetch
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_CSRMatrixPrefetch( hypre_CSRMatrix *A, HYPRE_MemoryLocation memory_location )
+hypre_CSRMatrixPrefetch( hypre_CSRMatrix      *A,
+                         HYPRE_MemoryLocation  memory_location )
 {
-   HYPRE_Int      ierr = 0;
-
-#ifdef HYPRE_USING_UNIFIED_MEMORY
+#if defined(HYPRE_USING_UNIFIED_MEMORY)
    if (hypre_CSRMatrixMemoryLocation(A) != HYPRE_MEMORY_DEVICE)
    {
-      return 1;
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "A is not at HYPRE_MEMORY_DEVICE");
+      return hypre_error_flag;
    }
 
    HYPRE_Complex *data = hypre_CSRMatrixData(A);
@@ -1057,15 +1435,25 @@ hypre_CSRMatrixPrefetch( hypre_CSRMatrix *A, HYPRE_MemoryLocation memory_locatio
    HYPRE_Int      nnzA = hypre_CSRMatrixNumNonzeros(A);
 
    hypre_MemPrefetch(data, sizeof(HYPRE_Complex)*nnzA, memory_location);
-   hypre_MemPrefetch(ia,   sizeof(HYPRE_Int)*(nrow+1), memory_location);
+   hypre_MemPrefetch(ia,   sizeof(HYPRE_Int) * (nrow + 1), memory_location);
    hypre_MemPrefetch(ja,   sizeof(HYPRE_Int)*nnzA,     memory_location);
+
+#else
+   HYPRE_UNUSED_VAR(A);
+   HYPRE_UNUSED_VAR(memory_location);
 #endif
 
-   return ierr;
+   return hypre_error_flag;
 }
 
-#if defined(HYPRE_USING_CUSPARSE) || defined(HYPRE_USING_ROCSPARSE)
-hypre_GpuMatData *
+#if defined(HYPRE_USING_CUSPARSE)  ||\
+    defined(HYPRE_USING_ROCSPARSE) ||\
+    defined(HYPRE_USING_ONEMKLSPARSE)
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixGetGPUMatData
+ *--------------------------------------------------------------------------*/
+
+hypre_GpuMatData*
 hypre_CSRMatrixGetGPUMatData(hypre_CSRMatrix *matrix)
 {
    if (!matrix)
@@ -1076,9 +1464,9 @@ hypre_CSRMatrixGetGPUMatData(hypre_CSRMatrix *matrix)
    if (!hypre_CSRMatrixGPUMatData(matrix))
    {
       hypre_CSRMatrixGPUMatData(matrix) = hypre_GpuMatDataCreate();
+      hypre_GPUMatDataSetCSRData(matrix);
    }
 
    return hypre_CSRMatrixGPUMatData(matrix);
 }
 #endif
-
diff --git a/external/hypre/src/seq_mv/csr_matrix.h b/external/hypre/src/seq_mv/csr_matrix.h
index e888e328..2a7c0c09 100644
--- a/external/hypre/src/seq_mv/csr_matrix.h
+++ b/external/hypre/src/seq_mv/csr_matrix.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -16,12 +16,12 @@
 #ifndef hypre_CSR_MATRIX_HEADER
 #define hypre_CSR_MATRIX_HEADER
 
-#if defined(HYPRE_USING_CUSPARSE) || defined(HYPRE_USING_ROCSPARSE)
+#if defined(HYPRE_USING_CUSPARSE)  ||\
+    defined(HYPRE_USING_ROCSPARSE) ||\
+    defined(HYPRE_USING_ONEMKLSPARSE)
 struct hypre_CsrsvData;
 typedef struct hypre_CsrsvData hypre_CsrsvData;
-#endif
 
-#if defined(HYPRE_USING_CUSPARSE) || defined(HYPRE_USING_ROCSPARSE)
 struct hypre_GpuMatData;
 typedef struct hypre_GpuMatData hypre_GpuMatData;
 #endif
@@ -41,15 +41,19 @@ typedef struct
    hypre_int            *i_short;
    hypre_int            *j_short;
    HYPRE_Int             owns_data;       /* Does the CSRMatrix create/destroy `data', `i', `j'? */
+   HYPRE_Int             pattern_only;    /* 1: data array is ignored, and assumed to be all 1's */
    HYPRE_Complex        *data;
    HYPRE_Int            *rownnz;          /* for compressing rows in matrix multiplication  */
    HYPRE_Int             num_rownnz;
    HYPRE_MemoryLocation  memory_location; /* memory location of arrays i, j, data */
-#if defined(HYPRE_USING_CUSPARSE) || defined(HYPRE_USING_ROCSPARSE)
+
+#if defined(HYPRE_USING_CUSPARSE)  ||\
+    defined(HYPRE_USING_ROCSPARSE) ||\
+    defined(HYPRE_USING_ONEMKLSPARSE)
    HYPRE_Int            *sorted_j;        /* some cusparse routines require sorted CSR */
    HYPRE_Complex        *sorted_data;
    hypre_CsrsvData      *csrsv_data;
-   hypre_GpuMatData      *mat_data;
+   hypre_GpuMatData     *mat_data;
 #endif
 } hypre_CSRMatrix;
 
@@ -67,9 +71,12 @@ typedef struct
 #define hypre_CSRMatrixRownnz(matrix)               ((matrix) -> rownnz)
 #define hypre_CSRMatrixNumRownnz(matrix)            ((matrix) -> num_rownnz)
 #define hypre_CSRMatrixOwnsData(matrix)             ((matrix) -> owns_data)
+#define hypre_CSRMatrixPatternOnly(matrix)          ((matrix) -> pattern_only)
 #define hypre_CSRMatrixMemoryLocation(matrix)       ((matrix) -> memory_location)
 
-#if defined(HYPRE_USING_CUSPARSE) || defined(HYPRE_USING_ROCSPARSE)
+#if defined(HYPRE_USING_CUSPARSE)  ||\
+    defined(HYPRE_USING_ROCSPARSE) ||\
+    defined(HYPRE_USING_ONEMKLSPARSE)
 #define hypre_CSRMatrixSortedJ(matrix)              ((matrix) -> sorted_j)
 #define hypre_CSRMatrixSortedData(matrix)           ((matrix) -> sorted_data)
 #define hypre_CSRMatrixCsrsvData(matrix)            ((matrix) -> csrsv_data)
@@ -108,4 +115,3 @@ typedef struct
 #define hypre_CSRBooleanMatrix_Get_OwnsData(matrix) ((matrix)->owns_data)
 
 #endif
-
diff --git a/external/hypre/src/seq_mv/csr_matrix_cuda_utils.c b/external/hypre/src/seq_mv/csr_matrix_cuda_utils.c
index 88e81a40..0a78be56 100644
--- a/external/hypre/src/seq_mv/csr_matrix_cuda_utils.c
+++ b/external/hypre/src/seq_mv/csr_matrix_cuda_utils.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -68,7 +68,7 @@ hypre_CSRMatrixToCusparseSpMat_core( HYPRE_Int      n,
  */
 cusparseSpMatDescr_t
 hypre_CSRMatrixToCusparseSpMat(const hypre_CSRMatrix *A,
-                                     HYPRE_Int        offset)
+                               HYPRE_Int        offset)
 {
    return hypre_CSRMatrixToCusparseSpMat_core( hypre_CSRMatrixNumRows(A),
                                                hypre_CSRMatrixNumCols(A),
@@ -87,21 +87,63 @@ hypre_CSRMatrixToCusparseSpMat(const hypre_CSRMatrix *A,
  * @warning Assumes CSRMatrix uses doubles for values
  */
 cusparseDnVecDescr_t
-hypre_VectorToCusparseDnVec(const hypre_Vector *x,
-                                  HYPRE_Int     offset,
-                                  HYPRE_Int     size_override)
+hypre_VectorToCusparseDnVec_core(HYPRE_Complex *x_data,
+                                 HYPRE_Int      n)
 {
    const cudaDataType data_type = hypre_HYPREComplexToCudaDataType();
 
    cusparseDnVecDescr_t vecX;
 
    HYPRE_CUSPARSE_CALL( cusparseCreateDnVec(&vecX,
-                                            size_override >= 0 ? size_override : hypre_VectorSize(x) - offset,
-                                            hypre_VectorData(x) + offset,
+                                            n,
+                                            x_data,
                                             data_type) );
    return vecX;
 }
 
+cusparseDnVecDescr_t
+hypre_VectorToCusparseDnVec(const hypre_Vector *x,
+                            HYPRE_Int           offset,
+                            HYPRE_Int           size_override)
+{
+   return hypre_VectorToCusparseDnVec_core(hypre_VectorData(x) + offset,
+                                           size_override >= 0 ? size_override : hypre_VectorSize(x) - offset);
+}
+
+/*
+ * @brief Creates a cuSPARSE dense matrix descriptor from a hypre_Vector
+ * @param[in] *x Pointer to a hypre_Vector
+ * @return cuSPARSE dense matrix descriptor
+ * @warning Assumes CSRMatrix uses doubles for values
+ */
+cusparseDnMatDescr_t
+hypre_VectorToCusparseDnMat_core(HYPRE_Complex *x_data,
+                                 HYPRE_Int      nrow,
+                                 HYPRE_Int      ncol,
+                                 HYPRE_Int      order)
+{
+
+   cudaDataType          data_type = hypre_HYPREComplexToCudaDataType();
+   cusparseDnMatDescr_t  matX;
+
+   HYPRE_CUSPARSE_CALL( cusparseCreateDnMat(&matX,
+                                            nrow,
+                                            ncol,
+                                            (order == 0) ? nrow : ncol,
+                                            x_data,
+                                            data_type,
+                                            (order == 0) ? CUSPARSE_ORDER_COL : CUSPARSE_ORDER_ROW) );
+   return matX;
+}
+
+cusparseDnMatDescr_t
+hypre_VectorToCusparseDnMat(const hypre_Vector *x)
+{
+   return hypre_VectorToCusparseDnMat_core(hypre_VectorData(x),
+                                           hypre_VectorSize(x),
+                                           hypre_VectorNumVectors(x),
+                                           hypre_VectorMultiVecStorageMethod(x));
+}
+
 #endif // #if CUSPARSE_VERSION >= CUSPARSE_NEWAPI_VERSION
 #endif // #if defined(HYPRE_USING_CUSPARSE)
-
diff --git a/external/hypre/src/seq_mv/csr_matvec.c b/external/hypre/src/seq_mv/csr_matvec.c
index 38d2f1d2..543009a3 100644
--- a/external/hypre/src/seq_mv/csr_matvec.c
+++ b/external/hypre/src/seq_mv/csr_matvec.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -32,7 +32,6 @@ hypre_CSRMatrixMatvecOutOfPlaceHost( HYPRE_Complex    alpha,
    HYPRE_Int        *A_j      = hypre_CSRMatrixJ(A);
    HYPRE_Int         num_rows = hypre_CSRMatrixNumRows(A) - offset;
    HYPRE_Int         num_cols = hypre_CSRMatrixNumCols(A);
-   /*HYPRE_Int         num_nnz  = hypre_CSRMatrixNumNonzeros(A);*/
 
    HYPRE_Int        *A_rownnz = hypre_CSRMatrixRownnz(A);
    HYPRE_Int         num_rownnz = hypre_CSRMatrixNumRownnz(A);
@@ -46,13 +45,13 @@ hypre_CSRMatrixMatvecOutOfPlaceHost( HYPRE_Complex    alpha,
    HYPRE_Int         num_vectors = hypre_VectorNumVectors(x);
    HYPRE_Int         idxstride_y = hypre_VectorIndexStride(y);
    HYPRE_Int         vecstride_y = hypre_VectorVectorStride(y);
-   /*HYPRE_Int         idxstride_b = hypre_VectorIndexStride(b);
-   HYPRE_Int         vecstride_b = hypre_VectorVectorStride(b);*/
+   HYPRE_Int         idxstride_b = hypre_VectorIndexStride(b);
+   HYPRE_Int         vecstride_b = hypre_VectorVectorStride(b);
    HYPRE_Int         idxstride_x = hypre_VectorIndexStride(x);
    HYPRE_Int         vecstride_x = hypre_VectorVectorStride(x);
    HYPRE_Complex     temp, tempx;
-   HYPRE_Int         i, j, jj, m, ierr=0;
-   HYPRE_Real        xpar=0.7;
+   HYPRE_Int         i, j, jj, m, ierr = 0;
+   HYPRE_Real        xpar = 0.7;
    hypre_Vector     *x_tmp = NULL;
 
    /*---------------------------------------------------------------------
@@ -68,6 +67,8 @@ hypre_CSRMatrixMatvecOutOfPlaceHost( HYPRE_Complex    alpha,
 
    hypre_assert(num_vectors == hypre_VectorNumVectors(y));
    hypre_assert(num_vectors == hypre_VectorNumVectors(b));
+   hypre_assert(idxstride_b == idxstride_y);
+   hypre_assert(vecstride_b == vecstride_y);
 
    if (num_cols != x_size)
    {
@@ -91,11 +92,11 @@ hypre_CSRMatrixMatvecOutOfPlaceHost( HYPRE_Complex    alpha,
    if (alpha == 0.0)
    {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-      for (i = 0; i < num_rows*num_vectors; i++)
+      for (i = 0; i < num_rows * num_vectors; i++)
       {
-         y_data[i] = beta*b_data[i];
+         y_data[i] = beta * b_data[i];
       }
 
 #ifdef HYPRE_PROFILE
@@ -122,9 +123,9 @@ hypre_CSRMatrixMatvecOutOfPlaceHost( HYPRE_Complex    alpha,
       if (temp == 0.0)
       {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+         #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-         for (i = 0; i < num_rows*num_vectors; i++)
+         for (i = 0; i < num_rows * num_vectors; i++)
          {
             y_data[i] = 0.0;
          }
@@ -132,9 +133,9 @@ hypre_CSRMatrixMatvecOutOfPlaceHost( HYPRE_Complex    alpha,
       else if (temp == 1.0)
       {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+         #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-         for (i = 0; i < num_rows*num_vectors; i++)
+         for (i = 0; i < num_rows * num_vectors; i++)
          {
             y_data[i] = b_data[i];
          }
@@ -142,9 +143,9 @@ hypre_CSRMatrixMatvecOutOfPlaceHost( HYPRE_Complex    alpha,
       else if (temp == -1.0)
       {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+         #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-         for (i = 0; i < num_rows*num_vectors; i++)
+         for (i = 0; i < num_rows * num_vectors; i++)
          {
             y_data[i] = -b_data[i];
          }
@@ -152,11 +153,11 @@ hypre_CSRMatrixMatvecOutOfPlaceHost( HYPRE_Complex    alpha,
       else
       {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+         #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-         for (i = 0; i < num_rows*num_vectors; i++)
+         for (i = 0; i < num_rows * num_vectors; i++)
          {
-            y_data[i] = temp*b_data[i];
+            y_data[i] = temp * b_data[i];
          }
       }
 
@@ -164,43 +165,203 @@ hypre_CSRMatrixMatvecOutOfPlaceHost( HYPRE_Complex    alpha,
        * y += A*x
        *-----------------------------------------------------------------*/
 
-      if (num_rownnz < xpar*num_rows)
+      if (num_rownnz < xpar * num_rows)
       {
+         switch (num_vectors)
+         {
+            case 2:
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i,j,jj,m,tempx) HYPRE_SMP_SCHEDULE
+               #pragma omp parallel for private(i,j,jj,m) HYPRE_SMP_SCHEDULE
 #endif
-         for (i = 0; i < num_rownnz; i++)
-         {
-            m = A_rownnz[i];
-            for (j = 0; j < num_vectors; j++)
-            {
-               tempx = 0.0;
-               for (jj = A_i[m]; jj < A_i[m+1]; jj++)
+               for (i = 0; i < num_rownnz; i++)
                {
-                  tempx += A_data[jj] * x_data[j*vecstride_x + A_j[jj]*idxstride_x];
+                  m = A_rownnz[i];
+
+                  HYPRE_Complex tmp[2] = {0.0, 0.0};
+                  for (jj = A_i[m]; jj < A_i[m + 1]; jj++)
+                  {
+                     HYPRE_Int     xidx = A_j[jj] * idxstride_x;
+                     HYPRE_Complex coef = A_data[jj];
+
+                     tmp[0] += coef * x_data[xidx];
+                     tmp[1] += coef * x_data[xidx + vecstride_x];
+                  }
+                  HYPRE_Int yidx = m * idxstride_y;
+
+                  y_data[yidx] += tmp[0];
+                  y_data[yidx + vecstride_y] += tmp[1];
                }
-               y_data[j*vecstride_y + m*idxstride_y] += tempx;
-            }
-         }
+               break;
+
+            case 3:
+#ifdef HYPRE_USING_OPENMP
+               #pragma omp parallel for private(i,j,jj,m) HYPRE_SMP_SCHEDULE
+#endif
+               for (i = 0; i < num_rownnz; i++)
+               {
+                  m = A_rownnz[i];
+
+                  HYPRE_Complex tmp[3] = {0.0, 0.0, 0.0};
+                  for (jj = A_i[m]; jj < A_i[m + 1]; jj++)
+                  {
+                     HYPRE_Int     xidx = A_j[jj] * idxstride_x;
+                     HYPRE_Complex coef = A_data[jj];
+
+                     tmp[0] += coef * x_data[xidx];
+                     tmp[1] += coef * x_data[xidx +   vecstride_x];
+                     tmp[2] += coef * x_data[xidx + 2 * vecstride_x];
+                  }
+                  HYPRE_Int yidx = m * idxstride_y;
+
+                  y_data[yidx] += tmp[0];
+                  y_data[yidx +   vecstride_y] += tmp[1];
+                  y_data[yidx + 2 * vecstride_y] += tmp[2];
+               }
+               break;
+
+            case 4:
+#ifdef HYPRE_USING_OPENMP
+               #pragma omp parallel for private(i,j,jj,m) HYPRE_SMP_SCHEDULE
+#endif
+               for (i = 0; i < num_rownnz; i++)
+               {
+                  m = A_rownnz[i];
+
+                  HYPRE_Complex tmp[4] = {0.0, 0.0, 0.0, 0.0};
+                  for (jj = A_i[m]; jj < A_i[m + 1]; jj++)
+                  {
+                     HYPRE_Int     xidx = A_j[jj] * idxstride_x;
+                     HYPRE_Complex coef = A_data[jj];
+
+                     tmp[0] += coef * x_data[xidx];
+                     tmp[1] += coef * x_data[xidx +   vecstride_x];
+                     tmp[2] += coef * x_data[xidx + 2 * vecstride_x];
+                     tmp[3] += coef * x_data[xidx + 3 * vecstride_x];
+                  }
+                  HYPRE_Int yidx = m * idxstride_y;
+
+                  y_data[yidx] += tmp[0];
+                  y_data[yidx +   vecstride_y] += tmp[1];
+                  y_data[yidx + 2 * vecstride_y] += tmp[2];
+                  y_data[yidx + 3 * vecstride_y] += tmp[3];
+               }
+               break;
+
+            default:
+#ifdef HYPRE_USING_OPENMP
+               #pragma omp parallel for private(i,j,jj,m,tempx) HYPRE_SMP_SCHEDULE
+#endif
+               for (i = 0; i < num_rownnz; i++)
+               {
+                  m = A_rownnz[i];
+                  for (j = 0; j < num_vectors; j++)
+                  {
+                     tempx = 0.0;
+                     for (jj = A_i[m]; jj < A_i[m + 1]; jj++)
+                     {
+                        tempx += A_data[jj] * x_data[j * vecstride_x + A_j[jj] * idxstride_x];
+                     }
+                     y_data[j * vecstride_y + m * idxstride_y] += tempx;
+                  }
+               }
+               break;
+         } /* switch (num_vectors) */
       }
       else
       {
+         switch (num_vectors)
+         {
+            case 2:
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i,j,jj,tempx) HYPRE_SMP_SCHEDULE
+               #pragma omp parallel for private(i,j,jj) HYPRE_SMP_SCHEDULE
 #endif
-         for (i = 0; i < num_rows; i++)
-         {
-            for (j = 0; j < num_vectors; ++j)
-            {
-               tempx = 0.0;
-               for (jj = A_i[i]; jj < A_i[i+1]; jj++)
+               for (i = 0; i < num_rows; i++)
                {
-                  tempx += A_data[jj] * x_data[j*vecstride_x + A_j[jj]*idxstride_x];
+                  HYPRE_Complex tmp[2] = {0.0, 0.0};
+                  for (jj = A_i[i]; jj < A_i[i + 1]; jj++)
+                  {
+                     HYPRE_Int     xidx = A_j[jj] * idxstride_x;
+                     HYPRE_Complex coef = A_data[jj];
+
+                     tmp[0] += coef * x_data[xidx];
+                     tmp[1] += coef * x_data[xidx + vecstride_x];
+                  }
+                  HYPRE_Int yidx = i * idxstride_y;
+
+                  y_data[yidx] += tmp[0];
+                  y_data[yidx + vecstride_y] += tmp[1];
                }
-               y_data[j*vecstride_y + i*idxstride_y] += tempx;
-            }
-         }
-      }
+               break;
+
+            case 3:
+#ifdef HYPRE_USING_OPENMP
+               #pragma omp parallel for private(i,j,jj) HYPRE_SMP_SCHEDULE
+#endif
+               for (i = 0; i < num_rows; i++)
+               {
+                  HYPRE_Complex tmp[3] = {0.0, 0.0, 0.0};
+                  for (jj = A_i[i]; jj < A_i[i + 1]; jj++)
+                  {
+                     HYPRE_Int     xidx = A_j[jj] * idxstride_x;
+                     HYPRE_Complex coef = A_data[jj];
+
+                     tmp[0] += coef * x_data[xidx];
+                     tmp[1] += coef * x_data[xidx +   vecstride_x];
+                     tmp[2] += coef * x_data[xidx + 2 * vecstride_x];
+                  }
+                  HYPRE_Int yidx = i * idxstride_y;
+
+                  y_data[yidx] += tmp[0];
+                  y_data[yidx +   vecstride_y] += tmp[1];
+                  y_data[yidx + 2 * vecstride_y] += tmp[2];
+               }
+               break;
+
+            case 4:
+#ifdef HYPRE_USING_OPENMP
+               #pragma omp parallel for private(i,j,jj) HYPRE_SMP_SCHEDULE
+#endif
+               for (i = 0; i < num_rows; i++)
+               {
+                  HYPRE_Complex tmp[4] = {0.0, 0.0, 0.0, 0.0};
+                  for (jj = A_i[i]; jj < A_i[i + 1]; jj++)
+                  {
+                     HYPRE_Int     xidx = A_j[jj] * idxstride_x;
+                     HYPRE_Complex coef = A_data[jj];
+
+                     tmp[0] += coef * x_data[xidx];
+                     tmp[1] += coef * x_data[xidx +   vecstride_x];
+                     tmp[2] += coef * x_data[xidx + 2 * vecstride_x];
+                     tmp[3] += coef * x_data[xidx + 3 * vecstride_x];
+                  }
+                  HYPRE_Int yidx = i * idxstride_y;
+
+                  y_data[yidx] += tmp[0];
+                  y_data[yidx +   vecstride_y] += tmp[1];
+                  y_data[yidx + 2 * vecstride_y] += tmp[2];
+                  y_data[yidx + 3 * vecstride_y] += tmp[3];
+               }
+               break;
+
+            default:
+#ifdef HYPRE_USING_OPENMP
+               #pragma omp parallel for private(i,j,jj,tempx) HYPRE_SMP_SCHEDULE
+#endif
+               for (i = 0; i < num_rows; i++)
+               {
+                  for (j = 0; j < num_vectors; ++j)
+                  {
+                     tempx = 0.0;
+                     for (jj = A_i[i]; jj < A_i[i + 1]; jj++)
+                     {
+                        tempx += A_data[jj] * x_data[j * vecstride_x + A_j[jj] * idxstride_x];
+                     }
+                     y_data[j * vecstride_y + i * idxstride_y] += tempx;
+                  }
+               }
+               break;
+         } /* switch (num_vectors) */
+      } /* if (num_rownnz < xpar * num_rows) */
 
       /*-----------------------------------------------------------------
        * y = alpha*y
@@ -209,15 +370,15 @@ hypre_CSRMatrixMatvecOutOfPlaceHost( HYPRE_Complex    alpha,
       if (alpha != 1.0)
       {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+         #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-         for (i = 0; i < num_rows*num_vectors; i++)
+         for (i = 0; i < num_rows * num_vectors; i++)
          {
             y_data[i] *= alpha;
          }
       }
    }
-   else if (num_rownnz < xpar*num_rows)
+   else if (num_rownnz < xpar * num_rows)
    {
       /* use rownnz pointer to do the A*x multiplication when
          num_rownnz is smaller than xpar*num_rows */
@@ -225,7 +386,7 @@ hypre_CSRMatrixMatvecOutOfPlaceHost( HYPRE_Complex    alpha,
       if (temp == 0.0)
       {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+         #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
          for (i = 0; i < num_rows; i++)
          {
@@ -235,13 +396,13 @@ hypre_CSRMatrixMatvecOutOfPlaceHost( HYPRE_Complex    alpha,
          if (alpha == 1.0)
          {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i,j,m,tempx) HYPRE_SMP_SCHEDULE
+            #pragma omp parallel for private(i,j,m,tempx) HYPRE_SMP_SCHEDULE
 #endif
             for (i = 0; i < num_rownnz; i++)
             {
                m = A_rownnz[i];
                tempx = 0.0;
-               for (j = A_i[m]; j < A_i[m+1]; j++)
+               for (j = A_i[m]; j < A_i[m + 1]; j++)
                {
                   tempx += A_data[j] * x_data[A_j[j]];
                }
@@ -251,13 +412,13 @@ hypre_CSRMatrixMatvecOutOfPlaceHost( HYPRE_Complex    alpha,
          else if (alpha == -1.0)
          {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i,j,m,tempx) HYPRE_SMP_SCHEDULE
+            #pragma omp parallel for private(i,j,m,tempx) HYPRE_SMP_SCHEDULE
 #endif
             for (i = 0; i < num_rownnz; i++)
             {
                m = A_rownnz[i];
                tempx = 0.0;
-               for (j = A_i[m]; j < A_i[m+1]; j++)
+               for (j = A_i[m]; j < A_i[m + 1]; j++)
                {
                   tempx -= A_data[j] * x_data[A_j[j]];
                }
@@ -267,17 +428,17 @@ hypre_CSRMatrixMatvecOutOfPlaceHost( HYPRE_Complex    alpha,
          else
          {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i,j,m,tempx) HYPRE_SMP_SCHEDULE
+            #pragma omp parallel for private(i,j,m,tempx) HYPRE_SMP_SCHEDULE
 #endif
             for (i = 0; i < num_rownnz; i++)
             {
                m = A_rownnz[i];
                tempx = 0.0;
-               for (j = A_i[m]; j < A_i[m+1]; j++)
+               for (j = A_i[m]; j < A_i[m + 1]; j++)
                {
                   tempx += A_data[j] * x_data[A_j[j]];
                }
-               y_data[m] = alpha*tempx;
+               y_data[m] = alpha * tempx;
             }
          } // y = alpha*A*x
       } // temp == 0
@@ -286,7 +447,7 @@ hypre_CSRMatrixMatvecOutOfPlaceHost( HYPRE_Complex    alpha,
          if (alpha == 1.0)
          {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+            #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
             for (i = 0; i < num_rows; i++)
             {
@@ -294,13 +455,13 @@ hypre_CSRMatrixMatvecOutOfPlaceHost( HYPRE_Complex    alpha,
             }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i,j,m,tempx) HYPRE_SMP_SCHEDULE
+            #pragma omp parallel for private(i,j,m,tempx) HYPRE_SMP_SCHEDULE
 #endif
             for (i = 0; i < num_rownnz; i++)
             {
                m = A_rownnz[i];
                tempx = 0.0;
-               for (j = A_i[m]; j < A_i[m+1]; j++)
+               for (j = A_i[m]; j < A_i[m + 1]; j++)
                {
                   tempx += A_data[j] * x_data[A_j[j]];
                }
@@ -310,7 +471,7 @@ hypre_CSRMatrixMatvecOutOfPlaceHost( HYPRE_Complex    alpha,
          else if (alpha == -1.0)
          {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+            #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
             for (i = 0; i < num_rows; i++)
             {
@@ -318,13 +479,13 @@ hypre_CSRMatrixMatvecOutOfPlaceHost( HYPRE_Complex    alpha,
             }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i,j,m,tempx) HYPRE_SMP_SCHEDULE
+            #pragma omp parallel for private(i,j,m,tempx) HYPRE_SMP_SCHEDULE
 #endif
             for (i = 0; i < num_rownnz; i++)
             {
                m = A_rownnz[i];
                tempx = 0.0;
-               for (j = A_i[m]; j < A_i[m+1]; j++)
+               for (j = A_i[m]; j < A_i[m + 1]; j++)
                {
                   tempx += A_data[j] * x_data[A_j[j]];
                }
@@ -334,25 +495,25 @@ hypre_CSRMatrixMatvecOutOfPlaceHost( HYPRE_Complex    alpha,
          else
          {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+            #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
             for (i = 0; i < num_rows; i++)
             {
-               y_data[i] = -alpha*b_data[i];
+               y_data[i] = -alpha * b_data[i];
             }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i,j,m,tempx) HYPRE_SMP_SCHEDULE
+            #pragma omp parallel for private(i,j,m,tempx) HYPRE_SMP_SCHEDULE
 #endif
             for (i = 0; i < num_rownnz; i++)
             {
                m = A_rownnz[i];
                tempx = 0.0;
-               for (j = A_i[m]; j < A_i[m+1]; j++)
+               for (j = A_i[m]; j < A_i[m + 1]; j++)
                {
                   tempx += A_data[j] * x_data[A_j[j]];
                }
-               y_data[m] += alpha*tempx;
+               y_data[m] += alpha * tempx;
             }
          } // y = alpha*(A*x - b)
       } // temp == -1
@@ -361,7 +522,7 @@ hypre_CSRMatrixMatvecOutOfPlaceHost( HYPRE_Complex    alpha,
          if (alpha == 1.0)
          {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+            #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
             for (i = 0; i < num_rows; i++)
             {
@@ -369,13 +530,13 @@ hypre_CSRMatrixMatvecOutOfPlaceHost( HYPRE_Complex    alpha,
             }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i,j,m,tempx) HYPRE_SMP_SCHEDULE
+            #pragma omp parallel for private(i,j,m,tempx) HYPRE_SMP_SCHEDULE
 #endif
             for (i = 0; i < num_rownnz; i++)
             {
                m = A_rownnz[i];
                tempx = 0.0;
-               for (j = A_i[m]; j < A_i[m+1]; j++)
+               for (j = A_i[m]; j < A_i[m + 1]; j++)
                {
                   tempx += A_data[j] * x_data[A_j[j]];
                }
@@ -385,7 +546,7 @@ hypre_CSRMatrixMatvecOutOfPlaceHost( HYPRE_Complex    alpha,
          else if (alpha == -1.0)
          {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+            #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
             for (i = 0; i < num_rows; i++)
             {
@@ -393,13 +554,13 @@ hypre_CSRMatrixMatvecOutOfPlaceHost( HYPRE_Complex    alpha,
             }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i,j,m,tempx) HYPRE_SMP_SCHEDULE
+            #pragma omp parallel for private(i,j,m,tempx) HYPRE_SMP_SCHEDULE
 #endif
             for (i = 0; i < num_rownnz; i++)
             {
                m = A_rownnz[i];
                tempx = 0.0;
-               for (j = A_i[m]; j < A_i[m+1]; j++)
+               for (j = A_i[m]; j < A_i[m + 1]; j++)
                {
                   tempx -= A_data[j] * x_data[A_j[j]];
                }
@@ -409,25 +570,25 @@ hypre_CSRMatrixMatvecOutOfPlaceHost( HYPRE_Complex    alpha,
          else
          {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+            #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
             for (i = 0; i < num_rows; i++)
             {
-               y_data[i] = alpha*b_data[i];
+               y_data[i] = alpha * b_data[i];
             }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i,j,m,tempx) HYPRE_SMP_SCHEDULE
+            #pragma omp parallel for private(i,j,m,tempx) HYPRE_SMP_SCHEDULE
 #endif
             for (i = 0; i < num_rownnz; i++)
             {
                m = A_rownnz[i];
                tempx = 0.0;
-               for (j = A_i[m]; j < A_i[m+1]; j++)
+               for (j = A_i[m]; j < A_i[m + 1]; j++)
                {
                   tempx += A_data[j] * x_data[A_j[j]];
                }
-               y_data[m] += alpha*tempx;
+               y_data[m] += alpha * tempx;
             }
          } // y = alpha*(A*x + b)
       }
@@ -436,21 +597,21 @@ hypre_CSRMatrixMatvecOutOfPlaceHost( HYPRE_Complex    alpha,
          if (alpha == 1.0)
          {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+            #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
             for (i = 0; i < num_rows; i++)
             {
-               y_data[i] = beta*b_data[i];
+               y_data[i] = beta * b_data[i];
             }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i,j,m,tempx) HYPRE_SMP_SCHEDULE
+            #pragma omp parallel for private(i,j,m,tempx) HYPRE_SMP_SCHEDULE
 #endif
             for (i = 0; i < num_rownnz; i++)
             {
                m = A_rownnz[i];
                tempx = 0.0;
-               for (j = A_i[m]; j < A_i[m+1]; j++)
+               for (j = A_i[m]; j < A_i[m + 1]; j++)
                {
                   tempx += A_data[j] * x_data[A_j[j]];
                }
@@ -460,21 +621,21 @@ hypre_CSRMatrixMatvecOutOfPlaceHost( HYPRE_Complex    alpha,
          else if (-1 == alpha)
          {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+            #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
             for (i = 0; i < num_rows; i++)
             {
-               y_data[i] = -temp*b_data[i];
+               y_data[i] = -temp * b_data[i];
             }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i,j,m,tempx) HYPRE_SMP_SCHEDULE
+            #pragma omp parallel for private(i,j,m,tempx) HYPRE_SMP_SCHEDULE
 #endif
             for (i = 0; i < num_rownnz; i++)
             {
                m = A_rownnz[i];
                tempx = 0.0;
-               for (j = A_i[m]; j < A_i[m+1]; j++)
+               for (j = A_i[m]; j < A_i[m + 1]; j++)
                {
                   tempx -= A_data[j] * x_data[A_j[j]];
                }
@@ -484,25 +645,25 @@ hypre_CSRMatrixMatvecOutOfPlaceHost( HYPRE_Complex    alpha,
          else
          {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+            #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
             for (i = 0; i < num_rows; i++)
             {
-               y_data[i] = beta*b_data[i];
+               y_data[i] = beta * b_data[i];
             }
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i,j,m,tempx) HYPRE_SMP_SCHEDULE
+            #pragma omp parallel for private(i,j,m,tempx) HYPRE_SMP_SCHEDULE
 #endif
             for (i = 0; i < num_rownnz; i++)
             {
                m = A_rownnz[i];
                tempx = 0.0;
-               for (j = A_i[m]; j < A_i[m+1]; j++)
+               for (j = A_i[m]; j < A_i[m + 1]; j++)
                {
                   tempx += A_data[j] * x_data[A_j[j]];
                }
-               y_data[m] += alpha*tempx;
+               y_data[m] += alpha * tempx;
             }
          } // y = alpha*(A*x + temp*b)
       } // temp != 0 && temp != -1 && temp != 1
@@ -510,7 +671,7 @@ hypre_CSRMatrixMatvecOutOfPlaceHost( HYPRE_Complex    alpha,
    else
    {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel private(i,jj,tempx)
+      #pragma omp parallel private(i,jj,tempx)
 #endif
       {
          HYPRE_Int iBegin = hypre_CSRMatrixGetLoadBalancedPartitionBegin(A);
@@ -526,7 +687,7 @@ hypre_CSRMatrixMatvecOutOfPlaceHost( HYPRE_Complex    alpha,
                for (i = iBegin; i < iEnd; i++)
                {
                   tempx = 0.0;
-                  for (jj = A_i[i]; jj < A_i[i+1]; jj++)
+                  for (jj = A_i[i]; jj < A_i[i + 1]; jj++)
                   {
                      tempx += A_data[jj] * x_data[A_j[jj]];
                   }
@@ -538,7 +699,7 @@ hypre_CSRMatrixMatvecOutOfPlaceHost( HYPRE_Complex    alpha,
                for (i = iBegin; i < iEnd; i++)
                {
                   tempx = 0.0;
-                  for (jj = A_i[i]; jj < A_i[i+1]; jj++)
+                  for (jj = A_i[i]; jj < A_i[i + 1]; jj++)
                   {
                      tempx -= A_data[jj] * x_data[A_j[jj]];
                   }
@@ -550,11 +711,11 @@ hypre_CSRMatrixMatvecOutOfPlaceHost( HYPRE_Complex    alpha,
                for (i = iBegin; i < iEnd; i++)
                {
                   tempx = 0.0;
-                  for (jj = A_i[i]; jj < A_i[i+1]; jj++)
+                  for (jj = A_i[i]; jj < A_i[i + 1]; jj++)
                   {
                      tempx += A_data[jj] * x_data[A_j[jj]];
                   }
-                  y_data[i] = alpha*tempx;
+                  y_data[i] = alpha * tempx;
                }
             } // y = alpha*A*x
          } // temp == 0
@@ -566,7 +727,7 @@ hypre_CSRMatrixMatvecOutOfPlaceHost( HYPRE_Complex    alpha,
                {
                   y_data[i] = -b_data[i];
                   tempx = 0.0;
-                  for (jj = A_i[i]; jj < A_i[i+1]; jj++)
+                  for (jj = A_i[i]; jj < A_i[i + 1]; jj++)
                   {
                      tempx += A_data[jj] * x_data[A_j[jj]];
                   }
@@ -579,7 +740,7 @@ hypre_CSRMatrixMatvecOutOfPlaceHost( HYPRE_Complex    alpha,
                {
                   y_data[i] = b_data[i];
                   tempx = 0.0;
-                  for (jj = A_i[i]; jj < A_i[i+1]; jj++)
+                  for (jj = A_i[i]; jj < A_i[i + 1]; jj++)
                   {
                      tempx -= A_data[jj] * x_data[A_j[jj]];
                   }
@@ -590,13 +751,13 @@ hypre_CSRMatrixMatvecOutOfPlaceHost( HYPRE_Complex    alpha,
             {
                for (i = iBegin; i < iEnd; i++)
                {
-                  y_data[i] = -alpha*b_data[i];
+                  y_data[i] = -alpha * b_data[i];
                   tempx = 0.0;
-                  for (jj = A_i[i]; jj < A_i[i+1]; jj++)
+                  for (jj = A_i[i]; jj < A_i[i + 1]; jj++)
                   {
                      tempx += A_data[jj] * x_data[A_j[jj]];
                   }
-                  y_data[i] += alpha*tempx;
+                  y_data[i] += alpha * tempx;
                }
             } // y = alpha*(A*x - y)
          } // temp == -1
@@ -608,7 +769,7 @@ hypre_CSRMatrixMatvecOutOfPlaceHost( HYPRE_Complex    alpha,
                {
                   y_data[i] = b_data[i];
                   tempx = 0.0;
-                  for (jj = A_i[i]; jj < A_i[i+1]; jj++)
+                  for (jj = A_i[i]; jj < A_i[i + 1]; jj++)
                   {
                      tempx += A_data[jj] * x_data[A_j[jj]];
                   }
@@ -621,7 +782,7 @@ hypre_CSRMatrixMatvecOutOfPlaceHost( HYPRE_Complex    alpha,
                {
                   y_data[i] = -b_data[i];
                   tempx = 0.0;
-                  for (jj = A_i[i]; jj < A_i[i+1]; jj++)
+                  for (jj = A_i[i]; jj < A_i[i + 1]; jj++)
                   {
                      tempx -= A_data[jj] * x_data[A_j[jj]];
                   }
@@ -634,11 +795,11 @@ hypre_CSRMatrixMatvecOutOfPlaceHost( HYPRE_Complex    alpha,
                {
                   y_data[i] = alpha * b_data[i];
                   tempx = 0.0;
-                  for (jj = A_i[i]; jj < A_i[i+1]; jj++)
+                  for (jj = A_i[i]; jj < A_i[i + 1]; jj++)
                   {
                      tempx += A_data[jj] * x_data[A_j[jj]];
                   }
-                  y_data[i] += alpha*tempx;
+                  y_data[i] += alpha * tempx;
                }
             } // y = alpha*(A*x + y)
          }
@@ -648,9 +809,9 @@ hypre_CSRMatrixMatvecOutOfPlaceHost( HYPRE_Complex    alpha,
             {
                for (i = iBegin; i < iEnd; i++)
                {
-                  y_data[i] = b_data[i]*temp;
+                  y_data[i] = b_data[i] * temp;
                   tempx = 0.0;
-                  for (jj = A_i[i]; jj < A_i[i+1]; jj++)
+                  for (jj = A_i[i]; jj < A_i[i + 1]; jj++)
                   {
                      tempx += A_data[jj] * x_data[A_j[jj]];
                   }
@@ -661,9 +822,9 @@ hypre_CSRMatrixMatvecOutOfPlaceHost( HYPRE_Complex    alpha,
             {
                for (i = iBegin; i < iEnd; i++)
                {
-                  y_data[i] = -b_data[i]*temp;
+                  y_data[i] = -b_data[i] * temp;
                   tempx = 0.0;
-                  for (jj = A_i[i]; jj < A_i[i+1]; jj++)
+                  for (jj = A_i[i]; jj < A_i[i + 1]; jj++)
                   {
                      tempx -= A_data[jj] * x_data[A_j[jj]];
                   }
@@ -674,13 +835,13 @@ hypre_CSRMatrixMatvecOutOfPlaceHost( HYPRE_Complex    alpha,
             {
                for (i = iBegin; i < iEnd; i++)
                {
-                  y_data[i] = b_data[i]*beta;
+                  y_data[i] = b_data[i] * beta;
                   tempx = 0.0;
-                  for (jj = A_i[i]; jj < A_i[i+1]; jj++)
+                  for (jj = A_i[i]; jj < A_i[i + 1]; jj++)
                   {
                      tempx += A_data[jj] * x_data[A_j[jj]];
                   }
-                  y_data[i] += alpha*tempx;
+                  y_data[i] += alpha * tempx;
                }
             } // y = alpha*(A*x + temp*y)
          } // temp != 0 && temp != -1 && temp != 1
@@ -710,10 +871,8 @@ hypre_CSRMatrixMatvecOutOfPlace( HYPRE_Complex    alpha,
 
    HYPRE_Int ierr = 0;
 
-#if defined(HYPRE_USING_GPU)
-   //HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_ParCSRMatrixMemoryLocation(A) );
-   //RL: TODO back to hypre_GetExecPolicy1 later
-   HYPRE_ExecutionPolicy exec = HYPRE_EXEC_DEVICE;
+#if defined(HYPRE_USING_GPU) || defined(HYPRE_USING_DEVICE_OPENMP)
+   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_CSRMatrixMemoryLocation(A) );
    if (exec == HYPRE_EXEC_DEVICE)
    {
       ierr = hypre_CSRMatrixMatvecDevice(0, alpha, A, x, beta, b, y, offset);
@@ -800,13 +959,19 @@ hypre_CSRMatrixMatvecTHost( HYPRE_Complex    alpha,
    hypre_assert( num_vectors == hypre_VectorNumVectors(y) );
 
    if (num_rows != x_size)
+   {
       ierr = 1;
+   }
 
    if (num_cols != y_size)
+   {
       ierr = 2;
+   }
 
    if (num_rows != x_size && num_cols != y_size)
+   {
       ierr = 3;
+   }
    /*-----------------------------------------------------------------------
     * Do (alpha == 0.0) computation - RDF: USE MACHINE EPS
     *-----------------------------------------------------------------------*/
@@ -814,10 +979,12 @@ hypre_CSRMatrixMatvecTHost( HYPRE_Complex    alpha,
    if (alpha == 0.0)
    {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-      for (i = 0; i < num_cols*num_vectors; i++)
+      for (i = 0; i < num_cols * num_vectors; i++)
+      {
          y_data[i] *= beta;
+      }
 
       return ierr;
    }
@@ -839,18 +1006,22 @@ hypre_CSRMatrixMatvecTHost( HYPRE_Complex    alpha,
       if (temp == 0.0)
       {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+         #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-         for (i = 0; i < num_cols*num_vectors; i++)
+         for (i = 0; i < num_cols * num_vectors; i++)
+         {
             y_data[i] = 0.0;
+         }
       }
       else
       {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+         #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-         for (i = 0; i < num_cols*num_vectors; i++)
+         for (i = 0; i < num_cols * num_vectors; i++)
+         {
             y_data[i] *= temp;
+         }
       }
    }
 
@@ -860,23 +1031,23 @@ hypre_CSRMatrixMatvecTHost( HYPRE_Complex    alpha,
    num_threads = hypre_NumThreads();
    if (num_threads > 1)
    {
-      y_data_expand = hypre_CTAlloc(HYPRE_Complex,  num_threads*y_size, HYPRE_MEMORY_HOST);
+      y_data_expand = hypre_CTAlloc(HYPRE_Complex,  num_threads * y_size, HYPRE_MEMORY_HOST);
 
-      if ( num_vectors==1 )
+      if ( num_vectors == 1 )
       {
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel private(i,jj,j,my_thread_num,offset)
+         #pragma omp parallel private(i,jj,j,my_thread_num,offset)
 #endif
          {
             my_thread_num = hypre_GetThreadNum();
-            offset =  y_size*my_thread_num;
+            offset =  y_size * my_thread_num;
 #ifdef HYPRE_USING_OPENMP
-#pragma omp for HYPRE_SMP_SCHEDULE
+            #pragma omp for HYPRE_SMP_SCHEDULE
 #endif
             for (i = 0; i < num_rows; i++)
             {
-               for (jj = A_i[i]; jj < A_i[i+1]; jj++)
+               for (jj = A_i[i]; jj < A_i[i + 1]; jj++)
                {
                   j = A_j[jj];
                   y_data_expand[offset + j] += A_data[jj] * x_data[i];
@@ -885,13 +1056,13 @@ hypre_CSRMatrixMatvecTHost( HYPRE_Complex    alpha,
 
             /* implied barrier (for threads)*/
 #ifdef HYPRE_USING_OPENMP
-#pragma omp for HYPRE_SMP_SCHEDULE
+            #pragma omp for HYPRE_SMP_SCHEDULE
 #endif
             for (i = 0; i < y_size; i++)
             {
                for (j = 0; j < num_threads; j++)
                {
-                  y_data[i] += y_data_expand[j*y_size + i];
+                  y_data[i] += y_data_expand[j * y_size + i];
 
                }
             }
@@ -903,13 +1074,13 @@ hypre_CSRMatrixMatvecTHost( HYPRE_Complex    alpha,
          /* multiple vector case is not threaded */
          for (i = 0; i < num_rows; i++)
          {
-            for ( jv=0; jv<num_vectors; ++jv )
+            for ( jv = 0; jv < num_vectors; ++jv )
             {
-               for (jj = A_i[i]; jj < A_i[i+1]; jj++)
+               for (jj = A_i[i]; jj < A_i[i + 1]; jj++)
                {
                   j = A_j[jj];
-                  y_data[ j*idxstride_y + jv*vecstride_y ] +=
-                     A_data[jj] * x_data[ i*idxstride_x + jv*vecstride_x];
+                  y_data[ j * idxstride_y + jv * vecstride_y ] +=
+                     A_data[jj] * x_data[ i * idxstride_x + jv * vecstride_x];
                }
             }
          }
@@ -922,9 +1093,9 @@ hypre_CSRMatrixMatvecTHost( HYPRE_Complex    alpha,
    {
       for (i = 0; i < num_rows; i++)
       {
-         if ( num_vectors==1 )
+         if ( num_vectors == 1 )
          {
-            for (jj = A_i[i]; jj < A_i[i+1]; jj++)
+            for (jj = A_i[i]; jj < A_i[i + 1]; jj++)
             {
                j = A_j[jj];
                y_data[j] += A_data[jj] * x_data[i];
@@ -932,13 +1103,13 @@ hypre_CSRMatrixMatvecTHost( HYPRE_Complex    alpha,
          }
          else
          {
-            for ( jv=0; jv<num_vectors; ++jv )
+            for ( jv = 0; jv < num_vectors; ++jv )
             {
-               for (jj = A_i[i]; jj < A_i[i+1]; jj++)
+               for (jj = A_i[i]; jj < A_i[i + 1]; jj++)
                {
                   j = A_j[jj];
-                  y_data[ j*idxstride_y + jv*vecstride_y ] +=
-                     A_data[jj] * x_data[ i*idxstride_x + jv*vecstride_x ];
+                  y_data[ j * idxstride_y + jv * vecstride_y ] +=
+                     A_data[jj] * x_data[ i * idxstride_x + jv * vecstride_x ];
                }
             }
          }
@@ -951,9 +1122,9 @@ hypre_CSRMatrixMatvecTHost( HYPRE_Complex    alpha,
    if (alpha != 1.0)
    {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-      for (i = 0; i < num_cols*num_vectors; i++)
+      for (i = 0; i < num_cols * num_vectors; i++)
       {
          y_data[i] *= alpha;
       }
@@ -980,10 +1151,8 @@ hypre_CSRMatrixMatvecT( HYPRE_Complex    alpha,
 
    HYPRE_Int ierr = 0;
 
-#if defined(HYPRE_USING_GPU)
-   //HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_ParCSRMatrixMemoryLocation(A) );
-   //RL: TODO back to hypre_GetExecPolicy1 later
-   HYPRE_ExecutionPolicy exec = HYPRE_EXEC_DEVICE;
+#if defined(HYPRE_USING_GPU) || defined(HYPRE_USING_DEVICE_OPENMP)
+   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1( hypre_CSRMatrixMemoryLocation(A) );
    if (exec == HYPRE_EXEC_DEVICE)
    {
       ierr = hypre_CSRMatrixMatvecDevice(1, alpha, A, x, beta, y, y, 0 );
@@ -1043,13 +1212,19 @@ hypre_CSRMatrixMatvec_FF( HYPRE_Complex    alpha,
     *--------------------------------------------------------------------*/
 
    if (num_cols != x_size)
+   {
       ierr = 1;
+   }
 
    if (num_rows != y_size)
+   {
       ierr = 2;
+   }
 
    if (num_cols != x_size && num_rows != y_size)
+   {
       ierr = 3;
+   }
 
    /*-----------------------------------------------------------------------
     * Do (alpha == 0.0) computation - RDF: USE MACHINE EPS
@@ -1058,10 +1233,10 @@ hypre_CSRMatrixMatvec_FF( HYPRE_Complex    alpha,
    if (alpha == 0.0)
    {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
       for (i = 0; i < num_rows; i++)
-         if (CF_marker_x[i] == fpt) y_data[i] *= beta;
+         if (CF_marker_x[i] == fpt) { y_data[i] *= beta; }
 
       return ierr;
    }
@@ -1077,18 +1252,18 @@ hypre_CSRMatrixMatvec_FF( HYPRE_Complex    alpha,
       if (temp == 0.0)
       {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+         #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
          for (i = 0; i < num_rows; i++)
-            if (CF_marker_x[i] == fpt) y_data[i] = 0.0;
+            if (CF_marker_x[i] == fpt) { y_data[i] = 0.0; }
       }
       else
       {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+         #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
          for (i = 0; i < num_rows; i++)
-            if (CF_marker_x[i] == fpt) y_data[i] *= temp;
+            if (CF_marker_x[i] == fpt) { y_data[i] *= temp; }
       }
    }
 
@@ -1097,7 +1272,7 @@ hypre_CSRMatrixMatvec_FF( HYPRE_Complex    alpha,
     *-----------------------------------------------------------------*/
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i,jj) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i,jj) HYPRE_SMP_SCHEDULE
 #endif
 
    for (i = 0; i < num_rows; i++)
@@ -1105,8 +1280,8 @@ hypre_CSRMatrixMatvec_FF( HYPRE_Complex    alpha,
       if (CF_marker_x[i] == fpt)
       {
          temp = y_data[i];
-         for (jj = A_i[i]; jj < A_i[i+1]; jj++)
-            if (CF_marker_y[A_j[jj]] == fpt) temp += A_data[jj] * x_data[A_j[jj]];
+         for (jj = A_i[i]; jj < A_i[i + 1]; jj++)
+            if (CF_marker_y[A_j[jj]] == fpt) { temp += A_data[jj] * x_data[A_j[jj]]; }
          y_data[i] = temp;
       }
    }
@@ -1118,10 +1293,10 @@ hypre_CSRMatrixMatvec_FF( HYPRE_Complex    alpha,
    if (alpha != 1.0)
    {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
       for (i = 0; i < num_rows; i++)
-         if (CF_marker_x[i] == fpt) y_data[i] *= alpha;
+         if (CF_marker_x[i] == fpt) { y_data[i] *= alpha; }
    }
 
    return ierr;
diff --git a/external/hypre/src/seq_mv/csr_matvec_device.c b/external/hypre/src/seq_mv/csr_matvec_device.c
index ab2c259f..0d523504 100644
--- a/external/hypre/src/seq_mv/csr_matvec_device.c
+++ b/external/hypre/src/seq_mv/csr_matvec_device.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -15,7 +15,20 @@
 #include "_hypre_utilities.hpp"
 #include "seq_mv.hpp"
 
-#if defined(HYPRE_USING_GPU)
+#if defined(HYPRE_USING_GPU) || defined(HYPRE_USING_DEVICE_OPENMP)
+
+#if CUSPARSE_VERSION >= CUSPARSE_NEWSPMM_VERSION
+#define HYPRE_CUSPARSE_SPMV_ALG CUSPARSE_SPMV_CSR_ALG2
+#define HYPRE_CUSPARSE_SPMM_ALG CUSPARSE_SPMM_CSR_ALG3
+
+#elif CUSPARSE_VERSION >= CUSPARSE_NEWAPI_VERSION
+#define HYPRE_CUSPARSE_SPMV_ALG CUSPARSE_CSRMV_ALG2
+#define HYPRE_CUSPARSE_SPMM_ALG CUSPARSE_SPMM_CSR_ALG1
+
+#else
+#define HYPRE_CUSPARSE_SPMV_ALG CUSPARSE_CSRMV_ALG2
+#define HYPRE_CUSPARSE_SPMM_ALG CUSPARSE_CSRMM_ALG1
+#endif
 
 /* y = alpha * A * x + beta * y
  * This function is supposed to be only used inside the other functions in this file
@@ -29,30 +42,64 @@ hypre_CSRMatrixMatvecDevice2( HYPRE_Int        trans,
                               hypre_Vector    *y,
                               HYPRE_Int        offset )
 {
+   /* Sanity check */
    if (hypre_VectorData(x) == hypre_VectorData(y))
    {
-      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "ERROR::x and y are the same pointer in hypre_CSRMatrixMatvecDevice2");
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                        "ERROR::x and y are the same pointer in hypre_CSRMatrixMatvecDevice2");
    }
 
-#ifdef HYPRE_USING_CUSPARSE
-#if CUSPARSE_VERSION >= CUSPARSE_NEWAPI_VERSION
-   /* Luke E: The generic API is techinically supported on 10.1,10.2 as a preview,
-    * with Dscrmv being deprecated. However, there are limitations.
-    * While in Cuda < 11, there are specific mentions of using csr2csc involving
-    * transposed matrix products with dcsrm*,
-    * they are not present in SpMV interface.
-    */
-   hypre_CSRMatrixMatvecCusparseNewAPI(trans, alpha, A, x, beta, y, offset);
+#if defined(HYPRE_USING_CUSPARSE)  || \
+    defined(HYPRE_USING_ROCSPARSE) || \
+    defined(HYPRE_USING_ONEMKLSPARSE)
+
+   /* Input variables */
+   HYPRE_Int  num_vectors_x      = hypre_VectorNumVectors(x);
+   HYPRE_Int  num_vectors_y      = hypre_VectorNumVectors(y);
+
+   /* Local variables */
+   HYPRE_Int  use_vendor = hypre_HandleSpMVUseVendor(hypre_handle());
+
+#if defined(HYPRE_USING_CUSPARSE) && CUSPARSE_VERSION >= CUSPARSE_NEWAPI_VERSION
+   HYPRE_Int  multivec_storage_x = hypre_VectorMultiVecStorageMethod(x);
+   HYPRE_Int  multivec_storage_y = hypre_VectorMultiVecStorageMethod(y);
+
+   /* Force use of hypre's SpMV for row-wise multivectors */
+   if ((num_vectors_x > 1 && multivec_storage_x == 1) ||
+       (num_vectors_y > 1 && multivec_storage_y == 1))
+   {
+      use_vendor = 0;
+   }
 #else
-   hypre_CSRMatrixMatvecCusparseOldAPI(trans, alpha, A, x, beta, y, offset);
+   /* TODO - enable cuda 10, rocsparse, and onemkle sparse support for multi-vectors */
+   if (num_vectors_x > 1 || num_vectors_y > 1)
+   {
+      use_vendor = 0;
+   }
 #endif
-#elif defined(HYPRE_USING_DEVICE_OPENMP)
-   hypre_CSRMatrixMatvecOMPOffload(trans, alpha, A, x, beta, y, offset);
+
+   if (use_vendor)
+   {
+#if defined(HYPRE_USING_CUSPARSE)
+      hypre_CSRMatrixMatvecCusparse(trans, alpha, A, x, beta, y, offset);
+
 #elif defined(HYPRE_USING_ROCSPARSE)
-   hypre_CSRMatrixMatvecRocsparse(trans, alpha, A, x, beta, y, offset);
-#else // #ifdef HYPRE_USING_CUSPARSE
-#error HYPRE SPMV TODO
+      hypre_CSRMatrixMatvecRocsparse(trans, alpha, A, x, beta, y, offset);
+
+#elif defined(HYPRE_USING_ONEMKLSPARSE)
+      hypre_CSRMatrixMatvecOnemklsparse(trans, alpha, A, x, beta, y, offset);
+#endif
+   }
+   else
+#endif // defined(HYPRE_USING_CUSPARSE) || defined(HYPRE_USING_ROCSPARSE) ...
+   {
+#if defined(HYPRE_USING_GPU)
+      hypre_CSRMatrixSpMVDevice(trans, alpha, A, x, beta, y, 0);
+
+#elif defined(HYPRE_USING_DEVICE_OPENMP)
+      hypre_CSRMatrixMatvecOMPOffload(trans, alpha, A, x, beta, y, offset);
 #endif
+   }
 
    return hypre_error_flag;
 }
@@ -68,13 +115,16 @@ hypre_CSRMatrixMatvecDevice( HYPRE_Int        trans,
                              hypre_Vector    *y,
                              HYPRE_Int        offset )
 {
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-   hypre_GpuProfilingPushRange("CSRMatrixMatvec");
-#endif
+   //hypre_GpuProfilingPushRange("CSRMatrixMatvec");
+   HYPRE_Int   num_vectors = hypre_VectorNumVectors(x);
 
    // TODO: RL: do we need offset > 0 at all?
    hypre_assert(offset == 0);
 
+   // VPM: offset > 0 does not work with multivectors. Remove offset? See comment above
+   hypre_assert(!(offset != 0 && num_vectors > 1));
+   hypre_assert(num_vectors > 0);
+
    HYPRE_Int nx = trans ? hypre_CSRMatrixNumRows(A) : hypre_CSRMatrixNumCols(A);
    HYPRE_Int ny = trans ? hypre_CSRMatrixNumCols(A) : hypre_CSRMatrixNumRows(A);
 
@@ -97,7 +147,7 @@ hypre_CSRMatrixMatvecDevice( HYPRE_Int        trans,
       hypre_TMemcpy( hypre_VectorData(y) + offset,
                      hypre_VectorData(b) + offset,
                      HYPRE_Complex,
-                     ny - offset,
+                     (ny - offset) * num_vectors,
                      hypre_VectorMemoryLocation(y),
                      hypre_VectorMemoryLocation(b) );
 
@@ -112,18 +162,26 @@ hypre_CSRMatrixMatvecDevice( HYPRE_Int        trans,
       hypre_CSRMatrixMatvecDevice2(trans, alpha, A, x, beta, y, offset);
    }
 
-   hypre_SyncCudaComputeStream(hypre_handle());
-
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-   hypre_GpuProfilingPopRange();
+#if defined(HYPRE_USING_GPU)
+   hypre_SyncComputeStream();
 #endif
 
+   //hypre_GpuProfilingPopRange();
+
    return hypre_error_flag;
 }
 
 #if defined(HYPRE_USING_CUSPARSE)
 #if CUSPARSE_VERSION >= CUSPARSE_NEWAPI_VERSION
 
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixMatvecCusparseNewAPI
+ *
+ * Sparse Matrix/(Multi)Vector interface to cusparse's API 11
+ *
+ * Note: The descriptor variables are not saved to allow for generic input
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_CSRMatrixMatvecCusparseNewAPI( HYPRE_Int        trans,
                                      HYPRE_Complex    alpha,
@@ -133,67 +191,149 @@ hypre_CSRMatrixMatvecCusparseNewAPI( HYPRE_Int        trans,
                                      hypre_Vector    *y,
                                      HYPRE_Int        offset )
 {
+   /* Input variables */
+   HYPRE_Int         num_vectors = hypre_VectorNumVectors(x);
+   HYPRE_Int         num_cols    = trans ? hypre_CSRMatrixNumRows(A) : hypre_CSRMatrixNumCols(A);
+   HYPRE_Int         num_rows    = trans ? hypre_CSRMatrixNumCols(A) : hypre_CSRMatrixNumRows(A);
+   hypre_CSRMatrix  *AT;
+   hypre_CSRMatrix  *B;
+
+   /* SpMV data */
+   size_t                    bufferSize = 0;
+   char                     *dBuffer    = hypre_CSRMatrixGPUMatSpMVBuffer(A);
+   cusparseHandle_t          handle     = hypre_HandleCusparseHandle(hypre_handle());
    const cudaDataType        data_type  = hypre_HYPREComplexToCudaDataType();
    const cusparseIndexType_t index_type = hypre_HYPREIntToCusparseIndexType();
+
+   /* Local cusparse descriptor variables */
    cusparseSpMatDescr_t      matA;
-   cusparseHandle_t          handle     = hypre_HandleCusparseHandle(hypre_handle());
-   hypre_CSRMatrix          *AT;
+   cusparseDnVecDescr_t      vecX, vecY;
+   cusparseDnMatDescr_t      matX, matY;
 
+   /* We handle the transpose explicitly to ensure the same output each run
+    * and for potential performance improvement memory for AT */
    if (trans)
    {
-      /* We handle the transpose explicitly to ensure the same output each run
-       * and for potential performance improvement memory for AT */
       hypre_CSRMatrixTransposeDevice(A, &AT, 1);
-      matA = hypre_CSRMatrixToCusparseSpMat(AT, offset);
+      B = AT;
    }
    else
    {
-      matA = hypre_CSRMatrixToCusparseSpMat(A, offset);
+      B = A;
    }
 
-   /* SpMV */
-   size_t bufferSize = 0;
-   char  *dBuffer    = NULL;
-   HYPRE_Int x_size_override = trans ? hypre_CSRMatrixNumRows(A) : hypre_CSRMatrixNumCols(A);
-   HYPRE_Int y_size_override = trans ? hypre_CSRMatrixNumCols(A) : hypre_CSRMatrixNumRows(A);
-   cusparseDnVecDescr_t vecX = hypre_VectorToCusparseDnVec(x,      0, x_size_override);
-   cusparseDnVecDescr_t vecY = hypre_VectorToCusparseDnVec(y, offset, y_size_override - offset);
-
-   HYPRE_CUSPARSE_CALL( cusparseSpMV_bufferSize(handle,
-                                                CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                                &alpha,
-                                                matA,
-                                                vecX,
-                                                &beta,
-                                                vecY,
-                                                data_type,
-                                                CUSPARSE_CSRMV_ALG2,
-                                                &bufferSize) );
-
-   dBuffer = hypre_TAlloc(char, bufferSize, HYPRE_MEMORY_DEVICE);
-
-   HYPRE_CUSPARSE_CALL( cusparseSpMV(handle,
-                                     CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                     &alpha,
-                                     matA,
-                                     vecX,
-                                     &beta,
-                                     vecY,
-                                     data_type,
-                                     CUSPARSE_CSRMV_ALG2,
-                                     dBuffer) );
-
-   hypre_SyncCudaComputeStream(hypre_handle());
+   /* Create cuSPARSE vector data structures */
+   matA = hypre_CSRMatrixToCusparseSpMat(B, offset);
+   if (num_vectors == 1)
+   {
+      vecX = hypre_VectorToCusparseDnVec(x, 0, num_cols);
+      vecY = hypre_VectorToCusparseDnVec(y, offset, num_rows - offset);
+   }
+   else
+   {
+      matX = hypre_VectorToCusparseDnMat(x);
+      matY = hypre_VectorToCusparseDnMat(y);
+   }
 
+   if (!dBuffer)
+   {
+      if (num_vectors == 1)
+      {
+         HYPRE_CUSPARSE_CALL( cusparseSpMV_bufferSize(handle,
+                                                      CUSPARSE_OPERATION_NON_TRANSPOSE,
+                                                      &alpha,
+                                                      matA,
+                                                      vecX,
+                                                      &beta,
+                                                      vecY,
+                                                      data_type,
+                                                      HYPRE_CUSPARSE_SPMV_ALG,
+                                                      &bufferSize) );
+      }
+      else
+      {
+         HYPRE_CUSPARSE_CALL( cusparseSpMM_bufferSize(handle,
+                                                      CUSPARSE_OPERATION_NON_TRANSPOSE,
+                                                      CUSPARSE_OPERATION_NON_TRANSPOSE,
+                                                      &alpha,
+                                                      matA,
+                                                      matX,
+                                                      &beta,
+                                                      matY,
+                                                      data_type,
+                                                      HYPRE_CUSPARSE_SPMM_ALG,
+                                                      &bufferSize) );
+      }
+
+      dBuffer = hypre_TAlloc(char, bufferSize, HYPRE_MEMORY_DEVICE);
+      hypre_CSRMatrixGPUMatSpMVBuffer(A) = dBuffer;
+
+#if CUSPARSE_VERSION >= CUSPARSE_NEWSPMM_VERSION
+      if (num_vectors > 1)
+      {
+         HYPRE_CUSPARSE_CALL( cusparseSpMM_preprocess(handle,
+                                                      CUSPARSE_OPERATION_NON_TRANSPOSE,
+                                                      CUSPARSE_OPERATION_NON_TRANSPOSE,
+                                                      &alpha,
+                                                      matA,
+                                                      matX,
+                                                      &beta,
+                                                      matY,
+                                                      data_type,
+                                                      HYPRE_CUSPARSE_SPMM_ALG,
+                                                      dBuffer) );
+      }
+#endif
+   }
+
+   if (num_vectors == 1)
+   {
+      HYPRE_CUSPARSE_CALL( cusparseSpMV(handle,
+                                        CUSPARSE_OPERATION_NON_TRANSPOSE,
+                                        &alpha,
+                                        matA,
+                                        vecX,
+                                        &beta,
+                                        vecY,
+                                        data_type,
+                                        HYPRE_CUSPARSE_SPMV_ALG,
+                                        dBuffer) );
+   }
+   else
+   {
+      HYPRE_CUSPARSE_CALL( cusparseSpMM(handle,
+                                        CUSPARSE_OPERATION_NON_TRANSPOSE,
+                                        CUSPARSE_OPERATION_NON_TRANSPOSE,
+                                        &alpha,
+                                        matA,
+                                        matX,
+                                        &beta,
+                                        matY,
+                                        data_type,
+                                        HYPRE_CUSPARSE_SPMM_ALG,
+                                        dBuffer) );
+   }
+
+#if defined(HYPRE_USING_GPU)
+   hypre_SyncComputeStream();
+#endif
+
+   /* Free memory */
+   HYPRE_CUSPARSE_CALL( cusparseDestroySpMat(matA) );
+   if (num_vectors == 1)
+   {
+      HYPRE_CUSPARSE_CALL( cusparseDestroyDnVec(vecX) );
+      HYPRE_CUSPARSE_CALL( cusparseDestroyDnVec(vecY) );
+   }
+   else
+   {
+      HYPRE_CUSPARSE_CALL( cusparseDestroyDnMat(matX) );
+      HYPRE_CUSPARSE_CALL( cusparseDestroyDnMat(matY) );
+   }
    if (trans)
    {
       hypre_CSRMatrixDestroy(AT);
    }
-   hypre_TFree(dBuffer, HYPRE_MEMORY_DEVICE);
-   /* This function releases the host memory allocated for the sparse matrix descriptor */
-   HYPRE_CUSPARSE_CALL(cusparseDestroySpMat(matA));
-   HYPRE_CUSPARSE_CALL(cusparseDestroyDnVec(vecX));
-   HYPRE_CUSPARSE_CALL(cusparseDestroyDnVec(vecY));
 
    return hypre_error_flag;
 }
@@ -225,20 +365,19 @@ hypre_CSRMatrixMatvecCusparseOldAPI( HYPRE_Int        trans,
       B = A;
    }
 
-   HYPRE_CUSPARSE_CALL( cusparseDcsrmv(handle,
-                                       CUSPARSE_OPERATION_NON_TRANSPOSE,
-                                       hypre_CSRMatrixNumRows(B) - offset,
-                                       hypre_CSRMatrixNumCols(B),
-                                       hypre_CSRMatrixNumNonzeros(B),
-                                       &alpha,
-                                       descr,
-                                       hypre_CSRMatrixData(B),
-                                       hypre_CSRMatrixI(B) + offset,
-                                       hypre_CSRMatrixJ(B),
-                                       hypre_VectorData(x),
-                                       &beta,
-                                       hypre_VectorData(y) + offset) );
-
+   HYPRE_CUSPARSE_CALL( hypre_cusparse_csrmv(handle,
+                                             CUSPARSE_OPERATION_NON_TRANSPOSE,
+                                             hypre_CSRMatrixNumRows(B) - offset,
+                                             hypre_CSRMatrixNumCols(B),
+                                             hypre_CSRMatrixNumNonzeros(B),
+                                             &alpha,
+                                             descr,
+                                             hypre_CSRMatrixData(B),
+                                             hypre_CSRMatrixI(B) + offset,
+                                             hypre_CSRMatrixJ(B),
+                                             hypre_VectorData(x),
+                                             &beta,
+                                             hypre_VectorData(y) + offset) );
 
    if (trans)
    {
@@ -249,6 +388,32 @@ hypre_CSRMatrixMatvecCusparseOldAPI( HYPRE_Int        trans,
 }
 
 #endif // #if CUSPARSE_VERSION >= CUSPARSE_NEWAPI_VERSION
+
+HYPRE_Int
+hypre_CSRMatrixMatvecCusparse( HYPRE_Int        trans,
+                               HYPRE_Complex    alpha,
+                               hypre_CSRMatrix *A,
+                               hypre_Vector    *x,
+                               HYPRE_Complex    beta,
+                               hypre_Vector    *y,
+                               HYPRE_Int        offset )
+{
+#if CUSPARSE_VERSION >= CUSPARSE_NEWAPI_VERSION
+   /* Luke E: The generic API is techinically supported on 10.1,10.2 as a preview,
+    * with Dscrmv being deprecated. However, there are limitations.
+    * While in Cuda < 11, there are specific mentions of using csr2csc involving
+    * transposed matrix products with dcsrm*,
+    * they are not present in SpMV interface.
+    */
+   hypre_CSRMatrixMatvecCusparseNewAPI(trans, alpha, A, x, beta, y, offset);
+
+#else
+   hypre_CSRMatrixMatvecCusparseOldAPI(trans, alpha, A, x, beta, y, offset);
+#endif
+
+   return hypre_error_flag;
+}
+
 #endif // #if defined(HYPRE_USING_CUSPARSE)
 
 #if defined(HYPRE_USING_ROCSPARSE)
@@ -276,20 +441,20 @@ hypre_CSRMatrixMatvecRocsparse( HYPRE_Int        trans,
       B = A;
    }
 
-   HYPRE_ROCSPARSE_CALL( rocsparse_dcsrmv(handle,
-                                          rocsparse_operation_none,
-                                          hypre_CSRMatrixNumRows(B) - offset,
-                                          hypre_CSRMatrixNumCols(B),
-                                          hypre_CSRMatrixNumNonzeros(B),
-                                          &alpha,
-                                          descr,
-                                          hypre_CSRMatrixData(B),
-                                          hypre_CSRMatrixI(B) + offset,
-                                          hypre_CSRMatrixJ(B),
-                                          info,
-                                          hypre_VectorData(x),
-                                          &beta,
-                                          hypre_VectorData(y) + offset) );
+   HYPRE_ROCSPARSE_CALL( hypre_rocsparse_csrmv(handle,
+                                               rocsparse_operation_none,
+                                               hypre_CSRMatrixNumRows(B) - offset,
+                                               hypre_CSRMatrixNumCols(B),
+                                               hypre_CSRMatrixNumNonzeros(B),
+                                               &alpha,
+                                               descr,
+                                               hypre_CSRMatrixData(B),
+                                               hypre_CSRMatrixI(B) + offset,
+                                               hypre_CSRMatrixJ(B),
+                                               info,
+                                               hypre_VectorData(x),
+                                               &beta,
+                                               hypre_VectorData(y) + offset) );
 
    if (trans)
    {
@@ -300,5 +465,43 @@ hypre_CSRMatrixMatvecRocsparse( HYPRE_Int        trans,
 }
 #endif // #if defined(HYPRE_USING_ROCSPARSE)
 
-#endif // #if defined(HYPRE_USING_GPU)
+#if defined(HYPRE_USING_ONEMKLSPARSE)
+HYPRE_Int
+hypre_CSRMatrixMatvecOnemklsparse( HYPRE_Int        trans,
+                                   HYPRE_Complex    alpha,
+                                   hypre_CSRMatrix *A,
+                                   hypre_Vector    *x,
+                                   HYPRE_Complex    beta,
+                                   hypre_Vector    *y,
+                                   HYPRE_Int        offset )
+{
+   sycl::queue *compute_queue = hypre_HandleComputeStream(hypre_handle());
+   hypre_CSRMatrix *AT;
+   oneapi::mkl::sparse::matrix_handle_t matA_handle = hypre_CSRMatrixGPUMatHandle(A);
+   hypre_GPUMatDataSetCSRData(A);
+
+   if (trans)
+   {
+      hypre_CSRMatrixTransposeDevice(A, &AT, 1);
+      hypre_GPUMatDataSetCSRData(AT);
+      matA_handle = hypre_CSRMatrixGPUMatHandle(AT);
+   }
+
+   HYPRE_ONEMKL_CALL( oneapi::mkl::sparse::gemv(*compute_queue,
+                                                oneapi::mkl::transpose::nontrans,
+                                                alpha,
+                                                matA_handle,
+                                                hypre_VectorData(x),
+                                                beta,
+                                                hypre_VectorData(y) + offset).wait() );
+
+   if (trans)
+   {
+      hypre_CSRMatrixDestroy(AT);
+   }
+
+   return hypre_error_flag;
+}
+#endif // #if defined(HYPRE_USING_ROCSPARSE)
 
+#endif // #if defined(HYPRE_USING_GPU) || defined(HYPRE_USING_DEVICE_OPENMP)
diff --git a/external/hypre/src/seq_mv/csr_matvec_oomp.c b/external/hypre/src/seq_mv/csr_matvec_oomp.c
index 46d6770f..75aec4d2 100644
--- a/external/hypre/src/seq_mv/csr_matvec_oomp.c
+++ b/external/hypre/src/seq_mv/csr_matvec_oomp.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -34,9 +34,9 @@ hypre_CSRMatrixMatvecOMPOffload( HYPRE_Int        trans,
 
    if (trans)
    {
-      hypre_CSRMatrixTransposeDevice(A, &B, 1);
+      hypre_CSRMatrixTranspose(A, &B, 1);
 
-      HYPRE_CUDA_CALL(cudaDeviceSynchronize());
+      /* HYPRE_CUDA_CALL(cudaDeviceSynchronize()); */
    }
    else
    {
@@ -51,16 +51,16 @@ hypre_CSRMatrixMatvecOMPOffload( HYPRE_Int        trans,
    HYPRE_Complex *y_data   = hypre_VectorData(y);
    HYPRE_Int      i;
 
-#pragma omp target teams distribute parallel for private(i) is_device_ptr(A_data, A_i, A_j, y_data, x_data)
+   #pragma omp target teams distribute parallel for private(i) is_device_ptr(A_data, A_i, A_j, y_data, x_data)
    for (i = offset; i < A_nrows; i++)
    {
       HYPRE_Complex tempx = 0.0;
       HYPRE_Int j;
-      for (j = A_i[i]; j < A_i[i+1]; j++)
+      for (j = A_i[i]; j < A_i[i + 1]; j++)
       {
          tempx += A_data[j] * x_data[A_j[j]];
       }
-      y_data[i] = alpha*tempx + beta*y_data[i];
+      y_data[i] = alpha * tempx + beta * y_data[i];
    }
 
    /* HYPRE_CUDA_CALL(cudaDeviceSynchronize()); */
diff --git a/external/hypre/src/seq_mv/csr_spadd_device.c b/external/hypre/src/seq_mv/csr_spadd_device.c
index 79b9d2bb..e080a14b 100644
--- a/external/hypre/src/seq_mv/csr_spadd_device.c
+++ b/external/hypre/src/seq_mv/csr_spadd_device.c
@@ -1,20 +1,21 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
  ******************************************************************************/
 
+#include "_hypre_onedpl.hpp"
 #include "seq_mv.h"
 #include "_hypre_utilities.hpp"
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
 
 /* This function effectively does (in Matlab notation)
  *              C := alpha * A(:, a_colmap)
  *              C(num_b, :) += beta * B(:, b_colmap)
  *
- * if num_b != NULL: A is ma x n and B is mb x n. len(num_b) == mb. 
+ * if num_b != NULL: A is ma x n and B is mb x n. len(num_b) == mb.
  *                   All numbers in num_b must be in [0,...,ma-1]
  *
  * if num_b == NULL: C = alpha * A + beta * B. ma == mb
@@ -24,7 +25,6 @@
 HYPRE_Int
 hypreDevice_CSRSpAdd( HYPRE_Int       ma, /* num of rows of A */
                       HYPRE_Int       mb, /* num of rows of B */
-                      HYPRE_Int       n,  /* not used actually */
                       HYPRE_Int       nnzA,
                       HYPRE_Int       nnzB,
                       HYPRE_Int      *d_ia,
@@ -66,7 +66,8 @@ hypreDevice_CSRSpAdd( HYPRE_Int       ma, /* num of rows of A */
    /* some trick here for memory alignment. maybe not worth it at all */
    HYPRE_Int align = 32;
    HYPRE_Int nnzT2 = (nnzT + align - 1) / align * align;
-   char *work_mem = hypre_TAlloc(char, (4*sizeof(HYPRE_Int)+2*sizeof(HYPRE_Complex))*nnzT2, HYPRE_MEMORY_DEVICE);
+   char *work_mem = hypre_TAlloc(char, (4 * sizeof(HYPRE_Int) + 2 * sizeof(HYPRE_Complex)) * nnzT2,
+                                 HYPRE_MEMORY_DEVICE);
    char *work_mem_saved = work_mem;
 
    //d_it = hypre_TAlloc(HYPRE_Int, nnzT, HYPRE_MEMORY_DEVICE);
@@ -82,7 +83,11 @@ hypreDevice_CSRSpAdd( HYPRE_Int       ma, /* num of rows of A */
    /* expansion: j */
    if (d_ja_map)
    {
+#if defined(HYPRE_USING_SYCL)
+      hypreSycl_gather(d_ja, d_ja + nnzA, d_ja_map, d_jt);
+#else
       HYPRE_THRUST_CALL(gather, d_ja, d_ja + nnzA, d_ja_map, d_jt);
+#endif
    }
    else
    {
@@ -90,7 +95,11 @@ hypreDevice_CSRSpAdd( HYPRE_Int       ma, /* num of rows of A */
    }
    if (d_jb_map)
    {
+#if defined(HYPRE_USING_SYCL)
+      hypreSycl_gather(d_jb, d_jb + nnzB, d_jb_map, d_jt + nnzA);
+#else
       HYPRE_THRUST_CALL(gather, d_jb, d_jb + nnzB, d_jb_map, d_jt + nnzA);
+#endif
    }
    else
    {
@@ -104,7 +113,7 @@ hypreDevice_CSRSpAdd( HYPRE_Int       ma, /* num of rows of A */
    }
    else
    {
-      HYPRE_THRUST_CALL( transform, d_aa, d_aa + nnzA, d_at, alpha * _1 );
+      hypreDevice_ComplexScalen( d_aa, nnzA, d_at, alpha );
    }
 
    if (beta == 1.0)
@@ -113,7 +122,7 @@ hypreDevice_CSRSpAdd( HYPRE_Int       ma, /* num of rows of A */
    }
    else
    {
-      HYPRE_THRUST_CALL( transform, d_ab, d_ab + nnzB, d_at + nnzA, beta * _1 );
+      hypreDevice_ComplexScalen( d_ab, nnzB, d_at + nnzA, beta );
    }
 
    /* expansion: i */
@@ -139,7 +148,8 @@ hypreDevice_CSRSpAdd( HYPRE_Int       ma, /* num of rows of A */
    d_at_cp = (HYPRE_Complex *) work_mem;
    work_mem += sizeof(HYPRE_Complex) * nnzT2;
 
-   hypre_assert( (size_t) (work_mem - work_mem_saved) == (4*sizeof(HYPRE_Int)+2*sizeof(HYPRE_Complex))*((size_t)nnzT2) );
+   hypre_assert( (size_t) (work_mem - work_mem_saved) == (4 * sizeof(HYPRE_Int) + 2 * sizeof(
+                                                             HYPRE_Complex)) * ((size_t)nnzT2) );
 
    /* sort: lexicographical order (row, col): hypreDevice_StableSortByTupleKey */
    hypreDevice_StableSortByTupleKey(nnzT, d_it, d_jt, d_at, 0);
@@ -180,11 +190,10 @@ hypreDevice_CSRSpAdd( HYPRE_Int       ma, /* num of rows of A */
    *d_ac_out = d_ac;
 
 #ifdef HYPRE_PROFILE
-   cudaThreadSynchronize();
    hypre_profile_times[HYPRE_TIMER_ID_SPADD] += hypre_MPI_Wtime();
 #endif
 
    return hypre_error_flag;
 }
 
-#endif // defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#endif // defined(HYPRE_USING_GPU)
diff --git a/external/hypre/src/seq_mv/csr_spgemm_device.c b/external/hypre/src/seq_mv/csr_spgemm_device.c
index a64da36e..877be714 100644
--- a/external/hypre/src/seq_mv/csr_spgemm_device.c
+++ b/external/hypre/src/seq_mv/csr_spgemm_device.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -9,9 +9,7 @@
 #include "csr_spgemm_device.h"
 #include "seq_mv.hpp"
 
-//#define HYPRE_SPGEMM_TIMING
-
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
 
 HYPRE_Int
 hypreDevice_CSRSpGemm(hypre_CSRMatrix  *A,
@@ -34,10 +32,6 @@ hypreDevice_CSRSpGemm(hypre_CSRMatrix  *A,
    HYPRE_Int        *d_jc;
    HYPRE_Int         nnzC;
    hypre_CSRMatrix  *C;
-#ifdef HYPRE_SPGEMM_TIMING
-   HYPRE_Real        t1, t2;
-   HYPRE_Real        ta, tb;
-#endif
 
    *C_ptr = C = hypre_CSRMatrixCreate(m, n, 0);
    hypre_CSRMatrixMemoryLocation(C) = HYPRE_MEMORY_DEVICE;
@@ -51,15 +45,16 @@ hypreDevice_CSRSpGemm(hypre_CSRMatrix  *A,
    }
 
 #ifdef HYPRE_PROFILE
-   hypre_profile_times[HYPRE_TIMER_ID_SPMM] -= hypre_MPI_Wtime();
+   hypre_profile_times[HYPRE_TIMER_ID_SPGEMM] -= hypre_MPI_Wtime();
 #endif
 
 #ifdef HYPRE_SPGEMM_TIMING
-   ta = hypre_MPI_Wtime();
+   hypre_ForceSyncComputeStream();
+   HYPRE_Real ta = hypre_MPI_Wtime();
 #endif
 
    /* use CUSPARSE or rocSPARSE*/
-   if (hypre_HandleSpgemmUseCusparse(hypre_handle()))
+   if (hypre_HandleSpgemmUseVendor(hypre_handle()))
    {
 #if defined(HYPRE_USING_CUSPARSE)
       hypreDevice_CSRSpGemmCusparse(m, k, n,
@@ -71,112 +66,59 @@ hypreDevice_CSRSpGemm(hypre_CSRMatrix  *A,
                                      hypre_CSRMatrixGPUMatDescr(A), nnza, d_ia, d_ja, d_a,
                                      hypre_CSRMatrixGPUMatDescr(B), nnzb, d_ib, d_jb, d_b,
                                      hypre_CSRMatrixGPUMatDescr(C), hypre_CSRMatrixGPUMatInfo(C), &nnzC, &d_ic, &d_jc, &d_c);
+#elif defined(HYPRE_USING_ONEMKLSPARSE)
+      hypreDevice_CSRSpGemmOnemklsparse( m, k, n,
+                                         hypre_CSRMatrixGPUMatHandle(A), nnza, d_ia, d_ja, d_a,
+                                         hypre_CSRMatrixGPUMatHandle(B), nnzb, d_ib, d_jb, d_b,
+                                         hypre_CSRMatrixGPUMatHandle(C), &nnzC, &d_ic, &d_jc, &d_c);
 #else
-      hypre_error_w_msg(HYPRE_ERROR_GENERIC,"Attempting to use device sparse matrix library for SpGEMM without having compiled support for it!\n");
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                        "Attempting to use device sparse matrix library for SpGEMM without having compiled support for it!\n");
 #endif
    }
    else
    {
-      HYPRE_Int *d_rc = NULL;
-
-      if (hypre_HandleSpgemmAlgorithm(hypre_handle()) == 1)
-      {
-         d_rc = hypre_TAlloc(HYPRE_Int, 2*m, HYPRE_MEMORY_DEVICE);
+      d_a  = hypre_CSRMatrixPatternOnly(A) ? NULL : d_a;
+      d_b  = hypre_CSRMatrixPatternOnly(B) ? NULL : d_b;
 
-#ifdef HYPRE_SPGEMM_TIMING
-         t1 = hypre_MPI_Wtime();
-#endif
-         hypreDevice_CSRSpGemmRownnz(m, k, n, d_ia, d_ja, d_ib, d_jb, 0 /* without input rc */, d_rc);
-#ifdef HYPRE_SPGEMM_TIMING
-         hypre_SyncCudaComputeStream(hypre_handle());
-         t2 = hypre_MPI_Wtime() - t1;
-         hypre_printf("Rownnz time %f\n", t2);
-#endif
+      HYPRE_Int *d_rc = hypre_TAlloc(HYPRE_Int, m, HYPRE_MEMORY_DEVICE);
+      const HYPRE_Int alg = hypre_HandleSpgemmAlgorithm(hypre_handle());
 
-#ifdef HYPRE_SPGEMM_TIMING
-         t1 = hypre_MPI_Wtime();
-#endif
-         hypreDevice_CSRSpGemmNumerWithRownnzUpperbound(m, k, n, d_ia, d_ja, d_a, d_ib, d_jb, d_b, d_rc, 1 /* exact row nnz */,
-                                                        &d_ic, &d_jc, &d_c, &nnzC);
-#ifdef HYPRE_SPGEMM_TIMING
-         hypre_SyncCudaComputeStream(hypre_handle());
-         t2 = hypre_MPI_Wtime() - t1;
-         hypre_printf("SpGemmNumerical time %f\n", t2);
-#endif
-      }
-      else if (hypre_HandleSpgemmAlgorithm(hypre_handle()) == 2)
+      if (hypre_HandleSpgemmNumBin(hypre_handle()) == 0)
       {
-         d_rc = hypre_TAlloc(HYPRE_Int, 2*m, HYPRE_MEMORY_DEVICE);
+         hypreDevice_CSRSpGemmBinnedGetBlockNumDim();
+      }
 
-#ifdef HYPRE_SPGEMM_TIMING
-         t1 = hypre_MPI_Wtime();
-#endif
-         hypreDevice_CSRSpGemmRownnzEstimate(m, k, n, d_ia, d_ja, d_ib, d_jb, d_rc);
-#ifdef HYPRE_SPGEMM_TIMING
-         hypre_SyncCudaComputeStream(hypre_handle());
-         t2 = hypre_MPI_Wtime() - t1;
-         hypre_printf("RownnzEst time %f\n", t2);
-#endif
+      if (alg == 1)
+      {
+         hypreDevice_CSRSpGemmRownnz
+         (m, k, n, nnza, d_ia, d_ja, d_ib, d_jb, 0 /* without input rc */, d_rc);
 
-#ifdef HYPRE_SPGEMM_TIMING
-         t1 = hypre_MPI_Wtime();
-#endif
-         hypreDevice_CSRSpGemmNumerWithRownnzEstimate(m, k, n, d_ia, d_ja, d_a, d_ib, d_jb, d_b, d_rc,
-                                                      &d_ic, &d_jc, &d_c, &nnzC);
-#ifdef HYPRE_SPGEMM_TIMING
-         hypre_SyncCudaComputeStream(hypre_handle());
-         t2 = hypre_MPI_Wtime() - t1;
-         hypre_printf("SpGemmNumerical time %f\n", t2);
-#endif
+         hypreDevice_CSRSpGemmNumerWithRownnzUpperbound
+         (m, k, n, d_ia, d_ja, d_a, d_ib, d_jb, d_b, d_rc, 1, &d_ic, &d_jc, &d_c, &nnzC);
       }
-      else
+      else /* if (alg == 3) */
       {
-         d_rc = hypre_TAlloc(HYPRE_Int, 2*m, HYPRE_MEMORY_DEVICE);
+         const HYPRE_Int row_est_mtd = hypre_HandleSpgemmRownnzEstimateMethod(hypre_handle());
 
-#ifdef HYPRE_SPGEMM_TIMING
-         t1 = hypre_MPI_Wtime();
-#endif
-         hypreDevice_CSRSpGemmRownnzEstimate(m, k, n, d_ia, d_ja, d_ib, d_jb, d_rc);
-#ifdef HYPRE_SPGEMM_TIMING
-         hypre_SyncCudaComputeStream(hypre_handle());
-         t2 = hypre_MPI_Wtime() - t1;
-         hypre_printf("RownnzEst time %f\n", t2);
-#endif
+         hypreDevice_CSRSpGemmRownnzEstimate(m, k, n, d_ia, d_ja, d_ib, d_jb, d_rc, row_est_mtd);
 
-#ifdef HYPRE_SPGEMM_TIMING
-         t1 = hypre_MPI_Wtime();
-#endif
-         hypreDevice_CSRSpGemmRownnzUpperbound(m, k, n, d_ia, d_ja, d_ib, d_jb, 1 /* with input rc */, d_rc, d_rc + m);
+         HYPRE_Int rownnz_exact;
 
-         /* row nnz is exact if no row failed */
-         HYPRE_Int rownnz_exact = !HYPRE_THRUST_CALL( any_of,
-                                                      d_rc + m,
-                                                      d_rc + 2*m,
-                                                      thrust::identity<HYPRE_Int>() );
-#ifdef HYPRE_SPGEMM_TIMING
-         hypre_SyncCudaComputeStream(hypre_handle());
-         t2 = hypre_MPI_Wtime() - t1;
-         hypre_printf("RownnzBound time %f\n", t2);
-#endif
+         hypreDevice_CSRSpGemmRownnzUpperbound
+         (m, k, n, d_ia, d_ja, d_ib, d_jb, 1 /* with input rc */, d_rc, &rownnz_exact);
 
-#ifdef HYPRE_SPGEMM_TIMING
-         t1 = hypre_MPI_Wtime();
-#endif
-         hypreDevice_CSRSpGemmNumerWithRownnzUpperbound(m, k, n, d_ia, d_ja, d_a, d_ib, d_jb, d_b, d_rc, rownnz_exact,
-                                                        &d_ic, &d_jc, &d_c, &nnzC);
-#ifdef HYPRE_SPGEMM_TIMING
-         hypre_SyncCudaComputeStream(hypre_handle());
-         t2 = hypre_MPI_Wtime() - t1;
-         hypre_printf("SpGemmNumerical time %f\n", t2);
-#endif
+         hypreDevice_CSRSpGemmNumerWithRownnzUpperbound
+         (m, k, n, d_ia, d_ja, d_a, d_ib, d_jb, d_b, d_rc, rownnz_exact, &d_ic, &d_jc, &d_c, &nnzC);
       }
 
       hypre_TFree(d_rc, HYPRE_MEMORY_DEVICE);
    }
 
 #ifdef HYPRE_SPGEMM_TIMING
-   tb = hypre_MPI_Wtime() - ta;
-   hypre_printf("SpGemm time %f\n", tb);
+   hypre_ForceSyncComputeStream();
+   HYPRE_Real tb = hypre_MPI_Wtime() - ta;
+   HYPRE_SPGEMM_PRINT("SpGemm time %f\n", tb);
 #endif
 
    hypre_CSRMatrixNumNonzeros(C) = nnzC;
@@ -185,12 +127,11 @@ hypreDevice_CSRSpGemm(hypre_CSRMatrix  *A,
    hypre_CSRMatrixData(C)        = d_c;
 
 #ifdef HYPRE_PROFILE
-   cudaThreadSynchronize();
-   hypre_profile_times[HYPRE_TIMER_ID_SPMM] += hypre_MPI_Wtime();
+   hypre_profile_times[HYPRE_TIMER_ID_SPGEMM] += hypre_MPI_Wtime();
 #endif
 
    return hypre_error_flag;
 }
 
-#endif /* HYPRE_USING_CUDA  || defined(HYPRE_USING_HIP) */
+#endif /* defined(HYPRE_USING_GPU) */
 
diff --git a/external/hypre/src/seq_mv/csr_spgemm_device.h b/external/hypre/src/seq_mv/csr_spgemm_device.h
index aedfa20b..97312fd3 100644
--- a/external/hypre/src/seq_mv/csr_spgemm_device.h
+++ b/external/hypre/src/seq_mv/csr_spgemm_device.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -10,41 +10,289 @@
 
 #include "_hypre_utilities.hpp"
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
 
 #define COHEN_USE_SHMEM 0
 
-/* these are under the assumptions made in spgemm on block sizes: only use in spmm routines
- * where we assume CUDA block is 3D and blockDim.x * blockDim.y = WARP_SIZE
+static const char HYPRE_SPGEMM_HASH_TYPE = 'D';
+
+/* bin settings                             0   1   2    3    4    5     6     7     8     9     10 */
+constexpr HYPRE_Int SYMBL_HASH_SIZE[11] = { 0, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384 };
+#if defined(HYPRE_USING_CUDA)
+constexpr HYPRE_Int NUMER_HASH_SIZE[11] = { 0, 16, 32,  64, 128, 256,  512, 1024, 2048, 4096,  8192 };
+#elif defined(HYPRE_USING_HIP)
+constexpr HYPRE_Int NUMER_HASH_SIZE[11] = { 0,  8, 16,  32,  64, 128,  256,  512, 1024, 2048,  4096 };
+#elif defined(HYPRE_USING_SYCL)
+constexpr HYPRE_Int NUMER_HASH_SIZE[11] = { 0,  8, 16,  32,  64, 128,  256,  512, 1024, 2048,  4096 };
+#endif
+constexpr HYPRE_Int T_GROUP_SIZE[11]    = { 0,  2,  4,   8,  16,  32,   64,  128,  256,  512,  1024 };
+
+#if defined(HYPRE_USING_CUDA)
+#define HYPRE_SPGEMM_DEFAULT_BIN 5
+#elif defined(HYPRE_USING_HIP)
+#define HYPRE_SPGEMM_DEFAULT_BIN 6
+#elif defined(HYPRE_USING_SYCL)
+#define HYPRE_SPGEMM_DEFAULT_BIN 6
+#endif
+
+/* unroll factor in the kernels */
+#if defined(HYPRE_USING_CUDA)
+#define HYPRE_SPGEMM_NUMER_UNROLL 256
+#define HYPRE_SPGEMM_SYMBL_UNROLL 512
+#elif defined(HYPRE_USING_HIP)
+#define HYPRE_SPGEMM_NUMER_UNROLL 256
+#define HYPRE_SPGEMM_SYMBL_UNROLL 512
+#elif defined(HYPRE_USING_SYCL)
+#define HYPRE_SPGEMM_NUMER_UNROLL 256
+#define HYPRE_SPGEMM_SYMBL_UNROLL 512
+#endif
+
+//#define HYPRE_SPGEMM_TIMING
+//#define HYPRE_SPGEMM_PRINTF
+//#define HYPRE_SPGEMM_NVTX
+
+/* ----------------------------------------------------------------------------------------------- *
+ * these are under the assumptions made in spgemm on block sizes: only use in csr_spgemm routines
+ * where we assume CUDA block is 3D and blockDim.x * blockDim.y = GROUP_SIZE
+ * Note - sycl linearizes indices differently from cuda, i.e. a cuda block with dimensions
+ * (x, y, z) is equivalent to a sycl nd_range (z, y, x)
+ *------------------------------------------------------------------------------------------------ */
+
+/* the number of groups in block */
+static __device__ __forceinline__
+hypre_int get_num_groups(hypre_DeviceItem &item)
+{
+#if defined(HYPRE_USING_SYCL)
+   return item.get_local_range(0);
+#else
+   return blockDim.z;
+#endif
+}
+
+/* the group id in the block */
+static __device__ __forceinline__
+hypre_int get_group_id(hypre_DeviceItem &item)
+{
+#if defined(HYPRE_USING_SYCL)
+   return item.get_local_id(0);
+#else
+   return threadIdx.z;
+#endif
+}
+
+/* the thread id (lane) in the group */
+static __device__ __forceinline__
+hypre_int get_group_lane_id(hypre_DeviceItem &item)
+{
+#if defined(HYPRE_USING_SYCL)
+   return item.get_local_id(1) * item.get_local_range(2) + item.get_local_id(2);
+#else
+   return hypre_gpu_get_thread_id<2>(item);
+#endif
+}
+
+/* the warp id in the group */
+template <HYPRE_Int GROUP_SIZE>
+static __device__ __forceinline__
+hypre_int get_warp_in_group_id(hypre_DeviceItem &item)
+{
+   if (GROUP_SIZE <= HYPRE_WARP_SIZE)
+   {
+      return 0;
+   }
+   else
+   {
+#if defined(HYPRE_USING_SYCL)
+      return get_group_lane_id(item) >> HYPRE_WARP_BITSHIFT;
+#else
+      return hypre_gpu_get_warp_id<2>(item);
+#endif
+   }
+}
+
+/* group reads 2 values from ptr to v1 and v2
+ * GROUP_SIZE must be >= 2
  */
+template <HYPRE_Int GROUP_SIZE>
 static __device__ __forceinline__
-hypre_int get_block_size()
+void group_read(hypre_DeviceItem &item, const HYPRE_Int *ptr, bool valid_ptr, HYPRE_Int &v1,
+                HYPRE_Int &v2)
 {
-   //return (blockDim.x * blockDim.y * blockDim.z);           // in general cases
-   return (HYPRE_WARP_SIZE * blockDim.z);                     // if blockDim.x * blockDim.y = WARP_SIZE
+   if (GROUP_SIZE >= HYPRE_WARP_SIZE)
+   {
+      /* lane = warp_lane
+       * Note: use "2" since assume HYPRE_WARP_SIZE divides (blockDim.x * blockDim.y) */
+#if defined(HYPRE_USING_SYCL)
+      const HYPRE_Int lane = get_group_lane_id(item) & (HYPRE_WARP_SIZE - 1);
+#else
+      const HYPRE_Int lane = hypre_gpu_get_lane_id<2>(item);
+#endif
+
+      if (lane < 2)
+      {
+         v1 = read_only_load(ptr + lane);
+      }
+      v2 = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, v1, 1);
+      v1 = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, v1, 0);
+   }
+   else
+   {
+      /* lane = group_lane */
+      const HYPRE_Int lane = get_group_lane_id(item);
+
+      if (valid_ptr && lane < 2)
+      {
+         v1 = read_only_load(ptr + lane);
+      }
+      v2 = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, v1, 1, GROUP_SIZE);
+      v1 = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, v1, 0, GROUP_SIZE);
+   }
+}
+
+/* group reads a value from ptr to v1
+ * GROUP_SIZE must be >= 2
+ */
+template <HYPRE_Int GROUP_SIZE>
+static __device__ __forceinline__
+void group_read(hypre_DeviceItem &item, const HYPRE_Int *ptr, bool valid_ptr, HYPRE_Int &v1)
+{
+   if (GROUP_SIZE >= HYPRE_WARP_SIZE)
+   {
+      /* lane = warp_lane
+       * Note: use "2" since assume HYPRE_WARP_SIZE divides (blockDim.x * blockDim.y) */
+#if defined(HYPRE_USING_SYCL)
+      const HYPRE_Int lane = get_group_lane_id(item) & (HYPRE_WARP_SIZE - 1);
+#else
+      const HYPRE_Int lane = hypre_gpu_get_lane_id<2>(item);
+#endif
+
+      if (!lane)
+      {
+         v1 = read_only_load(ptr);
+      }
+      v1 = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, v1, 0);
+   }
+   else
+   {
+      /* lane = group_lane */
+      const HYPRE_Int lane = get_group_lane_id(item);
+
+      if (valid_ptr && !lane)
+      {
+         v1 = read_only_load(ptr);
+      }
+      v1 = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, v1, 0, GROUP_SIZE);
+   }
 }
 
+template <typename T, HYPRE_Int NUM_GROUPS_PER_BLOCK, HYPRE_Int GROUP_SIZE>
 static __device__ __forceinline__
-hypre_int get_thread_id()
+T group_reduce_sum(hypre_DeviceItem &item, T in)
 {
-   //return (threadIdx.z * blockDim.x * blockDim.y + threadIdx.y * blockDim.x + threadIdx.x); // in general cases
-   return (threadIdx.z * HYPRE_WARP_SIZE + threadIdx.y * blockDim.x + threadIdx.x);           // if blockDim.x * blockDim.y = WARP_SIZE
+#if defined(HYPRE_DEBUG)
+   hypre_device_assert(GROUP_SIZE <= HYPRE_WARP_SIZE);
+#endif
+
+#pragma unroll
+   for (hypre_int d = GROUP_SIZE / 2; d > 0; d >>= 1)
+   {
+      in += warp_shuffle_down_sync(item, HYPRE_WARP_FULL_MASK, in, d);
+   }
+
+   return in;
 }
 
+/* s_WarpData[NUM_GROUPS_PER_BLOCK * GROUP_SIZE / HYPRE_WARP_SIZE] */
+template <typename T, HYPRE_Int NUM_GROUPS_PER_BLOCK, HYPRE_Int GROUP_SIZE>
 static __device__ __forceinline__
-hypre_int get_warp_id()
+T group_reduce_sum(hypre_DeviceItem &item, T in, volatile T *s_WarpData)
 {
-   // return get_thread_id() >> HYPRE_WARP_BITSHIFT;        // in general cases
-   return threadIdx.z;                                      // if blockDim.x * blockDim.y = WARP_SIZE
+#if defined(HYPRE_DEBUG)
+   hypre_device_assert(GROUP_SIZE > HYPRE_WARP_SIZE);
+#endif
+
+   T out = warp_reduce_sum(item, in);
+
+#if defined(HYPRE_USING_SYCL)
+   const HYPRE_Int warp_lane_id = get_group_lane_id(item) & (HYPRE_WARP_SIZE - 1);
+#else
+   const HYPRE_Int warp_lane_id = hypre_gpu_get_lane_id<2>(item);
+#endif
+   const HYPRE_Int warp_id = hypre_gpu_get_warp_id<3>(item);
+
+   if (warp_lane_id == 0)
+   {
+      s_WarpData[warp_id] = out;
+   }
+
+   block_sync(item);
+
+   if (get_warp_in_group_id<GROUP_SIZE>(item) == 0)
+   {
+      const T a = warp_lane_id < GROUP_SIZE / HYPRE_WARP_SIZE ? s_WarpData[warp_id + warp_lane_id] : 0.0;
+      out = warp_reduce_sum(item, a);
+   }
+
+   block_sync(item);
+
+   return out;
 }
 
+/* GROUP_SIZE must <= HYPRE_WARP_SIZE */
+template <typename T, HYPRE_Int GROUP_SIZE>
 static __device__ __forceinline__
-hypre_int get_lane_id()
+T group_prefix_sum(hypre_DeviceItem &item, hypre_int lane_id, T in, T &all_sum)
 {
-   // return get_thread_id() & (WARP_SIZE-1);               // in general cases
-   return threadIdx.y * blockDim.x + threadIdx.x;           // if blockDim.x * blockDim.y = WARP_SIZE
+#pragma unroll
+   for (hypre_int d = 2; d <= GROUP_SIZE; d <<= 1)
+   {
+      T t = warp_shuffle_up_sync(item, HYPRE_WARP_FULL_MASK, in, d >> 1, GROUP_SIZE);
+      if ( (lane_id & (d - 1)) == (d - 1) )
+      {
+         in += t;
+      }
+   }
+
+   all_sum = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, in, GROUP_SIZE - 1, GROUP_SIZE);
+
+   if (lane_id == GROUP_SIZE - 1)
+   {
+      in = 0;
+   }
+
+#pragma unroll
+   for (hypre_int d = GROUP_SIZE >> 1; d > 0; d >>= 1)
+   {
+      T t = warp_shuffle_xor_sync(item, HYPRE_WARP_FULL_MASK, in, d, GROUP_SIZE);
+
+      if ( (lane_id & (d - 1)) == (d - 1))
+      {
+         if ( (lane_id & ((d << 1) - 1)) == ((d << 1) - 1) )
+         {
+            in += t;
+         }
+         else
+         {
+            in = t;
+         }
+      }
+   }
+   return in;
 }
 
+template <HYPRE_Int GROUP_SIZE>
+static __device__ __forceinline__
+void group_sync(hypre_DeviceItem &item)
+{
+   if (GROUP_SIZE <= HYPRE_WARP_SIZE)
+   {
+      warp_sync(item);
+   }
+   else
+   {
+      block_sync(item);
+   }
+}
 
 /* Hash functions */
 static __device__ __forceinline__
@@ -55,24 +303,24 @@ HYPRE_Int Hash2Func(HYPRE_Int key)
    return ( (key >> 6) | 1 );
 }
 
-template <char type>
+template <char HASHTYPE>
 static __device__ __forceinline__
 HYPRE_Int HashFunc(HYPRE_Int m, HYPRE_Int key, HYPRE_Int i, HYPRE_Int prev)
 {
    HYPRE_Int hashval = 0;
 
    /* assume m is power of 2 */
-   if (type == 'L')
+   if (HASHTYPE == 'L')
    {
       //hashval = (key + i) % m;
       hashval = ( prev + 1 ) & (m - 1);
    }
-   else if (type == 'Q')
+   else if (HASHTYPE == 'Q')
    {
       //hashval = (key + (i + i*i)/2) & (m-1);
       hashval = ( prev + i ) & (m - 1);
    }
-   else if (type == 'D')
+   else if (HASHTYPE == 'D')
    {
       //hashval = (key + i*Hash2Func(key) ) & (m - 1);
       hashval = ( prev + Hash2Func(key) ) & (m - 1);
@@ -81,9 +329,143 @@ HYPRE_Int HashFunc(HYPRE_Int m, HYPRE_Int key, HYPRE_Int i, HYPRE_Int prev)
    return hashval;
 }
 
-void hypre_create_ija( HYPRE_Int m, HYPRE_Int *d_c, HYPRE_Int *d_i, HYPRE_Int **d_j, HYPRE_Complex **d_a, HYPRE_Int *nnz );
+template <HYPRE_Int SHMEM_HASH_SIZE, char HASHTYPE>
+static __device__ __forceinline__
+HYPRE_Int HashFunc(HYPRE_Int key, HYPRE_Int i, HYPRE_Int prev)
+{
+   HYPRE_Int hashval = 0;
 
-HYPRE_Int hypre_SpGemmCreateGlobalHashTable( HYPRE_Int num_rows, HYPRE_Int *row_id, HYPRE_Int num_ghash, HYPRE_Int *row_sizes, HYPRE_Int SHMEM_HASH_SIZE, HYPRE_Int **ghash_i_ptr, HYPRE_Int **ghash_j_ptr, HYPRE_Complex **ghash_a_ptr, HYPRE_Int *ghash_size_ptr, HYPRE_Int type);
+   /* assume m is power of 2 */
+   if (HASHTYPE == 'L')
+   {
+      //hashval = (key + i) % SHMEM_HASH_SIZE;
+      hashval = ( prev + 1 ) & (SHMEM_HASH_SIZE - 1);
+   }
+   else if (HASHTYPE == 'Q')
+   {
+      //hashval = (key + (i + i*i)/2) & (SHMEM_HASH_SIZE-1);
+      hashval = ( prev + i ) & (SHMEM_HASH_SIZE - 1);
+   }
+   else if (HASHTYPE == 'D')
+   {
+      //hashval = (key + i*Hash2Func(key) ) & (SHMEM_HASH_SIZE - 1);
+      hashval = ( prev + Hash2Func(key) ) & (SHMEM_HASH_SIZE - 1);
+   }
 
-#endif /* HYPRE_USING_CUDA || defined(HYPRE_USING_HIP) */
+   return hashval;
+}
+
+template<typename T>
+#if (defined(THRUST_VERSION) && THRUST_VERSION < 101000)
+struct spgemm_bin_op : public thrust::unary_function<T, char>
+#else
+struct spgemm_bin_op
+#endif
+{
+   char s, t, u; /* s: base size of bins; t: lowest bin; u: highest bin */
+
+   spgemm_bin_op(char s_, char t_, char u_) { s = s_; t = t_; u = u_; }
+
+   __device__ char operator()(const T &x) const
+   {
+      if (x <= 0)
+      {
+         return 0;
+      }
+
+      const T y = (x + s - 1) / s;
+
+      if ( y <= (1 << (t - 1)) )
+      {
+         return t;
+      }
+
+      for (char i = t; i < u - 1; i++)
+      {
+         if (y <= (1 << i))
+         {
+            return i + 1;
+         }
+      }
+
+      return u;
+   }
+};
+
+void hypre_create_ija(HYPRE_Int m, HYPRE_Int *row_id, HYPRE_Int *d_c, HYPRE_Int *d_i,
+                      HYPRE_Int **d_j, HYPRE_Complex **d_a, HYPRE_Int *nnz_ptr );
+
+void hypre_create_ija(HYPRE_Int SHMEM_HASH_SIZE, HYPRE_Int m, HYPRE_Int *row_id, HYPRE_Int *d_c,
+                      HYPRE_Int *d_i, HYPRE_Int **d_j, HYPRE_Complex **d_a, HYPRE_Int *nnz_ptr );
+
+HYPRE_Int hypre_SpGemmCreateGlobalHashTable( HYPRE_Int num_rows, HYPRE_Int *row_id,
+                                             HYPRE_Int num_ghash, HYPRE_Int *row_sizes, HYPRE_Int SHMEM_HASH_SIZE, HYPRE_Int **ghash_i_ptr,
+                                             HYPRE_Int **ghash_j_ptr, HYPRE_Complex **ghash_a_ptr, HYPRE_Int *ghash_size_ptr);
+
+HYPRE_Int hypreDevice_CSRSpGemmRownnzEstimate(HYPRE_Int m, HYPRE_Int k, HYPRE_Int n,
+                                              HYPRE_Int *d_ia, HYPRE_Int *d_ja, HYPRE_Int *d_ib, HYPRE_Int *d_jb, HYPRE_Int *d_rc,
+                                              HYPRE_Int row_est_mtd);
+
+HYPRE_Int hypreDevice_CSRSpGemmRownnzUpperbound(HYPRE_Int m, HYPRE_Int k, HYPRE_Int n,
+                                                HYPRE_Int *d_ia, HYPRE_Int *d_ja, HYPRE_Int *d_ib, HYPRE_Int *d_jb, HYPRE_Int in_rc,
+                                                HYPRE_Int *d_rc, HYPRE_Int *rownnz_exact_ptr);
+
+HYPRE_Int hypreDevice_CSRSpGemmRownnz(HYPRE_Int m, HYPRE_Int k, HYPRE_Int n, HYPRE_Int nnzA,
+                                      HYPRE_Int *d_ia,
+                                      HYPRE_Int *d_ja, HYPRE_Int *d_ib, HYPRE_Int *d_jb, HYPRE_Int in_rc, HYPRE_Int *d_rc);
+
+HYPRE_Int hypreDevice_CSRSpGemmNumerWithRownnzUpperbound(HYPRE_Int m, HYPRE_Int k, HYPRE_Int n,
+                                                         HYPRE_Int *d_ia, HYPRE_Int *d_ja, HYPRE_Complex *d_a, HYPRE_Int *d_ib, HYPRE_Int *d_jb,
+                                                         HYPRE_Complex *d_b, HYPRE_Int *d_rc, HYPRE_Int exact_rownnz, HYPRE_Int **d_ic_out,
+                                                         HYPRE_Int **d_jc_out, HYPRE_Complex **d_c_out, HYPRE_Int *nnzC);
+
+HYPRE_Int hypre_SpGemmCreateBins( HYPRE_Int m, char s, char t, char u, HYPRE_Int *d_rc,
+                                  bool d_rc_indice_in, HYPRE_Int *d_rc_indice, HYPRE_Int *h_bin_ptr );
+
+template <HYPRE_Int BIN, HYPRE_Int SHMEM_HASH_SIZE, HYPRE_Int GROUP_SIZE, bool HAS_RIND>
+HYPRE_Int hypre_spgemm_symbolic_rownnz( HYPRE_Int m, HYPRE_Int *row_ind, HYPRE_Int k, HYPRE_Int n,
+                                        bool need_ghash, HYPRE_Int *d_ia, HYPRE_Int *d_ja, HYPRE_Int *d_ib, HYPRE_Int *d_jb,
+                                        HYPRE_Int *d_rc, bool can_fail, char *d_rf );
+
+template <HYPRE_Int BIN, HYPRE_Int SHMEM_HASH_SIZE, HYPRE_Int GROUP_SIZE, bool HAS_RIND>
+HYPRE_Int hypre_spgemm_numerical_with_rownnz( HYPRE_Int m, HYPRE_Int *row_ind, HYPRE_Int k,
+                                              HYPRE_Int n, bool need_ghash,
+                                              HYPRE_Int exact_rownnz, HYPRE_Int *d_ia, HYPRE_Int *d_ja, HYPRE_Complex *d_a,
+                                              HYPRE_Int *d_ib, HYPRE_Int *d_jb, HYPRE_Complex *d_b, HYPRE_Int *d_rc, HYPRE_Int *d_ic,
+                                              HYPRE_Int *d_jc, HYPRE_Complex *d_c );
+
+template <HYPRE_Int SHMEM_HASH_SIZE, HYPRE_Int GROUP_SIZE>
+HYPRE_Int hypre_spgemm_symbolic_max_num_blocks( HYPRE_Int multiProcessorCount,
+                                                HYPRE_Int *num_blocks_ptr, HYPRE_Int *block_size_ptr );
+
+template <HYPRE_Int SHMEM_HASH_SIZE, HYPRE_Int GROUP_SIZE>
+HYPRE_Int hypre_spgemm_numerical_max_num_blocks( HYPRE_Int multiProcessorCount,
+                                                 HYPRE_Int *num_blocks_ptr, HYPRE_Int *block_size_ptr );
+
+HYPRE_Int hypreDevice_CSRSpGemmBinnedGetBlockNumDim();
+
+template <HYPRE_Int GROUP_SIZE>
+HYPRE_Int hypreDevice_CSRSpGemmNumerPostCopy( HYPRE_Int m, HYPRE_Int *d_rc, HYPRE_Int *nnzC,
+                                              HYPRE_Int **d_ic, HYPRE_Int **d_jc, HYPRE_Complex **d_c);
+
+template <HYPRE_Int GROUP_SIZE>
+static constexpr HYPRE_Int
+hypre_spgemm_get_num_groups_per_block()
+{
+#if defined(HYPRE_USING_CUDA)
+   return hypre_min(hypre_max(512 / GROUP_SIZE, 1), 64);
+#elif defined(HYPRE_USING_HIP)
+   return hypre_max(512 / GROUP_SIZE, 1);
+#elif defined(HYPRE_USING_SYCL)
+   return hypre_max(512 / GROUP_SIZE, 1);
 #endif
+}
+
+#if defined(HYPRE_SPGEMM_PRINTF) || defined(HYPRE_SPGEMM_TIMING)
+#define HYPRE_SPGEMM_PRINT(...) hypre_ParPrintf(hypre_MPI_COMM_WORLD, __VA_ARGS__)
+#else
+#define HYPRE_SPGEMM_PRINT(...)
+#endif
+
+#endif /* defined(HYPRE_USING_GPU) */
+#endif /* #ifndef CSR_SPGEMM_DEVICE_H */
diff --git a/external/hypre/src/seq_mv/csr_spgemm_device_attempt.c b/external/hypre/src/seq_mv/csr_spgemm_device_attempt.c
deleted file mode 100644
index d6b23a99..00000000
--- a/external/hypre/src/seq_mv/csr_spgemm_device_attempt.c
+++ /dev/null
@@ -1,632 +0,0 @@
-/******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
- * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
- *
- * SPDX-License-Identifier: (Apache-2.0 OR MIT)
- ******************************************************************************/
-
-/*- - - - - - - - - - - - - - - - - - - - - - - - - - *
-           Perform SpMM with Row Nnz Estimation
- *- - - - - - - - - - - - - - - - - - - - - - - - - - */
-#include "seq_mv.h"
-#include "csr_spgemm_device.h"
-
-#define HYPRE_SPGEMM_NUMER_HASH_SIZE 128
-
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-
-template <char HashType>
-static __device__ __forceinline__
-HYPRE_Int
-hypre_spgemm_hash_insert_attempt( HYPRE_Int      HashSize,      /* capacity of the hash table */
-                         volatile HYPRE_Int     *HashKeys,      /* assumed to be initialized as all -1's */
-                         volatile HYPRE_Complex *HashVals,      /* assumed to be initialized as all 0's */
-                                  HYPRE_Int      key,           /* assumed to be nonnegative */
-                                  HYPRE_Complex  val,
-                                  HYPRE_Int     &count,         /* increase by 1 if is a new entry */
-                                  hypre_int      warp_failed )
-{
-   HYPRE_Int j = 0;
-
-#pragma unroll
-   for (HYPRE_Int i = 0; i < HashSize; i++)
-   {
-      /* compute the hash value of key */
-      if (i == 0)
-      {
-         j = key & (HashSize - 1);
-      }
-      else
-      {
-         j = HashFunc<HashType>(HashSize, key, i, j);
-      }
-
-      /* try to insert key+1 into slot j */
-      HYPRE_Int old = atomicCAS((HYPRE_Int*)(HashKeys+j), -1, key);
-
-      if (old == -1 || old == key)
-      {
-         /* new insertion, increase counter */
-         if (old == -1)
-         {
-            count++;
-         }
-
-         /* this slot was open or contained 'key', update value */
-         if (!warp_failed)
-         {
-            atomicAdd((HYPRE_Complex*)(HashVals+j), val);
-         }
-
-         return j;
-      }
-   }
-
-   return -1;
-}
-
-template <HYPRE_Int ATTEMPT, char HashType>
-static __device__ __forceinline__
-HYPRE_Int
-hypre_spgemm_compute_row_attempt( HYPRE_Int      rowi,
-                         volatile HYPRE_Int      lane_id,
-                                  HYPRE_Int     *ia,
-                                  HYPRE_Int     *ja,
-                                  HYPRE_Complex *aa,
-                                  HYPRE_Int     *ib,
-                                  HYPRE_Int     *jb,
-                                  HYPRE_Complex *ab,
-                                  HYPRE_Int      s_HashSize,
-                         volatile HYPRE_Int     *s_HashKeys,
-                         volatile HYPRE_Complex *s_HashVals,
-                                  HYPRE_Int      g_HashSize,
-                                  HYPRE_Int     *g_HashKeys,
-                                  HYPRE_Complex *g_HashVals,
-                                  hypre_int     &failed )
-{
-   /* load the start and end position of row i of A */
-   HYPRE_Int j = 0;
-
-   if (lane_id < 2)
-   {
-      j = read_only_load(ia + rowi + lane_id);
-   }
-   const HYPRE_Int istart = __shfl_sync(HYPRE_WARP_FULL_MASK, j, 0);
-   const HYPRE_Int iend   = __shfl_sync(HYPRE_WARP_FULL_MASK, j, 1);
-
-   HYPRE_Int num_new_insert = 0;
-   hypre_int warp_failed    = 0;
-
-   /* load column idx and values of row i of A */
-   for (HYPRE_Int i = istart; i < iend; i += blockDim.y)
-   {
-      HYPRE_Int     colA = -1;
-      HYPRE_Complex valA = 0.0;
-
-      if (threadIdx.x == 0 && i + threadIdx.y < iend)
-      {
-         colA = read_only_load(ja + i + threadIdx.y);
-         valA = read_only_load(aa + i + threadIdx.y);
-      }
-
-#if 0
-      //const HYPRE_Int ymask = get_mask<4>(lane_id);
-      // TODO: need to confirm the behavior of __ballot_sync, leave it here for now
-      //const HYPRE_Int num_valid_rows = __popc(__ballot_sync(ymask, valid_i));
-      //for (HYPRE_Int j = 0; j < num_valid_rows; j++)
-#endif
-
-      /* threads in the same ygroup work on one row together */
-      const HYPRE_Int     rowB = __shfl_sync(HYPRE_WARP_FULL_MASK, colA, 0, blockDim.x);
-      const HYPRE_Complex mult = __shfl_sync(HYPRE_WARP_FULL_MASK, valA, 0, blockDim.x);
-      /* open this row of B, collectively */
-      HYPRE_Int tmp = 0;
-      if (rowB != -1 && threadIdx.x < 2)
-      {
-         tmp = read_only_load(ib+rowB+threadIdx.x);
-      }
-      const HYPRE_Int rowB_start = __shfl_sync(HYPRE_WARP_FULL_MASK, tmp, 0, blockDim.x);
-      const HYPRE_Int rowB_end   = __shfl_sync(HYPRE_WARP_FULL_MASK, tmp, 1, blockDim.x);
-
-      for (HYPRE_Int k = rowB_start + threadIdx.x; __any_sync(HYPRE_WARP_FULL_MASK, k < rowB_end); k += blockDim.x)
-      {
-         if (k < rowB_end)
-         {
-            const HYPRE_Int     k_idx = read_only_load(jb + k);
-            const HYPRE_Complex k_val = read_only_load(ab + k) * mult;
-            /* first try to insert into shared memory hash table */
-            HYPRE_Int pos = hypre_spgemm_hash_insert_attempt<HashType>
-               (s_HashSize, s_HashKeys, s_HashVals, k_idx, k_val, num_new_insert, warp_failed);
-
-            if (-1 == pos)
-            {
-               pos = hypre_spgemm_hash_insert_attempt<HashType>
-                     (g_HashSize, g_HashKeys, g_HashVals, k_idx, k_val, num_new_insert, warp_failed);
-            }
-            /* if failed again, both hash tables must have been full
-               (hash table size estimation was too small).
-               Increase the counter anyhow (will lead to over-counting)
-               */
-            if (pos == -1)
-            {
-               num_new_insert ++;
-               failed = 1;
-            }
-         }
-
-         if (ATTEMPT == 1)
-         {
-            if (!warp_failed)
-            {
-               warp_failed = warp_allreduce_sum(failed);
-            }
-         }
-      }
-   }
-
-   return num_new_insert;
-}
-
-template <HYPRE_Int NUM_WARPS_PER_BLOCK, HYPRE_Int SHMEM_HASH_SIZE, HYPRE_Int ATTEMPT, char HashType>
-__global__ void
-hypre_spgemm_attempt( HYPRE_Int      M, /* HYPRE_Int K, HYPRE_Int N, */
-                      HYPRE_Int     *rind,
-                      HYPRE_Int     *ia,
-                      HYPRE_Int     *ja,
-                      HYPRE_Complex *aa,
-                      HYPRE_Int     *ib,
-                      HYPRE_Int     *jb,
-                      HYPRE_Complex *ab,
-                      HYPRE_Int     *js,
-                      HYPRE_Complex *as,
-                      HYPRE_Int     *ig,
-                      HYPRE_Int     *jg,
-                      HYPRE_Complex *ag,
-                      HYPRE_Int     *rc,
-                      HYPRE_Int     *rf )
-{
-   volatile const HYPRE_Int num_warps = NUM_WARPS_PER_BLOCK * gridDim.x;
-   /* warp id inside the block */
-   volatile const HYPRE_Int warp_id = get_warp_id();
-   /* warp id in the grid */
-   volatile const HYPRE_Int grid_warp_id = blockIdx.x * NUM_WARPS_PER_BLOCK + warp_id;
-   /* lane id inside the warp */
-   volatile HYPRE_Int lane_id = get_lane_id();
-   /* shared memory hash table */
-#if 1
-   __shared__ volatile HYPRE_Int s_HashKeys[NUM_WARPS_PER_BLOCK * SHMEM_HASH_SIZE];
-   __shared__ volatile HYPRE_Complex s_HashVals[NUM_WARPS_PER_BLOCK * SHMEM_HASH_SIZE];
-#else
-   extern __shared__ volatile HYPRE_Int shared_mem[];
-   volatile HYPRE_Int *s_HashKeys = shared_mem;
-   volatile HYPRE_Complex *s_HashVals = (volatile HYPRE_Complex *) &s_HashKeys[NUM_WARPS_PER_BLOCK * SHMEM_HASH_SIZE];
-#endif
-   /* shared memory hash table for this warp */
-   volatile HYPRE_Int *warp_s_HashKeys = s_HashKeys + warp_id * SHMEM_HASH_SIZE;
-   volatile HYPRE_Complex *warp_s_HashVals = s_HashVals + warp_id * SHMEM_HASH_SIZE;
-
-   hypre_device_assert(blockDim.z              == NUM_WARPS_PER_BLOCK);
-   hypre_device_assert(blockDim.x * blockDim.y == HYPRE_WARP_SIZE);
-   hypre_device_assert(NUM_WARPS_PER_BLOCK     <= HYPRE_WARP_SIZE);
-
-   /* a warp working on the ith row */
-   for (HYPRE_Int i = grid_warp_id; i < M; i += num_warps)
-   {
-      /* start/end position of global memory hash table */
-      HYPRE_Int j = 0, ii;
-      hypre_int failed = 0;
-
-      if (ATTEMPT == 2)
-      {
-         if (lane_id == 0)
-         {
-            j = rind[i];
-         }
-         ii = __shfl_sync(HYPRE_WARP_FULL_MASK, j, 0);
-      }
-      else
-      {
-         ii = i;
-      }
-
-      /* start/end position of global memory hash table */
-      HYPRE_Int istart_g = 0, iend_g = 0, ghash_size = 0;
-
-      if (ig)
-      {
-         if (lane_id < 2)
-         {
-            j = read_only_load(ig + ii + lane_id);
-         }
-         istart_g = __shfl_sync(HYPRE_WARP_FULL_MASK, j, 0);
-         iend_g   = __shfl_sync(HYPRE_WARP_FULL_MASK, j, 1);
-
-         /* size of global hash table allocated for this row
-           (must be power of 2 and >= the actual size of the row of C - shmem hash size) */
-         ghash_size = iend_g - istart_g;
-
-         /* initialize warp's global memory hash table */
-#pragma unroll
-         for (HYPRE_Int k = lane_id; k < ghash_size; k += HYPRE_WARP_SIZE)
-         {
-            jg[istart_g+k] = -1;
-            ag[istart_g+k] = 0.0;
-         }
-      }
-
-      /* initialize warp's shared memory hash table */
-#pragma unroll
-      for (HYPRE_Int k = lane_id; k < SHMEM_HASH_SIZE; k += HYPRE_WARP_SIZE)
-      {
-         warp_s_HashKeys[k] = -1;
-         warp_s_HashVals[k] = 0.0;
-      }
-
-      __syncwarp();
-
-      /* work with two hash tables */
-      j = hypre_spgemm_compute_row_attempt<ATTEMPT, HashType>(ii, lane_id, ia, ja, aa, ib, jb, ab,
-                                                              SHMEM_HASH_SIZE, warp_s_HashKeys, warp_s_HashVals,
-                                                              ghash_size, jg + istart_g, ag + istart_g, failed);
-
-#if defined(HYPRE_DEBUG)
-      if (ATTEMPT == 2)
-      {
-         hypre_device_assert(failed == 0);
-      }
-#endif
-
-      /* num of inserts in this row (an upper bound) */
-      j = warp_reduce_sum(j);
-
-      /* if this row failed */
-      if (ATTEMPT == 1)
-      {
-         failed = warp_allreduce_sum(failed);
-      }
-
-      if (lane_id == 0)
-      {
-         rc[ii] = j;
-
-         if (ATTEMPT == 1)
-         {
-            rf[ii] = failed > 0;
-         }
-      }
-
-      if (!failed)
-      {
-#pragma unroll
-         for (HYPRE_Int k = lane_id; k < SHMEM_HASH_SIZE; k += HYPRE_WARP_SIZE)
-         {
-            js[ii * SHMEM_HASH_SIZE + k] = warp_s_HashKeys[k];
-            as[ii * SHMEM_HASH_SIZE + k] = warp_s_HashVals[k];
-         }
-      }
-   } // for (i=...)
-}
-
-template <HYPRE_Int NUM_WARPS_PER_BLOCK, HYPRE_Int SHMEM_HASH_SIZE>
-static __device__ __forceinline__
-HYPRE_Int
-hypre_spgemm_copy_from_hash_into_C_row( HYPRE_Int      lane_id,
-                               volatile HYPRE_Int     *s_HashKeys,
-                               volatile HYPRE_Complex *s_HashVals,
-                                        HYPRE_Int      ghash_size,
-                                        HYPRE_Int     *jg_start,
-                                        HYPRE_Complex *ag_start,
-                                        HYPRE_Int     *jc_start,
-                                        HYPRE_Complex *ac_start )
-{
-   HYPRE_Int j = 0;
-
-   /* copy shared memory hash table into C */
-#pragma unroll
-   for (HYPRE_Int k = lane_id; k < SHMEM_HASH_SIZE; k += HYPRE_WARP_SIZE)
-   {
-      HYPRE_Int key, sum, pos;
-      key = s_HashKeys[k];
-      HYPRE_Int in = key != -1;
-      pos = warp_prefix_sum(lane_id, in, sum);
-      if (key != -1)
-      {
-         jc_start[j + pos] = key;
-         ac_start[j + pos] = s_HashVals[k];
-      }
-      j += sum;
-   }
-
-   /* copy global memory hash table into C */
-#pragma unroll
-   for (HYPRE_Int k = 0; k < ghash_size; k += HYPRE_WARP_SIZE)
-   {
-      HYPRE_Int key = -1, sum, pos;
-      if (k + lane_id < ghash_size)
-      {
-         key = jg_start[k + lane_id];
-      }
-      HYPRE_Int in = key != -1;
-      pos = warp_prefix_sum(lane_id, in, sum);
-      if (key != -1)
-      {
-         jc_start[j + pos] = key;
-         ac_start[j + pos] = ag_start[k + lane_id];
-      }
-      j += sum;
-   }
-
-   return j;
-}
-
-template <HYPRE_Int NUM_WARPS_PER_BLOCK, HYPRE_Int SHMEM_HASH_SIZE>
-__global__ void
-hypre_spgemm_copy_from_hash_into_C( HYPRE_Int      M,
-                                    HYPRE_Int     *rf,
-                                    HYPRE_Int     *js,
-                                    HYPRE_Complex *as,
-                                    HYPRE_Int     *ig1,
-                                    HYPRE_Int     *jg1,
-                                    HYPRE_Complex *ag1,
-                                    HYPRE_Int     *ig2,
-                                    HYPRE_Int     *jg2,
-                                    HYPRE_Complex *ag2,
-                                    HYPRE_Int     *ic,
-                                    HYPRE_Int     *jc,
-                                    HYPRE_Complex *ac)
-{
-   const HYPRE_Int num_warps = NUM_WARPS_PER_BLOCK * gridDim.x;
-   /* warp id inside the block */
-   const HYPRE_Int warp_id = get_warp_id();
-   /* warp id in the grid */
-   volatile const HYPRE_Int grid_warp_id = blockIdx.x * NUM_WARPS_PER_BLOCK + warp_id;
-   /* lane id inside the warp */
-   volatile const HYPRE_Int lane_id = get_lane_id();
-
-   hypre_device_assert(blockDim.x * blockDim.y == HYPRE_WARP_SIZE);
-
-   for (HYPRE_Int i = grid_warp_id; i < M; i += num_warps)
-   {
-      HYPRE_Int j = 0, irf = 0;
-      HYPRE_Int istart_c = 0, istart_g = 0, iend_g = 0, *ig = NULL, *jg = NULL;
-      HYPRE_Complex *ag = NULL;
-
-      if (lane_id == 0)
-      {
-         istart_c = read_only_load(ic + i);
-         irf = read_only_load(rf + i);
-      }
-      istart_c  = __shfl_sync(HYPRE_WARP_FULL_MASK, istart_c, 0);
-      irf = __shfl_sync(HYPRE_WARP_FULL_MASK, irf, 0);
-
-      if (irf)
-      {
-         ig = ig2;  jg = jg2;  ag = ag2;
-      }
-      else
-      {
-         ig = ig1;  jg = jg1;  ag = ag1;
-      }
-
-      if (ig)
-      {
-         if (lane_id < 2)
-         {
-            j = read_only_load(ig + i + lane_id);
-         }
-         istart_g = __shfl_sync(HYPRE_WARP_FULL_MASK, j, 0);
-         iend_g   = __shfl_sync(HYPRE_WARP_FULL_MASK, j, 1);
-      }
-
-#ifdef HYPRE_DEBUG
-      j =
-#endif
-      hypre_spgemm_copy_from_hash_into_C_row<NUM_WARPS_PER_BLOCK, SHMEM_HASH_SIZE>
-      (lane_id, js + i * SHMEM_HASH_SIZE, as + i * SHMEM_HASH_SIZE, iend_g - istart_g,
-       jg + istart_g, ag + istart_g, jc + istart_c, ac + istart_c);
-
-#ifdef HYPRE_DEBUG
-      hypre_device_assert(istart_c + j == ic[i+1]);
-#endif
-   }
-}
-
-/* SpGeMM with Rownnz Estimates */
-template <HYPRE_Int shmem_hash_size, char hash_type>
-HYPRE_Int
-hypre_spgemm_numerical_with_rowest( HYPRE_Int       m,
-                                    HYPRE_Int       k,
-                                    HYPRE_Int       n,
-                                    HYPRE_Int      *d_ia,
-                                    HYPRE_Int      *d_ja,
-                                    HYPRE_Complex  *d_a,
-                                    HYPRE_Int      *d_ib,
-                                    HYPRE_Int      *d_jb,
-                                    HYPRE_Complex  *d_b,
-                                    HYPRE_Int      *d_rc,
-                                    HYPRE_Int      *d_rf,
-                                    HYPRE_Int     **d_ic_out,
-                                    HYPRE_Int     **d_jc_out,
-                                    HYPRE_Complex **d_c_out,
-                                    HYPRE_Int      *nnzC_out )
-{
-#if defined(HYPRE_USING_CUDA)
-   const HYPRE_Int num_warps_per_block = 16;
-#elif defined(HYPRE_USING_HIP)
-   const HYPRE_Int num_warps_per_block = 16;
-#endif
-   const HYPRE_Int BDIMX               = 2;
-   const HYPRE_Int BDIMY               = HYPRE_WARP_SIZE / BDIMX;
-   const size_t    shash_size          = shmem_hash_size * (size_t) m;
-
-#if 0
-   const size_t    shmem_size          = num_warps_per_block * shmem_hash_size * (sizeof(HYPRE_Complex) + sizeof(HYPRE_Int));
-   const HYPRE_Int shmem_maxbytes      = 65536;
-   hypre_assert(shmem_size <= shmem_maxbytes);
-   /* CUDA V100 */
-   if (shmem_maxbytes > 49152)
-   {
-      HYPRE_CUDA_CALL( cudaFuncSetAttribute(hypre_spgemm_attempt<num_warps_per_block, shmem_hash_size, 1, hash_type>,
-                       cudaFuncAttributeMaxDynamicSharedMemorySize, shmem_maxbytes) );
-
-      HYPRE_CUDA_CALL( cudaFuncSetAttribute(hypre_spgemm_attempt<num_warps_per_block, shmem_hash_size, 2, hash_type>,
-                       cudaFuncAttributeMaxDynamicSharedMemorySize, shmem_maxbytes) );
-   }
-#endif
-
-   /* CUDA kernel configurations */
-   dim3 bDim(BDIMX, BDIMY, num_warps_per_block);
-   hypre_assert(bDim.x * bDim.y == HYPRE_WARP_SIZE);
-
-   /* ---------------------------------------------------------------------------
-    * global memory hash table
-    * ---------------------------------------------------------------------------*/
-   HYPRE_Int     *d_ghash1_i = NULL;
-   HYPRE_Int     *d_ghash1_j = NULL;
-   HYPRE_Complex *d_ghash1_a = NULL;
-   HYPRE_Int     *d_ghash2_i = NULL;
-   HYPRE_Int     *d_ghash2_j = NULL;
-   HYPRE_Complex *d_ghash2_a = NULL;
-   HYPRE_Int     *d_js       = hypre_TAlloc(HYPRE_Int,     shash_size, HYPRE_MEMORY_DEVICE);
-   HYPRE_Complex *d_as       = hypre_TAlloc(HYPRE_Complex, shash_size, HYPRE_MEMORY_DEVICE);
-   HYPRE_Int     *rf_ind     = NULL;
-
-   /* ---------------------------------------------------------------------------
-    * 1st multiplication attempt:
-    * ---------------------------------------------------------------------------*/
-   {
-      hypre_SpGemmCreateGlobalHashTable(m, NULL, m, d_rc, shmem_hash_size, &d_ghash1_i,
-                                        &d_ghash1_j, &d_ghash1_a, NULL, 2);
-
-      // for cases where one WARP works on a row
-      dim3 gDim( (m + bDim.z - 1) / bDim.z );
-
-      HYPRE_CUDA_LAUNCH ( (hypre_spgemm_attempt<num_warps_per_block, shmem_hash_size, 1, hash_type>),
-                          gDim, bDim, /* shmem_size, */
-                          m, NULL, d_ia, d_ja, d_a, d_ib, d_jb, d_b, d_js, d_as, d_ghash1_i, d_ghash1_j, d_ghash1_a,
-                          d_rc, d_rf );
-   }
-
-   HYPRE_Int num_failed_rows = hypreDevice_IntegerReduceSum(m, d_rf);
-
-   /* ---------------------------------------------------------------------------
-    * 2nd multiplication attempt:
-    * ---------------------------------------------------------------------------*/
-   if (num_failed_rows)
-   {
-      //hypre_printf("[%s, %d]: num of failed rows %d (%.2f)\n", __FILE__, __LINE__, num_failed_rows, num_failed_rows / (m + 0.0) );
-
-      rf_ind = hypre_TAlloc(HYPRE_Int, num_failed_rows, HYPRE_MEMORY_DEVICE);
-
-      HYPRE_Int *new_end =
-      HYPRE_THRUST_CALL( copy_if,
-                         thrust::make_counting_iterator(0),
-                         thrust::make_counting_iterator(m),
-                         d_rf,
-                         rf_ind,
-                         thrust::identity<HYPRE_Int>() );
-
-      hypre_assert(new_end - rf_ind == num_failed_rows);
-
-      /* ---------------------------------------------------------------------------
-       * build a second hash table for long rows
-       * ---------------------------------------------------------------------------*/
-      hypre_SpGemmCreateGlobalHashTable(num_failed_rows, rf_ind, m, d_rc, shmem_hash_size,
-                                        &d_ghash2_i, &d_ghash2_j, &d_ghash2_a, NULL, 2);
-
-      // for cases where one WARP works on a row
-      dim3 gDim( (num_failed_rows + bDim.z - 1) / bDim.z );
-
-      HYPRE_CUDA_LAUNCH ( (hypre_spgemm_attempt<num_warps_per_block, shmem_hash_size, 2, hash_type>),
-                          gDim, bDim, /* shmem_size, */
-                          num_failed_rows, rf_ind, d_ia, d_ja, d_a, d_ib, d_jb, d_b, d_js, d_as, d_ghash2_i, d_ghash2_j, d_ghash2_a,
-                          d_rc, NULL );
-   }
-
-   HYPRE_Int     *d_ic = hypre_TAlloc(HYPRE_Int, m + 1, HYPRE_MEMORY_DEVICE);
-   HYPRE_Int     *d_jc;
-   HYPRE_Complex *d_c;
-   HYPRE_Int      nnzC;
-
-   hypre_create_ija(m, d_rc, d_ic, &d_jc, &d_c, &nnzC);
-
-   /* ---------------------------------------------------------------------------
-    * copy from hash tables to C
-    * ---------------------------------------------------------------------------*/
-   {
-      // for cases where one WARP works on a row
-      dim3 gDim( (m + bDim.z - 1) / bDim.z );
-
-      HYPRE_CUDA_LAUNCH( (hypre_spgemm_copy_from_hash_into_C<num_warps_per_block, shmem_hash_size>), gDim, bDim,
-                          m, d_rf,
-                          d_js, d_as,
-                          d_ghash1_i, d_ghash1_j, d_ghash1_a,
-                          d_ghash2_i, d_ghash2_j, d_ghash2_a,
-                          d_ic, d_jc, d_c );
-   }
-
-   hypre_TFree(d_ghash1_i, HYPRE_MEMORY_DEVICE);
-   hypre_TFree(d_ghash1_j, HYPRE_MEMORY_DEVICE);
-   hypre_TFree(d_ghash1_a, HYPRE_MEMORY_DEVICE);
-   hypre_TFree(d_ghash2_i, HYPRE_MEMORY_DEVICE);
-   hypre_TFree(d_ghash2_j, HYPRE_MEMORY_DEVICE);
-   hypre_TFree(d_ghash2_a, HYPRE_MEMORY_DEVICE);
-   hypre_TFree(d_js,       HYPRE_MEMORY_DEVICE);
-   hypre_TFree(d_as,       HYPRE_MEMORY_DEVICE);
-   hypre_TFree(rf_ind,     HYPRE_MEMORY_DEVICE);
-
-   *d_ic_out = d_ic;
-   *d_jc_out = d_jc;
-   *d_c_out  = d_c;
-   *nnzC_out = nnzC;
-
-   return hypre_error_flag;
-}
-
-HYPRE_Int
-hypreDevice_CSRSpGemmNumerWithRownnzEstimate( HYPRE_Int       m,
-                                              HYPRE_Int       k,
-                                              HYPRE_Int       n,
-                                              HYPRE_Int      *d_ia,
-                                              HYPRE_Int      *d_ja,
-                                              HYPRE_Complex  *d_a,
-                                              HYPRE_Int      *d_ib,
-                                              HYPRE_Int      *d_jb,
-                                              HYPRE_Complex  *d_b,
-                                              HYPRE_Int      *d_rc,
-                                              HYPRE_Int     **d_ic_out,
-                                              HYPRE_Int     **d_jc_out,
-                                              HYPRE_Complex **d_c_out,
-                                              HYPRE_Int      *nnzC )
-{
-   const HYPRE_Int shmem_hash_size = HYPRE_SPGEMM_NUMER_HASH_SIZE;
-   const char      hash_type       = hypre_HandleSpgemmHashType(hypre_handle());
-
-   /* a binary array to indicate if row nnz counting is failed for a row */
-   HYPRE_Int *d_rf = d_rc + m;
-
-   if (hash_type == 'L')
-   {
-      hypre_spgemm_numerical_with_rowest<shmem_hash_size, 'L'>
-         (m, k, n, d_ia, d_ja, d_a, d_ib, d_jb, d_b, d_rc, d_rf, d_ic_out, d_jc_out, d_c_out, nnzC);
-   }
-   else if (hash_type == 'Q')
-   {
-      hypre_spgemm_numerical_with_rowest<shmem_hash_size, 'Q'>
-         (m, k, n, d_ia, d_ja, d_a, d_ib, d_jb, d_b, d_rc, d_rf, d_ic_out, d_jc_out, d_c_out, nnzC);
-   }
-   else if (hash_type == 'D')
-   {
-      hypre_spgemm_numerical_with_rowest<shmem_hash_size, 'D'>
-         (m, k, n, d_ia, d_ja, d_a, d_ib, d_jb, d_b, d_rc, d_rf, d_ic_out, d_jc_out, d_c_out, nnzC);
-   }
-   else
-   {
-      hypre_printf("Unrecognized hash type ... [L(inear), Q(uadratic), D(ouble)]\n");
-      exit(0);
-   }
-
-   return hypre_error_flag;
-}
-
-#endif /* HYPRE_USING_CUDA  || defined(HYPRE_USING_HIP) */
diff --git a/external/hypre/src/seq_mv/csr_spgemm_device_confident.c b/external/hypre/src/seq_mv/csr_spgemm_device_confident.c
deleted file mode 100644
index 86633323..00000000
--- a/external/hypre/src/seq_mv/csr_spgemm_device_confident.c
+++ /dev/null
@@ -1,589 +0,0 @@
-/******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
- * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
- *
- * SPDX-License-Identifier: (Apache-2.0 OR MIT)
- ******************************************************************************/
-
-/*- - - - - - - - - - - - - - - - - - - - - - - - - - *
-           Perform SpMM with Row Nnz Upper Bound
- *- - - - - - - - - - - - - - - - - - - - - - - - - - */
-#include "seq_mv.h"
-#include "csr_spgemm_device.h"
-
-/*- - - - - - - - - - - - - - - - - - - - - - - - - - *
-                Numerical Multiplication
- *- - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if defined(HYPRE_USING_CUDA)
-#define HYPRE_SPGEMM_NUMER_HASH_SIZE 256
-#elif defined(HYPRE_USING_HIP)
-#define HYPRE_SPGEMM_NUMER_HASH_SIZE 256
-#endif
-
-
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-
-template <char HashType, HYPRE_Int FAILED_SYMBL>
-static __device__ __forceinline__
-HYPRE_Int
-hypre_spgemm_hash_insert_numer( HYPRE_Int      HashSize,      /* capacity of the hash table */
-                       volatile HYPRE_Int     *HashKeys,      /* assumed to be initialized as all -1's */
-                       volatile HYPRE_Complex *HashVals,      /* assumed to be initialized as all 0's */
-                                HYPRE_Int      key,           /* assumed to be nonnegative */
-                                HYPRE_Complex  val,
-                                HYPRE_Int     &count )
-{
-   HYPRE_Int j = 0;
-
-#pragma unroll
-   for (HYPRE_Int i = 0; i < HashSize; i++)
-   {
-      /* compute the hash value of key */
-      if (i == 0)
-      {
-         j = key & (HashSize - 1);
-      }
-      else
-      {
-         j = HashFunc<HashType>(HashSize, key, i, j);
-      }
-
-      /* try to insert key+1 into slot j */
-      HYPRE_Int old = atomicCAS((HYPRE_Int *)(HashKeys+j), -1, key);
-
-      if (old == -1 || old == key)
-      {
-         if (FAILED_SYMBL)
-         {
-            if (old == -1)
-            {
-               count++;
-            }
-         }
-         /* this slot was open or contained 'key', update value */
-         atomicAdd((HYPRE_Complex*)(HashVals+j), val);
-         return j;
-      }
-   }
-
-   return -1;
-}
-
-template <HYPRE_Int FAILED_SYMBL, char HashType>
-static __device__ __forceinline__
-HYPRE_Int
-hypre_spgemm_compute_row_numer( HYPRE_Int      rowi,
-                                HYPRE_Int      lane_id,
-                                HYPRE_Int     *ia,
-                                HYPRE_Int     *ja,
-                                HYPRE_Complex *aa,
-                                HYPRE_Int     *ib,
-                                HYPRE_Int     *jb,
-                                HYPRE_Complex *ab,
-                                HYPRE_Int      s_HashSize,
-                       volatile HYPRE_Int     *s_HashKeys,
-                       volatile HYPRE_Complex *s_HashVals,
-                                HYPRE_Int      g_HashSize,
-                                HYPRE_Int     *g_HashKeys,
-                                HYPRE_Complex *g_HashVals)
-{
-   /* load the start and end position of row i of A */
-   HYPRE_Int i = 0;
-
-   if (lane_id < 2)
-   {
-      i = read_only_load(ia + rowi + lane_id);
-   }
-   const HYPRE_Int istart = __shfl_sync(HYPRE_WARP_FULL_MASK, i, 0);
-   const HYPRE_Int iend   = __shfl_sync(HYPRE_WARP_FULL_MASK, i, 1);
-
-   HYPRE_Int num_new_insert = 0;
-
-   /* load column idx and values of row i of A */
-   for (i = istart; i < iend; i += blockDim.y)
-   {
-      HYPRE_Int     colA = -1;
-      HYPRE_Complex valA = 0.0;
-
-      if (threadIdx.x == 0 && i + threadIdx.y < iend)
-      {
-         colA = read_only_load(ja + i + threadIdx.y);
-         valA = read_only_load(aa + i + threadIdx.y);
-      }
-
-#if 0
-      //const HYPRE_Int ymask = get_mask<4>(lane_id);
-      // TODO: need to confirm the behavior of __ballot_sync, leave it here for now
-      //const HYPRE_Int num_valid_rows = __popc(__ballot_sync(ymask, valid_i));
-      //for (HYPRE_Int j = 0; j < num_valid_rows; j++)
-#endif
-
-      /* threads in the same ygroup work on one row together */
-      const HYPRE_Int     rowB = __shfl_sync(HYPRE_WARP_FULL_MASK, colA, 0, blockDim.x);
-      const HYPRE_Complex mult = __shfl_sync(HYPRE_WARP_FULL_MASK, valA, 0, blockDim.x);
-      /* open this row of B, collectively */
-      HYPRE_Int tmp = 0;
-      if (rowB != -1 && threadIdx.x < 2)
-      {
-         tmp = read_only_load(ib+rowB+threadIdx.x);
-      }
-      const HYPRE_Int rowB_start = __shfl_sync(HYPRE_WARP_FULL_MASK, tmp, 0, blockDim.x);
-      const HYPRE_Int rowB_end   = __shfl_sync(HYPRE_WARP_FULL_MASK, tmp, 1, blockDim.x);
-
-      for (HYPRE_Int k = rowB_start + threadIdx.x; __any_sync(HYPRE_WARP_FULL_MASK, k < rowB_end); k += blockDim.x)
-      {
-         if (k < rowB_end)
-         {
-            const HYPRE_Int     k_idx = read_only_load(jb + k);
-            const HYPRE_Complex k_val = read_only_load(ab + k) * mult;
-            /* first try to insert into shared memory hash table */
-            HYPRE_Int pos = hypre_spgemm_hash_insert_numer<HashType, FAILED_SYMBL>
-               (s_HashSize, s_HashKeys, s_HashVals, k_idx, k_val, num_new_insert);
-
-            if (-1 == pos)
-            {
-               pos = hypre_spgemm_hash_insert_numer<HashType, FAILED_SYMBL>
-                     (g_HashSize, g_HashKeys, g_HashVals, k_idx, k_val, num_new_insert);
-            }
-
-            hypre_device_assert(pos != -1);
-         }
-      }
-   }
-
-   return num_new_insert;
-}
-
-template <HYPRE_Int NUM_WARPS_PER_BLOCK, HYPRE_Int SHMEM_HASH_SIZE>
-static __device__ __forceinline__
-HYPRE_Int
-hypre_spgemm_copy_from_hash_into_C_row( HYPRE_Int      lane_id,
-                               volatile HYPRE_Int     *s_HashKeys,
-                               volatile HYPRE_Complex *s_HashVals,
-                                        HYPRE_Int      ghash_size,
-                                        HYPRE_Int     *jg_start,
-                                        HYPRE_Complex *ag_start,
-                                        HYPRE_Int     *jc_start,
-                                        HYPRE_Complex *ac_start)
-{
-   HYPRE_Int j = 0;
-
-   /* copy shared memory hash table into C */
-#pragma unroll
-   for (HYPRE_Int k = lane_id; k < SHMEM_HASH_SIZE; k += HYPRE_WARP_SIZE)
-   {
-      HYPRE_Int key, sum, pos;
-      key = s_HashKeys[k];
-      HYPRE_Int in = key != -1;
-      pos = warp_prefix_sum(lane_id, in, sum);
-      if (key != -1)
-      {
-         jc_start[j + pos] = key;
-         ac_start[j + pos] = s_HashVals[k];
-      }
-      j += sum;
-   }
-
-   /* copy global memory hash table into C */
-#pragma unroll
-   for (HYPRE_Int k = 0; k < ghash_size; k += HYPRE_WARP_SIZE)
-   {
-      HYPRE_Int key = -1, sum, pos;
-      if (k + lane_id < ghash_size)
-      {
-         key = jg_start[k + lane_id];
-      }
-      HYPRE_Int in = key != -1;
-      pos = warp_prefix_sum(lane_id, in, sum);
-      if (key != -1)
-      {
-         jc_start[j + pos] = key;
-         ac_start[j + pos] = ag_start[k + lane_id];
-      }
-      j += sum;
-   }
-
-   return j;
-}
-
-template <HYPRE_Int NUM_WARPS_PER_BLOCK, HYPRE_Int SHMEM_HASH_SIZE, HYPRE_Int FAILED_SYMBL, char HashType>
-__global__ void
-hypre_spgemm_numeric( HYPRE_Int      M, /* HYPRE_Int K, HYPRE_Int N, */
-                      HYPRE_Int     *ia,
-                      HYPRE_Int     *ja,
-                      HYPRE_Complex *aa,
-                      HYPRE_Int     *ib,
-                      HYPRE_Int     *jb,
-                      HYPRE_Complex *ab,
-                      HYPRE_Int     *ic,
-                      HYPRE_Int     *jc,
-                      HYPRE_Complex *ac,
-                      HYPRE_Int     *rc,
-                      HYPRE_Int     *ig,
-                      HYPRE_Int     *jg,
-                      HYPRE_Complex *ag)
-{
-   volatile const HYPRE_Int num_warps = NUM_WARPS_PER_BLOCK * gridDim.x;
-   /* warp id inside the block */
-   volatile const HYPRE_Int warp_id = get_warp_id();
-   /* warp id in the grid */
-   volatile const HYPRE_Int grid_warp_id = blockIdx.x * NUM_WARPS_PER_BLOCK + warp_id;
-   /* lane id inside the warp */
-   volatile HYPRE_Int lane_id = get_lane_id();
-   /* shared memory hash table */
-#if 1
-   __shared__ volatile HYPRE_Int     s_HashKeys[NUM_WARPS_PER_BLOCK * SHMEM_HASH_SIZE];
-   __shared__ volatile HYPRE_Complex s_HashVals[NUM_WARPS_PER_BLOCK * SHMEM_HASH_SIZE];
-#else
-   extern __shared__ volatile HYPRE_Int shared_mem[];
-   volatile HYPRE_Int *s_HashKeys = shared_mem;
-   volatile HYPRE_Complex *s_HashVals = (volatile HYPRE_Complex *) &s_HashKeys[NUM_WARPS_PER_BLOCK * SHMEM_HASH_SIZE];
-#endif
-   /* shared memory hash table for this warp */
-   volatile HYPRE_Int     *warp_s_HashKeys = s_HashKeys + warp_id * SHMEM_HASH_SIZE;
-   volatile HYPRE_Complex *warp_s_HashVals = s_HashVals + warp_id * SHMEM_HASH_SIZE;
-
-   hypre_device_assert(blockDim.z              == NUM_WARPS_PER_BLOCK);
-   hypre_device_assert(blockDim.x * blockDim.y == HYPRE_WARP_SIZE);
-
-   /* a warp working on the ith row */
-   for (HYPRE_Int i = grid_warp_id; i < M; i += num_warps)
-   {
-      /* start/end position of global memory hash table */
-      HYPRE_Int j = -1, istart_g = 0, iend_g = 0, ghash_size = 0, jsum;
-
-      if (ig)
-      {
-         if (lane_id < 2)
-         {
-            j = read_only_load(ig + grid_warp_id + lane_id);
-         }
-         istart_g = __shfl_sync(HYPRE_WARP_FULL_MASK, j, 0);
-         iend_g   = __shfl_sync(HYPRE_WARP_FULL_MASK, j, 1);
-
-         /* size of global hash table allocated for this row
-            (must be power of 2 and >= the actual size of the row of C) */
-         ghash_size = iend_g - istart_g;
-
-         /* initialize warp's global memory hash table */
-#pragma unroll
-         for (HYPRE_Int k = lane_id; k < ghash_size; k += HYPRE_WARP_SIZE)
-         {
-            jg[istart_g+k] = -1;
-            ag[istart_g+k] = 0.0;
-         }
-      }
-
-      /* initialize warp's shared memory hash table */
-#pragma unroll
-      for (HYPRE_Int k = lane_id; k < SHMEM_HASH_SIZE; k += HYPRE_WARP_SIZE)
-      {
-         warp_s_HashKeys[k] = -1;
-         warp_s_HashVals[k] = 0.0;
-      }
-
-      __syncwarp();
-
-      /* work with two hash tables. jsum is the (exact) nnz for row i */
-      jsum = hypre_spgemm_compute_row_numer<FAILED_SYMBL, HashType>(i, lane_id, ia, ja, aa, ib, jb, ab,
-                                                                    SHMEM_HASH_SIZE, warp_s_HashKeys,
-                                                                    warp_s_HashVals,
-                                                                    ghash_size, jg + istart_g, ag + istart_g);
-
-      if (FAILED_SYMBL)
-      {
-         /* in the case when symb mult was failed, save row nnz into rc */
-         /* num of nonzeros of this row of C (exact) */
-         jsum = warp_reduce_sum(jsum);
-         if (lane_id == 0)
-         {
-            rc[i] = jsum;
-         }
-      }
-
-      /* copy results into the final C */
-      /* start/end position in C */
-#ifdef HYPRE_DEBUG
-      if (lane_id < 2)
-      {
-         j = read_only_load(ic + i + lane_id);
-      }
-      HYPRE_Int istart_c = __shfl_sync(HYPRE_WARP_FULL_MASK, j, 0);
-      HYPRE_Int iend_c   = __shfl_sync(HYPRE_WARP_FULL_MASK, j, 1);
-#else
-      if (lane_id < 1)
-      {
-         j = read_only_load(ic + i);
-      }
-      HYPRE_Int istart_c = __shfl_sync(HYPRE_WARP_FULL_MASK, j, 0);
-#endif
-
-      j = hypre_spgemm_copy_from_hash_into_C_row<NUM_WARPS_PER_BLOCK, SHMEM_HASH_SIZE>
-         (lane_id, warp_s_HashKeys, warp_s_HashVals, ghash_size, jg + istart_g,
-          ag + istart_g, jc + istart_c, ac + istart_c);
-
-#if defined(HYPRE_DEBUG)
-      if (FAILED_SYMBL)
-      {
-         hypre_device_assert(istart_c + j <= iend_c);
-      }
-      else
-      {
-         hypre_device_assert(istart_c + j == iend_c);
-      }
-#endif
-   }
-}
-
-template <HYPRE_Int NUM_WARPS_PER_BLOCK>
-__global__ void
-hypre_spgemm_copy_from_Cext_into_C( HYPRE_Int      M,
-                                    HYPRE_Int     *ix,
-                                    HYPRE_Int     *jx,
-                                    HYPRE_Complex *ax,
-                                    HYPRE_Int     *ic,
-                                    HYPRE_Int     *jc,
-                                    HYPRE_Complex *ac )
-{
-   const HYPRE_Int num_warps = NUM_WARPS_PER_BLOCK * gridDim.x;
-   /* warp id inside the block */
-   const HYPRE_Int warp_id = get_warp_id();
-   /* lane id inside the warp */
-   volatile const HYPRE_Int lane_id = get_lane_id();
-
-   hypre_device_assert(blockDim.x * blockDim.y == HYPRE_WARP_SIZE);
-
-   for (HYPRE_Int i = blockIdx.x * NUM_WARPS_PER_BLOCK + warp_id;
-                  i < M;
-                  i += num_warps)
-   {
-      HYPRE_Int kc = 0, kx = 0;
-
-      /* start/end position in C and X*/
-      if (lane_id < 2)
-      {
-         kc = read_only_load(ic + i + lane_id);
-         kx = read_only_load(ix + i + lane_id);
-      }
-      HYPRE_Int istart_c = __shfl_sync(HYPRE_WARP_FULL_MASK, kc, 0);
-      HYPRE_Int iend_c   = __shfl_sync(HYPRE_WARP_FULL_MASK, kc, 1);
-      HYPRE_Int istart_x = __shfl_sync(HYPRE_WARP_FULL_MASK, kx, 0);
-#if defined(HYPRE_DEBUG)
-      HYPRE_Int iend_x   = __shfl_sync(HYPRE_WARP_FULL_MASK, kx, 1);
-      hypre_device_assert(iend_c - istart_c <= iend_x - istart_x);
-#endif
-
-      HYPRE_Int p = istart_x - istart_c;
-      for (HYPRE_Int k = istart_c + lane_id; k < iend_c; k += HYPRE_WARP_SIZE)
-      {
-         jc[k] = jx[k+p];
-         ac[k] = ax[k+p];
-      }
-   }
-}
-
-/* SpGeMM with Rownnz/Upper bound */
-template <HYPRE_Int shmem_hash_size, HYPRE_Int exact_rownnz, char hash_type>
-HYPRE_Int
-hypre_spgemm_numerical_with_rownnz( HYPRE_Int       m,
-                                    HYPRE_Int       k,
-                                    HYPRE_Int       n,
-                                    HYPRE_Int      *d_ia,
-                                    HYPRE_Int      *d_ja,
-                                    HYPRE_Complex  *d_a,
-                                    HYPRE_Int      *d_ib,
-                                    HYPRE_Int      *d_jb,
-                                    HYPRE_Complex  *d_b,
-                                    HYPRE_Int      *d_rc,
-                                    HYPRE_Int     **d_ic_out,
-                                    HYPRE_Int     **d_jc_out,
-                                    HYPRE_Complex **d_c_out,
-                                    HYPRE_Int      *nnzC)
-{
-#ifdef HYPRE_PROFILE
-   hypre_profile_times[HYPRE_TIMER_ID_SPMM_NUMERIC] -= hypre_MPI_Wtime();
-#endif
-
-#if defined(HYPRE_USING_CUDA)
-   const HYPRE_Int num_warps_per_block = 16;
-   const HYPRE_Int BDIMX               =  2;
-#elif defined(HYPRE_USING_HIP)
-   const HYPRE_Int num_warps_per_block = 16;
-   const HYPRE_Int BDIMX               =  4;
-#endif
-   const HYPRE_Int BDIMY               = HYPRE_WARP_SIZE / BDIMX;
-
-#if 0
-   const size_t    shmem_size          = num_warps_per_block * shmem_hash_size * (sizeof(HYPRE_Complex) + sizeof(HYPRE_Int));
-   const HYPRE_Int shmem_maxbytes      = 65536;
-   hypre_assert(shmem_size <= shmem_maxbytes);
-   /* CUDA V100 */
-   hypre_int v1, v2;
-   cudaDeviceGetAttribute(&v1, cudaDevAttrMaxSharedMemoryPerBlock,      hypre_HandleCudaDevice(hypre_handle()));
-   cudaDeviceGetAttribute(&v2, cudaDevAttrMaxSharedMemoryPerBlockOptin, hypre_HandleCudaDevice(hypre_handle()));
-
-   if (shmem_maxbytes > 49152)
-   {
-      HYPRE_CUDA_CALL( cudaFuncSetAttribute(hypre_spgemm_numeric<num_warps_per_block, shmem_hash_size, !exact_rownnz, hash_type>,
-                       cudaFuncAttributeMaxDynamicSharedMemorySize, shmem_maxbytes) );
-   }
-#endif
-
-   /* CUDA kernel configurations */
-   dim3 bDim(BDIMX, BDIMY, num_warps_per_block);
-   hypre_assert(bDim.x * bDim.y == HYPRE_WARP_SIZE);
-   // for cases where one WARP works on a row
-   HYPRE_Int num_warps = hypre_min(m, HYPRE_MAX_NUM_WARPS);
-   dim3 gDim( (num_warps + bDim.z - 1) / bDim.z );
-   // number of active warps
-   HYPRE_Int num_act_warps = hypre_min(bDim.z * gDim.x, m);
-
-   /* ---------------------------------------------------------------------------
-    * build hash table
-    * ---------------------------------------------------------------------------*/
-   HYPRE_Int     *d_ghash_i = NULL;
-   HYPRE_Int     *d_ghash_j = NULL;
-   HYPRE_Complex *d_ghash_a = NULL;
-
-   /* RL Note: even with exact_rownnz, still may need global hash, since shared hash has different size from symbol. */
-   hypre_SpGemmCreateGlobalHashTable(m, NULL, num_act_warps, d_rc, shmem_hash_size,
-                                     &d_ghash_i, &d_ghash_j, &d_ghash_a, NULL, 1);
-
-   /* ---------------------------------------------------------------------------
-    * numerical multiplication:
-    * ---------------------------------------------------------------------------*/
-   /* if rc contains exact_rownnz: can allocate the final C=(ic,jc,c) directly;
-      if rc contains upper bound : it is a temporary space that is more than enough to store C */
-   HYPRE_Int     *d_ic = hypre_TAlloc(HYPRE_Int, m + 1, HYPRE_MEMORY_DEVICE);
-   HYPRE_Int     *d_jc;
-   HYPRE_Complex *d_c;
-   HYPRE_Int      nnzC_nume;
-
-   hypre_create_ija(m, d_rc, d_ic, &d_jc, &d_c, &nnzC_nume);
-
-   HYPRE_CUDA_LAUNCH ( (hypre_spgemm_numeric<num_warps_per_block, shmem_hash_size, !exact_rownnz, hash_type>),
-                        gDim, bDim, /* shmem_size, */
-                        m, /* k, n, */ d_ia, d_ja, d_a, d_ib, d_jb, d_b, d_ic, d_jc, d_c, d_rc,
-                        d_ghash_i, d_ghash_j, d_ghash_a );
-
-   /* post-processing */
-   if (!exact_rownnz)
-   {
-      HYPRE_Int nnzC_nume_new = hypreDevice_IntegerReduceSum(m, d_rc);
-
-      hypre_assert(nnzC_nume_new <= nnzC_nume);
-
-      if (nnzC_nume_new < nnzC_nume)
-      {
-         HYPRE_Int     *d_ic_new = hypre_TAlloc(HYPRE_Int, m + 1, HYPRE_MEMORY_DEVICE);
-         HYPRE_Int     *d_jc_new;
-         HYPRE_Complex *d_c_new;
-         HYPRE_Int      tmp;
-
-         /* alloc final C */
-         hypre_create_ija(m, d_rc, d_ic_new, &d_jc_new, &d_c_new, &tmp);
-         hypre_assert(tmp == nnzC_nume_new);
-
-         /* copy to the final C */
-         dim3 gDim( (m + bDim.z - 1) / bDim.z );
-         HYPRE_CUDA_LAUNCH( (hypre_spgemm_copy_from_Cext_into_C<num_warps_per_block>), gDim, bDim,
-                            m, d_ic, d_jc, d_c, d_ic_new, d_jc_new, d_c_new );
-
-         hypre_TFree(d_ic, HYPRE_MEMORY_DEVICE);
-         hypre_TFree(d_jc, HYPRE_MEMORY_DEVICE);
-         hypre_TFree(d_c,  HYPRE_MEMORY_DEVICE);
-
-         d_ic = d_ic_new;
-         d_jc = d_jc_new;
-         d_c  = d_c_new;
-         nnzC_nume = nnzC_nume_new;
-      }
-   }
-
-   hypre_TFree(d_ghash_i, HYPRE_MEMORY_DEVICE);
-   hypre_TFree(d_ghash_j, HYPRE_MEMORY_DEVICE);
-   hypre_TFree(d_ghash_a, HYPRE_MEMORY_DEVICE);
-
-   *d_ic_out = d_ic;
-   *d_jc_out = d_jc;
-   *d_c_out  = d_c;
-   *nnzC     = nnzC_nume;
-
-#ifdef HYPRE_PROFILE
-   cudaThreadSynchronize();
-   hypre_profile_times[HYPRE_TIMER_ID_SPMM_NUMERIC] += hypre_MPI_Wtime();
-#endif
-
-   return hypre_error_flag;
-}
-
-HYPRE_Int
-hypreDevice_CSRSpGemmNumerWithRownnzUpperbound( HYPRE_Int       m,
-                                                HYPRE_Int       k,
-                                                HYPRE_Int       n,
-                                                HYPRE_Int      *d_ia,
-                                                HYPRE_Int      *d_ja,
-                                                HYPRE_Complex  *d_a,
-                                                HYPRE_Int      *d_ib,
-                                                HYPRE_Int      *d_jb,
-                                                HYPRE_Complex  *d_b,
-                                                HYPRE_Int      *d_rc,         /* input: nnz (upper bound) of each row */
-                                                HYPRE_Int       exact_rownnz, /* if d_rc is exact       */
-                                                HYPRE_Int     **d_ic_out,
-                                                HYPRE_Int     **d_jc_out,
-                                                HYPRE_Complex **d_c_out,
-                                                HYPRE_Int      *nnzC )
-{
-   const HYPRE_Int shmem_hash_size = HYPRE_SPGEMM_NUMER_HASH_SIZE;
-   const char      hash_type       = hypre_HandleSpgemmHashType(hypre_handle());
-
-   if (hash_type != 'L' && hash_type != 'Q' && hash_type != 'D')
-   {
-      hypre_printf("Unrecognized hash type ... [L(inear), Q(uadratic), D(ouble)]\n");
-      exit(0);
-   }
-
-   //HYPRE_Int max_rc = HYPRE_THRUST_CALL(reduce, d_rc, d_rc + m, 0, thrust::maximum<HYPRE_Int>());
-   //hypre_printf("max_rc numerical %d\n", max_rc);
-
-   if (exact_rownnz)
-   {
-      if (hash_type == 'L')
-      {
-         hypre_spgemm_numerical_with_rownnz<shmem_hash_size, 1, 'L'>
-            (m, k, n, d_ia, d_ja, d_a, d_ib, d_jb, d_b, d_rc, d_ic_out, d_jc_out, d_c_out, nnzC);
-      }
-      else if (hash_type == 'Q')
-      {
-         hypre_spgemm_numerical_with_rownnz<shmem_hash_size, 1, 'Q'>
-            (m, k, n, d_ia, d_ja, d_a, d_ib, d_jb, d_b, d_rc, d_ic_out, d_jc_out, d_c_out, nnzC);
-      }
-      else if (hash_type == 'D')
-      {
-         hypre_spgemm_numerical_with_rownnz<shmem_hash_size, 1, 'D'>
-            (m, k, n, d_ia, d_ja, d_a, d_ib, d_jb, d_b, d_rc, d_ic_out, d_jc_out, d_c_out, nnzC);
-      }
-   }
-   else
-   {
-      if (hash_type == 'L')
-      {
-         hypre_spgemm_numerical_with_rownnz<shmem_hash_size, 0, 'L'>
-            (m, k, n, d_ia, d_ja, d_a, d_ib, d_jb, d_b, d_rc, d_ic_out, d_jc_out, d_c_out, nnzC);
-      }
-      else if (hash_type == 'Q')
-      {
-         hypre_spgemm_numerical_with_rownnz<shmem_hash_size, 0, 'Q'>
-            (m, k, n, d_ia, d_ja, d_a, d_ib, d_jb, d_b, d_rc, d_ic_out, d_jc_out, d_c_out, nnzC);
-      }
-      else if (hash_type == 'D')
-      {
-         hypre_spgemm_numerical_with_rownnz<shmem_hash_size, 0, 'D'>
-            (m, k, n, d_ia, d_ja, d_a, d_ib, d_jb, d_b, d_rc, d_ic_out, d_jc_out, d_c_out, nnzC);
-      }
-   }
-
-   return hypre_error_flag;
-}
-#endif /* HYPRE_USING_CUDA  || defined(HYPRE_USING_HIP) */
-
diff --git a/external/hypre/src/seq_mv/csr_spgemm_device_cusparse.c b/external/hypre/src/seq_mv/csr_spgemm_device_cusparse.c
index c8ade7b1..fa275553 100644
--- a/external/hypre/src/seq_mv/csr_spgemm_device_cusparse.c
+++ b/external/hypre/src/seq_mv/csr_spgemm_device_cusparse.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -8,6 +8,7 @@
 #include "seq_mv.h"
 #include "_hypre_utilities.hpp"
 #include "seq_mv.hpp"
+#include "csr_spgemm_device.h"
 
 #if defined(HYPRE_USING_CUDA) && defined(HYPRE_USING_CUSPARSE)
 
@@ -36,6 +37,9 @@ hypreDevice_CSRSpGemmCusparse(HYPRE_Int          m,
                                            nnzA, d_ia, d_ja, d_a,
                                            nnzB, d_ib, d_jb, d_b,
                                            nnzC_out, d_ic_out, d_jc_out, d_c_out);
+   HYPRE_UNUSED_VAR(descr_A);
+   HYPRE_UNUSED_VAR(descr_B);
+   HYPRE_UNUSED_VAR(descr_C);
 #else
    hypreDevice_CSRSpGemmCusparseOldAPI(m, k, n,
                                        descr_A, nnzA, d_ia, d_ja, d_a,
@@ -87,9 +91,10 @@ hypreDevice_CSRSpGemmCusparseGenericAPI(HYPRE_Int       m,
    cusparseHandle_t cusparsehandle = hypre_HandleCusparseHandle(hypre_handle());
 
    //Initialize the descriptors for the mats
+   HYPRE_Int *d_ic = hypre_TAlloc(HYPRE_Int, m + 1, HYPRE_MEMORY_DEVICE);
    cusparseSpMatDescr_t matA = hypre_CSRMatrixToCusparseSpMat_core(m, k, 0, nnzA, d_ia, d_ja, d_a);
    cusparseSpMatDescr_t matB = hypre_CSRMatrixToCusparseSpMat_core(k, n, 0, nnzB, d_ib, d_jb, d_b);
-   cusparseSpMatDescr_t matC = hypre_CSRMatrixToCusparseSpMat_core(m, n, 0, 0,    NULL, NULL, NULL);
+   cusparseSpMatDescr_t matC = hypre_CSRMatrixToCusparseSpMat_core(m, n, 0, 0,    d_ic, NULL, NULL);
    cusparseOperation_t opA = CUSPARSE_OPERATION_NON_TRANSPOSE;
    cusparseOperation_t opB = CUSPARSE_OPERATION_NON_TRANSPOSE;
 
@@ -105,6 +110,15 @@ hypreDevice_CSRSpGemmCusparseGenericAPI(HYPRE_Int       m,
    void *dBuffer1 = NULL;
    void *dBuffer2 = NULL;
 
+#ifdef HYPRE_SPGEMM_TIMING
+   HYPRE_Real t1, t2;
+#endif
+
+#ifdef HYPRE_SPGEMM_TIMING
+   hypre_ForceSyncComputeStream();
+   t1 = hypre_MPI_Wtime();
+#endif
+
    /* Do work estimation */
    HYPRE_CUSPARSE_CALL( cusparseSpGEMM_workEstimation(cusparsehandle, opA, opB,
                                                       &alpha, matA, matB, &beta, matC,
@@ -117,6 +131,16 @@ hypreDevice_CSRSpGemmCusparseGenericAPI(HYPRE_Int       m,
                                                       computeType, CUSPARSE_SPGEMM_DEFAULT,
                                                       spgemmDesc, &bufferSize1, dBuffer1) );
 
+#ifdef HYPRE_SPGEMM_TIMING
+   hypre_ForceSyncComputeStream();
+   t2 = hypre_MPI_Wtime() - t1;
+   hypre_printf("WorkEst %f\n", t2);
+#endif
+
+#ifdef HYPRE_SPGEMM_TIMING
+   t1 = hypre_MPI_Wtime();
+#endif
+
    /* Do computation */
    HYPRE_CUSPARSE_CALL( cusparseSpGEMM_compute(cusparsehandle, opA, opB,
                                                &alpha, matA, matB, &beta, matC,
@@ -130,9 +154,19 @@ hypreDevice_CSRSpGemmCusparseGenericAPI(HYPRE_Int       m,
                                                computeType, CUSPARSE_SPGEMM_DEFAULT,
                                                spgemmDesc, &bufferSize2, dBuffer2) );
 
+#ifdef HYPRE_SPGEMM_TIMING
+   hypre_ForceSyncComputeStream();
+   t2 = hypre_MPI_Wtime() - t1;
+   hypre_printf("Compute %f\n", t2);
+#endif
+
+#ifdef HYPRE_SPGEMM_TIMING
+   t1 = hypre_MPI_Wtime();
+#endif
+
    /* Required by cusparse api (as of 11) to be int64_t */
    int64_t C_num_rows, C_num_cols, nnzC;
-   HYPRE_Int *d_ic, *d_jc;
+   HYPRE_Int *d_jc;
    HYPRE_Complex *d_c;
 
    /* Get required information for C */
@@ -141,19 +175,24 @@ hypreDevice_CSRSpGemmCusparseGenericAPI(HYPRE_Int       m,
    hypre_assert(C_num_rows == m);
    hypre_assert(C_num_cols == n);
 
-   d_ic = hypre_TAlloc(HYPRE_Int,     C_num_rows+1, HYPRE_MEMORY_DEVICE);
-   d_jc = hypre_TAlloc(HYPRE_Int,     nnzC,         HYPRE_MEMORY_DEVICE);
-   d_c  = hypre_TAlloc(HYPRE_Complex, nnzC,         HYPRE_MEMORY_DEVICE);
+   d_jc = hypre_TAlloc(HYPRE_Int,     nnzC, HYPRE_MEMORY_DEVICE);
+   d_c  = hypre_TAlloc(HYPRE_Complex, nnzC, HYPRE_MEMORY_DEVICE);
 
    /* Setup the required descriptor for C */
    HYPRE_CUSPARSE_CALL(cusparseCsrSetPointers(matC, d_ic, d_jc, d_c));
 
    /* Copy the data into C */
-   HYPRE_CUSPARSE_CALL(cusparseSpGEMM_copy( cusparsehandle, opA, opB, 
-                                            &alpha, matA, matB, &beta, matC, 
+   HYPRE_CUSPARSE_CALL(cusparseSpGEMM_copy( cusparsehandle, opA, opB,
+                                            &alpha, matA, matB, &beta, matC,
                                             computeType, CUSPARSE_SPGEMM_DEFAULT,
                                             spgemmDesc) );
 
+#ifdef HYPRE_SPGEMM_TIMING
+   hypre_ForceSyncComputeStream();
+   t2 = hypre_MPI_Wtime() - t1;
+   hypre_printf("Copy %f\n", t2);
+#endif
+
    /* Cleanup the data */
    HYPRE_CUSPARSE_CALL( cusparseSpGEMM_destroyDescr(spgemmDesc) );
    HYPRE_CUSPARSE_CALL( cusparseDestroySpMat(matA) );
@@ -198,6 +237,14 @@ hypreDevice_CSRSpGemmCusparseOldAPI(HYPRE_Int          m,
    HYPRE_Int  *d_ja_sorted, *d_jb_sorted;
    HYPRE_Complex *d_c, *d_a_sorted, *d_b_sorted;
 
+#ifdef HYPRE_SPGEMM_TIMING
+   HYPRE_Real t1, t2;
+#endif
+
+#ifdef HYPRE_SPGEMM_TIMING
+   t1 = hypre_MPI_Wtime();
+#endif
+
    /* Allocate space for sorted arrays */
    d_a_sorted  = hypre_TAlloc(HYPRE_Complex, nnzA, HYPRE_MEMORY_DEVICE);
    d_b_sorted  = hypre_TAlloc(HYPRE_Complex, nnzB, HYPRE_MEMORY_DEVICE);
@@ -208,11 +255,6 @@ hypreDevice_CSRSpGemmCusparseOldAPI(HYPRE_Int          m,
    cusparseOperation_t transA = CUSPARSE_OPERATION_NON_TRANSPOSE;
    cusparseOperation_t transB = CUSPARSE_OPERATION_NON_TRANSPOSE;
 
-   HYPRE_Int isDoublePrecision = sizeof(HYPRE_Complex) == sizeof(hypre_double);
-   HYPRE_Int isSinglePrecision = sizeof(HYPRE_Complex) == sizeof(hypre_double) / 2;
-
-   hypre_assert(isDoublePrecision || isSinglePrecision);
-
    /* Copy the unsorted over as the initial "sorted" */
    hypre_TMemcpy(d_ja_sorted, d_ja, HYPRE_Int,     nnzA, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
    hypre_TMemcpy(d_a_sorted,  d_a,  HYPRE_Complex, nnzA, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
@@ -223,11 +265,21 @@ hypreDevice_CSRSpGemmCusparseOldAPI(HYPRE_Int          m,
    hypre_SortCSRCusparse(m, k, nnzA, descr_A, d_ia, d_ja_sorted, d_a_sorted);
    hypre_SortCSRCusparse(k, n, nnzB, descr_B, d_ib, d_jb_sorted, d_b_sorted);
 
+#ifdef HYPRE_SPGEMM_TIMING
+   hypre_ForceSyncComputeStream();
+   t2 = hypre_MPI_Wtime() - t1;
+   hypre_printf("sort %f\n", t2);
+#endif
+
+#ifdef HYPRE_SPGEMM_TIMING
+   t1 = hypre_MPI_Wtime();
+#endif
+
    // nnzTotalDevHostPtr points to host memory
    HYPRE_Int *nnzTotalDevHostPtr = &nnzC;
    HYPRE_CUSPARSE_CALL( cusparseSetPointerMode(cusparsehandle, CUSPARSE_POINTER_MODE_HOST) );
 
-   d_ic = hypre_TAlloc(HYPRE_Int, m+1, HYPRE_MEMORY_DEVICE);
+   d_ic = hypre_TAlloc(HYPRE_Int, m + 1, HYPRE_MEMORY_DEVICE);
 
    HYPRE_CUSPARSE_CALL( cusparseXcsrgemmNnz(cusparsehandle, transA, transB,
                                             m, n, k,
@@ -247,23 +299,29 @@ hypreDevice_CSRSpGemmCusparseOldAPI(HYPRE_Int          m,
       nnzC -= baseC;
    }
 
+#ifdef HYPRE_SPGEMM_TIMING
+   hypre_ForceSyncComputeStream();
+   t2 = hypre_MPI_Wtime() - t1;
+   hypre_printf("csrgemmNnz %f\n", t2);
+#endif
+
+#ifdef HYPRE_SPGEMM_TIMING
+   t1 = hypre_MPI_Wtime();
+#endif
+
    d_jc = hypre_TAlloc(HYPRE_Int,     nnzC, HYPRE_MEMORY_DEVICE);
    d_c  = hypre_TAlloc(HYPRE_Complex, nnzC, HYPRE_MEMORY_DEVICE);
 
-   if (isDoublePrecision)
-   {
-      HYPRE_CUSPARSE_CALL( cusparseDcsrgemm(cusparsehandle, transA, transB, m, n, k,
-                                            descr_A, nnzA, d_a_sorted, d_ia, d_ja_sorted,
-                                            descr_B, nnzB, d_b_sorted, d_ib, d_jb_sorted,
-                                            descr_C,       d_c, d_ic, d_jc) );
-   }
-   else if (isSinglePrecision)
-   {
-      HYPRE_CUSPARSE_CALL( cusparseScsrgemm(cusparsehandle, transA, transB, m, n, k,
-                                            descr_A, nnzA, (float *) d_a_sorted, d_ia, d_ja_sorted,
-                                            descr_B, nnzB, (float *) d_b_sorted, d_ib, d_jb_sorted,
-                                            descr_C,       (float *) d_c, d_ic, d_jc) );
-   }
+   HYPRE_CUSPARSE_CALL( hypre_cusparse_csrgemm(cusparsehandle, transA, transB, m, n, k,
+                                               descr_A, nnzA, d_a_sorted, d_ia, d_ja_sorted,
+                                               descr_B, nnzB, d_b_sorted, d_ib, d_jb_sorted,
+                                               descr_C,       d_c, d_ic, d_jc) );
+
+#ifdef HYPRE_SPGEMM_TIMING
+   hypre_ForceSyncComputeStream();
+   t2 = hypre_MPI_Wtime() - t1;
+   hypre_printf("csrgemm %f\n", t2);
+#endif
 
    *d_ic_out = d_ic;
    *d_jc_out = d_jc;
@@ -280,4 +338,3 @@ hypreDevice_CSRSpGemmCusparseOldAPI(HYPRE_Int          m,
 
 #endif /* #if CUSPARSE_VERSION >= CUSPARSE_NEWAPI_VERSION */
 #endif /* #if defined(HYPRE_USING_CUDA) && defined(HYPRE_USING_CUSPARSE) */
-
diff --git a/external/hypre/src/seq_mv/csr_spgemm_device_numblocks.c b/external/hypre/src/seq_mv/csr_spgemm_device_numblocks.c
new file mode 100644
index 00000000..cec1e56f
--- /dev/null
+++ b/external/hypre/src/seq_mv/csr_spgemm_device_numblocks.c
@@ -0,0 +1,149 @@
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+#include "seq_mv.h"
+
+#if defined(HYPRE_USING_GPU)
+
+#include "csr_spgemm_device.h"
+
+HYPRE_Int hypreDevice_CSRSpGemmBinnedGetBlockNumDim()
+{
+   hypre_int multiProcessorCount = 0;
+   /* bins 1, 2, ..., num_bins, are effective; 0 is reserved for empty rows */
+   const HYPRE_Int num_bins = 10;
+
+   hypre_HandleSpgemmNumBin(hypre_handle()) = num_bins;
+
+#if defined(HYPRE_USING_CUDA)
+   HYPRE_CUDA_CALL(cudaDeviceGetAttribute(
+                      &multiProcessorCount,
+                      cudaDevAttrMultiProcessorCount,
+                      hypre_HandleDevice(hypre_handle())));
+
+#elif defined(HYPRE_USING_HIP)
+   HYPRE_HIP_CALL(hipDeviceGetAttribute(
+                     &multiProcessorCount,
+                     hipDeviceAttributeMultiprocessorCount,
+                     hypre_HandleDevice(hypre_handle())));
+
+#elif defined(HYPRE_USING_SYCL)
+   multiProcessorCount =
+      hypre_HandleDevice(hypre_handle())->get_info<sycl::info::device::max_compute_units>();
+#endif
+
+   typedef HYPRE_Int arrType[4][HYPRE_SPGEMM_MAX_NBIN + 1];
+   arrType &max_nblocks = hypre_HandleSpgemmBlockNumDim(hypre_handle());
+
+   for (HYPRE_Int i = 0; i < num_bins + 1; i++)
+   {
+      max_nblocks[0][i] = max_nblocks[1][i] = max_nblocks[2][i] = max_nblocks[3][i] = 0;
+   }
+
+   /* symbolic */
+   hypre_spgemm_symbolic_max_num_blocks< SYMBL_HASH_SIZE[1], T_GROUP_SIZE[1] >
+   (multiProcessorCount, &max_nblocks[0][1], &max_nblocks[2][1]);
+
+   hypre_spgemm_symbolic_max_num_blocks< SYMBL_HASH_SIZE[2], T_GROUP_SIZE[2] >
+   (multiProcessorCount, &max_nblocks[0][2], &max_nblocks[2][2]);
+
+   hypre_spgemm_symbolic_max_num_blocks< SYMBL_HASH_SIZE[3], T_GROUP_SIZE[3] >
+   (multiProcessorCount, &max_nblocks[0][3], &max_nblocks[2][3]);
+
+   hypre_spgemm_symbolic_max_num_blocks< SYMBL_HASH_SIZE[4], T_GROUP_SIZE[4] >
+   (multiProcessorCount, &max_nblocks[0][4], &max_nblocks[2][4]);
+
+   hypre_spgemm_symbolic_max_num_blocks< SYMBL_HASH_SIZE[5], T_GROUP_SIZE[5] >
+   (multiProcessorCount, &max_nblocks[0][5], &max_nblocks[2][5]);
+
+   hypre_spgemm_symbolic_max_num_blocks< SYMBL_HASH_SIZE[6], T_GROUP_SIZE[6] >
+   (multiProcessorCount, &max_nblocks[0][6], &max_nblocks[2][6]);
+
+   hypre_spgemm_symbolic_max_num_blocks< SYMBL_HASH_SIZE[7], T_GROUP_SIZE[7] >
+   (multiProcessorCount, &max_nblocks[0][7], &max_nblocks[2][7]);
+
+   hypre_spgemm_symbolic_max_num_blocks< SYMBL_HASH_SIZE[8], T_GROUP_SIZE[8] >
+   (multiProcessorCount, &max_nblocks[0][8], &max_nblocks[2][8]);
+
+   hypre_spgemm_symbolic_max_num_blocks< SYMBL_HASH_SIZE[9], T_GROUP_SIZE[9] >
+   (multiProcessorCount, &max_nblocks[0][9], &max_nblocks[2][9]);
+
+   hypre_spgemm_symbolic_max_num_blocks< SYMBL_HASH_SIZE[10], T_GROUP_SIZE[10] >
+   (multiProcessorCount, &max_nblocks[0][10], &max_nblocks[2][10]);
+
+   /* numeric */
+   hypre_spgemm_numerical_max_num_blocks< NUMER_HASH_SIZE[1], T_GROUP_SIZE[1] >
+   (multiProcessorCount, &max_nblocks[1][1], &max_nblocks[3][1]);
+
+   hypre_spgemm_numerical_max_num_blocks< NUMER_HASH_SIZE[2], T_GROUP_SIZE[2] >
+   (multiProcessorCount, &max_nblocks[1][2], &max_nblocks[3][2]);
+
+   hypre_spgemm_numerical_max_num_blocks< NUMER_HASH_SIZE[3], T_GROUP_SIZE[3] >
+   (multiProcessorCount, &max_nblocks[1][3], &max_nblocks[3][3]);
+
+   hypre_spgemm_numerical_max_num_blocks< NUMER_HASH_SIZE[4], T_GROUP_SIZE[4] >
+   (multiProcessorCount, &max_nblocks[1][4], &max_nblocks[3][4]);
+
+   hypre_spgemm_numerical_max_num_blocks< NUMER_HASH_SIZE[5], T_GROUP_SIZE[5] >
+   (multiProcessorCount, &max_nblocks[1][5], &max_nblocks[3][5]);
+
+   hypre_spgemm_numerical_max_num_blocks< NUMER_HASH_SIZE[6], T_GROUP_SIZE[6] >
+   (multiProcessorCount, &max_nblocks[1][6], &max_nblocks[3][6]);
+
+   hypre_spgemm_numerical_max_num_blocks< NUMER_HASH_SIZE[7], T_GROUP_SIZE[7] >
+   (multiProcessorCount, &max_nblocks[1][7], &max_nblocks[3][7]);
+
+   hypre_spgemm_numerical_max_num_blocks< NUMER_HASH_SIZE[8], T_GROUP_SIZE[8] >
+   (multiProcessorCount, &max_nblocks[1][8], &max_nblocks[3][8]);
+
+   hypre_spgemm_numerical_max_num_blocks< NUMER_HASH_SIZE[9], T_GROUP_SIZE[9] >
+   (multiProcessorCount, &max_nblocks[1][9], &max_nblocks[3][9]);
+
+   hypre_spgemm_numerical_max_num_blocks< NUMER_HASH_SIZE[10], T_GROUP_SIZE[10] >
+   (multiProcessorCount, &max_nblocks[1][10], &max_nblocks[3][10]);
+
+   /* highest bin with nonzero num blocks */
+   typedef HYPRE_Int arr2Type[2];
+   arr2Type &high_bin = hypre_HandleSpgemmHighestBin(hypre_handle());
+
+   for (HYPRE_Int i = num_bins; i >= 0; i--) { if (max_nblocks[0][i] > 0) { high_bin[0] = i; break; } }
+   for (HYPRE_Int i = num_bins; i >= 0; i--) { if (max_nblocks[1][i] > 0) { high_bin[1] = i; break; } }
+
+   /* this is just a heuristic; having more blocks (than max active) seems improving performance */
+#if defined(HYPRE_USING_CUDA)
+   for (HYPRE_Int i = 0; i < num_bins + 1; i++) { max_nblocks[0][i] *= 5; max_nblocks[1][i] *= 5; }
+#endif
+
+#if defined(HYPRE_SPGEMM_PRINTF)
+   HYPRE_SPGEMM_PRINT("===========================================================================\n");
+   HYPRE_SPGEMM_PRINT("SM count %d\n", multiProcessorCount);
+   HYPRE_SPGEMM_PRINT("Highest Bin Symbl %d, Numer %d\n",
+                      hypre_HandleSpgemmHighestBin(hypre_handle())[0],
+                      hypre_HandleSpgemmHighestBin(hypre_handle())[1]);
+   HYPRE_SPGEMM_PRINT("---------------------------------------------------------------------------\n");
+   HYPRE_SPGEMM_PRINT("Bin:      ");
+   for (HYPRE_Int i = 0; i < num_bins + 1; i++) { HYPRE_SPGEMM_PRINT("%5d ", i); } HYPRE_SPGEMM_PRINT("\n");
+   HYPRE_SPGEMM_PRINT("---------------------------------------------------------------------------\n");
+   HYPRE_SPGEMM_PRINT("Sym-Bdim: ");
+   for (HYPRE_Int i = 0; i < num_bins + 1; i++) { HYPRE_SPGEMM_PRINT("%5d ", hypre_HandleSpgemmBlockNumDim(hypre_handle())[2][i]); }
+   HYPRE_SPGEMM_PRINT("\n");
+   HYPRE_SPGEMM_PRINT("Sym-Gdim: ");
+   for (HYPRE_Int i = 0; i < num_bins + 1; i++) { HYPRE_SPGEMM_PRINT("%5d ", hypre_HandleSpgemmBlockNumDim(hypre_handle())[0][i]); }
+   HYPRE_SPGEMM_PRINT("\n");
+   HYPRE_SPGEMM_PRINT("Num-Bdim: ");
+   for (HYPRE_Int i = 0; i < num_bins + 1; i++) { HYPRE_SPGEMM_PRINT("%5d ", hypre_HandleSpgemmBlockNumDim(hypre_handle())[3][i]); }
+   HYPRE_SPGEMM_PRINT("\n");
+   HYPRE_SPGEMM_PRINT("Num-Gdim: ");
+   for (HYPRE_Int i = 0; i < num_bins + 1; i++) { HYPRE_SPGEMM_PRINT("%5d ", hypre_HandleSpgemmBlockNumDim(hypre_handle())[1][i]); }
+   HYPRE_SPGEMM_PRINT("\n");
+   HYPRE_SPGEMM_PRINT("===========================================================================\n");
+#endif
+
+   return hypre_error_flag;
+}
+
+#endif /* defined(HYPRE_USING_GPU) */
diff --git a/external/hypre/src/seq_mv/csr_spgemm_device_numer.c b/external/hypre/src/seq_mv/csr_spgemm_device_numer.c
new file mode 100644
index 00000000..7d93d2b3
--- /dev/null
+++ b/external/hypre/src/seq_mv/csr_spgemm_device_numer.c
@@ -0,0 +1,238 @@
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+#include "_hypre_onedpl.hpp"
+#include "seq_mv.h"
+#include "csr_spgemm_device.h"
+
+#if defined(HYPRE_USING_GPU)
+
+/*
+ * d_rc: input: nnz (upper bound) of each row
+ * exact_rownnz: if d_rc is exact
+ */
+HYPRE_Int
+hypreDevice_CSRSpGemmNumerWithRownnzUpperboundNoBin( HYPRE_Int       m,
+                                                     HYPRE_Int       k,
+                                                     HYPRE_Int       n,
+                                                     HYPRE_Int      *d_ia,
+                                                     HYPRE_Int      *d_ja,
+                                                     HYPRE_Complex  *d_a,
+                                                     HYPRE_Int      *d_ib,
+                                                     HYPRE_Int      *d_jb,
+                                                     HYPRE_Complex  *d_b,
+                                                     HYPRE_Int      *d_rc,
+                                                     HYPRE_Int       exact_rownnz,
+                                                     HYPRE_Int     **d_ic_out,
+                                                     HYPRE_Int     **d_jc_out,
+                                                     HYPRE_Complex **d_c_out,
+                                                     HYPRE_Int      *nnzC_out )
+{
+   static constexpr HYPRE_Int SHMEM_HASH_SIZE = NUMER_HASH_SIZE[HYPRE_SPGEMM_DEFAULT_BIN];
+   static constexpr HYPRE_Int GROUP_SIZE = T_GROUP_SIZE[HYPRE_SPGEMM_DEFAULT_BIN];
+   static constexpr HYPRE_Int BIN = HYPRE_SPGEMM_DEFAULT_BIN;
+
+#ifdef HYPRE_SPGEMM_PRINTF
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_Int max_rc = HYPRE_ONEDPL_CALL(std::reduce, d_rc, d_rc + m, 0,
+                                        sycl::maximum<HYPRE_Int>());
+   HYPRE_Int min_rc = HYPRE_ONEDPL_CALL(std::reduce, d_rc, d_rc + m, max_rc,
+                                        sycl::minimum<HYPRE_Int>());
+#else
+   HYPRE_Int max_rc = HYPRE_THRUST_CALL(reduce, d_rc, d_rc + m, 0,      thrust::maximum<HYPRE_Int>());
+   HYPRE_Int min_rc = HYPRE_THRUST_CALL(reduce, d_rc, d_rc + m, max_rc, thrust::minimum<HYPRE_Int>());
+#endif
+   HYPRE_SPGEMM_PRINT("%s[%d]: max RC %d, min RC %d\n", __FILE__, __LINE__, max_rc, min_rc);
+#endif
+
+   /* if rc contains exact rownnz: can allocate the final C=(ic,jc,c) directly;
+      if rc contains upper bound : it is a temporary space that is more than enough to store C */
+   HYPRE_Int     *d_ic = hypre_TAlloc(HYPRE_Int, m + 1, HYPRE_MEMORY_DEVICE);
+   HYPRE_Int     *d_jc;
+   HYPRE_Complex *d_c;
+   HYPRE_Int      nnzC = -1;
+
+   hypre_create_ija(m, NULL, d_rc, d_ic, &d_jc, &d_c, &nnzC);
+
+#ifdef HYPRE_SPGEMM_PRINTF
+   HYPRE_SPGEMM_PRINT("%s[%d]: nnzC %d\n", __FILE__, __LINE__, nnzC);
+#endif
+
+
+   /* even with exact rownnz, still may need global hash, since shared hash is smaller than symbol */
+   hypre_spgemm_numerical_with_rownnz<BIN, SHMEM_HASH_SIZE, GROUP_SIZE, false>
+   (m, NULL, k, n, true, exact_rownnz, d_ia, d_ja, d_a, d_ib, d_jb, d_b, d_rc, d_ic, d_jc, d_c);
+
+   if (!exact_rownnz)
+   {
+      hypreDevice_CSRSpGemmNumerPostCopy<T_GROUP_SIZE[5]>(m, d_rc, &nnzC, &d_ic, &d_jc, &d_c);
+   }
+
+   *d_ic_out = d_ic;
+   *d_jc_out = d_jc;
+   *d_c_out  = d_c;
+   *nnzC_out = nnzC;
+
+   return hypre_error_flag;
+}
+
+#define HYPRE_SPGEMM_NUMERICAL_WITH_ROWNNZ_BINNED2(BIN, BIN2, SHMEM_HASH_SIZE, GROUP_SIZE, EXACT_ROWNNZ, GHASH)  \
+{                                                                                                                \
+   const HYPRE_Int p = h_bin_ptr[BIN - 1];                                                                       \
+   const HYPRE_Int q = h_bin_ptr[BIN];                                                                           \
+   const HYPRE_Int bs = q - p;                                                                                   \
+   if (bs)                                                                                                       \
+   {                                                                                                             \
+      HYPRE_SPGEMM_PRINT("bin[%d]: %d rows, p %d, q %d\n", BIN, bs, p, q);                                       \
+      hypre_spgemm_numerical_with_rownnz<BIN2, SHMEM_HASH_SIZE, GROUP_SIZE, true>                                \
+         (bs, d_rind + p, k, n, GHASH, EXACT_ROWNNZ, d_ia, d_ja, d_a, d_ib, d_jb, d_b, d_rc, d_ic, d_jc, d_c);   \
+   }                                                                                                             \
+}
+
+#define HYPRE_SPGEMM_NUMERICAL_WITH_ROWNNZ_BINNED(BIN, SHMEM_HASH_SIZE, GROUP_SIZE, EXACT_ROWNNZ, GHASH)         \
+   HYPRE_SPGEMM_NUMERICAL_WITH_ROWNNZ_BINNED2(BIN, BIN, SHMEM_HASH_SIZE, GROUP_SIZE, EXACT_ROWNNZ, GHASH)
+
+HYPRE_Int
+hypreDevice_CSRSpGemmNumerWithRownnzUpperboundBinned( HYPRE_Int       m,
+                                                      HYPRE_Int       k,
+                                                      HYPRE_Int       n,
+                                                      HYPRE_Int      *d_ia,
+                                                      HYPRE_Int      *d_ja,
+                                                      HYPRE_Complex  *d_a,
+                                                      HYPRE_Int      *d_ib,
+                                                      HYPRE_Int      *d_jb,
+                                                      HYPRE_Complex  *d_b,
+                                                      HYPRE_Int      *d_rc,
+                                                      HYPRE_Int       exact_rownnz,
+                                                      HYPRE_Int     **d_ic_out,
+                                                      HYPRE_Int     **d_jc_out,
+                                                      HYPRE_Complex **d_c_out,
+                                                      HYPRE_Int      *nnzC_out )
+{
+   /* if rc contains exact rownnz: can allocate the final C=(ic,jc,c) directly;
+      if rc contains upper bound : it is a temporary space that is more than enough to store C */
+   HYPRE_Int     *d_ic = hypre_TAlloc(HYPRE_Int, m + 1, HYPRE_MEMORY_DEVICE);
+   HYPRE_Int     *d_jc;
+   HYPRE_Complex *d_c;
+   HYPRE_Int      nnzC = -1;
+
+   hypre_create_ija(m, NULL, d_rc, d_ic, &d_jc, &d_c, &nnzC);
+
+#ifdef HYPRE_SPGEMM_PRINTF
+   HYPRE_SPGEMM_PRINT("%s[%d]: nnzC %d\n", __FILE__, __LINE__, nnzC);
+#endif
+
+   HYPRE_Int *d_rind = hypre_TAlloc(HYPRE_Int, m, HYPRE_MEMORY_DEVICE);
+   HYPRE_Int  h_bin_ptr[HYPRE_SPGEMM_MAX_NBIN + 1];
+   //HYPRE_Int  num_bins = hypre_HandleSpgemmNumBin(hypre_handle());
+   HYPRE_Int high_bin = hypre_HandleSpgemmHighestBin(hypre_handle())[1];
+   const bool hbin9 = 9 == high_bin;
+   const char s = NUMER_HASH_SIZE[1] / 2, t = 2, u = high_bin;
+
+   hypre_SpGemmCreateBins(m, s, t, u, d_rc, false, d_rind, h_bin_ptr);
+
+#if 0
+   HYPRE_SPGEMM_NUMERICAL_WITH_ROWNNZ_BINNED(  1, NUMER_HASH_SIZE[ 1], T_GROUP_SIZE[ 1], exact_rownnz,
+                                               false);
+#endif
+   HYPRE_SPGEMM_NUMERICAL_WITH_ROWNNZ_BINNED(  2, NUMER_HASH_SIZE[ 2], T_GROUP_SIZE[ 2], exact_rownnz,
+                                               false);
+   HYPRE_SPGEMM_NUMERICAL_WITH_ROWNNZ_BINNED(  3, NUMER_HASH_SIZE[ 3], T_GROUP_SIZE[ 3], exact_rownnz,
+                                               false);
+   HYPRE_SPGEMM_NUMERICAL_WITH_ROWNNZ_BINNED(  4, NUMER_HASH_SIZE[ 4], T_GROUP_SIZE[ 4], exact_rownnz,
+                                               false);
+   HYPRE_SPGEMM_NUMERICAL_WITH_ROWNNZ_BINNED(  5, NUMER_HASH_SIZE[ 5], T_GROUP_SIZE[ 5], exact_rownnz,
+                                               false);
+   HYPRE_SPGEMM_NUMERICAL_WITH_ROWNNZ_BINNED(  6, NUMER_HASH_SIZE[ 6], T_GROUP_SIZE[ 6], exact_rownnz,
+                                               false);
+   HYPRE_SPGEMM_NUMERICAL_WITH_ROWNNZ_BINNED(  7, NUMER_HASH_SIZE[ 7], T_GROUP_SIZE[ 7], exact_rownnz,
+                                               false);
+   HYPRE_SPGEMM_NUMERICAL_WITH_ROWNNZ_BINNED(  8, NUMER_HASH_SIZE[ 8], T_GROUP_SIZE[ 8], exact_rownnz,
+                                               false);
+   HYPRE_SPGEMM_NUMERICAL_WITH_ROWNNZ_BINNED(  9, NUMER_HASH_SIZE[ 9], T_GROUP_SIZE[ 9], exact_rownnz,
+                                               hbin9);
+   HYPRE_SPGEMM_NUMERICAL_WITH_ROWNNZ_BINNED( 10, NUMER_HASH_SIZE[10], T_GROUP_SIZE[10], exact_rownnz,
+                                              true);
+
+   if (!exact_rownnz)
+   {
+      hypreDevice_CSRSpGemmNumerPostCopy<T_GROUP_SIZE[5]>(m, d_rc, &nnzC, &d_ic, &d_jc, &d_c);
+   }
+
+   *d_ic_out = d_ic;
+   *d_jc_out = d_jc;
+   *d_c_out  = d_c;
+   *nnzC_out = nnzC;
+
+   hypre_TFree(d_rind, HYPRE_MEMORY_DEVICE);
+
+   return hypre_error_flag;
+}
+
+HYPRE_Int
+hypreDevice_CSRSpGemmNumerWithRownnzUpperbound( HYPRE_Int       m,
+                                                HYPRE_Int       k,
+                                                HYPRE_Int       n,
+                                                HYPRE_Int      *d_ia,
+                                                HYPRE_Int      *d_ja,
+                                                HYPRE_Complex  *d_a,
+                                                HYPRE_Int      *d_ib,
+                                                HYPRE_Int      *d_jb,
+                                                HYPRE_Complex  *d_b,
+                                                HYPRE_Int      *d_rc,
+                                                HYPRE_Int       exact_rownnz,
+                                                HYPRE_Int     **d_ic_out,
+                                                HYPRE_Int     **d_jc_out,
+                                                HYPRE_Complex **d_c_out,
+                                                HYPRE_Int      *nnzC_out )
+
+{
+   HYPRE_UNUSED_VAR(exact_rownnz);
+
+#ifdef HYPRE_PROFILE
+   hypre_profile_times[HYPRE_TIMER_ID_SPGEMM_NUMERIC] -= hypre_MPI_Wtime();
+#endif
+
+#ifdef HYPRE_SPGEMM_NVTX
+   hypre_GpuProfilingPushRange("CSRSpGemmNumer");
+#endif
+
+#ifdef HYPRE_SPGEMM_TIMING
+   HYPRE_Real t1 = hypre_MPI_Wtime();
+#endif
+
+   const HYPRE_Int binned = hypre_HandleSpgemmBinned(hypre_handle());
+
+   if (binned)
+   {
+      hypreDevice_CSRSpGemmNumerWithRownnzUpperboundBinned
+      (m, k, n, d_ia, d_ja, d_a, d_ib, d_jb, d_b, d_rc, 1, d_ic_out, d_jc_out, d_c_out, nnzC_out);
+   }
+   else
+   {
+      hypreDevice_CSRSpGemmNumerWithRownnzUpperboundNoBin
+      (m, k, n, d_ia, d_ja, d_a, d_ib, d_jb, d_b, d_rc, 1, d_ic_out, d_jc_out, d_c_out, nnzC_out);
+   }
+
+#ifdef HYPRE_SPGEMM_TIMING
+   hypre_ForceSyncComputeStream();
+   HYPRE_Real t2 = hypre_MPI_Wtime() - t1;
+   HYPRE_SPGEMM_PRINT("SpGemmNumerical time %f\n", t2);
+#endif
+
+#ifdef HYPRE_SPGEMM_NVTX
+   hypre_GpuProfilingPopRange();
+#endif
+
+#ifdef HYPRE_PROFILE
+   hypre_profile_times[HYPRE_TIMER_ID_SPGEMM_NUMERIC] += hypre_MPI_Wtime();
+#endif
+
+   return hypre_error_flag;
+}
+
+#endif /* defined(HYPRE_USING_GPU) */
diff --git a/external/hypre/src/seq_mv/csr_spgemm_device_numer.h b/external/hypre/src/seq_mv/csr_spgemm_device_numer.h
new file mode 100644
index 00000000..5da27470
--- /dev/null
+++ b/external/hypre/src/seq_mv/csr_spgemm_device_numer.h
@@ -0,0 +1,889 @@
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+/*- - - - - - - - - - - - - - - - - - - - - - - - - - *
+           Perform SpGEMM with Row Nnz Upper Bound
+ *- - - - - - - - - - - - - - - - - - - - - - - - - - */
+#include "seq_mv.h"
+#include "csr_spgemm_device.h"
+
+/*- - - - - - - - - - - - - - - - - - - - - - - - - - *
+                Numerical Multiplication
+ *- - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#if defined(HYPRE_USING_GPU)
+
+/* HashKeys: assumed to be initialized as all -1's
+ * HashVals: assumed to be initialized as all 0's
+ * Key:      assumed to be nonnegative
+ */
+template <HYPRE_Int SHMEM_HASH_SIZE, char HASHTYPE, HYPRE_Int UNROLL_FACTOR>
+static __device__ __forceinline__
+HYPRE_Int
+hypre_spgemm_hash_insert_numer(
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_Int              *HashKeys,
+   HYPRE_Complex          *HashVals,
+#else
+   volatile HYPRE_Int     *HashKeys,
+   volatile HYPRE_Complex *HashVals,
+#endif
+   HYPRE_Int               key,
+   HYPRE_Complex           val )
+{
+   HYPRE_Int j = 0;
+   HYPRE_Int old = -1;
+
+#if defined(HYPRE_USING_HIP) && (HIP_VERSION == 50422804)
+   /* VPM: see https://github.com/hypre-space/hypre/issues/875 */
+#pragma unroll 8
+#else
+#pragma unroll UNROLL_FACTOR
+#endif
+   for (HYPRE_Int i = 0; i < SHMEM_HASH_SIZE; i++)
+   {
+      /* compute the hash value of key */
+      if (i == 0)
+      {
+         j = key & (SHMEM_HASH_SIZE - 1);
+      }
+      else
+      {
+         j = HashFunc<SHMEM_HASH_SIZE, HASHTYPE>(key, i, j);
+      }
+
+      /* try to insert key+1 into slot j */
+#if defined(HYPRE_USING_SYCL)
+      auto atomic_key = sycl::atomic_ref <
+                        HYPRE_Int, sycl::memory_order::relaxed,
+                        sycl::memory_scope::device,
+                        sycl::access::address_space::local_space > (HashKeys[j]);
+      old = -1;
+      atomic_key.compare_exchange_strong(old, key);
+#else
+      old = atomicCAS((HYPRE_Int *)(HashKeys + j), -1, key);
+#endif
+
+      if (old == -1 || old == key)
+      {
+         /* this slot was open or contained 'key', update value */
+#if defined(HYPRE_USING_SYCL)
+         auto atomic_val = sycl::atomic_ref <
+                           HYPRE_Complex, sycl::memory_order::relaxed,
+                           sycl::memory_scope::device,
+                           sycl::access::address_space::local_space > (HashVals[j]);
+         /* WM: replacing fetch_add(), which has slow performance due to poor compiler interpretation */
+         /* atomic_val.fetch_add(val); */
+         auto curr = atomic_val.load(sycl::memory_order::relaxed);
+         while (!atomic_val.compare_exchange_strong(curr, curr + val, sycl::memory_order::relaxed)) {}
+#else
+         atomicAdd((HYPRE_Complex*)(HashVals + j), val);
+#endif
+         return j;
+      }
+   }
+
+   return -1;
+}
+
+template <char HASHTYPE>
+static __device__ __forceinline__
+HYPRE_Int
+hypre_spgemm_hash_insert_numer( HYPRE_Int               HashSize,
+#if defined(HYPRE_USING_SYCL)
+                                HYPRE_Int              *HashKeys,
+                                HYPRE_Complex          *HashVals,
+#else
+                                volatile HYPRE_Int     *HashKeys,
+                                volatile HYPRE_Complex *HashVals,
+#endif
+                                HYPRE_Int               key,
+                                HYPRE_Complex           val )
+{
+   HYPRE_Int j = 0;
+   HYPRE_Int old = -1;
+
+   for (HYPRE_Int i = 0; i < HashSize; i++)
+   {
+      /* compute the hash value of key */
+      if (i == 0)
+      {
+         j = key & (HashSize - 1);
+      }
+      else
+      {
+         j = HashFunc<HASHTYPE>(HashSize, key, i, j);
+      }
+
+      /* try to insert key+1 into slot j */
+#if defined(HYPRE_USING_SYCL)
+      auto atomic_key = sycl::atomic_ref <
+                        HYPRE_Int, sycl::memory_order::relaxed,
+                        sycl::memory_scope::device,
+                        sycl::access::address_space::local_space > (HashKeys[j]);
+      old = -1;
+      atomic_key.compare_exchange_strong(old, key);
+#else
+      old = atomicCAS((HYPRE_Int *)(HashKeys + j), -1, key);
+#endif
+
+      if (old == -1 || old == key)
+      {
+         /* this slot was open or contained 'key', update value */
+#if defined(HYPRE_USING_SYCL)
+         auto atomic_val = sycl::atomic_ref <
+                           HYPRE_Complex, sycl::memory_order::relaxed,
+                           sycl::memory_scope::device,
+                           sycl::access::address_space::local_space > (HashVals[j]);
+         /* WM: replacing fetch_add(), which has slow performance due to poor compiler interpretation */
+         /* atomic_val.fetch_add(val); */
+         auto curr = atomic_val.load(sycl::memory_order::relaxed);
+         while (!atomic_val.compare_exchange_strong(curr, curr + val, sycl::memory_order::relaxed)) {}
+#else
+         atomicAdd((HYPRE_Complex*)(HashVals + j), val);
+#endif
+         return j;
+      }
+   }
+
+   return -1;
+}
+
+template <HYPRE_Int SHMEM_HASH_SIZE, char HASHTYPE, HYPRE_Int GROUP_SIZE, bool HAS_GHASH, bool IA1, HYPRE_Int UNROLL_FACTOR>
+static __device__ __forceinline__
+void
+hypre_spgemm_compute_row_numer( hypre_DeviceItem       &item,
+                                HYPRE_Int               istart_a,
+                                HYPRE_Int               iend_a,
+                                HYPRE_Int               istart_c,
+#if defined(HYPRE_DEBUG)
+                                HYPRE_Int               iend_c,
+#endif
+                                const    HYPRE_Int     *ja,
+                                const    HYPRE_Complex *aa,
+                                const    HYPRE_Int     *ib,
+                                const    HYPRE_Int     *jb,
+                                const    HYPRE_Complex *ab,
+                                HYPRE_Int              *jc,
+                                HYPRE_Complex          *ac,
+#if defined(HYPRE_USING_SYCL)
+                                HYPRE_Int              *s_HashKeys,
+                                HYPRE_Complex          *s_HashVals,
+#else
+                                volatile HYPRE_Int     *s_HashKeys,
+                                volatile HYPRE_Complex *s_HashVals,
+#endif
+                                HYPRE_Int               g_HashSize,
+                                HYPRE_Int              *g_HashKeys,
+                                HYPRE_Complex          *g_HashVals )
+{
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_Int threadIdx_x = item.get_local_id(2);
+   HYPRE_Int threadIdx_y = item.get_local_id(1);
+   HYPRE_Int blockDim_x = item.get_local_range(2);
+   HYPRE_Int blockDim_y = item.get_local_range(1);
+#else
+   HYPRE_Int threadIdx_x = threadIdx.x;
+   HYPRE_Int threadIdx_y = threadIdx.y;
+   HYPRE_Int blockDim_x = blockDim.x;
+   HYPRE_Int blockDim_y = blockDim.y;
+#endif
+   /* load column idx and values of row of A */
+   for (HYPRE_Int i = istart_a + threadIdx_y; warp_any_sync(item, HYPRE_WARP_FULL_MASK, i < iend_a);
+        i += blockDim_y)
+   {
+      HYPRE_Int     rowB = -1;
+      HYPRE_Complex mult = 0.0;
+
+      if (threadIdx_x == 0 && i < iend_a)
+      {
+         rowB = read_only_load(ja + i);
+         mult = aa ? read_only_load(aa + i) : 1.0;
+      }
+
+#if 0
+      //const HYPRE_Int ymask = get_mask<4>(...);
+      // TODO: need to confirm the behavior of __ballot_sync, leave it here for now
+      //const HYPRE_Int num_valid_rows = __popc(__ballot_sync(ymask, valid_i));
+      //for (HYPRE_Int j = 0; j < num_valid_rows; j++)
+#endif
+
+      /* threads in the same ygroup work on one row together */
+      rowB = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, rowB, 0, blockDim_x);
+      mult = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, mult, 0, blockDim_x);
+      /* open this row of B, collectively */
+      HYPRE_Int tmp = 0;
+      if (rowB != -1 && threadIdx_x < 2)
+      {
+         tmp = read_only_load(ib + rowB + threadIdx_x);
+      }
+      const HYPRE_Int rowB_start = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, tmp, 0, blockDim_x);
+      const HYPRE_Int rowB_end   = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, tmp, 1, blockDim_x);
+
+#if defined(HYPRE_DEBUG)
+      if (IA1) { hypre_device_assert(rowB == -1 || rowB_end - rowB_start == iend_c - istart_c); }
+#endif
+
+      for (HYPRE_Int k = rowB_start + threadIdx_x;
+           warp_any_sync(item, HYPRE_WARP_FULL_MASK, k < rowB_end);
+           k += blockDim_x)
+      {
+         /* WM: todo - have a warp_any_sync(k < rowB_end) to enter the loop directly followed by if (k < rowB_end)... do we need the any_sync above? */
+         /*        I seem to be getting a hang here in sycl... does the use of atomics below require all threads in the group/subgroup to hit this or something? */
+         if (k < rowB_end)
+         {
+            const HYPRE_Int     k_idx = read_only_load(jb + k);
+            const HYPRE_Complex k_val = (ab ? read_only_load(ab + k) : 1.0) * mult;
+
+            if (IA1)
+            {
+               jc[istart_c + k - rowB_start] = k_idx;
+               ac[istart_c + k - rowB_start] = k_val;
+            }
+            else
+            {
+               /* first try to insert into shared memory hash table */
+               HYPRE_Int pos = hypre_spgemm_hash_insert_numer<SHMEM_HASH_SIZE, HASHTYPE, UNROLL_FACTOR>
+                               (s_HashKeys, s_HashVals, k_idx, k_val);
+
+               if (HAS_GHASH && -1 == pos)
+               {
+                  pos = hypre_spgemm_hash_insert_numer<HASHTYPE>
+                        (g_HashSize, g_HashKeys, g_HashVals, k_idx, k_val);
+               }
+
+               hypre_device_assert(pos != -1);
+            }
+         }
+      }
+   }
+}
+
+template <HYPRE_Int GROUP_SIZE, HYPRE_Int SHMEM_HASH_SIZE, bool HAS_GHASH, HYPRE_Int UNROLL_FACTOR>
+static __device__ __forceinline__
+HYPRE_Int
+hypre_spgemm_copy_from_hash_into_C_row( hypre_DeviceItem       &item,
+                                        HYPRE_Int               lane_id,
+                                        HYPRE_Int               do_shared_copy,
+#if defined(HYPRE_USING_SYCL)
+                                        HYPRE_Int              *s_HashKeys,
+                                        HYPRE_Complex          *s_HashVals,
+#else
+                                        volatile HYPRE_Int     *s_HashKeys,
+                                        volatile HYPRE_Complex *s_HashVals,
+#endif
+                                        HYPRE_Int               ghash_size,
+                                        HYPRE_Int              *jg_start,
+                                        HYPRE_Complex          *ag_start,
+                                        HYPRE_Int              *jc_start,
+                                        HYPRE_Complex          *ac_start )
+{
+   HYPRE_Int j = 0;
+   const HYPRE_Int STEP_SIZE = hypre_min(GROUP_SIZE, HYPRE_WARP_SIZE);
+
+   /* copy shared memory hash table into C */
+   //#pragma unroll UNROLL_FACTOR
+
+   if (warp_any_sync(item, HYPRE_WARP_FULL_MASK, do_shared_copy))
+   {
+      for (HYPRE_Int k = lane_id; k < SHMEM_HASH_SIZE; k += STEP_SIZE)
+      {
+         HYPRE_Int sum;
+         HYPRE_Int key = do_shared_copy ? s_HashKeys[k] : -1;
+         HYPRE_Int pos = group_prefix_sum<HYPRE_Int, STEP_SIZE>(item, lane_id, (HYPRE_Int) (key != -1), sum);
+
+         if (key != -1)
+         {
+            jc_start[j + pos] = key;
+            ac_start[j + pos] = s_HashVals[k];
+         }
+         j += sum;
+      }
+   }
+
+   if (HAS_GHASH)
+   {
+      /* copy global memory hash table into C */
+      for (HYPRE_Int k = lane_id; warp_any_sync(item, HYPRE_WARP_FULL_MASK, k < ghash_size);
+           k += STEP_SIZE)
+      {
+         HYPRE_Int sum;
+         HYPRE_Int key = k < ghash_size ? jg_start[k] : -1;
+         HYPRE_Int pos = group_prefix_sum<HYPRE_Int, STEP_SIZE>(item, lane_id, (HYPRE_Int) (key != -1), sum);
+
+         if (key != -1)
+         {
+            jc_start[j + pos] = key;
+            ac_start[j + pos] = ag_start[k];
+         }
+         j += sum;
+      }
+   }
+
+   return j;
+}
+
+template <HYPRE_Int NUM_GROUPS_PER_BLOCK, HYPRE_Int GROUP_SIZE, HYPRE_Int SHMEM_HASH_SIZE, bool HAS_RIND,
+          bool FAILED_SYMBL, char HASHTYPE, bool HAS_GHASH>
+__global__ void
+hypre_spgemm_numeric( hypre_DeviceItem                 &item,
+#if defined(HYPRE_USING_SYCL)
+                      char                             *shmem_ptr,
+#endif
+                      const HYPRE_Int                   M,
+                      const HYPRE_Int*     __restrict__ rind,
+                      const HYPRE_Int*     __restrict__ ia,
+                      const HYPRE_Int*     __restrict__ ja,
+                      const HYPRE_Complex* __restrict__ aa,
+                      const HYPRE_Int*     __restrict__ ib,
+                      const HYPRE_Int*     __restrict__ jb,
+                      const HYPRE_Complex* __restrict__ ab,
+                      const HYPRE_Int*     __restrict__ ic,
+                      HYPRE_Int*           __restrict__ jc,
+                      HYPRE_Complex*       __restrict__ ac,
+                      HYPRE_Int*           __restrict__ rc,
+                      const HYPRE_Int*     __restrict__ ig,
+                      HYPRE_Int*           __restrict__ jg,
+                      HYPRE_Complex*       __restrict__ ag )
+{
+   /* number of groups in the grid */
+#if defined(HYPRE_USING_SYCL)
+   volatile const HYPRE_Int grid_num_groups = get_num_groups(item) * item.get_group_range(2);
+#else
+   volatile const HYPRE_Int grid_num_groups = get_num_groups(item) * gridDim.x;
+#endif
+   /* group id inside the block */
+   volatile const HYPRE_Int group_id = get_group_id(item);
+   /* group id in the grid */
+#if defined(HYPRE_USING_SYCL)
+   volatile const HYPRE_Int grid_group_id = item.get_group(2) * get_num_groups(item) + group_id;
+#else
+   volatile const HYPRE_Int grid_group_id = blockIdx.x * get_num_groups(item) + group_id;
+#endif
+   /* lane id inside the group */
+   volatile const HYPRE_Int lane_id = get_group_lane_id(item);
+#if defined(HYPRE_USING_SYCL)
+   /* shared memory hash table */
+   HYPRE_Int *s_HashKeys = (HYPRE_Int*) & (shmem_ptr[0]);
+   HYPRE_Complex *s_HashVals = (HYPRE_Complex*) & (s_HashKeys[NUM_GROUPS_PER_BLOCK * SHMEM_HASH_SIZE]);
+   /* shared memory hash table for this group */
+   HYPRE_Int     *group_s_HashKeys = s_HashKeys + group_id * SHMEM_HASH_SIZE;
+   HYPRE_Complex *group_s_HashVals = s_HashVals + group_id * SHMEM_HASH_SIZE;
+#else
+   /* shared memory hash table */
+#if defined(HYPRE_SPGEMM_DEVICE_USE_DSHMEM)
+   extern __shared__ volatile HYPRE_Int shared_mem[];
+   volatile HYPRE_Int     *s_HashKeys = shared_mem;
+   volatile HYPRE_Complex *s_HashVals = (volatile HYPRE_Complex *)
+                                        &s_HashKeys[NUM_GROUPS_PER_BLOCK * SHMEM_HASH_SIZE];
+#else
+   __shared__ volatile HYPRE_Int     s_HashKeys[NUM_GROUPS_PER_BLOCK * SHMEM_HASH_SIZE];
+   __shared__ volatile HYPRE_Complex s_HashVals[NUM_GROUPS_PER_BLOCK * SHMEM_HASH_SIZE];
+#endif
+   /* shared memory hash table for this group */
+   volatile HYPRE_Int     *group_s_HashKeys = s_HashKeys + group_id * SHMEM_HASH_SIZE;
+   volatile HYPRE_Complex *group_s_HashVals = s_HashVals + group_id * SHMEM_HASH_SIZE;
+#endif
+
+   const HYPRE_Int UNROLL_FACTOR = hypre_min(HYPRE_SPGEMM_NUMER_UNROLL, SHMEM_HASH_SIZE);
+   HYPRE_Int do_shared_copy;
+   HYPRE_Int valid_ptr;
+
+#if defined(HYPRE_USING_SYCL)
+   hypre_device_assert(item.get_local_range(2) * item.get_local_range(1) == GROUP_SIZE);
+#else
+   hypre_device_assert(blockDim.x * blockDim.y == GROUP_SIZE);
+#endif
+
+   /* Note - in cuda/hip, exited threads are not required to reach collective calls like
+    *        syncthreads(), but this is not true for sycl (all threads must call the collective).
+    *        Thus, all threads in the block must enter the loop (which is not ensured for cuda). */
+#if defined(HYPRE_USING_SYCL)
+   for (HYPRE_Int i = grid_group_id; sycl::any_of_group(item.get_group(), i < M);
+        i += grid_num_groups)
+#else
+   for (HYPRE_Int i = grid_group_id; warp_any_sync(item, HYPRE_WARP_FULL_MASK, i < M);
+        i += grid_num_groups)
+#endif
+   {
+#if defined(HYPRE_USING_SYCL)
+      valid_ptr = warp_any_sync(item, HYPRE_WARP_FULL_MASK, i < M) &&
+                  (GROUP_SIZE >= HYPRE_WARP_SIZE || i < M);
+#else
+      valid_ptr = GROUP_SIZE >= HYPRE_WARP_SIZE || i < M;
+#endif
+
+      HYPRE_Int ii = -1;
+
+      if (HAS_RIND)
+      {
+         group_read<GROUP_SIZE>(item, rind + i, valid_ptr, ii);
+      }
+      else
+      {
+         ii = i;
+      }
+
+      /* start/end position of global memory hash table */
+      HYPRE_Int istart_g = 0, iend_g = 0, ghash_size = 0;
+
+      if (HAS_GHASH)
+      {
+         group_read<GROUP_SIZE>(item, ig + grid_group_id, valid_ptr,
+                                istart_g, iend_g);
+
+         /* size of global hash table allocated for this row
+            (must be power of 2 and >= the actual size of the row of C) */
+         ghash_size = iend_g - istart_g;
+
+         /* initialize group's global memory hash table */
+         for (HYPRE_Int k = lane_id; k < ghash_size; k += GROUP_SIZE)
+         {
+            jg[istart_g + k] = -1;
+            ag[istart_g + k] = 0.0;
+         }
+      }
+
+      /* initialize group's shared memory hash table */
+      if (valid_ptr)
+      {
+#pragma unroll UNROLL_FACTOR
+         for (HYPRE_Int k = lane_id; k < SHMEM_HASH_SIZE; k += GROUP_SIZE)
+         {
+            group_s_HashKeys[k] = -1;
+            group_s_HashVals[k] = 0.0;
+         }
+      }
+
+      group_sync<GROUP_SIZE>(item);
+
+      /* start/end position of row of A */
+      HYPRE_Int istart_a = 0, iend_a = 0;
+
+      /* load the start and end position of row ii of A */
+      group_read<GROUP_SIZE>(item, ia + ii, valid_ptr, istart_a, iend_a);
+
+      /* start/end position of row of C */
+      HYPRE_Int istart_c = 0;
+#if defined(HYPRE_DEBUG)
+      HYPRE_Int iend_c = 0;
+      group_read<GROUP_SIZE>(item, ic + ii, valid_ptr, istart_c, iend_c);
+#else
+      group_read<GROUP_SIZE>(item, ic + ii, valid_ptr, istart_c);
+#endif
+
+      /* work with two hash tables */
+      if (iend_a == istart_a + 1)
+      {
+         hypre_spgemm_compute_row_numer<SHMEM_HASH_SIZE, HASHTYPE, GROUP_SIZE, HAS_GHASH, true, UNROLL_FACTOR>
+         (item, istart_a, iend_a, istart_c,
+#if defined(HYPRE_DEBUG)
+          iend_c,
+#endif
+          ja, aa, ib, jb, ab, jc, ac, group_s_HashKeys, group_s_HashVals, ghash_size,
+          jg + istart_g, ag + istart_g);
+      }
+      else
+      {
+         hypre_spgemm_compute_row_numer<SHMEM_HASH_SIZE, HASHTYPE, GROUP_SIZE, HAS_GHASH, false, UNROLL_FACTOR>
+         (item, istart_a, iend_a, istart_c,
+#if defined(HYPRE_DEBUG)
+          iend_c,
+#endif
+          ja, aa, ib, jb, ab, jc, ac, group_s_HashKeys, group_s_HashVals, ghash_size,
+          jg + istart_g, ag + istart_g);
+      }
+
+      if (GROUP_SIZE > HYPRE_WARP_SIZE)
+      {
+         group_sync<GROUP_SIZE>(item);
+      }
+
+      HYPRE_Int jsum = 0;
+
+      /* the first warp of the group copies results into the final C
+       * if GROUP_SIZE < WARP_SIZE, the whole group copies */
+      if (get_warp_in_group_id<GROUP_SIZE>(item) == 0)
+      {
+         do_shared_copy = (iend_a > istart_a + 1) && (valid_ptr);
+         jsum = hypre_spgemm_copy_from_hash_into_C_row<GROUP_SIZE, SHMEM_HASH_SIZE, HAS_GHASH, UNROLL_FACTOR>
+                (item,
+                 lane_id,
+                 do_shared_copy,
+                 group_s_HashKeys,
+                 group_s_HashVals,
+                 ghash_size,
+                 jg + istart_g, ag + istart_g,
+                 jc + istart_c, ac + istart_c);
+
+#if defined(HYPRE_DEBUG)
+         if (iend_a != istart_a + 1)
+         {
+            if (FAILED_SYMBL)
+            {
+               hypre_device_assert(istart_c + jsum <= iend_c);
+            }
+            else
+            {
+               hypre_device_assert(istart_c + jsum == iend_c);
+            }
+         }
+#endif
+      }
+
+      if (GROUP_SIZE > HYPRE_WARP_SIZE)
+      {
+         group_sync<GROUP_SIZE>(item);
+      }
+
+      if (FAILED_SYMBL)
+      {
+         /* when symb mult was failed, save (exact) row nnz */
+         if ((valid_ptr) && lane_id == 0)
+         {
+            rc[ii] = jsum;
+         }
+      }
+   }
+}
+
+/* SpGeMM with Rownnz/Upper bound */
+template <HYPRE_Int BIN, HYPRE_Int SHMEM_HASH_SIZE, HYPRE_Int GROUP_SIZE, bool HAS_RIND>
+HYPRE_Int
+hypre_spgemm_numerical_with_rownnz( HYPRE_Int      m,
+                                    HYPRE_Int     *row_ind,
+                                    HYPRE_Int      k,
+                                    HYPRE_Int      n,
+                                    bool           need_ghash,
+                                    HYPRE_Int      exact_rownnz,
+                                    HYPRE_Int     *d_ia,
+                                    HYPRE_Int     *d_ja,
+                                    HYPRE_Complex *d_a,
+                                    HYPRE_Int     *d_ib,
+                                    HYPRE_Int     *d_jb,
+                                    HYPRE_Complex *d_b,
+                                    HYPRE_Int     *d_rc,
+                                    HYPRE_Int     *d_ic,
+                                    HYPRE_Int     *d_jc,
+                                    HYPRE_Complex *d_c )
+{
+   const HYPRE_Int num_groups_per_block = hypre_spgemm_get_num_groups_per_block<GROUP_SIZE>();
+#if defined(HYPRE_USING_CUDA)
+   const HYPRE_Int BDIMX                = hypre_min(4, GROUP_SIZE);
+#elif defined(HYPRE_USING_HIP)
+   const HYPRE_Int BDIMX                = hypre_min(4, GROUP_SIZE);
+#elif defined(HYPRE_USING_SYCL)
+   const HYPRE_Int BDIMX                = hypre_min(4, GROUP_SIZE);
+#endif
+   const HYPRE_Int BDIMY                = GROUP_SIZE / BDIMX;
+
+#if defined(HYPRE_USING_SYCL)
+   /* CUDA kernel configurations: bDim.z is the number of groups in block */
+   dim3 bDim(num_groups_per_block, BDIMY, BDIMX);
+   hypre_assert(bDim.get(2) * bDim.get(1) == GROUP_SIZE);
+   // grid dimension (number of blocks)
+   const HYPRE_Int num_blocks = hypre_min( hypre_HandleSpgemmBlockNumDim(hypre_handle())[1][BIN],
+                                           (m + bDim.get(0) - 1) / bDim.get(0) );
+   dim3 gDim(1, 1, num_blocks);
+   // number of active groups
+   HYPRE_Int num_act_groups = hypre_min(bDim.get(0) * gDim.get(2), m);
+#else
+   /* CUDA kernel configurations: bDim.z is the number of groups in block */
+   dim3 bDim(BDIMX, BDIMY, num_groups_per_block);
+   hypre_assert(bDim.x * bDim.y == GROUP_SIZE);
+   // grid dimension (number of blocks)
+   const HYPRE_Int num_blocks = hypre_min( hypre_HandleSpgemmBlockNumDim(hypre_handle())[1][BIN],
+                                           (HYPRE_Int) ((m + bDim.z - 1) / bDim.z) );
+   dim3 gDim( num_blocks );
+   // number of active groups
+   HYPRE_Int num_act_groups = hypre_min((HYPRE_Int) (bDim.z * gDim.x), m);
+#endif
+
+   const char HASH_TYPE = HYPRE_SPGEMM_HASH_TYPE;
+
+   if (HASH_TYPE != 'L' && HASH_TYPE != 'Q' && HASH_TYPE != 'D')
+   {
+      hypre_error_w_msg(1, "Unrecognized hash type ... [L(inear), Q(uadratic), D(ouble)]\n");
+   }
+
+   /* ---------------------------------------------------------------------------
+    * build hash table
+    * ---------------------------------------------------------------------------*/
+   HYPRE_Int     *d_ghash_i = NULL;
+   HYPRE_Int     *d_ghash_j = NULL;
+   HYPRE_Complex *d_ghash_a = NULL;
+   HYPRE_Int      ghash_size = 0;
+
+   if (need_ghash)
+   {
+      hypre_SpGemmCreateGlobalHashTable(m, row_ind, num_act_groups, d_rc, SHMEM_HASH_SIZE,
+                                        &d_ghash_i, &d_ghash_j, &d_ghash_a, &ghash_size);
+   }
+
+#ifdef HYPRE_SPGEMM_PRINTF
+   HYPRE_SPGEMM_PRINT("%s[%d], BIN[%d]: m %d k %d n %d, HASH %c, SHMEM_HASH_SIZE %d, GROUP_SIZE %d, "
+                      "exact_rownnz %d, need_ghash %d, ghash %p size %d\n",
+                      __FILE__, __LINE__, BIN, m, k, n,
+                      HASH_TYPE, SHMEM_HASH_SIZE, GROUP_SIZE, exact_rownnz, need_ghash, d_ghash_i, ghash_size);
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_SPGEMM_PRINT("kernel spec [%d %d %d] x [%d %d %d]\n", gDim.get(2), gDim.get(1), gDim.get(0),
+                      bDim.get(2), bDim.get(1),
+                      bDim.get(0));
+#else
+   HYPRE_SPGEMM_PRINT("kernel spec [%d %d %d] x [%d %d %d]\n", gDim.x, gDim.y, gDim.z, bDim.x, bDim.y,
+                      bDim.z);
+#endif
+#else
+   HYPRE_UNUSED_VAR(k);
+   HYPRE_UNUSED_VAR(n);
+#endif
+
+#if defined(HYPRE_SPGEMM_DEVICE_USE_DSHMEM) || defined(HYPRE_USING_SYCL)
+   const size_t shmem_bytes = num_groups_per_block * SHMEM_HASH_SIZE * (sizeof(HYPRE_Int) + sizeof(
+                                                                           HYPRE_Complex));
+#else
+   const size_t shmem_bytes = 0;
+#endif
+
+   /* ---------------------------------------------------------------------------
+    * numerical multiplication:
+    * ---------------------------------------------------------------------------*/
+   hypre_assert(HAS_RIND == (row_ind != NULL) );
+
+   /* <NUM_GROUPS_PER_BLOCK, GROUP_SIZE, SHMEM_HASH_SIZE, HAS_RIND, FAILED_SYMBL, HASHTYPE, HAS_GHASH> */
+
+   if (exact_rownnz)
+   {
+      if (ghash_size)
+      {
+         HYPRE_GPU_LAUNCH2 (
+            (hypre_spgemm_numeric<num_groups_per_block, GROUP_SIZE, SHMEM_HASH_SIZE, HAS_RIND, false, HASH_TYPE, true>),
+            gDim, bDim, shmem_bytes,
+            m, row_ind, d_ia, d_ja, d_a, d_ib, d_jb, d_b, d_ic, d_jc, d_c, NULL, d_ghash_i, d_ghash_j,
+            d_ghash_a );
+      }
+      else
+      {
+         HYPRE_GPU_LAUNCH2 (
+            (hypre_spgemm_numeric<num_groups_per_block, GROUP_SIZE, SHMEM_HASH_SIZE, HAS_RIND, false, HASH_TYPE, false>),
+            gDim, bDim, shmem_bytes,
+            m, row_ind, d_ia, d_ja, d_a, d_ib, d_jb, d_b, d_ic, d_jc, d_c, NULL, d_ghash_i, d_ghash_j,
+            d_ghash_a );
+      }
+   }
+   else
+   {
+      if (ghash_size)
+      {
+         HYPRE_GPU_LAUNCH2 (
+            (hypre_spgemm_numeric<num_groups_per_block, GROUP_SIZE, SHMEM_HASH_SIZE, HAS_RIND, true, HASH_TYPE, true>),
+            gDim, bDim, shmem_bytes,
+            m, row_ind, d_ia, d_ja, d_a, d_ib, d_jb, d_b, d_ic, d_jc, d_c, d_rc, d_ghash_i, d_ghash_j,
+            d_ghash_a );
+      }
+      else
+      {
+         HYPRE_GPU_LAUNCH2 (
+            (hypre_spgemm_numeric<num_groups_per_block, GROUP_SIZE, SHMEM_HASH_SIZE, HAS_RIND, true, HASH_TYPE, false>),
+            gDim, bDim, shmem_bytes,
+            m, row_ind, d_ia, d_ja, d_a, d_ib, d_jb, d_b, d_ic, d_jc, d_c, d_rc, d_ghash_i, d_ghash_j,
+            d_ghash_a );
+      }
+   }
+
+   hypre_TFree(d_ghash_i, HYPRE_MEMORY_DEVICE);
+   hypre_TFree(d_ghash_j, HYPRE_MEMORY_DEVICE);
+   hypre_TFree(d_ghash_a, HYPRE_MEMORY_DEVICE);
+
+   return hypre_error_flag;
+}
+
+template <HYPRE_Int GROUP_SIZE>
+__global__ void
+hypre_spgemm_copy_from_Cext_into_C( hypre_DeviceItem    &item,
+                                    HYPRE_Int            M,
+                                    HYPRE_Int           *ix,
+                                    HYPRE_Int           *jx,
+                                    HYPRE_Complex       *ax,
+                                    HYPRE_Int           *ic,
+                                    HYPRE_Int           *jc,
+                                    HYPRE_Complex       *ac )
+{
+   /* number of groups in the grid */
+#if defined(HYPRE_USING_SYCL)
+   const HYPRE_Int grid_num_groups = get_num_groups(item) * item.get_group_range(2);
+#else
+   const HYPRE_Int grid_num_groups = get_num_groups(item) * gridDim.x;
+#endif
+   /* group id inside the block */
+   const HYPRE_Int group_id = get_group_id(item);
+   /* group id in the grid */
+#if defined(HYPRE_USING_SYCL)
+   const HYPRE_Int grid_group_id = item.get_group_range(2) * get_num_groups(item) + group_id;
+#else
+   const HYPRE_Int grid_group_id = blockIdx.x * get_num_groups(item) + group_id;
+#endif
+   /* lane id inside the group */
+   const HYPRE_Int lane_id = get_group_lane_id(item);
+
+#if defined(HYPRE_USING_SYCL)
+   hypre_device_assert(item.get_local_range(2) * item.get_local_range(1) == GROUP_SIZE);
+#else
+   hypre_device_assert(blockDim.x * blockDim.y == GROUP_SIZE);
+#endif
+
+   for (HYPRE_Int i = grid_group_id; warp_any_sync(item, HYPRE_WARP_FULL_MASK, i < M);
+        i += grid_num_groups)
+   {
+      HYPRE_Int istart_c = 0, iend_c = 0, istart_x = 0;
+
+      /* start/end position in C and X */
+      group_read<GROUP_SIZE>(item, ic + i, GROUP_SIZE >= HYPRE_WARP_SIZE || i < M, istart_c, iend_c);
+#if defined(HYPRE_DEBUG)
+      HYPRE_Int iend_x = 0;
+      group_read<GROUP_SIZE>(item, ix + i, GROUP_SIZE >= HYPRE_WARP_SIZE || i < M, istart_x, iend_x);
+      hypre_device_assert(iend_c - istart_c <= iend_x - istart_x);
+#else
+      group_read<GROUP_SIZE>(item, ix + i, GROUP_SIZE >= HYPRE_WARP_SIZE || i < M, istart_x);
+#endif
+      const HYPRE_Int p = istart_x - istart_c;
+      for (HYPRE_Int k = istart_c + lane_id; k < iend_c; k += GROUP_SIZE)
+      {
+         jc[k] = jx[k + p];
+         ac[k] = ax[k + p];
+      }
+   }
+}
+
+template <HYPRE_Int GROUP_SIZE>
+HYPRE_Int
+hypreDevice_CSRSpGemmNumerPostCopy( HYPRE_Int       m,
+                                    HYPRE_Int      *d_rc,
+                                    HYPRE_Int      *nnzC,
+                                    HYPRE_Int     **d_ic,
+                                    HYPRE_Int     **d_jc,
+                                    HYPRE_Complex **d_c)
+{
+   HYPRE_Int nnzC_new = hypreDevice_IntegerReduceSum(m, d_rc);
+
+   hypre_assert(nnzC_new <= *nnzC && nnzC_new >= 0);
+
+   if (nnzC_new < *nnzC)
+   {
+      HYPRE_Int     *d_ic_new = hypre_TAlloc(HYPRE_Int, m + 1, HYPRE_MEMORY_DEVICE);
+      HYPRE_Int     *d_jc_new;
+      HYPRE_Complex *d_c_new;
+
+      /* alloc final C */
+      hypre_create_ija(m, NULL, d_rc, d_ic_new, &d_jc_new, &d_c_new, &nnzC_new);
+
+#ifdef HYPRE_SPGEMM_PRINTF
+      HYPRE_SPGEMM_PRINT("%s[%d]: Post Copy: new nnzC %d\n", __FILE__, __LINE__, nnzC_new);
+#endif
+
+      /* copy to the final C */
+      const HYPRE_Int num_groups_per_block = hypre_spgemm_get_num_groups_per_block<GROUP_SIZE>();
+      dim3 bDim(GROUP_SIZE, 1, num_groups_per_block);
+#if defined(HYPRE_USING_SYCL)
+      dim3 gDim(1, 1, (m + bDim.get(2) - 1) / bDim.get(2) );
+#else
+      dim3 gDim( (m + bDim.z - 1) / bDim.z );
+#endif
+
+      HYPRE_GPU_LAUNCH( (hypre_spgemm_copy_from_Cext_into_C<GROUP_SIZE>), gDim, bDim,
+                        m, *d_ic, *d_jc, *d_c, d_ic_new, d_jc_new, d_c_new );
+
+      hypre_TFree(*d_ic, HYPRE_MEMORY_DEVICE);
+      hypre_TFree(*d_jc, HYPRE_MEMORY_DEVICE);
+      hypre_TFree(*d_c,  HYPRE_MEMORY_DEVICE);
+
+      *d_ic = d_ic_new;
+      *d_jc = d_jc_new;
+      *d_c  = d_c_new;
+      *nnzC = nnzC_new;
+   }
+
+   return hypre_error_flag;
+}
+
+template <HYPRE_Int SHMEM_HASH_SIZE, HYPRE_Int GROUP_SIZE>
+HYPRE_Int hypre_spgemm_numerical_max_num_blocks( HYPRE_Int  multiProcessorCount,
+                                                 HYPRE_Int *num_blocks_ptr,
+                                                 HYPRE_Int *block_size_ptr )
+{
+   const char HASH_TYPE = HYPRE_SPGEMM_HASH_TYPE;
+   const HYPRE_Int num_groups_per_block = hypre_spgemm_get_num_groups_per_block<GROUP_SIZE>();
+   const HYPRE_Int block_size = num_groups_per_block * GROUP_SIZE;
+   hypre_int numBlocksPerSm = 0;
+   /* Note - sycl shmem is alwasy dynamic */
+#if defined(HYPRE_SPGEMM_DEVICE_USE_DSHMEM) || defined(HYPRE_USING_SYCL)
+   const hypre_int shmem_bytes = num_groups_per_block * SHMEM_HASH_SIZE *
+                                 (sizeof(HYPRE_Int) + sizeof(HYPRE_Complex));
+   hypre_int dynamic_shmem_size = shmem_bytes;
+#else
+   hypre_int dynamic_shmem_size = 0;
+#endif
+
+#if defined(HYPRE_SPGEMM_DEVICE_USE_DSHMEM)
+#if defined(HYPRE_USING_CUDA)
+   /* with CUDA, to use > 48K shared memory, must use dynamic and must opt-in. BIN = 10 requires 96K */
+   hypre_int max_shmem_optin;
+   hypre_GetDeviceMaxShmemSize(-1, NULL, &max_shmem_optin);
+
+   if (dynamic_shmem_size <= max_shmem_optin)
+   {
+      HYPRE_CUDA_CALL( cudaFuncSetAttribute(
+                          hypre_spgemm_numeric<num_groups_per_block, GROUP_SIZE, SHMEM_HASH_SIZE, true, false, HASH_TYPE, true>,
+                          cudaFuncAttributeMaxDynamicSharedMemorySize, dynamic_shmem_size) );
+
+      HYPRE_CUDA_CALL( cudaFuncSetAttribute(
+                          hypre_spgemm_numeric<num_groups_per_block, GROUP_SIZE, SHMEM_HASH_SIZE, true, false, HASH_TYPE, false>,
+                          cudaFuncAttributeMaxDynamicSharedMemorySize, dynamic_shmem_size) );
+
+      HYPRE_CUDA_CALL( cudaFuncSetAttribute(
+                          hypre_spgemm_numeric<num_groups_per_block, GROUP_SIZE, SHMEM_HASH_SIZE, true, true,  HASH_TYPE, true>,
+                          cudaFuncAttributeMaxDynamicSharedMemorySize, dynamic_shmem_size) );
+
+      HYPRE_CUDA_CALL( cudaFuncSetAttribute(
+                          hypre_spgemm_numeric<num_groups_per_block, GROUP_SIZE, SHMEM_HASH_SIZE, true, true, HASH_TYPE, false>,
+                          cudaFuncAttributeMaxDynamicSharedMemorySize, dynamic_shmem_size) );
+
+      /*
+         HYPRE_CUDA_CALL( cudaFuncSetAttribute(
+         hypre_spgemm_numeric<num_groups_per_block, GROUP_SIZE, SHMEM_HASH_SIZE, false, false, HASH_TYPE, false>,
+         cudaFuncAttributeMaxDynamicSharedMemorySize, dynamic_shmem_size) );
+      */
+   }
+#endif
+#endif
+
+#if defined(HYPRE_USING_CUDA)
+   HYPRE_CUDA_CALL(cudaOccupancyMaxActiveBlocksPerMultiprocessor(
+                      &numBlocksPerSm,
+                      hypre_spgemm_numeric<num_groups_per_block, GROUP_SIZE, SHMEM_HASH_SIZE, true, false, HASH_TYPE, true>,
+                      block_size, dynamic_shmem_size));
+#endif
+
+#if defined(HYPRE_USING_HIP)
+   HYPRE_HIP_CALL(hipOccupancyMaxActiveBlocksPerMultiprocessor(
+                     &numBlocksPerSm,
+                     hypre_spgemm_numeric<num_groups_per_block, GROUP_SIZE, SHMEM_HASH_SIZE, true, false, HASH_TYPE, true>,
+                     block_size, dynamic_shmem_size));
+#endif
+
+#if defined(HYPRE_USING_SYCL)
+   /* WM: todo */
+   numBlocksPerSm = 1;
+#endif
+
+   *num_blocks_ptr = multiProcessorCount * numBlocksPerSm;
+   *block_size_ptr = block_size;
+
+   return hypre_error_flag;
+}
+
+#endif /* defined(HYPRE_USING_GPU) */
diff --git a/external/hypre/src/seq_mv/csr_spgemm_device_numer.in b/external/hypre/src/seq_mv/csr_spgemm_device_numer.in
new file mode 100644
index 00000000..92463d68
--- /dev/null
+++ b/external/hypre/src/seq_mv/csr_spgemm_device_numer.in
@@ -0,0 +1,50 @@
+
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+#include "seq_mv.h"
+
+#if defined(HYPRE_USING_GPU)
+
+#if HYPRE_SPGEMM_BIN >= 10
+#define HYPRE_SPGEMM_DEVICE_USE_DSHMEM
+#endif
+
+#include <csr_spgemm_device_numer.h>
+
+template HYPRE_Int
+hypre_spgemm_numerical_with_rownnz
+< HYPRE_SPGEMM_BIN, NUMER_HASH_SIZE[HYPRE_SPGEMM_BIN], T_GROUP_SIZE[HYPRE_SPGEMM_BIN], true >
+( HYPRE_Int m, HYPRE_Int *row_ind, HYPRE_Int k, HYPRE_Int n, bool need_ghash,
+  HYPRE_Int exact_rownnz,
+  HYPRE_Int *d_ia, HYPRE_Int *d_ja, HYPRE_Complex *d_a, HYPRE_Int *d_ib, HYPRE_Int *d_jb,
+  HYPRE_Complex *d_b,
+  HYPRE_Int *d_rc, HYPRE_Int *d_ic, HYPRE_Int *d_jc, HYPRE_Complex *d_c );
+
+#if HYPRE_SPGEMM_BIN == HYPRE_SPGEMM_DEFAULT_BIN
+template HYPRE_Int
+hypre_spgemm_numerical_with_rownnz
+< HYPRE_SPGEMM_BIN, NUMER_HASH_SIZE[HYPRE_SPGEMM_BIN], T_GROUP_SIZE[HYPRE_SPGEMM_BIN], false >
+( HYPRE_Int m, HYPRE_Int *row_ind, HYPRE_Int k, HYPRE_Int n, bool need_ghash,
+  HYPRE_Int exact_rownnz,
+  HYPRE_Int *d_ia, HYPRE_Int *d_ja, HYPRE_Complex *d_a, HYPRE_Int *d_ib, HYPRE_Int *d_jb,
+  HYPRE_Complex *d_b,
+  HYPRE_Int *d_rc, HYPRE_Int *d_ic, HYPRE_Int *d_jc, HYPRE_Complex *d_c );
+#endif
+
+template HYPRE_Int
+hypre_spgemm_numerical_max_num_blocks
+< NUMER_HASH_SIZE[HYPRE_SPGEMM_BIN], T_GROUP_SIZE[HYPRE_SPGEMM_BIN] >
+( HYPRE_Int multiProcessorCount, HYPRE_Int *num_blocks_ptr, HYPRE_Int *block_size_ptr );
+
+#if HYPRE_SPGEMM_BIN == 5
+template HYPRE_Int
+hypreDevice_CSRSpGemmNumerPostCopy<T_GROUP_SIZE[HYPRE_SPGEMM_BIN]>
+( HYPRE_Int m, HYPRE_Int *d_rc, HYPRE_Int *nnzC, HYPRE_Int **d_ic, HYPRE_Int **d_jc, HYPRE_Complex **d_c );
+#endif
+
+#endif /* defined(HYPRE_USING_GPU) */
diff --git a/external/hypre/src/seq_mv/csr_spgemm_device_onemklsparse.c b/external/hypre/src/seq_mv/csr_spgemm_device_onemklsparse.c
new file mode 100644
index 00000000..dc449fae
--- /dev/null
+++ b/external/hypre/src/seq_mv/csr_spgemm_device_onemklsparse.c
@@ -0,0 +1,257 @@
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+#include "seq_mv.h"
+#include "_hypre_utilities.hpp"
+#include "seq_mv.hpp"
+
+#if defined(HYPRE_USING_SYCL) && defined(HYPRE_USING_ONEMKLSPARSE)
+
+HYPRE_Int
+hypreDevice_CSRSpGemmOnemklsparse(HYPRE_Int                            m,
+                                  HYPRE_Int                            k,
+                                  HYPRE_Int                            n,
+                                  oneapi::mkl::sparse::matrix_handle_t handle_A,
+                                  HYPRE_Int                            nnzA,
+                                  HYPRE_Int                           *_d_ia,
+                                  HYPRE_Int                           *_d_ja,
+                                  HYPRE_Complex                       *d_a,
+                                  oneapi::mkl::sparse::matrix_handle_t handle_B,
+                                  HYPRE_Int                            nnzB,
+                                  HYPRE_Int                           *_d_ib,
+                                  HYPRE_Int                           *_d_jb,
+                                  HYPRE_Complex                       *d_b,
+                                  oneapi::mkl::sparse::matrix_handle_t handle_C,
+                                  HYPRE_Int                           *nnzC_out,
+                                  HYPRE_Int                          **d_ic_out,
+                                  HYPRE_Int                          **d_jc_out,
+                                  HYPRE_Complex                      **d_c_out)
+{
+   /* Need these conversions in the case of the bigint build */
+#if defined(HYPRE_BIGINT)
+   std::int64_t *d_ia      = reinterpret_cast<std::int64_t*>(_d_ia);
+   std::int64_t *d_ja      = reinterpret_cast<std::int64_t*>(_d_ja);
+   std::int64_t *d_ib      = reinterpret_cast<std::int64_t*>(_d_ib);
+   std::int64_t *d_jb      = reinterpret_cast<std::int64_t*>(_d_jb);
+
+   std::int64_t *d_ic, *d_jc = NULL;
+   std::int64_t *d_ja_sorted, *d_jb_sorted;
+
+   /* Allocate space for sorted arrays */
+   d_ja_sorted = hypre_TAlloc(std::int64_t,     nnzA, HYPRE_MEMORY_DEVICE);
+   d_jb_sorted = hypre_TAlloc(std::int64_t,     nnzB, HYPRE_MEMORY_DEVICE);
+
+   /* Copy the unsorted over as the initial "sorted" */
+   hypre_TMemcpy(d_ja_sorted, d_ja, std::int64_t,     nnzA, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+   hypre_TMemcpy(d_jb_sorted, d_jb, std::int64_t,     nnzB, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+#else
+   HYPRE_Int *d_ia      = _d_ia;
+   HYPRE_Int *d_ja      = _d_ja;
+   HYPRE_Int *d_ib      = _d_ib;
+   HYPRE_Int *d_jb      = _d_jb;
+
+   HYPRE_Int *d_ic, *d_jc = NULL;
+   HYPRE_Int *d_ja_sorted, *d_jb_sorted;
+
+   /* Allocate space for sorted arrays */
+   d_ja_sorted = hypre_TAlloc(HYPRE_Int,     nnzA, HYPRE_MEMORY_DEVICE);
+   d_jb_sorted = hypre_TAlloc(HYPRE_Int,     nnzB, HYPRE_MEMORY_DEVICE);
+
+   /* Copy the unsorted over as the initial "sorted" */
+   hypre_TMemcpy(d_ja_sorted, d_ja, HYPRE_Int,     nnzA, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+   hypre_TMemcpy(d_jb_sorted, d_jb, HYPRE_Int,     nnzB, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+#endif
+
+   std::int64_t *tmp_size1_h = NULL, *tmp_size1_d = NULL;
+   std::int64_t *tmp_size2_h = NULL, *tmp_size2_d = NULL;
+   std::int64_t *nnzC_h = NULL, *nnzC_d;
+   void *tmp_buffer1 = NULL;
+   void *tmp_buffer2 = NULL;
+   HYPRE_Complex *d_c = NULL;
+   HYPRE_Complex *d_a_sorted, *d_b_sorted;
+
+   /* Allocate space for sorted arrays */
+   d_a_sorted  = hypre_TAlloc(HYPRE_Complex, nnzA, HYPRE_MEMORY_DEVICE);
+   d_b_sorted  = hypre_TAlloc(HYPRE_Complex, nnzB, HYPRE_MEMORY_DEVICE);
+
+   /* Copy the unsorted over as the initial "sorted" */
+   hypre_TMemcpy(d_a_sorted,  d_a,  HYPRE_Complex, nnzA, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+   hypre_TMemcpy(d_b_sorted,  d_b,  HYPRE_Complex, nnzB, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+
+   /* sort copies of col indices and data for A and B */
+   HYPRE_ONEMKL_CALL( oneapi::mkl::sparse::set_csr_data(*hypre_HandleComputeStream(hypre_handle()),
+                                                        handle_A, m, k, oneapi::mkl::index_base::zero,
+                                                        d_ia, d_ja_sorted, d_a_sorted).wait() );
+   HYPRE_ONEMKL_CALL( oneapi::mkl::sparse::set_csr_data(*hypre_HandleComputeStream(hypre_handle()),
+                                                        handle_B, k, n, oneapi::mkl::index_base::zero,
+                                                        d_ib, d_jb_sorted, d_b_sorted).wait() );
+   HYPRE_ONEMKL_CALL( oneapi::mkl::sparse::sort_matrix(*hypre_HandleComputeStream(hypre_handle()),
+                                                       handle_A, {}).wait() );
+   HYPRE_ONEMKL_CALL( oneapi::mkl::sparse::sort_matrix(*hypre_HandleComputeStream(hypre_handle()),
+                                                       handle_B, {}).wait() );
+
+   oneapi::mkl::sparse::matmat_descr_t descr = NULL;
+   oneapi::mkl::sparse::matmat_request req;
+
+#if defined(HYPRE_BIGINT)
+   d_ic = hypre_TAlloc(std::int64_t, m + 1, HYPRE_MEMORY_DEVICE);
+#else
+   d_ic = hypre_TAlloc(HYPRE_Int, m + 1, HYPRE_MEMORY_DEVICE);
+#endif
+   HYPRE_ONEMKL_CALL( oneapi::mkl::sparse::set_csr_data(*hypre_HandleComputeStream(hypre_handle()),
+                                                        handle_C, m, n, oneapi::mkl::index_base::zero,
+                                                        d_ic, d_jc, d_c).wait() );
+
+   HYPRE_ONEMKL_CALL( oneapi::mkl::sparse::init_matmat_descr(&descr) );
+   HYPRE_ONEMKL_CALL( oneapi::mkl::sparse::set_matmat_data(descr,
+                                                           oneapi::mkl::sparse::matrix_view_descr::general,
+                                                           oneapi::mkl::transpose::nontrans,
+                                                           oneapi::mkl::sparse::matrix_view_descr::general,
+                                                           oneapi::mkl::transpose::nontrans,
+                                                           oneapi::mkl::sparse::matrix_view_descr::general) );
+
+   /* get tmp_buffer1 size for work estimation */
+   req = oneapi::mkl::sparse::matmat_request::get_work_estimation_buf_size;
+   tmp_size1_d = hypre_TAlloc(std::int64_t, 1, HYPRE_MEMORY_DEVICE);
+   HYPRE_ONEMKL_CALL( oneapi::mkl::sparse::matmat(*hypre_HandleComputeStream(hypre_handle()),
+                                                  handle_A,
+                                                  handle_B,
+                                                  handle_C,
+                                                  req,
+                                                  descr,
+                                                  tmp_size1_d,
+                                                  NULL,
+                                                  {}).wait() );
+
+   /* allocate tmp_buffer1 for work estimation */
+   tmp_size1_h = hypre_TAlloc(std::int64_t, 1, HYPRE_MEMORY_HOST);
+   hypre_TMemcpy(tmp_size1_h, tmp_size1_d, std::int64_t, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
+   tmp_buffer1 = (void*) hypre_TAlloc(std::uint8_t, *tmp_size1_h, HYPRE_MEMORY_DEVICE);
+
+   /* do work_estimation */
+   req = oneapi::mkl::sparse::matmat_request::work_estimation;
+   HYPRE_ONEMKL_CALL( oneapi::mkl::sparse::matmat(*hypre_HandleComputeStream(hypre_handle()),
+                                                  handle_A,
+                                                  handle_B,
+                                                  handle_C,
+                                                  req,
+                                                  descr,
+                                                  tmp_size1_d,
+                                                  tmp_buffer1,
+                                                  {}).wait() );
+
+   /* get tmp_buffer2 size for computation */
+   req = oneapi::mkl::sparse::matmat_request::get_compute_buf_size;
+   tmp_size2_d = hypre_TAlloc(std::int64_t, 1, HYPRE_MEMORY_DEVICE);
+   HYPRE_ONEMKL_CALL( oneapi::mkl::sparse::matmat(*hypre_HandleComputeStream(hypre_handle()),
+                                                  handle_A,
+                                                  handle_B,
+                                                  handle_C,
+                                                  req,
+                                                  descr,
+                                                  tmp_size2_d,
+                                                  NULL,
+                                                  {}).wait() );
+
+   /* allocate tmp_buffer2 for computation */
+   tmp_size2_h = hypre_TAlloc(std::int64_t, 1, HYPRE_MEMORY_HOST);
+   hypre_TMemcpy(tmp_size2_h, tmp_size2_d, std::int64_t, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
+   tmp_buffer2 = (void*) hypre_TAlloc(std::uint8_t, *tmp_size2_h, HYPRE_MEMORY_DEVICE);
+
+   /* do the computation */
+   req = oneapi::mkl::sparse::matmat_request::compute;
+   HYPRE_ONEMKL_CALL( oneapi::mkl::sparse::matmat(*hypre_HandleComputeStream(hypre_handle()),
+                                                  handle_A,
+                                                  handle_B,
+                                                  handle_C,
+                                                  req,
+                                                  descr,
+                                                  tmp_size2_d,
+                                                  tmp_buffer2,
+                                                  {}).wait() );
+
+   /* get nnzC */
+   req = oneapi::mkl::sparse::matmat_request::get_nnz;
+   nnzC_d = hypre_TAlloc(std::int64_t, 1, HYPRE_MEMORY_DEVICE);
+   HYPRE_ONEMKL_CALL( oneapi::mkl::sparse::matmat(*hypre_HandleComputeStream(hypre_handle()),
+                                                  handle_A,
+                                                  handle_B,
+                                                  handle_C,
+                                                  req,
+                                                  descr,
+                                                  nnzC_d,
+                                                  NULL,
+                                                  {}).wait() );
+
+   /* allocate col index and data arrays */
+   nnzC_h = hypre_TAlloc(std::int64_t, 1, HYPRE_MEMORY_HOST);
+   hypre_TMemcpy(nnzC_h, nnzC_d, std::int64_t, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
+
+   if (*nnzC_h > 0)
+   {
+#if defined(HYPRE_BIGINT)
+      d_jc = hypre_TAlloc(std::int64_t, *nnzC_h, HYPRE_MEMORY_DEVICE);
+#else
+      d_jc = hypre_TAlloc(HYPRE_Int, *nnzC_h, HYPRE_MEMORY_DEVICE);
+#endif
+      d_c = hypre_TAlloc(HYPRE_Complex, *nnzC_h, HYPRE_MEMORY_DEVICE);
+      HYPRE_ONEMKL_CALL( oneapi::mkl::sparse::set_csr_data(*hypre_HandleComputeStream(hypre_handle()),
+                                                           handle_C, m, n, oneapi::mkl::index_base::zero,
+                                                           d_ic, d_jc, d_c).wait() );
+
+      /* finalize C */
+      req = oneapi::mkl::sparse::matmat_request::finalize;
+      HYPRE_ONEMKL_CALL( oneapi::mkl::sparse::matmat(*hypre_HandleComputeStream(hypre_handle()),
+                                                     handle_A,
+                                                     handle_B,
+                                                     handle_C,
+                                                     req,
+                                                     descr,
+                                                     NULL,
+                                                     NULL,
+                                                     {}).wait() );
+   }
+
+   /* release the matmat descr */
+   HYPRE_ONEMKL_CALL( oneapi::mkl::sparse::release_matmat_descr(&descr) );
+
+   /* assign the output */
+   *nnzC_out = *nnzC_h;
+#if defined(HYPRE_BIGINT)
+   *d_ic_out = reinterpret_cast<HYPRE_Int*>(d_ic);
+   *d_jc_out = reinterpret_cast<HYPRE_Int*>(d_jc);
+#else
+   *d_ic_out = d_ic;
+   *d_jc_out = d_jc;
+#endif
+   *d_c_out = d_c;
+
+   /* restore the original (unsorted) col indices and data to A and B and free sorted arrays */
+   HYPRE_ONEMKL_CALL( oneapi::mkl::sparse::set_csr_data(*hypre_HandleComputeStream(hypre_handle()),
+                                                        handle_A, m, k, oneapi::mkl::index_base::zero,
+                                                        d_ia, d_ja, d_a).wait() );
+   HYPRE_ONEMKL_CALL( oneapi::mkl::sparse::set_csr_data(*hypre_HandleComputeStream(hypre_handle()),
+                                                        handle_B, k, n, oneapi::mkl::index_base::zero,
+                                                        d_ib, d_jb, d_b).wait() );
+   hypre_TFree(d_a_sorted,  HYPRE_MEMORY_DEVICE);
+   hypre_TFree(d_b_sorted,  HYPRE_MEMORY_DEVICE);
+   hypre_TFree(d_ja_sorted, HYPRE_MEMORY_DEVICE);
+   hypre_TFree(d_jb_sorted, HYPRE_MEMORY_DEVICE);
+
+   /* free temporary arrays */
+   hypre_TFree(tmp_size1_h, HYPRE_MEMORY_HOST);
+   hypre_TFree(tmp_size1_d, HYPRE_MEMORY_DEVICE);
+   hypre_TFree(tmp_size2_h, HYPRE_MEMORY_HOST);
+   hypre_TFree(tmp_size2_d, HYPRE_MEMORY_DEVICE);
+   hypre_TFree(nnzC_h, HYPRE_MEMORY_HOST);
+   hypre_TFree(nnzC_d, HYPRE_MEMORY_DEVICE);
+   hypre_TFree(tmp_buffer1, HYPRE_MEMORY_DEVICE);
+   hypre_TFree(tmp_buffer2, HYPRE_MEMORY_DEVICE);
+
+   return hypre_error_flag;
+}
+#endif
diff --git a/external/hypre/src/seq_mv/csr_spgemm_device_rocsparse.c b/external/hypre/src/seq_mv/csr_spgemm_device_rocsparse.c
index 81c8b21b..faf37814 100644
--- a/external/hypre/src/seq_mv/csr_spgemm_device_rocsparse.c
+++ b/external/hypre/src/seq_mv/csr_spgemm_device_rocsparse.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -46,27 +46,25 @@ hypreDevice_CSRSpGemmRocsparse(HYPRE_Int           m,
    rocsparse_operation transA = rocsparse_operation_none;
    rocsparse_operation transB = rocsparse_operation_none;
 
-   HYPRE_Int isDoublePrecision = sizeof(HYPRE_Complex) == sizeof(hypre_double);
-   HYPRE_Int isSinglePrecision = sizeof(HYPRE_Complex) == sizeof(hypre_double) / 2;
-
-   hypre_assert(isDoublePrecision || isSinglePrecision);
-
    /* Copy the unsorted over as the initial "sorted" */
    hypre_TMemcpy(d_ja_sorted, d_ja, HYPRE_Int,     nnzA, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
    hypre_TMemcpy(d_a_sorted,  d_a,  HYPRE_Complex, nnzA, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
    hypre_TMemcpy(d_jb_sorted, d_jb, HYPRE_Int,     nnzB, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
    hypre_TMemcpy(d_b_sorted,  d_b,  HYPRE_Complex, nnzB, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
 
-   /* For rocSPARSE, the CSR SpGEMM implementation does not require the columns
-      to be sorted!
-     hypre_SortCSRRocsparse(m, k, nnzA, descrA, d_ia, d_ja_sorted, d_a_sorted);
-     hypre_SortCSRRocsparse(k, n, nnzB, descrB, d_ib, d_jb_sorted, d_b_sorted); */
+   /* For rocSPARSE, the CSR SpGEMM implementation does not require the columns to be sorted! */
+   /* RL: for matrices with long rows, it seemed that the sorting is still needed */
+   /* VPM: Adding sorting back since it is necessary for correctness in a few cases */
+#if 1
+   hypre_SortCSRRocsparse(m, k, nnzA, descrA, d_ia, d_ja_sorted, d_a_sorted);
+   hypre_SortCSRRocsparse(k, n, nnzB, descrB, d_ib, d_jb_sorted, d_b_sorted);
+#endif
 
    // nnzTotalDevHostPtr points to host memory
    HYPRE_Int *nnzTotalDevHostPtr = &nnzC;
    HYPRE_ROCSPARSE_CALL( rocsparse_set_pointer_mode(handle, rocsparse_pointer_mode_host) );
 
-   d_ic = hypre_TAlloc(HYPRE_Int, m+1, HYPRE_MEMORY_DEVICE);
+   d_ic = hypre_TAlloc(HYPRE_Int, m + 1, HYPRE_MEMORY_DEVICE);
 
    // For rocsparse, we need an extra buffer for computing the
    // csrgemmnnz and the csrgemm
@@ -82,29 +80,15 @@ hypreDevice_CSRSpGemmRocsparse(HYPRE_Int           m,
    size_t rs_buffer_size = 0;
    void *rs_buffer;
 
-   if (isDoublePrecision)
-   {
-      HYPRE_ROCSPARSE_CALL( rocsparse_dcsrgemm_buffer_size(handle,
-                                                           transA, transB,
-                                                           m, n, k,
-                                                           &alpha, // \alpha = 1
-                                                           descrA, nnzA, d_ia, d_ja_sorted,
-                                                           descrB, nnzB, d_ib, d_jb_sorted,
-                                                           NULL, // \beta = 0
-                                                           NULL,   0,    NULL, NULL, // D is nothing
-                                                           infoC, &rs_buffer_size) );
-   }
-   else if (isSinglePrecision)
-   {
-      HYPRE_ROCSPARSE_CALL( rocsparse_scsrgemm_buffer_size(handle, transA, transB,
-                                                           m, n, k,
-                                                           (float *) &alpha, // \alpha = 1
-                                                           descrA, nnzA, d_ia, d_ja_sorted,
-                                                           descrB, nnzB, d_ib, d_jb_sorted,
-                                                           NULL, // \beta = 0
-                                                           NULL,   0,    NULL, NULL,
-                                                           infoC, &rs_buffer_size) );
-   }
+   HYPRE_ROCSPARSE_CALL( hypre_rocsparse_csrgemm_buffer_size(handle,
+                                                             transA, transB,
+                                                             m, n, k,
+                                                             &alpha, // \alpha = 1
+                                                             descrA, nnzA, d_ia, d_ja_sorted,
+                                                             descrB, nnzB, d_ib, d_jb_sorted,
+                                                             NULL, // \beta = 0
+                                                             NULL,   0,    NULL, NULL, // D is nothing
+                                                             infoC, &rs_buffer_size) );
 
    rs_buffer = hypre_TAlloc(char, rs_buffer_size, HYPRE_MEMORY_DEVICE);
 
@@ -133,30 +117,15 @@ hypreDevice_CSRSpGemmRocsparse(HYPRE_Int           m,
    d_jc = hypre_TAlloc(HYPRE_Int,     nnzC, HYPRE_MEMORY_DEVICE);
    d_c  = hypre_TAlloc(HYPRE_Complex, nnzC, HYPRE_MEMORY_DEVICE);
 
-   if (isDoublePrecision)
-   {
-      HYPRE_ROCSPARSE_CALL( rocsparse_dcsrgemm(handle, transA, transB,
-                                               m, n, k,
-                                               &alpha, // alpha = 1
-                                               descrA, nnzA, d_a_sorted, d_ia, d_ja_sorted,
-                                               descrB, nnzB, d_b_sorted, d_ib, d_jb_sorted,
-                                               NULL, // beta = 0
-                                               NULL,   0,    NULL,       NULL, NULL, // D is nothing
-                                               descrC,       d_c, d_ic, d_jc,
-                                               infoC, rs_buffer) );
-   }
-   else if (isSinglePrecision)
-   {
-      HYPRE_ROCSPARSE_CALL( rocsparse_scsrgemm(handle, transA, transB,
-                                               m, n, k,
-                                               (float *) &alpha, // alpha = 1
-                                               descrA, nnzA, (float *) d_a_sorted, d_ia, d_ja_sorted,
-                                               descrB, nnzB, (float *) d_b_sorted, d_ib, d_jb_sorted,
-                                               NULL, // beta = 0
-                                               NULL,   0,    NULL,       NULL, NULL, // D is nothing
-                                               descrC,       (float *) d_c, d_ic, d_jc,
-                                               infoC, rs_buffer) );
-   }
+   HYPRE_ROCSPARSE_CALL( hypre_rocsparse_csrgemm(handle, transA, transB,
+                                                 m, n, k,
+                                                 &alpha, // alpha = 1
+                                                 descrA, nnzA, d_a_sorted, d_ia, d_ja_sorted,
+                                                 descrB, nnzB, d_b_sorted, d_ib, d_jb_sorted,
+                                                 NULL, // beta = 0
+                                                 NULL,   0,    NULL,       NULL, NULL, // D is nothing
+                                                 descrC,       d_c, d_ic, d_jc,
+                                                 infoC, rs_buffer) );
 
    // Free up the memory needed by rocsparse
    hypre_TFree(rs_buffer, HYPRE_MEMORY_DEVICE);
diff --git a/external/hypre/src/seq_mv/csr_spgemm_device_rowbound.c b/external/hypre/src/seq_mv/csr_spgemm_device_rowbound.c
deleted file mode 100644
index d3dce3e6..00000000
--- a/external/hypre/src/seq_mv/csr_spgemm_device_rowbound.c
+++ /dev/null
@@ -1,407 +0,0 @@
-/******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
- * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
- *
- * SPDX-License-Identifier: (Apache-2.0 OR MIT)
- ******************************************************************************/
-
-#include "seq_mv.h"
-#include "csr_spgemm_device.h"
-
-/*- - - - - - - - - - - - - - - - - - - - - - - - - - *
-                Symbolic Multiplication
- *- - - - - - - - - - - - - - - - - - - - - - - - - - */
-
-#if defined(HYPRE_USING_CUDA)
-#define HYPRE_SPGEMM_SYMBL_HASH_SIZE 512
-#elif defined(HYPRE_USING_HIP)
-#define HYPRE_SPGEMM_SYMBL_HASH_SIZE 512
-#endif
-
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-
-template <char HashType>
-static __device__ __forceinline__
-HYPRE_Int
-hypre_spgemm_hash_insert_symbl( HYPRE_Int   HashSize, /* capacity of the hash table */
-                       volatile HYPRE_Int  *HashKeys, /* assumed to be initialized as all -1's */
-                                HYPRE_Int   key,      /* assumed to be nonnegative */
-                                HYPRE_Int  &count     /* increase by 1 if is a new entry */)
-{
-   HYPRE_Int j = 0;
-
-#pragma unroll
-   for (HYPRE_Int i = 0; i < HashSize; i++)
-   {
-      /* compute the hash value of key */
-      if (i == 0)
-      {
-         j = key & (HashSize - 1);
-      }
-      else
-      {
-         j = HashFunc<HashType>(HashSize, key, i, j);
-      }
-
-      /* try to insert key+1 into slot j */
-      HYPRE_Int old = atomicCAS((HYPRE_Int*)(HashKeys+j), -1, key);
-
-      if (old == -1)
-      {
-         count++;
-         return j;
-      }
-      if (old == key)
-      {
-         return j;
-      }
-   }
-   return -1;
-}
-
-template <char HashType>
-static __device__ __forceinline__
-HYPRE_Int
-hypre_spgemm_compute_row_symbl( HYPRE_Int  rowi,
-                                HYPRE_Int  lane_id,
-                                HYPRE_Int *ia,
-                                HYPRE_Int *ja,
-                                HYPRE_Int *ib,
-                                HYPRE_Int *jb,
-                                HYPRE_Int  s_HashSize,
-                       volatile HYPRE_Int *s_HashKeys,
-                                HYPRE_Int  g_HashSize,
-                                HYPRE_Int *g_HashKeys,
-                                hypre_int &failed )
-{
-   /* load the start and end position of row i of A */
-   HYPRE_Int j = 0;
-
-   if (lane_id < 2)
-   {
-      j = read_only_load(ia + rowi + lane_id);
-   }
-   const HYPRE_Int istart = __shfl_sync(HYPRE_WARP_FULL_MASK, j, 0);
-   const HYPRE_Int iend   = __shfl_sync(HYPRE_WARP_FULL_MASK, j, 1);
-
-   HYPRE_Int num_new_insert = 0;
-
-   /* load column idx and values of row i of A */
-   for (HYPRE_Int i = istart; i < iend; i += blockDim.y)
-   {
-      HYPRE_Int colA = -1;
-
-      if (threadIdx.x == 0 && i + threadIdx.y < iend)
-      {
-         colA = read_only_load(ja + i + threadIdx.y);
-      }
-
-#if 0
-      //const HYPRE_Int ymask = get_mask<4>(lane_id);
-      // TODO: need to confirm the behavior of __ballot_sync, leave it here for now
-      //const HYPRE_Int num_valid_rows = __popc(__ballot_sync(ymask, valid_i));
-      //for (HYPRE_Int j = 0; j < num_valid_rows; j++)
-#endif
-
-      /* threads in the same ygroup work on one row together */
-      const HYPRE_Int rowB = __shfl_sync(HYPRE_WARP_FULL_MASK, colA, 0, blockDim.x);
-      /* open this row of B, collectively */
-      HYPRE_Int tmp = 0;
-      if (rowB != -1 && threadIdx.x < 2)
-      {
-         tmp = read_only_load(ib+rowB+threadIdx.x);
-      }
-      const HYPRE_Int rowB_start = __shfl_sync(HYPRE_WARP_FULL_MASK, tmp, 0, blockDim.x);
-      const HYPRE_Int rowB_end   = __shfl_sync(HYPRE_WARP_FULL_MASK, tmp, 1, blockDim.x);
-
-      for (HYPRE_Int k = rowB_start + threadIdx.x; __any_sync(HYPRE_WARP_FULL_MASK, k < rowB_end); k += blockDim.x)
-      {
-         if (k < rowB_end)
-         {
-            const HYPRE_Int k_idx = read_only_load(jb + k);
-            /* first try to insert into shared memory hash table */
-            HYPRE_Int pos = hypre_spgemm_hash_insert_symbl<HashType>(s_HashSize, s_HashKeys, k_idx, num_new_insert);
-
-            if (-1 == pos)
-            {
-               pos = hypre_spgemm_hash_insert_symbl<HashType>(g_HashSize, g_HashKeys, k_idx, num_new_insert);
-            }
-            /* if failed again, both hash tables must have been full
-               (hash table size estimation was too small).
-               Increase the counter anyhow (will lead to over-counting)
-               */
-            if (pos == -1)
-            {
-               num_new_insert ++;
-               failed = 1;
-            }
-         }
-      }
-   }
-
-   return num_new_insert;
-}
-
-template <HYPRE_Int NUM_WARPS_PER_BLOCK, HYPRE_Int SHMEM_HASH_SIZE, HYPRE_Int ATTEMPT, char HashType>
-__global__ void
-hypre_spgemm_symbolic( HYPRE_Int  M, /* HYPRE_Int K, HYPRE_Int N, */
-                       HYPRE_Int *rind,
-                       HYPRE_Int *ia,
-                       HYPRE_Int *ja,
-                       HYPRE_Int *ib,
-                       HYPRE_Int *jb,
-                       HYPRE_Int *ig,
-                       HYPRE_Int *jg,
-                       HYPRE_Int *rc,
-                       HYPRE_Int *rf)
-{
-   volatile const HYPRE_Int num_warps = NUM_WARPS_PER_BLOCK * gridDim.x;
-   /* warp id inside the block */
-   volatile const HYPRE_Int warp_id = get_warp_id();
-   /* warp id in the grid */
-   volatile const HYPRE_Int grid_warp_id = blockIdx.x * NUM_WARPS_PER_BLOCK + warp_id;
-   /* lane id inside the warp */
-   volatile HYPRE_Int lane_id = get_lane_id();
-   /* shared memory hash table */
-   __shared__ volatile HYPRE_Int s_HashKeys[NUM_WARPS_PER_BLOCK * SHMEM_HASH_SIZE];
-   /* shared memory hash table for this warp */
-   volatile HYPRE_Int *warp_s_HashKeys = s_HashKeys + warp_id * SHMEM_HASH_SIZE;
-
-   hypre_device_assert(blockDim.z              == NUM_WARPS_PER_BLOCK);
-   hypre_device_assert(blockDim.x * blockDim.y == HYPRE_WARP_SIZE);
-   hypre_device_assert(NUM_WARPS_PER_BLOCK     <= HYPRE_WARP_SIZE);
-
-   for (HYPRE_Int i = grid_warp_id; i < M; i += num_warps)
-   {
-      HYPRE_Int j = 0, ii;
-      hypre_int failed = 0;
-
-      if (ATTEMPT == 2)
-      {
-         if (lane_id == 0)
-         {
-            j = read_only_load(&rind[i]);
-         }
-         ii = __shfl_sync(HYPRE_WARP_FULL_MASK, j, 0);
-      }
-      else
-      {
-         ii = i;
-      }
-
-      /* start/end position of global memory hash table */
-      HYPRE_Int istart_g = 0, iend_g = 0, ghash_size = 0;
-
-      if (ig)
-      {
-         if (lane_id < 2)
-         {
-            j = read_only_load(ig + grid_warp_id + lane_id);
-         }
-         istart_g = __shfl_sync(HYPRE_WARP_FULL_MASK, j, 0);
-         iend_g   = __shfl_sync(HYPRE_WARP_FULL_MASK, j, 1);
-
-         /* size of global hash table allocated for this row
-           (must be power of 2 and >= the actual size of the row of C - shmem hash size) */
-         ghash_size = iend_g - istart_g;
-
-         /* initialize warp's global memory hash table */
-#pragma unroll
-         for (HYPRE_Int k = lane_id; k < ghash_size; k += HYPRE_WARP_SIZE)
-         {
-            jg[istart_g + k] = -1;
-         }
-      }
-
-      /* initialize warp's shared memory hash table */
-#pragma unroll
-      for (HYPRE_Int k = lane_id; k < SHMEM_HASH_SIZE; k += HYPRE_WARP_SIZE)
-      {
-         warp_s_HashKeys[k] = -1;
-      }
-
-      __syncwarp();
-
-      /* work with two hash tables */
-      j = hypre_spgemm_compute_row_symbl<HashType>(ii, lane_id, ia, ja, ib, jb,
-                                                   SHMEM_HASH_SIZE, warp_s_HashKeys,
-                                                   ghash_size, jg + istart_g, failed);
-
-#if defined(HYPRE_DEBUG)
-      if (ATTEMPT == 2)
-      {
-         hypre_device_assert(failed == 0);
-      }
-#endif
-
-      /* num of nonzeros of this row (an upper bound) */
-      j = warp_reduce_sum(j);
-
-      /* if this row failed */
-      if (ATTEMPT == 1)
-      {
-         failed = warp_reduce_sum(failed);
-      }
-
-      if (lane_id == 0)
-      {
-         rc[ii] = j;
-
-         if (ATTEMPT == 1)
-         {
-            rf[ii] = failed > 0;
-         }
-      }
-   }
-}
-
-template <HYPRE_Int shmem_hash_size, HYPRE_Int ATTEMPT>
-void
-hypre_spgemm_rownnz_attempt(HYPRE_Int  m,
-                            HYPRE_Int *rf_ind, /* ATTEMPT = 2, input: row indices (length of m) */
-                            HYPRE_Int  k,
-                            HYPRE_Int  n,
-                            HYPRE_Int *d_ia,
-                            HYPRE_Int *d_ja,
-                            HYPRE_Int *d_ib,
-                            HYPRE_Int *d_jb,
-                            HYPRE_Int  in_rc,
-                            HYPRE_Int *d_rc, /* ATTEMPT = 1,  input: rownnz est (if in_rc), output: rownnz bound;
-                                                ATTEMPT = 2,  input: rownnz bound, output: rownnz (exact) */
-                            HYPRE_Int *d_rf  /* ATTEMPT = 1, output: if symbolic mult. failed  */ )
-{
-#ifdef HYPRE_PROFILE
-   hypre_profile_times[HYPRE_TIMER_ID_SPMM_SYMBOLIC] -= hypre_MPI_Wtime();
-#endif
-
-#if defined(HYPRE_USING_CUDA)
-   const HYPRE_Int num_warps_per_block = 16;
-   const HYPRE_Int BDIMX               =  2;
-#elif defined(HYPRE_USING_HIP)
-   const HYPRE_Int num_warps_per_block = 16;
-   const HYPRE_Int BDIMX               =  4;
-#endif
-   const HYPRE_Int BDIMY               = HYPRE_WARP_SIZE / BDIMX;
-
-   /* CUDA kernel configurations */
-   dim3 bDim(BDIMX, BDIMY, num_warps_per_block);
-   hypre_assert(bDim.x * bDim.y == HYPRE_WARP_SIZE);
-   // for cases where one WARP works on a row
-   HYPRE_Int num_warps = hypre_min(m, HYPRE_MAX_NUM_WARPS);
-   dim3 gDim( (num_warps + bDim.z - 1) / bDim.z );
-   // number of active warps
-   HYPRE_Int num_act_warps = hypre_min(bDim.z * gDim.x, m);
-
-   const char hash_type = hypre_HandleSpgemmHashType(hypre_handle());
-
-   /* ---------------------------------------------------------------------------
-    * build hash table (no values)
-    * ---------------------------------------------------------------------------*/
-   HYPRE_Int *d_ghash_i = NULL, *d_ghash_j = NULL;
-
-   if (in_rc)
-   {
-      hypre_SpGemmCreateGlobalHashTable(m, rf_ind, num_act_warps, d_rc, shmem_hash_size,
-                                        &d_ghash_i, &d_ghash_j, NULL, NULL, 1);
-   }
-
-   /* ---------------------------------------------------------------------------
-    * symbolic multiplication:
-    * On output, it provides an upper bound of nnz in rows of C
-    * ---------------------------------------------------------------------------*/
-   if (hash_type == 'L')
-   {
-      HYPRE_CUDA_LAUNCH( (hypre_spgemm_symbolic<num_warps_per_block, shmem_hash_size, ATTEMPT, 'L'>), gDim, bDim,
-                         m, rf_ind, /*k, n,*/ d_ia, d_ja, d_ib, d_jb, d_ghash_i, d_ghash_j, d_rc, d_rf );
-   }
-   else if (hash_type == 'Q')
-   {
-      HYPRE_CUDA_LAUNCH( (hypre_spgemm_symbolic<num_warps_per_block, shmem_hash_size, ATTEMPT, 'Q'>), gDim, bDim,
-                         m, rf_ind, /*k, n,*/ d_ia, d_ja, d_ib, d_jb, d_ghash_i, d_ghash_j, d_rc, d_rf );
-   }
-   else if (hash_type == 'D')
-   {
-      HYPRE_CUDA_LAUNCH( (hypre_spgemm_symbolic<num_warps_per_block, shmem_hash_size, ATTEMPT, 'D'>), gDim, bDim,
-                         m, rf_ind, /*k, n,*/ d_ia, d_ja, d_ib, d_jb, d_ghash_i, d_ghash_j, d_rc, d_rf );
-   }
-   else
-   {
-      hypre_printf("Unrecognized hash type ... [L(inear), Q(uadratic), D(ouble)]\n");
-      exit(0);
-   }
-
-   hypre_TFree(d_ghash_i, HYPRE_MEMORY_DEVICE);
-   hypre_TFree(d_ghash_j, HYPRE_MEMORY_DEVICE);
-
-#ifdef HYPRE_PROFILE
-   cudaThreadSynchronize();
-   hypre_profile_times[HYPRE_TIMER_ID_SPMM_SYMBOLIC] += hypre_MPI_Wtime();
-#endif
-}
-
-HYPRE_Int
-hypreDevice_CSRSpGemmRownnzUpperbound( HYPRE_Int  m,
-                                       HYPRE_Int  k,
-                                       HYPRE_Int  n,
-                                       HYPRE_Int *d_ia,
-                                       HYPRE_Int *d_ja,
-                                       HYPRE_Int *d_ib,
-                                       HYPRE_Int *d_jb,
-                                       HYPRE_Int  in_rc,
-                                       HYPRE_Int *d_rc,
-                                       HYPRE_Int *d_rf)
-{
-   const HYPRE_Int shmem_hash_size = HYPRE_SPGEMM_SYMBL_HASH_SIZE;
-
-   hypre_spgemm_rownnz_attempt<shmem_hash_size, 1> (m, NULL, k, n, d_ia, d_ja, d_ib, d_jb, in_rc, d_rc, d_rf);
-
-   return hypre_error_flag;
-}
-
-HYPRE_Int
-hypreDevice_CSRSpGemmRownnz( HYPRE_Int  m,
-                             HYPRE_Int  k,
-                             HYPRE_Int  n,
-                             HYPRE_Int *d_ia,
-                             HYPRE_Int *d_ja,
-                             HYPRE_Int *d_ib,
-                             HYPRE_Int *d_jb,
-                             HYPRE_Int  in_rc,
-                             HYPRE_Int *d_rc )
-{
-   const HYPRE_Int shmem_hash_size = HYPRE_SPGEMM_SYMBL_HASH_SIZE;
-
-   /* a binary array to indicate if row nnz counting is failed for a row */
-   HYPRE_Int *d_rf  = d_rc + m;
-
-   hypre_spgemm_rownnz_attempt<shmem_hash_size, 1> (m, NULL, k, n, d_ia, d_ja, d_ib, d_jb, in_rc, d_rc, d_rf);
-
-   /* row nnz is exact if no row failed */
-   HYPRE_Int num_failed_rows = hypreDevice_IntegerReduceSum(m, d_rf);
-
-   if (num_failed_rows)
-   {
-      //hypre_printf("[%s, %d]: num of failed rows %d (%.2f)\n", __FILE__, __LINE__, num_failed_rows, num_failed_rows / (m + 0.0) );
-
-      HYPRE_Int *rf_ind = hypre_TAlloc(HYPRE_Int, num_failed_rows, HYPRE_MEMORY_DEVICE);
-
-      HYPRE_Int *new_end =
-      HYPRE_THRUST_CALL( copy_if,
-                         thrust::make_counting_iterator(0),
-                         thrust::make_counting_iterator(m),
-                         d_rf,
-                         rf_ind,
-                         thrust::identity<HYPRE_Int>() );
-
-      hypre_assert(new_end - rf_ind == num_failed_rows);
-
-      hypre_spgemm_rownnz_attempt<shmem_hash_size, 2> (num_failed_rows, rf_ind, k, n, d_ia, d_ja, d_ib, d_jb, 1, d_rc, NULL);
-
-      hypre_TFree(rf_ind, HYPRE_MEMORY_DEVICE);
-   }
-
-   return hypre_error_flag;
-}
-
-#endif /* HYPRE_USING_CUDA  || defined(HYPRE_USING_HIP) */
-
diff --git a/external/hypre/src/seq_mv/csr_spgemm_device_rowest.c b/external/hypre/src/seq_mv/csr_spgemm_device_rowest.c
index f058d1d7..cd6ebb3d 100644
--- a/external/hypre/src/seq_mv/csr_spgemm_device_rowest.c
+++ b/external/hypre/src/seq_mv/csr_spgemm_device_rowest.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -12,15 +12,21 @@
 #include "seq_mv.h"
 #include "csr_spgemm_device.h"
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
 
 /*- - - - - - - - - - - - - - - - - - - - - - - - - - *
                        NAIVE
  *- - - - - - - - - - - - - - - - - - - - - - - - - - */
 template <char type>
 static __device__ __forceinline__
-void rownnz_naive_rowi(HYPRE_Int rowi, HYPRE_Int lane_id, HYPRE_Int *ia, HYPRE_Int *ja, HYPRE_Int *ib,
-                       HYPRE_Int &row_nnz_sum, HYPRE_Int &row_nnz_max)
+void hypre_rownnz_naive_rowi( hypre_DeviceItem &item,
+                              HYPRE_Int  rowi,
+                              HYPRE_Int  lane_id,
+                              HYPRE_Int *ia,
+                              HYPRE_Int *ja,
+                              HYPRE_Int *ib,
+                              HYPRE_Int &row_nnz_sum,
+                              HYPRE_Int &row_nnz_max )
 {
    /* load the start and end position of row i of A */
    HYPRE_Int j = -1;
@@ -28,8 +34,8 @@ void rownnz_naive_rowi(HYPRE_Int rowi, HYPRE_Int lane_id, HYPRE_Int *ia, HYPRE_I
    {
       j = read_only_load(ia + rowi + lane_id);
    }
-   const HYPRE_Int istart = __shfl_sync(HYPRE_WARP_FULL_MASK, j, 0);
-   const HYPRE_Int iend   = __shfl_sync(HYPRE_WARP_FULL_MASK, j, 1);
+   const HYPRE_Int istart = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, j, 0);
+   const HYPRE_Int iend   = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, j, 1);
 
    row_nnz_sum = 0;
    row_nnz_max = 0;
@@ -40,15 +46,19 @@ void rownnz_naive_rowi(HYPRE_Int rowi, HYPRE_Int lane_id, HYPRE_Int *ia, HYPRE_I
       if (i + lane_id < iend)
       {
          HYPRE_Int colA = read_only_load(ja + i + lane_id);
-         HYPRE_Int rowB_start = read_only_load(ib+colA);
-         HYPRE_Int rowB_end   = read_only_load(ib+colA+1);
+         HYPRE_Int rowB_start = read_only_load(ib + colA);
+         HYPRE_Int rowB_end   = read_only_load(ib + colA + 1);
          if (type == 'U' || type == 'B')
          {
             row_nnz_sum += rowB_end - rowB_start;
          }
          if (type == 'L' || type == 'B')
          {
+#if defined(HYPRE_USING_SYCL)
+            row_nnz_max = std::max(row_nnz_max, rowB_end - rowB_start);
+#else
             row_nnz_max = max(row_nnz_max, rowB_end - rowB_start);
+#endif
          }
       }
    }
@@ -56,34 +66,55 @@ void rownnz_naive_rowi(HYPRE_Int rowi, HYPRE_Int lane_id, HYPRE_Int *ia, HYPRE_I
 
 template <char type, HYPRE_Int NUM_WARPS_PER_BLOCK>
 __global__
-void csr_spmm_rownnz_naive(HYPRE_Int M, /*HYPRE_Int K,*/ HYPRE_Int N, HYPRE_Int *ia, HYPRE_Int *ja,
-                           HYPRE_Int *ib, HYPRE_Int *jb, HYPRE_Int *rcL, HYPRE_Int *rcU)
+void hypre_spgemm_rownnz_naive( hypre_DeviceItem &item,
+                                HYPRE_Int  M,
+                                HYPRE_Int  N,
+                                HYPRE_Int *ia,
+                                HYPRE_Int *ja,
+                                HYPRE_Int *ib,
+                                HYPRE_Int *jb,
+                                HYPRE_Int *rcL,
+                                HYPRE_Int *rcU )
 {
+#if defined(HYPRE_USING_SYCL)
+   const HYPRE_Int num_warps = NUM_WARPS_PER_BLOCK * item.get_global_range(2);
+   HYPRE_Int blockIdx_x = item.get_group(2);
+#else
    const HYPRE_Int num_warps = NUM_WARPS_PER_BLOCK * gridDim.x;
+   HYPRE_Int blockIdx_x = blockIdx.x;
+#endif
    /* warp id inside the block */
-   const HYPRE_Int warp_id = get_warp_id();
+   const HYPRE_Int warp_id = get_group_id(item);
    /* lane id inside the warp */
-   volatile const HYPRE_Int lane_id = get_lane_id();
+   volatile const HYPRE_Int lane_id = get_group_lane_id(item);
 
+#if defined(HYPRE_USING_SYCL)
+   hypre_device_assert(item.get_local_range(2) * item.get_local_range(1) == HYPRE_WARP_SIZE);
+#else
    hypre_device_assert(blockDim.x * blockDim.y == HYPRE_WARP_SIZE);
+#endif
 
-   for (HYPRE_Int i = blockIdx.x * NUM_WARPS_PER_BLOCK + warp_id;
-            i < M;
-            i += num_warps)
+   for (HYPRE_Int i = blockIdx_x * NUM_WARPS_PER_BLOCK + warp_id;
+        i < M;
+        i += num_warps)
    {
       HYPRE_Int jU, jL;
 
-      rownnz_naive_rowi<type>(i, lane_id, ia, ja, ib, jU, jL);
+      hypre_rownnz_naive_rowi<type>(item, i, lane_id, ia, ja, ib, jU, jL);
 
       if (type == 'U' || type == 'B')
       {
-         jU = warp_reduce_sum(jU);
+         jU = warp_reduce_sum(item, jU);
+#if defined(HYPRE_USING_SYCL)
+         jU = sycl::min(jU, N);
+#else
          jU = min(jU, N);
+#endif
       }
 
       if (type == 'L' || type == 'B')
       {
-         jL = warp_reduce_max(jL);
+         jL = warp_reduce_max(item, jL);
       }
 
       if (lane_id == 0)
@@ -105,12 +136,18 @@ void csr_spmm_rownnz_naive(HYPRE_Int M, /*HYPRE_Int K,*/ HYPRE_Int N, HYPRE_Int
                        COHEN
  *- - - - - - - - - - - - - - - - - - - - - - - - - - */
 __global__
-void expdistfromuniform(HYPRE_Int n, float *x)
+void hypre_expdistfromuniform( hypre_DeviceItem &item,
+                               HYPRE_Int   n,
+                               float      *x )
 {
-   const HYPRE_Int global_thread_id  = blockIdx.x * get_block_size() + get_thread_id();
-   const HYPRE_Int total_num_threads = gridDim.x  * get_block_size();
+   const HYPRE_Int global_thread_id  = hypre_gpu_get_grid_thread_id<3, 1>(item);
+   const HYPRE_Int total_num_threads = hypre_gpu_get_grid_num_threads<3, 1>(item);
 
+#if defined(HYPRE_USING_SYCL)
+   hypre_device_assert(item.get_local_range(2) * item.get_local_range(1) == HYPRE_WARP_SIZE);
+#else
    hypre_device_assert(blockDim.x * blockDim.y == HYPRE_WARP_SIZE);
+#endif
 
    for (HYPRE_Int i = global_thread_id; i < n; i += total_num_threads)
    {
@@ -121,26 +158,46 @@ void expdistfromuniform(HYPRE_Int n, float *x)
 /* T = float: single precision should be enough */
 template <typename T, HYPRE_Int NUM_WARPS_PER_BLOCK, HYPRE_Int SHMEM_SIZE_PER_WARP, HYPRE_Int layer>
 __global__
-void cohen_rowest_kernel(HYPRE_Int nrow, HYPRE_Int *rowptr, HYPRE_Int *colidx, T *V_in, T *V_out,
-                         HYPRE_Int *rc, HYPRE_Int nsamples, HYPRE_Int *low, HYPRE_Int *upp, T mult)
+void hypre_cohen_rowest_kernel( hypre_DeviceItem &item,
+                                HYPRE_Int  nrow,
+                                HYPRE_Int *rowptr,
+                                HYPRE_Int *colidx,
+                                T         *V_in,
+                                T         *V_out,
+                                HYPRE_Int *rc,
+                                HYPRE_Int  nsamples,
+                                HYPRE_Int *low,
+                                HYPRE_Int *upp,
+                                T          mult )
 {
+#if defined(HYPRE_USING_SYCL)
+   const HYPRE_Int num_warps = NUM_WARPS_PER_BLOCK * item.get_global_range(2);
+   HYPRE_Int blockIdx_x = item.get_group(2);
+#else
    const HYPRE_Int num_warps = NUM_WARPS_PER_BLOCK * gridDim.x;
+   HYPRE_Int blockIdx_x = blockIdx.x;
+#endif
    /* warp id inside the block */
-   const HYPRE_Int warp_id = get_warp_id();
+   const HYPRE_Int warp_id = get_group_id(item);
    /* lane id inside the warp */
-   volatile HYPRE_Int lane_id = get_lane_id();
+   volatile HYPRE_Int lane_id = get_group_lane_id(item);
 #if COHEN_USE_SHMEM
    __shared__ volatile HYPRE_Int s_col[NUM_WARPS_PER_BLOCK * SHMEM_SIZE_PER_WARP];
    volatile HYPRE_Int  *warp_s_col = s_col + warp_id * SHMEM_SIZE_PER_WARP;
 #endif
 
+#if defined(HYPRE_USING_SYCL)
+   hypre_device_assert(item.get_local_range(1)                           == NUM_WARPS_PER_BLOCK);
+   hypre_device_assert(item.get_local_range(2) * item.get_local_range(1) == HYPRE_WARP_SIZE);
+#else
    hypre_device_assert(blockDim.z              == NUM_WARPS_PER_BLOCK);
    hypre_device_assert(blockDim.x * blockDim.y == HYPRE_WARP_SIZE);
+#endif
    hypre_device_assert(sizeof(T) == sizeof(float));
 
-   for (HYPRE_Int i = blockIdx.x * NUM_WARPS_PER_BLOCK + warp_id;
-                  i < nrow;
-                  i += num_warps)
+   for (HYPRE_Int i = blockIdx_x * NUM_WARPS_PER_BLOCK + warp_id;
+        i < nrow;
+        i += num_warps)
    {
       /* load the start and end position of row i */
       HYPRE_Int tmp = -1;
@@ -148,8 +205,8 @@ void cohen_rowest_kernel(HYPRE_Int nrow, HYPRE_Int *rowptr, HYPRE_Int *colidx, T
       {
          tmp = read_only_load(rowptr + i + lane_id);
       }
-      const HYPRE_Int istart = __shfl_sync(HYPRE_WARP_FULL_MASK, tmp, 0);
-      const HYPRE_Int iend   = __shfl_sync(HYPRE_WARP_FULL_MASK, tmp, 1);
+      const HYPRE_Int istart = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, tmp, 0);
+      const HYPRE_Int iend   = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, tmp, 1);
 
       /* works on WARP_SIZE samples at a time */
       for (HYPRE_Int r = 0; r < nsamples; r += HYPRE_WARP_SIZE)
@@ -196,7 +253,7 @@ void cohen_rowest_kernel(HYPRE_Int nrow, HYPRE_Int *rowptr, HYPRE_Int *colidx, T
 
             for (HYPRE_Int k = 0; k < HYPRE_WARP_SIZE; k++)
             {
-               HYPRE_Int colk = __shfl_sync(HYPRE_WARP_FULL_MASK, col, k);
+               HYPRE_Int colk = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, col, k);
                if (colk == -1)
                {
                   hypre_device_assert(j + HYPRE_WARP_SIZE >= iend);
@@ -206,7 +263,11 @@ void cohen_rowest_kernel(HYPRE_Int nrow, HYPRE_Int *rowptr, HYPRE_Int *colidx, T
                if (r + lane_id < nsamples)
                {
                   T val = read_only_load(V_in + r + lane_id + colk * nsamples);
+#if defined(HYPRE_USING_SYCL)
+                  vmin = sycl::min(vmin, val);
+#else
                   vmin = min(vmin, val);
+#endif
                }
             }
          }
@@ -226,7 +287,7 @@ void cohen_rowest_kernel(HYPRE_Int nrow, HYPRE_Int *rowptr, HYPRE_Int *colidx, T
             }
 
             /* partial sum along r */
-            vmin = warp_reduce_sum(vmin);
+            vmin = warp_reduce_sum(item, vmin);
 
             if (lane_id == 0)
             {
@@ -251,11 +312,19 @@ void cohen_rowest_kernel(HYPRE_Int nrow, HYPRE_Int *rowptr, HYPRE_Int *colidx, T
 
             if (low)
             {
+#if defined(HYPRE_USING_SYCL)
+               len = std::max(low[i], len);
+#else
                len = max(low[i], len);
+#endif
             }
             if (upp)
             {
+#if defined(HYPRE_USING_SYCL)
+               len = std::min(upp[i], len);
+#else
                len = min(upp[i], len);
+#endif
             }
             if (rc)
             {
@@ -267,38 +336,81 @@ void cohen_rowest_kernel(HYPRE_Int nrow, HYPRE_Int *rowptr, HYPRE_Int *colidx, T
 }
 
 template <typename T, HYPRE_Int BDIMX, HYPRE_Int BDIMY, HYPRE_Int NUM_WARPS_PER_BLOCK, HYPRE_Int SHMEM_SIZE_PER_WARP>
-void csr_spmm_rownnz_cohen(HYPRE_Int M, HYPRE_Int K, HYPRE_Int N, HYPRE_Int *d_ia, HYPRE_Int *d_ja, HYPRE_Int *d_ib, HYPRE_Int *d_jb, HYPRE_Int *d_low, HYPRE_Int *d_upp, HYPRE_Int *d_rc, HYPRE_Int nsamples, T mult_factor, T *work)
+void hypre_spgemm_rownnz_cohen( HYPRE_Int  M,
+                                HYPRE_Int  K,
+                                HYPRE_Int  N,
+                                HYPRE_Int *d_ia,
+                                HYPRE_Int *d_ja,
+                                HYPRE_Int *d_ib,
+                                HYPRE_Int *d_jb,
+                                HYPRE_Int *d_low,
+                                HYPRE_Int *d_upp,
+                                HYPRE_Int *d_rc,
+                                HYPRE_Int  nsamples,
+                                T          mult_factor,
+                                T         *work )
 {
+#if defined(HYPRE_USING_SYCL)
+   dim3 bDim(NUM_WARPS_PER_BLOCK, BDIMY, BDIMX);
+   hypre_assert(bDim.get(2) * bDim.get(1) == HYPRE_WARP_SIZE);
+#else
    dim3 bDim(BDIMX, BDIMY, NUM_WARPS_PER_BLOCK);
    hypre_assert(bDim.x * bDim.y == HYPRE_WARP_SIZE);
+#endif
 
    T *d_V1, *d_V2, *d_V3;
 
    d_V1 = work;
-   d_V2 = d_V1 + nsamples*N;
+   d_V2 = d_V1 + nsamples * N;
    //d_V1 = hypre_TAlloc(T, nsamples*N, HYPRE_MEMORY_DEVICE);
    //d_V2 = hypre_TAlloc(T, nsamples*K, HYPRE_MEMORY_DEVICE);
 
+#ifdef HYPRE_SPGEMM_TIMING
+   HYPRE_Real t1, t2;
+   t1 = hypre_MPI_Wtime();
+#endif
+
    /* random V1: uniform --> exp */
    hypre_CurandUniformSingle(nsamples * N, d_V1, 0, 0, 0, 0);
 
-   dim3 gDim( (nsamples * N + bDim.z * HYPRE_WARP_SIZE - 1) / (bDim.z * HYPRE_WARP_SIZE) );
+#ifdef HYPRE_SPGEMM_TIMING
+   hypre_ForceSyncComputeStream();
+   t2 = hypre_MPI_Wtime() - t1;
+   HYPRE_SPGEMM_PRINT("Curand time %f\n", t2);
+#endif
+
+#if defined(HYPRE_USING_SYCL)
+   dim3 gDim( 1, 1, (nsamples * N + bDim.get(0) * HYPRE_WARP_SIZE - 1) / (bDim.get(
+                                                                             0) * HYPRE_WARP_SIZE) );
+#else
+   dim3 gDim( (nsamples * N + bDim.z * HYPRE_WARP_SIZE - 1) / (bDim.z * HYPRE_WARP_SIZE), 1, 1 );
+#endif
 
-   HYPRE_CUDA_LAUNCH( expdistfromuniform, gDim, bDim, nsamples * N, d_V1 );
+   HYPRE_GPU_LAUNCH( hypre_expdistfromuniform, gDim, bDim, nsamples * N, d_V1 );
 
    /* step-1: layer 3-2 */
+#if defined(HYPRE_USING_SYCL)
+   gDim[2] = (K + bDim.get(0) - 1) / bDim.get(0);
+#else
    gDim.x = (K + bDim.z - 1) / bDim.z;
-   HYPRE_CUDA_LAUNCH( (cohen_rowest_kernel<T, NUM_WARPS_PER_BLOCK, SHMEM_SIZE_PER_WARP, 2>), gDim, bDim,
-                      K, d_ib, d_jb, d_V1, d_V2, NULL, nsamples, NULL, NULL, -1.0);
+#endif
+   HYPRE_GPU_LAUNCH( (hypre_cohen_rowest_kernel<T, NUM_WARPS_PER_BLOCK, SHMEM_SIZE_PER_WARP, 2>),
+                     gDim, bDim,
+                     K, d_ib, d_jb, d_V1, d_V2, NULL, nsamples, NULL, NULL, -1.0);
 
    //hypre_TFree(d_V1, HYPRE_MEMORY_DEVICE);
 
    /* step-2: layer 2-1 */
    d_V3 = (T*) d_rc;
 
+#if defined(HYPRE_USING_SYCL)
+   gDim[2] = (M + bDim.get(0) - 1) / bDim.get(0);
+#else
    gDim.x = (M + bDim.z - 1) / bDim.z;
-   HYPRE_CUDA_LAUNCH( (cohen_rowest_kernel<T, NUM_WARPS_PER_BLOCK, SHMEM_SIZE_PER_WARP, 1>), gDim, bDim,
-                      M, d_ia, d_ja, d_V2, d_V3, d_rc, nsamples, d_low, d_upp, mult_factor);
+#endif
+   HYPRE_GPU_LAUNCH( (hypre_cohen_rowest_kernel<T, NUM_WARPS_PER_BLOCK, SHMEM_SIZE_PER_WARP, 1>),
+                     gDim, bDim,
+                     M, d_ia, d_ja, d_V2, d_V3, d_rc, nsamples, d_low, d_upp, mult_factor);
 
    /* done */
    //hypre_TFree(d_V2, HYPRE_MEMORY_DEVICE);
@@ -306,60 +418,87 @@ void csr_spmm_rownnz_cohen(HYPRE_Int M, HYPRE_Int K, HYPRE_Int N, HYPRE_Int *d_i
 
 
 HYPRE_Int
-hypreDevice_CSRSpGemmRownnzEstimate(HYPRE_Int m, HYPRE_Int k, HYPRE_Int n,
-                                    HYPRE_Int *d_ia, HYPRE_Int *d_ja, HYPRE_Int *d_ib, HYPRE_Int *d_jb, HYPRE_Int *d_rc)
+hypreDevice_CSRSpGemmRownnzEstimate( HYPRE_Int  m,
+                                     HYPRE_Int  k,
+                                     HYPRE_Int  n,
+                                     HYPRE_Int *d_ia,
+                                     HYPRE_Int *d_ja,
+                                     HYPRE_Int *d_ib,
+                                     HYPRE_Int *d_jb,
+                                     HYPRE_Int *d_rc,
+                                     HYPRE_Int  row_est_mtd )
 {
+#ifdef HYPRE_SPGEMM_NVTX
+   hypre_GpuProfilingPushRange("CSRSpGemmRowEstimate");
+#endif
+
 #ifdef HYPRE_PROFILE
-   hypre_profile_times[HYPRE_TIMER_ID_SPMM_ROWNNZ] -= hypre_MPI_Wtime();
+   hypre_profile_times[HYPRE_TIMER_ID_SPGEMM_ROWNNZ] -= hypre_MPI_Wtime();
 #endif
 
+#ifdef HYPRE_SPGEMM_TIMING
+   HYPRE_Real t1 = hypre_MPI_Wtime();
+#endif
+
+   static constexpr HYPRE_Int shmem_size_per_warp = 128;
    const HYPRE_Int num_warps_per_block =  16;
-   const HYPRE_Int shmem_size_per_warp = 128;
    const HYPRE_Int BDIMX               =   2;
    const HYPRE_Int BDIMY               = HYPRE_WARP_SIZE / BDIMX;
 
+#if defined(HYPRE_USING_SYCL)
+   /* CUDA kernel configurations */
+   dim3 bDim(num_warps_per_block, BDIMY, BDIMX);
+   hypre_assert(bDim.get(2) * bDim.get(1) == HYPRE_WARP_SIZE);
+   // for cases where one WARP works on a row
+   dim3 gDim(1, 1, (m + bDim.get(0) - 1) / bDim.get(0));
+#else
    /* CUDA kernel configurations */
    dim3 bDim(BDIMX, BDIMY, num_warps_per_block);
    hypre_assert(bDim.x * bDim.y == HYPRE_WARP_SIZE);
    // for cases where one WARP works on a row
    dim3 gDim( (m + bDim.z - 1) / bDim.z );
+#endif
 
-   HYPRE_Int   row_est_mtd    = hypre_HandleSpgemmRownnzEstimateMethod(hypre_handle());
-   HYPRE_Int   cohen_nsamples = hypre_HandleSpgemmRownnzEstimateNsamples(hypre_handle());
-   float cohen_mult           = hypre_HandleSpgemmRownnzEstimateMultFactor(hypre_handle());
+   size_t cohen_nsamples = hypre_HandleSpgemmRownnzEstimateNsamples(hypre_handle());
+   float  cohen_mult     = hypre_HandleSpgemmRownnzEstimateMultFactor(hypre_handle());
+
+   //hypre_printf("Cohen Nsamples %d, mult %f\n", cohen_nsamples, cohen_mult);
 
    if (row_est_mtd == 1)
    {
       /* naive overestimate */
-      HYPRE_CUDA_LAUNCH( (csr_spmm_rownnz_naive<'U', num_warps_per_block>), gDim, bDim,
-                         m, /*k,*/ n, d_ia, d_ja, d_ib, d_jb, NULL, d_rc );
+      HYPRE_GPU_LAUNCH( (hypre_spgemm_rownnz_naive<'U', num_warps_per_block>), gDim, bDim,
+                        m, /*k,*/ n, d_ia, d_ja, d_ib, d_jb, NULL, d_rc );
    }
    else if (row_est_mtd == 2)
    {
       /* naive underestimate */
-      HYPRE_CUDA_LAUNCH( (csr_spmm_rownnz_naive<'L', num_warps_per_block>), gDim, bDim,
-                         m, /*k,*/ n, d_ia, d_ja, d_ib, d_jb, d_rc, NULL );
+      HYPRE_GPU_LAUNCH( (hypre_spgemm_rownnz_naive<'L', num_warps_per_block>), gDim, bDim,
+                        m, /*k,*/ n, d_ia, d_ja, d_ib, d_jb, d_rc, NULL );
    }
    else if (row_est_mtd == 3)
    {
       /* [optional] first run naive estimate for naive lower and upper bounds,
                     which will be given to Cohen's alg as corrections */
-      char *work_mem = hypre_TAlloc(char, cohen_nsamples*(n+k)*sizeof(float)+2*m*sizeof(HYPRE_Int), HYPRE_MEMORY_DEVICE);
+      char *work_mem = hypre_TAlloc(char,
+                                    cohen_nsamples * (n + k) * sizeof(float) + 2 * m * sizeof(HYPRE_Int),
+                                    HYPRE_MEMORY_DEVICE);
       char *work_mem_saved = work_mem;
 
       //HYPRE_Int *d_low_upp = hypre_TAlloc(HYPRE_Int, 2 * m, HYPRE_MEMORY_DEVICE);
       HYPRE_Int *d_low_upp = (HYPRE_Int *) work_mem;
-      work_mem += 2*m*sizeof(HYPRE_Int);
+      work_mem += 2 * m * sizeof(HYPRE_Int);
 
       HYPRE_Int *d_low = d_low_upp;
       HYPRE_Int *d_upp = d_low_upp + m;
 
-      HYPRE_CUDA_LAUNCH( (csr_spmm_rownnz_naive<'B', num_warps_per_block>), gDim, bDim,
-                         m, /*k,*/ n, d_ia, d_ja, d_ib, d_jb, d_low, d_upp );
+      HYPRE_GPU_LAUNCH( (hypre_spgemm_rownnz_naive<'B', num_warps_per_block>), gDim, bDim,
+                        m, /*k,*/ n, d_ia, d_ja, d_ib, d_jb, d_low, d_upp );
 
       /* Cohen's algorithm, stochastic approach */
-      csr_spmm_rownnz_cohen<float, BDIMX, BDIMY, num_warps_per_block, shmem_size_per_warp>
-         (m, k, n, d_ia, d_ja, d_ib, d_jb, d_low, d_upp, d_rc, cohen_nsamples, cohen_mult, (float *)work_mem);
+      hypre_spgemm_rownnz_cohen<float, BDIMX, BDIMY, num_warps_per_block, shmem_size_per_warp>
+      (m, k, n, d_ia, d_ja, d_ib, d_jb, d_low, d_upp, d_rc, cohen_nsamples, cohen_mult,
+       (float *)work_mem);
 
       //hypre_TFree(d_low_upp, HYPRE_MEMORY_DEVICE);
       hypre_TFree(work_mem_saved, HYPRE_MEMORY_DEVICE);
@@ -371,12 +510,21 @@ hypreDevice_CSRSpGemmRownnzEstimate(HYPRE_Int m, HYPRE_Int k, HYPRE_Int n,
       hypre_error_w_msg(HYPRE_ERROR_GENERIC, msg);
    }
 
+#ifdef HYPRE_SPGEMM_TIMING
+   hypre_ForceSyncComputeStream();
+   HYPRE_Real t2 = hypre_MPI_Wtime() - t1;
+   HYPRE_SPGEMM_PRINT("RownnzEst time %f\n", t2);
+#endif
+
 #ifdef HYPRE_PROFILE
-   cudaThreadSynchronize();
-   hypre_profile_times[HYPRE_TIMER_ID_SPMM_ROWNNZ] += hypre_MPI_Wtime();
+   hypre_profile_times[HYPRE_TIMER_ID_SPGEMM_ROWNNZ] += hypre_MPI_Wtime();
+#endif
+
+#ifdef HYPRE_SPGEMM_NVTX
+   hypre_GpuProfilingPopRange();
 #endif
 
    return hypre_error_flag;
 }
 
-#endif /* HYPRE_USING_CUDA  || defined(HYPRE_USING_HIP) */
+#endif /* defined(HYPRE_USING_GPU) */
diff --git a/external/hypre/src/seq_mv/csr_spgemm_device_symbl.c b/external/hypre/src/seq_mv/csr_spgemm_device_symbl.c
new file mode 100644
index 00000000..f4074019
--- /dev/null
+++ b/external/hypre/src/seq_mv/csr_spgemm_device_symbl.c
@@ -0,0 +1,426 @@
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+#include "_hypre_onedpl.hpp"
+#include "seq_mv.h"
+#include "csr_spgemm_device.h"
+
+#if defined(HYPRE_USING_GPU)
+
+#define HYPRE_SPGEMM_ROWNNZ_BINNED(BIN, SHMEM_HASH_SIZE, GROUP_SIZE, GHASH, CAN_FAIL, RF)  \
+{                                                                                          \
+   const HYPRE_Int p = h_bin_ptr[BIN - 1];                                                 \
+   const HYPRE_Int q = h_bin_ptr[BIN];                                                     \
+   const HYPRE_Int bs = q - p;                                                             \
+   if (bs)                                                                                 \
+   {                                                                                       \
+      HYPRE_SPGEMM_PRINT("bin[%d]: %d rows, p %d, q %d\n", BIN, bs, p, q);                 \
+      hypre_spgemm_symbolic_rownnz<BIN, SHMEM_HASH_SIZE, GROUP_SIZE, true>                 \
+         ( bs, d_rind + p, k, n, GHASH, d_ia, d_ja, d_ib, d_jb, d_rc, CAN_FAIL, RF );      \
+   }                                                                                       \
+}
+
+HYPRE_Int
+hypreDevice_CSRSpGemmRownnzUpperboundNoBin( HYPRE_Int  m,
+                                            HYPRE_Int  k,
+                                            HYPRE_Int  n,
+                                            HYPRE_Int *d_ia,
+                                            HYPRE_Int *d_ja,
+                                            HYPRE_Int *d_ib,
+                                            HYPRE_Int *d_jb,
+                                            HYPRE_Int  in_rc,
+                                            HYPRE_Int *d_rc,
+                                            char      *d_rf )
+{
+   static constexpr HYPRE_Int SHMEM_HASH_SIZE = SYMBL_HASH_SIZE[5];
+   static constexpr HYPRE_Int GROUP_SIZE = T_GROUP_SIZE[5];
+   static constexpr HYPRE_Int BIN = 5;
+
+   const bool need_ghash = in_rc > 0;
+   const bool can_fail = in_rc < 2;
+
+   hypre_spgemm_symbolic_rownnz<BIN, SHMEM_HASH_SIZE, GROUP_SIZE, false>
+   (m, NULL, k, n, need_ghash, d_ia, d_ja, d_ib, d_jb, d_rc, can_fail, d_rf);
+
+   return hypre_error_flag;
+}
+
+HYPRE_Int
+hypreDevice_CSRSpGemmRownnzUpperboundBinned( HYPRE_Int  m,
+                                             HYPRE_Int  k,
+                                             HYPRE_Int  n,
+                                             HYPRE_Int *d_ia,
+                                             HYPRE_Int *d_ja,
+                                             HYPRE_Int *d_ib,
+                                             HYPRE_Int *d_jb,
+                                             HYPRE_Int  in_rc,
+                                             HYPRE_Int *d_rc,
+                                             char      *d_rf )
+{
+   HYPRE_UNUSED_VAR(in_rc);
+
+   const bool CAN_FAIL = true;
+
+   /* Binning (bins 3-10) with d_rc */
+   HYPRE_Int h_bin_ptr[HYPRE_SPGEMM_MAX_NBIN + 1];
+   //HYPRE_Int num_bins = hypre_HandleSpgemmNumBin(hypre_handle());
+   HYPRE_Int high_bin = hypre_HandleSpgemmHighestBin(hypre_handle())[0];
+   const bool hbin9 = 9 == high_bin;
+   const char s = 32, t = 3, u = high_bin;
+
+   HYPRE_Int *d_rind = hypre_TAlloc(HYPRE_Int, m, HYPRE_MEMORY_DEVICE);
+
+   hypre_SpGemmCreateBins(m, s, t, u, d_rc, false, d_rind, h_bin_ptr);
+
+   HYPRE_SPGEMM_ROWNNZ_BINNED(  3, SYMBL_HASH_SIZE[ 3], T_GROUP_SIZE[ 3], false, CAN_FAIL, d_rf);
+   HYPRE_SPGEMM_ROWNNZ_BINNED(  4, SYMBL_HASH_SIZE[ 4], T_GROUP_SIZE[ 4], false, CAN_FAIL, d_rf);
+   HYPRE_SPGEMM_ROWNNZ_BINNED(  5, SYMBL_HASH_SIZE[ 5], T_GROUP_SIZE[ 5], false, CAN_FAIL, d_rf);
+   HYPRE_SPGEMM_ROWNNZ_BINNED(  6, SYMBL_HASH_SIZE[ 6], T_GROUP_SIZE[ 6], false, CAN_FAIL, d_rf);
+   HYPRE_SPGEMM_ROWNNZ_BINNED(  7, SYMBL_HASH_SIZE[ 7], T_GROUP_SIZE[ 7], false, CAN_FAIL, d_rf);
+   HYPRE_SPGEMM_ROWNNZ_BINNED(  8, SYMBL_HASH_SIZE[ 8], T_GROUP_SIZE[ 8], false, CAN_FAIL, d_rf);
+   HYPRE_SPGEMM_ROWNNZ_BINNED(  9, SYMBL_HASH_SIZE[ 9], T_GROUP_SIZE[ 9], hbin9, CAN_FAIL, d_rf);
+   HYPRE_SPGEMM_ROWNNZ_BINNED( 10, SYMBL_HASH_SIZE[10], T_GROUP_SIZE[10], true,  CAN_FAIL, d_rf);
+
+   hypre_TFree(d_rind, HYPRE_MEMORY_DEVICE);
+
+   return hypre_error_flag;
+}
+
+/* in_rc: 0: no input row count
+ *        1: input row count est (CURRENTLY ONLY 1)
+*/
+HYPRE_Int
+hypreDevice_CSRSpGemmRownnzUpperbound( HYPRE_Int  m,
+                                       HYPRE_Int  k,
+                                       HYPRE_Int  n,
+                                       HYPRE_Int *d_ia,
+                                       HYPRE_Int *d_ja,
+                                       HYPRE_Int *d_ib,
+                                       HYPRE_Int *d_jb,
+                                       HYPRE_Int  in_rc,
+                                       HYPRE_Int *d_rc,
+                                       HYPRE_Int *rownnz_exact_ptr)
+{
+   HYPRE_UNUSED_VAR(in_rc);
+
+#ifdef HYPRE_PROFILE
+   hypre_profile_times[HYPRE_TIMER_ID_SPGEMM_SYMBOLIC] -= hypre_MPI_Wtime();
+#endif
+
+#ifdef HYPRE_SPGEMM_NVTX
+   hypre_GpuProfilingPushRange("CSRSpGemmRownnzUpperbound");
+#endif
+
+#ifdef HYPRE_SPGEMM_TIMING
+   HYPRE_Real t1 = hypre_MPI_Wtime();
+#endif
+
+   char *d_rf = hypre_TAlloc(char, m, HYPRE_MEMORY_DEVICE);
+
+   const HYPRE_Int binned = hypre_HandleSpgemmBinned(hypre_handle());
+
+   if (binned)
+   {
+      hypreDevice_CSRSpGemmRownnzUpperboundBinned
+      (m, k, n, d_ia, d_ja, d_ib, d_jb, 1 /* with input rc */, d_rc, d_rf);
+   }
+   else
+   {
+      hypreDevice_CSRSpGemmRownnzUpperboundNoBin
+      (m, k, n, d_ia, d_ja, d_ib, d_jb, 1 /* with input rc */, d_rc, d_rf);
+   }
+
+   /* row nnz is exact if no row failed */
+#if defined(HYPRE_USING_SYCL)
+   *rownnz_exact_ptr = !HYPRE_ONEDPL_CALL( std::any_of,
+                                           d_rf,
+                                           d_rf + m,
+   [] (const auto & x) {return x;} );
+#else
+   *rownnz_exact_ptr = !HYPRE_THRUST_CALL( any_of,
+                                           d_rf,
+                                           d_rf + m,
+                                           thrust::identity<char>() );
+#endif
+
+   hypre_TFree(d_rf, HYPRE_MEMORY_DEVICE);
+
+#ifdef HYPRE_SPGEMM_TIMING
+   hypre_ForceSyncComputeStream();
+   HYPRE_Real t2 = hypre_MPI_Wtime() - t1;
+   HYPRE_SPGEMM_PRINT("RownnzBound time %f\n", t2);
+#endif
+
+#ifdef HYPRE_SPGEMM_NVTX
+   hypre_GpuProfilingPopRange();
+#endif
+
+#ifdef HYPRE_PROFILE
+   hypre_profile_times[HYPRE_TIMER_ID_SPGEMM_SYMBOLIC] += hypre_MPI_Wtime();
+#endif
+
+   return hypre_error_flag;
+}
+
+/* in_rc: 0: no input row count  (CURRENTLY ONLY 0)
+ *        1: input row count est
+ *        2: input row bound
+*/
+HYPRE_Int
+hypreDevice_CSRSpGemmRownnzNoBin( HYPRE_Int  m,
+                                  HYPRE_Int  k,
+                                  HYPRE_Int  n,
+                                  HYPRE_Int *d_ia,
+                                  HYPRE_Int *d_ja,
+                                  HYPRE_Int *d_ib,
+                                  HYPRE_Int *d_jb,
+                                  HYPRE_Int  in_rc,
+                                  HYPRE_Int *d_rc )
+{
+   static constexpr HYPRE_Int SHMEM_HASH_SIZE = SYMBL_HASH_SIZE[5];
+   static constexpr HYPRE_Int GROUP_SIZE = T_GROUP_SIZE[5];
+   static constexpr HYPRE_Int BIN = 5;
+
+   const bool need_ghash = in_rc > 0;
+   const bool can_fail = in_rc < 2;
+
+   char *d_rf = can_fail ? hypre_TAlloc(char, m, HYPRE_MEMORY_DEVICE) : NULL;
+
+   hypre_spgemm_symbolic_rownnz<BIN, SHMEM_HASH_SIZE, GROUP_SIZE, false>
+   (m, NULL, k, n, need_ghash, d_ia, d_ja, d_ib, d_jb, d_rc, can_fail, d_rf);
+
+   if (can_fail)
+   {
+      /* row nnz is exact if no row failed */
+#if defined(HYPRE_USING_SYCL)
+      HYPRE_Int num_failed_rows =
+         HYPRE_ONEDPL_CALL( std::reduce,
+                            oneapi::dpl::make_transform_iterator(d_rf,     type_cast<char, HYPRE_Int>()),
+                            oneapi::dpl::make_transform_iterator(d_rf + m, type_cast<char, HYPRE_Int>()) );
+#else
+      HYPRE_Int num_failed_rows =
+         HYPRE_THRUST_CALL( reduce,
+                            thrust::make_transform_iterator(d_rf,     type_cast<char, HYPRE_Int>()),
+                            thrust::make_transform_iterator(d_rf + m, type_cast<char, HYPRE_Int>()) );
+#endif
+
+      if (num_failed_rows)
+      {
+#ifdef HYPRE_SPGEMM_PRINTF
+         HYPRE_SPGEMM_PRINT("[%s, %d]: num of failed rows %d (%.2f)\n", __FILE__, __LINE__,
+                            num_failed_rows, num_failed_rows / (m + 0.0) );
+#endif
+         HYPRE_Int *d_rind = hypre_TAlloc(HYPRE_Int, num_failed_rows, HYPRE_MEMORY_DEVICE);
+
+#if defined(HYPRE_USING_SYCL)
+         oneapi::dpl::counting_iterator count(0);
+         HYPRE_Int *new_end = hypreSycl_copy_if(
+                                 count,
+                                 count + m,
+                                 d_rf,
+                                 d_rind,
+         [] (const auto & x) {return x;} );
+#else
+         HYPRE_Int *new_end =
+            HYPRE_THRUST_CALL( copy_if,
+                               thrust::make_counting_iterator(0),
+                               thrust::make_counting_iterator(m),
+                               d_rf,
+                               d_rind,
+                               thrust::identity<char>() );
+#endif
+
+         hypre_assert(new_end - d_rind == num_failed_rows);
+
+         hypre_spgemm_symbolic_rownnz < BIN + 1, 2 * SHMEM_HASH_SIZE, 2 * GROUP_SIZE, true >
+         (num_failed_rows, d_rind, k, n, true, d_ia, d_ja, d_ib, d_jb, d_rc, false, NULL);
+
+         hypre_TFree(d_rind, HYPRE_MEMORY_DEVICE);
+      }
+   }
+
+   hypre_TFree(d_rf, HYPRE_MEMORY_DEVICE);
+
+   return hypre_error_flag;
+}
+
+/* in_rc: 0: no input row count  (CURRENTLY ONLY 0)
+ *        1: input row count est
+ *        2: input row bound
+*/
+HYPRE_Int
+hypreDevice_CSRSpGemmRownnzBinned( HYPRE_Int  m,
+                                   HYPRE_Int  k,
+                                   HYPRE_Int  n,
+                                   HYPRE_Int  nnzA,
+                                   HYPRE_Int *d_ia,
+                                   HYPRE_Int *d_ja,
+                                   HYPRE_Int *d_ib,
+                                   HYPRE_Int *d_jb,
+                                   HYPRE_Int  in_rc,
+                                   HYPRE_Int *d_rc )
+{
+   HYPRE_UNUSED_VAR(in_rc);
+
+   const char s = 32, t = 1, u = 5;
+   HYPRE_Int  h_bin_ptr[HYPRE_SPGEMM_MAX_NBIN + 1];
+#if 0
+   HYPRE_Int *d_rind = hypre_TAlloc(HYPRE_Int, m, HYPRE_MEMORY_DEVICE);
+
+   hypreDevice_CSRSpGemmRownnzEstimate(m, k, n, d_ia, d_ja, d_ib, d_jb, d_rc, 1);
+#else
+   HYPRE_Int *d_rind = hypre_TAlloc(HYPRE_Int, hypre_max(m, k + 1), HYPRE_MEMORY_DEVICE);
+
+#ifdef HYPRE_SPGEMM_TIMING
+   HYPRE_Real t1 = hypre_MPI_Wtime();
+#endif
+
+   /* naive upper bound */
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_ONEDPL_CALL( std::adjacent_difference, d_ib, d_ib + k + 1, d_rind );
+#else
+   HYPRE_THRUST_CALL( adjacent_difference, d_ib, d_ib + k + 1, d_rind );
+#endif
+   hypre_CSRMatrixIntSpMVDevice(m, nnzA, 1, d_ia, d_ja, NULL, d_rind + 1, 0, d_rc);
+
+#ifdef HYPRE_SPGEMM_TIMING
+   hypre_ForceSyncComputeStream();
+   HYPRE_Real t2 = hypre_MPI_Wtime() - t1;
+   HYPRE_SPGEMM_PRINT("RownnzEst time %f\n", t2);
+#endif
+#endif
+
+   hypre_SpGemmCreateBins(m, s, t, u, d_rc, false, d_rind, h_bin_ptr);
+
+   HYPRE_SPGEMM_ROWNNZ_BINNED( 1, SYMBL_HASH_SIZE[1], T_GROUP_SIZE[1], false, false, NULL);
+   HYPRE_SPGEMM_ROWNNZ_BINNED( 2, SYMBL_HASH_SIZE[2], T_GROUP_SIZE[2], false, false, NULL);
+   HYPRE_SPGEMM_ROWNNZ_BINNED( 3, SYMBL_HASH_SIZE[3], T_GROUP_SIZE[3], false, false, NULL);
+   HYPRE_SPGEMM_ROWNNZ_BINNED( 4, SYMBL_HASH_SIZE[4], T_GROUP_SIZE[4], false, false, NULL);
+
+   if (h_bin_ptr[5] > h_bin_ptr[4])
+   {
+      char *d_rf = hypre_CTAlloc(char, m, HYPRE_MEMORY_DEVICE);
+
+      HYPRE_SPGEMM_ROWNNZ_BINNED( 5, SYMBL_HASH_SIZE[5], T_GROUP_SIZE[5], false, true, d_rf);
+
+#if defined(HYPRE_USING_SYCL)
+      HYPRE_Int num_failed_rows =
+         HYPRE_ONEDPL_CALL( std::reduce,
+                            oneapi::dpl::make_transform_iterator(d_rf,     type_cast<char, HYPRE_Int>()),
+                            oneapi::dpl::make_transform_iterator(d_rf + m, type_cast<char, HYPRE_Int>()) );
+#else
+      HYPRE_Int num_failed_rows =
+         HYPRE_THRUST_CALL( reduce,
+                            thrust::make_transform_iterator(d_rf,     type_cast<char, HYPRE_Int>()),
+                            thrust::make_transform_iterator(d_rf + m, type_cast<char, HYPRE_Int>()) );
+#endif
+
+      if (num_failed_rows)
+      {
+#ifdef HYPRE_SPGEMM_PRINTF
+         HYPRE_SPGEMM_PRINT("[%s, %d]: num of failed rows %d (%.2f)\n", __FILE__, __LINE__,
+                            num_failed_rows, num_failed_rows / (m + 0.0) );
+#endif
+#if defined(HYPRE_USING_SYCL)
+         oneapi::dpl::counting_iterator count(0);
+         HYPRE_Int *new_end =
+            hypreSycl_copy_if( count,
+                               count + m,
+                               d_rf,
+                               d_rind,
+         [] (const auto & x) {return x;} );
+#else
+         HYPRE_Int *new_end =
+            HYPRE_THRUST_CALL( copy_if,
+                               thrust::make_counting_iterator(0),
+                               thrust::make_counting_iterator(m),
+                               d_rf,
+                               d_rind,
+                               thrust::identity<char>() );
+#endif
+
+         hypre_assert(new_end - d_rind == num_failed_rows);
+
+         /* Binning (bins 6-10) with d_rc which is a **rownnz-bound** now */
+         HYPRE_Int high_bin = hypre_HandleSpgemmHighestBin(hypre_handle())[0];
+         const char t = 6, u = high_bin;
+         const bool hbin9 = 9 == high_bin;
+
+         hypre_SpGemmCreateBins(num_failed_rows, s, t, u, d_rc, true, d_rind, h_bin_ptr);
+
+         HYPRE_SPGEMM_ROWNNZ_BINNED(  6, SYMBL_HASH_SIZE[ 6], T_GROUP_SIZE[ 6], false, false, NULL);
+         HYPRE_SPGEMM_ROWNNZ_BINNED(  7, SYMBL_HASH_SIZE[ 7], T_GROUP_SIZE[ 7], false, false, NULL);
+         HYPRE_SPGEMM_ROWNNZ_BINNED(  8, SYMBL_HASH_SIZE[ 8], T_GROUP_SIZE[ 8], false, false, NULL);
+         HYPRE_SPGEMM_ROWNNZ_BINNED(  9, SYMBL_HASH_SIZE[ 9], T_GROUP_SIZE[ 9], hbin9, false, NULL);
+         HYPRE_SPGEMM_ROWNNZ_BINNED( 10, SYMBL_HASH_SIZE[10], T_GROUP_SIZE[10], true,  false, NULL);
+      }
+
+      hypre_TFree(d_rf, HYPRE_MEMORY_DEVICE);
+   }
+
+   hypre_TFree(d_rind, HYPRE_MEMORY_DEVICE);
+
+   return hypre_error_flag;
+}
+
+HYPRE_Int
+hypreDevice_CSRSpGemmRownnz( HYPRE_Int  m,
+                             HYPRE_Int  k,
+                             HYPRE_Int  n,
+                             HYPRE_Int  nnzA,
+                             HYPRE_Int *d_ia,
+                             HYPRE_Int *d_ja,
+                             HYPRE_Int *d_ib,
+                             HYPRE_Int *d_jb,
+                             HYPRE_Int  in_rc,
+                             HYPRE_Int *d_rc )
+{
+   HYPRE_UNUSED_VAR(in_rc);
+
+#ifdef HYPRE_PROFILE
+   hypre_profile_times[HYPRE_TIMER_ID_SPGEMM_SYMBOLIC] -= hypre_MPI_Wtime();
+#endif
+
+#ifdef HYPRE_SPGEMM_NVTX
+   hypre_GpuProfilingPushRange("CSRSpGemmRownnz");
+#endif
+
+#ifdef HYPRE_SPGEMM_TIMING
+   HYPRE_Real t1 = hypre_MPI_Wtime();
+#endif
+
+   const HYPRE_Int binned = hypre_HandleSpgemmBinned(hypre_handle());
+
+   if (binned)
+   {
+      hypreDevice_CSRSpGemmRownnzBinned
+      (m, k, n, nnzA, d_ia, d_ja, d_ib, d_jb, 0 /* without input rc */, d_rc);
+   }
+   else
+   {
+      hypreDevice_CSRSpGemmRownnzNoBin
+      (m, k, n, d_ia, d_ja, d_ib, d_jb, 0 /* without input rc */, d_rc);
+   }
+
+#ifdef HYPRE_SPGEMM_TIMING
+   hypre_ForceSyncComputeStream();
+   HYPRE_Real t2 = hypre_MPI_Wtime() - t1;
+   HYPRE_SPGEMM_PRINT("Rownnz time %f\n", t2);
+#endif
+
+#ifdef HYPRE_SPGEMM_NVTX
+   hypre_GpuProfilingPopRange();
+#endif
+
+#ifdef HYPRE_PROFILE
+   hypre_profile_times[HYPRE_TIMER_ID_SPGEMM_SYMBOLIC] += hypre_MPI_Wtime();
+#endif
+
+   return hypre_error_flag;
+}
+
+#endif /* defined(HYPRE_USING_GPU) */
diff --git a/external/hypre/src/seq_mv/csr_spgemm_device_symbl.h b/external/hypre/src/seq_mv/csr_spgemm_device_symbl.h
new file mode 100644
index 00000000..bf64351f
--- /dev/null
+++ b/external/hypre/src/seq_mv/csr_spgemm_device_symbl.h
@@ -0,0 +1,629 @@
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+#include "seq_mv.h"
+#include "csr_spgemm_device.h"
+
+/*- - - - - - - - - - - - - - - - - - - - - - - - - - *
+                Symbolic Multiplication
+ *- - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#if defined(HYPRE_USING_GPU)
+
+/* HashKeys: assumed to be initialized as all -1's
+ * Key:      assumed to be nonnegative
+ * increase by 1 if is a new entry
+ */
+template <HYPRE_Int SHMEM_HASH_SIZE, char HASHTYPE, HYPRE_Int UNROLL_FACTOR>
+static __device__ __forceinline__
+HYPRE_Int
+hypre_spgemm_hash_insert_symbl(
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_Int          *HashKeys,
+#else
+   volatile HYPRE_Int *HashKeys,
+#endif
+   HYPRE_Int           key,
+   HYPRE_Int          &count )
+{
+   HYPRE_Int j = 0;
+   HYPRE_Int old = -1;
+
+#if defined(HYPRE_USING_HIP) && (HIP_VERSION == 50422804)
+   /* VPM: see https://github.com/hypre-space/hypre/issues/875 */
+#pragma unroll 8
+#else
+#pragma unroll UNROLL_FACTOR
+#endif
+   for (HYPRE_Int i = 0; i < SHMEM_HASH_SIZE; i++)
+   {
+      /* compute the hash value of key */
+      if (i == 0)
+      {
+         j = key & (SHMEM_HASH_SIZE - 1);
+      }
+      else
+      {
+         j = HashFunc<SHMEM_HASH_SIZE, HASHTYPE>(key, i, j);
+      }
+
+      /* try to insert key+1 into slot j */
+#if defined(HYPRE_USING_SYCL)
+      auto atomic_key = sycl::atomic_ref <
+                        HYPRE_Int, sycl::memory_order::relaxed,
+                        sycl::memory_scope::device,
+                        sycl::access::address_space::local_space > (HashKeys[j]);
+      old = -1;
+      atomic_key.compare_exchange_strong(old, key);
+#else
+      old = atomicCAS((HYPRE_Int*)(HashKeys + j), -1, key);
+#endif
+      if (old == -1)
+      {
+         count++;
+         return j;
+      }
+      if (old == key)
+      {
+         return j;
+      }
+   }
+   return -1;
+}
+
+template <char HASHTYPE>
+static __device__ __forceinline__
+HYPRE_Int
+hypre_spgemm_hash_insert_symbl( HYPRE_Int           HashSize,
+#if defined(HYPRE_USING_SYCL)
+                                HYPRE_Int          *HashKeys,
+#else
+                                volatile HYPRE_Int *HashKeys,
+#endif
+                                HYPRE_Int           key,
+                                HYPRE_Int          &count )
+{
+   HYPRE_Int j = 0;
+   HYPRE_Int old = -1;
+
+   for (HYPRE_Int i = 0; i < HashSize; i++)
+   {
+      /* compute the hash value of key */
+      if (i == 0)
+      {
+         j = key & (HashSize - 1);
+      }
+      else
+      {
+         j = HashFunc<HASHTYPE>(HashSize, key, i, j);
+      }
+
+      /* try to insert key+1 into slot j */
+#if defined(HYPRE_USING_SYCL)
+      auto atomic_key = sycl::atomic_ref <
+                        HYPRE_Int, sycl::memory_order::relaxed,
+                        sycl::memory_scope::device,
+                        sycl::access::address_space::local_space > (HashKeys[j]);
+      old = -1;
+      atomic_key.compare_exchange_strong(old, key);
+#else
+      old = atomicCAS((HYPRE_Int*)(HashKeys + j), -1, key);
+#endif
+
+      if (old == -1)
+      {
+         count++;
+         return j;
+      }
+      if (old == key)
+      {
+         return j;
+      }
+   }
+   return -1;
+}
+
+template <HYPRE_Int SHMEM_HASH_SIZE, char HASHTYPE, HYPRE_Int GROUP_SIZE, bool HAS_GHASH, bool IA1, HYPRE_Int UNROLL_FACTOR>
+static __device__ __forceinline__
+HYPRE_Int
+hypre_spgemm_compute_row_symbl( hypre_DeviceItem   &item,
+                                HYPRE_Int           istart_a,
+                                HYPRE_Int           iend_a,
+                                const HYPRE_Int    *ja,
+                                const HYPRE_Int    *ib,
+                                const HYPRE_Int    *jb,
+#if defined(HYPRE_USING_SYCL)
+                                HYPRE_Int          *s_HashKeys,
+#else
+                                volatile HYPRE_Int *s_HashKeys,
+#endif
+                                HYPRE_Int           g_HashSize,
+                                HYPRE_Int          *g_HashKeys,
+                                char               &failed )
+{
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_Int threadIdx_x = item.get_local_id(2);
+   HYPRE_Int threadIdx_y = item.get_local_id(1);
+   HYPRE_Int blockDim_x = item.get_local_range(2);
+   HYPRE_Int blockDim_y = item.get_local_range(1);
+#else
+   HYPRE_Int threadIdx_x = threadIdx.x;
+   HYPRE_Int threadIdx_y = threadIdx.y;
+   HYPRE_Int blockDim_x = blockDim.x;
+   HYPRE_Int blockDim_y = blockDim.y;
+#endif
+   HYPRE_Int num_new_insert = 0;
+
+   /* load column idx and values of row i of A */
+   for (HYPRE_Int i = istart_a + threadIdx_y; warp_any_sync(item, HYPRE_WARP_FULL_MASK, i < iend_a);
+        i += blockDim_y)
+   {
+      HYPRE_Int rowB = -1;
+
+      if (threadIdx_x == 0 && i < iend_a)
+      {
+         rowB = read_only_load(ja + i);
+      }
+
+#if 0
+      //const HYPRE_Int ymask = get_mask<4>(...);
+      // TODO: need to confirm the behavior of __ballot_sync, leave it here for now
+      //const HYPRE_Int num_valid_rows = __popc(__ballot_sync(ymask, valid_i));
+      //for (HYPRE_Int j = 0; j < num_valid_rows; j++)
+#endif
+
+      /* threads in the same ygroup work on one row together */
+      rowB = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, rowB, 0, blockDim_x);
+      /* open this row of B, collectively */
+      HYPRE_Int tmp = 0;
+      if (rowB != -1 && threadIdx_x < 2)
+      {
+         tmp = read_only_load(ib + rowB + threadIdx_x);
+      }
+      const HYPRE_Int rowB_start = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, tmp, 0, blockDim_x);
+      const HYPRE_Int rowB_end   = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, tmp, 1, blockDim_x);
+
+      for (HYPRE_Int k = rowB_start + threadIdx_x;
+           warp_any_sync(item, HYPRE_WARP_FULL_MASK, k < rowB_end);
+           k += blockDim_x)
+      {
+         if (k < rowB_end)
+         {
+            if (IA1)
+            {
+               num_new_insert ++;
+            }
+            else
+            {
+               const HYPRE_Int k_idx = read_only_load(jb + k);
+               /* first try to insert into shared memory hash table */
+               HYPRE_Int pos = hypre_spgemm_hash_insert_symbl<SHMEM_HASH_SIZE, HASHTYPE, UNROLL_FACTOR>
+                               (s_HashKeys, k_idx, num_new_insert);
+
+               if (HAS_GHASH && -1 == pos)
+               {
+                  pos = hypre_spgemm_hash_insert_symbl<HASHTYPE>
+                        (g_HashSize, g_HashKeys, k_idx, num_new_insert);
+               }
+               /* if failed again, both hash tables must have been full
+                  (hash table size estimation was too small).
+                  Increase the counter anyhow (will lead to over-counting) */
+               if (pos == -1)
+               {
+                  num_new_insert ++;
+                  failed = 1;
+               }
+            }
+         }
+      }
+   }
+
+   return num_new_insert;
+}
+
+template <HYPRE_Int NUM_GROUPS_PER_BLOCK, HYPRE_Int GROUP_SIZE, HYPRE_Int SHMEM_HASH_SIZE, bool HAS_RIND,
+          bool CAN_FAIL, char HASHTYPE, bool HAS_GHASH>
+__global__ void
+hypre_spgemm_symbolic( hypre_DeviceItem             &item,
+#if defined(HYPRE_USING_SYCL)
+                       char                         *shmem_ptr,
+#endif
+                       const HYPRE_Int               M,
+                       const HYPRE_Int* __restrict__ rind,
+                       const HYPRE_Int* __restrict__ ia,
+                       const HYPRE_Int* __restrict__ ja,
+                       const HYPRE_Int* __restrict__ ib,
+                       const HYPRE_Int* __restrict__ jb,
+                       const HYPRE_Int* __restrict__ ig,
+                       HYPRE_Int*       __restrict__ jg,
+                       HYPRE_Int*       __restrict__ rc,
+                       char*            __restrict__ rf )
+{
+   /* number of groups in the grid */
+#if defined(HYPRE_USING_SYCL)
+   volatile const HYPRE_Int grid_num_groups = get_num_groups(item) * item.get_group_range(2);
+#else
+   volatile const HYPRE_Int grid_num_groups = get_num_groups(item) * gridDim.x;
+#endif
+   /* group id inside the block */
+   volatile const HYPRE_Int group_id = get_group_id(item);
+   /* group id in the grid */
+#if defined(HYPRE_USING_SYCL)
+   volatile const HYPRE_Int grid_group_id = item.get_group(2) * get_num_groups(item) + group_id;
+#else
+   volatile const HYPRE_Int grid_group_id = blockIdx.x * get_num_groups(item) + group_id;
+#endif
+   /* lane id inside the group */
+   volatile const HYPRE_Int lane_id = get_group_lane_id(item);
+#if defined(HYPRE_USING_SYCL)
+   /* shared memory hash table */
+   HYPRE_Int *s_HashKeys = (HYPRE_Int*) shmem_ptr;
+   /* shared memory hash table for this group */
+   HYPRE_Int *group_s_HashKeys = s_HashKeys + group_id * SHMEM_HASH_SIZE;
+#else
+   /* shared memory hash table */
+#if defined(HYPRE_SPGEMM_DEVICE_USE_DSHMEM)
+   extern __shared__ volatile HYPRE_Int shared_mem[];
+   volatile HYPRE_Int *s_HashKeys = shared_mem;
+#else
+   __shared__ volatile HYPRE_Int s_HashKeys[NUM_GROUPS_PER_BLOCK * SHMEM_HASH_SIZE];
+#endif
+   /* shared memory hash table for this group */
+   volatile HYPRE_Int *group_s_HashKeys = s_HashKeys + group_id * SHMEM_HASH_SIZE;
+#endif
+
+   const HYPRE_Int UNROLL_FACTOR = hypre_min(HYPRE_SPGEMM_SYMBL_UNROLL, SHMEM_HASH_SIZE);
+   HYPRE_Int valid_ptr;
+
+#if defined(HYPRE_USING_SYCL)
+   hypre_device_assert(item.get_local_range(2) * item.get_local_range(1) == GROUP_SIZE);
+#else
+   hypre_device_assert(blockDim.x * blockDim.y == GROUP_SIZE);
+#endif
+
+   /* WM: note - in cuda/hip, exited threads are not required to reach collective calls like
+    *            syncthreads(), but this is not true for sycl (all threads must call the collective).
+    *            Thus, all threads in the block must enter the loop (which is not ensured for cuda). */
+#if defined(HYPRE_USING_SYCL)
+   for (HYPRE_Int i = grid_group_id; sycl::any_of_group(item.get_group(), i < M);
+        i += grid_num_groups)
+#else
+   for (HYPRE_Int i = grid_group_id; warp_any_sync(item, HYPRE_WARP_FULL_MASK, i < M);
+        i += grid_num_groups)
+#endif
+   {
+#if defined(HYPRE_USING_SYCL)
+      valid_ptr = warp_any_sync(item, HYPRE_WARP_FULL_MASK, i < M) &&
+                  (GROUP_SIZE >= HYPRE_WARP_SIZE || i < M);
+#else
+      valid_ptr = GROUP_SIZE >= HYPRE_WARP_SIZE || i < M;
+#endif
+
+      HYPRE_Int ii = -1;
+      char failed = 0;
+
+      if (HAS_RIND)
+      {
+         group_read<GROUP_SIZE>(item, rind + i, valid_ptr, ii);
+      }
+      else
+      {
+         ii = i;
+      }
+
+      /* start/end position of global memory hash table */
+      HYPRE_Int istart_g = 0, iend_g = 0, ghash_size = 0;
+
+      if (HAS_GHASH)
+      {
+         group_read<GROUP_SIZE>(item, ig + grid_group_id, valid_ptr,
+                                istart_g, iend_g);
+
+         /* size of global hash table allocated for this row
+           (must be power of 2 and >= the actual size of the row of C - shmem hash size) */
+         ghash_size = iend_g - istart_g;
+
+         /* initialize group's global memory hash table */
+         for (HYPRE_Int k = lane_id; k < ghash_size; k += GROUP_SIZE)
+         {
+            jg[istart_g + k] = -1;
+         }
+      }
+
+      /* initialize group's shared memory hash table */
+      if (valid_ptr)
+      {
+#pragma unroll UNROLL_FACTOR
+         for (HYPRE_Int k = lane_id; k < SHMEM_HASH_SIZE; k += GROUP_SIZE)
+         {
+            group_s_HashKeys[k] = -1;
+         }
+      }
+
+      group_sync<GROUP_SIZE>(item);
+
+      /* start/end position of row of A */
+      HYPRE_Int istart_a = 0, iend_a = 0;
+
+      /* load the start and end position of row ii of A */
+      group_read<GROUP_SIZE>(item, ia + ii, valid_ptr, istart_a, iend_a);
+
+      /* work with two hash tables */
+      HYPRE_Int jsum;
+
+      if (iend_a == istart_a + 1)
+      {
+         jsum = hypre_spgemm_compute_row_symbl<SHMEM_HASH_SIZE, HASHTYPE, GROUP_SIZE, HAS_GHASH, true, UNROLL_FACTOR>
+                (item, istart_a, iend_a, ja, ib, jb, group_s_HashKeys, ghash_size, jg + istart_g, failed);
+      }
+      else
+      {
+         jsum = hypre_spgemm_compute_row_symbl<SHMEM_HASH_SIZE, HASHTYPE, GROUP_SIZE, HAS_GHASH, false, UNROLL_FACTOR>
+                (item, istart_a, iend_a, ja, ib, jb, group_s_HashKeys, ghash_size, jg + istart_g, failed);
+      }
+
+#if defined(HYPRE_DEBUG)
+      hypre_device_assert(CAN_FAIL || failed == 0);
+#endif
+
+      /* num of nonzeros of this row (an upper bound)
+       * use s_HashKeys as shared memory workspace */
+      if (GROUP_SIZE <= HYPRE_WARP_SIZE)
+      {
+         jsum = group_reduce_sum<HYPRE_Int, NUM_GROUPS_PER_BLOCK, GROUP_SIZE>(item, jsum);
+      }
+      else
+      {
+         group_sync<GROUP_SIZE>(item);
+
+         jsum = group_reduce_sum<HYPRE_Int, NUM_GROUPS_PER_BLOCK, GROUP_SIZE>(item, jsum, s_HashKeys);
+      }
+
+      /* if this row failed */
+      if (CAN_FAIL)
+      {
+         if (GROUP_SIZE <= HYPRE_WARP_SIZE)
+         {
+            failed = (char) group_reduce_sum<hypre_int, NUM_GROUPS_PER_BLOCK, GROUP_SIZE>(item,
+                                                                                          (hypre_int) failed);
+         }
+         else
+         {
+            failed = (char) group_reduce_sum<HYPRE_Int, NUM_GROUPS_PER_BLOCK, GROUP_SIZE>(item,
+                                                                                          (HYPRE_Int) failed,
+                                                                                          s_HashKeys);
+         }
+      }
+
+      if ((valid_ptr) && lane_id == 0)
+      {
+#if defined(HYPRE_DEBUG)
+         hypre_device_assert(ii >= 0);
+#endif
+         rc[ii] = jsum;
+
+         if (CAN_FAIL)
+         {
+            rf[ii] = failed > 0;
+         }
+      }
+   }
+}
+
+template <HYPRE_Int BIN, HYPRE_Int SHMEM_HASH_SIZE, HYPRE_Int GROUP_SIZE, bool HAS_RIND>
+HYPRE_Int
+hypre_spgemm_symbolic_rownnz( HYPRE_Int  m,
+                              HYPRE_Int *row_ind, /* input: row indices (length of m) */
+                              HYPRE_Int  k,
+                              HYPRE_Int  n,
+                              bool       need_ghash,
+                              HYPRE_Int *d_ia,
+                              HYPRE_Int *d_ja,
+                              HYPRE_Int *d_ib,
+                              HYPRE_Int *d_jb,
+                              HYPRE_Int *d_rc,
+                              bool       can_fail,
+                              char      *d_rf  /* output: if symbolic mult. failed for each row */ )
+{
+   const HYPRE_Int num_groups_per_block = hypre_spgemm_get_num_groups_per_block<GROUP_SIZE>();
+#if defined(HYPRE_USING_CUDA)
+   const HYPRE_Int BDIMX                = hypre_min(4, GROUP_SIZE);
+#elif defined(HYPRE_USING_HIP)
+   const HYPRE_Int BDIMX                = hypre_min(2, GROUP_SIZE);
+#elif defined(HYPRE_USING_SYCL)
+   const HYPRE_Int BDIMX                = hypre_min(2, GROUP_SIZE);
+#endif
+   const HYPRE_Int BDIMY                = GROUP_SIZE / BDIMX;
+
+#if defined(HYPRE_USING_SYCL)
+   /* CUDA kernel configurations: bDim.z is the number of groups in block */
+   dim3 bDim(num_groups_per_block, BDIMY, BDIMX);
+   hypre_assert(bDim.get(2) * bDim.get(1) == GROUP_SIZE);
+   // grid dimension (number of blocks)
+   const HYPRE_Int num_blocks = hypre_min( hypre_HandleSpgemmBlockNumDim(hypre_handle())[0][BIN],
+                                           (m + bDim.get(0) - 1) / bDim.get(0) );
+   dim3 gDim(1, 1, num_blocks);
+   // number of active groups
+   HYPRE_Int num_act_groups = hypre_min(bDim.get(0) * gDim.get(2), m);
+#else
+   /* CUDA kernel configurations: bDim.z is the number of groups in block */
+   dim3 bDim(BDIMX, BDIMY, num_groups_per_block);
+   hypre_assert(bDim.x * bDim.y == GROUP_SIZE);
+   // grid dimension (number of blocks)
+   const HYPRE_Int num_blocks = hypre_min( hypre_HandleSpgemmBlockNumDim(hypre_handle())[0][BIN],
+                                           (HYPRE_Int) ((m + bDim.z - 1) / bDim.z) );
+   dim3 gDim( num_blocks );
+   // number of active groups
+   HYPRE_Int num_act_groups = hypre_min((HYPRE_Int) (bDim.z * gDim.x), m);
+#endif
+
+   const char HASH_TYPE = HYPRE_SPGEMM_HASH_TYPE;
+   if (HASH_TYPE != 'L' && HASH_TYPE != 'Q' && HASH_TYPE != 'D')
+   {
+      hypre_printf("Unrecognized hash type ... [L(inear), Q(uadratic), D(ouble)]\n");
+   }
+
+   /* ---------------------------------------------------------------------------
+    * build hash table (no values)
+    * ---------------------------------------------------------------------------*/
+   HYPRE_Int *d_ghash_i = NULL;
+   HYPRE_Int *d_ghash_j = NULL;
+   HYPRE_Int  ghash_size = 0;
+
+   if (need_ghash)
+   {
+      hypre_SpGemmCreateGlobalHashTable(m, row_ind, num_act_groups, d_rc, SHMEM_HASH_SIZE,
+                                        &d_ghash_i, &d_ghash_j, NULL, &ghash_size);
+   }
+
+#ifdef HYPRE_SPGEMM_PRINTF
+   HYPRE_SPGEMM_PRINT("%s[%d], BIN[%d]: m %d k %d n %d, HASH %c, SHMEM_HASH_SIZE %d, GROUP_SIZE %d, "
+                      "can_fail %d, need_ghash %d, ghash %p size %d\n",
+                      __FILE__, __LINE__, BIN, m, k, n,
+                      HASH_TYPE, SHMEM_HASH_SIZE, GROUP_SIZE, can_fail, need_ghash, d_ghash_i, ghash_size);
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_SPGEMM_PRINT("kernel spec [%d %d %d] x [%d %d %d]\n", gDim.get(2), gDim.get(1), gDim.get(0),
+                      bDim.get(2), bDim.get(1), bDim.get(0));
+#else
+   HYPRE_SPGEMM_PRINT("kernel spec [%d %d %d] x [%d %d %d]\n", gDim.x, gDim.y, gDim.z, bDim.x, bDim.y,
+                      bDim.z);
+#endif
+#else
+   HYPRE_UNUSED_VAR(k);
+   HYPRE_UNUSED_VAR(n);
+#endif
+
+#if defined(HYPRE_SPGEMM_DEVICE_USE_DSHMEM) || defined(HYPRE_USING_SYCL)
+   const size_t shmem_bytes = num_groups_per_block * SHMEM_HASH_SIZE * sizeof(HYPRE_Int);
+#else
+   const size_t shmem_bytes = 0;
+#endif
+
+   /* ---------------------------------------------------------------------------
+    * symbolic multiplication:
+    * On output, it provides an upper bound of nnz in rows of C
+    * ---------------------------------------------------------------------------*/
+   hypre_assert(HAS_RIND == (row_ind != NULL) );
+
+   /* <NUM_GROUPS_PER_BLOCK, GROUP_SIZE, SHMEM_HASH_SIZE, HAS_RIND, CAN_FAIL, HASHTYPE, HAS_GHASH> */
+
+   if (can_fail)
+   {
+      if (ghash_size)
+      {
+         HYPRE_GPU_LAUNCH2(
+            (hypre_spgemm_symbolic<num_groups_per_block, GROUP_SIZE, SHMEM_HASH_SIZE, HAS_RIND, true, HASH_TYPE, true>),
+            gDim, bDim, shmem_bytes,
+            m, row_ind, d_ia, d_ja, d_ib, d_jb, d_ghash_i, d_ghash_j, d_rc, d_rf );
+      }
+      else
+      {
+         HYPRE_GPU_LAUNCH2(
+            (hypre_spgemm_symbolic<num_groups_per_block, GROUP_SIZE, SHMEM_HASH_SIZE, HAS_RIND, true, HASH_TYPE, false>),
+            gDim, bDim, shmem_bytes,
+            m, row_ind, d_ia, d_ja, d_ib, d_jb, d_ghash_i, d_ghash_j, d_rc, d_rf );
+      }
+   }
+   else
+   {
+      if (ghash_size)
+      {
+         HYPRE_GPU_LAUNCH2(
+            (hypre_spgemm_symbolic<num_groups_per_block, GROUP_SIZE, SHMEM_HASH_SIZE, HAS_RIND, false, HASH_TYPE, true>),
+            gDim, bDim, shmem_bytes,
+            m, row_ind, d_ia, d_ja, d_ib, d_jb, d_ghash_i, d_ghash_j, d_rc, d_rf );
+      }
+      else
+      {
+         HYPRE_GPU_LAUNCH2(
+            (hypre_spgemm_symbolic<num_groups_per_block, GROUP_SIZE, SHMEM_HASH_SIZE, HAS_RIND, false, HASH_TYPE, false>),
+            gDim, bDim, shmem_bytes,
+            m, row_ind, d_ia, d_ja, d_ib, d_jb, d_ghash_i, d_ghash_j, d_rc, d_rf );
+      }
+   }
+
+   hypre_TFree(d_ghash_i, HYPRE_MEMORY_DEVICE);
+   hypre_TFree(d_ghash_j, HYPRE_MEMORY_DEVICE);
+
+   return hypre_error_flag;
+}
+
+template <HYPRE_Int SHMEM_HASH_SIZE, HYPRE_Int GROUP_SIZE>
+HYPRE_Int hypre_spgemm_symbolic_max_num_blocks( HYPRE_Int  multiProcessorCount,
+                                                HYPRE_Int *num_blocks_ptr,
+                                                HYPRE_Int *block_size_ptr )
+{
+   const char HASH_TYPE = HYPRE_SPGEMM_HASH_TYPE;
+   const HYPRE_Int num_groups_per_block = hypre_spgemm_get_num_groups_per_block<GROUP_SIZE>();
+   const HYPRE_Int block_size = num_groups_per_block * GROUP_SIZE;
+   hypre_int numBlocksPerSm = 0;
+#if defined(HYPRE_SPGEMM_DEVICE_USE_DSHMEM)
+   const hypre_int shmem_bytes = num_groups_per_block * SHMEM_HASH_SIZE * sizeof(HYPRE_Int);
+   hypre_int dynamic_shmem_size = shmem_bytes;
+#else
+   hypre_int dynamic_shmem_size = 0;
+#endif
+
+#if defined(HYPRE_SPGEMM_DEVICE_USE_DSHMEM)
+#if defined(HYPRE_USING_CUDA)
+   /* with CUDA, to use > 48K shared memory, must use dynamic and must opt-in. BIN = 10 requires 64K */
+   hypre_int max_shmem_optin;
+   hypre_GetDeviceMaxShmemSize(-1, NULL, &max_shmem_optin);
+
+   if (dynamic_shmem_size <= max_shmem_optin)
+   {
+      HYPRE_CUDA_CALL( cudaFuncSetAttribute(
+                          hypre_spgemm_symbolic<num_groups_per_block, GROUP_SIZE, SHMEM_HASH_SIZE, true, false, HASH_TYPE, true>,
+                          cudaFuncAttributeMaxDynamicSharedMemorySize, dynamic_shmem_size) );
+
+      HYPRE_CUDA_CALL( cudaFuncSetAttribute(
+                          hypre_spgemm_symbolic<num_groups_per_block, GROUP_SIZE, SHMEM_HASH_SIZE, true, false, HASH_TYPE, false>,
+                          cudaFuncAttributeMaxDynamicSharedMemorySize, dynamic_shmem_size) );
+
+      HYPRE_CUDA_CALL( cudaFuncSetAttribute(
+                          hypre_spgemm_symbolic<num_groups_per_block, GROUP_SIZE, SHMEM_HASH_SIZE, true, true,  HASH_TYPE, true>,
+                          cudaFuncAttributeMaxDynamicSharedMemorySize, dynamic_shmem_size) );
+
+      HYPRE_CUDA_CALL( cudaFuncSetAttribute(
+                          hypre_spgemm_symbolic<num_groups_per_block, GROUP_SIZE, SHMEM_HASH_SIZE, true, true,  HASH_TYPE, false>,
+                          cudaFuncAttributeMaxDynamicSharedMemorySize, dynamic_shmem_size) );
+
+      /*
+      HYPRE_CUDA_CALL( cudaFuncSetAttribute(
+            hypre_spgemm_symbolic<num_groups_per_block, GROUP_SIZE, SHMEM_HASH_SIZE, false, true, HASH_TYPE, false>,
+            cudaFuncAttributeMaxDynamicSharedMemorySize, dynamic_shmem_size) );
+      */
+   }
+#endif
+#endif
+
+#if defined(HYPRE_USING_CUDA)
+   HYPRE_CUDA_CALL(cudaOccupancyMaxActiveBlocksPerMultiprocessor(
+                      &numBlocksPerSm,
+                      hypre_spgemm_symbolic<num_groups_per_block, GROUP_SIZE, SHMEM_HASH_SIZE, true, false, HASH_TYPE, true>,
+                      block_size, dynamic_shmem_size));
+#endif
+
+#if defined(HYPRE_USING_HIP)
+   HYPRE_HIP_CALL(hipOccupancyMaxActiveBlocksPerMultiprocessor(
+                     &numBlocksPerSm,
+                     hypre_spgemm_symbolic<num_groups_per_block, GROUP_SIZE, SHMEM_HASH_SIZE, true, false, HASH_TYPE, true>,
+                     block_size, dynamic_shmem_size));
+#endif
+
+#if defined(HYPRE_USING_SYCL)
+   /* WM: todo - sycl version of the above? */
+   numBlocksPerSm = 1;
+#endif
+
+   *num_blocks_ptr = multiProcessorCount * numBlocksPerSm;
+   *block_size_ptr = block_size;
+
+   return hypre_error_flag;
+}
+
+#endif /* defined(HYPRE_USING_GPU) */
diff --git a/external/hypre/src/seq_mv/csr_spgemm_device_symbl.in b/external/hypre/src/seq_mv/csr_spgemm_device_symbl.in
new file mode 100644
index 00000000..dc51ffad
--- /dev/null
+++ b/external/hypre/src/seq_mv/csr_spgemm_device_symbl.in
@@ -0,0 +1,40 @@
+
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+#include "seq_mv.h"
+
+#if defined(HYPRE_USING_GPU)
+
+#if defined(HYPRE_USING_CUDA) && HYPRE_SPGEMM_BIN >= 10
+#define HYPRE_SPGEMM_DEVICE_USE_DSHMEM
+#endif
+
+#include <csr_spgemm_device_symbl.h>
+
+template HYPRE_Int
+hypre_spgemm_symbolic_rownnz
+< HYPRE_SPGEMM_BIN, SYMBL_HASH_SIZE[HYPRE_SPGEMM_BIN], T_GROUP_SIZE[HYPRE_SPGEMM_BIN], true >
+( HYPRE_Int m, HYPRE_Int *row_ind, HYPRE_Int k, HYPRE_Int n, bool need_ghash, HYPRE_Int *d_ia,
+  HYPRE_Int *d_ja,
+  HYPRE_Int *d_ib, HYPRE_Int *d_jb, HYPRE_Int *d_rc, bool can_fail, char *d_rf );
+
+#if HYPRE_SPGEMM_BIN == 5
+template HYPRE_Int
+hypre_spgemm_symbolic_rownnz
+< HYPRE_SPGEMM_BIN, SYMBL_HASH_SIZE[HYPRE_SPGEMM_BIN], T_GROUP_SIZE[HYPRE_SPGEMM_BIN], false >
+( HYPRE_Int m, HYPRE_Int *row_ind, HYPRE_Int k, HYPRE_Int n, bool need_ghash, HYPRE_Int *d_ia,
+  HYPRE_Int *d_ja,
+  HYPRE_Int *d_ib, HYPRE_Int *d_jb, HYPRE_Int *d_rc, bool can_fail, char *d_rf );
+#endif
+
+template HYPRE_Int
+hypre_spgemm_symbolic_max_num_blocks
+< SYMBL_HASH_SIZE[HYPRE_SPGEMM_BIN], T_GROUP_SIZE[HYPRE_SPGEMM_BIN] >
+( HYPRE_Int multiProcessorCount, HYPRE_Int *num_blocks_ptr, HYPRE_Int *block_size_ptr );
+
+#endif /* defined(HYPRE_USING_GPU) */
diff --git a/external/hypre/src/seq_mv/csr_spgemm_device_util.c b/external/hypre/src/seq_mv/csr_spgemm_device_util.c
index 63270e43..fcbd795e 100644
--- a/external/hypre/src/seq_mv/csr_spgemm_device_util.c
+++ b/external/hypre/src/seq_mv/csr_spgemm_device_util.c
@@ -1,50 +1,189 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
  ******************************************************************************/
 
+#include "_hypre_onedpl.hpp"
 #include "seq_mv.h"
 #include "csr_spgemm_device.h"
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_GPU)
 
-/* assume d_c is of length m and contains the "sizes" */
+#if (defined(THRUST_VERSION) && THRUST_VERSION < 101000)
+struct row_size : public thrust::unary_function<HYPRE_Int, HYPRE_Int>
+#else
+struct row_size
+#endif
+{
+   HYPRE_Int SHMEM_HASH_SIZE;
+
+   row_size(HYPRE_Int SHMEM_HASH_SIZE_ = HYPRE_Int()) { SHMEM_HASH_SIZE = SHMEM_HASH_SIZE_; }
+
+   __device__ HYPRE_Int operator()(const HYPRE_Int &x) const
+   {
+      // RL: ???
+      return next_power_of_2(x - SHMEM_HASH_SIZE) + x;
+   }
+};
+
+/* Assume d_c is of length m and contains the size of each row
+ *        d_i has size (m+1) on entry
+ * generate (i,j,a) with d_c */
 void
 hypre_create_ija( HYPRE_Int       m,
-                  HYPRE_Int      *d_c,
+                  HYPRE_Int      *row_id, /* length of m, row indices; if null, it is [0,1,2,3,...] */
+                  HYPRE_Int      *d_c,    /* d_c[row_id[i]] is the size of ith row */
                   HYPRE_Int      *d_i,
                   HYPRE_Int     **d_j,
                   HYPRE_Complex **d_a,
-                  HYPRE_Int      *nnz )
+                  HYPRE_Int
+                  *nnz_ptr /* in/out: if input >= 0, it must be the sum of d_c, remain unchanged in output
+                                                     if input <  0, it is computed as the sum of d_c and output */)
 {
+   HYPRE_Int nnz = 0;
+
    hypre_Memset(d_i, 0, sizeof(HYPRE_Int), HYPRE_MEMORY_DEVICE);
 
-   HYPRE_THRUST_CALL(inclusive_scan, d_c, d_c + m, d_i + 1);
+#if defined(HYPRE_USING_SYCL)
+   if (row_id)
+   {
+      HYPRE_ONEDPL_CALL(std::inclusive_scan,
+                        oneapi::dpl::make_permutation_iterator(d_c, row_id),
+                        oneapi::dpl::make_permutation_iterator(d_c, row_id) + m,
+                        d_i + 1);
+   }
+   else
+   {
+      HYPRE_ONEDPL_CALL(std::inclusive_scan,
+                        d_c,
+                        d_c + m,
+                        d_i + 1);
+   }
+#else
+   if (row_id)
+   {
+      HYPRE_THRUST_CALL(inclusive_scan,
+                        thrust::make_permutation_iterator(d_c, row_id),
+                        thrust::make_permutation_iterator(d_c, row_id) + m,
+                        d_i + 1);
+   }
+   else
+   {
+      HYPRE_THRUST_CALL(inclusive_scan,
+                        d_c,
+                        d_c + m,
+                        d_i + 1);
+   }
+#endif
 
-   hypre_TMemcpy(nnz, d_i + m, HYPRE_Int, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
+   if (*nnz_ptr >= 0)
+   {
+#if defined(HYPRE_DEBUG)
+      hypre_TMemcpy(&nnz, d_i + m, HYPRE_Int, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
+      hypre_assert(nnz == *nnz_ptr);
+#endif
+      nnz = *nnz_ptr;
+   }
+   else
+   {
+      hypre_TMemcpy(&nnz, d_i + m, HYPRE_Int, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
+      *nnz_ptr = nnz;
+   }
 
    if (d_j)
    {
-      *d_j = hypre_TAlloc(HYPRE_Int, *nnz, HYPRE_MEMORY_DEVICE);
+      *d_j = hypre_TAlloc(HYPRE_Int, nnz, HYPRE_MEMORY_DEVICE);
    }
 
    if (d_a)
    {
-      *d_a = hypre_TAlloc(HYPRE_Complex, *nnz, HYPRE_MEMORY_DEVICE);
+      *d_a = hypre_TAlloc(HYPRE_Complex, nnz, HYPRE_MEMORY_DEVICE);
+   }
+}
+
+/* Assume d_c is of length m and contains the size of each row
+ *        d_i has size (m+1) on entry
+ * generate (i,j,a) with row_size(d_c) see above (over allocation) */
+void
+hypre_create_ija( HYPRE_Int       SHMEM_HASH_SIZE,
+                  HYPRE_Int       m,
+                  HYPRE_Int      *row_id,        /* length of m, row indices; if null, it is [0,1,2,3,...] */
+                  HYPRE_Int      *d_c,           /* d_c[row_id[i]] is the size of ith row */
+                  HYPRE_Int      *d_i,
+                  HYPRE_Int     **d_j,
+                  HYPRE_Complex **d_a,
+                  HYPRE_Int      *nnz_ptr )
+{
+   HYPRE_Int nnz = 0;
+
+   hypre_Memset(d_i, 0, sizeof(HYPRE_Int), HYPRE_MEMORY_DEVICE);
+
+#if defined(HYPRE_USING_SYCL)
+   if (row_id)
+   {
+      HYPRE_ONEDPL_CALL( std::inclusive_scan,
+                         oneapi::dpl::make_transform_iterator(oneapi::dpl::make_permutation_iterator(d_c, row_id),
+                                                              row_size(SHMEM_HASH_SIZE)),
+                         oneapi::dpl::make_transform_iterator(oneapi::dpl::make_permutation_iterator(d_c, row_id),
+                                                              row_size(SHMEM_HASH_SIZE)) + m,
+                         d_i + 1 );
+   }
+   else
+   {
+      HYPRE_ONEDPL_CALL( std::inclusive_scan,
+                         oneapi::dpl::make_transform_iterator(d_c, row_size(SHMEM_HASH_SIZE)),
+                         oneapi::dpl::make_transform_iterator(d_c, row_size(SHMEM_HASH_SIZE)) + m,
+                         d_i + 1 );
+   }
+#else
+   if (row_id)
+   {
+      HYPRE_THRUST_CALL( inclusive_scan,
+                         thrust::make_transform_iterator(thrust::make_permutation_iterator(d_c, row_id),
+                                                         row_size(SHMEM_HASH_SIZE)),
+                         thrust::make_transform_iterator(thrust::make_permutation_iterator(d_c, row_id),
+                                                         row_size(SHMEM_HASH_SIZE)) + m,
+                         d_i + 1 );
+   }
+   else
+   {
+      HYPRE_THRUST_CALL( inclusive_scan,
+                         thrust::make_transform_iterator(d_c, row_size(SHMEM_HASH_SIZE)),
+                         thrust::make_transform_iterator(d_c, row_size(SHMEM_HASH_SIZE)) + m,
+                         d_i + 1 );
+   }
+#endif
+
+   hypre_TMemcpy(&nnz, d_i + m, HYPRE_Int, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
+
+   if (nnz_ptr)
+   {
+      *nnz_ptr = nnz;
+   }
+
+   if (d_j)
+   {
+      *d_j = hypre_TAlloc(HYPRE_Int, nnz, HYPRE_MEMORY_DEVICE);
+   }
+
+   if (d_a)
+   {
+      *d_a = hypre_TAlloc(HYPRE_Complex, nnz, HYPRE_MEMORY_DEVICE);
    }
 }
 
 __global__ void
-hypre_SpGemmGhashSize1( HYPRE_Int  num_rows,
-                        HYPRE_Int *row_id,
-                        HYPRE_Int  num_ghash,
-                        HYPRE_Int *row_sizes,
-                        HYPRE_Int *ghash_sizes,
-                        HYPRE_Int  SHMEM_HASH_SIZE )
+hypre_SpGemmGhashSize( hypre_DeviceItem &item,
+                       HYPRE_Int  num_rows,
+                       HYPRE_Int *row_id,
+                       HYPRE_Int  num_ghash,
+                       HYPRE_Int *row_sizes,
+                       HYPRE_Int *ghash_sizes,
+                       HYPRE_Int  SHMEM_HASH_SIZE )
 {
-   const HYPRE_Int global_thread_id = hypre_cuda_get_grid_thread_id<1,1>();
+   const HYPRE_Int global_thread_id = hypre_gpu_get_grid_thread_id<1, 1>(item);
 
    if (global_thread_id >= num_ghash)
    {
@@ -64,24 +203,6 @@ hypre_SpGemmGhashSize1( HYPRE_Int  num_rows,
    ghash_sizes[global_thread_id] = j;
 }
 
-__global__ void
-hypre_SpGemmGhashSize2( HYPRE_Int  num_rows,
-                        HYPRE_Int *row_id,
-                        HYPRE_Int  num_ghash,
-                        HYPRE_Int *row_sizes,
-                        HYPRE_Int *ghash_sizes,
-                        HYPRE_Int  SHMEM_HASH_SIZE )
-{
-   const HYPRE_Int i = hypre_cuda_get_grid_thread_id<1,1>();
-
-   if (i < num_rows)
-   {
-      const HYPRE_Int rid = row_id ? read_only_load(&row_id[i]) : i;
-      const HYPRE_Int rnz = read_only_load(&row_sizes[rid]);
-      ghash_sizes[rid] = next_power_of_2(rnz - SHMEM_HASH_SIZE);
-   }
-}
-
 HYPRE_Int
 hypre_SpGemmCreateGlobalHashTable( HYPRE_Int       num_rows,        /* number of rows */
                                    HYPRE_Int      *row_id,          /* row_id[i] is index of ith row; i if row_id == NULL */
@@ -91,32 +212,23 @@ hypre_SpGemmCreateGlobalHashTable( HYPRE_Int       num_rows,        /* number of
                                    HYPRE_Int     **ghash_i_ptr,     /* of length num_ghash + 1 */
                                    HYPRE_Int     **ghash_j_ptr,
                                    HYPRE_Complex **ghash_a_ptr,
-                                   HYPRE_Int      *ghash_size_ptr,
-                                   HYPRE_Int       type )
+                                   HYPRE_Int      *ghash_size_ptr )
 {
-   hypre_assert(type == 2 || num_ghash <= num_rows);
+   hypre_assert(num_ghash <= num_rows);
 
    HYPRE_Int *ghash_i, ghash_size;
-   dim3 bDim = hypre_GetDefaultCUDABlockDimension();
+   dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
 
-   if (type == 1)
-   {
-      ghash_i = hypre_TAlloc(HYPRE_Int, num_ghash + 1, HYPRE_MEMORY_DEVICE);
-      dim3 gDim = hypre_GetDefaultCUDAGridDimension(num_ghash, "thread", bDim);
-      HYPRE_CUDA_LAUNCH( hypre_SpGemmGhashSize1, gDim, bDim,
-                         num_rows, row_id, num_ghash, row_sizes, ghash_i, SHMEM_HASH_SIZE );
-   }
-   else if (type == 2)
-   {
-      ghash_i = hypre_CTAlloc(HYPRE_Int, num_ghash + 1, HYPRE_MEMORY_DEVICE);
-      dim3 gDim = hypre_GetDefaultCUDAGridDimension(num_rows, "thread", bDim);
-      HYPRE_CUDA_LAUNCH( hypre_SpGemmGhashSize2, gDim, bDim,
-                         num_rows, row_id, num_ghash, row_sizes, ghash_i, SHMEM_HASH_SIZE );
-   }
+   ghash_i = hypre_TAlloc(HYPRE_Int, num_ghash + 1, HYPRE_MEMORY_DEVICE);
+   hypre_Memset(ghash_i + num_ghash, 0, sizeof(HYPRE_Int), HYPRE_MEMORY_DEVICE);
+   dim3 gDim = hypre_GetDefaultDeviceGridDimension(num_ghash, "thread", bDim);
+   HYPRE_GPU_LAUNCH( hypre_SpGemmGhashSize, gDim, bDim,
+                     num_rows, row_id, num_ghash, row_sizes, ghash_i, SHMEM_HASH_SIZE );
 
    hypreDevice_IntegerExclusiveScan(num_ghash + 1, ghash_i);
 
-   hypre_TMemcpy(&ghash_size, ghash_i + num_ghash, HYPRE_Int, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
+   hypre_TMemcpy(&ghash_size, ghash_i + num_ghash, HYPRE_Int, 1, HYPRE_MEMORY_HOST,
+                 HYPRE_MEMORY_DEVICE);
 
    if (!ghash_size)
    {
@@ -146,5 +258,83 @@ hypre_SpGemmCreateGlobalHashTable( HYPRE_Int       num_rows,        /* number of
    return hypre_error_flag;
 }
 
+HYPRE_Int hypre_SpGemmCreateBins( HYPRE_Int  m,
+                                  char       s,
+                                  char       t,
+                                  char       u,
+                                  HYPRE_Int *d_rc,
+                                  bool       d_rc_indice_in,
+                                  HYPRE_Int *d_rc_indice,
+                                  HYPRE_Int *h_bin_ptr )
+{
+#ifdef HYPRE_SPGEMM_TIMING
+   hypre_ForceSyncComputeStream();
+   HYPRE_Real t1 = hypre_MPI_Wtime();
+#endif
+
+   HYPRE_Int  num_bins = hypre_HandleSpgemmNumBin(hypre_handle());
+   HYPRE_Int *d_bin_ptr = hypre_TAlloc(HYPRE_Int, num_bins + 1, HYPRE_MEMORY_DEVICE);
+
+   /* assume there are no more than 127 = 2^7-1 bins, which should be enough */
+   char *d_bin_key = hypre_TAlloc(char, m, HYPRE_MEMORY_DEVICE);
+
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_ONEDPL_CALL( std::transform,
+                      d_rc,
+                      d_rc + m,
+                      d_bin_key,
+                      spgemm_bin_op<HYPRE_Int>(s, t, u) );
+
+   if (!d_rc_indice_in)
+   {
+      hypreSycl_sequence(d_rc_indice, d_rc_indice + m, 0);
+   }
+
+   hypreSycl_stable_sort_by_key(d_bin_key, d_bin_key + m, d_rc_indice);
+
+   HYPRE_ONEDPL_CALL( oneapi::dpl::lower_bound,
+                      d_bin_key,
+                      d_bin_key + m,
+                      oneapi::dpl::counting_iterator<HYPRE_Int>(1),
+                      oneapi::dpl::counting_iterator<HYPRE_Int>(num_bins + 2),
+                      d_bin_ptr );
+#else
+   HYPRE_THRUST_CALL( transform,
+                      d_rc,
+                      d_rc + m,
+                      d_bin_key,
+                      spgemm_bin_op<HYPRE_Int>(s, t, u) );
+
+   if (!d_rc_indice_in)
+   {
+      HYPRE_THRUST_CALL( sequence, d_rc_indice, d_rc_indice + m);
+   }
+
+   HYPRE_THRUST_CALL( stable_sort_by_key, d_bin_key, d_bin_key + m, d_rc_indice );
+
+   HYPRE_THRUST_CALL( lower_bound,
+                      d_bin_key,
+                      d_bin_key + m,
+                      thrust::make_counting_iterator(1),
+                      thrust::make_counting_iterator(num_bins + 2),
+                      d_bin_ptr );
 #endif
 
+   hypre_TMemcpy(h_bin_ptr, d_bin_ptr, HYPRE_Int, num_bins + 1, HYPRE_MEMORY_HOST,
+                 HYPRE_MEMORY_DEVICE);
+
+   hypre_assert(h_bin_ptr[num_bins] == m);
+
+   hypre_TFree(d_bin_key, HYPRE_MEMORY_DEVICE);
+   hypre_TFree(d_bin_ptr, HYPRE_MEMORY_DEVICE);
+
+#ifdef HYPRE_SPGEMM_TIMING
+   hypre_ForceSyncComputeStream();
+   HYPRE_Real t2 = hypre_MPI_Wtime() - t1;
+   HYPRE_SPGEMM_PRINT("%s[%d]: Binning time %f\n", __FILE__, __LINE__, t2);
+#endif
+
+   return hypre_error_flag;
+}
+
+#endif // #if defined(HYPRE_USING_GPU)
diff --git a/external/hypre/src/seq_mv/csr_spmv_device.c b/external/hypre/src/seq_mv/csr_spmv_device.c
index ba0a1857..38cefc77 100644
--- a/external/hypre/src/seq_mv/csr_spmv_device.c
+++ b/external/hypre/src/seq_mv/csr_spmv_device.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -14,248 +14,591 @@
 #include "seq_mv.h"
 #include "_hypre_utilities.hpp"
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-
-#define SPMV_BLOCKDIM 512
-#define VERSION 1
-
-#define SPMV_ADD_SUM(p)                                              \
-{                                                                    \
-   const HYPRE_Int col = read_only_load(&d_ja[p]);                   \
-   if (F == 0)                                                       \
-   {                                                                 \
-      sum += read_only_load(&d_a[p]) * read_only_load(&d_x[col]);    \
-   }                                                                 \
-   else if (F == -1)                                                 \
-   {                                                                 \
-      if (col <= grid_group_id)                                      \
-      {                                                              \
-         sum += read_only_load(&d_a[p]) * read_only_load(&d_x[col]); \
-      }                                                              \
-   }                                                                 \
-   else if (F == 1)                                                  \
-   {                                                                 \
-      if (col >= grid_group_id)                                      \
-      {                                                              \
-         sum += read_only_load(&d_a[p]) * read_only_load(&d_x[col]); \
-      }                                                              \
-   }                                                                 \
-   else if (F == -2)                                                 \
-   {                                                                 \
-      if (col < grid_group_id)                                       \
-      {                                                              \
-         sum += read_only_load(&d_a[p]) * read_only_load(&d_x[col]); \
-      }                                                              \
-   }                                                                 \
-   else if (F == 2)                                                  \
-   {                                                                 \
-      if (col > grid_group_id)                                       \
-      {                                                              \
-         sum += read_only_load(&d_a[p]) * read_only_load(&d_x[col]); \
-      }                                                              \
-   }                                                                 \
-}
+#if defined(HYPRE_USING_GPU)
+
+#include "csr_spmv_device.h"
+
+/*--------------------------------------------------------------------------
+ * hypreGPUKernel_CSRMatvecShuffleGT8
+ *
+ * Templated SpMV device kernel based of warp-shuffle reduction.
+ * Uses groups of K threads per row.
+ * Specialized function for num_vectors > 8
+ *
+ * Template parameters:
+ *   1) K:  number of threads working on a single row. K = 2, 4, 8, 16, 32
+ *   2) F:  fill-mode. See hypreDevice_CSRMatrixMatvec for supported values
+ *   3) NV: number of vectors (> 1 for multi-component vectors)
+ *   4) T:  data type of matrix/vector coefficients
+ *--------------------------------------------------------------------------*/
 
-/* K is the number of threads working on a single row. K = 2, 4, 8, 16, 32 */
-template <HYPRE_Int F, HYPRE_Int K, typename T>
+template <HYPRE_Int F, HYPRE_Int K, HYPRE_Int NV, typename T>
 __global__ void
-hypre_csr_v_k_shuffle(HYPRE_Int     n,
-                      T             alpha,
-                      HYPRE_Int    *d_ia,
-                      HYPRE_Int    *d_ja,
-                      T            *d_a,
-                      T            *d_x,
-                      T             beta,
-                      T            *d_y)
+hypreGPUKernel_CSRMatvecShuffleGT8(hypre_DeviceItem &item,
+                                   HYPRE_Int         num_rows,
+                                   HYPRE_Int         num_vectors,
+                                   HYPRE_Int        *row_id,
+                                   HYPRE_Int         idxstride_x,
+                                   HYPRE_Int         idxstride_y,
+                                   HYPRE_Int         vecstride_x,
+                                   HYPRE_Int         vecstride_y,
+                                   T                 alpha,
+                                   HYPRE_Int        *d_ia,
+                                   HYPRE_Int        *d_ja,
+                                   T                *d_a,
+                                   T                *d_x,
+                                   T                 beta,
+                                   T                *d_y )
 {
-   /*------------------------------------------------------------*
-    *               CSR spmv-vector kernel
-    *               warp-shuffle reduction
-    *            (Group of K threads) per row
-    *------------------------------------------------------------*/
-   const HYPRE_Int grid_ngroups = gridDim.x * (SPMV_BLOCKDIM / K);
-   HYPRE_Int grid_group_id = (blockIdx.x * SPMV_BLOCKDIM + threadIdx.x) / K;
-   const HYPRE_Int group_lane = threadIdx.x & (K - 1);
-   const HYPRE_Int warp_lane = threadIdx.x & (HYPRE_WARP_SIZE - 1);
-   const HYPRE_Int warp_group_id = warp_lane / K;
-   const HYPRE_Int warp_ngroups = HYPRE_WARP_SIZE / K;
-
-   for (; __any_sync(HYPRE_WARP_FULL_MASK, grid_group_id < n); grid_group_id += grid_ngroups)
+#if defined (HYPRE_USING_SYCL)
+   const HYPRE_Int  grid_ngroups  = item.get_group_range(2) * (HYPRE_SPMV_BLOCKDIM / K);
+   HYPRE_Int        grid_group_id = (item.get_group(2) * HYPRE_SPMV_BLOCKDIM + item.get_local_id(
+                                        2)) / K;
+   const HYPRE_Int  group_lane    = item.get_local_id(2) & (K - 1);
+#else
+   const HYPRE_Int  grid_ngroups  = gridDim.x * (HYPRE_SPMV_BLOCKDIM / K);
+   HYPRE_Int        grid_group_id = (blockIdx.x * HYPRE_SPMV_BLOCKDIM + threadIdx.x) / K;
+   const HYPRE_Int  group_lane    = threadIdx.x & (K - 1);
+#endif
+   T sum[64];
+
+   for (; warp_any_sync(item, HYPRE_WARP_FULL_MASK, grid_group_id < num_rows);
+        grid_group_id += grid_ngroups)
    {
-#if 0
-      HYPRE_Int p = 0, q = 0;
-      if (grid_group_id < n && group_lane < 2)
+      HYPRE_Int grid_row_id = -1, p = 0, q = 0;
+
+      if (row_id)
       {
-         p = read_only_load(&d_ia[grid_group_id+group_lane]);
+         if (grid_group_id < num_rows && group_lane == 0)
+         {
+            grid_row_id = read_only_load(&row_id[grid_group_id]);
+         }
+         grid_row_id = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, grid_row_id, 0, K);
       }
-      q = __shfl_sync(HYPRE_WARP_FULL_MASK, p, 1, K);
-      p = __shfl_sync(HYPRE_WARP_FULL_MASK, p, 0, K);
-#else
-      const HYPRE_Int s = grid_group_id - warp_group_id + warp_lane;
-      HYPRE_Int p = 0, q = 0;
-      if (s <= n && warp_lane <= warp_ngroups)
+      else
       {
-         p = read_only_load(&d_ia[s]);
+         grid_row_id = grid_group_id;
       }
-      q = __shfl_sync(HYPRE_WARP_FULL_MASK, p, warp_group_id+1);
-      p = __shfl_sync(HYPRE_WARP_FULL_MASK, p, warp_group_id);
-#endif
-      T sum = 0.0;
-#if VERSION == 1
+
+      if (grid_group_id < num_rows && group_lane < 2)
+      {
+         p = read_only_load(&d_ia[grid_row_id + group_lane]);
+      }
+      q = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 1, K);
+      p = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 0, K);
+
+      for (HYPRE_Int i = 0; i < num_vectors; i++)
+      {
+         sum[i] = T(0.0);
+      }
+
 #pragma unroll 1
-      for (p += group_lane; __any_sync(HYPRE_WARP_FULL_MASK, p < q); p += K * 2)
+      for (p += group_lane; p < q; p += K * 2)
       {
-         if (p < q)
+         HYPRE_SPMV_ADD_SUM(p, num_vectors)
+         if (p + K < q)
+         {
+            HYPRE_SPMV_ADD_SUM((p + K), num_vectors)
+         }
+      }
+
+      // parallel reduction
+      for (HYPRE_Int i = 0; i < num_vectors; i++)
+      {
+         for (HYPRE_Int d = K / 2; d > 0; d >>= 1)
+         {
+            sum[i] += warp_shuffle_down_sync(item, HYPRE_WARP_FULL_MASK, sum[i], d);
+         }
+      }
+
+      if (grid_group_id < num_rows && group_lane == 0)
+      {
+         if (beta)
+         {
+            for (HYPRE_Int i = 0; i < num_vectors; i++)
+            {
+               d_y[grid_row_id * idxstride_y + i * vecstride_y] =
+                  alpha * sum[i] +
+                  beta * d_y[grid_row_id * idxstride_y + i * vecstride_y];
+            }
+         }
+         else
          {
-            SPMV_ADD_SUM(p)
-            if (p + K < q)
+            for (HYPRE_Int i = 0; i < num_vectors; i++)
             {
-               SPMV_ADD_SUM((p + K))
+               d_y[grid_row_id * idxstride_y + i * vecstride_y] = alpha * sum[i];
             }
          }
       }
-#elif VERSION == 2
+   }
+}
+
+/*--------------------------------------------------------------------------
+ * hypreGPUKernel_CSRMatvecShuffle
+ *
+ * Templated SpMV device kernel based of warp-shuffle reduction.
+ * Uses groups of K threads per row
+ *
+ * Template parameters:
+ *   1) K:  number of threads working on a single row. K = 2, 4, 8, 16, 32
+ *   2) F:  fill-mode. See hypreDevice_CSRMatrixMatvec for supported values
+ *   3) NV: number of vectors (> 1 for multi-component vectors)
+ *   4) T:  data type of matrix/vector coefficients
+ *--------------------------------------------------------------------------*/
+
+template <HYPRE_Int F, HYPRE_Int K, HYPRE_Int NV, typename T>
+__global__ void
+//__launch_bounds__(512, 1)
+hypreGPUKernel_CSRMatvecShuffle(hypre_DeviceItem &item,
+                                HYPRE_Int         num_rows,
+                                HYPRE_Int         num_vectors,
+                                HYPRE_Int        *row_id,
+                                HYPRE_Int         idxstride_x,
+                                HYPRE_Int         idxstride_y,
+                                HYPRE_Int         vecstride_x,
+                                HYPRE_Int         vecstride_y,
+                                T                 alpha,
+                                HYPRE_Int        *d_ia,
+                                HYPRE_Int        *d_ja,
+                                T                *d_a,
+                                T                *d_x,
+                                T                 beta,
+                                T                *d_y )
+{
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_Int grid_ngroups  = item.get_group_range(2) * (HYPRE_SPMV_BLOCKDIM / K);
+   HYPRE_Int grid_group_id = (item.get_group(2) * HYPRE_SPMV_BLOCKDIM + item.get_local_id(2)) / K;
+   HYPRE_Int group_lane    = item.get_local_id(2) & (K - 1);
+#else
+   const HYPRE_Int  grid_ngroups  = gridDim.x * (HYPRE_SPMV_BLOCKDIM / K);
+   HYPRE_Int        grid_group_id = (blockIdx.x * HYPRE_SPMV_BLOCKDIM + threadIdx.x) / K;
+   const HYPRE_Int  group_lane    = threadIdx.x & (K - 1);
+#endif
+
+   for (; warp_any_sync(item, HYPRE_WARP_FULL_MASK, grid_group_id < num_rows);
+        grid_group_id += grid_ngroups)
+   {
+      HYPRE_Int grid_row_id = -1, p = 0, q = 0;
+
+      if (row_id)
+      {
+         if (grid_group_id < num_rows && group_lane == 0)
+         {
+            grid_row_id = read_only_load(&row_id[grid_group_id]);
+         }
+         grid_row_id = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, grid_row_id, 0, K);
+      }
+      else
+      {
+         grid_row_id = grid_group_id;
+      }
+
+      if (grid_group_id < num_rows && group_lane < 2)
+      {
+         p = read_only_load(&d_ia[grid_row_id + group_lane]);
+      }
+      q = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 1, K);
+      p = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, p, 0, K);
+
+      T sum[NV] = {T(0)};
+#if HYPRE_SPMV_VERSION == 1
 #pragma unroll 1
-      for (p += group_lane; __any_sync(HYPRE_WARP_FULL_MASK, p < q); p += K)
+      for (p += group_lane; p < q; p += K * 2)
+      {
+         HYPRE_SPMV_ADD_SUM(p, NV)
+         if (p + K < q)
+         {
+            HYPRE_SPMV_ADD_SUM((p + K), NV)
+         }
+      }
+#elif HYPRE_SPMV_VERSION == 2
+#pragma unroll 1
+      for (p += group_lane; warp_any_sync(item, HYPRE_WARP_FULL_MASK, p < q); p += K)
       {
          if (p < q)
          {
-            SPMV_ADD_SUM(p)
+            HYPRE_SPMV_ADD_SUM(p, NV)
          }
       }
 #else
 #pragma unroll 1
       for (p += group_lane;  p < q; p += K)
       {
-         SPMV_ADD_SUM(p)
+         HYPRE_SPMV_ADD_SUM(p, NV)
       }
 #endif
+
       // parallel reduction
-#pragma unroll
-      for (HYPRE_Int d = K/2; d > 0; d >>= 1)
+      for (HYPRE_Int i = 0; i < NV; i++)
       {
-         sum += __shfl_down_sync(HYPRE_WARP_FULL_MASK, sum, d);
+         for (HYPRE_Int d = K / 2; d > 0; d >>= 1)
+         {
+            sum[i] += warp_shuffle_down_sync(item, HYPRE_WARP_FULL_MASK, sum[i], d);
+         }
       }
-      if (grid_group_id < n && group_lane == 0)
+
+      if (grid_group_id < num_rows && group_lane == 0)
       {
-         d_y[grid_group_id] = alpha * sum + beta * d_y[grid_group_id];
+         if (beta)
+         {
+            for (HYPRE_Int i = 0; i < NV; i++)
+            {
+               d_y[grid_row_id * idxstride_y + i * vecstride_y] =
+                  alpha * sum[i] +
+                  beta * d_y[grid_row_id * idxstride_y + i * vecstride_y];
+            }
+         }
+         else
+         {
+            for (HYPRE_Int i = 0; i < NV; i++)
+            {
+               d_y[grid_row_id * idxstride_y + i * vecstride_y] = alpha * sum[i];
+            }
+         }
       }
    }
 }
 
-/* F is fill-mode
+/*--------------------------------------------------------------------------
+ * hypreDevice_CSRMatrixMatvec
+ *
+ * Templated host function for launching the device kernels for SpMV.
+ *
+ * The template parameter F is the fill-mode. Supported values:
  *    0: whole matrix
  *   -1: lower
  *    1: upper
  *   -2: strict lower
  *    2: strict upper
- */
-template <HYPRE_Int F>
+ * The template parameter T is the matrix/vector coefficient data type
+ *--------------------------------------------------------------------------*/
+
+template <HYPRE_Int F, typename T>
 HYPRE_Int
-hypreDevice_CSRMatrixMatvec( HYPRE_Int      nrows,
-                             HYPRE_Int      nnz,
-                             HYPRE_Complex  alpha,
-                             HYPRE_Int     *d_ia,
-                             HYPRE_Int     *d_ja,
-                             HYPRE_Complex *d_a,
-                             HYPRE_Complex *d_x,
-                             HYPRE_Complex  beta,
-                             HYPRE_Complex *d_y )
+hypreDevice_CSRMatrixMatvec( HYPRE_Int  num_vectors,
+                             HYPRE_Int  num_rows,
+                             HYPRE_Int *rowid,
+                             HYPRE_Int  num_nonzeros,
+                             HYPRE_Int  idxstride_x,
+                             HYPRE_Int  idxstride_y,
+                             HYPRE_Int  vecstride_x,
+                             HYPRE_Int  vecstride_y,
+                             T          alpha,
+                             HYPRE_Int *d_ia,
+                             HYPRE_Int *d_ja,
+                             T         *d_a,
+                             T         *d_x,
+                             T          beta,
+                             T         *d_y )
 {
-   const HYPRE_Int rownnz = (nnz + nrows - 1) / nrows;
-   const dim3 bDim(SPMV_BLOCKDIM);
-
-   if (rownnz >= 64)
-   {
-      const HYPRE_Int group_size = 32;
-      const HYPRE_Int num_groups_per_block = SPMV_BLOCKDIM / group_size;
-      const dim3 gDim((nrows + num_groups_per_block - 1) / num_groups_per_block);
-      HYPRE_CUDA_LAUNCH( (hypre_csr_v_k_shuffle<F, group_size, HYPRE_Real>), gDim, bDim,
-                         nrows, alpha, d_ia, d_ja, d_a, d_x, beta, d_y );
-   }
-   else if (rownnz >= 32)
-   {
-      const HYPRE_Int group_size = 16;
-      const HYPRE_Int num_groups_per_block = SPMV_BLOCKDIM / group_size;
-      const dim3 gDim((nrows + num_groups_per_block - 1) / num_groups_per_block);
-      HYPRE_CUDA_LAUNCH( (hypre_csr_v_k_shuffle<F, group_size, HYPRE_Real>), gDim, bDim,
-                         nrows, alpha, d_ia, d_ja, d_a, d_x, beta, d_y );
-   }
-   else if (rownnz >= 16)
+   if (num_vectors > 64)
    {
-      const HYPRE_Int group_size = 8;
-      const HYPRE_Int num_groups_per_block = SPMV_BLOCKDIM / group_size;
-      const dim3 gDim((nrows + num_groups_per_block - 1) / num_groups_per_block);
-      HYPRE_CUDA_LAUNCH( (hypre_csr_v_k_shuffle<F, group_size, HYPRE_Real>), gDim, bDim,
-                         nrows, alpha, d_ia, d_ja, d_a, d_x, beta, d_y );
-   }
-   else if (rownnz >= 8)
-   {
-      const HYPRE_Int group_size = 4;
-      const HYPRE_Int num_groups_per_block = SPMV_BLOCKDIM / group_size;
-      const dim3 gDim((nrows + num_groups_per_block - 1) / num_groups_per_block);
-      HYPRE_CUDA_LAUNCH( (hypre_csr_v_k_shuffle<F, group_size, HYPRE_Real>), gDim, bDim,
-                         nrows, alpha, d_ia, d_ja, d_a, d_x, beta, d_y );
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "hypre's SpMV: (num_vectors > 64) not implemented");
+      return hypre_error_flag;
    }
-   else
+
+   const HYPRE_Int avg_rownnz = (num_nonzeros + num_rows - 1) / num_rows;
+
+   static constexpr HYPRE_Int group_sizes[5] = {32, 16, 8, 4, 4};
+
+   static constexpr HYPRE_Int unroll_depth[9] = {0, 1, 2, 3, 4, 5, 6, 7, 8};
+
+   static HYPRE_Int avg_rownnz_lower_bounds[5] = {64, 32, 16, 8, 0};
+
+   static HYPRE_Int num_groups_per_block[5] = { HYPRE_SPMV_BLOCKDIM / group_sizes[0],
+                                                HYPRE_SPMV_BLOCKDIM / group_sizes[1],
+                                                HYPRE_SPMV_BLOCKDIM / group_sizes[2],
+                                                HYPRE_SPMV_BLOCKDIM / group_sizes[3],
+                                                HYPRE_SPMV_BLOCKDIM / group_sizes[4]
+                                              };
+
+   const dim3 bDim = hypre_dim3(HYPRE_SPMV_BLOCKDIM);
+
+   /* Select execution path */
+   switch (num_vectors)
    {
-      const HYPRE_Int group_size = 4;
-      const HYPRE_Int num_groups_per_block = SPMV_BLOCKDIM / group_size;
-      const dim3 gDim((nrows + num_groups_per_block - 1) / num_groups_per_block);
-      HYPRE_CUDA_LAUNCH( (hypre_csr_v_k_shuffle<F, group_size, HYPRE_Real>), gDim, bDim,
-                         nrows, alpha, d_ia, d_ja, d_a, d_x, beta, d_y );
+      case unroll_depth[1]:
+         HYPRE_SPMV_GPU_LAUNCH(hypreGPUKernel_CSRMatvecShuffle, unroll_depth[1]);
+         break;
+
+      case unroll_depth[2]:
+         HYPRE_SPMV_GPU_LAUNCH(hypreGPUKernel_CSRMatvecShuffle, unroll_depth[2]);
+         break;
+
+      case unroll_depth[3]:
+         HYPRE_SPMV_GPU_LAUNCH(hypreGPUKernel_CSRMatvecShuffle, unroll_depth[3]);
+         break;
+
+      case unroll_depth[4]:
+         HYPRE_SPMV_GPU_LAUNCH(hypreGPUKernel_CSRMatvecShuffle, unroll_depth[4]);
+         break;
+
+      case unroll_depth[5]:
+         HYPRE_SPMV_GPU_LAUNCH(hypreGPUKernel_CSRMatvecShuffle, unroll_depth[5]);
+         break;
+
+      case unroll_depth[6]:
+         HYPRE_SPMV_GPU_LAUNCH(hypreGPUKernel_CSRMatvecShuffle, unroll_depth[6]);
+         break;
+
+      case unroll_depth[7]:
+         HYPRE_SPMV_GPU_LAUNCH(hypreGPUKernel_CSRMatvecShuffle, unroll_depth[7]);
+         break;
+
+      case unroll_depth[8]:
+         HYPRE_SPMV_GPU_LAUNCH(hypreGPUKernel_CSRMatvecShuffle, unroll_depth[8]);
+         break;
+
+      default:
+         HYPRE_SPMV_GPU_LAUNCH(hypreGPUKernel_CSRMatvecShuffleGT8, unroll_depth[8]);
+         break;
    }
 
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixSpMVDevice
+ *
+ * hypre's internal implementation of sparse matrix/vector multiplication
+ * (SpMV) on GPUs.
+ *
+ * Computes:  y = alpha*op(B)*x + beta*y
+ *
+ * Supported cases:
+ *   1) rownnz_B != NULL: y(rownnz_B) = alpha*op(B)*x + beta*y(rownnz_B)
+ *
+ *   2) op(B) = B (trans = 0) or B^T (trans = 1)
+ *      op(B) = B^T: not recommended since it computes B^T at every call
+ *
+ *   3) multi-component vectors up to 64 components (1 <= num_vectors <= 64)
+ *
+ * Notes:
+ *   1) if B has no numerical values, assume the values are all ones
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_CSRMatrixSpMVDevice( HYPRE_Complex    alpha,
-                           hypre_CSRMatrix *A,
+hypre_CSRMatrixSpMVDevice( HYPRE_Int        trans,
+                           HYPRE_Complex    alpha,
+                           hypre_CSRMatrix *B,
                            hypre_Vector    *x,
                            HYPRE_Complex    beta,
                            hypre_Vector    *y,
                            HYPRE_Int        fill )
 {
-   HYPRE_Int      nrows = hypre_CSRMatrixNumRows(A);
-   HYPRE_Int      nnz   = hypre_CSRMatrixNumNonzeros(A);
-   HYPRE_Int     *d_ia  = hypre_CSRMatrixI(A);
-   HYPRE_Int     *d_ja  = hypre_CSRMatrixJ(A);
-   HYPRE_Complex *d_a   = hypre_CSRMatrixData(A);
-   HYPRE_Complex *d_x   = hypre_VectorData(x);
-   HYPRE_Complex *d_y   = hypre_VectorData(y);
-
-   if (nnz <= 0 || alpha == 0.0)
-   {
-      hypre_SeqVectorScale(beta, y);
+   /* Input data variables */
+   HYPRE_Int        num_rows      = trans ? hypre_CSRMatrixNumCols(B) : hypre_CSRMatrixNumRows(B);
+   HYPRE_Int        num_nonzeros  = hypre_CSRMatrixNumNonzeros(B);
+   HYPRE_Int        num_vectors_x = hypre_VectorNumVectors(x);
+   HYPRE_Int        num_vectors_y = hypre_VectorNumVectors(y);
+   HYPRE_Complex   *d_x           = hypre_VectorData(x);
+   HYPRE_Complex   *d_y           = hypre_VectorData(y);
+   HYPRE_Int        idxstride_x   = hypre_VectorIndexStride(x);
+   HYPRE_Int        vecstride_x   = hypre_VectorVectorStride(x);
+   HYPRE_Int        idxstride_y   = hypre_VectorIndexStride(y);
+   HYPRE_Int        vecstride_y   = hypre_VectorVectorStride(y);
 
+   /* Matrix A variables */
+   hypre_CSRMatrix *A = NULL;
+   HYPRE_Int       *d_ia;
+   HYPRE_Int       *d_ja;
+   HYPRE_Complex   *d_a;
+   HYPRE_Int       *d_rownnz_A = NULL;
+
+   /* Sanity checks */
+   if (num_vectors_x != num_vectors_y)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "num_vectors_x != num_vectors_y");
       return hypre_error_flag;
    }
+   hypre_assert(num_rows > 0);
 
-   hypre_assert(nrows > 0);
+   /* Trivial case when alpha * op(B) * x = 0 */
+   if (num_nonzeros <= 0 || alpha == 0.0)
+   {
+      hypre_SeqVectorScale(beta, y);
+      return hypre_error_flag;
+   }
 
-   if (fill == 0)
+   /* Select op(B) */
+   if (trans)
    {
-      return hypreDevice_CSRMatrixMatvec<0>(nrows, nnz, alpha, d_ia, d_ja, d_a, d_x, beta, d_y);
+      hypre_CSRMatrixTransposeDevice(B, &A, hypre_CSRMatrixData(B) != NULL);
    }
-   else if (fill == 1)
+   else
    {
-      return hypreDevice_CSRMatrixMatvec<1>(nrows, nnz, alpha, d_ia, d_ja, d_a, d_x, beta, d_y);
+      A = B;
    }
-   else if (fill == -1)
+
+   /* Get matrix A info */
+   d_ia = hypre_CSRMatrixI(A);
+   d_ja = hypre_CSRMatrixJ(A);
+   d_a  = hypre_CSRMatrixData(A);
+
+   if (hypre_CSRMatrixRownnz(A))
    {
-      return hypreDevice_CSRMatrixMatvec<-1>(nrows, nnz, alpha, d_ia, d_ja, d_a, d_x, beta, d_y);
+      num_rows   = hypre_CSRMatrixNumRownnz(A);
+      d_rownnz_A = hypre_CSRMatrixRownnz(A);
+
+      hypre_SeqVectorScale(beta, y);
+      beta = beta ? 1.0 : 0.0;
    }
-   else if (fill == 2)
+
+   /* Choose matrix fill mode */
+   switch (fill)
    {
-      return hypreDevice_CSRMatrixMatvec<2>(nrows, nnz, alpha, d_ia, d_ja, d_a, d_x, beta, d_y);
+      case HYPRE_SPMV_FILL_STRICT_LOWER:
+         /* Strict lower matrix */
+         hypreDevice_CSRMatrixMatvec<HYPRE_SPMV_FILL_STRICT_LOWER>(num_vectors_x,
+                                                                   num_rows,
+                                                                   d_rownnz_A,
+                                                                   num_nonzeros,
+                                                                   idxstride_x,
+                                                                   idxstride_y,
+                                                                   vecstride_x,
+                                                                   vecstride_y,
+                                                                   alpha,
+                                                                   d_ia,
+                                                                   d_ja,
+                                                                   d_a,
+                                                                   d_x,
+                                                                   beta,
+                                                                   d_y);
+         break;
+
+      case HYPRE_SPMV_FILL_LOWER:
+         /* Lower matrix */
+         hypreDevice_CSRMatrixMatvec<HYPRE_SPMV_FILL_LOWER>(num_vectors_x,
+                                                            num_rows,
+                                                            d_rownnz_A,
+                                                            num_nonzeros,
+                                                            idxstride_x,
+                                                            idxstride_y,
+                                                            vecstride_x,
+                                                            vecstride_y,
+                                                            alpha,
+                                                            d_ia,
+                                                            d_ja,
+                                                            d_a,
+                                                            d_x,
+                                                            beta,
+                                                            d_y);
+         break;
+
+      case HYPRE_SPMV_FILL_WHOLE:
+         /* Full matrix */
+         hypreDevice_CSRMatrixMatvec<HYPRE_SPMV_FILL_WHOLE>(num_vectors_x,
+                                                            num_rows,
+                                                            d_rownnz_A,
+                                                            num_nonzeros,
+                                                            idxstride_x,
+                                                            idxstride_y,
+                                                            vecstride_x,
+                                                            vecstride_y,
+                                                            alpha,
+                                                            d_ia,
+                                                            d_ja,
+                                                            d_a,
+                                                            d_x,
+                                                            beta,
+                                                            d_y);
+         break;
+
+      case HYPRE_SPMV_FILL_UPPER:
+         /* Upper matrix */
+         hypreDevice_CSRMatrixMatvec<HYPRE_SPMV_FILL_UPPER>(num_vectors_x,
+                                                            num_rows,
+                                                            d_rownnz_A,
+                                                            num_nonzeros,
+                                                            idxstride_x,
+                                                            idxstride_y,
+                                                            vecstride_x,
+                                                            vecstride_y,
+                                                            alpha,
+                                                            d_ia,
+                                                            d_ja,
+                                                            d_a,
+                                                            d_x,
+                                                            beta,
+                                                            d_y);
+         break;
+
+      case HYPRE_SPMV_FILL_STRICT_UPPER:
+         /* Strict upper matrix */
+         hypreDevice_CSRMatrixMatvec<HYPRE_SPMV_FILL_STRICT_UPPER>(num_vectors_x,
+                                                                   num_rows,
+                                                                   d_rownnz_A,
+                                                                   num_nonzeros,
+                                                                   idxstride_x,
+                                                                   idxstride_y,
+                                                                   vecstride_x,
+                                                                   vecstride_y,
+                                                                   alpha,
+                                                                   d_ia,
+                                                                   d_ja,
+                                                                   d_a,
+                                                                   d_x,
+                                                                   beta,
+                                                                   d_y);
+         break;
+
+      default:
+         hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Fill mode for SpMV unavailable!");
+         return hypre_error_flag;
    }
-   else if (fill == -2)
+
+   /* Free memory */
+   if (trans)
    {
-      return hypreDevice_CSRMatrixMatvec<-2>(nrows, nnz, alpha, d_ia, d_ja, d_a, d_x, beta, d_y);
+      hypre_CSRMatrixDestroy(A);
    }
 
    return hypre_error_flag;
 }
 
-#endif /*#if defined(HYPRE_USING_CUDA)  || defined(HYPRE_USING_HIP) */
+/*--------------------------------------------------------------------------
+ * hypre_CSRMatrixIntSpMVDevice
+ *
+ * Sparse matrix/vector multiplication with integer data on GPUs
+ *
+ * Note: This function does not support multi-component vectors
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_CSRMatrixIntSpMVDevice( HYPRE_Int  num_rows,
+                              HYPRE_Int  num_nonzeros,
+                              HYPRE_Int  alpha,
+                              HYPRE_Int *d_ia,
+                              HYPRE_Int *d_ja,
+                              HYPRE_Int *d_a,
+                              HYPRE_Int *d_x,
+                              HYPRE_Int  beta,
+                              HYPRE_Int *d_y )
+{
+   /* Additional input variables */
+   HYPRE_Int        num_vectors = 1;
+   HYPRE_Int        idxstride_x = 1;
+   HYPRE_Int        vecstride_x = 1;
+   HYPRE_Int        idxstride_y = 1;
+   HYPRE_Int        vecstride_y = 1;
+   HYPRE_Int       *d_rownnz    = NULL;
+
+   hypreDevice_CSRMatrixMatvec<HYPRE_SPMV_FILL_WHOLE, HYPRE_Int>(num_vectors,
+                                                                 num_rows,
+                                                                 d_rownnz,
+                                                                 num_nonzeros,
+                                                                 idxstride_x,
+                                                                 idxstride_y,
+                                                                 vecstride_x,
+                                                                 vecstride_y,
+                                                                 alpha,
+                                                                 d_ia,
+                                                                 d_ja,
+                                                                 d_a,
+                                                                 d_x,
+                                                                 beta,
+                                                                 d_y);
+
+   return hypre_error_flag;
+}
+#endif /* #if defined(HYPRE_USING_GPU) */
diff --git a/external/hypre/src/seq_mv/csr_spmv_device.h b/external/hypre/src/seq_mv/csr_spmv_device.h
new file mode 100644
index 00000000..85f7337b
--- /dev/null
+++ b/external/hypre/src/seq_mv/csr_spmv_device.h
@@ -0,0 +1,123 @@
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+#ifndef hypre_CSR_SPMV_DEVICE_H
+#define hypre_CSR_SPMV_DEVICE_H
+
+#define HYPRE_SPMV_BLOCKDIM 512
+#define HYPRE_SPMV_VERSION 1
+#define HYPRE_SPMV_FILL_STRICT_LOWER -2
+#define HYPRE_SPMV_FILL_LOWER -1
+#define HYPRE_SPMV_FILL_WHOLE 0
+#define HYPRE_SPMV_FILL_UPPER 1
+#define HYPRE_SPMV_FILL_STRICT_UPPER 2
+
+#define HYPRE_SPMV_ADD_SUM(p, nv)                                                         \
+{                                                                                         \
+   const HYPRE_Int col = read_only_load(&d_ja[p]);                                        \
+   if (F == HYPRE_SPMV_FILL_WHOLE)                                                        \
+   {                                                                                      \
+      const T val = d_a ? read_only_load(&d_a[p]) : T(1);                                 \
+      for (HYPRE_Int i = 0; i < nv; i++)                                                  \
+      {                                                                                   \
+         sum[i] += val * read_only_load(&d_x[col * idxstride_x + i * vecstride_x]);       \
+      }                                                                                   \
+   }                                                                                      \
+   else if (F == HYPRE_SPMV_FILL_LOWER)                                                   \
+   {                                                                                      \
+      if (col <= grid_group_id)                                                           \
+      {                                                                                   \
+         const T val = d_a ? read_only_load(&d_a[p]) : T(1);                              \
+         for (HYPRE_Int i = 0; i < nv; i++)                                               \
+         {                                                                                \
+            sum[i] += val * read_only_load(&d_x[col * idxstride_x + i * vecstride_x]);    \
+         }                                                                                \
+      }                                                                                   \
+   }                                                                                      \
+   else if (F == HYPRE_SPMV_FILL_UPPER)                                                   \
+   {                                                                                      \
+      if (col >= grid_group_id)                                                           \
+      {                                                                                   \
+         const T val = d_a ? read_only_load(&d_a[p]) : T(1);                              \
+         for (HYPRE_Int i = 0; i < nv; i++)                                               \
+         {                                                                                \
+            sum[i] += val * read_only_load(&d_x[col * idxstride_x + i * vecstride_x]);    \
+         }                                                                                \
+      }                                                                                   \
+   }                                                                                      \
+   else if (F == HYPRE_SPMV_FILL_STRICT_LOWER)                                            \
+   {                                                                                      \
+      if (col < grid_group_id)                                                            \
+      {                                                                                   \
+         const T val = d_a ? read_only_load(&d_a[p]) : T(1);                              \
+         for (HYPRE_Int i = 0; i < nv; i++)                                               \
+         {                                                                                \
+            sum[i] += val * read_only_load(&d_x[col * idxstride_x + i * vecstride_x]);    \
+         }                                                                                \
+      }                                                                                   \
+   }                                                                                      \
+   else if (F == HYPRE_SPMV_FILL_STRICT_UPPER)                                            \
+   {                                                                                      \
+      if (col > grid_group_id)                                                            \
+      {                                                                                   \
+         const T val = d_a ? read_only_load(&d_a[p]) : T(1);                              \
+         for (HYPRE_Int i = 0; i < nv; i++)                                               \
+         {                                                                                \
+            sum[i] += val * read_only_load(&d_x[col * idxstride_x + i * vecstride_x]);    \
+         }                                                                                \
+      }                                                                                   \
+   }                                                                                      \
+}
+
+#define HYPRE_SPMV_GPU_LAUNCH(kernel, nv)                                                  \
+   if (avg_rownnz >= avg_rownnz_lower_bounds[0])                                           \
+   {                                                                                       \
+      const dim3 gDim =                                                                    \
+         hypre_dim3((num_rows + num_groups_per_block[0] - 1) / num_groups_per_block[0]);   \
+      HYPRE_GPU_LAUNCH( (kernel<F, group_sizes[0], nv, T>),                                \
+                        gDim, bDim, num_rows, num_vectors, rowid, idxstride_x,             \
+                        idxstride_y, vecstride_x, vecstride_y, alpha,                      \
+                        d_ia, d_ja, d_a, d_x, beta, d_y );                                 \
+   }                                                                                       \
+   else if (avg_rownnz >= avg_rownnz_lower_bounds[1])                                      \
+   {                                                                                       \
+      const dim3 gDim =                                                                    \
+         hypre_dim3((num_rows + num_groups_per_block[1] - 1) / num_groups_per_block[1]);   \
+      HYPRE_GPU_LAUNCH( (kernel<F, group_sizes[1], nv, T>),                                \
+                        gDim, bDim, num_rows, num_vectors, rowid, idxstride_x,             \
+                        idxstride_y, vecstride_x, vecstride_y, alpha,                      \
+                        d_ia, d_ja, d_a, d_x, beta, d_y );                                 \
+   }                                                                                       \
+   else if (avg_rownnz >= avg_rownnz_lower_bounds[2])                                      \
+   {                                                                                       \
+      const dim3 gDim =                                                                    \
+         hypre_dim3((num_rows + num_groups_per_block[2] - 1) / num_groups_per_block[2]);   \
+      HYPRE_GPU_LAUNCH( (kernel<F, group_sizes[2], nv, T>),                                \
+                        gDim, bDim, num_rows, num_vectors, rowid, idxstride_x,             \
+                        idxstride_y, vecstride_x, vecstride_y, alpha,                      \
+                        d_ia, d_ja, d_a, d_x, beta, d_y );                                 \
+   }                                                                                       \
+   else if (avg_rownnz >= avg_rownnz_lower_bounds[3])                                      \
+   {                                                                                       \
+      const dim3 gDim =                                                                    \
+         hypre_dim3((num_rows + num_groups_per_block[3] - 1) / num_groups_per_block[3]);   \
+      HYPRE_GPU_LAUNCH( (kernel<F, group_sizes[3], nv, T>),                                \
+                        gDim, bDim, num_rows, num_vectors, rowid, idxstride_x,             \
+                        idxstride_y, vecstride_x, vecstride_y, alpha,                      \
+                        d_ia, d_ja, d_a, d_x, beta, d_y );                                 \
+   }                                                                                       \
+   else                                                                                    \
+   {                                                                                       \
+      const dim3 gDim =                                                                    \
+         hypre_dim3((num_rows + num_groups_per_block[4] - 1) / num_groups_per_block[4]);   \
+      HYPRE_GPU_LAUNCH( (kernel<F, group_sizes[4], nv, T>),                                \
+                        gDim, bDim, num_rows, num_vectors, rowid, idxstride_x,             \
+                        idxstride_y, vecstride_x, vecstride_y, alpha,                      \
+                        d_ia, d_ja, d_a, d_x, beta, d_y );                                 \
+   }
+
+#endif
diff --git a/external/hypre/src/seq_mv/csr_sptrans_device.c b/external/hypre/src/seq_mv/csr_sptrans_device.c
index d41d38af..b7285ad4 100644
--- a/external/hypre/src/seq_mv/csr_sptrans_device.c
+++ b/external/hypre/src/seq_mv/csr_sptrans_device.c
@@ -1,10 +1,11 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
  ******************************************************************************/
 
+#include "_hypre_onedpl.hpp"
 #include "seq_mv.h"
 #include "_hypre_utilities.hpp"
 
@@ -63,20 +64,19 @@ hypreDevice_CSRSpTransCusparse(HYPRE_Int   m,        HYPRE_Int   n,        HYPRE
 
    hypre_TFree(dBuffer, HYPRE_MEMORY_DEVICE);
 #else
-   HYPRE_CUSPARSE_CALL( cusparseDcsr2csc(handle,
-                                         m, n, nnzA,
-                                         d_aa, d_ia, d_ja,
-                                         csc_a, csc_j, csc_i,
-                                         action,
-                                         CUSPARSE_INDEX_BASE_ZERO) );
-#endif
+   HYPRE_CUSPARSE_CALL( hypre_cusparse_csr2csc(handle,
+                                               m, n, nnzA,
+                                               d_aa, d_ia, d_ja,
+                                               csc_a, csc_j, csc_i,
+                                               action,
+                                               CUSPARSE_INDEX_BASE_ZERO) );
+#endif /* #if CUSPARSE_VERSION >= CUSPARSE_NEWAPI_VERSION */
 
    *d_ic_out = csc_i;
    *d_jc_out = csc_j;
    *d_ac_out = csc_a;
 
 #ifdef HYPRE_PROFILE
-   cudaThreadSynchronize();
    hypre_profile_times[HYPRE_TIMER_ID_SPTRANS] += hypre_MPI_Wtime();
 #endif
 
@@ -123,13 +123,14 @@ hypreDevice_CSRSpTransRocsparse(HYPRE_Int   m,        HYPRE_Int   n,        HYPR
    void * buffer;
    buffer = hypre_TAlloc(char, buffer_size, HYPRE_MEMORY_DEVICE);
 
-   HYPRE_ROCSPARSE_CALL( rocsparse_dcsr2csc(handle,
-                                            m, n, nnzA,
-                                            d_aa, d_ia, d_ja,
-                                            csc_a, csc_j, csc_i,
-                                            action,
-                                            rocsparse_index_base_zero,
-                                            buffer) );
+   HYPRE_ROCSPARSE_CALL( hypre_rocsparse_csr2csc(handle,
+                                                 m, n, nnzA,
+                                                 d_aa, d_ia, d_ja,
+                                                 csc_a, csc_j, csc_i,
+                                                 action,
+                                                 rocsparse_index_base_zero,
+                                                 buffer) );
+
    hypre_TFree(buffer, HYPRE_MEMORY_DEVICE);
 
    *d_ic_out = csc_i;
@@ -137,7 +138,7 @@ hypreDevice_CSRSpTransRocsparse(HYPRE_Int   m,        HYPRE_Int   n,        HYPR
    *d_ac_out = csc_a;
 
 #ifdef HYPRE_PROFILE
-   hypre_SyncCudaDevice(hypre_handle())
+   hypre_SyncDevice();
    hypre_profile_times[HYPRE_TIMER_ID_SPTRANS] += hypre_MPI_Wtime();
 #endif
 
@@ -146,7 +147,6 @@ hypreDevice_CSRSpTransRocsparse(HYPRE_Int   m,        HYPRE_Int   n,        HYPR
 
 #endif // #if defined(HYPRE_USING_ROCSPARSE)
 
-
 #if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
 
 HYPRE_Int
@@ -161,7 +161,7 @@ hypreDevice_CSRSpTrans(HYPRE_Int   m,        HYPRE_Int   n,        HYPRE_Int
 
    HYPRE_Int *d_jt, *d_it, *d_pm, *d_ic, *d_jc;
    HYPRE_Complex *d_ac = NULL;
-   HYPRE_Int *mem_work = hypre_TAlloc(HYPRE_Int, 3*nnzA, HYPRE_MEMORY_DEVICE);
+   HYPRE_Int *mem_work = hypre_TAlloc(HYPRE_Int, 3 * nnzA, HYPRE_MEMORY_DEVICE);
 
    /* allocate C */
    d_jc = hypre_TAlloc(HYPRE_Int, nnzA, HYPRE_MEMORY_DEVICE);
@@ -214,7 +214,6 @@ hypreDevice_CSRSpTrans(HYPRE_Int   m,        HYPRE_Int   n,        HYPRE_Int
    *d_ac_out = d_ac;
 
 #ifdef HYPRE_PROFILE
-   cudaThreadSynchronize();
    hypre_profile_times[HYPRE_TIMER_ID_SPTRANS] += hypre_MPI_Wtime();
 #endif
 
@@ -222,3 +221,87 @@ hypreDevice_CSRSpTrans(HYPRE_Int   m,        HYPRE_Int   n,        HYPRE_Int
 }
 
 #endif /* HYPRE_USING_CUDA  || defined(HYPRE_USING_HIP) */
+
+#if defined(HYPRE_USING_SYCL)
+HYPRE_Int
+hypreDevice_CSRSpTrans(HYPRE_Int   m,        HYPRE_Int   n,        HYPRE_Int       nnzA,
+                       HYPRE_Int  *d_ia,     HYPRE_Int  *d_ja,     HYPRE_Complex  *d_aa,
+                       HYPRE_Int **d_ic_out, HYPRE_Int **d_jc_out, HYPRE_Complex **d_ac_out,
+                       HYPRE_Int   want_data)
+{
+#ifdef HYPRE_PROFILE
+   hypre_profile_times[HYPRE_TIMER_ID_SPTRANS] -= hypre_MPI_Wtime();
+#endif
+
+   HYPRE_Int *d_jt, *d_it, *d_pm, *d_ic, *d_jc;
+   HYPRE_Complex *d_ac = NULL;
+   HYPRE_Int *mem_work = hypre_TAlloc(HYPRE_Int, 3 * nnzA, HYPRE_MEMORY_DEVICE);
+
+   /* allocate C */
+   d_jc = hypre_TAlloc(HYPRE_Int, nnzA, HYPRE_MEMORY_DEVICE);
+   if (want_data)
+   {
+      d_ac = hypre_TAlloc(HYPRE_Complex, nnzA, HYPRE_MEMORY_DEVICE);
+   }
+
+   /* permutation vector */
+   d_pm = mem_work;
+
+   /* expansion: A's row idx */
+   d_it = d_pm + nnzA;
+   hypreDevice_CsrRowPtrsToIndices_v2(m, nnzA, d_ia, d_it);
+
+   /* a copy of col idx of A */
+   d_jt = d_it + nnzA;
+   hypre_TMemcpy(d_jt, d_ja, HYPRE_Int, nnzA, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+
+   /* sort: by col */
+   oneapi::dpl::counting_iterator<HYPRE_Int> count(0);
+   HYPRE_ONEDPL_CALL( std::copy,
+                      count,
+                      count + nnzA,
+                      d_pm);
+
+   auto zip_jt_pm = oneapi::dpl::make_zip_iterator(d_jt, d_pm);
+   HYPRE_ONEDPL_CALL( std::stable_sort,
+                      zip_jt_pm,
+                      zip_jt_pm + nnzA,
+   [](auto lhs, auto rhs) { return std::get<0>(lhs) < std::get<0>(rhs); } );
+
+   auto permuted_it = oneapi::dpl::make_permutation_iterator(d_it, d_pm);
+   HYPRE_ONEDPL_CALL( std::copy,
+                      permuted_it,
+                      permuted_it + nnzA,
+                      d_jc );
+
+   if (want_data)
+   {
+      auto permuted_aa = oneapi::dpl::make_permutation_iterator(d_aa, d_pm);
+      HYPRE_ONEDPL_CALL( std::copy,
+                         permuted_aa,
+                         permuted_aa + nnzA,
+                         d_ac );
+   }
+
+   /* convert into ic: row idx --> row ptrs */
+   d_ic = hypreDevice_CsrRowIndicesToPtrs(n, nnzA, d_jt);
+
+#ifdef HYPRE_DEBUG
+   HYPRE_Int nnzC;
+   hypre_TMemcpy(&nnzC, &d_ic[n], HYPRE_Int, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
+   hypre_assert(nnzC == nnzA);
+#endif
+
+   hypre_TFree(mem_work, HYPRE_MEMORY_DEVICE);
+
+   *d_ic_out = d_ic;
+   *d_jc_out = d_jc;
+   *d_ac_out = d_ac;
+
+#ifdef HYPRE_PROFILE
+   hypre_profile_times[HYPRE_TIMER_ID_SPTRANS] += hypre_MPI_Wtime();
+#endif
+
+   return hypre_error_flag;
+}
+#endif // #if defined(HYPRE_USING_SYCL)
diff --git a/external/hypre/src/seq_mv/genpart.c b/external/hypre/src/seq_mv/genpart.c
index aa84c893..ba256be4 100644
--- a/external/hypre/src/seq_mv/genpart.c
+++ b/external/hypre/src/seq_mv/genpart.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -22,14 +22,14 @@ hypre_GeneratePartitioning(HYPRE_BigInt length, HYPRE_Int num_procs, HYPRE_BigIn
    HYPRE_Int size, rest;
    HYPRE_Int i;
 
-   part = hypre_CTAlloc(HYPRE_BigInt,  num_procs+1, HYPRE_MEMORY_HOST);
+   part = hypre_CTAlloc(HYPRE_BigInt,  num_procs + 1, HYPRE_MEMORY_HOST);
    size = (HYPRE_Int)(length / (HYPRE_BigInt)num_procs);
-   rest = (HYPRE_Int)(length - (HYPRE_BigInt)(size*num_procs));
+   rest = (HYPRE_Int)(length - (HYPRE_BigInt)(size * num_procs));
    part[0] = 0;
-   for (i=0; i < num_procs; i++)
+   for (i = 0; i < num_procs; i++)
    {
-	part[i+1] = part[i]+(HYPRE_BigInt)size;
-	if (i < rest) part[i+1]++;
+      part[i + 1] = part[i] + (HYPRE_BigInt)size;
+      if (i < rest) { part[i + 1]++; }
    }
 
    *part_ptr = part;
@@ -54,15 +54,15 @@ hypre_GenerateLocalPartitioning(HYPRE_BigInt   length,
    HYPRE_Int  size, rest;
 
    size = (HYPRE_Int)(length / (HYPRE_BigInt)num_procs);
-   rest = (HYPRE_Int)(length - (HYPRE_BigInt)(size*num_procs));
+   rest = (HYPRE_Int)(length - (HYPRE_BigInt)(size * num_procs));
 
    /* first row I own */
-   part[0] = (HYPRE_BigInt)(size*myid);
+   part[0] = (HYPRE_BigInt)(size * myid);
    part[0] += (HYPRE_BigInt)(hypre_min(myid, rest));
 
    /* last row I own */
-   part[1] =  (HYPRE_BigInt)(size*(myid+1));
-   part[1] += (HYPRE_BigInt)(hypre_min(myid+1, rest));
+   part[1] =  (HYPRE_BigInt)(size * (myid + 1));
+   part[1] += (HYPRE_BigInt)(hypre_min(myid + 1, rest));
    part[1] = part[1] - 1;
 
    /* add 1 to last row since this is for "starts" vector */
diff --git a/external/hypre/src/seq_mv/headers b/external/hypre/src/seq_mv/headers
old mode 100644
new mode 100755
index 7ed292ff..81f32d15
--- a/external/hypre/src/seq_mv/headers
+++ b/external/hypre/src/seq_mv/headers
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/seq_mv/mapped_matrix.c b/external/hypre/src/seq_mv/mapped_matrix.c
index a0b9643d..0895371e 100644
--- a/external/hypre/src/seq_mv/mapped_matrix.c
+++ b/external/hypre/src/seq_mv/mapped_matrix.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -18,7 +18,7 @@
  *--------------------------------------------------------------------------*/
 
 hypre_MappedMatrix *
-hypre_MappedMatrixCreate(  )
+hypre_MappedMatrixCreate( void )
 {
    hypre_MappedMatrix  *matrix;
 
@@ -32,10 +32,10 @@ hypre_MappedMatrixCreate(  )
  * hypre_MappedMatrixDestroy
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 hypre_MappedMatrixDestroy( hypre_MappedMatrix *matrix )
 {
-   HYPRE_Int  ierr=0;
+   HYPRE_Int  ierr = 0;
 
    if (matrix)
    {
@@ -53,10 +53,10 @@ hypre_MappedMatrixDestroy( hypre_MappedMatrix *matrix )
  * hypre_MappedMatrixLimitedDestroy
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 hypre_MappedMatrixLimitedDestroy( hypre_MappedMatrix *matrix )
 {
-   HYPRE_Int  ierr=0;
+   HYPRE_Int  ierr = 0;
 
    if (matrix)
    {
@@ -66,42 +66,50 @@ hypre_MappedMatrixLimitedDestroy( hypre_MappedMatrix *matrix )
    return ierr;
 }
 
-
 /*--------------------------------------------------------------------------
  * hypre_MappedMatrixInitialize
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 hypre_MappedMatrixInitialize( hypre_MappedMatrix *matrix )
 {
-   HYPRE_Int    ierr=0;
+   HYPRE_Int ierr = 0;
+
+   HYPRE_UNUSED_VAR(matrix);
 
    return ierr;
 }
 
-
 /*--------------------------------------------------------------------------
  * hypre_MappedMatrixAssemble
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 hypre_MappedMatrixAssemble( hypre_MappedMatrix *matrix )
 {
-   HYPRE_Int    ierr=0;
+   HYPRE_Int    ierr = 0;
 
-   if( matrix == NULL )
+   if ( matrix == NULL )
+   {
       return ( -1 ) ;
+   }
 
-   if( hypre_MappedMatrixMatrix(matrix) == NULL )
+   if ( hypre_MappedMatrixMatrix(matrix) == NULL )
+   {
       return ( -1 ) ;
+   }
 
-   if( hypre_MappedMatrixColMap(matrix) == NULL )
+   if ( hypre_MappedMatrixColMap(matrix) == NULL )
+   {
       return ( -1 ) ;
+   }
 
-   if( hypre_MappedMatrixMapData(matrix) == NULL )
+   if ( hypre_MappedMatrixMapData(matrix) == NULL )
+   {
       return ( -1 ) ;
+   }
 
-   return(ierr);
+   return (ierr);
 }
 
 
@@ -112,6 +120,8 @@ hypre_MappedMatrixAssemble( hypre_MappedMatrix *matrix )
 void
 hypre_MappedMatrixPrint(hypre_MappedMatrix *matrix  )
 {
+   HYPRE_UNUSED_VAR(matrix);
+
    hypre_printf("Stub for hypre_MappedMatrix\n");
 }
 
@@ -122,7 +132,7 @@ hypre_MappedMatrixPrint(hypre_MappedMatrix *matrix  )
 HYPRE_Int
 hypre_MappedMatrixGetColIndex(hypre_MappedMatrix *matrix, HYPRE_Int j  )
 {
-   return( hypre_MappedMatrixColIndex(matrix,j) );
+   return ( hypre_MappedMatrixColIndex(matrix, j) );
 }
 
 /*--------------------------------------------------------------------------
@@ -132,7 +142,7 @@ hypre_MappedMatrixGetColIndex(hypre_MappedMatrix *matrix, HYPRE_Int j  )
 void *
 hypre_MappedMatrixGetMatrix(hypre_MappedMatrix *matrix )
 {
-   return( hypre_MappedMatrixMatrix(matrix) );
+   return ( hypre_MappedMatrixMatrix(matrix) );
 }
 
 /*--------------------------------------------------------------------------
@@ -142,11 +152,11 @@ hypre_MappedMatrixGetMatrix(hypre_MappedMatrix *matrix )
 HYPRE_Int
 hypre_MappedMatrixSetMatrix(hypre_MappedMatrix *matrix, void *matrix_data  )
 {
-   HYPRE_Int ierr=0;
+   HYPRE_Int ierr = 0;
 
    hypre_MappedMatrixMatrix(matrix) = matrix_data;
 
-   return(ierr);
+   return (ierr);
 }
 
 /*--------------------------------------------------------------------------
@@ -154,14 +164,14 @@ hypre_MappedMatrixSetMatrix(hypre_MappedMatrix *matrix, void *matrix_data  )
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_MappedMatrixSetColMap(hypre_MappedMatrix *matrix, 
-                          HYPRE_Int (*ColMap)(HYPRE_Int, void *)  )
+hypre_MappedMatrixSetColMap(hypre_MappedMatrix *matrix,
+                            HYPRE_Int (*ColMap)(HYPRE_Int, void *)  )
 {
-   HYPRE_Int ierr=0;
+   HYPRE_Int ierr = 0;
 
    hypre_MappedMatrixColMap(matrix) = ColMap;
 
-   return(ierr);
+   return (ierr);
 }
 
 /*--------------------------------------------------------------------------
@@ -169,13 +179,12 @@ hypre_MappedMatrixSetColMap(hypre_MappedMatrix *matrix,
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_MappedMatrixSetMapData(hypre_MappedMatrix *matrix, 
-                          void *map_data )
+hypre_MappedMatrixSetMapData(hypre_MappedMatrix *matrix,
+                             void *map_data )
 {
-   HYPRE_Int ierr=0;
+   HYPRE_Int ierr = 0;
 
    hypre_MappedMatrixMapData(matrix) = map_data;
 
-   return(ierr);
+   return (ierr);
 }
-
diff --git a/external/hypre/src/seq_mv/mapped_matrix.h b/external/hypre/src/seq_mv/mapped_matrix.h
index 3a055a23..b1564d10 100644
--- a/external/hypre/src/seq_mv/mapped_matrix.h
+++ b/external/hypre/src/seq_mv/mapped_matrix.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/seq_mv/multiblock_matrix.c b/external/hypre/src/seq_mv/multiblock_matrix.c
index 4818e29b..fce20d17 100644
--- a/external/hypre/src/seq_mv/multiblock_matrix.c
+++ b/external/hypre/src/seq_mv/multiblock_matrix.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -18,7 +18,7 @@
  *--------------------------------------------------------------------------*/
 
 hypre_MultiblockMatrix *
-hypre_MultiblockMatrixCreate( )
+hypre_MultiblockMatrixCreate( void )
 {
    hypre_MultiblockMatrix  *matrix;
 
@@ -31,15 +31,17 @@ hypre_MultiblockMatrixCreate( )
  * hypre_MultiblockMatrixDestroy
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 hypre_MultiblockMatrixDestroy( hypre_MultiblockMatrix *matrix )
 {
-   HYPRE_Int  ierr=0, i;
+   HYPRE_Int  ierr = 0, i;
 
    if (matrix)
    {
-      for(i=0; i < hypre_MultiblockMatrixNumSubmatrices(matrix); i++)
+      for (i = 0; i < hypre_MultiblockMatrixNumSubmatrices(matrix); i++)
+      {
          hypre_TFree(hypre_MultiblockMatrixSubmatrix(matrix, i), HYPRE_MEMORY_HOST);
+      }
       hypre_TFree(hypre_MultiblockMatrixSubmatrices(matrix), HYPRE_MEMORY_HOST);
       hypre_TFree(hypre_MultiblockMatrixSubmatrixTypes(matrix), HYPRE_MEMORY_HOST);
 
@@ -54,10 +56,10 @@ hypre_MultiblockMatrixDestroy( hypre_MultiblockMatrix *matrix )
  * hypre_MultiblockMatrixLimitedDestroy
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 hypre_MultiblockMatrixLimitedDestroy( hypre_MultiblockMatrix *matrix )
 {
-   HYPRE_Int  ierr=0;
+   HYPRE_Int  ierr = 0;
 
    if (matrix)
    {
@@ -75,36 +77,38 @@ hypre_MultiblockMatrixLimitedDestroy( hypre_MultiblockMatrix *matrix )
  * hypre_MultiblockMatrixInitialize
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 hypre_MultiblockMatrixInitialize( hypre_MultiblockMatrix *matrix )
 {
-   HYPRE_Int    ierr=0;
+   HYPRE_Int    ierr = 0;
 
-   if( hypre_MultiblockMatrixNumSubmatrices(matrix) <= 0 )
-      return(-1);
+   if ( hypre_MultiblockMatrixNumSubmatrices(matrix) <= 0 )
+   {
+      return (-1);
+   }
 
-   hypre_MultiblockMatrixSubmatrixTypes(matrix) = 
-      hypre_CTAlloc( HYPRE_Int,  hypre_MultiblockMatrixNumSubmatrices(matrix) , HYPRE_MEMORY_HOST);
+   hypre_MultiblockMatrixSubmatrixTypes(matrix) =
+      hypre_CTAlloc( HYPRE_Int,  hypre_MultiblockMatrixNumSubmatrices(matrix), HYPRE_MEMORY_HOST);
 
-   hypre_MultiblockMatrixSubmatrices(matrix) = 
-      hypre_CTAlloc( void *,  hypre_MultiblockMatrixNumSubmatrices(matrix) , HYPRE_MEMORY_HOST);
+   hypre_MultiblockMatrixSubmatrices(matrix) =
+      hypre_CTAlloc( void *,  hypre_MultiblockMatrixNumSubmatrices(matrix), HYPRE_MEMORY_HOST);
 
    return ierr;
 }
 
-
 /*--------------------------------------------------------------------------
  * hypre_MultiblockMatrixAssemble
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 hypre_MultiblockMatrixAssemble( hypre_MultiblockMatrix *matrix )
 {
-   HYPRE_Int    ierr=0;
+   HYPRE_Int    ierr = 0;
 
-   return(ierr);
-}
+   HYPRE_UNUSED_VAR(matrix);
 
+   return (ierr);
+}
 
 /*--------------------------------------------------------------------------
  * hypre_MultiblockMatrixPrint
@@ -113,6 +117,8 @@ hypre_MultiblockMatrixAssemble( hypre_MultiblockMatrix *matrix )
 void
 hypre_MultiblockMatrixPrint(hypre_MultiblockMatrix *matrix  )
 {
+   HYPRE_UNUSED_VAR(matrix);
+
    hypre_printf("Stub for hypre_MultiblockMatrix\n");
 }
 
@@ -126,7 +132,7 @@ hypre_MultiblockMatrixSetNumSubmatrices(hypre_MultiblockMatrix *matrix, HYPRE_In
    HYPRE_Int ierr = 0;
 
    hypre_MultiblockMatrixNumSubmatrices(matrix) = n;
-   return( ierr );
+   return ( ierr );
 }
 
 /*--------------------------------------------------------------------------
@@ -134,19 +140,21 @@ hypre_MultiblockMatrixSetNumSubmatrices(hypre_MultiblockMatrix *matrix, HYPRE_In
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_MultiblockMatrixSetSubmatrixType(hypre_MultiblockMatrix *matrix, 
-                                     HYPRE_Int j,
-                                     HYPRE_Int type  )
+hypre_MultiblockMatrixSetSubmatrixType(hypre_MultiblockMatrix *matrix,
+                                       HYPRE_Int j,
+                                       HYPRE_Int type  )
 {
    HYPRE_Int ierr = 0;
 
-   if ( (j<0) || 
-         (j >= hypre_MultiblockMatrixNumSubmatrices(matrix)) )
-      return(-1);
+   if ( (j < 0) ||
+        (j >= hypre_MultiblockMatrixNumSubmatrices(matrix)) )
+   {
+      return (-1);
+   }
 
-   hypre_MultiblockMatrixSubmatrixType(matrix,j) = type;
+   hypre_MultiblockMatrixSubmatrixType(matrix, j) = type;
 
-   return( ierr );
+   return ( ierr );
 }
 
 /*--------------------------------------------------------------------------
@@ -154,19 +162,19 @@ hypre_MultiblockMatrixSetSubmatrixType(hypre_MultiblockMatrix *matrix,
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_MultiblockMatrixSetSubmatrix(hypre_MultiblockMatrix *matrix, 
-                                     HYPRE_Int j,
-                                     void *submatrix  )
+hypre_MultiblockMatrixSetSubmatrix(hypre_MultiblockMatrix *matrix,
+                                   HYPRE_Int j,
+                                   void *submatrix  )
 {
    HYPRE_Int ierr = 0;
 
-   if ( (j<0) || 
-         (j >= hypre_MultiblockMatrixNumSubmatrices(matrix)) )
-      return(-1);
+   if ( (j < 0) ||
+        (j >= hypre_MultiblockMatrixNumSubmatrices(matrix)) )
+   {
+      return (-1);
+   }
 
-   hypre_MultiblockMatrixSubmatrix(matrix,j) = submatrix;
+   hypre_MultiblockMatrixSubmatrix(matrix, j) = submatrix;
 
-   return( ierr );
+   return ( ierr );
 }
-
-
diff --git a/external/hypre/src/seq_mv/multiblock_matrix.h b/external/hypre/src/seq_mv/multiblock_matrix.h
index 7dd463a4..995413b9 100644
--- a/external/hypre/src/seq_mv/multiblock_matrix.h
+++ b/external/hypre/src/seq_mv/multiblock_matrix.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/seq_mv/protos.h b/external/hypre/src/seq_mv/protos.h
index 62a97e2b..f645aa0c 100644
--- a/external/hypre/src/seq_mv/protos.h
+++ b/external/hypre/src/seq_mv/protos.h
@@ -1,106 +1,201 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
  ******************************************************************************/
 
+/* csr_filter.c */
+HYPRE_Int hypre_CSRMatrixTruncateDiag(hypre_CSRMatrix *A);
+
 /* csr_matop.c */
-HYPRE_Int hypre_CSRMatrixAddFirstPass ( HYPRE_Int firstrow , HYPRE_Int lastrow , HYPRE_Int *marker , HYPRE_Int *twspace , HYPRE_Int *map_A2C , HYPRE_Int *map_B2C , hypre_CSRMatrix *A , hypre_CSRMatrix *B , HYPRE_Int nnzrows_C , HYPRE_Int nrows_C , HYPRE_Int ncols_C , HYPRE_Int *rownnz_C , HYPRE_MemoryLocation memory_location_C , HYPRE_Int *C_i , hypre_CSRMatrix **C_ptr );
-HYPRE_Int hypre_CSRMatrixAddSecondPass ( HYPRE_Int firstrow , HYPRE_Int lastrow , HYPRE_Int *marker, HYPRE_Int *twspace , HYPRE_Int *map_A2C , HYPRE_Int *map_B2C , HYPRE_Int *rownnz_C , HYPRE_Complex alpha , HYPRE_Complex beta , hypre_CSRMatrix *A , hypre_CSRMatrix *B , hypre_CSRMatrix *C);
-hypre_CSRMatrix *hypre_CSRMatrixAddHost ( HYPRE_Complex alpha, hypre_CSRMatrix *A, HYPRE_Complex beta, hypre_CSRMatrix *B );
-hypre_CSRMatrix *hypre_CSRMatrixAdd ( HYPRE_Complex alpha, hypre_CSRMatrix *A, HYPRE_Complex beta, hypre_CSRMatrix *B );
-hypre_CSRMatrix *hypre_CSRMatrixBigAdd ( hypre_CSRMatrix *A , hypre_CSRMatrix *B );
-hypre_CSRMatrix *hypre_CSRMatrixMultiplyHost ( hypre_CSRMatrix *A , hypre_CSRMatrix *B );
-hypre_CSRMatrix *hypre_CSRMatrixMultiply ( hypre_CSRMatrix *A , hypre_CSRMatrix *B );
-hypre_CSRMatrix *hypre_CSRMatrixDeleteZeros ( hypre_CSRMatrix *A , HYPRE_Real tol );
-HYPRE_Int hypre_CSRMatrixTransposeHost ( hypre_CSRMatrix *A , hypre_CSRMatrix **AT , HYPRE_Int data );
-HYPRE_Int hypre_CSRMatrixTranspose ( hypre_CSRMatrix *A , hypre_CSRMatrix **AT , HYPRE_Int data );
+HYPRE_Int hypre_CSRMatrixAddFirstPass ( HYPRE_Int firstrow, HYPRE_Int lastrow, HYPRE_Int *marker,
+                                        HYPRE_Int *twspace, HYPRE_Int *map_A2C, HYPRE_Int *map_B2C,
+                                        hypre_CSRMatrix *A, hypre_CSRMatrix *B,
+                                        HYPRE_Int nnzrows_C, HYPRE_Int nrows_C, HYPRE_Int ncols_C,
+                                        HYPRE_Int *rownnz_C,
+                                        HYPRE_MemoryLocation memory_location_C,
+                                        HYPRE_Int *C_i, hypre_CSRMatrix **C_ptr );
+HYPRE_Int hypre_CSRMatrixAddSecondPass ( HYPRE_Int firstrow, HYPRE_Int lastrow, HYPRE_Int *marker,
+                                         HYPRE_Int *map_A2C, HYPRE_Int *map_B2C,
+                                         HYPRE_Int *rownnz_C, HYPRE_Complex alpha,
+                                         HYPRE_Complex beta, hypre_CSRMatrix *A,
+                                         hypre_CSRMatrix *B, hypre_CSRMatrix *C);
+hypre_CSRMatrix *hypre_CSRMatrixAddHost ( HYPRE_Complex alpha, hypre_CSRMatrix *A,
+                                          HYPRE_Complex beta, hypre_CSRMatrix *B );
+hypre_CSRMatrix *hypre_CSRMatrixAdd ( HYPRE_Complex alpha, hypre_CSRMatrix *A, HYPRE_Complex beta,
+                                      hypre_CSRMatrix *B );
+hypre_CSRMatrix *hypre_CSRMatrixBigAdd ( hypre_CSRMatrix *A, hypre_CSRMatrix *B );
+hypre_CSRMatrix *hypre_CSRMatrixMultiplyHost ( hypre_CSRMatrix *A, hypre_CSRMatrix *B );
+hypre_CSRMatrix *hypre_CSRMatrixMultiply ( hypre_CSRMatrix *A, hypre_CSRMatrix *B );
+hypre_CSRMatrix *hypre_CSRMatrixDeleteZeros ( hypre_CSRMatrix *A, HYPRE_Real tol );
+HYPRE_Int hypre_CSRMatrixTransposeHost ( hypre_CSRMatrix *A, hypre_CSRMatrix **AT, HYPRE_Int data );
+HYPRE_Int hypre_CSRMatrixTranspose ( hypre_CSRMatrix *A, hypre_CSRMatrix **AT, HYPRE_Int data );
 HYPRE_Int hypre_CSRMatrixReorder ( hypre_CSRMatrix *A );
 HYPRE_Complex hypre_CSRMatrixSumElts ( hypre_CSRMatrix *A );
 HYPRE_Real hypre_CSRMatrixFnorm( hypre_CSRMatrix *A );
-HYPRE_Int hypre_CSRMatrixSplit(hypre_CSRMatrix *Bs_ext, HYPRE_BigInt first_col_diag_B, HYPRE_BigInt last_col_diag_B, HYPRE_Int num_cols_offd_B, HYPRE_BigInt *col_map_offd_B, HYPRE_Int *num_cols_offd_C_ptr, HYPRE_BigInt **col_map_offd_C_ptr, hypre_CSRMatrix **Bext_diag_ptr, hypre_CSRMatrix **Bext_offd_ptr);
-hypre_CSRMatrix * hypre_CSRMatrixAddPartial( hypre_CSRMatrix *A, hypre_CSRMatrix *B, HYPRE_Int *row_nums);
-void hypre_CSRMatrixComputeRowSum( hypre_CSRMatrix *A, HYPRE_Int *CF_i, HYPRE_Int *CF_j, HYPRE_Complex *row_sum, HYPRE_Int type, HYPRE_Complex scal, const char *set_or_add);
-void hypre_CSRMatrixExtractDiagonal( hypre_CSRMatrix *A, HYPRE_Complex *d, HYPRE_Int type);
-void hypre_CSRMatrixExtractDiagonalHost( hypre_CSRMatrix *A, HYPRE_Complex *d, HYPRE_Int type);
+HYPRE_Int hypre_CSRMatrixSplit(hypre_CSRMatrix *Bs_ext, HYPRE_BigInt first_col_diag_B,
+                               HYPRE_BigInt last_col_diag_B, HYPRE_Int num_cols_offd_B, HYPRE_BigInt *col_map_offd_B,
+                               HYPRE_Int *num_cols_offd_C_ptr, HYPRE_BigInt **col_map_offd_C_ptr, hypre_CSRMatrix **Bext_diag_ptr,
+                               hypre_CSRMatrix **Bext_offd_ptr);
+hypre_CSRMatrix * hypre_CSRMatrixAddPartial( hypre_CSRMatrix *A, hypre_CSRMatrix *B,
+                                             HYPRE_Int *row_nums);
+void hypre_CSRMatrixComputeRowSumHost( hypre_CSRMatrix *A, HYPRE_Int *CF_i, HYPRE_Int *CF_j,
+                                       HYPRE_Complex *row_sum, HYPRE_Int type, HYPRE_Complex scal, const char *set_or_add);
+void hypre_CSRMatrixComputeRowSum( hypre_CSRMatrix *A, HYPRE_Int *CF_i, HYPRE_Int *CF_j,
+                                   HYPRE_Complex *row_sum, HYPRE_Int type, HYPRE_Complex scal, const char *set_or_add);
+HYPRE_Int hypre_CSRMatrixExtractDiagonal( hypre_CSRMatrix *A, HYPRE_Complex *d, HYPRE_Int type);
+HYPRE_Int hypre_CSRMatrixExtractDiagonalHost( hypre_CSRMatrix *A, HYPRE_Complex *d, HYPRE_Int type);
 HYPRE_Int hypre_CSRMatrixScale(hypre_CSRMatrix *A, HYPRE_Complex scalar);
 HYPRE_Int hypre_CSRMatrixSetConstantValues( hypre_CSRMatrix *A, HYPRE_Complex value);
+HYPRE_Int hypre_CSRMatrixDiagScale( hypre_CSRMatrix *A, hypre_Vector *ld, hypre_Vector *rd);
 
 /* csr_matop_device.c */
-hypre_CSRMatrix *hypre_CSRMatrixAddDevice ( HYPRE_Complex alpha, hypre_CSRMatrix *A, HYPRE_Complex beta, hypre_CSRMatrix *B );
-hypre_CSRMatrix *hypre_CSRMatrixMultiplyDevice ( hypre_CSRMatrix *A , hypre_CSRMatrix *B );
-hypre_CSRMatrix *hypre_CSRMatrixTripleMultiplyDevice ( hypre_CSRMatrix *A, hypre_CSRMatrix *B, hypre_CSRMatrix *C );
-HYPRE_Int hypre_CSRMatrixSplitDevice_core( HYPRE_Int job, HYPRE_Int num_rows, HYPRE_Int B_ext_nnz, HYPRE_Int *B_ext_ii, HYPRE_BigInt *B_ext_bigj, HYPRE_Complex *B_ext_data, char *B_ext_xata, HYPRE_BigInt first_col_diag_B, HYPRE_BigInt last_col_diag_B, HYPRE_Int num_cols_offd_B, HYPRE_BigInt *col_map_offd_B, HYPRE_Int **map_B_to_C_ptr, HYPRE_Int *num_cols_offd_C_ptr, HYPRE_BigInt **col_map_offd_C_ptr, HYPRE_Int *B_ext_diag_nnz_ptr, HYPRE_Int *B_ext_diag_ii, HYPRE_Int *B_ext_diag_j, HYPRE_Complex *B_ext_diag_data, char *B_ext_diag_xata, HYPRE_Int *B_ext_offd_nnz_ptr, HYPRE_Int *B_ext_offd_ii, HYPRE_Int *B_ext_offd_j, HYPRE_Complex *B_ext_offd_data, char *B_ext_offd_xata );
-HYPRE_Int hypre_CSRMatrixSplitDevice(hypre_CSRMatrix *B_ext, HYPRE_BigInt first_col_diag_B, HYPRE_BigInt last_col_diag_B, HYPRE_Int num_cols_offd_B, HYPRE_BigInt *col_map_offd_B, HYPRE_Int **map_B_to_C_ptr, HYPRE_Int *num_cols_offd_C_ptr, HYPRE_BigInt **col_map_offd_C_ptr, hypre_CSRMatrix **B_ext_diag_ptr, hypre_CSRMatrix **B_ext_offd_ptr);
-HYPRE_Int hypre_CSRMatrixTransposeDevice ( hypre_CSRMatrix *A , hypre_CSRMatrix **AT , HYPRE_Int data );
-hypre_CSRMatrix* hypre_CSRMatrixAddPartialDevice( hypre_CSRMatrix *A, hypre_CSRMatrix *B, HYPRE_Int *row_nums);
+hypre_CSRMatrix *hypre_CSRMatrixAddDevice ( HYPRE_Complex alpha, hypre_CSRMatrix *A,
+                                            HYPRE_Complex beta, hypre_CSRMatrix *B );
+hypre_CSRMatrix *hypre_CSRMatrixMultiplyDevice ( hypre_CSRMatrix *A, hypre_CSRMatrix *B );
+hypre_CSRMatrix *hypre_CSRMatrixTripleMultiplyDevice ( hypre_CSRMatrix *A, hypre_CSRMatrix *B,
+                                                       hypre_CSRMatrix *C );
+HYPRE_Int hypre_CSRMatrixMergeColMapOffd( HYPRE_Int num_cols_offd_B, HYPRE_BigInt *col_map_offd_B,
+                                          HYPRE_Int B_ext_offd_nnz, HYPRE_BigInt *B_ext_offd_bigj, HYPRE_Int *num_cols_offd_C_ptr,
+                                          HYPRE_BigInt **col_map_offd_C_ptr, HYPRE_Int **map_B_to_C_ptr );
+HYPRE_Int hypre_CSRMatrixSplitDevice_core( HYPRE_Int job, HYPRE_Int num_rows, HYPRE_Int B_ext_nnz,
+                                           HYPRE_Int *B_ext_ii, HYPRE_BigInt *B_ext_bigj, HYPRE_Complex *B_ext_data, char *B_ext_xata,
+                                           HYPRE_BigInt first_col_diag_B, HYPRE_BigInt last_col_diag_B, HYPRE_Int num_cols_offd_B,
+                                           HYPRE_BigInt *col_map_offd_B, HYPRE_Int **map_B_to_C_ptr, HYPRE_Int *num_cols_offd_C_ptr,
+                                           HYPRE_BigInt **col_map_offd_C_ptr, HYPRE_Int *B_ext_diag_nnz_ptr, HYPRE_Int *B_ext_diag_ii,
+                                           HYPRE_Int *B_ext_diag_j, HYPRE_Complex *B_ext_diag_data, char *B_ext_diag_xata,
+                                           HYPRE_Int *B_ext_offd_nnz_ptr, HYPRE_Int *B_ext_offd_ii, HYPRE_Int *B_ext_offd_j,
+                                           HYPRE_Complex *B_ext_offd_data, char *B_ext_offd_xata );
+HYPRE_Int hypre_CSRMatrixSplitDevice(hypre_CSRMatrix *B_ext, HYPRE_BigInt first_col_diag_B,
+                                     HYPRE_BigInt last_col_diag_B, HYPRE_Int num_cols_offd_B, HYPRE_BigInt *col_map_offd_B,
+                                     HYPRE_Int **map_B_to_C_ptr, HYPRE_Int *num_cols_offd_C_ptr, HYPRE_BigInt **col_map_offd_C_ptr,
+                                     hypre_CSRMatrix **B_ext_diag_ptr, hypre_CSRMatrix **B_ext_offd_ptr);
+HYPRE_Int hypre_CSRMatrixTransposeDevice ( hypre_CSRMatrix *A, hypre_CSRMatrix **AT,
+                                           HYPRE_Int data );
+hypre_CSRMatrix* hypre_CSRMatrixAddPartialDevice( hypre_CSRMatrix *A, hypre_CSRMatrix *B,
+                                                  HYPRE_Int *row_nums);
 HYPRE_Int hypre_CSRMatrixColNNzRealDevice( hypre_CSRMatrix *A, HYPRE_Real *colnnz);
 HYPRE_Int hypre_CSRMatrixMoveDiagFirstDevice( hypre_CSRMatrix  *A );
 HYPRE_Int hypre_CSRMatrixCheckDiagFirstDevice( hypre_CSRMatrix  *A );
-HYPRE_Int hypre_CSRMatrixFixZeroDiagDevice( hypre_CSRMatrix *A, HYPRE_Complex v, HYPRE_Real tol );
-HYPRE_Int hypre_CSRMatrixReplaceDiagDevice( hypre_CSRMatrix *A, HYPRE_Complex *new_diag, HYPRE_Complex v, HYPRE_Real tol );
-void hypre_CSRMatrixComputeRowSumDevice( hypre_CSRMatrix *A, HYPRE_Int *CF_i, HYPRE_Int *CF_j, HYPRE_Complex *row_sum, HYPRE_Int type, HYPRE_Complex scal, const char *set_or_add);
-void hypre_CSRMatrixExtractDiagonalDevice( hypre_CSRMatrix *A, HYPRE_Complex *d, HYPRE_Int type);
+HYPRE_Int hypre_CSRMatrixCheckForMissingDiagonal( hypre_CSRMatrix *A );
+HYPRE_Int hypre_CSRMatrixReplaceDiagDevice( hypre_CSRMatrix *A, HYPRE_Complex *new_diag,
+                                            HYPRE_Complex v, HYPRE_Real tol );
+HYPRE_Int hypre_CSRMatrixComputeRowSumDevice( hypre_CSRMatrix *A, HYPRE_Int *CF_i, HYPRE_Int *CF_j,
+                                              HYPRE_Complex *row_sum, HYPRE_Int type,
+                                              HYPRE_Complex scal, const char *set_or_add );
+HYPRE_Int hypre_CSRMatrixExtractDiagonalDevice( hypre_CSRMatrix *A, HYPRE_Complex *d,
+                                                HYPRE_Int type );
 hypre_CSRMatrix* hypre_CSRMatrixStack2Device(hypre_CSRMatrix *A, hypre_CSRMatrix *B);
 hypre_CSRMatrix* hypre_CSRMatrixIdentityDevice(HYPRE_Int n, HYPRE_Complex alp);
+hypre_CSRMatrix* hypre_CSRMatrixDiagMatrixFromVectorDevice(HYPRE_Int n, HYPRE_Complex *v);
+hypre_CSRMatrix* hypre_CSRMatrixDiagMatrixFromMatrixDevice(hypre_CSRMatrix *A, HYPRE_Int type);
 HYPRE_Int hypre_CSRMatrixRemoveDiagonalDevice(hypre_CSRMatrix *A);
-HYPRE_Int hypre_CSRMatrixDropSmallEntriesDevice( hypre_CSRMatrix *A, HYPRE_Real tol, HYPRE_Real *elmt_tols);
+HYPRE_Int hypre_CSRMatrixDropSmallEntriesDevice( hypre_CSRMatrix *A, HYPRE_Real tol,
+                                                 HYPRE_Real *elmt_tols);
+HYPRE_Int hypre_CSRMatrixPermuteDevice( hypre_CSRMatrix *A, HYPRE_Int *perm,
+                                        HYPRE_Int *rqperm, hypre_CSRMatrix *B );
 HYPRE_Int hypre_CSRMatrixSortRow(hypre_CSRMatrix *A);
-HYPRE_Int hypre_CSRMatrixTriLowerUpperSolveDevice(char uplo, hypre_CSRMatrix *A, HYPRE_Real *l1_norms, hypre_Vector *f, hypre_Vector *u );
-HYPRE_Int hypre_CSRMatrixTriLowerUpperSolveRocsparse(char uplo, hypre_CSRMatrix *A, HYPRE_Real *l1_norms, hypre_Vector *f, hypre_Vector *u );
-HYPRE_Int hypre_CSRMatrixTriLowerUpperSolveCusparse(char uplo, hypre_CSRMatrix *A, HYPRE_Real *l1_norms, hypre_Vector *f, hypre_Vector *u );
-HYPRE_Int hypre_CSRMatrixIntersectPattern(hypre_CSRMatrix *A, hypre_CSRMatrix *B, HYPRE_Int *markA, HYPRE_Int diag_option);
+HYPRE_Int hypre_CSRMatrixSortRowOutOfPlace(hypre_CSRMatrix *A);
+HYPRE_Int hypre_CSRMatrixTriLowerUpperSolveDevice_core(char uplo, HYPRE_Int unit_diag,
+                                                       hypre_CSRMatrix *A, HYPRE_Real *l1_norms, hypre_Vector *f, HYPRE_Int offset_f, hypre_Vector *u,
+                                                       HYPRE_Int offset_u);
+HYPRE_Int hypre_CSRMatrixTriLowerUpperSolveDevice(char uplo, HYPRE_Int unit_diag,
+                                                  hypre_CSRMatrix *A, HYPRE_Real *l1_norms, hypre_Vector *f, hypre_Vector *u );
+HYPRE_Int hypre_CSRMatrixTriLowerUpperSolveRocsparse(char uplo, HYPRE_Int unit_diag,
+                                                     hypre_CSRMatrix *A, HYPRE_Real *l1_norms, HYPRE_Complex *f, HYPRE_Complex *u );
+HYPRE_Int hypre_CSRMatrixTriLowerUpperSolveCusparse(char uplo, HYPRE_Int unit_diag,
+                                                    hypre_CSRMatrix *A, HYPRE_Real *l1_norms, HYPRE_Complex *f, HYPRE_Complex *u );
+HYPRE_Int hypre_CSRMatrixTriLowerUpperSolveOnemklsparse(char uplo, HYPRE_Int unit_diag,
+                                                        hypre_CSRMatrix *A, HYPRE_Real *l1_norms, HYPRE_Complex *f, HYPRE_Complex *u );
+HYPRE_Int hypre_CSRMatrixIntersectPattern(hypre_CSRMatrix *A, hypre_CSRMatrix *B, HYPRE_Int *markA,
+                                          HYPRE_Int diag_option);
+HYPRE_Int hypre_CSRMatrixDiagScaleDevice( hypre_CSRMatrix *A, hypre_Vector *ld, hypre_Vector *rd);
+HYPRE_Int hypre_CSRMatrixCompressColumnsDevice(hypre_CSRMatrix *A, HYPRE_BigInt *col_map,
+                                               HYPRE_Int **col_idx_new_ptr, HYPRE_BigInt **col_map_new_ptr);
+HYPRE_Int hypre_CSRMatrixILU0(hypre_CSRMatrix *A);
 
 /* csr_matrix.c */
-hypre_CSRMatrix *hypre_CSRMatrixCreate ( HYPRE_Int num_rows , HYPRE_Int num_cols , HYPRE_Int num_nonzeros );
+hypre_CSRMatrix *hypre_CSRMatrixCreate ( HYPRE_Int num_rows, HYPRE_Int num_cols,
+                                         HYPRE_Int num_nonzeros );
 HYPRE_Int hypre_CSRMatrixDestroy ( hypre_CSRMatrix *matrix );
-HYPRE_Int hypre_CSRMatrixInitialize_v2( hypre_CSRMatrix *matrix, HYPRE_Int bigInit, HYPRE_MemoryLocation memory_location );
+HYPRE_Int hypre_CSRMatrixInitialize_v2( hypre_CSRMatrix *matrix, HYPRE_Int bigInit,
+                                        HYPRE_MemoryLocation memory_location );
 HYPRE_Int hypre_CSRMatrixInitialize ( hypre_CSRMatrix *matrix );
 HYPRE_Int hypre_CSRMatrixBigInitialize ( hypre_CSRMatrix *matrix );
 HYPRE_Int hypre_CSRMatrixBigJtoJ ( hypre_CSRMatrix *matrix );
 HYPRE_Int hypre_CSRMatrixJtoBigJ ( hypre_CSRMatrix *matrix );
-HYPRE_Int hypre_CSRMatrixSetDataOwner ( hypre_CSRMatrix *matrix , HYPRE_Int owns_data );
+HYPRE_Int hypre_CSRMatrixSetDataOwner ( hypre_CSRMatrix *matrix, HYPRE_Int owns_data );
+HYPRE_Int hypre_CSRMatrixSetPatternOnly( hypre_CSRMatrix *matrix, HYPRE_Int pattern_only );
 HYPRE_Int hypre_CSRMatrixSetRownnz ( hypre_CSRMatrix *matrix );
 hypre_CSRMatrix *hypre_CSRMatrixRead ( char *file_name );
 HYPRE_Int hypre_CSRMatrixPrint ( hypre_CSRMatrix *matrix, const char *file_name );
-HYPRE_Int hypre_CSRMatrixPrint2( hypre_CSRMatrix *matrix, const char *file_name );
-HYPRE_Int hypre_CSRMatrixPrintHB ( hypre_CSRMatrix *matrix_input , char *file_name );
-HYPRE_Int hypre_CSRMatrixPrintMM( hypre_CSRMatrix *matrix, HYPRE_Int basei, HYPRE_Int basej, HYPRE_Int trans, const char *file_name );
-HYPRE_Int hypre_CSRMatrixCopy ( hypre_CSRMatrix *A , hypre_CSRMatrix *B , HYPRE_Int copy_data );
+HYPRE_Int hypre_CSRMatrixPrintIJ( hypre_CSRMatrix *matrix, HYPRE_Int base_i,
+                                  HYPRE_Int base_j, char *filename );
+HYPRE_Int hypre_CSRMatrixPrintHB ( hypre_CSRMatrix *matrix_input, char *file_name );
+HYPRE_Int hypre_CSRMatrixPrintMM( hypre_CSRMatrix *matrix, HYPRE_Int basei, HYPRE_Int basej,
+                                  HYPRE_Int trans, const char *file_name );
+HYPRE_Int hypre_CSRMatrixCopy ( hypre_CSRMatrix *A, hypre_CSRMatrix *B, HYPRE_Int copy_data );
+HYPRE_Int hypre_CSRMatrixMigrate( hypre_CSRMatrix *A, HYPRE_MemoryLocation memory_location );
 hypre_CSRMatrix *hypre_CSRMatrixClone ( hypre_CSRMatrix *A, HYPRE_Int copy_data );
-hypre_CSRMatrix *hypre_CSRMatrixClone_v2( hypre_CSRMatrix *A, HYPRE_Int copy_data, HYPRE_MemoryLocation memory_location );
-hypre_CSRMatrix *hypre_CSRMatrixUnion ( hypre_CSRMatrix *A , hypre_CSRMatrix *B , HYPRE_BigInt *col_map_offd_A , HYPRE_BigInt *col_map_offd_B , HYPRE_BigInt **col_map_offd_C );
+hypre_CSRMatrix *hypre_CSRMatrixClone_v2( hypre_CSRMatrix *A, HYPRE_Int copy_data,
+                                          HYPRE_MemoryLocation memory_location );
+HYPRE_Int hypre_CSRMatrixPermute( hypre_CSRMatrix *A, HYPRE_Int *perm,
+                                  HYPRE_Int *rqperm, hypre_CSRMatrix **B_ptr );
+hypre_CSRMatrix *hypre_CSRMatrixUnion( hypre_CSRMatrix *A,
+                                       hypre_CSRMatrix *B,
+                                       HYPRE_BigInt *col_map_offd_A,
+                                       HYPRE_BigInt *col_map_offd_B,
+                                       HYPRE_BigInt **col_map_offd_C );
 HYPRE_Int hypre_CSRMatrixPrefetch( hypre_CSRMatrix *A, HYPRE_MemoryLocation memory_location);
 HYPRE_Int hypre_CSRMatrixCheckSetNumNonzeros( hypre_CSRMatrix *matrix );
-HYPRE_Int hypre_CSRMatrixResize( hypre_CSRMatrix *matrix, HYPRE_Int new_num_rows, HYPRE_Int new_num_cols, HYPRE_Int new_num_nonzeros );
+HYPRE_Int hypre_CSRMatrixResize( hypre_CSRMatrix *matrix, HYPRE_Int new_num_rows,
+                                 HYPRE_Int new_num_cols, HYPRE_Int new_num_nonzeros );
 
 /* csr_matvec.c */
 // y[offset:end] = alpha*A[offset:end,:]*x + beta*b[offset:end]
-HYPRE_Int hypre_CSRMatrixMatvecOutOfPlace ( HYPRE_Complex alpha , hypre_CSRMatrix *A , hypre_Vector *x , HYPRE_Complex beta , hypre_Vector *b, hypre_Vector *y, HYPRE_Int offset );
+HYPRE_Int hypre_CSRMatrixMatvecOutOfPlace ( HYPRE_Complex alpha, hypre_CSRMatrix *A,
+                                            hypre_Vector *x, HYPRE_Complex beta, hypre_Vector *b, hypre_Vector *y, HYPRE_Int offset );
 // y = alpha*A + beta*y
-HYPRE_Int hypre_CSRMatrixMatvec ( HYPRE_Complex alpha , hypre_CSRMatrix *A , hypre_Vector *x , HYPRE_Complex beta , hypre_Vector *y );
-HYPRE_Int hypre_CSRMatrixMatvecT ( HYPRE_Complex alpha , hypre_CSRMatrix *A , hypre_Vector *x , HYPRE_Complex beta , hypre_Vector *y );
-HYPRE_Int hypre_CSRMatrixMatvec_FF ( HYPRE_Complex alpha , hypre_CSRMatrix *A , hypre_Vector *x , HYPRE_Complex beta , hypre_Vector *y , HYPRE_Int *CF_marker_x , HYPRE_Int *CF_marker_y , HYPRE_Int fpt );
+HYPRE_Int hypre_CSRMatrixMatvec ( HYPRE_Complex alpha, hypre_CSRMatrix *A, hypre_Vector *x,
+                                  HYPRE_Complex beta, hypre_Vector *y );
+HYPRE_Int hypre_CSRMatrixMatvecT ( HYPRE_Complex alpha, hypre_CSRMatrix *A, hypre_Vector *x,
+                                   HYPRE_Complex beta, hypre_Vector *y );
+HYPRE_Int hypre_CSRMatrixMatvec_FF ( HYPRE_Complex alpha, hypre_CSRMatrix *A, hypre_Vector *x,
+                                     HYPRE_Complex beta, hypre_Vector *y, HYPRE_Int *CF_marker_x, HYPRE_Int *CF_marker_y,
+                                     HYPRE_Int fpt );
 
 /* csr_matvec_device.c */
-HYPRE_Int hypre_CSRMatrixMatvecDevice(HYPRE_Int trans, HYPRE_Complex alpha , hypre_CSRMatrix *A , hypre_Vector *x , HYPRE_Complex beta , hypre_Vector *b, hypre_Vector *y, HYPRE_Int offset );
-HYPRE_Int hypre_CSRMatrixMatvecCusparseNewAPI( HYPRE_Int trans, HYPRE_Complex alpha, hypre_CSRMatrix *A, hypre_Vector *x, HYPRE_Complex beta, hypre_Vector *y, HYPRE_Int offset );
-HYPRE_Int hypre_CSRMatrixMatvecCusparseOldAPI( HYPRE_Int trans, HYPRE_Complex alpha, hypre_CSRMatrix *A, hypre_Vector *x, HYPRE_Complex beta, hypre_Vector *y, HYPRE_Int offset );
-HYPRE_Int hypre_CSRMatrixMatvecOMPOffload (HYPRE_Int trans, HYPRE_Complex alpha , hypre_CSRMatrix *A , hypre_Vector *x , HYPRE_Complex beta , hypre_Vector *y, HYPRE_Int offset );
-HYPRE_Int hypre_CSRMatrixMatvecRocsparse (HYPRE_Int trans, HYPRE_Complex alpha , hypre_CSRMatrix *A , hypre_Vector *x , HYPRE_Complex beta , hypre_Vector *y, HYPRE_Int offset );
+HYPRE_Int hypre_CSRMatrixMatvecDevice(HYPRE_Int trans, HYPRE_Complex alpha, hypre_CSRMatrix *A,
+                                      hypre_Vector *x, HYPRE_Complex beta, hypre_Vector *b, hypre_Vector *y, HYPRE_Int offset );
+HYPRE_Int hypre_CSRMatrixMatvecCusparseNewAPI( HYPRE_Int trans, HYPRE_Complex alpha,
+                                               hypre_CSRMatrix *A, hypre_Vector *x, HYPRE_Complex beta, hypre_Vector *y, HYPRE_Int offset );
+HYPRE_Int hypre_CSRMatrixMatvecCusparseOldAPI( HYPRE_Int trans, HYPRE_Complex alpha,
+                                               hypre_CSRMatrix *A, hypre_Vector *x, HYPRE_Complex beta, hypre_Vector *y, HYPRE_Int offset );
+HYPRE_Int hypre_CSRMatrixMatvecCusparse( HYPRE_Int trans, HYPRE_Complex alpha,
+                                         hypre_CSRMatrix *A, hypre_Vector *x, HYPRE_Complex beta, hypre_Vector *y, HYPRE_Int offset );
+HYPRE_Int hypre_CSRMatrixMatvecOMPOffload (HYPRE_Int trans, HYPRE_Complex alpha, hypre_CSRMatrix *A,
+                                           hypre_Vector *x, HYPRE_Complex beta, hypre_Vector *y, HYPRE_Int offset );
+HYPRE_Int hypre_CSRMatrixMatvecRocsparse (HYPRE_Int trans, HYPRE_Complex alpha, hypre_CSRMatrix *A,
+                                          hypre_Vector *x, HYPRE_Complex beta, hypre_Vector *y, HYPRE_Int offset );
+HYPRE_Int hypre_CSRMatrixMatvecOnemklsparse (HYPRE_Int trans, HYPRE_Complex alpha,
+                                             hypre_CSRMatrix *A,
+                                             hypre_Vector *x, HYPRE_Complex beta, hypre_Vector *y, HYPRE_Int offset );
 
 /* genpart.c */
-HYPRE_Int hypre_GeneratePartitioning ( HYPRE_BigInt length , HYPRE_Int num_procs , HYPRE_BigInt **part_ptr );
-HYPRE_Int hypre_GenerateLocalPartitioning ( HYPRE_BigInt length , HYPRE_Int num_procs , HYPRE_Int myid , HYPRE_BigInt *part );
+HYPRE_Int hypre_GeneratePartitioning ( HYPRE_BigInt length, HYPRE_Int num_procs,
+                                       HYPRE_BigInt **part_ptr );
+HYPRE_Int hypre_GenerateLocalPartitioning ( HYPRE_BigInt length, HYPRE_Int num_procs,
+                                            HYPRE_Int myid, HYPRE_BigInt *part );
 
 /* HYPRE_csr_matrix.c */
-HYPRE_CSRMatrix HYPRE_CSRMatrixCreate ( HYPRE_Int num_rows , HYPRE_Int num_cols , HYPRE_Int *row_sizes );
+HYPRE_CSRMatrix HYPRE_CSRMatrixCreate ( HYPRE_Int num_rows, HYPRE_Int num_cols,
+                                        HYPRE_Int *row_sizes );
 HYPRE_Int HYPRE_CSRMatrixDestroy ( HYPRE_CSRMatrix matrix );
 HYPRE_Int HYPRE_CSRMatrixInitialize ( HYPRE_CSRMatrix matrix );
 HYPRE_CSRMatrix HYPRE_CSRMatrixRead ( char *file_name );
-void HYPRE_CSRMatrixPrint ( HYPRE_CSRMatrix matrix , char *file_name );
-HYPRE_Int HYPRE_CSRMatrixGetNumRows ( HYPRE_CSRMatrix matrix , HYPRE_Int *num_rows );
+void HYPRE_CSRMatrixPrint ( HYPRE_CSRMatrix matrix, char *file_name );
+HYPRE_Int HYPRE_CSRMatrixGetNumRows ( HYPRE_CSRMatrix matrix, HYPRE_Int *num_rows );
 
 /* HYPRE_mapped_matrix.c */
 HYPRE_MappedMatrix HYPRE_MappedMatrixCreate ( void );
@@ -109,11 +204,12 @@ HYPRE_Int HYPRE_MappedMatrixLimitedDestroy ( HYPRE_MappedMatrix matrix );
 HYPRE_Int HYPRE_MappedMatrixInitialize ( HYPRE_MappedMatrix matrix );
 HYPRE_Int HYPRE_MappedMatrixAssemble ( HYPRE_MappedMatrix matrix );
 void HYPRE_MappedMatrixPrint ( HYPRE_MappedMatrix matrix );
-HYPRE_Int HYPRE_MappedMatrixGetColIndex ( HYPRE_MappedMatrix matrix , HYPRE_Int j );
+HYPRE_Int HYPRE_MappedMatrixGetColIndex ( HYPRE_MappedMatrix matrix, HYPRE_Int j );
 void *HYPRE_MappedMatrixGetMatrix ( HYPRE_MappedMatrix matrix );
-HYPRE_Int HYPRE_MappedMatrixSetMatrix ( HYPRE_MappedMatrix matrix , void *matrix_data );
-HYPRE_Int HYPRE_MappedMatrixSetColMap ( HYPRE_MappedMatrix matrix , HYPRE_Int (*ColMap )(HYPRE_Int ,void *));
-HYPRE_Int HYPRE_MappedMatrixSetMapData ( HYPRE_MappedMatrix matrix , void *MapData );
+HYPRE_Int HYPRE_MappedMatrixSetMatrix ( HYPRE_MappedMatrix matrix, void *matrix_data );
+HYPRE_Int HYPRE_MappedMatrixSetColMap ( HYPRE_MappedMatrix matrix, HYPRE_Int (*ColMap )(HYPRE_Int,
+                                                                                        void *));
+HYPRE_Int HYPRE_MappedMatrixSetMapData ( HYPRE_MappedMatrix matrix, void *MapData );
 
 /* HYPRE_multiblock_matrix.c */
 HYPRE_MultiblockMatrix HYPRE_MultiblockMatrixCreate ( void );
@@ -122,14 +218,15 @@ HYPRE_Int HYPRE_MultiblockMatrixLimitedDestroy ( HYPRE_MultiblockMatrix matrix )
 HYPRE_Int HYPRE_MultiblockMatrixInitialize ( HYPRE_MultiblockMatrix matrix );
 HYPRE_Int HYPRE_MultiblockMatrixAssemble ( HYPRE_MultiblockMatrix matrix );
 void HYPRE_MultiblockMatrixPrint ( HYPRE_MultiblockMatrix matrix );
-HYPRE_Int HYPRE_MultiblockMatrixSetNumSubmatrices ( HYPRE_MultiblockMatrix matrix , HYPRE_Int n );
-HYPRE_Int HYPRE_MultiblockMatrixSetSubmatrixType ( HYPRE_MultiblockMatrix matrix , HYPRE_Int j , HYPRE_Int type );
+HYPRE_Int HYPRE_MultiblockMatrixSetNumSubmatrices ( HYPRE_MultiblockMatrix matrix, HYPRE_Int n );
+HYPRE_Int HYPRE_MultiblockMatrixSetSubmatrixType ( HYPRE_MultiblockMatrix matrix, HYPRE_Int j,
+                                                   HYPRE_Int type );
 
 /* HYPRE_vector.c */
 HYPRE_Vector HYPRE_VectorCreate ( HYPRE_Int size );
 HYPRE_Int HYPRE_VectorDestroy ( HYPRE_Vector vector );
 HYPRE_Int HYPRE_VectorInitialize ( HYPRE_Vector vector );
-HYPRE_Int HYPRE_VectorPrint ( HYPRE_Vector vector , char *file_name );
+HYPRE_Int HYPRE_VectorPrint ( HYPRE_Vector vector, char *file_name );
 HYPRE_Vector HYPRE_VectorRead ( char *file_name );
 
 /* mapped_matrix.c */
@@ -139,11 +236,12 @@ HYPRE_Int hypre_MappedMatrixLimitedDestroy ( hypre_MappedMatrix *matrix );
 HYPRE_Int hypre_MappedMatrixInitialize ( hypre_MappedMatrix *matrix );
 HYPRE_Int hypre_MappedMatrixAssemble ( hypre_MappedMatrix *matrix );
 void hypre_MappedMatrixPrint ( hypre_MappedMatrix *matrix );
-HYPRE_Int hypre_MappedMatrixGetColIndex ( hypre_MappedMatrix *matrix , HYPRE_Int j );
+HYPRE_Int hypre_MappedMatrixGetColIndex ( hypre_MappedMatrix *matrix, HYPRE_Int j );
 void *hypre_MappedMatrixGetMatrix ( hypre_MappedMatrix *matrix );
-HYPRE_Int hypre_MappedMatrixSetMatrix ( hypre_MappedMatrix *matrix , void *matrix_data );
-HYPRE_Int hypre_MappedMatrixSetColMap ( hypre_MappedMatrix *matrix , HYPRE_Int (*ColMap )(HYPRE_Int ,void *));
-HYPRE_Int hypre_MappedMatrixSetMapData ( hypre_MappedMatrix *matrix , void *map_data );
+HYPRE_Int hypre_MappedMatrixSetMatrix ( hypre_MappedMatrix *matrix, void *matrix_data );
+HYPRE_Int hypre_MappedMatrixSetColMap ( hypre_MappedMatrix *matrix, HYPRE_Int (*ColMap )(HYPRE_Int,
+                                                                                         void *));
+HYPRE_Int hypre_MappedMatrixSetMapData ( hypre_MappedMatrix *matrix, void *map_data );
 
 /* multiblock_matrix.c */
 hypre_MultiblockMatrix *hypre_MultiblockMatrixCreate ( void );
@@ -152,76 +250,140 @@ HYPRE_Int hypre_MultiblockMatrixLimitedDestroy ( hypre_MultiblockMatrix *matrix
 HYPRE_Int hypre_MultiblockMatrixInitialize ( hypre_MultiblockMatrix *matrix );
 HYPRE_Int hypre_MultiblockMatrixAssemble ( hypre_MultiblockMatrix *matrix );
 void hypre_MultiblockMatrixPrint ( hypre_MultiblockMatrix *matrix );
-HYPRE_Int hypre_MultiblockMatrixSetNumSubmatrices ( hypre_MultiblockMatrix *matrix , HYPRE_Int n );
-HYPRE_Int hypre_MultiblockMatrixSetSubmatrixType ( hypre_MultiblockMatrix *matrix , HYPRE_Int j , HYPRE_Int type );
-HYPRE_Int hypre_MultiblockMatrixSetSubmatrix ( hypre_MultiblockMatrix *matrix , HYPRE_Int j , void *submatrix );
+HYPRE_Int hypre_MultiblockMatrixSetNumSubmatrices ( hypre_MultiblockMatrix *matrix, HYPRE_Int n );
+HYPRE_Int hypre_MultiblockMatrixSetSubmatrixType ( hypre_MultiblockMatrix *matrix, HYPRE_Int j,
+                                                   HYPRE_Int type );
+HYPRE_Int hypre_MultiblockMatrixSetSubmatrix ( hypre_MultiblockMatrix *matrix, HYPRE_Int j,
+                                               void *submatrix );
 
 /* vector.c */
 hypre_Vector *hypre_SeqVectorCreate ( HYPRE_Int size );
-hypre_Vector *hypre_SeqMultiVectorCreate ( HYPRE_Int size , HYPRE_Int num_vectors );
+hypre_Vector *hypre_SeqMultiVectorCreate ( HYPRE_Int size, HYPRE_Int num_vectors );
 HYPRE_Int hypre_SeqVectorDestroy ( hypre_Vector *vector );
-HYPRE_Int hypre_SeqVectorInitialize_v2( hypre_Vector *vector, HYPRE_MemoryLocation memory_location );
+HYPRE_Int hypre_SeqVectorInitializeShell( hypre_Vector *vector );
+HYPRE_Int hypre_SeqVectorSetData( hypre_Vector *vector, HYPRE_Complex *data );
+HYPRE_Int hypre_SeqVectorInitialize_v2( hypre_Vector *vector,
+                                        HYPRE_MemoryLocation memory_location );
 HYPRE_Int hypre_SeqVectorInitialize ( hypre_Vector *vector );
-HYPRE_Int hypre_SeqVectorSetDataOwner ( hypre_Vector *vector , HYPRE_Int owns_data );
+HYPRE_Int hypre_SeqVectorSetDataOwner ( hypre_Vector *vector, HYPRE_Int owns_data );
+HYPRE_Int hypre_SeqVectorSetSize ( hypre_Vector *vector, HYPRE_Int size );
+HYPRE_Int hypre_SeqVectorResize ( hypre_Vector *vector, HYPRE_Int num_vectors_in );
 hypre_Vector *hypre_SeqVectorRead ( char *file_name );
-HYPRE_Int hypre_SeqVectorPrint ( hypre_Vector *vector , char *file_name );
-HYPRE_Int hypre_SeqVectorSetConstantValues ( hypre_Vector *v , HYPRE_Complex value );
-HYPRE_Int hypre_SeqVectorSetRandomValues ( hypre_Vector *v , HYPRE_Int seed );
-HYPRE_Int hypre_SeqVectorCopy ( hypre_Vector *x , hypre_Vector *y );
+HYPRE_Int hypre_SeqVectorPrint ( hypre_Vector *vector, char *file_name );
+HYPRE_Int hypre_SeqVectorSetConstantValues ( hypre_Vector *v, HYPRE_Complex value );
+HYPRE_Int hypre_SeqVectorSetConstantValuesHost ( hypre_Vector *v, HYPRE_Complex value );
+HYPRE_Int hypre_SeqVectorSetRandomValues ( hypre_Vector *v, HYPRE_Int seed );
+HYPRE_Int hypre_SeqVectorCopy ( hypre_Vector *x, hypre_Vector *y );
+HYPRE_Int hypre_SeqVectorStridedCopy( hypre_Vector *x, HYPRE_Int istride, HYPRE_Int ostride,
+                                      HYPRE_Int size, HYPRE_Complex *data);
 hypre_Vector *hypre_SeqVectorCloneDeep ( hypre_Vector *x );
 hypre_Vector *hypre_SeqVectorCloneDeep_v2( hypre_Vector *x, HYPRE_MemoryLocation memory_location );
 hypre_Vector *hypre_SeqVectorCloneShallow ( hypre_Vector *x );
+HYPRE_Int hypre_SeqVectorMigrate( hypre_Vector *x, HYPRE_MemoryLocation  memory_location );
 HYPRE_Int hypre_SeqVectorScale( HYPRE_Complex alpha, hypre_Vector *y );
-
-HYPRE_Int hypre_SeqVectorAxpy ( HYPRE_Complex alpha , hypre_Vector *x , hypre_Vector *y );
-HYPRE_Real hypre_SeqVectorInnerProd ( hypre_Vector *x , hypre_Vector *y );
-HYPRE_Int hypre_SeqVectorMassInnerProd(hypre_Vector *x, hypre_Vector **y, HYPRE_Int k, HYPRE_Int unroll, HYPRE_Real *result);
-HYPRE_Int hypre_SeqVectorMassInnerProd4(hypre_Vector *x, hypre_Vector **y, HYPRE_Int k,  HYPRE_Real *result);
-HYPRE_Int hypre_SeqVectorMassInnerProd8(hypre_Vector *x, hypre_Vector **y, HYPRE_Int k,  HYPRE_Real *result);
-HYPRE_Int hypre_SeqVectorMassDotpTwo(hypre_Vector *x, hypre_Vector *y , hypre_Vector **z, HYPRE_Int k, HYPRE_Int unroll,  HYPRE_Real *result_x , HYPRE_Real *result_y);
-HYPRE_Int hypre_SeqVectorMassDotpTwo4(hypre_Vector *x, hypre_Vector *y , hypre_Vector **z, HYPRE_Int k, HYPRE_Real *result_x , HYPRE_Real *result_y);
-HYPRE_Int hypre_SeqVectorMassDotpTwo8(hypre_Vector *x, hypre_Vector *y , hypre_Vector **z, HYPRE_Int k,  HYPRE_Real *result_x , HYPRE_Real *result_y);
-HYPRE_Int hypre_SeqVectorMassAxpy(HYPRE_Complex *alpha, hypre_Vector **x, hypre_Vector *y, HYPRE_Int k, HYPRE_Int unroll);
-HYPRE_Int hypre_SeqVectorMassAxpy4(HYPRE_Complex *alpha, hypre_Vector **x, hypre_Vector *y, HYPRE_Int k);
-HYPRE_Int hypre_SeqVectorMassAxpy8(HYPRE_Complex *alpha, hypre_Vector **x, hypre_Vector *y, HYPRE_Int k);
+HYPRE_Int hypre_SeqVectorScaleHost( HYPRE_Complex alpha, hypre_Vector *y );
+HYPRE_Int hypre_SeqVectorAxpy ( HYPRE_Complex alpha, hypre_Vector *x, hypre_Vector *y );
+HYPRE_Int hypre_SeqVectorAxpyHost ( HYPRE_Complex alpha, hypre_Vector *x, hypre_Vector *y );
+HYPRE_Int hypre_SeqVectorAxpyz ( HYPRE_Complex alpha, hypre_Vector *x,
+                                 HYPRE_Complex beta, hypre_Vector *y,
+                                 hypre_Vector *z );
+HYPRE_Real hypre_SeqVectorInnerProd ( hypre_Vector *x, hypre_Vector *y );
+HYPRE_Real hypre_SeqVectorInnerProdHost ( hypre_Vector *x, hypre_Vector *y );
+HYPRE_Int hypre_SeqVectorMassInnerProd(hypre_Vector *x, hypre_Vector **y, HYPRE_Int k,
+                                       HYPRE_Int unroll, HYPRE_Real *result);
+HYPRE_Int hypre_SeqVectorMassInnerProd4(hypre_Vector *x, hypre_Vector **y, HYPRE_Int k,
+                                        HYPRE_Real *result);
+HYPRE_Int hypre_SeqVectorMassInnerProd8(hypre_Vector *x, hypre_Vector **y, HYPRE_Int k,
+                                        HYPRE_Real *result);
+HYPRE_Int hypre_SeqVectorMassDotpTwo(hypre_Vector *x, hypre_Vector *y, hypre_Vector **z,
+                                     HYPRE_Int k, HYPRE_Int unroll,  HYPRE_Real *result_x, HYPRE_Real *result_y);
+HYPRE_Int hypre_SeqVectorMassDotpTwo4(hypre_Vector *x, hypre_Vector *y, hypre_Vector **z,
+                                      HYPRE_Int k, HYPRE_Real *result_x, HYPRE_Real *result_y);
+HYPRE_Int hypre_SeqVectorMassDotpTwo8(hypre_Vector *x, hypre_Vector *y, hypre_Vector **z,
+                                      HYPRE_Int k,  HYPRE_Real *result_x, HYPRE_Real *result_y);
+HYPRE_Int hypre_SeqVectorMassAxpy(HYPRE_Complex *alpha, hypre_Vector **x, hypre_Vector *y,
+                                  HYPRE_Int k, HYPRE_Int unroll);
+HYPRE_Int hypre_SeqVectorMassAxpy4(HYPRE_Complex *alpha, hypre_Vector **x, hypre_Vector *y,
+                                   HYPRE_Int k);
+HYPRE_Int hypre_SeqVectorMassAxpy8(HYPRE_Complex *alpha, hypre_Vector **x, hypre_Vector *y,
+                                   HYPRE_Int k);
 HYPRE_Complex hypre_SeqVectorSumElts ( hypre_Vector *vector );
-HYPRE_Int hypre_SeqVectorPrefetch(hypre_Vector *x, HYPRE_MemoryLocation memory_location);
+HYPRE_Complex hypre_SeqVectorSumEltsHost ( hypre_Vector *vector );
 //HYPRE_Int hypre_SeqVectorMax( HYPRE_Complex alpha, hypre_Vector *x, HYPRE_Complex beta, hypre_Vector *y );
 
-HYPRE_Int hypreDevice_CSRSpAdd(HYPRE_Int ma, HYPRE_Int mb, HYPRE_Int n, HYPRE_Int nnzA, HYPRE_Int nnzB, HYPRE_Int *d_ia, HYPRE_Int *d_ja, HYPRE_Complex alpha, HYPRE_Complex *d_aa, HYPRE_Int *d_ja_map, HYPRE_Int *d_ib, HYPRE_Int *d_jb, HYPRE_Complex beta, HYPRE_Complex *d_ab, HYPRE_Int *d_jb_map, HYPRE_Int *d_num_b, HYPRE_Int *nnzC_out, HYPRE_Int **d_ic_out, HYPRE_Int **d_jc_out, HYPRE_Complex **d_ac_out);
-
-HYPRE_Int hypreDevice_CSRSpTrans(HYPRE_Int m, HYPRE_Int n, HYPRE_Int nnzA, HYPRE_Int *d_ia, HYPRE_Int *d_ja, HYPRE_Complex *d_aa, HYPRE_Int **d_ic_out, HYPRE_Int **d_jc_out, HYPRE_Complex **d_ac_out, HYPRE_Int want_data);
+HYPRE_Int hypreDevice_CSRSpAdd(HYPRE_Int ma, HYPRE_Int mb, HYPRE_Int nnzA,
+                               HYPRE_Int nnzB, HYPRE_Int *d_ia, HYPRE_Int *d_ja, HYPRE_Complex alpha, HYPRE_Complex *d_aa,
+                               HYPRE_Int *d_ja_map, HYPRE_Int *d_ib, HYPRE_Int *d_jb, HYPRE_Complex beta, HYPRE_Complex *d_ab,
+                               HYPRE_Int *d_jb_map, HYPRE_Int *d_num_b, HYPRE_Int *nnzC_out, HYPRE_Int **d_ic_out,
+                               HYPRE_Int **d_jc_out, HYPRE_Complex **d_ac_out);
 
-HYPRE_Int hypreDevice_CSRSpTransCusparse(HYPRE_Int m, HYPRE_Int n, HYPRE_Int nnzA, HYPRE_Int *d_ia, HYPRE_Int *d_ja, HYPRE_Complex *d_aa, HYPRE_Int **d_ic_out, HYPRE_Int **d_jc_out, HYPRE_Complex **d_ac_out, HYPRE_Int want_data);
-
-HYPRE_Int hypreDevice_CSRSpTransRocsparse(HYPRE_Int m, HYPRE_Int n, HYPRE_Int nnzA, HYPRE_Int *d_ia, HYPRE_Int *d_ja, HYPRE_Complex *d_aa, HYPRE_Int **d_ic_out, HYPRE_Int **d_jc_out, HYPRE_Complex **d_ac_out, HYPRE_Int want_data);
-
-HYPRE_Int hypreDevice_CSRSpGemm(hypre_CSRMatrix *A, hypre_CSRMatrix *B, hypre_CSRMatrix **C_ptr);
+HYPRE_Int hypreDevice_CSRSpTrans(HYPRE_Int m, HYPRE_Int n, HYPRE_Int nnzA, HYPRE_Int *d_ia,
+                                 HYPRE_Int *d_ja, HYPRE_Complex *d_aa, HYPRE_Int **d_ic_out, HYPRE_Int **d_jc_out,
+                                 HYPRE_Complex **d_ac_out, HYPRE_Int want_data);
 
-HYPRE_Int hypreDevice_CSRSpGemmRownnzEstimate(HYPRE_Int m, HYPRE_Int k, HYPRE_Int n, HYPRE_Int *d_ia, HYPRE_Int *d_ja, HYPRE_Int *d_ib, HYPRE_Int *d_jb, HYPRE_Int *d_rc);
+HYPRE_Int hypreDevice_CSRSpTransCusparse(HYPRE_Int m, HYPRE_Int n, HYPRE_Int nnzA, HYPRE_Int *d_ia,
+                                         HYPRE_Int *d_ja, HYPRE_Complex *d_aa, HYPRE_Int **d_ic_out, HYPRE_Int **d_jc_out,
+                                         HYPRE_Complex **d_ac_out, HYPRE_Int want_data);
 
-HYPRE_Int hypreDevice_CSRSpGemmRownnzUpperbound(HYPRE_Int m, HYPRE_Int k, HYPRE_Int n, HYPRE_Int *d_ia, HYPRE_Int *d_ja, HYPRE_Int *d_ib, HYPRE_Int *d_jb, HYPRE_Int in_rc, HYPRE_Int *d_rc, HYPRE_Int *d_rf);
+HYPRE_Int hypreDevice_CSRSpTransRocsparse(HYPRE_Int m, HYPRE_Int n, HYPRE_Int nnzA, HYPRE_Int *d_ia,
+                                          HYPRE_Int *d_ja, HYPRE_Complex *d_aa, HYPRE_Int **d_ic_out, HYPRE_Int **d_jc_out,
+                                          HYPRE_Complex **d_ac_out, HYPRE_Int want_data);
 
-HYPRE_Int hypreDevice_CSRSpGemmRownnz(HYPRE_Int m, HYPRE_Int k, HYPRE_Int n, HYPRE_Int *d_ia, HYPRE_Int *d_ja, HYPRE_Int *d_ib, HYPRE_Int *d_jb, HYPRE_Int in_rc, HYPRE_Int *d_rc);
+HYPRE_Int hypreDevice_CSRSpTransOnemklsparse(HYPRE_Int m, HYPRE_Int n, HYPRE_Int nnzA,
+                                             HYPRE_Int *d_ia, HYPRE_Int *d_ja, HYPRE_Complex *d_aa, HYPRE_Int **d_ic_out, HYPRE_Int **d_jc_out,
+                                             HYPRE_Complex **d_ac_out, HYPRE_Int want_data);
 
-HYPRE_Int hypreDevice_CSRSpGemmNumerWithRownnzUpperbound(HYPRE_Int m, HYPRE_Int k, HYPRE_Int n, HYPRE_Int *d_ia, HYPRE_Int *d_ja, HYPRE_Complex *d_a, HYPRE_Int *d_ib, HYPRE_Int *d_jb, HYPRE_Complex *d_b, HYPRE_Int *d_rc, HYPRE_Int exact_rownnz, HYPRE_Int **d_ic_out, HYPRE_Int **d_jc_out, HYPRE_Complex **d_c_out, HYPRE_Int *nnzC);
-
-HYPRE_Int hypreDevice_CSRSpGemmNumerWithRownnzEstimate(HYPRE_Int m, HYPRE_Int k, HYPRE_Int n, HYPRE_Int *d_ia, HYPRE_Int *d_ja, HYPRE_Complex *d_a, HYPRE_Int *d_ib, HYPRE_Int *d_jb, HYPRE_Complex *d_b, HYPRE_Int *d_rc, HYPRE_Int **d_ic_out, HYPRE_Int **d_jc_out, HYPRE_Complex **d_c_out, HYPRE_Int *nnzC);
+HYPRE_Int hypreDevice_CSRSpGemm(hypre_CSRMatrix *A, hypre_CSRMatrix *B, hypre_CSRMatrix **C_ptr);
 
-HYPRE_Int hypreDevice_CSRSpGemmCusparseGenericAPI(HYPRE_Int m, HYPRE_Int k, HYPRE_Int n, HYPRE_Int nnzA, HYPRE_Int *d_ia, HYPRE_Int *d_ja, HYPRE_Complex *d_a, HYPRE_Int nnzB, HYPRE_Int *d_ib, HYPRE_Int *d_jb, HYPRE_Complex *d_b, HYPRE_Int *nnzC_out, HYPRE_Int **d_ic_out, HYPRE_Int **d_jc_out, HYPRE_Complex **d_c_out);
+HYPRE_Int hypreDevice_CSRSpGemmCusparseGenericAPI(HYPRE_Int m, HYPRE_Int k, HYPRE_Int n,
+                                                  HYPRE_Int nnzA, HYPRE_Int *d_ia, HYPRE_Int *d_ja, HYPRE_Complex *d_a, HYPRE_Int nnzB,
+                                                  HYPRE_Int *d_ib, HYPRE_Int *d_jb, HYPRE_Complex *d_b, HYPRE_Int *nnzC_out, HYPRE_Int **d_ic_out,
+                                                  HYPRE_Int **d_jc_out, HYPRE_Complex **d_c_out);
 
 HYPRE_Int hypre_SeqVectorElmdivpy( hypre_Vector *x, hypre_Vector *b, hypre_Vector *y );
-HYPRE_Int hypre_SeqVectorElmdivpyMarked( hypre_Vector *x, hypre_Vector *b, hypre_Vector *y, HYPRE_Int *marker, HYPRE_Int marker_val );
+HYPRE_Int hypre_SeqVectorElmdivpyMarked( hypre_Vector *x, hypre_Vector *b, hypre_Vector *y,
+                                         HYPRE_Int *marker, HYPRE_Int marker_val );
+HYPRE_Int hypre_SeqVectorElmdivpyHost( hypre_Vector *x, hypre_Vector *b, hypre_Vector *y,
+                                       HYPRE_Int *marker, HYPRE_Int marker_val );
+HYPRE_Int hypre_CSRMatrixSpMVDevice( HYPRE_Int trans, HYPRE_Complex alpha, hypre_CSRMatrix *A,
+                                     hypre_Vector *x,
+                                     HYPRE_Complex beta, hypre_Vector *y, HYPRE_Int fill );
 
-HYPRE_Int hypre_CSRMatrixSpMVDevice( HYPRE_Complex alpha, hypre_CSRMatrix *A, hypre_Vector *x, HYPRE_Complex beta, hypre_Vector *y, HYPRE_Int fill );
+HYPRE_Int hypre_CSRMatrixIntSpMVDevice( HYPRE_Int num_rows, HYPRE_Int num_nonzeros,
+                                        HYPRE_Int alpha, HYPRE_Int *d_ia, HYPRE_Int *d_ja,
+                                        HYPRE_Int *d_a, HYPRE_Int *d_x, HYPRE_Int beta,
+                                        HYPRE_Int *d_y );
 
-#if defined(HYPRE_USING_CUSPARSE) || defined(HYPRE_USING_ROCSPARSE)
+#if defined(HYPRE_USING_CUSPARSE)  ||\
+    defined(HYPRE_USING_ROCSPARSE) ||\
+    defined(HYPRE_USING_ONEMKLSPARSE)
 hypre_CsrsvData* hypre_CsrsvDataCreate();
-void hypre_CsrsvDataDestroy(hypre_CsrsvData *data);
+HYPRE_Int hypre_CsrsvDataDestroy(hypre_CsrsvData *data);
 hypre_GpuMatData* hypre_GpuMatDataCreate();
-void hypre_GpuMatDataDestroy(hypre_GpuMatData *data);
+HYPRE_Int hypre_GPUMatDataSetCSRData(hypre_CSRMatrix *matrix);
+HYPRE_Int hypre_GpuMatDataDestroy(hypre_GpuMatData *data);
 hypre_GpuMatData* hypre_CSRMatrixGetGPUMatData(hypre_CSRMatrix *matrix);
-#define hypre_CSRMatrixGPUMatDescr(matrix) ( hypre_GpuMatDataMatDecsr(hypre_CSRMatrixGetGPUMatData(matrix)) )
-#define hypre_CSRMatrixGPUMatInfo(matrix)  ( hypre_GpuMatDataMatInfo (hypre_CSRMatrixGetGPUMatData(matrix)) )
+
+#define hypre_CSRMatrixGPUMatDescr(matrix)       ( hypre_GpuMatDataMatDescr(hypre_CSRMatrixGetGPUMatData(matrix)) )
+#define hypre_CSRMatrixGPUMatInfo(matrix)        ( hypre_GpuMatDataMatInfo (hypre_CSRMatrixGetGPUMatData(matrix)) )
+#define hypre_CSRMatrixGPUMatHandle(matrix)      ( hypre_GpuMatDataMatHandle (hypre_CSRMatrixGetGPUMatData(matrix)) )
+#define hypre_CSRMatrixGPUMatSpMVBuffer(matrix)  ( hypre_GpuMatDataSpMVBuffer (hypre_CSRMatrixGetGPUMatData(matrix)) )
 #endif
-void hypre_CSRMatrixGpuSpMVAnalysis(hypre_CSRMatrix *matrix);
+
+HYPRE_Int hypre_CSRMatrixSpMVAnalysisDevice(hypre_CSRMatrix *matrix);
+
+/* vector_device.c */
+HYPRE_Int hypre_SeqVectorSetConstantValuesDevice ( hypre_Vector *v, HYPRE_Complex value );
+HYPRE_Int hypre_SeqVectorScaleDevice( HYPRE_Complex alpha, hypre_Vector *y );
+HYPRE_Int hypre_SeqVectorAxpyDevice ( HYPRE_Complex alpha, hypre_Vector *x, hypre_Vector *y );
+HYPRE_Int hypre_SeqVectorAxpyzDevice ( HYPRE_Complex alpha, hypre_Vector *x,
+                                       HYPRE_Complex beta, hypre_Vector *y,
+                                       hypre_Vector *z );
+HYPRE_Int hypre_SeqVectorElmdivpyDevice( hypre_Vector *x, hypre_Vector *b, hypre_Vector *y,
+                                         HYPRE_Int *marker, HYPRE_Int marker_val );
+HYPRE_Real hypre_SeqVectorInnerProdDevice ( hypre_Vector *x, hypre_Vector *y );
+HYPRE_Complex hypre_SeqVectorSumEltsDevice ( hypre_Vector *vector );
+HYPRE_Int hypre_SeqVectorStridedCopyDevice( hypre_Vector *vector,
+                                            HYPRE_Int istride, HYPRE_Int ostride,
+                                            HYPRE_Int size, HYPRE_Complex *data );
+HYPRE_Int hypre_SeqVectorPrefetch(hypre_Vector *x, HYPRE_MemoryLocation memory_location);
diff --git a/external/hypre/src/seq_mv/seq_mv.h b/external/hypre/src/seq_mv/seq_mv.h
index e5f9cab9..5c1fe7c7 100644
--- a/external/hypre/src/seq_mv/seq_mv.h
+++ b/external/hypre/src/seq_mv/seq_mv.h
@@ -19,7 +19,7 @@ extern "C" {
 #endif
 
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -36,12 +36,12 @@ extern "C" {
 #ifndef hypre_CSR_MATRIX_HEADER
 #define hypre_CSR_MATRIX_HEADER
 
-#if defined(HYPRE_USING_CUSPARSE) || defined(HYPRE_USING_ROCSPARSE)
+#if defined(HYPRE_USING_CUSPARSE)  ||\
+    defined(HYPRE_USING_ROCSPARSE) ||\
+    defined(HYPRE_USING_ONEMKLSPARSE)
 struct hypre_CsrsvData;
 typedef struct hypre_CsrsvData hypre_CsrsvData;
-#endif
 
-#if defined(HYPRE_USING_CUSPARSE) || defined(HYPRE_USING_ROCSPARSE)
 struct hypre_GpuMatData;
 typedef struct hypre_GpuMatData hypre_GpuMatData;
 #endif
@@ -61,15 +61,19 @@ typedef struct
    hypre_int            *i_short;
    hypre_int            *j_short;
    HYPRE_Int             owns_data;       /* Does the CSRMatrix create/destroy `data', `i', `j'? */
+   HYPRE_Int             pattern_only;    /* 1: data array is ignored, and assumed to be all 1's */
    HYPRE_Complex        *data;
    HYPRE_Int            *rownnz;          /* for compressing rows in matrix multiplication  */
    HYPRE_Int             num_rownnz;
    HYPRE_MemoryLocation  memory_location; /* memory location of arrays i, j, data */
-#if defined(HYPRE_USING_CUSPARSE) || defined(HYPRE_USING_ROCSPARSE)
+
+#if defined(HYPRE_USING_CUSPARSE)  ||\
+    defined(HYPRE_USING_ROCSPARSE) ||\
+    defined(HYPRE_USING_ONEMKLSPARSE)
    HYPRE_Int            *sorted_j;        /* some cusparse routines require sorted CSR */
    HYPRE_Complex        *sorted_data;
    hypre_CsrsvData      *csrsv_data;
-   hypre_GpuMatData      *mat_data;
+   hypre_GpuMatData     *mat_data;
 #endif
 } hypre_CSRMatrix;
 
@@ -87,9 +91,12 @@ typedef struct
 #define hypre_CSRMatrixRownnz(matrix)               ((matrix) -> rownnz)
 #define hypre_CSRMatrixNumRownnz(matrix)            ((matrix) -> num_rownnz)
 #define hypre_CSRMatrixOwnsData(matrix)             ((matrix) -> owns_data)
+#define hypre_CSRMatrixPatternOnly(matrix)          ((matrix) -> pattern_only)
 #define hypre_CSRMatrixMemoryLocation(matrix)       ((matrix) -> memory_location)
 
-#if defined(HYPRE_USING_CUSPARSE) || defined(HYPRE_USING_ROCSPARSE)
+#if defined(HYPRE_USING_CUSPARSE)  ||\
+    defined(HYPRE_USING_ROCSPARSE) ||\
+    defined(HYPRE_USING_ONEMKLSPARSE)
 #define hypre_CSRMatrixSortedJ(matrix)              ((matrix) -> sorted_j)
 #define hypre_CSRMatrixSortedData(matrix)           ((matrix) -> sorted_data)
 #define hypre_CSRMatrixCsrsvData(matrix)            ((matrix) -> csrsv_data)
@@ -128,9 +135,8 @@ typedef struct
 #define hypre_CSRBooleanMatrix_Get_OwnsData(matrix) ((matrix)->owns_data)
 
 #endif
-
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -171,7 +177,7 @@ typedef struct
 #endif
 
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -214,7 +220,7 @@ typedef struct
 #endif
 
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -235,14 +241,12 @@ typedef struct
 
 typedef struct
 {
-   HYPRE_Complex  *data;
-   HYPRE_Int       size;
-
-   /* Does the Vector create/destroy `data'? */
-   HYPRE_Int       owns_data;
-
-   /* memory location of array data */
-   HYPRE_MemoryLocation  memory_location;
+   HYPRE_Complex        *data;
+   HYPRE_Int             size;      /* Number of elements of a single vector component */
+   HYPRE_Int             component; /* Index of a multivector component
+                                    (used for set/get routines )*/
+   HYPRE_Int             owns_data;  /* Does the Vector create/destroy `data'? */
+   HYPRE_MemoryLocation  memory_location; /* memory location of data array */
 
    /* For multivectors...*/
    HYPRE_Int   num_vectors;  /* the above "size" is size of one vector */
@@ -261,118 +265,216 @@ typedef struct
 
 #define hypre_VectorData(vector)                  ((vector) -> data)
 #define hypre_VectorSize(vector)                  ((vector) -> size)
+#define hypre_VectorComponent(vector)             ((vector) -> component)
 #define hypre_VectorOwnsData(vector)              ((vector) -> owns_data)
 #define hypre_VectorMemoryLocation(vector)        ((vector) -> memory_location)
 #define hypre_VectorNumVectors(vector)            ((vector) -> num_vectors)
 #define hypre_VectorMultiVecStorageMethod(vector) ((vector) -> multivec_storage_method)
-#define hypre_VectorVectorStride(vector)          ((vector) -> vecstride )
-#define hypre_VectorIndexStride(vector)           ((vector) -> idxstride )
+#define hypre_VectorVectorStride(vector)          ((vector) -> vecstride)
+#define hypre_VectorIndexStride(vector)           ((vector) -> idxstride)
+#define hypre_VectorEntryI(vector, i)             ((vector) -> data[i])
+#define hypre_VectorEntryIJ(vector, i, j) \
+   ((vector) -> data[((vector) -> vecstride) * j + ((vector) -> idxstride) * i])
 
 #endif
-
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
  ******************************************************************************/
 
+/* csr_filter.c */
+HYPRE_Int hypre_CSRMatrixTruncateDiag(hypre_CSRMatrix *A);
+
 /* csr_matop.c */
-HYPRE_Int hypre_CSRMatrixAddFirstPass ( HYPRE_Int firstrow , HYPRE_Int lastrow , HYPRE_Int *marker , HYPRE_Int *twspace , HYPRE_Int *map_A2C , HYPRE_Int *map_B2C , hypre_CSRMatrix *A , hypre_CSRMatrix *B , HYPRE_Int nnzrows_C , HYPRE_Int nrows_C , HYPRE_Int ncols_C , HYPRE_Int *rownnz_C , HYPRE_MemoryLocation memory_location_C , HYPRE_Int *C_i , hypre_CSRMatrix **C_ptr );
-HYPRE_Int hypre_CSRMatrixAddSecondPass ( HYPRE_Int firstrow , HYPRE_Int lastrow , HYPRE_Int *marker, HYPRE_Int *twspace , HYPRE_Int *map_A2C , HYPRE_Int *map_B2C , HYPRE_Int *rownnz_C , HYPRE_Complex alpha , HYPRE_Complex beta , hypre_CSRMatrix *A , hypre_CSRMatrix *B , hypre_CSRMatrix *C);
-hypre_CSRMatrix *hypre_CSRMatrixAddHost ( HYPRE_Complex alpha, hypre_CSRMatrix *A, HYPRE_Complex beta, hypre_CSRMatrix *B );
-hypre_CSRMatrix *hypre_CSRMatrixAdd ( HYPRE_Complex alpha, hypre_CSRMatrix *A, HYPRE_Complex beta, hypre_CSRMatrix *B );
-hypre_CSRMatrix *hypre_CSRMatrixBigAdd ( hypre_CSRMatrix *A , hypre_CSRMatrix *B );
-hypre_CSRMatrix *hypre_CSRMatrixMultiplyHost ( hypre_CSRMatrix *A , hypre_CSRMatrix *B );
-hypre_CSRMatrix *hypre_CSRMatrixMultiply ( hypre_CSRMatrix *A , hypre_CSRMatrix *B );
-hypre_CSRMatrix *hypre_CSRMatrixDeleteZeros ( hypre_CSRMatrix *A , HYPRE_Real tol );
-HYPRE_Int hypre_CSRMatrixTransposeHost ( hypre_CSRMatrix *A , hypre_CSRMatrix **AT , HYPRE_Int data );
-HYPRE_Int hypre_CSRMatrixTranspose ( hypre_CSRMatrix *A , hypre_CSRMatrix **AT , HYPRE_Int data );
+HYPRE_Int hypre_CSRMatrixAddFirstPass ( HYPRE_Int firstrow, HYPRE_Int lastrow, HYPRE_Int *marker,
+                                        HYPRE_Int *twspace, HYPRE_Int *map_A2C, HYPRE_Int *map_B2C,
+                                        hypre_CSRMatrix *A, hypre_CSRMatrix *B,
+                                        HYPRE_Int nnzrows_C, HYPRE_Int nrows_C, HYPRE_Int ncols_C,
+                                        HYPRE_Int *rownnz_C,
+                                        HYPRE_MemoryLocation memory_location_C,
+                                        HYPRE_Int *C_i, hypre_CSRMatrix **C_ptr );
+HYPRE_Int hypre_CSRMatrixAddSecondPass ( HYPRE_Int firstrow, HYPRE_Int lastrow, HYPRE_Int *marker,
+                                         HYPRE_Int *map_A2C, HYPRE_Int *map_B2C,
+                                         HYPRE_Int *rownnz_C, HYPRE_Complex alpha,
+                                         HYPRE_Complex beta, hypre_CSRMatrix *A,
+                                         hypre_CSRMatrix *B, hypre_CSRMatrix *C);
+hypre_CSRMatrix *hypre_CSRMatrixAddHost ( HYPRE_Complex alpha, hypre_CSRMatrix *A,
+                                          HYPRE_Complex beta, hypre_CSRMatrix *B );
+hypre_CSRMatrix *hypre_CSRMatrixAdd ( HYPRE_Complex alpha, hypre_CSRMatrix *A, HYPRE_Complex beta,
+                                      hypre_CSRMatrix *B );
+hypre_CSRMatrix *hypre_CSRMatrixBigAdd ( hypre_CSRMatrix *A, hypre_CSRMatrix *B );
+hypre_CSRMatrix *hypre_CSRMatrixMultiplyHost ( hypre_CSRMatrix *A, hypre_CSRMatrix *B );
+hypre_CSRMatrix *hypre_CSRMatrixMultiply ( hypre_CSRMatrix *A, hypre_CSRMatrix *B );
+hypre_CSRMatrix *hypre_CSRMatrixDeleteZeros ( hypre_CSRMatrix *A, HYPRE_Real tol );
+HYPRE_Int hypre_CSRMatrixTransposeHost ( hypre_CSRMatrix *A, hypre_CSRMatrix **AT, HYPRE_Int data );
+HYPRE_Int hypre_CSRMatrixTranspose ( hypre_CSRMatrix *A, hypre_CSRMatrix **AT, HYPRE_Int data );
 HYPRE_Int hypre_CSRMatrixReorder ( hypre_CSRMatrix *A );
 HYPRE_Complex hypre_CSRMatrixSumElts ( hypre_CSRMatrix *A );
 HYPRE_Real hypre_CSRMatrixFnorm( hypre_CSRMatrix *A );
-HYPRE_Int hypre_CSRMatrixSplit(hypre_CSRMatrix *Bs_ext, HYPRE_BigInt first_col_diag_B, HYPRE_BigInt last_col_diag_B, HYPRE_Int num_cols_offd_B, HYPRE_BigInt *col_map_offd_B, HYPRE_Int *num_cols_offd_C_ptr, HYPRE_BigInt **col_map_offd_C_ptr, hypre_CSRMatrix **Bext_diag_ptr, hypre_CSRMatrix **Bext_offd_ptr);
-hypre_CSRMatrix * hypre_CSRMatrixAddPartial( hypre_CSRMatrix *A, hypre_CSRMatrix *B, HYPRE_Int *row_nums);
-void hypre_CSRMatrixComputeRowSum( hypre_CSRMatrix *A, HYPRE_Int *CF_i, HYPRE_Int *CF_j, HYPRE_Complex *row_sum, HYPRE_Int type, HYPRE_Complex scal, const char *set_or_add);
-void hypre_CSRMatrixExtractDiagonal( hypre_CSRMatrix *A, HYPRE_Complex *d, HYPRE_Int type);
-void hypre_CSRMatrixExtractDiagonalHost( hypre_CSRMatrix *A, HYPRE_Complex *d, HYPRE_Int type);
+HYPRE_Int hypre_CSRMatrixSplit(hypre_CSRMatrix *Bs_ext, HYPRE_BigInt first_col_diag_B,
+                               HYPRE_BigInt last_col_diag_B, HYPRE_Int num_cols_offd_B, HYPRE_BigInt *col_map_offd_B,
+                               HYPRE_Int *num_cols_offd_C_ptr, HYPRE_BigInt **col_map_offd_C_ptr, hypre_CSRMatrix **Bext_diag_ptr,
+                               hypre_CSRMatrix **Bext_offd_ptr);
+hypre_CSRMatrix * hypre_CSRMatrixAddPartial( hypre_CSRMatrix *A, hypre_CSRMatrix *B,
+                                             HYPRE_Int *row_nums);
+void hypre_CSRMatrixComputeRowSumHost( hypre_CSRMatrix *A, HYPRE_Int *CF_i, HYPRE_Int *CF_j,
+                                       HYPRE_Complex *row_sum, HYPRE_Int type, HYPRE_Complex scal, const char *set_or_add);
+void hypre_CSRMatrixComputeRowSum( hypre_CSRMatrix *A, HYPRE_Int *CF_i, HYPRE_Int *CF_j,
+                                   HYPRE_Complex *row_sum, HYPRE_Int type, HYPRE_Complex scal, const char *set_or_add);
+HYPRE_Int hypre_CSRMatrixExtractDiagonal( hypre_CSRMatrix *A, HYPRE_Complex *d, HYPRE_Int type);
+HYPRE_Int hypre_CSRMatrixExtractDiagonalHost( hypre_CSRMatrix *A, HYPRE_Complex *d, HYPRE_Int type);
 HYPRE_Int hypre_CSRMatrixScale(hypre_CSRMatrix *A, HYPRE_Complex scalar);
 HYPRE_Int hypre_CSRMatrixSetConstantValues( hypre_CSRMatrix *A, HYPRE_Complex value);
+HYPRE_Int hypre_CSRMatrixDiagScale( hypre_CSRMatrix *A, hypre_Vector *ld, hypre_Vector *rd);
 
 /* csr_matop_device.c */
-hypre_CSRMatrix *hypre_CSRMatrixAddDevice ( HYPRE_Complex alpha, hypre_CSRMatrix *A, HYPRE_Complex beta, hypre_CSRMatrix *B );
-hypre_CSRMatrix *hypre_CSRMatrixMultiplyDevice ( hypre_CSRMatrix *A , hypre_CSRMatrix *B );
-hypre_CSRMatrix *hypre_CSRMatrixTripleMultiplyDevice ( hypre_CSRMatrix *A, hypre_CSRMatrix *B, hypre_CSRMatrix *C );
-HYPRE_Int hypre_CSRMatrixSplitDevice_core( HYPRE_Int job, HYPRE_Int num_rows, HYPRE_Int B_ext_nnz, HYPRE_Int *B_ext_ii, HYPRE_BigInt *B_ext_bigj, HYPRE_Complex *B_ext_data, char *B_ext_xata, HYPRE_BigInt first_col_diag_B, HYPRE_BigInt last_col_diag_B, HYPRE_Int num_cols_offd_B, HYPRE_BigInt *col_map_offd_B, HYPRE_Int **map_B_to_C_ptr, HYPRE_Int *num_cols_offd_C_ptr, HYPRE_BigInt **col_map_offd_C_ptr, HYPRE_Int *B_ext_diag_nnz_ptr, HYPRE_Int *B_ext_diag_ii, HYPRE_Int *B_ext_diag_j, HYPRE_Complex *B_ext_diag_data, char *B_ext_diag_xata, HYPRE_Int *B_ext_offd_nnz_ptr, HYPRE_Int *B_ext_offd_ii, HYPRE_Int *B_ext_offd_j, HYPRE_Complex *B_ext_offd_data, char *B_ext_offd_xata );
-HYPRE_Int hypre_CSRMatrixSplitDevice(hypre_CSRMatrix *B_ext, HYPRE_BigInt first_col_diag_B, HYPRE_BigInt last_col_diag_B, HYPRE_Int num_cols_offd_B, HYPRE_BigInt *col_map_offd_B, HYPRE_Int **map_B_to_C_ptr, HYPRE_Int *num_cols_offd_C_ptr, HYPRE_BigInt **col_map_offd_C_ptr, hypre_CSRMatrix **B_ext_diag_ptr, hypre_CSRMatrix **B_ext_offd_ptr);
-HYPRE_Int hypre_CSRMatrixTransposeDevice ( hypre_CSRMatrix *A , hypre_CSRMatrix **AT , HYPRE_Int data );
-hypre_CSRMatrix* hypre_CSRMatrixAddPartialDevice( hypre_CSRMatrix *A, hypre_CSRMatrix *B, HYPRE_Int *row_nums);
+hypre_CSRMatrix *hypre_CSRMatrixAddDevice ( HYPRE_Complex alpha, hypre_CSRMatrix *A,
+                                            HYPRE_Complex beta, hypre_CSRMatrix *B );
+hypre_CSRMatrix *hypre_CSRMatrixMultiplyDevice ( hypre_CSRMatrix *A, hypre_CSRMatrix *B );
+hypre_CSRMatrix *hypre_CSRMatrixTripleMultiplyDevice ( hypre_CSRMatrix *A, hypre_CSRMatrix *B,
+                                                       hypre_CSRMatrix *C );
+HYPRE_Int hypre_CSRMatrixMergeColMapOffd( HYPRE_Int num_cols_offd_B, HYPRE_BigInt *col_map_offd_B,
+                                          HYPRE_Int B_ext_offd_nnz, HYPRE_BigInt *B_ext_offd_bigj, HYPRE_Int *num_cols_offd_C_ptr,
+                                          HYPRE_BigInt **col_map_offd_C_ptr, HYPRE_Int **map_B_to_C_ptr );
+HYPRE_Int hypre_CSRMatrixSplitDevice_core( HYPRE_Int job, HYPRE_Int num_rows, HYPRE_Int B_ext_nnz,
+                                           HYPRE_Int *B_ext_ii, HYPRE_BigInt *B_ext_bigj, HYPRE_Complex *B_ext_data, char *B_ext_xata,
+                                           HYPRE_BigInt first_col_diag_B, HYPRE_BigInt last_col_diag_B, HYPRE_Int num_cols_offd_B,
+                                           HYPRE_BigInt *col_map_offd_B, HYPRE_Int **map_B_to_C_ptr, HYPRE_Int *num_cols_offd_C_ptr,
+                                           HYPRE_BigInt **col_map_offd_C_ptr, HYPRE_Int *B_ext_diag_nnz_ptr, HYPRE_Int *B_ext_diag_ii,
+                                           HYPRE_Int *B_ext_diag_j, HYPRE_Complex *B_ext_diag_data, char *B_ext_diag_xata,
+                                           HYPRE_Int *B_ext_offd_nnz_ptr, HYPRE_Int *B_ext_offd_ii, HYPRE_Int *B_ext_offd_j,
+                                           HYPRE_Complex *B_ext_offd_data, char *B_ext_offd_xata );
+HYPRE_Int hypre_CSRMatrixSplitDevice(hypre_CSRMatrix *B_ext, HYPRE_BigInt first_col_diag_B,
+                                     HYPRE_BigInt last_col_diag_B, HYPRE_Int num_cols_offd_B, HYPRE_BigInt *col_map_offd_B,
+                                     HYPRE_Int **map_B_to_C_ptr, HYPRE_Int *num_cols_offd_C_ptr, HYPRE_BigInt **col_map_offd_C_ptr,
+                                     hypre_CSRMatrix **B_ext_diag_ptr, hypre_CSRMatrix **B_ext_offd_ptr);
+HYPRE_Int hypre_CSRMatrixTransposeDevice ( hypre_CSRMatrix *A, hypre_CSRMatrix **AT,
+                                           HYPRE_Int data );
+hypre_CSRMatrix* hypre_CSRMatrixAddPartialDevice( hypre_CSRMatrix *A, hypre_CSRMatrix *B,
+                                                  HYPRE_Int *row_nums);
 HYPRE_Int hypre_CSRMatrixColNNzRealDevice( hypre_CSRMatrix *A, HYPRE_Real *colnnz);
 HYPRE_Int hypre_CSRMatrixMoveDiagFirstDevice( hypre_CSRMatrix  *A );
 HYPRE_Int hypre_CSRMatrixCheckDiagFirstDevice( hypre_CSRMatrix  *A );
-HYPRE_Int hypre_CSRMatrixFixZeroDiagDevice( hypre_CSRMatrix *A, HYPRE_Complex v, HYPRE_Real tol );
-HYPRE_Int hypre_CSRMatrixReplaceDiagDevice( hypre_CSRMatrix *A, HYPRE_Complex *new_diag, HYPRE_Complex v, HYPRE_Real tol );
-void hypre_CSRMatrixComputeRowSumDevice( hypre_CSRMatrix *A, HYPRE_Int *CF_i, HYPRE_Int *CF_j, HYPRE_Complex *row_sum, HYPRE_Int type, HYPRE_Complex scal, const char *set_or_add);
-void hypre_CSRMatrixExtractDiagonalDevice( hypre_CSRMatrix *A, HYPRE_Complex *d, HYPRE_Int type);
+HYPRE_Int hypre_CSRMatrixCheckForMissingDiagonal( hypre_CSRMatrix *A );
+HYPRE_Int hypre_CSRMatrixReplaceDiagDevice( hypre_CSRMatrix *A, HYPRE_Complex *new_diag,
+                                            HYPRE_Complex v, HYPRE_Real tol );
+HYPRE_Int hypre_CSRMatrixComputeRowSumDevice( hypre_CSRMatrix *A, HYPRE_Int *CF_i, HYPRE_Int *CF_j,
+                                              HYPRE_Complex *row_sum, HYPRE_Int type,
+                                              HYPRE_Complex scal, const char *set_or_add );
+HYPRE_Int hypre_CSRMatrixExtractDiagonalDevice( hypre_CSRMatrix *A, HYPRE_Complex *d,
+                                                HYPRE_Int type );
 hypre_CSRMatrix* hypre_CSRMatrixStack2Device(hypre_CSRMatrix *A, hypre_CSRMatrix *B);
 hypre_CSRMatrix* hypre_CSRMatrixIdentityDevice(HYPRE_Int n, HYPRE_Complex alp);
+hypre_CSRMatrix* hypre_CSRMatrixDiagMatrixFromVectorDevice(HYPRE_Int n, HYPRE_Complex *v);
+hypre_CSRMatrix* hypre_CSRMatrixDiagMatrixFromMatrixDevice(hypre_CSRMatrix *A, HYPRE_Int type);
 HYPRE_Int hypre_CSRMatrixRemoveDiagonalDevice(hypre_CSRMatrix *A);
-HYPRE_Int hypre_CSRMatrixDropSmallEntriesDevice( hypre_CSRMatrix *A, HYPRE_Real tol, HYPRE_Real *elmt_tols);
+HYPRE_Int hypre_CSRMatrixDropSmallEntriesDevice( hypre_CSRMatrix *A, HYPRE_Real tol,
+                                                 HYPRE_Real *elmt_tols);
+HYPRE_Int hypre_CSRMatrixPermuteDevice( hypre_CSRMatrix *A, HYPRE_Int *perm,
+                                        HYPRE_Int *rqperm, hypre_CSRMatrix *B );
 HYPRE_Int hypre_CSRMatrixSortRow(hypre_CSRMatrix *A);
-HYPRE_Int hypre_CSRMatrixTriLowerUpperSolveDevice(char uplo, hypre_CSRMatrix *A, HYPRE_Real *l1_norms, hypre_Vector *f, hypre_Vector *u );
-HYPRE_Int hypre_CSRMatrixTriLowerUpperSolveRocsparse(char uplo, hypre_CSRMatrix *A, HYPRE_Real *l1_norms, hypre_Vector *f, hypre_Vector *u );
-HYPRE_Int hypre_CSRMatrixTriLowerUpperSolveCusparse(char uplo, hypre_CSRMatrix *A, HYPRE_Real *l1_norms, hypre_Vector *f, hypre_Vector *u );
-HYPRE_Int hypre_CSRMatrixIntersectPattern(hypre_CSRMatrix *A, hypre_CSRMatrix *B, HYPRE_Int *markA, HYPRE_Int diag_option);
+HYPRE_Int hypre_CSRMatrixSortRowOutOfPlace(hypre_CSRMatrix *A);
+HYPRE_Int hypre_CSRMatrixTriLowerUpperSolveDevice_core(char uplo, HYPRE_Int unit_diag,
+                                                       hypre_CSRMatrix *A, HYPRE_Real *l1_norms, hypre_Vector *f, HYPRE_Int offset_f, hypre_Vector *u,
+                                                       HYPRE_Int offset_u);
+HYPRE_Int hypre_CSRMatrixTriLowerUpperSolveDevice(char uplo, HYPRE_Int unit_diag,
+                                                  hypre_CSRMatrix *A, HYPRE_Real *l1_norms, hypre_Vector *f, hypre_Vector *u );
+HYPRE_Int hypre_CSRMatrixTriLowerUpperSolveRocsparse(char uplo, HYPRE_Int unit_diag,
+                                                     hypre_CSRMatrix *A, HYPRE_Real *l1_norms, HYPRE_Complex *f, HYPRE_Complex *u );
+HYPRE_Int hypre_CSRMatrixTriLowerUpperSolveCusparse(char uplo, HYPRE_Int unit_diag,
+                                                    hypre_CSRMatrix *A, HYPRE_Real *l1_norms, HYPRE_Complex *f, HYPRE_Complex *u );
+HYPRE_Int hypre_CSRMatrixTriLowerUpperSolveOnemklsparse(char uplo, HYPRE_Int unit_diag,
+                                                        hypre_CSRMatrix *A, HYPRE_Real *l1_norms, HYPRE_Complex *f, HYPRE_Complex *u );
+HYPRE_Int hypre_CSRMatrixIntersectPattern(hypre_CSRMatrix *A, hypre_CSRMatrix *B, HYPRE_Int *markA,
+                                          HYPRE_Int diag_option);
+HYPRE_Int hypre_CSRMatrixDiagScaleDevice( hypre_CSRMatrix *A, hypre_Vector *ld, hypre_Vector *rd);
+HYPRE_Int hypre_CSRMatrixCompressColumnsDevice(hypre_CSRMatrix *A, HYPRE_BigInt *col_map,
+                                               HYPRE_Int **col_idx_new_ptr, HYPRE_BigInt **col_map_new_ptr);
+HYPRE_Int hypre_CSRMatrixILU0(hypre_CSRMatrix *A);
 
 /* csr_matrix.c */
-hypre_CSRMatrix *hypre_CSRMatrixCreate ( HYPRE_Int num_rows , HYPRE_Int num_cols , HYPRE_Int num_nonzeros );
+hypre_CSRMatrix *hypre_CSRMatrixCreate ( HYPRE_Int num_rows, HYPRE_Int num_cols,
+                                         HYPRE_Int num_nonzeros );
 HYPRE_Int hypre_CSRMatrixDestroy ( hypre_CSRMatrix *matrix );
-HYPRE_Int hypre_CSRMatrixInitialize_v2( hypre_CSRMatrix *matrix, HYPRE_Int bigInit, HYPRE_MemoryLocation memory_location );
+HYPRE_Int hypre_CSRMatrixInitialize_v2( hypre_CSRMatrix *matrix, HYPRE_Int bigInit,
+                                        HYPRE_MemoryLocation memory_location );
 HYPRE_Int hypre_CSRMatrixInitialize ( hypre_CSRMatrix *matrix );
 HYPRE_Int hypre_CSRMatrixBigInitialize ( hypre_CSRMatrix *matrix );
 HYPRE_Int hypre_CSRMatrixBigJtoJ ( hypre_CSRMatrix *matrix );
 HYPRE_Int hypre_CSRMatrixJtoBigJ ( hypre_CSRMatrix *matrix );
-HYPRE_Int hypre_CSRMatrixSetDataOwner ( hypre_CSRMatrix *matrix , HYPRE_Int owns_data );
+HYPRE_Int hypre_CSRMatrixSetDataOwner ( hypre_CSRMatrix *matrix, HYPRE_Int owns_data );
+HYPRE_Int hypre_CSRMatrixSetPatternOnly( hypre_CSRMatrix *matrix, HYPRE_Int pattern_only );
 HYPRE_Int hypre_CSRMatrixSetRownnz ( hypre_CSRMatrix *matrix );
 hypre_CSRMatrix *hypre_CSRMatrixRead ( char *file_name );
 HYPRE_Int hypre_CSRMatrixPrint ( hypre_CSRMatrix *matrix, const char *file_name );
-HYPRE_Int hypre_CSRMatrixPrint2( hypre_CSRMatrix *matrix, const char *file_name );
-HYPRE_Int hypre_CSRMatrixPrintHB ( hypre_CSRMatrix *matrix_input , char *file_name );
-HYPRE_Int hypre_CSRMatrixPrintMM( hypre_CSRMatrix *matrix, HYPRE_Int basei, HYPRE_Int basej, HYPRE_Int trans, const char *file_name );
-HYPRE_Int hypre_CSRMatrixCopy ( hypre_CSRMatrix *A , hypre_CSRMatrix *B , HYPRE_Int copy_data );
+HYPRE_Int hypre_CSRMatrixPrintIJ( hypre_CSRMatrix *matrix, HYPRE_Int base_i,
+                                  HYPRE_Int base_j, char *filename );
+HYPRE_Int hypre_CSRMatrixPrintHB ( hypre_CSRMatrix *matrix_input, char *file_name );
+HYPRE_Int hypre_CSRMatrixPrintMM( hypre_CSRMatrix *matrix, HYPRE_Int basei, HYPRE_Int basej,
+                                  HYPRE_Int trans, const char *file_name );
+HYPRE_Int hypre_CSRMatrixCopy ( hypre_CSRMatrix *A, hypre_CSRMatrix *B, HYPRE_Int copy_data );
+HYPRE_Int hypre_CSRMatrixMigrate( hypre_CSRMatrix *A, HYPRE_MemoryLocation memory_location );
 hypre_CSRMatrix *hypre_CSRMatrixClone ( hypre_CSRMatrix *A, HYPRE_Int copy_data );
-hypre_CSRMatrix *hypre_CSRMatrixClone_v2( hypre_CSRMatrix *A, HYPRE_Int copy_data, HYPRE_MemoryLocation memory_location );
-hypre_CSRMatrix *hypre_CSRMatrixUnion ( hypre_CSRMatrix *A , hypre_CSRMatrix *B , HYPRE_BigInt *col_map_offd_A , HYPRE_BigInt *col_map_offd_B , HYPRE_BigInt **col_map_offd_C );
+hypre_CSRMatrix *hypre_CSRMatrixClone_v2( hypre_CSRMatrix *A, HYPRE_Int copy_data,
+                                          HYPRE_MemoryLocation memory_location );
+HYPRE_Int hypre_CSRMatrixPermute( hypre_CSRMatrix *A, HYPRE_Int *perm,
+                                  HYPRE_Int *rqperm, hypre_CSRMatrix **B_ptr );
+hypre_CSRMatrix *hypre_CSRMatrixUnion( hypre_CSRMatrix *A,
+                                       hypre_CSRMatrix *B,
+                                       HYPRE_BigInt *col_map_offd_A,
+                                       HYPRE_BigInt *col_map_offd_B,
+                                       HYPRE_BigInt **col_map_offd_C );
 HYPRE_Int hypre_CSRMatrixPrefetch( hypre_CSRMatrix *A, HYPRE_MemoryLocation memory_location);
 HYPRE_Int hypre_CSRMatrixCheckSetNumNonzeros( hypre_CSRMatrix *matrix );
-HYPRE_Int hypre_CSRMatrixResize( hypre_CSRMatrix *matrix, HYPRE_Int new_num_rows, HYPRE_Int new_num_cols, HYPRE_Int new_num_nonzeros );
+HYPRE_Int hypre_CSRMatrixResize( hypre_CSRMatrix *matrix, HYPRE_Int new_num_rows,
+                                 HYPRE_Int new_num_cols, HYPRE_Int new_num_nonzeros );
 
 /* csr_matvec.c */
 // y[offset:end] = alpha*A[offset:end,:]*x + beta*b[offset:end]
-HYPRE_Int hypre_CSRMatrixMatvecOutOfPlace ( HYPRE_Complex alpha , hypre_CSRMatrix *A , hypre_Vector *x , HYPRE_Complex beta , hypre_Vector *b, hypre_Vector *y, HYPRE_Int offset );
+HYPRE_Int hypre_CSRMatrixMatvecOutOfPlace ( HYPRE_Complex alpha, hypre_CSRMatrix *A,
+                                            hypre_Vector *x, HYPRE_Complex beta, hypre_Vector *b, hypre_Vector *y, HYPRE_Int offset );
 // y = alpha*A + beta*y
-HYPRE_Int hypre_CSRMatrixMatvec ( HYPRE_Complex alpha , hypre_CSRMatrix *A , hypre_Vector *x , HYPRE_Complex beta , hypre_Vector *y );
-HYPRE_Int hypre_CSRMatrixMatvecT ( HYPRE_Complex alpha , hypre_CSRMatrix *A , hypre_Vector *x , HYPRE_Complex beta , hypre_Vector *y );
-HYPRE_Int hypre_CSRMatrixMatvec_FF ( HYPRE_Complex alpha , hypre_CSRMatrix *A , hypre_Vector *x , HYPRE_Complex beta , hypre_Vector *y , HYPRE_Int *CF_marker_x , HYPRE_Int *CF_marker_y , HYPRE_Int fpt );
+HYPRE_Int hypre_CSRMatrixMatvec ( HYPRE_Complex alpha, hypre_CSRMatrix *A, hypre_Vector *x,
+                                  HYPRE_Complex beta, hypre_Vector *y );
+HYPRE_Int hypre_CSRMatrixMatvecT ( HYPRE_Complex alpha, hypre_CSRMatrix *A, hypre_Vector *x,
+                                   HYPRE_Complex beta, hypre_Vector *y );
+HYPRE_Int hypre_CSRMatrixMatvec_FF ( HYPRE_Complex alpha, hypre_CSRMatrix *A, hypre_Vector *x,
+                                     HYPRE_Complex beta, hypre_Vector *y, HYPRE_Int *CF_marker_x, HYPRE_Int *CF_marker_y,
+                                     HYPRE_Int fpt );
 
 /* csr_matvec_device.c */
-HYPRE_Int hypre_CSRMatrixMatvecDevice(HYPRE_Int trans, HYPRE_Complex alpha , hypre_CSRMatrix *A , hypre_Vector *x , HYPRE_Complex beta , hypre_Vector *b, hypre_Vector *y, HYPRE_Int offset );
-HYPRE_Int hypre_CSRMatrixMatvecCusparseNewAPI( HYPRE_Int trans, HYPRE_Complex alpha, hypre_CSRMatrix *A, hypre_Vector *x, HYPRE_Complex beta, hypre_Vector *y, HYPRE_Int offset );
-HYPRE_Int hypre_CSRMatrixMatvecCusparseOldAPI( HYPRE_Int trans, HYPRE_Complex alpha, hypre_CSRMatrix *A, hypre_Vector *x, HYPRE_Complex beta, hypre_Vector *y, HYPRE_Int offset );
-HYPRE_Int hypre_CSRMatrixMatvecOMPOffload (HYPRE_Int trans, HYPRE_Complex alpha , hypre_CSRMatrix *A , hypre_Vector *x , HYPRE_Complex beta , hypre_Vector *y, HYPRE_Int offset );
-HYPRE_Int hypre_CSRMatrixMatvecRocsparse (HYPRE_Int trans, HYPRE_Complex alpha , hypre_CSRMatrix *A , hypre_Vector *x , HYPRE_Complex beta , hypre_Vector *y, HYPRE_Int offset );
+HYPRE_Int hypre_CSRMatrixMatvecDevice(HYPRE_Int trans, HYPRE_Complex alpha, hypre_CSRMatrix *A,
+                                      hypre_Vector *x, HYPRE_Complex beta, hypre_Vector *b, hypre_Vector *y, HYPRE_Int offset );
+HYPRE_Int hypre_CSRMatrixMatvecCusparseNewAPI( HYPRE_Int trans, HYPRE_Complex alpha,
+                                               hypre_CSRMatrix *A, hypre_Vector *x, HYPRE_Complex beta, hypre_Vector *y, HYPRE_Int offset );
+HYPRE_Int hypre_CSRMatrixMatvecCusparseOldAPI( HYPRE_Int trans, HYPRE_Complex alpha,
+                                               hypre_CSRMatrix *A, hypre_Vector *x, HYPRE_Complex beta, hypre_Vector *y, HYPRE_Int offset );
+HYPRE_Int hypre_CSRMatrixMatvecCusparse( HYPRE_Int trans, HYPRE_Complex alpha,
+                                         hypre_CSRMatrix *A, hypre_Vector *x, HYPRE_Complex beta, hypre_Vector *y, HYPRE_Int offset );
+HYPRE_Int hypre_CSRMatrixMatvecOMPOffload (HYPRE_Int trans, HYPRE_Complex alpha, hypre_CSRMatrix *A,
+                                           hypre_Vector *x, HYPRE_Complex beta, hypre_Vector *y, HYPRE_Int offset );
+HYPRE_Int hypre_CSRMatrixMatvecRocsparse (HYPRE_Int trans, HYPRE_Complex alpha, hypre_CSRMatrix *A,
+                                          hypre_Vector *x, HYPRE_Complex beta, hypre_Vector *y, HYPRE_Int offset );
+HYPRE_Int hypre_CSRMatrixMatvecOnemklsparse (HYPRE_Int trans, HYPRE_Complex alpha,
+                                             hypre_CSRMatrix *A,
+                                             hypre_Vector *x, HYPRE_Complex beta, hypre_Vector *y, HYPRE_Int offset );
 
 /* genpart.c */
-HYPRE_Int hypre_GeneratePartitioning ( HYPRE_BigInt length , HYPRE_Int num_procs , HYPRE_BigInt **part_ptr );
-HYPRE_Int hypre_GenerateLocalPartitioning ( HYPRE_BigInt length , HYPRE_Int num_procs , HYPRE_Int myid , HYPRE_BigInt *part );
+HYPRE_Int hypre_GeneratePartitioning ( HYPRE_BigInt length, HYPRE_Int num_procs,
+                                       HYPRE_BigInt **part_ptr );
+HYPRE_Int hypre_GenerateLocalPartitioning ( HYPRE_BigInt length, HYPRE_Int num_procs,
+                                            HYPRE_Int myid, HYPRE_BigInt *part );
 
 /* HYPRE_csr_matrix.c */
-HYPRE_CSRMatrix HYPRE_CSRMatrixCreate ( HYPRE_Int num_rows , HYPRE_Int num_cols , HYPRE_Int *row_sizes );
+HYPRE_CSRMatrix HYPRE_CSRMatrixCreate ( HYPRE_Int num_rows, HYPRE_Int num_cols,
+                                        HYPRE_Int *row_sizes );
 HYPRE_Int HYPRE_CSRMatrixDestroy ( HYPRE_CSRMatrix matrix );
 HYPRE_Int HYPRE_CSRMatrixInitialize ( HYPRE_CSRMatrix matrix );
 HYPRE_CSRMatrix HYPRE_CSRMatrixRead ( char *file_name );
-void HYPRE_CSRMatrixPrint ( HYPRE_CSRMatrix matrix , char *file_name );
-HYPRE_Int HYPRE_CSRMatrixGetNumRows ( HYPRE_CSRMatrix matrix , HYPRE_Int *num_rows );
+void HYPRE_CSRMatrixPrint ( HYPRE_CSRMatrix matrix, char *file_name );
+HYPRE_Int HYPRE_CSRMatrixGetNumRows ( HYPRE_CSRMatrix matrix, HYPRE_Int *num_rows );
 
 /* HYPRE_mapped_matrix.c */
 HYPRE_MappedMatrix HYPRE_MappedMatrixCreate ( void );
@@ -381,11 +483,12 @@ HYPRE_Int HYPRE_MappedMatrixLimitedDestroy ( HYPRE_MappedMatrix matrix );
 HYPRE_Int HYPRE_MappedMatrixInitialize ( HYPRE_MappedMatrix matrix );
 HYPRE_Int HYPRE_MappedMatrixAssemble ( HYPRE_MappedMatrix matrix );
 void HYPRE_MappedMatrixPrint ( HYPRE_MappedMatrix matrix );
-HYPRE_Int HYPRE_MappedMatrixGetColIndex ( HYPRE_MappedMatrix matrix , HYPRE_Int j );
+HYPRE_Int HYPRE_MappedMatrixGetColIndex ( HYPRE_MappedMatrix matrix, HYPRE_Int j );
 void *HYPRE_MappedMatrixGetMatrix ( HYPRE_MappedMatrix matrix );
-HYPRE_Int HYPRE_MappedMatrixSetMatrix ( HYPRE_MappedMatrix matrix , void *matrix_data );
-HYPRE_Int HYPRE_MappedMatrixSetColMap ( HYPRE_MappedMatrix matrix , HYPRE_Int (*ColMap )(HYPRE_Int ,void *));
-HYPRE_Int HYPRE_MappedMatrixSetMapData ( HYPRE_MappedMatrix matrix , void *MapData );
+HYPRE_Int HYPRE_MappedMatrixSetMatrix ( HYPRE_MappedMatrix matrix, void *matrix_data );
+HYPRE_Int HYPRE_MappedMatrixSetColMap ( HYPRE_MappedMatrix matrix, HYPRE_Int (*ColMap )(HYPRE_Int,
+                                                                                        void *));
+HYPRE_Int HYPRE_MappedMatrixSetMapData ( HYPRE_MappedMatrix matrix, void *MapData );
 
 /* HYPRE_multiblock_matrix.c */
 HYPRE_MultiblockMatrix HYPRE_MultiblockMatrixCreate ( void );
@@ -394,14 +497,15 @@ HYPRE_Int HYPRE_MultiblockMatrixLimitedDestroy ( HYPRE_MultiblockMatrix matrix )
 HYPRE_Int HYPRE_MultiblockMatrixInitialize ( HYPRE_MultiblockMatrix matrix );
 HYPRE_Int HYPRE_MultiblockMatrixAssemble ( HYPRE_MultiblockMatrix matrix );
 void HYPRE_MultiblockMatrixPrint ( HYPRE_MultiblockMatrix matrix );
-HYPRE_Int HYPRE_MultiblockMatrixSetNumSubmatrices ( HYPRE_MultiblockMatrix matrix , HYPRE_Int n );
-HYPRE_Int HYPRE_MultiblockMatrixSetSubmatrixType ( HYPRE_MultiblockMatrix matrix , HYPRE_Int j , HYPRE_Int type );
+HYPRE_Int HYPRE_MultiblockMatrixSetNumSubmatrices ( HYPRE_MultiblockMatrix matrix, HYPRE_Int n );
+HYPRE_Int HYPRE_MultiblockMatrixSetSubmatrixType ( HYPRE_MultiblockMatrix matrix, HYPRE_Int j,
+                                                   HYPRE_Int type );
 
 /* HYPRE_vector.c */
 HYPRE_Vector HYPRE_VectorCreate ( HYPRE_Int size );
 HYPRE_Int HYPRE_VectorDestroy ( HYPRE_Vector vector );
 HYPRE_Int HYPRE_VectorInitialize ( HYPRE_Vector vector );
-HYPRE_Int HYPRE_VectorPrint ( HYPRE_Vector vector , char *file_name );
+HYPRE_Int HYPRE_VectorPrint ( HYPRE_Vector vector, char *file_name );
 HYPRE_Vector HYPRE_VectorRead ( char *file_name );
 
 /* mapped_matrix.c */
@@ -411,11 +515,12 @@ HYPRE_Int hypre_MappedMatrixLimitedDestroy ( hypre_MappedMatrix *matrix );
 HYPRE_Int hypre_MappedMatrixInitialize ( hypre_MappedMatrix *matrix );
 HYPRE_Int hypre_MappedMatrixAssemble ( hypre_MappedMatrix *matrix );
 void hypre_MappedMatrixPrint ( hypre_MappedMatrix *matrix );
-HYPRE_Int hypre_MappedMatrixGetColIndex ( hypre_MappedMatrix *matrix , HYPRE_Int j );
+HYPRE_Int hypre_MappedMatrixGetColIndex ( hypre_MappedMatrix *matrix, HYPRE_Int j );
 void *hypre_MappedMatrixGetMatrix ( hypre_MappedMatrix *matrix );
-HYPRE_Int hypre_MappedMatrixSetMatrix ( hypre_MappedMatrix *matrix , void *matrix_data );
-HYPRE_Int hypre_MappedMatrixSetColMap ( hypre_MappedMatrix *matrix , HYPRE_Int (*ColMap )(HYPRE_Int ,void *));
-HYPRE_Int hypre_MappedMatrixSetMapData ( hypre_MappedMatrix *matrix , void *map_data );
+HYPRE_Int hypre_MappedMatrixSetMatrix ( hypre_MappedMatrix *matrix, void *matrix_data );
+HYPRE_Int hypre_MappedMatrixSetColMap ( hypre_MappedMatrix *matrix, HYPRE_Int (*ColMap )(HYPRE_Int,
+                                                                                         void *));
+HYPRE_Int hypre_MappedMatrixSetMapData ( hypre_MappedMatrix *matrix, void *map_data );
 
 /* multiblock_matrix.c */
 hypre_MultiblockMatrix *hypre_MultiblockMatrixCreate ( void );
@@ -424,79 +529,143 @@ HYPRE_Int hypre_MultiblockMatrixLimitedDestroy ( hypre_MultiblockMatrix *matrix
 HYPRE_Int hypre_MultiblockMatrixInitialize ( hypre_MultiblockMatrix *matrix );
 HYPRE_Int hypre_MultiblockMatrixAssemble ( hypre_MultiblockMatrix *matrix );
 void hypre_MultiblockMatrixPrint ( hypre_MultiblockMatrix *matrix );
-HYPRE_Int hypre_MultiblockMatrixSetNumSubmatrices ( hypre_MultiblockMatrix *matrix , HYPRE_Int n );
-HYPRE_Int hypre_MultiblockMatrixSetSubmatrixType ( hypre_MultiblockMatrix *matrix , HYPRE_Int j , HYPRE_Int type );
-HYPRE_Int hypre_MultiblockMatrixSetSubmatrix ( hypre_MultiblockMatrix *matrix , HYPRE_Int j , void *submatrix );
+HYPRE_Int hypre_MultiblockMatrixSetNumSubmatrices ( hypre_MultiblockMatrix *matrix, HYPRE_Int n );
+HYPRE_Int hypre_MultiblockMatrixSetSubmatrixType ( hypre_MultiblockMatrix *matrix, HYPRE_Int j,
+                                                   HYPRE_Int type );
+HYPRE_Int hypre_MultiblockMatrixSetSubmatrix ( hypre_MultiblockMatrix *matrix, HYPRE_Int j,
+                                               void *submatrix );
 
 /* vector.c */
 hypre_Vector *hypre_SeqVectorCreate ( HYPRE_Int size );
-hypre_Vector *hypre_SeqMultiVectorCreate ( HYPRE_Int size , HYPRE_Int num_vectors );
+hypre_Vector *hypre_SeqMultiVectorCreate ( HYPRE_Int size, HYPRE_Int num_vectors );
 HYPRE_Int hypre_SeqVectorDestroy ( hypre_Vector *vector );
-HYPRE_Int hypre_SeqVectorInitialize_v2( hypre_Vector *vector, HYPRE_MemoryLocation memory_location );
+HYPRE_Int hypre_SeqVectorInitializeShell( hypre_Vector *vector );
+HYPRE_Int hypre_SeqVectorSetData( hypre_Vector *vector, HYPRE_Complex *data );
+HYPRE_Int hypre_SeqVectorInitialize_v2( hypre_Vector *vector,
+                                        HYPRE_MemoryLocation memory_location );
 HYPRE_Int hypre_SeqVectorInitialize ( hypre_Vector *vector );
-HYPRE_Int hypre_SeqVectorSetDataOwner ( hypre_Vector *vector , HYPRE_Int owns_data );
+HYPRE_Int hypre_SeqVectorSetDataOwner ( hypre_Vector *vector, HYPRE_Int owns_data );
+HYPRE_Int hypre_SeqVectorSetSize ( hypre_Vector *vector, HYPRE_Int size );
+HYPRE_Int hypre_SeqVectorResize ( hypre_Vector *vector, HYPRE_Int num_vectors_in );
 hypre_Vector *hypre_SeqVectorRead ( char *file_name );
-HYPRE_Int hypre_SeqVectorPrint ( hypre_Vector *vector , char *file_name );
-HYPRE_Int hypre_SeqVectorSetConstantValues ( hypre_Vector *v , HYPRE_Complex value );
-HYPRE_Int hypre_SeqVectorSetRandomValues ( hypre_Vector *v , HYPRE_Int seed );
-HYPRE_Int hypre_SeqVectorCopy ( hypre_Vector *x , hypre_Vector *y );
+HYPRE_Int hypre_SeqVectorPrint ( hypre_Vector *vector, char *file_name );
+HYPRE_Int hypre_SeqVectorSetConstantValues ( hypre_Vector *v, HYPRE_Complex value );
+HYPRE_Int hypre_SeqVectorSetConstantValuesHost ( hypre_Vector *v, HYPRE_Complex value );
+HYPRE_Int hypre_SeqVectorSetRandomValues ( hypre_Vector *v, HYPRE_Int seed );
+HYPRE_Int hypre_SeqVectorCopy ( hypre_Vector *x, hypre_Vector *y );
+HYPRE_Int hypre_SeqVectorStridedCopy( hypre_Vector *x, HYPRE_Int istride, HYPRE_Int ostride,
+                                      HYPRE_Int size, HYPRE_Complex *data);
 hypre_Vector *hypre_SeqVectorCloneDeep ( hypre_Vector *x );
 hypre_Vector *hypre_SeqVectorCloneDeep_v2( hypre_Vector *x, HYPRE_MemoryLocation memory_location );
 hypre_Vector *hypre_SeqVectorCloneShallow ( hypre_Vector *x );
+HYPRE_Int hypre_SeqVectorMigrate( hypre_Vector *x, HYPRE_MemoryLocation  memory_location );
 HYPRE_Int hypre_SeqVectorScale( HYPRE_Complex alpha, hypre_Vector *y );
-
-HYPRE_Int hypre_SeqVectorAxpy ( HYPRE_Complex alpha , hypre_Vector *x , hypre_Vector *y );
-HYPRE_Real hypre_SeqVectorInnerProd ( hypre_Vector *x , hypre_Vector *y );
-HYPRE_Int hypre_SeqVectorMassInnerProd(hypre_Vector *x, hypre_Vector **y, HYPRE_Int k, HYPRE_Int unroll, HYPRE_Real *result);
-HYPRE_Int hypre_SeqVectorMassInnerProd4(hypre_Vector *x, hypre_Vector **y, HYPRE_Int k,  HYPRE_Real *result);
-HYPRE_Int hypre_SeqVectorMassInnerProd8(hypre_Vector *x, hypre_Vector **y, HYPRE_Int k,  HYPRE_Real *result);
-HYPRE_Int hypre_SeqVectorMassDotpTwo(hypre_Vector *x, hypre_Vector *y , hypre_Vector **z, HYPRE_Int k, HYPRE_Int unroll,  HYPRE_Real *result_x , HYPRE_Real *result_y);
-HYPRE_Int hypre_SeqVectorMassDotpTwo4(hypre_Vector *x, hypre_Vector *y , hypre_Vector **z, HYPRE_Int k, HYPRE_Real *result_x , HYPRE_Real *result_y);
-HYPRE_Int hypre_SeqVectorMassDotpTwo8(hypre_Vector *x, hypre_Vector *y , hypre_Vector **z, HYPRE_Int k,  HYPRE_Real *result_x , HYPRE_Real *result_y);
-HYPRE_Int hypre_SeqVectorMassAxpy(HYPRE_Complex *alpha, hypre_Vector **x, hypre_Vector *y, HYPRE_Int k, HYPRE_Int unroll);
-HYPRE_Int hypre_SeqVectorMassAxpy4(HYPRE_Complex *alpha, hypre_Vector **x, hypre_Vector *y, HYPRE_Int k);
-HYPRE_Int hypre_SeqVectorMassAxpy8(HYPRE_Complex *alpha, hypre_Vector **x, hypre_Vector *y, HYPRE_Int k);
+HYPRE_Int hypre_SeqVectorScaleHost( HYPRE_Complex alpha, hypre_Vector *y );
+HYPRE_Int hypre_SeqVectorAxpy ( HYPRE_Complex alpha, hypre_Vector *x, hypre_Vector *y );
+HYPRE_Int hypre_SeqVectorAxpyHost ( HYPRE_Complex alpha, hypre_Vector *x, hypre_Vector *y );
+HYPRE_Int hypre_SeqVectorAxpyz ( HYPRE_Complex alpha, hypre_Vector *x,
+                                 HYPRE_Complex beta, hypre_Vector *y,
+                                 hypre_Vector *z );
+HYPRE_Real hypre_SeqVectorInnerProd ( hypre_Vector *x, hypre_Vector *y );
+HYPRE_Real hypre_SeqVectorInnerProdHost ( hypre_Vector *x, hypre_Vector *y );
+HYPRE_Int hypre_SeqVectorMassInnerProd(hypre_Vector *x, hypre_Vector **y, HYPRE_Int k,
+                                       HYPRE_Int unroll, HYPRE_Real *result);
+HYPRE_Int hypre_SeqVectorMassInnerProd4(hypre_Vector *x, hypre_Vector **y, HYPRE_Int k,
+                                        HYPRE_Real *result);
+HYPRE_Int hypre_SeqVectorMassInnerProd8(hypre_Vector *x, hypre_Vector **y, HYPRE_Int k,
+                                        HYPRE_Real *result);
+HYPRE_Int hypre_SeqVectorMassDotpTwo(hypre_Vector *x, hypre_Vector *y, hypre_Vector **z,
+                                     HYPRE_Int k, HYPRE_Int unroll,  HYPRE_Real *result_x, HYPRE_Real *result_y);
+HYPRE_Int hypre_SeqVectorMassDotpTwo4(hypre_Vector *x, hypre_Vector *y, hypre_Vector **z,
+                                      HYPRE_Int k, HYPRE_Real *result_x, HYPRE_Real *result_y);
+HYPRE_Int hypre_SeqVectorMassDotpTwo8(hypre_Vector *x, hypre_Vector *y, hypre_Vector **z,
+                                      HYPRE_Int k,  HYPRE_Real *result_x, HYPRE_Real *result_y);
+HYPRE_Int hypre_SeqVectorMassAxpy(HYPRE_Complex *alpha, hypre_Vector **x, hypre_Vector *y,
+                                  HYPRE_Int k, HYPRE_Int unroll);
+HYPRE_Int hypre_SeqVectorMassAxpy4(HYPRE_Complex *alpha, hypre_Vector **x, hypre_Vector *y,
+                                   HYPRE_Int k);
+HYPRE_Int hypre_SeqVectorMassAxpy8(HYPRE_Complex *alpha, hypre_Vector **x, hypre_Vector *y,
+                                   HYPRE_Int k);
 HYPRE_Complex hypre_SeqVectorSumElts ( hypre_Vector *vector );
-HYPRE_Int hypre_SeqVectorPrefetch(hypre_Vector *x, HYPRE_MemoryLocation memory_location);
+HYPRE_Complex hypre_SeqVectorSumEltsHost ( hypre_Vector *vector );
 //HYPRE_Int hypre_SeqVectorMax( HYPRE_Complex alpha, hypre_Vector *x, HYPRE_Complex beta, hypre_Vector *y );
 
-HYPRE_Int hypreDevice_CSRSpAdd(HYPRE_Int ma, HYPRE_Int mb, HYPRE_Int n, HYPRE_Int nnzA, HYPRE_Int nnzB, HYPRE_Int *d_ia, HYPRE_Int *d_ja, HYPRE_Complex alpha, HYPRE_Complex *d_aa, HYPRE_Int *d_ja_map, HYPRE_Int *d_ib, HYPRE_Int *d_jb, HYPRE_Complex beta, HYPRE_Complex *d_ab, HYPRE_Int *d_jb_map, HYPRE_Int *d_num_b, HYPRE_Int *nnzC_out, HYPRE_Int **d_ic_out, HYPRE_Int **d_jc_out, HYPRE_Complex **d_ac_out);
+HYPRE_Int hypreDevice_CSRSpAdd(HYPRE_Int ma, HYPRE_Int mb, HYPRE_Int nnzA,
+                               HYPRE_Int nnzB, HYPRE_Int *d_ia, HYPRE_Int *d_ja, HYPRE_Complex alpha, HYPRE_Complex *d_aa,
+                               HYPRE_Int *d_ja_map, HYPRE_Int *d_ib, HYPRE_Int *d_jb, HYPRE_Complex beta, HYPRE_Complex *d_ab,
+                               HYPRE_Int *d_jb_map, HYPRE_Int *d_num_b, HYPRE_Int *nnzC_out, HYPRE_Int **d_ic_out,
+                               HYPRE_Int **d_jc_out, HYPRE_Complex **d_ac_out);
 
-HYPRE_Int hypreDevice_CSRSpTrans(HYPRE_Int m, HYPRE_Int n, HYPRE_Int nnzA, HYPRE_Int *d_ia, HYPRE_Int *d_ja, HYPRE_Complex *d_aa, HYPRE_Int **d_ic_out, HYPRE_Int **d_jc_out, HYPRE_Complex **d_ac_out, HYPRE_Int want_data);
+HYPRE_Int hypreDevice_CSRSpTrans(HYPRE_Int m, HYPRE_Int n, HYPRE_Int nnzA, HYPRE_Int *d_ia,
+                                 HYPRE_Int *d_ja, HYPRE_Complex *d_aa, HYPRE_Int **d_ic_out, HYPRE_Int **d_jc_out,
+                                 HYPRE_Complex **d_ac_out, HYPRE_Int want_data);
 
-HYPRE_Int hypreDevice_CSRSpTransCusparse(HYPRE_Int m, HYPRE_Int n, HYPRE_Int nnzA, HYPRE_Int *d_ia, HYPRE_Int *d_ja, HYPRE_Complex *d_aa, HYPRE_Int **d_ic_out, HYPRE_Int **d_jc_out, HYPRE_Complex **d_ac_out, HYPRE_Int want_data);
+HYPRE_Int hypreDevice_CSRSpTransCusparse(HYPRE_Int m, HYPRE_Int n, HYPRE_Int nnzA, HYPRE_Int *d_ia,
+                                         HYPRE_Int *d_ja, HYPRE_Complex *d_aa, HYPRE_Int **d_ic_out, HYPRE_Int **d_jc_out,
+                                         HYPRE_Complex **d_ac_out, HYPRE_Int want_data);
 
-HYPRE_Int hypreDevice_CSRSpTransRocsparse(HYPRE_Int m, HYPRE_Int n, HYPRE_Int nnzA, HYPRE_Int *d_ia, HYPRE_Int *d_ja, HYPRE_Complex *d_aa, HYPRE_Int **d_ic_out, HYPRE_Int **d_jc_out, HYPRE_Complex **d_ac_out, HYPRE_Int want_data);
+HYPRE_Int hypreDevice_CSRSpTransRocsparse(HYPRE_Int m, HYPRE_Int n, HYPRE_Int nnzA, HYPRE_Int *d_ia,
+                                          HYPRE_Int *d_ja, HYPRE_Complex *d_aa, HYPRE_Int **d_ic_out, HYPRE_Int **d_jc_out,
+                                          HYPRE_Complex **d_ac_out, HYPRE_Int want_data);
 
-HYPRE_Int hypreDevice_CSRSpGemm(hypre_CSRMatrix *A, hypre_CSRMatrix *B, hypre_CSRMatrix **C_ptr);
+HYPRE_Int hypreDevice_CSRSpTransOnemklsparse(HYPRE_Int m, HYPRE_Int n, HYPRE_Int nnzA,
+                                             HYPRE_Int *d_ia, HYPRE_Int *d_ja, HYPRE_Complex *d_aa, HYPRE_Int **d_ic_out, HYPRE_Int **d_jc_out,
+                                             HYPRE_Complex **d_ac_out, HYPRE_Int want_data);
 
-HYPRE_Int hypreDevice_CSRSpGemmRownnzEstimate(HYPRE_Int m, HYPRE_Int k, HYPRE_Int n, HYPRE_Int *d_ia, HYPRE_Int *d_ja, HYPRE_Int *d_ib, HYPRE_Int *d_jb, HYPRE_Int *d_rc);
-
-HYPRE_Int hypreDevice_CSRSpGemmRownnzUpperbound(HYPRE_Int m, HYPRE_Int k, HYPRE_Int n, HYPRE_Int *d_ia, HYPRE_Int *d_ja, HYPRE_Int *d_ib, HYPRE_Int *d_jb, HYPRE_Int in_rc, HYPRE_Int *d_rc, HYPRE_Int *d_rf);
-
-HYPRE_Int hypreDevice_CSRSpGemmRownnz(HYPRE_Int m, HYPRE_Int k, HYPRE_Int n, HYPRE_Int *d_ia, HYPRE_Int *d_ja, HYPRE_Int *d_ib, HYPRE_Int *d_jb, HYPRE_Int in_rc, HYPRE_Int *d_rc);
-
-HYPRE_Int hypreDevice_CSRSpGemmNumerWithRownnzUpperbound(HYPRE_Int m, HYPRE_Int k, HYPRE_Int n, HYPRE_Int *d_ia, HYPRE_Int *d_ja, HYPRE_Complex *d_a, HYPRE_Int *d_ib, HYPRE_Int *d_jb, HYPRE_Complex *d_b, HYPRE_Int *d_rc, HYPRE_Int exact_rownnz, HYPRE_Int **d_ic_out, HYPRE_Int **d_jc_out, HYPRE_Complex **d_c_out, HYPRE_Int *nnzC);
-
-HYPRE_Int hypreDevice_CSRSpGemmNumerWithRownnzEstimate(HYPRE_Int m, HYPRE_Int k, HYPRE_Int n, HYPRE_Int *d_ia, HYPRE_Int *d_ja, HYPRE_Complex *d_a, HYPRE_Int *d_ib, HYPRE_Int *d_jb, HYPRE_Complex *d_b, HYPRE_Int *d_rc, HYPRE_Int **d_ic_out, HYPRE_Int **d_jc_out, HYPRE_Complex **d_c_out, HYPRE_Int *nnzC);
+HYPRE_Int hypreDevice_CSRSpGemm(hypre_CSRMatrix *A, hypre_CSRMatrix *B, hypre_CSRMatrix **C_ptr);
 
-HYPRE_Int hypreDevice_CSRSpGemmCusparseGenericAPI(HYPRE_Int m, HYPRE_Int k, HYPRE_Int n, HYPRE_Int nnzA, HYPRE_Int *d_ia, HYPRE_Int *d_ja, HYPRE_Complex *d_a, HYPRE_Int nnzB, HYPRE_Int *d_ib, HYPRE_Int *d_jb, HYPRE_Complex *d_b, HYPRE_Int *nnzC_out, HYPRE_Int **d_ic_out, HYPRE_Int **d_jc_out, HYPRE_Complex **d_c_out);
+HYPRE_Int hypreDevice_CSRSpGemmCusparseGenericAPI(HYPRE_Int m, HYPRE_Int k, HYPRE_Int n,
+                                                  HYPRE_Int nnzA, HYPRE_Int *d_ia, HYPRE_Int *d_ja, HYPRE_Complex *d_a, HYPRE_Int nnzB,
+                                                  HYPRE_Int *d_ib, HYPRE_Int *d_jb, HYPRE_Complex *d_b, HYPRE_Int *nnzC_out, HYPRE_Int **d_ic_out,
+                                                  HYPRE_Int **d_jc_out, HYPRE_Complex **d_c_out);
 
 HYPRE_Int hypre_SeqVectorElmdivpy( hypre_Vector *x, hypre_Vector *b, hypre_Vector *y );
-HYPRE_Int hypre_SeqVectorElmdivpyMarked( hypre_Vector *x, hypre_Vector *b, hypre_Vector *y, HYPRE_Int *marker, HYPRE_Int marker_val );
-
-HYPRE_Int hypre_CSRMatrixSpMVDevice( HYPRE_Complex alpha, hypre_CSRMatrix *A, hypre_Vector *x, HYPRE_Complex beta, hypre_Vector *y, HYPRE_Int fill );
-
-#if defined(HYPRE_USING_CUSPARSE) || defined(HYPRE_USING_ROCSPARSE)
+HYPRE_Int hypre_SeqVectorElmdivpyMarked( hypre_Vector *x, hypre_Vector *b, hypre_Vector *y,
+                                         HYPRE_Int *marker, HYPRE_Int marker_val );
+HYPRE_Int hypre_SeqVectorElmdivpyHost( hypre_Vector *x, hypre_Vector *b, hypre_Vector *y,
+                                       HYPRE_Int *marker, HYPRE_Int marker_val );
+HYPRE_Int hypre_CSRMatrixSpMVDevice( HYPRE_Int trans, HYPRE_Complex alpha, hypre_CSRMatrix *A,
+                                     hypre_Vector *x,
+                                     HYPRE_Complex beta, hypre_Vector *y, HYPRE_Int fill );
+
+HYPRE_Int hypre_CSRMatrixIntSpMVDevice( HYPRE_Int num_rows, HYPRE_Int num_nonzeros,
+                                        HYPRE_Int alpha, HYPRE_Int *d_ia, HYPRE_Int *d_ja,
+                                        HYPRE_Int *d_a, HYPRE_Int *d_x, HYPRE_Int beta,
+                                        HYPRE_Int *d_y );
+
+#if defined(HYPRE_USING_CUSPARSE)  ||\
+    defined(HYPRE_USING_ROCSPARSE) ||\
+    defined(HYPRE_USING_ONEMKLSPARSE)
 hypre_CsrsvData* hypre_CsrsvDataCreate();
-void hypre_CsrsvDataDestroy(hypre_CsrsvData *data);
+HYPRE_Int hypre_CsrsvDataDestroy(hypre_CsrsvData *data);
 hypre_GpuMatData* hypre_GpuMatDataCreate();
-void hypre_GpuMatDataDestroy(hypre_GpuMatData *data);
+HYPRE_Int hypre_GPUMatDataSetCSRData(hypre_CSRMatrix *matrix);
+HYPRE_Int hypre_GpuMatDataDestroy(hypre_GpuMatData *data);
 hypre_GpuMatData* hypre_CSRMatrixGetGPUMatData(hypre_CSRMatrix *matrix);
-#define hypre_CSRMatrixGPUMatDescr(matrix) ( hypre_GpuMatDataMatDecsr(hypre_CSRMatrixGetGPUMatData(matrix)) )
-#define hypre_CSRMatrixGPUMatInfo(matrix)  ( hypre_GpuMatDataMatInfo (hypre_CSRMatrixGetGPUMatData(matrix)) )
+
+#define hypre_CSRMatrixGPUMatDescr(matrix)       ( hypre_GpuMatDataMatDescr(hypre_CSRMatrixGetGPUMatData(matrix)) )
+#define hypre_CSRMatrixGPUMatInfo(matrix)        ( hypre_GpuMatDataMatInfo (hypre_CSRMatrixGetGPUMatData(matrix)) )
+#define hypre_CSRMatrixGPUMatHandle(matrix)      ( hypre_GpuMatDataMatHandle (hypre_CSRMatrixGetGPUMatData(matrix)) )
+#define hypre_CSRMatrixGPUMatSpMVBuffer(matrix)  ( hypre_GpuMatDataSpMVBuffer (hypre_CSRMatrixGetGPUMatData(matrix)) )
 #endif
-void hypre_CSRMatrixGpuSpMVAnalysis(hypre_CSRMatrix *matrix);
+
+HYPRE_Int hypre_CSRMatrixSpMVAnalysisDevice(hypre_CSRMatrix *matrix);
+
+/* vector_device.c */
+HYPRE_Int hypre_SeqVectorSetConstantValuesDevice ( hypre_Vector *v, HYPRE_Complex value );
+HYPRE_Int hypre_SeqVectorScaleDevice( HYPRE_Complex alpha, hypre_Vector *y );
+HYPRE_Int hypre_SeqVectorAxpyDevice ( HYPRE_Complex alpha, hypre_Vector *x, hypre_Vector *y );
+HYPRE_Int hypre_SeqVectorAxpyzDevice ( HYPRE_Complex alpha, hypre_Vector *x,
+                                       HYPRE_Complex beta, hypre_Vector *y,
+                                       hypre_Vector *z );
+HYPRE_Int hypre_SeqVectorElmdivpyDevice( hypre_Vector *x, hypre_Vector *b, hypre_Vector *y,
+                                         HYPRE_Int *marker, HYPRE_Int marker_val );
+HYPRE_Real hypre_SeqVectorInnerProdDevice ( hypre_Vector *x, hypre_Vector *y );
+HYPRE_Complex hypre_SeqVectorSumEltsDevice ( hypre_Vector *vector );
+HYPRE_Int hypre_SeqVectorStridedCopyDevice( hypre_Vector *vector,
+                                            HYPRE_Int istride, HYPRE_Int ostride,
+                                            HYPRE_Int size, HYPRE_Complex *data );
+HYPRE_Int hypre_SeqVectorPrefetch(hypre_Vector *x, HYPRE_MemoryLocation memory_location);
 
 #ifdef __cplusplus
 }
diff --git a/external/hypre/src/seq_mv/seq_mv.hpp b/external/hypre/src/seq_mv/seq_mv.hpp
index 00fa5320..273e9650 100644
--- a/external/hypre/src/seq_mv/seq_mv.hpp
+++ b/external/hypre/src/seq_mv/seq_mv.hpp
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -12,44 +12,60 @@ extern "C" {
 #endif
 
 #if defined(HYPRE_USING_CUSPARSE)
+#if CUSPARSE_VERSION >= CUSPARSE_NEWAPI_VERSION
 cusparseSpMatDescr_t hypre_CSRMatrixToCusparseSpMat(const hypre_CSRMatrix *A, HYPRE_Int offset);
 
-cusparseSpMatDescr_t hypre_CSRMatrixToCusparseSpMat_core(HYPRE_Int n, HYPRE_Int m, HYPRE_Int offset,
-                                                         HYPRE_Int nnz, HYPRE_Int *i, HYPRE_Int *j,
-                                                         HYPRE_Complex *data);
+cusparseSpMatDescr_t hypre_CSRMatrixToCusparseSpMat_core( HYPRE_Int n, HYPRE_Int m,
+                                                          HYPRE_Int offset, HYPRE_Int nnz, HYPRE_Int *i, HYPRE_Int *j, HYPRE_Complex *data);
+
+cusparseDnVecDescr_t hypre_VectorToCusparseDnVec_core(HYPRE_Complex *x_data, HYPRE_Int n);
 
 cusparseDnVecDescr_t hypre_VectorToCusparseDnVec(const hypre_Vector *x, HYPRE_Int offset,
                                                  HYPRE_Int size_override);
 
+cusparseDnMatDescr_t hypre_VectorToCusparseDnMat_core(HYPRE_Complex *x_data, HYPRE_Int nrow,
+                                                      HYPRE_Int ncol, HYPRE_Int order);
+
+cusparseDnMatDescr_t hypre_VectorToCusparseDnMat(const hypre_Vector *x);
+#endif
+
 HYPRE_Int hypreDevice_CSRSpGemmCusparseOldAPI(HYPRE_Int m, HYPRE_Int k, HYPRE_Int n,
-                                              cusparseMatDescr_t descr_A, HYPRE_Int nnzA, HYPRE_Int *d_ia,
-                                              HYPRE_Int *d_ja, HYPRE_Complex *d_a, cusparseMatDescr_t descr_B,
-                                              HYPRE_Int nnzB, HYPRE_Int *d_ib, HYPRE_Int *d_jb,
-                                              HYPRE_Complex *d_b, cusparseMatDescr_t descr_C,
-                                              HYPRE_Int *nnzC_out, HYPRE_Int **d_ic_out, HYPRE_Int **d_jc_out,
+                                              cusparseMatDescr_t descr_A, HYPRE_Int nnzA, HYPRE_Int *d_ia, HYPRE_Int *d_ja, HYPRE_Complex *d_a,
+                                              cusparseMatDescr_t descr_B, HYPRE_Int nnzB, HYPRE_Int *d_ib, HYPRE_Int *d_jb, HYPRE_Complex *d_b,
+                                              cusparseMatDescr_t descr_C, HYPRE_Int *nnzC_out, HYPRE_Int **d_ic_out, HYPRE_Int **d_jc_out,
                                               HYPRE_Complex **d_c_out);
 
-HYPRE_Int hypreDevice_CSRSpGemmCusparse(HYPRE_Int m, HYPRE_Int k, HYPRE_Int n, cusparseMatDescr_t descr_A,
-                                        HYPRE_Int nnzA, HYPRE_Int *d_ia, HYPRE_Int *d_ja, HYPRE_Complex *d_a,
-                                        cusparseMatDescr_t descr_B, HYPRE_Int nnzB, HYPRE_Int *d_ib,
-                                        HYPRE_Int *d_jb, HYPRE_Complex *d_b, cusparseMatDescr_t descr_C,
-                                        HYPRE_Int *nnzC_out, HYPRE_Int **d_ic_out, HYPRE_Int **d_jc_out,
+HYPRE_Int hypreDevice_CSRSpGemmCusparse(HYPRE_Int m, HYPRE_Int k, HYPRE_Int n,
+                                        cusparseMatDescr_t descr_A, HYPRE_Int nnzA, HYPRE_Int *d_ia, HYPRE_Int *d_ja, HYPRE_Complex *d_a,
+                                        cusparseMatDescr_t descr_B, HYPRE_Int nnzB, HYPRE_Int *d_ib, HYPRE_Int *d_jb, HYPRE_Complex *d_b,
+                                        cusparseMatDescr_t descr_C, HYPRE_Int *nnzC_out, HYPRE_Int **d_ic_out, HYPRE_Int **d_jc_out,
                                         HYPRE_Complex **d_c_out);
 
-void hypre_SortCSRCusparse(HYPRE_Int n, HYPRE_Int m, HYPRE_Int nnzA, cusparseMatDescr_t descrA,
-                           const HYPRE_Int *d_ia, HYPRE_Int *d_ja_sorted, HYPRE_Complex *d_a_sorted);
+HYPRE_Int hypre_SortCSRCusparse( HYPRE_Int n, HYPRE_Int m, HYPRE_Int nnzA,
+                                 cusparseMatDescr_t descrA,
+                                 const HYPRE_Int *d_ia, HYPRE_Int *d_ja_sorted, HYPRE_Complex *d_a_sorted );
 #endif
 
 #if defined(HYPRE_USING_ROCSPARSE)
-HYPRE_Int hypreDevice_CSRSpGemmRocsparse(HYPRE_Int m, HYPRE_Int k, HYPRE_Int n, rocsparse_mat_descr descrA,
-                                         HYPRE_Int nnzA, HYPRE_Int *d_ia, HYPRE_Int *d_ja, HYPRE_Complex *d_a,
-                                         rocsparse_mat_descr descrB, HYPRE_Int nnzB, HYPRE_Int *d_ib,
-                                         HYPRE_Int *d_jb, HYPRE_Complex *d_b, rocsparse_mat_descr descrC,
-                                         rocsparse_mat_info infoC, HYPRE_Int *nnzC_out, HYPRE_Int **d_ic_out,
+HYPRE_Int hypreDevice_CSRSpGemmRocsparse(HYPRE_Int m, HYPRE_Int k, HYPRE_Int n,
+                                         rocsparse_mat_descr descrA, HYPRE_Int nnzA, HYPRE_Int *d_ia, HYPRE_Int *d_ja, HYPRE_Complex *d_a,
+                                         rocsparse_mat_descr descrB, HYPRE_Int nnzB, HYPRE_Int *d_ib, HYPRE_Int *d_jb, HYPRE_Complex *d_b,
+                                         rocsparse_mat_descr descrC, rocsparse_mat_info infoC, HYPRE_Int *nnzC_out, HYPRE_Int **d_ic_out,
                                          HYPRE_Int **d_jc_out, HYPRE_Complex **d_c_out);
 
-void hypre_SortCSRRocsparse(HYPRE_Int n, HYPRE_Int m, HYPRE_Int nnzA, rocsparse_mat_descr descrA,
-                            const HYPRE_Int *d_ia, HYPRE_Int *d_ja_sorted, HYPRE_Complex *d_a_sorted);
+HYPRE_Int hypre_SortCSRRocsparse( HYPRE_Int n, HYPRE_Int m, HYPRE_Int nnzA,
+                                  rocsparse_mat_descr descrA,
+                                  const HYPRE_Int *d_ia, HYPRE_Int *d_ja_sorted, HYPRE_Complex *d_a_sorted );
+#endif
+
+#if defined(HYPRE_USING_ONEMKLSPARSE)
+HYPRE_Int hypreDevice_CSRSpGemmOnemklsparse(HYPRE_Int m, HYPRE_Int k, HYPRE_Int n,
+                                            oneapi::mkl::sparse::matrix_handle_t handle_A,
+                                            HYPRE_Int nnzA, HYPRE_Int *d_ia, HYPRE_Int *d_ja, HYPRE_Complex *d_a,
+                                            oneapi::mkl::sparse::matrix_handle_t handle_B,
+                                            HYPRE_Int nnzB, HYPRE_Int *d_ib, HYPRE_Int *d_jb, HYPRE_Complex *d_b,
+                                            oneapi::mkl::sparse::matrix_handle_t handle_C,
+                                            HYPRE_Int *nnzC_out, HYPRE_Int **d_ic_out, HYPRE_Int **d_jc_out, HYPRE_Complex **d_c_out);
 #endif
 
 #ifdef __cplusplus
diff --git a/external/hypre/src/seq_mv/vector.c b/external/hypre/src/seq_mv/vector.c
index d56c9d00..d74b37f2 100644
--- a/external/hypre/src/seq_mv/vector.c
+++ b/external/hypre/src/seq_mv/vector.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -12,7 +12,6 @@
  *****************************************************************************/
 
 #include "seq_mv.h"
-#include "_hypre_utilities.hpp" //RL: TODO vector_device.c, include cuda there
 
 /*--------------------------------------------------------------------------
  * hypre_SeqVectorCreate
@@ -59,13 +58,11 @@ hypre_SeqMultiVectorCreate( HYPRE_Int size, HYPRE_Int num_vectors )
 HYPRE_Int
 hypre_SeqVectorDestroy( hypre_Vector *vector )
 {
-   HYPRE_Int ierr=0;
-
    if (vector)
    {
       HYPRE_MemoryLocation memory_location = hypre_VectorMemoryLocation(vector);
 
-      if ( hypre_VectorOwnsData(vector) )
+      if (hypre_VectorOwnsData(vector))
       {
          hypre_TFree(hypre_VectorData(vector), memory_location);
       }
@@ -73,58 +70,101 @@ hypre_SeqVectorDestroy( hypre_Vector *vector )
       hypre_TFree(vector, HYPRE_MEMORY_HOST);
    }
 
-   return ierr;
+   return hypre_error_flag;
 }
 
 /*--------------------------------------------------------------------------
- * hypre_SeqVectorInitialize
+ * hypre_SeqVectorInitializeShell
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_SeqVectorInitialize_v2( hypre_Vector *vector, HYPRE_MemoryLocation memory_location )
+hypre_SeqVectorInitializeShell( hypre_Vector *vector )
 {
    HYPRE_Int  size = hypre_VectorSize(vector);
-   HYPRE_Int  ierr = 0;
    HYPRE_Int  num_vectors = hypre_VectorNumVectors(vector);
    HYPRE_Int  multivec_storage_method = hypre_VectorMultiVecStorageMethod(vector);
 
-   hypre_VectorMemoryLocation(vector) = memory_location;
-
-   /* Caveat: for pre-existing data, the memory location must be guaranteed
-    * to be consistent with `memory_location'
-    * Otherwise, mismatches will exist and problems will be encountered
-    * when being used, and freed */
-   if ( !hypre_VectorData(vector) )
-   {
-      hypre_VectorData(vector) = hypre_CTAlloc(HYPRE_Complex, num_vectors*size, memory_location);
-   }
-
-   if ( multivec_storage_method == 0 )
+   if (multivec_storage_method == 0)
    {
       hypre_VectorVectorStride(vector) = size;
-      hypre_VectorIndexStride(vector) = 1;
+      hypre_VectorIndexStride(vector)  = 1;
    }
-   else if ( multivec_storage_method == 1 )
+   else if (multivec_storage_method == 1)
    {
       hypre_VectorVectorStride(vector) = 1;
-      hypre_VectorIndexStride(vector) = num_vectors;
+      hypre_VectorIndexStride(vector)  = num_vectors;
    }
    else
    {
-      ++ierr;
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Invalid multivec storage method!\n");
+      return hypre_error_flag;
    }
 
-   return ierr;
+   return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_SeqVectorSetData
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_SeqVectorInitialize( hypre_Vector *vector )
+hypre_SeqVectorSetData( hypre_Vector  *vector,
+                        HYPRE_Complex *data )
+{
+   /* Free data array if already present */
+   if (hypre_VectorData(vector) && hypre_VectorOwnsData(vector))
+   {
+      hypre_TFree(hypre_VectorData(vector), hypre_VectorMemoryLocation(vector));
+   }
+
+   /* Set data pointer passed via input  */
+   hypre_VectorData(vector) = data;
+
+   /* Remove data pointer ownership */
+   hypre_VectorOwnsData(vector) = 0;
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_SeqVectorInitialize_v2
+ *
+ * Initialize a vector at a given memory location
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_SeqVectorInitialize_v2( hypre_Vector         *vector,
+                              HYPRE_MemoryLocation  memory_location )
 {
-   HYPRE_Int ierr;
+   HYPRE_Int  size        = hypre_VectorSize(vector);
+   HYPRE_Int  num_vectors = hypre_VectorNumVectors(vector);
+
+   /* Set up the basic structure and metadata for the local vector */
+   hypre_SeqVectorInitializeShell(vector);
+
+   /* Set memory location */
+   hypre_VectorMemoryLocation(vector) = memory_location;
 
-   ierr = hypre_SeqVectorInitialize_v2( vector, hypre_VectorMemoryLocation(vector) );
+   /* Caveat: for pre-existing data, the memory location must be guaranteed
+    * to be consistent with `memory_location'
+    * Otherwise, mismatches will exist and problems will be encountered
+    * when being used, and freed */
+   if (!hypre_VectorData(vector))
+   {
+      hypre_VectorData(vector) = hypre_CTAlloc(HYPRE_Complex, num_vectors * size, memory_location);
+   }
 
-   return ierr;
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_SeqVectorInitialize
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_SeqVectorInitialize( hypre_Vector *vector )
+{
+   return hypre_SeqVectorInitialize_v2(vector, hypre_VectorMemoryLocation(vector));
 }
 
 /*--------------------------------------------------------------------------
@@ -133,17 +173,77 @@ hypre_SeqVectorInitialize( hypre_Vector *vector )
 
 HYPRE_Int
 hypre_SeqVectorSetDataOwner( hypre_Vector *vector,
-                             HYPRE_Int     owns_data   )
+                             HYPRE_Int     owns_data )
 {
-   HYPRE_Int    ierr=0;
-
    hypre_VectorOwnsData(vector) = owns_data;
 
-   return ierr;
+   return hypre_error_flag;
 }
 
 /*--------------------------------------------------------------------------
- * ReadVector
+ * hypre_SeqVectorSetSize
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_SeqVectorSetSize( hypre_Vector *vector,
+                        HYPRE_Int     size   )
+{
+   HYPRE_Int  multivec_storage_method = hypre_VectorMultiVecStorageMethod(vector);
+
+   hypre_VectorSize(vector) = size;
+   if (multivec_storage_method == 0)
+   {
+      hypre_VectorVectorStride(vector) = size;
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_SeqVectorResize
+ *
+ * Resize a sequential vector when changing its number of components.
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_SeqVectorResize( hypre_Vector *vector,
+                       HYPRE_Int     num_vectors_in )
+{
+   HYPRE_Int  method        = hypre_VectorMultiVecStorageMethod(vector);
+   HYPRE_Int  size          = hypre_VectorSize(vector);
+   HYPRE_Int  num_vectors   = hypre_VectorNumVectors(vector);
+   HYPRE_Int  total_size    = num_vectors * size;
+   HYPRE_Int  total_size_in = num_vectors_in * size;
+
+   /* Reallocate data array */
+   if (total_size_in > total_size)
+   {
+      hypre_VectorData(vector) = hypre_TReAlloc_v2(hypre_VectorData(vector),
+                                                   HYPRE_Complex,
+                                                   total_size,
+                                                   HYPRE_Complex,
+                                                   total_size_in,
+                                                   hypre_VectorMemoryLocation(vector));
+   }
+
+   /* Update vector info */
+   hypre_VectorNumVectors(vector) = num_vectors_in;
+   if (method == 0)
+   {
+      hypre_VectorVectorStride(vector) = size;
+      hypre_VectorIndexStride(vector)  = 1;
+   }
+   else if (method == 1)
+   {
+      hypre_VectorVectorStride(vector) = 1;
+      hypre_VectorIndexStride(vector)  = num_vectors;
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_SeqVectorRead
  *--------------------------------------------------------------------------*/
 
 hypre_Vector *
@@ -194,7 +294,7 @@ HYPRE_Int
 hypre_SeqVectorPrint( hypre_Vector *vector,
                       char         *file_name )
 {
-   FILE    *fp;
+   FILE          *fp;
 
    HYPRE_Complex *data;
    HYPRE_Int      size, num_vectors, vecstride, idxstride;
@@ -202,8 +302,6 @@ hypre_SeqVectorPrint( hypre_Vector *vector,
    HYPRE_Int      i, j;
    HYPRE_Complex  value;
 
-   HYPRE_Int      ierr = 0;
-
    num_vectors = hypre_VectorNumVectors(vector);
    vecstride = hypre_VectorVectorStride(vector);
    idxstride = hypre_VectorIndexStride(vector);
@@ -226,14 +324,14 @@ hypre_SeqVectorPrint( hypre_Vector *vector,
       hypre_fprintf(fp, "%d vectors of size %d\n", num_vectors, size );
    }
 
-   if ( num_vectors>1 )
+   if ( num_vectors > 1 )
    {
-      for ( j=0; j<num_vectors; ++j )
+      for ( j = 0; j < num_vectors; ++j )
       {
          hypre_fprintf(fp, "vector %d\n", j );
          for (i = 0; i < size; i++)
          {
-            value = data[ j*vecstride + i*idxstride ];
+            value = data[ j * vecstride + i * idxstride ];
 #ifdef HYPRE_COMPLEX
             hypre_fprintf(fp, "%.14e , %.14e\n",
                           hypre_creal(value), hypre_cimag(value));
@@ -258,7 +356,32 @@ hypre_SeqVectorPrint( hypre_Vector *vector,
 
    fclose(fp);
 
-   return ierr;
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_SeqVectorSetConstantValuesHost
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_SeqVectorSetConstantValuesHost( hypre_Vector *v,
+                                      HYPRE_Complex value )
+{
+   HYPRE_Complex *vector_data = hypre_VectorData(v);
+   HYPRE_Int      num_vectors = hypre_VectorNumVectors(v);
+   HYPRE_Int      size        = hypre_VectorSize(v);
+   HYPRE_Int      total_size  = size * num_vectors;
+   HYPRE_Int      i;
+
+#if defined(HYPRE_USING_OPENMP)
+   #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+#endif
+   for (i = 0; i < total_size; i++)
+   {
+      vector_data[i] = value;
+   }
+
+   return hypre_error_flag;
 }
 
 /*--------------------------------------------------------------------------
@@ -273,47 +396,40 @@ hypre_SeqVectorSetConstantValues( hypre_Vector *v,
    hypre_profile_times[HYPRE_TIMER_ID_BLAS1] -= hypre_MPI_Wtime();
 #endif
 
-   HYPRE_Complex *vector_data = hypre_VectorData(v);
-   HYPRE_Int      size        = hypre_VectorSize(v);
-   HYPRE_Int      ierr  = 0;
+   HYPRE_Int   num_vectors = hypre_VectorNumVectors(v);
+   HYPRE_Int   size        = hypre_VectorSize(v);
+   HYPRE_Int   total_size  = size * num_vectors;
 
-   size *= hypre_VectorNumVectors(v);
+   /* Trivial case */
+   if (total_size <= 0)
+   {
+      return hypre_error_flag;
+   }
 
-   //hypre_SeqVectorPrefetch(v, HYPRE_MEMORY_DEVICE);
+#if defined(HYPRE_USING_GPU) || defined(HYPRE_USING_DEVICE_OPENMP)
+   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1(hypre_VectorMemoryLocation(v));
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-   if (size > 0)
+   if (exec == HYPRE_EXEC_DEVICE)
    {
-      HYPRE_THRUST_CALL( fill_n, vector_data, size, value );
+      hypre_SeqVectorSetConstantValuesDevice(v, value);
    }
-#else
-   HYPRE_Int i;
-#if defined(HYPRE_USING_DEVICE_OPENMP)
-#pragma omp target teams distribute parallel for private(i) is_device_ptr(vector_data)
-#elif defined(HYPRE_USING_OPENMP)
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+   else
 #endif
-   for (i = 0; i < size; i++)
    {
-      vector_data[i] = value;
+      hypre_SeqVectorSetConstantValuesHost(v, value);
    }
-#endif /* defined(HYPRE_USING_CUDA)  || defined(HYPRE_USING_HIP) */
-
-#if defined(HYPRE_USING_GPU)
-   hypre_SyncCudaComputeStream(hypre_handle());
-#endif
 
 #ifdef HYPRE_PROFILE
    hypre_profile_times[HYPRE_TIMER_ID_BLAS1] += hypre_MPI_Wtime();
 #endif
 
-   return ierr;
+   return hypre_error_flag;
 }
 
 /*--------------------------------------------------------------------------
  * hypre_SeqVectorSetRandomValues
  *
- *     returns vector of values randomly distributed between -1.0 and +1.0
+ * returns vector of values randomly distributed between -1.0 and +1.0
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
@@ -323,9 +439,8 @@ hypre_SeqVectorSetRandomValues( hypre_Vector *v,
    HYPRE_Complex *vector_data = hypre_VectorData(v);
    HYPRE_Int      size        = hypre_VectorSize(v);
    HYPRE_Int      i;
-   HYPRE_Int      ierr  = 0;
-   hypre_SeedRand(seed);
 
+   hypre_SeedRand(seed);
    size *= hypre_VectorNumVectors(v);
 
    if (hypre_GetActualMemLocation(hypre_VectorMemoryLocation(v)) == hypre_MEMORY_HOST)
@@ -343,11 +458,12 @@ hypre_SeqVectorSetRandomValues( hypre_Vector *v,
       {
          h_data[i] = 2.0 * hypre_Rand() - 1.0;
       }
-      hypre_TMemcpy(vector_data, h_data, HYPRE_Complex, size, hypre_VectorMemoryLocation(v), HYPRE_MEMORY_HOST);
+      hypre_TMemcpy(vector_data, h_data, HYPRE_Complex, size, hypre_VectorMemoryLocation(v),
+                    HYPRE_MEMORY_HOST);
       hypre_TFree(h_data, HYPRE_MEMORY_HOST);
    }
 
-   return ierr;
+   return hypre_error_flag;
 }
 
 /*--------------------------------------------------------------------------
@@ -356,6 +472,7 @@ hypre_SeqVectorSetRandomValues( hypre_Vector *v,
  * if size of x is larger than y only the first size_y elements of x are
  * copied to y
  *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_SeqVectorCopy( hypre_Vector *x,
                      hypre_Vector *y )
@@ -364,9 +481,9 @@ hypre_SeqVectorCopy( hypre_Vector *x,
    hypre_profile_times[HYPRE_TIMER_ID_BLAS1] -= hypre_MPI_Wtime();
 #endif
 
-   HYPRE_Int ierr = 0;
+   hypre_GpuProfilingPushRange("SeqVectorCopy");
 
-   size_t size = hypre_min( hypre_VectorSize(x), hypre_VectorSize(y) ) * hypre_VectorNumVectors(x);
+   size_t size = hypre_min(hypre_VectorSize(x), hypre_VectorSize(y)) * hypre_VectorNumVectors(x);
 
    hypre_TMemcpy( hypre_VectorData(y),
                   hypre_VectorData(x),
@@ -378,13 +495,74 @@ hypre_SeqVectorCopy( hypre_Vector *x,
 #ifdef HYPRE_PROFILE
    hypre_profile_times[HYPRE_TIMER_ID_BLAS1] += hypre_MPI_Wtime();
 #endif
+   hypre_GpuProfilingPopRange();
 
-   return ierr;
+   return hypre_error_flag;
 }
 
 /*--------------------------------------------------------------------------
- * hypre_SeqVectorCloneDeep
- * Returns a complete copy of x - a deep copy, with its own copy of the data.
+ * hypre_SeqVectorStridedCopy
+ *
+ * Perform strided copy from a data array to x->data.
+ *
+ * We assume that the data array lives in the same memory location as x->data
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_SeqVectorStridedCopy( hypre_Vector  *x,
+                            HYPRE_Int      istride,
+                            HYPRE_Int      ostride,
+                            HYPRE_Int      size,
+                            HYPRE_Complex *data)
+{
+   HYPRE_Int        x_size = hypre_VectorSize(x);
+   HYPRE_Complex   *x_data = hypre_VectorData(x);
+
+   HYPRE_Int        i;
+
+   /* Sanity checks */
+   if (istride < 1)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Input stride needs to be greater than zero!");
+      return hypre_error_flag;
+   }
+
+   if (ostride < 1)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Output stride needs to be greater than zero!");
+      return hypre_error_flag;
+   }
+
+   if (x_size < (size / istride) * ostride)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Not enough space in x!");
+      return hypre_error_flag;
+   }
+
+#if defined(HYPRE_USING_GPU)
+   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1(hypre_VectorMemoryLocation(x));
+
+   if (exec == HYPRE_EXEC_DEVICE)
+   {
+      hypre_SeqVectorStridedCopyDevice(x, istride, ostride, size, data);
+   }
+   else
+#endif
+   {
+#if defined(HYPRE_USING_OPENMP)
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+#endif
+      for (i = 0; i < size; i += istride)
+      {
+         x_data[(i / istride) * ostride] = data[i];
+      }
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_SeqVectorCloneDeep_v2
  *--------------------------------------------------------------------------*/
 
 hypre_Vector*
@@ -405,6 +583,12 @@ hypre_SeqVectorCloneDeep_v2( hypre_Vector *x, HYPRE_MemoryLocation memory_locati
    return y;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_SeqVectorCloneDeep
+ *
+ * Returns a complete copy of x - a deep copy, with its own copy of the data.
+ *--------------------------------------------------------------------------*/
+
 hypre_Vector*
 hypre_SeqVectorCloneDeep( hypre_Vector *x )
 {
@@ -413,15 +597,16 @@ hypre_SeqVectorCloneDeep( hypre_Vector *x )
 
 /*--------------------------------------------------------------------------
  * hypre_SeqVectorCloneShallow
+ *
  * Returns a complete copy of x - a shallow copy, pointing the data of x
  *--------------------------------------------------------------------------*/
 
 hypre_Vector *
 hypre_SeqVectorCloneShallow( hypre_Vector *x )
 {
-   HYPRE_Int      size   = hypre_VectorSize(x);
-   HYPRE_Int      num_vectors   = hypre_VectorNumVectors(x);
-   hypre_Vector * y = hypre_SeqMultiVectorCreate( size, num_vectors );
+   HYPRE_Int     size         = hypre_VectorSize(x);
+   HYPRE_Int     num_vectors  = hypre_VectorNumVectors(x);
+   hypre_Vector *y            = hypre_SeqMultiVectorCreate(size, num_vectors);
 
    hypre_VectorMultiVecStorageMethod(y) = hypre_VectorMultiVecStorageMethod(x);
    hypre_VectorVectorStride(y) = hypre_VectorVectorStride(x);
@@ -430,23 +615,93 @@ hypre_SeqVectorCloneShallow( hypre_Vector *x )
    hypre_VectorMemoryLocation(y) = hypre_VectorMemoryLocation(x);
 
    hypre_VectorData(y) = hypre_VectorData(x);
-   hypre_SeqVectorSetDataOwner( y, 0 );
+   hypre_SeqVectorSetDataOwner(y, 0);
    hypre_SeqVectorInitialize(y);
 
    return y;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_SeqVectorMigrate
+ *
+ * Migrates the vector data to memory_location.
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_SeqVectorMigrate(hypre_Vector         *x,
+                       HYPRE_MemoryLocation  memory_location )
+{
+   HYPRE_Complex       *data = hypre_VectorData(x);
+   HYPRE_Int            size = hypre_VectorSize(x);
+   HYPRE_Int            num_vectors = hypre_VectorNumVectors(x);
+   HYPRE_MemoryLocation old_memory_location = hypre_VectorMemoryLocation(x);
+   HYPRE_Int            total_size = size * num_vectors;
+
+   /* Update x's memory location */
+   hypre_VectorMemoryLocation(x) = memory_location;
+
+   if ( hypre_GetActualMemLocation(memory_location) !=
+        hypre_GetActualMemLocation(old_memory_location) )
+   {
+      if (data)
+      {
+         HYPRE_Complex *new_data;
+
+         new_data = hypre_TAlloc(HYPRE_Complex, total_size, memory_location);
+         hypre_TMemcpy(new_data, data, HYPRE_Complex, total_size,
+                       memory_location, old_memory_location);
+         hypre_VectorData(x) = new_data;
+         hypre_VectorOwnsData(x) = 1;
+
+         /* Free old data */
+         hypre_TFree(data, old_memory_location);
+      }
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_SeqVectorScaleHost
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_SeqVectorScaleHost( HYPRE_Complex alpha,
+                          hypre_Vector *y )
+{
+   HYPRE_Complex *y_data      = hypre_VectorData(y);
+   HYPRE_Int      num_vectors = hypre_VectorNumVectors(y);
+   HYPRE_Int      size        = hypre_VectorSize(y);
+   HYPRE_Int      total_size  = size * num_vectors;
+   HYPRE_Int      i;
+
+#if defined(HYPRE_USING_OPENMP)
+   #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+#endif
+   for (i = 0; i < total_size; i++)
+   {
+      y_data[i] *= alpha;
+   }
+
+   return hypre_error_flag;
+}
+
 /*--------------------------------------------------------------------------
  * hypre_SeqVectorScale
  *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_SeqVectorScale( HYPRE_Complex alpha,
                       hypre_Vector *y )
 {
+#ifdef HYPRE_PROFILE
+   hypre_profile_times[HYPRE_TIMER_ID_BLAS1] -= hypre_MPI_Wtime();
+#endif
+
    /* special cases */
    if (alpha == 1.0)
    {
-      return 0;
+      return hypre_error_flag;
    }
 
    if (alpha == 0.0)
@@ -454,52 +709,57 @@ hypre_SeqVectorScale( HYPRE_Complex alpha,
       return hypre_SeqVectorSetConstantValues(y, 0.0);
    }
 
+#if defined(HYPRE_USING_GPU)
+   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1(hypre_VectorMemoryLocation(y));
+
+   if (exec == HYPRE_EXEC_DEVICE)
+   {
+      hypre_SeqVectorScaleDevice(alpha, y);
+   }
+   else
+#endif
+   {
+      hypre_SeqVectorScaleHost(alpha, y);
+   }
+
 #ifdef HYPRE_PROFILE
-   hypre_profile_times[HYPRE_TIMER_ID_BLAS1] -= hypre_MPI_Wtime();
+   hypre_profile_times[HYPRE_TIMER_ID_BLAS1] += hypre_MPI_Wtime();
 #endif
 
-   HYPRE_Complex *y_data = hypre_VectorData(y);
-   HYPRE_Int      size   = hypre_VectorSize(y);
-   HYPRE_Int      ierr = 0;
+   return hypre_error_flag;
+}
 
-   size *= hypre_VectorNumVectors(y);
+/*--------------------------------------------------------------------------
+ * hypre_SeqVectorAxpyHost
+ *--------------------------------------------------------------------------*/
 
-   //hypre_SeqVectorPrefetch(y, HYPRE_MEMORY_DEVICE);
+HYPRE_Int
+hypre_SeqVectorAxpyHost( HYPRE_Complex alpha,
+                         hypre_Vector *x,
+                         hypre_Vector *y )
+{
+   HYPRE_Complex *x_data      = hypre_VectorData(x);
+   HYPRE_Complex *y_data      = hypre_VectorData(y);
+   HYPRE_Int      num_vectors = hypre_VectorNumVectors(x);
+   HYPRE_Int      size        = hypre_VectorSize(x);
+   HYPRE_Int      total_size  = size * num_vectors;
+   HYPRE_Int      i;
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-#if defined(HYPRE_USING_CUBLAS)
-   HYPRE_CUBLAS_CALL( cublasDscal(hypre_HandleCublasHandle(hypre_handle()), size, &alpha, y_data, 1) );
-#else
-   HYPRE_THRUST_CALL( transform, y_data, y_data + size, y_data, alpha * _1 );
+#if defined(HYPRE_USING_OPENMP)
+   #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-#else
-   HYPRE_Int i;
-#if defined(HYPRE_USING_DEVICE_OPENMP)
-#pragma omp target teams distribute parallel for private(i) is_device_ptr(y_data)
-#elif defined(HYPRE_USING_OPENMP)
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
-#endif
-   for (i = 0; i < size; i++)
+   for (i = 0; i < total_size; i++)
    {
-      y_data[i] *= alpha;
+      y_data[i] += alpha * x_data[i];
    }
 
-#endif /* defined(HYPRE_USING_CUDA)  || defined(HYPRE_USING_HIP) */
-
-#if defined(HYPRE_USING_GPU)
-   hypre_SyncCudaComputeStream(hypre_handle());
-#endif
-
-#ifdef HYPRE_PROFILE
-   hypre_profile_times[HYPRE_TIMER_ID_BLAS1] += hypre_MPI_Wtime();
-#endif
-
-   return ierr;
+   return hypre_error_flag;
 }
 
 /*--------------------------------------------------------------------------
  * hypre_SeqVectorAxpy
  *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_SeqVectorAxpy( HYPRE_Complex alpha,
                      hypre_Vector *x,
@@ -509,102 +769,227 @@ hypre_SeqVectorAxpy( HYPRE_Complex alpha,
    hypre_profile_times[HYPRE_TIMER_ID_BLAS1] -= hypre_MPI_Wtime();
 #endif
 
-   HYPRE_Complex *x_data = hypre_VectorData(x);
-   HYPRE_Complex *y_data = hypre_VectorData(y);
-   HYPRE_Int      size   = hypre_VectorSize(x);
-   HYPRE_Int      ierr = 0;
-
-   size *= hypre_VectorNumVectors(x);
-
-   //hypre_SeqVectorPrefetch(x, HYPRE_MEMORY_DEVICE);
-   //hypre_SeqVectorPrefetch(y, HYPRE_MEMORY_DEVICE);
-
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-#if defined(HYPRE_USING_CUBLAS)
-   HYPRE_CUBLAS_CALL( cublasDaxpy(hypre_HandleCublasHandle(hypre_handle()), size, &alpha, x_data, 1, y_data, 1) );
-#else
-   HYPRE_THRUST_CALL( transform, x_data, x_data + size, y_data, y_data, alpha * _1 + _2 );
-#endif
-#else
-   HYPRE_Int i;
-#if defined(HYPRE_USING_DEVICE_OPENMP)
-#pragma omp target teams distribute parallel for private(i) is_device_ptr(y_data, x_data)
-#elif defined(HYPRE_USING_OPENMP)
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
-#endif
-   for (i = 0; i < size; i++)
+#if defined(HYPRE_USING_GPU)
+   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy2( hypre_VectorMemoryLocation(x),
+                                                      hypre_VectorMemoryLocation(y) );
+   if (exec == HYPRE_EXEC_DEVICE)
    {
-      y_data[i] += alpha * x_data[i];
+      hypre_SeqVectorAxpyDevice(alpha, x, y);
    }
-
-#endif /* defined(HYPRE_USING_CUDA)  || defined(HYPRE_USING_HIP) */
-
-#if defined(HYPRE_USING_GPU)
-   hypre_SyncCudaComputeStream(hypre_handle());
+   else
 #endif
+   {
+      hypre_SeqVectorAxpyHost(alpha, x, y);
+   }
 
 #ifdef HYPRE_PROFILE
    hypre_profile_times[HYPRE_TIMER_ID_BLAS1] += hypre_MPI_Wtime();
 #endif
 
-   return ierr;
+   return hypre_error_flag;
 }
 
-/* y = y + x ./ b */
+/*--------------------------------------------------------------------------
+ * hypre_SeqVectorAxpyzHost
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_SeqVectorElmdivpy( hypre_Vector *x,
-                         hypre_Vector *b,
-                         hypre_Vector *y )
+hypre_SeqVectorAxpyzHost( HYPRE_Complex alpha,
+                          hypre_Vector *x,
+                          HYPRE_Complex beta,
+                          hypre_Vector *y,
+                          hypre_Vector *z )
 {
-#ifdef HYPRE_PROFILE
-   hypre_profile_times[HYPRE_TIMER_ID_BLAS1] -= hypre_MPI_Wtime();
+   HYPRE_Complex *x_data      = hypre_VectorData(x);
+   HYPRE_Complex *y_data      = hypre_VectorData(y);
+   HYPRE_Complex *z_data      = hypre_VectorData(z);
+
+   HYPRE_Int      num_vectors = hypre_VectorNumVectors(x);
+   HYPRE_Int      size        = hypre_VectorSize(x);
+   HYPRE_Int      total_size  = size * num_vectors;
+   HYPRE_Int      i;
+
+#if defined(HYPRE_USING_OPENMP)
+   #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
+   for (i = 0; i < total_size; i++)
+   {
+      z_data[i] = alpha * x_data[i] + beta * y_data[i];
+   }
 
-   HYPRE_Complex *x_data = hypre_VectorData(x);
-   HYPRE_Complex *b_data = hypre_VectorData(b);
-   HYPRE_Complex *y_data = hypre_VectorData(y);
-   HYPRE_Int      size   = hypre_VectorSize(b);
+   return hypre_error_flag;
+}
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-   //HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy2( hypre_VectorMemoryLocation(x), hypre_VectorMemoryLocation(b) );
-   //RL: TODO back to hypre_GetExecPolicy2 later
-   HYPRE_ExecutionPolicy exec = HYPRE_EXEC_DEVICE;
+/*--------------------------------------------------------------------------
+ * hypre_SeqVectorAxpyz
+ *
+ * Computes z = a*x + b*y
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_SeqVectorAxpyz( HYPRE_Complex alpha,
+                      hypre_Vector *x,
+                      HYPRE_Complex beta,
+                      hypre_Vector *y,
+                      hypre_Vector *z )
+{
+#if defined(HYPRE_USING_GPU)
+   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy2( hypre_VectorMemoryLocation(x),
+                                                      hypre_VectorMemoryLocation(y));
    if (exec == HYPRE_EXEC_DEVICE)
    {
-      //TODO
-      //hypre_SeqVectorElmdivpyDevice(x, b, y);
-      /*
-#if defined(HYPRE_USING_DEVICE_OPENMP)
-#pragma omp target teams distribute parallel for private(i) is_device_ptr(u_data,v_data,l1_norms)
-#endif
-      */
-      hypreDevice_IVAXPY(size, b_data, x_data, y_data);
+      hypre_SeqVectorAxpyzDevice(alpha, x, beta, y, z);
    }
    else
 #endif
    {
-      HYPRE_Int i;
+      hypre_SeqVectorAxpyzHost(alpha, x, beta, y, z);
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_SeqVectorElmdivpyHost
+ *
+ * if marker != NULL: only for marker[i] == marker_val
+ *
+ * TODO:
+ *        1) Change to hypre_SeqVectorElmdivpyMarkedHost?
+ *        2) Add vecstride/idxstride variables
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_SeqVectorElmdivpyHost( hypre_Vector *x,
+                             hypre_Vector *b,
+                             hypre_Vector *y,
+                             HYPRE_Int    *marker,
+                             HYPRE_Int     marker_val )
+{
+   HYPRE_Complex   *x_data        = hypre_VectorData(x);
+   HYPRE_Complex   *b_data        = hypre_VectorData(b);
+   HYPRE_Complex   *y_data        = hypre_VectorData(y);
+   HYPRE_Int        num_vectors_x = hypre_VectorNumVectors(x);
+   HYPRE_Int        num_vectors_y = hypre_VectorNumVectors(y);
+   HYPRE_Int        num_vectors_b = hypre_VectorNumVectors(b);
+   HYPRE_Int        size          = hypre_VectorSize(b);
+   HYPRE_Int        i, j;
+   HYPRE_Complex    val;
+
+   if (num_vectors_b == 1)
+   {
+      if (num_vectors_x == 1 &&
+          num_vectors_y == 1)
+      {
+         if (marker)
+         {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+            #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
-      for (i = 0; i < size; i++)
+            for (i = 0; i < size; i++)
+            {
+               if (marker[i] == marker_val)
+               {
+                  y_data[i] += x_data[i] / b_data[i];
+               }
+            }
+         }
+         else
+         {
+#ifdef HYPRE_USING_OPENMP
+            #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+#endif
+            for (i = 0; i < size; i++)
+            {
+               y_data[i] += x_data[i] / b_data[i];
+            }
+         } /* if (marker) */
+      }
+      else if (num_vectors_x == 2 &&
+               num_vectors_y == 2)
       {
-         y_data[i] += x_data[i] / b_data[i];
+         if (marker)
+         {
+#ifdef HYPRE_USING_OPENMP
+            #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+#endif
+            for (i = 0; i < size; i++)
+            {
+               val = 1.0 / b_data[i];
+               if (marker[i] == marker_val)
+               {
+                  y_data[i]        += x_data[i]        * val;
+                  y_data[i + size] += x_data[i + size] * val;
+               }
+            }
+         }
+         else
+         {
+#ifdef HYPRE_USING_OPENMP
+            #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+#endif
+            for (i = 0; i < size; i++)
+            {
+               val = 1.0 / b_data[i];
+
+               y_data[i]        += x_data[i]        * val;
+               y_data[i + size] += x_data[i + size] * val;
+            }
+         } /* if (marker) */
       }
-   }
-
-#if defined(HYPRE_USING_GPU)
-   hypre_SyncCudaComputeStream(hypre_handle());
+      else if (num_vectors_x == num_vectors_y)
+      {
+         if (marker)
+         {
+#ifdef HYPRE_USING_OPENMP
+            #pragma omp parallel for private(i, j) HYPRE_SMP_SCHEDULE
 #endif
-
-#ifdef HYPRE_PROFILE
-   hypre_profile_times[HYPRE_TIMER_ID_BLAS1] += hypre_MPI_Wtime();
+            for (i = 0; i < size; i++)
+            {
+               val = 1.0 / b_data[i];
+               if (marker[i] == marker_val)
+               {
+                  for (j = 0; j < num_vectors_x; j++)
+                  {
+                     y_data[i + size * j] += x_data[i + size * j] * val;
+                  }
+               }
+            }
+         }
+         else
+         {
+#ifdef HYPRE_USING_OPENMP
+            #pragma omp parallel for private(i, j) HYPRE_SMP_SCHEDULE
 #endif
+            for (i = 0; i < size; i++)
+            {
+               val = 1.0 / b_data[i];
+               for (j = 0; j < num_vectors_x; j++)
+               {
+                  y_data[i + size * j] += x_data[i + size * j] * val;
+               }
+            }
+         } /* if (marker) */
+      }
+      else
+      {
+         hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Unsupported combination of num_vectors!\n");
+      }
+   }
+   else
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "num_vectors_b != 1 not supported!\n");
+   }
 
    return hypre_error_flag;
 }
 
-/* y[i] += x[i] / b[i] where marker[i] == marker_val */
+/*--------------------------------------------------------------------------
+ * hypre_SeqVectorElmdivpyMarked
+ *
+ * Computes: y[i] = y[i] + x[i] / b[i] for marker[i] = marker_val
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_SeqVectorElmdivpyMarked( hypre_Vector *x,
                                hypre_Vector *b,
@@ -616,36 +1001,54 @@ hypre_SeqVectorElmdivpyMarked( hypre_Vector *x,
    hypre_profile_times[HYPRE_TIMER_ID_BLAS1] -= hypre_MPI_Wtime();
 #endif
 
-   HYPRE_Complex *x_data = hypre_VectorData(x);
-   HYPRE_Complex *b_data = hypre_VectorData(b);
-   HYPRE_Complex *y_data = hypre_VectorData(y);
-   HYPRE_Int      size   = hypre_VectorSize(b);
+   /* Sanity checks */
+   if (hypre_VectorSize(x) < hypre_VectorSize(b))
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "sizes of x and b do not match!\n");
+      return hypre_error_flag;
+   }
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy2( hypre_VectorMemoryLocation(x), hypre_VectorMemoryLocation(b) );
-   if (exec == HYPRE_EXEC_DEVICE)
+   if (!hypre_VectorSize(x))
    {
-      hypreDevice_IVAXPYMarked(size, b_data, x_data, y_data, marker, marker_val);
+      /* VPM: Do not throw an error message here since this can happen for idle processors */
+      return hypre_error_flag;
    }
-   else
-#endif
+
+   if (!hypre_VectorData(x))
    {
-      HYPRE_Int i;
-#ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
-#endif
-      for (i = 0; i < size; i++)
-      {
-         if (marker[i] == marker_val)
-         {
-            y_data[i] += x_data[i] / b_data[i];
-         }
-      }
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "x_data is not present!\n");
+      return hypre_error_flag;
+   }
+
+   if (!hypre_VectorData(b))
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "b_data is not present!\n");
+      return hypre_error_flag;
    }
 
+   if (!hypre_VectorData(y))
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "y_data is not present!\n");
+      return hypre_error_flag;
+   }
+
+   /* row-wise multivec is not supported */
+   hypre_assert(hypre_VectorMultiVecStorageMethod(x) == 0);
+   hypre_assert(hypre_VectorMultiVecStorageMethod(b) == 0);
+   hypre_assert(hypre_VectorMultiVecStorageMethod(y) == 0);
+
 #if defined(HYPRE_USING_GPU)
-   hypre_SyncCudaComputeStream(hypre_handle());
+   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy2( hypre_VectorMemoryLocation(x),
+                                                      hypre_VectorMemoryLocation(b) );
+   if (exec == HYPRE_EXEC_DEVICE)
+   {
+      hypre_SeqVectorElmdivpyDevice(x, b, y, marker, marker_val);
+   }
+   else
 #endif
+   {
+      hypre_SeqVectorElmdivpyHost(x, b, y, marker, marker_val);
+   }
 
 #ifdef HYPRE_PROFILE
    hypre_profile_times[HYPRE_TIMER_ID_BLAS1] += hypre_MPI_Wtime();
@@ -654,9 +1057,56 @@ hypre_SeqVectorElmdivpyMarked( hypre_Vector *x,
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_SeqVectorElmdivpy
+ *
+ * Computes: y = y + x ./ b
+ *
+ * Notes:
+ *    1) x and b must have the same sizes
+ *    2) x and y can have different sizes
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_SeqVectorElmdivpy( hypre_Vector *x,
+                         hypre_Vector *b,
+                         hypre_Vector *y )
+{
+   return hypre_SeqVectorElmdivpyMarked(x, b, y, NULL, -1);
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_SeqVectorInnerProdHost
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Real
+hypre_SeqVectorInnerProdHost( hypre_Vector *x,
+                              hypre_Vector *y )
+{
+   HYPRE_Complex *x_data      = hypre_VectorData(x);
+   HYPRE_Complex *y_data      = hypre_VectorData(y);
+   HYPRE_Int      num_vectors = hypre_VectorNumVectors(x);
+   HYPRE_Int      size        = hypre_VectorSize(x);
+   HYPRE_Int      total_size  = size * num_vectors;
+
+   HYPRE_Real     result      = 0.0;
+   HYPRE_Int      i;
+
+#if defined(HYPRE_USING_OPENMP)
+   #pragma omp parallel for private(i) reduction(+:result) HYPRE_SMP_SCHEDULE
+#endif
+   for (i = 0; i < total_size; i++)
+   {
+      result += hypre_conj(y_data[i]) * x_data[i];
+   }
+
+   return result;
+}
+
 /*--------------------------------------------------------------------------
  * hypre_SeqVectorInnerProd
  *--------------------------------------------------------------------------*/
+
 HYPRE_Real
 hypre_SeqVectorInnerProd( hypre_Vector *x,
                           hypre_Vector *y )
@@ -665,43 +1115,20 @@ hypre_SeqVectorInnerProd( hypre_Vector *x,
    hypre_profile_times[HYPRE_TIMER_ID_BLAS1] -= hypre_MPI_Wtime();
 #endif
 
-   HYPRE_Complex *x_data = hypre_VectorData(x);
-   HYPRE_Complex *y_data = hypre_VectorData(y);
-   HYPRE_Int      size   = hypre_VectorSize(x);
-   HYPRE_Real     result = 0.0;
-
-   size *= hypre_VectorNumVectors(x);
+   HYPRE_Real result;
 
-   //hypre_SeqVectorPrefetch(x, HYPRE_MEMORY_DEVICE);
-   //hypre_SeqVectorPrefetch(y, HYPRE_MEMORY_DEVICE);
-
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-#ifndef HYPRE_COMPLEX
-#if defined(HYPRE_USING_CUBLAS)
-   HYPRE_CUBLAS_CALL( cublasDdot(hypre_HandleCublasHandle(hypre_handle()), size, x_data, 1, y_data, 1, &result) );
-#else
-   result = HYPRE_THRUST_CALL( inner_product, x_data, x_data + size, y_data, 0.0 );
-#endif
-#else
-   /* TODO */
-#error "Complex inner product"
-#endif
-#else /* #if defined(HYPRE_USING_CUDA)  || defined(HYPRE_USING_HIP) */
-   HYPRE_Int i;
-#if defined(HYPRE_USING_DEVICE_OPENMP)
-#pragma omp target teams  distribute  parallel for private(i) reduction(+:result) is_device_ptr(y_data,x_data) map(result)
-#elif defined(HYPRE_USING_OPENMP)
-#pragma omp parallel for private(i) reduction(+:result) HYPRE_SMP_SCHEDULE
-#endif
-   for (i = 0; i < size; i++)
+#if defined(HYPRE_USING_GPU)
+   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy2( hypre_VectorMemoryLocation(x),
+                                                      hypre_VectorMemoryLocation(y) );
+   if (exec == HYPRE_EXEC_DEVICE)
    {
-     result += hypre_conj(y_data[i]) * x_data[i];
+      result = hypre_SeqVectorInnerProdDevice(x, y);
    }
-#endif /* defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP) */
-
-#if defined(HYPRE_USING_GPU)
-   hypre_SyncCudaComputeStream(hypre_handle());
+   else
 #endif
+   {
+      result = hypre_SeqVectorInnerProdHost(x, y);
+   }
 
 #ifdef HYPRE_PROFILE
    hypre_profile_times[HYPRE_TIMER_ID_BLAS1] += hypre_MPI_Wtime();
@@ -710,53 +1137,85 @@ hypre_SeqVectorInnerProd( hypre_Vector *x,
    return result;
 }
 
-//TODO
-
 /*--------------------------------------------------------------------------
- * hypre_VectorSumElts:
- * Returns the sum of all vector elements.
+ * hypre_SeqVectorSumEltsHost
  *--------------------------------------------------------------------------*/
 
-HYPRE_Complex hypre_SeqVectorSumElts( hypre_Vector *vector )
+HYPRE_Complex
+hypre_SeqVectorSumEltsHost( hypre_Vector *vector )
 {
-   HYPRE_Complex  sum = 0;
-   HYPRE_Complex *data = hypre_VectorData( vector );
-   HYPRE_Int      size = hypre_VectorSize( vector );
-   HYPRE_Int      i;
+   HYPRE_Complex  *data        = hypre_VectorData( vector );
+   HYPRE_Int       num_vectors = hypre_VectorNumVectors(vector);
+   HYPRE_Int       size        = hypre_VectorSize(vector);
+   HYPRE_Int       total_size  = size * num_vectors;
+
+   HYPRE_Complex   sum  = 0;
+   HYPRE_Int       i;
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(i) reduction(+:sum) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i) reduction(+:sum) HYPRE_SMP_SCHEDULE
 #endif
-   for ( i=0; i<size; ++i ) sum += data[i];
+   for (i = 0; i < total_size; i++)
+   {
+      sum += data[i];
+   }
 
    return sum;
 }
 
-HYPRE_Int
-hypre_SeqVectorPrefetch( hypre_Vector *x, HYPRE_MemoryLocation memory_location)
+/*--------------------------------------------------------------------------
+ * hypre_SeqVectorSumElts:
+ *
+ * Returns the sum of all vector elements.
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Complex
+hypre_SeqVectorSumElts( hypre_Vector *v )
 {
-   HYPRE_Int      ierr = 0;
-#ifdef HYPRE_USING_UNIFIED_MEMORY
-   if (hypre_VectorMemoryLocation(x) != HYPRE_MEMORY_DEVICE)
-   {
-      /* hypre_error_w_msg(HYPRE_ERROR_GENERIC," Error! CUDA Prefetch with non-unified momory\n");*/
-      return 1;
-   }
+#ifdef HYPRE_PROFILE
+   hypre_profile_times[HYPRE_TIMER_ID_BLAS1] -= hypre_MPI_Wtime();
+#endif
 
-   HYPRE_Complex *x_data = hypre_VectorData(x);
-   HYPRE_Int      size   = hypre_VectorSize(x) * hypre_VectorNumVectors(x);
+   HYPRE_Complex sum;
+
+#if defined(HYPRE_USING_GPU)
+   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1(hypre_VectorMemoryLocation(v));
 
-   if (size == 0)
+   if (exec == HYPRE_EXEC_DEVICE)
+   {
+      sum = hypre_SeqVectorSumEltsDevice(v);
+   }
+   else
+#endif
    {
-      return ierr;
+      sum = hypre_SeqVectorSumEltsHost(v);
    }
 
-   hypre_MemPrefetch(x_data, sizeof(HYPRE_Complex)*size, memory_location);
+#ifdef HYPRE_PROFILE
+   hypre_profile_times[HYPRE_TIMER_ID_BLAS1] += hypre_MPI_Wtime();
 #endif
 
-   return ierr;
+   return sum;
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 #if 0
 /* y[i] = max(alpha*x[i], beta*y[i]) */
 HYPRE_Int
@@ -772,7 +1231,6 @@ hypre_SeqVectorMax( HYPRE_Complex alpha,
    HYPRE_Complex *x_data = hypre_VectorData(x);
    HYPRE_Complex *y_data = hypre_VectorData(y);
    HYPRE_Int      size   = hypre_VectorSize(x);
-   HYPRE_Int      ierr = 0;
 
    size *= hypre_VectorNumVectors(x);
 
@@ -791,9 +1249,9 @@ hypre_SeqVectorMax( HYPRE_Complex alpha,
 #else
    HYPRE_Int i;
 #if defined(HYPRE_USING_DEVICE_OPENMP)
-#pragma omp target teams distribute parallel for private(i) is_device_ptr(y_data, x_data)
+   #pragma omp target teams distribute parallel for private(i) is_device_ptr(y_data, x_data)
 #elif defined(HYPRE_USING_OPENMP)
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
    for (i = 0; i < size; i++)
    {
@@ -802,12 +1260,12 @@ hypre_SeqVectorMax( HYPRE_Complex alpha,
 
 #endif /* defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP) */
 
-   hypre_SyncCudaComputeStream(hypre_handle());
+   hypre_SyncComputeStream();
 
 #ifdef HYPRE_PROFILE
    hypre_profile_times[HYPRE_TIMER_ID_BLAS1] += hypre_MPI_Wtime();
 #endif
 
-   return ierr;
+   return hypre_error_flag;
 }
 #endif
diff --git a/external/hypre/src/seq_mv/vector.h b/external/hypre/src/seq_mv/vector.h
index 6e38fe09..dab51adf 100644
--- a/external/hypre/src/seq_mv/vector.h
+++ b/external/hypre/src/seq_mv/vector.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -20,14 +20,12 @@
 
 typedef struct
 {
-   HYPRE_Complex  *data;
-   HYPRE_Int       size;
-
-   /* Does the Vector create/destroy `data'? */
-   HYPRE_Int       owns_data;
-
-   /* memory location of array data */
-   HYPRE_MemoryLocation  memory_location;
+   HYPRE_Complex        *data;
+   HYPRE_Int             size;      /* Number of elements of a single vector component */
+   HYPRE_Int             component; /* Index of a multivector component
+                                    (used for set/get routines )*/
+   HYPRE_Int             owns_data;  /* Does the Vector create/destroy `data'? */
+   HYPRE_MemoryLocation  memory_location; /* memory location of data array */
 
    /* For multivectors...*/
    HYPRE_Int   num_vectors;  /* the above "size" is size of one vector */
@@ -46,12 +44,15 @@ typedef struct
 
 #define hypre_VectorData(vector)                  ((vector) -> data)
 #define hypre_VectorSize(vector)                  ((vector) -> size)
+#define hypre_VectorComponent(vector)             ((vector) -> component)
 #define hypre_VectorOwnsData(vector)              ((vector) -> owns_data)
 #define hypre_VectorMemoryLocation(vector)        ((vector) -> memory_location)
 #define hypre_VectorNumVectors(vector)            ((vector) -> num_vectors)
 #define hypre_VectorMultiVecStorageMethod(vector) ((vector) -> multivec_storage_method)
-#define hypre_VectorVectorStride(vector)          ((vector) -> vecstride )
-#define hypre_VectorIndexStride(vector)           ((vector) -> idxstride )
+#define hypre_VectorVectorStride(vector)          ((vector) -> vecstride)
+#define hypre_VectorIndexStride(vector)           ((vector) -> idxstride)
+#define hypre_VectorEntryI(vector, i)             ((vector) -> data[i])
+#define hypre_VectorEntryIJ(vector, i, j) \
+   ((vector) -> data[((vector) -> vecstride) * j + ((vector) -> idxstride) * i])
 
 #endif
-
diff --git a/external/hypre/src/seq_mv/vector_batched.c b/external/hypre/src/seq_mv/vector_batched.c
index 626c077a..dd7739e2 100644
--- a/external/hypre/src/seq_mv/vector_batched.c
+++ b/external/hypre/src/seq_mv/vector_batched.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -13,8 +13,8 @@
 
 HYPRE_Int
 hypre_SeqVectorMassAxpy8( HYPRE_Complex *alpha,
-                     hypre_Vector **x,
-                     hypre_Vector  *y, HYPRE_Int k)
+                          hypre_Vector **x,
+                          hypre_Vector  *y, HYPRE_Int k)
 {
    HYPRE_Complex  *x_data = hypre_VectorData(x[0]);
    HYPRE_Complex  *y_data = hypre_VectorData(y);
@@ -23,107 +23,109 @@ hypre_SeqVectorMassAxpy8( HYPRE_Complex *alpha,
    HYPRE_Int      i, j, jstart, restk;
 
 
-   restk = (k-(k/8*8));
+   restk = (k - (k / 8 * 8));
 
    if (k > 7)
    {
-      for (j = 0; j < k-7; j += 8)
+      for (j = 0; j < k - 7; j += 8)
       {
-         jstart = j*size;
+         jstart = j * size;
 #if defined(HYPRE_USING_OPENMP)
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+         #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
          for (i = 0; i < size; i++)
          {
-            y_data[i] += alpha[j]*x_data[jstart+i] + alpha[j+1]*x_data[jstart+i+size]
-            + alpha[j+2]*x_data[(j+2)*size+i] + alpha[j+3]*x_data[(j+3)*size+i]
-            + alpha[j+4]*x_data[(j+4)*size+i] + alpha[j+5]*x_data[(j+5)*size+i]
-            + alpha[j+6]*x_data[(j+6)*size+i] + alpha[j+7]*x_data[(j+7)*size+i];
+            y_data[i] += alpha[j] * x_data[jstart + i] + alpha[j + 1] * x_data[jstart + i + size]
+                         + alpha[j + 2] * x_data[(j + 2) * size + i] + alpha[j + 3] * x_data[(j + 3) * size + i]
+                         + alpha[j + 4] * x_data[(j + 4) * size + i] + alpha[j + 5] * x_data[(j + 5) * size + i]
+                         + alpha[j + 6] * x_data[(j + 6) * size + i] + alpha[j + 7] * x_data[(j + 7) * size + i];
          }
       }
    }
    if (restk == 1)
    {
-      jstart = (k-1)*size;
+      jstart = (k - 1) * size;
 #if defined(HYPRE_USING_OPENMP)
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
       for (i = 0; i < size; i++)
       {
-         y_data[i] += alpha[k-1] * x_data[jstart+i];
+         y_data[i] += alpha[k - 1] * x_data[jstart + i];
       }
    }
    else if (restk == 2)
    {
-      jstart = (k-2)*size;
+      jstart = (k - 2) * size;
 #if defined(HYPRE_USING_OPENMP)
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
       for (i = 0; i < size; i++)
       {
-         y_data[i] += alpha[k-2] * x_data[jstart+i] + alpha[k-1] * x_data[jstart+size+i];
+         y_data[i] += alpha[k - 2] * x_data[jstart + i] + alpha[k - 1] * x_data[jstart + size + i];
       }
    }
    else if (restk == 3)
    {
-      jstart = (k-3)*size;
+      jstart = (k - 3) * size;
 #if defined(HYPRE_USING_OPENMP)
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
       for (i = 0; i < size; i++)
       {
-         y_data[i] += alpha[k-3] * x_data[jstart+i] + alpha[k-2] * x_data[jstart+size+i] + alpha[k-1] * x_data[(k-1)*size+i];
+         y_data[i] += alpha[k - 3] * x_data[jstart + i] + alpha[k - 2] * x_data[jstart + size + i] + alpha[k
+                                                                                                           - 1] *
+                      x_data[(k - 1) * size + i];
       }
    }
    else if (restk == 4)
    {
-      jstart = (k-4)*size;
+      jstart = (k - 4) * size;
 #if defined(HYPRE_USING_OPENMP)
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
       for (i = 0; i < size; i++)
       {
-            y_data[i] += alpha[k-4]*x_data[(k-4)*size+i] + alpha[k-3]*x_data[(k-3)*size+i]
-            + alpha[k-2]*x_data[(k-2)*size+i] + alpha[k-1]*x_data[(k-1)*size+i];
+         y_data[i] += alpha[k - 4] * x_data[(k - 4) * size + i] + alpha[k - 3] * x_data[(k - 3) * size + i]
+                      + alpha[k - 2] * x_data[(k - 2) * size + i] + alpha[k - 1] * x_data[(k - 1) * size + i];
       }
    }
    else if (restk == 5)
    {
 #if defined(HYPRE_USING_OPENMP)
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
       for (i = 0; i < size; i++)
       {
-            y_data[i] += + alpha[k-5]*x_data[(k-5)*size+i] + alpha[k-4]*x_data[(k-4)*size+i]
-            + alpha[k-3]*x_data[(k-3)*size+i] + alpha[k-2]*x_data[(k-2)*size+i]
-            + alpha[k-1]*x_data[(k-1)*size+i];
+         y_data[i] += + alpha[k - 5] * x_data[(k - 5) * size + i] + alpha[k - 4] * x_data[(k - 4) * size + i]
+                      + alpha[k - 3] * x_data[(k - 3) * size + i] + alpha[k - 2] * x_data[(k - 2) * size + i]
+                      + alpha[k - 1] * x_data[(k - 1) * size + i];
       }
    }
    else if (restk == 6)
    {
-      jstart = (k-6)*size;
+      jstart = (k - 6) * size;
 #if defined(HYPRE_USING_OPENMP)
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
       for (i = 0; i < size; i++)
       {
-            y_data[i] += alpha[k-6]*x_data[jstart+i] + alpha[k-5]*x_data[jstart+i+size]
-            + alpha[k-4]*x_data[(k-4)*size+i] + alpha[k-3]*x_data[(k-3)*size+i]
-            + alpha[k-2]*x_data[(k-2)*size+i] + alpha[k-1]*x_data[(k-1)*size+i];
+         y_data[i] += alpha[k - 6] * x_data[jstart + i] + alpha[k - 5] * x_data[jstart + i + size]
+                      + alpha[k - 4] * x_data[(k - 4) * size + i] + alpha[k - 3] * x_data[(k - 3) * size + i]
+                      + alpha[k - 2] * x_data[(k - 2) * size + i] + alpha[k - 1] * x_data[(k - 1) * size + i];
       }
    }
    else if (restk == 7)
    {
-      jstart = (k-7)*size;
+      jstart = (k - 7) * size;
 #if defined(HYPRE_USING_OPENMP)
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
       for (i = 0; i < size; i++)
       {
-            y_data[i] += alpha[k-7]*x_data[jstart+i] + alpha[k-6]*x_data[jstart+i+size]
-            + alpha[k-5]*x_data[(k-5)*size+i] + alpha[k-4]*x_data[(k-4)*size+i]
-            + alpha[k-3]*x_data[(k-3)*size+i] + alpha[k-2]*x_data[(k-2)*size+i]
-            + alpha[k-1]*x_data[(k-1)*size+i];
+         y_data[i] += alpha[k - 7] * x_data[jstart + i] + alpha[k - 6] * x_data[jstart + i + size]
+                      + alpha[k - 5] * x_data[(k - 5) * size + i] + alpha[k - 4] * x_data[(k - 4) * size + i]
+                      + alpha[k - 3] * x_data[(k - 3) * size + i] + alpha[k - 2] * x_data[(k - 2) * size + i]
+                      + alpha[k - 1] * x_data[(k - 1) * size + i];
       }
    }
 
@@ -136,8 +138,8 @@ hypre_SeqVectorMassAxpy8( HYPRE_Complex *alpha,
 
 HYPRE_Int
 hypre_SeqVectorMassAxpy4( HYPRE_Complex *alpha,
-                     hypre_Vector **x,
-                     hypre_Vector  *y, HYPRE_Int k)
+                          hypre_Vector **x,
+                          hypre_Vector  *y, HYPRE_Int k)
 {
    HYPRE_Complex  *x_data = hypre_VectorData(x[0]);
    HYPRE_Complex  *y_data = hypre_VectorData(y);
@@ -146,54 +148,56 @@ hypre_SeqVectorMassAxpy4( HYPRE_Complex *alpha,
    HYPRE_Int      i, j, jstart, restk;
 
 
-   restk = (k-(k/4*4));
+   restk = (k - (k / 4 * 4));
 
    if (k > 3)
    {
-      for (j = 0; j < k-3; j += 4)
+      for (j = 0; j < k - 3; j += 4)
       {
-         jstart = j*size;
+         jstart = j * size;
 #if defined(HYPRE_USING_OPENMP)
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+         #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
          for (i = 0; i < size; i++)
          {
-            y_data[i] += alpha[j]*x_data[jstart+i] + alpha[j+1]*x_data[jstart+i+size]
-            + alpha[j+2]*x_data[(j+2)*size+i] + alpha[j+3]*x_data[(j+3)*size+i];
+            y_data[i] += alpha[j] * x_data[jstart + i] + alpha[j + 1] * x_data[jstart + i + size]
+                         + alpha[j + 2] * x_data[(j + 2) * size + i] + alpha[j + 3] * x_data[(j + 3) * size + i];
          }
       }
    }
    if (restk == 1)
    {
-      jstart = (k-1)*size;
+      jstart = (k - 1) * size;
 #if defined(HYPRE_USING_OPENMP)
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
       for (i = 0; i < size; i++)
       {
-         y_data[i] += alpha[k-1] * x_data[jstart+i];
+         y_data[i] += alpha[k - 1] * x_data[jstart + i];
       }
    }
    else if (restk == 2)
    {
-      jstart = (k-2)*size;
+      jstart = (k - 2) * size;
 #if defined(HYPRE_USING_OPENMP)
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
       for (i = 0; i < size; i++)
       {
-         y_data[i] += alpha[k-2] * x_data[jstart+i] + alpha[k-1] * x_data[jstart+size+i];
+         y_data[i] += alpha[k - 2] * x_data[jstart + i] + alpha[k - 1] * x_data[jstart + size + i];
       }
    }
    else if (restk == 3)
    {
-      jstart = (k-3)*size;
+      jstart = (k - 3) * size;
 #if defined(HYPRE_USING_OPENMP)
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
       for (i = 0; i < size; i++)
       {
-         y_data[i] += alpha[k-3] * x_data[jstart+i] + alpha[k-2] * x_data[jstart+size+i] + alpha[k-1] * x_data[(k-1)*size+i];
+         y_data[i] += alpha[k - 3] * x_data[jstart + i] + alpha[k - 2] * x_data[jstart + size + i] + alpha[k
+                                                                                                           - 1] *
+                      x_data[(k - 1) * size + i];
       }
    }
 
@@ -206,8 +210,8 @@ hypre_SeqVectorMassAxpy4( HYPRE_Complex *alpha,
 
 HYPRE_Int
 hypre_SeqVectorMassAxpy( HYPRE_Complex *alpha,
-                     hypre_Vector **x,
-                     hypre_Vector  *y, HYPRE_Int k, HYPRE_Int unroll)
+                         hypre_Vector **x,
+                         hypre_Vector  *y, HYPRE_Int k, HYPRE_Int unroll)
 {
    HYPRE_Complex  *x_data = hypre_VectorData(x[0]);
    HYPRE_Complex  *y_data = hypre_VectorData(y);
@@ -229,13 +233,13 @@ hypre_SeqVectorMassAxpy( HYPRE_Complex *alpha,
    {
       for (j = 0; j < k; j++)
       {
-         jstart = j*size;
+         jstart = j * size;
 #if defined(HYPRE_USING_OPENMP)
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+         #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
          for (i = 0; i < size; i++)
          {
-            y_data[i] += alpha[j]*x_data[jstart+i];
+            y_data[i] += alpha[j] * x_data[jstart + i];
          }
       }
    }
@@ -247,7 +251,7 @@ hypre_SeqVectorMassAxpy( HYPRE_Complex *alpha,
  * hypre_SeqVectorMassInnerProd8
  *--------------------------------------------------------------------------*/
 HYPRE_Int hypre_SeqVectorMassInnerProd8( hypre_Vector *x,
-                       hypre_Vector **y, HYPRE_Int k, HYPRE_Real *result)
+                                         hypre_Vector **y, HYPRE_Int k, HYPRE_Real *result)
 {
    HYPRE_Complex *x_data = hypre_VectorData(x);
    HYPRE_Complex *y_data = hypre_VectorData(y[0]);
@@ -271,11 +275,11 @@ HYPRE_Int hypre_SeqVectorMassInnerProd8( hypre_Vector *x,
    HYPRE_Int jstart6;
    HYPRE_Int jstart7;
 
-   restk = (k-(k/8*8));
+   restk = (k - (k / 8 * 8));
 
    if (k > 7)
    {
-      for (j = 0; j < k-7; j += 8)
+      for (j = 0; j < k - 7; j += 8)
       {
          res1 = 0;
          res2 = 0;
@@ -285,88 +289,88 @@ HYPRE_Int hypre_SeqVectorMassInnerProd8( hypre_Vector *x,
          res6 = 0;
          res7 = 0;
          res8 = 0;
-         jstart = j*size;
-         jstart1 = jstart+size;
-         jstart2 = jstart1+size;
-         jstart3 = jstart2+size;
-         jstart4 = jstart3+size;
-         jstart5 = jstart4+size;
-         jstart6 = jstart5+size;
-         jstart7 = jstart6+size;
+         jstart = j * size;
+         jstart1 = jstart + size;
+         jstart2 = jstart1 + size;
+         jstart3 = jstart2 + size;
+         jstart4 = jstart3 + size;
+         jstart5 = jstart4 + size;
+         jstart6 = jstart5 + size;
+         jstart7 = jstart6 + size;
 #if defined(HYPRE_USING_OPENMP)
-#pragma omp parallel for private(i) reduction(+:res1,res2,res3,res4,res5,res6,res7,res8) HYPRE_SMP_SCHEDULE
+         #pragma omp parallel for private(i) reduction(+:res1,res2,res3,res4,res5,res6,res7,res8) HYPRE_SMP_SCHEDULE
 #endif
          for (i = 0; i < size; i++)
          {
-            res1 += hypre_conj(y_data[jstart+i]) * x_data[i];
-            res2 += hypre_conj(y_data[jstart1+i]) * x_data[i];
-            res3 += hypre_conj(y_data[jstart2+i]) * x_data[i];
-            res4 += hypre_conj(y_data[jstart3+i]) * x_data[i];
-            res5 += hypre_conj(y_data[jstart4+i]) * x_data[i];
-            res6 += hypre_conj(y_data[jstart5+i]) * x_data[i];
-            res7 += hypre_conj(y_data[jstart6+i]) * x_data[i];
-            res8 += hypre_conj(y_data[jstart7+i]) * x_data[i];
+            res1 += hypre_conj(y_data[jstart + i]) * x_data[i];
+            res2 += hypre_conj(y_data[jstart1 + i]) * x_data[i];
+            res3 += hypre_conj(y_data[jstart2 + i]) * x_data[i];
+            res4 += hypre_conj(y_data[jstart3 + i]) * x_data[i];
+            res5 += hypre_conj(y_data[jstart4 + i]) * x_data[i];
+            res6 += hypre_conj(y_data[jstart5 + i]) * x_data[i];
+            res7 += hypre_conj(y_data[jstart6 + i]) * x_data[i];
+            res8 += hypre_conj(y_data[jstart7 + i]) * x_data[i];
          }
          result[j] = res1;
-         result[j+1] = res2;
-         result[j+2] = res3;
-         result[j+3] = res4;
-         result[j+4] = res5;
-         result[j+5] = res6;
-         result[j+6] = res7;
-         result[j+7] = res8;
+         result[j + 1] = res2;
+         result[j + 2] = res3;
+         result[j + 3] = res4;
+         result[j + 4] = res5;
+         result[j + 5] = res6;
+         result[j + 6] = res7;
+         result[j + 7] = res8;
       }
    }
    if (restk == 1)
    {
       res1 = 0;
-      jstart = (k-1)*size;
+      jstart = (k - 1) * size;
 #if defined(HYPRE_USING_OPENMP)
-#pragma omp parallel for private(i) reduction(+:res1) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) reduction(+:res1) HYPRE_SMP_SCHEDULE
 #endif
       for (i = 0; i < size; i++)
       {
-         res1 += hypre_conj(y_data[jstart+i]) * x_data[i];
+         res1 += hypre_conj(y_data[jstart + i]) * x_data[i];
       }
-      result[k-1] = res1;
+      result[k - 1] = res1;
    }
    else if (restk == 2)
    {
       res1 = 0;
       res2 = 0;
-      jstart = (k-2)*size;
-      jstart1 = jstart+size;
+      jstart = (k - 2) * size;
+      jstart1 = jstart + size;
 #if defined(HYPRE_USING_OPENMP)
-#pragma omp parallel for private(i) reduction(+:res1,res2) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) reduction(+:res1,res2) HYPRE_SMP_SCHEDULE
 #endif
       for (i = 0; i < size; i++)
       {
-         res1 += hypre_conj(y_data[jstart+i]) * x_data[i];
-         res2 += hypre_conj(y_data[jstart1+i]) * x_data[i];
+         res1 += hypre_conj(y_data[jstart + i]) * x_data[i];
+         res2 += hypre_conj(y_data[jstart1 + i]) * x_data[i];
       }
-      result[k-2] = res1;
-      result[k-1] = res2;
+      result[k - 2] = res1;
+      result[k - 1] = res2;
    }
    else if (restk == 3)
    {
       res1 = 0;
       res2 = 0;
       res3 = 0;
-      jstart = (k-3)*size;
-      jstart1 = jstart+size;
-      jstart2 = jstart1+size;
+      jstart = (k - 3) * size;
+      jstart1 = jstart + size;
+      jstart2 = jstart1 + size;
 #if defined(HYPRE_USING_OPENMP)
-#pragma omp parallel for private(i) reduction(+:res1,res2,res3) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) reduction(+:res1,res2,res3) HYPRE_SMP_SCHEDULE
 #endif
       for (i = 0; i < size; i++)
       {
-         res1 += hypre_conj(y_data[jstart+i]) * x_data[i];
-         res2 += hypre_conj(y_data[jstart1+i]) * x_data[i];
-         res3 += hypre_conj(y_data[jstart2+i]) * x_data[i];
+         res1 += hypre_conj(y_data[jstart + i]) * x_data[i];
+         res2 += hypre_conj(y_data[jstart1 + i]) * x_data[i];
+         res3 += hypre_conj(y_data[jstart2 + i]) * x_data[i];
       }
-      result[k-3] = res1;
-      result[k-2] = res2;
-      result[k-1] = res3;
+      result[k - 3] = res1;
+      result[k - 2] = res2;
+      result[k - 1] = res3;
    }
    else if (restk == 4)
    {
@@ -374,24 +378,24 @@ HYPRE_Int hypre_SeqVectorMassInnerProd8( hypre_Vector *x,
       res2 = 0;
       res3 = 0;
       res4 = 0;
-      jstart = (k-4)*size;
-      jstart1 = jstart+size;
-      jstart2 = jstart1+size;
-      jstart3 = jstart2+size;
+      jstart = (k - 4) * size;
+      jstart1 = jstart + size;
+      jstart2 = jstart1 + size;
+      jstart3 = jstart2 + size;
 #if defined(HYPRE_USING_OPENMP)
-#pragma omp parallel for private(i) reduction(+:res1,res2,res3,res4) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) reduction(+:res1,res2,res3,res4) HYPRE_SMP_SCHEDULE
 #endif
       for (i = 0; i < size; i++)
       {
-         res1 += hypre_conj(y_data[jstart+i]) * x_data[i];
-         res2 += hypre_conj(y_data[jstart1+i]) * x_data[i];
-         res3 += hypre_conj(y_data[jstart2+i]) * x_data[i];
-         res4 += hypre_conj(y_data[jstart3+i]) * x_data[i];
+         res1 += hypre_conj(y_data[jstart + i]) * x_data[i];
+         res2 += hypre_conj(y_data[jstart1 + i]) * x_data[i];
+         res3 += hypre_conj(y_data[jstart2 + i]) * x_data[i];
+         res4 += hypre_conj(y_data[jstart3 + i]) * x_data[i];
       }
-      result[k-4] = res1;
-      result[k-3] = res2;
-      result[k-2] = res3;
-      result[k-1] = res4;
+      result[k - 4] = res1;
+      result[k - 3] = res2;
+      result[k - 2] = res3;
+      result[k - 1] = res4;
    }
    else if (restk == 5)
    {
@@ -400,27 +404,27 @@ HYPRE_Int hypre_SeqVectorMassInnerProd8( hypre_Vector *x,
       res3 = 0;
       res4 = 0;
       res5 = 0;
-      jstart = (k-5)*size;
-      jstart1 = jstart+size;
-      jstart2 = jstart1+size;
-      jstart3 = jstart2+size;
-      jstart4 = jstart3+size;
+      jstart = (k - 5) * size;
+      jstart1 = jstart + size;
+      jstart2 = jstart1 + size;
+      jstart3 = jstart2 + size;
+      jstart4 = jstart3 + size;
 #if defined(HYPRE_USING_OPENMP)
-#pragma omp parallel for private(i) reduction(+:res1,res2,res3,res4,res5) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) reduction(+:res1,res2,res3,res4,res5) HYPRE_SMP_SCHEDULE
 #endif
       for (i = 0; i < size; i++)
       {
-         res1 += hypre_conj(y_data[jstart+i]) * x_data[i];
-         res2 += hypre_conj(y_data[jstart1+i]) * x_data[i];
-         res3 += hypre_conj(y_data[jstart2+i]) * x_data[i];
-         res4 += hypre_conj(y_data[jstart3+i]) * x_data[i];
-         res5 += hypre_conj(y_data[jstart4+i]) * x_data[i];
+         res1 += hypre_conj(y_data[jstart + i]) * x_data[i];
+         res2 += hypre_conj(y_data[jstart1 + i]) * x_data[i];
+         res3 += hypre_conj(y_data[jstart2 + i]) * x_data[i];
+         res4 += hypre_conj(y_data[jstart3 + i]) * x_data[i];
+         res5 += hypre_conj(y_data[jstart4 + i]) * x_data[i];
       }
-      result[k-5] = res1;
-      result[k-4] = res2;
-      result[k-3] = res3;
-      result[k-2] = res4;
-      result[k-1] = res5;
+      result[k - 5] = res1;
+      result[k - 4] = res2;
+      result[k - 3] = res3;
+      result[k - 2] = res4;
+      result[k - 1] = res5;
    }
    else if (restk == 6)
    {
@@ -430,30 +434,30 @@ HYPRE_Int hypre_SeqVectorMassInnerProd8( hypre_Vector *x,
       res4 = 0;
       res5 = 0;
       res6 = 0;
-      jstart = (k-6)*size;
-      jstart1 = jstart+size;
-      jstart2 = jstart1+size;
-      jstart3 = jstart2+size;
-      jstart4 = jstart3+size;
-      jstart5 = jstart4+size;
+      jstart = (k - 6) * size;
+      jstart1 = jstart + size;
+      jstart2 = jstart1 + size;
+      jstart3 = jstart2 + size;
+      jstart4 = jstart3 + size;
+      jstart5 = jstart4 + size;
 #if defined(HYPRE_USING_OPENMP)
-#pragma omp parallel for private(i) reduction(+:res1,res2,res3,res4,res5,res6) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) reduction(+:res1,res2,res3,res4,res5,res6) HYPRE_SMP_SCHEDULE
 #endif
       for (i = 0; i < size; i++)
       {
-         res1 += hypre_conj(y_data[jstart+i]) * x_data[i];
-         res2 += hypre_conj(y_data[jstart1+i]) * x_data[i];
-         res3 += hypre_conj(y_data[jstart2+i]) * x_data[i];
-         res4 += hypre_conj(y_data[jstart3+i]) * x_data[i];
-         res5 += hypre_conj(y_data[jstart4+i]) * x_data[i];
-         res6 += hypre_conj(y_data[jstart5+i]) * x_data[i];
+         res1 += hypre_conj(y_data[jstart + i]) * x_data[i];
+         res2 += hypre_conj(y_data[jstart1 + i]) * x_data[i];
+         res3 += hypre_conj(y_data[jstart2 + i]) * x_data[i];
+         res4 += hypre_conj(y_data[jstart3 + i]) * x_data[i];
+         res5 += hypre_conj(y_data[jstart4 + i]) * x_data[i];
+         res6 += hypre_conj(y_data[jstart5 + i]) * x_data[i];
       }
-      result[k-6] = res1;
-      result[k-5] = res2;
-      result[k-4] = res3;
-      result[k-3] = res4;
-      result[k-2] = res5;
-      result[k-1] = res6;
+      result[k - 6] = res1;
+      result[k - 5] = res2;
+      result[k - 4] = res3;
+      result[k - 3] = res4;
+      result[k - 2] = res5;
+      result[k - 1] = res6;
    }
    else if (restk == 7)
    {
@@ -464,33 +468,33 @@ HYPRE_Int hypre_SeqVectorMassInnerProd8( hypre_Vector *x,
       res5 = 0;
       res6 = 0;
       res7 = 0;
-      jstart = (k-7)*size;
-      jstart1 = jstart+size;
-      jstart2 = jstart1+size;
-      jstart3 = jstart2+size;
-      jstart4 = jstart3+size;
-      jstart5 = jstart4+size;
-      jstart6 = jstart5+size;
+      jstart = (k - 7) * size;
+      jstart1 = jstart + size;
+      jstart2 = jstart1 + size;
+      jstart3 = jstart2 + size;
+      jstart4 = jstart3 + size;
+      jstart5 = jstart4 + size;
+      jstart6 = jstart5 + size;
 #if defined(HYPRE_USING_OPENMP)
-#pragma omp parallel for private(i) reduction(+:res1,res2,res3,res4,res5,res6,res7) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) reduction(+:res1,res2,res3,res4,res5,res6,res7) HYPRE_SMP_SCHEDULE
 #endif
       for (i = 0; i < size; i++)
       {
-         res1 += hypre_conj(y_data[jstart+i]) * x_data[i];
-         res2 += hypre_conj(y_data[jstart1+i]) * x_data[i];
-         res3 += hypre_conj(y_data[jstart2+i]) * x_data[i];
-         res4 += hypre_conj(y_data[jstart3+i]) * x_data[i];
-         res5 += hypre_conj(y_data[jstart4+i]) * x_data[i];
-         res6 += hypre_conj(y_data[jstart5+i]) * x_data[i];
-         res7 += hypre_conj(y_data[jstart6+i]) * x_data[i];
+         res1 += hypre_conj(y_data[jstart + i]) * x_data[i];
+         res2 += hypre_conj(y_data[jstart1 + i]) * x_data[i];
+         res3 += hypre_conj(y_data[jstart2 + i]) * x_data[i];
+         res4 += hypre_conj(y_data[jstart3 + i]) * x_data[i];
+         res5 += hypre_conj(y_data[jstart4 + i]) * x_data[i];
+         res6 += hypre_conj(y_data[jstart5 + i]) * x_data[i];
+         res7 += hypre_conj(y_data[jstart6 + i]) * x_data[i];
       }
-      result[k-7] = res1;
-      result[k-6] = res2;
-      result[k-5] = res3;
-      result[k-4] = res4;
-      result[k-3] = res5;
-      result[k-2] = res6;
-      result[k-1] = res7;
+      result[k - 7] = res1;
+      result[k - 6] = res2;
+      result[k - 5] = res3;
+      result[k - 4] = res4;
+      result[k - 3] = res5;
+      result[k - 2] = res6;
+      result[k - 1] = res7;
    }
 
 
@@ -501,7 +505,7 @@ HYPRE_Int hypre_SeqVectorMassInnerProd8( hypre_Vector *x,
  * hypre_SeqVectorMassInnerProd4
  *--------------------------------------------------------------------------*/
 HYPRE_Int hypre_SeqVectorMassInnerProd4( hypre_Vector *x,
-                       hypre_Vector **y, HYPRE_Int k, HYPRE_Real *result)
+                                         hypre_Vector **y, HYPRE_Int k, HYPRE_Real *result)
 {
    HYPRE_Complex *x_data = hypre_VectorData(x);
    HYPRE_Complex *y_data = hypre_VectorData(y[0]);
@@ -517,86 +521,86 @@ HYPRE_Int hypre_SeqVectorMassInnerProd4( hypre_Vector *x,
    HYPRE_Int jstart2;
    HYPRE_Int jstart3;
 
-   restk = (k-(k/4*4));
+   restk = (k - (k / 4 * 4));
 
    if (k > 3)
    {
-      for (j = 0; j < k-3; j += 4)
+      for (j = 0; j < k - 3; j += 4)
       {
          res1 = 0;
          res2 = 0;
          res3 = 0;
          res4 = 0;
-         jstart = j*size;
-         jstart1 = jstart+size;
-         jstart2 = jstart1+size;
-         jstart3 = jstart2+size;
+         jstart = j * size;
+         jstart1 = jstart + size;
+         jstart2 = jstart1 + size;
+         jstart3 = jstart2 + size;
 #if defined(HYPRE_USING_OPENMP)
-#pragma omp parallel for private(i) reduction(+:res1,res2,res3,res4) HYPRE_SMP_SCHEDULE
+         #pragma omp parallel for private(i) reduction(+:res1,res2,res3,res4) HYPRE_SMP_SCHEDULE
 #endif
          for (i = 0; i < size; i++)
          {
-            res1 += hypre_conj(y_data[jstart+i]) * x_data[i];
-            res2 += hypre_conj(y_data[jstart1+i]) * x_data[i];
-            res3 += hypre_conj(y_data[jstart2+i]) * x_data[i];
-            res4 += hypre_conj(y_data[jstart3+i]) * x_data[i];
+            res1 += hypre_conj(y_data[jstart + i]) * x_data[i];
+            res2 += hypre_conj(y_data[jstart1 + i]) * x_data[i];
+            res3 += hypre_conj(y_data[jstart2 + i]) * x_data[i];
+            res4 += hypre_conj(y_data[jstart3 + i]) * x_data[i];
          }
          result[j] = res1;
-         result[j+1] = res2;
-         result[j+2] = res3;
-         result[j+3] = res4;
+         result[j + 1] = res2;
+         result[j + 2] = res3;
+         result[j + 3] = res4;
       }
    }
    if (restk == 1)
    {
       res1 = 0;
-      jstart = (k-1)*size;
+      jstart = (k - 1) * size;
 #if defined(HYPRE_USING_OPENMP)
-#pragma omp parallel for private(i) reduction(+:res1) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) reduction(+:res1) HYPRE_SMP_SCHEDULE
 #endif
       for (i = 0; i < size; i++)
       {
-         res1 += hypre_conj(y_data[jstart+i]) * x_data[i];
+         res1 += hypre_conj(y_data[jstart + i]) * x_data[i];
       }
-      result[k-1] = res1;
+      result[k - 1] = res1;
    }
    else if (restk == 2)
    {
       res1 = 0;
       res2 = 0;
-      jstart = (k-2)*size;
-      jstart1 = jstart+size;
+      jstart = (k - 2) * size;
+      jstart1 = jstart + size;
 #if defined(HYPRE_USING_OPENMP)
-#pragma omp parallel for private(i) reduction(+:res1,res2) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) reduction(+:res1,res2) HYPRE_SMP_SCHEDULE
 #endif
       for (i = 0; i < size; i++)
       {
-         res1 += hypre_conj(y_data[jstart+i]) * x_data[i];
-         res2 += hypre_conj(y_data[jstart1+i]) * x_data[i];
+         res1 += hypre_conj(y_data[jstart + i]) * x_data[i];
+         res2 += hypre_conj(y_data[jstart1 + i]) * x_data[i];
       }
-      result[k-2] = res1;
-      result[k-1] = res2;
+      result[k - 2] = res1;
+      result[k - 1] = res2;
    }
    else if (restk == 3)
    {
       res1 = 0;
       res2 = 0;
       res3 = 0;
-      jstart = (k-3)*size;
-      jstart1 = jstart+size;
-      jstart2 = jstart1+size;
+      jstart = (k - 3) * size;
+      jstart1 = jstart + size;
+      jstart2 = jstart1 + size;
 #if defined(HYPRE_USING_OPENMP)
-#pragma omp parallel for private(i) reduction(+:res1,res2,res3) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) reduction(+:res1,res2,res3) HYPRE_SMP_SCHEDULE
 #endif
       for (i = 0; i < size; i++)
       {
-         res1 += hypre_conj(y_data[jstart+i]) * x_data[i];
-         res2 += hypre_conj(y_data[jstart1+i]) * x_data[i];
-         res3 += hypre_conj(y_data[jstart2+i]) * x_data[i];
+         res1 += hypre_conj(y_data[jstart + i]) * x_data[i];
+         res2 += hypre_conj(y_data[jstart1 + i]) * x_data[i];
+         res3 += hypre_conj(y_data[jstart2 + i]) * x_data[i];
       }
-      result[k-3] = res1;
-      result[k-2] = res2;
-      result[k-1] = res3;
+      result[k - 3] = res1;
+      result[k - 2] = res2;
+      result[k - 1] = res3;
    }
 
 
@@ -607,7 +611,7 @@ HYPRE_Int hypre_SeqVectorMassInnerProd4( hypre_Vector *x,
  * hypre_SeqVectorMassDotpTwo8
  *--------------------------------------------------------------------------*/
 HYPRE_Int hypre_SeqVectorMassDotpTwo8( hypre_Vector *x, hypre_Vector *y,
-                       hypre_Vector **z, HYPRE_Int k, HYPRE_Real *result_x, HYPRE_Real *result_y)
+                                       hypre_Vector **z, HYPRE_Int k, HYPRE_Real *result_x, HYPRE_Real *result_y)
 {
    HYPRE_Complex *x_data = hypre_VectorData(x);
    HYPRE_Complex *y_data = hypre_VectorData(y);
@@ -640,11 +644,11 @@ HYPRE_Int hypre_SeqVectorMassDotpTwo8( hypre_Vector *x, hypre_Vector *y,
    HYPRE_Int jstart6;
    HYPRE_Int jstart7;
 
-   restk = (k-(k/8*8));
+   restk = (k - (k / 8 * 8));
 
    if (k > 7)
    {
-      for (j = 0; j < k-7; j += 8)
+      for (j = 0; j < k - 7; j += 8)
       {
          res_x1 = 0;
          res_x2 = 0;
@@ -662,69 +666,69 @@ HYPRE_Int hypre_SeqVectorMassDotpTwo8( hypre_Vector *x, hypre_Vector *y,
          res_y6 = 0;
          res_y7 = 0;
          res_y8 = 0;
-         jstart = j*size;
-         jstart1 = jstart+size;
-         jstart2 = jstart1+size;
-         jstart3 = jstart2+size;
-         jstart4 = jstart3+size;
-         jstart5 = jstart4+size;
-         jstart6 = jstart5+size;
-         jstart7 = jstart6+size;
+         jstart = j * size;
+         jstart1 = jstart + size;
+         jstart2 = jstart1 + size;
+         jstart3 = jstart2 + size;
+         jstart4 = jstart3 + size;
+         jstart5 = jstart4 + size;
+         jstart6 = jstart5 + size;
+         jstart7 = jstart6 + size;
 #if defined(HYPRE_USING_OPENMP)
-#pragma omp parallel for private(i) reduction(+:res_x1,res_x2,res_x3,res_x4,res_x5,res_x6,res_x7,res_x8,res_y1,res_y2,res_y3,res_y4,res_y5,res_y6,res_y7,res_y8) HYPRE_SMP_SCHEDULE
+         #pragma omp parallel for private(i) reduction(+:res_x1,res_x2,res_x3,res_x4,res_x5,res_x6,res_x7,res_x8,res_y1,res_y2,res_y3,res_y4,res_y5,res_y6,res_y7,res_y8) HYPRE_SMP_SCHEDULE
 #endif
          for (i = 0; i < size; i++)
          {
-            res_x1 += hypre_conj(z_data[jstart+i]) * x_data[i];
-            res_y1 += hypre_conj(z_data[jstart+i]) * y_data[i];
-            res_x2 += hypre_conj(z_data[jstart1+i]) * x_data[i];
-            res_y2 += hypre_conj(z_data[jstart1+i]) * y_data[i];
-            res_x3 += hypre_conj(z_data[jstart2+i]) * x_data[i];
-            res_y3 += hypre_conj(z_data[jstart2+i]) * y_data[i];
-            res_x4 += hypre_conj(z_data[jstart3+i]) * x_data[i];
-            res_y4 += hypre_conj(z_data[jstart3+i]) * y_data[i];
-            res_x5 += hypre_conj(z_data[jstart4+i]) * x_data[i];
-            res_y5 += hypre_conj(z_data[jstart4+i]) * y_data[i];
-            res_x6 += hypre_conj(z_data[jstart5+i]) * x_data[i];
-            res_y6 += hypre_conj(z_data[jstart5+i]) * y_data[i];
-            res_x7 += hypre_conj(z_data[jstart6+i]) * x_data[i];
-            res_y7 += hypre_conj(z_data[jstart6+i]) * y_data[i];
-            res_x8 += hypre_conj(z_data[jstart7+i]) * x_data[i];
-            res_y8 += hypre_conj(z_data[jstart7+i]) * y_data[i];
+            res_x1 += hypre_conj(z_data[jstart + i]) * x_data[i];
+            res_y1 += hypre_conj(z_data[jstart + i]) * y_data[i];
+            res_x2 += hypre_conj(z_data[jstart1 + i]) * x_data[i];
+            res_y2 += hypre_conj(z_data[jstart1 + i]) * y_data[i];
+            res_x3 += hypre_conj(z_data[jstart2 + i]) * x_data[i];
+            res_y3 += hypre_conj(z_data[jstart2 + i]) * y_data[i];
+            res_x4 += hypre_conj(z_data[jstart3 + i]) * x_data[i];
+            res_y4 += hypre_conj(z_data[jstart3 + i]) * y_data[i];
+            res_x5 += hypre_conj(z_data[jstart4 + i]) * x_data[i];
+            res_y5 += hypre_conj(z_data[jstart4 + i]) * y_data[i];
+            res_x6 += hypre_conj(z_data[jstart5 + i]) * x_data[i];
+            res_y6 += hypre_conj(z_data[jstart5 + i]) * y_data[i];
+            res_x7 += hypre_conj(z_data[jstart6 + i]) * x_data[i];
+            res_y7 += hypre_conj(z_data[jstart6 + i]) * y_data[i];
+            res_x8 += hypre_conj(z_data[jstart7 + i]) * x_data[i];
+            res_y8 += hypre_conj(z_data[jstart7 + i]) * y_data[i];
          }
          result_x[j] = res_x1;
-         result_x[j+1] = res_x2;
-         result_x[j+2] = res_x3;
-         result_x[j+3] = res_x4;
-         result_x[j+4] = res_x5;
-         result_x[j+5] = res_x6;
-         result_x[j+6] = res_x7;
-         result_x[j+7] = res_x8;
+         result_x[j + 1] = res_x2;
+         result_x[j + 2] = res_x3;
+         result_x[j + 3] = res_x4;
+         result_x[j + 4] = res_x5;
+         result_x[j + 5] = res_x6;
+         result_x[j + 6] = res_x7;
+         result_x[j + 7] = res_x8;
          result_y[j] = res_y1;
-         result_y[j+1] = res_y2;
-         result_y[j+2] = res_y3;
-         result_y[j+3] = res_y4;
-         result_y[j+4] = res_y5;
-         result_y[j+5] = res_y6;
-         result_y[j+6] = res_y7;
-         result_y[j+7] = res_y8;
+         result_y[j + 1] = res_y2;
+         result_y[j + 2] = res_y3;
+         result_y[j + 3] = res_y4;
+         result_y[j + 4] = res_y5;
+         result_y[j + 5] = res_y6;
+         result_y[j + 6] = res_y7;
+         result_y[j + 7] = res_y8;
       }
    }
    if (restk == 1)
    {
       res_x1 = 0;
       res_y1 = 0;
-      jstart = (k-1)*size;
+      jstart = (k - 1) * size;
 #if defined(HYPRE_USING_OPENMP)
-#pragma omp parallel for private(i) reduction(+:res_x1,res_y1) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) reduction(+:res_x1,res_y1) HYPRE_SMP_SCHEDULE
 #endif
       for (i = 0; i < size; i++)
       {
-         res_x1 += hypre_conj(z_data[jstart+i]) * x_data[i];
-         res_y1 += hypre_conj(z_data[jstart+i]) * y_data[i];
+         res_x1 += hypre_conj(z_data[jstart + i]) * x_data[i];
+         res_y1 += hypre_conj(z_data[jstart + i]) * y_data[i];
       }
-      result_x[k-1] = res_x1;
-      result_y[k-1] = res_y1;
+      result_x[k - 1] = res_x1;
+      result_y[k - 1] = res_y1;
    }
    else if (restk == 2)
    {
@@ -732,22 +736,22 @@ HYPRE_Int hypre_SeqVectorMassDotpTwo8( hypre_Vector *x, hypre_Vector *y,
       res_x2 = 0;
       res_y1 = 0;
       res_y2 = 0;
-      jstart = (k-2)*size;
-      jstart1 = jstart+size;
+      jstart = (k - 2) * size;
+      jstart1 = jstart + size;
 #if defined(HYPRE_USING_OPENMP)
-#pragma omp parallel for private(i) reduction(+:res_x1,res_x2,res_y1,res_y2) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) reduction(+:res_x1,res_x2,res_y1,res_y2) HYPRE_SMP_SCHEDULE
 #endif
       for (i = 0; i < size; i++)
       {
-         res_x1 += hypre_conj(z_data[jstart+i]) * x_data[i];
-         res_y1 += hypre_conj(z_data[jstart+i]) * y_data[i];
-         res_x2 += hypre_conj(z_data[jstart1+i]) * x_data[i];
-         res_y2 += hypre_conj(z_data[jstart1+i]) * y_data[i];
+         res_x1 += hypre_conj(z_data[jstart + i]) * x_data[i];
+         res_y1 += hypre_conj(z_data[jstart + i]) * y_data[i];
+         res_x2 += hypre_conj(z_data[jstart1 + i]) * x_data[i];
+         res_y2 += hypre_conj(z_data[jstart1 + i]) * y_data[i];
       }
-      result_x[k-2] = res_x1;
-      result_x[k-1] = res_x2;
-      result_y[k-2] = res_y1;
-      result_y[k-1] = res_y2;
+      result_x[k - 2] = res_x1;
+      result_x[k - 1] = res_x2;
+      result_y[k - 2] = res_y1;
+      result_y[k - 1] = res_y2;
    }
    else if (restk == 3)
    {
@@ -757,27 +761,27 @@ HYPRE_Int hypre_SeqVectorMassDotpTwo8( hypre_Vector *x, hypre_Vector *y,
       res_y1 = 0;
       res_y2 = 0;
       res_y3 = 0;
-      jstart = (k-3)*size;
-      jstart1 = jstart+size;
-      jstart2 = jstart1+size;
+      jstart = (k - 3) * size;
+      jstart1 = jstart + size;
+      jstart2 = jstart1 + size;
 #if defined(HYPRE_USING_OPENMP)
-#pragma omp parallel for private(i) reduction(+:res_x1,res_x2,res_x3,res_y1,res_y2,res_y3) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) reduction(+:res_x1,res_x2,res_x3,res_y1,res_y2,res_y3) HYPRE_SMP_SCHEDULE
 #endif
       for (i = 0; i < size; i++)
       {
-         res_x1 += hypre_conj(z_data[jstart+i]) * x_data[i];
-         res_y1 += hypre_conj(z_data[jstart+i]) * y_data[i];
-         res_x2 += hypre_conj(z_data[jstart1+i]) * x_data[i];
-         res_y2 += hypre_conj(z_data[jstart1+i]) * y_data[i];
-         res_x3 += hypre_conj(z_data[jstart2+i]) * x_data[i];
-         res_y3 += hypre_conj(z_data[jstart2+i]) * y_data[i];
+         res_x1 += hypre_conj(z_data[jstart + i]) * x_data[i];
+         res_y1 += hypre_conj(z_data[jstart + i]) * y_data[i];
+         res_x2 += hypre_conj(z_data[jstart1 + i]) * x_data[i];
+         res_y2 += hypre_conj(z_data[jstart1 + i]) * y_data[i];
+         res_x3 += hypre_conj(z_data[jstart2 + i]) * x_data[i];
+         res_y3 += hypre_conj(z_data[jstart2 + i]) * y_data[i];
       }
-      result_x[k-3] = res_x1;
-      result_x[k-2] = res_x2;
-      result_x[k-1] = res_x3;
-      result_y[k-3] = res_y1;
-      result_y[k-2] = res_y2;
-      result_y[k-1] = res_y3;
+      result_x[k - 3] = res_x1;
+      result_x[k - 2] = res_x2;
+      result_x[k - 1] = res_x3;
+      result_y[k - 3] = res_y1;
+      result_y[k - 2] = res_y2;
+      result_y[k - 1] = res_y3;
    }
    else if (restk == 4)
    {
@@ -789,32 +793,32 @@ HYPRE_Int hypre_SeqVectorMassDotpTwo8( hypre_Vector *x, hypre_Vector *y,
       res_y2 = 0;
       res_y3 = 0;
       res_y4 = 0;
-      jstart = (k-4)*size;
-      jstart1 = jstart+size;
-      jstart2 = jstart1+size;
-      jstart3 = jstart2+size;
+      jstart = (k - 4) * size;
+      jstart1 = jstart + size;
+      jstart2 = jstart1 + size;
+      jstart3 = jstart2 + size;
 #if defined(HYPRE_USING_OPENMP)
-#pragma omp parallel for private(i) reduction(+:res_x1,res_x2,res_x3,res_x4,res_y1,res_y2,res_y3,res_y4) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) reduction(+:res_x1,res_x2,res_x3,res_x4,res_y1,res_y2,res_y3,res_y4) HYPRE_SMP_SCHEDULE
 #endif
       for (i = 0; i < size; i++)
       {
-         res_x1 += hypre_conj(z_data[jstart+i]) * x_data[i];
-         res_y1 += hypre_conj(z_data[jstart+i]) * y_data[i];
-         res_x2 += hypre_conj(z_data[jstart1+i]) * x_data[i];
-         res_y2 += hypre_conj(z_data[jstart1+i]) * y_data[i];
-         res_x3 += hypre_conj(z_data[jstart2+i]) * x_data[i];
-         res_y3 += hypre_conj(z_data[jstart2+i]) * y_data[i];
-         res_x4 += hypre_conj(z_data[jstart3+i]) * x_data[i];
-         res_y4 += hypre_conj(z_data[jstart3+i]) * y_data[i];
+         res_x1 += hypre_conj(z_data[jstart + i]) * x_data[i];
+         res_y1 += hypre_conj(z_data[jstart + i]) * y_data[i];
+         res_x2 += hypre_conj(z_data[jstart1 + i]) * x_data[i];
+         res_y2 += hypre_conj(z_data[jstart1 + i]) * y_data[i];
+         res_x3 += hypre_conj(z_data[jstart2 + i]) * x_data[i];
+         res_y3 += hypre_conj(z_data[jstart2 + i]) * y_data[i];
+         res_x4 += hypre_conj(z_data[jstart3 + i]) * x_data[i];
+         res_y4 += hypre_conj(z_data[jstart3 + i]) * y_data[i];
       }
-      result_x[k-4] = res_x1;
-      result_x[k-3] = res_x2;
-      result_x[k-2] = res_x3;
-      result_x[k-1] = res_x4;
-      result_y[k-4] = res_y1;
-      result_y[k-3] = res_y2;
-      result_y[k-2] = res_y3;
-      result_y[k-1] = res_y4;
+      result_x[k - 4] = res_x1;
+      result_x[k - 3] = res_x2;
+      result_x[k - 2] = res_x3;
+      result_x[k - 1] = res_x4;
+      result_y[k - 4] = res_y1;
+      result_y[k - 3] = res_y2;
+      result_y[k - 2] = res_y3;
+      result_y[k - 1] = res_y4;
    }
    else if (restk == 5)
    {
@@ -828,37 +832,37 @@ HYPRE_Int hypre_SeqVectorMassDotpTwo8( hypre_Vector *x, hypre_Vector *y,
       res_y3 = 0;
       res_y4 = 0;
       res_y5 = 0;
-      jstart = (k-5)*size;
-      jstart1 = jstart+size;
-      jstart2 = jstart1+size;
-      jstart3 = jstart2+size;
-      jstart4 = jstart3+size;
+      jstart = (k - 5) * size;
+      jstart1 = jstart + size;
+      jstart2 = jstart1 + size;
+      jstart3 = jstart2 + size;
+      jstart4 = jstart3 + size;
 #if defined(HYPRE_USING_OPENMP)
-#pragma omp parallel for private(i) reduction(+:res_x1,res_x2,res_x3,res_x4,res_x5,res_y1,res_y2,res_y3,res_y4,res_y5) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) reduction(+:res_x1,res_x2,res_x3,res_x4,res_x5,res_y1,res_y2,res_y3,res_y4,res_y5) HYPRE_SMP_SCHEDULE
 #endif
       for (i = 0; i < size; i++)
       {
-         res_x1 += hypre_conj(z_data[jstart+i]) * x_data[i];
-         res_y1 += hypre_conj(z_data[jstart+i]) * y_data[i];
-         res_x2 += hypre_conj(z_data[jstart1+i]) * x_data[i];
-         res_y2 += hypre_conj(z_data[jstart1+i]) * y_data[i];
-         res_x3 += hypre_conj(z_data[jstart2+i]) * x_data[i];
-         res_y3 += hypre_conj(z_data[jstart2+i]) * y_data[i];
-         res_x4 += hypre_conj(z_data[jstart3+i]) * x_data[i];
-         res_y4 += hypre_conj(z_data[jstart3+i]) * y_data[i];
-         res_x5 += hypre_conj(z_data[jstart4+i]) * x_data[i];
-         res_y5 += hypre_conj(z_data[jstart4+i]) * y_data[i];
+         res_x1 += hypre_conj(z_data[jstart + i]) * x_data[i];
+         res_y1 += hypre_conj(z_data[jstart + i]) * y_data[i];
+         res_x2 += hypre_conj(z_data[jstart1 + i]) * x_data[i];
+         res_y2 += hypre_conj(z_data[jstart1 + i]) * y_data[i];
+         res_x3 += hypre_conj(z_data[jstart2 + i]) * x_data[i];
+         res_y3 += hypre_conj(z_data[jstart2 + i]) * y_data[i];
+         res_x4 += hypre_conj(z_data[jstart3 + i]) * x_data[i];
+         res_y4 += hypre_conj(z_data[jstart3 + i]) * y_data[i];
+         res_x5 += hypre_conj(z_data[jstart4 + i]) * x_data[i];
+         res_y5 += hypre_conj(z_data[jstart4 + i]) * y_data[i];
       }
-      result_x[k-5] = res_x1;
-      result_x[k-4] = res_x2;
-      result_x[k-3] = res_x3;
-      result_x[k-2] = res_x4;
-      result_x[k-1] = res_x5;
-      result_y[k-5] = res_y1;
-      result_y[k-4] = res_y2;
-      result_y[k-3] = res_y3;
-      result_y[k-2] = res_y4;
-      result_y[k-1] = res_y5;
+      result_x[k - 5] = res_x1;
+      result_x[k - 4] = res_x2;
+      result_x[k - 3] = res_x3;
+      result_x[k - 2] = res_x4;
+      result_x[k - 1] = res_x5;
+      result_y[k - 5] = res_y1;
+      result_y[k - 4] = res_y2;
+      result_y[k - 3] = res_y3;
+      result_y[k - 2] = res_y4;
+      result_y[k - 1] = res_y5;
    }
    else if (restk == 6)
    {
@@ -874,42 +878,42 @@ HYPRE_Int hypre_SeqVectorMassDotpTwo8( hypre_Vector *x, hypre_Vector *y,
       res_y4 = 0;
       res_y5 = 0;
       res_y6 = 0;
-      jstart = (k-6)*size;
-      jstart1 = jstart+size;
-      jstart2 = jstart1+size;
-      jstart3 = jstart2+size;
-      jstart4 = jstart3+size;
-      jstart5 = jstart4+size;
+      jstart = (k - 6) * size;
+      jstart1 = jstart + size;
+      jstart2 = jstart1 + size;
+      jstart3 = jstart2 + size;
+      jstart4 = jstart3 + size;
+      jstart5 = jstart4 + size;
 #if defined(HYPRE_USING_OPENMP)
-#pragma omp parallel for private(i) reduction(+:res_x1,res_x2,res_x3,res_x4,res_x5,res_x6,res_y1,res_y2,res_y3,res_y4,res_y5,res_y6) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) reduction(+:res_x1,res_x2,res_x3,res_x4,res_x5,res_x6,res_y1,res_y2,res_y3,res_y4,res_y5,res_y6) HYPRE_SMP_SCHEDULE
 #endif
       for (i = 0; i < size; i++)
       {
-         res_x1 += hypre_conj(z_data[jstart+i]) * x_data[i];
-         res_y1 += hypre_conj(z_data[jstart+i]) * y_data[i];
-         res_x2 += hypre_conj(z_data[jstart1+i]) * x_data[i];
-         res_y2 += hypre_conj(z_data[jstart1+i]) * y_data[i];
-         res_x3 += hypre_conj(z_data[jstart2+i]) * x_data[i];
-         res_y3 += hypre_conj(z_data[jstart2+i]) * y_data[i];
-         res_x4 += hypre_conj(z_data[jstart3+i]) * x_data[i];
-         res_y4 += hypre_conj(z_data[jstart3+i]) * y_data[i];
-         res_x5 += hypre_conj(z_data[jstart4+i]) * x_data[i];
-         res_y5 += hypre_conj(z_data[jstart4+i]) * y_data[i];
-         res_x6 += hypre_conj(z_data[jstart5+i]) * x_data[i];
-         res_y6 += hypre_conj(z_data[jstart5+i]) * y_data[i];
+         res_x1 += hypre_conj(z_data[jstart + i]) * x_data[i];
+         res_y1 += hypre_conj(z_data[jstart + i]) * y_data[i];
+         res_x2 += hypre_conj(z_data[jstart1 + i]) * x_data[i];
+         res_y2 += hypre_conj(z_data[jstart1 + i]) * y_data[i];
+         res_x3 += hypre_conj(z_data[jstart2 + i]) * x_data[i];
+         res_y3 += hypre_conj(z_data[jstart2 + i]) * y_data[i];
+         res_x4 += hypre_conj(z_data[jstart3 + i]) * x_data[i];
+         res_y4 += hypre_conj(z_data[jstart3 + i]) * y_data[i];
+         res_x5 += hypre_conj(z_data[jstart4 + i]) * x_data[i];
+         res_y5 += hypre_conj(z_data[jstart4 + i]) * y_data[i];
+         res_x6 += hypre_conj(z_data[jstart5 + i]) * x_data[i];
+         res_y6 += hypre_conj(z_data[jstart5 + i]) * y_data[i];
       }
-      result_x[k-6] = res_x1;
-      result_x[k-5] = res_x2;
-      result_x[k-4] = res_x3;
-      result_x[k-3] = res_x4;
-      result_x[k-2] = res_x5;
-      result_x[k-1] = res_x6;
-      result_y[k-6] = res_y1;
-      result_y[k-5] = res_y2;
-      result_y[k-4] = res_y3;
-      result_y[k-3] = res_y4;
-      result_y[k-2] = res_y5;
-      result_y[k-1] = res_y6;
+      result_x[k - 6] = res_x1;
+      result_x[k - 5] = res_x2;
+      result_x[k - 4] = res_x3;
+      result_x[k - 3] = res_x4;
+      result_x[k - 2] = res_x5;
+      result_x[k - 1] = res_x6;
+      result_y[k - 6] = res_y1;
+      result_y[k - 5] = res_y2;
+      result_y[k - 4] = res_y3;
+      result_y[k - 3] = res_y4;
+      result_y[k - 2] = res_y5;
+      result_y[k - 1] = res_y6;
    }
    else if (restk == 7)
    {
@@ -927,47 +931,47 @@ HYPRE_Int hypre_SeqVectorMassDotpTwo8( hypre_Vector *x, hypre_Vector *y,
       res_y5 = 0;
       res_y6 = 0;
       res_y7 = 0;
-      jstart = (k-7)*size;
-      jstart1 = jstart+size;
-      jstart2 = jstart1+size;
-      jstart3 = jstart2+size;
-      jstart4 = jstart3+size;
-      jstart5 = jstart4+size;
-      jstart6 = jstart5+size;
+      jstart = (k - 7) * size;
+      jstart1 = jstart + size;
+      jstart2 = jstart1 + size;
+      jstart3 = jstart2 + size;
+      jstart4 = jstart3 + size;
+      jstart5 = jstart4 + size;
+      jstart6 = jstart5 + size;
 #if defined(HYPRE_USING_OPENMP)
-#pragma omp parallel for private(i) reduction(+:res_x1,res_x2,res_x3,res_x4,res_x5,res_x6,res_x7,res_y1,res_y2,res_y3,res_y4,res_y5,res_y6,res_y7) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) reduction(+:res_x1,res_x2,res_x3,res_x4,res_x5,res_x6,res_x7,res_y1,res_y2,res_y3,res_y4,res_y5,res_y6,res_y7) HYPRE_SMP_SCHEDULE
 #endif
       for (i = 0; i < size; i++)
       {
-         res_x1 += hypre_conj(z_data[jstart+i]) * x_data[i];
-         res_y1 += hypre_conj(z_data[jstart+i]) * y_data[i];
-         res_x2 += hypre_conj(z_data[jstart1+i]) * x_data[i];
-         res_y2 += hypre_conj(z_data[jstart1+i]) * y_data[i];
-         res_x3 += hypre_conj(z_data[jstart2+i]) * x_data[i];
-         res_y3 += hypre_conj(z_data[jstart2+i]) * y_data[i];
-         res_x4 += hypre_conj(z_data[jstart3+i]) * x_data[i];
-         res_y4 += hypre_conj(z_data[jstart3+i]) * y_data[i];
-         res_x5 += hypre_conj(z_data[jstart4+i]) * x_data[i];
-         res_y5 += hypre_conj(z_data[jstart4+i]) * y_data[i];
-         res_x6 += hypre_conj(z_data[jstart5+i]) * x_data[i];
-         res_y6 += hypre_conj(z_data[jstart5+i]) * y_data[i];
-         res_x7 += hypre_conj(z_data[jstart6+i]) * x_data[i];
-         res_y7 += hypre_conj(z_data[jstart6+i]) * y_data[i];
+         res_x1 += hypre_conj(z_data[jstart + i]) * x_data[i];
+         res_y1 += hypre_conj(z_data[jstart + i]) * y_data[i];
+         res_x2 += hypre_conj(z_data[jstart1 + i]) * x_data[i];
+         res_y2 += hypre_conj(z_data[jstart1 + i]) * y_data[i];
+         res_x3 += hypre_conj(z_data[jstart2 + i]) * x_data[i];
+         res_y3 += hypre_conj(z_data[jstart2 + i]) * y_data[i];
+         res_x4 += hypre_conj(z_data[jstart3 + i]) * x_data[i];
+         res_y4 += hypre_conj(z_data[jstart3 + i]) * y_data[i];
+         res_x5 += hypre_conj(z_data[jstart4 + i]) * x_data[i];
+         res_y5 += hypre_conj(z_data[jstart4 + i]) * y_data[i];
+         res_x6 += hypre_conj(z_data[jstart5 + i]) * x_data[i];
+         res_y6 += hypre_conj(z_data[jstart5 + i]) * y_data[i];
+         res_x7 += hypre_conj(z_data[jstart6 + i]) * x_data[i];
+         res_y7 += hypre_conj(z_data[jstart6 + i]) * y_data[i];
       }
-      result_x[k-7] = res_x1;
-      result_x[k-6] = res_x2;
-      result_x[k-5] = res_x3;
-      result_x[k-4] = res_x4;
-      result_x[k-3] = res_x5;
-      result_x[k-2] = res_x6;
-      result_x[k-1] = res_x7;
-      result_y[k-7] = res_y1;
-      result_y[k-6] = res_y2;
-      result_y[k-5] = res_y3;
-      result_y[k-4] = res_y4;
-      result_y[k-3] = res_y5;
-      result_y[k-2] = res_y6;
-      result_y[k-1] = res_y7;
+      result_x[k - 7] = res_x1;
+      result_x[k - 6] = res_x2;
+      result_x[k - 5] = res_x3;
+      result_x[k - 4] = res_x4;
+      result_x[k - 3] = res_x5;
+      result_x[k - 2] = res_x6;
+      result_x[k - 1] = res_x7;
+      result_y[k - 7] = res_y1;
+      result_y[k - 6] = res_y2;
+      result_y[k - 5] = res_y3;
+      result_y[k - 4] = res_y4;
+      result_y[k - 3] = res_y5;
+      result_y[k - 2] = res_y6;
+      result_y[k - 1] = res_y7;
    }
 
 
@@ -978,7 +982,7 @@ HYPRE_Int hypre_SeqVectorMassDotpTwo8( hypre_Vector *x, hypre_Vector *y,
  * hypre_SeqVectorMassDotpTwo4
  *--------------------------------------------------------------------------*/
 HYPRE_Int hypre_SeqVectorMassDotpTwo4( hypre_Vector *x, hypre_Vector *y,
-                       hypre_Vector **z, HYPRE_Int k, HYPRE_Real *result_x, HYPRE_Real *result_y)
+                                       hypre_Vector **z, HYPRE_Int k, HYPRE_Real *result_x, HYPRE_Real *result_y)
 {
    HYPRE_Complex *x_data = hypre_VectorData(x);
    HYPRE_Complex *y_data = hypre_VectorData(y);
@@ -999,11 +1003,11 @@ HYPRE_Int hypre_SeqVectorMassDotpTwo4( hypre_Vector *x, hypre_Vector *y,
    HYPRE_Int jstart2;
    HYPRE_Int jstart3;
 
-   restk = (k-(k/4*4));
+   restk = (k - (k / 4 * 4));
 
    if (k > 3)
    {
-      for (j = 0; j < k-3; j += 4)
+      for (j = 0; j < k - 3; j += 4)
       {
          res_x1 = 0;
          res_x2 = 0;
@@ -1013,49 +1017,49 @@ HYPRE_Int hypre_SeqVectorMassDotpTwo4( hypre_Vector *x, hypre_Vector *y,
          res_y2 = 0;
          res_y3 = 0;
          res_y4 = 0;
-         jstart = j*size;
-         jstart1 = jstart+size;
-         jstart2 = jstart1+size;
-         jstart3 = jstart2+size;
+         jstart = j * size;
+         jstart1 = jstart + size;
+         jstart2 = jstart1 + size;
+         jstart3 = jstart2 + size;
 #if defined(HYPRE_USING_OPENMP)
-#pragma omp parallel for private(i) reduction(+:res_x1,res_x2,res_x3,res_x4,res_y1,res_y2,res_y3,res_y4) HYPRE_SMP_SCHEDULE
+         #pragma omp parallel for private(i) reduction(+:res_x1,res_x2,res_x3,res_x4,res_y1,res_y2,res_y3,res_y4) HYPRE_SMP_SCHEDULE
 #endif
          for (i = 0; i < size; i++)
          {
-            res_x1 += hypre_conj(z_data[jstart+i]) * x_data[i];
-            res_y1 += hypre_conj(z_data[jstart+i]) * y_data[i];
-            res_x2 += hypre_conj(z_data[jstart1+i]) * x_data[i];
-            res_y2 += hypre_conj(z_data[jstart1+i]) * y_data[i];
-            res_x3 += hypre_conj(z_data[jstart2+i]) * x_data[i];
-            res_y3 += hypre_conj(z_data[jstart2+i]) * y_data[i];
-            res_x4 += hypre_conj(z_data[jstart3+i]) * x_data[i];
-            res_y4 += hypre_conj(z_data[jstart3+i]) * y_data[i];
+            res_x1 += hypre_conj(z_data[jstart + i]) * x_data[i];
+            res_y1 += hypre_conj(z_data[jstart + i]) * y_data[i];
+            res_x2 += hypre_conj(z_data[jstart1 + i]) * x_data[i];
+            res_y2 += hypre_conj(z_data[jstart1 + i]) * y_data[i];
+            res_x3 += hypre_conj(z_data[jstart2 + i]) * x_data[i];
+            res_y3 += hypre_conj(z_data[jstart2 + i]) * y_data[i];
+            res_x4 += hypre_conj(z_data[jstart3 + i]) * x_data[i];
+            res_y4 += hypre_conj(z_data[jstart3 + i]) * y_data[i];
          }
          result_x[j] = res_x1;
-         result_x[j+1] = res_x2;
-         result_x[j+2] = res_x3;
-         result_x[j+3] = res_x4;
+         result_x[j + 1] = res_x2;
+         result_x[j + 2] = res_x3;
+         result_x[j + 3] = res_x4;
          result_y[j] = res_y1;
-         result_y[j+1] = res_y2;
-         result_y[j+2] = res_y3;
-         result_y[j+3] = res_y4;
+         result_y[j + 1] = res_y2;
+         result_y[j + 2] = res_y3;
+         result_y[j + 3] = res_y4;
       }
    }
    if (restk == 1)
    {
       res_x1 = 0;
       res_y1 = 0;
-      jstart = (k-1)*size;
+      jstart = (k - 1) * size;
 #if defined(HYPRE_USING_OPENMP)
-#pragma omp parallel for private(i) reduction(+:res_x1,res_y1) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) reduction(+:res_x1,res_y1) HYPRE_SMP_SCHEDULE
 #endif
       for (i = 0; i < size; i++)
       {
-         res_x1 += hypre_conj(z_data[jstart+i]) * x_data[i];
-         res_y1 += hypre_conj(z_data[jstart+i]) * y_data[i];
+         res_x1 += hypre_conj(z_data[jstart + i]) * x_data[i];
+         res_y1 += hypre_conj(z_data[jstart + i]) * y_data[i];
       }
-      result_x[k-1] = res_x1;
-      result_y[k-1] = res_y1;
+      result_x[k - 1] = res_x1;
+      result_y[k - 1] = res_y1;
    }
    else if (restk == 2)
    {
@@ -1063,22 +1067,22 @@ HYPRE_Int hypre_SeqVectorMassDotpTwo4( hypre_Vector *x, hypre_Vector *y,
       res_x2 = 0;
       res_y1 = 0;
       res_y2 = 0;
-      jstart = (k-2)*size;
-      jstart1 = jstart+size;
+      jstart = (k - 2) * size;
+      jstart1 = jstart + size;
 #if defined(HYPRE_USING_OPENMP)
-#pragma omp parallel for private(i) reduction(+:res_x1,res_x2,res_y1,res_y2) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) reduction(+:res_x1,res_x2,res_y1,res_y2) HYPRE_SMP_SCHEDULE
 #endif
       for (i = 0; i < size; i++)
       {
-         res_x1 += hypre_conj(z_data[jstart+i]) * x_data[i];
-         res_y1 += hypre_conj(z_data[jstart+i]) * y_data[i];
-         res_x2 += hypre_conj(z_data[jstart1+i]) * x_data[i];
-         res_y2 += hypre_conj(z_data[jstart1+i]) * y_data[i];
+         res_x1 += hypre_conj(z_data[jstart + i]) * x_data[i];
+         res_y1 += hypre_conj(z_data[jstart + i]) * y_data[i];
+         res_x2 += hypre_conj(z_data[jstart1 + i]) * x_data[i];
+         res_y2 += hypre_conj(z_data[jstart1 + i]) * y_data[i];
       }
-      result_x[k-2] = res_x1;
-      result_x[k-1] = res_x2;
-      result_y[k-2] = res_y1;
-      result_y[k-1] = res_y2;
+      result_x[k - 2] = res_x1;
+      result_x[k - 1] = res_x2;
+      result_y[k - 2] = res_y1;
+      result_y[k - 1] = res_y2;
    }
    else if (restk == 3)
    {
@@ -1088,27 +1092,27 @@ HYPRE_Int hypre_SeqVectorMassDotpTwo4( hypre_Vector *x, hypre_Vector *y,
       res_y1 = 0;
       res_y2 = 0;
       res_y3 = 0;
-      jstart = (k-3)*size;
-      jstart1 = jstart+size;
-      jstart2 = jstart1+size;
+      jstart = (k - 3) * size;
+      jstart1 = jstart + size;
+      jstart2 = jstart1 + size;
 #if defined(HYPRE_USING_OPENMP)
-#pragma omp parallel for private(i) reduction(+:res_x1,res_x2,res_x3,res_y1,res_y2,res_y3) HYPRE_SMP_SCHEDULE
+      #pragma omp parallel for private(i) reduction(+:res_x1,res_x2,res_x3,res_y1,res_y2,res_y3) HYPRE_SMP_SCHEDULE
 #endif
       for (i = 0; i < size; i++)
       {
-         res_x1 += hypre_conj(z_data[jstart+i]) * x_data[i];
-         res_y1 += hypre_conj(z_data[jstart+i]) * y_data[i];
-         res_x2 += hypre_conj(z_data[jstart1+i]) * x_data[i];
-         res_y2 += hypre_conj(z_data[jstart1+i]) * y_data[i];
-         res_x3 += hypre_conj(z_data[jstart2+i]) * x_data[i];
-         res_y3 += hypre_conj(z_data[jstart2+i]) * y_data[i];
+         res_x1 += hypre_conj(z_data[jstart + i]) * x_data[i];
+         res_y1 += hypre_conj(z_data[jstart + i]) * y_data[i];
+         res_x2 += hypre_conj(z_data[jstart1 + i]) * x_data[i];
+         res_y2 += hypre_conj(z_data[jstart1 + i]) * y_data[i];
+         res_x3 += hypre_conj(z_data[jstart2 + i]) * x_data[i];
+         res_y3 += hypre_conj(z_data[jstart2 + i]) * y_data[i];
       }
-      result_x[k-3] = res_x1;
-      result_x[k-2] = res_x2;
-      result_x[k-1] = res_x3;
-      result_y[k-3] = res_y1;
-      result_y[k-2] = res_y2;
-      result_y[k-1] = res_y3;
+      result_x[k - 3] = res_x1;
+      result_x[k - 2] = res_x2;
+      result_x[k - 1] = res_x3;
+      result_y[k - 3] = res_y1;
+      result_y[k - 2] = res_y2;
+      result_y[k - 1] = res_y3;
    }
 
 
@@ -1116,7 +1120,7 @@ HYPRE_Int hypre_SeqVectorMassDotpTwo4( hypre_Vector *x, hypre_Vector *y,
 }
 
 HYPRE_Int hypre_SeqVectorMassInnerProd( hypre_Vector *x,
-          hypre_Vector **y, HYPRE_Int k, HYPRE_Int unroll, HYPRE_Real *result)
+                                        hypre_Vector **y, HYPRE_Int k, HYPRE_Int unroll, HYPRE_Real *result)
 {
    HYPRE_Complex *x_data = hypre_VectorData(x);
    HYPRE_Complex *y_data = hypre_VectorData(y[0]);
@@ -1127,12 +1131,12 @@ HYPRE_Int hypre_SeqVectorMassInnerProd( hypre_Vector *x,
 
    if (unroll == 8)
    {
-      hypre_SeqVectorMassInnerProd8(x,y,k,result);
+      hypre_SeqVectorMassInnerProd8(x, y, k, result);
       return hypre_error_flag;
    }
    else if (unroll == 4)
    {
-      hypre_SeqVectorMassInnerProd4(x,y,k,result);
+      hypre_SeqVectorMassInnerProd4(x, y, k, result);
       return hypre_error_flag;
    }
    else
@@ -1140,13 +1144,13 @@ HYPRE_Int hypre_SeqVectorMassInnerProd( hypre_Vector *x,
       for (j = 0; j < k; j++)
       {
          res = 0;
-         jstart = j*size;
+         jstart = j * size;
 #if defined(HYPRE_USING_OPENMP)
-#pragma omp parallel for private(i) reduction(+:res) HYPRE_SMP_SCHEDULE
+         #pragma omp parallel for private(i) reduction(+:res) HYPRE_SMP_SCHEDULE
 #endif
          for (i = 0; i < size; i++)
          {
-            res += hypre_conj(y_data[jstart+i]) * x_data[i];
+            res += hypre_conj(y_data[jstart + i]) * x_data[i];
          }
          result[j] = res;
       }
@@ -1160,8 +1164,8 @@ HYPRE_Int hypre_SeqVectorMassInnerProd( hypre_Vector *x,
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int hypre_SeqVectorMassDotpTwo( hypre_Vector *x, hypre_Vector *y,
-                       hypre_Vector **z, HYPRE_Int k,  HYPRE_Int unroll,
-                       HYPRE_Real *result_x, HYPRE_Real *result_y)
+                                      hypre_Vector **z, HYPRE_Int k,  HYPRE_Int unroll,
+                                      HYPRE_Real *result_x, HYPRE_Real *result_y)
 {
    HYPRE_Complex *x_data = hypre_VectorData(x);
    HYPRE_Complex *y_data = hypre_VectorData(y);
@@ -1173,12 +1177,12 @@ HYPRE_Int hypre_SeqVectorMassDotpTwo( hypre_Vector *x, hypre_Vector *y,
 
    if (unroll == 8)
    {
-      hypre_SeqVectorMassDotpTwo8(x,y,z,k,result_x,result_y);
+      hypre_SeqVectorMassDotpTwo8(x, y, z, k, result_x, result_y);
       return hypre_error_flag;
    }
    else if (unroll == 4)
    {
-      hypre_SeqVectorMassDotpTwo4(x,y,z,k,result_x,result_y);
+      hypre_SeqVectorMassDotpTwo4(x, y, z, k, result_x, result_y);
       return hypre_error_flag;
    }
    else
@@ -1187,14 +1191,14 @@ HYPRE_Int hypre_SeqVectorMassDotpTwo( hypre_Vector *x, hypre_Vector *y,
       {
          res_x = 0; //result_x[j];
          res_y = 0; //result_y[j];
-         jstart = j*size;
+         jstart = j * size;
 #if defined(HYPRE_USING_OPENMP)
-#pragma omp parallel for private(i) reduction(+:res_x,res_y) HYPRE_SMP_SCHEDULE
+         #pragma omp parallel for private(i) reduction(+:res_x,res_y) HYPRE_SMP_SCHEDULE
 #endif
          for (i = 0; i < size; i++)
          {
-            res_x += hypre_conj(z_data[jstart+i]) * x_data[i];
-            res_y += hypre_conj(z_data[jstart+i]) * y_data[i];
+            res_x += hypre_conj(z_data[jstart + i]) * x_data[i];
+            res_y += hypre_conj(z_data[jstart + i]) * y_data[i];
          }
          result_x[j] = res_x;
          result_y[j] = res_y;
diff --git a/external/hypre/src/seq_mv/vector_device.c b/external/hypre/src/seq_mv/vector_device.c
new file mode 100644
index 00000000..7fb5eb10
--- /dev/null
+++ b/external/hypre/src/seq_mv/vector_device.c
@@ -0,0 +1,403 @@
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ * Matvec functions for hypre_CSRMatrix class.
+ *
+ *****************************************************************************/
+
+#include "_hypre_onedpl.hpp"
+#include "seq_mv.h"
+#include "_hypre_utilities.hpp"
+#include "seq_mv.hpp"
+
+#if defined(HYPRE_USING_GPU) || defined(HYPRE_USING_DEVICE_OPENMP)
+
+/*--------------------------------------------------------------------------
+ * hypre_SeqVectorSetConstantValuesDevice
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_SeqVectorSetConstantValuesDevice( hypre_Vector *v,
+                                        HYPRE_Complex value )
+{
+   HYPRE_Complex *vector_data = hypre_VectorData(v);
+   HYPRE_Int      num_vectors = hypre_VectorNumVectors(v);
+   HYPRE_Int      size        = hypre_VectorSize(v);
+   HYPRE_Int      total_size  = size * num_vectors;
+
+   //hypre_SeqVectorPrefetch(v, HYPRE_MEMORY_DEVICE);
+
+#if defined(HYPRE_USING_GPU)
+   hypreDevice_ComplexFilln( vector_data, total_size, value );
+
+   hypre_SyncComputeStream();
+
+#elif defined(HYPRE_USING_DEVICE_OPENMP)
+   HYPRE_Int i;
+
+   #pragma omp target teams distribute parallel for private(i) is_device_ptr(vector_data)
+   for (i = 0; i < total_size; i++)
+   {
+      vector_data[i] = value;
+   }
+#endif
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_SeqVectorScaleDevice
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_SeqVectorScaleDevice( HYPRE_Complex alpha,
+                            hypre_Vector *y )
+{
+   HYPRE_Complex *y_data      = hypre_VectorData(y);
+   HYPRE_Int      num_vectors = hypre_VectorNumVectors(y);
+   HYPRE_Int      size        = hypre_VectorSize(y);
+   HYPRE_Int      total_size  = size * num_vectors;
+
+   hypre_GpuProfilingPushRange("SeqVectorScale");
+   //hypre_SeqVectorPrefetch(y, HYPRE_MEMORY_DEVICE);
+
+#if defined(HYPRE_USING_GPU)
+
+#if ( defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP) ) && defined(HYPRE_USING_CUBLAS)
+   HYPRE_CUBLAS_CALL( hypre_cublas_scal(hypre_HandleCublasHandle(hypre_handle()),
+                                        total_size, &alpha, y_data, 1) );
+#elif defined(HYPRE_USING_SYCL) && defined(HYPRE_USING_ONEMKLBLAS)
+   HYPRE_ONEMKL_CALL( oneapi::mkl::blas::scal(*hypre_HandleComputeStream(hypre_handle()),
+                                              total_size, alpha,
+                                              y_data, 1).wait() );
+#else
+   hypreDevice_ComplexScalen( y_data, total_size, y_data, alpha );
+#endif
+
+   hypre_SyncComputeStream();
+
+#elif defined(HYPRE_USING_DEVICE_OPENMP)
+   HYPRE_Int i;
+
+   #pragma omp target teams distribute parallel for private(i) is_device_ptr(y_data)
+   for (i = 0; i < total_size; i++)
+   {
+      y_data[i] *= alpha;
+   }
+#endif
+
+   hypre_GpuProfilingPopRange();
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_SeqVectorAxpyDevice
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_SeqVectorAxpyDevice( HYPRE_Complex alpha,
+                           hypre_Vector *x,
+                           hypre_Vector *y )
+{
+   HYPRE_Complex *x_data      = hypre_VectorData(x);
+   HYPRE_Complex *y_data      = hypre_VectorData(y);
+   HYPRE_Int      num_vectors = hypre_VectorNumVectors(x);
+   HYPRE_Int      size        = hypre_VectorSize(x);
+   HYPRE_Int      total_size  = size * num_vectors;
+
+#if defined(HYPRE_USING_GPU)
+
+#if ( defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP) ) && defined(HYPRE_USING_CUBLAS)
+   HYPRE_CUBLAS_CALL( hypre_cublas_axpy(hypre_HandleCublasHandle(hypre_handle()),
+                                        total_size, &alpha, x_data, 1,
+                                        y_data, 1) );
+#elif defined(HYPRE_USING_SYCL) && defined(HYPRE_USING_ONEMKLBLAS)
+   HYPRE_ONEMKL_CALL( oneapi::mkl::blas::axpy(*hypre_HandleComputeStream(hypre_handle()),
+                                              total_size, alpha,
+                                              x_data, 1, y_data, 1).wait() );
+#else
+   hypreDevice_ComplexAxpyn(x_data, total_size, y_data, y_data, alpha);
+#endif
+
+   hypre_SyncComputeStream();
+
+#elif defined(HYPRE_USING_DEVICE_OPENMP)
+   HYPRE_Int i;
+
+   #pragma omp target teams distribute parallel for private(i) is_device_ptr(y_data, x_data)
+   for (i = 0; i < total_size; i++)
+   {
+      y_data[i] += alpha * x_data[i];
+   }
+#endif
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_SeqVectorAxpyzDevice
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_SeqVectorAxpyzDevice( HYPRE_Complex  alpha,
+                            hypre_Vector  *x,
+                            HYPRE_Complex  beta,
+                            hypre_Vector  *y,
+                            hypre_Vector  *z )
+{
+   HYPRE_Complex  *x_data      = hypre_VectorData(x);
+   HYPRE_Complex  *y_data      = hypre_VectorData(y);
+   HYPRE_Complex  *z_data      = hypre_VectorData(z);
+
+   HYPRE_Int       num_vectors = hypre_VectorNumVectors(x);
+   HYPRE_Int       size        = hypre_VectorSize(x);
+   HYPRE_Int       total_size  = size * num_vectors;
+
+#if defined(HYPRE_USING_GPU)
+   hypreDevice_ComplexAxpyzn(total_size, x_data, y_data, z_data, alpha, beta);
+
+   hypre_SyncComputeStream();
+
+#elif defined(HYPRE_USING_DEVICE_OPENMP)
+   HYPRE_Int i;
+
+   #pragma omp target teams distribute parallel for private(i) is_device_ptr(z_data, y_data, x_data)
+   for (i = 0; i < total_size; i++)
+   {
+      z_data[i] = alpha * x_data[i] + beta * y_data[i];
+   }
+#endif
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_SeqVectorElmdivpyDevice
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_SeqVectorElmdivpyDevice( hypre_Vector *x,
+                               hypre_Vector *b,
+                               hypre_Vector *y,
+                               HYPRE_Int    *marker,
+                               HYPRE_Int     marker_val )
+{
+#if defined(HYPRE_USING_GPU)
+   HYPRE_Complex  *x_data        = hypre_VectorData(x);
+   HYPRE_Complex  *b_data        = hypre_VectorData(b);
+   HYPRE_Complex  *y_data        = hypre_VectorData(y);
+   HYPRE_Int       num_vectors_x = hypre_VectorNumVectors(x);
+   HYPRE_Int       num_vectors_y = hypre_VectorNumVectors(y);
+   HYPRE_Int       num_vectors_b = hypre_VectorNumVectors(b);
+   HYPRE_Int       size          = hypre_VectorSize(b);
+
+   hypre_GpuProfilingPushRange("SeqVectorElmdivpyDevice");
+   if (num_vectors_b == 1)
+   {
+      if (num_vectors_x == 1)
+      {
+         if (marker)
+         {
+            hypreDevice_IVAXPYMarked(size, b_data, x_data, y_data, marker, marker_val);
+         }
+         else
+         {
+            hypreDevice_IVAXPY(size, b_data, x_data, y_data);
+         }
+      }
+#if !defined(HYPRE_USING_SYCL)
+      else if (num_vectors_x == num_vectors_y)
+      {
+         if (!marker)
+         {
+            hypreDevice_IVAMXPMY(num_vectors_x, size, b_data, x_data, y_data);
+         }
+         else
+         {
+            hypre_error_w_msg(HYPRE_ERROR_GENERIC, "marker != NULL not supported!\n");
+         }
+      }
+      else
+      {
+         hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Unsupported combination of num_vectors!\n");
+      }
+
+#else
+      else
+      {
+         hypre_error_w_msg(HYPRE_ERROR_GENERIC, "num_vectors_x != 1 not supported for SYCL!\n");
+      }
+#endif
+   }
+   else
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "num_vectors_b != 1 not supported!\n");
+   }
+
+   hypre_SyncComputeStream();
+   hypre_GpuProfilingPopRange();
+
+#elif defined(HYPRE_USING_OPENMP)
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Not implemented for device OpenMP!\n");
+#endif
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_SeqVectorInnerProdDevice
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Real
+hypre_SeqVectorInnerProdDevice( hypre_Vector *x,
+                                hypre_Vector *y )
+{
+   HYPRE_Complex *x_data      = hypre_VectorData(x);
+   HYPRE_Complex *y_data      = hypre_VectorData(y);
+   HYPRE_Int      num_vectors = hypre_VectorNumVectors(x);
+   HYPRE_Int      size        = hypre_VectorSize(x);
+   HYPRE_Int      total_size  = size * num_vectors;
+
+   HYPRE_Real     result = 0.0;
+
+   //hypre_SeqVectorPrefetch(x, HYPRE_MEMORY_DEVICE);
+   //hypre_SeqVectorPrefetch(y, HYPRE_MEMORY_DEVICE);
+
+#if defined(HYPRE_USING_GPU)
+
+#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if defined(HYPRE_USING_CUBLAS)
+   HYPRE_CUBLAS_CALL( hypre_cublas_dot(hypre_HandleCublasHandle(hypre_handle()), total_size,
+                                       x_data, 1, y_data, 1, &result) );
+#else
+   result = HYPRE_THRUST_CALL( inner_product, x_data, x_data + total_size, y_data, 0.0 );
+#endif
+
+#elif defined(HYPRE_USING_SYCL)
+#if defined(HYPRE_USING_ONEMKLBLAS)
+   HYPRE_Real *result_dev = hypre_CTAlloc(HYPRE_Real, 1, HYPRE_MEMORY_DEVICE);
+   HYPRE_ONEMKL_CALL( oneapi::mkl::blas::dot(*hypre_HandleComputeStream(hypre_handle()),
+                                             total_size, x_data, 1,
+                                             y_data, 1, result_dev).wait() );
+   hypre_TMemcpy(&result, result_dev, HYPRE_Real, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
+   hypre_TFree(result_dev, HYPRE_MEMORY_DEVICE);
+#else
+   result = HYPRE_ONEDPL_CALL( std::transform_reduce, x_data, x_data + total_size, y_data, 0.0 );
+#endif
+#endif
+
+   hypre_SyncComputeStream();
+
+#elif defined(HYPRE_USING_DEVICE_OPENMP)
+   HYPRE_Int i;
+
+   #pragma omp target teams distribute parallel for private(i) reduction(+:result) is_device_ptr(y_data, x_data) map(result)
+   for (i = 0; i < total_size; i++)
+   {
+      result += hypre_conj(y_data[i]) * x_data[i];
+   }
+#endif
+
+   return result;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_SeqVectorSumEltsDevice
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Complex
+hypre_SeqVectorSumEltsDevice( hypre_Vector *vector )
+{
+   HYPRE_Complex  *data        = hypre_VectorData(vector);
+   HYPRE_Int       num_vectors = hypre_VectorNumVectors(vector);
+   HYPRE_Int       size        = hypre_VectorSize(vector);
+   HYPRE_Int       total_size  = size * num_vectors;
+   HYPRE_Complex   sum = 0.0;
+
+#if defined(HYPRE_USING_GPU)
+   sum = hypreDevice_ComplexReduceSum(total_size, data);
+
+   hypre_SyncComputeStream();
+
+#elif HYPRE_USING_DEVICE_OPENMP
+   HYPRE_Int i;
+
+   #pragma omp target teams distribute parallel for private(i) reduction(+:sum) is_device_ptr(data) map(sum)
+   for (i = 0; i < total_size; i++)
+   {
+      sum += data[i];
+   }
+#endif
+
+   return sum;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_SeqVectorStridedCopyDevice
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_SeqVectorStridedCopyDevice( hypre_Vector  *vector,
+                                  HYPRE_Int      istride,
+                                  HYPRE_Int      ostride,
+                                  HYPRE_Int      size,
+                                  HYPRE_Complex *data)
+{
+   HYPRE_Complex  *v_data = hypre_VectorData(vector);
+
+#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+   auto begin = thrust::make_counting_iterator(0);
+   auto last  = thrust::make_counting_iterator(size / istride);
+
+   HYPRE_THRUST_CALL( transform, begin, last,
+                      thrust::make_permutation_iterator(v_data,
+                                                        thrust::make_transform_iterator(begin,
+                                                                                        hypreFunctor_IndexStrided<HYPRE_Int>(ostride))),
+                      hypreFunctor_ArrayStridedAccess<HYPRE_Complex>(istride, data) );
+
+#elif defined(HYPRE_USING_DEVICE_OPENMP) || defined(HYPRE_USING_SYCL)
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Not implemented!");
+#endif
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_SeqVectorPrefetch
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_SeqVectorPrefetch( hypre_Vector        *x,
+                         HYPRE_MemoryLocation memory_location )
+{
+#if defined(HYPRE_USING_UNIFIED_MEMORY)
+   if (hypre_VectorMemoryLocation(x) != HYPRE_MEMORY_DEVICE)
+   {
+      /* hypre_error_w_msg(HYPRE_ERROR_GENERIC," Error! CUDA Prefetch with non-unified momory\n"); */
+      return hypre_error_flag;
+   }
+
+   HYPRE_Complex  *x_data      = hypre_VectorData(x);
+   HYPRE_Int       num_vectors = hypre_VectorNumVectors(x);
+   HYPRE_Int       size        = hypre_VectorSize(x);
+   HYPRE_Int       total_size  = size * num_vectors;
+
+   if (total_size == 0)
+   {
+      return hypre_error_flag;
+   }
+
+   hypre_MemPrefetch(x_data, sizeof(HYPRE_Complex) * total_size, memory_location);
+#endif
+
+   return hypre_error_flag;
+}
+
+#endif
diff --git a/external/hypre/src/sstruct_ls/CMakeLists.txt b/external/hypre/src/sstruct_ls/CMakeLists.txt
index 344360ce..2d35908a 100644
--- a/external/hypre/src/sstruct_ls/CMakeLists.txt
+++ b/external/hypre/src/sstruct_ls/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -79,8 +79,8 @@ target_sources(${PROJECT_NAME}
           ${HDRS}
 )
 
-if (HYPRE_USING_CUDA)
-  set(CUDA_SRCS
+if (HYPRE_USING_GPU)
+  set(GPU_SRCS
     fac_amr_fcoarsen.c
     fac_amr_rap.c
     fac_restrict2.c
@@ -88,8 +88,8 @@ if (HYPRE_USING_CUDA)
     fac_zero_stencilcoef.c
     node_relax.c
   )
-  convert_filenames_to_full_paths(CUDA_SRCS)
-  set(HYPRE_CUDA_SOURCES ${HYPRE_CUDA_SOURCES} ${CUDA_SRCS} PARENT_SCOPE)
+  convert_filenames_to_full_paths(GPU_SRCS)
+  set(HYPRE_GPU_SOURCES ${HYPRE_GPU_SOURCES} ${GPU_SRCS} PARENT_SCOPE)
 endif ()
 
 convert_filenames_to_full_paths(HDRS)
diff --git a/external/hypre/src/sstruct_ls/F90_HYPRE_sstruct_InterFAC.c b/external/hypre/src/sstruct_ls/F90_HYPRE_sstruct_InterFAC.c
index cf085816..3a71be3d 100644
--- a/external/hypre/src/sstruct_ls/F90_HYPRE_sstruct_InterFAC.c
+++ b/external/hypre/src/sstruct_ls/F90_HYPRE_sstruct_InterFAC.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -17,21 +17,21 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-	
+
 /*--------------------------------------------------------------------------
  * HYPRE_SStructFACCreate
  *--------------------------------------------------------------------------*/
 
 void
 hypre_F90_IFACE(hypre_sstructfaccreate, HYPRE_SSTRUCTFACCREATE)
-   (hypre_F90_Comm *comm,
-    hypre_F90_Obj *solver,
-    hypre_F90_Int *ierr)
+(hypre_F90_Comm *comm,
+ hypre_F90_Obj *solver,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_SStructFACCreate(
-           hypre_F90_PassComm (comm),
-           hypre_F90_PassObjRef (HYPRE_SStructSolver, solver) ));
+           ( HYPRE_SStructFACCreate(
+                hypre_F90_PassComm (comm),
+                hypre_F90_PassObjRef (HYPRE_SStructSolver, solver) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -40,12 +40,12 @@ hypre_F90_IFACE(hypre_sstructfaccreate, HYPRE_SSTRUCTFACCREATE)
 
 void
 hypre_F90_IFACE(hypre_sstructfacdestroy2, HYPRE_SSTRUCTFACDESTROY2)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_SStructFACDestroy2(
-           hypre_F90_PassObj (HYPRE_SStructSolver, solver) ));
+           ( HYPRE_SStructFACDestroy2(
+                hypre_F90_PassObj (HYPRE_SStructSolver, solver) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -54,16 +54,16 @@ hypre_F90_IFACE(hypre_sstructfacdestroy2, HYPRE_SSTRUCTFACDESTROY2)
 
 void
 hypre_F90_IFACE(hypre_sstructfacamrrap, HYPRE_SSTRUCTFACAMRRAP)
-   (hypre_F90_Obj *A,
-    HYPRE_Int (*rfactors)[HYPRE_MAXDIM],
-    hypre_F90_Obj *facA,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *A,
+ HYPRE_Int (*rfactors)[HYPRE_MAXDIM],
+ hypre_F90_Obj *facA,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_SStructFACAMR_RAP(
-           hypre_F90_PassObj (HYPRE_SStructMatrix, A),
-           rfactors,
-           hypre_F90_PassObjRef (HYPRE_SStructMatrix, facA) ));
+           ( HYPRE_SStructFACAMR_RAP(
+                hypre_F90_PassObj (HYPRE_SStructMatrix, A),
+                rfactors,
+                hypre_F90_PassObjRef (HYPRE_SStructMatrix, facA) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -72,18 +72,18 @@ hypre_F90_IFACE(hypre_sstructfacamrrap, HYPRE_SSTRUCTFACAMRRAP)
 
 void
 hypre_F90_IFACE(hypre_sstructfacsetup2, HYPRE_SSTRUCTFACSETUP2)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Obj *A,
-    hypre_F90_Obj *b,
-    hypre_F90_Obj *x,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Obj *A,
+ hypre_F90_Obj *b,
+ hypre_F90_Obj *x,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_SStructFACSetup2(
-           hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-           hypre_F90_PassObj (HYPRE_SStructMatrix, A),
-           hypre_F90_PassObj (HYPRE_SStructVector, b),
-           hypre_F90_PassObj (HYPRE_SStructVector, x) ));
+           ( HYPRE_SStructFACSetup2(
+                hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+                hypre_F90_PassObj (HYPRE_SStructMatrix, A),
+                hypre_F90_PassObj (HYPRE_SStructVector, b),
+                hypre_F90_PassObj (HYPRE_SStructVector, x) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -92,18 +92,18 @@ hypre_F90_IFACE(hypre_sstructfacsetup2, HYPRE_SSTRUCTFACSETUP2)
 
 void
 hypre_F90_IFACE(hypre_sstructfacsolve3, HYPRE_SSTRUCTFACSOLVE3)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Obj *A,
-    hypre_F90_Obj *b,
-    hypre_F90_Obj *x,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Obj *A,
+ hypre_F90_Obj *b,
+ hypre_F90_Obj *x,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_SStructFACSolve3(
-           hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-           hypre_F90_PassObj (HYPRE_SStructMatrix, A),
-           hypre_F90_PassObj (HYPRE_SStructVector, b),
-           hypre_F90_PassObj (HYPRE_SStructVector, x)));
+           ( HYPRE_SStructFACSolve3(
+                hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+                hypre_F90_PassObj (HYPRE_SStructMatrix, A),
+                hypre_F90_PassObj (HYPRE_SStructVector, b),
+                hypre_F90_PassObj (HYPRE_SStructVector, x)));
 }
 
 /*--------------------------------------------------------------------------
@@ -112,14 +112,14 @@ hypre_F90_IFACE(hypre_sstructfacsolve3, HYPRE_SSTRUCTFACSOLVE3)
 
 void
 hypre_F90_IFACE(hypre_sstructfacsettol, HYPRE_SSTRUCTFACSETTOL)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Real *tol,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Real *tol,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_SStructFACSetTol(
-           hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-           hypre_F90_PassReal (tol) ));
+           ( HYPRE_SStructFACSetTol(
+                hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+                hypre_F90_PassReal (tol) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -128,16 +128,16 @@ hypre_F90_IFACE(hypre_sstructfacsettol, HYPRE_SSTRUCTFACSETTOL)
 
 void
 hypre_F90_IFACE(hypre_sstructfacsetplevels, HYPRE_SSTRUCTFACSETPLEVELS)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *nparts,
-    hypre_F90_IntArray *plevels,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *nparts,
+ hypre_F90_IntArray *plevels,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_SStructFACSetPLevels(
-           hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-           hypre_F90_PassInt (nparts),
-           hypre_F90_PassIntArray (plevels)));
+           ( HYPRE_SStructFACSetPLevels(
+                hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+                hypre_F90_PassInt (nparts),
+                hypre_F90_PassIntArray (plevels)));
 }
 
 /*--------------------------------------------------------------------------
@@ -146,18 +146,18 @@ hypre_F90_IFACE(hypre_sstructfacsetplevels, HYPRE_SSTRUCTFACSETPLEVELS)
 
 void
 hypre_F90_IFACE(hypre_sstructfaczerocfsten, HYPRE_SSTRUCTFACZEROCFSTEN)
-   (hypre_F90_Obj *A,
-    hypre_F90_Obj *grid,
-    hypre_F90_Int *part,
-    HYPRE_Int (*rfactors)[HYPRE_MAXDIM],
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *A,
+ hypre_F90_Obj *grid,
+ hypre_F90_Int *part,
+ HYPRE_Int (*rfactors)[HYPRE_MAXDIM],
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_SStructFACZeroCFSten(
-           hypre_F90_PassObj (HYPRE_SStructMatrix, A),
-           hypre_F90_PassObj (HYPRE_SStructGrid, grid),
-           hypre_F90_PassInt (part),
-           rfactors[HYPRE_MAXDIM] ));
+           ( HYPRE_SStructFACZeroCFSten(
+                hypre_F90_PassObj (HYPRE_SStructMatrix, A),
+                hypre_F90_PassObj (HYPRE_SStructGrid, grid),
+                hypre_F90_PassInt (part),
+                rfactors[HYPRE_MAXDIM] ));
 }
 
 /*--------------------------------------------------------------------------
@@ -166,16 +166,16 @@ hypre_F90_IFACE(hypre_sstructfaczerocfsten, HYPRE_SSTRUCTFACZEROCFSTEN)
 
 void
 hypre_F90_IFACE(hypre_sstructfaczerofcsten, HYPRE_SSTRUCTFACZEROFCSTEN)
-   (hypre_F90_Obj *A,
-    hypre_F90_Obj *grid,
-    hypre_F90_Int *part,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *A,
+ hypre_F90_Obj *grid,
+ hypre_F90_Int *part,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_SStructFACZeroFCSten(
-           hypre_F90_PassObj (HYPRE_SStructMatrix, A),
-           hypre_F90_PassObj (HYPRE_SStructGrid, grid),
-           hypre_F90_PassInt (part) ));
+           ( HYPRE_SStructFACZeroFCSten(
+                hypre_F90_PassObj (HYPRE_SStructMatrix, A),
+                hypre_F90_PassObj (HYPRE_SStructGrid, grid),
+                hypre_F90_PassInt (part) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -184,16 +184,16 @@ hypre_F90_IFACE(hypre_sstructfaczerofcsten, HYPRE_SSTRUCTFACZEROFCSTEN)
 
 void
 hypre_F90_IFACE(hypre_sstructfaczeroamrmatrixdata, HYPRE_SSTRUCTFACZEROAMRMATRIXDATA)
-   (hypre_F90_Obj *A,
-    hypre_F90_Int *part_crse,
-    HYPRE_Int (*rfactors)[HYPRE_MAXDIM],
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *A,
+ hypre_F90_Int *part_crse,
+ HYPRE_Int (*rfactors)[HYPRE_MAXDIM],
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_SStructFACZeroAMRMatrixData(
-           hypre_F90_PassObj (HYPRE_SStructMatrix, A),
-           hypre_F90_PassInt (part_crse),
-           rfactors[HYPRE_MAXDIM] ));
+           ( HYPRE_SStructFACZeroAMRMatrixData(
+                hypre_F90_PassObj (HYPRE_SStructMatrix, A),
+                hypre_F90_PassInt (part_crse),
+                rfactors[HYPRE_MAXDIM] ));
 }
 
 /*--------------------------------------------------------------------------
@@ -202,16 +202,16 @@ hypre_F90_IFACE(hypre_sstructfaczeroamrmatrixdata, HYPRE_SSTRUCTFACZEROAMRMATRIX
 
 void
 hypre_F90_IFACE(hypre_sstructfaczeroamrvectordata, HYPRE_SSTRUCTFACZEROAMRVECTORDATA)
-   (hypre_F90_Obj *b,
-    hypre_F90_IntArray *plevels,
-    HYPRE_Int (*rfactors)[HYPRE_MAXDIM],
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *b,
+ hypre_F90_IntArray *plevels,
+ HYPRE_Int (*rfactors)[HYPRE_MAXDIM],
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_SStructFACZeroAMRVectorData(
-           hypre_F90_PassObj (HYPRE_SStructVector, b),
-           hypre_F90_PassIntArray (plevels),
-           rfactors ));
+           ( HYPRE_SStructFACZeroAMRVectorData(
+                hypre_F90_PassObj (HYPRE_SStructVector, b),
+                hypre_F90_PassIntArray (plevels),
+                rfactors ));
 }
 
 
@@ -221,16 +221,16 @@ hypre_F90_IFACE(hypre_sstructfaczeroamrvectordata, HYPRE_SSTRUCTFACZEROAMRVECTOR
 
 void
 hypre_F90_IFACE(hypre_sstructfacsetprefinements, HYPRE_SSTRUCTFACSETPREFINEMENTS)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *nparts,
-    HYPRE_Int (*rfactors)[HYPRE_MAXDIM],
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *nparts,
+ HYPRE_Int (*rfactors)[HYPRE_MAXDIM],
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_SStructFACSetPRefinements(
-           hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-           hypre_F90_PassInt (nparts),
-           rfactors ));
+           ( HYPRE_SStructFACSetPRefinements(
+                hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+                hypre_F90_PassInt (nparts),
+                rfactors ));
 }
 
 /*--------------------------------------------------------------------------
@@ -239,14 +239,14 @@ hypre_F90_IFACE(hypre_sstructfacsetprefinements, HYPRE_SSTRUCTFACSETPREFINEMENTS
 
 void
 hypre_F90_IFACE(hypre_sstructfacsetmaxlevels, HYPRE_SSTRUCTFACSETMAXLEVELS)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *max_levels,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *max_levels,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_SStructFACSetMaxLevels(
-           hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-           hypre_F90_PassInt (max_levels) ));
+           ( HYPRE_SStructFACSetMaxLevels(
+                hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+                hypre_F90_PassInt (max_levels) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -255,14 +255,14 @@ hypre_F90_IFACE(hypre_sstructfacsetmaxlevels, HYPRE_SSTRUCTFACSETMAXLEVELS)
 
 void
 hypre_F90_IFACE(hypre_sstructfacsetmaxiter, HYPRE_SSTRUCTFACSETMAXITER)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *max_iter,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *max_iter,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_SStructFACSetMaxIter(
-           hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-           hypre_F90_PassInt (max_iter) ));
+           ( HYPRE_SStructFACSetMaxIter(
+                hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+                hypre_F90_PassInt (max_iter) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -271,14 +271,14 @@ hypre_F90_IFACE(hypre_sstructfacsetmaxiter, HYPRE_SSTRUCTFACSETMAXITER)
 
 void
 hypre_F90_IFACE(hypre_sstructfacsetrelchange, HYPRE_SSTRUCTFACSETRELCHANGE)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *rel_change,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *rel_change,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_SStructFACSetRelChange(
-           hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-           hypre_F90_PassInt (rel_change) ));
+           ( HYPRE_SStructFACSetRelChange(
+                hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+                hypre_F90_PassInt (rel_change) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -287,12 +287,12 @@ hypre_F90_IFACE(hypre_sstructfacsetrelchange, HYPRE_SSTRUCTFACSETRELCHANGE)
 
 void
 hypre_F90_IFACE(hypre_sstructfacsetzeroguess, HYPRE_SSTRUCTFACSETZEROGUESS)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_SStructFACSetZeroGuess(
-           hypre_F90_PassObj (HYPRE_SStructSolver, solver) ));
+           ( HYPRE_SStructFACSetZeroGuess(
+                hypre_F90_PassObj (HYPRE_SStructSolver, solver) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -301,12 +301,12 @@ hypre_F90_IFACE(hypre_sstructfacsetzeroguess, HYPRE_SSTRUCTFACSETZEROGUESS)
 
 void
 hypre_F90_IFACE(hypre_sstructfacsetnonzeroguess, HYPRE_SSTRUCTFACSETNONZEROGUESS)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_SStructFACSetNonZeroGuess(
-           hypre_F90_PassObj (HYPRE_SStructSolver, solver) ));
+           ( HYPRE_SStructFACSetNonZeroGuess(
+                hypre_F90_PassObj (HYPRE_SStructSolver, solver) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -315,14 +315,14 @@ hypre_F90_IFACE(hypre_sstructfacsetnonzeroguess, HYPRE_SSTRUCTFACSETNONZEROGUESS
 
 void
 hypre_F90_IFACE(hypre_sstructfacsetrelaxtype, HYPRE_SSTRUCTFACSETRELAXTYPE)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *relax_type,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *relax_type,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_SStructFACSetRelaxType(
-           hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-           hypre_F90_PassInt (relax_type) ));
+           ( HYPRE_SStructFACSetRelaxType(
+                hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+                hypre_F90_PassInt (relax_type) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -330,13 +330,13 @@ hypre_F90_IFACE(hypre_sstructfacsetrelaxtype, HYPRE_SSTRUCTFACSETRELAXTYPE)
  *--------------------------------------------------------------------------*/
 void
 hypre_F90_IFACE(hypre_sstructfacsetjacobiweigh, HYPRE_SSTRUCTFACSETJACOBIWEIGH)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Real *weight,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Real *weight,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructFACSetJacobiWeight( hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-                                        hypre_F90_PassReal (weight) ) );
+           (HYPRE_SStructFACSetJacobiWeight( hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+                                             hypre_F90_PassReal (weight) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -345,13 +345,13 @@ hypre_F90_IFACE(hypre_sstructfacsetjacobiweigh, HYPRE_SSTRUCTFACSETJACOBIWEIGH)
 
 void
 hypre_F90_IFACE(hypre_sstructfacsetnumprerelax, HYPRE_SSTRUCTFACSETNUMPRERELAX)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *num_pre_relax,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *num_pre_relax,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_SStructFACSetNumPreRelax( hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-                                        hypre_F90_PassInt (num_pre_relax) ));
+           ( HYPRE_SStructFACSetNumPreRelax( hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+                                             hypre_F90_PassInt (num_pre_relax) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -360,14 +360,14 @@ hypre_F90_IFACE(hypre_sstructfacsetnumprerelax, HYPRE_SSTRUCTFACSETNUMPRERELAX)
 
 void
 hypre_F90_IFACE(hypre_sstructfacsetnumpostrelax, HYPRE_SSTRUCTFACSETNUMPOSTRELAX)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *num_post_relax,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *num_post_relax,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructFACSetNumPostRelax(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassInt (num_post_relax) ));
+           (HYPRE_SStructFACSetNumPostRelax(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassInt (num_post_relax) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -376,14 +376,14 @@ hypre_F90_IFACE(hypre_sstructfacsetnumpostrelax, HYPRE_SSTRUCTFACSETNUMPOSTRELAX
 
 void
 hypre_F90_IFACE(hypre_sstructfacsetcoarsesolver, HYPRE_SSTRUCTFACSETCOARSESOLVER)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *csolver_type,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *csolver_type,
+ hypre_F90_Int *ierr)
 {
-   *ierr = (hypre_F90_Int) 
-      (HYPRE_SStructFACSetCoarseSolverType(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassInt (csolver_type)));
+   *ierr = (hypre_F90_Int)
+           (HYPRE_SStructFACSetCoarseSolverType(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassInt (csolver_type)));
 }
 
 /*--------------------------------------------------------------------------
@@ -392,14 +392,14 @@ hypre_F90_IFACE(hypre_sstructfacsetcoarsesolver, HYPRE_SSTRUCTFACSETCOARSESOLVER
 
 void
 hypre_F90_IFACE(hypre_sstructfacsetlogging, HYPRE_SSTRUCTFACSETLOGGING)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *logging,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *logging,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructFACSetLogging(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassInt (logging) ));
+           (HYPRE_SStructFACSetLogging(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassInt (logging) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -408,14 +408,14 @@ hypre_F90_IFACE(hypre_sstructfacsetlogging, HYPRE_SSTRUCTFACSETLOGGING)
 
 void
 hypre_F90_IFACE(hypre_sstructfacgetnumiteration, HYPRE_SSTRUCTFACGETNUMITERATION)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *num_iterations,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *num_iterations,
+ hypre_F90_Int *ierr)
 {
-   *ierr = (hypre_F90_Int)  
-      ( HYPRE_SStructFACGetNumIterations(
-           hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-           hypre_F90_PassIntRef (num_iterations)));
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_SStructFACGetNumIterations(
+                hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+                hypre_F90_PassIntRef (num_iterations)));
 }
 
 /*--------------------------------------------------------------------------
@@ -424,14 +424,14 @@ hypre_F90_IFACE(hypre_sstructfacgetnumiteration, HYPRE_SSTRUCTFACGETNUMITERATION
 
 void
 hypre_F90_IFACE(hypre_sstructfacgetfinalrelativ, HYPRE_SSTRUCTFACGETFINALRELATIV)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Real *norm,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Real *norm,
+ hypre_F90_Int *ierr)
 {
-   *ierr = (hypre_F90_Int) 
-      ( HYPRE_SStructFACGetFinalRelativeResidualNorm(
-           hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-           hypre_F90_PassRealRef (norm) ));
+   *ierr = (hypre_F90_Int)
+           ( HYPRE_SStructFACGetFinalRelativeResidualNorm(
+                hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+                hypre_F90_PassRealRef (norm) ));
 }
 
 #ifdef __cplusplus
diff --git a/external/hypre/src/sstruct_ls/F90_HYPRE_sstruct_bicgstab.c b/external/hypre/src/sstruct_ls/F90_HYPRE_sstruct_bicgstab.c
index 40c316e6..2e002f3b 100644
--- a/external/hypre/src/sstruct_ls/F90_HYPRE_sstruct_bicgstab.c
+++ b/external/hypre/src/sstruct_ls/F90_HYPRE_sstruct_bicgstab.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -17,21 +17,21 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-	
+
 /*--------------------------------------------------------------------------
  * HYPRE_SStructBiCGSTABCreate
  *--------------------------------------------------------------------------*/
 
 void
 hypre_F90_IFACE(hypre_sstructbicgstabcreate, HYPRE_SSTRUCTBICGSTABCREATE)
-   (hypre_F90_Comm *comm,
-    hypre_F90_Obj *solver,
-    hypre_F90_Int *ierr)
+(hypre_F90_Comm *comm,
+ hypre_F90_Obj *solver,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructBiCGSTABCreate(
-          hypre_F90_PassComm (comm),
-          hypre_F90_PassObjRef (HYPRE_SStructSolver, solver) )) ;
+           (HYPRE_SStructBiCGSTABCreate(
+               hypre_F90_PassComm (comm),
+               hypre_F90_PassObjRef (HYPRE_SStructSolver, solver) )) ;
 }
 
 /*--------------------------------------------------------------------------
@@ -40,12 +40,12 @@ hypre_F90_IFACE(hypre_sstructbicgstabcreate, HYPRE_SSTRUCTBICGSTABCREATE)
 
 void
 hypre_F90_IFACE(hypre_sstructbicgstabdestroy, HYPRE_SSTRUCTBICGSTABDESTROY)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructBiCGSTABDestroy(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver) ));
+           (HYPRE_SStructBiCGSTABDestroy(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -54,18 +54,18 @@ hypre_F90_IFACE(hypre_sstructbicgstabdestroy, HYPRE_SSTRUCTBICGSTABDESTROY)
 
 void
 hypre_F90_IFACE(hypre_sstructbicgstabsetup, HYPRE_SSTRUCTBICGSTABSETUP)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Obj *A,
-    hypre_F90_Obj *b,
-    hypre_F90_Obj *x,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Obj *A,
+ hypre_F90_Obj *b,
+ hypre_F90_Obj *x,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructBiCGSTABSetup(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassObj (HYPRE_SStructMatrix, A),
-          hypre_F90_PassObj (HYPRE_SStructVector, b),
-          hypre_F90_PassObj (HYPRE_SStructVector, x) ));
+           (HYPRE_SStructBiCGSTABSetup(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassObj (HYPRE_SStructMatrix, A),
+               hypre_F90_PassObj (HYPRE_SStructVector, b),
+               hypre_F90_PassObj (HYPRE_SStructVector, x) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -74,18 +74,18 @@ hypre_F90_IFACE(hypre_sstructbicgstabsetup, HYPRE_SSTRUCTBICGSTABSETUP)
 
 void
 hypre_F90_IFACE(hypre_sstructbicgstabsolve, HYPRE_SSTRUCTBICGSTABSOLVE)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Obj *A,
-    hypre_F90_Obj *b,
-    hypre_F90_Obj *x,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Obj *A,
+ hypre_F90_Obj *b,
+ hypre_F90_Obj *x,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructBiCGSTABSolve(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassObj (HYPRE_SStructMatrix, A),
-          hypre_F90_PassObj (HYPRE_SStructVector, b),
-          hypre_F90_PassObj (HYPRE_SStructVector, x) ));
+           (HYPRE_SStructBiCGSTABSolve(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassObj (HYPRE_SStructMatrix, A),
+               hypre_F90_PassObj (HYPRE_SStructVector, b),
+               hypre_F90_PassObj (HYPRE_SStructVector, x) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -94,14 +94,14 @@ hypre_F90_IFACE(hypre_sstructbicgstabsolve, HYPRE_SSTRUCTBICGSTABSOLVE)
 
 void
 hypre_F90_IFACE(hypre_sstructbicgstabsettol, HYPRE_SSTRUCTBICGSTABSETTOL)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Real *tol,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Real *tol,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructBiCGSTABSetTol(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassReal (tol) ));
+           (HYPRE_SStructBiCGSTABSetTol(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassReal (tol) ));
 }
 /*--------------------------------------------------------------------------
  * HYPRE_SStructBiCGSTABSetAnsoluteTol
@@ -109,14 +109,14 @@ hypre_F90_IFACE(hypre_sstructbicgstabsettol, HYPRE_SSTRUCTBICGSTABSETTOL)
 
 void
 hypre_F90_IFACE(hypre_sstructbicgstabsetabsolutetol, HYPRE_SSTRUCTBICGSTABSETABSOLUTETOL)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Real *tol,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Real *tol,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructBiCGSTABSetAbsoluteTol(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassReal (tol) ));
+           (HYPRE_SStructBiCGSTABSetAbsoluteTol(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassReal (tol) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -125,14 +125,14 @@ hypre_F90_IFACE(hypre_sstructbicgstabsetabsolutetol, HYPRE_SSTRUCTBICGSTABSETABS
 
 void
 hypre_F90_IFACE(hypre_sstructbicgstabsetminiter, HYPRE_SSTRUCTBICGSTABSETMINITER)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *min_iter,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *min_iter,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructBiCGSTABSetMinIter(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassInt (min_iter) ));
+           (HYPRE_SStructBiCGSTABSetMinIter(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassInt (min_iter) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -141,14 +141,14 @@ hypre_F90_IFACE(hypre_sstructbicgstabsetminiter, HYPRE_SSTRUCTBICGSTABSETMINITER
 
 void
 hypre_F90_IFACE(hypre_sstructbicgstabsetmaxiter, HYPRE_SSTRUCTBICGSTABSETMAXITER)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *max_iter,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *max_iter,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructBiCGSTABSetMaxIter(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassInt (max_iter) ));
+           (HYPRE_SStructBiCGSTABSetMaxIter(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassInt (max_iter) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -157,14 +157,14 @@ hypre_F90_IFACE(hypre_sstructbicgstabsetmaxiter, HYPRE_SSTRUCTBICGSTABSETMAXITER
 
 void
 hypre_F90_IFACE(hypre_sstructbicgstabsetstopcri, HYPRE_SSTRUCTBICGSTABSETSTOPCRI)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *stop_crit,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *stop_crit,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructBiCGSTABSetStopCrit(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassInt (stop_crit) ));
+           (HYPRE_SStructBiCGSTABSetStopCrit(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassInt (stop_crit) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -173,10 +173,10 @@ hypre_F90_IFACE(hypre_sstructbicgstabsetstopcri, HYPRE_SSTRUCTBICGSTABSETSTOPCRI
 
 void
 hypre_F90_IFACE(hypre_sstructbicgstabsetprecond, HYPRE_SSTRUCTBICGSTABSETPRECOND)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *precond_id,
-    hypre_F90_Obj *precond_solver,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *precond_id,
+ hypre_F90_Obj *precond_solver,
+ hypre_F90_Int *ierr)
 /*------------------------------------------
  *    precond_id flags mean:
  *    2 - setup a split-solver preconditioner
@@ -186,36 +186,36 @@ hypre_F90_IFACE(hypre_sstructbicgstabsetprecond, HYPRE_SSTRUCTBICGSTABSETPRECOND
  *----------------------------------------*/
 
 {
-   if(*precond_id == 2)
+   if (*precond_id == 2)
    {
       *ierr = (hypre_F90_Int)
-         (HYPRE_SStructBiCGSTABSetPrecond(
-             hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-             HYPRE_SStructSplitSolve,
-             HYPRE_SStructSplitSetup,
-             hypre_F90_PassObjRef (HYPRE_SStructSolver, precond_solver)));
+              (HYPRE_SStructBiCGSTABSetPrecond(
+                  hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+                  HYPRE_SStructSplitSolve,
+                  HYPRE_SStructSplitSetup,
+                  hypre_F90_PassObjRef (HYPRE_SStructSolver, precond_solver)));
    }
 
-   else if(*precond_id == 3)
+   else if (*precond_id == 3)
    {
       *ierr = (hypre_F90_Int)
-         (HYPRE_SStructBiCGSTABSetPrecond(
-             hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-             HYPRE_SStructSysPFMGSolve,
-             HYPRE_SStructSysPFMGSetup,
-             hypre_F90_PassObj (HYPRE_SStructSolver, precond_solver)));
+              (HYPRE_SStructBiCGSTABSetPrecond(
+                  hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+                  HYPRE_SStructSysPFMGSolve,
+                  HYPRE_SStructSysPFMGSetup,
+                  hypre_F90_PassObj (HYPRE_SStructSolver, precond_solver)));
    }
 
-   else if(*precond_id == 8)
+   else if (*precond_id == 8)
    {
       *ierr = (hypre_F90_Int)
-         (HYPRE_SStructBiCGSTABSetPrecond(
-             hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-             HYPRE_SStructDiagScale,
-             HYPRE_SStructDiagScaleSetup,
-             hypre_F90_PassObj (HYPRE_SStructSolver, precond_solver)));
+              (HYPRE_SStructBiCGSTABSetPrecond(
+                  hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+                  HYPRE_SStructDiagScale,
+                  HYPRE_SStructDiagScaleSetup,
+                  hypre_F90_PassObj (HYPRE_SStructSolver, precond_solver)));
    }
-   else if(*precond_id == 9)
+   else if (*precond_id == 9)
    {
       *ierr = 0;
    }
@@ -233,14 +233,14 @@ hypre_F90_IFACE(hypre_sstructbicgstabsetprecond, HYPRE_SSTRUCTBICGSTABSETPRECOND
 
 void
 hypre_F90_IFACE(hypre_sstructbicgstabsetlogging, HYPRE_SSTRUCTBICGSTABSETLOGGING)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *logging,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *logging,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructBiCGSTABSetLogging(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassInt (logging) ));
+           (HYPRE_SStructBiCGSTABSetLogging(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassInt (logging) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -249,14 +249,14 @@ hypre_F90_IFACE(hypre_sstructbicgstabsetlogging, HYPRE_SSTRUCTBICGSTABSETLOGGING
 
 void
 hypre_F90_IFACE(hypre_sstructbicgstabsetprintle, HYPRE_SSTRUCTBICGSTABSETPRINTLE)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *print_level,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *print_level,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructBiCGSTABSetPrintLevel(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassInt (print_level) ));
+           (HYPRE_SStructBiCGSTABSetPrintLevel(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassInt (print_level) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -265,14 +265,14 @@ hypre_F90_IFACE(hypre_sstructbicgstabsetprintle, HYPRE_SSTRUCTBICGSTABSETPRINTLE
 
 void
 hypre_F90_IFACE(hypre_sstructbicgstabgetnumiter, HYPRE_SSTRUCTBICGSTABGETNUMITER)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *num_iterations,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *num_iterations,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructBiCGSTABGetNumIterations(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassIntRef (num_iterations) ) );
+           (HYPRE_SStructBiCGSTABGetNumIterations(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassIntRef (num_iterations) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -281,14 +281,14 @@ hypre_F90_IFACE(hypre_sstructbicgstabgetnumiter, HYPRE_SSTRUCTBICGSTABGETNUMITER
 
 void
 hypre_F90_IFACE(hypre_sstructbicgstabgetfinalre, HYPRE_SSTRUCTBICGSTABGETFINALRE)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Real *norm,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Real *norm,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructBiCGSTABGetFinalRelativeResidualNorm(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassRealRef (norm) ));
+           (HYPRE_SStructBiCGSTABGetFinalRelativeResidualNorm(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassRealRef (norm) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -297,14 +297,14 @@ hypre_F90_IFACE(hypre_sstructbicgstabgetfinalre, HYPRE_SSTRUCTBICGSTABGETFINALRE
 
 void
 hypre_F90_IFACE(hypre_sstructbicgstabgetresidua, HYPRE_SSTRUCTBICGSTABGETRESIDUA)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Obj *residual,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Obj *residual,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructBiCGSTABGetResidual(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          (void **)              *residual));
+           (HYPRE_SStructBiCGSTABGetResidual(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               (void **)              *residual));
 }
 
 #ifdef __cplusplus
diff --git a/external/hypre/src/sstruct_ls/F90_HYPRE_sstruct_flexgmres.c b/external/hypre/src/sstruct_ls/F90_HYPRE_sstruct_flexgmres.c
index 698f2222..4d464f2d 100644
--- a/external/hypre/src/sstruct_ls/F90_HYPRE_sstruct_flexgmres.c
+++ b/external/hypre/src/sstruct_ls/F90_HYPRE_sstruct_flexgmres.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -17,21 +17,21 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-	
+
 /*--------------------------------------------------------------------------
  * HYPRE_SStructFlexGMRESCreate
  *--------------------------------------------------------------------------*/
 
 void
 hypre_F90_IFACE(hypre_sstructflexgmrescreate, HYPRE_SSTRUCTFLEXGMRESCREATE)
-   (hypre_F90_Comm *comm,
-    hypre_F90_Obj *solver,
-    hypre_F90_Int *ierr)
+(hypre_F90_Comm *comm,
+ hypre_F90_Obj *solver,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructFlexGMRESCreate(
-          hypre_F90_PassComm (comm),
-          hypre_F90_PassObjRef (HYPRE_SStructSolver, solver) ));
+           (HYPRE_SStructFlexGMRESCreate(
+               hypre_F90_PassComm (comm),
+               hypre_F90_PassObjRef (HYPRE_SStructSolver, solver) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -40,12 +40,12 @@ hypre_F90_IFACE(hypre_sstructflexgmrescreate, HYPRE_SSTRUCTFLEXGMRESCREATE)
 
 void
 hypre_F90_IFACE(hypre_sstructflexgmresdestroy, HYPRE_SSTRUCTFLEXGMRESDESTROY)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructFlexGMRESDestroy(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver) ));
+           (HYPRE_SStructFlexGMRESDestroy(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -54,18 +54,18 @@ hypre_F90_IFACE(hypre_sstructflexgmresdestroy, HYPRE_SSTRUCTFLEXGMRESDESTROY)
 
 void
 hypre_F90_IFACE(hypre_sstructflexgmressetup, HYPRE_SSTRUCTFLEXGMRESSETUP)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Obj *A,
-    hypre_F90_Obj *b,
-    hypre_F90_Obj *x,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Obj *A,
+ hypre_F90_Obj *b,
+ hypre_F90_Obj *x,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructFlexGMRESSetup(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassObj (HYPRE_SStructMatrix, A),
-          hypre_F90_PassObj (HYPRE_SStructVector, b),
-          hypre_F90_PassObj (HYPRE_SStructVector, x) ) );
+           (HYPRE_SStructFlexGMRESSetup(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassObj (HYPRE_SStructMatrix, A),
+               hypre_F90_PassObj (HYPRE_SStructVector, b),
+               hypre_F90_PassObj (HYPRE_SStructVector, x) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -74,18 +74,18 @@ hypre_F90_IFACE(hypre_sstructflexgmressetup, HYPRE_SSTRUCTFLEXGMRESSETUP)
 
 void
 hypre_F90_IFACE(hypre_sstructflexgmressolve, HYPRE_SSTRUCTFLEXGMRESSOLVE)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Obj *A,
-    hypre_F90_Obj *b,
-    hypre_F90_Obj *x,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Obj *A,
+ hypre_F90_Obj *b,
+ hypre_F90_Obj *x,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructFlexGMRESSolve(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassObj (HYPRE_SStructMatrix, A),
-          hypre_F90_PassObj (HYPRE_SStructVector, b),
-          hypre_F90_PassObj (HYPRE_SStructVector, x) ) );
+           (HYPRE_SStructFlexGMRESSolve(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassObj (HYPRE_SStructMatrix, A),
+               hypre_F90_PassObj (HYPRE_SStructVector, b),
+               hypre_F90_PassObj (HYPRE_SStructVector, x) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -94,14 +94,14 @@ hypre_F90_IFACE(hypre_sstructflexgmressolve, HYPRE_SSTRUCTFLEXGMRESSOLVE)
 
 void
 hypre_F90_IFACE(hypre_sstructflexgmressetkdim, HYPRE_SSTRUCTFLEXGMRESSETKDIM)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *k_dim,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *k_dim,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructFlexGMRESSetKDim(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassInt (k_dim) ));
+           (HYPRE_SStructFlexGMRESSetKDim(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassInt (k_dim) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -110,14 +110,14 @@ hypre_F90_IFACE(hypre_sstructflexgmressetkdim, HYPRE_SSTRUCTFLEXGMRESSETKDIM)
 
 void
 hypre_F90_IFACE(hypre_sstructflexgmressettol, HYPRE_SSTRUCTFLEXGMRESSETTOL)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Real *tol,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Real *tol,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructFlexGMRESSetTol(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassReal (tol) ) );
+           (HYPRE_SStructFlexGMRESSetTol(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassReal (tol) ) );
 }
 /*--------------------------------------------------------------------------
  * HYPRE_SStructFlexGMRESSetAbsoluteTol
@@ -125,14 +125,14 @@ hypre_F90_IFACE(hypre_sstructflexgmressettol, HYPRE_SSTRUCTFLEXGMRESSETTOL)
 
 void
 hypre_F90_IFACE(hypre_sstructflexgmressetabsolutetol, HYPRE_SSTRUCTFLEXGMRESSETABSOLUTETOL)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Real *tol,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Real *tol,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructFlexGMRESSetAbsoluteTol(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassReal (tol) ) );
+           (HYPRE_SStructFlexGMRESSetAbsoluteTol(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassReal (tol) ) );
 }
 /*--------------------------------------------------------------------------
  * HYPRE_SStructFlexGMRESSetMinIter
@@ -140,14 +140,14 @@ hypre_F90_IFACE(hypre_sstructflexgmressetabsolutetol, HYPRE_SSTRUCTFLEXGMRESSETA
 
 void
 hypre_F90_IFACE(hypre_sstructflexgmressetminiter, HYPRE_SSTRUCTFLEXGMRESSETMINITER)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *min_iter,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *min_iter,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructFlexGMRESSetMinIter(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassInt (min_iter) ) );
+           (HYPRE_SStructFlexGMRESSetMinIter(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassInt (min_iter) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -156,14 +156,14 @@ hypre_F90_IFACE(hypre_sstructflexgmressetminiter, HYPRE_SSTRUCTFLEXGMRESSETMINIT
 
 void
 hypre_F90_IFACE(hypre_sstructflexgmressetmaxiter, HYPRE_SSTRUCTFLEXGMRESSETMAXITER)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *max_iter,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *max_iter,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructFlexGMRESSetMaxIter(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassInt (max_iter) ) );
+           (HYPRE_SStructFlexGMRESSetMaxIter(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassInt (max_iter) ) );
 }
 
 
@@ -174,10 +174,10 @@ hypre_F90_IFACE(hypre_sstructflexgmressetmaxiter, HYPRE_SSTRUCTFLEXGMRESSETMAXIT
 
 void
 hypre_F90_IFACE(hypre_sstructflexgmressetprecond, HYPRE_SSTRUCTFLEXGMRESSETPRECOND)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *precond_id,
-    hypre_F90_Obj *precond_solver,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *precond_id,
+ hypre_F90_Obj *precond_solver,
+ hypre_F90_Int *ierr)
 /*------------------------------------------
  *    precond_id flags mean:
  *    2 - setup a split-solver preconditioner
@@ -187,36 +187,36 @@ hypre_F90_IFACE(hypre_sstructflexgmressetprecond, HYPRE_SSTRUCTFLEXGMRESSETPRECO
  *----------------------------------------*/
 
 {
-   if(*precond_id == 2)
+   if (*precond_id == 2)
    {
       *ierr = (hypre_F90_Int)
-         (HYPRE_SStructFlexGMRESSetPrecond(
-             hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-             HYPRE_SStructSplitSolve,
-             HYPRE_SStructSplitSetup,
-             hypre_F90_PassObjRef (HYPRE_SStructSolver, precond_solver)));
+              (HYPRE_SStructFlexGMRESSetPrecond(
+                  hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+                  HYPRE_SStructSplitSolve,
+                  HYPRE_SStructSplitSetup,
+                  hypre_F90_PassObjRef (HYPRE_SStructSolver, precond_solver)));
    }
 
-   else if(*precond_id == 3)
+   else if (*precond_id == 3)
    {
       *ierr = (hypre_F90_Int)
-         (HYPRE_SStructFlexGMRESSetPrecond(
-             hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-             HYPRE_SStructSysPFMGSolve,
-             HYPRE_SStructSysPFMGSetup,
-             hypre_F90_PassObjRef (HYPRE_SStructSolver, precond_solver)));
+              (HYPRE_SStructFlexGMRESSetPrecond(
+                  hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+                  HYPRE_SStructSysPFMGSolve,
+                  HYPRE_SStructSysPFMGSetup,
+                  hypre_F90_PassObjRef (HYPRE_SStructSolver, precond_solver)));
    }
 
-   else if(*precond_id == 8)
+   else if (*precond_id == 8)
    {
       *ierr = (hypre_F90_Int)
-         (HYPRE_SStructFlexGMRESSetPrecond(
-             hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-             HYPRE_SStructDiagScale,
-             HYPRE_SStructDiagScaleSetup,
-             hypre_F90_PassObjRef (HYPRE_SStructSolver, precond_solver)));
+              (HYPRE_SStructFlexGMRESSetPrecond(
+                  hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+                  HYPRE_SStructDiagScale,
+                  HYPRE_SStructDiagScaleSetup,
+                  hypre_F90_PassObjRef (HYPRE_SStructSolver, precond_solver)));
    }
-   else if(*precond_id == 9)
+   else if (*precond_id == 9)
    {
       *ierr = 0;
    }
@@ -234,14 +234,14 @@ hypre_F90_IFACE(hypre_sstructflexgmressetprecond, HYPRE_SSTRUCTFLEXGMRESSETPRECO
 
 void
 hypre_F90_IFACE(hypre_sstructflexgmressetlogging, HYPRE_SSTRUCTFLEXGMRESSETLOGGING)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *logging,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *logging,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructFlexGMRESSetLogging(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassInt (logging) ) );
+           (HYPRE_SStructFlexGMRESSetLogging(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassInt (logging) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -250,14 +250,14 @@ hypre_F90_IFACE(hypre_sstructflexgmressetlogging, HYPRE_SSTRUCTFLEXGMRESSETLOGGI
 
 void
 hypre_F90_IFACE(hypre_sstructflexgmressetprintlevel, HYPRE_SSTRUCTFLEXGMRESSETPRINTLEVEL)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *level,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *level,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructFlexGMRESSetPrintLevel(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassInt (level) ) );
+           (HYPRE_SStructFlexGMRESSetPrintLevel(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassInt (level) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -266,14 +266,14 @@ hypre_F90_IFACE(hypre_sstructflexgmressetprintlevel, HYPRE_SSTRUCTFLEXGMRESSETPR
 
 void
 hypre_F90_IFACE(hypre_sstructflexgmresgetnumiterati, HYPRE_SSTRUCTFLEXGMRESGETNUMITERATI)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *num_iterations,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *num_iterations,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructFlexGMRESGetNumIterations(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassIntRef (num_iterations) ) );
+           (HYPRE_SStructFlexGMRESGetNumIterations(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassIntRef (num_iterations) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -282,14 +282,14 @@ hypre_F90_IFACE(hypre_sstructflexgmresgetnumiterati, HYPRE_SSTRUCTFLEXGMRESGETNU
 
 void
 hypre_F90_IFACE(hypre_sstructflexgmresgetfinalrelat, HYPRE_SSTRUCTFLEXGMRESGETFINALRELAT)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Real *norm,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Real *norm,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructFlexGMRESGetFinalRelativeResidualNorm(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassRealRef (norm) ) );
+           (HYPRE_SStructFlexGMRESGetFinalRelativeResidualNorm(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassRealRef (norm) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -298,14 +298,14 @@ hypre_F90_IFACE(hypre_sstructflexgmresgetfinalrelat, HYPRE_SSTRUCTFLEXGMRESGETFI
 
 void
 hypre_F90_IFACE(hypre_sstructflexgmresgetresidual, HYPRE_SSTRUCTFLEXGMRESGETRESIDUAL)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Obj *residual,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Obj *residual,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructFlexGMRESGetResidual(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          (void **)              *residual ) );
+           (HYPRE_SStructFlexGMRESGetResidual(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               (void **)              *residual ) );
 }
 
 #ifdef __cplusplus
diff --git a/external/hypre/src/sstruct_ls/F90_HYPRE_sstruct_gmres.c b/external/hypre/src/sstruct_ls/F90_HYPRE_sstruct_gmres.c
index 4ed75aca..1f1e30b4 100644
--- a/external/hypre/src/sstruct_ls/F90_HYPRE_sstruct_gmres.c
+++ b/external/hypre/src/sstruct_ls/F90_HYPRE_sstruct_gmres.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -17,20 +17,20 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-	
+
 /*--------------------------------------------------------------------------
  * HYPRE_SStructGMRESCreate
  *--------------------------------------------------------------------------*/
 
 void
 hypre_F90_IFACE(hypre_sstructgmrescreate, HYPRE_SSTRUCTGMRESCREATE)
-   (hypre_F90_Comm *comm,
-    hypre_F90_Obj  *solver,
-    hypre_F90_Int *ierr)
+(hypre_F90_Comm *comm,
+ hypre_F90_Obj  *solver,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int) HYPRE_SStructGMRESCreate(
-      hypre_F90_PassComm(comm),
-      hypre_F90_PassObjRef(HYPRE_SStructSolver,solver));
+              hypre_F90_PassComm(comm),
+              hypre_F90_PassObjRef(HYPRE_SStructSolver, solver));
 }
 
 /*--------------------------------------------------------------------------
@@ -39,12 +39,12 @@ hypre_F90_IFACE(hypre_sstructgmrescreate, HYPRE_SSTRUCTGMRESCREATE)
 
 void
 hypre_F90_IFACE(hypre_sstructgmresdestroy, HYPRE_SSTRUCTGMRESDESTROY)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructGMRESDestroy(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver) ));
+           (HYPRE_SStructGMRESDestroy(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -53,18 +53,18 @@ hypre_F90_IFACE(hypre_sstructgmresdestroy, HYPRE_SSTRUCTGMRESDESTROY)
 
 void
 hypre_F90_IFACE(hypre_sstructgmressetup, HYPRE_SSTRUCTGMRESSETUP)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Obj *A,
-    hypre_F90_Obj *b,
-    hypre_F90_Obj *x,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Obj *A,
+ hypre_F90_Obj *b,
+ hypre_F90_Obj *x,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructGMRESSetup(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassObj (HYPRE_SStructMatrix, A),
-          hypre_F90_PassObj (HYPRE_SStructVector, b),
-          hypre_F90_PassObj (HYPRE_SStructVector, x) ) );
+           (HYPRE_SStructGMRESSetup(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassObj (HYPRE_SStructMatrix, A),
+               hypre_F90_PassObj (HYPRE_SStructVector, b),
+               hypre_F90_PassObj (HYPRE_SStructVector, x) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -73,18 +73,18 @@ hypre_F90_IFACE(hypre_sstructgmressetup, HYPRE_SSTRUCTGMRESSETUP)
 
 void
 hypre_F90_IFACE(hypre_sstructgmressolve, HYPRE_SSTRUCTGMRESSOLVE)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Obj *A,
-    hypre_F90_Obj *b,
-    hypre_F90_Obj *x,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Obj *A,
+ hypre_F90_Obj *b,
+ hypre_F90_Obj *x,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructGMRESSolve(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassObj (HYPRE_SStructMatrix, A),
-          hypre_F90_PassObj (HYPRE_SStructVector, b),
-          hypre_F90_PassObj (HYPRE_SStructVector, x) ) );
+           (HYPRE_SStructGMRESSolve(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassObj (HYPRE_SStructMatrix, A),
+               hypre_F90_PassObj (HYPRE_SStructVector, b),
+               hypre_F90_PassObj (HYPRE_SStructVector, x) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -93,14 +93,14 @@ hypre_F90_IFACE(hypre_sstructgmressolve, HYPRE_SSTRUCTGMRESSOLVE)
 
 void
 hypre_F90_IFACE(hypre_sstructgmressetkdim, HYPRE_SSTRUCTGMRESSETKDIM)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *k_dim,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *k_dim,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructGMRESSetKDim(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassInt (k_dim) ));
+           (HYPRE_SStructGMRESSetKDim(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassInt (k_dim) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -109,14 +109,14 @@ hypre_F90_IFACE(hypre_sstructgmressetkdim, HYPRE_SSTRUCTGMRESSETKDIM)
 
 void
 hypre_F90_IFACE(hypre_sstructgmressettol, HYPRE_SSTRUCTGMRESSETTOL)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Real *tol,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Real *tol,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructGMRESSetTol(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassReal (tol) ) );
+           (HYPRE_SStructGMRESSetTol(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassReal (tol) ) );
 }
 /*--------------------------------------------------------------------------
  * HYPRE_SStructGMRESSetAbsoluteTol
@@ -124,14 +124,14 @@ hypre_F90_IFACE(hypre_sstructgmressettol, HYPRE_SSTRUCTGMRESSETTOL)
 
 void
 hypre_F90_IFACE(hypre_sstructgmressetabsolutetol, HYPRE_SSTRUCTGMRESSETABSOLUTETOL)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Real *tol,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Real *tol,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructGMRESSetAbsoluteTol(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassReal (tol) ) );
+           (HYPRE_SStructGMRESSetAbsoluteTol(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassReal (tol) ) );
 }
 /*--------------------------------------------------------------------------
  * HYPRE_SStructGMRESSetMinIter
@@ -139,14 +139,14 @@ hypre_F90_IFACE(hypre_sstructgmressetabsolutetol, HYPRE_SSTRUCTGMRESSETABSOLUTET
 
 void
 hypre_F90_IFACE(hypre_sstructgmressetminiter, HYPRE_SSTRUCTGMRESSETMINITER)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *min_iter,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *min_iter,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructGMRESSetMinIter(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassInt (min_iter) ) );
+           (HYPRE_SStructGMRESSetMinIter(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassInt (min_iter) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -155,14 +155,14 @@ hypre_F90_IFACE(hypre_sstructgmressetminiter, HYPRE_SSTRUCTGMRESSETMINITER)
 
 void
 hypre_F90_IFACE(hypre_sstructgmressetmaxiter, HYPRE_SSTRUCTGMRESSETMAXITER)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *max_iter,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *max_iter,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructGMRESSetMaxIter(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassInt (max_iter) ) );
+           (HYPRE_SStructGMRESSetMaxIter(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassInt (max_iter) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -171,14 +171,14 @@ hypre_F90_IFACE(hypre_sstructgmressetmaxiter, HYPRE_SSTRUCTGMRESSETMAXITER)
 
 void
 hypre_F90_IFACE(hypre_sstructgmressetstopcrit, HYPRE_SSTRUCTGMRESSETSTOPCRIT)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *stop_crit,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *stop_crit,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructGMRESSetStopCrit(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassInt (stop_crit) ) );
+           (HYPRE_SStructGMRESSetStopCrit(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassInt (stop_crit) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -187,10 +187,10 @@ hypre_F90_IFACE(hypre_sstructgmressetstopcrit, HYPRE_SSTRUCTGMRESSETSTOPCRIT)
 
 void
 hypre_F90_IFACE(hypre_sstructgmressetprecond, HYPRE_SSTRUCTGMRESSETPRECOND)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *precond_id,
-    hypre_F90_Obj *precond_solver,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *precond_id,
+ hypre_F90_Obj *precond_solver,
+ hypre_F90_Int *ierr)
 /*------------------------------------------
  *    precond_id flags mean:
  *    2 - setup a split-solver preconditioner
@@ -200,36 +200,36 @@ hypre_F90_IFACE(hypre_sstructgmressetprecond, HYPRE_SSTRUCTGMRESSETPRECOND)
  *----------------------------------------*/
 
 {
-   if(*precond_id == 2)
+   if (*precond_id == 2)
    {
       *ierr = (hypre_F90_Int)
-         (HYPRE_SStructGMRESSetPrecond(
-             hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-             HYPRE_SStructSplitSolve,
-             HYPRE_SStructSplitSetup,
-             hypre_F90_PassObjRef (HYPRE_SStructSolver, precond_solver)));
+              (HYPRE_SStructGMRESSetPrecond(
+                  hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+                  HYPRE_SStructSplitSolve,
+                  HYPRE_SStructSplitSetup,
+                  hypre_F90_PassObjRef (HYPRE_SStructSolver, precond_solver)));
    }
 
-   else if(*precond_id == 3)
+   else if (*precond_id == 3)
    {
       *ierr = (hypre_F90_Int)
-         (HYPRE_SStructGMRESSetPrecond(
-             hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-             HYPRE_SStructSysPFMGSolve,
-             HYPRE_SStructSysPFMGSetup,
-             hypre_F90_PassObjRef (HYPRE_SStructSolver, precond_solver)));
+              (HYPRE_SStructGMRESSetPrecond(
+                  hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+                  HYPRE_SStructSysPFMGSolve,
+                  HYPRE_SStructSysPFMGSetup,
+                  hypre_F90_PassObjRef (HYPRE_SStructSolver, precond_solver)));
    }
 
-   else if(*precond_id == 8)
+   else if (*precond_id == 8)
    {
       *ierr = (hypre_F90_Int)
-         (HYPRE_SStructGMRESSetPrecond(
-             hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-             HYPRE_SStructDiagScale,
-             HYPRE_SStructDiagScaleSetup,
-             hypre_F90_PassObjRef (HYPRE_SStructSolver, precond_solver)));
+              (HYPRE_SStructGMRESSetPrecond(
+                  hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+                  HYPRE_SStructDiagScale,
+                  HYPRE_SStructDiagScaleSetup,
+                  hypre_F90_PassObjRef (HYPRE_SStructSolver, precond_solver)));
    }
-   else if(*precond_id == 9)
+   else if (*precond_id == 9)
    {
       *ierr = 0;
    }
@@ -247,14 +247,14 @@ hypre_F90_IFACE(hypre_sstructgmressetprecond, HYPRE_SSTRUCTGMRESSETPRECOND)
 
 void
 hypre_F90_IFACE(hypre_sstructgmressetlogging, HYPRE_SSTRUCTGMRESSETLOGGING)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *logging,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *logging,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructGMRESSetLogging(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassInt (logging) ) );
+           (HYPRE_SStructGMRESSetLogging(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassInt (logging) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -263,14 +263,14 @@ hypre_F90_IFACE(hypre_sstructgmressetlogging, HYPRE_SSTRUCTGMRESSETLOGGING)
 
 void
 hypre_F90_IFACE(hypre_sstructgmressetprintlevel, HYPRE_SSTRUCTGMRESSETPRINTLEVEL)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *level,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *level,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructGMRESSetPrintLevel(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassInt (level) ) );
+           (HYPRE_SStructGMRESSetPrintLevel(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassInt (level) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -279,14 +279,14 @@ hypre_F90_IFACE(hypre_sstructgmressetprintlevel, HYPRE_SSTRUCTGMRESSETPRINTLEVEL
 
 void
 hypre_F90_IFACE(hypre_sstructgmresgetnumiterati, HYPRE_SSTRUCTGMRESGETNUMITERATI)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *num_iterations,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *num_iterations,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructGMRESGetNumIterations(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassIntRef (num_iterations) ) );
+           (HYPRE_SStructGMRESGetNumIterations(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassIntRef (num_iterations) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -295,14 +295,14 @@ hypre_F90_IFACE(hypre_sstructgmresgetnumiterati, HYPRE_SSTRUCTGMRESGETNUMITERATI
 
 void
 hypre_F90_IFACE(hypre_sstructgmresgetfinalrelat, HYPRE_SSTRUCTGMRESGETFINALRELAT)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Real *norm,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Real *norm,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructGMRESGetFinalRelativeResidualNorm(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassRealRef (norm) ) );
+           (HYPRE_SStructGMRESGetFinalRelativeResidualNorm(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassRealRef (norm) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -311,14 +311,14 @@ hypre_F90_IFACE(hypre_sstructgmresgetfinalrelat, HYPRE_SSTRUCTGMRESGETFINALRELAT
 
 void
 hypre_F90_IFACE(hypre_sstructgmresgetresidual, HYPRE_SSTRUCTGMRESGETRESIDUAL)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Obj *residual,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Obj *residual,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructGMRESGetResidual(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          (void **)              *residual ) );
+           (HYPRE_SStructGMRESGetResidual(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               (void **)              *residual ) );
 }
 
 #ifdef __cplusplus
diff --git a/external/hypre/src/sstruct_ls/F90_HYPRE_sstruct_int.c b/external/hypre/src/sstruct_ls/F90_HYPRE_sstruct_int.c
index 4f06cf70..2e1e0deb 100644
--- a/external/hypre/src/sstruct_ls/F90_HYPRE_sstruct_int.c
+++ b/external/hypre/src/sstruct_ls/F90_HYPRE_sstruct_int.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -18,21 +18,21 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-	
+
 /*--------------------------------------------------------------------------
  *  HYPRE_SStructPVectorSetRandomValues
  *--------------------------------------------------------------------------*/
 
 void
 hypre_F90_IFACE(hypre_sstructpvectorsetrandomva, HYPRE_SSTRUCTPVECTORSETRANDOMVA)
-   (hypre_F90_Obj *pvector,
-    hypre_F90_Int *seed,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *pvector,
+ hypre_F90_Int *seed,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( hypre_SStructPVectorSetRandomValues(
-           (hypre_SStructPVector *) pvector,
-           hypre_F90_PassInt (seed) ));
+           ( hypre_SStructPVectorSetRandomValues(
+                (hypre_SStructPVector *) pvector,
+                hypre_F90_PassInt (seed) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -41,14 +41,14 @@ hypre_F90_IFACE(hypre_sstructpvectorsetrandomva, HYPRE_SSTRUCTPVECTORSETRANDOMVA
 
 void
 hypre_F90_IFACE(hypre_sstructvectorsetrandomval, HYPRE_SSTRUCTVECTORSETRANDOMVAL)
-   (hypre_F90_Obj *vector,
-    hypre_F90_Int *seed,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *vector,
+ hypre_F90_Int *seed,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( hypre_SStructVectorSetRandomValues(
-           (hypre_SStructVector *) vector,
-           hypre_F90_PassInt (seed) ));
+           ( hypre_SStructVectorSetRandomValues(
+                (hypre_SStructVector *) vector,
+                hypre_F90_PassInt (seed) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -57,13 +57,13 @@ hypre_F90_IFACE(hypre_sstructvectorsetrandomval, HYPRE_SSTRUCTVECTORSETRANDOMVAL
 
 void
 hypre_F90_IFACE(hypre_sstructsetrandomvalues, HYPRE_SSTRUCTSETRANDOMVALUES)
-   (hypre_F90_Obj *v,
-    hypre_F90_Int *seed,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *v,
+ hypre_F90_Int *seed,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( hypre_SStructSetRandomValues(
-           (void *) v, hypre_F90_PassInt (seed) )); 
+           ( hypre_SStructSetRandomValues(
+                (void *) v, hypre_F90_PassInt (seed) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -72,12 +72,12 @@ hypre_F90_IFACE(hypre_sstructsetrandomvalues, HYPRE_SSTRUCTSETRANDOMVALUES)
 
 void
 hypre_F90_IFACE(hypre_sstructsetupinterpreter, HYPRE_SSTRUCTSETUPINTERPRETER)
-   (hypre_F90_Obj *i,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *i,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_SStructSetupInterpreter(
-           (mv_InterfaceInterpreter *) i ));
+           ( HYPRE_SStructSetupInterpreter(
+                (mv_InterfaceInterpreter *) i ));
 }
 
 /*--------------------------------------------------------------------------
@@ -86,12 +86,12 @@ hypre_F90_IFACE(hypre_sstructsetupinterpreter, HYPRE_SSTRUCTSETUPINTERPRETER)
 
 void
 hypre_F90_IFACE(hypre_sstructsetupmatvec, HYPRE_SSTRUCTSETUPMATVEC)
-   (hypre_F90_Obj *mv,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *mv,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_SStructSetupMatvec(
-           hypre_F90_PassObjRef (HYPRE_MatvecFunctions, mv)));
+           ( HYPRE_SStructSetupMatvec(
+                hypre_F90_PassObjRef (HYPRE_MatvecFunctions, mv)));
 }
 
 #ifdef __cplusplus
diff --git a/external/hypre/src/sstruct_ls/F90_HYPRE_sstruct_lgmres.c b/external/hypre/src/sstruct_ls/F90_HYPRE_sstruct_lgmres.c
index 2ac6bd0b..e11e3d0b 100644
--- a/external/hypre/src/sstruct_ls/F90_HYPRE_sstruct_lgmres.c
+++ b/external/hypre/src/sstruct_ls/F90_HYPRE_sstruct_lgmres.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -24,14 +24,14 @@ extern "C" {
 
 void
 hypre_F90_IFACE(hypre_sstructlgmrescreate, HYPRE_SSTRUCTLGMRESCREATE)
-   (hypre_F90_Comm *comm,
-    hypre_F90_Obj *solver,
-    hypre_F90_Int *ierr)
+(hypre_F90_Comm *comm,
+ hypre_F90_Obj *solver,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructLGMRESCreate(
-          hypre_F90_PassComm (comm),
-          hypre_F90_PassObjRef (HYPRE_SStructSolver, solver) ));
+           (HYPRE_SStructLGMRESCreate(
+               hypre_F90_PassComm (comm),
+               hypre_F90_PassObjRef (HYPRE_SStructSolver, solver) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -40,12 +40,12 @@ hypre_F90_IFACE(hypre_sstructlgmrescreate, HYPRE_SSTRUCTLGMRESCREATE)
 
 void
 hypre_F90_IFACE(hypre_sstructlgmresdestroy, HYPRE_SSTRUCTLGMRESDESTROY)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructLGMRESDestroy(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver) ));
+           (HYPRE_SStructLGMRESDestroy(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -54,18 +54,18 @@ hypre_F90_IFACE(hypre_sstructlgmresdestroy, HYPRE_SSTRUCTLGMRESDESTROY)
 
 void
 hypre_F90_IFACE(hypre_sstructlgmressetup, HYPRE_SSTRUCTLGMRESSETUP)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Obj *A,
-    hypre_F90_Obj *b,
-    hypre_F90_Obj *x,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Obj *A,
+ hypre_F90_Obj *b,
+ hypre_F90_Obj *x,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructLGMRESSetup(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassObj (HYPRE_SStructMatrix, A),
-          hypre_F90_PassObj (HYPRE_SStructVector, b),
-          hypre_F90_PassObj (HYPRE_SStructVector, x) ) );
+           (HYPRE_SStructLGMRESSetup(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassObj (HYPRE_SStructMatrix, A),
+               hypre_F90_PassObj (HYPRE_SStructVector, b),
+               hypre_F90_PassObj (HYPRE_SStructVector, x) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -74,18 +74,18 @@ hypre_F90_IFACE(hypre_sstructlgmressetup, HYPRE_SSTRUCTLGMRESSETUP)
 
 void
 hypre_F90_IFACE(hypre_sstructlgmressolve, HYPRE_SSTRUCTLGMRESSOLVE)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Obj *A,
-    hypre_F90_Obj *b,
-    hypre_F90_Obj *x,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Obj *A,
+ hypre_F90_Obj *b,
+ hypre_F90_Obj *x,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructLGMRESSolve(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassObj (HYPRE_SStructMatrix, A),
-          hypre_F90_PassObj (HYPRE_SStructVector, b),
-          hypre_F90_PassObj (HYPRE_SStructVector, x) ) );
+           (HYPRE_SStructLGMRESSolve(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassObj (HYPRE_SStructMatrix, A),
+               hypre_F90_PassObj (HYPRE_SStructVector, b),
+               hypre_F90_PassObj (HYPRE_SStructVector, x) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -94,14 +94,14 @@ hypre_F90_IFACE(hypre_sstructlgmressolve, HYPRE_SSTRUCTLGMRESSOLVE)
 
 void
 hypre_F90_IFACE(hypre_sstructlgmressetkdim, HYPRE_SSTRUCTLGMRESSETKDIM)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *k_dim,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *k_dim,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructLGMRESSetKDim(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassInt (k_dim) ));
+           (HYPRE_SStructLGMRESSetKDim(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassInt (k_dim) ));
 }
 /*--------------------------------------------------------------------------
  * HYPRE_SStructLGMRESSetAugDim
@@ -109,14 +109,14 @@ hypre_F90_IFACE(hypre_sstructlgmressetkdim, HYPRE_SSTRUCTLGMRESSETKDIM)
 
 void
 hypre_F90_IFACE(hypre_sstructlgmressetaugdim, HYPRE_SSTRUCTLGMRESSETAUGDIM)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *aug_dim,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *aug_dim,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructLGMRESSetAugDim(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassInt (aug_dim) ));
+           (HYPRE_SStructLGMRESSetAugDim(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassInt (aug_dim) ));
 }
 /*--------------------------------------------------------------------------
  * HYPRE_SStructLGMRESSetTol
@@ -124,14 +124,14 @@ hypre_F90_IFACE(hypre_sstructlgmressetaugdim, HYPRE_SSTRUCTLGMRESSETAUGDIM)
 
 void
 hypre_F90_IFACE(hypre_sstructlgmressettol, HYPRE_SSTRUCTLGMRESSETTOL)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Real *tol,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Real *tol,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructLGMRESSetTol(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassReal (tol) ) );
+           (HYPRE_SStructLGMRESSetTol(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassReal (tol) ) );
 }
 /*--------------------------------------------------------------------------
  * HYPRE_SStructLGMRESSetAbsoluteTol
@@ -139,14 +139,14 @@ hypre_F90_IFACE(hypre_sstructlgmressettol, HYPRE_SSTRUCTLGMRESSETTOL)
 
 void
 hypre_F90_IFACE(hypre_sstructlgmressetabsolutetol, HYPRE_SSTRUCTLGMRESSETABSOLUTETOL)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Real *tol,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Real *tol,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructLGMRESSetAbsoluteTol(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassReal (tol) ) );
+           (HYPRE_SStructLGMRESSetAbsoluteTol(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassReal (tol) ) );
 }
 /*--------------------------------------------------------------------------
  * HYPRE_SStructLGMRESSetMinIter
@@ -154,14 +154,14 @@ hypre_F90_IFACE(hypre_sstructlgmressetabsolutetol, HYPRE_SSTRUCTLGMRESSETABSOLUT
 
 void
 hypre_F90_IFACE(hypre_sstructlgmressetminiter, HYPRE_SSTRUCTLGMRESSETMINITER)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *min_iter,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *min_iter,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructLGMRESSetMinIter(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassInt (min_iter) ) );
+           (HYPRE_SStructLGMRESSetMinIter(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassInt (min_iter) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -170,14 +170,14 @@ hypre_F90_IFACE(hypre_sstructlgmressetminiter, HYPRE_SSTRUCTLGMRESSETMINITER)
 
 void
 hypre_F90_IFACE(hypre_sstructlgmressetmaxiter, HYPRE_SSTRUCTLGMRESSETMAXITER)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *max_iter,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *max_iter,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructLGMRESSetMaxIter(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassInt (max_iter) ) );
+           (HYPRE_SStructLGMRESSetMaxIter(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassInt (max_iter) ) );
 }
 
 
@@ -188,10 +188,10 @@ hypre_F90_IFACE(hypre_sstructlgmressetmaxiter, HYPRE_SSTRUCTLGMRESSETMAXITER)
 
 void
 hypre_F90_IFACE(hypre_sstructlgmressetprecond, HYPRE_SSTRUCTLGMRESSETPRECOND)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *precond_id,
-    hypre_F90_Obj *precond_solver,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *precond_id,
+ hypre_F90_Obj *precond_solver,
+ hypre_F90_Int *ierr)
 /*------------------------------------------
  *    precond_id flags mean:
  *    2 - setup a split-solver preconditioner
@@ -201,36 +201,36 @@ hypre_F90_IFACE(hypre_sstructlgmressetprecond, HYPRE_SSTRUCTLGMRESSETPRECOND)
  *----------------------------------------*/
 
 {
-   if(*precond_id == 2)
+   if (*precond_id == 2)
    {
       *ierr = (hypre_F90_Int)
-         (HYPRE_SStructLGMRESSetPrecond(
-             hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-             HYPRE_SStructSplitSolve,
-             HYPRE_SStructSplitSetup,
-             hypre_F90_PassObjRef (HYPRE_SStructSolver, precond_solver)));
+              (HYPRE_SStructLGMRESSetPrecond(
+                  hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+                  HYPRE_SStructSplitSolve,
+                  HYPRE_SStructSplitSetup,
+                  hypre_F90_PassObjRef (HYPRE_SStructSolver, precond_solver)));
    }
 
-   else if(*precond_id == 3)
+   else if (*precond_id == 3)
    {
       *ierr = (hypre_F90_Int)
-         (HYPRE_SStructLGMRESSetPrecond(
-             hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-             HYPRE_SStructSysPFMGSolve,
-             HYPRE_SStructSysPFMGSetup,
-             hypre_F90_PassObjRef (HYPRE_SStructSolver, precond_solver)));
+              (HYPRE_SStructLGMRESSetPrecond(
+                  hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+                  HYPRE_SStructSysPFMGSolve,
+                  HYPRE_SStructSysPFMGSetup,
+                  hypre_F90_PassObjRef (HYPRE_SStructSolver, precond_solver)));
    }
 
-   else if(*precond_id == 8)
+   else if (*precond_id == 8)
    {
       *ierr = (hypre_F90_Int)
-         (HYPRE_SStructLGMRESSetPrecond(
-             hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-             HYPRE_SStructDiagScale,
-             HYPRE_SStructDiagScaleSetup,
-             hypre_F90_PassObjRef (HYPRE_SStructSolver, precond_solver)));
+              (HYPRE_SStructLGMRESSetPrecond(
+                  hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+                  HYPRE_SStructDiagScale,
+                  HYPRE_SStructDiagScaleSetup,
+                  hypre_F90_PassObjRef (HYPRE_SStructSolver, precond_solver)));
    }
-   else if(*precond_id == 9)
+   else if (*precond_id == 9)
    {
       *ierr = 0;
    }
@@ -248,14 +248,14 @@ hypre_F90_IFACE(hypre_sstructlgmressetprecond, HYPRE_SSTRUCTLGMRESSETPRECOND)
 
 void
 hypre_F90_IFACE(hypre_sstructlgmressetlogging, HYPRE_SSTRUCTLGMRESSETLOGGING)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *logging,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *logging,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructLGMRESSetLogging(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassInt (logging) ) );
+           (HYPRE_SStructLGMRESSetLogging(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassInt (logging) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -264,14 +264,14 @@ hypre_F90_IFACE(hypre_sstructlgmressetlogging, HYPRE_SSTRUCTLGMRESSETLOGGING)
 
 void
 hypre_F90_IFACE(hypre_sstructlgmressetprintlevel, HYPRE_SSTRUCTLGMRESSETPRINTLEVEL)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *level,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *level,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructLGMRESSetPrintLevel(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassInt (level) ) );
+           (HYPRE_SStructLGMRESSetPrintLevel(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassInt (level) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -280,14 +280,14 @@ hypre_F90_IFACE(hypre_sstructlgmressetprintlevel, HYPRE_SSTRUCTLGMRESSETPRINTLEV
 
 void
 hypre_F90_IFACE(hypre_sstructlgmresgetnumiterati, HYPRE_SSTRUCTLGMRESGETNUMITERATI)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *num_iterations,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *num_iterations,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructLGMRESGetNumIterations(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassIntRef (num_iterations) ) );
+           (HYPRE_SStructLGMRESGetNumIterations(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassIntRef (num_iterations) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -296,14 +296,14 @@ hypre_F90_IFACE(hypre_sstructlgmresgetnumiterati, HYPRE_SSTRUCTLGMRESGETNUMITERA
 
 void
 hypre_F90_IFACE(hypre_sstructlgmresgetfinalrelat, HYPRE_SSTRUCTLGMRESGETFINALRELAT)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Real *norm,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Real *norm,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructLGMRESGetFinalRelativeResidualNorm(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassRealRef (norm) ) );
+           (HYPRE_SStructLGMRESGetFinalRelativeResidualNorm(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassRealRef (norm) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -312,14 +312,14 @@ hypre_F90_IFACE(hypre_sstructlgmresgetfinalrelat, HYPRE_SSTRUCTLGMRESGETFINALREL
 
 void
 hypre_F90_IFACE(hypre_sstructlgmresgetresidual, HYPRE_SSTRUCTLGMRESGETRESIDUAL)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Obj *residual,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Obj *residual,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructLGMRESGetResidual(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          (void **)              *residual ) );
+           (HYPRE_SStructLGMRESGetResidual(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               (void **)              *residual ) );
 }
 
 #ifdef __cplusplus
diff --git a/external/hypre/src/sstruct_ls/F90_HYPRE_sstruct_maxwell.c b/external/hypre/src/sstruct_ls/F90_HYPRE_sstruct_maxwell.c
index 2e7efd30..4aa2492c 100644
--- a/external/hypre/src/sstruct_ls/F90_HYPRE_sstruct_maxwell.c
+++ b/external/hypre/src/sstruct_ls/F90_HYPRE_sstruct_maxwell.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -17,21 +17,21 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-	
+
 /*--------------------------------------------------------------------------
  * HYPRE_SStructMaxwellCreate
  *--------------------------------------------------------------------------*/
 
 void
 hypre_F90_IFACE(hypre_sstructmaxwellcreate, HYPRE_SSTRUCTMAXWELLCREATE)
-   (hypre_F90_Comm *comm,
-    hypre_F90_Obj *solver,
-    hypre_F90_Int *ierr)
+(hypre_F90_Comm *comm,
+ hypre_F90_Obj *solver,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructMaxwellCreate(
-          hypre_F90_PassComm (comm),
-          hypre_F90_PassObjRef (HYPRE_SStructSolver, solver)) );
+           (HYPRE_SStructMaxwellCreate(
+               hypre_F90_PassComm (comm),
+               hypre_F90_PassObjRef (HYPRE_SStructSolver, solver)) );
 }
 
 /*--------------------------------------------------------------------------
@@ -40,12 +40,12 @@ hypre_F90_IFACE(hypre_sstructmaxwellcreate, HYPRE_SSTRUCTMAXWELLCREATE)
 
 void
 hypre_F90_IFACE(hypre_sstructmaxwelldestroy, HYPRE_SSTRUCTMAXWELLDESTROY)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructMaxwellDestroy(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver)));
+           (HYPRE_SStructMaxwellDestroy(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver)));
 }
 
 /*--------------------------------------------------------------------------
@@ -54,18 +54,18 @@ hypre_F90_IFACE(hypre_sstructmaxwelldestroy, HYPRE_SSTRUCTMAXWELLDESTROY)
 
 void
 hypre_F90_IFACE(hypre_sstructmaxwellsetup, HYPRE_SSTRUCTMAXWELLSETUP)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Obj *A,
-    hypre_F90_Obj *b,
-    hypre_F90_Obj *x,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Obj *A,
+ hypre_F90_Obj *b,
+ hypre_F90_Obj *x,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_SStructMaxwellSetup( 
-           hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-           hypre_F90_PassObj (HYPRE_SStructMatrix, A),
-           hypre_F90_PassObj (HYPRE_SStructVector, b),
-           hypre_F90_PassObj (HYPRE_SStructVector, x) ));
+           ( HYPRE_SStructMaxwellSetup(
+                hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+                hypre_F90_PassObj (HYPRE_SStructMatrix, A),
+                hypre_F90_PassObj (HYPRE_SStructVector, b),
+                hypre_F90_PassObj (HYPRE_SStructVector, x) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -74,18 +74,18 @@ hypre_F90_IFACE(hypre_sstructmaxwellsetup, HYPRE_SSTRUCTMAXWELLSETUP)
 
 void
 hypre_F90_IFACE(hypre_sstructmaxwellsolve, HYPRE_SSTRUCTMAXWELLSOLVE)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Obj *A,
-    hypre_F90_Obj *b,
-    hypre_F90_Obj *x,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Obj *A,
+ hypre_F90_Obj *b,
+ hypre_F90_Obj *x,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructMaxwellSolve( 
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassObj (HYPRE_SStructMatrix, A),
-          hypre_F90_PassObj (HYPRE_SStructVector, b),
-          hypre_F90_PassObj (HYPRE_SStructVector, x)     ) );
+           (HYPRE_SStructMaxwellSolve(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassObj (HYPRE_SStructMatrix, A),
+               hypre_F90_PassObj (HYPRE_SStructVector, b),
+               hypre_F90_PassObj (HYPRE_SStructVector, x)     ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -94,18 +94,18 @@ hypre_F90_IFACE(hypre_sstructmaxwellsolve, HYPRE_SSTRUCTMAXWELLSOLVE)
 
 void
 hypre_F90_IFACE(hypre_sstructmaxwellsolve2, HYPRE_SSTRUCTMAXWELLSOLVE2)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Obj *A,
-    hypre_F90_Obj *b,
-    hypre_F90_Obj *x,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Obj *A,
+ hypre_F90_Obj *b,
+ hypre_F90_Obj *x,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructMaxwellSolve2( 
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassObj (HYPRE_SStructMatrix, A),
-          hypre_F90_PassObj (HYPRE_SStructVector, b),
-          hypre_F90_PassObj (HYPRE_SStructVector, x)     ) );
+           (HYPRE_SStructMaxwellSolve2(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassObj (HYPRE_SStructMatrix, A),
+               hypre_F90_PassObj (HYPRE_SStructVector, b),
+               hypre_F90_PassObj (HYPRE_SStructVector, x)     ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -114,14 +114,14 @@ hypre_F90_IFACE(hypre_sstructmaxwellsolve2, HYPRE_SSTRUCTMAXWELLSOLVE2)
 
 void
 hypre_F90_IFACE(hypre_maxwellgrad, HYPRE_MAXWELLGRAD)
-   (hypre_F90_Obj *grid,
-    hypre_F90_Obj *T,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *grid,
+ hypre_F90_Obj *T,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_MaxwellGrad(
-           hypre_F90_PassObj (HYPRE_SStructGrid, grid),
-           hypre_F90_PassObjRef (HYPRE_ParCSRMatrix, T) ) );
+           ( HYPRE_MaxwellGrad(
+                hypre_F90_PassObj (HYPRE_SStructGrid, grid),
+                hypre_F90_PassObjRef (HYPRE_ParCSRMatrix, T) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -130,14 +130,14 @@ hypre_F90_IFACE(hypre_maxwellgrad, HYPRE_MAXWELLGRAD)
 
 void
 hypre_F90_IFACE(hypre_sstructmaxwellsetgrad, HYPRE_SSTRUCTMAXWELLSETGRAD)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Obj *T,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Obj *T,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_SStructMaxwellSetGrad(
-           hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-           hypre_F90_PassObj (HYPRE_ParCSRMatrix, T) ));
+           ( HYPRE_SStructMaxwellSetGrad(
+                hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+                hypre_F90_PassObj (HYPRE_ParCSRMatrix, T) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -146,14 +146,14 @@ hypre_F90_IFACE(hypre_sstructmaxwellsetgrad, HYPRE_SSTRUCTMAXWELLSETGRAD)
 
 void
 hypre_F90_IFACE(hypre_sstructmaxwellsetrfactors, HYPRE_SSTRUCTMAXWELLSETRFACTORS)
-   (hypre_F90_Obj *solver,
-    HYPRE_Int     (*rfactors)[3],
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ HYPRE_Int     (*rfactors)[3],
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_SStructMaxwellSetRfactors(
-           hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-           rfactors[3] ));
+           ( HYPRE_SStructMaxwellSetRfactors(
+                hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+                rfactors[3] ));
 }
 
 /*--------------------------------------------------------------------------
@@ -162,14 +162,14 @@ hypre_F90_IFACE(hypre_sstructmaxwellsetrfactors, HYPRE_SSTRUCTMAXWELLSETRFACTORS
 
 void
 hypre_F90_IFACE(hypre_sstructmaxwellsettol, HYPRE_SSTRUCTMAXWELLSETTOL)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Real *tol,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Real *tol,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_SStructMaxwellSetTol(
-           hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-           hypre_F90_PassReal (tol)    ));
+           ( HYPRE_SStructMaxwellSetTol(
+                hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+                hypre_F90_PassReal (tol)    ));
 }
 
 /*--------------------------------------------------------------------------
@@ -178,14 +178,14 @@ hypre_F90_IFACE(hypre_sstructmaxwellsettol, HYPRE_SSTRUCTMAXWELLSETTOL)
 
 void
 hypre_F90_IFACE(hypre_sstructmaxwellsetconstant, HYPRE_SSTRUCTMAXWELLSETCONSTANT)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *constant_coef,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *constant_coef,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_SStructMaxwellSetConstantCoef( 
-           (HYPRE_SStructSolver ) *solver,
-           hypre_F90_PassInt (constant_coef)) );
+           ( HYPRE_SStructMaxwellSetConstantCoef(
+                (HYPRE_SStructSolver ) * solver,
+                hypre_F90_PassInt (constant_coef)) );
 }
 
 /*--------------------------------------------------------------------------
@@ -194,14 +194,14 @@ hypre_F90_IFACE(hypre_sstructmaxwellsetconstant, HYPRE_SSTRUCTMAXWELLSETCONSTANT
 
 void
 hypre_F90_IFACE(hypre_sstructmaxwellsetmaxiter, HYPRE_SSTRUCTMAXWELLSETMAXITER)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *max_iter,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *max_iter,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_SStructMaxwellSetMaxIter(
-           hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-           hypre_F90_PassInt (max_iter)  ));
+           ( HYPRE_SStructMaxwellSetMaxIter(
+                hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+                hypre_F90_PassInt (max_iter)  ));
 }
 
 /*--------------------------------------------------------------------------
@@ -210,14 +210,14 @@ hypre_F90_IFACE(hypre_sstructmaxwellsetmaxiter, HYPRE_SSTRUCTMAXWELLSETMAXITER)
 
 void
 hypre_F90_IFACE(hypre_sstructmaxwellsetrelchang, HYPRE_SSTRUCTMAXWELLSETRELCHANG)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *rel_change,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *rel_change,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_SStructMaxwellSetRelChange(
-           hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-           hypre_F90_PassInt (rel_change)  ));
+           ( HYPRE_SStructMaxwellSetRelChange(
+                hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+                hypre_F90_PassInt (rel_change)  ));
 }
 
 /*--------------------------------------------------------------------------
@@ -226,14 +226,14 @@ hypre_F90_IFACE(hypre_sstructmaxwellsetrelchang, HYPRE_SSTRUCTMAXWELLSETRELCHANG
 
 void
 hypre_F90_IFACE(hypre_sstructmaxwellsetnumprere, HYPRE_SSTRUCTMAXWELLSETNUMPRERE)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *num_pre_relax,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *num_pre_relax,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_SStructMaxwellSetNumPreRelax( 
-           hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-           hypre_F90_PassInt (num_pre_relax) ));
+           ( HYPRE_SStructMaxwellSetNumPreRelax(
+                hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+                hypre_F90_PassInt (num_pre_relax) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -242,14 +242,14 @@ hypre_F90_IFACE(hypre_sstructmaxwellsetnumprere, HYPRE_SSTRUCTMAXWELLSETNUMPRERE
 
 void
 hypre_F90_IFACE(hypre_sstructmaxwellsetnumpostr, HYPRE_SSTRUCTMAXWELLSETNUMPOSTR)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *num_post_relax,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *num_post_relax,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_SStructMaxwellSetNumPostRelax( 
-           hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-           hypre_F90_PassInt (num_post_relax) ));
+           ( HYPRE_SStructMaxwellSetNumPostRelax(
+                hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+                hypre_F90_PassInt (num_post_relax) ));
 
 }
 
@@ -259,14 +259,14 @@ hypre_F90_IFACE(hypre_sstructmaxwellsetnumpostr, HYPRE_SSTRUCTMAXWELLSETNUMPOSTR
 
 void
 hypre_F90_IFACE(hypre_sstructmaxwellsetlogging, HYPRE_SSTRUCTMAXWELLSETLOGGING)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *logging,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *logging,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_SStructMaxwellSetLogging(
-           hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-           hypre_F90_PassInt (logging)));
+           ( HYPRE_SStructMaxwellSetLogging(
+                hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+                hypre_F90_PassInt (logging)));
 }
 
 /*--------------------------------------------------------------------------
@@ -275,14 +275,14 @@ hypre_F90_IFACE(hypre_sstructmaxwellsetlogging, HYPRE_SSTRUCTMAXWELLSETLOGGING)
 
 void
 hypre_F90_IFACE(hypre_sstructmaxwellsetprintlev, HYPRE_SSTRUCTMAXWELLSETPRINTLEV)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *print_level,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *print_level,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_SStructMaxwellSetPrintLevel( 
-           hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-           hypre_F90_PassInt (print_level) ));
+           ( HYPRE_SStructMaxwellSetPrintLevel(
+                hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+                hypre_F90_PassInt (print_level) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -291,14 +291,14 @@ hypre_F90_IFACE(hypre_sstructmaxwellsetprintlev, HYPRE_SSTRUCTMAXWELLSETPRINTLEV
 
 void
 hypre_F90_IFACE(hypre_sstructmaxwellprintloggin, HYPRE_SSTRUCTMAXWELLPRINTLOGGIN)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *myid,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *myid,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_SStructMaxwellPrintLogging( 
-           hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-           hypre_F90_PassInt (myid)));
+           ( HYPRE_SStructMaxwellPrintLogging(
+                hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+                hypre_F90_PassInt (myid)));
 }
 
 /*--------------------------------------------------------------------------
@@ -306,15 +306,15 @@ hypre_F90_IFACE(hypre_sstructmaxwellprintloggin, HYPRE_SSTRUCTMAXWELLPRINTLOGGIN
  *--------------------------------------------------------------------------*/
 
 void
-hypre_F90_IFACE(hypre_sstructmaxwellgetnumitera, HYPRE_SSTRUCTMAXWELLGETNUMITERA) 
-   (hypre_F90_Obj *solver, 
-    hypre_F90_Int *num_iterations,
-    hypre_F90_Int *ierr)
+hypre_F90_IFACE(hypre_sstructmaxwellgetnumitera, HYPRE_SSTRUCTMAXWELLGETNUMITERA)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *num_iterations,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_SStructMaxwellGetNumIterations( 
-           hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-           hypre_F90_PassIntRef (num_iterations) ));
+           ( HYPRE_SStructMaxwellGetNumIterations(
+                hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+                hypre_F90_PassIntRef (num_iterations) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -322,15 +322,15 @@ hypre_F90_IFACE(hypre_sstructmaxwellgetnumitera, HYPRE_SSTRUCTMAXWELLGETNUMITERA
  *--------------------------------------------------------------------------*/
 
 void
-hypre_F90_IFACE(hypre_sstructmaxwellgetfinalrel, HYPRE_SSTRUCTMAXWELLGETFINALREL) 
-   (hypre_F90_Obj *solver, 
-    hypre_F90_Real *norm,
-    hypre_F90_Int *ierr)
+hypre_F90_IFACE(hypre_sstructmaxwellgetfinalrel, HYPRE_SSTRUCTMAXWELLGETFINALREL)
+(hypre_F90_Obj *solver,
+ hypre_F90_Real *norm,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_SStructMaxwellGetFinalRelativeResidualNorm( 
-           hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-           hypre_F90_PassRealRef (norm)   ));
+           ( HYPRE_SStructMaxwellGetFinalRelativeResidualNorm(
+                hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+                hypre_F90_PassRealRef (norm)   ));
 }
 
 /*--------------------------------------------------------------------------
@@ -338,21 +338,21 @@ hypre_F90_IFACE(hypre_sstructmaxwellgetfinalrel, HYPRE_SSTRUCTMAXWELLGETFINALREL
  *--------------------------------------------------------------------------*/
 
 void
-hypre_F90_IFACE(hypre_sstructmaxwellphysbdy, HYPRE_SSTRUCTMAXWELLPHYSBDY) 
-   (hypre_F90_Obj *grid_l, 
-    hypre_F90_Int *num_levels,
-    HYPRE_Int      (*rfactors)[3],
-    HYPRE_Int      (***BdryRanks_ptr),
-    HYPRE_Int      (**BdryRanksCnt_ptr),
-    hypre_F90_Int *ierr)
+hypre_F90_IFACE(hypre_sstructmaxwellphysbdy, HYPRE_SSTRUCTMAXWELLPHYSBDY)
+(hypre_F90_Obj *grid_l,
+ hypre_F90_Int *num_levels,
+ HYPRE_Int      (*rfactors)[3],
+ HYPRE_Int      (***BdryRanks_ptr),
+ HYPRE_Int      (**BdryRanksCnt_ptr),
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_SStructMaxwellPhysBdy( 
-           hypre_F90_PassObjRef (HYPRE_SStructGrid, grid_l),
-           hypre_F90_PassInt (num_levels),
-           rfactors[3],
-           BdryRanks_ptr,
-           BdryRanksCnt_ptr ));
+           ( HYPRE_SStructMaxwellPhysBdy(
+                hypre_F90_PassObjRef (HYPRE_SStructGrid, grid_l),
+                hypre_F90_PassInt (num_levels),
+                rfactors[3],
+                BdryRanks_ptr,
+                BdryRanksCnt_ptr ));
 }
 
 /*--------------------------------------------------------------------------
@@ -360,18 +360,18 @@ hypre_F90_IFACE(hypre_sstructmaxwellphysbdy, HYPRE_SSTRUCTMAXWELLPHYSBDY)
  *--------------------------------------------------------------------------*/
 
 void
-hypre_F90_IFACE(hypre_sstructmaxwelleliminatero, HYPRE_SSTRUCTMAXWELLELIMINATERO) 
-   (hypre_F90_Obj *A, 
-    hypre_F90_Int *nrows,
-    hypre_F90_IntArray *rows,
-    hypre_F90_Int *ierr)
+hypre_F90_IFACE(hypre_sstructmaxwelleliminatero, HYPRE_SSTRUCTMAXWELLELIMINATERO)
+(hypre_F90_Obj *A,
+ hypre_F90_Int *nrows,
+ hypre_F90_IntArray *rows,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_SStructMaxwellEliminateRowsCols(
-           hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
-           hypre_F90_PassInt (nrows),
-           hypre_F90_PassIntArray (rows) ));
-}      
+           ( HYPRE_SStructMaxwellEliminateRowsCols(
+                hypre_F90_PassObj (HYPRE_ParCSRMatrix, A),
+                hypre_F90_PassInt (nrows),
+                hypre_F90_PassIntArray (rows) ));
+}
 
 
 /*--------------------------------------------------------------------------
@@ -379,18 +379,18 @@ hypre_F90_IFACE(hypre_sstructmaxwelleliminatero, HYPRE_SSTRUCTMAXWELLELIMINATERO
  *--------------------------------------------------------------------------*/
 
 void
-hypre_F90_IFACE(hypre_sstructmaxwellzerovector, HYPRE_SSTRUCTMAXWELLZEROVECTOR) 
-   (hypre_F90_Obj *b, 
-    hypre_F90_IntArray *rows,
-    hypre_F90_Int *nrows,
-    hypre_F90_Int *ierr)
+hypre_F90_IFACE(hypre_sstructmaxwellzerovector, HYPRE_SSTRUCTMAXWELLZEROVECTOR)
+(hypre_F90_Obj *b,
+ hypre_F90_IntArray *rows,
+ hypre_F90_Int *nrows,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_SStructMaxwellZeroVector(
-           hypre_F90_PassObj (HYPRE_ParVector, b),
-           hypre_F90_PassIntArray (rows),
-           hypre_F90_PassInt (nrows) ));
-}      
+           ( HYPRE_SStructMaxwellZeroVector(
+                hypre_F90_PassObj (HYPRE_ParVector, b),
+                hypre_F90_PassIntArray (rows),
+                hypre_F90_PassInt (nrows) ));
+}
 
 #ifdef __cplusplus
 }
diff --git a/external/hypre/src/sstruct_ls/F90_HYPRE_sstruct_pcg.c b/external/hypre/src/sstruct_ls/F90_HYPRE_sstruct_pcg.c
index b822096b..4fbc2105 100644
--- a/external/hypre/src/sstruct_ls/F90_HYPRE_sstruct_pcg.c
+++ b/external/hypre/src/sstruct_ls/F90_HYPRE_sstruct_pcg.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -24,14 +24,14 @@ extern "C" {
 
 void
 hypre_F90_IFACE(hypre_sstructpcgcreate, HYPRE_SSTRUCTPCGCREATE)
-   (hypre_F90_Comm *comm,
-    hypre_F90_Obj *solver,
-    hypre_F90_Int *ierr)
+(hypre_F90_Comm *comm,
+ hypre_F90_Obj *solver,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructPCGCreate(
-          hypre_F90_PassComm (comm),
-          hypre_F90_PassObjRef (HYPRE_SStructSolver, solver) ) );
+           (HYPRE_SStructPCGCreate(
+               hypre_F90_PassComm (comm),
+               hypre_F90_PassObjRef (HYPRE_SStructSolver, solver) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -40,12 +40,12 @@ hypre_F90_IFACE(hypre_sstructpcgcreate, HYPRE_SSTRUCTPCGCREATE)
 
 void
 hypre_F90_IFACE(hypre_sstructpcgdestroy, HYPRE_SSTRUCTPCGDESTROY)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructPCGDestroy(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver) ));
+           (HYPRE_SStructPCGDestroy(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -54,18 +54,18 @@ hypre_F90_IFACE(hypre_sstructpcgdestroy, HYPRE_SSTRUCTPCGDESTROY)
 
 void
 hypre_F90_IFACE(hypre_sstructpcgsetup, HYPRE_SSTRUCTPCGSETUP)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Obj *A,
-    hypre_F90_Obj *b,
-    hypre_F90_Obj *x,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Obj *A,
+ hypre_F90_Obj *b,
+ hypre_F90_Obj *x,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructPCGSetup(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassObj (HYPRE_SStructMatrix, A),
-          hypre_F90_PassObj (HYPRE_SStructVector, b),
-          hypre_F90_PassObj (HYPRE_SStructVector, x) ) );
+           (HYPRE_SStructPCGSetup(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassObj (HYPRE_SStructMatrix, A),
+               hypre_F90_PassObj (HYPRE_SStructVector, b),
+               hypre_F90_PassObj (HYPRE_SStructVector, x) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -74,18 +74,18 @@ hypre_F90_IFACE(hypre_sstructpcgsetup, HYPRE_SSTRUCTPCGSETUP)
 
 void
 hypre_F90_IFACE(hypre_sstructpcgsolve, HYPRE_SSTRUCTPCGSOLVE)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Obj *A,
-    hypre_F90_Obj *b,
-    hypre_F90_Obj *x,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Obj *A,
+ hypre_F90_Obj *b,
+ hypre_F90_Obj *x,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructPCGSolve(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassObj (HYPRE_SStructMatrix, A),
-          hypre_F90_PassObj (HYPRE_SStructVector, b),
-          hypre_F90_PassObj (HYPRE_SStructVector, x) ) );
+           (HYPRE_SStructPCGSolve(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassObj (HYPRE_SStructMatrix, A),
+               hypre_F90_PassObj (HYPRE_SStructVector, b),
+               hypre_F90_PassObj (HYPRE_SStructVector, x) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -94,14 +94,14 @@ hypre_F90_IFACE(hypre_sstructpcgsolve, HYPRE_SSTRUCTPCGSOLVE)
 
 void
 hypre_F90_IFACE(hypre_sstructpcgsettol, HYPRE_SSTRUCTPCGSETTOL)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Real *tol,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Real *tol,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructPCGSetTol(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassReal (tol) ) );
+           (HYPRE_SStructPCGSetTol(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassReal (tol) ) );
 }
 /*--------------------------------------------------------------------------
  *  HYPRE_SStructPCGSetAbsoluteTol
@@ -109,14 +109,14 @@ hypre_F90_IFACE(hypre_sstructpcgsettol, HYPRE_SSTRUCTPCGSETTOL)
 
 void
 hypre_F90_IFACE(hypre_sstructpcgsetabsolutetol, HYPRE_SSTRUCTPCGSETABSOLUTETOL)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Real *tol,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Real *tol,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructPCGSetAbsoluteTol(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassReal (tol) ) );
+           (HYPRE_SStructPCGSetAbsoluteTol(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassReal (tol) ) );
 }
 /*--------------------------------------------------------------------------
  *  HYPRE_SStructPCGSetMaxIter
@@ -124,14 +124,14 @@ hypre_F90_IFACE(hypre_sstructpcgsetabsolutetol, HYPRE_SSTRUCTPCGSETABSOLUTETOL)
 
 void
 hypre_F90_IFACE(hypre_sstructpcgsetmaxiter, HYPRE_SSTRUCTPCGSETMAXITER)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *max_iter,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *max_iter,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructPCGSetMaxIter(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassInt (max_iter) ) );
+           (HYPRE_SStructPCGSetMaxIter(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassInt (max_iter) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -140,14 +140,14 @@ hypre_F90_IFACE(hypre_sstructpcgsetmaxiter, HYPRE_SSTRUCTPCGSETMAXITER)
 
 void
 hypre_F90_IFACE(hypre_sstructpcgsettwonorm, HYPRE_SSTRUCTPCGSETTWONORM)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *two_norm,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *two_norm,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructPCGSetTwoNorm(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassInt (two_norm) ) );
+           (HYPRE_SStructPCGSetTwoNorm(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassInt (two_norm) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -156,14 +156,14 @@ hypre_F90_IFACE(hypre_sstructpcgsettwonorm, HYPRE_SSTRUCTPCGSETTWONORM)
 
 void
 hypre_F90_IFACE(hypre_sstructpcgsetrelchange, HYPRE_SSTRUCTPCGSETRELCHANGE)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *rel_change,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *rel_change,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructPCGSetRelChange(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassInt (rel_change) ) );
+           (HYPRE_SStructPCGSetRelChange(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassInt (rel_change) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -172,10 +172,10 @@ hypre_F90_IFACE(hypre_sstructpcgsetrelchange, HYPRE_SSTRUCTPCGSETRELCHANGE)
 
 void
 hypre_F90_IFACE(hypre_sstructpcgsetprecond, HYPRE_SSTRUCTPCGSETPRECOND)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *precond_id,
-    hypre_F90_Obj *precond_solver,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *precond_id,
+ hypre_F90_Obj *precond_solver,
+ hypre_F90_Int *ierr)
 /*------------------------------------------
  *    precond_id flags mean:
  *    2 - setup a split-solver preconditioner
@@ -185,36 +185,36 @@ hypre_F90_IFACE(hypre_sstructpcgsetprecond, HYPRE_SSTRUCTPCGSETPRECOND)
  *----------------------------------------*/
 
 {
-   if(*precond_id == 2)
+   if (*precond_id == 2)
    {
       *ierr = (hypre_F90_Int)
-         (HYPRE_SStructPCGSetPrecond(
-             hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-             HYPRE_SStructSplitSolve,
-             HYPRE_SStructSplitSetup,
-             hypre_F90_PassObjRef (HYPRE_SStructSolver, precond_solver)));
+              (HYPRE_SStructPCGSetPrecond(
+                  hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+                  HYPRE_SStructSplitSolve,
+                  HYPRE_SStructSplitSetup,
+                  hypre_F90_PassObjRef (HYPRE_SStructSolver, precond_solver)));
    }
 
-   else if(*precond_id == 3)
+   else if (*precond_id == 3)
    {
       *ierr = (hypre_F90_Int)
-         (HYPRE_SStructPCGSetPrecond(
-             hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-             HYPRE_SStructSysPFMGSolve,
-             HYPRE_SStructSysPFMGSetup,
-             hypre_F90_PassObjRef (HYPRE_SStructSolver, precond_solver)));
+              (HYPRE_SStructPCGSetPrecond(
+                  hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+                  HYPRE_SStructSysPFMGSolve,
+                  HYPRE_SStructSysPFMGSetup,
+                  hypre_F90_PassObjRef (HYPRE_SStructSolver, precond_solver)));
    }
 
-   else if(*precond_id == 8)
+   else if (*precond_id == 8)
    {
       *ierr = (hypre_F90_Int)
-         (HYPRE_SStructPCGSetPrecond(
-             hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-             HYPRE_SStructDiagScale,
-             HYPRE_SStructDiagScaleSetup,
-             hypre_F90_PassObjRef (HYPRE_SStructSolver, precond_solver)));
+              (HYPRE_SStructPCGSetPrecond(
+                  hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+                  HYPRE_SStructDiagScale,
+                  HYPRE_SStructDiagScaleSetup,
+                  hypre_F90_PassObjRef (HYPRE_SStructSolver, precond_solver)));
    }
-   else if(*precond_id == 9)
+   else if (*precond_id == 9)
    {
       *ierr = 0;
    }
@@ -232,14 +232,14 @@ hypre_F90_IFACE(hypre_sstructpcgsetprecond, HYPRE_SSTRUCTPCGSETPRECOND)
 
 void
 hypre_F90_IFACE(hypre_sstructpcgsetlogging, HYPRE_SSTRUCTPCGSETLOGGING)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *logging,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *logging,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructPCGSetLogging(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassInt (logging) ) );
+           (HYPRE_SStructPCGSetLogging(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassInt (logging) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -248,14 +248,14 @@ hypre_F90_IFACE(hypre_sstructpcgsetlogging, HYPRE_SSTRUCTPCGSETLOGGING)
 
 void
 hypre_F90_IFACE(hypre_sstructpcgsetprintlevel, HYPRE_SSTRUCTPCGSETPRINTLEVEL)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *level,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *level,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructPCGSetPrintLevel(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassInt (level) ) );
+           (HYPRE_SStructPCGSetPrintLevel(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassInt (level) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -264,14 +264,14 @@ hypre_F90_IFACE(hypre_sstructpcgsetprintlevel, HYPRE_SSTRUCTPCGSETPRINTLEVEL)
 
 void
 hypre_F90_IFACE(hypre_sstructpcggetnumiteration, HYPRE_SSTRUCTPCGGETNUMITERATION)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *num_iterations,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *num_iterations,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructPCGGetNumIterations(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassIntRef (num_iterations) ) );
+           (HYPRE_SStructPCGGetNumIterations(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassIntRef (num_iterations) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -280,14 +280,14 @@ hypre_F90_IFACE(hypre_sstructpcggetnumiteration, HYPRE_SSTRUCTPCGGETNUMITERATION
 
 void
 hypre_F90_IFACE(hypre_sstructpcggetfinalrelativ, HYPRE_SSTRUCTPCGGETFINALRELATIV)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Real *norm,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Real *norm,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructPCGGetFinalRelativeResidualNorm(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassRealRef (norm) ) );
+           (HYPRE_SStructPCGGetFinalRelativeResidualNorm(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassRealRef (norm) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -296,14 +296,14 @@ hypre_F90_IFACE(hypre_sstructpcggetfinalrelativ, HYPRE_SSTRUCTPCGGETFINALRELATIV
 
 void
 hypre_F90_IFACE(hypre_sstructpcggetresidual, HYPRE_SSTRUCTPCGGETRESIDUAL)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Obj *residual,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Obj *residual,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructPCGGetResidual(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          (void **)              *residual ) );
+           (HYPRE_SStructPCGGetResidual(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               (void **)              *residual ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -312,18 +312,18 @@ hypre_F90_IFACE(hypre_sstructpcggetresidual, HYPRE_SSTRUCTPCGGETRESIDUAL)
 
 void
 hypre_F90_IFACE(hypre_sstructdiagscalesetup, HYPRE_SSTRUCTDIAGSCALESETUP)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Obj *A,
-    hypre_F90_Obj *y,
-    hypre_F90_Obj *x,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Obj *A,
+ hypre_F90_Obj *y,
+ hypre_F90_Obj *x,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructDiagScaleSetup(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassObj (HYPRE_SStructMatrix, A),
-          hypre_F90_PassObj (HYPRE_SStructVector, y),
-          hypre_F90_PassObj (HYPRE_SStructVector, x)    ) );
+           (HYPRE_SStructDiagScaleSetup(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassObj (HYPRE_SStructMatrix, A),
+               hypre_F90_PassObj (HYPRE_SStructVector, y),
+               hypre_F90_PassObj (HYPRE_SStructVector, x)    ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -332,18 +332,18 @@ hypre_F90_IFACE(hypre_sstructdiagscalesetup, HYPRE_SSTRUCTDIAGSCALESETUP)
 
 void
 hypre_F90_IFACE(hypre_sstructdiagscale, HYPRE_SSTRUCTDIAGSCALE)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Obj *A,
-    hypre_F90_Obj *y,
-    hypre_F90_Obj *x,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Obj *A,
+ hypre_F90_Obj *y,
+ hypre_F90_Obj *x,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructDiagScale(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassObj (HYPRE_SStructMatrix, A),
-          hypre_F90_PassObj (HYPRE_SStructVector, y),
-          hypre_F90_PassObj (HYPRE_SStructVector, x)    ) );
+           (HYPRE_SStructDiagScale(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassObj (HYPRE_SStructMatrix, A),
+               hypre_F90_PassObj (HYPRE_SStructVector, y),
+               hypre_F90_PassObj (HYPRE_SStructVector, x)    ) );
 }
 
 #ifdef __cplusplus
diff --git a/external/hypre/src/sstruct_ls/F90_HYPRE_sstruct_split.c b/external/hypre/src/sstruct_ls/F90_HYPRE_sstruct_split.c
index 440c700f..8523964e 100644
--- a/external/hypre/src/sstruct_ls/F90_HYPRE_sstruct_split.c
+++ b/external/hypre/src/sstruct_ls/F90_HYPRE_sstruct_split.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -16,21 +16,21 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-	
+
 /*--------------------------------------------------------------------------
  *  HYPRE_SStructSplitCreate
  *--------------------------------------------------------------------------*/
 
 void
 hypre_F90_IFACE(hypre_sstructsplitcreate, HYPRE_SSTRUCTSPLITCREATE)
-   (hypre_F90_Comm *comm,
-    hypre_F90_Obj *solver_ptr,
-    hypre_F90_Int *ierr)
+(hypre_F90_Comm *comm,
+ hypre_F90_Obj *solver_ptr,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructSplitCreate(
-          hypre_F90_PassComm (comm),
-          hypre_F90_PassObjRef (HYPRE_SStructSolver, solver_ptr) ) );
+           (HYPRE_SStructSplitCreate(
+               hypre_F90_PassComm (comm),
+               hypre_F90_PassObjRef (HYPRE_SStructSolver, solver_ptr) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -39,12 +39,12 @@ hypre_F90_IFACE(hypre_sstructsplitcreate, HYPRE_SSTRUCTSPLITCREATE)
 
 void
 hypre_F90_IFACE(hypre_sstructsplitdestroy, HYPRE_SSTRUCTSPLITDESTROY)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructSplitDestroy(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver) ) );
+           (HYPRE_SStructSplitDestroy(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -53,18 +53,18 @@ hypre_F90_IFACE(hypre_sstructsplitdestroy, HYPRE_SSTRUCTSPLITDESTROY)
 
 void
 hypre_F90_IFACE(hypre_sstructsplitsetup, HYPRE_SSTRUCTSPLITSETUP)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Obj *A,
-    hypre_F90_Obj *b,
-    hypre_F90_Obj *x,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Obj *A,
+ hypre_F90_Obj *b,
+ hypre_F90_Obj *x,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructSplitSetup(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassObj (HYPRE_SStructMatrix, A),
-          hypre_F90_PassObj (HYPRE_SStructVector, b),
-          hypre_F90_PassObj (HYPRE_SStructVector, x) ) );
+           (HYPRE_SStructSplitSetup(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassObj (HYPRE_SStructMatrix, A),
+               hypre_F90_PassObj (HYPRE_SStructVector, b),
+               hypre_F90_PassObj (HYPRE_SStructVector, x) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -73,18 +73,18 @@ hypre_F90_IFACE(hypre_sstructsplitsetup, HYPRE_SSTRUCTSPLITSETUP)
 
 void
 hypre_F90_IFACE(hypre_sstructsplitsolve, HYPRE_SSTRUCTSPLITSOLVE)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Obj *A,
-    hypre_F90_Obj *b,
-    hypre_F90_Obj *x,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Obj *A,
+ hypre_F90_Obj *b,
+ hypre_F90_Obj *x,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructSplitSolve(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassObj (HYPRE_SStructMatrix, A),
-          hypre_F90_PassObj (HYPRE_SStructVector, b),
-          hypre_F90_PassObj (HYPRE_SStructVector, x) ) );
+           (HYPRE_SStructSplitSolve(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassObj (HYPRE_SStructMatrix, A),
+               hypre_F90_PassObj (HYPRE_SStructVector, b),
+               hypre_F90_PassObj (HYPRE_SStructVector, x) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -93,14 +93,14 @@ hypre_F90_IFACE(hypre_sstructsplitsolve, HYPRE_SSTRUCTSPLITSOLVE)
 
 void
 hypre_F90_IFACE(hypre_sstructsplitsettol, HYPRE_SSTRUCTSPLITSETTOL)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Real *tol,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Real *tol,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructSplitSetTol(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassReal (tol) ) );
+           (HYPRE_SStructSplitSetTol(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassReal (tol) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -109,14 +109,14 @@ hypre_F90_IFACE(hypre_sstructsplitsettol, HYPRE_SSTRUCTSPLITSETTOL)
 
 void
 hypre_F90_IFACE(hypre_sstructsplitsetmaxiter, HYPRE_SSTRUCTSPLITSETMAXITER)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *max_iter,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *max_iter,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructSplitSetMaxIter(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassInt (max_iter) ) );
+           (HYPRE_SStructSplitSetMaxIter(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassInt (max_iter) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -125,12 +125,12 @@ hypre_F90_IFACE(hypre_sstructsplitsetmaxiter, HYPRE_SSTRUCTSPLITSETMAXITER)
 
 void
 hypre_F90_IFACE(hypre_sstructsplitsetzeroguess, HYPRE_SSTRUCTSPLITSETZEROGUESS)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructSplitSetZeroGuess(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver) ) );
+           (HYPRE_SStructSplitSetZeroGuess(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -139,12 +139,12 @@ hypre_F90_IFACE(hypre_sstructsplitsetzeroguess, HYPRE_SSTRUCTSPLITSETZEROGUESS)
 
 void
 hypre_F90_IFACE(hypre_sstructsplitsetnonzerogue, HYPRE_SSTRUCTSPLITSETNONZEROGUE)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructSplitSetNonZeroGuess(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver) ));
+           (HYPRE_SStructSplitSetNonZeroGuess(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -153,14 +153,14 @@ hypre_F90_IFACE(hypre_sstructsplitsetnonzerogue, HYPRE_SSTRUCTSPLITSETNONZEROGUE
 
 void
 hypre_F90_IFACE(hypre_sstructsplitsetstructsolv, HYPRE_SSTRUCTSPLITSETSTRUCTSOLV)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *ssolver,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *ssolver,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructSplitSetStructSolver(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassInt (ssolver) ) );
+           (HYPRE_SStructSplitSetStructSolver(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassInt (ssolver) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -169,14 +169,14 @@ hypre_F90_IFACE(hypre_sstructsplitsetstructsolv, HYPRE_SSTRUCTSPLITSETSTRUCTSOLV
 
 void
 hypre_F90_IFACE(hypre_sstructsplitgetnumiterati, HYPRE_SSTRUCTSPLITGETNUMITERATI)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *num_iterations,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *num_iterations,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructSplitGetNumIterations(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassIntRef (num_iterations) ) );
+           (HYPRE_SStructSplitGetNumIterations(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassIntRef (num_iterations) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -185,14 +185,14 @@ hypre_F90_IFACE(hypre_sstructsplitgetnumiterati, HYPRE_SSTRUCTSPLITGETNUMITERATI
 
 void
 hypre_F90_IFACE(hypre_sstructsplitgetfinalrelat, HYPRE_SSTRUCTSPLITGETFINALRELAT)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Real *norm,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Real *norm,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructSplitGetFinalRelativeResidualNorm(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassRealRef (norm) ) );
+           (HYPRE_SStructSplitGetFinalRelativeResidualNorm(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassRealRef (norm) ) );
 }
 
 #ifdef __cplusplus
diff --git a/external/hypre/src/sstruct_ls/F90_HYPRE_sstruct_sys_pfmg.c b/external/hypre/src/sstruct_ls/F90_HYPRE_sstruct_sys_pfmg.c
index 4dd42757..af16fc85 100644
--- a/external/hypre/src/sstruct_ls/F90_HYPRE_sstruct_sys_pfmg.c
+++ b/external/hypre/src/sstruct_ls/F90_HYPRE_sstruct_sys_pfmg.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -24,14 +24,14 @@ extern "C" {
 
 void
 hypre_F90_IFACE(hypre_sstructsyspfmgcreate, HYPRE_SSTRUCTSYSPFMGCREATE)
-   (hypre_F90_Comm *comm,
-    hypre_F90_Obj *solver,
-    hypre_F90_Int *ierr)
+(hypre_F90_Comm *comm,
+ hypre_F90_Obj *solver,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructSysPFMGCreate(
-          hypre_F90_PassComm (comm),
-          hypre_F90_PassObjRef (HYPRE_SStructSolver, solver) ));
+           (HYPRE_SStructSysPFMGCreate(
+               hypre_F90_PassComm (comm),
+               hypre_F90_PassObjRef (HYPRE_SStructSolver, solver) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -40,12 +40,12 @@ hypre_F90_IFACE(hypre_sstructsyspfmgcreate, HYPRE_SSTRUCTSYSPFMGCREATE)
 
 void
 hypre_F90_IFACE(hypre_sstructsyspfmgdestroy, HYPRE_SSTRUCTSYSPFMGDESTROY)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructSysPFMGDestroy(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver) ));
+           (HYPRE_SStructSysPFMGDestroy(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -54,18 +54,18 @@ hypre_F90_IFACE(hypre_sstructsyspfmgdestroy, HYPRE_SSTRUCTSYSPFMGDESTROY)
 
 void
 hypre_F90_IFACE(hypre_sstructsyspfmgsetup, HYPRE_SSTRUCTSYSPFMGSETUP)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Obj *A,
-    hypre_F90_Obj *b,
-    hypre_F90_Obj *x,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Obj *A,
+ hypre_F90_Obj *b,
+ hypre_F90_Obj *x,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructSysPFMGSetup(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassObj (HYPRE_SStructMatrix, A),
-          hypre_F90_PassObj (HYPRE_SStructVector, b),
-          hypre_F90_PassObj (HYPRE_SStructVector, x)    ) );
+           (HYPRE_SStructSysPFMGSetup(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassObj (HYPRE_SStructMatrix, A),
+               hypre_F90_PassObj (HYPRE_SStructVector, b),
+               hypre_F90_PassObj (HYPRE_SStructVector, x)    ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -74,18 +74,18 @@ hypre_F90_IFACE(hypre_sstructsyspfmgsetup, HYPRE_SSTRUCTSYSPFMGSETUP)
 
 void
 hypre_F90_IFACE(hypre_sstructsyspfmgsolve, HYPRE_SSTRUCTSYSPFMGSOLVE)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Obj *A,
-    hypre_F90_Obj *b,
-    hypre_F90_Obj *x,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Obj *A,
+ hypre_F90_Obj *b,
+ hypre_F90_Obj *x,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructSysPFMGSolve(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassObj (HYPRE_SStructMatrix, A),
-          hypre_F90_PassObj (HYPRE_SStructVector, b),
-          hypre_F90_PassObj (HYPRE_SStructVector, x)    ) );
+           (HYPRE_SStructSysPFMGSolve(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassObj (HYPRE_SStructMatrix, A),
+               hypre_F90_PassObj (HYPRE_SStructVector, b),
+               hypre_F90_PassObj (HYPRE_SStructVector, x)    ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -94,14 +94,14 @@ hypre_F90_IFACE(hypre_sstructsyspfmgsolve, HYPRE_SSTRUCTSYSPFMGSOLVE)
 
 void
 hypre_F90_IFACE(hypre_sstructsyspfmgsettol, HYPRE_SSTRUCTSYSPFMGSETTOL)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Real *tol,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Real *tol,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructSysPFMGSetTol(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassReal (tol)    ) );
+           (HYPRE_SStructSysPFMGSetTol(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassReal (tol)    ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -110,14 +110,14 @@ hypre_F90_IFACE(hypre_sstructsyspfmgsettol, HYPRE_SSTRUCTSYSPFMGSETTOL)
 
 void
 hypre_F90_IFACE(hypre_sstructsyspfmgsetmaxiter, HYPRE_SSTRUCTSYSPFMGSETMAXITER)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *max_iter,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *max_iter,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructSysPFMGSetMaxIter(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassInt (max_iter)  ) );
+           (HYPRE_SStructSysPFMGSetMaxIter(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassInt (max_iter)  ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -126,14 +126,14 @@ hypre_F90_IFACE(hypre_sstructsyspfmgsetmaxiter, HYPRE_SSTRUCTSYSPFMGSETMAXITER)
 
 void
 hypre_F90_IFACE(hypre_sstructsyspfmgsetrelchang, HYPRE_SSTRUCTSYSPFMGSETRELCHANG)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *rel_change,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *rel_change,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructSysPFMGSetRelChange(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassInt (rel_change)  ));
+           (HYPRE_SStructSysPFMGSetRelChange(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassInt (rel_change)  ));
 }
 
 /*--------------------------------------------------------------------------
@@ -142,12 +142,12 @@ hypre_F90_IFACE(hypre_sstructsyspfmgsetrelchang, HYPRE_SSTRUCTSYSPFMGSETRELCHANG
 
 void
 hypre_F90_IFACE(hypre_sstructsyspfmgsetzerogues, HYPRE_SSTRUCTSYSPFMGSETZEROGUES)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructSysPFMGSetZeroGuess(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver) ));
+           (HYPRE_SStructSysPFMGSetZeroGuess(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -156,12 +156,12 @@ hypre_F90_IFACE(hypre_sstructsyspfmgsetzerogues, HYPRE_SSTRUCTSYSPFMGSETZEROGUES
 
 void
 hypre_F90_IFACE(hypre_sstructsyspfmgsetnonzerog, HYPRE_SSTRUCTSYSPFMGSETNONZEROG)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructSysPFMGSetNonZeroGuess(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver) ));
+           (HYPRE_SStructSysPFMGSetNonZeroGuess(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -170,30 +170,30 @@ hypre_F90_IFACE(hypre_sstructsyspfmgsetnonzerog, HYPRE_SSTRUCTSYSPFMGSETNONZEROG
 
 void
 hypre_F90_IFACE(hypre_sstructsyspfmgsetrelaxtyp, HYPRE_SSTRUCTSYSPFMGSETRELAXTYP)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *relax_type,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *relax_type,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructSysPFMGSetRelaxType(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassInt (relax_type) ));
+           (HYPRE_SStructSysPFMGSetRelaxType(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassInt (relax_type) ));
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_SStructSysPFMGSetJacobiWeight
  *--------------------------------------------------------------------------*/
-                                                                                                                                                               
+
 void
 hypre_F90_IFACE(hypre_sstructsyspfmgsetjacobiweigh, HYPRE_SSTRUCTSYSPFMGSETJACOBIWEIGH)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Real *weight,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Real *weight,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructSysPFMGSetJacobiWeight(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassReal (weight) ) );
+           (HYPRE_SStructSysPFMGSetJacobiWeight(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassReal (weight) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -202,14 +202,14 @@ hypre_F90_IFACE(hypre_sstructsyspfmgsetjacobiweigh, HYPRE_SSTRUCTSYSPFMGSETJACOB
 
 void
 hypre_F90_IFACE(hypre_sstructsyspfmgsetnumprere, HYPRE_SSTRUCTSYSPFMGSETNUMPRERE)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *num_pre_relax,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *num_pre_relax,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructSysPFMGSetNumPreRelax(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassInt (num_pre_relax) ));
+           (HYPRE_SStructSysPFMGSetNumPreRelax(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassInt (num_pre_relax) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -218,14 +218,14 @@ hypre_F90_IFACE(hypre_sstructsyspfmgsetnumprere, HYPRE_SSTRUCTSYSPFMGSETNUMPRERE
 
 void
 hypre_F90_IFACE(hypre_sstructsyspfmgsetnumpostr, HYPRE_SSTRUCTSYSPFMGSETNUMPOSTR)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *num_post_relax,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *num_post_relax,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructSysPFMGSetNumPostRelax(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassInt (num_post_relax) ));
+           (HYPRE_SStructSysPFMGSetNumPostRelax(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassInt (num_post_relax) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -234,14 +234,14 @@ hypre_F90_IFACE(hypre_sstructsyspfmgsetnumpostr, HYPRE_SSTRUCTSYSPFMGSETNUMPOSTR
 
 void
 hypre_F90_IFACE(hypre_sstructsyspfmgsetskiprela, HYPRE_SSTRUCTSYSPFMGSETSKIPRELA)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *skip_relax,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *skip_relax,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructSysPFMGSetSkipRelax(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassInt (skip_relax) ));
+           (HYPRE_SStructSysPFMGSetSkipRelax(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassInt (skip_relax) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -250,14 +250,14 @@ hypre_F90_IFACE(hypre_sstructsyspfmgsetskiprela, HYPRE_SSTRUCTSYSPFMGSETSKIPRELA
 
 void
 hypre_F90_IFACE(hypre_sstructsyspfmgsetdxyz, HYPRE_SSTRUCTSYSPFMGSETDXYZ)
-   (hypre_F90_Obj *solver,
-    hypre_F90_RealArray *dxyz,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_RealArray *dxyz,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructSysPFMGSetDxyz(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassRealArray (dxyz)   ));
+           (HYPRE_SStructSysPFMGSetDxyz(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassRealArray (dxyz)   ));
 }
 
 /*--------------------------------------------------------------------------
@@ -266,14 +266,14 @@ hypre_F90_IFACE(hypre_sstructsyspfmgsetdxyz, HYPRE_SSTRUCTSYSPFMGSETDXYZ)
 
 void
 hypre_F90_IFACE(hypre_sstructsyspfmgsetlogging, HYPRE_SSTRUCTSYSPFMGSETLOGGING)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *logging,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *logging,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructSysPFMGSetLogging(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassInt (logging) ));
+           (HYPRE_SStructSysPFMGSetLogging(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassInt (logging) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -282,14 +282,14 @@ hypre_F90_IFACE(hypre_sstructsyspfmgsetlogging, HYPRE_SSTRUCTSYSPFMGSETLOGGING)
 
 void
 hypre_F90_IFACE(hypre_sstructsyspfmgsetprintlev, HYPRE_SSTRUCTSYSPFMGSETPRINTLEV)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *print_level,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *print_level,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructSysPFMGSetPrintLevel(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassInt (print_level) ));
+           (HYPRE_SStructSysPFMGSetPrintLevel(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassInt (print_level) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -298,14 +298,14 @@ hypre_F90_IFACE(hypre_sstructsyspfmgsetprintlev, HYPRE_SSTRUCTSYSPFMGSETPRINTLEV
 
 void
 hypre_F90_IFACE(hypre_sstructsyspfmggetnumitera, HYPRE_SSTRUCTSYSPFMGGETNUMITERA)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *num_iterations,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *num_iterations,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructSysPFMGGetNumIterations(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassIntRef (num_iterations) ));
+           (HYPRE_SStructSysPFMGGetNumIterations(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassIntRef (num_iterations) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -314,14 +314,14 @@ hypre_F90_IFACE(hypre_sstructsyspfmggetnumitera, HYPRE_SSTRUCTSYSPFMGGETNUMITERA
 
 void
 hypre_F90_IFACE(hypre_sstructsyspfmggetfinalrel, HYPRE_SSTRUCTSYSPFMGGETFINALREL)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Real *norm,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Real *norm,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructSysPFMGGetFinalRelativeResidualNorm(
-          hypre_F90_PassObj (HYPRE_SStructSolver, solver),
-          hypre_F90_PassRealRef (norm)   ));
+           (HYPRE_SStructSysPFMGGetFinalRelativeResidualNorm(
+               hypre_F90_PassObj (HYPRE_SStructSolver, solver),
+               hypre_F90_PassRealRef (norm)   ));
 }
 
 #ifdef __cplusplus
diff --git a/external/hypre/src/sstruct_ls/HYPRE_sstruct_InterFAC.c b/external/hypre/src/sstruct_ls/HYPRE_sstruct_InterFAC.c
index 7e75d473..3fbd3ae9 100644
--- a/external/hypre/src/sstruct_ls/HYPRE_sstruct_InterFAC.c
+++ b/external/hypre/src/sstruct_ls/HYPRE_sstruct_InterFAC.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -32,7 +32,7 @@ HYPRE_SStructFACCreate( MPI_Comm comm, HYPRE_SStructSolver *solver )
 HYPRE_Int
 HYPRE_SStructFACDestroy2( HYPRE_SStructSolver solver )
 {
-   return( hypre_FACDestroy2( (void *) solver ) );
+   return ( hypre_FACDestroy2( (void *) solver ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -43,7 +43,7 @@ HYPRE_SStructFACAMR_RAP( HYPRE_SStructMatrix  A,
                          HYPRE_Int          (*rfactors)[HYPRE_MAXDIM],
                          HYPRE_SStructMatrix *fac_A )
 {
-   return( hypre_AMR_RAP(A, rfactors, fac_A) );
+   return ( hypre_AMR_RAP(A, rfactors, fac_A) );
 }
 
 /*--------------------------------------------------------------------------
@@ -55,10 +55,10 @@ HYPRE_SStructFACSetup2( HYPRE_SStructSolver  solver,
                         HYPRE_SStructVector  b,
                         HYPRE_SStructVector  x )
 {
-   return( hypre_FacSetup2( (void *) solver,
-                           (hypre_SStructMatrix *)  A,
-                           (hypre_SStructVector *)  b,
-                           (hypre_SStructVector *)  x ) );
+   return ( hypre_FacSetup2( (void *) solver,
+                             (hypre_SStructMatrix *)  A,
+                             (hypre_SStructVector *)  b,
+                             (hypre_SStructVector *)  x ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -70,10 +70,10 @@ HYPRE_SStructFACSolve3(HYPRE_SStructSolver solver,
                        HYPRE_SStructVector b,
                        HYPRE_SStructVector x)
 {
-   return( hypre_FACSolve3((void *) solver,
-                           (hypre_SStructMatrix *)  A,
-                           (hypre_SStructVector *)  b,
-                           (hypre_SStructVector *)  x ) );
+   return ( hypre_FACSolve3((void *) solver,
+                            (hypre_SStructMatrix *)  A,
+                            (hypre_SStructVector *)  b,
+                            (hypre_SStructVector *)  x ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -84,7 +84,7 @@ HYPRE_Int
 HYPRE_SStructFACSetTol( HYPRE_SStructSolver solver,
                         HYPRE_Real         tol    )
 {
-   return( hypre_FACSetTol( (void *) solver, tol ) );
+   return ( hypre_FACSetTol( (void *) solver, tol ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -95,7 +95,7 @@ HYPRE_SStructFACSetPLevels( HYPRE_SStructSolver  solver,
                             HYPRE_Int            nparts,
                             HYPRE_Int           *plevels)
 {
-   return( hypre_FACSetPLevels( (void *) solver, nparts, plevels ) );
+   return ( hypre_FACSetPLevels( (void *) solver, nparts, plevels ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -107,10 +107,10 @@ HYPRE_SStructFACZeroCFSten( HYPRE_SStructMatrix  A,
                             HYPRE_Int            part,
                             HYPRE_Int            rfactors[HYPRE_MAXDIM] )
 {
-    hypre_SStructPMatrix   *Af= hypre_SStructMatrixPMatrix(A, part);
-    hypre_SStructPMatrix   *Ac= hypre_SStructMatrixPMatrix(A, part-1);
+   hypre_SStructPMatrix   *Af = hypre_SStructMatrixPMatrix(A, part);
+   hypre_SStructPMatrix   *Ac = hypre_SStructMatrixPMatrix(A, part - 1);
 
-    return( hypre_FacZeroCFSten(Af, Ac, (hypre_SStructGrid *)grid,
+   return ( hypre_FacZeroCFSten(Af, Ac, (hypre_SStructGrid *)grid,
                                 part, rfactors) );
 }
 
@@ -122,9 +122,9 @@ HYPRE_SStructFACZeroFCSten( HYPRE_SStructMatrix  A,
                             HYPRE_SStructGrid    grid,
                             HYPRE_Int            part )
 {
-    hypre_SStructPMatrix   *Af= hypre_SStructMatrixPMatrix(A, part);
+   hypre_SStructPMatrix   *Af = hypre_SStructMatrixPMatrix(A, part);
 
-    return( hypre_FacZeroFCSten(Af, (hypre_SStructGrid *)grid,
+   return ( hypre_FacZeroFCSten(Af, (hypre_SStructGrid *)grid,
                                 part) );
 }
 
@@ -136,9 +136,9 @@ HYPRE_SStructFACZeroAMRMatrixData( HYPRE_SStructMatrix  A,
                                    HYPRE_Int            part_crse,
                                    HYPRE_Int            rfactors[HYPRE_MAXDIM] )
 {
-    return( hypre_ZeroAMRMatrixData(A, part_crse, rfactors) );
+   return ( hypre_ZeroAMRMatrixData(A, part_crse, rfactors) );
 }
-                                                                                                                                                             
+
 /*--------------------------------------------------------------------------
  * HYPRE_SStructFACZeroAMRVectorData
  *--------------------------------------------------------------------------*/
@@ -147,7 +147,7 @@ HYPRE_SStructFACZeroAMRVectorData( HYPRE_SStructVector  b,
                                    HYPRE_Int           *plevels,
                                    HYPRE_Int          (*rfactors)[HYPRE_MAXDIM] )
 {
-    return( hypre_ZeroAMRVectorData(b, plevels, rfactors) );
+   return ( hypre_ZeroAMRVectorData(b, plevels, rfactors) );
 }
 
 
@@ -159,9 +159,9 @@ HYPRE_SStructFACSetPRefinements( HYPRE_SStructSolver  solver,
                                  HYPRE_Int            nparts,
                                  HYPRE_Int          (*rfactors)[HYPRE_MAXDIM] )
 {
-   return( hypre_FACSetPRefinements( (void *)         solver,
-                                                      nparts,
-                                                      rfactors ) );
+   return ( hypre_FACSetPRefinements( (void *)         solver,
+                                      nparts,
+                                      rfactors ) );
 }
 /*--------------------------------------------------------------------------
  * HYPRE_SStructFACSetMaxLevels
@@ -171,7 +171,7 @@ HYPRE_Int
 HYPRE_SStructFACSetMaxLevels( HYPRE_SStructSolver solver,
                               HYPRE_Int           max_levels  )
 {
-   return( hypre_FACSetMaxLevels( (void *) solver, max_levels ) );
+   return ( hypre_FACSetMaxLevels( (void *) solver, max_levels ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -182,7 +182,7 @@ HYPRE_Int
 HYPRE_SStructFACSetMaxIter( HYPRE_SStructSolver solver,
                             HYPRE_Int          max_iter  )
 {
-   return( hypre_FACSetMaxIter( (void *) solver, max_iter ) );
+   return ( hypre_FACSetMaxIter( (void *) solver, max_iter ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -193,7 +193,7 @@ HYPRE_Int
 HYPRE_SStructFACSetRelChange( HYPRE_SStructSolver solver,
                               HYPRE_Int          rel_change  )
 {
-   return( hypre_FACSetRelChange( (void *) solver, rel_change ) );
+   return ( hypre_FACSetRelChange( (void *) solver, rel_change ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -203,7 +203,7 @@ HYPRE_SStructFACSetRelChange( HYPRE_SStructSolver solver,
 HYPRE_Int
 HYPRE_SStructFACSetZeroGuess( HYPRE_SStructSolver solver )
 {
-   return( hypre_FACSetZeroGuess( (void *) solver, 1 ) );
+   return ( hypre_FACSetZeroGuess( (void *) solver, 1 ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -213,7 +213,7 @@ HYPRE_SStructFACSetZeroGuess( HYPRE_SStructSolver solver )
 HYPRE_Int
 HYPRE_SStructFACSetNonZeroGuess( HYPRE_SStructSolver solver )
 {
-   return( hypre_FACSetZeroGuess( (void *) solver, 0 ) );
+   return ( hypre_FACSetZeroGuess( (void *) solver, 0 ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -224,7 +224,7 @@ HYPRE_Int
 HYPRE_SStructFACSetRelaxType( HYPRE_SStructSolver solver,
                               HYPRE_Int          relax_type )
 {
-   return( hypre_FACSetRelaxType( (void *) solver, relax_type) );
+   return ( hypre_FACSetRelaxType( (void *) solver, relax_type) );
 }
 
 /*--------------------------------------------------------------------------
@@ -235,7 +235,7 @@ HYPRE_Int
 HYPRE_SStructFACSetJacobiWeight( HYPRE_SStructSolver solver,
                                  HYPRE_Real          weight)
 {
-   return( hypre_FACSetJacobiWeight( (void *) solver, weight) );
+   return ( hypre_FACSetJacobiWeight( (void *) solver, weight) );
 }
 
 /*--------------------------------------------------------------------------
@@ -245,7 +245,7 @@ HYPRE_Int
 HYPRE_SStructFACSetNumPreRelax( HYPRE_SStructSolver solver,
                                 HYPRE_Int          num_pre_relax )
 {
-   return( hypre_FACSetNumPreSmooth( (void *) solver, num_pre_relax) );
+   return ( hypre_FACSetNumPreSmooth( (void *) solver, num_pre_relax) );
 }
 
 /*--------------------------------------------------------------------------
@@ -256,7 +256,7 @@ HYPRE_Int
 HYPRE_SStructFACSetNumPostRelax( HYPRE_SStructSolver solver,
                                  HYPRE_Int          num_post_relax )
 {
-   return( hypre_FACSetNumPostSmooth( (void *) solver, num_post_relax) );
+   return ( hypre_FACSetNumPostSmooth( (void *) solver, num_post_relax) );
 }
 
 /*--------------------------------------------------------------------------
@@ -267,7 +267,7 @@ HYPRE_Int
 HYPRE_SStructFACSetCoarseSolverType( HYPRE_SStructSolver solver,
                                      HYPRE_Int           csolver_type)
 {
-   return( hypre_FACSetCoarseSolverType( (void *) solver, csolver_type) );
+   return ( hypre_FACSetCoarseSolverType( (void *) solver, csolver_type) );
 }
 
 
@@ -279,7 +279,7 @@ HYPRE_Int
 HYPRE_SStructFACSetLogging( HYPRE_SStructSolver solver,
                             HYPRE_Int          logging )
 {
-   return( hypre_FACSetLogging( (void *) solver, logging) );
+   return ( hypre_FACSetLogging( (void *) solver, logging) );
 }
 
 /*--------------------------------------------------------------------------
@@ -290,7 +290,7 @@ HYPRE_Int
 HYPRE_SStructFACGetNumIterations( HYPRE_SStructSolver  solver,
                                   HYPRE_Int          *num_iterations )
 {
-   return( hypre_FACGetNumIterations( (void *) solver, num_iterations ) );
+   return ( hypre_FACGetNumIterations( (void *) solver, num_iterations ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -301,7 +301,7 @@ HYPRE_Int
 HYPRE_SStructFACGetFinalRelativeResidualNorm( HYPRE_SStructSolver  solver,
                                               HYPRE_Real         *norm   )
 {
-   return( hypre_FACGetFinalRelativeResidualNorm( (void *) solver, norm ) );
+   return ( hypre_FACGetFinalRelativeResidualNorm( (void *) solver, norm ) );
 }
 
 
diff --git a/external/hypre/src/sstruct_ls/HYPRE_sstruct_bicgstab.c b/external/hypre/src/sstruct_ls/HYPRE_sstruct_bicgstab.c
index c8d8dd8c..29867996 100644
--- a/external/hypre/src/sstruct_ls/HYPRE_sstruct_bicgstab.c
+++ b/external/hypre/src/sstruct_ls/HYPRE_sstruct_bicgstab.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -14,15 +14,17 @@ HYPRE_Int
 HYPRE_SStructBiCGSTABCreate( MPI_Comm             comm,
                              HYPRE_SStructSolver *solver )
 {
+   HYPRE_UNUSED_VAR(comm);
+
    hypre_BiCGSTABFunctions * bicgstab_functions =
       hypre_BiCGSTABFunctionsCreate(
          hypre_SStructKrylovCreateVector,
          hypre_SStructKrylovDestroyVector, hypre_SStructKrylovMatvecCreate,
          hypre_SStructKrylovMatvec, hypre_SStructKrylovMatvecDestroy,
          hypre_SStructKrylovInnerProd, hypre_SStructKrylovCopyVector,
-	 hypre_SStructKrylovClearVector,
+         hypre_SStructKrylovClearVector,
          hypre_SStructKrylovScaleVector, hypre_SStructKrylovAxpy,
-	 hypre_SStructKrylovCommInfo,
+         hypre_SStructKrylovCommInfo,
          hypre_SStructKrylovIdentitySetup, hypre_SStructKrylovIdentity );
 
    *solver = ( (HYPRE_SStructSolver) hypre_BiCGSTABCreate( bicgstab_functions ) );
@@ -33,40 +35,40 @@ HYPRE_SStructBiCGSTABCreate( MPI_Comm             comm,
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_SStructBiCGSTABDestroy( HYPRE_SStructSolver solver )
 {
-   return( hypre_BiCGSTABDestroy( (void *) solver ) );
+   return ( hypre_BiCGSTABDestroy( (void *) solver ) );
 }
 
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_SStructBiCGSTABSetup( HYPRE_SStructSolver solver,
                             HYPRE_SStructMatrix A,
                             HYPRE_SStructVector b,
                             HYPRE_SStructVector x )
 {
-   return( HYPRE_BiCGSTABSetup( (HYPRE_Solver) solver,
-                                (HYPRE_Matrix) A,
-                                (HYPRE_Vector) b,
-                                (HYPRE_Vector) x ) );
+   return ( HYPRE_BiCGSTABSetup( (HYPRE_Solver) solver,
+                                 (HYPRE_Matrix) A,
+                                 (HYPRE_Vector) b,
+                                 (HYPRE_Vector) x ) );
 }
 
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_SStructBiCGSTABSolve( HYPRE_SStructSolver solver,
                             HYPRE_SStructMatrix A,
                             HYPRE_SStructVector b,
                             HYPRE_SStructVector x )
 {
-   return( HYPRE_BiCGSTABSolve( (HYPRE_Solver) solver,
-                                (HYPRE_Matrix) A,
-                                (HYPRE_Vector) b,
-                                (HYPRE_Vector) x ) );
+   return ( HYPRE_BiCGSTABSolve( (HYPRE_Solver) solver,
+                                 (HYPRE_Matrix) A,
+                                 (HYPRE_Vector) b,
+                                 (HYPRE_Vector) x ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -76,7 +78,7 @@ HYPRE_Int
 HYPRE_SStructBiCGSTABSetTol( HYPRE_SStructSolver solver,
                              HYPRE_Real          tol )
 {
-   return( HYPRE_BiCGSTABSetTol( (HYPRE_Solver) solver, tol ) );
+   return ( HYPRE_BiCGSTABSetTol( (HYPRE_Solver) solver, tol ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -86,7 +88,7 @@ HYPRE_Int
 HYPRE_SStructBiCGSTABSetAbsoluteTol( HYPRE_SStructSolver solver,
                                      HYPRE_Real          tol )
 {
-   return( HYPRE_BiCGSTABSetAbsoluteTol( (HYPRE_Solver) solver, tol ) );
+   return ( HYPRE_BiCGSTABSetAbsoluteTol( (HYPRE_Solver) solver, tol ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -96,7 +98,7 @@ HYPRE_Int
 HYPRE_SStructBiCGSTABSetMinIter( HYPRE_SStructSolver solver,
                                  HYPRE_Int           min_iter )
 {
-   return( HYPRE_BiCGSTABSetMinIter( (HYPRE_Solver) solver, min_iter ) );
+   return ( HYPRE_BiCGSTABSetMinIter( (HYPRE_Solver) solver, min_iter ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -106,7 +108,7 @@ HYPRE_Int
 HYPRE_SStructBiCGSTABSetMaxIter( HYPRE_SStructSolver solver,
                                  HYPRE_Int           max_iter )
 {
-   return( HYPRE_BiCGSTABSetMaxIter( (HYPRE_Solver) solver, max_iter ) );
+   return ( HYPRE_BiCGSTABSetMaxIter( (HYPRE_Solver) solver, max_iter ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -116,7 +118,7 @@ HYPRE_Int
 HYPRE_SStructBiCGSTABSetStopCrit( HYPRE_SStructSolver solver,
                                   HYPRE_Int           stop_crit )
 {
-   return( HYPRE_BiCGSTABSetStopCrit( (HYPRE_Solver) solver, stop_crit ) );
+   return ( HYPRE_BiCGSTABSetStopCrit( (HYPRE_Solver) solver, stop_crit ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -128,10 +130,10 @@ HYPRE_SStructBiCGSTABSetPrecond( HYPRE_SStructSolver          solver,
                                  HYPRE_PtrToSStructSolverFcn  precond_setup,
                                  void *          precond_data )
 {
-   return( HYPRE_BiCGSTABSetPrecond( (HYPRE_Solver) solver,
-                                     (HYPRE_PtrToSolverFcn) precond,
-                                     (HYPRE_PtrToSolverFcn) precond_setup,
-                                     (HYPRE_Solver) precond_data ) );
+   return ( HYPRE_BiCGSTABSetPrecond( (HYPRE_Solver) solver,
+                                      (HYPRE_PtrToSolverFcn) precond,
+                                      (HYPRE_PtrToSolverFcn) precond_setup,
+                                      (HYPRE_Solver) precond_data ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -141,7 +143,7 @@ HYPRE_Int
 HYPRE_SStructBiCGSTABSetLogging( HYPRE_SStructSolver solver,
                                  HYPRE_Int           logging )
 {
-   return( HYPRE_BiCGSTABSetLogging( (HYPRE_Solver) solver, logging ) );
+   return ( HYPRE_BiCGSTABSetLogging( (HYPRE_Solver) solver, logging ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -151,7 +153,7 @@ HYPRE_Int
 HYPRE_SStructBiCGSTABSetPrintLevel( HYPRE_SStructSolver solver,
                                     HYPRE_Int           print_level )
 {
-   return( HYPRE_BiCGSTABSetPrintLevel( (HYPRE_Solver) solver, print_level ) );
+   return ( HYPRE_BiCGSTABSetPrintLevel( (HYPRE_Solver) solver, print_level ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -161,8 +163,8 @@ HYPRE_Int
 HYPRE_SStructBiCGSTABGetNumIterations( HYPRE_SStructSolver  solver,
                                        HYPRE_Int           *num_iterations )
 {
-   return( HYPRE_BiCGSTABGetNumIterations( (HYPRE_Solver) solver,
-                                           num_iterations ) );
+   return ( HYPRE_BiCGSTABGetNumIterations( (HYPRE_Solver) solver,
+                                            num_iterations ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -172,8 +174,8 @@ HYPRE_Int
 HYPRE_SStructBiCGSTABGetFinalRelativeResidualNorm( HYPRE_SStructSolver  solver,
                                                    HYPRE_Real          *norm )
 {
-   return( HYPRE_BiCGSTABGetFinalRelativeResidualNorm( (HYPRE_Solver) solver,
-                                                       norm ) );
+   return ( HYPRE_BiCGSTABGetFinalRelativeResidualNorm( (HYPRE_Solver) solver,
+                                                        norm ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -182,7 +184,7 @@ HYPRE_SStructBiCGSTABGetFinalRelativeResidualNorm( HYPRE_SStructSolver  solver,
 
 HYPRE_Int
 HYPRE_SStructBiCGSTABGetResidual( HYPRE_SStructSolver  solver,
-                                  void 			**residual)
+                                  void          **residual)
 {
-   return( HYPRE_BiCGSTABGetResidual( (HYPRE_Solver) solver, residual ) );
+   return ( HYPRE_BiCGSTABGetResidual( (HYPRE_Solver) solver, residual ) );
 }
diff --git a/external/hypre/src/sstruct_ls/HYPRE_sstruct_flexgmres.c b/external/hypre/src/sstruct_ls/HYPRE_sstruct_flexgmres.c
index 3c6bc098..e5571096 100644
--- a/external/hypre/src/sstruct_ls/HYPRE_sstruct_flexgmres.c
+++ b/external/hypre/src/sstruct_ls/HYPRE_sstruct_flexgmres.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -14,6 +14,8 @@ HYPRE_Int
 HYPRE_SStructFlexGMRESCreate( MPI_Comm             comm,
                               HYPRE_SStructSolver *solver )
 {
+   HYPRE_UNUSED_VAR(comm);
+
    hypre_FlexGMRESFunctions * fgmres_functions =
       hypre_FlexGMRESFunctionsCreate(
          hypre_SStructKrylovCAlloc, hypre_SStructKrylovFree, hypre_SStructKrylovCommInfo,
@@ -34,40 +36,40 @@ HYPRE_SStructFlexGMRESCreate( MPI_Comm             comm,
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_SStructFlexGMRESDestroy( HYPRE_SStructSolver solver )
 {
-   return( hypre_FlexGMRESDestroy( (void *) solver ) );
+   return ( hypre_FlexGMRESDestroy( (void *) solver ) );
 }
 
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_SStructFlexGMRESSetup( HYPRE_SStructSolver solver,
                              HYPRE_SStructMatrix A,
                              HYPRE_SStructVector b,
                              HYPRE_SStructVector x )
 {
-   return( HYPRE_FlexGMRESSetup( (HYPRE_Solver) solver,
-                                 (HYPRE_Matrix) A,
-                                 (HYPRE_Vector) b,
-                                 (HYPRE_Vector) x ) );
+   return ( HYPRE_FlexGMRESSetup( (HYPRE_Solver) solver,
+                                  (HYPRE_Matrix) A,
+                                  (HYPRE_Vector) b,
+                                  (HYPRE_Vector) x ) );
 }
 
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_SStructFlexGMRESSolve( HYPRE_SStructSolver solver,
                              HYPRE_SStructMatrix A,
                              HYPRE_SStructVector b,
                              HYPRE_SStructVector x )
 {
-   return( HYPRE_FlexGMRESSolve( (HYPRE_Solver) solver,
-                                 (HYPRE_Matrix) A,
-                                 (HYPRE_Vector) b,
-                                 (HYPRE_Vector) x ) );
+   return ( HYPRE_FlexGMRESSolve( (HYPRE_Solver) solver,
+                                  (HYPRE_Matrix) A,
+                                  (HYPRE_Vector) b,
+                                  (HYPRE_Vector) x ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -77,7 +79,7 @@ HYPRE_Int
 HYPRE_SStructFlexGMRESSetKDim( HYPRE_SStructSolver solver,
                                HYPRE_Int           k_dim )
 {
-   return( HYPRE_FlexGMRESSetKDim( (HYPRE_Solver) solver, k_dim ) );
+   return ( HYPRE_FlexGMRESSetKDim( (HYPRE_Solver) solver, k_dim ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -87,7 +89,7 @@ HYPRE_Int
 HYPRE_SStructFlexGMRESSetTol( HYPRE_SStructSolver solver,
                               HYPRE_Real          tol )
 {
-   return( HYPRE_FlexGMRESSetTol( (HYPRE_Solver) solver, tol ) );
+   return ( HYPRE_FlexGMRESSetTol( (HYPRE_Solver) solver, tol ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -97,7 +99,7 @@ HYPRE_Int
 HYPRE_SStructFlexGMRESSetAbsoluteTol( HYPRE_SStructSolver solver,
                                       HYPRE_Real          tol )
 {
-   return( HYPRE_FlexGMRESSetAbsoluteTol( (HYPRE_Solver) solver, tol ) );
+   return ( HYPRE_FlexGMRESSetAbsoluteTol( (HYPRE_Solver) solver, tol ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -107,7 +109,7 @@ HYPRE_Int
 HYPRE_SStructFlexGMRESSetMinIter( HYPRE_SStructSolver solver,
                                   HYPRE_Int           min_iter )
 {
-   return( HYPRE_FlexGMRESSetMinIter( (HYPRE_Solver) solver, min_iter ) );
+   return ( HYPRE_FlexGMRESSetMinIter( (HYPRE_Solver) solver, min_iter ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -117,7 +119,7 @@ HYPRE_Int
 HYPRE_SStructFlexGMRESSetMaxIter( HYPRE_SStructSolver solver,
                                   HYPRE_Int           max_iter )
 {
-   return( HYPRE_FlexGMRESSetMaxIter( (HYPRE_Solver) solver, max_iter ) );
+   return ( HYPRE_FlexGMRESSetMaxIter( (HYPRE_Solver) solver, max_iter ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -129,10 +131,10 @@ HYPRE_SStructFlexGMRESSetPrecond( HYPRE_SStructSolver          solver,
                                   HYPRE_PtrToSStructSolverFcn  precond_setup,
                                   void *          precond_data )
 {
-   return( HYPRE_FlexGMRESSetPrecond( (HYPRE_Solver) solver,
-                                      (HYPRE_PtrToSolverFcn) precond,
-                                      (HYPRE_PtrToSolverFcn) precond_setup,
-                                      (HYPRE_Solver) precond_data ) );
+   return ( HYPRE_FlexGMRESSetPrecond( (HYPRE_Solver) solver,
+                                       (HYPRE_PtrToSolverFcn) precond,
+                                       (HYPRE_PtrToSolverFcn) precond_setup,
+                                       (HYPRE_Solver) precond_data ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -142,7 +144,7 @@ HYPRE_Int
 HYPRE_SStructFlexGMRESSetLogging( HYPRE_SStructSolver solver,
                                   HYPRE_Int           logging )
 {
-   return( HYPRE_FlexGMRESSetLogging( (HYPRE_Solver) solver, logging ) );
+   return ( HYPRE_FlexGMRESSetLogging( (HYPRE_Solver) solver, logging ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -152,7 +154,7 @@ HYPRE_Int
 HYPRE_SStructFlexGMRESSetPrintLevel( HYPRE_SStructSolver solver,
                                      HYPRE_Int           level )
 {
-   return( HYPRE_FlexGMRESSetPrintLevel( (HYPRE_Solver) solver, level ) );
+   return ( HYPRE_FlexGMRESSetPrintLevel( (HYPRE_Solver) solver, level ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -162,8 +164,8 @@ HYPRE_Int
 HYPRE_SStructFlexGMRESGetNumIterations( HYPRE_SStructSolver  solver,
                                         HYPRE_Int           *num_iterations )
 {
-   return( HYPRE_FlexGMRESGetNumIterations( (HYPRE_Solver) solver,
-                                            num_iterations ) );
+   return ( HYPRE_FlexGMRESGetNumIterations( (HYPRE_Solver) solver,
+                                             num_iterations ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -173,8 +175,8 @@ HYPRE_Int
 HYPRE_SStructFlexGMRESGetFinalRelativeResidualNorm( HYPRE_SStructSolver  solver,
                                                     HYPRE_Real          *norm )
 {
-   return( HYPRE_FlexGMRESGetFinalRelativeResidualNorm( (HYPRE_Solver) solver,
-                                                        norm ) );
+   return ( HYPRE_FlexGMRESGetFinalRelativeResidualNorm( (HYPRE_Solver) solver,
+                                                         norm ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -184,12 +186,12 @@ HYPRE_Int
 HYPRE_SStructFlexGMRESGetResidual( HYPRE_SStructSolver  solver,
                                    void              **residual )
 {
-   return( HYPRE_FlexGMRESGetResidual( (HYPRE_Solver) solver, residual ) );
+   return ( HYPRE_FlexGMRESGetResidual( (HYPRE_Solver) solver, residual ) );
 }
 
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
- 
+
 
 HYPRE_Int HYPRE_SStructFlexGMRESSetModifyPC( HYPRE_SStructSolver  solver,
                                              HYPRE_PtrToModifyPCFcn modify_pc)
@@ -197,6 +199,5 @@ HYPRE_Int HYPRE_SStructFlexGMRESSetModifyPC( HYPRE_SStructSolver  solver,
 {
    return ( HYPRE_FlexGMRESSetModifyPC( (HYPRE_Solver) solver,
                                         (HYPRE_PtrToModifyPCFcn) modify_pc));
-   
-}
 
+}
diff --git a/external/hypre/src/sstruct_ls/HYPRE_sstruct_gmres.c b/external/hypre/src/sstruct_ls/HYPRE_sstruct_gmres.c
index 5b64f253..22783652 100644
--- a/external/hypre/src/sstruct_ls/HYPRE_sstruct_gmres.c
+++ b/external/hypre/src/sstruct_ls/HYPRE_sstruct_gmres.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -14,6 +14,8 @@ HYPRE_Int
 HYPRE_SStructGMRESCreate( MPI_Comm             comm,
                           HYPRE_SStructSolver *solver )
 {
+   HYPRE_UNUSED_VAR(comm);
+
    hypre_GMRESFunctions * gmres_functions =
       hypre_GMRESFunctionsCreate(
          hypre_SStructKrylovCAlloc, hypre_SStructKrylovFree, hypre_SStructKrylovCommInfo,
@@ -34,40 +36,40 @@ HYPRE_SStructGMRESCreate( MPI_Comm             comm,
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_SStructGMRESDestroy( HYPRE_SStructSolver solver )
 {
-   return( hypre_GMRESDestroy( (void *) solver ) );
+   return ( hypre_GMRESDestroy( (void *) solver ) );
 }
 
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_SStructGMRESSetup( HYPRE_SStructSolver solver,
                          HYPRE_SStructMatrix A,
                          HYPRE_SStructVector b,
                          HYPRE_SStructVector x )
 {
-   return( HYPRE_GMRESSetup( (HYPRE_Solver) solver,
-                             (HYPRE_Matrix) A,
-                             (HYPRE_Vector) b,
-                             (HYPRE_Vector) x ) );
+   return ( HYPRE_GMRESSetup( (HYPRE_Solver) solver,
+                              (HYPRE_Matrix) A,
+                              (HYPRE_Vector) b,
+                              (HYPRE_Vector) x ) );
 }
 
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_SStructGMRESSolve( HYPRE_SStructSolver solver,
                          HYPRE_SStructMatrix A,
                          HYPRE_SStructVector b,
                          HYPRE_SStructVector x )
 {
-   return( HYPRE_GMRESSolve( (HYPRE_Solver) solver,
-                             (HYPRE_Matrix) A,
-                             (HYPRE_Vector) b,
-                             (HYPRE_Vector) x ) );
+   return ( HYPRE_GMRESSolve( (HYPRE_Solver) solver,
+                              (HYPRE_Matrix) A,
+                              (HYPRE_Vector) b,
+                              (HYPRE_Vector) x ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -77,7 +79,7 @@ HYPRE_Int
 HYPRE_SStructGMRESSetKDim( HYPRE_SStructSolver solver,
                            HYPRE_Int           k_dim )
 {
-   return( HYPRE_GMRESSetKDim( (HYPRE_Solver) solver, k_dim ) );
+   return ( HYPRE_GMRESSetKDim( (HYPRE_Solver) solver, k_dim ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -87,16 +89,16 @@ HYPRE_Int
 HYPRE_SStructGMRESSetTol( HYPRE_SStructSolver solver,
                           HYPRE_Real          tol )
 {
-   return( HYPRE_GMRESSetTol( (HYPRE_Solver) solver, tol ) );
+   return ( HYPRE_GMRESSetTol( (HYPRE_Solver) solver, tol ) );
 }
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
 HYPRE_SStructGMRESSetAbsoluteTol( HYPRE_SStructSolver solver,
-                          HYPRE_Real          atol )
+                                  HYPRE_Real          atol )
 {
-   return( HYPRE_GMRESSetAbsoluteTol( (HYPRE_Solver) solver, atol ) );
+   return ( HYPRE_GMRESSetAbsoluteTol( (HYPRE_Solver) solver, atol ) );
 }
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
@@ -105,7 +107,7 @@ HYPRE_Int
 HYPRE_SStructGMRESSetMinIter( HYPRE_SStructSolver solver,
                               HYPRE_Int           min_iter )
 {
-   return( HYPRE_GMRESSetMinIter( (HYPRE_Solver) solver, min_iter ) );
+   return ( HYPRE_GMRESSetMinIter( (HYPRE_Solver) solver, min_iter ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -115,7 +117,7 @@ HYPRE_Int
 HYPRE_SStructGMRESSetMaxIter( HYPRE_SStructSolver solver,
                               HYPRE_Int           max_iter )
 {
-   return( HYPRE_GMRESSetMaxIter( (HYPRE_Solver) solver, max_iter ) );
+   return ( HYPRE_GMRESSetMaxIter( (HYPRE_Solver) solver, max_iter ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -125,7 +127,7 @@ HYPRE_Int
 HYPRE_SStructGMRESSetStopCrit( HYPRE_SStructSolver solver,
                                HYPRE_Int           stop_crit )
 {
-   return( HYPRE_GMRESSetStopCrit( (HYPRE_Solver) solver, stop_crit ) );
+   return ( HYPRE_GMRESSetStopCrit( (HYPRE_Solver) solver, stop_crit ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -137,10 +139,10 @@ HYPRE_SStructGMRESSetPrecond( HYPRE_SStructSolver          solver,
                               HYPRE_PtrToSStructSolverFcn  precond_setup,
                               void *          precond_data )
 {
-   return( HYPRE_GMRESSetPrecond( (HYPRE_Solver) solver,
-                                  (HYPRE_PtrToSolverFcn) precond,
-                                  (HYPRE_PtrToSolverFcn) precond_setup,
-                                  (HYPRE_Solver) precond_data ) );
+   return ( HYPRE_GMRESSetPrecond( (HYPRE_Solver) solver,
+                                   (HYPRE_PtrToSolverFcn) precond,
+                                   (HYPRE_PtrToSolverFcn) precond_setup,
+                                   (HYPRE_Solver) precond_data ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -150,7 +152,7 @@ HYPRE_Int
 HYPRE_SStructGMRESSetLogging( HYPRE_SStructSolver solver,
                               HYPRE_Int           logging )
 {
-   return( HYPRE_GMRESSetLogging( (HYPRE_Solver) solver, logging ) );
+   return ( HYPRE_GMRESSetLogging( (HYPRE_Solver) solver, logging ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -158,9 +160,9 @@ HYPRE_SStructGMRESSetLogging( HYPRE_SStructSolver solver,
 
 HYPRE_Int
 HYPRE_SStructGMRESSetPrintLevel( HYPRE_SStructSolver solver,
-                              HYPRE_Int           level )
+                                 HYPRE_Int           level )
 {
-   return( HYPRE_GMRESSetPrintLevel( (HYPRE_Solver) solver, level ) );
+   return ( HYPRE_GMRESSetPrintLevel( (HYPRE_Solver) solver, level ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -170,7 +172,7 @@ HYPRE_Int
 HYPRE_SStructGMRESGetNumIterations( HYPRE_SStructSolver  solver,
                                     HYPRE_Int           *num_iterations )
 {
-   return( HYPRE_GMRESGetNumIterations( (HYPRE_Solver) solver, num_iterations ) );
+   return ( HYPRE_GMRESGetNumIterations( (HYPRE_Solver) solver, num_iterations ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -180,7 +182,7 @@ HYPRE_Int
 HYPRE_SStructGMRESGetFinalRelativeResidualNorm( HYPRE_SStructSolver  solver,
                                                 HYPRE_Real          *norm )
 {
-   return( HYPRE_GMRESGetFinalRelativeResidualNorm( (HYPRE_Solver) solver, norm ) );
+   return ( HYPRE_GMRESGetFinalRelativeResidualNorm( (HYPRE_Solver) solver, norm ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -188,7 +190,7 @@ HYPRE_SStructGMRESGetFinalRelativeResidualNorm( HYPRE_SStructSolver  solver,
 
 HYPRE_Int
 HYPRE_SStructGMRESGetResidual( HYPRE_SStructSolver  solver,
-                                void              **residual )
+                               void              **residual )
 {
-   return( HYPRE_GMRESGetResidual( (HYPRE_Solver) solver, residual ) );
+   return ( HYPRE_GMRESGetResidual( (HYPRE_Solver) solver, residual ) );
 }
diff --git a/external/hypre/src/sstruct_ls/HYPRE_sstruct_int.c b/external/hypre/src/sstruct_ls/HYPRE_sstruct_int.c
index b770d73a..a91fdee1 100644
--- a/external/hypre/src/sstruct_ls/HYPRE_sstruct_int.c
+++ b/external/hypre/src/sstruct_ls/HYPRE_sstruct_int.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -11,7 +11,7 @@
 #include "temp_multivector.h"
 
 
-HYPRE_Int 
+HYPRE_Int
 hypre_SStructPVectorSetRandomValues( hypre_SStructPVector *pvector, HYPRE_Int seed )
 {
    HYPRE_Int ierr = 0;
@@ -31,7 +31,7 @@ hypre_SStructPVectorSetRandomValues( hypre_SStructPVector *pvector, HYPRE_Int se
    return ierr;
 }
 
-HYPRE_Int 
+HYPRE_Int
 hypre_SStructVectorSetRandomValues( hypre_SStructVector *vector, HYPRE_Int seed )
 {
    HYPRE_Int ierr = 0;
@@ -52,54 +52,55 @@ hypre_SStructVectorSetRandomValues( hypre_SStructVector *vector, HYPRE_Int seed
 }
 
 HYPRE_Int
-hypre_SStructSetRandomValues( void* v, HYPRE_Int seed ) {
+hypre_SStructSetRandomValues( void* v, HYPRE_Int seed )
+{
 
-  return hypre_SStructVectorSetRandomValues( (hypre_SStructVector*)v, seed );
+   return hypre_SStructVectorSetRandomValues( (hypre_SStructVector*)v, seed );
 }
 
 HYPRE_Int
 HYPRE_SStructSetupInterpreter( mv_InterfaceInterpreter *i )
 {
-  i->CreateVector = hypre_SStructKrylovCreateVector;
-  i->DestroyVector = hypre_SStructKrylovDestroyVector; 
-  i->InnerProd = hypre_SStructKrylovInnerProd; 
-  i->CopyVector = hypre_SStructKrylovCopyVector;
-  i->ClearVector = hypre_SStructKrylovClearVector;
-  i->SetRandomValues = hypre_SStructSetRandomValues;
-  i->ScaleVector = hypre_SStructKrylovScaleVector;
-  i->Axpy = hypre_SStructKrylovAxpy;
-
-  i->CreateMultiVector = mv_TempMultiVectorCreateFromSampleVector;
-  i->CopyCreateMultiVector = mv_TempMultiVectorCreateCopy;
-  i->DestroyMultiVector = mv_TempMultiVectorDestroy;
-
-  i->Width = mv_TempMultiVectorWidth;
-  i->Height = mv_TempMultiVectorHeight;
-  i->SetMask = mv_TempMultiVectorSetMask;
-  i->CopyMultiVector = mv_TempMultiVectorCopy;
-  i->ClearMultiVector = mv_TempMultiVectorClear;
-  i->SetRandomVectors = mv_TempMultiVectorSetRandom;
-  i->MultiInnerProd = mv_TempMultiVectorByMultiVector;
-  i->MultiInnerProdDiag = mv_TempMultiVectorByMultiVectorDiag;
-  i->MultiVecMat = mv_TempMultiVectorByMatrix;
-  i->MultiVecMatDiag = mv_TempMultiVectorByDiagonal;
-  i->MultiAxpy = mv_TempMultiVectorAxpy;
-  i->MultiXapy = mv_TempMultiVectorXapy;
-  i->Eval = mv_TempMultiVectorEval;
-
-  return 0;
+   i->CreateVector = hypre_SStructKrylovCreateVector;
+   i->DestroyVector = hypre_SStructKrylovDestroyVector;
+   i->InnerProd = hypre_SStructKrylovInnerProd;
+   i->CopyVector = hypre_SStructKrylovCopyVector;
+   i->ClearVector = hypre_SStructKrylovClearVector;
+   i->SetRandomValues = hypre_SStructSetRandomValues;
+   i->ScaleVector = hypre_SStructKrylovScaleVector;
+   i->Axpy = hypre_SStructKrylovAxpy;
+
+   i->CreateMultiVector = mv_TempMultiVectorCreateFromSampleVector;
+   i->CopyCreateMultiVector = mv_TempMultiVectorCreateCopy;
+   i->DestroyMultiVector = mv_TempMultiVectorDestroy;
+
+   i->Width = mv_TempMultiVectorWidth;
+   i->Height = mv_TempMultiVectorHeight;
+   i->SetMask = mv_TempMultiVectorSetMask;
+   i->CopyMultiVector = mv_TempMultiVectorCopy;
+   i->ClearMultiVector = mv_TempMultiVectorClear;
+   i->SetRandomVectors = mv_TempMultiVectorSetRandom;
+   i->MultiInnerProd = mv_TempMultiVectorByMultiVector;
+   i->MultiInnerProdDiag = mv_TempMultiVectorByMultiVectorDiag;
+   i->MultiVecMat = mv_TempMultiVectorByMatrix;
+   i->MultiVecMatDiag = mv_TempMultiVectorByDiagonal;
+   i->MultiAxpy = mv_TempMultiVectorAxpy;
+   i->MultiXapy = mv_TempMultiVectorXapy;
+   i->Eval = mv_TempMultiVectorEval;
+
+   return 0;
 }
 
 HYPRE_Int
 HYPRE_SStructSetupMatvec(HYPRE_MatvecFunctions * mv)
 {
-  mv->MatvecCreate = hypre_SStructKrylovMatvecCreate;
-  mv->Matvec = hypre_SStructKrylovMatvec; 
-  mv->MatvecDestroy = hypre_SStructKrylovMatvecDestroy;
+   mv->MatvecCreate = hypre_SStructKrylovMatvecCreate;
+   mv->Matvec = hypre_SStructKrylovMatvec;
+   mv->MatvecDestroy = hypre_SStructKrylovMatvecDestroy;
 
-  mv->MatMultiVecCreate = NULL;
-  mv->MatMultiVec = NULL;
-  mv->MatMultiVecDestroy = NULL;
+   mv->MatMultiVecCreate = NULL;
+   mv->MatMultiVec = NULL;
+   mv->MatMultiVecDestroy = NULL;
 
-  return 0;
+   return 0;
 }
diff --git a/external/hypre/src/sstruct_ls/HYPRE_sstruct_lgmres.c b/external/hypre/src/sstruct_ls/HYPRE_sstruct_lgmres.c
index 19f1fbd2..beda3843 100644
--- a/external/hypre/src/sstruct_ls/HYPRE_sstruct_lgmres.c
+++ b/external/hypre/src/sstruct_ls/HYPRE_sstruct_lgmres.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -12,8 +12,10 @@
 
 HYPRE_Int
 HYPRE_SStructLGMRESCreate( MPI_Comm             comm,
-                          HYPRE_SStructSolver *solver )
+                           HYPRE_SStructSolver *solver )
 {
+   HYPRE_UNUSED_VAR(comm);
+
    hypre_LGMRESFunctions * lgmres_functions =
       hypre_LGMRESFunctionsCreate(
          hypre_SStructKrylovCAlloc, hypre_SStructKrylovFree, hypre_SStructKrylovCommInfo,
@@ -34,40 +36,40 @@ HYPRE_SStructLGMRESCreate( MPI_Comm             comm,
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_SStructLGMRESDestroy( HYPRE_SStructSolver solver )
 {
-   return( hypre_LGMRESDestroy( (void *) solver ) );
+   return ( hypre_LGMRESDestroy( (void *) solver ) );
 }
 
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_SStructLGMRESSetup( HYPRE_SStructSolver solver,
-                         HYPRE_SStructMatrix A,
-                         HYPRE_SStructVector b,
-                         HYPRE_SStructVector x )
+                          HYPRE_SStructMatrix A,
+                          HYPRE_SStructVector b,
+                          HYPRE_SStructVector x )
 {
-   return( HYPRE_LGMRESSetup( (HYPRE_Solver) solver,
-                             (HYPRE_Matrix) A,
-                             (HYPRE_Vector) b,
-                             (HYPRE_Vector) x ) );
+   return ( HYPRE_LGMRESSetup( (HYPRE_Solver) solver,
+                               (HYPRE_Matrix) A,
+                               (HYPRE_Vector) b,
+                               (HYPRE_Vector) x ) );
 }
 
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_SStructLGMRESSolve( HYPRE_SStructSolver solver,
-                         HYPRE_SStructMatrix A,
-                         HYPRE_SStructVector b,
-                         HYPRE_SStructVector x )
+                          HYPRE_SStructMatrix A,
+                          HYPRE_SStructVector b,
+                          HYPRE_SStructVector x )
 {
-   return( HYPRE_LGMRESSolve( (HYPRE_Solver) solver,
-                             (HYPRE_Matrix) A,
-                             (HYPRE_Vector) b,
-                             (HYPRE_Vector) x ) );
+   return ( HYPRE_LGMRESSolve( (HYPRE_Solver) solver,
+                               (HYPRE_Matrix) A,
+                               (HYPRE_Vector) b,
+                               (HYPRE_Vector) x ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -75,9 +77,9 @@ HYPRE_SStructLGMRESSolve( HYPRE_SStructSolver solver,
 
 HYPRE_Int
 HYPRE_SStructLGMRESSetKDim( HYPRE_SStructSolver solver,
-                           HYPRE_Int           k_dim )
+                            HYPRE_Int           k_dim )
 {
-   return( HYPRE_LGMRESSetKDim( (HYPRE_Solver) solver, k_dim ) );
+   return ( HYPRE_LGMRESSetKDim( (HYPRE_Solver) solver, k_dim ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -85,9 +87,9 @@ HYPRE_SStructLGMRESSetKDim( HYPRE_SStructSolver solver,
 
 HYPRE_Int
 HYPRE_SStructLGMRESSetAugDim( HYPRE_SStructSolver solver,
-                           HYPRE_Int           aug_dim )
+                              HYPRE_Int           aug_dim )
 {
-   return( HYPRE_LGMRESSetAugDim( (HYPRE_Solver) solver, aug_dim ) );
+   return ( HYPRE_LGMRESSetAugDim( (HYPRE_Solver) solver, aug_dim ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -95,9 +97,9 @@ HYPRE_SStructLGMRESSetAugDim( HYPRE_SStructSolver solver,
 
 HYPRE_Int
 HYPRE_SStructLGMRESSetTol( HYPRE_SStructSolver solver,
-                          HYPRE_Real          tol )
+                           HYPRE_Real          tol )
 {
-   return( HYPRE_LGMRESSetTol( (HYPRE_Solver) solver, tol ) );
+   return ( HYPRE_LGMRESSetTol( (HYPRE_Solver) solver, tol ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -105,9 +107,9 @@ HYPRE_SStructLGMRESSetTol( HYPRE_SStructSolver solver,
 
 HYPRE_Int
 HYPRE_SStructLGMRESSetAbsoluteTol( HYPRE_SStructSolver solver,
-                          HYPRE_Real          atol )
+                                   HYPRE_Real          atol )
 {
-   return( HYPRE_LGMRESSetAbsoluteTol( (HYPRE_Solver) solver, atol ) );
+   return ( HYPRE_LGMRESSetAbsoluteTol( (HYPRE_Solver) solver, atol ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -115,9 +117,9 @@ HYPRE_SStructLGMRESSetAbsoluteTol( HYPRE_SStructSolver solver,
 
 HYPRE_Int
 HYPRE_SStructLGMRESSetMinIter( HYPRE_SStructSolver solver,
-                              HYPRE_Int           min_iter )
+                               HYPRE_Int           min_iter )
 {
-   return( HYPRE_LGMRESSetMinIter( (HYPRE_Solver) solver, min_iter ) );
+   return ( HYPRE_LGMRESSetMinIter( (HYPRE_Solver) solver, min_iter ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -125,9 +127,9 @@ HYPRE_SStructLGMRESSetMinIter( HYPRE_SStructSolver solver,
 
 HYPRE_Int
 HYPRE_SStructLGMRESSetMaxIter( HYPRE_SStructSolver solver,
-                              HYPRE_Int           max_iter )
+                               HYPRE_Int           max_iter )
 {
-   return( HYPRE_LGMRESSetMaxIter( (HYPRE_Solver) solver, max_iter ) );
+   return ( HYPRE_LGMRESSetMaxIter( (HYPRE_Solver) solver, max_iter ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -135,14 +137,14 @@ HYPRE_SStructLGMRESSetMaxIter( HYPRE_SStructSolver solver,
 
 HYPRE_Int
 HYPRE_SStructLGMRESSetPrecond( HYPRE_SStructSolver          solver,
-                              HYPRE_PtrToSStructSolverFcn  precond,
-                              HYPRE_PtrToSStructSolverFcn  precond_setup,
-                              void *          precond_data )
+                               HYPRE_PtrToSStructSolverFcn  precond,
+                               HYPRE_PtrToSStructSolverFcn  precond_setup,
+                               void *          precond_data )
 {
-   return( HYPRE_LGMRESSetPrecond( (HYPRE_Solver) solver,
-                                  (HYPRE_PtrToSolverFcn) precond,
-                                  (HYPRE_PtrToSolverFcn) precond_setup,
-                                  (HYPRE_Solver) precond_data ) );
+   return ( HYPRE_LGMRESSetPrecond( (HYPRE_Solver) solver,
+                                    (HYPRE_PtrToSolverFcn) precond,
+                                    (HYPRE_PtrToSolverFcn) precond_setup,
+                                    (HYPRE_Solver) precond_data ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -150,9 +152,9 @@ HYPRE_SStructLGMRESSetPrecond( HYPRE_SStructSolver          solver,
 
 HYPRE_Int
 HYPRE_SStructLGMRESSetLogging( HYPRE_SStructSolver solver,
-                              HYPRE_Int           logging )
+                               HYPRE_Int           logging )
 {
-   return( HYPRE_LGMRESSetLogging( (HYPRE_Solver) solver, logging ) );
+   return ( HYPRE_LGMRESSetLogging( (HYPRE_Solver) solver, logging ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -160,9 +162,9 @@ HYPRE_SStructLGMRESSetLogging( HYPRE_SStructSolver solver,
 
 HYPRE_Int
 HYPRE_SStructLGMRESSetPrintLevel( HYPRE_SStructSolver solver,
-                              HYPRE_Int           level )
+                                  HYPRE_Int           level )
 {
-   return( HYPRE_LGMRESSetPrintLevel( (HYPRE_Solver) solver, level ) );
+   return ( HYPRE_LGMRESSetPrintLevel( (HYPRE_Solver) solver, level ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -170,9 +172,9 @@ HYPRE_SStructLGMRESSetPrintLevel( HYPRE_SStructSolver solver,
 
 HYPRE_Int
 HYPRE_SStructLGMRESGetNumIterations( HYPRE_SStructSolver  solver,
-                                    HYPRE_Int           *num_iterations )
+                                     HYPRE_Int           *num_iterations )
 {
-   return( HYPRE_LGMRESGetNumIterations( (HYPRE_Solver) solver, num_iterations ) );
+   return ( HYPRE_LGMRESGetNumIterations( (HYPRE_Solver) solver, num_iterations ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -180,9 +182,9 @@ HYPRE_SStructLGMRESGetNumIterations( HYPRE_SStructSolver  solver,
 
 HYPRE_Int
 HYPRE_SStructLGMRESGetFinalRelativeResidualNorm( HYPRE_SStructSolver  solver,
-                                                HYPRE_Real          *norm )
+                                                 HYPRE_Real          *norm )
 {
-   return( HYPRE_LGMRESGetFinalRelativeResidualNorm( (HYPRE_Solver) solver, norm ) );
+   return ( HYPRE_LGMRESGetFinalRelativeResidualNorm( (HYPRE_Solver) solver, norm ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -192,5 +194,5 @@ HYPRE_Int
 HYPRE_SStructLGMRESGetResidual( HYPRE_SStructSolver  solver,
                                 void              **residual )
 {
-   return( HYPRE_LGMRESGetResidual( (HYPRE_Solver) solver, residual ) );
+   return ( HYPRE_LGMRESGetResidual( (HYPRE_Solver) solver, residual ) );
 }
diff --git a/external/hypre/src/sstruct_ls/HYPRE_sstruct_ls.h b/external/hypre/src/sstruct_ls/HYPRE_sstruct_ls.h
index 27a0e8f6..c4e2356f 100644
--- a/external/hypre/src/sstruct_ls/HYPRE_sstruct_ls.h
+++ b/external/hypre/src/sstruct_ls/HYPRE_sstruct_ls.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -26,10 +26,8 @@ extern "C" {
 /**
  * @defgroup SStructSolvers SStruct Solvers
  *
- * These solvers use matrix/vector storage schemes that are taylored
- * to semi-structured grid problems.
- *
- * @memo Linear solvers for semi-structured grids
+ * Linear solvers for semi-structured grids. These solvers use matrix/vector
+ * storage schemes that are taylored to semi-structured grid problems.
  *
  * @{
  **/
@@ -58,12 +56,6 @@ typedef HYPRE_Int (*HYPRE_PtrToSStructSolverFcn)(HYPRE_SStructSolver,
 #define HYPRE_MODIFYPC
 /* if pc not defined, then may need HYPRE_SOLVER also */
 
- #ifndef HYPRE_SOLVER_STRUCT
- #define HYPRE_SOLVER_STRUCT
- struct hypre_Solver_struct;
- typedef struct hypre_Solver_struct *HYPRE_Solver;
- #endif
-
 typedef HYPRE_Int (*HYPRE_PtrToModifyPCFcn)(HYPRE_Solver,
                                             HYPRE_Int,
                                             HYPRE_Real);
@@ -458,7 +450,7 @@ HYPRE_SStructFACZeroAMRVectorData(HYPRE_SStructVector  b,
  * (Optional) Set maximum number of FAC levels.
  **/
 HYPRE_Int
-HYPRE_SStructFACSetMaxLevels( HYPRE_SStructSolver solver , 
+HYPRE_SStructFACSetMaxLevels( HYPRE_SStructSolver solver,
                               HYPRE_Int           max_levels );
 /**
  * (Optional) Set the convergence tolerance.
@@ -626,7 +618,7 @@ HYPRE_SStructMaxwellSetGrad(HYPRE_SStructSolver solver,
  **/
 HYPRE_Int
 HYPRE_SStructMaxwellSetRfactors(HYPRE_SStructSolver solver,
-                                HYPRE_Int           rfactors[HYPRE_MAXDIM]);
+                                HYPRE_Int          *rfactors);
 
 /**
  * Finds the physical boundary row ranks on all levels.
@@ -634,7 +626,7 @@ HYPRE_SStructMaxwellSetRfactors(HYPRE_SStructSolver solver,
 HYPRE_Int
 HYPRE_SStructMaxwellPhysBdy(HYPRE_SStructGrid  *grid_l,
                             HYPRE_Int           num_levels,
-                            HYPRE_Int           rfactors[HYPRE_MAXDIM],
+                            HYPRE_Int          *rfactors,
                             HYPRE_Int        ***BdryRanks_ptr,
                             HYPRE_Int         **BdryRanksCnt_ptr );
 
@@ -735,7 +727,7 @@ HYPRE_SStructMaxwellGetFinalRelativeResidualNorm(HYPRE_SStructSolver solver,
 
 /**
  * @name SStruct PCG Solver
- * 
+ *
  * These routines should be used in conjunction with the generic interface in
  * \ref KrylovSolvers.
  *
@@ -1074,7 +1066,7 @@ HYPRE_SStructLGMRESSetup(HYPRE_SStructSolver solver,
                          HYPRE_SStructMatrix A,
                          HYPRE_SStructVector b,
                          HYPRE_SStructVector x);
-   
+
 HYPRE_Int
 HYPRE_SStructLGMRESSolve(HYPRE_SStructSolver solver,
                          HYPRE_SStructMatrix A,
diff --git a/external/hypre/src/sstruct_ls/HYPRE_sstruct_maxwell.c b/external/hypre/src/sstruct_ls/HYPRE_sstruct_maxwell.c
index 8cb83bd4..02de0441 100644
--- a/external/hypre/src/sstruct_ls/HYPRE_sstruct_maxwell.c
+++ b/external/hypre/src/sstruct_ls/HYPRE_sstruct_maxwell.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -32,7 +32,7 @@ HYPRE_SStructMaxwellCreate(MPI_Comm comm, HYPRE_SStructSolver *solver)
 HYPRE_Int
 HYPRE_SStructMaxwellDestroy(HYPRE_SStructSolver solver)
 {
-   return( hypre_MaxwellTVDestroy( (void *) solver ) );
+   return ( hypre_MaxwellTVDestroy( (void *) solver ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -45,10 +45,10 @@ HYPRE_SStructMaxwellSetup( HYPRE_SStructSolver  solver,
                            HYPRE_SStructVector b,
                            HYPRE_SStructVector x )
 {
-   return( hypre_MaxwellTV_Setup( (void *) solver,
-                                  (hypre_SStructMatrix *) A,
-                                  (hypre_SStructVector *) b,
-                                  (hypre_SStructVector *) x ));
+   return ( hypre_MaxwellTV_Setup( (void *) solver,
+                                   (hypre_SStructMatrix *) A,
+                                   (hypre_SStructVector *) b,
+                                   (hypre_SStructVector *) x ));
 }
 
 /*--------------------------------------------------------------------------
@@ -61,10 +61,10 @@ HYPRE_SStructMaxwellSolve( HYPRE_SStructSolver solver,
                            HYPRE_SStructVector b,
                            HYPRE_SStructVector x      )
 {
-   return( hypre_MaxwellSolve( (void *) solver,
-                               (hypre_SStructMatrix *) A,
-                               (hypre_SStructVector *) b,
-                               (hypre_SStructVector *) x ) );
+   return ( hypre_MaxwellSolve( (void *) solver,
+                                (hypre_SStructMatrix *) A,
+                                (hypre_SStructVector *) b,
+                                (hypre_SStructVector *) x ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -77,10 +77,10 @@ HYPRE_SStructMaxwellSolve2( HYPRE_SStructSolver solver,
                             HYPRE_SStructVector b,
                             HYPRE_SStructVector x      )
 {
-   return( hypre_MaxwellSolve2( (void *) solver,
-                                (hypre_SStructMatrix *) A,
-                                (hypre_SStructVector *) b,
-                                (hypre_SStructVector *) x ) );
+   return ( hypre_MaxwellSolve2( (void *) solver,
+                                 (hypre_SStructMatrix *) A,
+                                 (hypre_SStructVector *) b,
+                                 (hypre_SStructVector *) x ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -91,8 +91,8 @@ HYPRE_MaxwellGrad( HYPRE_SStructGrid   grid,
                    HYPRE_ParCSRMatrix *T )
 
 {
-   *T= ( (HYPRE_ParCSRMatrix) hypre_Maxwell_Grad( (hypre_SStructGrid *) grid));
-    return 0;
+   *T = ( (HYPRE_ParCSRMatrix) hypre_Maxwell_Grad( (hypre_SStructGrid *) grid));
+   return 0;
 }
 
 /*--------------------------------------------------------------------------
@@ -102,8 +102,8 @@ HYPRE_Int
 HYPRE_SStructMaxwellSetGrad( HYPRE_SStructSolver  solver,
                              HYPRE_ParCSRMatrix   T )
 {
-   return( hypre_MaxwellSetGrad( (void *)               solver,
-                                 (hypre_ParCSRMatrix *) T) );
+   return ( hypre_MaxwellSetGrad( (void *)               solver,
+                                  (hypre_ParCSRMatrix *) T) );
 }
 
 /*--------------------------------------------------------------------------
@@ -111,10 +111,10 @@ HYPRE_SStructMaxwellSetGrad( HYPRE_SStructSolver  solver,
  *--------------------------------------------------------------------------*/
 HYPRE_Int
 HYPRE_SStructMaxwellSetRfactors( HYPRE_SStructSolver  solver,
-                                 HYPRE_Int            rfactors[3] )
+                                 HYPRE_Int           *rfactors )
 {
-   return( hypre_MaxwellSetRfactors( (void *)         solver,
-                                                      rfactors ) );
+   return ( hypre_MaxwellSetRfactors( (void *)         solver,
+                                      rfactors ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -124,7 +124,7 @@ HYPRE_Int
 HYPRE_SStructMaxwellSetTol( HYPRE_SStructSolver solver,
                             HYPRE_Real          tol    )
 {
-   return( hypre_MaxwellSetTol( (void *) solver, tol ) );
+   return ( hypre_MaxwellSetTol( (void *) solver, tol ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -134,7 +134,7 @@ HYPRE_Int
 HYPRE_SStructMaxwellSetConstantCoef( HYPRE_SStructSolver solver,
                                      HYPRE_Int           constant_coef)
 {
-   return( hypre_MaxwellSetConstantCoef( (void *) solver, constant_coef) );
+   return ( hypre_MaxwellSetConstantCoef( (void *) solver, constant_coef) );
 }
 
 /*--------------------------------------------------------------------------
@@ -144,7 +144,7 @@ HYPRE_Int
 HYPRE_SStructMaxwellSetMaxIter( HYPRE_SStructSolver solver,
                                 HYPRE_Int           max_iter  )
 {
-   return( hypre_MaxwellSetMaxIter( (void *) solver, max_iter ) );
+   return ( hypre_MaxwellSetMaxIter( (void *) solver, max_iter ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -154,7 +154,7 @@ HYPRE_Int
 HYPRE_SStructMaxwellSetRelChange( HYPRE_SStructSolver solver,
                                   HYPRE_Int           rel_change  )
 {
-   return( hypre_MaxwellSetRelChange( (void *) solver, rel_change ) );
+   return ( hypre_MaxwellSetRelChange( (void *) solver, rel_change ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -164,7 +164,7 @@ HYPRE_Int
 HYPRE_SStructMaxwellSetNumPreRelax( HYPRE_SStructSolver solver,
                                     HYPRE_Int           num_pre_relax )
 {
-   return( hypre_MaxwellSetNumPreRelax( (void *) solver, num_pre_relax) );
+   return ( hypre_MaxwellSetNumPreRelax( (void *) solver, num_pre_relax) );
 }
 
 /*--------------------------------------------------------------------------
@@ -174,7 +174,7 @@ HYPRE_Int
 HYPRE_SStructMaxwellSetNumPostRelax( HYPRE_SStructSolver solver,
                                      HYPRE_Int           num_post_relax )
 {
-   return( hypre_MaxwellSetNumPostRelax( (void *) solver, num_post_relax) );
+   return ( hypre_MaxwellSetNumPostRelax( (void *) solver, num_post_relax) );
 }
 
 /*--------------------------------------------------------------------------
@@ -184,7 +184,7 @@ HYPRE_Int
 HYPRE_SStructMaxwellSetLogging( HYPRE_SStructSolver solver,
                                 HYPRE_Int           logging )
 {
-   return( hypre_MaxwellSetLogging( (void *) solver, logging) );
+   return ( hypre_MaxwellSetLogging( (void *) solver, logging) );
 }
 
 /*--------------------------------------------------------------------------
@@ -194,7 +194,7 @@ HYPRE_Int
 HYPRE_SStructMaxwellSetPrintLevel( HYPRE_SStructSolver solver,
                                    HYPRE_Int           print_level )
 {
-   return( hypre_MaxwellSetPrintLevel( (void *) solver, print_level) );
+   return ( hypre_MaxwellSetPrintLevel( (void *) solver, print_level) );
 }
 
 /*--------------------------------------------------------------------------
@@ -204,7 +204,7 @@ HYPRE_Int
 HYPRE_SStructMaxwellPrintLogging( HYPRE_SStructSolver solver,
                                   HYPRE_Int           myid)
 {
-   return( hypre_MaxwellPrintLogging( (void *) solver, myid) );
+   return ( hypre_MaxwellPrintLogging( (void *) solver, myid) );
 }
 
 /*--------------------------------------------------------------------------
@@ -214,7 +214,7 @@ HYPRE_Int
 HYPRE_SStructMaxwellGetNumIterations( HYPRE_SStructSolver  solver,
                                       HYPRE_Int           *num_iterations )
 {
-   return( hypre_MaxwellGetNumIterations( (void *) solver, num_iterations ) );
+   return ( hypre_MaxwellGetNumIterations( (void *) solver, num_iterations ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -224,7 +224,7 @@ HYPRE_Int
 HYPRE_SStructMaxwellGetFinalRelativeResidualNorm( HYPRE_SStructSolver  solver,
                                                   HYPRE_Real          *norm   )
 {
-   return( hypre_MaxwellGetFinalRelativeResidualNorm( (void *) solver, norm ) );
+   return ( hypre_MaxwellGetFinalRelativeResidualNorm( (void *) solver, norm ) );
 }
 
 
@@ -234,15 +234,15 @@ HYPRE_SStructMaxwellGetFinalRelativeResidualNorm( HYPRE_SStructSolver  solver,
 HYPRE_Int
 HYPRE_SStructMaxwellPhysBdy( HYPRE_SStructGrid  *grid_l,
                              HYPRE_Int           num_levels,
-                             HYPRE_Int           rfactors[3],
+                             HYPRE_Int          *rfactors,
                              HYPRE_Int        ***BdryRanks_ptr,
                              HYPRE_Int         **BdryRanksCnt_ptr )
 {
-    return( hypre_Maxwell_PhysBdy( (hypre_SStructGrid  **) grid_l,
-                                                           num_levels,
-                                                           rfactors,
-                                                           BdryRanks_ptr,
-                                                           BdryRanksCnt_ptr ) );
+   return ( hypre_Maxwell_PhysBdy( (hypre_SStructGrid  **) grid_l,
+                                   num_levels,
+                                   rfactors,
+                                   BdryRanks_ptr,
+                                   BdryRanksCnt_ptr ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -250,24 +250,24 @@ HYPRE_SStructMaxwellPhysBdy( HYPRE_SStructGrid  *grid_l,
  *--------------------------------------------------------------------------*/
 HYPRE_Int
 HYPRE_SStructMaxwellEliminateRowsCols( HYPRE_ParCSRMatrix  parA,
-                                     HYPRE_Int           nrows,
-                                     HYPRE_Int          *rows )
+                                       HYPRE_Int           nrows,
+                                       HYPRE_Int          *rows )
 {
-    return( hypre_ParCSRMatrixEliminateRowsCols( (hypre_ParCSRMatrix *) parA,
-                                                                        nrows,
-                                                                        rows ) );
+   return ( hypre_ParCSRMatrixEliminateRowsCols( (hypre_ParCSRMatrix *) parA,
+                                                 nrows,
+                                                 rows ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_SStructMaxwellZeroVector
  *--------------------------------------------------------------------------*/
 HYPRE_Int HYPRE_SStructMaxwellZeroVector(HYPRE_ParVector  v,
-                                   HYPRE_Int       *rows,
-                                   HYPRE_Int        nrows)
+                                         HYPRE_Int       *rows,
+                                         HYPRE_Int        nrows)
 {
-    return( hypre_ParVectorZeroBCValues( (hypre_ParVector *) v,
-                                                                rows,
-                                                                nrows ) );
+   return ( hypre_ParVectorZeroBCValues( (hypre_ParVector *) v,
+                                         rows,
+                                         nrows ) );
 }
 
 
diff --git a/external/hypre/src/sstruct_ls/HYPRE_sstruct_pcg.c b/external/hypre/src/sstruct_ls/HYPRE_sstruct_pcg.c
index 3dce3919..24174d4a 100644
--- a/external/hypre/src/sstruct_ls/HYPRE_sstruct_pcg.c
+++ b/external/hypre/src/sstruct_ls/HYPRE_sstruct_pcg.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -14,6 +14,8 @@ HYPRE_Int
 HYPRE_SStructPCGCreate( MPI_Comm             comm,
                         HYPRE_SStructSolver *solver )
 {
+   HYPRE_UNUSED_VAR(comm);
+
    hypre_PCGFunctions * pcg_functions =
       hypre_PCGFunctionsCreate(
          hypre_SStructKrylovCAlloc, hypre_SStructKrylovFree, hypre_SStructKrylovCommInfo,
@@ -33,40 +35,40 @@ HYPRE_SStructPCGCreate( MPI_Comm             comm,
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_SStructPCGDestroy( HYPRE_SStructSolver solver )
 {
-   return( hypre_PCGDestroy( (void *) solver ) );
+   return ( hypre_PCGDestroy( (void *) solver ) );
 }
 
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_SStructPCGSetup( HYPRE_SStructSolver solver,
                        HYPRE_SStructMatrix A,
                        HYPRE_SStructVector b,
                        HYPRE_SStructVector x )
 {
-   return( HYPRE_PCGSetup( (HYPRE_Solver) solver,
-                           (HYPRE_Matrix) A,
-                           (HYPRE_Vector) b,
-                           (HYPRE_Vector) x ) );
+   return ( HYPRE_PCGSetup( (HYPRE_Solver) solver,
+                            (HYPRE_Matrix) A,
+                            (HYPRE_Vector) b,
+                            (HYPRE_Vector) x ) );
 }
 
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_SStructPCGSolve( HYPRE_SStructSolver solver,
                        HYPRE_SStructMatrix A,
                        HYPRE_SStructVector b,
                        HYPRE_SStructVector x )
 {
-   return( HYPRE_PCGSolve( (HYPRE_Solver) solver,
-                           (HYPRE_Matrix) A,
-                           (HYPRE_Vector) b,
-                           (HYPRE_Vector) x ) );
+   return ( HYPRE_PCGSolve( (HYPRE_Solver) solver,
+                            (HYPRE_Matrix) A,
+                            (HYPRE_Vector) b,
+                            (HYPRE_Vector) x ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -76,7 +78,7 @@ HYPRE_Int
 HYPRE_SStructPCGSetTol( HYPRE_SStructSolver solver,
                         HYPRE_Real          tol )
 {
-   return( HYPRE_PCGSetTol( (HYPRE_Solver) solver, tol ) );
+   return ( HYPRE_PCGSetTol( (HYPRE_Solver) solver, tol ) );
 }
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
@@ -85,7 +87,7 @@ HYPRE_Int
 HYPRE_SStructPCGSetAbsoluteTol( HYPRE_SStructSolver solver,
                                 HYPRE_Real          tol )
 {
-   return( HYPRE_PCGSetAbsoluteTol( (HYPRE_Solver) solver, tol ) );
+   return ( HYPRE_PCGSetAbsoluteTol( (HYPRE_Solver) solver, tol ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -95,7 +97,7 @@ HYPRE_Int
 HYPRE_SStructPCGSetMaxIter( HYPRE_SStructSolver solver,
                             HYPRE_Int           max_iter )
 {
-   return( HYPRE_PCGSetMaxIter( (HYPRE_Solver) solver, max_iter ) );
+   return ( HYPRE_PCGSetMaxIter( (HYPRE_Solver) solver, max_iter ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -105,7 +107,7 @@ HYPRE_Int
 HYPRE_SStructPCGSetTwoNorm( HYPRE_SStructSolver solver,
                             HYPRE_Int           two_norm )
 {
-   return( HYPRE_PCGSetTwoNorm( (HYPRE_Solver) solver, two_norm ) );
+   return ( HYPRE_PCGSetTwoNorm( (HYPRE_Solver) solver, two_norm ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -115,7 +117,7 @@ HYPRE_Int
 HYPRE_SStructPCGSetRelChange( HYPRE_SStructSolver solver,
                               HYPRE_Int           rel_change )
 {
-   return( HYPRE_PCGSetRelChange( (HYPRE_Solver) solver, rel_change ) );
+   return ( HYPRE_PCGSetRelChange( (HYPRE_Solver) solver, rel_change ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -127,10 +129,10 @@ HYPRE_SStructPCGSetPrecond( HYPRE_SStructSolver          solver,
                             HYPRE_PtrToSStructSolverFcn  precond_setup,
                             void                        *precond_data )
 {
-   return( HYPRE_PCGSetPrecond( (HYPRE_Solver) solver,
-                                (HYPRE_PtrToSolverFcn) precond,
-                                (HYPRE_PtrToSolverFcn) precond_setup,
-                                (HYPRE_Solver) precond_data ) );
+   return ( HYPRE_PCGSetPrecond( (HYPRE_Solver) solver,
+                                 (HYPRE_PtrToSolverFcn) precond,
+                                 (HYPRE_PtrToSolverFcn) precond_setup,
+                                 (HYPRE_Solver) precond_data ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -140,7 +142,7 @@ HYPRE_Int
 HYPRE_SStructPCGSetLogging( HYPRE_SStructSolver solver,
                             HYPRE_Int           logging )
 {
-   return( HYPRE_PCGSetLogging( (HYPRE_Solver) solver, logging ) );
+   return ( HYPRE_PCGSetLogging( (HYPRE_Solver) solver, logging ) );
 }
 
 
@@ -149,9 +151,9 @@ HYPRE_SStructPCGSetLogging( HYPRE_SStructSolver solver,
 
 HYPRE_Int
 HYPRE_SStructPCGSetPrintLevel( HYPRE_SStructSolver solver,
-                            HYPRE_Int           level )
+                               HYPRE_Int           level )
 {
-   return( HYPRE_PCGSetPrintLevel( (HYPRE_Solver) solver, level ) );
+   return ( HYPRE_PCGSetPrintLevel( (HYPRE_Solver) solver, level ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -161,7 +163,7 @@ HYPRE_Int
 HYPRE_SStructPCGGetNumIterations( HYPRE_SStructSolver  solver,
                                   HYPRE_Int           *num_iterations )
 {
-   return( HYPRE_PCGGetNumIterations( (HYPRE_Solver) solver, num_iterations ) );
+   return ( HYPRE_PCGGetNumIterations( (HYPRE_Solver) solver, num_iterations ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -171,7 +173,7 @@ HYPRE_Int
 HYPRE_SStructPCGGetFinalRelativeResidualNorm( HYPRE_SStructSolver  solver,
                                               HYPRE_Real          *norm )
 {
-   return( HYPRE_PCGGetFinalRelativeResidualNorm( (HYPRE_Solver) solver, norm ) );
+   return ( HYPRE_PCGGetFinalRelativeResidualNorm( (HYPRE_Solver) solver, norm ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -179,9 +181,9 @@ HYPRE_SStructPCGGetFinalRelativeResidualNorm( HYPRE_SStructSolver  solver,
 
 HYPRE_Int
 HYPRE_SStructPCGGetResidual( HYPRE_SStructSolver  solver,
-                              void              **residual )
+                             void              **residual )
 {
-   return( HYPRE_PCGGetResidual( (HYPRE_Solver) solver, residual ) );
+   return ( HYPRE_PCGGetResidual( (HYPRE_Solver) solver, residual ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -193,11 +195,11 @@ HYPRE_SStructDiagScaleSetup( HYPRE_SStructSolver solver,
                              HYPRE_SStructVector y,
                              HYPRE_SStructVector x      )
 {
-  
-   return( HYPRE_StructDiagScaleSetup( (HYPRE_StructSolver) solver,
-                                       (HYPRE_StructMatrix) A,
-                                       (HYPRE_StructVector) y,
-                                       (HYPRE_StructVector) x ) );
+
+   return ( HYPRE_StructDiagScaleSetup( (HYPRE_StructSolver) solver,
+                                        (HYPRE_StructMatrix) A,
+                                        (HYPRE_StructVector) y,
+                                        (HYPRE_StructVector) x ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -209,7 +211,7 @@ HYPRE_SStructDiagScale( HYPRE_SStructSolver solver,
                         HYPRE_SStructVector y,
                         HYPRE_SStructVector x      )
 {
-   HYPRE_Int                nparts= hypre_SStructMatrixNParts(A);
+   HYPRE_Int                nparts = hypre_SStructMatrixNParts(A);
 
    hypre_SStructPMatrix    *pA;
    hypre_SStructPVector    *px;
@@ -226,13 +228,13 @@ HYPRE_SStructDiagScale( HYPRE_SStructSolver solver,
       pA = hypre_SStructMatrixPMatrix(A, part);
       px = hypre_SStructVectorPVector(x, part);
       py = hypre_SStructVectorPVector(y, part);
-      nvars= hypre_SStructPMatrixNVars(pA);
+      nvars = hypre_SStructPMatrixNVars(pA);
       for (vi = 0; vi < nvars; vi++)
       {
          sA = hypre_SStructPMatrixSMatrix(pA, vi, vi);
          sx = hypre_SStructPVectorSVector(px, vi);
          sy = hypre_SStructPVectorSVector(py, vi);
-         
+
          HYPRE_StructDiagScale( (HYPRE_StructSolver) solver,
                                 (HYPRE_StructMatrix) sA,
                                 (HYPRE_StructVector) sy,
@@ -242,6 +244,3 @@ HYPRE_SStructDiagScale( HYPRE_SStructSolver solver,
 
    return hypre_error_flag;
 }
-
-
-
diff --git a/external/hypre/src/sstruct_ls/HYPRE_sstruct_split.c b/external/hypre/src/sstruct_ls/HYPRE_sstruct_split.c
index ead04af6..f0f7f293 100644
--- a/external/hypre/src/sstruct_ls/HYPRE_sstruct_split.c
+++ b/external/hypre/src/sstruct_ls/HYPRE_sstruct_split.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -20,6 +20,9 @@
 
 #include "_hypre_sstruct_ls.h"
 
+typedef HYPRE_Int (*HYPRE_PtrToVoid1Fcn)(void*);
+typedef HYPRE_Int (*HYPRE_PtrToVoid4Fcn)(void*, void*, void*, void*);
+
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
 
@@ -32,8 +35,8 @@ typedef struct hypre_SStructSolver_struct
 
    void                 ****smatvec_data;
 
-   HYPRE_Int            (***ssolver_solve)();
-   HYPRE_Int            (***ssolver_destroy)();
+   HYPRE_PtrToVoid1Fcn    **ssolver_destroy;
+   HYPRE_PtrToVoid4Fcn    **ssolver_solve;
    void                  ***ssolver_data;
 
    HYPRE_Real               tol;
@@ -54,6 +57,8 @@ HYPRE_Int
 HYPRE_SStructSplitCreate( MPI_Comm             comm,
                           HYPRE_SStructSolver *solver_ptr )
 {
+   HYPRE_UNUSED_VAR(comm);
+
    hypre_SStructSolver *solver;
 
    solver = hypre_TAlloc(hypre_SStructSolver,  1, HYPRE_MEMORY_HOST);
@@ -81,18 +86,18 @@ HYPRE_SStructSplitCreate( MPI_Comm             comm,
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_SStructSplitDestroy( HYPRE_SStructSolver solver )
 {
    hypre_SStructVector     *y;
    HYPRE_Int                nparts;
    HYPRE_Int               *nvars;
    void                 ****smatvec_data;
-   HYPRE_Int            (***ssolver_solve)();
-   HYPRE_Int            (***ssolver_destroy)();
+   HYPRE_PtrToVoid4Fcn    **ssolver_solve;
+   HYPRE_PtrToVoid1Fcn    **ssolver_destroy;
    void                  ***ssolver_data;
 
-   HYPRE_Int              (*sdestroy)(void *);
+   HYPRE_PtrToVoid1Fcn      sdestroy;
    void                    *sdata;
 
    HYPRE_Int                part, vi, vj;
@@ -120,7 +125,7 @@ HYPRE_SStructSplitDestroy( HYPRE_SStructSolver solver )
                }
             }
             hypre_TFree(smatvec_data[part][vi], HYPRE_MEMORY_HOST);
-            sdestroy = (HYPRE_Int (*)(void *))ssolver_destroy[part][vi];
+            sdestroy = ssolver_destroy[part][vi];
             sdata = ssolver_data[part][vi];
             sdestroy(sdata);
          }
@@ -144,20 +149,20 @@ HYPRE_SStructSplitDestroy( HYPRE_SStructSolver solver )
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_SStructSplitSetup( HYPRE_SStructSolver solver,
                          HYPRE_SStructMatrix A,
                          HYPRE_SStructVector b,
                          HYPRE_SStructVector x )
 {
+   HYPRE_Int                ssolver = (solver -> ssolver);
    hypre_SStructVector     *y;
    HYPRE_Int                nparts;
    HYPRE_Int               *nvars;
    void                 ****smatvec_data;
-   HYPRE_Int            (***ssolver_solve)();
-   HYPRE_Int            (***ssolver_destroy)();
+   HYPRE_PtrToVoid4Fcn    **ssolver_solve;
+   HYPRE_PtrToVoid1Fcn    **ssolver_destroy;
    void                  ***ssolver_data;
-   HYPRE_Int                ssolver          = (solver -> ssolver);
 
    MPI_Comm                 comm;
    hypre_SStructGrid       *grid;
@@ -170,8 +175,9 @@ HYPRE_SStructSplitSetup( HYPRE_SStructSolver solver,
    HYPRE_StructMatrix      sAH;
    HYPRE_StructVector      sxH;
    HYPRE_StructVector      syH;
-   HYPRE_Int              (*ssolve)();
-   HYPRE_Int              (*sdestroy)();
+
+   HYPRE_PtrToVoid4Fcn      ssolve;
+   HYPRE_PtrToVoid1Fcn      sdestroy;
    void                    *sdata;
 
    HYPRE_Int                part, vi, vj;
@@ -183,11 +189,13 @@ HYPRE_SStructSplitSetup( HYPRE_SStructSolver solver,
    HYPRE_SStructVectorAssemble(y);
 
    nparts = hypre_SStructMatrixNParts(A);
-   nvars = hypre_TAlloc(HYPRE_Int,  nparts, HYPRE_MEMORY_HOST);
-   smatvec_data    = hypre_TAlloc(void ***,  nparts, HYPRE_MEMORY_HOST);
-   ssolver_solve   = (HYPRE_Int (***)()) hypre_MAlloc((sizeof(HYPRE_Int (**)()) * nparts), HYPRE_MEMORY_HOST);
-   ssolver_destroy = (HYPRE_Int (***)()) hypre_MAlloc((sizeof(HYPRE_Int (**)()) * nparts), HYPRE_MEMORY_HOST);
-   ssolver_data    = hypre_TAlloc(void **,  nparts, HYPRE_MEMORY_HOST);
+   nvars  = hypre_TAlloc(HYPRE_Int, nparts, HYPRE_MEMORY_HOST);
+
+   smatvec_data    = hypre_TAlloc(void***, nparts, HYPRE_MEMORY_HOST);
+   ssolver_solve   = hypre_TAlloc(HYPRE_PtrToVoid4Fcn*, nparts, HYPRE_MEMORY_HOST);
+   ssolver_destroy = hypre_TAlloc(HYPRE_PtrToVoid1Fcn*, nparts, HYPRE_MEMORY_HOST);
+   ssolver_data    = hypre_TAlloc(void**,  nparts, HYPRE_MEMORY_HOST);
+
    for (part = 0; part < nparts; part++)
    {
       pA = hypre_SStructMatrixPMatrix(A, part);
@@ -195,15 +203,13 @@ HYPRE_SStructSplitSetup( HYPRE_SStructSolver solver,
       py = hypre_SStructVectorPVector(y, part);
       nvars[part] = hypre_SStructPMatrixNVars(pA);
 
-      smatvec_data[part]    = hypre_TAlloc(void **,  nvars[part], HYPRE_MEMORY_HOST);
-      ssolver_solve[part]   =
-         (HYPRE_Int (**)()) hypre_MAlloc((sizeof(HYPRE_Int (*)()) * nvars[part]), HYPRE_MEMORY_HOST);
-      ssolver_destroy[part] =
-         (HYPRE_Int (**)()) hypre_MAlloc((sizeof(HYPRE_Int (*)()) * nvars[part]), HYPRE_MEMORY_HOST);
-      ssolver_data[part]    = hypre_TAlloc(void *,  nvars[part], HYPRE_MEMORY_HOST);
+      smatvec_data[part]    = hypre_TAlloc(void**, nvars[part], HYPRE_MEMORY_HOST);
+      ssolver_solve[part]   = hypre_TAlloc(HYPRE_PtrToVoid4Fcn, nvars[part], HYPRE_MEMORY_HOST);
+      ssolver_destroy[part] = hypre_TAlloc(HYPRE_PtrToVoid1Fcn, nvars[part], HYPRE_MEMORY_HOST);
+      ssolver_data[part]    = hypre_TAlloc(void*, nvars[part], HYPRE_MEMORY_HOST);
       for (vi = 0; vi < nvars[part]; vi++)
       {
-         smatvec_data[part][vi] = hypre_TAlloc(void *,  nvars[part], HYPRE_MEMORY_HOST);
+         smatvec_data[part][vi] = hypre_TAlloc(void*,  nvars[part], HYPRE_MEMORY_HOST);
          for (vj = 0; vj < nvars[part]; vj++)
          {
             sA = hypre_SStructPMatrixSMatrix(pA, vi, vj);
@@ -222,14 +228,16 @@ HYPRE_SStructSplitSetup( HYPRE_SStructSolver solver,
          sAH = (HYPRE_StructMatrix) sA;
          sxH = (HYPRE_StructVector) sx;
          syH = (HYPRE_StructVector) sy;
-         switch(ssolver)
+         switch (ssolver)
          {
             default:
                /* If no solver is matched, use Jacobi, but throw and error */
                if (ssolver != HYPRE_Jacobi)
                {
                   hypre_error(HYPRE_ERROR_GENERIC);
-               } /* don't break */
+               }
+            /* fall through */
+
             case HYPRE_Jacobi:
                HYPRE_StructJacobiCreate(comm, (HYPRE_StructSolver *)&sdata);
                HYPRE_StructJacobiSetMaxIter((HYPRE_StructSolver)sdata, 1);
@@ -239,9 +247,10 @@ HYPRE_SStructSplitSetup( HYPRE_SStructSolver solver,
                   HYPRE_StructJacobiSetZeroGuess((HYPRE_StructSolver)sdata);
                }
                HYPRE_StructJacobiSetup((HYPRE_StructSolver)sdata, sAH, syH, sxH);
-               ssolve = (HYPRE_Int (*)())HYPRE_StructJacobiSolve;
-               sdestroy = (HYPRE_Int (*)())HYPRE_StructJacobiDestroy;
+               ssolve   = (HYPRE_PtrToVoid4Fcn) HYPRE_StructJacobiSolve;
+               sdestroy = (HYPRE_PtrToVoid1Fcn) HYPRE_StructJacobiDestroy;
                break;
+
             case HYPRE_SMG:
                HYPRE_StructSMGCreate(comm, (HYPRE_StructSolver *)&sdata);
                HYPRE_StructSMGSetMemoryUse((HYPRE_StructSolver)sdata, 0);
@@ -256,9 +265,10 @@ HYPRE_SStructSplitSetup( HYPRE_SStructSolver solver,
                HYPRE_StructSMGSetLogging((HYPRE_StructSolver)sdata, 0);
                HYPRE_StructSMGSetPrintLevel((HYPRE_StructSolver)sdata, 0);
                HYPRE_StructSMGSetup((HYPRE_StructSolver)sdata, sAH, syH, sxH);
-               ssolve = (HYPRE_Int (*)())HYPRE_StructSMGSolve;
-               sdestroy = (HYPRE_Int (*)())HYPRE_StructSMGDestroy;
+               ssolve   = (HYPRE_PtrToVoid4Fcn) HYPRE_StructSMGSolve;
+               sdestroy = (HYPRE_PtrToVoid1Fcn) HYPRE_StructSMGDestroy;
                break;
+
             case HYPRE_PFMG:
                HYPRE_StructPFMGCreate(comm, (HYPRE_StructSolver *)&sdata);
                HYPRE_StructPFMGSetMaxIter((HYPRE_StructSolver)sdata, 1);
@@ -273,8 +283,8 @@ HYPRE_SStructSplitSetup( HYPRE_SStructSolver solver,
                HYPRE_StructPFMGSetLogging((HYPRE_StructSolver)sdata, 0);
                HYPRE_StructPFMGSetPrintLevel((HYPRE_StructSolver)sdata, 0);
                HYPRE_StructPFMGSetup((HYPRE_StructSolver)sdata, sAH, syH, sxH);
-               ssolve = (HYPRE_Int (*)())HYPRE_StructPFMGSolve;
-               sdestroy = (HYPRE_Int (*)())HYPRE_StructPFMGDestroy;
+               ssolve   = (HYPRE_PtrToVoid4Fcn) HYPRE_StructPFMGSolve;
+               sdestroy = (HYPRE_PtrToVoid1Fcn) HYPRE_StructPFMGDestroy;
                break;
          }
          ssolver_solve[part][vi]   = ssolve;
@@ -302,22 +312,22 @@ HYPRE_SStructSplitSetup( HYPRE_SStructSolver solver,
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_SStructSplitSolve( HYPRE_SStructSolver solver,
                          HYPRE_SStructMatrix A,
                          HYPRE_SStructVector b,
                          HYPRE_SStructVector x )
 {
-   hypre_SStructVector     *y                = (solver -> y);
-   HYPRE_Int                nparts           = (solver -> nparts);
-   HYPRE_Int               *nvars            = (solver -> nvars);
-   void                 ****smatvec_data     = (solver -> smatvec_data);
-   HYPRE_Int            (***ssolver_solve)() = (solver -> ssolver_solve);
-   void                  ***ssolver_data     = (solver -> ssolver_data);
-   HYPRE_Real               tol              = (solver -> tol);
-   HYPRE_Int                max_iter         = (solver -> max_iter);
-   HYPRE_Int                zero_guess       = (solver -> zero_guess);
-   void                    *matvec_data      = (solver -> matvec_data);
+   hypre_SStructVector     *y                     = (solver -> y);
+   HYPRE_Int                nparts                = (solver -> nparts);
+   HYPRE_Int               *nvars                 = (solver -> nvars);
+   void                 ****smatvec_data          = (solver -> smatvec_data);
+   HYPRE_PtrToVoid4Fcn    **ssolver_solve         = (solver -> ssolver_solve);
+   void                  ***ssolver_data          = (solver -> ssolver_data);
+   HYPRE_Real               tol                   = (solver -> tol);
+   HYPRE_Int                max_iter              = (solver -> max_iter);
+   HYPRE_Int                zero_guess            = (solver -> zero_guess);
+   void                    *matvec_data           = (solver -> matvec_data);
 
    hypre_SStructPMatrix    *pA;
    hypre_SStructPVector    *px;
@@ -325,7 +335,8 @@ HYPRE_SStructSplitSolve( HYPRE_SStructSolver solver,
    hypre_StructMatrix      *sA;
    hypre_StructVector      *sx;
    hypre_StructVector      *sy;
-   HYPRE_Int              (*ssolve)(void*, hypre_StructMatrix*,hypre_StructVector*,hypre_StructVector*);
+
+   HYPRE_PtrToVoid4Fcn      ssolve;
    void                    *sdata;
    hypre_ParCSRMatrix      *parcsrA;
    hypre_ParVector         *parx;
@@ -334,8 +345,6 @@ HYPRE_SStructSplitSolve( HYPRE_SStructSolver solver,
    HYPRE_Int                iter, part, vi, vj;
    HYPRE_Real               b_dot_b = 0, r_dot_r;
 
-
-
    /* part of convergence check */
    if (tol > 0.0)
    {
@@ -361,7 +370,7 @@ HYPRE_SStructSplitSolve( HYPRE_SStructSolver solver,
          hypre_SStructCopy(b, y);
          hypre_SStructMatvecCompute(matvec_data, -1.0, A, x, 1.0, y);
          hypre_SStructInnerProd(y, y, &r_dot_r);
-         (solver -> rel_norm) = sqrt(r_dot_r/b_dot_b);
+         (solver -> rel_norm) = hypre_sqrt(r_dot_r / b_dot_b);
 
          if ((solver -> rel_norm) < tol)
          {
@@ -411,12 +420,13 @@ HYPRE_SStructSplitSolve( HYPRE_SStructSolver solver,
          py = hypre_SStructVectorPVector(y, part);
          for (vi = 0; vi < nvars[part]; vi++)
          {
-            ssolve = (HYPRE_Int (*)(void *, hypre_StructMatrix *, hypre_StructVector *, hypre_StructVector *))ssolver_solve[part][vi];
+            ssolve = ssolver_solve[part][vi];
             sdata  = ssolver_data[part][vi];
             sA = hypre_SStructPMatrixSMatrix(pA, vi, vi);
             sx = hypre_SStructPVectorSVector(px, vi);
             sy = hypre_SStructPVectorSVector(py, vi);
-            ssolve(sdata, sA, sy, sx);
+
+            ssolve(sdata, (void*) sA, (void*) sy, (void*) sx);
          }
       }
    }
diff --git a/external/hypre/src/sstruct_ls/HYPRE_sstruct_sys_pfmg.c b/external/hypre/src/sstruct_ls/HYPRE_sstruct_sys_pfmg.c
index 040ddfc0..5fdd8f56 100644
--- a/external/hypre/src/sstruct_ls/HYPRE_sstruct_sys_pfmg.c
+++ b/external/hypre/src/sstruct_ls/HYPRE_sstruct_sys_pfmg.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -21,40 +21,40 @@ HYPRE_SStructSysPFMGCreate( MPI_Comm comm, HYPRE_SStructSolver *solver )
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_SStructSysPFMGDestroy( HYPRE_SStructSolver solver )
 {
-   return( hypre_SysPFMGDestroy( (void *) solver ) );
+   return ( hypre_SysPFMGDestroy( (void *) solver ) );
 }
 
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_SStructSysPFMGSetup( HYPRE_SStructSolver  solver,
                            HYPRE_SStructMatrix A,
                            HYPRE_SStructVector b,
                            HYPRE_SStructVector x      )
 {
-   return( hypre_SysPFMGSetup( (void *) solver,
-                               (hypre_SStructMatrix *) A,
-                               (hypre_SStructVector *) b,
-                               (hypre_SStructVector *) x ) );
+   return ( hypre_SysPFMGSetup( (void *) solver,
+                                (hypre_SStructMatrix *) A,
+                                (hypre_SStructVector *) b,
+                                (hypre_SStructVector *) x ) );
 }
 
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_SStructSysPFMGSolve( HYPRE_SStructSolver solver,
                            HYPRE_SStructMatrix A,
                            HYPRE_SStructVector b,
                            HYPRE_SStructVector x      )
 {
-   return( hypre_SysPFMGSolve( (void *) solver,
-                            (hypre_SStructMatrix *) A,
-                            (hypre_SStructVector *) b,
-                            (hypre_SStructVector *) x ) );
+   return ( hypre_SysPFMGSolve( (void *) solver,
+                                (hypre_SStructMatrix *) A,
+                                (hypre_SStructVector *) b,
+                                (hypre_SStructVector *) x ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -64,7 +64,7 @@ HYPRE_Int
 HYPRE_SStructSysPFMGSetTol( HYPRE_SStructSolver solver,
                             HYPRE_Real         tol    )
 {
-   return( hypre_SysPFMGSetTol( (void *) solver, tol ) );
+   return ( hypre_SysPFMGSetTol( (void *) solver, tol ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -74,7 +74,7 @@ HYPRE_Int
 HYPRE_SStructSysPFMGSetMaxIter( HYPRE_SStructSolver solver,
                                 HYPRE_Int          max_iter  )
 {
-   return( hypre_SysPFMGSetMaxIter( (void *) solver, max_iter ) );
+   return ( hypre_SysPFMGSetMaxIter( (void *) solver, max_iter ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -84,25 +84,25 @@ HYPRE_Int
 HYPRE_SStructSysPFMGSetRelChange( HYPRE_SStructSolver solver,
                                   HYPRE_Int          rel_change  )
 {
-   return( hypre_SysPFMGSetRelChange( (void *) solver, rel_change ) );
+   return ( hypre_SysPFMGSetRelChange( (void *) solver, rel_change ) );
 }
 
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
- 
+
 HYPRE_Int
 HYPRE_SStructSysPFMGSetZeroGuess( HYPRE_SStructSolver solver )
 {
-   return( hypre_SysPFMGSetZeroGuess( (void *) solver, 1 ) );
+   return ( hypre_SysPFMGSetZeroGuess( (void *) solver, 1 ) );
 }
 
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
- 
+
 HYPRE_Int
 HYPRE_SStructSysPFMGSetNonZeroGuess( HYPRE_SStructSolver solver )
 {
-   return( hypre_SysPFMGSetZeroGuess( (void *) solver, 0 ) );
+   return ( hypre_SysPFMGSetZeroGuess( (void *) solver, 0 ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -112,17 +112,17 @@ HYPRE_Int
 HYPRE_SStructSysPFMGSetRelaxType( HYPRE_SStructSolver solver,
                                   HYPRE_Int          relax_type )
 {
-   return( hypre_SysPFMGSetRelaxType( (void *) solver, relax_type) );
+   return ( hypre_SysPFMGSetRelaxType( (void *) solver, relax_type) );
 }
 
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
-                                                                                                                                                               
+
 HYPRE_Int
 HYPRE_SStructSysPFMGSetJacobiWeight(HYPRE_SStructSolver solver,
                                     HYPRE_Real          weight)
 {
-   return( hypre_SysPFMGSetJacobiWeight( (void *) solver, weight) );
+   return ( hypre_SysPFMGSetJacobiWeight( (void *) solver, weight) );
 }
 
 /*--------------------------------------------------------------------------
@@ -132,7 +132,7 @@ HYPRE_Int
 HYPRE_SStructSysPFMGSetNumPreRelax( HYPRE_SStructSolver solver,
                                     HYPRE_Int          num_pre_relax )
 {
-   return( hypre_SysPFMGSetNumPreRelax( (void *) solver, num_pre_relax) );
+   return ( hypre_SysPFMGSetNumPreRelax( (void *) solver, num_pre_relax) );
 }
 
 /*--------------------------------------------------------------------------
@@ -142,7 +142,7 @@ HYPRE_Int
 HYPRE_SStructSysPFMGSetNumPostRelax( HYPRE_SStructSolver solver,
                                      HYPRE_Int          num_post_relax )
 {
-   return( hypre_SysPFMGSetNumPostRelax( (void *) solver, num_post_relax) );
+   return ( hypre_SysPFMGSetNumPostRelax( (void *) solver, num_post_relax) );
 }
 
 /*--------------------------------------------------------------------------
@@ -152,7 +152,7 @@ HYPRE_Int
 HYPRE_SStructSysPFMGSetSkipRelax( HYPRE_SStructSolver solver,
                                   HYPRE_Int          skip_relax )
 {
-   return( hypre_SysPFMGSetSkipRelax( (void *) solver, skip_relax) );
+   return ( hypre_SysPFMGSetSkipRelax( (void *) solver, skip_relax) );
 }
 
 /*--------------------------------------------------------------------------
@@ -160,9 +160,9 @@ HYPRE_SStructSysPFMGSetSkipRelax( HYPRE_SStructSolver solver,
 
 HYPRE_Int
 HYPRE_SStructSysPFMGSetDxyz( HYPRE_SStructSolver  solver,
-                         HYPRE_Real         *dxyz   )
+                             HYPRE_Real         *dxyz   )
 {
-   return( hypre_SysPFMGSetDxyz( (void *) solver, dxyz) );
+   return ( hypre_SysPFMGSetDxyz( (void *) solver, dxyz) );
 }
 
 /*--------------------------------------------------------------------------
@@ -172,7 +172,7 @@ HYPRE_Int
 HYPRE_SStructSysPFMGSetLogging( HYPRE_SStructSolver solver,
                                 HYPRE_Int          logging )
 {
-   return( hypre_SysPFMGSetLogging( (void *) solver, logging) );
+   return ( hypre_SysPFMGSetLogging( (void *) solver, logging) );
 }
 
 /*--------------------------------------------------------------------------
@@ -180,9 +180,9 @@ HYPRE_SStructSysPFMGSetLogging( HYPRE_SStructSolver solver,
 
 HYPRE_Int
 HYPRE_SStructSysPFMGSetPrintLevel( HYPRE_SStructSolver solver,
-                                HYPRE_Int         print_level )
+                                   HYPRE_Int         print_level )
 {
-   return( hypre_SysPFMGSetPrintLevel( (void *) solver, print_level) );
+   return ( hypre_SysPFMGSetPrintLevel( (void *) solver, print_level) );
 }
 
 /*--------------------------------------------------------------------------
@@ -192,7 +192,7 @@ HYPRE_Int
 HYPRE_SStructSysPFMGGetNumIterations( HYPRE_SStructSolver  solver,
                                       HYPRE_Int          *num_iterations )
 {
-   return( hypre_SysPFMGGetNumIterations( (void *) solver, num_iterations ) );
+   return ( hypre_SysPFMGGetNumIterations( (void *) solver, num_iterations ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -202,6 +202,6 @@ HYPRE_Int
 HYPRE_SStructSysPFMGGetFinalRelativeResidualNorm( HYPRE_SStructSolver  solver,
                                                   HYPRE_Real         *norm   )
 {
-   return( hypre_SysPFMGGetFinalRelativeResidualNorm( (void *) solver, norm ) );
+   return ( hypre_SysPFMGGetFinalRelativeResidualNorm( (void *) solver, norm ) );
 }
 
diff --git a/external/hypre/src/sstruct_ls/_hypre_sstruct_ls.h b/external/hypre/src/sstruct_ls/_hypre_sstruct_ls.h
index 9466fab4..3aeb553c 100644
--- a/external/hypre/src/sstruct_ls/_hypre_sstruct_ls.h
+++ b/external/hypre/src/sstruct_ls/_hypre_sstruct_ls.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -37,7 +37,7 @@ extern "C" {
 #define hypre_OWNINFODATA_HEADER
 
 
-typedef struct 
+typedef struct
 {
    HYPRE_Int             size;
 
@@ -71,7 +71,7 @@ typedef struct
 #define hypre_RECVINFODATA_HEADER
 
 
-typedef struct 
+typedef struct
 {
    HYPRE_Int             size;
 
@@ -88,7 +88,7 @@ typedef struct
 #define hypre_SENDINFODATA_HEADER
 
 
-typedef struct 
+typedef struct
 {
    HYPRE_Int             size;
 
@@ -101,13 +101,13 @@ typedef struct
 #endif
 typedef struct
 {
-    hypre_IJMatrix    *Face_iedge;
-    hypre_IJMatrix    *Element_iedge;
-    hypre_IJMatrix    *Edge_iedge;
-                                                                                                                            
-    hypre_IJMatrix    *Element_Face;
-    hypre_IJMatrix    *Element_Edge;
-                                                                                                                            
+   hypre_IJMatrix    *Face_iedge;
+   hypre_IJMatrix    *Element_iedge;
+   hypre_IJMatrix    *Edge_iedge;
+
+   hypre_IJMatrix    *Element_Face;
+   hypre_IJMatrix    *Element_Edge;
+
 } hypre_PTopology;
 
 /******************************************************************************
@@ -126,22 +126,22 @@ typedef struct
 typedef struct
 {
    MPI_Comm                comm;
-                      
+
    HYPRE_Real              tol;
    HYPRE_Int               max_iter;
    HYPRE_Int               rel_change;
    HYPRE_Int               zero_guess;
    HYPRE_Int               ndim;
-                      
+
    HYPRE_Int               num_pre_relax;  /* number of pre relaxation sweeps */
    HYPRE_Int               num_post_relax; /* number of post relaxation sweeps */
 
    HYPRE_Int               constant_coef;
-   
+
    hypre_Index            *rfactor;
 
    hypre_SStructGrid     **egrid_l;
-                    
+
    HYPRE_IJMatrix          Aen;
    hypre_ParCSRMatrix    **Aen_l;
 
@@ -173,8 +173,8 @@ typedef struct
    hypre_ParCSRMatrix     *T_transpose;
 
    /* edge data structure. These will have grids. */
-   HYPRE_Int               edge_maxlevels;  
-   HYPRE_Int               edge_numlevels;  
+   HYPRE_Int               edge_maxlevels;
+   HYPRE_Int               edge_numlevels;
    hypre_ParCSRMatrix    **Aee_l;
    hypre_ParVector       **be_l;
    hypre_ParVector       **xe_l;
@@ -212,445 +212,583 @@ typedef struct
 typedef struct
 {
    HYPRE_Int row;
-                                                                                                                                    
+
    HYPRE_Int ncols;
    HYPRE_BigInt *cols;
    HYPRE_Real   *data;
-                                                                                                                                    
+
 } hypre_MaxwellOffProcRow;
 
 
 /* eliminate_rowscols.c */
-HYPRE_Int hypre_ParCSRMatrixEliminateRowsCols ( hypre_ParCSRMatrix *A , HYPRE_Int nrows_to_eliminate , HYPRE_Int *rows_to_eliminate );
-HYPRE_Int hypre_CSRMatrixEliminateRowsColsDiag ( hypre_ParCSRMatrix *A , HYPRE_Int nrows_to_eliminate , HYPRE_Int *rows_to_eliminate );
-HYPRE_Int hypre_CSRMatrixEliminateRowsOffd ( hypre_ParCSRMatrix *A , HYPRE_Int nrows_to_eliminate , HYPRE_Int *rows_to_eliminate );
-HYPRE_Int hypre_CSRMatrixEliminateColsOffd ( hypre_CSRMatrix *Aoffd , HYPRE_Int ncols_to_eliminate , HYPRE_Int *cols_to_eliminate );
+HYPRE_Int hypre_ParCSRMatrixEliminateRowsCols ( hypre_ParCSRMatrix *A, HYPRE_Int nrows_to_eliminate,
+                                                HYPRE_Int *rows_to_eliminate );
+HYPRE_Int hypre_CSRMatrixEliminateRowsColsDiag ( hypre_ParCSRMatrix *A,
+                                                 HYPRE_Int nrows_to_eliminate, HYPRE_Int *rows_to_eliminate );
+HYPRE_Int hypre_CSRMatrixEliminateRowsOffd ( hypre_ParCSRMatrix *A, HYPRE_Int nrows_to_eliminate,
+                                             HYPRE_Int *rows_to_eliminate );
+HYPRE_Int hypre_CSRMatrixEliminateColsOffd ( hypre_CSRMatrix *Aoffd, HYPRE_Int ncols_to_eliminate,
+                                             HYPRE_Int *cols_to_eliminate );
 
 /* fac_amr_fcoarsen.c */
-HYPRE_Int hypre_AMR_FCoarsen ( hypre_SStructMatrix *A , hypre_SStructMatrix *fac_A , hypre_SStructPMatrix *A_crse , hypre_Index refine_factors , HYPRE_Int level );
+HYPRE_Int hypre_AMR_FCoarsen ( hypre_SStructMatrix *A, hypre_SStructMatrix *fac_A,
+                               hypre_SStructPMatrix *A_crse, hypre_Index refine_factors, HYPRE_Int level );
 
 /* fac_amr_rap.c */
-HYPRE_Int hypre_AMR_RAP ( hypre_SStructMatrix *A , hypre_Index *rfactors , hypre_SStructMatrix **fac_A_ptr );
+HYPRE_Int hypre_AMR_RAP ( hypre_SStructMatrix *A, hypre_Index *rfactors,
+                          hypre_SStructMatrix **fac_A_ptr );
 
 /* fac_amr_zero_data.c */
-HYPRE_Int hypre_ZeroAMRVectorData ( hypre_SStructVector *b , HYPRE_Int *plevels , hypre_Index *rfactors );
-HYPRE_Int hypre_ZeroAMRMatrixData ( hypre_SStructMatrix *A , HYPRE_Int part_crse , hypre_Index rfactors );
+HYPRE_Int hypre_ZeroAMRVectorData ( hypre_SStructVector *b, HYPRE_Int *plevels,
+                                    hypre_Index *rfactors );
+HYPRE_Int hypre_ZeroAMRMatrixData ( hypre_SStructMatrix *A, HYPRE_Int part_crse,
+                                    hypre_Index rfactors );
 
 /* fac.c */
 void *hypre_FACCreate ( MPI_Comm comm );
 HYPRE_Int hypre_FACDestroy2 ( void *fac_vdata );
-HYPRE_Int hypre_FACSetTol ( void *fac_vdata , HYPRE_Real tol );
-HYPRE_Int hypre_FACSetPLevels ( void *fac_vdata , HYPRE_Int nparts , HYPRE_Int *plevels );
-HYPRE_Int hypre_FACSetPRefinements ( void *fac_vdata , HYPRE_Int nparts , hypre_Index *prefinements);
-HYPRE_Int hypre_FACSetMaxLevels ( void *fac_vdata , HYPRE_Int nparts );
-HYPRE_Int hypre_FACSetMaxIter ( void *fac_vdata , HYPRE_Int max_iter );
-HYPRE_Int hypre_FACSetRelChange ( void *fac_vdata , HYPRE_Int rel_change );
-HYPRE_Int hypre_FACSetZeroGuess ( void *fac_vdata , HYPRE_Int zero_guess );
-HYPRE_Int hypre_FACSetRelaxType ( void *fac_vdata , HYPRE_Int relax_type );
-HYPRE_Int hypre_FACSetJacobiWeight ( void *fac_vdata , HYPRE_Real weight );
-HYPRE_Int hypre_FACSetNumPreSmooth ( void *fac_vdata , HYPRE_Int num_pre_smooth );
-HYPRE_Int hypre_FACSetNumPostSmooth ( void *fac_vdata , HYPRE_Int num_post_smooth );
-HYPRE_Int hypre_FACSetCoarseSolverType ( void *fac_vdata , HYPRE_Int csolver_type );
-HYPRE_Int hypre_FACSetLogging ( void *fac_vdata , HYPRE_Int logging );
-HYPRE_Int hypre_FACGetNumIterations ( void *fac_vdata , HYPRE_Int *num_iterations );
-HYPRE_Int hypre_FACPrintLogging ( void *fac_vdata , HYPRE_Int myid );
-HYPRE_Int hypre_FACGetFinalRelativeResidualNorm ( void *fac_vdata , HYPRE_Real *relative_residual_norm );
+HYPRE_Int hypre_FACSetTol ( void *fac_vdata, HYPRE_Real tol );
+HYPRE_Int hypre_FACSetPLevels ( void *fac_vdata, HYPRE_Int nparts, HYPRE_Int *plevels );
+HYPRE_Int hypre_FACSetPRefinements ( void *fac_vdata, HYPRE_Int nparts, hypre_Index *prefinements);
+HYPRE_Int hypre_FACSetMaxLevels ( void *fac_vdata, HYPRE_Int nparts );
+HYPRE_Int hypre_FACSetMaxIter ( void *fac_vdata, HYPRE_Int max_iter );
+HYPRE_Int hypre_FACSetRelChange ( void *fac_vdata, HYPRE_Int rel_change );
+HYPRE_Int hypre_FACSetZeroGuess ( void *fac_vdata, HYPRE_Int zero_guess );
+HYPRE_Int hypre_FACSetRelaxType ( void *fac_vdata, HYPRE_Int relax_type );
+HYPRE_Int hypre_FACSetJacobiWeight ( void *fac_vdata, HYPRE_Real weight );
+HYPRE_Int hypre_FACSetNumPreSmooth ( void *fac_vdata, HYPRE_Int num_pre_smooth );
+HYPRE_Int hypre_FACSetNumPostSmooth ( void *fac_vdata, HYPRE_Int num_post_smooth );
+HYPRE_Int hypre_FACSetCoarseSolverType ( void *fac_vdata, HYPRE_Int csolver_type );
+HYPRE_Int hypre_FACSetLogging ( void *fac_vdata, HYPRE_Int logging );
+HYPRE_Int hypre_FACGetNumIterations ( void *fac_vdata, HYPRE_Int *num_iterations );
+HYPRE_Int hypre_FACPrintLogging ( void *fac_vdata, HYPRE_Int myid );
+HYPRE_Int hypre_FACGetFinalRelativeResidualNorm ( void *fac_vdata,
+                                                  HYPRE_Real *relative_residual_norm );
 
 /* fac_cf_coarsen.c */
-HYPRE_Int hypre_AMR_CFCoarsen ( hypre_SStructMatrix *A , hypre_SStructMatrix *fac_A , hypre_Index refine_factors , HYPRE_Int level );
+HYPRE_Int hypre_AMR_CFCoarsen ( hypre_SStructMatrix *A, hypre_SStructMatrix *fac_A,
+                                hypre_Index refine_factors, HYPRE_Int level );
 
 /* fac_CFInterfaceExtents.c */
-hypre_BoxArray *hypre_CFInterfaceExtents ( hypre_Box *fgrid_box , hypre_Box *cgrid_box , hypre_StructStencil *stencils , hypre_Index rfactors );
-HYPRE_Int hypre_CFInterfaceExtents2 ( hypre_Box *fgrid_box , hypre_Box *cgrid_box , hypre_StructStencil *stencils , hypre_Index rfactors , hypre_BoxArray *cf_interface );
+hypre_BoxArray *hypre_CFInterfaceExtents ( hypre_Box *fgrid_box, hypre_Box *cgrid_box,
+                                           hypre_StructStencil *stencils, hypre_Index rfactors );
+HYPRE_Int hypre_CFInterfaceExtents2 ( hypre_Box *fgrid_box, hypre_Box *cgrid_box,
+                                      hypre_StructStencil *stencils, hypre_Index rfactors, hypre_BoxArray *cf_interface );
 
 /* fac_cfstencil_box.c */
-hypre_Box *hypre_CF_StenBox ( hypre_Box *fgrid_box , hypre_Box *cgrid_box , hypre_Index stencil_shape , hypre_Index rfactors , HYPRE_Int ndim );
+hypre_Box *hypre_CF_StenBox ( hypre_Box *fgrid_box, hypre_Box *cgrid_box, hypre_Index stencil_shape,
+                              hypre_Index rfactors, HYPRE_Int ndim );
 
 /* fac_interp2.c */
 HYPRE_Int hypre_FacSemiInterpCreate2 ( void **fac_interp_vdata_ptr );
 HYPRE_Int hypre_FacSemiInterpDestroy2 ( void *fac_interp_vdata );
-HYPRE_Int hypre_FacSemiInterpSetup2 ( void *fac_interp_vdata , hypre_SStructVector *e , hypre_SStructPVector *ec , hypre_Index rfactors );
-HYPRE_Int hypre_FAC_IdentityInterp2 ( void *fac_interp_vdata , hypre_SStructPVector *xc , hypre_SStructVector *e );
-HYPRE_Int hypre_FAC_WeightedInterp2 ( void *fac_interp_vdata , hypre_SStructPVector *xc , hypre_SStructVector *e_parts );
+HYPRE_Int hypre_FacSemiInterpSetup2 ( void *fac_interp_vdata, hypre_SStructVector *e,
+                                      hypre_SStructPVector *ec, hypre_Index rfactors );
+HYPRE_Int hypre_FAC_IdentityInterp2 ( void *fac_interp_vdata, hypre_SStructPVector *xc,
+                                      hypre_SStructVector *e );
+HYPRE_Int hypre_FAC_WeightedInterp2 ( void *fac_interp_vdata, hypre_SStructPVector *xc,
+                                      hypre_SStructVector *e_parts );
 
 /* fac_relax.c */
-HYPRE_Int hypre_FacLocalRelax ( void *relax_vdata , hypre_SStructPMatrix *A , hypre_SStructPVector *x , hypre_SStructPVector *b , HYPRE_Int num_relax , HYPRE_Int *zero_guess );
+HYPRE_Int hypre_FacLocalRelax ( void *relax_vdata, hypre_SStructPMatrix *A, hypre_SStructPVector *x,
+                                hypre_SStructPVector *b, HYPRE_Int num_relax, HYPRE_Int *zero_guess );
 
 /* fac_restrict2.c */
 HYPRE_Int hypre_FacSemiRestrictCreate2 ( void **fac_restrict_vdata_ptr );
-HYPRE_Int hypre_FacSemiRestrictSetup2 ( void *fac_restrict_vdata , hypre_SStructVector *r , HYPRE_Int part_crse , HYPRE_Int part_fine , hypre_SStructPVector *rc , hypre_Index rfactors );
-HYPRE_Int hypre_FACRestrict2 ( void *fac_restrict_vdata , hypre_SStructVector *xf , hypre_SStructPVector *xc );
+HYPRE_Int hypre_FacSemiRestrictSetup2 ( void *fac_restrict_vdata, hypre_SStructVector *r,
+                                        HYPRE_Int part_crse, HYPRE_Int part_fine, hypre_SStructPVector *rc, hypre_Index rfactors );
+HYPRE_Int hypre_FACRestrict2 ( void *fac_restrict_vdata, hypre_SStructVector *xf,
+                               hypre_SStructPVector *xc );
 HYPRE_Int hypre_FacSemiRestrictDestroy2 ( void *fac_restrict_vdata );
 
 /* fac_setup2.c */
-HYPRE_Int hypre_FacSetup2 ( void *fac_vdata , hypre_SStructMatrix *A_in , hypre_SStructVector *b , hypre_SStructVector *x );
+HYPRE_Int hypre_FacSetup2 ( void *fac_vdata, hypre_SStructMatrix *A_in, hypre_SStructVector *b,
+                            hypre_SStructVector *x );
 
 /* fac_solve3.c */
-HYPRE_Int hypre_FACSolve3 ( void *fac_vdata , hypre_SStructMatrix *A_user , hypre_SStructVector *b_in , hypre_SStructVector *x_in );
+HYPRE_Int hypre_FACSolve3 ( void *fac_vdata, hypre_SStructMatrix *A_user, hypre_SStructVector *b_in,
+                            hypre_SStructVector *x_in );
 
 /* fac_zero_cdata.c */
-HYPRE_Int hypre_FacZeroCData ( void *fac_vdata , hypre_SStructMatrix *A );
+HYPRE_Int hypre_FacZeroCData ( void *fac_vdata, hypre_SStructMatrix *A );
 
 /* fac_zero_stencilcoef.c */
-HYPRE_Int hypre_FacZeroCFSten ( hypre_SStructPMatrix *Af , hypre_SStructPMatrix *Ac , hypre_SStructGrid *grid , HYPRE_Int fine_part , hypre_Index rfactors );
-HYPRE_Int hypre_FacZeroFCSten ( hypre_SStructPMatrix *A , hypre_SStructGrid *grid , HYPRE_Int fine_part );
+HYPRE_Int hypre_FacZeroCFSten ( hypre_SStructPMatrix *Af, hypre_SStructPMatrix *Ac,
+                                hypre_SStructGrid *grid, HYPRE_Int fine_part, hypre_Index rfactors );
+HYPRE_Int hypre_FacZeroFCSten ( hypre_SStructPMatrix *A, hypre_SStructGrid *grid,
+                                HYPRE_Int fine_part );
 
 /* bsearch.c */
-HYPRE_Int hypre_LowerBinarySearch ( HYPRE_Int *list , HYPRE_Int value , HYPRE_Int list_length );
-HYPRE_Int hypre_UpperBinarySearch ( HYPRE_Int *list , HYPRE_Int value , HYPRE_Int list_length );
+HYPRE_Int hypre_LowerBinarySearch ( HYPRE_Int *list, HYPRE_Int value, HYPRE_Int list_length );
+HYPRE_Int hypre_UpperBinarySearch ( HYPRE_Int *list, HYPRE_Int value, HYPRE_Int list_length );
 
 /* maxwell_solve2.c */
-HYPRE_Int hypre_MaxwellSolve2 ( void *maxwell_vdata , hypre_SStructMatrix *A_in , hypre_SStructVector *f , hypre_SStructVector *u );
+HYPRE_Int hypre_MaxwellSolve2 ( void *maxwell_vdata, hypre_SStructMatrix *A_in,
+                                hypre_SStructVector *f, hypre_SStructVector *u );
 
 /* maxwell_solve.c */
-HYPRE_Int hypre_MaxwellSolve ( void *maxwell_vdata , hypre_SStructMatrix *A_in , hypre_SStructVector *f , hypre_SStructVector *u );
+HYPRE_Int hypre_MaxwellSolve ( void *maxwell_vdata, hypre_SStructMatrix *A_in,
+                               hypre_SStructVector *f, hypre_SStructVector *u );
 
 /* HYPRE_sstruct_bicgstab.c */
-HYPRE_Int HYPRE_SStructBiCGSTABCreate ( MPI_Comm comm , HYPRE_SStructSolver *solver );
+HYPRE_Int HYPRE_SStructBiCGSTABCreate ( MPI_Comm comm, HYPRE_SStructSolver *solver );
 HYPRE_Int HYPRE_SStructBiCGSTABDestroy ( HYPRE_SStructSolver solver );
-HYPRE_Int HYPRE_SStructBiCGSTABSetup ( HYPRE_SStructSolver solver , HYPRE_SStructMatrix A , HYPRE_SStructVector b , HYPRE_SStructVector x );
-HYPRE_Int HYPRE_SStructBiCGSTABSolve ( HYPRE_SStructSolver solver , HYPRE_SStructMatrix A , HYPRE_SStructVector b , HYPRE_SStructVector x );
-HYPRE_Int HYPRE_SStructBiCGSTABSetTol ( HYPRE_SStructSolver solver , HYPRE_Real tol );
-HYPRE_Int HYPRE_SStructBiCGSTABSetAbsoluteTol ( HYPRE_SStructSolver solver , HYPRE_Real tol );
-HYPRE_Int HYPRE_SStructBiCGSTABSetMinIter ( HYPRE_SStructSolver solver , HYPRE_Int min_iter );
-HYPRE_Int HYPRE_SStructBiCGSTABSetMaxIter ( HYPRE_SStructSolver solver , HYPRE_Int max_iter );
-HYPRE_Int HYPRE_SStructBiCGSTABSetStopCrit ( HYPRE_SStructSolver solver , HYPRE_Int stop_crit );
-HYPRE_Int HYPRE_SStructBiCGSTABSetPrecond ( HYPRE_SStructSolver solver , HYPRE_PtrToSStructSolverFcn precond , HYPRE_PtrToSStructSolverFcn precond_setup , void *precond_data );
-HYPRE_Int HYPRE_SStructBiCGSTABSetLogging ( HYPRE_SStructSolver solver , HYPRE_Int logging );
-HYPRE_Int HYPRE_SStructBiCGSTABSetPrintLevel ( HYPRE_SStructSolver solver , HYPRE_Int print_level );
-HYPRE_Int HYPRE_SStructBiCGSTABGetNumIterations ( HYPRE_SStructSolver solver , HYPRE_Int *num_iterations );
-HYPRE_Int HYPRE_SStructBiCGSTABGetFinalRelativeResidualNorm ( HYPRE_SStructSolver solver , HYPRE_Real *norm );
-HYPRE_Int HYPRE_SStructBiCGSTABGetResidual ( HYPRE_SStructSolver solver , void **residual );
+HYPRE_Int HYPRE_SStructBiCGSTABSetup ( HYPRE_SStructSolver solver, HYPRE_SStructMatrix A,
+                                       HYPRE_SStructVector b, HYPRE_SStructVector x );
+HYPRE_Int HYPRE_SStructBiCGSTABSolve ( HYPRE_SStructSolver solver, HYPRE_SStructMatrix A,
+                                       HYPRE_SStructVector b, HYPRE_SStructVector x );
+HYPRE_Int HYPRE_SStructBiCGSTABSetTol ( HYPRE_SStructSolver solver, HYPRE_Real tol );
+HYPRE_Int HYPRE_SStructBiCGSTABSetAbsoluteTol ( HYPRE_SStructSolver solver, HYPRE_Real tol );
+HYPRE_Int HYPRE_SStructBiCGSTABSetMinIter ( HYPRE_SStructSolver solver, HYPRE_Int min_iter );
+HYPRE_Int HYPRE_SStructBiCGSTABSetMaxIter ( HYPRE_SStructSolver solver, HYPRE_Int max_iter );
+HYPRE_Int HYPRE_SStructBiCGSTABSetStopCrit ( HYPRE_SStructSolver solver, HYPRE_Int stop_crit );
+HYPRE_Int HYPRE_SStructBiCGSTABSetPrecond ( HYPRE_SStructSolver solver,
+                                            HYPRE_PtrToSStructSolverFcn precond, HYPRE_PtrToSStructSolverFcn precond_setup,
+                                            void *precond_data );
+HYPRE_Int HYPRE_SStructBiCGSTABSetLogging ( HYPRE_SStructSolver solver, HYPRE_Int logging );
+HYPRE_Int HYPRE_SStructBiCGSTABSetPrintLevel ( HYPRE_SStructSolver solver, HYPRE_Int print_level );
+HYPRE_Int HYPRE_SStructBiCGSTABGetNumIterations ( HYPRE_SStructSolver solver,
+                                                  HYPRE_Int *num_iterations );
+HYPRE_Int HYPRE_SStructBiCGSTABGetFinalRelativeResidualNorm ( HYPRE_SStructSolver solver,
+                                                              HYPRE_Real *norm );
+HYPRE_Int HYPRE_SStructBiCGSTABGetResidual ( HYPRE_SStructSolver solver, void **residual );
 
 /* HYPRE_sstruct_flexgmres.c */
-HYPRE_Int HYPRE_SStructFlexGMRESCreate ( MPI_Comm comm , HYPRE_SStructSolver *solver );
+HYPRE_Int HYPRE_SStructFlexGMRESCreate ( MPI_Comm comm, HYPRE_SStructSolver *solver );
 HYPRE_Int HYPRE_SStructFlexGMRESDestroy ( HYPRE_SStructSolver solver );
-HYPRE_Int HYPRE_SStructFlexGMRESSetup ( HYPRE_SStructSolver solver , HYPRE_SStructMatrix A , HYPRE_SStructVector b , HYPRE_SStructVector x );
-HYPRE_Int HYPRE_SStructFlexGMRESSolve ( HYPRE_SStructSolver solver , HYPRE_SStructMatrix A , HYPRE_SStructVector b , HYPRE_SStructVector x );
-HYPRE_Int HYPRE_SStructFlexGMRESSetKDim ( HYPRE_SStructSolver solver , HYPRE_Int k_dim );
-HYPRE_Int HYPRE_SStructFlexGMRESSetTol ( HYPRE_SStructSolver solver , HYPRE_Real tol );
-HYPRE_Int HYPRE_SStructFlexGMRESSetAbsoluteTol ( HYPRE_SStructSolver solver , HYPRE_Real tol );
-HYPRE_Int HYPRE_SStructFlexGMRESSetMinIter ( HYPRE_SStructSolver solver , HYPRE_Int min_iter );
-HYPRE_Int HYPRE_SStructFlexGMRESSetMaxIter ( HYPRE_SStructSolver solver , HYPRE_Int max_iter );
-HYPRE_Int HYPRE_SStructFlexGMRESSetPrecond ( HYPRE_SStructSolver solver , HYPRE_PtrToSStructSolverFcn precond , HYPRE_PtrToSStructSolverFcn precond_setup , void *precond_data );
-HYPRE_Int HYPRE_SStructFlexGMRESSetLogging ( HYPRE_SStructSolver solver , HYPRE_Int logging );
-HYPRE_Int HYPRE_SStructFlexGMRESSetPrintLevel ( HYPRE_SStructSolver solver , HYPRE_Int level );
-HYPRE_Int HYPRE_SStructFlexGMRESGetNumIterations ( HYPRE_SStructSolver solver , HYPRE_Int *num_iterations );
-HYPRE_Int HYPRE_SStructFlexGMRESGetFinalRelativeResidualNorm ( HYPRE_SStructSolver solver , HYPRE_Real *norm );
-HYPRE_Int HYPRE_SStructFlexGMRESGetResidual ( HYPRE_SStructSolver solver , void **residual );
-HYPRE_Int HYPRE_SStructFlexGMRESSetModifyPC ( HYPRE_SStructSolver solver , HYPRE_PtrToModifyPCFcn modify_pc );
+HYPRE_Int HYPRE_SStructFlexGMRESSetup ( HYPRE_SStructSolver solver, HYPRE_SStructMatrix A,
+                                        HYPRE_SStructVector b, HYPRE_SStructVector x );
+HYPRE_Int HYPRE_SStructFlexGMRESSolve ( HYPRE_SStructSolver solver, HYPRE_SStructMatrix A,
+                                        HYPRE_SStructVector b, HYPRE_SStructVector x );
+HYPRE_Int HYPRE_SStructFlexGMRESSetKDim ( HYPRE_SStructSolver solver, HYPRE_Int k_dim );
+HYPRE_Int HYPRE_SStructFlexGMRESSetTol ( HYPRE_SStructSolver solver, HYPRE_Real tol );
+HYPRE_Int HYPRE_SStructFlexGMRESSetAbsoluteTol ( HYPRE_SStructSolver solver, HYPRE_Real tol );
+HYPRE_Int HYPRE_SStructFlexGMRESSetMinIter ( HYPRE_SStructSolver solver, HYPRE_Int min_iter );
+HYPRE_Int HYPRE_SStructFlexGMRESSetMaxIter ( HYPRE_SStructSolver solver, HYPRE_Int max_iter );
+HYPRE_Int HYPRE_SStructFlexGMRESSetPrecond ( HYPRE_SStructSolver solver,
+                                             HYPRE_PtrToSStructSolverFcn precond, HYPRE_PtrToSStructSolverFcn precond_setup,
+                                             void *precond_data );
+HYPRE_Int HYPRE_SStructFlexGMRESSetLogging ( HYPRE_SStructSolver solver, HYPRE_Int logging );
+HYPRE_Int HYPRE_SStructFlexGMRESSetPrintLevel ( HYPRE_SStructSolver solver, HYPRE_Int level );
+HYPRE_Int HYPRE_SStructFlexGMRESGetNumIterations ( HYPRE_SStructSolver solver,
+                                                   HYPRE_Int *num_iterations );
+HYPRE_Int HYPRE_SStructFlexGMRESGetFinalRelativeResidualNorm ( HYPRE_SStructSolver solver,
+                                                               HYPRE_Real *norm );
+HYPRE_Int HYPRE_SStructFlexGMRESGetResidual ( HYPRE_SStructSolver solver, void **residual );
+HYPRE_Int HYPRE_SStructFlexGMRESSetModifyPC ( HYPRE_SStructSolver solver,
+                                              HYPRE_PtrToModifyPCFcn modify_pc );
 
 /* HYPRE_sstruct_gmres.c */
-HYPRE_Int HYPRE_SStructGMRESCreate ( MPI_Comm comm , HYPRE_SStructSolver *solver );
+HYPRE_Int HYPRE_SStructGMRESCreate ( MPI_Comm comm, HYPRE_SStructSolver *solver );
 HYPRE_Int HYPRE_SStructGMRESDestroy ( HYPRE_SStructSolver solver );
-HYPRE_Int HYPRE_SStructGMRESSetup ( HYPRE_SStructSolver solver , HYPRE_SStructMatrix A , HYPRE_SStructVector b , HYPRE_SStructVector x );
-HYPRE_Int HYPRE_SStructGMRESSolve ( HYPRE_SStructSolver solver , HYPRE_SStructMatrix A , HYPRE_SStructVector b , HYPRE_SStructVector x );
-HYPRE_Int HYPRE_SStructGMRESSetKDim ( HYPRE_SStructSolver solver , HYPRE_Int k_dim );
-HYPRE_Int HYPRE_SStructGMRESSetTol ( HYPRE_SStructSolver solver , HYPRE_Real tol );
-HYPRE_Int HYPRE_SStructGMRESSetAbsoluteTol ( HYPRE_SStructSolver solver , HYPRE_Real atol );
-HYPRE_Int HYPRE_SStructGMRESSetMinIter ( HYPRE_SStructSolver solver , HYPRE_Int min_iter );
-HYPRE_Int HYPRE_SStructGMRESSetMaxIter ( HYPRE_SStructSolver solver , HYPRE_Int max_iter );
-HYPRE_Int HYPRE_SStructGMRESSetStopCrit ( HYPRE_SStructSolver solver , HYPRE_Int stop_crit );
-HYPRE_Int HYPRE_SStructGMRESSetPrecond ( HYPRE_SStructSolver solver , HYPRE_PtrToSStructSolverFcn precond , HYPRE_PtrToSStructSolverFcn precond_setup , void *precond_data );
-HYPRE_Int HYPRE_SStructGMRESSetLogging ( HYPRE_SStructSolver solver , HYPRE_Int logging );
-HYPRE_Int HYPRE_SStructGMRESSetPrintLevel ( HYPRE_SStructSolver solver , HYPRE_Int level );
-HYPRE_Int HYPRE_SStructGMRESGetNumIterations ( HYPRE_SStructSolver solver , HYPRE_Int *num_iterations );
-HYPRE_Int HYPRE_SStructGMRESGetFinalRelativeResidualNorm ( HYPRE_SStructSolver solver , HYPRE_Real *norm );
-HYPRE_Int HYPRE_SStructGMRESGetResidual ( HYPRE_SStructSolver solver , void **residual );
+HYPRE_Int HYPRE_SStructGMRESSetup ( HYPRE_SStructSolver solver, HYPRE_SStructMatrix A,
+                                    HYPRE_SStructVector b, HYPRE_SStructVector x );
+HYPRE_Int HYPRE_SStructGMRESSolve ( HYPRE_SStructSolver solver, HYPRE_SStructMatrix A,
+                                    HYPRE_SStructVector b, HYPRE_SStructVector x );
+HYPRE_Int HYPRE_SStructGMRESSetKDim ( HYPRE_SStructSolver solver, HYPRE_Int k_dim );
+HYPRE_Int HYPRE_SStructGMRESSetTol ( HYPRE_SStructSolver solver, HYPRE_Real tol );
+HYPRE_Int HYPRE_SStructGMRESSetAbsoluteTol ( HYPRE_SStructSolver solver, HYPRE_Real atol );
+HYPRE_Int HYPRE_SStructGMRESSetMinIter ( HYPRE_SStructSolver solver, HYPRE_Int min_iter );
+HYPRE_Int HYPRE_SStructGMRESSetMaxIter ( HYPRE_SStructSolver solver, HYPRE_Int max_iter );
+HYPRE_Int HYPRE_SStructGMRESSetStopCrit ( HYPRE_SStructSolver solver, HYPRE_Int stop_crit );
+HYPRE_Int HYPRE_SStructGMRESSetPrecond ( HYPRE_SStructSolver solver,
+                                         HYPRE_PtrToSStructSolverFcn precond, HYPRE_PtrToSStructSolverFcn precond_setup,
+                                         void *precond_data );
+HYPRE_Int HYPRE_SStructGMRESSetLogging ( HYPRE_SStructSolver solver, HYPRE_Int logging );
+HYPRE_Int HYPRE_SStructGMRESSetPrintLevel ( HYPRE_SStructSolver solver, HYPRE_Int level );
+HYPRE_Int HYPRE_SStructGMRESGetNumIterations ( HYPRE_SStructSolver solver,
+                                               HYPRE_Int *num_iterations );
+HYPRE_Int HYPRE_SStructGMRESGetFinalRelativeResidualNorm ( HYPRE_SStructSolver solver,
+                                                           HYPRE_Real *norm );
+HYPRE_Int HYPRE_SStructGMRESGetResidual ( HYPRE_SStructSolver solver, void **residual );
 
 /* HYPRE_sstruct_int.c */
-HYPRE_Int hypre_SStructPVectorSetRandomValues ( hypre_SStructPVector *pvector , HYPRE_Int seed );
-HYPRE_Int hypre_SStructVectorSetRandomValues ( hypre_SStructVector *vector , HYPRE_Int seed );
-HYPRE_Int hypre_SStructSetRandomValues ( void *v , HYPRE_Int seed );
+HYPRE_Int hypre_SStructPVectorSetRandomValues ( hypre_SStructPVector *pvector, HYPRE_Int seed );
+HYPRE_Int hypre_SStructVectorSetRandomValues ( hypre_SStructVector *vector, HYPRE_Int seed );
+HYPRE_Int hypre_SStructSetRandomValues ( void *v, HYPRE_Int seed );
 HYPRE_Int HYPRE_SStructSetupInterpreter ( mv_InterfaceInterpreter *i );
 HYPRE_Int HYPRE_SStructSetupMatvec ( HYPRE_MatvecFunctions *mv );
 
 /* HYPRE_sstruct_InterFAC.c */
-HYPRE_Int HYPRE_SStructFACCreate ( MPI_Comm comm , HYPRE_SStructSolver *solver );
+HYPRE_Int HYPRE_SStructFACCreate ( MPI_Comm comm, HYPRE_SStructSolver *solver );
 HYPRE_Int HYPRE_SStructFACDestroy2 ( HYPRE_SStructSolver solver );
-HYPRE_Int HYPRE_SStructFACAMR_RAP ( HYPRE_SStructMatrix A , HYPRE_Int (*rfactors )[HYPRE_MAXDIM] , HYPRE_SStructMatrix *fac_A );
-HYPRE_Int HYPRE_SStructFACSetup2 ( HYPRE_SStructSolver solver , HYPRE_SStructMatrix A , HYPRE_SStructVector b , HYPRE_SStructVector x );
-HYPRE_Int HYPRE_SStructFACSolve3 ( HYPRE_SStructSolver solver , HYPRE_SStructMatrix A , HYPRE_SStructVector b , HYPRE_SStructVector x );
-HYPRE_Int HYPRE_SStructFACSetTol ( HYPRE_SStructSolver solver , HYPRE_Real tol );
-HYPRE_Int HYPRE_SStructFACSetPLevels ( HYPRE_SStructSolver solver , HYPRE_Int nparts , HYPRE_Int *plevels );
-HYPRE_Int HYPRE_SStructFACZeroCFSten ( HYPRE_SStructMatrix A , HYPRE_SStructGrid grid , HYPRE_Int part , HYPRE_Int rfactors [HYPRE_MAXDIM]);
-HYPRE_Int HYPRE_SStructFACZeroFCSten ( HYPRE_SStructMatrix A , HYPRE_SStructGrid grid , HYPRE_Int part );
-HYPRE_Int HYPRE_SStructFACZeroAMRMatrixData ( HYPRE_SStructMatrix A , HYPRE_Int part_crse , HYPRE_Int rfactors [HYPRE_MAXDIM]);
-HYPRE_Int HYPRE_SStructFACZeroAMRVectorData ( HYPRE_SStructVector b , HYPRE_Int *plevels , HYPRE_Int (*rfactors )[HYPRE_MAXDIM]);
-HYPRE_Int HYPRE_SStructFACSetPRefinements ( HYPRE_SStructSolver solver , HYPRE_Int nparts , HYPRE_Int (*rfactors )[HYPRE_MAXDIM]);
-HYPRE_Int HYPRE_SStructFACSetMaxLevels ( HYPRE_SStructSolver solver , HYPRE_Int max_levels );
-HYPRE_Int HYPRE_SStructFACSetMaxIter ( HYPRE_SStructSolver solver , HYPRE_Int max_iter );
-HYPRE_Int HYPRE_SStructFACSetRelChange ( HYPRE_SStructSolver solver , HYPRE_Int rel_change );
+HYPRE_Int HYPRE_SStructFACAMR_RAP ( HYPRE_SStructMatrix A, HYPRE_Int (*rfactors )[HYPRE_MAXDIM],
+                                    HYPRE_SStructMatrix *fac_A );
+HYPRE_Int HYPRE_SStructFACSetup2 ( HYPRE_SStructSolver solver, HYPRE_SStructMatrix A,
+                                   HYPRE_SStructVector b, HYPRE_SStructVector x );
+HYPRE_Int HYPRE_SStructFACSolve3 ( HYPRE_SStructSolver solver, HYPRE_SStructMatrix A,
+                                   HYPRE_SStructVector b, HYPRE_SStructVector x );
+HYPRE_Int HYPRE_SStructFACSetTol ( HYPRE_SStructSolver solver, HYPRE_Real tol );
+HYPRE_Int HYPRE_SStructFACSetPLevels ( HYPRE_SStructSolver solver, HYPRE_Int nparts,
+                                       HYPRE_Int *plevels );
+HYPRE_Int HYPRE_SStructFACZeroCFSten ( HYPRE_SStructMatrix A, HYPRE_SStructGrid grid,
+                                       HYPRE_Int part, HYPRE_Int rfactors [HYPRE_MAXDIM]);
+HYPRE_Int HYPRE_SStructFACZeroFCSten ( HYPRE_SStructMatrix A, HYPRE_SStructGrid grid,
+                                       HYPRE_Int part );
+HYPRE_Int HYPRE_SStructFACZeroAMRMatrixData ( HYPRE_SStructMatrix A, HYPRE_Int part_crse,
+                                              HYPRE_Int rfactors [HYPRE_MAXDIM]);
+HYPRE_Int HYPRE_SStructFACZeroAMRVectorData ( HYPRE_SStructVector b, HYPRE_Int *plevels,
+                                              HYPRE_Int (*rfactors )[HYPRE_MAXDIM]);
+HYPRE_Int HYPRE_SStructFACSetPRefinements ( HYPRE_SStructSolver solver, HYPRE_Int nparts,
+                                            HYPRE_Int (*rfactors )[HYPRE_MAXDIM]);
+HYPRE_Int HYPRE_SStructFACSetMaxLevels ( HYPRE_SStructSolver solver, HYPRE_Int max_levels );
+HYPRE_Int HYPRE_SStructFACSetMaxIter ( HYPRE_SStructSolver solver, HYPRE_Int max_iter );
+HYPRE_Int HYPRE_SStructFACSetRelChange ( HYPRE_SStructSolver solver, HYPRE_Int rel_change );
 HYPRE_Int HYPRE_SStructFACSetZeroGuess ( HYPRE_SStructSolver solver );
 HYPRE_Int HYPRE_SStructFACSetNonZeroGuess ( HYPRE_SStructSolver solver );
-HYPRE_Int HYPRE_SStructFACSetRelaxType ( HYPRE_SStructSolver solver , HYPRE_Int relax_type );
-HYPRE_Int HYPRE_SStructFACSetJacobiWeight ( HYPRE_SStructSolver solver , HYPRE_Real weight );
-HYPRE_Int HYPRE_SStructFACSetNumPreRelax ( HYPRE_SStructSolver solver , HYPRE_Int num_pre_relax );
-HYPRE_Int HYPRE_SStructFACSetNumPostRelax ( HYPRE_SStructSolver solver , HYPRE_Int num_post_relax );
-HYPRE_Int HYPRE_SStructFACSetCoarseSolverType ( HYPRE_SStructSolver solver , HYPRE_Int csolver_type );
-HYPRE_Int HYPRE_SStructFACSetLogging ( HYPRE_SStructSolver solver , HYPRE_Int logging );
-HYPRE_Int HYPRE_SStructFACGetNumIterations ( HYPRE_SStructSolver solver , HYPRE_Int *num_iterations );
-HYPRE_Int HYPRE_SStructFACGetFinalRelativeResidualNorm ( HYPRE_SStructSolver solver , HYPRE_Real *norm );
+HYPRE_Int HYPRE_SStructFACSetRelaxType ( HYPRE_SStructSolver solver, HYPRE_Int relax_type );
+HYPRE_Int HYPRE_SStructFACSetJacobiWeight ( HYPRE_SStructSolver solver, HYPRE_Real weight );
+HYPRE_Int HYPRE_SStructFACSetNumPreRelax ( HYPRE_SStructSolver solver, HYPRE_Int num_pre_relax );
+HYPRE_Int HYPRE_SStructFACSetNumPostRelax ( HYPRE_SStructSolver solver, HYPRE_Int num_post_relax );
+HYPRE_Int HYPRE_SStructFACSetCoarseSolverType ( HYPRE_SStructSolver solver,
+                                                HYPRE_Int csolver_type );
+HYPRE_Int HYPRE_SStructFACSetLogging ( HYPRE_SStructSolver solver, HYPRE_Int logging );
+HYPRE_Int HYPRE_SStructFACGetNumIterations ( HYPRE_SStructSolver solver,
+                                             HYPRE_Int *num_iterations );
+HYPRE_Int HYPRE_SStructFACGetFinalRelativeResidualNorm ( HYPRE_SStructSolver solver,
+                                                         HYPRE_Real *norm );
 
 /* HYPRE_sstruct_lgmres.c */
-HYPRE_Int HYPRE_SStructLGMRESCreate ( MPI_Comm comm , HYPRE_SStructSolver *solver );
+HYPRE_Int HYPRE_SStructLGMRESCreate ( MPI_Comm comm, HYPRE_SStructSolver *solver );
 HYPRE_Int HYPRE_SStructLGMRESDestroy ( HYPRE_SStructSolver solver );
-HYPRE_Int HYPRE_SStructLGMRESSetup ( HYPRE_SStructSolver solver , HYPRE_SStructMatrix A , HYPRE_SStructVector b , HYPRE_SStructVector x );
-HYPRE_Int HYPRE_SStructLGMRESSolve ( HYPRE_SStructSolver solver , HYPRE_SStructMatrix A , HYPRE_SStructVector b , HYPRE_SStructVector x );
-HYPRE_Int HYPRE_SStructLGMRESSetKDim ( HYPRE_SStructSolver solver , HYPRE_Int k_dim );
-HYPRE_Int HYPRE_SStructLGMRESSetAugDim ( HYPRE_SStructSolver solver , HYPRE_Int aug_dim );
-HYPRE_Int HYPRE_SStructLGMRESSetTol ( HYPRE_SStructSolver solver , HYPRE_Real tol );
-HYPRE_Int HYPRE_SStructLGMRESSetAbsoluteTol ( HYPRE_SStructSolver solver , HYPRE_Real atol );
-HYPRE_Int HYPRE_SStructLGMRESSetMinIter ( HYPRE_SStructSolver solver , HYPRE_Int min_iter );
-HYPRE_Int HYPRE_SStructLGMRESSetMaxIter ( HYPRE_SStructSolver solver , HYPRE_Int max_iter );
-HYPRE_Int HYPRE_SStructLGMRESSetPrecond ( HYPRE_SStructSolver solver , HYPRE_PtrToSStructSolverFcn precond , HYPRE_PtrToSStructSolverFcn precond_setup , void *precond_data );
-HYPRE_Int HYPRE_SStructLGMRESSetLogging ( HYPRE_SStructSolver solver , HYPRE_Int logging );
-HYPRE_Int HYPRE_SStructLGMRESSetPrintLevel ( HYPRE_SStructSolver solver , HYPRE_Int level );
-HYPRE_Int HYPRE_SStructLGMRESGetNumIterations ( HYPRE_SStructSolver solver , HYPRE_Int *num_iterations );
-HYPRE_Int HYPRE_SStructLGMRESGetFinalRelativeResidualNorm ( HYPRE_SStructSolver solver , HYPRE_Real *norm );
-HYPRE_Int HYPRE_SStructLGMRESGetResidual ( HYPRE_SStructSolver solver , void **residual );
+HYPRE_Int HYPRE_SStructLGMRESSetup ( HYPRE_SStructSolver solver, HYPRE_SStructMatrix A,
+                                     HYPRE_SStructVector b, HYPRE_SStructVector x );
+HYPRE_Int HYPRE_SStructLGMRESSolve ( HYPRE_SStructSolver solver, HYPRE_SStructMatrix A,
+                                     HYPRE_SStructVector b, HYPRE_SStructVector x );
+HYPRE_Int HYPRE_SStructLGMRESSetKDim ( HYPRE_SStructSolver solver, HYPRE_Int k_dim );
+HYPRE_Int HYPRE_SStructLGMRESSetAugDim ( HYPRE_SStructSolver solver, HYPRE_Int aug_dim );
+HYPRE_Int HYPRE_SStructLGMRESSetTol ( HYPRE_SStructSolver solver, HYPRE_Real tol );
+HYPRE_Int HYPRE_SStructLGMRESSetAbsoluteTol ( HYPRE_SStructSolver solver, HYPRE_Real atol );
+HYPRE_Int HYPRE_SStructLGMRESSetMinIter ( HYPRE_SStructSolver solver, HYPRE_Int min_iter );
+HYPRE_Int HYPRE_SStructLGMRESSetMaxIter ( HYPRE_SStructSolver solver, HYPRE_Int max_iter );
+HYPRE_Int HYPRE_SStructLGMRESSetPrecond ( HYPRE_SStructSolver solver,
+                                          HYPRE_PtrToSStructSolverFcn precond, HYPRE_PtrToSStructSolverFcn precond_setup,
+                                          void *precond_data );
+HYPRE_Int HYPRE_SStructLGMRESSetLogging ( HYPRE_SStructSolver solver, HYPRE_Int logging );
+HYPRE_Int HYPRE_SStructLGMRESSetPrintLevel ( HYPRE_SStructSolver solver, HYPRE_Int level );
+HYPRE_Int HYPRE_SStructLGMRESGetNumIterations ( HYPRE_SStructSolver solver,
+                                                HYPRE_Int *num_iterations );
+HYPRE_Int HYPRE_SStructLGMRESGetFinalRelativeResidualNorm ( HYPRE_SStructSolver solver,
+                                                            HYPRE_Real *norm );
+HYPRE_Int HYPRE_SStructLGMRESGetResidual ( HYPRE_SStructSolver solver, void **residual );
 
 /* HYPRE_sstruct_maxwell.c */
-HYPRE_Int HYPRE_SStructMaxwellCreate ( MPI_Comm comm , HYPRE_SStructSolver *solver );
+HYPRE_Int HYPRE_SStructMaxwellCreate ( MPI_Comm comm, HYPRE_SStructSolver *solver );
 HYPRE_Int HYPRE_SStructMaxwellDestroy ( HYPRE_SStructSolver solver );
-HYPRE_Int HYPRE_SStructMaxwellSetup ( HYPRE_SStructSolver solver , HYPRE_SStructMatrix A , HYPRE_SStructVector b , HYPRE_SStructVector x );
-HYPRE_Int HYPRE_SStructMaxwellSolve ( HYPRE_SStructSolver solver , HYPRE_SStructMatrix A , HYPRE_SStructVector b , HYPRE_SStructVector x );
-HYPRE_Int HYPRE_SStructMaxwellSolve2 ( HYPRE_SStructSolver solver , HYPRE_SStructMatrix A , HYPRE_SStructVector b , HYPRE_SStructVector x );
-HYPRE_Int HYPRE_MaxwellGrad ( HYPRE_SStructGrid grid , HYPRE_ParCSRMatrix *T );
-HYPRE_Int HYPRE_SStructMaxwellSetGrad ( HYPRE_SStructSolver solver , HYPRE_ParCSRMatrix T );
-HYPRE_Int HYPRE_SStructMaxwellSetRfactors ( HYPRE_SStructSolver solver , HYPRE_Int rfactors [HYPRE_MAXDIM]);
-HYPRE_Int HYPRE_SStructMaxwellSetTol ( HYPRE_SStructSolver solver , HYPRE_Real tol );
-HYPRE_Int HYPRE_SStructMaxwellSetConstantCoef ( HYPRE_SStructSolver solver , HYPRE_Int constant_coef );
-HYPRE_Int HYPRE_SStructMaxwellSetMaxIter ( HYPRE_SStructSolver solver , HYPRE_Int max_iter );
-HYPRE_Int HYPRE_SStructMaxwellSetRelChange ( HYPRE_SStructSolver solver , HYPRE_Int rel_change );
-HYPRE_Int HYPRE_SStructMaxwellSetNumPreRelax ( HYPRE_SStructSolver solver , HYPRE_Int num_pre_relax );
-HYPRE_Int HYPRE_SStructMaxwellSetNumPostRelax ( HYPRE_SStructSolver solver , HYPRE_Int num_post_relax );
-HYPRE_Int HYPRE_SStructMaxwellSetLogging ( HYPRE_SStructSolver solver , HYPRE_Int logging );
-HYPRE_Int HYPRE_SStructMaxwellSetPrintLevel ( HYPRE_SStructSolver solver , HYPRE_Int print_level );
-HYPRE_Int HYPRE_SStructMaxwellPrintLogging ( HYPRE_SStructSolver solver , HYPRE_Int myid );
-HYPRE_Int HYPRE_SStructMaxwellGetNumIterations ( HYPRE_SStructSolver solver , HYPRE_Int *num_iterations );
-HYPRE_Int HYPRE_SStructMaxwellGetFinalRelativeResidualNorm ( HYPRE_SStructSolver solver , HYPRE_Real *norm );
-HYPRE_Int HYPRE_SStructMaxwellPhysBdy ( HYPRE_SStructGrid *grid_l , HYPRE_Int num_levels , HYPRE_Int rfactors [HYPRE_MAXDIM], HYPRE_Int ***BdryRanks_ptr , HYPRE_Int **BdryRanksCnt_ptr );
-HYPRE_Int HYPRE_SStructMaxwellEliminateRowsCols ( HYPRE_ParCSRMatrix parA , HYPRE_Int nrows , HYPRE_Int *rows );
-HYPRE_Int HYPRE_SStructMaxwellZeroVector ( HYPRE_ParVector v , HYPRE_Int *rows , HYPRE_Int nrows );
+HYPRE_Int HYPRE_SStructMaxwellSetup ( HYPRE_SStructSolver solver, HYPRE_SStructMatrix A,
+                                      HYPRE_SStructVector b, HYPRE_SStructVector x );
+HYPRE_Int HYPRE_SStructMaxwellSolve ( HYPRE_SStructSolver solver, HYPRE_SStructMatrix A,
+                                      HYPRE_SStructVector b, HYPRE_SStructVector x );
+HYPRE_Int HYPRE_SStructMaxwellSolve2 ( HYPRE_SStructSolver solver, HYPRE_SStructMatrix A,
+                                       HYPRE_SStructVector b, HYPRE_SStructVector x );
+HYPRE_Int HYPRE_MaxwellGrad ( HYPRE_SStructGrid grid, HYPRE_ParCSRMatrix *T );
+HYPRE_Int HYPRE_SStructMaxwellSetGrad ( HYPRE_SStructSolver solver, HYPRE_ParCSRMatrix T );
+HYPRE_Int HYPRE_SStructMaxwellSetRfactors ( HYPRE_SStructSolver solver,
+                                            HYPRE_Int *rfactors);
+HYPRE_Int HYPRE_SStructMaxwellSetTol ( HYPRE_SStructSolver solver, HYPRE_Real tol );
+HYPRE_Int HYPRE_SStructMaxwellSetConstantCoef ( HYPRE_SStructSolver solver,
+                                                HYPRE_Int constant_coef );
+HYPRE_Int HYPRE_SStructMaxwellSetMaxIter ( HYPRE_SStructSolver solver, HYPRE_Int max_iter );
+HYPRE_Int HYPRE_SStructMaxwellSetRelChange ( HYPRE_SStructSolver solver, HYPRE_Int rel_change );
+HYPRE_Int HYPRE_SStructMaxwellSetNumPreRelax ( HYPRE_SStructSolver solver,
+                                               HYPRE_Int num_pre_relax );
+HYPRE_Int HYPRE_SStructMaxwellSetNumPostRelax ( HYPRE_SStructSolver solver,
+                                                HYPRE_Int num_post_relax );
+HYPRE_Int HYPRE_SStructMaxwellSetLogging ( HYPRE_SStructSolver solver, HYPRE_Int logging );
+HYPRE_Int HYPRE_SStructMaxwellSetPrintLevel ( HYPRE_SStructSolver solver, HYPRE_Int print_level );
+HYPRE_Int HYPRE_SStructMaxwellPrintLogging ( HYPRE_SStructSolver solver, HYPRE_Int myid );
+HYPRE_Int HYPRE_SStructMaxwellGetNumIterations ( HYPRE_SStructSolver solver,
+                                                 HYPRE_Int *num_iterations );
+HYPRE_Int HYPRE_SStructMaxwellGetFinalRelativeResidualNorm ( HYPRE_SStructSolver solver,
+                                                             HYPRE_Real *norm );
+HYPRE_Int HYPRE_SStructMaxwellPhysBdy ( HYPRE_SStructGrid *grid_l, HYPRE_Int num_levels,
+                                        HYPRE_Int *rfactors, HYPRE_Int ***BdryRanks_ptr, HYPRE_Int **BdryRanksCnt_ptr );
+HYPRE_Int HYPRE_SStructMaxwellEliminateRowsCols ( HYPRE_ParCSRMatrix parA, HYPRE_Int nrows,
+                                                  HYPRE_Int *rows );
+HYPRE_Int HYPRE_SStructMaxwellZeroVector ( HYPRE_ParVector v, HYPRE_Int *rows, HYPRE_Int nrows );
 
 /* HYPRE_sstruct_pcg.c */
-HYPRE_Int HYPRE_SStructPCGCreate ( MPI_Comm comm , HYPRE_SStructSolver *solver );
+HYPRE_Int HYPRE_SStructPCGCreate ( MPI_Comm comm, HYPRE_SStructSolver *solver );
 HYPRE_Int HYPRE_SStructPCGDestroy ( HYPRE_SStructSolver solver );
-HYPRE_Int HYPRE_SStructPCGSetup ( HYPRE_SStructSolver solver , HYPRE_SStructMatrix A , HYPRE_SStructVector b , HYPRE_SStructVector x );
-HYPRE_Int HYPRE_SStructPCGSolve ( HYPRE_SStructSolver solver , HYPRE_SStructMatrix A , HYPRE_SStructVector b , HYPRE_SStructVector x );
-HYPRE_Int HYPRE_SStructPCGSetTol ( HYPRE_SStructSolver solver , HYPRE_Real tol );
-HYPRE_Int HYPRE_SStructPCGSetAbsoluteTol ( HYPRE_SStructSolver solver , HYPRE_Real tol );
-HYPRE_Int HYPRE_SStructPCGSetMaxIter ( HYPRE_SStructSolver solver , HYPRE_Int max_iter );
-HYPRE_Int HYPRE_SStructPCGSetTwoNorm ( HYPRE_SStructSolver solver , HYPRE_Int two_norm );
-HYPRE_Int HYPRE_SStructPCGSetRelChange ( HYPRE_SStructSolver solver , HYPRE_Int rel_change );
-HYPRE_Int HYPRE_SStructPCGSetPrecond ( HYPRE_SStructSolver solver , HYPRE_PtrToSStructSolverFcn precond , HYPRE_PtrToSStructSolverFcn precond_setup , void *precond_data );
-HYPRE_Int HYPRE_SStructPCGSetLogging ( HYPRE_SStructSolver solver , HYPRE_Int logging );
-HYPRE_Int HYPRE_SStructPCGSetPrintLevel ( HYPRE_SStructSolver solver , HYPRE_Int level );
-HYPRE_Int HYPRE_SStructPCGGetNumIterations ( HYPRE_SStructSolver solver , HYPRE_Int *num_iterations );
-HYPRE_Int HYPRE_SStructPCGGetFinalRelativeResidualNorm ( HYPRE_SStructSolver solver , HYPRE_Real *norm );
-HYPRE_Int HYPRE_SStructPCGGetResidual ( HYPRE_SStructSolver solver , void **residual );
-HYPRE_Int HYPRE_SStructDiagScaleSetup ( HYPRE_SStructSolver solver , HYPRE_SStructMatrix A , HYPRE_SStructVector y , HYPRE_SStructVector x );
-HYPRE_Int HYPRE_SStructDiagScale ( HYPRE_SStructSolver solver , HYPRE_SStructMatrix A , HYPRE_SStructVector y , HYPRE_SStructVector x );
+HYPRE_Int HYPRE_SStructPCGSetup ( HYPRE_SStructSolver solver, HYPRE_SStructMatrix A,
+                                  HYPRE_SStructVector b, HYPRE_SStructVector x );
+HYPRE_Int HYPRE_SStructPCGSolve ( HYPRE_SStructSolver solver, HYPRE_SStructMatrix A,
+                                  HYPRE_SStructVector b, HYPRE_SStructVector x );
+HYPRE_Int HYPRE_SStructPCGSetTol ( HYPRE_SStructSolver solver, HYPRE_Real tol );
+HYPRE_Int HYPRE_SStructPCGSetAbsoluteTol ( HYPRE_SStructSolver solver, HYPRE_Real tol );
+HYPRE_Int HYPRE_SStructPCGSetMaxIter ( HYPRE_SStructSolver solver, HYPRE_Int max_iter );
+HYPRE_Int HYPRE_SStructPCGSetTwoNorm ( HYPRE_SStructSolver solver, HYPRE_Int two_norm );
+HYPRE_Int HYPRE_SStructPCGSetRelChange ( HYPRE_SStructSolver solver, HYPRE_Int rel_change );
+HYPRE_Int HYPRE_SStructPCGSetPrecond ( HYPRE_SStructSolver solver,
+                                       HYPRE_PtrToSStructSolverFcn precond, HYPRE_PtrToSStructSolverFcn precond_setup,
+                                       void *precond_data );
+HYPRE_Int HYPRE_SStructPCGSetLogging ( HYPRE_SStructSolver solver, HYPRE_Int logging );
+HYPRE_Int HYPRE_SStructPCGSetPrintLevel ( HYPRE_SStructSolver solver, HYPRE_Int level );
+HYPRE_Int HYPRE_SStructPCGGetNumIterations ( HYPRE_SStructSolver solver,
+                                             HYPRE_Int *num_iterations );
+HYPRE_Int HYPRE_SStructPCGGetFinalRelativeResidualNorm ( HYPRE_SStructSolver solver,
+                                                         HYPRE_Real *norm );
+HYPRE_Int HYPRE_SStructPCGGetResidual ( HYPRE_SStructSolver solver, void **residual );
+HYPRE_Int HYPRE_SStructDiagScaleSetup ( HYPRE_SStructSolver solver, HYPRE_SStructMatrix A,
+                                        HYPRE_SStructVector y, HYPRE_SStructVector x );
+HYPRE_Int HYPRE_SStructDiagScale ( HYPRE_SStructSolver solver, HYPRE_SStructMatrix A,
+                                   HYPRE_SStructVector y, HYPRE_SStructVector x );
 
 /* HYPRE_sstruct_split.c */
-HYPRE_Int HYPRE_SStructSplitCreate ( MPI_Comm comm , HYPRE_SStructSolver *solver_ptr );
+HYPRE_Int HYPRE_SStructSplitCreate ( MPI_Comm comm, HYPRE_SStructSolver *solver_ptr );
 HYPRE_Int HYPRE_SStructSplitDestroy ( HYPRE_SStructSolver solver );
-HYPRE_Int HYPRE_SStructSplitSetup ( HYPRE_SStructSolver solver , HYPRE_SStructMatrix A , HYPRE_SStructVector b , HYPRE_SStructVector x );
-HYPRE_Int HYPRE_SStructSplitSolve ( HYPRE_SStructSolver solver , HYPRE_SStructMatrix A , HYPRE_SStructVector b , HYPRE_SStructVector x );
-HYPRE_Int HYPRE_SStructSplitSetTol ( HYPRE_SStructSolver solver , HYPRE_Real tol );
-HYPRE_Int HYPRE_SStructSplitSetMaxIter ( HYPRE_SStructSolver solver , HYPRE_Int max_iter );
+HYPRE_Int HYPRE_SStructSplitSetup ( HYPRE_SStructSolver solver, HYPRE_SStructMatrix A,
+                                    HYPRE_SStructVector b, HYPRE_SStructVector x );
+HYPRE_Int HYPRE_SStructSplitSolve ( HYPRE_SStructSolver solver, HYPRE_SStructMatrix A,
+                                    HYPRE_SStructVector b, HYPRE_SStructVector x );
+HYPRE_Int HYPRE_SStructSplitSetTol ( HYPRE_SStructSolver solver, HYPRE_Real tol );
+HYPRE_Int HYPRE_SStructSplitSetMaxIter ( HYPRE_SStructSolver solver, HYPRE_Int max_iter );
 HYPRE_Int HYPRE_SStructSplitSetZeroGuess ( HYPRE_SStructSolver solver );
 HYPRE_Int HYPRE_SStructSplitSetNonZeroGuess ( HYPRE_SStructSolver solver );
-HYPRE_Int HYPRE_SStructSplitSetStructSolver ( HYPRE_SStructSolver solver , HYPRE_Int ssolver );
-HYPRE_Int HYPRE_SStructSplitGetNumIterations ( HYPRE_SStructSolver solver , HYPRE_Int *num_iterations );
-HYPRE_Int HYPRE_SStructSplitGetFinalRelativeResidualNorm ( HYPRE_SStructSolver solver , HYPRE_Real *norm );
+HYPRE_Int HYPRE_SStructSplitSetStructSolver ( HYPRE_SStructSolver solver, HYPRE_Int ssolver );
+HYPRE_Int HYPRE_SStructSplitGetNumIterations ( HYPRE_SStructSolver solver,
+                                               HYPRE_Int *num_iterations );
+HYPRE_Int HYPRE_SStructSplitGetFinalRelativeResidualNorm ( HYPRE_SStructSolver solver,
+                                                           HYPRE_Real *norm );
 
 /* HYPRE_sstruct_sys_pfmg.c */
-HYPRE_Int HYPRE_SStructSysPFMGCreate ( MPI_Comm comm , HYPRE_SStructSolver *solver );
+HYPRE_Int HYPRE_SStructSysPFMGCreate ( MPI_Comm comm, HYPRE_SStructSolver *solver );
 HYPRE_Int HYPRE_SStructSysPFMGDestroy ( HYPRE_SStructSolver solver );
-HYPRE_Int HYPRE_SStructSysPFMGSetup ( HYPRE_SStructSolver solver , HYPRE_SStructMatrix A , HYPRE_SStructVector b , HYPRE_SStructVector x );
-HYPRE_Int HYPRE_SStructSysPFMGSolve ( HYPRE_SStructSolver solver , HYPRE_SStructMatrix A , HYPRE_SStructVector b , HYPRE_SStructVector x );
-HYPRE_Int HYPRE_SStructSysPFMGSetTol ( HYPRE_SStructSolver solver , HYPRE_Real tol );
-HYPRE_Int HYPRE_SStructSysPFMGSetMaxIter ( HYPRE_SStructSolver solver , HYPRE_Int max_iter );
-HYPRE_Int HYPRE_SStructSysPFMGSetRelChange ( HYPRE_SStructSolver solver , HYPRE_Int rel_change );
+HYPRE_Int HYPRE_SStructSysPFMGSetup ( HYPRE_SStructSolver solver, HYPRE_SStructMatrix A,
+                                      HYPRE_SStructVector b, HYPRE_SStructVector x );
+HYPRE_Int HYPRE_SStructSysPFMGSolve ( HYPRE_SStructSolver solver, HYPRE_SStructMatrix A,
+                                      HYPRE_SStructVector b, HYPRE_SStructVector x );
+HYPRE_Int HYPRE_SStructSysPFMGSetTol ( HYPRE_SStructSolver solver, HYPRE_Real tol );
+HYPRE_Int HYPRE_SStructSysPFMGSetMaxIter ( HYPRE_SStructSolver solver, HYPRE_Int max_iter );
+HYPRE_Int HYPRE_SStructSysPFMGSetRelChange ( HYPRE_SStructSolver solver, HYPRE_Int rel_change );
 HYPRE_Int HYPRE_SStructSysPFMGSetZeroGuess ( HYPRE_SStructSolver solver );
 HYPRE_Int HYPRE_SStructSysPFMGSetNonZeroGuess ( HYPRE_SStructSolver solver );
-HYPRE_Int HYPRE_SStructSysPFMGSetRelaxType ( HYPRE_SStructSolver solver , HYPRE_Int relax_type );
-HYPRE_Int HYPRE_SStructSysPFMGSetJacobiWeight ( HYPRE_SStructSolver solver , HYPRE_Real weight );
-HYPRE_Int HYPRE_SStructSysPFMGSetNumPreRelax ( HYPRE_SStructSolver solver , HYPRE_Int num_pre_relax );
-HYPRE_Int HYPRE_SStructSysPFMGSetNumPostRelax ( HYPRE_SStructSolver solver , HYPRE_Int num_post_relax );
-HYPRE_Int HYPRE_SStructSysPFMGSetSkipRelax ( HYPRE_SStructSolver solver , HYPRE_Int skip_relax );
-HYPRE_Int HYPRE_SStructSysPFMGSetDxyz ( HYPRE_SStructSolver solver , HYPRE_Real *dxyz );
-HYPRE_Int HYPRE_SStructSysPFMGSetLogging ( HYPRE_SStructSolver solver , HYPRE_Int logging );
-HYPRE_Int HYPRE_SStructSysPFMGSetPrintLevel ( HYPRE_SStructSolver solver , HYPRE_Int print_level );
-HYPRE_Int HYPRE_SStructSysPFMGGetNumIterations ( HYPRE_SStructSolver solver , HYPRE_Int *num_iterations );
-HYPRE_Int HYPRE_SStructSysPFMGGetFinalRelativeResidualNorm ( HYPRE_SStructSolver solver , HYPRE_Real *norm );
+HYPRE_Int HYPRE_SStructSysPFMGSetRelaxType ( HYPRE_SStructSolver solver, HYPRE_Int relax_type );
+HYPRE_Int HYPRE_SStructSysPFMGSetJacobiWeight ( HYPRE_SStructSolver solver, HYPRE_Real weight );
+HYPRE_Int HYPRE_SStructSysPFMGSetNumPreRelax ( HYPRE_SStructSolver solver,
+                                               HYPRE_Int num_pre_relax );
+HYPRE_Int HYPRE_SStructSysPFMGSetNumPostRelax ( HYPRE_SStructSolver solver,
+                                                HYPRE_Int num_post_relax );
+HYPRE_Int HYPRE_SStructSysPFMGSetSkipRelax ( HYPRE_SStructSolver solver, HYPRE_Int skip_relax );
+HYPRE_Int HYPRE_SStructSysPFMGSetDxyz ( HYPRE_SStructSolver solver, HYPRE_Real *dxyz );
+HYPRE_Int HYPRE_SStructSysPFMGSetLogging ( HYPRE_SStructSolver solver, HYPRE_Int logging );
+HYPRE_Int HYPRE_SStructSysPFMGSetPrintLevel ( HYPRE_SStructSolver solver, HYPRE_Int print_level );
+HYPRE_Int HYPRE_SStructSysPFMGGetNumIterations ( HYPRE_SStructSolver solver,
+                                                 HYPRE_Int *num_iterations );
+HYPRE_Int HYPRE_SStructSysPFMGGetFinalRelativeResidualNorm ( HYPRE_SStructSolver solver,
+                                                             HYPRE_Real *norm );
 
 /* krylov.c */
-HYPRE_Int hypre_SStructKrylovIdentitySetup ( void *vdata , void *A , void *b , void *x );
-HYPRE_Int hypre_SStructKrylovIdentity ( void *vdata , void *A , void *b , void *x );
+HYPRE_Int hypre_SStructKrylovIdentitySetup ( void *vdata, void *A, void *b, void *x );
+HYPRE_Int hypre_SStructKrylovIdentity ( void *vdata, void *A, void *b, void *x );
 
 /* krylov_sstruct.c */
 void *hypre_SStructKrylovCAlloc ( size_t count, size_t elt_size, HYPRE_MemoryLocation location );
 HYPRE_Int hypre_SStructKrylovFree ( void *ptr );
 void *hypre_SStructKrylovCreateVector ( void *vvector );
-void *hypre_SStructKrylovCreateVectorArray ( HYPRE_Int n , void *vvector );
+void *hypre_SStructKrylovCreateVectorArray ( HYPRE_Int n, void *vvector );
 HYPRE_Int hypre_SStructKrylovDestroyVector ( void *vvector );
-void *hypre_SStructKrylovMatvecCreate ( void *A , void *x );
-HYPRE_Int hypre_SStructKrylovMatvec ( void *matvec_data , HYPRE_Complex alpha , void *A , void *x , HYPRE_Complex beta , void *y );
+void *hypre_SStructKrylovMatvecCreate ( void *A, void *x );
+HYPRE_Int hypre_SStructKrylovMatvec ( void *matvec_data, HYPRE_Complex alpha, void *A, void *x,
+                                      HYPRE_Complex beta, void *y );
 HYPRE_Int hypre_SStructKrylovMatvecDestroy ( void *matvec_data );
-HYPRE_Real hypre_SStructKrylovInnerProd ( void *x , void *y );
-HYPRE_Int hypre_SStructKrylovCopyVector ( void *x , void *y );
+HYPRE_Real hypre_SStructKrylovInnerProd ( void *x, void *y );
+HYPRE_Int hypre_SStructKrylovCopyVector ( void *x, void *y );
 HYPRE_Int hypre_SStructKrylovClearVector ( void *x );
-HYPRE_Int hypre_SStructKrylovScaleVector ( HYPRE_Complex alpha , void *x );
-HYPRE_Int hypre_SStructKrylovAxpy ( HYPRE_Complex alpha , void *x , void *y );
-HYPRE_Int hypre_SStructKrylovCommInfo ( void *A , HYPRE_Int *my_id , HYPRE_Int *num_procs );
+HYPRE_Int hypre_SStructKrylovScaleVector ( HYPRE_Complex alpha, void *x );
+HYPRE_Int hypre_SStructKrylovAxpy ( HYPRE_Complex alpha, void *x, void *y );
+HYPRE_Int hypre_SStructKrylovCommInfo ( void *A, HYPRE_Int *my_id, HYPRE_Int *num_procs );
 
 /* maxwell_grad.c */
 hypre_ParCSRMatrix *hypre_Maxwell_Grad ( hypre_SStructGrid *grid );
 
 /* maxwell_physbdy.c */
-HYPRE_Int hypre_Maxwell_PhysBdy ( hypre_SStructGrid **grid_l , HYPRE_Int num_levels , hypre_Index rfactors , HYPRE_Int ***BdryRanksl_ptr , HYPRE_Int **BdryRanksCntsl_ptr );
-HYPRE_Int hypre_Maxwell_VarBdy ( hypre_SStructPGrid *pgrid , hypre_BoxArrayArray **bdry );
+HYPRE_Int hypre_Maxwell_PhysBdy ( hypre_SStructGrid **grid_l, HYPRE_Int num_levels,
+                                  hypre_Index rfactors, HYPRE_Int ***BdryRanksl_ptr, HYPRE_Int **BdryRanksCntsl_ptr );
+HYPRE_Int hypre_Maxwell_VarBdy ( hypre_SStructPGrid *pgrid, hypre_BoxArrayArray **bdry );
 
 /* maxwell_PNedelec_bdy.c */
-HYPRE_Int hypre_Maxwell_PNedelec_Bdy ( hypre_StructGrid *cell_grid , hypre_SStructPGrid *pgrid , hypre_BoxArrayArray ****bdry_ptr );
+HYPRE_Int hypre_Maxwell_PNedelec_Bdy ( hypre_StructGrid *cell_grid, hypre_SStructPGrid *pgrid,
+                                       hypre_BoxArrayArray ****bdry_ptr );
 
 /* maxwell_PNedelec.c */
-hypre_IJMatrix *hypre_Maxwell_PNedelec ( hypre_SStructGrid *fgrid_edge , hypre_SStructGrid *cgrid_edge , hypre_Index rfactor );
+hypre_IJMatrix *hypre_Maxwell_PNedelec ( hypre_SStructGrid *fgrid_edge,
+                                         hypre_SStructGrid *cgrid_edge, hypre_Index rfactor );
 
 /* maxwell_semi_interp.c */
 HYPRE_Int hypre_CreatePTopology ( void **PTopology_vdata_ptr );
 HYPRE_Int hypre_DestroyPTopology ( void *PTopology_vdata );
-hypre_IJMatrix *hypre_Maxwell_PTopology ( hypre_SStructGrid *fgrid_edge , hypre_SStructGrid *cgrid_edge , hypre_SStructGrid *fgrid_face , hypre_SStructGrid *cgrid_face , hypre_SStructGrid *fgrid_element , hypre_SStructGrid *cgrid_element , hypre_ParCSRMatrix *Aee , hypre_Index rfactor , void *PTopology_vdata );
-HYPRE_Int hypre_CollapseStencilToStencil ( hypre_ParCSRMatrix *Aee , hypre_SStructGrid *grid , HYPRE_Int part , HYPRE_Int var , hypre_Index pt_location , HYPRE_Int collapse_dir , HYPRE_Int new_stencil_dir , HYPRE_Real **collapsed_vals_ptr );
-HYPRE_Int hypre_TriDiagSolve ( HYPRE_Real *diag , HYPRE_Real *upper , HYPRE_Real *lower , HYPRE_Real *rhs , HYPRE_Int size );
+hypre_IJMatrix *hypre_Maxwell_PTopology ( hypre_SStructGrid *fgrid_edge,
+                                          hypre_SStructGrid *cgrid_edge, hypre_SStructGrid *fgrid_face, hypre_SStructGrid *cgrid_face,
+                                          hypre_SStructGrid *fgrid_element, hypre_SStructGrid *cgrid_element, hypre_ParCSRMatrix *Aee,
+                                          hypre_Index rfactor, void *PTopology_vdata );
+HYPRE_Int hypre_CollapseStencilToStencil ( hypre_ParCSRMatrix *Aee, hypre_SStructGrid *grid,
+                                           HYPRE_Int part, HYPRE_Int var, hypre_Index pt_location, HYPRE_Int collapse_dir,
+                                           HYPRE_Int new_stencil_dir, HYPRE_Real **collapsed_vals_ptr );
+HYPRE_Int hypre_TriDiagSolve ( HYPRE_Real *diag, HYPRE_Real *upper, HYPRE_Real *lower,
+                               HYPRE_Real *rhs, HYPRE_Int size );
 
 /* maxwell_TV.c */
 void *hypre_MaxwellTVCreate ( MPI_Comm comm );
 HYPRE_Int hypre_MaxwellTVDestroy ( void *maxwell_vdata );
-HYPRE_Int hypre_MaxwellSetRfactors ( void *maxwell_vdata , HYPRE_Int rfactor [HYPRE_MAXDIM]);
-HYPRE_Int hypre_MaxwellSetGrad ( void *maxwell_vdata , hypre_ParCSRMatrix *T );
-HYPRE_Int hypre_MaxwellSetConstantCoef ( void *maxwell_vdata , HYPRE_Int constant_coef );
-HYPRE_Int hypre_MaxwellSetTol ( void *maxwell_vdata , HYPRE_Real tol );
-HYPRE_Int hypre_MaxwellSetMaxIter ( void *maxwell_vdata , HYPRE_Int max_iter );
-HYPRE_Int hypre_MaxwellSetRelChange ( void *maxwell_vdata , HYPRE_Int rel_change );
-HYPRE_Int hypre_MaxwellSetNumPreRelax ( void *maxwell_vdata , HYPRE_Int num_pre_relax );
-HYPRE_Int hypre_MaxwellSetNumPostRelax ( void *maxwell_vdata , HYPRE_Int num_post_relax );
-HYPRE_Int hypre_MaxwellGetNumIterations ( void *maxwell_vdata , HYPRE_Int *num_iterations );
-HYPRE_Int hypre_MaxwellSetPrintLevel ( void *maxwell_vdata , HYPRE_Int print_level );
-HYPRE_Int hypre_MaxwellSetLogging ( void *maxwell_vdata , HYPRE_Int logging );
-HYPRE_Int hypre_MaxwellPrintLogging ( void *maxwell_vdata , HYPRE_Int myid );
-HYPRE_Int hypre_MaxwellGetFinalRelativeResidualNorm ( void *maxwell_vdata , HYPRE_Real *relative_residual_norm );
+HYPRE_Int hypre_MaxwellSetRfactors ( void *maxwell_vdata, HYPRE_Int rfactor [HYPRE_MAXDIM]);
+HYPRE_Int hypre_MaxwellSetGrad ( void *maxwell_vdata, hypre_ParCSRMatrix *T );
+HYPRE_Int hypre_MaxwellSetConstantCoef ( void *maxwell_vdata, HYPRE_Int constant_coef );
+HYPRE_Int hypre_MaxwellSetTol ( void *maxwell_vdata, HYPRE_Real tol );
+HYPRE_Int hypre_MaxwellSetMaxIter ( void *maxwell_vdata, HYPRE_Int max_iter );
+HYPRE_Int hypre_MaxwellSetRelChange ( void *maxwell_vdata, HYPRE_Int rel_change );
+HYPRE_Int hypre_MaxwellSetNumPreRelax ( void *maxwell_vdata, HYPRE_Int num_pre_relax );
+HYPRE_Int hypre_MaxwellSetNumPostRelax ( void *maxwell_vdata, HYPRE_Int num_post_relax );
+HYPRE_Int hypre_MaxwellGetNumIterations ( void *maxwell_vdata, HYPRE_Int *num_iterations );
+HYPRE_Int hypre_MaxwellSetPrintLevel ( void *maxwell_vdata, HYPRE_Int print_level );
+HYPRE_Int hypre_MaxwellSetLogging ( void *maxwell_vdata, HYPRE_Int logging );
+HYPRE_Int hypre_MaxwellPrintLogging ( void *maxwell_vdata, HYPRE_Int myid );
+HYPRE_Int hypre_MaxwellGetFinalRelativeResidualNorm ( void *maxwell_vdata,
+                                                      HYPRE_Real *relative_residual_norm );
 
 /* maxwell_TV_setup.c */
-HYPRE_Int hypre_MaxwellTV_Setup ( void *maxwell_vdata , hypre_SStructMatrix *Aee_in , hypre_SStructVector *b_in , hypre_SStructVector *x_in );
-HYPRE_Int hypre_CoarsenPGrid ( hypre_SStructGrid *fgrid , hypre_Index index , hypre_Index stride , HYPRE_Int part , hypre_SStructGrid *cgrid , HYPRE_Int *nboxes );
-hypre_Box *hypre_BoxContraction ( hypre_Box *box , hypre_StructGrid *sgrid , hypre_Index rfactor );
+HYPRE_Int hypre_MaxwellTV_Setup ( void *maxwell_vdata, hypre_SStructMatrix *Aee_in,
+                                  hypre_SStructVector *b_in, hypre_SStructVector *x_in );
+HYPRE_Int hypre_CoarsenPGrid ( hypre_SStructGrid *fgrid, hypre_Index index, hypre_Index stride,
+                               HYPRE_Int part, hypre_SStructGrid *cgrid, HYPRE_Int *nboxes );
+hypre_Box *hypre_BoxContraction ( hypre_Box *box, hypre_StructGrid *sgrid, hypre_Index rfactor );
 
 /* maxwell_zeroBC.c */
-HYPRE_Int hypre_ParVectorZeroBCValues ( hypre_ParVector *v , HYPRE_Int *rows , HYPRE_Int nrows );
-HYPRE_Int hypre_SeqVectorZeroBCValues ( hypre_Vector *v , HYPRE_Int *rows , HYPRE_Int nrows );
+HYPRE_Int hypre_ParVectorZeroBCValues ( hypre_ParVector *v, HYPRE_Int *rows, HYPRE_Int nrows );
+HYPRE_Int hypre_SeqVectorZeroBCValues ( hypre_Vector *v, HYPRE_Int *rows, HYPRE_Int nrows );
 
 /* nd1_amge_interpolation.c */
-HYPRE_Int hypre_ND1AMGeInterpolation ( hypre_ParCSRMatrix *Aee , hypre_ParCSRMatrix *ELEM_idof , hypre_ParCSRMatrix *FACE_idof , hypre_ParCSRMatrix *EDGE_idof , hypre_ParCSRMatrix *ELEM_FACE , hypre_ParCSRMatrix *ELEM_EDGE , HYPRE_Int num_OffProcRows , hypre_MaxwellOffProcRow **OffProcRows , hypre_IJMatrix *IJ_dof_DOF );
-HYPRE_Int hypre_HarmonicExtension ( hypre_CSRMatrix *A , hypre_CSRMatrix *P , HYPRE_Int num_DOF , HYPRE_BigInt *DOF , HYPRE_Int num_idof , HYPRE_BigInt *idof , HYPRE_Int num_bdof , HYPRE_BigInt *bdof );
+HYPRE_Int hypre_ND1AMGeInterpolation ( hypre_ParCSRMatrix *Aee, hypre_ParCSRMatrix *ELEM_idof,
+                                       hypre_ParCSRMatrix *FACE_idof, hypre_ParCSRMatrix *EDGE_idof, hypre_ParCSRMatrix *ELEM_FACE,
+                                       hypre_ParCSRMatrix *ELEM_EDGE, HYPRE_Int num_OffProcRows, hypre_MaxwellOffProcRow **OffProcRows,
+                                       hypre_IJMatrix *IJ_dof_DOF );
+HYPRE_Int hypre_HarmonicExtension ( hypre_CSRMatrix *A, hypre_CSRMatrix *P, HYPRE_Int num_DOF,
+                                    HYPRE_BigInt *DOF, HYPRE_Int num_idof, HYPRE_BigInt *idof, HYPRE_Int num_bdof, HYPRE_BigInt *bdof );
 
 /* node_relax.c */
 void *hypre_NodeRelaxCreate ( MPI_Comm comm );
 HYPRE_Int hypre_NodeRelaxDestroy ( void *relax_vdata );
-HYPRE_Int hypre_NodeRelaxSetup ( void *relax_vdata , hypre_SStructPMatrix *A , hypre_SStructPVector *b , hypre_SStructPVector *x );
-HYPRE_Int hypre_NodeRelax ( void *relax_vdata , hypre_SStructPMatrix *A , hypre_SStructPVector *b , hypre_SStructPVector *x );
-HYPRE_Int hypre_NodeRelaxSetTol ( void *relax_vdata , HYPRE_Real tol );
-HYPRE_Int hypre_NodeRelaxSetMaxIter ( void *relax_vdata , HYPRE_Int max_iter );
-HYPRE_Int hypre_NodeRelaxSetZeroGuess ( void *relax_vdata , HYPRE_Int zero_guess );
-HYPRE_Int hypre_NodeRelaxSetWeight ( void *relax_vdata , HYPRE_Real weight );
-HYPRE_Int hypre_NodeRelaxSetNumNodesets ( void *relax_vdata , HYPRE_Int num_nodesets );
-HYPRE_Int hypre_NodeRelaxSetNodeset ( void *relax_vdata , HYPRE_Int nodeset , HYPRE_Int nodeset_size , hypre_Index nodeset_stride , hypre_Index *nodeset_indices );
-HYPRE_Int hypre_NodeRelaxSetNodesetRank ( void *relax_vdata , HYPRE_Int nodeset , HYPRE_Int nodeset_rank );
-HYPRE_Int hypre_NodeRelaxSetTempVec ( void *relax_vdata , hypre_SStructPVector *t );
+HYPRE_Int hypre_NodeRelaxSetup ( void *relax_vdata, hypre_SStructPMatrix *A,
+                                 hypre_SStructPVector *b, hypre_SStructPVector *x );
+HYPRE_Int hypre_NodeRelax ( void *relax_vdata, hypre_SStructPMatrix *A, hypre_SStructPVector *b,
+                            hypre_SStructPVector *x );
+HYPRE_Int hypre_NodeRelaxSetTol ( void *relax_vdata, HYPRE_Real tol );
+HYPRE_Int hypre_NodeRelaxSetMaxIter ( void *relax_vdata, HYPRE_Int max_iter );
+HYPRE_Int hypre_NodeRelaxSetZeroGuess ( void *relax_vdata, HYPRE_Int zero_guess );
+HYPRE_Int hypre_NodeRelaxSetWeight ( void *relax_vdata, HYPRE_Real weight );
+HYPRE_Int hypre_NodeRelaxSetNumNodesets ( void *relax_vdata, HYPRE_Int num_nodesets );
+HYPRE_Int hypre_NodeRelaxSetNodeset ( void *relax_vdata, HYPRE_Int nodeset, HYPRE_Int nodeset_size,
+                                      hypre_Index nodeset_stride, hypre_Index *nodeset_indices );
+HYPRE_Int hypre_NodeRelaxSetNodesetRank ( void *relax_vdata, HYPRE_Int nodeset,
+                                          HYPRE_Int nodeset_rank );
+HYPRE_Int hypre_NodeRelaxSetTempVec ( void *relax_vdata, hypre_SStructPVector *t );
 
 /* sstruct_amr_intercommunication.c */
-HYPRE_Int hypre_SStructAMRInterCommunication ( hypre_SStructSendInfoData *sendinfo , hypre_SStructRecvInfoData *recvinfo , hypre_BoxArray *send_data_space , hypre_BoxArray *recv_data_space , HYPRE_Int num_values , MPI_Comm comm , hypre_CommPkg **comm_pkg_ptr );
+HYPRE_Int hypre_SStructAMRInterCommunication ( hypre_SStructSendInfoData *sendinfo,
+                                               hypre_SStructRecvInfoData *recvinfo, hypre_BoxArray *send_data_space,
+                                               hypre_BoxArray *recv_data_space, HYPRE_Int num_values, MPI_Comm comm,
+                                               hypre_CommPkg **comm_pkg_ptr );
 
 /* sstruct_owninfo.c */
-HYPRE_Int hypre_SStructIndexScaleF_C ( hypre_Index findex , hypre_Index index , hypre_Index stride , hypre_Index cindex );
-HYPRE_Int hypre_SStructIndexScaleC_F ( hypre_Index cindex , hypre_Index index , hypre_Index stride , hypre_Index findex );
-hypre_SStructOwnInfoData *hypre_SStructOwnInfo ( hypre_StructGrid *fgrid , hypre_StructGrid *cgrid , hypre_BoxManager *cboxman , hypre_BoxManager *fboxman , hypre_Index rfactor );
+HYPRE_Int hypre_SStructIndexScaleF_C ( hypre_Index findex, hypre_Index index, hypre_Index stride,
+                                       hypre_Index cindex );
+HYPRE_Int hypre_SStructIndexScaleC_F ( hypre_Index cindex, hypre_Index index, hypre_Index stride,
+                                       hypre_Index findex );
+hypre_SStructOwnInfoData *hypre_SStructOwnInfo ( hypre_StructGrid *fgrid, hypre_StructGrid *cgrid,
+                                                 hypre_BoxManager *cboxman, hypre_BoxManager *fboxman, hypre_Index rfactor );
 HYPRE_Int hypre_SStructOwnInfoDataDestroy ( hypre_SStructOwnInfoData *owninfo_data );
 
 /* sstruct_recvinfo.c */
-hypre_SStructRecvInfoData *hypre_SStructRecvInfo ( hypre_StructGrid *cgrid , hypre_BoxManager *fboxman , hypre_Index rfactor );
+hypre_SStructRecvInfoData *hypre_SStructRecvInfo ( hypre_StructGrid *cgrid,
+                                                   hypre_BoxManager *fboxman, hypre_Index rfactor );
 HYPRE_Int hypre_SStructRecvInfoDataDestroy ( hypre_SStructRecvInfoData *recvinfo_data );
 
 /* sstruct_sendinfo.c */
-hypre_SStructSendInfoData *hypre_SStructSendInfo ( hypre_StructGrid *fgrid , hypre_BoxManager *cboxman , hypre_Index rfactor );
+hypre_SStructSendInfoData *hypre_SStructSendInfo ( hypre_StructGrid *fgrid,
+                                                   hypre_BoxManager *cboxman, hypre_Index rfactor );
 HYPRE_Int hypre_SStructSendInfoDataDestroy ( hypre_SStructSendInfoData *sendinfo_data );
 
 /* sstruct_sharedDOFComm.c */
 hypre_MaxwellOffProcRow *hypre_MaxwellOffProcRowCreate ( HYPRE_Int ncols );
 HYPRE_Int hypre_MaxwellOffProcRowDestroy ( void *OffProcRow_vdata );
-HYPRE_Int hypre_SStructSharedDOF_ParcsrMatRowsComm ( hypre_SStructGrid *grid , hypre_ParCSRMatrix *A , HYPRE_Int *num_offprocrows_ptr , hypre_MaxwellOffProcRow ***OffProcRows_ptr );
+HYPRE_Int hypre_SStructSharedDOF_ParcsrMatRowsComm ( hypre_SStructGrid *grid, hypre_ParCSRMatrix *A,
+                                                     HYPRE_Int *num_offprocrows_ptr, hypre_MaxwellOffProcRow ***OffProcRows_ptr );
 
 /* sys_pfmg.c */
 void *hypre_SysPFMGCreate ( MPI_Comm comm );
 HYPRE_Int hypre_SysPFMGDestroy ( void *sys_pfmg_vdata );
-HYPRE_Int hypre_SysPFMGSetTol ( void *sys_pfmg_vdata , HYPRE_Real tol );
-HYPRE_Int hypre_SysPFMGSetMaxIter ( void *sys_pfmg_vdata , HYPRE_Int max_iter );
-HYPRE_Int hypre_SysPFMGSetRelChange ( void *sys_pfmg_vdata , HYPRE_Int rel_change );
-HYPRE_Int hypre_SysPFMGSetZeroGuess ( void *sys_pfmg_vdata , HYPRE_Int zero_guess );
-HYPRE_Int hypre_SysPFMGSetRelaxType ( void *sys_pfmg_vdata , HYPRE_Int relax_type );
-HYPRE_Int hypre_SysPFMGSetJacobiWeight ( void *sys_pfmg_vdata , HYPRE_Real weight );
-HYPRE_Int hypre_SysPFMGSetNumPreRelax ( void *sys_pfmg_vdata , HYPRE_Int num_pre_relax );
-HYPRE_Int hypre_SysPFMGSetNumPostRelax ( void *sys_pfmg_vdata , HYPRE_Int num_post_relax );
-HYPRE_Int hypre_SysPFMGSetSkipRelax ( void *sys_pfmg_vdata , HYPRE_Int skip_relax );
-HYPRE_Int hypre_SysPFMGSetDxyz ( void *sys_pfmg_vdata , HYPRE_Real *dxyz );
-HYPRE_Int hypre_SysPFMGSetLogging ( void *sys_pfmg_vdata , HYPRE_Int logging );
-HYPRE_Int hypre_SysPFMGSetPrintLevel ( void *sys_pfmg_vdata , HYPRE_Int print_level );
-HYPRE_Int hypre_SysPFMGGetNumIterations ( void *sys_pfmg_vdata , HYPRE_Int *num_iterations );
-HYPRE_Int hypre_SysPFMGPrintLogging ( void *sys_pfmg_vdata , HYPRE_Int myid );
-HYPRE_Int hypre_SysPFMGGetFinalRelativeResidualNorm ( void *sys_pfmg_vdata , HYPRE_Real *relative_residual_norm );
+HYPRE_Int hypre_SysPFMGSetTol ( void *sys_pfmg_vdata, HYPRE_Real tol );
+HYPRE_Int hypre_SysPFMGSetMaxIter ( void *sys_pfmg_vdata, HYPRE_Int max_iter );
+HYPRE_Int hypre_SysPFMGSetRelChange ( void *sys_pfmg_vdata, HYPRE_Int rel_change );
+HYPRE_Int hypre_SysPFMGSetZeroGuess ( void *sys_pfmg_vdata, HYPRE_Int zero_guess );
+HYPRE_Int hypre_SysPFMGSetRelaxType ( void *sys_pfmg_vdata, HYPRE_Int relax_type );
+HYPRE_Int hypre_SysPFMGSetJacobiWeight ( void *sys_pfmg_vdata, HYPRE_Real weight );
+HYPRE_Int hypre_SysPFMGSetNumPreRelax ( void *sys_pfmg_vdata, HYPRE_Int num_pre_relax );
+HYPRE_Int hypre_SysPFMGSetNumPostRelax ( void *sys_pfmg_vdata, HYPRE_Int num_post_relax );
+HYPRE_Int hypre_SysPFMGSetSkipRelax ( void *sys_pfmg_vdata, HYPRE_Int skip_relax );
+HYPRE_Int hypre_SysPFMGSetDxyz ( void *sys_pfmg_vdata, HYPRE_Real *dxyz );
+HYPRE_Int hypre_SysPFMGSetLogging ( void *sys_pfmg_vdata, HYPRE_Int logging );
+HYPRE_Int hypre_SysPFMGSetPrintLevel ( void *sys_pfmg_vdata, HYPRE_Int print_level );
+HYPRE_Int hypre_SysPFMGGetNumIterations ( void *sys_pfmg_vdata, HYPRE_Int *num_iterations );
+HYPRE_Int hypre_SysPFMGPrintLogging ( void *sys_pfmg_vdata, HYPRE_Int myid );
+HYPRE_Int hypre_SysPFMGGetFinalRelativeResidualNorm ( void *sys_pfmg_vdata,
+                                                      HYPRE_Real *relative_residual_norm );
 
 /* sys_pfmg_relax.c */
 void *hypre_SysPFMGRelaxCreate ( MPI_Comm comm );
 HYPRE_Int hypre_SysPFMGRelaxDestroy ( void *sys_pfmg_relax_vdata );
-HYPRE_Int hypre_SysPFMGRelax ( void *sys_pfmg_relax_vdata , hypre_SStructPMatrix *A , hypre_SStructPVector *b , hypre_SStructPVector *x );
-HYPRE_Int hypre_SysPFMGRelaxSetup ( void *sys_pfmg_relax_vdata , hypre_SStructPMatrix *A , hypre_SStructPVector *b , hypre_SStructPVector *x );
-HYPRE_Int hypre_SysPFMGRelaxSetType ( void *sys_pfmg_relax_vdata , HYPRE_Int relax_type );
-HYPRE_Int hypre_SysPFMGRelaxSetJacobiWeight ( void *sys_pfmg_relax_vdata , HYPRE_Real weight );
+HYPRE_Int hypre_SysPFMGRelax ( void *sys_pfmg_relax_vdata, hypre_SStructPMatrix *A,
+                               hypre_SStructPVector *b, hypre_SStructPVector *x );
+HYPRE_Int hypre_SysPFMGRelaxSetup ( void *sys_pfmg_relax_vdata, hypre_SStructPMatrix *A,
+                                    hypre_SStructPVector *b, hypre_SStructPVector *x );
+HYPRE_Int hypre_SysPFMGRelaxSetType ( void *sys_pfmg_relax_vdata, HYPRE_Int relax_type );
+HYPRE_Int hypre_SysPFMGRelaxSetJacobiWeight ( void *sys_pfmg_relax_vdata, HYPRE_Real weight );
 HYPRE_Int hypre_SysPFMGRelaxSetPreRelax ( void *sys_pfmg_relax_vdata );
 HYPRE_Int hypre_SysPFMGRelaxSetPostRelax ( void *sys_pfmg_relax_vdata );
-HYPRE_Int hypre_SysPFMGRelaxSetTol ( void *sys_pfmg_relax_vdata , HYPRE_Real tol );
-HYPRE_Int hypre_SysPFMGRelaxSetMaxIter ( void *sys_pfmg_relax_vdata , HYPRE_Int max_iter );
-HYPRE_Int hypre_SysPFMGRelaxSetZeroGuess ( void *sys_pfmg_relax_vdata , HYPRE_Int zero_guess );
-HYPRE_Int hypre_SysPFMGRelaxSetTempVec ( void *sys_pfmg_relax_vdata , hypre_SStructPVector *t );
+HYPRE_Int hypre_SysPFMGRelaxSetTol ( void *sys_pfmg_relax_vdata, HYPRE_Real tol );
+HYPRE_Int hypre_SysPFMGRelaxSetMaxIter ( void *sys_pfmg_relax_vdata, HYPRE_Int max_iter );
+HYPRE_Int hypre_SysPFMGRelaxSetZeroGuess ( void *sys_pfmg_relax_vdata, HYPRE_Int zero_guess );
+HYPRE_Int hypre_SysPFMGRelaxSetTempVec ( void *sys_pfmg_relax_vdata, hypre_SStructPVector *t );
 
 /* sys_pfmg_setup.c */
-HYPRE_Int hypre_SysPFMGSetup ( void *sys_pfmg_vdata , hypre_SStructMatrix *A_in , hypre_SStructVector *b_in , hypre_SStructVector *x_in );
-HYPRE_Int hypre_SysStructCoarsen ( hypre_SStructPGrid *fgrid , hypre_Index index , hypre_Index stride , HYPRE_Int prune , hypre_SStructPGrid **cgrid_ptr );
+HYPRE_Int hypre_SysPFMGSetup ( void *sys_pfmg_vdata, hypre_SStructMatrix *A_in,
+                               hypre_SStructVector *b_in, hypre_SStructVector *x_in );
+HYPRE_Int hypre_SysStructCoarsen ( hypre_SStructPGrid *fgrid, hypre_Index index, hypre_Index stride,
+                                   HYPRE_Int prune, hypre_SStructPGrid **cgrid_ptr );
 
 /* sys_pfmg_setup_interp.c */
-hypre_SStructPMatrix *hypre_SysPFMGCreateInterpOp ( hypre_SStructPMatrix *A , hypre_SStructPGrid *cgrid , HYPRE_Int cdir );
-HYPRE_Int hypre_SysPFMGSetupInterpOp ( hypre_SStructPMatrix *A , HYPRE_Int cdir , hypre_Index findex , hypre_Index stride , hypre_SStructPMatrix *P );
+hypre_SStructPMatrix *hypre_SysPFMGCreateInterpOp ( hypre_SStructPMatrix *A,
+                                                    hypre_SStructPGrid *cgrid, HYPRE_Int cdir );
+HYPRE_Int hypre_SysPFMGSetupInterpOp ( hypre_SStructPMatrix *A, HYPRE_Int cdir, hypre_Index findex,
+                                       hypre_Index stride, hypre_SStructPMatrix *P );
 
 /* sys_pfmg_setup_rap.c */
-hypre_SStructPMatrix *hypre_SysPFMGCreateRAPOp ( hypre_SStructPMatrix *R , hypre_SStructPMatrix *A , hypre_SStructPMatrix *P , hypre_SStructPGrid *coarse_grid , HYPRE_Int cdir );
-HYPRE_Int hypre_SysPFMGSetupRAPOp ( hypre_SStructPMatrix *R , hypre_SStructPMatrix *A , hypre_SStructPMatrix *P , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_SStructPMatrix *Ac );
+hypre_SStructPMatrix *hypre_SysPFMGCreateRAPOp ( hypre_SStructPMatrix *R, hypre_SStructPMatrix *A,
+                                                 hypre_SStructPMatrix *P, hypre_SStructPGrid *coarse_grid, HYPRE_Int cdir );
+HYPRE_Int hypre_SysPFMGSetupRAPOp ( hypre_SStructPMatrix *R, hypre_SStructPMatrix *A,
+                                    hypre_SStructPMatrix *P, HYPRE_Int cdir, hypre_Index cindex, hypre_Index cstride,
+                                    hypre_SStructPMatrix *Ac );
 
 /* sys_pfmg_solve.c */
-HYPRE_Int hypre_SysPFMGSolve ( void *sys_pfmg_vdata , hypre_SStructMatrix *A_in , hypre_SStructVector *b_in , hypre_SStructVector *x_in );
+HYPRE_Int hypre_SysPFMGSolve ( void *sys_pfmg_vdata, hypre_SStructMatrix *A_in,
+                               hypre_SStructVector *b_in, hypre_SStructVector *x_in );
 
 /* sys_semi_interp.c */
 HYPRE_Int hypre_SysSemiInterpCreate ( void **sys_interp_vdata_ptr );
-HYPRE_Int hypre_SysSemiInterpSetup ( void *sys_interp_vdata , hypre_SStructPMatrix *P , HYPRE_Int P_stored_as_transpose , hypre_SStructPVector *xc , hypre_SStructPVector *e , hypre_Index cindex , hypre_Index findex , hypre_Index stride );
-HYPRE_Int hypre_SysSemiInterp ( void *sys_interp_vdata , hypre_SStructPMatrix *P , hypre_SStructPVector *xc , hypre_SStructPVector *e );
+HYPRE_Int hypre_SysSemiInterpSetup ( void *sys_interp_vdata, hypre_SStructPMatrix *P,
+                                     HYPRE_Int P_stored_as_transpose, hypre_SStructPVector *xc, hypre_SStructPVector *e,
+                                     hypre_Index cindex, hypre_Index findex, hypre_Index stride );
+HYPRE_Int hypre_SysSemiInterp ( void *sys_interp_vdata, hypre_SStructPMatrix *P,
+                                hypre_SStructPVector *xc, hypre_SStructPVector *e );
 HYPRE_Int hypre_SysSemiInterpDestroy ( void *sys_interp_vdata );
 
 /* sys_semi_restrict.c */
 HYPRE_Int hypre_SysSemiRestrictCreate ( void **sys_restrict_vdata_ptr );
-HYPRE_Int hypre_SysSemiRestrictSetup ( void *sys_restrict_vdata , hypre_SStructPMatrix *R , HYPRE_Int R_stored_as_transpose , hypre_SStructPVector *r , hypre_SStructPVector *rc , hypre_Index cindex , hypre_Index findex , hypre_Index stride );
-HYPRE_Int hypre_SysSemiRestrict ( void *sys_restrict_vdata , hypre_SStructPMatrix *R , hypre_SStructPVector *r , hypre_SStructPVector *rc );
+HYPRE_Int hypre_SysSemiRestrictSetup ( void *sys_restrict_vdata, hypre_SStructPMatrix *R,
+                                       HYPRE_Int R_stored_as_transpose, hypre_SStructPVector *r, hypre_SStructPVector *rc,
+                                       hypre_Index cindex, hypre_Index findex, hypre_Index stride );
+HYPRE_Int hypre_SysSemiRestrict ( void *sys_restrict_vdata, hypre_SStructPMatrix *R,
+                                  hypre_SStructPVector *r, hypre_SStructPVector *rc );
 HYPRE_Int hypre_SysSemiRestrictDestroy ( void *sys_restrict_vdata );
 
 #ifdef __cplusplus
diff --git a/external/hypre/src/sstruct_ls/bsearch.c b/external/hypre/src/sstruct_ls/bsearch.c
index 71deed2b..3ed378c3 100644
--- a/external/hypre/src/sstruct_ls/bsearch.c
+++ b/external/hypre/src/sstruct_ls/bsearch.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -14,7 +14,7 @@
  *      list[m-1] < value <= list[m].
  * The routine returns location m or -1.
  *--------------------------------------------------------------------------*/
-    
+
 HYPRE_Int hypre_LowerBinarySearch(HYPRE_Int *list, HYPRE_Int value, HYPRE_Int list_length)
 {
    HYPRE_Int low, high, m;
@@ -33,27 +33,27 @@ HYPRE_Int hypre_LowerBinarySearch(HYPRE_Int *list, HYPRE_Int value, HYPRE_Int li
    }
 
    low = 0;
-   high= list_length-1;
+   high = list_length - 1;
    while (not_found && low <= high)
    {
       m = (low + high) / 2;
       if (m < 1)
       {
-         m= 1;
+         m = 1;
       }
 
-      if (list[m-1] < value && list[m] < value)
+      if (list[m - 1] < value && list[m] < value)
       {
-         low= m + 1;
+         low = m + 1;
       }
-      else if (value <= list[m-1] && value <= list[m])
+      else if (value <= list[m - 1] && value <= list[m])
       {
-         high= m - 1;
+         high = m - 1;
       }
       else
       {
-        not_found = 0;
-        return m;
+         not_found = 0;
+         return m;
       }
    }
    return -1;
@@ -77,28 +77,28 @@ HYPRE_Int hypre_UpperBinarySearch(HYPRE_Int *list, HYPRE_Int value, HYPRE_Int li
    }
 
    /* special case, list[list_length-1] >= value */
-   if (list[list_length-1] <= value)
+   if (list[list_length - 1] <= value)
    {
-      return (list_length-1);
+      return (list_length - 1);
    }
 
    low = 0;
-   high= list_length-1;
+   high = list_length - 1;
    while (not_found && low <= high)
    {
       m = (low + high) / 2;
-      if (list[m] <= value && list[m+1] <= value)
+      if (list[m] <= value && list[m + 1] <= value)
       {
-         low= m + 1;
+         low = m + 1;
       }
-      else if (value < list[m] && value < list[m+1])
+      else if (value < list[m] && value < list[m + 1])
       {
-         high= m - 1;
+         high = m - 1;
       }
       else
       {
-        not_found = 0;
-        return m;
+         not_found = 0;
+         return m;
       }
    }
 
diff --git a/external/hypre/src/sstruct_ls/eliminate_rowscols.c b/external/hypre/src/sstruct_ls/eliminate_rowscols.c
index 565a4eeb..f75defd3 100644
--- a/external/hypre/src/sstruct_ls/eliminate_rowscols.c
+++ b/external/hypre/src/sstruct_ls/eliminate_rowscols.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -7,10 +7,10 @@
 
 #include "_hypre_parcsr_mv.h"
 #include "eliminate_rowscols.h"
-    
+
 HYPRE_Int hypre_ParCSRMatrixEliminateRowsCols (hypre_ParCSRMatrix *A,
-                                         HYPRE_Int nrows_to_eliminate,
-                                         HYPRE_Int *rows_to_eliminate)
+                                               HYPRE_Int nrows_to_eliminate,
+                                               HYPRE_Int *rows_to_eliminate)
 {
    HYPRE_Int ierr = 0;
 
@@ -28,7 +28,7 @@ HYPRE_Int hypre_ParCSRMatrixEliminateRowsCols (hypre_ParCSRMatrix *A,
    HYPRE_Int       ibeg;
 
    hypre_MPI_Comm_rank(comm, &myproc);
-   ibeg= 0;
+   ibeg = 0;
 
 
    /* take care of the diagonal part (sequential elimination) */
@@ -60,23 +60,27 @@ HYPRE_Int hypre_ParCSRMatrixEliminateRowsCols (hypre_ParCSRMatrix *A,
 
       /* which of the local rows are to be eliminated */
       for (i = 0; i < diag_nrows; i++)
+      {
          eliminate_row[i] = 0;
+      }
       for (i = 0; i < nrows_to_eliminate; i++)
-         eliminate_row[rows_to_eliminate[i]-ibeg] = 1;
+      {
+         eliminate_row[rows_to_eliminate[i] - ibeg] = 1;
+      }
 
       /* use a Matvec communication pattern to find (in eliminate_col)
          which of the local offd columns are to be eliminated */
       num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
-      int_buf_data = hypre_CTAlloc(HYPRE_Int, 
-                                   hypre_ParCSRCommPkgSendMapStart(comm_pkg, 
+      int_buf_data = hypre_CTAlloc(HYPRE_Int,
+                                   hypre_ParCSRCommPkgSendMapStart(comm_pkg,
                                                                    num_sends), HYPRE_MEMORY_HOST);
       index = 0;
       for (i = 0; i < num_sends; i++)
       {
          start = hypre_ParCSRCommPkgSendMapStart(comm_pkg, i);
-         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i+1); j++)
+         for (j = start; j < hypre_ParCSRCommPkgSendMapStart(comm_pkg, i + 1); j++)
          {
-            k = hypre_ParCSRCommPkgSendMapElmt(comm_pkg,j);
+            k = hypre_ParCSRCommPkgSendMapElmt(comm_pkg, j);
             int_buf_data[index++] = eliminate_row[k];
          }
       }
@@ -88,14 +92,18 @@ HYPRE_Int hypre_ParCSRMatrixEliminateRowsCols (hypre_ParCSRMatrix *A,
       ncols_to_eliminate = 0;
       for (i = 0; i < offd_ncols; i++)
          if (eliminate_col[i])
+         {
             ncols_to_eliminate++;
+         }
 
       cols_to_eliminate = hypre_CTAlloc(HYPRE_Int,  ncols_to_eliminate, HYPRE_MEMORY_HOST);
 
       ncols_to_eliminate = 0;
       for (i = 0; i < offd_ncols; i++)
          if (eliminate_col[i])
+         {
             cols_to_eliminate[ncols_to_eliminate++] = i;
+         }
 
       hypre_TFree(int_buf_data, HYPRE_MEMORY_HOST);
       hypre_TFree(eliminate_row, HYPRE_MEMORY_HOST);
@@ -113,11 +121,11 @@ HYPRE_Int hypre_ParCSRMatrixEliminateRowsCols (hypre_ParCSRMatrix *A,
 
 
 HYPRE_Int hypre_CSRMatrixEliminateRowsColsDiag (hypre_ParCSRMatrix *A,
-                                          HYPRE_Int nrows_to_eliminate,
-                                          HYPRE_Int *rows_to_eliminate)
+                                                HYPRE_Int nrows_to_eliminate,
+                                                HYPRE_Int *rows_to_eliminate)
 {
    HYPRE_Int ierr = 0;
-  
+
    MPI_Comm          comm      = hypre_ParCSRMatrixComm(A);
    hypre_CSRMatrix  *Adiag     = hypre_ParCSRMatrixDiag(A);
 
@@ -130,26 +138,28 @@ HYPRE_Int hypre_CSRMatrixEliminateRowsColsDiag (hypre_ParCSRMatrix *A,
    HYPRE_Real       *Adata     = hypre_CSRMatrixData(Adiag);
 
    HYPRE_Int        *local_rows;
-  
+
    HYPRE_Int         myproc;
 
    hypre_MPI_Comm_rank(comm, &myproc);
-   ibeg= 0;
+   ibeg = 0;
 
    /* grab local rows to eliminate */
-   local_rows= hypre_TAlloc(HYPRE_Int,  nrows_to_eliminate, HYPRE_MEMORY_HOST);
-   for (i= 0; i< nrows_to_eliminate; i++)
+   local_rows = hypre_TAlloc(HYPRE_Int,  nrows_to_eliminate, HYPRE_MEMORY_HOST);
+   for (i = 0; i < nrows_to_eliminate; i++)
    {
-      local_rows[i]= rows_to_eliminate[i]-ibeg;
+      local_rows[i] = rows_to_eliminate[i] - ibeg;
    }
-      
+
    /* remove the columns */
    for (i = 0; i < nnz; i++)
    {
       irow = hypre_BinarySearch(local_rows, Aj[i],
                                 nrows_to_eliminate);
       if (irow != -1)
+      {
          Adata[i] = 0.0;
+      }
    }
 
    /* remove the rows and set the diagonal equal to 1 */
@@ -157,12 +167,16 @@ HYPRE_Int hypre_CSRMatrixEliminateRowsColsDiag (hypre_ParCSRMatrix *A,
    {
       irow = local_rows[i];
       ibeg = Ai[irow];
-      iend = Ai[irow+1];
+      iend = Ai[irow + 1];
       for (j = ibeg; j < iend; j++)
          if (Aj[j] == irow)
+         {
             Adata[j] = 1.0;
+         }
          else
+         {
             Adata[j] = 0.0;
+         }
    }
 
    hypre_TFree(local_rows, HYPRE_MEMORY_HOST);
@@ -171,8 +185,8 @@ HYPRE_Int hypre_CSRMatrixEliminateRowsColsDiag (hypre_ParCSRMatrix *A,
 }
 
 HYPRE_Int hypre_CSRMatrixEliminateRowsOffd (hypre_ParCSRMatrix *A,
-                                      HYPRE_Int  nrows_to_eliminate,
-                                      HYPRE_Int *rows_to_eliminate)
+                                            HYPRE_Int  nrows_to_eliminate,
+                                            HYPRE_Int *rows_to_eliminate)
 {
    HYPRE_Int ierr = 0;
 
@@ -190,21 +204,23 @@ HYPRE_Int hypre_CSRMatrixEliminateRowsOffd (hypre_ParCSRMatrix *A,
    HYPRE_Int myproc;
 
    hypre_MPI_Comm_rank(comm, &myproc);
-   ibeg= 0;
+   ibeg = 0;
 
    /* grab local rows to eliminate */
-   local_rows= hypre_TAlloc(HYPRE_Int,  nrows_to_eliminate, HYPRE_MEMORY_HOST);
-   for (i= 0; i< nrows_to_eliminate; i++)
+   local_rows = hypre_TAlloc(HYPRE_Int,  nrows_to_eliminate, HYPRE_MEMORY_HOST);
+   for (i = 0; i < nrows_to_eliminate; i++)
    {
-      local_rows[i]= rows_to_eliminate[i]-ibeg;
+      local_rows[i] = rows_to_eliminate[i] - ibeg;
    }
 
    for (i = 0; i < nrows_to_eliminate; i++)
    {
       ibeg = Ai[local_rows[i]];
-      iend = Ai[local_rows[i]+1];
+      iend = Ai[local_rows[i] + 1];
       for (j = ibeg; j < iend; j++)
+      {
          Adata[j] = 0.0;
+      }
    }
 
    hypre_TFree(local_rows, HYPRE_MEMORY_HOST);
@@ -213,8 +229,8 @@ HYPRE_Int hypre_CSRMatrixEliminateRowsOffd (hypre_ParCSRMatrix *A,
 }
 
 HYPRE_Int hypre_CSRMatrixEliminateColsOffd (hypre_CSRMatrix *Aoffd,
-                                      HYPRE_Int ncols_to_eliminate,
-                                      HYPRE_Int *cols_to_eliminate)
+                                            HYPRE_Int ncols_to_eliminate,
+                                            HYPRE_Int *cols_to_eliminate)
 {
    HYPRE_Int ierr = 0;
 
@@ -230,7 +246,9 @@ HYPRE_Int hypre_CSRMatrixEliminateColsOffd (hypre_CSRMatrix *Aoffd,
       icol = hypre_BinarySearch(cols_to_eliminate, Aj[i],
                                 ncols_to_eliminate);
       if (icol != -1)
+      {
          Adata[i] = 0.0;
+      }
    }
 
    return ierr;
diff --git a/external/hypre/src/sstruct_ls/eliminate_rowscols.h b/external/hypre/src/sstruct_ls/eliminate_rowscols.h
index fb9ff61b..6ca9d907 100644
--- a/external/hypre/src/sstruct_ls/eliminate_rowscols.h
+++ b/external/hypre/src/sstruct_ls/eliminate_rowscols.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -11,7 +11,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-    
+
 /*
   Function:  hypre_ParCSRMatrixEliminateRowsCols
 
@@ -25,8 +25,8 @@ extern "C" {
                 \ A_bi | A_bb /          \   0  |  I   /
 */
 HYPRE_Int hypre_ParCSRMatrixEliminateRowsCols (hypre_ParCSRMatrix *A,
-                                         HYPRE_Int nrows_to_eliminate,
-                                         HYPRE_Int *rows_to_eliminate);
+                                               HYPRE_Int nrows_to_eliminate,
+                                               HYPRE_Int *rows_to_eliminate);
 
 
 /*
@@ -36,8 +36,8 @@ HYPRE_Int hypre_ParCSRMatrixEliminateRowsCols (hypre_ParCSRMatrix *A,
   given sorted (!) list of rows. Put I on the eliminated diagonal.
 */
 HYPRE_Int hypre_CSRMatrixEliminateRowsColsDiag (hypre_ParCSRMatrix *A,
-                                          HYPRE_Int nrows_to_eliminate,
-                                          HYPRE_Int *rows_to_eliminate);
+                                                HYPRE_Int nrows_to_eliminate,
+                                                HYPRE_Int *rows_to_eliminate);
 
 /*
   Function:  hypre_CSRMatrixEliminateRowsOffd
@@ -45,8 +45,8 @@ HYPRE_Int hypre_CSRMatrixEliminateRowsColsDiag (hypre_ParCSRMatrix *A,
   Eliminate the given list of rows of Aoffd.
 */
 HYPRE_Int hypre_CSRMatrixEliminateRowsOffd (hypre_ParCSRMatrix *A,
-                                      HYPRE_Int nrows_to_eliminate,
-                                      HYPRE_Int *rows_to_eliminate);
+                                            HYPRE_Int nrows_to_eliminate,
+                                            HYPRE_Int *rows_to_eliminate);
 
 /*
   Function:  hypre_CSRMatrixEliminateColsOffd
@@ -54,8 +54,8 @@ HYPRE_Int hypre_CSRMatrixEliminateRowsOffd (hypre_ParCSRMatrix *A,
   Eliminate the given sorted (!) list of columns of Aoffd.
 */
 HYPRE_Int hypre_CSRMatrixEliminateColsOffd (hypre_CSRMatrix *Aoffd,
-                                      HYPRE_Int ncols_to_eliminate,
-                                      HYPRE_Int *cols_to_eliminate);
+                                            HYPRE_Int ncols_to_eliminate,
+                                            HYPRE_Int *cols_to_eliminate);
 
 #ifdef __cplusplus
 }
diff --git a/external/hypre/src/sstruct_ls/fac.c b/external/hypre/src/sstruct_ls/fac.c
index 1e7f7185..003974a2 100644
--- a/external/hypre/src/sstruct_ls/fac.c
+++ b/external/hypre/src/sstruct_ls/fac.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -14,9 +14,9 @@
 void *
 hypre_FACCreate( MPI_Comm  comm )
 {
-    hypre_FACData *fac_data;
+   hypre_FACData *fac_data;
 
-    fac_data = hypre_CTAlloc(hypre_FACData,  1, HYPRE_MEMORY_HOST);
+   fac_data = hypre_CTAlloc(hypre_FACData,  1, HYPRE_MEMORY_HOST);
 
    (fac_data -> comm)       = comm;
    (fac_data -> time_index) = hypre_InitializeTiming("FAC");
@@ -28,7 +28,7 @@ hypre_FACCreate( MPI_Comm  comm )
    (fac_data -> max_levels)       = 0;
    (fac_data -> relax_type)       = 2; /*  1 Jacobi; 2 Gauss-Seidel */
    (fac_data -> jacobi_weight)    = 0.0;
-   (fac_data -> usr_jacobi_weight)= 0;
+   (fac_data -> usr_jacobi_weight) = 0;
    (fac_data -> num_pre_smooth)   = 1;
    (fac_data -> num_post_smooth)  = 1;
    (fac_data -> csolver_type)     = 1;
@@ -43,19 +43,19 @@ hypre_FACCreate( MPI_Comm  comm )
 HYPRE_Int
 hypre_FACDestroy2(void *fac_vdata)
 {
-	hypre_FACData *fac_data = (hypre_FACData *)fac_vdata;
+   hypre_FACData *fac_data = (hypre_FACData *)fac_vdata;
 
    HYPRE_Int level;
    HYPRE_Int ierr = 0;
 
    if (fac_data)
    {
-      hypre_TFree((fac_data ->plevels) , HYPRE_MEMORY_HOST);
-      hypre_TFree((fac_data ->prefinements) , HYPRE_MEMORY_HOST);
+      hypre_TFree((fac_data ->plevels), HYPRE_MEMORY_HOST);
+      hypre_TFree((fac_data ->prefinements), HYPRE_MEMORY_HOST);
 
       HYPRE_SStructGraphDestroy(hypre_SStructMatrixGraph((fac_data -> A_rap)));
       HYPRE_SStructMatrixDestroy((fac_data -> A_rap));
-      for (level= 0; level<= (fac_data -> max_levels); level++)
+      for (level = 0; level <= (fac_data -> max_levels); level++)
       {
          HYPRE_SStructMatrixDestroy( (fac_data -> A_level[level]) );
          HYPRE_SStructVectorDestroy( (fac_data -> x_level[level]) );
@@ -85,19 +85,19 @@ hypre_FACDestroy2(void *fac_vdata)
       hypre_SStructMatvecDestroy( (fac_data -> matvec_data) );
 
       hypre_TFree(fac_data -> A_level, HYPRE_MEMORY_HOST);
-      hypre_TFree(fac_data -> x_level, HYPRE_MEMORY_HOST); 
-      hypre_TFree(fac_data -> b_level, HYPRE_MEMORY_HOST); 
-      hypre_TFree(fac_data -> r_level, HYPRE_MEMORY_HOST); 
-      hypre_TFree(fac_data -> e_level, HYPRE_MEMORY_HOST); 
-      hypre_TFree(fac_data -> tx_level, HYPRE_MEMORY_HOST); 
-      hypre_TFree(fac_data -> relax_data_level, HYPRE_MEMORY_HOST); 
-      hypre_TFree(fac_data -> restrict_data_level, HYPRE_MEMORY_HOST); 
-      hypre_TFree(fac_data -> matvec_data_level, HYPRE_MEMORY_HOST); 
-      hypre_TFree(fac_data -> pmatvec_data_level, HYPRE_MEMORY_HOST); 
-      hypre_TFree(fac_data -> interp_data_level, HYPRE_MEMORY_HOST); 
-
-      hypre_TFree(fac_data -> grid_level, HYPRE_MEMORY_HOST); 
-      hypre_TFree(fac_data -> graph_level, HYPRE_MEMORY_HOST); 
+      hypre_TFree(fac_data -> x_level, HYPRE_MEMORY_HOST);
+      hypre_TFree(fac_data -> b_level, HYPRE_MEMORY_HOST);
+      hypre_TFree(fac_data -> r_level, HYPRE_MEMORY_HOST);
+      hypre_TFree(fac_data -> e_level, HYPRE_MEMORY_HOST);
+      hypre_TFree(fac_data -> tx_level, HYPRE_MEMORY_HOST);
+      hypre_TFree(fac_data -> relax_data_level, HYPRE_MEMORY_HOST);
+      hypre_TFree(fac_data -> restrict_data_level, HYPRE_MEMORY_HOST);
+      hypre_TFree(fac_data -> matvec_data_level, HYPRE_MEMORY_HOST);
+      hypre_TFree(fac_data -> pmatvec_data_level, HYPRE_MEMORY_HOST);
+      hypre_TFree(fac_data -> interp_data_level, HYPRE_MEMORY_HOST);
+
+      hypre_TFree(fac_data -> grid_level, HYPRE_MEMORY_HOST);
+      hypre_TFree(fac_data -> graph_level, HYPRE_MEMORY_HOST);
 
       HYPRE_SStructVectorDestroy(fac_data -> tx);
 
@@ -107,12 +107,12 @@ hypre_FACDestroy2(void *fac_vdata)
 
       if ( (fac_data -> csolver_type) == 1)
       {
-          HYPRE_SStructPCGDestroy(fac_data -> csolver);
-          HYPRE_SStructSysPFMGDestroy(fac_data -> cprecond);
+         HYPRE_SStructPCGDestroy(fac_data -> csolver);
+         HYPRE_SStructSysPFMGDestroy(fac_data -> cprecond);
       }
       else if ((fac_data -> csolver_type) == 2)
       {
-          HYPRE_SStructSysPFMGDestroy(fac_data -> csolver);
+         HYPRE_SStructSysPFMGDestroy(fac_data -> csolver);
       }
 
       if ((fac_data -> logging) > 0)
@@ -126,7 +126,7 @@ hypre_FACDestroy2(void *fac_vdata)
       hypre_TFree(fac_data, HYPRE_MEMORY_HOST);
    }
 
-   return(ierr);
+   return (ierr);
 }
 
 HYPRE_Int
@@ -155,14 +155,14 @@ hypre_FACSetPLevels( void *fac_vdata,
    HYPRE_Int      ierr       = 0;
    HYPRE_Int      i;
 
-   fac_plevels= hypre_CTAlloc(HYPRE_Int,  nparts, HYPRE_MEMORY_HOST);
+   fac_plevels = hypre_CTAlloc(HYPRE_Int,  nparts, HYPRE_MEMORY_HOST);
 
-   for (i= 0; i< nparts; i++)
+   for (i = 0; i < nparts; i++)
    {
-      fac_plevels[i]= plevels[i];
+      fac_plevels[i] = plevels[i];
    }
 
-   (fac_data -> plevels)=  fac_plevels;
+   (fac_data -> plevels) =  fac_plevels;
 
    return ierr;
 }
@@ -180,14 +180,14 @@ hypre_FACSetPRefinements( void         *fac_vdata,
    HYPRE_Int      ierr       = 0;
    HYPRE_Int      i;
 
-   fac_prefinements= hypre_TAlloc(hypre_Index,  nparts, HYPRE_MEMORY_HOST);
+   fac_prefinements = hypre_TAlloc(hypre_Index,  nparts, HYPRE_MEMORY_HOST);
 
-   for (i= 0; i< nparts; i++)
+   for (i = 0; i < nparts; i++)
    {
       hypre_CopyIndex( prefinements[i], fac_prefinements[i] );
    }
 
-   (fac_data -> prefinements)=  fac_prefinements;
+   (fac_data -> prefinements) =  fac_prefinements;
 
    return ierr;
 }
@@ -202,7 +202,7 @@ hypre_FACSetMaxLevels( void *fac_vdata,
    hypre_FACData *fac_data = (hypre_FACData *)fac_vdata;
    HYPRE_Int          ierr = 0;
 
-   (fac_data -> max_levels) = nparts-1;
+   (fac_data -> max_levels) = nparts - 1;
 
    return ierr;
 }
@@ -279,10 +279,10 @@ hypre_FACSetJacobiWeight( void  *fac_vdata,
                           HYPRE_Real weight )
 {
    hypre_FACData *fac_data = (hypre_FACData *)fac_vdata;
-                                                                                                                                            
+
    (fac_data -> jacobi_weight)    = weight;
-   (fac_data -> usr_jacobi_weight)= 1;
-                                                                                                                                            
+   (fac_data -> usr_jacobi_weight) = 1;
+
    return hypre_error_flag;
 }
 
@@ -388,8 +388,8 @@ hypre_FACPrintLogging( void *fac_vdata,
       {
          for (i = 0; i < num_iterations; i++)
          {
-            hypre_printf("Residual norm[%d] = %e   ",i,norms[i]);
-            hypre_printf("Relative residual norm[%d] = %e\n",i,rel_norms[i]);
+            hypre_printf("Residual norm[%d] = %e   ", i, norms[i]);
+            hypre_printf("Relative residual norm[%d] = %e\n", i, rel_norms[i]);
          }
       }
    }
@@ -423,7 +423,7 @@ hypre_FACGetFinalRelativeResidualNorm( void   *fac_vdata,
       }
       else if (num_iterations == max_iter)
       {
-         *relative_residual_norm = rel_norms[num_iterations-1];
+         *relative_residual_norm = rel_norms[num_iterations - 1];
       }
       else
       {
diff --git a/external/hypre/src/sstruct_ls/fac.h b/external/hypre/src/sstruct_ls/fac.h
index fa0c3508..39bc6efc 100644
--- a/external/hypre/src/sstruct_ls/fac.h
+++ b/external/hypre/src/sstruct_ls/fac.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -20,7 +20,7 @@
 typedef struct
 {
    MPI_Comm               comm;
-  
+
    HYPRE_Int             *plevels;
    hypre_Index           *prefinements;
 
diff --git a/external/hypre/src/sstruct_ls/fac_CFInterfaceExtents.c b/external/hypre/src/sstruct_ls/fac_CFInterfaceExtents.c
index 260dd125..43df0ebf 100644
--- a/external/hypre/src/sstruct_ls/fac_CFInterfaceExtents.c
+++ b/external/hypre/src/sstruct_ls/fac_CFInterfaceExtents.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -40,57 +40,57 @@ hypre_CFInterfaceExtents( hypre_Box              *fgrid_box,
    HYPRE_Int              stencil_size;
    HYPRE_Int              abs_stencil;
 
-   HYPRE_Int              ndim= hypre_StructStencilNDim(stencils);
+   HYPRE_Int              ndim = hypre_StructStencilNDim(stencils);
    HYPRE_Int              i, j;
-    
+
    hypre_ClearIndex(zero_index);
    hypre_ClearIndex(neg_index);
-   for (i= 0; i< ndim; i++)
+   for (i = 0; i < ndim; i++)
    {
-      neg_index[i]= -1;
+      neg_index[i] = -1;
    }
    hypre_CopyIndex(hypre_BoxIMin(cgrid_box), cstart);
 
    stencil_size       = hypre_StructStencilSize(stencils);
-   stencil_box_extents= hypre_BoxArrayCreate(stencil_size, ndim);
+   stencil_box_extents = hypre_BoxArrayCreate(stencil_size, ndim);
    union_boxes        = hypre_BoxArrayCreate(0, ndim);
 
-   for (i= 0; i< stencil_size; i++)
+   for (i = 0; i < stencil_size; i++)
    {
-       hypre_CopyIndex(hypre_StructStencilElement(stencils, i), stencil_shape);
-       AbsStencilShape(stencil_shape, abs_stencil);
+      hypre_CopyIndex(hypre_StructStencilElement(stencils, i), stencil_shape);
+      AbsStencilShape(stencil_shape, abs_stencil);
 
-       if (abs_stencil)  /* only do if not the centre stencil */
-       {
-          cfine_box= hypre_CF_StenBox(fgrid_box, cgrid_box, stencil_shape, rfactors,
+      if (abs_stencil)  /* only do if not the centre stencil */
+      {
+         cfine_box = hypre_CF_StenBox(fgrid_box, cgrid_box, stencil_shape, rfactors,
                                       ndim);
 
-          if ( hypre_BoxVolume(cfine_box) )
-          {
-             hypre_AppendBox(cfine_box, union_boxes);
-             hypre_CopyBox(cfine_box, hypre_BoxArrayBox(stencil_box_extents, i));
-             for (j= 0; j< ndim; j++)
-             {
-                hypre_BoxIMin(cfine_box)[j]-=  cstart[j];
-                hypre_BoxIMax(cfine_box)[j]-=  cstart[j];
-             }
-             hypre_CopyBox(cfine_box, hypre_BoxArrayBox(stencil_box_extents, i));
-          }
-         
-          else
-          {
-             hypre_BoxSetExtents(hypre_BoxArrayBox(stencil_box_extents, i),
-                                 zero_index, neg_index);
-          }
-
-          hypre_BoxDestroy(cfine_box);
-       }
-
-       else /* centre */
-       {
-           hypre_BoxSetExtents(hypre_BoxArrayBox(stencil_box_extents, i),
-                               zero_index, neg_index);
-       }
+         if ( hypre_BoxVolume(cfine_box) )
+         {
+            hypre_AppendBox(cfine_box, union_boxes);
+            hypre_CopyBox(cfine_box, hypre_BoxArrayBox(stencil_box_extents, i));
+            for (j = 0; j < ndim; j++)
+            {
+               hypre_BoxIMin(cfine_box)[j] -=  cstart[j];
+               hypre_BoxIMax(cfine_box)[j] -=  cstart[j];
+            }
+            hypre_CopyBox(cfine_box, hypre_BoxArrayBox(stencil_box_extents, i));
+         }
+
+         else
+         {
+            hypre_BoxSetExtents(hypre_BoxArrayBox(stencil_box_extents, i),
+                                zero_index, neg_index);
+         }
+
+         hypre_BoxDestroy(cfine_box);
+      }
+
+      else /* centre */
+      {
+         hypre_BoxSetExtents(hypre_BoxArrayBox(stencil_box_extents, i),
+                             zero_index, neg_index);
+      }
    }
 
    /*--------------------------------------------------------------------------
@@ -100,22 +100,22 @@ hypre_CFInterfaceExtents( hypre_Box              *fgrid_box,
     *--------------------------------------------------------------------------*/
    if (hypre_BoxArraySize(union_boxes) > 1)
    {
-       hypre_UnionBoxes(union_boxes);
+      hypre_UnionBoxes(union_boxes);
    }
 
    hypre_ForBoxI(i, union_boxes)
    {
-       hypre_AppendBox(hypre_BoxArrayBox(union_boxes, i), stencil_box_extents);
+      hypre_AppendBox(hypre_BoxArrayBox(union_boxes, i), stencil_box_extents);
    }
    hypre_BoxArrayDestroy(union_boxes);
-      
-   for (i= stencil_size; i< hypre_BoxArraySize(stencil_box_extents); i++)
+
+   for (i = stencil_size; i < hypre_BoxArraySize(stencil_box_extents); i++)
    {
-      box= hypre_BoxArrayBox(stencil_box_extents, i);
-      for (j= 0; j< ndim; j++)
+      box = hypre_BoxArrayBox(stencil_box_extents, i);
+      for (j = 0; j < ndim; j++)
       {
-         hypre_BoxIMin(box)[j]-=  cstart[j];
-         hypre_BoxIMax(box)[j]-=  cstart[j];
+         hypre_BoxIMin(box)[j] -=  cstart[j];
+         hypre_BoxIMax(box)[j] -=  cstart[j];
       }
    }
 
@@ -127,7 +127,7 @@ hypre_CFInterfaceExtents2( hypre_Box              *fgrid_box,
                            hypre_Box              *cgrid_box,
                            hypre_StructStencil    *stencils,
                            hypre_Index             rfactors,
-                           hypre_BoxArray         *cf_interface ) 
+                           hypre_BoxArray         *cf_interface )
 {
 
    hypre_BoxArray        *stencil_box_extents;
@@ -138,71 +138,71 @@ hypre_CFInterfaceExtents2( hypre_Box              *fgrid_box,
    HYPRE_Int              stencil_size;
    HYPRE_Int              abs_stencil;
 
-   HYPRE_Int              ndim= hypre_StructStencilNDim(stencils);
+   HYPRE_Int              ndim = hypre_StructStencilNDim(stencils);
 
    HYPRE_Int              i;
-   HYPRE_Int              ierr= 0;
-    
+   HYPRE_Int              ierr = 0;
+
    hypre_ClearIndex(zero_index);
    hypre_ClearIndex(neg_index);
-   for (i= 0; i< ndim; i++)
+   for (i = 0; i < ndim; i++)
    {
-      neg_index[i]= -1;
+      neg_index[i] = -1;
    }
 
    stencil_size       = hypre_StructStencilSize(stencils);
-   stencil_box_extents= hypre_BoxArrayCreate(stencil_size, ndim);
+   stencil_box_extents = hypre_BoxArrayCreate(stencil_size, ndim);
    union_boxes        = hypre_BoxArrayCreate(0, ndim);
 
-   for (i= 0; i< stencil_size; i++)
+   for (i = 0; i < stencil_size; i++)
    {
-       hypre_CopyIndex(hypre_StructStencilElement(stencils, i), stencil_shape);
-       AbsStencilShape(stencil_shape, abs_stencil);
+      hypre_CopyIndex(hypre_StructStencilElement(stencils, i), stencil_shape);
+      AbsStencilShape(stencil_shape, abs_stencil);
 
-       if (abs_stencil)  /* only do if not the centre stencil */
-       {
-          cfine_box= hypre_CF_StenBox(fgrid_box, cgrid_box, stencil_shape, 
+      if (abs_stencil)  /* only do if not the centre stencil */
+      {
+         cfine_box = hypre_CF_StenBox(fgrid_box, cgrid_box, stencil_shape,
                                       rfactors, ndim);
 
-          if ( hypre_BoxVolume(cfine_box) )
-          {
-             hypre_AppendBox(cfine_box, union_boxes);
-             hypre_CopyBox(cfine_box, hypre_BoxArrayBox(stencil_box_extents, i));
-          }
-         
-          else
-          {
-             hypre_BoxSetExtents(hypre_BoxArrayBox(stencil_box_extents, i),
-                                 zero_index, neg_index);
-          }
-
-          hypre_BoxDestroy(cfine_box);
-       }
-
-       else /* centre */
-       {
-           hypre_BoxSetExtents(hypre_BoxArrayBox(stencil_box_extents, i),
-                               zero_index, neg_index);
-       }
+         if ( hypre_BoxVolume(cfine_box) )
+         {
+            hypre_AppendBox(cfine_box, union_boxes);
+            hypre_CopyBox(cfine_box, hypre_BoxArrayBox(stencil_box_extents, i));
+         }
+
+         else
+         {
+            hypre_BoxSetExtents(hypre_BoxArrayBox(stencil_box_extents, i),
+                                zero_index, neg_index);
+         }
+
+         hypre_BoxDestroy(cfine_box);
+      }
+
+      else /* centre */
+      {
+         hypre_BoxSetExtents(hypre_BoxArrayBox(stencil_box_extents, i),
+                             zero_index, neg_index);
+      }
    }
 
    /*--------------------------------------------------------------------------
     * Union the stencil_box_extents to get the full CF extents and append to
-    * the end of the stencil_box_extents BoxArray. 
+    * the end of the stencil_box_extents BoxArray.
     *--------------------------------------------------------------------------*/
    if (hypre_BoxArraySize(union_boxes) > 1)
    {
-       hypre_UnionBoxes(union_boxes);
+      hypre_UnionBoxes(union_boxes);
    }
 
    hypre_ForBoxI(i, union_boxes)
    {
-       hypre_AppendBox(hypre_BoxArrayBox(union_boxes, i), stencil_box_extents);
+      hypre_AppendBox(hypre_BoxArrayBox(union_boxes, i), stencil_box_extents);
    }
    hypre_AppendBoxArray(stencil_box_extents, cf_interface);
 
    hypre_BoxArrayDestroy(union_boxes);
    hypre_BoxArrayDestroy(stencil_box_extents);
-      
+
    return ierr;
 }
diff --git a/external/hypre/src/sstruct_ls/fac_amr_fcoarsen.c b/external/hypre/src/sstruct_ls/fac_amr_fcoarsen.c
index 0b058275..52cd8cf7 100644
--- a/external/hypre/src/sstruct_ls/fac_amr_fcoarsen.c
+++ b/external/hypre/src/sstruct_ls/fac_amr_fcoarsen.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -81,22 +81,22 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
    HYPRE_Int               graph_type = hypre_SStructGraphObjectType(graph);
    hypre_SStructGrid      *grid       = hypre_SStructGraphGrid(graph);
    HYPRE_IJMatrix          ij_A       = hypre_SStructMatrixIJMatrix(A);
-   HYPRE_Int               matrix_type= hypre_SStructMatrixObjectType(A);
+   HYPRE_Int               matrix_type = hypre_SStructMatrixObjectType(A);
    HYPRE_Int               ndim       = hypre_SStructMatrixNDim(A);
 
    hypre_SStructPMatrix   *A_pmatrix  = hypre_SStructMatrixPMatrix(fac_A, level);
 
    hypre_StructMatrix     *smatrix_var;
    hypre_StructStencil    *stencils, *stencils_last;
-   HYPRE_Int               stencil_size, stencil_last_size;
+   HYPRE_Int               stencil_size = 0, stencil_last_size;
    hypre_Index             stencil_shape_i, stencil_last_shape_i;
    hypre_Index             loop_size;
    hypre_Box               loop_box;
    HYPRE_Real            **a_ptrs;
    hypre_Box              *A_dbox;
 
-   HYPRE_Int               part_crse= level-1;
-   HYPRE_Int               part_fine= level;
+   HYPRE_Int               part_crse = level - 1;
+   HYPRE_Int               part_fine = level;
 
    hypre_StructMatrix     *crse_smatrix;
    HYPRE_Real             *crse_ptr;
@@ -131,25 +131,25 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
    hypre_BoxArray         *data_space;
 
    HYPRE_Int               ci, fi, arrayi;
-   HYPRE_Int               max_stencil_size= 27;
+   HYPRE_Int               max_stencil_size = 27;
    HYPRE_Int               trueV = 1;
-   HYPRE_Int               falseV= 0;
+   HYPRE_Int               falseV = 0;
    HYPRE_Int               found, sort;
    HYPRE_Int               stencil_marker;
-   HYPRE_Int              *stencil_ranks, *rank_stencils;
-   HYPRE_Int              *stencil_contrib_cnt;
-   HYPRE_Int             **stencil_contrib_i;
-   HYPRE_Real            **weight_contrib_i;
-   HYPRE_Real              weights[4]= {1.0, 0.25, 0.125, 0.0625};
+   HYPRE_Int              *stencil_ranks = NULL, *rank_stencils = NULL;
+   HYPRE_Int              *stencil_contrib_cnt = NULL;
+   HYPRE_Int             **stencil_contrib_i = NULL;
+   HYPRE_Real            **weight_contrib_i = NULL;
+   HYPRE_Real              weights[4] = {1.0, 0.25, 0.125, 0.0625};
    HYPRE_Real              sum;
    HYPRE_Int               abs_stencil_shape;
-   hypre_Box             **shift_box;
+   hypre_Box             **shift_box = NULL;
    hypre_Box               coarse_cell_box;
    HYPRE_Int               volume_coarse_cell_box;
-   HYPRE_Int              *volume_shift_box;
-   HYPRE_Int               max_contribut_size, stencil_i;
+   HYPRE_Int              *volume_shift_box = NULL;
+   HYPRE_Int               max_contribut_size = 0, stencil_i;
    HYPRE_BigInt            startrank, rank;
-   HYPRE_Real             *vals, *vals2;
+   HYPRE_Real             *vals = NULL, *vals2 = NULL;
 
    HYPRE_Int               i, j, k, l, m, n, ll, kk, jj;
    HYPRE_Int               nvars, var1, var2, var2_start;
@@ -166,7 +166,7 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
    HYPRE_Int              *box_connections;
    HYPRE_Int             **coarse_contrib_Uv;
    HYPRE_Int              *fine_interface_ranks;
-   HYPRE_Int               nUventries= hypre_SStructGraphNUVEntries(graph);
+   HYPRE_Int               nUventries = hypre_SStructGraphNUVEntries(graph);
    HYPRE_Int              *iUventries  = hypre_SStructGraphIUVEntries(graph);
    hypre_SStructUVEntry  **Uventries   = hypre_SStructGraphUVEntries(graph);
    hypre_SStructUVEntry   *Uventry;
@@ -205,6 +205,7 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
    hypre_BoxInit(&intersect_box, ndim);
    hypre_BoxInit(&loop_box, ndim);
    hypre_BoxInit(&coarse_cell_box, ndim);
+   hypre_SetIndex3(lindex, 0, 0, 0);
 
    /*--------------------------------------------------------------------------
     * Task: Coarsen the fbox and f/c connections to form the coarse grid
@@ -213,33 +214,38 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
 
    if (graph_type == HYPRE_SSTRUCT)
    {
-      startrank   = hypre_SStructGridGhstartRank(grid);
+      startrank = hypre_SStructGridGhstartRank(grid);
    }
-   if (graph_type == HYPRE_PARCSR)
+   else if (graph_type == HYPRE_PARCSR)
    {
-      startrank   = hypre_SStructGridStartRank(grid);
+      startrank = hypre_SStructGridStartRank(grid);
+   }
+   else
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Unsupported graph_type!");
+      return hypre_error_flag;
    }
 
    /*--------------------------------------------------------------------------
     * Fine grid strides by the refinement factors.
     *--------------------------------------------------------------------------*/
    hypre_SetIndex3(stridec, 1, 1, 1);
-   for (i= 0; i< ndim; i++)
+   for (i = 0; i < ndim; i++)
    {
-      stridef[i]= refine_factors[i];
+      stridef[i] = refine_factors[i];
    }
-   for (i= ndim; i< 3; i++)
+   for (i = ndim; i < 3; i++)
    {
-      stridef[i]= 1;
+      stridef[i] = 1;
    }
 
    /*--------------------------------------------------------------------------
     * Scaling for averaging row sum.
     *--------------------------------------------------------------------------*/
-   scaling= 1.0;
-   for (i= 0; i< ndim-2; i++)
+   scaling = 1.0;
+   for (i = 0; i < ndim - 2; i++)
    {
-      scaling*= refine_factors[0];
+      scaling *= refine_factors[0];
    }
 
    /*--------------------------------------------------------------------------
@@ -271,24 +277,27 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
    cboxi_fboxes            = hypre_TAlloc(HYPRE_Int **,  nvars, HYPRE_MEMORY_HOST);
    cboxi_fcnt              = hypre_TAlloc(HYPRE_Int *,  nvars, HYPRE_MEMORY_HOST);
 
-   for (var1= 0; var1< nvars; var1++)
+   for (var1 = 0; var1 < nvars; var1++)
    {
-      cgrid= hypre_SStructPGridSGrid(hypre_SStructPMatrixPGrid(A_crse), var1);
-      cgrid_boxes= hypre_StructGridBoxes(cgrid);
-      fgrid_crse_extents[var1]= hypre_TAlloc(hypre_BoxArray *,
-                                             hypre_BoxArraySize(cgrid_boxes), HYPRE_MEMORY_HOST);
-      fbox_interior[var1]= hypre_TAlloc(hypre_BoxArray *,
-                                        hypre_BoxArraySize(cgrid_boxes), HYPRE_MEMORY_HOST);
+      cgrid = hypre_SStructPGridSGrid(hypre_SStructPMatrixPGrid(A_crse), var1);
+      cgrid_boxes = hypre_StructGridBoxes(cgrid);
+      fgrid_crse_extents[var1] = hypre_TAlloc(hypre_BoxArray *,
+                                              hypre_BoxArraySize(cgrid_boxes), HYPRE_MEMORY_HOST);
+      fbox_interior[var1] = hypre_TAlloc(hypre_BoxArray *,
+                                         hypre_BoxArraySize(cgrid_boxes), HYPRE_MEMORY_HOST);
       fbox_bdy[var1]     = hypre_TAlloc(hypre_BoxArrayArray *,
                                         hypre_BoxArraySize(cgrid_boxes), HYPRE_MEMORY_HOST);
-      interior_fboxi[var1]= hypre_TAlloc(HYPRE_Int *,  hypre_BoxArraySize(cgrid_boxes), HYPRE_MEMORY_HOST);
-      bdy_fboxi[var1]     = hypre_TAlloc(HYPRE_Int *,  hypre_BoxArraySize(cgrid_boxes), HYPRE_MEMORY_HOST);
+      interior_fboxi[var1] = hypre_TAlloc(HYPRE_Int *,  hypre_BoxArraySize(cgrid_boxes),
+                                          HYPRE_MEMORY_HOST);
+      bdy_fboxi[var1]     = hypre_TAlloc(HYPRE_Int *,  hypre_BoxArraySize(cgrid_boxes),
+                                         HYPRE_MEMORY_HOST);
 
-      fgrid= hypre_SStructPGridSGrid(hypre_SStructPMatrixPGrid(A_pmatrix), var1);
-      fgrid_boxes= hypre_StructGridBoxes(fgrid);
+      fgrid = hypre_SStructPGridSGrid(hypre_SStructPMatrixPGrid(A_pmatrix), var1);
+      fgrid_boxes = hypre_StructGridBoxes(fgrid);
 
-      cboxi_fboxes[var1]= hypre_CTAlloc(HYPRE_Int *,  hypre_BoxArraySize(fgrid_boxes), HYPRE_MEMORY_HOST);
-      cboxi_fcnt[var1]  = hypre_CTAlloc(HYPRE_Int  ,  hypre_BoxArraySize(fgrid_boxes), HYPRE_MEMORY_HOST);
+      cboxi_fboxes[var1] = hypre_CTAlloc(HYPRE_Int *,  hypre_BoxArraySize(fgrid_boxes),
+                                         HYPRE_MEMORY_HOST);
+      cboxi_fcnt[var1]  = hypre_CTAlloc(HYPRE_Int,  hypre_BoxArraySize(fgrid_boxes), HYPRE_MEMORY_HOST);
 
       /*-----------------------------------------------------------------------
        *  Determine the fine grid boxes that are underlying a coarse grid box.
@@ -301,23 +310,23 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
        *-----------------------------------------------------------------------*/
       hypre_ForBoxI(ci, cgrid_boxes)
       {
-         cgrid_box= hypre_BoxArrayBox(cgrid_boxes, ci);
+         cgrid_box = hypre_BoxArrayBox(cgrid_boxes, ci);
          hypre_CopyIndex(hypre_BoxIMin(cgrid_box), cstart);
 
-         cnt1= 0;
-         temp1= hypre_CTAlloc(HYPRE_Int,  hypre_BoxArraySize(fgrid_boxes), HYPRE_MEMORY_HOST);
+         cnt1 = 0;
+         temp1 = hypre_CTAlloc(HYPRE_Int,  hypre_BoxArraySize(fgrid_boxes), HYPRE_MEMORY_HOST);
 
          hypre_ClearIndex(index_temp);
          hypre_ForBoxI(fi, fgrid_boxes)
          {
-            fgrid_box= hypre_BoxArrayBox(fgrid_boxes, fi);
+            fgrid_box = hypre_BoxArrayBox(fgrid_boxes, fi);
             hypre_CopyIndex(hypre_BoxIMin(fgrid_box), fstart);
-            for (i= 0; i< ndim; i++)
+            for (i = 0; i < ndim; i++)
             {
-               j= fstart[i]%refine_factors[i];
+               j = fstart[i] % refine_factors[i];
                if (j)
                {
-                  fstart[i]+= refine_factors[i] - j;
+                  fstart[i] += refine_factors[i] - j;
                }
             }
 
@@ -329,19 +338,19 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
             hypre_IntersectBoxes(&fine_box, cgrid_box, &intersect_box);
             if (hypre_BoxVolume(&intersect_box) > 0)
             {
-               temp1[cnt1++]= fi;
+               temp1[cnt1++] = fi;
             }
          }
 
-         fgrid_crse_extents[var1][ci]= hypre_BoxArrayCreate(cnt1, ndim);
+         fgrid_crse_extents[var1][ci] = hypre_BoxArrayCreate(cnt1, ndim);
          fbox_interior[var1][ci]  = hypre_BoxArrayCreate(cnt1, ndim);
          fbox_bdy[var1][ci]       = hypre_BoxArrayArrayCreate(cnt1, ndim);
          interior_fboxi[var1][ci] = hypre_CTAlloc(HYPRE_Int,  cnt1, HYPRE_MEMORY_HOST);
          bdy_fboxi[var1][ci]      = hypre_CTAlloc(HYPRE_Int,  cnt1, HYPRE_MEMORY_HOST);
 
-         for (fi= 0; fi< cnt1; fi++)
+         for (fi = 0; fi < cnt1; fi++)
          {
-            fgrid_box= hypre_BoxArrayBox(fgrid_boxes, temp1[fi]);
+            fgrid_box = hypre_BoxArrayBox(fgrid_boxes, temp1[fi]);
             hypre_CopyIndex(hypre_BoxIMin(fgrid_box), fstart);
             hypre_CopyIndex(hypre_BoxIMax(fgrid_box), fend);
 
@@ -353,19 +362,19 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
              * correspond to an f/c interface whether it has been adjusted or not.
              *--------------------------------------------------------------------*/
             hypre_SetIndex3(index1, 1, 1, 1);
-            for (i= 0; i< ndim; i++)
+            for (i = 0; i < ndim; i++)
             {
-               j= fstart[i]%refine_factors[i];
+               j = fstart[i] % refine_factors[i];
                if (j)
                {
-                  fstart[i]+= refine_factors[i] - j;
+                  fstart[i] += refine_factors[i] - j;
                   index1[i] = 0;
                }
 
-               j= fend[i]%refine_factors[i];
-               if (refine_factors[i]-1 - j)
+               j = fend[i] % refine_factors[i];
+               if (refine_factors[i] - 1 - j)
                {
-                  fend[i] +=(refine_factors[i]-1) - j;
+                  fend[i] += (refine_factors[i] - 1) - j;
                }
             }
 
@@ -387,25 +396,25 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
 
             /* the following index2 shift for ndim<3 is no problem since
                refine_factors[j]= 1 for j>=ndim. */
-            hypre_SetIndex3(index2, refine_factors[0]-1, refine_factors[1]-1,
-                            refine_factors[2]-1);
+            hypre_SetIndex3(index2, refine_factors[0] - 1, refine_factors[1] - 1,
+                            refine_factors[2] - 1);
             hypre_StructMapCoarseToFine(hypre_BoxIMax(&intersect_box), index2,
                                         refine_factors, hypre_BoxIMax(&fine_box));
 
             hypre_SetIndex3(index2, 1, 1, 1);
             hypre_CopyBox(&fine_box, &loop_box);
-            for (i= 0; i< ndim; i++)
+            for (i = 0; i < ndim; i++)
             {
-               hypre_BoxIMin(&loop_box)[i]+= refine_factors[i]*index1[i];
-               hypre_BoxIMax(&loop_box)[i]-= refine_factors[i]*index2[i];
+               hypre_BoxIMin(&loop_box)[i] += refine_factors[i] * index1[i];
+               hypre_BoxIMax(&loop_box)[i] -= refine_factors[i] * index2[i];
             }
             hypre_CopyBox(&loop_box,
                           hypre_BoxArrayBox(fbox_interior[var1][ci], fi));
-            interior_fboxi[var1][ci][fi]= temp1[fi];
+            interior_fboxi[var1][ci][fi] = temp1[fi];
 
             hypre_SubtractBoxes(&fine_box, &loop_box,
                                 hypre_BoxArrayArrayBoxArray(fbox_bdy[var1][ci], fi));
-            bdy_fboxi[var1][ci][fi]= temp1[fi];
+            bdy_fboxi[var1][ci][fi] = temp1[fi];
          }
          hypre_TFree(temp1, HYPRE_MEMORY_HOST);
 
@@ -416,14 +425,14 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
        *--------------------------------------------------------------------*/
       hypre_ForBoxI(fi, fgrid_boxes)
       {
-         fgrid_box= hypre_BoxArrayBox(fgrid_boxes, fi);
+         fgrid_box = hypre_BoxArrayBox(fgrid_boxes, fi);
          hypre_CopyIndex(hypre_BoxIMin(fgrid_box), fstart);
-         for (i= 0; i< ndim; i++)
+         for (i = 0; i < ndim; i++)
          {
-            j= fstart[i]%refine_factors[i];
+            j = fstart[i] % refine_factors[i];
             if (j)
             {
-               fstart[i]+= refine_factors[i] - j;
+               fstart[i] += refine_factors[i] - j;
             }
          }
 
@@ -432,22 +441,22 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
          hypre_StructMapFineToCoarse(hypre_BoxIMax(fgrid_box), index_temp,
                                      refine_factors, hypre_BoxIMax(&fine_box));
 
-         temp1= hypre_CTAlloc(HYPRE_Int,  hypre_BoxArraySize(cgrid_boxes), HYPRE_MEMORY_HOST);
+         temp1 = hypre_CTAlloc(HYPRE_Int,  hypre_BoxArraySize(cgrid_boxes), HYPRE_MEMORY_HOST);
          hypre_ForBoxI(i, cgrid_boxes)
          {
-            cgrid_box= hypre_BoxArrayBox(cgrid_boxes, i);
+            cgrid_box = hypre_BoxArrayBox(cgrid_boxes, i);
             hypre_IntersectBoxes(&fine_box, cgrid_box, &intersect_box);
             if (hypre_BoxVolume(&intersect_box) > 0)
             {
-               temp1[cboxi_fcnt[var1][fi]]= i;
+               temp1[cboxi_fcnt[var1][fi]] = i;
                cboxi_fcnt[var1][fi]++;
             }
          }
 
-         cboxi_fboxes[var1][fi]= hypre_TAlloc(HYPRE_Int,  cboxi_fcnt[var1][fi], HYPRE_MEMORY_HOST);
-         for (i= 0; i< cboxi_fcnt[var1][fi]; i++)
+         cboxi_fboxes[var1][fi] = hypre_TAlloc(HYPRE_Int,  cboxi_fcnt[var1][fi], HYPRE_MEMORY_HOST);
+         for (i = 0; i < cboxi_fcnt[var1][fi]; i++)
          {
-            cboxi_fboxes[var1][fi][i]= temp1[i];
+            cboxi_fboxes[var1][fi][i] = temp1[i];
          }
          hypre_TFree(temp1, HYPRE_MEMORY_HOST);
       }
@@ -478,11 +487,11 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
     *--------------------------------------------------------------------------*/
    hypre_ClearIndex(index_temp);
    hypre_CopyIndex(index_temp, hypre_BoxIMin(&coarse_cell_box));
-   hypre_SetIndex3(index_temp, refine_factors[0]-1, refine_factors[1]-1,
-                   refine_factors[2]-1 );
+   hypre_SetIndex3(index_temp, refine_factors[0] - 1, refine_factors[1] - 1,
+                   refine_factors[2] - 1 );
    hypre_CopyIndex(index_temp, hypre_BoxIMax(&coarse_cell_box));
 
-   volume_coarse_cell_box= hypre_BoxVolume(&coarse_cell_box);
+   volume_coarse_cell_box = hypre_BoxVolume(&coarse_cell_box);
 
 
    /*--------------------------------------------------------------------------
@@ -490,9 +499,9 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
     * for pointing to correct coarse stencil location.
     *--------------------------------------------------------------------------*/
    OffsetA =  hypre_CTAlloc(HYPRE_Int *,  2, HYPRE_MEMORY_HOST);
-   for (i= 0; i< 2; i++)
+   for (i = 0; i < 2; i++)
    {
-      OffsetA[i]= hypre_CTAlloc(HYPRE_Int,  refine_factors[i+1], HYPRE_MEMORY_HOST);
+      OffsetA[i] = hypre_CTAlloc(HYPRE_Int,  refine_factors[i + 1], HYPRE_MEMORY_HOST);
    }
 
    /*--------------------------------------------------------------------------
@@ -503,22 +512,22 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
     *  Mark the stencil_marker so that the first time the stencil is non-null,
     *  the stencil contribution cnts, weights, etc are computed.
     *--------------------------------------------------------------------------*/
-   stencil_marker= trueV;
-   for (var1= 0; var1< nvars; var1++)
+   stencil_marker = trueV;
+   for (var1 = 0; var1 < nvars; var1++)
    {
-      cgrid= hypre_SStructPGridSGrid(hypre_SStructPMatrixPGrid(A_crse), var1);
-      cgrid_boxes= hypre_StructGridBoxes(cgrid);
+      cgrid = hypre_SStructPGridSGrid(hypre_SStructPMatrixPGrid(A_crse), var1);
+      cgrid_boxes = hypre_StructGridBoxes(cgrid);
 
-      fgrid= hypre_SStructPGridSGrid(hypre_SStructPMatrixPGrid(A_pmatrix), var1);
-      fgrid_boxes= hypre_StructGridBoxes(fgrid);
+      fgrid = hypre_SStructPGridSGrid(hypre_SStructPMatrixPGrid(A_pmatrix), var1);
+      fgrid_boxes = hypre_StructGridBoxes(fgrid);
 
 
-      for (var2= 0; var2< nvars; var2++)
+      for (var2 = 0; var2 < nvars; var2++)
       {
-         stencils= hypre_SStructPMatrixSStencil(A_crse, var1, var2);
+         stencils = hypre_SStructPMatrixSStencil(A_crse, var1, var2);
          if (stencils != NULL)
          {
-            stencil_size= hypre_StructStencilSize(stencils);
+            stencil_size = hypre_StructStencilSize(stencils);
 
             /*-----------------------------------------------------------------
              * When stencil_marker== true, form the stencil contributions cnts,
@@ -534,15 +543,15 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
             {
                /* search for the first previous non-null stencil */
                found     = falseV;
-               var2_start= var2-1;
-               for (j= var1; j>= 0; j--)
+               var2_start = var2 - 1;
+               for (j = var1; j >= 0; j--)
                {
-                  for (i= var2_start; i>= 0; i--)
+                  for (i = var2_start; i >= 0; i--)
                   {
-                     stencils_last= hypre_SStructPMatrixSStencil(A_crse, j, i);
+                     stencils_last = hypre_SStructPMatrixSStencil(A_crse, j, i);
                      if (stencils_last != NULL)
                      {
-                        found= trueV;
+                        found = trueV;
                         break;
                      }
                   }
@@ -552,42 +561,42 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
                   }
                   else
                   {
-                     var2_start= nvars-1;
+                     var2_start = nvars - 1;
                   }
                }
 
                /*--------------------------------------------------------------
                 * Compare the stencil shape.
                 *--------------------------------------------------------------*/
-               stencil_last_size= hypre_StructStencilSize(stencils_last);
+               stencil_last_size = hypre_StructStencilSize(stencils_last);
                if (stencil_last_size != stencil_size)
                {
-                  stencil_marker= trueV;
+                  stencil_marker = trueV;
                   break;
                }
                else
                {
-                  found= falseV;
-                  for (i= 0; i< stencil_size; i++)
+                  found = falseV;
+                  for (i = 0; i < stencil_size; i++)
                   {
                      hypre_CopyIndex(hypre_StructStencilElement(stencils, i),
                                      stencil_shape_i);
-                     hypre_CopyIndex(hypre_StructStencilElement(stencils_last,i),
+                     hypre_CopyIndex(hypre_StructStencilElement(stencils_last, i),
                                      stencil_last_shape_i);
 
                      hypre_SetIndex3(index_temp,
-                                     stencil_shape_i[0]-stencil_last_shape_i[0],
-                                     stencil_shape_i[1]-stencil_last_shape_i[1],
-                                     stencil_shape_i[2]-stencil_last_shape_i[2]);
+                                     stencil_shape_i[0] - stencil_last_shape_i[0],
+                                     stencil_shape_i[1] - stencil_last_shape_i[1],
+                                     stencil_shape_i[2] - stencil_last_shape_i[2]);
 
                      AbsStencilShape(index_temp, abs_stencil_shape);
                      if (abs_stencil_shape)
                      {
-                        found= trueV;
-                        stencil_marker= trueV;
+                        found = trueV;
+                        stencil_marker = trueV;
                         hypre_TFree(stencil_contrib_cnt, HYPRE_MEMORY_HOST);
                         hypre_TFree(stencil_ranks, HYPRE_MEMORY_HOST);
-                        for (i= 0; i< stencil_size; i++)
+                        for (i = 0; i < stencil_size; i++)
                         {
                            hypre_BoxDestroy(shift_box[i]);
                         }
@@ -595,9 +604,9 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
                         hypre_TFree(volume_shift_box, HYPRE_MEMORY_HOST);
                         hypre_TFree(vals, HYPRE_MEMORY_HOST);
 
-                        for (j= 1; j< max_stencil_size; j++)
+                        for (j = 1; j < max_stencil_size; j++)
                         {
-                           stencil_i= rank_stencils[j];
+                           stencil_i = rank_stencils[j];
                            if (stencil_i != -1)
                            {
                               hypre_TFree(stencil_contrib_i[stencil_i], HYPRE_MEMORY_HOST);
@@ -643,9 +652,9 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
             {
 
                /* mark stencil_marker for the next stencil */
-               stencil_marker= falseV;
+               stencil_marker = falseV;
 
-               stencil_contrib_cnt= hypre_CTAlloc(HYPRE_Int,  stencil_size, HYPRE_MEMORY_HOST);
+               stencil_contrib_cnt = hypre_CTAlloc(HYPRE_Int,  stencil_size, HYPRE_MEMORY_HOST);
                stencil_contrib_i  = hypre_TAlloc(HYPRE_Int *,  stencil_size, HYPRE_MEMORY_HOST);
                weight_contrib_i   = hypre_TAlloc(HYPRE_Real *,  stencil_size, HYPRE_MEMORY_HOST);
                stencil_ranks      = hypre_TAlloc(HYPRE_Int,  stencil_size, HYPRE_MEMORY_HOST);
@@ -653,12 +662,12 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
                shift_box          = hypre_TAlloc(hypre_Box *,  stencil_size, HYPRE_MEMORY_HOST);
                volume_shift_box   = hypre_TAlloc(HYPRE_Int,  stencil_size, HYPRE_MEMORY_HOST);
 
-               for (i= 0; i< max_stencil_size; i++)
+               for (i = 0; i < max_stencil_size; i++)
                {
-                  rank_stencils[i]= -1;
+                  rank_stencils[i] = -1;
                   if (i < stencil_size)
                   {
-                     stencil_ranks[i]= -1;
+                     stencil_ranks[i] = -1;
                   }
                }
 
@@ -670,19 +679,19 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
                 *  dimensions. For j>=ndim,
                 *  hypre_BoxIMin(shift_box[i])[j]=hypre_BoxIMax(shift_box[i])[j]= 0.
                 *-----------------------------------------------------------------*/
-               for (i= 0; i< stencil_size; i++)
+               for (i = 0; i < stencil_size; i++)
                {
                   shift_box[i] = hypre_BoxCreate(ndim);
                   hypre_CopyIndex(hypre_StructStencilElement(stencils, i),
                                   stencil_shape_i);
                   MapStencilRank(stencil_shape_i, j);
-                  stencil_ranks[i]= j;
+                  stencil_ranks[i] = j;
                   rank_stencils[stencil_ranks[i]] = i;
 
                   hypre_SetIndex3(hypre_BoxIMin(shift_box[i]),
-                                  (refine_factors[0]-1)*stencil_shape_i[0],
-                                  (refine_factors[1]-1)*stencil_shape_i[1],
-                                  (refine_factors[2]-1)*stencil_shape_i[2]);
+                                  (refine_factors[0] - 1)*stencil_shape_i[0],
+                                  (refine_factors[1] - 1)*stencil_shape_i[1],
+                                  (refine_factors[2] - 1)*stencil_shape_i[2]);
 
                   hypre_AddIndexes(hypre_BoxIMin(shift_box[i]),
                                    hypre_BoxIMax(&coarse_cell_box), 3,
@@ -690,7 +699,7 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
 
                   hypre_IntersectBoxes(&coarse_cell_box, shift_box[i], shift_box[i]);
 
-                  volume_shift_box[i]= hypre_BoxVolume(shift_box[i]);
+                  volume_shift_box[i] = hypre_BoxVolume(shift_box[i]);
                }
 
                /*-----------------------------------------------------------------
@@ -700,325 +709,341 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
                 *-----------------------------------------------------------------*/
 
                /* east */
-               stencil_i= rank_stencils[1];
+               stencil_i = rank_stencils[1];
                if (stencil_i != -1)
                {
                   stencil_contrib_cnt[stencil_i]++;
-                  for (i= 4; i<= 7; i+=3)
+                  for (i = 4; i <= 7; i += 3)
                   {
                      if (rank_stencils[i] != -1)       /* ne or se */
+                     {
                         stencil_contrib_cnt[stencil_i]++;
+                     }
                   }
 
                   if (ndim > 2)
                   {
-                     for (j= 1; j<= 2; j++)
+                     for (j = 1; j <= 2; j++)
                      {
-                        for (i= 1; i<= 7; i+=3)
+                        for (i = 1; i <= 7; i += 3)
                         {
-                           if (rank_stencils[j*9+i] != -1)  /* bottom or top planes */
+                           if (rank_stencils[j * 9 + i] != -1) /* bottom or top planes */
+                           {
                               stencil_contrib_cnt[stencil_i]++;
+                           }
                         }
                      }
                   }
-                  max_contribut_size= stencil_contrib_cnt[stencil_i];
+                  max_contribut_size = stencil_contrib_cnt[stencil_i];
                }
 
                /* fill up the east contribution stencil indices */
                if (stencil_i != -1)
                {
-                  stencil_contrib_i[stencil_i]=
+                  stencil_contrib_i[stencil_i] =
                      hypre_TAlloc(HYPRE_Int,  stencil_contrib_cnt[stencil_i], HYPRE_MEMORY_HOST);
                   weight_contrib_i[stencil_i] =
                      hypre_TAlloc(HYPRE_Real,  stencil_contrib_cnt[stencil_i], HYPRE_MEMORY_HOST);
-                  sum= 0.0;
-                  k= 0;
+                  sum = 0.0;
+                  k = 0;
 
-                  stencil_contrib_i[stencil_i][k]= stencil_i;
-                  AbsStencilShape( hypre_StructStencilElement(stencils,stencil_i),
+                  stencil_contrib_i[stencil_i][k] = stencil_i;
+                  AbsStencilShape( hypre_StructStencilElement(stencils, stencil_i),
                                    abs_stencil_shape );
                   weight_contrib_i[stencil_i][k++] = weights[abs_stencil_shape];
-                  sum+= weights[abs_stencil_shape];
+                  sum += weights[abs_stencil_shape];
 
-                  for (i= 4; i<= 7; i+=3)
+                  for (i = 4; i <= 7; i += 3)
                   {
                      if (rank_stencils[i] != -1)
                      {
                         stencil_contrib_i[stencil_i][k] = rank_stencils[i];
 
-                        AbsStencilShape(hypre_StructStencilElement(stencils,rank_stencils[i]),
+                        AbsStencilShape(hypre_StructStencilElement(stencils, rank_stencils[i]),
                                         abs_stencil_shape );
                         weight_contrib_i[stencil_i][k++] = weights[abs_stencil_shape];
-                        sum+= weights[abs_stencil_shape];
+                        sum += weights[abs_stencil_shape];
                      }
                   }
 
                   if (ndim > 2)
                   {
-                     for (j= 1; j<= 2; j++)
+                     for (j = 1; j <= 2; j++)
                      {
-                        for (i= 1; i<= 7; i+=3)
+                        for (i = 1; i <= 7; i += 3)
                         {
-                           if (rank_stencils[j*9+i] != -1)
+                           if (rank_stencils[j * 9 + i] != -1)
                            {
-                              stencil_contrib_i[stencil_i][k] = rank_stencils[j*9+i];
+                              stencil_contrib_i[stencil_i][k] = rank_stencils[j * 9 + i];
 
                               AbsStencilShape(
-                                 hypre_StructStencilElement(stencils,rank_stencils[j*9+i]),
+                                 hypre_StructStencilElement(stencils, rank_stencils[j * 9 + i]),
                                  abs_stencil_shape );
                               weight_contrib_i[stencil_i][k++] = weights[abs_stencil_shape];
-                              sum+= weights[abs_stencil_shape];
+                              sum += weights[abs_stencil_shape];
                            }
                         }
                      }
                   }
 
-                  for (i= 0; i< k ; i++)
+                  for (i = 0; i < k ; i++)
                   {
-                     weight_contrib_i[stencil_i][i]/= sum;
+                     weight_contrib_i[stencil_i][i] /= sum;
                   }
                }
 
 
                /* west */
-               stencil_i= rank_stencils[2];
+               stencil_i = rank_stencils[2];
                if (stencil_i != -1)
                {
                   stencil_contrib_cnt[stencil_i]++;
-                  for (i= 5; i<= 8; i+=3)
+                  for (i = 5; i <= 8; i += 3)
                   {
                      if (rank_stencils[i] != -1)       /* nw or sw */
+                     {
                         stencil_contrib_cnt[stencil_i]++;
+                     }
                   }
 
                   if (ndim > 2)
                   {
-                     for (j= 1; j<= 2; j++)
+                     for (j = 1; j <= 2; j++)
                      {
-                        for (i= 2; i<= 8; i+=3)
+                        for (i = 2; i <= 8; i += 3)
                         {
-                           if (rank_stencils[j*9+i] != -1)  /* bottom or top planes */
+                           if (rank_stencils[j * 9 + i] != -1) /* bottom or top planes */
+                           {
                               stencil_contrib_cnt[stencil_i]++;
+                           }
                         }
                      }
                   }
-                  max_contribut_size= hypre_max( max_contribut_size,
-                                                 stencil_contrib_cnt[stencil_i] );
+                  max_contribut_size = hypre_max( max_contribut_size,
+                                                  stencil_contrib_cnt[stencil_i] );
                }
 
                if (stencil_i != -1)
                {
-                  stencil_contrib_i[stencil_i]=
+                  stencil_contrib_i[stencil_i] =
                      hypre_TAlloc(HYPRE_Int,  stencil_contrib_cnt[stencil_i], HYPRE_MEMORY_HOST);
                   weight_contrib_i[stencil_i] =
                      hypre_TAlloc(HYPRE_Real,  stencil_contrib_cnt[stencil_i], HYPRE_MEMORY_HOST);
-                  sum= 0.0;
-                  k= 0;
+                  sum = 0.0;
+                  k = 0;
 
-                  stencil_contrib_i[stencil_i][k]= stencil_i;
-                  AbsStencilShape( hypre_StructStencilElement(stencils,stencil_i),
+                  stencil_contrib_i[stencil_i][k] = stencil_i;
+                  AbsStencilShape( hypre_StructStencilElement(stencils, stencil_i),
                                    abs_stencil_shape );
                   weight_contrib_i[stencil_i][k++] = weights[abs_stencil_shape];
-                  sum+= weights[abs_stencil_shape];
+                  sum += weights[abs_stencil_shape];
 
-                  for (i= 5; i<= 8; i+=3)
+                  for (i = 5; i <= 8; i += 3)
                   {
                      if (rank_stencils[i] != -1)
                      {
                         stencil_contrib_i[stencil_i][k] = rank_stencils[i];
 
-                        AbsStencilShape(hypre_StructStencilElement(stencils,rank_stencils[i]),
+                        AbsStencilShape(hypre_StructStencilElement(stencils, rank_stencils[i]),
                                         abs_stencil_shape );
                         weight_contrib_i[stencil_i][k++] = weights[abs_stencil_shape];
-                        sum+= weights[abs_stencil_shape];
+                        sum += weights[abs_stencil_shape];
                      }
                   }
 
                   if (ndim > 2)
                   {
-                     for (j= 1; j<= 2; j++)
+                     for (j = 1; j <= 2; j++)
                      {
-                        for (i= 2; i<= 8; i+=3)
+                        for (i = 2; i <= 8; i += 3)
                         {
-                           if (rank_stencils[j*9+i] != -1)
+                           if (rank_stencils[j * 9 + i] != -1)
                            {
-                              stencil_contrib_i[stencil_i][k] = rank_stencils[j*9+i];
+                              stencil_contrib_i[stencil_i][k] = rank_stencils[j * 9 + i];
 
                               AbsStencilShape(
-                                 hypre_StructStencilElement(stencils,rank_stencils[j*9+i]),
+                                 hypre_StructStencilElement(stencils, rank_stencils[j * 9 + i]),
                                  abs_stencil_shape );
                               weight_contrib_i[stencil_i][k++] = weights[abs_stencil_shape];
-                              sum+= weights[abs_stencil_shape];
+                              sum += weights[abs_stencil_shape];
                            }
                         }
                      }
                   }
 
-                  for (i= 0; i< k ; i++)
+                  for (i = 0; i < k ; i++)
                   {
-                     weight_contrib_i[stencil_i][i]/= sum;
+                     weight_contrib_i[stencil_i][i] /= sum;
                   }
                }
 
 
                /* north */
-               stencil_i= rank_stencils[3];
+               stencil_i = rank_stencils[3];
                if (stencil_i != -1)
                {
                   stencil_contrib_cnt[stencil_i]++;
-                  for (i= 4; i<= 5; i++)
+                  for (i = 4; i <= 5; i++)
                   {
                      if (rank_stencils[i] != -1)       /* ne or nw */
+                     {
                         stencil_contrib_cnt[stencil_i]++;
+                     }
                   }
 
                   if (ndim > 2)
                   {
-                     for (j= 1; j<= 2; j++)
+                     for (j = 1; j <= 2; j++)
                      {
-                        for (i= 3; i<= 5; i++)
+                        for (i = 3; i <= 5; i++)
                         {
-                           if (rank_stencils[j*9+i] != -1)  /* bottom or top planes */
+                           if (rank_stencils[j * 9 + i] != -1) /* bottom or top planes */
+                           {
                               stencil_contrib_cnt[stencil_i]++;
+                           }
                         }
                      }
                   }
-                  max_contribut_size= hypre_max( max_contribut_size,
-                                                 stencil_contrib_cnt[stencil_i] );
+                  max_contribut_size = hypre_max( max_contribut_size,
+                                                  stencil_contrib_cnt[stencil_i] );
                }
 
                if (stencil_i != -1)
                {
-                  stencil_contrib_i[stencil_i]=
+                  stencil_contrib_i[stencil_i] =
                      hypre_TAlloc(HYPRE_Int,  stencil_contrib_cnt[stencil_i], HYPRE_MEMORY_HOST);
                   weight_contrib_i[stencil_i] =
                      hypre_TAlloc(HYPRE_Real,  stencil_contrib_cnt[stencil_i], HYPRE_MEMORY_HOST);
-                  sum= 0.0;
-                  k= 0;
+                  sum = 0.0;
+                  k = 0;
 
-                  stencil_contrib_i[stencil_i][k]= stencil_i;
-                  AbsStencilShape( hypre_StructStencilElement(stencils,stencil_i),
+                  stencil_contrib_i[stencil_i][k] = stencil_i;
+                  AbsStencilShape( hypre_StructStencilElement(stencils, stencil_i),
                                    abs_stencil_shape );
                   weight_contrib_i[stencil_i][k++] = weights[abs_stencil_shape];
-                  sum+= weights[abs_stencil_shape];
+                  sum += weights[abs_stencil_shape];
 
-                  for (i= 4; i<= 5; i++)
+                  for (i = 4; i <= 5; i++)
                   {
                      if (rank_stencils[i] != -1)
                      {
                         stencil_contrib_i[stencil_i][k] = rank_stencils[i];
 
-                        AbsStencilShape(hypre_StructStencilElement(stencils,rank_stencils[i]),
+                        AbsStencilShape(hypre_StructStencilElement(stencils, rank_stencils[i]),
                                         abs_stencil_shape );
                         weight_contrib_i[stencil_i][k++] = weights[abs_stencil_shape];
-                        sum+= weights[abs_stencil_shape];
+                        sum += weights[abs_stencil_shape];
                      }
                   }
 
                   if (ndim > 2)
                   {
-                     for (j= 1; j<= 2; j++)
+                     for (j = 1; j <= 2; j++)
                      {
-                        for (i= 3; i<= 5; i++)
+                        for (i = 3; i <= 5; i++)
                         {
-                           if (rank_stencils[j*9+i] != -1)
+                           if (rank_stencils[j * 9 + i] != -1)
                            {
-                              stencil_contrib_i[stencil_i][k] = rank_stencils[j*9+i];
+                              stencil_contrib_i[stencil_i][k] = rank_stencils[j * 9 + i];
 
                               AbsStencilShape(
-                                 hypre_StructStencilElement(stencils,rank_stencils[j*9+i]),
+                                 hypre_StructStencilElement(stencils, rank_stencils[j * 9 + i]),
                                  abs_stencil_shape );
                               weight_contrib_i[stencil_i][k++] = weights[abs_stencil_shape];
-                              sum+= weights[abs_stencil_shape];
+                              sum += weights[abs_stencil_shape];
                            }
                         }
                      }
                   }
 
-                  for (i= 0; i< k ; i++)
+                  for (i = 0; i < k ; i++)
                   {
-                     weight_contrib_i[stencil_i][i]/= sum;
+                     weight_contrib_i[stencil_i][i] /= sum;
                   }
                }
 
                /* south */
-               stencil_i= rank_stencils[6];
+               stencil_i = rank_stencils[6];
                if (stencil_i != -1)
                {
                   stencil_contrib_cnt[stencil_i]++;
-                  for (i= 7; i<= 8; i++)
+                  for (i = 7; i <= 8; i++)
                   {
                      if (rank_stencils[i] != -1)       /* ne or nw */
+                     {
                         stencil_contrib_cnt[stencil_i]++;
+                     }
                   }
 
                   if (ndim > 2)
                   {
-                     for (j= 1; j<= 2; j++)
+                     for (j = 1; j <= 2; j++)
                      {
-                        for (i= 6; i<= 8; i++)
+                        for (i = 6; i <= 8; i++)
                         {
-                           if (rank_stencils[j*9+i] != -1)  /* bottom or top planes */
+                           if (rank_stencils[j * 9 + i] != -1) /* bottom or top planes */
+                           {
                               stencil_contrib_cnt[stencil_i]++;
+                           }
                         }
                      }
                   }
-                  max_contribut_size= hypre_max( max_contribut_size,
-                                                 stencil_contrib_cnt[stencil_i] );
+                  max_contribut_size = hypre_max( max_contribut_size,
+                                                  stencil_contrib_cnt[stencil_i] );
                }
 
 
                if (stencil_i != -1)
                {
-                  stencil_contrib_i[stencil_i]=
+                  stencil_contrib_i[stencil_i] =
                      hypre_TAlloc(HYPRE_Int,  stencil_contrib_cnt[stencil_i], HYPRE_MEMORY_HOST);
                   weight_contrib_i[stencil_i] =
                      hypre_TAlloc(HYPRE_Real,  stencil_contrib_cnt[stencil_i], HYPRE_MEMORY_HOST);
-                  sum= 0.0;
-                  k= 0;
+                  sum = 0.0;
+                  k = 0;
 
-                  stencil_contrib_i[stencil_i][k]= stencil_i;
-                  AbsStencilShape( hypre_StructStencilElement(stencils,stencil_i),
+                  stencil_contrib_i[stencil_i][k] = stencil_i;
+                  AbsStencilShape( hypre_StructStencilElement(stencils, stencil_i),
                                    abs_stencil_shape );
                   weight_contrib_i[stencil_i][k++] = weights[abs_stencil_shape];
-                  sum+= weights[abs_stencil_shape];
+                  sum += weights[abs_stencil_shape];
 
-                  for (i= 7; i<= 8; i++)
+                  for (i = 7; i <= 8; i++)
                   {
                      if (rank_stencils[i] != -1)
                      {
                         stencil_contrib_i[stencil_i][k] = rank_stencils[i];
 
-                        AbsStencilShape(hypre_StructStencilElement(stencils,rank_stencils[i]),
+                        AbsStencilShape(hypre_StructStencilElement(stencils, rank_stencils[i]),
                                         abs_stencil_shape );
                         weight_contrib_i[stencil_i][k++] = weights[abs_stencil_shape];
-                        sum+= weights[abs_stencil_shape];
+                        sum += weights[abs_stencil_shape];
                      }
                   }
 
                   if (ndim > 2)
                   {
-                     for (j= 1; j<= 2; j++)
+                     for (j = 1; j <= 2; j++)
                      {
-                        for (i= 6; i<= 8; i++)
+                        for (i = 6; i <= 8; i++)
                         {
-                           if (rank_stencils[j*9+i] != -1)
+                           if (rank_stencils[j * 9 + i] != -1)
                            {
-                              stencil_contrib_i[stencil_i][k] = rank_stencils[j*9+i];
+                              stencil_contrib_i[stencil_i][k] = rank_stencils[j * 9 + i];
 
                               AbsStencilShape(
-                                 hypre_StructStencilElement(stencils,rank_stencils[j*9+i]),
+                                 hypre_StructStencilElement(stencils, rank_stencils[j * 9 + i]),
                                  abs_stencil_shape );
                               weight_contrib_i[stencil_i][k++] = weights[abs_stencil_shape];
-                              sum+= weights[abs_stencil_shape];
+                              sum += weights[abs_stencil_shape];
                            }
                         }
                      }
                   }
 
-                  for (i= 0; i< k ; i++)
+                  for (i = 0; i < k ; i++)
                   {
-                     weight_contrib_i[stencil_i][i]/= sum;
+                     weight_contrib_i[stencil_i][i] /= sum;
                   }
                }
 
@@ -1028,29 +1053,29 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
                if (ndim == 2)
                {
                   /* corners: ne  & nw */
-                  for (i= 4; i<= 5; i++)
+                  for (i = 4; i <= 5; i++)
                   {
-                     stencil_i= rank_stencils[i];
+                     stencil_i = rank_stencils[i];
                      if (stencil_i != -1)
                      {
                         stencil_contrib_cnt[stencil_i]++;
-                        stencil_contrib_i[stencil_i]= hypre_TAlloc(HYPRE_Int,  1, HYPRE_MEMORY_HOST);
+                        stencil_contrib_i[stencil_i] = hypre_TAlloc(HYPRE_Int,  1, HYPRE_MEMORY_HOST);
                         weight_contrib_i[stencil_i] =  hypre_TAlloc(HYPRE_Real,  1, HYPRE_MEMORY_HOST);
-                        stencil_contrib_i[stencil_i][0]= stencil_i;
+                        stencil_contrib_i[stencil_i][0] = stencil_i;
                         weight_contrib_i[stencil_i][0] = weights[0];
                      }
                   }
 
                   /* corners: se  & sw */
-                  for (i= 7; i<= 8; i++)
+                  for (i = 7; i <= 8; i++)
                   {
-                     stencil_i= rank_stencils[i];
+                     stencil_i = rank_stencils[i];
                      if (stencil_i != -1)
                      {
                         stencil_contrib_cnt[stencil_i]++;
-                        stencil_contrib_i[stencil_i]= hypre_TAlloc(HYPRE_Int,  1, HYPRE_MEMORY_HOST);
+                        stencil_contrib_i[stencil_i] = hypre_TAlloc(HYPRE_Int,  1, HYPRE_MEMORY_HOST);
                         weight_contrib_i[stencil_i] =  hypre_TAlloc(HYPRE_Real,  1, HYPRE_MEMORY_HOST);
-                        stencil_contrib_i[stencil_i][0]= stencil_i;
+                        stencil_contrib_i[stencil_i][0] = stencil_i;
                         weight_contrib_i[stencil_i][0] = weights[0];
                      }
                   }
@@ -1062,701 +1087,729 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
                if (ndim > 2)
                {
                   /* sides: top */
-                  stencil_i= rank_stencils[9];
+                  stencil_i = rank_stencils[9];
                   if (stencil_i != -1)
                   {
                      stencil_contrib_cnt[stencil_i]++;
-                     for (i=1; i<= 8; i++)
+                     for (i = 1; i <= 8; i++)
                      {
-                        if (rank_stencils[9+i] != -1)
+                        if (rank_stencils[9 + i] != -1)
+                        {
                            stencil_contrib_cnt[stencil_i]++;
+                        }
                      }
-                     max_contribut_size= hypre_max( max_contribut_size,
-                                                    stencil_contrib_cnt[stencil_i] );
+                     max_contribut_size = hypre_max( max_contribut_size,
+                                                     stencil_contrib_cnt[stencil_i] );
                   }
 
                   if (stencil_i != -1)
                   {
-                     stencil_contrib_i[stencil_i]=
+                     stencil_contrib_i[stencil_i] =
                         hypre_TAlloc(HYPRE_Int,  stencil_contrib_cnt[stencil_i], HYPRE_MEMORY_HOST);
                      weight_contrib_i[stencil_i] =
                         hypre_TAlloc(HYPRE_Real,  stencil_contrib_cnt[stencil_i], HYPRE_MEMORY_HOST);
-                     sum= 0.0;
-                     k= 0;
+                     sum = 0.0;
+                     k = 0;
 
-                     stencil_contrib_i[stencil_i][k]= stencil_i;
-                     AbsStencilShape( hypre_StructStencilElement(stencils,stencil_i),
+                     stencil_contrib_i[stencil_i][k] = stencil_i;
+                     AbsStencilShape( hypre_StructStencilElement(stencils, stencil_i),
                                       abs_stencil_shape );
                      weight_contrib_i[stencil_i][k++] = weights[abs_stencil_shape];
-                     sum+= weights[abs_stencil_shape];
+                     sum += weights[abs_stencil_shape];
 
-                     for (i=1; i<= 8; i++)
+                     for (i = 1; i <= 8; i++)
                      {
-                        if (rank_stencils[9+i] != -1)
+                        if (rank_stencils[9 + i] != -1)
                         {
-                           stencil_contrib_i[stencil_i][k]= rank_stencils[9+i];
+                           stencil_contrib_i[stencil_i][k] = rank_stencils[9 + i];
 
-                           AbsStencilShape(hypre_StructStencilElement(stencils,rank_stencils[9+i]),
+                           AbsStencilShape(hypre_StructStencilElement(stencils, rank_stencils[9 + i]),
                                            abs_stencil_shape );
                            weight_contrib_i[stencil_i][k++] = weights[abs_stencil_shape];
-                           sum+= weights[abs_stencil_shape];
+                           sum += weights[abs_stencil_shape];
                         }
                      }
 
-                     for (i= 0; i< k ; i++)
+                     for (i = 0; i < k ; i++)
                      {
-                        weight_contrib_i[stencil_i][i]/= sum;
+                        weight_contrib_i[stencil_i][i] /= sum;
                      }
                   }
 
                   /* sides: bottom */
-                  stencil_i= rank_stencils[18];
+                  stencil_i = rank_stencils[18];
                   if (stencil_i != -1)
                   {
                      stencil_contrib_cnt[stencil_i]++;
-                     for (i=1; i<= 8; i++)
+                     for (i = 1; i <= 8; i++)
                      {
-                        if (rank_stencils[18+i] != -1)
+                        if (rank_stencils[18 + i] != -1)
+                        {
                            stencil_contrib_cnt[stencil_i]++;
+                        }
                      }
-                     max_contribut_size= hypre_max( max_contribut_size,
-                                                    stencil_contrib_cnt[stencil_i] );
+                     max_contribut_size = hypre_max( max_contribut_size,
+                                                     stencil_contrib_cnt[stencil_i] );
                   }
 
                   if (stencil_i != -1)
                   {
-                     stencil_contrib_i[stencil_i]=
+                     stencil_contrib_i[stencil_i] =
                         hypre_TAlloc(HYPRE_Int,  stencil_contrib_cnt[stencil_i], HYPRE_MEMORY_HOST);
                      weight_contrib_i[stencil_i] =
                         hypre_TAlloc(HYPRE_Real,  stencil_contrib_cnt[stencil_i], HYPRE_MEMORY_HOST);
-                     sum= 0.0;
-                     k= 0;
+                     sum = 0.0;
+                     k = 0;
 
-                     stencil_contrib_i[stencil_i][k]= stencil_i;
-                     AbsStencilShape( hypre_StructStencilElement(stencils,stencil_i),
+                     stencil_contrib_i[stencil_i][k] = stencil_i;
+                     AbsStencilShape( hypre_StructStencilElement(stencils, stencil_i),
                                       abs_stencil_shape );
                      weight_contrib_i[stencil_i][k++] = weights[abs_stencil_shape];
-                     sum+= weights[abs_stencil_shape];
+                     sum += weights[abs_stencil_shape];
 
-                     for (i=1; i<= 8; i++)
+                     for (i = 1; i <= 8; i++)
                      {
-                        if (rank_stencils[18+i] != -1)
+                        if (rank_stencils[18 + i] != -1)
                         {
-                           stencil_contrib_i[stencil_i][k]= rank_stencils[18+i];
+                           stencil_contrib_i[stencil_i][k] = rank_stencils[18 + i];
 
-                           AbsStencilShape(hypre_StructStencilElement(stencils,rank_stencils[18+i]),
+                           AbsStencilShape(hypre_StructStencilElement(stencils, rank_stencils[18 + i]),
                                            abs_stencil_shape );
                            weight_contrib_i[stencil_i][k++] = weights[abs_stencil_shape];
-                           sum+= weights[abs_stencil_shape];
+                           sum += weights[abs_stencil_shape];
                         }
                      }
 
-                     for (i= 0; i< k ; i++)
+                     for (i = 0; i < k ; i++)
                      {
-                        weight_contrib_i[stencil_i][i]/= sum;
+                        weight_contrib_i[stencil_i][i] /= sum;
                      }
                   }
 
                   /* edges: cne */
-                  stencil_i= rank_stencils[4];
+                  stencil_i = rank_stencils[4];
                   if (stencil_i != -1)
                   {
                      stencil_contrib_cnt[stencil_i]++;
-                     for (j=1; j<= 2; j++)
+                     for (j = 1; j <= 2; j++)
                      {
-                        if (rank_stencils[j*9+4] != -1)  /* bottom or top planes */
+                        if (rank_stencils[j * 9 + 4] != -1) /* bottom or top planes */
+                        {
                            stencil_contrib_cnt[stencil_i]++;
+                        }
                      }
-                     max_contribut_size= hypre_max( max_contribut_size,
-                                                    stencil_contrib_cnt[stencil_i] );
+                     max_contribut_size = hypre_max( max_contribut_size,
+                                                     stencil_contrib_cnt[stencil_i] );
                   }
 
                   if (stencil_i != -1)
                   {
-                     stencil_contrib_i[stencil_i]=
+                     stencil_contrib_i[stencil_i] =
                         hypre_TAlloc(HYPRE_Int,  stencil_contrib_cnt[stencil_i], HYPRE_MEMORY_HOST);
                      weight_contrib_i[stencil_i] =
                         hypre_TAlloc(HYPRE_Real,  stencil_contrib_cnt[stencil_i], HYPRE_MEMORY_HOST);
-                     sum= 0.0;
-                     k= 0;
+                     sum = 0.0;
+                     k = 0;
 
-                     stencil_contrib_i[stencil_i][k]= stencil_i;
-                     AbsStencilShape( hypre_StructStencilElement(stencils,stencil_i),
+                     stencil_contrib_i[stencil_i][k] = stencil_i;
+                     AbsStencilShape( hypre_StructStencilElement(stencils, stencil_i),
                                       abs_stencil_shape );
                      weight_contrib_i[stencil_i][k++] = weights[abs_stencil_shape];
-                     sum+= weights[abs_stencil_shape];
+                     sum += weights[abs_stencil_shape];
 
-                     for (j=1; j<= 2; j++)
+                     for (j = 1; j <= 2; j++)
                      {
-                        if (rank_stencils[j*9+4] != -1)
+                        if (rank_stencils[j * 9 + 4] != -1)
                         {
-                           stencil_contrib_i[stencil_i][k]= rank_stencils[j*9+4];
+                           stencil_contrib_i[stencil_i][k] = rank_stencils[j * 9 + 4];
 
-                           AbsStencilShape(hypre_StructStencilElement(stencils,rank_stencils[j*9+4]),
+                           AbsStencilShape(hypre_StructStencilElement(stencils, rank_stencils[j * 9 + 4]),
                                            abs_stencil_shape );
                            weight_contrib_i[stencil_i][k++] = weights[abs_stencil_shape];
-                           sum+= weights[abs_stencil_shape];
+                           sum += weights[abs_stencil_shape];
                         }
                      }
 
-                     for (i= 0; i< k ; i++)
+                     for (i = 0; i < k ; i++)
                      {
-                        weight_contrib_i[stencil_i][i]/= sum;
+                        weight_contrib_i[stencil_i][i] /= sum;
                      }
                   }
 
                   /* edges: cse */
-                  stencil_i= rank_stencils[7];
+                  stencil_i = rank_stencils[7];
                   if (stencil_i != -1)
                   {
                      stencil_contrib_cnt[stencil_i]++;
-                     for (j=1; j<= 2; j++)
+                     for (j = 1; j <= 2; j++)
                      {
-                        if (rank_stencils[j*9+7] != -1)  /* bottom or top planes */
+                        if (rank_stencils[j * 9 + 7] != -1) /* bottom or top planes */
+                        {
                            stencil_contrib_cnt[stencil_i]++;
+                        }
                      }
-                     max_contribut_size= hypre_max( max_contribut_size,
-                                                    stencil_contrib_cnt[stencil_i] );
+                     max_contribut_size = hypre_max( max_contribut_size,
+                                                     stencil_contrib_cnt[stencil_i] );
                   }
 
                   if (stencil_i != -1)
                   {
-                     stencil_contrib_i[stencil_i]=
+                     stencil_contrib_i[stencil_i] =
                         hypre_TAlloc(HYPRE_Int,  stencil_contrib_cnt[stencil_i], HYPRE_MEMORY_HOST);
                      weight_contrib_i[stencil_i] =
                         hypre_TAlloc(HYPRE_Real,  stencil_contrib_cnt[stencil_i], HYPRE_MEMORY_HOST);
-                     sum= 0.0;
-                     k= 0;
+                     sum = 0.0;
+                     k = 0;
 
-                     stencil_contrib_i[stencil_i][k]= stencil_i;
-                     AbsStencilShape( hypre_StructStencilElement(stencils,stencil_i),
+                     stencil_contrib_i[stencil_i][k] = stencil_i;
+                     AbsStencilShape( hypre_StructStencilElement(stencils, stencil_i),
                                       abs_stencil_shape );
                      weight_contrib_i[stencil_i][k++] = weights[abs_stencil_shape];
-                     sum+= weights[abs_stencil_shape];
+                     sum += weights[abs_stencil_shape];
 
-                     for (j=1; j<= 2; j++)
+                     for (j = 1; j <= 2; j++)
                      {
-                        if (rank_stencils[j*9+7] != -1)
+                        if (rank_stencils[j * 9 + 7] != -1)
                         {
-                           stencil_contrib_i[stencil_i][k]= rank_stencils[j*9+7];
+                           stencil_contrib_i[stencil_i][k] = rank_stencils[j * 9 + 7];
 
-                           AbsStencilShape(hypre_StructStencilElement(stencils,rank_stencils[j*9+7]),
+                           AbsStencilShape(hypre_StructStencilElement(stencils, rank_stencils[j * 9 + 7]),
                                            abs_stencil_shape );
                            weight_contrib_i[stencil_i][k++] = weights[abs_stencil_shape];
-                           sum+= weights[abs_stencil_shape];
+                           sum += weights[abs_stencil_shape];
                         }
                      }
 
-                     for (i= 0; i< k ; i++)
+                     for (i = 0; i < k ; i++)
                      {
-                        weight_contrib_i[stencil_i][i]/= sum;
+                        weight_contrib_i[stencil_i][i] /= sum;
                      }
                   }
 
                   /* edges: cnw */
-                  stencil_i= rank_stencils[5];
+                  stencil_i = rank_stencils[5];
                   if (stencil_i != -1)
                   {
                      stencil_contrib_cnt[stencil_i]++;
-                     for (j=1; j<= 2; j++)
+                     for (j = 1; j <= 2; j++)
                      {
-                        if (rank_stencils[j*9+5] != -1)  /* bottom or top planes */
+                        if (rank_stencils[j * 9 + 5] != -1) /* bottom or top planes */
+                        {
                            stencil_contrib_cnt[stencil_i]++;
+                        }
                      }
-                     max_contribut_size= hypre_max( max_contribut_size,
-                                                    stencil_contrib_cnt[stencil_i] );
+                     max_contribut_size = hypre_max( max_contribut_size,
+                                                     stencil_contrib_cnt[stencil_i] );
                   }
 
                   if (stencil_i != -1)
                   {
-                     stencil_contrib_i[stencil_i]=
+                     stencil_contrib_i[stencil_i] =
                         hypre_TAlloc(HYPRE_Int,  stencil_contrib_cnt[stencil_i], HYPRE_MEMORY_HOST);
                      weight_contrib_i[stencil_i] =
                         hypre_TAlloc(HYPRE_Real,  stencil_contrib_cnt[stencil_i], HYPRE_MEMORY_HOST);
-                     sum= 0.0;
-                     k= 0;
+                     sum = 0.0;
+                     k = 0;
 
-                     stencil_contrib_i[stencil_i][k]= stencil_i;
-                     AbsStencilShape( hypre_StructStencilElement(stencils,stencil_i),
+                     stencil_contrib_i[stencil_i][k] = stencil_i;
+                     AbsStencilShape( hypre_StructStencilElement(stencils, stencil_i),
                                       abs_stencil_shape );
                      weight_contrib_i[stencil_i][k++] = weights[abs_stencil_shape];
-                     sum+= weights[abs_stencil_shape];
+                     sum += weights[abs_stencil_shape];
 
-                     for (j=1; j<= 2; j++)
+                     for (j = 1; j <= 2; j++)
                      {
-                        if (rank_stencils[j*9+5] != -1)
+                        if (rank_stencils[j * 9 + 5] != -1)
                         {
-                           stencil_contrib_i[stencil_i][k]= rank_stencils[j*9+5];
+                           stencil_contrib_i[stencil_i][k] = rank_stencils[j * 9 + 5];
 
-                           AbsStencilShape(hypre_StructStencilElement(stencils,rank_stencils[j*9+5]),
+                           AbsStencilShape(hypre_StructStencilElement(stencils, rank_stencils[j * 9 + 5]),
                                            abs_stencil_shape );
                            weight_contrib_i[stencil_i][k++] = weights[abs_stencil_shape];
-                           sum+= weights[abs_stencil_shape];
+                           sum += weights[abs_stencil_shape];
                         }
                      }
 
-                     for (i= 0; i< k ; i++)
+                     for (i = 0; i < k ; i++)
                      {
-                        weight_contrib_i[stencil_i][i]/= sum;
+                        weight_contrib_i[stencil_i][i] /= sum;
                      }
                   }
 
                   /* edges: csw */
-                  stencil_i= rank_stencils[8];
+                  stencil_i = rank_stencils[8];
                   if (stencil_i != -1)
                   {
                      stencil_contrib_cnt[stencil_i]++;
-                     for (j=1; j<= 2; j++)
+                     for (j = 1; j <= 2; j++)
                      {
-                        if (rank_stencils[j*9+8] != -1)  /* bottom or top planes */
+                        if (rank_stencils[j * 9 + 8] != -1) /* bottom or top planes */
+                        {
                            stencil_contrib_cnt[stencil_i]++;
+                        }
                      }
-                     max_contribut_size= hypre_max( max_contribut_size,
-                                                    stencil_contrib_cnt[stencil_i] );
+                     max_contribut_size = hypre_max( max_contribut_size,
+                                                     stencil_contrib_cnt[stencil_i] );
                   }
 
                   if (stencil_i != -1)
                   {
-                     stencil_contrib_i[stencil_i]=
+                     stencil_contrib_i[stencil_i] =
                         hypre_TAlloc(HYPRE_Int,  stencil_contrib_cnt[stencil_i], HYPRE_MEMORY_HOST);
                      weight_contrib_i[stencil_i] =
                         hypre_TAlloc(HYPRE_Real,  stencil_contrib_cnt[stencil_i], HYPRE_MEMORY_HOST);
-                     sum= 0.0;
-                     k= 0;
+                     sum = 0.0;
+                     k = 0;
 
-                     stencil_contrib_i[stencil_i][k]= stencil_i;
-                     AbsStencilShape( hypre_StructStencilElement(stencils,stencil_i),
+                     stencil_contrib_i[stencil_i][k] = stencil_i;
+                     AbsStencilShape( hypre_StructStencilElement(stencils, stencil_i),
                                       abs_stencil_shape );
                      weight_contrib_i[stencil_i][k++] = weights[abs_stencil_shape];
-                     sum+= weights[abs_stencil_shape];
+                     sum += weights[abs_stencil_shape];
 
-                     for (j=1; j<= 2; j++)
+                     for (j = 1; j <= 2; j++)
                      {
-                        if (rank_stencils[j*9+8] != -1)
+                        if (rank_stencils[j * 9 + 8] != -1)
                         {
-                           stencil_contrib_i[stencil_i][k]= rank_stencils[j*9+8];
+                           stencil_contrib_i[stencil_i][k] = rank_stencils[j * 9 + 8];
 
-                           AbsStencilShape(hypre_StructStencilElement(stencils,rank_stencils[j*9+8]),
+                           AbsStencilShape(hypre_StructStencilElement(stencils, rank_stencils[j * 9 + 8]),
                                            abs_stencil_shape );
                            weight_contrib_i[stencil_i][k++] = weights[abs_stencil_shape];
-                           sum+= weights[abs_stencil_shape];
+                           sum += weights[abs_stencil_shape];
                         }
                      }
 
-                     for (i= 0; i< k ; i++)
+                     for (i = 0; i < k ; i++)
                      {
-                        weight_contrib_i[stencil_i][i]/= sum;
+                        weight_contrib_i[stencil_i][i] /= sum;
                      }
                   }
 
                   /* edges: top east */
-                  stencil_i= rank_stencils[10];
+                  stencil_i = rank_stencils[10];
                   if (stencil_i != -1)
                   {
                      stencil_contrib_cnt[stencil_i]++;
-                     for (i=3; i<= 6; i+=3)
+                     for (i = 3; i <= 6; i += 3)
                      {
-                        if (rank_stencils[10+i] != -1)
+                        if (rank_stencils[10 + i] != -1)
+                        {
                            stencil_contrib_cnt[stencil_i]++;
+                        }
                      }
-                     max_contribut_size= hypre_max( max_contribut_size,
-                                                    stencil_contrib_cnt[stencil_i] );
+                     max_contribut_size = hypre_max( max_contribut_size,
+                                                     stencil_contrib_cnt[stencil_i] );
                   }
 
                   if (stencil_i != -1)
                   {
-                     stencil_contrib_i[stencil_i]=
+                     stencil_contrib_i[stencil_i] =
                         hypre_TAlloc(HYPRE_Int,  stencil_contrib_cnt[stencil_i], HYPRE_MEMORY_HOST);
                      weight_contrib_i[stencil_i] =
                         hypre_TAlloc(HYPRE_Real,  stencil_contrib_cnt[stencil_i], HYPRE_MEMORY_HOST);
-                     sum= 0.0;
-                     k= 0;
+                     sum = 0.0;
+                     k = 0;
 
-                     stencil_contrib_i[stencil_i][k]= stencil_i;
-                     AbsStencilShape( hypre_StructStencilElement(stencils,stencil_i),
+                     stencil_contrib_i[stencil_i][k] = stencil_i;
+                     AbsStencilShape( hypre_StructStencilElement(stencils, stencil_i),
                                       abs_stencil_shape );
                      weight_contrib_i[stencil_i][k++] = weights[abs_stencil_shape];
-                     sum+= weights[abs_stencil_shape];
+                     sum += weights[abs_stencil_shape];
 
-                     for (i=3; i<= 6; i+=3)
+                     for (i = 3; i <= 6; i += 3)
                      {
-                        if (rank_stencils[10+i] != -1)
+                        if (rank_stencils[10 + i] != -1)
                         {
-                           stencil_contrib_i[stencil_i][k]= rank_stencils[10+i];
+                           stencil_contrib_i[stencil_i][k] = rank_stencils[10 + i];
 
-                           AbsStencilShape(hypre_StructStencilElement(stencils,rank_stencils[10+i]),
+                           AbsStencilShape(hypre_StructStencilElement(stencils, rank_stencils[10 + i]),
                                            abs_stencil_shape );
                            weight_contrib_i[stencil_i][k++] = weights[abs_stencil_shape];
-                           sum+= weights[abs_stencil_shape];
+                           sum += weights[abs_stencil_shape];
                         }
                      }
 
-                     for (i= 0; i< k ; i++)
+                     for (i = 0; i < k ; i++)
                      {
-                        weight_contrib_i[stencil_i][i]/= sum;
+                        weight_contrib_i[stencil_i][i] /= sum;
                      }
                   }
 
                   /* edges: top west */
-                  stencil_i= rank_stencils[11];
+                  stencil_i = rank_stencils[11];
                   if (stencil_i != -1)
                   {
                      stencil_contrib_cnt[stencil_i]++;
-                     for (i=3; i<= 6; i+=3)
+                     for (i = 3; i <= 6; i += 3)
                      {
-                        if (rank_stencils[11+i] != -1)
+                        if (rank_stencils[11 + i] != -1)
+                        {
                            stencil_contrib_cnt[stencil_i]++;
+                        }
                      }
-                     max_contribut_size= hypre_max( max_contribut_size,
-                                                    stencil_contrib_cnt[stencil_i] );
+                     max_contribut_size = hypre_max( max_contribut_size,
+                                                     stencil_contrib_cnt[stencil_i] );
                   }
 
                   if (stencil_i != -1)
                   {
-                     stencil_contrib_i[stencil_i]=
+                     stencil_contrib_i[stencil_i] =
                         hypre_TAlloc(HYPRE_Int,  stencil_contrib_cnt[stencil_i], HYPRE_MEMORY_HOST);
                      weight_contrib_i[stencil_i] =
                         hypre_TAlloc(HYPRE_Real,  stencil_contrib_cnt[stencil_i], HYPRE_MEMORY_HOST);
-                     sum= 0.0;
-                     k= 0;
+                     sum = 0.0;
+                     k = 0;
 
-                     stencil_contrib_i[stencil_i][k]= stencil_i;
-                     AbsStencilShape( hypre_StructStencilElement(stencils,stencil_i),
+                     stencil_contrib_i[stencil_i][k] = stencil_i;
+                     AbsStencilShape( hypre_StructStencilElement(stencils, stencil_i),
                                       abs_stencil_shape );
                      weight_contrib_i[stencil_i][k++] = weights[abs_stencil_shape];
-                     sum+= weights[abs_stencil_shape];
+                     sum += weights[abs_stencil_shape];
 
-                     for (i=3; i<= 6; i+=3)
+                     for (i = 3; i <= 6; i += 3)
                      {
-                        if (rank_stencils[11+i] != -1)
+                        if (rank_stencils[11 + i] != -1)
                         {
-                           stencil_contrib_i[stencil_i][k]= rank_stencils[11+i];
+                           stencil_contrib_i[stencil_i][k] = rank_stencils[11 + i];
 
-                           AbsStencilShape(hypre_StructStencilElement(stencils,rank_stencils[11+i]),
+                           AbsStencilShape(hypre_StructStencilElement(stencils, rank_stencils[11 + i]),
                                            abs_stencil_shape );
                            weight_contrib_i[stencil_i][k++] = weights[abs_stencil_shape];
-                           sum+= weights[abs_stencil_shape];
+                           sum += weights[abs_stencil_shape];
                         }
                      }
 
-                     for (i= 0; i< k ; i++)
+                     for (i = 0; i < k ; i++)
                      {
-                        weight_contrib_i[stencil_i][i]/= sum;
+                        weight_contrib_i[stencil_i][i] /= sum;
                      }
                   }
 
                   /* edges: top north */
-                  stencil_i= rank_stencils[12];
+                  stencil_i = rank_stencils[12];
                   if (stencil_i != -1)
                   {
                      stencil_contrib_cnt[stencil_i]++;
-                     for (i=13; i<= 14; i++)
+                     for (i = 13; i <= 14; i++)
                      {
                         if (rank_stencils[i] != -1)
+                        {
                            stencil_contrib_cnt[stencil_i]++;
+                        }
                      }
-                     max_contribut_size= hypre_max( max_contribut_size,
-                                                    stencil_contrib_cnt[stencil_i] );
+                     max_contribut_size = hypre_max( max_contribut_size,
+                                                     stencil_contrib_cnt[stencil_i] );
                   }
 
                   if (stencil_i != -1)
                   {
-                     stencil_contrib_i[stencil_i]=
+                     stencil_contrib_i[stencil_i] =
                         hypre_TAlloc(HYPRE_Int,  stencil_contrib_cnt[stencil_i], HYPRE_MEMORY_HOST);
                      weight_contrib_i[stencil_i] =
                         hypre_TAlloc(HYPRE_Real,  stencil_contrib_cnt[stencil_i], HYPRE_MEMORY_HOST);
-                     sum= 0.0;
-                     k= 0;
+                     sum = 0.0;
+                     k = 0;
 
-                     stencil_contrib_i[stencil_i][k]= stencil_i;
-                     AbsStencilShape( hypre_StructStencilElement(stencils,stencil_i),
+                     stencil_contrib_i[stencil_i][k] = stencil_i;
+                     AbsStencilShape( hypre_StructStencilElement(stencils, stencil_i),
                                       abs_stencil_shape );
                      weight_contrib_i[stencil_i][k++] = weights[abs_stencil_shape];
-                     sum+= weights[abs_stencil_shape];
+                     sum += weights[abs_stencil_shape];
 
-                     for (i=13; i<= 14; i++)
+                     for (i = 13; i <= 14; i++)
                      {
                         if (rank_stencils[i] != -1)
                         {
-                           stencil_contrib_i[stencil_i][k]= rank_stencils[i];
+                           stencil_contrib_i[stencil_i][k] = rank_stencils[i];
 
-                           AbsStencilShape(hypre_StructStencilElement(stencils,rank_stencils[i]),
+                           AbsStencilShape(hypre_StructStencilElement(stencils, rank_stencils[i]),
                                            abs_stencil_shape );
                            weight_contrib_i[stencil_i][k++] = weights[abs_stencil_shape];
-                           sum+= weights[abs_stencil_shape];
+                           sum += weights[abs_stencil_shape];
                         }
                      }
 
-                     for (i= 0; i< k ; i++)
+                     for (i = 0; i < k ; i++)
                      {
-                        weight_contrib_i[stencil_i][i]/= sum;
+                        weight_contrib_i[stencil_i][i] /= sum;
                      }
                   }
 
                   /* edges: top south*/
-                  stencil_i= rank_stencils[15];
+                  stencil_i = rank_stencils[15];
                   if (stencil_i != -1)
                   {
                      stencil_contrib_cnt[stencil_i]++;
-                     for (i=16; i<= 17; i++)
+                     for (i = 16; i <= 17; i++)
                      {
                         if (rank_stencils[i] != -1)
+                        {
                            stencil_contrib_cnt[stencil_i]++;
+                        }
                      }
-                     max_contribut_size= hypre_max( max_contribut_size,
-                                                    stencil_contrib_cnt[stencil_i] );
+                     max_contribut_size = hypre_max( max_contribut_size,
+                                                     stencil_contrib_cnt[stencil_i] );
                   }
 
                   if (stencil_i != -1)
                   {
-                     stencil_contrib_i[stencil_i]=
+                     stencil_contrib_i[stencil_i] =
                         hypre_TAlloc(HYPRE_Int,  stencil_contrib_cnt[stencil_i], HYPRE_MEMORY_HOST);
                      weight_contrib_i[stencil_i] =
                         hypre_TAlloc(HYPRE_Real,  stencil_contrib_cnt[stencil_i], HYPRE_MEMORY_HOST);
-                     sum= 0.0;
-                     k= 0;
+                     sum = 0.0;
+                     k = 0;
 
-                     stencil_contrib_i[stencil_i][k]= stencil_i;
-                     AbsStencilShape( hypre_StructStencilElement(stencils,stencil_i),
+                     stencil_contrib_i[stencil_i][k] = stencil_i;
+                     AbsStencilShape( hypre_StructStencilElement(stencils, stencil_i),
                                       abs_stencil_shape );
                      weight_contrib_i[stencil_i][k++] = weights[abs_stencil_shape];
-                     sum+= weights[abs_stencil_shape];
+                     sum += weights[abs_stencil_shape];
 
-                     for (i=16; i<= 17; i++)
+                     for (i = 16; i <= 17; i++)
                      {
                         if (rank_stencils[i] != -1)
                         {
-                           stencil_contrib_i[stencil_i][k]= rank_stencils[i];
+                           stencil_contrib_i[stencil_i][k] = rank_stencils[i];
 
-                           AbsStencilShape(hypre_StructStencilElement(stencils,rank_stencils[i]),
+                           AbsStencilShape(hypre_StructStencilElement(stencils, rank_stencils[i]),
                                            abs_stencil_shape );
                            weight_contrib_i[stencil_i][k++] = weights[abs_stencil_shape];
-                           sum+= weights[abs_stencil_shape];
+                           sum += weights[abs_stencil_shape];
                         }
                      }
 
-                     for (i= 0; i< k ; i++)
+                     for (i = 0; i < k ; i++)
                      {
-                        weight_contrib_i[stencil_i][i]/= sum;
+                        weight_contrib_i[stencil_i][i] /= sum;
                      }
                   }
 
                   /* edges: bottom east */
-                  stencil_i= rank_stencils[19];
+                  stencil_i = rank_stencils[19];
                   if (stencil_i != -1)
                   {
                      stencil_contrib_cnt[stencil_i]++;
-                     for (i=3; i<= 6; i+=3)
+                     for (i = 3; i <= 6; i += 3)
                      {
-                        if (rank_stencils[19+i] != -1)
+                        if (rank_stencils[19 + i] != -1)
+                        {
                            stencil_contrib_cnt[stencil_i]++;
+                        }
                      }
-                     max_contribut_size= hypre_max( max_contribut_size,
-                                                    stencil_contrib_cnt[stencil_i] );
+                     max_contribut_size = hypre_max( max_contribut_size,
+                                                     stencil_contrib_cnt[stencil_i] );
                   }
 
                   if (stencil_i != -1)
                   {
-                     stencil_contrib_i[stencil_i]=
+                     stencil_contrib_i[stencil_i] =
                         hypre_TAlloc(HYPRE_Int,  stencil_contrib_cnt[stencil_i], HYPRE_MEMORY_HOST);
                      weight_contrib_i[stencil_i] =
                         hypre_TAlloc(HYPRE_Real,  stencil_contrib_cnt[stencil_i], HYPRE_MEMORY_HOST);
-                     sum= 0.0;
-                     k= 0;
+                     sum = 0.0;
+                     k = 0;
 
-                     stencil_contrib_i[stencil_i][k]= stencil_i;
-                     AbsStencilShape( hypre_StructStencilElement(stencils,stencil_i),
+                     stencil_contrib_i[stencil_i][k] = stencil_i;
+                     AbsStencilShape( hypre_StructStencilElement(stencils, stencil_i),
                                       abs_stencil_shape );
                      weight_contrib_i[stencil_i][k++] = weights[abs_stencil_shape];
-                     sum+= weights[abs_stencil_shape];
+                     sum += weights[abs_stencil_shape];
 
-                     for (i=3; i<= 6; i+=3)
+                     for (i = 3; i <= 6; i += 3)
                      {
-                        if (rank_stencils[19+i] != -1)
+                        if (rank_stencils[19 + i] != -1)
                         {
-                           stencil_contrib_i[stencil_i][k]= rank_stencils[19+i];
+                           stencil_contrib_i[stencil_i][k] = rank_stencils[19 + i];
 
-                           AbsStencilShape(hypre_StructStencilElement(stencils,rank_stencils[19+i]),
+                           AbsStencilShape(hypre_StructStencilElement(stencils, rank_stencils[19 + i]),
                                            abs_stencil_shape );
                            weight_contrib_i[stencil_i][k++] = weights[abs_stencil_shape];
-                           sum+= weights[abs_stencil_shape];
+                           sum += weights[abs_stencil_shape];
                         }
                      }
 
-                     for (i= 0; i< k ; i++)
+                     for (i = 0; i < k ; i++)
                      {
-                        weight_contrib_i[stencil_i][i]/= sum;
+                        weight_contrib_i[stencil_i][i] /= sum;
                      }
                   }
 
                   /* edges: bottom west */
-                  stencil_i= rank_stencils[20];
+                  stencil_i = rank_stencils[20];
                   if (stencil_i != -1)
                   {
                      stencil_contrib_cnt[stencil_i]++;
-                     for (i=3; i<= 6; i+=3)
+                     for (i = 3; i <= 6; i += 3)
                      {
-                        if (rank_stencils[20+i] != -1)
+                        if (rank_stencils[20 + i] != -1)
+                        {
                            stencil_contrib_cnt[stencil_i]++;
+                        }
                      }
-                     max_contribut_size= hypre_max( max_contribut_size,
-                                                    stencil_contrib_cnt[stencil_i] );
+                     max_contribut_size = hypre_max( max_contribut_size,
+                                                     stencil_contrib_cnt[stencil_i] );
                   }
 
                   if (stencil_i != -1)
                   {
-                     stencil_contrib_i[stencil_i]=
+                     stencil_contrib_i[stencil_i] =
                         hypre_TAlloc(HYPRE_Int,  stencil_contrib_cnt[stencil_i], HYPRE_MEMORY_HOST);
                      weight_contrib_i[stencil_i] =
                         hypre_TAlloc(HYPRE_Real,  stencil_contrib_cnt[stencil_i], HYPRE_MEMORY_HOST);
-                     sum= 0.0;
-                     k= 0;
+                     sum = 0.0;
+                     k = 0;
 
-                     stencil_contrib_i[stencil_i][k]= stencil_i;
-                     AbsStencilShape( hypre_StructStencilElement(stencils,stencil_i),
+                     stencil_contrib_i[stencil_i][k] = stencil_i;
+                     AbsStencilShape( hypre_StructStencilElement(stencils, stencil_i),
                                       abs_stencil_shape );
                      weight_contrib_i[stencil_i][k++] = weights[abs_stencil_shape];
-                     sum+= weights[abs_stencil_shape];
+                     sum += weights[abs_stencil_shape];
 
-                     for (i=3; i<= 6; i+=3)
+                     for (i = 3; i <= 6; i += 3)
                      {
-                        if (rank_stencils[20+i] != -1)
+                        if (rank_stencils[20 + i] != -1)
                         {
-                           stencil_contrib_i[stencil_i][k]= rank_stencils[20+i];
+                           stencil_contrib_i[stencil_i][k] = rank_stencils[20 + i];
 
-                           AbsStencilShape(hypre_StructStencilElement(stencils,rank_stencils[20+i]),
+                           AbsStencilShape(hypre_StructStencilElement(stencils, rank_stencils[20 + i]),
                                            abs_stencil_shape );
                            weight_contrib_i[stencil_i][k++] = weights[abs_stencil_shape];
-                           sum+= weights[abs_stencil_shape];
+                           sum += weights[abs_stencil_shape];
                         }
                      }
 
-                     for (i= 0; i< k ; i++)
+                     for (i = 0; i < k ; i++)
                      {
-                        weight_contrib_i[stencil_i][i]/= sum;
+                        weight_contrib_i[stencil_i][i] /= sum;
                      }
                   }
 
                   /* edges: bottom north */
-                  stencil_i= rank_stencils[21];
+                  stencil_i = rank_stencils[21];
                   if (stencil_i != -1)
                   {
                      stencil_contrib_cnt[stencil_i]++;
-                     for (i=22; i<= 23; i++)
+                     for (i = 22; i <= 23; i++)
                      {
                         if (rank_stencils[i] != -1)
+                        {
                            stencil_contrib_cnt[stencil_i]++;
+                        }
                      }
-                     max_contribut_size= hypre_max( max_contribut_size,
-                                                    stencil_contrib_cnt[stencil_i] );
+                     max_contribut_size = hypre_max( max_contribut_size,
+                                                     stencil_contrib_cnt[stencil_i] );
                   }
 
                   if (stencil_i != -1)
                   {
-                     stencil_contrib_i[stencil_i]=
+                     stencil_contrib_i[stencil_i] =
                         hypre_TAlloc(HYPRE_Int,  stencil_contrib_cnt[stencil_i], HYPRE_MEMORY_HOST);
                      weight_contrib_i[stencil_i] =
                         hypre_TAlloc(HYPRE_Real,  stencil_contrib_cnt[stencil_i], HYPRE_MEMORY_HOST);
-                     sum= 0.0;
-                     k= 0;
+                     sum = 0.0;
+                     k = 0;
 
-                     stencil_contrib_i[stencil_i][k]= stencil_i;
-                     AbsStencilShape( hypre_StructStencilElement(stencils,stencil_i),
+                     stencil_contrib_i[stencil_i][k] = stencil_i;
+                     AbsStencilShape( hypre_StructStencilElement(stencils, stencil_i),
                                       abs_stencil_shape );
                      weight_contrib_i[stencil_i][k++] = weights[abs_stencil_shape];
-                     sum+= weights[abs_stencil_shape];
+                     sum += weights[abs_stencil_shape];
 
-                     for (i=22; i<= 23; i++)
+                     for (i = 22; i <= 23; i++)
                      {
                         if (rank_stencils[i] != -1)
                         {
-                           stencil_contrib_i[stencil_i][k]= rank_stencils[i];
+                           stencil_contrib_i[stencil_i][k] = rank_stencils[i];
 
-                           AbsStencilShape(hypre_StructStencilElement(stencils,rank_stencils[i]),
+                           AbsStencilShape(hypre_StructStencilElement(stencils, rank_stencils[i]),
                                            abs_stencil_shape );
                            weight_contrib_i[stencil_i][k++] = weights[abs_stencil_shape];
-                           sum+= weights[abs_stencil_shape];
+                           sum += weights[abs_stencil_shape];
                         }
                      }
 
-                     for (i= 0; i< k ; i++)
+                     for (i = 0; i < k ; i++)
                      {
-                        weight_contrib_i[stencil_i][i]/= sum;
+                        weight_contrib_i[stencil_i][i] /= sum;
                      }
                   }
 
                   /* edges: bottom south*/
-                  stencil_i= rank_stencils[24];
+                  stencil_i = rank_stencils[24];
                   if (stencil_i != -1)
                   {
                      stencil_contrib_cnt[stencil_i]++;
-                     for (i=25; i<= 26; i++)
+                     for (i = 25; i <= 26; i++)
                      {
                         if (rank_stencils[i] != -1)
+                        {
                            stencil_contrib_cnt[stencil_i]++;
+                        }
                      }
-                     max_contribut_size= hypre_max( max_contribut_size,
-                                                    stencil_contrib_cnt[stencil_i] );
+                     max_contribut_size = hypre_max( max_contribut_size,
+                                                     stencil_contrib_cnt[stencil_i] );
                   }
 
                   if (stencil_i != -1)
                   {
-                     stencil_contrib_i[stencil_i]=
+                     stencil_contrib_i[stencil_i] =
                         hypre_TAlloc(HYPRE_Int,  stencil_contrib_cnt[stencil_i], HYPRE_MEMORY_HOST);
                      weight_contrib_i[stencil_i] =
                         hypre_TAlloc(HYPRE_Real,  stencil_contrib_cnt[stencil_i], HYPRE_MEMORY_HOST);
-                     sum= 0.0;
-                     k= 0;
+                     sum = 0.0;
+                     k = 0;
 
-                     stencil_contrib_i[stencil_i][k]= stencil_i;
-                     AbsStencilShape( hypre_StructStencilElement(stencils,stencil_i),
+                     stencil_contrib_i[stencil_i][k] = stencil_i;
+                     AbsStencilShape( hypre_StructStencilElement(stencils, stencil_i),
                                       abs_stencil_shape );
                      weight_contrib_i[stencil_i][k++] = weights[abs_stencil_shape];
-                     sum+= weights[abs_stencil_shape];
+                     sum += weights[abs_stencil_shape];
 
-                     for (i=25; i<= 26; i++)
+                     for (i = 25; i <= 26; i++)
                      {
                         if (rank_stencils[i] != -1)
                         {
-                           stencil_contrib_i[stencil_i][k]= rank_stencils[i];
+                           stencil_contrib_i[stencil_i][k] = rank_stencils[i];
 
-                           AbsStencilShape(hypre_StructStencilElement(stencils,rank_stencils[i]),
+                           AbsStencilShape(hypre_StructStencilElement(stencils, rank_stencils[i]),
                                            abs_stencil_shape );
                            weight_contrib_i[stencil_i][k++] = weights[abs_stencil_shape];
-                           sum+= weights[abs_stencil_shape];
+                           sum += weights[abs_stencil_shape];
                         }
                      }
 
-                     for (i= 0; i< k ; i++)
+                     for (i = 0; i < k ; i++)
                      {
-                        weight_contrib_i[stencil_i][i]/= sum;
+                        weight_contrib_i[stencil_i][i] /= sum;
                      }
                   }
 
                   /* corners*/
-                  for (j= 1; j<= 2; j++)
+                  for (j = 1; j <= 2; j++)
                   {
-                     for (i= 4; i<= 5; i++)
+                     for (i = 4; i <= 5; i++)
                      {
-                        stencil_i= rank_stencils[9*j+i];
+                        stencil_i = rank_stencils[9 * j + i];
                         if (stencil_i != -1)
                         {
                            stencil_contrib_cnt[stencil_i]++;
-                           stencil_contrib_i[stencil_i]= hypre_TAlloc(HYPRE_Int,  1, HYPRE_MEMORY_HOST);
+                           stencil_contrib_i[stencil_i] = hypre_TAlloc(HYPRE_Int,  1, HYPRE_MEMORY_HOST);
                            weight_contrib_i[stencil_i] =  hypre_TAlloc(HYPRE_Real,  1, HYPRE_MEMORY_HOST);
-                           stencil_contrib_i[stencil_i][0]= stencil_i;
+                           stencil_contrib_i[stencil_i][0] = stencil_i;
                            weight_contrib_i[stencil_i][0] = weights[0];
                         }
                      }
-                     for (i= 7; i<= 8; i++)
+                     for (i = 7; i <= 8; i++)
                      {
-                        stencil_i= rank_stencils[9*j+i];
+                        stencil_i = rank_stencils[9 * j + i];
                         if (stencil_i != -1)
                         {
                            stencil_contrib_cnt[stencil_i]++;
-                           stencil_contrib_i[stencil_i]= hypre_TAlloc(HYPRE_Int,  1, HYPRE_MEMORY_HOST);
+                           stencil_contrib_i[stencil_i] = hypre_TAlloc(HYPRE_Int,  1, HYPRE_MEMORY_HOST);
                            weight_contrib_i[stencil_i] =  hypre_TAlloc(HYPRE_Real,  1, HYPRE_MEMORY_HOST);
-                           stencil_contrib_i[stencil_i][0]= stencil_i;
+                           stencil_contrib_i[stencil_i][0] = stencil_i;
                            weight_contrib_i[stencil_i][0] = weights[0];
                         }
                      }
@@ -1767,7 +1820,7 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
                 *  Allocate for the temporary vector used in computing the
                 *  averages.
                 *-----------------------------------------------------------------*/
-               vals= hypre_CTAlloc(HYPRE_Real,  max_contribut_size, HYPRE_MEMORY_HOST);
+               vals = hypre_CTAlloc(HYPRE_Real,  max_contribut_size, HYPRE_MEMORY_HOST);
 
                /*-----------------------------------------------------------------
                 *  coarse grid stencil contributor structures have been formed.
@@ -1778,52 +1831,52 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
              *  Loop over gridboxes to average stencils
              *---------------------------------------------------------------------*/
             smatrix_var = hypre_SStructPMatrixSMatrix(A_pmatrix, var1, var2);
-            crse_smatrix= hypre_SStructPMatrixSMatrix(A_crse, var1, var2);
+            crse_smatrix = hypre_SStructPMatrixSMatrix(A_crse, var1, var2);
 
             /*---------------------------------------------------------------------
              *  data ptrs to extract and fill in data.
              *---------------------------------------------------------------------*/
             a_ptrs   = hypre_TAlloc(HYPRE_Real *,  stencil_size, HYPRE_MEMORY_HOST);
-            crse_ptrs= hypre_TAlloc(HYPRE_Real *,  stencil_size, HYPRE_MEMORY_HOST);
+            crse_ptrs = hypre_TAlloc(HYPRE_Real *,  stencil_size, HYPRE_MEMORY_HOST);
 
             hypre_ForBoxI(ci, cgrid_boxes)
             {
-               cgrid_box= hypre_BoxArrayBox(cgrid_boxes, ci);
+               cgrid_box = hypre_BoxArrayBox(cgrid_boxes, ci);
                fbox_interior_ci = fbox_interior[var1][ci];
                fbox_bdy_ci      = fbox_bdy[var1][ci];
-               interior_fboxi_ci= interior_fboxi[var1][ci];
+               interior_fboxi_ci = interior_fboxi[var1][ci];
                bdy_fboxi_ci     = bdy_fboxi[var1][ci];
 
-               crse_dbox= hypre_BoxArrayBox(hypre_StructMatrixDataSpace(crse_smatrix),
-                                            ci);
+               crse_dbox = hypre_BoxArrayBox(hypre_StructMatrixDataSpace(crse_smatrix),
+                                             ci);
                /*------------------------------------------------------------------
                 * grab the correct coarse grid pointers. These are the parent base
                 * grids.
                 *------------------------------------------------------------------*/
-               for (i= 0; i< stencil_size; i++)
+               for (i = 0; i < stencil_size; i++)
                {
                   hypre_CopyIndex(hypre_StructStencilElement(stencils, i), stencil_shape_i);
-                  crse_ptrs[i]= hypre_StructMatrixExtractPointerByIndex(crse_smatrix,
-                                                                        ci,
-                                                                        stencil_shape_i);
+                  crse_ptrs[i] = hypre_StructMatrixExtractPointerByIndex(crse_smatrix,
+                                                                         ci,
+                                                                         stencil_shape_i);
                }
                /*------------------------------------------------------------------
                 *  Loop over the interior of each patch inside cgrid_box.
                 *------------------------------------------------------------------*/
                hypre_ForBoxI(fi, fbox_interior_ci)
                {
-                  fgrid_box= hypre_BoxArrayBox(fbox_interior_ci, fi);
+                  fgrid_box = hypre_BoxArrayBox(fbox_interior_ci, fi);
                   /*--------------------------------------------------------------
                    * grab the fine grid ptrs & create the offsets for the fine
                    * grid ptrs.
                    *--------------------------------------------------------------*/
-                  A_dbox= hypre_BoxArrayBox(hypre_StructMatrixDataSpace(smatrix_var),
-                                            interior_fboxi_ci[fi]);
-                  for (i= 0; i< stencil_size; i++)
+                  A_dbox = hypre_BoxArrayBox(hypre_StructMatrixDataSpace(smatrix_var),
+                                             interior_fboxi_ci[fi]);
+                  for (i = 0; i < stencil_size; i++)
                   {
                      hypre_CopyIndex(hypre_StructStencilElement(stencils, i),
                                      stencil_shape_i);
-                     a_ptrs[i]=
+                     a_ptrs[i] =
                         hypre_StructMatrixExtractPointerByIndex(smatrix_var,
                                                                 interior_fboxi_ci[fi],
                                                                 stencil_shape_i);
@@ -1834,10 +1887,10 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
                    *  Note that for 1-d, OffsetA[j][i]= 0. Therefore, this ptr
                    *  will be correct for 1-d.
                    *---------------------------------------------------------------*/
-                  for (j= 0; j< 2; j++)
+                  for (j = 0; j < 2; j++)
                   {
-                     OffsetA[j][0]= 0;
-                     for (i= 1; i< refine_factors[j+1]; i++)
+                     OffsetA[j][0] = 0;
+                     for (i = 1; i < refine_factors[j + 1]; i++)
                      {
                         if (j == 0)
                         {
@@ -1873,9 +1926,9 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
                                             A_dbox, fstart, stridef, iA,
                                             crse_dbox, cstart, stridec, iAc);
                   {
-                     for (i= 0; i< stencil_size; i++)
+                     for (i = 0; i < stencil_size; i++)
                      {
-                        rank=  stencil_ranks[i];
+                        rank =  stencil_ranks[i];
 
                         /*------------------------------------------------------------
                          *  Loop over refinement agglomeration making up a coarse cell
@@ -1890,9 +1943,9 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
                            hypre_CopyIndex(hypre_BoxIMin(shift_box[i]), index1);
                            hypre_CopyIndex(hypre_BoxIMax(shift_box[i]), index2);
 
-                           for (m= 0; m< stencil_contrib_cnt[i]; m++)
+                           for (m = 0; m < stencil_contrib_cnt[i]; m++)
                            {
-                              vals[m]= 0.0;
+                              vals[m] = 0.0;
                            }
 
                            /*--------------------------------------------------------
@@ -1900,20 +1953,20 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
                             *    iA_shift_zyx= j,
                             * which is correct. Similarly, 2-d is correct.
                             *--------------------------------------------------------*/
-                           for (l= index1[2]; l<= index2[2]; l++)
+                           for (l = index1[2]; l <= index2[2]; l++)
                            {
-                              iA_shift_z= iA + OffsetA[1][l];
-                              for (k= index1[1]; k<= index2[1]; k++)
+                              iA_shift_z = iA + OffsetA[1][l];
+                              for (k = index1[1]; k <= index2[1]; k++)
                               {
-                                 iA_shift_zy= iA_shift_z + OffsetA[0][k];
-                                 for (j= index1[0]; j<= index2[0]; j++)
+                                 iA_shift_zy = iA_shift_z + OffsetA[0][k];
+                                 for (j = index1[0]; j <= index2[0]; j++)
                                  {
-                                    iA_shift_zyx= iA_shift_zy + j;
+                                    iA_shift_zyx = iA_shift_zy + j;
 
-                                    for (m= 0; m< stencil_contrib_cnt[i]; m++)
+                                    for (m = 0; m < stencil_contrib_cnt[i]; m++)
                                     {
-                                       stencil_i= stencil_contrib_i[i][m];
-                                       vals[m]+= a_ptrs[stencil_i][iA_shift_zyx];
+                                       stencil_i = stencil_contrib_i[i][m];
+                                       vals[m] += a_ptrs[stencil_i][iA_shift_zyx];
                                     }
                                  }
                               }
@@ -1922,12 +1975,12 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
                             *  average & weight the contributions and place into coarse
                             *  stencil entry.
                             *----------------------------------------------------------*/
-                           crse_ptrs[i][iAc]= 0.0;
-                           for (m= 0; m< stencil_contrib_cnt[i]; m++)
+                           crse_ptrs[i][iAc] = 0.0;
+                           for (m = 0; m < stencil_contrib_cnt[i]; m++)
                            {
-                              crse_ptrs[i][iAc]+= vals[m]*weight_contrib_i[i][m];
+                              crse_ptrs[i][iAc] += vals[m] * weight_contrib_i[i][m];
                            }
-                           crse_ptrs[i][iAc]/= volume_shift_box[i];
+                           crse_ptrs[i][iAc] /= volume_shift_box[i];
 
                         }  /* if (rank) */
                      }     /* for i */
@@ -1943,19 +1996,19 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
                      hypre_CopyIndex(hypre_BoxIMin(&coarse_cell_box), index1);
                      hypre_CopyIndex(hypre_BoxIMax(&coarse_cell_box), index2);
 
-                     sum= 0.0;
-                     for (l= index1[2]; l<= index2[2]; l++)
+                     sum = 0.0;
+                     for (l = index1[2]; l <= index2[2]; l++)
                      {
-                        iA_shift_z= iA + OffsetA[1][l];
-                        for (k= index1[1]; k<= index2[1]; k++)
+                        iA_shift_z = iA + OffsetA[1][l];
+                        for (k = index1[1]; k <= index2[1]; k++)
                         {
-                           iA_shift_zy= iA_shift_z + OffsetA[0][k];
-                           for (j= index1[0]; j<= index2[0]; j++)
+                           iA_shift_zy = iA_shift_z + OffsetA[0][k];
+                           for (j = index1[0]; j <= index2[0]; j++)
                            {
-                              iA_shift_zyx= iA_shift_zy + j;
-                              for (m= 0; m< stencil_size; m++)
+                              iA_shift_zyx = iA_shift_zy + j;
+                              for (m = 0; m < stencil_size; m++)
                               {
-                                 sum+= a_ptrs[m][iA_shift_zyx];
+                                 sum += a_ptrs[m][iA_shift_zyx];
                               }
                            }
                         }
@@ -1967,15 +2020,15 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
                       * off-diagonal components.
                       *---------------------------------------------------------------*/
                      sum /= scaling;
-                     for (m= 0; m< stencil_size; m++)
+                     for (m = 0; m < stencil_size; m++)
                      {
-                        rank= stencil_ranks[m];
+                        rank = stencil_ranks[m];
                         if (rank)
                         {
-                           sum-= crse_ptrs[m][iAc];
+                           sum -= crse_ptrs[m][iAc];
                         }
                      }
-                     crse_ptrs[ rank_stencils[0] ][iAc]= sum;
+                     crse_ptrs[ rank_stencils[0] ][iAc] = sum;
                   }
                   hypre_SerialBoxLoop2End(iA, iAc);
                }    /* end hypre_ForBoxI(fi, fbox_interior_ci) */
@@ -1985,22 +2038,22 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
                 *------------------------------------------------------------------*/
                hypre_ForBoxArrayI(arrayi, fbox_bdy_ci)
                {
-                  fbox_bdy_ci_fi= hypre_BoxArrayArrayBoxArray(fbox_bdy_ci, arrayi);
+                  fbox_bdy_ci_fi = hypre_BoxArrayArrayBoxArray(fbox_bdy_ci, arrayi);
                   hypre_ForBoxI(fi, fbox_bdy_ci_fi)
                   {
-                     fgrid_box= hypre_BoxArrayBox(fbox_bdy_ci_fi, fi);
+                     fgrid_box = hypre_BoxArrayBox(fbox_bdy_ci_fi, fi);
 
                      /*-----------------------------------------------------------
                       * grab the fine grid ptrs & create the offsets for the fine
                       * grid ptrs.
                       *-----------------------------------------------------------*/
-                     A_dbox= hypre_BoxArrayBox(hypre_StructMatrixDataSpace(smatrix_var),
-                                               bdy_fboxi_ci[arrayi]);
-                     for (i= 0; i< stencil_size; i++)
+                     A_dbox = hypre_BoxArrayBox(hypre_StructMatrixDataSpace(smatrix_var),
+                                                bdy_fboxi_ci[arrayi]);
+                     for (i = 0; i < stencil_size; i++)
                      {
                         hypre_CopyIndex(hypre_StructStencilElement(stencils, i),
                                         stencil_shape_i);
-                        a_ptrs[i]=
+                        a_ptrs[i] =
                            hypre_StructMatrixExtractPointerByIndex(smatrix_var,
                                                                    bdy_fboxi_ci[arrayi],
                                                                    stencil_shape_i);
@@ -2009,10 +2062,10 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
                      /*--------------------------------------------------------------
                       *  Compute the offsets for pointing to the correct data.
                       *--------------------------------------------------------------*/
-                     for (j= 0; j< 2; j++)
+                     for (j = 0; j < 2; j++)
                      {
-                        OffsetA[j][0]= 0;
-                        for (i= 1; i< refine_factors[j+1]; i++)
+                        OffsetA[j][0] = 0;
+                        for (i = 1; i < refine_factors[j + 1]; i++)
                         {
                            if (j == 0)
                            {
@@ -2049,9 +2102,9 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
                                                crse_dbox, cstart, stridec, iAc);
                      {
                         zypre_BoxLoopGetIndex(lindex);
-                        for (i= 0; i< stencil_size; i++)
+                        for (i = 0; i < stencil_size; i++)
                         {
-                           rank=  stencil_ranks[i];
+                           rank =  stencil_ranks[i];
 
                            /*--------------------------------------------------------
                             * Loop over refinement agglomeration making up a coarse
@@ -2066,25 +2119,25 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
                               hypre_CopyIndex(hypre_BoxIMin(shift_box[i]), index1);
                               hypre_CopyIndex(hypre_BoxIMax(shift_box[i]), index2);
 
-                              for (m= 0; m< stencil_contrib_cnt[i]; m++)
+                              for (m = 0; m < stencil_contrib_cnt[i]; m++)
                               {
-                                 vals[m]= 0.0;
+                                 vals[m] = 0.0;
                               }
 
-                              for (l= index1[2]; l<= index2[2]; l++)
+                              for (l = index1[2]; l <= index2[2]; l++)
                               {
-                                 iA_shift_z= iA + OffsetA[1][l];
-                                 for (k= index1[1]; k<= index2[1]; k++)
+                                 iA_shift_z = iA + OffsetA[1][l];
+                                 for (k = index1[1]; k <= index2[1]; k++)
                                  {
-                                    iA_shift_zy= iA_shift_z + OffsetA[0][k];
-                                    for (j= index1[0]; j<= index2[0]; j++)
+                                    iA_shift_zy = iA_shift_z + OffsetA[0][k];
+                                    for (j = index1[0]; j <= index2[0]; j++)
                                     {
-                                       iA_shift_zyx= iA_shift_zy + j;
+                                       iA_shift_zyx = iA_shift_zy + j;
 
-                                       for (m= 0; m< stencil_contrib_cnt[i]; m++)
+                                       for (m = 0; m < stencil_contrib_cnt[i]; m++)
                                        {
-                                          stencil_i= stencil_contrib_i[i][m];
-                                          vals[m]+= a_ptrs[stencil_i][iA_shift_zyx];
+                                          stencil_i = stencil_contrib_i[i][m];
+                                          vals[m] += a_ptrs[stencil_i][iA_shift_zyx];
                                        }
                                     }
                                  }
@@ -2093,12 +2146,12 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
                                *  average & weight the contributions and place into coarse
                                *  stencil entry.
                                *---------------------------------------------------------*/
-                              crse_ptrs[i][iAc]= 0.0;
-                              for (m= 0; m< stencil_contrib_cnt[i]; m++)
+                              crse_ptrs[i][iAc] = 0.0;
+                              for (m = 0; m < stencil_contrib_cnt[i]; m++)
                               {
-                                 crse_ptrs[i][iAc]+= vals[m]*weight_contrib_i[i][m];
+                                 crse_ptrs[i][iAc] += vals[m] * weight_contrib_i[i][m];
                               }
-                              crse_ptrs[i][iAc]/= volume_shift_box[i];
+                              crse_ptrs[i][iAc] /= volume_shift_box[i];
 
                            }  /* if (rank) */
                         }     /* for i */
@@ -2115,27 +2168,27 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
                         hypre_CopyIndex(hypre_BoxIMin(&coarse_cell_box), index1);
                         hypre_CopyIndex(hypre_BoxIMax(&coarse_cell_box), index2);
 
-                        temp3= hypre_CTAlloc(HYPRE_Real,  volume_coarse_cell_box, HYPRE_MEMORY_HOST);
+                        temp3 = hypre_CTAlloc(HYPRE_Real,  volume_coarse_cell_box, HYPRE_MEMORY_HOST);
 
                         /*---------------------------------------------------------------
                          *  iA_shift_zyx is computed correctly for 1 & 2-d. Also,
                          *  ll= 0 for 2-d, and ll= kk= 0 for 1-d. Correct ptrs.
                          *---------------------------------------------------------------*/
-                        for (l= index1[2]; l<= index2[2]; l++)
+                        for (l = index1[2]; l <= index2[2]; l++)
                         {
-                           iA_shift_z= iA + OffsetA[1][l];
-                           ll        = l*refine_factors[1]*refine_factors[0];
-                           for (k= index1[1]; k<= index2[1]; k++)
+                           iA_shift_z = iA + OffsetA[1][l];
+                           ll        = l * refine_factors[1] * refine_factors[0];
+                           for (k = index1[1]; k <= index2[1]; k++)
                            {
-                              iA_shift_zy= iA_shift_z + OffsetA[0][k];
-                              kk         = ll + k*refine_factors[0];
-                              for (j= index1[0]; j<= index2[0]; j++)
+                              iA_shift_zy = iA_shift_z + OffsetA[0][k];
+                              kk         = ll + k * refine_factors[0];
+                              for (j = index1[0]; j <= index2[0]; j++)
                               {
-                                 iA_shift_zyx= iA_shift_zy + j;
+                                 iA_shift_zyx = iA_shift_zy + j;
                                  jj          = kk + j;
-                                 for (m= 0; m< stencil_size; m++)
+                                 for (m = 0; m < stencil_size; m++)
                                  {
-                                    temp3[jj]+= a_ptrs[m][iA_shift_zyx];
+                                    temp3[jj] += a_ptrs[m][iA_shift_zyx];
                                  }
                               }
                            }
@@ -2147,22 +2200,22 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
                          *------------------------------------------------------------*/
                         if (nUventries > 0)
                         {
-                           temp2= hypre_CTAlloc(HYPRE_Int,  volume_coarse_cell_box, HYPRE_MEMORY_HOST);
-                           cnt1= 0;
-                           for (l= index1[2]; l<= index2[2]; l++)
+                           temp2 = hypre_CTAlloc(HYPRE_Int,  volume_coarse_cell_box, HYPRE_MEMORY_HOST);
+                           cnt1 = 0;
+                           for (l = index1[2]; l <= index2[2]; l++)
                            {
-                              ll= l*refine_factors[1]*refine_factors[0];
-                              for (k= index1[1]; k<= index2[1]; k++)
+                              ll = l * refine_factors[1] * refine_factors[0];
+                              for (k = index1[1]; k <= index2[1]; k++)
                               {
-                                 kk= ll + k*refine_factors[0];
-                                 for (j= index1[0]; j<= index2[0]; j++)
+                                 kk = ll + k * refine_factors[0];
+                                 for (j = index1[0]; j <= index2[0]; j++)
                                  {
-                                    jj= kk+ j;
+                                    jj = kk + j;
 
                                     hypre_SetIndex3(index_temp,
-                                                    j+lindex[0]*stridef[0],
-                                                    k+lindex[1]*stridef[1],
-                                                    l+lindex[2]*stridef[2]);
+                                                    j + lindex[0]*stridef[0],
+                                                    k + lindex[1]*stridef[1],
+                                                    l + lindex[2]*stridef[2]);
                                     hypre_AddIndexes(fstart, index_temp, 3, index_temp);
 
                                     hypre_SStructGridFindBoxManEntry(grid, part_fine, index_temp,
@@ -2170,32 +2223,32 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
                                     hypre_SStructBoxManEntryGetGlobalRank(boxman_entry, index_temp,
                                                                           &rank, matrix_type);
 
-                                    found= falseV;
-                                    i= hypre_SStructGraphIUVEntry(graph, 0);
-                                    m= hypre_SStructGraphIUVEntry(graph, nUventries-1);
-                                    if ((rank-startrank) >= i && (rank-startrank) <= m)
+                                    found = falseV;
+                                    i = hypre_SStructGraphIUVEntry(graph, 0);
+                                    m = hypre_SStructGraphIUVEntry(graph, nUventries - 1);
+                                    if ((rank - startrank) >= i && (rank - startrank) <= m)
                                     {
-                                       found= trueV;
+                                       found = trueV;
                                     }
 
                                     if (found)
                                     {
-                                       Uventry= hypre_SStructGraphUVEntry(graph, rank-startrank);
+                                       Uventry = hypre_SStructGraphUVEntry(graph, rank - startrank);
 
                                        if (Uventry != NULL)
                                        {
-                                          nUentries= hypre_SStructUVEntryNUEntries(Uventry);
+                                          nUentries = hypre_SStructUVEntryNUEntries(Uventry);
 
-                                          m= 0;
-                                          for (i= 0; i< nUentries; i++)
+                                          m = 0;
+                                          for (i = 0; i < nUentries; i++)
                                           {
-                                             if (hypre_SStructUVEntryToPart(Uventry, i)==part_crse)
+                                             if (hypre_SStructUVEntryToPart(Uventry, i) == part_crse)
                                              {
                                                 m++;
                                              }
                                           }  /* for (i= 0; i< nUentries; i++) */
 
-                                          temp2[jj]= m;
+                                          temp2[jj] = m;
                                           cnt1    += m;
 
                                        }  /* if (Uventry != NULL) */
@@ -2205,31 +2258,31 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
                               }      /* for (k= index1[1]; k<= index2[1]; k++) */
                            }         /* for (l= index1[2]; l<= index2[2]; l++) */
 
-                           ncols= hypre_TAlloc(HYPRE_Int,  cnt1, HYPRE_MEMORY_HOST);
-                           for (l= 0; l< cnt1; l++)
+                           ncols = hypre_TAlloc(HYPRE_Int,  cnt1, HYPRE_MEMORY_HOST);
+                           for (l = 0; l < cnt1; l++)
                            {
-                              ncols[l]= 1;
+                              ncols[l] = 1;
                            }
 
                            rows = hypre_TAlloc(HYPRE_BigInt,  cnt1, HYPRE_MEMORY_HOST);
                            cols = hypre_TAlloc(HYPRE_BigInt,  cnt1, HYPRE_MEMORY_HOST);
-                           vals2= hypre_CTAlloc(HYPRE_Real,  cnt1, HYPRE_MEMORY_HOST);
+                           vals2 = hypre_CTAlloc(HYPRE_Real,  cnt1, HYPRE_MEMORY_HOST);
 
-                           cnt1= 0;
-                           for (l= index1[2]; l<= index2[2]; l++)
+                           cnt1 = 0;
+                           for (l = index1[2]; l <= index2[2]; l++)
                            {
-                              ll= l*refine_factors[1]*refine_factors[0];
-                              for (k= index1[1]; k<= index2[1]; k++)
+                              ll = l * refine_factors[1] * refine_factors[0];
+                              for (k = index1[1]; k <= index2[1]; k++)
                               {
-                                 kk= ll + k*refine_factors[0];
-                                 for (j= index1[0]; j<= index2[0]; j++)
+                                 kk = ll + k * refine_factors[0];
+                                 for (j = index1[0]; j <= index2[0]; j++)
                                  {
-                                    jj= kk+ j;
+                                    jj = kk + j;
 
                                     hypre_SetIndex3(index_temp,
-                                                    j+lindex[0]*stridef[0],
-                                                    k+lindex[1]*stridef[1],
-                                                    l+lindex[2]*stridef[2]);
+                                                    j + lindex[0]*stridef[0],
+                                                    k + lindex[1]*stridef[1],
+                                                    l + lindex[2]*stridef[2]);
                                     hypre_AddIndexes(fstart, index_temp, 3, index_temp);
 
                                     hypre_SStructGridFindBoxManEntry(grid, part_fine, index_temp,
@@ -2237,30 +2290,30 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
                                     hypre_SStructBoxManEntryGetGlobalRank(boxman_entry, index_temp,
                                                                           &rank, matrix_type);
 
-                                    found= falseV;
+                                    found = falseV;
                                     if (nUventries > 0)
                                     {
-                                       i= hypre_SStructGraphIUVEntry(graph, 0);
-                                       m= hypre_SStructGraphIUVEntry(graph, nUventries-1);
-                                       if ((HYPRE_Int)(rank-startrank) >= i && (HYPRE_Int)(rank-startrank) <= m)
+                                       i = hypre_SStructGraphIUVEntry(graph, 0);
+                                       m = hypre_SStructGraphIUVEntry(graph, nUventries - 1);
+                                       if ((HYPRE_Int)(rank - startrank) >= i && (HYPRE_Int)(rank - startrank) <= m)
                                        {
-                                          found= trueV;
+                                          found = trueV;
                                        }
                                     }
 
                                     if (found)
                                     {
-                                       Uventry= hypre_SStructGraphUVEntry(graph, (HYPRE_Int)(rank-startrank));
+                                       Uventry = hypre_SStructGraphUVEntry(graph, (HYPRE_Int)(rank - startrank));
 
                                        if (Uventry != NULL)
                                        {
-                                          nUentries= hypre_SStructUVEntryNUEntries(Uventry);
-                                          for (i= 0; i< nUentries; i++)
+                                          nUentries = hypre_SStructUVEntryNUEntries(Uventry);
+                                          for (i = 0; i < nUentries; i++)
                                           {
-                                             if (hypre_SStructUVEntryToPart(Uventry, i)==part_crse)
+                                             if (hypre_SStructUVEntryToPart(Uventry, i) == part_crse)
                                              {
-                                                rows[cnt1]= rank;
-                                                cols[cnt1++]= hypre_SStructUVEntryToRank(Uventry, i);
+                                                rows[cnt1] = rank;
+                                                cols[cnt1++] = hypre_SStructUVEntryToRank(Uventry, i);
                                              }
 
                                           }  /* for (i= 0; i< nUentries; i++) */
@@ -2273,22 +2326,22 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
 
                            HYPRE_IJMatrixGetValues(ij_A, cnt1, ncols, rows, cols, vals2);
 
-                           cnt1= 0;
-                           for (l= index1[2]; l<= index2[2]; l++)
+                           cnt1 = 0;
+                           for (l = index1[2]; l <= index2[2]; l++)
                            {
-                              ll= l*refine_factors[1]*refine_factors[0];
-                              for (k= index1[1]; k<= index2[1]; k++)
+                              ll = l * refine_factors[1] * refine_factors[0];
+                              for (k = index1[1]; k <= index2[1]; k++)
                               {
-                                 kk= ll + k*refine_factors[0];
-                                 for (j= index1[0]; j<= index2[0]; j++)
+                                 kk = ll + k * refine_factors[0];
+                                 for (j = index1[0]; j <= index2[0]; j++)
                                  {
-                                    jj= kk+ j;
-                                    for (m= 0; m< temp2[jj]; m++)
+                                    jj = kk + j;
+                                    for (m = 0; m < temp2[jj]; m++)
                                     {
-                                       temp3[jj]+= vals2[cnt1];
+                                       temp3[jj] += vals2[cnt1];
                                        cnt1++;
                                     }
-                                    temp2[jj]= 0; /* zero off for next time */
+                                    temp2[jj] = 0; /* zero off for next time */
                                  }       /* for (j= index1[0]; j<= index2[0]; j++) */
                               }           /* for (k= index1[1]; k<= index2[1]; k++) */
                            }              /* for (l= index1[2]; l<= index2[2]; l++) */
@@ -2301,23 +2354,23 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
 
                         }   /* if Uventries > 0 */
 
-                        sum= 0.0;
-                        for (l= index1[2]; l<= index2[2]; l++)
+                        sum = 0.0;
+                        for (l = index1[2]; l <= index2[2]; l++)
                         {
-                           ll= l*refine_factors[1]*refine_factors[0];
-                           for (k= index1[1]; k<= index2[1]; k++)
+                           ll = l * refine_factors[1] * refine_factors[0];
+                           for (k = index1[1]; k <= index2[1]; k++)
                            {
-                              kk= ll + k*refine_factors[0];
-                              for (j= index1[0]; j<= index2[0]; j++)
+                              kk = ll + k * refine_factors[0];
+                              for (j = index1[0]; j <= index2[0]; j++)
                               {
-                                 jj= kk + j;
-                                 sum+= temp3[jj];
+                                 jj = kk + j;
+                                 sum += temp3[jj];
                               }
                            }
                         }
 
                         sum /= scaling;
-                        crse_ptrs[ rank_stencils[0] ][iAc]= sum;
+                        crse_ptrs[ rank_stencils[0] ][iAc] = sum;
 
                         hypre_TFree(temp3, HYPRE_MEMORY_HOST);
 
@@ -2336,33 +2389,45 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
    }          /* end var1 */
 
    if (stencil_contrib_cnt)
+   {
       hypre_TFree(stencil_contrib_cnt, HYPRE_MEMORY_HOST);
+   }
    if (stencil_ranks)
+   {
       hypre_TFree(stencil_ranks, HYPRE_MEMORY_HOST);
+   }
    if (volume_shift_box)
+   {
       hypre_TFree(volume_shift_box, HYPRE_MEMORY_HOST);
+   }
    if (vals)
+   {
       hypre_TFree(vals, HYPRE_MEMORY_HOST);
+   }
 
    if (shift_box)
    {
-      for (j= 0; j< stencil_size; j++)
+      for (j = 0; j < stencil_size; j++)
       {
          if (shift_box[j])
+         {
             hypre_BoxDestroy(shift_box[j]);
+         }
       }
       hypre_TFree(shift_box, HYPRE_MEMORY_HOST);
    }
 
    if (stencil_contrib_i)
    {
-      for (j= 1; j< max_stencil_size; j++)
+      for (j = 1; j < max_stencil_size; j++)
       {
-         stencil_i= rank_stencils[j];
+         stencil_i = rank_stencils[j];
          if (stencil_i != -1)
          {
             if (stencil_contrib_i[stencil_i])
+            {
                hypre_TFree(stencil_contrib_i[stencil_i], HYPRE_MEMORY_HOST);
+            }
          }
       }
       hypre_TFree(stencil_contrib_i, HYPRE_MEMORY_HOST);
@@ -2370,27 +2435,33 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
 
    if (weight_contrib_i)
    {
-      for (j= 1; j< max_stencil_size; j++)
+      for (j = 1; j < max_stencil_size; j++)
       {
-         stencil_i= rank_stencils[j];
+         stencil_i = rank_stencils[j];
          if (stencil_i != -1)
          {
             if (weight_contrib_i[stencil_i])
+            {
                hypre_TFree(weight_contrib_i[stencil_i], HYPRE_MEMORY_HOST);
+            }
          }
       }
       hypre_TFree(weight_contrib_i, HYPRE_MEMORY_HOST);
    }
 
    if (rank_stencils)
+   {
       hypre_TFree(rank_stencils, HYPRE_MEMORY_HOST);
+   }
 
    if (OffsetA)
    {
-      for (j= 0; j< 2; j++)
+      for (j = 0; j < 2; j++)
       {
          if (OffsetA[j])
+         {
             hypre_TFree(OffsetA[j], HYPRE_MEMORY_HOST);
+         }
       }
       hypre_TFree(OffsetA, HYPRE_MEMORY_HOST);
    }
@@ -2449,18 +2520,18 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
    {
       nvars    =  hypre_SStructPMatrixNVars(A_pmatrix);
 
-      for (var1= 0; var1< nvars; var1++)
+      for (var1 = 0; var1 < nvars; var1++)
       {
          /*-----------------------------------------------------------------
           *  Yank out the structured stencils for this variable (only like
           *  variables considered) and find their ranks.
           *-----------------------------------------------------------------*/
          stencils    = hypre_SStructPMatrixSStencil(A_crse, var1, var1);
-         stencil_size= hypre_StructStencilSize(stencils);
+         stencil_size = hypre_StructStencilSize(stencils);
 
-         stencil_ranks= hypre_TAlloc(HYPRE_Int,  stencil_size, HYPRE_MEMORY_HOST);
-         rank_stencils= hypre_TAlloc(HYPRE_Int,  max_stencil_size, HYPRE_MEMORY_HOST);
-         for (i= 0; i< stencil_size; i++)
+         stencil_ranks = hypre_TAlloc(HYPRE_Int,  stencil_size, HYPRE_MEMORY_HOST);
+         rank_stencils = hypre_TAlloc(HYPRE_Int,  max_stencil_size, HYPRE_MEMORY_HOST);
+         for (i = 0; i < stencil_size; i++)
          {
             hypre_CopyIndex(hypre_StructStencilElement(stencils, i),
                             stencil_shape_i);
@@ -2470,16 +2541,16 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
          /*-----------------------------------------------------------------
           *  qsort the ranks into ascending order
           *-----------------------------------------------------------------*/
-         hypre_qsort0(stencil_ranks, 0, stencil_size-1);
+         hypre_qsort0(stencil_ranks, 0, stencil_size - 1);
 
-         crse_smatrix= hypre_SStructPMatrixSMatrix(A_crse, var1, var1);
-         cgrid= hypre_SStructPGridSGrid(hypre_SStructPMatrixPGrid(A_crse), var1);
-         cgrid_boxes= hypre_StructGridBoxes(cgrid);
+         crse_smatrix = hypre_SStructPMatrixSMatrix(A_crse, var1, var1);
+         cgrid = hypre_SStructPGridSGrid(hypre_SStructPMatrixPGrid(A_crse), var1);
+         cgrid_boxes = hypre_StructGridBoxes(cgrid);
 
-         fgrid= hypre_SStructPGridSGrid(hypre_SStructPMatrixPGrid(A_pmatrix), var1);
-         fgrid_boxes= hypre_StructGridBoxes(fgrid);
+         fgrid = hypre_SStructPGridSGrid(hypre_SStructPMatrixPGrid(A_pmatrix), var1);
+         fgrid_boxes = hypre_StructGridBoxes(fgrid);
 
-         box_starts= hypre_CTAlloc(HYPRE_Int,  hypre_BoxArraySize(fgrid_boxes), HYPRE_MEMORY_HOST);
+         box_starts = hypre_CTAlloc(HYPRE_Int,  hypre_BoxArraySize(fgrid_boxes), HYPRE_MEMORY_HOST);
          box_ends  = hypre_CTAlloc(HYPRE_Int,  hypre_BoxArraySize(fgrid_boxes), HYPRE_MEMORY_HOST);
          hypre_SStructGraphFindSGridEndpts(graph, part_fine, var1, myid,
                                            0, box_starts);
@@ -2499,16 +2570,16 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
           *-----------------------------------------------------------------*/
          box_array_size   = hypre_BoxArraySize(fgrid_boxes);
          cbox_array_size  = hypre_BoxArraySize(cgrid_boxes);
-         box_graph_indices= hypre_CTAlloc(HYPRE_Int *,  box_array_size, HYPRE_MEMORY_HOST);
-         box_graph_cnts   = hypre_CTAlloc(HYPRE_Int ,  box_array_size, HYPRE_MEMORY_HOST);
+         box_graph_indices = hypre_CTAlloc(HYPRE_Int *,  box_array_size, HYPRE_MEMORY_HOST);
+         box_graph_cnts   = hypre_CTAlloc(HYPRE_Int,  box_array_size, HYPRE_MEMORY_HOST);
 
          data_space = hypre_StructMatrixDataSpace(crse_smatrix);
-         cdata_space_ranks= hypre_CTAlloc(HYPRE_Int,  cbox_array_size, HYPRE_MEMORY_HOST);
-         cdata_space_ranks[0]= 0;
-         for (i= 1; i< cbox_array_size; i++)
+         cdata_space_ranks = hypre_CTAlloc(HYPRE_Int,  cbox_array_size, HYPRE_MEMORY_HOST);
+         cdata_space_ranks[0] = 0;
+         for (i = 1; i < cbox_array_size; i++)
          {
-            cdata_space_ranks[i]= cdata_space_ranks[i-1]+
-               hypre_BoxVolume(hypre_BoxArrayBox(data_space, i-1));
+            cdata_space_ranks[i] = cdata_space_ranks[i - 1] +
+                                   hypre_BoxVolume(hypre_BoxArrayBox(data_space, i - 1));
          }
 
          /*-----------------------------------------------------------------
@@ -2518,24 +2589,24 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
           *  bounds found. Note that if start has positive index, then end
           *  must have a positive index also.
           *-----------------------------------------------------------------*/
-         for (fi= 0; fi< box_array_size; fi++)
+         for (fi = 0; fi < box_array_size; fi++)
          {
-            i= hypre_LowerBinarySearch(iUventries, box_starts[fi], nUventries);
+            i = hypre_LowerBinarySearch(iUventries, box_starts[fi], nUventries);
             if (i >= 0)
             {
-               j= hypre_UpperBinarySearch(iUventries, box_ends[fi], nUventries);
-               box_graph_indices[fi]= hypre_TAlloc(HYPRE_Int,  j-i+1, HYPRE_MEMORY_HOST);
+               j = hypre_UpperBinarySearch(iUventries, box_ends[fi], nUventries);
+               box_graph_indices[fi] = hypre_TAlloc(HYPRE_Int,  j - i + 1, HYPRE_MEMORY_HOST);
 
-               for (k= 0; k< (j-i+1); k++)
+               for (k = 0; k < (j - i + 1); k++)
                {
-                  Uventry= hypre_SStructGraphUVEntry(graph,
-                                                     iUventries[i+k]);
+                  Uventry = hypre_SStructGraphUVEntry(graph,
+                                                      iUventries[i + k]);
 
-                  for (m= 0; m< hypre_SStructUVEntryNUEntries(Uventry); m++)
+                  for (m = 0; m < hypre_SStructUVEntryNUEntries(Uventry); m++)
                   {
                      if (hypre_SStructUVEntryToPart(Uventry, m) == part_crse)
                      {
-                        box_graph_indices[fi][box_graph_cnts[fi]]= iUventries[i+k];
+                        box_graph_indices[fi][box_graph_cnts[fi]] = iUventries[i + k];
                         box_graph_cnts[fi]++;
                         break;
                      }
@@ -2566,7 +2637,7 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
           *                           contain fine-to-coarse connections of
           *                           coarse node l.
           *-----------------------------------------------------------------*/
-         for (fi= 0; fi< box_array_size; fi++)
+         for (fi = 0; fi < box_array_size; fi++)
          {
             /*-------------------------------------------------------------
              * Determine the coarse data ptrs corresponding to fine box fi.
@@ -2583,7 +2654,7 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
             box_ranks       = hypre_TAlloc(HYPRE_Int,  box_graph_cnts[fi], HYPRE_MEMORY_HOST);
             box_connections = hypre_TAlloc(HYPRE_Int,  box_graph_cnts[fi], HYPRE_MEMORY_HOST);
             parents         = hypre_TAlloc(HYPRE_Int,  box_graph_cnts[fi], HYPRE_MEMORY_HOST);
-            temp1           = hypre_CTAlloc(HYPRE_Int,  box_graph_cnts[fi]+1, HYPRE_MEMORY_HOST);
+            temp1           = hypre_CTAlloc(HYPRE_Int,  box_graph_cnts[fi] + 1, HYPRE_MEMORY_HOST);
             temp2           = hypre_CTAlloc(HYPRE_Int,  box_graph_cnts[fi], HYPRE_MEMORY_HOST);
             Uv_cindex       = hypre_TAlloc(hypre_Index,  box_graph_cnts[fi], HYPRE_MEMORY_HOST);
 
@@ -2591,7 +2662,7 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
              * determine the parent box of this fgrid_box.
              *-------------------------------------------------------------*/
             hypre_ClearIndex(index_temp);
-            for (i= 0; i < box_graph_cnts[fi]; i++)
+            for (i = 0; i < box_graph_cnts[fi]; i++)
             {
                Uventry = Uventries[box_graph_indices[fi][i]];
 
@@ -2605,10 +2676,11 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
                hypre_StructMapFineToCoarse(index, index_temp, stridef, Uv_cindex[i]);
                hypre_BoxSetExtents(&fine_box, Uv_cindex[i], Uv_cindex[i]);
 
-               for (j= 0; j< cboxi_fcnt[var1][fi]; j++)
+               ci = 0;
+               for (j = 0; j < cboxi_fcnt[var1][fi]; j++)
                {
-                  ci= cboxi_fboxes[var1][fi][j];
-                  cgrid_box= hypre_BoxArrayBox(cgrid_boxes, ci);
+                  ci = cboxi_fboxes[var1][fi][j];
+                  cgrid_box = hypre_BoxArrayBox(cgrid_boxes, ci);
                   hypre_IntersectBoxes(&fine_box, cgrid_box, &intersect_box);
                   if (hypre_BoxVolume(&intersect_box) > 0)
                   {
@@ -2617,38 +2689,38 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
                }
 
                parents[i]  = ci;
-               box_ranks[i]= cdata_space_ranks[ci] +
-                  hypre_BoxIndexRank(hypre_BoxArrayBox(data_space, ci),
-                                     Uv_cindex[i]);
+               box_ranks[i] = cdata_space_ranks[ci] +
+                              hypre_BoxIndexRank(hypre_BoxArrayBox(data_space, ci),
+                                                 Uv_cindex[i]);
             }
 
             /*---------------------------------------------------------------
              * Determine and "group" the Uventries using the box_ranks.
              * temp2 stores the Uventries indices for a coarsen node.
              *---------------------------------------------------------------*/
-            cnt1= 0;
+            cnt1 = 0;
             j   = 0;
-            temp1[cnt1]= j;
+            temp1[cnt1] = j;
 
-            for (i= 0; i< box_graph_cnts[fi]; i++)
+            for (i = 0; i < box_graph_cnts[fi]; i++)
             {
                if (box_ranks[i] != -1)
                {
                   k                 = box_ranks[i];
-                  box_connections[i]= cnt1;
+                  box_connections[i] = cnt1;
                   temp2[j++]        = box_graph_indices[fi][i];
 
-                  for (l= i+1; l< box_graph_cnts[fi]; l++)
+                  for (l = i + 1; l < box_graph_cnts[fi]; l++)
                   {
                      if (box_ranks[l] == k)
                      {
-                        box_connections[l]= cnt1;
+                        box_connections[l] = cnt1;
                         temp2[j++]        = box_graph_indices[fi][l];
-                        box_ranks[l]      =-1;
+                        box_ranks[l]      = -1;
                      }
                   }
                   cnt1++;
-                  temp1[cnt1]= j;
+                  temp1[cnt1] = j;
                }
             }
 
@@ -2657,45 +2729,57 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
              *  grid node.
              *-----------------------------------------------------------------*/
             parents_cnodes      = hypre_TAlloc(HYPRE_Int,  cnt1, HYPRE_MEMORY_HOST);
-            fine_interface_ranks= hypre_TAlloc(HYPRE_Int,  cnt1, HYPRE_MEMORY_HOST);
+            fine_interface_ranks = hypre_TAlloc(HYPRE_Int,  cnt1, HYPRE_MEMORY_HOST);
             box_ranks_cnt       = hypre_CTAlloc(HYPRE_Int,  cnt1, HYPRE_MEMORY_HOST);
             coarse_contrib_Uv   = hypre_TAlloc(HYPRE_Int *,  cnt1, HYPRE_MEMORY_HOST);
             cindex              = hypre_TAlloc(hypre_Index,  cnt1, HYPRE_MEMORY_HOST);
 
-            for (i= 0; i< box_graph_cnts[fi]; i++)
+            for (i = 0; i < box_graph_cnts[fi]; i++)
             {
                if (box_ranks[i] != -1)
                {
                   j                      = box_connections[i];
                   parents_cnodes[j]      = parents[i];
-                  fine_interface_ranks[j]=
+                  fine_interface_ranks[j] =
                      hypre_BoxIndexRank(hypre_BoxArrayBox(data_space, parents[i]),
                                         Uv_cindex[i]);
                   hypre_CopyIndex(Uv_cindex[i], cindex[j]);
 
-                  box_ranks_cnt[j]       = temp1[j+1] - temp1[j];
+                  box_ranks_cnt[j]       = temp1[j + 1] - temp1[j];
                   coarse_contrib_Uv[j]   = hypre_TAlloc(HYPRE_Int,  box_ranks_cnt[j], HYPRE_MEMORY_HOST);
 
                   l                      = temp1[j];
-                  for (k= 0; k< box_ranks_cnt[j]; k++)
+                  for (k = 0; k < box_ranks_cnt[j]; k++)
                   {
-                     coarse_contrib_Uv[j][k]= temp2[l+k];
+                     coarse_contrib_Uv[j][k] = temp2[l + k];
                   }
                }
             }
 
             if (box_ranks)
+            {
                hypre_TFree(box_ranks, HYPRE_MEMORY_HOST);
+            }
             if (box_connections)
+            {
                hypre_TFree(box_connections, HYPRE_MEMORY_HOST);
+            }
             if (parents)
+            {
                hypre_TFree(parents, HYPRE_MEMORY_HOST);
+            }
             if (temp1)
+            {
                hypre_TFree(temp1, HYPRE_MEMORY_HOST);
+            }
             if (temp2)
+            {
                hypre_TFree(temp2, HYPRE_MEMORY_HOST);
+            }
             if (Uv_cindex)
+            {
                hypre_TFree(Uv_cindex, HYPRE_MEMORY_HOST);
+            }
 
             /*------------------------------------------------------------------------
              *  Step 3:
@@ -2723,14 +2807,14 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
              *-----------------------------------------------------------------*/
             hypre_ClearIndex(index_temp);
 
-            nrows= 0;
-            box_to_ranks_cnt=  hypre_CTAlloc(HYPRE_Int,  cnt1, HYPRE_MEMORY_HOST);
-            for (i= 0; i< cnt1; i++)
+            nrows = 0;
+            box_to_ranks_cnt =  hypre_CTAlloc(HYPRE_Int,  cnt1, HYPRE_MEMORY_HOST);
+            for (i = 0; i < cnt1; i++)
             {
-               for (j= 0; j< box_ranks_cnt[i]; j++)
+               for (j = 0; j < box_ranks_cnt[i]; j++)
                {
                   Uventry  = Uventries[ coarse_contrib_Uv[i][j] ];
-                  for (k= 0; k< hypre_SStructUVEntryNUEntries(Uventry); k++)
+                  for (k = 0; k < hypre_SStructUVEntryNUEntries(Uventry); k++)
                   {
                      if (hypre_SStructUVEntryToPart(Uventry, k) == part_crse)
                      {
@@ -2738,33 +2822,33 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
                      }
                   }
                }
-               nrows+= box_to_ranks_cnt[i];
+               nrows += box_to_ranks_cnt[i];
             }
 
-            ncols= hypre_TAlloc(HYPRE_Int,  nrows, HYPRE_MEMORY_HOST);
-            for (i= 0; i< nrows; i++)
+            ncols = hypre_TAlloc(HYPRE_Int,  nrows, HYPRE_MEMORY_HOST);
+            for (i = 0; i < nrows; i++)
             {
-               ncols[i]= 1;
+               ncols[i] = 1;
             }
 
-            rows=  hypre_TAlloc(HYPRE_BigInt,  nrows, HYPRE_MEMORY_HOST);
-            cols=  hypre_TAlloc(HYPRE_BigInt,  nrows, HYPRE_MEMORY_HOST);
-            vals=  hypre_CTAlloc(HYPRE_Real,  nrows, HYPRE_MEMORY_HOST);
+            rows =  hypre_TAlloc(HYPRE_BigInt,  nrows, HYPRE_MEMORY_HOST);
+            cols =  hypre_TAlloc(HYPRE_BigInt,  nrows, HYPRE_MEMORY_HOST);
+            vals =  hypre_CTAlloc(HYPRE_Real,  nrows, HYPRE_MEMORY_HOST);
 
-            interface_max_stencil_ranks=  hypre_TAlloc(HYPRE_Int *,  cnt1, HYPRE_MEMORY_HOST);
+            interface_max_stencil_ranks =  hypre_TAlloc(HYPRE_Int *,  cnt1, HYPRE_MEMORY_HOST);
             interface_max_stencil_cnt  =  hypre_TAlloc(HYPRE_Int *,  cnt1, HYPRE_MEMORY_HOST);
             interface_rank_stencils    =  hypre_TAlloc(HYPRE_Int *,  cnt1, HYPRE_MEMORY_HOST);
             interface_stencil_ranks    =  hypre_TAlloc(HYPRE_Int *,  cnt1, HYPRE_MEMORY_HOST);
-            coarse_stencil_cnt         =  hypre_CTAlloc(HYPRE_Int ,  cnt1, HYPRE_MEMORY_HOST);
+            coarse_stencil_cnt         =  hypre_CTAlloc(HYPRE_Int,  cnt1, HYPRE_MEMORY_HOST);
 
-            k= 0;
-            for (i= 0; i< cnt1; i++)
+            k = 0;
+            for (i = 0; i < cnt1; i++)
             {
                /*-----------------------------------------------------------------
                 * for each coarse interface node, we get a stencil. We compute only
                 * the ranks assuming a maximum size stencil of 27.
                 *-----------------------------------------------------------------*/
-               interface_max_stencil_ranks[i]= hypre_TAlloc(HYPRE_Int,  box_to_ranks_cnt[i], HYPRE_MEMORY_HOST);
+               interface_max_stencil_ranks[i] = hypre_TAlloc(HYPRE_Int,  box_to_ranks_cnt[i], HYPRE_MEMORY_HOST);
                interface_max_stencil_cnt[i]  = hypre_CTAlloc(HYPRE_Int,  max_stencil_size, HYPRE_MEMORY_HOST);
 
                /*-----------------------------------------------------------------
@@ -2774,8 +2858,8 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
                hypre_CopyIndex(cindex[i], index1);
                hypre_SetIndex3(index1, -index1[0], -index1[1], -index1[2]);
 
-               n= 0;
-               for (j= 0; j< box_ranks_cnt[i]; j++)
+               n = 0;
+               for (j = 0; j < box_ranks_cnt[i]; j++)
                {
                   /*--------------------------------------------------------------
                    * extract the row rank for a given Uventry. Note that these
@@ -2790,26 +2874,26 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
                   hypre_SStructGridFindBoxManEntry(grid, part_fine, index, var1, &boxman_entry);
                   hypre_SStructBoxManEntryGetGlobalRank(boxman_entry, index, &rank, matrix_type);
 
-                  Uventry= hypre_SStructGraphUVEntry(graph, rank-startrank);
-                  nUentries= hypre_SStructUVEntryNUEntries(Uventry);
+                  Uventry = hypre_SStructGraphUVEntry(graph, rank - startrank);
+                  nUentries = hypre_SStructUVEntryNUEntries(Uventry);
 
-                  for (l= 0; l< nUentries; l++)
+                  for (l = 0; l < nUentries; l++)
                   {
                      if (hypre_SStructUVEntryToPart(Uventry, l) == part_crse)
                      {
                         to_rank  = hypre_SStructUVEntryToRank(Uventry, l);
                         rows[k]  = rank;
-                        cols[k++]= to_rank;
+                        cols[k++] = to_rank;
 
                         /*---------------------------------------------------------
                          * compute stencil shape for this Uentry.
                          *---------------------------------------------------------*/
-                        hypre_CopyIndex( hypre_SStructUVEntryToIndex(Uventry,l),
+                        hypre_CopyIndex( hypre_SStructUVEntryToIndex(Uventry, l),
                                          index );
                         hypre_AddIndexes(index, index1, 3, index2);
 
                         MapStencilRank(index2, m);
-                        interface_max_stencil_ranks[i][n++]= m;
+                        interface_max_stencil_ranks[i][n++] = m;
                         interface_max_stencil_cnt[i][m]++;
                      }
                   }
@@ -2819,8 +2903,8 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
                /*-----------------------------------------------------------------
                 * Determine only the distinct stencil ranks for coarse node i.
                 *-----------------------------------------------------------------*/
-               l= 0;
-               for (j= 0; j< max_stencil_size; j++)
+               l = 0;
+               for (j = 0; j < max_stencil_size; j++)
                {
                   if (interface_max_stencil_cnt[i][j])
                   {
@@ -2828,20 +2912,20 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
                   }
                }
 
-               coarse_stencil_cnt[i]= l;
-               interface_stencil_ranks[i]= hypre_TAlloc(HYPRE_Int,  l, HYPRE_MEMORY_HOST);
-               interface_rank_stencils[i]= hypre_TAlloc(HYPRE_Int,  max_stencil_size, HYPRE_MEMORY_HOST);
+               coarse_stencil_cnt[i] = l;
+               interface_stencil_ranks[i] = hypre_TAlloc(HYPRE_Int,  l, HYPRE_MEMORY_HOST);
+               interface_rank_stencils[i] = hypre_TAlloc(HYPRE_Int,  max_stencil_size, HYPRE_MEMORY_HOST);
 
                /*-----------------------------------------------------------------
                 * For each stencil rank, assign one of the stencil_shape_i index.
                 *-----------------------------------------------------------------*/
-               l= 0;
-               for (j= 0; j< max_stencil_size; j++)
+               l = 0;
+               for (j = 0; j < max_stencil_size; j++)
                {
                   if (interface_max_stencil_cnt[i][j])
                   {
-                     interface_rank_stencils[i][j]= l;
-                     interface_stencil_ranks[i][l]= j;
+                     interface_rank_stencils[i][j] = l;
+                     interface_stencil_ranks[i][l] = j;
                      l++;
                   }
                }
@@ -2877,19 +2961,19 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
              *                            corresponding to the common
              *                            stencil_shape.
              *-----------------------------------------------------------------*/
-            k= 0;
-            for (i= 0; i< cnt1; i++)
+            k = 0;
+            for (i = 0; i < cnt1; i++)
             {
-               stencil_vals= hypre_CTAlloc(HYPRE_Real,  coarse_stencil_cnt[i], HYPRE_MEMORY_HOST);
+               stencil_vals = hypre_CTAlloc(HYPRE_Real,  coarse_stencil_cnt[i], HYPRE_MEMORY_HOST);
 
                /*-----------------------------------------------------------------
                 * Compute the arithmetic stencil averages for coarse node i.
                 *-----------------------------------------------------------------*/
-               for (j= 0; j< box_to_ranks_cnt[i]; j++)
+               for (j = 0; j < box_to_ranks_cnt[i]; j++)
                {
-                  m= interface_max_stencil_ranks[i][j];
-                  l= interface_rank_stencils[i][m];
-                  stencil_vals[l]+= vals[k]/interface_max_stencil_cnt[i][m];
+                  m = interface_max_stencil_ranks[i][j];
+                  l = interface_rank_stencils[i][m];
+                  stencil_vals[l] += vals[k] / interface_max_stencil_cnt[i][m];
                   k++;
                }
                hypre_TFree(interface_max_stencil_ranks[i], HYPRE_MEMORY_HOST);
@@ -2905,39 +2989,39 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
                 * accordingly.
                 *-----------------------------------------------------------------*/
 
-               sort= falseV;
-               for (j= 0; j< (coarse_stencil_cnt[i]-1); j++)
+               sort = falseV;
+               for (j = 0; j < (coarse_stencil_cnt[i] - 1); j++)
                {
-                  if (interface_stencil_ranks[i][j] > interface_stencil_ranks[i][j+1])
+                  if (interface_stencil_ranks[i][j] > interface_stencil_ranks[i][j + 1])
                   {
-                     sort= trueV;
+                     sort = trueV;
                      break;
                   }
                }
 
-               if ( (coarse_stencil_cnt[i]>1) && (sort==trueV) )
+               if ( (coarse_stencil_cnt[i] > 1) && (sort == trueV) )
                {
-                  temp1= hypre_TAlloc(HYPRE_Int,  coarse_stencil_cnt[i], HYPRE_MEMORY_HOST);
-                  for (j= 0; j< coarse_stencil_cnt[i]; j++)
+                  temp1 = hypre_TAlloc(HYPRE_Int,  coarse_stencil_cnt[i], HYPRE_MEMORY_HOST);
+                  for (j = 0; j < coarse_stencil_cnt[i]; j++)
                   {
-                     temp1[j]= j;
+                     temp1[j] = j;
                   }
 
                   hypre_qsort1(interface_stencil_ranks[i], (HYPRE_Real *) temp1, 0,
-                               coarse_stencil_cnt[i]-1);
+                               coarse_stencil_cnt[i] - 1);
 
                   /*---------------------------------------------------------------
                    * swap the stencil_vals to agree with the rank swapping.
                    *---------------------------------------------------------------*/
                   temp3  = hypre_TAlloc(HYPRE_Real,  coarse_stencil_cnt[i], HYPRE_MEMORY_HOST);
-                  for (j=0; j< coarse_stencil_cnt[i]; j++)
+                  for (j = 0; j < coarse_stencil_cnt[i]; j++)
                   {
                      m         = temp1[j];
                      temp3[j]  = stencil_vals[m];
                   }
-                  for (j=0; j< coarse_stencil_cnt[i]; j++)
+                  for (j = 0; j < coarse_stencil_cnt[i]; j++)
                   {
-                     stencil_vals[j]= temp3[j];
+                     stencil_vals[j] = temp3[j];
                   }
 
                   hypre_TFree(temp1, HYPRE_MEMORY_HOST);
@@ -2949,12 +3033,12 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
                 * We need to convert the ranks back to stencil_shapes and then
                 * find the abs of the stencil shape.
                 *-----------------------------------------------------------------*/
-               temp3= hypre_TAlloc(HYPRE_Real,  coarse_stencil_cnt[i], HYPRE_MEMORY_HOST);
-               for (j=0; j< coarse_stencil_cnt[i]; j++)
+               temp3 = hypre_TAlloc(HYPRE_Real,  coarse_stencil_cnt[i], HYPRE_MEMORY_HOST);
+               for (j = 0; j < coarse_stencil_cnt[i]; j++)
                {
                   InverseMapStencilRank(interface_stencil_ranks[i][j], index_temp);
                   AbsStencilShape(index_temp, abs_stencil_shape);
-                  temp3[j]= weights[abs_stencil_shape];
+                  temp3[j] = weights[abs_stencil_shape];
                }
 
                /*-----------------------------------------------------------------
@@ -2963,16 +3047,16 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
                 * WE ARE ASSUMING THAT THE COARSE INTERFACE STENCIL HAS SOME
                 * COMMON STENCIL SHAPE WITH THE COARSE STENCIL.
                 *-----------------------------------------------------------------*/
-               common_rank_stencils= hypre_TAlloc(HYPRE_Int,  stencil_size, HYPRE_MEMORY_HOST);
-               common_stencil_ranks= hypre_TAlloc(HYPRE_Int,  stencil_size, HYPRE_MEMORY_HOST);
+               common_rank_stencils = hypre_TAlloc(HYPRE_Int,  stencil_size, HYPRE_MEMORY_HOST);
+               common_stencil_ranks = hypre_TAlloc(HYPRE_Int,  stencil_size, HYPRE_MEMORY_HOST);
                common_stencil_i    = hypre_TAlloc(HYPRE_Int,  stencil_size, HYPRE_MEMORY_HOST);
 
-               l= 0;
-               m= 0;
-               for (j= 0; j< stencil_size; j++)
+               l = 0;
+               m = 0;
+               for (j = 0; j < stencil_size; j++)
                {
-                  while(  (l < coarse_stencil_cnt[i])
-                          && (stencil_ranks[j] > interface_stencil_ranks[i][l]) )
+                  while (  (l < coarse_stencil_cnt[i])
+                           && (stencil_ranks[j] > interface_stencil_ranks[i][l]) )
                   {
                      l++;
                   }
@@ -2987,8 +3071,8 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
                   if (   (stencil_ranks[j] == interface_stencil_ranks[i][l])
                          && (l < coarse_stencil_cnt[i]) )
                   {
-                     common_rank_stencils[m]= rank_stencils[ stencil_ranks[j] ];
-                     common_stencil_ranks[m]= stencil_ranks[j];
+                     common_rank_stencils[m] = rank_stencils[ stencil_ranks[j] ];
+                     common_stencil_ranks[m] = stencil_ranks[j];
                      common_stencil_i[m++]  = l;
                      l++;
                   }
@@ -2996,16 +3080,16 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
                /*-----------------------------------------------------------------
                 * Find the contribution and weights for the averaged stencils.
                 *-----------------------------------------------------------------*/
-               for (j= 0; j< m; j++)
+               for (j = 0; j < m; j++)
                {
                   hypre_CopyIndex(hypre_StructStencilElement(
                                      stencils, common_rank_stencils[j]),
                                   stencil_shape_i);
                   AbsStencilShape(stencil_shape_i, abs_stencil_shape);
 
-                  crse_ptr= hypre_StructMatrixExtractPointerByIndex(crse_smatrix,
-                                                                    parents_cnodes[i],
-                                                                    stencil_shape_i);
+                  crse_ptr = hypre_StructMatrixExtractPointerByIndex(crse_smatrix,
+                                                                     parents_cnodes[i],
+                                                                     stencil_shape_i);
 
                   /*-----------------------------------------------------------------
                    *  For a compact stencil (e.g., -1 <= hypre_Index[i] <= 1, i= 0-2),
@@ -3022,22 +3106,22 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
                    *                          0   c in 1-d, 2-d, or 3-d.
                    *-----------------------------------------------------------------*/
 
-                  switch(abs_stencil_shape)
+                  switch (abs_stencil_shape)
                   {
                      case 3:    /* corners of 3-d stencil */
 
-                        l= common_stencil_i[j];
-                        crse_ptr[fine_interface_ranks[i]]= stencil_vals[l];
+                        l = common_stencil_i[j];
+                        crse_ptr[fine_interface_ranks[i]] = stencil_vals[l];
 
                         break;
 
 
                      case 2:    /* corners in 2-d or edges in 3-d */
 
-                        if (ndim ==2)
+                        if (ndim == 2)
                         {
-                           l= common_stencil_i[j];
-                           crse_ptr[fine_interface_ranks[i]]= stencil_vals[l];
+                           l = common_stencil_i[j];
+                           crse_ptr[fine_interface_ranks[i]] = stencil_vals[l];
                         }
 
                         else if (ndim == 3)
@@ -3052,80 +3136,80 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
                             *      17  15  16           8  6  7         26   24   25
                             *----------------------------------------------------------*/
                            l    =  common_stencil_ranks[j];
-                           temp1=  hypre_TAlloc(HYPRE_Int,  2, HYPRE_MEMORY_HOST);
+                           temp1 =  hypre_TAlloc(HYPRE_Int,  2, HYPRE_MEMORY_HOST);
 
-                           switch(l)
+                           switch (l)
                            {
                               case 4:   /* centre plane ne */
 
-                                 temp1[0]= 13;
-                                 temp1[1]= 22;
+                                 temp1[0] = 13;
+                                 temp1[1] = 22;
                                  break;
 
                               case 5:   /* centre plane nw */
 
-                                 temp1[0]= 14;
-                                 temp1[1]= 23;
+                                 temp1[0] = 14;
+                                 temp1[1] = 23;
                                  break;
 
                               case 7:   /* centre plane se */
 
-                                 temp1[0]= 16;
-                                 temp1[1]= 25;
+                                 temp1[0] = 16;
+                                 temp1[1] = 25;
                                  break;
 
                               case 8:   /* centre plane sw */
 
-                                 temp1[0]= 17;
-                                 temp1[1]= 26;
+                                 temp1[0] = 17;
+                                 temp1[1] = 26;
                                  break;
 
                               case 10:   /* top plane e */
 
-                                 temp1[0]= 13;
-                                 temp1[1]= 16;
+                                 temp1[0] = 13;
+                                 temp1[1] = 16;
                                  break;
 
                               case 11:   /* top plane w */
 
-                                 temp1[0]= 14;
-                                 temp1[1]= 17;
+                                 temp1[0] = 14;
+                                 temp1[1] = 17;
                                  break;
 
                               case 12:   /* top plane n */
 
-                                 temp1[0]= 13;
-                                 temp1[1]= 14;
+                                 temp1[0] = 13;
+                                 temp1[1] = 14;
                                  break;
 
                               case 15:   /* top plane s */
 
-                                 temp1[0]= 16;
-                                 temp1[1]= 17;
+                                 temp1[0] = 16;
+                                 temp1[1] = 17;
                                  break;
 
                               case 19:   /* bottom plane e */
 
-                                 temp1[0]= 22;
-                                 temp1[1]= 25;
+                                 temp1[0] = 22;
+                                 temp1[1] = 25;
                                  break;
 
                               case 20:   /* bottom plane w */
 
-                                 temp1[0]= 23;
-                                 temp1[1]= 26;
+                                 temp1[0] = 23;
+                                 temp1[1] = 26;
                                  break;
 
                               case 21:   /* bottom plane n */
 
-                                 temp1[0]= 22;
-                                 temp1[1]= 23;
+                                 temp1[0] = 22;
+                                 temp1[1] = 23;
                                  break;
 
                               case 24:   /* bottom plane s */
 
-                                 temp1[0]= 25;
-                                 temp1[1]= 26;
+                                 temp1[0] = 25;
+                                 temp1[1] = 26;
                                  break;
                            }
 
@@ -3136,15 +3220,15 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
                             *  interface_stencil_ranks. The weights must be averaged.
                             *-------------------------------------------------------*/
 
-                           l= common_stencil_i[j];
-                           sum= temp3[l];
-                           sum_contrib= sum*stencil_vals[l];
+                           l = common_stencil_i[j];
+                           sum = temp3[l];
+                           sum_contrib = sum * stencil_vals[l];
 
-                           n= 1;
-                           for (l= 0; l< 2; l++)
+                           n = 1;
+                           for (l = 0; l < 2; l++)
                            {
                               while (  (n < coarse_stencil_cnt[i])
-                                       &&(interface_stencil_ranks[i][n] < temp1[l]) )
+                                       && (interface_stencil_ranks[i][n] < temp1[l]) )
                               {
                                  n++;
                               }
@@ -3156,15 +3240,15 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
 
                               if (interface_stencil_ranks[i][n] == temp1[l])
                               {
-                                 sum+= temp3[n];
-                                 sum_contrib+= temp3[n]*stencil_vals[n];
+                                 sum += temp3[n];
+                                 sum_contrib += temp3[n] * stencil_vals[n];
                                  n++;
                               }
                            }
 
-                           sum_contrib/= sum;    /* average out the weights */
-                           l= common_stencil_i[j];
-                           crse_ptr[fine_interface_ranks[i]]= sum_contrib;
+                           sum_contrib /= sum;   /* average out the weights */
+                           l = common_stencil_i[j];
+                           crse_ptr[fine_interface_ranks[i]] = sum_contrib;
 
                            hypre_TFree(temp1, HYPRE_MEMORY_HOST);
 
@@ -3176,39 +3260,39 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
 
                         if (ndim == 1)
                         {
-                           l= common_stencil_i[j];
-                           crse_ptr[fine_interface_ranks[i]]= stencil_vals[l];
+                           l = common_stencil_i[j];
+                           crse_ptr[fine_interface_ranks[i]] = stencil_vals[l];
                         }
 
                         else if (ndim == 2)
                         {
                            l    =  common_stencil_ranks[j];
-                           temp1=  hypre_TAlloc(HYPRE_Int,  2, HYPRE_MEMORY_HOST);
+                           temp1 =  hypre_TAlloc(HYPRE_Int,  2, HYPRE_MEMORY_HOST);
 
-                           switch(l)
+                           switch (l)
                            {
                               case 1:   /* e */
 
-                                 temp1[0]= 4;
-                                 temp1[1]= 7;
+                                 temp1[0] = 4;
+                                 temp1[1] = 7;
                                  break;
 
                               case 2:   /* w */
 
-                                 temp1[0]= 5;
-                                 temp1[1]= 8;
+                                 temp1[0] = 5;
+                                 temp1[1] = 8;
                                  break;
 
                               case 3:   /* n */
 
-                                 temp1[0]= 4;
-                                 temp1[1]= 5;
+                                 temp1[0] = 4;
+                                 temp1[1] = 5;
                                  break;
 
                               case 6:   /* s */
 
-                                 temp1[0]= 7;
-                                 temp1[1]= 8;
+                                 temp1[0] = 7;
+                                 temp1[1] = 8;
                                  break;
                            }
 
@@ -3217,15 +3301,15 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
                             *  stencils.
                             *-------------------------------------------------------*/
 
-                           l= common_stencil_i[j];
-                           sum= temp3[l];
-                           sum_contrib= sum*stencil_vals[l];
+                           l = common_stencil_i[j];
+                           sum = temp3[l];
+                           sum_contrib = sum * stencil_vals[l];
 
-                           n= 1;
-                           for (l= 0; l< 2; l++)
+                           n = 1;
+                           for (l = 0; l < 2; l++)
                            {
                               while (  (n < coarse_stencil_cnt[i])
-                                       &&(interface_stencil_ranks[i][n] < temp1[l]) )
+                                       && (interface_stencil_ranks[i][n] < temp1[l]) )
                               {
                                  n++;
                               }
@@ -3237,15 +3321,15 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
 
                               if (interface_stencil_ranks[i][n] == temp1[l])
                               {
-                                 sum+= temp3[n];
-                                 sum_contrib+= temp3[n]*stencil_vals[n];
+                                 sum += temp3[n];
+                                 sum_contrib += temp3[n] * stencil_vals[n];
                                  n++;
                               }
                            }
 
-                           sum_contrib/= sum;    /* average out the weights */
-                           l= common_stencil_i[j];
-                           crse_ptr[fine_interface_ranks[i]]= sum_contrib;
+                           sum_contrib /= sum;   /* average out the weights */
+                           l = common_stencil_i[j];
+                           crse_ptr[fine_interface_ranks[i]] = sum_contrib;
 
                            hypre_TFree(temp1, HYPRE_MEMORY_HOST);
 
@@ -3254,71 +3338,71 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
                         else /* 3-d */
                         {
                            l    =  common_stencil_ranks[j];
-                           temp1=  hypre_TAlloc(HYPRE_Int,  8, HYPRE_MEMORY_HOST);
+                           temp1 =  hypre_TAlloc(HYPRE_Int,  8, HYPRE_MEMORY_HOST);
 
-                           switch(l)
+                           switch (l)
                            {
                               case 1:   /* centre plane e */
 
-                                 temp1[0]= 4;
-                                 temp1[1]= 7;
-                                 temp1[2]= 10;
-                                 temp1[3]= 13;
-                                 temp1[4]= 16;
-                                 temp1[5]= 19;
-                                 temp1[6]= 22;
-                                 temp1[7]= 25;
+                                 temp1[0] = 4;
+                                 temp1[1] = 7;
+                                 temp1[2] = 10;
+                                 temp1[3] = 13;
+                                 temp1[4] = 16;
+                                 temp1[5] = 19;
+                                 temp1[6] = 22;
+                                 temp1[7] = 25;
                                  break;
 
                               case 2:   /* centre plane w */
 
-                                 temp1[0]= 5;
-                                 temp1[1]= 8;
-                                 temp1[2]= 11;
-                                 temp1[3]= 14;
-                                 temp1[4]= 17;
-                                 temp1[5]= 20;
-                                 temp1[6]= 23;
-                                 temp1[7]= 26;
+                                 temp1[0] = 5;
+                                 temp1[1] = 8;
+                                 temp1[2] = 11;
+                                 temp1[3] = 14;
+                                 temp1[4] = 17;
+                                 temp1[5] = 20;
+                                 temp1[6] = 23;
+                                 temp1[7] = 26;
                                  break;
 
                               case 3:   /* centre plane n */
 
-                                 temp1[0]= 4;
-                                 temp1[1]= 5;
-                                 temp1[2]= 12;
-                                 temp1[3]= 13;
-                                 temp1[4]= 14;
-                                 temp1[5]= 21;
-                                 temp1[6]= 22;
-                                 temp1[7]= 23;
+                                 temp1[0] = 4;
+                                 temp1[1] = 5;
+                                 temp1[2] = 12;
+                                 temp1[3] = 13;
+                                 temp1[4] = 14;
+                                 temp1[5] = 21;
+                                 temp1[6] = 22;
+                                 temp1[7] = 23;
                                  break;
 
                               case 6:   /* centre plane s */
 
-                                 temp1[0]= 7;
-                                 temp1[1]= 8;
-                                 temp1[2]= 15;
-                                 temp1[3]= 16;
-                                 temp1[4]= 17;
-                                 temp1[5]= 24;
-                                 temp1[6]= 25;
-                                 temp1[7]= 26;
+                                 temp1[0] = 7;
+                                 temp1[1] = 8;
+                                 temp1[2] = 15;
+                                 temp1[3] = 16;
+                                 temp1[4] = 17;
+                                 temp1[5] = 24;
+                                 temp1[6] = 25;
+                                 temp1[7] = 26;
                                  break;
 
                               case 9:   /* top plane c */
 
-                                 for (n= 0; n< 8; n++)
+                                 for (n = 0; n < 8; n++)
                                  {
-                                    temp1[n]= 10+n;
+                                    temp1[n] = 10 + n;
                                  }
                                  break;
 
                               case 18:   /* bottom plane c */
 
-                                 for (n= 0; n< 8; n++)
+                                 for (n = 0; n < 8; n++)
                                  {
-                                    temp1[n]= 19+n;
+                                    temp1[n] = 19 + n;
                                  }
                                  break;
 
@@ -3329,12 +3413,12 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
                             *  stencils.
                             *-------------------------------------------------------*/
 
-                           l= common_stencil_i[j];
-                           sum= temp3[l];
-                           sum_contrib= sum*stencil_vals[l];
+                           l = common_stencil_i[j];
+                           sum = temp3[l];
+                           sum_contrib = sum * stencil_vals[l];
 
-                           n= 1;
-                           for (l= 0; l< 8; l++)
+                           n = 1;
+                           for (l = 0; l < 8; l++)
                            {
                               while (   (n < coarse_stencil_cnt[i])
                                         && (interface_stencil_ranks[i][n] < temp1[l]) )
@@ -3349,15 +3433,15 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
 
                               if (interface_stencil_ranks[i][n] == temp1[l])
                               {
-                                 sum+= temp3[n];
-                                 sum_contrib+= temp3[n]*stencil_vals[n];
+                                 sum += temp3[n];
+                                 sum_contrib += temp3[n] * stencil_vals[n];
                                  n++;
                               }
                            }
 
-                           sum_contrib/= sum;    /* average out the weights */
-                           l= common_stencil_i[j];
-                           crse_ptr[fine_interface_ranks[i]]= sum_contrib;
+                           sum_contrib /= sum;   /* average out the weights */
+                           l = common_stencil_i[j];
+                           crse_ptr[fine_interface_ranks[i]] = sum_contrib;
 
                            hypre_TFree(temp1, HYPRE_MEMORY_HOST);
 
@@ -3398,10 +3482,12 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
          hypre_TFree(rank_stencils, HYPRE_MEMORY_HOST);
          hypre_TFree(cdata_space_ranks, HYPRE_MEMORY_HOST);
          hypre_TFree(box_graph_cnts, HYPRE_MEMORY_HOST);
-         for (i= 0; i< box_array_size; i++)
+         for (i = 0; i < box_array_size; i++)
          {
             if (box_graph_indices[i])
+            {
                hypre_TFree(box_graph_indices[i], HYPRE_MEMORY_HOST);
+            }
          }
          hypre_TFree(box_graph_indices, HYPRE_MEMORY_HOST);
 
@@ -3418,7 +3504,7 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
     *        the coarsened fbox_bdy's and set the centre stencils.
     *--------------------------------------------------------------------------*/
    hypre_ClearIndex(index_temp);
-   for (var1= 0; var1< nvars; var1++)
+   for (var1 = 0; var1 < nvars; var1++)
    {
       /* only like variables couple. */
       smatrix_var  = hypre_SStructPMatrixSMatrix(A_crse, var1, var1);
@@ -3426,31 +3512,31 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
       stencil_size = hypre_StructStencilSize(stencils);
       a_ptrs       = hypre_TAlloc(HYPRE_Real *,  stencil_size, HYPRE_MEMORY_HOST);
 
-      rank_stencils= hypre_TAlloc(HYPRE_Int,  max_stencil_size, HYPRE_MEMORY_HOST);
-      for (i= 0; i< stencil_size; i++)
+      rank_stencils = hypre_TAlloc(HYPRE_Int,  max_stencil_size, HYPRE_MEMORY_HOST);
+      for (i = 0; i < stencil_size; i++)
       {
          hypre_CopyIndex(hypre_StructStencilElement(stencils, i),
                          stencil_shape_i);
          MapStencilRank(stencil_shape_i, rank);
-         rank_stencils[rank]= i;
+         rank_stencils[rank] = i;
       }
-      centre= rank_stencils[0];
+      centre = rank_stencils[0];
 
-      cgrid= hypre_SStructPGridSGrid(hypre_SStructPMatrixPGrid(A_crse), var1);
-      cgrid_boxes= hypre_StructGridBoxes(cgrid);
+      cgrid = hypre_SStructPGridSGrid(hypre_SStructPMatrixPGrid(A_crse), var1);
+      cgrid_boxes = hypre_StructGridBoxes(cgrid);
 
       hypre_ForBoxI(ci, cgrid_boxes)
       {
          A_dbox     = hypre_BoxArrayBox(hypre_StructMatrixDataSpace(smatrix_var), ci);
-         fbox_bdy_ci= fbox_bdy[var1][ci];
+         fbox_bdy_ci = fbox_bdy[var1][ci];
 
-         for (i= 0; i< stencil_size; i++)
+         for (i = 0; i < stencil_size; i++)
          {
             hypre_CopyIndex(hypre_StructStencilElement(stencils, i),
                             stencil_shape_i);
-            a_ptrs[i]= hypre_StructMatrixExtractPointerByIndex(smatrix_var,
-                                                               ci,
-                                                               stencil_shape_i);
+            a_ptrs[i] = hypre_StructMatrixExtractPointerByIndex(smatrix_var,
+                                                                ci,
+                                                                stencil_shape_i);
          }
 
          /*------------------------------------------------------------------
@@ -3459,10 +3545,10 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
           *------------------------------------------------------------------*/
          hypre_ForBoxArrayI(arrayi, fbox_bdy_ci)
          {
-            fbox_bdy_ci_fi= hypre_BoxArrayArrayBoxArray(fbox_bdy_ci, arrayi);
+            fbox_bdy_ci_fi = hypre_BoxArrayArrayBoxArray(fbox_bdy_ci, arrayi);
             hypre_ForBoxI(fi, fbox_bdy_ci_fi)
             {
-               fgrid_box= hypre_BoxArrayBox(fbox_bdy_ci_fi, fi);
+               fgrid_box = hypre_BoxArrayBox(fbox_bdy_ci_fi, fi);
                hypre_StructMapFineToCoarse(hypre_BoxIMin(fgrid_box), index_temp,
                                            stridef, hypre_BoxIMin(&fine_box));
                hypre_StructMapFineToCoarse(hypre_BoxIMax(fgrid_box), index_temp,
@@ -3476,11 +3562,11 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
                                    A_dbox, cstart, stridec, iA);
                {
                   HYPRE_Int i;
-                  for (i= 0; i< stencil_size; i++)
+                  for (i = 0; i < stencil_size; i++)
                   {
                      if (i != centre)
                      {
-                        a_ptrs[centre][iA]-= a_ptrs[i][iA];
+                        a_ptrs[centre][iA] -= a_ptrs[i][iA];
                      }
                   }
                }
@@ -3496,13 +3582,13 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
 
    }  /* for (var1= 0; var1< nvars; var1++) */
 
-   for (var1= 0; var1< nvars; var1++)
+   for (var1 = 0; var1 < nvars; var1++)
    {
-      cgrid= hypre_SStructPGridSGrid(hypre_SStructPMatrixPGrid(A_crse), var1);
-      cgrid_boxes= hypre_StructGridBoxes(cgrid);
+      cgrid = hypre_SStructPGridSGrid(hypre_SStructPMatrixPGrid(A_crse), var1);
+      cgrid_boxes = hypre_StructGridBoxes(cgrid);
 
-      fgrid= hypre_SStructPGridSGrid(hypre_SStructPMatrixPGrid(A_pmatrix), var1);
-      fgrid_boxes= hypre_StructGridBoxes(fgrid);
+      fgrid = hypre_SStructPGridSGrid(hypre_SStructPMatrixPGrid(A_pmatrix), var1);
+      fgrid_boxes = hypre_StructGridBoxes(fgrid);
 
       hypre_ForBoxI(ci, cgrid_boxes)
       {
@@ -3535,4 +3621,3 @@ hypre_AMR_FCoarsen( hypre_SStructMatrix  *   A,
 
    return 0;
 }
-
diff --git a/external/hypre/src/sstruct_ls/fac_amr_rap.c b/external/hypre/src/sstruct_ls/fac_amr_rap.c
index ca87b623..e4e273fd 100644
--- a/external/hypre/src/sstruct_ls/fac_amr_rap.c
+++ b/external/hypre/src/sstruct_ls/fac_amr_rap.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -85,7 +85,7 @@ hypre_AMR_RAP( hypre_SStructMatrix  *A,
    HYPRE_Int                    i, j, k, size;
 
    HYPRE_Int                    myid;
-   HYPRE_Int                    ierr= 0;
+   HYPRE_Int                    ierr = 0;
 
    hypre_MPI_Comm_rank(comm, &myid);
    hypre_ClearIndex(zero_index);
@@ -93,7 +93,7 @@ hypre_AMR_RAP( hypre_SStructMatrix  *A,
    hypre_BoxInit(&scaled_box, ndim);
 
    hypre_SStructGraphRef(graph, &fac_graph);
-   fac_grid= hypre_SStructGraphGrid(fac_graph);
+   fac_grid = hypre_SStructGraphGrid(fac_graph);
    HYPRE_SStructMatrixCreate(comm, fac_graph, &fac_A);
    HYPRE_SStructMatrixInitialize(fac_A);
 
@@ -103,37 +103,37 @@ hypre_AMR_RAP( hypre_SStructMatrix  *A,
     * are also the same. Thus, the rows, cols, etc. for the IJ_matrix are
     * the same.
     *--------------------------------------------------------------------------*/
-   ncols= hypre_CTAlloc(HYPRE_Int,  nUventries, HYPRE_MEMORY_HOST);
+   ncols = hypre_CTAlloc(HYPRE_Int,  nUventries, HYPRE_MEMORY_HOST);
    rows = hypre_CTAlloc(HYPRE_BigInt,  nUventries, HYPRE_MEMORY_HOST);
 
-   tot_cols= 0;
-   for (i= 0; i< nUventries; i++)
+   tot_cols = 0;
+   for (i = 0; i < nUventries; i++)
    {
-      Uventry= Uventries[iUventries[i]];
-      tot_cols+= hypre_SStructUVEntryNUEntries(Uventry);
+      Uventry = Uventries[iUventries[i]];
+      tot_cols += hypre_SStructUVEntryNUEntries(Uventry);
    }
    cols = hypre_CTAlloc(HYPRE_BigInt,  tot_cols, HYPRE_MEMORY_HOST);
 
    k    = 0;
-   for (i= 0; i< nUventries; i++)
+   for (i = 0; i < nUventries; i++)
    {
-      Uventry= Uventries[iUventries[i]];
+      Uventry = Uventries[iUventries[i]];
       part   = hypre_SStructUVEntryPart(Uventry);
       hypre_CopyIndex(hypre_SStructUVEntryIndex(Uventry), index);
       var1     = hypre_SStructUVEntryVar(Uventry);
-      nUentries= hypre_SStructUVEntryNUEntries(Uventry);
+      nUentries = hypre_SStructUVEntryNUEntries(Uventry);
 
-      ncols[i]= nUentries;
+      ncols[i] = nUentries;
       hypre_SStructGridFindBoxManEntry(grid, part, index, var1, &boxman_entry);
       hypre_SStructBoxManEntryGetGlobalRank(boxman_entry, index, &rows[i], matrix_type);
 
-      for (j= 0; j< nUentries; j++)
+      for (j = 0; j < nUentries; j++)
       {
-         cols[k++]= hypre_SStructUVEntryToRank(Uventry, j);
+         cols[k++] = hypre_SStructUVEntryToRank(Uventry, j);
       }
    }
 
-   values= hypre_CTAlloc(HYPRE_Real,  tot_cols, HYPRE_MEMORY_HOST);
+   values = hypre_CTAlloc(HYPRE_Real,  tot_cols, HYPRE_MEMORY_HOST);
    HYPRE_IJMatrixGetValues(ij_A, nUventries, ncols, rows, cols, values);
 
    HYPRE_IJMatrixSetValues(hypre_SStructMatrixIJMatrix(fac_A), nUventries,
@@ -145,79 +145,79 @@ hypre_AMR_RAP( hypre_SStructMatrix  *A,
    hypre_TFree(values, HYPRE_MEMORY_HOST);
 
    owninfo = hypre_CTAlloc(hypre_SStructOwnInfoData  **,  nparts, HYPRE_MEMORY_HOST);
-   for (part= (nparts-1); part> 0; part--)
+   for (part = (nparts - 1); part > 0; part--)
    {
-      f_pgrid= hypre_SStructGridPGrid(fac_grid, part);
-      c_pgrid= hypre_SStructGridPGrid(fac_grid, part-1);
+      f_pgrid = hypre_SStructGridPGrid(fac_grid, part);
+      c_pgrid = hypre_SStructGridPGrid(fac_grid, part - 1);
 
       nvars  = hypre_SStructPGridNVars(f_pgrid);
       owninfo[part] = hypre_CTAlloc(hypre_SStructOwnInfoData   *,  nvars, HYPRE_MEMORY_HOST);
 
-      for (var1= 0; var1< nvars; var1++)
+      for (var1 = 0; var1 < nvars; var1++)
       {
-         fboxman= hypre_SStructGridBoxManager(fac_grid, part, var1);
-         cboxman= hypre_SStructGridBoxManager(fac_grid, part-1, var1);
+         fboxman = hypre_SStructGridBoxManager(fac_grid, part, var1);
+         cboxman = hypre_SStructGridBoxManager(fac_grid, part - 1, var1);
 
-         fgrid= hypre_SStructPGridSGrid(f_pgrid, var1);
-         cgrid= hypre_SStructPGridSGrid(c_pgrid, var1);
+         fgrid = hypre_SStructPGridSGrid(f_pgrid, var1);
+         cgrid = hypre_SStructPGridSGrid(c_pgrid, var1);
 
-         owninfo[part][var1]= hypre_SStructOwnInfo(fgrid, cgrid, cboxman, fboxman,
-                                                   rfactors[part]);
+         owninfo[part][var1] = hypre_SStructOwnInfo(fgrid, cgrid, cboxman, fboxman,
+                                                    rfactors[part]);
       }
    }
 
    hypre_SetIndex3(stride, 1, 1, 1);
-   for (part= (nparts-1); part> 0; part--)
+   for (part = (nparts - 1); part > 0; part--)
    {
-      f_pgrid= hypre_SStructGridPGrid(fac_grid, part);
-      c_pgrid= hypre_SStructGridPGrid(fac_grid, part-1);
+      f_pgrid = hypre_SStructGridPGrid(fac_grid, part);
+      c_pgrid = hypre_SStructGridPGrid(fac_grid, part - 1);
       nvars  = hypre_SStructPGridNVars(f_pgrid);
 
-      for (var1= 0; var1< nvars; var1++)
+      for (var1 = 0; var1 < nvars; var1++)
       {
          fgrid     = hypre_SStructPGridSGrid(f_pgrid, var1);
          cgrid     = hypre_SStructPGridSGrid(c_pgrid, var1);
-         grid_boxes= hypre_StructGridBoxes(fgrid);
+         grid_boxes = hypre_StructGridBoxes(fgrid);
 
-         stencils= hypre_SStructGraphStencil(graph, part, var1);
-         stencil_size= hypre_SStructStencilSize(stencils);
-         stencil_vars= hypre_SStructStencilVars(stencils);
+         stencils = hypre_SStructGraphStencil(graph, part, var1);
+         stencil_size = hypre_SStructStencilSize(stencils);
+         stencil_vars = hypre_SStructStencilVars(stencils);
 
-         if (part == (nparts-1)) /* copy all fine data */
+         if (part == (nparts - 1)) /* copy all fine data */
          {
             pmatrix    = hypre_SStructMatrixPMatrix(A, part);
-            fac_pmatrix= hypre_SStructMatrixPMatrix(fac_A, part);
+            fac_pmatrix = hypre_SStructMatrixPMatrix(fac_A, part);
             hypre_ForBoxI(i, grid_boxes)
             {
-               grid_box= hypre_BoxArrayBox(grid_boxes, i);
+               grid_box = hypre_BoxArrayBox(grid_boxes, i);
                hypre_BoxGetSize(grid_box, loop_size);
                hypre_CopyIndex(hypre_BoxIMin(grid_box), ilower);
 
-               for (j = 0; j< stencil_size; j++)
+               for (j = 0; j < stencil_size; j++)
                {
                   var2       = stencil_vars[j];
                   smatrix    = hypre_SStructPMatrixSMatrix(pmatrix, var1, var2);
-                  fac_smatrix= hypre_SStructPMatrixSMatrix(fac_pmatrix, var1, var2);
+                  fac_smatrix = hypre_SStructPMatrixSMatrix(fac_pmatrix, var1, var2);
 
-                  smatrix_dbox= hypre_BoxArrayBox(hypre_StructMatrixDataSpace(smatrix),
-                                                  i);
-                  fac_smatrix_dbox=
+                  smatrix_dbox = hypre_BoxArrayBox(hypre_StructMatrixDataSpace(smatrix),
+                                                   i);
+                  fac_smatrix_dbox =
                      hypre_BoxArrayBox(hypre_StructMatrixDataSpace(fac_smatrix), i);
 
                   hypre_CopyIndex(hypre_SStructStencilEntry(stencils, j), stencil_shape);
-                  smatrix_vals= hypre_StructMatrixExtractPointerByIndex(smatrix,
-                                                                        i,
-                                                                        stencil_shape);
-                  fac_smatrix_vals= hypre_StructMatrixExtractPointerByIndex(fac_smatrix,
-                                                                            i,
-                                                                            stencil_shape);
+                  smatrix_vals = hypre_StructMatrixExtractPointerByIndex(smatrix,
+                                                                         i,
+                                                                         stencil_shape);
+                  fac_smatrix_vals = hypre_StructMatrixExtractPointerByIndex(fac_smatrix,
+                                                                             i,
+                                                                             stencil_shape);
 
 #define DEVICE_VAR is_device_ptr(fac_smatrix_vals,smatrix_vals)
                   hypre_BoxLoop2Begin(ndim, loop_size,
                                       smatrix_dbox, ilower, stride, iA,
                                       fac_smatrix_dbox, ilower, stride, iAc);
                   {
-                     fac_smatrix_vals[iAc]= smatrix_vals[iA];
+                     fac_smatrix_vals[iAc] = smatrix_vals[iA];
                   }
                   hypre_BoxLoop2End(iA, iAc);
 #undef DEVICE_VAR
@@ -230,49 +230,49 @@ hypre_AMR_RAP( hypre_SStructMatrix  *A,
           *  Copy all coarse data not underlying a fbox and on this processor-
           *  i.e., the own_composite_cbox data.
           *----------------------------------------------------------------------*/
-         pmatrix    = hypre_SStructMatrixPMatrix(A, part-1);
-         fac_pmatrix= hypre_SStructMatrixPMatrix(fac_A, part-1);
+         pmatrix    = hypre_SStructMatrixPMatrix(A, part - 1);
+         fac_pmatrix = hypre_SStructMatrixPMatrix(fac_A, part - 1);
 
-         own_composite_cboxes= hypre_SStructOwnInfoDataCompositeCBoxes(owninfo[part][var1]);
+         own_composite_cboxes = hypre_SStructOwnInfoDataCompositeCBoxes(owninfo[part][var1]);
 
-         stencils= hypre_SStructGraphStencil(graph, part-1, var1);
-         stencil_size= hypre_SStructStencilSize(stencils);
-         stencil_vars= hypre_SStructStencilVars(stencils);
+         stencils = hypre_SStructGraphStencil(graph, part - 1, var1);
+         stencil_size = hypre_SStructStencilSize(stencils);
+         stencil_vars = hypre_SStructStencilVars(stencils);
 
          hypre_ForBoxArrayI(i, own_composite_cboxes)
          {
-            own_composite_cbox= hypre_BoxArrayArrayBoxArray(own_composite_cboxes, i);
+            own_composite_cbox = hypre_BoxArrayArrayBoxArray(own_composite_cboxes, i);
             hypre_ForBoxI(j, own_composite_cbox)
             {
-               grid_box= hypre_BoxArrayBox(own_composite_cbox, j);
+               grid_box = hypre_BoxArrayBox(own_composite_cbox, j);
                hypre_BoxGetSize(grid_box, loop_size);
                hypre_CopyIndex(hypre_BoxIMin(grid_box), ilower);
 
-               for (k = 0; k< stencil_size; k++)
+               for (k = 0; k < stencil_size; k++)
                {
                   var2       = stencil_vars[k];
                   smatrix    = hypre_SStructPMatrixSMatrix(pmatrix, var1, var2);
-                  fac_smatrix= hypre_SStructPMatrixSMatrix(fac_pmatrix, var1, var2);
+                  fac_smatrix = hypre_SStructPMatrixSMatrix(fac_pmatrix, var1, var2);
 
-                  smatrix_dbox= hypre_BoxArrayBox(hypre_StructMatrixDataSpace(smatrix),
-                                                  i);
-                  fac_smatrix_dbox=
+                  smatrix_dbox = hypre_BoxArrayBox(hypre_StructMatrixDataSpace(smatrix),
+                                                   i);
+                  fac_smatrix_dbox =
                      hypre_BoxArrayBox(hypre_StructMatrixDataSpace(fac_smatrix), i);
 
                   hypre_CopyIndex(hypre_SStructStencilEntry(stencils, k), stencil_shape);
-                  smatrix_vals= hypre_StructMatrixExtractPointerByIndex(smatrix,
-                                                                        i,
-                                                                        stencil_shape);
-                  fac_smatrix_vals= hypre_StructMatrixExtractPointerByIndex(fac_smatrix,
-                                                                            i,
-                                                                            stencil_shape);
+                  smatrix_vals = hypre_StructMatrixExtractPointerByIndex(smatrix,
+                                                                         i,
+                                                                         stencil_shape);
+                  fac_smatrix_vals = hypre_StructMatrixExtractPointerByIndex(fac_smatrix,
+                                                                             i,
+                                                                             stencil_shape);
 
 #define DEVICE_VAR is_device_ptr(fac_smatrix_vals,smatrix_vals)
                   hypre_BoxLoop2Begin(ndim, loop_size,
                                       smatrix_dbox, ilower, stride, iA,
                                       fac_smatrix_dbox, ilower, stride, iAc);
                   {
-                     fac_smatrix_vals[iAc]= smatrix_vals[iA];
+                     fac_smatrix_vals[iAc] = smatrix_vals[iA];
                   }
                   hypre_BoxLoop2End(iA, iAc);
 #undef DEVICE_VAR
@@ -300,7 +300,7 @@ hypre_AMR_RAP( hypre_SStructMatrix  *A,
     *         communicate any that belongs to another processor.
     *   }
     *--------------------------------------------------------------------------*/
-   for (part= (nparts-1); part>= 1; part--)
+   for (part = (nparts - 1); part >= 1; part--)
    {
       hypre_AMR_CFCoarsen(A, fac_A, rfactors[part], part);
 
@@ -308,17 +308,17 @@ hypre_AMR_RAP( hypre_SStructMatrix  *A,
        *  Create the temp SStruct_PMatrix for coarsening away the level= part
        *  boxes.
        *-----------------------------------------------------------------------*/
-      f_pgrid= hypre_SStructGridPGrid(fac_grid, part);
-      c_pgrid= hypre_SStructGridPGrid(fac_grid, part-1);
-      grid_boxes= hypre_SStructPGridCellIBoxArray(f_pgrid);
+      f_pgrid = hypre_SStructGridPGrid(fac_grid, part);
+      c_pgrid = hypre_SStructGridPGrid(fac_grid, part - 1);
+      grid_boxes = hypre_SStructPGridCellIBoxArray(f_pgrid);
 
       hypre_SStructPGridCreate(hypre_SStructGridComm(f_pgrid),
                                ndim, &temp_pgrid);
 
       /*coarsen the fboxes.*/
-      for (i= 0; i< hypre_BoxArraySize(grid_boxes); i++)
+      for (i = 0; i < hypre_BoxArraySize(grid_boxes); i++)
       {
-         grid_box= hypre_BoxArrayBox(grid_boxes, i);
+         grid_box = hypre_BoxArrayBox(grid_boxes, i);
          hypre_StructMapFineToCoarse(hypre_BoxIMin(grid_box), zero_index,
                                      rfactors[part], hypre_BoxIMin(&scaled_box));
          hypre_StructMapFineToCoarse(hypre_BoxIMax(grid_box), zero_index,
@@ -335,9 +335,9 @@ hypre_AMR_RAP( hypre_SStructMatrix  *A,
       hypre_SStructPGridAssemble(temp_pgrid);
 
       /* reference the sstruct_stencil of fac_pmatrix- to be used in temp_pmatrix */
-      temp_sstencils= hypre_CTAlloc(hypre_SStructStencil *,  nvars, HYPRE_MEMORY_HOST);
-      fac_pmatrix= hypre_SStructMatrixPMatrix(fac_A, part-1);
-      for (i=0; i< nvars; i++)
+      temp_sstencils = hypre_CTAlloc(hypre_SStructStencil *,  nvars, HYPRE_MEMORY_HOST);
+      fac_pmatrix = hypre_SStructMatrixPMatrix(fac_A, part - 1);
+      for (i = 0; i < nvars; i++)
       {
          hypre_SStructStencilRef(hypre_SStructPMatrixStencil(fac_pmatrix, i),
                                  &temp_sstencils[i]);
@@ -354,51 +354,51 @@ hypre_AMR_RAP( hypre_SStructMatrix  *A,
       /*-----------------------------------------------------------------------
        * Extract the own_box data (boxes of coarsen data of this processor).
        *-----------------------------------------------------------------------*/
-      fac_pmatrix= hypre_SStructMatrixPMatrix(fac_A, part-1);
-      for (var1= 0; var1< nvars; var1++)
+      fac_pmatrix = hypre_SStructMatrixPMatrix(fac_A, part - 1);
+      for (var1 = 0; var1 < nvars; var1++)
       {
-         stencils= hypre_SStructGraphStencil(graph, part-1, var1);
-         stencil_size= hypre_SStructStencilSize(stencils);
-         stencil_vars= hypre_SStructStencilVars(stencils);
+         stencils = hypre_SStructGraphStencil(graph, part - 1, var1);
+         stencil_size = hypre_SStructStencilSize(stencils);
+         stencil_vars = hypre_SStructStencilVars(stencils);
 
-         own_boxes= hypre_SStructOwnInfoDataOwnBoxes(owninfo[part][var1]);
-         own_cboxnums= hypre_SStructOwnInfoDataOwnBoxNums(owninfo[part][var1]);
-         size= hypre_SStructOwnInfoDataSize(owninfo[part][var1]);
+         own_boxes = hypre_SStructOwnInfoDataOwnBoxes(owninfo[part][var1]);
+         own_cboxnums = hypre_SStructOwnInfoDataOwnBoxNums(owninfo[part][var1]);
+         size = hypre_SStructOwnInfoDataSize(owninfo[part][var1]);
 
          /* loop over all the cbox chunks */
-         for (i= 0; i< size; i++)
+         for (i = 0; i < size; i++)
          {
-            cgrid_boxes= hypre_BoxArrayArrayBoxArray(own_boxes, i);
+            cgrid_boxes = hypre_BoxArrayArrayBoxArray(own_boxes, i);
             hypre_ForBoxI(j, cgrid_boxes)
             {
-               grid_box= hypre_BoxArrayBox(cgrid_boxes, j);
+               grid_box = hypre_BoxArrayBox(cgrid_boxes, j);
                hypre_BoxGetSize(grid_box, loop_size);
                hypre_CopyIndex(hypre_BoxIMin(grid_box), ilower);
 
-               cbox= own_cboxnums[i][j];
+               cbox = own_cboxnums[i][j];
 
-               for (k= 0; k< stencil_size; k++)
+               for (k = 0; k < stencil_size; k++)
                {
-                  var2= stencil_vars[k];
-                  smatrix= hypre_SStructPMatrixSMatrix(temp_pmatrix, var1, var2);
-                  fac_smatrix= hypre_SStructPMatrixSMatrix(fac_pmatrix, var1, var2);
+                  var2 = stencil_vars[k];
+                  smatrix = hypre_SStructPMatrixSMatrix(temp_pmatrix, var1, var2);
+                  fac_smatrix = hypre_SStructPMatrixSMatrix(fac_pmatrix, var1, var2);
 
                   /*---------------------------------------------------------------
                    * note: the cbox number of the temp_grid is the same as the
                    * fbox number, whereas the cbox numbers of the fac_grid is in
                    * own_cboxnums- i.e., numbers i & cbox, respectively.
                    *---------------------------------------------------------------*/
-                  smatrix_dbox= hypre_BoxArrayBox(hypre_StructMatrixDataSpace(smatrix),
-                                                  i);
-                  fac_smatrix_dbox=
+                  smatrix_dbox = hypre_BoxArrayBox(hypre_StructMatrixDataSpace(smatrix),
+                                                   i);
+                  fac_smatrix_dbox =
                      hypre_BoxArrayBox(hypre_StructMatrixDataSpace(fac_smatrix), cbox);
 
                   hypre_CopyIndex(hypre_SStructStencilEntry(stencils, k), stencil_shape);
-                  smatrix_vals=
+                  smatrix_vals =
                      hypre_StructMatrixExtractPointerByIndex(smatrix,
                                                              i,
                                                              stencil_shape);
-                  fac_smatrix_vals=
+                  fac_smatrix_vals =
                      hypre_StructMatrixExtractPointerByIndex(fac_smatrix,
                                                              cbox,
                                                              stencil_shape);
@@ -408,7 +408,7 @@ hypre_AMR_RAP( hypre_SStructMatrix  *A,
                                       smatrix_dbox, ilower, stride, iA,
                                       fac_smatrix_dbox, ilower, stride, iAc);
                   {
-                     fac_smatrix_vals[iAc]= smatrix_vals[iA];
+                     fac_smatrix_vals[iAc] = smatrix_vals[iA];
                   }
                   hypre_BoxLoop2End(iA, iAc);
 #undef DEVICE_VAR
@@ -427,24 +427,24 @@ hypre_AMR_RAP( hypre_SStructMatrix  *A,
        * needed. Thus, compute the communication info- sendboxes, recvboxes,
        * etc.
        *-----------------------------------------------------------------------*/
-      for (var1= 0; var1< nvars; var1++)
+      for (var1 = 0; var1 < nvars; var1++)
       {
-         fboxman= hypre_SStructGridBoxManager(fac_grid, part, var1);
-         cboxman= hypre_SStructGridBoxManager(fac_grid, part-1, var1);
+         fboxman = hypre_SStructGridBoxManager(fac_grid, part, var1);
+         cboxman = hypre_SStructGridBoxManager(fac_grid, part - 1, var1);
 
-         fgrid= hypre_SStructPGridSGrid(f_pgrid, var1);
-         cgrid= hypre_SStructPGridSGrid(c_pgrid, var1);
+         fgrid = hypre_SStructPGridSGrid(f_pgrid, var1);
+         cgrid = hypre_SStructPGridSGrid(c_pgrid, var1);
 
-         sendinfo= hypre_SStructSendInfo(fgrid, cboxman, rfactors[part]);
-         recvinfo= hypre_SStructRecvInfo(cgrid, fboxman, rfactors[part]);
+         sendinfo = hypre_SStructSendInfo(fgrid, cboxman, rfactors[part]);
+         recvinfo = hypre_SStructRecvInfo(cgrid, fboxman, rfactors[part]);
 
          /*-------------------------------------------------------------------
           * need to check this for more than one variable- are the comm. info
           * for this sgrid okay for cross-variable matrices?
           *-------------------------------------------------------------------*/
-         for (var2= 0; var2< nvars; var2++)
+         for (var2 = 0; var2 < nvars; var2++)
          {
-            fac_smatrix= hypre_SStructPMatrixSMatrix(fac_pmatrix, var1, var2);
+            fac_smatrix = hypre_SStructPMatrixSMatrix(fac_pmatrix, var1, var2);
             smatrix    = hypre_SStructPMatrixSMatrix(temp_pmatrix, var1, var2);
 
             hypre_SStructAMRInterCommunication(sendinfo,
diff --git a/external/hypre/src/sstruct_ls/fac_amr_zero_data.c b/external/hypre/src/sstruct_ls/fac_amr_zero_data.c
index 216ab909..acf4f928 100644
--- a/external/hypre/src/sstruct_ls/fac_amr_zero_data.c
+++ b/external/hypre/src/sstruct_ls/fac_amr_zero_data.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -9,7 +9,7 @@
 #include "fac.h"
 
 /*--------------------------------------------------------------------------
- * hypre_ZeroAMRVectorData: Zeroes the data over the underlying coarse 
+ * hypre_ZeroAMRVectorData: Zeroes the data over the underlying coarse
  * indices of the refinement patches.
  *--------------------------------------------------------------------------*/
 
@@ -18,7 +18,7 @@ hypre_ZeroAMRVectorData(hypre_SStructVector  *b,
                         HYPRE_Int            *plevels,
                         hypre_Index          *rfactors )
 {
-   hypre_SStructGrid     *grid =  hypre_SStructVectorGrid(b); 
+   hypre_SStructGrid     *grid =  hypre_SStructVectorGrid(b);
    hypre_SStructPGrid    *p_cgrid;
 
    hypre_StructGrid      *cgrid;
@@ -32,115 +32,115 @@ hypre_ZeroAMRVectorData(hypre_SStructVector  *b,
    hypre_Box              scaled_box;
    hypre_Box              intersect_box;
 
-   HYPRE_Int              npart=  hypre_SStructVectorNParts(b);
+   HYPRE_Int              npart =  hypre_SStructVectorNParts(b);
    HYPRE_Int              ndim =  hypre_SStructVectorNDim(b);
 
    HYPRE_Int             *levels;
 
    hypre_Index           *refine_factors;
    hypre_Index            temp_index, ilower, iupper;
-  
+
    HYPRE_Int              level;
    HYPRE_Int              nvars, var;
 
    HYPRE_Int              part, ci, rem, i, j, intersect_size;
 
    HYPRE_Real            *values1;
- 
+
    HYPRE_Int              ierr = 0;
 
    hypre_BoxInit(&scaled_box, ndim);
    hypre_BoxInit(&intersect_box, ndim);
 
    levels        = hypre_CTAlloc(HYPRE_Int,  npart, HYPRE_MEMORY_HOST);
-   refine_factors= hypre_CTAlloc(hypre_Index,  npart, HYPRE_MEMORY_HOST);
-   for (part= 0; part< npart; part++)
+   refine_factors = hypre_CTAlloc(hypre_Index,  npart, HYPRE_MEMORY_HOST);
+   for (part = 0; part < npart; part++)
    {
-       levels[plevels[part]]= part;
-       for (i= 0; i< ndim; i++)
-       {
-           refine_factors[plevels[part]][i]= rfactors[part][i];
-       }
-       for (i= ndim; i< 3; i++)
-       {
-           refine_factors[plevels[part]][i]= 1;
-       }
+      levels[plevels[part]] = part;
+      for (i = 0; i < ndim; i++)
+      {
+         refine_factors[plevels[part]][i] = rfactors[part][i];
+      }
+      for (i = ndim; i < 3; i++)
+      {
+         refine_factors[plevels[part]][i] = 1;
+      }
    }
 
    hypre_ClearIndex(temp_index);
 
-   for (level= npart-1; level> 0; level--)
+   for (level = npart - 1; level > 0; level--)
    {
-      p_cgrid= hypre_SStructGridPGrid(grid, levels[level-1]);
+      p_cgrid = hypre_SStructGridPGrid(grid, levels[level - 1]);
       nvars  = hypre_SStructPGridNVars(p_cgrid);
 
-      for (var= 0; var< nvars; var++)
+      for (var = 0; var < nvars; var++)
       {
          /*---------------------------------------------------------------------
           * For each variable, find the underlying boxes for each fine box.
           *---------------------------------------------------------------------*/
          cgrid      = hypre_SStructPGridSGrid(p_cgrid, var);
-         cgrid_boxes= hypre_StructGridBoxes(cgrid);
+         cgrid_boxes = hypre_StructGridBoxes(cgrid);
          fboxman    = hypre_SStructGridBoxManager(grid, levels[level], var);
 
          hypre_ForBoxI(ci, cgrid_boxes)
          {
-             cgrid_box= hypre_BoxArrayBox(cgrid_boxes, ci);
-
-             hypre_ClearIndex(temp_index);
-             hypre_StructMapCoarseToFine(hypre_BoxIMin(cgrid_box), temp_index,
-                            refine_factors[level], hypre_BoxIMin(&scaled_box));
-             for (i= 0; i< ndim; i++)
-             {
-                temp_index[i]= refine_factors[level][i]-1;
-             }
-             hypre_StructMapCoarseToFine(hypre_BoxIMax(cgrid_box), temp_index,
-                            refine_factors[level], hypre_BoxIMax(&scaled_box));
-             hypre_ClearIndex(temp_index);
-
-             hypre_BoxManIntersect(fboxman, hypre_BoxIMin(&scaled_box),
-                                   hypre_BoxIMax(&scaled_box), &boxman_entries,
-                                   &nboxman_entries);
-
-             for (i= 0; i< nboxman_entries; i++)
-             {
-                hypre_BoxManEntryGetExtents(boxman_entries[i], ilower, iupper);
-                hypre_BoxSetExtents(&intersect_box, ilower, iupper);
-                hypre_IntersectBoxes(&intersect_box, &scaled_box, &intersect_box);
+            cgrid_box = hypre_BoxArrayBox(cgrid_boxes, ci);
+
+            hypre_ClearIndex(temp_index);
+            hypre_StructMapCoarseToFine(hypre_BoxIMin(cgrid_box), temp_index,
+                                        refine_factors[level], hypre_BoxIMin(&scaled_box));
+            for (i = 0; i < ndim; i++)
+            {
+               temp_index[i] = refine_factors[level][i] - 1;
+            }
+            hypre_StructMapCoarseToFine(hypre_BoxIMax(cgrid_box), temp_index,
+                                        refine_factors[level], hypre_BoxIMax(&scaled_box));
+            hypre_ClearIndex(temp_index);
+
+            hypre_BoxManIntersect(fboxman, hypre_BoxIMin(&scaled_box),
+                                  hypre_BoxIMax(&scaled_box), &boxman_entries,
+                                  &nboxman_entries);
+
+            for (i = 0; i < nboxman_entries; i++)
+            {
+               hypre_BoxManEntryGetExtents(boxman_entries[i], ilower, iupper);
+               hypre_BoxSetExtents(&intersect_box, ilower, iupper);
+               hypre_IntersectBoxes(&intersect_box, &scaled_box, &intersect_box);
 
                /* adjust the box so that it is divisible by refine_factors */
-                for (j= 0; j< ndim; j++)
-                {
-                   rem= hypre_BoxIMin(&intersect_box)[j]%refine_factors[level][j];
-                   if (rem)
-                   {
-                      hypre_BoxIMin(&intersect_box)[j]+=refine_factors[level][j] - rem;
-                   }
-                }
-
-                hypre_StructMapFineToCoarse(hypre_BoxIMin(&intersect_box), temp_index,
-                                     refine_factors[level], hypre_BoxIMin(&intersect_box));
-                hypre_StructMapFineToCoarse(hypre_BoxIMax(&intersect_box), temp_index,
-                                     refine_factors[level], hypre_BoxIMax(&intersect_box));
-
-                intersect_size= hypre_BoxVolume(&intersect_box);
-                if (intersect_size > 0)
-                {
+               for (j = 0; j < ndim; j++)
+               {
+                  rem = hypre_BoxIMin(&intersect_box)[j] % refine_factors[level][j];
+                  if (rem)
+                  {
+                     hypre_BoxIMin(&intersect_box)[j] += refine_factors[level][j] - rem;
+                  }
+               }
+
+               hypre_StructMapFineToCoarse(hypre_BoxIMin(&intersect_box), temp_index,
+                                           refine_factors[level], hypre_BoxIMin(&intersect_box));
+               hypre_StructMapFineToCoarse(hypre_BoxIMax(&intersect_box), temp_index,
+                                           refine_factors[level], hypre_BoxIMax(&intersect_box));
+
+               intersect_size = hypre_BoxVolume(&intersect_box);
+               if (intersect_size > 0)
+               {
                   /*------------------------------------------------------------
                    * Coarse underlying box found. Now zero off.
                    *------------------------------------------------------------*/
-                   values1= hypre_CTAlloc(HYPRE_Real,  intersect_size, HYPRE_MEMORY_HOST);
+                  values1 = hypre_CTAlloc(HYPRE_Real,  intersect_size, HYPRE_MEMORY_HOST);
+
+                  HYPRE_SStructVectorSetBoxValues(b, levels[level - 1],
+                                                  hypre_BoxIMin(&intersect_box),
+                                                  hypre_BoxIMax(&intersect_box),
+                                                  var, values1);
+                  hypre_TFree(values1, HYPRE_MEMORY_HOST);
 
-                   HYPRE_SStructVectorSetBoxValues(b, levels[level-1], 
-                                                   hypre_BoxIMin(&intersect_box),
-                                                   hypre_BoxIMax(&intersect_box),
-                                                   var, values1);
-                   hypre_TFree(values1, HYPRE_MEMORY_HOST);
+               }  /* if (intersect_size > 0) */
+            }     /* for (i= 0; i< nboxman_entries; i++) */
 
-                }  /* if (intersect_size > 0) */
-             }     /* for (i= 0; i< nboxman_entries; i++) */
-       
-             hypre_TFree(boxman_entries, HYPRE_MEMORY_HOST);
+            hypre_TFree(boxman_entries, HYPRE_MEMORY_HOST);
 
          }   /* hypre_ForBoxI(ci, cgrid_boxes) */
       }      /* for (var= 0; var< nvars; var++) */
@@ -154,7 +154,7 @@ hypre_ZeroAMRVectorData(hypre_SStructVector  *b,
 
 
 /*--------------------------------------------------------------------------
- * hypre_ZeroAMRMatrixData: Zeroes the data over the underlying coarse 
+ * hypre_ZeroAMRMatrixData: Zeroes the data over the underlying coarse
  * indices of the refinement patches between two levels.
  *--------------------------------------------------------------------------*/
 
@@ -163,8 +163,8 @@ hypre_ZeroAMRMatrixData(hypre_SStructMatrix  *A,
                         HYPRE_Int             part_crse,
                         hypre_Index           rfactors )
 {
-   hypre_SStructGraph    *graph=  hypre_SStructMatrixGraph(A);
-   hypre_SStructGrid     *grid =  hypre_SStructGraphGrid(graph); 
+   hypre_SStructGraph    *graph =  hypre_SStructMatrixGraph(A);
+   hypre_SStructGrid     *grid =  hypre_SStructGraphGrid(graph);
    HYPRE_Int              ndim =  hypre_SStructMatrixNDim(A);
 
    hypre_SStructPGrid    *p_cgrid;
@@ -185,117 +185,117 @@ hypre_ZeroAMRMatrixData(hypre_SStructMatrix  *A,
 
    hypre_Index           *stencil_shape;
    hypre_Index            temp_index, ilower, iupper;
-  
+
    HYPRE_Int              nvars, var;
 
    HYPRE_Int              ci, i, j, rem, intersect_size, rank;
 
    HYPRE_Real            *values1, *values2;
- 
+
    HYPRE_Int              ierr = 0;
 
    hypre_BoxInit(&scaled_box, ndim);
    hypre_BoxInit(&intersect_box, ndim);
 
-   p_cgrid= hypre_SStructGridPGrid(grid, part_crse);
+   p_cgrid = hypre_SStructGridPGrid(grid, part_crse);
    nvars  = hypre_SStructPGridNVars(p_cgrid);
 
-   for (var= 0; var< nvars; var++)
+   for (var = 0; var < nvars; var++)
    {
       stencils     =  hypre_SStructGraphStencil(graph, part_crse, var);
       stencil_size =  hypre_SStructStencilSize(stencils);
-      stencil_shape= hypre_SStructStencilShape(stencils);
+      stencil_shape = hypre_SStructStencilShape(stencils);
 
       /*---------------------------------------------------------------------
        * For each variable, find the underlying boxes for each fine box.
        *---------------------------------------------------------------------*/
       cgrid        = hypre_SStructPGridSGrid(p_cgrid, var);
       cgrid_boxes  = hypre_StructGridBoxes(cgrid);
-      fboxman      = hypre_SStructGridBoxManager(grid, part_crse+1, var);
+      fboxman      = hypre_SStructGridBoxManager(grid, part_crse + 1, var);
 
       hypre_ForBoxI(ci, cgrid_boxes)
       {
-          cgrid_box= hypre_BoxArrayBox(cgrid_boxes, ci);
-
-          hypre_ClearIndex(temp_index);
-          hypre_StructMapCoarseToFine(hypre_BoxIMin(cgrid_box), temp_index,
-                                      rfactors, hypre_BoxIMin(&scaled_box));
-          for (i= 0; i< ndim; i++)
-          {
-             temp_index[i]=  rfactors[i]-1;
-          }
-          hypre_StructMapCoarseToFine(hypre_BoxIMax(cgrid_box), temp_index,
-                                      rfactors, hypre_BoxIMax(&scaled_box));
-          hypre_ClearIndex(temp_index);
-
-          hypre_BoxManIntersect(fboxman, hypre_BoxIMin(&scaled_box),
-                                hypre_BoxIMax(&scaled_box), &boxman_entries,
-                                &nboxman_entries);
-
-          for (i= 0; i< nboxman_entries; i++)
-          {
-             hypre_BoxManEntryGetExtents(boxman_entries[i], ilower, iupper);
-             hypre_BoxSetExtents(&intersect_box, ilower, iupper);
-             hypre_IntersectBoxes(&intersect_box, &scaled_box, &intersect_box);
+         cgrid_box = hypre_BoxArrayBox(cgrid_boxes, ci);
+
+         hypre_ClearIndex(temp_index);
+         hypre_StructMapCoarseToFine(hypre_BoxIMin(cgrid_box), temp_index,
+                                     rfactors, hypre_BoxIMin(&scaled_box));
+         for (i = 0; i < ndim; i++)
+         {
+            temp_index[i] =  rfactors[i] - 1;
+         }
+         hypre_StructMapCoarseToFine(hypre_BoxIMax(cgrid_box), temp_index,
+                                     rfactors, hypre_BoxIMax(&scaled_box));
+         hypre_ClearIndex(temp_index);
+
+         hypre_BoxManIntersect(fboxman, hypre_BoxIMin(&scaled_box),
+                               hypre_BoxIMax(&scaled_box), &boxman_entries,
+                               &nboxman_entries);
+
+         for (i = 0; i < nboxman_entries; i++)
+         {
+            hypre_BoxManEntryGetExtents(boxman_entries[i], ilower, iupper);
+            hypre_BoxSetExtents(&intersect_box, ilower, iupper);
+            hypre_IntersectBoxes(&intersect_box, &scaled_box, &intersect_box);
 
             /* adjust the box so that it is divisible by refine_factors */
-             for (j= 0; j< ndim; j++)
-             {
-                rem= hypre_BoxIMin(&intersect_box)[j]%rfactors[j];
-                if (rem)
-                {
-                    hypre_BoxIMin(&intersect_box)[j]+= rfactors[j] - rem;
-                }
-             }
-
-             hypre_StructMapFineToCoarse(hypre_BoxIMin(&intersect_box), temp_index,
-                                         rfactors, hypre_BoxIMin(&intersect_box));
-             hypre_StructMapFineToCoarse(hypre_BoxIMax(&intersect_box), temp_index,
-                                         rfactors, hypre_BoxIMax(&intersect_box));
-
-             intersect_size= hypre_BoxVolume(&intersect_box);
-             if (intersect_size > 0)
-             {
-                /*------------------------------------------------------------
-                 * Coarse underlying box found. Now zero off.
-                 *------------------------------------------------------------*/
-                 values1= hypre_CTAlloc(HYPRE_Real,  intersect_size, HYPRE_MEMORY_HOST);
-                 values2= hypre_TAlloc(HYPRE_Real,  intersect_size, HYPRE_MEMORY_HOST);
-                 for (j= 0; j< intersect_size; j++)
-                 {
-                     values2[j]= 1.0;
-                 }
-
-                 for (j= 0; j< stencil_size; j++)
-                 {
-                    rank= hypre_abs(hypre_IndexX(stencil_shape[j]))+
-                          hypre_abs(hypre_IndexY(stencil_shape[j]))+
-                          hypre_abs(hypre_IndexZ(stencil_shape[j]));
-                   
-                    if (rank)
-                    {
-                       HYPRE_SStructMatrixSetBoxValues(A,
-                                                       part_crse, 
-                                                       hypre_BoxIMin(&intersect_box),
-                                                       hypre_BoxIMax(&intersect_box),
-                                                       var, 1, &j, values1);
-                    }
-                    else
-                    {
-                       HYPRE_SStructMatrixSetBoxValues(A,
-                                                       part_crse, 
-                                                       hypre_BoxIMin(&intersect_box),
-                                                       hypre_BoxIMax(&intersect_box),
-                                                       var, 1, &j, values2);
-                    }
-                 }
-                 hypre_TFree(values1, HYPRE_MEMORY_HOST);
-                 hypre_TFree(values2, HYPRE_MEMORY_HOST);
-
-             }   /* if (intersect_size > 0) */
-          }      /* for (i= 0; i< nmap_entries; i++) */
-
-          hypre_TFree(boxman_entries, HYPRE_MEMORY_HOST);
+            for (j = 0; j < ndim; j++)
+            {
+               rem = hypre_BoxIMin(&intersect_box)[j] % rfactors[j];
+               if (rem)
+               {
+                  hypre_BoxIMin(&intersect_box)[j] += rfactors[j] - rem;
+               }
+            }
+
+            hypre_StructMapFineToCoarse(hypre_BoxIMin(&intersect_box), temp_index,
+                                        rfactors, hypre_BoxIMin(&intersect_box));
+            hypre_StructMapFineToCoarse(hypre_BoxIMax(&intersect_box), temp_index,
+                                        rfactors, hypre_BoxIMax(&intersect_box));
+
+            intersect_size = hypre_BoxVolume(&intersect_box);
+            if (intersect_size > 0)
+            {
+               /*------------------------------------------------------------
+                * Coarse underlying box found. Now zero off.
+                *------------------------------------------------------------*/
+               values1 = hypre_CTAlloc(HYPRE_Real,  intersect_size, HYPRE_MEMORY_HOST);
+               values2 = hypre_TAlloc(HYPRE_Real,  intersect_size, HYPRE_MEMORY_HOST);
+               for (j = 0; j < intersect_size; j++)
+               {
+                  values2[j] = 1.0;
+               }
+
+               for (j = 0; j < stencil_size; j++)
+               {
+                  rank = hypre_abs(hypre_IndexX(stencil_shape[j])) +
+                         hypre_abs(hypre_IndexY(stencil_shape[j])) +
+                         hypre_abs(hypre_IndexZ(stencil_shape[j]));
+
+                  if (rank)
+                  {
+                     HYPRE_SStructMatrixSetBoxValues(A,
+                                                     part_crse,
+                                                     hypre_BoxIMin(&intersect_box),
+                                                     hypre_BoxIMax(&intersect_box),
+                                                     var, 1, &j, values1);
+                  }
+                  else
+                  {
+                     HYPRE_SStructMatrixSetBoxValues(A,
+                                                     part_crse,
+                                                     hypre_BoxIMin(&intersect_box),
+                                                     hypre_BoxIMax(&intersect_box),
+                                                     var, 1, &j, values2);
+                  }
+               }
+               hypre_TFree(values1, HYPRE_MEMORY_HOST);
+               hypre_TFree(values2, HYPRE_MEMORY_HOST);
+
+            }   /* if (intersect_size > 0) */
+         }      /* for (i= 0; i< nmap_entries; i++) */
+
+         hypre_TFree(boxman_entries, HYPRE_MEMORY_HOST);
       }   /* hypre_ForBoxI(ci, cgrid_boxes) */
    }      /* for (var= 0; var< nvars; var++) */
 
diff --git a/external/hypre/src/sstruct_ls/fac_cf_coarsen.c b/external/hypre/src/sstruct_ls/fac_cf_coarsen.c
index f9306273..d212826b 100644
--- a/external/hypre/src/sstruct_ls/fac_cf_coarsen.c
+++ b/external/hypre/src/sstruct_ls/fac_cf_coarsen.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -12,7 +12,7 @@
  *
  ******************************************************************************/
 
-#include "_hypre_sstruct_ls.h" 
+#include "_hypre_sstruct_ls.h"
 #include "fac.h"
 
 #define MapStencilRank(stencil, rank)           \
@@ -57,10 +57,10 @@
    }
 
 /*--------------------------------------------------------------------------
- * hypre_AMR_CFCoarsen: Coarsens the CF interface to get the stencils 
+ * hypre_AMR_CFCoarsen: Coarsens the CF interface to get the stencils
  * reaching into a coarsened fbox. Also sets the centre coefficient of CF
- * interface nodes to have "preserved" row sum. 
- * 
+ * interface nodes to have "preserved" row sum.
+ *
  * On entry, fac_A already has all the coefficient values of the cgrid
  * chunks that are not underlying a fbox.  Note that A & fac_A have the
  * same grid & graph. Therefore, we will use A's grid & graph.
@@ -72,7 +72,7 @@ HYPRE_Int
 hypre_AMR_CFCoarsen( hypre_SStructMatrix  *   A,
                      hypre_SStructMatrix  *   fac_A,
                      hypre_Index              refine_factors,
-                     HYPRE_Int                level ) 
+                     HYPRE_Int                level )
 
 {
    MPI_Comm                comm       = hypre_SStructMatrixComm(A);
@@ -81,7 +81,7 @@ hypre_AMR_CFCoarsen( hypre_SStructMatrix  *   A,
    hypre_SStructGrid      *grid       = hypre_SStructGraphGrid(graph);
    HYPRE_Int               nUventries = hypre_SStructGraphNUVEntries(graph);
    HYPRE_IJMatrix          ij_A       = hypre_SStructMatrixIJMatrix(A);
-   HYPRE_Int               matrix_type= hypre_SStructMatrixObjectType(A);
+   HYPRE_Int               matrix_type = hypre_SStructMatrixObjectType(A);
    HYPRE_Int               ndim       = hypre_SStructMatrixNDim(A);
 
    hypre_SStructPMatrix   *A_pmatrix;
@@ -94,9 +94,9 @@ hypre_AMR_CFCoarsen( hypre_SStructMatrix  *   A,
    HYPRE_Real            **a_ptrs;
    hypre_Box              *A_dbox;
 
-   HYPRE_Int               part_crse= level-1;
-   HYPRE_Int               part_fine= level;
- 
+   HYPRE_Int               part_crse = level - 1;
+   HYPRE_Int               part_fine = level;
+
    hypre_BoxManager       *fboxman;
    hypre_BoxManEntry     **boxman_entries, *boxman_entry;
    HYPRE_Int               nboxman_entries;
@@ -117,8 +117,8 @@ hypre_AMR_CFCoarsen( hypre_SStructMatrix  *   A,
    HYPRE_Int               centre;
 
    HYPRE_Int               ci, fi, boxi;
-   HYPRE_Int               max_stencil_size= 27;
-   HYPRE_Int               falseV= 0;
+   HYPRE_Int               max_stencil_size = 27;
+   HYPRE_Int               falseV = 0;
    HYPRE_Int               trueV = 1;
    HYPRE_Int               found;
    HYPRE_Int              *stencil_ranks, *rank_stencils;
@@ -126,7 +126,7 @@ hypre_AMR_CFCoarsen( hypre_SStructMatrix  *   A,
    HYPRE_Real             *vals;
 
    HYPRE_Int               i, j;
-   HYPRE_Int               nvars, var1; 
+   HYPRE_Int               nvars, var1;
 
    hypre_Index             lindex, zero_index;
    hypre_Index             index1, index2;
@@ -138,48 +138,53 @@ hypre_AMR_CFCoarsen( hypre_SStructMatrix  *   A,
 
    HYPRE_Int              *ncols;
    HYPRE_BigInt           *rows, *cols;
-   
+
    HYPRE_Int              *temp1, *temp2;
 
    HYPRE_Int               myid;
 
    hypre_MPI_Comm_rank(comm, &myid);
    hypre_SetIndex3(zero_index, 0, 0, 0);
+   hypre_SetIndex3(lindex, 0, 0, 0);
 
    hypre_BoxInit(&refined_box, ndim);
    hypre_BoxInit(&boxman_entry_box, ndim);
-   
+
    /*--------------------------------------------------------------------------
-    *  Task: Coarsen the CF interface connections of A into fac_A so that 
+    *  Task: Coarsen the CF interface connections of A into fac_A so that
     *  fac_A will have the stencil coefficients extending into a coarsened
     *  fbox. The centre coefficient is constructed to preserve the row sum.
     *--------------------------------------------------------------------------*/
 
    if (graph_type == HYPRE_SSTRUCT)
    {
-      startrank   = hypre_SStructGridGhstartRank(grid);
+      startrank = hypre_SStructGridGhstartRank(grid);
    }
-   if (graph_type == HYPRE_PARCSR)
+   else if (graph_type == HYPRE_PARCSR)
    {
-      startrank   = hypre_SStructGridStartRank(grid);
+      startrank = hypre_SStructGridStartRank(grid);
+   }
+   else
+   {
+      startrank = 0;
    }
 
    /*--------------------------------------------------------------------------
     * Fine grid strides by the refinement factors.
     *--------------------------------------------------------------------------*/
    hypre_SetIndex3(stridec, 1, 1, 1);
-   for (i= 0; i< ndim; i++)
+   for (i = 0; i < ndim; i++)
    {
-      stridef[i]= refine_factors[i];
+      stridef[i] = refine_factors[i];
    }
-   for (i= ndim; i< 3; i++)
+   for (i = ndim; i < 3; i++)
    {
-      stridef[i]= 1;
+      stridef[i] = 1;
    }
 
    /*--------------------------------------------------------------------------
     *  Determine the c/f interface index boxes: fgrid_cinterface_extents.
-    *  These are between fpart= level and cpart= (level-1). The 
+    *  These are between fpart= level and cpart= (level-1). The
     *  fgrid_cinterface_extents are indexed by cboxes, but fboxes that
     *  abutt a given cbox must be considered. Moreover, for each fbox,
     *  we can have a c/f interface from a number of different stencil
@@ -194,28 +199,28 @@ hypre_AMR_CFCoarsen( hypre_SStructMatrix  *   A,
     *
     *  fgrid_cinterface_extents[var1][ci]
     *--------------------------------------------------------------------------*/
-   A_pmatrix=  hypre_SStructMatrixPMatrix(fac_A, part_crse);
+   A_pmatrix =  hypre_SStructMatrixPMatrix(fac_A, part_crse);
    nvars    =  hypre_SStructPMatrixNVars(A_pmatrix);
 
-   fgrid_cinterface_extents= hypre_TAlloc(hypre_BoxArrayArray **,  nvars, HYPRE_MEMORY_HOST);
-   for (var1= 0; var1< nvars; var1++)
+   fgrid_cinterface_extents = hypre_TAlloc(hypre_BoxArrayArray **,  nvars, HYPRE_MEMORY_HOST);
+   for (var1 = 0; var1 < nvars; var1++)
    {
-      fboxman= hypre_SStructGridBoxManager(grid, part_fine, var1);
-      stencils= hypre_SStructPMatrixSStencil(A_pmatrix, var1, var1);
+      fboxman = hypre_SStructGridBoxManager(grid, part_fine, var1);
+      stencils = hypre_SStructPMatrixSStencil(A_pmatrix, var1, var1);
 
-      cgrid= hypre_SStructPGridSGrid(hypre_SStructPMatrixPGrid(A_pmatrix), var1);
-      cgrid_boxes= hypre_StructGridBoxes(cgrid); 
-      fgrid_cinterface_extents[var1]= hypre_TAlloc(hypre_BoxArrayArray *,  
-                                                   hypre_BoxArraySize(cgrid_boxes), HYPRE_MEMORY_HOST);
+      cgrid = hypre_SStructPGridSGrid(hypre_SStructPMatrixPGrid(A_pmatrix), var1);
+      cgrid_boxes = hypre_StructGridBoxes(cgrid);
+      fgrid_cinterface_extents[var1] = hypre_TAlloc(hypre_BoxArrayArray *,
+                                                    hypre_BoxArraySize(cgrid_boxes), HYPRE_MEMORY_HOST);
 
       hypre_ForBoxI(ci, cgrid_boxes)
       {
-         cgrid_box= hypre_BoxArrayBox(cgrid_boxes, ci);
+         cgrid_box = hypre_BoxArrayBox(cgrid_boxes, ci);
 
          hypre_StructMapCoarseToFine(hypre_BoxIMin(cgrid_box), zero_index,
                                      refine_factors, hypre_BoxIMin(&refined_box));
-         hypre_SetIndex3(index1, refine_factors[0]-1, refine_factors[1]-1,
-                         refine_factors[2]-1);
+         hypre_SetIndex3(index1, refine_factors[0] - 1, refine_factors[1] - 1,
+                         refine_factors[2] - 1);
          hypre_StructMapCoarseToFine(hypre_BoxIMax(cgrid_box), index1,
                                      refine_factors, hypre_BoxIMax(&refined_box));
 
@@ -223,17 +228,17 @@ hypre_AMR_CFCoarsen( hypre_SStructMatrix  *   A,
           * Stretch the refined_box so that a BoxManIntersect will get abutting
           * fboxes.
           *------------------------------------------------------------------------*/
-         for (i= 0; i< ndim; i++)
+         for (i = 0; i < ndim; i++)
          {
-            hypre_BoxIMin(&refined_box)[i]-= 1;
-            hypre_BoxIMax(&refined_box)[i]+= 1;
+            hypre_BoxIMin(&refined_box)[i] -= 1;
+            hypre_BoxIMax(&refined_box)[i] += 1;
          }
 
          hypre_BoxManIntersect(fboxman, hypre_BoxIMin(&refined_box),
                                hypre_BoxIMax(&refined_box), &boxman_entries,
                                &nboxman_entries);
 
-         fgrid_cinterface_extents[var1][ci]= hypre_BoxArrayArrayCreate(nboxman_entries, ndim);
+         fgrid_cinterface_extents[var1][ci] = hypre_BoxArrayArrayCreate(nboxman_entries, ndim);
 
          /*------------------------------------------------------------------------
           * Get the  fgrid_cinterface_extents using var1-var1 stencil (only like-
@@ -241,7 +246,7 @@ hypre_AMR_CFCoarsen( hypre_SStructMatrix  *   A,
           *------------------------------------------------------------------------*/
          if (stencils != NULL)
          {
-            for (i= 0; i< nboxman_entries; i++)
+            for (i = 0; i < nboxman_entries; i++)
             {
                hypre_BoxManEntryGetExtents(boxman_entries[i],
                                            hypre_BoxIMin(&boxman_entry_box),
@@ -258,21 +263,21 @@ hypre_AMR_CFCoarsen( hypre_SStructMatrix  *   A,
    /*--------------------------------------------------------------------------
     *  STEP 1:
     *        ADJUST THE ENTRIES ALONG THE C/F BOXES SO THAT THE COARSENED
-    *        C/F CONNECTION HAS THE APPROPRIATE ROW SUM. 
+    *        C/F CONNECTION HAS THE APPROPRIATE ROW SUM.
     *        WE ARE ASSUMING ONLY LIKE VARIABLES COUPLE.
     *--------------------------------------------------------------------------*/
-   for (var1= 0; var1< nvars; var1++)
+   for (var1 = 0; var1 < nvars; var1++)
    {
-      cgrid= hypre_SStructPGridSGrid(hypre_SStructPMatrixPGrid(A_pmatrix), var1);
-      cgrid_boxes= hypre_StructGridBoxes(cgrid);
-      stencils=  hypre_SStructPMatrixSStencil(A_pmatrix, var1, var1);
+      cgrid = hypre_SStructPGridSGrid(hypre_SStructPMatrixPGrid(A_pmatrix), var1);
+      cgrid_boxes = hypre_StructGridBoxes(cgrid);
+      stencils =  hypre_SStructPMatrixSStencil(A_pmatrix, var1, var1);
 
       /*----------------------------------------------------------------------
        * Extract only where variables couple.
        *----------------------------------------------------------------------*/
       if (stencils != NULL)
       {
-         stencil_size= hypre_StructStencilSize(stencils);
+         stencil_size = hypre_StructStencilSize(stencils);
 
          /*------------------------------------------------------------------
           *  stencil_ranks[i]      =  rank of stencil entry i.
@@ -281,45 +286,45 @@ hypre_AMR_CFCoarsen( hypre_SStructMatrix  *   A,
           * These are needed in collapsing the unstructured connections to
           * a stencil connection.
           *------------------------------------------------------------------*/
-         stencil_ranks= hypre_TAlloc(HYPRE_Int,  stencil_size, HYPRE_MEMORY_HOST);
-         rank_stencils= hypre_TAlloc(HYPRE_Int,  max_stencil_size, HYPRE_MEMORY_HOST);
-         for (i= 0; i< max_stencil_size; i++)
+         stencil_ranks = hypre_TAlloc(HYPRE_Int,  stencil_size, HYPRE_MEMORY_HOST);
+         rank_stencils = hypre_TAlloc(HYPRE_Int,  max_stencil_size, HYPRE_MEMORY_HOST);
+         for (i = 0; i < max_stencil_size; i++)
          {
-            rank_stencils[i]= -1;
+            rank_stencils[i] = -1;
             if (i < stencil_size)
             {
-               stencil_ranks[i]= -1;
+               stencil_ranks[i] = -1;
             }
          }
 
-         for (i= 0; i< stencil_size; i++)
+         for (i = 0; i < stencil_size; i++)
          {
             hypre_CopyIndex(hypre_StructStencilElement(stencils, i), stencil_shape_i);
             MapStencilRank(stencil_shape_i, j);
-            stencil_ranks[i]= j;
-            rank_stencils[stencil_ranks[i]] = i;            
+            stencil_ranks[i] = j;
+            rank_stencils[stencil_ranks[i]] = i;
          }
-         centre= rank_stencils[0];
+         centre = rank_stencils[0];
 
          smatrix_var = hypre_SStructPMatrixSMatrix(A_pmatrix, var1, var1);
 
          a_ptrs   = hypre_TAlloc(HYPRE_Real *,  stencil_size, HYPRE_MEMORY_HOST);
          hypre_ForBoxI(ci, cgrid_boxes)
          {
-            cgrid_box= hypre_BoxArrayBox(cgrid_boxes, ci);
+            cgrid_box = hypre_BoxArrayBox(cgrid_boxes, ci);
 
-            cinterface_arrays= fgrid_cinterface_extents[var1][ci];
-            A_dbox= hypre_BoxArrayBox(hypre_StructMatrixDataSpace(smatrix_var), ci);
+            cinterface_arrays = fgrid_cinterface_extents[var1][ci];
+            A_dbox = hypre_BoxArrayBox(hypre_StructMatrixDataSpace(smatrix_var), ci);
 
             /*-----------------------------------------------------------------
              * Ptrs to the correct data location.
              *-----------------------------------------------------------------*/
-            for (i= 0; i< stencil_size; i++)
+            for (i = 0; i < stencil_size; i++)
             {
                hypre_CopyIndex(hypre_StructStencilElement(stencils, i), stencil_shape_i);
-               a_ptrs[i]= hypre_StructMatrixExtractPointerByIndex(smatrix_var,
-                                                                  ci,
-                                                                  stencil_shape_i);
+               a_ptrs[i] = hypre_StructMatrixExtractPointerByIndex(smatrix_var,
+                                                                   ci,
+                                                                   stencil_shape_i);
             }
 
             /*-------------------------------------------------------------------
@@ -329,11 +334,11 @@ hypre_AMR_CFCoarsen( hypre_SStructMatrix  *   A,
              *-------------------------------------------------------------------*/
             hypre_ForBoxArrayI(fi, cinterface_arrays)
             {
-               cinterface_array= hypre_BoxArrayArrayBoxArray(cinterface_arrays, fi);
+               cinterface_array = hypre_BoxArrayArrayBoxArray(cinterface_arrays, fi);
                box_array_size  = hypre_BoxArraySize(cinterface_array);
-               for (boxi= stencil_size; boxi< box_array_size; boxi++)
+               for (boxi = stencil_size; boxi < box_array_size; boxi++)
                {
-                  fgrid_cinterface= hypre_BoxArrayBox(cinterface_array, boxi);
+                  fgrid_cinterface = hypre_BoxArrayBox(cinterface_array, boxi);
                   hypre_CopyIndex(hypre_BoxIMin(fgrid_cinterface), node_extents);
                   hypre_BoxGetSize(fgrid_cinterface, loop_size);
 
@@ -341,11 +346,11 @@ hypre_AMR_CFCoarsen( hypre_SStructMatrix  *   A,
                                             A_dbox, node_extents, stridec, iA);
                   {
                      zypre_BoxLoopGetIndex(lindex);
-                     for (i= 0; i< stencil_size; i++)
+                     for (i = 0; i < stencil_size; i++)
                      {
                         if (i != centre)
                         {
-                           a_ptrs[centre][iA]+= a_ptrs[i][iA];
+                           a_ptrs[centre][iA] += a_ptrs[i][iA];
                         }
                      }
 
@@ -353,11 +358,11 @@ hypre_AMR_CFCoarsen( hypre_SStructMatrix  *   A,
                       * Search for unstructured connections for this coarse node. Need
                       * to compute the index of the node. We will "collapse" the
                       * unstructured connections to the appropriate stencil entry. Thus
-                      * we need to serch for the stencil entry. 
+                      * we need to serch for the stencil entry.
                       *-----------------------------------------------------------------*/
-                     index_temp[0]= node_extents[0] + lindex[0];
-                     index_temp[1]= node_extents[1] + lindex[1];
-                     index_temp[2]= node_extents[2] + lindex[2];
+                     index_temp[0] = node_extents[0] + lindex[0];
+                     index_temp[1] = node_extents[1] + lindex[1];
+                     index_temp[2] = node_extents[2] + lindex[2];
 
                      hypre_SStructGridFindBoxManEntry(grid, part_crse, index_temp, var1,
                                                       &boxman_entry);
@@ -365,11 +370,11 @@ hypre_AMR_CFCoarsen( hypre_SStructMatrix  *   A,
                                                            matrix_type);
                      if (nUventries > 0)
                      {
-                        found= falseV;
-                        if ((rank-startrank) >= hypre_SStructGraphIUVEntry(graph, 0) &&
-                            (rank-startrank) <= hypre_SStructGraphIUVEntry(graph, nUventries-1))
+                        found = falseV;
+                        if ((rank - startrank) >= hypre_SStructGraphIUVEntry(graph, 0) &&
+                            (rank - startrank) <= hypre_SStructGraphIUVEntry(graph, nUventries - 1))
                         {
-                           found= trueV;
+                           found = trueV;
                         }
                      }
 
@@ -379,39 +384,39 @@ hypre_AMR_CFCoarsen( hypre_SStructMatrix  *   A,
                       *-----------------------------------------------------------------*/
                      if (nUventries > 0 && found == trueV)
                      {
-                        Uventry= hypre_SStructGraphUVEntry(graph, rank-startrank);
+                        Uventry = hypre_SStructGraphUVEntry(graph, rank - startrank);
 
                         if (Uventry != NULL)
                         {
-                           nUentries= hypre_SStructUVEntryNUEntries(Uventry);
-                              
+                           nUentries = hypre_SStructUVEntryNUEntries(Uventry);
+
                            /*-----------------------------------------------------------
                             * extract only the connections to level part_fine and the
                             * correct variable.
                             *-----------------------------------------------------------*/
-                           temp1= hypre_CTAlloc(HYPRE_Int,  nUentries, HYPRE_MEMORY_HOST);
-                           cnt1= 0;
-                           for (i=0; i< nUentries; i++)
+                           temp1 = hypre_CTAlloc(HYPRE_Int,  nUentries, HYPRE_MEMORY_HOST);
+                           cnt1 = 0;
+                           for (i = 0; i < nUentries; i++)
                            {
-                              if (hypre_SStructUVEntryToPart(Uventry, i) == part_fine 
+                              if (hypre_SStructUVEntryToPart(Uventry, i) == part_fine
                                   &&  hypre_SStructUVEntryToVar(Uventry, i) == var1)
                               {
-                                 temp1[cnt1++]= i;
+                                 temp1[cnt1++] = i;
                               }
                            }
 
-                           ncols= hypre_TAlloc(HYPRE_Int,  cnt1, HYPRE_MEMORY_HOST);
+                           ncols = hypre_TAlloc(HYPRE_Int,  cnt1, HYPRE_MEMORY_HOST);
                            rows = hypre_TAlloc(HYPRE_BigInt,  cnt1, HYPRE_MEMORY_HOST);
                            cols = hypre_TAlloc(HYPRE_BigInt,  cnt1, HYPRE_MEMORY_HOST);
-                           temp2= hypre_TAlloc(HYPRE_Int,  cnt1, HYPRE_MEMORY_HOST);
+                           temp2 = hypre_TAlloc(HYPRE_Int,  cnt1, HYPRE_MEMORY_HOST);
                            vals = hypre_CTAlloc(HYPRE_Real,  cnt1, HYPRE_MEMORY_HOST);
 
-                           for (i= 0; i< cnt1; i++)
+                           for (i = 0; i < cnt1; i++)
                            {
-                              ncols[i]= 1;
+                              ncols[i] = 1;
                               rows[i] = rank;
                               cols[i] = hypre_SStructUVEntryToRank(Uventry, temp1[i]);
-                         
+
                               /* determine the stencil connection pattern */
                               hypre_StructMapFineToCoarse(
                                  hypre_SStructUVEntryToIndex(Uventry, temp1[i]),
@@ -423,10 +428,10 @@ hypre_AMR_CFCoarsen( hypre_SStructMatrix  *   A,
                               /* zero off this stencil connection into the fbox */
                               if (temp2[i] < max_stencil_size)
                               {
-                                 j= rank_stencils[temp2[i]];
+                                 j = rank_stencils[temp2[i]];
                                  if (j >= 0)
                                  {
-                                    a_ptrs[j][iA]= 0.0;
+                                    a_ptrs[j][iA] = 0.0;
                                  }
                               }
                            }  /* for (i= 0; i< cnt1; i++) */
@@ -434,9 +439,9 @@ hypre_AMR_CFCoarsen( hypre_SStructMatrix  *   A,
                            hypre_TFree(temp1, HYPRE_MEMORY_HOST);
 
                            HYPRE_IJMatrixGetValues(ij_A, cnt1, ncols, rows, cols, vals);
-                           for (i= 0; i< cnt1; i++)
+                           for (i = 0; i < cnt1; i++)
                            {
-                              a_ptrs[centre][iA]+= vals[i];
+                              a_ptrs[centre][iA] += vals[i];
                            }
 
                            hypre_TFree(ncols, HYPRE_MEMORY_HOST);
@@ -444,14 +449,14 @@ hypre_AMR_CFCoarsen( hypre_SStructMatrix  *   A,
                            hypre_TFree(cols, HYPRE_MEMORY_HOST);
 
                            /* compute the connection to the coarsened fine box */
-                           for (i= 0; i< cnt1; i++)
+                           for (i = 0; i < cnt1; i++)
                            {
                               if (temp2[i] < max_stencil_size)
                               {
-                                 j= rank_stencils[temp2[i]];
+                                 j = rank_stencils[temp2[i]];
                                  if (j >= 0)
                                  {
-                                    a_ptrs[j][iA]+= vals[i];
+                                    a_ptrs[j][iA] += vals[i];
                                  }
                               }
                            }
@@ -459,11 +464,11 @@ hypre_AMR_CFCoarsen( hypre_SStructMatrix  *   A,
                            hypre_TFree(temp2, HYPRE_MEMORY_HOST);
 
                            /* centre connection which preserves the row sum */
-                           for (i= 0; i< stencil_size; i++)
+                           for (i = 0; i < stencil_size; i++)
                            {
                               if (i != centre)
                               {
-                                 a_ptrs[centre][iA]-= a_ptrs[i][iA];
+                                 a_ptrs[centre][iA] -= a_ptrs[i][iA];
                               }
                            }
 
@@ -482,10 +487,10 @@ hypre_AMR_CFCoarsen( hypre_SStructMatrix  *   A,
    }      /* end var1 */
 
 
-   for (var1= 0; var1< nvars; var1++)
+   for (var1 = 0; var1 < nvars; var1++)
    {
-      cgrid= hypre_SStructPGridSGrid(hypre_SStructPMatrixPGrid(A_pmatrix), var1);
-      cgrid_boxes= hypre_StructGridBoxes(cgrid);
+      cgrid = hypre_SStructPGridSGrid(hypre_SStructPMatrixPGrid(A_pmatrix), var1);
+      cgrid_boxes = hypre_StructGridBoxes(cgrid);
 
       hypre_ForBoxI(ci, cgrid_boxes)
       {
@@ -497,4 +502,3 @@ hypre_AMR_CFCoarsen( hypre_SStructMatrix  *   A,
 
    return 0;
 }
-
diff --git a/external/hypre/src/sstruct_ls/fac_cfstencil_box.c b/external/hypre/src/sstruct_ls/fac_cfstencil_box.c
index a2a17c75..a48e6bce 100644
--- a/external/hypre/src/sstruct_ls/fac_cfstencil_box.c
+++ b/external/hypre/src/sstruct_ls/fac_cfstencil_box.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -48,29 +48,29 @@ hypre_CF_StenBox( hypre_Box              *fgrid_box,
 
    hypre_BoxInit(&coarsen_box, ndim);
    hypre_BoxInit(&contracted_box, ndim);
-   hypre_BoxInit(&extended_box, ndim); 
+   hypre_BoxInit(&extended_box, ndim);
    hypre_BoxInit(&intersect_box, ndim);
    hypre_BoxInit(&shift_cbox, ndim);
    hypre_BoxInit(&shift_ibox, ndim);
 
-  /*--------------------------------------------------------------------------
-   * Coarsen the fine box, extend it, and shift it to determine if there
-   * is a reach between fgrid_box and cgrid_box in the stencil_shape direction.
-   * Note: the fine_box may not align as the index rule assumes:
-   *  [a_0,a_1,a_2]x[b_0,b_1,b_2], a_i= c_i*rfactors[i]
-   *                               b_i= f_i*rfactors[i]+g_i, g_i= rfactors[i]-1.
-   * When fine_box does not, then there must be a sibling box. fine_box
-   * should be adjusted so that the flooring of the MapFineToCoarse does not
-   * introduce extra coarse nodes in the coarsened box. Only the lower bound
-   * needs to be adjusted.
-   *--------------------------------------------------------------------------*/
+   /*--------------------------------------------------------------------------
+    * Coarsen the fine box, extend it, and shift it to determine if there
+    * is a reach between fgrid_box and cgrid_box in the stencil_shape direction.
+    * Note: the fine_box may not align as the index rule assumes:
+    *  [a_0,a_1,a_2]x[b_0,b_1,b_2], a_i= c_i*rfactors[i]
+    *                               b_i= f_i*rfactors[i]+g_i, g_i= rfactors[i]-1.
+    * When fine_box does not, then there must be a sibling box. fine_box
+    * should be adjusted so that the flooring of the MapFineToCoarse does not
+    * introduce extra coarse nodes in the coarsened box. Only the lower bound
+    * needs to be adjusted.
+    *--------------------------------------------------------------------------*/
    hypre_CopyBox(fgrid_box, &contracted_box);
-   for (i= 0; i< ndim; i++)
+   for (i = 0; i < ndim; i++)
    {
-      remainder= hypre_BoxIMin(&contracted_box)[i] % rfactors[i];
+      remainder = hypre_BoxIMin(&contracted_box)[i] % rfactors[i];
       if (remainder)
       {
-          hypre_BoxIMin(&contracted_box)[i]+= rfactors[i] - remainder;
+         hypre_BoxIMin(&contracted_box)[i] += rfactors[i] - remainder;
       }
    }
 
@@ -80,66 +80,66 @@ hypre_CF_StenBox( hypre_Box              *fgrid_box,
                                rfactors, hypre_BoxIMax(&coarsen_box));
 
    hypre_ClearIndex(size_cbox);
-   for (i= 0; i< ndim; i++)
+   for (i = 0; i < ndim; i++)
    {
       size_cbox[i] = hypre_BoxSizeD(&coarsen_box, i) - 1;
    }
 
-  /*---------------------------------------------------------------------
-   * Extend the coarsened fgrid_box by one layer in each direction so
-   * that actual cf interface is reached. If only coarsen_box were
-   * extended, the actual cf interface may not be reached.
-   *---------------------------------------------------------------------*/
+   /*---------------------------------------------------------------------
+    * Extend the coarsened fgrid_box by one layer in each direction so
+    * that actual cf interface is reached. If only coarsen_box were
+    * extended, the actual cf interface may not be reached.
+    *---------------------------------------------------------------------*/
    hypre_CopyBox(&coarsen_box, &extended_box);
    /*hypre_StructMapFineToCoarse(hypre_BoxIMin(fgrid_box), temp_index,
                                rfactors, hypre_BoxIMin(&extended_box));
    hypre_StructMapFineToCoarse(hypre_BoxIMax(fgrid_box), temp_index,
                                rfactors, hypre_BoxIMax(&extended_box));*/
-   for (i= 0; i< ndim; i++)
+   for (i = 0; i < ndim; i++)
    {
-      hypre_BoxIMin(&extended_box)[i]-=1;
-      hypre_BoxIMax(&extended_box)[i]+=1;
+      hypre_BoxIMin(&extended_box)[i] -= 1;
+      hypre_BoxIMax(&extended_box)[i] += 1;
    }
 
    hypre_IntersectBoxes(&extended_box, cgrid_box, &intersect_box);
-   intersect_size= hypre_BoxVolume(&intersect_box);
+   intersect_size = hypre_BoxVolume(&intersect_box);
    if (intersect_size == 0)
    {
-       hypre_CopyBox(&intersect_box, stenbox);
-       return stenbox;
+      hypre_CopyBox(&intersect_box, stenbox);
+      return stenbox;
    }
 
    hypre_ClearIndex(size_ibox);
-   for (i= 0; i< ndim; i++)
+   for (i = 0; i < ndim; i++)
    {
       size_ibox[i] = hypre_BoxSizeD(&intersect_box, i) - 1;
    }
 
-  /*---------------------------------------------------------------------
-   * To find the box extents that must be loop over, we need to take the
-   * "opposite" stencil_shape and shift the coarsen and extended boxes.
-   *---------------------------------------------------------------------*/
+   /*---------------------------------------------------------------------
+    * To find the box extents that must be loop over, we need to take the
+    * "opposite" stencil_shape and shift the coarsen and extended boxes.
+    *---------------------------------------------------------------------*/
    hypre_SetIndex3(shift_index,
-                 -size_ibox[0]*stencil_shape[0],
-                 -size_ibox[1]*stencil_shape[1],
-                 -size_ibox[2]*stencil_shape[2]);
+                   -size_ibox[0]*stencil_shape[0],
+                   -size_ibox[1]*stencil_shape[1],
+                   -size_ibox[2]*stencil_shape[2]);
    hypre_AddIndexes(shift_index, hypre_BoxIMin(&intersect_box), 3, hypre_BoxIMin(&shift_ibox));
    hypre_AddIndexes(shift_index, hypre_BoxIMax(&intersect_box), 3, hypre_BoxIMax(&shift_ibox));
    hypre_IntersectBoxes(&shift_ibox, &intersect_box, &shift_ibox);
 
    hypre_SetIndex3(shift_index,
-                 -size_cbox[0]*stencil_shape[0],
-                 -size_cbox[1]*stencil_shape[1],
-                 -size_cbox[2]*stencil_shape[2]);
+                   -size_cbox[0]*stencil_shape[0],
+                   -size_cbox[1]*stencil_shape[1],
+                   -size_cbox[2]*stencil_shape[2]);
    hypre_AddIndexes(shift_index, hypre_BoxIMin(&coarsen_box), 3, hypre_BoxIMin(&shift_cbox));
    hypre_AddIndexes(shift_index, hypre_BoxIMax(&coarsen_box), 3, hypre_BoxIMax(&shift_cbox));
    hypre_IntersectBoxes(&shift_cbox, &coarsen_box, &shift_cbox);
 
-  /*---------------------------------------------------------------------
-   * shift_ibox & shift_cbox will contain the loop extents. Shifting
-   * shift_cbox by -stencil_shape and then intersecting with shift_ibox
-   * gives the exact extents.
-   *---------------------------------------------------------------------*/
+   /*---------------------------------------------------------------------
+    * shift_ibox & shift_cbox will contain the loop extents. Shifting
+    * shift_cbox by -stencil_shape and then intersecting with shift_ibox
+    * gives the exact extents.
+    *---------------------------------------------------------------------*/
    hypre_SetIndex3(shift_index, -stencil_shape[0], -stencil_shape[1], -stencil_shape[2]);
    hypre_AddIndexes(shift_index, hypre_BoxIMin(&shift_cbox), 3, hypre_BoxIMin(&shift_cbox));
    hypre_AddIndexes(shift_index, hypre_BoxIMax(&shift_cbox), 3, hypre_BoxIMax(&shift_cbox));
diff --git a/external/hypre/src/sstruct_ls/fac_interp2.c b/external/hypre/src/sstruct_ls/fac_interp2.c
index 02dcd953..d6031d33 100644
--- a/external/hypre/src/sstruct_ls/fac_interp2.c
+++ b/external/hypre/src/sstruct_ls/fac_interp2.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -50,11 +50,11 @@ typedef struct
 HYPRE_Int
 hypre_FacSemiInterpCreate2( void **fac_interp_vdata_ptr )
 {
-   HYPRE_Int                 ierr= 0;
+   HYPRE_Int                 ierr = 0;
    hypre_FacSemiInterpData2  *fac_interp_data;
 
    fac_interp_data = hypre_CTAlloc(hypre_FacSemiInterpData2,  1, HYPRE_MEMORY_HOST);
-   *fac_interp_vdata_ptr= (void *) fac_interp_data;
+   *fac_interp_vdata_ptr = (void *) fac_interp_data;
 
    return ierr;
 }
@@ -74,14 +74,14 @@ hypre_FacSemiInterpDestroy2( void *fac_interp_vdata)
    {
       hypre_SStructPVectorDestroy(fac_interp_data-> recv_cvectors);
 
-      for (i= 0; i< (fac_interp_data-> nvars); i++)
+      for (i = 0; i < (fac_interp_data-> nvars); i++)
       {
          hypre_TFree(fac_interp_data -> recv_boxnum_map[i], HYPRE_MEMORY_HOST);
          hypre_BoxArrayArrayDestroy(fac_interp_data -> identity_arrayboxes[i]);
 
-         size= hypre_BoxArrayArraySize(fac_interp_data -> ownboxes[i]);
+         size = hypre_BoxArrayArraySize(fac_interp_data -> ownboxes[i]);
          hypre_BoxArrayArrayDestroy(fac_interp_data -> ownboxes[i]);
-         for (j= 0; j< size; j++)
+         for (j = 0; j < size; j++)
          {
             hypre_TFree(fac_interp_data -> own_cboxnums[i][j], HYPRE_MEMORY_HOST);
          }
@@ -99,7 +99,7 @@ hypre_FacSemiInterpDestroy2( void *fac_interp_vdata)
       hypre_TFree(fac_interp_data -> gnodes_comm_pkg, HYPRE_MEMORY_HOST);
       hypre_TFree(fac_interp_data -> interlevel_comm, HYPRE_MEMORY_HOST);
 
-      for (i= 0; i< (fac_interp_data -> ndim); i++)
+      for (i = 0; i < (fac_interp_data -> ndim); i++)
       {
          hypre_TFree(fac_interp_data -> weights[i], HYPRE_MEMORY_HOST);
       }
@@ -125,8 +125,8 @@ hypre_FacSemiInterpSetup2( void                 *fac_interp_vdata,
    HYPRE_Int                 ierr = 0;
 
    hypre_FacSemiInterpData2 *fac_interp_data = (hypre_FacSemiInterpData2 *)fac_interp_vdata;
-   HYPRE_Int                 part_fine= 1;
-   HYPRE_Int                 part_crse= 0;
+   HYPRE_Int                 part_fine = 1;
+   HYPRE_Int                 part_crse = 0;
 
    hypre_CommPkg           **gnodes_comm_pkg;
    hypre_CommPkg           **interlevel_comm;
@@ -139,7 +139,7 @@ hypre_FacSemiInterpSetup2( void                 *fac_interp_vdata,
 
    hypre_SStructPGrid       *pgrid;
 
-   hypre_SStructPVector     *ef= hypre_SStructVectorPVector(e, part_fine);
+   hypre_SStructPVector     *ef = hypre_SStructVectorPVector(e, part_fine);
    hypre_StructVector       *e_var, *s_rc, *s_cvector;
 
    hypre_BoxArrayArray     **identity_arrayboxes;
@@ -162,7 +162,7 @@ hypre_FacSemiInterpSetup2( void                 *fac_interp_vdata,
    hypre_BoxManEntry       **boxman_entries;
    HYPRE_Int                 nboxman_entries;
 
-   HYPRE_Int                 nvars= hypre_SStructPVectorNVars(ef);
+   HYPRE_Int                 nvars = hypre_SStructPVectorNVars(ef);
    HYPRE_Int                 vars;
 
    hypre_Index               zero_index, index;
@@ -181,7 +181,7 @@ hypre_FacSemiInterpSetup2( void                 *fac_interp_vdata,
    hypre_MPI_Comm_rank(hypre_MPI_COMM_WORLD, &myproc);
    hypre_MPI_Comm_size(hypre_MPI_COMM_WORLD, &tot_procs);
 
-   ndim= hypre_SStructPGridNDim(hypre_SStructPVectorPGrid(ef));
+   ndim = hypre_SStructPGridNDim(hypre_SStructPVectorPGrid(ef));
    hypre_SetIndex3(zero_index, 0, 0, 0);
 
    hypre_BoxInit(&box, ndim);
@@ -194,11 +194,11 @@ hypre_FacSemiInterpSetup2( void                 *fac_interp_vdata,
     * stencil pattern for each StructVector, i.e., linear interpolation for
     * each variable.
     *------------------------------------------------------------------------*/
-   gnodes_comm_pkg= hypre_CTAlloc(hypre_CommPkg *,  nvars, HYPRE_MEMORY_HOST);
-   for (vars= 0; vars< nvars; vars++)
+   gnodes_comm_pkg = hypre_CTAlloc(hypre_CommPkg *,  nvars, HYPRE_MEMORY_HOST);
+   for (vars = 0; vars < nvars; vars++)
    {
-      e_var= hypre_SStructPVectorSVector(ec, vars);
-      num_ghost= hypre_StructVectorNumGhost(e_var);
+      e_var = hypre_SStructPVectorSVector(ec, vars);
+      num_ghost = hypre_StructVectorNumGhost(e_var);
 
       hypre_CreateCommInfoFromNumGhost(hypre_StructVectorGrid(e_var),
                                        num_ghost, &comm_info);
@@ -212,7 +212,7 @@ hypre_FacSemiInterpSetup2( void                 *fac_interp_vdata,
 
    (fac_interp_data -> ndim)           = ndim;
    (fac_interp_data -> nvars)          = nvars;
-   (fac_interp_data -> gnodes_comm_pkg)= gnodes_comm_pkg;
+   (fac_interp_data -> gnodes_comm_pkg) = gnodes_comm_pkg;
    hypre_CopyIndex(rfactors, (fac_interp_data -> stride));
 
    /*------------------------------------------------------------------------
@@ -235,26 +235,26 @@ hypre_FacSemiInterpSetup2( void                 *fac_interp_vdata,
     * is also communicated. However, the recv_grid will consists of the
     * unstretched boxes so that overlapping does not occur.
     *--------------------------------------------------------------------------*/
-   identity_arrayboxes= hypre_CTAlloc(hypre_BoxArrayArray *,  nvars, HYPRE_MEMORY_HOST);
+   identity_arrayboxes = hypre_CTAlloc(hypre_BoxArrayArray *,  nvars, HYPRE_MEMORY_HOST);
 
-   pgrid= hypre_SStructPVectorPGrid(ec);
+   pgrid = hypre_SStructPVectorPGrid(ec);
    hypre_ClearIndex(index);
-   for (i= 0; i< ndim; i++)
+   for (i = 0; i < ndim; i++)
    {
-      index[i]= rfactors[i]-1;
+      index[i] = rfactors[i] - 1;
    }
 
    tmp_boxarray = hypre_BoxArrayCreate(0, ndim);
-   for (vars= 0; vars< nvars; vars++)
+   for (vars = 0; vars < nvars; vars++)
    {
-      boxman1= hypre_SStructGridBoxManager(hypre_SStructVectorGrid(e),
-                                           part_fine, vars);
-      boxarray= hypre_StructGridBoxes(hypre_SStructPGridSGrid(pgrid, vars));
-      identity_arrayboxes[vars]= hypre_BoxArrayArrayCreate(hypre_BoxArraySize(boxarray), ndim);
+      boxman1 = hypre_SStructGridBoxManager(hypre_SStructVectorGrid(e),
+                                            part_fine, vars);
+      boxarray = hypre_StructGridBoxes(hypre_SStructPGridSGrid(pgrid, vars));
+      identity_arrayboxes[vars] = hypre_BoxArrayArrayCreate(hypre_BoxArraySize(boxarray), ndim);
 
       hypre_ForBoxI(ci, boxarray)
       {
-         box= *hypre_BoxArrayBox(boxarray, ci);
+         box = *hypre_BoxArrayBox(boxarray, ci);
          hypre_AppendBox(&box,
                          hypre_BoxArrayArrayBoxArray(identity_arrayboxes[vars], ci));
 
@@ -267,8 +267,8 @@ hypre_FacSemiInterpSetup2( void                 *fac_interp_vdata,
                                hypre_BoxIMax(&scaled_box), &boxman_entries,
                                &nboxman_entries);
 
-         intersect_boxes= hypre_BoxArrayCreate(0, ndim);
-         for (i= 0; i< nboxman_entries; i++)
+         intersect_boxes = hypre_BoxArrayCreate(0, ndim);
+         for (i = 0; i < nboxman_entries; i++)
          {
             hypre_BoxManEntryGetExtents(boxman_entries[i], ilower, iupper);
             hypre_BoxSetExtents(&box, ilower, iupper);
@@ -276,12 +276,12 @@ hypre_FacSemiInterpSetup2( void                 *fac_interp_vdata,
 
             /* contract this refined box so that only the coarse nodes on this
                processor will be subtracted. */
-            for (j= 0; j< ndim; j++)
+            for (j = 0; j < ndim; j++)
             {
-               k= hypre_BoxIMin(&box)[j] % rfactors[j];
+               k = hypre_BoxIMin(&box)[j] % rfactors[j];
                if (k)
                {
-                  hypre_BoxIMin(&box)[j]+= rfactors[j] - k;
+                  hypre_BoxIMin(&box)[j] += rfactors[j] - k;
                }
             }
 
@@ -301,53 +301,54 @@ hypre_FacSemiInterpSetup2( void                 *fac_interp_vdata,
       }
    }
    hypre_BoxArrayDestroy(tmp_boxarray);
-   fac_interp_data -> identity_arrayboxes= identity_arrayboxes;
+   fac_interp_data -> identity_arrayboxes = identity_arrayboxes;
 
    /*--------------------------------------------------------------------------
     * fboxes are coarsened. For each coarsened fbox, we need a boxarray of
     * recvboxes or ownboxes.
     *--------------------------------------------------------------------------*/
-   ownboxes= hypre_CTAlloc(hypre_BoxArrayArray *,  nvars, HYPRE_MEMORY_HOST);
-   own_cboxnums= hypre_CTAlloc(HYPRE_Int **,  nvars, HYPRE_MEMORY_HOST);
+   ownboxes = hypre_CTAlloc(hypre_BoxArrayArray *,  nvars, HYPRE_MEMORY_HOST);
+   own_cboxnums = hypre_CTAlloc(HYPRE_Int **,  nvars, HYPRE_MEMORY_HOST);
 
-   recv_boxes= hypre_CTAlloc(hypre_BoxArrayArray *,  nvars, HYPRE_MEMORY_HOST);
-   recv_processes= hypre_CTAlloc(HYPRE_Int **,  nvars, HYPRE_MEMORY_HOST);
+   recv_boxes = hypre_CTAlloc(hypre_BoxArrayArray *,  nvars, HYPRE_MEMORY_HOST);
+   recv_processes = hypre_CTAlloc(HYPRE_Int **,  nvars, HYPRE_MEMORY_HOST);
 
    /* dummy pointer for CommInfoCreate */
-   recv_remote_boxnums= hypre_CTAlloc(HYPRE_Int **,  nvars, HYPRE_MEMORY_HOST);
+   recv_remote_boxnums = hypre_CTAlloc(HYPRE_Int **,  nvars, HYPRE_MEMORY_HOST);
    hypre_ClearIndex(index);
-   for (i= 0; i< ndim; i++)
+   for (i = 0; i < ndim; i++)
    {
-      index[i]= 1;
+      index[i] = 1;
    }
 
-   for (vars= 0; vars< nvars; vars++)
+   for (vars = 0; vars < nvars; vars++)
    {
-      boxman1= hypre_SStructGridBoxManager(hypre_SStructVectorGrid(e),
-                                           part_crse, vars);
-      pgrid= hypre_SStructPVectorPGrid(ef);
-      boxarray= hypre_StructGridBoxes(hypre_SStructPGridSGrid(pgrid, vars));
+      boxman1 = hypre_SStructGridBoxManager(hypre_SStructVectorGrid(e),
+                                            part_crse, vars);
+      pgrid = hypre_SStructPVectorPGrid(ef);
+      boxarray = hypre_StructGridBoxes(hypre_SStructPGridSGrid(pgrid, vars));
 
       ownboxes[vars] = hypre_BoxArrayArrayCreate(hypre_BoxArraySize(boxarray), ndim);
-      own_cboxnums[vars]= hypre_CTAlloc(HYPRE_Int *,  hypre_BoxArraySize(boxarray), HYPRE_MEMORY_HOST);
+      own_cboxnums[vars] = hypre_CTAlloc(HYPRE_Int *,  hypre_BoxArraySize(boxarray), HYPRE_MEMORY_HOST);
       recv_boxes[vars]    = hypre_BoxArrayArrayCreate(hypre_BoxArraySize(boxarray), ndim);
-      recv_processes[vars]= hypre_CTAlloc(HYPRE_Int *,  hypre_BoxArraySize(boxarray), HYPRE_MEMORY_HOST);
-      recv_remote_boxnums[vars]= hypre_CTAlloc(HYPRE_Int *,  hypre_BoxArraySize(boxarray), HYPRE_MEMORY_HOST);
+      recv_processes[vars] = hypre_CTAlloc(HYPRE_Int *,  hypre_BoxArraySize(boxarray), HYPRE_MEMORY_HOST);
+      recv_remote_boxnums[vars] = hypre_CTAlloc(HYPRE_Int *,  hypre_BoxArraySize(boxarray),
+                                                HYPRE_MEMORY_HOST);
 
       hypre_ForBoxI(fi, boxarray)
       {
-         box= *hypre_BoxArrayBox(boxarray, fi);
+         box = *hypre_BoxArrayBox(boxarray, fi);
 
          /*--------------------------------------------------------------------
           * Adjust this box so that only the coarse nodes inside the fine box
           * are extracted.
           *--------------------------------------------------------------------*/
-         for (j= 0; j< ndim; j++)
+         for (j = 0; j < ndim; j++)
          {
-            k= hypre_BoxIMin(&box)[j] % rfactors[j];
+            k = hypre_BoxIMin(&box)[j] % rfactors[j];
             if (k)
             {
-               hypre_BoxIMin(&box)[j]+= rfactors[j] - k;
+               hypre_BoxIMin(&box)[j] += rfactors[j] - k;
             }
          }
 
@@ -359,8 +360,8 @@ hypre_FacSemiInterpSetup2( void                 *fac_interp_vdata,
          hypre_BoxManIntersect(boxman1, hypre_BoxIMin(&scaled_box),
                                hypre_BoxIMax(&scaled_box), &boxman_entries, &nboxman_entries);
 
-         cnt1= 0; cnt2= 0;
-         for (i= 0; i< nboxman_entries; i++)
+         cnt1 = 0; cnt2 = 0;
+         for (i = 0; i < nboxman_entries; i++)
          {
             hypre_SStructBoxManEntryGetProcess(boxman_entries[i], &proc);
             if (proc == myproc)
@@ -374,11 +375,11 @@ hypre_FacSemiInterpSetup2( void                 *fac_interp_vdata,
          }
 
          own_cboxnums[vars][fi]  = hypre_CTAlloc(HYPRE_Int,  cnt1, HYPRE_MEMORY_HOST);
-         recv_processes[vars][fi]= hypre_CTAlloc(HYPRE_Int,  cnt2, HYPRE_MEMORY_HOST);
-         recv_remote_boxnums[vars][fi]= hypre_CTAlloc(HYPRE_Int ,  cnt2, HYPRE_MEMORY_HOST);
+         recv_processes[vars][fi] = hypre_CTAlloc(HYPRE_Int,  cnt2, HYPRE_MEMORY_HOST);
+         recv_remote_boxnums[vars][fi] = hypre_CTAlloc(HYPRE_Int,  cnt2, HYPRE_MEMORY_HOST);
 
-         cnt1= 0; cnt2= 0;
-         for (i= 0; i< nboxman_entries; i++)
+         cnt1 = 0; cnt2 = 0;
+         for (i = 0; i < nboxman_entries; i++)
          {
             hypre_BoxManEntryGetExtents(boxman_entries[i], ilower, iupper);
             hypre_BoxSetExtents(&box, ilower, iupper);
@@ -402,7 +403,7 @@ hypre_FacSemiInterpSetup2( void                 *fac_interp_vdata,
 
                hypre_AppendBox(&box,
                                hypre_BoxArrayArrayBoxArray(recv_boxes[vars], fi));
-               recv_processes[vars][fi][cnt2]= proc;
+               recv_processes[vars][fi][cnt2] = proc;
                cnt2++;
             }
          }
@@ -410,8 +411,8 @@ hypre_FacSemiInterpSetup2( void                 *fac_interp_vdata,
       }  /* hypre_ForBoxI(fi, boxarray) */
    }     /* for (vars= 0; vars< nvars; vars++) */
 
-   (fac_interp_data -> ownboxes)= ownboxes;
-   (fac_interp_data -> own_cboxnums)= own_cboxnums;
+   (fac_interp_data -> ownboxes) = ownboxes;
+   (fac_interp_data -> own_cboxnums) = own_cboxnums;
 
    /*--------------------------------------------------------------------------
     * With the recv'ed boxes form a SStructPGrid and a SStructGrid. The
@@ -423,31 +424,31 @@ hypre_FacSemiInterpSetup2( void                 *fac_interp_vdata,
    HYPRE_SStructGridCreate(hypre_SStructPVectorComm(ec),
                            ndim, 1, &temp_grid);
    hypre_SStructPGridCreate(hypre_SStructPVectorComm(ec), ndim, &recv_cgrid);
-   recv_boxnum_map= hypre_CTAlloc(HYPRE_Int *,  nvars, HYPRE_MEMORY_HOST);
+   recv_boxnum_map = hypre_CTAlloc(HYPRE_Int *,  nvars, HYPRE_MEMORY_HOST);
 
-   cnt2= 0;
+   cnt2 = 0;
    hypre_ClearIndex(index);
-   for (i= 0; i< ndim; i++)
+   for (i = 0; i < ndim; i++)
    {
-      index[i]= 1;
+      index[i] = 1;
    }
-   for (vars= 0; vars< nvars; vars++)
+   for (vars = 0; vars < nvars; vars++)
    {
-      cnt1= 0;
+      cnt1 = 0;
       hypre_ForBoxArrayI(i, recv_boxes[vars])
       {
-         boxarray= hypre_BoxArrayArrayBoxArray(recv_boxes[vars], i);
-         cnt1+= hypre_BoxArraySize(boxarray);
+         boxarray = hypre_BoxArrayArrayBoxArray(recv_boxes[vars], i);
+         cnt1 += hypre_BoxArraySize(boxarray);
       }
-      recv_boxnum_map[vars]= hypre_CTAlloc(HYPRE_Int,  cnt1, HYPRE_MEMORY_HOST);
+      recv_boxnum_map[vars] = hypre_CTAlloc(HYPRE_Int,  cnt1, HYPRE_MEMORY_HOST);
 
-      cnt1= 0;
+      cnt1 = 0;
       hypre_ForBoxArrayI(i, recv_boxes[vars])
       {
-         boxarray= hypre_BoxArrayArrayBoxArray(recv_boxes[vars], i);
+         boxarray = hypre_BoxArrayArrayBoxArray(recv_boxes[vars], i);
          hypre_ForBoxI(j, boxarray)
          {
-            box= *hypre_BoxArrayBox(boxarray, j);
+            box = *hypre_BoxArrayBox(boxarray, j);
 
             /* contract the box its actual size. */
             hypre_AddIndexes(hypre_BoxIMin(&box), index, 3, hypre_BoxIMin(&box));
@@ -462,7 +463,7 @@ hypre_FacSemiInterpSetup2( void                 *fac_interp_vdata,
                                         hypre_BoxIMin(&box),
                                         hypre_BoxIMax(&box));
 
-            recv_boxnum_map[vars][cnt1]= i; /* record the fbox num. i */
+            recv_boxnum_map[vars][cnt1] = i; /* record the fbox num. i */
             cnt1++;
             cnt2++;
          }
@@ -501,7 +502,7 @@ hypre_FacSemiInterpSetup2( void                 *fac_interp_vdata,
    hypre_SStructPVectorAssemble(recv_cvectors);
 
    fac_interp_data -> recv_cvectors  = recv_cvectors;
-   fac_interp_data -> recv_boxnum_map= recv_boxnum_map;
+   fac_interp_data -> recv_boxnum_map = recv_boxnum_map;
 
    /* pgrid recv_cgrid no longer needed. */
    hypre_SStructPGridDestroy(recv_cgrid);
@@ -516,40 +517,41 @@ hypre_FacSemiInterpSetup2( void                 *fac_interp_vdata,
     * will be on the processor. Also, note that the remote_boxnums are
     * with respect to the recv_cgrid box numbering.
     *--------------------------------------------------------------------------*/
-   send_boxes= hypre_CTAlloc(hypre_BoxArrayArray *,  nvars, HYPRE_MEMORY_HOST);
-   send_processes= hypre_CTAlloc(HYPRE_Int **,  nvars, HYPRE_MEMORY_HOST);
-   send_remote_boxnums= hypre_CTAlloc(HYPRE_Int **,  nvars, HYPRE_MEMORY_HOST);
+   send_boxes = hypre_CTAlloc(hypre_BoxArrayArray *,  nvars, HYPRE_MEMORY_HOST);
+   send_processes = hypre_CTAlloc(HYPRE_Int **,  nvars, HYPRE_MEMORY_HOST);
+   send_remote_boxnums = hypre_CTAlloc(HYPRE_Int **,  nvars, HYPRE_MEMORY_HOST);
 
    hypre_ClearIndex(index);
-   for (i= 0; i< ndim; i++)
+   for (i = 0; i < ndim; i++)
    {
-      index[i]= 1;
+      index[i] = 1;
    }
-   for (vars= 0; vars< nvars; vars++)
+   for (vars = 0; vars < nvars; vars++)
    {
       /*-------------------------------------------------------------------
        * send boxes: intersect with temp_grid that has all the recv boxes-
        * These local box_nums may not be the same as the local box_nums of
        * the coarse grid.
        *-------------------------------------------------------------------*/
-      boxman1= hypre_SStructGridBoxManager(temp_grid, 0, vars);
-      pgrid= hypre_SStructPVectorPGrid(ec);
-      boxarray= hypre_StructGridBoxes(hypre_SStructPGridSGrid(pgrid, vars));
+      boxman1 = hypre_SStructGridBoxManager(temp_grid, 0, vars);
+      pgrid = hypre_SStructPVectorPGrid(ec);
+      boxarray = hypre_StructGridBoxes(hypre_SStructPGridSGrid(pgrid, vars));
 
-      send_boxes[vars]= hypre_BoxArrayArrayCreate(hypre_BoxArraySize(boxarray), ndim);
-      send_processes[vars]= hypre_CTAlloc(HYPRE_Int *,  hypre_BoxArraySize(boxarray), HYPRE_MEMORY_HOST);
-      send_remote_boxnums[vars]= hypre_CTAlloc(HYPRE_Int *,  hypre_BoxArraySize(boxarray), HYPRE_MEMORY_HOST);
+      send_boxes[vars] = hypre_BoxArrayArrayCreate(hypre_BoxArraySize(boxarray), ndim);
+      send_processes[vars] = hypre_CTAlloc(HYPRE_Int *,  hypre_BoxArraySize(boxarray), HYPRE_MEMORY_HOST);
+      send_remote_boxnums[vars] = hypre_CTAlloc(HYPRE_Int *,  hypre_BoxArraySize(boxarray),
+                                                HYPRE_MEMORY_HOST);
 
       hypre_ForBoxI(ci, boxarray)
       {
-         box= *hypre_BoxArrayBox(boxarray, ci);
+         box = *hypre_BoxArrayBox(boxarray, ci);
          hypre_BoxSetExtents(&scaled_box, hypre_BoxIMin(&box), hypre_BoxIMax(&box));
 
          hypre_BoxManIntersect(boxman1, hypre_BoxIMin(&scaled_box),
                                hypre_BoxIMax(&scaled_box), &boxman_entries, &nboxman_entries);
 
-         cnt1= 0;
-         for (i= 0; i< nboxman_entries; i++)
+         cnt1 = 0;
+         for (i = 0; i < nboxman_entries; i++)
          {
             hypre_SStructBoxManEntryGetProcess(boxman_entries[i], &proc);
             if (proc != myproc)
@@ -558,10 +560,10 @@ hypre_FacSemiInterpSetup2( void                 *fac_interp_vdata,
             }
          }
          send_processes[vars][ci]     = hypre_CTAlloc(HYPRE_Int,  cnt1, HYPRE_MEMORY_HOST);
-         send_remote_boxnums[vars][ci]= hypre_CTAlloc(HYPRE_Int,  cnt1, HYPRE_MEMORY_HOST);
+         send_remote_boxnums[vars][ci] = hypre_CTAlloc(HYPRE_Int,  cnt1, HYPRE_MEMORY_HOST);
 
-         cnt1= 0;
-         for (i= 0; i< nboxman_entries; i++)
+         cnt1 = 0;
+         for (i = 0; i < nboxman_entries; i++)
          {
             hypre_BoxManEntryGetExtents(boxman_entries[i], ilower, iupper);
             hypre_BoxSetExtents(&box, ilower, iupper);
@@ -578,7 +580,7 @@ hypre_FacSemiInterpSetup2( void                 *fac_interp_vdata,
                hypre_AppendBox(&box,
                                hypre_BoxArrayArrayBoxArray(send_boxes[vars], ci));
 
-               send_processes[vars][ci][cnt1]= proc;
+               send_processes[vars][ci][cnt1] = proc;
                hypre_SStructBoxManEntryGetBoxnum(
                   boxman_entries[i], &send_remote_boxnums[vars][ci][cnt1]);
                cnt1++;
@@ -597,16 +599,16 @@ hypre_FacSemiInterpSetup2( void                 *fac_interp_vdata,
    /*--------------------------------------------------------------------------
     * Can create the interlevel_comm.
     *--------------------------------------------------------------------------*/
-   interlevel_comm= hypre_CTAlloc(hypre_CommPkg *,  nvars, HYPRE_MEMORY_HOST);
+   interlevel_comm = hypre_CTAlloc(hypre_CommPkg *,  nvars, HYPRE_MEMORY_HOST);
 
-   num_values= 1;
-   for (vars= 0; vars< nvars; vars++)
+   num_values = 1;
+   for (vars = 0; vars < nvars; vars++)
    {
-      s_rc= hypre_SStructPVectorSVector(ec, vars);
+      s_rc = hypre_SStructPVectorSVector(ec, vars);
 
-      s_cvector= hypre_SStructPVectorSVector(recv_cvectors, vars);
-      send_rboxes= hypre_BoxArrayArrayDuplicate(send_boxes[vars]);
-      recv_rboxes= hypre_BoxArrayArrayDuplicate(recv_boxes[vars]);
+      s_cvector = hypre_SStructPVectorSVector(recv_cvectors, vars);
+      send_rboxes = hypre_BoxArrayArrayDuplicate(send_boxes[vars]);
+      recv_rboxes = hypre_BoxArrayArrayDuplicate(recv_boxes[vars]);
 
       hypre_CommInfoCreate(send_boxes[vars], recv_boxes[vars],
                            send_processes[vars], recv_processes[vars],
@@ -628,36 +630,36 @@ hypre_FacSemiInterpSetup2( void                 *fac_interp_vdata,
    hypre_TFree(send_remote_boxnums, HYPRE_MEMORY_HOST);
    hypre_TFree(recv_remote_boxnums, HYPRE_MEMORY_HOST);
 
-   (fac_interp_data -> interlevel_comm)= interlevel_comm;
+   (fac_interp_data -> interlevel_comm) = interlevel_comm;
 
    /* interpolation weights */
-   weights= hypre_TAlloc(HYPRE_Real *,  ndim, HYPRE_MEMORY_HOST);
-   for (i= 0; i< ndim; i++)
+   weights = hypre_TAlloc(HYPRE_Real *,  ndim, HYPRE_MEMORY_HOST);
+   for (i = 0; i < ndim; i++)
    {
-      weights[i]= hypre_CTAlloc(HYPRE_Real,  rfactors[i]+1, HYPRE_MEMORY_HOST);
+      weights[i] = hypre_CTAlloc(HYPRE_Real,  rfactors[i] + 1, HYPRE_MEMORY_HOST);
    }
 
    hypre_ClearIndex(refine_factors_half);
-/*   hypre_ClearIndex(refine_factors_2recp);*/
-   for (i= 0; i< ndim; i++)
+   /*   hypre_ClearIndex(refine_factors_2recp);*/
+   for (i = 0; i < ndim; i++)
    {
-      refine_factors_half[i] = rfactors[i]/2;
-      refine_factors_2recp[i]= 1.0/(2.0*rfactors[i]);
+      refine_factors_half[i] = rfactors[i] / 2;
+      refine_factors_2recp[i] = 1.0 / (2.0 * rfactors[i]);
    }
 
-   for (i= 0; i< ndim; i++)
+   for (i = 0; i < ndim; i++)
    {
-      for (j= 0; j<= refine_factors_half[i]; j++)
+      for (j = 0; j <= refine_factors_half[i]; j++)
       {
-         weights[i][j]= refine_factors_2recp[i]*(rfactors[i] + 2*j - 1.0);
+         weights[i][j] = refine_factors_2recp[i] * (rfactors[i] + 2 * j - 1.0);
       }
 
-      for (j= (refine_factors_half[i]+1); j<= rfactors[i]; j++)
+      for (j = (refine_factors_half[i] + 1); j <= rfactors[i]; j++)
       {
-         weights[i][j]= refine_factors_2recp[i]*(2*j - rfactors[i] - 1.0);
+         weights[i][j] = refine_factors_2recp[i] * (2 * j - rfactors[i] - 1.0);
       }
    }
-   (fac_interp_data -> weights)= weights;
+   (fac_interp_data -> weights) = weights;
 
 
    return ierr;
@@ -668,10 +670,10 @@ hypre_FAC_IdentityInterp2(void                 *  fac_interp_vdata,
                           hypre_SStructPVector *  xc,
                           hypre_SStructVector  *  e)
 {
-   hypre_FacSemiInterpData2 *interp_data= (hypre_FacSemiInterpData2 *)fac_interp_vdata;
-   hypre_BoxArrayArray     **identity_boxes= interp_data-> identity_arrayboxes;
+   hypre_FacSemiInterpData2 *interp_data = (hypre_FacSemiInterpData2 *)fac_interp_vdata;
+   hypre_BoxArrayArray     **identity_boxes = interp_data-> identity_arrayboxes;
 
-   HYPRE_Int               part_crse= 0;
+   HYPRE_Int               part_crse = 0;
 
    HYPRE_Int               ierr     = 0;
 
@@ -701,9 +703,9 @@ hypre_FAC_WeightedInterp2(void                  *fac_interp_vdata,
    hypre_FacSemiInterpData2 *interp_data = (hypre_FacSemiInterpData2 *)fac_interp_vdata;
 
    hypre_CommPkg          **comm_pkg       = interp_data-> gnodes_comm_pkg;
-   hypre_CommPkg          **interlevel_comm= interp_data-> interlevel_comm;
+   hypre_CommPkg          **interlevel_comm = interp_data-> interlevel_comm;
    hypre_SStructPVector    *recv_cvectors  = interp_data-> recv_cvectors;
-   HYPRE_Int              **recv_boxnum_map= interp_data-> recv_boxnum_map;
+   HYPRE_Int              **recv_boxnum_map = interp_data-> recv_boxnum_map;
    hypre_BoxArrayArray    **ownboxes       = interp_data-> ownboxes;
    HYPRE_Int             ***own_cboxnums   = interp_data-> own_cboxnums;
    HYPRE_Real             **weights        = interp_data-> weights;
@@ -750,16 +752,16 @@ hypre_FAC_WeightedInterp2(void                  *fac_interp_vdata,
    HYPRE_Int               nvars, var;
 
    HYPRE_Int               i, j, k, offset_ip1, offset_jp1, offset_kp1;
-   HYPRE_Int               ishift, jshift, kshift;
+   HYPRE_Int               ishift, jshift = 0, kshift = 0;
    HYPRE_Int               ptr_ishift, ptr_jshift, ptr_kshift;
    HYPRE_Int               imax, jmax, kmax;
    HYPRE_Int               jsize, ksize;
 
-   HYPRE_Int               part_fine= 1;
+   HYPRE_Int               part_fine = 1;
 
    HYPRE_Real              xweight1, xweight2;
-   HYPRE_Real              yweight1, yweight2;
-   HYPRE_Real              zweight1, zweight2;
+   HYPRE_Real              yweight1 = 0.0, yweight2 = 0.0;
+   HYPRE_Real              zweight1 = 0.0, zweight2 = 0.0;
 
    /*-----------------------------------------------------------------------
     * Initialize some things
@@ -768,18 +770,19 @@ hypre_FAC_WeightedInterp2(void                  *fac_interp_vdata,
    hypre_BoxInit(&refined_box, ndim);
    hypre_BoxInit(&intersect_box, ndim);
 
-   stride        = (interp_data -> stride);
+   stride = (interp_data -> stride);
 
    hypre_SetIndex3(zero_index, 0, 0, 0);
+   hypre_SetIndex3(lindex, 0, 0, 0);
    hypre_CopyIndex(stride, refine_factors);
-   for (i= ndim; i< 3; i++)
+   for (i = ndim; i < 3; i++)
    {
-      refine_factors[i]= 1;
+      refine_factors[i] = 1;
    }
    hypre_SetIndex3(stridec, 1, 1, 1);
-   for (i= 0; i< ndim; i++)
+   for (i = 0; i < ndim; i++)
    {
-      refine_factors_half[i]= refine_factors[i]/2;
+      refine_factors_half[i] = refine_factors[i] / 2;
    }
 
    /*-----------------------------------------------------------------------
@@ -787,10 +790,10 @@ hypre_FAC_WeightedInterp2(void                  *fac_interp_vdata,
     * data. Will need a ghostlayer communication on the given level and an
     * interlevel communication between levels.
     *-----------------------------------------------------------------------*/
-   nvars=  hypre_SStructPVectorNVars(xc);
-   for (var= 0; var< nvars; var++)
+   nvars =  hypre_SStructPVectorNVars(xc);
+   for (var = 0; var < nvars; var++)
    {
-      xc_var= hypre_SStructPVectorSVector(xc, var);
+      xc_var = hypre_SStructPVectorSVector(xc, var);
       hypre_InitializeCommunication(comm_pkg[var],
                                     hypre_StructVectorData(xc_var),
                                     hypre_StructVectorData(xc_var), 0, 0,
@@ -799,7 +802,7 @@ hypre_FAC_WeightedInterp2(void                  *fac_interp_vdata,
 
       if (recv_cvectors != NULL)
       {
-         recv_var= hypre_SStructPVectorSVector(recv_cvectors, var);
+         recv_var = hypre_SStructPVectorSVector(recv_cvectors, var);
          hypre_InitializeCommunication(interlevel_comm[var],
                                        hypre_StructVectorData(xc_var),
                                        hypre_StructVectorData(recv_var), 0, 0,
@@ -808,7 +811,7 @@ hypre_FAC_WeightedInterp2(void                  *fac_interp_vdata,
       }
    }
 
-   e=  hypre_SStructVectorPVector(e_parts, part_fine);
+   e =  hypre_SStructVectorPVector(e_parts, part_fine);
 
    /*-----------------------------------------------------------------------
     * Allocate memory for the data pointers. Assuming linear interpolation.
@@ -822,74 +825,74 @@ hypre_FAC_WeightedInterp2(void                  *fac_interp_vdata,
     *   ndim= 2     kplane= 0     & jplane= 0,1,2    **ptr size [1][3]
     *   ndim= 1     kplane= 0     & jplane= 0        **ptr size [1][1]
     *-----------------------------------------------------------------------*/
-   ksize= 3;
-   jsize= 3;
+   ksize = 3;
+   jsize = 3;
    if (ndim < 3)
    {
-      ksize= 1;
+      ksize = 1;
    }
    if (ndim < 2)
    {
-      jsize= 1;
+      jsize = 1;
    }
 
    xcp  = hypre_TAlloc(HYPRE_Real **,  ksize, HYPRE_MEMORY_HOST);
    ep   = hypre_TAlloc(HYPRE_Real **,  refine_factors[2], HYPRE_MEMORY_HOST);
 
-   for (k= 0; k< refine_factors[2]; k++)
+   for (k = 0; k < refine_factors[2]; k++)
    {
-      ep[k]= hypre_TAlloc(HYPRE_Real *,  refine_factors[1], HYPRE_MEMORY_HOST);
+      ep[k] = hypre_TAlloc(HYPRE_Real *,  refine_factors[1], HYPRE_MEMORY_HOST);
    }
 
-   for (k= 0; k< ksize; k++)
+   for (k = 0; k < ksize; k++)
    {
-      xcp[k]= hypre_TAlloc(HYPRE_Real *,  jsize, HYPRE_MEMORY_HOST);
+      xcp[k] = hypre_TAlloc(HYPRE_Real *,  jsize, HYPRE_MEMORY_HOST);
    }
 
-   for (var= 0; var< nvars; var++)
+   for (var = 0; var < nvars; var++)
    {
-      xc_var= hypre_SStructPVectorSVector(xc, var);
+      xc_var = hypre_SStructPVectorSVector(xc, var);
       e_var = hypre_SStructPVectorSVector(e, var);
 
       fgrid      = hypre_StructVectorGrid(e_var);
-      fgrid_boxes= hypre_StructGridBoxes(fgrid);
+      fgrid_boxes = hypre_StructGridBoxes(fgrid);
 
       own_cboxes = ownboxes[var];
-      var_boxnums= own_cboxnums[var];
+      var_boxnums = own_cboxnums[var];
 
       /*--------------------------------------------------------------------
        * Interpolate the own_box coarse grid values.
        *--------------------------------------------------------------------*/
       hypre_ForBoxI(fi, fgrid_boxes)
       {
-         fbox= hypre_BoxArrayBox(fgrid_boxes, fi);
+         fbox = hypre_BoxArrayBox(fgrid_boxes, fi);
 
-         e_dbox= hypre_BoxArrayBox(hypre_StructVectorDataSpace(e_var), fi);
-         own_abox= hypre_BoxArrayArrayBoxArray(own_cboxes, fi);
-         cboxnums= var_boxnums[fi];
+         e_dbox = hypre_BoxArrayBox(hypre_StructVectorDataSpace(e_var), fi);
+         own_abox = hypre_BoxArrayArrayBoxArray(own_cboxes, fi);
+         cboxnums = var_boxnums[fi];
 
          /*--------------------------------------------------------------------
           * Get the ptrs for the fine struct_vectors.
           *--------------------------------------------------------------------*/
-         for (k= 0; k< refine_factors[2]; k++)
+         for (k = 0; k < refine_factors[2]; k++)
          {
-            for (j=0; j< refine_factors[1]; j++)
+            for (j = 0; j < refine_factors[1]; j++)
             {
                hypre_SetIndex3(temp_index1, 0, j, k);
-               ep[k][j]= hypre_StructVectorBoxData(e_var, fi) +
-                  hypre_BoxOffsetDistance(e_dbox, temp_index1);
+               ep[k][j] = hypre_StructVectorBoxData(e_var, fi) +
+                          hypre_BoxOffsetDistance(e_dbox, temp_index1);
             }
          }
 
          hypre_ForBoxI(bi, own_abox)
          {
-            ownbox= hypre_BoxArrayBox(own_abox, bi);
+            ownbox = hypre_BoxArrayBox(own_abox, bi);
             hypre_StructMapCoarseToFine(hypre_BoxIMin(ownbox), zero_index,
                                         refine_factors, hypre_BoxIMin(&refined_box));
             hypre_ClearIndex(temp_index1);
-            for (j= 0; j< ndim; j++)
+            for (j = 0; j < ndim; j++)
             {
-               temp_index1[j]= refine_factors[j]-1;
+               temp_index1[j] = refine_factors[j] - 1;
             }
             hypre_StructMapCoarseToFine(hypre_BoxIMax(ownbox), temp_index1,
                                         refine_factors, hypre_BoxIMax(&refined_box));
@@ -908,9 +911,9 @@ hypre_FAC_WeightedInterp2(void                  *fac_interp_vdata,
              *-----------------------------------------------------------------*/
             hypre_CopyIndex(hypre_BoxIMin(&intersect_box), start);
             hypre_CopyIndex(hypre_BoxIMax(&intersect_box), intersect_size);
-            for (i= 0; i< 3; i++)
+            for (i = 0; i < 3; i++)
             {
-               intersect_size[i]-= (start[i]-1);
+               intersect_size[i] -= (start[i] - 1);
             }
 
             /*------------------------------------------------------------------
@@ -923,36 +926,36 @@ hypre_FAC_WeightedInterp2(void                  *fac_interp_vdata,
              * by refine_factors. We do the calculation anyways for future changes.
              *------------------------------------------------------------------*/
             hypre_ClearIndex(start_offset);
-            for (i= 0; i< ndim; i++)
+            for (i = 0; i < ndim; i++)
             {
-               start_offset[i]= start[i] % refine_factors[i];
+               start_offset[i] = start[i] % refine_factors[i];
             }
 
-            ptr_kshift= 0;
-            if ( (start[2]%refine_factors[2] < refine_factors_half[2]) && ndim == 3 )
+            ptr_kshift = 0;
+            if ( (start[2] % refine_factors[2] < refine_factors_half[2]) && ndim == 3 )
             {
-               ptr_kshift= -1;
+               ptr_kshift = -1;
             }
 
-            ptr_jshift= 0;
-            if ( start[1]%refine_factors[1] < refine_factors_half[1] && ndim >= 2 )
+            ptr_jshift = 0;
+            if ( start[1] % refine_factors[1] < refine_factors_half[1] && ndim >= 2 )
             {
-               ptr_jshift= -1;
+               ptr_jshift = -1;
             }
 
-            ptr_ishift= 0;
-            if ( start[0]%refine_factors[0] < refine_factors_half[0] )
+            ptr_ishift = 0;
+            if ( start[0] % refine_factors[0] < refine_factors_half[0] )
             {
-               ptr_ishift= -1;
+               ptr_ishift = -1;
             }
 
-            for (k= 0; k< ksize; k++)
+            for (k = 0; k < ksize; k++)
             {
-               for (j=0; j< jsize; j++)
+               for (j = 0; j < jsize; j++)
                {
-                  hypre_SetIndex3(temp_index2, ptr_ishift, j+ptr_jshift, k+ptr_kshift);
-                  xcp[k][j]= hypre_StructVectorBoxData(xc_var, cboxnums[bi]) +
-                     hypre_BoxOffsetDistance(xc_dbox, temp_index2);
+                  hypre_SetIndex3(temp_index2, ptr_ishift, j + ptr_jshift, k + ptr_kshift);
+                  xcp[k][j] = hypre_StructVectorBoxData(xc_var, cboxnums[bi]) +
+                              hypre_BoxOffsetDistance(xc_dbox, temp_index2);
                }
             }
 
@@ -971,95 +974,94 @@ hypre_FAC_WeightedInterp2(void                  *fac_interp_vdata,
                 * extents are needed.
                 *--------------------------------------------------------*/
                zypre_BoxLoopGetIndex(lindex);
-               imax= hypre_min( (intersect_size[0]-lindex[0]*stride[0]),
-                                refine_factors[0] );
-               jmax= hypre_min( (intersect_size[1]-lindex[1]*stride[1]),
-                                refine_factors[1]);
-               kmax= hypre_min( (intersect_size[2]-lindex[2]*stride[2]),
-                                refine_factors[2]);
-
-               for (k= 0; k< kmax; k++)
+               imax = hypre_min( (intersect_size[0] - lindex[0] * stride[0]),
+                                 refine_factors[0] );
+               jmax = hypre_min( (intersect_size[1] - lindex[1] * stride[1]),
+                                 refine_factors[1]);
+               kmax = hypre_min( (intersect_size[2] - lindex[2] * stride[2]),
+                                 refine_factors[2]);
+
+               for (k = 0; k < kmax; k++)
                {
                   if (ndim == 3)
                   {
-                     offset_kp1= start_offset[2]+k+1;
+                     offset_kp1 = start_offset[2] + k + 1;
 
                      if (ptr_kshift == -1)
                      {
                         if (offset_kp1 <= refine_factors_half[2])
                         {
-                           zweight2= weights[2][offset_kp1];
-                           kshift= 0;
+                           zweight2 = weights[2][offset_kp1];
+                           kshift = 0;
                         }
                         else
                         {
-                           kshift= 1;
+                           kshift = 1;
                            if (offset_kp1 >  refine_factors_half[2] &&
                                offset_kp1 <= refine_factors[2])
                            {
-                              zweight2= weights[2][offset_kp1];
+                              zweight2 = weights[2][offset_kp1];
                            }
                            else
                            {
-                              zweight2= weights[2][offset_kp1-refine_factors[2]];
+                              zweight2 = weights[2][offset_kp1 - refine_factors[2]];
                            }
                         }
-                        zweight1= 1.0 - zweight2;
+                        zweight1 = 1.0 - zweight2;
                      }
-
                      else
                      {
                         if (offset_kp1 > refine_factors_half[2] &&
                             offset_kp1 <= refine_factors[2])
                         {
-                           zweight2= weights[2][offset_kp1];
-                           kshift= 0;
+                           zweight2 = weights[2][offset_kp1];
+                           kshift = 0;
                         }
                         else
                         {
-                           kshift= 0;
-                           offset_kp1-= refine_factors[2];
+                           kshift = 0;
+                           offset_kp1 -= refine_factors[2];
                            if (offset_kp1 > 0 && offset_kp1 <= refine_factors_half[2])
                            {
-                              zweight2= weights[2][offset_kp1];
+                              zweight2 = weights[2][offset_kp1];
                            }
                            else
                            {
-                              zweight2= weights[2][offset_kp1];
+                              zweight2 = weights[2][offset_kp1];
                               kshift  = 1;
                            }
                         }
-                        zweight1= 1.0 - zweight2;
+                        zweight1 = 1.0 - zweight2;
                      }
                   }     /* if (ndim == 3) */
 
-                  for (j= 0; j< jmax; j++)
+                  for (j = 0; j < jmax; j++)
                   {
                      if (ndim >= 2)
                      {
-                        offset_jp1= start_offset[1]+j+1;
+                        offset_jp1 = start_offset[1] + j + 1;
 
                         if (ptr_jshift == -1)
                         {
                            if (offset_jp1 <= refine_factors_half[1])
                            {
-                              yweight2= weights[1][offset_jp1];
-                              jshift= 0;
+                              yweight2 = weights[1][offset_jp1];
+                              jshift = 0;
                            }
                            else
                            {
-                              jshift= 1;
+                              jshift = 1;
                               if (offset_jp1 >  refine_factors_half[1] &&
                                   offset_jp1 <= refine_factors[1])
                               {
-                                 yweight2= weights[1][offset_jp1];
+                                 yweight2 = weights[1][offset_jp1];
                               }
                               else
                               {
-                                 yweight2= weights[1][offset_jp1-refine_factors[1]];
+                                 yweight2 = weights[1][offset_jp1 - refine_factors[1]];
                               }
                            }
-                           yweight1= 1.0 - yweight2;
+                           yweight1 = 1.0 - yweight2;
                         }
 
                         else
@@ -1067,52 +1069,52 @@ hypre_FAC_WeightedInterp2(void                  *fac_interp_vdata,
                            if (offset_jp1 > refine_factors_half[1] &&
                                offset_jp1 <= refine_factors[1])
                            {
-                              yweight2= weights[1][offset_jp1];
-                              jshift= 0;
+                              yweight2 = weights[1][offset_jp1];
+                              jshift = 0;
                            }
                            else
                            {
-                              jshift= 0;
-                              offset_jp1-= refine_factors[1];
+                              jshift = 0;
+                              offset_jp1 -= refine_factors[1];
                               if (offset_jp1 > 0 && offset_jp1 <= refine_factors_half[1])
                               {
-                                 yweight2= weights[1][offset_jp1];
+                                 yweight2 = weights[1][offset_jp1];
                               }
                               else
                               {
-                                 yweight2= weights[1][offset_jp1];
+                                 yweight2 = weights[1][offset_jp1];
                                  jshift  = 1;
                               }
                            }
-                           yweight1= 1.0 - yweight2;
+                           yweight1 = 1.0 - yweight2;
                         }
                      }     /* if (ndim >= 2) */
 
-                     for (i= 0; i< imax; i++)
+                     for (i = 0; i < imax; i++)
                      {
-                        offset_ip1= start_offset[0]+i+1;
+                        offset_ip1 = start_offset[0] + i + 1;
 
                         if (ptr_ishift == -1)
                         {
                            if (offset_ip1 <= refine_factors_half[0])
                            {
-                              xweight2= weights[0][offset_ip1];
-                              ishift= 0;
+                              xweight2 = weights[0][offset_ip1];
+                              ishift = 0;
                            }
                            else
                            {
-                              ishift= 1;
+                              ishift = 1;
                               if (offset_ip1 >  refine_factors_half[0] &&
                                   offset_ip1 <= refine_factors[0])
                               {
-                                 xweight2= weights[0][offset_ip1];
+                                 xweight2 = weights[0][offset_ip1];
                               }
                               else
                               {
-                                 xweight2= weights[0][offset_ip1-refine_factors[0]];
+                                 xweight2 = weights[0][offset_ip1 - refine_factors[0]];
                               }
                            }
-                           xweight1= 1.0 - xweight2;
+                           xweight1 = 1.0 - xweight2;
                         }
 
                         else
@@ -1120,56 +1122,56 @@ hypre_FAC_WeightedInterp2(void                  *fac_interp_vdata,
                            if (offset_ip1 > refine_factors_half[0] &&
                                offset_ip1 <= refine_factors[0])
                            {
-                              xweight2= weights[0][offset_ip1];
-                              ishift= 0;
+                              xweight2 = weights[0][offset_ip1];
+                              ishift = 0;
                            }
                            else
                            {
-                              ishift= 0;
-                              offset_ip1-= refine_factors[0];
+                              ishift = 0;
+                              offset_ip1 -= refine_factors[0];
                               if (offset_ip1 > 0 && offset_ip1 <= refine_factors_half[0])
                               {
-                                 xweight2= weights[0][offset_ip1];
+                                 xweight2 = weights[0][offset_ip1];
                               }
                               else
                               {
-                                 xweight2= weights[0][offset_ip1];
+                                 xweight2 = weights[0][offset_ip1];
                                  ishift  = 1;
                               }
                            }
-                           xweight1= 1.0 - xweight2;
+                           xweight1 = 1.0 - xweight2;
                         }
 
                         if (ndim == 3)
                         {
-                           ep[k][j][ei+i]= zweight1*(
-                              yweight1*(
-                                 xweight1*xcp[kshift][jshift][ishift+xci]+
-                                 xweight2*xcp[kshift][jshift][ishift+xci+1])
-                              +yweight2*(
-                                 xweight1*xcp[kshift][jshift+1][ishift+xci]+
-                                 xweight2*xcp[kshift][jshift+1][ishift+xci+1]) )
-                              + zweight2*(
-                                 yweight1*(
-                                    xweight1*xcp[kshift+1][jshift][ishift+xci]+
-                                    xweight2*xcp[kshift+1][jshift][ishift+xci+1])
-                                 +yweight2*(
-                                    xweight1*xcp[kshift+1][jshift+1][ishift+xci]+
-                                    xweight2*xcp[kshift+1][jshift+1][ishift+xci+1]) );
+                           ep[k][j][ei + i] = zweight1 * (
+                                                 yweight1 * (
+                                                    xweight1 * xcp[kshift][jshift][ishift + xci] +
+                                                    xweight2 * xcp[kshift][jshift][ishift + xci + 1])
+                                                 + yweight2 * (
+                                                    xweight1 * xcp[kshift][jshift + 1][ishift + xci] +
+                                                    xweight2 * xcp[kshift][jshift + 1][ishift + xci + 1]) )
+                                              + zweight2 * (
+                                                 yweight1 * (
+                                                    xweight1 * xcp[kshift + 1][jshift][ishift + xci] +
+                                                    xweight2 * xcp[kshift + 1][jshift][ishift + xci + 1])
+                                                 + yweight2 * (
+                                                    xweight1 * xcp[kshift + 1][jshift + 1][ishift + xci] +
+                                                    xweight2 * xcp[kshift + 1][jshift + 1][ishift + xci + 1]) );
                         }
                         else if (ndim == 2)
                         {
-                           ep[0][j][ei+i] = yweight1*(
-                              xweight1*xcp[0][jshift][ishift+xci]+
-                              xweight2*xcp[0][jshift][ishift+xci+1]);
-                           ep[0][j][ei+i]+= yweight2*(
-                              xweight1*xcp[0][jshift+1][ishift+xci]+
-                              xweight2*xcp[0][jshift+1][ishift+xci+1]);
+                           ep[0][j][ei + i] = yweight1 * (
+                                                 xweight1 * xcp[0][jshift][ishift + xci] +
+                                                 xweight2 * xcp[0][jshift][ishift + xci + 1]);
+                           ep[0][j][ei + i] += yweight2 * (
+                                                  xweight1 * xcp[0][jshift + 1][ishift + xci] +
+                                                  xweight2 * xcp[0][jshift + 1][ishift + xci + 1]);
                         }
                         else
                         {
-                           ep[0][0][ei+i] = xweight1*xcp[0][0][ishift+xci]+
-                              xweight2*xcp[0][0][ishift+xci+1];
+                           ep[0][0][ei + i] = xweight1 * xcp[0][0][ishift + xci] +
+                                              xweight2 * xcp[0][0][ishift + xci + 1];
                         }
                      }      /* for (i= 0; i< imax; i++) */
                   }         /* for (j= 0; j< jmax; j++) */
@@ -1192,37 +1194,37 @@ hypre_FAC_WeightedInterp2(void                  *fac_interp_vdata,
 
       hypre_ForBoxI(bi, own_abox)
       {
-         ownbox= hypre_BoxArrayBox(own_abox, bi);
+         ownbox = hypre_BoxArrayBox(own_abox, bi);
 
          /*check for boxes of volume zero- i.e., recv_cvectors is really null.*/
          if (hypre_BoxVolume(ownbox))
          {
-            xc_dbox= hypre_BoxArrayBox(
-               hypre_StructVectorDataSpace(recv_var), bi);
+            xc_dbox = hypre_BoxArrayBox(
+                         hypre_StructVectorDataSpace(recv_var), bi);
 
-            fi= cboxnums[bi];
+            fi = cboxnums[bi];
             fbox  = hypre_BoxArrayBox(fgrid_boxes, fi);
-            e_dbox= hypre_BoxArrayBox(hypre_StructVectorDataSpace(e_var), fi);
+            e_dbox = hypre_BoxArrayBox(hypre_StructVectorDataSpace(e_var), fi);
 
             /*------------------------------------------------------------------
              * Get the ptrs for the fine struct_vectors.
              *------------------------------------------------------------------*/
-            for (k= 0; k< refine_factors[2]; k++)
+            for (k = 0; k < refine_factors[2]; k++)
             {
-               for (j=0; j< refine_factors[1]; j++)
+               for (j = 0; j < refine_factors[1]; j++)
                {
                   hypre_SetIndex3(temp_index1, 0, j, k);
-                  ep[k][j]= hypre_StructVectorBoxData(e_var, fi) +
-                     hypre_BoxOffsetDistance(e_dbox, temp_index1);
+                  ep[k][j] = hypre_StructVectorBoxData(e_var, fi) +
+                             hypre_BoxOffsetDistance(e_dbox, temp_index1);
                }
             }
 
             hypre_StructMapCoarseToFine(hypre_BoxIMin(ownbox), zero_index,
                                         refine_factors, hypre_BoxIMin(&refined_box));
             hypre_ClearIndex(temp_index1);
-            for (j= 0; j< ndim; j++)
+            for (j = 0; j < ndim; j++)
             {
-               temp_index1[j]= refine_factors[j]-1;
+               temp_index1[j] = refine_factors[j] - 1;
             }
             hypre_StructMapCoarseToFine(hypre_BoxIMax(ownbox), temp_index1,
                                         refine_factors, hypre_BoxIMax(&refined_box));
@@ -1238,9 +1240,9 @@ hypre_FAC_WeightedInterp2(void                  *fac_interp_vdata,
              *-----------------------------------------------------------------*/
             hypre_CopyIndex(hypre_BoxIMin(&intersect_box), start);
             hypre_CopyIndex(hypre_BoxIMax(&intersect_box), intersect_size);
-            for (i= 0; i< 3; i++)
+            for (i = 0; i < 3; i++)
             {
-               intersect_size[i]-= (start[i]-1);
+               intersect_size[i] -= (start[i] - 1);
             }
 
             /*------------------------------------------------------------------
@@ -1253,37 +1255,37 @@ hypre_FAC_WeightedInterp2(void                  *fac_interp_vdata,
              * by refine_factors. We do the calculation anyways for future changes.
              *------------------------------------------------------------------*/
             hypre_ClearIndex(start_offset);
-            for (i= 0; i< ndim; i++)
+            for (i = 0; i < ndim; i++)
             {
-               start_offset[i]= start[i] % refine_factors[i];
+               start_offset[i] = start[i] % refine_factors[i];
             }
 
-            ptr_kshift= 0;
-            if ((start[2]%refine_factors[2]<refine_factors_half[2]) && ndim==3)
+            ptr_kshift = 0;
+            if ((start[2] % refine_factors[2] < refine_factors_half[2]) && ndim == 3)
             {
-               ptr_kshift= -1;
+               ptr_kshift = -1;
             }
 
-            ptr_jshift= 0;
-            if ((start[1]%refine_factors[1]<refine_factors_half[1]) && ndim>=2)
+            ptr_jshift = 0;
+            if ((start[1] % refine_factors[1] < refine_factors_half[1]) && ndim >= 2)
             {
-               ptr_jshift= -1;
+               ptr_jshift = -1;
             }
 
-            ptr_ishift= 0;
-            if ( start[0]%refine_factors[0] < refine_factors_half[0] )
+            ptr_ishift = 0;
+            if ( start[0] % refine_factors[0] < refine_factors_half[0] )
             {
-               ptr_ishift= -1;
+               ptr_ishift = -1;
             }
 
-            for (k= 0; k< ksize; k++)
+            for (k = 0; k < ksize; k++)
             {
-               for (j=0; j< jsize; j++)
+               for (j = 0; j < jsize; j++)
                {
                   hypre_SetIndex3(temp_index2,
-                                  ptr_ishift, j+ptr_jshift, k+ptr_kshift);
-                  xcp[k][j]= hypre_StructVectorBoxData(recv_var, bi) +
-                     hypre_BoxOffsetDistance(xc_dbox, temp_index2);
+                                  ptr_ishift, j + ptr_jshift, k + ptr_kshift);
+                  xcp[k][j] = hypre_StructVectorBoxData(recv_var, bi) +
+                              hypre_BoxOffsetDistance(xc_dbox, temp_index2);
                }
             }
 
@@ -1302,40 +1304,40 @@ hypre_FAC_WeightedInterp2(void                  *fac_interp_vdata,
                 * extents are needed.
                 *--------------------------------------------------------*/
                zypre_BoxLoopGetIndex(lindex);
-               imax= hypre_min( (intersect_size[0]-lindex[0]*stride[0]),
-                                refine_factors[0] );
-               jmax= hypre_min( (intersect_size[1]-lindex[1]*stride[1]),
-                                refine_factors[1]);
-               kmax= hypre_min( (intersect_size[2]-lindex[2]*stride[2]),
-                                refine_factors[2]);
-
-               for (k= 0; k< kmax; k++)
+               imax = hypre_min( (intersect_size[0] - lindex[0] * stride[0]),
+                                 refine_factors[0] );
+               jmax = hypre_min( (intersect_size[1] - lindex[1] * stride[1]),
+                                 refine_factors[1]);
+               kmax = hypre_min( (intersect_size[2] - lindex[2] * stride[2]),
+                                 refine_factors[2]);
+
+               for (k = 0; k < kmax; k++)
                {
                   if (ndim == 3)
                   {
-                     offset_kp1= start_offset[2]+k+1;
+                     offset_kp1 = start_offset[2] + k + 1;
 
                      if (ptr_kshift == -1)
                      {
                         if (offset_kp1 <= refine_factors_half[2])
                         {
-                           zweight2= weights[2][offset_kp1];
-                           kshift= 0;
+                           zweight2 = weights[2][offset_kp1];
+                           kshift = 0;
                         }
                         else
                         {
-                           kshift= 1;
+                           kshift = 1;
                            if (offset_kp1 >  refine_factors_half[2] &&
                                offset_kp1 <= refine_factors[2])
                            {
-                              zweight2= weights[2][offset_kp1];
+                              zweight2 = weights[2][offset_kp1];
                            }
                            else
                            {
-                              zweight2= weights[2][offset_kp1-refine_factors[2]];
+                              zweight2 = weights[2][offset_kp1 - refine_factors[2]];
                            }
                         }
-                        zweight1= 1.0 - zweight2;
+                        zweight1 = 1.0 - zweight2;
                      }
 
                      else
@@ -1343,54 +1345,54 @@ hypre_FAC_WeightedInterp2(void                  *fac_interp_vdata,
                         if (offset_kp1 > refine_factors_half[2] &&
                             offset_kp1 <= refine_factors[2])
                         {
-                           zweight2= weights[2][offset_kp1];
-                           kshift= 0;
+                           zweight2 = weights[2][offset_kp1];
+                           kshift = 0;
                         }
                         else
                         {
-                           kshift= 0;
-                           offset_kp1-= refine_factors[2];
+                           kshift = 0;
+                           offset_kp1 -= refine_factors[2];
                            if (offset_kp1 > 0 && offset_kp1 <= refine_factors_half[2])
                            {
-                              zweight2= weights[2][offset_kp1];
+                              zweight2 = weights[2][offset_kp1];
                            }
                            else
                            {
-                              zweight2= weights[2][offset_kp1];
+                              zweight2 = weights[2][offset_kp1];
                               kshift  = 1;
                            }
                         }
-                        zweight1= 1.0 - zweight2;
+                        zweight1 = 1.0 - zweight2;
                      }
                   }     /* if (ndim == 3) */
 
-                  for (j= 0; j< jmax; j++)
+                  for (j = 0; j < jmax; j++)
                   {
                      if (ndim >= 2)
                      {
-                        offset_jp1= start_offset[1]+j+1;
+                        offset_jp1 = start_offset[1] + j + 1;
 
                         if (ptr_jshift == -1)
                         {
                            if (offset_jp1 <= refine_factors_half[1])
                            {
-                              yweight2= weights[1][offset_jp1];
-                              jshift= 0;
+                              yweight2 = weights[1][offset_jp1];
+                              jshift = 0;
                            }
                            else
                            {
-                              jshift= 1;
+                              jshift = 1;
                               if (offset_jp1 >  refine_factors_half[1] &&
                                   offset_jp1 <= refine_factors[1])
                               {
-                                 yweight2= weights[1][offset_jp1];
+                                 yweight2 = weights[1][offset_jp1];
                               }
                               else
                               {
-                                 yweight2= weights[1][offset_jp1-refine_factors[1]];
+                                 yweight2 = weights[1][offset_jp1 - refine_factors[1]];
                               }
                            }
-                           yweight1= 1.0 - yweight2;
+                           yweight1 = 1.0 - yweight2;
                         }
 
                         else
@@ -1398,52 +1400,52 @@ hypre_FAC_WeightedInterp2(void                  *fac_interp_vdata,
                            if (offset_jp1 > refine_factors_half[1] &&
                                offset_jp1 <= refine_factors[1])
                            {
-                              yweight2= weights[1][offset_jp1];
-                              jshift= 0;
+                              yweight2 = weights[1][offset_jp1];
+                              jshift = 0;
                            }
                            else
                            {
-                              jshift= 0;
-                              offset_jp1-= refine_factors[1];
+                              jshift = 0;
+                              offset_jp1 -= refine_factors[1];
                               if (offset_jp1 > 0 && offset_jp1 <= refine_factors_half[1])
                               {
-                                 yweight2= weights[1][offset_jp1];
+                                 yweight2 = weights[1][offset_jp1];
                               }
                               else
                               {
-                                 yweight2= weights[1][offset_jp1];
+                                 yweight2 = weights[1][offset_jp1];
                                  jshift  = 1;
                               }
                            }
-                           yweight1= 1.0 - yweight2;
+                           yweight1 = 1.0 - yweight2;
                         }
                      }  /* if (ndim >= 2) */
 
-                     for (i= 0; i< imax; i++)
+                     for (i = 0; i < imax; i++)
                      {
-                        offset_ip1= start_offset[0]+i+1;
+                        offset_ip1 = start_offset[0] + i + 1;
 
                         if (ptr_ishift == -1)
                         {
                            if (offset_ip1 <= refine_factors_half[0])
                            {
-                              xweight2= weights[0][offset_ip1];
-                              ishift= 0;
+                              xweight2 = weights[0][offset_ip1];
+                              ishift = 0;
                            }
                            else
                            {
-                              ishift= 1;
+                              ishift = 1;
                               if (offset_ip1 >  refine_factors_half[0] &&
                                   offset_ip1 <= refine_factors[0])
                               {
-                                 xweight2= weights[0][offset_ip1];
+                                 xweight2 = weights[0][offset_ip1];
                               }
                               else
                               {
-                                 xweight2= weights[0][offset_ip1-refine_factors[0]];
+                                 xweight2 = weights[0][offset_ip1 - refine_factors[0]];
                               }
                            }
-                           xweight1= 1.0 - xweight2;
+                           xweight1 = 1.0 - xweight2;
                         }
 
                         else
@@ -1451,58 +1453,58 @@ hypre_FAC_WeightedInterp2(void                  *fac_interp_vdata,
                            if (offset_ip1 > refine_factors_half[0] &&
                                offset_ip1 <= refine_factors[0])
                            {
-                              xweight2= weights[0][offset_ip1];
-                              ishift= 0;
+                              xweight2 = weights[0][offset_ip1];
+                              ishift = 0;
                            }
                            else
                            {
-                              ishift= 0;
-                              offset_ip1-= refine_factors[0];
+                              ishift = 0;
+                              offset_ip1 -= refine_factors[0];
                               if (offset_ip1 > 0 && offset_ip1 <= refine_factors_half[0])
                               {
-                                 xweight2= weights[0][offset_ip1];
+                                 xweight2 = weights[0][offset_ip1];
                               }
                               else
                               {
-                                 xweight2= weights[0][offset_ip1];
+                                 xweight2 = weights[0][offset_ip1];
                                  ishift  = 1;
                               }
                            }
-                           xweight1= 1.0 - xweight2;
+                           xweight1 = 1.0 - xweight2;
                         }
 
 
                         if (ndim == 3)
                         {
-                           ep[k][j][ei+i]= zweight1*(
-                              yweight1*(
-                                 xweight1*xcp[kshift][jshift][ishift+xci]+
-                                 xweight2*xcp[kshift][jshift][ishift+xci+1])
-                              +yweight2*(
-                                 xweight1*xcp[kshift][jshift+1][ishift+xci]+
-                                 xweight2*xcp[kshift][jshift+1][ishift+xci+1]) )
-                              + zweight2*(
-                                 yweight1*(
-                                    xweight1*xcp[kshift+1][jshift][ishift+xci]+
-                                    xweight2*xcp[kshift+1][jshift][ishift+xci+1])
-                                 +yweight2*(
-                                    xweight1*xcp[kshift+1][jshift+1][ishift+xci]+
-                                    xweight2*xcp[kshift+1][jshift+1][ishift+xci+1]) );
+                           ep[k][j][ei + i] = zweight1 * (
+                                                 yweight1 * (
+                                                    xweight1 * xcp[kshift][jshift][ishift + xci] +
+                                                    xweight2 * xcp[kshift][jshift][ishift + xci + 1])
+                                                 + yweight2 * (
+                                                    xweight1 * xcp[kshift][jshift + 1][ishift + xci] +
+                                                    xweight2 * xcp[kshift][jshift + 1][ishift + xci + 1]) )
+                                              + zweight2 * (
+                                                 yweight1 * (
+                                                    xweight1 * xcp[kshift + 1][jshift][ishift + xci] +
+                                                    xweight2 * xcp[kshift + 1][jshift][ishift + xci + 1])
+                                                 + yweight2 * (
+                                                    xweight1 * xcp[kshift + 1][jshift + 1][ishift + xci] +
+                                                    xweight2 * xcp[kshift + 1][jshift + 1][ishift + xci + 1]) );
                         }
                         else if (ndim == 2)
                         {
-                           ep[0][j][ei+i] = yweight1*(
-                              xweight1*xcp[0][jshift][ishift+xci]+
-                              xweight2*xcp[0][jshift][ishift+xci+1]);
-                           ep[0][j][ei+i]+= yweight2*(
-                              xweight1*xcp[0][jshift+1][ishift+xci]+
-                              xweight2*xcp[0][jshift+1][ishift+xci+1]);
+                           ep[0][j][ei + i] = yweight1 * (
+                                                 xweight1 * xcp[0][jshift][ishift + xci] +
+                                                 xweight2 * xcp[0][jshift][ishift + xci + 1]);
+                           ep[0][j][ei + i] += yweight2 * (
+                                                  xweight1 * xcp[0][jshift + 1][ishift + xci] +
+                                                  xweight2 * xcp[0][jshift + 1][ishift + xci + 1]);
                         }
 
                         else
                         {
-                           ep[0][0][ei+i] = xweight1*xcp[0][0][ishift+xci]+
-                              xweight2*xcp[0][0][ishift+xci+1];
+                           ep[0][0][ei + i] = xweight1 * xcp[0][0][ishift + xci] +
+                                              xweight2 * xcp[0][0][ishift + xci + 1];
                         }
 
                      }      /* for (i= 0; i< imax; i++) */
@@ -1515,13 +1517,13 @@ hypre_FAC_WeightedInterp2(void                  *fac_interp_vdata,
       }     /* hypre_ForBoxI(bi, own_abox) */
    }         /* for (var= 0; var< nvars; var++)*/
 
-   for (k= 0; k< ksize; k++)
+   for (k = 0; k < ksize; k++)
    {
       hypre_TFree(xcp[k], HYPRE_MEMORY_HOST);
    }
    hypre_TFree(xcp, HYPRE_MEMORY_HOST);
 
-   for (k= 0; k< refine_factors[2]; k++)
+   for (k = 0; k < refine_factors[2]; k++)
    {
       hypre_TFree(ep[k], HYPRE_MEMORY_HOST);
    }
diff --git a/external/hypre/src/sstruct_ls/fac_relax.c b/external/hypre/src/sstruct_ls/fac_relax.c
index 9f228d7d..b111ebe1 100644
--- a/external/hypre/src/sstruct_ls/fac_relax.c
+++ b/external/hypre/src/sstruct_ls/fac_relax.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/sstruct_ls/fac_restrict2.c b/external/hypre/src/sstruct_ls/fac_restrict2.c
index 935b6514..36b7bf45 100644
--- a/external/hypre/src/sstruct_ls/fac_restrict2.c
+++ b/external/hypre/src/sstruct_ls/fac_restrict2.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -55,9 +55,9 @@ typedef struct
    HYPRE_Int          ***own_cboxnums;       /* local crs boxnums of ownboxes */
 
    hypre_CommPkg       **interlevel_comm;
-/*   hypre_CommPkg       **intralevel_comm;*/ /* may need to build an intra comm so
-     that each processor only fullwts its
-     own fine data- may need to add contrib */
+   /*   hypre_CommPkg       **intralevel_comm;*/ /* may need to build an intra comm so
+        that each processor only fullwts its
+        own fine data- may need to add contrib */
 
 } hypre_FacSemiRestrictData2;
 
@@ -106,11 +106,11 @@ hypre_FacSemiRestrictSetup2( void                 *fac_restrict_vdata,
    HYPRE_Int                 ierr = 0;
 
    hypre_FacSemiRestrictData2 *fac_restrict_data = (hypre_FacSemiRestrictData2 *)fac_restrict_vdata;
-   MPI_Comm                    comm= hypre_SStructPVectorComm(rc);
+   MPI_Comm                    comm = hypre_SStructPVectorComm(rc);
    hypre_CommInfo             *comm_info;
    hypre_CommPkg             **interlevel_comm;
 
-   hypre_SStructPVector       *rf= hypre_SStructVectorPVector(r, part_fine);
+   hypre_SStructPVector       *rf = hypre_SStructVectorPVector(r, part_fine);
    hypre_StructVector         *s_rc, *s_cvector;
    hypre_SStructPGrid         *pgrid;
 
@@ -138,7 +138,7 @@ hypre_FacSemiRestrictSetup2( void                 *fac_restrict_vdata,
    hypre_Box                   box, scaled_box;
 
    hypre_Index                 zero_index, index, ilower, iupper;
-   HYPRE_Int                   ndim= hypre_SStructVectorNDim(r);
+   HYPRE_Int                   ndim = hypre_SStructVectorNDim(r);
    HYPRE_Int                   myproc, proc;
    HYPRE_Int                   nvars, vars;
    HYPRE_Int                   num_values;
@@ -152,20 +152,20 @@ hypre_FacSemiRestrictSetup2( void                 *fac_restrict_vdata,
    hypre_MPI_Comm_rank(comm, &myproc);
    hypre_ClearIndex(zero_index);
 
-   nvars= hypre_SStructPVectorNVars(rc);
-   (fac_restrict_data -> nvars)=  nvars;
+   nvars = hypre_SStructPVectorNVars(rc);
+   (fac_restrict_data -> nvars) =  nvars;
    hypre_CopyIndex(rfactors, (fac_restrict_data -> stride));
-   for (i= ndim; i< 3; i++)
+   for (i = ndim; i < 3; i++)
    {
-      rfactors[i]= 1;
+      rfactors[i] = 1;
    }
 
    /* work vector for storing the fullweighted fgrid boxes */
    hypre_SStructPGridCreate(hypre_SStructPVectorComm(rf), ndim, &fgrid_coarsen);
-   pgrid= hypre_SStructPVectorPGrid(rf);
-   for (vars= 0; vars< nvars; vars++)
+   pgrid = hypre_SStructPVectorPGrid(rf);
+   for (vars = 0; vars < nvars; vars++)
    {
-      boxarray= hypre_StructGridBoxes(hypre_SStructPGridSGrid(pgrid, vars));
+      boxarray = hypre_StructGridBoxes(hypre_SStructPGridSGrid(pgrid, vars));
       hypre_ForBoxI(fi, boxarray)
       {
          hypre_CopyBox(hypre_BoxArrayBox(boxarray, fi), &box);
@@ -190,7 +190,7 @@ hypre_FacSemiRestrictSetup2( void                 *fac_restrict_vdata,
    /* pgrid fgrid_coarsen no longer needed */
    hypre_SStructPGridDestroy(fgrid_coarsen);
 
-   fac_restrict_data -> fgrid_cvectors= fgrid_cvectors;
+   fac_restrict_data -> fgrid_cvectors = fgrid_cvectors;
 
    /*--------------------------------------------------------------------------
     * boxes that are not underlying a fine box:
@@ -206,23 +206,23 @@ hypre_FacSemiRestrictSetup2( void                 *fac_restrict_vdata,
     * will be subtracted from the cbox. Contraction can erroneously lead
     * to bigger identity boxes.
     *--------------------------------------------------------------------------*/
-   identity_arrayboxes= hypre_CTAlloc(hypre_BoxArrayArray *,  nvars, HYPRE_MEMORY_HOST);
-   pgrid= hypre_SStructPVectorPGrid(rc);
+   identity_arrayboxes = hypre_CTAlloc(hypre_BoxArrayArray *,  nvars, HYPRE_MEMORY_HOST);
+   pgrid = hypre_SStructPVectorPGrid(rc);
 
    hypre_ClearIndex(index);
-   for (i= 0; i< ndim; i++)
+   for (i = 0; i < ndim; i++)
    {
-      index[i]= rfactors[i]-1;
+      index[i] = rfactors[i] - 1;
    }
 
    tmp_boxarray = hypre_BoxArrayCreate(0, ndim);
-   for (vars= 0; vars< nvars; vars++)
+   for (vars = 0; vars < nvars; vars++)
    {
-      boxman= hypre_SStructGridBoxManager(hypre_SStructVectorGrid(r),
-                                          part_fine, vars);
-      boxarray= hypre_StructGridBoxes(hypre_SStructPGridSGrid(pgrid, vars));
+      boxman = hypre_SStructGridBoxManager(hypre_SStructVectorGrid(r),
+                                           part_fine, vars);
+      boxarray = hypre_StructGridBoxes(hypre_SStructPGridSGrid(pgrid, vars));
 
-      identity_arrayboxes[vars]= hypre_BoxArrayArrayCreate(hypre_BoxArraySize(boxarray), ndim);
+      identity_arrayboxes[vars] = hypre_BoxArrayArrayCreate(hypre_BoxArraySize(boxarray), ndim);
 
       hypre_ForBoxI(ci, boxarray)
       {
@@ -240,8 +240,8 @@ hypre_FacSemiRestrictSetup2( void                 *fac_restrict_vdata,
                                &nboxman_entries);
 
          /* all send and coarsened fboxes on this processor are collected */
-         intersect_boxes= hypre_BoxArrayCreate(0, ndim);
-         for (i= 0; i< nboxman_entries; i++)
+         intersect_boxes = hypre_BoxArrayCreate(0, ndim);
+         for (i = 0; i < nboxman_entries; i++)
          {
             hypre_BoxManEntryGetExtents(boxman_entries[i], ilower, iupper);
             hypre_BoxSetExtents(&box, ilower, iupper);
@@ -263,7 +263,7 @@ hypre_FacSemiRestrictSetup2( void                 *fac_restrict_vdata,
       }
    }
    hypre_BoxArrayDestroy(tmp_boxarray);
-   fac_restrict_data -> identity_arrayboxes= identity_arrayboxes;
+   fac_restrict_data -> identity_arrayboxes = identity_arrayboxes;
 
    /*--------------------------------------------------------------------------
     * fboxes that are coarsened. Some will be sent. We create the communication
@@ -276,28 +276,31 @@ hypre_FacSemiRestrictSetup2( void                 *fac_restrict_vdata,
     * Note that no contraction is needed. Contraction can lead to erroneous
     * send_boxes.
     *--------------------------------------------------------------------------*/
-   interlevel_comm= hypre_CTAlloc(hypre_CommPkg *,  nvars, HYPRE_MEMORY_HOST);
-   fullwgt_sendboxes= hypre_CTAlloc(hypre_BoxArrayArray *,  nvars, HYPRE_MEMORY_HOST);
-   fullwgt_ownboxes= hypre_CTAlloc(hypre_BoxArrayArray *,  nvars, HYPRE_MEMORY_HOST);
-   own_cboxnums= hypre_CTAlloc(HYPRE_Int **,  nvars, HYPRE_MEMORY_HOST);
+   interlevel_comm = hypre_CTAlloc(hypre_CommPkg *,  nvars, HYPRE_MEMORY_HOST);
+   fullwgt_sendboxes = hypre_CTAlloc(hypre_BoxArrayArray *,  nvars, HYPRE_MEMORY_HOST);
+   fullwgt_ownboxes = hypre_CTAlloc(hypre_BoxArrayArray *,  nvars, HYPRE_MEMORY_HOST);
+   own_cboxnums = hypre_CTAlloc(HYPRE_Int **,  nvars, HYPRE_MEMORY_HOST);
 
-   send_boxes= hypre_CTAlloc(hypre_BoxArrayArray *,  nvars, HYPRE_MEMORY_HOST);
-   send_processes= hypre_CTAlloc(HYPRE_Int **,  nvars, HYPRE_MEMORY_HOST);
-   send_remote_boxnums= hypre_CTAlloc(HYPRE_Int **,  nvars, HYPRE_MEMORY_HOST);
+   send_boxes = hypre_CTAlloc(hypre_BoxArrayArray *,  nvars, HYPRE_MEMORY_HOST);
+   send_processes = hypre_CTAlloc(HYPRE_Int **,  nvars, HYPRE_MEMORY_HOST);
+   send_remote_boxnums = hypre_CTAlloc(HYPRE_Int **,  nvars, HYPRE_MEMORY_HOST);
 
-   pgrid= hypre_SStructPVectorPGrid(rf);
-   for (vars= 0; vars< nvars; vars++)
+   pgrid = hypre_SStructPVectorPGrid(rf);
+   for (vars = 0; vars < nvars; vars++)
    {
-      boxman= hypre_SStructGridBoxManager(hypre_SStructVectorGrid(r),
-                                          part_crse, vars);
-      boxarray= hypre_StructGridBoxes(hypre_SStructPGridSGrid(pgrid, vars));
-      fullwgt_sendboxes[vars]= hypre_BoxArrayArrayCreate(hypre_BoxArraySize(boxarray), ndim);
+      boxman = hypre_SStructGridBoxManager(hypre_SStructVectorGrid(r),
+                                           part_crse, vars);
+      boxarray = hypre_StructGridBoxes(hypre_SStructPGridSGrid(pgrid, vars));
+      fullwgt_sendboxes[vars] = hypre_BoxArrayArrayCreate(hypre_BoxArraySize(boxarray), ndim);
       fullwgt_ownboxes[vars] = hypre_BoxArrayArrayCreate(hypre_BoxArraySize(boxarray), ndim);
-      own_cboxnums[vars]     = hypre_CTAlloc(HYPRE_Int *,  hypre_BoxArraySize(boxarray), HYPRE_MEMORY_HOST);
+      own_cboxnums[vars]     = hypre_CTAlloc(HYPRE_Int *,  hypre_BoxArraySize(boxarray),
+                                             HYPRE_MEMORY_HOST);
 
       send_boxes[vars]         = hypre_BoxArrayArrayCreate(hypre_BoxArraySize(boxarray), ndim);
-      send_processes[vars]     = hypre_CTAlloc(HYPRE_Int *,  hypre_BoxArraySize(boxarray), HYPRE_MEMORY_HOST);
-      send_remote_boxnums[vars]= hypre_CTAlloc(HYPRE_Int *,  hypre_BoxArraySize(boxarray), HYPRE_MEMORY_HOST);
+      send_processes[vars]     = hypre_CTAlloc(HYPRE_Int *,  hypre_BoxArraySize(boxarray),
+                                               HYPRE_MEMORY_HOST);
+      send_remote_boxnums[vars] = hypre_CTAlloc(HYPRE_Int *,  hypre_BoxArraySize(boxarray),
+                                                HYPRE_MEMORY_HOST);
 
       hypre_ForBoxI(fi, boxarray)
       {
@@ -310,8 +313,8 @@ hypre_FacSemiRestrictSetup2( void                 *fac_restrict_vdata,
          hypre_BoxManIntersect(boxman, hypre_BoxIMin(&scaled_box),
                                hypre_BoxIMax(&scaled_box), &boxman_entries, &nboxman_entries);
 
-         cnt1= 0; cnt2= 0;
-         for (i= 0; i< nboxman_entries; i++)
+         cnt1 = 0; cnt2 = 0;
+         for (i = 0; i < nboxman_entries; i++)
          {
             hypre_SStructBoxManEntryGetProcess(boxman_entries[i], &proc);
             if (proc != myproc)
@@ -324,11 +327,11 @@ hypre_FacSemiRestrictSetup2( void                 *fac_restrict_vdata,
             }
          }
          send_processes[vars][fi]     = hypre_CTAlloc(HYPRE_Int,  cnt1, HYPRE_MEMORY_HOST);
-         send_remote_boxnums[vars][fi]= hypre_CTAlloc(HYPRE_Int,  cnt1, HYPRE_MEMORY_HOST);
+         send_remote_boxnums[vars][fi] = hypre_CTAlloc(HYPRE_Int,  cnt1, HYPRE_MEMORY_HOST);
          own_cboxnums[vars][fi]       = hypre_CTAlloc(HYPRE_Int,  cnt2, HYPRE_MEMORY_HOST);
 
-         cnt1= 0; cnt2= 0;
-         for (i= 0; i< nboxman_entries; i++)
+         cnt1 = 0; cnt2 = 0;
+         for (i = 0; i < nboxman_entries; i++)
          {
             hypre_BoxManEntryGetExtents(boxman_entries[i], ilower, iupper);
             hypre_BoxSetExtents(&box, ilower, iupper);
@@ -342,7 +345,7 @@ hypre_FacSemiRestrictSetup2( void                 *fac_restrict_vdata,
                hypre_AppendBox(&box,
                                hypre_BoxArrayArrayBoxArray(send_boxes[vars], fi));
 
-               send_processes[vars][fi][cnt1]= proc;
+               send_processes[vars][fi][cnt1] = proc;
                hypre_SStructBoxManEntryGetBoxnum(boxman_entries[i],
                                                  &send_remote_boxnums[vars][fi][cnt1]);
                cnt1++;
@@ -362,9 +365,9 @@ hypre_FacSemiRestrictSetup2( void                 *fac_restrict_vdata,
       }  /* hypre_ForBoxI(fi, boxarray) */
    }     /* for (vars= 0; vars< nvars; vars++) */
 
-   (fac_restrict_data -> fullwgt_sendboxes)= fullwgt_sendboxes;
-   (fac_restrict_data -> fullwgt_ownboxes)= fullwgt_ownboxes;
-   (fac_restrict_data -> own_cboxnums)= own_cboxnums;
+   (fac_restrict_data -> fullwgt_sendboxes) = fullwgt_sendboxes;
+   (fac_restrict_data -> fullwgt_ownboxes) = fullwgt_ownboxes;
+   (fac_restrict_data -> own_cboxnums) = own_cboxnums;
 
    /*--------------------------------------------------------------------------
     * coarsened fboxes this processor will receive.
@@ -373,22 +376,23 @@ hypre_FacSemiRestrictSetup2( void                 *fac_restrict_vdata,
     * processors the refinement belongs in. The processors owning a chunk
     * are the recv_processors.
     *--------------------------------------------------------------------------*/
-   recv_boxes= hypre_CTAlloc(hypre_BoxArrayArray *,  nvars, HYPRE_MEMORY_HOST);
-   recv_processes= hypre_CTAlloc(HYPRE_Int **,  nvars, HYPRE_MEMORY_HOST);
+   recv_boxes = hypre_CTAlloc(hypre_BoxArrayArray *,  nvars, HYPRE_MEMORY_HOST);
+   recv_processes = hypre_CTAlloc(HYPRE_Int **,  nvars, HYPRE_MEMORY_HOST);
 
    /* dummy pointer for CommInfoCreate */
-   recv_remote_boxnums= hypre_CTAlloc(HYPRE_Int **,  nvars, HYPRE_MEMORY_HOST);
+   recv_remote_boxnums = hypre_CTAlloc(HYPRE_Int **,  nvars, HYPRE_MEMORY_HOST);
 
-   pgrid= hypre_SStructPVectorPGrid(rc);
-   for (vars= 0; vars< nvars; vars++)
+   pgrid = hypre_SStructPVectorPGrid(rc);
+   for (vars = 0; vars < nvars; vars++)
    {
-      boxman= hypre_SStructGridBoxManager(hypre_SStructVectorGrid(r),
-                                          part_fine, vars);
-      boxarray= hypre_StructGridBoxes(hypre_SStructPGridSGrid(pgrid, vars));
+      boxman = hypre_SStructGridBoxManager(hypre_SStructVectorGrid(r),
+                                           part_fine, vars);
+      boxarray = hypre_StructGridBoxes(hypre_SStructPGridSGrid(pgrid, vars));
 
       recv_boxes[vars]    = hypre_BoxArrayArrayCreate(hypre_BoxArraySize(boxarray), ndim);
-      recv_processes[vars]= hypre_CTAlloc(HYPRE_Int *,  hypre_BoxArraySize(boxarray), HYPRE_MEMORY_HOST);
-      recv_remote_boxnums[vars]= hypre_CTAlloc(HYPRE_Int *,  hypre_BoxArraySize(boxarray), HYPRE_MEMORY_HOST);
+      recv_processes[vars] = hypre_CTAlloc(HYPRE_Int *,  hypre_BoxArraySize(boxarray), HYPRE_MEMORY_HOST);
+      recv_remote_boxnums[vars] = hypre_CTAlloc(HYPRE_Int *,  hypre_BoxArraySize(boxarray),
+                                                HYPRE_MEMORY_HOST);
 
       hypre_ForBoxI(ci, boxarray)
       {
@@ -401,8 +405,8 @@ hypre_FacSemiRestrictSetup2( void                 *fac_restrict_vdata,
          hypre_BoxManIntersect(boxman, hypre_BoxIMin(&scaled_box),
                                hypre_BoxIMax(&scaled_box), &boxman_entries, &nboxman_entries);
 
-         cnt1= 0;
-         for (i= 0; i< nboxman_entries; i++)
+         cnt1 = 0;
+         for (i = 0; i < nboxman_entries; i++)
          {
             hypre_SStructBoxManEntryGetProcess(boxman_entries[i], &proc);
             if (proc != myproc)
@@ -410,11 +414,11 @@ hypre_FacSemiRestrictSetup2( void                 *fac_restrict_vdata,
                cnt1++;
             }
          }
-         recv_processes[vars][ci]= hypre_CTAlloc(HYPRE_Int,  cnt1, HYPRE_MEMORY_HOST);
-         recv_remote_boxnums[vars][ci]= hypre_CTAlloc(HYPRE_Int ,  cnt1, HYPRE_MEMORY_HOST);
+         recv_processes[vars][ci] = hypre_CTAlloc(HYPRE_Int,  cnt1, HYPRE_MEMORY_HOST);
+         recv_remote_boxnums[vars][ci] = hypre_CTAlloc(HYPRE_Int,  cnt1, HYPRE_MEMORY_HOST);
 
-         cnt1= 0;
-         for (i= 0; i< nboxman_entries; i++)
+         cnt1 = 0;
+         for (i = 0; i < nboxman_entries; i++)
          {
             hypre_SStructBoxManEntryGetProcess(boxman_entries[i], &proc);
             if (proc != myproc)
@@ -431,7 +435,7 @@ hypre_FacSemiRestrictSetup2( void                 *fac_restrict_vdata,
                hypre_AppendBox(&box,
                                hypre_BoxArrayArrayBoxArray(recv_boxes[vars], ci));
 
-               recv_processes[vars][ci][cnt1]= proc;
+               recv_processes[vars][ci][cnt1] = proc;
                cnt1++;
 
             }  /* if (proc != myproc) */
@@ -442,13 +446,13 @@ hypre_FacSemiRestrictSetup2( void                 *fac_restrict_vdata,
       }        /* hypre_ForBoxI(ci, boxarray) */
    }           /* for (vars= 0; vars< nvars; vars++) */
 
-   num_values= 1;
-   for (vars= 0; vars< nvars; vars++)
+   num_values = 1;
+   for (vars = 0; vars < nvars; vars++)
    {
       s_rc     = hypre_SStructPVectorSVector(rc, vars);
-      s_cvector= hypre_SStructPVectorSVector(fgrid_cvectors, vars);
-      send_rboxes= hypre_BoxArrayArrayDuplicate(send_boxes[vars]);
-      recv_rboxes= hypre_BoxArrayArrayDuplicate(recv_boxes[vars]);
+      s_cvector = hypre_SStructPVectorSVector(fgrid_cvectors, vars);
+      send_rboxes = hypre_BoxArrayArrayDuplicate(send_boxes[vars]);
+      recv_rboxes = hypre_BoxArrayArrayDuplicate(recv_boxes[vars]);
 
       hypre_CommInfoCreate(send_boxes[vars], recv_boxes[vars],
                            send_processes[vars], recv_processes[vars],
@@ -470,7 +474,7 @@ hypre_FacSemiRestrictSetup2( void                 *fac_restrict_vdata,
    hypre_TFree(send_remote_boxnums, HYPRE_MEMORY_HOST);
    hypre_TFree(recv_remote_boxnums, HYPRE_MEMORY_HOST);
 
-   (fac_restrict_data -> interlevel_comm)= interlevel_comm;
+   (fac_restrict_data -> interlevel_comm) = interlevel_comm;
 
    return ierr;
 
@@ -486,10 +490,10 @@ hypre_FACRestrict2( void                 *  fac_restrict_vdata,
    hypre_FacSemiRestrictData2 *restrict_data = (hypre_FacSemiRestrictData2 *)fac_restrict_vdata;
 
    hypre_SStructPVector   *fgrid_cvectors     = restrict_data->fgrid_cvectors;
-   hypre_BoxArrayArray   **identity_arrayboxes= restrict_data->identity_arrayboxes;
+   hypre_BoxArrayArray   **identity_arrayboxes = restrict_data->identity_arrayboxes;
    hypre_BoxArrayArray   **fullwgt_ownboxes   = restrict_data->fullwgt_ownboxes;
    HYPRE_Int            ***own_cboxnums       = restrict_data->own_cboxnums;
-   hypre_CommPkg         **interlevel_comm= restrict_data-> interlevel_comm;
+   hypre_CommPkg         **interlevel_comm = restrict_data-> interlevel_comm;
    hypre_CommHandle       *comm_handle;
 
    HYPRE_Int               ndim           =  hypre_SStructVectorNDim(xf);
@@ -527,7 +531,7 @@ hypre_FACRestrict2( void                 *  fac_restrict_vdata,
 
    HYPRE_Int               fi, ci;
    HYPRE_Int               nvars, var;
-   HYPRE_Int               volume_crse_cell;
+   /* HYPRE_Int               volume_crse_cell; */
 
    HYPRE_Int               i, j, k;
    HYPRE_Int               imax, jmax, kmax;
@@ -536,57 +540,53 @@ hypre_FACRestrict2( void                 *  fac_restrict_vdata,
    HYPRE_Real             *sum;
    HYPRE_Real              scaling;
 
-   HYPRE_Int               part_crse= 0;
-   HYPRE_Int               part_fine= 1;
+   HYPRE_Int               part_crse = 0;
+   HYPRE_Int               part_fine = 1;
    HYPRE_Int               num_coarse_cells;
 
    /*-----------------------------------------------------------------------
     * Initialize some things
     *-----------------------------------------------------------------------*/
-   stride= (restrict_data -> stride);
-
-   hypre_ClearIndex(stridec);
-   for (i= 0; i< ndim; i++)
-   {
-      stridec[i]= 1;
-   }
+   stride = (restrict_data -> stride);
 
+   hypre_SetIndex(lindex, 0);
+   hypre_SetIndex(stridec, 1);
    hypre_CopyIndex(stride, rfactors);
-   for (i= ndim; i< 3; i++)
+   for (i = ndim; i < HYPRE_MAXDIM; i++)
    {
-      rfactors[i]= 1;
+      rfactors[i] = 1;
    }
 
-   volume_crse_cell= 1;
-   for (i= 0; i< ndim; i++)
-   {
-      volume_crse_cell*= rfactors[i];
-   }
+   /* volume_crse_cell = 1; */
+   /* for (i = 0; i < ndim; i++) */
+   /* { */
+   /*    volume_crse_cell *= rfactors[i]; */
+   /* } */
 
    /*-----------------------------------------------------------------------
     * We are assuming the refinement and coarsening have same variable
     * types.
     *-----------------------------------------------------------------------*/
-   nvars=  hypre_SStructPVectorNVars(xc);
+   nvars =  hypre_SStructPVectorNVars(xc);
 
    /*-----------------------------------------------------------------------
     * For each coordinate direction, a fine node can contribute only to the
     * left or right cell=> only 2 coarse cells per direction.
     *-----------------------------------------------------------------------*/
-   num_coarse_cells= 1;
-   for (i= 0; i< ndim; i++)
+   num_coarse_cells = 1;
+   for (i = 0; i < ndim; i++)
    {
-      num_coarse_cells*= 2;
+      num_coarse_cells *= 2;
    }
-   sum= hypre_CTAlloc(HYPRE_Real,  num_coarse_cells, HYPRE_MEMORY_HOST);
+   sum = hypre_CTAlloc(HYPRE_Real,  num_coarse_cells, HYPRE_MEMORY_HOST);
 
    /*--------------------------------------------------------------------------
     * Scaling for averaging restriction.
     *--------------------------------------------------------------------------*/
-   scaling= 1.0;
-   for (i= 0; i< ndim-2; i++)
+   scaling = 1.0;
+   for (i = 0; i < ndim - 2; i++)
    {
-      scaling*= rfactors[0];
+      scaling *= rfactors[0];
    }
 
    /*-----------------------------------------------------------------------
@@ -616,11 +616,11 @@ hypre_FACRestrict2( void                 *  fac_restrict_vdata,
     *-----------------------------------------------------------------------*/
    if (ndim > 1)
    {
-      xcp_temp= hypre_TAlloc(HYPRE_Real **,  (ndim-1), HYPRE_MEMORY_HOST);
-      xcp     = hypre_TAlloc(HYPRE_Real **,  (ndim-1), HYPRE_MEMORY_HOST);
-      for (k= 0; k< (ndim-1); k++)
+      xcp_temp = hypre_TAlloc(HYPRE_Real **,  (ndim - 1), HYPRE_MEMORY_HOST);
+      xcp     = hypre_TAlloc(HYPRE_Real **,  (ndim - 1), HYPRE_MEMORY_HOST);
+      for (k = 0; k < (ndim - 1); k++)
       {
-         xcp_temp[k]= hypre_TAlloc(HYPRE_Real *,  2, HYPRE_MEMORY_HOST);
+         xcp_temp[k] = hypre_TAlloc(HYPRE_Real *,  2, HYPRE_MEMORY_HOST);
          xcp[k]     = hypre_TAlloc(HYPRE_Real *,  2, HYPRE_MEMORY_HOST);
       }
    }
@@ -628,22 +628,22 @@ hypre_FACRestrict2( void                 *  fac_restrict_vdata,
    {
       xcp_temp   = hypre_TAlloc(HYPRE_Real **,  1, HYPRE_MEMORY_HOST);
       xcp        = hypre_TAlloc(HYPRE_Real **,  1, HYPRE_MEMORY_HOST);
-      xcp_temp[0]= hypre_TAlloc(HYPRE_Real *,  1, HYPRE_MEMORY_HOST);
+      xcp_temp[0] = hypre_TAlloc(HYPRE_Real *,  1, HYPRE_MEMORY_HOST);
       xcp[0]     = hypre_TAlloc(HYPRE_Real *,  1, HYPRE_MEMORY_HOST);
    }
 
    /* memory allocation of xfp is okay for all dimensions */
-   xfp= hypre_TAlloc(HYPRE_Real **,  rfactors[2], HYPRE_MEMORY_HOST);
-   for (k= 0; k< rfactors[2]; k++)
+   xfp = hypre_TAlloc(HYPRE_Real **,  rfactors[2], HYPRE_MEMORY_HOST);
+   for (k = 0; k < rfactors[2]; k++)
    {
-      xfp[k]= hypre_TAlloc(HYPRE_Real *,  rfactors[1], HYPRE_MEMORY_HOST);
+      xfp[k] = hypre_TAlloc(HYPRE_Real *,  rfactors[1], HYPRE_MEMORY_HOST);
    }
 
-   for (var= 0; var< nvars; var++)
+   for (var = 0; var < nvars; var++)
    {
-      xc_temp= hypre_SStructPVectorSVector(fgrid_cvectors, var);
-      xf_var= hypre_SStructPVectorSVector(hypre_SStructVectorPVector(xf,part_fine),
-                                          var);
+      xc_temp = hypre_SStructPVectorSVector(fgrid_cvectors, var);
+      xf_var = hypre_SStructPVectorSVector(hypre_SStructVectorPVector(xf, part_fine),
+                                           var);
 
       fgrid        = hypre_StructVectorGrid(xf_var);
       fgrid_boxes  = hypre_StructGridBoxes(fgrid);
@@ -652,19 +652,19 @@ hypre_FACRestrict2( void                 *  fac_restrict_vdata,
 
       hypre_ForBoxI(fi, fgrid_boxes)
       {
-         fgrid_box= hypre_BoxArrayBox(fgrid_boxes, fi);
+         fgrid_box = hypre_BoxArrayBox(fgrid_boxes, fi);
 
          /*--------------------------------------------------------------------
           * Get the ptrs for the fine struct_vectors.
           *--------------------------------------------------------------------*/
          xf_dbox  = hypre_BoxArrayBox(hypre_StructVectorDataSpace(xf_var), fi);
-         for (k= 0; k< rfactors[2]; k++)
+         for (k = 0; k < rfactors[2]; k++)
          {
-            for (j=0; j< rfactors[1]; j++)
+            for (j = 0; j < rfactors[1]; j++)
             {
                hypre_SetIndex3(temp_index1, 0, j, k);
-               xfp[k][j]= hypre_StructVectorBoxData(xf_var, fi) +
-                  hypre_BoxOffsetDistance(xf_dbox, temp_index1);
+               xfp[k][j] = hypre_StructVectorBoxData(xf_var, fi) +
+                           hypre_BoxOffsetDistance(xf_dbox, temp_index1);
             }
          }
 
@@ -674,24 +674,24 @@ hypre_FACRestrict2( void                 *  fac_restrict_vdata,
           * Work vectors were created this way.
           * Dimensionally dependent.
           *--------------------------------------------------------------------*/
-         xc_temp_dbox= hypre_BoxArrayBox(hypre_StructVectorDataSpace(xc_temp), fi);
+         xc_temp_dbox = hypre_BoxArrayBox(hypre_StructVectorDataSpace(xc_temp), fi);
          if (ndim > 1)
          {
-            for (k= 0; k< (ndim-1); k++)
+            for (k = 0; k < (ndim - 1); k++)
             {
-               for (j=0; j< 2; j++)
+               for (j = 0; j < 2; j++)
                {
                   hypre_SetIndex3(temp_index1, 0, j, k);
-                  xcp_temp[k][j]= hypre_StructVectorBoxData(xc_temp, fi) +
-                     hypre_BoxOffsetDistance(xc_temp_dbox, temp_index1);
+                  xcp_temp[k][j] = hypre_StructVectorBoxData(xc_temp, fi) +
+                                   hypre_BoxOffsetDistance(xc_temp_dbox, temp_index1);
                }
             }
          }
          else /* 1d case */
          {
             hypre_ClearIndex(temp_index1);
-            xcp_temp[0][0]= hypre_StructVectorBoxData(xc_temp, fi) +
-               hypre_BoxOffsetDistance(xc_temp_dbox, temp_index1);
+            xcp_temp[0][0] = hypre_StructVectorBoxData(xc_temp, fi) +
+                             hypre_BoxOffsetDistance(xc_temp_dbox, temp_index1);
          }
          hypre_CopyIndex(hypre_BoxIMin(fgrid_box), start);
          hypre_CopyIndex(hypre_BoxIMax(fgrid_box), fbox_size);
@@ -701,9 +701,9 @@ hypre_FACRestrict2( void                 *  fac_restrict_vdata,
           * ndim < 3.
           *    fbox_size= hypre_BoxIMax(fgrid_box)-hypre_BoxIMin(fgrid_box)+1.
           *--------------------------------------------------------------------*/
-         for (i= 0; i< 3; i++)
+         for (i = 0; i < 3; i++)
          {
-            fbox_size[i]-= (start[i]-1);
+            fbox_size[i] -= (start[i] - 1);
          }
 
          /*--------------------------------------------------------------------
@@ -712,9 +712,9 @@ hypre_FACRestrict2( void                 *  fac_restrict_vdata,
           * coarse node gets the restricted values.
           *--------------------------------------------------------------------*/
          hypre_ClearIndex(node_offset);
-         for (i= 0; i< ndim; i++)
+         for (i = 0; i < ndim; i++)
          {
-            node_offset[i]= rfactors[i]-(start[i]%rfactors[i])-1;
+            node_offset[i] = rfactors[i] - (start[i] % rfactors[i]) - 1;
          }
 
          hypre_SetIndex3(temp_index2, 0, 0, 0);
@@ -733,41 +733,41 @@ hypre_FACRestrict2( void                 *  fac_restrict_vdata,
              * piecewise constant restriction.
              *-----------------------------------------------------------------*/
             zypre_BoxLoopGetIndex(lindex);
-            imax= hypre_min( (fbox_size[0]-lindex[0]*stride[0]), rfactors[0] );
-            jmax= hypre_min( (fbox_size[1]-lindex[1]*stride[1]), rfactors[1] );
-            kmax= hypre_min( (fbox_size[2]-lindex[2]*stride[2]), rfactors[2] );
+            imax = hypre_min( (fbox_size[0] - lindex[0] * stride[0]), rfactors[0] );
+            jmax = hypre_min( (fbox_size[1] - lindex[1] * stride[1]), rfactors[1] );
+            kmax = hypre_min( (fbox_size[2] - lindex[2] * stride[2]), rfactors[2] );
 
-            for (i= 0; i< num_coarse_cells; i++)
+            for (i = 0; i < num_coarse_cells; i++)
             {
-               sum[i]= 0.0;
+               sum[i] = 0.0;
             }
 
-            for (k= 0; k< kmax; k++)
+            for (k = 0; k < kmax; k++)
             {
-               kcell= 1;
+               kcell = 1;
                if (k <= node_offset[2])
                {
-                  kcell= 0;
+                  kcell = 0;
                }
 
-               for (j= 0; j< jmax; j++)
+               for (j = 0; j < jmax; j++)
                {
-                  jcell= 1;
+                  jcell = 1;
                   if (j <= node_offset[1])
                   {
-                     jcell= 0;
+                     jcell = 0;
                   }
 
-                  for (i= 0; i< imax; i++)
+                  for (i = 0; i < imax; i++)
                   {
-                     icell= 1;
+                     icell = 1;
                      if (i <= node_offset[0])
                      {
-                        icell= 0;
+                        icell = 0;
                      }
 
-                     MapCellRank(icell, jcell , kcell, ijkcell);
-                     sum[ijkcell]+= xfp[k][j][xfi+i];
+                     MapCellRank(icell, jcell, kcell, ijkcell);
+                     sum[ijkcell] += xfp[k][j][xfi + i];
                   }
                }
             }
@@ -775,16 +775,16 @@ hypre_FACRestrict2( void                 *  fac_restrict_vdata,
             /*-----------------------------------------------------------------
              * Add the compute averages to the correct coarse cell.
              *-----------------------------------------------------------------*/
-            for (ijkcell= 0; ijkcell< num_coarse_cells; ijkcell++)
+            for (ijkcell = 0; ijkcell < num_coarse_cells; ijkcell++)
             {
                if (sum[ijkcell] != 0.0)
                {
-                  sum[ijkcell]/= scaling;
+                  sum[ijkcell] /= scaling;
                   InverseMapCellRank(ijkcell, temp_index2);
-                  i=  temp_index2[0];
-                  j=  temp_index2[1];
-                  k=  temp_index2[2];
-                  xcp_temp[k][j][xci+i]+= sum[ijkcell];
+                  i =  temp_index2[0];
+                  j =  temp_index2[1];
+                  k =  temp_index2[2];
+                  xcp_temp[k][j][xci + i] += sum[ijkcell];
                }
             }
 
@@ -799,10 +799,10 @@ hypre_FACRestrict2( void                 *  fac_restrict_vdata,
     * patch. Only actual communicated values will be put in the
     * coarse vector.
     *------------------------------------------------------------------*/
-   for (var= 0; var< nvars; var++)
+   for (var = 0; var < nvars; var++)
    {
-      xc_temp= hypre_SStructPVectorSVector(fgrid_cvectors, var);
-      xc_var= hypre_SStructPVectorSVector(xc, var);
+      xc_temp = hypre_SStructPVectorSVector(fgrid_cvectors, var);
+      xc_var = hypre_SStructPVectorSVector(xc, var);
       hypre_InitializeCommunication(interlevel_comm[var],
                                     hypre_StructVectorData(xc_temp),
                                     hypre_StructVectorData(xc_var), 0, 0,
@@ -815,31 +815,31 @@ hypre_FACRestrict2( void                 *  fac_restrict_vdata,
     * Need to add the coarsened patches that belong on this processor
     * to the coarse vector.
     *------------------------------------------------------------------*/
-   for (var= 0; var< nvars; var++)
+   for (var = 0; var < nvars; var++)
    {
-      xc_temp= hypre_SStructPVectorSVector(fgrid_cvectors, var);
-      xc_var= hypre_SStructPVectorSVector(xc, var);
+      xc_temp = hypre_SStructPVectorSVector(fgrid_cvectors, var);
+      xc_var = hypre_SStructPVectorSVector(xc, var);
 
       cgrid        = hypre_StructVectorGrid(xc_temp);
       cgrid_boxes  = hypre_StructGridBoxes(cgrid);
 
-      arrayarray_ownboxes= fullwgt_ownboxes[var];
+      arrayarray_ownboxes = fullwgt_ownboxes[var];
       hypre_ForBoxI(ci, cgrid_boxes)
       {
-         xc_temp_dbox= hypre_BoxArrayBox(hypre_StructVectorDataSpace(xc_temp), ci);
-         xcp_temp[0][0]= hypre_StructVectorBoxData(xc_temp, ci);
+         xc_temp_dbox = hypre_BoxArrayBox(hypre_StructVectorDataSpace(xc_temp), ci);
+         xcp_temp[0][0] = hypre_StructVectorBoxData(xc_temp, ci);
 
          /*--------------------------------------------------------------
           * Each ci box of cgrid_box has a boxarray of subboxes. Copy
           * each of these subboxes to the coarse vector.
           *--------------------------------------------------------------*/
-         own_boxes= hypre_BoxArrayArrayBoxArray(arrayarray_ownboxes, ci);
+         own_boxes = hypre_BoxArrayArrayBoxArray(arrayarray_ownboxes, ci);
          boxnums  = own_cboxnums[var][ci];
          hypre_ForBoxI(i, own_boxes)
          {
-            own_box= hypre_BoxArrayBox(own_boxes, i);
-            xf_dbox= hypre_BoxArrayBox(hypre_StructVectorDataSpace(xc_var), boxnums[i]);
-            xcp[0][0]= hypre_StructVectorBoxData(xc_var, boxnums[i]);
+            own_box = hypre_BoxArrayBox(own_boxes, i);
+            xf_dbox = hypre_BoxArrayBox(hypre_StructVectorDataSpace(xc_var), boxnums[i]);
+            xcp[0][0] = hypre_StructVectorBoxData(xc_var, boxnums[i]);
 
             hypre_BoxGetSize(own_box, loop_size);
 
@@ -848,7 +848,7 @@ hypre_FACRestrict2( void                 *  fac_restrict_vdata,
                                 xc_temp_dbox, hypre_BoxIMin(own_box), stridec, xfi,
                                 xf_dbox, hypre_BoxIMin(own_box), stridec, xci);
             {
-               xcp[0][0][xci]+= xcp_temp[0][0][xfi];
+               xcp[0][0][xci] += xcp_temp[0][0][xfi];
             }
             hypre_BoxLoop2End(xfi, xci);
 #undef DEVICE_VAR
@@ -858,7 +858,7 @@ hypre_FACRestrict2( void                 *  fac_restrict_vdata,
    }        /* for (var= 0; var< nvars; var++) */
 
    hypre_TFree(sum, HYPRE_MEMORY_HOST);
-   for (k= 0; k< rfactors[2]; k++)
+   for (k = 0; k < rfactors[2]; k++)
    {
       hypre_TFree(xfp[k], HYPRE_MEMORY_HOST);
    }
@@ -866,7 +866,7 @@ hypre_FACRestrict2( void                 *  fac_restrict_vdata,
 
    if (ndim > 1)
    {
-      for (k= 0; k< (ndim-1); k++)
+      for (k = 0; k < (ndim - 1); k++)
       {
          hypre_TFree(xcp_temp[k], HYPRE_MEMORY_HOST);
          hypre_TFree(xcp[k], HYPRE_MEMORY_HOST);
@@ -899,14 +899,14 @@ hypre_FacSemiRestrictDestroy2( void *fac_restrict_vdata )
 
    if (fac_restrict_data)
    {
-      nvars= (fac_restrict_data-> nvars);
+      nvars = (fac_restrict_data-> nvars);
       hypre_SStructPVectorDestroy(fac_restrict_data-> fgrid_cvectors);
 
-      for (i= 0; i< nvars; i++)
+      for (i = 0; i < nvars; i++)
       {
          hypre_BoxArrayArrayDestroy((fac_restrict_data -> identity_arrayboxes)[i]);
          hypre_BoxArrayArrayDestroy((fac_restrict_data -> fullwgt_sendboxes)[i]);
-         for (j= 0; j< hypre_BoxArrayArraySize(fac_restrict_data->fullwgt_ownboxes[i]); j++)
+         for (j = 0; j < hypre_BoxArrayArraySize(fac_restrict_data->fullwgt_ownboxes[i]); j++)
          {
             hypre_TFree((fac_restrict_data -> own_cboxnums)[i][j], HYPRE_MEMORY_HOST);
          }
diff --git a/external/hypre/src/sstruct_ls/fac_setup2.c b/external/hypre/src/sstruct_ls/fac_setup2.c
index b1baef22..79537ec8 100644
--- a/external/hypre/src/sstruct_ls/fac_setup2.c
+++ b/external/hypre/src/sstruct_ls/fac_setup2.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -21,6 +21,8 @@ hypre_FacSetup2( void                 *fac_vdata,
                  hypre_SStructVector  *b,
                  hypre_SStructVector  *x )
 {
+   HYPRE_UNUSED_VAR(b);
+
    hypre_FACData          *fac_data      =  (hypre_FACData*)fac_vdata;
 
    HYPRE_Int              *plevels       = (fac_data-> plevels);
@@ -43,8 +45,8 @@ hypre_FacSetup2( void                 *fac_vdata,
 
    hypre_SStructGraph     *graph;
    hypre_SStructGrid      *grid;
-   hypre_SStructPGrid     *pgrid; 
-   hypre_StructGrid       *sgrid; 
+   hypre_SStructPGrid     *pgrid;
+   hypre_StructGrid       *sgrid;
    hypre_BoxArray         *sgrid_boxes;
    hypre_Box              *sgrid_box;
    hypre_SStructStencil   *stencils;
@@ -57,7 +59,7 @@ hypre_FacSetup2( void                 *fac_vdata,
    hypre_SStructUVEntry  **Uventries;
    HYPRE_Int               nUventries;
    HYPRE_Int              *iUventries;
-   hypre_SStructUVEntry   *Uventry; 
+   hypre_SStructUVEntry   *Uventry;
    hypre_SStructUEntry    *Uentry;
    hypre_Index             index, to_index, stride;
    HYPRE_Int               var, to_var, to_part, level_part, level_topart;
@@ -84,13 +86,13 @@ hypre_FacSetup2( void                 *fac_vdata,
 
 
    /* coarsest grid solver */
-   HYPRE_Int               csolver_type       =(fac_data-> csolver_type);
-   HYPRE_SStructSolver     crse_solver=NULL;
-   HYPRE_SStructSolver     crse_precond=NULL;
-   
+   HYPRE_Int               csolver_type       = (fac_data-> csolver_type);
+   HYPRE_SStructSolver     crse_solver = NULL;
+   HYPRE_SStructSolver     crse_precond = NULL;
+
    HYPRE_Int               max_level        =  hypre_FACDataMaxLevels(fac_data);
    HYPRE_Int               relax_type       =  fac_data -> relax_type;
-   HYPRE_Int               usr_jacobi_weight=  fac_data -> usr_jacobi_weight;
+   HYPRE_Int               usr_jacobi_weight =  fac_data -> usr_jacobi_weight;
    HYPRE_Real              jacobi_weight    =  fac_data -> jacobi_weight;
    HYPRE_Int              *levels;
    HYPRE_Int              *part_to_level;
@@ -102,14 +104,14 @@ hypre_FacSetup2( void                 *fac_vdata,
    HYPRE_Int              *stencil_vars;
    HYPRE_Real             *values;
    HYPRE_Real             *A_smatrix_value;
- 
+
    HYPRE_Int              *nrows;
    HYPRE_Int             **ncols;
    HYPRE_BigInt          **rows;
    HYPRE_BigInt          **cols;
    HYPRE_Int              *cnt;
    HYPRE_Real             *vals;
-   
+
    HYPRE_BigInt           *level_rows;
    HYPRE_BigInt           *level_cols;
    HYPRE_Int               level_cnt;
@@ -120,22 +122,22 @@ hypre_FacSetup2( void                 *fac_vdata,
    HYPRE_Int               max_cycles;
 
    HYPRE_Int               ierr = 0;
-/*hypre_SStructMatrix *nested_A;
+   /*hypre_SStructMatrix *nested_A;
 
-  nested_A= hypre_TAlloc(hypre_SStructMatrix ,  1, HYPRE_MEMORY_HOST);
-  nested_A= hypre_CoarsenAMROp(fac_vdata, A);*/
+     nested_A= hypre_TAlloc(hypre_SStructMatrix ,  1, HYPRE_MEMORY_HOST);
+     nested_A= hypre_CoarsenAMROp(fac_vdata, A);*/
 
    /* generate the composite operator with the computed coarse-grid operators */
    hypre_AMR_RAP(A_in, rfactors, &A_rap);
-   (fac_data -> A_rap)= A_rap;
+   (fac_data -> A_rap) = A_rap;
 
    comm = hypre_SStructMatrixComm(A_rap);
    ndim = hypre_SStructMatrixNDim(A_rap);
-   npart= hypre_SStructMatrixNParts(A_rap);
-   graph= hypre_SStructMatrixGraph(A_rap);
+   npart = hypre_SStructMatrixNParts(A_rap);
+   graph = hypre_SStructMatrixGraph(A_rap);
    grid = hypre_SStructGraphGrid(graph);
    ij_A = hypre_SStructMatrixIJMatrix(A_rap);
-   matrix_type= hypre_SStructMatrixObjectType(A_rap);
+   matrix_type = hypre_SStructMatrixObjectType(A_rap);
 
    /*--------------------------------------------------------------------------
     * logging arrays.
@@ -144,7 +146,7 @@ hypre_FacSetup2( void                 *fac_vdata,
    {
       max_cycles = (fac_data -> max_cycles);
       (fac_data -> norms)    = hypre_TAlloc(HYPRE_Real,  max_cycles, HYPRE_MEMORY_HOST);
-      (fac_data -> rel_norms)= hypre_TAlloc(HYPRE_Real,  max_cycles, HYPRE_MEMORY_HOST);
+      (fac_data -> rel_norms) = hypre_TAlloc(HYPRE_Real,  max_cycles, HYPRE_MEMORY_HOST);
    }
 
    /*--------------------------------------------------------------------------
@@ -152,52 +154,52 @@ hypre_FacSetup2( void                 *fac_vdata,
     *--------------------------------------------------------------------------*/
    levels        = hypre_CTAlloc(HYPRE_Int,  npart, HYPRE_MEMORY_HOST);
    part_to_level = hypre_CTAlloc(HYPRE_Int,  npart, HYPRE_MEMORY_HOST);
-   refine_factors= hypre_CTAlloc(hypre_Index,  npart, HYPRE_MEMORY_HOST);
-   for (part= 0; part< npart; part++)
+   refine_factors = hypre_CTAlloc(hypre_Index,  npart, HYPRE_MEMORY_HOST);
+   for (part = 0; part < npart; part++)
    {
       part_to_level[part]  = plevels[part];
-      levels[plevels[part]]= part;
-      for (i= 0; i< ndim; i++)
+      levels[plevels[part]] = part;
+      for (i = 0; i < ndim; i++)
       {
-         refine_factors[plevels[part]][i]= rfactors[part][i];
+         refine_factors[plevels[part]][i] = rfactors[part][i];
       }
-      for (i= ndim; i< 3; i++)
+      for (i = ndim; i < 3; i++)
       {
-         refine_factors[plevels[part]][i]= 1;
+         refine_factors[plevels[part]][i] = 1;
       }
    }
    (fac_data -> level_to_part) = levels;
    (fac_data -> part_to_level) = part_to_level;
-   (fac_data -> refine_factors)= refine_factors;
-   
+   (fac_data -> refine_factors) = refine_factors;
+
    /*--------------------------------------------------------------------------
-    * Create the level SStructGrids using the original composite grid. 
+    * Create the level SStructGrids using the original composite grid.
     *--------------------------------------------------------------------------*/
-   grid_level= hypre_TAlloc(hypre_SStructGrid *,  max_level+1, HYPRE_MEMORY_HOST);
-   for (level= max_level; level >= 0; level--)
+   grid_level = hypre_TAlloc(hypre_SStructGrid *,  max_level + 1, HYPRE_MEMORY_HOST);
+   for (level = max_level; level >= 0; level--)
    {
       HYPRE_SStructGridCreate(comm, ndim, nparts_level, &grid_level[level]);
    }
 
-   for (level= max_level; level >= 0; level--)
+   for (level = max_level; level >= 0; level--)
    {
       /*--------------------------------------------------------------------------
-       * Create the fine part of the finest level SStructGrids using the original 
+       * Create the fine part of the finest level SStructGrids using the original
        * composite grid.
        *--------------------------------------------------------------------------*/
       if (level == max_level)
       {
          pgrid = hypre_SStructGridPGrid(grid, levels[level]);
-         iboxarray= hypre_SStructPGridCellIBoxArray(pgrid);
+         iboxarray = hypre_SStructPGridCellIBoxArray(pgrid);
          for (box = 0; box < hypre_BoxArraySize(iboxarray); box++)
          {
             HYPRE_SStructGridSetExtents(grid_level[level], part_fine,
-                                        hypre_BoxIMin( hypre_BoxArrayBox(iboxarray,box) ),
-                                        hypre_BoxIMax( hypre_BoxArrayBox(iboxarray,box) ));
+                                        hypre_BoxIMin( hypre_BoxArrayBox(iboxarray, box) ),
+                                        hypre_BoxIMax( hypre_BoxArrayBox(iboxarray, box) ));
          }
 
-         HYPRE_SStructGridSetVariables( grid_level[level], part_fine, 
-                                        hypre_SStructPGridNVars(pgrid), 
+         HYPRE_SStructGridSetVariables( grid_level[level], part_fine,
+                                        hypre_SStructPGridNVars(pgrid),
                                         hypre_SStructPGridVarTypes(pgrid) );
 
          /*-----------------------------------------------------------------------
@@ -208,8 +210,8 @@ hypre_FacSetup2( void                 *fac_vdata,
             for (box = 0; box < hypre_BoxArraySize(iboxarray); box++)
             {
                HYPRE_SStructGridSetExtents(grid_level[level], part_crse,
-                                           hypre_BoxIMin( hypre_BoxArrayBox(iboxarray,box) ),
-                                           hypre_BoxIMax( hypre_BoxArrayBox(iboxarray,box) ));
+                                           hypre_BoxIMin( hypre_BoxArrayBox(iboxarray, box) ),
+                                           hypre_BoxIMax( hypre_BoxArrayBox(iboxarray, box) ));
             }
 
             HYPRE_SStructGridSetVariables( grid_level[level], part_crse,
@@ -219,45 +221,45 @@ hypre_FacSetup2( void                 *fac_vdata,
       }
 
       /*--------------------------------------------------------------------------
-       * Create the coarse part of level SStructGrids using the original composite 
+       * Create the coarse part of level SStructGrids using the original composite
        * grid, the coarsest part SStructGrid, and the fine part if level < max_level.
        *--------------------------------------------------------------------------*/
       if (level > 0)
       {
-         pgrid = hypre_SStructGridPGrid(grid, levels[level-1]);
-         iboxarray= hypre_SStructPGridCellIBoxArray(pgrid);
+         pgrid = hypre_SStructGridPGrid(grid, levels[level - 1]);
+         iboxarray = hypre_SStructPGridCellIBoxArray(pgrid);
          for (box = 0; box < hypre_BoxArraySize(iboxarray); box++)
          {
             HYPRE_SStructGridSetExtents(grid_level[level], part_crse,
-                                        hypre_BoxIMin( hypre_BoxArrayBox(iboxarray,box) ),
-                                        hypre_BoxIMax( hypre_BoxArrayBox(iboxarray,box) ));
+                                        hypre_BoxIMin( hypre_BoxArrayBox(iboxarray, box) ),
+                                        hypre_BoxIMax( hypre_BoxArrayBox(iboxarray, box) ));
+
+            HYPRE_SStructGridSetExtents(grid_level[level - 1], part_fine,
+                                        hypre_BoxIMin( hypre_BoxArrayBox(iboxarray, box) ),
+                                        hypre_BoxIMax( hypre_BoxArrayBox(iboxarray, box) ));
 
-            HYPRE_SStructGridSetExtents(grid_level[level-1], part_fine,
-                                        hypre_BoxIMin( hypre_BoxArrayBox(iboxarray,box) ),
-                                        hypre_BoxIMax( hypre_BoxArrayBox(iboxarray,box) ));
 
-              
             if (level == 1)
             {
-               HYPRE_SStructGridSetExtents(grid_level[level-1], part_crse,
-                                           hypre_BoxIMin( hypre_BoxArrayBox(iboxarray,box) ),
-                                           hypre_BoxIMax( hypre_BoxArrayBox(iboxarray,box) ));
+               HYPRE_SStructGridSetExtents(grid_level[level - 1], part_crse,
+                                           hypre_BoxIMin( hypre_BoxArrayBox(iboxarray, box) ),
+                                           hypre_BoxIMax( hypre_BoxArrayBox(iboxarray, box) ));
             }
          }
 
-         HYPRE_SStructGridSetVariables( grid_level[level], part_crse, 
-                                        hypre_SStructPGridNVars(pgrid), 
+         HYPRE_SStructGridSetVariables( grid_level[level], part_crse,
+                                        hypre_SStructPGridNVars(pgrid),
                                         hypre_SStructPGridVarTypes(pgrid) );
 
-         HYPRE_SStructGridSetVariables( grid_level[level-1], part_fine, 
-                                        hypre_SStructPGridNVars(pgrid), 
+         HYPRE_SStructGridSetVariables( grid_level[level - 1], part_fine,
+                                        hypre_SStructPGridNVars(pgrid),
                                         hypre_SStructPGridVarTypes(pgrid) );
 
          /* coarsest SStructGrid */
          if (level == 1)
          {
-            HYPRE_SStructGridSetVariables( grid_level[level-1], part_crse, 
-                                           hypre_SStructPGridNVars(pgrid), 
+            HYPRE_SStructGridSetVariables( grid_level[level - 1], part_crse,
+                                           hypre_SStructPGridNVars(pgrid),
                                            hypre_SStructPGridVarTypes(pgrid) );
          }
       }
@@ -265,19 +267,19 @@ hypre_FacSetup2( void                 *fac_vdata,
       HYPRE_SStructGridAssemble(grid_level[level]);
    }
 
-   (fac_data -> grid_level)= grid_level;
+   (fac_data -> grid_level) = grid_level;
 
    /*-----------------------------------------------------------
     * Set up the graph. Create only the structured components
     * first.
     *-----------------------------------------------------------*/
-   graph_level= hypre_TAlloc(hypre_SStructGraph *,  max_level+1, HYPRE_MEMORY_HOST);
-   for (level= max_level; level >= 0; level--)
+   graph_level = hypre_TAlloc(hypre_SStructGraph *,  max_level + 1, HYPRE_MEMORY_HOST);
+   for (level = max_level; level >= 0; level--)
    {
       HYPRE_SStructGraphCreate(comm, grid_level[level], &graph_level[level]);
    }
 
-   for (level= max_level; level >= 0; level--)
+   for (level = max_level; level >= 0; level--)
    {
       /*-----------------------------------------------------------------------
        * Create the fine part of the finest level structured graph connection.
@@ -288,7 +290,7 @@ hypre_FacSetup2( void                 *fac_vdata,
          nvars = hypre_SStructPGridNVars(pgrid);
          for (var1 = 0; var1 < nvars; var1++)
          {
-            stencils= hypre_SStructGraphStencil(graph, levels[level], var1);
+            stencils = hypre_SStructGraphStencil(graph, levels[level], var1);
             HYPRE_SStructGraphSetStencil(graph_level[level], part_fine, var1, stencils);
 
             if (level == 0)
@@ -304,18 +306,18 @@ hypre_FacSetup2( void                 *fac_vdata,
        *--------------------------------------------------------------------------*/
       if (level > 0)
       {
-         pgrid = hypre_SStructGridPGrid(grid, levels[level-1]);
+         pgrid = hypre_SStructGridPGrid(grid, levels[level - 1]);
          nvars = hypre_SStructPGridNVars(pgrid);
 
          for (var1 = 0; var1 < nvars; var1++)
          {
-            stencils= hypre_SStructGraphStencil(graph, levels[level-1], var1);
+            stencils = hypre_SStructGraphStencil(graph, levels[level - 1], var1);
             HYPRE_SStructGraphSetStencil(graph_level[level], part_crse, var1, stencils );
-            HYPRE_SStructGraphSetStencil(graph_level[level-1], part_fine, var1, stencils );
+            HYPRE_SStructGraphSetStencil(graph_level[level - 1], part_fine, var1, stencils );
 
             if (level == 1)
             {
-               HYPRE_SStructGraphSetStencil(graph_level[level-1], part_crse, var1, stencils );
+               HYPRE_SStructGraphSetStencil(graph_level[level - 1], part_crse, var1, stencils );
             }
 
          }
@@ -331,23 +333,23 @@ hypre_FacSetup2( void                 *fac_vdata,
     * CONNECTIONS.
     *-----------------------------------------------------------*/
    Uventries =  hypre_SStructGraphUVEntries(graph);
-   nUventries=  hypre_SStructGraphNUVEntries(graph);
-   iUventries=  hypre_SStructGraphIUVEntries(graph);
+   nUventries =  hypre_SStructGraphNUVEntries(graph);
+   iUventries =  hypre_SStructGraphIUVEntries(graph);
 
-   nrows     =  hypre_CTAlloc(HYPRE_Int,  max_level+1, HYPRE_MEMORY_HOST);
-   for (i= 0; i< nUventries; i++)
+   nrows     =  hypre_CTAlloc(HYPRE_Int,  max_level + 1, HYPRE_MEMORY_HOST);
+   for (i = 0; i < nUventries; i++)
    {
-      Uventry=  Uventries[iUventries[i]];
+      Uventry =  Uventries[iUventries[i]];
 
       part     =  hypre_SStructUVEntryPart(Uventry);
       hypre_CopyIndex(hypre_SStructUVEntryIndex(Uventry), index);
       var      =  hypre_SStructUVEntryVar(Uventry);
-      nUentries=  hypre_SStructUVEntryNUEntries(Uventry);
+      nUentries =  hypre_SStructUVEntryNUEntries(Uventry);
 
-      for (k= 0; k< nUentries; k++)
+      for (k = 0; k < nUentries; k++)
       {
          Uentry  =  hypre_SStructUVEntryUEntry(Uventry, k);
-    
+
          to_part =  hypre_SStructUEntryToPart(Uentry);
          hypre_CopyIndex(hypre_SStructUEntryToIndex(Uentry), to_index);
          to_var  =  hypre_SStructUEntryToVar(Uentry);
@@ -371,25 +373,25 @@ hypre_FacSetup2( void                 *fac_vdata,
       }
    }
 
-   for (level= 0; level <= max_level; level++)
+   for (level = 0; level <= max_level; level++)
    {
       HYPRE_SStructGraphAssemble(graph_level[level]);
    }
 
-   (fac_data -> graph_level)= graph_level;
+   (fac_data -> graph_level) = graph_level;
 
    /*---------------------------------------------------------------
     * Create the level SStruct_Vectors, and temporary global
-    * sstuct_vector. 
+    * sstuct_vector.
     *---------------------------------------------------------------*/
-   b_level= hypre_TAlloc(hypre_SStructVector *,  max_level+1, HYPRE_MEMORY_HOST);
-   x_level= hypre_TAlloc(hypre_SStructVector *,  max_level+1, HYPRE_MEMORY_HOST);
-   r_level= hypre_TAlloc(hypre_SStructVector *,  max_level+1, HYPRE_MEMORY_HOST);
-   e_level= hypre_TAlloc(hypre_SStructVector *,  max_level+1, HYPRE_MEMORY_HOST);
+   b_level = hypre_TAlloc(hypre_SStructVector *,  max_level + 1, HYPRE_MEMORY_HOST);
+   x_level = hypre_TAlloc(hypre_SStructVector *,  max_level + 1, HYPRE_MEMORY_HOST);
+   r_level = hypre_TAlloc(hypre_SStructVector *,  max_level + 1, HYPRE_MEMORY_HOST);
+   e_level = hypre_TAlloc(hypre_SStructVector *,  max_level + 1, HYPRE_MEMORY_HOST);
 
-   tx_level= hypre_TAlloc(hypre_SStructPVector *,  max_level+1, HYPRE_MEMORY_HOST);
+   tx_level = hypre_TAlloc(hypre_SStructPVector *,  max_level + 1, HYPRE_MEMORY_HOST);
 
-   for (level= 0; level<= max_level; level++)
+   for (level = 0; level <= max_level; level++)
    {
       HYPRE_SStructVectorCreate(comm, grid_level[level], &b_level[level]);
       HYPRE_SStructVectorInitialize(b_level[level]);
@@ -425,67 +427,67 @@ hypre_FacSetup2( void                 *fac_vdata,
    (fac_data -> x_level) = x_level;
    (fac_data -> r_level) = r_level;
    (fac_data -> e_level) = e_level;
-   (fac_data -> tx_level)= tx_level;
+   (fac_data -> tx_level) = tx_level;
    (fac_data -> tx)      = tx;
 
    /*-----------------------------------------------------------
-    * Set up the level composite sstruct_matrices. 
+    * Set up the level composite sstruct_matrices.
     *-----------------------------------------------------------*/
 
-   A_level= hypre_TAlloc(hypre_SStructMatrix *,  max_level+1, HYPRE_MEMORY_HOST);
+   A_level = hypre_TAlloc(hypre_SStructMatrix *,  max_level + 1, HYPRE_MEMORY_HOST);
    hypre_SetIndex3(stride, 1, 1, 1);
-   for (level= 0; level <= max_level; level++)
+   for (level = 0; level <= max_level; level++)
    {
       HYPRE_SStructMatrixCreate(comm, graph_level[level], &A_level[level]);
       HYPRE_SStructMatrixInitialize(A_level[level]);
 
-      max_box_volume= 0;
+      max_box_volume = 0;
       pgrid = hypre_SStructGridPGrid(grid, levels[level]);
       nvars = hypre_SStructPGridNVars(pgrid);
 
       for (var1 = 0; var1 < nvars; var1++)
       {
-         sgrid= hypre_SStructPGridSGrid(pgrid, var1);
-         sgrid_boxes= hypre_StructGridBoxes(sgrid);
+         sgrid = hypre_SStructPGridSGrid(pgrid, var1);
+         sgrid_boxes = hypre_StructGridBoxes(sgrid);
 
          hypre_ForBoxI(i, sgrid_boxes)
          {
             sgrid_box = hypre_BoxArrayBox(sgrid_boxes, i);
-            box_volume= hypre_BoxVolume(sgrid_box);
+            box_volume = hypre_BoxVolume(sgrid_box);
 
-            max_box_volume= hypre_max(max_box_volume, box_volume);
+            max_box_volume = hypre_max(max_box_volume, box_volume);
          }
       }
 
       values   = hypre_TAlloc(HYPRE_Real,  max_box_volume, HYPRE_MEMORY_HOST);
-      A_pmatrix= hypre_SStructMatrixPMatrix(A_rap, levels[level]);
+      A_pmatrix = hypre_SStructMatrixPMatrix(A_rap, levels[level]);
 
       /*-----------------------------------------------------------
        * extract stencil values for all fine levels.
        *-----------------------------------------------------------*/
       for (var1 = 0; var1 < nvars; var1++)
       {
-         sgrid= hypre_SStructPGridSGrid(pgrid, var1);
-         sgrid_boxes= hypre_StructGridBoxes(sgrid);
+         sgrid = hypre_SStructPGridSGrid(pgrid, var1);
+         sgrid_boxes = hypre_StructGridBoxes(sgrid);
 
-         stencils= hypre_SStructGraphStencil(graph, levels[level], var1);
-         stencil_size= hypre_SStructStencilSize(stencils);
-         stencil_vars= hypre_SStructStencilVars(stencils);
+         stencils = hypre_SStructGraphStencil(graph, levels[level], var1);
+         stencil_size = hypre_SStructStencilSize(stencils);
+         stencil_vars = hypre_SStructStencilVars(stencils);
 
          for (i = 0; i < stencil_size; i++)
          {
-            var2= stencil_vars[i];
-            A_smatrix= hypre_SStructPMatrixSMatrix(A_pmatrix, var1, var2);
+            var2 = stencil_vars[i];
+            A_smatrix = hypre_SStructPMatrixSMatrix(A_pmatrix, var1, var2);
             hypre_CopyIndex(hypre_SStructStencilEntry(stencils, i), stencil_shape_i);
 
             hypre_ForBoxI(j, sgrid_boxes)
             {
-               sgrid_box=  hypre_BoxArrayBox(sgrid_boxes, j);
-               box_start=  hypre_BoxIMin(sgrid_box);
+               sgrid_box =  hypre_BoxArrayBox(sgrid_boxes, j);
+               box_start =  hypre_BoxIMin(sgrid_box);
                box_end  =  hypre_BoxIMax(sgrid_box);
 
-               A_smatrix_dbox=  hypre_BoxArrayBox(hypre_StructMatrixDataSpace(A_smatrix), j);
-               A_smatrix_value= 
+               A_smatrix_dbox =  hypre_BoxArrayBox(hypre_StructMatrixDataSpace(A_smatrix), j);
+               A_smatrix_value =
                   hypre_StructMatrixExtractPointerByIndex(A_smatrix, j, stencil_shape_i);
 
                hypre_BoxGetSize(sgrid_box, loop_size);
@@ -495,70 +497,70 @@ hypre_FacSetup2( void                 *fac_vdata,
                                    sgrid_box, box_start, stride, k,
                                    A_smatrix_dbox, box_start, stride, iA);
                {
-                  values[k]= A_smatrix_value[iA];
+                  values[k] = A_smatrix_value[iA];
                }
                hypre_BoxLoop2End(k, iA);
 #undef DEVICE_VAR
 
                HYPRE_SStructMatrixSetBoxValues(A_level[level], part_fine, box_start, box_end,
                                                var1, 1, &i, values);
-            }   /* hypre_ForBoxI */ 
+            }   /* hypre_ForBoxI */
          }      /* for i */
       }         /* for var1 */
       hypre_TFree(values, HYPRE_MEMORY_HOST);
 
       /*-----------------------------------------------------------
-       *  Extract the coarse part 
+       *  Extract the coarse part
        *-----------------------------------------------------------*/
       if (level > 0)
       {
-         max_box_volume= 0;
-         pgrid = hypre_SStructGridPGrid(grid, levels[level-1]);
+         max_box_volume = 0;
+         pgrid = hypre_SStructGridPGrid(grid, levels[level - 1]);
          nvars = hypre_SStructPGridNVars(pgrid);
 
          for (var1 = 0; var1 < nvars; var1++)
          {
             sgrid      = hypre_SStructPGridSGrid( pgrid, var1 );
-            sgrid_boxes= hypre_StructGridBoxes(sgrid);
+            sgrid_boxes = hypre_StructGridBoxes(sgrid);
 
             hypre_ForBoxI( i, sgrid_boxes )
             {
                sgrid_box = hypre_BoxArrayBox(sgrid_boxes, i);
-               box_volume= hypre_BoxVolume(sgrid_box);
+               box_volume = hypre_BoxVolume(sgrid_box);
 
-               max_box_volume= hypre_max(max_box_volume, box_volume );
+               max_box_volume = hypre_max(max_box_volume, box_volume );
             }
          }
 
          values   = hypre_TAlloc(HYPRE_Real,  max_box_volume, HYPRE_MEMORY_HOST);
-         A_pmatrix= hypre_SStructMatrixPMatrix(A_rap, levels[level-1]);
+         A_pmatrix = hypre_SStructMatrixPMatrix(A_rap, levels[level - 1]);
 
          /*-----------------------------------------------------------
-          * extract stencil values 
+          * extract stencil values
           *-----------------------------------------------------------*/
          for (var1 = 0; var1 < nvars; var1++)
          {
             sgrid      = hypre_SStructPGridSGrid(pgrid, var1);
-            sgrid_boxes= hypre_StructGridBoxes(sgrid);
+            sgrid_boxes = hypre_StructGridBoxes(sgrid);
 
-            stencils= hypre_SStructGraphStencil(graph, levels[level-1], var1);
-            stencil_size= hypre_SStructStencilSize(stencils);
-            stencil_vars= hypre_SStructStencilVars(stencils);
+            stencils = hypre_SStructGraphStencil(graph, levels[level - 1], var1);
+            stencil_size = hypre_SStructStencilSize(stencils);
+            stencil_vars = hypre_SStructStencilVars(stencils);
 
             for (i = 0; i < stencil_size; i++)
             {
-               var2= stencil_vars[i];
-               A_smatrix= hypre_SStructPMatrixSMatrix(A_pmatrix, var1, var2);
+               var2 = stencil_vars[i];
+               A_smatrix = hypre_SStructPMatrixSMatrix(A_pmatrix, var1, var2);
                hypre_CopyIndex(hypre_SStructStencilEntry(stencils, i), stencil_shape_i);
 
                hypre_ForBoxI( j, sgrid_boxes )
                {
-                  sgrid_box=  hypre_BoxArrayBox(sgrid_boxes, j);
-                  box_start=  hypre_BoxIMin(sgrid_box);
+                  sgrid_box =  hypre_BoxArrayBox(sgrid_boxes, j);
+                  box_start =  hypre_BoxIMin(sgrid_box);
                   box_end  =  hypre_BoxIMax(sgrid_box);
 
-                  A_smatrix_dbox=  hypre_BoxArrayBox(hypre_StructMatrixDataSpace(A_smatrix), j);
-                  A_smatrix_value= 
+                  A_smatrix_dbox =  hypre_BoxArrayBox(hypre_StructMatrixDataSpace(A_smatrix), j);
+                  A_smatrix_value =
                      hypre_StructMatrixExtractPointerByIndex(A_smatrix, j, stencil_shape_i);
 
                   hypre_BoxGetSize(sgrid_box, loop_size);
@@ -568,14 +570,14 @@ hypre_FacSetup2( void                 *fac_vdata,
                                       sgrid_box, box_start, stride, k,
                                       A_smatrix_dbox, box_start, stride, iA);
                   {
-                     values[k]= A_smatrix_value[iA];
+                     values[k] = A_smatrix_value[iA];
                   }
                   hypre_BoxLoop2End(k, iA);
 #undef DEVICE_VAR
 
                   HYPRE_SStructMatrixSetBoxValues(A_level[level], part_crse, box_start, box_end,
                                                   var1, 1, &i, values);
-               }  /* hypre_ForBoxI */ 
+               }  /* hypre_ForBoxI */
             }     /* for i */
          }        /* for var1 */
          hypre_TFree(values, HYPRE_MEMORY_HOST);
@@ -589,32 +591,32 @@ hypre_FacSetup2( void                 *fac_vdata,
     *-----------------------------------------------------------*/
 
    Uventries =  hypre_SStructGraphUVEntries(graph);
-   nUventries=  hypre_SStructGraphNUVEntries(graph);
-   iUventries=  hypre_SStructGraphIUVEntries(graph);
+   nUventries =  hypre_SStructGraphNUVEntries(graph);
+   iUventries =  hypre_SStructGraphIUVEntries(graph);
 
    /*-----------------------------------------------------------
     * Allocate memory for arguments of HYPRE_IJMatrixGetValues.
     *-----------------------------------------------------------*/
-   ncols =  hypre_TAlloc(HYPRE_Int *,  max_level+1, HYPRE_MEMORY_HOST);
-   rows  =  hypre_TAlloc(HYPRE_BigInt *,  max_level+1, HYPRE_MEMORY_HOST);
-   cols  =  hypre_TAlloc(HYPRE_BigInt *,  max_level+1, HYPRE_MEMORY_HOST);
-   cnt   =  hypre_CTAlloc(HYPRE_Int,  max_level+1, HYPRE_MEMORY_HOST);
+   ncols =  hypre_TAlloc(HYPRE_Int *,  max_level + 1, HYPRE_MEMORY_HOST);
+   rows  =  hypre_TAlloc(HYPRE_BigInt *,  max_level + 1, HYPRE_MEMORY_HOST);
+   cols  =  hypre_TAlloc(HYPRE_BigInt *,  max_level + 1, HYPRE_MEMORY_HOST);
+   cnt   =  hypre_CTAlloc(HYPRE_Int,  max_level + 1, HYPRE_MEMORY_HOST);
 
-   ncols[0]= NULL;
+   ncols[0] = NULL;
    rows[0] = NULL;
    cols[0] = NULL;
-   for (level= 1; level<= max_level; level++)
+   for (level = 1; level <= max_level; level++)
    {
-      ncols[level]= hypre_TAlloc(HYPRE_Int,  nrows[level], HYPRE_MEMORY_HOST);
-      for (i=0; i< nrows[level]; i++)
+      ncols[level] = hypre_TAlloc(HYPRE_Int,  nrows[level], HYPRE_MEMORY_HOST);
+      for (i = 0; i < nrows[level]; i++)
       {
-         ncols[level][i]= 1;
+         ncols[level][i] = 1;
       }
       rows[level] = hypre_TAlloc(HYPRE_BigInt,  nrows[level], HYPRE_MEMORY_HOST);
       cols[level] = hypre_TAlloc(HYPRE_BigInt,  nrows[level], HYPRE_MEMORY_HOST);
    }
-   
-   for (i= 0; i< nUventries; i++)
+
+   for (i = 0; i < nUventries; i++)
    {
       Uventry  =  Uventries[iUventries[i]];
 
@@ -626,30 +628,30 @@ hypre_FacSetup2( void                 *fac_vdata,
       hypre_SStructBoxManEntryGetGlobalRank(boxman_entry, index, &row_coord,
                                             matrix_type);
 
-      nUentries=  hypre_SStructUVEntryNUEntries(Uventry);
-      for (k= 0; k< nUentries; k++)
+      nUentries =  hypre_SStructUVEntryNUEntries(Uventry);
+      for (k = 0; k < nUentries; k++)
       {
          to_part =  hypre_SStructUVEntryToPart(Uventry, k);
          to_rank =  hypre_SStructUVEntryToRank(Uventry, k);
-         
+
          /*-----------------------------------------------------------
           *  store the row & col indices in the correct level.
           *-----------------------------------------------------------*/
          level   = hypre_max( part_to_level[part], part_to_level[to_part] );
-         rows[level][ cnt[level] ]= row_coord;
-         cols[level][ cnt[level]++ ]= to_rank;
+         rows[level][ cnt[level] ] = row_coord;
+         cols[level][ cnt[level]++ ] = to_rank;
       }
    }
    hypre_TFree(cnt, HYPRE_MEMORY_HOST);
 
-   for (level= 1; level<= max_level; level++)
+   for (level = 1; level <= max_level; level++)
    {
-  
+
       vals      = hypre_CTAlloc(HYPRE_Real,  nrows[level], HYPRE_MEMORY_HOST);
-      level_rows= hypre_TAlloc(HYPRE_BigInt,  nrows[level], HYPRE_MEMORY_HOST);
-      level_cols= hypre_TAlloc(HYPRE_BigInt,  nrows[level], HYPRE_MEMORY_HOST);
+      level_rows = hypre_TAlloc(HYPRE_BigInt,  nrows[level], HYPRE_MEMORY_HOST);
+      level_cols = hypre_TAlloc(HYPRE_BigInt,  nrows[level], HYPRE_MEMORY_HOST);
 
-      HYPRE_IJMatrixGetValues(ij_A, nrows[level], ncols[level], rows[level], 
+      HYPRE_IJMatrixGetValues(ij_A, nrows[level], ncols[level], rows[level],
                               cols[level], vals);
 
       Uventries =  hypre_SStructGraphUVEntries(graph_level[level]);
@@ -657,42 +659,42 @@ hypre_FacSetup2( void                 *fac_vdata,
        * Find the rows & cols of the level ij_matrices where the
        * extracted data must be placed. Note that because the
        * order in which the HYPRE_SStructGraphAddEntries in the
-       * graph_level's is the same order in which rows[level] & 
+       * graph_level's is the same order in which rows[level] &
        * cols[level] were formed, the coefficients in val are
        * in the correct order.
        *-----------------------------------------------------------*/
 
-      level_cnt= 0;
-      for (i= 0; i< hypre_SStructGraphNUVEntries(graph_level[level]); i++)
+      level_cnt = 0;
+      for (i = 0; i < hypre_SStructGraphNUVEntries(graph_level[level]); i++)
       {
          j      =  hypre_SStructGraphIUVEntry(graph_level[level], i);
-         Uventry=  Uventries[j];
+         Uventry =  Uventries[j];
 
          part     =  hypre_SStructUVEntryPart(Uventry);
          hypre_CopyIndex(hypre_SStructUVEntryIndex(Uventry), index);
          var      =  hypre_SStructUVEntryVar(Uventry);
-   
+
          hypre_SStructGridFindBoxManEntry(grid_level[level], part, index, var, &boxman_entry);
          hypre_SStructBoxManEntryGetGlobalRank(boxman_entry, index, &row_coord, matrix_type);
 
-         nUentries=  hypre_SStructUVEntryNUEntries(Uventry);
-         for (k= 0; k< nUentries; k++)
+         nUentries =  hypre_SStructUVEntryNUEntries(Uventry);
+         for (k = 0; k < nUentries; k++)
          {
             to_rank =  hypre_SStructUVEntryToRank(Uventry, k);
-         
+
             level_rows[level_cnt]  = row_coord;
-            level_cols[level_cnt++]= to_rank;
+            level_cols[level_cnt++] = to_rank;
          }
       }
-    
+
       /*-----------------------------------------------------------
        * Place the extracted ij coefficients into the level ij
        * matrices.
        *-----------------------------------------------------------*/
       HYPRE_IJMatrixSetValues( hypre_SStructMatrixIJMatrix(A_level[level]),
-                               nrows[level], ncols[level], (const HYPRE_BigInt *) level_rows, 
+                               nrows[level], ncols[level], (const HYPRE_BigInt *) level_rows,
                                (const HYPRE_BigInt *) level_cols, (const HYPRE_Real *) vals );
-      
+
       hypre_TFree(ncols[level], HYPRE_MEMORY_HOST);
       hypre_TFree(rows[level], HYPRE_MEMORY_HOST);
       hypre_TFree(cols[level], HYPRE_MEMORY_HOST);
@@ -706,30 +708,30 @@ hypre_FacSetup2( void                 *fac_vdata,
    hypre_TFree(rows, HYPRE_MEMORY_HOST);
    hypre_TFree(cols, HYPRE_MEMORY_HOST);
    hypre_TFree(nrows, HYPRE_MEMORY_HOST);
- 
+
    /*---------------------------------------------------------------
     * Construct the fine grid (part 1) SStruct_PMatrix for all
     * levels except for max_level. This involves coarsening the
-    * finer level SStruct_Matrix. Coarsening involves interpolation, 
+    * finer level SStruct_Matrix. Coarsening involves interpolation,
     * matvec, and restriction (to obtain the "row-sum").
     *---------------------------------------------------------------*/
-   matvec_data_level  = hypre_TAlloc(void *,  max_level+1, HYPRE_MEMORY_HOST);
-   pmatvec_data_level = hypre_TAlloc(void *,  max_level+1, HYPRE_MEMORY_HOST);
-   interp_data_level  = hypre_TAlloc(void *,  max_level+1, HYPRE_MEMORY_HOST);
-   restrict_data_level= hypre_TAlloc(void *,  max_level+1, HYPRE_MEMORY_HOST);
-   for (level= 0; level<= max_level; level++)
+   matvec_data_level  = hypre_TAlloc(void *,  max_level + 1, HYPRE_MEMORY_HOST);
+   pmatvec_data_level = hypre_TAlloc(void *,  max_level + 1, HYPRE_MEMORY_HOST);
+   interp_data_level  = hypre_TAlloc(void *,  max_level + 1, HYPRE_MEMORY_HOST);
+   restrict_data_level = hypre_TAlloc(void *,  max_level + 1, HYPRE_MEMORY_HOST);
+   for (level = 0; level <= max_level; level++)
    {
       if (level < max_level)
       {
          hypre_FacSemiInterpCreate2(&interp_data_level[level]);
          hypre_FacSemiInterpSetup2(interp_data_level[level],
-                                   x_level[level+1], 
+                                   x_level[level + 1],
                                    hypre_SStructVectorPVector(x_level[level], part_fine),
-                                   refine_factors[level+1]);
+                                   refine_factors[level + 1]);
       }
       else
       {
-         interp_data_level[level]= NULL;
+         interp_data_level[level] = NULL;
       }
 
       if (level > 0)
@@ -738,18 +740,18 @@ hypre_FacSetup2( void                 *fac_vdata,
 
          hypre_FacSemiRestrictSetup2(restrict_data_level[level],
                                      x_level[level], part_crse, part_fine,
-                                     hypre_SStructVectorPVector(x_level[level-1], part_fine),
+                                     hypre_SStructVectorPVector(x_level[level - 1], part_fine),
                                      refine_factors[level]);
       }
       else
       {
-         restrict_data_level[level]= NULL;
+         restrict_data_level[level] = NULL;
       }
    }
 
-   for (level= max_level; level> 0; level--)
+   for (level = max_level; level > 0; level--)
    {
-      
+
       /*  hypre_FacZeroCFSten(hypre_SStructMatrixPMatrix(A_level[level], part_fine),
           hypre_SStructMatrixPMatrix(A_level[level], part_crse),
           grid_level[level],
@@ -765,7 +767,7 @@ hypre_FacSetup2( void                 *fac_vdata,
 
       HYPRE_SStructMatrixAssemble(A_level[level]);
       /*------------------------------------------------------------
-       * create data structures that are needed for coarsening 
+       * create data structures that are needed for coarsening
        -------------------------------------------------------------*/
       hypre_SStructMatvecCreate(&matvec_data_level[level]);
       hypre_SStructMatvecSetup(matvec_data_level[level],
@@ -774,50 +776,50 @@ hypre_FacSetup2( void                 *fac_vdata,
 
       hypre_SStructPMatvecCreate(&pmatvec_data_level[level]);
       hypre_SStructPMatvecSetup(pmatvec_data_level[level],
-                                hypre_SStructMatrixPMatrix(A_level[level],part_fine),
-                                hypre_SStructVectorPVector(x_level[level],part_fine));
-   } 
+                                hypre_SStructMatrixPMatrix(A_level[level], part_fine),
+                                hypre_SStructVectorPVector(x_level[level], part_fine));
+   }
 
    /*---------------------------------------------------------------
     * To avoid memory leaks, we cannot reference the coarsest level
     * SStructPMatrix. We need only copy the stuctured coefs.
     *---------------------------------------------------------------*/
-   pgrid= hypre_SStructGridPGrid(grid_level[0], part_fine);
-   nvars= hypre_SStructPGridNVars(pgrid);
-   A_pmatrix= hypre_SStructMatrixPMatrix(A_level[0], part_fine);
+   pgrid = hypre_SStructGridPGrid(grid_level[0], part_fine);
+   nvars = hypre_SStructPGridNVars(pgrid);
+   A_pmatrix = hypre_SStructMatrixPMatrix(A_level[0], part_fine);
    for (var1 = 0; var1 < nvars; var1++)
    {
-      sgrid= hypre_SStructPGridSGrid(pgrid, var1);
-      sgrid_boxes= hypre_StructGridBoxes(sgrid);
+      sgrid = hypre_SStructPGridSGrid(pgrid, var1);
+      sgrid_boxes = hypre_StructGridBoxes(sgrid);
 
-      max_box_volume= 0;
+      max_box_volume = 0;
       hypre_ForBoxI(i, sgrid_boxes)
       {
          sgrid_box = hypre_BoxArrayBox(sgrid_boxes, i);
-         box_volume= hypre_BoxVolume(sgrid_box);
+         box_volume = hypre_BoxVolume(sgrid_box);
 
-         max_box_volume= hypre_max(max_box_volume, box_volume);
+         max_box_volume = hypre_max(max_box_volume, box_volume);
       }
 
       values   = hypre_TAlloc(HYPRE_Real,  max_box_volume, HYPRE_MEMORY_HOST);
-   
-      stencils= hypre_SStructGraphStencil(graph_level[0], part_fine, var1);
-      stencil_size= hypre_SStructStencilSize(stencils);
-      stencil_vars= hypre_SStructStencilVars(stencils);
+
+      stencils = hypre_SStructGraphStencil(graph_level[0], part_fine, var1);
+      stencil_size = hypre_SStructStencilSize(stencils);
+      stencil_vars = hypre_SStructStencilVars(stencils);
 
       for (i = 0; i < stencil_size; i++)
       {
-         var2= stencil_vars[i];
-         A_smatrix= hypre_SStructPMatrixSMatrix(A_pmatrix, var1, var2);
+         var2 = stencil_vars[i];
+         A_smatrix = hypre_SStructPMatrixSMatrix(A_pmatrix, var1, var2);
          hypre_CopyIndex(hypre_SStructStencilEntry(stencils, i), stencil_shape_i);
          hypre_ForBoxI(j, sgrid_boxes)
          {
-            sgrid_box=  hypre_BoxArrayBox(sgrid_boxes, j);
-            box_start=  hypre_BoxIMin(sgrid_box);
+            sgrid_box =  hypre_BoxArrayBox(sgrid_boxes, j);
+            box_start =  hypre_BoxIMin(sgrid_box);
             box_end  =  hypre_BoxIMax(sgrid_box);
 
-            A_smatrix_dbox=  hypre_BoxArrayBox(hypre_StructMatrixDataSpace(A_smatrix), j);
-            A_smatrix_value=
+            A_smatrix_dbox =  hypre_BoxArrayBox(hypre_StructMatrixDataSpace(A_smatrix), j);
+            A_smatrix_value =
                hypre_StructMatrixExtractPointerByIndex(A_smatrix, j, stencil_shape_i);
 
             hypre_BoxGetSize(sgrid_box, loop_size);
@@ -827,7 +829,7 @@ hypre_FacSetup2( void                 *fac_vdata,
                                 sgrid_box, box_start, stride, k,
                                 A_smatrix_dbox, box_start, stride, iA);
             {
-               values[k]= A_smatrix_value[iA];
+               values[k] = A_smatrix_value[iA];
             }
             hypre_BoxLoop2End(k, iA);
 #undef DEVICE_VAR
@@ -836,7 +838,7 @@ hypre_FacSetup2( void                 *fac_vdata,
                                             var1, 1, &i, values);
          }   /* hypre_ForBoxI */
       }      /* for i */
-      
+
       hypre_TFree(values, HYPRE_MEMORY_HOST);
    }         /* for var1 */
 
@@ -849,9 +851,9 @@ hypre_FacSetup2( void                 *fac_vdata,
 
    hypre_SStructPMatvecCreate(&pmatvec_data_level[0]);
    hypre_SStructPMatvecSetup(pmatvec_data_level[0],
-                             hypre_SStructMatrixPMatrix(A_level[0],part_fine),
-                             hypre_SStructVectorPVector(x_level[0],part_fine));
-   
+                             hypre_SStructMatrixPMatrix(A_level[0], part_fine),
+                             hypre_SStructVectorPVector(x_level[0], part_fine));
+
    hypre_SStructMatvecCreate(&matvec_data);
    hypre_SStructMatvecSetup(matvec_data, A_rap, x);
 
@@ -867,11 +869,11 @@ hypre_FacSetup2( void                 *fac_vdata,
    /*---------------------------------------------------------------
     * Create the fine patch relax_data structure.
     *---------------------------------------------------------------*/
-   relax_data_level   = hypre_TAlloc(void *,  max_level+1, HYPRE_MEMORY_HOST);
-   
-   for (level= 0; level<= max_level; level++)
+   relax_data_level   = hypre_TAlloc(void *,  max_level + 1, HYPRE_MEMORY_HOST);
+
+   for (level = 0; level <= max_level; level++)
    {
-      relax_data_level[level]=  hypre_SysPFMGRelaxCreate(comm);
+      relax_data_level[level] =  hypre_SysPFMGRelaxCreate(comm);
       hypre_SysPFMGRelaxSetTol(relax_data_level[level], 0.0);
       hypre_SysPFMGRelaxSetType(relax_data_level[level], relax_type);
       if (usr_jacobi_weight)
@@ -879,14 +881,14 @@ hypre_FacSetup2( void                 *fac_vdata,
          hypre_SysPFMGRelaxSetJacobiWeight(relax_data_level[level], jacobi_weight);
       }
       hypre_SysPFMGRelaxSetTempVec(relax_data_level[level], tx_level[level]);
-      hypre_SysPFMGRelaxSetup(relax_data_level[level], 
+      hypre_SysPFMGRelaxSetup(relax_data_level[level],
                               hypre_SStructMatrixPMatrix(A_level[level], part_fine),
                               hypre_SStructVectorPVector(b_level[level], part_fine),
                               hypre_SStructVectorPVector(x_level[level], part_fine));
    }
    (fac_data -> relax_data_level)    = relax_data_level;
-  
-   
+
+
    /*---------------------------------------------------------------
     * Create the coarsest composite level preconditioned solver.
     *  csolver_type=   1      multigrid-pcg
@@ -898,7 +900,7 @@ hypre_FacSetup2( void                 *fac_vdata,
       HYPRE_PCGSetMaxIter((HYPRE_Solver) crse_solver, 1);
       HYPRE_PCGSetTol((HYPRE_Solver) crse_solver, 1.0e-6);
       HYPRE_PCGSetTwoNorm((HYPRE_Solver) crse_solver, 1);
- 
+
       /* use SysPFMG solver as preconditioner */
       HYPRE_SStructSysPFMGCreate(comm, &crse_precond);
       HYPRE_SStructSysPFMGSetMaxIter(crse_precond, 1);
@@ -917,7 +919,7 @@ hypre_FacSetup2( void                 *fac_vdata,
                           (HYPRE_PtrToSolverFcn) HYPRE_SStructSysPFMGSetup,
                           (HYPRE_Solver) crse_precond);
 
-      HYPRE_PCGSetup((HYPRE_Solver) crse_solver, 
+      HYPRE_PCGSetup((HYPRE_Solver) crse_solver,
                      (HYPRE_Matrix) A_level[0],
                      (HYPRE_Vector) b_level[0],
                      (HYPRE_Vector) x_level[0]);
@@ -925,7 +927,7 @@ hypre_FacSetup2( void                 *fac_vdata,
 
    else if (csolver_type == 2)
    {
-      crse_precond= NULL;
+      crse_precond = NULL;
 
       HYPRE_SStructSysPFMGCreate(comm, &crse_solver);
       HYPRE_SStructSysPFMGSetMaxIter(crse_solver, 1);
@@ -949,4 +951,3 @@ hypre_FacSetup2( void                 *fac_vdata,
 
    return ierr;
 }
-
diff --git a/external/hypre/src/sstruct_ls/fac_solve3.c b/external/hypre/src/sstruct_ls/fac_solve3.c
index 821fefde..f1cb60b9 100644
--- a/external/hypre/src/sstruct_ls/fac_solve3.c
+++ b/external/hypre/src/sstruct_ls/fac_solve3.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -17,42 +17,44 @@
 
 HYPRE_Int
 hypre_FACSolve3( void                 *fac_vdata,
-                hypre_SStructMatrix  *A_user,
-                hypre_SStructVector  *b_in,
-                hypre_SStructVector  *x_in         )
+                 hypre_SStructMatrix  *A_user,
+                 hypre_SStructVector  *b_in,
+                 hypre_SStructVector  *x_in         )
 {
-	hypre_FACData           *fac_data           = (hypre_FACData*)fac_vdata;
-
-   hypre_SStructMatrix     *A_in               =(fac_data-> A_rap);
-   hypre_SStructMatrix    **A_level            =(fac_data-> A_level);
-   hypre_SStructVector    **b_level            =(fac_data-> b_level);
-   hypre_SStructVector    **x_level            =(fac_data-> x_level);
-   hypre_SStructVector    **e_level            =(fac_data-> e_level);
-   hypre_SStructPVector   **tx_level           =(fac_data-> tx_level);
-   hypre_SStructVector     *tx                 =(fac_data-> tx);
-   void                   **relax_data_level   =(fac_data-> relax_data_level);
-   void                   **matvec_data_level  =(fac_data-> matvec_data_level);
-   void                   **pmatvec_data_level =(fac_data-> pmatvec_data_level);
-   void                   **restrict_data_level=(fac_data-> restrict_data_level);
-   void                   **interp_data_level  =(fac_data-> interp_data_level);
-   void                    *matvec_data        =(fac_data-> matvec_data);
-   HYPRE_SStructSolver      csolver            =(fac_data-> csolver);
-
-   HYPRE_Int                max_level          =(fac_data-> max_levels);
-   HYPRE_Int               *levels             =(fac_data-> level_to_part);
-   HYPRE_Int                max_cycles         =(fac_data-> max_cycles);
-   HYPRE_Int                rel_change         =(fac_data-> rel_change);
-   HYPRE_Int                zero_guess         =(fac_data-> zero_guess);
-   HYPRE_Int                num_pre_smooth     =(fac_data-> num_pre_smooth);
-   HYPRE_Int                num_post_smooth    =(fac_data-> num_post_smooth);
-   HYPRE_Int                csolver_type       =(fac_data-> csolver_type);
-   HYPRE_Int                logging            =(fac_data-> logging);
-   HYPRE_Real              *norms              =(fac_data-> norms);
-   HYPRE_Real              *rel_norms          =(fac_data-> rel_norms);
-   HYPRE_Real               tol                =(fac_data-> tol);
-
-   HYPRE_Int                part_crse= 0;
-   HYPRE_Int                part_fine= 1;
+   HYPRE_UNUSED_VAR(A_user);
+
+   hypre_FACData           *fac_data           = (hypre_FACData*)fac_vdata;
+
+   hypre_SStructMatrix     *A_in               = (fac_data-> A_rap);
+   hypre_SStructMatrix    **A_level            = (fac_data-> A_level);
+   hypre_SStructVector    **b_level            = (fac_data-> b_level);
+   hypre_SStructVector    **x_level            = (fac_data-> x_level);
+   hypre_SStructVector    **e_level            = (fac_data-> e_level);
+   hypre_SStructPVector   **tx_level           = (fac_data-> tx_level);
+   hypre_SStructVector     *tx                 = (fac_data-> tx);
+   void                   **relax_data_level   = (fac_data-> relax_data_level);
+   void                   **matvec_data_level  = (fac_data-> matvec_data_level);
+   void                   **pmatvec_data_level = (fac_data-> pmatvec_data_level);
+   void                   **restrict_data_level = (fac_data-> restrict_data_level);
+   void                   **interp_data_level  = (fac_data-> interp_data_level);
+   void                    *matvec_data        = (fac_data-> matvec_data);
+   HYPRE_SStructSolver      csolver            = (fac_data-> csolver);
+
+   HYPRE_Int                max_level          = (fac_data-> max_levels);
+   HYPRE_Int               *levels             = (fac_data-> level_to_part);
+   HYPRE_Int                max_cycles         = (fac_data-> max_cycles);
+   HYPRE_Int                rel_change         = (fac_data-> rel_change);
+   HYPRE_Int                zero_guess         = (fac_data-> zero_guess);
+   HYPRE_Int                num_pre_smooth     = (fac_data-> num_pre_smooth);
+   HYPRE_Int                num_post_smooth    = (fac_data-> num_post_smooth);
+   HYPRE_Int                csolver_type       = (fac_data-> csolver_type);
+   HYPRE_Int                logging            = (fac_data-> logging);
+   HYPRE_Real              *norms              = (fac_data-> norms);
+   HYPRE_Real              *rel_norms          = (fac_data-> rel_norms);
+   HYPRE_Real               tol                = (fac_data-> tol);
+
+   HYPRE_Int                part_crse = 0;
+   HYPRE_Int                part_fine = 1;
 
    hypre_SStructPMatrix    *pA;
    hypre_SStructPVector    *px;
@@ -63,10 +65,10 @@ hypre_FACSolve3( void                 *fac_vdata,
 
    HYPRE_Real               b_dot_b = 0, r_dot_r, eps = 0;
    HYPRE_Real               e_dot_e = 0, e_dot_e_l, x_dot_x = 1;
-                    
+
    HYPRE_Int                level, i;
    HYPRE_Int                ierr = 0;
-  
+
    /*--------------------------------------------------------------
     * Special cases
     *--------------------------------------------------------------*/
@@ -89,7 +91,7 @@ hypre_FACSolve3( void                 *fac_vdata,
    }
 
    /*--------------------------------------------------------------
-    * Convergence check- we need to compute the norm of the 
+    * Convergence check- we need to compute the norm of the
     * composite rhs.
     *--------------------------------------------------------------*/
 
@@ -100,10 +102,10 @@ hypre_FACSolve3( void                 *fac_vdata,
       hypre_SStructInnerProd(b_in, b_in, &b_dot_b);
       if (b_dot_b < 0.000000001)
       {
-          hypre_SStructInnerProd(x_in, x_in, &b_dot_b);
+         hypre_SStructInnerProd(x_in, x_in, &b_dot_b);
       }
 
-      eps = tol*tol;
+      eps = tol * tol;
 
       /* if rhs is zero, return a zero solution */
 
@@ -117,7 +119,7 @@ hypre_FACSolve3( void                 *fac_vdata,
          }
 
          hypre_EndTiming(fac_data -> time_index);
-         return ierr; 
+         return ierr;
       }
    }
 
@@ -130,7 +132,7 @@ hypre_FACSolve3( void                 *fac_vdata,
       hypre_SStructMatvecCompute(matvec_data, -1.0, A_in, x_in, 1.0, tx);
 
       /*-----------------------------------------------------------
-       * convergence check 
+       * convergence check
        *-----------------------------------------------------------*/
       if (tol > 0.0)
       {
@@ -141,20 +143,26 @@ hypre_FACSolve3( void                 *fac_vdata,
 
          if (logging > 0)
          {
-            norms[i] = sqrt(r_dot_r);
+            norms[i] = hypre_sqrt(r_dot_r);
             if (b_dot_b > 0)
-               rel_norms[i] = sqrt(r_dot_r/b_dot_b);
+            {
+               rel_norms[i] = hypre_sqrt(r_dot_r / b_dot_b);
+            }
             else
+            {
                rel_norms[i] = 0.0;
+            }
          }
 
          /* always do at least 1 FAC V-cycle */
-         if ((r_dot_r/b_dot_b < eps) && (i > 0))
+         if ((r_dot_r / b_dot_b < eps) && (i > 0))
          {
             if (rel_change)
             {
-               if ((e_dot_e/x_dot_x) < eps)
+               if ((e_dot_e / x_dot_x) < eps)
+               {
                   break;
+               }
             }
             else
             {
@@ -171,9 +179,9 @@ hypre_FACSolve3( void                 *fac_vdata,
       hypre_SStructPCopy(hypre_SStructVectorPVector(tx, levels[max_level]),
                          hypre_SStructVectorPVector(b_level[max_level], part_fine));
 
-      for (level= 1; level<= max_level; level++)
+      for (level = 1; level <= max_level; level++)
       {
-         hypre_SStructPCopy(hypre_SStructVectorPVector(tx, levels[level-1]),
+         hypre_SStructPCopy(hypre_SStructVectorPVector(tx, levels[level - 1]),
                             hypre_SStructVectorPVector(b_level[level], part_crse));
       }
 
@@ -181,67 +189,67 @@ hypre_FACSolve3( void                 *fac_vdata,
        * Down cycle:
        *--------------------------------------------------------------*/
       hypre_SStructVectorSetConstantValues(x_level[max_level], 0.0);
-      for (level= max_level; level> 0; level--)
+      for (level = max_level; level > 0; level--)
       {
          /*-----------------------------------------------------------
-          * local fine solve: the rhs has already been updated with 
+          * local fine solve: the rhs has already been updated with
           * the "unstructured" interface coupling. That is, since the
           * composite corrections are initialized to zero, the patch
           * fine-to-coarse boundary couplings (conditions) do not
           * contribute to the rhs of the patch equations.
           *-----------------------------------------------------------*/
-          pA = hypre_SStructMatrixPMatrix(A_level[level], part_fine);
-          px = hypre_SStructVectorPVector(x_level[level], part_fine);
-          py = hypre_SStructVectorPVector(b_level[level], part_fine);
-          
-          hypre_FacLocalRelax(relax_data_level[level], pA, px, py,
-                              num_pre_smooth, &zero_guess);
-          
+         pA = hypre_SStructMatrixPMatrix(A_level[level], part_fine);
+         px = hypre_SStructVectorPVector(x_level[level], part_fine);
+         py = hypre_SStructVectorPVector(b_level[level], part_fine);
+
+         hypre_FacLocalRelax(relax_data_level[level], pA, px, py,
+                             num_pre_smooth, &zero_guess);
+
          /*-----------------------------------------------------------
           * set up the coarse part problem: update two-level composite
           * residual, restrict, and zero coarse approximation.
           *
           * The residual is updated using the patch solution. This
-          * involves coarse-to-fine matvec contributions. Since 
-          * part_crse of x_level is zero, only zero  fine-to-coarse 
+          * involves coarse-to-fine matvec contributions. Since
+          * part_crse of x_level is zero, only zero  fine-to-coarse
           * contributions are involved.
           *-----------------------------------------------------------*/
 
          /* structured contribution */
-          hypre_SStructPMatvecCompute(pmatvec_data_level[level],
+         hypre_SStructPMatvecCompute(pmatvec_data_level[level],
                                      -1.0, pA, px, 1.0, py);
-      
+
          /* unstructured contribution */
-          parcsrA = hypre_SStructMatrixParCSRMatrix(A_level[level]);
-          hypre_SStructVectorConvert(x_level[level], &parx);
-          hypre_SStructVectorConvert(b_level[level], &pary);
-          hypre_ParCSRMatrixMatvec(-1.0, parcsrA, parx, 1.0, pary);
-          hypre_SStructVectorRestore(x_level[level], parx);
-          hypre_SStructVectorRestore(b_level[level], pary);
+         parcsrA = hypre_SStructMatrixParCSRMatrix(A_level[level]);
+         hypre_SStructVectorConvert(x_level[level], &parx);
+         hypre_SStructVectorConvert(b_level[level], &pary);
+         hypre_ParCSRMatrixMatvec(-1.0, parcsrA, parx, 1.0, pary);
+         hypre_SStructVectorRestore(x_level[level], parx);
+         hypre_SStructVectorRestore(b_level[level], pary);
 
          /*-----------------------------------------------------------
-          *  restrict the two-level composite residual. 
-          *  
-          *  This involves restricting the two-level composite residual 
+          *  restrict the two-level composite residual.
+          *
+          *  This involves restricting the two-level composite residual
           *  of the current level to the part_fine rhs of the next
-          *  descending level, or part_crse if the next descending 
+          *  descending level, or part_crse if the next descending
           *  level is the coarsest. Part_fine of the two-level composite
           *  residual is resricted, part_crse is injected.
           *-----------------------------------------------------------*/
-          if (level > 1)
-          {
-             hypre_FACRestrict2(restrict_data_level[level], 
-                                b_level[level], 
-                                hypre_SStructVectorPVector(b_level[level-1],part_fine));
-          }
-          else
-          {
-             hypre_FACRestrict2(restrict_data_level[level], 
-                                b_level[level], 
-                                hypre_SStructVectorPVector(b_level[level-1],part_crse));
-          }
-
-          hypre_SStructVectorSetConstantValues(x_level[level-1], 0.0);
+         if (level > 1)
+         {
+            hypre_FACRestrict2(restrict_data_level[level],
+                               b_level[level],
+                               hypre_SStructVectorPVector(b_level[level - 1], part_fine));
+         }
+         else
+         {
+            hypre_FACRestrict2(restrict_data_level[level],
+                               b_level[level],
+                               hypre_SStructVectorPVector(b_level[level - 1], part_crse));
+         }
+
+         hypre_SStructVectorSetConstantValues(x_level[level - 1], 0.0);
       }
 
       /*-----------------------------------------------------------
@@ -250,20 +258,20 @@ hypre_FACSolve3( void                 *fac_vdata,
        * A_level[0], b_level[0], x_level[0]. Therefore, copy the
        * solution to the part_fine.
        *-----------------------------------------------------------*/
-       level= 0;
-       if (csolver_type==1)
-       {
-           HYPRE_PCGSolve((HYPRE_Solver) csolver, 
-                          (HYPRE_Matrix) A_level[0],
-                          (HYPRE_Vector) b_level[0],
-                          (HYPRE_Vector) x_level[0]);
-       }
-       else if (csolver_type==2)
-       {
-           HYPRE_SStructSysPFMGSolve(csolver, A_level[0], b_level[0], x_level[0]);
-       }
-       hypre_SStructPCopy(hypre_SStructVectorPVector(x_level[0], part_crse),
-                          hypre_SStructVectorPVector(x_level[0], part_fine));
+      level = 0;
+      if (csolver_type == 1)
+      {
+         HYPRE_PCGSolve((HYPRE_Solver) csolver,
+                        (HYPRE_Matrix) A_level[0],
+                        (HYPRE_Vector) b_level[0],
+                        (HYPRE_Vector) x_level[0]);
+      }
+      else if (csolver_type == 2)
+      {
+         HYPRE_SStructSysPFMGSolve(csolver, A_level[0], b_level[0], x_level[0]);
+      }
+      hypre_SStructPCopy(hypre_SStructVectorPVector(x_level[0], part_crse),
+                         hypre_SStructVectorPVector(x_level[0], part_fine));
 
 #if DEBUG
 #endif
@@ -271,11 +279,11 @@ hypre_FACSolve3( void                 *fac_vdata,
       /*-----------------------------------------------------------
        * Up cycle
        *-----------------------------------------------------------*/
-       for (level= 1; level<= max_level; level++)
-       {
+      for (level = 1; level <= max_level; level++)
+      {
 
          /*-----------------------------------------------------------
-          * Interpolate error, update the residual, and correct 
+          * Interpolate error, update the residual, and correct
           * (x = x + Pe_c). Interpolation is done in several stages:
           *   1)interpolate only the coarse unknowns away from the
           *     refinement patch: identity interpolation, interpolated
@@ -283,108 +291,108 @@ hypre_FACSolve3( void                 *fac_vdata,
           *   2) interpolate the coarse unknowns under the fine grid
           *      patch
           *-----------------------------------------------------------*/
-          hypre_SStructVectorSetConstantValues(e_level[level], 0.0);
-/*
-hypre_SStructVectorSetConstantValues(x_level[max_level-1], 1.0);
-*/
+         hypre_SStructVectorSetConstantValues(e_level[level], 0.0);
+         /*
+         hypre_SStructVectorSetConstantValues(x_level[max_level-1], 1.0);
+         */
 
          /*-----------------------------------------------------------
-          *  interpolation of unknowns away from the underlying 
+          *  interpolation of unknowns away from the underlying
           *  fine grid patch. Identity interpolation.
           *-----------------------------------------------------------*/
-          hypre_FAC_IdentityInterp2(interp_data_level[level-1],
-                             hypre_SStructVectorPVector(x_level[level-1], part_fine),
-                             e_level[level]);
+         hypre_FAC_IdentityInterp2(interp_data_level[level - 1],
+                                   hypre_SStructVectorPVector(x_level[level - 1], part_fine),
+                                   e_level[level]);
 
          /*-----------------------------------------------------------
           *  complete the interpolation- unknowns under the fine
           *  patch. Weighted interpolation.
           *-----------------------------------------------------------*/
-          hypre_FAC_WeightedInterp2(interp_data_level[level-1],
-                             hypre_SStructVectorPVector(x_level[level-1], part_fine),
-                             e_level[level]);
+         hypre_FAC_WeightedInterp2(interp_data_level[level - 1],
+                                   hypre_SStructVectorPVector(x_level[level - 1], part_fine),
+                                   e_level[level]);
 
          /*-----------------------------------------------------------
           *  add the correction to x_level
           *-----------------------------------------------------------*/
-          hypre_SStructAxpy(1.0, e_level[level], x_level[level]);
+         hypre_SStructAxpy(1.0, e_level[level], x_level[level]);
 
          /*-----------------------------------------------------------
           *  update residual due to the interpolated correction
           *-----------------------------------------------------------*/
-          if (num_post_smooth)
-          {
-             hypre_SStructMatvecCompute(matvec_data_level[level], -1.0,
-                                        A_level[level], e_level[level], 
-                                        1.0, b_level[level]);
-          }
+         if (num_post_smooth)
+         {
+            hypre_SStructMatvecCompute(matvec_data_level[level], -1.0,
+                                       A_level[level], e_level[level],
+                                       1.0, b_level[level]);
+         }
 
          /*-----------------------------------------------------------
           *  post-smooth on the refinement patch
           *-----------------------------------------------------------*/
-          if (num_post_smooth)
-          {
-             hypre_SStructPVectorSetConstantValues(tx_level[level], 0.0);
-             pA = hypre_SStructMatrixPMatrix(A_level[level], part_fine);
-             py = hypre_SStructVectorPVector(b_level[level], part_fine);
-          
-             hypre_FacLocalRelax(relax_data_level[level], pA, tx_level[level], py,
-                                 num_post_smooth, &zero_guess);
-
-         /*-----------------------------------------------------------
-          *  add the post-smooth solution to x_level and to the error
-          *  vector e_level if level= max_level. The e_levels should
-          *  contain only the correction to x_in. 
-          *-----------------------------------------------------------*/
-             hypre_SStructPAxpy(1.0, tx_level[level], 
-                                hypre_SStructVectorPVector(x_level[level], part_fine));
-
-             if (level == max_level)
-             {
-                hypre_SStructPAxpy(1.0, tx_level[level], 
-                                hypre_SStructVectorPVector(e_level[level], part_fine));
-             }
-          }
+         if (num_post_smooth)
+         {
+            hypre_SStructPVectorSetConstantValues(tx_level[level], 0.0);
+            pA = hypre_SStructMatrixPMatrix(A_level[level], part_fine);
+            py = hypre_SStructVectorPVector(b_level[level], part_fine);
+
+            hypre_FacLocalRelax(relax_data_level[level], pA, tx_level[level], py,
+                                num_post_smooth, &zero_guess);
+
+            /*-----------------------------------------------------------
+             *  add the post-smooth solution to x_level and to the error
+             *  vector e_level if level= max_level. The e_levels should
+             *  contain only the correction to x_in.
+             *-----------------------------------------------------------*/
+            hypre_SStructPAxpy(1.0, tx_level[level],
+                               hypre_SStructVectorPVector(x_level[level], part_fine));
+
+            if (level == max_level)
+            {
+               hypre_SStructPAxpy(1.0, tx_level[level],
+                                  hypre_SStructVectorPVector(e_level[level], part_fine));
+            }
+         }
 
       }
 
       /*--------------------------------------------------------------
        * Add two-level corrections x_level to the composite solution
-       * x_in. 
+       * x_in.
        *
-       * Notice that except for the finest two-level sstruct_vector, 
+       * Notice that except for the finest two-level sstruct_vector,
        * only the part_crse of each two-level sstruct_vector has
        * a correction to x_in. For max_level, both part_crse and
        * part_fine has a correction to x_in.
        *--------------------------------------------------------------*/
- 
-      hypre_SStructPAxpy(1.0, 
+
+      hypre_SStructPAxpy(1.0,
                          hypre_SStructVectorPVector(x_level[max_level], part_fine),
                          hypre_SStructVectorPVector(x_in, levels[max_level]));
 
-      for (level= 1; level<= max_level; level++)
+      for (level = 1; level <= max_level; level++)
       {
-          hypre_SStructPAxpy(1.0, 
-                             hypre_SStructVectorPVector(x_level[level], part_crse),
-                             hypre_SStructVectorPVector(x_in, levels[level-1]) );
+         hypre_SStructPAxpy(1.0,
+                            hypre_SStructVectorPVector(x_level[level], part_crse),
+                            hypre_SStructVectorPVector(x_in, levels[level - 1]) );
       }
 
       /*-----------------------------------------------
-       * convergence check 
+       * convergence check
        *-----------------------------------------------*/
       if ((tol > 0.0) && (rel_change))
       {
-          hypre_SStructInnerProd(x_in, x_in, &x_dot_x);
-
-          hypre_SStructInnerProd(e_level[max_level], e_level[max_level], &e_dot_e);
-          for (level= 1; level< max_level; level++)
-          {
-             hypre_SStructPInnerProd( 
-                         hypre_SStructVectorPVector(e_level[level], part_crse),
-                         hypre_SStructVectorPVector(e_level[level], part_crse),
-                         &e_dot_e_l);
-             e_dot_e += e_dot_e_l;
-          }
+         hypre_SStructInnerProd(x_in, x_in, &x_dot_x);
+
+         hypre_SStructInnerProd(e_level[max_level], e_level[max_level], &e_dot_e);
+         for (level = 1; level < max_level; level++)
+         {
+            hypre_SStructPInnerProd(
+               hypre_SStructVectorPVector(e_level[level], part_crse),
+               hypre_SStructVectorPVector(e_level[level], part_crse),
+               &e_dot_e_l);
+            e_dot_e += e_dot_e_l;
+         }
       }
 
       (fac_data -> num_iterations) = (i + 1);
@@ -397,4 +405,3 @@ hypre_SStructVectorSetConstantValues(x_level[max_level-1], 1.0);
 
    return ierr;
 }
-
diff --git a/external/hypre/src/sstruct_ls/fac_zero_cdata.c b/external/hypre/src/sstruct_ls/fac_zero_cdata.c
index ce56bb08..9be784f0 100644
--- a/external/hypre/src/sstruct_ls/fac_zero_cdata.c
+++ b/external/hypre/src/sstruct_ls/fac_zero_cdata.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -15,7 +15,7 @@
  *       {
  *          1) refine cbox and boxman_intersect with fboxman
  *          2) loop over intersection boxes
- *                3) coarsen and contract (only the coarse nodes on this 
+ *                3) coarsen and contract (only the coarse nodes on this
  *                   processor) and zero data.
  *       }
  *
@@ -25,7 +25,7 @@ HYPRE_Int
 hypre_FacZeroCData( void                 *fac_vdata,
                     hypre_SStructMatrix  *A )
 {
-	hypre_FACData         *fac_data      =  (hypre_FACData*)fac_vdata;
+   hypre_FACData         *fac_data      =  (hypre_FACData*)fac_vdata;
 
    hypre_SStructGrid     *grid;
    hypre_SStructPGrid    *p_cgrid;
@@ -48,7 +48,7 @@ hypre_FacZeroCData( void                 *fac_vdata,
    hypre_Index           *refine_factors;
    hypre_Index            temp_index;
    hypre_Index            ilower, iupper;
-  
+
    HYPRE_Int              max_level     =  fac_data -> max_levels;
    HYPRE_Int             *level_to_part =  fac_data -> level_to_part;
 
@@ -61,26 +61,26 @@ hypre_FacZeroCData( void                 *fac_vdata,
    HYPRE_Int              ci, i, j, rem, intersect_size;
 
    HYPRE_Real            *values;
- 
+
    HYPRE_Int              ierr = 0;
 
    hypre_BoxInit(&scaled_box, ndim);
    hypre_BoxInit(&intersect_box, ndim);
 
-   for (level= max_level; level> 0; level--)
+   for (level = max_level; level > 0; level--)
    {
       level_pmatrix = hypre_SStructMatrixPMatrix(fac_data -> A_level[level], part_crse);
 
       grid          = (fac_data -> grid_level[level]);
-      refine_factors= &(fac_data -> refine_factors[level]);
-      
-      p_cgrid= hypre_SStructGridPGrid(grid, part_crse);
+      refine_factors = &(fac_data -> refine_factors[level]);
+
+      p_cgrid = hypre_SStructGridPGrid(grid, part_crse);
       nvars  = hypre_SStructPGridNVars(p_cgrid);
 
-      for (var= 0; var< nvars; var++)
+      for (var = 0; var < nvars; var++)
       {
          stencils    =  hypre_SStructPMatrixSStencil(level_pmatrix, var, var);
-         stencil_size=  hypre_StructStencilSize(stencils);
+         stencil_size =  hypre_StructStencilSize(stencils);
 
          /*---------------------------------------------------------------------
           * For each variable, find the underlying boxes for each coarse box.
@@ -91,73 +91,73 @@ hypre_FacZeroCData( void                 *fac_vdata,
 
          hypre_ForBoxI(ci, cgrid_boxes)
          {
-             cgrid_box= hypre_BoxArrayBox(cgrid_boxes, ci);
+            cgrid_box = hypre_BoxArrayBox(cgrid_boxes, ci);
 
-             hypre_ClearIndex(temp_index);
-             hypre_StructMapCoarseToFine(hypre_BoxIMin(cgrid_box), temp_index,
+            hypre_ClearIndex(temp_index);
+            hypre_StructMapCoarseToFine(hypre_BoxIMin(cgrid_box), temp_index,
                                         *refine_factors, hypre_BoxIMin(&scaled_box));
-             for (i= 0; i< ndim; i++)
-             {
-                temp_index[i]= (*refine_factors)[i]-1;
-             }
-             hypre_StructMapCoarseToFine(hypre_BoxIMax(cgrid_box), temp_index,
+            for (i = 0; i < ndim; i++)
+            {
+               temp_index[i] = (*refine_factors)[i] - 1;
+            }
+            hypre_StructMapCoarseToFine(hypre_BoxIMax(cgrid_box), temp_index,
                                         *refine_factors, hypre_BoxIMax(&scaled_box));
 
-             hypre_BoxManIntersect(fboxman, hypre_BoxIMin(&scaled_box),
-                                   hypre_BoxIMax(&scaled_box), &boxman_entries,
+            hypre_BoxManIntersect(fboxman, hypre_BoxIMin(&scaled_box),
+                                  hypre_BoxIMax(&scaled_box), &boxman_entries,
                                   &nboxman_entries);
 
-             for (i= 0; i< nboxman_entries; i++)
-             {
-                hypre_BoxManEntryGetExtents(boxman_entries[i], ilower, iupper);
-                hypre_BoxSetExtents(&intersect_box, ilower, iupper);
-                hypre_IntersectBoxes(&intersect_box, &scaled_box, &intersect_box);
+            for (i = 0; i < nboxman_entries; i++)
+            {
+               hypre_BoxManEntryGetExtents(boxman_entries[i], ilower, iupper);
+               hypre_BoxSetExtents(&intersect_box, ilower, iupper);
+               hypre_IntersectBoxes(&intersect_box, &scaled_box, &intersect_box);
 
                /* adjust the box so that it is divisible by refine_factors */
-                for (j= 0; j< ndim; j++)
-                {
-                   rem= hypre_BoxIMin(&intersect_box)[j]%(*refine_factors)[j];
-                   if (rem)
-                   {
-                      hypre_BoxIMin(&intersect_box)[j]+=(*refine_factors)[j] - rem;
-                   }
-                }
-
-                hypre_ClearIndex(temp_index);
-                hypre_StructMapFineToCoarse(hypre_BoxIMin(&intersect_box), temp_index,
+               for (j = 0; j < ndim; j++)
+               {
+                  rem = hypre_BoxIMin(&intersect_box)[j] % (*refine_factors)[j];
+                  if (rem)
+                  {
+                     hypre_BoxIMin(&intersect_box)[j] += (*refine_factors)[j] - rem;
+                  }
+               }
+
+               hypre_ClearIndex(temp_index);
+               hypre_StructMapFineToCoarse(hypre_BoxIMin(&intersect_box), temp_index,
                                            *refine_factors, hypre_BoxIMin(&intersect_box));
-                hypre_StructMapFineToCoarse(hypre_BoxIMax(&intersect_box), temp_index,
+               hypre_StructMapFineToCoarse(hypre_BoxIMax(&intersect_box), temp_index,
                                            *refine_factors, hypre_BoxIMax(&intersect_box));
 
-                intersect_size= hypre_BoxVolume(&intersect_box);
-                if (intersect_size > 0)
-                {
+               intersect_size = hypre_BoxVolume(&intersect_box);
+               if (intersect_size > 0)
+               {
                   /*------------------------------------------------------------
                    * Coarse underlying box found. Now zero off.
                    *------------------------------------------------------------*/
-                   values= hypre_CTAlloc(HYPRE_Real,  intersect_size, HYPRE_MEMORY_HOST);
+                  values = hypre_CTAlloc(HYPRE_Real,  intersect_size, HYPRE_MEMORY_HOST);
 
-                   for (j= 0; j< stencil_size; j++)
-                   {
-                      HYPRE_SStructMatrixSetBoxValues(fac_data -> A_level[level],
-                                                      part_crse, 
-                                                      hypre_BoxIMin(&intersect_box),
-                                                      hypre_BoxIMax(&intersect_box),
-                                                      var, 1, &j, values);
+                  for (j = 0; j < stencil_size; j++)
+                  {
+                     HYPRE_SStructMatrixSetBoxValues(fac_data -> A_level[level],
+                                                     part_crse,
+                                                     hypre_BoxIMin(&intersect_box),
+                                                     hypre_BoxIMax(&intersect_box),
+                                                     var, 1, &j, values);
 
-                      HYPRE_SStructMatrixSetBoxValues(A,
-                                                      level_to_part[level-1], 
-                                                      hypre_BoxIMin(&intersect_box),
-                                                      hypre_BoxIMax(&intersect_box),
-                                                      var, 1, &j, values);
-                   }
+                     HYPRE_SStructMatrixSetBoxValues(A,
+                                                     level_to_part[level - 1],
+                                                     hypre_BoxIMin(&intersect_box),
+                                                     hypre_BoxIMax(&intersect_box),
+                                                     var, 1, &j, values);
+                  }
 
-                   hypre_TFree(values, HYPRE_MEMORY_HOST);
+                  hypre_TFree(values, HYPRE_MEMORY_HOST);
 
-                }  /* if (intersect_size > 0) */
-             }     /* for (i= 0; i< nboxman_entries; i++) */
+               }  /* if (intersect_size > 0) */
+            }     /* for (i= 0; i< nboxman_entries; i++) */
 
-             hypre_TFree(boxman_entries, HYPRE_MEMORY_HOST);
+            hypre_TFree(boxman_entries, HYPRE_MEMORY_HOST);
 
          }   /* hypre_ForBoxI(ci, cgrid_boxes) */
       }      /* for (var= 0; var< nvars; var++) */
diff --git a/external/hypre/src/sstruct_ls/fac_zero_stencilcoef.c b/external/hypre/src/sstruct_ls/fac_zero_stencilcoef.c
index 31c0ec24..6b02443b 100644
--- a/external/hypre/src/sstruct_ls/fac_zero_stencilcoef.c
+++ b/external/hypre/src/sstruct_ls/fac_zero_stencilcoef.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -36,6 +36,8 @@ hypre_FacZeroCFSten( hypre_SStructPMatrix *Af,
                      HYPRE_Int             fine_part,
                      hypre_Index           rfactors )
 {
+   HYPRE_UNUSED_VAR(Af);
+
    hypre_BoxManager      *fboxman;
    hypre_BoxManEntry    **boxman_entries;
    HYPRE_Int              nboxman_entries;
@@ -83,27 +85,27 @@ hypre_FacZeroCFSten( hypre_SStructPMatrix *Af,
    hypre_ClearIndex(zero_index);
    hypre_ClearIndex(stride);
    hypre_ClearIndex(upper_shift);
-   for (i= 0; i< ndim; i++)
+   for (i = 0; i < ndim; i++)
    {
-      stride[i]= 1;
-      upper_shift[i]= rfactors[i]-1;
+      stride[i] = 1;
+      upper_shift[i] = rfactors[i] - 1;
    }
 
    hypre_CopyIndex(rfactors, refine_factors);
    if (ndim < 3)
    {
-      for (i= ndim; i< 3; i++)
+      for (i = ndim; i < 3; i++)
       {
-         refine_factors[i]= 1;
+         refine_factors[i] = 1;
       }
    }
 
-   for (var1= 0; var1< nvars; var1++)
+   for (var1 = 0; var1 < nvars; var1++)
    {
-      cgrid= hypre_SStructPGridSGrid(hypre_SStructPMatrixPGrid(Ac), var1);
-      cgrid_boxes= hypre_StructGridBoxes(cgrid);
+      cgrid = hypre_SStructPGridSGrid(hypre_SStructPMatrixPGrid(Ac), var1);
+      cgrid_boxes = hypre_StructGridBoxes(cgrid);
 
-      fboxman= hypre_SStructGridBoxManager(grid, fine_part, var1);
+      fboxman = hypre_SStructGridBoxManager(grid, fine_part, var1);
 
       /*------------------------------------------------------------------
        * For each parent coarse box find all fboxes that may be connected
@@ -112,7 +114,7 @@ hypre_FacZeroCFSten( hypre_SStructPMatrix *Af,
        *------------------------------------------------------------------*/
       hypre_ForBoxI(ci, cgrid_boxes)
       {
-         cgrid_box= hypre_BoxArrayBox(cgrid_boxes, ci);
+         cgrid_box = hypre_BoxArrayBox(cgrid_boxes, ci);
 
          hypre_StructMapCoarseToFine(hypre_BoxIMin(cgrid_box), zero_index,
                                      refine_factors, hypre_BoxIMin(&scaled_box));
@@ -128,13 +130,13 @@ hypre_FacZeroCFSten( hypre_SStructPMatrix *Af,
                                hypre_BoxIMax(&scaled_box), &boxman_entries,
                                &nboxman_entries);
 
-         for (var2= 0; var2< nvars; var2++)
+         for (var2 = 0; var2 < nvars; var2++)
          {
-            stencils=  hypre_SStructPMatrixSStencil(Ac, var1, var2);
+            stencils =  hypre_SStructPMatrixSStencil(Ac, var1, var2);
 
             if (stencils != NULL)
             {
-               stencil_size= hypre_StructStencilSize(stencils);
+               stencil_size = hypre_StructStencilSize(stencils);
                smatrix     = hypre_SStructPMatrixSMatrix(Ac, var1, var2);
                ac_dbox     = hypre_BoxArrayBox(hypre_StructMatrixDataSpace(smatrix),
                                                ci);
@@ -143,7 +145,7 @@ hypre_FacZeroCFSten( hypre_SStructPMatrix *Af,
                 * Find the stencil coefficients that must be zeroed off.
                 * Loop over all possible boxes.
                 *---------------------------------------------------------*/
-               for (i= 0; i< stencil_size; i++)
+               for (i = 0; i < stencil_size; i++)
                {
                   hypre_CopyIndex(hypre_StructStencilElement(stencils, i),
                                   stencil_shape);
@@ -152,19 +154,19 @@ hypre_FacZeroCFSten( hypre_SStructPMatrix *Af,
                   if (abs_shape)   /* non-centre stencils are zeroed */
                   {
                      /* look for connecting fboxes that must be zeroed. */
-                     for (j= 0; j< nboxman_entries; j++)
+                     for (j = 0; j < nboxman_entries; j++)
                      {
                         hypre_BoxManEntryGetExtents(boxman_entries[j], ilower, iupper);
                         hypre_BoxSetExtents(&fgrid_box, ilower, iupper);
 
-                        shift_ibox= hypre_CF_StenBox(&fgrid_box, cgrid_box, stencil_shape,
-                                                     refine_factors, ndim);
+                        shift_ibox = hypre_CF_StenBox(&fgrid_box, cgrid_box, stencil_shape,
+                                                      refine_factors, ndim);
 
                         if ( hypre_BoxVolume(shift_ibox) )
                         {
-                           ac_ptr= hypre_StructMatrixExtractPointerByIndex(smatrix,
-                                                                           ci,
-                                                                           stencil_shape);
+                           ac_ptr = hypre_StructMatrixExtractPointerByIndex(smatrix,
+                                                                            ci,
+                                                                            stencil_shape);
                            hypre_BoxGetSize(shift_ibox, loop_size);
 
 #define DEVICE_VAR is_device_ptr(ac_ptr)
@@ -218,7 +220,7 @@ hypre_FacZeroFCSten( hypre_SStructPMatrix  *A,
                      hypre_SStructGrid     *grid,
                      HYPRE_Int              fine_part)
 {
-   MPI_Comm               comm=   hypre_SStructGridComm(grid);
+   MPI_Comm               comm =   hypre_SStructGridComm(grid);
    hypre_BoxManager      *fboxman;
    hypre_BoxManEntry    **boxman_entries;
    HYPRE_Int              nboxman_entries;
@@ -267,24 +269,24 @@ hypre_FacZeroFCSten( hypre_SStructPMatrix  *A,
    hypre_BoxInit(&intersect_box, ndim);
 
    hypre_ClearIndex(stride);
-   for (i= 0; i< ndim; i++)
+   for (i = 0; i < ndim; i++)
    {
-      stride[i]= 1;
+      stride[i] = 1;
    }
 
-   tmp_box_array1= hypre_BoxArrayCreate(1, ndim);
+   tmp_box_array1 = hypre_BoxArrayCreate(1, ndim);
 
-   for (var1= 0; var1< nvars; var1++)
+   for (var1 = 0; var1 < nvars; var1++)
    {
       fgrid      = hypre_SStructPGridSGrid(hypre_SStructPMatrixPGrid(A), var1);
-      fgrid_boxes= hypre_StructGridBoxes(fgrid);
+      fgrid_boxes = hypre_StructGridBoxes(fgrid);
       fboxman    = hypre_SStructGridBoxManager(grid, fine_part, var1);
 
       hypre_ForBoxI(fi, fgrid_boxes)
       {
-         fgrid_box= hypre_BoxArrayBox(fgrid_boxes, fi);
+         fgrid_box = hypre_BoxArrayBox(fgrid_boxes, fi);
          hypre_ClearIndex(size_ibox);
-         for (i= 0; i< ndim; i++)
+         for (i = 0; i < ndim; i++)
          {
             size_ibox[i] = hypre_BoxSizeD(fgrid_box, i) - 1;
          }
@@ -299,18 +301,18 @@ hypre_FacZeroFCSten( hypre_SStructPMatrix  *A,
                                hypre_BoxIMax(&scaled_box), &boxman_entries,
                                &nboxman_entries);
 
-         for (var2= 0; var2< nvars; var2++)
+         for (var2 = 0; var2 < nvars; var2++)
          {
-            stencils=  hypre_SStructPMatrixSStencil(A, var1, var2);
+            stencils =  hypre_SStructPMatrixSStencil(A, var1, var2);
 
             if (stencils != NULL)
             {
-               stencil_size= hypre_StructStencilSize(stencils);
+               stencil_size = hypre_StructStencilSize(stencils);
                smatrix     = hypre_SStructPMatrixSMatrix(A, var1, var2);
                a_dbox      = hypre_BoxArrayBox(hypre_StructMatrixDataSpace(smatrix),
                                                fi);
 
-               for (i= 0; i< stencil_size; i++)
+               for (i = 0; i < stencil_size; i++)
                {
                   hypre_CopyIndex(hypre_StructStencilElement(stencils, i),
                                   stencil_shape);
@@ -341,10 +343,10 @@ hypre_FacZeroFCSten( hypre_SStructPMatrix  *A,
                      hypre_AddIndexes(stencil_shape, hypre_BoxIMax(&shift_ibox), 3,
                                       hypre_BoxIMax(&shift_ibox));
 
-                     intersect_boxes=  hypre_BoxArrayCreate(1, ndim);
-                     hypre_CopyBox(&shift_ibox, hypre_BoxArrayBox(intersect_boxes,0));
+                     intersect_boxes =  hypre_BoxArrayCreate(1, ndim);
+                     hypre_CopyBox(&shift_ibox, hypre_BoxArrayBox(intersect_boxes, 0));
 
-                     for (j= 0; j< nboxman_entries; j++)
+                     for (j = 0; j < nboxman_entries; j++)
                      {
                         hypre_SStructBoxManEntryGetProcess(boxman_entries[j], &proc);
                         hypre_SStructBoxManEntryGetBoxnum(boxman_entries[j], &fj);
@@ -361,7 +363,7 @@ hypre_FacZeroFCSten( hypre_SStructPMatrix  *A,
                               hypre_CopyBox(&intersect_box,
                                             hypre_BoxArrayBox(tmp_box_array1, 0));
 
-                              tmp_box_array2= hypre_BoxArrayCreate(0, ndim);
+                              tmp_box_array2 = hypre_BoxArrayCreate(0, ndim);
 
                               hypre_SubtractBoxArrays(intersect_boxes,
                                                       tmp_box_array1,
@@ -376,9 +378,9 @@ hypre_FacZeroFCSten( hypre_SStructPMatrix  *A,
                       * intersect_boxes now has the shifted extents for the
                       * coefficients to be zeroed.
                       *-----------------------------------------------------------*/
-                     a_ptr= hypre_StructMatrixExtractPointerByIndex(smatrix,
-                                                                    fi,
-                                                                    stencil_shape);
+                     a_ptr = hypre_StructMatrixExtractPointerByIndex(smatrix,
+                                                                     fi,
+                                                                     stencil_shape);
                      hypre_ForBoxI(fj, intersect_boxes)
                      {
                         hypre_CopyBox(hypre_BoxArrayBox(intersect_boxes, fj), &intersect_box);
@@ -417,4 +419,3 @@ hypre_FacZeroFCSten( hypre_SStructPMatrix  *A,
 
    return ierr;
 }
-
diff --git a/external/hypre/src/sstruct_ls/headers b/external/hypre/src/sstruct_ls/headers
deleted file mode 100644
index d42e7044..00000000
--- a/external/hypre/src/sstruct_ls/headers
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
-# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
-#
-# SPDX-License-Identifier: (Apache-2.0 OR MIT)
-
-INTERNAL_HEADER=_hypre_sstruct_ls.h
-
-#===========================================================================
-# Include guards and other includes
-#===========================================================================
-
-cat > $INTERNAL_HEADER <<@
-
-#include <HYPRE_config.h>
-
-#include "HYPRE_sstruct_ls.h"
-
-#ifndef hypre_SSTRUCT_LS_HEADER
-#define hypre_SSTRUCT_LS_HEADER
-
-#include "_hypre_utilities.h"
-#include "krylov.h"
-#include "_hypre_struct_ls.h"
-#include "_hypre_sstruct_mv.h"
-#include "_hypre_parcsr_ls.h"
-#include "multivector.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-@
-
-#===========================================================================
-# Structures and prototypes
-#===========================================================================
-cat sstruct_owninfo.h     >> $INTERNAL_HEADER
-cat sstruct_recvinfo.h    >> $INTERNAL_HEADER
-cat sstruct_sendinfo.h    >> $INTERNAL_HEADER
-cat maxwell_PTopology.h   >> $INTERNAL_HEADER
-cat maxwell_TV.h          >> $INTERNAL_HEADER
-cat sstruct_sharedDOFComm.h  >> $INTERNAL_HEADER
-                                                                                                            
-../utilities/protos [!F]*.c   >> $INTERNAL_HEADER
-
-#===========================================================================
-# Include guards
-#===========================================================================
-
-cat >> $INTERNAL_HEADER <<@
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
-@
-
diff --git a/external/hypre/src/sstruct_ls/krylov.c b/external/hypre/src/sstruct_ls/krylov.c
index b01b7fbe..1cf35494 100644
--- a/external/hypre/src/sstruct_ls/krylov.c
+++ b/external/hypre/src/sstruct_ls/krylov.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -8,7 +8,7 @@
 #include "_hypre_utilities.h"
 #include "_hypre_sstruct_ls.h"
 
-	
+
 HYPRE_Int hypre_SStructKrylovCopyVector( void *x, void *y );
 
 /*--------------------------------------------------------------------------
@@ -16,11 +16,16 @@ HYPRE_Int hypre_SStructKrylovCopyVector( void *x, void *y );
 
 HYPRE_Int
 hypre_SStructKrylovIdentitySetup( void *vdata,
-                           void *A,
-                           void *b,
-                           void *x )
+                                  void *A,
+                                  void *b,
+                                  void *x )
 
 {
+   HYPRE_UNUSED_VAR(vdata);
+   HYPRE_UNUSED_VAR(A);
+   HYPRE_UNUSED_VAR(b);
+   HYPRE_UNUSED_VAR(x);
+
    return hypre_error_flag;
 }
 
@@ -29,11 +34,13 @@ hypre_SStructKrylovIdentitySetup( void *vdata,
 
 HYPRE_Int
 hypre_SStructKrylovIdentity( void *vdata,
-                      void *A,
-                      void *b,
-                      void *x )
+                             void *A,
+                             void *b,
+                             void *x )
 
 {
-   return( hypre_SStructKrylovCopyVector(b, x) );
-}
+   HYPRE_UNUSED_VAR(vdata);
+   HYPRE_UNUSED_VAR(A);
 
+   return ( hypre_SStructKrylovCopyVector(b, x) );
+}
diff --git a/external/hypre/src/sstruct_ls/krylov_sstruct.c b/external/hypre/src/sstruct_ls/krylov_sstruct.c
index 6060711a..14d3e691 100644
--- a/external/hypre/src/sstruct_ls/krylov_sstruct.c
+++ b/external/hypre/src/sstruct_ls/krylov_sstruct.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -21,7 +21,7 @@ hypre_SStructKrylovCAlloc( size_t count,
                            size_t elt_size,
                            HYPRE_MemoryLocation location )
 {
-   return( (void*) hypre_CTAlloc(char, count * elt_size, location) );
+   return ( (void*) hypre_CTAlloc(char, count * elt_size, location) );
 }
 
 /*--------------------------------------------------------------------------
@@ -30,7 +30,7 @@ hypre_SStructKrylovCAlloc( size_t count,
 HYPRE_Int
 hypre_SStructKrylovFree( void *ptr )
 {
-   hypre_TFree( ptr , HYPRE_MEMORY_HOST);
+   hypre_TFree( ptr, HYPRE_MEMORY_HOST);
 
    return hypre_error_flag;
 }
@@ -45,7 +45,7 @@ hypre_SStructKrylovCreateVector( void *vvector )
    hypre_SStructVector  *new_vector;
    HYPRE_Int             object_type;
 
-   HYPRE_Int             nparts= hypre_SStructVectorNParts(vector);
+   HYPRE_Int             nparts = hypre_SStructVectorNParts(vector);
    hypre_SStructPVector *pvector;
    hypre_StructVector   *svector;
    hypre_SStructPVector *new_pvector;
@@ -55,7 +55,7 @@ hypre_SStructKrylovCreateVector( void *vvector )
    HYPRE_Int    part;
    HYPRE_Int    nvars, var;
 
-   object_type= hypre_SStructVectorObjectType(vector);
+   object_type = hypre_SStructVectorObjectType(vector);
 
    HYPRE_SStructVectorCreate(hypre_SStructVectorComm(vector),
                              hypre_SStructVectorGrid(vector),
@@ -64,18 +64,18 @@ hypre_SStructKrylovCreateVector( void *vvector )
 
    if (object_type == HYPRE_SSTRUCT || object_type == HYPRE_STRUCT)
    {
-      for (part= 0; part< nparts; part++)
+      for (part = 0; part < nparts; part++)
       {
          pvector    = hypre_SStructVectorPVector(vector, part);
-         new_pvector= hypre_SStructVectorPVector(new_vector, part);
+         new_pvector = hypre_SStructVectorPVector(new_vector, part);
          nvars      = hypre_SStructPVectorNVars(pvector);
 
-         for (var= 0; var< nvars; var++)
+         for (var = 0; var < nvars; var++)
          {
-            svector= hypre_SStructPVectorSVector(pvector, var);
-            num_ghost= hypre_StructVectorNumGhost(svector);
+            svector = hypre_SStructPVectorSVector(pvector, var);
+            num_ghost = hypre_StructVectorNumGhost(svector);
 
-            new_svector= hypre_SStructPVectorSVector(new_pvector, var);
+            new_svector = hypre_SStructPVectorSVector(new_pvector, var);
             hypre_StructVectorSetNumGhost(new_svector, num_ghost);
          }
       }
@@ -93,11 +93,11 @@ hypre_SStructKrylovCreateVector( void *vvector )
 void *
 hypre_SStructKrylovCreateVectorArray(HYPRE_Int n, void *vvector )
 {
-	hypre_SStructVector  *vector = (hypre_SStructVector  *)vvector;
+   hypre_SStructVector  *vector = (hypre_SStructVector  *)vvector;
    hypre_SStructVector  **new_vector;
    HYPRE_Int             object_type;
 
-   HYPRE_Int             nparts= hypre_SStructVectorNParts(vector);
+   HYPRE_Int             nparts = hypre_SStructVectorNParts(vector);
    hypre_SStructPVector *pvector;
    hypre_StructVector   *svector;
    hypre_SStructPVector *new_pvector;
@@ -109,10 +109,10 @@ hypre_SStructKrylovCreateVectorArray(HYPRE_Int n, void *vvector )
 
    HYPRE_Int i;
 
-   object_type= hypre_SStructVectorObjectType(vector);
+   object_type = hypre_SStructVectorObjectType(vector);
 
    new_vector = hypre_CTAlloc(hypre_SStructVector*, n, HYPRE_MEMORY_HOST);
-   for (i=0; i < n; i++)
+   for (i = 0; i < n; i++)
    {
       HYPRE_SStructVectorCreate(hypre_SStructVectorComm(vector),
                                 hypre_SStructVectorGrid(vector),
@@ -121,18 +121,18 @@ hypre_SStructKrylovCreateVectorArray(HYPRE_Int n, void *vvector )
 
       if (object_type == HYPRE_SSTRUCT || object_type == HYPRE_STRUCT)
       {
-         for (part= 0; part< nparts; part++)
+         for (part = 0; part < nparts; part++)
          {
             pvector    = hypre_SStructVectorPVector(vector, part);
-            new_pvector= hypre_SStructVectorPVector(new_vector[i], part);
+            new_pvector = hypre_SStructVectorPVector(new_vector[i], part);
             nvars      = hypre_SStructPVectorNVars(pvector);
 
-            for (var= 0; var< nvars; var++)
+            for (var = 0; var < nvars; var++)
             {
-               svector= hypre_SStructPVectorSVector(pvector, var);
-               num_ghost= hypre_StructVectorNumGhost(svector);
+               svector = hypre_SStructPVectorSVector(pvector, var);
+               num_ghost = hypre_StructVectorNumGhost(svector);
 
-               new_svector= hypre_SStructPVectorSVector(new_pvector, var);
+               new_svector = hypre_SStructPVectorSVector(new_pvector, var);
                hypre_StructVectorSetNumGhost(new_svector, num_ghost);
             }
          }
@@ -151,9 +151,9 @@ hypre_SStructKrylovCreateVectorArray(HYPRE_Int n, void *vvector )
 HYPRE_Int
 hypre_SStructKrylovDestroyVector( void *vvector )
 {
-	hypre_SStructVector *vector = (hypre_SStructVector  *)vvector;
+   hypre_SStructVector *vector = (hypre_SStructVector  *)vvector;
 
-   return( HYPRE_SStructVectorDestroy( vector ) );
+   return ( HYPRE_SStructVectorDestroy( vector ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -184,6 +184,8 @@ hypre_SStructKrylovMatvec( void   *matvec_data,
                            HYPRE_Complex  beta,
                            void   *y )
 {
+   HYPRE_UNUSED_VAR(matvec_data);
+
    return ( hypre_SStructMatvec( alpha,
                                  (hypre_SStructMatrix *) A,
                                  (hypre_SStructVector *) x,
@@ -268,8 +270,7 @@ hypre_SStructKrylovCommInfo( void  *A,
                              HYPRE_Int   *num_procs )
 {
    MPI_Comm comm = hypre_SStructMatrixComm((hypre_SStructMatrix *) A);
-   hypre_MPI_Comm_size(comm,num_procs);
-   hypre_MPI_Comm_rank(comm,my_id);
+   hypre_MPI_Comm_size(comm, num_procs);
+   hypre_MPI_Comm_rank(comm, my_id);
    return hypre_error_flag;
 }
-
diff --git a/external/hypre/src/sstruct_ls/maxwell_PNedelec.c b/external/hypre/src/sstruct_ls/maxwell_PNedelec.c
index c0d31568..551fb4ba 100644
--- a/external/hypre/src/sstruct_ls/maxwell_PNedelec.c
+++ b/external/hypre/src/sstruct_ls/maxwell_PNedelec.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -20,7 +20,7 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                         hypre_SStructGrid    *cgrid_edge,
                         hypre_Index           rfactor    )
 {
-   MPI_Comm               comm= (fgrid_edge->  comm);
+   MPI_Comm               comm = (fgrid_edge->  comm);
 
    HYPRE_IJMatrix         edge_Edge;
 
@@ -53,16 +53,16 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
    hypre_Index            ishift, jshift, kshift, zero_index, one_index;
    HYPRE_Int              n_boxoffsets;
 
-   HYPRE_Int              nparts= hypre_SStructGridNParts(fgrid_edge);
+   HYPRE_Int              nparts = hypre_SStructGridNParts(fgrid_edge);
    HYPRE_Int              ndim  = hypre_SStructGridNDim(fgrid_edge);
 
    HYPRE_SStructVariable *vartypes, *Edge_vartypes;
    hypre_Index           *varoffsets;
    HYPRE_Int             *vartype_map;
-   HYPRE_Int              matrix_type= HYPRE_PARCSR;
+   HYPRE_Int              matrix_type = HYPRE_PARCSR;
 
    HYPRE_Int              nvars, Edge_nvars, part, var;
-   HYPRE_Int              tot_vars= 8;
+   HYPRE_Int              tot_vars = 8;
 
    HYPRE_Int              t, i, j, k, m, n, size;
    HYPRE_BigInt           l, p;
@@ -75,7 +75,7 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
    HYPRE_Int             *num_vboxes, **vboxnums;
 
    HYPRE_Int              trueV = 1;
-   HYPRE_Int              falseV= 0;
+   HYPRE_Int              falseV = 0;
    HYPRE_Int              row_in;
 
    HYPRE_Int              myproc;
@@ -86,17 +86,14 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
    hypre_SetIndex3(ishift, 1, 0, 0);
    hypre_SetIndex3(jshift, 0, 1, 0);
    hypre_SetIndex3(kshift, 0, 0, 1);
-   hypre_SetIndex3(zero_index, 0, 0, 0);
-   hypre_SetIndex3(one_index, 0, 0, 0);
-   for (i= 0; i< ndim; i++)
-   {
-      one_index[i]= 1;
-   }
+   hypre_SetIndex(zero_index, 0);
+   hypre_SetIndex(one_index, 1);
+   hypre_SetIndex(lindex, 0);
 
    /* set rfactor[2]= 1 if ndim=2. */
    if (ndim == 2)
    {
-      rfactor[2]= 1;
+      rfactor[2] = 1;
    }
 
    /*-------------------------------------------------------------------
@@ -110,51 +107,51 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
     * We will continue to call them edges, but use the face variable
     * enumeration.
     *-------------------------------------------------------------------*/
-   varoffsets= hypre_CTAlloc(hypre_Index,  tot_vars, HYPRE_MEMORY_HOST);
+   varoffsets = hypre_CTAlloc(hypre_Index,  tot_vars, HYPRE_MEMORY_HOST);
 
    /* total of 8 variable types. Create a mapping between user enumeration
       to hypre enumeration. Only need for edge grids. */
-   vartype_map= hypre_CTAlloc(HYPRE_Int,  tot_vars, HYPRE_MEMORY_HOST);
+   vartype_map = hypre_CTAlloc(HYPRE_Int,  tot_vars, HYPRE_MEMORY_HOST);
 
-   part= 0;
+   part = 0;
    p_cgrid = hypre_SStructGridPGrid(cgrid_edge, part);
    nvars   = hypre_SStructPGridNVars(p_cgrid);
-   vartypes= hypre_SStructPGridVarTypes(p_cgrid);
+   vartypes = hypre_SStructPGridVarTypes(p_cgrid);
 
-   for (i= 0; i< nvars; i++)
+   for (i = 0; i < nvars; i++)
    {
-      t= vartypes[i];
+      t = vartypes[i];
       hypre_SStructVariableGetOffset((hypre_SStructVariable) t,
                                      ndim, varoffsets[t]);
-      switch(t)
+      switch (t)
       {
          case 2:
          {
-            vartype_map[2]= i;
+            vartype_map[2] = i;
             break;
          }
 
          case 3:
          {
-            vartype_map[3]= i;
+            vartype_map[3] = i;
             break;
          }
 
          case 5:
          {
-            vartype_map[5]= i;
+            vartype_map[5] = i;
             break;
          }
 
          case 6:
          {
-            vartype_map[6]= i;
+            vartype_map[6] = i;
             break;
          }
 
          case 7:
          {
-            vartype_map[7]= i;
+            vartype_map[7] = i;
             break;
          }
       }
@@ -162,15 +159,15 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
 
    /* local sizes */
    nedges   = 0;
-   for (part= 0; part< nparts; part++)
+   for (part = 0; part < nparts; part++)
    {
       /* same for 2-d & 3-d, assuming that fgrid_edge= fgrid_face in input */
       p_fgrid = hypre_SStructGridPGrid(fgrid_edge, part);    /* edge fgrid */
       nvars   = hypre_SStructPGridNVars(p_fgrid);
 
-      for (var= 0; var< nvars; var++)
+      for (var = 0; var < nvars; var++)
       {
-         var_fgrid= hypre_SStructPGridSGrid(p_fgrid, var);
+         var_fgrid = hypre_SStructPGridSGrid(p_fgrid, var);
          nedges  += hypre_StructGridLocalSize(var_fgrid);
       }
    }
@@ -181,28 +178,28 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
     *  the extraction, a cbox can land in more than 1 fboxes (e.g., cbox
     *  boundary extending into other fboxes).
     *--------------------------------------------------------------------------*/
-   cfbox_mapping= hypre_TAlloc(HYPRE_Int *,  nparts, HYPRE_MEMORY_HOST);
-   fcbox_mapping= hypre_TAlloc(HYPRE_Int *,  nparts, HYPRE_MEMORY_HOST);
-   for (i= 0; i< nparts; i++)
+   cfbox_mapping = hypre_TAlloc(HYPRE_Int *,  nparts, HYPRE_MEMORY_HOST);
+   fcbox_mapping = hypre_TAlloc(HYPRE_Int *,  nparts, HYPRE_MEMORY_HOST);
+   for (i = 0; i < nparts; i++)
    {
       p_fgrid  = hypre_SStructGridPGrid(fgrid_edge, i);
-      var_fgrid= hypre_SStructPGridCellSGrid(p_fgrid);
+      var_fgrid = hypre_SStructPGridCellSGrid(p_fgrid);
       fboxes   = hypre_StructGridBoxes(var_fgrid);
       j        = hypre_BoxArraySize(fboxes);
-      fcbox_mapping[i]= hypre_CTAlloc(HYPRE_Int,  j, HYPRE_MEMORY_HOST);
+      fcbox_mapping[i] = hypre_CTAlloc(HYPRE_Int,  j, HYPRE_MEMORY_HOST);
 
       p_cgrid  = hypre_SStructGridPGrid(cgrid_edge, i);
-      var_cgrid= hypre_SStructPGridCellSGrid(p_cgrid);
+      var_cgrid = hypre_SStructPGridCellSGrid(p_cgrid);
       cboxes   = hypre_StructGridBoxes(var_cgrid);
       j        = hypre_BoxArraySize(fboxes);
-      cfbox_mapping[i]= hypre_CTAlloc(HYPRE_Int,  j, HYPRE_MEMORY_HOST);
+      cfbox_mapping[i] = hypre_CTAlloc(HYPRE_Int,  j, HYPRE_MEMORY_HOST);
 
       /* assuming if i1 > i2 and (box j1) is coarsened from (box i1)
          and (box j2) from (box i2), then j1 > j2. */
-      k= 0;
+      k = 0;
       hypre_ForBoxI(j, fboxes)
       {
-         fbox= hypre_BoxArrayBox(fboxes, j);
+         fbox = hypre_BoxArrayBox(fboxes, j);
          hypre_CopyBox(fbox, &copy_box);
          hypre_ProjectBox(&copy_box, zero_index, rfactor);
          hypre_StructMapFineToCoarse(hypre_BoxIMin(&copy_box), zero_index,
@@ -214,12 +211,12 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
             ordering, we only have to check if the first cbox in the
             list intersects with copy_box. If not, this fbox vanished in the
             coarsening. Note that this gives you the correct interior cbox. */
-         cbox= hypre_BoxArrayBox(cboxes, k);
+         cbox = hypre_BoxArrayBox(cboxes, k);
          hypre_IntersectBoxes(&copy_box, cbox, &copy_box);
          if (hypre_BoxVolume(&copy_box))
          {
-            cfbox_mapping[i][k]= j;
-            fcbox_mapping[i][j]= k;
+            cfbox_mapping[i][k] = j;
+            fcbox_mapping[i][j] = k;
             k++;
          }  /* if (hypre_BoxVolume(&copy_box)) */
       }     /* hypre_ForBoxI(j, fboxes) */
@@ -228,26 +225,26 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
    /* variable rank bounds for this processor */
    n_CtoVbox   = hypre_TAlloc(HYPRE_Int **,  nparts, HYPRE_MEMORY_HOST);
    CtoVboxnums = hypre_TAlloc(HYPRE_Int ***,  nparts, HYPRE_MEMORY_HOST);
-   for (part= 0; part< nparts; part++)
+   for (part = 0; part < nparts; part++)
    {
       hypre_SStructCellGridBoxNumMap(fgrid_edge, part, &n_CtoVbox[part],
                                      &CtoVboxnums[part]);
    }
 
    /* variable rank bounds for this processor */
-   lower_ranks= hypre_TAlloc(HYPRE_BigInt *,  nparts, HYPRE_MEMORY_HOST);
-   upper_ranks= hypre_TAlloc(HYPRE_BigInt *,  nparts, HYPRE_MEMORY_HOST);
-   for (part= 0; part< nparts; part++)
+   lower_ranks = hypre_TAlloc(HYPRE_BigInt *,  nparts, HYPRE_MEMORY_HOST);
+   upper_ranks = hypre_TAlloc(HYPRE_BigInt *,  nparts, HYPRE_MEMORY_HOST);
+   for (part = 0; part < nparts; part++)
    {
       p_fgrid  = hypre_SStructGridPGrid(fgrid_edge, part);
-      Edge_nvars= hypre_SStructPGridNVars(p_fgrid);
+      Edge_nvars = hypre_SStructPGridNVars(p_fgrid);
 
-      lower_ranks[part]= hypre_CTAlloc(HYPRE_BigInt,  Edge_nvars, HYPRE_MEMORY_HOST);
-      upper_ranks[part]= hypre_CTAlloc(HYPRE_BigInt,  Edge_nvars, HYPRE_MEMORY_HOST);
-      for (t= 0; t< Edge_nvars; t++)
+      lower_ranks[part] = hypre_CTAlloc(HYPRE_BigInt,  Edge_nvars, HYPRE_MEMORY_HOST);
+      upper_ranks[part] = hypre_CTAlloc(HYPRE_BigInt,  Edge_nvars, HYPRE_MEMORY_HOST);
+      for (t = 0; t < Edge_nvars; t++)
       {
-         var_fgrid= hypre_SStructPGridSGrid(p_fgrid, t);
-         box_array= hypre_StructGridBoxes(var_fgrid);
+         var_fgrid = hypre_SStructPGridSGrid(p_fgrid, t);
+         box_array = hypre_StructGridBoxes(var_fgrid);
 
          fbox     = hypre_BoxArrayBox(box_array, 0);
          hypre_CopyIndex(hypre_BoxIMin(fbox), findex);
@@ -256,7 +253,7 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
          hypre_SStructBoxManEntryGetGlobalRank(entry, findex, &lower_ranks[part][t],
                                                matrix_type);
 
-         fbox= hypre_BoxArrayBox(box_array, hypre_BoxArraySize(box_array)-1);
+         fbox = hypre_BoxArrayBox(box_array, hypre_BoxArraySize(box_array) - 1);
          hypre_CopyIndex(hypre_BoxIMax(fbox), findex);
          hypre_SStructGridFindBoxManEntry(fgrid_edge, part, findex, t,
                                           &entry);
@@ -272,31 +269,31 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
 
    /* edge_Edge. Same for 2-d and 3-d. */
    /* lower rank */
-   start_rank1= hypre_SStructGridStartRank(fgrid_edge);
-   start_rank2= hypre_SStructGridStartRank(cgrid_edge);
+   start_rank1 = hypre_SStructGridStartRank(fgrid_edge);
+   start_rank2 = hypre_SStructGridStartRank(cgrid_edge);
    ilower     = start_rank1;
    jlower     = start_rank2;
 
    /* upper rank */
-   part= nparts-1;
+   part = nparts - 1;
    p_fgrid = hypre_SStructGridPGrid(fgrid_edge, part);
    nvars   = hypre_SStructPGridNVars(p_fgrid);
-   var_fgrid= hypre_SStructPGridSGrid(p_fgrid, nvars-1);
+   var_fgrid = hypre_SStructPGridSGrid(p_fgrid, nvars - 1);
    fboxes   = hypre_StructGridBoxes(var_fgrid);
-   fbox    = hypre_BoxArrayBox(fboxes, hypre_BoxArraySize(fboxes)-1);
+   fbox    = hypre_BoxArrayBox(fboxes, hypre_BoxArraySize(fboxes) - 1);
 
-   hypre_SStructGridBoxProcFindBoxManEntry(fgrid_edge, part, nvars-1,
-                                           hypre_BoxArraySize(fboxes)-1, myproc, &entry);
+   hypre_SStructGridBoxProcFindBoxManEntry(fgrid_edge, part, nvars - 1,
+                                           hypre_BoxArraySize(fboxes) - 1, myproc, &entry);
    hypre_SStructBoxManEntryGetGlobalCSRank(entry, hypre_BoxIMax(fbox), &iupper);
 
    p_cgrid = hypre_SStructGridPGrid(cgrid_edge, part);
    nvars   = hypre_SStructPGridNVars(p_cgrid);
-   var_cgrid= hypre_SStructPGridSGrid(p_cgrid, nvars-1);
+   var_cgrid = hypre_SStructPGridSGrid(p_cgrid, nvars - 1);
    cboxes   = hypre_StructGridBoxes(var_cgrid);
-   cbox    = hypre_BoxArrayBox(cboxes, hypre_BoxArraySize(cboxes)-1);
+   cbox    = hypre_BoxArrayBox(cboxes, hypre_BoxArraySize(cboxes) - 1);
 
-   hypre_SStructGridBoxProcFindBoxManEntry(cgrid_edge, part, nvars-1,
-                                           hypre_BoxArraySize(cboxes)-1, myproc, &entry);
+   hypre_SStructGridBoxProcFindBoxManEntry(cgrid_edge, part, nvars - 1,
+                                           hypre_BoxArraySize(cboxes) - 1, myproc, &entry);
    hypre_SStructBoxManEntryGetGlobalCSRank(entry, hypre_BoxIMax(cbox), &jupper);
 
    HYPRE_IJMatrixCreate(comm, ilower, iupper, jlower, jupper, &edge_Edge);
@@ -323,51 +320,51 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
 
    /* count the row/col connections */
    iedgeEdge     = hypre_CTAlloc(HYPRE_BigInt,  nedges, HYPRE_MEMORY_HOST);
-   ncols_edgeEdge= hypre_CTAlloc(HYPRE_Int,  nedges, HYPRE_MEMORY_HOST);
+   ncols_edgeEdge = hypre_CTAlloc(HYPRE_Int,  nedges, HYPRE_MEMORY_HOST);
 
    /* get the contracted boxes */
-   contract_fedgeBoxes= hypre_TAlloc(hypre_BoxArray *,  nparts, HYPRE_MEMORY_HOST);
-   Edge_cstarts= hypre_TAlloc(hypre_Index *,  nparts, HYPRE_MEMORY_HOST);
-   upper_shifts= hypre_TAlloc(hypre_Index *,  nparts, HYPRE_MEMORY_HOST);
-   lower_shifts= hypre_TAlloc(hypre_Index *,  nparts, HYPRE_MEMORY_HOST);
+   contract_fedgeBoxes = hypre_TAlloc(hypre_BoxArray *,  nparts, HYPRE_MEMORY_HOST);
+   Edge_cstarts = hypre_TAlloc(hypre_Index *,  nparts, HYPRE_MEMORY_HOST);
+   upper_shifts = hypre_TAlloc(hypre_Index *,  nparts, HYPRE_MEMORY_HOST);
+   lower_shifts = hypre_TAlloc(hypre_Index *,  nparts, HYPRE_MEMORY_HOST);
 
-   for (part= 0; part< nparts; part++)
+   for (part = 0; part < nparts; part++)
    {
       p_fgrid  = hypre_SStructGridPGrid(fgrid_edge, part);
-      var_fgrid= hypre_SStructPGridCellSGrid(p_fgrid);
+      var_fgrid = hypre_SStructPGridCellSGrid(p_fgrid);
       fboxes   = hypre_StructGridBoxes(var_fgrid);
 
       /* fill up the contracted box_array */
-      contract_fedgeBoxes[part]= hypre_BoxArrayCreate(0, ndim);
-      Edge_cstarts[part]= hypre_TAlloc(hypre_Index,  hypre_BoxArraySize(fboxes), HYPRE_MEMORY_HOST);
-      upper_shifts[part]= hypre_TAlloc(hypre_Index,  hypre_BoxArraySize(fboxes), HYPRE_MEMORY_HOST);
-      lower_shifts[part]= hypre_TAlloc(hypre_Index,  hypre_BoxArraySize(fboxes), HYPRE_MEMORY_HOST);
+      contract_fedgeBoxes[part] = hypre_BoxArrayCreate(0, ndim);
+      Edge_cstarts[part] = hypre_TAlloc(hypre_Index,  hypre_BoxArraySize(fboxes), HYPRE_MEMORY_HOST);
+      upper_shifts[part] = hypre_TAlloc(hypre_Index,  hypre_BoxArraySize(fboxes), HYPRE_MEMORY_HOST);
+      lower_shifts[part] = hypre_TAlloc(hypre_Index,  hypre_BoxArraySize(fboxes), HYPRE_MEMORY_HOST);
 
       hypre_ForBoxI(i, fboxes)
       {
-         fbox= hypre_BoxArrayBox(fboxes, i);
+         fbox = hypre_BoxArrayBox(fboxes, i);
 
          /* contract the fbox to correspond to the correct cbox */
-         cbox= hypre_BoxContraction(fbox, var_fgrid, rfactor);
+         cbox = hypre_BoxContraction(fbox, var_fgrid, rfactor);
          hypre_AppendBox(cbox, contract_fedgeBoxes[part]);
 
          /* record the offset mapping between the coarse cell index and
             the fine cell index */
          hypre_ClearIndex(upper_shifts[part][i]);
          hypre_ClearIndex(lower_shifts[part][i]);
-         for (k= 0; k< ndim; k++)
+         for (k = 0; k < ndim; k++)
          {
-            m= hypre_BoxIMin(cbox)[k];
-            p= m%rfactor[k];
+            m = hypre_BoxIMin(cbox)[k];
+            p = m % rfactor[k];
             if (p > 0 && m > 0)
             {
-               upper_shifts[part][i][k]= p-1;
-               lower_shifts[part][i][k]= p-rfactor[k];
+               upper_shifts[part][i][k] = p - 1;
+               lower_shifts[part][i][k] = p - rfactor[k];
             }
             else
             {
-               upper_shifts[part][i][k]= rfactor[k]-p-1;
-               lower_shifts[part][i][k]=-p;
+               upper_shifts[part][i][k] = rfactor[k] - p - 1;
+               lower_shifts[part][i][k] = -p;
             }
          }
 
@@ -386,27 +383,27 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
     * loop first over the fedges aligning with the agglomerate coarse edges.
     * Will loop over the face & interior edges separately also.
     *-----------------------------------------------------------------------*/
-   j= 0;
-   for (part= 0; part< nparts; part++)
+   j = 0;
+   for (part = 0; part < nparts; part++)
    {
-      p_fgrid= hypre_SStructGridPGrid(fgrid_edge, part);  /* edge grid */
-      Edge_nvars= hypre_SStructPGridNVars(p_fgrid);
-      Edge_vartypes= hypre_SStructPGridVarTypes(p_fgrid);
+      p_fgrid = hypre_SStructGridPGrid(fgrid_edge, part); /* edge grid */
+      Edge_nvars = hypre_SStructPGridNVars(p_fgrid);
+      Edge_vartypes = hypre_SStructPGridVarTypes(p_fgrid);
 
       /* note that fboxes are the contracted CELL boxes. Will get the correct
          variable grid extents. */
-      fboxes= contract_fedgeBoxes[part];
+      fboxes = contract_fedgeBoxes[part];
 
-      for (t= 0; t< Edge_nvars; t++)
+      for (t = 0; t < Edge_nvars; t++)
       {
          var         = Edge_vartypes[t];
          var_fgrid   = hypre_SStructPGridVTSGrid(p_fgrid, var);
          box_array   = hypre_StructGridBoxes(var_fgrid);
 
-         n_boxoffsets= ndim-1;
+         n_boxoffsets = ndim - 1;
          boxoffset   = hypre_CTAlloc(hypre_Index,  n_boxoffsets, HYPRE_MEMORY_HOST);
          suboffset   = hypre_CTAlloc(hypre_Index,  n_boxoffsets, HYPRE_MEMORY_HOST);
-         switch(var)
+         switch (var)
          {
             case 2: /* 2-d: x_face (vertical edges), stride=[rfactor[0],1,1] */
             {
@@ -414,7 +411,7 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                hypre_CopyIndex(varoffsets[2], var_index);
 
                /* boxoffset shrink in the i direction */
-               hypre_SetIndex3(boxoffset[0], rfactor[0]-1, 0, 0);
+               hypre_SetIndex3(boxoffset[0], rfactor[0] - 1, 0, 0);
                hypre_SetIndex3(suboffset[0], 1, 0, 0);
 
                /* extend loop_size by one in the stride direction */
@@ -428,7 +425,7 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                hypre_CopyIndex(varoffsets[3], var_index);
 
                /* boxoffset shrink in the j direction */
-               hypre_SetIndex3(boxoffset[0], 0, rfactor[1]-1, 0);
+               hypre_SetIndex3(boxoffset[0], 0, rfactor[1] - 1, 0);
                hypre_SetIndex3(suboffset[0], 0, 1, 0);
 
                /* extend loop_size by one in the stride direction */
@@ -442,8 +439,8 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                hypre_CopyIndex(varoffsets[5], var_index);
 
                /* boxoffset shrink in the j & k directions */
-               hypre_SetIndex3(boxoffset[0], 0, rfactor[1]-1, 0);
-               hypre_SetIndex3(boxoffset[1], 0, 0, rfactor[2]-1);
+               hypre_SetIndex3(boxoffset[0], 0, rfactor[1] - 1, 0);
+               hypre_SetIndex3(boxoffset[1], 0, 0, rfactor[2] - 1);
                hypre_SetIndex3(suboffset[0], 0, 1, 0);
                hypre_SetIndex3(suboffset[1], 0, 0, 1);
 
@@ -458,8 +455,8 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                hypre_CopyIndex(varoffsets[6], var_index);
 
                /* boxoffset shrink in the i & k directions */
-               hypre_SetIndex3(boxoffset[0], rfactor[0]-1, 0, 0);
-               hypre_SetIndex3(boxoffset[1], 0, 0, rfactor[2]-1);
+               hypre_SetIndex3(boxoffset[0], rfactor[0] - 1, 0, 0);
+               hypre_SetIndex3(boxoffset[1], 0, 0, rfactor[2] - 1);
                hypre_SetIndex3(suboffset[0], 1, 0, 0);
                hypre_SetIndex3(suboffset[1], 0, 0, 1);
 
@@ -474,8 +471,8 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                hypre_CopyIndex(varoffsets[7], var_index);
 
                /* boxoffset shrink in the i & j directions */
-               hypre_SetIndex3(boxoffset[0], rfactor[0]-1, 0, 0);
-               hypre_SetIndex3(boxoffset[1], 0, rfactor[1]-1, 0);
+               hypre_SetIndex3(boxoffset[0], rfactor[0] - 1, 0, 0);
+               hypre_SetIndex3(boxoffset[1], 0, rfactor[1] - 1, 0);
                hypre_SetIndex3(suboffset[0], 1, 0, 0);
                hypre_SetIndex3(suboffset[1], 0, 1, 0);
 
@@ -487,10 +484,10 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
 
          hypre_ForBoxI(i, fboxes)
          {
-            cellbox= hypre_BoxArrayBox(fboxes, i);
+            cellbox = hypre_BoxArrayBox(fboxes, i);
 
             /* vboxes inside the i'th cellbox */
-            num_vboxes= n_CtoVbox[part][i];
+            num_vboxes = n_CtoVbox[part][i];
             vboxnums  = CtoVboxnums[part][i];
 
             /* adjust the project cellbox to the variable box */
@@ -502,19 +499,19 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                has to be decreased, then we decrease it by (rfactor[j]-1)
                in the appropriate direction.
                Check the location of the shifted lower box index. */
-            for (k= 0; k< n_boxoffsets; k++)
+            for (k = 0; k < n_boxoffsets; k++)
             {
                hypre_SubtractIndexes(hypre_BoxIMin(&copy_box), suboffset[k], 3,
                                      findex);
-               row_in= falseV;
-               for (p= 0; p< num_vboxes[t]; p++)
+               row_in = falseV;
+               for (p = 0; p < num_vboxes[t]; p++)
                {
-                  vbox= hypre_BoxArrayBox(box_array, vboxnums[t][p]);
+                  vbox = hypre_BoxArrayBox(box_array, vboxnums[t][p]);
 
                   if (hypre_IndexInBox(findex, vbox))
                   {
                      hypre_CopyIndex(findex, hypre_BoxIMin(&copy_box));
-                     row_in= trueV;
+                     row_in = trueV;
                      break;
                   }
                }
@@ -539,9 +536,9 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
             {
                zypre_BoxLoopGetIndex(lindex);
                hypre_SetIndex3(findex, lindex[0], lindex[1], lindex[2]);
-               for (k= 0; k< 3; k++)
+               for (k = 0; k < 3; k++)
                {
-                  findex[k]*= stride[k];
+                  findex[k] *= stride[k];
                }
                hypre_AddIndexes(findex, start, 3, findex);
 
@@ -551,8 +548,8 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                /* still row p may be outside the processor- check to make sure in */
                if ( (p <= upper_ranks[part][t]) && (p >= lower_ranks[part][t]) )
                {
-                  iedgeEdge[j]= p;
-                  ncols_edgeEdge[j]= 1;
+                  iedgeEdge[j] = p;
+                  ncols_edgeEdge[j] = 1;
                   j++;
                }
             }
@@ -571,42 +568,42 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
     *-----------------------------------------------------------------------*/
    if (ndim == 3)
    {
-      for (part= 0; part< nparts; part++)
+      for (part = 0; part < nparts; part++)
       {
-         p_fgrid= hypre_SStructGridPGrid(fgrid_edge, part);  /* edge grid */
-         Edge_nvars= hypre_SStructPGridNVars(p_fgrid);
-         Edge_vartypes= hypre_SStructPGridVarTypes(p_fgrid);
+         p_fgrid = hypre_SStructGridPGrid(fgrid_edge, part); /* edge grid */
+         Edge_nvars = hypre_SStructPGridNVars(p_fgrid);
+         Edge_vartypes = hypre_SStructPGridVarTypes(p_fgrid);
 
          /* note that fboxes are the contracted CELL boxes. Will get the correct
             variable grid extents. */
-         fboxes= contract_fedgeBoxes[part];
+         fboxes = contract_fedgeBoxes[part];
 
          /* may need to shrink a given box in some boxoffset directions */
-         boxoffset= hypre_TAlloc(hypre_Index,  ndim, HYPRE_MEMORY_HOST);
-         for (t= 0; t< ndim; t++)
+         boxoffset = hypre_TAlloc(hypre_Index,  ndim, HYPRE_MEMORY_HOST);
+         for (t = 0; t < ndim; t++)
          {
             hypre_ClearIndex(boxoffset[t]);
-            hypre_IndexD(boxoffset[t], t)= rfactor[t]-1;
+            hypre_IndexD(boxoffset[t], t) = rfactor[t] - 1;
          }
 
-         for (t= 0; t< Edge_nvars; t++)
+         for (t = 0; t < Edge_nvars; t++)
          {
             var      = Edge_vartypes[t];
-            var_fgrid= hypre_SStructPGridVTSGrid(p_fgrid, var);
-            box_array= hypre_StructGridBoxes(var_fgrid);
+            var_fgrid = hypre_SStructPGridVTSGrid(p_fgrid, var);
+            box_array = hypre_StructGridBoxes(var_fgrid);
 
             /* to reduce comparison, take the switch outside of the loop */
-            switch(var)
+            switch (var)
             {
                case 5:
                {
                   /* 3-d x_edge, can be Y or Z_Face */
                   hypre_ForBoxI(i, fboxes)
                   {
-                     cellbox= hypre_BoxArrayBox(fboxes, i);
+                     cellbox = hypre_BoxArrayBox(fboxes, i);
 
                      /* vboxes inside the i'th cellbox */
-                     num_vboxes= n_CtoVbox[part][i];
+                     num_vboxes = n_CtoVbox[part][i];
                      vboxnums  = CtoVboxnums[part][i];
 
                      /* adjust the contracted cellbox to the variable box */
@@ -624,14 +621,14 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                                            findex);
 
                      /* loop over all the vboxes to see if findex is inside */
-                     row_in= falseV;
-                     for (p= 0; p< num_vboxes[t]; p++)
+                     row_in = falseV;
+                     for (p = 0; p < num_vboxes[t]; p++)
                      {
-                        vbox= hypre_BoxArrayBox(box_array, vboxnums[t][p]);
+                        vbox = hypre_BoxArrayBox(box_array, vboxnums[t][p]);
                         if (hypre_IndexInBox(findex, vbox))
                         {
                            hypre_CopyIndex(findex, hypre_BoxIMin(&copy_box));
-                           row_in= trueV;
+                           row_in = trueV;
                            break;
                         }
                      }
@@ -656,20 +653,20 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                      {
                         zypre_BoxLoopGetIndex(lindex);
                         hypre_SetIndex3(findex, lindex[0], lindex[1], lindex[2]);
-                        for (k= 0; k< 3; k++)
+                        for (k = 0; k < 3; k++)
                         {
-                           findex[k]*= rfactor[k];
+                           findex[k] *= rfactor[k];
                         }
                         hypre_AddIndexes(findex, start, 3, findex);
 
                         /************************************************************
                          * Loop over the Z_Face x_edges.
                          ************************************************************/
-                        for (p= 0; p< rfactor[0]; p++)
+                        for (p = 0; p < rfactor[0]; p++)
                         {
                            hypre_CopyIndex(findex, var_index);
-                           var_index[0]+= p;
-                           for (n= 1; n< rfactor[1]; n++)
+                           var_index[0] += p;
+                           for (n = 1; n < rfactor[1]; n++)
                            {
                               var_index[1]++;
                               hypre_SStructGridFindBoxManEntry(fgrid_edge, part, var_index,
@@ -681,10 +678,10 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                               if ((l <= upper_ranks[part][t]) &&
                                   (l >= lower_ranks[part][t]))
                               {
-                                 iedgeEdge[j]= l;
+                                 iedgeEdge[j] = l;
 
                                  /* Z_Face. Two coarse Edge connections. */
-                                 ncols_edgeEdge[j]= 2;
+                                 ncols_edgeEdge[j] = 2;
                                  j++;
                               }
 
@@ -699,14 +696,14 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                                            findex);
 
                      /* loop over all the vboxes to see if findex is inside */
-                     row_in= falseV;
-                     for (p= 0; p< num_vboxes[t]; p++)
+                     row_in = falseV;
+                     for (p = 0; p < num_vboxes[t]; p++)
                      {
-                        vbox= hypre_BoxArrayBox(box_array, vboxnums[t][p]);
+                        vbox = hypre_BoxArrayBox(box_array, vboxnums[t][p]);
                         if (hypre_IndexInBox(findex, vbox))
                         {
                            hypre_CopyIndex(findex, hypre_BoxIMin(&copy_box));
-                           row_in= trueV;
+                           row_in = trueV;
                            break;
                         }
                      }
@@ -730,18 +727,18 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                      {
                         zypre_BoxLoopGetIndex(lindex);
                         hypre_SetIndex3(findex, lindex[0], lindex[1], lindex[2]);
-                        for (k= 0; k< 3; k++)
+                        for (k = 0; k < 3; k++)
                         {
-                           findex[k]*= rfactor[k];
+                           findex[k] *= rfactor[k];
                         }
                         hypre_AddIndexes(findex, start, 3, findex);
 
                         /* Y_Face */
-                        for (p= 0; p< rfactor[0]; p++)
+                        for (p = 0; p < rfactor[0]; p++)
                         {
                            hypre_CopyIndex(findex, var_index);
-                           var_index[0]+= p;
-                           for (n= 1; n< rfactor[2]; n++)
+                           var_index[0] += p;
+                           for (n = 1; n < rfactor[2]; n++)
                            {
                               var_index[2]++;
                               hypre_SStructGridFindBoxManEntry(fgrid_edge, part, var_index,
@@ -751,10 +748,10 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                               if ((l <= upper_ranks[part][t]) &&
                                   (l >= lower_ranks[part][t]))
                               {
-                                 iedgeEdge[j]= l;
+                                 iedgeEdge[j] = l;
 
                                  /* Y_Face. Two coarse Edge connections. */
-                                 ncols_edgeEdge[j]= 2;
+                                 ncols_edgeEdge[j] = 2;
                                  j++;
                               }
 
@@ -772,10 +769,10 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                   /* 3-d y_edge, can be X or Z_Face */
                   hypre_ForBoxI(i, fboxes)
                   {
-                     cellbox= hypre_BoxArrayBox(fboxes, i);
+                     cellbox = hypre_BoxArrayBox(fboxes, i);
 
                      /* vboxes inside the i'th cellbox */
-                     num_vboxes= n_CtoVbox[part][i];
+                     num_vboxes = n_CtoVbox[part][i];
                      vboxnums  = CtoVboxnums[part][i];
 
                      /* adjust the project cellbox to the variable box */
@@ -792,14 +789,14 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                      hypre_SubtractIndexes(hypre_BoxIMin(&copy_box), kshift, 3,
                                            findex);
                      /* loop over all the vboxes to see if findex is inside */
-                     row_in= falseV;
-                     for (p= 0; p< num_vboxes[t]; p++)
+                     row_in = falseV;
+                     for (p = 0; p < num_vboxes[t]; p++)
                      {
-                        vbox= hypre_BoxArrayBox(box_array, vboxnums[t][p]);
+                        vbox = hypre_BoxArrayBox(box_array, vboxnums[t][p]);
                         if (hypre_IndexInBox(findex, vbox))
                         {
                            hypre_CopyIndex(findex, hypre_BoxIMin(&copy_box));
-                           row_in= trueV;
+                           row_in = trueV;
                            break;
                         }
                      }
@@ -827,19 +824,19 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                         zypre_BoxLoopGetIndex(lindex);
                         hypre_SetIndex3(findex, lindex[0], lindex[1], lindex[2]);
 
-                        for (k= 0; k< 3; k++)
+                        for (k = 0; k < 3; k++)
                         {
-                           findex[k]*= rfactor[k];
+                           findex[k] *= rfactor[k];
                         }
 
                         hypre_AddIndexes(findex, start, 3, findex);
 
                         /* Z_Face */
-                        for (p= 0; p< rfactor[1]; p++)
+                        for (p = 0; p < rfactor[1]; p++)
                         {
                            hypre_CopyIndex(findex, var_index);
-                           var_index[1]+= p;
-                           for (n= 1; n< rfactor[0]; n++)
+                           var_index[1] += p;
+                           for (n = 1; n < rfactor[0]; n++)
                            {
                               var_index[0]++;
                               hypre_SStructGridFindBoxManEntry(fgrid_edge, part, var_index,
@@ -849,10 +846,10 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                               if ((l <= upper_ranks[part][t]) &&
                                   (l >= lower_ranks[part][t]))
                               {
-                                 iedgeEdge[j]= l;
+                                 iedgeEdge[j] = l;
 
                                  /* Z_Face. Two coarse Edge connections. */
-                                 ncols_edgeEdge[j]= 2;
+                                 ncols_edgeEdge[j] = 2;
                                  j++;
                               }
 
@@ -867,14 +864,14 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                      hypre_SubtractIndexes(hypre_BoxIMin(&copy_box), ishift, 3,
                                            findex);
                      /* loop over all the vboxes to see if findex is inside */
-                     row_in= falseV;
-                     for (p= 0; p< num_vboxes[t]; p++)
+                     row_in = falseV;
+                     for (p = 0; p < num_vboxes[t]; p++)
                      {
-                        vbox= hypre_BoxArrayBox(box_array, vboxnums[t][p]);
+                        vbox = hypre_BoxArrayBox(box_array, vboxnums[t][p]);
                         if (hypre_IndexInBox(findex, vbox))
                         {
                            hypre_CopyIndex(findex, hypre_BoxIMin(&copy_box));
-                           row_in= trueV;
+                           row_in = trueV;
                            break;
                         }
                      }
@@ -900,19 +897,19 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                         zypre_BoxLoopGetIndex(lindex);
                         hypre_SetIndex3(findex, lindex[0], lindex[1], lindex[2]);
 
-                        for (k= 0; k< 3; k++)
+                        for (k = 0; k < 3; k++)
                         {
-                           findex[k]*= rfactor[k];
+                           findex[k] *= rfactor[k];
                         }
 
                         hypre_AddIndexes(findex, start, 3, findex);
 
                         /* X_Face */
-                        for (p= 0; p< rfactor[1]; p++)
+                        for (p = 0; p < rfactor[1]; p++)
                         {
                            hypre_CopyIndex(findex, var_index);
-                           var_index[1]+= p;
-                           for (n= 1; n< rfactor[2]; n++)
+                           var_index[1] += p;
+                           for (n = 1; n < rfactor[2]; n++)
                            {
                               var_index[2]++;
                               hypre_SStructGridFindBoxManEntry(fgrid_edge, part, var_index,
@@ -922,10 +919,10 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                               if ((l <= upper_ranks[part][t]) &&
                                   (l >= lower_ranks[part][t]))
                               {
-                                 iedgeEdge[j]= l;
+                                 iedgeEdge[j] = l;
 
                                  /* X_Face. Two coarse Edge connections. */
-                                 ncols_edgeEdge[j]= 2;
+                                 ncols_edgeEdge[j] = 2;
                                  j++;
                               }
 
@@ -943,10 +940,10 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                   /* 3-d z_edge, can be interior, X or Y_Face, or Z_Edge */
                   hypre_ForBoxI(i, fboxes)
                   {
-                     cellbox= hypre_BoxArrayBox(fboxes, i);
+                     cellbox = hypre_BoxArrayBox(fboxes, i);
 
                      /* vboxes inside the i'th cellbox */
-                     num_vboxes= n_CtoVbox[part][i];
+                     num_vboxes = n_CtoVbox[part][i];
                      vboxnums  = CtoVboxnums[part][i];
 
                      /* adjust the project cellbox to the variable box */
@@ -963,14 +960,14 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                      hypre_SubtractIndexes(hypre_BoxIMin(&copy_box), ishift, 3,
                                            findex);
                      /* loop over all the vboxes to see if findex is inside */
-                     row_in= falseV;
-                     for (p= 0; p< num_vboxes[t]; p++)
+                     row_in = falseV;
+                     for (p = 0; p < num_vboxes[t]; p++)
                      {
-                        vbox= hypre_BoxArrayBox(box_array, vboxnums[t][p]);
+                        vbox = hypre_BoxArrayBox(box_array, vboxnums[t][p]);
                         if (hypre_IndexInBox(findex, vbox))
                         {
                            hypre_CopyIndex(findex, hypre_BoxIMin(&copy_box));
-                           row_in= trueV;
+                           row_in = trueV;
                            break;
                         }
                      }
@@ -997,19 +994,19 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                         zypre_BoxLoopGetIndex(lindex);
                         hypre_SetIndex3(findex, lindex[0], lindex[1], lindex[2]);
 
-                        for (k= 0; k< 3; k++)
+                        for (k = 0; k < 3; k++)
                         {
-                           findex[k]*= rfactor[k];
+                           findex[k] *= rfactor[k];
                         }
 
                         hypre_AddIndexes(findex, start, 3, findex);
 
                         /* X_Face */
-                        for (p= 0; p< rfactor[2]; p++)
+                        for (p = 0; p < rfactor[2]; p++)
                         {
                            hypre_CopyIndex(findex, var_index);
-                           var_index[2]+= p;
-                           for (n= 1; n< rfactor[1]; n++)
+                           var_index[2] += p;
+                           for (n = 1; n < rfactor[1]; n++)
                            {
                               var_index[1]++;
                               hypre_SStructGridFindBoxManEntry(fgrid_edge, part, var_index,
@@ -1019,10 +1016,10 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                               if ((l <= upper_ranks[part][t]) &&
                                   (l >= lower_ranks[part][t]))
                               {
-                                 iedgeEdge[j]= l;
+                                 iedgeEdge[j] = l;
 
                                  /* X_Face. Two coarse Edge connections. */
-                                 ncols_edgeEdge[j]= 2;
+                                 ncols_edgeEdge[j] = 2;
                                  j++;
                               }
                            }  /* for (n= 1; n< rfactor[1]; n++) */
@@ -1035,14 +1032,14 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                      hypre_SubtractIndexes(hypre_BoxIMin(&copy_box), jshift, 3,
                                            findex);
                      /* loop over all the vboxes to see if findex is inside */
-                     row_in= falseV;
-                     for (p= 0; p< num_vboxes[t]; p++)
+                     row_in = falseV;
+                     for (p = 0; p < num_vboxes[t]; p++)
                      {
-                        vbox= hypre_BoxArrayBox(box_array, vboxnums[t][p]);
+                        vbox = hypre_BoxArrayBox(box_array, vboxnums[t][p]);
                         if (hypre_IndexInBox(findex, vbox))
                         {
                            hypre_CopyIndex(findex, hypre_BoxIMin(&copy_box));
-                           row_in= trueV;
+                           row_in = trueV;
                            break;
                         }
                      }
@@ -1068,19 +1065,19 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                         zypre_BoxLoopGetIndex(lindex);
                         hypre_SetIndex3(findex, lindex[0], lindex[1], lindex[2]);
 
-                        for (k= 0; k< 3; k++)
+                        for (k = 0; k < 3; k++)
                         {
-                           findex[k]*= rfactor[k];
+                           findex[k] *= rfactor[k];
                         }
 
                         hypre_AddIndexes(findex, start, 3, findex);
 
                         /* Y_Face */
-                        for (p= 0; p< rfactor[2]; p++)
+                        for (p = 0; p < rfactor[2]; p++)
                         {
                            hypre_CopyIndex(findex, var_index);
-                           var_index[2]+= p;
-                           for (n= 1; n< rfactor[0]; n++)
+                           var_index[2] += p;
+                           for (n = 1; n < rfactor[0]; n++)
                            {
                               var_index[0]++;
                               hypre_SStructGridFindBoxManEntry(fgrid_edge, part, var_index,
@@ -1090,10 +1087,10 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                               if ((l <= upper_ranks[part][t]) &&
                                   (l >= lower_ranks[part][t]))
                               {
-                                 iedgeEdge[j]= l;
+                                 iedgeEdge[j] = l;
 
                                  /* Y_Face. Two coarse Edge connections. */
-                                 ncols_edgeEdge[j]= 2;
+                                 ncols_edgeEdge[j] = 2;
                                  j++;
                               }
                            }  /* for (n= 1; n< rfactor[0]; n++) */
@@ -1112,31 +1109,31 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
       }  /* for (part= 0; part< nparts; part++) */
    }     /* if (ndim == 3) */
 
-   for (part= 0; part< nparts; part++)
+   for (part = 0; part < nparts; part++)
    {
-      p_fgrid= hypre_SStructGridPGrid(fgrid_edge, part);  /* edge grid */
-      Edge_nvars= hypre_SStructPGridNVars(p_fgrid);
-      Edge_vartypes= hypre_SStructPGridVarTypes(p_fgrid);
+      p_fgrid = hypre_SStructGridPGrid(fgrid_edge, part); /* edge grid */
+      Edge_nvars = hypre_SStructPGridNVars(p_fgrid);
+      Edge_vartypes = hypre_SStructPGridVarTypes(p_fgrid);
 
       /* note that fboxes are the contracted CELL boxes. Will get the correct
          variable grid extents. */
-      fboxes= contract_fedgeBoxes[part];
+      fboxes = contract_fedgeBoxes[part];
 
-      for (t= 0; t< Edge_nvars; t++)
+      for (t = 0; t < Edge_nvars; t++)
       {
          var      = Edge_vartypes[t];
-         var_fgrid= hypre_SStructPGridVTSGrid(p_fgrid, var);
-         box_array= hypre_StructGridBoxes(var_fgrid);
+         var_fgrid = hypre_SStructPGridVTSGrid(p_fgrid, var);
+         box_array = hypre_StructGridBoxes(var_fgrid);
 
          /* to reduce comparison, take the switch outside of the loop */
-         switch(var)
+         switch (var)
          {
             case 2:
             {
                /* 2-d x_face = x_edge, can be interior */
                hypre_ForBoxI(i, fboxes)
                {
-                  cellbox= hypre_BoxArrayBox(fboxes, i);
+                  cellbox = hypre_BoxArrayBox(fboxes, i);
 
                   /* adjust the contract cellbox to the variable box */
                   hypre_CopyBox(cellbox, &copy_box);
@@ -1154,27 +1151,27 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                   {
                      zypre_BoxLoopGetIndex(lindex);
                      hypre_SetIndex3(findex, lindex[0], lindex[1], lindex[2]);
-                     for (k= 0; k< 3; k++)
+                     for (k = 0; k < 3; k++)
                      {
-                        findex[k]*= rfactor[k];
+                        findex[k] *= rfactor[k];
                      }
                      hypre_AddIndexes(findex, start, 3, findex);
 
                      /* get interior edges */
-                     for (p= 1; p< rfactor[0]; p++)
+                     for (p = 1; p < rfactor[0]; p++)
                      {
                         hypre_CopyIndex(findex, var_index);
-                        var_index[0]+= p;
-                        for (n= 0; n< rfactor[1]; n++)
+                        var_index[0] += p;
+                        for (n = 0; n < rfactor[1]; n++)
                         {
                            hypre_SStructGridFindBoxManEntry(fgrid_edge, part, var_index,
                                                             t, &entry);
                            hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &l,
                                                                  matrix_type);
-                           iedgeEdge[j]= l;
+                           iedgeEdge[j] = l;
 
                            /* lies interior of Face. Two coarse Edge connection. */
-                           ncols_edgeEdge[j]= 2;
+                           ncols_edgeEdge[j] = 2;
                            j++;
 
                            var_index[1]++;
@@ -1192,7 +1189,7 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                /* 2-d y_face = y_edge, can be interior */
                hypre_ForBoxI(i, fboxes)
                {
-                  cellbox= hypre_BoxArrayBox(fboxes, i);
+                  cellbox = hypre_BoxArrayBox(fboxes, i);
 
                   /* adjust the project cellbox to the variable box */
                   hypre_CopyBox(cellbox, &copy_box);
@@ -1211,28 +1208,28 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                      zypre_BoxLoopGetIndex(lindex);
                      hypre_SetIndex3(findex, lindex[0], lindex[1], lindex[2]);
 
-                     for (k= 0; k< 3; k++)
+                     for (k = 0; k < 3; k++)
                      {
-                        findex[k]*= rfactor[k];
+                        findex[k] *= rfactor[k];
                      }
 
                      hypre_AddIndexes(findex, start, 3, findex);
 
                      /* get interior edges */
-                     for (p= 1; p< rfactor[1]; p++)
+                     for (p = 1; p < rfactor[1]; p++)
                      {
                         hypre_CopyIndex(findex, var_index);
-                        var_index[1]+= p;
-                        for (n= 0; n< rfactor[0]; n++)
+                        var_index[1] += p;
+                        for (n = 0; n < rfactor[0]; n++)
                         {
                            hypre_SStructGridFindBoxManEntry(fgrid_edge, part, var_index,
                                                             t, &entry);
                            hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &l,
                                                                  matrix_type);
-                           iedgeEdge[j]= l;
+                           iedgeEdge[j] = l;
 
                            /* lies interior of Face. Two coarse Edge connection. */
-                           ncols_edgeEdge[j]= 2;
+                           ncols_edgeEdge[j] = 2;
                            j++;
 
                            var_index[0]++;
@@ -1250,7 +1247,7 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                /* 3-d x_edge, can be only interior */
                hypre_ForBoxI(i, fboxes)
                {
-                  cellbox= hypre_BoxArrayBox(fboxes, i);
+                  cellbox = hypre_BoxArrayBox(fboxes, i);
 
                   /* adjust the project cellbox to the variable box */
                   hypre_CopyBox(cellbox, &copy_box);
@@ -1268,42 +1265,42 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                   {
                      zypre_BoxLoopGetIndex(lindex);
                      hypre_SetIndex3(findex, lindex[0], lindex[1], lindex[2]);
-                     for (k= 0; k< 3; k++)
+                     for (k = 0; k < 3; k++)
                      {
-                        findex[k]*= rfactor[k];
+                        findex[k] *= rfactor[k];
                      }
                      hypre_AddIndexes(findex, start, 3, findex);
 
                      /* get interior edges */
-                     for (p= 1; p< rfactor[2]; p++)
+                     for (p = 1; p < rfactor[2]; p++)
                      {
                         hypre_CopyIndex(findex, var_index);
-                        var_index[2]+= p;
-                        for (n= 1; n< rfactor[1]; n++)
+                        var_index[2] += p;
+                        for (n = 1; n < rfactor[1]; n++)
                         {
                            var_index[1]++;
-                           for (k= 0; k< rfactor[0]; k++)
+                           for (k = 0; k < rfactor[0]; k++)
                            {
                               hypre_SStructGridFindBoxManEntry(fgrid_edge, part, var_index,
                                                                t, &entry);
                               hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &l,
                                                                     matrix_type);
-                              iedgeEdge[j]= l;
+                              iedgeEdge[j] = l;
 
                               /* Interior. Four coarse Edge connections. */
-                              ncols_edgeEdge[j]= 4;
+                              ncols_edgeEdge[j] = 4;
                               j++;
 
                               var_index[0]++;
                            }  /* for (k= 0; k< rfactor[0]; k++) */
 
                            /* reset var_index[0] to the initial index for next k loop */
-                           var_index[0]-= rfactor[0];
+                           var_index[0] -= rfactor[0];
 
                         }  /* for (n= 1; n< rfactor[1]; n++) */
 
                         /* reset var_index[1] to the initial index for next n loop */
-                        var_index[1]-= (rfactor[1]-1);
+                        var_index[1] -= (rfactor[1] - 1);
                      }  /* for (p= 1; p< rfactor[2]; p++) */
 
                   }
@@ -1317,7 +1314,7 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                /* 3-d y_edge, can be only interior */
                hypre_ForBoxI(i, fboxes)
                {
-                  cellbox= hypre_BoxArrayBox(fboxes, i);
+                  cellbox = hypre_BoxArrayBox(fboxes, i);
 
                   /* adjust the project cellbox to the variable box */
                   hypre_CopyBox(cellbox, &copy_box);
@@ -1335,42 +1332,42 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                   {
                      zypre_BoxLoopGetIndex(lindex);
                      hypre_SetIndex3(findex, lindex[0], lindex[1], lindex[2]);
-                     for (k= 0; k< 3; k++)
+                     for (k = 0; k < 3; k++)
                      {
-                        findex[k]*= rfactor[k];
+                        findex[k] *= rfactor[k];
                      }
                      hypre_AddIndexes(findex, start, 3, findex);
 
                      /* get interior edges */
-                     for (p= 1; p< rfactor[2]; p++)
+                     for (p = 1; p < rfactor[2]; p++)
                      {
                         hypre_CopyIndex(findex, var_index);
-                        var_index[2]+= p;
-                        for (n= 1; n< rfactor[0]; n++)
+                        var_index[2] += p;
+                        for (n = 1; n < rfactor[0]; n++)
                         {
                            var_index[0]++;
-                           for (k= 0; k< rfactor[1]; k++)
+                           for (k = 0; k < rfactor[1]; k++)
                            {
                               hypre_SStructGridFindBoxManEntry(fgrid_edge, part, var_index,
                                                                t, &entry);
                               hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &l,
                                                                     matrix_type);
-                              iedgeEdge[j]= l;
+                              iedgeEdge[j] = l;
 
                               /* Interior. Four coarse Edge connections. */
-                              ncols_edgeEdge[j]= 4;
+                              ncols_edgeEdge[j] = 4;
                               j++;
 
                               var_index[1]++;
                            }  /* for (k= 0; k< rfactor[1]; k++) */
 
                            /* reset var_index[1] to the initial index for next k loop */
-                           var_index[1]-= rfactor[1];
+                           var_index[1] -= rfactor[1];
 
                         }  /* for (n= 1; n< rfactor[0]; n++) */
 
                         /* reset var_index[0] to the initial index for next n loop */
-                        var_index[0]-= (rfactor[0]-1);
+                        var_index[0] -= (rfactor[0] - 1);
                      }  /* for (p= 1; p< rfactor[2]; p++) */
 
                   }
@@ -1385,7 +1382,7 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                /* 3-d z_edge, can be only interior */
                hypre_ForBoxI(i, fboxes)
                {
-                  cellbox= hypre_BoxArrayBox(fboxes, i);
+                  cellbox = hypre_BoxArrayBox(fboxes, i);
 
                   /* adjust the project cellbox to the variable box */
                   hypre_CopyBox(cellbox, &copy_box);
@@ -1403,42 +1400,42 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                   {
                      zypre_BoxLoopGetIndex(lindex);
                      hypre_SetIndex3(findex, lindex[0], lindex[1], lindex[2]);
-                     for (k= 0; k< 3; k++)
+                     for (k = 0; k < 3; k++)
                      {
-                        findex[k]*= rfactor[k];
+                        findex[k] *= rfactor[k];
                      }
                      hypre_AddIndexes(findex, start, 3, findex);
 
                      /* get interior edges */
-                     for (p= 1; p< rfactor[1]; p++)
+                     for (p = 1; p < rfactor[1]; p++)
                      {
                         hypre_CopyIndex(findex, var_index);
-                        var_index[1]+= p;
-                        for (n= 1; n< rfactor[0]; n++)
+                        var_index[1] += p;
+                        for (n = 1; n < rfactor[0]; n++)
                         {
                            var_index[0]++;
-                           for (k= 0; k< rfactor[2]; k++)
+                           for (k = 0; k < rfactor[2]; k++)
                            {
                               hypre_SStructGridFindBoxManEntry(fgrid_edge, part, var_index,
                                                                t, &entry);
                               hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &l,
                                                                     matrix_type);
-                              iedgeEdge[j]= l;
+                              iedgeEdge[j] = l;
 
                               /* Interior. Four coarse Edge connections. */
-                              ncols_edgeEdge[j]= 4;
+                              ncols_edgeEdge[j] = 4;
                               j++;
 
                               var_index[2]++;
                            }  /* for (k= 0; k< rfactor[2]; k++) */
 
                            /* reset var_index[2] to the initial index for next k loop */
-                           var_index[2]-= rfactor[2];
+                           var_index[2] -= rfactor[2];
 
                         }  /* for (n= 1; n< rfactor[0]; n++) */
 
                         /* reset var_index[0] to the initial index for next n loop */
-                        var_index[0]-= (rfactor[0]-1);
+                        var_index[0] -= (rfactor[0] - 1);
                      }  /* for (p= 1; p< rfactor[1]; p++) */
                   }
                   hypre_SerialBoxLoop1End(m);
@@ -1450,13 +1447,13 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
       }     /* for (t= 0; t< Edge_nvars; t++) */
    }        /* for (part= 0; part< nparts; part++) */
 
-   k= 0;
-   j= 0;
-   for (i= 0; i< nedges; i++)
+   k = 0;
+   j = 0;
+   for (i = 0; i < nedges; i++)
    {
       if (ncols_edgeEdge[i])
       {
-         k+= ncols_edgeEdge[i];
+         k += ncols_edgeEdge[i];
          j++;
       }
    }
@@ -1464,7 +1461,7 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
    jedge_Edge    = hypre_CTAlloc(HYPRE_BigInt,  k, HYPRE_MEMORY_HOST);
 
    /* update nedges so that the true number of rows is set */
-   size= j;
+   size = j;
 
    /*********************************************************************
     * Fill up the edge_Edge interpolation matrix. Interpolation weights
@@ -1472,37 +1469,37 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
     *********************************************************************/
 
    /* loop over fedges aligning with the agglomerate coarse edges first. */
-   k= 0;
-   for (part= 0; part< nparts; part++)
+   k = 0;
+   for (part = 0; part < nparts; part++)
    {
-      p_fgrid= hypre_SStructGridPGrid(fgrid_edge, part);  /* edge grid */
-      Edge_nvars= hypre_SStructPGridNVars(p_fgrid);
-      Edge_vartypes= hypre_SStructPGridVarTypes(p_fgrid);
-      p_cgrid= hypre_SStructGridPGrid(cgrid_edge, part);  /* Edge grid */
+      p_fgrid = hypre_SStructGridPGrid(fgrid_edge, part); /* edge grid */
+      Edge_nvars = hypre_SStructPGridNVars(p_fgrid);
+      Edge_vartypes = hypre_SStructPGridVarTypes(p_fgrid);
+      p_cgrid = hypre_SStructGridPGrid(cgrid_edge, part); /* Edge grid */
 
       /* note that fboxes are the contracted CELL boxes. Will get the correct
          variable grid extents. */
-      fboxes= contract_fedgeBoxes[part];
+      fboxes = contract_fedgeBoxes[part];
 
-      for (t= 0; t< Edge_nvars; t++)
+      for (t = 0; t < Edge_nvars; t++)
       {
          var      = Edge_vartypes[t];
-         var_fgrid= hypre_SStructPGridVTSGrid(p_fgrid, var);
-         box_array= hypre_StructGridBoxes(var_fgrid);
+         var_fgrid = hypre_SStructPGridVTSGrid(p_fgrid, var);
+         box_array = hypre_StructGridBoxes(var_fgrid);
 
-         n_boxoffsets= ndim-1;
+         n_boxoffsets = ndim - 1;
          boxoffset   = hypre_CTAlloc(hypre_Index,  n_boxoffsets, HYPRE_MEMORY_HOST);
          suboffset   = hypre_CTAlloc(hypre_Index,  n_boxoffsets, HYPRE_MEMORY_HOST);
-         switch(var)
+         switch (var)
          {
             case 2: /* 2-d: x_face (vertical edges), stride=[rfactor[0],1,1]
                        fCedge_ratio= 1.0/rfactor[1] */
             {
                hypre_SetIndex3(stride, rfactor[0], 1, 1);
-               fCedge_ratio= 1.0/rfactor[1];
+               fCedge_ratio = 1.0 / rfactor[1];
 
                /* boxoffset shrink in the i direction */
-               hypre_SetIndex3(boxoffset[0], rfactor[0]-1, 0, 0);
+               hypre_SetIndex3(boxoffset[0], rfactor[0] - 1, 0, 0);
                hypre_SetIndex3(suboffset[0], 1, 0, 0);
 
                /* extend loop_size by one in the stride direction */
@@ -1514,10 +1511,10 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                        fCedge_ratio= 1.0/rfactor[0] */
             {
                hypre_SetIndex3(stride, 1, rfactor[1], 1);
-               fCedge_ratio= 1.0/rfactor[0];
+               fCedge_ratio = 1.0 / rfactor[0];
 
                /* boxoffset shrink in the j direction */
-               hypre_SetIndex3(boxoffset[0], 0, rfactor[1]-1, 0);
+               hypre_SetIndex3(boxoffset[0], 0, rfactor[1] - 1, 0);
                hypre_SetIndex3(suboffset[0], 0, 1, 0);
 
                /* extend loop_size by one in the stride direction */
@@ -1529,11 +1526,11 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                        fCedge_ratio= 1.0/rfactor[0] */
             {
                hypre_SetIndex3(stride, 1, rfactor[1], rfactor[2]);
-               fCedge_ratio= 1.0/rfactor[0];
+               fCedge_ratio = 1.0 / rfactor[0];
 
                /* boxoffset shrink in the j & k directions */
-               hypre_SetIndex3(boxoffset[0], 0, rfactor[1]-1, 0);
-               hypre_SetIndex3(boxoffset[1], 0, 0, rfactor[2]-1);
+               hypre_SetIndex3(boxoffset[0], 0, rfactor[1] - 1, 0);
+               hypre_SetIndex3(boxoffset[1], 0, 0, rfactor[2] - 1);
                hypre_SetIndex3(suboffset[0], 0, 1, 0);
                hypre_SetIndex3(suboffset[1], 0, 0, 1);
 
@@ -1546,11 +1543,11 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                        fCedge_ratio= 1.0/rfactor[1] */
             {
                hypre_SetIndex3(stride, rfactor[0], 1, rfactor[2]);
-               fCedge_ratio= 1.0/rfactor[1];
+               fCedge_ratio = 1.0 / rfactor[1];
 
                /* boxoffset shrink in the i & k directions */
-               hypre_SetIndex3(boxoffset[0], rfactor[0]-1, 0, 0);
-               hypre_SetIndex3(boxoffset[1], 0, 0, rfactor[2]-1);
+               hypre_SetIndex3(boxoffset[0], rfactor[0] - 1, 0, 0);
+               hypre_SetIndex3(boxoffset[1], 0, 0, rfactor[2] - 1);
                hypre_SetIndex3(suboffset[0], 1, 0, 0);
                hypre_SetIndex3(suboffset[1], 0, 0, 1);
 
@@ -1562,11 +1559,11 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                        fCedge_ratio= 1.0/rfactor[2] */
             {
                hypre_SetIndex3(stride, rfactor[0], rfactor[1], 1);
-               fCedge_ratio= 1.0/rfactor[2];
+               fCedge_ratio = 1.0 / rfactor[2];
 
                /* boxoffset shrink in the i & j directions */
-               hypre_SetIndex3(boxoffset[0], rfactor[0]-1, 0, 0);
-               hypre_SetIndex3(boxoffset[1], 0, rfactor[1]-1, 0);
+               hypre_SetIndex3(boxoffset[0], rfactor[0] - 1, 0, 0);
+               hypre_SetIndex3(boxoffset[1], 0, rfactor[1] - 1, 0);
                hypre_SetIndex3(suboffset[0], 1, 0, 0);
                hypre_SetIndex3(suboffset[1], 0, 1, 0);
 
@@ -1574,14 +1571,18 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                hypre_SetIndex3(hi_index, 1, 1, 0);
                break;
             }
+            default:
+            {
+               fCedge_ratio = 1.0;
+            }
          }
 
          hypre_ForBoxI(i, fboxes)
          {
-            cellbox= hypre_BoxArrayBox(fboxes, i);
+            cellbox = hypre_BoxArrayBox(fboxes, i);
 
             /* vboxes inside the i'th cellbox */
-            num_vboxes= n_CtoVbox[part][i];
+            num_vboxes = n_CtoVbox[part][i];
             vboxnums  = CtoVboxnums[part][i];
 
             hypre_CopyIndex(Edge_cstarts[part][i], cstart);
@@ -1591,19 +1592,19 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                vanish. */
             hypre_CopyBox(cellbox, &copy_box);
 
-            for (j= 0; j< n_boxoffsets; j++)
+            for (j = 0; j < n_boxoffsets; j++)
             {
                hypre_SubtractIndexes(hypre_BoxIMin(&copy_box), suboffset[j], 3,
                                      findex);
-               row_in= falseV;
-               for (p= 0; p< num_vboxes[t]; p++)
+               row_in = falseV;
+               for (p = 0; p < num_vboxes[t]; p++)
                {
-                  vbox= hypre_BoxArrayBox(box_array, vboxnums[t][p]);
+                  vbox = hypre_BoxArrayBox(box_array, vboxnums[t][p]);
 
                   if (hypre_IndexInBox(findex, vbox))
                   {
                      hypre_CopyIndex(findex, hypre_BoxIMin(&copy_box));
-                     row_in= trueV;
+                     row_in = trueV;
                      break;
                   }
                }
@@ -1637,9 +1638,9 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
             {
                zypre_BoxLoopGetIndex(lindex);
                hypre_SetIndex3(findex, lindex[0], lindex[1], lindex[2]);
-               for (j= 0; j< 3; j++)
+               for (j = 0; j < 3; j++)
                {
-                  findex[j]*= stride[j];
+                  findex[j] *= stride[j];
                }
 
                /* make sure that we do have the fine row corresponding to findex */
@@ -1665,8 +1666,8 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                                                    t, &entry);
                   hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &l,
                                                         matrix_type);
-                  jedge_Edge[k]= l;
-                  vals_edgeEdge[k]= fCedge_ratio;
+                  jedge_Edge[k] = l;
+                  vals_edgeEdge[k] = fCedge_ratio;
 
                   k++;
                }  /* if ((p <= upper_ranks[part][t]) && (p >= lower_ranks[part][t])) */
@@ -1682,42 +1683,42 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
    /* generate the face interpolation weights/info. Only for 3-d */
    if (ndim == 3)
    {
-      for (part= 0; part< nparts; part++)
+      for (part = 0; part < nparts; part++)
       {
-         p_fgrid= hypre_SStructGridPGrid(fgrid_edge, part);  /* edge grid */
-         Edge_nvars= hypre_SStructPGridNVars(p_fgrid);
-         Edge_vartypes= hypre_SStructPGridVarTypes(p_fgrid);
-         p_cgrid= hypre_SStructGridPGrid(cgrid_edge, part);  /* Edge grid */
+         p_fgrid = hypre_SStructGridPGrid(fgrid_edge, part); /* edge grid */
+         Edge_nvars = hypre_SStructPGridNVars(p_fgrid);
+         Edge_vartypes = hypre_SStructPGridVarTypes(p_fgrid);
+         p_cgrid = hypre_SStructGridPGrid(cgrid_edge, part); /* Edge grid */
 
          /* note that fboxes are the contracted CELL boxes. Will get the correct
             variable grid extents. */
-         fboxes= contract_fedgeBoxes[part];
+         fboxes = contract_fedgeBoxes[part];
 
          /* may need to shrink a given box in some boxoffset directions */
-         boxoffset= hypre_TAlloc(hypre_Index,  ndim, HYPRE_MEMORY_HOST);
-         for (t= 0; t< ndim; t++)
+         boxoffset = hypre_TAlloc(hypre_Index,  ndim, HYPRE_MEMORY_HOST);
+         for (t = 0; t < ndim; t++)
          {
             hypre_ClearIndex(boxoffset[t]);
-            hypre_IndexD(boxoffset[t], t)= rfactor[t]-1;
+            hypre_IndexD(boxoffset[t], t) = rfactor[t] - 1;
          }
 
-         for (t= 0; t< Edge_nvars; t++)
+         for (t = 0; t < Edge_nvars; t++)
          {
             var      = Edge_vartypes[t];
-            var_fgrid=  hypre_SStructPGridVTSGrid(p_fgrid, var);
-            box_array= hypre_StructGridBoxes(var_fgrid);
+            var_fgrid =  hypre_SStructPGridVTSGrid(p_fgrid, var);
+            box_array = hypre_StructGridBoxes(var_fgrid);
 
-            switch(var)
+            switch (var)
             {
                case 5:
                {
                   /* 3-d x_edge, can be Y or Z_Face */
                   hypre_ForBoxI(i, fboxes)
                   {
-                     cellbox= hypre_BoxArrayBox(fboxes, i);
+                     cellbox = hypre_BoxArrayBox(fboxes, i);
 
                      /* vboxes inside the i'th cellbox */
-                     num_vboxes= n_CtoVbox[part][i];
+                     num_vboxes = n_CtoVbox[part][i];
                      vboxnums  = CtoVboxnums[part][i];
 
                      hypre_CopyIndex(Edge_cstarts[part][i], cstart);
@@ -1737,14 +1738,14 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                                            findex);
 
                      /* loop over all the vboxes to see if findex is inside */
-                     row_in= falseV;
-                     for (p= 0; p< num_vboxes[t]; p++)
+                     row_in = falseV;
+                     for (p = 0; p < num_vboxes[t]; p++)
                      {
-                        vbox= hypre_BoxArrayBox(box_array, vboxnums[t][p]);
+                        vbox = hypre_BoxArrayBox(box_array, vboxnums[t][p]);
                         if (hypre_IndexInBox(findex, vbox))
                         {
                            hypre_CopyIndex(findex, hypre_BoxIMin(&copy_box));
-                           row_in= trueV;
+                           row_in = trueV;
                            break;
                         }
                      }
@@ -1780,9 +1781,9 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                         hypre_AddIndexes(cindex, cstart, 3, cindex);
 
                         /* Will need the actual fine indices. */
-                        for (l= 0; l< ndim; l++)
+                        for (l = 0; l < ndim; l++)
                         {
-                           findex[l]*= rfactor[l];
+                           findex[l] *= rfactor[l];
                         }
                         hypre_AddIndexes(findex, start, 3, findex);
 
@@ -1805,11 +1806,11 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                                                               matrix_type);
 
                         /* loop over the strips of x_edges making up the Z_Face */
-                        for (p= 0; p< rfactor[0]; p++)
+                        for (p = 0; p < rfactor[0]; p++)
                         {
                            hypre_CopyIndex(findex, var_index);
-                           var_index[0]+= p;
-                           for (n= 1; n< rfactor[1]; n++)
+                           var_index[0] += p;
+                           for (n = 1; n < rfactor[1]; n++)
                            {
                               var_index[1]++;
                               hypre_SStructGridFindBoxManEntry(fgrid_edge, part, var_index,
@@ -1821,12 +1822,12 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                               if ((l <= upper_ranks[part][t]) &&
                                   (l >= lower_ranks[part][t]))
                               {
-                                 jedge_Edge[k]= rank;
-                                 vals_edgeEdge[k]= (HYPRE_Real) n/(rfactor[1]*rfactor[0]);
+                                 jedge_Edge[k] = rank;
+                                 vals_edgeEdge[k] = (HYPRE_Real) n / (rfactor[1] * rfactor[0]);
                                  k++;
 
-                                 jedge_Edge[k]= rank2;
-                                 vals_edgeEdge[k]= 1.0/rfactor[0]*(1.0-(HYPRE_Real) n/rfactor[1]);
+                                 jedge_Edge[k] = rank2;
+                                 vals_edgeEdge[k] = 1.0 / rfactor[0] * (1.0 - (HYPRE_Real) n / rfactor[1]);
                                  k++;
                               }
                            }  /* for (n= 1; n< rfactor[1]; n++) */
@@ -1840,14 +1841,14 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                      hypre_SubtractIndexes(hypre_BoxIMin(&copy_box), jshift, 3,
                                            findex);
                      /* loop over all the vboxes to see if findex is inside */
-                     row_in= falseV;
-                     for (p= 0; p< num_vboxes[t]; p++)
+                     row_in = falseV;
+                     for (p = 0; p < num_vboxes[t]; p++)
                      {
-                        vbox= hypre_BoxArrayBox(box_array, vboxnums[t][p]);
+                        vbox = hypre_BoxArrayBox(box_array, vboxnums[t][p]);
                         if (hypre_IndexInBox(findex, vbox))
                         {
                            hypre_CopyIndex(findex, hypre_BoxIMin(&copy_box));
-                           row_in= trueV;
+                           row_in = trueV;
                            break;
                         }
                      }
@@ -1882,9 +1883,9 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                         hypre_AddIndexes(cindex, cstart, 3, cindex);
 
                         /* Will need the actual fine indices. */
-                        for (l= 0; l< ndim; l++)
+                        for (l = 0; l < ndim; l++)
                         {
-                           findex[l]*= rfactor[l];
+                           findex[l] *= rfactor[l];
                         }
                         hypre_AddIndexes(findex, start, 3, findex);
 
@@ -1905,11 +1906,11 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                                                               matrix_type);
 
                         /* loop over the strips of x_edges making up the Y_Face */
-                        for (p= 0; p< rfactor[0]; p++)
+                        for (p = 0; p < rfactor[0]; p++)
                         {
                            hypre_CopyIndex(findex, var_index);
-                           var_index[0]+= p;
-                           for (n= 1; n< rfactor[2]; n++)
+                           var_index[0] += p;
+                           for (n = 1; n < rfactor[2]; n++)
                            {
                               var_index[2]++;
                               hypre_SStructGridFindBoxManEntry(fgrid_edge, part, var_index,
@@ -1919,12 +1920,12 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                               if ((l <= upper_ranks[part][t]) &&
                                   (l >= lower_ranks[part][t]))
                               {
-                                 jedge_Edge[k]= rank;
-                                 vals_edgeEdge[k]= (HYPRE_Real) n/(rfactor[0]*rfactor[2]);
+                                 jedge_Edge[k] = rank;
+                                 vals_edgeEdge[k] = (HYPRE_Real) n / (rfactor[0] * rfactor[2]);
                                  k++;
 
-                                 jedge_Edge[k]= rank2;
-                                 vals_edgeEdge[k]= 1.0/rfactor[0]*(1.0 - (HYPRE_Real) n/rfactor[2]);
+                                 jedge_Edge[k] = rank2;
+                                 vals_edgeEdge[k] = 1.0 / rfactor[0] * (1.0 - (HYPRE_Real) n / rfactor[2]);
                                  k++;
                               }
                            }  /* for (n= 1; n< rfactor[2]; n++) */
@@ -1940,10 +1941,10 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                   /* 3-d y_edge, can be X or Z_Face */
                   hypre_ForBoxI(i, fboxes)
                   {
-                     cellbox= hypre_BoxArrayBox(fboxes, i);
+                     cellbox = hypre_BoxArrayBox(fboxes, i);
 
                      /* vboxes inside the i'th cellbox */
-                     num_vboxes= n_CtoVbox[part][i];
+                     num_vboxes = n_CtoVbox[part][i];
                      vboxnums  = CtoVboxnums[part][i];
 
                      hypre_CopyIndex(Edge_cstarts[part][i], cstart);
@@ -1965,14 +1966,14 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                                            findex);
 
                      /* loop over all the vboxes to see if findex is inside */
-                     row_in= falseV;
-                     for (p= 0; p< num_vboxes[t]; p++)
+                     row_in = falseV;
+                     for (p = 0; p < num_vboxes[t]; p++)
                      {
-                        vbox= hypre_BoxArrayBox(box_array, vboxnums[t][p]);
+                        vbox = hypre_BoxArrayBox(box_array, vboxnums[t][p]);
                         if (hypre_IndexInBox(findex, vbox))
                         {
                            hypre_CopyIndex(findex, hypre_BoxIMin(&copy_box));
-                           row_in= trueV;
+                           row_in = trueV;
                            break;
                         }
                      }
@@ -2008,9 +2009,9 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                         hypre_AddIndexes(cindex, cstart, 3, cindex);
 
                         /* Will need the actual fine indices. */
-                        for (l= 0; l< ndim; l++)
+                        for (l = 0; l < ndim; l++)
                         {
-                           findex[l]*= rfactor[l];
+                           findex[l] *= rfactor[l];
                         }
                         hypre_AddIndexes(findex, start, 3, findex);
 
@@ -2033,11 +2034,11 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                                                               matrix_type);
 
                         /* loop over the strips of y_edges making up the Z_Face */
-                        for (p= 0; p< rfactor[1]; p++)
+                        for (p = 0; p < rfactor[1]; p++)
                         {
                            hypre_CopyIndex(findex, var_index);
-                           var_index[1]+= p;
-                           for (n= 1; n< rfactor[0]; n++)
+                           var_index[1] += p;
+                           for (n = 1; n < rfactor[0]; n++)
                            {
                               var_index[0]++;
                               hypre_SStructGridFindBoxManEntry(fgrid_edge, part, var_index,
@@ -2047,12 +2048,12 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                               if ((l <= upper_ranks[part][t]) &&
                                   (l >= lower_ranks[part][t]))
                               {
-                                 jedge_Edge[k]= rank;
-                                 vals_edgeEdge[k]= (HYPRE_Real) n/(rfactor[0]*rfactor[1]);
+                                 jedge_Edge[k] = rank;
+                                 vals_edgeEdge[k] = (HYPRE_Real) n / (rfactor[0] * rfactor[1]);
                                  k++;
 
-                                 jedge_Edge[k]= rank2;
-                                 vals_edgeEdge[k]= 1.0/rfactor[1]*(1.0 - (HYPRE_Real) n/rfactor[0]);
+                                 jedge_Edge[k] = rank2;
+                                 vals_edgeEdge[k] = 1.0 / rfactor[1] * (1.0 - (HYPRE_Real) n / rfactor[0]);
                                  k++;
                               }
                            }  /* for (n= 1; n< rfactor[0]; n++) */
@@ -2068,14 +2069,14 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                                            findex);
 
                      /* loop over all the vboxes to see if findex is inside */
-                     row_in= falseV;
-                     for (p= 0; p< num_vboxes[t]; p++)
+                     row_in = falseV;
+                     for (p = 0; p < num_vboxes[t]; p++)
                      {
-                        vbox= hypre_BoxArrayBox(box_array, vboxnums[t][p]);
+                        vbox = hypre_BoxArrayBox(box_array, vboxnums[t][p]);
                         if (hypre_IndexInBox(findex, vbox))
                         {
                            hypre_CopyIndex(findex, hypre_BoxIMin(&copy_box));
-                           row_in= trueV;
+                           row_in = trueV;
                            break;
                         }
                      }
@@ -2109,9 +2110,9 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                         hypre_AddIndexes(cindex, cstart, 3, cindex);
 
                         /* Will need the actual fine indices. */
-                        for (l= 0; l< ndim; l++)
+                        for (l = 0; l < ndim; l++)
                         {
-                           findex[l]*= rfactor[l];
+                           findex[l] *= rfactor[l];
                         }
                         hypre_AddIndexes(findex, start, 3, findex);
                         /******************************************************
@@ -2131,11 +2132,11 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                                                               matrix_type);
 
                         /* loop over the strips of y_edges making up the X_Face */
-                        for (p= 0; p< rfactor[1]; p++)
+                        for (p = 0; p < rfactor[1]; p++)
                         {
                            hypre_CopyIndex(findex, var_index);
-                           var_index[1]+= p;
-                           for (n= 1; n< rfactor[2]; n++)
+                           var_index[1] += p;
+                           for (n = 1; n < rfactor[2]; n++)
                            {
                               var_index[2]++;
                               hypre_SStructGridFindBoxManEntry(fgrid_edge, part, var_index,
@@ -2145,12 +2146,12 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                               if ((l <= upper_ranks[part][t]) &&
                                   (l >= lower_ranks[part][t]))
                               {
-                                 jedge_Edge[k]= rank;
-                                 vals_edgeEdge[k]= (HYPRE_Real) n/(rfactor[1]*rfactor[2]);
+                                 jedge_Edge[k] = rank;
+                                 vals_edgeEdge[k] = (HYPRE_Real) n / (rfactor[1] * rfactor[2]);
                                  k++;
 
-                                 jedge_Edge[k]= rank2;
-                                 vals_edgeEdge[k]= 1.0/rfactor[1]*(1.0 - (HYPRE_Real) n/rfactor[2]);
+                                 jedge_Edge[k] = rank2;
+                                 vals_edgeEdge[k] = 1.0 / rfactor[1] * (1.0 - (HYPRE_Real) n / rfactor[2]);
                                  k++;
                               }
                            }  /* for (n= 1; n< rfactor[2]; n++) */
@@ -2167,10 +2168,10 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                   /* 3-d z_edge, can be X or Y_Face */
                   hypre_ForBoxI(i, fboxes)
                   {
-                     cellbox= hypre_BoxArrayBox(fboxes, i);
+                     cellbox = hypre_BoxArrayBox(fboxes, i);
 
                      /* vboxes inside the i'th cellbox */
-                     num_vboxes= n_CtoVbox[part][i];
+                     num_vboxes = n_CtoVbox[part][i];
                      vboxnums  = CtoVboxnums[part][i];
 
                      hypre_CopyIndex(Edge_cstarts[part][i], cstart);
@@ -2189,14 +2190,14 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                      hypre_SubtractIndexes(hypre_BoxIMin(&copy_box), ishift, 3,
                                            findex);
                      /* loop over all the vboxes to see if findex is inside */
-                     row_in= falseV;
-                     for (p= 0; p< num_vboxes[t]; p++)
+                     row_in = falseV;
+                     for (p = 0; p < num_vboxes[t]; p++)
                      {
-                        vbox= hypre_BoxArrayBox(box_array, vboxnums[t][p]);
+                        vbox = hypre_BoxArrayBox(box_array, vboxnums[t][p]);
                         if (hypre_IndexInBox(findex, vbox))
                         {
                            hypre_CopyIndex(findex, hypre_BoxIMin(&copy_box));
-                           row_in= trueV;
+                           row_in = trueV;
                            break;
                         }
                      }
@@ -2231,9 +2232,9 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                         hypre_AddIndexes(cindex, cstart, 3, cindex);
 
                         /* Will need the actual fine indices. */
-                        for (l= 0; l< ndim; l++)
+                        for (l = 0; l < ndim; l++)
                         {
-                           findex[l]*= rfactor[l];
+                           findex[l] *= rfactor[l];
                         }
                         hypre_AddIndexes(findex, start, 3, findex);
 
@@ -2256,11 +2257,11 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                                                               matrix_type);
 
                         /* loop over the strips of z_edges making up the X_Face */
-                        for (p= 0; p< rfactor[2]; p++)
+                        for (p = 0; p < rfactor[2]; p++)
                         {
                            hypre_CopyIndex(findex, var_index);
-                           var_index[2]+= p;
-                           for (n= 1; n< rfactor[1]; n++)
+                           var_index[2] += p;
+                           for (n = 1; n < rfactor[1]; n++)
                            {
                               var_index[1]++;
                               hypre_SStructGridFindBoxManEntry(fgrid_edge, part, var_index,
@@ -2270,12 +2271,12 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                               if ((l <= upper_ranks[part][t]) &&
                                   (l >= lower_ranks[part][t]))
                               {
-                                 jedge_Edge[k]= rank;
-                                 vals_edgeEdge[k]= (HYPRE_Real) n/(rfactor[0]*rfactor[2]);
+                                 jedge_Edge[k] = rank;
+                                 vals_edgeEdge[k] = (HYPRE_Real) n / (rfactor[0] * rfactor[2]);
                                  k++;
 
-                                 jedge_Edge[k]= rank2;
-                                 vals_edgeEdge[k]= 1.0/rfactor[2]*(1.0-(HYPRE_Real) n/rfactor[0]);
+                                 jedge_Edge[k] = rank2;
+                                 vals_edgeEdge[k] = 1.0 / rfactor[2] * (1.0 - (HYPRE_Real) n / rfactor[0]);
                                  k++;
                               }
                            }  /* for (n= 1; n< rfactor[1]; n++) */
@@ -2290,14 +2291,14 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                      hypre_SubtractIndexes(hypre_BoxIMin(&copy_box), jshift, 3,
                                            findex);
                      /* loop over all the vboxes to see if findex is inside */
-                     row_in= falseV;
-                     for (p= 0; p< num_vboxes[t]; p++)
+                     row_in = falseV;
+                     for (p = 0; p < num_vboxes[t]; p++)
                      {
-                        vbox= hypre_BoxArrayBox(box_array, vboxnums[t][p]);
+                        vbox = hypre_BoxArrayBox(box_array, vboxnums[t][p]);
                         if (hypre_IndexInBox(findex, vbox))
                         {
                            hypre_CopyIndex(findex, hypre_BoxIMin(&copy_box));
-                           row_in= trueV;
+                           row_in = trueV;
                            break;
                         }
                      }
@@ -2331,9 +2332,9 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                         hypre_AddIndexes(cindex, cstart, 3, cindex);
 
                         /* Will need the actual fine indices. */
-                        for (l= 0; l< ndim; l++)
+                        for (l = 0; l < ndim; l++)
                         {
-                           findex[l]*= rfactor[l];
+                           findex[l] *= rfactor[l];
                         }
                         hypre_AddIndexes(findex, start, 3, findex);
                         /**********************************************************
@@ -2353,11 +2354,11 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                                                               matrix_type);
 
                         /* loop over the strips of y_edges making up the Y_Face */
-                        for (p= 0; p< rfactor[2]; p++)
+                        for (p = 0; p < rfactor[2]; p++)
                         {
                            hypre_CopyIndex(findex, var_index);
-                           var_index[2]+= p;
-                           for (n= 1; n< rfactor[0]; n++)
+                           var_index[2] += p;
+                           for (n = 1; n < rfactor[0]; n++)
                            {
                               var_index[0]++;
                               hypre_SStructGridFindBoxManEntry(fgrid_edge, part, var_index,
@@ -2367,12 +2368,12 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                               if ((l <= upper_ranks[part][t]) &&
                                   (l >= lower_ranks[part][t]))
                               {
-                                 jedge_Edge[k]= rank;
-                                 vals_edgeEdge[k]= (HYPRE_Real) n/(rfactor[0]*rfactor[2]);
+                                 jedge_Edge[k] = rank;
+                                 vals_edgeEdge[k] = (HYPRE_Real) n / (rfactor[0] * rfactor[2]);
                                  k++;
 
-                                 jedge_Edge[k]= rank2;
-                                 vals_edgeEdge[k]= 1.0/rfactor[2]*(1.0-(HYPRE_Real) n/rfactor[0]);
+                                 jedge_Edge[k] = rank2;
+                                 vals_edgeEdge[k] = 1.0 / rfactor[2] * (1.0 - (HYPRE_Real) n / rfactor[0]);
                                  k++;
                               }
                            }  /* for (n= 1; n< rfactor[0]; n++) */
@@ -2391,31 +2392,31 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
    }     /* if (ndim == 3) */
 
    /* generate the interior interpolation weights/info */
-   for (part= 0; part< nparts; part++)
+   for (part = 0; part < nparts; part++)
    {
-      p_fgrid= hypre_SStructGridPGrid(fgrid_edge, part);  /* edge grid */
-      Edge_nvars= hypre_SStructPGridNVars(p_fgrid);
-      Edge_vartypes= hypre_SStructPGridVarTypes(p_fgrid);
-      p_cgrid= hypre_SStructGridPGrid(cgrid_edge, part);  /* Edge grid */
+      p_fgrid = hypre_SStructGridPGrid(fgrid_edge, part); /* edge grid */
+      Edge_nvars = hypre_SStructPGridNVars(p_fgrid);
+      Edge_vartypes = hypre_SStructPGridVarTypes(p_fgrid);
+      p_cgrid = hypre_SStructGridPGrid(cgrid_edge, part); /* Edge grid */
 
       /* note that fboxes are the contracted CELL boxes. Will get the correct
          variable grid extents. */
-      fboxes= contract_fedgeBoxes[part];
+      fboxes = contract_fedgeBoxes[part];
 
-      for (t= 0; t< Edge_nvars; t++)
+      for (t = 0; t < Edge_nvars; t++)
       {
          var      = Edge_vartypes[t];
-         var_fgrid=  hypre_SStructPGridVTSGrid(p_fgrid, var);
-         box_array= hypre_StructGridBoxes(var_fgrid);
+         var_fgrid =  hypre_SStructPGridVTSGrid(p_fgrid, var);
+         box_array = hypre_StructGridBoxes(var_fgrid);
 
-         switch(var)
+         switch (var)
          {
             case 2:
             {
                /* 2-d x_face = x_edge, can be interior or on X_Edge */
                hypre_ForBoxI(i, fboxes)
                {
-                  cellbox= hypre_BoxArrayBox(fboxes, i);
+                  cellbox = hypre_BoxArrayBox(fboxes, i);
                   vbox   = hypre_BoxArrayBox(box_array, i);
                   hypre_CopyIndex(Edge_cstarts[part][i], cstart);
 
@@ -2444,9 +2445,9 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                       *
                       * Loop over the interior fine edges in an agglomerate.
                       *****************************************************/
-                     for (p= 1; p< rfactor[0]; p++)
+                     for (p = 1; p < rfactor[0]; p++)
                      {
-                        for (n= 0; n< rfactor[1]; n++)
+                        for (n = 0; n < rfactor[1]; n++)
                         {
                            hypre_CopyIndex(findex, cindex);
                            hypre_AddIndexes(cindex, cstart, 3, cindex);
@@ -2457,8 +2458,8 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                                                             t, &entry);
                            hypre_SStructBoxManEntryGetGlobalRank(entry, cindex, &rank,
                                                                  matrix_type);
-                           jedge_Edge[k]= rank;
-                           vals_edgeEdge[k]= (HYPRE_Real) p/(rfactor[0]*rfactor[1]);
+                           jedge_Edge[k] = rank;
+                           vals_edgeEdge[k] = (HYPRE_Real) p / (rfactor[0] * rfactor[1]);
                            k++;
 
                            hypre_SubtractIndexes(cindex, ishift, 3, var_index);
@@ -2466,8 +2467,8 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                                                             t, &entry);
                            hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                                  matrix_type);
-                           jedge_Edge[k]= rank;
-                           vals_edgeEdge[k]= (HYPRE_Real) (rfactor[0]-p)/(rfactor[0]*rfactor[1]);
+                           jedge_Edge[k] = rank;
+                           vals_edgeEdge[k] = (HYPRE_Real) (rfactor[0] - p) / (rfactor[0] * rfactor[1]);
                            k++;
                         }  /* for (n= 0; n< rfactor[1]; n++) */
                      }     /* for (p= 1; p< rfactor[0]; p++) */
@@ -2483,7 +2484,7 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                /* 2-d y_face = y_edge, can be interior or on Y_Edge */
                hypre_ForBoxI(i, fboxes)
                {
-                  cellbox= hypre_BoxArrayBox(fboxes, i);
+                  cellbox = hypre_BoxArrayBox(fboxes, i);
                   vbox   = hypre_BoxArrayBox(box_array, i);
                   hypre_CopyIndex(Edge_cstarts[part][i], cstart);
 
@@ -2512,9 +2513,9 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                       *
                       * Loop over the interior fine edges in an agglomerate.
                       *****************************************************/
-                     for (p= 1; p< rfactor[1]; p++)
+                     for (p = 1; p < rfactor[1]; p++)
                      {
-                        for (n= 0; n< rfactor[0]; n++)
+                        for (n = 0; n < rfactor[0]; n++)
                         {
                            hypre_CopyIndex(findex, cindex);
                            hypre_AddIndexes(cindex, cstart, 3, cindex);
@@ -2525,8 +2526,8 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                                                             t, &entry);
                            hypre_SStructBoxManEntryGetGlobalRank(entry, cindex, &rank,
                                                                  matrix_type);
-                           jedge_Edge[k]= rank;
-                           vals_edgeEdge[k]= (HYPRE_Real) p/(rfactor[0]*rfactor[1]);
+                           jedge_Edge[k] = rank;
+                           vals_edgeEdge[k] = (HYPRE_Real) p / (rfactor[0] * rfactor[1]);
                            k++;
 
                            hypre_SubtractIndexes(cindex, jshift, 3, var_index);
@@ -2534,8 +2535,8 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                                                             t, &entry);
                            hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                                  matrix_type);
-                           jedge_Edge[k]= rank;
-                           vals_edgeEdge[k]= (HYPRE_Real) (rfactor[1]-p)/(rfactor[0]*rfactor[1]);
+                           jedge_Edge[k] = rank;
+                           vals_edgeEdge[k] = (HYPRE_Real) (rfactor[1] - p) / (rfactor[0] * rfactor[1]);
                            k++;
                         }  /* for (n= 0; n< rfactor[0]; n++) */
                      }     /* for (p= 1; p< rfactor[1]; p++) */
@@ -2551,7 +2552,7 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                /* 3-d x_edge, must be interior */
                hypre_ForBoxI(i, fboxes)
                {
-                  cellbox= hypre_BoxArrayBox(fboxes, i);
+                  cellbox = hypre_BoxArrayBox(fboxes, i);
                   vbox   = hypre_BoxArrayBox(box_array, i);
                   hypre_CopyIndex(Edge_cstarts[part][i], cstart);
 
@@ -2580,11 +2581,11 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                       *
                       * Loop over the interior fine edges in an agglomerate.
                       *****************************************************/
-                     for (p= 1; p< rfactor[2]; p++)
+                     for (p = 1; p < rfactor[2]; p++)
                      {
-                        for (n= 1; n< rfactor[1]; n++)
+                        for (n = 1; n < rfactor[1]; n++)
                         {
-                           for (m= 0; m< rfactor[0]; m++)
+                           for (m = 0; m < rfactor[0]; m++)
                            {
                               hypre_CopyIndex(findex, cindex);
                               hypre_AddIndexes(cindex, cstart, 3, cindex);
@@ -2597,9 +2598,9 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                                                                t, &entry);
                               hypre_SStructBoxManEntryGetGlobalRank(entry, cindex, &rank,
                                                                     matrix_type);
-                              jedge_Edge[k]= rank;
-                              vals_edgeEdge[k]= (HYPRE_Real) p*n/
-                                 (rfactor[0]*rfactor[1]*rfactor[2]);
+                              jedge_Edge[k] = rank;
+                              vals_edgeEdge[k] = (HYPRE_Real) p * n /
+                                                 (rfactor[0] * rfactor[1] * rfactor[2]);
 
                               k++;
 
@@ -2608,9 +2609,9 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                                                                t, &entry);
                               hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                                     matrix_type);
-                              jedge_Edge[k]= rank;
-                              vals_edgeEdge[k]= (HYPRE_Real) p*(rfactor[1]-n)/
-                                 (rfactor[0]*rfactor[1]*rfactor[2]);
+                              jedge_Edge[k] = rank;
+                              vals_edgeEdge[k] = (HYPRE_Real) p * (rfactor[1] - n) /
+                                                 (rfactor[0] * rfactor[1] * rfactor[2]);
                               k++;
 
                               hypre_SubtractIndexes(var_index, kshift, 3, var_index);
@@ -2618,9 +2619,9 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                                                                t, &entry);
                               hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                                     matrix_type);
-                              jedge_Edge[k]= rank;
-                              vals_edgeEdge[k]= (HYPRE_Real) (rfactor[1]-n)*(rfactor[2]-p)/
-                                 (rfactor[0]*rfactor[1]*rfactor[2]);
+                              jedge_Edge[k] = rank;
+                              vals_edgeEdge[k] = (HYPRE_Real) (rfactor[1] - n) * (rfactor[2] - p) /
+                                                 (rfactor[0] * rfactor[1] * rfactor[2]);
                               k++;
 
                               hypre_AddIndexes(var_index, jshift, 3, var_index);
@@ -2628,9 +2629,9 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                                                                t, &entry);
                               hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                                     matrix_type);
-                              jedge_Edge[k]= rank;
-                              vals_edgeEdge[k]= (HYPRE_Real) n*(rfactor[2]-p)/
-                                 (rfactor[0]*rfactor[1]*rfactor[2]);
+                              jedge_Edge[k] = rank;
+                              vals_edgeEdge[k] = (HYPRE_Real) n * (rfactor[2] - p) /
+                                                 (rfactor[0] * rfactor[1] * rfactor[2]);
                               k++;
                            }  /* for (m= 0; m< rfactor[0]; m++) */
                         }     /* for (n= 1; n< rfactor[1]; n++) */
@@ -2646,7 +2647,7 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                /* 3-d y_edge, must be interior */
                hypre_ForBoxI(i, fboxes)
                {
-                  cellbox= hypre_BoxArrayBox(fboxes, i);
+                  cellbox = hypre_BoxArrayBox(fboxes, i);
                   vbox   = hypre_BoxArrayBox(box_array, i);
                   hypre_CopyIndex(Edge_cstarts[part][i], cstart);
 
@@ -2675,11 +2676,11 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                       *
                       * Loop over the interior fine edges in an agglomerate.
                       *****************************************************/
-                     for (p= 1; p< rfactor[2]; p++)
+                     for (p = 1; p < rfactor[2]; p++)
                      {
-                        for (n= 1; n< rfactor[0]; n++)
+                        for (n = 1; n < rfactor[0]; n++)
                         {
-                           for (m= 0; m< rfactor[1]; m++)
+                           for (m = 0; m < rfactor[1]; m++)
                            {
                               hypre_CopyIndex(findex, cindex);
                               hypre_AddIndexes(cindex, cstart, 3, cindex);
@@ -2692,9 +2693,9 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                                                                t, &entry);
                               hypre_SStructBoxManEntryGetGlobalRank(entry, cindex, &rank,
                                                                     matrix_type);
-                              jedge_Edge[k]= rank;
-                              vals_edgeEdge[k]= (HYPRE_Real) p*n/
-                                 (rfactor[0]*rfactor[1]*rfactor[2]);
+                              jedge_Edge[k] = rank;
+                              vals_edgeEdge[k] = (HYPRE_Real) p * n /
+                                                 (rfactor[0] * rfactor[1] * rfactor[2]);
                               k++;
 
                               hypre_SubtractIndexes(cindex, ishift, 3, var_index);
@@ -2702,9 +2703,9 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                                                                t, &entry);
                               hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                                     matrix_type);
-                              jedge_Edge[k]= rank;
-                              vals_edgeEdge[k]= (HYPRE_Real) p*(rfactor[0]-n)/
-                                 (rfactor[0]*rfactor[1]*rfactor[2]);
+                              jedge_Edge[k] = rank;
+                              vals_edgeEdge[k] = (HYPRE_Real) p * (rfactor[0] - n) /
+                                                 (rfactor[0] * rfactor[1] * rfactor[2]);
                               k++;
 
                               hypre_SubtractIndexes(var_index, kshift, 3, var_index);
@@ -2712,9 +2713,9 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                                                                t, &entry);
                               hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                                     matrix_type);
-                              jedge_Edge[k]= rank;
-                              vals_edgeEdge[k]= (HYPRE_Real) (rfactor[0]-n)*(rfactor[2]-p)/
-                                 (rfactor[0]*rfactor[1]*rfactor[2]);
+                              jedge_Edge[k] = rank;
+                              vals_edgeEdge[k] = (HYPRE_Real) (rfactor[0] - n) * (rfactor[2] - p) /
+                                                 (rfactor[0] * rfactor[1] * rfactor[2]);
                               k++;
 
                               hypre_AddIndexes(var_index, ishift, 3, var_index);
@@ -2722,9 +2723,9 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                                                                t, &entry);
                               hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                                     matrix_type);
-                              jedge_Edge[k]= rank;
-                              vals_edgeEdge[k]= (HYPRE_Real) n*(rfactor[2]-p)/
-                                 (rfactor[0]*rfactor[1]*rfactor[2]);
+                              jedge_Edge[k] = rank;
+                              vals_edgeEdge[k] = (HYPRE_Real) n * (rfactor[2] - p) /
+                                                 (rfactor[0] * rfactor[1] * rfactor[2]);
                               k++;
                            }  /* for (m= 0; m< rfactor[1]; m++) */
                         }     /* for (n= 1; n< rfactor[0]; n++) */
@@ -2741,7 +2742,7 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                /* 3-d z_edge, only the interior */
                hypre_ForBoxI(i, fboxes)
                {
-                  cellbox= hypre_BoxArrayBox(fboxes, i);
+                  cellbox = hypre_BoxArrayBox(fboxes, i);
                   vbox   = hypre_BoxArrayBox(box_array, i);
                   hypre_CopyIndex(Edge_cstarts[part][i], cstart);
 
@@ -2770,11 +2771,11 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                       *
                       * Loop over the interior fine edges in an agglomerate.
                       *****************************************************/
-                     for (p= 1; p< rfactor[1]; p++)
+                     for (p = 1; p < rfactor[1]; p++)
                      {
-                        for (n= 1; n< rfactor[0]; n++)
+                        for (n = 1; n < rfactor[0]; n++)
                         {
-                           for (m= 0; m< rfactor[2]; m++)
+                           for (m = 0; m < rfactor[2]; m++)
                            {
                               hypre_CopyIndex(findex, cindex);
                               hypre_AddIndexes(cindex, cstart, 3, cindex);
@@ -2787,9 +2788,9 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                                                                t, &entry);
                               hypre_SStructBoxManEntryGetGlobalRank(entry, cindex, &rank,
                                                                     matrix_type);
-                              jedge_Edge[k]= rank;
-                              vals_edgeEdge[k]= (HYPRE_Real) n*p/
-                                 (rfactor[0]*rfactor[1]*rfactor[2]);
+                              jedge_Edge[k] = rank;
+                              vals_edgeEdge[k] = (HYPRE_Real) n * p /
+                                                 (rfactor[0] * rfactor[1] * rfactor[2]);
                               k++;
 
                               hypre_SubtractIndexes(cindex, ishift, 3, var_index);
@@ -2797,9 +2798,9 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                                                                t, &entry);
                               hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                                     matrix_type);
-                              jedge_Edge[k]= rank;
-                              vals_edgeEdge[k]= (HYPRE_Real) p*(rfactor[0]-n)/
-                                 (rfactor[0]*rfactor[1]*rfactor[2]);
+                              jedge_Edge[k] = rank;
+                              vals_edgeEdge[k] = (HYPRE_Real) p * (rfactor[0] - n) /
+                                                 (rfactor[0] * rfactor[1] * rfactor[2]);
                               k++;
 
                               hypre_SubtractIndexes(var_index, jshift, 3, var_index);
@@ -2807,9 +2808,9 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                                                                t, &entry);
                               hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                                     matrix_type);
-                              jedge_Edge[k]= rank;
-                              vals_edgeEdge[k]= (HYPRE_Real) (rfactor[1]-p)*(rfactor[0]-n)/
-                                 (rfactor[0]*rfactor[1]*rfactor[2]);
+                              jedge_Edge[k] = rank;
+                              vals_edgeEdge[k] = (HYPRE_Real) (rfactor[1] - p) * (rfactor[0] - n) /
+                                                 (rfactor[0] * rfactor[1] * rfactor[2]);
                               k++;
 
                               hypre_AddIndexes(var_index, ishift, 3, var_index);
@@ -2817,9 +2818,9 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
                                                                t, &entry);
                               hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                                     matrix_type);
-                              jedge_Edge[k]= rank;
-                              vals_edgeEdge[k]= (HYPRE_Real) n*(rfactor[1]-p)/
-                                 (rfactor[0]*rfactor[1]*rfactor[2]);
+                              jedge_Edge[k] = rank;
+                              vals_edgeEdge[k] = (HYPRE_Real) n * (rfactor[1] - p) /
+                                                 (rfactor[0] * rfactor[1] * rfactor[2]);
                               k++;
                            }  /* for (m= 0; m< rfactor[2]; m++) */
                         }     /* for (n= 1; n< rfactor[0]; n++) */
@@ -2847,16 +2848,16 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
    hypre_TFree(vartype_map, HYPRE_MEMORY_HOST);
 
    /* n_CtoVbox[part][cellboxi][var]  & CtoVboxnums[part][cellboxi][var][nvboxes] */
-   for (part= 0; part< nparts; part++)
+   for (part = 0; part < nparts; part++)
    {
-      p_fgrid= hypre_SStructGridPGrid(fgrid_edge, part);
-      Edge_nvars= hypre_SStructPGridNVars(p_fgrid);
+      p_fgrid = hypre_SStructGridPGrid(fgrid_edge, part);
+      Edge_nvars = hypre_SStructPGridNVars(p_fgrid);
 
-      var_fgrid= hypre_SStructPGridCellSGrid(p_fgrid);
+      var_fgrid = hypre_SStructPGridCellSGrid(p_fgrid);
       fboxes   = hypre_StructGridBoxes(var_fgrid);
       hypre_ForBoxI(j, fboxes)
       {
-         for (t= 0; t< Edge_nvars; t++)
+         for (t = 0; t < Edge_nvars; t++)
          {
             hypre_TFree(CtoVboxnums[part][j][t], HYPRE_MEMORY_HOST);
          }
@@ -2869,7 +2870,7 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
    hypre_TFree(n_CtoVbox, HYPRE_MEMORY_HOST);
    hypre_TFree(CtoVboxnums, HYPRE_MEMORY_HOST);
 
-   for (part= 0; part< nparts; part++)
+   for (part = 0; part < nparts; part++)
    {
       hypre_BoxArrayDestroy(contract_fedgeBoxes[part]);
       hypre_TFree(Edge_cstarts[part], HYPRE_MEMORY_HOST);
@@ -2891,4 +2892,3 @@ hypre_Maxwell_PNedelec( hypre_SStructGrid    *fgrid_edge,
 
    return (hypre_IJMatrix *) edge_Edge;
 }
-
diff --git a/external/hypre/src/sstruct_ls/maxwell_PNedelec_bdy.c b/external/hypre/src/sstruct_ls/maxwell_PNedelec_bdy.c
index aa39f0eb..f041a69e 100644
--- a/external/hypre/src/sstruct_ls/maxwell_PNedelec_bdy.c
+++ b/external/hypre/src/sstruct_ls/maxwell_PNedelec_bdy.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -47,77 +47,77 @@ hypre_Maxwell_PNedelec_Bdy( hypre_StructGrid       *cell_grid,
    hypre_SetIndex3(jshift, 0, 1, 0);
    hypre_SetIndex3(kshift, 0, 0, 1);
 
-   cell_boxes= hypre_StructGridBoxes(cell_grid);
+   cell_boxes = hypre_StructGridBoxes(cell_grid);
    nboxes    = hypre_BoxArraySize(cell_boxes);
 
-   bdry= hypre_TAlloc(hypre_BoxArrayArray **,  nboxes, HYPRE_MEMORY_HOST);
-   shifted_box= hypre_BoxCreate(ndim);
+   bdry = hypre_TAlloc(hypre_BoxArrayArray **,  nboxes, HYPRE_MEMORY_HOST);
+   shifted_box = hypre_BoxCreate(ndim);
 
    hypre_ForBoxI(j, cell_boxes)
    {
-      box= hypre_BoxArrayBox(cell_boxes, j);
+      box = hypre_BoxArrayBox(cell_boxes, j);
 
-     /* find the cellgrid boundaries of box if there are any. */
-      cellgrid_bdry= hypre_BoxArrayArrayCreate(2*ndim, ndim);
-      flag= hypre_CTAlloc(HYPRE_Int,  2*ndim, HYPRE_MEMORY_HOST);
+      /* find the cellgrid boundaries of box if there are any. */
+      cellgrid_bdry = hypre_BoxArrayArrayCreate(2 * ndim, ndim);
+      flag = hypre_CTAlloc(HYPRE_Int,  2 * ndim, HYPRE_MEMORY_HOST);
       bdy = 0;
 
-      for (i= 0; i< ndim; i++)
+      for (i = 0; i < ndim; i++)
       {
-         hypre_BoxBoundaryDG(box, cell_grid, 
-                             hypre_BoxArrayArrayBoxArray(cellgrid_bdry, 2*i),
-                             hypre_BoxArrayArrayBoxArray(cellgrid_bdry, 2*i+1),
+         hypre_BoxBoundaryDG(box, cell_grid,
+                             hypre_BoxArrayArrayBoxArray(cellgrid_bdry, 2 * i),
+                             hypre_BoxArrayArrayBoxArray(cellgrid_bdry, 2 * i + 1),
                              i);
-         if (hypre_BoxArraySize(hypre_BoxArrayArrayBoxArray(cellgrid_bdry, 2*i)))
+         if (hypre_BoxArraySize(hypre_BoxArrayArrayBoxArray(cellgrid_bdry, 2 * i)))
          {
-            flag[2*i]= 1;
+            flag[2 * i] = 1;
             bdy++;
          }
 
-         if (hypre_BoxArraySize(hypre_BoxArrayArrayBoxArray(cellgrid_bdry, 2*i+1)))
+         if (hypre_BoxArraySize(hypre_BoxArrayArrayBoxArray(cellgrid_bdry, 2 * i + 1)))
          {
-            flag[2*i+1]= 1;
+            flag[2 * i + 1] = 1;
             bdy++;
          }
       }
 
-     /* There are boundary boxes. Every variable of pgrid will have some */
+      /* There are boundary boxes. Every variable of pgrid will have some */
       if (bdy)
       {
-         bdry[j]= hypre_TAlloc(hypre_BoxArrayArray *,  nvars+1, HYPRE_MEMORY_HOST); 
-        
-        /* keep the cell-centred boxarrayarray of boundaries */
-         bdry[j][0]= hypre_BoxArrayArrayDuplicate(cellgrid_bdry); 
+         bdry[j] = hypre_TAlloc(hypre_BoxArrayArray *,  nvars + 1, HYPRE_MEMORY_HOST);
 
-         k= 2*(ndim-1);  /* 3-d requires 4 boundary faces to be checked */
-         for (i= 0; i< nvars; i++)
+         /* keep the cell-centred boxarrayarray of boundaries */
+         bdry[j][0] = hypre_BoxArrayArrayDuplicate(cellgrid_bdry);
+
+         k = 2 * (ndim - 1); /* 3-d requires 4 boundary faces to be checked */
+         for (i = 0; i < nvars; i++)
          {
-            bdry[j][i+1]= hypre_BoxArrayArrayCreate(k, ndim); /* one for +/- directions */
+            bdry[j][i + 1] = hypre_BoxArrayArrayCreate(k, ndim); /* one for +/- directions */
          }
-   
-         for (i= 0; i< nvars; i++)
+
+         for (i = 0; i < nvars; i++)
          {
-            t= vartypes[i];
+            t = vartypes[i];
             hypre_SStructVariableGetOffset(vartypes[i], ndim, varoffset);
 
-            switch(t)
+            switch (t)
             {
                case 2: /* xface, boundary i= lower, upper */
                {
                   if (flag[0]) /* boundary i= lower */
                   {
                      box_array = hypre_BoxArrayArrayBoxArray(cellgrid_bdry, 0);
-                     box_array2= hypre_BoxArrayArrayBoxArray(bdry[j][i+1], 0);
+                     box_array2 = hypre_BoxArrayArrayBoxArray(bdry[j][i + 1], 0);
                      hypre_ForBoxI(k, box_array)
                      {
-                        bdy_box= hypre_BoxArrayBox(box_array, k);
-                   
-                       /* bdry boxes */
+                        bdy_box = hypre_BoxArrayBox(box_array, k);
+
+                        /* bdry boxes */
                         hypre_CopyIndex(hypre_BoxIMin(bdy_box), lower);
                         hypre_CopyIndex(hypre_BoxIMax(bdy_box), upper);
                         hypre_SubtractIndexes(lower, varoffset, ndim, lower);
                         hypre_SubtractIndexes(upper, varoffset, ndim, upper);
-  
+
                         hypre_BoxSetExtents(shifted_box, lower, upper);
                         hypre_AppendBox(shifted_box, box_array2);
                      }
@@ -125,16 +125,16 @@ hypre_Maxwell_PNedelec_Bdy( hypre_StructGrid       *cell_grid,
 
                   if (flag[1]) /* boundary i= upper */
                   {
-                     box_array= hypre_BoxArrayArrayBoxArray(cellgrid_bdry, 1);
-                     box_array2= hypre_BoxArrayArrayBoxArray(bdry[j][i+1], 1);
+                     box_array = hypre_BoxArrayArrayBoxArray(cellgrid_bdry, 1);
+                     box_array2 = hypre_BoxArrayArrayBoxArray(bdry[j][i + 1], 1);
                      hypre_ForBoxI(k, box_array)
                      {
-                        bdy_box= hypre_BoxArrayBox(box_array, k);
+                        bdy_box = hypre_BoxArrayBox(box_array, k);
 
-                       /* bdry boxes */
+                        /* bdry boxes */
                         hypre_CopyIndex(hypre_BoxIMin(bdy_box), lower);
                         hypre_CopyIndex(hypre_BoxIMax(bdy_box), upper);
-                                                                                                         
+
                         hypre_BoxSetExtents(shifted_box, lower, upper);
                         hypre_AppendBox(shifted_box, box_array2);
                      }
@@ -148,17 +148,17 @@ hypre_Maxwell_PNedelec_Bdy( hypre_StructGrid       *cell_grid,
                   if (flag[2]) /* boundary j= lower */
                   {
                      box_array = hypre_BoxArrayArrayBoxArray(cellgrid_bdry, 2);
-                     box_array2= hypre_BoxArrayArrayBoxArray(bdry[j][i+1], 0);
+                     box_array2 = hypre_BoxArrayArrayBoxArray(bdry[j][i + 1], 0);
                      hypre_ForBoxI(k, box_array)
                      {
-                        bdy_box= hypre_BoxArrayBox(box_array, k);
-                   
-                       /* bdry boxes */
+                        bdy_box = hypre_BoxArrayBox(box_array, k);
+
+                        /* bdry boxes */
                         hypre_CopyIndex(hypre_BoxIMin(bdy_box), lower);
                         hypre_CopyIndex(hypre_BoxIMax(bdy_box), upper);
                         hypre_SubtractIndexes(lower, varoffset, ndim, lower);
                         hypre_SubtractIndexes(upper, varoffset, ndim, upper);
-  
+
                         hypre_BoxSetExtents(shifted_box, lower, upper);
                         hypre_AppendBox(shifted_box, box_array2);
                      }
@@ -166,13 +166,13 @@ hypre_Maxwell_PNedelec_Bdy( hypre_StructGrid       *cell_grid,
 
                   if (flag[3]) /* boundary j= upper */
                   {
-                     box_array= hypre_BoxArrayArrayBoxArray(cellgrid_bdry, 3);
-                     box_array2= hypre_BoxArrayArrayBoxArray(bdry[j][i+1], 1);
+                     box_array = hypre_BoxArrayArrayBoxArray(cellgrid_bdry, 3);
+                     box_array2 = hypre_BoxArrayArrayBoxArray(bdry[j][i + 1], 1);
                      hypre_ForBoxI(k, box_array)
                      {
-                        bdy_box= hypre_BoxArrayBox(box_array, k);
-                                                                                                         
-                       /* bdry boxes */
+                        bdy_box = hypre_BoxArrayBox(box_array, k);
+
+                        /* bdry boxes */
                         hypre_CopyIndex(hypre_BoxIMin(bdy_box), lower);
                         hypre_CopyIndex(hypre_BoxIMax(bdy_box), upper);
 
@@ -189,17 +189,17 @@ hypre_Maxwell_PNedelec_Bdy( hypre_StructGrid       *cell_grid,
                   if (flag[4]) /* boundary k= lower zface*/
                   {
                      box_array = hypre_BoxArrayArrayBoxArray(cellgrid_bdry, 4);
-                     box_array2= hypre_BoxArrayArrayBoxArray(bdry[j][i+1], 0);
+                     box_array2 = hypre_BoxArrayArrayBoxArray(bdry[j][i + 1], 0);
                      hypre_ForBoxI(k, box_array)
                      {
-                        bdy_box= hypre_BoxArrayBox(box_array, k);
-                   
-                       /* bdry boxes */
+                        bdy_box = hypre_BoxArrayBox(box_array, k);
+
+                        /* bdry boxes */
                         hypre_CopyIndex(hypre_BoxIMin(bdy_box), lower);
                         hypre_CopyIndex(hypre_BoxIMax(bdy_box), upper);
                         hypre_SubtractIndexes(lower, varoffset, ndim, lower);
                         hypre_SubtractIndexes(upper, kshift, ndim, upper);
-  
+
                         hypre_BoxSetExtents(shifted_box, lower, upper);
                         hypre_AppendBox(shifted_box, box_array2);
                      }
@@ -208,16 +208,16 @@ hypre_Maxwell_PNedelec_Bdy( hypre_StructGrid       *cell_grid,
                   if (flag[5]) /* boundary k= upper zface*/
                   {
                      box_array = hypre_BoxArrayArrayBoxArray(cellgrid_bdry, 5);
-                     box_array2= hypre_BoxArrayArrayBoxArray(bdry[j][i+1], 1);
+                     box_array2 = hypre_BoxArrayArrayBoxArray(bdry[j][i + 1], 1);
                      hypre_ForBoxI(k, box_array)
                      {
-                        bdy_box= hypre_BoxArrayBox(box_array, k);
-                   
-                       /* bdry boxes */
+                        bdy_box = hypre_BoxArrayBox(box_array, k);
+
+                        /* bdry boxes */
                         hypre_CopyIndex(hypre_BoxIMin(bdy_box), lower);
                         hypre_CopyIndex(hypre_BoxIMax(bdy_box), upper);
                         hypre_SubtractIndexes(lower, jshift, ndim, lower);
-  
+
                         hypre_BoxSetExtents(shifted_box, lower, upper);
                         hypre_AppendBox(shifted_box, box_array2);
                      }
@@ -226,35 +226,35 @@ hypre_Maxwell_PNedelec_Bdy( hypre_StructGrid       *cell_grid,
                   if (flag[2]) /* boundary j= lower yface*/
                   {
                      box_array = hypre_BoxArrayArrayBoxArray(cellgrid_bdry, 2);
-                     box_array2= hypre_BoxArrayArrayBoxArray(bdry[j][i+1], 2);
+                     box_array2 = hypre_BoxArrayArrayBoxArray(bdry[j][i + 1], 2);
                      hypre_ForBoxI(k, box_array)
                      {
-                        bdy_box= hypre_BoxArrayBox(box_array, k);
-                                                                                                                        
-                       /* bdry boxes */
+                        bdy_box = hypre_BoxArrayBox(box_array, k);
+
+                        /* bdry boxes */
                         hypre_CopyIndex(hypre_BoxIMin(bdy_box), lower);
                         hypre_CopyIndex(hypre_BoxIMax(bdy_box), upper);
                         hypre_SubtractIndexes(lower, varoffset, ndim, lower);
                         hypre_SubtractIndexes(upper, jshift, ndim, upper);
-                                                                                                                        
+
                         hypre_BoxSetExtents(shifted_box, lower, upper);
                         hypre_AppendBox(shifted_box, box_array2);
                      }
                   }
-                                                                                                                        
+
                   if (flag[3]) /* boundary j= upper yface*/
                   {
                      box_array = hypre_BoxArrayArrayBoxArray(cellgrid_bdry, 3);
-                     box_array2= hypre_BoxArrayArrayBoxArray(bdry[j][i+1], 3);
+                     box_array2 = hypre_BoxArrayArrayBoxArray(bdry[j][i + 1], 3);
                      hypre_ForBoxI(k, box_array)
                      {
-                        bdy_box= hypre_BoxArrayBox(box_array, k);
+                        bdy_box = hypre_BoxArrayBox(box_array, k);
 
-                       /* bdry boxes */
+                        /* bdry boxes */
                         hypre_CopyIndex(hypre_BoxIMin(bdy_box), lower);
                         hypre_CopyIndex(hypre_BoxIMax(bdy_box), upper);
                         hypre_SubtractIndexes(lower, kshift, ndim, lower);
-                                                                                                                        
+
                         hypre_BoxSetExtents(shifted_box, lower, upper);
                         hypre_AppendBox(shifted_box, box_array2);
                      }
@@ -267,68 +267,68 @@ hypre_Maxwell_PNedelec_Bdy( hypre_StructGrid       *cell_grid,
                   if (flag[4]) /* boundary k= lower zface*/
                   {
                      box_array = hypre_BoxArrayArrayBoxArray(cellgrid_bdry, 4);
-                     box_array2= hypre_BoxArrayArrayBoxArray(bdry[j][i+1], 0);
+                     box_array2 = hypre_BoxArrayArrayBoxArray(bdry[j][i + 1], 0);
                      hypre_ForBoxI(k, box_array)
                      {
-                        bdy_box= hypre_BoxArrayBox(box_array, k);
+                        bdy_box = hypre_BoxArrayBox(box_array, k);
 
-                       /* bdry boxes */
+                        /* bdry boxes */
                         hypre_CopyIndex(hypre_BoxIMin(bdy_box), lower);
                         hypre_CopyIndex(hypre_BoxIMax(bdy_box), upper);
                         hypre_SubtractIndexes(lower, varoffset, ndim, lower);
                         hypre_SubtractIndexes(upper, kshift, ndim, upper);
-                                                                                                                        
+
                         hypre_BoxSetExtents(shifted_box, lower, upper);
                         hypre_AppendBox(shifted_box, box_array2);
                      }
                   }
-                                                                                                                        
+
                   if (flag[5]) /* boundary k= upper zface*/
                   {
                      box_array = hypre_BoxArrayArrayBoxArray(cellgrid_bdry, 5);
-                     box_array2= hypre_BoxArrayArrayBoxArray(bdry[j][i+1], 1);
+                     box_array2 = hypre_BoxArrayArrayBoxArray(bdry[j][i + 1], 1);
                      hypre_ForBoxI(k, box_array)
                      {
-                        bdy_box= hypre_BoxArrayBox(box_array, k);
+                        bdy_box = hypre_BoxArrayBox(box_array, k);
 
-                       /* bdry boxes */
+                        /* bdry boxes */
                         hypre_CopyIndex(hypre_BoxIMin(bdy_box), lower);
                         hypre_CopyIndex(hypre_BoxIMax(bdy_box), upper);
                         hypre_SubtractIndexes(lower, ishift, ndim, lower);
-                                                                                                                        
+
                         hypre_BoxSetExtents(shifted_box, lower, upper);
                         hypre_AppendBox(shifted_box, box_array2);
                      }
                   }
-                                                                                                                        
+
                   if (flag[0]) /* boundary i= lower xface*/
                   {
                      box_array = hypre_BoxArrayArrayBoxArray(cellgrid_bdry, 0);
-                     box_array2= hypre_BoxArrayArrayBoxArray(bdry[j][i+1], 2);
+                     box_array2 = hypre_BoxArrayArrayBoxArray(bdry[j][i + 1], 2);
                      hypre_ForBoxI(k, box_array)
                      {
-                        bdy_box= hypre_BoxArrayBox(box_array, k);
+                        bdy_box = hypre_BoxArrayBox(box_array, k);
 
-                       /* bdry boxes */
+                        /* bdry boxes */
                         hypre_CopyIndex(hypre_BoxIMin(bdy_box), lower);
                         hypre_CopyIndex(hypre_BoxIMax(bdy_box), upper);
                         hypre_SubtractIndexes(lower, varoffset, ndim, lower);
                         hypre_SubtractIndexes(upper, ishift, ndim, upper);
-                                                                                                                        
+
                         hypre_BoxSetExtents(shifted_box, lower, upper);
                         hypre_AppendBox(shifted_box, box_array2);
                      }
                   }
-                                                                                                                        
+
                   if (flag[1]) /* boundary i= upper xface*/
                   {
                      box_array = hypre_BoxArrayArrayBoxArray(cellgrid_bdry, 1);
-                     box_array2= hypre_BoxArrayArrayBoxArray(bdry[j][i+1], 3);
+                     box_array2 = hypre_BoxArrayArrayBoxArray(bdry[j][i + 1], 3);
                      hypre_ForBoxI(k, box_array)
                      {
-                        bdy_box= hypre_BoxArrayBox(box_array, k);
-                                                                                                                        
-                       /* bdry boxes */
+                        bdy_box = hypre_BoxArrayBox(box_array, k);
+
+                        /* bdry boxes */
                         hypre_CopyIndex(hypre_BoxIMin(bdy_box), lower);
                         hypre_CopyIndex(hypre_BoxIMax(bdy_box), upper);
                         hypre_SubtractIndexes(lower, kshift, ndim, lower);
@@ -345,78 +345,78 @@ hypre_Maxwell_PNedelec_Bdy( hypre_StructGrid       *cell_grid,
                {
                   if (flag[2]) /* boundary j= lower yface*/
                   {
-                      box_array = hypre_BoxArrayArrayBoxArray(cellgrid_bdry, 2);
-                      box_array2= hypre_BoxArrayArrayBoxArray(bdry[j][i+1], 0);
-                      hypre_ForBoxI(k, box_array)
-                      {
-                         bdy_box= hypre_BoxArrayBox(box_array, k);
-                                                                                                                        
+                     box_array = hypre_BoxArrayArrayBoxArray(cellgrid_bdry, 2);
+                     box_array2 = hypre_BoxArrayArrayBoxArray(bdry[j][i + 1], 0);
+                     hypre_ForBoxI(k, box_array)
+                     {
+                        bdy_box = hypre_BoxArrayBox(box_array, k);
+
                         /* bdry boxes */
-                         hypre_CopyIndex(hypre_BoxIMin(bdy_box), lower);
-                         hypre_CopyIndex(hypre_BoxIMax(bdy_box), upper);
-                         hypre_SubtractIndexes(lower, varoffset, ndim, lower);
-                         hypre_SubtractIndexes(upper, jshift, ndim, upper);
-
-                         hypre_BoxSetExtents(shifted_box, lower, upper);
-                         hypre_AppendBox(shifted_box, box_array2);
-                      }
-                   }
-
-                   if (flag[3]) /* boundary j= upper yface*/
-                   {
-                      box_array = hypre_BoxArrayArrayBoxArray(cellgrid_bdry, 3);
-                      box_array2= hypre_BoxArrayArrayBoxArray(bdry[j][i+1], 1);
-                      hypre_ForBoxI(k, box_array)
-                      {
-                         bdy_box= hypre_BoxArrayBox(box_array, k);
+                        hypre_CopyIndex(hypre_BoxIMin(bdy_box), lower);
+                        hypre_CopyIndex(hypre_BoxIMax(bdy_box), upper);
+                        hypre_SubtractIndexes(lower, varoffset, ndim, lower);
+                        hypre_SubtractIndexes(upper, jshift, ndim, upper);
+
+                        hypre_BoxSetExtents(shifted_box, lower, upper);
+                        hypre_AppendBox(shifted_box, box_array2);
+                     }
+                  }
+
+                  if (flag[3]) /* boundary j= upper yface*/
+                  {
+                     box_array = hypre_BoxArrayArrayBoxArray(cellgrid_bdry, 3);
+                     box_array2 = hypre_BoxArrayArrayBoxArray(bdry[j][i + 1], 1);
+                     hypre_ForBoxI(k, box_array)
+                     {
+                        bdy_box = hypre_BoxArrayBox(box_array, k);
 
                         /* bdry boxes */
-                         hypre_CopyIndex(hypre_BoxIMin(bdy_box), lower);
-                         hypre_CopyIndex(hypre_BoxIMax(bdy_box), upper);
-                         hypre_SubtractIndexes(lower, ishift, ndim, lower);
-
-                         hypre_BoxSetExtents(shifted_box, lower, upper);
-                         hypre_AppendBox(shifted_box, box_array2);
-                      }
-                   }
-
-                   if (flag[0]) /* boundary i= lower xface*/
-                   {
-                      box_array = hypre_BoxArrayArrayBoxArray(cellgrid_bdry, 0);
-                      box_array2= hypre_BoxArrayArrayBoxArray(bdry[j][i+1], 2);
-                      hypre_ForBoxI(k, box_array)
-                      {
-                         bdy_box= hypre_BoxArrayBox(box_array, k);
+                        hypre_CopyIndex(hypre_BoxIMin(bdy_box), lower);
+                        hypre_CopyIndex(hypre_BoxIMax(bdy_box), upper);
+                        hypre_SubtractIndexes(lower, ishift, ndim, lower);
+
+                        hypre_BoxSetExtents(shifted_box, lower, upper);
+                        hypre_AppendBox(shifted_box, box_array2);
+                     }
+                  }
+
+                  if (flag[0]) /* boundary i= lower xface*/
+                  {
+                     box_array = hypre_BoxArrayArrayBoxArray(cellgrid_bdry, 0);
+                     box_array2 = hypre_BoxArrayArrayBoxArray(bdry[j][i + 1], 2);
+                     hypre_ForBoxI(k, box_array)
+                     {
+                        bdy_box = hypre_BoxArrayBox(box_array, k);
 
                         /* bdry boxes */
-                         hypre_CopyIndex(hypre_BoxIMin(bdy_box), lower);
-                         hypre_CopyIndex(hypre_BoxIMax(bdy_box), upper);
-                         hypre_SubtractIndexes(lower, varoffset, ndim, lower);
-                         hypre_SubtractIndexes(upper, ishift, ndim, upper);
-
-                         hypre_BoxSetExtents(shifted_box, lower, upper);
-                         hypre_AppendBox(shifted_box, box_array2);
-                      }
-                   }
-
-                   if (flag[1]) /* boundary i= upper xface*/
-                   {
-                      box_array = hypre_BoxArrayArrayBoxArray(cellgrid_bdry, 1);
-                      box_array2= hypre_BoxArrayArrayBoxArray(bdry[j][i+1], 3);
-                      hypre_ForBoxI(k, box_array)
-                      {
-                         bdy_box= hypre_BoxArrayBox(box_array, k);
+                        hypre_CopyIndex(hypre_BoxIMin(bdy_box), lower);
+                        hypre_CopyIndex(hypre_BoxIMax(bdy_box), upper);
+                        hypre_SubtractIndexes(lower, varoffset, ndim, lower);
+                        hypre_SubtractIndexes(upper, ishift, ndim, upper);
+
+                        hypre_BoxSetExtents(shifted_box, lower, upper);
+                        hypre_AppendBox(shifted_box, box_array2);
+                     }
+                  }
+
+                  if (flag[1]) /* boundary i= upper xface*/
+                  {
+                     box_array = hypre_BoxArrayArrayBoxArray(cellgrid_bdry, 1);
+                     box_array2 = hypre_BoxArrayArrayBoxArray(bdry[j][i + 1], 3);
+                     hypre_ForBoxI(k, box_array)
+                     {
+                        bdy_box = hypre_BoxArrayBox(box_array, k);
 
                         /* bdry boxes */
-                         hypre_CopyIndex(hypre_BoxIMin(bdy_box), lower);
-                         hypre_CopyIndex(hypre_BoxIMax(bdy_box), upper);
-                         hypre_SubtractIndexes(lower, jshift, ndim, lower);
-
-                         hypre_BoxSetExtents(shifted_box, lower, upper);
-                         hypre_AppendBox(shifted_box, box_array2);
-                      }
-                   }
-                   break;
+                        hypre_CopyIndex(hypre_BoxIMin(bdy_box), lower);
+                        hypre_CopyIndex(hypre_BoxIMax(bdy_box), upper);
+                        hypre_SubtractIndexes(lower, jshift, ndim, lower);
+
+                        hypre_BoxSetExtents(shifted_box, lower, upper);
+                        hypre_AppendBox(shifted_box, box_array2);
+                     }
+                  }
+                  break;
                }
 
             }  /* switch(t) */
@@ -425,22 +425,22 @@ hypre_Maxwell_PNedelec_Bdy( hypre_StructGrid       *cell_grid,
 
       else
       {
-        /* make an empty ptr of boxarrayarrays to avoid memory leaks when
-           destroying bdry later. */
-         bdry[j]= hypre_TAlloc(hypre_BoxArrayArray *,  nvars+1, HYPRE_MEMORY_HOST); 
-         for (i= 0; i< nvars+1; i++)
+         /* make an empty ptr of boxarrayarrays to avoid memory leaks when
+            destroying bdry later. */
+         bdry[j] = hypre_TAlloc(hypre_BoxArrayArray *,  nvars + 1, HYPRE_MEMORY_HOST);
+         for (i = 0; i < nvars + 1; i++)
          {
-            bdry[j][i]= hypre_BoxArrayArrayCreate(0, ndim);
+            bdry[j][i] = hypre_BoxArrayArrayCreate(0, ndim);
          }
       }
 
-      hypre_BoxArrayArrayDestroy(cellgrid_bdry); 
+      hypre_BoxArrayArrayDestroy(cellgrid_bdry);
       hypre_TFree(flag, HYPRE_MEMORY_HOST);
    }  /* hypre_ForBoxI(j, cell_boxes) */
 
    hypre_BoxDestroy(shifted_box);
 
-  *bdry_ptr     = bdry;
+   *bdry_ptr     = bdry;
 
    return ierr;
 }
diff --git a/external/hypre/src/sstruct_ls/maxwell_PTopology.h b/external/hypre/src/sstruct_ls/maxwell_PTopology.h
index 35eeb355..33e2d4ca 100644
--- a/external/hypre/src/sstruct_ls/maxwell_PTopology.h
+++ b/external/hypre/src/sstruct_ls/maxwell_PTopology.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -7,12 +7,12 @@
 
 typedef struct
 {
-    hypre_IJMatrix    *Face_iedge;
-    hypre_IJMatrix    *Element_iedge;
-    hypre_IJMatrix    *Edge_iedge;
-                                                                                                                            
-    hypre_IJMatrix    *Element_Face;
-    hypre_IJMatrix    *Element_Edge;
-                                                                                                                            
+   hypre_IJMatrix    *Face_iedge;
+   hypre_IJMatrix    *Element_iedge;
+   hypre_IJMatrix    *Edge_iedge;
+
+   hypre_IJMatrix    *Element_Face;
+   hypre_IJMatrix    *Element_Edge;
+
 } hypre_PTopology;
 
diff --git a/external/hypre/src/sstruct_ls/maxwell_TV.c b/external/hypre/src/sstruct_ls/maxwell_TV.c
index 92e2d8fd..19044c04 100644
--- a/external/hypre/src/sstruct_ls/maxwell_TV.c
+++ b/external/hypre/src/sstruct_ls/maxwell_TV.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -34,10 +34,10 @@ hypre_MaxwellTVCreate( MPI_Comm  comm )
    (maxwell_data -> print_level)    = 0;
    (maxwell_data -> logging)        = 0;
 
-   maxwell_rfactor= hypre_TAlloc(hypre_Index,  1, HYPRE_MEMORY_HOST);
+   maxwell_rfactor = hypre_TAlloc(hypre_Index,  1, HYPRE_MEMORY_HOST);
    hypre_SetIndex3(maxwell_rfactor[0], 2, 2, 2);
-   (maxwell_data -> rfactor)= maxwell_rfactor;
-                                         
+   (maxwell_data -> rfactor) = maxwell_rfactor;
+
 
    return (void *) maxwell_data;
 }
@@ -49,7 +49,7 @@ hypre_MaxwellTVCreate( MPI_Comm  comm )
 HYPRE_Int
 hypre_MaxwellTVDestroy( void *maxwell_vdata )
 {
-	hypre_MaxwellData *maxwell_data= (hypre_MaxwellData *)maxwell_vdata;
+   hypre_MaxwellData *maxwell_data = (hypre_MaxwellData *)maxwell_vdata;
 
    HYPRE_Int l;
    HYPRE_Int ierr = 0;
@@ -68,29 +68,29 @@ hypre_MaxwellTVDestroy( void *maxwell_vdata )
       {
          for (l = 0; l < (maxwell_data-> edge_numlevels); l++)
          {
-             HYPRE_SStructGridDestroy(maxwell_data-> egrid_l[l]);
-             hypre_ParVectorDestroy(maxwell_data-> rese_l[l]);
-             hypre_ParVectorDestroy(maxwell_data-> ee_l[l]);
-             hypre_ParVectorDestroy(maxwell_data-> eVtemp_l[l]);
-             hypre_ParVectorDestroy(maxwell_data-> eVtemp2_l[l]);
-             hypre_TFree(maxwell_data -> eCF_marker_l[l], HYPRE_MEMORY_HOST);
+            HYPRE_SStructGridDestroy(maxwell_data-> egrid_l[l]);
+            hypre_ParVectorDestroy(maxwell_data-> rese_l[l]);
+            hypre_ParVectorDestroy(maxwell_data-> ee_l[l]);
+            hypre_ParVectorDestroy(maxwell_data-> eVtemp_l[l]);
+            hypre_ParVectorDestroy(maxwell_data-> eVtemp2_l[l]);
+            hypre_TFree(maxwell_data -> eCF_marker_l[l], HYPRE_MEMORY_HOST);
 
             /* Cannot destroy Aee_l[0] since it points to the user
                Aee_in. */
-             if (l) 
-             {
-                hypre_ParCSRMatrixDestroy(maxwell_data-> Aee_l[l]);
-                hypre_ParVectorDestroy(maxwell_data-> be_l[l]);
-                hypre_ParVectorDestroy(maxwell_data-> xe_l[l]);
-             }
-
-             if (l < (maxwell_data-> edge_numlevels)-1) 
-             {
-                HYPRE_IJMatrixDestroy( 
-                            (HYPRE_IJMatrix)  (maxwell_data-> Pe_l[l]));
-             }
-
-             hypre_TFree(maxwell_data-> BdryRanks_l[l], HYPRE_MEMORY_HOST);
+            if (l)
+            {
+               hypre_ParCSRMatrixDestroy(maxwell_data-> Aee_l[l]);
+               hypre_ParVectorDestroy(maxwell_data-> be_l[l]);
+               hypre_ParVectorDestroy(maxwell_data-> xe_l[l]);
+            }
+
+            if (l < (maxwell_data-> edge_numlevels) - 1)
+            {
+               HYPRE_IJMatrixDestroy(
+                  (HYPRE_IJMatrix)  (maxwell_data-> Pe_l[l]));
+            }
+
+            hypre_TFree(maxwell_data-> BdryRanks_l[l], HYPRE_MEMORY_HOST);
          }
          hypre_TFree(maxwell_data-> egrid_l, HYPRE_MEMORY_HOST);
          hypre_TFree(maxwell_data-> Aee_l, HYPRE_MEMORY_HOST);
@@ -105,7 +105,7 @@ hypre_MaxwellTVDestroy( void *maxwell_vdata )
          hypre_TFree(maxwell_data-> eCF_marker_l, HYPRE_MEMORY_HOST);
          hypre_TFree(maxwell_data-> erelax_weight, HYPRE_MEMORY_HOST);
          hypre_TFree(maxwell_data-> eomega, HYPRE_MEMORY_HOST);
-         
+
          hypre_TFree(maxwell_data-> BdryRanks_l, HYPRE_MEMORY_HOST);
          hypre_TFree(maxwell_data-> BdryRanksCnts_l, HYPRE_MEMORY_HOST);
       }
@@ -114,10 +114,10 @@ hypre_MaxwellTVDestroy( void *maxwell_vdata )
       {
          for (l = 0; l < (maxwell_data-> node_numlevels); l++)
          {
-             hypre_ParVectorDestroy(maxwell_data-> resn_l[l]);
-             hypre_ParVectorDestroy(maxwell_data-> en_l[l]);
-             hypre_ParVectorDestroy(maxwell_data-> nVtemp_l[l]);
-             hypre_ParVectorDestroy(maxwell_data-> nVtemp2_l[l]);
+            hypre_ParVectorDestroy(maxwell_data-> resn_l[l]);
+            hypre_ParVectorDestroy(maxwell_data-> en_l[l]);
+            hypre_ParVectorDestroy(maxwell_data-> nVtemp_l[l]);
+            hypre_ParVectorDestroy(maxwell_data-> nVtemp2_l[l]);
          }
          hypre_BoomerAMGDestroy(maxwell_data-> amg_vdata);
 
@@ -140,19 +140,19 @@ hypre_MaxwellTVDestroy( void *maxwell_vdata )
 
       if ((maxwell_data -> en_numlevels) > 0)
       {
-         for (l= 1; l< (maxwell_data-> en_numlevels); l++)
+         for (l = 1; l < (maxwell_data-> en_numlevels); l++)
          {
-             hypre_ParCSRMatrixDestroy(maxwell_data-> Aen_l[l]);
+            hypre_ParCSRMatrixDestroy(maxwell_data-> Aen_l[l]);
          }
       }
       hypre_TFree(maxwell_data-> Aen_l, HYPRE_MEMORY_HOST);
 
       HYPRE_SStructVectorDestroy(
-           (HYPRE_SStructVector) maxwell_data-> bn);
+         (HYPRE_SStructVector) maxwell_data-> bn);
       HYPRE_SStructVectorDestroy(
-           (HYPRE_SStructVector) maxwell_data-> xn);
+         (HYPRE_SStructVector) maxwell_data-> xn);
       HYPRE_SStructMatrixDestroy(
-           (HYPRE_SStructMatrix) maxwell_data-> Ann);
+         (HYPRE_SStructMatrix) maxwell_data-> Ann);
       HYPRE_IJMatrixDestroy(maxwell_data-> Aen);
 
       hypre_ParCSRMatrixDestroy(maxwell_data-> T_transpose);
@@ -161,7 +161,7 @@ hypre_MaxwellTVDestroy( void *maxwell_vdata )
       hypre_TFree(maxwell_data, HYPRE_MEMORY_HOST);
    }
 
-   return(ierr);
+   return (ierr);
 }
 
 /*--------------------------------------------------------------------------
@@ -169,14 +169,14 @@ hypre_MaxwellTVDestroy( void *maxwell_vdata )
  *--------------------------------------------------------------------------*/
 HYPRE_Int
 hypre_MaxwellSetRfactors(void         *maxwell_vdata,
-                          HYPRE_Int     rfactor[3] )
+                         HYPRE_Int     rfactor[HYPRE_MAXDIM] )
 {
    hypre_MaxwellData *maxwell_data   = (hypre_MaxwellData *)maxwell_vdata;
-   hypre_Index       *maxwell_rfactor=(maxwell_data -> rfactor);
+   hypre_Index       *maxwell_rfactor = (maxwell_data -> rfactor);
    HYPRE_Int          ierr       = 0;
-                                                                                                              
+
    hypre_CopyIndex(rfactor, maxwell_rfactor[0]);
-                                                                                                              
+
    return ierr;
 }
 
@@ -187,14 +187,14 @@ HYPRE_Int
 hypre_MaxwellSetGrad(void               *maxwell_vdata,
                      hypre_ParCSRMatrix *T )
 {
-   hypre_MaxwellData *maxwell_data= (hypre_MaxwellData *)maxwell_vdata;
+   hypre_MaxwellData *maxwell_data = (hypre_MaxwellData *)maxwell_vdata;
    HYPRE_Int          ierr       = 0;
-                                                                                                              
-   (maxwell_data -> Tgrad)=  T;
-                                                                                                              
+
+   (maxwell_data -> Tgrad) =  T;
+
    return ierr;
 }
-                                                                                                              
+
 /*--------------------------------------------------------------------------
  * hypre_MaxwellSetConstantCoef
  *--------------------------------------------------------------------------*/
@@ -202,10 +202,10 @@ HYPRE_Int
 hypre_MaxwellSetConstantCoef( void   *maxwell_vdata,
                               HYPRE_Int     constant_coef)
 {
-   hypre_MaxwellData *maxwell_data= (hypre_MaxwellData *)maxwell_vdata;
+   hypre_MaxwellData *maxwell_data = (hypre_MaxwellData *)maxwell_vdata;
    HYPRE_Int          ierr        = 0;
-                                                                                                                            
-  (maxwell_data -> constant_coef) = constant_coef;
+
+   (maxwell_data -> constant_coef) = constant_coef;
 
    return ierr;
 }
@@ -217,10 +217,10 @@ HYPRE_Int
 hypre_MaxwellSetTol( void   *maxwell_vdata,
                      HYPRE_Real  tol       )
 {
-   hypre_MaxwellData *maxwell_data= (hypre_MaxwellData *)maxwell_vdata;
+   hypre_MaxwellData *maxwell_data = (hypre_MaxwellData *)maxwell_vdata;
    HYPRE_Int          ierr        = 0;
-                                                                                                                            
-  (maxwell_data -> tol) = tol;
+
+   (maxwell_data -> tol) = tol;
 
    return ierr;
 }
@@ -235,11 +235,11 @@ hypre_MaxwellSetMaxIter( void *maxwell_vdata,
    hypre_MaxwellData *maxwell_data = (hypre_MaxwellData *)maxwell_vdata;
    HYPRE_Int          ierr = 0;
 
-  (maxwell_data -> max_iter) = max_iter;
+   (maxwell_data -> max_iter) = max_iter;
 
    return ierr;
 }
-                                                                                                                            
+
 /*--------------------------------------------------------------------------
  * hypre_MaxwellSetRelChange
  *--------------------------------------------------------------------------*/
@@ -249,28 +249,28 @@ hypre_MaxwellSetRelChange( void *maxwell_vdata,
 {
    hypre_MaxwellData *maxwell_data = (hypre_MaxwellData *)maxwell_vdata;
    HYPRE_Int          ierr = 0;
-                                                                                                                            
-  (maxwell_data -> rel_change) = rel_change;
+
+   (maxwell_data -> rel_change) = rel_change;
 
    return ierr;
 }
-                                                                                                                            
+
 /*--------------------------------------------------------------------------
  * hypre_MaxwellNumPreRelax
  *--------------------------------------------------------------------------*/
-                                                                                                                            
+
 HYPRE_Int
 hypre_MaxwellSetNumPreRelax( void *maxwell_vdata,
                              HYPRE_Int   num_pre_relax )
 {
-   hypre_MaxwellData *maxwell_data= (hypre_MaxwellData *)maxwell_vdata;
+   hypre_MaxwellData *maxwell_data = (hypre_MaxwellData *)maxwell_vdata;
    HYPRE_Int          ierr = 0;
 
-  (maxwell_data -> num_pre_relax) = num_pre_relax;
+   (maxwell_data -> num_pre_relax) = num_pre_relax;
 
    return ierr;
 }
-                                                                                                                            
+
 /*--------------------------------------------------------------------------
  * hypre_MaxwellSetNumPostRelax
  *--------------------------------------------------------------------------*/
@@ -278,10 +278,10 @@ HYPRE_Int
 hypre_MaxwellSetNumPostRelax( void *maxwell_vdata,
                               HYPRE_Int   num_post_relax )
 {
-   hypre_MaxwellData *maxwell_data= (hypre_MaxwellData *)maxwell_vdata;
+   hypre_MaxwellData *maxwell_data = (hypre_MaxwellData *)maxwell_vdata;
    HYPRE_Int          ierr = 0;
-                                                                                                                            
-  (maxwell_data -> num_post_relax)= num_post_relax;
+
+   (maxwell_data -> num_post_relax) = num_post_relax;
 
    return ierr;
 }
@@ -293,10 +293,10 @@ HYPRE_Int
 hypre_MaxwellGetNumIterations( void *maxwell_vdata,
                                HYPRE_Int  *num_iterations )
 {
-   hypre_MaxwellData *maxwell_data= (hypre_MaxwellData *)maxwell_vdata;
+   hypre_MaxwellData *maxwell_data = (hypre_MaxwellData *)maxwell_vdata;
    HYPRE_Int          ierr = 0;
-                                                                                                                            
-  *num_iterations = (maxwell_data -> num_iterations);
+
+   *num_iterations = (maxwell_data -> num_iterations);
 
    return ierr;
 }
@@ -310,12 +310,12 @@ hypre_MaxwellSetPrintLevel( void *maxwell_vdata,
 {
    hypre_MaxwellData *maxwell_data = (hypre_MaxwellData *)maxwell_vdata;
    HYPRE_Int          ierr = 0;
-                                                                                                             
+
    (maxwell_data -> print_level) = print_level;
-                                                                                                             
+
    return ierr;
 }
-                                                                                                             
+
 /*--------------------------------------------------------------------------
  * hypre_MaxwellSetLogging
  *--------------------------------------------------------------------------*/
@@ -325,12 +325,12 @@ hypre_MaxwellSetLogging( void *maxwell_vdata,
 {
    hypre_MaxwellData *maxwell_data = (hypre_MaxwellData *)maxwell_vdata;
    HYPRE_Int          ierr = 0;
-                                                                                                                       
+
    (maxwell_data -> logging) = logging;
-                                                                                                                       
+
    return ierr;
 }
-                                                                                                                       
+
 /*--------------------------------------------------------------------------
  * hypre_MaxwellPrintLogging
  *--------------------------------------------------------------------------*/
@@ -341,25 +341,25 @@ hypre_MaxwellPrintLogging( void *maxwell_vdata,
    hypre_MaxwellData *maxwell_data = (hypre_MaxwellData *)maxwell_vdata;
    HYPRE_Int          ierr = 0;
    HYPRE_Int          i;
-   HYPRE_Int          num_iterations= (maxwell_data -> num_iterations);
+   HYPRE_Int          num_iterations = (maxwell_data -> num_iterations);
    HYPRE_Int          logging       = (maxwell_data -> logging);
    HYPRE_Int          print_level   = (maxwell_data -> print_level);
    HYPRE_Real        *norms         = (maxwell_data -> norms);
    HYPRE_Real        *rel_norms     = (maxwell_data -> rel_norms);
-                                                                                                                            
+
    if (myid == 0)
    {
-     if (print_level > 0 )
-     {
+      if (print_level > 0 )
+      {
          if (logging > 0)
          {
             for (i = 0; i < num_iterations; i++)
             {
-              hypre_printf("Residual norm[%d] = %e   ",i,norms[i]);
-              hypre_printf("Relative residual norm[%d] = %e\n",i,rel_norms[i]);
+               hypre_printf("Residual norm[%d] = %e   ", i, norms[i]);
+               hypre_printf("Relative residual norm[%d] = %e\n", i, rel_norms[i]);
             }
          }
-     }
+      }
    }
 
    return ierr;
@@ -370,7 +370,7 @@ hypre_MaxwellGetFinalRelativeResidualNorm( void   *maxwell_vdata,
                                            HYPRE_Real *relative_residual_norm )
 {
    hypre_MaxwellData *maxwell_data = (hypre_MaxwellData *)maxwell_vdata;
-                                                                                                                            
+
    HYPRE_Int          max_iter        = (maxwell_data -> max_iter);
    HYPRE_Int          num_iterations  = (maxwell_data -> num_iterations);
    HYPRE_Int          logging         = (maxwell_data -> logging);
@@ -386,7 +386,7 @@ hypre_MaxwellGetFinalRelativeResidualNorm( void   *maxwell_vdata,
       }
       else if (num_iterations == max_iter)
       {
-         *relative_residual_norm = rel_norms[num_iterations-1];
+         *relative_residual_norm = rel_norms[num_iterations - 1];
       }
       else
       {
diff --git a/external/hypre/src/sstruct_ls/maxwell_TV.h b/external/hypre/src/sstruct_ls/maxwell_TV.h
index b7250506..72ea06bc 100644
--- a/external/hypre/src/sstruct_ls/maxwell_TV.h
+++ b/external/hypre/src/sstruct_ls/maxwell_TV.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -21,22 +21,22 @@
 typedef struct
 {
    MPI_Comm                comm;
-                      
+
    HYPRE_Real              tol;
    HYPRE_Int               max_iter;
    HYPRE_Int               rel_change;
    HYPRE_Int               zero_guess;
    HYPRE_Int               ndim;
-                      
+
    HYPRE_Int               num_pre_relax;  /* number of pre relaxation sweeps */
    HYPRE_Int               num_post_relax; /* number of post relaxation sweeps */
 
    HYPRE_Int               constant_coef;
-   
+
    hypre_Index            *rfactor;
 
    hypre_SStructGrid     **egrid_l;
-                    
+
    HYPRE_IJMatrix          Aen;
    hypre_ParCSRMatrix    **Aen_l;
 
@@ -68,8 +68,8 @@ typedef struct
    hypre_ParCSRMatrix     *T_transpose;
 
    /* edge data structure. These will have grids. */
-   HYPRE_Int               edge_maxlevels;  
-   HYPRE_Int               edge_numlevels;  
+   HYPRE_Int               edge_maxlevels;
+   HYPRE_Int               edge_numlevels;
    hypre_ParCSRMatrix    **Aee_l;
    hypre_ParVector       **be_l;
    hypre_ParVector       **xe_l;
diff --git a/external/hypre/src/sstruct_ls/maxwell_TV_setup.c b/external/hypre/src/sstruct_ls/maxwell_TV_setup.c
index 98524324..42e5e91c 100644
--- a/external/hypre/src/sstruct_ls/maxwell_TV_setup.c
+++ b/external/hypre/src/sstruct_ls/maxwell_TV_setup.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -31,9 +31,9 @@ hypre_MaxwellTV_Setup(void                 *maxwell_vdata,
 
    MPI_Comm               comm = hypre_SStructMatrixComm(Aee_in);
 
-   hypre_SStructGraph    *graph= hypre_SStructMatrixGraph(Aee_in);
+   hypre_SStructGraph    *graph = hypre_SStructMatrixGraph(Aee_in);
    hypre_SStructGrid     *grid = hypre_SStructGraphGrid(graph);
-   hypre_Index           *rfactor_in= (maxwell_TV_data-> rfactor);
+   hypre_Index           *rfactor_in = (maxwell_TV_data-> rfactor);
    hypre_ParCSRMatrix    *T         = (maxwell_TV_data-> Tgrad);
 
    hypre_SStructMatrix   *Ann;
@@ -91,7 +91,7 @@ hypre_MaxwellTV_Setup(void                 *maxwell_vdata,
    HYPRE_Int             *relax_types;
    void                  *e_amg_vdata;
    hypre_ParAMGData      *e_amgData;
-   HYPRE_Int              numCGSweeps= 10;
+   HYPRE_Int              numCGSweeps = 10;
    HYPRE_Int            **amg_CF_marker;
    hypre_ParCSRMatrix   **A_array;
 #endif
@@ -102,7 +102,7 @@ hypre_MaxwellTV_Setup(void                 *maxwell_vdata,
    HYPRE_Int             *coarsen;
    hypre_SStructGrid    **egrid_l;
    hypre_SStructGrid     *edge_grid, *face_grid, *cell_grid;
-   hypre_SStructGrid    **topological_edge, **topological_face, **topological_cell;
+   hypre_SStructGrid    **topological_edge, **topological_face = NULL, **topological_cell;
 
    HYPRE_Int            **BdryRanks_l;
    HYPRE_Int             *BdryRanksCnts_l;
@@ -114,7 +114,7 @@ hypre_MaxwellTV_Setup(void                 *maxwell_vdata,
    hypre_Box             *box, *box_piece, *contract_box;
    hypre_BoxArray        *cboxes;
 
-   HYPRE_SStructVariable *vartypes, *vartype_edges, *vartype_faces, *vartype_cell;
+   HYPRE_SStructVariable *vartypes, *vartype_edges, *vartype_faces = NULL, *vartype_cell;
    hypre_SStructStencil **Ann_stencils;
 
    hypre_MaxwellOffProcRow **OffProcRows;
@@ -123,7 +123,7 @@ hypre_MaxwellTV_Setup(void                 *maxwell_vdata,
    hypre_Index            rfactor;
    hypre_Index            index, cindex, shape, loop_size, start, lindex;
    HYPRE_Int              stencil_size;
-   HYPRE_Int              matrix_type= HYPRE_PARCSR;
+   HYPRE_Int              matrix_type = HYPRE_PARCSR;
 
    HYPRE_Int              ndim = hypre_SStructMatrixNDim(Aee_in);
    HYPRE_Int              nparts, part, vars, nboxes, lev_nboxes;
@@ -139,7 +139,7 @@ hypre_MaxwellTV_Setup(void                 *maxwell_vdata,
 
    hypre_BoxManager      *node_boxman;
    hypre_BoxManEntry     *entry;
-   HYPRE_Int              kstart=0, kend=0;
+   HYPRE_Int              kstart = 0, kend = 0;
    HYPRE_BigInt           ilower, iupper;
    HYPRE_BigInt           jlower, jupper;
    HYPRE_Int              myproc;
@@ -149,25 +149,28 @@ hypre_MaxwellTV_Setup(void                 *maxwell_vdata,
 
    HYPRE_Int              edge_maxlevels, edge_numlevels, en_numlevels;
 
-   HYPRE_Int              constant_coef=  maxwell_TV_data -> constant_coef;
+   HYPRE_Int              constant_coef =  maxwell_TV_data -> constant_coef;
    HYPRE_Int              trueV = 1;
-   HYPRE_Int              falseV= 0;
+   HYPRE_Int              falseV = 0;
 
    HYPRE_Int              ierr = 0;
 #if DEBUG
    /*char                  filename[255];*/
 #endif
 
+   HYPRE_MemoryLocation   memory_location = hypre_ParCSRMatrixMemoryLocation(Aee);
+
    hypre_MPI_Comm_rank(comm, &myproc);
 
-   (maxwell_TV_data -> ndim)= ndim;
+   (maxwell_TV_data -> ndim) = ndim;
 
    /* Adjust rfactor so that the correct dimension is used */
-   for (i= ndim; i< 3; i++)
+   for (i = ndim; i < 3; i++)
    {
-      rfactor_in[0][i]= 1;
+      rfactor_in[0][i] = 1;
    }
    hypre_CopyIndex(rfactor_in[0], rfactor);
+   hypre_SetIndex(lindex, 0);
 
    /*---------------------------------------------------------------------
     * Set up matrices Ann, Aen.
@@ -178,22 +181,22 @@ hypre_MaxwellTV_Setup(void                 *maxwell_vdata,
     *
     * Need to form the grid, graph, etc. for these matrices.
     *---------------------------------------------------------------------*/
-   nparts= hypre_SStructMatrixNParts(Aee_in);
+   nparts = hypre_SStructMatrixNParts(Aee_in);
    HYPRE_SStructGridCreate(comm, ndim, nparts, &node_grid);
 
    /* grids can be constructed from the cell-centre grid of Aee_in */
-   vartypes= hypre_CTAlloc(HYPRE_SStructVariable,  1, HYPRE_MEMORY_HOST);
-   vartypes[0]= HYPRE_SSTRUCT_VARIABLE_NODE;
+   vartypes = hypre_CTAlloc(HYPRE_SStructVariable,  1, HYPRE_MEMORY_HOST);
+   vartypes[0] = HYPRE_SSTRUCT_VARIABLE_NODE;
 
-   for (i= 0; i< nparts; i++)
+   for (i = 0; i < nparts; i++)
    {
-      pgrid= hypre_SStructPMatrixPGrid(hypre_SStructMatrixPMatrix(Aee_in, i));
-      sgrid= hypre_SStructPGridCellSGrid(pgrid);
+      pgrid = hypre_SStructPMatrixPGrid(hypre_SStructMatrixPMatrix(Aee_in, i));
+      sgrid = hypre_SStructPGridCellSGrid(pgrid);
 
-      boxes= hypre_StructGridBoxes(sgrid);
+      boxes = hypre_StructGridBoxes(sgrid);
       hypre_ForBoxI(j, boxes)
       {
-         box= hypre_BoxArrayBox(boxes, j);
+         box = hypre_BoxArrayBox(boxes, j);
          HYPRE_SStructGridSetExtents(node_grid, i,
                                      hypre_BoxIMin(box), hypre_BoxIMax(box));
       }
@@ -203,33 +206,33 @@ hypre_MaxwellTV_Setup(void                 *maxwell_vdata,
    HYPRE_SStructGridAssemble(node_grid);
 
    /* Ann stencils & graph */
-   stencil_size= 1;
-   for (i= 0; i< ndim; i++)
+   stencil_size = 1;
+   for (i = 0; i < ndim; i++)
    {
-      stencil_size*= 3;
+      stencil_size *= 3;
    }
 
-   Ann_stencils= hypre_CTAlloc(hypre_SStructStencil *,  1, HYPRE_MEMORY_HOST);
+   Ann_stencils = hypre_CTAlloc(hypre_SStructStencil *,  1, HYPRE_MEMORY_HOST);
    HYPRE_SStructStencilCreate(ndim, stencil_size, &Ann_stencils[0]);
 
-   vars= 0; /* scalar equation, node-to-node */
+   vars = 0; /* scalar equation, node-to-node */
    if (ndim > 2)
    {
-      kstart= -1;
+      kstart = -1;
       kend  =  2;
    }
    else if (ndim == 2)
    {
-      kstart= 0;
+      kstart = 0;
       kend  = 1;
    }
 
-   m= 0;
-   for (k= kstart; k< kend; k++)
+   m = 0;
+   for (k = kstart; k < kend; k++)
    {
-      for (j= -1; j< 2; j++)
+      for (j = -1; j < 2; j++)
       {
-         for (i= -1; i< 2; i++)
+         for (i = -1; i < 2; i++)
          {
             hypre_SetIndex3(shape, i, j, k);
             HYPRE_SStructStencilSetEntry(Ann_stencils[0], m, shape, vars);
@@ -239,7 +242,7 @@ hypre_MaxwellTV_Setup(void                 *maxwell_vdata,
    }
 
    HYPRE_SStructGraphCreate(comm, node_grid, &node_graph);
-   for (part= 0; part< nparts; part++)
+   for (part = 0; part < nparts; part++)
    {
       HYPRE_SStructGraphSetStencil(node_graph, part, 0, Ann_stencils[0]);
    }
@@ -251,52 +254,52 @@ hypre_MaxwellTV_Setup(void                 *maxwell_vdata,
 
    /* Aen is constructed as an IJ matrix. Constructing it as a sstruct_matrix
     * would make it a square matrix. */
-   part= 0;
+   part = 0;
    i   = 0;
 
    hypre_SStructGridBoxProcFindBoxManEntry(node_grid, part, 0, i, myproc, &entry);
-   pgrid= hypre_SStructGridPGrid(node_grid, part);
-   vartypes[0]= HYPRE_SSTRUCT_VARIABLE_NODE;
-   j= vartypes[0];
-   sgrid= hypre_SStructPGridVTSGrid(pgrid, j);
-   boxes= hypre_StructGridBoxes(sgrid);
+   pgrid = hypre_SStructGridPGrid(node_grid, part);
+   vartypes[0] = HYPRE_SSTRUCT_VARIABLE_NODE;
+   j = vartypes[0];
+   sgrid = hypre_SStructPGridVTSGrid(pgrid, j);
+   boxes = hypre_StructGridBoxes(sgrid);
    box  = hypre_BoxArrayBox(boxes, 0);
    hypre_SStructBoxManEntryGetGlobalCSRank(entry, hypre_BoxIMin(box), &jlower);
 
    hypre_SStructGridBoxProcFindBoxManEntry(grid, part, 0, i, myproc, &entry);
-   pgrid= hypre_SStructGridPGrid(grid, part);
+   pgrid = hypre_SStructGridPGrid(grid, part);
    /* grab the first edge variable type */
-   vartypes[0]= hypre_SStructPGridVarType(pgrid, 0);
-   j= vartypes[0];
-   sgrid= hypre_SStructPGridVTSGrid(pgrid, j);
-   boxes= hypre_StructGridBoxes(sgrid);
+   vartypes[0] = hypre_SStructPGridVarType(pgrid, 0);
+   j = vartypes[0];
+   sgrid = hypre_SStructPGridVTSGrid(pgrid, j);
+   boxes = hypre_StructGridBoxes(sgrid);
    box  = hypre_BoxArrayBox(boxes, 0);
    hypre_SStructBoxManEntryGetGlobalCSRank(entry, hypre_BoxIMin(box), &ilower);
 
-   part = nparts-1;
-   pgrid= hypre_SStructGridPGrid(node_grid, part);
-   vartypes[0]= HYPRE_SSTRUCT_VARIABLE_NODE;
-   j= vartypes[0];
-   sgrid= hypre_SStructPGridVTSGrid(pgrid, j);
-   boxes= hypre_StructGridBoxes(sgrid);
-   box  = hypre_BoxArrayBox(boxes, hypre_BoxArraySize(boxes)-1);
+   part = nparts - 1;
+   pgrid = hypre_SStructGridPGrid(node_grid, part);
+   vartypes[0] = HYPRE_SSTRUCT_VARIABLE_NODE;
+   j = vartypes[0];
+   sgrid = hypre_SStructPGridVTSGrid(pgrid, j);
+   boxes = hypre_StructGridBoxes(sgrid);
+   box  = hypre_BoxArrayBox(boxes, hypre_BoxArraySize(boxes) - 1);
 
    hypre_SStructGridBoxProcFindBoxManEntry(node_grid, part, 0,
-                                           hypre_BoxArraySize(boxes)-1,
+                                           hypre_BoxArraySize(boxes) - 1,
                                            myproc, &entry);
    hypre_SStructBoxManEntryGetGlobalCSRank(entry, hypre_BoxIMax(box), &jupper);
 
-   pgrid= hypre_SStructGridPGrid(grid, part);
+   pgrid = hypre_SStructGridPGrid(grid, part);
    vars = hypre_SStructPGridNVars(pgrid);
-   vartypes[0]= hypre_SStructPGridVarType(pgrid, vars-1);
-   j= vartypes[0];
-   sgrid= hypre_SStructPGridVTSGrid(pgrid, j);
-   boxes= hypre_StructGridBoxes(sgrid);
-   box  = hypre_BoxArrayBox(boxes, hypre_BoxArraySize(boxes)-1);
+   vartypes[0] = hypre_SStructPGridVarType(pgrid, vars - 1);
+   j = vartypes[0];
+   sgrid = hypre_SStructPGridVTSGrid(pgrid, j);
+   boxes = hypre_StructGridBoxes(sgrid);
+   box  = hypre_BoxArrayBox(boxes, hypre_BoxArraySize(boxes) - 1);
    hypre_TFree(vartypes, HYPRE_MEMORY_HOST);
 
-   hypre_SStructGridBoxProcFindBoxManEntry(grid, part, vars-1,
-                                           hypre_BoxArraySize(boxes)-1,
+   hypre_SStructGridBoxProcFindBoxManEntry(grid, part, vars - 1,
+                                           hypre_BoxArraySize(boxes) - 1,
                                            myproc, &entry);
    hypre_SStructBoxManEntryGetGlobalCSRank(entry, hypre_BoxIMax(box), &iupper);
 
@@ -306,15 +309,15 @@ hypre_MaxwellTV_Setup(void                 *maxwell_vdata,
 
    /* setup the Aen & Ann using matrix-matrix products
     * Aen's parscr matrix has not been formed yet-> fill up ij_matrix */
-   parcsr_mat= hypre_ParMatmul(Aee, T);
+   parcsr_mat = hypre_ParMatmul(Aee, T);
    HYPRE_ParCSRMatrixGetLocalRange((HYPRE_ParCSRMatrix) parcsr_mat,
                                    &first_local_row, &last_local_row,
                                    &first_local_col, &last_local_col);
 
-   size_ptr  = hypre_TAlloc(HYPRE_Int,    1, HYPRE_MEMORY_DEVICE);
-   big_i_ptr = hypre_TAlloc(HYPRE_BigInt, 1, HYPRE_MEMORY_DEVICE);
+   size_ptr  = hypre_TAlloc(HYPRE_Int,    1, memory_location);
+   big_i_ptr = hypre_TAlloc(HYPRE_BigInt, 1, memory_location);
 
-   for (big_i= first_local_row; big_i<= last_local_row; big_i++)
+   for (big_i = first_local_row; big_i <= last_local_row; big_i++)
    {
       HYPRE_ParCSRMatrixGetRow((HYPRE_ParCSRMatrix) parcsr_mat,
                                big_i, &size, &col_inds, &values);
@@ -334,13 +337,13 @@ hypre_MaxwellTV_Setup(void                 *maxwell_vdata,
 
    /* Ann's parscr matrix has not been formed yet-> fill up ij_matrix */
    hypre_ParCSRMatrixTranspose(T, &T_transpose, 1);
-   parcsr_mat= hypre_ParMatmul(T_transpose,
-                               (hypre_ParCSRMatrix *) hypre_IJMatrixObject(Aen));
+   parcsr_mat = hypre_ParMatmul(T_transpose,
+                                (hypre_ParCSRMatrix *) hypre_IJMatrixObject(Aen));
    HYPRE_ParCSRMatrixGetLocalRange((HYPRE_ParCSRMatrix) parcsr_mat,
                                    &first_local_row, &last_local_row,
                                    &first_local_col, &last_local_col);
 
-   for (big_i= first_local_row; big_i<= last_local_row; big_i++)
+   for (big_i = first_local_row; big_i <= last_local_row; big_i++)
    {
       HYPRE_ParCSRMatrixGetRow((HYPRE_ParCSRMatrix) parcsr_mat,
                                big_i, &size, &col_inds, &values);
@@ -358,29 +361,29 @@ hypre_MaxwellTV_Setup(void                 *maxwell_vdata,
    }
    hypre_ParCSRMatrixDestroy(parcsr_mat);
 
-   hypre_TFree(size_ptr,  HYPRE_MEMORY_DEVICE);
-   hypre_TFree(big_i_ptr, HYPRE_MEMORY_DEVICE);
+   hypre_TFree(size_ptr,  memory_location);
+   hypre_TFree(big_i_ptr, memory_location);
 
    /* set the physical boundary points to identity */
-   nrows= 0;
-   for (part= 0; part< nparts; part++)
+   nrows = 0;
+   for (part = 0; part < nparts; part++)
    {
       pgrid = hypre_SStructGridPGrid(node_grid, part);
       sgrid = hypre_SStructPGridSGrid(pgrid, 0);
-      nrows+= hypre_StructGridLocalSize(sgrid);
+      nrows += hypre_StructGridLocalSize(sgrid);
    }
 
    flag = hypre_CTAlloc(HYPRE_Int,  nrows, HYPRE_MEMORY_HOST);
-   flag2= hypre_CTAlloc(HYPRE_BigInt,  nrows, HYPRE_MEMORY_HOST);
-   for (i= 0; i< nrows; i++)
+   flag2 = hypre_CTAlloc(HYPRE_BigInt,  nrows, HYPRE_MEMORY_HOST);
+   for (i = 0; i < nrows; i++)
    {
-      flag[i]= 1;
+      flag[i] = 1;
    }
 
    /* Determine physical boundary points. Get the rank and set flag[rank]= rank.
       This will boundary point, i.e., ncols[rank]> 0 will flag a boundary point. */
-   start_rank= hypre_SStructGridStartRank(node_grid);
-   for (part= 0; part< nparts; part++)
+   start_rank = hypre_SStructGridStartRank(node_grid);
+   for (part = 0; part < nparts; part++)
    {
       pgrid   = hypre_SStructGridPGrid(node_grid, part);
       sgrid   = hypre_SStructPGridSGrid(pgrid, 0);
@@ -389,16 +392,16 @@ hypre_MaxwellTV_Setup(void                 *maxwell_vdata,
 
       hypre_ForBoxI(j, boxes)
       {
-         box= hypre_BoxArrayBox(boxes, j);
+         box = hypre_BoxArrayBox(boxes, j);
          hypre_BoxManGetEntry(node_boxman, myproc, j, &entry);
-         i= hypre_BoxVolume(box);
+         i = hypre_BoxVolume(box);
 
-         tmp_box_array= hypre_BoxArrayCreate(0, ndim);
+         tmp_box_array = hypre_BoxArrayCreate(0, ndim);
          ierr        += hypre_BoxBoundaryG(box, sgrid, tmp_box_array);
 
-         for (m= 0; m< hypre_BoxArraySize(tmp_box_array); m++)
+         for (m = 0; m < hypre_BoxArraySize(tmp_box_array); m++)
          {
-            box_piece= hypre_BoxArrayBox(tmp_box_array, m);
+            box_piece = hypre_BoxArrayBox(tmp_box_array, m);
             if (hypre_BoxVolume(box_piece) < i)
             {
                hypre_BoxGetSize(box_piece, loop_size);
@@ -412,8 +415,8 @@ hypre_MaxwellTV_Setup(void                 *maxwell_vdata,
 
                   hypre_SStructBoxManEntryGetGlobalRank(entry, index,
                                                         &rank, matrix_type);
-                  flag[(HYPRE_Int)(rank-start_rank)] = 0;
-                  flag2[(HYPRE_Int)(rank-start_rank)]= rank;
+                  flag[(HYPRE_Int)(rank - start_rank)] = 0;
+                  flag2[(HYPRE_Int)(rank - start_rank)] = rank;
                }
                hypre_SerialBoxLoop0End();
             }  /* if (hypre_BoxVolume(box_piece) < i) */
@@ -423,8 +426,8 @@ hypre_MaxwellTV_Setup(void                 *maxwell_vdata,
    }     /* for (part= 0; part< nparts; part++) */
 
    /* set up boundary identity */
-   j= 0;
-   for (i= 0; i< nrows; i++)
+   j = 0;
+   for (i = 0; i < nrows; i++)
    {
       if (!flag[i])
       {
@@ -432,19 +435,19 @@ hypre_MaxwellTV_Setup(void                 *maxwell_vdata,
       }
    }
 
-   inode= hypre_CTAlloc(HYPRE_BigInt, j, HYPRE_MEMORY_DEVICE);
-   ncols= hypre_CTAlloc(HYPRE_Int,    j, HYPRE_MEMORY_DEVICE);
-   jnode= hypre_CTAlloc(HYPRE_BigInt, j, HYPRE_MEMORY_DEVICE);
-   vals = hypre_TAlloc(HYPRE_Real,    j, HYPRE_MEMORY_DEVICE);
+   inode = hypre_CTAlloc(HYPRE_BigInt, j, memory_location);
+   ncols = hypre_CTAlloc(HYPRE_Int,    j, memory_location);
+   jnode = hypre_CTAlloc(HYPRE_BigInt, j, memory_location);
+   vals = hypre_TAlloc(HYPRE_Real,    j, memory_location);
 
-   j= 0;
-   for (i= 0; i< nrows; i++)
+   j = 0;
+   for (i = 0; i < nrows; i++)
    {
       if (!flag[i])
       {
-         ncols[j]= 1;
-         inode[j]= flag2[i];
-         jnode[j]= flag2[i];
+         ncols[j] = 1;
+         inode[j] = flag2[i];
+         jnode[j] = flag2[i];
          vals[j] = 1.0;
          j++;
       }
@@ -455,10 +458,10 @@ hypre_MaxwellTV_Setup(void                 *maxwell_vdata,
    HYPRE_IJMatrixSetValues(hypre_SStructMatrixIJMatrix(Ann),
                            j, ncols, (const HYPRE_BigInt*) inode,
                            (const HYPRE_BigInt*) jnode, (const HYPRE_Real*) vals);
-   hypre_TFree(ncols, HYPRE_MEMORY_DEVICE);
-   hypre_TFree(inode, HYPRE_MEMORY_DEVICE);
-   hypre_TFree(jnode, HYPRE_MEMORY_DEVICE);
-   hypre_TFree(vals,  HYPRE_MEMORY_DEVICE);
+   hypre_TFree(ncols, memory_location);
+   hypre_TFree(inode, memory_location);
+   hypre_TFree(jnode, memory_location);
+   hypre_TFree(vals,  memory_location);
 
    HYPRE_SStructMatrixAssemble(Ann);
 #if DEBUG
@@ -494,7 +497,7 @@ hypre_MaxwellTV_Setup(void                 *maxwell_vdata,
 
    /* create the multigrid components for the nodal matrix using amg. We need
       to extract the nodal mg components to form the system mg components. */
-   amg_vdata= (void *) hypre_BoomerAMGCreate();
+   amg_vdata = (void *) hypre_BoomerAMGCreate();
    hypre_BoomerAMGSetStrongThreshold(amg_vdata, 0.25);
    hypre_BoomerAMGSetup(amg_vdata,
                         hypre_SStructMatrixParCSRMatrix(Ann),
@@ -503,7 +506,7 @@ hypre_MaxwellTV_Setup(void                 *maxwell_vdata,
    {
       amg_data = (hypre_ParAMGData*) amg_vdata;
 
-      node_numlevels= hypre_ParAMGDataNumLevels(amg_data);
+      node_numlevels = hypre_ParAMGDataNumLevels(amg_data);
 
       Ann_l   = hypre_CTAlloc(hypre_ParCSRMatrix *,  node_numlevels, HYPRE_MEMORY_HOST);
       Pn_l    = hypre_CTAlloc(hypre_ParCSRMatrix *,  node_numlevels, HYPRE_MEMORY_HOST);
@@ -512,43 +515,43 @@ hypre_MaxwellTV_Setup(void                 *maxwell_vdata,
       xn_l    = hypre_CTAlloc(hypre_ParVector*,  node_numlevels, HYPRE_MEMORY_HOST);
       resn_l  = hypre_CTAlloc(hypre_ParVector*,  node_numlevels, HYPRE_MEMORY_HOST);
       en_l    = hypre_CTAlloc(hypre_ParVector*,  node_numlevels, HYPRE_MEMORY_HOST);
-      nVtemp_l= hypre_CTAlloc(hypre_ParVector*,  node_numlevels, HYPRE_MEMORY_HOST);
-      nVtemp2_l= hypre_CTAlloc(hypre_ParVector*,  node_numlevels, HYPRE_MEMORY_HOST);
+      nVtemp_l = hypre_CTAlloc(hypre_ParVector*,  node_numlevels, HYPRE_MEMORY_HOST);
+      nVtemp2_l = hypre_CTAlloc(hypre_ParVector*,  node_numlevels, HYPRE_MEMORY_HOST);
 
       /* relaxation parameters */
       nCF_marker_l = hypre_CTAlloc(HYPRE_Int *,  node_numlevels, HYPRE_MEMORY_HOST);
-      nrelax_weight= hypre_CTAlloc(HYPRE_Real ,  node_numlevels, HYPRE_MEMORY_HOST);
-      nomega       = hypre_CTAlloc(HYPRE_Real ,  node_numlevels, HYPRE_MEMORY_HOST);
+      nrelax_weight = hypre_CTAlloc(HYPRE_Real,  node_numlevels, HYPRE_MEMORY_HOST);
+      nomega       = hypre_CTAlloc(HYPRE_Real,  node_numlevels, HYPRE_MEMORY_HOST);
       nrelax_type  = 6;  /* fast parallel hybrid */
 
-      for (i= 0; i< node_numlevels; i++)
+      for (i = 0; i < node_numlevels; i++)
       {
-         Ann_l[i]= (hypre_ParAMGDataAArray(amg_data))[i];
+         Ann_l[i] = (hypre_ParAMGDataAArray(amg_data))[i];
          Pn_l[i] = hypre_ParAMGDataPArray(amg_data)[i];
-         RnT_l[i]= hypre_ParAMGDataRArray(amg_data)[i];
+         RnT_l[i] = hypre_ParAMGDataRArray(amg_data)[i];
 
          bn_l[i] = hypre_ParAMGDataFArray(amg_data)[i];
          xn_l[i] = hypre_ParAMGDataUArray(amg_data)[i];
 
          /* create temporary vectors */
-         resn_l[i]= hypre_ParVectorCreate(hypre_ParCSRMatrixComm(Ann_l[i]),
-                                          hypre_ParCSRMatrixGlobalNumRows(Ann_l[i]),
-                                          hypre_ParCSRMatrixRowStarts(Ann_l[i]));
+         resn_l[i] = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(Ann_l[i]),
+                                           hypre_ParCSRMatrixGlobalNumRows(Ann_l[i]),
+                                           hypre_ParCSRMatrixRowStarts(Ann_l[i]));
          hypre_ParVectorInitialize(resn_l[i]);
 
-         en_l[i]= hypre_ParVectorCreate(hypre_ParCSRMatrixComm(Ann_l[i]),
-                                        hypre_ParCSRMatrixGlobalNumRows(Ann_l[i]),
-                                        hypre_ParCSRMatrixRowStarts(Ann_l[i]));
+         en_l[i] = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(Ann_l[i]),
+                                         hypre_ParCSRMatrixGlobalNumRows(Ann_l[i]),
+                                         hypre_ParCSRMatrixRowStarts(Ann_l[i]));
          hypre_ParVectorInitialize(en_l[i]);
 
-         nVtemp_l[i]= hypre_ParVectorCreate(hypre_ParCSRMatrixComm(Ann_l[i]),
-                                            hypre_ParCSRMatrixGlobalNumRows(Ann_l[i]),
-                                            hypre_ParCSRMatrixRowStarts(Ann_l[i]));
-         hypre_ParVectorInitialize(nVtemp_l[i]);
-
-         nVtemp2_l[i]= hypre_ParVectorCreate(hypre_ParCSRMatrixComm(Ann_l[i]),
+         nVtemp_l[i] = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(Ann_l[i]),
                                              hypre_ParCSRMatrixGlobalNumRows(Ann_l[i]),
                                              hypre_ParCSRMatrixRowStarts(Ann_l[i]));
+         hypre_ParVectorInitialize(nVtemp_l[i]);
+
+         nVtemp2_l[i] = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(Ann_l[i]),
+                                              hypre_ParCSRMatrixGlobalNumRows(Ann_l[i]),
+                                              hypre_ParCSRMatrixRowStarts(Ann_l[i]));
          hypre_ParVectorInitialize(nVtemp2_l[i]);
 
          if (hypre_ParAMGDataCFMarkerArray(amg_data)[i])
@@ -559,7 +562,7 @@ hypre_MaxwellTV_Setup(void                 *maxwell_vdata,
          {
             nCF_marker_l[i] = NULL;
          }
-         nrelax_weight[i]= hypre_ParAMGDataRelaxWeight(amg_data)[i];
+         nrelax_weight[i] = hypre_ParAMGDataRelaxWeight(amg_data)[i];
          nomega[i]       = hypre_ParAMGDataOmega(amg_data)[i];
       }
    }
@@ -590,35 +593,35 @@ hypre_MaxwellTV_Setup(void                 *maxwell_vdata,
     * scheme to semi-coarsen. That is, coarsen wrt to rfactor, with
     * rfactor[i] > 1 for i < ndim.
     * Determine the number of levels for the edge problem */
-   cboxes= hypre_BoxArrayCreate(0, ndim);
-   coarsen= hypre_CTAlloc(HYPRE_Int,  nparts, HYPRE_MEMORY_HOST);
-   edge_maxlevels= 0;
-   for (part= 0; part< nparts; part++)
+   cboxes = hypre_BoxArrayCreate(0, ndim);
+   coarsen = hypre_CTAlloc(HYPRE_Int,  nparts, HYPRE_MEMORY_HOST);
+   edge_maxlevels = 0;
+   for (part = 0; part < nparts; part++)
    {
-      pgrid= hypre_SStructGridPGrid(grid, part);
-      sgrid= hypre_SStructPGridCellSGrid(pgrid);
+      pgrid = hypre_SStructGridPGrid(grid, part);
+      sgrid = hypre_SStructPGridCellSGrid(pgrid);
 
-      box= hypre_BoxDuplicate(hypre_StructGridBoundingBox(sgrid));
+      box = hypre_BoxDuplicate(hypre_StructGridBoundingBox(sgrid));
       hypre_AppendBox(box, cboxes);
       /* since rfactor[i]>1, the following i will be an upper bound of
          the number of levels. */
       i  = hypre_Log2(hypre_BoxSizeD(box, 0)) + 2 +
-         hypre_Log2(hypre_BoxSizeD(box, 1)) + 2 +
-         hypre_Log2(hypre_BoxSizeD(box, 2)) + 2;
+           hypre_Log2(hypre_BoxSizeD(box, 1)) + 2 +
+           hypre_Log2(hypre_BoxSizeD(box, 2)) + 2;
 
       hypre_BoxDestroy(box);
       /* the following allows some of the parts to have volume zero grids */
-      edge_maxlevels= hypre_max(edge_maxlevels, i);
+      edge_maxlevels = hypre_max(edge_maxlevels, i);
       coarsen[part] = trueV;
    }
 
    if ((maxwell_TV_data-> edge_maxlevels) > 0)
    {
-      edge_maxlevels= hypre_min(edge_maxlevels,
-                                (maxwell_TV_data -> edge_maxlevels));
+      edge_maxlevels = hypre_min(edge_maxlevels,
+                                 (maxwell_TV_data -> edge_maxlevels));
    }
 
-   (maxwell_TV_data -> edge_maxlevels)= edge_maxlevels;
+   (maxwell_TV_data -> edge_maxlevels) = edge_maxlevels;
 
    /* form the edge grids: coarsen the cell grid on each part and then
       set the boxes of these grids to be the boxes of the sstruct_grid. */
@@ -628,37 +631,37 @@ hypre_MaxwellTV_Setup(void                 *maxwell_vdata,
    /* form the topological grids for the topological matrices. */
 
    /* Assuming same variable ordering on all parts */
-   pgrid= hypre_SStructGridPGrid(grid, 0);
+   pgrid = hypre_SStructGridPGrid(grid, 0);
 
    HYPRE_SStructGridCreate(comm, ndim, nparts, &edge_grid);
-   vartype_edges= hypre_CTAlloc(HYPRE_SStructVariable,  ndim, HYPRE_MEMORY_HOST);
+   vartype_edges = hypre_CTAlloc(HYPRE_SStructVariable,  ndim, HYPRE_MEMORY_HOST);
    if (ndim > 2)
    {
       HYPRE_SStructGridCreate(comm, ndim, nparts, &face_grid);
-      vartype_faces= hypre_CTAlloc(HYPRE_SStructVariable,  ndim, HYPRE_MEMORY_HOST);
-      for (i= 0; i< 3; i++)
+      vartype_faces = hypre_CTAlloc(HYPRE_SStructVariable,  ndim, HYPRE_MEMORY_HOST);
+      for (i = 0; i < 3; i++)
       {
-         vartype_edges[2]= hypre_SStructPGridVarType(pgrid, i);
-         j= vartype_edges[2];
+         vartype_edges[2] = hypre_SStructPGridVarType(pgrid, i);
+         j = vartype_edges[2];
 
-         switch(j)
+         switch (j)
          {
             case 5:
             {
-               vartype_edges[i]= HYPRE_SSTRUCT_VARIABLE_XEDGE;
-               vartype_faces[i]= HYPRE_SSTRUCT_VARIABLE_XFACE;
+               vartype_edges[i] = HYPRE_SSTRUCT_VARIABLE_XEDGE;
+               vartype_faces[i] = HYPRE_SSTRUCT_VARIABLE_XFACE;
                break;
             }
             case 6:
             {
-               vartype_edges[i]= HYPRE_SSTRUCT_VARIABLE_YEDGE;
-               vartype_faces[i]= HYPRE_SSTRUCT_VARIABLE_YFACE;
+               vartype_edges[i] = HYPRE_SSTRUCT_VARIABLE_YEDGE;
+               vartype_faces[i] = HYPRE_SSTRUCT_VARIABLE_YFACE;
                break;
             }
             case 7:
             {
-               vartype_edges[i]= HYPRE_SSTRUCT_VARIABLE_ZEDGE;
-               vartype_faces[i]= HYPRE_SSTRUCT_VARIABLE_ZFACE;
+               vartype_edges[i] = HYPRE_SSTRUCT_VARIABLE_ZEDGE;
+               vartype_faces[i] = HYPRE_SSTRUCT_VARIABLE_ZFACE;
                break;
             }
 
@@ -667,21 +670,21 @@ hypre_MaxwellTV_Setup(void                 *maxwell_vdata,
    }
    else
    {
-      for (i= 0; i< 2; i++)
+      for (i = 0; i < 2; i++)
       {
-         vartype_edges[1]= hypre_SStructPGridVarType(pgrid, i);
-         j= vartype_edges[1];
+         vartype_edges[1] = hypre_SStructPGridVarType(pgrid, i);
+         j = vartype_edges[1];
 
-         switch(j)
+         switch (j)
          {
             case 2:
             {
-               vartype_edges[i]= HYPRE_SSTRUCT_VARIABLE_XFACE;
+               vartype_edges[i] = HYPRE_SSTRUCT_VARIABLE_XFACE;
                break;
             }
             case 3:
             {
-               vartype_edges[i]= HYPRE_SSTRUCT_VARIABLE_YFACE;
+               vartype_edges[i] = HYPRE_SSTRUCT_VARIABLE_YFACE;
                break;
             }
          }  /* switch(j) */
@@ -689,18 +692,18 @@ hypre_MaxwellTV_Setup(void                 *maxwell_vdata,
    }
 
    HYPRE_SStructGridCreate(comm, ndim, nparts, &cell_grid);
-   vartype_cell= hypre_CTAlloc(HYPRE_SStructVariable,  1, HYPRE_MEMORY_HOST);
-   vartype_cell[0]= HYPRE_SSTRUCT_VARIABLE_CELL;
+   vartype_cell = hypre_CTAlloc(HYPRE_SStructVariable,  1, HYPRE_MEMORY_HOST);
+   vartype_cell[0] = HYPRE_SSTRUCT_VARIABLE_CELL;
 
-   for (i= 0; i< nparts; i++)
+   for (i = 0; i < nparts; i++)
    {
-      pgrid= hypre_SStructPMatrixPGrid(hypre_SStructMatrixPMatrix(Aee_in, i));
-      sgrid= hypre_SStructPGridCellSGrid(pgrid);
+      pgrid = hypre_SStructPMatrixPGrid(hypre_SStructMatrixPMatrix(Aee_in, i));
+      sgrid = hypre_SStructPGridCellSGrid(pgrid);
 
-      boxes= hypre_StructGridBoxes(sgrid);
+      boxes = hypre_StructGridBoxes(sgrid);
       hypre_ForBoxI(j, boxes)
       {
-         box= hypre_BoxArrayBox(boxes, j);
+         box = hypre_BoxArrayBox(boxes, j);
          HYPRE_SStructGridSetExtents(edge_grid, i,
                                      hypre_BoxIMin(box), hypre_BoxIMax(box));
          HYPRE_SStructGridSetExtents(cell_grid, i,
@@ -722,17 +725,17 @@ hypre_MaxwellTV_Setup(void                 *maxwell_vdata,
 
    HYPRE_SStructGridAssemble(edge_grid);
    topological_edge   = hypre_TAlloc(hypre_SStructGrid *,  edge_maxlevels, HYPRE_MEMORY_HOST);
-   topological_edge[0]= edge_grid;
+   topological_edge[0] = edge_grid;
 
    HYPRE_SStructGridAssemble(cell_grid);
    topological_cell   = hypre_TAlloc(hypre_SStructGrid *,  edge_maxlevels, HYPRE_MEMORY_HOST);
-   topological_cell[0]= cell_grid;
+   topological_cell[0] = cell_grid;
 
    if (ndim > 2)
    {
       HYPRE_SStructGridAssemble(face_grid);
-      topological_face= hypre_TAlloc(hypre_SStructGrid *,  edge_maxlevels, HYPRE_MEMORY_HOST);
-      topological_face[0]= face_grid;
+      topological_face = hypre_TAlloc(hypre_SStructGrid *,  edge_maxlevels, HYPRE_MEMORY_HOST);
+      topological_face[0] = face_grid;
    }
 
    /*--------------------------------------------------------------------------
@@ -741,44 +744,44 @@ hypre_MaxwellTV_Setup(void                 *maxwell_vdata,
     * replaced by the generated coarse egrid cell bounding boxes.
     *--------------------------------------------------------------------------*/
    hypre_SetIndex3(cindex, 0, 0, 0);
-   j= 0; /* j tracks the number of parts that have been coarsened away */
-   edge_numlevels= 1;
+   j = 0; /* j tracks the number of parts that have been coarsened away */
+   edge_numlevels = 1;
 
-   for (l= 0; ; l++)
+   for (l = 0; ; l++)
    {
-      HYPRE_SStructGridCreate(comm, ndim, nparts, &egrid_l[l+1]);
-      HYPRE_SStructGridCreate(comm, ndim, nparts, &topological_edge[l+1]);
-      HYPRE_SStructGridCreate(comm, ndim, nparts, &topological_cell[l+1]);
+      HYPRE_SStructGridCreate(comm, ndim, nparts, &egrid_l[l + 1]);
+      HYPRE_SStructGridCreate(comm, ndim, nparts, &topological_edge[l + 1]);
+      HYPRE_SStructGridCreate(comm, ndim, nparts, &topological_cell[l + 1]);
       if (ndim > 2)
       {
-         HYPRE_SStructGridCreate(comm, ndim, nparts, &topological_face[l+1]);
+         HYPRE_SStructGridCreate(comm, ndim, nparts, &topological_face[l + 1]);
       }
 
       /* coarsen the non-zero bounding boxes only if we have some. */
-      nboxes= 0;
+      nboxes = 0;
       if (j < nparts)
       {
-         for (part= 0; part< nparts; part++)
+         for (part = 0; part < nparts; part++)
          {
-            pgrid= hypre_SStructGridPGrid(egrid_l[l], part);
-            sgrid= hypre_SStructPGridCellSGrid(pgrid);
+            pgrid = hypre_SStructGridPGrid(egrid_l[l], part);
+            sgrid = hypre_SStructPGridCellSGrid(pgrid);
 
             if (coarsen[part])
             {
-               box= hypre_BoxArrayBox(cboxes, part);
-               m= trueV;
-               for (i= 0; i< ndim; i++)
+               box = hypre_BoxArrayBox(cboxes, part);
+               m = trueV;
+               for (i = 0; i < ndim; i++)
                {
                   if ( hypre_BoxIMaxD(box, i) < hypre_BoxIMinD(box, i) )
                   {
-                     m= falseV;
+                     m = falseV;
                      break;
                   }
                }
 
                if (m)
                {
-/*   MAY NEED TO CHECK THE FOLLOWING MORE CAREFULLY: */
+                  /*   MAY NEED TO CHECK THE FOLLOWING MORE CAREFULLY: */
                   /* should we decrease this bounding box so that we get the
                      correct coarse bounding box? Recall that we will decrease
                      each box of the cell_grid so that exact rfactor divisibility
@@ -788,7 +791,7 @@ hypre_MaxwellTV_Setup(void                 *maxwell_vdata,
                      ending indices that are divisible by rfactor. Then an extra
                      coarse grid layer is given by project. */
 
-                  contract_box= hypre_BoxContraction(box, sgrid, rfactor);
+                  contract_box = hypre_BoxContraction(box, sgrid, rfactor);
                   hypre_CopyBox(contract_box, box);
                   hypre_BoxDestroy(contract_box);
 
@@ -801,39 +804,39 @@ hypre_MaxwellTV_Setup(void                 *maxwell_vdata,
                   /* build the coarse edge grids. Only fill up box extents.
                      The boxes of the grid may be contracted. Note that the
                      box projection may not perform the contraction. */
-                  k= 0;
+                  k = 0;
                   hypre_CoarsenPGrid(egrid_l[l], cindex, rfactor, part,
-                                     egrid_l[l+1], &k);
+                                     egrid_l[l + 1], &k);
 
                   /* build the topological grids */
                   hypre_CoarsenPGrid(topological_edge[l], cindex, rfactor, part,
-                                     topological_edge[l+1], &i);
+                                     topological_edge[l + 1], &i);
                   hypre_CoarsenPGrid(topological_cell[l], cindex, rfactor, part,
-                                     topological_cell[l+1], &i);
+                                     topological_cell[l + 1], &i);
                   if (ndim > 2)
                   {
                      hypre_CoarsenPGrid(topological_face[l], cindex, rfactor,
-                                        part, topological_face[l+1], &i);
+                                        part, topological_face[l + 1], &i);
                   }
-                  nboxes+= k;
+                  nboxes += k;
                }
                else
                {
                   /* record empty, coarsened-away part */
-                  coarsen[part]= falseV;
+                  coarsen[part] = falseV;
                   /* set up a dummy box so this grid can be destroyed */
-                  HYPRE_SStructGridSetExtents(egrid_l[l+1], part,
+                  HYPRE_SStructGridSetExtents(egrid_l[l + 1], part,
                                               hypre_BoxIMin(box), hypre_BoxIMin(box));
 
-                  HYPRE_SStructGridSetExtents(topological_edge[l+1], part,
+                  HYPRE_SStructGridSetExtents(topological_edge[l + 1], part,
                                               hypre_BoxIMin(box), hypre_BoxIMin(box));
 
-                  HYPRE_SStructGridSetExtents(topological_cell[l+1], part,
+                  HYPRE_SStructGridSetExtents(topological_cell[l + 1], part,
                                               hypre_BoxIMin(box), hypre_BoxIMin(box));
 
                   if (ndim > 2)
                   {
-                     HYPRE_SStructGridSetExtents(topological_face[l+1], part,
+                     HYPRE_SStructGridSetExtents(topological_face[l + 1], part,
                                                  hypre_BoxIMin(box), hypre_BoxIMin(box));
                   }
                   j++;
@@ -841,34 +844,34 @@ hypre_MaxwellTV_Setup(void                 *maxwell_vdata,
 
             }  /* if (coarsen[part]) */
 
-            vartypes= hypre_SStructPGridVarTypes(
-               hypre_SStructGridPGrid(egrid_l[l], part));
-            HYPRE_SStructGridSetVariables(egrid_l[l+1], part, ndim,
+            vartypes = hypre_SStructPGridVarTypes(
+                          hypre_SStructGridPGrid(egrid_l[l], part));
+            HYPRE_SStructGridSetVariables(egrid_l[l + 1], part, ndim,
                                           vartypes);
 
-            HYPRE_SStructGridSetVariables(topological_edge[l+1], part, ndim,
+            HYPRE_SStructGridSetVariables(topological_edge[l + 1], part, ndim,
                                           vartype_edges);
-            HYPRE_SStructGridSetVariables(topological_cell[l+1], part, 1,
+            HYPRE_SStructGridSetVariables(topological_cell[l + 1], part, 1,
                                           vartype_cell);
             if (ndim > 2)
             {
-               HYPRE_SStructGridSetVariables(topological_face[l+1], part, ndim,
+               HYPRE_SStructGridSetVariables(topological_face[l + 1], part, ndim,
                                              vartype_faces);
             }
          }  /* for (part= 0; part< nparts; part++) */
       }     /* if (j < nparts) */
 
-      HYPRE_SStructGridAssemble(egrid_l[l+1]);
-      HYPRE_SStructGridAssemble(topological_edge[l+1]);
-      HYPRE_SStructGridAssemble(topological_cell[l+1]);
+      HYPRE_SStructGridAssemble(egrid_l[l + 1]);
+      HYPRE_SStructGridAssemble(topological_edge[l + 1]);
+      HYPRE_SStructGridAssemble(topological_cell[l + 1]);
       if (ndim > 2)
       {
-         HYPRE_SStructGridAssemble(topological_face[l+1]);
+         HYPRE_SStructGridAssemble(topological_face[l + 1]);
       }
 
-      lev_nboxes= 0;
+      lev_nboxes = 0;
       hypre_MPI_Allreduce(&nboxes, &lev_nboxes, 1, HYPRE_MPI_INT, hypre_MPI_SUM,
-                          hypre_SStructGridComm(egrid_l[l+1]));
+                          hypre_SStructGridComm(egrid_l[l + 1]));
 
       if (lev_nboxes)  /* there were coarsen boxes */
       {
@@ -879,21 +882,21 @@ hypre_MaxwellTV_Setup(void                 *maxwell_vdata,
       {
          /* no coarse boxes. Trigger coarsening completed and destroy the
             cgrids corresponding to this level. */
-         j= nparts;
+         j = nparts;
       }
 
       /* extract the cell bounding boxes */
       if (j < nparts)
       {
-         for (part= 0; part< nparts; part++)
+         for (part = 0; part < nparts; part++)
          {
             if (coarsen[part])
             {
-               pgrid= hypre_SStructGridPGrid(egrid_l[l+1], part);
-               sgrid= hypre_SStructPGridCellSGrid(pgrid);
+               pgrid = hypre_SStructGridPGrid(egrid_l[l + 1], part);
+               sgrid = hypre_SStructPGridCellSGrid(pgrid);
 
-               box= hypre_BoxDuplicate(hypre_StructGridBoundingBox(sgrid));
-               hypre_CopyBox(box, hypre_BoxArrayBox(cboxes,part));
+               box = hypre_BoxDuplicate(hypre_StructGridBoundingBox(sgrid));
+               hypre_CopyBox(box, hypre_BoxArrayBox(cboxes, part));
                hypre_BoxDestroy(box);
             }
          }
@@ -901,23 +904,23 @@ hypre_MaxwellTV_Setup(void                 *maxwell_vdata,
 
       else
       {
-         HYPRE_SStructGridDestroy(egrid_l[l+1]);
-         HYPRE_SStructGridDestroy(topological_edge[l+1]);
-         HYPRE_SStructGridDestroy(topological_cell[l+1]);
+         HYPRE_SStructGridDestroy(egrid_l[l + 1]);
+         HYPRE_SStructGridDestroy(topological_edge[l + 1]);
+         HYPRE_SStructGridDestroy(topological_cell[l + 1]);
          if (ndim > 2)
          {
-            HYPRE_SStructGridDestroy(topological_face[l+1]);
+            HYPRE_SStructGridDestroy(topological_face[l + 1]);
          }
          break;
       }
    }
-   (maxwell_TV_data -> egrid_l)= egrid_l;
+   (maxwell_TV_data -> egrid_l) = egrid_l;
 
    hypre_Maxwell_PhysBdy(egrid_l, edge_numlevels, rfactor,
                          &BdryRanks_l, &BdryRanksCnts_l);
 
    (maxwell_TV_data -> BdryRanks_l)    = BdryRanks_l;
-   (maxwell_TV_data -> BdryRanksCnts_l)= BdryRanksCnts_l;
+   (maxwell_TV_data -> BdryRanksCnts_l) = BdryRanksCnts_l;
 
    hypre_BoxArrayDestroy(cboxes);
    hypre_TFree(coarsen, HYPRE_MEMORY_HOST);
@@ -931,50 +934,50 @@ hypre_MaxwellTV_Setup(void                 *maxwell_vdata,
 
 
    /* Aen matrices are defined for min(edge_numlevels, node_numlevels). */
-   en_numlevels= hypre_min(edge_numlevels, node_numlevels);
+   en_numlevels = hypre_min(edge_numlevels, node_numlevels);
    (maxwell_TV_data -> en_numlevels)  = en_numlevels;
-   (maxwell_TV_data -> edge_numlevels)= edge_numlevels;
+   (maxwell_TV_data -> edge_numlevels) = edge_numlevels;
 
-   Aee_l= hypre_TAlloc(hypre_ParCSRMatrix *,  edge_numlevels, HYPRE_MEMORY_HOST);
-   Aen_l= hypre_TAlloc(hypre_ParCSRMatrix *,  en_numlevels, HYPRE_MEMORY_HOST);
+   Aee_l = hypre_TAlloc(hypre_ParCSRMatrix *,  edge_numlevels, HYPRE_MEMORY_HOST);
+   Aen_l = hypre_TAlloc(hypre_ParCSRMatrix *,  en_numlevels, HYPRE_MEMORY_HOST);
 
    /* Pe_l are defined to be IJ matrices rather than directly parcsr. This
       was done so that in the topological formation, some of the ij matrix
       routines can be used. */
-   Pe_l    = hypre_TAlloc(hypre_IJMatrix  *,  edge_numlevels-1, HYPRE_MEMORY_HOST);
-   ReT_l   = hypre_TAlloc(hypre_IJMatrix  *,  edge_numlevels-1, HYPRE_MEMORY_HOST);
+   Pe_l    = hypre_TAlloc(hypre_IJMatrix  *,  edge_numlevels - 1, HYPRE_MEMORY_HOST);
+   ReT_l   = hypre_TAlloc(hypre_IJMatrix  *,  edge_numlevels - 1, HYPRE_MEMORY_HOST);
 
    be_l    = hypre_TAlloc(hypre_ParVector *,  edge_numlevels, HYPRE_MEMORY_HOST);
    xe_l    = hypre_TAlloc(hypre_ParVector *,  edge_numlevels, HYPRE_MEMORY_HOST);
    rese_l  = hypre_TAlloc(hypre_ParVector *,  edge_numlevels, HYPRE_MEMORY_HOST);
    ee_l    = hypre_TAlloc(hypre_ParVector *,  edge_numlevels, HYPRE_MEMORY_HOST);
-   eVtemp_l= hypre_TAlloc(hypre_ParVector *,  edge_numlevels, HYPRE_MEMORY_HOST);
-   eVtemp2_l= hypre_TAlloc(hypre_ParVector *,  edge_numlevels, HYPRE_MEMORY_HOST);
+   eVtemp_l = hypre_TAlloc(hypre_ParVector *,  edge_numlevels, HYPRE_MEMORY_HOST);
+   eVtemp2_l = hypre_TAlloc(hypre_ParVector *,  edge_numlevels, HYPRE_MEMORY_HOST);
 
-   Aee_l[0]= hypre_SStructMatrixParCSRMatrix(Aee_in);
-   Aen_l[0]=(hypre_ParCSRMatrix *) hypre_IJMatrixObject(Aen),
-      be_l[0] = hypre_SStructVectorParVector(b_in);
+   Aee_l[0] = hypre_SStructMatrixParCSRMatrix(Aee_in);
+   Aen_l[0] = (hypre_ParCSRMatrix *) hypre_IJMatrixObject(Aen),
+              be_l[0] = hypre_SStructVectorParVector(b_in);
    xe_l[0] = hypre_SStructVectorParVector(x_in);
 
-   rese_l[0]=
+   rese_l[0] =
       hypre_ParVectorCreate(hypre_ParCSRMatrixComm(Aee_l[0]),
                             hypre_ParCSRMatrixGlobalNumRows(Aee_l[0]),
                             hypre_ParCSRMatrixRowStarts(Aee_l[0]));
    hypre_ParVectorInitialize(rese_l[0]);
 
-   ee_l[0]=
+   ee_l[0] =
       hypre_ParVectorCreate(hypre_ParCSRMatrixComm(Aee_l[0]),
                             hypre_ParCSRMatrixGlobalNumRows(Aee_l[0]),
                             hypre_ParCSRMatrixRowStarts(Aee_l[0]));
    hypre_ParVectorInitialize(ee_l[0]);
 
-   eVtemp_l[0]=
+   eVtemp_l[0] =
       hypre_ParVectorCreate(hypre_ParCSRMatrixComm(Aee_l[0]),
                             hypre_ParCSRMatrixGlobalNumRows(Aee_l[0]),
                             hypre_ParCSRMatrixRowStarts(Aee_l[0]));
    hypre_ParVectorInitialize(eVtemp_l[0]);
 
-   eVtemp2_l[0]=
+   eVtemp2_l[0] =
       hypre_ParVectorCreate(hypre_ParCSRMatrixComm(Aee_l[0]),
                             hypre_ParCSRMatrixGlobalNumRows(Aee_l[0]),
                             hypre_ParCSRMatrixRowStarts(Aee_l[0]));
@@ -992,31 +995,31 @@ hypre_MaxwellTV_Setup(void                 *maxwell_vdata,
             hypre_CreatePTopology(&PTopology_vdata);
             if (ndim > 2)
             {
-               Pe_l[l]= hypre_Maxwell_PTopology(topological_edge[l],
-                                                topological_edge[l+1],
-                                                topological_face[l],
-                                                topological_face[l+1],
-                                                topological_cell[l],
-                                                topological_cell[l+1],
-                                                Aee_l[l],
-                                                rfactor,
-                                                PTopology_vdata);
+               Pe_l[l] = hypre_Maxwell_PTopology(topological_edge[l],
+                                                 topological_edge[l + 1],
+                                                 topological_face[l],
+                                                 topological_face[l + 1],
+                                                 topological_cell[l],
+                                                 topological_cell[l + 1],
+                                                 Aee_l[l],
+                                                 rfactor,
+                                                 PTopology_vdata);
             }
             else
             {
                /* two-dim case: edges= faces but stored in edge grid */
-               Pe_l[l]= hypre_Maxwell_PTopology(topological_edge[l],
-                                                topological_edge[l+1],
-                                                topological_edge[l],
-                                                topological_edge[l+1],
-                                                topological_cell[l],
-                                                topological_cell[l+1],
-                                                Aee_l[l],
-                                                rfactor,
-                                                PTopology_vdata);
+               Pe_l[l] = hypre_Maxwell_PTopology(topological_edge[l],
+                                                 topological_edge[l + 1],
+                                                 topological_edge[l],
+                                                 topological_edge[l + 1],
+                                                 topological_cell[l],
+                                                 topological_cell[l + 1],
+                                                 Aee_l[l],
+                                                 rfactor,
+                                                 PTopology_vdata);
             }
 
-            PTopology= (hypre_PTopology*)PTopology_vdata;
+            PTopology = (hypre_PTopology*)PTopology_vdata;
 
             /* extract off-processors rows of Pe_l[l]. Needed for amge.*/
             hypre_SStructSharedDOF_ParcsrMatRowsComm(egrid_l[l],
@@ -1051,7 +1054,7 @@ hypre_MaxwellTV_Setup(void                 *maxwell_vdata,
 
             hypre_DestroyPTopology(PTopology_vdata);
 
-            for (i= 0; i< num_OffProcRows; i++)
+            for (i = 0; i < num_OffProcRows; i++)
             {
                hypre_MaxwellOffProcRowDestroy((void *) OffProcRows[i]);
             }
@@ -1060,75 +1063,75 @@ hypre_MaxwellTV_Setup(void                 *maxwell_vdata,
 
          else
          {
-            Pe_l[l]= hypre_Maxwell_PNedelec(topological_edge[l],
-                                            topological_edge[l+1],
-                                            rfactor);
+            Pe_l[l] = hypre_Maxwell_PNedelec(topological_edge[l],
+                                             topological_edge[l + 1],
+                                             rfactor);
          }
 #if DEBUG
 #endif
 
 
-         ReT_l[l]= Pe_l[l];
+         ReT_l[l] = Pe_l[l];
          hypre_BoomerAMGBuildCoarseOperator(
             (hypre_ParCSRMatrix *) hypre_IJMatrixObject(Pe_l[l]),
             Aee_l[l],
             (hypre_ParCSRMatrix *) hypre_IJMatrixObject(Pe_l[l]),
-            &Aee_l[l+1]);
+            &Aee_l[l + 1]);
 
          /* zero off boundary points */
-         hypre_ParCSRMatrixEliminateRowsCols(Aee_l[l+1],
-                                             BdryRanksCnts_l[l+1],
-                                             BdryRanks_l[l+1]);
+         hypre_ParCSRMatrixEliminateRowsCols(Aee_l[l + 1],
+                                             BdryRanksCnts_l[l + 1],
+                                             BdryRanks_l[l + 1]);
 
          hypre_ParCSRMatrixTranspose(
             (hypre_ParCSRMatrix *) hypre_IJMatrixObject(Pe_l[l]),
             &transpose, 1);
-         parcsr_mat= hypre_ParMatmul(transpose, Aen_l[l]);
-         Aen_l[l+1]= hypre_ParMatmul(parcsr_mat, Pn_l[l]);
+         parcsr_mat = hypre_ParMatmul(transpose, Aen_l[l]);
+         Aen_l[l + 1] = hypre_ParMatmul(parcsr_mat, Pn_l[l]);
          hypre_ParCSRMatrixDestroy(parcsr_mat);
          hypre_ParCSRMatrixDestroy(transpose);
 
-         xe_l[l+1] =
-            hypre_ParVectorCreate(hypre_ParCSRMatrixComm(Aee_l[l+1]),
-                                  hypre_ParCSRMatrixGlobalNumRows(Aee_l[l+1]),
-                                  hypre_ParCSRMatrixRowStarts(Aee_l[l+1]));
-         hypre_ParVectorInitialize(xe_l[l+1]);
-
-         be_l[l+1] =
-            hypre_ParVectorCreate(hypre_ParCSRMatrixComm(Aee_l[l+1]),
-                                  hypre_ParCSRMatrixGlobalNumRows(Aee_l[l+1]),
-                                  hypre_ParCSRMatrixRowStarts(Aee_l[l+1]));
-         hypre_ParVectorInitialize(be_l[l+1]);
-
-         rese_l[l+1] =
-            hypre_ParVectorCreate(hypre_ParCSRMatrixComm(Aee_l[l+1]),
-                                  hypre_ParCSRMatrixGlobalNumRows(Aee_l[l+1]),
-                                  hypre_ParCSRMatrixRowStarts(Aee_l[l+1]));
-         hypre_ParVectorInitialize(rese_l[l+1]);
-
-         ee_l[l+1] =
-            hypre_ParVectorCreate(hypre_ParCSRMatrixComm(Aee_l[l+1]),
-                                  hypre_ParCSRMatrixGlobalNumRows(Aee_l[l+1]),
-                                  hypre_ParCSRMatrixRowStarts(Aee_l[l+1]));
-         hypre_ParVectorInitialize(ee_l[l+1]);
-
-         eVtemp_l[l+1] =
-            hypre_ParVectorCreate(hypre_ParCSRMatrixComm(Aee_l[l+1]),
-                                  hypre_ParCSRMatrixGlobalNumRows(Aee_l[l+1]),
-                                  hypre_ParCSRMatrixRowStarts(Aee_l[l+1]));
-         hypre_ParVectorInitialize(eVtemp_l[l+1]);
-
-         eVtemp2_l[l+1] =
-            hypre_ParVectorCreate(hypre_ParCSRMatrixComm(Aee_l[l+1]),
-                                  hypre_ParCSRMatrixGlobalNumRows(Aee_l[l+1]),
-                                  hypre_ParCSRMatrixRowStarts(Aee_l[l+1]));
-         hypre_ParVectorInitialize(eVtemp2_l[l+1]);
+         xe_l[l + 1] =
+            hypre_ParVectorCreate(hypre_ParCSRMatrixComm(Aee_l[l + 1]),
+                                  hypre_ParCSRMatrixGlobalNumRows(Aee_l[l + 1]),
+                                  hypre_ParCSRMatrixRowStarts(Aee_l[l + 1]));
+         hypre_ParVectorInitialize(xe_l[l + 1]);
+
+         be_l[l + 1] =
+            hypre_ParVectorCreate(hypre_ParCSRMatrixComm(Aee_l[l + 1]),
+                                  hypre_ParCSRMatrixGlobalNumRows(Aee_l[l + 1]),
+                                  hypre_ParCSRMatrixRowStarts(Aee_l[l + 1]));
+         hypre_ParVectorInitialize(be_l[l + 1]);
+
+         rese_l[l + 1] =
+            hypre_ParVectorCreate(hypre_ParCSRMatrixComm(Aee_l[l + 1]),
+                                  hypre_ParCSRMatrixGlobalNumRows(Aee_l[l + 1]),
+                                  hypre_ParCSRMatrixRowStarts(Aee_l[l + 1]));
+         hypre_ParVectorInitialize(rese_l[l + 1]);
+
+         ee_l[l + 1] =
+            hypre_ParVectorCreate(hypre_ParCSRMatrixComm(Aee_l[l + 1]),
+                                  hypre_ParCSRMatrixGlobalNumRows(Aee_l[l + 1]),
+                                  hypre_ParCSRMatrixRowStarts(Aee_l[l + 1]));
+         hypre_ParVectorInitialize(ee_l[l + 1]);
+
+         eVtemp_l[l + 1] =
+            hypre_ParVectorCreate(hypre_ParCSRMatrixComm(Aee_l[l + 1]),
+                                  hypre_ParCSRMatrixGlobalNumRows(Aee_l[l + 1]),
+                                  hypre_ParCSRMatrixRowStarts(Aee_l[l + 1]));
+         hypre_ParVectorInitialize(eVtemp_l[l + 1]);
+
+         eVtemp2_l[l + 1] =
+            hypre_ParVectorCreate(hypre_ParCSRMatrixComm(Aee_l[l + 1]),
+                                  hypre_ParCSRMatrixGlobalNumRows(Aee_l[l + 1]),
+                                  hypre_ParCSRMatrixRowStarts(Aee_l[l + 1]));
+         hypre_ParVectorInitialize(eVtemp2_l[l + 1]);
 
       }  /* if (l < edge_numlevels) */
    }     /* for (l = 0; l < (en_numlevels - 1); l++) */
 
    /* possible to have more edge levels */
-   for (l = (en_numlevels-1); l < (edge_numlevels - 1); l++)
+   for (l = (en_numlevels - 1); l < (edge_numlevels - 1); l++)
    {
       if (!constant_coef)
       {
@@ -1138,30 +1141,30 @@ hypre_MaxwellTV_Setup(void                 *maxwell_vdata,
          hypre_CreatePTopology(&PTopology_vdata);
          if (ndim > 2)
          {
-            Pe_l[l]= hypre_Maxwell_PTopology(topological_edge[l],
-                                             topological_edge[l+1],
-                                             topological_face[l],
-                                             topological_face[l+1],
-                                             topological_cell[l],
-                                             topological_cell[l+1],
-                                             Aee_l[l],
-                                             rfactor,
-                                             PTopology_vdata);
+            Pe_l[l] = hypre_Maxwell_PTopology(topological_edge[l],
+                                              topological_edge[l + 1],
+                                              topological_face[l],
+                                              topological_face[l + 1],
+                                              topological_cell[l],
+                                              topological_cell[l + 1],
+                                              Aee_l[l],
+                                              rfactor,
+                                              PTopology_vdata);
          }
          else
          {
-            Pe_l[l]= hypre_Maxwell_PTopology(topological_edge[l],
-                                             topological_edge[l+1],
-                                             topological_edge[l],
-                                             topological_edge[l+1],
-                                             topological_cell[l],
-                                             topological_cell[l+1],
-                                             Aee_l[l],
-                                             rfactor,
-                                             PTopology_vdata);
+            Pe_l[l] = hypre_Maxwell_PTopology(topological_edge[l],
+                                              topological_edge[l + 1],
+                                              topological_edge[l],
+                                              topological_edge[l + 1],
+                                              topological_cell[l],
+                                              topological_cell[l + 1],
+                                              Aee_l[l],
+                                              rfactor,
+                                              PTopology_vdata);
          }
 
-         PTopology= (hypre_PTopology*)PTopology_vdata;
+         PTopology = (hypre_PTopology*)PTopology_vdata;
 
          /* extract off-processors rows of Pe_l[l]. Needed for amge.*/
          hypre_SStructSharedDOF_ParcsrMatRowsComm(egrid_l[l],
@@ -1194,7 +1197,7 @@ hypre_MaxwellTV_Setup(void                 *maxwell_vdata,
          }
 
          hypre_DestroyPTopology(PTopology_vdata);
-         for (i= 0; i< num_OffProcRows; i++)
+         for (i = 0; i < num_OffProcRows; i++)
          {
             hypre_MaxwellOffProcRowDestroy((void *) OffProcRows[i]);
          }
@@ -1203,58 +1206,58 @@ hypre_MaxwellTV_Setup(void                 *maxwell_vdata,
 
       else
       {
-         Pe_l[l]= hypre_Maxwell_PNedelec(topological_edge[l],
-                                         topological_edge[l+1],
-                                         rfactor);
+         Pe_l[l] = hypre_Maxwell_PNedelec(topological_edge[l],
+                                          topological_edge[l + 1],
+                                          rfactor);
       }
 
-      ReT_l[l]= Pe_l[l];
+      ReT_l[l] = Pe_l[l];
       hypre_BoomerAMGBuildCoarseOperator(
          (hypre_ParCSRMatrix *) hypre_IJMatrixObject(Pe_l[l]),
          Aee_l[l],
          (hypre_ParCSRMatrix *) hypre_IJMatrixObject(Pe_l[l]),
-         &Aee_l[l+1]);
+         &Aee_l[l + 1]);
 
       /* zero off boundary points */
-      hypre_ParCSRMatrixEliminateRowsCols(Aee_l[l+1],
-                                          BdryRanksCnts_l[l+1],
-                                          BdryRanks_l[l+1]);
-
-      xe_l[l+1] =
-         hypre_ParVectorCreate(hypre_ParCSRMatrixComm(Aee_l[l+1]),
-                               hypre_ParCSRMatrixGlobalNumRows(Aee_l[l+1]),
-                               hypre_ParCSRMatrixRowStarts(Aee_l[l+1]));
-      hypre_ParVectorInitialize(xe_l[l+1]);
-
-      be_l[l+1] =
-         hypre_ParVectorCreate(hypre_ParCSRMatrixComm(Aee_l[l+1]),
-                               hypre_ParCSRMatrixGlobalNumRows(Aee_l[l+1]),
-                               hypre_ParCSRMatrixRowStarts(Aee_l[l+1]));
-      hypre_ParVectorInitialize(be_l[l+1]);
-
-      ee_l[l+1] =
-         hypre_ParVectorCreate(hypre_ParCSRMatrixComm(Aee_l[l+1]),
-                               hypre_ParCSRMatrixGlobalNumRows(Aee_l[l+1]),
-                               hypre_ParCSRMatrixRowStarts(Aee_l[l+1]));
-      hypre_ParVectorInitialize(ee_l[l+1]);
-
-      rese_l[l+1] =
-         hypre_ParVectorCreate(hypre_ParCSRMatrixComm(Aee_l[l+1]),
-                               hypre_ParCSRMatrixGlobalNumRows(Aee_l[l+1]),
-                               hypre_ParCSRMatrixRowStarts(Aee_l[l+1]));
-      hypre_ParVectorInitialize(rese_l[l+1]);
-
-      eVtemp_l[l+1] =
-         hypre_ParVectorCreate(hypre_ParCSRMatrixComm(Aee_l[l+1]),
-                               hypre_ParCSRMatrixGlobalNumRows(Aee_l[l+1]),
-                               hypre_ParCSRMatrixRowStarts(Aee_l[l+1]));
-      hypre_ParVectorInitialize(eVtemp_l[l+1]);
-
-      eVtemp2_l[l+1] =
-         hypre_ParVectorCreate(hypre_ParCSRMatrixComm(Aee_l[l+1]),
-                               hypre_ParCSRMatrixGlobalNumRows(Aee_l[l+1]),
-                               hypre_ParCSRMatrixRowStarts(Aee_l[l+1]));
-      hypre_ParVectorInitialize(eVtemp2_l[l+1]);
+      hypre_ParCSRMatrixEliminateRowsCols(Aee_l[l + 1],
+                                          BdryRanksCnts_l[l + 1],
+                                          BdryRanks_l[l + 1]);
+
+      xe_l[l + 1] =
+         hypre_ParVectorCreate(hypre_ParCSRMatrixComm(Aee_l[l + 1]),
+                               hypre_ParCSRMatrixGlobalNumRows(Aee_l[l + 1]),
+                               hypre_ParCSRMatrixRowStarts(Aee_l[l + 1]));
+      hypre_ParVectorInitialize(xe_l[l + 1]);
+
+      be_l[l + 1] =
+         hypre_ParVectorCreate(hypre_ParCSRMatrixComm(Aee_l[l + 1]),
+                               hypre_ParCSRMatrixGlobalNumRows(Aee_l[l + 1]),
+                               hypre_ParCSRMatrixRowStarts(Aee_l[l + 1]));
+      hypre_ParVectorInitialize(be_l[l + 1]);
+
+      ee_l[l + 1] =
+         hypre_ParVectorCreate(hypre_ParCSRMatrixComm(Aee_l[l + 1]),
+                               hypre_ParCSRMatrixGlobalNumRows(Aee_l[l + 1]),
+                               hypre_ParCSRMatrixRowStarts(Aee_l[l + 1]));
+      hypre_ParVectorInitialize(ee_l[l + 1]);
+
+      rese_l[l + 1] =
+         hypre_ParVectorCreate(hypre_ParCSRMatrixComm(Aee_l[l + 1]),
+                               hypre_ParCSRMatrixGlobalNumRows(Aee_l[l + 1]),
+                               hypre_ParCSRMatrixRowStarts(Aee_l[l + 1]));
+      hypre_ParVectorInitialize(rese_l[l + 1]);
+
+      eVtemp_l[l + 1] =
+         hypre_ParVectorCreate(hypre_ParCSRMatrixComm(Aee_l[l + 1]),
+                               hypre_ParCSRMatrixGlobalNumRows(Aee_l[l + 1]),
+                               hypre_ParCSRMatrixRowStarts(Aee_l[l + 1]));
+      hypre_ParVectorInitialize(eVtemp_l[l + 1]);
+
+      eVtemp2_l[l + 1] =
+         hypre_ParVectorCreate(hypre_ParCSRMatrixComm(Aee_l[l + 1]),
+                               hypre_ParCSRMatrixGlobalNumRows(Aee_l[l + 1]),
+                               hypre_ParCSRMatrixRowStarts(Aee_l[l + 1]));
+      hypre_ParVectorInitialize(eVtemp2_l[l + 1]);
    }
 
    /* Can delete all topological grids. Not even referenced in IJMatrices. */
@@ -1286,34 +1289,34 @@ hypre_MaxwellTV_Setup(void                 *maxwell_vdata,
    (maxwell_TV_data -> ee_l)     = ee_l;
    (maxwell_TV_data -> rese_l)   = rese_l;
    (maxwell_TV_data -> eVtemp_l) = eVtemp_l;
-   (maxwell_TV_data -> eVtemp2_l)= eVtemp2_l;
+   (maxwell_TV_data -> eVtemp2_l) = eVtemp2_l;
 
    /*-----------------------------------------------------
     * Determine relaxation parameters for edge problems.
     * Needed for quick parallel over/under-relaxation.
     *-----------------------------------------------------*/
    erelax_type  = 2;
-   erelax_weight= hypre_TAlloc(HYPRE_Real,  edge_numlevels, HYPRE_MEMORY_HOST);
+   erelax_weight = hypre_TAlloc(HYPRE_Real,  edge_numlevels, HYPRE_MEMORY_HOST);
    eomega       = hypre_TAlloc(HYPRE_Real,  edge_numlevels, HYPRE_MEMORY_HOST);
    eCF_marker_l = hypre_TAlloc(HYPRE_Int *,  edge_numlevels, HYPRE_MEMORY_HOST);
 
 #if 0
-   relax_type= 6; /* SSOR */
-   for (l= 0; l< 1; l++)
+   relax_type = 6; /* SSOR */
+   for (l = 0; l < 1; l++)
    {
-      erelax_weight[l]= 1.0;
-      eCF_marker_l[l]= NULL;
+      erelax_weight[l] = 1.0;
+      eCF_marker_l[l] = NULL;
 
-      e_amg_vdata= (void *) hypre_BoomerAMGCreate();
-      e_amgData= e_amg_vdata;
+      e_amg_vdata = (void *) hypre_BoomerAMGCreate();
+      e_amgData = e_amg_vdata;
 
-      relax_types= hypre_CTAlloc(HYPRE_Int,  2, HYPRE_MEMORY_HOST);
-      relax_types[1]= relax_type;
+      relax_types = hypre_CTAlloc(HYPRE_Int,  2, HYPRE_MEMORY_HOST);
+      relax_types[1] = relax_type;
 
-      amg_CF_marker= hypre_TAlloc(HYPRE_Int *,  1, HYPRE_MEMORY_HOST);
+      amg_CF_marker = hypre_TAlloc(HYPRE_Int *,  1, HYPRE_MEMORY_HOST);
       A_array      = hypre_TAlloc(hypre_ParCSRMatrix *,  1, HYPRE_MEMORY_HOST);
 
-      amg_CF_marker[0]= NULL;
+      amg_CF_marker[0] = NULL;
       A_array[0]      = Aee_l[l];
 
       (e_amgData -> CF_marker_array)   = amg_CF_marker;
@@ -1327,23 +1330,23 @@ hypre_MaxwellTV_Setup(void                 *maxwell_vdata,
       hypre_TFree((e_amgData -> A_array), HYPRE_MEMORY_HOST);
       hypre_TFree((e_amgData -> CF_marker_array), HYPRE_MEMORY_HOST);
       hypre_TFree((e_amgData -> grid_relax_type), HYPRE_MEMORY_HOST);
-      (e_amgData -> A_array)= NULL;
+      (e_amgData -> A_array) = NULL;
       (e_amgData -> Vtemp ) = NULL;
-      (e_amgData -> CF_marker_array)= NULL;
-      (e_amgData -> grid_relax_type)= NULL;
+      (e_amgData -> CF_marker_array) = NULL;
+      (e_amgData -> grid_relax_type) = NULL;
       hypre_TFree(e_amg_vdata, HYPRE_MEMORY_HOST);
-      eomega[l]= 1.0;
+      eomega[l] = 1.0;
    }
 #endif
 
-   for (l= 0; l< edge_numlevels; l++)
+   for (l = 0; l < edge_numlevels; l++)
    {
-      erelax_weight[l]= 1.0;
-      eomega[l]= 1.0;
-      eCF_marker_l[l]= NULL;
+      erelax_weight[l] = 1.0;
+      eomega[l] = 1.0;
+      eCF_marker_l[l] = NULL;
    }
    (maxwell_TV_data ->  erelax_type)  = erelax_type;
-   (maxwell_TV_data ->  erelax_weight)= erelax_weight;
+   (maxwell_TV_data ->  erelax_weight) = erelax_weight;
    (maxwell_TV_data ->  eomega)       = eomega;
    (maxwell_TV_data ->  eCF_marker_l) = eCF_marker_l;
 
@@ -1354,7 +1357,7 @@ hypre_MaxwellTV_Setup(void                 *maxwell_vdata,
 
    if ((maxwell_TV_data -> logging) > 0)
    {
-      i= (maxwell_TV_data -> max_iter);
+      i = (maxwell_TV_data -> max_iter);
       (maxwell_TV_data -> norms)     = hypre_TAlloc(HYPRE_Real,  i, HYPRE_MEMORY_HOST);
       (maxwell_TV_data -> rel_norms) = hypre_TAlloc(HYPRE_Real,  i, HYPRE_MEMORY_HOST);
    }
@@ -1372,8 +1375,8 @@ hypre_CoarsenPGrid( hypre_SStructGrid  *fgrid,
 {
    HYPRE_Int ierr = 0;
 
-   hypre_SStructPGrid *pgrid= hypre_SStructGridPGrid(fgrid, part);
-   hypre_StructGrid   *sgrid= hypre_SStructPGridCellSGrid(pgrid);
+   hypre_SStructPGrid *pgrid = hypre_SStructGridPGrid(fgrid, part);
+   hypre_StructGrid   *sgrid = hypre_SStructPGridCellSGrid(pgrid);
 
    hypre_BoxArray     *boxes;
    hypre_Box          *box, *contract_box;
@@ -1388,7 +1391,7 @@ hypre_CoarsenPGrid( hypre_SStructGrid  *fgrid,
       box = hypre_BoxArrayBox(boxes, i);
 
       /* contract box so that divisible by stride */
-      contract_box= hypre_BoxContraction(box, sgrid, stride);
+      contract_box = hypre_BoxContraction(box, sgrid, stride);
       hypre_ProjectBox(contract_box, index, stride);
 
       hypre_StructMapFineToCoarse(hypre_BoxIMin(contract_box), index, stride,
@@ -1403,7 +1406,7 @@ hypre_CoarsenPGrid( hypre_SStructGrid  *fgrid,
 
       if ( hypre_BoxVolume(contract_box) )
       {
-         *nboxes= *nboxes+1;
+         *nboxes = *nboxes + 1;
       }
       hypre_BoxDestroy(contract_box);
    }
@@ -1430,13 +1433,13 @@ hypre_BoxContraction( hypre_Box           *box,
 
    hypre_BoxManager    *boxman = hypre_StructGridBoxMan(sgrid);
 
-   hypre_BoxArray      *neighbor_boxes= NULL;
+   hypre_BoxArray      *neighbor_boxes = NULL;
    hypre_Box           *nbox;
    hypre_Box           *contracted_box;
    hypre_Box           *shifted_box;
    hypre_Box            intersect_box;
 
-   HYPRE_Int            ndim= hypre_StructGridNDim(sgrid);
+   HYPRE_Int            ndim = hypre_StructGridNDim(sgrid);
 
    hypre_Index          remainder, box_width;
    HYPRE_Int            i, j, k, p;
@@ -1449,19 +1452,19 @@ hypre_BoxContraction( hypre_Box           *box,
 
    hypre_BoxInit(&intersect_box, ndim);
 
-   contracted_box= hypre_BoxCreate(ndim);
+   contracted_box = hypre_BoxCreate(ndim);
 
    hypre_ClearIndex(remainder);
-   p= 0;
-   for (i= 0; i< ndim; i++)
+   p = 0;
+   for (i = 0; i < ndim; i++)
    {
-      j= hypre_BoxIMax(box)[i] - hypre_BoxIMin(box)[i] + 1;
-      box_width[i]= j;
-      k= j%rfactor[i];
+      j = hypre_BoxIMax(box)[i] - hypre_BoxIMin(box)[i] + 1;
+      box_width[i] = j;
+      k = j % rfactor[i];
 
       if (k)
       {
-         remainder[i]= k;
+         remainder[i] = k;
          p++;
       }
    }
@@ -1469,21 +1472,21 @@ hypre_BoxContraction( hypre_Box           *box,
    hypre_CopyBox(box, contracted_box);
    if (p)
    {
-      shifted_box= hypre_BoxCreate(ndim);
-      for (i= 0; i< ndim; i++)
+      shifted_box = hypre_BoxCreate(ndim);
+      for (i = 0; i < ndim; i++)
       {
          if (remainder[i])   /* non-divisible in the i'th direction */
          {
             /* shift box in + & - directions to determine which side to
                contract. */
             hypre_CopyBox(box, shifted_box);
-            hypre_BoxIMax(shifted_box)[i]+= box_width[i];
-            hypre_BoxIMin(shifted_box)[i]+= box_width[i];
+            hypre_BoxIMax(shifted_box)[i] += box_width[i];
+            hypre_BoxIMin(shifted_box)[i] += box_width[i];
 
-            npos= 0;
+            npos = 0;
             hypre_ForBoxI(k, neighbor_boxes)
             {
-               nbox= hypre_BoxArrayBox(neighbor_boxes, k);
+               nbox = hypre_BoxArrayBox(neighbor_boxes, k);
                hypre_IntersectBoxes(shifted_box, nbox, &intersect_box);
                if (hypre_BoxVolume(&intersect_box))
                {
@@ -1492,13 +1495,13 @@ hypre_BoxContraction( hypre_Box           *box,
             }
 
             hypre_CopyBox(box, shifted_box);
-            hypre_BoxIMax(shifted_box)[i]-= box_width[i];
-            hypre_BoxIMin(shifted_box)[i]-= box_width[i];
+            hypre_BoxIMax(shifted_box)[i] -= box_width[i];
+            hypre_BoxIMin(shifted_box)[i] -= box_width[i];
 
-            nneg= 0;
+            nneg = 0;
             hypre_ForBoxI(k, neighbor_boxes)
             {
-               nbox= hypre_BoxArrayBox(neighbor_boxes, k);
+               nbox = hypre_BoxArrayBox(neighbor_boxes, k);
                hypre_IntersectBoxes(shifted_box, nbox, &intersect_box);
                if (hypre_BoxVolume(&intersect_box))
                {
@@ -1509,14 +1512,14 @@ hypre_BoxContraction( hypre_Box           *box,
             if ( (npos) || ( (!npos) && (!nneg) ) )
             {
                /* contract - direction */
-               hypre_BoxIMin(contracted_box)[i]+= remainder[i];
+               hypre_BoxIMin(contracted_box)[i] += remainder[i];
             }
             else
             {
                if (nneg)
                {
                   /* contract + direction */
-                  hypre_BoxIMax(contracted_box)[i]-= remainder[i];
+                  hypre_BoxIMax(contracted_box)[i] -= remainder[i];
                }
             }
 
diff --git a/external/hypre/src/sstruct_ls/maxwell_grad.c b/external/hypre/src/sstruct_ls/maxwell_grad.c
index 3eb66d1b..da651a65 100644
--- a/external/hypre/src/sstruct_ls/maxwell_grad.c
+++ b/external/hypre/src/sstruct_ls/maxwell_grad.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -46,13 +46,13 @@
  *
  *--------------------------------------------------------------------------*/
 hypre_ParCSRMatrix *
-hypre_Maxwell_Grad(hypre_SStructGrid    *grid)
+hypre_Maxwell_Grad(hypre_SStructGrid *grid)
 {
    MPI_Comm               comm = (grid ->  comm);
 
    HYPRE_IJMatrix         T_grad;
    hypre_ParCSRMatrix    *parcsr_grad;
-   HYPRE_Int              matrix_type= HYPRE_PARCSR;
+   HYPRE_Int              matrix_type = HYPRE_PARCSR;
 
    hypre_SStructGrid     *node_grid, *edge_grid;
 
@@ -76,7 +76,7 @@ hypre_Maxwell_Grad(hypre_SStructGrid    *grid)
    hypre_Index            shift, shift2;
    hypre_Index           *offsets, *varoffsets;
 
-   HYPRE_Int              nparts= hypre_SStructGridNParts(grid);
+   HYPRE_Int              nparts = hypre_SStructGridNParts(grid);
    HYPRE_Int              ndim  = hypre_SStructGridNDim(grid);
 
    HYPRE_SStructVariable  vartype_node, *vartype_edges;
@@ -92,9 +92,9 @@ hypre_Maxwell_Grad(hypre_SStructGrid    *grid)
    HYPRE_BigInt           jlower, jupper;
 
    HYPRE_BigInt           start_rank1, start_rank2, rank;
-
    HYPRE_Int              myproc;
-   HYPRE_Int              ierr=0;
+
+   HYPRE_MemoryLocation   memory_location;
 
    hypre_BoxInit(&layer, ndim);
    hypre_BoxInit(&interior_box, ndim);
@@ -102,10 +102,8 @@ hypre_Maxwell_Grad(hypre_SStructGrid    *grid)
    hypre_MPI_Comm_rank(comm, &myproc);
 
    hypre_ClearIndex(shift);
-   for (i= 0; i< ndim; i++)
-   {
-      hypre_IndexD(shift, i)= -1;
-   }
+   hypre_SetIndex(shift, -1);
+   hypre_SetIndex(lindex, 0);
 
    /* To get the correct ranks, separate node & edge grids must be formed.
       Note that the edge vars must be ordered the same way as is in grid.*/
@@ -113,50 +111,50 @@ hypre_Maxwell_Grad(hypre_SStructGrid    *grid)
    HYPRE_SStructGridCreate(comm, ndim, nparts, &edge_grid);
 
    vartype_node = HYPRE_SSTRUCT_VARIABLE_NODE;
-   vartype_edges= hypre_TAlloc(HYPRE_SStructVariable,  ndim, HYPRE_MEMORY_HOST);
+   vartype_edges = hypre_TAlloc(HYPRE_SStructVariable,  ndim, HYPRE_MEMORY_HOST);
 
    /* Assuming the same edge variable types on all parts */
    pgrid   = hypre_SStructGridPGrid(grid, 0);
-   vartypes= hypre_SStructPGridVarTypes(pgrid);
+   vartypes = hypre_SStructPGridVarTypes(pgrid);
    nvars   = hypre_SStructPGridNVars(pgrid);
 
-   k= 0;
-   for (i= 0; i< nvars; i++)
+   k = 0;
+   for (i = 0; i < nvars; i++)
    {
-      j= vartypes[i];
-      switch(j)
+      j = vartypes[i];
+      switch (j)
       {
          case 2:
          {
-            vartype_edges[k]= HYPRE_SSTRUCT_VARIABLE_XFACE;
+            vartype_edges[k] = HYPRE_SSTRUCT_VARIABLE_XFACE;
             k++;
             break;
          }
 
          case 3:
          {
-            vartype_edges[k]= HYPRE_SSTRUCT_VARIABLE_YFACE;
+            vartype_edges[k] = HYPRE_SSTRUCT_VARIABLE_YFACE;
             k++;
             break;
          }
 
          case 5:
          {
-            vartype_edges[k]= HYPRE_SSTRUCT_VARIABLE_XEDGE;
+            vartype_edges[k] = HYPRE_SSTRUCT_VARIABLE_XEDGE;
             k++;
             break;
          }
 
          case 6:
          {
-            vartype_edges[k]= HYPRE_SSTRUCT_VARIABLE_YEDGE;
+            vartype_edges[k] = HYPRE_SSTRUCT_VARIABLE_YEDGE;
             k++;
             break;
          }
 
          case 7:
          {
-            vartype_edges[k]= HYPRE_SSTRUCT_VARIABLE_ZEDGE;
+            vartype_edges[k] = HYPRE_SSTRUCT_VARIABLE_ZEDGE;
             k++;
             break;
          }
@@ -164,15 +162,15 @@ hypre_Maxwell_Grad(hypre_SStructGrid    *grid)
       }  /* switch(j) */
    }     /* for (i= 0; i< nvars; i++) */
 
-   for (part= 0; part< nparts; part++)
+   for (part = 0; part < nparts; part++)
    {
-      pgrid= hypre_SStructGridPGrid(grid, part);
-      var_grid= hypre_SStructPGridCellSGrid(pgrid) ;
+      pgrid = hypre_SStructGridPGrid(grid, part);
+      var_grid = hypre_SStructPGridCellSGrid(pgrid) ;
 
-      boxes= hypre_StructGridBoxes(var_grid);
+      boxes = hypre_StructGridBoxes(var_grid);
       hypre_ForBoxI(j, boxes)
       {
-         box= hypre_BoxArrayBox(boxes, j);
+         box = hypre_BoxArrayBox(boxes, j);
          HYPRE_SStructGridSetExtents(node_grid, part,
                                      hypre_BoxIMin(box), hypre_BoxIMax(box));
          HYPRE_SStructGridSetExtents(edge_grid, part,
@@ -191,45 +189,45 @@ hypre_Maxwell_Grad(hypre_SStructGrid    *grid)
 
    /* Grad: node(col) -> edge(row). Same for 2-d and 3-d */
    /* lower rank */
-   part= 0;
+   part = 0;
    i   = 0;
 
    hypre_SStructGridBoxProcFindBoxManEntry(edge_grid, part, 0, i, myproc, &entry);
    pgrid   = hypre_SStructGridPGrid(edge_grid, part);
-   var_grid= hypre_SStructPGridSGrid(pgrid, 0);
+   var_grid = hypre_SStructPGridSGrid(pgrid, 0);
    boxes   = hypre_StructGridBoxes(var_grid);
    box     = hypre_BoxArrayBox(boxes, 0);
    hypre_SStructBoxManEntryGetGlobalCSRank(entry, hypre_BoxIMin(box), &ilower);
 
    hypre_SStructGridBoxProcFindBoxManEntry(node_grid, part, 0, i, myproc, &entry);
    pgrid   = hypre_SStructGridPGrid(node_grid, part);
-   var_grid= hypre_SStructPGridSGrid(pgrid, 0);
+   var_grid = hypre_SStructPGridSGrid(pgrid, 0);
    boxes   = hypre_StructGridBoxes(var_grid);
    box     = hypre_BoxArrayBox(boxes, 0);
    hypre_SStructBoxManEntryGetGlobalCSRank(entry, hypre_BoxIMin(box), &jlower);
 
    /* upper rank */
-   part= nparts-1;
+   part = nparts - 1;
 
    pgrid   = hypre_SStructGridPGrid(edge_grid, part);
    nvars   = hypre_SStructPGridNVars(pgrid);
-   var_grid= hypre_SStructPGridSGrid(pgrid, nvars-1);
+   var_grid = hypre_SStructPGridSGrid(pgrid, nvars - 1);
    boxes   = hypre_StructGridBoxes(var_grid);
-   box     = hypre_BoxArrayBox(boxes, hypre_BoxArraySize(boxes)-1);
+   box     = hypre_BoxArrayBox(boxes, hypre_BoxArraySize(boxes) - 1);
 
-   hypre_SStructGridBoxProcFindBoxManEntry(edge_grid, part, nvars-1,
-                                           hypre_BoxArraySize(boxes)-1, myproc,
+   hypre_SStructGridBoxProcFindBoxManEntry(edge_grid, part, nvars - 1,
+                                           hypre_BoxArraySize(boxes) - 1, myproc,
                                            &entry);
    hypre_SStructBoxManEntryGetGlobalCSRank(entry, hypre_BoxIMax(box), &iupper);
 
    pgrid   = hypre_SStructGridPGrid(node_grid, part);
    nvars   = hypre_SStructPGridNVars(pgrid);
-   var_grid= hypre_SStructPGridSGrid(pgrid, nvars-1);
+   var_grid = hypre_SStructPGridSGrid(pgrid, nvars - 1);
    boxes   = hypre_StructGridBoxes(var_grid);
-   box     = hypre_BoxArrayBox(boxes, hypre_BoxArraySize(boxes)-1);
+   box     = hypre_BoxArrayBox(boxes, hypre_BoxArraySize(boxes) - 1);
 
-   hypre_SStructGridBoxProcFindBoxManEntry(node_grid, part, nvars-1,
-                                           hypre_BoxArraySize(boxes)-1, myproc,
+   hypre_SStructGridBoxProcFindBoxManEntry(node_grid, part, nvars - 1,
+                                           hypre_BoxArraySize(boxes) - 1, myproc,
                                            &entry);
    hypre_SStructBoxManEntryGetGlobalCSRank(entry, hypre_BoxIMax(box), &jupper);
 
@@ -237,43 +235,45 @@ hypre_Maxwell_Grad(hypre_SStructGrid    *grid)
    HYPRE_IJMatrixSetObjectType(T_grad, HYPRE_PARCSR);
    HYPRE_IJMatrixInitialize(T_grad);
 
+   memory_location = hypre_IJMatrixMemoryLocation(T_grad);
+
    /*------------------------------------------------------------------------------
     * fill up the parcsr matrix.
     *------------------------------------------------------------------------------*/
 
    /* count the no. of rows. Make sure repeated nodes along the boundaries are counted.*/
    nrows = 0;
-   nnodes= 0;
-   for (part= 0; part< nparts; part++)
+   nnodes = 0;
+   for (part = 0; part < nparts; part++)
    {
-      pgrid= hypre_SStructGridPGrid(edge_grid, part);
-      nvars= hypre_SStructPGridNVars(pgrid);
-      for (m= 0; m< nvars; m++)
+      pgrid = hypre_SStructGridPGrid(edge_grid, part);
+      nvars = hypre_SStructPGridNVars(pgrid);
+      for (m = 0; m < nvars; m++)
       {
-         var_grid= hypre_SStructPGridSGrid(pgrid, m);
+         var_grid = hypre_SStructPGridSGrid(pgrid, m);
          boxes   = hypre_StructGridBoxes(var_grid);
          hypre_ForBoxI(j, boxes)
          {
-            box= hypre_BoxArrayBox(boxes, j);
+            box = hypre_BoxArrayBox(boxes, j);
             /* make slightly bigger to handle any shared nodes */
             hypre_CopyBox(box, &layer);
             hypre_AddIndexes(hypre_BoxIMin(&layer), shift, 3, hypre_BoxIMin(&layer));
             hypre_SubtractIndexes(hypre_BoxIMax(&layer), shift, 3, hypre_BoxIMax(&layer));
-            nrows+= hypre_BoxVolume(&layer);
+            nrows += hypre_BoxVolume(&layer);
          }
       }
 
-      pgrid= hypre_SStructGridPGrid(node_grid, part);
-      var_grid= hypre_SStructPGridSGrid(pgrid, 0); /* only one variable grid */
+      pgrid = hypre_SStructGridPGrid(node_grid, part);
+      var_grid = hypre_SStructPGridSGrid(pgrid, 0); /* only one variable grid */
       boxes   = hypre_StructGridBoxes(var_grid);
       hypre_ForBoxI(j, boxes)
       {
-         box= hypre_BoxArrayBox(boxes, j);
+         box = hypre_BoxArrayBox(boxes, j);
          /* make slightly bigger to handle any shared nodes */
          hypre_CopyBox(box, &layer);
          hypre_AddIndexes(hypre_BoxIMin(&layer), shift, 3, hypre_BoxIMin(&layer));
          hypre_SubtractIndexes(hypre_BoxIMax(&layer), shift, 3, hypre_BoxIMax(&layer));
-         nnodes+= hypre_BoxVolume(&layer);
+         nnodes += hypre_BoxVolume(&layer);
       }
    }
 
@@ -282,41 +282,41 @@ hypre_Maxwell_Grad(hypre_SStructGrid    *grid)
 
    /* Set eflag to have the number of nodes connected to an edge (2) and
       nflag to have the number of edges connect to a node. */
-   for (i= 0; i< nrows; i++)
+   for (i = 0; i < nrows; i++)
    {
-      eflag[i]= 2;
+      eflag[i] = 2;
    }
-   j= 2*ndim;
-   for (i= 0; i< nnodes; i++)
+   j = 2 * ndim;
+   for (i = 0; i < nnodes; i++)
    {
-      nflag[i]= j;
+      nflag[i] = j;
    }
 
    /* Determine physical boundary points. Get the rank and set flag[rank]= 0.
       This will boundary dof, i.e., flag[rank]= 0 will flag a boundary dof. */
 
-   start_rank1= hypre_SStructGridStartRank(node_grid);
-   start_rank2= hypre_SStructGridStartRank(edge_grid);
-   for (part= 0; part< nparts; part++)
+   start_rank1 = hypre_SStructGridStartRank(node_grid);
+   start_rank2 = hypre_SStructGridStartRank(edge_grid);
+   for (part = 0; part < nparts; part++)
    {
       /* node flag */
       pgrid   = hypre_SStructGridPGrid(node_grid, part);
-      var_grid= hypre_SStructPGridSGrid(pgrid, 0);
+      var_grid = hypre_SStructPGridSGrid(pgrid, 0);
       boxes   = hypre_StructGridBoxes(var_grid);
       boxman     = hypre_SStructGridBoxManager(node_grid, part, 0);
 
       hypre_ForBoxI(j, boxes)
       {
-         box= hypre_BoxArrayBox(boxes, j);
+         box = hypre_BoxArrayBox(boxes, j);
          hypre_BoxManGetEntry(boxman, myproc, j, &entry);
-         i= hypre_BoxVolume(box);
+         i = hypre_BoxVolume(box);
 
-         tmp_box_array1= hypre_BoxArrayCreate(0, ndim);
-         ierr         += hypre_BoxBoundaryG(box, var_grid, tmp_box_array1);
+         tmp_box_array1 = hypre_BoxArrayCreate(0, ndim);
+         hypre_BoxBoundaryG(box, var_grid, tmp_box_array1);
 
-         for (m= 0; m< hypre_BoxArraySize(tmp_box_array1); m++)
+         for (m = 0; m < hypre_BoxArraySize(tmp_box_array1); m++)
          {
-            box_piece= hypre_BoxArrayBox(tmp_box_array1, m);
+            box_piece = hypre_BoxArrayBox(tmp_box_array1, m);
             if (hypre_BoxVolume(box_piece) < i)
             {
                hypre_BoxGetSize(box_piece, loop_size);
@@ -330,7 +330,7 @@ hypre_Maxwell_Grad(hypre_SStructGrid    *grid)
 
                   hypre_SStructBoxManEntryGetGlobalRank(entry, index,
                                                         &rank, matrix_type);
-                  nflag[rank-start_rank1]= 0;
+                  nflag[rank - start_rank1] = 0;
                }
                hypre_SerialBoxLoop0End();
             }  /* if (hypre_BoxVolume(box_piece) < i) */
@@ -353,71 +353,76 @@ hypre_Maxwell_Grad(hypre_SStructGrid    *grid)
        *-----------------------------------------------------------------*/
       pgrid    = hypre_SStructGridPGrid(edge_grid, part);
       nvars    = hypre_SStructPGridNVars(pgrid);
-      direction= hypre_TAlloc(HYPRE_Int,  2, HYPRE_MEMORY_HOST); /* only two directions at most */
-      for (m= 0; m< nvars; m++)
+      direction = hypre_TAlloc(HYPRE_Int,  2, HYPRE_MEMORY_HOST); /* only two directions at most */
+      for (m = 0; m < nvars; m++)
       {
-         var_grid= hypre_SStructPGridSGrid(pgrid, m);
+         var_grid = hypre_SStructPGridSGrid(pgrid, m);
          boxes   = hypre_StructGridBoxes(var_grid);
          boxman  = hypre_SStructGridBoxManager(edge_grid, part, m);
 
-         j= vartype_edges[m];
-         switch(j)
+         j = vartype_edges[m];
+         switch (j)
          {
             case 2: /* x faces, 2d */
             {
                ndirection  = 1;
-               direction[0]= 0;
+               direction[0] = 0;
                break;
             }
 
             case 3: /* y faces, 2d */
             {
                ndirection  = 1;
-               direction[0]= 1;
+               direction[0] = 1;
                break;
             }
 
             case 5: /* x edges, 3d */
             {
                ndirection  = 2;
-               direction[0]= 1;
-               direction[1]= 2;
+               direction[0] = 1;
+               direction[1] = 2;
                break;
             }
 
             case 6: /* y edges, 3d */
             {
                ndirection  = 2;
-               direction[0]= 0;
-               direction[1]= 2;
+               direction[0] = 0;
+               direction[1] = 2;
                break;
             }
 
             case 7: /* z edges, 3d */
             {
                ndirection  = 2;
-               direction[0]= 0;
-               direction[1]= 1;
+               direction[0] = 0;
+               direction[1] = 1;
                break;
             }
+
+            default:
+            {
+               ndirection = 0;
+            }
          }  /* switch(j) */
 
          hypre_ForBoxI(j, boxes)
          {
-            box= hypre_BoxArrayBox(boxes, j);
+            box = hypre_BoxArrayBox(boxes, j);
             hypre_BoxManGetEntry(boxman, myproc, j, &entry);
-            i= hypre_BoxVolume(box);
+            i = hypre_BoxVolume(box);
 
-            for (d= 0; d< ndirection; d++)
+            for (d = 0; d < ndirection; d++)
             {
-               tmp_box_array1= hypre_BoxArrayCreate(0, ndim);
-               tmp_box_array2= hypre_BoxArrayCreate(0, ndim);
-               ierr+= hypre_BoxBoundaryDG(box, var_grid, tmp_box_array1,
-                                          tmp_box_array2, direction[d]);
+               tmp_box_array1 = hypre_BoxArrayCreate(0, ndim);
+               tmp_box_array2 = hypre_BoxArrayCreate(0, ndim);
+               hypre_BoxBoundaryDG(box, var_grid, tmp_box_array1,
+                                   tmp_box_array2, direction[d]);
 
-               for (k= 0; k< hypre_BoxArraySize(tmp_box_array1); k++)
+               for (k = 0; k < hypre_BoxArraySize(tmp_box_array1); k++)
                {
-                  box_piece= hypre_BoxArrayBox(tmp_box_array1, k);
+                  box_piece = hypre_BoxArrayBox(tmp_box_array1, k);
                   if (hypre_BoxVolume(box_piece) < i)
                   {
                      hypre_BoxGetSize(box_piece, loop_size);
@@ -431,7 +436,7 @@ hypre_Maxwell_Grad(hypre_SStructGrid    *grid)
 
                         hypre_SStructBoxManEntryGetGlobalRank(entry, index,
                                                               &rank, matrix_type);
-                        eflag[rank-start_rank2]= 0;
+                        eflag[rank - start_rank2] = 0;
                      }
                      hypre_SerialBoxLoop0End();
                   }  /* if (hypre_BoxVolume(box_piece) < i) */
@@ -439,9 +444,9 @@ hypre_Maxwell_Grad(hypre_SStructGrid    *grid)
 
                hypre_BoxArrayDestroy(tmp_box_array1);
 
-               for (k= 0; k< hypre_BoxArraySize(tmp_box_array2); k++)
+               for (k = 0; k < hypre_BoxArraySize(tmp_box_array2); k++)
                {
-                  box_piece= hypre_BoxArrayBox(tmp_box_array2, k);
+                  box_piece = hypre_BoxArrayBox(tmp_box_array2, k);
                   if (hypre_BoxVolume(box_piece) < i)
                   {
                      hypre_BoxGetSize(box_piece, loop_size);
@@ -455,7 +460,7 @@ hypre_Maxwell_Grad(hypre_SStructGrid    *grid)
 
                         hypre_SStructBoxManEntryGetGlobalRank(entry, index,
                                                               &rank, matrix_type);
-                        eflag[rank-start_rank2]= 0;
+                        eflag[rank - start_rank2] = 0;
                      }
                      hypre_SerialBoxLoop0End();
                   }  /* if (hypre_BoxVolume(box_piece) < i) */
@@ -471,28 +476,28 @@ hypre_Maxwell_Grad(hypre_SStructGrid    *grid)
 
    /* set vals. Will have more memory than is needed- extra allotted
       for repeated nodes. */
-   inode= hypre_CTAlloc(HYPRE_BigInt,  nrows, HYPRE_MEMORY_DEVICE);
-   ncols= hypre_CTAlloc(HYPRE_Int, nrows, HYPRE_MEMORY_DEVICE);
+   inode = hypre_CTAlloc(HYPRE_BigInt, nrows, memory_location);
+   ncols = hypre_CTAlloc(HYPRE_Int, nrows, memory_location);
 
    /* each row can have at most two columns */
-   k= 2*nrows;
-   jedge= hypre_CTAlloc(HYPRE_BigInt,  k, HYPRE_MEMORY_DEVICE);
-   vals = hypre_TAlloc(HYPRE_Real,  k, HYPRE_MEMORY_DEVICE);
-   for (i= 0; i< k; i++)
+   k = 2 * nrows;
+   jedge = hypre_CTAlloc(HYPRE_BigInt, k, memory_location);
+   vals = hypre_TAlloc(HYPRE_Real, k, memory_location);
+   for (i = 0; i < k; i++)
    {
-      vals[i]=-1.0;
+      vals[i] = -1.0;
    }
 
    /* to get the correct col connection to each node, we need to offset
       index ijk. Determine these. Assuming the same var ordering for each
       part. Note that these are not the variable offsets. */
    offsets   = hypre_TAlloc(hypre_Index,  ndim, HYPRE_MEMORY_HOST);
-   varoffsets= hypre_TAlloc(hypre_Index,  ndim, HYPRE_MEMORY_HOST);
-   for (i= 0; i< ndim; i++)
+   varoffsets = hypre_TAlloc(hypre_Index,  ndim, HYPRE_MEMORY_HOST);
+   for (i = 0; i < ndim; i++)
    {
-      j= vartype_edges[i];
+      j = vartype_edges[i];
       hypre_SStructVariableGetOffset(vartype_edges[i], ndim, varoffsets[i]);
-      switch(j)
+      switch (j)
       {
          case 2:
          {
@@ -526,8 +531,8 @@ hypre_Maxwell_Grad(hypre_SStructGrid    *grid)
       }   /*  switch(j) */
    }     /* for (i= 0; i< ndim; i++) */
 
-   nrows= 0; i= 0;
-   for (part= 0; part< nparts; part++)
+   nrows = 0; i = 0;
+   for (part = 0; part < nparts; part++)
    {
       /* grab boxarray for node rank extracting later */
       pgrid       = hypre_SStructGridPGrid(node_grid, part);
@@ -540,19 +545,19 @@ hypre_Maxwell_Grad(hypre_SStructGrid    *grid)
          interior edge box. For parallel distribution of the edge
          grid, simple contraction of the edge box does not get the
          correct interior edge box. Need to contract the cell box. */
-      var_grid= hypre_SStructPGridCellSGrid(pgrid);
-      cell_boxes= hypre_StructGridBoxes(var_grid);
+      var_grid = hypre_SStructPGridCellSGrid(pgrid);
+      cell_boxes = hypre_StructGridBoxes(var_grid);
 
       nvars     = hypre_SStructPGridNVars(pgrid);
-      for (n= 0; n< nvars; n++)
+      for (n = 0; n < nvars; n++)
       {
          var_grid  = hypre_SStructPGridSGrid(pgrid, n);
-         edge_boxes= hypre_StructGridBoxes(var_grid);
+         edge_boxes = hypre_StructGridBoxes(var_grid);
 
          hypre_ForBoxI(j, edge_boxes)
          {
-            box= hypre_BoxArrayBox(edge_boxes, j);
-            cell_box= hypre_BoxArrayBox(cell_boxes, j);
+            box = hypre_BoxArrayBox(edge_boxes, j);
+            cell_box = hypre_BoxArrayBox(cell_boxes, j);
 
             hypre_CopyBox(cell_box, &interior_box);
 
@@ -586,12 +591,12 @@ hypre_Maxwell_Grad(hypre_SStructGrid    *grid)
                hypre_SStructGridFindBoxManEntry(edge_grid, part, index, n,
                                                 &entry);
                hypre_SStructBoxManEntryGetGlobalRank(entry, index, &m, matrix_type);
-               inode[nrows]= m;
+               inode[nrows] = m;
 
                hypre_SStructGridFindBoxManEntry(node_grid, part, index, 0,
                                                 &entry);
                hypre_SStructBoxManEntryGetGlobalRank(entry, index, &m, matrix_type);
-               jedge[i]= m;
+               jedge[i] = m;
                vals[i] = 1.0; /* change only this connection */
                i++;
 
@@ -599,10 +604,10 @@ hypre_Maxwell_Grad(hypre_SStructGrid    *grid)
                hypre_SStructGridFindBoxManEntry(node_grid, part, index, 0,
                                                 &entry);
                hypre_SStructBoxManEntryGetGlobalRank(entry, index, &m, matrix_type);
-               jedge[i]= m;
+               jedge[i] = m;
                i++;
 
-               ncols[nrows]= 2;
+               ncols[nrows] = 2;
                nrows++;
             }
             hypre_SerialBoxLoop0End();
@@ -610,16 +615,16 @@ hypre_Maxwell_Grad(hypre_SStructGrid    *grid)
             /* now the boundary layers. To cases to consider: is the
                edge totally on the boundary or is the edge connected
                to the boundary. Need to check eflag & nflag. */
-            for (d= 0; d< ndim; d++)
+            for (d = 0; d < ndim; d++)
             {
                /*shift the layer box in the correct direction and distance.
                  distance= hypre_BoxIMax(box)[d]-hypre_BoxIMin(box)[d]+1-1
                  = hypre_BoxIMax(box)[d]-hypre_BoxIMin(box)[d] */
                hypre_ClearIndex(shift2);
-               shift2[d]= hypre_BoxIMax(box)[d]-hypre_BoxIMin(box)[d];
+               shift2[d] = hypre_BoxIMax(box)[d] - hypre_BoxIMin(box)[d];
 
                /* ndirection= 0 negative; ndirection= 1 positive */
-               for (ndirection= 0; ndirection< 2; ndirection++)
+               for (ndirection = 0; ndirection < 2; ndirection++)
                {
                   hypre_CopyBox(box, &layer);
 
@@ -650,9 +655,9 @@ hypre_Maxwell_Grad(hypre_SStructGrid    *grid)
 
                      /* check if the edge lies on the boundary & if not
                         check if the connecting node is on the boundary. */
-                     if (eflag[m-start_rank2])
+                     if (eflag[m - start_rank2])
                      {
-                        inode[nrows]= m;
+                        inode[nrows] = m;
                         /* edge not completely on the boundary. One connecting
                            node must be in the interior. */
                         hypre_SStructGridFindBoxManEntry(node_grid, part, index, 0,
@@ -665,9 +670,9 @@ hypre_Maxwell_Grad(hypre_SStructGrid    *grid)
                         if (m >= start_rank1 && m <= jupper)
                         {
                            /* node on proc. Now check if on the boundary. */
-                           if (nflag[m-start_rank1]) /* interior node */
+                           if (nflag[m - start_rank1]) /* interior node */
                            {
-                              jedge[i]= m;
+                              jedge[i] = m;
                               vals[i] = 1.0;
                               i++;
 
@@ -676,7 +681,7 @@ hypre_Maxwell_Grad(hypre_SStructGrid    *grid)
                         }
                         else  /* node off-proc */
                         {
-                           jedge[i]= m;
+                           jedge[i] = m;
                            vals[i] = 1.0;
                            i++;
 
@@ -693,16 +698,16 @@ hypre_Maxwell_Grad(hypre_SStructGrid    *grid)
                         if (m >= start_rank1 && m <= jupper)
                         {
                            /* node on proc. Now check if on the boundary. */
-                           if (nflag[m-start_rank1]) /* interior node */
+                           if (nflag[m - start_rank1]) /* interior node */
                            {
-                              jedge[i]= m;
+                              jedge[i] = m;
                               i++;
                               ncols[nrows]++;
                            }
                         }
                         else  /* node off-proc */
                         {
-                           jedge[i]= m;
+                           jedge[i] = m;
                            i++;
                            ncols[nrows]++;
                         }
@@ -732,12 +737,12 @@ hypre_Maxwell_Grad(hypre_SStructGrid    *grid)
 
    hypre_TFree(eflag, HYPRE_MEMORY_HOST);
    hypre_TFree(nflag, HYPRE_MEMORY_HOST);
-   hypre_TFree(ncols, HYPRE_MEMORY_DEVICE);
-   hypre_TFree(inode, HYPRE_MEMORY_DEVICE);
-   hypre_TFree(jedge, HYPRE_MEMORY_DEVICE);
-   hypre_TFree(vals,  HYPRE_MEMORY_DEVICE);
+   hypre_TFree(ncols, memory_location);
+   hypre_TFree(inode, memory_location);
+   hypre_TFree(jedge, memory_location);
+   hypre_TFree(vals, memory_location);
 
-   parcsr_grad= (hypre_ParCSRMatrix *) hypre_IJMatrixObject(T_grad);
+   parcsr_grad = (hypre_ParCSRMatrix *) hypre_IJMatrixObject(T_grad);
    HYPRE_IJMatrixSetObjectType(T_grad, -1);
    HYPRE_IJMatrixDestroy(T_grad);
 
diff --git a/external/hypre/src/sstruct_ls/maxwell_physbdy.c b/external/hypre/src/sstruct_ls/maxwell_physbdy.c
index ff7abd13..3b6a0f40 100644
--- a/external/hypre/src/sstruct_ls/maxwell_physbdy.c
+++ b/external/hypre/src/sstruct_ls/maxwell_physbdy.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -44,7 +44,7 @@ hypre_Maxwell_PhysBdy( hypre_SStructGrid      **grid_l,
                        HYPRE_Int              **BdryRanksCntsl_ptr )
 {
 
-   MPI_Comm                comm= (grid_l[0]-> comm);
+   MPI_Comm                comm = (grid_l[0]-> comm);
 
    HYPRE_Int             **BdryRanks_l;
    HYPRE_Int              *BdryRanksCnts_l;
@@ -68,7 +68,7 @@ hypre_Maxwell_PhysBdy( hypre_SStructGrid      **grid_l,
    hypre_Box              *box, *contract_fbox, rbox;
    hypre_Box               intersect;
 
-   HYPRE_Int             **cbox_mapping, **fbox_mapping;
+   HYPRE_Int             **cbox_mapping = NULL, **fbox_mapping = NULL;
    HYPRE_Int             **boxes_with_bdry;
 
    HYPRE_Int               ndim, nvars;
@@ -82,44 +82,45 @@ hypre_Maxwell_PhysBdy( hypre_SStructGrid      **grid_l,
    HYPRE_Int               d;
    HYPRE_Int               cnt;
 
-   HYPRE_Int               part= 0;  /* NOTE, ASSUMING ONE PART */
-   HYPRE_Int               matrix_type= HYPRE_PARCSR;
+   HYPRE_Int               part = 0; /* NOTE, ASSUMING ONE PART */
+   HYPRE_Int               matrix_type = HYPRE_PARCSR;
    HYPRE_Int               myproc;
 
-   HYPRE_Int               ierr= 0;
+   HYPRE_Int               ierr = 0;
 
    hypre_MPI_Comm_rank(comm, &myproc);
 
-   ndim= hypre_SStructGridNDim(grid_l[0]);
-   hypre_SetIndex3(zero_shift, 0, 0, 0);
+   ndim = hypre_SStructGridNDim(grid_l[0]);
+   hypre_SetIndex(zero_shift, 0);
+   hypre_SetIndex(lindex, 0);
 
    hypre_BoxInit(&intersect, ndim);
 
    /* bounding global ranks of this processor & allocate boundary box markers. */
-   upper_rank= hypre_CTAlloc(HYPRE_BigInt,  num_levels, HYPRE_MEMORY_HOST);
-   lower_rank= hypre_CTAlloc(HYPRE_BigInt,  num_levels, HYPRE_MEMORY_HOST);
+   upper_rank = hypre_CTAlloc(HYPRE_BigInt,  num_levels, HYPRE_MEMORY_HOST);
+   lower_rank = hypre_CTAlloc(HYPRE_BigInt,  num_levels, HYPRE_MEMORY_HOST);
 
-   boxes_with_bdry= hypre_TAlloc(HYPRE_Int *,  num_levels, HYPRE_MEMORY_HOST);
-   for (i= 0; i< num_levels; i++)
+   boxes_with_bdry = hypre_TAlloc(HYPRE_Int *,  num_levels, HYPRE_MEMORY_HOST);
+   for (i = 0; i < num_levels; i++)
    {
       grid = grid_l[i];
-      lower_rank[i]= hypre_SStructGridStartRank(grid);
+      lower_rank[i] = hypre_SStructGridStartRank(grid);
 
       /* note we are assuming only one part */
-      pgrid= hypre_SStructGridPGrid(grid, part);
-      nvars= hypre_SStructPGridNVars(pgrid);
-      sgrid= hypre_SStructPGridSGrid(pgrid, nvars-1);
-      box_array= hypre_StructGridBoxes(sgrid);
-      box  = hypre_BoxArrayBox(box_array, hypre_BoxArraySize(box_array)-1);
-
-      hypre_SStructGridBoxProcFindBoxManEntry(grid, part, nvars-1,
-                                              hypre_BoxArraySize(box_array)-1, myproc, &boxman_entry);
+      pgrid = hypre_SStructGridPGrid(grid, part);
+      nvars = hypre_SStructPGridNVars(pgrid);
+      sgrid = hypre_SStructPGridSGrid(pgrid, nvars - 1);
+      box_array = hypre_StructGridBoxes(sgrid);
+      box  = hypre_BoxArrayBox(box_array, hypre_BoxArraySize(box_array) - 1);
+
+      hypre_SStructGridBoxProcFindBoxManEntry(grid, part, nvars - 1,
+                                              hypre_BoxArraySize(box_array) - 1, myproc, &boxman_entry);
       hypre_SStructBoxManEntryGetGlobalCSRank(boxman_entry, hypre_BoxIMax(box),
                                               &upper_rank[i]);
 
-      sgrid= hypre_SStructPGridCellSGrid(pgrid);
-      box_array= hypre_StructGridBoxes(sgrid);
-      boxes_with_bdry[i]= hypre_CTAlloc(HYPRE_Int,  hypre_BoxArraySize(box_array), HYPRE_MEMORY_HOST);
+      sgrid = hypre_SStructPGridCellSGrid(pgrid);
+      box_array = hypre_StructGridBoxes(sgrid);
+      boxes_with_bdry[i] = hypre_CTAlloc(HYPRE_Int,  hypre_BoxArraySize(box_array), HYPRE_MEMORY_HOST);
    }
 
    /*-----------------------------------------------------------------------------
@@ -134,32 +135,32 @@ hypre_Maxwell_PhysBdy( hypre_SStructGrid      **grid_l,
     *-----------------------------------------------------------------------------*/
    if (num_levels > 1)
    {
-      cbox_mapping= hypre_CTAlloc(HYPRE_Int *,  num_levels, HYPRE_MEMORY_HOST);
-      fbox_mapping= hypre_CTAlloc(HYPRE_Int *,  num_levels, HYPRE_MEMORY_HOST);
+      cbox_mapping = hypre_CTAlloc(HYPRE_Int *,  num_levels, HYPRE_MEMORY_HOST);
+      fbox_mapping = hypre_CTAlloc(HYPRE_Int *,  num_levels, HYPRE_MEMORY_HOST);
    }
-   for (i= 0; i< (num_levels-1); i++)
+   for (i = 0; i < (num_levels - 1); i++)
    {
       grid = grid_l[i];
-      pgrid= hypre_SStructGridPGrid(grid, 0); /* assuming one part */
-      cell_fgrid= hypre_SStructPGridCellSGrid(pgrid);
-      fboxes= hypre_StructGridBoxes(cell_fgrid);
-      nfboxes= hypre_BoxArraySize(hypre_StructGridBoxes(cell_fgrid));
-      fbox_mapping[i]= hypre_CTAlloc(HYPRE_Int,  nfboxes, HYPRE_MEMORY_HOST);
+      pgrid = hypre_SStructGridPGrid(grid, 0); /* assuming one part */
+      cell_fgrid = hypre_SStructPGridCellSGrid(pgrid);
+      fboxes = hypre_StructGridBoxes(cell_fgrid);
+      nfboxes = hypre_BoxArraySize(hypre_StructGridBoxes(cell_fgrid));
+      fbox_mapping[i] = hypre_CTAlloc(HYPRE_Int,  nfboxes, HYPRE_MEMORY_HOST);
 
-      grid = grid_l[i+1];
-      pgrid= hypre_SStructGridPGrid(grid, 0); /* assuming one part */
-      cell_cgrid= hypre_SStructPGridCellSGrid(pgrid);
-      cboxes= hypre_StructGridBoxes(cell_cgrid);
-      nboxes= hypre_BoxArraySize(hypre_StructGridBoxes(cell_cgrid));
+      grid = grid_l[i + 1];
+      pgrid = hypre_SStructGridPGrid(grid, 0); /* assuming one part */
+      cell_cgrid = hypre_SStructPGridCellSGrid(pgrid);
+      cboxes = hypre_StructGridBoxes(cell_cgrid);
+      nboxes = hypre_BoxArraySize(hypre_StructGridBoxes(cell_cgrid));
 
-      cbox_mapping[i+1]= hypre_CTAlloc(HYPRE_Int,  nboxes, HYPRE_MEMORY_HOST);
+      cbox_mapping[i + 1] = hypre_CTAlloc(HYPRE_Int,  nboxes, HYPRE_MEMORY_HOST);
 
       /* assuming if i1 > i2 and (box j1) is coarsened from (box i1)
          and (box j2) from (box i2), then j1 > j2. */
-      k= 0;
+      k = 0;
       hypre_ForBoxI(j, fboxes)
       {
-         fbox= hypre_BoxArrayBox(fboxes, j);
+         fbox = hypre_BoxArrayBox(fboxes, j);
          hypre_CopyBox(fbox, &rbox);
          hypre_ProjectBox(&rbox, zero_shift, rfactors);
          hypre_StructMapFineToCoarse(hypre_BoxIMin(&rbox), zero_shift,
@@ -171,114 +172,114 @@ hypre_Maxwell_PhysBdy( hypre_SStructGrid      **grid_l,
             ordering, we only have to check if the first cbox in the
             list intersects with rbox. If not, this fbox vanished in the
             coarsening. */
-         cbox= hypre_BoxArrayBox(cboxes, k);
+         cbox = hypre_BoxArrayBox(cboxes, k);
          hypre_IntersectBoxes(&rbox, cbox, &rbox);
          if (hypre_BoxVolume(&rbox))
          {
-            cbox_mapping[i+1][k]= j;
-            fbox_mapping[i][j]= k;
+            cbox_mapping[i + 1][k] = j;
+            fbox_mapping[i][j] = k;
             k++;
          }  /* if (hypre_BoxVolume(&rbox)) */
       }     /* hypre_ForBoxI(j, fboxes) */
    }        /* for (i= 0; i< (num_levels-1); i++) */
 
-   bdry= hypre_TAlloc(hypre_BoxArrayArray ***,  num_levels, HYPRE_MEMORY_HOST);
-   npts= hypre_CTAlloc(HYPRE_Int,  num_levels, HYPRE_MEMORY_HOST);
+   bdry = hypre_TAlloc(hypre_BoxArrayArray ***,  num_levels, HYPRE_MEMORY_HOST);
+   npts = hypre_CTAlloc(HYPRE_Int,  num_levels, HYPRE_MEMORY_HOST);
 
    /* finest level boundary determination */
    grid = grid_l[0];
-   pgrid= hypre_SStructGridPGrid(grid, 0); /* assuming one part */
-   nvars= hypre_SStructPGridNVars(pgrid);
-   cell_fgrid= hypre_SStructPGridCellSGrid(pgrid);
-   nboxes= hypre_BoxArraySize(hypre_StructGridBoxes(cell_fgrid));
+   pgrid = hypre_SStructGridPGrid(grid, 0); /* assuming one part */
+   nvars = hypre_SStructPGridNVars(pgrid);
+   cell_fgrid = hypre_SStructPGridCellSGrid(pgrid);
+   nboxes = hypre_BoxArraySize(hypre_StructGridBoxes(cell_fgrid));
 
    hypre_Maxwell_PNedelec_Bdy(cell_fgrid, pgrid, &bdry[0]);
-   for (i= 0; i< nboxes; i++)
+   for (i = 0; i < nboxes; i++)
    {
       if (bdry[0][i])  /* boundary layers on box[i] */
       {
-         for (j= 0; j< nvars; j++)
+         for (j = 0; j < nvars; j++)
          {
-            fbdry= bdry[0][i][j+1]; /*(j+1) since j= 0 stores cell-centred boxes*/
+            fbdry = bdry[0][i][j + 1]; /*(j+1) since j= 0 stores cell-centred boxes*/
             hypre_ForBoxArrayI(k, fbdry)
             {
-               box_array= hypre_BoxArrayArrayBoxArray(fbdry, k);
+               box_array = hypre_BoxArrayArrayBoxArray(fbdry, k);
                hypre_ForBoxI(p, box_array)
                {
-                  box= hypre_BoxArrayBox(box_array, p);
-                  npts[0]+= hypre_BoxVolume(box);
+                  box = hypre_BoxArrayBox(box_array, p);
+                  npts[0] += hypre_BoxVolume(box);
                }
             }
          }  /* for (j= 0; j< nvars; j++) */
 
-         boxes_with_bdry[0][i]= 1; /* mark this box as containing boundary layers */
+         boxes_with_bdry[0][i] = 1; /* mark this box as containing boundary layers */
       }  /* if (bdry[0][i]) */
    }
-   nfboxes= nboxes;
+   nfboxes = nboxes;
 
    /* coarser levels */
-   for (i= 1; i< num_levels; i++)
+   for (i = 1; i < num_levels; i++)
    {
-      grid = grid_l[i-1];
-      pgrid= hypre_SStructGridPGrid(grid, 0); /* assuming one part */
-      cell_fgrid= hypre_SStructPGridCellSGrid(pgrid);
-      fboxes= hypre_StructGridBoxes(cell_fgrid);
+      grid = grid_l[i - 1];
+      pgrid = hypre_SStructGridPGrid(grid, 0); /* assuming one part */
+      cell_fgrid = hypre_SStructPGridCellSGrid(pgrid);
+      fboxes = hypre_StructGridBoxes(cell_fgrid);
 
       grid = grid_l[i];
-      pgrid= hypre_SStructGridPGrid(grid, 0); /* assuming one part */
-      cell_cgrid= hypre_SStructPGridCellSGrid(pgrid);
-      nvars= hypre_SStructPGridNVars(pgrid);
-      cboxes= hypre_StructGridBoxes(cell_cgrid);
-      nboxes= hypre_BoxArraySize(hypre_StructGridBoxes(cell_cgrid));
-
-      bdry[i]= hypre_TAlloc(hypre_BoxArrayArray **,  nboxes, HYPRE_MEMORY_HOST);
-      p= 2*(ndim-1);
-      for (j= 0; j< nboxes; j++)
+      pgrid = hypre_SStructGridPGrid(grid, 0); /* assuming one part */
+      cell_cgrid = hypre_SStructPGridCellSGrid(pgrid);
+      nvars = hypre_SStructPGridNVars(pgrid);
+      cboxes = hypre_StructGridBoxes(cell_cgrid);
+      nboxes = hypre_BoxArraySize(hypre_StructGridBoxes(cell_cgrid));
+
+      bdry[i] = hypre_TAlloc(hypre_BoxArrayArray **,  nboxes, HYPRE_MEMORY_HOST);
+      p = 2 * (ndim - 1);
+      for (j = 0; j < nboxes; j++)
       {
-         bdry[i][j]= hypre_TAlloc(hypre_BoxArrayArray *,  nvars+1, HYPRE_MEMORY_HOST);
+         bdry[i][j] = hypre_TAlloc(hypre_BoxArrayArray *,  nvars + 1, HYPRE_MEMORY_HOST);
 
          /* cell grid boxarrayarray */
-         bdry[i][j][0]= hypre_BoxArrayArrayCreate(2*ndim, ndim);
+         bdry[i][j][0] = hypre_BoxArrayArrayCreate(2 * ndim, ndim);
 
          /* var grid boxarrayarrays */
-         for (k= 0; k< nvars; k++)
+         for (k = 0; k < nvars; k++)
          {
-            bdry[i][j][k+1]= hypre_BoxArrayArrayCreate(p, ndim);
+            bdry[i][j][k + 1] = hypre_BoxArrayArrayCreate(p, ndim);
          }
       }
 
       /* check if there are boundary points from the previous level */
-      for (j= 0; j< nfboxes; j++)
+      for (j = 0; j < nfboxes; j++)
       {
          /* see if the j box of level (i-1) has any boundary layers */
-         if (boxes_with_bdry[i-1][j])
+         if (boxes_with_bdry[i - 1][j])
          {
-            boxi= fbox_mapping[i-1][j];
-            cbox= hypre_BoxArrayBox(cboxes, boxi);
-            fbox= hypre_BoxArrayBox(fboxes, j);
+            boxi = fbox_mapping[i - 1][j];
+            cbox = hypre_BoxArrayBox(cboxes, boxi);
+            fbox = hypre_BoxArrayBox(fboxes, j);
 
             /* contract the fbox so that divisible in rfactor */
-            contract_fbox= hypre_BoxContraction(fbox, cell_fgrid, rfactors);
+            contract_fbox = hypre_BoxContraction(fbox, cell_fgrid, rfactors);
 
             /* refine the cbox. Expand the refined cbox so that the complete
                chunk of the fine box that coarsened to it is included. This
                requires some offsets */
             hypre_ClearIndex(upper_shift);
             hypre_ClearIndex(lower_shift);
-            for (k= 0; k< ndim; k++)
+            for (k = 0; k < ndim; k++)
             {
-               m= hypre_BoxIMin(contract_fbox)[k];
-               p= m%rfactors[k];
+               m = hypre_BoxIMin(contract_fbox)[k];
+               p = m % rfactors[k];
 
                if (p > 0 && m > 0)
                {
-                  upper_shift[k]= p-1;
-                  lower_shift[k]= p-rfactors[k];
+                  upper_shift[k] = p - 1;
+                  lower_shift[k] = p - rfactors[k];
                }
                else
                {
-                  upper_shift[k]= rfactors[k]-p-1;
-                  lower_shift[k]=-p;
+                  upper_shift[k] = rfactors[k] - p - 1;
+                  lower_shift[k] = -p;
                }
             }
             hypre_BoxDestroy(contract_fbox);
@@ -298,59 +299,59 @@ hypre_Maxwell_PhysBdy( hypre_SStructGrid      **grid_l,
                boundaries of the coarser levels may not be physical, we cannot
                use hypre_BoxBoundaryDG. But accomplished through intersecting
                with the finer level boundary boxes. */
-            fbdry= bdry[i-1][j][0]; /* cell-centred boundary layers of level (i-1) */
-            cbdry= bdry[i][boxi][0]; /* cell-centred boundary layers of level i */
+            fbdry = bdry[i - 1][j][0]; /* cell-centred boundary layers of level (i-1) */
+            cbdry = bdry[i][boxi][0]; /* cell-centred boundary layers of level i */
 
             /* fbdry is the cell-centred box_arrayarray. Contains an array of (2*ndim)
                boxarrays, one for each direction. */
-            cnt= 0;
+            cnt = 0;
             hypre_ForBoxArrayI(l, fbdry)
             {
                /* determine which boundary side we are doing. Depending on the
                   boundary, when we coarsen the refined boundary layer, the
                   extents may need to be changed,
                   e.g., index[lower,j,k]= index[upper,j,k]. */
-               switch(l)
+               switch (l)
                {
                   case 0:  /* lower x direction, x_upper= x_lower */
                   {
-                     n= 1; /* n flags whether upper or lower to be replaced */
-                     d= 0; /* x component */
+                     n = 1; /* n flags whether upper or lower to be replaced */
+                     d = 0; /* x component */
                      break;
                   }
                   case 1:  /* upper x direction, x_lower= x_upper */
                   {
-                     n= 0; /* n flags whether upper or lower to be replaced */
-                     d= 0; /* x component */
+                     n = 0; /* n flags whether upper or lower to be replaced */
+                     d = 0; /* x component */
                      break;
                   }
                   case 2:  /* lower y direction, y_upper= y_lower */
                   {
-                     n= 1; /* n flags whether upper or lower to be replaced */
-                     d= 1; /* y component */
+                     n = 1; /* n flags whether upper or lower to be replaced */
+                     d = 1; /* y component */
                      break;
                   }
                   case 3:  /* upper y direction, y_lower= y_upper */
                   {
-                     n= 0; /* n flags whether upper or lower to be replaced */
-                     d= 1; /* y component */
+                     n = 0; /* n flags whether upper or lower to be replaced */
+                     d = 1; /* y component */
                      break;
                   }
                   case 4:  /* lower z direction, z_lower= z_upper */
                   {
-                     n= 1; /* n flags whether upper or lower to be replaced */
-                     d= 2; /* z component */
+                     n = 1; /* n flags whether upper or lower to be replaced */
+                     d = 2; /* z component */
                      break;
                   }
                   case 5:  /* upper z direction, z_upper= z_lower */
                   {
-                     n= 0; /* n flags whether upper or lower to be replaced */
-                     d= 2; /* z component */
+                     n = 0; /* n flags whether upper or lower to be replaced */
+                     d = 2; /* z component */
                      break;
                   }
                }
 
-               box_array= hypre_BoxArrayArrayBoxArray(fbdry, l);
+               box_array = hypre_BoxArrayArrayBoxArray(fbdry, l);
                hypre_ForBoxI(p, box_array)
                {
                   hypre_IntersectBoxes(hypre_BoxArrayBox(box_array, p), &rbox,
@@ -369,11 +370,11 @@ hypre_Maxwell_PhysBdy( hypre_SStructGrid      **grid_l,
                         of the box projecting formulas. */
                      if (n) /* replace upper by lower */
                      {
-                        hypre_BoxIMax(&intersect)[d]= hypre_BoxIMin(&intersect)[d];
+                        hypre_BoxIMax(&intersect)[d] = hypre_BoxIMin(&intersect)[d];
                      }
                      else   /* replace lower by upper */
                      {
-                        hypre_BoxIMin(&intersect)[d]= hypre_BoxIMax(&intersect)[d];
+                        hypre_BoxIMin(&intersect)[d] = hypre_BoxIMax(&intersect)[d];
                      }
 
                      hypre_AppendBox(&intersect,
@@ -390,46 +391,46 @@ hypre_Maxwell_PhysBdy( hypre_SStructGrid      **grid_l,
             {
                hypre_Maxwell_VarBdy(pgrid, bdry[i][boxi]);
 
-               for (p= 0; p< nvars; p++)
+               for (p = 0; p < nvars; p++)
                {
-                  cbdry= bdry[i][boxi][p+1];
+                  cbdry = bdry[i][boxi][p + 1];
                   hypre_ForBoxArrayI(l, cbdry)
                   {
-                     box_array= hypre_BoxArrayArrayBoxArray(cbdry, l);
+                     box_array = hypre_BoxArrayArrayBoxArray(cbdry, l);
                      hypre_ForBoxI(m, box_array)
                      {
-                        cbox= hypre_BoxArrayBox(box_array, m);
-                        npts[i]+= hypre_BoxVolume(cbox);
+                        cbox = hypre_BoxArrayBox(box_array, m);
+                        npts[i] += hypre_BoxVolume(cbox);
                      }
                   }
                }
 
-               boxes_with_bdry[i][boxi]= 1; /* mark as containing boundary */
+               boxes_with_bdry[i][boxi] = 1; /* mark as containing boundary */
             }
 
          }  /* if (boxes_with_bdry[i-1][j]) */
       }     /* for (j= 0; j< nfboxes; j++) */
 
-      nfboxes= nboxes;
+      nfboxes = nboxes;
    }  /* for (i= 1; i< num_levels; i++) */
 
    /* de-allocate objects that are not needed anymore */
-   for (i= 0; i< (num_levels-1); i++)
+   for (i = 0; i < (num_levels - 1); i++)
    {
       if (fbox_mapping[i])
       {
          hypre_TFree(fbox_mapping[i], HYPRE_MEMORY_HOST);
       }
-      if (cbox_mapping[i+1])
+      if (cbox_mapping[i + 1])
       {
-         hypre_TFree(cbox_mapping[i+1], HYPRE_MEMORY_HOST);
+         hypre_TFree(cbox_mapping[i + 1], HYPRE_MEMORY_HOST);
       }
 
-      grid = grid_l[i+1];
-      pgrid= hypre_SStructGridPGrid(grid, 0); /* assuming one part */
-      cell_cgrid= hypre_SStructPGridCellSGrid(pgrid);
-      cboxes= hypre_StructGridBoxes(cell_cgrid);
-      nboxes= hypre_BoxArraySize(hypre_StructGridBoxes(cell_cgrid));
+      grid = grid_l[i + 1];
+      pgrid = hypre_SStructGridPGrid(grid, 0); /* assuming one part */
+      cell_cgrid = hypre_SStructPGridCellSGrid(pgrid);
+      cboxes = hypre_StructGridBoxes(cell_cgrid);
+      nboxes = hypre_BoxArraySize(hypre_StructGridBoxes(cell_cgrid));
    }
    if (num_levels > 1)
    {
@@ -439,35 +440,35 @@ hypre_Maxwell_PhysBdy( hypre_SStructGrid      **grid_l,
 
    /* find the ranks for the boundary points */
    BdryRanks_l    = hypre_TAlloc(HYPRE_Int *,  num_levels, HYPRE_MEMORY_HOST);
-   BdryRanksCnts_l= hypre_TAlloc(HYPRE_Int  ,  num_levels, HYPRE_MEMORY_HOST);
+   BdryRanksCnts_l = hypre_TAlloc(HYPRE_Int,  num_levels, HYPRE_MEMORY_HOST);
 
    /* loop over levels and extract boundary ranks. Only extract unique
       ranks */
-   for (i= 0; i< num_levels; i++)
+   for (i = 0; i < num_levels; i++)
    {
-      grid= grid_l[i];
-      pgrid= hypre_SStructGridPGrid(grid, 0); /* assuming one part */
-      cell_cgrid= hypre_SStructPGridCellSGrid(pgrid);
-      nvars= hypre_SStructPGridNVars(pgrid);
-      cboxes= hypre_StructGridBoxes(cell_cgrid);
-      nboxes= hypre_BoxArraySize(hypre_StructGridBoxes(cell_cgrid));
-
-      ranks= hypre_TAlloc(HYPRE_BigInt,  npts[i], HYPRE_MEMORY_HOST);
-      cnt= 0;
-      for (j= 0; j< nboxes; j++)
+      grid = grid_l[i];
+      pgrid = hypre_SStructGridPGrid(grid, 0); /* assuming one part */
+      cell_cgrid = hypre_SStructPGridCellSGrid(pgrid);
+      nvars = hypre_SStructPGridNVars(pgrid);
+      cboxes = hypre_StructGridBoxes(cell_cgrid);
+      nboxes = hypre_BoxArraySize(hypre_StructGridBoxes(cell_cgrid));
+
+      ranks = hypre_TAlloc(HYPRE_BigInt,  npts[i], HYPRE_MEMORY_HOST);
+      cnt = 0;
+      for (j = 0; j < nboxes; j++)
       {
          if (boxes_with_bdry[i][j])
          {
-            for (k= 0; k< nvars; k++)
+            for (k = 0; k < nvars; k++)
             {
-               fbdry= bdry[i][j][k+1];
+               fbdry = bdry[i][j][k + 1];
 
                hypre_ForBoxArrayI(m, fbdry)
                {
-                  box_array= hypre_BoxArrayArrayBoxArray(fbdry, m);
+                  box_array = hypre_BoxArrayArrayBoxArray(fbdry, m);
                   hypre_ForBoxI(p, box_array)
                   {
-                     box= hypre_BoxArrayBox(box_array, p);
+                     box = hypre_BoxArrayBox(box_array, p);
                      hypre_BoxGetSize(box, loop_size);
                      hypre_CopyIndex(hypre_BoxIMin(box), start);
 
@@ -491,9 +492,9 @@ hypre_Maxwell_PhysBdy( hypre_SStructGrid      **grid_l,
             }  /* for (k= 0; k< nvars; k++) */
          } /* if (boxes_with_bdry[i][j]) */
 
-         for (k= 0; k< nvars; k++)
+         for (k = 0; k < nvars; k++)
          {
-            hypre_BoxArrayArrayDestroy(bdry[i][j][k+1]);
+            hypre_BoxArrayArrayDestroy(bdry[i][j][k + 1]);
          }
          hypre_BoxArrayArrayDestroy(bdry[i][j][0]);
          hypre_TFree(bdry[i][j], HYPRE_MEMORY_HOST);
@@ -502,59 +503,59 @@ hypre_Maxwell_PhysBdy( hypre_SStructGrid      **grid_l,
       hypre_TFree(bdry[i], HYPRE_MEMORY_HOST);
 
       /* mark all ranks that are outside this processor to -1 */
-      for (j= 0; j< cnt; j++)
+      for (j = 0; j < cnt; j++)
       {
          if ( (ranks[j] < lower_rank[i]) || (ranks[j] > upper_rank[i]) )
          {
-            ranks[j]= -1;
+            ranks[j] = -1;
          }
       }
 
       /* sort the ranks & extract the unique ones */
       if (cnt)  /* recall that some may not have bdry pts */
       {
-         hypre_BigQsort0(ranks, 0, cnt-1);
+         hypre_BigQsort0(ranks, 0, cnt - 1);
 
-         k= 0;
+         k = 0;
          if (ranks[0] < 0) /* remove the off-processor markers */
          {
-            for (j= 1; j< cnt; j++)
+            for (j = 1; j < cnt; j++)
             {
                if (ranks[j] > -1)
                {
-                  k= j;
+                  k = j;
                   break;
                }
             }
          }
 
-         l= 1;
-         for (j= k+1; j< cnt; j++)
+         l = 1;
+         for (j = k + 1; j < cnt; j++)
          {
-            if (ranks[j] != ranks[j-1])
+            if (ranks[j] != ranks[j - 1])
             {
                l++;
             }
          }
-         BdryRanks_l[i]= hypre_TAlloc(HYPRE_Int,  l, HYPRE_MEMORY_HOST);
-         BdryRanksCnts_l[i]= l;
+         BdryRanks_l[i] = hypre_TAlloc(HYPRE_Int,  l, HYPRE_MEMORY_HOST);
+         BdryRanksCnts_l[i] = l;
 
-         l= 0;
-         BdryRanks_l[i][l]= ranks[k]-lower_rank[i];
-         for (j= k+1; j< cnt; j++)
+         l = 0;
+         BdryRanks_l[i][l] = ranks[k] - lower_rank[i];
+         for (j = k + 1; j < cnt; j++)
          {
-            if (ranks[j] != ranks[j-1])
+            if (ranks[j] != ranks[j - 1])
             {
                l++;
-               BdryRanks_l[i][l]= ranks[j]-lower_rank[i]; /* store local ranks */
+               BdryRanks_l[i][l] = ranks[j] - lower_rank[i]; /* store local ranks */
             }
          }
       }
 
       else /* set BdryRanks_l[i] to be null */
       {
-         BdryRanks_l[i]= NULL;
-         BdryRanksCnts_l[i]= 0;
+         BdryRanks_l[i] = NULL;
+         BdryRanksCnts_l[i] = 0;
       }
 
       hypre_TFree(ranks, HYPRE_MEMORY_HOST);
@@ -570,7 +571,7 @@ hypre_Maxwell_PhysBdy( hypre_SStructGrid      **grid_l,
    hypre_TFree(npts, HYPRE_MEMORY_HOST);
 
    *BdryRanksl_ptr    = BdryRanks_l;
-   *BdryRanksCntsl_ptr= BdryRanksCnts_l;
+   *BdryRanksCntsl_ptr = BdryRanksCnts_l;
 
    return ierr;
 }
@@ -586,9 +587,9 @@ hypre_Maxwell_VarBdy( hypre_SStructPGrid       *pgrid,
                       hypre_BoxArrayArray     **bdry )
 {
    HYPRE_Int              ierr = 0;
-   HYPRE_Int              nvars= hypre_SStructPGridNVars(pgrid);
+   HYPRE_Int              nvars = hypre_SStructPGridNVars(pgrid);
 
-   hypre_BoxArrayArray   *cell_bdry= bdry[0];
+   hypre_BoxArrayArray   *cell_bdry = bdry[0];
    hypre_BoxArray        *box_array, *box_array2;
    hypre_Box             *bdy_box, *shifted_box;
 
@@ -603,23 +604,23 @@ hypre_Maxwell_VarBdy( hypre_SStructPGrid       *pgrid,
    hypre_SetIndex3(jshift, 0, 1, 0);
    hypre_SetIndex3(kshift, 0, 0, 1);
 
-   shifted_box= hypre_BoxCreate(ndim);
-   for (i= 0; i< nvars; i++)
+   shifted_box = hypre_BoxCreate(ndim);
+   for (i = 0; i < nvars; i++)
    {
-      t= vartypes[i];
+      t = vartypes[i];
       hypre_SStructVariableGetOffset(vartypes[i], ndim, varoffset);
-      switch(t)
+      switch (t)
       {
          case 2: /* xface, boundary i= lower, upper */
          {
             /* boundary i= lower */
-            box_array= hypre_BoxArrayArrayBoxArray(cell_bdry, 0);
+            box_array = hypre_BoxArrayArrayBoxArray(cell_bdry, 0);
             if (hypre_BoxArraySize(box_array))
             {
-               box_array2= hypre_BoxArrayArrayBoxArray(bdry[i+1], 0);
+               box_array2 = hypre_BoxArrayArrayBoxArray(bdry[i + 1], 0);
                hypre_ForBoxI(k, box_array)
                {
-                  bdy_box= hypre_BoxArrayBox(box_array, k);
+                  bdy_box = hypre_BoxArrayBox(box_array, k);
 
                   /* bdry boxes */
                   hypre_CopyIndex(hypre_BoxIMin(bdy_box), lower);
@@ -633,13 +634,13 @@ hypre_Maxwell_VarBdy( hypre_SStructPGrid       *pgrid,
             }
 
             /* boundary i= upper */
-            box_array= hypre_BoxArrayArrayBoxArray(cell_bdry, 1);
+            box_array = hypre_BoxArrayArrayBoxArray(cell_bdry, 1);
             if (hypre_BoxArraySize(box_array))
             {
-               box_array2= hypre_BoxArrayArrayBoxArray(bdry[i+1], 1);
+               box_array2 = hypre_BoxArrayArrayBoxArray(bdry[i + 1], 1);
                hypre_ForBoxI(k, box_array)
                {
-                  bdy_box= hypre_BoxArrayBox(box_array, k);
+                  bdy_box = hypre_BoxArrayBox(box_array, k);
 
                   /* bdry boxes */
                   hypre_CopyIndex(hypre_BoxIMin(bdy_box), lower);
@@ -654,13 +655,13 @@ hypre_Maxwell_VarBdy( hypre_SStructPGrid       *pgrid,
 
          case 3: /* yface, boundary j= lower, upper */
          {
-            box_array= hypre_BoxArrayArrayBoxArray(cell_bdry, 2);
+            box_array = hypre_BoxArrayArrayBoxArray(cell_bdry, 2);
             if (hypre_BoxArraySize(box_array))
             {
-               box_array2= hypre_BoxArrayArrayBoxArray(bdry[i+1], 0);
+               box_array2 = hypre_BoxArrayArrayBoxArray(bdry[i + 1], 0);
                hypre_ForBoxI(k, box_array)
                {
-                  bdy_box= hypre_BoxArrayBox(box_array, k);
+                  bdy_box = hypre_BoxArrayBox(box_array, k);
 
                   /* bdry boxes */
                   hypre_CopyIndex(hypre_BoxIMin(bdy_box), lower);
@@ -673,13 +674,13 @@ hypre_Maxwell_VarBdy( hypre_SStructPGrid       *pgrid,
                }
             }
 
-            box_array= hypre_BoxArrayArrayBoxArray(cell_bdry, 3);
+            box_array = hypre_BoxArrayArrayBoxArray(cell_bdry, 3);
             if (hypre_BoxArraySize(box_array))
             {
-               box_array2= hypre_BoxArrayArrayBoxArray(bdry[i+1], 1);
+               box_array2 = hypre_BoxArrayArrayBoxArray(bdry[i + 1], 1);
                hypre_ForBoxI(k, box_array)
                {
-                  bdy_box= hypre_BoxArrayBox(box_array, k);
+                  bdy_box = hypre_BoxArrayBox(box_array, k);
 
                   /* bdry boxes */
                   hypre_CopyIndex(hypre_BoxIMin(bdy_box), lower);
@@ -695,13 +696,13 @@ hypre_Maxwell_VarBdy( hypre_SStructPGrid       *pgrid,
          case 5: /* xedge, boundary z_faces & y_faces */
          {
             /* boundary k= lower zface*/
-            box_array= hypre_BoxArrayArrayBoxArray(cell_bdry, 4);
+            box_array = hypre_BoxArrayArrayBoxArray(cell_bdry, 4);
             if (hypre_BoxArraySize(box_array))
             {
-               box_array2= hypre_BoxArrayArrayBoxArray(bdry[i+1], 0);
+               box_array2 = hypre_BoxArrayArrayBoxArray(bdry[i + 1], 0);
                hypre_ForBoxI(k, box_array)
                {
-                  bdy_box= hypre_BoxArrayBox(box_array, k);
+                  bdy_box = hypre_BoxArrayBox(box_array, k);
 
                   /* bdry boxes */
                   hypre_CopyIndex(hypre_BoxIMin(bdy_box), lower);
@@ -715,13 +716,13 @@ hypre_Maxwell_VarBdy( hypre_SStructPGrid       *pgrid,
             }
 
             /* boundary k= upper zface*/
-            box_array= hypre_BoxArrayArrayBoxArray(cell_bdry, 5);
+            box_array = hypre_BoxArrayArrayBoxArray(cell_bdry, 5);
             if (hypre_BoxArraySize(box_array))
             {
-               box_array2= hypre_BoxArrayArrayBoxArray(bdry[i+1], 1);
+               box_array2 = hypre_BoxArrayArrayBoxArray(bdry[i + 1], 1);
                hypre_ForBoxI(k, box_array)
                {
-                  bdy_box= hypre_BoxArrayBox(box_array, k);
+                  bdy_box = hypre_BoxArrayBox(box_array, k);
 
                   /* bdry boxes */
                   hypre_CopyIndex(hypre_BoxIMin(bdy_box), lower);
@@ -734,13 +735,13 @@ hypre_Maxwell_VarBdy( hypre_SStructPGrid       *pgrid,
             }
 
             /* boundary j= lower yface*/
-            box_array= hypre_BoxArrayArrayBoxArray(cell_bdry, 2);
+            box_array = hypre_BoxArrayArrayBoxArray(cell_bdry, 2);
             if (hypre_BoxArraySize(box_array))
             {
-               box_array2= hypre_BoxArrayArrayBoxArray(bdry[i+1], 2);
+               box_array2 = hypre_BoxArrayArrayBoxArray(bdry[i + 1], 2);
                hypre_ForBoxI(k, box_array)
                {
-                  bdy_box= hypre_BoxArrayBox(box_array, k);
+                  bdy_box = hypre_BoxArrayBox(box_array, k);
 
                   /* bdry boxes */
                   hypre_CopyIndex(hypre_BoxIMin(bdy_box), lower);
@@ -754,13 +755,13 @@ hypre_Maxwell_VarBdy( hypre_SStructPGrid       *pgrid,
             }
 
             /* boundary j= upper yface*/
-            box_array= hypre_BoxArrayArrayBoxArray(cell_bdry, 3);
+            box_array = hypre_BoxArrayArrayBoxArray(cell_bdry, 3);
             if (hypre_BoxArraySize(box_array))
             {
-               box_array2= hypre_BoxArrayArrayBoxArray(bdry[i+1], 3);
+               box_array2 = hypre_BoxArrayArrayBoxArray(bdry[i + 1], 3);
                hypre_ForBoxI(k, box_array)
                {
-                  bdy_box= hypre_BoxArrayBox(box_array, k);
+                  bdy_box = hypre_BoxArrayBox(box_array, k);
 
                   /* bdry boxes */
                   hypre_CopyIndex(hypre_BoxIMin(bdy_box), lower);
@@ -777,13 +778,13 @@ hypre_Maxwell_VarBdy( hypre_SStructPGrid       *pgrid,
          case 6: /* yedge, boundary z_faces & x_faces */
          {
             /* boundary k= lower zface*/
-            box_array= hypre_BoxArrayArrayBoxArray(cell_bdry, 4);
+            box_array = hypre_BoxArrayArrayBoxArray(cell_bdry, 4);
             if (hypre_BoxArraySize(box_array))
             {
-               box_array2= hypre_BoxArrayArrayBoxArray(bdry[i+1], 0);
+               box_array2 = hypre_BoxArrayArrayBoxArray(bdry[i + 1], 0);
                hypre_ForBoxI(k, box_array)
                {
-                  bdy_box= hypre_BoxArrayBox(box_array, k);
+                  bdy_box = hypre_BoxArrayBox(box_array, k);
 
                   /* bdry boxes */
                   hypre_CopyIndex(hypre_BoxIMin(bdy_box), lower);
@@ -797,13 +798,13 @@ hypre_Maxwell_VarBdy( hypre_SStructPGrid       *pgrid,
             }
 
             /* boundary k= upper zface*/
-            box_array= hypre_BoxArrayArrayBoxArray(cell_bdry, 5);
+            box_array = hypre_BoxArrayArrayBoxArray(cell_bdry, 5);
             if (hypre_BoxArraySize(box_array))
             {
-               box_array2= hypre_BoxArrayArrayBoxArray(bdry[i+1], 1);
+               box_array2 = hypre_BoxArrayArrayBoxArray(bdry[i + 1], 1);
                hypre_ForBoxI(k, box_array)
                {
-                  bdy_box= hypre_BoxArrayBox(box_array, k);
+                  bdy_box = hypre_BoxArrayBox(box_array, k);
 
                   /* bdry boxes */
                   hypre_CopyIndex(hypre_BoxIMin(bdy_box), lower);
@@ -816,13 +817,13 @@ hypre_Maxwell_VarBdy( hypre_SStructPGrid       *pgrid,
             }
 
             /* boundary i= lower xface*/
-            box_array= hypre_BoxArrayArrayBoxArray(cell_bdry, 0);
+            box_array = hypre_BoxArrayArrayBoxArray(cell_bdry, 0);
             if (hypre_BoxArraySize(box_array))
             {
-               box_array2= hypre_BoxArrayArrayBoxArray(bdry[i+1], 2);
+               box_array2 = hypre_BoxArrayArrayBoxArray(bdry[i + 1], 2);
                hypre_ForBoxI(k, box_array)
                {
-                  bdy_box= hypre_BoxArrayBox(box_array, k);
+                  bdy_box = hypre_BoxArrayBox(box_array, k);
 
                   /* bdry boxes */
                   hypre_CopyIndex(hypre_BoxIMin(bdy_box), lower);
@@ -836,13 +837,13 @@ hypre_Maxwell_VarBdy( hypre_SStructPGrid       *pgrid,
             }
 
             /* boundary i= upper xface*/
-            box_array= hypre_BoxArrayArrayBoxArray(cell_bdry, 1);
+            box_array = hypre_BoxArrayArrayBoxArray(cell_bdry, 1);
             if (hypre_BoxArraySize(box_array))
             {
-               box_array2= hypre_BoxArrayArrayBoxArray(bdry[i+1], 3);
+               box_array2 = hypre_BoxArrayArrayBoxArray(bdry[i + 1], 3);
                hypre_ForBoxI(k, box_array)
                {
-                  bdy_box= hypre_BoxArrayBox(box_array, k);
+                  bdy_box = hypre_BoxArrayBox(box_array, k);
 
                   /* bdry boxes */
                   hypre_CopyIndex(hypre_BoxIMin(bdy_box), lower);
@@ -859,13 +860,13 @@ hypre_Maxwell_VarBdy( hypre_SStructPGrid       *pgrid,
          case 7: /* zedge, boundary y_faces & x_faces */
          {
             /* boundary j= lower yface*/
-            box_array= hypre_BoxArrayArrayBoxArray(cell_bdry, 2);
+            box_array = hypre_BoxArrayArrayBoxArray(cell_bdry, 2);
             if (hypre_BoxArraySize(box_array))
             {
-               box_array2= hypre_BoxArrayArrayBoxArray(bdry[i+1], 0);
+               box_array2 = hypre_BoxArrayArrayBoxArray(bdry[i + 1], 0);
                hypre_ForBoxI(k, box_array)
                {
-                  bdy_box= hypre_BoxArrayBox(box_array, k);
+                  bdy_box = hypre_BoxArrayBox(box_array, k);
 
                   /* bdry boxes */
                   hypre_CopyIndex(hypre_BoxIMin(bdy_box), lower);
@@ -879,13 +880,13 @@ hypre_Maxwell_VarBdy( hypre_SStructPGrid       *pgrid,
             }
 
             /* boundary j= upper yface*/
-            box_array= hypre_BoxArrayArrayBoxArray(cell_bdry, 3);
+            box_array = hypre_BoxArrayArrayBoxArray(cell_bdry, 3);
             if (hypre_BoxArraySize(box_array))
             {
-               box_array2= hypre_BoxArrayArrayBoxArray(bdry[i+1], 1);
+               box_array2 = hypre_BoxArrayArrayBoxArray(bdry[i + 1], 1);
                hypre_ForBoxI(k, box_array)
                {
-                  bdy_box= hypre_BoxArrayBox(box_array, k);
+                  bdy_box = hypre_BoxArrayBox(box_array, k);
 
                   /* bdry boxes */
                   hypre_CopyIndex(hypre_BoxIMin(bdy_box), lower);
@@ -898,13 +899,13 @@ hypre_Maxwell_VarBdy( hypre_SStructPGrid       *pgrid,
             }
 
             /* boundary i= lower xface*/
-            box_array= hypre_BoxArrayArrayBoxArray(cell_bdry, 0);
+            box_array = hypre_BoxArrayArrayBoxArray(cell_bdry, 0);
             if (hypre_BoxArraySize(box_array))
             {
-               box_array2= hypre_BoxArrayArrayBoxArray(bdry[i+1], 2);
+               box_array2 = hypre_BoxArrayArrayBoxArray(bdry[i + 1], 2);
                hypre_ForBoxI(k, box_array)
                {
-                  bdy_box= hypre_BoxArrayBox(box_array, k);
+                  bdy_box = hypre_BoxArrayBox(box_array, k);
 
                   /* bdry boxes */
                   hypre_CopyIndex(hypre_BoxIMin(bdy_box), lower);
@@ -918,13 +919,13 @@ hypre_Maxwell_VarBdy( hypre_SStructPGrid       *pgrid,
             }
 
             /* boundary i= upper xface*/
-            box_array= hypre_BoxArrayArrayBoxArray(cell_bdry, 1);
+            box_array = hypre_BoxArrayArrayBoxArray(cell_bdry, 1);
             if (hypre_BoxArraySize(box_array))
             {
-               box_array2= hypre_BoxArrayArrayBoxArray(bdry[i+1], 3);
+               box_array2 = hypre_BoxArrayArrayBoxArray(bdry[i + 1], 3);
                hypre_ForBoxI(k, box_array)
                {
-                  bdy_box= hypre_BoxArrayBox(box_array, k);
+                  bdy_box = hypre_BoxArrayBox(box_array, k);
 
                   /* bdry boxes */
                   hypre_CopyIndex(hypre_BoxIMin(bdy_box), lower);
@@ -945,4 +946,3 @@ hypre_Maxwell_VarBdy( hypre_SStructPGrid       *pgrid,
 
    return ierr;
 }
-
diff --git a/external/hypre/src/sstruct_ls/maxwell_semi_interp.c b/external/hypre/src/sstruct_ls/maxwell_semi_interp.c
index 7cfd48f6..b761983e 100644
--- a/external/hypre/src/sstruct_ls/maxwell_semi_interp.c
+++ b/external/hypre/src/sstruct_ls/maxwell_semi_interp.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -24,18 +24,18 @@ HYPRE_Int
 hypre_CreatePTopology(void **PTopology_vdata_ptr)
 {
    hypre_PTopology   *PTopology;
-   HYPRE_Int          ierr= 0;
+   HYPRE_Int          ierr = 0;
 
-   PTopology= hypre_CTAlloc(hypre_PTopology, 1, HYPRE_MEMORY_HOST);
+   PTopology = hypre_CTAlloc(hypre_PTopology, 1, HYPRE_MEMORY_HOST);
 
    (PTopology ->  Face_iedge)   = NULL;
-   (PTopology ->  Element_iedge)= NULL;
+   (PTopology ->  Element_iedge) = NULL;
    (PTopology ->  Edge_iedge)   = NULL;
 
    (PTopology ->  Element_Face) = NULL;
    (PTopology ->  Element_Edge) = NULL;
 
-   *PTopology_vdata_ptr= (void *) PTopology;
+   *PTopology_vdata_ptr = (void *) PTopology;
 
    return ierr;
 }
@@ -43,7 +43,7 @@ hypre_CreatePTopology(void **PTopology_vdata_ptr)
 HYPRE_Int
 hypre_DestroyPTopology(void *PTopology_vdata)
 {
-   hypre_PTopology       *PTopology= (hypre_PTopology       *)PTopology_vdata;
+   hypre_PTopology       *PTopology = (hypre_PTopology       *)PTopology_vdata;
    HYPRE_Int              ierr     = 0;
 
    if (PTopology)
@@ -79,7 +79,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
 {
    MPI_Comm               comm = (fgrid_element ->  comm);
 
-   hypre_PTopology       *PTopology= (hypre_PTopology       *)PTopology_vdata;
+   hypre_PTopology       *PTopology = (hypre_PTopology *) PTopology_vdata;
 
    hypre_IJMatrix        *Face_iedge;
    hypre_IJMatrix        *Element_iedge;
@@ -104,23 +104,26 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
    HYPRE_BigInt           start_rank1;
 
    HYPRE_Int              nFaces, nEdges, nElements, nedges;
-   HYPRE_Int              nxFaces, nyFaces, nzFaces, nxEdges, nyEdges, nzEdges;
+   HYPRE_Int              nxFaces, nyFaces, nzFaces;
+   /* HYPRE_Int              nxEdges, nyEdges, nzEdges; */
    HYPRE_Int              n_xFace_iedges, n_yFace_iedges, n_zFace_iedges;
    HYPRE_Int              n_Cell_iedges;
 
    HYPRE_Int              nElements_iedges, nFaces_iedges, nEdges_iedges;
    HYPRE_Int              nElements_Faces, nElements_Edges;
 
-   HYPRE_BigInt          *iFace, *iEdge;
+   HYPRE_BigInt          *iFace = NULL, *iEdge;
    HYPRE_BigInt          *jFace_edge;
    HYPRE_BigInt          *jEdge_iedge;
-   HYPRE_BigInt          *jElement_Face, *jedge_Edge;
+   HYPRE_BigInt          *jElement_Face = NULL, *jedge_Edge;
    HYPRE_BigInt          *iElement, *jElement_Edge, *iedgeEdge, *jElement_edge;
 
-   HYPRE_Real            *vals_ElementEdge, *vals_ElementFace, *vals_edgeEdge, *vals_Faceedge;
+   HYPRE_Real            *vals_ElementEdge, *vals_ElementFace = NULL;
+   HYPRE_Real            *vals_edgeEdge, *vals_Faceedge;
    HYPRE_Real            *vals_Elementedge, *vals_Edgeiedge;
-   HYPRE_Int             *ncols_Elementedge, *ncols_Edgeiedge, *ncols_edgeEdge, *ncols_Faceedge;
-   HYPRE_Int             *ncols_ElementFace, *ncols_ElementEdge;
+   HYPRE_Int             *ncols_Elementedge, *ncols_Edgeiedge;
+   HYPRE_Int             *ncols_edgeEdge, *ncols_Faceedge;
+   HYPRE_Int             *ncols_ElementFace = NULL, *ncols_ElementEdge;
    HYPRE_Int             *bdryedge_location;
    HYPRE_Real             fCedge_ratio;
    HYPRE_Real            *stencil_vals, *upper, *lower, *diag, *face_w1, *face_w2;
@@ -134,16 +137,17 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
    hypre_Index            lindex;
    HYPRE_Int              n_boxoffsets;
 
-   HYPRE_Int              nparts= hypre_SStructGridNParts(fgrid_element);
+   HYPRE_Int              nparts = hypre_SStructGridNParts(fgrid_element);
    HYPRE_Int              ndim  = hypre_SStructGridNDim(fgrid_element);
 
-   HYPRE_SStructVariable *vartypes, *Edge_vartypes, *Face_vartypes;
+   HYPRE_SStructVariable *vartypes, *Face_vartypes, *Edge_vartypes = NULL;
    hypre_Index           *varoffsets;
    HYPRE_Int             *vartype_map;
-   HYPRE_Int              matrix_type= HYPRE_PARCSR;
+   HYPRE_Int              matrix_type = HYPRE_PARCSR;
 
-   HYPRE_Int              nvars, Face_nvars, Edge_nvars, part, var, box, fboxi;
-   HYPRE_Int              tot_vars= 8;
+   HYPRE_Int              nvars, Face_nvars, part, var, box, fboxi;
+   HYPRE_Int              Edge_nvars = 0;
+   HYPRE_Int              tot_vars = 8;
 
    HYPRE_Int              t, i, j, k, l, m, n, p;
 
@@ -156,11 +160,13 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
 
    HYPRE_Int              size1;
    HYPRE_Int              trueV = 1;
-   HYPRE_Int              falseV= 0;
+   HYPRE_Int              falseV = 0;
    HYPRE_Int              row_in;
 
    HYPRE_Int              myproc;
 
+   HYPRE_MemoryLocation   memory_location = hypre_ParCSRMatrixMemoryLocation(Aee);
+
    hypre_BoxInit(&copy_box, ndim);
 
    hypre_MPI_Comm_rank(comm, &myproc);
@@ -169,15 +175,13 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
    hypre_SetIndex3(kshift, 0, 0, 1);
    hypre_ClearIndex(zero_index);
    hypre_ClearIndex(one_index);
-   for (i= 0; i< ndim; i++)
-   {
-      one_index[i]= 1;
-   }
+   hypre_SetIndex(one_index, 1);
+   hypre_SetIndex(lindex, 1);
 
    /* set rfactor[2]= 1 if ndim=2. */
    if (ndim == 2)
    {
-      rfactor[2]= 1;
+      rfactor[2] = 1;
    }
 
    /*-------------------------------------------------------------------
@@ -199,31 +203,31 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
       to hypre enumeration. Only need for face and edge grids. */
    vartype_map = hypre_CTAlloc(HYPRE_Int, 8, HYPRE_MEMORY_HOST);
 
-   part= 0;
+   part = 0;
    p_cgrid = hypre_SStructGridPGrid(cgrid_face, part);   /* face cgrid */
    nvars   = hypre_SStructPGridNVars(p_cgrid);
-   vartypes= hypre_SStructPGridVarTypes(p_cgrid);
+   vartypes = hypre_SStructPGridVarTypes(p_cgrid);
 
-   for (i= 0; i< nvars; i++)
+   for (i = 0; i < nvars; i++)
    {
-      t= vartypes[i];
-      switch(t)
+      t = vartypes[i];
+      switch (t)
       {
          case 2:
          {
-            vartype_map[2]= i;
+            vartype_map[2] = i;
             break;
          }
 
          case 3:
          {
-            vartype_map[3]= i;
+            vartype_map[3] = i;
             break;
          }
 
          case 4:
          {
-            vartype_map[4]= i;
+            vartype_map[4] = i;
             break;
          }
       }
@@ -233,28 +237,28 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
    {
       p_cgrid = hypre_SStructGridPGrid(cgrid_edge, part);   /* edge cgrid */
       nvars   = hypre_SStructPGridNVars(p_cgrid);
-      vartypes= hypre_SStructPGridVarTypes(p_cgrid);
+      vartypes = hypre_SStructPGridVarTypes(p_cgrid);
 
-      for (i= 0; i< nvars; i++)
+      for (i = 0; i < nvars; i++)
       {
-         t= vartypes[i];
-         switch(t)
+         t = vartypes[i];
+         switch (t)
          {
             case 5:
             {
-               vartype_map[5]= i;
+               vartype_map[5] = i;
                break;
             }
 
             case 6:
             {
-               vartype_map[6]= i;
+               vartype_map[6] = i;
                break;
             }
 
             case 7:
             {
-               vartype_map[7]= i;
+               vartype_map[7] = i;
                break;
             }
          }
@@ -264,46 +268,46 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
    /* local sizes */
    nFaces   = 0;
    nEdges   = 0;
-   nElements= 0;
+   nElements = 0;
    nedges   = 0;
 
    nxFaces  = 0;
    nyFaces  = 0;
    nzFaces  = 0;
-   nxEdges  = 0;
-   nyEdges  = 0;
-   nzEdges  = 0;
+   /* nxEdges  = 0; */
+   /* nyEdges  = 0; */
+   /* nzEdges  = 0; */
 
-   for (part= 0; part< nparts; part++)
+   for (part = 0; part < nparts; part++)
    {
       p_cgrid   = hypre_SStructGridPGrid(cgrid_element, part);  /* cell cgrid */
       var_cgrid = hypre_SStructPGridCellSGrid(p_cgrid) ;
-      nElements+= hypre_StructGridLocalSize(var_cgrid);
+      nElements += hypre_StructGridLocalSize(var_cgrid);
 
-      t= 0;
+      t = 0;
       hypre_SStructVariableGetOffset((hypre_SStructVariable) t,
                                      ndim, varoffsets[0]);
 
       p_cgrid = hypre_SStructGridPGrid(cgrid_face, part);       /* face cgrid */
       nvars   = hypre_SStructPGridNVars(p_cgrid);
-      vartypes= hypre_SStructPGridVarTypes(p_cgrid);
+      vartypes = hypre_SStructPGridVarTypes(p_cgrid);
 
-      for (var= 0; var< nvars; var++)
+      for (var = 0; var < nvars; var++)
       {
-         var_cgrid= hypre_SStructPGridSGrid(p_cgrid, var);
-         t= vartypes[var];
-         nFaces+= hypre_StructGridLocalSize(var_cgrid);
+         var_cgrid = hypre_SStructPGridSGrid(p_cgrid, var);
+         t = vartypes[var];
+         nFaces += hypre_StructGridLocalSize(var_cgrid);
 
-         switch(t)
+         switch (t)
          {
             case 2:
-               nxFaces+= hypre_StructGridLocalSize(var_cgrid);
+               nxFaces += hypre_StructGridLocalSize(var_cgrid);
                break;
             case 3:
-               nyFaces+= hypre_StructGridLocalSize(var_cgrid);
+               nyFaces += hypre_StructGridLocalSize(var_cgrid);
                break;
             case 4:
-               nzFaces+= hypre_StructGridLocalSize(var_cgrid);
+               nzFaces += hypre_StructGridLocalSize(var_cgrid);
                break;
          }
 
@@ -315,35 +319,35 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
       if (ndim < 3)
       {
          nEdges = nFaces;
-         nxEdges= nxFaces;
-         nyEdges= nyFaces;
-         nzEdges= 0;
+         /* nxEdges = nxFaces; */
+         /* nyEdges = nyFaces; */
+         /* nzEdges = 0; */
       }
 
       else
       {
          p_cgrid = hypre_SStructGridPGrid(cgrid_edge, part);    /* edge cgrid */
          nvars   = hypre_SStructPGridNVars(p_cgrid);
-         vartypes= hypre_SStructPGridVarTypes(p_cgrid);
+         vartypes = hypre_SStructPGridVarTypes(p_cgrid);
 
-         for (var= 0; var< nvars; var++)
+         for (var = 0; var < nvars; var++)
          {
-            var_cgrid= hypre_SStructPGridSGrid(p_cgrid, var);
-            t= vartypes[var];
-            nEdges+= hypre_StructGridLocalSize(var_cgrid);
-
-            switch(t)
-            {
-               case 5:
-                  nxEdges+= hypre_StructGridLocalSize(var_cgrid);
-                  break;
-               case 6:
-                  nyEdges+= hypre_StructGridLocalSize(var_cgrid);
-                  break;
-               case 7:
-                  nzEdges+= hypre_StructGridLocalSize(var_cgrid);
-                  break;
-            }
+            var_cgrid = hypre_SStructPGridSGrid(p_cgrid, var);
+            t = vartypes[var];
+            nEdges += hypre_StructGridLocalSize(var_cgrid);
+
+            /* switch (t) */
+            /* { */
+            /*    case 5: */
+            /*       nxEdges += hypre_StructGridLocalSize(var_cgrid); */
+            /*       break; */
+            /*    case 6: */
+            /*       nyEdges += hypre_StructGridLocalSize(var_cgrid); */
+            /*       break; */
+            /*    case 7: */
+            /*       nzEdges += hypre_StructGridLocalSize(var_cgrid); */
+            /*       break; */
+            /* } */
 
             hypre_SStructVariableGetOffset((hypre_SStructVariable) t,
                                            ndim, varoffsets[t]);
@@ -353,11 +357,11 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
       /* same for 2-d & 3-d, assuming that fgrid_edge= fgrid_face in input */
       p_fgrid = hypre_SStructGridPGrid(fgrid_edge, part);    /* edge fgrid */
       nvars   = hypre_SStructPGridNVars(p_fgrid);
-      vartypes= hypre_SStructPGridVarTypes(p_fgrid);
+      vartypes = hypre_SStructPGridVarTypes(p_fgrid);
 
-      for (var= 0; var< nvars; var++)
+      for (var = 0; var < nvars; var++)
       {
-         var_fgrid= hypre_SStructPGridSGrid(p_fgrid, var);
+         var_fgrid = hypre_SStructPGridSGrid(p_fgrid, var);
          nedges  += hypre_StructGridLocalSize(var_fgrid);
       }
    }
@@ -374,33 +378,33 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
     *
     *  Also determine contracted cell-centred fboxes.
     *--------------------------------------------------------------------------*/
-   cfbox_mapping= hypre_TAlloc(HYPRE_Int *,  nparts, HYPRE_MEMORY_HOST);
-   fcbox_mapping= hypre_TAlloc(HYPRE_Int *,  nparts, HYPRE_MEMORY_HOST);
-   contract_fedgeBoxes= hypre_TAlloc(hypre_BoxArray *,  nparts, HYPRE_MEMORY_HOST);
-   Edge_cstarts= hypre_TAlloc(hypre_Index *,  nparts, HYPRE_MEMORY_HOST);
-   upper_shifts= hypre_TAlloc(hypre_Index *,  nparts, HYPRE_MEMORY_HOST);
-   lower_shifts= hypre_TAlloc(hypre_Index *,  nparts, HYPRE_MEMORY_HOST);
-
-   for (i= 0; i< nparts; i++)
+   cfbox_mapping = hypre_TAlloc(HYPRE_Int *,  nparts, HYPRE_MEMORY_HOST);
+   fcbox_mapping = hypre_TAlloc(HYPRE_Int *,  nparts, HYPRE_MEMORY_HOST);
+   contract_fedgeBoxes = hypre_TAlloc(hypre_BoxArray *,  nparts, HYPRE_MEMORY_HOST);
+   Edge_cstarts = hypre_TAlloc(hypre_Index *,  nparts, HYPRE_MEMORY_HOST);
+   upper_shifts = hypre_TAlloc(hypre_Index *,  nparts, HYPRE_MEMORY_HOST);
+   lower_shifts = hypre_TAlloc(hypre_Index *,  nparts, HYPRE_MEMORY_HOST);
+
+   for (i = 0; i < nparts; i++)
    {
       p_fgrid  = hypre_SStructGridPGrid(fgrid_element, i);
-      var_fgrid= hypre_SStructPGridCellSGrid(p_fgrid);
+      var_fgrid = hypre_SStructPGridCellSGrid(p_fgrid);
       fboxes   = hypre_StructGridBoxes(var_fgrid);
       j        = hypre_BoxArraySize(fboxes);
-      fcbox_mapping[i]= hypre_CTAlloc(HYPRE_Int,  j, HYPRE_MEMORY_HOST);
+      fcbox_mapping[i] = hypre_CTAlloc(HYPRE_Int,  j, HYPRE_MEMORY_HOST);
 
       p_cgrid  = hypre_SStructGridPGrid(cgrid_element, i);
-      var_cgrid= hypre_SStructPGridCellSGrid(p_cgrid);
+      var_cgrid = hypre_SStructPGridCellSGrid(p_cgrid);
       cboxes   = hypre_StructGridBoxes(var_cgrid);
       j        = hypre_BoxArraySize(fboxes);
-      cfbox_mapping[i]= hypre_CTAlloc(HYPRE_Int,  j, HYPRE_MEMORY_HOST);
+      cfbox_mapping[i] = hypre_CTAlloc(HYPRE_Int,  j, HYPRE_MEMORY_HOST);
 
       /* assuming if i1 > i2 and (box j1) is coarsened from (box i1)
          and (box j2) from (box i2), then j1 > j2. */
-      k= 0;
+      k = 0;
       hypre_ForBoxI(j, fboxes)
       {
-         fbox= hypre_BoxArrayBox(fboxes, j);
+         fbox = hypre_BoxArrayBox(fboxes, j);
          hypre_CopyBox(fbox, &copy_box);
          hypre_ProjectBox(&copy_box, zero_index, rfactor);
          hypre_StructMapFineToCoarse(hypre_BoxIMin(&copy_box), zero_index,
@@ -412,46 +416,46 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
             ordering, we only have to check if the first cbox in the
             list intersects with copy_box. If not, this fbox vanished in the
             coarsening. Note that this gives you the correct interior cbox. */
-         cbox= hypre_BoxArrayBox(cboxes, k);
+         cbox = hypre_BoxArrayBox(cboxes, k);
          hypre_IntersectBoxes(&copy_box, cbox, &copy_box);
          if (hypre_BoxVolume(&copy_box))
          {
-            cfbox_mapping[i][k]= j;
-            fcbox_mapping[i][j]= k;
+            cfbox_mapping[i][k] = j;
+            fcbox_mapping[i][j] = k;
             k++;
          }  /* if (hypre_BoxVolume(&copy_box)) */
       }     /* hypre_ForBoxI(j, fboxes) */
 
       /* fill up the contracted box_array */
-      contract_fedgeBoxes[i]= hypre_BoxArrayCreate(0, ndim);
-      Edge_cstarts[i]= hypre_TAlloc(hypre_Index,  hypre_BoxArraySize(fboxes), HYPRE_MEMORY_HOST);
-      upper_shifts[i]= hypre_TAlloc(hypre_Index,  hypre_BoxArraySize(fboxes), HYPRE_MEMORY_HOST);
-      lower_shifts[i]= hypre_TAlloc(hypre_Index,  hypre_BoxArraySize(fboxes), HYPRE_MEMORY_HOST);
+      contract_fedgeBoxes[i] = hypre_BoxArrayCreate(0, ndim);
+      Edge_cstarts[i] = hypre_TAlloc(hypre_Index,  hypre_BoxArraySize(fboxes), HYPRE_MEMORY_HOST);
+      upper_shifts[i] = hypre_TAlloc(hypre_Index,  hypre_BoxArraySize(fboxes), HYPRE_MEMORY_HOST);
+      lower_shifts[i] = hypre_TAlloc(hypre_Index,  hypre_BoxArraySize(fboxes), HYPRE_MEMORY_HOST);
       hypre_ForBoxI(j, fboxes)
       {
-         fbox= hypre_BoxArrayBox(fboxes, j);
+         fbox = hypre_BoxArrayBox(fboxes, j);
 
          /* contract the fbox to correspond to the correct cbox */
-         cbox= hypre_BoxContraction(fbox, var_fgrid, rfactor);
+         cbox = hypre_BoxContraction(fbox, var_fgrid, rfactor);
          hypre_AppendBox(cbox, contract_fedgeBoxes[i]);
 
          /* record the offset mapping between the coarse cell index and
             the fine cell index */
          hypre_ClearIndex(upper_shifts[i][j]);
          hypre_ClearIndex(lower_shifts[i][j]);
-         for (l= 0; l< ndim; l++)
+         for (l = 0; l < ndim; l++)
          {
-            m= hypre_BoxIMin(cbox)[l];
-            p= m%rfactor[l];
+            m = hypre_BoxIMin(cbox)[l];
+            p = m % rfactor[l];
             if (p > 0 && m > 0)
             {
-               upper_shifts[i][j][l]= p-1;
-               lower_shifts[i][j][l]= p-rfactor[l];
+               upper_shifts[i][j][l] = p - 1;
+               lower_shifts[i][j][l] = p - rfactor[l];
             }
             else
             {
-               upper_shifts[i][j][l]= rfactor[l]-p-1;
-               lower_shifts[i][j][l]=-p;
+               upper_shifts[i][j][l] = rfactor[l] - p - 1;
+               lower_shifts[i][j][l] = -p;
             }
          }
 
@@ -468,27 +472,27 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
    /* variable rank bounds for this processor */
    n_CtoVbox   = hypre_TAlloc(HYPRE_Int **,  nparts, HYPRE_MEMORY_HOST);
    CtoVboxnums = hypre_TAlloc(HYPRE_Int ***,  nparts, HYPRE_MEMORY_HOST);
-   for (part= 0; part< nparts; part++)
+   for (part = 0; part < nparts; part++)
    {
       hypre_SStructCellGridBoxNumMap(fgrid_edge, part, &n_CtoVbox[part],
                                      &CtoVboxnums[part]);
    }
 
    /* variable rank bounds for this processor */
-   flower_ranks= hypre_TAlloc(HYPRE_BigInt *,  nparts, HYPRE_MEMORY_HOST);
-   fupper_ranks= hypre_TAlloc(HYPRE_BigInt *,  nparts, HYPRE_MEMORY_HOST);
+   flower_ranks = hypre_TAlloc(HYPRE_BigInt *,  nparts, HYPRE_MEMORY_HOST);
+   fupper_ranks = hypre_TAlloc(HYPRE_BigInt *,  nparts, HYPRE_MEMORY_HOST);
 
-   clower_ranks= hypre_TAlloc(HYPRE_BigInt *,  nparts, HYPRE_MEMORY_HOST);
-   cupper_ranks= hypre_TAlloc(HYPRE_BigInt *,  nparts, HYPRE_MEMORY_HOST);
-   for (part= 0; part< nparts; part++)
+   clower_ranks = hypre_TAlloc(HYPRE_BigInt *,  nparts, HYPRE_MEMORY_HOST);
+   cupper_ranks = hypre_TAlloc(HYPRE_BigInt *,  nparts, HYPRE_MEMORY_HOST);
+   for (part = 0; part < nparts; part++)
    {
-      flower_ranks[part]= hypre_CTAlloc(HYPRE_BigInt,  tot_vars, HYPRE_MEMORY_HOST);
-      fupper_ranks[part]= hypre_CTAlloc(HYPRE_BigInt,  tot_vars, HYPRE_MEMORY_HOST);
+      flower_ranks[part] = hypre_CTAlloc(HYPRE_BigInt,  tot_vars, HYPRE_MEMORY_HOST);
+      fupper_ranks[part] = hypre_CTAlloc(HYPRE_BigInt,  tot_vars, HYPRE_MEMORY_HOST);
 
       /* cell grid ranks */
-      p_fgrid= hypre_SStructGridPGrid(fgrid_element, part);
-      var_fgrid= hypre_SStructPGridSGrid(p_fgrid, 0);
-      box_array= hypre_StructGridBoxes(var_fgrid);
+      p_fgrid = hypre_SStructGridPGrid(fgrid_element, part);
+      var_fgrid = hypre_SStructPGridSGrid(p_fgrid, 0);
+      box_array = hypre_StructGridBoxes(var_fgrid);
 
       fbox     = hypre_BoxArrayBox(box_array, 0);
       hypre_CopyIndex(hypre_BoxIMin(fbox), findex);
@@ -497,19 +501,19 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
       hypre_SStructBoxManEntryGetGlobalRank(entry, findex, &flower_ranks[part][0],
                                             matrix_type);
 
-      fbox= hypre_BoxArrayBox(box_array, hypre_BoxArraySize(box_array)-1);
+      fbox = hypre_BoxArrayBox(box_array, hypre_BoxArraySize(box_array) - 1);
       hypre_CopyIndex(hypre_BoxIMax(fbox), findex);
       hypre_SStructGridFindBoxManEntry(fgrid_edge, part, findex, 0,
                                        &entry);
       hypre_SStructBoxManEntryGetGlobalRank(entry, findex, &fupper_ranks[part][0],
                                             matrix_type);
 
-      clower_ranks[part]= hypre_CTAlloc(HYPRE_BigInt,  tot_vars, HYPRE_MEMORY_HOST);
-      cupper_ranks[part]= hypre_CTAlloc(HYPRE_BigInt,  tot_vars, HYPRE_MEMORY_HOST);
+      clower_ranks[part] = hypre_CTAlloc(HYPRE_BigInt,  tot_vars, HYPRE_MEMORY_HOST);
+      cupper_ranks[part] = hypre_CTAlloc(HYPRE_BigInt,  tot_vars, HYPRE_MEMORY_HOST);
 
-      p_cgrid= hypre_SStructGridPGrid(cgrid_element, part);
-      var_cgrid= hypre_SStructPGridSGrid(p_cgrid, 0);
-      box_array= hypre_StructGridBoxes(var_cgrid);
+      p_cgrid = hypre_SStructGridPGrid(cgrid_element, part);
+      var_cgrid = hypre_SStructPGridSGrid(p_cgrid, 0);
+      box_array = hypre_StructGridBoxes(var_cgrid);
 
       cbox     = hypre_BoxArrayBox(box_array, 0);
       hypre_CopyIndex(hypre_BoxIMin(cbox), cindex);
@@ -518,7 +522,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
       hypre_SStructBoxManEntryGetGlobalRank(entry, cindex, &clower_ranks[part][0],
                                             matrix_type);
 
-      cbox= hypre_BoxArrayBox(box_array, hypre_BoxArraySize(box_array)-1);
+      cbox = hypre_BoxArrayBox(box_array, hypre_BoxArraySize(box_array) - 1);
       hypre_CopyIndex(hypre_BoxIMax(cbox), cindex);
       hypre_SStructGridFindBoxManEntry(cgrid_edge, part, cindex, 0,
                                        &entry);
@@ -526,16 +530,16 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                             matrix_type);
 
       /* face grid ranks */
-      p_fgrid= hypre_SStructGridPGrid(fgrid_face, part);
-      p_cgrid= hypre_SStructGridPGrid(cgrid_face, part);
+      p_fgrid = hypre_SStructGridPGrid(fgrid_face, part);
+      p_cgrid = hypre_SStructGridPGrid(cgrid_face, part);
       nvars  = hypre_SStructPGridNVars(p_fgrid);
-      vartypes= hypre_SStructPGridVarTypes(p_cgrid);
+      vartypes = hypre_SStructPGridVarTypes(p_cgrid);
 
-      for (i= 0; i< nvars; i++)
+      for (i = 0; i < nvars; i++)
       {
-         t= vartypes[i];
-         var_fgrid= hypre_SStructPGridSGrid(p_fgrid, i);
-         box_array= hypre_StructGridBoxes(var_fgrid);
+         t = vartypes[i];
+         var_fgrid = hypre_SStructPGridSGrid(p_fgrid, i);
+         box_array = hypre_StructGridBoxes(var_fgrid);
 
          fbox     = hypre_BoxArrayBox(box_array, 0);
          hypre_CopyIndex(hypre_BoxIMin(fbox), findex);
@@ -544,15 +548,15 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
          hypre_SStructBoxManEntryGetGlobalRank(entry, findex, &flower_ranks[part][t],
                                                matrix_type);
 
-         fbox= hypre_BoxArrayBox(box_array, hypre_BoxArraySize(box_array)-1);
+         fbox = hypre_BoxArrayBox(box_array, hypre_BoxArraySize(box_array) - 1);
          hypre_CopyIndex(hypre_BoxIMax(fbox), findex);
          hypre_SStructGridFindBoxManEntry(fgrid_face, part, findex, i,
                                           &entry);
          hypre_SStructBoxManEntryGetGlobalRank(entry, findex, &fupper_ranks[part][t],
                                                matrix_type);
 
-         var_cgrid= hypre_SStructPGridSGrid(p_cgrid, i);
-         box_array= hypre_StructGridBoxes(var_cgrid);
+         var_cgrid = hypre_SStructPGridSGrid(p_cgrid, i);
+         box_array = hypre_StructGridBoxes(var_cgrid);
          cbox     = hypre_BoxArrayBox(box_array, 0);
          hypre_CopyIndex(hypre_BoxIMin(cbox), cindex);
          hypre_SStructGridFindBoxManEntry(cgrid_face, part, cindex, i,
@@ -560,7 +564,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
          hypre_SStructBoxManEntryGetGlobalRank(entry, cindex, &clower_ranks[part][t],
                                                matrix_type);
 
-         cbox= hypre_BoxArrayBox(box_array, hypre_BoxArraySize(box_array)-1);
+         cbox = hypre_BoxArrayBox(box_array, hypre_BoxArraySize(box_array) - 1);
          hypre_CopyIndex(hypre_BoxIMax(cbox), cindex);
          hypre_SStructGridFindBoxManEntry(cgrid_face, part, cindex, i,
                                           &entry);
@@ -568,16 +572,16 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                matrix_type);
       }
       /* edge grid ranks */
-      p_fgrid= hypre_SStructGridPGrid(fgrid_edge, part);
-      p_cgrid= hypre_SStructGridPGrid(cgrid_edge, part);
+      p_fgrid = hypre_SStructGridPGrid(fgrid_edge, part);
+      p_cgrid = hypre_SStructGridPGrid(cgrid_edge, part);
       nvars  = hypre_SStructPGridNVars(p_fgrid);
-      vartypes= hypre_SStructPGridVarTypes(p_cgrid);
+      vartypes = hypre_SStructPGridVarTypes(p_cgrid);
 
-      for (i= 0; i< nvars; i++)
+      for (i = 0; i < nvars; i++)
       {
-         t= vartypes[i];
-         var_fgrid= hypre_SStructPGridSGrid(p_fgrid, i);
-         box_array= hypre_StructGridBoxes(var_fgrid);
+         t = vartypes[i];
+         var_fgrid = hypre_SStructPGridSGrid(p_fgrid, i);
+         box_array = hypre_StructGridBoxes(var_fgrid);
 
          fbox     = hypre_BoxArrayBox(box_array, 0);
          hypre_CopyIndex(hypre_BoxIMin(fbox), findex);
@@ -586,15 +590,15 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
          hypre_SStructBoxManEntryGetGlobalRank(entry, findex, &flower_ranks[part][t],
                                                matrix_type);
 
-         fbox= hypre_BoxArrayBox(box_array, hypre_BoxArraySize(box_array)-1);
+         fbox = hypre_BoxArrayBox(box_array, hypre_BoxArraySize(box_array) - 1);
          hypre_CopyIndex(hypre_BoxIMax(fbox), findex);
          hypre_SStructGridFindBoxManEntry(fgrid_edge, part, findex, i,
                                           &entry);
          hypre_SStructBoxManEntryGetGlobalRank(entry, findex, &fupper_ranks[part][t],
                                                matrix_type);
 
-         var_cgrid= hypre_SStructPGridSGrid(p_cgrid, i);
-         box_array= hypre_StructGridBoxes(var_cgrid);
+         var_cgrid = hypre_SStructPGridSGrid(p_cgrid, i);
+         box_array = hypre_StructGridBoxes(var_cgrid);
          cbox     = hypre_BoxArrayBox(box_array, 0);
          hypre_CopyIndex(hypre_BoxIMin(cbox), cindex);
          hypre_SStructGridFindBoxManEntry(cgrid_edge, part, cindex, i,
@@ -602,7 +606,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
          hypre_SStructBoxManEntryGetGlobalRank(entry, cindex, &clower_ranks[part][t],
                                                matrix_type);
 
-         cbox= hypre_BoxArrayBox(box_array, hypre_BoxArraySize(box_array)-1);
+         cbox = hypre_BoxArrayBox(box_array, hypre_BoxArraySize(box_array) - 1);
          hypre_CopyIndex(hypre_BoxIMax(cbox), cindex);
          hypre_SStructGridFindBoxManEntry(cgrid_edge, part, cindex, i,
                                           &entry);
@@ -618,12 +622,12 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
 
    /* Element_iedge- same for 2-d and 3-d */
    /* lower rank */
-   part= 0;
+   part = 0;
    box = 0;
    hypre_SStructGridBoxProcFindBoxManEntry(cgrid_element, part, 0, box, myproc, &entry);
 
    p_cgrid  = hypre_SStructGridPGrid(cgrid_element, part);
-   var_cgrid= hypre_SStructPGridCellSGrid(p_cgrid) ;
+   var_cgrid = hypre_SStructPGridCellSGrid(p_cgrid) ;
    cboxes   = hypre_StructGridBoxes(var_cgrid);
    cbox     = hypre_BoxArrayBox(cboxes, 0);
    hypre_SStructBoxManEntryGetGlobalCSRank(entry, hypre_BoxIMin(cbox), &ilower);
@@ -631,30 +635,30 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
    p_fgrid = hypre_SStructGridPGrid(fgrid_edge, part);
    hypre_SStructGridBoxProcFindBoxManEntry(fgrid_edge, part, 0, box, myproc, &entry);
 
-   var_fgrid= hypre_SStructPGridSGrid(p_fgrid, 0);
+   var_fgrid = hypre_SStructPGridSGrid(p_fgrid, 0);
    fboxes   = hypre_StructGridBoxes(var_fgrid);
    fbox     = hypre_BoxArrayBox(fboxes, 0);
    hypre_SStructBoxManEntryGetGlobalCSRank(entry, hypre_BoxIMin(fbox), &jlower);
 
    /* upper rank */
-   part= nparts-1;
+   part = nparts - 1;
    p_cgrid  = hypre_SStructGridPGrid(cgrid_element, part);
-   var_cgrid= hypre_SStructPGridCellSGrid(p_cgrid) ;
+   var_cgrid = hypre_SStructPGridCellSGrid(p_cgrid) ;
    cboxes   = hypre_StructGridBoxes(var_cgrid);
-   cbox     = hypre_BoxArrayBox(cboxes, hypre_BoxArraySize(cboxes)-1);
+   cbox     = hypre_BoxArrayBox(cboxes, hypre_BoxArraySize(cboxes) - 1);
 
-   hypre_SStructGridBoxProcFindBoxManEntry(cgrid_element, part, 0, hypre_BoxArraySize(cboxes)-1,
+   hypre_SStructGridBoxProcFindBoxManEntry(cgrid_element, part, 0, hypre_BoxArraySize(cboxes) - 1,
                                            myproc, &entry);
    hypre_SStructBoxManEntryGetGlobalCSRank(entry, hypre_BoxIMax(cbox), &iupper);
 
    p_fgrid = hypre_SStructGridPGrid(fgrid_edge, part);
    nvars   = hypre_SStructPGridNVars(p_fgrid);
 
-   var_fgrid= hypre_SStructPGridSGrid(p_fgrid, nvars-1);
+   var_fgrid = hypre_SStructPGridSGrid(p_fgrid, nvars - 1);
    fboxes   = hypre_StructGridBoxes(var_fgrid);
-   fbox     = hypre_BoxArrayBox(fboxes, hypre_BoxArraySize(fboxes)-1);
+   fbox     = hypre_BoxArrayBox(fboxes, hypre_BoxArraySize(fboxes) - 1);
 
-   hypre_SStructGridBoxProcFindBoxManEntry(fgrid_edge, part, nvars-1, hypre_BoxArraySize(fboxes)-1,
+   hypre_SStructGridBoxProcFindBoxManEntry(fgrid_edge, part, nvars - 1, hypre_BoxArraySize(fboxes) - 1,
                                            myproc, &entry);
    hypre_SStructBoxManEntryGetGlobalCSRank(entry, hypre_BoxIMax(fbox), &jupper);
 
@@ -666,40 +670,40 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
     * truncated edges are not), we use the ranks determined by the Edge/edge grids.
     * Same for 2-d and 3-d. */
    /* lower rank */
-   part= 0;
+   part = 0;
    box = 0;
    hypre_SStructGridBoxProcFindBoxManEntry(cgrid_edge, part, 0, box, myproc, &entry);
    p_cgrid = hypre_SStructGridPGrid(cgrid_edge, part);
-   var_cgrid= hypre_SStructPGridSGrid(p_cgrid, 0);
+   var_cgrid = hypre_SStructPGridSGrid(p_cgrid, 0);
    cboxes   = hypre_StructGridBoxes(var_cgrid);
    cbox    = hypre_BoxArrayBox(cboxes, 0);
    hypre_SStructBoxManEntryGetGlobalCSRank(entry, hypre_BoxIMin(cbox), &ilower);
 
    hypre_SStructGridBoxProcFindBoxManEntry(fgrid_edge, part, 0, box, myproc, &entry);
    p_fgrid = hypre_SStructGridPGrid(fgrid_edge, part);
-   var_fgrid= hypre_SStructPGridSGrid(p_fgrid, 0);
+   var_fgrid = hypre_SStructPGridSGrid(p_fgrid, 0);
    fboxes   = hypre_StructGridBoxes(var_fgrid);
    fbox    = hypre_BoxArrayBox(fboxes, 0);
    hypre_SStructBoxManEntryGetGlobalCSRank(entry, hypre_BoxIMin(fbox), &jlower);
 
    /* upper rank */
-   part= nparts-1;
+   part = nparts - 1;
    p_cgrid = hypre_SStructGridPGrid(cgrid_edge, part);
    nvars   = hypre_SStructPGridNVars(p_cgrid);
-   var_cgrid= hypre_SStructPGridSGrid(p_cgrid, nvars-1);
+   var_cgrid = hypre_SStructPGridSGrid(p_cgrid, nvars - 1);
    cboxes   = hypre_StructGridBoxes(var_cgrid);
-   cbox    = hypre_BoxArrayBox(cboxes, hypre_BoxArraySize(cboxes)-1);
-   hypre_SStructGridBoxProcFindBoxManEntry(cgrid_edge, part, nvars-1,
-                                           hypre_BoxArraySize(cboxes)-1, myproc, &entry);
+   cbox    = hypre_BoxArrayBox(cboxes, hypre_BoxArraySize(cboxes) - 1);
+   hypre_SStructGridBoxProcFindBoxManEntry(cgrid_edge, part, nvars - 1,
+                                           hypre_BoxArraySize(cboxes) - 1, myproc, &entry);
    hypre_SStructBoxManEntryGetGlobalCSRank(entry, hypre_BoxIMax(cbox), &iupper);
 
    p_fgrid = hypre_SStructGridPGrid(fgrid_edge, part);
    nvars   = hypre_SStructPGridNVars(p_fgrid);
-   var_fgrid= hypre_SStructPGridSGrid(p_fgrid, nvars-1);
+   var_fgrid = hypre_SStructPGridSGrid(p_fgrid, nvars - 1);
    fboxes   = hypre_StructGridBoxes(var_fgrid);
-   fbox    = hypre_BoxArrayBox(fboxes, hypre_BoxArraySize(fboxes)-1);
-   hypre_SStructGridBoxProcFindBoxManEntry(fgrid_edge, part, nvars-1,
-                                           hypre_BoxArraySize(fboxes)-1, myproc, &entry);
+   fbox    = hypre_BoxArrayBox(fboxes, hypre_BoxArraySize(fboxes) - 1);
+   hypre_SStructGridBoxProcFindBoxManEntry(fgrid_edge, part, nvars - 1,
+                                           hypre_BoxArraySize(fboxes) - 1, myproc, &entry);
    hypre_SStructBoxManEntryGetGlobalCSRank(entry, hypre_BoxIMax(fbox), &jupper);
 
    HYPRE_IJMatrixCreate(comm, ilower, iupper, jlower, jupper, &Edge_iedge);
@@ -708,90 +712,90 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
 
    /* edge_Edge. Same for 2-d and 3-d. */
    /* lower rank */
-   part= 0;
+   part = 0;
    box = 0;
    hypre_SStructGridBoxProcFindBoxManEntry(fgrid_edge, part, 0, box, myproc, &entry);
    p_fgrid = hypre_SStructGridPGrid(fgrid_edge, part);
-   var_fgrid= hypre_SStructPGridSGrid(p_fgrid, 0);
+   var_fgrid = hypre_SStructPGridSGrid(p_fgrid, 0);
    fboxes   = hypre_StructGridBoxes(var_fgrid);
    fbox    = hypre_BoxArrayBox(fboxes, 0);
    hypre_SStructBoxManEntryGetGlobalCSRank(entry, hypre_BoxIMin(fbox), &ilower);
 
    hypre_SStructGridBoxProcFindBoxManEntry(cgrid_edge, part, 0, box, myproc, &entry);
    p_cgrid = hypre_SStructGridPGrid(cgrid_edge, part);
-   var_cgrid= hypre_SStructPGridSGrid(p_cgrid, 0);
+   var_cgrid = hypre_SStructPGridSGrid(p_cgrid, 0);
    cboxes   = hypre_StructGridBoxes(var_cgrid);
    cbox    = hypre_BoxArrayBox(cboxes, 0);
    hypre_SStructBoxManEntryGetGlobalCSRank(entry, hypre_BoxIMin(cbox), &jlower);
 
    /* upper rank */
-   part= nparts-1;
+   part = nparts - 1;
    p_fgrid = hypre_SStructGridPGrid(fgrid_edge, part);
    nvars   = hypre_SStructPGridNVars(p_fgrid);
-   var_fgrid= hypre_SStructPGridSGrid(p_fgrid, nvars-1);
+   var_fgrid = hypre_SStructPGridSGrid(p_fgrid, nvars - 1);
    fboxes   = hypre_StructGridBoxes(var_fgrid);
-   fbox    = hypre_BoxArrayBox(fboxes, hypre_BoxArraySize(fboxes)-1);
+   fbox    = hypre_BoxArrayBox(fboxes, hypre_BoxArraySize(fboxes) - 1);
 
-   hypre_SStructGridBoxProcFindBoxManEntry(fgrid_edge, part, nvars-1,
-                                           hypre_BoxArraySize(fboxes)-1, myproc, &entry);
+   hypre_SStructGridBoxProcFindBoxManEntry(fgrid_edge, part, nvars - 1,
+                                           hypre_BoxArraySize(fboxes) - 1, myproc, &entry);
    hypre_SStructBoxManEntryGetGlobalCSRank(entry, hypre_BoxIMax(fbox), &iupper);
 
    p_cgrid = hypre_SStructGridPGrid(cgrid_edge, part);
    nvars   = hypre_SStructPGridNVars(p_cgrid);
-   var_cgrid= hypre_SStructPGridSGrid(p_cgrid, nvars-1);
+   var_cgrid = hypre_SStructPGridSGrid(p_cgrid, nvars - 1);
    cboxes   = hypre_StructGridBoxes(var_cgrid);
-   cbox    = hypre_BoxArrayBox(cboxes, hypre_BoxArraySize(cboxes)-1);
+   cbox    = hypre_BoxArrayBox(cboxes, hypre_BoxArraySize(cboxes) - 1);
 
-   hypre_SStructGridBoxProcFindBoxManEntry(cgrid_edge, part, nvars-1,
-                                           hypre_BoxArraySize(cboxes)-1, myproc, &entry);
+   hypre_SStructGridBoxProcFindBoxManEntry(cgrid_edge, part, nvars - 1,
+                                           hypre_BoxArraySize(cboxes) - 1, myproc, &entry);
    hypre_SStructBoxManEntryGetGlobalCSRank(entry, hypre_BoxIMax(cbox), &jupper);
 
    HYPRE_IJMatrixCreate(comm, ilower, iupper, jlower, jupper, &edge_Edge);
-   HYPRE_IJMatrixSetObjectType(edge_Edge , HYPRE_PARCSR);
+   HYPRE_IJMatrixSetObjectType(edge_Edge, HYPRE_PARCSR);
    HYPRE_IJMatrixInitialize(edge_Edge);
 
    /* Face_iedge. Only needed in 3-d. */
    if (ndim == 3)
    {
       /* lower rank */
-      part= 0;
+      part = 0;
       box = 0;
       hypre_SStructGridBoxProcFindBoxManEntry(cgrid_face, part, 0, box, myproc, &entry);
 
       p_cgrid  = hypre_SStructGridPGrid(cgrid_face, part);
-      var_cgrid= hypre_SStructPGridSGrid(p_cgrid, 0);
+      var_cgrid = hypre_SStructPGridSGrid(p_cgrid, 0);
       cboxes   = hypre_StructGridBoxes(var_cgrid);
       cbox     = hypre_BoxArrayBox(cboxes, 0);
       hypre_SStructBoxManEntryGetGlobalCSRank(entry, hypre_BoxIMin(cbox), &ilower);
 
       hypre_SStructGridBoxProcFindBoxManEntry(fgrid_edge, part, 0, box, myproc, &entry);
       p_fgrid = hypre_SStructGridPGrid(fgrid_edge, part);
-      var_fgrid= hypre_SStructPGridSGrid(p_fgrid, 0);
+      var_fgrid = hypre_SStructPGridSGrid(p_fgrid, 0);
       fboxes   = hypre_StructGridBoxes(var_fgrid);
       fbox     = hypre_BoxArrayBox(fboxes, 0);
       hypre_SStructBoxManEntryGetGlobalCSRank(entry, hypre_BoxIMin(fbox), &jlower);
 
       /* upper rank */
-      part= nparts-1;
+      part = nparts - 1;
       p_cgrid = hypre_SStructGridPGrid(cgrid_face, part);
       nvars   = hypre_SStructPGridNVars(p_cgrid);
-      var_cgrid= hypre_SStructPGridSGrid(p_cgrid, nvars-1);
+      var_cgrid = hypre_SStructPGridSGrid(p_cgrid, nvars - 1);
       cboxes   = hypre_StructGridBoxes(var_cgrid);
-      cbox    = hypre_BoxArrayBox(cboxes, hypre_BoxArraySize(cboxes)-1);
+      cbox    = hypre_BoxArrayBox(cboxes, hypre_BoxArraySize(cboxes) - 1);
 
-      hypre_SStructGridBoxProcFindBoxManEntry(cgrid_face, part, nvars-1,
-                                              hypre_BoxArraySize(cboxes)-1, myproc, &entry);
+      hypre_SStructGridBoxProcFindBoxManEntry(cgrid_face, part, nvars - 1,
+                                              hypre_BoxArraySize(cboxes) - 1, myproc, &entry);
       hypre_SStructBoxManEntryGetGlobalCSRank(entry, hypre_BoxIMax(cbox), &iupper);
 
       p_fgrid = hypre_SStructGridPGrid(fgrid_edge, part);
       nvars   = hypre_SStructPGridNVars(p_fgrid);
 
-      var_fgrid= hypre_SStructPGridSGrid(p_fgrid, nvars-1);
+      var_fgrid = hypre_SStructPGridSGrid(p_fgrid, nvars - 1);
       fboxes   = hypre_StructGridBoxes(var_fgrid);
-      fbox     = hypre_BoxArrayBox(fboxes, hypre_BoxArraySize(fboxes)-1);
+      fbox     = hypre_BoxArrayBox(fboxes, hypre_BoxArraySize(fboxes) - 1);
 
-      hypre_SStructGridBoxProcFindBoxManEntry(fgrid_edge, part, nvars-1,
-                                              hypre_BoxArraySize(fboxes)-1, myproc, &entry);
+      hypre_SStructGridBoxProcFindBoxManEntry(fgrid_edge, part, nvars - 1,
+                                              hypre_BoxArraySize(fboxes) - 1, myproc, &entry);
       hypre_SStructBoxManEntryGetGlobalCSRank(entry, hypre_BoxIMax(fbox), &jupper);
 
       HYPRE_IJMatrixCreate(comm, ilower, iupper, jlower, jupper, &Face_iedge);
@@ -803,13 +807,13 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
    /* lower rank */
    if (ndim == 3)
    {
-      part= 0;
+      part = 0;
       box = 0;
       hypre_SStructGridBoxProcFindBoxManEntry(cgrid_element, part, 0, box,
                                               myproc, &entry);
 
       p_cgrid  = hypre_SStructGridPGrid(cgrid_element, part);
-      var_cgrid= hypre_SStructPGridSGrid(p_cgrid, 0);
+      var_cgrid = hypre_SStructPGridSGrid(p_cgrid, 0);
       cboxes   = hypre_StructGridBoxes(var_cgrid);
       cbox     = hypre_BoxArrayBox(cboxes, 0);
       hypre_SStructBoxManEntryGetGlobalCSRank(entry, hypre_BoxIMin(cbox), &ilower);
@@ -817,31 +821,31 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
       hypre_SStructGridBoxProcFindBoxManEntry(cgrid_face, part, 0, box,
                                               myproc, &entry);
       p_cgrid = hypre_SStructGridPGrid(cgrid_face, part);
-      var_cgrid= hypre_SStructPGridSGrid(p_cgrid, 0);
+      var_cgrid = hypre_SStructPGridSGrid(p_cgrid, 0);
       cboxes  = hypre_StructGridBoxes(var_cgrid);
       cbox    = hypre_BoxArrayBox(cboxes, 0);
       hypre_SStructBoxManEntryGetGlobalCSRank(entry, hypre_BoxIMin(cbox), &jlower);
 
       /* upper rank */
-      part= nparts-1;
+      part = nparts - 1;
       p_cgrid = hypre_SStructGridPGrid(cgrid_element, part);
       nvars   = hypre_SStructPGridNVars(p_cgrid);
-      var_cgrid= hypre_SStructPGridSGrid(p_cgrid, nvars-1);
+      var_cgrid = hypre_SStructPGridSGrid(p_cgrid, nvars - 1);
       cboxes  = hypre_StructGridBoxes(var_cgrid);
-      cbox    = hypre_BoxArrayBox(cboxes, hypre_BoxArraySize(cboxes)-1);
+      cbox    = hypre_BoxArrayBox(cboxes, hypre_BoxArraySize(cboxes) - 1);
 
-      hypre_SStructGridBoxProcFindBoxManEntry(cgrid_element, part, nvars-1,
-                                              hypre_BoxArraySize(cboxes)-1, myproc, &entry);
+      hypre_SStructGridBoxProcFindBoxManEntry(cgrid_element, part, nvars - 1,
+                                              hypre_BoxArraySize(cboxes) - 1, myproc, &entry);
       hypre_SStructBoxManEntryGetGlobalCSRank(entry, hypre_BoxIMax(cbox), &iupper);
 
       p_cgrid = hypre_SStructGridPGrid(cgrid_face, part);
       nvars   = hypre_SStructPGridNVars(p_cgrid);
-      var_cgrid= hypre_SStructPGridSGrid(p_cgrid, nvars-1);
+      var_cgrid = hypre_SStructPGridSGrid(p_cgrid, nvars - 1);
       cboxes  = hypre_StructGridBoxes(var_cgrid);
-      cbox    = hypre_BoxArrayBox(cboxes, hypre_BoxArraySize(cboxes)-1);
+      cbox    = hypre_BoxArrayBox(cboxes, hypre_BoxArraySize(cboxes) - 1);
 
-      hypre_SStructGridBoxProcFindBoxManEntry(cgrid_face, part, nvars-1,
-                                              hypre_BoxArraySize(cboxes)-1, myproc, &entry);
+      hypre_SStructGridBoxProcFindBoxManEntry(cgrid_face, part, nvars - 1,
+                                              hypre_BoxArraySize(cboxes) - 1, myproc, &entry);
       hypre_SStructBoxManEntryGetGlobalCSRank(entry, hypre_BoxIMax(cbox), &jupper);
 
       HYPRE_IJMatrixCreate(comm, ilower, iupper, jlower, jupper, &Element_Face);
@@ -851,43 +855,43 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
 
    /* Element_Edge. Same for 2-d and 3-d. */
    /* lower rank */
-   part= 0;
+   part = 0;
    box = 0;
    hypre_SStructGridBoxProcFindBoxManEntry(cgrid_element, part, 0, box, myproc, &entry);
 
    p_cgrid  = hypre_SStructGridPGrid(cgrid_element, part);
-   var_cgrid= hypre_SStructPGridSGrid(p_cgrid, 0);
+   var_cgrid = hypre_SStructPGridSGrid(p_cgrid, 0);
    cboxes   = hypre_StructGridBoxes(var_cgrid);
    cbox     = hypre_BoxArrayBox(cboxes, 0);
    hypre_SStructBoxManEntryGetGlobalCSRank(entry, hypre_BoxIMin(cbox), &ilower);
 
    hypre_SStructGridBoxProcFindBoxManEntry(cgrid_edge, part, 0, box, myproc, &entry);
    p_cgrid = hypre_SStructGridPGrid(cgrid_edge, part);
-   var_cgrid= hypre_SStructPGridSGrid(p_cgrid, 0);
+   var_cgrid = hypre_SStructPGridSGrid(p_cgrid, 0);
    cboxes  = hypre_StructGridBoxes(var_cgrid);
    cbox    = hypre_BoxArrayBox(cboxes, 0);
    hypre_SStructBoxManEntryGetGlobalCSRank(entry, hypre_BoxIMin(cbox), &jlower);
 
    /* upper rank */
-   part= nparts-1;
+   part = nparts - 1;
    p_cgrid = hypre_SStructGridPGrid(cgrid_element, part);
    nvars   = hypre_SStructPGridNVars(p_cgrid);
-   var_cgrid= hypre_SStructPGridSGrid(p_cgrid, nvars-1);
+   var_cgrid = hypre_SStructPGridSGrid(p_cgrid, nvars - 1);
    cboxes  = hypre_StructGridBoxes(var_cgrid);
-   cbox    = hypre_BoxArrayBox(cboxes, hypre_BoxArraySize(cboxes)-1);
+   cbox    = hypre_BoxArrayBox(cboxes, hypre_BoxArraySize(cboxes) - 1);
 
-   hypre_SStructGridBoxProcFindBoxManEntry(cgrid_element, part, nvars-1,
-                                           hypre_BoxArraySize(cboxes)-1, myproc, &entry);
+   hypre_SStructGridBoxProcFindBoxManEntry(cgrid_element, part, nvars - 1,
+                                           hypre_BoxArraySize(cboxes) - 1, myproc, &entry);
    hypre_SStructBoxManEntryGetGlobalCSRank(entry, hypre_BoxIMax(cbox), &iupper);
 
    p_cgrid = hypre_SStructGridPGrid(cgrid_edge, part);
    nvars   = hypre_SStructPGridNVars(p_cgrid);
-   var_cgrid= hypre_SStructPGridSGrid(p_cgrid, nvars-1);
+   var_cgrid = hypre_SStructPGridSGrid(p_cgrid, nvars - 1);
    cboxes  = hypre_StructGridBoxes(var_cgrid);
-   cbox    = hypre_BoxArrayBox(cboxes, hypre_BoxArraySize(cboxes)-1);
+   cbox    = hypre_BoxArrayBox(cboxes, hypre_BoxArraySize(cboxes) - 1);
 
-   hypre_SStructGridBoxProcFindBoxManEntry(cgrid_edge, part, nvars-1,
-                                           hypre_BoxArraySize(cboxes)-1, myproc, &entry);
+   hypre_SStructGridBoxProcFindBoxManEntry(cgrid_edge, part, nvars - 1,
+                                           hypre_BoxArraySize(cboxes) - 1, myproc, &entry);
    hypre_SStructBoxManEntryGetGlobalCSRank(entry, hypre_BoxIMax(cbox), &jupper);
 
    HYPRE_IJMatrixCreate(comm, ilower, iupper, jlower, jupper, &Element_Edge);
@@ -902,39 +906,39 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
     * Need to distinguish between 2 and 3-d. */
    if (ndim == 3)
    {
-      n_xFace_iedges= (rfactor[1]-1)*rfactor[2] + (rfactor[2]-1)*rfactor[1];
-      n_yFace_iedges= (rfactor[0]-1)*rfactor[2] + (rfactor[2]-1)*rfactor[0];
-      n_zFace_iedges= (rfactor[1]-1)*rfactor[0] + (rfactor[0]-1)*rfactor[1];
-      n_Cell_iedges = (rfactor[2]-1)*n_zFace_iedges +
-         rfactor[2]*(rfactor[0]-1)*(rfactor[1]-1);
-
-      nFaces_iedges = nxFaces*n_xFace_iedges + nyFaces*n_yFace_iedges +
-         nzFaces*n_zFace_iedges;
-      nElements_iedges= nElements * n_Cell_iedges;
+      n_xFace_iedges = (rfactor[1] - 1) * rfactor[2] + (rfactor[2] - 1) * rfactor[1];
+      n_yFace_iedges = (rfactor[0] - 1) * rfactor[2] + (rfactor[2] - 1) * rfactor[0];
+      n_zFace_iedges = (rfactor[1] - 1) * rfactor[0] + (rfactor[0] - 1) * rfactor[1];
+      n_Cell_iedges = (rfactor[2] - 1) * n_zFace_iedges +
+                      rfactor[2] * (rfactor[0] - 1) * (rfactor[1] - 1);
+
+      nFaces_iedges = nxFaces * n_xFace_iedges + nyFaces * n_yFace_iedges +
+                      nzFaces * n_zFace_iedges;
+      nElements_iedges = nElements * n_Cell_iedges;
    }
    else
    {
-      n_Cell_iedges = (rfactor[0]-1)*rfactor[1] + (rfactor[1]-1)*rfactor[0];
-      nElements_iedges= nElements * n_Cell_iedges;
+      n_Cell_iedges = (rfactor[0] - 1) * rfactor[1] + (rfactor[1] - 1) * rfactor[0];
+      nElements_iedges = nElements * n_Cell_iedges;
    }
 
    if (ndim == 3)
    {
-      iFace = hypre_CTAlloc(HYPRE_BigInt, nFaces,    HYPRE_MEMORY_DEVICE);
+      iFace = hypre_CTAlloc(HYPRE_BigInt, nFaces, memory_location);
    }
-   iEdge    = hypre_CTAlloc(HYPRE_BigInt, nEdges,    HYPRE_MEMORY_DEVICE);
-   iElement = hypre_CTAlloc(HYPRE_BigInt, nElements, HYPRE_MEMORY_DEVICE);
+   iEdge    = hypre_CTAlloc(HYPRE_BigInt, nEdges, memory_location);
+   iElement = hypre_CTAlloc(HYPRE_BigInt, nElements, memory_location);
 
    /* array structures needed for forming ij_matrices */
 
    /* Element_edge. Same for 2-d and 3-d. */
-   ncols_Elementedge= hypre_CTAlloc(HYPRE_Int,  nElements, HYPRE_MEMORY_DEVICE);
-   for (i= 0; i< nElements; i++)
+   ncols_Elementedge = hypre_CTAlloc(HYPRE_Int,  nElements, memory_location);
+   for (i = 0; i < nElements; i++)
    {
-      ncols_Elementedge[i]= n_Cell_iedges;
+      ncols_Elementedge[i] = n_Cell_iedges;
    }
-   jElement_edge    = hypre_CTAlloc(HYPRE_BigInt, nElements_iedges, HYPRE_MEMORY_DEVICE);
-   vals_Elementedge = hypre_CTAlloc(HYPRE_Real,   nElements_iedges, HYPRE_MEMORY_DEVICE);
+   jElement_edge    = hypre_CTAlloc(HYPRE_BigInt, nElements_iedges, memory_location);
+   vals_Elementedge = hypre_CTAlloc(HYPRE_Real,   nElements_iedges, memory_location);
 
    /*---------------------------------------------------------------------------
     * Fill up the row/column ranks of Element_edge. Will need to distinguish
@@ -949,21 +953,21 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
     *           corresponding to the coarse box.
     *        b) loop map these fine cells and find the ranks of the fine edges.
     *---------------------------------------------------------------------------*/
-   nElements= 0;
-   nElements_iedges= 0;
-   for (part= 0; part< nparts; part++)
+   nElements = 0;
+   nElements_iedges = 0;
+   for (part = 0; part < nparts; part++)
    {
       if (ndim == 3)
       {
-         p_cgrid      = hypre_SStructGridPGrid(cgrid_edge, part);  /* Edge grid */
-         Edge_nvars   = hypre_SStructPGridNVars(p_cgrid);
-         Edge_vartypes= hypre_SStructPGridVarTypes(p_cgrid);
+         p_cgrid       = hypre_SStructGridPGrid(cgrid_edge, part);  /* Edge grid */
+         Edge_nvars    = hypre_SStructPGridNVars(p_cgrid);
+         Edge_vartypes = hypre_SStructPGridVarTypes(p_cgrid);
       }
       else if (ndim == 2) /* edge is a face in 2-d*/
       {
-         p_cgrid      = hypre_SStructGridPGrid(cgrid_face, part);  /* Face grid */
-         Face_nvars   = hypre_SStructPGridNVars(p_cgrid);
-         Face_vartypes= hypre_SStructPGridVarTypes(p_cgrid);
+         p_cgrid       = hypre_SStructGridPGrid(cgrid_face, part);  /* Face grid */
+         Face_nvars    = hypre_SStructPGridNVars(p_cgrid);
+         Face_vartypes = hypre_SStructPGridVarTypes(p_cgrid);
       }
 
       p_cgrid   = hypre_SStructGridPGrid(cgrid_element, part);  /* ccell grid */
@@ -976,13 +980,13 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
 
       hypre_ForBoxI(i, cboxes)
       {
-         cbox= hypre_BoxArrayBox(cboxes, i);
+         cbox = hypre_BoxArrayBox(cboxes, i);
          hypre_BoxGetSize(cbox, loop_size);
          hypre_CopyIndex(hypre_BoxIMin(cbox), cstart);
 
          /* determine which fine box cbox has coarsened from. Obtained from
             cfbox_mapping. */
-         fboxi= cfbox_mapping[part][i];
+         fboxi = cfbox_mapping[part][i];
          fbox = hypre_BoxArrayBox(fboxes, fboxi);
 
          /**********************************************************************
@@ -1010,20 +1014,20 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
             /* Element(i,j,k) rank */
             hypre_SStructGridFindBoxManEntry(cgrid_element, part, cindex, 0, &entry);
             hypre_SStructBoxManEntryGetGlobalRank(entry, cindex, &rank, matrix_type);
-            iElement[nElements]= rank;
+            iElement[nElements] = rank;
             nElements++;
 
             /* Element_iedge columns: 3-d, x_edges, y_edges, and z_edges. */
             if (ndim == 3)
             {
-               hypre_SetIndex3(low_index, findex[0]-rfactor[0]+1,
-                               findex[1]-rfactor[1]+1,
-                               findex[2]-rfactor[2]+1);
+               hypre_SetIndex3(low_index, findex[0] - rfactor[0] + 1,
+                               findex[1] - rfactor[1] + 1,
+                               findex[2] - rfactor[2] + 1);
 
-               for (t= 0; t< Edge_nvars; t++)
+               for (t = 0; t < Edge_nvars; t++)
                {
                   hypre_CopyIndex(findex, hi_index);
-                  var= Edge_vartypes[t]; /* c & f edges enumerated the same */
+                  var = Edge_vartypes[t]; /* c & f edges enumerated the same */
 
                   /* determine looping extents over the refined cells that
                      will have fine edges. */
@@ -1031,37 +1035,37 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                   {
                      case 5:  /* x_edges */
                      {
-                        hi_index[1]-= 1;
-                        hi_index[2]-= 1;
+                        hi_index[1] -= 1;
+                        hi_index[2] -= 1;
                         break;
                      }
                      case 6:  /* y_edges */
                      {
-                        hi_index[0]-= 1;
-                        hi_index[2]-= 1;
+                        hi_index[0] -= 1;
+                        hi_index[2] -= 1;
                         break;
                      }
                      case 7:  /* z_edges */
                      {
-                        hi_index[0]-= 1;
-                        hi_index[1]-= 1;
+                        hi_index[0] -= 1;
+                        hi_index[1] -= 1;
                         break;
                      }
                   }   /* switch (var) */
 
                   /* column ranks. */
-                  for (m= low_index[2]; m<= hi_index[2]; m++)
+                  for (m = low_index[2]; m <= hi_index[2]; m++)
                   {
-                     for (k= low_index[1]; k<= hi_index[1]; k++)
+                     for (k = low_index[1]; k <= hi_index[1]; k++)
                      {
-                        for (j= low_index[0]; j<= hi_index[0]; j++)
+                        for (j = low_index[0]; j <= hi_index[0]; j++)
                         {
                            hypre_SetIndex3(var_index, j, k, m);
                            hypre_SStructGridFindBoxManEntry(fgrid_edge, part, var_index,
                                                             t, &entry);
                            hypre_SStructBoxManEntryGetGlobalRank(entry, var_index,
                                                                  &rank, matrix_type);
-                           jElement_edge[nElements_iedges]= rank;
+                           jElement_edge[nElements_iedges] = rank;
                            nElements_iedges++;
                         }  /* for (j= findex[0]; j<= hi_index[0]; j++) */
                      }     /* for (k= findex[1]; k<= hi_index[1]; k++) */
@@ -1071,40 +1075,40 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
 
             else if (ndim == 2) /* only x & y faces */
             {
-               hypre_SetIndex3(low_index, findex[0]-rfactor[0]+1,
-                               findex[1]-rfactor[1]+1,
+               hypre_SetIndex3(low_index, findex[0] - rfactor[0] + 1,
+                               findex[1] - rfactor[1] + 1,
                                findex[2]);
 
-               for (t= 0; t< Face_nvars; t++)
+               for (t = 0; t < Face_nvars; t++)
                {
                   hypre_CopyIndex(findex, hi_index);
-                  var= Face_vartypes[t]; /* c & f faces enumerated the same */
+                  var = Face_vartypes[t]; /* c & f faces enumerated the same */
 
                   switch (var) /* note: hi_index computed differently in 2-d */
                   {
                      case 2:  /* x_faces */
                      {
-                        hi_index[0]-= 1;
+                        hi_index[0] -= 1;
                         break;
                      }
                      case 3:  /* y_edges */
                      {
-                        hi_index[1]-= 1;
+                        hi_index[1] -= 1;
                         break;
                      }
                   }   /* switch (var) */
 
                   /* column ranks. */
-                  for (k= low_index[1]; k<= hi_index[1]; k++)
+                  for (k = low_index[1]; k <= hi_index[1]; k++)
                   {
-                     for (j= low_index[0]; j<= hi_index[0]; j++)
+                     for (j = low_index[0]; j <= hi_index[0]; j++)
                      {
                         hypre_SetIndex3(var_index, j, k, findex[2]);
                         hypre_SStructGridFindBoxManEntry(fgrid_edge, part, var_index,
                                                          t, &entry);
                         hypre_SStructBoxManEntryGetGlobalRank(entry, var_index,
                                                               &rank, matrix_type);
-                        jElement_edge[nElements_iedges]= rank;
+                        jElement_edge[nElements_iedges] = rank;
                         nElements_iedges++;
                      }  /* for (j= findex[0]; j<= hi_index[0]; j++) */
                   }     /* for (k= findex[1]; k<= hi_index[1]; k++) */
@@ -1120,9 +1124,9 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                            (const HYPRE_Real*) vals_Elementedge);
    HYPRE_IJMatrixAssemble((HYPRE_IJMatrix) Element_iedge);
 
-   hypre_TFree(ncols_Elementedge, HYPRE_MEMORY_DEVICE);
-   hypre_TFree(jElement_edge,     HYPRE_MEMORY_DEVICE);
-   hypre_TFree(vals_Elementedge,  HYPRE_MEMORY_DEVICE);
+   hypre_TFree(ncols_Elementedge, memory_location);
+   hypre_TFree(jElement_edge, memory_location);
+   hypre_TFree(vals_Elementedge, memory_location);
 
    /* Face_edge */
    /*------------------------------------------------------------------------------
@@ -1135,84 +1139,84 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
     *------------------------------------------------------------------------------*/
    if (ndim == 3)
    {
-      ncols_Faceedge = hypre_CTAlloc(HYPRE_Int, nFaces, HYPRE_MEMORY_DEVICE);
-      nFaces= 0;
-      j= 0;
-      for (part= 0; part< nparts; part++)
+      ncols_Faceedge = hypre_CTAlloc(HYPRE_Int, nFaces, memory_location);
+      nFaces = 0;
+      j = 0;
+      for (part = 0; part < nparts; part++)
       {
          p_cgrid      = hypre_SStructGridPGrid(cgrid_face, part);  /* Face grid */
          Face_nvars   = hypre_SStructPGridNVars(p_cgrid);
-         Face_vartypes= hypre_SStructPGridVarTypes(p_cgrid);
+         Face_vartypes = hypre_SStructPGridVarTypes(p_cgrid);
 
          p_fgrid   = hypre_SStructGridPGrid(fgrid_edge, part);
          var_fgrid = hypre_SStructPGridCellSGrid(p_fgrid);
          fboxes    = hypre_StructGridBoxes(var_fgrid);
 
-         for (t= 0; t< Face_nvars; t++)
+         for (t = 0; t < Face_nvars; t++)
          {
-            var= Face_vartypes[t];
-            var_cgrid= hypre_SStructPGridSGrid(p_cgrid, t);
-            k= hypre_StructGridLocalSize(var_cgrid);
+            var = Face_vartypes[t];
+            var_cgrid = hypre_SStructPGridSGrid(p_cgrid, t);
+            k = hypre_StructGridLocalSize(var_cgrid);
 
-            switch(var)
+            switch (var)
             {
                case 2: /* x_Faces (i,j,k) then (i-1,j,k), contain y,z edges */
                {
-                  for (i= 0; i< k; i++)
+                  for (i = 0; i < k; i++)
                   {
                      /* y_iedge connections to x_Face */
-                     ncols_Faceedge[nFaces]= (rfactor[2]-1)*rfactor[1];
+                     ncols_Faceedge[nFaces] = (rfactor[2] - 1) * rfactor[1];
 
                      /* z_iedge connections to x_Face */
-                     ncols_Faceedge[nFaces]+= rfactor[2]*(rfactor[1]-1);
+                     ncols_Faceedge[nFaces] += rfactor[2] * (rfactor[1] - 1);
 
-                     j+= ncols_Faceedge[nFaces];
+                     j += ncols_Faceedge[nFaces];
                      nFaces++;
                   }
                   break;
-               }   /* case 2 */
+                  }   /* case 2 */
 
                case 3: /* y_Faces (i,j,k) then (i,j-1,k), contain x,z edges */
                {
-                  for (i= 0; i< k; i++)
+                  for (i = 0; i < k; i++)
                   {
                      /* x_iedge connections to y_Face */
-                     ncols_Faceedge[nFaces]= (rfactor[2]-1)*rfactor[0];
+                     ncols_Faceedge[nFaces] = (rfactor[2] - 1) * rfactor[0];
 
                      /* z_iedge connections to y_Face */
-                     ncols_Faceedge[nFaces]+= rfactor[2]*(rfactor[0]-1);
+                     ncols_Faceedge[nFaces] += rfactor[2] * (rfactor[0] - 1);
 
-                     j+= ncols_Faceedge[nFaces];
+                     j += ncols_Faceedge[nFaces];
                      nFaces++;
                   }
                   break;
-               }   /* case 3 */
+                  }   /* case 3 */
 
                case 4: /* z_Faces (i,j,k) then (i,j,k-1), contain x,y edges */
                {
-                  for (i= 0; i< k; i++)
+                  for (i = 0; i < k; i++)
                   {
                      /* x_iedge connections to z_Face */
-                     ncols_Faceedge[nFaces]= (rfactor[1]-1)*rfactor[0];
+                     ncols_Faceedge[nFaces] = (rfactor[1] - 1) * rfactor[0];
 
                      /* y_iedge connections to z_Face */
-                     ncols_Faceedge[nFaces]+= rfactor[1]*(rfactor[0]-1);
+                     ncols_Faceedge[nFaces] += rfactor[1] * (rfactor[0] - 1);
 
-                     j+= ncols_Faceedge[nFaces];
+                     j += ncols_Faceedge[nFaces];
                      nFaces++;
                   }
                   break;
-               }   /* case 4 */
+                  }   /* case 4 */
 
             } /* switch(var) */
          }    /* for (t= 0; t< Face_nvars; t++) */
       }       /* for (part= 0; part< nparts; part++) */
 
-      jFace_edge    = hypre_CTAlloc(HYPRE_BigInt, j, HYPRE_MEMORY_DEVICE);
-      vals_Faceedge = hypre_CTAlloc(HYPRE_Real,   j, HYPRE_MEMORY_DEVICE);
-      for (i= 0; i< j; i++)
+      jFace_edge    = hypre_CTAlloc(HYPRE_BigInt, j, memory_location);
+      vals_Faceedge = hypre_CTAlloc(HYPRE_Real, j, memory_location);
+      for (i = 0; i < j; i++)
       {
-         vals_Faceedge[i]= 1.0;
+         vals_Faceedge[i] = 1.0;
       }
 
       /*---------------------------------------------------------------------------
@@ -1227,27 +1231,27 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
        *        d) map these fine cells to the fine edges.
        *---------------------------------------------------------------------------*/
       nFaces       = 0;
-      nFaces_iedges= 0;
-      for (part= 0; part< nparts; part++)
+      nFaces_iedges = 0;
+      for (part = 0; part < nparts; part++)
       {
          p_cgrid      = hypre_SStructGridPGrid(cgrid_face, part);  /* Face grid */
          Face_nvars   = hypre_SStructPGridNVars(p_cgrid);
-         Face_vartypes= hypre_SStructPGridVarTypes(p_cgrid);
+         Face_vartypes = hypre_SStructPGridVarTypes(p_cgrid);
 
-         for (t= 0; t< Face_nvars; t++)
+         for (t = 0; t < Face_nvars; t++)
          {
-            var= Face_vartypes[t];
+            var = Face_vartypes[t];
             var_cgrid = hypre_SStructPGridCellSGrid(p_cgrid);
             cboxes   = hypre_StructGridBoxes(var_cgrid);
 
             /* to eliminate comparisons, take the switch outside of the loop. */
-            switch(var)
+            switch (var)
             {
                case 2:  /* x_Faces-> y_iedges, z_iedges */
                {
                   hypre_ForBoxI(i, cboxes)
                   {
-                     cbox= hypre_BoxArrayBox(cboxes, i);
+                     cbox = hypre_BoxArrayBox(cboxes, i);
                      hypre_CopyBox(cbox, &copy_box);
                      hypre_SubtractIndexes(hypre_BoxIMin(&copy_box), varoffsets[var], 3,
                                            hypre_BoxIMin(&copy_box));
@@ -1256,7 +1260,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                      hypre_CopyIndex(hypre_BoxIMin(&copy_box), start);
 
                      /* determine which fine box cbox has coarsened from */
-                     fboxi= cfbox_mapping[part][i];
+                     fboxi = cfbox_mapping[part][i];
                      fbox = hypre_BoxArrayBox(fboxes, fboxi);
 
                      /**********************************************************
@@ -1279,7 +1283,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                         if ((rank <= cupper_ranks[part][var]) &&
                             (rank >= clower_ranks[part][var]))
                         {
-                           iFace[nFaces]= rank;
+                           iFace[nFaces] = rank;
                            nFaces++;
 
                            /* transform face index to cell index */
@@ -1296,55 +1300,55 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
 
                            /* cell_index was refined to the upper fine index. Shift
                               back to the lower end, subtract (rfactor-1). */
-                           for (j= 0; j< ndim; j++)
+                           for (j = 0; j < ndim; j++)
                            {
-                              findex[j]-= rfactor[j]-1;
+                              findex[j] -= rfactor[j] - 1;
                            }
 
                            /* y_iedges */
-                           ilower= findex[0]-1;
-                           for (k= 0; k< rfactor[2]-1; k++)
+                           ilower = findex[0] - 1;
+                           for (k = 0; k < rfactor[2] - 1; k++)
                            {
-                              for (j= 0; j< rfactor[1]; j++)
+                              for (j = 0; j < rfactor[1]; j++)
                               {
-                                 hypre_SetIndex3(var_index, ilower, j+findex[1], k+findex[2]);
+                                 hypre_SetIndex3(var_index, ilower, j + findex[1], k + findex[2]);
                                  hypre_SStructGridFindBoxManEntry(fgrid_edge, part, var_index,
                                                                   vartype_map[6], &entry);
                                  hypre_SStructBoxManEntryGetGlobalRank(entry, var_index,
                                                                        &rank, matrix_type);
-                                 jFace_edge[nFaces_iedges]= rank;
+                                 jFace_edge[nFaces_iedges] = rank;
                                  nFaces_iedges++;
                               }
                            }
 
                            /* z_iedges */
-                           for (k= 0; k< rfactor[2]; k++)
+                           for (k = 0; k < rfactor[2]; k++)
                            {
-                              for (j= 0; j< rfactor[1]-1; j++)
+                              for (j = 0; j < rfactor[1] - 1; j++)
                               {
-                                 hypre_SetIndex3(var_index, ilower, j+findex[1], k+findex[2]);
+                                 hypre_SetIndex3(var_index, ilower, j + findex[1], k + findex[2]);
                                  hypre_SStructGridFindBoxManEntry(fgrid_edge, part, var_index,
                                                                   vartype_map[7], &entry);
                                  hypre_SStructBoxManEntryGetGlobalRank(entry, var_index,
                                                                        &rank, matrix_type);
-                                 jFace_edge[nFaces_iedges]= rank;
+                                 jFace_edge[nFaces_iedges] = rank;
                                  nFaces_iedges++;
                               }
                            }
                         }  /* if ((rank <= cupper_ranks[part][var]) &&
-                              (rank >= clower_ranks[part][var])) */
+(rank >= clower_ranks[part][var])) */
                      }
 
                      hypre_SerialBoxLoop0End();
                   }  /* hypre_ForBoxI(i, cboxes) */
                   break;
-               }   /* case 2:  x_Faces-> y_iedges, z_iedges */
+                  }   /* case 2:  x_Faces-> y_iedges, z_iedges */
 
                case 3:  /* y_Faces-> x_iedges, z_iedges */
                {
                   hypre_ForBoxI(i, cboxes)
                   {
-                     cbox= hypre_BoxArrayBox(cboxes, i);
+                     cbox = hypre_BoxArrayBox(cboxes, i);
                      hypre_CopyBox(cbox, &copy_box);
                      hypre_SubtractIndexes(hypre_BoxIMin(&copy_box), varoffsets[var], 3,
                                            hypre_BoxIMin(&copy_box));
@@ -1353,7 +1357,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                      hypre_CopyIndex(hypre_BoxIMin(&copy_box), start);
 
                      /* determine which fine box cbox has coarsened from */
-                     fboxi= cfbox_mapping[part][i];
+                     fboxi = cfbox_mapping[part][i];
                      fbox = hypre_BoxArrayBox(fboxes, fboxi);
 
                      /**********************************************************
@@ -1375,7 +1379,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                         if ((rank <= cupper_ranks[part][var]) &&
                             (rank >= clower_ranks[part][var]))
                         {
-                           iFace[nFaces]= rank;
+                           iFace[nFaces] = rank;
                            nFaces++;
 
                            /* transform face index to cell index */
@@ -1392,55 +1396,55 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
 
                            /* cell_index is refined to the upper fine index. Shift
                               back to the lower end, subtract (rfactor-1). */
-                           for (j= 0; j< ndim; j++)
+                           for (j = 0; j < ndim; j++)
                            {
-                              findex[j]-= rfactor[j]-1;
+                              findex[j] -= rfactor[j] - 1;
                            }
 
                            /* x_iedges */
-                           ilower= findex[1]-1;
-                           for (k= 0; k< rfactor[2]-1; k++)
+                           ilower = findex[1] - 1;
+                           for (k = 0; k < rfactor[2] - 1; k++)
                            {
-                              for (j= 0; j< rfactor[0]; j++)
+                              for (j = 0; j < rfactor[0]; j++)
                               {
-                                 hypre_SetIndex3(var_index, j+findex[0], ilower, k+findex[2]);
+                                 hypre_SetIndex3(var_index, j + findex[0], ilower, k + findex[2]);
                                  hypre_SStructGridFindBoxManEntry(fgrid_edge, part, var_index,
                                                                   vartype_map[5], &entry);
                                  hypre_SStructBoxManEntryGetGlobalRank(entry, var_index,
                                                                        &rank, matrix_type);
-                                 jFace_edge[nFaces_iedges]= rank;
+                                 jFace_edge[nFaces_iedges] = rank;
                                  nFaces_iedges++;
                               }
                            }
 
                            /* z_iedges */
-                           for (k= 0; k< rfactor[2]; k++)
+                           for (k = 0; k < rfactor[2]; k++)
                            {
-                              for (j= 0; j< rfactor[0]-1; j++)
+                              for (j = 0; j < rfactor[0] - 1; j++)
                               {
-                                 hypre_SetIndex3(var_index, j+findex[0], ilower, k+findex[2]);
+                                 hypre_SetIndex3(var_index, j + findex[0], ilower, k + findex[2]);
                                  hypre_SStructGridFindBoxManEntry(fgrid_edge, part, var_index,
                                                                   vartype_map[7], &entry);
                                  hypre_SStructBoxManEntryGetGlobalRank(entry, var_index,
                                                                        &rank, matrix_type);
-                                 jFace_edge[nFaces_iedges]= rank;
+                                 jFace_edge[nFaces_iedges] = rank;
                                  nFaces_iedges++;
                               }
                            }
                         }  /* if ((rank <= cupper_ranks[part][var]) &&
-                              (rank >= clower_ranks[part][var])) */
+(rank >= clower_ranks[part][var])) */
                      }
 
                      hypre_SerialBoxLoop0End();
                   }  /* hypre_ForBoxI(i, cboxes) */
                   break;
-               }   /* case 3:  y_Faces-> x_iedges, z_iedges */
+                  }   /* case 3:  y_Faces-> x_iedges, z_iedges */
 
                case 4:  /* z_Faces-> x_iedges, y_iedges */
                {
                   hypre_ForBoxI(i, cboxes)
                   {
-                     cbox= hypre_BoxArrayBox(cboxes, i);
+                     cbox = hypre_BoxArrayBox(cboxes, i);
                      hypre_CopyBox(cbox, &copy_box);
                      hypre_SubtractIndexes(hypre_BoxIMin(&copy_box), varoffsets[var], 3,
                                            hypre_BoxIMin(&copy_box));
@@ -1449,7 +1453,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                      hypre_CopyIndex(hypre_BoxIMin(&copy_box), start);
 
                      /* determine which fine box cbox has coarsened from */
-                     fboxi= cfbox_mapping[part][i];
+                     fboxi = cfbox_mapping[part][i];
                      fbox = hypre_BoxArrayBox(fboxes, fboxi);
 
                      /**********************************************************
@@ -1472,7 +1476,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                         if ((rank <= cupper_ranks[part][var]) &&
                             (rank >= clower_ranks[part][var]))
                         {
-                           iFace[nFaces]= rank;
+                           iFace[nFaces] = rank;
                            nFaces++;
 
                            /* transform face index to cell index */
@@ -1489,48 +1493,48 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
 
                            /* cell_index is refined to the upper fine index. Shift
                               back to the lower end, subtract (rfactor-1). */
-                           for (j= 0; j< ndim; j++)
+                           for (j = 0; j < ndim; j++)
                            {
-                              findex[j]-= rfactor[j]-1;
+                              findex[j] -= rfactor[j] - 1;
                            }
 
                            /* x_iedges */
-                           ilower= findex[2]-1;
-                           for (k= 0; k< rfactor[1]-1; k++)
+                           ilower = findex[2] - 1;
+                           for (k = 0; k < rfactor[1] - 1; k++)
                            {
-                              for (j= 0; j< rfactor[0]; j++)
+                              for (j = 0; j < rfactor[0]; j++)
                               {
-                                 hypre_SetIndex3(var_index, j+findex[0], k+findex[1], ilower);
+                                 hypre_SetIndex3(var_index, j + findex[0], k + findex[1], ilower);
                                  hypre_SStructGridFindBoxManEntry(fgrid_edge, part, var_index,
                                                                   vartype_map[5], &entry);
                                  hypre_SStructBoxManEntryGetGlobalRank(entry, var_index,
                                                                        &rank, matrix_type);
-                                 jFace_edge[nFaces_iedges]= rank;
+                                 jFace_edge[nFaces_iedges] = rank;
                                  nFaces_iedges++;
                               }
                            }
 
                            /* y_iedges */
-                           for (k= 0; k< rfactor[1]; k++)
+                           for (k = 0; k < rfactor[1]; k++)
                            {
-                              for (j= 0; j< rfactor[0]-1; j++)
+                              for (j = 0; j < rfactor[0] - 1; j++)
                               {
-                                 hypre_SetIndex3(var_index, j+findex[0], k+findex[1], ilower);
+                                 hypre_SetIndex3(var_index, j + findex[0], k + findex[1], ilower);
                                  hypre_SStructGridFindBoxManEntry(fgrid_edge, part, var_index,
                                                                   vartype_map[6], &entry);
                                  hypre_SStructBoxManEntryGetGlobalRank(entry, var_index,
                                                                        &rank, matrix_type);
-                                 jFace_edge[nFaces_iedges]= rank;
+                                 jFace_edge[nFaces_iedges] = rank;
                                  nFaces_iedges++;
                               }
                            }
                         }  /* if ((rank <= cupper_ranks[part][var]) &&
-                              (rank >= clower_ranks[part][var])) */
+(rank >= clower_ranks[part][var])) */
                      }
                      hypre_SerialBoxLoop0End();
                   }  /* hypre_ForBoxI(i, cboxes) */
                   break;
-               }   /* case 4:  z_Faces-> x_iedges, y_iedges */
+                  }   /* case 4:  z_Faces-> x_iedges, y_iedges */
 
             }   /* switch(var) */
          }      /* for (t= 0; t< Face_nvars; t++) */
@@ -1541,10 +1545,10 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                               (const HYPRE_Real*) vals_Faceedge);
       HYPRE_IJMatrixAssemble((HYPRE_IJMatrix) Face_iedge);
 
-      hypre_TFree(ncols_Faceedge, HYPRE_MEMORY_DEVICE);
-      hypre_TFree(iFace,          HYPRE_MEMORY_DEVICE);
-      hypre_TFree(jFace_edge,     HYPRE_MEMORY_DEVICE);
-      hypre_TFree(vals_Faceedge,  HYPRE_MEMORY_DEVICE);
+      hypre_TFree(ncols_Faceedge, memory_location);
+      hypre_TFree(iFace, memory_location);
+      hypre_TFree(jFace_edge, memory_location);
+      hypre_TFree(vals_Faceedge, memory_location);
    }  /* if (ndim == 3) */
 
    /* Edge_edge */
@@ -1552,72 +1556,77 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
     * Count the Edge_edge connections. Will need to distinguish 2-d and 3-d.
     *------------------------------------------------------------------------------*/
    /* nEdges should be correct for 2-d & 3-d */
-   ncols_Edgeiedge= hypre_CTAlloc(HYPRE_Int, nEdges, HYPRE_MEMORY_DEVICE);
+   ncols_Edgeiedge = hypre_CTAlloc(HYPRE_Int, nEdges, memory_location);
 
-   nEdges= 0;
-   k= 0;
-   for (part= 0; part< nparts; part++)
+   nEdges = 0;
+   k = 0;
+   for (part = 0; part < nparts; part++)
    {
       /* Edge grid. In 2-d this will be the face grid, which is assumed to be
          in cgrid_edge. */
       p_cgrid      = hypre_SStructGridPGrid(cgrid_edge, part);
-      Edge_vartypes= hypre_SStructPGridVarTypes(p_cgrid);
+      Edge_vartypes = hypre_SStructPGridVarTypes(p_cgrid);
       Edge_nvars   = hypre_SStructPGridNVars(p_cgrid);
 
-      for (t= 0; t< Edge_nvars; t++)
+      for (t = 0; t < Edge_nvars; t++)
       {
-         var= Edge_vartypes[t];
-         var_cgrid= hypre_SStructPGridSGrid(p_cgrid, t);
-         j= hypre_StructGridLocalSize(var_cgrid);
+         var = Edge_vartypes[t];
+         var_cgrid = hypre_SStructPGridSGrid(p_cgrid, t);
+         j = hypre_StructGridLocalSize(var_cgrid);
 
-         switch(var)
+         switch (var)
          {
             case 2:    /* 2-d, x_Face */
             {
-               m= rfactor[1];
+               m = rfactor[1];
                break;
             }
 
             case 3:    /* 2-d, y_Face */
             {
-               m= rfactor[0];
+               m = rfactor[0];
                break;
             }
 
             case 5:    /* 3-d, x_Edge */
             {
-               m= rfactor[0];
+               m = rfactor[0];
                break;
             }
 
             case 6:    /* 3-d, y_Edge */
             {
-               m= rfactor[1];
+               m = rfactor[1];
                break;
             }
 
             case 7:    /* 3-d, z_Edge */
             {
-               m= rfactor[2];
+               m = rfactor[2];
                break;
             }
+
+            default:
+            {
+               m = 0;
+            }
          }
 
-         for (i= nEdges; i< nEdges+j; i++) /*fill in the column size for Edge */
+         for (i = nEdges; i < nEdges + j; i++) /*fill in the column size for Edge */
          {
-            ncols_Edgeiedge[i]= m;
-            k+= m;
+            ncols_Edgeiedge[i] = m;
+            k += m;
          }
-         nEdges+= j;
+         nEdges += j;
 
       }  /* for (t= 0; t< Edge_nvars; t++) */
    }     /* for (part= 0; part< nparts; part++) */
 
-   jEdge_iedge    = hypre_CTAlloc(HYPRE_BigInt, k, HYPRE_MEMORY_DEVICE);
-   vals_Edgeiedge = hypre_CTAlloc(HYPRE_Real,   k, HYPRE_MEMORY_DEVICE);
-   for (i= 0; i< k; i++)
+   jEdge_iedge    = hypre_CTAlloc(HYPRE_BigInt, k, memory_location);
+   vals_Edgeiedge = hypre_CTAlloc(HYPRE_Real, k, memory_location);
+   for (i = 0; i < k; i++)
    {
-      vals_Edgeiedge[i]= 1.0;
+      vals_Edgeiedge[i] = 1.0;
    }
 
    /*---------------------------------------------------------------------------
@@ -1635,26 +1644,26 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
     *---------------------------------------------------------------------------*/
 
    nEdges       = 0;
-   nEdges_iedges= 0;
-   for (part= 0; part< nparts; part++)
+   nEdges_iedges = 0;
+   for (part = 0; part < nparts; part++)
    {
       p_cgrid      = hypre_SStructGridPGrid(cgrid_edge, part);
-      Edge_vartypes= hypre_SStructPGridVarTypes(p_cgrid);
+      Edge_vartypes = hypre_SStructPGridVarTypes(p_cgrid);
       Edge_nvars   = hypre_SStructPGridNVars(p_cgrid);
 
       p_fgrid   = hypre_SStructGridPGrid(fgrid_edge, part);
       var_fgrid = hypre_SStructPGridCellSGrid(p_fgrid);
       fboxes    = hypre_StructGridBoxes(var_fgrid);
 
-      for (t= 0; t< Edge_nvars; t++)
+      for (t = 0; t < Edge_nvars; t++)
       {
-         var= Edge_vartypes[t];
-         var_cgrid= hypre_SStructPGridCellSGrid(p_cgrid);
+         var = Edge_vartypes[t];
+         var_cgrid = hypre_SStructPGridCellSGrid(p_cgrid);
          cboxes   = hypre_StructGridBoxes(var_cgrid);
 
          hypre_ForBoxI(i, cboxes)
          {
-            cbox= hypre_BoxArrayBox(cboxes, i);
+            cbox = hypre_BoxArrayBox(cboxes, i);
 
             /*-------------------------------------------------------------------
              * extract the variable box by offsetting with var_offset. Note that
@@ -1668,7 +1677,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
             hypre_CopyIndex(hypre_BoxIMin(&copy_box), start);
 
             /* determine which fine box cbox has coarsened from */
-            fboxi= cfbox_mapping[part][i];
+            fboxi = cfbox_mapping[part][i];
             fbox = hypre_BoxArrayBox(fboxes, fboxi);
 
             /**********************************************************
@@ -1694,7 +1703,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                if ((rank <= cupper_ranks[part][var]) &&
                    (rank >= clower_ranks[part][var]))
                {
-                  iEdge[nEdges]= rank;
+                  iEdge[nEdges] = rank;
                   nEdges++;
 
                   hypre_AddIndexes(cindex, varoffsets[var], 3, cell_index);
@@ -1706,24 +1715,24 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
 
                   /* cell_index is refined to the upper fine index. Shift
                      back to the lower end, subtract (rfactor-1). */
-                  for (j= 0; j< ndim; j++)
+                  for (j = 0; j < ndim; j++)
                   {
-                     findex[j]-= rfactor[j]-1;
+                     findex[j] -= rfactor[j] - 1;
                   }
 
                   hypre_SubtractIndexes(findex, varoffsets[var], 3, var_index);
 
-                  switch(var)
+                  switch (var)
                   {
                      case 2:    /* 2-d, x_face */
                      {
-                        for (m= 0; m< rfactor[1]; m++)
+                        for (m = 0; m < rfactor[1]; m++)
                         {
                            hypre_SStructGridFindBoxManEntry(fgrid_edge, part,
                                                             var_index, t, &entry);
                            hypre_SStructBoxManEntryGetGlobalRank(entry, var_index,
                                                                  &rank, matrix_type);
-                           jEdge_iedge[nEdges_iedges]= rank;
+                           jEdge_iedge[nEdges_iedges] = rank;
                            nEdges_iedges++;
 
                            /* increment the x component to get the next one in the
@@ -1735,13 +1744,13 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
 
                      case 3:    /* 2-d, y_face */
                      {
-                        for (m= 0; m< rfactor[0]; m++)
+                        for (m = 0; m < rfactor[0]; m++)
                         {
                            hypre_SStructGridFindBoxManEntry(fgrid_edge, part,
                                                             var_index, t, &entry);
                            hypre_SStructBoxManEntryGetGlobalRank(entry, var_index,
                                                                  &rank, matrix_type);
-                           jEdge_iedge[nEdges_iedges]= rank;
+                           jEdge_iedge[nEdges_iedges] = rank;
                            nEdges_iedges++;
 
                            /* increment the y component to get the next one in the
@@ -1753,13 +1762,13 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
 
                      case 5:    /* 3-d, x_edge */
                      {
-                        for (m= 0; m< rfactor[0]; m++)
+                        for (m = 0; m < rfactor[0]; m++)
                         {
                            hypre_SStructGridFindBoxManEntry(fgrid_edge, part,
                                                             var_index, t, &entry);
                            hypre_SStructBoxManEntryGetGlobalRank(entry, var_index,
                                                                  &rank, matrix_type);
-                           jEdge_iedge[nEdges_iedges]= rank;
+                           jEdge_iedge[nEdges_iedges] = rank;
                            nEdges_iedges++;
 
                            /* increment the x component to get the next one in the
@@ -1771,13 +1780,13 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
 
                      case 6:    /* 3-d, y_edge */
                      {
-                        for (m= 0; m< rfactor[1]; m++)
+                        for (m = 0; m < rfactor[1]; m++)
                         {
                            hypre_SStructGridFindBoxManEntry(fgrid_edge, part,
                                                             var_index, t, &entry);
                            hypre_SStructBoxManEntryGetGlobalRank(entry, var_index,
                                                                  &rank, matrix_type);
-                           jEdge_iedge[nEdges_iedges]= rank;
+                           jEdge_iedge[nEdges_iedges] = rank;
                            nEdges_iedges++;
 
                            /* increment the y component to get the next one in the
@@ -1789,13 +1798,13 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
 
                      case 7:    /* 3-d, z_edge */
                      {
-                        for (m= 0; m< rfactor[2]; m++)
+                        for (m = 0; m < rfactor[2]; m++)
                         {
                            hypre_SStructGridFindBoxManEntry(fgrid_edge, part,
                                                             var_index, t, &entry);
                            hypre_SStructBoxManEntryGetGlobalRank(entry, var_index,
                                                                  &rank, matrix_type);
-                           jEdge_iedge[nEdges_iedges]= rank;
+                           jEdge_iedge[nEdges_iedges] = rank;
                            nEdges_iedges++;
 
                            /* increment the z component to get the next one in the
@@ -1820,42 +1829,42 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                            (const HYPRE_Real*) vals_Edgeiedge);
    HYPRE_IJMatrixAssemble((HYPRE_IJMatrix) Edge_iedge);
 
-   hypre_TFree(ncols_Edgeiedge, HYPRE_MEMORY_DEVICE);
-   hypre_TFree(iEdge,           HYPRE_MEMORY_DEVICE);
-   hypre_TFree(jEdge_iedge,     HYPRE_MEMORY_DEVICE);
-   hypre_TFree(vals_Edgeiedge,  HYPRE_MEMORY_DEVICE);
+   hypre_TFree(ncols_Edgeiedge, memory_location);
+   hypre_TFree(iEdge, memory_location);
+   hypre_TFree(jEdge_iedge, memory_location);
+   hypre_TFree(vals_Edgeiedge, memory_location);
 
    /* Element_Face & Element_Edge. Element_Face only for 3-d. */
    if (ndim == 3)
    {
-      ncols_ElementFace = hypre_CTAlloc(HYPRE_Int, nElements, HYPRE_MEMORY_DEVICE);
-      j= 2*ndim;
-      for (i= 0; i< nElements; i++)
+      ncols_ElementFace = hypre_CTAlloc(HYPRE_Int, nElements, memory_location);
+      j = 2 * ndim;
+      for (i = 0; i < nElements; i++)
       {
          ncols_ElementFace[i] = j;  /* 3-dim -> 6  */
       }
 
-      j*= nElements;
-      jElement_Face    = hypre_CTAlloc(HYPRE_BigInt, j, HYPRE_MEMORY_DEVICE);
-      vals_ElementFace = hypre_CTAlloc(HYPRE_Real,   j, HYPRE_MEMORY_DEVICE);
-      for (i= 0; i< j; i++)
+      j *= nElements;
+      jElement_Face    = hypre_CTAlloc(HYPRE_BigInt, j, memory_location);
+      vals_ElementFace = hypre_CTAlloc(HYPRE_Real, j, memory_location);
+      for (i = 0; i < j; i++)
       {
          vals_ElementFace[i] = 1.0;
       }
    }
 
-   ncols_ElementEdge = hypre_CTAlloc(HYPRE_Int,  nElements, HYPRE_MEMORY_DEVICE);
-   j= 2*ndim;
-   k= (ndim-1)*j;
-   for (i= 0; i< nElements; i++)
+   ncols_ElementEdge = hypre_CTAlloc(HYPRE_Int, nElements, memory_location);
+   j = 2 * ndim;
+   k = (ndim - 1) * j;
+   for (i = 0; i < nElements; i++)
    {
       ncols_ElementEdge[i] = k;  /* 2-dim -> 4; 3-dim -> 12 */
    }
 
-   k*= nElements;
-   jElement_Edge   = hypre_CTAlloc(HYPRE_BigInt, k, HYPRE_MEMORY_DEVICE);
-   vals_ElementEdge= hypre_CTAlloc(HYPRE_Real,   k, HYPRE_MEMORY_DEVICE);
-   for (i= 0; i< k; i++)
+   k *= nElements;
+   jElement_Edge   = hypre_CTAlloc(HYPRE_BigInt, k, memory_location);
+   vals_ElementEdge = hypre_CTAlloc(HYPRE_Real, k, memory_location);
+   for (i = 0; i < k; i++)
    {
       vals_ElementEdge[i] = 1.0;
    }
@@ -1864,21 +1873,21 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
     * Fill up the column ranks of ELement_Face and Element_Edge. Note that the
     * iElement has alrady been formed when filling Element_edge.
     *---------------------------------------------------------------------------*/
-   nElements_Faces= 0;
-   nElements_Edges= 0;
-   for (part= 0; part< nparts; part++)
+   nElements_Faces = 0;
+   nElements_Edges = 0;
+   for (part = 0; part < nparts; part++)
    {
       /* grab the nvars & vartypes for the face and edge variables */
       if (ndim == 3)
       {
          p_cgrid      = hypre_SStructGridPGrid(cgrid_face, part);
          Face_nvars   = hypre_SStructPGridNVars(p_cgrid);
-         Face_vartypes= hypre_SStructPGridVarTypes(p_cgrid);
+         Face_vartypes = hypre_SStructPGridVarTypes(p_cgrid);
       }
 
       p_cgrid      = hypre_SStructGridPGrid(cgrid_edge, part);  /* Edge grid */
       Edge_nvars   = hypre_SStructPGridNVars(p_cgrid);
-      Edge_vartypes= hypre_SStructPGridVarTypes(p_cgrid);
+      Edge_vartypes = hypre_SStructPGridVarTypes(p_cgrid);
 
       p_cgrid   = hypre_SStructGridPGrid(cgrid_element, part);  /* cell grid */
       var_cgrid = hypre_SStructPGridCellSGrid(p_cgrid);
@@ -1888,7 +1897,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
       {
          hypre_ForBoxI(i, cboxes)
          {
-            cbox= hypre_BoxArrayBox(cboxes, i);
+            cbox = hypre_BoxArrayBox(cboxes, i);
             hypre_BoxGetSize(cbox, loop_size);
             hypre_CopyIndex(hypre_BoxIMin(cbox), start);
 
@@ -1901,15 +1910,15 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                /*-------------------------------------------------------------
                 * jElement_Face: (i,j,k) then (i-1,j,k), (i,j-1,k), (i,j,k-1).
                 *-------------------------------------------------------------*/
-               for (t= 0; t< Face_nvars; t++)
+               for (t = 0; t < Face_nvars; t++)
                {
-                  var= Face_vartypes[t];
+                  var = Face_vartypes[t];
 
                   hypre_SStructGridFindBoxManEntry(cgrid_face, part, cindex, t,
                                                    &entry);
                   hypre_SStructBoxManEntryGetGlobalRank(entry, cindex, &rank,
                                                         matrix_type);
-                  jElement_Face[nElements_Faces]= rank;
+                  jElement_Face[nElements_Faces] = rank;
                   nElements_Faces++;
 
                   hypre_SubtractIndexes(cindex, varoffsets[var], 3, var_index);
@@ -1917,7 +1926,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                    &entry);
                   hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                         matrix_type);
-                  jElement_Face[nElements_Faces]= rank;
+                  jElement_Face[nElements_Faces] = rank;
                   nElements_Faces++;
                }
 
@@ -1939,7 +1948,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
        *-------------------------------------------------------------------*/
       hypre_ForBoxI(i, cboxes)
       {
-         cbox= hypre_BoxArrayBox(cboxes, i);
+         cbox = hypre_BoxArrayBox(cboxes, i);
          hypre_BoxGetSize(cbox, loop_size);
          hypre_CopyIndex(hypre_BoxIMin(cbox), start);
 
@@ -1949,10 +1958,10 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
             hypre_SetIndex3(cindex, lindex[0], lindex[1], lindex[2]);
             hypre_AddIndexes(cindex, start, 3, cindex);
 
-            for (t= 0; t< Edge_nvars; t++)
+            for (t = 0; t < Edge_nvars; t++)
             {
                /* Edge (i,j,k) */
-               var= Edge_vartypes[t];
+               var = Edge_vartypes[t];
 
                switch (var)
                {
@@ -1962,7 +1971,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                       &entry);
                      hypre_SStructBoxManEntryGetGlobalRank(entry, cindex, &rank,
                                                            matrix_type);
-                     jElement_Edge[nElements_Edges]= rank;
+                     jElement_Edge[nElements_Edges] = rank;
                      nElements_Edges++;
 
                      hypre_SubtractIndexes(cindex, ishift, 3, var_index);
@@ -1970,7 +1979,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                       &entry);
                      hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                            matrix_type);
-                     jElement_Edge[nElements_Edges]= rank;
+                     jElement_Edge[nElements_Edges] = rank;
                      nElements_Edges++;
                      break;
                   }
@@ -1981,7 +1990,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                       &entry);
                      hypre_SStructBoxManEntryGetGlobalRank(entry, cindex, &rank,
                                                            matrix_type);
-                     jElement_Edge[nElements_Edges]= rank;
+                     jElement_Edge[nElements_Edges] = rank;
                      nElements_Edges++;
 
                      hypre_SubtractIndexes(cindex, jshift, 3, var_index);
@@ -1989,7 +1998,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                       &entry);
                      hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                            matrix_type);
-                     jElement_Edge[nElements_Edges]= rank;
+                     jElement_Edge[nElements_Edges] = rank;
                      nElements_Edges++;
                      break;
                   }
@@ -2000,7 +2009,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                       &entry);
                      hypre_SStructBoxManEntryGetGlobalRank(entry, cindex, &rank,
                                                            matrix_type);
-                     jElement_Edge[nElements_Edges]= rank;
+                     jElement_Edge[nElements_Edges] = rank;
                      nElements_Edges++;
 
                      hypre_SubtractIndexes(cindex, jshift, 3, var_index);
@@ -2008,7 +2017,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                       &entry);
                      hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                            matrix_type);
-                     jElement_Edge[nElements_Edges]= rank;
+                     jElement_Edge[nElements_Edges] = rank;
                      nElements_Edges++;
 
                      hypre_SubtractIndexes(var_index, kshift, 3, var_index);
@@ -2016,7 +2025,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                       &entry);
                      hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                            matrix_type);
-                     jElement_Edge[nElements_Edges]= rank;
+                     jElement_Edge[nElements_Edges] = rank;
                      nElements_Edges++;
 
                      hypre_AddIndexes(var_index, jshift, 3, var_index);
@@ -2024,7 +2033,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                       &entry);
                      hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                            matrix_type);
-                     jElement_Edge[nElements_Edges]= rank;
+                     jElement_Edge[nElements_Edges] = rank;
                      nElements_Edges++;
                      break;
                   }
@@ -2035,7 +2044,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                       &entry);
                      hypre_SStructBoxManEntryGetGlobalRank(entry, cindex, &rank,
                                                            matrix_type);
-                     jElement_Edge[nElements_Edges]= rank;
+                     jElement_Edge[nElements_Edges] = rank;
                      nElements_Edges++;
 
                      hypre_SubtractIndexes(cindex, ishift, 3, var_index);
@@ -2043,7 +2052,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                       &entry);
                      hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                            matrix_type);
-                     jElement_Edge[nElements_Edges]= rank;
+                     jElement_Edge[nElements_Edges] = rank;
                      nElements_Edges++;
 
                      hypre_SubtractIndexes(var_index, kshift, 3, var_index);
@@ -2051,7 +2060,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                       &entry);
                      hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                            matrix_type);
-                     jElement_Edge[nElements_Edges]= rank;
+                     jElement_Edge[nElements_Edges] = rank;
                      nElements_Edges++;
 
                      hypre_AddIndexes(var_index, ishift, 3, var_index);
@@ -2059,7 +2068,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                       &entry);
                      hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                            matrix_type);
-                     jElement_Edge[nElements_Edges]= rank;
+                     jElement_Edge[nElements_Edges] = rank;
                      nElements_Edges++;
                      break;
                   }
@@ -2070,7 +2079,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                       &entry);
                      hypre_SStructBoxManEntryGetGlobalRank(entry, cindex, &rank,
                                                            matrix_type);
-                     jElement_Edge[nElements_Edges]= rank;
+                     jElement_Edge[nElements_Edges] = rank;
                      nElements_Edges++;
 
                      hypre_SubtractIndexes(cindex, jshift, 3, var_index);
@@ -2078,7 +2087,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                       &entry);
                      hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                            matrix_type);
-                     jElement_Edge[nElements_Edges]= rank;
+                     jElement_Edge[nElements_Edges] = rank;
                      nElements_Edges++;
 
                      hypre_SubtractIndexes(var_index, ishift, 3, var_index);
@@ -2086,7 +2095,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                       &entry);
                      hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                            matrix_type);
-                     jElement_Edge[nElements_Edges]= rank;
+                     jElement_Edge[nElements_Edges] = rank;
                      nElements_Edges++;
 
                      hypre_AddIndexes(var_index, jshift, 3, var_index);
@@ -2094,7 +2103,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                       &entry);
                      hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                            matrix_type);
-                     jElement_Edge[nElements_Edges]= rank;
+                     jElement_Edge[nElements_Edges] = rank;
                      nElements_Edges++;
                      break;
                   }
@@ -2113,9 +2122,9 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                               (const HYPRE_Real*) vals_ElementFace);
       HYPRE_IJMatrixAssemble((HYPRE_IJMatrix) Element_Face);
 
-      hypre_TFree(ncols_ElementFace, HYPRE_MEMORY_DEVICE);
-      hypre_TFree(jElement_Face,     HYPRE_MEMORY_DEVICE);
-      hypre_TFree(vals_ElementFace,  HYPRE_MEMORY_DEVICE);
+      hypre_TFree(ncols_ElementFace, memory_location);
+      hypre_TFree(jElement_Face, memory_location);
+      hypre_TFree(vals_ElementFace, memory_location);
    }  /* if (ndim == 3) */
 
    HYPRE_IJMatrixSetValues(Element_Edge, nElements, ncols_ElementEdge,
@@ -2123,10 +2132,10 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                            (const HYPRE_Real*) vals_ElementEdge);
    HYPRE_IJMatrixAssemble((HYPRE_IJMatrix) Element_Edge);
 
-   hypre_TFree(ncols_ElementEdge, HYPRE_MEMORY_DEVICE);
-   hypre_TFree(iElement,          HYPRE_MEMORY_DEVICE);
-   hypre_TFree(jElement_Edge,     HYPRE_MEMORY_DEVICE);
-   hypre_TFree(vals_ElementEdge,  HYPRE_MEMORY_DEVICE);
+   hypre_TFree(ncols_ElementEdge, memory_location);
+   hypre_TFree(iElement, memory_location);
+   hypre_TFree(jElement_Edge, memory_location);
+   hypre_TFree(vals_ElementEdge, memory_location);
 
    /*-----------------------------------------------------------------------
     * edge_Edge, the actual interpolation matrix.
@@ -2147,8 +2156,8 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
     *-----------------------------------------------------------------------*/
 
    /* count the row/col connections */
-   iedgeEdge      = hypre_CTAlloc(HYPRE_BigInt, nedges, HYPRE_MEMORY_DEVICE);
-   ncols_edgeEdge = hypre_CTAlloc(HYPRE_Int,    nedges, HYPRE_MEMORY_DEVICE);
+   iedgeEdge      = hypre_CTAlloc(HYPRE_BigInt, nedges, memory_location);
+   ncols_edgeEdge = hypre_CTAlloc(HYPRE_Int, nedges, memory_location);
 
    /*-----------------------------------------------------------------------
     * loop first over the fedges aligning with the agglomerate coarse edges.
@@ -2159,29 +2168,29 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
     * that points to the location of the weight:
     *          pointer[rank of edge]= index location where weight resides.
     *-----------------------------------------------------------------------*/
-   j= 0;
-   start_rank1= hypre_SStructGridStartRank(fgrid_edge);
-   bdryedge_location= hypre_CTAlloc(HYPRE_Int, nedges, HYPRE_MEMORY_HOST);
-   for (part= 0; part< nparts; part++)
+   j = 0;
+   start_rank1 = hypre_SStructGridStartRank(fgrid_edge);
+   bdryedge_location = hypre_CTAlloc(HYPRE_Int, nedges, HYPRE_MEMORY_HOST);
+   for (part = 0; part < nparts; part++)
    {
-      p_fgrid= hypre_SStructGridPGrid(fgrid_edge, part);  /* edge grid */
-      Edge_nvars= hypre_SStructPGridNVars(p_fgrid);
-      Edge_vartypes= hypre_SStructPGridVarTypes(p_fgrid);
+      p_fgrid = hypre_SStructGridPGrid(fgrid_edge, part); /* edge grid */
+      Edge_nvars = hypre_SStructPGridNVars(p_fgrid);
+      Edge_vartypes = hypre_SStructPGridVarTypes(p_fgrid);
 
       /* note that fboxes are the contracted CELL boxes. Will get the correct
          variable grid extents. */
-      fboxes= contract_fedgeBoxes[part];
+      fboxes = contract_fedgeBoxes[part];
 
-      for (t= 0; t< Edge_nvars; t++)
+      for (t = 0; t < Edge_nvars; t++)
       {
          var         = Edge_vartypes[t];
          var_fgrid   = hypre_SStructPGridVTSGrid(p_fgrid, var);
          box_array   = hypre_StructGridBoxes(var_fgrid);
 
-         n_boxoffsets= ndim-1;
+         n_boxoffsets = ndim - 1;
          boxoffset   = hypre_CTAlloc(hypre_Index, n_boxoffsets, HYPRE_MEMORY_HOST);
          suboffset   = hypre_CTAlloc(hypre_Index, n_boxoffsets, HYPRE_MEMORY_HOST);
-         switch(var)
+         switch (var)
          {
             case 2: /* 2-d: x_face (vertical edges), stride=[rfactor[0],1,1] */
             {
@@ -2189,7 +2198,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                hypre_CopyIndex(varoffsets[2], var_index);
 
                /* boxoffset shrink in the i direction */
-               hypre_SetIndex3(boxoffset[0], rfactor[0]-1, 0, 0);
+               hypre_SetIndex3(boxoffset[0], rfactor[0] - 1, 0, 0);
                hypre_SetIndex3(suboffset[0], 1, 0, 0);
 
                /* extend loop_size by one in the stride direction */
@@ -2203,7 +2212,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                hypre_CopyIndex(varoffsets[3], var_index);
 
                /* boxoffset shrink in the j direction */
-               hypre_SetIndex3(boxoffset[0], 0, rfactor[1]-1, 0);
+               hypre_SetIndex3(boxoffset[0], 0, rfactor[1] - 1, 0);
                hypre_SetIndex3(suboffset[0], 0, 1, 0);
 
                /* extend loop_size by one in the stride direction */
@@ -2217,8 +2226,8 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                hypre_CopyIndex(varoffsets[5], var_index);
 
                /* boxoffset shrink in the j & k directions */
-               hypre_SetIndex3(boxoffset[0], 0, rfactor[1]-1, 0);
-               hypre_SetIndex3(boxoffset[1], 0, 0, rfactor[2]-1);
+               hypre_SetIndex3(boxoffset[0], 0, rfactor[1] - 1, 0);
+               hypre_SetIndex3(boxoffset[1], 0, 0, rfactor[2] - 1);
                hypre_SetIndex3(suboffset[0], 0, 1, 0);
                hypre_SetIndex3(suboffset[1], 0, 0, 1);
 
@@ -2233,8 +2242,8 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                hypre_CopyIndex(varoffsets[6], var_index);
 
                /* boxoffset shrink in the i & k directions */
-               hypre_SetIndex3(boxoffset[0], rfactor[0]-1, 0, 0);
-               hypre_SetIndex3(boxoffset[1], 0, 0, rfactor[2]-1);
+               hypre_SetIndex3(boxoffset[0], rfactor[0] - 1, 0, 0);
+               hypre_SetIndex3(boxoffset[1], 0, 0, rfactor[2] - 1);
                hypre_SetIndex3(suboffset[0], 1, 0, 0);
                hypre_SetIndex3(suboffset[1], 0, 0, 1);
 
@@ -2249,8 +2258,8 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                hypre_CopyIndex(varoffsets[7], var_index);
 
                /* boxoffset shrink in the i & j directions */
-               hypre_SetIndex3(boxoffset[0], rfactor[0]-1, 0, 0);
-               hypre_SetIndex3(boxoffset[1], 0, rfactor[1]-1, 0);
+               hypre_SetIndex3(boxoffset[0], rfactor[0] - 1, 0, 0);
+               hypre_SetIndex3(boxoffset[1], 0, rfactor[1] - 1, 0);
                hypre_SetIndex3(suboffset[0], 1, 0, 0);
                hypre_SetIndex3(suboffset[1], 0, 1, 0);
 
@@ -2262,10 +2271,10 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
 
          hypre_ForBoxI(i, fboxes)
          {
-            cellbox= hypre_BoxArrayBox(fboxes, i);
+            cellbox = hypre_BoxArrayBox(fboxes, i);
 
             /* vboxes inside the i'th cellbox */
-            num_vboxes= n_CtoVbox[part][i];
+            num_vboxes = n_CtoVbox[part][i];
             vboxnums  = CtoVboxnums[part][i];
 
             /* adjust the project cellbox to the variable box */
@@ -2277,19 +2286,19 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                has to be decreased, then we decrease it by (rfactor[j]-1)
                in the appropriate direction.
                Check the location of the shifted lower box index. */
-            for (k= 0; k< n_boxoffsets; k++)
+            for (k = 0; k < n_boxoffsets; k++)
             {
                hypre_SubtractIndexes(hypre_BoxIMin(&copy_box), suboffset[k], 3,
                                      findex);
-               row_in= falseV;
-               for (p= 0; p< num_vboxes[t]; p++)
+               row_in = falseV;
+               for (p = 0; p < num_vboxes[t]; p++)
                {
-                  vbox= hypre_BoxArrayBox(box_array, vboxnums[t][p]);
+                  vbox = hypre_BoxArrayBox(box_array, vboxnums[t][p]);
 
                   if (hypre_IndexInBox(findex, vbox))
                   {
                      hypre_CopyIndex(findex, hypre_BoxIMin(&copy_box));
-                     row_in= trueV;
+                     row_in = trueV;
                      break;
                   }
                }
@@ -2315,9 +2324,9 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
             {
                zypre_BoxLoopGetIndex(lindex);
                hypre_SetIndex3(findex, lindex[0], lindex[1], lindex[2]);
-               for (k= 0; k< 3; k++)
+               for (k = 0; k < 3; k++)
                {
-                  findex[k]*= stride[k];
+                  findex[k] *= stride[k];
                }
                hypre_AddIndexes(findex, start, 3, findex);
 
@@ -2326,9 +2335,9 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                /* still row p may be outside the processor- check to make sure in */
                if ((rank <= fupper_ranks[part][var]) && (rank >= flower_ranks[part][var]))
                {
-                  iedgeEdge[j]= rank;
-                  ncols_edgeEdge[j]= 1;
-                  bdryedge_location[rank-start_rank1]= j;
+                  iedgeEdge[j] = rank;
+                  ncols_edgeEdge[j] = 1;
+                  bdryedge_location[rank - start_rank1] = j;
                   j++;
                }
             }
@@ -2352,43 +2361,43 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
     *-----------------------------------------------------------------------*/
    if (ndim == 3)
    {
-      l= j;
-      for (part= 0; part< nparts; part++)
+      l = j;
+      for (part = 0; part < nparts; part++)
       {
-         p_fgrid= hypre_SStructGridPGrid(fgrid_edge, part);  /* edge grid */
-         Edge_nvars= hypre_SStructPGridNVars(p_fgrid);
-         Edge_vartypes= hypre_SStructPGridVarTypes(p_fgrid);
+         p_fgrid = hypre_SStructGridPGrid(fgrid_edge, part); /* edge grid */
+         Edge_nvars = hypre_SStructPGridNVars(p_fgrid);
+         Edge_vartypes = hypre_SStructPGridVarTypes(p_fgrid);
 
          /* note that fboxes are the contracted CELL boxes. Will get the correct
             variable grid extents. */
-         fboxes= contract_fedgeBoxes[part];
+         fboxes = contract_fedgeBoxes[part];
 
          /* may need to shrink a given box in some boxoffset directions */
-         boxoffset= hypre_TAlloc(hypre_Index,  ndim, HYPRE_MEMORY_HOST);
-         for (t= 0; t< ndim; t++)
+         boxoffset = hypre_TAlloc(hypre_Index,  ndim, HYPRE_MEMORY_HOST);
+         for (t = 0; t < ndim; t++)
          {
             hypre_ClearIndex(boxoffset[t]);
-            hypre_IndexD(boxoffset[t], t)= rfactor[t]-1;
+            hypre_IndexD(boxoffset[t], t) = rfactor[t] - 1;
          }
 
-         for (t= 0; t< Edge_nvars; t++)
+         for (t = 0; t < Edge_nvars; t++)
          {
             var      = Edge_vartypes[t];
-            var_fgrid=  hypre_SStructPGridVTSGrid(p_fgrid, var);
-            box_array= hypre_StructGridBoxes(var_fgrid);
+            var_fgrid =  hypre_SStructPGridVTSGrid(p_fgrid, var);
+            box_array = hypre_StructGridBoxes(var_fgrid);
 
             /* to reduce comparison, take the switch outside of the loop */
-            switch(var)
+            switch (var)
             {
                case 5:
                {
                   /* 3-d x_edge, can be Y or Z_Face */
                   hypre_ForBoxI(i, fboxes)
                   {
-                     cellbox= hypre_BoxArrayBox(fboxes, i);
+                     cellbox = hypre_BoxArrayBox(fboxes, i);
 
                      /* vboxes inside the i'th cellbox */
-                     num_vboxes= n_CtoVbox[part][i];
+                     num_vboxes = n_CtoVbox[part][i];
                      vboxnums  = CtoVboxnums[part][i];
 
                      /* adjust the contracted cellbox to the variable box */
@@ -2405,14 +2414,14 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                      hypre_SubtractIndexes(hypre_BoxIMin(&copy_box), kshift, 3,
                                            findex);
                      /* loop over all the vboxes to see if findex is inside */
-                     row_in= falseV;
-                     for (p= 0; p< num_vboxes[t]; p++)
+                     row_in = falseV;
+                     for (p = 0; p < num_vboxes[t]; p++)
                      {
-                        vbox= hypre_BoxArrayBox(box_array, vboxnums[t][p]);
+                        vbox = hypre_BoxArrayBox(box_array, vboxnums[t][p]);
                         if (hypre_IndexInBox(findex, vbox))
                         {
                            hypre_CopyIndex(findex, hypre_BoxIMin(&copy_box));
-                           row_in= trueV;
+                           row_in = trueV;
                            break;
                         }
                      }
@@ -2438,20 +2447,20 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                      {
                         zypre_BoxLoopGetIndex(lindex);
                         hypre_SetIndex3(findex, lindex[0], lindex[1], lindex[2]);
-                        for (k= 0; k< 3; k++)
+                        for (k = 0; k < 3; k++)
                         {
-                           findex[k]*= rfactor[k];
+                           findex[k] *= rfactor[k];
                         }
                         hypre_AddIndexes(findex, start, 3, findex);
 
                         /************************************************************
                          * Loop over the Z_Face x_edges.
                          ************************************************************/
-                        for (p= 0; p< rfactor[0]; p++)
+                        for (p = 0; p < rfactor[0]; p++)
                         {
                            hypre_CopyIndex(findex, var_index);
-                           var_index[0]+= p;
-                           for (n= 1; n< rfactor[1]; n++)
+                           var_index[0] += p;
+                           for (n = 1; n < rfactor[1]; n++)
                            {
                               var_index[1]++;
                               hypre_SStructGridFindBoxManEntry(fgrid_edge, part, var_index,
@@ -2462,15 +2471,15 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                               if ((rank <= fupper_ranks[part][var]) &&
                                   (rank >= flower_ranks[part][var]))
                               {
-                                 iedgeEdge[j]= rank;
+                                 iedgeEdge[j] = rank;
 
                                  /* Z_Face. Two coarse Edge connections. */
-                                 ncols_edgeEdge[j]= 2;
+                                 ncols_edgeEdge[j] = 2;
                                  j++;
 
                                  /* record index location */
-                                 bdryedge_location[rank-start_rank1]= l;
-                                 l+= 2;  /* two weight values */
+                                 bdryedge_location[rank - start_rank1] = l;
+                                 l += 2; /* two weight values */
                               }
                            }  /* for (n= 1; n< rfactor[1]; n++) */
                         }     /* for (p= 0; p< rfactor[0]; p++) */
@@ -2482,14 +2491,14 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                      hypre_SubtractIndexes(hypre_BoxIMin(&copy_box), jshift, 3,
                                            findex);
                      /* loop over all the vboxes to see if findex is inside */
-                     row_in= falseV;
-                     for (p= 0; p< num_vboxes[t]; p++)
+                     row_in = falseV;
+                     for (p = 0; p < num_vboxes[t]; p++)
                      {
-                        vbox= hypre_BoxArrayBox(box_array, vboxnums[t][p]);
+                        vbox = hypre_BoxArrayBox(box_array, vboxnums[t][p]);
                         if (hypre_IndexInBox(findex, vbox))
                         {
                            hypre_CopyIndex(findex, hypre_BoxIMin(&copy_box));
-                           row_in= trueV;
+                           row_in = trueV;
                            break;
                         }
                      }
@@ -2514,20 +2523,20 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                      {
                         zypre_BoxLoopGetIndex(lindex);
                         hypre_SetIndex3(findex, lindex[0], lindex[1], lindex[2]);
-                        for (k= 0; k< 3; k++)
+                        for (k = 0; k < 3; k++)
                         {
-                           findex[k]*= rfactor[k];
+                           findex[k] *= rfactor[k];
                         }
                         hypre_AddIndexes(findex, start, 3, findex);
 
                         /************************************************************
                          * Loop over the Y_Face x_edges.
                          ************************************************************/
-                        for (p= 0; p< rfactor[0]; p++)
+                        for (p = 0; p < rfactor[0]; p++)
                         {
                            hypre_CopyIndex(findex, var_index);
-                           var_index[0]+= p;
-                           for (n= 1; n< rfactor[2]; n++)
+                           var_index[0] += p;
+                           for (n = 1; n < rfactor[2]; n++)
                            {
                               var_index[2]++;
                               hypre_SStructGridFindBoxManEntry(fgrid_edge, part, var_index,
@@ -2537,15 +2546,15 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                               if ((rank <= fupper_ranks[part][var]) &&
                                   (rank >= flower_ranks[part][var]))
                               {
-                                 iedgeEdge[j]= rank;
+                                 iedgeEdge[j] = rank;
 
                                  /* Y_Face. Two coarse Edge connections. */
-                                 ncols_edgeEdge[j]= 2;
+                                 ncols_edgeEdge[j] = 2;
                                  j++;
 
                                  /* record index location */
-                                 bdryedge_location[rank-start_rank1]= l;
-                                 l+= 2;
+                                 bdryedge_location[rank - start_rank1] = l;
+                                 l += 2;
                               }
                            }  /* for (n= 1; n< rfactor[2]; n++) */
                         }     /* for (p= 0; p< rfactor[0]; p++) */
@@ -2561,10 +2570,10 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                   /* 3-d y_edge, can be X or Z_Face */
                   hypre_ForBoxI(i, fboxes)
                   {
-                     cellbox= hypre_BoxArrayBox(fboxes, i);
+                     cellbox = hypre_BoxArrayBox(fboxes, i);
 
                      /* vboxes inside the i'th cellbox */
-                     num_vboxes= n_CtoVbox[part][i];
+                     num_vboxes = n_CtoVbox[part][i];
                      vboxnums  = CtoVboxnums[part][i];
 
                      /* adjust the project cellbox to the variable box */
@@ -2581,14 +2590,14 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                      hypre_SubtractIndexes(hypre_BoxIMin(&copy_box), kshift, 3,
                                            findex);
                      /* loop over all the vboxes to see if findex is inside */
-                     row_in= falseV;
-                     for (p= 0; p< num_vboxes[t]; p++)
+                     row_in = falseV;
+                     for (p = 0; p < num_vboxes[t]; p++)
                      {
-                        vbox= hypre_BoxArrayBox(box_array, vboxnums[t][p]);
+                        vbox = hypre_BoxArrayBox(box_array, vboxnums[t][p]);
                         if (hypre_IndexInBox(findex, vbox))
                         {
                            hypre_CopyIndex(findex, hypre_BoxIMin(&copy_box));
-                           row_in= trueV;
+                           row_in = trueV;
                            break;
                         }
                      }
@@ -2616,18 +2625,18 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                         zypre_BoxLoopGetIndex(lindex);
                         hypre_SetIndex3(findex, lindex[0], lindex[1], lindex[2]);
 
-                        for (k= 0; k< 3; k++)
+                        for (k = 0; k < 3; k++)
                         {
-                           findex[k]*= rfactor[k];
+                           findex[k] *= rfactor[k];
                         }
                         hypre_AddIndexes(findex, start, 3, findex);
 
                         /* Z_Face */
-                        for (p= 0; p< rfactor[1]; p++)
+                        for (p = 0; p < rfactor[1]; p++)
                         {
                            hypre_CopyIndex(findex, var_index);
-                           var_index[1]+= p;
-                           for (n= 1; n< rfactor[0]; n++)
+                           var_index[1] += p;
+                           for (n = 1; n < rfactor[0]; n++)
                            {
                               var_index[0]++;
                               hypre_SStructGridFindBoxManEntry(fgrid_edge, part, var_index,
@@ -2637,15 +2646,15 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                               if ((rank <= fupper_ranks[part][var]) &&
                                   (rank >= flower_ranks[part][var]))
                               {
-                                 iedgeEdge[j]= rank;
+                                 iedgeEdge[j] = rank;
 
                                  /* Z_Face. Two coarse Edge connections. */
-                                 ncols_edgeEdge[j]= 2;
+                                 ncols_edgeEdge[j] = 2;
                                  j++;
 
                                  /* record index location */
-                                 bdryedge_location[rank-start_rank1]= l;
-                                 l+= 2;
+                                 bdryedge_location[rank - start_rank1] = l;
+                                 l += 2;
                               }
                            }  /* for (n= 1; n< rfactor[0]; n++) */
                         }     /* for (p= 0; p< rfactor[1]; p++) */
@@ -2657,14 +2666,14 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                      hypre_SubtractIndexes(hypre_BoxIMin(&copy_box), ishift, 3,
                                            findex);
                      /* loop over all the vboxes to see if findex is inside */
-                     row_in= falseV;
-                     for (p= 0; p< num_vboxes[t]; p++)
+                     row_in = falseV;
+                     for (p = 0; p < num_vboxes[t]; p++)
                      {
-                        vbox= hypre_BoxArrayBox(box_array, vboxnums[t][p]);
+                        vbox = hypre_BoxArrayBox(box_array, vboxnums[t][p]);
                         if (hypre_IndexInBox(findex, vbox))
                         {
                            hypre_CopyIndex(findex, hypre_BoxIMin(&copy_box));
-                           row_in= trueV;
+                           row_in = trueV;
                            break;
                         }
                      }
@@ -2690,20 +2699,20 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                      {
                         zypre_BoxLoopGetIndex(lindex);
                         hypre_SetIndex3(findex, lindex[0], lindex[1], lindex[2]);
-                        for (k= 0; k< 3; k++)
+                        for (k = 0; k < 3; k++)
                         {
-                           findex[k]*= rfactor[k];
+                           findex[k] *= rfactor[k];
                         }
                         hypre_AddIndexes(findex, start, 3, findex);
 
                         /*****************************************************
                          * Loop over the X_Face y_edges.
                          *****************************************************/
-                        for (p= 0; p< rfactor[1]; p++)
+                        for (p = 0; p < rfactor[1]; p++)
                         {
                            hypre_CopyIndex(findex, var_index);
-                           var_index[1]+= p;
-                           for (n= 1; n< rfactor[2]; n++)
+                           var_index[1] += p;
+                           for (n = 1; n < rfactor[2]; n++)
                            {
                               var_index[2]++;
                               hypre_SStructGridFindBoxManEntry(fgrid_edge, part, var_index,
@@ -2713,14 +2722,14 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                               if ((rank <= fupper_ranks[part][var]) &&
                                   (rank >= flower_ranks[part][var]))
                               {
-                                 iedgeEdge[j]= rank;
+                                 iedgeEdge[j] = rank;
                                  /* X_Face. Two coarse Edge connections. */
-                                 ncols_edgeEdge[j]= 2;
+                                 ncols_edgeEdge[j] = 2;
                                  j++;
 
                                  /* record index location */
-                                 bdryedge_location[rank-start_rank1]= l;
-                                 l+= 2;
+                                 bdryedge_location[rank - start_rank1] = l;
+                                 l += 2;
                               }
                            }  /* for (n= 1; n< rfactor[2]; n++) */
                         }     /* for (p= 0; p< rfactor[1]; p++) */
@@ -2736,10 +2745,10 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                   /* 3-d z_edge, can be interior, X or Y_Face, or Z_Edge */
                   hypre_ForBoxI(i, fboxes)
                   {
-                     cellbox= hypre_BoxArrayBox(fboxes, i);
+                     cellbox = hypre_BoxArrayBox(fboxes, i);
 
                      /* vboxes inside the i'th cellbox */
-                     num_vboxes= n_CtoVbox[part][i];
+                     num_vboxes = n_CtoVbox[part][i];
                      vboxnums  = CtoVboxnums[part][i];
 
                      /* adjust the project cellbox to the variable box */
@@ -2756,14 +2765,14 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                      hypre_SubtractIndexes(hypre_BoxIMin(&copy_box), ishift, 3,
                                            findex);
                      /* loop over all the vboxes to see if findex is inside */
-                     row_in= falseV;
-                     for (p= 0; p< num_vboxes[t]; p++)
+                     row_in = falseV;
+                     for (p = 0; p < num_vboxes[t]; p++)
                      {
-                        vbox= hypre_BoxArrayBox(box_array, vboxnums[t][p]);
+                        vbox = hypre_BoxArrayBox(box_array, vboxnums[t][p]);
                         if (hypre_IndexInBox(findex, vbox))
                         {
                            hypre_CopyIndex(findex, hypre_BoxIMin(&copy_box));
-                           row_in= trueV;
+                           row_in = trueV;
                            break;
                         }
                      }
@@ -2791,9 +2800,9 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                         zypre_BoxLoopGetIndex(lindex);
                         hypre_SetIndex3(findex, lindex[0], lindex[1], lindex[2]);
 
-                        for (k= 0; k< 3; k++)
+                        for (k = 0; k < 3; k++)
                         {
-                           findex[k]*= rfactor[k];
+                           findex[k] *= rfactor[k];
                         }
 
                         hypre_AddIndexes(findex, start, 3, findex);
@@ -2801,11 +2810,11 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                         /******************************************************
                          * Loop over the X_Face z_edges.
                          ******************************************************/
-                        for (p= 0; p< rfactor[2]; p++)
+                        for (p = 0; p < rfactor[2]; p++)
                         {
                            hypre_CopyIndex(findex, var_index);
-                           var_index[2]+= p;
-                           for (n= 1; n< rfactor[1]; n++)
+                           var_index[2] += p;
+                           for (n = 1; n < rfactor[1]; n++)
                            {
                               var_index[1]++;
                               hypre_SStructGridFindBoxManEntry(fgrid_edge, part, var_index,
@@ -2815,15 +2824,15 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                               if ((rank <= fupper_ranks[part][var]) &&
                                   (rank >= flower_ranks[part][var]))
                               {
-                                 iedgeEdge[j]= rank;
+                                 iedgeEdge[j] = rank;
 
                                  /* X_Face. Two coarse Edge connections. */
-                                 ncols_edgeEdge[j]= 2;
+                                 ncols_edgeEdge[j] = 2;
                                  j++;
 
                                  /* record index location */
-                                 bdryedge_location[rank-start_rank1]= l;
-                                 l+= 2;
+                                 bdryedge_location[rank - start_rank1] = l;
+                                 l += 2;
                               }
                            }  /* for (n= 1; n< rfactor[1]; n++) */
                         }     /* for (p= 0; p< rfactor[2]; p++) */
@@ -2836,14 +2845,14 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                      hypre_SubtractIndexes(hypre_BoxIMin(&copy_box), jshift, 3,
                                            findex);
                      /* loop over all the vboxes to see if findex is inside */
-                     row_in= falseV;
-                     for (p= 0; p< num_vboxes[t]; p++)
+                     row_in = falseV;
+                     for (p = 0; p < num_vboxes[t]; p++)
                      {
-                        vbox= hypre_BoxArrayBox(box_array, vboxnums[t][p]);
+                        vbox = hypre_BoxArrayBox(box_array, vboxnums[t][p]);
                         if (hypre_IndexInBox(findex, vbox))
                         {
                            hypre_CopyIndex(findex, hypre_BoxIMin(&copy_box));
-                           row_in= trueV;
+                           row_in = trueV;
                            break;
                         }
                      }
@@ -2869,20 +2878,20 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                         zypre_BoxLoopGetIndex(lindex);
                         hypre_SetIndex3(findex, lindex[0], lindex[1], lindex[2]);
 
-                        for (k= 0; k< 3; k++)
+                        for (k = 0; k < 3; k++)
                         {
-                           findex[k]*= rfactor[k];
+                           findex[k] *= rfactor[k];
                         }
 
                         hypre_AddIndexes(findex, start, 3, findex);
                         /****************************************************
                          * Loop over the Y_Face z_edges.
                          ****************************************************/
-                        for (p= 0; p< rfactor[2]; p++)
+                        for (p = 0; p < rfactor[2]; p++)
                         {
                            hypre_CopyIndex(findex, var_index);
-                           var_index[2]+= p;
-                           for (n= 1; n< rfactor[0]; n++)
+                           var_index[2] += p;
+                           for (n = 1; n < rfactor[0]; n++)
                            {
                               var_index[0]++;
                               hypre_SStructGridFindBoxManEntry(fgrid_edge, part, var_index,
@@ -2892,15 +2901,15 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                               if ((rank <= fupper_ranks[part][var]) &&
                                   (rank >= flower_ranks[part][var]))
                               {
-                                 iedgeEdge[j]= rank;
+                                 iedgeEdge[j] = rank;
 
                                  /* Y_Face. Two coarse Edge connections. */
-                                 ncols_edgeEdge[j]= 2;
+                                 ncols_edgeEdge[j] = 2;
                                  j++;
 
                                  /* record index location */
-                                 bdryedge_location[rank-start_rank1]= l;
-                                 l+= 2;
+                                 bdryedge_location[rank - start_rank1] = l;
+                                 l += 2;
                               }
                            }  /* for (n= 1; n< rfactor[0]; n++) */
                         }     /* for (p= 0; p< rfactor[2]; p++) */
@@ -2918,31 +2927,31 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
       }  /* for (part= 0; part< nparts; part++) */
    }     /* if (ndim == 3) */
 
-   for (part= 0; part< nparts; part++)
+   for (part = 0; part < nparts; part++)
    {
-      p_fgrid= hypre_SStructGridPGrid(fgrid_edge, part);  /* edge grid */
-      Edge_nvars= hypre_SStructPGridNVars(p_fgrid);
-      Edge_vartypes= hypre_SStructPGridVarTypes(p_fgrid);
+      p_fgrid = hypre_SStructGridPGrid(fgrid_edge, part); /* edge grid */
+      Edge_nvars = hypre_SStructPGridNVars(p_fgrid);
+      Edge_vartypes = hypre_SStructPGridVarTypes(p_fgrid);
 
       /* note that fboxes are the contracted CELL boxes. Will get the correct
          variable grid extents. */
-      fboxes= contract_fedgeBoxes[part];
+      fboxes = contract_fedgeBoxes[part];
 
-      for (t= 0; t< Edge_nvars; t++)
+      for (t = 0; t < Edge_nvars; t++)
       {
          var      = Edge_vartypes[t];
-         var_fgrid= hypre_SStructPGridVTSGrid(p_fgrid, var);
-         box_array= hypre_StructGridBoxes(var_fgrid);
+         var_fgrid = hypre_SStructPGridVTSGrid(p_fgrid, var);
+         box_array = hypre_StructGridBoxes(var_fgrid);
 
          /* to reduce comparison, take the switch outside of the loop */
-         switch(var)
+         switch (var)
          {
             case 2:
             {
                /* 2-d x_face = x_edge, can be interior */
                hypre_ForBoxI(i, fboxes)
                {
-                  cellbox= hypre_BoxArrayBox(fboxes, i);
+                  cellbox = hypre_BoxArrayBox(fboxes, i);
                   vbox   = hypre_BoxArrayBox(box_array, i);
 
                   /* adjust the contracted cellbox to the variable box */
@@ -2960,27 +2969,27 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                   {
                      zypre_BoxLoopGetIndex(lindex);
                      hypre_SetIndex3(findex, lindex[0], lindex[1], lindex[2]);
-                     for (k= 0; k< 3; k++)
+                     for (k = 0; k < 3; k++)
                      {
-                        findex[k]*= rfactor[k];
+                        findex[k] *= rfactor[k];
                      }
                      hypre_AddIndexes(findex, start, 3, findex);
 
                      /* get interior edges */
-                     for (p= 1; p< rfactor[0]; p++)
+                     for (p = 1; p < rfactor[0]; p++)
                      {
                         hypre_CopyIndex(findex, var_index);
-                        var_index[0]+= p;
-                        for (n= 0; n< rfactor[1]; n++)
+                        var_index[0] += p;
+                        for (n = 0; n < rfactor[1]; n++)
                         {
                            hypre_SStructGridFindBoxManEntry(fgrid_edge, part, var_index,
                                                             t, &entry);
                            hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                                  matrix_type);
-                           iedgeEdge[j]= rank;
+                           iedgeEdge[j] = rank;
 
                            /* lies interior of Face. Four coarse Edge connection. */
-                           ncols_edgeEdge[j]= 4;
+                           ncols_edgeEdge[j] = 4;
                            j++;
 
                            var_index[1]++;
@@ -2998,7 +3007,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                /* 2-d y_face = y_edge, can be interior */
                hypre_ForBoxI(i, fboxes)
                {
-                  cellbox= hypre_BoxArrayBox(fboxes, i);
+                  cellbox = hypre_BoxArrayBox(fboxes, i);
                   vbox   = hypre_BoxArrayBox(box_array, i);
 
                   /* adjust the project cellbox to the variable box */
@@ -3017,28 +3026,28 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                      zypre_BoxLoopGetIndex(lindex);
                      hypre_SetIndex3(findex, lindex[0], lindex[1], lindex[2]);
 
-                     for (k= 0; k< 3; k++)
+                     for (k = 0; k < 3; k++)
                      {
-                        findex[k]*= rfactor[k];
+                        findex[k] *= rfactor[k];
                      }
 
                      hypre_AddIndexes(findex, start, 3, findex);
 
                      /* get interior edges */
-                     for (p= 1; p< rfactor[1]; p++)
+                     for (p = 1; p < rfactor[1]; p++)
                      {
                         hypre_CopyIndex(findex, var_index);
-                        var_index[1]+= p;
-                        for (n= 0; n< rfactor[0]; n++)
+                        var_index[1] += p;
+                        for (n = 0; n < rfactor[0]; n++)
                         {
                            hypre_SStructGridFindBoxManEntry(fgrid_edge, part, var_index,
                                                             t, &entry);
                            hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                                  matrix_type);
-                           iedgeEdge[j]= rank;
+                           iedgeEdge[j] = rank;
 
                            /* lies interior of Face. Four coarse Edge connection. */
-                           ncols_edgeEdge[j]= 4;
+                           ncols_edgeEdge[j] = 4;
                            j++;
 
                            var_index[0]++;
@@ -3055,7 +3064,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                /* 3-d x_edge, can be only interior */
                hypre_ForBoxI(i, fboxes)
                {
-                  cellbox= hypre_BoxArrayBox(fboxes, i);
+                  cellbox = hypre_BoxArrayBox(fboxes, i);
                   vbox   = hypre_BoxArrayBox(box_array, i);
 
                   /* adjust the project cellbox to the variable box */
@@ -3073,42 +3082,42 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                   {
                      zypre_BoxLoopGetIndex(lindex);
                      hypre_SetIndex3(findex, lindex[0], lindex[1], lindex[2]);
-                     for (k= 0; k< 3; k++)
+                     for (k = 0; k < 3; k++)
                      {
-                        findex[k]*= rfactor[k];
+                        findex[k] *= rfactor[k];
                      }
                      hypre_AddIndexes(findex, start, 3, findex);
 
                      /* get interior edges */
-                     for (p= 1; p< rfactor[2]; p++)
+                     for (p = 1; p < rfactor[2]; p++)
                      {
                         hypre_CopyIndex(findex, var_index);
-                        var_index[2]+= p;
-                        for (n= 1; n< rfactor[1]; n++)
+                        var_index[2] += p;
+                        for (n = 1; n < rfactor[1]; n++)
                         {
                            var_index[1]++;
-                           for (k= 0; k< rfactor[0]; k++)
+                           for (k = 0; k < rfactor[0]; k++)
                            {
                               hypre_SStructGridFindBoxManEntry(fgrid_edge, part, var_index,
                                                                t, &entry);
                               hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                                     matrix_type);
-                              iedgeEdge[j]= rank;
+                              iedgeEdge[j] = rank;
 
                               /* Interior. Twelve coarse Edge connections. */
-                              ncols_edgeEdge[j]= 12;
+                              ncols_edgeEdge[j] = 12;
                               j++;
 
                               var_index[0]++;
                            }  /* for (k= 0; k< rfactor[0]; k++) */
 
                            /* reset var_index[0] to the initial index for next k loop */
-                           var_index[0]-= rfactor[0];
+                           var_index[0] -= rfactor[0];
 
                         }  /* for (n= 1; n< rfactor[1]; n++) */
 
                         /* reset var_index[1] to the initial index for next n loop */
-                        var_index[1]-= (rfactor[1]-1);
+                        var_index[1] -= (rfactor[1] - 1);
                      }  /* for (p= 1; p< rfactor[2]; p++) */
 
                   }
@@ -3122,7 +3131,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                /* 3-d y_edge, can be only interior */
                hypre_ForBoxI(i, fboxes)
                {
-                  cellbox= hypre_BoxArrayBox(fboxes, i);
+                  cellbox = hypre_BoxArrayBox(fboxes, i);
                   vbox   = hypre_BoxArrayBox(box_array, i);
 
                   /* adjust the contract cellbox to the variable box */
@@ -3140,42 +3149,42 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                   {
                      zypre_BoxLoopGetIndex(lindex);
                      hypre_SetIndex3(findex, lindex[0], lindex[1], lindex[2]);
-                     for (k= 0; k< 3; k++)
+                     for (k = 0; k < 3; k++)
                      {
-                        findex[k]*= rfactor[k];
+                        findex[k] *= rfactor[k];
                      }
                      hypre_AddIndexes(findex, start, 3, findex);
 
                      /* get interior edges */
-                     for (p= 1; p< rfactor[2]; p++)
+                     for (p = 1; p < rfactor[2]; p++)
                      {
                         hypre_CopyIndex(findex, var_index);
-                        var_index[2]+= p;
-                        for (n= 1; n< rfactor[0]; n++)
+                        var_index[2] += p;
+                        for (n = 1; n < rfactor[0]; n++)
                         {
                            var_index[0]++;
-                           for (k= 0; k< rfactor[1]; k++)
+                           for (k = 0; k < rfactor[1]; k++)
                            {
                               hypre_SStructGridFindBoxManEntry(fgrid_edge, part, var_index,
                                                                t, &entry);
                               hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                                     matrix_type);
-                              iedgeEdge[j]= rank;
+                              iedgeEdge[j] = rank;
 
                               /* Interior. Twelve coarse Edge connections. */
-                              ncols_edgeEdge[j]= 12;
+                              ncols_edgeEdge[j] = 12;
                               j++;
 
                               var_index[1]++;
                            }  /* for (k= 0; k< rfactor[1]; k++) */
 
                            /* reset var_index[1] to the initial index for next k loop */
-                           var_index[1]-= rfactor[1];
+                           var_index[1] -= rfactor[1];
 
                         }  /* for (n= 1; n< rfactor[0]; n++) */
 
                         /* reset var_index[0] to the initial index for next n loop */
-                        var_index[0]-= (rfactor[0]-1);
+                        var_index[0] -= (rfactor[0] - 1);
                      }  /* for (p= 1; p< rfactor[2]; p++) */
 
                   }
@@ -3190,7 +3199,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                /* 3-d z_edge, can be only interior */
                hypre_ForBoxI(i, fboxes)
                {
-                  cellbox= hypre_BoxArrayBox(fboxes, i);
+                  cellbox = hypre_BoxArrayBox(fboxes, i);
                   vbox   = hypre_BoxArrayBox(box_array, i);
 
                   /* adjust the contracted cellbox to the variable box */
@@ -3208,42 +3217,42 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                   {
                      zypre_BoxLoopGetIndex(lindex);
                      hypre_SetIndex3(findex, lindex[0], lindex[1], lindex[2]);
-                     for (k= 0; k< 3; k++)
+                     for (k = 0; k < 3; k++)
                      {
-                        findex[k]*= rfactor[k];
+                        findex[k] *= rfactor[k];
                      }
                      hypre_AddIndexes(findex, start, 3, findex);
 
                      /* get interior edges */
-                     for (p= 1; p< rfactor[1]; p++)
+                     for (p = 1; p < rfactor[1]; p++)
                      {
                         hypre_CopyIndex(findex, var_index);
-                        var_index[1]+= p;
-                        for (n= 1; n< rfactor[0]; n++)
+                        var_index[1] += p;
+                        for (n = 1; n < rfactor[0]; n++)
                         {
                            var_index[0]++;
-                           for (k= 0; k< rfactor[2]; k++)
+                           for (k = 0; k < rfactor[2]; k++)
                            {
                               hypre_SStructGridFindBoxManEntry(fgrid_edge, part, var_index,
                                                                t, &entry);
                               hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                                     matrix_type);
-                              iedgeEdge[j]= rank;
+                              iedgeEdge[j] = rank;
 
                               /* Interior. Twelve coarse Edge connections. */
-                              ncols_edgeEdge[j]= 12;
+                              ncols_edgeEdge[j] = 12;
                               j++;
 
                               var_index[2]++;
                            }  /* for (k= 0; k< rfactor[2]; k++) */
 
                            /* reset var_index[2] to the initial index for next k loop */
-                           var_index[2]-= rfactor[2];
+                           var_index[2] -= rfactor[2];
 
                         }  /* for (n= 1; n< rfactor[0]; n++) */
 
                         /* reset var_index[0] to the initial index for next n loop */
-                        var_index[0]-= (rfactor[0]-1);
+                        var_index[0] -= (rfactor[0] - 1);
                      }  /* for (p= 1; p< rfactor[1]; p++) */
 
                   }
@@ -3256,18 +3265,18 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
       }     /* for (t= 0; t< Edge_nvars; t++) */
    }        /* for (part= 0; part< nparts; part++) */
 
-   k= 0;
-   j= 0;
-   for (i= 0; i< nedges; i++)
+   k = 0;
+   j = 0;
+   for (i = 0; i < nedges; i++)
    {
       if (ncols_edgeEdge[i])
       {
-         k+= ncols_edgeEdge[i];
+         k += ncols_edgeEdge[i];
          j++;
       }
    }
-   vals_edgeEdge = hypre_CTAlloc(HYPRE_Real,   k, HYPRE_MEMORY_DEVICE);
-   jedge_Edge    = hypre_CTAlloc(HYPRE_BigInt, k, HYPRE_MEMORY_DEVICE);
+   vals_edgeEdge = hypre_CTAlloc(HYPRE_Real, k, memory_location);
+   jedge_Edge    = hypre_CTAlloc(HYPRE_BigInt, k, memory_location);
    size1         = j;
 
    /*********************************************************************
@@ -3285,37 +3294,37 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
     *********************************************************************/
 
    /* loop over fedges aligning with the agglomerate coarse edges first. */
-   k= 0;
-   for (part= 0; part< nparts; part++)
+   k = 0;
+   for (part = 0; part < nparts; part++)
    {
-      p_fgrid= hypre_SStructGridPGrid(fgrid_edge, part);  /* edge grid */
-      Edge_nvars= hypre_SStructPGridNVars(p_fgrid);
-      Edge_vartypes= hypre_SStructPGridVarTypes(p_fgrid);
-      p_cgrid= hypre_SStructGridPGrid(cgrid_edge, part);  /* Edge grid */
+      p_fgrid = hypre_SStructGridPGrid(fgrid_edge, part); /* edge grid */
+      Edge_nvars = hypre_SStructPGridNVars(p_fgrid);
+      Edge_vartypes = hypre_SStructPGridVarTypes(p_fgrid);
+      p_cgrid = hypre_SStructGridPGrid(cgrid_edge, part); /* Edge grid */
 
       /* note that fboxes are the contracted CELL boxes. Will get the correct
          variable grid extents. */
-      fboxes= contract_fedgeBoxes[part];
+      fboxes = contract_fedgeBoxes[part];
 
-      for (t= 0; t< Edge_nvars; t++)
+      for (t = 0; t < Edge_nvars; t++)
       {
          var      = Edge_vartypes[t];
-         var_fgrid= hypre_SStructPGridVTSGrid(p_fgrid, var);
-         box_array= hypre_StructGridBoxes(var_fgrid);
+         var_fgrid = hypre_SStructPGridVTSGrid(p_fgrid, var);
+         box_array = hypre_StructGridBoxes(var_fgrid);
 
-         n_boxoffsets= ndim-1;
+         n_boxoffsets = ndim - 1;
          boxoffset   = hypre_CTAlloc(hypre_Index,  n_boxoffsets, HYPRE_MEMORY_HOST);
          suboffset   = hypre_CTAlloc(hypre_Index,  n_boxoffsets, HYPRE_MEMORY_HOST);
-         switch(var)
+         switch (var)
          {
             case 2: /* 2-d: x_face (vertical edges), stride=[rfactor[0],1,1]
                        fCedge_ratio= 1.0/rfactor[1] */
             {
                hypre_SetIndex3(stride, rfactor[0], 1, 1);
-               fCedge_ratio= 1.0/rfactor[1];
+               fCedge_ratio = 1.0 / rfactor[1];
 
                /* boxoffset shrink in the i direction */
-               hypre_SetIndex3(boxoffset[0], rfactor[0]-1, 0, 0);
+               hypre_SetIndex3(boxoffset[0], rfactor[0] - 1, 0, 0);
                hypre_SetIndex3(suboffset[0], 1, 0, 0);
 
                /* extend loop_size by one in the stride direction */
@@ -3327,10 +3336,10 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                        fCedge_ratio= 1.0/rfactor[0] */
             {
                hypre_SetIndex3(stride, 1, rfactor[1], 1);
-               fCedge_ratio= 1.0/rfactor[0];
+               fCedge_ratio = 1.0 / rfactor[0];
 
                /* boxoffset shrink in the j direction */
-               hypre_SetIndex3(boxoffset[0], 0, rfactor[1]-1, 0);
+               hypre_SetIndex3(boxoffset[0], 0, rfactor[1] - 1, 0);
                hypre_SetIndex3(suboffset[0], 0, 1, 0);
 
                /* extend loop_size by one in the stride direction */
@@ -3342,11 +3351,11 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                        fCedge_ratio= 1.0/rfactor[0] */
             {
                hypre_SetIndex3(stride, 1, rfactor[1], rfactor[2]);
-               fCedge_ratio= 1.0/rfactor[0];
+               fCedge_ratio = 1.0 / rfactor[0];
 
                /* boxoffset shrink in the j & k directions */
-               hypre_SetIndex3(boxoffset[0], 0, rfactor[1]-1, 0);
-               hypre_SetIndex3(boxoffset[1], 0, 0, rfactor[2]-1);
+               hypre_SetIndex3(boxoffset[0], 0, rfactor[1] - 1, 0);
+               hypre_SetIndex3(boxoffset[1], 0, 0, rfactor[2] - 1);
                hypre_SetIndex3(suboffset[0], 0, 1, 0);
                hypre_SetIndex3(suboffset[1], 0, 0, 1);
 
@@ -3359,11 +3368,11 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                        fCedge_ratio= 1.0/rfactor[1] */
             {
                hypre_SetIndex3(stride, rfactor[0], 1, rfactor[2]);
-               fCedge_ratio= 1.0/rfactor[1];
+               fCedge_ratio = 1.0 / rfactor[1];
 
                /* boxoffset shrink in the i & k directions */
-               hypre_SetIndex3(boxoffset[0], rfactor[0]-1, 0, 0);
-               hypre_SetIndex3(boxoffset[1], 0, 0, rfactor[2]-1);
+               hypre_SetIndex3(boxoffset[0], rfactor[0] - 1, 0, 0);
+               hypre_SetIndex3(boxoffset[1], 0, 0, rfactor[2] - 1);
                hypre_SetIndex3(suboffset[0], 1, 0, 0);
                hypre_SetIndex3(suboffset[1], 0, 0, 1);
 
@@ -3376,11 +3385,11 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                        fCedge_ratio= 1.0/rfactor[2] */
             {
                hypre_SetIndex3(stride, rfactor[0], rfactor[1], 1);
-               fCedge_ratio= 1.0/rfactor[2];
+               fCedge_ratio = 1.0 / rfactor[2];
 
                /* boxoffset shrink in the i & j directions */
-               hypre_SetIndex3(boxoffset[0], rfactor[0]-1, 0, 0);
-               hypre_SetIndex3(boxoffset[1], 0, rfactor[1]-1, 0);
+               hypre_SetIndex3(boxoffset[0], rfactor[0] - 1, 0, 0);
+               hypre_SetIndex3(boxoffset[1], 0, rfactor[1] - 1, 0);
                hypre_SetIndex3(suboffset[0], 1, 0, 0);
                hypre_SetIndex3(suboffset[1], 0, 1, 0);
 
@@ -3388,14 +3397,18 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                hypre_SetIndex3(hi_index, 1, 1, 0);
                break;
             }
+            default:
+            {
+               fCedge_ratio = 1.0;
+            }
          }
 
          hypre_ForBoxI(i, fboxes)
          {
-            cellbox= hypre_BoxArrayBox(fboxes, i);
+            cellbox = hypre_BoxArrayBox(fboxes, i);
 
             /* vboxes inside the i'th cellbox */
-            num_vboxes= n_CtoVbox[part][i];
+            num_vboxes = n_CtoVbox[part][i];
             vboxnums  = CtoVboxnums[part][i];
 
             hypre_CopyIndex(Edge_cstarts[part][i], cstart);
@@ -3405,19 +3418,19 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                vanish. */
             hypre_CopyBox(cellbox, &copy_box);
 
-            for (j= 0; j< n_boxoffsets; j++)
+            for (j = 0; j < n_boxoffsets; j++)
             {
                hypre_SubtractIndexes(hypre_BoxIMin(&copy_box), suboffset[j], 3,
                                      findex);
-               row_in= falseV;
-               for (p= 0; p< num_vboxes[t]; p++)
+               row_in = falseV;
+               for (p = 0; p < num_vboxes[t]; p++)
                {
-                  vbox= hypre_BoxArrayBox(box_array, vboxnums[t][p]);
+                  vbox = hypre_BoxArrayBox(box_array, vboxnums[t][p]);
 
                   if (hypre_IndexInBox(findex, vbox))
                   {
                      hypre_CopyIndex(findex, hypre_BoxIMin(&copy_box));
-                     row_in= trueV;
+                     row_in = trueV;
                      break;
                   }
                }
@@ -3453,9 +3466,9 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                HYPRE_BigInt big_j;
                zypre_BoxLoopGetIndex(lindex);
                hypre_SetIndex3(findex, lindex[0], lindex[1], lindex[2]);
-               for (j= 0; j< 3; j++)
+               for (j = 0; j < 3; j++)
                {
-                  findex[j]*= stride[j];
+                  findex[j] *= stride[j];
                }
 
                hypre_AddIndexes(findex, start, 3, findex);
@@ -3481,8 +3494,8 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                    t, &entry);
                   hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                         matrix_type);
-                  jedge_Edge[k]= rank;
-                  vals_edgeEdge[k]= fCedge_ratio;
+                  jedge_Edge[k] = rank;
+                  vals_edgeEdge[k] = fCedge_ratio;
 
                   k++;
                }
@@ -3499,57 +3512,57 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
    {
       /* Allocate memory to arrays for the tridiagonal system & solutions.
          Take the maximum size needed. */
-      i= rfactor[0]-1;
-      for (j= 1; j< ndim; j++)
+      i = rfactor[0] - 1;
+      for (j = 1; j < ndim; j++)
       {
-         if (i < (rfactor[j]-1))
+         if (i < (rfactor[j] - 1))
          {
-            i= rfactor[j]-1;
+            i = rfactor[j] - 1;
          }
       }
-      upper= hypre_CTAlloc(HYPRE_Real,  i, HYPRE_MEMORY_HOST);
-      lower= hypre_CTAlloc(HYPRE_Real,  i, HYPRE_MEMORY_HOST);
+      upper = hypre_CTAlloc(HYPRE_Real,  i, HYPRE_MEMORY_HOST);
+      lower = hypre_CTAlloc(HYPRE_Real,  i, HYPRE_MEMORY_HOST);
       diag = hypre_CTAlloc(HYPRE_Real,  i, HYPRE_MEMORY_HOST);
-      face_w1= hypre_CTAlloc(HYPRE_Real,  i, HYPRE_MEMORY_HOST);
-      face_w2= hypre_CTAlloc(HYPRE_Real,  i, HYPRE_MEMORY_HOST);
-      off_proc_flag= hypre_CTAlloc(HYPRE_Int,  i+1, HYPRE_MEMORY_HOST);
+      face_w1 = hypre_CTAlloc(HYPRE_Real,  i, HYPRE_MEMORY_HOST);
+      face_w2 = hypre_CTAlloc(HYPRE_Real,  i, HYPRE_MEMORY_HOST);
+      off_proc_flag = hypre_CTAlloc(HYPRE_Int,  i + 1, HYPRE_MEMORY_HOST);
 
-      for (part= 0; part< nparts; part++)
+      for (part = 0; part < nparts; part++)
       {
-         p_fgrid= hypre_SStructGridPGrid(fgrid_edge, part);  /* edge grid */
-         Edge_nvars= hypre_SStructPGridNVars(p_fgrid);
-         Edge_vartypes= hypre_SStructPGridVarTypes(p_fgrid);
-         p_cgrid= hypre_SStructGridPGrid(cgrid_edge, part);  /* Edge grid */
+         p_fgrid = hypre_SStructGridPGrid(fgrid_edge, part); /* edge grid */
+         Edge_nvars = hypre_SStructPGridNVars(p_fgrid);
+         Edge_vartypes = hypre_SStructPGridVarTypes(p_fgrid);
+         p_cgrid = hypre_SStructGridPGrid(cgrid_edge, part); /* Edge grid */
 
          /* note that fboxes are the contracted CELL boxes. Will get the correct
             variable grid extents. */
-         fboxes= contract_fedgeBoxes[part];
+         fboxes = contract_fedgeBoxes[part];
 
          /* may need to shrink a given box in some boxoffset directions */
-         boxoffset= hypre_TAlloc(hypre_Index,  ndim, HYPRE_MEMORY_HOST);
-         for (t= 0; t< ndim; t++)
+         boxoffset = hypre_TAlloc(hypre_Index,  ndim, HYPRE_MEMORY_HOST);
+         for (t = 0; t < ndim; t++)
          {
             hypre_ClearIndex(boxoffset[t]);
-            hypre_IndexD(boxoffset[t], t)= rfactor[t]-1;
+            hypre_IndexD(boxoffset[t], t) = rfactor[t] - 1;
          }
 
-         for (t= 0; t< Edge_nvars; t++)
+         for (t = 0; t < Edge_nvars; t++)
          {
             var      = Edge_vartypes[t];
-            var_fgrid=  hypre_SStructPGridVTSGrid(p_fgrid, var);
-            box_array= hypre_StructGridBoxes(var_fgrid);
-            switch(var)
+            var_fgrid =  hypre_SStructPGridVTSGrid(p_fgrid, var);
+            box_array = hypre_StructGridBoxes(var_fgrid);
+            switch (var)
             {
                case 5:
                {
                   /* 3-d x_edge, can be Y or Z_Face */
-                  fCedge_ratio= 1.0/rfactor[0];
+                  fCedge_ratio = 1.0 / rfactor[0];
                   hypre_ForBoxI(i, fboxes)
                   {
-                     cellbox= hypre_BoxArrayBox(fboxes, i);
+                     cellbox = hypre_BoxArrayBox(fboxes, i);
 
                      /* vboxes inside the i'th cellbox */
-                     num_vboxes= n_CtoVbox[part][i];
+                     num_vboxes = n_CtoVbox[part][i];
                      vboxnums  = CtoVboxnums[part][i];
 
                      hypre_CopyIndex(Edge_cstarts[part][i], cstart);
@@ -3568,14 +3581,14 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                      hypre_SubtractIndexes(hypre_BoxIMin(&copy_box), kshift, 3,
                                            findex);
                      /* loop over all the vboxes to see if findex is inside */
-                     row_in= falseV;
-                     for (p= 0; p< num_vboxes[t]; p++)
+                     row_in = falseV;
+                     for (p = 0; p < num_vboxes[t]; p++)
                      {
-                        vbox= hypre_BoxArrayBox(box_array, vboxnums[t][p]);
+                        vbox = hypre_BoxArrayBox(box_array, vboxnums[t][p]);
                         if (hypre_IndexInBox(findex, vbox))
                         {
                            hypre_CopyIndex(findex, hypre_BoxIMin(&copy_box));
-                           row_in= trueV;
+                           row_in = trueV;
                            break;
                         }
                      }
@@ -3611,9 +3624,9 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                         hypre_AddIndexes(cindex, cstart, 3, cindex);
 
                         /* Will need the actual fine indices. */
-                        for (l= 0; l< ndim; l++)
+                        for (l = 0; l < ndim; l++)
                         {
-                           findex[l]*= rfactor[l];
+                           findex[l] *= rfactor[l];
                         }
                         hypre_AddIndexes(findex, start, 3, findex);
 
@@ -3631,14 +3644,14 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
 
                         /* loop over the strips of x_edges making up the Z_Face and
                            create the tridiagonal systems by collapsing the stencils. */
-                        for (p= 0; p< rfactor[0]; p++)
+                        for (p = 0; p < rfactor[0]; p++)
                         {
                            /* create the rhs's for the tridiagonal system. Require
                               find the ranks at the endpt's of the strip. */
-                           for (n= 0; n< rfactor[1]-1; n++)
+                           for (n = 0; n < rfactor[1] - 1; n++)
                            {
-                              face_w1[n]= 0.0;
-                              face_w2[n]= 0.0;
+                              face_w1[n] = 0.0;
+                              face_w2[n] = 0.0;
                            }
 
                            /******************************************************
@@ -3648,19 +3661,19 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                             ******************************************************/
 
                            /* lower-end and upper-end edge weights */
-                           face_w1[0]= fCedge_ratio;
-                           face_w2[rfactor[1]-2]= fCedge_ratio;
+                           face_w1[0] = fCedge_ratio;
+                           face_w2[rfactor[1] - 2] = fCedge_ratio;
 
                            /******************************************************
                             * create tridiagonal matrix.
                             * x_edge for Z_Face: collapse_dir= 2, stencil_dir= 1
                             ******************************************************/
                            hypre_CopyIndex(findex, var_index);
-                           var_index[0]+= p;
-                           for (n= 1; n< rfactor[1]; n++)
+                           var_index[0] += p;
+                           for (n = 1; n < rfactor[1]; n++)
                            {
                               var_index[1]++;
-                              off_proc_flag[n]=
+                              off_proc_flag[n] =
                                  hypre_CollapseStencilToStencil(Aee,
                                                                 fgrid_edge,
                                                                 part,
@@ -3670,30 +3683,30 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                                 1,
                                                                 &stencil_vals);
                               /* put extracted stencil_vals into tridiagonal matrix */
-                              lower[n-1]= stencil_vals[0];
-                              diag[n-1] = stencil_vals[1];
-                              upper[n-1]= stencil_vals[2];
+                              lower[n - 1] = stencil_vals[0];
+                              diag[n - 1] = stencil_vals[1];
+                              upper[n - 1] = stencil_vals[2];
                               hypre_TFree(stencil_vals, HYPRE_MEMORY_HOST);
                            }
 
                            /* solve systems to get weights. Must adjust face_w's so
                               that the stencil entry contributes. */
-                           face_w1[0]*= -lower[0];
-                           face_w2[rfactor[1]-2]*= -upper[rfactor[1]-2];
-                           hypre_TriDiagSolve(diag, upper, lower, face_w1, rfactor[1]-1);
-                           hypre_TriDiagSolve(diag, upper, lower, face_w2, rfactor[1]-1);
+                           face_w1[0] *= -lower[0];
+                           face_w2[rfactor[1] - 2] *= -upper[rfactor[1] - 2];
+                           hypre_TriDiagSolve(diag, upper, lower, face_w1, rfactor[1] - 1);
+                           hypre_TriDiagSolve(diag, upper, lower, face_w2, rfactor[1] - 1);
 
                            /* place weights into vals_edgeEdge */
-                           for (n= 1; n< rfactor[1]; n++)
+                           for (n = 1; n < rfactor[1]; n++)
                            {
                               if (!off_proc_flag[n])  /* off_proc_flag= 1 if offproc */
                               {
-                                 jedge_Edge[k]= rank;
-                                 vals_edgeEdge[k]= face_w1[n-1]; /* lower end connection */
+                                 jedge_Edge[k] = rank;
+                                 vals_edgeEdge[k] = face_w1[n - 1]; /* lower end connection */
                                  k++;
 
-                                 jedge_Edge[k]= rank2;
-                                 vals_edgeEdge[k]= face_w2[n-1]; /* upper end connection */
+                                 jedge_Edge[k] = rank2;
+                                 vals_edgeEdge[k] = face_w2[n - 1]; /* upper end connection */
                                  k++;
                               }
                            }
@@ -3707,14 +3720,14 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                      hypre_SubtractIndexes(hypre_BoxIMin(&copy_box), jshift, 3,
                                            findex);
                      /* loop over all the vboxes to see if findex is inside */
-                     row_in= falseV;
-                     for (p= 0; p< num_vboxes[t]; p++)
+                     row_in = falseV;
+                     for (p = 0; p < num_vboxes[t]; p++)
                      {
-                        vbox= hypre_BoxArrayBox(box_array, vboxnums[t][p]);
+                        vbox = hypre_BoxArrayBox(box_array, vboxnums[t][p]);
                         if (hypre_IndexInBox(findex, vbox))
                         {
                            hypre_CopyIndex(findex, hypre_BoxIMin(&copy_box));
-                           row_in= trueV;
+                           row_in = trueV;
                            break;
                         }
                      }
@@ -3749,9 +3762,9 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                         hypre_AddIndexes(cindex, cstart, 3, cindex);
 
                         /* Will need the actual fine indices. */
-                        for (l= 0; l< ndim; l++)
+                        for (l = 0; l < ndim; l++)
                         {
-                           findex[l]*= rfactor[l];
+                           findex[l] *= rfactor[l];
                         }
                         hypre_AddIndexes(findex, start, 3, findex);
 
@@ -3773,30 +3786,30 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
 
                         /* loop over the strips of x_edges making up the Y_Face and
                            create the tridiagonal systems by collapsing the stencils. */
-                        for (p= 0; p< rfactor[0]; p++)
+                        for (p = 0; p < rfactor[0]; p++)
                         {
                            /* create the rhs's for the tridiagonal system. Require
                               find the ranks at the endpt's of the strip. */
-                           for (n= 0; n< rfactor[2]-1; n++)
+                           for (n = 0; n < rfactor[2] - 1; n++)
                            {
-                              face_w1[n]= 0.0;
-                              face_w2[n]= 0.0;
+                              face_w1[n] = 0.0;
+                              face_w2[n] = 0.0;
                            }
 
                            /* lower-end and upper-end edge weights */
-                           face_w1[0]= fCedge_ratio;
-                           face_w2[rfactor[2]-2]= fCedge_ratio;
+                           face_w1[0] = fCedge_ratio;
+                           face_w2[rfactor[2] - 2] = fCedge_ratio;
 
                            /******************************************************
                             * create tridiagonal matrix.
                             * x_edge for Y_Face: collapse_dir= 1, stencil_dir= 2
                             ******************************************************/
                            hypre_CopyIndex(findex, var_index);
-                           var_index[0]+= p;
-                           for (n= 1; n< rfactor[2]; n++)
+                           var_index[0] += p;
+                           for (n = 1; n < rfactor[2]; n++)
                            {
                               var_index[2]++;
-                              off_proc_flag[n]=
+                              off_proc_flag[n] =
                                  hypre_CollapseStencilToStencil(Aee,
                                                                 fgrid_edge,
                                                                 part,
@@ -3806,30 +3819,30 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                                 2,
                                                                 &stencil_vals);
                               /* put extracted stencil_vals into tridiagonal matrix */
-                              lower[n-1]= stencil_vals[0];
-                              diag[n-1] = stencil_vals[1];
-                              upper[n-1]= stencil_vals[2];
+                              lower[n - 1] = stencil_vals[0];
+                              diag[n - 1] = stencil_vals[1];
+                              upper[n - 1] = stencil_vals[2];
                               hypre_TFree(stencil_vals, HYPRE_MEMORY_HOST);
                            }
 
                            /* solve systems to get weights. Must adjust face_w's so
                               that the stencil entry contributes. */
-                           face_w1[0]*= -lower[0];
-                           face_w2[rfactor[2]-2]*= -upper[rfactor[2]-2];
-                           hypre_TriDiagSolve(diag, upper, lower, face_w1, rfactor[2]-1);
-                           hypre_TriDiagSolve(diag, upper, lower, face_w2, rfactor[2]-1);
+                           face_w1[0] *= -lower[0];
+                           face_w2[rfactor[2] - 2] *= -upper[rfactor[2] - 2];
+                           hypre_TriDiagSolve(diag, upper, lower, face_w1, rfactor[2] - 1);
+                           hypre_TriDiagSolve(diag, upper, lower, face_w2, rfactor[2] - 1);
 
                            /* place weights into vals_edgeEdge */
-                           for (n= 1; n< rfactor[2]; n++)
+                           for (n = 1; n < rfactor[2]; n++)
                            {
                               if (!off_proc_flag[n])  /* off_proc_flag= 1 if offproc */
                               {
-                                 jedge_Edge[k]= rank;
-                                 vals_edgeEdge[k]= face_w1[n-1]; /* lower end connection */
+                                 jedge_Edge[k] = rank;
+                                 vals_edgeEdge[k] = face_w1[n - 1]; /* lower end connection */
                                  k++;
 
-                                 jedge_Edge[k]= rank2;
-                                 vals_edgeEdge[k]= face_w2[n-1]; /* upper end connection */
+                                 jedge_Edge[k] = rank2;
+                                 vals_edgeEdge[k] = face_w2[n - 1]; /* upper end connection */
                                  k++;
                               }
                            }
@@ -3844,13 +3857,13 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                case 6:
                {
                   /* 3-d y_edge, can be X or Z_Face */
-                  fCedge_ratio= 1.0/rfactor[1];
+                  fCedge_ratio = 1.0 / rfactor[1];
                   hypre_ForBoxI(i, fboxes)
                   {
-                     cellbox= hypre_BoxArrayBox(fboxes, i);
+                     cellbox = hypre_BoxArrayBox(fboxes, i);
 
                      /* vboxes inside the i'th cellbox */
-                     num_vboxes= n_CtoVbox[part][i];
+                     num_vboxes = n_CtoVbox[part][i];
                      vboxnums  = CtoVboxnums[part][i];
 
                      hypre_CopyIndex(Edge_cstarts[part][i], cstart);
@@ -3870,14 +3883,14 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                      hypre_SubtractIndexes(hypre_BoxIMin(&copy_box), kshift, 3,
                                            findex);
                      /* loop over all the vboxes to see if findex is inside */
-                     row_in= falseV;
-                     for (p= 0; p< num_vboxes[t]; p++)
+                     row_in = falseV;
+                     for (p = 0; p < num_vboxes[t]; p++)
                      {
-                        vbox= hypre_BoxArrayBox(box_array, vboxnums[t][p]);
+                        vbox = hypre_BoxArrayBox(box_array, vboxnums[t][p]);
                         if (hypre_IndexInBox(findex, vbox))
                         {
                            hypre_CopyIndex(findex, hypre_BoxIMin(&copy_box));
-                           row_in= trueV;
+                           row_in = trueV;
                            break;
                         }
                      }
@@ -3913,9 +3926,9 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                         hypre_AddIndexes(cindex, cstart, 3, cindex);
 
                         /* Will need the actual fine indices. */
-                        for (l= 0; l< ndim; l++)
+                        for (l = 0; l < ndim; l++)
                         {
-                           findex[l]*= rfactor[l];
+                           findex[l] *= rfactor[l];
                         }
                         hypre_AddIndexes(findex, start, 3, findex);
 
@@ -3933,30 +3946,30 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
 
                         /* loop over the strips of y_edges making up the Z_Face and
                            create the tridiagonal systems by collapsing the stencils. */
-                        for (p= 0; p< rfactor[1]; p++)
+                        for (p = 0; p < rfactor[1]; p++)
                         {
                            /* create the rhs's for the tridiagonal system. Require
                               find the ranks at the endpt's of the strip. */
-                           for (n= 0; n< rfactor[0]-1; n++)
+                           for (n = 0; n < rfactor[0] - 1; n++)
                            {
-                              face_w1[n]= 0.0;
-                              face_w2[n]= 0.0;
+                              face_w1[n] = 0.0;
+                              face_w2[n] = 0.0;
                            }
 
                            /* lower-end and upper-end edge weights */
-                           face_w1[0]= fCedge_ratio;
-                           face_w2[rfactor[0]-2]= fCedge_ratio;
+                           face_w1[0] = fCedge_ratio;
+                           face_w2[rfactor[0] - 2] = fCedge_ratio;
 
                            /******************************************************
                             * create tridiagonal matrix.
                             * y_edge for Z_Face: collapse_dir= 2, stencil_dir= 0
                             ******************************************************/
                            hypre_CopyIndex(findex, var_index);
-                           var_index[1]+= p;
-                           for (n= 1; n< rfactor[0]; n++)
+                           var_index[1] += p;
+                           for (n = 1; n < rfactor[0]; n++)
                            {
                               var_index[0]++;
-                              off_proc_flag[n]=
+                              off_proc_flag[n] =
                                  hypre_CollapseStencilToStencil(Aee,
                                                                 fgrid_edge,
                                                                 part,
@@ -3966,30 +3979,30 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                                 0,
                                                                 &stencil_vals);
                               /* put extracted stencil_vals into tridiagonal matrix */
-                              lower[n-1]= stencil_vals[0];
-                              diag[n-1] = stencil_vals[1];
-                              upper[n-1]= stencil_vals[2];
+                              lower[n - 1] = stencil_vals[0];
+                              diag[n - 1] = stencil_vals[1];
+                              upper[n - 1] = stencil_vals[2];
                               hypre_TFree(stencil_vals, HYPRE_MEMORY_HOST);
                            }
 
                            /* solve systems to get weights. Must adjust face_w's so
                               that the stencil entry contributes. */
-                           face_w1[0]*= -lower[0];
-                           face_w2[rfactor[0]-2]*= -upper[rfactor[0]-2];
-                           hypre_TriDiagSolve(diag, upper, lower, face_w1, rfactor[0]-1);
-                           hypre_TriDiagSolve(diag, upper, lower, face_w2, rfactor[0]-1);
+                           face_w1[0] *= -lower[0];
+                           face_w2[rfactor[0] - 2] *= -upper[rfactor[0] - 2];
+                           hypre_TriDiagSolve(diag, upper, lower, face_w1, rfactor[0] - 1);
+                           hypre_TriDiagSolve(diag, upper, lower, face_w2, rfactor[0] - 1);
 
                            /* place weights into vals_edgeEdge */
-                           for (n= 1; n< rfactor[0]; n++)
+                           for (n = 1; n < rfactor[0]; n++)
                            {
                               if (!off_proc_flag[n])  /* off_proc_flag= 1 if offproc */
                               {
-                                 jedge_Edge[k]= rank;
-                                 vals_edgeEdge[k]= face_w1[n-1]; /* lower end connection */
+                                 jedge_Edge[k] = rank;
+                                 vals_edgeEdge[k] = face_w1[n - 1]; /* lower end connection */
                                  k++;
 
-                                 jedge_Edge[k]= rank2;
-                                 vals_edgeEdge[k]= face_w2[n-1]; /* upper end connection */
+                                 jedge_Edge[k] = rank2;
+                                 vals_edgeEdge[k] = face_w2[n - 1]; /* upper end connection */
                                  k++;
                               }
                            }
@@ -4004,14 +4017,14 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                      hypre_SubtractIndexes(hypre_BoxIMin(&copy_box), ishift, 3,
                                            findex);
                      /* loop over all the vboxes to see if findex is inside */
-                     row_in= falseV;
-                     for (p= 0; p< num_vboxes[t]; p++)
+                     row_in = falseV;
+                     for (p = 0; p < num_vboxes[t]; p++)
                      {
-                        vbox= hypre_BoxArrayBox(box_array, vboxnums[t][p]);
+                        vbox = hypre_BoxArrayBox(box_array, vboxnums[t][p]);
                         if (hypre_IndexInBox(findex, vbox))
                         {
                            hypre_CopyIndex(findex, hypre_BoxIMin(&copy_box));
-                           row_in= trueV;
+                           row_in = trueV;
                            break;
                         }
                      }
@@ -4046,9 +4059,9 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                         hypre_AddIndexes(cindex, cstart, 3, cindex);
 
                         /* Will need the actual fine indices. */
-                        for (l= 0; l< ndim; l++)
+                        for (l = 0; l < ndim; l++)
                         {
-                           findex[l]*= rfactor[l];
+                           findex[l] *= rfactor[l];
                         }
                         hypre_AddIndexes(findex, start, 3, findex);
 
@@ -4070,30 +4083,30 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
 
                         /* loop over the strips of y_edges making up the X_Face and
                            create the tridiagonal systems by collapsing the stencils. */
-                        for (p= 0; p< rfactor[1]; p++)
+                        for (p = 0; p < rfactor[1]; p++)
                         {
                            /* create the rhs's for the tridiagonal system. Require
                               find the ranks at the endpt's of the strip. */
-                           for (n= 0; n< rfactor[2]-1; n++)
+                           for (n = 0; n < rfactor[2] - 1; n++)
                            {
-                              face_w1[n]= 0.0;
-                              face_w2[n]= 0.0;
+                              face_w1[n] = 0.0;
+                              face_w2[n] = 0.0;
                            }
 
                            /* lower-end and upper-end edge weights */
-                           face_w1[0]= fCedge_ratio;
-                           face_w2[rfactor[0]-2]= fCedge_ratio;
+                           face_w1[0] = fCedge_ratio;
+                           face_w2[rfactor[0] - 2] = fCedge_ratio;
 
                            /******************************************************
                             * create tridiagonal matrix.
                             * y_edge for X_Face: collapse_dir= 0, stencil_dir= 2
                             ******************************************************/
                            hypre_CopyIndex(findex, var_index);
-                           var_index[1]+= p;
-                           for (n= 1; n< rfactor[2]; n++)
+                           var_index[1] += p;
+                           for (n = 1; n < rfactor[2]; n++)
                            {
                               var_index[2]++;
-                              off_proc_flag[n]=
+                              off_proc_flag[n] =
                                  hypre_CollapseStencilToStencil(Aee,
                                                                 fgrid_edge,
                                                                 part,
@@ -4103,30 +4116,30 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                                 2,
                                                                 &stencil_vals);
                               /* put extracted stencil_vals into tridiagonal matrix */
-                              lower[n-1]= stencil_vals[0];
-                              diag[n-1] = stencil_vals[1];
-                              upper[n-1]= stencil_vals[2];
+                              lower[n - 1] = stencil_vals[0];
+                              diag[n - 1] = stencil_vals[1];
+                              upper[n - 1] = stencil_vals[2];
                               hypre_TFree(stencil_vals, HYPRE_MEMORY_HOST);
                            }
 
                            /* solve systems to get weights. Must adjust face_w's so
                               that the stencil entry contributes. */
-                           face_w1[0]*= -lower[0];
-                           face_w2[rfactor[2]-2]*= -upper[rfactor[2]-2];
-                           hypre_TriDiagSolve(diag, upper, lower, face_w1, rfactor[2]-1);
-                           hypre_TriDiagSolve(diag, upper, lower, face_w2, rfactor[2]-1);
+                           face_w1[0] *= -lower[0];
+                           face_w2[rfactor[2] - 2] *= -upper[rfactor[2] - 2];
+                           hypre_TriDiagSolve(diag, upper, lower, face_w1, rfactor[2] - 1);
+                           hypre_TriDiagSolve(diag, upper, lower, face_w2, rfactor[2] - 1);
 
                            /* place weights into vals_edgeEdge */
-                           for (n= 1; n< rfactor[2]; n++)
+                           for (n = 1; n < rfactor[2]; n++)
                            {
                               if (!off_proc_flag[n])  /* off_proc_flag= 1 if offproc */
                               {
-                                 jedge_Edge[k]= rank;
-                                 vals_edgeEdge[k]= face_w1[n-1]; /* lower end connection */
+                                 jedge_Edge[k] = rank;
+                                 vals_edgeEdge[k] = face_w1[n - 1]; /* lower end connection */
                                  k++;
 
-                                 jedge_Edge[k]= rank2;
-                                 vals_edgeEdge[k]= face_w2[n-1]; /* upper end connection */
+                                 jedge_Edge[k] = rank2;
+                                 vals_edgeEdge[k] = face_w2[n - 1]; /* upper end connection */
                                  k++;
                               }
                            }
@@ -4141,13 +4154,13 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                case 7:
                {
                   /* 3-d z_edge, can be X or Y_Face */
-                  fCedge_ratio= 1.0/rfactor[2];
+                  fCedge_ratio = 1.0 / rfactor[2];
                   hypre_ForBoxI(i, fboxes)
                   {
-                     cellbox= hypre_BoxArrayBox(fboxes, i);
+                     cellbox = hypre_BoxArrayBox(fboxes, i);
 
                      /* vboxes inside the i'th cellbox */
-                     num_vboxes= n_CtoVbox[part][i];
+                     num_vboxes = n_CtoVbox[part][i];
                      vboxnums  = CtoVboxnums[part][i];
 
                      hypre_CopyIndex(Edge_cstarts[part][i], cstart);
@@ -4166,14 +4179,14 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                      hypre_SubtractIndexes(hypre_BoxIMin(&copy_box), ishift, 3,
                                            findex);
                      /* loop over all the vboxes to see if findex is inside */
-                     row_in= falseV;
-                     for (p= 0; p< num_vboxes[t]; p++)
+                     row_in = falseV;
+                     for (p = 0; p < num_vboxes[t]; p++)
                      {
-                        vbox= hypre_BoxArrayBox(box_array, vboxnums[t][p]);
+                        vbox = hypre_BoxArrayBox(box_array, vboxnums[t][p]);
                         if (hypre_IndexInBox(findex, vbox))
                         {
                            hypre_CopyIndex(findex, hypre_BoxIMin(&copy_box));
-                           row_in= trueV;
+                           row_in = trueV;
                            break;
                         }
                      }
@@ -4210,9 +4223,9 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                         hypre_AddIndexes(cindex, cstart, 3, cindex);
 
                         /* Will need the actual fine indices. */
-                        for (l= 0; l< ndim; l++)
+                        for (l = 0; l < ndim; l++)
                         {
-                           findex[l]*= rfactor[l];
+                           findex[l] *= rfactor[l];
                         }
                         hypre_AddIndexes(findex, start, 3, findex);
 
@@ -4230,30 +4243,30 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
 
                         /* loop over the strips of z_edges making up the X_Face and
                            create the tridiagonal systems by collapsing the stencils. */
-                        for (p= 0; p< rfactor[2]; p++)
+                        for (p = 0; p < rfactor[2]; p++)
                         {
                            /* create the rhs's for the tridiagonal system. Require
                               find the ranks at the endpt's of the strip. */
-                           for (n= 0; n< rfactor[1]-1; n++)
+                           for (n = 0; n < rfactor[1] - 1; n++)
                            {
-                              face_w1[n]= 0.0;
-                              face_w2[n]= 0.0;
+                              face_w1[n] = 0.0;
+                              face_w2[n] = 0.0;
                            }
 
                            /* lower-end and upper-end edge weights */
-                           face_w1[0]= fCedge_ratio;
-                           face_w2[rfactor[1]-2]= fCedge_ratio;
+                           face_w1[0] = fCedge_ratio;
+                           face_w2[rfactor[1] - 2] = fCedge_ratio;
 
                            /******************************************************
                             * create tridiagonal matrix.
                             * z_edge for X_Face: collapse_dir= 0, stencil_dir= 1
                             ******************************************************/
                            hypre_CopyIndex(findex, var_index);
-                           var_index[2]+= p;
-                           for (n= 1; n< rfactor[1]; n++)
+                           var_index[2] += p;
+                           for (n = 1; n < rfactor[1]; n++)
                            {
                               var_index[1]++;
-                              off_proc_flag[n]=
+                              off_proc_flag[n] =
                                  hypre_CollapseStencilToStencil(Aee,
                                                                 fgrid_edge,
                                                                 part,
@@ -4263,30 +4276,30 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                                 1,
                                                                 &stencil_vals);
                               /* put extracted stencil_vals into tridiagonal matrix */
-                              lower[n-1]= stencil_vals[0];
-                              diag[n-1] = stencil_vals[1];
-                              upper[n-1]= stencil_vals[2];
+                              lower[n - 1] = stencil_vals[0];
+                              diag[n - 1] = stencil_vals[1];
+                              upper[n - 1] = stencil_vals[2];
                               hypre_TFree(stencil_vals, HYPRE_MEMORY_HOST);
                            }
 
                            /* solve systems to get weights. Must adjust face_w's so
                               that the stencil entry contributes. */
-                           face_w1[0]*= -lower[0];
-                           face_w2[rfactor[1]-2]*= -upper[rfactor[1]-2];
-                           hypre_TriDiagSolve(diag, upper, lower, face_w1, rfactor[1]-1);
-                           hypre_TriDiagSolve(diag, upper, lower, face_w2, rfactor[1]-1);
+                           face_w1[0] *= -lower[0];
+                           face_w2[rfactor[1] - 2] *= -upper[rfactor[1] - 2];
+                           hypre_TriDiagSolve(diag, upper, lower, face_w1, rfactor[1] - 1);
+                           hypre_TriDiagSolve(diag, upper, lower, face_w2, rfactor[1] - 1);
 
                            /* place weights into vals_edgeEdge */
-                           for (n= 1; n< rfactor[1]; n++)
+                           for (n = 1; n < rfactor[1]; n++)
                            {
                               if (!off_proc_flag[n])  /* off_proc_flag= 1 if offproc */
                               {
-                                 jedge_Edge[k]= rank;
-                                 vals_edgeEdge[k]= face_w1[n-1]; /* lower end connection */
+                                 jedge_Edge[k] = rank;
+                                 vals_edgeEdge[k] = face_w1[n - 1]; /* lower end connection */
                                  k++;
 
-                                 jedge_Edge[k]= rank2;
-                                 vals_edgeEdge[k]= face_w2[n-1]; /* upper end connection */
+                                 jedge_Edge[k] = rank2;
+                                 vals_edgeEdge[k] = face_w2[n - 1]; /* upper end connection */
                                  k++;
                               }
                            }
@@ -4301,14 +4314,14 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                      hypre_SubtractIndexes(hypre_BoxIMin(&copy_box), jshift, 3,
                                            findex);
                      /* loop over all the vboxes to see if findex is inside */
-                     row_in= falseV;
-                     for (p= 0; p< num_vboxes[t]; p++)
+                     row_in = falseV;
+                     for (p = 0; p < num_vboxes[t]; p++)
                      {
-                        vbox= hypre_BoxArrayBox(box_array, vboxnums[t][p]);
+                        vbox = hypre_BoxArrayBox(box_array, vboxnums[t][p]);
                         if (hypre_IndexInBox(findex, vbox))
                         {
                            hypre_CopyIndex(findex, hypre_BoxIMin(&copy_box));
-                           row_in= trueV;
+                           row_in = trueV;
                            break;
                         }
                      }
@@ -4342,9 +4355,9 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                         hypre_AddIndexes(cindex, cstart, 3, cindex);
 
                         /* Will need the actual fine indices. */
-                        for (l= 0; l< ndim; l++)
+                        for (l = 0; l < ndim; l++)
                         {
-                           findex[l]*= rfactor[l];
+                           findex[l] *= rfactor[l];
                         }
                         hypre_AddIndexes(findex, start, 3, findex);
 
@@ -4366,30 +4379,30 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
 
                         /* loop over the strips of y_edges making up the Y_Face and
                            create the tridiagonal systems by collapsing the stencils. */
-                        for (p= 0; p< rfactor[2]; p++)
+                        for (p = 0; p < rfactor[2]; p++)
                         {
                            /* create the rhs's for the tridiagonal system. Require
                               find the ranks at the endpt's of the strip. */
-                           for (n= 0; n< rfactor[0]-1; n++)
+                           for (n = 0; n < rfactor[0] - 1; n++)
                            {
-                              face_w1[n]= 0.0;
-                              face_w2[n]= 0.0;
+                              face_w1[n] = 0.0;
+                              face_w2[n] = 0.0;
                            }
 
                            /* lower-end and upper-end edge weights */
-                           face_w1[0]= fCedge_ratio;
-                           face_w2[rfactor[0]-2]= fCedge_ratio;
+                           face_w1[0] = fCedge_ratio;
+                           face_w2[rfactor[0] - 2] = fCedge_ratio;
 
                            /******************************************************
                             * create tridiagonal matrix.
                             * z_edge for Y_Face: collapse_dir= 1, stencil_dir= 0
                             ******************************************************/
                            hypre_CopyIndex(findex, var_index);
-                           var_index[2]+= p;
-                           for (n= 1; n< rfactor[0]; n++)
+                           var_index[2] += p;
+                           for (n = 1; n < rfactor[0]; n++)
                            {
                               var_index[0]++;
-                              off_proc_flag[n]=
+                              off_proc_flag[n] =
                                  hypre_CollapseStencilToStencil(Aee,
                                                                 fgrid_edge,
                                                                 part,
@@ -4399,30 +4412,30 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                                 0,
                                                                 &stencil_vals);
                               /* put extracted stencil_vals into tridiagonal matrix */
-                              lower[n-1]= stencil_vals[0];
-                              diag[n-1] = stencil_vals[1];
-                              upper[n-1]= stencil_vals[2];
+                              lower[n - 1] = stencil_vals[0];
+                              diag[n - 1] = stencil_vals[1];
+                              upper[n - 1] = stencil_vals[2];
                               hypre_TFree(stencil_vals, HYPRE_MEMORY_HOST);
                            }
 
                            /* solve systems to get weights. Must adjust face_w's so
                               that the stencil entry contributes. */
-                           face_w1[0]*= -lower[0];
-                           face_w2[rfactor[0]-2]*= -upper[rfactor[0]-2];
-                           hypre_TriDiagSolve(diag, upper, lower, face_w1, rfactor[0]-1);
-                           hypre_TriDiagSolve(diag, upper, lower, face_w2, rfactor[0]-1);
+                           face_w1[0] *= -lower[0];
+                           face_w2[rfactor[0] - 2] *= -upper[rfactor[0] - 2];
+                           hypre_TriDiagSolve(diag, upper, lower, face_w1, rfactor[0] - 1);
+                           hypre_TriDiagSolve(diag, upper, lower, face_w2, rfactor[0] - 1);
 
                            /* place weights into vals_edgeEdge */
-                           for (n= 1; n< rfactor[0]; n++)
+                           for (n = 1; n < rfactor[0]; n++)
                            {
                               if (!off_proc_flag[n])  /* off_proc_flag= 1 if offproc */
                               {
-                                 jedge_Edge[k]= rank;
-                                 vals_edgeEdge[k]= face_w1[n-1]; /* lower end connection */
+                                 jedge_Edge[k] = rank;
+                                 vals_edgeEdge[k] = face_w1[n - 1]; /* lower end connection */
                                  k++;
 
-                                 jedge_Edge[k]= rank2;
-                                 vals_edgeEdge[k]= face_w2[n-1]; /* upper end connection */
+                                 jedge_Edge[k] = rank2;
+                                 vals_edgeEdge[k] = face_w2[n - 1]; /* upper end connection */
                                  k++;
                               }
                            }
@@ -4433,7 +4446,10 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                   }  /* hypre_ForBoxI(i, fboxes) */
                   break;
                }
-
+               default:
+               {
+                  fCedge_ratio = 1.0;
+               }
             }  /* switch */
          }     /* for (t= 0; t< Edge_nvars; t++) */
 
@@ -4449,31 +4465,31 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
    }  /* if (ndim == 3) */
 
    /* generate the interior interpolation weights/info */
-   for (part= 0; part< nparts; part++)
+   for (part = 0; part < nparts; part++)
    {
-      p_fgrid= hypre_SStructGridPGrid(fgrid_edge, part);  /* edge grid */
-      Edge_nvars= hypre_SStructPGridNVars(p_fgrid);
-      Edge_vartypes= hypre_SStructPGridVarTypes(p_fgrid);
-      p_cgrid= hypre_SStructGridPGrid(cgrid_edge, part);  /* Edge grid */
+      p_fgrid = hypre_SStructGridPGrid(fgrid_edge, part); /* edge grid */
+      Edge_nvars = hypre_SStructPGridNVars(p_fgrid);
+      Edge_vartypes = hypre_SStructPGridVarTypes(p_fgrid);
+      p_cgrid = hypre_SStructGridPGrid(cgrid_edge, part); /* Edge grid */
 
       /* note that fboxes are the contracted CELL boxes. Will get the correct
          variable grid extents. */
-      fboxes= contract_fedgeBoxes[part];
+      fboxes = contract_fedgeBoxes[part];
 
-      for (t= 0; t< Edge_nvars; t++)
+      for (t = 0; t < Edge_nvars; t++)
       {
          var      = Edge_vartypes[t];
-         var_fgrid=  hypre_SStructPGridVTSGrid(p_fgrid, var);
-         box_array= hypre_StructGridBoxes(var_fgrid);
+         var_fgrid =  hypre_SStructPGridVTSGrid(p_fgrid, var);
+         box_array = hypre_StructGridBoxes(var_fgrid);
 
-         switch(var)
+         switch (var)
          {
             case 2:
             {
                /* 2-d x_face = x_edge, can be interior or on X_Edge */
                hypre_ForBoxI(i, fboxes)
                {
-                  cellbox= hypre_BoxArrayBox(fboxes, i);
+                  cellbox = hypre_BoxArrayBox(fboxes, i);
                   vbox   = hypre_BoxArrayBox(box_array, i);
                   hypre_CopyIndex(Edge_cstarts[part][i], cstart);
 
@@ -4501,9 +4517,9 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                       *
                       * Loop over the interior fine edges in an agglomerate.
                       *****************************************************/
-                     for (p= 1; p< rfactor[0]; p++)
+                     for (p = 1; p < rfactor[0]; p++)
                      {
-                        for (n= 0; n< rfactor[1]; n++)
+                        for (n = 0; n < rfactor[1]; n++)
                         {
                            hypre_CopyIndex(findex, cindex);
                            hypre_AddIndexes(cindex, cstart, 3, cindex);
@@ -4515,7 +4531,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                             t, &entry);
                            hypre_SStructBoxManEntryGetGlobalRank(entry, cindex, &rank,
                                                                  matrix_type);
-                           jedge_Edge[k]= rank;
+                           jedge_Edge[k] = rank;
                            k++;
 
                            hypre_SubtractIndexes(cindex, ishift, 3, var_index);
@@ -4523,7 +4539,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                             t, &entry);
                            hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                                  matrix_type);
-                           jedge_Edge[k]= rank;
+                           jedge_Edge[k] = rank;
                            k++;
 
                            /* y_Edges */
@@ -4531,7 +4547,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                             vartype_map[3], &entry);
                            hypre_SStructBoxManEntryGetGlobalRank(entry, cindex, &rank,
                                                                  matrix_type);
-                           jedge_Edge[k]= rank;
+                           jedge_Edge[k] = rank;
                            k++;
 
                            hypre_SubtractIndexes(cindex, jshift, 3, var_index);
@@ -4539,7 +4555,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                             vartype_map[3], &entry);
                            hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                                  matrix_type);
-                           jedge_Edge[k]= rank;
+                           jedge_Edge[k] = rank;
                            k++;
                         }  /* for (n= 0; n< rfactor[1]; n++) */
                      }     /* for (p= 1; p< rfactor[0]; p++) */
@@ -4556,7 +4572,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                /* 2-d y_face = y_edge, can be interior or on Y_Edge */
                hypre_ForBoxI(i, fboxes)
                {
-                  cellbox= hypre_BoxArrayBox(fboxes, i);
+                  cellbox = hypre_BoxArrayBox(fboxes, i);
                   vbox   = hypre_BoxArrayBox(box_array, i);
                   hypre_CopyIndex(Edge_cstarts[part][i], cstart);
 
@@ -4584,9 +4600,9 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                       *
                       * Loop over the interior fine edges in an agglomerate.
                       *****************************************************/
-                     for (p= 1; p< rfactor[1]; p++)
+                     for (p = 1; p < rfactor[1]; p++)
                      {
-                        for (n= 0; n< rfactor[0]; n++)
+                        for (n = 0; n < rfactor[0]; n++)
                         {
                            hypre_CopyIndex(findex, cindex);
                            hypre_AddIndexes(cindex, cstart, 3, cindex);
@@ -4598,7 +4614,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                             t, &entry);
                            hypre_SStructBoxManEntryGetGlobalRank(entry, cindex, &rank,
                                                                  matrix_type);
-                           jedge_Edge[k]= rank;
+                           jedge_Edge[k] = rank;
                            k++;
 
                            hypre_SubtractIndexes(cindex, jshift, 3, var_index);
@@ -4606,7 +4622,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                             t, &entry);
                            hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                                  matrix_type);
-                           jedge_Edge[k]= rank;
+                           jedge_Edge[k] = rank;
                            k++;
 
                            /* x_Edges */
@@ -4614,7 +4630,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                             vartype_map[2], &entry);
                            hypre_SStructBoxManEntryGetGlobalRank(entry, cindex, &rank,
                                                                  matrix_type);
-                           jedge_Edge[k]= rank;
+                           jedge_Edge[k] = rank;
                            k++;
 
                            hypre_SubtractIndexes(cindex, ishift, 3, var_index);
@@ -4622,7 +4638,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                             vartype_map[2], &entry);
                            hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                                  matrix_type);
-                           jedge_Edge[k]= rank;
+                           jedge_Edge[k] = rank;
                            k++;
                         }  /* for (n= 0; n< rfactor[0]; n++) */
                      }     /* for (p= 1; p< rfactor[1]; p++) */
@@ -4639,7 +4655,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                /* 3-d x_edge, must be interior */
                hypre_ForBoxI(i, fboxes)
                {
-                  cellbox= hypre_BoxArrayBox(fboxes, i);
+                  cellbox = hypre_BoxArrayBox(fboxes, i);
                   vbox   = hypre_BoxArrayBox(box_array, i);
                   hypre_CopyIndex(Edge_cstarts[part][i], cstart);
 
@@ -4667,11 +4683,11 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                       *
                       * Loop over the interior fine edges in an agglomerate.
                       *****************************************************/
-                     for (p= 1; p< rfactor[2]; p++)
+                     for (p = 1; p < rfactor[2]; p++)
                      {
-                        for (n= 1; n< rfactor[1]; n++)
+                        for (n = 1; n < rfactor[1]; n++)
                         {
-                           for (m= 0; m< rfactor[0]; m++)
+                           for (m = 0; m < rfactor[0]; m++)
                            {
                               hypre_CopyIndex(findex, cindex);
                               hypre_AddIndexes(cindex, cstart, 3, cindex);
@@ -4688,7 +4704,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                                t, &entry);
                               hypre_SStructBoxManEntryGetGlobalRank(entry, cindex, &rank,
                                                                     matrix_type);
-                              jedge_Edge[k]= rank;
+                              jedge_Edge[k] = rank;
                               k++;
 
                               hypre_SubtractIndexes(cindex, jshift, 3, var_index);
@@ -4696,7 +4712,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                                t, &entry);
                               hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                                     matrix_type);
-                              jedge_Edge[k]= rank;
+                              jedge_Edge[k] = rank;
                               k++;
 
                               hypre_SubtractIndexes(var_index, kshift, 3, var_index);
@@ -4704,7 +4720,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                                t, &entry);
                               hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                                     matrix_type);
-                              jedge_Edge[k]= rank;
+                              jedge_Edge[k] = rank;
                               k++;
 
                               hypre_AddIndexes(var_index, jshift, 3, var_index);
@@ -4712,7 +4728,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                                t, &entry);
                               hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                                     matrix_type);
-                              jedge_Edge[k]= rank;
+                              jedge_Edge[k] = rank;
                               k++;
 
                               /* y_Edge */
@@ -4720,7 +4736,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                                vartype_map[6], &entry);
                               hypre_SStructBoxManEntryGetGlobalRank(entry, cindex, &rank,
                                                                     matrix_type);
-                              jedge_Edge[k]= rank;
+                              jedge_Edge[k] = rank;
                               k++;
 
                               hypre_SubtractIndexes(cindex, ishift, 3, var_index);
@@ -4728,7 +4744,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                                vartype_map[6], &entry);
                               hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                                     matrix_type);
-                              jedge_Edge[k]= rank;
+                              jedge_Edge[k] = rank;
                               k++;
 
                               hypre_SubtractIndexes(var_index, kshift, 3, var_index);
@@ -4736,7 +4752,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                                vartype_map[6], &entry);
                               hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                                     matrix_type);
-                              jedge_Edge[k]= rank;
+                              jedge_Edge[k] = rank;
                               k++;
 
                               hypre_AddIndexes(var_index, ishift, 3, var_index);
@@ -4744,7 +4760,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                                vartype_map[6], &entry);
                               hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                                     matrix_type);
-                              jedge_Edge[k]= rank;
+                              jedge_Edge[k] = rank;
                               k++;
 
                               /* z_Edge */
@@ -4752,7 +4768,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                                vartype_map[7], &entry);
                               hypre_SStructBoxManEntryGetGlobalRank(entry, cindex, &rank,
                                                                     matrix_type);
-                              jedge_Edge[k]= rank;
+                              jedge_Edge[k] = rank;
                               k++;
 
                               hypre_SubtractIndexes(cindex, ishift, 3, var_index);
@@ -4760,7 +4776,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                                vartype_map[7], &entry);
                               hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                                     matrix_type);
-                              jedge_Edge[k]= rank;
+                              jedge_Edge[k] = rank;
                               k++;
 
                               hypre_SubtractIndexes(var_index, jshift, 3, var_index);
@@ -4768,7 +4784,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                                vartype_map[7], &entry);
                               hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                                     matrix_type);
-                              jedge_Edge[k]= rank;
+                              jedge_Edge[k] = rank;
                               k++;
 
                               hypre_AddIndexes(var_index, ishift, 3, var_index);
@@ -4776,7 +4792,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                                vartype_map[7], &entry);
                               hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                                     matrix_type);
-                              jedge_Edge[k]= rank;
+                              jedge_Edge[k] = rank;
                               k++;
                            }  /* for (m= 0; m< rfactor[0]; m++) */
                         }     /* for (n= 1; n< rfactor[1]; n++) */
@@ -4793,7 +4809,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                /* 3-d y_edge, must be interior */
                hypre_ForBoxI(i, fboxes)
                {
-                  cellbox= hypre_BoxArrayBox(fboxes, i);
+                  cellbox = hypre_BoxArrayBox(fboxes, i);
                   vbox   = hypre_BoxArrayBox(box_array, i);
                   hypre_CopyIndex(Edge_cstarts[part][i], cstart);
 
@@ -4821,11 +4837,11 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                       *
                       * Loop over the interior fine edges in an agglomerate.
                       *****************************************************/
-                     for (p= 1; p< rfactor[2]; p++)
+                     for (p = 1; p < rfactor[2]; p++)
                      {
-                        for (n= 1; n< rfactor[0]; n++)
+                        for (n = 1; n < rfactor[0]; n++)
                         {
-                           for (m= 0; m< rfactor[1]; m++)
+                           for (m = 0; m < rfactor[1]; m++)
                            {
                               hypre_CopyIndex(findex, cindex);
                               hypre_AddIndexes(cindex, cstart, 3, cindex);
@@ -4842,7 +4858,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                                t, &entry);
                               hypre_SStructBoxManEntryGetGlobalRank(entry, cindex, &rank,
                                                                     matrix_type);
-                              jedge_Edge[k]= rank;
+                              jedge_Edge[k] = rank;
                               k++;
 
                               hypre_SubtractIndexes(cindex, ishift, 3, var_index);
@@ -4850,7 +4866,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                                t, &entry);
                               hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                                     matrix_type);
-                              jedge_Edge[k]= rank;
+                              jedge_Edge[k] = rank;
                               k++;
 
                               hypre_SubtractIndexes(var_index, kshift, 3, var_index);
@@ -4858,7 +4874,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                                t, &entry);
                               hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                                     matrix_type);
-                              jedge_Edge[k]= rank;
+                              jedge_Edge[k] = rank;
                               k++;
 
                               hypre_AddIndexes(var_index, ishift, 3, var_index);
@@ -4866,7 +4882,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                                t, &entry);
                               hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                                     matrix_type);
-                              jedge_Edge[k]= rank;
+                              jedge_Edge[k] = rank;
                               k++;
 
                               /* z_Edge */
@@ -4874,7 +4890,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                                vartype_map[7], &entry);
                               hypre_SStructBoxManEntryGetGlobalRank(entry, cindex, &rank,
                                                                     matrix_type);
-                              jedge_Edge[k]= rank;
+                              jedge_Edge[k] = rank;
                               k++;
 
                               hypre_SubtractIndexes(cindex, ishift, 3, var_index);
@@ -4882,7 +4898,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                                vartype_map[7], &entry);
                               hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                                     matrix_type);
-                              jedge_Edge[k]= rank;
+                              jedge_Edge[k] = rank;
                               k++;
 
                               hypre_SubtractIndexes(var_index, jshift, 3, var_index);
@@ -4890,7 +4906,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                                vartype_map[7], &entry);
                               hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                                     matrix_type);
-                              jedge_Edge[k]= rank;
+                              jedge_Edge[k] = rank;
                               k++;
 
                               hypre_AddIndexes(var_index, ishift, 3, var_index);
@@ -4898,7 +4914,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                                vartype_map[7], &entry);
                               hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                                     matrix_type);
-                              jedge_Edge[k]= rank;
+                              jedge_Edge[k] = rank;
                               k++;
 
                               /* x_Edge */
@@ -4906,7 +4922,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                                vartype_map[5], &entry);
                               hypre_SStructBoxManEntryGetGlobalRank(entry, cindex, &rank,
                                                                     matrix_type);
-                              jedge_Edge[k]= rank;
+                              jedge_Edge[k] = rank;
                               k++;
 
                               hypre_SubtractIndexes(cindex, jshift, 3, var_index);
@@ -4914,7 +4930,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                                vartype_map[5], &entry);
                               hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                                     matrix_type);
-                              jedge_Edge[k]= rank;
+                              jedge_Edge[k] = rank;
                               k++;
 
                               hypre_SubtractIndexes(var_index, kshift, 3, var_index);
@@ -4922,7 +4938,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                                vartype_map[5], &entry);
                               hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                                     matrix_type);
-                              jedge_Edge[k]= rank;
+                              jedge_Edge[k] = rank;
                               k++;
 
                               hypre_AddIndexes(var_index, jshift, 3, var_index);
@@ -4930,7 +4946,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                                vartype_map[5], &entry);
                               hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                                     matrix_type);
-                              jedge_Edge[k]= rank;
+                              jedge_Edge[k] = rank;
                               k++;
                            }  /* for (m= 0; m< rfactor[1]; m++) */
                         }     /* for (n= 1; n< rfactor[0]; n++) */
@@ -4948,7 +4964,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                /* 3-d z_edge, only the interior */
                hypre_ForBoxI(i, fboxes)
                {
-                  cellbox= hypre_BoxArrayBox(fboxes, i);
+                  cellbox = hypre_BoxArrayBox(fboxes, i);
                   vbox   = hypre_BoxArrayBox(box_array, i);
                   hypre_CopyIndex(Edge_cstarts[part][i], cstart);
 
@@ -4976,11 +4992,11 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                       *
                       * Loop over the interior fine edges in an agglomerate.
                       *****************************************************/
-                     for (p= 1; p< rfactor[1]; p++)
+                     for (p = 1; p < rfactor[1]; p++)
                      {
-                        for (n= 1; n< rfactor[0]; n++)
+                        for (n = 1; n < rfactor[0]; n++)
                         {
-                           for (m= 0; m< rfactor[2]; m++)
+                           for (m = 0; m < rfactor[2]; m++)
                            {
                               hypre_CopyIndex(findex, cindex);
                               hypre_AddIndexes(cindex, cstart, 3, cindex);
@@ -4997,7 +5013,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                                t, &entry);
                               hypre_SStructBoxManEntryGetGlobalRank(entry, cindex, &rank,
                                                                     matrix_type);
-                              jedge_Edge[k]= rank;
+                              jedge_Edge[k] = rank;
                               k++;
 
                               hypre_SubtractIndexes(cindex, ishift, 3, var_index);
@@ -5005,7 +5021,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                                t, &entry);
                               hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                                     matrix_type);
-                              jedge_Edge[k]= rank;
+                              jedge_Edge[k] = rank;
                               k++;
 
                               hypre_SubtractIndexes(var_index, jshift, 3, var_index);
@@ -5013,7 +5029,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                                t, &entry);
                               hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                                     matrix_type);
-                              jedge_Edge[k]= rank;
+                              jedge_Edge[k] = rank;
                               k++;
 
                               hypre_AddIndexes(var_index, ishift, 3, var_index);
@@ -5021,7 +5037,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                                t, &entry);
                               hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                                     matrix_type);
-                              jedge_Edge[k]= rank;
+                              jedge_Edge[k] = rank;
                               k++;
 
                               /* x_Edge */
@@ -5029,7 +5045,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                                vartype_map[5], &entry);
                               hypre_SStructBoxManEntryGetGlobalRank(entry, cindex, &rank,
                                                                     matrix_type);
-                              jedge_Edge[k]= rank;
+                              jedge_Edge[k] = rank;
                               k++;
 
                               hypre_SubtractIndexes(cindex, jshift, 3, var_index);
@@ -5037,7 +5053,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                                vartype_map[5], &entry);
                               hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                                     matrix_type);
-                              jedge_Edge[k]= rank;
+                              jedge_Edge[k] = rank;
                               k++;
 
                               hypre_SubtractIndexes(var_index, kshift, 3, var_index);
@@ -5045,7 +5061,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                                vartype_map[5], &entry);
                               hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                                     matrix_type);
-                              jedge_Edge[k]= rank;
+                              jedge_Edge[k] = rank;
                               k++;
 
                               hypre_AddIndexes(var_index, jshift, 3, var_index);
@@ -5053,7 +5069,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                                vartype_map[5], &entry);
                               hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                                     matrix_type);
-                              jedge_Edge[k]= rank;
+                              jedge_Edge[k] = rank;
                               k++;
 
                               /* y_Edge */
@@ -5061,7 +5077,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                                vartype_map[6], &entry);
                               hypre_SStructBoxManEntryGetGlobalRank(entry, cindex, &rank,
                                                                     matrix_type);
-                              jedge_Edge[k]= rank;
+                              jedge_Edge[k] = rank;
                               k++;
 
                               hypre_SubtractIndexes(cindex, ishift, 3, var_index);
@@ -5069,7 +5085,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                                vartype_map[6], &entry);
                               hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                                     matrix_type);
-                              jedge_Edge[k]= rank;
+                              jedge_Edge[k] = rank;
                               k++;
 
                               hypre_SubtractIndexes(var_index, kshift, 3, var_index);
@@ -5077,7 +5093,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                                vartype_map[6], &entry);
                               hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                                     matrix_type);
-                              jedge_Edge[k]= rank;
+                              jedge_Edge[k] = rank;
                               k++;
 
                               hypre_AddIndexes(var_index, ishift, 3, var_index);
@@ -5085,7 +5101,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                                                                vartype_map[6], &entry);
                               hypre_SStructBoxManEntryGetGlobalRank(entry, var_index, &rank,
                                                                     matrix_type);
-                              jedge_Edge[k]= rank;
+                              jedge_Edge[k] = rank;
                               k++;
                            }  /* for (m= 0; m< rfactor[2]; m++) */
                         }     /* for (n= 1; n< rfactor[0]; n++) */
@@ -5108,22 +5124,22 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
                            (const HYPRE_Real*) vals_edgeEdge);
    HYPRE_IJMatrixAssemble((HYPRE_IJMatrix) edge_Edge);
 
-   hypre_TFree(ncols_edgeEdge, HYPRE_MEMORY_DEVICE);
-   hypre_TFree(iedgeEdge,      HYPRE_MEMORY_DEVICE);
-   hypre_TFree(jedge_Edge,     HYPRE_MEMORY_DEVICE);
-   hypre_TFree(vals_edgeEdge,  HYPRE_MEMORY_DEVICE);
+   hypre_TFree(ncols_edgeEdge, memory_location);
+   hypre_TFree(iedgeEdge, memory_location);
+   hypre_TFree(jedge_Edge, memory_location);
+   hypre_TFree(vals_edgeEdge, memory_location);
 
    /* n_CtoVbox[part][cellboxi][var]  & CtoVboxnums[part][cellboxi][var][nvboxes] */
-   for (part= 0; part< nparts; part++)
+   for (part = 0; part < nparts; part++)
    {
-      p_fgrid= hypre_SStructGridPGrid(fgrid_edge, part);
-      Edge_nvars= hypre_SStructPGridNVars(p_fgrid);
+      p_fgrid = hypre_SStructGridPGrid(fgrid_edge, part);
+      Edge_nvars = hypre_SStructPGridNVars(p_fgrid);
 
-      var_fgrid= hypre_SStructPGridCellSGrid(p_fgrid);
+      var_fgrid = hypre_SStructPGridCellSGrid(p_fgrid);
       fboxes   = hypre_StructGridBoxes(var_fgrid);
       hypre_ForBoxI(j, fboxes)
       {
-         for (t= 0; t< Edge_nvars; t++)
+         for (t = 0; t < Edge_nvars; t++)
          {
             hypre_TFree(CtoVboxnums[part][j][t], HYPRE_MEMORY_HOST);
          }
@@ -5136,10 +5152,10 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
    hypre_TFree(n_CtoVbox, HYPRE_MEMORY_HOST);
    hypre_TFree(CtoVboxnums, HYPRE_MEMORY_HOST);
 
-   for (part= 0; part< nparts; part++)
+   for (part = 0; part < nparts; part++)
    {
-      p_fgrid= hypre_SStructGridPGrid(fgrid_edge, part);
-      var_fgrid= hypre_SStructPGridCellSGrid(p_fgrid);
+      p_fgrid = hypre_SStructGridPGrid(fgrid_edge, part);
+      var_fgrid = hypre_SStructPGridCellSGrid(p_fgrid);
       fboxes   = hypre_StructGridBoxes(var_fgrid);
 
       hypre_BoxArrayDestroy(contract_fedgeBoxes[part]);
@@ -5173,7 +5189,7 @@ hypre_Maxwell_PTopology(  hypre_SStructGrid    *fgrid_edge,
       (PTopology ->  Face_iedge)   = Face_iedge;
       (PTopology ->  Element_Face) = Element_Face;
    }
-   (PTopology ->  Element_iedge)= Element_iedge;
+   (PTopology ->  Element_iedge) = Element_iedge;
    (PTopology ->  Edge_iedge)   = Edge_iedge;
    (PTopology ->  Element_Edge) = Element_Edge;
 
@@ -5205,9 +5221,9 @@ hypre_CollapseStencilToStencil(hypre_ParCSRMatrix     *Aee,
                                HYPRE_Int               new_stencil_dir,
                                HYPRE_Real            **collapsed_vals_ptr)
 {
-   HYPRE_Int                ierr= 0;
+   HYPRE_Int                ierr = 0;
 
-   HYPRE_Int                matrix_type= HYPRE_PARCSR;
+   HYPRE_Int                matrix_type = HYPRE_PARCSR;
    HYPRE_BigInt             start_rank = hypre_ParCSRMatrixFirstRowIndex(Aee);
    HYPRE_BigInt             end_rank   = hypre_ParCSRMatrixLastRowIndex(Aee);
 
@@ -5215,7 +5231,7 @@ hypre_CollapseStencilToStencil(hypre_ParCSRMatrix     *Aee,
 
    HYPRE_BigInt            *ranks;
    HYPRE_Int               *marker;     /* marker to record the rank groups */
-   HYPRE_Int                max_ranksize= 9;
+   HYPRE_Int                max_ranksize = 9;
 
    HYPRE_Real              *collapsed_vals;
 
@@ -5232,7 +5248,7 @@ hypre_CollapseStencilToStencil(hypre_ParCSRMatrix     *Aee,
    HYPRE_Int                cnt;
 
    /* create the collapsed stencil coefficients. Three components. */
-   collapsed_vals= hypre_CTAlloc(HYPRE_Real,  3, HYPRE_MEMORY_HOST);
+   collapsed_vals = hypre_CTAlloc(HYPRE_Real,  3, HYPRE_MEMORY_HOST);
 
    /* check if the row corresponding to pt_location is on this proc. If
       not, return an identity row. THIS SHOULD BE CORRECTED IN THE FUTURE
@@ -5242,8 +5258,8 @@ hypre_CollapseStencilToStencil(hypre_ParCSRMatrix     *Aee,
    if (rank < start_rank || rank > end_rank)
    {
       collapsed_vals[1] = 1.0;
-      *collapsed_vals_ptr= collapsed_vals;
-      ierr= 1;
+      *collapsed_vals_ptr = collapsed_vals;
+      ierr = 1;
       return ierr;
    }
 
@@ -5251,31 +5267,31 @@ hypre_CollapseStencilToStencil(hypre_ParCSRMatrix     *Aee,
       collapsing, we assume that max stencil size is 9. This agrees with the
       assumed pattern surrounding pt_location. Concatenating done. */
    ranks = hypre_TAlloc(HYPRE_BigInt,  max_ranksize, HYPRE_MEMORY_HOST);
-   marker= hypre_TAlloc(HYPRE_Int,  max_ranksize, HYPRE_MEMORY_HOST);
+   marker = hypre_TAlloc(HYPRE_Int,  max_ranksize, HYPRE_MEMORY_HOST);
 
-   cnt= 0;
-   centre= 0;
-   for (j= -1; j<= 1; j++)
+   cnt = 0;
+   centre = 0;
+   for (j = -1; j <= 1; j++)
    {
       hypre_CopyIndex(pt_location, index1);
-      index1[new_stencil_dir]+= j;
+      index1[new_stencil_dir] += j;
 
-      for (i= -1; i<= 1; i++)
+      for (i = -1; i <= 1; i++)
       {
          hypre_CopyIndex(index1, index2);
-         index2[collapse_dir]+= i;
+         index2[collapse_dir] += i;
 
          hypre_SStructGridFindBoxManEntry(grid, part, index2, var, &entry);
          if (entry)
          {
             hypre_SStructBoxManEntryGetGlobalRank(entry, index2, &rank, matrix_type);
             ranks[cnt] = rank;
-            marker[cnt]= j+1;
+            marker[cnt] = j + 1;
 
             /* mark centre component- entry!=NULL always */
             if ( (!i) && (!j) )
             {
-               centre= cnt;
+               centre = cnt;
             }
             cnt++;
          }
@@ -5285,29 +5301,31 @@ hypre_CollapseStencilToStencil(hypre_ParCSRMatrix     *Aee,
    /* Grab the row corresponding to index pt_location. rank located in location
       centre of ranks, i.e., rank for index2= pt_location. Mark location of values,
       which will record the original location of values after the sorting. */
-   row_rank= ranks[centre];
-   getrow_ierr= HYPRE_ParCSRMatrixGetRow((HYPRE_ParCSRMatrix) Aee, row_rank,
-                                         &size, &col_inds, &values);
+   row_rank = ranks[centre];
+   getrow_ierr = HYPRE_ParCSRMatrixGetRow((HYPRE_ParCSRMatrix) Aee, row_rank,
+                                          &size, &col_inds, &values);
    if (getrow_ierr < 0)
+   {
       hypre_printf("offproc collapsing problem");
+   }
 
-   swap_inds= hypre_TAlloc(HYPRE_Int,  size, HYPRE_MEMORY_HOST);
-   col_inds2= hypre_TAlloc(HYPRE_BigInt,  size, HYPRE_MEMORY_HOST);
-   for (i= 0; i< size; i++)
+   swap_inds = hypre_TAlloc(HYPRE_Int,  size, HYPRE_MEMORY_HOST);
+   col_inds2 = hypre_TAlloc(HYPRE_BigInt,  size, HYPRE_MEMORY_HOST);
+   for (i = 0; i < size; i++)
    {
-      swap_inds[i]= i;
-      col_inds2[i]= col_inds[i];
+      swap_inds[i] = i;
+      col_inds2[i] = col_inds[i];
    }
 
    /* qsort ranks & col_inds */
-   hypre_BigQsortbi(ranks, marker, 0, cnt-1);
-   hypre_BigQsortbi(col_inds2, swap_inds, 0, size-1);
+   hypre_BigQsortbi(ranks, marker, 0, cnt - 1);
+   hypre_BigQsortbi(col_inds2, swap_inds, 0, size - 1);
 
    /* search for values to collapse */
-   m= 0;
-   for (i= 0; i< cnt; i++)
+   m = 0;
+   for (i = 0; i < cnt; i++)
    {
-      found= 0;
+      found = 0;
       while (!found)
       {
          if (ranks[i] != col_inds2[m])
@@ -5316,7 +5334,7 @@ hypre_CollapseStencilToStencil(hypre_ParCSRMatrix     *Aee,
          }
          else
          {
-            collapsed_vals[marker[i]]+= values[swap_inds[m]];
+            collapsed_vals[marker[i]] += values[swap_inds[m]];
             m++;
             break; /* break out of while loop */
          }
@@ -5331,7 +5349,7 @@ hypre_CollapseStencilToStencil(hypre_ParCSRMatrix     *Aee,
    hypre_TFree(marker, HYPRE_MEMORY_HOST);
    hypre_TFree(swap_inds, HYPRE_MEMORY_HOST);
 
-   *collapsed_vals_ptr= collapsed_vals;
+   *collapsed_vals_ptr = collapsed_vals;
 
    return ierr;
 }
@@ -5346,34 +5364,34 @@ hypre_TriDiagSolve(HYPRE_Real *diag,
                    HYPRE_Real *rhs,
                    HYPRE_Int   size)
 {
-   HYPRE_Int       ierr= 0;
+   HYPRE_Int       ierr = 0;
 
    HYPRE_Int       i, size1;
    HYPRE_Real     *copy_diag;
    HYPRE_Real      multiplier;
 
-   size1= size-1;
+   size1 = size - 1;
 
    /* copy diag so that the matrix is not modified */
-   copy_diag= hypre_TAlloc(HYPRE_Real,  size, HYPRE_MEMORY_HOST);
-   for (i= 0; i< size; i++)
+   copy_diag = hypre_TAlloc(HYPRE_Real,  size, HYPRE_MEMORY_HOST);
+   for (i = 0; i < size; i++)
    {
-      copy_diag[i]= diag[i];
+      copy_diag[i] = diag[i];
    }
 
    /* forward substitution */
-   for (i= 1; i< size; i++)
+   for (i = 1; i < size; i++)
    {
-      multiplier= -lower[i]/copy_diag[i-1];
-      copy_diag[i]+= multiplier*upper[i-1];
-      rhs[i] += multiplier*rhs[i-1];
+      multiplier = -lower[i] / copy_diag[i - 1];
+      copy_diag[i] += multiplier * upper[i - 1];
+      rhs[i] += multiplier * rhs[i - 1];
    }
 
    /* backward substitution */
-   rhs[size1]/= copy_diag[size1];
-   for (i= size1-1; i>= 0; i--)
+   rhs[size1] /= copy_diag[size1];
+   for (i = size1 - 1; i >= 0; i--)
    {
-      rhs[i]= (rhs[i] - upper[i]*rhs[i+1])/copy_diag[i];
+      rhs[i] = (rhs[i] - upper[i] * rhs[i + 1]) / copy_diag[i];
    }
 
    hypre_TFree(copy_diag, HYPRE_MEMORY_HOST);
diff --git a/external/hypre/src/sstruct_ls/maxwell_solve.c b/external/hypre/src/sstruct_ls/maxwell_solve.c
index 78e25edb..d732359a 100644
--- a/external/hypre/src/sstruct_ls/maxwell_solve.c
+++ b/external/hypre/src/sstruct_ls/maxwell_solve.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -20,6 +20,8 @@ hypre_MaxwellSolve( void                *maxwell_vdata,
                     hypre_SStructVector *f,
                     hypre_SStructVector *u )
 {
+   HYPRE_UNUSED_VAR(A_in);
+
    hypre_MaxwellData     *maxwell_data = (hypre_MaxwellData *) maxwell_vdata;
 
    hypre_ParVector       *f_edge;
@@ -42,7 +44,7 @@ hypre_MaxwellSolve( void                *maxwell_vdata,
    hypre_ParVector      **nVtemp_l     = maxwell_data-> nVtemp_l;
    hypre_ParVector      **nVtemp2_l    = maxwell_data-> nVtemp2_l;
    HYPRE_Int            **nCF_marker_l = maxwell_data-> nCF_marker_l;
-   HYPRE_Real            *nrelax_weight= maxwell_data-> nrelax_weight;
+   HYPRE_Real            *nrelax_weight = maxwell_data-> nrelax_weight;
    HYPRE_Real            *nomega       = maxwell_data-> nomega;
    HYPRE_Int              nrelax_type  = maxwell_data-> nrelax_type;
    HYPRE_Int              node_numlevs = maxwell_data-> node_numlevels;
@@ -63,13 +65,13 @@ hypre_MaxwellSolve( void                *maxwell_vdata,
    hypre_ParVector      **eVtemp_l     = maxwell_data-> eVtemp_l;
    hypre_ParVector      **eVtemp2_l    = maxwell_data-> eVtemp2_l;
    HYPRE_Int            **eCF_marker_l = maxwell_data-> eCF_marker_l;
-   HYPRE_Real            *erelax_weight= maxwell_data-> erelax_weight;
+   HYPRE_Real            *erelax_weight = maxwell_data-> erelax_weight;
    HYPRE_Real            *eomega       = maxwell_data-> eomega;
    HYPRE_Int              erelax_type  = maxwell_data-> erelax_type;
    HYPRE_Int              edge_numlevs = maxwell_data-> edge_numlevels;
 
    HYPRE_Int            **BdryRanks_l  = maxwell_data-> BdryRanks_l;
-   HYPRE_Int             *BdryRanksCnts_l= maxwell_data-> BdryRanksCnts_l;
+   HYPRE_Int             *BdryRanksCnts_l = maxwell_data-> BdryRanksCnts_l;
 
    HYPRE_Int              logging     = maxwell_data-> logging;
    HYPRE_Real            *norms       = maxwell_data-> norms;
@@ -86,7 +88,7 @@ hypre_MaxwellSolve( void                *maxwell_vdata,
    /* added for the relaxation routines */
    hypre_ParVector *ze = NULL;
 
-#if !defined(HYPRE_USING_CUDA) && !defined(HYPRE_USING_HIP)
+#if !defined(HYPRE_USING_CUDA) && !defined(HYPRE_USING_HIP) &&!defined(HYPRE_USING_SYCL)
    /* GPU impl. needs ze */
    if (hypre_NumThreads() > 1)
 #endif
@@ -105,15 +107,15 @@ hypre_MaxwellSolve( void                *maxwell_vdata,
    hypre_SStructVectorConvert(u, &u_edge);
    hypre_ParVectorZeroBCValues(f_edge, BdryRanks_l[0], BdryRanksCnts_l[0]);
    hypre_ParVectorZeroBCValues(u_edge, BdryRanks_l[0], BdryRanksCnts_l[0]);
-   be_l[0]= f_edge;
-   xe_l[0]= u_edge;
+   be_l[0] = f_edge;
+   xe_l[0] = u_edge;
 
    /* the nodal fine vectors: bn= T'*be, xn= 0. */
    hypre_ParCSRMatrixMatvec(1.0, T_transpose, f_edge, 0.0, bn_l[0]);
    hypre_ParVectorSetConstantValues(xn_l[0], 0.0);
 
-   relax_local= 0;
-   cycle_param= 0;
+   relax_local = 0;
+   cycle_param = 0;
 
    (maxwell_data-> num_iterations) = 0;
    /* if max_iter is zero, return */
@@ -134,8 +136,8 @@ hypre_MaxwellSolve( void                *maxwell_vdata,
    if (tol > 0.0)
    {
       /* eps = (tol^2) */
-      b_dot_b= hypre_ParVectorInnerProd(be_l[0], be_l[0]);
-      eps = tol*tol;
+      b_dot_b = hypre_ParVectorInnerProd(be_l[0], be_l[0]);
+      eps = tol * tol;
 
       /* if rhs is zero, return a zero solution */
       if (b_dot_b == 0.0)
@@ -177,7 +179,7 @@ hypre_MaxwellSolve( void                *maxwell_vdata,
       {
          hypre_ParVectorCopy(bn_l[0], nVtemp_l[0]);
          hypre_ParCSRMatrixMatvecT(-1.0, Aen_l[0], xe_l[0],
-                                    1.0, nVtemp_l[0]);
+                                   1.0, nVtemp_l[0]);
 
          hypre_BoomerAMGRelaxIF(Ann_l[0],
                                 nVtemp_l[0],
@@ -195,7 +197,7 @@ hypre_MaxwellSolve( void                *maxwell_vdata,
          /* update edge right-hand fe_l= fe_l-Aen_l*xn_l[0] */
          hypre_ParVectorCopy(be_l[0], eVtemp_l[0]);
          hypre_ParCSRMatrixMatvec(-1.0, Aen_l[0], xn_l[0],
-                                   1.0, eVtemp_l[0]);
+                                  1.0, eVtemp_l[0]);
          hypre_ParVectorZeroBCValues(eVtemp_l[0], BdryRanks_l[0],
                                      BdryRanksCnts_l[0]);
 
@@ -228,14 +230,14 @@ hypre_MaxwellSolve( void                *maxwell_vdata,
       /* convergence check */
       if (tol > 0.0)
       {
-         r_dot_r= hypre_ParVectorInnerProd(rese_l[0], rese_l[0]);
+         r_dot_r = hypre_ParVectorInnerProd(rese_l[0], rese_l[0]);
 
          if (logging > 0)
          {
-            norms[i] = sqrt(r_dot_r);
+            norms[i] = hypre_sqrt(r_dot_r);
             if (b_dot_b > 0)
             {
-               rel_norms[i] = sqrt(r_dot_r/b_dot_b);
+               rel_norms[i] = hypre_sqrt(r_dot_r / b_dot_b);
             }
             else
             {
@@ -244,11 +246,11 @@ hypre_MaxwellSolve( void                *maxwell_vdata,
          }
 
          /* always do at least 1 V-cycle */
-         if ((r_dot_r/b_dot_b < eps) && (i > 0))
+         if ((r_dot_r / b_dot_b < eps) && (i > 0))
          {
             if (rel_change)
             {
-               if ((e_dot_e/x_dot_x) < eps)
+               if ((e_dot_e / x_dot_x) < eps)
                {
                   break;
                }
@@ -266,7 +268,7 @@ hypre_MaxwellSolve( void                *maxwell_vdata,
                                    bn_l[1]);
 
          hypre_ParCSRMatrixMatvecT(1.0,
-            (hypre_ParCSRMatrix *) hypre_IJMatrixObject(ReT_l[0]),
+                                   (hypre_ParCSRMatrix *) hypre_IJMatrixObject(ReT_l[0]),
                                    rese_l[0], 0.0, be_l[1]);
 
          hypre_ParVectorZeroBCValues(be_l[1], BdryRanks_l[1],
@@ -278,7 +280,7 @@ hypre_MaxwellSolve( void                *maxwell_vdata,
 
       }  /* if (en_numlevs > 1) */
 
-      for (level = 1; level<= en_numlevs-2; level++)
+      for (level = 1; level <= en_numlevs - 2; level++)
       {
          /*-----------------------------------------------
           * Down cycle
@@ -289,7 +291,7 @@ hypre_MaxwellSolve( void                *maxwell_vdata,
             if (j)
             {
                hypre_ParCSRMatrixMatvecT(-1.0, Aen_l[level],
-                                          xe_l[level], 1.0, nVtemp_l[level]);
+                                         xe_l[level], 1.0, nVtemp_l[level]);
             }
             hypre_BoomerAMGRelaxIF(Ann_l[level],
                                    nVtemp_l[level],
@@ -328,33 +330,33 @@ hypre_MaxwellSolve( void                *maxwell_vdata,
          /* compute residuals */
          hypre_ParVectorCopy(bn_l[level], resn_l[level]);
          hypre_ParCSRMatrixMatvec(-1.0, Ann_l[level], xn_l[level],
-                                   1.0, resn_l[level]);
+                                  1.0, resn_l[level]);
 
          hypre_ParCSRMatrixMatvecT(-1.0, Aen_l[level], xe_l[level],
-                                    1.0, resn_l[level]);
+                                   1.0, resn_l[level]);
 
          hypre_ParVectorCopy(be_l[level], rese_l[level]);
          hypre_ParCSRMatrixMatvec(-1.0, Aee_l[level], xe_l[level],
-                                   1.0, rese_l[level]);
+                                  1.0, rese_l[level]);
          hypre_ParCSRMatrixMatvec(-1.0, Aen_l[level], xn_l[level],
-                                   1.0, rese_l[level]);
+                                  1.0, rese_l[level]);
          hypre_ParVectorZeroBCValues(rese_l[level], BdryRanks_l[level],
                                      BdryRanksCnts_l[level]);
 
          /* restrict residuals */
          hypre_ParCSRMatrixMatvecT(1.0, RnT_l[level], resn_l[level],
-                                   0.0, bn_l[level+1]);
+                                   0.0, bn_l[level + 1]);
 
          hypre_ParCSRMatrixMatvecT(1.0,
-            (hypre_ParCSRMatrix *) hypre_IJMatrixObject(ReT_l[level]),
-                                   rese_l[level], 0.0, be_l[level+1]);
+                                   (hypre_ParCSRMatrix *) hypre_IJMatrixObject(ReT_l[level]),
+                                   rese_l[level], 0.0, be_l[level + 1]);
 
-         hypre_ParVectorZeroBCValues(be_l[level+1], BdryRanks_l[level+1],
-                                     BdryRanksCnts_l[level+1]);
+         hypre_ParVectorZeroBCValues(be_l[level + 1], BdryRanks_l[level + 1],
+                                     BdryRanksCnts_l[level + 1]);
 
          /* zero off initial guess for the next level */
-         hypre_ParVectorSetConstantValues(xn_l[level+1], 0.0);
-         hypre_ParVectorSetConstantValues(xe_l[level+1], 0.0);
+         hypre_ParVectorSetConstantValues(xn_l[level + 1], 0.0);
+         hypre_ParVectorSetConstantValues(xe_l[level + 1], 0.0);
 
       }  /* for (level = 0; level<= en_numlevels-2; level++) */
 
@@ -363,11 +365,11 @@ hypre_MaxwellSolve( void                *maxwell_vdata,
        * cycling down if there are more than en_numlevels levels for
        * one of the node or edge dofs.
        *----------------------------------------------------------------*/
-      level = en_numlevs-1;
+      level = en_numlevs - 1;
 
       /* npre_relax if not the coarsest level. Otherwise, relax once.*/
       if (   (en_numlevs != edge_numlevs)
-            || (en_numlevs != node_numlevs)  )
+             || (en_numlevs != node_numlevs)  )
       {
          for (j = 0; j < npre_relax; j++)
          {
@@ -430,7 +432,7 @@ hypre_MaxwellSolve( void                *maxwell_vdata,
 
          hypre_ParVectorCopy(be_l[level], eVtemp_l[level]);
          hypre_ParCSRMatrixMatvec(-1.0, Aen_l[level], xn_l[level],
-                                   1.0, eVtemp_l[level]);
+                                  1.0, eVtemp_l[level]);
 
          hypre_ParVectorZeroBCValues(eVtemp_l[level], BdryRanks_l[level],
                                      BdryRanksCnts_l[level]);
@@ -456,14 +458,14 @@ hypre_MaxwellSolve( void                *maxwell_vdata,
          hypre_ParCSRMatrixMatvec(-1.0, Aee_l[level], xe_l[level], 1.0,
                                   rese_l[level]);
          hypre_ParCSRMatrixMatvecT(1.0,
-            (hypre_ParCSRMatrix *) hypre_IJMatrixObject(ReT_l[level]),
-                                   rese_l[level], 0.0, be_l[level+1]);
-         hypre_ParVectorZeroBCValues(be_l[level+1], BdryRanks_l[level+1],
-                                     BdryRanksCnts_l[level+1]);
+                                   (hypre_ParCSRMatrix *) hypre_IJMatrixObject(ReT_l[level]),
+                                   rese_l[level], 0.0, be_l[level + 1]);
+         hypre_ParVectorZeroBCValues(be_l[level + 1], BdryRanks_l[level + 1],
+                                     BdryRanksCnts_l[level + 1]);
 
-         hypre_ParVectorSetConstantValues(xe_l[level+1], 0.0);
+         hypre_ParVectorSetConstantValues(xe_l[level + 1], 0.0);
 
-         for (level = en_numlevs; level<= edge_numlevs-2; level++)
+         for (level = en_numlevs; level <= edge_numlevs - 2; level++)
          {
             for (j = 0; j < npre_relax; j++)
             {
@@ -484,18 +486,18 @@ hypre_MaxwellSolve( void                *maxwell_vdata,
             /* compute residuals and restrict */
             hypre_ParVectorCopy(be_l[level], rese_l[level]);
             hypre_ParCSRMatrixMatvec(-1.0, Aee_l[level], xe_l[level],
-                                      1.0, rese_l[level]);
+                                     1.0, rese_l[level]);
             hypre_ParCSRMatrixMatvecT(1.0,
-               (hypre_ParCSRMatrix *) hypre_IJMatrixObject(ReT_l[level]),
-                                      rese_l[level], 0.0, be_l[level+1]);
-            hypre_ParVectorZeroBCValues(be_l[level+1], BdryRanks_l[level+1],
-                                        BdryRanksCnts_l[level+1]);
+                                      (hypre_ParCSRMatrix *) hypre_IJMatrixObject(ReT_l[level]),
+                                      rese_l[level], 0.0, be_l[level + 1]);
+            hypre_ParVectorZeroBCValues(be_l[level + 1], BdryRanks_l[level + 1],
+                                        BdryRanksCnts_l[level + 1]);
 
-            hypre_ParVectorSetConstantValues(xe_l[level+1], 0.0);
+            hypre_ParVectorSetConstantValues(xe_l[level + 1], 0.0);
          }  /* for (level = en_numlevs; level< edge_numlevs-2; level++) */
 
          /* coarsest relaxation */
-         level = edge_numlevs-1;
+         level = edge_numlevs - 1;
          hypre_BoomerAMGRelaxIF(Aee_l[level],
                                 be_l[level],
                                 eCF_marker_l[level],
@@ -520,12 +522,12 @@ hypre_MaxwellSolve( void                *maxwell_vdata,
          hypre_ParCSRMatrixMatvec(-1.0, Ann_l[level], xn_l[level], 1.0,
                                   resn_l[level]);
          hypre_ParCSRMatrixMatvecT(1.0,
-            (hypre_ParCSRMatrix *) RnT_l[level],
-                                   resn_l[level], 0.0, bn_l[level+1]);
+                                   (hypre_ParCSRMatrix *) RnT_l[level],
+                                   resn_l[level], 0.0, bn_l[level + 1]);
 
-         hypre_ParVectorSetConstantValues(xn_l[level+1], 0.0);
+         hypre_ParVectorSetConstantValues(xn_l[level + 1], 0.0);
 
-         for (level = en_numlevs; level<= node_numlevs-2; level++)
+         for (level = en_numlevs; level <= node_numlevs - 2; level++)
          {
             for (j = 0; j < npre_relax; j++)
             {
@@ -546,15 +548,15 @@ hypre_MaxwellSolve( void                *maxwell_vdata,
             /* compute residuals and restrict */
             hypre_ParVectorCopy(bn_l[level], resn_l[level]);
             hypre_ParCSRMatrixMatvec(-1.0, Ann_l[level], xn_l[level],
-                                      1.0, resn_l[level]);
+                                     1.0, resn_l[level]);
             hypre_ParCSRMatrixMatvecT(1.0, RnT_l[level], resn_l[level],
-                                      0.0, bn_l[level+1]);
+                                      0.0, bn_l[level + 1]);
 
-            hypre_ParVectorSetConstantValues(xn_l[level+1], 0.0);
+            hypre_ParVectorSetConstantValues(xn_l[level + 1], 0.0);
          }  /* for (level = en_numlevs; level<= node_numlevs-2; level++) */
 
          /* coarsest relaxation */
-         level = node_numlevs-1;
+         level = node_numlevs - 1;
          hypre_BoomerAMGRelaxIF(Ann_l[level],
                                 bn_l[level],
                                 nCF_marker_l[level],
@@ -575,11 +577,11 @@ hypre_MaxwellSolve( void                *maxwell_vdata,
        *---------------------------------------------------------------------*/
       if (edge_numlevs > en_numlevs)
       {
-         for (level = (edge_numlevs - 2); level>= en_numlevs-1; level--)
+         for (level = (edge_numlevs - 2); level >= en_numlevs - 1; level--)
          {
             hypre_ParCSRMatrixMatvec(1.0,
-              (hypre_ParCSRMatrix *) hypre_IJMatrixObject(Pe_l[level]),
-                                     xe_l[level+1], 0.0, ee_l[level]);
+                                     (hypre_ParCSRMatrix *) hypre_IJMatrixObject(Pe_l[level]),
+                                     xe_l[level + 1], 0.0, ee_l[level]);
             hypre_ParVectorZeroBCValues(ee_l[level], BdryRanks_l[level],
                                         BdryRanksCnts_l[level]);
             hypre_ParVectorAxpy(1.0, ee_l[level], xe_l[level]);
@@ -606,9 +608,9 @@ hypre_MaxwellSolve( void                *maxwell_vdata,
 
       else if (node_numlevs > en_numlevs)
       {
-         for (level = (node_numlevs - 2); level>= en_numlevs-1; level--)
+         for (level = (node_numlevs - 2); level >= en_numlevs - 1; level--)
          {
-            hypre_ParCSRMatrixMatvec(1.0, Pn_l[level], xn_l[level+1], 0.0,
+            hypre_ParCSRMatrixMatvec(1.0, Pn_l[level], xn_l[level + 1], 0.0,
                                      en_l[level]);
             hypre_ParVectorAxpy(1.0, en_l[level], xn_l[level]);
 
@@ -635,15 +637,15 @@ hypre_MaxwellSolve( void                *maxwell_vdata,
       /*---------------------------------------------------------------------
        *  Cycle up the common levels.
        *---------------------------------------------------------------------*/
-      for (level = (en_numlevs - 2); level>= 1; level--)
+      for (level = (en_numlevs - 2); level >= 1; level--)
       {
-         hypre_ParCSRMatrixMatvec(1.0, Pn_l[level], xn_l[level+1], 0.0,
+         hypre_ParCSRMatrixMatvec(1.0, Pn_l[level], xn_l[level + 1], 0.0,
                                   en_l[level]);
          hypre_ParVectorAxpy(1.0, en_l[level], xn_l[level]);
 
          hypre_ParCSRMatrixMatvec(1.0,
-           (hypre_ParCSRMatrix *) hypre_IJMatrixObject(Pe_l[level]),
-                                  xe_l[level+1], 0.0, ee_l[level]);
+                                  (hypre_ParCSRMatrix *) hypre_IJMatrixObject(Pe_l[level]),
+                                  xe_l[level + 1], 0.0, ee_l[level]);
          hypre_ParVectorZeroBCValues(ee_l[level], BdryRanks_l[level],
                                      BdryRanksCnts_l[level]);
          hypre_ParVectorAxpy(1.0, ee_l[level], xe_l[level]);
@@ -653,7 +655,7 @@ hypre_MaxwellSolve( void                *maxwell_vdata,
          {
             hypre_ParVectorCopy(bn_l[level], nVtemp_l[level]);
             hypre_ParCSRMatrixMatvecT(-1.0, Aen_l[level], xe_l[level],
-                                       1.0, nVtemp_l[level]);
+                                      1.0, nVtemp_l[level]);
             hypre_BoomerAMGRelaxIF(Ann_l[level],
                                    nVtemp_l[level],
                                    nCF_marker_l[level],
@@ -669,7 +671,7 @@ hypre_MaxwellSolve( void                *maxwell_vdata,
 
             hypre_ParVectorCopy(be_l[level], eVtemp_l[level]);
             hypre_ParCSRMatrixMatvec(-1.0, Aen_l[level], xn_l[level],
-                                      1.0, eVtemp_l[level]);
+                                     1.0, eVtemp_l[level]);
             hypre_ParVectorZeroBCValues(eVtemp_l[level], BdryRanks_l[level],
                                         BdryRanksCnts_l[level]);
 
@@ -694,7 +696,7 @@ hypre_MaxwellSolve( void                *maxwell_vdata,
       hypre_ParVectorAxpy(1.0, en_l[0], xn_l[0]);
 
       hypre_ParCSRMatrixMatvec(1.0,
-        (hypre_ParCSRMatrix *) hypre_IJMatrixObject(Pe_l[0]),
+                               (hypre_ParCSRMatrix *) hypre_IJMatrixObject(Pe_l[0]),
                                xe_l[1], 0.0, ee_l[0]);
       hypre_ParVectorZeroBCValues(ee_l[0], BdryRanks_l[0],
                                   BdryRanksCnts_l[0]);
@@ -711,14 +713,14 @@ hypre_MaxwellSolve( void                *maxwell_vdata,
                                      ee_l[0]);
             hypre_ParVectorZeroBCValues(ee_l[0], BdryRanks_l[0],
                                         BdryRanksCnts_l[0]);
-            e_dot_e= hypre_ParVectorInnerProd(ee_l[0], ee_l[0]);
+            e_dot_e = hypre_ParVectorInnerProd(ee_l[0], ee_l[0]);
 
             hypre_ParVectorCopy(xe_l[0], eVtemp_l[0]);
             hypre_ParCSRMatrixMatvec(1.0, Tgrad, xn_l[0], 1.0,
                                      eVtemp_l[0]);
             hypre_ParVectorZeroBCValues(eVtemp_l[0], BdryRanks_l[0],
                                         BdryRanksCnts_l[0]);
-            x_dot_x= hypre_ParVectorInnerProd(eVtemp_l[0], eVtemp_l[0]);
+            x_dot_x = hypre_ParVectorInnerProd(eVtemp_l[0], eVtemp_l[0]);
          }
          else
          {
@@ -733,7 +735,7 @@ hypre_MaxwellSolve( void                *maxwell_vdata,
       {
          hypre_ParVectorCopy(bn_l[0], nVtemp_l[0]);
          hypre_ParCSRMatrixMatvecT(-1.0, Aen_l[0], xe_l[0],
-                                    1.0, nVtemp_l[0]);
+                                   1.0, nVtemp_l[0]);
          hypre_BoomerAMGRelaxIF(Ann_l[0],
                                 nVtemp_l[0],
                                 nCF_marker_l[0],
diff --git a/external/hypre/src/sstruct_ls/maxwell_solve2.c b/external/hypre/src/sstruct_ls/maxwell_solve2.c
index 950ffbda..a478e790 100644
--- a/external/hypre/src/sstruct_ls/maxwell_solve2.c
+++ b/external/hypre/src/sstruct_ls/maxwell_solve2.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -20,6 +20,8 @@ hypre_MaxwellSolve2( void                *maxwell_vdata,
                      hypre_SStructVector *f,
                      hypre_SStructVector *u )
 {
+   HYPRE_UNUSED_VAR(A_in);
+
    hypre_MaxwellData     *maxwell_data = (hypre_MaxwellData     *)maxwell_vdata;
 
    hypre_ParVector       *f_edge;
@@ -41,7 +43,7 @@ hypre_MaxwellSolve2( void                *maxwell_vdata,
    hypre_ParVector      **en_l         = maxwell_data-> en_l;
    hypre_ParVector      **nVtemp2_l    = maxwell_data-> nVtemp2_l;
    HYPRE_Int            **nCF_marker_l = maxwell_data-> nCF_marker_l;
-   HYPRE_Real            *nrelax_weight= maxwell_data-> nrelax_weight;
+   HYPRE_Real            *nrelax_weight = maxwell_data-> nrelax_weight;
    HYPRE_Real            *nomega       = maxwell_data-> nomega;
    HYPRE_Int              nrelax_type  = maxwell_data-> nrelax_type;
    HYPRE_Int              node_numlevs = maxwell_data-> node_numlevels;
@@ -58,13 +60,13 @@ hypre_MaxwellSolve2( void                *maxwell_vdata,
    hypre_ParVector      **ee_l         = maxwell_data-> ee_l;
    hypre_ParVector      **eVtemp2_l    = maxwell_data-> eVtemp2_l;
    HYPRE_Int            **eCF_marker_l = maxwell_data-> eCF_marker_l;
-   HYPRE_Real            *erelax_weight= maxwell_data-> erelax_weight;
+   HYPRE_Real            *erelax_weight = maxwell_data-> erelax_weight;
    HYPRE_Real            *eomega       = maxwell_data-> eomega;
    HYPRE_Int              erelax_type  = maxwell_data-> erelax_type;
    HYPRE_Int              edge_numlevs = maxwell_data-> edge_numlevels;
 
    HYPRE_Int            **BdryRanks_l  = maxwell_data-> BdryRanks_l;
-   HYPRE_Int             *BdryRanksCnts_l= maxwell_data-> BdryRanksCnts_l;
+   HYPRE_Int             *BdryRanksCnts_l = maxwell_data-> BdryRanksCnts_l;
 
    HYPRE_Int              logging      = maxwell_data-> logging;
    HYPRE_Real            *norms        = maxwell_data-> norms;
@@ -73,7 +75,7 @@ hypre_MaxwellSolve2( void                *maxwell_vdata,
    HYPRE_Int              relax_local, cycle_param;
 
    HYPRE_Real             b_dot_b = 0, r_dot_r, eps = 0;
-   HYPRE_Real             e_dot_e, x_dot_x;
+   HYPRE_Real             e_dot_e = 1.0, x_dot_x = 1.0;
 
    HYPRE_Int              i, j;
    HYPRE_Int              level;
@@ -86,8 +88,8 @@ hypre_MaxwellSolve2( void                *maxwell_vdata,
       /* Aee is always bigger than Ann */
 
       ze = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(Aee_l[0]),
-                                hypre_ParCSRMatrixGlobalNumRows(Aee_l[0]),
-                                hypre_ParCSRMatrixRowStarts(Aee_l[0]));
+                                 hypre_ParCSRMatrixGlobalNumRows(Aee_l[0]),
+                                 hypre_ParCSRMatrixRowStarts(Aee_l[0]));
       hypre_ParVectorInitialize(ze);
    }
 
@@ -97,14 +99,14 @@ hypre_MaxwellSolve2( void                *maxwell_vdata,
    hypre_SStructVectorConvert(u, &u_edge);
    hypre_ParVectorZeroBCValues(f_edge, BdryRanks_l[0], BdryRanksCnts_l[0]);
    hypre_ParVectorZeroBCValues(u_edge, BdryRanks_l[0], BdryRanksCnts_l[0]);
-   be_l[0]= f_edge;
-   xe_l[0]= u_edge;
+   be_l[0] = f_edge;
+   xe_l[0] = u_edge;
 
    /* the nodal fine vectors: xn= 0. bn= T'*(be- Aee*xe) is updated in the cycle. */
    hypre_ParVectorSetConstantValues(xn_l[0], 0.0);
 
-   relax_local= 0;
-   cycle_param= 0;
+   relax_local = 0;
+   cycle_param = 0;
 
    (maxwell_data-> num_iterations) = 0;
    /* if max_iter is zero, return */
@@ -125,8 +127,8 @@ hypre_MaxwellSolve2( void                *maxwell_vdata,
    if (tol > 0.0)
    {
       /* eps = (tol^2) */
-      b_dot_b= hypre_ParVectorInnerProd(be_l[0], be_l[0]);
-      eps = tol*tol;
+      b_dot_b = hypre_ParVectorInnerProd(be_l[0], be_l[0]);
+      eps = tol * tol;
 
       /* if rhs is zero, return a zero solution */
       if (b_dot_b == 0.0)
@@ -153,7 +155,7 @@ hypre_MaxwellSolve2( void                *maxwell_vdata,
     *-----------------------------------------------------*/
    for (i = 0; i < max_iter; i++)
    {
-     /* compute fine grid residual & nodal rhs. */
+      /* compute fine grid residual & nodal rhs. */
       hypre_ParVectorCopy(be_l[0], rese_l[0]);
       hypre_ParCSRMatrixMatvec(-1.0, Aee_l[0], xe_l[0], 1.0, rese_l[0]);
       hypre_ParVectorZeroBCValues(rese_l[0], BdryRanks_l[0], BdryRanksCnts_l[0]);
@@ -162,24 +164,30 @@ hypre_MaxwellSolve2( void                *maxwell_vdata,
       /* convergence check */
       if (tol > 0.0)
       {
-         r_dot_r= hypre_ParVectorInnerProd(rese_l[0], rese_l[0]);
+         r_dot_r = hypre_ParVectorInnerProd(rese_l[0], rese_l[0]);
 
          if (logging > 0)
          {
-            norms[i] = sqrt(r_dot_r);
+            norms[i] = hypre_sqrt(r_dot_r);
             if (b_dot_b > 0)
-               rel_norms[i] = sqrt(r_dot_r/b_dot_b);
+            {
+               rel_norms[i] = hypre_sqrt(r_dot_r / b_dot_b);
+            }
             else
+            {
                rel_norms[i] = 0.0;
+            }
          }
 
          /* always do at least 1 V-cycle */
-         if ((r_dot_r/b_dot_b < eps) && (i > 0))
+         if ((r_dot_r / b_dot_b < eps) && (i > 0))
          {
             if (rel_change)
             {
-               if ((e_dot_e/x_dot_x) < eps)
+               if ((e_dot_e / x_dot_x) < eps)
+               {
                   break;
+               }
             }
             else
             {
@@ -190,45 +198,45 @@ hypre_MaxwellSolve2( void                *maxwell_vdata,
 
       hypre_ParVectorCopy(bn_l[0], resn_l[0]);
       hypre_ParCSRMatrixMatvec(-1.0, Ann_l[0], xn_l[0], 1.0, resn_l[0]);
-      r_dot_r= hypre_ParVectorInnerProd(resn_l[0], resn_l[0]);
+      r_dot_r = hypre_ParVectorInnerProd(resn_l[0], resn_l[0]);
 
-      for (level = 0; level<= node_numlevs-2; level++)
+      for (level = 0; level <= node_numlevs - 2; level++)
       {
          /*-----------------------------------------------
           * Down cycle
           *-----------------------------------------------*/
-          for (j = 0; j < npre_relax; j++)
-          {
-             hypre_BoomerAMGRelaxIF(Ann_l[level],
-                                    bn_l[level],
-                                    nCF_marker_l[level],
-                                    nrelax_type,
-                                    relax_local,
-                                    cycle_param,
-                                    nrelax_weight[level],
-                                    nomega[level],
-                                    NULL,
-                                    xn_l[level],
-                                    nVtemp2_l[level],
-                                    ze);
-          }  /*for (j = 0; j < npre_relax; j++) */
-
-          /* compute residuals */
-          hypre_ParVectorCopy(bn_l[level], resn_l[level]);
-          hypre_ParCSRMatrixMatvec(-1.0, Ann_l[level], xn_l[level],
-                                    1.0, resn_l[level]);
-
-          /* restrict residuals */
-          hypre_ParCSRMatrixMatvecT(1.0, RnT_l[level], resn_l[level],
-                                    0.0, bn_l[level+1]);
-
-          /* zero off initial guess for the next level */
-          hypre_ParVectorSetConstantValues(xn_l[level+1], 0.0);
+         for (j = 0; j < npre_relax; j++)
+         {
+            hypre_BoomerAMGRelaxIF(Ann_l[level],
+                                   bn_l[level],
+                                   nCF_marker_l[level],
+                                   nrelax_type,
+                                   relax_local,
+                                   cycle_param,
+                                   nrelax_weight[level],
+                                   nomega[level],
+                                   NULL,
+                                   xn_l[level],
+                                   nVtemp2_l[level],
+                                   ze);
+         }  /*for (j = 0; j < npre_relax; j++) */
+
+         /* compute residuals */
+         hypre_ParVectorCopy(bn_l[level], resn_l[level]);
+         hypre_ParCSRMatrixMatvec(-1.0, Ann_l[level], xn_l[level],
+                                  1.0, resn_l[level]);
+
+         /* restrict residuals */
+         hypre_ParCSRMatrixMatvecT(1.0, RnT_l[level], resn_l[level],
+                                   0.0, bn_l[level + 1]);
+
+         /* zero off initial guess for the next level */
+         hypre_ParVectorSetConstantValues(xn_l[level + 1], 0.0);
 
       }  /* for (level = 0; level<= node_numlevs-2; level++) */
 
       /* coarsest node solve */
-      level = node_numlevs-1;
+      level = node_numlevs - 1;
       hypre_BoomerAMGRelaxIF(Ann_l[level],
                              bn_l[level],
                              nCF_marker_l[level],
@@ -242,31 +250,31 @@ hypre_MaxwellSolve2( void                *maxwell_vdata,
                              nVtemp2_l[level],
                              ze);
 
-     /*---------------------------------------------------------------------
-      *  Cycle up the levels.
-      *---------------------------------------------------------------------*/
-      for (level = (node_numlevs - 2); level>= 1; level--)
+      /*---------------------------------------------------------------------
+       *  Cycle up the levels.
+       *---------------------------------------------------------------------*/
+      for (level = (node_numlevs - 2); level >= 1; level--)
       {
-          hypre_ParCSRMatrixMatvec(1.0, Pn_l[level], xn_l[level+1], 0.0,
-                                   en_l[level]);
-          hypre_ParVectorAxpy(1.0, en_l[level], xn_l[level]);
-
-          /* post smooth */
-          for (j = 0; j < npost_relax; j++)
-          {
-             hypre_BoomerAMGRelaxIF(Ann_l[level],
-                                    bn_l[level],
-                                    nCF_marker_l[level],
-                                    nrelax_type,
-                                    relax_local,
-                                    cycle_param,
-                                    nrelax_weight[level],
-                                    nomega[level],
-                                    NULL,
-                                    xn_l[level],
-                                    nVtemp2_l[level],
-                                    ze);
-          }
+         hypre_ParCSRMatrixMatvec(1.0, Pn_l[level], xn_l[level + 1], 0.0,
+                                  en_l[level]);
+         hypre_ParVectorAxpy(1.0, en_l[level], xn_l[level]);
+
+         /* post smooth */
+         for (j = 0; j < npost_relax; j++)
+         {
+            hypre_BoomerAMGRelaxIF(Ann_l[level],
+                                   bn_l[level],
+                                   nCF_marker_l[level],
+                                   nrelax_type,
+                                   relax_local,
+                                   cycle_param,
+                                   nrelax_weight[level],
+                                   nomega[level],
+                                   NULL,
+                                   xn_l[level],
+                                   nVtemp2_l[level],
+                                   ze);
+         }
       }   /* for (level = (en_numlevs - 2); level>= 1; level--) */
 
       /* interpolate error and correct on finest grids */
@@ -296,48 +304,48 @@ hypre_MaxwellSolve2( void                *maxwell_vdata,
 
       hypre_ParVectorCopy(be_l[0], rese_l[0]);
       hypre_ParCSRMatrixMatvec(-1.0, Aee_l[0], xe_l[0], 1.0, rese_l[0]);
-      r_dot_r= hypre_ParVectorInnerProd(rese_l[0], rese_l[0]);
+      r_dot_r = hypre_ParVectorInnerProd(rese_l[0], rese_l[0]);
 
-      for (level = 0; level<= edge_numlevs-2; level++)
+      for (level = 0; level <= edge_numlevs - 2; level++)
       {
          /*-----------------------------------------------
           * Down cycle
           *-----------------------------------------------*/
-          for (j = 0; j < npre_relax; j++)
-          {
-             hypre_BoomerAMGRelaxIF(Aee_l[level],
-                                    be_l[level],
-                                    eCF_marker_l[level],
-                                    erelax_type,
-                                    relax_local,
-                                    cycle_param,
-                                    erelax_weight[level],
-                                    eomega[level],
-                                    NULL,
-                                    xe_l[level],
-                                    eVtemp2_l[level],
-                                    ze);
-          }  /*for (j = 0; j < npre_relax; j++) */
-
-          /* compute residuals */
-          hypre_ParVectorCopy(be_l[level], rese_l[level]);
-          hypre_ParCSRMatrixMatvec(-1.0, Aee_l[level], xe_l[level],
-                                    1.0, rese_l[level]);
-
-          /* restrict residuals */
-          hypre_ParCSRMatrixMatvecT(1.0,
-             (hypre_ParCSRMatrix *) hypre_IJMatrixObject(ReT_l[level]),
-                                    rese_l[level], 0.0, be_l[level+1]);
-          hypre_ParVectorZeroBCValues(be_l[level+1], BdryRanks_l[level+1],
-                                      BdryRanksCnts_l[level+1]);
-
-          /* zero off initial guess for the next level */
-          hypre_ParVectorSetConstantValues(xe_l[level+1], 0.0);
+         for (j = 0; j < npre_relax; j++)
+         {
+            hypre_BoomerAMGRelaxIF(Aee_l[level],
+                                   be_l[level],
+                                   eCF_marker_l[level],
+                                   erelax_type,
+                                   relax_local,
+                                   cycle_param,
+                                   erelax_weight[level],
+                                   eomega[level],
+                                   NULL,
+                                   xe_l[level],
+                                   eVtemp2_l[level],
+                                   ze);
+         }  /*for (j = 0; j < npre_relax; j++) */
+
+         /* compute residuals */
+         hypre_ParVectorCopy(be_l[level], rese_l[level]);
+         hypre_ParCSRMatrixMatvec(-1.0, Aee_l[level], xe_l[level],
+                                  1.0, rese_l[level]);
+
+         /* restrict residuals */
+         hypre_ParCSRMatrixMatvecT(1.0,
+                                   (hypre_ParCSRMatrix *) hypre_IJMatrixObject(ReT_l[level]),
+                                   rese_l[level], 0.0, be_l[level + 1]);
+         hypre_ParVectorZeroBCValues(be_l[level + 1], BdryRanks_l[level + 1],
+                                     BdryRanksCnts_l[level + 1]);
+
+         /* zero off initial guess for the next level */
+         hypre_ParVectorSetConstantValues(xe_l[level + 1], 0.0);
 
       }  /* for (level = 1; level<= edge_numlevels-2; level++) */
 
       /* coarsest edge solve */
-      level = edge_numlevs-1;
+      level = edge_numlevs - 1;
       for (j = 0; j < npre_relax; j++)
       {
          hypre_BoomerAMGRelaxIF(Aee_l[level],
@@ -354,14 +362,14 @@ hypre_MaxwellSolve2( void                *maxwell_vdata,
                                 ze);
       }
 
-     /*---------------------------------------------------------------------
-      *  Up cycle.
-      *---------------------------------------------------------------------*/
-      for (level = (edge_numlevs - 2); level>= 1; level--)
+      /*---------------------------------------------------------------------
+       *  Up cycle.
+       *---------------------------------------------------------------------*/
+      for (level = (edge_numlevs - 2); level >= 1; level--)
       {
          hypre_ParCSRMatrixMatvec(1.0,
-           (hypre_ParCSRMatrix *) hypre_IJMatrixObject(Pe_l[level]),
-                                  xe_l[level+1], 0.0, ee_l[level]);
+                                  (hypre_ParCSRMatrix *) hypre_IJMatrixObject(Pe_l[level]),
+                                  xe_l[level + 1], 0.0, ee_l[level]);
          hypre_ParVectorZeroBCValues(ee_l[level], BdryRanks_l[level],
                                      BdryRanksCnts_l[level]);
          hypre_ParVectorAxpy(1.0, ee_l[level], xe_l[level]);
@@ -386,7 +394,7 @@ hypre_MaxwellSolve2( void                *maxwell_vdata,
 
       /* interpolate error and correct on finest grids */
       hypre_ParCSRMatrixMatvec(1.0,
-        (hypre_ParCSRMatrix *) hypre_IJMatrixObject(Pe_l[0]),
+                               (hypre_ParCSRMatrix *) hypre_IJMatrixObject(Pe_l[0]),
                                xe_l[1], 0.0, ee_l[0]);
       hypre_ParVectorZeroBCValues(ee_l[0], BdryRanks_l[0],
                                   BdryRanksCnts_l[0]);
diff --git a/external/hypre/src/sstruct_ls/maxwell_zeroBC.c b/external/hypre/src/sstruct_ls/maxwell_zeroBC.c
index 09fb4d26..865ba87e 100644
--- a/external/hypre/src/sstruct_ls/maxwell_zeroBC.c
+++ b/external/hypre/src/sstruct_ls/maxwell_zeroBC.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -12,7 +12,7 @@ hypre_ParVectorZeroBCValues(hypre_ParVector *v,
                             HYPRE_Int       *rows,
                             HYPRE_Int        nrows)
 {
-   HYPRE_Int   ierr= 0;
+   HYPRE_Int   ierr = 0;
 
    hypre_Vector *v_local = hypre_ParVectorLocalVector(v);
 
@@ -31,10 +31,12 @@ hypre_SeqVectorZeroBCValues(hypre_Vector *v,
    HYPRE_Int      ierr  = 0;
 
 #if defined(HYPRE_USING_OPENMP)
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
    for (i = 0; i < nrows; i++)
-      vector_data[rows[i]]= 0.0;
+   {
+      vector_data[rows[i]] = 0.0;
+   }
 
    return ierr;
 }
diff --git a/external/hypre/src/sstruct_ls/nd1_amge_interpolation.c b/external/hypre/src/sstruct_ls/nd1_amge_interpolation.c
index f27be534..8af35e78 100644
--- a/external/hypre/src/sstruct_ls/nd1_amge_interpolation.c
+++ b/external/hypre/src/sstruct_ls/nd1_amge_interpolation.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -32,21 +32,21 @@
   from one group to the next.
 */
 HYPRE_Int hypre_ND1AMGeInterpolation (hypre_ParCSRMatrix       * Aee,
-                                hypre_ParCSRMatrix       * ELEM_idof,
-                                hypre_ParCSRMatrix       * FACE_idof,
-                                hypre_ParCSRMatrix       * EDGE_idof,
-                                hypre_ParCSRMatrix       * ELEM_FACE,
-                                hypre_ParCSRMatrix       * ELEM_EDGE,
-                                HYPRE_Int                  num_OffProcRows,
-                                hypre_MaxwellOffProcRow ** OffProcRows,
-                                hypre_IJMatrix           * IJ_dof_DOF)
+                                      hypre_ParCSRMatrix       * ELEM_idof,
+                                      hypre_ParCSRMatrix       * FACE_idof,
+                                      hypre_ParCSRMatrix       * EDGE_idof,
+                                      hypre_ParCSRMatrix       * ELEM_FACE,
+                                      hypre_ParCSRMatrix       * ELEM_EDGE,
+                                      HYPRE_Int                  num_OffProcRows,
+                                      hypre_MaxwellOffProcRow ** OffProcRows,
+                                      hypre_IJMatrix           * IJ_dof_DOF)
 {
    HYPRE_Int ierr = 0;
 
    HYPRE_Int  i, j;
    HYPRE_BigInt  big_k;
    HYPRE_BigInt *offproc_rnums;
-   HYPRE_Int *swap;
+   HYPRE_Int *swap = NULL;
 
    hypre_ParCSRMatrix * dof_DOF = (hypre_ParCSRMatrix *)hypre_IJMatrixObject(IJ_dof_DOF);
    hypre_ParCSRMatrix * ELEM_DOF = ELEM_EDGE;
@@ -58,7 +58,7 @@ HYPRE_Int hypre_ND1AMGeInterpolation (hypre_ParCSRMatrix       * Aee,
    HYPRE_Int getrow_ierr;
    HYPRE_Int three_dimensional_problem;
 
-   MPI_Comm comm= hypre_ParCSRMatrixComm(Aee);
+   MPI_Comm comm = hypre_ParCSRMatrixComm(Aee);
    HYPRE_Int      myproc;
 
    hypre_MPI_Comm_rank(comm, &myproc);
@@ -75,31 +75,37 @@ HYPRE_Int hypre_ND1AMGeInterpolation (hypre_ParCSRMatrix       * Aee,
    hypre_IJMatrixAssembleFlag(ij_dof_DOF) = 1;
 #endif
 
-  /* sort the offproc rows to get quicker comparison for later */
+   /* sort the offproc rows to get quicker comparison for later */
    if (num_OffProcRows)
    {
-      offproc_rnums= hypre_TAlloc(HYPRE_BigInt,  num_OffProcRows, HYPRE_MEMORY_HOST);
-      swap         = hypre_TAlloc(HYPRE_Int,  num_OffProcRows, HYPRE_MEMORY_HOST);
-      for (i= 0; i< num_OffProcRows; i++)
+      offproc_rnums = hypre_TAlloc(HYPRE_BigInt, num_OffProcRows, HYPRE_MEMORY_HOST);
+      swap          = hypre_TAlloc(HYPRE_Int, num_OffProcRows, HYPRE_MEMORY_HOST);
+      for (i = 0; i < num_OffProcRows; i++)
       {
-         offproc_rnums[i]=(OffProcRows[i] -> row);
-         swap[i]         = i;
+         offproc_rnums[i] = (OffProcRows[i] -> row);
+         swap[i]          = i;
       }
    }
 
    if (num_OffProcRows > 1)
    {
-      hypre_BigQsortbi(offproc_rnums, swap, 0, num_OffProcRows-1);
+      hypre_BigQsortbi(offproc_rnums, swap, 0, num_OffProcRows - 1);
    }
 
    if (FACE_idof == EDGE_idof)
+   {
       three_dimensional_problem = 0;
+   }
    else
+   {
       three_dimensional_problem = 1;
+   }
 
    /* ELEM_FACEidof = ELEM_FACE x FACE_idof */
    if (three_dimensional_problem)
+   {
       ELEM_FACEidof = hypre_ParMatmul(ELEM_FACE, FACE_idof);
+   }
 
    /* ELEM_EDGEidof = ELEM_EDGE x EDGE_idof */
    ELEM_EDGEidof = hypre_ParMatmul(ELEM_EDGE, EDGE_idof);
@@ -121,57 +127,62 @@ HYPRE_Int hypre_ND1AMGeInterpolation (hypre_ParCSRMatrix       * Aee,
 
       /* Determine the coarse DOFs */
       hypre_ParCSRMatrixGetRow (ELEM_DOF, big_k, &num_DOF, &DOF0, &boolean_data);
-      DOF= hypre_TAlloc(HYPRE_BigInt,  num_DOF, HYPRE_MEMORY_HOST);
-      for (j= 0; j< num_DOF; j++)
+      DOF = hypre_TAlloc(HYPRE_BigInt,  num_DOF, HYPRE_MEMORY_HOST);
+      for (j = 0; j < num_DOF; j++)
       {
-         DOF[j]= DOF0[j];
+         DOF[j] = DOF0[j];
       }
       hypre_ParCSRMatrixRestoreRow (ELEM_DOF, big_k, &num_DOF, &DOF0, &boolean_data);
 
-      hypre_BigQsort0(DOF,0,num_DOF-1);
+      hypre_BigQsort0(DOF, 0, num_DOF - 1);
 
       /* Find the fine dofs interior for the current coarse element */
       hypre_ParCSRMatrixGetRow (ELEM_idof, big_k, &num_idof, &idof0, &boolean_data);
-      idof= hypre_TAlloc(HYPRE_BigInt,  num_idof, HYPRE_MEMORY_HOST);
-      for (j= 0; j< num_idof; j++)
+      idof = hypre_TAlloc(HYPRE_BigInt,  num_idof, HYPRE_MEMORY_HOST);
+      for (j = 0; j < num_idof; j++)
       {
-         idof[j]= idof0[j];
+         idof[j] = idof0[j];
       }
       hypre_ParCSRMatrixRestoreRow (ELEM_idof, big_k, &num_idof, &idof0, &boolean_data);
 
       /* Sort the interior dofs according to their global number */
-      hypre_BigQsort0(idof,0,num_idof-1);
+      hypre_BigQsort0(idof, 0, num_idof - 1);
 
       /* Find the fine dofs on the boundary of the current coarse element */
       if (three_dimensional_problem)
       {
          hypre_ParCSRMatrixGetRow (ELEM_FACEidof, big_k, &size1, &col_ind0, &boolean_data);
-         col_ind1= hypre_TAlloc(HYPRE_BigInt,  size1, HYPRE_MEMORY_HOST);
-         for (j= 0; j< size1; j++)
+         col_ind1 = hypre_TAlloc(HYPRE_BigInt, size1, HYPRE_MEMORY_HOST);
+         for (j = 0; j < size1; j++)
          {
-            col_ind1[j]= col_ind0[j];
+            col_ind1[j] = col_ind0[j];
          }
          hypre_ParCSRMatrixRestoreRow (ELEM_FACEidof, big_k, &size1, &col_ind0, &boolean_data);
       }
       else
+      {
+         col_ind1 = NULL;
          size1 = 0;
+      }
 
       hypre_ParCSRMatrixGetRow (ELEM_EDGEidof, big_k, &size2, &col_ind0, &boolean_data);
-      col_ind2= hypre_TAlloc(HYPRE_BigInt,  size2, HYPRE_MEMORY_HOST);
-      for (j= 0; j< size2; j++)
+      col_ind2 = hypre_TAlloc(HYPRE_BigInt, size2, HYPRE_MEMORY_HOST);
+      for (j = 0; j < size2; j++)
       {
-         col_ind2[j]= col_ind0[j];
+         col_ind2[j] = col_ind0[j];
       }
       hypre_ParCSRMatrixRestoreRow (ELEM_EDGEidof, big_k, &size2, &col_ind0, &boolean_data);
 
       /* Merge and sort the boundary dofs according to their global number */
       num_bdof = size1 + size2;
-      bdof = hypre_CTAlloc(HYPRE_BigInt,  num_bdof, HYPRE_MEMORY_HOST);
+      bdof = hypre_CTAlloc(HYPRE_BigInt, num_bdof, HYPRE_MEMORY_HOST);
       if (three_dimensional_problem)
-		 hypre_TMemcpy(bdof,  col_ind1, HYPRE_BigInt, size1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
-      hypre_TMemcpy(bdof+size1,  col_ind2, HYPRE_BigInt, size2, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
+      {
+         hypre_TMemcpy(bdof, col_ind1, HYPRE_BigInt, size1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
+      }
+      hypre_TMemcpy(bdof + size1, col_ind2, HYPRE_BigInt, size2, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
 
-      hypre_BigQsort0(bdof,0,num_bdof-1);
+      hypre_BigQsort0(bdof, 0, num_bdof - 1);
 
       /* A = extract_rows(Aee, idof) */
       A = hypre_CSRMatrixCreate (num_idof, num_idof + num_bdof,
@@ -181,22 +192,26 @@ HYPRE_Int hypre_ND1AMGeInterpolation (hypre_ParCSRMatrix       * Aee,
          HYPRE_Int *I = hypre_CSRMatrixI(A);
          HYPRE_BigInt *J = hypre_CSRMatrixBigJ(A);
          HYPRE_Real *data = hypre_CSRMatrixData(A);
-
          HYPRE_BigInt *tmp_J;
          HYPRE_Real *tmp_data;
 
+         HYPRE_MemoryLocation memory_location_A = hypre_CSRMatrixMemoryLocation(A);
+         HYPRE_MemoryLocation memory_location_Aee = hypre_ParCSRMatrixMemoryLocation(Aee);
+
          I[0] = 0;
          for (j = 0; j < num_idof; j++)
          {
-            getrow_ierr= hypre_ParCSRMatrixGetRow (Aee, idof[j], &I[j+1], &tmp_J, &tmp_data);
-            if (getrow_ierr <0)
-               hypre_printf("getrow Aee off proc[%d] = \n",myproc);
-            hypre_TMemcpy(J,  tmp_J, HYPRE_BigInt, I[j+1], HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
-            hypre_TMemcpy(data,  tmp_data, HYPRE_Real, I[j+1], HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
-            J+= I[j+1];
-            data+= I[j+1];
-            hypre_ParCSRMatrixRestoreRow (Aee, idof[j], &I[j+1], &tmp_J, &tmp_data);
-            I[j+1] += I[j];
+            getrow_ierr = hypre_ParCSRMatrixGetRow (Aee, idof[j], &size1, &tmp_J, &tmp_data);
+            if (getrow_ierr < 0)
+            {
+               hypre_printf("getrow Aee off proc[%d] = \n", myproc);
+            }
+            hypre_TMemcpy(J, tmp_J, HYPRE_BigInt, size1, memory_location_A, memory_location_Aee);
+            hypre_TMemcpy(data, tmp_data, HYPRE_Real, size1, memory_location_A, memory_location_Aee);
+            J += size1;
+            data += size1;
+            hypre_ParCSRMatrixRestoreRow (Aee, idof[j], &size1, &tmp_J, &tmp_data);
+            I[j + 1] = size1 + I[j];
          }
       }
 
@@ -204,6 +219,7 @@ HYPRE_Int hypre_ND1AMGeInterpolation (hypre_ParCSRMatrix       * Aee,
       P = hypre_CSRMatrixCreate (num_idof + num_bdof, num_DOF,
                                  (num_idof + num_bdof) * num_DOF);
       hypre_CSRMatrixBigInitialize(P);
+
       {
          HYPRE_Int *I = hypre_CSRMatrixI(P);
          HYPRE_BigInt *J = hypre_CSRMatrixBigJ(P);
@@ -212,29 +228,32 @@ HYPRE_Int hypre_ND1AMGeInterpolation (hypre_ParCSRMatrix       * Aee,
 
          HYPRE_BigInt *tmp_J;
          HYPRE_Real *tmp_data;
-     
+
+         HYPRE_MemoryLocation memory_location_P = hypre_CSRMatrixMemoryLocation(P);
+         HYPRE_MemoryLocation memory_location_d = hypre_ParCSRMatrixMemoryLocation(dof_DOF);
+
          I[0] = 0;
          for (j = 0; j < num_idof; j++)
          {
-            getrow_ierr= hypre_ParCSRMatrixGetRow (dof_DOF, idof[j], &I[j+1], &tmp_J, &tmp_data);
+            getrow_ierr = hypre_ParCSRMatrixGetRow (dof_DOF, idof[j], &size1, &tmp_J, &tmp_data);
             if (getrow_ierr >= 0)
             {
-			   hypre_TMemcpy(J,  tmp_J, HYPRE_BigInt, I[j+1], HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
-               hypre_TMemcpy(data,  tmp_data, HYPRE_Real, I[j+1], HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
-               J+= I[j+1];
-               data+= I[j+1];
-               hypre_ParCSRMatrixRestoreRow (dof_DOF, idof[j], &I[j+1], &tmp_J, &tmp_data);
-               I[j+1] += I[j];
+               hypre_TMemcpy(J, tmp_J, HYPRE_BigInt, size1, memory_location_P, memory_location_d);
+               hypre_TMemcpy(data, tmp_data, HYPRE_Real, size1, memory_location_P, memory_location_d);
+               J += size1;
+               data += size1;
+               hypre_ParCSRMatrixRestoreRow (dof_DOF, idof[j], &size1, &tmp_J, &tmp_data);
+               I[j + 1] = size1 + I[j];
             }
             else    /* row offproc */
             {
-               hypre_ParCSRMatrixRestoreRow (dof_DOF, idof[j], &I[j+1], &tmp_J, &tmp_data);
-              /* search for OffProcRows */
-               m= 0;
+               hypre_ParCSRMatrixRestoreRow (dof_DOF, idof[j], &size1, &tmp_J, &tmp_data);
+               /* search for OffProcRows */
+               m = 0;
                while (m < num_OffProcRows)
                {
                   if (offproc_rnums[m] == idof[j])
-                  { 
+                  {
                      break;
                   }
                   else
@@ -242,37 +261,37 @@ HYPRE_Int hypre_ND1AMGeInterpolation (hypre_ParCSRMatrix       * Aee,
                      m++;
                   }
                }
-               I[j+1]= (OffProcRows[swap[m]] -> ncols);
+               size1 = (OffProcRows[swap[m]] -> ncols);
                tmp_J = (OffProcRows[swap[m]] -> cols);
-               tmp_data= (OffProcRows[swap[m]] -> data);
-               hypre_TMemcpy(J,  tmp_J, HYPRE_BigInt, I[j+1], HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
-               hypre_TMemcpy(data,  tmp_data, HYPRE_Real, I[j+1], HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
-               J+= I[j+1];
-               data+= I[j+1];
-               I[j+1] += I[j];
+               tmp_data = (OffProcRows[swap[m]] -> data);
+               hypre_TMemcpy(J, tmp_J, HYPRE_BigInt, size1, memory_location_P, HYPRE_MEMORY_HOST);
+               hypre_TMemcpy(data, tmp_data, HYPRE_Real, size1, memory_location_P, HYPRE_MEMORY_HOST);
+               J += size1;
+               data += size1;
+               I[j + 1] = size1 + I[j];
             }
-
          }
+
          for ( ; j < num_idof + num_bdof; j++)
          {
-            getrow_ierr= hypre_ParCSRMatrixGetRow (dof_DOF, bdof[j-num_idof], &I[j+1], &tmp_J, &tmp_data);
+            getrow_ierr = hypre_ParCSRMatrixGetRow (dof_DOF, bdof[j - num_idof], &size1, &tmp_J, &tmp_data);
             if (getrow_ierr >= 0)
             {
-				hypre_TMemcpy(J,  tmp_J, HYPRE_BigInt, I[j+1], HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
-				hypre_TMemcpy(data,  tmp_data, HYPRE_Real, I[j+1], HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
-               J+= I[j+1];
-               data+= I[j+1];
-               hypre_ParCSRMatrixRestoreRow (dof_DOF, bdof[j-num_idof], &I[j+1], &tmp_J, &tmp_data);
-               I[j+1] += I[j];
+               hypre_TMemcpy(J, tmp_J, HYPRE_BigInt, size1, memory_location_P, memory_location_d);
+               hypre_TMemcpy(data, tmp_data, HYPRE_Real, size1, memory_location_P, memory_location_d);
+               J += size1;
+               data += size1;
+               hypre_ParCSRMatrixRestoreRow (dof_DOF, bdof[j - num_idof], &size1, &tmp_J, &tmp_data);
+               I[j + 1] = size1 + I[j];
             }
             else    /* row offproc */
             {
-               hypre_ParCSRMatrixRestoreRow (dof_DOF, bdof[j-num_idof], &I[j+1], &tmp_J, &tmp_data);
-              /* search for OffProcRows */
-               m= 0;
+               hypre_ParCSRMatrixRestoreRow (dof_DOF, bdof[j - num_idof], &size1, &tmp_J, &tmp_data);
+               /* search for OffProcRows */
+               m = 0;
                while (m < num_OffProcRows)
                {
-                  if (offproc_rnums[m] == bdof[j-num_idof])
+                  if (offproc_rnums[m] == bdof[j - num_idof])
                   {
                      break;
                   }
@@ -281,15 +300,15 @@ HYPRE_Int hypre_ND1AMGeInterpolation (hypre_ParCSRMatrix       * Aee,
                      m++;
                   }
                }
-               if (m>= num_OffProcRows)hypre_printf("here the mistake\n");
-               I[j+1]= (OffProcRows[swap[m]] -> ncols);
+               if (m >= num_OffProcRows) { hypre_printf("here the mistake\n"); }
+               size1 = (OffProcRows[swap[m]] -> ncols);
                tmp_J = (OffProcRows[swap[m]] -> cols);
-               tmp_data= (OffProcRows[swap[m]] -> data);
-               hypre_TMemcpy(J,  tmp_J, HYPRE_BigInt, I[j+1], HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
-               hypre_TMemcpy(data,  tmp_data, HYPRE_Real, I[j+1], HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
-               J+= I[j+1];
-               data+= I[j+1];
-               I[j+1] += I[j];
+               tmp_data = (OffProcRows[swap[m]] -> data);
+               hypre_TMemcpy(J, tmp_J, HYPRE_BigInt, size1, memory_location_P, HYPRE_MEMORY_HOST);
+               hypre_TMemcpy(data, tmp_data, HYPRE_Real, size1, memory_location_P, HYPRE_MEMORY_HOST);
+               J += size1;
+               data += size1;
+               I[j + 1] = size1 + I[j];
             }
          }
       }
@@ -306,7 +325,7 @@ HYPRE_Int hypre_ND1AMGeInterpolation (hypre_ParCSRMatrix       * Aee,
          for (j = 0; j < num_idof; j++)
          {
             ncols[j] = num_DOF;
-            idof_indexes[j] = j*num_DOF;
+            idof_indexes[j] = j * num_DOF;
          }
 
          hypre_IJMatrixAddToValuesParCSR (IJ_dof_DOF,
@@ -336,7 +355,9 @@ HYPRE_Int hypre_ND1AMGeInterpolation (hypre_ParCSRMatrix       * Aee,
 #endif
 
    if (three_dimensional_problem)
+   {
       hypre_ParCSRMatrixDestroy(ELEM_FACEidof);
+   }
    hypre_ParCSRMatrixDestroy(ELEM_EDGEidof);
 
    if (num_OffProcRows)
@@ -352,10 +373,10 @@ HYPRE_Int hypre_ND1AMGeInterpolation (hypre_ParCSRMatrix       * Aee,
 
 
 HYPRE_Int hypre_HarmonicExtension (hypre_CSRMatrix *A,
-                             hypre_CSRMatrix *P,
-                             HYPRE_Int num_DOF, HYPRE_BigInt *DOF,
-                             HYPRE_Int num_idof, HYPRE_BigInt *idof,
-                             HYPRE_Int num_bdof, HYPRE_BigInt *bdof)
+                                   hypre_CSRMatrix *P,
+                                   HYPRE_Int num_DOF, HYPRE_BigInt *DOF,
+                                   HYPRE_Int num_idof, HYPRE_BigInt *idof,
+                                   HYPRE_Int num_bdof, HYPRE_BigInt *bdof)
 {
    HYPRE_Int ierr = 0;
 
@@ -370,28 +391,28 @@ HYPRE_Int hypre_HarmonicExtension (hypre_CSRMatrix *A,
    HYPRE_BigInt *JP = hypre_CSRMatrixBigJ(P);
    HYPRE_Real *dataP = hypre_CSRMatrixData(P);
 
-   HYPRE_Real * Aii = hypre_CTAlloc(HYPRE_Real,  num_idof*num_idof, HYPRE_MEMORY_HOST);
-   HYPRE_Real * Pi = hypre_CTAlloc(HYPRE_Real,  num_idof*num_DOF, HYPRE_MEMORY_HOST);
+   HYPRE_Real * Aii = hypre_CTAlloc(HYPRE_Real,  num_idof * num_idof, HYPRE_MEMORY_HOST);
+   HYPRE_Real * Pi = hypre_CTAlloc(HYPRE_Real,  num_idof * num_DOF, HYPRE_MEMORY_HOST);
 
    /* Loop over the rows of A */
    for (i = 0; i < num_idof; i++)
-      for (j = IA[i]; j < IA[i+1]; j++)
+      for (j = IA[i]; j < IA[i + 1]; j++)
       {
          /* Global to local*/
-         k = hypre_BigBinarySearch(idof,JA[j], num_idof);
+         k = hypre_BigBinarySearch(idof, JA[j], num_idof);
          /* If a column is a bdof, compute its participation in Pi = Aib x Pb */
          if (k == -1)
          {
-            k = hypre_BigBinarySearch(bdof,JA[j], num_bdof);
+            k = hypre_BigBinarySearch(bdof, JA[j], num_bdof);
             if (k > -1)
             {
-               for (l = IP[k+num_idof]; l < IP[k+num_idof+1]; l++)
+               for (l = IP[k + num_idof]; l < IP[k + num_idof + 1]; l++)
                {
-                  m = hypre_BigBinarySearch(DOF,JP[l], num_DOF);
+                  m = hypre_BigBinarySearch(DOF, JP[l], num_DOF);
                   if (m > -1)
                   {
-                     m+=i*num_DOF;
-                    /* Pi[i*num_DOF+m] += dataA[j] * dataP[l];*/
+                     m += i * num_DOF;
+                     /* Pi[i*num_DOF+m] += dataA[j] * dataP[l];*/
                      Pi[m] += dataA[j] * dataP[l];
                   }
                }
@@ -399,32 +420,42 @@ HYPRE_Int hypre_HarmonicExtension (hypre_CSRMatrix *A,
          }
          /* If a column is an idof, put it in Aii */
          else
-            Aii[i*num_idof+k] = dataA[j];
+         {
+            Aii[i * num_idof + k] = dataA[j];
+         }
       }
 
    /* Perform Gaussian elimination in [Aii, Pi] */
-   for (j = 0; j < num_idof-1; j++)
-      if (Aii[j*num_idof+j] != 0.0)
-         for (i = j+1; i < num_idof; i++)
-            if (Aii[i*num_idof+j] != 0.0)
+   for (j = 0; j < num_idof - 1; j++)
+      if (Aii[j * num_idof + j] != 0.0)
+         for (i = j + 1; i < num_idof; i++)
+            if (Aii[i * num_idof + j] != 0.0)
             {
-               factor = Aii[i*num_idof+j]/Aii[j*num_idof+j];
-               for (m = j+1; m < num_idof; m++)
-                  Aii[i*num_idof+m] -= factor * Aii[j*num_idof+m];
+               factor = Aii[i * num_idof + j] / Aii[j * num_idof + j];
+               for (m = j + 1; m < num_idof; m++)
+               {
+                  Aii[i * num_idof + m] -= factor * Aii[j * num_idof + m];
+               }
                for (m = 0; m < num_DOF; m++)
-                  Pi[i*num_DOF+m] -= factor * Pi[j*num_DOF+m];
+               {
+                  Pi[i * num_DOF + m] -= factor * Pi[j * num_DOF + m];
+               }
             }
 
    /* Back Substitution */
-   for (i = num_idof-1; i >= 0; i--)
+   for (i = num_idof - 1; i >= 0; i--)
    {
-      for (j = i+1; j < num_idof; j++)
-         if (Aii[i*num_idof+j] != 0.0)
+      for (j = i + 1; j < num_idof; j++)
+         if (Aii[i * num_idof + j] != 0.0)
             for (m = 0; m < num_DOF; m++)
-               Pi[i*num_DOF+m] -= Aii[i*num_idof+j] * Pi[j*num_DOF+m];
+            {
+               Pi[i * num_DOF + m] -= Aii[i * num_idof + j] * Pi[j * num_DOF + m];
+            }
 
       for (m = 0; m < num_DOF; m++)
-         Pi[i*num_DOF+m] /= Aii[i*num_idof+i];
+      {
+         Pi[i * num_DOF + m] /= Aii[i * num_idof + i];
+      }
    }
 
    /* Put -Pi back in P. We assume that each idof depends on _all_ DOFs */
@@ -432,7 +463,7 @@ HYPRE_Int hypre_HarmonicExtension (hypre_CSRMatrix *A,
       for (j = 0; j < num_DOF; j++)
       {
          JP[j]    = DOF[j];
-         dataP[j] = -Pi[i*num_DOF+j];
+         dataP[j] = -Pi[i * num_DOF + j];
       }
 
    hypre_TFree(Aii, HYPRE_MEMORY_HOST);
diff --git a/external/hypre/src/sstruct_ls/nd1_amge_interpolation.h b/external/hypre/src/sstruct_ls/nd1_amge_interpolation.h
index bfc27000..049b33a8 100644
--- a/external/hypre/src/sstruct_ls/nd1_amge_interpolation.h
+++ b/external/hypre/src/sstruct_ls/nd1_amge_interpolation.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -32,14 +32,14 @@
   Note: If FACE_iedge == EDGE_iedge the input should describe a 2D problem.
 */
 HYPRE_Int hypre_ND1AMGeInterpolation (hypre_ParCSRMatrix * Aee,
-                                hypre_ParCSRMatrix * ELEM_iedge,
-                                hypre_ParCSRMatrix * FACE_iedge,
-                                hypre_ParCSRMatrix * EDGE_iedge,
-                                hypre_ParCSRMatrix * ELEM_FACE,
-                                hypre_ParCSRMatrix * ELEM_EDGE,
-                                HYPRE_Int            num_OffProcRows,
-                                hypre_MaxwellOffProcRow ** OffProcRows,
-                                hypre_IJMatrix     * edge_EDGE);
+                                      hypre_ParCSRMatrix * ELEM_iedge,
+                                      hypre_ParCSRMatrix * FACE_iedge,
+                                      hypre_ParCSRMatrix * EDGE_iedge,
+                                      hypre_ParCSRMatrix * ELEM_FACE,
+                                      hypre_ParCSRMatrix * ELEM_EDGE,
+                                      HYPRE_Int            num_OffProcRows,
+                                      hypre_MaxwellOffProcRow ** OffProcRows,
+                                      hypre_IJMatrix     * edge_EDGE);
 
 /*
   Function: hypre_HarmonicExtension
@@ -54,9 +54,9 @@ HYPRE_Int hypre_ND1AMGeInterpolation (hypre_ParCSRMatrix * Aee,
   according to the arrays idof and bdof. The only output parameter is Pi.
 */
 HYPRE_Int hypre_HarmonicExtension (hypre_CSRMatrix *A,
-                             hypre_CSRMatrix *P,
-                             HYPRE_Int num_DOF, HYPRE_BigInt *DOF,
-                             HYPRE_Int num_idof, HYPRE_BigInt *idof,
-                             HYPRE_Int num_bdof, HYPRE_BigInt *bdof);
+                                   hypre_CSRMatrix *P,
+                                   HYPRE_Int num_DOF, HYPRE_BigInt *DOF,
+                                   HYPRE_Int num_idof, HYPRE_BigInt *idof,
+                                   HYPRE_Int num_bdof, HYPRE_BigInt *bdof);
 
 #endif
diff --git a/external/hypre/src/sstruct_ls/node_relax.c b/external/hypre/src/sstruct_ls/node_relax.c
index 358b35ca..1f9c1bfe 100644
--- a/external/hypre/src/sstruct_ls/node_relax.c
+++ b/external/hypre/src/sstruct_ls/node_relax.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -43,7 +43,7 @@ typedef struct
 
    /* defines sends and recieves for each struct_vector */
    hypre_ComputePkg     ***svec_compute_pkgs;
-   hypre_CommHandle     **comm_handle;
+   hypre_CommHandle      **comm_handle;
 
    /* defines independent and dependent boxes for computations */
    hypre_ComputePkg      **compute_pkgs;
@@ -55,11 +55,11 @@ typedef struct
    */
 
    /* pointers for vector and matrix data */
-   HYPRE_Real          **Ap;
-   HYPRE_Real          **bp;
-   HYPRE_Real          **xp;
-   HYPRE_Real          **tp;
-
+   HYPRE_MemoryLocation    memory_location;
+   HYPRE_Real            **Ap;
+   HYPRE_Real            **bp;
+   HYPRE_Real            **xp;
+   HYPRE_Real            **tp;
 
    /* log info (always logged) */
    HYPRE_Int               num_iterations;
@@ -76,8 +76,8 @@ hypre_NodeRelaxCreate( MPI_Comm  comm )
 {
    hypre_NodeRelaxData *relax_data;
 
-   hypre_Index           stride;
-   hypre_Index           indices[1];
+   hypre_Index          stride;
+   hypre_Index          indices[1];
 
    relax_data = hypre_CTAlloc(hypre_NodeRelaxData,  1, HYPRE_MEMORY_HOST);
 
@@ -106,7 +106,7 @@ hypre_NodeRelaxCreate( MPI_Comm  comm )
    (relax_data -> xp)               = NULL;
    (relax_data -> tp)               = NULL;
    (relax_data -> comm_handle)      = NULL;
-   (relax_data -> svec_compute_pkgs)= NULL;
+   (relax_data -> svec_compute_pkgs) = NULL;
    (relax_data -> compute_pkgs)     = NULL;
 
    hypre_SetIndex3(stride, 1, 1, 1);
@@ -124,12 +124,15 @@ HYPRE_Int
 hypre_NodeRelaxDestroy( void *relax_vdata )
 {
    hypre_NodeRelaxData  *relax_data = (hypre_NodeRelaxData  *)relax_vdata;
-   HYPRE_Int             i,vi;
+   HYPRE_Int             i, vi;
    HYPRE_Int             nvars;
 
    if (relax_data)
    {
+      HYPRE_MemoryLocation memory_location = relax_data -> memory_location;
+
       nvars = hypre_SStructPMatrixNVars(relax_data -> A);
+
       for (i = 0; i < (relax_data -> num_nodesets); i++)
       {
          hypre_TFree(relax_data -> nodeset_indices[i], HYPRE_MEMORY_HOST);
@@ -152,13 +155,13 @@ hypre_NodeRelaxDestroy( void *relax_vdata )
       hypre_TFree(relax_data -> compute_pkgs, HYPRE_MEMORY_HOST);
       hypre_SStructPVectorDestroy(relax_data -> t);
       /*
-      hypre_TFree(relax_data -> x_loc, HYPRE_MEMORY_DEVICE);
-      hypre_TFree(relax_data -> A_loc, HYPRE_MEMORY_DEVICE);
+      hypre_TFree(relax_data -> x_loc, memory_location);
+      hypre_TFree(relax_data -> A_loc, memory_location);
       */
-      hypre_TFree(relax_data -> bp, HYPRE_MEMORY_DEVICE);
-      hypre_TFree(relax_data -> xp, HYPRE_MEMORY_DEVICE);
-      hypre_TFree(relax_data -> tp, HYPRE_MEMORY_DEVICE);
-      hypre_TFree(relax_data -> Ap, HYPRE_MEMORY_DEVICE);
+      hypre_TFree(relax_data -> bp, memory_location);
+      hypre_TFree(relax_data -> xp, memory_location);
+      hypre_TFree(relax_data -> tp, memory_location);
+      hypre_TFree(relax_data -> Ap, memory_location);
       for (vi = 0; vi < nvars; vi++)
       {
          hypre_TFree((relax_data -> diag_rank)[vi], HYPRE_MEMORY_HOST);
@@ -239,6 +242,8 @@ hypre_NodeRelaxSetup(  void                 *relax_vdata,
    HYPRE_Int              nvars;
    HYPRE_Int              dim;
 
+   HYPRE_MemoryLocation   memory_location;
+
    /*----------------------------------------------------------
     * Set up the temp vector
     *----------------------------------------------------------*/
@@ -261,7 +266,7 @@ hypre_NodeRelaxSetup(  void                 *relax_vdata,
 
    hypre_assert(nvars <= HYPRE_MAXVARS);
 
-   diag_rank = hypre_CTAlloc(HYPRE_Int *,  nvars, HYPRE_MEMORY_HOST);
+   diag_rank = hypre_CTAlloc(HYPRE_Int *, nvars, HYPRE_MEMORY_HOST);
    for (vi = 0; vi < nvars; vi++)
    {
       diag_rank[vi] = hypre_CTAlloc(HYPRE_Int,  nvars, HYPRE_MEMORY_HOST);
@@ -280,20 +285,22 @@ hypre_NodeRelaxSetup(  void                 *relax_vdata,
       }
    }
 
+   memory_location = hypre_StructMatrixMemoryLocation(hypre_SStructPMatrixSMatrix(A, 0, 0));
+
    /*----------------------------------------------------------
     * Allocate storage used to invert local diagonal blocks
     *----------------------------------------------------------*/
    /*
    i = hypre_NumThreads();
-   x_loc = hypre_TAlloc(HYPRE_Real  , i*nvars,       HYPRE_MEMORY_DEVICE);
-   A_loc = hypre_TAlloc(HYPRE_Real  , i*nvars*nvars, HYPRE_MEMORY_DEVICE);
+   x_loc = hypre_TAlloc(HYPRE_Real  , i*nvars,       memory_location);
+   A_loc = hypre_TAlloc(HYPRE_Real  , i*nvars*nvars, memory_location);
    */
 
    /* Allocate pointers for vector and matrix */
-   bp = hypre_TAlloc(HYPRE_Real *, nvars,       HYPRE_MEMORY_DEVICE);
-   xp = hypre_TAlloc(HYPRE_Real *, nvars,       HYPRE_MEMORY_DEVICE);
-   tp = hypre_TAlloc(HYPRE_Real *, nvars,       HYPRE_MEMORY_DEVICE);
-   Ap = hypre_TAlloc(HYPRE_Real *, nvars*nvars, HYPRE_MEMORY_DEVICE);
+   bp = hypre_TAlloc(HYPRE_Real *, nvars, memory_location);
+   xp = hypre_TAlloc(HYPRE_Real *, nvars, memory_location);
+   tp = hypre_TAlloc(HYPRE_Real *, nvars, memory_location);
+   Ap = hypre_TAlloc(HYPRE_Real *, nvars * nvars, memory_location);
 
    /*----------------------------------------------------------
     * Set up the compute packages for each nodeset
@@ -341,7 +348,7 @@ hypre_NodeRelaxSetup(  void                 *relax_vdata,
             {
                for (vj = 0; vj < nvars; vj++)
                {
-                  if (hypre_SStructPMatrixSMatrix(A,vj,i) != NULL)
+                  if (hypre_SStructPMatrixSMatrix(A, vj, i) != NULL)
                   {
                      sstencil = hypre_SStructPMatrixSStencil(A, vj, i);
                      sstencil_union_count += hypre_StructStencilSize(sstencil);
@@ -353,7 +360,7 @@ hypre_NodeRelaxSetup(  void                 *relax_vdata,
          {
             for (vj = 0; vj < nvars; vj++)
             {
-               if (hypre_SStructPMatrixSMatrix(A,vj,vi) != NULL)
+               if (hypre_SStructPMatrixSMatrix(A, vj, vi) != NULL)
                {
                   sstencil = hypre_SStructPMatrixSStencil(A, vj, vi);
                   sstencil_union_count += hypre_StructStencilSize(sstencil);
@@ -369,7 +376,7 @@ hypre_NodeRelaxSetup(  void                 *relax_vdata,
             {
                for (vj = 0; vj < nvars; vj++)
                {
-                  if (hypre_SStructPMatrixSMatrix(A,vj,i) != NULL)
+                  if (hypre_SStructPMatrixSMatrix(A, vj, i) != NULL)
                   {
                      sstencil = hypre_SStructPMatrixSStencil(A, vj, i);
                      sstencil_size = hypre_StructStencilSize(sstencil);
@@ -388,7 +395,7 @@ hypre_NodeRelaxSetup(  void                 *relax_vdata,
          {
             for (vj = 0; vj < nvars; vj++)
             {
-               if (hypre_SStructPMatrixSMatrix(A,vj,vi) != NULL)
+               if (hypre_SStructPMatrixSMatrix(A, vj, vi) != NULL)
                {
                   sstencil = hypre_SStructPMatrixSStencil(A, vj, vi);
                   sstencil_size = hypre_StructStencilSize(sstencil);
@@ -415,7 +422,7 @@ hypre_NodeRelaxSetup(  void                 *relax_vdata,
 
          for (compute_i = 0; compute_i < 2; compute_i++)
          {
-            switch(compute_i)
+            switch (compute_i)
             {
                case 0:
                   box_aa = orig_indt_boxes;
@@ -454,7 +461,7 @@ hypre_NodeRelaxSetup(  void                 *relax_vdata,
                }
             }
 
-            switch(compute_i)
+            switch (compute_i)
             {
                case 0:
                   hypre_ComputeInfoIndtBoxes(compute_info) = new_box_aa;
@@ -472,14 +479,14 @@ hypre_NodeRelaxSetup(  void                 *relax_vdata,
          {
             hypre_ComputePkgCreate(compute_info,
                                    hypre_StructVectorDataSpace(
-                                   hypre_SStructPVectorSVector(x, 0)),
+                                      hypre_SStructPVectorSVector(x, 0)),
                                    1, sgrid, &compute_pkgs[p]);
          }
          else
          {
             hypre_ComputePkgCreate(compute_info,
                                    hypre_StructVectorDataSpace(
-                                   hypre_SStructPVectorSVector(x, vi)),
+                                      hypre_SStructPVectorSVector(x, vi)),
                                    1, sgrid, &svec_compute_pkgs[p][vi]);
          }
 
@@ -507,6 +514,7 @@ hypre_NodeRelaxSetup(  void                 *relax_vdata,
    (relax_data -> bp)    = bp;
    (relax_data -> tp)    = tp;
    (relax_data -> xp)    = xp;
+   (relax_data -> memory_location) = memory_location;
    (relax_data -> compute_pkgs) = compute_pkgs;
    (relax_data -> svec_compute_pkgs) = svec_compute_pkgs;
    (relax_data -> comm_handle) = comm_handle;
@@ -525,9 +533,9 @@ hypre_NodeRelaxSetup(  void                 *relax_vdata,
       scale += (nodeset_sizes[p] / frac);
    }
    /* REALLY Rough Estimate = num_nodes * nvar^3 */
-   (relax_data -> flops) = scale * nvars * nvars * nvars *
-                           hypre_StructVectorGlobalSize(
-                                 hypre_SStructPVectorSVector(x,0) );
+   (relax_data -> flops) = (HYPRE_Int)(scale * nvars * nvars * nvars *
+                                       hypre_StructVectorGlobalSize(
+                                          hypre_SStructPVectorSVector(x, 0) ) );
 
    return hypre_error_flag;
 }
@@ -541,55 +549,52 @@ hypre_NodeRelax(  void                 *relax_vdata,
                   hypre_SStructPVector *b,
                   hypre_SStructPVector *x           )
 {
-   hypre_NodeRelaxData   *relax_data = (hypre_NodeRelaxData  *)relax_vdata;
-
-   HYPRE_Int              max_iter         = (relax_data -> max_iter);
-   HYPRE_Int              zero_guess       = (relax_data -> zero_guess);
-   HYPRE_Real             weight           = (relax_data -> weight);
-   HYPRE_Int              num_nodesets     = (relax_data -> num_nodesets);
-   HYPRE_Int             *nodeset_ranks    = (relax_data -> nodeset_ranks);
-   hypre_Index           *nodeset_strides  = (relax_data -> nodeset_strides);
-   hypre_SStructPVector  *t                = (relax_data -> t);
-   HYPRE_Int            **diag_rank        = (relax_data -> diag_rank);
-   hypre_ComputePkg     **compute_pkgs     = (relax_data -> compute_pkgs);
-   hypre_ComputePkg    ***svec_compute_pkgs= (relax_data ->
-                                              svec_compute_pkgs);
-   hypre_CommHandle     **comm_handle      = (relax_data -> comm_handle);
-
-   hypre_ComputePkg      *compute_pkg;
-   hypre_ComputePkg      *svec_compute_pkg;
-
-   hypre_BoxArrayArray   *compute_box_aa;
-   hypre_BoxArray        *compute_box_a;
-   hypre_Box             *compute_box;
-
-   hypre_Box             *A_data_box;
-   hypre_Box             *b_data_box;
-   hypre_Box             *x_data_box;
-   hypre_Box             *t_data_box;
+   hypre_NodeRelaxData  *relax_data        = (hypre_NodeRelaxData  *)relax_vdata;
+
+   HYPRE_Int             max_iter          = (relax_data -> max_iter);
+   HYPRE_Int             zero_guess        = (relax_data -> zero_guess);
+   HYPRE_Real            weight            = (relax_data -> weight);
+   HYPRE_Int             num_nodesets      = (relax_data -> num_nodesets);
+   HYPRE_Int            *nodeset_ranks     = (relax_data -> nodeset_ranks);
+   hypre_Index          *nodeset_strides   = (relax_data -> nodeset_strides);
+   hypre_SStructPVector *t                 = (relax_data -> t);
+   HYPRE_Int           **diag_rank         = (relax_data -> diag_rank);
+   hypre_ComputePkg    **compute_pkgs      = (relax_data -> compute_pkgs);
+   hypre_ComputePkg   ***svec_compute_pkgs = (relax_data ->svec_compute_pkgs);
+   hypre_CommHandle    **comm_handle       = (relax_data -> comm_handle);
+
+   hypre_ComputePkg     *compute_pkg;
+   hypre_ComputePkg     *svec_compute_pkg;
+
+   hypre_BoxArrayArray  *compute_box_aa;
+   hypre_BoxArray       *compute_box_a;
+   hypre_Box            *compute_box;
+   hypre_Box            *A_data_box;
+   hypre_Box            *b_data_box;
+   hypre_Box            *x_data_box;
+   hypre_Box            *t_data_box;
 
    /*
-   HYPRE_Real            *tA_loc = (relax_data -> A_loc);
-   HYPRE_Real            *tx_loc = (relax_data -> x_loc);
+   HYPRE_Real           *tA_loc = (relax_data -> A_loc);
+   HYPRE_Real           *tx_loc = (relax_data -> x_loc);
    */
-
-   HYPRE_Real           **Ap = (relax_data -> Ap);
-   HYPRE_Real           **bp = (relax_data -> bp);
-   HYPRE_Real           **xp = (relax_data -> xp);
-   HYPRE_Real           **tp = (relax_data -> tp);
-
-   HYPRE_Real            *_h_Ap[HYPRE_MAXVARS * HYPRE_MAXVARS];
-   HYPRE_Real            *_h_bp[HYPRE_MAXVARS];
-   HYPRE_Real            *_h_xp[HYPRE_MAXVARS];
-   HYPRE_Real            *_h_tp[HYPRE_MAXVARS];
-
-   HYPRE_Real           **h_Ap;
-   HYPRE_Real           **h_bp;
-   HYPRE_Real           **h_xp;
-   HYPRE_Real           **h_tp;
+   HYPRE_Real          **Ap = (relax_data -> Ap);
+   HYPRE_Real          **bp = (relax_data -> bp);
+   HYPRE_Real          **xp = (relax_data -> xp);
+   HYPRE_Real          **tp = (relax_data -> tp);
+   HYPRE_Real           *_h_Ap[HYPRE_MAXVARS * HYPRE_MAXVARS];
+   HYPRE_Real           *_h_bp[HYPRE_MAXVARS];
+   HYPRE_Real           *_h_xp[HYPRE_MAXVARS];
+   HYPRE_Real           *_h_tp[HYPRE_MAXVARS];
+   HYPRE_Real          **h_Ap;
+   HYPRE_Real          **h_bp;
+   HYPRE_Real          **h_xp;
+   HYPRE_Real          **h_tp;
+
+   HYPRE_MemoryLocation  memory_location = relax_data -> memory_location;
 
    /* Ap, bp, xp, tp are device pointers */
-   if (hypre_GetActualMemLocation(HYPRE_MEMORY_DEVICE) != hypre_MEMORY_HOST)
+   if (hypre_GetExecPolicy1(memory_location) == HYPRE_EXEC_DEVICE)
    {
       h_Ap = _h_Ap;
       h_bp = _h_bp;
@@ -671,7 +676,7 @@ hypre_NodeRelax(  void                 *relax_vdata,
 
       for (compute_i = 0; compute_i < 2; compute_i++)
       {
-         switch(compute_i)
+         switch (compute_i)
          {
             case 0:
             {
@@ -691,42 +696,42 @@ hypre_NodeRelax(  void                 *relax_vdata,
             compute_box_a = hypre_BoxArrayArrayBoxArray(compute_box_aa, i);
 
             A_data_box = hypre_BoxArrayBox(hypre_StructMatrixDataSpace(
-                                           hypre_SStructPMatrixSMatrix(A,0,0)), i);
+                                              hypre_SStructPMatrixSMatrix(A, 0, 0)), i);
             b_data_box = hypre_BoxArrayBox(hypre_StructVectorDataSpace(
-                                           hypre_SStructPVectorSVector(b,0)), i);
+                                              hypre_SStructPVectorSVector(b, 0)), i);
             x_data_box = hypre_BoxArrayBox(hypre_StructVectorDataSpace(
-                                           hypre_SStructPVectorSVector(x,0)), i);
+                                              hypre_SStructPVectorSVector(x, 0)), i);
 
             for (vi = 0; vi < nvars; vi++)
             {
                for (vj = 0; vj < nvars; vj++)
                {
-                  if (hypre_SStructPMatrixSMatrix(A,vi,vj) != NULL)
+                  if (hypre_SStructPMatrixSMatrix(A, vi, vj) != NULL)
                   {
-                     h_Ap[vi*nvars+vj] = hypre_StructMatrixBoxData( hypre_SStructPMatrixSMatrix(A,vi,vj),
-                                                                    i, diag_rank[vi][vj] );
+                     h_Ap[vi * nvars + vj] = hypre_StructMatrixBoxData( hypre_SStructPMatrixSMatrix(A, vi, vj),
+                                                                        i, diag_rank[vi][vj] );
                   }
                   else
                   {
-                     h_Ap[vi*nvars+vj] = NULL;
+                     h_Ap[vi * nvars + vj] = NULL;
                   }
                }
-               h_bp[vi] = hypre_StructVectorBoxData( hypre_SStructPVectorSVector(b,vi), i );
-               h_xp[vi] = hypre_StructVectorBoxData( hypre_SStructPVectorSVector(x,vi), i );
+               h_bp[vi] = hypre_StructVectorBoxData( hypre_SStructPVectorSVector(b, vi), i );
+               h_xp[vi] = hypre_StructVectorBoxData( hypre_SStructPVectorSVector(x, vi), i );
             }
 
-            if (hypre_GetActualMemLocation(HYPRE_MEMORY_DEVICE) != hypre_MEMORY_HOST)
+            if (hypre_GetExecPolicy1(memory_location) == HYPRE_EXEC_DEVICE)
             {
-               hypre_Memcpy(Ap, h_Ap, nvars*nvars*sizeof(HYPRE_Real*), HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
-               hypre_Memcpy(bp, h_bp,       nvars*sizeof(HYPRE_Real*), HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
-               hypre_Memcpy(xp, h_xp,       nvars*sizeof(HYPRE_Real*), HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
+               hypre_TMemcpy(Ap, h_Ap, HYPRE_Real *, nvars * nvars, memory_location, HYPRE_MEMORY_HOST);
+               hypre_TMemcpy(bp, h_bp, HYPRE_Real *, nvars, memory_location, HYPRE_MEMORY_HOST);
+               hypre_TMemcpy(xp, h_xp, HYPRE_Real *, nvars, memory_location, HYPRE_MEMORY_HOST);
             }
 
             hypre_ForBoxI(j, compute_box_a)
             {
                compute_box = hypre_BoxArrayBox(compute_box_a, j);
 
-               start  = hypre_BoxIMin(compute_box);
+               start = hypre_BoxIMin(compute_box);
                hypre_BoxGetStrideSize(compute_box, stride, loop_size);
 
 #define DEVICE_VAR is_device_ptr(bp,Ap,xp)
@@ -738,8 +743,8 @@ hypre_NodeRelax(  void                 *relax_vdata,
                   HYPRE_Int vi, vj, err;
                   //HYPRE_Real *A_loc = tA_loc + hypre_BoxLoopBlock() * nvars * nvars;
                   //HYPRE_Real *x_loc = tx_loc + hypre_BoxLoopBlock() * nvars;
-                  HYPRE_Real A_loc[HYPRE_MAXVARS * HYPRE_MAXVARS];
-                  HYPRE_Real x_loc[HYPRE_MAXVARS];
+                  HYPRE_Real A_loc[HYPRE_MAXVARS * HYPRE_MAXVARS] = {0};
+                  HYPRE_Real x_loc[HYPRE_MAXVARS] = {0};
                   /*------------------------------------------------
                    * Copy rhs and matrix for diagonal coupling
                    * (intra-nodal) into local storage.
@@ -750,8 +755,8 @@ hypre_NodeRelax(  void                 *relax_vdata,
                      x_loc[vi] = bpi[bi];
                      for (vj = 0; vj < nvars; vj++)
                      {
-                        HYPRE_Real *Apij = Ap[vi*nvars+vj];
-                        A_loc[vi*nvars+vj] = Apij ? Apij[Ai] : 0.0;
+                        HYPRE_Real *Apij = Ap[vi * nvars + vj];
+                        A_loc[vi * nvars + vj] = Apij ? Apij[Ai] : 0.0;
                      }
                   }
 
@@ -759,6 +764,9 @@ hypre_NodeRelax(  void                 *relax_vdata,
                    * Invert intra-nodal coupling
                    *----------------------------------------------*/
                   hypre_gselim(A_loc, x_loc, nvars, err);
+                  (void) err;
+                  /* TODO (VPM): need a way to check error codes on device */
+
                   /*------------------------------------------------
                    * Copy solution from local storage.
                    *----------------------------------------------*/
@@ -797,13 +805,13 @@ hypre_NodeRelax(  void                 *relax_vdata,
 
       for (compute_i = 0; compute_i < 2; compute_i++)
       {
-         switch(compute_i)
+         switch (compute_i)
          {
             case 0:
             {
                for (vi = 0; vi < nvars; vi++)
                {
-                  x_block = hypre_SStructPVectorSVector(x,vi);
+                  x_block = hypre_SStructPVectorSVector(x, vi);
                   h_xp[vi] = hypre_StructVectorData(x_block);
                   svec_compute_pkg = svec_compute_pkgs[nodeset][vi];
                   hypre_InitializeIndtComputations(svec_compute_pkg,
@@ -829,24 +837,24 @@ hypre_NodeRelax(  void                 *relax_vdata,
             compute_box_a = hypre_BoxArrayArrayBoxArray(compute_box_aa, i);
 
             A_data_box = hypre_BoxArrayBox( hypre_StructMatrixDataSpace(
-                                            hypre_SStructPMatrixSMatrix(A,0,0)), i );
+                                               hypre_SStructPMatrixSMatrix(A, 0, 0)), i );
             b_data_box = hypre_BoxArrayBox( hypre_StructVectorDataSpace(
-                                            hypre_SStructPVectorSVector(b,0)), i );
+                                               hypre_SStructPVectorSVector(b, 0)), i );
             x_data_box = hypre_BoxArrayBox( hypre_StructVectorDataSpace(
-                                            hypre_SStructPVectorSVector(x,0)), i );
+                                               hypre_SStructPVectorSVector(x, 0)), i );
             t_data_box = hypre_BoxArrayBox( hypre_StructVectorDataSpace(
-                                            hypre_SStructPVectorSVector(t,0)), i );
+                                               hypre_SStructPVectorSVector(t, 0)), i );
 
             for (vi = 0; vi < nvars; vi++)
             {
-               h_bp[vi] = hypre_StructVectorBoxData( hypre_SStructPVectorSVector(b,vi), i );
-               h_tp[vi] = hypre_StructVectorBoxData( hypre_SStructPVectorSVector(t,vi), i );
+               h_bp[vi] = hypre_StructVectorBoxData( hypre_SStructPVectorSVector(b, vi), i );
+               h_tp[vi] = hypre_StructVectorBoxData( hypre_SStructPVectorSVector(t, vi), i );
             }
 
-            if (hypre_GetActualMemLocation(HYPRE_MEMORY_DEVICE) != hypre_MEMORY_HOST)
+            if (hypre_GetExecPolicy1(memory_location) == HYPRE_EXEC_DEVICE)
             {
-               hypre_Memcpy(bp, h_bp, nvars*sizeof(HYPRE_Real*), HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
-               hypre_Memcpy(tp, h_tp, nvars*sizeof(HYPRE_Real*), HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
+               hypre_TMemcpy(bp, h_bp, HYPRE_Real *, nvars, memory_location, HYPRE_MEMORY_HOST);
+               hypre_TMemcpy(tp, h_tp, HYPRE_Real *, nvars, memory_location, HYPRE_MEMORY_HOST);
             }
 
             hypre_ForBoxI(j, compute_box_a)
@@ -877,10 +885,10 @@ hypre_NodeRelax(  void                 *relax_vdata,
                {
                   for (vj = 0; vj < nvars; vj++)
                   {
-                     if (hypre_SStructPMatrixSMatrix(A,vi,vj) != NULL)
+                     if (hypre_SStructPMatrixSMatrix(A, vi, vj) != NULL)
                      {
-                        A_block = hypre_SStructPMatrixSMatrix(A,vi,vj);
-                        x_block = hypre_SStructPVectorSVector(x,vj);
+                        A_block = hypre_SStructPMatrixSMatrix(A, vi, vj);
+                        x_block = hypre_SStructPVectorSVector(x, vj);
                         stencil = hypre_StructMatrixStencil(A_block);
                         stencil_shape = hypre_StructStencilShape(stencil);
                         stencil_size  = hypre_StructStencilSize(stencil);
@@ -913,21 +921,21 @@ hypre_NodeRelax(  void                 *relax_vdata,
                {
                   for (vj = 0; vj < nvars; vj++)
                   {
-                     if (hypre_SStructPMatrixSMatrix(A,vi,vj) != NULL)
+                     if (hypre_SStructPMatrixSMatrix(A, vi, vj) != NULL)
                      {
-                        h_Ap[vi*nvars+vj] = hypre_StructMatrixBoxData( hypre_SStructPMatrixSMatrix(A,vi,vj),
-                                                                       i, diag_rank[vi][vj]);
+                        h_Ap[vi * nvars + vj] = hypre_StructMatrixBoxData( hypre_SStructPMatrixSMatrix(A, vi, vj),
+                                                                           i, diag_rank[vi][vj]);
                      }
                      else
                      {
-                        h_Ap[vi*nvars+vj] = NULL;
+                        h_Ap[vi * nvars + vj] = NULL;
                      }
                   }
                }
 
-               if (hypre_GetActualMemLocation(HYPRE_MEMORY_DEVICE) != hypre_MEMORY_HOST)
+               if (hypre_GetExecPolicy1(memory_location) == HYPRE_EXEC_DEVICE)
                {
-                  hypre_Memcpy(Ap, h_Ap, nvars*nvars*sizeof(HYPRE_Real*), HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
+                  hypre_TMemcpy(Ap, h_Ap, HYPRE_Real *, nvars * nvars, memory_location, HYPRE_MEMORY_HOST);
                }
 
 #define DEVICE_VAR is_device_ptr(tp,Ap)
@@ -940,8 +948,8 @@ hypre_NodeRelax(  void                 *relax_vdata,
                   HYPRE_Real *A_loc = tA_loc + hypre_BoxLoopBlock() * nvars * nvars;
                   HYPRE_Real *x_loc = tx_loc + hypre_BoxLoopBlock() * nvars;
                   */
-                  HYPRE_Real A_loc[HYPRE_MAXVARS * HYPRE_MAXVARS];
-                  HYPRE_Real x_loc[HYPRE_MAXVARS];
+                  HYPRE_Real A_loc[HYPRE_MAXVARS * HYPRE_MAXVARS] = {0};
+                  HYPRE_Real x_loc[HYPRE_MAXVARS] = {0};
 
                   /*------------------------------------------------
                    * Copy rhs and matrix for diagonal coupling
@@ -953,8 +961,8 @@ hypre_NodeRelax(  void                 *relax_vdata,
                      x_loc[vi] = tpi[ti];
                      for (vj = 0; vj < nvars; vj++)
                      {
-                        HYPRE_Real *Apij = Ap[vi*nvars+vj];
-                        A_loc[vi*nvars+vj] = Apij ? Apij[Ai] : 0.0;
+                        HYPRE_Real *Apij = Ap[vi * nvars + vj];
+                        A_loc[vi * nvars + vj] = Apij ? Apij[Ai] : 0.0;
                      }
                   }
 
@@ -962,6 +970,8 @@ hypre_NodeRelax(  void                 *relax_vdata,
                    * Invert intra-nodal coupling
                    *----------------------------------------------*/
                   hypre_gselim(A_loc, x_loc, nvars, err);
+                  (void) err;
+
                   /*------------------------------------------------
                    * Copy solution from local storage.
                    *----------------------------------------------*/
@@ -1157,4 +1167,3 @@ hypre_NodeRelaxSetTempVec( void                 *relax_vdata,
 
    return hypre_error_flag;
 }
-
diff --git a/external/hypre/src/sstruct_ls/sstruct_amr_intercommunication.c b/external/hypre/src/sstruct_ls/sstruct_amr_intercommunication.c
index 14a130ab..5cb5ce1a 100644
--- a/external/hypre/src/sstruct_ls/sstruct_amr_intercommunication.c
+++ b/external/hypre/src/sstruct_ls/sstruct_amr_intercommunication.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -44,21 +44,22 @@ hypre_SStructAMRInterCommunication( hypre_SStructSendInfoData *sendinfo,
     *  The communication info is copied from sendinfo & recvinfo.
     *------------------------------------------------------------------------*/
    sendboxes  = hypre_BoxArrayArrayDuplicate(sendinfo -> send_boxes);
-   send_rboxes= hypre_BoxArrayArrayDuplicate(sendinfo -> send_boxes);
+   send_rboxes = hypre_BoxArrayArrayDuplicate(sendinfo -> send_boxes);
 
    sprocesses   = hypre_CTAlloc(HYPRE_Int *,  hypre_BoxArrayArraySize(send_rboxes), HYPRE_MEMORY_HOST);
-   send_rboxnums= hypre_CTAlloc(HYPRE_Int *,  hypre_BoxArrayArraySize(send_rboxes), HYPRE_MEMORY_HOST);
+   send_rboxnums = hypre_CTAlloc(HYPRE_Int *,  hypre_BoxArrayArraySize(send_rboxes),
+                                 HYPRE_MEMORY_HOST);
 
    hypre_ForBoxArrayI(i, sendboxes)
    {
-      boxarray= hypre_BoxArrayArrayBoxArray(sendboxes, i);
+      boxarray = hypre_BoxArrayArrayBoxArray(sendboxes, i);
       sprocesses[i]   = hypre_CTAlloc(HYPRE_Int,  hypre_BoxArraySize(boxarray), HYPRE_MEMORY_HOST);
-      send_rboxnums[i]= hypre_CTAlloc(HYPRE_Int,  hypre_BoxArraySize(boxarray), HYPRE_MEMORY_HOST);
+      send_rboxnums[i] = hypre_CTAlloc(HYPRE_Int,  hypre_BoxArraySize(boxarray), HYPRE_MEMORY_HOST);
 
       hypre_ForBoxI(j, boxarray)
       {
          sprocesses[i][j]   = (sendinfo -> send_procs)[i][j];
-         send_rboxnums[i][j]= (sendinfo -> send_remote_boxnums)[i][j];
+         send_rboxnums[i][j] = (sendinfo -> send_remote_boxnums)[i][j];
       }
    }
 
@@ -71,9 +72,9 @@ hypre_SStructAMRInterCommunication( hypre_SStructSendInfoData *sendinfo,
 
    hypre_ForBoxArrayI(i, recvboxes)
    {
-      boxarray= hypre_BoxArrayArrayBoxArray(recvboxes, i);
-      rprocesses[i]= hypre_CTAlloc(HYPRE_Int,  hypre_BoxArraySize(boxarray), HYPRE_MEMORY_HOST);
-      recv_rboxnums[i]= hypre_CTAlloc(HYPRE_Int,  hypre_BoxArraySize(boxarray), HYPRE_MEMORY_HOST);
+      boxarray = hypre_BoxArrayArrayBoxArray(recvboxes, i);
+      rprocesses[i] = hypre_CTAlloc(HYPRE_Int,  hypre_BoxArraySize(boxarray), HYPRE_MEMORY_HOST);
+      recv_rboxnums[i] = hypre_CTAlloc(HYPRE_Int,  hypre_BoxArraySize(boxarray), HYPRE_MEMORY_HOST);
 
       hypre_ForBoxI(j, boxarray)
       {
@@ -93,7 +94,7 @@ hypre_SStructAMRInterCommunication( hypre_SStructSendInfoData *sendinfo,
                        &comm_pkg);
    hypre_CommInfoDestroy(comm_info);
 
-  *comm_pkg_ptr = comm_pkg;
+   *comm_pkg_ptr = comm_pkg;
 
    return ierr;
 }
diff --git a/external/hypre/src/sstruct_ls/sstruct_owninfo.c b/external/hypre/src/sstruct_ls/sstruct_owninfo.c
index c56240fb..c3df9fd7 100644
--- a/external/hypre/src/sstruct_ls/sstruct_owninfo.c
+++ b/external/hypre/src/sstruct_ls/sstruct_owninfo.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -53,8 +53,8 @@ hypre_SStructOwnInfo( hypre_StructGrid  *fgrid,
 {
    hypre_SStructOwnInfoData *owninfo_data;
 
-   MPI_Comm                  comm= hypre_SStructVectorComm(fgrid);
-   HYPRE_Int                 ndim= hypre_StructGridNDim(fgrid);
+   MPI_Comm                  comm = hypre_SStructVectorComm(fgrid);
+   HYPRE_Int                 ndim = hypre_StructGridNDim(fgrid);
 
    hypre_BoxArray           *grid_boxes;
    hypre_BoxArray           *intersect_boxes;
@@ -81,13 +81,13 @@ hypre_SStructOwnInfo( hypre_StructGrid  *fgrid,
    hypre_BoxInit(&scaled_box, ndim);
    hypre_BoxInit(&boxman_entry_box, ndim);
 
-   hypre_ClearIndex(index); 
+   hypre_ClearIndex(index);
    hypre_MPI_Comm_rank(comm, &myproc);
 
-   owninfo_data= hypre_CTAlloc(hypre_SStructOwnInfoData,  1, HYPRE_MEMORY_HOST);
+   owninfo_data = hypre_CTAlloc(hypre_SStructOwnInfoData,  1, HYPRE_MEMORY_HOST);
 
    /*------------------------------------------------------------------------
-    * Create the structured ownbox patterns. 
+    * Create the structured ownbox patterns.
     *
     *   own_boxes are obtained by intersecting this proc's fgrid boxes
     *   with cgrid's box_man. Intersecting BoxManEntries on this proc
@@ -96,127 +96,127 @@ hypre_SStructOwnInfo( hypre_StructGrid  *fgrid,
    grid_boxes    = hypre_StructGridBoxes(fgrid);
 
    own_boxes   = hypre_BoxArrayArrayCreate(hypre_BoxArraySize(grid_boxes), ndim);
-   own_cboxnums= hypre_CTAlloc(HYPRE_Int *,  hypre_BoxArraySize(grid_boxes), HYPRE_MEMORY_HOST);
+   own_cboxnums = hypre_CTAlloc(HYPRE_Int *,  hypre_BoxArraySize(grid_boxes), HYPRE_MEMORY_HOST);
 
    hypre_ForBoxI(i, grid_boxes)
    {
-       grid_box= hypre_BoxArrayBox(grid_boxes, i);
-
-       /*---------------------------------------------------------------------
-        * Find the boxarray that is owned. BoxManIntersect returns
-        * the full extents of the boxes that intersect with the given box.
-        * We further need to intersect each box in the list with the given
-        * box to determine the actual box that is owned.
-        *---------------------------------------------------------------------*/
-       hypre_SStructIndexScaleF_C(hypre_BoxIMin(grid_box), index,
-                                  rfactor, hypre_BoxIMin(&scaled_box));
-       hypre_SStructIndexScaleF_C(hypre_BoxIMax(grid_box), index,
-                                  rfactor, hypre_BoxIMax(&scaled_box));
-
-       hypre_BoxManIntersect(cboxman, hypre_BoxIMin(&scaled_box), 
-                             hypre_BoxIMax(&scaled_box), &boxman_entries,
-                             &nboxman_entries);
-
-       cnt= 0;
-       for (j= 0; j< nboxman_entries; j++)
-       {
-          hypre_SStructBoxManEntryGetProcess(boxman_entries[j], &proc);
-          if (proc == myproc)
-          {
-             cnt++;
-          }
-       }
-       own_cboxnums[i]= hypre_CTAlloc(HYPRE_Int,  cnt, HYPRE_MEMORY_HOST);
-
-       cnt= 0;
-       for (j= 0; j< nboxman_entries; j++)
-       {
-          hypre_SStructBoxManEntryGetProcess(boxman_entries[j], &proc);
-
-          /* determine the chunk of the boxman_entries[j] box that is needed */
-          hypre_BoxManEntryGetExtents(boxman_entries[j], ilower, iupper);
-          hypre_BoxSetExtents(&boxman_entry_box, ilower, iupper);
-          hypre_IntersectBoxes(&boxman_entry_box, &scaled_box, &boxman_entry_box);
-
-          if (proc == myproc)
-          {
-             hypre_SStructBoxManEntryGetBoxnum(boxman_entries[j], &own_cboxnums[i][cnt]);
-             hypre_AppendBox(&boxman_entry_box, 
-                             hypre_BoxArrayArrayBoxArray(own_boxes, i));
-             cnt++;
-          }
-      } 
+      grid_box = hypre_BoxArrayBox(grid_boxes, i);
+
+      /*---------------------------------------------------------------------
+       * Find the boxarray that is owned. BoxManIntersect returns
+       * the full extents of the boxes that intersect with the given box.
+       * We further need to intersect each box in the list with the given
+       * box to determine the actual box that is owned.
+       *---------------------------------------------------------------------*/
+      hypre_SStructIndexScaleF_C(hypre_BoxIMin(grid_box), index,
+                                 rfactor, hypre_BoxIMin(&scaled_box));
+      hypre_SStructIndexScaleF_C(hypre_BoxIMax(grid_box), index,
+                                 rfactor, hypre_BoxIMax(&scaled_box));
+
+      hypre_BoxManIntersect(cboxman, hypre_BoxIMin(&scaled_box),
+                            hypre_BoxIMax(&scaled_box), &boxman_entries,
+                            &nboxman_entries);
+
+      cnt = 0;
+      for (j = 0; j < nboxman_entries; j++)
+      {
+         hypre_SStructBoxManEntryGetProcess(boxman_entries[j], &proc);
+         if (proc == myproc)
+         {
+            cnt++;
+         }
+      }
+      own_cboxnums[i] = hypre_CTAlloc(HYPRE_Int,  cnt, HYPRE_MEMORY_HOST);
+
+      cnt = 0;
+      for (j = 0; j < nboxman_entries; j++)
+      {
+         hypre_SStructBoxManEntryGetProcess(boxman_entries[j], &proc);
+
+         /* determine the chunk of the boxman_entries[j] box that is needed */
+         hypre_BoxManEntryGetExtents(boxman_entries[j], ilower, iupper);
+         hypre_BoxSetExtents(&boxman_entry_box, ilower, iupper);
+         hypre_IntersectBoxes(&boxman_entry_box, &scaled_box, &boxman_entry_box);
+
+         if (proc == myproc)
+         {
+            hypre_SStructBoxManEntryGetBoxnum(boxman_entries[j], &own_cboxnums[i][cnt]);
+            hypre_AppendBox(&boxman_entry_box,
+                            hypre_BoxArrayArrayBoxArray(own_boxes, i));
+            cnt++;
+         }
+      }
       hypre_TFree(boxman_entries, HYPRE_MEMORY_HOST);
-   }  /* hypre_ForBoxI(i, grid_boxes) */ 
+   }  /* hypre_ForBoxI(i, grid_boxes) */
 
    (owninfo_data -> size)     = hypre_BoxArraySize(grid_boxes);
-   (owninfo_data -> own_boxes)= own_boxes;
-   (owninfo_data -> own_cboxnums)= own_cboxnums;
+   (owninfo_data -> own_boxes) = own_boxes;
+   (owninfo_data -> own_cboxnums) = own_cboxnums;
 
    /*------------------------------------------------------------------------
-    *   own_composite_cboxes are obtained by intersecting this proc's cgrid 
-    *   boxes with fgrid's box_man. For each cbox, subtracting all the 
-    *   intersecting boxes from all processors will give the 
+    *   own_composite_cboxes are obtained by intersecting this proc's cgrid
+    *   boxes with fgrid's box_man. For each cbox, subtracting all the
+    *   intersecting boxes from all processors will give the
     *   own_composite_cboxes.
     *------------------------------------------------------------------------*/
-   grid_boxes= hypre_StructGridBoxes(cgrid);
-   own_composite_cboxes= hypre_BoxArrayArrayCreate(hypre_BoxArraySize(grid_boxes), ndim);
-  (owninfo_data -> own_composite_size)= hypre_BoxArraySize(grid_boxes);
+   grid_boxes = hypre_StructGridBoxes(cgrid);
+   own_composite_cboxes = hypre_BoxArrayArrayCreate(hypre_BoxArraySize(grid_boxes), ndim);
+   (owninfo_data -> own_composite_size) = hypre_BoxArraySize(grid_boxes);
 
    tmp_boxarray = hypre_BoxArrayCreate(0, ndim);
    hypre_ForBoxI(i, grid_boxes)
    {
-       grid_box= hypre_BoxArrayBox(grid_boxes, i);
-       hypre_AppendBox(grid_box,
-                       hypre_BoxArrayArrayBoxArray(own_composite_cboxes, i));
-
-       hypre_ClearIndex(index); 
-       hypre_SStructIndexScaleC_F(hypre_BoxIMin(grid_box), index,
-                                  rfactor, hypre_BoxIMin(&scaled_box));
-       hypre_SetIndex3(index, rfactor[0]-1, rfactor[1]-1, rfactor[2]-1); 
-       hypre_SStructIndexScaleC_F(hypre_BoxIMax(grid_box), index,
-                                  rfactor, hypre_BoxIMax(&scaled_box));
-
-       hypre_BoxManIntersect(fboxman, hypre_BoxIMin(&scaled_box),
-                             hypre_BoxIMax(&scaled_box), &boxman_entries,
+      grid_box = hypre_BoxArrayBox(grid_boxes, i);
+      hypre_AppendBox(grid_box,
+                      hypre_BoxArrayArrayBoxArray(own_composite_cboxes, i));
+
+      hypre_ClearIndex(index);
+      hypre_SStructIndexScaleC_F(hypre_BoxIMin(grid_box), index,
+                                 rfactor, hypre_BoxIMin(&scaled_box));
+      hypre_SetIndex3(index, rfactor[0] - 1, rfactor[1] - 1, rfactor[2] - 1);
+      hypre_SStructIndexScaleC_F(hypre_BoxIMax(grid_box), index,
+                                 rfactor, hypre_BoxIMax(&scaled_box));
+
+      hypre_BoxManIntersect(fboxman, hypre_BoxIMin(&scaled_box),
+                            hypre_BoxIMax(&scaled_box), &boxman_entries,
                             &nboxman_entries);
-       
-       hypre_ClearIndex(index); 
-       intersect_boxes= hypre_BoxArrayCreate(0, ndim);
-       for (j= 0; j< nboxman_entries; j++)
-       {
-          hypre_BoxManEntryGetExtents(boxman_entries[j], ilower, iupper);
-          hypre_BoxSetExtents(&boxman_entry_box, ilower, iupper);
-          hypre_IntersectBoxes(&boxman_entry_box, &scaled_box, &boxman_entry_box);
-
-         /* contract the intersection box so that only the cnodes in the 
+
+      hypre_ClearIndex(index);
+      intersect_boxes = hypre_BoxArrayCreate(0, ndim);
+      for (j = 0; j < nboxman_entries; j++)
+      {
+         hypre_BoxManEntryGetExtents(boxman_entries[j], ilower, iupper);
+         hypre_BoxSetExtents(&boxman_entry_box, ilower, iupper);
+         hypre_IntersectBoxes(&boxman_entry_box, &scaled_box, &boxman_entry_box);
+
+         /* contract the intersection box so that only the cnodes in the
             intersection box are included. */
-          for (k= 0; k< ndim; k++)
-          {
-             mod= hypre_BoxIMin(&boxman_entry_box)[k] % rfactor[k];
-             if (mod)
-             {
-                hypre_BoxIMin(&boxman_entry_box)[k]+= rfactor[k] - mod;
-             }
-          }
- 
-          hypre_SStructIndexScaleF_C(hypre_BoxIMin(&boxman_entry_box), index,
-                                     rfactor, hypre_BoxIMin(&boxman_entry_box));
-          hypre_SStructIndexScaleF_C(hypre_BoxIMax(&boxman_entry_box), index,
-                                     rfactor, hypre_BoxIMax(&boxman_entry_box));
-          hypre_AppendBox(&boxman_entry_box, intersect_boxes);
-       }
-
-       hypre_SubtractBoxArrays(hypre_BoxArrayArrayBoxArray(own_composite_cboxes, i),
-                               intersect_boxes, tmp_boxarray);
-       hypre_MinUnionBoxes(hypre_BoxArrayArrayBoxArray(own_composite_cboxes, i));
-
-       hypre_TFree(boxman_entries, HYPRE_MEMORY_HOST);
-       hypre_BoxArrayDestroy(intersect_boxes);
+         for (k = 0; k < ndim; k++)
+         {
+            mod = hypre_BoxIMin(&boxman_entry_box)[k] % rfactor[k];
+            if (mod)
+            {
+               hypre_BoxIMin(&boxman_entry_box)[k] += rfactor[k] - mod;
+            }
+         }
+
+         hypre_SStructIndexScaleF_C(hypre_BoxIMin(&boxman_entry_box), index,
+                                    rfactor, hypre_BoxIMin(&boxman_entry_box));
+         hypre_SStructIndexScaleF_C(hypre_BoxIMax(&boxman_entry_box), index,
+                                    rfactor, hypre_BoxIMax(&boxman_entry_box));
+         hypre_AppendBox(&boxman_entry_box, intersect_boxes);
+      }
+
+      hypre_SubtractBoxArrays(hypre_BoxArrayArrayBoxArray(own_composite_cboxes, i),
+                              intersect_boxes, tmp_boxarray);
+      hypre_MinUnionBoxes(hypre_BoxArrayArrayBoxArray(own_composite_cboxes, i));
+
+      hypre_TFree(boxman_entries, HYPRE_MEMORY_HOST);
+      hypre_BoxArrayDestroy(intersect_boxes);
    }
    hypre_BoxArrayDestroy(tmp_boxarray);
-       
-  (owninfo_data -> own_composite_cboxes)= own_composite_cboxes;
+
+   (owninfo_data -> own_composite_cboxes) = own_composite_cboxes;
 
    return owninfo_data;
 }
@@ -237,11 +237,11 @@ hypre_SStructOwnInfoDataDestroy(hypre_SStructOwnInfoData *owninfo_data)
          hypre_BoxArrayArrayDestroy( (owninfo_data -> own_boxes) );
       }
 
-      for (i= 0; i< (owninfo_data -> size); i++)
+      for (i = 0; i < (owninfo_data -> size); i++)
       {
          if (owninfo_data -> own_cboxnums[i])
          {
-             hypre_TFree(owninfo_data -> own_cboxnums[i], HYPRE_MEMORY_HOST);
+            hypre_TFree(owninfo_data -> own_cboxnums[i], HYPRE_MEMORY_HOST);
          }
       }
       hypre_TFree(owninfo_data -> own_cboxnums, HYPRE_MEMORY_HOST);
diff --git a/external/hypre/src/sstruct_ls/sstruct_owninfo.h b/external/hypre/src/sstruct_ls/sstruct_owninfo.h
index cc6df2cd..34ccad87 100644
--- a/external/hypre/src/sstruct_ls/sstruct_owninfo.h
+++ b/external/hypre/src/sstruct_ls/sstruct_owninfo.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -15,7 +15,7 @@
 #define hypre_OWNINFODATA_HEADER
 
 
-typedef struct 
+typedef struct
 {
    HYPRE_Int             size;
 
diff --git a/external/hypre/src/sstruct_ls/sstruct_recvinfo.c b/external/hypre/src/sstruct_ls/sstruct_recvinfo.c
index 072baaf0..accb99cc 100644
--- a/external/hypre/src/sstruct_ls/sstruct_recvinfo.c
+++ b/external/hypre/src/sstruct_ls/sstruct_recvinfo.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -43,15 +43,15 @@ hypre_SStructRecvInfo( hypre_StructGrid      *cgrid,
    hypre_BoxInit(&fbox, ndim);
    hypre_BoxInit(&boxman_entry_box, ndim);
 
-   hypre_ClearIndex(index1); 
-   hypre_SetIndex3(index2, rfactor[0]-1, rfactor[1]-1, rfactor[2]-1);
+   hypre_ClearIndex(index1);
+   hypre_SetIndex3(index2, rfactor[0] - 1, rfactor[1] - 1, rfactor[2] - 1);
 
    hypre_MPI_Comm_rank(comm, &myproc);
 
-   recvinfo_data= hypre_CTAlloc(hypre_SStructRecvInfoData,  1, HYPRE_MEMORY_HOST);
+   recvinfo_data = hypre_CTAlloc(hypre_SStructRecvInfoData,  1, HYPRE_MEMORY_HOST);
 
    /*------------------------------------------------------------------------
-    * Create the structured recvbox patterns. 
+    * Create the structured recvbox patterns.
     *   recv_boxes are obtained by intersecting this proc's cgrid boxes
     *   with the fine fboxman. Intersecting BoxManEntries not on this proc
     *   will give the boxes that we will be receiving some data from. To
@@ -62,62 +62,62 @@ hypre_SStructRecvInfo( hypre_StructGrid      *cgrid,
    intersect_box = hypre_BoxCreate(ndim);
    grid_boxes   = hypre_StructGridBoxes(cgrid);
 
-   recv_boxes= hypre_BoxArrayArrayCreate(hypre_BoxArraySize(grid_boxes), ndim);
-   recv_processes= hypre_CTAlloc(HYPRE_Int *,  hypre_BoxArraySize(grid_boxes), HYPRE_MEMORY_HOST);
+   recv_boxes = hypre_BoxArrayArrayCreate(hypre_BoxArraySize(grid_boxes), ndim);
+   recv_processes = hypre_CTAlloc(HYPRE_Int *,  hypre_BoxArraySize(grid_boxes), HYPRE_MEMORY_HOST);
 
    hypre_ForBoxI(i, grid_boxes)
    {
-       grid_box= hypre_BoxArrayBox(grid_boxes, i);
+      grid_box = hypre_BoxArrayBox(grid_boxes, i);
 
-       hypre_SStructIndexScaleC_F(hypre_BoxIMin(grid_box), index1,
-                                  rfactor, hypre_BoxIMin(&fbox));
-       hypre_SStructIndexScaleC_F(hypre_BoxIMax(grid_box), index2,
-                                  rfactor, hypre_BoxIMax(&fbox));
+      hypre_SStructIndexScaleC_F(hypre_BoxIMin(grid_box), index1,
+                                 rfactor, hypre_BoxIMin(&fbox));
+      hypre_SStructIndexScaleC_F(hypre_BoxIMax(grid_box), index2,
+                                 rfactor, hypre_BoxIMax(&fbox));
 
-       hypre_BoxManIntersect(fboxman, hypre_BoxIMin(&fbox), hypre_BoxIMax(&fbox),
+      hypre_BoxManIntersect(fboxman, hypre_BoxIMin(&fbox), hypre_BoxIMax(&fbox),
                             &boxman_entries, &nboxman_entries);
 
-       cnt= 0;
-       for (j= 0; j< nboxman_entries; j++)
-       {
-          hypre_SStructBoxManEntryGetProcess(boxman_entries[j], &proc);
-          if (proc != myproc)
-          {
-             cnt++;
-          }
-       }
-       recv_processes[i]     = hypre_CTAlloc(HYPRE_Int,  cnt, HYPRE_MEMORY_HOST);
-
-       cnt= 0;
-       for (j= 0; j< nboxman_entries; j++)
-       {
-          hypre_SStructBoxManEntryGetProcess(boxman_entries[j], &proc);
-
-          /* determine the chunk of the boxman_entries[j] box that is needed */
-          hypre_BoxManEntryGetExtents(boxman_entries[j], ilower, iupper);
-          hypre_BoxSetExtents(&boxman_entry_box, ilower, iupper);
-          hypre_IntersectBoxes(&boxman_entry_box, &fbox, &boxman_entry_box);
-
-          if (proc != myproc)
-          {
-             recv_processes[i][cnt]= proc;
-             hypre_SStructIndexScaleF_C(hypre_BoxIMin(&boxman_entry_box), index1,
-                                        rfactor, hypre_BoxIMin(&boxman_entry_box));
-             hypre_SStructIndexScaleF_C(hypre_BoxIMax(&boxman_entry_box), index1,
-                                        rfactor, hypre_BoxIMax(&boxman_entry_box));
-             hypre_AppendBox(&boxman_entry_box, 
-                              hypre_BoxArrayArrayBoxArray(recv_boxes, i));
-             cnt++;
-          }
-      } 
+      cnt = 0;
+      for (j = 0; j < nboxman_entries; j++)
+      {
+         hypre_SStructBoxManEntryGetProcess(boxman_entries[j], &proc);
+         if (proc != myproc)
+         {
+            cnt++;
+         }
+      }
+      recv_processes[i]     = hypre_CTAlloc(HYPRE_Int,  cnt, HYPRE_MEMORY_HOST);
+
+      cnt = 0;
+      for (j = 0; j < nboxman_entries; j++)
+      {
+         hypre_SStructBoxManEntryGetProcess(boxman_entries[j], &proc);
+
+         /* determine the chunk of the boxman_entries[j] box that is needed */
+         hypre_BoxManEntryGetExtents(boxman_entries[j], ilower, iupper);
+         hypre_BoxSetExtents(&boxman_entry_box, ilower, iupper);
+         hypre_IntersectBoxes(&boxman_entry_box, &fbox, &boxman_entry_box);
+
+         if (proc != myproc)
+         {
+            recv_processes[i][cnt] = proc;
+            hypre_SStructIndexScaleF_C(hypre_BoxIMin(&boxman_entry_box), index1,
+                                       rfactor, hypre_BoxIMin(&boxman_entry_box));
+            hypre_SStructIndexScaleF_C(hypre_BoxIMax(&boxman_entry_box), index1,
+                                       rfactor, hypre_BoxIMax(&boxman_entry_box));
+            hypre_AppendBox(&boxman_entry_box,
+                            hypre_BoxArrayArrayBoxArray(recv_boxes, i));
+            cnt++;
+         }
+      }
       hypre_TFree(boxman_entries, HYPRE_MEMORY_HOST);
-   }  /* hypre_ForBoxI(i, grid_boxes) */ 
+   }  /* hypre_ForBoxI(i, grid_boxes) */
 
    hypre_BoxDestroy(intersect_box);
 
    (recvinfo_data -> size)      = hypre_BoxArraySize(grid_boxes);
-   (recvinfo_data -> recv_boxes)= recv_boxes;
-   (recvinfo_data -> recv_procs)= recv_processes;
+   (recvinfo_data -> recv_boxes) = recv_boxes;
+   (recvinfo_data -> recv_procs) = recv_processes;
 
    return recvinfo_data;
 }
@@ -138,11 +138,11 @@ hypre_SStructRecvInfoDataDestroy(hypre_SStructRecvInfoData *recvinfo_data)
          hypre_BoxArrayArrayDestroy( (recvinfo_data -> recv_boxes) );
       }
 
-      for (i= 0; i< (recvinfo_data -> size); i++)
+      for (i = 0; i < (recvinfo_data -> size); i++)
       {
          if (recvinfo_data -> recv_procs[i])
          {
-             hypre_TFree(recvinfo_data -> recv_procs[i], HYPRE_MEMORY_HOST);
+            hypre_TFree(recvinfo_data -> recv_procs[i], HYPRE_MEMORY_HOST);
          }
 
       }
diff --git a/external/hypre/src/sstruct_ls/sstruct_recvinfo.h b/external/hypre/src/sstruct_ls/sstruct_recvinfo.h
index d44b1253..e28f96bf 100644
--- a/external/hypre/src/sstruct_ls/sstruct_recvinfo.h
+++ b/external/hypre/src/sstruct_ls/sstruct_recvinfo.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -12,7 +12,7 @@
 #define hypre_RECVINFODATA_HEADER
 
 
-typedef struct 
+typedef struct
 {
    HYPRE_Int             size;
 
diff --git a/external/hypre/src/sstruct_ls/sstruct_sendinfo.c b/external/hypre/src/sstruct_ls/sstruct_sendinfo.c
index 1a7f29a0..32fee366 100644
--- a/external/hypre/src/sstruct_ls/sstruct_sendinfo.c
+++ b/external/hypre/src/sstruct_ls/sstruct_sendinfo.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -9,7 +9,7 @@
 
 /*--------------------------------------------------------------------------
  * hypre_SStructSendInfo: Given a fgrid, coarsen each fbox and find the
- * coarsened boxes that must be sent, the procs that they must be sent to, 
+ * coarsened boxes that must be sent, the procs that they must be sent to,
  * and the remote boxnums of these sendboxes.
  *--------------------------------------------------------------------------*/
 
@@ -44,13 +44,13 @@ hypre_SStructSendInfo( hypre_StructGrid      *fgrid,
    hypre_BoxInit(&cbox, ndim);
    hypre_BoxInit(&boxman_entry_box, ndim);
 
-   hypre_ClearIndex(index); 
+   hypre_ClearIndex(index);
    hypre_MPI_Comm_rank(comm, &myproc);
 
-   sendinfo_data= hypre_CTAlloc(hypre_SStructSendInfoData,  1, HYPRE_MEMORY_HOST);
+   sendinfo_data = hypre_CTAlloc(hypre_SStructSendInfoData,  1, HYPRE_MEMORY_HOST);
 
    /*------------------------------------------------------------------------
-    * Create the structured sendbox patterns. 
+    * Create the structured sendbox patterns.
     *
     *   send_boxes are obtained by intersecting this proc's fgrid boxes
     *   with cgrid's box_man. Intersecting BoxManEntries not on this proc
@@ -61,69 +61,70 @@ hypre_SStructSendInfo( hypre_StructGrid      *fgrid,
    intersect_box = hypre_BoxCreate(ndim);
    grid_boxes   = hypre_StructGridBoxes(fgrid);
 
-   send_boxes= hypre_BoxArrayArrayCreate(hypre_BoxArraySize(grid_boxes), ndim);
-   send_processes= hypre_CTAlloc(HYPRE_Int *,  hypre_BoxArraySize(grid_boxes), HYPRE_MEMORY_HOST);
-   send_remote_boxnums= hypre_CTAlloc(HYPRE_Int *,  hypre_BoxArraySize(grid_boxes), HYPRE_MEMORY_HOST);
+   send_boxes = hypre_BoxArrayArrayCreate(hypre_BoxArraySize(grid_boxes), ndim);
+   send_processes = hypre_CTAlloc(HYPRE_Int *,  hypre_BoxArraySize(grid_boxes), HYPRE_MEMORY_HOST);
+   send_remote_boxnums = hypre_CTAlloc(HYPRE_Int *,  hypre_BoxArraySize(grid_boxes),
+                                       HYPRE_MEMORY_HOST);
 
    hypre_ForBoxI(i, grid_boxes)
    {
-       grid_box= hypre_BoxArrayBox(grid_boxes, i);
-
-       /*---------------------------------------------------------------------
-        * Find the boxarray that must be sent. BoxManIntersect returns
-        * the full extents of the boxes that intersect with the given box.
-        * We further need to intersect each box in the list with the given
-        * box to determine the actual box that needs to be sent.
-        *---------------------------------------------------------------------*/
-       hypre_SStructIndexScaleF_C(hypre_BoxIMin(grid_box), index,
-                                  rfactor, hypre_BoxIMin(&cbox));
-       hypre_SStructIndexScaleF_C(hypre_BoxIMax(grid_box), index,
-                                  rfactor, hypre_BoxIMax(&cbox));
-
-       hypre_BoxManIntersect(cboxman, hypre_BoxIMin(&cbox), hypre_BoxIMax(&cbox),
+      grid_box = hypre_BoxArrayBox(grid_boxes, i);
+
+      /*---------------------------------------------------------------------
+       * Find the boxarray that must be sent. BoxManIntersect returns
+       * the full extents of the boxes that intersect with the given box.
+       * We further need to intersect each box in the list with the given
+       * box to determine the actual box that needs to be sent.
+       *---------------------------------------------------------------------*/
+      hypre_SStructIndexScaleF_C(hypre_BoxIMin(grid_box), index,
+                                 rfactor, hypre_BoxIMin(&cbox));
+      hypre_SStructIndexScaleF_C(hypre_BoxIMax(grid_box), index,
+                                 rfactor, hypre_BoxIMax(&cbox));
+
+      hypre_BoxManIntersect(cboxman, hypre_BoxIMin(&cbox), hypre_BoxIMax(&cbox),
                             &boxman_entries, &nboxman_entries);
 
-       cnt= 0;
-       for (j= 0; j< nboxman_entries; j++)
-       {
-          hypre_SStructBoxManEntryGetProcess(boxman_entries[j], &proc);
-          if (proc != myproc)
-          {
-             cnt++;
-          }
-       }
-       send_processes[i]     = hypre_CTAlloc(HYPRE_Int,  cnt, HYPRE_MEMORY_HOST);
-       send_remote_boxnums[i]= hypre_CTAlloc(HYPRE_Int,  cnt, HYPRE_MEMORY_HOST);
-
-       cnt= 0;
-       for (j= 0; j< nboxman_entries; j++)
-       {
-          hypre_SStructBoxManEntryGetProcess(boxman_entries[j], &proc);
-
-          /* determine the chunk of the boxman_entries[j] box that is needed */
-          hypre_BoxManEntryGetExtents(boxman_entries[j], ilower, iupper);
-          hypre_BoxSetExtents(&boxman_entry_box, ilower, iupper);
-          hypre_IntersectBoxes(&boxman_entry_box, &cbox, &boxman_entry_box);
-
-          if (proc != myproc)
-          {
-             send_processes[i][cnt]     = proc;
-             hypre_SStructBoxManEntryGetBoxnum(boxman_entries[j], 
-                                            &send_remote_boxnums[i][cnt]);
-             hypre_AppendBox(&boxman_entry_box, 
-                              hypre_BoxArrayArrayBoxArray(send_boxes, i));
-             cnt++;
-          }
-      } 
+      cnt = 0;
+      for (j = 0; j < nboxman_entries; j++)
+      {
+         hypre_SStructBoxManEntryGetProcess(boxman_entries[j], &proc);
+         if (proc != myproc)
+         {
+            cnt++;
+         }
+      }
+      send_processes[i]     = hypre_CTAlloc(HYPRE_Int,  cnt, HYPRE_MEMORY_HOST);
+      send_remote_boxnums[i] = hypre_CTAlloc(HYPRE_Int,  cnt, HYPRE_MEMORY_HOST);
+
+      cnt = 0;
+      for (j = 0; j < nboxman_entries; j++)
+      {
+         hypre_SStructBoxManEntryGetProcess(boxman_entries[j], &proc);
+
+         /* determine the chunk of the boxman_entries[j] box that is needed */
+         hypre_BoxManEntryGetExtents(boxman_entries[j], ilower, iupper);
+         hypre_BoxSetExtents(&boxman_entry_box, ilower, iupper);
+         hypre_IntersectBoxes(&boxman_entry_box, &cbox, &boxman_entry_box);
+
+         if (proc != myproc)
+         {
+            send_processes[i][cnt]     = proc;
+            hypre_SStructBoxManEntryGetBoxnum(boxman_entries[j],
+                                              &send_remote_boxnums[i][cnt]);
+            hypre_AppendBox(&boxman_entry_box,
+                            hypre_BoxArrayArrayBoxArray(send_boxes, i));
+            cnt++;
+         }
+      }
       hypre_TFree(boxman_entries, HYPRE_MEMORY_HOST);
-   }  /* hypre_ForBoxI(i, grid_boxes) */ 
+   }  /* hypre_ForBoxI(i, grid_boxes) */
 
    hypre_BoxDestroy(intersect_box);
 
    (sendinfo_data -> size)               = hypre_BoxArraySize(grid_boxes);
    (sendinfo_data -> send_boxes)         = send_boxes;
    (sendinfo_data -> send_procs)         = send_processes;
-   (sendinfo_data -> send_remote_boxnums)= send_remote_boxnums;
+   (sendinfo_data -> send_remote_boxnums) = send_remote_boxnums;
 
    return sendinfo_data;
 }
@@ -144,16 +145,16 @@ hypre_SStructSendInfoDataDestroy(hypre_SStructSendInfoData *sendinfo_data)
          hypre_BoxArrayArrayDestroy( (sendinfo_data -> send_boxes) );
       }
 
-      for (i= 0; i< (sendinfo_data -> size); i++)
+      for (i = 0; i < (sendinfo_data -> size); i++)
       {
          if (sendinfo_data -> send_procs[i])
          {
-             hypre_TFree(sendinfo_data -> send_procs[i], HYPRE_MEMORY_HOST);
+            hypre_TFree(sendinfo_data -> send_procs[i], HYPRE_MEMORY_HOST);
          }
 
          if (sendinfo_data -> send_remote_boxnums[i])
          {
-             hypre_TFree(sendinfo_data -> send_remote_boxnums[i], HYPRE_MEMORY_HOST);
+            hypre_TFree(sendinfo_data -> send_remote_boxnums[i], HYPRE_MEMORY_HOST);
          }
       }
       hypre_TFree(sendinfo_data -> send_procs, HYPRE_MEMORY_HOST);
diff --git a/external/hypre/src/sstruct_ls/sstruct_sendinfo.h b/external/hypre/src/sstruct_ls/sstruct_sendinfo.h
index f380596c..40289585 100644
--- a/external/hypre/src/sstruct_ls/sstruct_sendinfo.h
+++ b/external/hypre/src/sstruct_ls/sstruct_sendinfo.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -12,7 +12,7 @@
 #define hypre_SENDINFODATA_HEADER
 
 
-typedef struct 
+typedef struct
 {
    HYPRE_Int             size;
 
diff --git a/external/hypre/src/sstruct_ls/sstruct_sharedDOFComm.c b/external/hypre/src/sstruct_ls/sstruct_sharedDOFComm.c
index 51a066f5..35b2978c 100644
--- a/external/hypre/src/sstruct_ls/sstruct_sharedDOFComm.c
+++ b/external/hypre/src/sstruct_ls/sstruct_sharedDOFComm.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -25,14 +25,14 @@ hypre_MaxwellOffProcRowCreate(HYPRE_Int ncols)
    HYPRE_BigInt             *cols;
    HYPRE_Real               *data;
 
-   OffProcRow= hypre_CTAlloc(hypre_MaxwellOffProcRow,  1, HYPRE_MEMORY_HOST);
-   (OffProcRow -> ncols)= ncols;
+   OffProcRow = hypre_CTAlloc(hypre_MaxwellOffProcRow,  1, HYPRE_MEMORY_HOST);
+   (OffProcRow -> ncols) = ncols;
 
-   cols= hypre_TAlloc(HYPRE_BigInt,  ncols, HYPRE_MEMORY_HOST);
-   data= hypre_TAlloc(HYPRE_Real,  ncols, HYPRE_MEMORY_HOST);
+   cols = hypre_TAlloc(HYPRE_BigInt,  ncols, HYPRE_MEMORY_HOST);
+   data = hypre_TAlloc(HYPRE_Real,  ncols, HYPRE_MEMORY_HOST);
 
-   (OffProcRow -> cols)= cols;
-   (OffProcRow -> data)= data;
+   (OffProcRow -> cols) = cols;
+   (OffProcRow -> data) = data;
 
    return OffProcRow;
 }
@@ -43,8 +43,8 @@ hypre_MaxwellOffProcRowCreate(HYPRE_Int ncols)
 HYPRE_Int
 hypre_MaxwellOffProcRowDestroy(void *OffProcRow_vdata)
 {
-   hypre_MaxwellOffProcRow  *OffProcRow= (hypre_MaxwellOffProcRow  *)OffProcRow_vdata;
-   HYPRE_Int                 ierr= 0;
+   hypre_MaxwellOffProcRow  *OffProcRow = (hypre_MaxwellOffProcRow  *)OffProcRow_vdata;
+   HYPRE_Int                 ierr = 0;
 
    if (OffProcRow)
    {
@@ -60,7 +60,7 @@ hypre_MaxwellOffProcRowDestroy(void *OffProcRow_vdata)
  * hypre_SStructSharedDOF_ParcsrMatRowsComm
  *   Given a sstruct_grid & parcsr matrix with rows corresponding to the
  *   sstruct_grid, determine and extract the rows that must be communicated.
- *   These rows are for shared dof that geometrically lie on processor 
+ *   These rows are for shared dof that geometrically lie on processor
  *   boundaries but internally are stored on one processor.
  *   Algo:
  *       for each cellbox
@@ -74,7 +74,7 @@ hypre_MaxwellOffProcRowDestroy(void *OffProcRow_vdata)
  *                 a) if belong on another proc, these are the recvs:
  *                    count and prepare the communication buffers and
  *                    values.
- *          
+ *
  *         SENDs:
  *          i)  form layer of cells that is one layer off cellbox
  *              (stretches in the appropriate direction)
@@ -86,7 +86,7 @@ hypre_MaxwellOffProcRowDestroy(void *OffProcRow_vdata)
  *                    values.
  *
  * Note: For the recv data, the dof can come from only one processor.
- *       For the send data, the dof can go to more than one processor 
+ *       For the send data, the dof can go to more than one processor
  *       (the same dof is on the boundary of several cells).
  *--------------------------------------------------------------------------*/
 HYPRE_Int
@@ -95,12 +95,12 @@ hypre_SStructSharedDOF_ParcsrMatRowsComm( hypre_SStructGrid    *grid,
                                           HYPRE_Int            *num_offprocrows_ptr,
                                           hypre_MaxwellOffProcRow ***OffProcRows_ptr)
 {
-   MPI_Comm             A_comm= hypre_ParCSRMatrixComm(A);
-   MPI_Comm          grid_comm= hypre_SStructGridComm(grid);
+   MPI_Comm             A_comm = hypre_ParCSRMatrixComm(A);
+   MPI_Comm          grid_comm = hypre_SStructGridComm(grid);
 
-   HYPRE_Int       matrix_type= HYPRE_PARCSR;
+   HYPRE_Int       matrix_type = HYPRE_PARCSR;
 
-   HYPRE_Int            nparts= hypre_SStructGridNParts(grid);
+   HYPRE_Int            nparts = hypre_SStructGridNParts(grid);
    HYPRE_Int            ndim  = hypre_SStructGridNDim(grid);
 
    hypre_SStructGrid     *cell_ssgrid;
@@ -111,13 +111,13 @@ hypre_SStructSharedDOF_ParcsrMatRowsComm( hypre_SStructGrid    *grid,
    hypre_Box             *box, *cellbox, vbox, boxman_entry_box;
 
    hypre_Index            loop_size, start, lindex;
-   HYPRE_BigInt           start_rank, end_rank, rank; 
+   HYPRE_BigInt           start_rank, end_rank, rank;
 
    HYPRE_Int              i, j, k, m, n, t, part, var, nvars;
 
    HYPRE_SStructVariable *vartypes;
-   HYPRE_Int              nbdry_slabs;
-   hypre_BoxArray        *recv_slabs, *send_slabs;
+   HYPRE_Int              nbdry_slabs = 0;
+   hypre_BoxArray        *recv_slabs = NULL, *send_slabs = NULL;
    hypre_Index            varoffset;
 
    hypre_BoxManager     **boxmans, *cell_boxman;
@@ -129,7 +129,7 @@ hypre_SStructSharedDOF_ParcsrMatRowsComm( hypre_SStructGrid    *grid,
    HYPRE_Int              proc, nprocs, myproc;
    HYPRE_Int             *SendToProcs, *RecvFromProcs;
    HYPRE_Int            **send_RowsNcols;       /* buffer for rows & ncols */
-   HYPRE_Int             *send_RowsNcols_alloc; 
+   HYPRE_Int             *send_RowsNcols_alloc;
    HYPRE_Int             *send_ColsData_alloc;
    HYPRE_Int             *tot_nsendRowsNcols, *tot_sendColsData;
    HYPRE_Real           **vals;  /* buffer for cols & data */
@@ -146,33 +146,34 @@ hypre_SStructSharedDOF_ParcsrMatRowsComm( hypre_SStructGrid    *grid,
    hypre_MaxwellOffProcRow **OffProcRows;
    HYPRE_Int                *starts;
 
-   HYPRE_Int              ierr= 0;
+   HYPRE_Int              ierr = 0;
 
    hypre_BoxInit(&vbox, ndim);
    hypre_BoxInit(&boxman_entry_box, ndim);
+   hypre_SetIndex(lindex, 0);
 
    hypre_MPI_Comm_rank(A_comm, &myproc);
    hypre_MPI_Comm_size(grid_comm, &nprocs);
 
-   start_rank= hypre_ParCSRMatrixFirstRowIndex(A);
+   start_rank = hypre_ParCSRMatrixFirstRowIndex(A);
    end_rank  = hypre_ParCSRMatrixLastRowIndex(A);
 
    /* need a cellgrid boxman to determine the send boxes -> only the cell dofs
       are unique so a boxman intersect can be used to get the edges that
       must be sent. */
    HYPRE_SStructGridCreate(grid_comm, ndim, nparts, &cell_ssgrid);
-   vartypes= hypre_CTAlloc(HYPRE_SStructVariable,  1, HYPRE_MEMORY_HOST);
-   vartypes[0]= HYPRE_SSTRUCT_VARIABLE_CELL;
+   vartypes = hypre_CTAlloc(HYPRE_SStructVariable,  1, HYPRE_MEMORY_HOST);
+   vartypes[0] = HYPRE_SSTRUCT_VARIABLE_CELL;
 
-   for (i= 0; i< nparts; i++)
+   for (i = 0; i < nparts; i++)
    {
-      pgrid= hypre_SStructGridPGrid(grid, i);
-      cellgrid= hypre_SStructPGridCellSGrid(pgrid);
+      pgrid = hypre_SStructGridPGrid(grid, i);
+      cellgrid = hypre_SStructPGridCellSGrid(pgrid);
 
-      cellboxes= hypre_StructGridBoxes(cellgrid);
+      cellboxes = hypre_StructGridBoxes(cellgrid);
       hypre_ForBoxI(j, cellboxes)
       {
-         box= hypre_BoxArrayBox(cellboxes, j);
+         box = hypre_BoxArrayBox(cellboxes, j);
          HYPRE_SStructGridSetExtents(cell_ssgrid, i,
                                      hypre_BoxIMin(box), hypre_BoxIMax(box));
       }
@@ -180,50 +181,50 @@ hypre_SStructSharedDOF_ParcsrMatRowsComm( hypre_SStructGrid    *grid,
    }
    HYPRE_SStructGridAssemble(cell_ssgrid);
    hypre_TFree(vartypes, HYPRE_MEMORY_HOST);
-   
+
    /* box algebra to determine communication */
    SendToProcs    = hypre_CTAlloc(HYPRE_Int,  nprocs, HYPRE_MEMORY_HOST);
    RecvFromProcs  = hypre_CTAlloc(HYPRE_Int,  nprocs, HYPRE_MEMORY_HOST);
 
    send_RowsNcols      = hypre_TAlloc(HYPRE_Int *,  nprocs, HYPRE_MEMORY_HOST);
-   send_RowsNcols_alloc= hypre_TAlloc(HYPRE_Int ,  nprocs, HYPRE_MEMORY_HOST);
-   send_ColsData_alloc = hypre_TAlloc(HYPRE_Int ,  nprocs, HYPRE_MEMORY_HOST);
+   send_RowsNcols_alloc = hypre_TAlloc(HYPRE_Int,  nprocs, HYPRE_MEMORY_HOST);
+   send_ColsData_alloc = hypre_TAlloc(HYPRE_Int,  nprocs, HYPRE_MEMORY_HOST);
    vals                = hypre_TAlloc(HYPRE_Real *,  nprocs, HYPRE_MEMORY_HOST);
    tot_nsendRowsNcols  = hypre_CTAlloc(HYPRE_Int,  nprocs, HYPRE_MEMORY_HOST);
    tot_sendColsData    = hypre_CTAlloc(HYPRE_Int,  nprocs, HYPRE_MEMORY_HOST);
 
-   for (i= 0; i< nprocs; i++)
+   for (i = 0; i < nprocs; i++)
    {
-      send_RowsNcols[i]= hypre_TAlloc(HYPRE_Int,  1000, HYPRE_MEMORY_HOST); /* initial allocation */
-      send_RowsNcols_alloc[i]= 1000;
+      send_RowsNcols[i] = hypre_TAlloc(HYPRE_Int,  1000, HYPRE_MEMORY_HOST); /* initial allocation */
+      send_RowsNcols_alloc[i] = 1000;
 
-      vals[i]= hypre_TAlloc(HYPRE_Real,  2000, HYPRE_MEMORY_HOST); /* initial allocation */
-      send_ColsData_alloc[i]= 2000;
+      vals[i] = hypre_TAlloc(HYPRE_Real,  2000, HYPRE_MEMORY_HOST); /* initial allocation */
+      send_ColsData_alloc[i] = 2000;
    }
-  
-   for (part= 0; part< nparts; part++)
+
+   for (part = 0; part < nparts; part++)
    {
-      pgrid= hypre_SStructGridPGrid(grid, part);
-      nvars= hypre_SStructPGridNVars(pgrid);
-      vartypes= hypre_SStructPGridVarTypes(pgrid);
+      pgrid = hypre_SStructGridPGrid(grid, part);
+      nvars = hypre_SStructPGridNVars(pgrid);
+      vartypes = hypre_SStructPGridVarTypes(pgrid);
 
       cellgrid = hypre_SStructPGridCellSGrid(pgrid);
-      cellboxes= hypre_StructGridBoxes(cellgrid);
+      cellboxes = hypre_StructGridBoxes(cellgrid);
 
-      boxmans= hypre_TAlloc(hypre_BoxManager *,  nvars, HYPRE_MEMORY_HOST);
-      for (t= 0; t< nvars; t++)
+      boxmans = hypre_TAlloc(hypre_BoxManager *,  nvars, HYPRE_MEMORY_HOST);
+      for (t = 0; t < nvars; t++)
       {
-         boxmans[t]= hypre_SStructGridBoxManager(grid, part, t);
+         boxmans[t] = hypre_SStructGridBoxManager(grid, part, t);
       }
-      cell_boxman= hypre_SStructGridBoxManager(cell_ssgrid, part, 0);
+      cell_boxman = hypre_SStructGridBoxManager(cell_ssgrid, part, 0);
 
       hypre_ForBoxI(j, cellboxes)
       {
-         cellbox= hypre_BoxArrayBox(cellboxes, j);
+         cellbox = hypre_BoxArrayBox(cellboxes, j);
 
-         for (t= 0; t< nvars; t++)
+         for (t = 0; t < nvars; t++)
          {
-            var= vartypes[t];
+            var = vartypes[t];
             hypre_SStructVariableGetOffset((hypre_SStructVariable) var,
                                            ndim, varoffset);
 
@@ -233,52 +234,52 @@ hypre_SStructSharedDOF_ParcsrMatRowsComm( hypre_SStructGrid    *grid,
                                   hypre_BoxIMin(&vbox));
 
             /* boundary layer box depends on variable type */
-            switch(var)
+            switch (var)
             {
                case 1:  /* node based */
                {
-                  nbdry_slabs= 6;
+                  nbdry_slabs = 6;
                   recv_slabs = hypre_BoxArrayCreate(nbdry_slabs, ndim);
 
                   /* slab in the +/- i,j,k directions */
-                  box= hypre_BoxArrayBox(recv_slabs, 0);
+                  box = hypre_BoxArrayBox(recv_slabs, 0);
                   hypre_CopyBox(&vbox, box);
-                  hypre_BoxIMin(box)[0]= hypre_BoxIMax(box)[0];
+                  hypre_BoxIMin(box)[0] = hypre_BoxIMax(box)[0];
 
-                  box= hypre_BoxArrayBox(recv_slabs, 1);
+                  box = hypre_BoxArrayBox(recv_slabs, 1);
                   hypre_CopyBox(&vbox, box);
-                  hypre_BoxIMax(box)[0]= hypre_BoxIMin(box)[0];
+                  hypre_BoxIMax(box)[0] = hypre_BoxIMin(box)[0];
 
                   /* need to contract the slab in the i direction to avoid repeated
                      counting of some nodes. */
-                  box= hypre_BoxArrayBox(recv_slabs, 2);
+                  box = hypre_BoxArrayBox(recv_slabs, 2);
                   hypre_CopyBox(&vbox, box);
-                  hypre_BoxIMin(box)[1]= hypre_BoxIMax(box)[1];
+                  hypre_BoxIMin(box)[1] = hypre_BoxIMax(box)[1];
 
                   hypre_BoxIMin(box)[0]++; /* contract */
                   hypre_BoxIMax(box)[0]--; /* contract */
 
-                  box= hypre_BoxArrayBox(recv_slabs, 3);
+                  box = hypre_BoxArrayBox(recv_slabs, 3);
                   hypre_CopyBox(&vbox, box);
-                  hypre_BoxIMax(box)[1]= hypre_BoxIMin(box)[1];
+                  hypre_BoxIMax(box)[1] = hypre_BoxIMin(box)[1];
 
                   hypre_BoxIMin(box)[0]++; /* contract */
                   hypre_BoxIMax(box)[0]--; /* contract */
 
                   /* need to contract the slab in the i & j directions to avoid repeated
                      counting of some nodes. */
-                  box= hypre_BoxArrayBox(recv_slabs, 4);
+                  box = hypre_BoxArrayBox(recv_slabs, 4);
                   hypre_CopyBox(&vbox, box);
-                  hypre_BoxIMin(box)[2]= hypre_BoxIMax(box)[2];
+                  hypre_BoxIMin(box)[2] = hypre_BoxIMax(box)[2];
 
                   hypre_BoxIMin(box)[0]++; /* contract */
                   hypre_BoxIMax(box)[0]--; /* contract */
                   hypre_BoxIMin(box)[1]++; /* contract */
                   hypre_BoxIMax(box)[1]--; /* contract */
 
-                  box= hypre_BoxArrayBox(recv_slabs, 5);
+                  box = hypre_BoxArrayBox(recv_slabs, 5);
                   hypre_CopyBox(&vbox, box);
-                  hypre_BoxIMax(box)[2]= hypre_BoxIMin(box)[2];
+                  hypre_BoxIMax(box)[2] = hypre_BoxIMin(box)[2];
 
                   hypre_BoxIMin(box)[0]++; /* contract */
                   hypre_BoxIMax(box)[0]--; /* contract */
@@ -286,342 +287,342 @@ hypre_SStructSharedDOF_ParcsrMatRowsComm( hypre_SStructGrid    *grid,
                   hypre_BoxIMax(box)[1]--; /* contract */
 
                   /* send boxes are cell-based stretching out of cellbox - i.e., cells
-                     that have these edges as boundary */ 
-                  send_slabs= hypre_BoxArrayCreate(nbdry_slabs, ndim);
-   
-                  box= hypre_BoxArrayBox(send_slabs, 0);
+                     that have these edges as boundary */
+                  send_slabs = hypre_BoxArrayCreate(nbdry_slabs, ndim);
+
+                  box = hypre_BoxArrayBox(send_slabs, 0);
                   hypre_CopyBox(cellbox, box);
                   hypre_BoxIMax(box)[0]++;
-                  hypre_BoxIMin(box)[0]= hypre_BoxIMax(box)[0];
+                  hypre_BoxIMin(box)[0] = hypre_BoxIMax(box)[0];
 
                   hypre_BoxIMax(box)[2]++; /* stretch one layer +/- k*/
-                  hypre_BoxIMin(box)[2]--; 
+                  hypre_BoxIMin(box)[2]--;
 
                   hypre_BoxIMax(box)[1]++; /* stretch one layer +/- j*/
-                  hypre_BoxIMin(box)[1]--; 
+                  hypre_BoxIMin(box)[1]--;
 
 
-                  box= hypre_BoxArrayBox(send_slabs, 1);
+                  box = hypre_BoxArrayBox(send_slabs, 1);
                   hypre_CopyBox(cellbox, box);
                   hypre_BoxIMin(box)[0]--;
-                  hypre_BoxIMax(box)[0]= hypre_BoxIMin(box)[0];
+                  hypre_BoxIMax(box)[0] = hypre_BoxIMin(box)[0];
 
                   hypre_BoxIMax(box)[2]++; /* stretch one layer +/- k*/
-                  hypre_BoxIMin(box)[2]--; 
+                  hypre_BoxIMin(box)[2]--;
 
                   hypre_BoxIMax(box)[1]++; /* stretch one layer +/- j*/
-                  hypre_BoxIMin(box)[1]--; 
+                  hypre_BoxIMin(box)[1]--;
 
 
-                  box= hypre_BoxArrayBox(send_slabs, 2);
+                  box = hypre_BoxArrayBox(send_slabs, 2);
                   hypre_CopyBox(cellbox, box);
                   hypre_BoxIMax(box)[1]++;
-                  hypre_BoxIMin(box)[1]= hypre_BoxIMax(box)[1];
+                  hypre_BoxIMin(box)[1] = hypre_BoxIMax(box)[1];
 
                   hypre_BoxIMax(box)[2]++; /* stretch one layer +/- k*/
                   hypre_BoxIMin(box)[2]--;
 
-                  box= hypre_BoxArrayBox(send_slabs, 3);
+                  box = hypre_BoxArrayBox(send_slabs, 3);
                   hypre_CopyBox(cellbox, box);
                   hypre_BoxIMin(box)[1]--;
-                  hypre_BoxIMax(box)[1]= hypre_BoxIMin(box)[1];
+                  hypre_BoxIMax(box)[1] = hypre_BoxIMin(box)[1];
 
                   hypre_BoxIMax(box)[2]++; /* stretch one layer +/- k*/
                   hypre_BoxIMin(box)[2]--;
 
 
-                  box= hypre_BoxArrayBox(send_slabs, 4);
+                  box = hypre_BoxArrayBox(send_slabs, 4);
                   hypre_CopyBox(cellbox, box);
                   hypre_BoxIMax(box)[2]++;
-                  hypre_BoxIMin(box)[2]= hypre_BoxIMax(box)[2];
+                  hypre_BoxIMin(box)[2] = hypre_BoxIMax(box)[2];
 
 
-                  box= hypre_BoxArrayBox(send_slabs, 5);
+                  box = hypre_BoxArrayBox(send_slabs, 5);
                   hypre_CopyBox(cellbox, box);
                   hypre_BoxIMin(box)[2]--;
-                  hypre_BoxIMax(box)[2]= hypre_BoxIMin(box)[2];
+                  hypre_BoxIMax(box)[2] = hypre_BoxIMin(box)[2];
 
                   break;
                }
 
                case 2:  /* x-face based */
                {
-                  nbdry_slabs= 2;
-                  recv_slabs= hypre_BoxArrayCreate(nbdry_slabs, ndim);
+                  nbdry_slabs = 2;
+                  recv_slabs = hypre_BoxArrayCreate(nbdry_slabs, ndim);
 
                   /* slab in the +/- i direction */
-                  box= hypre_BoxArrayBox(recv_slabs, 0);
+                  box = hypre_BoxArrayBox(recv_slabs, 0);
                   hypre_CopyBox(&vbox, box);
-                  hypre_BoxIMin(box)[0]= hypre_BoxIMax(box)[0];
+                  hypre_BoxIMin(box)[0] = hypre_BoxIMax(box)[0];
 
-                  box= hypre_BoxArrayBox(recv_slabs, 1);
+                  box = hypre_BoxArrayBox(recv_slabs, 1);
                   hypre_CopyBox(&vbox, box);
-                  hypre_BoxIMax(box)[0]= hypre_BoxIMin(box)[0];
+                  hypre_BoxIMax(box)[0] = hypre_BoxIMin(box)[0];
 
                   /* send boxes are cell-based stretching out of cellbox - i.e., cells
-                     that have these edges as boundary */ 
-                  send_slabs= hypre_BoxArrayCreate(nbdry_slabs, ndim);
-   
-                  box= hypre_BoxArrayBox(send_slabs, 0);
+                     that have these edges as boundary */
+                  send_slabs = hypre_BoxArrayCreate(nbdry_slabs, ndim);
+
+                  box = hypre_BoxArrayBox(send_slabs, 0);
                   hypre_CopyBox(cellbox, box);
                   hypre_BoxIMax(box)[0]++;
-                  hypre_BoxIMin(box)[0]= hypre_BoxIMax(box)[0];
+                  hypre_BoxIMin(box)[0] = hypre_BoxIMax(box)[0];
 
-                  box= hypre_BoxArrayBox(send_slabs, 1);
+                  box = hypre_BoxArrayBox(send_slabs, 1);
                   hypre_CopyBox(cellbox, box);
                   hypre_BoxIMin(box)[0]--;
-                  hypre_BoxIMax(box)[0]= hypre_BoxIMin(box)[0];
+                  hypre_BoxIMax(box)[0] = hypre_BoxIMin(box)[0];
 
                   break;
                }
 
                case 3:  /* y-face based */
                {
-                  nbdry_slabs= 2;
-                  recv_slabs= hypre_BoxArrayCreate(nbdry_slabs, ndim);
+                  nbdry_slabs = 2;
+                  recv_slabs = hypre_BoxArrayCreate(nbdry_slabs, ndim);
 
                   /* slab in the +/- j direction */
-                  box= hypre_BoxArrayBox(recv_slabs, 0);
+                  box = hypre_BoxArrayBox(recv_slabs, 0);
                   hypre_CopyBox(&vbox, box);
-                  hypre_BoxIMin(box)[1]= hypre_BoxIMax(box)[1];
+                  hypre_BoxIMin(box)[1] = hypre_BoxIMax(box)[1];
 
-                  box= hypre_BoxArrayBox(recv_slabs, 1);
+                  box = hypre_BoxArrayBox(recv_slabs, 1);
                   hypre_CopyBox(&vbox, box);
-                  hypre_BoxIMax(box)[1]= hypre_BoxIMin(box)[1];
+                  hypre_BoxIMax(box)[1] = hypre_BoxIMin(box)[1];
 
                   /* send boxes are cell-based stretching out of cellbox - i.e., cells
                      that have these edges as boundary */
-                  send_slabs= hypre_BoxArrayCreate(nbdry_slabs, ndim);
+                  send_slabs = hypre_BoxArrayCreate(nbdry_slabs, ndim);
 
-                  box= hypre_BoxArrayBox(send_slabs, 0);
+                  box = hypre_BoxArrayBox(send_slabs, 0);
                   hypre_CopyBox(cellbox, box);
                   hypre_BoxIMax(box)[1]++;
-                  hypre_BoxIMin(box)[1]= hypre_BoxIMax(box)[1];
+                  hypre_BoxIMin(box)[1] = hypre_BoxIMax(box)[1];
 
-                  box= hypre_BoxArrayBox(send_slabs, 1);
+                  box = hypre_BoxArrayBox(send_slabs, 1);
                   hypre_CopyBox(cellbox, box);
                   hypre_BoxIMin(box)[1]--;
-                  hypre_BoxIMax(box)[1]= hypre_BoxIMin(box)[1];
+                  hypre_BoxIMax(box)[1] = hypre_BoxIMin(box)[1];
 
                   break;
                }
 
                case 4:  /* z-face based */
                {
-                  nbdry_slabs= 2;
-                  recv_slabs= hypre_BoxArrayCreate(nbdry_slabs, ndim);
+                  nbdry_slabs = 2;
+                  recv_slabs = hypre_BoxArrayCreate(nbdry_slabs, ndim);
 
                   /* slab in the +/- k direction */
-                  box= hypre_BoxArrayBox(recv_slabs, 0);
+                  box = hypre_BoxArrayBox(recv_slabs, 0);
                   hypre_CopyBox(&vbox, box);
-                  hypre_BoxIMin(box)[2]= hypre_BoxIMax(box)[2];
+                  hypre_BoxIMin(box)[2] = hypre_BoxIMax(box)[2];
 
-                  box= hypre_BoxArrayBox(recv_slabs, 1);
+                  box = hypre_BoxArrayBox(recv_slabs, 1);
                   hypre_CopyBox(&vbox, box);
-                  hypre_BoxIMax(box)[2]= hypre_BoxIMin(box)[2];
+                  hypre_BoxIMax(box)[2] = hypre_BoxIMin(box)[2];
 
                   /* send boxes are cell-based stretching out of cellbox - i.e., cells
                      that have these edges as boundary */
-                  send_slabs= hypre_BoxArrayCreate(nbdry_slabs, ndim);
+                  send_slabs = hypre_BoxArrayCreate(nbdry_slabs, ndim);
 
-                  box= hypre_BoxArrayBox(send_slabs, 0);
+                  box = hypre_BoxArrayBox(send_slabs, 0);
                   hypre_CopyBox(cellbox, box);
                   hypre_BoxIMax(box)[2]++;
-                  hypre_BoxIMin(box)[2]= hypre_BoxIMax(box)[2];
+                  hypre_BoxIMin(box)[2] = hypre_BoxIMax(box)[2];
 
-                  box= hypre_BoxArrayBox(send_slabs, 1);
+                  box = hypre_BoxArrayBox(send_slabs, 1);
                   hypre_CopyBox(cellbox, box);
                   hypre_BoxIMin(box)[2]--;
-                  hypre_BoxIMax(box)[2]= hypre_BoxIMin(box)[2];
+                  hypre_BoxIMax(box)[2] = hypre_BoxIMin(box)[2];
 
                   break;
                }
 
                case 5:  /* x-edge based */
                {
-                  nbdry_slabs= 4;
-                  recv_slabs= hypre_BoxArrayCreate(nbdry_slabs, ndim);
+                  nbdry_slabs = 4;
+                  recv_slabs = hypre_BoxArrayCreate(nbdry_slabs, ndim);
 
                   /* slab in the +/- j & k direction */
-                  box= hypre_BoxArrayBox(recv_slabs, 0);
+                  box = hypre_BoxArrayBox(recv_slabs, 0);
                   hypre_CopyBox(&vbox, box);
-                  hypre_BoxIMin(box)[1]= hypre_BoxIMax(box)[1];
+                  hypre_BoxIMin(box)[1] = hypre_BoxIMax(box)[1];
 
-                  box= hypre_BoxArrayBox(recv_slabs, 1);
+                  box = hypre_BoxArrayBox(recv_slabs, 1);
                   hypre_CopyBox(&vbox, box);
-                  hypre_BoxIMax(box)[1]= hypre_BoxIMin(box)[1];
+                  hypre_BoxIMax(box)[1] = hypre_BoxIMin(box)[1];
 
                   /* need to contract the slab in the j direction to avoid repeated
                      counting of some x-edges. */
-                  box= hypre_BoxArrayBox(recv_slabs, 2);
+                  box = hypre_BoxArrayBox(recv_slabs, 2);
                   hypre_CopyBox(&vbox, box);
-                  hypre_BoxIMin(box)[2]= hypre_BoxIMax(box)[2];
+                  hypre_BoxIMin(box)[2] = hypre_BoxIMax(box)[2];
 
                   hypre_BoxIMin(box)[1]++; /* contract */
                   hypre_BoxIMax(box)[1]--; /* contract */
 
-                  box= hypre_BoxArrayBox(recv_slabs, 3);
+                  box = hypre_BoxArrayBox(recv_slabs, 3);
                   hypre_CopyBox(&vbox, box);
-                  hypre_BoxIMax(box)[2]= hypre_BoxIMin(box)[2];
+                  hypre_BoxIMax(box)[2] = hypre_BoxIMin(box)[2];
 
                   hypre_BoxIMin(box)[1]++; /* contract */
                   hypre_BoxIMax(box)[1]--; /* contract */
 
                   /* send boxes are cell-based stretching out of cellbox - i.e., cells
                      that have these edges as boundary */
-                  send_slabs= hypre_BoxArrayCreate(nbdry_slabs, ndim);
+                  send_slabs = hypre_BoxArrayCreate(nbdry_slabs, ndim);
 
-                  box= hypre_BoxArrayBox(send_slabs, 0);
+                  box = hypre_BoxArrayBox(send_slabs, 0);
                   hypre_CopyBox(cellbox, box);
                   hypre_BoxIMax(box)[1]++;
-                  hypre_BoxIMin(box)[1]= hypre_BoxIMax(box)[1];
+                  hypre_BoxIMin(box)[1] = hypre_BoxIMax(box)[1];
 
                   hypre_BoxIMax(box)[2]++; /* stretch one layer +/- k*/
-                  hypre_BoxIMin(box)[2]--; 
+                  hypre_BoxIMin(box)[2]--;
 
-                  box= hypre_BoxArrayBox(send_slabs, 1);
+                  box = hypre_BoxArrayBox(send_slabs, 1);
                   hypre_CopyBox(cellbox, box);
                   hypre_BoxIMin(box)[1]--;
-                  hypre_BoxIMax(box)[1]= hypre_BoxIMin(box)[1];
+                  hypre_BoxIMax(box)[1] = hypre_BoxIMin(box)[1];
 
                   hypre_BoxIMax(box)[2]++; /* stretch one layer +/- k*/
                   hypre_BoxIMin(box)[2]--;
 
-                  box= hypre_BoxArrayBox(send_slabs, 2);
+                  box = hypre_BoxArrayBox(send_slabs, 2);
                   hypre_CopyBox(cellbox, box);
-                  hypre_BoxIMax(box)[2]++; 
-                  hypre_BoxIMin(box)[2]= hypre_BoxIMax(box)[2];
+                  hypre_BoxIMax(box)[2]++;
+                  hypre_BoxIMin(box)[2] = hypre_BoxIMax(box)[2];
 
-                  box= hypre_BoxArrayBox(send_slabs, 3);
+                  box = hypre_BoxArrayBox(send_slabs, 3);
                   hypre_CopyBox(cellbox, box);
-                  hypre_BoxIMin(box)[2]--; 
-                  hypre_BoxIMax(box)[2]= hypre_BoxIMin(box)[2];
+                  hypre_BoxIMin(box)[2]--;
+                  hypre_BoxIMax(box)[2] = hypre_BoxIMin(box)[2];
 
                   break;
-               }  
+               }
 
                case 6:  /* y-edge based */
                {
-                  nbdry_slabs= 4;
-                  recv_slabs= hypre_BoxArrayCreate(nbdry_slabs, ndim);
+                  nbdry_slabs = 4;
+                  recv_slabs = hypre_BoxArrayCreate(nbdry_slabs, ndim);
 
                   /* slab in the +/- i & k direction */
-                  box= hypre_BoxArrayBox(recv_slabs, 0);
+                  box = hypre_BoxArrayBox(recv_slabs, 0);
                   hypre_CopyBox(&vbox, box);
-                  hypre_BoxIMin(box)[0]= hypre_BoxIMax(box)[0];
+                  hypre_BoxIMin(box)[0] = hypre_BoxIMax(box)[0];
 
-                  box= hypre_BoxArrayBox(recv_slabs, 1);
+                  box = hypre_BoxArrayBox(recv_slabs, 1);
                   hypre_CopyBox(&vbox, box);
-                  hypre_BoxIMax(box)[0]= hypre_BoxIMin(box)[0];
+                  hypre_BoxIMax(box)[0] = hypre_BoxIMin(box)[0];
 
                   /* need to contract the slab in the i direction to avoid repeated
                      counting of some y-edges. */
-                  box= hypre_BoxArrayBox(recv_slabs, 2);
+                  box = hypre_BoxArrayBox(recv_slabs, 2);
                   hypre_CopyBox(&vbox, box);
-                  hypre_BoxIMin(box)[2]= hypre_BoxIMax(box)[2];
+                  hypre_BoxIMin(box)[2] = hypre_BoxIMax(box)[2];
 
                   hypre_BoxIMin(box)[0]++; /* contract */
                   hypre_BoxIMax(box)[0]--; /* contract */
 
-                  box= hypre_BoxArrayBox(recv_slabs, 3);
+                  box = hypre_BoxArrayBox(recv_slabs, 3);
                   hypre_CopyBox(&vbox, box);
-                  hypre_BoxIMax(box)[2]= hypre_BoxIMin(box)[2];
+                  hypre_BoxIMax(box)[2] = hypre_BoxIMin(box)[2];
 
                   hypre_BoxIMin(box)[0]++; /* contract */
                   hypre_BoxIMax(box)[0]--; /* contract */
 
                   /* send boxes are cell-based stretching out of cellbox - i.e., cells
                      that have these edges as boundary */
-                  send_slabs= hypre_BoxArrayCreate(nbdry_slabs, ndim);
+                  send_slabs = hypre_BoxArrayCreate(nbdry_slabs, ndim);
 
-                  box= hypre_BoxArrayBox(send_slabs, 0);
+                  box = hypre_BoxArrayBox(send_slabs, 0);
                   hypre_CopyBox(cellbox, box);
                   hypre_BoxIMax(box)[0]++;
-                  hypre_BoxIMin(box)[0]= hypre_BoxIMax(box)[0];
+                  hypre_BoxIMin(box)[0] = hypre_BoxIMax(box)[0];
 
                   hypre_BoxIMax(box)[2]++; /* stretch one layer +/- k*/
-                  hypre_BoxIMin(box)[2]--; 
+                  hypre_BoxIMin(box)[2]--;
 
-                  box= hypre_BoxArrayBox(send_slabs, 1);
+                  box = hypre_BoxArrayBox(send_slabs, 1);
                   hypre_CopyBox(cellbox, box);
                   hypre_BoxIMin(box)[0]--;
-                  hypre_BoxIMax(box)[0]= hypre_BoxIMin(box)[0];
+                  hypre_BoxIMax(box)[0] = hypre_BoxIMin(box)[0];
 
                   hypre_BoxIMax(box)[2]++; /* stretch one layer +/- k*/
                   hypre_BoxIMin(box)[2]--;
 
-                  box= hypre_BoxArrayBox(send_slabs, 2);
+                  box = hypre_BoxArrayBox(send_slabs, 2);
                   hypre_CopyBox(cellbox, box);
-                  hypre_BoxIMax(box)[2]++; 
-                  hypre_BoxIMin(box)[2]= hypre_BoxIMax(box)[2];
+                  hypre_BoxIMax(box)[2]++;
+                  hypre_BoxIMin(box)[2] = hypre_BoxIMax(box)[2];
 
-                  box= hypre_BoxArrayBox(send_slabs, 3);
+                  box = hypre_BoxArrayBox(send_slabs, 3);
                   hypre_CopyBox(cellbox, box);
-                  hypre_BoxIMin(box)[2]--; 
-                  hypre_BoxIMax(box)[2]= hypre_BoxIMin(box)[2];
+                  hypre_BoxIMin(box)[2]--;
+                  hypre_BoxIMax(box)[2] = hypre_BoxIMin(box)[2];
 
                   break;
                }
 
                case 7:  /* z-edge based */
                {
-                  nbdry_slabs= 4;
-                  recv_slabs= hypre_BoxArrayCreate(nbdry_slabs, ndim);
+                  nbdry_slabs = 4;
+                  recv_slabs = hypre_BoxArrayCreate(nbdry_slabs, ndim);
 
                   /* slab in the +/- i & j direction */
-                  box= hypre_BoxArrayBox(recv_slabs, 0);
+                  box = hypre_BoxArrayBox(recv_slabs, 0);
                   hypre_CopyBox(&vbox, box);
-                  hypre_BoxIMin(box)[0]= hypre_BoxIMax(box)[0];
+                  hypre_BoxIMin(box)[0] = hypre_BoxIMax(box)[0];
 
-                  box= hypre_BoxArrayBox(recv_slabs, 1);
+                  box = hypre_BoxArrayBox(recv_slabs, 1);
                   hypre_CopyBox(&vbox, box);
-                  hypre_BoxIMax(box)[0]= hypre_BoxIMin(box)[0];
+                  hypre_BoxIMax(box)[0] = hypre_BoxIMin(box)[0];
 
                   /* need to contract the slab in the i direction to avoid repeated
                      counting of some z-edges. */
-                  box= hypre_BoxArrayBox(recv_slabs, 2);
+                  box = hypre_BoxArrayBox(recv_slabs, 2);
                   hypre_CopyBox(&vbox, box);
-                  hypre_BoxIMin(box)[1]= hypre_BoxIMax(box)[1];
+                  hypre_BoxIMin(box)[1] = hypre_BoxIMax(box)[1];
 
                   hypre_BoxIMin(box)[0]++; /* contract */
                   hypre_BoxIMax(box)[0]--; /* contract */
 
-                  box= hypre_BoxArrayBox(recv_slabs, 3);
+                  box = hypre_BoxArrayBox(recv_slabs, 3);
                   hypre_CopyBox(&vbox, box);
-                  hypre_BoxIMax(box)[1]= hypre_BoxIMin(box)[1];
+                  hypre_BoxIMax(box)[1] = hypre_BoxIMin(box)[1];
 
                   hypre_BoxIMin(box)[0]++; /* contract */
                   hypre_BoxIMax(box)[0]--; /* contract */
 
                   /* send boxes are cell-based stretching out of cellbox - i.e., cells
                      that have these edges as boundary */
-                  send_slabs= hypre_BoxArrayCreate(nbdry_slabs, ndim);
+                  send_slabs = hypre_BoxArrayCreate(nbdry_slabs, ndim);
 
-                  box= hypre_BoxArrayBox(send_slabs, 0);
+                  box = hypre_BoxArrayBox(send_slabs, 0);
                   hypre_CopyBox(cellbox, box);
                   hypre_BoxIMax(box)[1]++;
-                  hypre_BoxIMin(box)[1]= hypre_BoxIMax(box)[1];
+                  hypre_BoxIMin(box)[1] = hypre_BoxIMax(box)[1];
 
                   hypre_BoxIMax(box)[0]++; /* stretch one layer +/- i*/
-                  hypre_BoxIMin(box)[0]--; 
+                  hypre_BoxIMin(box)[0]--;
 
-                  box= hypre_BoxArrayBox(send_slabs, 1);
+                  box = hypre_BoxArrayBox(send_slabs, 1);
                   hypre_CopyBox(cellbox, box);
                   hypre_BoxIMin(box)[1]--;
-                  hypre_BoxIMax(box)[1]= hypre_BoxIMin(box)[1];
+                  hypre_BoxIMax(box)[1] = hypre_BoxIMin(box)[1];
 
                   hypre_BoxIMax(box)[0]++; /* stretch one layer +/- i*/
                   hypre_BoxIMin(box)[0]--;
 
-                  box= hypre_BoxArrayBox(send_slabs, 2);
+                  box = hypre_BoxArrayBox(send_slabs, 2);
                   hypre_CopyBox(cellbox, box);
-                  hypre_BoxIMax(box)[0]++; 
-                  hypre_BoxIMin(box)[0]= hypre_BoxIMax(box)[0];
+                  hypre_BoxIMax(box)[0]++;
+                  hypre_BoxIMin(box)[0] = hypre_BoxIMax(box)[0];
 
-                  box= hypre_BoxArrayBox(send_slabs, 3);
+                  box = hypre_BoxArrayBox(send_slabs, 3);
                   hypre_CopyBox(cellbox, box);
-                  hypre_BoxIMin(box)[0]--; 
-                  hypre_BoxIMax(box)[0]= hypre_BoxIMin(box)[0];
+                  hypre_BoxIMin(box)[0]--;
+                  hypre_BoxIMax(box)[0] = hypre_BoxIMin(box)[0];
 
                   break;
                }
@@ -629,13 +630,13 @@ hypre_SStructSharedDOF_ParcsrMatRowsComm( hypre_SStructGrid    *grid,
             }  /* switch(var) */
 
             /* determine no. of recv rows */
-            for (i= 0; i< nbdry_slabs; i++)
+            for (i = 0; i < nbdry_slabs; i++)
             {
-               box= hypre_BoxArrayBox(recv_slabs, i);
+               box = hypre_BoxArrayBox(recv_slabs, i);
                hypre_BoxManIntersect(boxmans[t], hypre_BoxIMin(box), hypre_BoxIMax(box),
                                      &boxman_entries, &nboxman_entries);
 
-               for (m= 0; m< nboxman_entries; m++)
+               for (m = 0; m < nboxman_entries; m++)
                {
                   hypre_SStructBoxManEntryGetProcess(boxman_entries[m], &proc);
                   if (proc != myproc)
@@ -644,17 +645,17 @@ hypre_SStructSharedDOF_ParcsrMatRowsComm( hypre_SStructGrid    *grid,
                      hypre_BoxSetExtents(&boxman_entry_box, ilower, iupper);
                      hypre_IntersectBoxes(&boxman_entry_box, box, &boxman_entry_box);
 
-                     RecvFromProcs[proc]+= hypre_BoxVolume(&boxman_entry_box);
+                     RecvFromProcs[proc] += hypre_BoxVolume(&boxman_entry_box);
                   }
                }
                hypre_TFree(boxman_entries, HYPRE_MEMORY_HOST);
-                  
+
                /* determine send rows. Note the cell_boxman */
-               box= hypre_BoxArrayBox(send_slabs, i);
+               box = hypre_BoxArrayBox(send_slabs, i);
                hypre_BoxManIntersect(cell_boxman, hypre_BoxIMin(box), hypre_BoxIMax(box),
                                      &boxman_entries, &nboxman_entries);
 
-               for (m= 0; m< nboxman_entries; m++)
+               for (m = 0; m < nboxman_entries; m++)
                {
                   hypre_SStructBoxManEntryGetProcess(boxman_entries[m], &proc);
                   if (proc != myproc)
@@ -663,7 +664,7 @@ hypre_SStructSharedDOF_ParcsrMatRowsComm( hypre_SStructGrid    *grid,
                      hypre_BoxSetExtents(&boxman_entry_box, ilower, iupper);
                      hypre_IntersectBoxes(&boxman_entry_box, box, &boxman_entry_box);
 
-                     /* not correct box piece right now. Need to determine 
+                     /* not correct box piece right now. Need to determine
                         the correct var box - extend to var_box and then intersect
                         with vbox */
                      hypre_SubtractIndexes(hypre_BoxIMin(&boxman_entry_box),
@@ -671,13 +672,13 @@ hypre_SStructSharedDOF_ParcsrMatRowsComm( hypre_SStructGrid    *grid,
                                            hypre_BoxIMin(&boxman_entry_box));
                      hypre_IntersectBoxes(&boxman_entry_box, &vbox, &boxman_entry_box);
 
-                     SendToProcs[proc]+= 2*hypre_BoxVolume(&boxman_entry_box);
+                     SendToProcs[proc] += 2 * hypre_BoxVolume(&boxman_entry_box);
                      /* check to see if sufficient memory allocation for send_rows */
                      if (SendToProcs[proc] > send_RowsNcols_alloc[proc])
                      {
-                        send_RowsNcols_alloc[proc]= SendToProcs[proc];
-                        send_RowsNcols[proc]= 
-                           hypre_TReAlloc(send_RowsNcols[proc],  HYPRE_Int, 
+                        send_RowsNcols_alloc[proc] = SendToProcs[proc];
+                        send_RowsNcols[proc] =
+                           hypre_TReAlloc(send_RowsNcols[proc],  HYPRE_Int,
                                           send_RowsNcols_alloc[proc], HYPRE_MEMORY_HOST);
                      }
 
@@ -702,26 +703,26 @@ hypre_SStructSharedDOF_ParcsrMatRowsComm( hypre_SStructGrid    *grid,
                               checking (difficult) the whole expanded box is on myproc */
                            if (rank <= end_rank && rank >= start_rank)
                            {
-                              send_RowsNcols[proc][tot_nsendRowsNcols[proc]]= rank;
+                              send_RowsNcols[proc][tot_nsendRowsNcols[proc]] = rank;
                               tot_nsendRowsNcols[proc]++;
 
-                              HYPRE_ParCSRMatrixGetRow((HYPRE_ParCSRMatrix) A, rank, &n, 
+                              HYPRE_ParCSRMatrixGetRow((HYPRE_ParCSRMatrix) A, rank, &n,
                                                        &col_inds, &values);
-                              send_RowsNcols[proc][tot_nsendRowsNcols[proc]]= n;
+                              send_RowsNcols[proc][tot_nsendRowsNcols[proc]] = n;
                               tot_nsendRowsNcols[proc]++;
 
                               /* check if sufficient memory allocation in the data arrays */
-                              if ( (tot_sendColsData[proc]+2*n) > send_ColsData_alloc[proc] )
+                              if ( (tot_sendColsData[proc] + 2 * n) > send_ColsData_alloc[proc] )
                               {
-                                 send_ColsData_alloc[proc]+= 2000;
-                                 vals[proc]= hypre_TReAlloc(vals[proc],  HYPRE_Real, 
-                                                            send_ColsData_alloc[proc], HYPRE_MEMORY_HOST);
+                                 send_ColsData_alloc[proc] += 2000;
+                                 vals[proc] = hypre_TReAlloc(vals[proc],  HYPRE_Real,
+                                                             send_ColsData_alloc[proc], HYPRE_MEMORY_HOST);
                               }
-                              for (k= 0; k< n; k++)
+                              for (k = 0; k < n; k++)
                               {
-                                 vals[proc][tot_sendColsData[proc]]= (HYPRE_Real) col_inds[k];
+                                 vals[proc][tot_sendColsData[proc]] = (HYPRE_Real) col_inds[k];
                                  tot_sendColsData[proc]++;
-                                 vals[proc][tot_sendColsData[proc]]= values[k];
+                                 vals[proc][tot_sendColsData[proc]] = values[k];
                                  tot_sendColsData[proc]++;
                               }
                               HYPRE_ParCSRMatrixRestoreRow((HYPRE_ParCSRMatrix) A, rank, &n,
@@ -746,17 +747,17 @@ hypre_SStructSharedDOF_ParcsrMatRowsComm( hypre_SStructGrid    *grid,
 
    HYPRE_SStructGridDestroy(cell_ssgrid);
 
-   num_sends= 0;
-   num_recvs= 0;
-   k= 0;
-   starts= hypre_CTAlloc(HYPRE_Int,  nprocs+1, HYPRE_MEMORY_HOST);
-   for (i= 0; i< nprocs; i++)
+   num_sends = 0;
+   num_recvs = 0;
+   k = 0;
+   starts = hypre_CTAlloc(HYPRE_Int,  nprocs + 1, HYPRE_MEMORY_HOST);
+   for (i = 0; i < nprocs; i++)
    {
-      starts[i+1]= starts[i]+RecvFromProcs[i];
+      starts[i + 1] = starts[i] + RecvFromProcs[i];
       if (RecvFromProcs[i])
       {
          num_recvs++;
-         k+= RecvFromProcs[i];
+         k += RecvFromProcs[i];
       }
 
       if (tot_sendColsData[i])
@@ -764,29 +765,29 @@ hypre_SStructSharedDOF_ParcsrMatRowsComm( hypre_SStructGrid    *grid,
          num_sends++;
       }
    }
-   OffProcRows= hypre_TAlloc(hypre_MaxwellOffProcRow *,  k, HYPRE_MEMORY_HOST);
-   *num_offprocrows_ptr= k;
+   OffProcRows = hypre_TAlloc(hypre_MaxwellOffProcRow *,  k, HYPRE_MEMORY_HOST);
+   *num_offprocrows_ptr = k;
 
-   requests= hypre_CTAlloc(hypre_MPI_Request,  num_sends+num_recvs, HYPRE_MEMORY_HOST);
-   status  = hypre_CTAlloc(hypre_MPI_Status,  num_sends+num_recvs, HYPRE_MEMORY_HOST);
+   requests = hypre_CTAlloc(hypre_MPI_Request,  num_sends + num_recvs, HYPRE_MEMORY_HOST);
+   status  = hypre_CTAlloc(hypre_MPI_Status,  num_sends + num_recvs, HYPRE_MEMORY_HOST);
 
    /* send row size data */
-   j= 0; 
-   rbuffer_RowsNcols= hypre_TAlloc(HYPRE_Int *,  nprocs, HYPRE_MEMORY_HOST);
+   j = 0;
+   rbuffer_RowsNcols = hypre_TAlloc(HYPRE_Int *,  nprocs, HYPRE_MEMORY_HOST);
    rbuffer_ColsData = hypre_TAlloc(HYPRE_Real *,  nprocs, HYPRE_MEMORY_HOST);
 
-   for (proc= 0; proc< nprocs; proc++)
+   for (proc = 0; proc < nprocs; proc++)
    {
       if (RecvFromProcs[proc])
       {
-         rbuffer_RowsNcols[proc]= hypre_TAlloc(HYPRE_Int,  2*RecvFromProcs[proc], HYPRE_MEMORY_HOST);
-         hypre_MPI_Irecv(rbuffer_RowsNcols[proc], 2*RecvFromProcs[proc], HYPRE_MPI_INT, 
+         rbuffer_RowsNcols[proc] = hypre_TAlloc(HYPRE_Int,  2 * RecvFromProcs[proc], HYPRE_MEMORY_HOST);
+         hypre_MPI_Irecv(rbuffer_RowsNcols[proc], 2 * RecvFromProcs[proc], HYPRE_MPI_INT,
                          proc, 0, grid_comm, &requests[j++]);
       }  /* if (RecvFromProcs[proc]) */
 
    }     /* for (proc= 0; proc< nprocs; proc++) */
-        
-   for (proc= 0; proc< nprocs; proc++)
+
+   for (proc = 0; proc < nprocs; proc++)
    {
       if (tot_nsendRowsNcols[proc])
       {
@@ -798,24 +799,25 @@ hypre_SStructSharedDOF_ParcsrMatRowsComm( hypre_SStructGrid    *grid,
    hypre_MPI_Waitall(j, requests, status);
 
    /* unpack data */
-   for (proc= 0; proc< nprocs; proc++)
+   for (proc = 0; proc < nprocs; proc++)
    {
-      send_RowsNcols_alloc[proc]= 0;
+      send_RowsNcols_alloc[proc] = 0;
       if (RecvFromProcs[proc])
       {
-         m= 0; ;
-         for (i= 0; i< RecvFromProcs[proc]; i++)
+         m = 0; ;
+         for (i = 0; i < RecvFromProcs[proc]; i++)
          {
             /* rbuffer_RowsNcols[m] has the row & rbuffer_RowsNcols[m+1] the col size */
-            OffProcRows[starts[proc]+i]= hypre_MaxwellOffProcRowCreate(rbuffer_RowsNcols[proc][m+1]);
-            (OffProcRows[starts[proc]+i] -> row)  = rbuffer_RowsNcols[proc][m];
-            (OffProcRows[starts[proc]+i] -> ncols)= rbuffer_RowsNcols[proc][m+1];
+            OffProcRows[starts[proc] + i] = hypre_MaxwellOffProcRowCreate(rbuffer_RowsNcols[proc][m + 1]);
+            (OffProcRows[starts[proc] + i] -> row)  = rbuffer_RowsNcols[proc][m];
+            (OffProcRows[starts[proc] + i] -> ncols) = rbuffer_RowsNcols[proc][m + 1];
 
-            send_RowsNcols_alloc[proc]+= rbuffer_RowsNcols[proc][m+1];
-            m+= 2;
+            send_RowsNcols_alloc[proc] += rbuffer_RowsNcols[proc][m + 1];
+            m += 2;
          }
 
-         rbuffer_ColsData[proc]= hypre_TAlloc(HYPRE_Real,  2*send_RowsNcols_alloc[proc], HYPRE_MEMORY_HOST);
+         rbuffer_ColsData[proc] = hypre_TAlloc(HYPRE_Real,  2 * send_RowsNcols_alloc[proc],
+                                               HYPRE_MEMORY_HOST);
          hypre_TFree(rbuffer_RowsNcols[proc], HYPRE_MEMORY_HOST);
       }
    }
@@ -824,21 +826,21 @@ hypre_SStructSharedDOF_ParcsrMatRowsComm( hypre_SStructGrid    *grid,
    hypre_TFree(requests, HYPRE_MEMORY_HOST);
    hypre_TFree(status, HYPRE_MEMORY_HOST);
 
-   requests= hypre_CTAlloc(hypre_MPI_Request,  num_sends+num_recvs, HYPRE_MEMORY_HOST);
-   status  = hypre_CTAlloc(hypre_MPI_Status,  num_sends+num_recvs, HYPRE_MEMORY_HOST);
+   requests = hypre_CTAlloc(hypre_MPI_Request,  num_sends + num_recvs, HYPRE_MEMORY_HOST);
+   status  = hypre_CTAlloc(hypre_MPI_Status,  num_sends + num_recvs, HYPRE_MEMORY_HOST);
 
    /* send row data */
-   j= 0;
-   for (proc= 0; proc< nprocs; proc++)
+   j = 0;
+   for (proc = 0; proc < nprocs; proc++)
    {
       if (RecvFromProcs[proc])
       {
-         hypre_MPI_Irecv(rbuffer_ColsData[proc], 2*send_RowsNcols_alloc[proc], HYPRE_MPI_REAL,
+         hypre_MPI_Irecv(rbuffer_ColsData[proc], 2 * send_RowsNcols_alloc[proc], HYPRE_MPI_REAL,
                          proc, 1, grid_comm, &requests[j++]);
       }  /* if (RecvFromProcs[proc]) */
    }     /* for (proc= 0; proc< nprocs; proc++) */
-                                                                                                                                    
-   for (proc= 0; proc< nprocs; proc++)
+
+   for (proc = 0; proc < nprocs; proc++)
    {
       if (tot_sendColsData[proc])
       {
@@ -846,24 +848,24 @@ hypre_SStructSharedDOF_ParcsrMatRowsComm( hypre_SStructGrid    *grid,
                          1, grid_comm, &requests[j++]);
       }
    }
-                                                                                                                                    
+
    hypre_MPI_Waitall(j, requests, status);
 
    /* unpack data */
-   for (proc= 0; proc< nprocs; proc++)
+   for (proc = 0; proc < nprocs; proc++)
    {
       if (RecvFromProcs[proc])
       {
-         k= 0;
-         for (i= 0; i< RecvFromProcs[proc]; i++)
+         k = 0;
+         for (i = 0; i < RecvFromProcs[proc]; i++)
          {
-            col_inds= (OffProcRows[starts[proc]+i] -> cols);
-            values  = (OffProcRows[starts[proc]+i] -> data);
-            m       = (OffProcRows[starts[proc]+i] -> ncols);
+            col_inds = (OffProcRows[starts[proc] + i] -> cols);
+            values  = (OffProcRows[starts[proc] + i] -> data);
+            m       = (OffProcRows[starts[proc] + i] -> ncols);
 
-            for (t= 0; t< m; t++)
+            for (t = 0; t < m; t++)
             {
-               col_inds[t]= (HYPRE_Int) rbuffer_ColsData[proc][k++];
+               col_inds[t] = (HYPRE_Int) rbuffer_ColsData[proc][k++];
                values[t]  = rbuffer_ColsData[proc][k++];
             }
          }
@@ -875,7 +877,7 @@ hypre_SStructSharedDOF_ParcsrMatRowsComm( hypre_SStructGrid    *grid,
 
    hypre_TFree(requests, HYPRE_MEMORY_HOST);
    hypre_TFree(status, HYPRE_MEMORY_HOST);
-   for (proc= 0; proc< nprocs; proc++)
+   for (proc = 0; proc < nprocs; proc++)
    {
       hypre_TFree(send_RowsNcols[proc], HYPRE_MEMORY_HOST);
       hypre_TFree(vals[proc], HYPRE_MEMORY_HOST);
@@ -890,7 +892,7 @@ hypre_SStructSharedDOF_ParcsrMatRowsComm( hypre_SStructGrid    *grid,
    hypre_TFree(RecvFromProcs, HYPRE_MEMORY_HOST);
    hypre_TFree(starts, HYPRE_MEMORY_HOST);
 
-   *OffProcRows_ptr= OffProcRows;
-            
+   *OffProcRows_ptr = OffProcRows;
+
    return ierr;
 }
diff --git a/external/hypre/src/sstruct_ls/sstruct_sharedDOFComm.h b/external/hypre/src/sstruct_ls/sstruct_sharedDOFComm.h
index 9f28526d..38631070 100644
--- a/external/hypre/src/sstruct_ls/sstruct_sharedDOFComm.h
+++ b/external/hypre/src/sstruct_ls/sstruct_sharedDOFComm.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -8,10 +8,10 @@
 typedef struct
 {
    HYPRE_BigInt row;
-                                                                                                                                    
+
    HYPRE_Int ncols;
    HYPRE_BigInt      *cols;
    HYPRE_Real   *data;
-                                                                                                                                    
+
 } hypre_MaxwellOffProcRow;
 
diff --git a/external/hypre/src/sstruct_ls/sys_pfmg.c b/external/hypre/src/sstruct_ls/sys_pfmg.c
index 8f3070db..262ae493 100644
--- a/external/hypre/src/sstruct_ls/sys_pfmg.c
+++ b/external/hypre/src/sstruct_ls/sys_pfmg.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -32,7 +32,7 @@ hypre_SysPFMGCreate( MPI_Comm  comm )
    (sys_pfmg_data -> dxyz)[2]          = 0.0;
    (sys_pfmg_data -> relax_type)       = 1;       /* weighted Jacobi */
    (sys_pfmg_data -> jacobi_weight)    = 0.0;
-   (sys_pfmg_data -> usr_jacobi_weight)= 0;
+   (sys_pfmg_data -> usr_jacobi_weight) = 0;
    (sys_pfmg_data -> num_pre_relax)    = 1;
    (sys_pfmg_data -> num_post_relax)   = 1;
    (sys_pfmg_data -> skip_relax)       = 1;
@@ -79,7 +79,7 @@ hypre_SysPFMGDestroy( void *sys_pfmg_vdata )
          hypre_TFree(sys_pfmg_data -> matvec_data_l, HYPRE_MEMORY_HOST);
          hypre_TFree(sys_pfmg_data -> restrict_data_l, HYPRE_MEMORY_HOST);
          hypre_TFree(sys_pfmg_data -> interp_data_l, HYPRE_MEMORY_HOST);
- 
+
          hypre_SStructPVectorDestroy(sys_pfmg_data -> tx_l[0]);
          /*hypre_SStructPGridDestroy(sys_pfmg_data -> grid_l[0]);*/
          hypre_SStructPMatrixDestroy(sys_pfmg_data -> A_l[0]);
@@ -87,15 +87,15 @@ hypre_SysPFMGDestroy( void *sys_pfmg_vdata )
          hypre_SStructPVectorDestroy(sys_pfmg_data -> x_l[0]);
          for (l = 0; l < ((sys_pfmg_data -> num_levels) - 1); l++)
          {
-            hypre_SStructPGridDestroy(sys_pfmg_data -> grid_l[l+1]);
-            hypre_SStructPGridDestroy(sys_pfmg_data -> P_grid_l[l+1]);
-            hypre_SStructPMatrixDestroy(sys_pfmg_data -> A_l[l+1]);
+            hypre_SStructPGridDestroy(sys_pfmg_data -> grid_l[l + 1]);
+            hypre_SStructPGridDestroy(sys_pfmg_data -> P_grid_l[l + 1]);
+            hypre_SStructPMatrixDestroy(sys_pfmg_data -> A_l[l + 1]);
             hypre_SStructPMatrixDestroy(sys_pfmg_data -> P_l[l]);
-            hypre_SStructPVectorDestroy(sys_pfmg_data -> b_l[l+1]);
-            hypre_SStructPVectorDestroy(sys_pfmg_data -> x_l[l+1]);
-            hypre_SStructPVectorDestroy(sys_pfmg_data -> tx_l[l+1]);
+            hypre_SStructPVectorDestroy(sys_pfmg_data -> b_l[l + 1]);
+            hypre_SStructPVectorDestroy(sys_pfmg_data -> x_l[l + 1]);
+            hypre_SStructPVectorDestroy(sys_pfmg_data -> tx_l[l + 1]);
          }
-          hypre_TFree(sys_pfmg_data -> data, HYPRE_MEMORY_HOST);
+         hypre_TFree(sys_pfmg_data -> data, HYPRE_MEMORY_HOST);
          hypre_TFree(sys_pfmg_data -> cdir_l, HYPRE_MEMORY_HOST);
          hypre_TFree(sys_pfmg_data -> active_l, HYPRE_MEMORY_HOST);
          hypre_TFree(sys_pfmg_data -> grid_l, HYPRE_MEMORY_HOST);
@@ -107,7 +107,7 @@ hypre_SysPFMGDestroy( void *sys_pfmg_vdata )
          hypre_TFree(sys_pfmg_data -> x_l, HYPRE_MEMORY_HOST);
          hypre_TFree(sys_pfmg_data -> tx_l, HYPRE_MEMORY_HOST);
       }
- 
+
       hypre_FinalizeTiming(sys_pfmg_data -> time_index);
       hypre_TFree(sys_pfmg_data, HYPRE_MEMORY_HOST);
    }
@@ -123,9 +123,9 @@ hypre_SysPFMGSetTol( void   *sys_pfmg_vdata,
                      HYPRE_Real  tol       )
 {
    hypre_SysPFMGData *sys_pfmg_data = (hypre_SysPFMGData *)sys_pfmg_vdata;
- 
+
    (sys_pfmg_data -> tol) = tol;
- 
+
    return hypre_error_flag;
 }
 
@@ -137,9 +137,9 @@ hypre_SysPFMGSetMaxIter( void *sys_pfmg_vdata,
                          HYPRE_Int   max_iter  )
 {
    hypre_SysPFMGData *sys_pfmg_data = (hypre_SysPFMGData *)sys_pfmg_vdata;
- 
+
    (sys_pfmg_data -> max_iter) = max_iter;
- 
+
    return hypre_error_flag;
 }
 
@@ -151,23 +151,23 @@ hypre_SysPFMGSetRelChange( void *sys_pfmg_vdata,
                            HYPRE_Int   rel_change  )
 {
    hypre_SysPFMGData *sys_pfmg_data = (hypre_SysPFMGData *)sys_pfmg_vdata;
- 
+
    (sys_pfmg_data -> rel_change) = rel_change;
- 
+
    return hypre_error_flag;
 }
 
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
- 
+
 HYPRE_Int
 hypre_SysPFMGSetZeroGuess( void *sys_pfmg_vdata,
                            HYPRE_Int   zero_guess )
 {
    hypre_SysPFMGData *sys_pfmg_data = (hypre_SysPFMGData *)sys_pfmg_vdata;
- 
+
    (sys_pfmg_data -> zero_guess) = zero_guess;
- 
+
    return hypre_error_flag;
 }
 
@@ -179,9 +179,9 @@ hypre_SysPFMGSetRelaxType( void *sys_pfmg_vdata,
                            HYPRE_Int   relax_type )
 {
    hypre_SysPFMGData *sys_pfmg_data = (hypre_SysPFMGData *)sys_pfmg_vdata;
- 
+
    (sys_pfmg_data -> relax_type) = relax_type;
- 
+
    return hypre_error_flag;
 }
 
@@ -192,9 +192,9 @@ hypre_SysPFMGSetJacobiWeight( void  *sys_pfmg_vdata,
                               HYPRE_Real weight )
 {
    hypre_SysPFMGData *sys_pfmg_data = (hypre_SysPFMGData *)sys_pfmg_vdata;
-                                                                                                                                     
+
    (sys_pfmg_data -> jacobi_weight)    = weight;
-   (sys_pfmg_data -> usr_jacobi_weight)= 1;
+   (sys_pfmg_data -> usr_jacobi_weight) = 1;
 
    return hypre_error_flag;
 }
@@ -207,9 +207,9 @@ hypre_SysPFMGSetNumPreRelax( void *sys_pfmg_vdata,
                              HYPRE_Int   num_pre_relax )
 {
    hypre_SysPFMGData *sys_pfmg_data = (hypre_SysPFMGData *)sys_pfmg_vdata;
- 
+
    (sys_pfmg_data -> num_pre_relax) = num_pre_relax;
- 
+
    return hypre_error_flag;
 }
 
@@ -221,9 +221,9 @@ hypre_SysPFMGSetNumPostRelax( void *sys_pfmg_vdata,
                               HYPRE_Int   num_post_relax )
 {
    hypre_SysPFMGData *sys_pfmg_data = (hypre_SysPFMGData *)sys_pfmg_vdata;
- 
+
    (sys_pfmg_data -> num_post_relax) = num_post_relax;
- 
+
    return hypre_error_flag;
 }
 
@@ -235,9 +235,9 @@ hypre_SysPFMGSetSkipRelax( void *sys_pfmg_vdata,
                            HYPRE_Int  skip_relax )
 {
    hypre_SysPFMGData *sys_pfmg_data = (hypre_SysPFMGData *)sys_pfmg_vdata;
- 
+
    (sys_pfmg_data -> skip_relax) = skip_relax;
- 
+
    return hypre_error_flag;
 }
 
@@ -253,7 +253,7 @@ hypre_SysPFMGSetDxyz( void   *sys_pfmg_vdata,
    (sys_pfmg_data -> dxyz[0]) = dxyz[0];
    (sys_pfmg_data -> dxyz[1]) = dxyz[1];
    (sys_pfmg_data -> dxyz[2]) = dxyz[2];
- 
+
    return hypre_error_flag;
 }
 
@@ -265,9 +265,9 @@ hypre_SysPFMGSetLogging( void *sys_pfmg_vdata,
                          HYPRE_Int   logging)
 {
    hypre_SysPFMGData *sys_pfmg_data = (hypre_SysPFMGData *)sys_pfmg_vdata;
- 
+
    (sys_pfmg_data -> logging) = logging;
- 
+
    return hypre_error_flag;
 }
 
@@ -279,9 +279,9 @@ hypre_SysPFMGSetPrintLevel( void *sys_pfmg_vdata,
                             HYPRE_Int   print_level)
 {
    hypre_SysPFMGData *sys_pfmg_data = (hypre_SysPFMGData *)sys_pfmg_vdata;
- 
+
    (sys_pfmg_data -> print_level) = print_level;
- 
+
    return hypre_error_flag;
 }
 
@@ -322,13 +322,13 @@ hypre_SysPFMGPrintLogging( void *sys_pfmg_vdata,
          {
             for (i = 0; i < num_iterations; i++)
             {
-               hypre_printf("Residual norm[%d] = %e   ",i,norms[i]);
-               hypre_printf("Relative residual norm[%d] = %e\n",i,rel_norms[i]);
+               hypre_printf("Residual norm[%d] = %e   ", i, norms[i]);
+               hypre_printf("Relative residual norm[%d] = %e\n", i, rel_norms[i]);
             }
          }
       }
    }
-  
+
    return hypre_error_flag;
 }
 
@@ -345,7 +345,7 @@ hypre_SysPFMGGetFinalRelativeResidualNorm( void   *sys_pfmg_vdata,
    HYPRE_Int          num_iterations  = (sys_pfmg_data -> num_iterations);
    HYPRE_Int          logging         = (sys_pfmg_data -> logging);
    HYPRE_Real        *rel_norms       = (sys_pfmg_data -> rel_norms);
-            
+
    if (logging > 0)
    {
       if (max_iter == 0)
@@ -354,14 +354,14 @@ hypre_SysPFMGGetFinalRelativeResidualNorm( void   *sys_pfmg_vdata,
       }
       else if (num_iterations == max_iter)
       {
-         *relative_residual_norm = rel_norms[num_iterations-1];
+         *relative_residual_norm = rel_norms[num_iterations - 1];
       }
       else
       {
          *relative_residual_norm = rel_norms[num_iterations];
       }
    }
-   
+
    return hypre_error_flag;
 }
 
diff --git a/external/hypre/src/sstruct_ls/sys_pfmg.h b/external/hypre/src/sstruct_ls/sys_pfmg.h
index 06f7280b..e19f6569 100644
--- a/external/hypre/src/sstruct_ls/sys_pfmg.h
+++ b/external/hypre/src/sstruct_ls/sys_pfmg.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -21,30 +21,30 @@
 typedef struct
 {
    MPI_Comm              comm;
-                      
+
    HYPRE_Real            tol;
    HYPRE_Int             max_iter;
    HYPRE_Int             rel_change;
    HYPRE_Int             zero_guess;
    HYPRE_Int             max_levels;  /* max_level <= 0 means no limit */
-                      
+
    HYPRE_Int             relax_type;     /* type of relaxation to use */
    HYPRE_Real            jacobi_weight;  /* weighted jacobi weight */
    HYPRE_Int             usr_jacobi_weight; /* indicator flag for user weight */
-                                                                                                                                     
+
    HYPRE_Int             num_pre_relax;  /* number of pre relaxation sweeps */
    HYPRE_Int             num_post_relax; /* number of post relaxation sweeps */
    HYPRE_Int             skip_relax;     /* flag to allow skipping relaxation */
    HYPRE_Real            dxyz[3];     /* parameters used to determine cdir */
 
    HYPRE_Int             num_levels;
-                      
+
    HYPRE_Int            *cdir_l;  /* coarsening directions */
    HYPRE_Int            *active_l;  /* flags to relax on level l*/
 
    hypre_SStructPGrid    **grid_l;
    hypre_SStructPGrid    **P_grid_l;
-                    
+
    HYPRE_Real             *data;
    hypre_SStructPMatrix  **A_l;
    hypre_SStructPMatrix  **P_l;
diff --git a/external/hypre/src/sstruct_ls/sys_pfmg_relax.c b/external/hypre/src/sstruct_ls/sys_pfmg_relax.c
index aece5232..c6cea897 100644
--- a/external/hypre/src/sstruct_ls/sys_pfmg_relax.c
+++ b/external/hypre/src/sstruct_ls/sys_pfmg_relax.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -39,7 +39,7 @@ hypre_SysPFMGRelaxCreate( MPI_Comm  comm )
 HYPRE_Int
 hypre_SysPFMGRelaxDestroy( void *sys_pfmg_relax_vdata )
 {
-	hypre_SysPFMGRelaxData *sys_pfmg_relax_data = (hypre_SysPFMGRelaxData *)sys_pfmg_relax_vdata;
+   hypre_SysPFMGRelaxData *sys_pfmg_relax_data = (hypre_SysPFMGRelaxData *)sys_pfmg_relax_vdata;
 
    if (sys_pfmg_relax_data)
    {
@@ -102,7 +102,7 @@ hypre_SysPFMGRelaxSetType( void  *sys_pfmg_relax_vdata,
 
    (sys_pfmg_relax_data -> relax_type) = relax_type;
 
-   switch(relax_type)
+   switch (relax_type)
    {
       case 0: /* Jacobi */
       {
@@ -155,7 +155,7 @@ hypre_SysPFMGRelaxSetJacobiWeight(void  *sys_pfmg_relax_vdata,
                                   HYPRE_Real weight)
 {
    hypre_SysPFMGRelaxData *sys_pfmg_relax_data = (hypre_SysPFMGRelaxData *)sys_pfmg_relax_vdata;
-                                                                                                                                     
+
    (sys_pfmg_relax_data -> jacobi_weight)    = weight;
 
    return hypre_error_flag;
@@ -171,7 +171,7 @@ hypre_SysPFMGRelaxSetPreRelax( void  *sys_pfmg_relax_vdata )
    void                   *relax_data = (sys_pfmg_relax_data -> relax_data);
    HYPRE_Int               relax_type = (sys_pfmg_relax_data -> relax_type);
 
-   switch(relax_type)
+   switch (relax_type)
    {
       case 1: /* Weighted Jacobi */
       case 0: /* Jacobi */
@@ -198,7 +198,7 @@ hypre_SysPFMGRelaxSetPostRelax( void  *sys_pfmg_relax_vdata )
    void                   *relax_data = (sys_pfmg_relax_data -> relax_data);
    HYPRE_Int               relax_type = (sys_pfmg_relax_data -> relax_type);
 
-   switch(relax_type)
+   switch (relax_type)
    {
       case 1: /* Weighted Jacobi */
       case 0: /* Jacobi */
diff --git a/external/hypre/src/sstruct_ls/sys_pfmg_setup.c b/external/hypre/src/sstruct_ls/sys_pfmg_setup.c
index bd55384e..b005475d 100644
--- a/external/hypre/src/sstruct_ls/sys_pfmg_setup.c
+++ b/external/hypre/src/sstruct_ls/sys_pfmg_setup.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -40,22 +40,22 @@ hypre_SysPFMGSetup( void                 *sys_pfmg_vdata,
    hypre_SysPFMGData    *sys_pfmg_data = (hypre_SysPFMGData    *)sys_pfmg_vdata;
 
    MPI_Comm              comm = (sys_pfmg_data -> comm);
-                     
+
    hypre_SStructPMatrix *A;
    hypre_SStructPVector *b;
    hypre_SStructPVector *x;
 
    HYPRE_Int             relax_type = (sys_pfmg_data -> relax_type);
-   HYPRE_Int             usr_jacobi_weight= (sys_pfmg_data -> usr_jacobi_weight);
+   HYPRE_Int             usr_jacobi_weight = (sys_pfmg_data -> usr_jacobi_weight);
    HYPRE_Real            jacobi_weight    = (sys_pfmg_data -> jacobi_weight);
    HYPRE_Int             skip_relax = (sys_pfmg_data -> skip_relax);
    HYPRE_Real           *dxyz       = (sys_pfmg_data -> dxyz);
-                     
+
    HYPRE_Int             max_iter;
    HYPRE_Int             max_levels;
-                      
+
    HYPRE_Int             num_levels;
-                     
+
    hypre_Index           cindex;
    hypre_Index           findex;
    hypre_Index           stride;
@@ -66,7 +66,7 @@ hypre_SysPFMGSetup( void                 *sys_pfmg_vdata,
    HYPRE_Int              *active_l;
    hypre_SStructPGrid    **grid_l;
    hypre_SStructPGrid    **P_grid_l;
-                    
+
    hypre_SStructPMatrix  **A_l;
    hypre_SStructPMatrix  **P_l;
    hypre_SStructPMatrix  **RT_l;
@@ -101,7 +101,7 @@ hypre_SysPFMGSetup( void                 *sys_pfmg_vdata,
    HYPRE_Int             i;
 
    HYPRE_Real**              sys_dxyz;
-                       
+
    HYPRE_Int             nvars;
 
 #if DEBUG
@@ -125,7 +125,7 @@ hypre_SysPFMGSetup( void                 *sys_pfmg_vdata,
    {
       sys_dxyz[i] = hypre_TAlloc(HYPRE_Real, 3, HYPRE_MEMORY_HOST);
    }
-   
+
    /*-----------------------------------------------------
     * Set up coarse grids
     *-----------------------------------------------------*/
@@ -147,7 +147,7 @@ hypre_SysPFMGSetup( void                 *sys_pfmg_vdata,
    (sys_pfmg_data -> max_levels) = max_levels;
 
    /* compute dxyz */
-   dxyz_flag= 0;
+   dxyz_flag = 0;
    if ((dxyz[0] == 0) || (dxyz[1] == 0) || (dxyz[2] == 0))
    {
       mean      = hypre_CTAlloc(HYPRE_Real, 3, HYPRE_MEMORY_HOST);
@@ -156,7 +156,7 @@ hypre_SysPFMGSetup( void                 *sys_pfmg_vdata,
       dxyz_flag = 0;
       for (i = 0; i < nvars; i++)
       {
-         hypre_PFMGComputeDxyz(hypre_SStructPMatrixSMatrix(A,i,i), sys_dxyz[i],
+         hypre_PFMGComputeDxyz(hypre_SStructPMatrixSMatrix(A, i, i), sys_dxyz[i],
                                mean, deviation);
 
          /* signal flag if any of the flag has a large (square) coeff. of
@@ -165,9 +165,9 @@ hypre_SysPFMGSetup( void                 *sys_pfmg_vdata,
          {
             for (d = 0; d < dim; d++)
             {
-               deviation[d] -= mean[d]*mean[d];
+               deviation[d] -= mean[d] * mean[d];
                /* square of coeff. of variation */
-               if (deviation[d]/(mean[d]*mean[d]) > .1)
+               if (deviation[d] / (mean[d]*mean[d]) > .1)
                {
                   dxyz_flag = 1;
                   break;
@@ -178,9 +178,9 @@ hypre_SysPFMGSetup( void                 *sys_pfmg_vdata,
          for (d = 0; d < 3; d++)
          {
             dxyz[d] += sys_dxyz[i][d];
-         } 
+         }
       }
-      hypre_TFree(mean     , HYPRE_MEMORY_HOST);
+      hypre_TFree(mean, HYPRE_MEMORY_HOST);
       hypre_TFree(deviation, HYPRE_MEMORY_HOST);
    }
 
@@ -206,9 +206,9 @@ hypre_SysPFMGSetup( void                 *sys_pfmg_vdata,
             min_dxyz = dxyz[d];
             cdir = d;
          }
-         alpha += 1.0/(dxyz[d]*dxyz[d]);
+         alpha += 1.0 / (dxyz[d] * dxyz[d]);
       }
-      relax_weights[l] = 2.0/3.0;
+      relax_weights[l] = 2.0 / 3.0;
 
       /* If it's possible to coarsen, change relax_weights */
       beta = 0.0;
@@ -216,7 +216,7 @@ hypre_SysPFMGSetup( void                 *sys_pfmg_vdata,
       {
          if (dxyz_flag)
          {
-            relax_weights[l] = 2.0/3.0;
+            relax_weights[l] = 2.0 / 3.0;
          }
 
          else
@@ -225,7 +225,7 @@ hypre_SysPFMGSetup( void                 *sys_pfmg_vdata,
             {
                if (d != cdir)
                {
-                  beta += 1.0/(dxyz[d]*dxyz[d]);
+                  beta += 1.0 / (dxyz[d] * dxyz[d]);
                }
             }
             if (beta == alpha)
@@ -234,17 +234,17 @@ hypre_SysPFMGSetup( void                 *sys_pfmg_vdata,
             }
             else
             {
-               alpha = beta/alpha;
+               alpha = beta / alpha;
             }
 
             /* determine level Jacobi weights */
             if (dim > 1)
             {
-               relax_weights[l] = 2.0/(3.0 - alpha);
+               relax_weights[l] = 2.0 / (3.0 - alpha);
             }
             else
             {
-               relax_weights[l] = 2.0/3.0; /* always 2/3 for 1-d */
+               relax_weights[l] = 2.0 / 3.0; /* always 2/3 for 1-d */
             }
          }
       }
@@ -307,10 +307,10 @@ hypre_SysPFMGSetup( void                 *sys_pfmg_vdata,
                                   hypre_BoxIMax(cbox));
 
       /* build the interpolation grid */
-      hypre_SysStructCoarsen(grid_l[l], findex, stride, 0, &P_grid_l[l+1]);
+      hypre_SysStructCoarsen(grid_l[l], findex, stride, 0, &P_grid_l[l + 1]);
 
       /* build the coarse grid */
-      hypre_SysStructCoarsen(grid_l[l], cindex, stride, 1, &grid_l[l+1]);
+      hypre_SysStructCoarsen(grid_l[l], cindex, stride, 1, &grid_l[l + 1]);
    }
    num_levels = l + 1;
 
@@ -325,12 +325,12 @@ hypre_SysPFMGSetup( void                 *sys_pfmg_vdata,
    full_periodic = 1;
    for (d = 0; d < dim; d++)
    {
-      full_periodic *= hypre_IndexD(hypre_SStructPGridPeriodic(grid),d);
+      full_periodic *= hypre_IndexD(hypre_SStructPGridPeriodic(grid), d);
    }
-   if( full_periodic != 0)
+   if ( full_periodic != 0)
    {
-      hypre_SStructPGridDestroy(grid_l[num_levels-1]);
-      hypre_SStructPGridDestroy(P_grid_l[num_levels-1]);
+      hypre_SStructPGridDestroy(grid_l[num_levels - 1]);
+      hypre_SStructPGridDestroy(P_grid_l[num_levels - 1]);
       num_levels -= 1;
    }
 
@@ -341,7 +341,7 @@ hypre_SysPFMGSetup( void                 *sys_pfmg_vdata,
       hypre_TFree(sys_dxyz[i], HYPRE_MEMORY_HOST);
    }
    hypre_TFree(sys_dxyz, HYPRE_MEMORY_HOST);
-   
+
 
    /* set all levels active if skip_relax = 0 */
    if (!skip_relax)
@@ -362,12 +362,12 @@ hypre_SysPFMGSetup( void                 *sys_pfmg_vdata,
     * Set up matrix and vector structures
     *-----------------------------------------------------*/
 
-   A_l  = hypre_TAlloc(hypre_SStructPMatrix *, num_levels    , HYPRE_MEMORY_HOST);
+   A_l  = hypre_TAlloc(hypre_SStructPMatrix *, num_levels, HYPRE_MEMORY_HOST);
    P_l  = hypre_TAlloc(hypre_SStructPMatrix *, num_levels - 1, HYPRE_MEMORY_HOST);
    RT_l = hypre_TAlloc(hypre_SStructPMatrix *, num_levels - 1, HYPRE_MEMORY_HOST);
-   b_l  = hypre_TAlloc(hypre_SStructPVector *, num_levels    , HYPRE_MEMORY_HOST);
-   x_l  = hypre_TAlloc(hypre_SStructPVector *, num_levels    , HYPRE_MEMORY_HOST);
-   tx_l = hypre_TAlloc(hypre_SStructPVector *, num_levels    , HYPRE_MEMORY_HOST);
+   b_l  = hypre_TAlloc(hypre_SStructPVector *, num_levels, HYPRE_MEMORY_HOST);
+   x_l  = hypre_TAlloc(hypre_SStructPVector *, num_levels, HYPRE_MEMORY_HOST);
+   tx_l = hypre_TAlloc(hypre_SStructPVector *, num_levels, HYPRE_MEMORY_HOST);
    r_l  = tx_l;
    e_l  = tx_l;
 
@@ -382,31 +382,31 @@ hypre_SysPFMGSetup( void                 *sys_pfmg_vdata,
    {
       cdir = cdir_l[l];
 
-      P_l[l]  = hypre_SysPFMGCreateInterpOp(A_l[l], P_grid_l[l+1], cdir);
+      P_l[l]  = hypre_SysPFMGCreateInterpOp(A_l[l], P_grid_l[l + 1], cdir);
       hypre_SStructPMatrixInitialize(P_l[l]);
 
       RT_l[l] = P_l[l];
 
-      A_l[l+1] = hypre_SysPFMGCreateRAPOp(RT_l[l], A_l[l], P_l[l],
-                                          grid_l[l+1], cdir);
-      hypre_SStructPMatrixInitialize(A_l[l+1]);
+      A_l[l + 1] = hypre_SysPFMGCreateRAPOp(RT_l[l], A_l[l], P_l[l],
+                                            grid_l[l + 1], cdir);
+      hypre_SStructPMatrixInitialize(A_l[l + 1]);
 
-      hypre_SStructPVectorCreate(comm, grid_l[l+1], &b_l[l+1]);
-      hypre_SStructPVectorInitialize(b_l[l+1]);
+      hypre_SStructPVectorCreate(comm, grid_l[l + 1], &b_l[l + 1]);
+      hypre_SStructPVectorInitialize(b_l[l + 1]);
 
-      hypre_SStructPVectorCreate(comm, grid_l[l+1], &x_l[l+1]);
-      hypre_SStructPVectorInitialize(x_l[l+1]);
+      hypre_SStructPVectorCreate(comm, grid_l[l + 1], &x_l[l + 1]);
+      hypre_SStructPVectorInitialize(x_l[l + 1]);
 
-      hypre_SStructPVectorCreate(comm, grid_l[l+1], &tx_l[l+1]);
-      hypre_SStructPVectorInitialize(tx_l[l+1]);
+      hypre_SStructPVectorCreate(comm, grid_l[l + 1], &tx_l[l + 1]);
+      hypre_SStructPVectorInitialize(tx_l[l + 1]);
    }
 
    hypre_SStructPVectorAssemble(tx_l[0]);
    for (l = 0; l < (num_levels - 1); l++)
    {
-      hypre_SStructPVectorAssemble(b_l[l+1]);
-      hypre_SStructPVectorAssemble(x_l[l+1]);
-      hypre_SStructPVectorAssemble(tx_l[l+1]);
+      hypre_SStructPVectorAssemble(b_l[l + 1]);
+      hypre_SStructPVectorAssemble(x_l[l + 1]);
+      hypre_SStructPVectorAssemble(tx_l[l + 1]);
    }
 
    (sys_pfmg_data -> A_l)  = A_l;
@@ -440,16 +440,16 @@ hypre_SysPFMGSetup( void                 *sys_pfmg_vdata,
 
       /* set up the coarse grid operator */
       hypre_SysPFMGSetupRAPOp(RT_l[l], A_l[l], P_l[l],
-                              cdir, cindex, stride, A_l[l+1]);
+                              cdir, cindex, stride, A_l[l + 1]);
 
       /* set up the interpolation routine */
       hypre_SysSemiInterpCreate(&interp_data_l[l]);
-      hypre_SysSemiInterpSetup(interp_data_l[l], P_l[l], 0, x_l[l+1], e_l[l],
+      hypre_SysSemiInterpSetup(interp_data_l[l], P_l[l], 0, x_l[l + 1], e_l[l],
                                cindex, findex, stride);
 
       /* set up the restriction routine */
       hypre_SysSemiRestrictCreate(&restrict_data_l[l]);
-      hypre_SysSemiRestrictSetup(restrict_data_l[l], RT_l[l], 1, r_l[l], b_l[l+1],
+      hypre_SysSemiRestrictSetup(restrict_data_l[l], RT_l[l], 1, r_l[l], b_l[l + 1],
                                  cindex, findex, stride);
    }
 
@@ -493,7 +493,7 @@ hypre_SysPFMGSetup( void                 *sys_pfmg_vdata,
          hypre_SysPFMGRelaxSetType(relax_data_l[l], 0);
          /* do no more work on the coarsest grid than the cost of a V-cycle
           * (estimating roughly 4 communications per V-cycle level) */
-         maxwork = 4*num_levels;
+         maxwork = 4 * num_levels;
          /* do sweeps proportional to the coarsest grid size */
          maxiter = hypre_min(maxwork, cmaxsize);
 #if 0
@@ -561,7 +561,7 @@ hypre_SysPFMGSetup( void                 *sys_pfmg_vdata,
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_SysStructCoarsen( hypre_SStructPGrid  *fgrid, 
+hypre_SysStructCoarsen( hypre_SStructPGrid  *fgrid,
                         hypre_Index          index,
                         hypre_Index          stride,
                         HYPRE_Int            prune,
@@ -612,7 +612,7 @@ hypre_SysStructCoarsen( hypre_SStructPGrid  *fgrid,
     *-----------------------------------------*/
 
    sfgrid = hypre_SStructPGridCellSGrid(fgrid);
-   hypre_StructCoarsen(sfgrid, index, stride, prune, &scgrid); 
+   hypre_StructCoarsen(sfgrid, index, stride, prune, &scgrid);
 
    hypre_CopyIndex(hypre_StructGridPeriodic(scgrid),
                    hypre_SStructPGridPeriodic(cgrid));
@@ -624,7 +624,7 @@ hypre_SysStructCoarsen( hypre_SStructPGrid  *fgrid,
 
    hypre_SStructPGridLocalSize(cgrid)  = 0;
    hypre_SStructPGridGlobalSize(cgrid) = 0;
-   hypre_SStructPGridGhlocalSize(cgrid)= 0;
+   hypre_SStructPGridGhlocalSize(cgrid) = 0;
 
    hypre_SStructPGridAssemble(cgrid);
 
diff --git a/external/hypre/src/sstruct_ls/sys_pfmg_setup_interp.c b/external/hypre/src/sstruct_ls/sys_pfmg_setup_interp.c
index d129f696..f5735a12 100644
--- a/external/hypre/src/sstruct_ls/sys_pfmg_setup_interp.c
+++ b/external/hypre/src/sstruct_ls/sys_pfmg_setup_interp.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -19,13 +19,13 @@ hypre_SysPFMGCreateInterpOp( hypre_SStructPMatrix *A,
 
    hypre_Index           *stencil_shape;
    HYPRE_Int              stencil_size;
-                       
+
    HYPRE_Int              ndim;
 
    HYPRE_Int              nvars;
    hypre_SStructStencil **P_stencils;
 
-   HYPRE_Int              i,s;
+   HYPRE_Int              i, s;
 
    /* set up stencil_shape */
    stencil_size = 2;
diff --git a/external/hypre/src/sstruct_ls/sys_pfmg_setup_rap.c b/external/hypre/src/sstruct_ls/sys_pfmg_setup_rap.c
index 7cc05833..cd6f5027 100644
--- a/external/hypre/src/sstruct_ls/sys_pfmg_setup_rap.c
+++ b/external/hypre/src/sstruct_ls/sys_pfmg_setup_rap.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -9,7 +9,7 @@
 
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
- 
+
 hypre_SStructPMatrix *
 hypre_SysPFMGCreateRAPOp( hypre_SStructPMatrix *R,
                           hypre_SStructPMatrix *A,
@@ -40,7 +40,7 @@ hypre_SysPFMGCreateRAPOp( hypre_SStructPMatrix *R,
 
    hypre_StructGrid      *cgrid;
 
-   HYPRE_Int              vi,vj;
+   HYPRE_Int              vi, vj;
 
    HYPRE_Int              sten_cntr;
 
@@ -72,7 +72,7 @@ hypre_SysPFMGCreateRAPOp( hypre_SStructPMatrix *R,
          P_s = hypre_SStructPMatrixSMatrix(P, vj, vj);
          sstencil_sizes[vj] = 0;
          if (A_s != NULL)
-         {         
+         {
             RAP_s = hypre_SemiCreateRAPOp(R_s, A_s, P_s,
                                           cgrid, cdir,
                                           P_stored_as_transpose);
@@ -82,11 +82,11 @@ hypre_SysPFMGCreateRAPOp( hypre_SStructPMatrix *R,
             shape = hypre_StructStencilShape(sstencil);
             sstencil_sizes[vj] = hypre_StructStencilSize(sstencil);
             stencil_size += sstencil_sizes[vj];
-            RAP_shapes[vj] = hypre_CTAlloc(hypre_Index, 
+            RAP_shapes[vj] = hypre_CTAlloc(hypre_Index,
                                            sstencil_sizes[vj], HYPRE_MEMORY_HOST);
             for (s = 0; s < sstencil_sizes[vj]; s++)
             {
-               hypre_CopyIndex(shape[s],RAP_shapes[vj][s]);
+               hypre_CopyIndex(shape[s], RAP_shapes[vj][s]);
             }
             hypre_StructMatrixDestroy(RAP_s);
          }
@@ -110,7 +110,7 @@ hypre_SysPFMGCreateRAPOp( hypre_SStructPMatrix *R,
    }
 
    /* create RAP Pmatrix */
-   hypre_SStructPMatrixCreate(hypre_SStructPMatrixComm(A), 
+   hypre_SStructPMatrixCreate(hypre_SStructPMatrixComm(A),
                               coarse_grid, RAP_stencils, &RAP);
 
    hypre_TFree(RAP_shapes, HYPRE_MEMORY_HOST);
@@ -121,7 +121,7 @@ hypre_SysPFMGCreateRAPOp( hypre_SStructPMatrix *R,
 
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
- 
+
 HYPRE_Int
 hypre_SysPFMGSetupRAPOp( hypre_SStructPMatrix *R,
                          hypre_SStructPMatrix *A,
@@ -132,7 +132,7 @@ hypre_SysPFMGSetupRAPOp( hypre_SStructPMatrix *R,
                          hypre_SStructPMatrix *Ac      )
 {
    HYPRE_Int               nvars;
-   HYPRE_Int               vi,vj;
+   HYPRE_Int               vi, vj;
 
    hypre_StructMatrix    *R_s;
    hypre_StructMatrix    *A_s;
diff --git a/external/hypre/src/sstruct_ls/sys_pfmg_solve.c b/external/hypre/src/sstruct_ls/sys_pfmg_solve.c
index 054b59ca..533b9f62 100644
--- a/external/hypre/src/sstruct_ls/sys_pfmg_solve.c
+++ b/external/hypre/src/sstruct_ls/sys_pfmg_solve.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -103,7 +103,7 @@ hypre_SysPFMGSolve( void                 *sys_pfmg_vdata,
    {
       /* eps = (tol^2) */
       hypre_SStructPInnerProd(b_l[0], b_l[0], &b_dot_b);
-      eps = tol*tol;
+      eps = tol * tol;
 
       /* if rhs is zero, return a zero solution */
       if (b_dot_b == 0.0)
@@ -153,10 +153,10 @@ hypre_SysPFMGSolve( void                 *sys_pfmg_vdata,
 
          if (logging > 0)
          {
-            norms[i] = sqrt(r_dot_r);
+            norms[i] = hypre_sqrt(r_dot_r);
             if (b_dot_b > 0)
             {
-               rel_norms[i] = sqrt(r_dot_r/b_dot_b);
+               rel_norms[i] = hypre_sqrt(r_dot_r / b_dot_b);
             }
             else
             {
@@ -165,9 +165,9 @@ hypre_SysPFMGSolve( void                 *sys_pfmg_vdata,
          }
 
          /* always do at least 1 V-cycle */
-         if ((r_dot_r/b_dot_b < eps) && (i > 0))
+         if ((r_dot_r / b_dot_b < eps) && (i > 0))
          {
-            if ( ((rel_change) && (e_dot_e/x_dot_x) < eps) || (!rel_change) )
+            if ( ((rel_change) && (e_dot_e / x_dot_x) < eps) || (!rel_change) )
             {
                HYPRE_ANNOTATE_MGLEVEL_END(0);
                break;
@@ -215,16 +215,16 @@ hypre_SysPFMGSolve( void                 *sys_pfmg_vdata,
 
             /* restrict residual */
             hypre_SysSemiRestrict(restrict_data_l[l],
-                                  RT_l[l], r_l[l], b_l[l+1]);
+                                  RT_l[l], r_l[l], b_l[l + 1]);
 #if DEBUG
             hypre_sprintf(filename, "zout_xdown.%02d", l);
             hypre_SStructPVectorPrint(filename, x_l[l], 0);
             hypre_sprintf(filename, "zout_rdown.%02d", l);
             hypre_SStructPVectorPrint(filename, r_l[l], 0);
-	    hypre_sprintf(filename, "zout_RT.%02d", l);
-	    hypre_SStructPMatrixPrint(filename, RT_l[l], 0);
-            hypre_sprintf(filename, "zout_b.%02d", l+1);
-            hypre_SStructPVectorPrint(filename, b_l[l+1], 0);
+            hypre_sprintf(filename, "zout_RT.%02d", l);
+            hypre_SStructPMatrixPrint(filename, RT_l[l], 0);
+            hypre_sprintf(filename, "zout_b.%02d", l + 1);
+            hypre_SStructPVectorPrint(filename, b_l[l + 1], 0);
 #endif
             HYPRE_ANNOTATE_MGLEVEL_END(l);
          }
@@ -248,7 +248,7 @@ hypre_SysPFMGSolve( void                 *sys_pfmg_vdata,
          for (l = (num_levels - 2); l >= 1; l--)
          {
             /* interpolate error and correct (x = x + Pe_c) */
-            hypre_SysSemiInterp(interp_data_l[l], P_l[l], x_l[l+1], e_l[l]);
+            hypre_SysSemiInterp(interp_data_l[l], P_l[l], x_l[l + 1], e_l[l]);
             hypre_SStructPAxpy(1.0, e_l[l], x_l[l]);
             HYPRE_ANNOTATE_MGLEVEL_END(l + 1);
 #if DEBUG
diff --git a/external/hypre/src/sstruct_ls/sys_semi_interp.c b/external/hypre/src/sstruct_ls/sys_semi_interp.c
index 2cfb783c..3ff55bca 100644
--- a/external/hypre/src/sstruct_ls/sys_semi_interp.c
+++ b/external/hypre/src/sstruct_ls/sys_semi_interp.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -44,7 +44,7 @@ hypre_SysSemiInterpSetup( void                 *sys_interp_vdata,
                           hypre_Index           findex,
                           hypre_Index           stride       )
 {
-	hypre_SysSemiInterpData  *sys_interp_data = (hypre_SysSemiInterpData  *)sys_interp_vdata;
+   hypre_SysSemiInterpData  *sys_interp_data = (hypre_SysSemiInterpData  *)sys_interp_vdata;
    void                    **sinterp_data;
 
    HYPRE_Int                 nvars;
diff --git a/external/hypre/src/sstruct_ls/sys_semi_restrict.c b/external/hypre/src/sstruct_ls/sys_semi_restrict.c
index 518dc516..43cc4b66 100644
--- a/external/hypre/src/sstruct_ls/sys_semi_restrict.c
+++ b/external/hypre/src/sstruct_ls/sys_semi_restrict.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -20,7 +20,7 @@ typedef struct
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_SysSemiRestrictCreate( void **sys_restrict_vdata_ptr) 
+hypre_SysSemiRestrictCreate( void **sys_restrict_vdata_ptr)
 {
    hypre_SysSemiRestrictData *sys_restrict_data;
 
@@ -64,7 +64,7 @@ hypre_SysSemiRestrictSetup( void                 *sys_restrict_vdata,
       r_s  = hypre_SStructPVectorSVector(r, vi);
       srestrict_data[vi] = hypre_SemiRestrictCreate( );
       hypre_SemiRestrictSetup( srestrict_data[vi], R_s, R_stored_as_transpose,
-                               r_s, rc_s, cindex, findex, stride);      
+                               r_s, rc_s, cindex, findex, stride);
    }
 
    (sys_restrict_data -> nvars)        = nvars;
diff --git a/external/hypre/src/sstruct_mv/CMakeLists.txt b/external/hypre/src/sstruct_mv/CMakeLists.txt
index 8aeda925..3b674ab9 100644
--- a/external/hypre/src/sstruct_mv/CMakeLists.txt
+++ b/external/hypre/src/sstruct_mv/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -36,13 +36,13 @@ target_sources(${PROJECT_NAME}
           ${HDRS}
 )
 
-if (HYPRE_USING_CUDA)
-  set(CUDA_SRCS
+if (HYPRE_USING_GPU)
+  set(GPU_SRCS
     sstruct_matrix.c
     sstruct_vector.c
   )
-  convert_filenames_to_full_paths(CUDA_SRCS)
-  set(HYPRE_CUDA_SOURCES ${HYPRE_CUDA_SOURCES} ${CUDA_SRCS} PARENT_SCOPE)
+  convert_filenames_to_full_paths(GPU_SRCS)
+  set(HYPRE_GPU_SOURCES ${HYPRE_GPU_SOURCES} ${GPU_SRCS} PARENT_SCOPE)
 endif ()
 
 convert_filenames_to_full_paths(HDRS)
diff --git a/external/hypre/src/sstruct_mv/F90_HYPRE_sstruct_graph.c b/external/hypre/src/sstruct_mv/F90_HYPRE_sstruct_graph.c
index af90d1d5..ac229ddb 100644
--- a/external/hypre/src/sstruct_mv/F90_HYPRE_sstruct_graph.c
+++ b/external/hypre/src/sstruct_mv/F90_HYPRE_sstruct_graph.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -17,23 +17,23 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-	
+
 /*--------------------------------------------------------------------------
  * HYPRE_SStructGraphCreate
  *--------------------------------------------------------------------------*/
 
 void
 hypre_F90_IFACE(hypre_sstructgraphcreate, HYPRE_SSTRUCTGRAPHCREATE)
-   (hypre_F90_Comm *comm,
-    hypre_F90_Obj *grid,
-    hypre_F90_Obj *graph_ptr,
-    hypre_F90_Int *ierr)
+(hypre_F90_Comm *comm,
+ hypre_F90_Obj *grid,
+ hypre_F90_Obj *graph_ptr,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructGraphCreate(
-          hypre_F90_PassComm (comm),
-          hypre_F90_PassObj (HYPRE_SStructGrid, grid),
-          hypre_F90_PassObjRef (HYPRE_SStructGraph, graph_ptr) ) );
+           (HYPRE_SStructGraphCreate(
+               hypre_F90_PassComm (comm),
+               hypre_F90_PassObj (HYPRE_SStructGrid, grid),
+               hypre_F90_PassObjRef (HYPRE_SStructGraph, graph_ptr) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -42,12 +42,12 @@ hypre_F90_IFACE(hypre_sstructgraphcreate, HYPRE_SSTRUCTGRAPHCREATE)
 
 void
 hypre_F90_IFACE(hypre_sstructgraphdestroy, HYPRE_SSTRUCTGRAPHDESTROY)
-   (hypre_F90_Obj *graph,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *graph,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructGraphDestroy(
-          hypre_F90_PassObj (HYPRE_SStructGraph, graph) ) );
+           (HYPRE_SStructGraphDestroy(
+               hypre_F90_PassObj (HYPRE_SStructGraph, graph) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -56,14 +56,14 @@ hypre_F90_IFACE(hypre_sstructgraphdestroy, HYPRE_SSTRUCTGRAPHDESTROY)
 
 void
 hypre_F90_IFACE(hypre_sstructgraphsetdomaingrid, HYPRE_SSTRUCTGRAPHSETDOMAINGRID)
-   (hypre_F90_Obj *graph,
-    hypre_F90_Obj *domain_grid,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *graph,
+ hypre_F90_Obj *domain_grid,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructGraphSetDomainGrid(
-          hypre_F90_PassObj (HYPRE_SStructGraph, graph),
-          hypre_F90_PassObj (HYPRE_SStructGrid, domain_grid) ) );
+           (HYPRE_SStructGraphSetDomainGrid(
+               hypre_F90_PassObj (HYPRE_SStructGraph, graph),
+               hypre_F90_PassObj (HYPRE_SStructGrid, domain_grid) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -72,18 +72,18 @@ hypre_F90_IFACE(hypre_sstructgraphsetdomaingrid, HYPRE_SSTRUCTGRAPHSETDOMAINGRID
 
 void
 hypre_F90_IFACE(hypre_sstructgraphsetstencil, HYPRE_SSTRUCTGRAPHSETSTENCIL)
-   (hypre_F90_Obj *graph,
-    hypre_F90_Int *part,
-    hypre_F90_Int *var,
-    hypre_F90_Obj *stencil,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *graph,
+ hypre_F90_Int *part,
+ hypre_F90_Int *var,
+ hypre_F90_Obj *stencil,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructGraphSetStencil(
-          hypre_F90_PassObj (HYPRE_SStructGraph, graph),
-          hypre_F90_PassInt (part),
-          hypre_F90_PassInt (var),
-          hypre_F90_PassObj (HYPRE_SStructStencil, stencil) ) );
+           (HYPRE_SStructGraphSetStencil(
+               hypre_F90_PassObj (HYPRE_SStructGraph, graph),
+               hypre_F90_PassInt (part),
+               hypre_F90_PassInt (var),
+               hypre_F90_PassObj (HYPRE_SStructStencil, stencil) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -92,14 +92,14 @@ hypre_F90_IFACE(hypre_sstructgraphsetstencil, HYPRE_SSTRUCTGRAPHSETSTENCIL)
 
 void
 hypre_F90_IFACE(hypre_sstructgraphsetfem, HYPRE_SSTRUCTGRAPHSETFEM)
-   (hypre_F90_Obj *graph,
-    hypre_F90_Int *part,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *graph,
+ hypre_F90_Int *part,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructGraphSetFEM(
-          hypre_F90_PassObj (HYPRE_SStructGraph, graph),
-          hypre_F90_PassInt (part) ) );
+           (HYPRE_SStructGraphSetFEM(
+               hypre_F90_PassObj (HYPRE_SStructGraph, graph),
+               hypre_F90_PassInt (part) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -108,18 +108,18 @@ hypre_F90_IFACE(hypre_sstructgraphsetfem, HYPRE_SSTRUCTGRAPHSETFEM)
 
 void
 hypre_F90_IFACE(hypre_sstructgraphsetfemsparsity, HYPRE_SSTRUCTGRAPHSETFEMSPARSITY)
-   (hypre_F90_Obj *graph,
-    hypre_F90_Int *part,
-    hypre_F90_Int *nsparse,
-    hypre_F90_IntArray *sparsity,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *graph,
+ hypre_F90_Int *part,
+ hypre_F90_Int *nsparse,
+ hypre_F90_IntArray *sparsity,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructGraphSetFEMSparsity(
-          hypre_F90_PassObj (HYPRE_SStructGraph, graph),
-          hypre_F90_PassInt (part),
-          hypre_F90_PassInt (nsparse),
-          hypre_F90_PassIntArray (sparsity) ) );
+           (HYPRE_SStructGraphSetFEMSparsity(
+               hypre_F90_PassObj (HYPRE_SStructGraph, graph),
+               hypre_F90_PassInt (part),
+               hypre_F90_PassInt (nsparse),
+               hypre_F90_PassIntArray (sparsity) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -129,24 +129,24 @@ hypre_F90_IFACE(hypre_sstructgraphsetfemsparsity, HYPRE_SSTRUCTGRAPHSETFEMSPARSI
 
 void
 hypre_F90_IFACE(hypre_sstructgraphaddentries, HYPRE_SSTRUCTGRAPHADDENTRIES)
-   (hypre_F90_Obj *graph,
-    hypre_F90_Int *part,
-    hypre_F90_IntArray *index,
-    hypre_F90_Int *var,
-    hypre_F90_Int *to_part,
-    hypre_F90_IntArray *to_index,
-    hypre_F90_Int *to_var,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *graph,
+ hypre_F90_Int *part,
+ hypre_F90_IntArray *index,
+ hypre_F90_Int *var,
+ hypre_F90_Int *to_part,
+ hypre_F90_IntArray *to_index,
+ hypre_F90_Int *to_var,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructGraphAddEntries(
-          hypre_F90_PassObj (HYPRE_SStructGraph, graph),
-          hypre_F90_PassInt (part),
-          hypre_F90_PassIntArray (index),
-          hypre_F90_PassInt (var),
-          hypre_F90_PassInt (to_part),
-          hypre_F90_PassIntArray (to_index),
-          hypre_F90_PassInt (to_var) ) );
+           (HYPRE_SStructGraphAddEntries(
+               hypre_F90_PassObj (HYPRE_SStructGraph, graph),
+               hypre_F90_PassInt (part),
+               hypre_F90_PassIntArray (index),
+               hypre_F90_PassInt (var),
+               hypre_F90_PassInt (to_part),
+               hypre_F90_PassIntArray (to_index),
+               hypre_F90_PassInt (to_var) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -155,12 +155,12 @@ hypre_F90_IFACE(hypre_sstructgraphaddentries, HYPRE_SSTRUCTGRAPHADDENTRIES)
 
 void
 hypre_F90_IFACE(hypre_sstructgraphassemble, HYPRE_SSTRUCTGRAPHASSEMBLE)
-   (hypre_F90_Obj *graph,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *graph,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructGraphAssemble(
-          hypre_F90_PassObj (HYPRE_SStructGraph, graph) ) );
+           (HYPRE_SStructGraphAssemble(
+               hypre_F90_PassObj (HYPRE_SStructGraph, graph) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -169,14 +169,14 @@ hypre_F90_IFACE(hypre_sstructgraphassemble, HYPRE_SSTRUCTGRAPHASSEMBLE)
 
 void
 hypre_F90_IFACE(hypre_sstructgraphsetobjecttype, HYPRE_SSTRUCTGRAPHSETOBJECTTYPE)
-   (hypre_F90_Obj *graph,
-    hypre_F90_Int *type,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *graph,
+ hypre_F90_Int *type,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructGraphSetObjectType(
-          hypre_F90_PassObj (HYPRE_SStructGraph, graph),
-          hypre_F90_PassInt (type) ) );
+           (HYPRE_SStructGraphSetObjectType(
+               hypre_F90_PassObj (HYPRE_SStructGraph, graph),
+               hypre_F90_PassInt (type) ) );
 }
 
 #ifdef __cplusplus
diff --git a/external/hypre/src/sstruct_mv/F90_HYPRE_sstruct_grid.c b/external/hypre/src/sstruct_mv/F90_HYPRE_sstruct_grid.c
index 99a19748..c1e19be9 100644
--- a/external/hypre/src/sstruct_mv/F90_HYPRE_sstruct_grid.c
+++ b/external/hypre/src/sstruct_mv/F90_HYPRE_sstruct_grid.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -17,24 +17,24 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-	
+
 /*--------------------------------------------------------------------------
  * HYPRE_SStructGridCreate
  *--------------------------------------------------------------------------*/
 
 void
 hypre_F90_IFACE(hypre_sstructgridcreate, HYPRE_SSTRUCTGRIDCREATE)
-   (hypre_F90_Comm   *comm,
-    hypre_F90_Int    *ndim,
-    hypre_F90_Int    *nparts,
-    hypre_F90_ObjRef *grid_ptr,
-    hypre_F90_Int    *ierr)
+(hypre_F90_Comm   *comm,
+ hypre_F90_Int    *ndim,
+ hypre_F90_Int    *nparts,
+ hypre_F90_ObjRef *grid_ptr,
+ hypre_F90_Int    *ierr)
 {
    *ierr = (hypre_F90_Int) HYPRE_SStructGridCreate(
-      hypre_F90_PassComm   (comm),
-      hypre_F90_PassInt    (ndim),
-      hypre_F90_PassInt    (nparts),
-      hypre_F90_PassObjRef (HYPRE_SStructGrid, grid_ptr) );
+              hypre_F90_PassComm   (comm),
+              hypre_F90_PassInt    (ndim),
+              hypre_F90_PassInt    (nparts),
+              hypre_F90_PassObjRef (HYPRE_SStructGrid, grid_ptr) );
 }
 
 /*--------------------------------------------------------------------------
@@ -43,11 +43,11 @@ hypre_F90_IFACE(hypre_sstructgridcreate, HYPRE_SSTRUCTGRIDCREATE)
 
 void
 hypre_F90_IFACE(hypre_sstructgriddestroy, HYPRE_SSTRUCTGRIDDESTROY)
-   (hypre_F90_Obj *grid,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *grid,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int) HYPRE_SStructGridDestroy(
-      hypre_F90_PassObj (HYPRE_SStructGrid, grid) );
+              hypre_F90_PassObj (HYPRE_SStructGrid, grid) );
 }
 
 /*--------------------------------------------------------------------------
@@ -56,17 +56,17 @@ hypre_F90_IFACE(hypre_sstructgriddestroy, HYPRE_SSTRUCTGRIDDESTROY)
 
 void
 hypre_F90_IFACE(hypre_sstructgridsetextents, HYPRE_SSTRUCTGRIDSETEXTENTS)
-   (hypre_F90_Obj      *grid,
-    hypre_F90_Int      *part,
-    hypre_F90_IntArray *ilower,
-    hypre_F90_IntArray *iupper,
-    hypre_F90_Int      *ierr)
+(hypre_F90_Obj      *grid,
+ hypre_F90_Int      *part,
+ hypre_F90_IntArray *ilower,
+ hypre_F90_IntArray *iupper,
+ hypre_F90_Int      *ierr)
 {
    *ierr = (hypre_F90_Int) HYPRE_SStructGridSetExtents(
-      hypre_F90_PassObj      (HYPRE_SStructGrid, grid),
-      hypre_F90_PassInt      (part),
-      hypre_F90_PassIntArray (ilower),
-      hypre_F90_PassIntArray (iupper) );
+              hypre_F90_PassObj      (HYPRE_SStructGrid, grid),
+              hypre_F90_PassInt      (part),
+              hypre_F90_PassIntArray (ilower),
+              hypre_F90_PassIntArray (iupper) );
 }
 
 /*--------------------------------------------------------------------------
@@ -75,17 +75,17 @@ hypre_F90_IFACE(hypre_sstructgridsetextents, HYPRE_SSTRUCTGRIDSETEXTENTS)
 
 void
 hypre_F90_IFACE(hypre_sstructgridsetvariables, HYPRE_SSTRUCTGRIDSETVARIABLES)
-   (hypre_F90_Obj      *grid,
-    hypre_F90_Int      *part,
-    hypre_F90_Int      *nvars,
-    hypre_F90_IntArray *vartypes,
-    hypre_F90_Int      *ierr)
+(hypre_F90_Obj      *grid,
+ hypre_F90_Int      *part,
+ hypre_F90_Int      *nvars,
+ hypre_F90_IntArray *vartypes,
+ hypre_F90_Int      *ierr)
 {
    *ierr = (hypre_F90_Int) HYPRE_SStructGridSetVariables(
-      hypre_F90_PassObj      (HYPRE_SStructGrid, grid),
-      hypre_F90_PassInt      (part),
-      hypre_F90_PassInt      (nvars),
-      hypre_F90_PassIntArray (vartypes) );
+              hypre_F90_PassObj      (HYPRE_SStructGrid, grid),
+              hypre_F90_PassInt      (part),
+              hypre_F90_PassInt      (nvars),
+              hypre_F90_PassIntArray (vartypes) );
 }
 
 /*--------------------------------------------------------------------------
@@ -94,19 +94,19 @@ hypre_F90_IFACE(hypre_sstructgridsetvariables, HYPRE_SSTRUCTGRIDSETVARIABLES)
 
 void
 hypre_F90_IFACE(hypre_sstructgridaddvariables, HYPRE_SSTRUCTGRIDADDVARIABLES)
-   (hypre_F90_Obj      *grid,
-    hypre_F90_Int      *part,
-    hypre_F90_IntArray *index,
-    hypre_F90_Int      *nvars,
-    hypre_F90_IntArray *vartypes,
-    hypre_F90_Int      *ierr)
+(hypre_F90_Obj      *grid,
+ hypre_F90_Int      *part,
+ hypre_F90_IntArray *index,
+ hypre_F90_Int      *nvars,
+ hypre_F90_IntArray *vartypes,
+ hypre_F90_Int      *ierr)
 {
    *ierr = (hypre_F90_Int) HYPRE_SStructGridAddVariables(
-      hypre_F90_PassObj(HYPRE_SStructGrid, grid),
-      hypre_F90_PassInt(part),
-      hypre_F90_PassIntArray(index),
-      hypre_F90_PassInt(nvars),
-      hypre_F90_PassIntArray(vartypes));
+              hypre_F90_PassObj(HYPRE_SStructGrid, grid),
+              hypre_F90_PassInt(part),
+              hypre_F90_PassIntArray(index),
+              hypre_F90_PassInt(nvars),
+              hypre_F90_PassIntArray(vartypes));
 }
 
 /*--------------------------------------------------------------------------
@@ -115,15 +115,15 @@ hypre_F90_IFACE(hypre_sstructgridaddvariables, HYPRE_SSTRUCTGRIDADDVARIABLES)
 
 void
 hypre_F90_IFACE(hypre_sstructgridsetfemordering, HYPRE_SSTRUCTGRIDSETFEMORDERING)
-   (hypre_F90_Obj      *grid,
-    hypre_F90_Int      *part,
-    hypre_F90_IntArray *ordering,
-    hypre_F90_Int      *ierr)
+(hypre_F90_Obj      *grid,
+ hypre_F90_Int      *part,
+ hypre_F90_IntArray *ordering,
+ hypre_F90_Int      *ierr)
 {
    *ierr = (hypre_F90_Int) HYPRE_SStructGridSetFEMOrdering(
-      hypre_F90_PassObj      (HYPRE_SStructGrid, grid),
-      hypre_F90_PassInt      (part),
-      hypre_F90_PassIntArray (ordering) );
+              hypre_F90_PassObj      (HYPRE_SStructGrid, grid),
+              hypre_F90_PassInt      (part),
+              hypre_F90_PassIntArray (ordering) );
 }
 
 /*--------------------------------------------------------------------------
@@ -132,27 +132,27 @@ hypre_F90_IFACE(hypre_sstructgridsetfemordering, HYPRE_SSTRUCTGRIDSETFEMORDERING
 
 void
 hypre_F90_IFACE(hypre_sstructgridsetneighborpart, HYPRE_SSTRUCTGRIDSETNEIGHBORPART)
-   (hypre_F90_Obj      *grid,
-    hypre_F90_Int      *part,
-    hypre_F90_IntArray *ilower,
-    hypre_F90_IntArray *iupper,
-    hypre_F90_Int      *nbor_part,
-    hypre_F90_IntArray *nbor_ilower,
-    hypre_F90_IntArray *nbor_iupper,
-    hypre_F90_IntArray *index_map,
-    hypre_F90_IntArray *index_dir,
-    hypre_F90_Int      *ierr)
+(hypre_F90_Obj      *grid,
+ hypre_F90_Int      *part,
+ hypre_F90_IntArray *ilower,
+ hypre_F90_IntArray *iupper,
+ hypre_F90_Int      *nbor_part,
+ hypre_F90_IntArray *nbor_ilower,
+ hypre_F90_IntArray *nbor_iupper,
+ hypre_F90_IntArray *index_map,
+ hypre_F90_IntArray *index_dir,
+ hypre_F90_Int      *ierr)
 {
    *ierr = (hypre_F90_Int) HYPRE_SStructGridSetNeighborPart(
-      hypre_F90_PassObj      (HYPRE_SStructGrid, grid),
-      hypre_F90_PassInt      (part),
-      hypre_F90_PassIntArray (ilower),
-      hypre_F90_PassIntArray (iupper),
-      hypre_F90_PassInt      (nbor_part),
-      hypre_F90_PassIntArray (nbor_ilower),
-      hypre_F90_PassIntArray (nbor_iupper),
-      hypre_F90_PassIntArray (index_map),
-      hypre_F90_PassIntArray (index_dir) );
+              hypre_F90_PassObj      (HYPRE_SStructGrid, grid),
+              hypre_F90_PassInt      (part),
+              hypre_F90_PassIntArray (ilower),
+              hypre_F90_PassIntArray (iupper),
+              hypre_F90_PassInt      (nbor_part),
+              hypre_F90_PassIntArray (nbor_ilower),
+              hypre_F90_PassIntArray (nbor_iupper),
+              hypre_F90_PassIntArray (index_map),
+              hypre_F90_PassIntArray (index_dir) );
 }
 
 /*--------------------------------------------------------------------------
@@ -161,31 +161,31 @@ hypre_F90_IFACE(hypre_sstructgridsetneighborpart, HYPRE_SSTRUCTGRIDSETNEIGHBORPA
 
 void
 hypre_F90_IFACE(hypre_sstructgridsetsharedpart, HYPRE_SSTRUCTGRIDSETSHAREDPART)
-   (hypre_F90_Obj      *grid,
-    hypre_F90_Int      *part,
-    hypre_F90_IntArray *ilower,
-    hypre_F90_IntArray *iupper,
-    hypre_F90_IntArray *offset,
-    hypre_F90_Int      *shared_part,
-    hypre_F90_IntArray *shared_ilower,
-    hypre_F90_IntArray *shared_iupper,
-    hypre_F90_IntArray *shared_offset,
-    hypre_F90_IntArray *index_map,
-    hypre_F90_IntArray *index_dir,
-    hypre_F90_Int      *ierr)
+(hypre_F90_Obj      *grid,
+ hypre_F90_Int      *part,
+ hypre_F90_IntArray *ilower,
+ hypre_F90_IntArray *iupper,
+ hypre_F90_IntArray *offset,
+ hypre_F90_Int      *shared_part,
+ hypre_F90_IntArray *shared_ilower,
+ hypre_F90_IntArray *shared_iupper,
+ hypre_F90_IntArray *shared_offset,
+ hypre_F90_IntArray *index_map,
+ hypre_F90_IntArray *index_dir,
+ hypre_F90_Int      *ierr)
 {
    *ierr = (hypre_F90_Int) HYPRE_SStructGridSetSharedPart(
-      hypre_F90_PassObj      (HYPRE_SStructGrid, grid),
-      hypre_F90_PassInt      (part),
-      hypre_F90_PassIntArray (ilower),
-      hypre_F90_PassIntArray (iupper),
-      hypre_F90_PassIntArray (offset),
-      hypre_F90_PassInt      (shared_part),
-      hypre_F90_PassIntArray (shared_ilower),
-      hypre_F90_PassIntArray (shared_iupper),
-      hypre_F90_PassIntArray (shared_offset),
-      hypre_F90_PassIntArray (index_map),
-      hypre_F90_PassIntArray (index_dir) );
+              hypre_F90_PassObj      (HYPRE_SStructGrid, grid),
+              hypre_F90_PassInt      (part),
+              hypre_F90_PassIntArray (ilower),
+              hypre_F90_PassIntArray (iupper),
+              hypre_F90_PassIntArray (offset),
+              hypre_F90_PassInt      (shared_part),
+              hypre_F90_PassIntArray (shared_ilower),
+              hypre_F90_PassIntArray (shared_iupper),
+              hypre_F90_PassIntArray (shared_offset),
+              hypre_F90_PassIntArray (index_map),
+              hypre_F90_PassIntArray (index_dir) );
 }
 
 /*--------------------------------------------------------------------------
@@ -197,15 +197,15 @@ hypre_F90_IFACE(hypre_sstructgridsetsharedpart, HYPRE_SSTRUCTGRIDSETSHAREDPART)
 
 void
 hypre_F90_IFACE(hypre_sstructgridaddunstructure, HYPRE_SSTRUCTGRIDADDUNSTRUCTURE)
-   (hypre_F90_Obj *grid,
-    hypre_F90_Int *ilower,
-    hypre_F90_Int *iupper,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *grid,
+ hypre_F90_Int *ilower,
+ hypre_F90_Int *iupper,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int) HYPRE_SStructGridAddUnstructuredPart(
-      hypre_F90_PassObj (HYPRE_SStructGrid, grid),
-      hypre_F90_PassInt (ilower),
-      hypre_F90_PassInt (iupper) );
+              hypre_F90_PassObj (HYPRE_SStructGrid, grid),
+              hypre_F90_PassInt (ilower),
+              hypre_F90_PassInt (iupper) );
 }
 #endif
 
@@ -215,11 +215,11 @@ hypre_F90_IFACE(hypre_sstructgridaddunstructure, HYPRE_SSTRUCTGRIDADDUNSTRUCTURE
 
 void
 hypre_F90_IFACE(hypre_sstructgridassemble, HYPRE_SSTRUCTGRIDASSEMBLE)
-   (hypre_F90_Obj *grid,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *grid,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int) HYPRE_SStructGridAssemble(
-      hypre_F90_PassObj (HYPRE_SStructGrid, grid) );
+              hypre_F90_PassObj (HYPRE_SStructGrid, grid) );
 }
 
 /*--------------------------------------------------------------------------
@@ -228,15 +228,15 @@ hypre_F90_IFACE(hypre_sstructgridassemble, HYPRE_SSTRUCTGRIDASSEMBLE)
 
 void
 hypre_F90_IFACE(hypre_sstructgridsetperiodic, HYPRE_SSTRUCTGRIDSETPERIODIC)
-   (hypre_F90_Obj      *grid,
-    hypre_F90_Int      *part,
-    hypre_F90_IntArray *periodic,
-    hypre_F90_Int      *ierr)
+(hypre_F90_Obj      *grid,
+ hypre_F90_Int      *part,
+ hypre_F90_IntArray *periodic,
+ hypre_F90_Int      *ierr)
 {
    *ierr = (hypre_F90_Int) HYPRE_SStructGridSetPeriodic(
-      hypre_F90_PassObj      (HYPRE_SStructGrid, grid),
-      hypre_F90_PassInt      (part),
-      hypre_F90_PassIntArray (periodic) );
+              hypre_F90_PassObj      (HYPRE_SStructGrid, grid),
+              hypre_F90_PassInt      (part),
+              hypre_F90_PassIntArray (periodic) );
 }
 
 /*--------------------------------------------------------------------------
@@ -245,13 +245,13 @@ hypre_F90_IFACE(hypre_sstructgridsetperiodic, HYPRE_SSTRUCTGRIDSETPERIODIC)
 
 void
 hypre_F90_IFACE(hypre_sstructgridsetnumghost, HYPRE_SSTRUCTGRIDSETNUMGHOST)
-   (hypre_F90_Obj      *grid,
-    hypre_F90_IntArray *num_ghost,
-    hypre_F90_Int      *ierr)
+(hypre_F90_Obj      *grid,
+ hypre_F90_IntArray *num_ghost,
+ hypre_F90_Int      *ierr)
 {
    *ierr = (hypre_F90_Int) HYPRE_SStructGridSetNumGhost(
-      hypre_F90_PassObj      (HYPRE_SStructGrid, grid),
-      hypre_F90_PassIntArray (num_ghost) );
+              hypre_F90_PassObj      (HYPRE_SStructGrid, grid),
+              hypre_F90_PassIntArray (num_ghost) );
 }
 
 #ifdef __cplusplus
diff --git a/external/hypre/src/sstruct_mv/F90_HYPRE_sstruct_matrix.c b/external/hypre/src/sstruct_mv/F90_HYPRE_sstruct_matrix.c
index 539370c2..a2fc9f8c 100644
--- a/external/hypre/src/sstruct_mv/F90_HYPRE_sstruct_matrix.c
+++ b/external/hypre/src/sstruct_mv/F90_HYPRE_sstruct_matrix.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -17,23 +17,23 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-	
+
 /*--------------------------------------------------------------------------
  *  HYPRE_SStructMatrixCreate
  *--------------------------------------------------------------------------*/
 
 void
 hypre_F90_IFACE(hypre_sstructmatrixcreate, HYPRE_SSTRUCTMATRIXCREATE)
-   (hypre_F90_Comm *comm,
-    hypre_F90_Obj *graph,
-    hypre_F90_Obj *matrix_ptr,
-    hypre_F90_Int *ierr)
+(hypre_F90_Comm *comm,
+ hypre_F90_Obj *graph,
+ hypre_F90_Obj *matrix_ptr,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructMatrixCreate(
-          hypre_F90_PassComm (comm),
-          hypre_F90_PassObj (HYPRE_SStructGraph, graph),
-          hypre_F90_PassObjRef (HYPRE_SStructMatrix, matrix_ptr) ) );
+           (HYPRE_SStructMatrixCreate(
+               hypre_F90_PassComm (comm),
+               hypre_F90_PassObj (HYPRE_SStructGraph, graph),
+               hypre_F90_PassObjRef (HYPRE_SStructMatrix, matrix_ptr) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -42,12 +42,12 @@ hypre_F90_IFACE(hypre_sstructmatrixcreate, HYPRE_SSTRUCTMATRIXCREATE)
 
 void
 hypre_F90_IFACE(hypre_sstructmatrixdestroy, HYPRE_SSTRUCTMATRIXDESTROY)
-   (hypre_F90_Obj *matrix,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *matrix,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructMatrixDestroy(
-          hypre_F90_PassObj (HYPRE_SStructMatrix, matrix) ));
+           (HYPRE_SStructMatrixDestroy(
+               hypre_F90_PassObj (HYPRE_SStructMatrix, matrix) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -56,12 +56,12 @@ hypre_F90_IFACE(hypre_sstructmatrixdestroy, HYPRE_SSTRUCTMATRIXDESTROY)
 
 void
 hypre_F90_IFACE(hypre_sstructmatrixinitialize, HYPRE_SSTRUCTMATRIXINITIALIZE)
-   (hypre_F90_Obj *matrix,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *matrix,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructMatrixInitialize(
-          hypre_F90_PassObj (HYPRE_SStructMatrix, matrix) ));
+           (HYPRE_SStructMatrixInitialize(
+               hypre_F90_PassObj (HYPRE_SStructMatrix, matrix) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -70,24 +70,24 @@ hypre_F90_IFACE(hypre_sstructmatrixinitialize, HYPRE_SSTRUCTMATRIXINITIALIZE)
 
 void
 hypre_F90_IFACE(hypre_sstructmatrixsetvalues, HYPRE_SSTRUCTMATRIXSETVALUES)
-   (hypre_F90_Obj *matrix,
-    hypre_F90_Int *part,
-    hypre_F90_IntArray *index,
-    hypre_F90_Int *var,
-    hypre_F90_Int *nentries,
-    hypre_F90_IntArray *entries,
-    hypre_F90_ComplexArray *values,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *matrix,
+ hypre_F90_Int *part,
+ hypre_F90_IntArray *index,
+ hypre_F90_Int *var,
+ hypre_F90_Int *nentries,
+ hypre_F90_IntArray *entries,
+ hypre_F90_ComplexArray *values,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructMatrixSetValues(
-          hypre_F90_PassObj (HYPRE_SStructMatrix, matrix),
-          hypre_F90_PassInt (part),
-          hypre_F90_PassIntArray (index),
-          hypre_F90_PassInt (var),
-          hypre_F90_PassInt (nentries),
-          hypre_F90_PassIntArray (entries),
-          hypre_F90_PassComplexArray (values) ));
+           (HYPRE_SStructMatrixSetValues(
+               hypre_F90_PassObj (HYPRE_SStructMatrix, matrix),
+               hypre_F90_PassInt (part),
+               hypre_F90_PassIntArray (index),
+               hypre_F90_PassInt (var),
+               hypre_F90_PassInt (nentries),
+               hypre_F90_PassIntArray (entries),
+               hypre_F90_PassComplexArray (values) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -96,24 +96,24 @@ hypre_F90_IFACE(hypre_sstructmatrixsetvalues, HYPRE_SSTRUCTMATRIXSETVALUES)
 
 void
 hypre_F90_IFACE(hypre_sstructmatrixaddtovalues, HYPRE_SSTRUCTMATRIXADDTOVALUES)
-   (hypre_F90_Obj *matrix,
-    hypre_F90_Int *part,
-    hypre_F90_IntArray *index,
-    hypre_F90_Int *var,
-    hypre_F90_Int *nentries,
-    hypre_F90_IntArray *entries,
-    hypre_F90_ComplexArray *values,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *matrix,
+ hypre_F90_Int *part,
+ hypre_F90_IntArray *index,
+ hypre_F90_Int *var,
+ hypre_F90_Int *nentries,
+ hypre_F90_IntArray *entries,
+ hypre_F90_ComplexArray *values,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructMatrixAddToValues(
-          hypre_F90_PassObj (HYPRE_SStructMatrix, matrix),
-          hypre_F90_PassInt (part),
-          hypre_F90_PassIntArray (index),
-          hypre_F90_PassInt (var),
-          hypre_F90_PassInt (nentries),
-          hypre_F90_PassIntArray (entries),
-          hypre_F90_PassComplexArray (values)) );
+           (HYPRE_SStructMatrixAddToValues(
+               hypre_F90_PassObj (HYPRE_SStructMatrix, matrix),
+               hypre_F90_PassInt (part),
+               hypre_F90_PassIntArray (index),
+               hypre_F90_PassInt (var),
+               hypre_F90_PassInt (nentries),
+               hypre_F90_PassIntArray (entries),
+               hypre_F90_PassComplexArray (values)) );
 }
 
 /*--------------------------------------------------------------------------
@@ -122,18 +122,18 @@ hypre_F90_IFACE(hypre_sstructmatrixaddtovalues, HYPRE_SSTRUCTMATRIXADDTOVALUES)
 
 void
 hypre_F90_IFACE(hypre_sstructmatrixaddfemvalues, HYPRE_SSTRUCTMATRIXADDFEMVALUES)
-   (hypre_F90_Obj *matrix,
-    hypre_F90_Int *part,
-    hypre_F90_IntArray *index,
-    hypre_F90_ComplexArray *values,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *matrix,
+ hypre_F90_Int *part,
+ hypre_F90_IntArray *index,
+ hypre_F90_ComplexArray *values,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructMatrixAddFEMValues(
-          hypre_F90_PassObj (HYPRE_SStructMatrix, matrix),
-          hypre_F90_PassInt (part),
-          hypre_F90_PassIntArray (index),
-          hypre_F90_PassComplexArray (values)) );
+           (HYPRE_SStructMatrixAddFEMValues(
+               hypre_F90_PassObj (HYPRE_SStructMatrix, matrix),
+               hypre_F90_PassInt (part),
+               hypre_F90_PassIntArray (index),
+               hypre_F90_PassComplexArray (values)) );
 }
 
 /*--------------------------------------------------------------------------
@@ -142,24 +142,24 @@ hypre_F90_IFACE(hypre_sstructmatrixaddfemvalues, HYPRE_SSTRUCTMATRIXADDFEMVALUES
 
 void
 hypre_F90_IFACE(hypre_sstructmatrixgetvalues, HYPRE_SSTRUCTMATRIXGETVALUES)
-   (hypre_F90_Obj *matrix,
-    hypre_F90_Int *part,
-    hypre_F90_IntArray *index,
-    hypre_F90_Int *var,
-    hypre_F90_Int *nentries,
-    hypre_F90_IntArray *entries,
-    hypre_F90_ComplexArray *values,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *matrix,
+ hypre_F90_Int *part,
+ hypre_F90_IntArray *index,
+ hypre_F90_Int *var,
+ hypre_F90_Int *nentries,
+ hypre_F90_IntArray *entries,
+ hypre_F90_ComplexArray *values,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructMatrixGetValues(
-          hypre_F90_PassObj (HYPRE_SStructMatrix, matrix),
-          hypre_F90_PassInt (part),
-          hypre_F90_PassIntArray (index),
-          hypre_F90_PassInt (var),
-          hypre_F90_PassInt (nentries),
-          hypre_F90_PassIntArray (entries),
-          hypre_F90_PassComplexArray (values)) );
+           (HYPRE_SStructMatrixGetValues(
+               hypre_F90_PassObj (HYPRE_SStructMatrix, matrix),
+               hypre_F90_PassInt (part),
+               hypre_F90_PassIntArray (index),
+               hypre_F90_PassInt (var),
+               hypre_F90_PassInt (nentries),
+               hypre_F90_PassIntArray (entries),
+               hypre_F90_PassComplexArray (values)) );
 }
 
 /*--------------------------------------------------------------------------
@@ -168,26 +168,26 @@ hypre_F90_IFACE(hypre_sstructmatrixgetvalues, HYPRE_SSTRUCTMATRIXGETVALUES)
 
 void
 hypre_F90_IFACE(hypre_sstructmatrixsetboxvalues, HYPRE_SSTRUCTMATRIXSETBOXVALUES)
-   (hypre_F90_Obj *matrix,
-    hypre_F90_Int *part,
-    hypre_F90_IntArray *ilower,
-    hypre_F90_IntArray *iupper,
-    hypre_F90_Int *var,
-    hypre_F90_Int *nentries,
-    hypre_F90_IntArray *entries,
-    hypre_F90_ComplexArray *values,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *matrix,
+ hypre_F90_Int *part,
+ hypre_F90_IntArray *ilower,
+ hypre_F90_IntArray *iupper,
+ hypre_F90_Int *var,
+ hypre_F90_Int *nentries,
+ hypre_F90_IntArray *entries,
+ hypre_F90_ComplexArray *values,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructMatrixSetBoxValues(
-          hypre_F90_PassObj (HYPRE_SStructMatrix, matrix),
-          hypre_F90_PassInt (part),
-          hypre_F90_PassIntArray (ilower),
-          hypre_F90_PassIntArray (iupper),
-          hypre_F90_PassInt (var),
-          hypre_F90_PassInt (nentries),
-          hypre_F90_PassIntArray (entries),
-          hypre_F90_PassComplexArray (values)));
+           (HYPRE_SStructMatrixSetBoxValues(
+               hypre_F90_PassObj (HYPRE_SStructMatrix, matrix),
+               hypre_F90_PassInt (part),
+               hypre_F90_PassIntArray (ilower),
+               hypre_F90_PassIntArray (iupper),
+               hypre_F90_PassInt (var),
+               hypre_F90_PassInt (nentries),
+               hypre_F90_PassIntArray (entries),
+               hypre_F90_PassComplexArray (values)));
 }
 
 /*--------------------------------------------------------------------------
@@ -196,26 +196,26 @@ hypre_F90_IFACE(hypre_sstructmatrixsetboxvalues, HYPRE_SSTRUCTMATRIXSETBOXVALUES
 
 void
 hypre_F90_IFACE(hypre_sstructmatrixaddtoboxvalu, HYPRE_SSTRUCTMATRIXADDTOBOXVALU)
-   (hypre_F90_Obj *matrix,
-    hypre_F90_Int *part,
-    hypre_F90_IntArray *ilower,
-    hypre_F90_IntArray *iupper,
-    hypre_F90_Int *var,
-    hypre_F90_Int *nentries,
-    hypre_F90_IntArray *entries,
-    hypre_F90_ComplexArray *values,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *matrix,
+ hypre_F90_Int *part,
+ hypre_F90_IntArray *ilower,
+ hypre_F90_IntArray *iupper,
+ hypre_F90_Int *var,
+ hypre_F90_Int *nentries,
+ hypre_F90_IntArray *entries,
+ hypre_F90_ComplexArray *values,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructMatrixAddToBoxValues(
-          hypre_F90_PassObj (HYPRE_SStructMatrix, matrix),
-          hypre_F90_PassInt (part),
-          hypre_F90_PassIntArray (ilower),
-          hypre_F90_PassIntArray (iupper),
-          hypre_F90_PassInt (var),
-          hypre_F90_PassInt (nentries),
-          hypre_F90_PassIntArray (entries),
-          hypre_F90_PassComplexArray (values) ) );
+           (HYPRE_SStructMatrixAddToBoxValues(
+               hypre_F90_PassObj (HYPRE_SStructMatrix, matrix),
+               hypre_F90_PassInt (part),
+               hypre_F90_PassIntArray (ilower),
+               hypre_F90_PassIntArray (iupper),
+               hypre_F90_PassInt (var),
+               hypre_F90_PassInt (nentries),
+               hypre_F90_PassIntArray (entries),
+               hypre_F90_PassComplexArray (values) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -224,26 +224,26 @@ hypre_F90_IFACE(hypre_sstructmatrixaddtoboxvalu, HYPRE_SSTRUCTMATRIXADDTOBOXVALU
 
 void
 hypre_F90_IFACE(hypre_sstructmatrixgetboxvalues, HYPRE_SSTRUCTMATRIXGETBOXVALUES)
-   (hypre_F90_Obj *matrix,
-    hypre_F90_Int *part,
-    hypre_F90_IntArray *ilower,
-    hypre_F90_IntArray *iupper,
-    hypre_F90_Int *var,
-    hypre_F90_Int *nentries,
-    hypre_F90_IntArray *entries,
-    hypre_F90_ComplexArray *values,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *matrix,
+ hypre_F90_Int *part,
+ hypre_F90_IntArray *ilower,
+ hypre_F90_IntArray *iupper,
+ hypre_F90_Int *var,
+ hypre_F90_Int *nentries,
+ hypre_F90_IntArray *entries,
+ hypre_F90_ComplexArray *values,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructMatrixGetBoxValues(
-          hypre_F90_PassObj (HYPRE_SStructMatrix, matrix),
-          hypre_F90_PassInt (part),
-          hypre_F90_PassIntArray (ilower),
-          hypre_F90_PassIntArray (iupper),
-          hypre_F90_PassInt (var),
-          hypre_F90_PassInt (nentries),
-          hypre_F90_PassIntArray (entries),
-          hypre_F90_PassComplexArray (values)));
+           (HYPRE_SStructMatrixGetBoxValues(
+               hypre_F90_PassObj (HYPRE_SStructMatrix, matrix),
+               hypre_F90_PassInt (part),
+               hypre_F90_PassIntArray (ilower),
+               hypre_F90_PassIntArray (iupper),
+               hypre_F90_PassInt (var),
+               hypre_F90_PassInt (nentries),
+               hypre_F90_PassIntArray (entries),
+               hypre_F90_PassComplexArray (values)));
 }
 
 /*--------------------------------------------------------------------------
@@ -252,12 +252,12 @@ hypre_F90_IFACE(hypre_sstructmatrixgetboxvalues, HYPRE_SSTRUCTMATRIXGETBOXVALUES
 
 void
 hypre_F90_IFACE(hypre_sstructmatrixassemble, HYPRE_SSTRUCTMATRIXASSEMBLE)
-   (hypre_F90_Obj *matrix,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *matrix,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructMatrixAssemble(
-          hypre_F90_PassObj (HYPRE_SStructMatrix, matrix) ));
+           (HYPRE_SStructMatrixAssemble(
+               hypre_F90_PassObj (HYPRE_SStructMatrix, matrix) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -266,20 +266,20 @@ hypre_F90_IFACE(hypre_sstructmatrixassemble, HYPRE_SSTRUCTMATRIXASSEMBLE)
 
 void
 hypre_F90_IFACE(hypre_sstructmatrixsetsymmetric, HYPRE_SSTRUCTMATRIXSETSYMMETRIC)
-   (hypre_F90_Obj *matrix,
-    hypre_F90_Int *part,
-    hypre_F90_Int *var,
-    hypre_F90_Int *to_var,
-    hypre_F90_Int *symmetric,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *matrix,
+ hypre_F90_Int *part,
+ hypre_F90_Int *var,
+ hypre_F90_Int *to_var,
+ hypre_F90_Int *symmetric,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructMatrixSetSymmetric(
-          hypre_F90_PassObj (HYPRE_SStructMatrix, matrix),
-          hypre_F90_PassInt (part),
-          hypre_F90_PassInt (var),
-          hypre_F90_PassInt (to_var),
-          hypre_F90_PassInt (symmetric) ));
+           (HYPRE_SStructMatrixSetSymmetric(
+               hypre_F90_PassObj (HYPRE_SStructMatrix, matrix),
+               hypre_F90_PassInt (part),
+               hypre_F90_PassInt (var),
+               hypre_F90_PassInt (to_var),
+               hypre_F90_PassInt (symmetric) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -288,14 +288,14 @@ hypre_F90_IFACE(hypre_sstructmatrixsetsymmetric, HYPRE_SSTRUCTMATRIXSETSYMMETRIC
 
 void
 hypre_F90_IFACE(hypre_sstructmatrixsetnssymmetr, HYPRE_SSTRUCTMATRIXSETNSSYMMETR)
-   (hypre_F90_Obj *matrix,
-    hypre_F90_Int *symmetric,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *matrix,
+ hypre_F90_Int *symmetric,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructMatrixSetNSSymmetric(
-          hypre_F90_PassObj (HYPRE_SStructMatrix, matrix),
-          hypre_F90_PassInt (symmetric) ));
+           (HYPRE_SStructMatrixSetNSSymmetric(
+               hypre_F90_PassObj (HYPRE_SStructMatrix, matrix),
+               hypre_F90_PassInt (symmetric) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -304,14 +304,14 @@ hypre_F90_IFACE(hypre_sstructmatrixsetnssymmetr, HYPRE_SSTRUCTMATRIXSETNSSYMMETR
 
 void
 hypre_F90_IFACE(hypre_sstructmatrixsetobjecttyp, HYPRE_SSTRUCTMATRIXSETOBJECTTYP)
-   (hypre_F90_Obj *matrix,
-    hypre_F90_Int *type,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *matrix,
+ hypre_F90_Int *type,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructMatrixSetObjectType(
-          hypre_F90_PassObj (HYPRE_SStructMatrix, matrix),
-          hypre_F90_PassInt (type) ));
+           (HYPRE_SStructMatrixSetObjectType(
+               hypre_F90_PassObj (HYPRE_SStructMatrix, matrix),
+               hypre_F90_PassInt (type) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -320,14 +320,14 @@ hypre_F90_IFACE(hypre_sstructmatrixsetobjecttyp, HYPRE_SSTRUCTMATRIXSETOBJECTTYP
 
 void
 hypre_F90_IFACE(hypre_sstructmatrixgetobject, HYPRE_SSTRUCTMATRIXGETOBJECT)
-   (hypre_F90_Obj *matrix,
-    hypre_F90_Obj *object,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *matrix,
+ hypre_F90_Obj *object,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructMatrixGetObject(
-          hypre_F90_PassObj (HYPRE_SStructMatrix, matrix),
-          (void **)              object )) ;
+           (HYPRE_SStructMatrixGetObject(
+               hypre_F90_PassObj (HYPRE_SStructMatrix, matrix),
+               (void **)              object )) ;
 }
 
 /*--------------------------------------------------------------------------
@@ -336,16 +336,16 @@ hypre_F90_IFACE(hypre_sstructmatrixgetobject, HYPRE_SSTRUCTMATRIXGETOBJECT)
 
 void
 hypre_F90_IFACE(hypre_sstructmatrixprint, HYPRE_SSTRUCTMATRIXPRINT)
-   (char *filename,
-    hypre_F90_Obj *matrix,
-    hypre_F90_Int *all,
-    hypre_F90_Int *ierr)
+(char *filename,
+ hypre_F90_Obj *matrix,
+ hypre_F90_Int *all,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructMatrixPrint(
-          (char *)           filename,
-          hypre_F90_PassObj (HYPRE_SStructMatrix, matrix),
-          hypre_F90_PassInt (all) ) );
+           (HYPRE_SStructMatrixPrint(
+               (char *)           filename,
+               hypre_F90_PassObj (HYPRE_SStructMatrix, matrix),
+               hypre_F90_PassInt (all) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -354,22 +354,22 @@ hypre_F90_IFACE(hypre_sstructmatrixprint, HYPRE_SSTRUCTMATRIXPRINT)
 
 void
 hypre_F90_IFACE(hypre_sstructmatrixmatvec, HYPRE_SSTRUCTMATRIXMATVEC)
-   (hypre_F90_Complex *alpha,
-    hypre_F90_Obj *A,
-    hypre_F90_Obj *x,
-    hypre_F90_Complex *beta,
-    hypre_F90_Obj *y,
-    hypre_F90_Int *ierr)
+(hypre_F90_Complex *alpha,
+ hypre_F90_Obj *A,
+ hypre_F90_Obj *x,
+ hypre_F90_Complex *beta,
+ hypre_F90_Obj *y,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructMatrixMatvec(
-          hypre_F90_PassComplex (alpha),
-          hypre_F90_PassObj (HYPRE_SStructMatrix, A),
-          hypre_F90_PassObj (HYPRE_SStructVector, x),
-          hypre_F90_PassComplex (beta),
-          hypre_F90_PassObj (HYPRE_SStructVector, y) )) ;
+           (HYPRE_SStructMatrixMatvec(
+               hypre_F90_PassComplex (alpha),
+               hypre_F90_PassObj (HYPRE_SStructMatrix, A),
+               hypre_F90_PassObj (HYPRE_SStructVector, x),
+               hypre_F90_PassComplex (beta),
+               hypre_F90_PassObj (HYPRE_SStructVector, y) )) ;
 }
-	
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/external/hypre/src/sstruct_mv/F90_HYPRE_sstruct_stencil.c b/external/hypre/src/sstruct_mv/F90_HYPRE_sstruct_stencil.c
index c01bcc81..51f30b07 100644
--- a/external/hypre/src/sstruct_mv/F90_HYPRE_sstruct_stencil.c
+++ b/external/hypre/src/sstruct_mv/F90_HYPRE_sstruct_stencil.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -17,23 +17,23 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-	
+
 /*--------------------------------------------------------------------------
  * HYPRE_SStructStencilCreate
  *--------------------------------------------------------------------------*/
 
 void
 hypre_F90_IFACE(hypre_sstructstencilcreate, HYPRE_SSTRUCTSTENCILCREATE)
-   (hypre_F90_Int *ndim,
-    hypre_F90_Int *size,
-    hypre_F90_Obj *stencil_ptr,
-    hypre_F90_Int *ierr)
+(hypre_F90_Int *ndim,
+ hypre_F90_Int *size,
+ hypre_F90_Obj *stencil_ptr,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructStencilCreate(
-          hypre_F90_PassInt (ndim),
-          hypre_F90_PassInt (size),
-          hypre_F90_PassObjRef (HYPRE_SStructStencil, stencil_ptr) ) );
+           (HYPRE_SStructStencilCreate(
+               hypre_F90_PassInt (ndim),
+               hypre_F90_PassInt (size),
+               hypre_F90_PassObjRef (HYPRE_SStructStencil, stencil_ptr) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -42,12 +42,12 @@ hypre_F90_IFACE(hypre_sstructstencilcreate, HYPRE_SSTRUCTSTENCILCREATE)
 
 void
 hypre_F90_IFACE(hypre_sstructstencildestroy, HYPRE_SSTRUCTSTENCILDESTROY)
-   (hypre_F90_Obj *stencil,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *stencil,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructStencilDestroy(
-          hypre_F90_PassObj (HYPRE_SStructStencil, stencil) ) );
+           (HYPRE_SStructStencilDestroy(
+               hypre_F90_PassObj (HYPRE_SStructStencil, stencil) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -56,18 +56,18 @@ hypre_F90_IFACE(hypre_sstructstencildestroy, HYPRE_SSTRUCTSTENCILDESTROY)
 
 void
 hypre_F90_IFACE(hypre_sstructstencilsetentry, HYPRE_SSTRUCTSTENCILSETENTRY)
-   (hypre_F90_Obj *stencil,
-    hypre_F90_Int *entry,
-    hypre_F90_IntArray *offset,
-    hypre_F90_Int *var,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *stencil,
+ hypre_F90_Int *entry,
+ hypre_F90_IntArray *offset,
+ hypre_F90_Int *var,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructStencilSetEntry(
-          hypre_F90_PassObj (HYPRE_SStructStencil, stencil),
-          hypre_F90_PassInt (entry),
-          hypre_F90_PassIntArray (offset),
-          hypre_F90_PassInt (var) ) );
+           (HYPRE_SStructStencilSetEntry(
+               hypre_F90_PassObj (HYPRE_SStructStencil, stencil),
+               hypre_F90_PassInt (entry),
+               hypre_F90_PassIntArray (offset),
+               hypre_F90_PassInt (var) ) );
 }
 
 #ifdef __cplusplus
diff --git a/external/hypre/src/sstruct_mv/F90_HYPRE_sstruct_vector.c b/external/hypre/src/sstruct_mv/F90_HYPRE_sstruct_vector.c
index d2596069..f50bb2cf 100644
--- a/external/hypre/src/sstruct_mv/F90_HYPRE_sstruct_vector.c
+++ b/external/hypre/src/sstruct_mv/F90_HYPRE_sstruct_vector.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -17,23 +17,23 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-	
+
 /*--------------------------------------------------------------------------
  *  HYPRE_SStructVectorCreate
  *--------------------------------------------------------------------------*/
 
 void
 hypre_F90_IFACE(hypre_sstructvectorcreate, HYPRE_SSTRUCTVECTORCREATE)
-   (hypre_F90_Comm *comm,
-    hypre_F90_Obj *grid,
-    hypre_F90_Obj *vector_ptr,
-    hypre_F90_Int *ierr)
+(hypre_F90_Comm *comm,
+ hypre_F90_Obj *grid,
+ hypre_F90_Obj *vector_ptr,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructVectorCreate(
-          hypre_F90_PassComm (comm),
-          hypre_F90_PassObj (HYPRE_SStructGrid, grid),
-          hypre_F90_PassObjRef (HYPRE_SStructVector, vector_ptr) ) );
+           (HYPRE_SStructVectorCreate(
+               hypre_F90_PassComm (comm),
+               hypre_F90_PassObj (HYPRE_SStructGrid, grid),
+               hypre_F90_PassObjRef (HYPRE_SStructVector, vector_ptr) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -42,12 +42,12 @@ hypre_F90_IFACE(hypre_sstructvectorcreate, HYPRE_SSTRUCTVECTORCREATE)
 
 void
 hypre_F90_IFACE(hypre_sstructvectordestroy, HYPRE_SSTRUCTVECTORDESTROY)
-   (hypre_F90_Obj *vector,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *vector,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructVectorDestroy(
-          hypre_F90_PassObj (HYPRE_SStructVector, vector) ) );
+           (HYPRE_SStructVectorDestroy(
+               hypre_F90_PassObj (HYPRE_SStructVector, vector) ) );
 }
 
 /*---------------------------------------------------------
@@ -56,12 +56,12 @@ hypre_F90_IFACE(hypre_sstructvectordestroy, HYPRE_SSTRUCTVECTORDESTROY)
 
 void
 hypre_F90_IFACE(hypre_sstructvectorinitialize, HYPRE_SSTRUCTVECTORINITIALIZE)
-   (hypre_F90_Obj *vector,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *vector,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructVectorInitialize(
-          hypre_F90_PassObj (HYPRE_SStructVector, vector) ));
+           (HYPRE_SStructVectorInitialize(
+               hypre_F90_PassObj (HYPRE_SStructVector, vector) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -70,20 +70,20 @@ hypre_F90_IFACE(hypre_sstructvectorinitialize, HYPRE_SSTRUCTVECTORINITIALIZE)
 
 void
 hypre_F90_IFACE(hypre_sstructvectorsetvalues, HYPRE_SSTRUCTVECTORSETVALUES)
-   (hypre_F90_Obj *vector,
-    hypre_F90_Int *part,
-    hypre_F90_IntArray *index,
-    hypre_F90_Int *var,
-    hypre_F90_Complex *value,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *vector,
+ hypre_F90_Int *part,
+ hypre_F90_IntArray *index,
+ hypre_F90_Int *var,
+ hypre_F90_Complex *value,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructVectorSetValues(
-          hypre_F90_PassObj (HYPRE_SStructVector, vector),
-          hypre_F90_PassInt (part),
-          hypre_F90_PassIntArray (index),
-          hypre_F90_PassInt (var),
-          hypre_F90_PassComplexRef (value) ) );
+           (HYPRE_SStructVectorSetValues(
+               hypre_F90_PassObj (HYPRE_SStructVector, vector),
+               hypre_F90_PassInt (part),
+               hypre_F90_PassIntArray (index),
+               hypre_F90_PassInt (var),
+               hypre_F90_PassComplexRef (value) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -92,20 +92,20 @@ hypre_F90_IFACE(hypre_sstructvectorsetvalues, HYPRE_SSTRUCTVECTORSETVALUES)
 
 void
 hypre_F90_IFACE(hypre_sstructvectoraddtovalues, HYPRE_SSTRUCTVECTORADDTOVALUES)
-   (hypre_F90_Obj *vector,
-    hypre_F90_Int *part,
-    hypre_F90_IntArray *index,
-    hypre_F90_Int *var,
-    hypre_F90_Complex *value,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *vector,
+ hypre_F90_Int *part,
+ hypre_F90_IntArray *index,
+ hypre_F90_Int *var,
+ hypre_F90_Complex *value,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructVectorAddToValues(
-          hypre_F90_PassObj (HYPRE_SStructVector, vector),
-          hypre_F90_PassInt (part),
-          hypre_F90_PassIntArray (index),
-          hypre_F90_PassInt (var),
-          hypre_F90_PassComplexRef (value) ) );
+           (HYPRE_SStructVectorAddToValues(
+               hypre_F90_PassObj (HYPRE_SStructVector, vector),
+               hypre_F90_PassInt (part),
+               hypre_F90_PassIntArray (index),
+               hypre_F90_PassInt (var),
+               hypre_F90_PassComplexRef (value) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -114,20 +114,20 @@ hypre_F90_IFACE(hypre_sstructvectoraddtovalues, HYPRE_SSTRUCTVECTORADDTOVALUES)
 
 void
 hypre_F90_IFACE(hypre_sstructvectorgetvalues, HYPRE_SSTRUCTVECTORGETVALUES)
-   (hypre_F90_Obj *vector,
-    hypre_F90_Int *part,
-    hypre_F90_IntArray *index,
-    hypre_F90_Int *var,
-    hypre_F90_Complex *value,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *vector,
+ hypre_F90_Int *part,
+ hypre_F90_IntArray *index,
+ hypre_F90_Int *var,
+ hypre_F90_Complex *value,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructVectorGetValues(
-          hypre_F90_PassObj (HYPRE_SStructVector, vector),
-          hypre_F90_PassInt (part),
-          hypre_F90_PassIntArray (index),
-          hypre_F90_PassInt (var),
-          hypre_F90_PassComplexRef (value) ));
+           (HYPRE_SStructVectorGetValues(
+               hypre_F90_PassObj (HYPRE_SStructVector, vector),
+               hypre_F90_PassInt (part),
+               hypre_F90_PassIntArray (index),
+               hypre_F90_PassInt (var),
+               hypre_F90_PassComplexRef (value) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -136,22 +136,22 @@ hypre_F90_IFACE(hypre_sstructvectorgetvalues, HYPRE_SSTRUCTVECTORGETVALUES)
 
 void
 hypre_F90_IFACE(hypre_sstructvectorsetboxvalues, HYPRE_SSTRUCTVECTORSETBOXVALUES)
-   (hypre_F90_Obj *vector,
-    hypre_F90_Int *part,
-    hypre_F90_IntArray *ilower,
-    hypre_F90_IntArray *iupper,
-    hypre_F90_Int *var,
-    hypre_F90_ComplexArray *values,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *vector,
+ hypre_F90_Int *part,
+ hypre_F90_IntArray *ilower,
+ hypre_F90_IntArray *iupper,
+ hypre_F90_Int *var,
+ hypre_F90_ComplexArray *values,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructVectorSetBoxValues(
-          hypre_F90_PassObj (HYPRE_SStructVector, vector),
-          hypre_F90_PassInt (part),
-          hypre_F90_PassIntArray (ilower),
-          hypre_F90_PassIntArray (iupper),
-          hypre_F90_PassInt (var),
-          hypre_F90_PassComplexArray (values) ) );
+           (HYPRE_SStructVectorSetBoxValues(
+               hypre_F90_PassObj (HYPRE_SStructVector, vector),
+               hypre_F90_PassInt (part),
+               hypre_F90_PassIntArray (ilower),
+               hypre_F90_PassIntArray (iupper),
+               hypre_F90_PassInt (var),
+               hypre_F90_PassComplexArray (values) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -160,22 +160,22 @@ hypre_F90_IFACE(hypre_sstructvectorsetboxvalues, HYPRE_SSTRUCTVECTORSETBOXVALUES
 
 void
 hypre_F90_IFACE(hypre_sstructvectoraddtoboxvalu, HYPRE_SSTRUCTVECTORADDTOBOXVALU)
-   (hypre_F90_Obj *vector,
-    hypre_F90_Int *part,
-    hypre_F90_IntArray *ilower,
-    hypre_F90_IntArray *iupper,
-    hypre_F90_Int *var,
-    hypre_F90_ComplexArray *values,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *vector,
+ hypre_F90_Int *part,
+ hypre_F90_IntArray *ilower,
+ hypre_F90_IntArray *iupper,
+ hypre_F90_Int *var,
+ hypre_F90_ComplexArray *values,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructVectorAddToBoxValues(
-          hypre_F90_PassObj (HYPRE_SStructVector, vector),
-          hypre_F90_PassInt (part),
-          hypre_F90_PassIntArray (ilower),
-          hypre_F90_PassIntArray (iupper),
-          hypre_F90_PassInt (var),
-          hypre_F90_PassComplexArray (values) ) );
+           (HYPRE_SStructVectorAddToBoxValues(
+               hypre_F90_PassObj (HYPRE_SStructVector, vector),
+               hypre_F90_PassInt (part),
+               hypre_F90_PassIntArray (ilower),
+               hypre_F90_PassIntArray (iupper),
+               hypre_F90_PassInt (var),
+               hypre_F90_PassComplexArray (values) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -184,22 +184,22 @@ hypre_F90_IFACE(hypre_sstructvectoraddtoboxvalu, HYPRE_SSTRUCTVECTORADDTOBOXVALU
 
 void
 hypre_F90_IFACE(hypre_sstructvectorgetboxvalues, HYPRE_SSTRUCTVECTORGETBOXVALUES)
-   (hypre_F90_Obj *vector,
-    hypre_F90_Int *part,
-    hypre_F90_IntArray *ilower,
-    hypre_F90_IntArray *iupper,
-    hypre_F90_Int *var,
-    hypre_F90_ComplexArray *values,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *vector,
+ hypre_F90_Int *part,
+ hypre_F90_IntArray *ilower,
+ hypre_F90_IntArray *iupper,
+ hypre_F90_Int *var,
+ hypre_F90_ComplexArray *values,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructVectorGetBoxValues(
-          (HYPRE_SStructVector ) *vector,
-          hypre_F90_PassInt (part),
-          hypre_F90_PassIntArray (ilower),
-          hypre_F90_PassIntArray (iupper),
-          hypre_F90_PassInt (var),
-          hypre_F90_PassComplexArray (values) ) );
+           (HYPRE_SStructVectorGetBoxValues(
+               (HYPRE_SStructVector ) * vector,
+               hypre_F90_PassInt (part),
+               hypre_F90_PassIntArray (ilower),
+               hypre_F90_PassIntArray (iupper),
+               hypre_F90_PassInt (var),
+               hypre_F90_PassComplexArray (values) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -208,12 +208,12 @@ hypre_F90_IFACE(hypre_sstructvectorgetboxvalues, HYPRE_SSTRUCTVECTORGETBOXVALUES
 
 void
 hypre_F90_IFACE(hypre_sstructvectorassemble, HYPRE_SSTRUCTVECTORASSEMBLE)
-   (hypre_F90_Obj *vector,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *vector,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructVectorAssemble(
-          hypre_F90_PassObj (HYPRE_SStructVector, vector) ));
+           (HYPRE_SStructVectorAssemble(
+               hypre_F90_PassObj (HYPRE_SStructVector, vector) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -222,12 +222,12 @@ hypre_F90_IFACE(hypre_sstructvectorassemble, HYPRE_SSTRUCTVECTORASSEMBLE)
 
 void
 hypre_F90_IFACE(hypre_sstructvectorgather, HYPRE_SSTRUCTVECTORGATHER)
-   (hypre_F90_Obj *vector,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *vector,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructVectorGather(
-          hypre_F90_PassObj (HYPRE_SStructVector, vector) ));
+           (HYPRE_SStructVectorGather(
+               hypre_F90_PassObj (HYPRE_SStructVector, vector) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -236,14 +236,14 @@ hypre_F90_IFACE(hypre_sstructvectorgather, HYPRE_SSTRUCTVECTORGATHER)
 
 void
 hypre_F90_IFACE(hypre_sstructvectorsetconstantv, HYPRE_SSTRUCTVECTORSETCONSTANTV)
-   (hypre_F90_Obj *vector,
-    hypre_F90_Complex *value,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *vector,
+ hypre_F90_Complex *value,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructVectorSetConstantValues(
-          hypre_F90_PassObj (HYPRE_SStructVector, vector),
-          hypre_F90_PassComplex (value)));
+           (HYPRE_SStructVectorSetConstantValues(
+               hypre_F90_PassObj (HYPRE_SStructVector, vector),
+               hypre_F90_PassComplex (value)));
 }
 
 /*--------------------------------------------------------------------------
@@ -252,14 +252,14 @@ hypre_F90_IFACE(hypre_sstructvectorsetconstantv, HYPRE_SSTRUCTVECTORSETCONSTANTV
 
 void
 hypre_F90_IFACE(hypre_sstructvectorsetobjecttyp, HYPRE_SSTRUCTVECTORSETOBJECTTYP)
-   (hypre_F90_Obj *vector,
-    hypre_F90_Int *type,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *vector,
+ hypre_F90_Int *type,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructVectorSetObjectType(
-          hypre_F90_PassObj (HYPRE_SStructVector, vector),
-          hypre_F90_PassInt (type) ));
+           (HYPRE_SStructVectorSetObjectType(
+               hypre_F90_PassObj (HYPRE_SStructVector, vector),
+               hypre_F90_PassInt (type) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -268,14 +268,14 @@ hypre_F90_IFACE(hypre_sstructvectorsetobjecttyp, HYPRE_SSTRUCTVECTORSETOBJECTTYP
 
 void
 hypre_F90_IFACE(hypre_sstructvectorgetobject, HYPRE_SSTRUCTVECTORGETOBJECT)
-   (hypre_F90_Obj *vector,
-    hypre_F90_Obj *object,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *vector,
+ hypre_F90_Obj *object,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructVectorGetObject(
-          hypre_F90_PassObj (HYPRE_SStructVector, vector),
-          (void **)              object ));
+           (HYPRE_SStructVectorGetObject(
+               hypre_F90_PassObj (HYPRE_SStructVector, vector),
+               (void **)              object ));
 }
 
 /*--------------------------------------------------------------------------
@@ -284,16 +284,16 @@ hypre_F90_IFACE(hypre_sstructvectorgetobject, HYPRE_SSTRUCTVECTORGETOBJECT)
 
 void
 hypre_F90_IFACE(hypre_sstructvectorprint, HYPRE_SSTRUCTVECTORPRINT)
-   (char *filename,
-    hypre_F90_Obj *vector,
-    hypre_F90_Int *all,
-    hypre_F90_Int *ierr)
+(char *filename,
+ hypre_F90_Obj *vector,
+ hypre_F90_Int *all,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructVectorPrint(
-          (char * )        filename,
-          hypre_F90_PassObj (HYPRE_SStructVector, vector),
-          hypre_F90_PassInt (all) ) );
+           (HYPRE_SStructVectorPrint(
+               (char * )        filename,
+               hypre_F90_PassObj (HYPRE_SStructVector, vector),
+               hypre_F90_PassInt (all) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -302,14 +302,14 @@ hypre_F90_IFACE(hypre_sstructvectorprint, HYPRE_SSTRUCTVECTORPRINT)
 
 void
 hypre_F90_IFACE(hypre_sstructvectorcopy, HYPRE_SSTRUCTVECTORCOPY)
-   (hypre_F90_Obj *x,
-    hypre_F90_Obj *y,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *x,
+ hypre_F90_Obj *y,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructVectorCopy(
-          hypre_F90_PassObj (HYPRE_SStructVector, x),
-          hypre_F90_PassObj (HYPRE_SStructVector, y) ) );
+           (HYPRE_SStructVectorCopy(
+               hypre_F90_PassObj (HYPRE_SStructVector, x),
+               hypre_F90_PassObj (HYPRE_SStructVector, y) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -318,14 +318,14 @@ hypre_F90_IFACE(hypre_sstructvectorcopy, HYPRE_SSTRUCTVECTORCOPY)
 
 void
 hypre_F90_IFACE(hypre_sstructvectorscale, HYPRE_SSTRUCTVECTORSCALE)
-   (hypre_F90_Complex *alpha,
-    hypre_F90_Obj *y,
-    hypre_F90_Int *ierr)
+(hypre_F90_Complex *alpha,
+ hypre_F90_Obj *y,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructVectorScale(
-          hypre_F90_PassComplex (alpha),
-          hypre_F90_PassObj (HYPRE_SStructVector, y) ) );
+           (HYPRE_SStructVectorScale(
+               hypre_F90_PassComplex (alpha),
+               hypre_F90_PassObj (HYPRE_SStructVector, y) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -334,16 +334,16 @@ hypre_F90_IFACE(hypre_sstructvectorscale, HYPRE_SSTRUCTVECTORSCALE)
 
 void
 hypre_F90_IFACE(hypre_sstructinnerprod, HYPRE_SSTRUCTINNERPROD)
-   (hypre_F90_Obj *x,
-    hypre_F90_Obj *y,
-    hypre_F90_Complex *result,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *x,
+ hypre_F90_Obj *y,
+ hypre_F90_Complex *result,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructInnerProd(
-          hypre_F90_PassObj (HYPRE_SStructVector, x),
-          hypre_F90_PassObj (HYPRE_SStructVector, y),
-          hypre_F90_PassComplexRef (result) ) );
+           (HYPRE_SStructInnerProd(
+               hypre_F90_PassObj (HYPRE_SStructVector, x),
+               hypre_F90_PassObj (HYPRE_SStructVector, y),
+               hypre_F90_PassComplexRef (result) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -352,16 +352,16 @@ hypre_F90_IFACE(hypre_sstructinnerprod, HYPRE_SSTRUCTINNERPROD)
 
 void
 hypre_F90_IFACE(hypre_sstructaxpy, HYPRE_SSTRUCTAXPY)
-   (hypre_F90_Complex *alpha,
-    hypre_F90_Obj *x,
-    hypre_F90_Obj *y,
-    hypre_F90_Int *ierr)
+(hypre_F90_Complex *alpha,
+ hypre_F90_Obj *x,
+ hypre_F90_Obj *y,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_SStructAxpy(
-          hypre_F90_PassComplex (alpha),
-          hypre_F90_PassObj (HYPRE_SStructVector, x),
-          hypre_F90_PassObj (HYPRE_SStructVector, y) ) );
+           (HYPRE_SStructAxpy(
+               hypre_F90_PassComplex (alpha),
+               hypre_F90_PassObj (HYPRE_SStructVector, x),
+               hypre_F90_PassObj (HYPRE_SStructVector, y) ) );
 }
 
 #ifdef __cplusplus
diff --git a/external/hypre/src/sstruct_mv/HYPRE_sstruct_graph.c b/external/hypre/src/sstruct_mv/HYPRE_sstruct_graph.c
index 5694666f..5691325e 100644
--- a/external/hypre/src/sstruct_mv/HYPRE_sstruct_graph.c
+++ b/external/hypre/src/sstruct_mv/HYPRE_sstruct_graph.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -78,7 +78,7 @@ HYPRE_SStructGraphCreate( MPI_Comm             comm,
    hypre_SStructGraphEntries(graph)    = NULL;
    hypre_SStructNGraphEntries(graph)   = 0;
    hypre_SStructAGraphEntries(graph)   = 0;
-   
+
    *graph_ptr = graph;
 
    return hypre_error_flag;
@@ -90,20 +90,21 @@ HYPRE_SStructGraphCreate( MPI_Comm             comm,
 HYPRE_Int
 HYPRE_SStructGraphDestroy( HYPRE_SStructGraph graph )
 {
-   HYPRE_Int               nparts;
-   hypre_SStructPGrid    **pgrids;
-   hypre_SStructStencil ***stencils;
-   HYPRE_Int              *fem_nsparse;
-   HYPRE_Int             **fem_sparse_i;
-   HYPRE_Int             **fem_sparse_j;
-   HYPRE_Int             **fem_entries;
-   HYPRE_Int               nUventries;
-   HYPRE_Int              *iUventries;
-   hypre_SStructUVEntry  **Uventries;
-   hypre_SStructUVEntry   *Uventry;
-   HYPRE_BigInt          **Uveoffsets;
-   HYPRE_Int               nvars;
-   HYPRE_Int               part, var, i;
+   HYPRE_Int                 nparts;
+   hypre_SStructPGrid      **pgrids;
+   hypre_SStructStencil   ***stencils;
+   HYPRE_Int                *fem_nsparse;
+   HYPRE_Int               **fem_sparse_i;
+   HYPRE_Int               **fem_sparse_j;
+   HYPRE_Int               **fem_entries;
+   HYPRE_Int                 nUventries;
+   HYPRE_Int                *iUventries;
+   hypre_SStructUVEntry    **Uventries;
+   hypre_SStructUVEntry     *Uventry;
+   HYPRE_BigInt            **Uveoffsets;
+   hypre_SStructGraphEntry **graph_entries;
+   HYPRE_Int                 nvars;
+   HYPRE_Int                 part, var, i;
 
    if (graph)
    {
@@ -155,6 +156,12 @@ HYPRE_SStructGraphDestroy( HYPRE_SStructGraph graph )
          hypre_TFree(iUventries, HYPRE_MEMORY_HOST);
          hypre_TFree(Uventries, HYPRE_MEMORY_HOST);
          hypre_TFree(Uveoffsets, HYPRE_MEMORY_HOST);
+         graph_entries = hypre_SStructGraphEntries(graph);
+         for (i = 0; i < hypre_SStructNGraphEntries(graph); i++)
+         {
+            hypre_TFree(graph_entries[i], HYPRE_MEMORY_HOST);
+         }
+         hypre_TFree(graph_entries, HYPRE_MEMORY_HOST);
          hypre_TFree(graph, HYPRE_MEMORY_HOST);
       }
    }
@@ -223,8 +230,8 @@ HYPRE_SStructGraphSetFEMSparsity( HYPRE_SStructGraph  graph,
    fem_sparse_j = hypre_TAlloc(HYPRE_Int,  nsparse, HYPRE_MEMORY_HOST);
    for (s = 0; s < nsparse; s++)
    {
-      fem_sparse_i[s] = sparsity[2*s];
-      fem_sparse_j[s] = sparsity[2*s+1];
+      fem_sparse_i[s] = sparsity[2 * s];
+      fem_sparse_j[s] = sparsity[2 * s + 1];
    }
    hypre_SStructGraphFEMPSparseI(graph, part) = fem_sparse_i;
    hypre_SStructGraphFEMPSparseJ(graph, part) = fem_sparse_j;
@@ -253,15 +260,15 @@ HYPRE_SStructGraphAddEntries( HYPRE_SStructGraph   graph,
 
    hypre_SStructGraphEntry **entries   = hypre_SStructGraphEntries(graph);
    hypre_SStructGraphEntry  *new_entry;
-   
+
    HYPRE_Int                 n_entries = hypre_SStructNGraphEntries(graph);
    HYPRE_Int                 a_entries = hypre_SStructAGraphEntries(graph);
-   
+
    /* check storage */
    if (!a_entries)
    {
       a_entries = 1000;
-      entries = hypre_CTAlloc(hypre_SStructGraphEntry *,  a_entries, HYPRE_MEMORY_HOST);
+      entries = hypre_TAlloc(hypre_SStructGraphEntry *,  a_entries, HYPRE_MEMORY_HOST);
 
       hypre_SStructAGraphEntries(graph) = a_entries;
       hypre_SStructGraphEntries(graph) = entries;
@@ -270,11 +277,11 @@ HYPRE_SStructGraphAddEntries( HYPRE_SStructGraph   graph,
    {
       a_entries += 1000;
       entries = hypre_TReAlloc(entries,  hypre_SStructGraphEntry *,  a_entries, HYPRE_MEMORY_HOST);
-   
+
       hypre_SStructAGraphEntries(graph) = a_entries;
       hypre_SStructGraphEntries(graph) = entries;
    }
-   
+
    /*save parameters to a new entry */
 
    new_entry = hypre_TAlloc(hypre_SStructGraphEntry,  1, HYPRE_MEMORY_HOST);
@@ -288,7 +295,7 @@ HYPRE_SStructGraphAddEntries( HYPRE_SStructGraph   graph,
    hypre_CopyToCleanIndex(index, ndim, hypre_SStructGraphEntryIndex(new_entry));
    hypre_CopyToCleanIndex(
       to_index, ndim, hypre_SStructGraphEntryToIndex(new_entry));
-     
+
    entries[n_entries] = new_entry;
 
    /* update count */
@@ -340,7 +347,7 @@ HYPRE_SStructGraphAssemble( HYPRE_SStructGraph graph )
    HYPRE_Int                 to_proc;
    HYPRE_BigInt              Uverank, rank;
    hypre_BoxManEntry        *boxman_entry;
-                         
+
    HYPRE_Int                 nprocs, myproc;
    HYPRE_Int                 part, var;
    hypre_IndexRef            index;
@@ -351,10 +358,10 @@ HYPRE_SStructGraphAssemble( HYPRE_SStructGraph graph )
    hypre_BoxManager        ***new_managers = NULL;
    hypre_BoxManager          *orig_boxman;
    hypre_BoxManager          *new_boxman;
-   
+
    HYPRE_Int                  global_n_add_entries;
    HYPRE_Int                  is_gather, k;
-   
+
    hypre_BoxManEntry         *all_entries, *entry;
    HYPRE_Int                  num_entries;
    void                      *info;
@@ -381,12 +388,12 @@ HYPRE_SStructGraphAssemble( HYPRE_SStructGraph graph )
     *---------------------------------------------------------*/
 
    new_box = hypre_BoxCreate(ndim);
-   
+
    /* if any processor has added entries, then all need to participate */
 
    hypre_MPI_Allreduce(&n_add_entries, &global_n_add_entries,
                        1, HYPRE_MPI_INT, hypre_MPI_SUM, comm);
- 
+
    if (global_n_add_entries > 0 )
    {
       /* create new managers */
@@ -397,19 +404,19 @@ HYPRE_SStructGraphAssemble( HYPRE_SStructGraph graph )
       {
          pgrid = hypre_SStructGridPGrid(grid, part);
          nvars = hypre_SStructPGridNVars(pgrid);
-         
+
          new_managers[part] = hypre_TAlloc(hypre_BoxManager *,  nvars, HYPRE_MEMORY_HOST);
          new_gboxes[part] = hypre_TAlloc(hypre_Box *,  nvars, HYPRE_MEMORY_HOST);
-         
+
          for (var = 0; var < nvars; var++)
          {
             sgrid = hypre_SStructPGridSGrid(pgrid, var);
-       
+
             orig_boxman = managers[part][var];
             bbox =  hypre_BoxManBoundingBox(orig_boxman);
-            
-            hypre_BoxManCreate(hypre_BoxManNEntries(orig_boxman), 
-                               hypre_BoxManEntryInfoSize(orig_boxman), 
+
+            hypre_BoxManCreate(hypre_BoxManNEntries(orig_boxman),
+                               hypre_BoxManEntryInfoSize(orig_boxman),
                                hypre_StructGridNDim(sgrid), bbox,
                                hypre_StructGridComm(sgrid),
                                &new_managers[part][var]);
@@ -433,7 +440,7 @@ HYPRE_SStructGraphAssemble( HYPRE_SStructGraph graph )
          /* check part, var, index, to_part, to_var, to_index */
          for (k = 0; k < 2; k++)
          {
-            switch(k)
+            switch (k)
             {
                case 0:
                   part =  hypre_SStructGraphEntryPart(new_entry);
@@ -450,11 +457,11 @@ HYPRE_SStructGraphAssemble( HYPRE_SStructGraph graph )
             /* if the index is not within the bounds of the struct grid bounding
                box (which has been set in the box manager) then there should not
                be a coupling here (doesn't make sense) */
-            
+
             new_boxman = new_managers[part][var];
             new_gbox = new_gboxes[part][var];
             bbox =  hypre_BoxManBoundingBox(new_boxman);
-            
+
             if (hypre_IndexInBox(index, bbox) != 0)
             {
                /* compute new gather box extents based on index */
@@ -468,7 +475,7 @@ HYPRE_SStructGraphAssemble( HYPRE_SStructGraph graph )
             }
          }
       }
-      
+
       /* Now go through the managers and if gather has been called (on any
          processor) then populate the new manager with the entries from the old
          manager and then assemble and delete the old manager. */
@@ -476,7 +483,7 @@ HYPRE_SStructGraphAssemble( HYPRE_SStructGraph graph )
       {
          pgrid = hypre_SStructGridPGrid(grid, part);
          nvars = hypre_SStructPGridNVars(pgrid);
-         
+
          for (var = 0; var < nvars; var++)
          {
             new_boxman = new_managers[part][var];
@@ -494,17 +501,17 @@ HYPRE_SStructGraphAssemble( HYPRE_SStructGraph graph )
             if (is_gather)
             {
                /* copy orig boxman information to the new boxman*/
-               
+
                orig_boxman = managers[part][var];
 
                hypre_BoxManGetAllEntries(orig_boxman, &num_entries, &all_entries);
-               
-               for (j=0; j< num_entries; j++)
+
+               for (j = 0; j < num_entries; j++)
                {
                   entry = &all_entries[j];
-                  
+
                   hypre_BoxManEntryGetInfo(entry, &info);
-                  
+
                   hypre_BoxManAddEntry(new_boxman,
                                        hypre_BoxManEntryIMin(entry),
                                        hypre_BoxManEntryIMax(entry),
@@ -512,7 +519,7 @@ HYPRE_SStructGraphAssemble( HYPRE_SStructGraph graph )
                                        hypre_BoxManEntryId(entry),
                                        info);
                }
-               
+
                /* call assemble for new boxmanager*/
                hypre_BoxManAssemble(new_boxman);
 
@@ -522,7 +529,7 @@ HYPRE_SStructGraphAssemble( HYPRE_SStructGraph graph )
                   hypre_MPI_Comm_rank(comm, &myproc);
                   hypre_printf("myid = %d, new_entries = %d, old entries = %d\n", myproc, hypre_BoxManNEntries(new_boxman), num_entries);
                   } */
-               
+
                /* destroy old manager */
                hypre_BoxManDestroy (managers[part][var]);
             }
@@ -530,11 +537,11 @@ HYPRE_SStructGraphAssemble( HYPRE_SStructGraph graph )
             {
                /*leave the old manager (so destroy the new one)  */
                hypre_BoxManDestroy(new_boxman);
-               
+
                /*copy the old to the new */
                new_managers[part][var] = managers[part][var];
             }
-            
+
             hypre_BoxDestroy(new_gboxes[part][var]);
          } /* end of var loop */
          hypre_TFree(managers[part], HYPRE_MEMORY_HOST);
@@ -542,7 +549,7 @@ HYPRE_SStructGraphAssemble( HYPRE_SStructGraph graph )
       } /* end of part loop */
       hypre_TFree(managers, HYPRE_MEMORY_HOST);
       hypre_TFree(new_gboxes, HYPRE_MEMORY_HOST);
-   
+
       /* assign the new ones */
       hypre_SStructGridBoxManagers(grid) = new_managers;
    }
@@ -601,14 +608,14 @@ HYPRE_SStructGraphAssemble( HYPRE_SStructGraph graph )
    for (j = 0; j < n_add_entries; j++)
    {
       new_entry = add_entries[j];
-      
+
       part =  hypre_SStructGraphEntryPart(new_entry);
       var = hypre_SStructGraphEntryVar(new_entry);
       index = hypre_SStructGraphEntryIndex(new_entry);
       to_part =  hypre_SStructGraphEntryToPart(new_entry) ;
       to_var =  hypre_SStructGraphEntryToVar(new_entry);
       to_index = hypre_SStructGraphEntryToIndex(new_entry);
-      
+
       /* compute location (rank) for Uventry */
       hypre_SStructGraphGetUVEntryRank(graph, part, var, index, &Uverank);
 
@@ -644,33 +651,26 @@ HYPRE_SStructGraphAssemble( HYPRE_SStructGraph graph )
          hypre_SStructUVEntryToPart(Uventry, i) = to_part;
          hypre_CopyIndex(to_index, hypre_SStructUVEntryToIndex(Uventry, i));
          hypre_SStructUVEntryToVar(Uventry, i) = to_var;
-      
+
          hypre_SStructGridFindBoxManEntry(
             dom_grid, to_part, to_index, to_var, &boxman_entry);
          hypre_SStructBoxManEntryGetBoxnum(boxman_entry, &to_boxnum);
          hypre_SStructUVEntryToBoxnum(Uventry, i) = to_boxnum;
          hypre_SStructBoxManEntryGetProcess(boxman_entry, &to_proc);
-         hypre_SStructUVEntryToProc(Uventry, i)= to_proc;
+         hypre_SStructUVEntryToProc(Uventry, i) = to_proc;
          hypre_SStructBoxManEntryGetGlobalRank(
-            boxman_entry, to_index, &rank, type);          
+            boxman_entry, to_index, &rank, type);
          hypre_SStructUVEntryToRank(Uventry, i) = rank;
-      
+
          Uventries[Uverank] = Uventry;
-      
+
          nUventries++;
          hypre_SStructGraphNUVEntries(graph) = nUventries;
 
          hypre_SStructGraphUVEntries(graph) = Uventries;
       }
+   } /* end of loop through add entries */
 
-      /*free each add entry after copying */
-      hypre_TFree(new_entry, HYPRE_MEMORY_HOST);
-
-   }/* end of loop through add entries */
-   
-   /* free the storage for the add entires */
-   hypre_TFree(add_entries, HYPRE_MEMORY_HOST);
-   
    /*---------------------------------------------------------
     * Set up the FEM stencil information
     *---------------------------------------------------------*/
@@ -724,8 +724,8 @@ HYPRE_SStructGraphAssemble( HYPRE_SStructGraph graph )
          stencil_vars    = hypre_CTAlloc(HYPRE_Int *,  nvars, HYPRE_MEMORY_HOST);
          for (iv = 0; iv < nvars; iv++)
          {
-            stencil_offsets[iv] = hypre_CTAlloc(hypre_Index,  fem_nvars*fem_nvars, HYPRE_MEMORY_HOST);
-            stencil_vars[iv]    = hypre_CTAlloc(HYPRE_Int,  fem_nvars*fem_nvars, HYPRE_MEMORY_HOST);
+            stencil_offsets[iv] = hypre_CTAlloc(hypre_Index,  fem_nvars * fem_nvars, HYPRE_MEMORY_HOST);
+            stencil_vars[iv]    = hypre_CTAlloc(HYPRE_Int,  fem_nvars * fem_nvars, HYPRE_MEMORY_HOST);
          }
 
          for (s = 0; s < fem_nsparse; s++)
@@ -761,7 +761,7 @@ HYPRE_SStructGraphAssemble( HYPRE_SStructGraph graph )
                stencil_vars[iv][entry] = jv;
                stencil_sizes[iv]++;
             }
-            
+
             fem_entries[s] = entry;
          }
 
@@ -802,7 +802,7 @@ HYPRE_SStructGraphAssemble( HYPRE_SStructGraph graph )
       j = 1;
       for (i = 1; i < nUventries; i++)
       {
-         if (iUventries[i] > iUventries[i-1])
+         if (iUventries[i] > iUventries[i - 1])
          {
             iUventries[j] = iUventries[i];
             j++;
@@ -826,3 +826,113 @@ HYPRE_SStructGraphSetObjectType( HYPRE_SStructGraph  graph,
 
    return hypre_error_flag;
 }
+
+/*--------------------------------------------------------------------------
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_SStructGraphPrint( FILE *file, HYPRE_SStructGraph graph )
+{
+   HYPRE_Int                 type = hypre_SStructGraphObjectType(graph);
+   HYPRE_Int                 ndim = hypre_SStructGraphNDim(graph);
+   HYPRE_Int                 nentries = hypre_SStructNGraphEntries(graph);
+   hypre_SStructGraphEntry **entries = hypre_SStructGraphEntries(graph);
+   HYPRE_Int                 part, to_part;
+   HYPRE_Int                 var, to_var;
+   hypre_IndexRef            index, to_index;
+
+   HYPRE_Int                 i;
+
+   /* Print auxiliary info */
+   hypre_fprintf(file, "GraphSetObjectType: %d\n", type);
+
+   /* Print SStructGraphEntry info */
+   hypre_fprintf(file, "GraphNumEntries: %d", nentries);
+   for (i = 0; i < nentries; i++)
+   {
+      part = hypre_SStructGraphEntryPart(entries[i]);
+      var = hypre_SStructGraphEntryVar(entries[i]);
+      index = hypre_SStructGraphEntryIndex(entries[i]);
+      to_part = hypre_SStructGraphEntryToPart(entries[i]);
+      to_var = hypre_SStructGraphEntryToVar(entries[i]);
+      to_index = hypre_SStructGraphEntryToIndex(entries[i]);
+
+      hypre_fprintf(file, "\nGraphAddEntries: %d %d ", part, var);
+      hypre_IndexPrint(file, ndim, index);
+      hypre_fprintf(file, " %d %d ", to_part, to_var);
+      hypre_IndexPrint(file, ndim, to_index);
+   }
+   hypre_fprintf(file, "\n");
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_SStructGraphRead( FILE                  *file,
+                        HYPRE_SStructGrid      grid,
+                        HYPRE_SStructStencil **stencils,
+                        HYPRE_SStructGraph    *graph_ptr )
+{
+   MPI_Comm                  comm = hypre_SStructGridComm(grid);
+   HYPRE_Int                 nparts = hypre_SStructGridNParts(grid);
+   HYPRE_Int                 ndim = hypre_SStructGridNDim(grid);
+
+   HYPRE_SStructGraph        graph;
+   hypre_SStructGraphEntry **entries;
+   hypre_SStructPGrid       *pgrid;
+   HYPRE_Int                 nentries;
+   HYPRE_Int                 a_entries;
+   HYPRE_Int                 part, to_part;
+   HYPRE_Int                 var, to_var;
+   hypre_Index               index, to_index;
+
+   HYPRE_Int                 type;
+   HYPRE_Int                 nvars;
+   HYPRE_Int                 i;
+
+   /* Create graph */
+   HYPRE_SStructGraphCreate(comm, grid, &graph);
+
+   /* Read auxiliary info */
+   hypre_fscanf(file, "GraphSetObjectType: %d\n", &type);
+   HYPRE_SStructGraphSetObjectType(graph, type);
+
+   /* Set stencils */
+   for (part = 0; part < nparts; part++)
+   {
+      pgrid = hypre_SStructGridPGrid(grid, part);
+      nvars = hypre_SStructPGridNVars(pgrid);
+
+      for (var = 0; var < nvars; var++)
+      {
+         HYPRE_SStructGraphSetStencil(graph, part, var, stencils[part][var]);
+      }
+   }
+
+   /* TODO: HYPRE_SStructGraphSetFEM */
+   /* TODO: HYPRE_SStructGraphSetFEMSparsity */
+
+   /* Read SStructGraphEntry info */
+   hypre_fscanf(file, "GraphNumEntries: %d", &nentries);
+   a_entries = nentries + 1;
+   hypre_SStructAGraphEntries(graph) = a_entries;
+   entries = hypre_CTAlloc(hypre_SStructGraphEntry *, a_entries, HYPRE_MEMORY_HOST);
+   hypre_SStructGraphEntries(graph) = entries;
+   for (i = 0; i < nentries; i++)
+   {
+      hypre_fscanf(file, "\nGraphAddEntries: %d %d ", &part, &var);
+      hypre_IndexRead(file, ndim, index);
+      hypre_fscanf(file, " %d %d ", &to_part, &to_var);
+      hypre_IndexRead(file, ndim, to_index);
+
+      HYPRE_SStructGraphAddEntries(graph, part, index, var, to_part, to_index, to_var);
+   }
+   hypre_fscanf(file, "\n");
+
+   *graph_ptr = graph;
+
+   return hypre_error_flag;
+}
diff --git a/external/hypre/src/sstruct_mv/HYPRE_sstruct_grid.c b/external/hypre/src/sstruct_mv/HYPRE_sstruct_grid.c
index c96e84b1..4a8bb826 100644
--- a/external/hypre/src/sstruct_mv/HYPRE_sstruct_grid.c
+++ b/external/hypre/src/sstruct_mv/HYPRE_sstruct_grid.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -33,7 +33,7 @@ HYPRE_SStructGridCreate( MPI_Comm           comm,
    HYPRE_Int               *fem_nvars;
    HYPRE_Int              **fem_vars;
    hypre_Index            **fem_offsets;
-   HYPRE_Int                num_ghost[2*HYPRE_MAXDIM];
+   HYPRE_Int                num_ghost[2 * HYPRE_MAXDIM];
    HYPRE_Int                i;
 
    grid = hypre_TAlloc(hypre_SStructGrid,  1, HYPRE_MEMORY_HOST);
@@ -81,7 +81,7 @@ HYPRE_SStructGridCreate( MPI_Comm           comm,
    hypre_SStructGridGhlocalSize(grid)   = 0;
 
    /* Initialize num ghost */
-   for (i = 0; i < 2*ndim; i++)
+   for (i = 0; i < 2 * ndim; i++)
    {
       num_ghost[i] = 1;
    }
@@ -205,10 +205,11 @@ HYPRE_SStructGridSetExtents( HYPRE_SStructGrid  grid,
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int HYPRE_SStructGridSetVariables( HYPRE_SStructGrid      grid,
-                                   HYPRE_Int              part,
-                                   HYPRE_Int              nvars,
-                                   HYPRE_SStructVariable *vartypes )
+HYPRE_Int
+HYPRE_SStructGridSetVariables( HYPRE_SStructGrid      grid,
+                               HYPRE_Int              part,
+                               HYPRE_Int              nvars,
+                               HYPRE_SStructVariable *vartypes )
 {
    hypre_SStructPGrid  *pgrid = hypre_SStructGridPGrid(grid, part);
 
@@ -238,7 +239,7 @@ HYPRE_SStructGridAddVariables( HYPRE_SStructGrid      grid,
    /* allocate more space if necessary */
    if ((nucvars % memchunk) == 0)
    {
-      ucvars = hypre_TReAlloc(ucvars,  hypre_SStructUCVar *, 
+      ucvars = hypre_TReAlloc(ucvars,  hypre_SStructUCVar *,
                               (nucvars + memchunk), HYPRE_MEMORY_HOST);
    }
 
@@ -305,7 +306,7 @@ HYPRE_SStructGridSetFEMOrdering( HYPRE_SStructGrid  grid,
    if (ordering == NULL)
    {
       clean = 1;
-      ordering = hypre_TAlloc(HYPRE_Int,  (1+ndim)*fem_nvars, HYPRE_MEMORY_HOST);
+      ordering = hypre_TAlloc(HYPRE_Int,  (1 + ndim) * fem_nvars, HYPRE_MEMORY_HOST);
       j = 0;
       for (i = 0; i < nvars; i++)
       {
@@ -318,17 +319,17 @@ HYPRE_SStructGridSetFEMOrdering( HYPRE_SStructGrid  grid,
                loop[d] = 1;
             }
          }
-         for (off[2] = -loop[2]; off[2] <= loop[2]; off[2]+=2)
+         for (off[2] = -loop[2]; off[2] <= loop[2]; off[2] += 2)
          {
-            for (off[1] = -loop[1]; off[1] <= loop[1]; off[1]+=2)
+            for (off[1] = -loop[1]; off[1] <= loop[1]; off[1] += 2)
             {
-               for (off[0] = -loop[0]; off[0] <= loop[0]; off[0]+=2)
+               for (off[0] = -loop[0]; off[0] <= loop[0]; off[0] += 2)
                {
-                  block = &ordering[(1+ndim)*j];
+                  block = &ordering[(1 + ndim) * j];
                   block[0] = i;
                   for (d = 0; d < ndim; d++)
                   {
-                     block[1+d] = off[d];
+                     block[1 + d] = off[d];
                   }
                   j++;
                }
@@ -337,17 +338,20 @@ HYPRE_SStructGridSetFEMOrdering( HYPRE_SStructGrid  grid,
       }
    }
 
-   fem_vars    = hypre_TAlloc(HYPRE_Int,  fem_nvars, HYPRE_MEMORY_HOST);
-   fem_offsets = hypre_TAlloc(hypre_Index,  fem_nvars, HYPRE_MEMORY_HOST);
+   fem_vars    = hypre_TReAlloc(hypre_SStructGridFEMPVars(grid, part), HYPRE_Int, fem_nvars,
+                                HYPRE_MEMORY_HOST);
+   fem_offsets = hypre_TReAlloc(hypre_SStructGridFEMPOffsets(grid, part), hypre_Index, fem_nvars,
+                                HYPRE_MEMORY_HOST);
+
    for (i = 0; i < fem_nvars; i++)
    {
-      block = &ordering[(1+ndim)*i];
+      block = &ordering[(1 + ndim) * i];
       fem_vars[i] = block[0];
       hypre_SetIndex(fem_offsets[i], 0);
       for (d = 0; d < ndim; d++)
       {
          /* modify the user offsets to contain only 0's and -1's */
-         if (block[1+d] < 0)
+         if (block[1 + d] < 0)
          {
             hypre_IndexD(fem_offsets[i], d) = -1;
          }
@@ -397,9 +401,9 @@ HYPRE_SStructGridSetNeighborPart( HYPRE_SStructGrid  grid,
    /* allocate more memory if needed */
    if ((nneighbors[part] % memchunk) == 0)
    {
-      neighbors[part] = hypre_TReAlloc(neighbors[part],  hypre_SStructNeighbor, 
+      neighbors[part] = hypre_TReAlloc(neighbors[part],  hypre_SStructNeighbor,
                                        (nneighbors[part] + memchunk), HYPRE_MEMORY_HOST);
-      nbor_offsets[part] = hypre_TReAlloc(nbor_offsets[part],  hypre_Index, 
+      nbor_offsets[part] = hypre_TReAlloc(nbor_offsets[part],  hypre_Index,
                                           (nneighbors[part] + memchunk), HYPRE_MEMORY_HOST);
    }
 
@@ -490,9 +494,9 @@ HYPRE_SStructGridSetSharedPart( HYPRE_SStructGrid  grid,
    /* allocate more memory if needed */
    if ((nneighbors[part] % memchunk) == 0)
    {
-      neighbors[part] = hypre_TReAlloc(neighbors[part],  hypre_SStructNeighbor, 
+      neighbors[part] = hypre_TReAlloc(neighbors[part],  hypre_SStructNeighbor,
                                        (nneighbors[part] + memchunk), HYPRE_MEMORY_HOST);
-      nbor_offsets[part] = hypre_TReAlloc(nbor_offsets[part],  hypre_Index, 
+      nbor_offsets[part] = hypre_TReAlloc(nbor_offsets[part],  hypre_Index,
                                           (nneighbors[part] + memchunk), HYPRE_MEMORY_HOST);
    }
 
@@ -539,7 +543,7 @@ HYPRE_SStructGridSetSharedPart( HYPRE_SStructGrid  grid,
       /* Map the offset to the neighbor part and adjust ilower_mapped so that
        * NeighborILower is a direct mapping of NeighborBoxIMin.  This allows us
        * to eliminate shared_offset. */
-      offset_mapped[dd] = offset[d]*dir[d];
+      offset_mapped[dd] = offset[d] * dir[d];
       if (offset_mapped[dd] != shared_offset[dd])
       {
          hypre_IndexD(ilower_mapped, dd) -= offset_mapped[dd];
@@ -630,7 +634,7 @@ HYPRE_SStructGridAssemble( HYPRE_SStructGrid grid )
     * actually live anywhere on the global grid.
     *
     * This is not an issue for cell-centered variables.
-    */ 
+    */
 
    for (part = 0; part < nparts; part++)
    {
@@ -657,7 +661,7 @@ HYPRE_SStructGridAssemble( HYPRE_SStructGrid grid )
    {
       hypre_SStructPGridAssemble(pgrids[part]);
    }
-   
+
    /*-------------------------------------------------------------
     * re-organize u-variables to reference via local cell rank
     *-------------------------------------------------------------*/
@@ -787,7 +791,8 @@ HYPRE_SStructGridAssemble( HYPRE_SStructGrid grid )
          }
 
          /* Set up vneighbors for this (part, var) */
-         vneighbors[part][var] = hypre_TAlloc(hypre_SStructNeighbor,  nvneighbors[part][var], HYPRE_MEMORY_HOST);
+         vneighbors[part][var] = hypre_TAlloc(hypre_SStructNeighbor,  nvneighbors[part][var],
+                                              HYPRE_MEMORY_HOST);
          vb = 0;
          for (b = 0; b < nneighbors[part]; b++)
          {
@@ -875,10 +880,9 @@ HYPRE_SStructGridSetPeriodic( HYPRE_SStructGrid  grid,
 
 HYPRE_Int
 HYPRE_SStructGridSetNumGhost( HYPRE_SStructGrid grid,
-                              HYPRE_Int      *num_ghost)       
+                              HYPRE_Int      *num_ghost)
 {
    hypre_SStructGridSetNumGhost(grid, num_ghost);
 
    return hypre_error_flag;
 }
-
diff --git a/external/hypre/src/sstruct_mv/HYPRE_sstruct_matrix.c b/external/hypre/src/sstruct_mv/HYPRE_sstruct_matrix.c
index 374bbc58..95333674 100644
--- a/external/hypre/src/sstruct_mv/HYPRE_sstruct_matrix.c
+++ b/external/hypre/src/sstruct_mv/HYPRE_sstruct_matrix.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -161,9 +161,12 @@ HYPRE_SStructMatrixDestroy( HYPRE_SStructMatrix matrix )
    hypre_SStructPGrid     *pgrid;
    HYPRE_Int               nvars;
    HYPRE_Int               part, var;
+   HYPRE_MemoryLocation    memory_location;
 
    if (matrix)
    {
+      memory_location = hypre_SStructMatrixMemoryLocation(matrix);
+
       hypre_SStructMatrixRefCount(matrix) --;
       if (hypre_SStructMatrixRefCount(matrix) == 0)
       {
@@ -194,10 +197,10 @@ HYPRE_SStructMatrixDestroy( HYPRE_SStructMatrix matrix )
          hypre_TFree(hypre_SStructMatrixUEntries(matrix), HYPRE_MEMORY_HOST);
          hypre_TFree(hypre_SStructMatrixTmpRowCoords(matrix), HYPRE_MEMORY_HOST);
          hypre_TFree(hypre_SStructMatrixTmpColCoords(matrix), HYPRE_MEMORY_HOST);
-         hypre_TFree(hypre_SStructMatrixTmpCoeffs(matrix),    HYPRE_MEMORY_HOST);
-         hypre_TFree(hypre_SStructMatrixTmpRowCoordsDevice(matrix), HYPRE_MEMORY_DEVICE);
-         hypre_TFree(hypre_SStructMatrixTmpColCoordsDevice(matrix), HYPRE_MEMORY_DEVICE);
-         hypre_TFree(hypre_SStructMatrixTmpCoeffsDevice(matrix),    HYPRE_MEMORY_DEVICE);
+         hypre_TFree(hypre_SStructMatrixTmpCoeffs(matrix), HYPRE_MEMORY_HOST);
+         hypre_TFree(hypre_SStructMatrixTmpRowCoordsDevice(matrix), memory_location);
+         hypre_TFree(hypre_SStructMatrixTmpColCoordsDevice(matrix), memory_location);
+         hypre_TFree(hypre_SStructMatrixTmpCoeffsDevice(matrix), memory_location);
          hypre_TFree(matrix, HYPRE_MEMORY_HOST);
       }
    }
@@ -234,7 +237,7 @@ HYPRE_SStructMatrixInitialize( HYPRE_SStructMatrix matrix )
    /* GEC0902 addition of variables for ilower and iupper   */
    MPI_Comm                comm;
    hypre_SStructGrid      *grid, *domain_grid;
-   HYPRE_Int               ilower, iupper, jlower, jupper;
+   HYPRE_BigInt            ilower, iupper, jlower, jupper;
    HYPRE_Int               matrix_type = hypre_SStructMatrixObjectType(matrix);
 
    /* S-matrix */
@@ -292,20 +295,24 @@ HYPRE_SStructMatrixInitialize( HYPRE_SStructMatrix matrix )
    domain_grid = hypre_SStructGraphDomainGrid(graph);
    comm =  hypre_SStructMatrixComm(matrix);
 
-   if(matrix_type == HYPRE_PARCSR)
+   if (matrix_type == HYPRE_PARCSR)
    {
-     ilower = hypre_SStructGridStartRank(grid);
-     iupper = ilower + hypre_SStructGridLocalSize(grid) - 1;
-     jlower = hypre_SStructGridStartRank(domain_grid);
-     jupper = jlower + hypre_SStructGridLocalSize(domain_grid) - 1;
+      ilower = hypre_SStructGridStartRank(grid);
+      iupper = ilower + hypre_SStructGridLocalSize(grid) - 1;
+      jlower = hypre_SStructGridStartRank(domain_grid);
+      jupper = jlower + hypre_SStructGridLocalSize(domain_grid) - 1;
    }
-
-   if(matrix_type == HYPRE_SSTRUCT || matrix_type == HYPRE_STRUCT)
+   else if (matrix_type == HYPRE_SSTRUCT || matrix_type == HYPRE_STRUCT)
+   {
+      ilower = hypre_SStructGridGhstartRank(grid);
+      iupper = ilower + hypre_SStructGridGhlocalSize(grid) - 1;
+      jlower = hypre_SStructGridGhstartRank(domain_grid);
+      jupper = jlower + hypre_SStructGridGhlocalSize(domain_grid) - 1;
+   }
+   else
    {
-     ilower = hypre_SStructGridGhstartRank(grid);
-     iupper = ilower + hypre_SStructGridGhlocalSize(grid) - 1;
-     jlower = hypre_SStructGridGhstartRank(domain_grid);
-     jupper = jlower + hypre_SStructGridGhlocalSize(domain_grid) - 1;
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Invalid matrix type!\n");
+      return hypre_error_flag;
    }
 
    HYPRE_IJMatrixCreate(comm, ilower, iupper, jlower, jupper,
@@ -316,6 +323,20 @@ HYPRE_SStructMatrixInitialize( HYPRE_SStructMatrix matrix )
    return hypre_error_flag;
 }
 
+HYPRE_Int
+HYPRE_SStructMatrixSetEarlyAssemble( HYPRE_SStructMatrix matrix,
+                                     HYPRE_Int           early_assemble )
+{
+   HYPRE_IJMatrix ijmatrix = hypre_SStructMatrixIJMatrix(matrix);
+
+   if (ijmatrix)
+   {
+      HYPRE_IJMatrixSetEarlyAssemble(ijmatrix, early_assemble);
+   }
+
+   return hypre_error_flag;
+}
+
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
 
@@ -355,7 +376,7 @@ HYPRE_SStructMatrixAddToValues( HYPRE_SStructMatrix  matrix,
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
 
-/* ONLY3D */
+/* ONLY3D - RDF: Why? */
 
 HYPRE_Int
 HYPRE_SStructMatrixAddFEMValues( HYPRE_SStructMatrix  matrix,
@@ -371,8 +392,9 @@ HYPRE_SStructMatrixAddFEMValues( HYPRE_SStructMatrix  matrix,
    HYPRE_Int          *fem_entries  = hypre_SStructGraphFEMPEntries(graph, part);
    HYPRE_Int          *fem_vars     = hypre_SStructGridFEMPVars(grid, part);
    hypre_Index        *fem_offsets  = hypre_SStructGridFEMPOffsets(grid, part);
-   HYPRE_Int           s, i, d, vindex[3];
+   HYPRE_Int           s, i, d, vindex[HYPRE_MAXDIM];
 
+   /* Set one coefficient at a time */
    for (s = 0; s < fem_nsparse; s++)
    {
       i = fem_sparse_i[s];
@@ -409,7 +431,7 @@ HYPRE_SStructMatrixGetValues( HYPRE_SStructMatrix  matrix,
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
 
-/* ONLY3D */
+/* ONLY3D - RDF: Why? */
 
 HYPRE_Int
 HYPRE_SStructMatrixGetFEMValues( HYPRE_SStructMatrix  matrix,
@@ -425,7 +447,7 @@ HYPRE_SStructMatrixGetFEMValues( HYPRE_SStructMatrix  matrix,
    HYPRE_Int          *fem_entries  = hypre_SStructGraphFEMPEntries(graph, part);
    HYPRE_Int          *fem_vars     = hypre_SStructGridFEMPVars(grid, part);
    hypre_Index        *fem_offsets  = hypre_SStructGridFEMPOffsets(grid, part);
-   HYPRE_Int           s, i, d, vindex[3];
+   HYPRE_Int           s, i, d, vindex[HYPRE_MAXDIM];
 
    for (s = 0; s < fem_nsparse; s++)
    {
@@ -616,6 +638,75 @@ HYPRE_SStructMatrixGetBoxValues2( HYPRE_SStructMatrix  matrix,
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_SStructMatrixAddFEMBoxValues(HYPRE_SStructMatrix  matrix,
+                                   HYPRE_Int            part,
+                                   HYPRE_Int           *ilower,
+                                   HYPRE_Int           *iupper,
+                                   HYPRE_Complex       *values)
+{
+   HYPRE_Int             ndim            = hypre_SStructMatrixNDim(matrix);
+   hypre_SStructGraph   *graph           = hypre_SStructMatrixGraph(matrix);
+   hypre_SStructGrid    *grid            = hypre_SStructGraphGrid(graph);
+   HYPRE_MemoryLocation  memory_location = hypre_SStructMatrixMemoryLocation(matrix);
+
+   HYPRE_Int             fem_nsparse     = hypre_SStructGraphFEMPNSparse(graph, part);
+   HYPRE_Int            *fem_sparse_i    = hypre_SStructGraphFEMPSparseI(graph, part);
+   HYPRE_Int            *fem_entries     = hypre_SStructGraphFEMPEntries(graph, part);
+   HYPRE_Int            *fem_vars        = hypre_SStructGridFEMPVars(grid, part);
+   hypre_Index          *fem_offsets     = hypre_SStructGridFEMPOffsets(grid, part);
+
+   HYPRE_Complex        *tvalues;
+   hypre_Box            *box;
+
+   HYPRE_Int             s, i, d, vilower[HYPRE_MAXDIM], viupper[HYPRE_MAXDIM];
+   HYPRE_Int             ei, vi, nelts;
+
+   /* Set one coefficient at a time */
+   box = hypre_BoxCreate(ndim);
+   hypre_BoxSetExtents(box, ilower, iupper);
+   nelts = hypre_BoxVolume(box);
+   tvalues = hypre_TAlloc(HYPRE_Complex, nelts, memory_location);
+
+   for (s = 0; s < fem_nsparse; s++)
+   {
+      i = fem_sparse_i[s];
+      for (d = 0; d < ndim; d++)
+      {
+         /* note: these offsets are different from what the user passes in */
+         vilower[d] = ilower[d] + hypre_IndexD(fem_offsets[i], d);
+         viupper[d] = iupper[d] + hypre_IndexD(fem_offsets[i], d);
+      }
+
+#if defined(HYPRE_USING_GPU)
+      if (hypre_GetExecPolicy1(memory_location) == HYPRE_EXEC_DEVICE)
+      {
+         hypreDevice_ComplexStridedCopy(nelts, fem_nsparse, values + s, tvalues);
+      }
+      else
+#endif
+      {
+         for (ei = 0, vi = s; ei < nelts; ei ++, vi += fem_nsparse)
+         {
+            tvalues[ei] = values[vi];
+         }
+      }
+
+      HYPRE_SStructMatrixAddToBoxValues(matrix, part, vilower, viupper,
+                                        fem_vars[i], 1, &fem_entries[s],
+                                        tvalues);
+   }
+
+   /* Free memory */
+   hypre_TFree(tvalues, memory_location);
+   hypre_BoxDestroy(box);
+
+   return hypre_error_flag;
+}
+
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
 
@@ -667,9 +758,9 @@ HYPRE_SStructMatrixAssemble( HYPRE_SStructMatrix matrix )
       recv_var  = hypre_SStructCommInfoRecvVar(vnbor_comm_info[ci]);
 
       send_matrix = hypre_SStructPMatrixSMatrix(
-         hypre_SStructMatrixPMatrix(matrix, send_part), send_var, send_var);
+                       hypre_SStructMatrixPMatrix(matrix, send_part), send_var, send_var);
       recv_matrix = hypre_SStructPMatrixSMatrix(
-         hypre_SStructMatrixPMatrix(matrix, recv_part), recv_var, recv_var);
+                       hypre_SStructMatrixPMatrix(matrix, recv_part), recv_var, recv_var);
 
       if ((send_matrix != NULL) && (recv_matrix != NULL))
       {
@@ -913,13 +1004,21 @@ HYPRE_SStructMatrixGetObject( HYPRE_SStructMatrix   matrix,
       var = 0;
       pmatrix = hypre_SStructMatrixPMatrix(matrix, part);
       smatrix = hypre_SStructPMatrixSMatrix(pmatrix, var, var);
-     *object = smatrix;
+      *object = smatrix;
    }
 
    return hypre_error_flag;
 }
 
 /*--------------------------------------------------------------------------
+ * HYPRE_SStructMatrixPrint
+ *
+ * This function prints a SStructMatrix to file. Assumptions:
+ *
+ *   1) All StructMatrices have the same number of ghost layers.
+ *   2) Range and domain num_ghosts are equal.
+ *
+ * TODO: Add GPU support
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
@@ -927,25 +1026,305 @@ HYPRE_SStructMatrixPrint( const char          *filename,
                           HYPRE_SStructMatrix  matrix,
                           HYPRE_Int            all )
 {
-   HYPRE_Int  nparts = hypre_SStructMatrixNParts(matrix);
-   HYPRE_Int  part;
-   char new_filename[255];
+   /* Matrix variables */
+   MPI_Comm                comm = hypre_SStructMatrixComm(matrix);
+   HYPRE_Int               nparts = hypre_SStructMatrixNParts(matrix);
+   hypre_SStructGraph     *graph = hypre_SStructMatrixGraph(matrix);
+   hypre_SStructGrid      *grid = hypre_SStructGraphGrid(graph);
+   hypre_SStructStencil ***stencils = hypre_SStructGraphStencils(graph);
+   hypre_SStructPMatrix   *pmatrix;
+   hypre_StructMatrix     *smatrix;
+   HYPRE_Int               data_size;
+
+   /* Local variables */
+   FILE                   *file;
+   HYPRE_Int               myid;
+   HYPRE_Int               part;
+   HYPRE_Int               var, vi, vj, nvars;
+   HYPRE_Int               num_symm_calls;
+   char                    new_filename[255];
+
+   /* Sanity check */
+   hypre_assert(nparts > 0);
+
+   /* Print auxiliary info */
+   hypre_MPI_Comm_rank(comm, &myid);
+   hypre_sprintf(new_filename, "%s.SMatrix.%05d", filename, myid);
+   if ((file = fopen(new_filename, "w")) == NULL)
+   {
+      hypre_printf("Error: can't open output file %s\n", new_filename);
+      hypre_error_in_arg(1);
 
+      return hypre_error_flag;
+   }
+
+   /* Print grid info */
+   hypre_fprintf(file, "SStructMatrix\n");
+   hypre_SStructGridPrint(file, grid);
+
+   /* Print stencil info */
    for (part = 0; part < nparts; part++)
    {
-      hypre_sprintf(new_filename, "%s.%02d", filename, part);
-      hypre_SStructPMatrixPrint(new_filename,
-                                hypre_SStructMatrixPMatrix(matrix, part),
-                                all);
+      pmatrix = hypre_SStructMatrixPMatrix(matrix, part);
+      nvars = hypre_SStructPMatrixNVars(pmatrix);
+
+      for (var = 0; var < nvars; var++)
+      {
+         hypre_fprintf(file, "\nStencil - (Part %d, Var %d):\n", part, var);
+         HYPRE_SStructStencilPrint(file, stencils[part][var]);
+      }
    }
+   hypre_fprintf(file, "\n");
 
-   /* U-matrix */
+   /* Print graph info */
+   HYPRE_SStructGraphPrint(file, graph);
+
+   /* Print symmetric info */
+   num_symm_calls = 0;
+   for (part = 0; part < nparts; part++)
+   {
+      pmatrix = hypre_SStructMatrixPMatrix(matrix, part);
+      nvars = hypre_SStructPMatrixNVars(pmatrix);
+
+      for (vi = 0; vi < nvars; vi++)
+      {
+         for (vj = 0; vj < nvars; vj++)
+         {
+            smatrix = hypre_SStructPMatrixSMatrix(pmatrix, vi, vj);
+            if (smatrix)
+            {
+               num_symm_calls++;
+            }
+         }
+      }
+   }
+   hypre_fprintf(file, "\nMatrixNumSetSymmetric: %d", num_symm_calls);
+   for (part = 0; part < nparts; part++)
+   {
+      pmatrix = hypre_SStructMatrixPMatrix(matrix, part);
+      nvars = hypre_SStructPMatrixNVars(pmatrix);
+
+      for (vi = 0; vi < nvars; vi++)
+      {
+         for (vj = 0; vj < nvars; vj++)
+         {
+            smatrix = hypre_SStructPMatrixSMatrix(pmatrix, vi, vj);
+            if (smatrix)
+            {
+               hypre_fprintf(file, "\nMatrixSetSymmetric: %d %d %d %d",
+                             part, vi, vj, hypre_StructMatrixSymmetric(smatrix));
+            }
+         }
+      }
+   }
+   hypre_fprintf(file, "\n");
+
+   /* Print data */
+   for (part = 0; part < nparts; part++)
+   {
+      pmatrix = hypre_SStructMatrixPMatrix(matrix, part);
+      nvars = hypre_SStructPMatrixNVars(pmatrix);
+
+      for (vi = 0; vi < nvars; vi++)
+      {
+         for (vj = 0; vj < nvars; vj++)
+         {
+            smatrix = hypre_SStructPMatrixSMatrix(pmatrix, vi, vj);
+            data_size = (smatrix) ? hypre_StructMatrixDataSize(smatrix) : 0;
+
+            hypre_fprintf(file, "\nData - (Part %d, Vi %d, Vj %d): %d\n",
+                          part, vi, vj, data_size);
+            if (smatrix)
+            {
+               hypre_StructMatrixPrintData(file, smatrix, all);
+            }
+         }
+      }
+   }
+   fclose(file);
+
+   /* Print unstructured matrix (U-Matrix) */
    hypre_sprintf(new_filename, "%s.UMatrix", filename);
    HYPRE_IJMatrixPrint(hypre_SStructMatrixIJMatrix(matrix), new_filename);
 
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ * HYPRE_SStructMatrixRead
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_SStructMatrixRead( MPI_Comm              comm,
+                         const char           *filename,
+                         HYPRE_SStructMatrix  *matrix_ptr )
+{
+   /* Matrix variables */
+   HYPRE_SStructMatrix     matrix;
+   hypre_SStructPMatrix   *pmatrix;
+   hypre_StructMatrix     *smatrix;
+   HYPRE_SStructGrid       grid;
+   hypre_SStructPGrid     *pgrid;
+   HYPRE_SStructGraph      graph;
+   HYPRE_SStructStencil  **stencils;
+   HYPRE_Int               nparts;
+   HYPRE_Int               nvars;
+   HYPRE_Int               data_size;
+   HYPRE_IJMatrix          umatrix;
+   HYPRE_IJMatrix          h_umatrix;
+   hypre_ParCSRMatrix     *h_parmatrix;
+   hypre_ParCSRMatrix     *parmatrix = NULL;
+
+   /* Local variables */
+   FILE                   *file;
+   HYPRE_Int               myid;
+   HYPRE_Int               part, var;
+   HYPRE_Int               p, v, i, j, vi, vj;
+   HYPRE_Int               symmetric;
+   HYPRE_Int               num_symm_calls;
+   char                    new_filename[255];
+
+   HYPRE_MemoryLocation memory_location = hypre_HandleMemoryLocation(hypre_handle());
+
+   hypre_MPI_Comm_rank(comm, &myid);
+
+   /*-----------------------------------------------------------
+    * Read S-Matrix
+    *-----------------------------------------------------------*/
+
+   hypre_sprintf(new_filename, "%s.SMatrix.%05d", filename, myid);
+   if ((file = fopen(new_filename, "r")) == NULL)
+   {
+      hypre_printf("Error: can't open input file %s\n", new_filename);
+      hypre_error_in_arg(2);
+
+      return hypre_error_flag;
+   }
+
+   /* Read grid info */
+   hypre_fscanf(file, "SStructMatrix\n");
+   hypre_SStructGridRead(comm, file, &grid);
+   nparts = hypre_SStructGridNParts(grid);
+
+   /* Read stencil info */
+   stencils = hypre_TAlloc(HYPRE_SStructStencil *, nparts, HYPRE_MEMORY_HOST);
+   for (p = 0; p < nparts; p++)
+   {
+      pgrid = hypre_SStructGridPGrid(grid, p);
+      nvars = hypre_SStructPGridNVars(pgrid);
+
+      stencils[p] = hypre_TAlloc(HYPRE_SStructStencil, nvars, HYPRE_MEMORY_HOST);
+      for (v = 0; v < nvars; v++)
+      {
+         hypre_fscanf(file, "\nStencil - (Part %d, Var %d):\n", &part, &var);
+         HYPRE_SStructStencilRead(file, &stencils[part][var]);
+      }
+   }
+   hypre_fscanf(file, "\n");
+
+   /* Read graph info */
+   HYPRE_SStructGraphRead(file, grid, stencils, &graph);
+
+   /* Free memory */
+   for (part = 0; part < nparts; part++)
+   {
+      pgrid = hypre_SStructGridPGrid(grid, part);
+      nvars = hypre_SStructPGridNVars(pgrid);
+
+      for (var = 0; var < nvars; var++)
+      {
+         HYPRE_SStructStencilDestroy(stencils[part][var]);
+      }
+      hypre_TFree(stencils[part], HYPRE_MEMORY_HOST);
+   }
+   hypre_TFree(stencils, HYPRE_MEMORY_HOST);
+
+   /* Assemble graph */
+   HYPRE_SStructGraphAssemble(graph);
+
+   /* Create matrix */
+   HYPRE_SStructMatrixCreate(comm, graph, &matrix);
+
+   /* Read symmetric info */
+   hypre_fscanf(file, "\nMatrixNumSetSymmetric: %d", &num_symm_calls);
+   for (i = 0; i < num_symm_calls; i++)
+   {
+      hypre_fscanf(file, "\nMatrixSetSymmetric: %d %d %d %d",
+                   &part, &vi, &vj, &symmetric);
+      HYPRE_SStructMatrixSetSymmetric(matrix, part, vi, vj, symmetric);
+   }
+   hypre_fscanf(file, "\n");
+
+   /* Initialize matrix */
+   HYPRE_SStructMatrixInitialize(matrix);
+
+   /* Read data */
+   for (p = 0; p < nparts; p++)
+   {
+      pmatrix = hypre_SStructMatrixPMatrix(matrix, p);
+      nvars = hypre_SStructPMatrixNVars(pmatrix);
+
+      for (i = 0; i < nvars; i++)
+      {
+         for (j = 0; j < nvars; j++)
+         {
+            hypre_fscanf(file, "\nData - (Part %d, Vi %d, Vj %d): %d\n",
+                         &part, &vi, &vj, &data_size);
+
+            pmatrix = hypre_SStructMatrixPMatrix(matrix, part);
+            smatrix = hypre_SStructPMatrixSMatrix(pmatrix, vi, vj);
+            if (data_size > 0)
+            {
+               hypre_StructMatrixReadData(file, smatrix);
+            }
+         }
+      }
+   }
+   fclose(file);
+
+   /*-----------------------------------------------------------
+    * Read U-Matrix
+    *-----------------------------------------------------------*/
+
+   /* Read unstructured matrix from file using host memory */
+   hypre_sprintf(new_filename, "%s.UMatrix", filename);
+   HYPRE_IJMatrixRead(new_filename, comm, HYPRE_PARCSR, &h_umatrix);
+   h_parmatrix = (hypre_ParCSRMatrix*) hypre_IJMatrixObject(h_umatrix);
+
+   /* Move ParCSRMatrix to device memory if necessary */
+   if (hypre_GetActualMemLocation(memory_location) != hypre_MEMORY_HOST)
+   {
+      parmatrix = hypre_ParCSRMatrixClone_v2(h_parmatrix, 1, memory_location);
+   }
+   else
+   {
+      parmatrix = h_parmatrix;
+      hypre_IJMatrixObject(h_umatrix) = NULL;
+   }
+
+   /* Free memory */
+   HYPRE_IJMatrixDestroy(h_umatrix);
+
+   /* Update the umatrix with contents read from file,
+      which now live on the correct memory location */
+   umatrix = hypre_SStructMatrixIJMatrix(matrix);
+   hypre_IJMatrixDestroyParCSR(umatrix);
+   hypre_IJMatrixObject(umatrix) = (void*) parmatrix;
+   hypre_SStructMatrixParCSRMatrix(matrix) = (hypre_ParCSRMatrix*) parmatrix;
+   hypre_IJMatrixAssembleFlag(umatrix) = 1;
+
+   /* Assemble SStructMatrix */
+   HYPRE_SStructMatrixAssemble(matrix);
+
+   /* Decrease ref counters */
+   HYPRE_SStructGraphDestroy(graph);
+   HYPRE_SStructGridDestroy(grid);
+
+   *matrix_ptr = matrix;
+
+   return hypre_error_flag;
+}
+
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
 
@@ -960,4 +1339,3 @@ HYPRE_SStructMatrixMatvec( HYPRE_Complex       alpha,
 
    return hypre_error_flag;
 }
-
diff --git a/external/hypre/src/sstruct_mv/HYPRE_sstruct_mv.h b/external/hypre/src/sstruct_mv/HYPRE_sstruct_mv.h
index a4ae419a..79222f81 100644
--- a/external/hypre/src/sstruct_mv/HYPRE_sstruct_mv.h
+++ b/external/hypre/src/sstruct_mv/HYPRE_sstruct_mv.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -23,10 +23,8 @@ extern "C" {
 /**
  * @defgroup SStructSystemInterface SStruct System Interface
  *
- * This interface represents a semi-structured-grid conceptual view of a linear
- * system.
- *
- * @memo A semi-structured-grid conceptual interface
+ * A semi-structured-grid conceptual interface. This interface represents a
+ * semi-structured-grid conceptual view of a linear system.
  *
  * @{
  **/
@@ -187,7 +185,7 @@ HYPRE_SStructGridSetFEMOrdering(HYPRE_SStructGrid  grid,
  * Indexes should increase from \e ilower to \e iupper.  It is not
  * necessary that indexes increase from \e nbor_ilower to \e
  * nbor_iupper.
- * 
+ *
  * The \e index_map describes the mapping of indexes 0, 1, and 2 on part
  * \e part to the corresponding indexes on part \e nbor_part.  For
  * example, triple (1, 2, 0) means that indexes 0, 1, and 2 on part \e part
@@ -249,7 +247,7 @@ HYPRE_SStructGridSetNeighborPart(HYPRE_SStructGrid  grid,
  * The \e shared_offset is used in the same way as \e offset, but with
  * respect to the box extents \e shared_ilower and \e shared_iupper on
  * part \e shared_part.
- * 
+ *
  * The \e index_map describes the mapping of indexes 0, 1, and 2 on part
  * \e part to the corresponding indexes on part \e shared_part.  For
  * example, triple (1, 2, 0) means that indexes 0, 1, and 2 on part \e part
@@ -467,7 +465,7 @@ HYPRE_SStructGraphAssemble(HYPRE_SStructGraph graph);
 /**
  * Set the storage type of the associated matrix object.  It is used before
  * AddEntries and Assemble to compute the right ranks in the graph.
- * 
+ *
  * NOTE: This routine is only necessary for implementation reasons, and will
  * eventually be removed.
  *
@@ -513,6 +511,17 @@ HYPRE_SStructMatrixDestroy(HYPRE_SStructMatrix matrix);
 HYPRE_Int
 HYPRE_SStructMatrixInitialize(HYPRE_SStructMatrix matrix);
 
+/**
+ * (Optional, GPU only) Sets if the matrix assemble routine does reductions
+ * of the IJ part before calling HYPRE_SStructMatrixAssemble.
+ * See also the comments of HYPRE_IJMatrixSetEarlyAssemble.
+ * This early assemble feature may save the peak memory usage but requires
+ * extra work.
+ **/
+HYPRE_Int
+HYPRE_SStructMatrixSetEarlyAssemble( HYPRE_SStructMatrix matrix,
+                                     HYPRE_Int           early_assemble );
+
 /**
  * Set matrix coefficients index by index.  The \e values array is of length
  * \e nentries.
@@ -562,9 +571,11 @@ HYPRE_SStructMatrixAddToValues(HYPRE_SStructMatrix  matrix,
 
 /**
  * Add finite element stiffness matrix coefficients index by index.  The layout
- * of the data in \e values is determined by the routines
- * \ref HYPRE_SStructGridSetFEMOrdering and
- * \ref HYPRE_SStructGraphSetFEMSparsity.
+ * of the data in \e values is determined by the routines \ref
+ * HYPRE_SStructGridSetFEMOrdering and \ref HYPRE_SStructGraphSetFEMSparsity.
+ *
+ * NOTE: For better efficiency, use \ref HYPRE_SStructMatrixAddFEMBoxValues to
+ * set coefficients a box at a time.
  **/
 HYPRE_Int
 HYPRE_SStructMatrixAddFEMValues(HYPRE_SStructMatrix  matrix,
@@ -696,6 +707,20 @@ HYPRE_SStructMatrixAddToBoxValues2(HYPRE_SStructMatrix  matrix,
                                    HYPRE_Int           *viupper,
                                    HYPRE_Complex       *values);
 
+/**
+ * Add finite element stiffness matrix coefficients a box at a time.  The data
+ * in \e values is organized as an array of element matrices ordered as in \ref
+ * HYPRE_SStructMatrixSetBoxValues.  The layout of the data entries of each
+ * element matrix is determined by the routines \ref
+ * HYPRE_SStructGridSetFEMOrdering and \ref HYPRE_SStructGraphSetFEMSparsity.
+ **/
+HYPRE_Int
+HYPRE_SStructMatrixAddFEMBoxValues(HYPRE_SStructMatrix  matrix,
+                                   HYPRE_Int            part,
+                                   HYPRE_Int           *ilower,
+                                   HYPRE_Int           *iupper,
+                                   HYPRE_Complex       *values);
+
 /**
  * Finalize the construction of the matrix before using.
  **/
@@ -737,6 +762,16 @@ HYPRE_SStructMatrixGetBoxValues2(HYPRE_SStructMatrix  matrix,
                                  HYPRE_Int           *viupper,
                                  HYPRE_Complex       *values);
 
+/**
+ * Does this even make sense to implement?
+ */
+HYPRE_Int
+HYPRE_SStructMatrixGetFEMBoxValues(HYPRE_SStructMatrix  matrix,
+                                   HYPRE_Int            part,
+                                   HYPRE_Int           *ilower,
+                                   HYPRE_Int           *iupper,
+                                   HYPRE_Complex       *values);
+
 /**
  * Define symmetry properties for the stencil entries in the matrix.  The
  * boolean argument \e symmetric is applied to stencil entries on part \e
@@ -745,7 +780,7 @@ HYPRE_SStructMatrixGetBoxValues2(HYPRE_SStructMatrix  matrix,
  * "all".  For example, if \e part and \e to_var are set to -1, then
  * the boolean is applied to stencil entries on all parts that couple variable
  * \e var to all other variables.
- * 
+ *
  * By default, matrices are assumed to be nonsymmetric.  Significant
  * storage savings can be made if the matrix is symmetric.
  **/
@@ -791,6 +826,14 @@ HYPRE_SStructMatrixPrint(const char          *filename,
                          HYPRE_SStructMatrix  matrix,
                          HYPRE_Int            all);
 
+/**
+ * Read the matrix from file.  This is mainly for debugging purposes.
+ **/
+HYPRE_Int
+HYPRE_SStructMatrixRead( MPI_Comm              comm,
+                         const char           *filename,
+                         HYPRE_SStructMatrix  *matrix_ptr );
+
 /**@}*/
 
 /*--------------------------------------------------------------------------
@@ -864,6 +907,9 @@ HYPRE_SStructVectorAddToValues(HYPRE_SStructVector  vector,
  * Add finite element vector coefficients index by index.  The layout of the
  * data in \e values is determined by the routine
  * \ref HYPRE_SStructGridSetFEMOrdering.
+ *
+ * NOTE: For better efficiency, use \ref HYPRE_SStructVectorAddFEMBoxValues to
+ * set coefficients a box at a time.
  **/
 HYPRE_Int
 HYPRE_SStructVectorAddFEMValues(HYPRE_SStructVector  vector,
@@ -974,6 +1020,20 @@ HYPRE_SStructVectorAddToBoxValues2(HYPRE_SStructVector  vector,
                                    HYPRE_Int           *viupper,
                                    HYPRE_Complex       *values);
 
+/**
+ * Add finite element vector coefficients a box at a time.  The data in \e
+ * values is organized as an array of element vectors ordered as in \ref
+ * HYPRE_SStructVectorSetBoxValues.  The layout of the data entries of each
+ * element vector is determined by the routine \ref
+ * HYPRE_SStructGridSetFEMOrdering.
+ **/
+HYPRE_Int
+HYPRE_SStructVectorAddFEMBoxValues(HYPRE_SStructVector  vector,
+                                   HYPRE_Int            part,
+                                   HYPRE_Int           *ilower,
+                                   HYPRE_Int           *iupper,
+                                   HYPRE_Complex       *values);
+
 /**
  * Finalize the construction of the vector before using.
  **/
@@ -1011,6 +1071,16 @@ HYPRE_SStructVectorGetBoxValues2(HYPRE_SStructVector  vector,
                                  HYPRE_Int           *viupper,
                                  HYPRE_Complex       *values);
 
+/**
+ * Does this even make sense to implement?
+ */
+HYPRE_Int
+HYPRE_SStructVectorGetFEMBoxValues(HYPRE_SStructVector  vector,
+                                   HYPRE_Int            part,
+                                   HYPRE_Int           *ilower,
+                                   HYPRE_Int           *iupper,
+                                   HYPRE_Complex       *values);
+
 /**
  * Gather vector data so that efficient \c GetValues can be done.  This
  * routine must be called prior to calling \c GetValues to ensure that
@@ -1048,6 +1118,14 @@ HYPRE_SStructVectorPrint(const char          *filename,
                          HYPRE_SStructVector  vector,
                          HYPRE_Int            all);
 
+/**
+ * Read the vector from file.  This is mainly for debugging purposes.
+ **/
+HYPRE_Int
+HYPRE_SStructVectorRead( MPI_Comm             comm,
+                         const char          *filename,
+                         HYPRE_SStructVector *vector_ptr );
+
 /**@}*/
 /**@}*/
 
@@ -1059,4 +1137,3 @@ HYPRE_SStructVectorPrint(const char          *filename,
 #endif
 
 #endif
-
diff --git a/external/hypre/src/sstruct_mv/HYPRE_sstruct_stencil.c b/external/hypre/src/sstruct_mv/HYPRE_sstruct_stencil.c
index ea7c0c27..54155865 100644
--- a/external/hypre/src/sstruct_mv/HYPRE_sstruct_stencil.c
+++ b/external/hypre/src/sstruct_mv/HYPRE_sstruct_stencil.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -75,4 +75,56 @@ HYPRE_SStructStencilSetEntry( HYPRE_SStructStencil  stencil,
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_SStructStencilPrint( FILE *file, HYPRE_SStructStencil stencil )
+{
+   HYPRE_Int    ndim  = hypre_SStructStencilNDim(stencil);
+   HYPRE_Int   *vars  = hypre_SStructStencilVars(stencil);
+   hypre_Index *shape = hypre_SStructStencilShape(stencil);
+   HYPRE_Int    size  = hypre_SStructStencilSize(stencil);
+
+   HYPRE_Int    i;
+
+   hypre_fprintf(file, "StencilCreate: %d %d", ndim, size);
+   for (i = 0; i < size; i++)
+   {
+      hypre_fprintf(file, "\nStencilSetEntry: %d %d ", i, vars[i]);
+      hypre_IndexPrint(file, ndim, shape[i]);
+   }
+   hypre_fprintf(file, "\n");
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_SStructStencilRead( FILE *file, HYPRE_SStructStencil *stencil_ptr )
+{
+   HYPRE_SStructStencil    stencil;
+
+   HYPRE_Int               var;
+   hypre_Index             shape;
+   HYPRE_Int               i, ndim;
+   HYPRE_Int               entry, size;
+
+   hypre_fscanf(file, "StencilCreate: %d %d", &ndim, &size);
+   HYPRE_SStructStencilCreate(ndim, size, &stencil);
+
+   for (i = 0; i < size; i++)
+   {
+      hypre_fscanf(file, "\nStencilSetEntry: %d %d ", &entry, &var);
+      hypre_IndexRead(file, ndim, shape);
+
+      HYPRE_SStructStencilSetEntry(stencil, entry, shape, var);
+   }
+   hypre_fscanf(file, "\n");
 
+   *stencil_ptr = stencil;
+
+   return hypre_error_flag;
+}
diff --git a/external/hypre/src/sstruct_mv/HYPRE_sstruct_vector.c b/external/hypre/src/sstruct_mv/HYPRE_sstruct_vector.c
index 46c27eb9..50026a39 100644
--- a/external/hypre/src/sstruct_mv/HYPRE_sstruct_vector.c
+++ b/external/hypre/src/sstruct_mv/HYPRE_sstruct_vector.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -28,7 +28,7 @@ HYPRE_SStructVectorCreate( MPI_Comm              comm,
    hypre_SStructPGrid    *pgrid;
    HYPRE_Int              part;
 
-   vector = hypre_TAlloc(hypre_SStructVector,  1, HYPRE_MEMORY_HOST);
+   vector = hypre_TAlloc(hypre_SStructVector, 1, HYPRE_MEMORY_HOST);
 
    hypre_SStructVectorComm(vector) = comm;
    hypre_SStructVectorNDim(vector) = hypre_SStructGridNDim(grid);
@@ -36,7 +36,7 @@ HYPRE_SStructVectorCreate( MPI_Comm              comm,
    hypre_SStructVectorObjectType(vector) = HYPRE_SSTRUCT;
    nparts = hypre_SStructGridNParts(grid);
    hypre_SStructVectorNParts(vector) = nparts;
-   pvectors = hypre_TAlloc(hypre_SStructPVector *,  nparts, HYPRE_MEMORY_HOST);
+   pvectors = hypre_TAlloc(hypre_SStructPVector *, nparts, HYPRE_MEMORY_HOST);
    for (part = 0; part < nparts; part++)
    {
       pgrid = hypre_SStructGridPGrid(grid, part);
@@ -79,11 +79,13 @@ HYPRE_SStructVectorDestroy( HYPRE_SStructVector vector )
    hypre_SStructPVector **pvectors;
    HYPRE_Int              part;
    HYPRE_Int              vector_type;
+   HYPRE_MemoryLocation   memory_location;
 
    /* GEC1002 destroying data indices and data in vector  */
-
    if (vector)
    {
+      memory_location = hypre_SStructVectorMemoryLocation(vector);
+
       vector_type = hypre_SStructVectorObjectType(vector);
       hypre_SStructVectorRefCount(vector) --;
       if (hypre_SStructVectorRefCount(vector) == 0)
@@ -99,16 +101,16 @@ HYPRE_SStructVectorDestroy( HYPRE_SStructVector vector )
          HYPRE_IJVectorDestroy(hypre_SStructVectorIJVector(vector));
 
          /* GEC1002 the ijdestroy takes care of the data when the
-          *  vector is type HYPRE_SSTRUCT. This is a result that the
+          * vector is type HYPRE_SSTRUCT. This is a result that the
           * ijvector does not use the owndata flag in the data structure
-          * unlike the structvector                               */
+          * unlike the struct vector                               */
 
          /* GEC if data has been allocated then free the pointer */
          hypre_TFree(hypre_SStructVectorDataIndices(vector), HYPRE_MEMORY_HOST);
 
          if (hypre_SStructVectorData(vector) && (vector_type == HYPRE_PARCSR))
          {
-            hypre_TFree(hypre_SStructVectorData(vector), HYPRE_MEMORY_DEVICE);
+            hypre_TFree(hypre_SStructVectorData(vector), memory_location);
          }
 
          hypre_TFree(vector, HYPRE_MEMORY_HOST);
@@ -131,7 +133,7 @@ HYPRE_SStructVectorInitialize( HYPRE_SStructVector vector )
    HYPRE_Int               datasize;
    HYPRE_Int               nvars ;
    HYPRE_Int               nparts = hypre_SStructVectorNParts(vector) ;
-   HYPRE_Int               var,part  ;
+   HYPRE_Int               var, part  ;
    HYPRE_Complex          *data ;
    HYPRE_Complex          *pdata ;
    HYPRE_Complex          *sdata  ;
@@ -145,9 +147,10 @@ HYPRE_SStructVectorInitialize( HYPRE_SStructVector vector )
    HYPRE_IJVector          ijvector;
    hypre_SStructPGrid     *pgrid;
    HYPRE_SStructVariable  *vartypes;
+   HYPRE_MemoryLocation    memory_location = hypre_HandleMemoryLocation(hypre_handle());
 
    /* GEC0902 addition of variables for ilower and iupper   */
-   HYPRE_Int               ilower, iupper;
+   HYPRE_BigInt            ilower, iupper;
    hypre_ParVector        *par_vector;
    hypre_Vector           *parlocal_vector;
 
@@ -158,15 +161,15 @@ HYPRE_SStructVectorInitialize( HYPRE_SStructVector vector )
 
    datasize = hypre_SStructVectorDataSize(vector);
 
-   data = hypre_CTAlloc(HYPRE_Complex, datasize, HYPRE_MEMORY_DEVICE);
+   data = hypre_CTAlloc(HYPRE_Complex, datasize, memory_location);
 
    dataindices = hypre_SStructVectorDataIndices(vector);
 
-   hypre_SStructVectorData(vector)  = data;
+   hypre_SStructVectorData(vector) = data;
 
    for (part = 0; part < nparts; part++)
    {
-      pvector = hypre_SStructVectorPVector(vector,part);
+      pvector = hypre_SStructVectorPVector(vector, part);
       pdataindices = hypre_SStructPVectorDataIndices(pvector);
       /* shift-num   = dataindices[part]; */
       pdata = data + dataindices[part];
@@ -196,17 +199,21 @@ HYPRE_SStructVectorInitialize( HYPRE_SStructVector vector )
    /* GEC1002 this is now the creation of the ijmatrix and the initialization
     * by checking the type of the vector */
 
-   if(vector_type == HYPRE_PARCSR )
+   if (vector_type == HYPRE_PARCSR )
    {
       ilower = hypre_SStructGridStartRank(grid);
       iupper = ilower + hypre_SStructGridLocalSize(grid) - 1;
    }
-
-   if(vector_type == HYPRE_SSTRUCT || vector_type == HYPRE_STRUCT)
+   else if (vector_type == HYPRE_SSTRUCT || vector_type == HYPRE_STRUCT)
    {
       ilower = hypre_SStructGridGhstartRank(grid);
       iupper = ilower + hypre_SStructGridGhlocalSize(grid) - 1;
    }
+   else
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Invalid vector type!\n");
+      return hypre_error_flag;
+   }
 
    HYPRE_IJVectorCreate(comm, ilower, iupper,
                         &hypre_SStructVectorIJVector(vector));
@@ -220,9 +227,8 @@ HYPRE_SStructVectorInitialize( HYPRE_SStructVector vector )
    ijvector = hypre_SStructVectorIJVector(vector);
 
    HYPRE_IJVectorSetObjectType(ijvector, HYPRE_PARCSR);
-
    HYPRE_IJVectorInitialize(ijvector);
-
+   HYPRE_IJVectorGetObject(ijvector, (void **) &hypre_SStructVectorParVector(vector));
 
    /* GEC1002 for HYPRE_SSTRUCT type of vector, we do not need data allocated
     * inside the parvector piece of the structure. We make that pointer within
@@ -235,9 +241,9 @@ HYPRE_SStructVectorInitialize( HYPRE_SStructVector vector )
 
    if (vector_type == HYPRE_SSTRUCT || vector_type == HYPRE_STRUCT)
    {
-      par_vector = (hypre_ParVector        *)hypre_IJVectorObject(ijvector);
+      par_vector = (hypre_ParVector *) hypre_IJVectorObject(ijvector);
       parlocal_vector = hypre_ParVectorLocalVector(par_vector);
-      hypre_TFree(hypre_VectorData(parlocal_vector), HYPRE_MEMORY_DEVICE);
+      hypre_TFree(hypre_VectorData(parlocal_vector), hypre_VectorMemoryLocation(parlocal_vector));
       hypre_VectorData(parlocal_vector) = data ;
    }
 
@@ -303,7 +309,7 @@ HYPRE_SStructVectorAddToValues( HYPRE_SStructVector  vector,
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
 
-/* ONLY3D */
+/* ONLY3D - RDF: Why? */
 
 HYPRE_Int
 HYPRE_SStructVectorAddFEMValues( HYPRE_SStructVector  vector,
@@ -316,8 +322,9 @@ HYPRE_SStructVectorAddFEMValues( HYPRE_SStructVector  vector,
    HYPRE_Int           fem_nvars    = hypre_SStructGridFEMPNVars(grid, part);
    HYPRE_Int          *fem_vars     = hypre_SStructGridFEMPVars(grid, part);
    hypre_Index        *fem_offsets  = hypre_SStructGridFEMPOffsets(grid, part);
-   HYPRE_Int           i, d, vindex[3];
+   HYPRE_Int           i, d, vindex[HYPRE_MAXDIM];
 
+   /* Set one variable at a time */
    for (i = 0; i < fem_nvars; i++)
    {
       for (d = 0; d < ndim; d++)
@@ -363,7 +370,7 @@ HYPRE_SStructVectorGetValues( HYPRE_SStructVector  vector,
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
 
-/* ONLY3D */
+/* ONLY3D - RDF: Why? */
 
 HYPRE_Int
 HYPRE_SStructVectorGetFEMValues( HYPRE_SStructVector  vector,
@@ -377,7 +384,7 @@ HYPRE_SStructVectorGetFEMValues( HYPRE_SStructVector  vector,
    HYPRE_Int             fem_nvars    = hypre_SStructGridFEMPNVars(grid, part);
    HYPRE_Int            *fem_vars     = hypre_SStructGridFEMPVars(grid, part);
    hypre_Index          *fem_offsets  = hypre_SStructGridFEMPOffsets(grid, part);
-   HYPRE_Int             i, d, vindex[3];
+   HYPRE_Int             i, d, vindex[HYPRE_MAXDIM];
 
    hypre_SetIndex(vindex, 0);
    for (i = 0; i < fem_nvars; i++)
@@ -555,6 +562,70 @@ HYPRE_SStructVectorGetBoxValues2(HYPRE_SStructVector  vector,
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_SStructVectorAddFEMBoxValues(HYPRE_SStructVector  vector,
+                                   HYPRE_Int            part,
+                                   HYPRE_Int           *ilower,
+                                   HYPRE_Int           *iupper,
+                                   HYPRE_Complex       *values)
+{
+   HYPRE_Int             ndim            = hypre_SStructVectorNDim(vector);
+   hypre_SStructGrid    *grid            = hypre_SStructVectorGrid(vector);
+   HYPRE_MemoryLocation  memory_location = hypre_SStructVectorMemoryLocation(vector);
+
+   HYPRE_Int             fem_nvars       = hypre_SStructGridFEMPNVars(grid, part);
+   HYPRE_Int            *fem_vars        = hypre_SStructGridFEMPVars(grid, part);
+   hypre_Index          *fem_offsets     = hypre_SStructGridFEMPOffsets(grid, part);
+
+   HYPRE_Complex        *tvalues;
+   hypre_Box            *box;
+
+   HYPRE_Int             i, d, vilower[HYPRE_MAXDIM], viupper[HYPRE_MAXDIM];
+   HYPRE_Int             ei, vi, nelts;
+
+   /* Set one variable at a time */
+   box = hypre_BoxCreate(ndim);
+   hypre_BoxSetExtents(box, ilower, iupper);
+   nelts = hypre_BoxVolume(box);
+   tvalues = hypre_TAlloc(HYPRE_Complex, nelts, memory_location);
+
+   for (i = 0; i < fem_nvars; i++)
+   {
+      for (d = 0; d < ndim; d++)
+      {
+         /* note: these offsets are different from what the user passes in */
+         vilower[d] = ilower[d] + hypre_IndexD(fem_offsets[i], d);
+         viupper[d] = iupper[d] + hypre_IndexD(fem_offsets[i], d);
+      }
+
+#if defined(HYPRE_USING_GPU)
+      if (hypre_GetExecPolicy1(memory_location) == HYPRE_EXEC_DEVICE)
+      {
+         hypreDevice_ComplexStridedCopy(nelts, fem_nvars, values + i, tvalues);
+      }
+      else
+#endif
+      {
+         for (ei = 0, vi = i; ei < nelts; ei ++, vi += fem_nvars)
+         {
+            tvalues[ei] = values[vi];
+         }
+      }
+
+      HYPRE_SStructVectorAddToBoxValues(vector, part, vilower, viupper,
+                                        fem_vars[i], tvalues);
+   }
+
+   /* Free memory */
+   hypre_TFree(tvalues, memory_location);
+   hypre_BoxDestroy(box);
+
+   return hypre_error_flag;
+}
+
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
 
@@ -598,9 +669,9 @@ HYPRE_SStructVectorAssemble( HYPRE_SStructVector vector )
       recv_var  = hypre_SStructCommInfoRecvVar(vnbor_comm_info[ci]);
 
       send_vector = hypre_SStructPVectorSVector(
-         hypre_SStructVectorPVector(vector, send_part), send_var);
+                       hypre_SStructVectorPVector(vector, send_part), send_var);
       recv_vector = hypre_SStructPVectorSVector(
-         hypre_SStructVectorPVector(vector, recv_part), recv_var);
+                       hypre_SStructVectorPVector(vector, recv_part), recv_var);
 
       /* want to communicate and add ghost data to real data */
       hypre_CommPkgCreate(comm_info,
@@ -629,9 +700,6 @@ HYPRE_SStructVectorAssemble( HYPRE_SStructVector vector )
    /* u-vector */
    HYPRE_IJVectorAssemble(ijvector);
 
-   HYPRE_IJVectorGetObject(ijvector,
-                           (void **) &hypre_SStructVectorParVector(vector));
-
    /*------------------------------------------------------
     *------------------------------------------------------*/
 
@@ -693,9 +761,9 @@ HYPRE_SStructVectorGather( HYPRE_SStructVector vector )
       recv_var  = hypre_SStructCommInfoRecvVar(vnbor_comm_info[ci]);
 
       send_vector = hypre_SStructPVectorSVector(
-         hypre_SStructVectorPVector(vector, send_part), send_var);
+                       hypre_SStructVectorPVector(vector, send_part), send_var);
       recv_vector = hypre_SStructPVectorSVector(
-         hypre_SStructVectorPVector(vector, recv_part), recv_var);
+                       hypre_SStructVectorPVector(vector, recv_part), recv_var);
 
       /* want to communicate real data to ghost data */
       hypre_CommPkgCreate(comm_info,
@@ -784,6 +852,10 @@ HYPRE_SStructVectorGetObject( HYPRE_SStructVector   vector,
 }
 
 /*--------------------------------------------------------------------------
+ * HYPRE_SStructVectorPrint
+ *
+ * This function prints a SStructVector to file. For the assumptions used
+ * here, see HYPRE_SStructMatrixPrint.
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
@@ -791,18 +863,121 @@ HYPRE_SStructVectorPrint( const char          *filename,
                           HYPRE_SStructVector  vector,
                           HYPRE_Int            all )
 {
-   HYPRE_Int  nparts = hypre_SStructVectorNParts(vector);
-   HYPRE_Int  part;
-   char new_filename[255];
+   /* Vector variables */
+   MPI_Comm              comm = hypre_SStructVectorComm(vector);
+   HYPRE_Int             nparts = hypre_SStructVectorNParts(vector);
+   hypre_SStructGrid    *grid = hypre_SStructVectorGrid(vector);
+
+   /* Local variables */
+   hypre_SStructPVector *pvector;
+   hypre_StructVector   *svector;
+
+   FILE                 *file;
+   HYPRE_Int             myid;
+   HYPRE_Int             part, var, nvars;
+   char                  new_filename[255];
+
+   /* Print auxiliary data */
+   hypre_MPI_Comm_rank(comm, &myid);
+   hypre_sprintf(new_filename, "%s.%05d", filename, myid);
+   if ((file = fopen(new_filename, "w")) == NULL)
+   {
+      hypre_printf("Error: can't open output file %s\n", new_filename);
+      hypre_error_in_arg(1);
+
+      return hypre_error_flag;
+   }
+
+   hypre_fprintf(file, "SStructVector\n");
+   hypre_SStructGridPrint(file, grid);
 
+   /* Print (part, var) vectors */
    for (part = 0; part < nparts; part++)
    {
-      hypre_sprintf(new_filename, "%s.%02d", filename, part);
-      hypre_SStructPVectorPrint(new_filename,
-                                hypre_SStructVectorPVector(vector, part),
-                                all);
+      pvector = hypre_SStructVectorPVector(vector, part);
+      nvars = hypre_SStructPVectorNVars(pvector);
+      for (var = 0; var < nvars; var++)
+      {
+         svector = hypre_SStructPVectorSVector(pvector, var);
+
+         hypre_fprintf(file, "\nData - (Part %d, Var %d):\n", part, var);
+         hypre_StructVectorPrintData(file, svector, all);
+      }
    }
 
+   fclose(file);
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_SStructVectorRead
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_SStructVectorRead( MPI_Comm             comm,
+                         const char          *filename,
+                         HYPRE_SStructVector *vector_ptr )
+{
+   /* Vector variables */
+   HYPRE_SStructVector    vector;
+   hypre_SStructPVector  *pvector;
+   hypre_StructVector    *svector;
+   hypre_SStructGrid     *grid;
+   HYPRE_Int              nparts;
+   HYPRE_Int              nvars;
+
+   /* Local variables */
+   FILE                  *file;
+   char                   new_filename[255];
+   HYPRE_Int              p, v, part, var;
+   HYPRE_Int              myid;
+
+   /* Read auxiliary data */
+   hypre_MPI_Comm_rank(comm, &myid);
+   hypre_sprintf(new_filename, "%s.%05d", filename, myid);
+   if ((file = fopen(new_filename, "r")) == NULL)
+   {
+      hypre_printf("Error: can't open input file %s\n", new_filename);
+      hypre_error_in_arg(2);
+
+      return hypre_error_flag;
+   }
+
+   hypre_fscanf(file, "SStructVector\n");
+   hypre_SStructGridRead(comm, file, &grid);
+
+   /* Create and initialize vector */
+   HYPRE_SStructVectorCreate(comm, grid, &vector);
+   HYPRE_SStructVectorInitialize(vector);
+
+   /* Read values from file */
+   nparts = hypre_SStructVectorNParts(vector);
+   for (p = 0; p < nparts; p++)
+   {
+      pvector = hypre_SStructVectorPVector(vector, p);
+      nvars = hypre_SStructPVectorNVars(pvector);
+
+      for (v = 0; v < nvars; v++)
+      {
+         hypre_fscanf(file, "\nData - (Part %d, Var %d):\n", &part, &var);
+
+         pvector = hypre_SStructVectorPVector(vector, part);
+         svector = hypre_SStructPVectorSVector(pvector, var);
+
+         hypre_StructVectorReadData(file, svector);
+      }
+   }
+   fclose(file);
+
+   /* Assemble vector */
+   HYPRE_SStructVectorAssemble(vector);
+
+   /* Decrease ref counters */
+   HYPRE_SStructGridDestroy(grid);
+
+   *vector_ptr = vector;
+
    return hypre_error_flag;
 }
 
diff --git a/external/hypre/src/sstruct_mv/_hypre_sstruct_mv.h b/external/hypre/src/sstruct_mv/_hypre_sstruct_mv.h
index 1eaa62b3..fbe5dc8e 100644
--- a/external/hypre/src/sstruct_mv/_hypre_sstruct_mv.h
+++ b/external/hypre/src/sstruct_mv/_hypre_sstruct_mv.h
@@ -19,7 +19,7 @@ extern "C" {
 #endif
 
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -78,7 +78,7 @@ typedef struct
 
    hypre_Index             periodic;         /* Indicates if pgrid is periodic */
 
-  /* GEC0902 additions for ghost expansion of boxes */
+   /* GEC0902 additions for ghost expansion of boxes */
 
    HYPRE_Int               ghlocal_size;     /* Number of vars including ghosts */
 
@@ -175,11 +175,11 @@ typedef struct hypre_SStructGrid_struct
 
    HYPRE_Int                  ref_count;
 
- /* GEC0902 additions for ghost expansion of boxes */
+   /* GEC0902 additions for ghost expansion of boxes */
 
    HYPRE_Int               ghlocal_size;  /* GEC0902 Number of vars including ghosts */
    HYPRE_BigInt            ghstart_rank;  /* GEC0902 start rank including ghosts  */
-   HYPRE_Int               num_ghost[2*HYPRE_MAXDIM]; /* ghost layer size */
+   HYPRE_Int               num_ghost[2 * HYPRE_MAXDIM]; /* ghost layer size */
 
 } hypre_SStructGrid;
 
@@ -314,7 +314,7 @@ typedef struct hypre_SStructGrid_struct
 #endif
 
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -362,7 +362,7 @@ hypre_StructStencilElement( hypre_SStructStencilSStencil(stencil), i )
 
 #endif
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -533,7 +533,7 @@ typedef struct hypre_SStructGraph_struct
 
 #endif
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -610,7 +610,7 @@ typedef struct hypre_SStructMatrix_struct
 
    HYPRE_Int               ref_count;
 
-  /* GEC0902   adding an object type to the matrix  */
+   /* GEC0902   adding an object type to the matrix  */
    HYPRE_Int               object_type;
 
 } hypre_SStructMatrix;
@@ -672,7 +672,7 @@ hypre_SStructPGridNDim(hypre_SStructPMatrixPGrid(pmat))
 
 #endif
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -729,15 +729,13 @@ typedef struct hypre_SStructVector_struct
    /* inter-part communication info */
    HYPRE_Int               nbor_ncomms;  /* num comm_pkgs with neighbor parts */
 
-  /* GEC10020902 pointer to big chunk of memory and auxiliary information   */
-
-   HYPRE_Complex           *data;        /* GEC1002 pointer to chunk data  */
-   HYPRE_Int               *dataindices; /* GEC1002 dataindices[partx] is the starting index
-                                          of vector data for the part=partx    */
-   HYPRE_Int               datasize    ;  /* GEC1002 size of all data = ghlocalsize */
+   /* GEC10020902 pointer to big chunk of memory and auxiliary information */
+   HYPRE_Complex          *data;        /* GEC1002 pointer to chunk data */
+   HYPRE_Int              *dataindices; /* GEC1002 dataindices[partx] is the starting index
+                                           of vector data for the part=partx */
+   HYPRE_Int               datasize;    /* GEC1002 size of all data = ghlocalsize */
 
    HYPRE_Int               global_size;  /* Total number coefficients */
-
    HYPRE_Int               ref_count;
 
 } hypre_SStructVector;
@@ -781,203 +779,330 @@ typedef struct hypre_SStructVector_struct
 
 #endif
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
  ******************************************************************************/
 
 /* HYPRE_sstruct_graph.c */
-HYPRE_Int HYPRE_SStructGraphCreate ( MPI_Comm comm , HYPRE_SStructGrid grid , HYPRE_SStructGraph *graph_ptr );
+HYPRE_Int HYPRE_SStructGraphCreate ( MPI_Comm comm, HYPRE_SStructGrid grid,
+                                     HYPRE_SStructGraph *graph_ptr );
 HYPRE_Int HYPRE_SStructGraphDestroy ( HYPRE_SStructGraph graph );
-HYPRE_Int HYPRE_SStructGraphSetDomainGrid ( HYPRE_SStructGraph graph , HYPRE_SStructGrid domain_grid );
-HYPRE_Int HYPRE_SStructGraphSetStencil ( HYPRE_SStructGraph graph , HYPRE_Int part , HYPRE_Int var , HYPRE_SStructStencil stencil );
-HYPRE_Int HYPRE_SStructGraphSetFEM ( HYPRE_SStructGraph graph , HYPRE_Int part );
-HYPRE_Int HYPRE_SStructGraphSetFEMSparsity ( HYPRE_SStructGraph graph , HYPRE_Int part , HYPRE_Int nsparse , HYPRE_Int *sparsity );
-HYPRE_Int HYPRE_SStructGraphAddEntries ( HYPRE_SStructGraph graph , HYPRE_Int part , HYPRE_Int *index , HYPRE_Int var , HYPRE_Int to_part , HYPRE_Int *to_index , HYPRE_Int to_var );
+HYPRE_Int HYPRE_SStructGraphSetDomainGrid ( HYPRE_SStructGraph graph,
+                                            HYPRE_SStructGrid domain_grid );
+HYPRE_Int HYPRE_SStructGraphSetStencil ( HYPRE_SStructGraph graph, HYPRE_Int part, HYPRE_Int var,
+                                         HYPRE_SStructStencil stencil );
+HYPRE_Int HYPRE_SStructGraphSetFEM ( HYPRE_SStructGraph graph, HYPRE_Int part );
+HYPRE_Int HYPRE_SStructGraphSetFEMSparsity ( HYPRE_SStructGraph graph, HYPRE_Int part,
+                                             HYPRE_Int nsparse, HYPRE_Int *sparsity );
+HYPRE_Int HYPRE_SStructGraphAddEntries ( HYPRE_SStructGraph graph, HYPRE_Int part, HYPRE_Int *index,
+                                         HYPRE_Int var, HYPRE_Int to_part, HYPRE_Int *to_index, HYPRE_Int to_var );
 HYPRE_Int HYPRE_SStructGraphAssemble ( HYPRE_SStructGraph graph );
-HYPRE_Int HYPRE_SStructGraphSetObjectType ( HYPRE_SStructGraph graph , HYPRE_Int type );
+HYPRE_Int HYPRE_SStructGraphSetObjectType ( HYPRE_SStructGraph graph, HYPRE_Int type );
+HYPRE_Int HYPRE_SStructGraphPrint ( FILE *file, HYPRE_SStructGraph graph );
+HYPRE_Int HYPRE_SStructGraphRead ( FILE *file, HYPRE_SStructGrid grid,
+                                   HYPRE_SStructStencil **stencils, HYPRE_SStructGraph *graph_ptr );
 
 /* HYPRE_sstruct_grid.c */
-HYPRE_Int HYPRE_SStructGridCreate ( MPI_Comm comm , HYPRE_Int ndim , HYPRE_Int nparts , HYPRE_SStructGrid *grid_ptr );
+HYPRE_Int HYPRE_SStructGridCreate ( MPI_Comm comm, HYPRE_Int ndim, HYPRE_Int nparts,
+                                    HYPRE_SStructGrid *grid_ptr );
 HYPRE_Int HYPRE_SStructGridDestroy ( HYPRE_SStructGrid grid );
-HYPRE_Int HYPRE_SStructGridSetExtents ( HYPRE_SStructGrid grid , HYPRE_Int part , HYPRE_Int *ilower , HYPRE_Int *iupper );
-HYPRE_Int HYPRE_SStructGridSetVariables ( HYPRE_SStructGrid grid , HYPRE_Int part , HYPRE_Int nvars , HYPRE_SStructVariable *vartypes );
-HYPRE_Int HYPRE_SStructGridAddVariables ( HYPRE_SStructGrid grid , HYPRE_Int part , HYPRE_Int *index , HYPRE_Int nvars , HYPRE_SStructVariable *vartypes );
-HYPRE_Int HYPRE_SStructGridSetFEMOrdering ( HYPRE_SStructGrid grid , HYPRE_Int part , HYPRE_Int *ordering );
-HYPRE_Int HYPRE_SStructGridSetNeighborPart ( HYPRE_SStructGrid grid , HYPRE_Int part , HYPRE_Int *ilower , HYPRE_Int *iupper , HYPRE_Int nbor_part , HYPRE_Int *nbor_ilower , HYPRE_Int *nbor_iupper , HYPRE_Int *index_map , HYPRE_Int *index_dir );
-HYPRE_Int HYPRE_SStructGridSetSharedPart ( HYPRE_SStructGrid grid , HYPRE_Int part , HYPRE_Int *ilower , HYPRE_Int *iupper , HYPRE_Int *offset , HYPRE_Int shared_part , HYPRE_Int *shared_ilower , HYPRE_Int *shared_iupper , HYPRE_Int *shared_offset , HYPRE_Int *index_map , HYPRE_Int *index_dir );
-HYPRE_Int HYPRE_SStructGridAddUnstructuredPart ( HYPRE_SStructGrid grid , HYPRE_Int ilower , HYPRE_Int iupper );
+HYPRE_Int HYPRE_SStructGridSetExtents ( HYPRE_SStructGrid grid, HYPRE_Int part, HYPRE_Int *ilower,
+                                        HYPRE_Int *iupper );
+HYPRE_Int HYPRE_SStructGridSetVariables ( HYPRE_SStructGrid grid, HYPRE_Int part, HYPRE_Int nvars,
+                                          HYPRE_SStructVariable *vartypes );
+HYPRE_Int HYPRE_SStructGridAddVariables ( HYPRE_SStructGrid grid, HYPRE_Int part, HYPRE_Int *index,
+                                          HYPRE_Int nvars, HYPRE_SStructVariable *vartypes );
+HYPRE_Int HYPRE_SStructGridSetFEMOrdering ( HYPRE_SStructGrid grid, HYPRE_Int part,
+                                            HYPRE_Int *ordering );
+HYPRE_Int HYPRE_SStructGridSetNeighborPart ( HYPRE_SStructGrid grid, HYPRE_Int part,
+                                             HYPRE_Int *ilower, HYPRE_Int *iupper, HYPRE_Int nbor_part, HYPRE_Int *nbor_ilower,
+                                             HYPRE_Int *nbor_iupper, HYPRE_Int *index_map, HYPRE_Int *index_dir );
+HYPRE_Int HYPRE_SStructGridSetSharedPart ( HYPRE_SStructGrid grid, HYPRE_Int part,
+                                           HYPRE_Int *ilower, HYPRE_Int *iupper, HYPRE_Int *offset, HYPRE_Int shared_part,
+                                           HYPRE_Int *shared_ilower, HYPRE_Int *shared_iupper, HYPRE_Int *shared_offset, HYPRE_Int *index_map,
+                                           HYPRE_Int *index_dir );
+HYPRE_Int HYPRE_SStructGridAddUnstructuredPart ( HYPRE_SStructGrid grid, HYPRE_Int ilower,
+                                                 HYPRE_Int iupper );
 HYPRE_Int HYPRE_SStructGridAssemble ( HYPRE_SStructGrid grid );
-HYPRE_Int HYPRE_SStructGridSetPeriodic ( HYPRE_SStructGrid grid , HYPRE_Int part , HYPRE_Int *periodic );
-HYPRE_Int HYPRE_SStructGridSetNumGhost ( HYPRE_SStructGrid grid , HYPRE_Int *num_ghost );
+HYPRE_Int HYPRE_SStructGridSetPeriodic ( HYPRE_SStructGrid grid, HYPRE_Int part,
+                                         HYPRE_Int *periodic );
+HYPRE_Int HYPRE_SStructGridSetNumGhost ( HYPRE_SStructGrid grid, HYPRE_Int *num_ghost );
 
 /* HYPRE_sstruct_matrix.c */
-HYPRE_Int HYPRE_SStructMatrixCreate ( MPI_Comm comm , HYPRE_SStructGraph graph , HYPRE_SStructMatrix *matrix_ptr );
+HYPRE_Int HYPRE_SStructMatrixCreate ( MPI_Comm comm, HYPRE_SStructGraph graph,
+                                      HYPRE_SStructMatrix *matrix_ptr );
 HYPRE_Int HYPRE_SStructMatrixDestroy ( HYPRE_SStructMatrix matrix );
 HYPRE_Int HYPRE_SStructMatrixInitialize ( HYPRE_SStructMatrix matrix );
-HYPRE_Int HYPRE_SStructMatrixSetValues ( HYPRE_SStructMatrix matrix , HYPRE_Int part , HYPRE_Int *index , HYPRE_Int var , HYPRE_Int nentries , HYPRE_Int *entries , HYPRE_Complex *values );
-HYPRE_Int HYPRE_SStructMatrixAddToValues ( HYPRE_SStructMatrix matrix , HYPRE_Int part , HYPRE_Int *index , HYPRE_Int var , HYPRE_Int nentries , HYPRE_Int *entries , HYPRE_Complex *values );
-HYPRE_Int HYPRE_SStructMatrixAddFEMValues ( HYPRE_SStructMatrix matrix , HYPRE_Int part , HYPRE_Int *index , HYPRE_Complex *values );
-HYPRE_Int HYPRE_SStructMatrixGetValues ( HYPRE_SStructMatrix matrix , HYPRE_Int part , HYPRE_Int *index , HYPRE_Int var , HYPRE_Int nentries , HYPRE_Int *entries , HYPRE_Complex *values );
-HYPRE_Int HYPRE_SStructMatrixGetFEMValues ( HYPRE_SStructMatrix matrix , HYPRE_Int part , HYPRE_Int *index , HYPRE_Complex *values );
-HYPRE_Int HYPRE_SStructMatrixSetBoxValues ( HYPRE_SStructMatrix matrix , HYPRE_Int part , HYPRE_Int *ilower , HYPRE_Int *iupper , HYPRE_Int var , HYPRE_Int nentries , HYPRE_Int *entries , HYPRE_Complex *values );
-HYPRE_Int HYPRE_SStructMatrixAddToBoxValues ( HYPRE_SStructMatrix matrix , HYPRE_Int part , HYPRE_Int *ilower , HYPRE_Int *iupper , HYPRE_Int var , HYPRE_Int nentries , HYPRE_Int *entries , HYPRE_Complex *values );
-HYPRE_Int HYPRE_SStructMatrixGetBoxValues ( HYPRE_SStructMatrix matrix , HYPRE_Int part , HYPRE_Int *ilower , HYPRE_Int *iupper , HYPRE_Int var , HYPRE_Int nentries , HYPRE_Int *entries , HYPRE_Complex *values );
+HYPRE_Int HYPRE_SStructMatrixSetValues ( HYPRE_SStructMatrix matrix, HYPRE_Int part,
+                                         HYPRE_Int *index, HYPRE_Int var, HYPRE_Int nentries, HYPRE_Int *entries, HYPRE_Complex *values );
+HYPRE_Int HYPRE_SStructMatrixAddToValues ( HYPRE_SStructMatrix matrix, HYPRE_Int part,
+                                           HYPRE_Int *index, HYPRE_Int var, HYPRE_Int nentries, HYPRE_Int *entries, HYPRE_Complex *values );
+HYPRE_Int HYPRE_SStructMatrixAddFEMValues ( HYPRE_SStructMatrix matrix, HYPRE_Int part,
+                                            HYPRE_Int *index, HYPRE_Complex *values );
+HYPRE_Int HYPRE_SStructMatrixGetValues ( HYPRE_SStructMatrix matrix, HYPRE_Int part,
+                                         HYPRE_Int *index, HYPRE_Int var, HYPRE_Int nentries, HYPRE_Int *entries, HYPRE_Complex *values );
+HYPRE_Int HYPRE_SStructMatrixGetFEMValues ( HYPRE_SStructMatrix matrix, HYPRE_Int part,
+                                            HYPRE_Int *index, HYPRE_Complex *values );
+HYPRE_Int HYPRE_SStructMatrixSetBoxValues ( HYPRE_SStructMatrix matrix, HYPRE_Int part,
+                                            HYPRE_Int *ilower, HYPRE_Int *iupper, HYPRE_Int var, HYPRE_Int nentries, HYPRE_Int *entries,
+                                            HYPRE_Complex *values );
+HYPRE_Int HYPRE_SStructMatrixAddToBoxValues ( HYPRE_SStructMatrix matrix, HYPRE_Int part,
+                                              HYPRE_Int *ilower, HYPRE_Int *iupper, HYPRE_Int var, HYPRE_Int nentries, HYPRE_Int *entries,
+                                              HYPRE_Complex *values );
+HYPRE_Int HYPRE_SStructMatrixGetBoxValues ( HYPRE_SStructMatrix matrix, HYPRE_Int part,
+                                            HYPRE_Int *ilower, HYPRE_Int *iupper, HYPRE_Int var, HYPRE_Int nentries, HYPRE_Int *entries,
+                                            HYPRE_Complex *values );
 HYPRE_Int HYPRE_SStructMatrixAssemble ( HYPRE_SStructMatrix matrix );
-HYPRE_Int HYPRE_SStructMatrixSetSymmetric ( HYPRE_SStructMatrix matrix , HYPRE_Int part , HYPRE_Int var , HYPRE_Int to_var , HYPRE_Int symmetric );
-HYPRE_Int HYPRE_SStructMatrixSetNSSymmetric ( HYPRE_SStructMatrix matrix , HYPRE_Int symmetric );
-HYPRE_Int HYPRE_SStructMatrixSetObjectType ( HYPRE_SStructMatrix matrix , HYPRE_Int type );
-HYPRE_Int HYPRE_SStructMatrixGetObject ( HYPRE_SStructMatrix matrix , void **object );
-HYPRE_Int HYPRE_SStructMatrixPrint ( const char *filename , HYPRE_SStructMatrix matrix , HYPRE_Int all );
-HYPRE_Int HYPRE_SStructMatrixMatvec ( HYPRE_Complex alpha , HYPRE_SStructMatrix A , HYPRE_SStructVector x , HYPRE_Complex beta , HYPRE_SStructVector y );
+HYPRE_Int HYPRE_SStructMatrixSetSymmetric ( HYPRE_SStructMatrix matrix, HYPRE_Int part,
+                                            HYPRE_Int var, HYPRE_Int to_var, HYPRE_Int symmetric );
+HYPRE_Int HYPRE_SStructMatrixSetNSSymmetric ( HYPRE_SStructMatrix matrix, HYPRE_Int symmetric );
+HYPRE_Int HYPRE_SStructMatrixSetObjectType ( HYPRE_SStructMatrix matrix, HYPRE_Int type );
+HYPRE_Int HYPRE_SStructMatrixGetObject ( HYPRE_SStructMatrix matrix, void **object );
+HYPRE_Int HYPRE_SStructMatrixPrint ( const char *filename, HYPRE_SStructMatrix matrix,
+                                     HYPRE_Int all );
+HYPRE_Int HYPRE_SStructMatrixRead ( MPI_Comm comm, const char *filename,
+                                    HYPRE_SStructMatrix *matrix_ptr );
+HYPRE_Int HYPRE_SStructMatrixMatvec ( HYPRE_Complex alpha, HYPRE_SStructMatrix A,
+                                      HYPRE_SStructVector x, HYPRE_Complex beta, HYPRE_SStructVector y );
 
 /* HYPRE_sstruct_stencil.c */
-HYPRE_Int HYPRE_SStructStencilCreate ( HYPRE_Int ndim , HYPRE_Int size , HYPRE_SStructStencil *stencil_ptr );
+HYPRE_Int HYPRE_SStructStencilCreate ( HYPRE_Int ndim, HYPRE_Int size,
+                                       HYPRE_SStructStencil *stencil_ptr );
 HYPRE_Int HYPRE_SStructStencilDestroy ( HYPRE_SStructStencil stencil );
-HYPRE_Int HYPRE_SStructStencilSetEntry ( HYPRE_SStructStencil stencil , HYPRE_Int entry , HYPRE_Int *offset , HYPRE_Int var );
+HYPRE_Int HYPRE_SStructStencilSetEntry ( HYPRE_SStructStencil stencil, HYPRE_Int entry,
+                                         HYPRE_Int *offset, HYPRE_Int var );
+HYPRE_Int HYPRE_SStructStencilPrint ( FILE *file, HYPRE_SStructStencil stencil );
+HYPRE_Int HYPRE_SStructStencilRead ( FILE *file, HYPRE_SStructStencil *stencil_ptr );
+
 
 /* HYPRE_sstruct_vector.c */
-HYPRE_Int HYPRE_SStructVectorCreate ( MPI_Comm comm , HYPRE_SStructGrid grid , HYPRE_SStructVector *vector_ptr );
+HYPRE_Int HYPRE_SStructVectorCreate ( MPI_Comm comm, HYPRE_SStructGrid grid,
+                                      HYPRE_SStructVector *vector_ptr );
 HYPRE_Int HYPRE_SStructVectorDestroy ( HYPRE_SStructVector vector );
 HYPRE_Int HYPRE_SStructVectorInitialize ( HYPRE_SStructVector vector );
-HYPRE_Int HYPRE_SStructVectorSetValues ( HYPRE_SStructVector vector , HYPRE_Int part , HYPRE_Int *index , HYPRE_Int var , HYPRE_Complex *value );
-HYPRE_Int HYPRE_SStructVectorAddToValues ( HYPRE_SStructVector vector , HYPRE_Int part , HYPRE_Int *index , HYPRE_Int var , HYPRE_Complex *value );
-HYPRE_Int HYPRE_SStructVectorAddFEMValues ( HYPRE_SStructVector vector , HYPRE_Int part , HYPRE_Int *index , HYPRE_Complex *values );
-HYPRE_Int HYPRE_SStructVectorGetValues ( HYPRE_SStructVector vector , HYPRE_Int part , HYPRE_Int *index , HYPRE_Int var , HYPRE_Complex *value );
-HYPRE_Int HYPRE_SStructVectorGetFEMValues ( HYPRE_SStructVector vector , HYPRE_Int part , HYPRE_Int *index , HYPRE_Complex *values );
-HYPRE_Int HYPRE_SStructVectorSetBoxValues ( HYPRE_SStructVector vector , HYPRE_Int part , HYPRE_Int *ilower , HYPRE_Int *iupper , HYPRE_Int var , HYPRE_Complex *values );
-HYPRE_Int HYPRE_SStructVectorAddToBoxValues ( HYPRE_SStructVector vector , HYPRE_Int part , HYPRE_Int *ilower , HYPRE_Int *iupper , HYPRE_Int var , HYPRE_Complex *values );
-HYPRE_Int HYPRE_SStructVectorGetBoxValues ( HYPRE_SStructVector vector , HYPRE_Int part , HYPRE_Int *ilower , HYPRE_Int *iupper , HYPRE_Int var , HYPRE_Complex *values );
+HYPRE_Int HYPRE_SStructVectorSetValues ( HYPRE_SStructVector vector, HYPRE_Int part,
+                                         HYPRE_Int *index, HYPRE_Int var, HYPRE_Complex *value );
+HYPRE_Int HYPRE_SStructVectorAddToValues ( HYPRE_SStructVector vector, HYPRE_Int part,
+                                           HYPRE_Int *index, HYPRE_Int var, HYPRE_Complex *value );
+HYPRE_Int HYPRE_SStructVectorAddFEMValues ( HYPRE_SStructVector vector, HYPRE_Int part,
+                                            HYPRE_Int *index, HYPRE_Complex *values );
+HYPRE_Int HYPRE_SStructVectorGetValues ( HYPRE_SStructVector vector, HYPRE_Int part,
+                                         HYPRE_Int *index, HYPRE_Int var, HYPRE_Complex *value );
+HYPRE_Int HYPRE_SStructVectorGetFEMValues ( HYPRE_SStructVector vector, HYPRE_Int part,
+                                            HYPRE_Int *index, HYPRE_Complex *values );
+HYPRE_Int HYPRE_SStructVectorSetBoxValues ( HYPRE_SStructVector vector, HYPRE_Int part,
+                                            HYPRE_Int *ilower, HYPRE_Int *iupper, HYPRE_Int var, HYPRE_Complex *values );
+HYPRE_Int HYPRE_SStructVectorAddToBoxValues ( HYPRE_SStructVector vector, HYPRE_Int part,
+                                              HYPRE_Int *ilower, HYPRE_Int *iupper, HYPRE_Int var, HYPRE_Complex *values );
+HYPRE_Int HYPRE_SStructVectorGetBoxValues ( HYPRE_SStructVector vector, HYPRE_Int part,
+                                            HYPRE_Int *ilower, HYPRE_Int *iupper, HYPRE_Int var, HYPRE_Complex *values );
 HYPRE_Int HYPRE_SStructVectorAssemble ( HYPRE_SStructVector vector );
 HYPRE_Int HYPRE_SStructVectorGather ( HYPRE_SStructVector vector );
-HYPRE_Int HYPRE_SStructVectorSetConstantValues ( HYPRE_SStructVector vector , HYPRE_Complex value );
-HYPRE_Int HYPRE_SStructVectorSetObjectType ( HYPRE_SStructVector vector , HYPRE_Int type );
-HYPRE_Int HYPRE_SStructVectorGetObject ( HYPRE_SStructVector vector , void **object );
-HYPRE_Int HYPRE_SStructVectorPrint ( const char *filename , HYPRE_SStructVector vector , HYPRE_Int all );
-HYPRE_Int HYPRE_SStructVectorCopy ( HYPRE_SStructVector x , HYPRE_SStructVector y );
-HYPRE_Int HYPRE_SStructVectorScale ( HYPRE_Complex alpha , HYPRE_SStructVector y );
-HYPRE_Int HYPRE_SStructInnerProd ( HYPRE_SStructVector x , HYPRE_SStructVector y , HYPRE_Real *result );
-HYPRE_Int HYPRE_SStructAxpy ( HYPRE_Complex alpha , HYPRE_SStructVector x , HYPRE_SStructVector y );
+HYPRE_Int HYPRE_SStructVectorSetConstantValues ( HYPRE_SStructVector vector, HYPRE_Complex value );
+HYPRE_Int HYPRE_SStructVectorSetObjectType ( HYPRE_SStructVector vector, HYPRE_Int type );
+HYPRE_Int HYPRE_SStructVectorGetObject ( HYPRE_SStructVector vector, void **object );
+HYPRE_Int HYPRE_SStructVectorPrint ( const char *filename, HYPRE_SStructVector vector,
+                                     HYPRE_Int all );
+HYPRE_Int HYPRE_SStructVectorRead ( MPI_Comm comm, const char *filename,
+                                    HYPRE_SStructVector *vector );
+HYPRE_Int HYPRE_SStructVectorCopy ( HYPRE_SStructVector x, HYPRE_SStructVector y );
+HYPRE_Int HYPRE_SStructVectorScale ( HYPRE_Complex alpha, HYPRE_SStructVector y );
+HYPRE_Int HYPRE_SStructInnerProd ( HYPRE_SStructVector x, HYPRE_SStructVector y,
+                                   HYPRE_Real *result );
+HYPRE_Int HYPRE_SStructAxpy ( HYPRE_Complex alpha, HYPRE_SStructVector x, HYPRE_SStructVector y );
 
 /* sstruct_axpy.c */
-HYPRE_Int hypre_SStructPAxpy ( HYPRE_Complex alpha , hypre_SStructPVector *px , hypre_SStructPVector *py );
-HYPRE_Int hypre_SStructAxpy ( HYPRE_Complex alpha , hypre_SStructVector *x , hypre_SStructVector *y );
+HYPRE_Int hypre_SStructPAxpy ( HYPRE_Complex alpha, hypre_SStructPVector *px,
+                               hypre_SStructPVector *py );
+HYPRE_Int hypre_SStructAxpy ( HYPRE_Complex alpha, hypre_SStructVector *x, hypre_SStructVector *y );
 
 /* sstruct_copy.c */
-HYPRE_Int hypre_SStructPCopy ( hypre_SStructPVector *px , hypre_SStructPVector *py );
-HYPRE_Int hypre_SStructPartialPCopy ( hypre_SStructPVector *px , hypre_SStructPVector *py , hypre_BoxArrayArray **array_boxes );
-HYPRE_Int hypre_SStructCopy ( hypre_SStructVector *x , hypre_SStructVector *y );
+HYPRE_Int hypre_SStructPCopy ( hypre_SStructPVector *px, hypre_SStructPVector *py );
+HYPRE_Int hypre_SStructPartialPCopy ( hypre_SStructPVector *px, hypre_SStructPVector *py,
+                                      hypre_BoxArrayArray **array_boxes );
+HYPRE_Int hypre_SStructCopy ( hypre_SStructVector *x, hypre_SStructVector *y );
 
 /* sstruct_graph.c */
-HYPRE_Int hypre_SStructGraphRef ( hypre_SStructGraph *graph , hypre_SStructGraph **graph_ref );
-HYPRE_Int hypre_SStructGraphGetUVEntryRank( hypre_SStructGraph *graph , HYPRE_Int part , HYPRE_Int var , hypre_Index index, HYPRE_BigInt *rank );
-HYPRE_Int hypre_SStructGraphFindBoxEndpt ( hypre_SStructGraph *graph , HYPRE_Int part , HYPRE_Int var , HYPRE_Int proc , HYPRE_Int endpt , HYPRE_Int boxi );
-HYPRE_Int hypre_SStructGraphFindSGridEndpts ( hypre_SStructGraph *graph , HYPRE_Int part , HYPRE_Int var , HYPRE_Int proc , HYPRE_Int endpt , HYPRE_Int *endpts );
+HYPRE_Int hypre_SStructGraphRef ( hypre_SStructGraph *graph, hypre_SStructGraph **graph_ref );
+HYPRE_Int hypre_SStructGraphGetUVEntryRank( hypre_SStructGraph *graph, HYPRE_Int part,
+                                            HYPRE_Int var, hypre_Index index, HYPRE_BigInt *rank );
+HYPRE_Int hypre_SStructGraphFindBoxEndpt ( hypre_SStructGraph *graph, HYPRE_Int part, HYPRE_Int var,
+                                           HYPRE_Int proc, HYPRE_Int endpt, HYPRE_Int boxi );
+HYPRE_Int hypre_SStructGraphFindSGridEndpts ( hypre_SStructGraph *graph, HYPRE_Int part,
+                                              HYPRE_Int var, HYPRE_Int proc, HYPRE_Int endpt, HYPRE_Int *endpts );
 
 /* sstruct_grid.c */
-HYPRE_Int hypre_SStructVariableGetOffset ( HYPRE_SStructVariable vartype , HYPRE_Int ndim , hypre_Index varoffset );
-HYPRE_Int hypre_SStructPGridCreate ( MPI_Comm comm , HYPRE_Int ndim , hypre_SStructPGrid **pgrid_ptr );
+HYPRE_Int hypre_SStructVariableGetOffset ( HYPRE_SStructVariable vartype, HYPRE_Int ndim,
+                                           hypre_Index varoffset );
+HYPRE_Int hypre_SStructPGridCreate ( MPI_Comm comm, HYPRE_Int ndim,
+                                     hypre_SStructPGrid **pgrid_ptr );
 HYPRE_Int hypre_SStructPGridDestroy ( hypre_SStructPGrid *pgrid );
-HYPRE_Int hypre_SStructPGridSetExtents ( hypre_SStructPGrid *pgrid , hypre_Index ilower , hypre_Index iupper );
-HYPRE_Int hypre_SStructPGridSetCellSGrid ( hypre_SStructPGrid *pgrid , hypre_StructGrid *cell_sgrid );
-HYPRE_Int hypre_SStructPGridSetVariables ( hypre_SStructPGrid *pgrid , HYPRE_Int nvars , HYPRE_SStructVariable *vartypes );
-HYPRE_Int hypre_SStructPGridSetPNeighbor ( hypre_SStructPGrid *pgrid , hypre_Box *pneighbor_box , hypre_Index pnbor_offset );
+HYPRE_Int hypre_SStructPGridSetExtents ( hypre_SStructPGrid *pgrid, hypre_Index ilower,
+                                         hypre_Index iupper );
+HYPRE_Int hypre_SStructPGridSetCellSGrid ( hypre_SStructPGrid *pgrid,
+                                           hypre_StructGrid *cell_sgrid );
+HYPRE_Int hypre_SStructPGridSetVariables ( hypre_SStructPGrid *pgrid, HYPRE_Int nvars,
+                                           HYPRE_SStructVariable *vartypes );
+HYPRE_Int hypre_SStructPGridSetPNeighbor ( hypre_SStructPGrid *pgrid, hypre_Box *pneighbor_box,
+                                           hypre_Index pnbor_offset );
 HYPRE_Int hypre_SStructPGridAssemble ( hypre_SStructPGrid *pgrid );
-HYPRE_Int hypre_SStructGridRef ( hypre_SStructGrid *grid , hypre_SStructGrid **grid_ref );
+HYPRE_Int hypre_SStructPGridGetMaxBoxSize ( hypre_SStructPGrid *pgrid );
+HYPRE_Int hypre_SStructGridRef ( hypre_SStructGrid *grid, hypre_SStructGrid **grid_ref );
 HYPRE_Int hypre_SStructGridAssembleBoxManagers ( hypre_SStructGrid *grid );
 HYPRE_Int hypre_SStructGridAssembleNborBoxManagers ( hypre_SStructGrid *grid );
 HYPRE_Int hypre_SStructGridCreateCommInfo ( hypre_SStructGrid *grid );
-HYPRE_Int hypre_SStructGridFindBoxManEntry ( hypre_SStructGrid *grid , HYPRE_Int part , hypre_Index index , HYPRE_Int var , hypre_BoxManEntry **entry_ptr );
-HYPRE_Int hypre_SStructGridFindNborBoxManEntry ( hypre_SStructGrid *grid , HYPRE_Int part , hypre_Index index , HYPRE_Int var , hypre_BoxManEntry **entry_ptr );
-HYPRE_Int hypre_SStructGridBoxProcFindBoxManEntry ( hypre_SStructGrid *grid , HYPRE_Int part , HYPRE_Int var , HYPRE_Int box , HYPRE_Int proc , hypre_BoxManEntry **entry_ptr );
-HYPRE_Int hypre_SStructBoxManEntryGetCSRstrides ( hypre_BoxManEntry *entry , hypre_Index strides );
-HYPRE_Int hypre_SStructBoxManEntryGetGhstrides ( hypre_BoxManEntry *entry , hypre_Index strides );
-HYPRE_Int hypre_SStructBoxManEntryGetGlobalCSRank ( hypre_BoxManEntry *entry , hypre_Index index , HYPRE_BigInt *rank_ptr );
-HYPRE_Int hypre_SStructBoxManEntryGetGlobalGhrank ( hypre_BoxManEntry *entry , hypre_Index index , HYPRE_BigInt *rank_ptr );
-HYPRE_Int hypre_SStructBoxManEntryGetProcess ( hypre_BoxManEntry *entry , HYPRE_Int *proc_ptr );
-HYPRE_Int hypre_SStructBoxManEntryGetBoxnum ( hypre_BoxManEntry *entry , HYPRE_Int *id_ptr );
-HYPRE_Int hypre_SStructBoxManEntryGetPart ( hypre_BoxManEntry *entry , HYPRE_Int part , HYPRE_Int *part_ptr );
-HYPRE_Int hypre_SStructIndexToNborIndex( hypre_Index index , hypre_Index root , hypre_Index nbor_root , hypre_Index coord , hypre_Index dir , HYPRE_Int ndim , hypre_Index nbor_index );
-HYPRE_Int hypre_SStructBoxToNborBox ( hypre_Box *box , hypre_Index root , hypre_Index nbor_root , hypre_Index coord , hypre_Index dir );
-HYPRE_Int hypre_SStructNborIndexToIndex( hypre_Index nbor_index , hypre_Index root , hypre_Index nbor_root , hypre_Index coord , hypre_Index dir , HYPRE_Int ndim , hypre_Index index );
-HYPRE_Int hypre_SStructNborBoxToBox ( hypre_Box *nbor_box , hypre_Index root , hypre_Index nbor_root , hypre_Index coord , hypre_Index dir );
-HYPRE_Int hypre_SStructVarToNborVar ( hypre_SStructGrid *grid , HYPRE_Int part , HYPRE_Int var , HYPRE_Int *coord , HYPRE_Int *nbor_var_ptr );
-HYPRE_Int hypre_SStructGridSetNumGhost ( hypre_SStructGrid *grid , HYPRE_Int *num_ghost );
-HYPRE_Int hypre_SStructBoxManEntryGetGlobalRank ( hypre_BoxManEntry *entry , hypre_Index index , HYPRE_BigInt *rank_ptr , HYPRE_Int type );
-HYPRE_Int hypre_SStructBoxManEntryGetStrides ( hypre_BoxManEntry *entry , hypre_Index strides , HYPRE_Int type );
-HYPRE_Int hypre_SStructBoxNumMap ( hypre_SStructGrid *grid , HYPRE_Int part , HYPRE_Int boxnum , HYPRE_Int **num_varboxes_ptr , HYPRE_Int ***map_ptr );
-HYPRE_Int hypre_SStructCellGridBoxNumMap ( hypre_SStructGrid *grid , HYPRE_Int part , HYPRE_Int ***num_varboxes_ptr , HYPRE_Int ****map_ptr );
-HYPRE_Int hypre_SStructCellBoxToVarBox ( hypre_Box *box , hypre_Index offset , hypre_Index varoffset , HYPRE_Int *valid );
-HYPRE_Int hypre_SStructGridIntersect ( hypre_SStructGrid *grid , HYPRE_Int part , HYPRE_Int var , hypre_Box *box , HYPRE_Int action , hypre_BoxManEntry ***entries_ptr , HYPRE_Int *nentries_ptr );
+HYPRE_Int hypre_SStructGridFindBoxManEntry ( hypre_SStructGrid *grid, HYPRE_Int part,
+                                             hypre_Index index, HYPRE_Int var, hypre_BoxManEntry **entry_ptr );
+HYPRE_Int hypre_SStructGridFindNborBoxManEntry ( hypre_SStructGrid *grid, HYPRE_Int part,
+                                                 hypre_Index index, HYPRE_Int var, hypre_BoxManEntry **entry_ptr );
+HYPRE_Int hypre_SStructGridBoxProcFindBoxManEntry ( hypre_SStructGrid *grid, HYPRE_Int part,
+                                                    HYPRE_Int var, HYPRE_Int box, HYPRE_Int proc, hypre_BoxManEntry **entry_ptr );
+HYPRE_Int hypre_SStructBoxManEntryGetCSRstrides ( hypre_BoxManEntry *entry, hypre_Index strides );
+HYPRE_Int hypre_SStructBoxManEntryGetGhstrides ( hypre_BoxManEntry *entry, hypre_Index strides );
+HYPRE_Int hypre_SStructBoxManEntryGetGlobalCSRank ( hypre_BoxManEntry *entry, hypre_Index index,
+                                                    HYPRE_BigInt *rank_ptr );
+HYPRE_Int hypre_SStructBoxManEntryGetGlobalGhrank ( hypre_BoxManEntry *entry, hypre_Index index,
+                                                    HYPRE_BigInt *rank_ptr );
+HYPRE_Int hypre_SStructBoxManEntryGetProcess ( hypre_BoxManEntry *entry, HYPRE_Int *proc_ptr );
+HYPRE_Int hypre_SStructBoxManEntryGetBoxnum ( hypre_BoxManEntry *entry, HYPRE_Int *id_ptr );
+HYPRE_Int hypre_SStructBoxManEntryGetPart ( hypre_BoxManEntry *entry, HYPRE_Int part,
+                                            HYPRE_Int *part_ptr );
+HYPRE_Int hypre_SStructIndexToNborIndex( hypre_Index index, hypre_Index root, hypre_Index nbor_root,
+                                         hypre_Index coord, hypre_Index dir, HYPRE_Int ndim, hypre_Index nbor_index );
+HYPRE_Int hypre_SStructBoxToNborBox ( hypre_Box *box, hypre_Index root, hypre_Index nbor_root,
+                                      hypre_Index coord, hypre_Index dir );
+HYPRE_Int hypre_SStructNborIndexToIndex( hypre_Index nbor_index, hypre_Index root,
+                                         hypre_Index nbor_root, hypre_Index coord, hypre_Index dir, HYPRE_Int ndim, hypre_Index index );
+HYPRE_Int hypre_SStructNborBoxToBox ( hypre_Box *nbor_box, hypre_Index root, hypre_Index nbor_root,
+                                      hypre_Index coord, hypre_Index dir );
+HYPRE_Int hypre_SStructVarToNborVar ( hypre_SStructGrid *grid, HYPRE_Int part, HYPRE_Int var,
+                                      HYPRE_Int *coord, HYPRE_Int *nbor_var_ptr );
+HYPRE_Int hypre_SStructGridSetNumGhost ( hypre_SStructGrid *grid, HYPRE_Int *num_ghost );
+HYPRE_Int hypre_SStructBoxManEntryGetGlobalRank ( hypre_BoxManEntry *entry, hypre_Index index,
+                                                  HYPRE_BigInt *rank_ptr, HYPRE_Int type );
+HYPRE_Int hypre_SStructBoxManEntryGetStrides ( hypre_BoxManEntry *entry, hypre_Index strides,
+                                               HYPRE_Int type );
+HYPRE_Int hypre_SStructBoxNumMap ( hypre_SStructGrid *grid, HYPRE_Int part, HYPRE_Int boxnum,
+                                   HYPRE_Int **num_varboxes_ptr, HYPRE_Int ***map_ptr );
+HYPRE_Int hypre_SStructCellGridBoxNumMap ( hypre_SStructGrid *grid, HYPRE_Int part,
+                                           HYPRE_Int ***num_varboxes_ptr, HYPRE_Int ****map_ptr );
+HYPRE_Int hypre_SStructCellBoxToVarBox ( hypre_Box *box, hypre_Index offset, hypre_Index varoffset,
+                                         HYPRE_Int *valid );
+HYPRE_Int hypre_SStructGridIntersect ( hypre_SStructGrid *grid, HYPRE_Int part, HYPRE_Int var,
+                                       hypre_Box *box, HYPRE_Int action, hypre_BoxManEntry ***entries_ptr, HYPRE_Int *nentries_ptr );
+HYPRE_Int hypre_SStructGridGetMaxBoxSize ( hypre_SStructGrid *grid );
+HYPRE_Int hypre_SStructGridPrint ( FILE *file, hypre_SStructGrid *grid );
+HYPRE_Int hypre_SStructGridRead ( MPI_Comm comm, FILE *file, hypre_SStructGrid **grid_ptr );
 
 /* sstruct_innerprod.c */
-HYPRE_Int hypre_SStructPInnerProd ( hypre_SStructPVector *px , hypre_SStructPVector *py , HYPRE_Real *presult_ptr );
-HYPRE_Int hypre_SStructInnerProd ( hypre_SStructVector *x , hypre_SStructVector *y , HYPRE_Real *result_ptr );
+HYPRE_Int hypre_SStructPInnerProd ( hypre_SStructPVector *px, hypre_SStructPVector *py,
+                                    HYPRE_Real *presult_ptr );
+HYPRE_Int hypre_SStructInnerProd ( hypre_SStructVector *x, hypre_SStructVector *y,
+                                   HYPRE_Real *result_ptr );
 
 /* sstruct_matrix.c */
-HYPRE_Int hypre_SStructPMatrixRef ( hypre_SStructPMatrix *matrix , hypre_SStructPMatrix **matrix_ref );
-HYPRE_Int hypre_SStructPMatrixCreate ( MPI_Comm comm , hypre_SStructPGrid *pgrid , hypre_SStructStencil **stencils , hypre_SStructPMatrix **pmatrix_ptr );
+HYPRE_Int hypre_SStructPMatrixRef ( hypre_SStructPMatrix *matrix,
+                                    hypre_SStructPMatrix **matrix_ref );
+HYPRE_Int hypre_SStructPMatrixCreate ( MPI_Comm comm, hypre_SStructPGrid *pgrid,
+                                       hypre_SStructStencil **stencils, hypre_SStructPMatrix **pmatrix_ptr );
 HYPRE_Int hypre_SStructPMatrixDestroy ( hypre_SStructPMatrix *pmatrix );
 HYPRE_Int hypre_SStructPMatrixInitialize ( hypre_SStructPMatrix *pmatrix );
-HYPRE_Int hypre_SStructPMatrixSetValues ( hypre_SStructPMatrix *pmatrix , hypre_Index index , HYPRE_Int var , HYPRE_Int nentries , HYPRE_Int *entries , HYPRE_Complex *values , HYPRE_Int action );
-HYPRE_Int hypre_SStructPMatrixSetBoxValues( hypre_SStructPMatrix *pmatrix , hypre_Box *set_box , HYPRE_Int var , HYPRE_Int nentries , HYPRE_Int *entries , hypre_Box *value_box , HYPRE_Complex *values , HYPRE_Int action );
+HYPRE_Int hypre_SStructPMatrixSetValues ( hypre_SStructPMatrix *pmatrix, hypre_Index index,
+                                          HYPRE_Int var, HYPRE_Int nentries, HYPRE_Int *entries, HYPRE_Complex *values, HYPRE_Int action );
+HYPRE_Int hypre_SStructPMatrixSetBoxValues( hypre_SStructPMatrix *pmatrix, hypre_Box *set_box,
+                                            HYPRE_Int var, HYPRE_Int nentries, HYPRE_Int *entries, hypre_Box *value_box, HYPRE_Complex *values,
+                                            HYPRE_Int action );
 HYPRE_Int hypre_SStructPMatrixAccumulate ( hypre_SStructPMatrix *pmatrix );
 HYPRE_Int hypre_SStructPMatrixAssemble ( hypre_SStructPMatrix *pmatrix );
-HYPRE_Int hypre_SStructPMatrixSetSymmetric ( hypre_SStructPMatrix *pmatrix , HYPRE_Int var , HYPRE_Int to_var , HYPRE_Int symmetric );
-HYPRE_Int hypre_SStructPMatrixPrint ( const char *filename , hypre_SStructPMatrix *pmatrix , HYPRE_Int all );
+HYPRE_Int hypre_SStructPMatrixSetSymmetric ( hypre_SStructPMatrix *pmatrix, HYPRE_Int var,
+                                             HYPRE_Int to_var, HYPRE_Int symmetric );
+HYPRE_Int hypre_SStructPMatrixPrint ( const char *filename, hypre_SStructPMatrix *pmatrix,
+                                      HYPRE_Int all );
 HYPRE_Int hypre_SStructUMatrixInitialize ( hypre_SStructMatrix *matrix );
-HYPRE_Int hypre_SStructUMatrixSetValues ( hypre_SStructMatrix *matrix , HYPRE_Int part , hypre_Index index , HYPRE_Int var , HYPRE_Int nentries , HYPRE_Int *entries , HYPRE_Complex *values , HYPRE_Int action );
-HYPRE_Int hypre_SStructUMatrixSetBoxValues( hypre_SStructMatrix *matrix , HYPRE_Int part , hypre_Box *set_box , HYPRE_Int var , HYPRE_Int nentries , HYPRE_Int *entries , hypre_Box *value_box , HYPRE_Complex *values , HYPRE_Int action );
+HYPRE_Int hypre_SStructUMatrixSetValues ( hypre_SStructMatrix *matrix, HYPRE_Int part,
+                                          hypre_Index index, HYPRE_Int var, HYPRE_Int nentries, HYPRE_Int *entries, HYPRE_Complex *values,
+                                          HYPRE_Int action );
+HYPRE_Int hypre_SStructUMatrixSetBoxValues( hypre_SStructMatrix *matrix, HYPRE_Int part,
+                                            hypre_Box *set_box, HYPRE_Int var, HYPRE_Int nentries, HYPRE_Int *entries, hypre_Box *value_box,
+                                            HYPRE_Complex *values, HYPRE_Int action );
 HYPRE_Int hypre_SStructUMatrixAssemble ( hypre_SStructMatrix *matrix );
-HYPRE_Int hypre_SStructMatrixRef ( hypre_SStructMatrix *matrix , hypre_SStructMatrix **matrix_ref );
-HYPRE_Int hypre_SStructMatrixSplitEntries ( hypre_SStructMatrix *matrix , HYPRE_Int part , HYPRE_Int var , HYPRE_Int nentries , HYPRE_Int *entries , HYPRE_Int *nSentries_ptr , HYPRE_Int **Sentries_ptr , HYPRE_Int *nUentries_ptr , HYPRE_Int **Uentries_ptr );
-HYPRE_Int hypre_SStructMatrixSetValues ( HYPRE_SStructMatrix matrix , HYPRE_Int part , HYPRE_Int *index , HYPRE_Int var , HYPRE_Int nentries , HYPRE_Int *entries , HYPRE_Complex *values , HYPRE_Int action );
-HYPRE_Int hypre_SStructMatrixSetBoxValues( HYPRE_SStructMatrix matrix , HYPRE_Int part , hypre_Box *set_box , HYPRE_Int var , HYPRE_Int nentries , HYPRE_Int *entries , hypre_Box *value_box , HYPRE_Complex *values , HYPRE_Int action );
-HYPRE_Int hypre_SStructMatrixSetInterPartValues( HYPRE_SStructMatrix matrix , HYPRE_Int part , hypre_Box *set_box , HYPRE_Int var , HYPRE_Int nentries , HYPRE_Int *entries , hypre_Box *value_box , HYPRE_Complex *values , HYPRE_Int action );
+HYPRE_Int hypre_SStructMatrixRef ( hypre_SStructMatrix *matrix, hypre_SStructMatrix **matrix_ref );
+HYPRE_Int hypre_SStructMatrixSplitEntries ( hypre_SStructMatrix *matrix, HYPRE_Int part,
+                                            HYPRE_Int var, HYPRE_Int nentries, HYPRE_Int *entries, HYPRE_Int *nSentries_ptr,
+                                            HYPRE_Int **Sentries_ptr, HYPRE_Int *nUentries_ptr, HYPRE_Int **Uentries_ptr );
+HYPRE_Int hypre_SStructMatrixSetValues ( HYPRE_SStructMatrix matrix, HYPRE_Int part,
+                                         HYPRE_Int *index, HYPRE_Int var, HYPRE_Int nentries, HYPRE_Int *entries, HYPRE_Complex *values,
+                                         HYPRE_Int action );
+HYPRE_Int hypre_SStructMatrixSetBoxValues( HYPRE_SStructMatrix matrix, HYPRE_Int part,
+                                           hypre_Box *set_box, HYPRE_Int var, HYPRE_Int nentries, HYPRE_Int *entries, hypre_Box *value_box,
+                                           HYPRE_Complex *values, HYPRE_Int action );
+HYPRE_Int hypre_SStructMatrixSetInterPartValues( HYPRE_SStructMatrix matrix, HYPRE_Int part,
+                                                 hypre_Box *set_box, HYPRE_Int var, HYPRE_Int nentries, HYPRE_Int *entries, hypre_Box *value_box,
+                                                 HYPRE_Complex *values, HYPRE_Int action );
+HYPRE_MemoryLocation hypre_SStructMatrixMemoryLocation(hypre_SStructMatrix *matrix);
 
 /* sstruct_matvec.c */
 HYPRE_Int hypre_SStructPMatvecCreate ( void **pmatvec_vdata_ptr );
-HYPRE_Int hypre_SStructPMatvecSetup ( void *pmatvec_vdata , hypre_SStructPMatrix *pA , hypre_SStructPVector *px );
-HYPRE_Int hypre_SStructPMatvecCompute ( void *pmatvec_vdata , HYPRE_Complex alpha , hypre_SStructPMatrix *pA , hypre_SStructPVector *px , HYPRE_Complex beta , hypre_SStructPVector *py );
+HYPRE_Int hypre_SStructPMatvecSetup ( void *pmatvec_vdata, hypre_SStructPMatrix *pA,
+                                      hypre_SStructPVector *px );
+HYPRE_Int hypre_SStructPMatvecCompute ( void *pmatvec_vdata, HYPRE_Complex alpha,
+                                        hypre_SStructPMatrix *pA, hypre_SStructPVector *px, HYPRE_Complex beta, hypre_SStructPVector *py );
 HYPRE_Int hypre_SStructPMatvecDestroy ( void *pmatvec_vdata );
-HYPRE_Int hypre_SStructPMatvec ( HYPRE_Complex alpha , hypre_SStructPMatrix *pA , hypre_SStructPVector *px , HYPRE_Complex beta , hypre_SStructPVector *py );
+HYPRE_Int hypre_SStructPMatvec ( HYPRE_Complex alpha, hypre_SStructPMatrix *pA,
+                                 hypre_SStructPVector *px, HYPRE_Complex beta, hypre_SStructPVector *py );
 HYPRE_Int hypre_SStructMatvecCreate ( void **matvec_vdata_ptr );
-HYPRE_Int hypre_SStructMatvecSetup ( void *matvec_vdata , hypre_SStructMatrix *A , hypre_SStructVector *x );
-HYPRE_Int hypre_SStructMatvecCompute ( void *matvec_vdata , HYPRE_Complex alpha , hypre_SStructMatrix *A , hypre_SStructVector *x , HYPRE_Complex beta , hypre_SStructVector *y );
+HYPRE_Int hypre_SStructMatvecSetup ( void *matvec_vdata, hypre_SStructMatrix *A,
+                                     hypre_SStructVector *x );
+HYPRE_Int hypre_SStructMatvecCompute ( void *matvec_vdata, HYPRE_Complex alpha,
+                                       hypre_SStructMatrix *A, hypre_SStructVector *x, HYPRE_Complex beta, hypre_SStructVector *y );
 HYPRE_Int hypre_SStructMatvecDestroy ( void *matvec_vdata );
-HYPRE_Int hypre_SStructMatvec ( HYPRE_Complex alpha , hypre_SStructMatrix *A , hypre_SStructVector *x , HYPRE_Complex beta , hypre_SStructVector *y );
+HYPRE_Int hypre_SStructMatvec ( HYPRE_Complex alpha, hypre_SStructMatrix *A, hypre_SStructVector *x,
+                                HYPRE_Complex beta, hypre_SStructVector *y );
 
 /* sstruct_scale.c */
-HYPRE_Int hypre_SStructPScale ( HYPRE_Complex alpha , hypre_SStructPVector *py );
-HYPRE_Int hypre_SStructScale ( HYPRE_Complex alpha , hypre_SStructVector *y );
+HYPRE_Int hypre_SStructPScale ( HYPRE_Complex alpha, hypre_SStructPVector *py );
+HYPRE_Int hypre_SStructScale ( HYPRE_Complex alpha, hypre_SStructVector *y );
 
 /* sstruct_stencil.c */
-HYPRE_Int hypre_SStructStencilRef ( hypre_SStructStencil *stencil , hypre_SStructStencil **stencil_ref );
+HYPRE_Int hypre_SStructStencilRef ( hypre_SStructStencil *stencil,
+                                    hypre_SStructStencil **stencil_ref );
 
 /* sstruct_vector.c */
-HYPRE_Int hypre_SStructPVectorRef ( hypre_SStructPVector *vector , hypre_SStructPVector **vector_ref );
-HYPRE_Int hypre_SStructPVectorCreate ( MPI_Comm comm , hypre_SStructPGrid *pgrid , hypre_SStructPVector **pvector_ptr );
+HYPRE_Int hypre_SStructPVectorRef ( hypre_SStructPVector *vector,
+                                    hypre_SStructPVector **vector_ref );
+HYPRE_Int hypre_SStructPVectorCreate ( MPI_Comm comm, hypre_SStructPGrid *pgrid,
+                                       hypre_SStructPVector **pvector_ptr );
 HYPRE_Int hypre_SStructPVectorDestroy ( hypre_SStructPVector *pvector );
 HYPRE_Int hypre_SStructPVectorInitialize ( hypre_SStructPVector *pvector );
-HYPRE_Int hypre_SStructPVectorSetValues ( hypre_SStructPVector *pvector , hypre_Index index , HYPRE_Int var , HYPRE_Complex *value , HYPRE_Int action );
-HYPRE_Int hypre_SStructPVectorSetBoxValues( hypre_SStructPVector *pvector , hypre_Box *set_box , HYPRE_Int var , hypre_Box *value_box , HYPRE_Complex *values , HYPRE_Int action );
+HYPRE_Int hypre_SStructPVectorSetValues ( hypre_SStructPVector *pvector, hypre_Index index,
+                                          HYPRE_Int var, HYPRE_Complex *value, HYPRE_Int action );
+HYPRE_Int hypre_SStructPVectorSetBoxValues( hypre_SStructPVector *pvector, hypre_Box *set_box,
+                                            HYPRE_Int var, hypre_Box *value_box, HYPRE_Complex *values, HYPRE_Int action );
 HYPRE_Int hypre_SStructPVectorAccumulate ( hypre_SStructPVector *pvector );
 HYPRE_Int hypre_SStructPVectorAssemble ( hypre_SStructPVector *pvector );
 HYPRE_Int hypre_SStructPVectorGather ( hypre_SStructPVector *pvector );
-HYPRE_Int hypre_SStructPVectorGetValues ( hypre_SStructPVector *pvector , hypre_Index index , HYPRE_Int var , HYPRE_Complex *value );
-HYPRE_Int hypre_SStructPVectorGetBoxValues( hypre_SStructPVector *pvector , hypre_Box *set_box , HYPRE_Int var , hypre_Box *value_box , HYPRE_Complex *values );
-HYPRE_Int hypre_SStructPVectorSetConstantValues ( hypre_SStructPVector *pvector , HYPRE_Complex value );
-HYPRE_Int hypre_SStructPVectorPrint ( const char *filename , hypre_SStructPVector *pvector , HYPRE_Int all );
-HYPRE_Int hypre_SStructVectorRef ( hypre_SStructVector *vector , hypre_SStructVector **vector_ref );
-HYPRE_Int hypre_SStructVectorSetConstantValues ( hypre_SStructVector *vector , HYPRE_Complex value );
-HYPRE_Int hypre_SStructVectorConvert ( hypre_SStructVector *vector , hypre_ParVector **parvector_ptr );
-HYPRE_Int hypre_SStructVectorParConvert ( hypre_SStructVector *vector , hypre_ParVector **parvector_ptr );
-HYPRE_Int hypre_SStructVectorRestore ( hypre_SStructVector *vector , hypre_ParVector *parvector );
-HYPRE_Int hypre_SStructVectorParRestore ( hypre_SStructVector *vector , hypre_ParVector *parvector );
+HYPRE_Int hypre_SStructPVectorGetValues ( hypre_SStructPVector *pvector, hypre_Index index,
+                                          HYPRE_Int var, HYPRE_Complex *value );
+HYPRE_Int hypre_SStructPVectorGetBoxValues( hypre_SStructPVector *pvector, hypre_Box *set_box,
+                                            HYPRE_Int var, hypre_Box *value_box, HYPRE_Complex *values );
+HYPRE_Int hypre_SStructPVectorSetConstantValues ( hypre_SStructPVector *pvector,
+                                                  HYPRE_Complex value );
+HYPRE_Int hypre_SStructPVectorPrint ( const char *filename, hypre_SStructPVector *pvector,
+                                      HYPRE_Int all );
+HYPRE_Int hypre_SStructVectorRef ( hypre_SStructVector *vector, hypre_SStructVector **vector_ref );
+HYPRE_Int hypre_SStructVectorSetConstantValues ( hypre_SStructVector *vector, HYPRE_Complex value );
+HYPRE_Int hypre_SStructVectorConvert ( hypre_SStructVector *vector,
+                                       hypre_ParVector **parvector_ptr );
+HYPRE_Int hypre_SStructVectorParConvert ( hypre_SStructVector *vector,
+                                          hypre_ParVector **parvector_ptr );
+HYPRE_Int hypre_SStructVectorRestore ( hypre_SStructVector *vector, hypre_ParVector *parvector );
+HYPRE_Int hypre_SStructVectorParRestore ( hypre_SStructVector *vector, hypre_ParVector *parvector );
 HYPRE_Int hypre_SStructPVectorInitializeShell ( hypre_SStructPVector *pvector );
 HYPRE_Int hypre_SStructVectorInitializeShell ( hypre_SStructVector *vector );
 HYPRE_Int hypre_SStructVectorClearGhostValues ( hypre_SStructVector *vector );
+HYPRE_MemoryLocation hypre_SStructVectorMemoryLocation(hypre_SStructVector *vector);
 
 
 #ifdef __cplusplus
diff --git a/external/hypre/src/sstruct_mv/headers b/external/hypre/src/sstruct_mv/headers
old mode 100644
new mode 100755
index f33c02d7..9e07536f
--- a/external/hypre/src/sstruct_mv/headers
+++ b/external/hypre/src/sstruct_mv/headers
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/sstruct_mv/protos.h b/external/hypre/src/sstruct_mv/protos.h
index 40c78aa9..a86329ee 100644
--- a/external/hypre/src/sstruct_mv/protos.h
+++ b/external/hypre/src/sstruct_mv/protos.h
@@ -1,199 +1,326 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
  ******************************************************************************/
 
 /* HYPRE_sstruct_graph.c */
-HYPRE_Int HYPRE_SStructGraphCreate ( MPI_Comm comm , HYPRE_SStructGrid grid , HYPRE_SStructGraph *graph_ptr );
+HYPRE_Int HYPRE_SStructGraphCreate ( MPI_Comm comm, HYPRE_SStructGrid grid,
+                                     HYPRE_SStructGraph *graph_ptr );
 HYPRE_Int HYPRE_SStructGraphDestroy ( HYPRE_SStructGraph graph );
-HYPRE_Int HYPRE_SStructGraphSetDomainGrid ( HYPRE_SStructGraph graph , HYPRE_SStructGrid domain_grid );
-HYPRE_Int HYPRE_SStructGraphSetStencil ( HYPRE_SStructGraph graph , HYPRE_Int part , HYPRE_Int var , HYPRE_SStructStencil stencil );
-HYPRE_Int HYPRE_SStructGraphSetFEM ( HYPRE_SStructGraph graph , HYPRE_Int part );
-HYPRE_Int HYPRE_SStructGraphSetFEMSparsity ( HYPRE_SStructGraph graph , HYPRE_Int part , HYPRE_Int nsparse , HYPRE_Int *sparsity );
-HYPRE_Int HYPRE_SStructGraphAddEntries ( HYPRE_SStructGraph graph , HYPRE_Int part , HYPRE_Int *index , HYPRE_Int var , HYPRE_Int to_part , HYPRE_Int *to_index , HYPRE_Int to_var );
+HYPRE_Int HYPRE_SStructGraphSetDomainGrid ( HYPRE_SStructGraph graph,
+                                            HYPRE_SStructGrid domain_grid );
+HYPRE_Int HYPRE_SStructGraphSetStencil ( HYPRE_SStructGraph graph, HYPRE_Int part, HYPRE_Int var,
+                                         HYPRE_SStructStencil stencil );
+HYPRE_Int HYPRE_SStructGraphSetFEM ( HYPRE_SStructGraph graph, HYPRE_Int part );
+HYPRE_Int HYPRE_SStructGraphSetFEMSparsity ( HYPRE_SStructGraph graph, HYPRE_Int part,
+                                             HYPRE_Int nsparse, HYPRE_Int *sparsity );
+HYPRE_Int HYPRE_SStructGraphAddEntries ( HYPRE_SStructGraph graph, HYPRE_Int part, HYPRE_Int *index,
+                                         HYPRE_Int var, HYPRE_Int to_part, HYPRE_Int *to_index, HYPRE_Int to_var );
 HYPRE_Int HYPRE_SStructGraphAssemble ( HYPRE_SStructGraph graph );
-HYPRE_Int HYPRE_SStructGraphSetObjectType ( HYPRE_SStructGraph graph , HYPRE_Int type );
+HYPRE_Int HYPRE_SStructGraphSetObjectType ( HYPRE_SStructGraph graph, HYPRE_Int type );
+HYPRE_Int HYPRE_SStructGraphPrint ( FILE *file, HYPRE_SStructGraph graph );
+HYPRE_Int HYPRE_SStructGraphRead ( FILE *file, HYPRE_SStructGrid grid,
+                                   HYPRE_SStructStencil **stencils, HYPRE_SStructGraph *graph_ptr );
 
 /* HYPRE_sstruct_grid.c */
-HYPRE_Int HYPRE_SStructGridCreate ( MPI_Comm comm , HYPRE_Int ndim , HYPRE_Int nparts , HYPRE_SStructGrid *grid_ptr );
+HYPRE_Int HYPRE_SStructGridCreate ( MPI_Comm comm, HYPRE_Int ndim, HYPRE_Int nparts,
+                                    HYPRE_SStructGrid *grid_ptr );
 HYPRE_Int HYPRE_SStructGridDestroy ( HYPRE_SStructGrid grid );
-HYPRE_Int HYPRE_SStructGridSetExtents ( HYPRE_SStructGrid grid , HYPRE_Int part , HYPRE_Int *ilower , HYPRE_Int *iupper );
-HYPRE_Int HYPRE_SStructGridSetVariables ( HYPRE_SStructGrid grid , HYPRE_Int part , HYPRE_Int nvars , HYPRE_SStructVariable *vartypes );
-HYPRE_Int HYPRE_SStructGridAddVariables ( HYPRE_SStructGrid grid , HYPRE_Int part , HYPRE_Int *index , HYPRE_Int nvars , HYPRE_SStructVariable *vartypes );
-HYPRE_Int HYPRE_SStructGridSetFEMOrdering ( HYPRE_SStructGrid grid , HYPRE_Int part , HYPRE_Int *ordering );
-HYPRE_Int HYPRE_SStructGridSetNeighborPart ( HYPRE_SStructGrid grid , HYPRE_Int part , HYPRE_Int *ilower , HYPRE_Int *iupper , HYPRE_Int nbor_part , HYPRE_Int *nbor_ilower , HYPRE_Int *nbor_iupper , HYPRE_Int *index_map , HYPRE_Int *index_dir );
-HYPRE_Int HYPRE_SStructGridSetSharedPart ( HYPRE_SStructGrid grid , HYPRE_Int part , HYPRE_Int *ilower , HYPRE_Int *iupper , HYPRE_Int *offset , HYPRE_Int shared_part , HYPRE_Int *shared_ilower , HYPRE_Int *shared_iupper , HYPRE_Int *shared_offset , HYPRE_Int *index_map , HYPRE_Int *index_dir );
-HYPRE_Int HYPRE_SStructGridAddUnstructuredPart ( HYPRE_SStructGrid grid , HYPRE_Int ilower , HYPRE_Int iupper );
+HYPRE_Int HYPRE_SStructGridSetExtents ( HYPRE_SStructGrid grid, HYPRE_Int part, HYPRE_Int *ilower,
+                                        HYPRE_Int *iupper );
+HYPRE_Int HYPRE_SStructGridSetVariables ( HYPRE_SStructGrid grid, HYPRE_Int part, HYPRE_Int nvars,
+                                          HYPRE_SStructVariable *vartypes );
+HYPRE_Int HYPRE_SStructGridAddVariables ( HYPRE_SStructGrid grid, HYPRE_Int part, HYPRE_Int *index,
+                                          HYPRE_Int nvars, HYPRE_SStructVariable *vartypes );
+HYPRE_Int HYPRE_SStructGridSetFEMOrdering ( HYPRE_SStructGrid grid, HYPRE_Int part,
+                                            HYPRE_Int *ordering );
+HYPRE_Int HYPRE_SStructGridSetNeighborPart ( HYPRE_SStructGrid grid, HYPRE_Int part,
+                                             HYPRE_Int *ilower, HYPRE_Int *iupper, HYPRE_Int nbor_part, HYPRE_Int *nbor_ilower,
+                                             HYPRE_Int *nbor_iupper, HYPRE_Int *index_map, HYPRE_Int *index_dir );
+HYPRE_Int HYPRE_SStructGridSetSharedPart ( HYPRE_SStructGrid grid, HYPRE_Int part,
+                                           HYPRE_Int *ilower, HYPRE_Int *iupper, HYPRE_Int *offset, HYPRE_Int shared_part,
+                                           HYPRE_Int *shared_ilower, HYPRE_Int *shared_iupper, HYPRE_Int *shared_offset, HYPRE_Int *index_map,
+                                           HYPRE_Int *index_dir );
+HYPRE_Int HYPRE_SStructGridAddUnstructuredPart ( HYPRE_SStructGrid grid, HYPRE_Int ilower,
+                                                 HYPRE_Int iupper );
 HYPRE_Int HYPRE_SStructGridAssemble ( HYPRE_SStructGrid grid );
-HYPRE_Int HYPRE_SStructGridSetPeriodic ( HYPRE_SStructGrid grid , HYPRE_Int part , HYPRE_Int *periodic );
-HYPRE_Int HYPRE_SStructGridSetNumGhost ( HYPRE_SStructGrid grid , HYPRE_Int *num_ghost );
+HYPRE_Int HYPRE_SStructGridSetPeriodic ( HYPRE_SStructGrid grid, HYPRE_Int part,
+                                         HYPRE_Int *periodic );
+HYPRE_Int HYPRE_SStructGridSetNumGhost ( HYPRE_SStructGrid grid, HYPRE_Int *num_ghost );
 
 /* HYPRE_sstruct_matrix.c */
-HYPRE_Int HYPRE_SStructMatrixCreate ( MPI_Comm comm , HYPRE_SStructGraph graph , HYPRE_SStructMatrix *matrix_ptr );
+HYPRE_Int HYPRE_SStructMatrixCreate ( MPI_Comm comm, HYPRE_SStructGraph graph,
+                                      HYPRE_SStructMatrix *matrix_ptr );
 HYPRE_Int HYPRE_SStructMatrixDestroy ( HYPRE_SStructMatrix matrix );
 HYPRE_Int HYPRE_SStructMatrixInitialize ( HYPRE_SStructMatrix matrix );
-HYPRE_Int HYPRE_SStructMatrixSetValues ( HYPRE_SStructMatrix matrix , HYPRE_Int part , HYPRE_Int *index , HYPRE_Int var , HYPRE_Int nentries , HYPRE_Int *entries , HYPRE_Complex *values );
-HYPRE_Int HYPRE_SStructMatrixAddToValues ( HYPRE_SStructMatrix matrix , HYPRE_Int part , HYPRE_Int *index , HYPRE_Int var , HYPRE_Int nentries , HYPRE_Int *entries , HYPRE_Complex *values );
-HYPRE_Int HYPRE_SStructMatrixAddFEMValues ( HYPRE_SStructMatrix matrix , HYPRE_Int part , HYPRE_Int *index , HYPRE_Complex *values );
-HYPRE_Int HYPRE_SStructMatrixGetValues ( HYPRE_SStructMatrix matrix , HYPRE_Int part , HYPRE_Int *index , HYPRE_Int var , HYPRE_Int nentries , HYPRE_Int *entries , HYPRE_Complex *values );
-HYPRE_Int HYPRE_SStructMatrixGetFEMValues ( HYPRE_SStructMatrix matrix , HYPRE_Int part , HYPRE_Int *index , HYPRE_Complex *values );
-HYPRE_Int HYPRE_SStructMatrixSetBoxValues ( HYPRE_SStructMatrix matrix , HYPRE_Int part , HYPRE_Int *ilower , HYPRE_Int *iupper , HYPRE_Int var , HYPRE_Int nentries , HYPRE_Int *entries , HYPRE_Complex *values );
-HYPRE_Int HYPRE_SStructMatrixAddToBoxValues ( HYPRE_SStructMatrix matrix , HYPRE_Int part , HYPRE_Int *ilower , HYPRE_Int *iupper , HYPRE_Int var , HYPRE_Int nentries , HYPRE_Int *entries , HYPRE_Complex *values );
-HYPRE_Int HYPRE_SStructMatrixGetBoxValues ( HYPRE_SStructMatrix matrix , HYPRE_Int part , HYPRE_Int *ilower , HYPRE_Int *iupper , HYPRE_Int var , HYPRE_Int nentries , HYPRE_Int *entries , HYPRE_Complex *values );
+HYPRE_Int HYPRE_SStructMatrixSetValues ( HYPRE_SStructMatrix matrix, HYPRE_Int part,
+                                         HYPRE_Int *index, HYPRE_Int var, HYPRE_Int nentries, HYPRE_Int *entries, HYPRE_Complex *values );
+HYPRE_Int HYPRE_SStructMatrixAddToValues ( HYPRE_SStructMatrix matrix, HYPRE_Int part,
+                                           HYPRE_Int *index, HYPRE_Int var, HYPRE_Int nentries, HYPRE_Int *entries, HYPRE_Complex *values );
+HYPRE_Int HYPRE_SStructMatrixAddFEMValues ( HYPRE_SStructMatrix matrix, HYPRE_Int part,
+                                            HYPRE_Int *index, HYPRE_Complex *values );
+HYPRE_Int HYPRE_SStructMatrixGetValues ( HYPRE_SStructMatrix matrix, HYPRE_Int part,
+                                         HYPRE_Int *index, HYPRE_Int var, HYPRE_Int nentries, HYPRE_Int *entries, HYPRE_Complex *values );
+HYPRE_Int HYPRE_SStructMatrixGetFEMValues ( HYPRE_SStructMatrix matrix, HYPRE_Int part,
+                                            HYPRE_Int *index, HYPRE_Complex *values );
+HYPRE_Int HYPRE_SStructMatrixSetBoxValues ( HYPRE_SStructMatrix matrix, HYPRE_Int part,
+                                            HYPRE_Int *ilower, HYPRE_Int *iupper, HYPRE_Int var, HYPRE_Int nentries, HYPRE_Int *entries,
+                                            HYPRE_Complex *values );
+HYPRE_Int HYPRE_SStructMatrixAddToBoxValues ( HYPRE_SStructMatrix matrix, HYPRE_Int part,
+                                              HYPRE_Int *ilower, HYPRE_Int *iupper, HYPRE_Int var, HYPRE_Int nentries, HYPRE_Int *entries,
+                                              HYPRE_Complex *values );
+HYPRE_Int HYPRE_SStructMatrixGetBoxValues ( HYPRE_SStructMatrix matrix, HYPRE_Int part,
+                                            HYPRE_Int *ilower, HYPRE_Int *iupper, HYPRE_Int var, HYPRE_Int nentries, HYPRE_Int *entries,
+                                            HYPRE_Complex *values );
 HYPRE_Int HYPRE_SStructMatrixAssemble ( HYPRE_SStructMatrix matrix );
-HYPRE_Int HYPRE_SStructMatrixSetSymmetric ( HYPRE_SStructMatrix matrix , HYPRE_Int part , HYPRE_Int var , HYPRE_Int to_var , HYPRE_Int symmetric );
-HYPRE_Int HYPRE_SStructMatrixSetNSSymmetric ( HYPRE_SStructMatrix matrix , HYPRE_Int symmetric );
-HYPRE_Int HYPRE_SStructMatrixSetObjectType ( HYPRE_SStructMatrix matrix , HYPRE_Int type );
-HYPRE_Int HYPRE_SStructMatrixGetObject ( HYPRE_SStructMatrix matrix , void **object );
-HYPRE_Int HYPRE_SStructMatrixPrint ( const char *filename , HYPRE_SStructMatrix matrix , HYPRE_Int all );
-HYPRE_Int HYPRE_SStructMatrixMatvec ( HYPRE_Complex alpha , HYPRE_SStructMatrix A , HYPRE_SStructVector x , HYPRE_Complex beta , HYPRE_SStructVector y );
+HYPRE_Int HYPRE_SStructMatrixSetSymmetric ( HYPRE_SStructMatrix matrix, HYPRE_Int part,
+                                            HYPRE_Int var, HYPRE_Int to_var, HYPRE_Int symmetric );
+HYPRE_Int HYPRE_SStructMatrixSetNSSymmetric ( HYPRE_SStructMatrix matrix, HYPRE_Int symmetric );
+HYPRE_Int HYPRE_SStructMatrixSetObjectType ( HYPRE_SStructMatrix matrix, HYPRE_Int type );
+HYPRE_Int HYPRE_SStructMatrixGetObject ( HYPRE_SStructMatrix matrix, void **object );
+HYPRE_Int HYPRE_SStructMatrixPrint ( const char *filename, HYPRE_SStructMatrix matrix,
+                                     HYPRE_Int all );
+HYPRE_Int HYPRE_SStructMatrixRead ( MPI_Comm comm, const char *filename,
+                                    HYPRE_SStructMatrix *matrix_ptr );
+HYPRE_Int HYPRE_SStructMatrixMatvec ( HYPRE_Complex alpha, HYPRE_SStructMatrix A,
+                                      HYPRE_SStructVector x, HYPRE_Complex beta, HYPRE_SStructVector y );
 
 /* HYPRE_sstruct_stencil.c */
-HYPRE_Int HYPRE_SStructStencilCreate ( HYPRE_Int ndim , HYPRE_Int size , HYPRE_SStructStencil *stencil_ptr );
+HYPRE_Int HYPRE_SStructStencilCreate ( HYPRE_Int ndim, HYPRE_Int size,
+                                       HYPRE_SStructStencil *stencil_ptr );
 HYPRE_Int HYPRE_SStructStencilDestroy ( HYPRE_SStructStencil stencil );
-HYPRE_Int HYPRE_SStructStencilSetEntry ( HYPRE_SStructStencil stencil , HYPRE_Int entry , HYPRE_Int *offset , HYPRE_Int var );
+HYPRE_Int HYPRE_SStructStencilSetEntry ( HYPRE_SStructStencil stencil, HYPRE_Int entry,
+                                         HYPRE_Int *offset, HYPRE_Int var );
+HYPRE_Int HYPRE_SStructStencilPrint ( FILE *file, HYPRE_SStructStencil stencil );
+HYPRE_Int HYPRE_SStructStencilRead ( FILE *file, HYPRE_SStructStencil *stencil_ptr );
+
 
 /* HYPRE_sstruct_vector.c */
-HYPRE_Int HYPRE_SStructVectorCreate ( MPI_Comm comm , HYPRE_SStructGrid grid , HYPRE_SStructVector *vector_ptr );
+HYPRE_Int HYPRE_SStructVectorCreate ( MPI_Comm comm, HYPRE_SStructGrid grid,
+                                      HYPRE_SStructVector *vector_ptr );
 HYPRE_Int HYPRE_SStructVectorDestroy ( HYPRE_SStructVector vector );
 HYPRE_Int HYPRE_SStructVectorInitialize ( HYPRE_SStructVector vector );
-HYPRE_Int HYPRE_SStructVectorSetValues ( HYPRE_SStructVector vector , HYPRE_Int part , HYPRE_Int *index , HYPRE_Int var , HYPRE_Complex *value );
-HYPRE_Int HYPRE_SStructVectorAddToValues ( HYPRE_SStructVector vector , HYPRE_Int part , HYPRE_Int *index , HYPRE_Int var , HYPRE_Complex *value );
-HYPRE_Int HYPRE_SStructVectorAddFEMValues ( HYPRE_SStructVector vector , HYPRE_Int part , HYPRE_Int *index , HYPRE_Complex *values );
-HYPRE_Int HYPRE_SStructVectorGetValues ( HYPRE_SStructVector vector , HYPRE_Int part , HYPRE_Int *index , HYPRE_Int var , HYPRE_Complex *value );
-HYPRE_Int HYPRE_SStructVectorGetFEMValues ( HYPRE_SStructVector vector , HYPRE_Int part , HYPRE_Int *index , HYPRE_Complex *values );
-HYPRE_Int HYPRE_SStructVectorSetBoxValues ( HYPRE_SStructVector vector , HYPRE_Int part , HYPRE_Int *ilower , HYPRE_Int *iupper , HYPRE_Int var , HYPRE_Complex *values );
-HYPRE_Int HYPRE_SStructVectorAddToBoxValues ( HYPRE_SStructVector vector , HYPRE_Int part , HYPRE_Int *ilower , HYPRE_Int *iupper , HYPRE_Int var , HYPRE_Complex *values );
-HYPRE_Int HYPRE_SStructVectorGetBoxValues ( HYPRE_SStructVector vector , HYPRE_Int part , HYPRE_Int *ilower , HYPRE_Int *iupper , HYPRE_Int var , HYPRE_Complex *values );
+HYPRE_Int HYPRE_SStructVectorSetValues ( HYPRE_SStructVector vector, HYPRE_Int part,
+                                         HYPRE_Int *index, HYPRE_Int var, HYPRE_Complex *value );
+HYPRE_Int HYPRE_SStructVectorAddToValues ( HYPRE_SStructVector vector, HYPRE_Int part,
+                                           HYPRE_Int *index, HYPRE_Int var, HYPRE_Complex *value );
+HYPRE_Int HYPRE_SStructVectorAddFEMValues ( HYPRE_SStructVector vector, HYPRE_Int part,
+                                            HYPRE_Int *index, HYPRE_Complex *values );
+HYPRE_Int HYPRE_SStructVectorGetValues ( HYPRE_SStructVector vector, HYPRE_Int part,
+                                         HYPRE_Int *index, HYPRE_Int var, HYPRE_Complex *value );
+HYPRE_Int HYPRE_SStructVectorGetFEMValues ( HYPRE_SStructVector vector, HYPRE_Int part,
+                                            HYPRE_Int *index, HYPRE_Complex *values );
+HYPRE_Int HYPRE_SStructVectorSetBoxValues ( HYPRE_SStructVector vector, HYPRE_Int part,
+                                            HYPRE_Int *ilower, HYPRE_Int *iupper, HYPRE_Int var, HYPRE_Complex *values );
+HYPRE_Int HYPRE_SStructVectorAddToBoxValues ( HYPRE_SStructVector vector, HYPRE_Int part,
+                                              HYPRE_Int *ilower, HYPRE_Int *iupper, HYPRE_Int var, HYPRE_Complex *values );
+HYPRE_Int HYPRE_SStructVectorGetBoxValues ( HYPRE_SStructVector vector, HYPRE_Int part,
+                                            HYPRE_Int *ilower, HYPRE_Int *iupper, HYPRE_Int var, HYPRE_Complex *values );
 HYPRE_Int HYPRE_SStructVectorAssemble ( HYPRE_SStructVector vector );
 HYPRE_Int HYPRE_SStructVectorGather ( HYPRE_SStructVector vector );
-HYPRE_Int HYPRE_SStructVectorSetConstantValues ( HYPRE_SStructVector vector , HYPRE_Complex value );
-HYPRE_Int HYPRE_SStructVectorSetObjectType ( HYPRE_SStructVector vector , HYPRE_Int type );
-HYPRE_Int HYPRE_SStructVectorGetObject ( HYPRE_SStructVector vector , void **object );
-HYPRE_Int HYPRE_SStructVectorPrint ( const char *filename , HYPRE_SStructVector vector , HYPRE_Int all );
-HYPRE_Int HYPRE_SStructVectorCopy ( HYPRE_SStructVector x , HYPRE_SStructVector y );
-HYPRE_Int HYPRE_SStructVectorScale ( HYPRE_Complex alpha , HYPRE_SStructVector y );
-HYPRE_Int HYPRE_SStructInnerProd ( HYPRE_SStructVector x , HYPRE_SStructVector y , HYPRE_Real *result );
-HYPRE_Int HYPRE_SStructAxpy ( HYPRE_Complex alpha , HYPRE_SStructVector x , HYPRE_SStructVector y );
+HYPRE_Int HYPRE_SStructVectorSetConstantValues ( HYPRE_SStructVector vector, HYPRE_Complex value );
+HYPRE_Int HYPRE_SStructVectorSetObjectType ( HYPRE_SStructVector vector, HYPRE_Int type );
+HYPRE_Int HYPRE_SStructVectorGetObject ( HYPRE_SStructVector vector, void **object );
+HYPRE_Int HYPRE_SStructVectorPrint ( const char *filename, HYPRE_SStructVector vector,
+                                     HYPRE_Int all );
+HYPRE_Int HYPRE_SStructVectorRead ( MPI_Comm comm, const char *filename,
+                                    HYPRE_SStructVector *vector );
+HYPRE_Int HYPRE_SStructVectorCopy ( HYPRE_SStructVector x, HYPRE_SStructVector y );
+HYPRE_Int HYPRE_SStructVectorScale ( HYPRE_Complex alpha, HYPRE_SStructVector y );
+HYPRE_Int HYPRE_SStructInnerProd ( HYPRE_SStructVector x, HYPRE_SStructVector y,
+                                   HYPRE_Real *result );
+HYPRE_Int HYPRE_SStructAxpy ( HYPRE_Complex alpha, HYPRE_SStructVector x, HYPRE_SStructVector y );
 
 /* sstruct_axpy.c */
-HYPRE_Int hypre_SStructPAxpy ( HYPRE_Complex alpha , hypre_SStructPVector *px , hypre_SStructPVector *py );
-HYPRE_Int hypre_SStructAxpy ( HYPRE_Complex alpha , hypre_SStructVector *x , hypre_SStructVector *y );
+HYPRE_Int hypre_SStructPAxpy ( HYPRE_Complex alpha, hypre_SStructPVector *px,
+                               hypre_SStructPVector *py );
+HYPRE_Int hypre_SStructAxpy ( HYPRE_Complex alpha, hypre_SStructVector *x, hypre_SStructVector *y );
 
 /* sstruct_copy.c */
-HYPRE_Int hypre_SStructPCopy ( hypre_SStructPVector *px , hypre_SStructPVector *py );
-HYPRE_Int hypre_SStructPartialPCopy ( hypre_SStructPVector *px , hypre_SStructPVector *py , hypre_BoxArrayArray **array_boxes );
-HYPRE_Int hypre_SStructCopy ( hypre_SStructVector *x , hypre_SStructVector *y );
+HYPRE_Int hypre_SStructPCopy ( hypre_SStructPVector *px, hypre_SStructPVector *py );
+HYPRE_Int hypre_SStructPartialPCopy ( hypre_SStructPVector *px, hypre_SStructPVector *py,
+                                      hypre_BoxArrayArray **array_boxes );
+HYPRE_Int hypre_SStructCopy ( hypre_SStructVector *x, hypre_SStructVector *y );
 
 /* sstruct_graph.c */
-HYPRE_Int hypre_SStructGraphRef ( hypre_SStructGraph *graph , hypre_SStructGraph **graph_ref );
-HYPRE_Int hypre_SStructGraphGetUVEntryRank( hypre_SStructGraph *graph , HYPRE_Int part , HYPRE_Int var , hypre_Index index, HYPRE_BigInt *rank );
-HYPRE_Int hypre_SStructGraphFindBoxEndpt ( hypre_SStructGraph *graph , HYPRE_Int part , HYPRE_Int var , HYPRE_Int proc , HYPRE_Int endpt , HYPRE_Int boxi );
-HYPRE_Int hypre_SStructGraphFindSGridEndpts ( hypre_SStructGraph *graph , HYPRE_Int part , HYPRE_Int var , HYPRE_Int proc , HYPRE_Int endpt , HYPRE_Int *endpts );
+HYPRE_Int hypre_SStructGraphRef ( hypre_SStructGraph *graph, hypre_SStructGraph **graph_ref );
+HYPRE_Int hypre_SStructGraphGetUVEntryRank( hypre_SStructGraph *graph, HYPRE_Int part,
+                                            HYPRE_Int var, hypre_Index index, HYPRE_BigInt *rank );
+HYPRE_Int hypre_SStructGraphFindBoxEndpt ( hypre_SStructGraph *graph, HYPRE_Int part, HYPRE_Int var,
+                                           HYPRE_Int proc, HYPRE_Int endpt, HYPRE_Int boxi );
+HYPRE_Int hypre_SStructGraphFindSGridEndpts ( hypre_SStructGraph *graph, HYPRE_Int part,
+                                              HYPRE_Int var, HYPRE_Int proc, HYPRE_Int endpt, HYPRE_Int *endpts );
 
 /* sstruct_grid.c */
-HYPRE_Int hypre_SStructVariableGetOffset ( HYPRE_SStructVariable vartype , HYPRE_Int ndim , hypre_Index varoffset );
-HYPRE_Int hypre_SStructPGridCreate ( MPI_Comm comm , HYPRE_Int ndim , hypre_SStructPGrid **pgrid_ptr );
+HYPRE_Int hypre_SStructVariableGetOffset ( HYPRE_SStructVariable vartype, HYPRE_Int ndim,
+                                           hypre_Index varoffset );
+HYPRE_Int hypre_SStructPGridCreate ( MPI_Comm comm, HYPRE_Int ndim,
+                                     hypre_SStructPGrid **pgrid_ptr );
 HYPRE_Int hypre_SStructPGridDestroy ( hypre_SStructPGrid *pgrid );
-HYPRE_Int hypre_SStructPGridSetExtents ( hypre_SStructPGrid *pgrid , hypre_Index ilower , hypre_Index iupper );
-HYPRE_Int hypre_SStructPGridSetCellSGrid ( hypre_SStructPGrid *pgrid , hypre_StructGrid *cell_sgrid );
-HYPRE_Int hypre_SStructPGridSetVariables ( hypre_SStructPGrid *pgrid , HYPRE_Int nvars , HYPRE_SStructVariable *vartypes );
-HYPRE_Int hypre_SStructPGridSetPNeighbor ( hypre_SStructPGrid *pgrid , hypre_Box *pneighbor_box , hypre_Index pnbor_offset );
+HYPRE_Int hypre_SStructPGridSetExtents ( hypre_SStructPGrid *pgrid, hypre_Index ilower,
+                                         hypre_Index iupper );
+HYPRE_Int hypre_SStructPGridSetCellSGrid ( hypre_SStructPGrid *pgrid,
+                                           hypre_StructGrid *cell_sgrid );
+HYPRE_Int hypre_SStructPGridSetVariables ( hypre_SStructPGrid *pgrid, HYPRE_Int nvars,
+                                           HYPRE_SStructVariable *vartypes );
+HYPRE_Int hypre_SStructPGridSetPNeighbor ( hypre_SStructPGrid *pgrid, hypre_Box *pneighbor_box,
+                                           hypre_Index pnbor_offset );
 HYPRE_Int hypre_SStructPGridAssemble ( hypre_SStructPGrid *pgrid );
-HYPRE_Int hypre_SStructGridRef ( hypre_SStructGrid *grid , hypre_SStructGrid **grid_ref );
+HYPRE_Int hypre_SStructPGridGetMaxBoxSize ( hypre_SStructPGrid *pgrid );
+HYPRE_Int hypre_SStructGridRef ( hypre_SStructGrid *grid, hypre_SStructGrid **grid_ref );
 HYPRE_Int hypre_SStructGridAssembleBoxManagers ( hypre_SStructGrid *grid );
 HYPRE_Int hypre_SStructGridAssembleNborBoxManagers ( hypre_SStructGrid *grid );
 HYPRE_Int hypre_SStructGridCreateCommInfo ( hypre_SStructGrid *grid );
-HYPRE_Int hypre_SStructGridFindBoxManEntry ( hypre_SStructGrid *grid , HYPRE_Int part , hypre_Index index , HYPRE_Int var , hypre_BoxManEntry **entry_ptr );
-HYPRE_Int hypre_SStructGridFindNborBoxManEntry ( hypre_SStructGrid *grid , HYPRE_Int part , hypre_Index index , HYPRE_Int var , hypre_BoxManEntry **entry_ptr );
-HYPRE_Int hypre_SStructGridBoxProcFindBoxManEntry ( hypre_SStructGrid *grid , HYPRE_Int part , HYPRE_Int var , HYPRE_Int box , HYPRE_Int proc , hypre_BoxManEntry **entry_ptr );
-HYPRE_Int hypre_SStructBoxManEntryGetCSRstrides ( hypre_BoxManEntry *entry , hypre_Index strides );
-HYPRE_Int hypre_SStructBoxManEntryGetGhstrides ( hypre_BoxManEntry *entry , hypre_Index strides );
-HYPRE_Int hypre_SStructBoxManEntryGetGlobalCSRank ( hypre_BoxManEntry *entry , hypre_Index index , HYPRE_BigInt *rank_ptr );
-HYPRE_Int hypre_SStructBoxManEntryGetGlobalGhrank ( hypre_BoxManEntry *entry , hypre_Index index , HYPRE_BigInt *rank_ptr );
-HYPRE_Int hypre_SStructBoxManEntryGetProcess ( hypre_BoxManEntry *entry , HYPRE_Int *proc_ptr );
-HYPRE_Int hypre_SStructBoxManEntryGetBoxnum ( hypre_BoxManEntry *entry , HYPRE_Int *id_ptr );
-HYPRE_Int hypre_SStructBoxManEntryGetPart ( hypre_BoxManEntry *entry , HYPRE_Int part , HYPRE_Int *part_ptr );
-HYPRE_Int hypre_SStructIndexToNborIndex( hypre_Index index , hypre_Index root , hypre_Index nbor_root , hypre_Index coord , hypre_Index dir , HYPRE_Int ndim , hypre_Index nbor_index );
-HYPRE_Int hypre_SStructBoxToNborBox ( hypre_Box *box , hypre_Index root , hypre_Index nbor_root , hypre_Index coord , hypre_Index dir );
-HYPRE_Int hypre_SStructNborIndexToIndex( hypre_Index nbor_index , hypre_Index root , hypre_Index nbor_root , hypre_Index coord , hypre_Index dir , HYPRE_Int ndim , hypre_Index index );
-HYPRE_Int hypre_SStructNborBoxToBox ( hypre_Box *nbor_box , hypre_Index root , hypre_Index nbor_root , hypre_Index coord , hypre_Index dir );
-HYPRE_Int hypre_SStructVarToNborVar ( hypre_SStructGrid *grid , HYPRE_Int part , HYPRE_Int var , HYPRE_Int *coord , HYPRE_Int *nbor_var_ptr );
-HYPRE_Int hypre_SStructGridSetNumGhost ( hypre_SStructGrid *grid , HYPRE_Int *num_ghost );
-HYPRE_Int hypre_SStructBoxManEntryGetGlobalRank ( hypre_BoxManEntry *entry , hypre_Index index , HYPRE_BigInt *rank_ptr , HYPRE_Int type );
-HYPRE_Int hypre_SStructBoxManEntryGetStrides ( hypre_BoxManEntry *entry , hypre_Index strides , HYPRE_Int type );
-HYPRE_Int hypre_SStructBoxNumMap ( hypre_SStructGrid *grid , HYPRE_Int part , HYPRE_Int boxnum , HYPRE_Int **num_varboxes_ptr , HYPRE_Int ***map_ptr );
-HYPRE_Int hypre_SStructCellGridBoxNumMap ( hypre_SStructGrid *grid , HYPRE_Int part , HYPRE_Int ***num_varboxes_ptr , HYPRE_Int ****map_ptr );
-HYPRE_Int hypre_SStructCellBoxToVarBox ( hypre_Box *box , hypre_Index offset , hypre_Index varoffset , HYPRE_Int *valid );
-HYPRE_Int hypre_SStructGridIntersect ( hypre_SStructGrid *grid , HYPRE_Int part , HYPRE_Int var , hypre_Box *box , HYPRE_Int action , hypre_BoxManEntry ***entries_ptr , HYPRE_Int *nentries_ptr );
+HYPRE_Int hypre_SStructGridFindBoxManEntry ( hypre_SStructGrid *grid, HYPRE_Int part,
+                                             hypre_Index index, HYPRE_Int var, hypre_BoxManEntry **entry_ptr );
+HYPRE_Int hypre_SStructGridFindNborBoxManEntry ( hypre_SStructGrid *grid, HYPRE_Int part,
+                                                 hypre_Index index, HYPRE_Int var, hypre_BoxManEntry **entry_ptr );
+HYPRE_Int hypre_SStructGridBoxProcFindBoxManEntry ( hypre_SStructGrid *grid, HYPRE_Int part,
+                                                    HYPRE_Int var, HYPRE_Int box, HYPRE_Int proc, hypre_BoxManEntry **entry_ptr );
+HYPRE_Int hypre_SStructBoxManEntryGetCSRstrides ( hypre_BoxManEntry *entry, hypre_Index strides );
+HYPRE_Int hypre_SStructBoxManEntryGetGhstrides ( hypre_BoxManEntry *entry, hypre_Index strides );
+HYPRE_Int hypre_SStructBoxManEntryGetGlobalCSRank ( hypre_BoxManEntry *entry, hypre_Index index,
+                                                    HYPRE_BigInt *rank_ptr );
+HYPRE_Int hypre_SStructBoxManEntryGetGlobalGhrank ( hypre_BoxManEntry *entry, hypre_Index index,
+                                                    HYPRE_BigInt *rank_ptr );
+HYPRE_Int hypre_SStructBoxManEntryGetProcess ( hypre_BoxManEntry *entry, HYPRE_Int *proc_ptr );
+HYPRE_Int hypre_SStructBoxManEntryGetBoxnum ( hypre_BoxManEntry *entry, HYPRE_Int *id_ptr );
+HYPRE_Int hypre_SStructBoxManEntryGetPart ( hypre_BoxManEntry *entry, HYPRE_Int part,
+                                            HYPRE_Int *part_ptr );
+HYPRE_Int hypre_SStructIndexToNborIndex( hypre_Index index, hypre_Index root, hypre_Index nbor_root,
+                                         hypre_Index coord, hypre_Index dir, HYPRE_Int ndim, hypre_Index nbor_index );
+HYPRE_Int hypre_SStructBoxToNborBox ( hypre_Box *box, hypre_Index root, hypre_Index nbor_root,
+                                      hypre_Index coord, hypre_Index dir );
+HYPRE_Int hypre_SStructNborIndexToIndex( hypre_Index nbor_index, hypre_Index root,
+                                         hypre_Index nbor_root, hypre_Index coord, hypre_Index dir, HYPRE_Int ndim, hypre_Index index );
+HYPRE_Int hypre_SStructNborBoxToBox ( hypre_Box *nbor_box, hypre_Index root, hypre_Index nbor_root,
+                                      hypre_Index coord, hypre_Index dir );
+HYPRE_Int hypre_SStructVarToNborVar ( hypre_SStructGrid *grid, HYPRE_Int part, HYPRE_Int var,
+                                      HYPRE_Int *coord, HYPRE_Int *nbor_var_ptr );
+HYPRE_Int hypre_SStructGridSetNumGhost ( hypre_SStructGrid *grid, HYPRE_Int *num_ghost );
+HYPRE_Int hypre_SStructBoxManEntryGetGlobalRank ( hypre_BoxManEntry *entry, hypre_Index index,
+                                                  HYPRE_BigInt *rank_ptr, HYPRE_Int type );
+HYPRE_Int hypre_SStructBoxManEntryGetStrides ( hypre_BoxManEntry *entry, hypre_Index strides,
+                                               HYPRE_Int type );
+HYPRE_Int hypre_SStructBoxNumMap ( hypre_SStructGrid *grid, HYPRE_Int part, HYPRE_Int boxnum,
+                                   HYPRE_Int **num_varboxes_ptr, HYPRE_Int ***map_ptr );
+HYPRE_Int hypre_SStructCellGridBoxNumMap ( hypre_SStructGrid *grid, HYPRE_Int part,
+                                           HYPRE_Int ***num_varboxes_ptr, HYPRE_Int ****map_ptr );
+HYPRE_Int hypre_SStructCellBoxToVarBox ( hypre_Box *box, hypre_Index offset, hypre_Index varoffset,
+                                         HYPRE_Int *valid );
+HYPRE_Int hypre_SStructGridIntersect ( hypre_SStructGrid *grid, HYPRE_Int part, HYPRE_Int var,
+                                       hypre_Box *box, HYPRE_Int action, hypre_BoxManEntry ***entries_ptr, HYPRE_Int *nentries_ptr );
+HYPRE_Int hypre_SStructGridGetMaxBoxSize ( hypre_SStructGrid *grid );
+HYPRE_Int hypre_SStructGridPrint ( FILE *file, hypre_SStructGrid *grid );
+HYPRE_Int hypre_SStructGridRead ( MPI_Comm comm, FILE *file, hypre_SStructGrid **grid_ptr );
 
 /* sstruct_innerprod.c */
-HYPRE_Int hypre_SStructPInnerProd ( hypre_SStructPVector *px , hypre_SStructPVector *py , HYPRE_Real *presult_ptr );
-HYPRE_Int hypre_SStructInnerProd ( hypre_SStructVector *x , hypre_SStructVector *y , HYPRE_Real *result_ptr );
+HYPRE_Int hypre_SStructPInnerProd ( hypre_SStructPVector *px, hypre_SStructPVector *py,
+                                    HYPRE_Real *presult_ptr );
+HYPRE_Int hypre_SStructInnerProd ( hypre_SStructVector *x, hypre_SStructVector *y,
+                                   HYPRE_Real *result_ptr );
 
 /* sstruct_matrix.c */
-HYPRE_Int hypre_SStructPMatrixRef ( hypre_SStructPMatrix *matrix , hypre_SStructPMatrix **matrix_ref );
-HYPRE_Int hypre_SStructPMatrixCreate ( MPI_Comm comm , hypre_SStructPGrid *pgrid , hypre_SStructStencil **stencils , hypre_SStructPMatrix **pmatrix_ptr );
+HYPRE_Int hypre_SStructPMatrixRef ( hypre_SStructPMatrix *matrix,
+                                    hypre_SStructPMatrix **matrix_ref );
+HYPRE_Int hypre_SStructPMatrixCreate ( MPI_Comm comm, hypre_SStructPGrid *pgrid,
+                                       hypre_SStructStencil **stencils, hypre_SStructPMatrix **pmatrix_ptr );
 HYPRE_Int hypre_SStructPMatrixDestroy ( hypre_SStructPMatrix *pmatrix );
 HYPRE_Int hypre_SStructPMatrixInitialize ( hypre_SStructPMatrix *pmatrix );
-HYPRE_Int hypre_SStructPMatrixSetValues ( hypre_SStructPMatrix *pmatrix , hypre_Index index , HYPRE_Int var , HYPRE_Int nentries , HYPRE_Int *entries , HYPRE_Complex *values , HYPRE_Int action );
-HYPRE_Int hypre_SStructPMatrixSetBoxValues( hypre_SStructPMatrix *pmatrix , hypre_Box *set_box , HYPRE_Int var , HYPRE_Int nentries , HYPRE_Int *entries , hypre_Box *value_box , HYPRE_Complex *values , HYPRE_Int action );
+HYPRE_Int hypre_SStructPMatrixSetValues ( hypre_SStructPMatrix *pmatrix, hypre_Index index,
+                                          HYPRE_Int var, HYPRE_Int nentries, HYPRE_Int *entries, HYPRE_Complex *values, HYPRE_Int action );
+HYPRE_Int hypre_SStructPMatrixSetBoxValues( hypre_SStructPMatrix *pmatrix, hypre_Box *set_box,
+                                            HYPRE_Int var, HYPRE_Int nentries, HYPRE_Int *entries, hypre_Box *value_box, HYPRE_Complex *values,
+                                            HYPRE_Int action );
 HYPRE_Int hypre_SStructPMatrixAccumulate ( hypre_SStructPMatrix *pmatrix );
 HYPRE_Int hypre_SStructPMatrixAssemble ( hypre_SStructPMatrix *pmatrix );
-HYPRE_Int hypre_SStructPMatrixSetSymmetric ( hypre_SStructPMatrix *pmatrix , HYPRE_Int var , HYPRE_Int to_var , HYPRE_Int symmetric );
-HYPRE_Int hypre_SStructPMatrixPrint ( const char *filename , hypre_SStructPMatrix *pmatrix , HYPRE_Int all );
+HYPRE_Int hypre_SStructPMatrixSetSymmetric ( hypre_SStructPMatrix *pmatrix, HYPRE_Int var,
+                                             HYPRE_Int to_var, HYPRE_Int symmetric );
+HYPRE_Int hypre_SStructPMatrixPrint ( const char *filename, hypre_SStructPMatrix *pmatrix,
+                                      HYPRE_Int all );
 HYPRE_Int hypre_SStructUMatrixInitialize ( hypre_SStructMatrix *matrix );
-HYPRE_Int hypre_SStructUMatrixSetValues ( hypre_SStructMatrix *matrix , HYPRE_Int part , hypre_Index index , HYPRE_Int var , HYPRE_Int nentries , HYPRE_Int *entries , HYPRE_Complex *values , HYPRE_Int action );
-HYPRE_Int hypre_SStructUMatrixSetBoxValues( hypre_SStructMatrix *matrix , HYPRE_Int part , hypre_Box *set_box , HYPRE_Int var , HYPRE_Int nentries , HYPRE_Int *entries , hypre_Box *value_box , HYPRE_Complex *values , HYPRE_Int action );
+HYPRE_Int hypre_SStructUMatrixSetValues ( hypre_SStructMatrix *matrix, HYPRE_Int part,
+                                          hypre_Index index, HYPRE_Int var, HYPRE_Int nentries, HYPRE_Int *entries, HYPRE_Complex *values,
+                                          HYPRE_Int action );
+HYPRE_Int hypre_SStructUMatrixSetBoxValues( hypre_SStructMatrix *matrix, HYPRE_Int part,
+                                            hypre_Box *set_box, HYPRE_Int var, HYPRE_Int nentries, HYPRE_Int *entries, hypre_Box *value_box,
+                                            HYPRE_Complex *values, HYPRE_Int action );
 HYPRE_Int hypre_SStructUMatrixAssemble ( hypre_SStructMatrix *matrix );
-HYPRE_Int hypre_SStructMatrixRef ( hypre_SStructMatrix *matrix , hypre_SStructMatrix **matrix_ref );
-HYPRE_Int hypre_SStructMatrixSplitEntries ( hypre_SStructMatrix *matrix , HYPRE_Int part , HYPRE_Int var , HYPRE_Int nentries , HYPRE_Int *entries , HYPRE_Int *nSentries_ptr , HYPRE_Int **Sentries_ptr , HYPRE_Int *nUentries_ptr , HYPRE_Int **Uentries_ptr );
-HYPRE_Int hypre_SStructMatrixSetValues ( HYPRE_SStructMatrix matrix , HYPRE_Int part , HYPRE_Int *index , HYPRE_Int var , HYPRE_Int nentries , HYPRE_Int *entries , HYPRE_Complex *values , HYPRE_Int action );
-HYPRE_Int hypre_SStructMatrixSetBoxValues( HYPRE_SStructMatrix matrix , HYPRE_Int part , hypre_Box *set_box , HYPRE_Int var , HYPRE_Int nentries , HYPRE_Int *entries , hypre_Box *value_box , HYPRE_Complex *values , HYPRE_Int action );
-HYPRE_Int hypre_SStructMatrixSetInterPartValues( HYPRE_SStructMatrix matrix , HYPRE_Int part , hypre_Box *set_box , HYPRE_Int var , HYPRE_Int nentries , HYPRE_Int *entries , hypre_Box *value_box , HYPRE_Complex *values , HYPRE_Int action );
+HYPRE_Int hypre_SStructMatrixRef ( hypre_SStructMatrix *matrix, hypre_SStructMatrix **matrix_ref );
+HYPRE_Int hypre_SStructMatrixSplitEntries ( hypre_SStructMatrix *matrix, HYPRE_Int part,
+                                            HYPRE_Int var, HYPRE_Int nentries, HYPRE_Int *entries, HYPRE_Int *nSentries_ptr,
+                                            HYPRE_Int **Sentries_ptr, HYPRE_Int *nUentries_ptr, HYPRE_Int **Uentries_ptr );
+HYPRE_Int hypre_SStructMatrixSetValues ( HYPRE_SStructMatrix matrix, HYPRE_Int part,
+                                         HYPRE_Int *index, HYPRE_Int var, HYPRE_Int nentries, HYPRE_Int *entries, HYPRE_Complex *values,
+                                         HYPRE_Int action );
+HYPRE_Int hypre_SStructMatrixSetBoxValues( HYPRE_SStructMatrix matrix, HYPRE_Int part,
+                                           hypre_Box *set_box, HYPRE_Int var, HYPRE_Int nentries, HYPRE_Int *entries, hypre_Box *value_box,
+                                           HYPRE_Complex *values, HYPRE_Int action );
+HYPRE_Int hypre_SStructMatrixSetInterPartValues( HYPRE_SStructMatrix matrix, HYPRE_Int part,
+                                                 hypre_Box *set_box, HYPRE_Int var, HYPRE_Int nentries, HYPRE_Int *entries, hypre_Box *value_box,
+                                                 HYPRE_Complex *values, HYPRE_Int action );
+HYPRE_MemoryLocation hypre_SStructMatrixMemoryLocation(hypre_SStructMatrix *matrix);
 
 /* sstruct_matvec.c */
 HYPRE_Int hypre_SStructPMatvecCreate ( void **pmatvec_vdata_ptr );
-HYPRE_Int hypre_SStructPMatvecSetup ( void *pmatvec_vdata , hypre_SStructPMatrix *pA , hypre_SStructPVector *px );
-HYPRE_Int hypre_SStructPMatvecCompute ( void *pmatvec_vdata , HYPRE_Complex alpha , hypre_SStructPMatrix *pA , hypre_SStructPVector *px , HYPRE_Complex beta , hypre_SStructPVector *py );
+HYPRE_Int hypre_SStructPMatvecSetup ( void *pmatvec_vdata, hypre_SStructPMatrix *pA,
+                                      hypre_SStructPVector *px );
+HYPRE_Int hypre_SStructPMatvecCompute ( void *pmatvec_vdata, HYPRE_Complex alpha,
+                                        hypre_SStructPMatrix *pA, hypre_SStructPVector *px, HYPRE_Complex beta, hypre_SStructPVector *py );
 HYPRE_Int hypre_SStructPMatvecDestroy ( void *pmatvec_vdata );
-HYPRE_Int hypre_SStructPMatvec ( HYPRE_Complex alpha , hypre_SStructPMatrix *pA , hypre_SStructPVector *px , HYPRE_Complex beta , hypre_SStructPVector *py );
+HYPRE_Int hypre_SStructPMatvec ( HYPRE_Complex alpha, hypre_SStructPMatrix *pA,
+                                 hypre_SStructPVector *px, HYPRE_Complex beta, hypre_SStructPVector *py );
 HYPRE_Int hypre_SStructMatvecCreate ( void **matvec_vdata_ptr );
-HYPRE_Int hypre_SStructMatvecSetup ( void *matvec_vdata , hypre_SStructMatrix *A , hypre_SStructVector *x );
-HYPRE_Int hypre_SStructMatvecCompute ( void *matvec_vdata , HYPRE_Complex alpha , hypre_SStructMatrix *A , hypre_SStructVector *x , HYPRE_Complex beta , hypre_SStructVector *y );
+HYPRE_Int hypre_SStructMatvecSetup ( void *matvec_vdata, hypre_SStructMatrix *A,
+                                     hypre_SStructVector *x );
+HYPRE_Int hypre_SStructMatvecCompute ( void *matvec_vdata, HYPRE_Complex alpha,
+                                       hypre_SStructMatrix *A, hypre_SStructVector *x, HYPRE_Complex beta, hypre_SStructVector *y );
 HYPRE_Int hypre_SStructMatvecDestroy ( void *matvec_vdata );
-HYPRE_Int hypre_SStructMatvec ( HYPRE_Complex alpha , hypre_SStructMatrix *A , hypre_SStructVector *x , HYPRE_Complex beta , hypre_SStructVector *y );
+HYPRE_Int hypre_SStructMatvec ( HYPRE_Complex alpha, hypre_SStructMatrix *A, hypre_SStructVector *x,
+                                HYPRE_Complex beta, hypre_SStructVector *y );
 
 /* sstruct_scale.c */
-HYPRE_Int hypre_SStructPScale ( HYPRE_Complex alpha , hypre_SStructPVector *py );
-HYPRE_Int hypre_SStructScale ( HYPRE_Complex alpha , hypre_SStructVector *y );
+HYPRE_Int hypre_SStructPScale ( HYPRE_Complex alpha, hypre_SStructPVector *py );
+HYPRE_Int hypre_SStructScale ( HYPRE_Complex alpha, hypre_SStructVector *y );
 
 /* sstruct_stencil.c */
-HYPRE_Int hypre_SStructStencilRef ( hypre_SStructStencil *stencil , hypre_SStructStencil **stencil_ref );
+HYPRE_Int hypre_SStructStencilRef ( hypre_SStructStencil *stencil,
+                                    hypre_SStructStencil **stencil_ref );
 
 /* sstruct_vector.c */
-HYPRE_Int hypre_SStructPVectorRef ( hypre_SStructPVector *vector , hypre_SStructPVector **vector_ref );
-HYPRE_Int hypre_SStructPVectorCreate ( MPI_Comm comm , hypre_SStructPGrid *pgrid , hypre_SStructPVector **pvector_ptr );
+HYPRE_Int hypre_SStructPVectorRef ( hypre_SStructPVector *vector,
+                                    hypre_SStructPVector **vector_ref );
+HYPRE_Int hypre_SStructPVectorCreate ( MPI_Comm comm, hypre_SStructPGrid *pgrid,
+                                       hypre_SStructPVector **pvector_ptr );
 HYPRE_Int hypre_SStructPVectorDestroy ( hypre_SStructPVector *pvector );
 HYPRE_Int hypre_SStructPVectorInitialize ( hypre_SStructPVector *pvector );
-HYPRE_Int hypre_SStructPVectorSetValues ( hypre_SStructPVector *pvector , hypre_Index index , HYPRE_Int var , HYPRE_Complex *value , HYPRE_Int action );
-HYPRE_Int hypre_SStructPVectorSetBoxValues( hypre_SStructPVector *pvector , hypre_Box *set_box , HYPRE_Int var , hypre_Box *value_box , HYPRE_Complex *values , HYPRE_Int action );
+HYPRE_Int hypre_SStructPVectorSetValues ( hypre_SStructPVector *pvector, hypre_Index index,
+                                          HYPRE_Int var, HYPRE_Complex *value, HYPRE_Int action );
+HYPRE_Int hypre_SStructPVectorSetBoxValues( hypre_SStructPVector *pvector, hypre_Box *set_box,
+                                            HYPRE_Int var, hypre_Box *value_box, HYPRE_Complex *values, HYPRE_Int action );
 HYPRE_Int hypre_SStructPVectorAccumulate ( hypre_SStructPVector *pvector );
 HYPRE_Int hypre_SStructPVectorAssemble ( hypre_SStructPVector *pvector );
 HYPRE_Int hypre_SStructPVectorGather ( hypre_SStructPVector *pvector );
-HYPRE_Int hypre_SStructPVectorGetValues ( hypre_SStructPVector *pvector , hypre_Index index , HYPRE_Int var , HYPRE_Complex *value );
-HYPRE_Int hypre_SStructPVectorGetBoxValues( hypre_SStructPVector *pvector , hypre_Box *set_box , HYPRE_Int var , hypre_Box *value_box , HYPRE_Complex *values );
-HYPRE_Int hypre_SStructPVectorSetConstantValues ( hypre_SStructPVector *pvector , HYPRE_Complex value );
-HYPRE_Int hypre_SStructPVectorPrint ( const char *filename , hypre_SStructPVector *pvector , HYPRE_Int all );
-HYPRE_Int hypre_SStructVectorRef ( hypre_SStructVector *vector , hypre_SStructVector **vector_ref );
-HYPRE_Int hypre_SStructVectorSetConstantValues ( hypre_SStructVector *vector , HYPRE_Complex value );
-HYPRE_Int hypre_SStructVectorConvert ( hypre_SStructVector *vector , hypre_ParVector **parvector_ptr );
-HYPRE_Int hypre_SStructVectorParConvert ( hypre_SStructVector *vector , hypre_ParVector **parvector_ptr );
-HYPRE_Int hypre_SStructVectorRestore ( hypre_SStructVector *vector , hypre_ParVector *parvector );
-HYPRE_Int hypre_SStructVectorParRestore ( hypre_SStructVector *vector , hypre_ParVector *parvector );
+HYPRE_Int hypre_SStructPVectorGetValues ( hypre_SStructPVector *pvector, hypre_Index index,
+                                          HYPRE_Int var, HYPRE_Complex *value );
+HYPRE_Int hypre_SStructPVectorGetBoxValues( hypre_SStructPVector *pvector, hypre_Box *set_box,
+                                            HYPRE_Int var, hypre_Box *value_box, HYPRE_Complex *values );
+HYPRE_Int hypre_SStructPVectorSetConstantValues ( hypre_SStructPVector *pvector,
+                                                  HYPRE_Complex value );
+HYPRE_Int hypre_SStructPVectorPrint ( const char *filename, hypre_SStructPVector *pvector,
+                                      HYPRE_Int all );
+HYPRE_Int hypre_SStructVectorRef ( hypre_SStructVector *vector, hypre_SStructVector **vector_ref );
+HYPRE_Int hypre_SStructVectorSetConstantValues ( hypre_SStructVector *vector, HYPRE_Complex value );
+HYPRE_Int hypre_SStructVectorConvert ( hypre_SStructVector *vector,
+                                       hypre_ParVector **parvector_ptr );
+HYPRE_Int hypre_SStructVectorParConvert ( hypre_SStructVector *vector,
+                                          hypre_ParVector **parvector_ptr );
+HYPRE_Int hypre_SStructVectorRestore ( hypre_SStructVector *vector, hypre_ParVector *parvector );
+HYPRE_Int hypre_SStructVectorParRestore ( hypre_SStructVector *vector, hypre_ParVector *parvector );
 HYPRE_Int hypre_SStructPVectorInitializeShell ( hypre_SStructPVector *pvector );
 HYPRE_Int hypre_SStructVectorInitializeShell ( hypre_SStructVector *vector );
 HYPRE_Int hypre_SStructVectorClearGhostValues ( hypre_SStructVector *vector );
+HYPRE_MemoryLocation hypre_SStructVectorMemoryLocation(hypre_SStructVector *vector);
 
diff --git a/external/hypre/src/sstruct_mv/sstruct_axpy.c b/external/hypre/src/sstruct_mv/sstruct_axpy.c
index c08bc6c1..3991ab83 100644
--- a/external/hypre/src/sstruct_mv/sstruct_axpy.c
+++ b/external/hypre/src/sstruct_mv/sstruct_axpy.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -47,9 +47,9 @@ hypre_SStructAxpy( HYPRE_Complex        alpha,
    HYPRE_Int nparts = hypre_SStructVectorNParts(x);
    HYPRE_Int part;
 
-   HYPRE_Int    x_object_type= hypre_SStructVectorObjectType(x);
-   HYPRE_Int    y_object_type= hypre_SStructVectorObjectType(y);
-                                                                                                                     
+   HYPRE_Int    x_object_type = hypre_SStructVectorObjectType(x);
+   HYPRE_Int    y_object_type = hypre_SStructVectorObjectType(y);
+
    if (x_object_type != y_object_type)
    {
       hypre_error_in_arg(2);
diff --git a/external/hypre/src/sstruct_mv/sstruct_copy.c b/external/hypre/src/sstruct_mv/sstruct_copy.c
index d3dcefa8..eab9d41d 100644
--- a/external/hypre/src/sstruct_mv/sstruct_copy.c
+++ b/external/hypre/src/sstruct_mv/sstruct_copy.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -49,7 +49,7 @@ hypre_SStructPartialPCopy( hypre_SStructPVector *px,
 
    for (var = 0; var < nvars; var++)
    {
-      boxes= array_boxes[var];
+      boxes = array_boxes[var];
       hypre_StructPartialCopy(hypre_SStructPVectorSVector(px, var),
                               hypre_SStructPVectorSVector(py, var),
                               boxes);
@@ -69,8 +69,8 @@ hypre_SStructCopy( hypre_SStructVector *x,
    HYPRE_Int nparts = hypre_SStructVectorNParts(x);
    HYPRE_Int part;
 
-   HYPRE_Int x_object_type= hypre_SStructVectorObjectType(x);
-   HYPRE_Int y_object_type= hypre_SStructVectorObjectType(y);
+   HYPRE_Int x_object_type = hypre_SStructVectorObjectType(x);
+   HYPRE_Int y_object_type = hypre_SStructVectorObjectType(y);
 
    if (x_object_type != y_object_type)
    {
diff --git a/external/hypre/src/sstruct_mv/sstruct_graph.c b/external/hypre/src/sstruct_mv/sstruct_graph.c
index 9930a56e..aee1823f 100644
--- a/external/hypre/src/sstruct_mv/sstruct_graph.c
+++ b/external/hypre/src/sstruct_mv/sstruct_graph.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -57,8 +57,8 @@ hypre_SStructGraphGetUVEntryRank( hypre_SStructGraph    *graph,
       found = 1;
       for (d = 0; d < ndim; d++)
       {
-         if ( (hypre_IndexD(index, d) < (hypre_BoxIMinD(box, d)-1)) ||
-              (hypre_IndexD(index, d) > (hypre_BoxIMaxD(box, d)+1)) )
+         if ( (hypre_IndexD(index, d) < (hypre_BoxIMinD(box, d) - 1)) ||
+              (hypre_IndexD(index, d) > (hypre_BoxIMaxD(box, d) + 1)) )
          {
             /* not in this box */
             found = 0;
@@ -68,10 +68,10 @@ hypre_SStructGraphGetUVEntryRank( hypre_SStructGraph    *graph,
       if (found)
       {
          vol = 0;
-         for (d = (ndim-1); d > -1; d--)
+         for (d = (ndim - 1); d > -1; d--)
          {
-            vol = vol*(hypre_BoxSizeD(box, d) + 2) +
-               (hypre_IndexD(index, d) - hypre_BoxIMinD(box, d) + 1);
+            vol = vol * (hypre_BoxSizeD(box, d) + 2) +
+                  (hypre_IndexD(index, d) - hypre_BoxIMinD(box, d) + 1);
          }
          *rank += (HYPRE_BigInt)vol;
          return hypre_error_flag;
@@ -120,32 +120,32 @@ hypre_SStructGraphFindBoxEndpt(hypre_SStructGraph    *graph,
 
    /* Should we be checking the neighbor box manager also ?*/
 
-   boxman= hypre_SStructGridBoxManager(grid, part, var);
+   boxman = hypre_SStructGridBoxManager(grid, part, var);
    hypre_BoxManGetEntry(boxman, proc, boxi, &boxman_entry);
 
-   sgrid= hypre_SStructPGridSGrid(hypre_SStructGridPGrid(grid, part), var);
+   sgrid = hypre_SStructPGridSGrid(hypre_SStructGridPGrid(grid, part), var);
    box  = hypre_StructGridBox(sgrid, boxi);
 
    /* get the global rank of the endpt corner of box boxi */
    if (endpt < 1)
    {
-       hypre_SStructBoxManEntryGetGlobalRank(
-          boxman_entry, hypre_BoxIMin(box), &rank, type);
+      hypre_SStructBoxManEntryGetGlobalRank(
+         boxman_entry, hypre_BoxIMin(box), &rank, type);
    }
 
    else
    {
-       hypre_SStructBoxManEntryGetGlobalRank(
-          boxman_entry, hypre_BoxIMax(box), &rank, type);
+      hypre_SStructBoxManEntryGetGlobalRank(
+         boxman_entry, hypre_BoxIMax(box), &rank, type);
    }
 
    if (type == HYPRE_SSTRUCT || type ==  HYPRE_STRUCT)
    {
-    rank -= hypre_SStructGridGhstartRank(grid);
+      rank -= hypre_SStructGridGhstartRank(grid);
    }
    if (type == HYPRE_PARCSR)
    {
-    rank -= hypre_SStructGridStartRank(grid);
+      rank -= hypre_SStructGridStartRank(grid);
    }
 
    return rank;
@@ -171,13 +171,13 @@ hypre_SStructGraphFindSGridEndpts(hypre_SStructGraph    *graph,
    hypre_BoxArray        *boxes;
    HYPRE_Int              i;
 
-   sgrid= hypre_SStructPGridSGrid(hypre_SStructGridPGrid(grid, part), var);
-   boxes= hypre_StructGridBoxes(sgrid);
+   sgrid = hypre_SStructPGridSGrid(hypre_SStructGridPGrid(grid, part), var);
+   boxes = hypre_StructGridBoxes(sgrid);
 
    /* get the endpts using hypre_SStructGraphFindBoxEndpt */
-   for (i= 0; i< hypre_BoxArraySize(boxes); i++)
+   for (i = 0; i < hypre_BoxArraySize(boxes); i++)
    {
-      endpts[i]= hypre_SStructGraphFindBoxEndpt(graph, part, var, proc, endpt, i);
+      endpts[i] = hypre_SStructGraphFindBoxEndpt(graph, part, var, proc, endpt, i);
    }
 
    return hypre_error_flag;
diff --git a/external/hypre/src/sstruct_mv/sstruct_graph.h b/external/hypre/src/sstruct_mv/sstruct_graph.h
index 8cf70e91..51af06e9 100644
--- a/external/hypre/src/sstruct_mv/sstruct_graph.h
+++ b/external/hypre/src/sstruct_mv/sstruct_graph.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -23,7 +23,7 @@ typedef struct
    HYPRE_Int     part;
    hypre_Index   index;
    HYPRE_Int     var;
-   HYPRE_Int     to_part;     
+   HYPRE_Int     to_part;
    hypre_Index   to_index;
    HYPRE_Int     to_var;
 
diff --git a/external/hypre/src/sstruct_mv/sstruct_grid.c b/external/hypre/src/sstruct_mv/sstruct_grid.c
index 2dcf34bc..cfee9309 100644
--- a/external/hypre/src/sstruct_mv/sstruct_grid.c
+++ b/external/hypre/src/sstruct_mv/sstruct_grid.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -29,7 +29,7 @@ hypre_SStructVariableGetOffset( HYPRE_SStructVariable  vartype,
 {
    HYPRE_Int d;
 
-   switch(vartype)
+   switch (vartype)
    {
       case HYPRE_SSTRUCT_VARIABLE_CELL:
          hypre_SetIndex(varoffset, 0);
@@ -89,7 +89,7 @@ hypre_SStructPGridCreate( MPI_Comm             comm,
    hypre_SStructPGridNVars(pgrid)            = 0;
    hypre_SStructPGridCellSGridDone(pgrid)    = 0;
    hypre_SStructPGridVarTypes(pgrid)         = NULL;
-   
+
    for (t = 0; t < 8; t++)
    {
       hypre_SStructPGridVTSGrid(pgrid, t)     = NULL;
@@ -97,7 +97,7 @@ hypre_SStructPGridCreate( MPI_Comm             comm,
    }
    HYPRE_StructGridCreate(comm, ndim, &sgrid);
    hypre_SStructPGridCellSGrid(pgrid) = sgrid;
-   
+
    hypre_SStructPGridPNeighbors(pgrid) = hypre_BoxArrayCreate(0, ndim);
    hypre_SStructPGridPNborOffsets(pgrid) = NULL;
 
@@ -106,7 +106,7 @@ hypre_SStructPGridCreate( MPI_Comm             comm,
 
    /* GEC0902 ghost addition to the grid    */
    hypre_SStructPGridGhlocalSize(pgrid)   = 0;
-   
+
    hypre_SetIndex(hypre_SStructPGridPeriodic(pgrid), 0);
 
    *pgrid_ptr = pgrid;
@@ -173,9 +173,10 @@ hypre_SStructPGridSetCellSGrid( hypre_SStructPGrid  *pgrid,
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int hypre_SStructPGridSetVariables( hypre_SStructPGrid    *pgrid,
-                                          HYPRE_Int              nvars,
-                                          HYPRE_SStructVariable *vartypes )
+HYPRE_Int
+hypre_SStructPGridSetVariables( hypre_SStructPGrid    *pgrid,
+                                HYPRE_Int              nvars,
+                                HYPRE_SStructVariable *vartypes )
 {
    hypre_SStructVariable  *new_vartypes;
    HYPRE_Int               i;
@@ -260,7 +261,9 @@ hypre_SStructPGridAssemble( hypre_SStructPGrid  *pgrid )
    cell_sgrid = hypre_SStructPGridCellSGrid(pgrid);
    HYPRE_StructGridSetPeriodic(cell_sgrid, periodic);
    if (!hypre_SStructPGridCellSGridDone(pgrid))
+   {
       HYPRE_StructGridAssemble(cell_sgrid);
+   }
 
    /* this is used to truncate boxes when periodicity is on */
    cell_imax = hypre_BoxIMax(hypre_StructGridBoundingBox(cell_sgrid));
@@ -276,7 +279,7 @@ hypre_SStructPGridAssemble( hypre_SStructPGrid  *pgrid )
 
    /* Add one since hood_first_local can be -1 */
    nbor_boxes = hypre_BoxArrayCreate(
-      pneighbors_size + hood_first_local + hood_num_local + 1, ndim);
+                   pneighbors_size + hood_first_local + hood_num_local + 1, ndim);
    diff_boxes = hypre_BoxArrayCreate(0, ndim);
    tmp_boxes  = hypre_BoxArrayCreate(0, ndim);
 
@@ -347,11 +350,11 @@ hypre_SStructPGridAssemble( hypre_SStructPGrid  *pgrid )
          HYPRE_StructGridAssemble(sgrid);
 
          sgrids[t] = sgrid;
-      }            
+      }
    }
 
    hypre_BoxArrayDestroy(hood_boxes);
-   
+
    hypre_BoxArrayDestroy(nbor_boxes);
    hypre_BoxArrayDestroy(diff_boxes);
    hypre_BoxArrayDestroy(tmp_boxes);
@@ -396,6 +399,26 @@ hypre_SStructPGridAssemble( hypre_SStructPGrid  *pgrid )
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_SStructPGridGetMaxBoxSize( hypre_SStructPGrid *pgrid )
+{
+   HYPRE_Int         nvars = hypre_SStructPGridNVars(pgrid);
+   HYPRE_Int         var;
+   hypre_StructGrid *sgrid;
+   HYPRE_Int         max_box_size = 0;
+
+   for (var = 0; var < nvars; var++)
+   {
+      sgrid = hypre_SStructPGridSGrid(pgrid, var);
+      max_box_size = hypre_max(max_box_size, hypre_StructGridGetMaxBoxSize(sgrid));
+   }
+
+   return max_box_size;
+}
+
 /*==========================================================================
  * SStructGrid routines
  *==========================================================================*/
@@ -423,7 +446,7 @@ hypre_SStructGridAssembleBoxManagers( hypre_SStructGrid *grid )
    MPI_Comm                   comm        = hypre_SStructGridComm(grid);
    HYPRE_Int                  ndim        = hypre_SStructGridNDim(grid);
    HYPRE_Int                  nparts      = hypre_SStructGridNParts(grid);
-   HYPRE_Int                  local_size  = hypre_SStructGridLocalSize(grid);
+   HYPRE_BigInt               local_size  = (HYPRE_BigInt) hypre_SStructGridLocalSize(grid);
    hypre_BoxManager        ***managers;
    hypre_SStructBoxManInfo    info_obj;
    hypre_SStructPGrid        *pgrid;
@@ -431,7 +454,7 @@ hypre_SStructGridAssembleBoxManagers( hypre_SStructGrid *grid )
    hypre_StructGrid          *sgrid;
    hypre_Box                 *bounding_box;
 
-   HYPRE_Int                 offsets[2];
+   HYPRE_BigInt              offsets[2];
 
    hypre_SStructBoxManInfo   *entry_info;
 
@@ -445,11 +468,11 @@ hypre_SStructGridAssembleBoxManagers( hypre_SStructGrid *grid )
 
    hypre_Box                 *ghostbox, *box;
    HYPRE_Int                 * num_ghost;
-   HYPRE_Int                  ghoffsets[2];
-   HYPRE_Int                  ghlocal_size  = hypre_SStructGridGhlocalSize(grid);
+   HYPRE_BigInt               ghoffsets[2];
+   HYPRE_BigInt               ghlocal_size  = (HYPRE_BigInt) hypre_SStructGridGhlocalSize(grid);
 
    HYPRE_Int                  info_size;
-   HYPRE_Int                  box_offset, ghbox_offset;
+   HYPRE_BigInt               box_offset, ghbox_offset;
 
    /*------------------------------------------------------
     * Build box manager info for grid boxes
@@ -460,13 +483,13 @@ hypre_SStructGridAssembleBoxManagers( hypre_SStructGrid *grid )
 
    /*find offset and ghost offsets */
    {
-      HYPRE_Int scan_recv;
-      
+      HYPRE_BigInt scan_recv;
+
       /* offsets */
 
       hypre_MPI_Scan(
-         &local_size, &scan_recv, 1, HYPRE_MPI_INT, hypre_MPI_SUM, comm);
-      /* first point in my range */ 
+         &local_size, &scan_recv, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
+      /* first point in my range */
       offsets[0] = scan_recv - local_size;
       /* first point in next proc's range */
       offsets[1] = scan_recv;
@@ -475,8 +498,8 @@ hypre_SStructGridAssembleBoxManagers( hypre_SStructGrid *grid )
 
       /* ghost offsets */
       hypre_MPI_Scan(
-         &ghlocal_size, &scan_recv, 1, HYPRE_MPI_INT, hypre_MPI_SUM, comm);
-      /* first point in my range */ 
+         &ghlocal_size, &scan_recv, 1, HYPRE_MPI_BIG_INT, hypre_MPI_SUM, comm);
+      /* first point in my range */
       ghoffsets[0] = scan_recv - ghlocal_size;
       /* first point in next proc's range */
       ghoffsets[1] = scan_recv;
@@ -485,7 +508,7 @@ hypre_SStructGridAssembleBoxManagers( hypre_SStructGrid *grid )
    }
 
    /* allocate a box manager for each part and variable -
-      copy the local box info from the underlying sgrid boxmanager*/ 
+      copy the local box info from the underlying sgrid boxmanager*/
 
    managers = hypre_TAlloc(hypre_BoxManager **,  nparts, HYPRE_MEMORY_HOST);
 
@@ -494,7 +517,7 @@ hypre_SStructGridAssembleBoxManagers( hypre_SStructGrid *grid )
    ghbox_offset =  ghoffsets[0];
 
    info_size = sizeof(hypre_SStructBoxManInfo);
- 
+
    /* storage for the entry info is allocated and kept in the box
       manager - so here we just write over the info_obj and then
       it is copied in AddEntry */
@@ -502,7 +525,7 @@ hypre_SStructGridAssembleBoxManagers( hypre_SStructGrid *grid )
 
    /* this is the same for all the info objects */
    hypre_SStructBoxManInfoType(entry_info) = hypre_SSTRUCT_BOXMAN_INFO_DEFAULT;
- 
+
    box = hypre_BoxCreate(ndim);
    ghostbox = hypre_BoxCreate(ndim);
 
@@ -521,20 +544,20 @@ hypre_SStructGridAssembleBoxManagers( hypre_SStructGrid *grid )
           * calculate the info and add to the box manager - the rest we will
           * gather (because we cannot calculate the info for them) */
 
-         hypre_BoxManGetAllEntries(hypre_StructGridBoxMan(sgrid), 
+         hypre_BoxManGetAllEntries(hypre_StructGridBoxMan(sgrid),
                                    &num_entries, &all_entries);
 
-         bounding_box = hypre_StructGridBoundingBox(sgrid);     
+         bounding_box = hypre_StructGridBoundingBox(sgrid);
 
          /* need to create a box manager and then later give it the bounding box
             for gather entries call */
-         
+
          hypre_BoxManCreate(
-            hypre_BoxManNumMyEntries(hypre_StructGridBoxMan(sgrid)), 
-            info_size, hypre_StructGridNDim(sgrid), bounding_box,  
+            hypre_BoxManNumMyEntries(hypre_StructGridBoxMan(sgrid)),
+            info_size, hypre_StructGridNDim(sgrid), bounding_box,
             hypre_StructGridComm(sgrid), &managers[part][var]);
 
-	 /* each sgrid has num_ghost */
+         /* each sgrid has num_ghost */
 
          num_ghost = hypre_StructGridNumGhost(sgrid);
          hypre_BoxManSetNumGhost(managers[part][var], num_ghost);
@@ -542,7 +565,7 @@ hypre_SStructGridAssembleBoxManagers( hypre_SStructGrid *grid )
          /* loop through the all of the entries - for the local boxes
           * populate the info object and add to Box Manager- recall
           * that all of the boxes array belong to the calling proc */
-       
+
          local_ct = 0;
          for (b = 0; b < num_entries; b++)
          {
@@ -567,20 +590,20 @@ hypre_SStructGridAssembleBoxManagers( hypre_SStructGrid *grid )
 
                /* grow box to compute volume with ghost */
                hypre_CopyBox(box, ghostbox);
-               hypre_BoxGrowByArray(ghostbox, num_ghost);         
-                
+               hypre_BoxGrowByArray(ghostbox, num_ghost);
+
                /* update offset */
-               ghbox_offset += hypre_BoxVolume(ghostbox); 
+               ghbox_offset += hypre_BoxVolume(ghostbox);
 
                local_ct++;
             }
             else /* not a local box */
             {
-               hypre_BoxManGatherEntries(managers[part][var],  
+               hypre_BoxManGatherEntries(managers[part][var],
                                          entry_imin, entry_imax);
             }
          }
-         
+
          /* call the assemble later */
 
       } /* end of variable loop */
@@ -589,11 +612,11 @@ hypre_SStructGridAssembleBoxManagers( hypre_SStructGrid *grid )
    {
       /* need to do a gather entries on neighbor information so that we have
          what we need for the NborBoxManagers function */
-      
+
       /* these neighbor boxes are much larger than the data that we care about,
          so first we need to intersect them with the grid and just pass the
          intersected box into the Box Manager */
-      
+
       hypre_SStructNeighbor    *vneighbor;
       HYPRE_Int                 b, i;
       hypre_Box                *vbox;
@@ -608,7 +631,7 @@ hypre_SStructGridAssembleBoxManagers( hypre_SStructGrid *grid )
       hypre_Box                *nbor_box;
       hypre_BoxManager         *box_man;
       hypre_BoxArray           *local_boxes;
-     
+
       grow_box = hypre_BoxCreate(ndim);
       int_box = hypre_BoxCreate(ndim);
       nbor_box =  hypre_BoxCreate(ndim);
@@ -624,18 +647,18 @@ hypre_SStructGridAssembleBoxManagers( hypre_SStructGrid *grid )
          {
             sgrid = hypre_SStructPGridSGrid(pgrid, var);
             max_distance = hypre_StructGridMaxDistance(sgrid);
-  
+
             /* now loop through my boxes, grow them, and intersect with all of
              * the neighbors */
-           
+
             box_man = hypre_StructGridBoxMan(sgrid);
             hypre_BoxManGetLocalEntriesBoxes(box_man, local_boxes);
-            
+
             hypre_ForBoxI(i, local_boxes)
             {
-               hypre_CopyBox(hypre_BoxArrayBox(local_boxes, i), grow_box); 
+               hypre_CopyBox(hypre_BoxArrayBox(local_boxes, i), grow_box);
                hypre_BoxGrowByIndex(grow_box, max_distance);
-              
+
                /* loop through neighbors */
                for (b = 0; b < nvneighbors[part][var]; b++)
                {
@@ -647,12 +670,12 @@ hypre_SStructGridAssembleBoxManagers( hypre_SStructGrid *grid )
                   hypre_BoxGrowByValue(nbor_box, 1);
 
                   nbor_part = hypre_SStructNeighborPart(vneighbor);
-              
+
                   coord = hypre_SStructNeighborCoord(vneighbor);
                   dir   = hypre_SStructNeighborDir(vneighbor);
-        
+
                   /* find intersection of neighbor and my local box */
-                  hypre_IntersectBoxes(grow_box, nbor_box, int_box); 
+                  hypre_IntersectBoxes(grow_box, nbor_box, int_box);
                   if (hypre_BoxVolume(int_box) > 0)
                   {
                      hypre_CopyIndex(hypre_BoxIMin(vbox), imin0);
@@ -661,9 +684,9 @@ hypre_SStructGridAssembleBoxManagers( hypre_SStructGrid *grid )
                      /* map int_box to neighbor part index space */
                      hypre_SStructBoxToNborBox(int_box, imin0, imin1, coord, dir);
                      hypre_SStructVarToNborVar(grid, part, var, coord, &nbor_var);
-                    
+
                      hypre_BoxManGatherEntries(
-                        managers[nbor_part][nbor_var], 
+                        managers[nbor_part][nbor_var],
                         hypre_BoxIMin(int_box), hypre_BoxIMax(int_box));
                   }
                } /* end neighbor loop */
@@ -732,7 +755,7 @@ hypre_SStructGridAssembleNborBoxManagers( hypre_SStructGrid *grid )
    hypre_Box                   *bounding_box;
 
    /*------------------------------------------------------
-    * Create a box manager for the neighbor boxes 
+    * Create a box manager for the neighbor boxes
     *------------------------------------------------------*/
 
    bounding_box = hypre_BoxCreate(ndim);
@@ -759,7 +782,7 @@ hypre_SStructGridAssembleNborBoxManagers( hypre_SStructGrid *grid )
       for (var = 0; var < nvars; var++)
       {
          sgrid = hypre_SStructPGridSGrid(pgrid, var);
-         hypre_CopyBox( hypre_StructGridBoundingBox(sgrid), bounding_box); 
+         hypre_CopyBox( hypre_StructGridBoundingBox(sgrid), bounding_box);
          /* The bounding_box is only needed if BoxManGatherEntries() is called,
           * but we don't gather anything currently for the neighbor boxman, so
           * the next bit of code is not needed right now. */
@@ -769,7 +792,7 @@ hypre_SStructGridAssembleNborBoxManagers( hypre_SStructGrid *grid )
             hypre_Box   *vbox;
             hypre_Index  min_index, max_index;
             HYPRE_Int    d;
-            HYPRE_Int    sendbuf6[2*HYPRE_MAXDIM], recvbuf6[2*HYPRE_MAXDIM];
+            HYPRE_Int    sendbuf6[2 * HYPRE_MAXDIM], recvbuf6[2 * HYPRE_MAXDIM];
             hypre_CopyToCleanIndex( hypre_BoxIMin(bounding_box), ndim, min_index);
             hypre_CopyToCleanIndex( hypre_BoxIMax(bounding_box), ndim, max_index);
 
@@ -777,40 +800,40 @@ hypre_SStructGridAssembleNborBoxManagers( hypre_SStructGrid *grid )
             {
                vneighbor = &vneighbors[part][var][b];
                vbox = hypre_SStructNeighborBox(vneighbor);
-               /* find min and max box extents */  
+               /* find min and max box extents */
                for (d = 0; d < ndim; d++)
                {
                   hypre_IndexD(min_index, d) =
                      hypre_min(hypre_IndexD(min_index, d), hypre_BoxIMinD(vbox, d));
                   hypre_IndexD(max_index, d) =
                      hypre_max(hypre_IndexD(max_index, d), hypre_BoxIMaxD(vbox, d));
-               } 
+               }
             }
             /* this is based on local info - all procs need to have
              * the same bounding box!  */
             hypre_BoxSetExtents( bounding_box, min_index, max_index);
-             
+
             /* communication needed for the bounding box */
             /* pack buffer */
-            for (d = 0; d < ndim; d++) 
+            for (d = 0; d < ndim; d++)
             {
                sendbuf6[d] = hypre_BoxIMinD(bounding_box, d);
-               sendbuf6[d+ndim] = -hypre_BoxIMaxD(bounding_box, d);
+               sendbuf6[d + ndim] = -hypre_BoxIMaxD(bounding_box, d);
             }
             hypre_MPI_Allreduce(
-               sendbuf6, recvbuf6, 2*ndim, HYPRE_MPI_INT, hypre_MPI_MIN, comm);
+               sendbuf6, recvbuf6, 2 * ndim, HYPRE_MPI_INT, hypre_MPI_MIN, comm);
             /* unpack buffer */
             for (d = 0; d < ndim; d++)
             {
                hypre_BoxIMinD(bounding_box, d) = recvbuf6[d];
-               hypre_BoxIMaxD(bounding_box, d) = -recvbuf6[d+ndim];
+               hypre_BoxIMaxD(bounding_box, d) = -recvbuf6[d + ndim];
             }
          }
 #endif
          /* Here we want to create a new manager for the neighbor information
           * (instead of adding to the current and reassembling).  This uses a
           * lower bound for the actual box manager size. */
-        
+
          hypre_BoxManCreate(nvneighbors[part][var], info_size, ndim,
                             hypre_StructGridBoundingBox(sgrid),
                             hypre_StructGridComm(sgrid),
@@ -879,8 +902,8 @@ hypre_SStructGridAssembleNborBoxManagers( hypre_SStructGrid *grid )
                ghstride[c[0]] = 1;
                for (d = 1; d < ndim; d++)
                {
-                  stride[c[d]]   = hypre_BoxSizeD(box, d-1)   * stride[c[d-1]];
-                  ghstride[c[d]] = hypre_BoxSizeD(ghbox, d-1) * ghstride[c[d-1]];
+                  stride[c[d]]   = hypre_BoxSizeD(box, d - 1)   * stride[c[d - 1]];
+                  ghstride[c[d]] = hypre_BoxSizeD(ghbox, d - 1) * ghstride[c[d - 1]];
                }
                for (d = 0; d < ndim; d++)
                {
@@ -934,13 +957,13 @@ hypre_SStructGridAssembleNborBoxManagers( hypre_SStructGrid *grid )
 
             hypre_BoxManGetAllEntries(hypre_SStructGridBoxManager(grid, part, var),
                                       &nentries, &all_entries);
-            
+
             for (b = 0; b < nentries; b++)
             {
                entry = &all_entries[b];
-               
+
                proc = hypre_BoxManEntryProc(entry);
-               
+
                hypre_BoxManEntryGetInfo(entry, (void **) &entry_info);
                hypre_SStructBoxManInfoType(peri_info) =
                   hypre_SStructBoxManInfoType(entry_info);
@@ -948,14 +971,14 @@ hypre_SStructGridAssembleNborBoxManagers( hypre_SStructGrid *grid )
                   hypre_SStructBoxManInfoOffset(entry_info);
                hypre_SStructBoxManInfoGhoffset(peri_info) =
                   hypre_SStructBoxManInfoGhoffset(entry_info);
-                  
+
                for (k = 1; k < num_periods; k++) /* k = 0 is original box */
                {
                   pshift = hypre_StructGridPShift(sgrid, k);
                   hypre_BoxSetExtents(box, hypre_BoxManEntryIMin(entry),
                                       hypre_BoxManEntryIMax(entry));
                   hypre_BoxShiftPos(box, pshift);
-                     
+
                   hypre_IntersectBoxes(box, bounding_box, int_box);
                   if (hypre_BoxVolume(int_box) > 0)
                   {
@@ -972,7 +995,7 @@ hypre_SStructGridAssembleNborBoxManagers( hypre_SStructGrid *grid )
       } /* end of variables loop */
 
    } /* end of part loop */
-   
+
    hypre_SStructGridNborBoxManagers(grid) = nbor_managers;
 
    hypre_TFree(nbor_info, HYPRE_MEMORY_HOST);
@@ -1087,7 +1110,7 @@ hypre_SStructGridCreateCommInfo( hypre_SStructGrid  *grid )
          maxvars = nvars;
       }
    }
-   cinfo_a = hypre_CTAlloc(CInfo *,  nparts*nparts*maxvars*maxvars, HYPRE_MEMORY_HOST);
+   cinfo_a = hypre_CTAlloc(CInfo *,  nparts * nparts * maxvars * maxvars, HYPRE_MEMORY_HOST);
 
    /* loop over local boxes and compute send/recv CommInfo */
 
@@ -1169,16 +1192,16 @@ hypre_SStructGridCreateCommInfo( hypre_SStructGrid  *grid )
                   /* if there is an intersection, compute communication info */
                   if (hypre_BoxVolume(int_box))
                   {
-                     cinfoi = (((pi)*maxvars + vi)*nparts + pj)*maxvars + vj;
-                     cinfoj = (((pj)*maxvars + vj)*nparts + pi)*maxvars + vi;
+                     cinfoi = (((pi) * maxvars + vi) * nparts + pj) * maxvars + vj;
+                     cinfoj = (((pj) * maxvars + vj) * nparts + pi) * maxvars + vi;
 
                      /* allocate CommInfo arguments if needed */
                      if (cinfo_a[cinfoi] == NULL)
                      {
                         HYPRE_Int  i_num_boxes = hypre_StructGridNumBoxes(
-                           hypre_SStructPGridSGrid(pgrids[pi], vi));
+                                                    hypre_SStructPGridSGrid(pgrids[pi], vi));
                         HYPRE_Int  j_num_boxes = hypre_StructGridNumBoxes(
-                           hypre_SStructPGridSGrid(pgrids[pj], vj));
+                                                    hypre_SStructPGridSGrid(pgrids[pj], vj));
 
                         cnum_transforms = hypre_CTAlloc(HYPRE_Int,  1, HYPRE_MEMORY_HOST);
                         ccoords = hypre_CTAlloc(hypre_Index,  nvneighbors[pi][vi], HYPRE_MEMORY_HOST);
@@ -1241,14 +1264,14 @@ hypre_SStructGridCreateCommInfo( hypre_SStructGrid  *grid )
 
                      size = hypre_BoxArraySize(cbox_a);
                      /* Allocate in chunks of 10 ('size' grows by 1) */
-                     if (size%10 == 0)
+                     if (size % 10 == 0)
                      {
                         (cinfo->procs[bi]) =
-                           hypre_TReAlloc((cinfo->procs[bi]),  HYPRE_Int,  size+10, HYPRE_MEMORY_HOST);
+                           hypre_TReAlloc((cinfo->procs[bi]),  HYPRE_Int,  size + 10, HYPRE_MEMORY_HOST);
                         (cinfo->rboxnums[bi]) =
-                           hypre_TReAlloc((cinfo->rboxnums[bi]),  HYPRE_Int,  size+10, HYPRE_MEMORY_HOST);
+                           hypre_TReAlloc((cinfo->rboxnums[bi]),  HYPRE_Int,  size + 10, HYPRE_MEMORY_HOST);
                         (cinfo->transforms[bi]) =
-                           hypre_TReAlloc((cinfo->transforms[bi]),  HYPRE_Int,  size+10, HYPRE_MEMORY_HOST);
+                           hypre_TReAlloc((cinfo->transforms[bi]),  HYPRE_Int,  size + 10, HYPRE_MEMORY_HOST);
                      }
                      cproc_a = (cinfo->procs[bi]);
                      crboxnum_a = (cinfo->rboxnums[bi]);
@@ -1260,7 +1283,7 @@ hypre_SStructGridCreateCommInfo( hypre_SStructGrid  *grid )
                      /* map intersection box to part pj index space */
                      hypre_CopyBox(int_box, int_rbox);
                      hypre_SStructBoxToNborBox(int_rbox, imin0, imin1, coord, dir);
-                           
+
                      hypre_AppendBox(int_box, cbox_a);
                      hypre_AppendBox(int_rbox, crbox_a);
                      hypre_SStructBoxManEntryGetProcess(pj_entry, &cproc_a[size]);
@@ -1299,20 +1322,20 @@ hypre_SStructGridCreateCommInfo( hypre_SStructGrid  *grid )
    {
       for (vi = 0; vi < maxvars; vi++)
       {
-         for (pj = (pi+1); pj < nparts; pj++)
+         for (pj = (pi + 1); pj < nparts; pj++)
          {
             for (vj = 0; vj < maxvars; vj++)
             {
-               cinfoi = (((pi)*maxvars + vi)*nparts + pj)*maxvars + vj;
+               cinfoi = (((pi) * maxvars + vi) * nparts + pj) * maxvars + vj;
 
                if (cinfo_a[cinfoi] != NULL)
                {
                   comm_info = hypre_TAlloc(hypre_SStructCommInfo,  1, HYPRE_MEMORY_HOST);
-                  
-                  cinfoj = (((pj)*maxvars + vj)*nparts + pi)*maxvars + vi;
+
+                  cinfoj = (((pj) * maxvars + vj) * nparts + pi) * maxvars + vi;
                   send_cinfo = cinfo_a[cinfoi];
                   recv_cinfo = cinfo_a[cinfoj];
-                  
+
                   /* send/recv boxes may not match (2nd to last argument) */
                   hypre_CommInfoCreate(
                      (send_cinfo->boxes), (recv_cinfo->boxes),
@@ -1326,12 +1349,12 @@ hypre_SStructGridCreateCommInfo( hypre_SStructGrid  *grid )
                      (send_cinfo->coords), (send_cinfo->dirs),
                      (send_cinfo->transforms), (recv_cinfo->transforms));
                   hypre_TFree(send_cinfo->num_transforms, HYPRE_MEMORY_HOST);
-                  
+
                   hypre_SStructCommInfoSendPart(comm_info) = pi;
                   hypre_SStructCommInfoRecvPart(comm_info) = pj;
                   hypre_SStructCommInfoSendVar(comm_info) = vi;
                   hypre_SStructCommInfoRecvVar(comm_info) = vj;
-                  
+
                   vnbor_comm_info[vnbor_ncomms] = comm_info;
 #if 0
                   {
@@ -1403,7 +1426,7 @@ hypre_SStructGridCreateCommInfo( hypre_SStructGrid  *grid )
    hypre_SStructGridVNborCommInfo(grid) = vnbor_comm_info;
    hypre_SStructGridVNborNComms(grid) = vnbor_ncomms;
 
-   size = nparts*nparts*maxvars*maxvars;
+   size = nparts * nparts * maxvars * maxvars;
    for (cinfoi = 0; cinfoi < size; cinfoi++)
    {
       hypre_TFree(cinfo_a[cinfoi], HYPRE_MEMORY_HOST);
@@ -1432,7 +1455,7 @@ hypre_SStructGridFindBoxManEntry( hypre_SStructGrid  *grid,
    HYPRE_Int nentries;
 
    hypre_BoxManEntry **entries;
-   
+
    hypre_BoxManIntersect (  hypre_SStructGridBoxManager(grid, part, var),
                             index, index, &entries, &nentries);
 
@@ -1452,8 +1475,8 @@ hypre_SStructGridFindBoxManEntry( hypre_SStructGrid  *grid,
    }
 
    /* remove the entries array (NULL or allocated in the intersect routine) */
-   hypre_TFree(entries, HYPRE_MEMORY_HOST); 
-   
+   hypre_TFree(entries, HYPRE_MEMORY_HOST);
+
    return hypre_error_flag;
 }
 
@@ -1490,8 +1513,8 @@ hypre_SStructGridFindNborBoxManEntry( hypre_SStructGrid  *grid,
    }
 
    /* remove the entries array (NULL or allocated in the intersect routine) */
-   hypre_TFree(entries, HYPRE_MEMORY_HOST); 
-   
+   hypre_TFree(entries, HYPRE_MEMORY_HOST);
+
    return hypre_error_flag;
 }
 
@@ -1534,8 +1557,8 @@ hypre_SStructBoxManEntryGetCSRstrides(  hypre_BoxManEntry *entry,
       strides[0] = 1;
       for (d = 1; d < ndim; d++)
       {
-         strides[d] = hypre_IndexD(imax, d-1) - hypre_IndexD(imin, d-1) + 1;
-         strides[d] *= strides[d-1];
+         strides[d] = hypre_IndexD(imax, d - 1) - hypre_IndexD(imin, d - 1) + 1;
+         strides[d] *= strides[d - 1];
       }
    }
    else
@@ -1578,18 +1601,18 @@ hypre_SStructBoxManEntryGetGhstrides( hypre_BoxManEntry *entry,
       numghost = hypre_BoxManEntryNumGhost(entry);
 
       for (d = 0; d < ndim; d++)
-      { 
-         imax[d] += numghost[2*d+1];
-         imin[d] -= numghost[2*d];
-      }  
+      {
+         imax[d] += numghost[2 * d + 1];
+         imin[d] -= numghost[2 * d];
+      }
 
       /* imin, imax modified now and calculation identical.  */
 
       strides[0] = 1;
       for (d = 1; d < ndim; d++)
       {
-         strides[d] = hypre_IndexD(imax, d-1) - hypre_IndexD(imin, d-1) + 1;
-         strides[d] *= strides[d-1];
+         strides[d] = hypre_IndexD(imax, d - 1) - hypre_IndexD(imin, d - 1) + 1;
+         strides[d] *= strides[d - 1];
       }
    }
    else
@@ -1654,7 +1677,7 @@ hypre_SStructBoxManEntryGetGlobalGhrank( hypre_BoxManEntry *entry,
    HYPRE_Int                 *numghost = hypre_BoxManEntryNumGhost(entry);
    HYPRE_Int                 d;
    HYPRE_Int                 info_type;
-   
+
    hypre_BoxManEntryGetInfo(entry, (void **) &entry_info);
    hypre_BoxManEntryGetExtents(entry, imin, imax);
    ghoffset = hypre_SStructBoxManInfoGhoffset(entry_info);
@@ -1671,10 +1694,10 @@ hypre_SStructBoxManEntryGetGlobalGhrank( hypre_BoxManEntry *entry,
    {
       for (d = 0; d < ndim; d++)
       {
-         imin[d] -= numghost[2*d];
+         imin[d] -= numghost[2 * d];
       }
    }
-   
+
    *rank_ptr = ghoffset;
    for (d = 0; d < ndim; d++)
    {
@@ -1708,7 +1731,7 @@ hypre_SStructBoxManEntryGetBoxnum( hypre_BoxManEntry *entry,
    hypre_SStructBoxManNborInfo *info;
 
    hypre_BoxManEntryGetInfo(entry, (void **) &info);
-   
+
    if (hypre_SStructBoxManInfoType(info) ==
        hypre_SSTRUCT_BOXMAN_INFO_NEIGHBOR)
       /* get from the info object */
@@ -1734,7 +1757,7 @@ hypre_SStructBoxManEntryGetPart( hypre_BoxManEntry *entry,
    hypre_SStructBoxManNborInfo *info;
 
    hypre_BoxManEntryGetInfo(entry, (void **) &info);
-   
+
    if (hypre_SStructBoxManInfoType(info) == hypre_SSTRUCT_BOXMAN_INFO_NEIGHBOR)
    {
       *part_ptr = hypre_SStructBoxManNborInfoPart(info);
@@ -1780,6 +1803,9 @@ hypre_SStructIndexToNborIndex( hypre_Index  index,
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_SStructBoxToNborBox( hypre_Box   *box,
                            hypre_Index  root,
@@ -1809,7 +1835,6 @@ hypre_SStructBoxToNborBox( hypre_Box   *box,
  * See "Mapping Notes" in comment for `hypre_SStructBoxToNborBox'.
  *--------------------------------------------------------------------------*/
 
-
 HYPRE_Int
 hypre_SStructNborIndexToIndex( hypre_Index  nbor_index,
                                hypre_Index  root,
@@ -1830,6 +1855,9 @@ hypre_SStructNborIndexToIndex( hypre_Index  nbor_index,
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_SStructNborBoxToBox( hypre_Box   *nbor_box,
                            hypre_Index  root,
@@ -1880,7 +1908,7 @@ hypre_SStructVarToNborVar( hypre_SStructGrid  *grid,
    hypre_SStructPGrid     *pgrid   = hypre_SStructGridPGrid(grid, part);
    HYPRE_SStructVariable   vartype = hypre_SStructPGridVarType(pgrid, var);
 
-   switch(vartype)
+   switch (vartype)
    {
       case HYPRE_SSTRUCT_VARIABLE_XFACE:
       case HYPRE_SSTRUCT_VARIABLE_XEDGE:
@@ -1888,11 +1916,11 @@ hypre_SStructVarToNborVar( hypre_SStructGrid  *grid,
          break;
       case HYPRE_SSTRUCT_VARIABLE_YFACE:
       case HYPRE_SSTRUCT_VARIABLE_YEDGE:
-         *nbor_var_ptr = var + (coord[1]-1);
+         *nbor_var_ptr = var + (coord[1] - 1);
          break;
       case HYPRE_SSTRUCT_VARIABLE_ZFACE:
       case HYPRE_SSTRUCT_VARIABLE_ZEDGE:
-         *nbor_var_ptr = var + (coord[2]-2);
+         *nbor_var_ptr = var + (coord[2] - 2);
          break;
       default:
          *nbor_var_ptr = var;
@@ -1915,7 +1943,7 @@ hypre_SStructGridSetNumGhost( hypre_SStructGrid  *grid, HYPRE_Int *num_ghost )
    hypre_SStructPGrid   *pgrid;
    hypre_StructGrid     *sgrid;
 
-   for (i = 0; i < 2*ndim; i++)
+   for (i = 0; i < 2 * ndim; i++)
    {
       hypre_SStructGridNumGhost(grid)[i] = num_ghost[i];
    }
@@ -1923,7 +1951,7 @@ hypre_SStructGridSetNumGhost( hypre_SStructGrid  *grid, HYPRE_Int *num_ghost )
    for (part = 0; part < nparts; part++)
    {
       pgrid = hypre_SStructGridPGrid(grid, part);
-     
+
       for (t = 0; t < 8; t++)
       {
          sgrid = hypre_SStructPGridVTSGrid(pgrid, t);
@@ -1950,7 +1978,7 @@ hypre_SStructBoxManEntryGetGlobalRank( hypre_BoxManEntry *entry,
 {
    if (type == HYPRE_PARCSR)
    {
-      hypre_SStructBoxManEntryGetGlobalCSRank(entry,index, rank_ptr);
+      hypre_SStructBoxManEntryGetGlobalCSRank(entry, index, rank_ptr);
    }
    if (type == HYPRE_SSTRUCT || type == HYPRE_STRUCT)
    {
@@ -1958,7 +1986,7 @@ hypre_SStructBoxManEntryGetGlobalRank( hypre_BoxManEntry *entry,
    }
 
    return hypre_error_flag;
-}  
+}
 
 /*--------------------------------------------------------------------------
  * GEC1002 a function that will select the right way to calculate the strides
@@ -1980,7 +2008,7 @@ hypre_SStructBoxManEntryGetStrides(hypre_BoxManEntry   *entry,
    }
 
    return hypre_error_flag;
-}  
+}
 
 /*--------------------------------------------------------------------------
  *  A function to determine the local variable box numbers that underlie
@@ -1996,11 +2024,11 @@ hypre_SStructBoxNumMap(hypre_SStructGrid        *grid,
                        HYPRE_Int              ***map_ptr)
 {
    hypre_SStructPGrid    *pgrid   = hypre_SStructGridPGrid(grid, part);
-   hypre_StructGrid      *cellgrid= hypre_SStructPGridCellSGrid(pgrid);
+   hypre_StructGrid      *cellgrid = hypre_SStructPGridCellSGrid(pgrid);
    hypre_StructGrid      *vargrid;
    hypre_BoxArray        *boxes;
    hypre_Box             *cellbox, vbox, *box, intersect_box;
-   HYPRE_SStructVariable *vartypes= hypre_SStructPGridVarTypes(pgrid);
+   HYPRE_SStructVariable *vartypes = hypre_SStructPGridVarTypes(pgrid);
 
    HYPRE_Int              ndim    = hypre_SStructGridNDim(grid);
    HYPRE_Int              nvars   = hypre_SStructPGridNVars(pgrid);
@@ -2014,23 +2042,23 @@ hypre_SStructBoxNumMap(hypre_SStructGrid        *grid,
 
    hypre_BoxInit(&vbox, ndim);
    hypre_BoxInit(&intersect_box, ndim);
-   cellbox= hypre_StructGridBox(cellgrid, boxnum);
+   cellbox = hypre_StructGridBox(cellgrid, boxnum);
 
    /* ptrs to store var_box map info */
    num_boxes  = hypre_CTAlloc(HYPRE_Int,  nvars, HYPRE_MEMORY_HOST);
-   var_boxnums= hypre_TAlloc(HYPRE_Int *,  nvars, HYPRE_MEMORY_HOST);
+   var_boxnums = hypre_TAlloc(HYPRE_Int *,  nvars, HYPRE_MEMORY_HOST);
 
    /* intersect the cellbox with the var_boxes */
-   for (var= 0; var< nvars; var++)
+   for (var = 0; var < nvars; var++)
    {
-      vargrid= hypre_SStructPGridSGrid(pgrid, var);
+      vargrid = hypre_SStructPGridSGrid(pgrid, var);
       boxes  = hypre_StructGridBoxes(vargrid);
       temp   = hypre_CTAlloc(HYPRE_Int,  hypre_BoxArraySize(boxes), HYPRE_MEMORY_HOST);
 
       /* map cellbox to a variable box */
       hypre_CopyBox(cellbox, &vbox);
 
-      i= vartypes[var];
+      i = vartypes[var];
       hypre_SStructVariableGetOffset((hypre_SStructVariable) i,
                                      ndim, varoffset);
       hypre_SubtractIndexes(hypre_BoxIMin(&vbox), varoffset, ndim,
@@ -2039,7 +2067,7 @@ hypre_SStructBoxNumMap(hypre_SStructGrid        *grid,
       /* loop over boxes to see if they intersect with vbox */
       hypre_ForBoxI(i, boxes)
       {
-         box= hypre_BoxArrayBox(boxes, i);
+         box = hypre_BoxArrayBox(boxes, i);
          hypre_IntersectBoxes(&vbox, box, &intersect_box);
          if (hypre_BoxVolume(&intersect_box))
          {
@@ -2051,20 +2079,20 @@ hypre_SStructBoxNumMap(hypre_SStructGrid        *grid,
       /* record local var box numbers */
       if (num_boxes[var])
       {
-         var_boxnums[var]= hypre_TAlloc(HYPRE_Int,  num_boxes[var], HYPRE_MEMORY_HOST);
+         var_boxnums[var] = hypre_TAlloc(HYPRE_Int,  num_boxes[var], HYPRE_MEMORY_HOST);
       }
       else
       {
-         var_boxnums[var]= NULL;
+         var_boxnums[var] = NULL;
       }
 
-      j= 0;
-      k= hypre_BoxArraySize(boxes);
-      for (i= 0; i< k; i++)
+      j = 0;
+      k = hypre_BoxArraySize(boxes);
+      for (i = 0; i < k; i++)
       {
          if (temp[i])
          {
-            var_boxnums[var][j]= i;
+            var_boxnums[var][j] = i;
             j++;
          }
       }
@@ -2072,8 +2100,8 @@ hypre_SStructBoxNumMap(hypre_SStructGrid        *grid,
 
    }  /* for (var= 0; var< nvars; var++) */
 
-   *num_varboxes_ptr= num_boxes;
-   *map_ptr= var_boxnums;
+   *num_varboxes_ptr = num_boxes;
+   *map_ptr = var_boxnums;
 
    return hypre_error_flag;
 }
@@ -2091,8 +2119,8 @@ hypre_SStructCellGridBoxNumMap(hypre_SStructGrid        *grid,
 {
    hypre_SStructPGrid    *pgrid    = hypre_SStructGridPGrid(grid, part);
    hypre_StructGrid      *cellgrid = hypre_SStructPGridCellSGrid(pgrid);
-   hypre_BoxArray        *cellboxes= hypre_StructGridBoxes(cellgrid);
-   
+   hypre_BoxArray        *cellboxes = hypre_StructGridBoxes(cellgrid);
+
    HYPRE_Int            **num_boxes;
    HYPRE_Int           ***var_boxnums;
 
@@ -2101,7 +2129,7 @@ hypre_SStructCellGridBoxNumMap(hypre_SStructGrid        *grid,
    ncellboxes = hypre_BoxArraySize(cellboxes);
 
    num_boxes  = hypre_TAlloc(HYPRE_Int *,  ncellboxes, HYPRE_MEMORY_HOST);
-   var_boxnums= hypre_TAlloc(HYPRE_Int **,  ncellboxes, HYPRE_MEMORY_HOST);
+   var_boxnums = hypre_TAlloc(HYPRE_Int **,  ncellboxes, HYPRE_MEMORY_HOST);
 
    hypre_ForBoxI(i, cellboxes)
    {
@@ -2112,8 +2140,8 @@ hypre_SStructCellGridBoxNumMap(hypre_SStructGrid        *grid,
                              &var_boxnums[i]);
    }
 
-   *num_varboxes_ptr= num_boxes;
-   *map_ptr= var_boxnums;
+   *num_varboxes_ptr = num_boxes;
+   *map_ptr = var_boxnums;
 
    return hypre_error_flag;
 }
@@ -2171,7 +2199,7 @@ hypre_SStructGridIntersect( hypre_SStructGrid   *grid,
                             HYPRE_Int            var,
                             hypre_Box           *box,
                             HYPRE_Int            action,
-                            hypre_BoxManEntry ***entries_ptr, 
+                            hypre_BoxManEntry ***entries_ptr,
                             HYPRE_Int           *nentries_ptr )
 {
    hypre_BoxManEntry **entries, **tentries;
@@ -2186,7 +2214,7 @@ hypre_SStructGridIntersect( hypre_SStructGrid   *grid,
       boxman = hypre_SStructGridNborBoxManager(grid, part, var);
       hypre_BoxManIntersect(boxman, hypre_BoxIMin(box), hypre_BoxIMax(box),
                             &tentries, &ntentries);
-      entries = hypre_TReAlloc(entries,  hypre_BoxManEntry *, 
+      entries = hypre_TReAlloc(entries,  hypre_BoxManEntry *,
                                (nentries + ntentries), HYPRE_MEMORY_HOST);
       for (i = 0; i < ntentries; i++)
       {
@@ -2215,3 +2243,299 @@ hypre_SStructGridIntersect( hypre_SStructGrid   *grid,
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_SStructGridGetMaxBoxSize( hypre_SStructGrid *grid )
+{
+   HYPRE_Int            nparts = hypre_SStructGridNParts(grid);
+   HYPRE_Int            part;
+   hypre_SStructPGrid  *pgrid;
+   HYPRE_Int            max_box_size = 0;
+
+   for (part = 0; part < nparts; part++)
+   {
+      pgrid = hypre_SStructGridPGrid(grid, part);
+      max_box_size = hypre_max(max_box_size, hypre_SStructPGridGetMaxBoxSize(pgrid));
+   }
+
+   return max_box_size;
+}
+
+/*--------------------------------------------------------------------------
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_SStructGridPrint( FILE              *file,
+                        hypre_SStructGrid *grid )
+{
+   /* Grid variables */
+   HYPRE_Int               ndim = hypre_SStructGridNDim(grid);
+   HYPRE_Int               nparts = hypre_SStructGridNParts(grid);
+   HYPRE_Int              *nneighbors = hypre_SStructGridNNeighbors(grid);
+   hypre_SStructNeighbor **neighbors  = hypre_SStructGridNeighbors(grid);
+   hypre_Index           **nbor_offsets = hypre_SStructGridNborOffsets(grid);
+   hypre_IndexRef          nbor_offset;
+   hypre_IndexRef          coord, dir, ilomap;
+   HYPRE_Int               npart;
+   hypre_SStructNeighbor  *neighbor;
+   hypre_SStructPGrid     *pgrid;
+   hypre_StructGrid       *sgrid;
+   hypre_BoxArray         *boxes;
+   hypre_Box              *box;
+   HYPRE_SStructVariable  *vartypes;
+   HYPRE_Int              *num_ghost;
+   hypre_IndexRef          periodic;
+
+   /* Local variables */
+   HYPRE_Int               i;
+   HYPRE_Int               part, var;
+   HYPRE_Int               nvars;
+   HYPRE_Int               nboxes;
+
+   /* Print basic info */
+   hypre_fprintf(file, "\nGridCreate: %d %d\n\n", ndim, nparts);
+
+   /* Print number of boxes per part */
+   for (part = 0; part < nparts; part++)
+   {
+      pgrid = hypre_SStructGridPGrid(grid, part);
+      sgrid = hypre_SStructPGridCellSGrid(pgrid);
+      boxes = hypre_StructGridBoxes(sgrid);
+      nboxes = hypre_BoxArraySize(boxes);
+
+      hypre_fprintf(file, "GridNumBoxes: %d %d\n", part, nboxes);
+   }
+
+   /* Print boxes per part */
+   for (part = 0; part < nparts; part++)
+   {
+      pgrid = hypre_SStructGridPGrid(grid, part);
+      sgrid = hypre_SStructPGridCellSGrid(pgrid);
+      boxes = hypre_StructGridBoxes(sgrid);
+
+      hypre_ForBoxI(i, boxes)
+      {
+         box = hypre_BoxArrayBox(boxes, i);
+
+         hypre_fprintf(file, "\nGridSetExtents: (%d, %d): ", part, i);
+         hypre_BoxPrint(file, box);
+      }
+   }
+   hypre_fprintf(file, "\n\n");
+
+   /* Print variable info per part */
+   for (part = 0; part < nparts; part++)
+   {
+      pgrid = hypre_SStructGridPGrid(grid, part);
+      nvars = hypre_SStructPGridNVars(pgrid);
+      vartypes = hypre_SStructPGridVarTypes(pgrid);
+
+      hypre_fprintf(file, "GridSetVariables: %d %d ", part, nvars);
+      hypre_fprintf(file, "[%d", vartypes[0]);
+      for (var = 1; var < nvars; var++)
+      {
+         hypre_fprintf(file, " %d", vartypes[var]);
+      }
+      hypre_fprintf(file, "]\n");
+   }
+   hypre_fprintf(file, "\n");
+
+   /* Print ghost info */
+   num_ghost = hypre_SStructGridNumGhost(grid);
+   hypre_fprintf(file, "GridSetNumGhost:");
+   for (i = 0; i < 2 * ndim; i++)
+   {
+      hypre_fprintf(file, " %d", num_ghost[i]);
+   }
+   hypre_fprintf(file, "\n");
+
+   /* Print periodic data per part */
+   for (part = 0; part < nparts; part++)
+   {
+      pgrid = hypre_SStructGridPGrid(grid, part);
+      periodic = hypre_SStructPGridPeriodic(pgrid);
+
+      hypre_fprintf(file, "\nGridSetPeriodic: %d ", part);
+      hypre_IndexPrint(file, ndim, periodic);
+   }
+   hypre_fprintf(file, "\n\n");
+
+   /* GridSetFEMOrdering */
+
+   /* GridSetSharedPart and GridSetNeighborPart data */
+   for (part = 0; part < nparts; part++)
+   {
+      hypre_fprintf(file, "GridNumNeighbors: %d %d\n", part, nneighbors[part]);
+      for (i = 0; i < nneighbors[part]; i++)
+      {
+         neighbor = &neighbors[part][i];
+         nbor_offset = nbor_offsets[part][i];
+         box = hypre_SStructNeighborBox(neighbor);
+         npart = hypre_SStructNeighborPart(neighbor);
+         coord = hypre_SStructNeighborCoord(neighbor);
+         dir = hypre_SStructNeighborDir(neighbor);
+         ilomap = hypre_SStructNeighborILower(neighbor);
+
+         /* Print SStructNeighbor info */
+         hypre_fprintf(file, "GridNeighborInfo: ");
+         hypre_BoxPrint(file, box);
+         hypre_fprintf(file, " ");
+         hypre_IndexPrint(file, ndim, nbor_offset);
+         hypre_fprintf(file, " %d ", npart);
+         hypre_IndexPrint(file, ndim, coord);
+         hypre_fprintf(file, " ");
+         hypre_IndexPrint(file, ndim, dir);
+         hypre_fprintf(file, " ");
+         hypre_IndexPrint(file, ndim, ilomap);
+         hypre_fprintf(file, "\n");
+      }
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_SStructGridRead
+ *
+ * This function reads a semi-structured grid from file. This is used mainly
+ * for debugging purposes.
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_SStructGridRead( MPI_Comm            comm,
+                       FILE               *file,
+                       hypre_SStructGrid **grid_ptr )
+{
+   /* Grid variables */
+   HYPRE_SStructGrid       grid;
+   HYPRE_SStructVariable  *vartypes;
+   HYPRE_Int               num_ghost[2 * HYPRE_MAXDIM];
+   hypre_Index           **nbor_offsets;
+   HYPRE_Int              *nneighbors;
+   hypre_SStructNeighbor **neighbors;
+   hypre_SStructNeighbor  *neighbor;
+   hypre_Index             periodic;
+
+   /* Local variables */
+   HYPRE_Int               ndim;
+   HYPRE_Int               b, d, i, j;
+   HYPRE_Int               part;
+   HYPRE_Int               nparts, nvars;
+   HYPRE_Int               nboxes;
+   HYPRE_Int              *nboxes_array;
+   hypre_Box              *box;
+
+   hypre_fscanf(file, "\nGridCreate: %d %d\n\n", &ndim, &nparts);
+   HYPRE_SStructGridCreate(comm, ndim, nparts, &grid);
+
+   /* Allocate memory */
+   nboxes_array = hypre_CTAlloc(HYPRE_Int, nparts, HYPRE_MEMORY_HOST);
+   box = hypre_BoxCreate(ndim);
+
+   /* Read number of boxes per part */
+   for (i = 0; i < nparts; i++)
+   {
+      hypre_fscanf(file, "GridNumBoxes: %d %d\n", &part, &nboxes);
+      nboxes_array[part] = nboxes;
+   }
+   hypre_fscanf(file, "\n");
+
+   /* Read boxes per part */
+   for (i = 0; i < nparts; i++)
+   {
+      for (j = 0; j < nboxes_array[i]; j++)
+      {
+         hypre_fscanf(file, "\nGridSetExtents: (%d, %d): ", &part, &b);
+         hypre_BoxRead(file, ndim, &box);
+
+         HYPRE_SStructGridSetExtents(grid, part, hypre_BoxIMin(box), hypre_BoxIMax(box));
+      }
+   }
+   hypre_fscanf(file, "\n\n");
+
+   /* Read variable info per part */
+   for (i = 0; i < nparts; i++)
+   {
+      hypre_fscanf(file, "GridSetVariables: %d %d ", &part, &nvars);
+      vartypes = hypre_CTAlloc(hypre_SStructVariable, nvars, HYPRE_MEMORY_HOST);
+
+      hypre_fscanf(file, "[%d", &vartypes[0]);
+      for (j = 1; j < nvars; j++)
+      {
+         hypre_fscanf(file, " %d", &vartypes[j]);
+      }
+      hypre_fscanf(file, "]\n");
+      HYPRE_SStructGridSetVariables(grid, part, nvars, vartypes);
+      hypre_TFree(vartypes, HYPRE_MEMORY_HOST);
+   }
+   hypre_fscanf(file, "\n");
+
+   /* Read ghost info */
+   hypre_fscanf(file, "GridSetNumGhost:");
+   for (i = 0; i < 2 * ndim; i++)
+   {
+      hypre_fscanf(file, " %d", &num_ghost[i]);
+   }
+   hypre_fscanf(file, "\n");
+
+   /* Read periodic data per part */
+   for (i = 0; i < nparts; i++)
+   {
+      hypre_fscanf(file, "\nGridSetPeriodic: %d ", &part);
+      hypre_IndexRead(file, ndim, periodic);
+
+      HYPRE_SStructGridSetPeriodic(grid, part, periodic);
+   }
+   hypre_fscanf(file, "\n\n");
+
+   /* GridSetFEMOrdering */
+
+   /* GridSetSharedPart and GridSetNeighborPart data */
+   nneighbors = hypre_SStructGridNNeighbors(grid);
+   neighbors  = hypre_SStructGridNeighbors(grid);
+   nbor_offsets = hypre_SStructGridNborOffsets(grid);
+   for (part = 0; part < nparts; part++)
+   {
+      hypre_fscanf(file, "GridNumNeighbors: %d %d\n", &part, &nneighbors[part]);
+      neighbors[part] = hypre_TAlloc(hypre_SStructNeighbor, nneighbors[part], HYPRE_MEMORY_HOST);
+      nbor_offsets[part] = hypre_TAlloc(hypre_Index, nneighbors[part], HYPRE_MEMORY_HOST);
+
+      for (i = 0; i < nneighbors[part]; i++)
+      {
+         neighbor = &neighbors[part][i];
+
+         /* Read SStructNeighbor info */
+         hypre_fscanf(file, "GridNeighborInfo: ");
+         hypre_BoxRead(file, ndim, &box);
+         hypre_CopyBox(box, hypre_SStructNeighborBox(neighbor));
+         hypre_fscanf(file, " ");
+         hypre_IndexRead(file, ndim, nbor_offsets[part][i]);
+         hypre_fscanf(file, " %d ", &hypre_SStructNeighborPart(neighbor));
+         hypre_IndexRead(file, ndim, hypre_SStructNeighborCoord(neighbor));
+         hypre_fscanf(file, " ");
+         hypre_IndexRead(file, ndim, hypre_SStructNeighborDir(neighbor));
+         hypre_fscanf(file, " ");
+         hypre_IndexRead(file, ndim, hypre_SStructNeighborILower(neighbor));
+         hypre_fscanf(file, "\n");
+
+         for (d = ndim; d < HYPRE_MAXDIM; d++)
+         {
+            hypre_IndexD(hypre_SStructNeighborCoord(neighbor), d) = d;
+            hypre_IndexD(hypre_SStructNeighborDir(neighbor), d) = 1;
+         }
+      }
+   }
+
+   /* Assemble grid */
+   HYPRE_SStructGridAssemble(grid);
+
+   /* Free memory */
+   hypre_TFree(nboxes_array, HYPRE_MEMORY_HOST);
+   hypre_BoxDestroy(box);
+
+   *grid_ptr = grid;
+
+   return hypre_error_flag;
+}
diff --git a/external/hypre/src/sstruct_mv/sstruct_grid.h b/external/hypre/src/sstruct_mv/sstruct_grid.h
index 597e8632..e1a9f6d0 100644
--- a/external/hypre/src/sstruct_mv/sstruct_grid.h
+++ b/external/hypre/src/sstruct_mv/sstruct_grid.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -49,7 +49,7 @@ typedef struct
    HYPRE_SStructVariable  *vartypes;         /* types of variables */
    hypre_StructGrid       *sgrids[8];        /* struct grids for each vartype */
    hypre_BoxArray         *iboxarrays[8];    /* interface boxes */
-                                       
+
    hypre_BoxArray         *pneighbors;
    hypre_Index            *pnbor_offsets;
 
@@ -58,10 +58,10 @@ typedef struct
 
    hypre_Index             periodic;         /* Indicates if pgrid is periodic */
 
-  /* GEC0902 additions for ghost expansion of boxes */
+   /* GEC0902 additions for ghost expansion of boxes */
 
    HYPRE_Int               ghlocal_size;     /* Number of vars including ghosts */
-                           
+
    HYPRE_Int               cell_sgrid_done;  /* =1 implies cell grid already assembled */
 } hypre_SStructPGrid;
 
@@ -85,7 +85,7 @@ typedef struct
 {
    HYPRE_Int  type;
    HYPRE_BigInt offset;
-   HYPRE_BigInt ghoffset; 
+   HYPRE_BigInt ghoffset;
 
 } hypre_SStructBoxManInfo;
 
@@ -96,13 +96,13 @@ typedef struct
    HYPRE_BigInt ghoffset; /* minimum offset ghost for this box */
    HYPRE_Int    proc;     /* redundant with the proc in the entry, but
                              makes some coding easier */
-   HYPRE_Int    boxnum;   /* this is different from the entry id */ 
+   HYPRE_Int    boxnum;   /* this is different from the entry id */
    HYPRE_Int    part;     /* part the box lives on */
    hypre_Index  ilower;   /* box ilower, but on the neighbor index-space */
    hypre_Index  coord;    /* lives on local index-space */
    hypre_Index  dir;      /* lives on local index-space */
    hypre_Index  stride;   /* lives on local index-space */
-   hypre_Index  ghstride; /* the ghost equivalent of strides */ 
+   hypre_Index  ghstride; /* the ghost equivalent of strides */
 
 } hypre_SStructBoxManNborInfo;
 
@@ -113,7 +113,7 @@ typedef struct
    HYPRE_Int        recv_part;
    HYPRE_Int        send_var;
    HYPRE_Int        recv_var;
-   
+
 } hypre_SStructCommInfo;
 
 typedef struct hypre_SStructGrid_struct
@@ -121,11 +121,11 @@ typedef struct hypre_SStructGrid_struct
    MPI_Comm                   comm;
    HYPRE_Int                  ndim;
    HYPRE_Int                  nparts;
-                          
-   /* s-variable info */  
+
+   /* s-variable info */
    hypre_SStructPGrid       **pgrids;
-                          
-   /* neighbor info */    
+
+   /* neighbor info */
    HYPRE_Int                 *nneighbors;
    hypre_SStructNeighbor    **neighbors;
    hypre_Index              **nbor_offsets;
@@ -152,14 +152,14 @@ typedef struct hypre_SStructGrid_struct
 
    HYPRE_Int                  local_size;  /* Number of variables locally */
    HYPRE_BigInt               global_size; /* Total number of variables */
-                              
+
    HYPRE_Int                  ref_count;
 
- /* GEC0902 additions for ghost expansion of boxes */
+   /* GEC0902 additions for ghost expansion of boxes */
 
    HYPRE_Int               ghlocal_size;  /* GEC0902 Number of vars including ghosts */
    HYPRE_BigInt            ghstart_rank;  /* GEC0902 start rank including ghosts  */
-   HYPRE_Int               num_ghost[2*HYPRE_MAXDIM]; /* ghost layer size */  
+   HYPRE_Int               num_ghost[2 * HYPRE_MAXDIM]; /* ghost layer size */
 
 } hypre_SStructGrid;
 
diff --git a/external/hypre/src/sstruct_mv/sstruct_innerprod.c b/external/hypre/src/sstruct_mv/sstruct_innerprod.c
index 38ea8b62..56b3040a 100644
--- a/external/hypre/src/sstruct_mv/sstruct_innerprod.c
+++ b/external/hypre/src/sstruct_mv/sstruct_innerprod.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -54,9 +54,9 @@ hypre_SStructInnerProd( hypre_SStructVector *x,
    HYPRE_Real   presult;
    HYPRE_Int    part;
 
-   HYPRE_Int    x_object_type= hypre_SStructVectorObjectType(x);
-   HYPRE_Int    y_object_type= hypre_SStructVectorObjectType(y);
-   
+   HYPRE_Int    x_object_type = hypre_SStructVectorObjectType(x);
+   HYPRE_Int    y_object_type = hypre_SStructVectorObjectType(y);
+
    if (x_object_type != y_object_type)
    {
       hypre_error_in_arg(2);
@@ -84,9 +84,9 @@ hypre_SStructInnerProd( hypre_SStructVector *x,
       hypre_SStructVectorConvert(x, &x_par);
       hypre_SStructVectorConvert(y, &y_par);
 
-      result= hypre_ParVectorInnerProd(x_par, y_par);
+      result = hypre_ParVectorInnerProd(x_par, y_par);
    }
-                                                                                                                
+
    *result_ptr = result;
 
    return hypre_error_flag;
diff --git a/external/hypre/src/sstruct_mv/sstruct_matrix.c b/external/hypre/src/sstruct_mv/sstruct_matrix.c
index 38dace26..72e92aaa 100644
--- a/external/hypre/src/sstruct_mv/sstruct_matrix.c
+++ b/external/hypre/src/sstruct_mv/sstruct_matrix.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -235,7 +235,7 @@ hypre_SStructPMatrixInitialize( hypre_SStructPMatrix *pmatrix )
     * one to set shared coefficients correctly, but not exactly one? */
    for (d = 0; d < ndim; d++)
    {
-      num_ghost[2*d] = num_ghost[2*d+1] = 1;
+      num_ghost[2 * d] = num_ghost[2 * d + 1] = 1;
    }
 #endif
    for (vi = 0; vi < nvars; vi++)
@@ -392,7 +392,7 @@ hypre_SStructPMatrixSetBoxValues( hypre_SStructPMatrix *pmatrix,
                                   values, action, -1, 0);
    /* TODO: Why need DeviceSync? */
 #if defined(HYPRE_USING_GPU)
-   hypre_SyncCudaDevice(hypre_handle());
+   hypre_SyncDevice();
 #endif
    /* set (AddTo/Get) or clear (Set) values outside the grid in ghost zones */
    if (action != 0)
@@ -482,7 +482,7 @@ hypre_SStructPMatrixAccumulate( hypre_SStructPMatrix *pmatrix )
 
    hypre_StructMatrix    *smatrix;
    hypre_Index            varoffset;
-   HYPRE_Int              num_ghost[2*HYPRE_MAXDIM];
+   HYPRE_Int              num_ghost[2 * HYPRE_MAXDIM];
    hypre_StructGrid      *sgrid;
    HYPRE_Int              vi, vj, d;
 
@@ -508,7 +508,7 @@ hypre_SStructPMatrixAccumulate( hypre_SStructPMatrix *pmatrix )
             hypre_SStructVariableGetOffset(vartypes[vi], ndim, varoffset);
             for (d = 0; d < ndim; d++)
             {
-               num_ghost[2*d]   = num_ghost[2*d+1] = hypre_IndexD(varoffset, d);
+               num_ghost[2 * d]   = num_ghost[2 * d + 1] = hypre_IndexD(varoffset, d);
             }
 
             /* accumulate values from AddTo */
@@ -658,7 +658,8 @@ hypre_SStructUMatrixInitialize( hypre_SStructMatrix *matrix )
    hypre_SStructStencil   *stencil;
    HYPRE_Int              *split;
    HYPRE_Int               nvars;
-   HYPRE_Int               nrows, rowstart, nnzs ;
+   HYPRE_Int               nrows, nnzs ;
+   HYPRE_BigInt            rowstart;
    HYPRE_Int               part, var, entry, b, m, mi;
    HYPRE_Int              *row_sizes;
    HYPRE_Int               max_row_size;
@@ -690,7 +691,7 @@ hypre_SStructUMatrixInitialize( hypre_SStructMatrix *matrix )
    m = 0;
    max_row_size = 0;
    ghost_box = hypre_BoxCreate(ndim);
-   row_sizes = hypre_CTAlloc(HYPRE_Int,  nrows, HYPRE_MEMORY_HOST);
+   row_sizes = hypre_CTAlloc(HYPRE_Int, nrows, HYPRE_MEMORY_HOST);
    hypre_SetIndex(stride, 1);
    for (part = 0; part < nparts; part++)
    {
@@ -713,7 +714,7 @@ hypre_SStructUMatrixInitialize( hypre_SStructMatrix *matrix )
          /* TODO: For now, assume stencil is full/complete */
          if (hypre_SStructMatrixSymmetric(matrix))
          {
-            nnzs = 2*nnzs - 1;
+            nnzs = 2 * nnzs - 1;
          }
 #endif
          boxes = hypre_StructGridBoxes(sgrid);
@@ -729,12 +730,8 @@ hypre_SStructUMatrixInitialize( hypre_SStructMatrix *matrix )
             hypre_BoxGetSize(box, loop_size);
             zypre_BoxLoop1Begin(hypre_SStructMatrixNDim(matrix), loop_size,
                                 ghost_box, start, stride, mi);
-#ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(HYPRE_BOX_PRIVATE,mi) HYPRE_SMP_SCHEDULE
-#endif
-            zypre_BoxLoop1For(mi)
             {
-               row_sizes[m+mi] = nnzs;
+               row_sizes[m + mi] = nnzs;
             }
             zypre_BoxLoop1End(mi);
 
@@ -771,15 +768,17 @@ hypre_SStructUMatrixInitialize( hypre_SStructMatrix *matrix )
 
    hypre_TFree(row_sizes, HYPRE_MEMORY_HOST);
 
-   hypre_SStructMatrixTmpSize(matrix)            = max_row_size;
-   hypre_SStructMatrixTmpRowCoords(matrix)       = hypre_CTAlloc(HYPRE_BigInt,  max_row_size, HYPRE_MEMORY_HOST);
-   hypre_SStructMatrixTmpColCoords(matrix)       = hypre_CTAlloc(HYPRE_BigInt,  max_row_size, HYPRE_MEMORY_HOST);
-   hypre_SStructMatrixTmpCoeffs(matrix)          = hypre_CTAlloc(HYPRE_Complex, max_row_size, HYPRE_MEMORY_HOST);
-   hypre_SStructMatrixTmpRowCoordsDevice(matrix) = hypre_CTAlloc(HYPRE_BigInt,  max_row_size, HYPRE_MEMORY_DEVICE);
-   hypre_SStructMatrixTmpColCoordsDevice(matrix) = hypre_CTAlloc(HYPRE_BigInt,  max_row_size, HYPRE_MEMORY_DEVICE);
-   hypre_SStructMatrixTmpCoeffsDevice(matrix)    = hypre_CTAlloc(HYPRE_Complex, max_row_size, HYPRE_MEMORY_DEVICE);
+   hypre_SStructMatrixTmpSize(matrix) = max_row_size;
+   hypre_SStructMatrixTmpRowCoords(matrix) = hypre_CTAlloc(HYPRE_BigInt, max_row_size,
+                                                           HYPRE_MEMORY_HOST);
+   hypre_SStructMatrixTmpColCoords(matrix) = hypre_CTAlloc(HYPRE_BigInt, max_row_size,
+                                                           HYPRE_MEMORY_HOST);
+   hypre_SStructMatrixTmpCoeffs(matrix)    = hypre_CTAlloc(HYPRE_Complex, max_row_size,
+                                                           HYPRE_MEMORY_HOST);
 
    HYPRE_IJMatrixInitialize(ijmatrix);
+   HYPRE_IJMatrixGetObject(ijmatrix,
+                           (void **) &hypre_SStructMatrixParCSRMatrix(matrix));
 
    return hypre_error_flag;
 }
@@ -825,12 +824,15 @@ hypre_SStructUMatrixSetValues( hypre_SStructMatrix *matrix,
    HYPRE_BigInt             Uverank;
    HYPRE_Int                matrix_type = hypre_SStructMatrixObjectType(matrix);
    HYPRE_Complex           *h_values;
+   HYPRE_MemoryLocation     memory_location = hypre_IJMatrixMemoryLocation(ijmatrix);
 
    hypre_SStructGridFindBoxManEntry(grid, part, index, var, &boxman_entry);
 
    /* if not local, check neighbors */
    if (boxman_entry == NULL)
+   {
       hypre_SStructGridFindNborBoxManEntry(grid, part, index, var, &boxman_entry);
+   }
 
    if (boxman_entry == NULL)
    {
@@ -848,13 +850,12 @@ hypre_SStructUMatrixSetValues( hypre_SStructMatrix *matrix,
                                          &row_coord, matrix_type);
 
    col_coords = hypre_SStructMatrixTmpColCoords(matrix);
-   coeffs     = hypre_SStructMatrixTmpCoeffs(matrix);
+   coeffs = hypre_SStructMatrixTmpCoeffs(matrix);
 
-   /* RL: copy values to host since the following for-loop is on CPU */
-   if ( hypre_GetActualMemLocation(HYPRE_MEMORY_DEVICE) != hypre_MEMORY_HOST )
+   if ( hypre_GetExecPolicy1(memory_location) == HYPRE_EXEC_DEVICE )
    {
       h_values = hypre_TAlloc(HYPRE_Complex, nentries, HYPRE_MEMORY_HOST);
-      hypre_TMemcpy(h_values, values, HYPRE_Complex, nentries, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
+      hypre_TMemcpy(h_values, values, HYPRE_Complex, nentries, HYPRE_MEMORY_HOST, memory_location);
    }
    else
    {
@@ -886,7 +887,7 @@ hypre_SStructUMatrixSetValues( hypre_SStructMatrix *matrix,
          if (boxman_entry != NULL)
          {
             hypre_SStructBoxManEntryGetGlobalRank(boxman_entry, to_index,
-                                                  &col_coords[ncoeffs],matrix_type);
+                                                  &col_coords[ncoeffs], matrix_type);
 
             coeffs[ncoeffs] = h_values[i];
             ncoeffs++;
@@ -908,34 +909,51 @@ hypre_SStructUMatrixSetValues( hypre_SStructMatrix *matrix,
       }
    }
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-   HYPRE_BigInt  *d_row_coords = hypre_SStructMatrixTmpRowCoordsDevice(matrix);
-   HYPRE_BigInt  *d_col_coords = hypre_SStructMatrixTmpColCoordsDevice(matrix);
-   HYPRE_Complex *d_coeffs     = hypre_SStructMatrixTmpCoeffsDevice(matrix);
-
-   if ( hypre_GetExecPolicy1(hypre_IJMatrixMemoryLocation(ijmatrix)) == HYPRE_EXEC_DEVICE )
+#if defined(HYPRE_USING_GPU)
+   if ( hypre_GetExecPolicy1(memory_location) == HYPRE_EXEC_DEVICE )
    {
-      hypreDevice_BigIntFilln(d_row_coords, ncoeffs, row_coord);
-      hypre_TMemcpy(d_col_coords, col_coords, HYPRE_BigInt, ncoeffs, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
-      hypre_TMemcpy(d_coeffs, coeffs, HYPRE_Complex, ncoeffs, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
+      if (!hypre_SStructMatrixTmpRowCoordsDevice(matrix))
+      {
+         hypre_SStructMatrixTmpRowCoordsDevice(matrix) =
+            hypre_CTAlloc(HYPRE_BigInt, hypre_SStructMatrixTmpSize(matrix), memory_location);
+      }
+
+      if (!hypre_SStructMatrixTmpColCoordsDevice(matrix))
+      {
+         hypre_SStructMatrixTmpColCoordsDevice(matrix) =
+            hypre_CTAlloc(HYPRE_BigInt, hypre_SStructMatrixTmpSize(matrix), memory_location);
+      }
+
+      if (!hypre_SStructMatrixTmpCoeffsDevice(matrix))
+      {
+         hypre_SStructMatrixTmpCoeffsDevice(matrix) =
+            hypre_CTAlloc(HYPRE_Complex, hypre_SStructMatrixTmpSize(matrix), memory_location);
+      }
+
+      hypreDevice_BigIntFilln(hypre_SStructMatrixTmpRowCoordsDevice(matrix), ncoeffs, row_coord);
+
+      hypre_TMemcpy(hypre_SStructMatrixTmpColCoordsDevice(matrix), col_coords, HYPRE_BigInt, ncoeffs,
+                    memory_location, HYPRE_MEMORY_HOST);
+
+      hypre_TMemcpy(hypre_SStructMatrixTmpCoeffsDevice(matrix), coeffs, HYPRE_Complex, ncoeffs,
+                    memory_location, HYPRE_MEMORY_HOST);
 
       if (action > 0)
       {
-         HYPRE_IJMatrixAddToValues(ijmatrix, ncoeffs, NULL, d_row_coords,
-                                   (const HYPRE_BigInt *) d_col_coords,
-                                   (const HYPRE_Complex *) d_coeffs);
+         HYPRE_IJMatrixAddToValues(ijmatrix, ncoeffs, NULL, hypre_SStructMatrixTmpRowCoordsDevice(matrix),
+                                   (const HYPRE_BigInt *) hypre_SStructMatrixTmpColCoordsDevice(matrix),
+                                   (const HYPRE_Complex *) hypre_SStructMatrixTmpCoeffsDevice(matrix));
       }
       else if (action > -1)
       {
-         HYPRE_IJMatrixSetValues(ijmatrix, ncoeffs, NULL, d_row_coords,
-                                 (const HYPRE_BigInt *) d_col_coords,
-                                 (const HYPRE_Complex *) d_coeffs);
+         HYPRE_IJMatrixSetValues(ijmatrix, ncoeffs, NULL, hypre_SStructMatrixTmpRowCoordsDevice(matrix),
+                                 (const HYPRE_BigInt *) hypre_SStructMatrixTmpColCoordsDevice(matrix),
+                                 (const HYPRE_Complex *) hypre_SStructMatrixTmpCoeffsDevice(matrix));
       }
       else
       {
          // RL:TODO
-         HYPRE_IJMatrixGetValues(ijmatrix, 1, &ncoeffs, &row_coord,
-                                 col_coords, values);
+         HYPRE_IJMatrixGetValues(ijmatrix, 1, &ncoeffs, &row_coord, col_coords, values);
       }
    }
    else
@@ -1020,7 +1038,7 @@ hypre_SStructUMatrixSetBoxValues( hypre_SStructMatrix *matrix,
    HYPRE_Int            *ncols, *row_indexes;;
    HYPRE_BigInt         *rows, *cols;
    HYPRE_Complex        *ijvalues;
-   hypre_Box            *box;
+   hypre_Box            *box = hypre_BoxCreate(ndim);
    hypre_Box            *to_box;
    hypre_Box            *map_box;
    hypre_Box            *int_box;
@@ -1030,8 +1048,7 @@ hypre_SStructUMatrixSetBoxValues( hypre_SStructMatrix *matrix,
    HYPRE_BigInt          row_base, col_base;
    HYPRE_Int             ei, entry, ii, jj;
    HYPRE_Int             matrix_type = hypre_SStructMatrixObjectType(matrix);
-
-   box  = hypre_BoxCreate(ndim);
+   HYPRE_MemoryLocation  memory_location = hypre_IJMatrixMemoryLocation(ijmatrix);
 
    /*------------------------------------------
     * all stencil entries
@@ -1044,11 +1061,11 @@ hypre_SStructUMatrixSetBoxValues( hypre_SStructMatrix *matrix,
       int_box = hypre_BoxCreate(ndim);
 
       nrows       = hypre_BoxVolume(set_box);
-      ncols       = hypre_CTAlloc(HYPRE_Int,     nrows,          HYPRE_MEMORY_DEVICE);
-      rows        = hypre_CTAlloc(HYPRE_BigInt,  nrows,          HYPRE_MEMORY_DEVICE);
-      row_indexes = hypre_CTAlloc(HYPRE_Int,     nrows,          HYPRE_MEMORY_DEVICE);
-      cols        = hypre_CTAlloc(HYPRE_BigInt,  nrows*nentries, HYPRE_MEMORY_DEVICE);
-      ijvalues    = hypre_CTAlloc(HYPRE_Complex, nrows*nentries, HYPRE_MEMORY_DEVICE);
+      ncols       = hypre_CTAlloc(HYPRE_Int,     nrows,            memory_location);
+      rows        = hypre_CTAlloc(HYPRE_BigInt,  nrows,            memory_location);
+      row_indexes = hypre_CTAlloc(HYPRE_Int,     nrows,            memory_location);
+      cols        = hypre_CTAlloc(HYPRE_BigInt,  nrows * nentries, memory_location);
+      ijvalues    = hypre_CTAlloc(HYPRE_Complex, nrows * nentries, memory_location);
 
       hypre_SetIndex(stride, 1);
 
@@ -1076,7 +1093,7 @@ hypre_SStructUMatrixSetBoxValues( hypre_SStructMatrix *matrix,
          hypre_LoopBegin(nrows, i)
          {
             ncols[i] = 0;
-            row_indexes[i] = i*nentries;
+            row_indexes[i] = i * nentries;
          }
          hypre_LoopEnd()
 #undef DEVICE_VAR
@@ -1116,78 +1133,98 @@ hypre_SStructUMatrixSetBoxValues( hypre_SStructMatrix *matrix,
                hypre_BoxGetSize(int_box, loop_size);
 
 #if defined(HYPRE_USING_GPU)
-               hypre_assert(ndim <= 3);
-
-               HYPRE_Int rs_0, rs_1, rs_2;
-               HYPRE_Int cs_0, cs_1, cs_2;
-
-               if (ndim > 0)
-               {
-                  rs_0 = rs[0];
-                  cs_0 = cs[0];
-               }
-
-               if (ndim > 1)
-               {
-                  rs_1 = rs[1];
-                  cs_1 = cs[1];
-               }
-
-               if (ndim > 2)
-               {
-                  rs_2 = rs[2];
-                  cs_2 = cs[2];
-               }
-#endif
-
-#undef DEVICE_VAR
-#define DEVICE_VAR is_device_ptr(ncols,rows,cols,ijvalues,values)
-               hypre_BoxLoop2Begin(ndim, loop_size,
-                                   box,       start, stride, mi,
-                                   value_box, start, stride, vi);
                {
-                  hypre_Index index;
-                  HYPRE_Int   ci;
+                  hypre_assert(ndim <= 3);
 
-                  hypre_BoxLoopGetIndex(index);
+                  HYPRE_Int rs_0, rs_1, rs_2;
+                  HYPRE_Int cs_0, cs_1, cs_2;
 
-                  ci = mi*nentries + ncols[mi];
-                  rows[mi] = row_base;
-                  cols[ci] = col_base;
-
-#if defined(HYPRE_USING_GPU)
                   if (ndim > 0)
                   {
-                     rows[mi] += index[0] * rs_0;
-                     cols[ci] += index[0] * cs_0;
+                     rs_0 = rs[0];
+                     cs_0 = cs[0];
                   }
 
                   if (ndim > 1)
                   {
-                     rows[mi] += index[1] * rs_1;
-                     cols[ci] += index[1] * cs_1;
+                     rs_1 = rs[1];
+                     cs_1 = cs[1];
                   }
 
                   if (ndim > 2)
                   {
-                     rows[mi] += index[2] * rs_2;
-                     cols[ci] += index[2] * cs_2;
+                     rs_2 = rs[2];
+                     cs_2 = cs[2];
                   }
-#else
-                  HYPRE_Int d;
-                  for (d = 0; d < ndim; d++)
+
+#undef DEVICE_VAR
+#define DEVICE_VAR is_device_ptr(ncols,rows,cols,ijvalues,values)
+                  hypre_BoxLoop2Begin(ndim, loop_size,
+                                      box,       start, stride, mi,
+                                      value_box, start, stride, vi);
                   {
-                     rows[mi] += index[d]*rs[d];
-                     cols[ci] += index[d]*cs[d];
-                  }
-#endif
+                     hypre_Index index;
+                     HYPRE_Int   ci;
 
-                  ijvalues[ci] = values[ei + vi*nentries];
-                  ncols[mi]++;
-               }
-               hypre_BoxLoop2End(mi, vi);
+                     hypre_BoxLoopGetIndex(index);
+
+                     ci = mi * nentries + ncols[mi];
+                     rows[mi] = row_base;
+                     cols[ci] = col_base;
+
+                     if (ndim > 0)
+                     {
+                        rows[mi] += index[0] * rs_0;
+                        cols[ci] += index[0] * cs_0;
+                     }
+
+                     if (ndim > 1)
+                     {
+                        rows[mi] += index[1] * rs_1;
+                        cols[ci] += index[1] * cs_1;
+                     }
+
+                     if (ndim > 2)
+                     {
+                        rows[mi] += index[2] * rs_2;
+                        cols[ci] += index[2] * cs_2;
+                     }
+
+                     ijvalues[ci] = values[ei + vi * nentries];
+                     ncols[mi]++;
+                  }
+                  hypre_BoxLoop2End(mi, vi);
 #undef DEVICE_VAR
 #define DEVICE_VAR
+               }
+#else
+               {
+                  hypre_BoxLoop2Begin(ndim, loop_size,
+                                      box,       start, stride, mi,
+                                      value_box, start, stride, vi);
+                  {
+                     hypre_Index index;
+                     HYPRE_Int   ci;
+
+                     hypre_BoxLoopGetIndex(index);
+
+                     ci = mi * nentries + ncols[mi];
+                     rows[mi] = row_base;
+                     cols[ci] = col_base;
+
+                     HYPRE_Int d;
+                     for (d = 0; d < ndim; d++)
+                     {
+                        rows[mi] += index[d] * rs[d];
+                        cols[ci] += index[d] * cs[d];
+                     }
+
+                     ijvalues[ci] = values[ei + vi * nentries];
+                     ncols[mi]++;
+                  }
+                  hypre_BoxLoop2End(mi, vi);
+               }
+#endif
             } /* end loop through boxman to entries */
 
             hypre_TFree(boxman_to_entries, HYPRE_MEMORY_HOST);
@@ -1219,11 +1256,11 @@ hypre_SStructUMatrixSetBoxValues( hypre_SStructMatrix *matrix,
 
       hypre_TFree(boxman_entries, HYPRE_MEMORY_HOST);
 
-      hypre_TFree(ncols, HYPRE_MEMORY_DEVICE);
-      hypre_TFree(rows, HYPRE_MEMORY_DEVICE);
-      hypre_TFree(row_indexes, HYPRE_MEMORY_DEVICE);
-      hypre_TFree(cols, HYPRE_MEMORY_DEVICE);
-      hypre_TFree(ijvalues, HYPRE_MEMORY_DEVICE);
+      hypre_TFree(ncols, memory_location);
+      hypre_TFree(rows, memory_location);
+      hypre_TFree(row_indexes, memory_location);
+      hypre_TFree(cols, memory_location);
+      hypre_TFree(ijvalues, memory_location);
 
       hypre_BoxDestroy(to_box);
       hypre_BoxDestroy(map_box);
@@ -1263,8 +1300,6 @@ hypre_SStructUMatrixAssemble( hypre_SStructMatrix *matrix )
    HYPRE_IJMatrix ijmatrix = hypre_SStructMatrixIJMatrix(matrix);
 
    HYPRE_IJMatrixAssemble(ijmatrix);
-   HYPRE_IJMatrixGetObject(
-      ijmatrix, (void **) &hypre_SStructMatrixParCSRMatrix(matrix));
 
    return hypre_error_flag;
 }
@@ -1507,6 +1542,8 @@ hypre_SStructMatrixSetInterPartValues( HYPRE_SStructMatrix  matrix,
    HYPRE_Int                tvalues_size = 0;
    HYPRE_Int                nfrentries, ntoentries, frpart, topart;
    HYPRE_Int                entry, sentry, ei, fri, toi;
+   HYPRE_MemoryLocation     memory_location = hypre_IJMatrixMemoryLocation(hypre_SStructMatrixIJMatrix(
+                                                                              matrix));
 
    pmatrix = hypre_SStructMatrixPMatrix(matrix, part);
 
@@ -1589,7 +1626,8 @@ hypre_SStructMatrixSetInterPartValues( HYPRE_SStructMatrix  matrix,
                if (hypre_BoxVolume(ibox1))
                {
                   HYPRE_Int tvalues_new_size = hypre_BoxVolume(ibox1);
-                  tvalues = hypre_TReAlloc_v2(tvalues, HYPRE_Complex, tvalues_size, HYPRE_Complex, tvalues_new_size, HYPRE_MEMORY_DEVICE);
+                  tvalues = hypre_TReAlloc_v2(tvalues, HYPRE_Complex, tvalues_size, HYPRE_Complex, tvalues_new_size,
+                                              memory_location);
                   tvalues_size = tvalues_new_size;
 
                   if (action >= 0)
@@ -1605,7 +1643,7 @@ hypre_SStructMatrixSetInterPartValues( HYPRE_SStructMatrix  matrix,
                                          ibox1, start, stride, mi,
                                          value_box, start, stride, vi);
                      {
-                        tvalues[mi] = values[ei + vi*nentries];
+                        tvalues[mi] = values[ei + vi * nentries];
                      }
                      hypre_BoxLoop2End(mi, vi);
 #undef DEVICE_VAR
@@ -1634,7 +1672,7 @@ hypre_SStructMatrixSetInterPartValues( HYPRE_SStructMatrix  matrix,
                                          ibox1, start, stride, mi,
                                          value_box, start, stride, vi);
                      {
-                        values[ei + vi*nentries] = tvalues[mi];
+                        values[ei + vi * nentries] = tvalues[mi];
                      }
                      hypre_BoxLoop2End(mi, vi);
 #undef DEVICE_VAR
@@ -1653,7 +1691,33 @@ hypre_SStructMatrixSetInterPartValues( HYPRE_SStructMatrix  matrix,
    hypre_BoxDestroy(ibox1);
    hypre_BoxDestroy(tobox);
    hypre_BoxDestroy(frbox);
-   hypre_TFree(tvalues, HYPRE_MEMORY_DEVICE);
+   hypre_TFree(tvalues, memory_location);
 
    return hypre_error_flag;
 }
+
+HYPRE_MemoryLocation
+hypre_SStructMatrixMemoryLocation(hypre_SStructMatrix *matrix)
+{
+   HYPRE_Int type = hypre_SStructMatrixObjectType(matrix);
+
+   if (type == HYPRE_SSTRUCT)
+   {
+      return hypre_ParCSRMatrixMemoryLocation(hypre_SStructMatrixParCSRMatrix(matrix));
+   }
+
+   void *object;
+   HYPRE_SStructMatrixGetObject(matrix, &object);
+
+   if (type == HYPRE_PARCSR)
+   {
+      return hypre_ParCSRMatrixMemoryLocation((hypre_ParCSRMatrix *) object);
+   }
+
+   if (type == HYPRE_STRUCT)
+   {
+      return hypre_StructMatrixMemoryLocation((hypre_StructMatrix *) object);
+   }
+
+   return HYPRE_MEMORY_UNDEFINED;
+}
diff --git a/external/hypre/src/sstruct_mv/sstruct_matrix.h b/external/hypre/src/sstruct_mv/sstruct_matrix.h
index c14ede0b..84c17430 100644
--- a/external/hypre/src/sstruct_mv/sstruct_matrix.h
+++ b/external/hypre/src/sstruct_mv/sstruct_matrix.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -76,7 +76,7 @@ typedef struct hypre_SStructMatrix_struct
 
    HYPRE_Int               ref_count;
 
-  /* GEC0902   adding an object type to the matrix  */
+   /* GEC0902   adding an object type to the matrix  */
    HYPRE_Int               object_type;
 
 } hypre_SStructMatrix;
diff --git a/external/hypre/src/sstruct_mv/sstruct_matvec.c b/external/hypre/src/sstruct_mv/sstruct_matvec.c
index a8886f1e..5f0ef3e3 100644
--- a/external/hypre/src/sstruct_mv/sstruct_matvec.c
+++ b/external/hypre/src/sstruct_mv/sstruct_matvec.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -280,8 +280,8 @@ hypre_SStructMatvecCompute( void                *matvec_vdata,
    hypre_ParVector          *pary;
 
    HYPRE_Int                 part;
-   HYPRE_Int                 x_object_type= hypre_SStructVectorObjectType(x);
-   HYPRE_Int                 A_object_type= hypre_SStructMatrixObjectType(A);
+   HYPRE_Int                 x_object_type = hypre_SStructVectorObjectType(x);
+   HYPRE_Int                 A_object_type = hypre_SStructMatrixObjectType(A);
 
    if (x_object_type != A_object_type)
    {
@@ -292,7 +292,7 @@ hypre_SStructMatvecCompute( void                *matvec_vdata,
 
    if ( (x_object_type == HYPRE_SSTRUCT) || (x_object_type == HYPRE_STRUCT) )
    {
-     /* do S-matrix computations */
+      /* do S-matrix computations */
       for (part = 0; part < nparts; part++)
       {
          pdata = pmatvec_data[part];
@@ -307,38 +307,38 @@ hypre_SStructMatvecCompute( void                *matvec_vdata,
 
          /* do U-matrix computations */
 
-         /* GEC1002 the data chunk pointed by the local-parvectors 
+         /* GEC1002 the data chunk pointed by the local-parvectors
           *  inside the semistruct vectors x and y is now identical to the
           *  data chunk of the structure vectors x and y. The role of the function
           *  convert is to pass the addresses of the data chunk
-          *  to the parx and pary. */  
+          *  to the parx and pary. */
 
          hypre_SStructVectorConvert(x, &parx);
-         hypre_SStructVectorConvert(y, &pary); 
+         hypre_SStructVectorConvert(y, &pary);
 
          hypre_ParCSRMatrixMatvec(alpha, parcsrA, parx, 1.0, pary);
 
          /* dummy functions since there is nothing to restore  */
 
          hypre_SStructVectorRestore(x, NULL);
-         hypre_SStructVectorRestore(y, pary); 
+         hypre_SStructVectorRestore(y, pary);
 
-         parx = NULL; 
+         parx = NULL;
       }
 
-  }
+   }
 
-  else if (x_object_type == HYPRE_PARCSR)
-  {
+   else if (x_object_type == HYPRE_PARCSR)
+   {
       hypre_SStructVectorConvert(x, &parx);
       hypre_SStructVectorConvert(y, &pary);
 
       hypre_ParCSRMatrixMatvec(alpha, parcsrA, parx, beta, pary);
 
       hypre_SStructVectorRestore(x, NULL);
-      hypre_SStructVectorRestore(y, pary); 
+      hypre_SStructVectorRestore(y, pary);
 
-      parx = NULL; 
+      parx = NULL;
    }
 
    return hypre_error_flag;
diff --git a/external/hypre/src/sstruct_mv/sstruct_scale.c b/external/hypre/src/sstruct_mv/sstruct_scale.c
index 189a928e..f7a1ebbc 100644
--- a/external/hypre/src/sstruct_mv/sstruct_scale.c
+++ b/external/hypre/src/sstruct_mv/sstruct_scale.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -40,7 +40,7 @@ hypre_SStructScale( HYPRE_Complex        alpha,
 {
    HYPRE_Int nparts = hypre_SStructVectorNParts(y);
    HYPRE_Int part;
-   HYPRE_Int y_object_type= hypre_SStructVectorObjectType(y);
+   HYPRE_Int y_object_type = hypre_SStructVectorObjectType(y);
 
    if (y_object_type == HYPRE_SSTRUCT)
    {
@@ -53,7 +53,7 @@ hypre_SStructScale( HYPRE_Complex        alpha,
    else if (y_object_type == HYPRE_PARCSR)
    {
       hypre_ParVector  *y_par;
-  
+
       hypre_SStructVectorConvert(y, &y_par);
       hypre_ParVectorScale(alpha, y_par);
    }
diff --git a/external/hypre/src/sstruct_mv/sstruct_stencil.c b/external/hypre/src/sstruct_mv/sstruct_stencil.c
index 074e10b5..1406cdc9 100644
--- a/external/hypre/src/sstruct_mv/sstruct_stencil.c
+++ b/external/hypre/src/sstruct_mv/sstruct_stencil.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -20,4 +20,3 @@ hypre_SStructStencilRef( hypre_SStructStencil  *stencil,
 
    return hypre_error_flag;
 }
-
diff --git a/external/hypre/src/sstruct_mv/sstruct_stencil.h b/external/hypre/src/sstruct_mv/sstruct_stencil.h
index d5aeaaab..994218a0 100644
--- a/external/hypre/src/sstruct_mv/sstruct_stencil.h
+++ b/external/hypre/src/sstruct_mv/sstruct_stencil.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/sstruct_mv/sstruct_vector.c b/external/hypre/src/sstruct_mv/sstruct_vector.c
index 930485b0..1eaf4d8c 100644
--- a/external/hypre/src/sstruct_mv/sstruct_vector.c
+++ b/external/hypre/src/sstruct_mv/sstruct_vector.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -247,7 +247,7 @@ hypre_SStructPVectorSetBoxValues( hypre_SStructPVector *pvector,
 
    /* TODO: Why need DeviceSync? */
 #if defined(HYPRE_USING_GPU)
-   hypre_SyncCudaDevice(hypre_handle());
+   hypre_SyncDevice();
 #endif
    /* set (AddTo/Get) or clear (Set) values outside the grid in ghost zones */
    if (action != 0)
@@ -341,7 +341,7 @@ hypre_SStructPVectorAccumulate( hypre_SStructPVector *pvector )
    HYPRE_SStructVariable *vartypes  = hypre_SStructPGridVarTypes(pgrid);
 
    hypre_Index            varoffset;
-   HYPRE_Int              num_ghost[2*HYPRE_MAXDIM];
+   HYPRE_Int              num_ghost[2 * HYPRE_MAXDIM];
    hypre_StructGrid      *sgrid;
    HYPRE_Int              var, d;
 
@@ -359,7 +359,7 @@ hypre_SStructPVectorAccumulate( hypre_SStructPVector *pvector )
          hypre_SStructVariableGetOffset(vartypes[var], ndim, varoffset);
          for (d = 0; d < ndim; d++)
          {
-            num_ghost[2*d]   = num_ghost[2*d+1] = hypre_IndexD(varoffset, d);
+            num_ghost[2 * d]   = num_ghost[2 * d + 1] = hypre_IndexD(varoffset, d);
          }
 
          hypre_CreateCommInfoFromNumGhost(sgrid, num_ghost, &comm_info);
@@ -642,7 +642,7 @@ hypre_SStructVectorParConvert( hypre_SStructVector  *vector,
                                 y_data_box, start, stride, yi,
                                 box,        start, stride, bi);
             {
-               pardata[pari+bi] = yp[yi];
+               pardata[pari + bi] = yp[yi];
             }
             hypre_BoxLoop2End(yi, bi);
 #undef DEVICE_VAR
@@ -667,6 +667,9 @@ HYPRE_Int
 hypre_SStructVectorRestore( hypre_SStructVector *vector,
                             hypre_ParVector     *parvector )
 {
+   HYPRE_UNUSED_VAR(vector);
+   HYPRE_UNUSED_VAR(parvector);
+
    return hypre_error_flag;
 }
 
@@ -728,7 +731,7 @@ hypre_SStructVectorParRestore( hypre_SStructVector *vector,
                                    y_data_box, start, stride, yi,
                                    box,        start, stride, bi);
                {
-                  yp[yi] = pardata[pari+bi];
+                  yp[yi] = pardata[pari + bi];
                }
                hypre_BoxLoop2End(yi, bi);
 #undef DEVICE_VAR
@@ -764,7 +767,7 @@ hypre_SStructPVectorInitializeShell( hypre_SStructPVector *pvector)
    pdatasize = 0;
    pdataindices = hypre_CTAlloc(HYPRE_Int,  nvars, HYPRE_MEMORY_HOST);
 
-   for (var =0; var < nvars; var++)
+   for (var = 0; var < nvars; var++)
    {
       svector = hypre_SStructPVectorSVector(pvector, var);
       hypre_StructVectorInitializeShell(svector);
@@ -778,7 +781,7 @@ hypre_SStructPVectorInitializeShell( hypre_SStructPVector *pvector)
     * for this part                                                  */
 
    hypre_SStructPVectorDataIndices(pvector) = pdataindices;
-   hypre_SStructPVectorDataSize(pvector) = pdatasize+nucvars ;
+   hypre_SStructPVectorDataSize(pvector) = pdatasize + nucvars ;
 
    hypre_SStructPVectorAccumulated(pvector) = 0;
 
@@ -822,24 +825,52 @@ hypre_SStructVectorInitializeShell( hypre_SStructVector *vector)
 HYPRE_Int
 hypre_SStructVectorClearGhostValues(hypre_SStructVector *vector)
 {
-   HYPRE_Int              nparts= hypre_SStructVectorNParts(vector);
+   HYPRE_Int              nparts = hypre_SStructVectorNParts(vector);
    hypre_SStructPVector  *pvector;
    hypre_StructVector    *svector;
 
    HYPRE_Int    part;
    HYPRE_Int    nvars, var;
 
-   for (part= 0; part< nparts; part++)
+   for (part = 0; part < nparts; part++)
    {
-      pvector= hypre_SStructVectorPVector(vector, part);
+      pvector = hypre_SStructVectorPVector(vector, part);
       nvars  = hypre_SStructPVectorNVars(pvector);
 
-      for (var= 0; var< nvars; var++)
+      for (var = 0; var < nvars; var++)
       {
-         svector= hypre_SStructPVectorSVector(pvector, var);
+         svector = hypre_SStructPVectorSVector(pvector, var);
          hypre_StructVectorClearGhostValues(svector);
       }
    }
 
    return hypre_error_flag;
 }
+
+HYPRE_MemoryLocation
+hypre_SStructVectorMemoryLocation(hypre_SStructVector *vector)
+{
+   HYPRE_Int type = hypre_SStructVectorObjectType(vector);
+
+   if (type == HYPRE_SSTRUCT)
+   {
+      hypre_ParVector *parvector;
+      hypre_SStructVectorConvert(vector, &parvector);
+      return hypre_ParVectorMemoryLocation(parvector);
+   }
+
+   void *object;
+   HYPRE_SStructVectorGetObject(vector, &object);
+
+   if (type == HYPRE_PARCSR)
+   {
+      return hypre_ParVectorMemoryLocation((hypre_ParVector *) object);
+   }
+
+   if (type == HYPRE_STRUCT)
+   {
+      return hypre_StructVectorMemoryLocation((hypre_StructVector *) object);
+   }
+
+   return HYPRE_MEMORY_UNDEFINED;
+}
diff --git a/external/hypre/src/sstruct_mv/sstruct_vector.h b/external/hypre/src/sstruct_mv/sstruct_vector.h
index 47bc9726..58701084 100644
--- a/external/hypre/src/sstruct_mv/sstruct_vector.h
+++ b/external/hypre/src/sstruct_mv/sstruct_vector.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -31,7 +31,7 @@ typedef struct
 
    HYPRE_Int               ref_count;
 
-   HYPRE_Int              *dataindices;  /* GEC1002 array for starting index of the 
+   HYPRE_Int              *dataindices;  /* GEC1002 array for starting index of the
                                             svector. pdataindices[varx] */
    HYPRE_Int               datasize;     /* Size of the pvector = sums size of svectors */
 
@@ -56,15 +56,13 @@ typedef struct hypre_SStructVector_struct
    /* inter-part communication info */
    HYPRE_Int               nbor_ncomms;  /* num comm_pkgs with neighbor parts */
 
-  /* GEC10020902 pointer to big chunk of memory and auxiliary information   */
-
-   HYPRE_Complex           *data;        /* GEC1002 pointer to chunk data  */
-   HYPRE_Int               *dataindices; /* GEC1002 dataindices[partx] is the starting index
-                                          of vector data for the part=partx    */
-   HYPRE_Int               datasize    ;  /* GEC1002 size of all data = ghlocalsize */
+   /* GEC10020902 pointer to big chunk of memory and auxiliary information */
+   HYPRE_Complex          *data;        /* GEC1002 pointer to chunk data */
+   HYPRE_Int              *dataindices; /* GEC1002 dataindices[partx] is the starting index
+                                           of vector data for the part=partx */
+   HYPRE_Int               datasize;    /* GEC1002 size of all data = ghlocalsize */
 
    HYPRE_Int               global_size;  /* Total number coefficients */
-
    HYPRE_Int               ref_count;
 
 } hypre_SStructVector;
diff --git a/external/hypre/src/struct_ls/CMakeLists.txt b/external/hypre/src/struct_ls/CMakeLists.txt
index 11d51c9e..95239832 100644
--- a/external/hypre/src/struct_ls/CMakeLists.txt
+++ b/external/hypre/src/struct_ls/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -73,14 +73,16 @@ set(SRCS
   sparse_msg_setup.c
   sparse_msg_setup_rap.c
   sparse_msg_solve.c
+  F90_HYPRE_struct_flexgmres.c
+  F90_HYPRE_struct_lgmres.c
 )
 target_sources(${PROJECT_NAME}
   PRIVATE ${SRCS}
           ${HDRS}
 )
 
-if (HYPRE_USING_CUDA)
-  set(CUDA_SRCS
+if (HYPRE_USING_GPU)
+  set(GPU_SRCS
     cyclic_reduction.c
     HYPRE_struct_int.c
     HYPRE_struct_pcg.c
@@ -108,8 +110,8 @@ if (HYPRE_USING_CUDA)
     sparse_msg_interp.c
     sparse_msg_restrict.c
   )
-  convert_filenames_to_full_paths(CUDA_SRCS)
-  set(HYPRE_CUDA_SOURCES ${HYPRE_CUDA_SOURCES} ${CUDA_SRCS} PARENT_SCOPE)
+  convert_filenames_to_full_paths(GPU_SRCS)
+  set(HYPRE_GPU_SOURCES ${HYPRE_GPU_SOURCES} ${GPU_SRCS} PARENT_SCOPE)
 endif ()
 
 convert_filenames_to_full_paths(HDRS)
diff --git a/external/hypre/src/struct_ls/F90_HYPRE_struct_bicgstab.c b/external/hypre/src/struct_ls/F90_HYPRE_struct_bicgstab.c
index 16970e41..c55c1c73 100644
--- a/external/hypre/src/struct_ls/F90_HYPRE_struct_bicgstab.c
+++ b/external/hypre/src/struct_ls/F90_HYPRE_struct_bicgstab.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -17,14 +17,14 @@ extern "C" {
 
 void
 hypre_F90_IFACE(hypre_structbicgstabcreate, HYPRE_STRUCTBICGSTABCREATE)
-   ( hypre_F90_Comm *comm,
-     hypre_F90_Obj *solver,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Comm *comm,
+  hypre_F90_Obj *solver,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructBiCGSTABCreate(
-           hypre_F90_PassComm (comm),
-           hypre_F90_PassObjRef (HYPRE_StructSolver, solver) ) );
+           ( HYPRE_StructBiCGSTABCreate(
+                hypre_F90_PassComm (comm),
+                hypre_F90_PassObjRef (HYPRE_StructSolver, solver) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -32,12 +32,12 @@ hypre_F90_IFACE(hypre_structbicgstabcreate, HYPRE_STRUCTBICGSTABCREATE)
 
 void
 hypre_F90_IFACE(hypre_structbicgstabdestroy, HYPRE_STRUCTBICGSTABDESTROY)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructBiCGSTABDestroy(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver) ) );
+           ( HYPRE_StructBiCGSTABDestroy(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -45,18 +45,18 @@ hypre_F90_IFACE(hypre_structbicgstabdestroy, HYPRE_STRUCTBICGSTABDESTROY)
 
 void
 hypre_F90_IFACE(hypre_structbicgstabsetup, HYPRE_STRUCTBICGSTABSETUP)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *A,
-     hypre_F90_Obj *b,
-     hypre_F90_Obj *x,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *A,
+  hypre_F90_Obj *b,
+  hypre_F90_Obj *x,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructBiCGSTABSetup(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassObj (HYPRE_StructMatrix, A),
-           hypre_F90_PassObj (HYPRE_StructVector, b),
-           hypre_F90_PassObj (HYPRE_StructVector, x) ) );
+           ( HYPRE_StructBiCGSTABSetup(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassObj (HYPRE_StructMatrix, A),
+                hypre_F90_PassObj (HYPRE_StructVector, b),
+                hypre_F90_PassObj (HYPRE_StructVector, x) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -64,18 +64,18 @@ hypre_F90_IFACE(hypre_structbicgstabsetup, HYPRE_STRUCTBICGSTABSETUP)
 
 void
 hypre_F90_IFACE(hypre_structbicgstabsolve, HYPRE_STRUCTBICGSTABSOLVE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *A,
-     hypre_F90_Obj *b,
-     hypre_F90_Obj *x,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *A,
+  hypre_F90_Obj *b,
+  hypre_F90_Obj *x,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructBiCGSTABSolve(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassObj (HYPRE_StructMatrix, A),
-           hypre_F90_PassObj (HYPRE_StructVector, b),
-           hypre_F90_PassObj (HYPRE_StructVector, x) ) );
+           ( HYPRE_StructBiCGSTABSolve(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassObj (HYPRE_StructMatrix, A),
+                hypre_F90_PassObj (HYPRE_StructVector, b),
+                hypre_F90_PassObj (HYPRE_StructVector, x) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -83,14 +83,14 @@ hypre_F90_IFACE(hypre_structbicgstabsolve, HYPRE_STRUCTBICGSTABSOLVE)
 
 void
 hypre_F90_IFACE(hypre_structbicgstabsettol, HYPRE_STRUCTBICGSTABSETTOL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *tol,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *tol,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructBiCGSTABSetTol(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassReal (tol) ) );
+           ( HYPRE_StructBiCGSTABSetTol(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassReal (tol) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -98,14 +98,14 @@ hypre_F90_IFACE(hypre_structbicgstabsettol, HYPRE_STRUCTBICGSTABSETTOL)
 
 void
 hypre_F90_IFACE(hypre_structbicgstabsetabstol, HYPRE_STRUCTBICGSTABSETABSTOL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *tol,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *tol,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructBiCGSTABSetAbsoluteTol(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassReal (tol) ) );
+           ( HYPRE_StructBiCGSTABSetAbsoluteTol(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassReal (tol) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -113,14 +113,14 @@ hypre_F90_IFACE(hypre_structbicgstabsetabstol, HYPRE_STRUCTBICGSTABSETABSTOL)
 
 void
 hypre_F90_IFACE(hypre_structbicgstabsetmaxiter, HYPRE_STRUCTBICGSTABSETMAXITER)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *max_iter,
-     hypre_F90_Int *ierr     )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *max_iter,
+  hypre_F90_Int *ierr     )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructBiCGSTABSetMaxIter(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassInt (max_iter) ) );
+           ( HYPRE_StructBiCGSTABSetMaxIter(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassInt (max_iter) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -128,10 +128,10 @@ hypre_F90_IFACE(hypre_structbicgstabsetmaxiter, HYPRE_STRUCTBICGSTABSETMAXITER)
 
 void
 hypre_F90_IFACE(hypre_structbicgstabsetprecond, HYPRE_STRUCTBICGSTABSETPRECOND)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *precond_id,
-     hypre_F90_Obj *precond_solver,
-     hypre_F90_Int *ierr           )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *precond_id,
+  hypre_F90_Obj *precond_solver,
+  hypre_F90_Int *ierr           )
 {
 
    /*------------------------------------------------------------
@@ -146,38 +146,38 @@ hypre_F90_IFACE(hypre_structbicgstabsetprecond, HYPRE_STRUCTBICGSTABSETPRECOND)
    if (*precond_id == 0)
    {
       *ierr = (hypre_F90_Int)
-         ( HYPRE_StructBiCGSTABSetPrecond(
-              hypre_F90_PassObj (HYPRE_StructSolver, solver),
-              HYPRE_StructSMGSolve,
-              HYPRE_StructSMGSetup,
-              hypre_F90_PassObj (HYPRE_StructSolver, precond_solver)) );
+              ( HYPRE_StructBiCGSTABSetPrecond(
+                   hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                   HYPRE_StructSMGSolve,
+                   HYPRE_StructSMGSetup,
+                   hypre_F90_PassObj (HYPRE_StructSolver, precond_solver)) );
    }
    else if (*precond_id == 1)
    {
       *ierr = (hypre_F90_Int)
-         ( HYPRE_StructBiCGSTABSetPrecond(
-              hypre_F90_PassObj (HYPRE_StructSolver, solver),
-              HYPRE_StructPFMGSolve,
-              HYPRE_StructPFMGSetup,
-              hypre_F90_PassObj (HYPRE_StructSolver, precond_solver)) );
+              ( HYPRE_StructBiCGSTABSetPrecond(
+                   hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                   HYPRE_StructPFMGSolve,
+                   HYPRE_StructPFMGSetup,
+                   hypre_F90_PassObj (HYPRE_StructSolver, precond_solver)) );
    }
    else if (*precond_id == 7)
    {
       *ierr = (hypre_F90_Int)
-         ( HYPRE_StructBiCGSTABSetPrecond(
-              hypre_F90_PassObj (HYPRE_StructSolver, solver),
-              HYPRE_StructJacobiSolve,
-              HYPRE_StructJacobiSetup,
-              hypre_F90_PassObj (HYPRE_StructSolver, precond_solver)) );
+              ( HYPRE_StructBiCGSTABSetPrecond(
+                   hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                   HYPRE_StructJacobiSolve,
+                   HYPRE_StructJacobiSetup,
+                   hypre_F90_PassObj (HYPRE_StructSolver, precond_solver)) );
    }
    else if (*precond_id == 8)
    {
       *ierr = (hypre_F90_Int)
-         ( HYPRE_StructBiCGSTABSetPrecond(
-              hypre_F90_PassObj (HYPRE_StructSolver, solver),
-              HYPRE_StructDiagScale,
-              HYPRE_StructDiagScaleSetup,
-              hypre_F90_PassObj (HYPRE_StructSolver, precond_solver)) );
+              ( HYPRE_StructBiCGSTABSetPrecond(
+                   hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                   HYPRE_StructDiagScale,
+                   HYPRE_StructDiagScaleSetup,
+                   hypre_F90_PassObj (HYPRE_StructSolver, precond_solver)) );
    }
    else if (*precond_id == 9)
    {
@@ -194,14 +194,14 @@ hypre_F90_IFACE(hypre_structbicgstabsetprecond, HYPRE_STRUCTBICGSTABSETPRECOND)
 
 void
 hypre_F90_IFACE(hypre_structbicgstabsetlogging, HYPRE_STRUCTBICGSTABSETLOGGING)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *logging,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *logging,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructBiCGSTABSetLogging(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassInt (logging) ) );
+           ( HYPRE_StructBiCGSTABSetLogging(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassInt (logging) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -209,14 +209,14 @@ hypre_F90_IFACE(hypre_structbicgstabsetlogging, HYPRE_STRUCTBICGSTABSETLOGGING)
 
 void
 hypre_F90_IFACE(hypre_structbicgstabsetprintlev, HYPRE_STRUCTBICGSTABSETPRINTLEV)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *print_level,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *print_level,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructBiCGSTABSetPrintLevel(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassInt (print_level) ) );
+           ( HYPRE_StructBiCGSTABSetPrintLevel(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassInt (print_level) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -224,14 +224,14 @@ hypre_F90_IFACE(hypre_structbicgstabsetprintlev, HYPRE_STRUCTBICGSTABSETPRINTLEV
 
 void
 hypre_F90_IFACE(hypre_structbicgstabgetnumitera, HYPRE_STRUCTBICGSTABGETNUMITERA)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *num_iterations,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *num_iterations,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructBiCGSTABGetNumIterations(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassIntRef (num_iterations) ) );
+           ( HYPRE_StructBiCGSTABGetNumIterations(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassIntRef (num_iterations) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -239,14 +239,14 @@ hypre_F90_IFACE(hypre_structbicgstabgetnumitera, HYPRE_STRUCTBICGSTABGETNUMITERA
 
 void
 hypre_F90_IFACE(hypre_structbicgstabgetresidual, HYPRE_STRUCTBICGSTABGETRESIDUAL)
-   ( hypre_F90_Obj *solver,
-     void *residual,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  void *residual,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructBiCGSTABGetResidual(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           (void **)          residual ) );
+           ( HYPRE_StructBiCGSTABGetResidual(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                (void **)          residual ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -254,14 +254,14 @@ hypre_F90_IFACE(hypre_structbicgstabgetresidual, HYPRE_STRUCTBICGSTABGETRESIDUAL
 
 void
 hypre_F90_IFACE(hypre_structbicgstabgetfinalrel, HYPRE_STRUCTBICGSTABGETFINALREL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *norm,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *norm,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructBiCGSTABGetFinalRelativeResidualNorm(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassRealRef (norm) ) );
+           ( HYPRE_StructBiCGSTABGetFinalRelativeResidualNorm(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassRealRef (norm) ) );
 }
 
 #ifdef __cplusplus
diff --git a/external/hypre/src/struct_ls/F90_HYPRE_struct_cycred.c b/external/hypre/src/struct_ls/F90_HYPRE_struct_cycred.c
index 8f229417..0b858fe9 100644
--- a/external/hypre/src/struct_ls/F90_HYPRE_struct_cycred.c
+++ b/external/hypre/src/struct_ls/F90_HYPRE_struct_cycred.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -11,71 +11,71 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-    
+
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
 
 void
 hypre_F90_IFACE(hypre_structcycredcreate, HYPRE_STRUCTCYCREDCREATE)
-   ( hypre_F90_Comm *comm,
-     hypre_F90_Obj *solver,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Comm *comm,
+  hypre_F90_Obj *solver,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructCycRedCreate(
-           hypre_F90_PassComm (comm),
-           hypre_F90_PassObjRef (HYPRE_StructSolver, solver) ) );
+           ( HYPRE_StructCycRedCreate(
+                hypre_F90_PassComm (comm),
+                hypre_F90_PassObjRef (HYPRE_StructSolver, solver) ) );
 }
 
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_structcycreddestroy, HYPRE_STRUCTCYCREDDESTROY)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructCycRedDestroy(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver) ) );
+           ( HYPRE_StructCycRedDestroy(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver) ) );
 }
 
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_structcycredsetup, HYPRE_STRUCTCYCREDSETUP)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *A,
-     hypre_F90_Obj *b,
-     hypre_F90_Obj *x,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *A,
+  hypre_F90_Obj *b,
+  hypre_F90_Obj *x,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructCycRedSetup(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassObj (HYPRE_StructMatrix, A),
-           hypre_F90_PassObj (HYPRE_StructVector, b),
-           hypre_F90_PassObj (HYPRE_StructVector, x)      ) );
+           ( HYPRE_StructCycRedSetup(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassObj (HYPRE_StructMatrix, A),
+                hypre_F90_PassObj (HYPRE_StructVector, b),
+                hypre_F90_PassObj (HYPRE_StructVector, x)      ) );
 }
 
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_structcycredsolve, HYPRE_STRUCTCYCREDSOLVE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *A,
-     hypre_F90_Obj *b,
-     hypre_F90_Obj *x,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *A,
+  hypre_F90_Obj *b,
+  hypre_F90_Obj *x,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructCycRedSolve(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassObj (HYPRE_StructMatrix, A),
-           hypre_F90_PassObj (HYPRE_StructVector, b),
-           hypre_F90_PassObj (HYPRE_StructVector, x)      ) );
+           ( HYPRE_StructCycRedSolve(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassObj (HYPRE_StructMatrix, A),
+                hypre_F90_PassObj (HYPRE_StructVector, b),
+                hypre_F90_PassObj (HYPRE_StructVector, x)      ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -83,14 +83,14 @@ hypre_F90_IFACE(hypre_structcycredsolve, HYPRE_STRUCTCYCREDSOLVE)
 
 void
 hypre_F90_IFACE(hypre_structcycredsettdim, HYPRE_STRUCTCYCREDSETTDIM)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *tdim,
-     hypre_F90_Int *ierr )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *tdim,
+  hypre_F90_Int *ierr )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructCycRedSetTDim(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassInt (tdim) ) );
+           ( HYPRE_StructCycRedSetTDim(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassInt (tdim) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -98,20 +98,20 @@ hypre_F90_IFACE(hypre_structcycredsettdim, HYPRE_STRUCTCYCREDSETTDIM)
 
 void
 hypre_F90_IFACE(hypre_structcycredsetbase, HYPRE_STRUCTCYCREDSETBASE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *ndim,
-     hypre_F90_IntArray *base_index,
-     hypre_F90_IntArray *base_stride,
-     hypre_F90_Int *ierr           )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *ndim,
+  hypre_F90_IntArray *base_index,
+  hypre_F90_IntArray *base_stride,
+  hypre_F90_Int *ierr           )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructCycRedSetBase(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassInt (ndim),
-           hypre_F90_PassIntArray (base_index),
-           hypre_F90_PassIntArray (base_stride) ) );
+           ( HYPRE_StructCycRedSetBase(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassInt (ndim),
+                hypre_F90_PassIntArray (base_index),
+                hypre_F90_PassIntArray (base_stride) ) );
 }
-    
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/external/hypre/src/struct_ls/F90_HYPRE_struct_flexgmres.c b/external/hypre/src/struct_ls/F90_HYPRE_struct_flexgmres.c
index 22eadd72..c00cba27 100644
--- a/external/hypre/src/struct_ls/F90_HYPRE_struct_flexgmres.c
+++ b/external/hypre/src/struct_ls/F90_HYPRE_struct_flexgmres.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -17,14 +17,14 @@ extern "C" {
 
 void
 hypre_F90_IFACE(hypre_structfgmrescreate, HYPRE_STRUCTFGMRESCREATE)
-   ( hypre_F90_Comm *comm,
-     hypre_F90_Obj *solver,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Comm *comm,
+  hypre_F90_Obj *solver,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructFlexGMRESCreate(
-           hypre_F90_PassComm (comm),
-           hypre_F90_PassObjRef (HYPRE_StructSolver, solver) ) );
+           ( HYPRE_StructFlexGMRESCreate(
+                hypre_F90_PassComm (comm),
+                hypre_F90_PassObjRef (HYPRE_StructSolver, solver) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -32,12 +32,12 @@ hypre_F90_IFACE(hypre_structfgmrescreate, HYPRE_STRUCTFGMRESCREATE)
 
 void
 hypre_F90_IFACE(hypre_structfgmresdestroy, HYPRE_STRUCTFGMRESDESTROY)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructFlexGMRESDestroy(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver) ) );
+           ( HYPRE_StructFlexGMRESDestroy(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -45,18 +45,18 @@ hypre_F90_IFACE(hypre_structfgmresdestroy, HYPRE_STRUCTFGMRESDESTROY)
 
 void
 hypre_F90_IFACE(hypre_structfgmressetup, HYPRE_STRUCTFGMRESSETUP)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *A,
-     hypre_F90_Obj *b,
-     hypre_F90_Obj *x,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *A,
+  hypre_F90_Obj *b,
+  hypre_F90_Obj *x,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructFlexGMRESSetup(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassObj (HYPRE_StructMatrix, A),
-           hypre_F90_PassObj (HYPRE_StructVector, b),
-           hypre_F90_PassObj (HYPRE_StructVector, x) ) );
+           ( HYPRE_StructFlexGMRESSetup(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassObj (HYPRE_StructMatrix, A),
+                hypre_F90_PassObj (HYPRE_StructVector, b),
+                hypre_F90_PassObj (HYPRE_StructVector, x) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -64,18 +64,18 @@ hypre_F90_IFACE(hypre_structfgmressetup, HYPRE_STRUCTFGMRESSETUP)
 
 void
 hypre_F90_IFACE(hypre_structfgmressolve, HYPRE_STRUCTFGMRESSOLVE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *A,
-     hypre_F90_Obj *b,
-     hypre_F90_Obj *x,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *A,
+  hypre_F90_Obj *b,
+  hypre_F90_Obj *x,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructFlexGMRESSolve(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassObj (HYPRE_StructMatrix, A),
-           hypre_F90_PassObj (HYPRE_StructVector, b),
-           hypre_F90_PassObj (HYPRE_StructVector, x) ) );
+           ( HYPRE_StructFlexGMRESSolve(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassObj (HYPRE_StructMatrix, A),
+                hypre_F90_PassObj (HYPRE_StructVector, b),
+                hypre_F90_PassObj (HYPRE_StructVector, x) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -83,14 +83,14 @@ hypre_F90_IFACE(hypre_structfgmressolve, HYPRE_STRUCTFGMRESSOLVE)
 
 void
 hypre_F90_IFACE(hypre_structfgmressettol, HYPRE_STRUCTFGMRESSETTOL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *tol,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *tol,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructFlexGMRESSetTol(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassReal (tol) ) );
+           ( HYPRE_StructFlexGMRESSetTol(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassReal (tol) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -98,14 +98,14 @@ hypre_F90_IFACE(hypre_structfgmressettol, HYPRE_STRUCTFGMRESSETTOL)
 
 void
 hypre_F90_IFACE(hypre_structfgmressetabstol, HYPRE_STRUCTFGMRESSETABSTOL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *tol,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *tol,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructFlexGMRESSetAbsoluteTol(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassReal (tol) ) );
+           ( HYPRE_StructFlexGMRESSetAbsoluteTol(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassReal (tol) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -113,14 +113,14 @@ hypre_F90_IFACE(hypre_structfgmressetabstol, HYPRE_STRUCTFGMRESSETABSTOL)
 
 void
 hypre_F90_IFACE(hypre_structfgmressetmaxiter, HYPRE_STRUCTFGMRESSETMAXITER)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *max_iter,
-     hypre_F90_Int *ierr     )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *max_iter,
+  hypre_F90_Int *ierr     )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructFlexGMRESSetMaxIter(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassInt (max_iter) ) );
+           ( HYPRE_StructFlexGMRESSetMaxIter(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassInt (max_iter) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -128,14 +128,14 @@ hypre_F90_IFACE(hypre_structfgmressetmaxiter, HYPRE_STRUCTFGMRESSETMAXITER)
 
 void
 hypre_F90_IFACE(hypre_structfgmressetkdim, HYPRE_STRUCTFGMRESSETKDIM)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *k_dim,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *k_dim,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_StructFlexGMRESSetKDim(
-          hypre_F90_PassObj (HYPRE_StructSolver, solver),
-          hypre_F90_PassInt (k_dim) ));
+           (HYPRE_StructFlexGMRESSetKDim(
+               hypre_F90_PassObj (HYPRE_StructSolver, solver),
+               hypre_F90_PassInt (k_dim) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -143,10 +143,10 @@ hypre_F90_IFACE(hypre_structfgmressetkdim, HYPRE_STRUCTFGMRESSETKDIM)
 
 void
 hypre_F90_IFACE(hypre_structfgmressetprecond, HYPRE_STRUCTFGMRESSETPRECOND)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *precond_id,
-     hypre_F90_Obj *precond_solver,
-     hypre_F90_Int *ierr           )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *precond_id,
+  hypre_F90_Obj *precond_solver,
+  hypre_F90_Int *ierr           )
 {
 
    /*------------------------------------------------------------
@@ -161,38 +161,38 @@ hypre_F90_IFACE(hypre_structfgmressetprecond, HYPRE_STRUCTFGMRESSETPRECOND)
    if (*precond_id == 0)
    {
       *ierr = (hypre_F90_Int)
-         ( HYPRE_StructFlexGMRESSetPrecond(
-              hypre_F90_PassObj (HYPRE_StructSolver, solver),
-              HYPRE_StructSMGSolve,
-              HYPRE_StructSMGSetup,
-              hypre_F90_PassObj (HYPRE_StructSolver, precond_solver)) );
+              ( HYPRE_StructFlexGMRESSetPrecond(
+                   hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                   HYPRE_StructSMGSolve,
+                   HYPRE_StructSMGSetup,
+                   hypre_F90_PassObj (HYPRE_StructSolver, precond_solver)) );
    }
    else if (*precond_id == 1)
    {
       *ierr = (hypre_F90_Int)
-         ( HYPRE_StructFlexGMRESSetPrecond(
-              hypre_F90_PassObj (HYPRE_StructSolver, solver),
-              HYPRE_StructPFMGSolve,
-              HYPRE_StructPFMGSetup,
-              hypre_F90_PassObj (HYPRE_StructSolver, precond_solver)) );
+              ( HYPRE_StructFlexGMRESSetPrecond(
+                   hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                   HYPRE_StructPFMGSolve,
+                   HYPRE_StructPFMGSetup,
+                   hypre_F90_PassObj (HYPRE_StructSolver, precond_solver)) );
    }
    else if (*precond_id == 6)
    {
       *ierr = (hypre_F90_Int)
-         ( HYPRE_StructFlexGMRESSetPrecond(
-              hypre_F90_PassObj (HYPRE_StructSolver, solver),
-              HYPRE_StructJacobiSolve,
-              HYPRE_StructJacobiSetup,
-              hypre_F90_PassObj (HYPRE_StructSolver, precond_solver)) );
+              ( HYPRE_StructFlexGMRESSetPrecond(
+                   hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                   HYPRE_StructJacobiSolve,
+                   HYPRE_StructJacobiSetup,
+                   hypre_F90_PassObj (HYPRE_StructSolver, precond_solver)) );
    }
    else if (*precond_id == 8)
    {
       *ierr = (hypre_F90_Int)
-         ( HYPRE_StructFlexGMRESSetPrecond(
-              hypre_F90_PassObj (HYPRE_StructSolver, solver),
-              HYPRE_StructDiagScale,
-              HYPRE_StructDiagScaleSetup,
-              hypre_F90_PassObj (HYPRE_StructSolver, precond_solver)) );
+              ( HYPRE_StructFlexGMRESSetPrecond(
+                   hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                   HYPRE_StructDiagScale,
+                   HYPRE_StructDiagScaleSetup,
+                   hypre_F90_PassObj (HYPRE_StructSolver, precond_solver)) );
    }
    else if (*precond_id == 9)
    {
@@ -209,14 +209,14 @@ hypre_F90_IFACE(hypre_structfgmressetprecond, HYPRE_STRUCTFGMRESSETPRECOND)
 
 void
 hypre_F90_IFACE(hypre_structfgmressetlogging, HYPRE_STRUCTFGMRESSETLOGGING)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *logging,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *logging,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructFlexGMRESSetLogging(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassInt (logging) ) );
+           ( HYPRE_StructFlexGMRESSetLogging(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassInt (logging) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -224,14 +224,14 @@ hypre_F90_IFACE(hypre_structfgmressetlogging, HYPRE_STRUCTFGMRESSETLOGGING)
 
 void
 hypre_F90_IFACE(hypre_structfgmressetprintlevel, HYPRE_STRUCTFGMRESSETPRINTLEVEL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *print_level,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *print_level,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructFlexGMRESSetPrintLevel(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassInt (print_level) ) );
+           ( HYPRE_StructFlexGMRESSetPrintLevel(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassInt (print_level) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -239,14 +239,14 @@ hypre_F90_IFACE(hypre_structfgmressetprintlevel, HYPRE_STRUCTFGMRESSETPRINTLEVEL
 
 void
 hypre_F90_IFACE(hypre_structfgmresgetnumiter, HYPRE_STRUCTFGMRESGETNUMITER)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *num_iterations,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *num_iterations,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructFlexGMRESGetNumIterations(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassIntRef (num_iterations) ) );
+           ( HYPRE_StructFlexGMRESGetNumIterations(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassIntRef (num_iterations) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -254,14 +254,14 @@ hypre_F90_IFACE(hypre_structfgmresgetnumiter, HYPRE_STRUCTFGMRESGETNUMITER)
 
 void
 hypre_F90_IFACE(hypre_structfgmresgetfinalrel, HYPRE_STRUCTFGMRESGETFINALREL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *norm,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *norm,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructFlexGMRESGetFinalRelativeResidualNorm(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassRealRef (norm) ) );
+           ( HYPRE_StructFlexGMRESGetFinalRelativeResidualNorm(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassRealRef (norm) ) );
 }
 
 #ifdef __cplusplus
diff --git a/external/hypre/src/struct_ls/F90_HYPRE_struct_gmres.c b/external/hypre/src/struct_ls/F90_HYPRE_struct_gmres.c
index 3126afec..794aa247 100644
--- a/external/hypre/src/struct_ls/F90_HYPRE_struct_gmres.c
+++ b/external/hypre/src/struct_ls/F90_HYPRE_struct_gmres.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -17,14 +17,14 @@ extern "C" {
 
 void
 hypre_F90_IFACE(hypre_structgmrescreate, HYPRE_STRUCTGMRESCREATE)
-   ( hypre_F90_Comm *comm,
-     hypre_F90_Obj *solver,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Comm *comm,
+  hypre_F90_Obj *solver,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructGMRESCreate(
-           hypre_F90_PassComm (comm),
-           hypre_F90_PassObjRef (HYPRE_StructSolver, solver) ) );
+           ( HYPRE_StructGMRESCreate(
+                hypre_F90_PassComm (comm),
+                hypre_F90_PassObjRef (HYPRE_StructSolver, solver) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -32,12 +32,12 @@ hypre_F90_IFACE(hypre_structgmrescreate, HYPRE_STRUCTGMRESCREATE)
 
 void
 hypre_F90_IFACE(hypre_structgmresdestroy, HYPRE_STRUCTGMRESDESTROY)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructGMRESDestroy(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver) ) );
+           ( HYPRE_StructGMRESDestroy(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -45,18 +45,18 @@ hypre_F90_IFACE(hypre_structgmresdestroy, HYPRE_STRUCTGMRESDESTROY)
 
 void
 hypre_F90_IFACE(hypre_structgmressetup, HYPRE_STRUCTGMRESSETUP)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *A,
-     hypre_F90_Obj *b,
-     hypre_F90_Obj *x,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *A,
+  hypre_F90_Obj *b,
+  hypre_F90_Obj *x,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructGMRESSetup(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassObj (HYPRE_StructMatrix, A),
-           hypre_F90_PassObj (HYPRE_StructVector, b),
-           hypre_F90_PassObj (HYPRE_StructVector, x) ) );
+           ( HYPRE_StructGMRESSetup(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassObj (HYPRE_StructMatrix, A),
+                hypre_F90_PassObj (HYPRE_StructVector, b),
+                hypre_F90_PassObj (HYPRE_StructVector, x) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -64,18 +64,18 @@ hypre_F90_IFACE(hypre_structgmressetup, HYPRE_STRUCTGMRESSETUP)
 
 void
 hypre_F90_IFACE(hypre_structgmressolve, HYPRE_STRUCTGMRESSOLVE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *A,
-     hypre_F90_Obj *b,
-     hypre_F90_Obj *x,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *A,
+  hypre_F90_Obj *b,
+  hypre_F90_Obj *x,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructGMRESSolve(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassObj (HYPRE_StructMatrix, A),
-           hypre_F90_PassObj (HYPRE_StructVector, b),
-           hypre_F90_PassObj (HYPRE_StructVector, x) ) );
+           ( HYPRE_StructGMRESSolve(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassObj (HYPRE_StructMatrix, A),
+                hypre_F90_PassObj (HYPRE_StructVector, b),
+                hypre_F90_PassObj (HYPRE_StructVector, x) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -83,14 +83,14 @@ hypre_F90_IFACE(hypre_structgmressolve, HYPRE_STRUCTGMRESSOLVE)
 
 void
 hypre_F90_IFACE(hypre_structgmressettol, HYPRE_STRUCTGMRESSETTOL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *tol,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *tol,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructGMRESSetTol(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassReal (tol) ) );
+           ( HYPRE_StructGMRESSetTol(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassReal (tol) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -98,14 +98,14 @@ hypre_F90_IFACE(hypre_structgmressettol, HYPRE_STRUCTGMRESSETTOL)
 
 void
 hypre_F90_IFACE(hypre_structgmressetabstol, HYPRE_STRUCTGMRESSETABSTOL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *tol,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *tol,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructGMRESSetAbsoluteTol(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassReal (tol) ) );
+           ( HYPRE_StructGMRESSetAbsoluteTol(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassReal (tol) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -113,14 +113,14 @@ hypre_F90_IFACE(hypre_structgmressetabstol, HYPRE_STRUCTGMRESSETABSTOL)
 
 void
 hypre_F90_IFACE(hypre_structgmressetmaxiter, HYPRE_STRUCTGMRESSETMAXITER)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *max_iter,
-     hypre_F90_Int *ierr     )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *max_iter,
+  hypre_F90_Int *ierr     )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructGMRESSetMaxIter(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassInt (max_iter) ) );
+           ( HYPRE_StructGMRESSetMaxIter(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassInt (max_iter) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -128,14 +128,14 @@ hypre_F90_IFACE(hypre_structgmressetmaxiter, HYPRE_STRUCTGMRESSETMAXITER)
 
 void
 hypre_F90_IFACE(hypre_structgmressetkdim, HYPRE_STRUCTGMRESSETKDIM)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *k_dim,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *k_dim,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_StructGMRESSetKDim(
-          hypre_F90_PassObj (HYPRE_StructSolver, solver),
-          hypre_F90_PassInt (k_dim) ));
+           (HYPRE_StructGMRESSetKDim(
+               hypre_F90_PassObj (HYPRE_StructSolver, solver),
+               hypre_F90_PassInt (k_dim) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -143,10 +143,10 @@ hypre_F90_IFACE(hypre_structgmressetkdim, HYPRE_STRUCTGMRESSETKDIM)
 
 void
 hypre_F90_IFACE(hypre_structgmressetprecond, HYPRE_STRUCTGMRESSETPRECOND)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *precond_id,
-     hypre_F90_Obj *precond_solver,
-     hypre_F90_Int *ierr           )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *precond_id,
+  hypre_F90_Obj *precond_solver,
+  hypre_F90_Int *ierr           )
 {
 
    /*------------------------------------------------------------
@@ -161,38 +161,38 @@ hypre_F90_IFACE(hypre_structgmressetprecond, HYPRE_STRUCTGMRESSETPRECOND)
    if (*precond_id == 0)
    {
       *ierr = (hypre_F90_Int)
-         ( HYPRE_StructGMRESSetPrecond(
-              hypre_F90_PassObj (HYPRE_StructSolver, solver),
-              HYPRE_StructSMGSolve,
-              HYPRE_StructSMGSetup,
-              hypre_F90_PassObj (HYPRE_StructSolver, precond_solver)) );
+              ( HYPRE_StructGMRESSetPrecond(
+                   hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                   HYPRE_StructSMGSolve,
+                   HYPRE_StructSMGSetup,
+                   hypre_F90_PassObj (HYPRE_StructSolver, precond_solver)) );
    }
    else if (*precond_id == 1)
    {
       *ierr = (hypre_F90_Int)
-         ( HYPRE_StructGMRESSetPrecond(
-              hypre_F90_PassObj (HYPRE_StructSolver, solver),
-              HYPRE_StructPFMGSolve,
-              HYPRE_StructPFMGSetup,
-              hypre_F90_PassObj (HYPRE_StructSolver, precond_solver)) );
+              ( HYPRE_StructGMRESSetPrecond(
+                   hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                   HYPRE_StructPFMGSolve,
+                   HYPRE_StructPFMGSetup,
+                   hypre_F90_PassObj (HYPRE_StructSolver, precond_solver)) );
    }
    else if (*precond_id == 6)
    {
       *ierr = (hypre_F90_Int)
-         ( HYPRE_StructGMRESSetPrecond(
-              hypre_F90_PassObj (HYPRE_StructSolver, solver),
-              HYPRE_StructJacobiSolve,
-              HYPRE_StructJacobiSetup,
-              hypre_F90_PassObj (HYPRE_StructSolver, precond_solver)) );
+              ( HYPRE_StructGMRESSetPrecond(
+                   hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                   HYPRE_StructJacobiSolve,
+                   HYPRE_StructJacobiSetup,
+                   hypre_F90_PassObj (HYPRE_StructSolver, precond_solver)) );
    }
    else if (*precond_id == 8)
    {
       *ierr = (hypre_F90_Int)
-         ( HYPRE_StructGMRESSetPrecond(
-              hypre_F90_PassObj (HYPRE_StructSolver, solver),
-              HYPRE_StructDiagScale,
-              HYPRE_StructDiagScaleSetup,
-              hypre_F90_PassObj (HYPRE_StructSolver, precond_solver)) );
+              ( HYPRE_StructGMRESSetPrecond(
+                   hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                   HYPRE_StructDiagScale,
+                   HYPRE_StructDiagScaleSetup,
+                   hypre_F90_PassObj (HYPRE_StructSolver, precond_solver)) );
    }
    else if (*precond_id == 9)
    {
@@ -209,14 +209,14 @@ hypre_F90_IFACE(hypre_structgmressetprecond, HYPRE_STRUCTGMRESSETPRECOND)
 
 void
 hypre_F90_IFACE(hypre_structgmressetlogging, HYPRE_STRUCTGMRESSETLOGGING)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *logging,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *logging,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructGMRESSetLogging(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassInt (logging) ) );
+           ( HYPRE_StructGMRESSetLogging(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassInt (logging) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -224,14 +224,14 @@ hypre_F90_IFACE(hypre_structgmressetlogging, HYPRE_STRUCTGMRESSETLOGGING)
 
 void
 hypre_F90_IFACE(hypre_structgmressetprintlevel, HYPRE_STRUCTGMRESSETPRINTLEVEL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *print_level,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *print_level,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructGMRESSetPrintLevel(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassInt (print_level) ) );
+           ( HYPRE_StructGMRESSetPrintLevel(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassInt (print_level) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -239,14 +239,14 @@ hypre_F90_IFACE(hypre_structgmressetprintlevel, HYPRE_STRUCTGMRESSETPRINTLEVEL)
 
 void
 hypre_F90_IFACE(hypre_structgmresgetnumiteratio, HYPRE_STRUCTGMRESGETNUMITERATIO)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *num_iterations,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *num_iterations,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructGMRESGetNumIterations(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassIntRef (num_iterations) ) );
+           ( HYPRE_StructGMRESGetNumIterations(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassIntRef (num_iterations) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -254,14 +254,14 @@ hypre_F90_IFACE(hypre_structgmresgetnumiteratio, HYPRE_STRUCTGMRESGETNUMITERATIO
 
 void
 hypre_F90_IFACE(hypre_structgmresgetfinalrelati, HYPRE_STRUCTGMRESGETFINALRELATI)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *norm,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *norm,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructGMRESGetFinalRelativeResidualNorm(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassRealRef (norm) ) );
+           ( HYPRE_StructGMRESGetFinalRelativeResidualNorm(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassRealRef (norm) ) );
 }
 
 #ifdef __cplusplus
diff --git a/external/hypre/src/struct_ls/F90_HYPRE_struct_hybrid.c b/external/hypre/src/struct_ls/F90_HYPRE_struct_hybrid.c
index fccb8172..802adf1e 100644
--- a/external/hypre/src/struct_ls/F90_HYPRE_struct_hybrid.c
+++ b/external/hypre/src/struct_ls/F90_HYPRE_struct_hybrid.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -18,14 +18,14 @@ extern "C" {
 
 void
 hypre_F90_IFACE(hypre_structhybridcreate, HYPRE_STRUCTHYBRIDCREATE)
-   ( hypre_F90_Comm *comm,
-     hypre_F90_Obj *solver,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Comm *comm,
+  hypre_F90_Obj *solver,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructHybridCreate(
-           hypre_F90_PassComm (comm),
-           hypre_F90_PassObjRef (HYPRE_StructSolver, solver) ) );
+           ( HYPRE_StructHybridCreate(
+                hypre_F90_PassComm (comm),
+                hypre_F90_PassObjRef (HYPRE_StructSolver, solver) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -34,12 +34,12 @@ hypre_F90_IFACE(hypre_structhybridcreate, HYPRE_STRUCTHYBRIDCREATE)
 
 void
 hypre_F90_IFACE(hypre_structhybriddestroy, HYPRE_STRUCTHYBRIDDESTROY)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructHybridDestroy(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver) ) );
+           ( HYPRE_StructHybridDestroy(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -48,18 +48,18 @@ hypre_F90_IFACE(hypre_structhybriddestroy, HYPRE_STRUCTHYBRIDDESTROY)
 
 void
 hypre_F90_IFACE(hypre_structhybridsetup, HYPRE_STRUCTHYBRIDSETUP)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *A,
-     hypre_F90_Obj *b,
-     hypre_F90_Obj *x,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *A,
+  hypre_F90_Obj *b,
+  hypre_F90_Obj *x,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructHybridSetup(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassObj (HYPRE_StructMatrix, A),
-           hypre_F90_PassObj (HYPRE_StructVector, b),
-           hypre_F90_PassObj (HYPRE_StructVector, x)      ) );
+           ( HYPRE_StructHybridSetup(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassObj (HYPRE_StructMatrix, A),
+                hypre_F90_PassObj (HYPRE_StructVector, b),
+                hypre_F90_PassObj (HYPRE_StructVector, x)      ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -68,18 +68,18 @@ hypre_F90_IFACE(hypre_structhybridsetup, HYPRE_STRUCTHYBRIDSETUP)
 
 void
 hypre_F90_IFACE(hypre_structhybridsolve, HYPRE_STRUCTHYBRIDSOLVE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *A,
-     hypre_F90_Obj *b,
-     hypre_F90_Obj *x,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *A,
+  hypre_F90_Obj *b,
+  hypre_F90_Obj *x,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructHybridSolve(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassObj (HYPRE_StructMatrix, A),
-           hypre_F90_PassObj (HYPRE_StructVector, b),
-           hypre_F90_PassObj (HYPRE_StructVector, x)      ) );
+           ( HYPRE_StructHybridSolve(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassObj (HYPRE_StructMatrix, A),
+                hypre_F90_PassObj (HYPRE_StructVector, b),
+                hypre_F90_PassObj (HYPRE_StructVector, x)      ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -88,14 +88,14 @@ hypre_F90_IFACE(hypre_structhybridsolve, HYPRE_STRUCTHYBRIDSOLVE)
 
 void
 hypre_F90_IFACE(hypre_structhybridsettol, HYPRE_STRUCTHYBRIDSETTOL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *tol,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *tol,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructHybridSetTol(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassReal (tol)    ) );
+           ( HYPRE_StructHybridSetTol(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassReal (tol)    ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -104,14 +104,14 @@ hypre_F90_IFACE(hypre_structhybridsettol, HYPRE_STRUCTHYBRIDSETTOL)
 
 void
 hypre_F90_IFACE(hypre_structhybridsetconvergenc, HYPRE_STRUCTHYBRIDSETCONVERGENC)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *cf_tol,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *cf_tol,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructHybridSetConvergenceTol(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassReal (cf_tol)  ) );
+           ( HYPRE_StructHybridSetConvergenceTol(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassReal (cf_tol)  ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -120,14 +120,14 @@ hypre_F90_IFACE(hypre_structhybridsetconvergenc, HYPRE_STRUCTHYBRIDSETCONVERGENC
 
 void
 hypre_F90_IFACE(hypre_structhybridsetdscgmaxite, HYPRE_STRUCTHYBRIDSETDSCGMAXITE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *dscg_max_its,
-     hypre_F90_Int *ierr         )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *dscg_max_its,
+  hypre_F90_Int *ierr         )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructHybridSetDSCGMaxIter(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassInt (dscg_max_its) ) );
+           ( HYPRE_StructHybridSetDSCGMaxIter(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassInt (dscg_max_its) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -136,14 +136,14 @@ hypre_F90_IFACE(hypre_structhybridsetdscgmaxite, HYPRE_STRUCTHYBRIDSETDSCGMAXITE
 
 void
 hypre_F90_IFACE(hypre_structhybridsetpcgmaxiter, HYPRE_STRUCTHYBRIDSETPCGMAXITER)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *pcg_max_its,
-     hypre_F90_Int *ierr        )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *pcg_max_its,
+  hypre_F90_Int *ierr        )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructHybridSetPCGMaxIter(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassInt (pcg_max_its) ) );
+           ( HYPRE_StructHybridSetPCGMaxIter(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassInt (pcg_max_its) ) );
 }
 
 
@@ -153,14 +153,14 @@ hypre_F90_IFACE(hypre_structhybridsetpcgmaxiter, HYPRE_STRUCTHYBRIDSETPCGMAXITER
 
 void
 hypre_F90_IFACE(hypre_structhybridsetpcgabsolut, HYPRE_STRUCTHYBRIDSETPCGABSOLUT)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *pcg_atolf,
-     hypre_F90_Int *ierr        )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *pcg_atolf,
+  hypre_F90_Int *ierr        )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructHybridSetPCGAbsoluteTolFactor(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassReal (pcg_atolf) ) );
+           ( HYPRE_StructHybridSetPCGAbsoluteTolFactor(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassReal (pcg_atolf) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -169,14 +169,14 @@ hypre_F90_IFACE(hypre_structhybridsetpcgabsolut, HYPRE_STRUCTHYBRIDSETPCGABSOLUT
 
 void
 hypre_F90_IFACE(hypre_structhybridsettwonorm, HYPRE_STRUCTHYBRIDSETTWONORM)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *two_norm,
-     hypre_F90_Int *ierr     )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *two_norm,
+  hypre_F90_Int *ierr     )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructHybridSetTwoNorm(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassInt (two_norm)    ) );
+           ( HYPRE_StructHybridSetTwoNorm(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassInt (two_norm)    ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -185,14 +185,14 @@ hypre_F90_IFACE(hypre_structhybridsettwonorm, HYPRE_STRUCTHYBRIDSETTWONORM)
 
 void
 hypre_F90_IFACE(hypre_structhybridsetstopcrit, HYPRE_STRUCTHYBRIDSETSTOPCRIT)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *stop_crit,
-     hypre_F90_Int *ierr     )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *stop_crit,
+  hypre_F90_Int *ierr     )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructHybridSetStopCrit(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassInt (stop_crit)   ) );
+           ( HYPRE_StructHybridSetStopCrit(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassInt (stop_crit)   ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -201,14 +201,14 @@ hypre_F90_IFACE(hypre_structhybridsetstopcrit, HYPRE_STRUCTHYBRIDSETSTOPCRIT)
 
 void
 hypre_F90_IFACE(hypre_structhybridsetrelchange, HYPRE_STRUCTHYBRIDSETRELCHANGE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *rel_change,
-     hypre_F90_Int *ierr       )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *rel_change,
+  hypre_F90_Int *ierr       )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructHybridSetRelChange(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassInt (rel_change)  ) );
+           ( HYPRE_StructHybridSetRelChange(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassInt (rel_change)  ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -217,14 +217,14 @@ hypre_F90_IFACE(hypre_structhybridsetrelchange, HYPRE_STRUCTHYBRIDSETRELCHANGE)
 
 void
 hypre_F90_IFACE(hypre_structhybridsetsolvertype, HYPRE_STRUCTHYBRIDSETSOLVERTYPE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *solver_type,
-     hypre_F90_Int *ierr     )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *solver_type,
+  hypre_F90_Int *ierr     )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructHybridSetSolverType(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassInt (solver_type) ) );
+           ( HYPRE_StructHybridSetSolverType(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassInt (solver_type) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -233,14 +233,14 @@ hypre_F90_IFACE(hypre_structhybridsetsolvertype, HYPRE_STRUCTHYBRIDSETSOLVERTYPE
 
 void
 hypre_F90_IFACE(hypre_structhybridsetkdim, HYPRE_STRUCTHYBRIDSETKDIM)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *k_dim,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *k_dim,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_StructHybridSetKDim(
-          hypre_F90_PassObj (HYPRE_StructSolver, solver),
-          hypre_F90_PassInt (k_dim) ) );
+           (HYPRE_StructHybridSetKDim(
+               hypre_F90_PassObj (HYPRE_StructSolver, solver),
+               hypre_F90_PassInt (k_dim) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -249,10 +249,10 @@ hypre_F90_IFACE(hypre_structhybridsetkdim, HYPRE_STRUCTHYBRIDSETKDIM)
 
 void
 hypre_F90_IFACE(hypre_structhybridsetprecond, HYPRE_STRUCTHYBRIDSETPRECOND)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *precond_id,
-     hypre_F90_Obj *precond_solver,
-     hypre_F90_Int *ierr           )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *precond_id,
+  hypre_F90_Obj *precond_solver,
+  hypre_F90_Int *ierr           )
 {
 
    /*------------------------------------------------------------
@@ -266,38 +266,38 @@ hypre_F90_IFACE(hypre_structhybridsetprecond, HYPRE_STRUCTHYBRIDSETPRECOND)
    if (*precond_id == 0)
    {
       *ierr = (hypre_F90_Int)
-         ( HYPRE_StructHybridSetPrecond(
-              hypre_F90_PassObj (HYPRE_StructSolver, solver),
-              HYPRE_StructSMGSolve,
-              HYPRE_StructSMGSetup,
-              hypre_F90_PassObj (HYPRE_StructSolver, precond_solver)) );
+              ( HYPRE_StructHybridSetPrecond(
+                   hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                   HYPRE_StructSMGSolve,
+                   HYPRE_StructSMGSetup,
+                   hypre_F90_PassObj (HYPRE_StructSolver, precond_solver)) );
    }
    else if (*precond_id == 1)
    {
       *ierr = (hypre_F90_Int)
-         ( HYPRE_StructHybridSetPrecond(
-              hypre_F90_PassObj (HYPRE_StructSolver, solver),
-              HYPRE_StructPFMGSolve,
-              HYPRE_StructPFMGSetup,
-              hypre_F90_PassObj (HYPRE_StructSolver, precond_solver)) );
+              ( HYPRE_StructHybridSetPrecond(
+                   hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                   HYPRE_StructPFMGSolve,
+                   HYPRE_StructPFMGSetup,
+                   hypre_F90_PassObj (HYPRE_StructSolver, precond_solver)) );
    }
    else if (*precond_id == 7)
    {
       *ierr = (hypre_F90_Int)
-         ( HYPRE_StructHybridSetPrecond(
-              hypre_F90_PassObj (HYPRE_StructSolver, solver),
-              HYPRE_StructJacobiSolve,
-              HYPRE_StructJacobiSetup,
-              hypre_F90_PassObj (HYPRE_StructSolver, precond_solver)) );
+              ( HYPRE_StructHybridSetPrecond(
+                   hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                   HYPRE_StructJacobiSolve,
+                   HYPRE_StructJacobiSetup,
+                   hypre_F90_PassObj (HYPRE_StructSolver, precond_solver)) );
    }
    else if (*precond_id == 8)
    {
       *ierr = (hypre_F90_Int)
-         ( HYPRE_StructHybridSetPrecond(
-              hypre_F90_PassObj (HYPRE_StructSolver, solver),
-              HYPRE_StructDiagScale,
-              HYPRE_StructDiagScaleSetup,
-              hypre_F90_PassObj (HYPRE_StructSolver, precond_solver)) );
+              ( HYPRE_StructHybridSetPrecond(
+                   hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                   HYPRE_StructDiagScale,
+                   HYPRE_StructDiagScaleSetup,
+                   hypre_F90_PassObj (HYPRE_StructSolver, precond_solver)) );
    }
    else
    {
@@ -311,14 +311,14 @@ hypre_F90_IFACE(hypre_structhybridsetprecond, HYPRE_STRUCTHYBRIDSETPRECOND)
 
 void
 hypre_F90_IFACE(hypre_structhybridsetlogging, HYPRE_STRUCTHYBRIDSETLOGGING)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *logging,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *logging,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructHybridSetLogging(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassInt (logging)    ) );
+           ( HYPRE_StructHybridSetLogging(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassInt (logging)    ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -327,14 +327,14 @@ hypre_F90_IFACE(hypre_structhybridsetlogging, HYPRE_STRUCTHYBRIDSETLOGGING)
 
 void
 hypre_F90_IFACE(hypre_structhybridsetprintlevel, HYPRE_STRUCTHYBRIDSETPRINTLEVEL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *print_level,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *print_level,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructHybridSetPrintLevel(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassInt (print_level)  ) );
+           ( HYPRE_StructHybridSetPrintLevel(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassInt (print_level)  ) );
 }
 /*--------------------------------------------------------------------------
  * HYPRE_StructHybridGetNumIterations
@@ -342,14 +342,14 @@ hypre_F90_IFACE(hypre_structhybridsetprintlevel, HYPRE_STRUCTHYBRIDSETPRINTLEVEL
 
 void
 hypre_F90_IFACE(hypre_structhybridgetnumiterati, HYPRE_STRUCTHYBRIDGETNUMITERATI)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *num_its,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *num_its,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructHybridGetNumIterations(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassIntRef (num_its)    ) );
+           ( HYPRE_StructHybridGetNumIterations(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassIntRef (num_its)    ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -358,14 +358,14 @@ hypre_F90_IFACE(hypre_structhybridgetnumiterati, HYPRE_STRUCTHYBRIDGETNUMITERATI
 
 void
 hypre_F90_IFACE(hypre_structhybridgetdscgnumite, HYPRE_STRUCTHYBRIDGETDSCGNUMITE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *dscg_num_its,
-     hypre_F90_Int *ierr         )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *dscg_num_its,
+  hypre_F90_Int *ierr         )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructHybridGetDSCGNumIterations(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassIntRef (dscg_num_its) ) );
+           ( HYPRE_StructHybridGetDSCGNumIterations(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassIntRef (dscg_num_its) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -374,14 +374,14 @@ hypre_F90_IFACE(hypre_structhybridgetdscgnumite, HYPRE_STRUCTHYBRIDGETDSCGNUMITE
 
 void
 hypre_F90_IFACE(hypre_structhybridgetpcgnumiter, HYPRE_STRUCTHYBRIDGETPCGNUMITER)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *pcg_num_its,
-     hypre_F90_Int *ierr        )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *pcg_num_its,
+  hypre_F90_Int *ierr        )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructHybridGetPCGNumIterations(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassIntRef (pcg_num_its) ) );
+           ( HYPRE_StructHybridGetPCGNumIterations(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassIntRef (pcg_num_its) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -390,14 +390,14 @@ hypre_F90_IFACE(hypre_structhybridgetpcgnumiter, HYPRE_STRUCTHYBRIDGETPCGNUMITER
 
 void
 hypre_F90_IFACE(hypre_structhybridgetfinalrelat, HYPRE_STRUCTHYBRIDGETFINALRELAT)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *norm,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *norm,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructHybridGetFinalRelativeResidualNorm(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassRealRef (norm)    ) );
+           ( HYPRE_StructHybridGetFinalRelativeResidualNorm(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassRealRef (norm)    ) );
 }
 
 #ifdef __cplusplus
diff --git a/external/hypre/src/struct_ls/F90_HYPRE_struct_int.c b/external/hypre/src/struct_ls/F90_HYPRE_struct_int.c
index 0362815a..bafb38e7 100644
--- a/external/hypre/src/struct_ls/F90_HYPRE_struct_int.c
+++ b/external/hypre/src/struct_ls/F90_HYPRE_struct_int.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -11,21 +11,21 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-    
+
 /*--------------------------------------------------------------------------
  * HYPRE_StructVectorSetRandomValues
  *--------------------------------------------------------------------------*/
 
 void
 hypre_F90_IFACE(hypre_structvectorsetrandomvalu, HYPRE_STRUCTVECTORSETRANDOMVALU)
-   (hypre_F90_Obj *vector,
-    hypre_F90_Int *seed,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *vector,
+ hypre_F90_Int *seed,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( hypre_StructVectorSetRandomValues(
-           (hypre_StructVector *) vector,
-           hypre_F90_PassInt (seed) ));
+           ( hypre_StructVectorSetRandomValues(
+                (hypre_StructVector *) vector,
+                hypre_F90_PassInt (seed) ));
 }
 
 
@@ -35,14 +35,14 @@ hypre_F90_IFACE(hypre_structvectorsetrandomvalu, HYPRE_STRUCTVECTORSETRANDOMVALU
 
 void
 hypre_F90_IFACE(hypre_structsetrandomvalues, HYPRE_STRUCTSETRANDOMVALUES)
-   (hypre_F90_Obj *vector,
-    hypre_F90_Int *seed,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *vector,
+ hypre_F90_Int *seed,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( hypre_StructSetRandomValues(
-           (hypre_StructVector *) vector,
-           hypre_F90_PassInt (seed) ));
+           ( hypre_StructSetRandomValues(
+                (hypre_StructVector *) vector,
+                hypre_F90_PassInt (seed) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -51,12 +51,12 @@ hypre_F90_IFACE(hypre_structsetrandomvalues, HYPRE_STRUCTSETRANDOMVALUES)
 
 void
 hypre_F90_IFACE(hypre_structsetupinterpreter, HYPRE_STRUCTSETUPINTERPRETER)
-   (hypre_F90_Obj *i,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *i,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructSetupInterpreter(
-           (mv_InterfaceInterpreter *) i ));
+           ( HYPRE_StructSetupInterpreter(
+                (mv_InterfaceInterpreter *) i ));
 }
 
 /*--------------------------------------------------------------------------
@@ -65,14 +65,14 @@ hypre_F90_IFACE(hypre_structsetupinterpreter, HYPRE_STRUCTSETUPINTERPRETER)
 
 void
 hypre_F90_IFACE(hypre_structsetupmatvec, HYPRE_STRUCTSETUPMATVEC)
-   (hypre_F90_Obj *mv,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *mv,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructSetupMatvec(
-           hypre_F90_PassObjRef (HYPRE_MatvecFunctions, mv)));
+           ( HYPRE_StructSetupMatvec(
+                hypre_F90_PassObjRef (HYPRE_MatvecFunctions, mv)));
 }
-    
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/external/hypre/src/struct_ls/F90_HYPRE_struct_jacobi.c b/external/hypre/src/struct_ls/F90_HYPRE_struct_jacobi.c
index af12b0c5..3a487397 100644
--- a/external/hypre/src/struct_ls/F90_HYPRE_struct_jacobi.c
+++ b/external/hypre/src/struct_ls/F90_HYPRE_struct_jacobi.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -11,75 +11,75 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-    
+
 /*--------------------------------------------------------------------------
  * HYPRE_StructJacobiCreate
  *--------------------------------------------------------------------------*/
 
 void
 hypre_F90_IFACE(hypre_structjacobicreate, HYPRE_STRUCTJACOBICREATE)
-   ( hypre_F90_Comm *comm,
-     hypre_F90_Obj *solver,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Comm *comm,
+  hypre_F90_Obj *solver,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructJacobiCreate(
-           hypre_F90_PassComm (comm),
-           hypre_F90_PassObjRef (HYPRE_StructSolver, solver) ) );
+           ( HYPRE_StructJacobiCreate(
+                hypre_F90_PassComm (comm),
+                hypre_F90_PassObjRef (HYPRE_StructSolver, solver) ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_StructJacobiDestroy
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_structjacobidestroy, HYPRE_STRUCTJACOBIDESTROY)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructJacobiDestroy(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver) ) );
+           ( HYPRE_StructJacobiDestroy(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver) ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_StructJacobiSetup
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_structjacobisetup, HYPRE_STRUCTJACOBISETUP)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *A,
-     hypre_F90_Obj *b,
-     hypre_F90_Obj *x,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *A,
+  hypre_F90_Obj *b,
+  hypre_F90_Obj *x,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructJacobiSetup(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassObj (HYPRE_StructMatrix, A),
-           hypre_F90_PassObj (HYPRE_StructVector, b),
-           hypre_F90_PassObj (HYPRE_StructVector, x) ) );
+           ( HYPRE_StructJacobiSetup(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassObj (HYPRE_StructMatrix, A),
+                hypre_F90_PassObj (HYPRE_StructVector, b),
+                hypre_F90_PassObj (HYPRE_StructVector, x) ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_StructJacobiSolve
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_structjacobisolve, HYPRE_STRUCTJACOBISOLVE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *A,
-     hypre_F90_Obj *b,
-     hypre_F90_Obj *x,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *A,
+  hypre_F90_Obj *b,
+  hypre_F90_Obj *x,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructJacobiSolve(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassObj (HYPRE_StructMatrix, A),
-           hypre_F90_PassObj (HYPRE_StructVector, b),
-           hypre_F90_PassObj (HYPRE_StructVector, x) ) );
+           ( HYPRE_StructJacobiSolve(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassObj (HYPRE_StructMatrix, A),
+                hypre_F90_PassObj (HYPRE_StructVector, b),
+                hypre_F90_PassObj (HYPRE_StructVector, x) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -88,14 +88,14 @@ hypre_F90_IFACE(hypre_structjacobisolve, HYPRE_STRUCTJACOBISOLVE)
 
 void
 hypre_F90_IFACE(hypre_structjacobisettol, HYPRE_STRUCTJACOBISETTOL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *tol,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *tol,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructJacobiSetTol(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassReal (tol) ) );
+           ( HYPRE_StructJacobiSetTol(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassReal (tol) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -104,14 +104,14 @@ hypre_F90_IFACE(hypre_structjacobisettol, HYPRE_STRUCTJACOBISETTOL)
 
 void
 hypre_F90_IFACE(hypre_structjacobigettol, HYPRE_STRUCTJACOBIGETTOL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *tol,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *tol,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructJacobiGetTol(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassRealRef (tol) ) );
+           ( HYPRE_StructJacobiGetTol(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassRealRef (tol) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -120,14 +120,14 @@ hypre_F90_IFACE(hypre_structjacobigettol, HYPRE_STRUCTJACOBIGETTOL)
 
 void
 hypre_F90_IFACE(hypre_structjacobisetmaxiter, HYPRE_STRUCTJACOBISETMAXITER)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *max_iter,
-     hypre_F90_Int *ierr     )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *max_iter,
+  hypre_F90_Int *ierr     )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructJacobiSetMaxIter(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassInt (max_iter) ) );
+           ( HYPRE_StructJacobiSetMaxIter(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassInt (max_iter) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -136,14 +136,14 @@ hypre_F90_IFACE(hypre_structjacobisetmaxiter, HYPRE_STRUCTJACOBISETMAXITER)
 
 void
 hypre_F90_IFACE(hypre_structjacobigetmaxiter, HYPRE_STRUCTJACOBIGETMAXITER)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *max_iter,
-     hypre_F90_Int *ierr     )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *max_iter,
+  hypre_F90_Int *ierr     )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructJacobiGetMaxIter(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassIntRef (max_iter) ) );
+           ( HYPRE_StructJacobiGetMaxIter(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassIntRef (max_iter) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -152,12 +152,12 @@ hypre_F90_IFACE(hypre_structjacobigetmaxiter, HYPRE_STRUCTJACOBIGETMAXITER)
 
 void
 hypre_F90_IFACE(hypre_structjacobisetzeroguess, HYPRE_STRUCTJACOBISETZEROGUESS)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *ierr       )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *ierr       )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructJacobiSetZeroGuess(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver) ) );
+           ( HYPRE_StructJacobiSetZeroGuess(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -166,14 +166,14 @@ hypre_F90_IFACE(hypre_structjacobisetzeroguess, HYPRE_STRUCTJACOBISETZEROGUESS)
 
 void
 hypre_F90_IFACE(hypre_structjacobigetzeroguess, HYPRE_STRUCTJACOBIGETZEROGUESS)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *zeroguess,
-     hypre_F90_Int *ierr       )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *zeroguess,
+  hypre_F90_Int *ierr       )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructJacobiGetZeroGuess(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassIntRef (zeroguess) ) );
+           ( HYPRE_StructJacobiGetZeroGuess(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassIntRef (zeroguess) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -182,12 +182,12 @@ hypre_F90_IFACE(hypre_structjacobigetzeroguess, HYPRE_STRUCTJACOBIGETZEROGUESS)
 
 void
 hypre_F90_IFACE(hypre_structjacobisetnonzerogue, HYPRE_STRUCTJACOBISETNONZEROGUE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *ierr       )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *ierr       )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructJacobiSetNonZeroGuess(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver) ) );
+           ( HYPRE_StructJacobiSetNonZeroGuess(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -196,14 +196,14 @@ hypre_F90_IFACE(hypre_structjacobisetnonzerogue, HYPRE_STRUCTJACOBISETNONZEROGUE
 
 void
 hypre_F90_IFACE(hypre_structjacobigetnumiterati, HYPRE_STRUCTJACOBIGETNUMITERATI)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *num_iterations,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *num_iterations,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructJacobiGetNumIterations(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassIntRef (num_iterations) ) );
+           ( HYPRE_StructJacobiGetNumIterations(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassIntRef (num_iterations) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -212,16 +212,16 @@ hypre_F90_IFACE(hypre_structjacobigetnumiterati, HYPRE_STRUCTJACOBIGETNUMITERATI
 
 void
 hypre_F90_IFACE(hypre_structjacobigetfinalrelat, HYPRE_STRUCTJACOBIGETFINALRELAT)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *norm,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *norm,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructJacobiGetFinalRelativeResidualNorm(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassRealRef (norm) ) );
+           ( HYPRE_StructJacobiGetFinalRelativeResidualNorm(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassRealRef (norm) ) );
 }
-    
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/external/hypre/src/struct_ls/F90_HYPRE_struct_lgmres.c b/external/hypre/src/struct_ls/F90_HYPRE_struct_lgmres.c
index f8d566a0..a4ff2113 100644
--- a/external/hypre/src/struct_ls/F90_HYPRE_struct_lgmres.c
+++ b/external/hypre/src/struct_ls/F90_HYPRE_struct_lgmres.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -17,14 +17,14 @@ extern "C" {
 
 void
 hypre_F90_IFACE(hypre_structlgmrescreate, HYPRE_STRUCTLGMRESCREATE)
-   ( hypre_F90_Comm *comm,
-     hypre_F90_Obj *solver,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Comm *comm,
+  hypre_F90_Obj *solver,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructLGMRESCreate(
-           hypre_F90_PassComm (comm),
-           hypre_F90_PassObjRef (HYPRE_StructSolver, solver) ) );
+           ( HYPRE_StructLGMRESCreate(
+                hypre_F90_PassComm (comm),
+                hypre_F90_PassObjRef (HYPRE_StructSolver, solver) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -32,12 +32,12 @@ hypre_F90_IFACE(hypre_structlgmrescreate, HYPRE_STRUCTLGMRESCREATE)
 
 void
 hypre_F90_IFACE(hypre_structlgmresdestroy, HYPRE_STRUCTLGMRESDESTROY)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructLGMRESDestroy(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver) ) );
+           ( HYPRE_StructLGMRESDestroy(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -45,18 +45,18 @@ hypre_F90_IFACE(hypre_structlgmresdestroy, HYPRE_STRUCTLGMRESDESTROY)
 
 void
 hypre_F90_IFACE(hypre_structlgmressetup, HYPRE_STRUCTLGMRESSETUP)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *A,
-     hypre_F90_Obj *b,
-     hypre_F90_Obj *x,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *A,
+  hypre_F90_Obj *b,
+  hypre_F90_Obj *x,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructLGMRESSetup(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassObj (HYPRE_StructMatrix, A),
-           hypre_F90_PassObj (HYPRE_StructVector, b),
-           hypre_F90_PassObj (HYPRE_StructVector, x) ) );
+           ( HYPRE_StructLGMRESSetup(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassObj (HYPRE_StructMatrix, A),
+                hypre_F90_PassObj (HYPRE_StructVector, b),
+                hypre_F90_PassObj (HYPRE_StructVector, x) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -64,18 +64,18 @@ hypre_F90_IFACE(hypre_structlgmressetup, HYPRE_STRUCTLGMRESSETUP)
 
 void
 hypre_F90_IFACE(hypre_structlgmressolve, HYPRE_STRUCTLGMRESSOLVE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *A,
-     hypre_F90_Obj *b,
-     hypre_F90_Obj *x,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *A,
+  hypre_F90_Obj *b,
+  hypre_F90_Obj *x,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructLGMRESSolve(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassObj (HYPRE_StructMatrix, A),
-           hypre_F90_PassObj (HYPRE_StructVector, b),
-           hypre_F90_PassObj (HYPRE_StructVector, x) ) );
+           ( HYPRE_StructLGMRESSolve(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassObj (HYPRE_StructMatrix, A),
+                hypre_F90_PassObj (HYPRE_StructVector, b),
+                hypre_F90_PassObj (HYPRE_StructVector, x) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -83,14 +83,14 @@ hypre_F90_IFACE(hypre_structlgmressolve, HYPRE_STRUCTLGMRESSOLVE)
 
 void
 hypre_F90_IFACE(hypre_structlgmressettol, HYPRE_STRUCTLGMRESSETTOL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *tol,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *tol,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructLGMRESSetTol(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassReal (tol) ) );
+           ( HYPRE_StructLGMRESSetTol(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassReal (tol) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -98,14 +98,14 @@ hypre_F90_IFACE(hypre_structlgmressettol, HYPRE_STRUCTLGMRESSETTOL)
 
 void
 hypre_F90_IFACE(hypre_structlgmressetabstol, HYPRE_STRUCTLGMRESSETABSTOL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *tol,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *tol,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructLGMRESSetAbsoluteTol(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassReal (tol) ) );
+           ( HYPRE_StructLGMRESSetAbsoluteTol(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassReal (tol) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -113,14 +113,14 @@ hypre_F90_IFACE(hypre_structlgmressetabstol, HYPRE_STRUCTLGMRESSETABSTOL)
 
 void
 hypre_F90_IFACE(hypre_structlgmressetmaxiter, HYPRE_STRUCTLGMRESSETMAXITER)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *max_iter,
-     hypre_F90_Int *ierr     )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *max_iter,
+  hypre_F90_Int *ierr     )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructLGMRESSetMaxIter(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassInt (max_iter) ) );
+           ( HYPRE_StructLGMRESSetMaxIter(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassInt (max_iter) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -128,14 +128,14 @@ hypre_F90_IFACE(hypre_structlgmressetmaxiter, HYPRE_STRUCTLGMRESSETMAXITER)
 
 void
 hypre_F90_IFACE(hypre_structlgmressetkdim, HYPRE_STRUCTLGMRESSETKDIM)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *k_dim,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *k_dim,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_StructLGMRESSetKDim(
-          hypre_F90_PassObj (HYPRE_StructSolver, solver),
-          hypre_F90_PassInt (k_dim) ));
+           (HYPRE_StructLGMRESSetKDim(
+               hypre_F90_PassObj (HYPRE_StructSolver, solver),
+               hypre_F90_PassInt (k_dim) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -143,14 +143,14 @@ hypre_F90_IFACE(hypre_structlgmressetkdim, HYPRE_STRUCTLGMRESSETKDIM)
 
 void
 hypre_F90_IFACE(hypre_structlgmressetaugdim, HYPRE_STRUCTLGMRESSETAUGDIM)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Int *aug_dim,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Int *aug_dim,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_StructLGMRESSetAugDim(
-          hypre_F90_PassObj (HYPRE_StructSolver, solver),
-          hypre_F90_PassInt (aug_dim) ));
+           (HYPRE_StructLGMRESSetAugDim(
+               hypre_F90_PassObj (HYPRE_StructSolver, solver),
+               hypre_F90_PassInt (aug_dim) ));
 }
 
 /*--------------------------------------------------------------------------
@@ -158,10 +158,10 @@ hypre_F90_IFACE(hypre_structlgmressetaugdim, HYPRE_STRUCTLGMRESSETAUGDIM)
 
 void
 hypre_F90_IFACE(hypre_structlgmressetprecond, HYPRE_STRUCTLGMRESSETPRECOND)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *precond_id,
-     hypre_F90_Obj *precond_solver,
-     hypre_F90_Int *ierr           )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *precond_id,
+  hypre_F90_Obj *precond_solver,
+  hypre_F90_Int *ierr           )
 {
 
    /*------------------------------------------------------------
@@ -176,38 +176,38 @@ hypre_F90_IFACE(hypre_structlgmressetprecond, HYPRE_STRUCTLGMRESSETPRECOND)
    if (*precond_id == 0)
    {
       *ierr = (hypre_F90_Int)
-         ( HYPRE_StructLGMRESSetPrecond(
-              hypre_F90_PassObj (HYPRE_StructSolver, solver),
-              HYPRE_StructSMGSolve,
-              HYPRE_StructSMGSetup,
-              hypre_F90_PassObj (HYPRE_StructSolver, precond_solver)) );
+              ( HYPRE_StructLGMRESSetPrecond(
+                   hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                   HYPRE_StructSMGSolve,
+                   HYPRE_StructSMGSetup,
+                   hypre_F90_PassObj (HYPRE_StructSolver, precond_solver)) );
    }
    else if (*precond_id == 1)
    {
       *ierr = (hypre_F90_Int)
-         ( HYPRE_StructLGMRESSetPrecond(
-              hypre_F90_PassObj (HYPRE_StructSolver, solver),
-              HYPRE_StructPFMGSolve,
-              HYPRE_StructPFMGSetup,
-              hypre_F90_PassObj (HYPRE_StructSolver, precond_solver)) );
+              ( HYPRE_StructLGMRESSetPrecond(
+                   hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                   HYPRE_StructPFMGSolve,
+                   HYPRE_StructPFMGSetup,
+                   hypre_F90_PassObj (HYPRE_StructSolver, precond_solver)) );
    }
    else if (*precond_id == 6)
    {
       *ierr = (hypre_F90_Int)
-         ( HYPRE_StructLGMRESSetPrecond(
-              hypre_F90_PassObj (HYPRE_StructSolver, solver),
-              HYPRE_StructJacobiSolve,
-              HYPRE_StructJacobiSetup,
-              hypre_F90_PassObj (HYPRE_StructSolver, precond_solver)) );
+              ( HYPRE_StructLGMRESSetPrecond(
+                   hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                   HYPRE_StructJacobiSolve,
+                   HYPRE_StructJacobiSetup,
+                   hypre_F90_PassObj (HYPRE_StructSolver, precond_solver)) );
    }
    else if (*precond_id == 8)
    {
       *ierr = (hypre_F90_Int)
-         ( HYPRE_StructLGMRESSetPrecond(
-              hypre_F90_PassObj (HYPRE_StructSolver, solver),
-              HYPRE_StructDiagScale,
-              HYPRE_StructDiagScaleSetup,
-              hypre_F90_PassObj (HYPRE_StructSolver, precond_solver)) );
+              ( HYPRE_StructLGMRESSetPrecond(
+                   hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                   HYPRE_StructDiagScale,
+                   HYPRE_StructDiagScaleSetup,
+                   hypre_F90_PassObj (HYPRE_StructSolver, precond_solver)) );
    }
    else if (*precond_id == 9)
    {
@@ -224,14 +224,14 @@ hypre_F90_IFACE(hypre_structlgmressetprecond, HYPRE_STRUCTLGMRESSETPRECOND)
 
 void
 hypre_F90_IFACE(hypre_structlgmressetlogging, HYPRE_STRUCTLGMRESSETLOGGING)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *logging,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *logging,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructLGMRESSetLogging(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassInt (logging) ) );
+           ( HYPRE_StructLGMRESSetLogging(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassInt (logging) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -239,14 +239,14 @@ hypre_F90_IFACE(hypre_structlgmressetlogging, HYPRE_STRUCTLGMRESSETLOGGING)
 
 void
 hypre_F90_IFACE(hypre_structlgmressetprintlevel, HYPRE_STRUCTLGMRESSETPRINTLEVEL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *print_level,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *print_level,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructLGMRESSetPrintLevel(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassInt (print_level) ) );
+           ( HYPRE_StructLGMRESSetPrintLevel(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassInt (print_level) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -254,14 +254,14 @@ hypre_F90_IFACE(hypre_structlgmressetprintlevel, HYPRE_STRUCTLGMRESSETPRINTLEVEL
 
 void
 hypre_F90_IFACE(hypre_structlgmresgetnumiter, HYPRE_STRUCTLGMRESGETNUMITER)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *num_iterations,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *num_iterations,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructLGMRESGetNumIterations(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassIntRef (num_iterations) ) );
+           ( HYPRE_StructLGMRESGetNumIterations(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassIntRef (num_iterations) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -269,14 +269,14 @@ hypre_F90_IFACE(hypre_structlgmresgetnumiter, HYPRE_STRUCTLGMRESGETNUMITER)
 
 void
 hypre_F90_IFACE(hypre_structlgmresgetfinalrel, HYPRE_STRUCTLGMRESGETFINALREL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *norm,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *norm,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructLGMRESGetFinalRelativeResidualNorm(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassRealRef (norm) ) );
+           ( HYPRE_StructLGMRESGetFinalRelativeResidualNorm(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassRealRef (norm) ) );
 }
 
 #ifdef __cplusplus
diff --git a/external/hypre/src/struct_ls/F90_HYPRE_struct_pcg.c b/external/hypre/src/struct_ls/F90_HYPRE_struct_pcg.c
index 03850031..33af5a63 100644
--- a/external/hypre/src/struct_ls/F90_HYPRE_struct_pcg.c
+++ b/external/hypre/src/struct_ls/F90_HYPRE_struct_pcg.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -17,14 +17,14 @@ extern "C" {
 
 void
 hypre_F90_IFACE(hypre_structpcgcreate, HYPRE_STRUCTPCGCREATE)
-   ( hypre_F90_Comm *comm,
-     hypre_F90_Obj *solver,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Comm *comm,
+  hypre_F90_Obj *solver,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructPCGCreate(
-           hypre_F90_PassComm (comm),
-           hypre_F90_PassObjRef (HYPRE_StructSolver, solver) ) );
+           ( HYPRE_StructPCGCreate(
+                hypre_F90_PassComm (comm),
+                hypre_F90_PassObjRef (HYPRE_StructSolver, solver) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -32,12 +32,12 @@ hypre_F90_IFACE(hypre_structpcgcreate, HYPRE_STRUCTPCGCREATE)
 
 void
 hypre_F90_IFACE(hypre_structpcgdestroy, HYPRE_STRUCTPCGDESTROY)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructPCGDestroy(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver) ) );
+           ( HYPRE_StructPCGDestroy(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -45,18 +45,18 @@ hypre_F90_IFACE(hypre_structpcgdestroy, HYPRE_STRUCTPCGDESTROY)
 
 void
 hypre_F90_IFACE(hypre_structpcgsetup, HYPRE_STRUCTPCGSETUP)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *A,
-     hypre_F90_Obj *b,
-     hypre_F90_Obj *x,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *A,
+  hypre_F90_Obj *b,
+  hypre_F90_Obj *x,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructPCGSetup(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassObj (HYPRE_StructMatrix, A),
-           hypre_F90_PassObj (HYPRE_StructVector, b),
-           hypre_F90_PassObj (HYPRE_StructVector, x) ) );
+           ( HYPRE_StructPCGSetup(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassObj (HYPRE_StructMatrix, A),
+                hypre_F90_PassObj (HYPRE_StructVector, b),
+                hypre_F90_PassObj (HYPRE_StructVector, x) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -64,18 +64,18 @@ hypre_F90_IFACE(hypre_structpcgsetup, HYPRE_STRUCTPCGSETUP)
 
 void
 hypre_F90_IFACE(hypre_structpcgsolve, HYPRE_STRUCTPCGSOLVE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *A,
-     hypre_F90_Obj *b,
-     hypre_F90_Obj *x,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *A,
+  hypre_F90_Obj *b,
+  hypre_F90_Obj *x,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructPCGSolve(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassObj (HYPRE_StructMatrix, A),
-           hypre_F90_PassObj (HYPRE_StructVector, b),
-           hypre_F90_PassObj (HYPRE_StructVector, x) ) );
+           ( HYPRE_StructPCGSolve(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassObj (HYPRE_StructMatrix, A),
+                hypre_F90_PassObj (HYPRE_StructVector, b),
+                hypre_F90_PassObj (HYPRE_StructVector, x) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -83,14 +83,14 @@ hypre_F90_IFACE(hypre_structpcgsolve, HYPRE_STRUCTPCGSOLVE)
 
 void
 hypre_F90_IFACE(hypre_structpcgsettol, HYPRE_STRUCTPCGSETTOL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *tol,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *tol,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructPCGSetTol(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassReal (tol) ) );
+           ( HYPRE_StructPCGSetTol(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassReal (tol) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -98,14 +98,14 @@ hypre_F90_IFACE(hypre_structpcgsettol, HYPRE_STRUCTPCGSETTOL)
 
 void
 hypre_F90_IFACE(hypre_structpcgsetabstol, HYPRE_STRUCTPCGSETABSTOL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *tol,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *tol,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructPCGSetAbsoluteTol(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassReal (tol) ) );
+           ( HYPRE_StructPCGSetAbsoluteTol(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassReal (tol) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -113,14 +113,14 @@ hypre_F90_IFACE(hypre_structpcgsetabstol, HYPRE_STRUCTPCGSETABSTOL)
 
 void
 hypre_F90_IFACE(hypre_structpcgsetmaxiter, HYPRE_STRUCTPCGSETMAXITER)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *max_iter,
-     hypre_F90_Int *ierr     )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *max_iter,
+  hypre_F90_Int *ierr     )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructPCGSetMaxIter(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassInt (max_iter) ) );
+           ( HYPRE_StructPCGSetMaxIter(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassInt (max_iter) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -128,14 +128,14 @@ hypre_F90_IFACE(hypre_structpcgsetmaxiter, HYPRE_STRUCTPCGSETMAXITER)
 
 void
 hypre_F90_IFACE(hypre_structpcgsettwonorm, HYPRE_STRUCTPCGSETTWONORM)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *two_norm,
-     hypre_F90_Int *ierr     )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *two_norm,
+  hypre_F90_Int *ierr     )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructPCGSetTwoNorm(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassInt (two_norm) ) );
+           ( HYPRE_StructPCGSetTwoNorm(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassInt (two_norm) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -143,14 +143,14 @@ hypre_F90_IFACE(hypre_structpcgsettwonorm, HYPRE_STRUCTPCGSETTWONORM)
 
 void
 hypre_F90_IFACE(hypre_structpcgsetrelchange, HYPRE_STRUCTPCGSETRELCHANGE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *rel_change,
-     hypre_F90_Int *ierr       )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *rel_change,
+  hypre_F90_Int *ierr       )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructPCGSetRelChange(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassInt (rel_change) ) );
+           ( HYPRE_StructPCGSetRelChange(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassInt (rel_change) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -158,10 +158,10 @@ hypre_F90_IFACE(hypre_structpcgsetrelchange, HYPRE_STRUCTPCGSETRELCHANGE)
 
 void
 hypre_F90_IFACE(hypre_structpcgsetprecond, HYPRE_STRUCTPCGSETPRECOND)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *precond_id,
-     hypre_F90_Obj *precond_solver,
-     hypre_F90_Int *ierr           )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *precond_id,
+  hypre_F90_Obj *precond_solver,
+  hypre_F90_Int *ierr           )
 {
 
    /*------------------------------------------------------------
@@ -176,38 +176,38 @@ hypre_F90_IFACE(hypre_structpcgsetprecond, HYPRE_STRUCTPCGSETPRECOND)
    if (*precond_id == 0)
    {
       *ierr = (hypre_F90_Int)
-         ( HYPRE_StructPCGSetPrecond(
-              hypre_F90_PassObj (HYPRE_StructSolver, solver),
-              HYPRE_StructSMGSolve,
-              HYPRE_StructSMGSetup,
-              hypre_F90_PassObj (HYPRE_StructSolver, precond_solver)) );
+              ( HYPRE_StructPCGSetPrecond(
+                   hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                   HYPRE_StructSMGSolve,
+                   HYPRE_StructSMGSetup,
+                   hypre_F90_PassObj (HYPRE_StructSolver, precond_solver)) );
    }
    else if (*precond_id == 1)
    {
       *ierr = (hypre_F90_Int)
-         ( HYPRE_StructPCGSetPrecond(
-              hypre_F90_PassObj (HYPRE_StructSolver, solver),
-              HYPRE_StructPFMGSolve,
-              HYPRE_StructPFMGSetup,
-              hypre_F90_PassObj (HYPRE_StructSolver, precond_solver)) );
+              ( HYPRE_StructPCGSetPrecond(
+                   hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                   HYPRE_StructPFMGSolve,
+                   HYPRE_StructPFMGSetup,
+                   hypre_F90_PassObj (HYPRE_StructSolver, precond_solver)) );
    }
    else if (*precond_id == 7)
    {
       *ierr = (hypre_F90_Int)
-         ( HYPRE_StructPCGSetPrecond(
-              hypre_F90_PassObj (HYPRE_StructSolver, solver),
-              HYPRE_StructJacobiSolve,
-              HYPRE_StructJacobiSetup,
-              hypre_F90_PassObj (HYPRE_StructSolver, precond_solver)) );
+              ( HYPRE_StructPCGSetPrecond(
+                   hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                   HYPRE_StructJacobiSolve,
+                   HYPRE_StructJacobiSetup,
+                   hypre_F90_PassObj (HYPRE_StructSolver, precond_solver)) );
    }
    else if (*precond_id == 8)
    {
       *ierr = (hypre_F90_Int)
-         ( HYPRE_StructPCGSetPrecond(
-              hypre_F90_PassObj (HYPRE_StructSolver, solver),
-              HYPRE_StructDiagScale,
-              HYPRE_StructDiagScaleSetup,
-              hypre_F90_PassObj (HYPRE_StructSolver, precond_solver)) );
+              ( HYPRE_StructPCGSetPrecond(
+                   hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                   HYPRE_StructDiagScale,
+                   HYPRE_StructDiagScaleSetup,
+                   hypre_F90_PassObj (HYPRE_StructSolver, precond_solver)) );
    }
    else if (*precond_id == 9)
    {
@@ -224,14 +224,14 @@ hypre_F90_IFACE(hypre_structpcgsetprecond, HYPRE_STRUCTPCGSETPRECOND)
 
 void
 hypre_F90_IFACE(hypre_structpcgsetlogging, HYPRE_STRUCTPCGSETLOGGING)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *logging,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *logging,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructPCGSetLogging(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassInt (logging) ) );
+           ( HYPRE_StructPCGSetLogging(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassInt (logging) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -239,14 +239,14 @@ hypre_F90_IFACE(hypre_structpcgsetlogging, HYPRE_STRUCTPCGSETLOGGING)
 
 void
 hypre_F90_IFACE(hypre_structpcgsetprintlevel, HYPRE_STRUCTPCGSETPRINTLEVEL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *print_level,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *print_level,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructPCGSetPrintLevel(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassInt (print_level) ) );
+           ( HYPRE_StructPCGSetPrintLevel(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassInt (print_level) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -254,14 +254,14 @@ hypre_F90_IFACE(hypre_structpcgsetprintlevel, HYPRE_STRUCTPCGSETPRINTLEVEL)
 
 void
 hypre_F90_IFACE(hypre_structpcggetnumiterations, HYPRE_STRUCTPCGGETNUMITERATIONS)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *num_iterations,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *num_iterations,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructPCGGetNumIterations(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassIntRef (num_iterations) ) );
+           ( HYPRE_StructPCGGetNumIterations(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassIntRef (num_iterations) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -269,14 +269,14 @@ hypre_F90_IFACE(hypre_structpcggetnumiterations, HYPRE_STRUCTPCGGETNUMITERATIONS
 
 void
 hypre_F90_IFACE(hypre_structpcggetfinalrelative, HYPRE_STRUCTPCGGETFINALRELATIVE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *norm,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *norm,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructPCGGetFinalRelativeResidualNorm(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassRealRef (norm) ) );
+           ( HYPRE_StructPCGGetFinalRelativeResidualNorm(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassRealRef (norm) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -284,18 +284,18 @@ hypre_F90_IFACE(hypre_structpcggetfinalrelative, HYPRE_STRUCTPCGGETFINALRELATIVE
 
 void
 hypre_F90_IFACE(hypre_structdiagscalesetup, HYPRE_STRUCTDIAGSCALESETUP)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *A,
-     hypre_F90_Obj *y,
-     hypre_F90_Obj *x,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *A,
+  hypre_F90_Obj *y,
+  hypre_F90_Obj *x,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructDiagScaleSetup(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassObj (HYPRE_StructMatrix, A),
-           hypre_F90_PassObj (HYPRE_StructVector, y),
-           hypre_F90_PassObj (HYPRE_StructVector, x)     ) );
+           ( HYPRE_StructDiagScaleSetup(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassObj (HYPRE_StructMatrix, A),
+                hypre_F90_PassObj (HYPRE_StructVector, y),
+                hypre_F90_PassObj (HYPRE_StructVector, x)     ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -303,18 +303,18 @@ hypre_F90_IFACE(hypre_structdiagscalesetup, HYPRE_STRUCTDIAGSCALESETUP)
 
 void
 hypre_F90_IFACE(hypre_structdiagscale, HYPRE_STRUCTDIAGSCALE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *HA,
-     hypre_F90_Obj *Hy,
-     hypre_F90_Obj *Hx,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *HA,
+  hypre_F90_Obj *Hy,
+  hypre_F90_Obj *Hx,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructDiagScale(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassObj (HYPRE_StructMatrix, HA),
-           hypre_F90_PassObj (HYPRE_StructVector, Hy),
-           hypre_F90_PassObj (HYPRE_StructVector, Hx)     ) );
+           ( HYPRE_StructDiagScale(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassObj (HYPRE_StructMatrix, HA),
+                hypre_F90_PassObj (HYPRE_StructVector, Hy),
+                hypre_F90_PassObj (HYPRE_StructVector, Hx)     ) );
 }
 
 #ifdef __cplusplus
diff --git a/external/hypre/src/struct_ls/F90_HYPRE_struct_pfmg.c b/external/hypre/src/struct_ls/F90_HYPRE_struct_pfmg.c
index 26f4feec..3e52142e 100644
--- a/external/hypre/src/struct_ls/F90_HYPRE_struct_pfmg.c
+++ b/external/hypre/src/struct_ls/F90_HYPRE_struct_pfmg.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -11,75 +11,75 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-    
+
 /*--------------------------------------------------------------------------
  * HYPRE_StructPFMGCreate
  *--------------------------------------------------------------------------*/
 
 void
 hypre_F90_IFACE(hypre_structpfmgcreate, HYPRE_STRUCTPFMGCREATE)
-   ( hypre_F90_Comm *comm,
-     hypre_F90_Obj *solver,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Comm *comm,
+  hypre_F90_Obj *solver,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructPFMGCreate(
-           hypre_F90_PassComm (comm),
-           hypre_F90_PassObjRef (HYPRE_StructSolver, solver) ) );
+           ( HYPRE_StructPFMGCreate(
+                hypre_F90_PassComm (comm),
+                hypre_F90_PassObjRef (HYPRE_StructSolver, solver) ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_StructPFMGDestroy
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_structpfmgdestroy, HYPRE_STRUCTPFMGDESTROY)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructPFMGDestroy(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver) ) );
+           ( HYPRE_StructPFMGDestroy(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver) ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_StructPFMGSetup
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_structpfmgsetup, HYPRE_STRUCTPFMGSETUP)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *A,
-     hypre_F90_Obj *b,
-     hypre_F90_Obj *x,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *A,
+  hypre_F90_Obj *b,
+  hypre_F90_Obj *x,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructPFMGSetup(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassObj (HYPRE_StructMatrix, A),
-           hypre_F90_PassObj (HYPRE_StructVector, b),
-           hypre_F90_PassObj (HYPRE_StructVector, x)      ) );
+           ( HYPRE_StructPFMGSetup(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassObj (HYPRE_StructMatrix, A),
+                hypre_F90_PassObj (HYPRE_StructVector, b),
+                hypre_F90_PassObj (HYPRE_StructVector, x)      ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_StructPFMGSolve
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_structpfmgsolve, HYPRE_STRUCTPFMGSOLVE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *A,
-     hypre_F90_Obj *b,
-     hypre_F90_Obj *x,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *A,
+  hypre_F90_Obj *b,
+  hypre_F90_Obj *x,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructPFMGSolve(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassObj (HYPRE_StructMatrix, A),
-           hypre_F90_PassObj (HYPRE_StructVector, b),
-           hypre_F90_PassObj (HYPRE_StructVector, x)      ) );
+           ( HYPRE_StructPFMGSolve(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassObj (HYPRE_StructMatrix, A),
+                hypre_F90_PassObj (HYPRE_StructVector, b),
+                hypre_F90_PassObj (HYPRE_StructVector, x)      ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -88,26 +88,26 @@ hypre_F90_IFACE(hypre_structpfmgsolve, HYPRE_STRUCTPFMGSOLVE)
 
 void
 hypre_F90_IFACE(hypre_structpfmgsettol, HYPRE_STRUCTPFMGSETTOL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *tol,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *tol,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructPFMGSetTol(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassReal (tol)    ) );
+           ( HYPRE_StructPFMGSetTol(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassReal (tol)    ) );
 }
 
 void
 hypre_F90_IFACE(hypre_structpfmggettol, HYPRE_STRUCTPFMGGETTOL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *tol,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *tol,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructPFMGGetTol(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassRealRef (tol)    ) );
+           ( HYPRE_StructPFMGGetTol(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassRealRef (tol)    ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -116,26 +116,26 @@ hypre_F90_IFACE(hypre_structpfmggettol, HYPRE_STRUCTPFMGGETTOL)
 
 void
 hypre_F90_IFACE(hypre_structpfmgsetmaxiter, HYPRE_STRUCTPFMGSETMAXITER)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *max_iter,
-     hypre_F90_Int *ierr     )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *max_iter,
+  hypre_F90_Int *ierr     )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructPFMGSetMaxIter(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassInt (max_iter)  ) );
+           ( HYPRE_StructPFMGSetMaxIter(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassInt (max_iter)  ) );
 }
 
 void
 hypre_F90_IFACE(hypre_structpfmggetmaxiter, HYPRE_STRUCTPFMGGETMAXITER)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *max_iter,
-     hypre_F90_Int *ierr     )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *max_iter,
+  hypre_F90_Int *ierr     )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructPFMGGetMaxIter(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassIntRef (max_iter)  ) );
+           ( HYPRE_StructPFMGGetMaxIter(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassIntRef (max_iter)  ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -144,26 +144,26 @@ hypre_F90_IFACE(hypre_structpfmggetmaxiter, HYPRE_STRUCTPFMGGETMAXITER)
 
 void
 hypre_F90_IFACE(hypre_structpfmgsetmaxlevels, HYPRE_STRUCTPFMGSETMAXLEVELS)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *max_levels,
-     hypre_F90_Int *ierr     )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *max_levels,
+  hypre_F90_Int *ierr     )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructPFMGSetMaxLevels(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassInt (max_levels)  ) );
+           ( HYPRE_StructPFMGSetMaxLevels(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassInt (max_levels)  ) );
 }
 
 void
 hypre_F90_IFACE(hypre_structpfmggetmaxlevels, HYPRE_STRUCTPFMGGETMAXLEVELS)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *max_levels,
-     hypre_F90_Int *ierr     )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *max_levels,
+  hypre_F90_Int *ierr     )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructPFMGGetMaxLevels(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassIntRef (max_levels)  ) );
+           ( HYPRE_StructPFMGGetMaxLevels(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassIntRef (max_levels)  ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -172,66 +172,66 @@ hypre_F90_IFACE(hypre_structpfmggetmaxlevels, HYPRE_STRUCTPFMGGETMAXLEVELS)
 
 void
 hypre_F90_IFACE(hypre_structpfmgsetrelchange, HYPRE_STRUCTPFMGSETRELCHANGE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *rel_change,
-     hypre_F90_Int *ierr       )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *rel_change,
+  hypre_F90_Int *ierr       )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructPFMGSetRelChange(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassInt (rel_change)  ) );
+           ( HYPRE_StructPFMGSetRelChange(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassInt (rel_change)  ) );
 }
 
 void
 hypre_F90_IFACE(hypre_structpfmggetrelchange, HYPRE_STRUCTPFMGGETRELCHANGE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *rel_change,
-     hypre_F90_Int *ierr       )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *rel_change,
+  hypre_F90_Int *ierr       )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructPFMGGetRelChange(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassIntRef (rel_change)  ) );
+           ( HYPRE_StructPFMGGetRelChange(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassIntRef (rel_change)  ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_StructPFMGSetZeroGuess, HYPRE_StructPFMGGetZeroGuess
  *--------------------------------------------------------------------------*/
- 
+
 void
 hypre_F90_IFACE(hypre_structpfmgsetzeroguess, HYPRE_STRUCTPFMGSETZEROGUESS)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructPFMGSetZeroGuess(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver) ) );
+           ( HYPRE_StructPFMGSetZeroGuess(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver) ) );
 }
- 
+
 void
 hypre_F90_IFACE(hypre_structpfmggetzeroguess, HYPRE_STRUCTPFMGGETZEROGUESS)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *zeroguess,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *zeroguess,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructPFMGGetZeroGuess(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassIntRef (zeroguess) ) );
+           ( HYPRE_StructPFMGGetZeroGuess(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassIntRef (zeroguess) ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_StructPFMGSetNonZeroGuess
  *--------------------------------------------------------------------------*/
- 
+
 void
 hypre_F90_IFACE(hypre_structpfmgsetnonzeroguess, HYPRE_STRUCTPFMGSETNONZEROGUESS)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructPFMGSetNonZeroGuess(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver) ) );
+           ( HYPRE_StructPFMGSetNonZeroGuess(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -240,26 +240,26 @@ hypre_F90_IFACE(hypre_structpfmgsetnonzeroguess, HYPRE_STRUCTPFMGSETNONZEROGUESS
 
 void
 hypre_F90_IFACE(hypre_structpfmgsetrelaxtype, HYPRE_STRUCTPFMGSETRELAXTYPE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *relax_type,
-     hypre_F90_Int *ierr       )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *relax_type,
+  hypre_F90_Int *ierr       )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructPFMGSetRelaxType(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassInt (relax_type) ) );
+           ( HYPRE_StructPFMGSetRelaxType(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassInt (relax_type) ) );
 }
 
 void
 hypre_F90_IFACE(hypre_structpfmggetrelaxtype, HYPRE_STRUCTPFMGGETRELAXTYPE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *relax_type,
-     hypre_F90_Int *ierr       )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *relax_type,
+  hypre_F90_Int *ierr       )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructPFMGGetRelaxType(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassIntRef (relax_type) ) );
+           ( HYPRE_StructPFMGGetRelaxType(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassIntRef (relax_type) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -267,14 +267,14 @@ hypre_F90_IFACE(hypre_structpfmggetrelaxtype, HYPRE_STRUCTPFMGGETRELAXTYPE)
  *--------------------------------------------------------------------------*/
 void
 hypre_F90_IFACE(hypre_structpfmgsetjacobiweigh, HYPRE_STRUCTPFMGSETJACOBIWEIGH)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Real *weight,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Real *weight,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_StructPFMGSetJacobiWeight(
-          hypre_F90_PassObj (HYPRE_StructSolver, solver),
-          hypre_F90_PassReal (weight) ) );
+           (HYPRE_StructPFMGSetJacobiWeight(
+               hypre_F90_PassObj (HYPRE_StructSolver, solver),
+               hypre_F90_PassReal (weight) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -283,26 +283,26 @@ hypre_F90_IFACE(hypre_structpfmgsetjacobiweigh, HYPRE_STRUCTPFMGSETJACOBIWEIGH)
 
 void
 hypre_F90_IFACE(hypre_structpfmgsetraptype, HYPRE_STRUCTPFMGSETRAPTYPE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *rap_type,
-     hypre_F90_Int *ierr       )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *rap_type,
+  hypre_F90_Int *ierr       )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructPFMGSetRAPType(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassInt (rap_type) ) );
+           ( HYPRE_StructPFMGSetRAPType(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassInt (rap_type) ) );
 }
 
 void
 hypre_F90_IFACE(hypre_structpfmggetraptype, HYPRE_STRUCTPFMGGETRAPTYPE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *rap_type,
-     hypre_F90_Int *ierr       )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *rap_type,
+  hypre_F90_Int *ierr       )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructPFMGGetRAPType(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassIntRef (rap_type) ) );
+           ( HYPRE_StructPFMGGetRAPType(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassIntRef (rap_type) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -311,26 +311,26 @@ hypre_F90_IFACE(hypre_structpfmggetraptype, HYPRE_STRUCTPFMGGETRAPTYPE)
 
 void
 hypre_F90_IFACE(hypre_structpfmgsetnumprerelax, HYPRE_STRUCTPFMGSETNUMPRERELAX)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *num_pre_relax,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *num_pre_relax,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructPFMGSetNumPreRelax(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassInt (num_pre_relax) ) );
+           ( HYPRE_StructPFMGSetNumPreRelax(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassInt (num_pre_relax) ) );
 }
 
 void
 hypre_F90_IFACE(hypre_structpfmggetnumprerelax, HYPRE_STRUCTPFMGGETNUMPRERELAX)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *num_pre_relax,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *num_pre_relax,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructPFMGGetNumPreRelax(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassIntRef (num_pre_relax) ) );
+           ( HYPRE_StructPFMGGetNumPreRelax(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassIntRef (num_pre_relax) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -339,26 +339,26 @@ hypre_F90_IFACE(hypre_structpfmggetnumprerelax, HYPRE_STRUCTPFMGGETNUMPRERELAX)
 
 void
 hypre_F90_IFACE(hypre_structpfmgsetnumpostrelax, HYPRE_STRUCTPFMGSETNUMPOSTRELAX)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *num_post_relax,
-     hypre_F90_Int *ierr           )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *num_post_relax,
+  hypre_F90_Int *ierr           )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructPFMGSetNumPostRelax(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassInt (num_post_relax) ) );
+           ( HYPRE_StructPFMGSetNumPostRelax(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassInt (num_post_relax) ) );
 }
 
 void
 hypre_F90_IFACE(hypre_structpfmggetnumpostrelax, HYPRE_STRUCTPFMGGETNUMPOSTRELAX)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *num_post_relax,
-     hypre_F90_Int *ierr           )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *num_post_relax,
+  hypre_F90_Int *ierr           )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructPFMGGetNumPostRelax(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassIntRef (num_post_relax) ) );
+           ( HYPRE_StructPFMGGetNumPostRelax(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassIntRef (num_post_relax) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -367,26 +367,26 @@ hypre_F90_IFACE(hypre_structpfmggetnumpostrelax, HYPRE_STRUCTPFMGGETNUMPOSTRELAX
 
 void
 hypre_F90_IFACE(hypre_structpfmgsetskiprelax, HYPRE_STRUCTPFMGSETSKIPRELAX)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *skip_relax,
-     hypre_F90_Int *ierr           )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *skip_relax,
+  hypre_F90_Int *ierr           )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructPFMGSetSkipRelax(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassInt (skip_relax) ) );
+           ( HYPRE_StructPFMGSetSkipRelax(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassInt (skip_relax) ) );
 }
 
 void
 hypre_F90_IFACE(hypre_structpfmggetskiprelax, HYPRE_STRUCTPFMGGETSKIPRELAX)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *skip_relax,
-     hypre_F90_Int *ierr           )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *skip_relax,
+  hypre_F90_Int *ierr           )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructPFMGGetSkipRelax(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassIntRef (skip_relax) ) );
+           ( HYPRE_StructPFMGGetSkipRelax(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassIntRef (skip_relax) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -395,14 +395,14 @@ hypre_F90_IFACE(hypre_structpfmggetskiprelax, HYPRE_STRUCTPFMGGETSKIPRELAX)
 
 void
 hypre_F90_IFACE(hypre_structpfmgsetdxyz, HYPRE_STRUCTPFMGSETDXYZ)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_RealArray *dxyz,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_RealArray *dxyz,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructPFMGSetDxyz(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassRealArray (dxyz)   ) );
+           ( HYPRE_StructPFMGSetDxyz(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassRealArray (dxyz)   ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -411,26 +411,26 @@ hypre_F90_IFACE(hypre_structpfmgsetdxyz, HYPRE_STRUCTPFMGSETDXYZ)
 
 void
 hypre_F90_IFACE(hypre_structpfmgsetlogging, HYPRE_STRUCTPFMGSETLOGGING)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *logging,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *logging,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructPFMGSetLogging(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassInt (logging) ) );
+           ( HYPRE_StructPFMGSetLogging(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassInt (logging) ) );
 }
 
 void
 hypre_F90_IFACE(hypre_structpfmggetlogging, HYPRE_STRUCTPFMGGETLOGGING)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *logging,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *logging,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructPFMGGetLogging(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassIntRef (logging) ) );
+           ( HYPRE_StructPFMGGetLogging(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassIntRef (logging) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -439,26 +439,26 @@ hypre_F90_IFACE(hypre_structpfmggetlogging, HYPRE_STRUCTPFMGGETLOGGING)
 
 void
 hypre_F90_IFACE(hypre_structpfmgsetprintlevel, HYPRE_STRUCTPFMGSETPRINTLEVEL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *print_level,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *print_level,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructPFMGSetPrintLevel(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassInt (print_level) ) );
+           ( HYPRE_StructPFMGSetPrintLevel(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassInt (print_level) ) );
 }
 
 void
 hypre_F90_IFACE(hypre_structpfmggetprintlevel, HYPRE_STRUCTPFMGGETPRINTLEVEL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *print_level,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *print_level,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructPFMGGetPrintLevel(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassIntRef (print_level) ) );
+           ( HYPRE_StructPFMGGetPrintLevel(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassIntRef (print_level) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -467,14 +467,14 @@ hypre_F90_IFACE(hypre_structpfmggetprintlevel, HYPRE_STRUCTPFMGGETPRINTLEVEL)
 
 void
 hypre_F90_IFACE(hypre_structpfmggetnumiteration, HYPRE_STRUCTPFMGGETNUMITERATION)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *num_iterations,
-     hypre_F90_Int *ierr           )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *num_iterations,
+  hypre_F90_Int *ierr           )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructPFMGGetNumIterations(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassIntRef (num_iterations) ) );
+           ( HYPRE_StructPFMGGetNumIterations(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassIntRef (num_iterations) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -483,16 +483,16 @@ hypre_F90_IFACE(hypre_structpfmggetnumiteration, HYPRE_STRUCTPFMGGETNUMITERATION
 
 void
 hypre_F90_IFACE(hypre_structpfmggetfinalrelativ, HYPRE_STRUCTPFMGGETFINALRELATIV)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *norm,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *norm,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructPFMGGetFinalRelativeResidualNorm(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassRealRef (norm)   ) );
+           ( HYPRE_StructPFMGGetFinalRelativeResidualNorm(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassRealRef (norm)   ) );
 }
-    
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/external/hypre/src/struct_ls/F90_HYPRE_struct_smg.c b/external/hypre/src/struct_ls/F90_HYPRE_struct_smg.c
index 46b1b687..dc298d20 100644
--- a/external/hypre/src/struct_ls/F90_HYPRE_struct_smg.c
+++ b/external/hypre/src/struct_ls/F90_HYPRE_struct_smg.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -17,21 +17,21 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-    
+
 /*--------------------------------------------------------------------------
  * HYPRE_StructSMGCreate
  *--------------------------------------------------------------------------*/
 
 void
 hypre_F90_IFACE(hypre_structsmgcreate, HYPRE_STRUCTSMGCREATE)
-   ( hypre_F90_Comm *comm,
-     hypre_F90_Obj *solver,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Comm *comm,
+  hypre_F90_Obj *solver,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructSMGCreate(
-           hypre_F90_PassComm (comm),
-           hypre_F90_PassObjRef (HYPRE_StructSolver, solver) ) );
+           ( HYPRE_StructSMGCreate(
+                hypre_F90_PassComm (comm),
+                hypre_F90_PassObjRef (HYPRE_StructSolver, solver) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -40,52 +40,52 @@ hypre_F90_IFACE(hypre_structsmgcreate, HYPRE_STRUCTSMGCREATE)
 
 void
 hypre_F90_IFACE(hypre_structsmgdestroy, HYPRE_STRUCTSMGDESTROY)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructSMGDestroy(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver) ) );
+           ( HYPRE_StructSMGDestroy(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver) ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_StructSMGSetup
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_structsmgsetup, HYPRE_STRUCTSMGSETUP)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *A,
-     hypre_F90_Obj *b,
-     hypre_F90_Obj *x,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *A,
+  hypre_F90_Obj *b,
+  hypre_F90_Obj *x,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructSMGSetup(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassObj (HYPRE_StructMatrix, A),
-           hypre_F90_PassObj (HYPRE_StructVector, b),
-           hypre_F90_PassObj (HYPRE_StructVector, x) ) );
+           ( HYPRE_StructSMGSetup(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassObj (HYPRE_StructMatrix, A),
+                hypre_F90_PassObj (HYPRE_StructVector, b),
+                hypre_F90_PassObj (HYPRE_StructVector, x) ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_StructSMGSolve
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_structsmgsolve, HYPRE_STRUCTSMGSOLVE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *A,
-     hypre_F90_Obj *b,
-     hypre_F90_Obj *x,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *A,
+  hypre_F90_Obj *b,
+  hypre_F90_Obj *x,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructSMGSolve(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassObj (HYPRE_StructMatrix, A),
-           hypre_F90_PassObj (HYPRE_StructVector, b),
-           hypre_F90_PassObj (HYPRE_StructVector, x) ) );
+           ( HYPRE_StructSMGSolve(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassObj (HYPRE_StructMatrix, A),
+                hypre_F90_PassObj (HYPRE_StructVector, b),
+                hypre_F90_PassObj (HYPRE_StructVector, x) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -94,26 +94,26 @@ hypre_F90_IFACE(hypre_structsmgsolve, HYPRE_STRUCTSMGSOLVE)
 
 void
 hypre_F90_IFACE(hypre_structsmgsetmemoryuse, HYPRE_STRUCTSMGSETMEMORYUSE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *memory_use,
-     hypre_F90_Int *ierr       )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *memory_use,
+  hypre_F90_Int *ierr       )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructSMGSetMemoryUse(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassInt (memory_use) ) );
+           ( HYPRE_StructSMGSetMemoryUse(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassInt (memory_use) ) );
 }
 
 void
 hypre_F90_IFACE(hypre_structsmggetmemoryuse, HYPRE_STRUCTSMGGETMEMORYUSE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *memory_use,
-     hypre_F90_Int *ierr       )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *memory_use,
+  hypre_F90_Int *ierr       )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructSMGGetMemoryUse(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassIntRef (memory_use) ) );
+           ( HYPRE_StructSMGGetMemoryUse(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassIntRef (memory_use) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -122,26 +122,26 @@ hypre_F90_IFACE(hypre_structsmggetmemoryuse, HYPRE_STRUCTSMGGETMEMORYUSE)
 
 void
 hypre_F90_IFACE(hypre_structsmgsettol, HYPRE_STRUCTSMGSETTOL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *tol,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *tol,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructSMGSetTol(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassReal (tol) ) );
+           ( HYPRE_StructSMGSetTol(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassReal (tol) ) );
 }
 
 void
 hypre_F90_IFACE(hypre_structsmggettol, HYPRE_STRUCTSMGGETTOL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *tol,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *tol,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructSMGGetTol(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassRealRef (tol) ) );
+           ( HYPRE_StructSMGGetTol(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassRealRef (tol) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -150,26 +150,26 @@ hypre_F90_IFACE(hypre_structsmggettol, HYPRE_STRUCTSMGGETTOL)
 
 void
 hypre_F90_IFACE(hypre_structsmgsetmaxiter, HYPRE_STRUCTSMGSETMAXITER)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *max_iter,
-     hypre_F90_Int *ierr     )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *max_iter,
+  hypre_F90_Int *ierr     )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructSMGSetMaxIter(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassInt (max_iter) ) );
+           ( HYPRE_StructSMGSetMaxIter(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassInt (max_iter) ) );
 }
 
 void
 hypre_F90_IFACE(hypre_structsmggetmaxiter, HYPRE_STRUCTSMGGETMAXITER)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *max_iter,
-     hypre_F90_Int *ierr     )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *max_iter,
+  hypre_F90_Int *ierr     )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructSMGGetMaxIter(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassIntRef (max_iter) ) );
+           ( HYPRE_StructSMGGetMaxIter(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassIntRef (max_iter) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -178,97 +178,97 @@ hypre_F90_IFACE(hypre_structsmggetmaxiter, HYPRE_STRUCTSMGGETMAXITER)
 
 void
 hypre_F90_IFACE(hypre_structsmgsetrelchange, HYPRE_STRUCTSMGSETRELCHANGE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *rel_change,
-     hypre_F90_Int *ierr       )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *rel_change,
+  hypre_F90_Int *ierr       )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructSMGSetRelChange(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassInt (rel_change) ) );
+           ( HYPRE_StructSMGSetRelChange(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassInt (rel_change) ) );
 }
 
 void
 hypre_F90_IFACE(hypre_structsmggetrelchange, HYPRE_STRUCTSMGGETRELCHANGE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *rel_change,
-     hypre_F90_Int *ierr       )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *rel_change,
+  hypre_F90_Int *ierr       )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructSMGGetRelChange(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassIntRef (rel_change) ) );
+           ( HYPRE_StructSMGGetRelChange(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassIntRef (rel_change) ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_StructSMGSetZeroGuess, HYPRE_StructSMGGetZeroGuess
  *--------------------------------------------------------------------------*/
- 
+
 void
 hypre_F90_IFACE(hypre_structsmgsetzeroguess, HYPRE_STRUCTSMGSETZEROGUESS)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructSMGSetZeroGuess(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver) ) );
+           ( HYPRE_StructSMGSetZeroGuess(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver) ) );
 }
- 
+
 void
 hypre_F90_IFACE(hypre_structsmggetzeroguess, HYPRE_STRUCTSMGGETZEROGUESS)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *zeroguess,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *zeroguess,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructSMGGetZeroGuess(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassIntRef (zeroguess) ) );
+           ( HYPRE_StructSMGGetZeroGuess(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassIntRef (zeroguess) ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_StructSMGSetNonZeroGuess
  *--------------------------------------------------------------------------*/
- 
+
 void
 hypre_F90_IFACE(hypre_structsmgsetnonzeroguess, HYPRE_STRUCTSMGSETNONZEROGUESS)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructSMGSetNonZeroGuess(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver) ) );
+           ( HYPRE_StructSMGSetNonZeroGuess(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver) ) );
 }
 
 
 /*--------------------------------------------------------------------------
  * HYPRE_StructSMGSetNumPreRelax, HYPRE_StructSMGGetNumPreRelax
  *
- * Note that we require at least 1 pre-relax sweep. 
+ * Note that we require at least 1 pre-relax sweep.
  *--------------------------------------------------------------------------*/
 
 void
 hypre_F90_IFACE(hypre_structsmgsetnumprerelax, HYPRE_STRUCTSMGSETNUMPRERELAX)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *num_pre_relax,
-     hypre_F90_Int *ierr         )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *num_pre_relax,
+  hypre_F90_Int *ierr         )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructSMGSetNumPreRelax(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassInt (num_pre_relax)) );
+           ( HYPRE_StructSMGSetNumPreRelax(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassInt (num_pre_relax)) );
 }
 
 void
 hypre_F90_IFACE(hypre_structsmggetnumprerelax, HYPRE_STRUCTSMGGETNUMPRERELAX)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *num_pre_relax,
-     hypre_F90_Int *ierr         )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *num_pre_relax,
+  hypre_F90_Int *ierr         )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructSMGGetNumPreRelax(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassIntRef (num_pre_relax)) );
+           ( HYPRE_StructSMGGetNumPreRelax(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassIntRef (num_pre_relax)) );
 }
 
 /*--------------------------------------------------------------------------
@@ -277,26 +277,26 @@ hypre_F90_IFACE(hypre_structsmggetnumprerelax, HYPRE_STRUCTSMGGETNUMPRERELAX)
 
 void
 hypre_F90_IFACE(hypre_structsmgsetnumpostrelax, HYPRE_STRUCTSMGSETNUMPOSTRELAX)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *num_post_relax,
-     hypre_F90_Int *ierr           )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *num_post_relax,
+  hypre_F90_Int *ierr           )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructSMGSetNumPostRelax(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassInt (num_post_relax)) );
+           ( HYPRE_StructSMGSetNumPostRelax(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassInt (num_post_relax)) );
 }
 
 void
 hypre_F90_IFACE(hypre_structsmggetnumpostrelax, HYPRE_STRUCTSMGGETNUMPOSTRELAX)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *num_post_relax,
-     hypre_F90_Int *ierr           )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *num_post_relax,
+  hypre_F90_Int *ierr           )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructSMGGetNumPostRelax(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassIntRef (num_post_relax)) );
+           ( HYPRE_StructSMGGetNumPostRelax(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassIntRef (num_post_relax)) );
 }
 
 /*--------------------------------------------------------------------------
@@ -305,26 +305,26 @@ hypre_F90_IFACE(hypre_structsmggetnumpostrelax, HYPRE_STRUCTSMGGETNUMPOSTRELAX)
 
 void
 hypre_F90_IFACE(hypre_structsmgsetlogging, HYPRE_STRUCTSMGSETLOGGING)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *logging,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *logging,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructSMGSetLogging(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassInt (logging)) );
+           ( HYPRE_StructSMGSetLogging(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassInt (logging)) );
 }
 
 void
 hypre_F90_IFACE(hypre_structsmggetlogging, HYPRE_STRUCTSMGGETLOGGING)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *logging,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *logging,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructSMGGetLogging(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassIntRef (logging)) );
+           ( HYPRE_StructSMGGetLogging(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassIntRef (logging)) );
 }
 
 /*--------------------------------------------------------------------------
@@ -333,26 +333,26 @@ hypre_F90_IFACE(hypre_structsmggetlogging, HYPRE_STRUCTSMGGETLOGGING)
 
 void
 hypre_F90_IFACE(hypre_structsmgsetprintlevel, HYPRE_STRUCTSMGSETPRINTLEVEL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *print_level,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *print_level,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructSMGSetPrintLevel(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassInt (print_level)) );
+           ( HYPRE_StructSMGSetPrintLevel(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassInt (print_level)) );
 }
 
 void
 hypre_F90_IFACE(hypre_structsmggetprintlevel, HYPRE_STRUCTSMGGETPRINTLEVEL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *print_level,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *print_level,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructSMGGetPrintLevel(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassIntRef (print_level)) );
+           ( HYPRE_StructSMGGetPrintLevel(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassIntRef (print_level)) );
 }
 
 /*--------------------------------------------------------------------------
@@ -361,14 +361,14 @@ hypre_F90_IFACE(hypre_structsmggetprintlevel, HYPRE_STRUCTSMGGETPRINTLEVEL)
 
 void
 hypre_F90_IFACE(hypre_structsmggetnumiterations, HYPRE_STRUCTSMGGETNUMITERATIONS)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *num_iterations,
-     hypre_F90_Int *ierr           )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *num_iterations,
+  hypre_F90_Int *ierr           )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructSMGGetNumIterations(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassIntRef (num_iterations) ) );
+           ( HYPRE_StructSMGGetNumIterations(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassIntRef (num_iterations) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -377,14 +377,14 @@ hypre_F90_IFACE(hypre_structsmggetnumiterations, HYPRE_STRUCTSMGGETNUMITERATIONS
 
 void
 hypre_F90_IFACE(hypre_structsmggetfinalrelative, HYPRE_STRUCTSMGGETFINALRELATIVE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *norm,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *norm,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructSMGGetFinalRelativeResidualNorm(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassRealRef (norm) ) );
+           ( HYPRE_StructSMGGetFinalRelativeResidualNorm(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassRealRef (norm) ) );
 }
 #ifdef __cplusplus
 }
diff --git a/external/hypre/src/struct_ls/F90_HYPRE_struct_sparse_msg.c b/external/hypre/src/struct_ls/F90_HYPRE_struct_sparse_msg.c
index 3503335f..77542a99 100644
--- a/external/hypre/src/struct_ls/F90_HYPRE_struct_sparse_msg.c
+++ b/external/hypre/src/struct_ls/F90_HYPRE_struct_sparse_msg.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -11,75 +11,75 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-    
+
 /*--------------------------------------------------------------------------
  * HYPRE_StructSparseMSGCreate
  *--------------------------------------------------------------------------*/
 
 void
 hypre_F90_IFACE(hypre_structsparsemsgcreate, HYPRE_STRUCTSPARSEMSGCREATE)
-   ( hypre_F90_Comm *comm,
-     hypre_F90_Obj *solver,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Comm *comm,
+  hypre_F90_Obj *solver,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructSparseMSGCreate(
-           hypre_F90_PassComm (comm),
-           hypre_F90_PassObjRef (HYPRE_StructSolver, solver) ) );
+           ( HYPRE_StructSparseMSGCreate(
+                hypre_F90_PassComm (comm),
+                hypre_F90_PassObjRef (HYPRE_StructSolver, solver) ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_StructSparseMSGDestroy
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_structsparsemsgdestroy, HYPRE_STRUCTSPARSEMSGDESTROY)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructSparseMSGDestroy(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver) ) );
+           ( HYPRE_StructSparseMSGDestroy(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver) ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_StructSparseMSGSetup
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_structsparsemsgsetup, HYPRE_STRUCTSPARSEMSGSETUP)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *A,
-     hypre_F90_Obj *b,
-     hypre_F90_Obj *x,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *A,
+  hypre_F90_Obj *b,
+  hypre_F90_Obj *x,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructSparseMSGSetup(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassObj (HYPRE_StructMatrix, A),
-           hypre_F90_PassObj (HYPRE_StructVector, b),
-           hypre_F90_PassObj (HYPRE_StructVector, x) ) );
+           ( HYPRE_StructSparseMSGSetup(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassObj (HYPRE_StructMatrix, A),
+                hypre_F90_PassObj (HYPRE_StructVector, b),
+                hypre_F90_PassObj (HYPRE_StructVector, x) ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_StructSparseMSGSolve
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_structsparsemsgsolve, HYPRE_STRUCTSPARSEMSGSOLVE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Obj *A,
-     hypre_F90_Obj *b,
-     hypre_F90_Obj *x,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Obj *A,
+  hypre_F90_Obj *b,
+  hypre_F90_Obj *x,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructSparseMSGSolve(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassObj (HYPRE_StructMatrix, A),
-           hypre_F90_PassObj (HYPRE_StructVector, b),
-           hypre_F90_PassObj (HYPRE_StructVector, x) ) );
+           ( HYPRE_StructSparseMSGSolve(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassObj (HYPRE_StructMatrix, A),
+                hypre_F90_PassObj (HYPRE_StructVector, b),
+                hypre_F90_PassObj (HYPRE_StructVector, x) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -88,14 +88,14 @@ hypre_F90_IFACE(hypre_structsparsemsgsolve, HYPRE_STRUCTSPARSEMSGSOLVE)
 
 void
 hypre_F90_IFACE(hypre_structsparsemsgsettol, HYPRE_STRUCTSPARSEMSGSETTOL)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *tol,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *tol,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructSparseMSGSetTol(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassReal (tol) ) );
+           ( HYPRE_StructSparseMSGSetTol(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassReal (tol) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -104,14 +104,14 @@ hypre_F90_IFACE(hypre_structsparsemsgsettol, HYPRE_STRUCTSPARSEMSGSETTOL)
 
 void
 hypre_F90_IFACE(hypre_structsparsemsgsetmaxiter, HYPRE_STRUCTSPARSEMSGSETMAXITER)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *max_iter,
-     hypre_F90_Int *ierr     )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *max_iter,
+  hypre_F90_Int *ierr     )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructSparseMSGSetMaxIter(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassInt (max_iter) ) );
+           ( HYPRE_StructSparseMSGSetMaxIter(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassInt (max_iter) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -120,14 +120,14 @@ hypre_F90_IFACE(hypre_structsparsemsgsetmaxiter, HYPRE_STRUCTSPARSEMSGSETMAXITER
 
 void
 hypre_F90_IFACE(hypre_structsparsemsgsetjump, HYPRE_STRUCTSPARSEMSGSETJUMP)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *jump,
-     hypre_F90_Int *ierr     )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *jump,
+  hypre_F90_Int *ierr     )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructSparseMSGSetJump(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassInt (jump) ) );
+           ( HYPRE_StructSparseMSGSetJump(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassInt (jump) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -136,14 +136,14 @@ hypre_F90_IFACE(hypre_structsparsemsgsetjump, HYPRE_STRUCTSPARSEMSGSETJUMP)
 
 void
 hypre_F90_IFACE(hypre_structsparsemsgsetrelchan, HYPRE_STRUCTSPARSEMSGSETRELCHAN)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *rel_change,
-     hypre_F90_Int *ierr       )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *rel_change,
+  hypre_F90_Int *ierr       )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructSparseMSGSetRelChange(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassInt (rel_change) ) );
+           ( HYPRE_StructSparseMSGSetRelChange(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassInt (rel_change) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -152,12 +152,12 @@ hypre_F90_IFACE(hypre_structsparsemsgsetrelchan, HYPRE_STRUCTSPARSEMSGSETRELCHAN
 
 void
 hypre_F90_IFACE(hypre_structsparsemsgsetzerogue, HYPRE_STRUCTSPARSEMSGSETZEROGUE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *ierr       )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *ierr       )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructSparseMSGSetZeroGuess(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver) ) );
+           ( HYPRE_StructSparseMSGSetZeroGuess(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -166,12 +166,12 @@ hypre_F90_IFACE(hypre_structsparsemsgsetzerogue, HYPRE_STRUCTSPARSEMSGSETZEROGUE
 
 void
 hypre_F90_IFACE(hypre_structsparsemsgsetnonzero, HYPRE_STRUCTSPARSEMSGSETNONZERO)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *ierr       )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *ierr       )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructSparseMSGSetNonZeroGuess(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver) ) );
+           ( HYPRE_StructSparseMSGSetNonZeroGuess(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -180,14 +180,14 @@ hypre_F90_IFACE(hypre_structsparsemsgsetnonzero, HYPRE_STRUCTSPARSEMSGSETNONZERO
 
 void
 hypre_F90_IFACE(hypre_structsparsemsgsetrelaxty, HYPRE_STRUCTSPARSEMSGSETRELAXTY)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *relax_type,
-     hypre_F90_Int *ierr       )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *relax_type,
+  hypre_F90_Int *ierr       )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructSparseMSGSetRelaxType(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassInt (relax_type) ) );
+           ( HYPRE_StructSparseMSGSetRelaxType(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassInt (relax_type) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -195,14 +195,14 @@ hypre_F90_IFACE(hypre_structsparsemsgsetrelaxty, HYPRE_STRUCTSPARSEMSGSETRELAXTY
  *--------------------------------------------------------------------------*/
 void
 hypre_F90_IFACE(hypre_structsparsemsgsetjacobiweigh, HYPRE_STRUCTSPARSEMSGSETJACOBIWEIGH)
-   (hypre_F90_Obj *solver,
-    hypre_F90_Real *weight,
-    hypre_F90_Int *ierr)
+(hypre_F90_Obj *solver,
+ hypre_F90_Real *weight,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      (HYPRE_StructSparseMSGSetJacobiWeight(
-          hypre_F90_PassObj (HYPRE_StructSolver, solver),
-          hypre_F90_PassReal (weight) ) );
+           (HYPRE_StructSparseMSGSetJacobiWeight(
+               hypre_F90_PassObj (HYPRE_StructSolver, solver),
+               hypre_F90_PassReal (weight) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -211,14 +211,14 @@ hypre_F90_IFACE(hypre_structsparsemsgsetjacobiweigh, HYPRE_STRUCTSPARSEMSGSETJAC
 
 void
 hypre_F90_IFACE(hypre_structsparsemsgsetnumprer, HYPRE_STRUCTSPARSEMSGSETNUMPRER)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *num_pre_relax,
-     hypre_F90_Int *ierr       )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *num_pre_relax,
+  hypre_F90_Int *ierr       )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructSparseMSGSetNumPreRelax(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassInt (num_pre_relax) ) );
+           ( HYPRE_StructSparseMSGSetNumPreRelax(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassInt (num_pre_relax) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -227,14 +227,14 @@ hypre_F90_IFACE(hypre_structsparsemsgsetnumprer, HYPRE_STRUCTSPARSEMSGSETNUMPRER
 
 void
 hypre_F90_IFACE(hypre_structsparsemsgsetnumpost, HYPRE_STRUCTSPARSEMSGSETNUMPOST)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *num_post_relax,
-     hypre_F90_Int *ierr       )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *num_post_relax,
+  hypre_F90_Int *ierr       )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructSparseMSGSetNumPostRelax(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassInt (num_post_relax) ) );
+           ( HYPRE_StructSparseMSGSetNumPostRelax(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassInt (num_post_relax) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -243,14 +243,14 @@ hypre_F90_IFACE(hypre_structsparsemsgsetnumpost, HYPRE_STRUCTSPARSEMSGSETNUMPOST
 
 void
 hypre_F90_IFACE(hypre_structsparsemsgsetnumfine, HYPRE_STRUCTSPARSEMSGSETNUMFINE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *num_fine_relax,
-     hypre_F90_Int *ierr       )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *num_fine_relax,
+  hypre_F90_Int *ierr       )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructSparseMSGSetNumFineRelax(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassInt (num_fine_relax) ) );
+           ( HYPRE_StructSparseMSGSetNumFineRelax(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassInt (num_fine_relax) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -259,14 +259,14 @@ hypre_F90_IFACE(hypre_structsparsemsgsetnumfine, HYPRE_STRUCTSPARSEMSGSETNUMFINE
 
 void
 hypre_F90_IFACE(hypre_structsparsemsgsetlogging, HYPRE_STRUCTSPARSEMSGSETLOGGING)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *logging,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *logging,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructSparseMSGSetLogging(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassInt (logging) ) );
+           ( HYPRE_StructSparseMSGSetLogging(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassInt (logging) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -275,14 +275,14 @@ hypre_F90_IFACE(hypre_structsparsemsgsetlogging, HYPRE_STRUCTSPARSEMSGSETLOGGING
 
 void
 hypre_F90_IFACE(hypre_structsparsemsgsetprintle, HYPRE_STRUCTSPARSEMSGSETPRINTLE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *print_level,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *print_level,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructSparseMSGSetPrintLevel(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassInt (print_level) ) );
+           ( HYPRE_StructSparseMSGSetPrintLevel(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassInt (print_level) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -291,14 +291,14 @@ hypre_F90_IFACE(hypre_structsparsemsgsetprintle, HYPRE_STRUCTSPARSEMSGSETPRINTLE
 
 void
 hypre_F90_IFACE(hypre_structsparsemsggetnumiter, HYPRE_STRUCTSPARSEMSGGETNUMITER)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Int *num_iterations,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Int *num_iterations,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructSparseMSGGetNumIterations(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassIntRef (num_iterations) ) );
+           ( HYPRE_StructSparseMSGGetNumIterations(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassIntRef (num_iterations) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -307,16 +307,16 @@ hypre_F90_IFACE(hypre_structsparsemsggetnumiter, HYPRE_STRUCTSPARSEMSGGETNUMITER
 
 void
 hypre_F90_IFACE(hypre_structsparsemsggetfinalre, HYPRE_STRUCTSPARSEMSGGETFINALRE)
-   ( hypre_F90_Obj *solver,
-     hypre_F90_Real *norm,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *solver,
+  hypre_F90_Real *norm,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructSparseMSGGetFinalRelativeResidualNorm(
-           hypre_F90_PassObj (HYPRE_StructSolver, solver),
-           hypre_F90_PassRealRef (norm) ) );
+           ( HYPRE_StructSparseMSGGetFinalRelativeResidualNorm(
+                hypre_F90_PassObj (HYPRE_StructSolver, solver),
+                hypre_F90_PassRealRef (norm) ) );
 }
-    
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/external/hypre/src/struct_ls/HYPRE_struct_bicgstab.c b/external/hypre/src/struct_ls/HYPRE_struct_bicgstab.c
index 6b9c5996..6d3ef940 100644
--- a/external/hypre/src/struct_ls/HYPRE_struct_bicgstab.c
+++ b/external/hypre/src/struct_ls/HYPRE_struct_bicgstab.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -12,6 +12,8 @@
 HYPRE_Int
 HYPRE_StructBiCGSTABCreate( MPI_Comm comm, HYPRE_StructSolver *solver )
 {
+   HYPRE_UNUSED_VAR(comm);
+
    hypre_BiCGSTABFunctions * bicgstab_functions =
       hypre_BiCGSTABFunctionsCreate(
          hypre_StructKrylovCreateVector,
@@ -30,38 +32,38 @@ HYPRE_StructBiCGSTABCreate( MPI_Comm comm, HYPRE_StructSolver *solver )
 
 /*==========================================================================*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_StructBiCGSTABDestroy( HYPRE_StructSolver solver )
 {
-   return( hypre_BiCGSTABDestroy( (void *) solver ) );
+   return ( hypre_BiCGSTABDestroy( (void *) solver ) );
 }
 
 /*==========================================================================*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_StructBiCGSTABSetup( HYPRE_StructSolver solver,
                            HYPRE_StructMatrix A,
                            HYPRE_StructVector b,
                            HYPRE_StructVector x      )
 {
-   return( HYPRE_BiCGSTABSetup( (HYPRE_Solver) solver,
-                                (HYPRE_Matrix) A,
-                                (HYPRE_Vector) b,
-                                (HYPRE_Vector) x ) );
+   return ( HYPRE_BiCGSTABSetup( (HYPRE_Solver) solver,
+                                 (HYPRE_Matrix) A,
+                                 (HYPRE_Vector) b,
+                                 (HYPRE_Vector) x ) );
 }
 
 /*==========================================================================*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_StructBiCGSTABSolve( HYPRE_StructSolver solver,
                            HYPRE_StructMatrix A,
                            HYPRE_StructVector b,
                            HYPRE_StructVector x      )
 {
-   return( HYPRE_BiCGSTABSolve( (HYPRE_Solver) solver,
-                                (HYPRE_Matrix) A,
-                                (HYPRE_Vector) b,
-                                (HYPRE_Vector) x ) );
+   return ( HYPRE_BiCGSTABSolve( (HYPRE_Solver) solver,
+                                 (HYPRE_Matrix) A,
+                                 (HYPRE_Vector) b,
+                                 (HYPRE_Vector) x ) );
 }
 
 /*==========================================================================*/
@@ -70,7 +72,7 @@ HYPRE_Int
 HYPRE_StructBiCGSTABSetTol( HYPRE_StructSolver solver,
                             HYPRE_Real         tol    )
 {
-   return( HYPRE_BiCGSTABSetTol( (HYPRE_Solver) solver, tol ) );
+   return ( HYPRE_BiCGSTABSetTol( (HYPRE_Solver) solver, tol ) );
 }
 
 /*==========================================================================*/
@@ -79,7 +81,7 @@ HYPRE_Int
 HYPRE_StructBiCGSTABSetAbsoluteTol( HYPRE_StructSolver solver,
                                     HYPRE_Real         tol    )
 {
-   return( HYPRE_BiCGSTABSetAbsoluteTol( (HYPRE_Solver) solver, tol ) );
+   return ( HYPRE_BiCGSTABSetAbsoluteTol( (HYPRE_Solver) solver, tol ) );
 }
 
 /*==========================================================================*/
@@ -88,7 +90,7 @@ HYPRE_Int
 HYPRE_StructBiCGSTABSetMaxIter( HYPRE_StructSolver solver,
                                 HYPRE_Int          max_iter )
 {
-   return( HYPRE_BiCGSTABSetMaxIter( (HYPRE_Solver) solver, max_iter ) );
+   return ( HYPRE_BiCGSTABSetMaxIter( (HYPRE_Solver) solver, max_iter ) );
 }
 
 
@@ -100,10 +102,10 @@ HYPRE_StructBiCGSTABSetPrecond( HYPRE_StructSolver         solver,
                                 HYPRE_PtrToStructSolverFcn precond_setup,
                                 HYPRE_StructSolver         precond_solver )
 {
-   return( HYPRE_BiCGSTABSetPrecond( (HYPRE_Solver) solver,
-                                     (HYPRE_PtrToSolverFcn) precond,
-                                     (HYPRE_PtrToSolverFcn) precond_setup,
-                                     (HYPRE_Solver) precond_solver ) );
+   return ( HYPRE_BiCGSTABSetPrecond( (HYPRE_Solver) solver,
+                                      (HYPRE_PtrToSolverFcn) precond,
+                                      (HYPRE_PtrToSolverFcn) precond_setup,
+                                      (HYPRE_Solver) precond_solver ) );
 }
 
 /*==========================================================================*/
@@ -112,7 +114,7 @@ HYPRE_Int
 HYPRE_StructBiCGSTABSetLogging( HYPRE_StructSolver solver,
                                 HYPRE_Int          logging )
 {
-   return( HYPRE_BiCGSTABSetLogging( (HYPRE_Solver) solver, logging ) );
+   return ( HYPRE_BiCGSTABSetLogging( (HYPRE_Solver) solver, logging ) );
 }
 
 /*==========================================================================*/
@@ -121,7 +123,7 @@ HYPRE_Int
 HYPRE_StructBiCGSTABSetPrintLevel( HYPRE_StructSolver solver,
                                    HYPRE_Int level)
 {
-   return( HYPRE_BiCGSTABSetPrintLevel( (HYPRE_Solver) solver, level ) );
+   return ( HYPRE_BiCGSTABSetPrintLevel( (HYPRE_Solver) solver, level ) );
 }
 
 /*==========================================================================*/
@@ -130,8 +132,8 @@ HYPRE_Int
 HYPRE_StructBiCGSTABGetNumIterations( HYPRE_StructSolver  solver,
                                       HYPRE_Int          *num_iterations )
 {
-   return( HYPRE_BiCGSTABGetNumIterations( (HYPRE_Solver) solver,
-                                           num_iterations ) );
+   return ( HYPRE_BiCGSTABGetNumIterations( (HYPRE_Solver) solver,
+                                            num_iterations ) );
 }
 
 /*==========================================================================*/
@@ -140,8 +142,8 @@ HYPRE_Int
 HYPRE_StructBiCGSTABGetFinalRelativeResidualNorm( HYPRE_StructSolver  solver,
                                                   HYPRE_Real         *norm   )
 {
-   return( HYPRE_BiCGSTABGetFinalRelativeResidualNorm( (HYPRE_Solver) solver,
-                                                       norm ) );
+   return ( HYPRE_BiCGSTABGetFinalRelativeResidualNorm( (HYPRE_Solver) solver,
+                                                        norm ) );
 }
 
 /*==========================================================================*/
@@ -150,6 +152,5 @@ HYPRE_Int
 HYPRE_StructBiCGSTABGetResidual( HYPRE_StructSolver  solver,
                                  void  **residual)
 {
-   return( HYPRE_BiCGSTABGetResidual( (HYPRE_Solver) solver, residual ) );
+   return ( HYPRE_BiCGSTABGetResidual( (HYPRE_Solver) solver, residual ) );
 }
-
diff --git a/external/hypre/src/struct_ls/HYPRE_struct_cycred.c b/external/hypre/src/struct_ls/HYPRE_struct_cycred.c
index ee4f76a7..ac0f46b0 100644
--- a/external/hypre/src/struct_ls/HYPRE_struct_cycred.c
+++ b/external/hypre/src/struct_ls/HYPRE_struct_cycred.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -21,50 +21,50 @@ HYPRE_StructCycRedCreate( MPI_Comm comm, HYPRE_StructSolver *solver )
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_StructCycRedDestroy( HYPRE_StructSolver solver )
 {
-   return( hypre_CyclicReductionDestroy( (void *) solver ) );
+   return ( hypre_CyclicReductionDestroy( (void *) solver ) );
 }
 
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_StructCycRedSetup( HYPRE_StructSolver solver,
                          HYPRE_StructMatrix A,
                          HYPRE_StructVector b,
                          HYPRE_StructVector x      )
 {
-   return( hypre_CyclicReductionSetup( (void *) solver,
-                                       (hypre_StructMatrix *) A,
-                                       (hypre_StructVector *) b,
-                                       (hypre_StructVector *) x ) );
+   return ( hypre_CyclicReductionSetup( (void *) solver,
+                                        (hypre_StructMatrix *) A,
+                                        (hypre_StructVector *) b,
+                                        (hypre_StructVector *) x ) );
 }
 
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_StructCycRedSolve( HYPRE_StructSolver solver,
                          HYPRE_StructMatrix A,
                          HYPRE_StructVector b,
                          HYPRE_StructVector x      )
 {
-   return( hypre_CyclicReduction( (void *) solver,
-                                  (hypre_StructMatrix *) A,
-                                  (hypre_StructVector *) b,
-                                  (hypre_StructVector *) x ) );
+   return ( hypre_CyclicReduction( (void *) solver,
+                                   (hypre_StructMatrix *) A,
+                                   (hypre_StructVector *) b,
+                                   (hypre_StructVector *) x ) );
 }
 
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_StructCycRedSetTDim( HYPRE_StructSolver solver,
                            HYPRE_Int          tdim )
 {
-   return( hypre_CyclicReductionSetCDir( (void *) solver, tdim ) );
+   return ( hypre_CyclicReductionSetCDir( (void *) solver, tdim ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -89,7 +89,7 @@ HYPRE_StructCycRedSetBase( HYPRE_StructSolver solver,
       hypre_IndexD(new_base_stride, d) = base_stride[d];
    }
 
-   return( hypre_CyclicReductionSetBase( (void *) solver,
-                                         new_base_index, new_base_stride ) );
+   return ( hypre_CyclicReductionSetBase( (void *) solver,
+                                          new_base_index, new_base_stride ) );
 }
 
diff --git a/external/hypre/src/struct_ls/HYPRE_struct_flexgmres.c b/external/hypre/src/struct_ls/HYPRE_struct_flexgmres.c
index 3ec663b2..455ff17d 100644
--- a/external/hypre/src/struct_ls/HYPRE_struct_flexgmres.c
+++ b/external/hypre/src/struct_ls/HYPRE_struct_flexgmres.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -12,6 +12,8 @@
 HYPRE_Int
 HYPRE_StructFlexGMRESCreate( MPI_Comm comm, HYPRE_StructSolver *solver )
 {
+   HYPRE_UNUSED_VAR(comm);
+
    hypre_FlexGMRESFunctions * fgmres_functions =
       hypre_FlexGMRESFunctionsCreate(
          hypre_StructKrylovCAlloc, hypre_StructKrylovFree,
@@ -32,38 +34,38 @@ HYPRE_StructFlexGMRESCreate( MPI_Comm comm, HYPRE_StructSolver *solver )
 
 /*==========================================================================*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_StructFlexGMRESDestroy( HYPRE_StructSolver solver )
 {
-   return( hypre_FlexGMRESDestroy( (void *) solver ) );
+   return ( hypre_FlexGMRESDestroy( (void *) solver ) );
 }
 
 /*==========================================================================*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_StructFlexGMRESSetup( HYPRE_StructSolver solver,
                             HYPRE_StructMatrix A,
                             HYPRE_StructVector b,
                             HYPRE_StructVector x      )
 {
-   return( HYPRE_FlexGMRESSetup( (HYPRE_Solver) solver,
-                                 (HYPRE_Matrix) A,
-                                 (HYPRE_Vector) b,
-                                 (HYPRE_Vector) x ) );
+   return ( HYPRE_FlexGMRESSetup( (HYPRE_Solver) solver,
+                                  (HYPRE_Matrix) A,
+                                  (HYPRE_Vector) b,
+                                  (HYPRE_Vector) x ) );
 }
 
 /*==========================================================================*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_StructFlexGMRESSolve( HYPRE_StructSolver solver,
                             HYPRE_StructMatrix A,
                             HYPRE_StructVector b,
                             HYPRE_StructVector x      )
 {
-   return( HYPRE_FlexGMRESSolve( (HYPRE_Solver) solver,
-                                 (HYPRE_Matrix) A,
-                                 (HYPRE_Vector) b,
-                                 (HYPRE_Vector) x ) );
+   return ( HYPRE_FlexGMRESSolve( (HYPRE_Solver) solver,
+                                  (HYPRE_Matrix) A,
+                                  (HYPRE_Vector) b,
+                                  (HYPRE_Vector) x ) );
 }
 
 /*==========================================================================*/
@@ -72,7 +74,7 @@ HYPRE_Int
 HYPRE_StructFlexGMRESSetTol( HYPRE_StructSolver solver,
                              HYPRE_Real         tol    )
 {
-   return( HYPRE_FlexGMRESSetTol( (HYPRE_Solver) solver, tol ) );
+   return ( HYPRE_FlexGMRESSetTol( (HYPRE_Solver) solver, tol ) );
 }
 
 /*==========================================================================*/
@@ -81,7 +83,7 @@ HYPRE_Int
 HYPRE_StructFlexGMRESSetAbsoluteTol( HYPRE_StructSolver solver,
                                      HYPRE_Real         atol    )
 {
-   return( HYPRE_FlexGMRESSetAbsoluteTol( (HYPRE_Solver) solver, atol ) );
+   return ( HYPRE_FlexGMRESSetAbsoluteTol( (HYPRE_Solver) solver, atol ) );
 }
 
 /*==========================================================================*/
@@ -90,7 +92,7 @@ HYPRE_Int
 HYPRE_StructFlexGMRESSetMaxIter( HYPRE_StructSolver solver,
                                  HYPRE_Int          max_iter )
 {
-   return( HYPRE_FlexGMRESSetMaxIter( (HYPRE_Solver) solver, max_iter ) );
+   return ( HYPRE_FlexGMRESSetMaxIter( (HYPRE_Solver) solver, max_iter ) );
 }
 
 /*==========================================================================*/
@@ -99,7 +101,7 @@ HYPRE_Int
 HYPRE_StructFlexGMRESSetKDim( HYPRE_StructSolver solver,
                               HYPRE_Int          k_dim )
 {
-   return( HYPRE_FlexGMRESSetKDim( (HYPRE_Solver) solver, k_dim ) );
+   return ( HYPRE_FlexGMRESSetKDim( (HYPRE_Solver) solver, k_dim ) );
 }
 
 /*==========================================================================*/
@@ -110,10 +112,10 @@ HYPRE_StructFlexGMRESSetPrecond( HYPRE_StructSolver         solver,
                                  HYPRE_PtrToStructSolverFcn precond_setup,
                                  HYPRE_StructSolver         precond_solver )
 {
-   return( HYPRE_FlexGMRESSetPrecond( (HYPRE_Solver) solver,
-                                      (HYPRE_PtrToSolverFcn) precond,
-                                      (HYPRE_PtrToSolverFcn) precond_setup,
-                                      (HYPRE_Solver) precond_solver ) );
+   return ( HYPRE_FlexGMRESSetPrecond( (HYPRE_Solver) solver,
+                                       (HYPRE_PtrToSolverFcn) precond,
+                                       (HYPRE_PtrToSolverFcn) precond_setup,
+                                       (HYPRE_Solver) precond_solver ) );
 }
 
 /*==========================================================================*/
@@ -122,7 +124,7 @@ HYPRE_Int
 HYPRE_StructFlexGMRESSetLogging( HYPRE_StructSolver solver,
                                  HYPRE_Int          logging )
 {
-   return( HYPRE_FlexGMRESSetLogging( (HYPRE_Solver) solver, logging ) );
+   return ( HYPRE_FlexGMRESSetLogging( (HYPRE_Solver) solver, logging ) );
 }
 
 /*==========================================================================*/
@@ -131,7 +133,7 @@ HYPRE_Int
 HYPRE_StructFlexGMRESSetPrintLevel( HYPRE_StructSolver solver,
                                     HYPRE_Int          print_level )
 {
-   return( HYPRE_FlexGMRESSetPrintLevel( (HYPRE_Solver) solver, print_level ) );
+   return ( HYPRE_FlexGMRESSetPrintLevel( (HYPRE_Solver) solver, print_level ) );
 }
 
 /*==========================================================================*/
@@ -140,8 +142,8 @@ HYPRE_Int
 HYPRE_StructFlexGMRESGetNumIterations( HYPRE_StructSolver  solver,
                                        HYPRE_Int          *num_iterations )
 {
-   return( HYPRE_FlexGMRESGetNumIterations( (HYPRE_Solver) solver,
-                                            num_iterations ) );
+   return ( HYPRE_FlexGMRESGetNumIterations( (HYPRE_Solver) solver,
+                                             num_iterations ) );
 }
 
 /*==========================================================================*/
@@ -150,8 +152,8 @@ HYPRE_Int
 HYPRE_StructFlexGMRESGetFinalRelativeResidualNorm( HYPRE_StructSolver  solver,
                                                    HYPRE_Real         *norm   )
 {
-   return( HYPRE_FlexGMRESGetFinalRelativeResidualNorm( (HYPRE_Solver) solver,
-                                                        norm ) );
+   return ( HYPRE_FlexGMRESGetFinalRelativeResidualNorm( (HYPRE_Solver) solver,
+                                                         norm ) );
 }
 
 /*==========================================================================*/
@@ -162,4 +164,3 @@ HYPRE_Int HYPRE_StructFlexGMRESSetModifyPC( HYPRE_StructSolver  solver,
    return ( HYPRE_FlexGMRESSetModifyPC( (HYPRE_Solver) solver,
                                         (HYPRE_PtrToModifyPCFcn) modify_pc));
 }
-
diff --git a/external/hypre/src/struct_ls/HYPRE_struct_gmres.c b/external/hypre/src/struct_ls/HYPRE_struct_gmres.c
index 34092f2d..62c78e98 100644
--- a/external/hypre/src/struct_ls/HYPRE_struct_gmres.c
+++ b/external/hypre/src/struct_ls/HYPRE_struct_gmres.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -12,6 +12,8 @@
 HYPRE_Int
 HYPRE_StructGMRESCreate( MPI_Comm comm, HYPRE_StructSolver *solver )
 {
+   HYPRE_UNUSED_VAR(comm);
+
    hypre_GMRESFunctions * gmres_functions =
       hypre_GMRESFunctionsCreate(
          hypre_StructKrylovCAlloc, hypre_StructKrylovFree,
@@ -32,38 +34,38 @@ HYPRE_StructGMRESCreate( MPI_Comm comm, HYPRE_StructSolver *solver )
 
 /*==========================================================================*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_StructGMRESDestroy( HYPRE_StructSolver solver )
 {
-   return( hypre_GMRESDestroy( (void *) solver ) );
+   return ( hypre_GMRESDestroy( (void *) solver ) );
 }
 
 /*==========================================================================*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_StructGMRESSetup( HYPRE_StructSolver solver,
                         HYPRE_StructMatrix A,
                         HYPRE_StructVector b,
                         HYPRE_StructVector x      )
 {
-   return( HYPRE_GMRESSetup( (HYPRE_Solver) solver,
-                             (HYPRE_Matrix) A,
-                             (HYPRE_Vector) b,
-                             (HYPRE_Vector) x ) );
+   return ( HYPRE_GMRESSetup( (HYPRE_Solver) solver,
+                              (HYPRE_Matrix) A,
+                              (HYPRE_Vector) b,
+                              (HYPRE_Vector) x ) );
 }
 
 /*==========================================================================*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_StructGMRESSolve( HYPRE_StructSolver solver,
                         HYPRE_StructMatrix A,
                         HYPRE_StructVector b,
                         HYPRE_StructVector x      )
 {
-   return( HYPRE_GMRESSolve( (HYPRE_Solver) solver,
-                             (HYPRE_Matrix) A,
-                             (HYPRE_Vector) b,
-                             (HYPRE_Vector) x ) );
+   return ( HYPRE_GMRESSolve( (HYPRE_Solver) solver,
+                              (HYPRE_Matrix) A,
+                              (HYPRE_Vector) b,
+                              (HYPRE_Vector) x ) );
 }
 
 /*==========================================================================*/
@@ -72,7 +74,7 @@ HYPRE_Int
 HYPRE_StructGMRESSetTol( HYPRE_StructSolver solver,
                          HYPRE_Real         tol    )
 {
-   return( HYPRE_GMRESSetTol( (HYPRE_Solver) solver, tol ) );
+   return ( HYPRE_GMRESSetTol( (HYPRE_Solver) solver, tol ) );
 }
 
 /*==========================================================================*/
@@ -81,7 +83,7 @@ HYPRE_Int
 HYPRE_StructGMRESSetAbsoluteTol( HYPRE_StructSolver solver,
                                  HYPRE_Real         atol    )
 {
-   return( HYPRE_GMRESSetAbsoluteTol( (HYPRE_Solver) solver, atol ) );
+   return ( HYPRE_GMRESSetAbsoluteTol( (HYPRE_Solver) solver, atol ) );
 }
 
 /*==========================================================================*/
@@ -90,7 +92,7 @@ HYPRE_Int
 HYPRE_StructGMRESSetMaxIter( HYPRE_StructSolver solver,
                              HYPRE_Int          max_iter )
 {
-   return( HYPRE_GMRESSetMaxIter( (HYPRE_Solver) solver, max_iter ) );
+   return ( HYPRE_GMRESSetMaxIter( (HYPRE_Solver) solver, max_iter ) );
 }
 
 /*==========================================================================*/
@@ -99,7 +101,7 @@ HYPRE_Int
 HYPRE_StructGMRESSetKDim( HYPRE_StructSolver solver,
                           HYPRE_Int          k_dim )
 {
-   return( HYPRE_GMRESSetKDim( (HYPRE_Solver) solver, k_dim ) );
+   return ( HYPRE_GMRESSetKDim( (HYPRE_Solver) solver, k_dim ) );
 }
 
 /*==========================================================================*/
@@ -110,10 +112,10 @@ HYPRE_StructGMRESSetPrecond( HYPRE_StructSolver         solver,
                              HYPRE_PtrToStructSolverFcn precond_setup,
                              HYPRE_StructSolver         precond_solver )
 {
-   return( HYPRE_GMRESSetPrecond( (HYPRE_Solver) solver,
-                                  (HYPRE_PtrToSolverFcn) precond,
-                                  (HYPRE_PtrToSolverFcn) precond_setup,
-                                  (HYPRE_Solver) precond_solver ) );
+   return ( HYPRE_GMRESSetPrecond( (HYPRE_Solver) solver,
+                                   (HYPRE_PtrToSolverFcn) precond,
+                                   (HYPRE_PtrToSolverFcn) precond_setup,
+                                   (HYPRE_Solver) precond_solver ) );
 }
 
 /*==========================================================================*/
@@ -122,7 +124,7 @@ HYPRE_Int
 HYPRE_StructGMRESSetLogging( HYPRE_StructSolver solver,
                              HYPRE_Int          logging )
 {
-   return( HYPRE_GMRESSetLogging( (HYPRE_Solver) solver, logging ) );
+   return ( HYPRE_GMRESSetLogging( (HYPRE_Solver) solver, logging ) );
 }
 
 /*==========================================================================*/
@@ -131,7 +133,7 @@ HYPRE_Int
 HYPRE_StructGMRESSetPrintLevel( HYPRE_StructSolver solver,
                                 HYPRE_Int          print_level )
 {
-   return( HYPRE_GMRESSetPrintLevel( (HYPRE_Solver) solver, print_level ) );
+   return ( HYPRE_GMRESSetPrintLevel( (HYPRE_Solver) solver, print_level ) );
 }
 
 /*==========================================================================*/
@@ -140,7 +142,7 @@ HYPRE_Int
 HYPRE_StructGMRESGetNumIterations( HYPRE_StructSolver  solver,
                                    HYPRE_Int          *num_iterations )
 {
-   return( HYPRE_GMRESGetNumIterations( (HYPRE_Solver) solver, num_iterations ) );
+   return ( HYPRE_GMRESGetNumIterations( (HYPRE_Solver) solver, num_iterations ) );
 }
 
 /*==========================================================================*/
@@ -149,7 +151,5 @@ HYPRE_Int
 HYPRE_StructGMRESGetFinalRelativeResidualNorm( HYPRE_StructSolver  solver,
                                                HYPRE_Real         *norm   )
 {
-   return( HYPRE_GMRESGetFinalRelativeResidualNorm( (HYPRE_Solver) solver, norm ) );
+   return ( HYPRE_GMRESGetFinalRelativeResidualNorm( (HYPRE_Solver) solver, norm ) );
 }
-
-
diff --git a/external/hypre/src/struct_ls/HYPRE_struct_hybrid.c b/external/hypre/src/struct_ls/HYPRE_struct_hybrid.c
index da4bb583..487678a6 100644
--- a/external/hypre/src/struct_ls/HYPRE_struct_hybrid.c
+++ b/external/hypre/src/struct_ls/HYPRE_struct_hybrid.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -21,40 +21,40 @@ HYPRE_StructHybridCreate( MPI_Comm comm, HYPRE_StructSolver *solver )
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_StructHybridDestroy( HYPRE_StructSolver solver )
 {
-   return( hypre_HybridDestroy( (void *) solver ) );
+   return ( hypre_HybridDestroy( (void *) solver ) );
 }
 
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_StructHybridSetup( HYPRE_StructSolver solver,
                          HYPRE_StructMatrix A,
                          HYPRE_StructVector b,
                          HYPRE_StructVector x      )
 {
-   return( hypre_HybridSetup( (void *) solver,
-                              (hypre_StructMatrix *) A,
-                              (hypre_StructVector *) b,
-                              (hypre_StructVector *) x ) );
+   return ( hypre_HybridSetup( (void *) solver,
+                               (hypre_StructMatrix *) A,
+                               (hypre_StructVector *) b,
+                               (hypre_StructVector *) x ) );
 }
 
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_StructHybridSolve( HYPRE_StructSolver solver,
                          HYPRE_StructMatrix A,
                          HYPRE_StructVector b,
                          HYPRE_StructVector x      )
 {
-   return( hypre_HybridSolve( (void *) solver,
-                              (hypre_StructMatrix *) A,
-                              (hypre_StructVector *) b,
-                              (hypre_StructVector *) x ) );
+   return ( hypre_HybridSolve( (void *) solver,
+                               (hypre_StructMatrix *) A,
+                               (hypre_StructVector *) b,
+                               (hypre_StructVector *) x ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -64,7 +64,7 @@ HYPRE_Int
 HYPRE_StructHybridSetTol( HYPRE_StructSolver solver,
                           HYPRE_Real         tol    )
 {
-   return( hypre_HybridSetTol( (void *) solver, tol ) );
+   return ( hypre_HybridSetTol( (void *) solver, tol ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -74,7 +74,7 @@ HYPRE_Int
 HYPRE_StructHybridSetConvergenceTol( HYPRE_StructSolver solver,
                                      HYPRE_Real         cf_tol    )
 {
-   return( hypre_HybridSetConvergenceTol( (void *) solver, cf_tol ) );
+   return ( hypre_HybridSetConvergenceTol( (void *) solver, cf_tol ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -84,7 +84,7 @@ HYPRE_Int
 HYPRE_StructHybridSetDSCGMaxIter( HYPRE_StructSolver solver,
                                   HYPRE_Int          dscg_max_its )
 {
-   return( hypre_HybridSetDSCGMaxIter( (void *) solver, dscg_max_its ) );
+   return ( hypre_HybridSetDSCGMaxIter( (void *) solver, dscg_max_its ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -94,7 +94,7 @@ HYPRE_Int
 HYPRE_StructHybridSetPCGMaxIter( HYPRE_StructSolver solver,
                                  HYPRE_Int          pcg_max_its )
 {
-   return( hypre_HybridSetPCGMaxIter( (void *) solver, pcg_max_its ) );
+   return ( hypre_HybridSetPCGMaxIter( (void *) solver, pcg_max_its ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -104,7 +104,7 @@ HYPRE_Int
 HYPRE_StructHybridSetPCGAbsoluteTolFactor( HYPRE_StructSolver solver,
                                            HYPRE_Real  pcg_atolf )
 {
-   return( hypre_HybridSetPCGAbsoluteTolFactor( (void *) solver, pcg_atolf ) );
+   return ( hypre_HybridSetPCGAbsoluteTolFactor( (void *) solver, pcg_atolf ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -114,7 +114,7 @@ HYPRE_Int
 HYPRE_StructHybridSetTwoNorm( HYPRE_StructSolver solver,
                               HYPRE_Int          two_norm    )
 {
-   return( hypre_HybridSetTwoNorm( (void *) solver, two_norm ) );
+   return ( hypre_HybridSetTwoNorm( (void *) solver, two_norm ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -124,7 +124,7 @@ HYPRE_Int
 HYPRE_StructHybridSetStopCrit( HYPRE_StructSolver solver,
                                HYPRE_Int          stop_crit    )
 {
-   return( hypre_HybridSetStopCrit( (void *) solver, stop_crit ) );
+   return ( hypre_HybridSetStopCrit( (void *) solver, stop_crit ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -134,7 +134,7 @@ HYPRE_Int
 HYPRE_StructHybridSetRelChange( HYPRE_StructSolver solver,
                                 HYPRE_Int          rel_change    )
 {
-   return( hypre_HybridSetRelChange( (void *) solver, rel_change ) );
+   return ( hypre_HybridSetRelChange( (void *) solver, rel_change ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -144,7 +144,7 @@ HYPRE_Int
 HYPRE_StructHybridSetSolverType( HYPRE_StructSolver solver,
                                  HYPRE_Int          solver_type    )
 {
-   return( hypre_HybridSetSolverType( (void *) solver, solver_type ) );
+   return ( hypre_HybridSetSolverType( (void *) solver, solver_type ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -154,14 +154,14 @@ HYPRE_Int
 HYPRE_StructHybridSetRecomputeResidual( HYPRE_StructSolver  solver,
                                         HYPRE_Int           recompute_residual )
 {
-   return( hypre_HybridSetRecomputeResidual( (void *) solver, recompute_residual ) );
+   return ( hypre_HybridSetRecomputeResidual( (void *) solver, recompute_residual ) );
 }
 
 HYPRE_Int
 HYPRE_StructHybridGetRecomputeResidual( HYPRE_StructSolver  solver,
                                         HYPRE_Int          *recompute_residual )
 {
-   return( hypre_HybridGetRecomputeResidual( (void *) solver, recompute_residual ) );
+   return ( hypre_HybridGetRecomputeResidual( (void *) solver, recompute_residual ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -171,14 +171,14 @@ HYPRE_Int
 HYPRE_StructHybridSetRecomputeResidualP( HYPRE_StructSolver  solver,
                                          HYPRE_Int           recompute_residual_p )
 {
-   return( hypre_HybridSetRecomputeResidualP( (void *) solver, recompute_residual_p ) );
+   return ( hypre_HybridSetRecomputeResidualP( (void *) solver, recompute_residual_p ) );
 }
 
 HYPRE_Int
 HYPRE_StructHybridGetRecomputeResidualP( HYPRE_StructSolver  solver,
                                          HYPRE_Int          *recompute_residual_p )
 {
-   return( hypre_HybridGetRecomputeResidualP( (void *) solver, recompute_residual_p ) );
+   return ( hypre_HybridGetRecomputeResidualP( (void *) solver, recompute_residual_p ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -188,7 +188,7 @@ HYPRE_Int
 HYPRE_StructHybridSetKDim( HYPRE_StructSolver solver,
                            HYPRE_Int          k_dim    )
 {
-   return( hypre_HybridSetKDim( (void *) solver, k_dim ) );
+   return ( hypre_HybridSetKDim( (void *) solver, k_dim ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -200,10 +200,10 @@ HYPRE_StructHybridSetPrecond( HYPRE_StructSolver         solver,
                               HYPRE_PtrToStructSolverFcn precond_setup,
                               HYPRE_StructSolver         precond_solver )
 {
-   return( hypre_HybridSetPrecond( (void *) solver,
-                                   (HYPRE_Int (*)(void*, void*, void*, void*)) precond,
-								   (HYPRE_Int (*)(void*, void*, void*, void*)) precond_setup,
-                                   (void *) precond_solver ) );
+   return ( hypre_HybridSetPrecond( (void *) solver,
+                                    (HYPRE_Int (*)(void*, void*, void*, void*)) precond,
+                                    (HYPRE_Int (*)(void*, void*, void*, void*)) precond_setup,
+                                    (void *) precond_solver ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -213,7 +213,7 @@ HYPRE_Int
 HYPRE_StructHybridSetLogging( HYPRE_StructSolver solver,
                               HYPRE_Int          logging    )
 {
-   return( hypre_HybridSetLogging( (void *) solver, logging ) );
+   return ( hypre_HybridSetLogging( (void *) solver, logging ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -223,7 +223,7 @@ HYPRE_Int
 HYPRE_StructHybridSetPrintLevel( HYPRE_StructSolver solver,
                                  HYPRE_Int          print_level    )
 {
-   return( hypre_HybridSetPrintLevel( (void *) solver, print_level ) );
+   return ( hypre_HybridSetPrintLevel( (void *) solver, print_level ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -233,7 +233,7 @@ HYPRE_Int
 HYPRE_StructHybridGetNumIterations( HYPRE_StructSolver solver,
                                     HYPRE_Int         *num_its    )
 {
-   return( hypre_HybridGetNumIterations( (void *) solver, num_its ) );
+   return ( hypre_HybridGetNumIterations( (void *) solver, num_its ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -243,7 +243,7 @@ HYPRE_Int
 HYPRE_StructHybridGetDSCGNumIterations( HYPRE_StructSolver solver,
                                         HYPRE_Int         *dscg_num_its )
 {
-   return( hypre_HybridGetDSCGNumIterations( (void *) solver, dscg_num_its ) );
+   return ( hypre_HybridGetDSCGNumIterations( (void *) solver, dscg_num_its ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -253,7 +253,7 @@ HYPRE_Int
 HYPRE_StructHybridGetPCGNumIterations( HYPRE_StructSolver solver,
                                        HYPRE_Int         *pcg_num_its )
 {
-   return( hypre_HybridGetPCGNumIterations( (void *) solver, pcg_num_its ) );
+   return ( hypre_HybridGetPCGNumIterations( (void *) solver, pcg_num_its ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -263,6 +263,6 @@ HYPRE_Int
 HYPRE_StructHybridGetFinalRelativeResidualNorm( HYPRE_StructSolver solver,
                                                 HYPRE_Real        *norm    )
 {
-   return( hypre_HybridGetFinalRelativeResidualNorm( (void *) solver, norm ) );
+   return ( hypre_HybridGetFinalRelativeResidualNorm( (void *) solver, norm ) );
 }
 
diff --git a/external/hypre/src/struct_ls/HYPRE_struct_int.c b/external/hypre/src/struct_ls/HYPRE_struct_int.c
index e9048acb..ab9f9449 100644
--- a/external/hypre/src/struct_ls/HYPRE_struct_int.c
+++ b/external/hypre/src/struct_ls/HYPRE_struct_int.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -11,86 +11,69 @@
 
 HYPRE_Int
 hypre_StructVectorSetRandomValues( hypre_StructVector *vector,
-                                   HYPRE_Int seed )
+                                   HYPRE_Int           seed )
 {
-   hypre_Box          *v_data_box;
-
-   HYPRE_Real         *vp;
-
-   hypre_BoxArray     *boxes;
-   hypre_Box          *box;
-   hypre_Index         loop_size;
-   hypre_IndexRef      start;
-   hypre_Index         unit_stride;
-
-   HYPRE_Int           i;
+   hypre_Box           *v_data_box;
+   HYPRE_Real          *vp;
+   hypre_BoxArray      *boxes;
+   hypre_Box           *box;
+   hypre_Index          loop_size;
+   hypre_IndexRef       start;
+   hypre_Index          unit_stride;
+   HYPRE_Int            i;
+   HYPRE_Complex       *data            = hypre_StructVectorData(vector);
+   HYPRE_Complex       *data_host       = NULL;
+   HYPRE_Int            data_size       = hypre_StructVectorDataSize(vector);
+   HYPRE_MemoryLocation memory_location = hypre_StructVectorMemoryLocation(vector);
 
    /*-----------------------------------------------------------------------
     * Set the vector coefficients
     *-----------------------------------------------------------------------*/
 
-//   srand( seed );
+   //   srand( seed );
    hypre_SeedRand(seed);
 
    hypre_SetIndex3(unit_stride, 1, 1, 1);
 
    boxes = hypre_StructGridBoxes(hypre_StructVectorGrid(vector));
+
+   if (hypre_GetExecPolicy1(memory_location) == HYPRE_EXEC_DEVICE)
+   {
+      data_host = hypre_CTAlloc(HYPRE_Complex, data_size, HYPRE_MEMORY_HOST);
+      hypre_StructVectorData(vector) = data_host;
+   }
+
    hypre_ForBoxI(i, boxes)
    {
-      box      = hypre_BoxArrayBox(boxes, i);
+      box   = hypre_BoxArrayBox(boxes, i);
       start = hypre_BoxIMin(box);
 
-      v_data_box =
-         hypre_BoxArrayBox(hypre_StructVectorDataSpace(vector), i);
+      v_data_box = hypre_BoxArrayBox(hypre_StructVectorDataSpace(vector), i);
       vp = hypre_StructVectorBoxData(vector, i);
 
       hypre_BoxGetSize(box, loop_size);
 
-      /* RL TODO: generate on host and copy to device. FIX? */
-#if defined(HYPRE_USING_GPU)
-      HYPRE_Int loop_n = 1, ii;
-      for (ii = 0; ii < hypre_StructVectorNDim(vector); ii++)
-      {
-         loop_n *= loop_size[ii];
-      }
-
-      HYPRE_Real *rand_host   = hypre_TAlloc(HYPRE_Real, loop_n, HYPRE_MEMORY_HOST);
-      HYPRE_Real *rand_device = hypre_TAlloc(HYPRE_Real, loop_n, HYPRE_MEMORY_DEVICE);
-
-      ii = 0;
-      hypre_SerialBoxLoop0Begin(hypre_StructVectorNDim(vector),loop_size)
-      {
-         rand_host[ii++] = 2.0*hypre_Rand() - 1.0;
-      }
-      hypre_SerialBoxLoop0End()
-      hypre_TMemcpy(rand_device, rand_host, HYPRE_Real, loop_n,
-                    HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
-#endif
-
-#define DEVICE_VAR is_device_ptr(vp, rand_device)
-      hypre_BoxLoop1Begin(hypre_StructVectorNDim(vector), loop_size,
-                          v_data_box, start, unit_stride, vi);
+      hypre_SerialBoxLoop1Begin(hypre_StructVectorNDim(vector), loop_size,
+                                v_data_box, start, unit_stride, vi);
       {
-#if defined(HYPRE_USING_GPU)
-         vp[vi] = rand_device[idx];
-#else
-         vp[vi] = 2.0*hypre_Rand() - 1.0;
-#endif
+         vp[vi] = 2.0 * hypre_Rand() - 1.0;
       }
-      hypre_BoxLoop1End(vi);
-#undef DEVICE_VAR
+      hypre_SerialBoxLoop1End(vi);
+   }
 
-#if defined(HYPRE_USING_GPU)
-      hypre_TFree(rand_device, HYPRE_MEMORY_DEVICE);
-      hypre_TFree(rand_host, HYPRE_MEMORY_HOST);
-#endif
+   if (data_host)
+   {
+      hypre_TMemcpy(data, data_host, HYPRE_Complex, data_size, memory_location, HYPRE_MEMORY_HOST);
+      hypre_StructVectorData(vector) = data;
+      hypre_TFree(data_host, HYPRE_MEMORY_HOST);
    }
 
    return hypre_error_flag;
 }
 
 HYPRE_Int
-hypre_StructSetRandomValues( void* v, HYPRE_Int seed ) {
+hypre_StructSetRandomValues( void* v, HYPRE_Int seed )
+{
 
    return hypre_StructVectorSetRandomValues( (hypre_StructVector*)v, seed );
 }
diff --git a/external/hypre/src/struct_ls/HYPRE_struct_jacobi.c b/external/hypre/src/struct_ls/HYPRE_struct_jacobi.c
index 6c0fab5c..7b7d0dac 100644
--- a/external/hypre/src/struct_ls/HYPRE_struct_jacobi.c
+++ b/external/hypre/src/struct_ls/HYPRE_struct_jacobi.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -22,40 +22,40 @@ HYPRE_StructJacobiCreate( MPI_Comm            comm,
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_StructJacobiDestroy( HYPRE_StructSolver solver )
 {
-   return( hypre_JacobiDestroy( (void *) solver ) );
+   return ( hypre_JacobiDestroy( (void *) solver ) );
 }
 
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_StructJacobiSetup( HYPRE_StructSolver solver,
                          HYPRE_StructMatrix A,
                          HYPRE_StructVector b,
                          HYPRE_StructVector x      )
 {
-   return( hypre_JacobiSetup( (void *) solver,
-                              (hypre_StructMatrix *) A,
-                              (hypre_StructVector *) b,
-                              (hypre_StructVector *) x ) );
+   return ( hypre_JacobiSetup( (void *) solver,
+                               (hypre_StructMatrix *) A,
+                               (hypre_StructVector *) b,
+                               (hypre_StructVector *) x ) );
 }
 
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_StructJacobiSolve( HYPRE_StructSolver solver,
                          HYPRE_StructMatrix A,
                          HYPRE_StructVector b,
                          HYPRE_StructVector x      )
 {
-   return( hypre_JacobiSolve( (void *) solver,
-                              (hypre_StructMatrix *) A,
-                              (hypre_StructVector *) b,
-                              (hypre_StructVector *) x ) );
+   return ( hypre_JacobiSolve( (void *) solver,
+                               (hypre_StructMatrix *) A,
+                               (hypre_StructVector *) b,
+                               (hypre_StructVector *) x ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -65,7 +65,7 @@ HYPRE_Int
 HYPRE_StructJacobiSetTol( HYPRE_StructSolver solver,
                           HYPRE_Real         tol    )
 {
-   return( hypre_JacobiSetTol( (void *) solver, tol ) );
+   return ( hypre_JacobiSetTol( (void *) solver, tol ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -75,7 +75,7 @@ HYPRE_Int
 HYPRE_StructJacobiGetTol( HYPRE_StructSolver solver,
                           HYPRE_Real       * tol    )
 {
-   return( hypre_JacobiGetTol( (void *) solver, tol ) );
+   return ( hypre_JacobiGetTol( (void *) solver, tol ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -85,7 +85,7 @@ HYPRE_Int
 HYPRE_StructJacobiSetMaxIter( HYPRE_StructSolver solver,
                               HYPRE_Int          max_iter  )
 {
-   return( hypre_JacobiSetMaxIter( (void *) solver, max_iter ) );
+   return ( hypre_JacobiSetMaxIter( (void *) solver, max_iter ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -95,35 +95,35 @@ HYPRE_Int
 HYPRE_StructJacobiGetMaxIter( HYPRE_StructSolver solver,
                               HYPRE_Int        * max_iter  )
 {
-   return( hypre_JacobiGetMaxIter( (void *) solver, max_iter ) );
+   return ( hypre_JacobiGetMaxIter( (void *) solver, max_iter ) );
 }
 
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
- 
+
 HYPRE_Int
 HYPRE_StructJacobiSetZeroGuess( HYPRE_StructSolver solver )
 {
-   return( hypre_JacobiSetZeroGuess( (void *) solver, 1 ) );
+   return ( hypre_JacobiSetZeroGuess( (void *) solver, 1 ) );
 }
 
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
- 
+
 HYPRE_Int
 HYPRE_StructJacobiGetZeroGuess( HYPRE_StructSolver solver,
                                 HYPRE_Int * zeroguess )
 {
-   return( hypre_JacobiGetZeroGuess( (void *) solver, zeroguess ) );
+   return ( hypre_JacobiGetZeroGuess( (void *) solver, zeroguess ) );
 }
 
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
- 
+
 HYPRE_Int
 HYPRE_StructJacobiSetNonZeroGuess( HYPRE_StructSolver solver )
 {
-   return( hypre_JacobiSetZeroGuess( (void *) solver, 0 ) );
+   return ( hypre_JacobiSetZeroGuess( (void *) solver, 0 ) );
 }
 
 
@@ -136,7 +136,7 @@ HYPRE_Int
 HYPRE_StructJacobiGetNumIterations( HYPRE_StructSolver  solver,
                                     HYPRE_Int          *num_iterations )
 {
-   return( hypre_JacobiGetNumIterations( (void *) solver, num_iterations ) );
+   return ( hypre_JacobiGetNumIterations( (void *) solver, num_iterations ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -146,5 +146,5 @@ HYPRE_Int
 HYPRE_StructJacobiGetFinalRelativeResidualNorm( HYPRE_StructSolver  solver,
                                                 HYPRE_Real         *norm   )
 {
-   return( hypre_JacobiGetFinalRelativeResidualNorm( (void *) solver, norm ) );
+   return ( hypre_JacobiGetFinalRelativeResidualNorm( (void *) solver, norm ) );
 }
diff --git a/external/hypre/src/struct_ls/HYPRE_struct_lgmres.c b/external/hypre/src/struct_ls/HYPRE_struct_lgmres.c
index 8f8f46a0..806e3412 100644
--- a/external/hypre/src/struct_ls/HYPRE_struct_lgmres.c
+++ b/external/hypre/src/struct_ls/HYPRE_struct_lgmres.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -12,6 +12,8 @@
 HYPRE_Int
 HYPRE_StructLGMRESCreate( MPI_Comm comm, HYPRE_StructSolver *solver )
 {
+   HYPRE_UNUSED_VAR(comm);
+
    hypre_LGMRESFunctions * lgmres_functions =
       hypre_LGMRESFunctionsCreate(
          hypre_StructKrylovCAlloc, hypre_StructKrylovFree,
@@ -32,38 +34,38 @@ HYPRE_StructLGMRESCreate( MPI_Comm comm, HYPRE_StructSolver *solver )
 
 /*==========================================================================*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_StructLGMRESDestroy( HYPRE_StructSolver solver )
 {
-   return( hypre_LGMRESDestroy( (void *) solver ) );
+   return ( hypre_LGMRESDestroy( (void *) solver ) );
 }
 
 /*==========================================================================*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_StructLGMRESSetup( HYPRE_StructSolver solver,
                          HYPRE_StructMatrix A,
                          HYPRE_StructVector b,
                          HYPRE_StructVector x      )
 {
-   return( HYPRE_LGMRESSetup( (HYPRE_Solver) solver,
-                              (HYPRE_Matrix) A,
-                              (HYPRE_Vector) b,
-                              (HYPRE_Vector) x ) );
+   return ( HYPRE_LGMRESSetup( (HYPRE_Solver) solver,
+                               (HYPRE_Matrix) A,
+                               (HYPRE_Vector) b,
+                               (HYPRE_Vector) x ) );
 }
 
 /*==========================================================================*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_StructLGMRESSolve( HYPRE_StructSolver solver,
                          HYPRE_StructMatrix A,
                          HYPRE_StructVector b,
                          HYPRE_StructVector x      )
 {
-   return( HYPRE_LGMRESSolve( (HYPRE_Solver) solver,
-                              (HYPRE_Matrix) A,
-                              (HYPRE_Vector) b,
-                              (HYPRE_Vector) x ) );
+   return ( HYPRE_LGMRESSolve( (HYPRE_Solver) solver,
+                               (HYPRE_Matrix) A,
+                               (HYPRE_Vector) b,
+                               (HYPRE_Vector) x ) );
 }
 
 /*==========================================================================*/
@@ -72,7 +74,7 @@ HYPRE_Int
 HYPRE_StructLGMRESSetTol( HYPRE_StructSolver solver,
                           HYPRE_Real         tol    )
 {
-   return( HYPRE_LGMRESSetTol( (HYPRE_Solver) solver, tol ) );
+   return ( HYPRE_LGMRESSetTol( (HYPRE_Solver) solver, tol ) );
 }
 /*==========================================================================*/
 
@@ -80,7 +82,7 @@ HYPRE_Int
 HYPRE_StructLGMRESSetAbsoluteTol( HYPRE_StructSolver solver,
                                   HYPRE_Real         tol    )
 {
-   return( HYPRE_LGMRESSetAbsoluteTol( (HYPRE_Solver) solver, tol ) );
+   return ( HYPRE_LGMRESSetAbsoluteTol( (HYPRE_Solver) solver, tol ) );
 }
 /*==========================================================================*/
 
@@ -88,7 +90,7 @@ HYPRE_Int
 HYPRE_StructLGMRESSetMaxIter( HYPRE_StructSolver solver,
                               HYPRE_Int          max_iter )
 {
-   return( HYPRE_LGMRESSetMaxIter( (HYPRE_Solver) solver, max_iter ) );
+   return ( HYPRE_LGMRESSetMaxIter( (HYPRE_Solver) solver, max_iter ) );
 }
 
 /*==========================================================================*/
@@ -97,7 +99,7 @@ HYPRE_Int
 HYPRE_StructLGMRESSetKDim( HYPRE_StructSolver solver,
                            HYPRE_Int          k_dim )
 {
-   return( HYPRE_LGMRESSetKDim( (HYPRE_Solver) solver, k_dim ) );
+   return ( HYPRE_LGMRESSetKDim( (HYPRE_Solver) solver, k_dim ) );
 }
 
 
@@ -108,7 +110,7 @@ HYPRE_Int
 HYPRE_StructLGMRESSetAugDim( HYPRE_StructSolver solver,
                              HYPRE_Int          aug_dim )
 {
-   return( HYPRE_LGMRESSetAugDim( (HYPRE_Solver) solver, aug_dim ) );
+   return ( HYPRE_LGMRESSetAugDim( (HYPRE_Solver) solver, aug_dim ) );
 }
 
 
@@ -120,10 +122,10 @@ HYPRE_StructLGMRESSetPrecond( HYPRE_StructSolver         solver,
                               HYPRE_PtrToStructSolverFcn precond_setup,
                               HYPRE_StructSolver         precond_solver )
 {
-   return( HYPRE_LGMRESSetPrecond( (HYPRE_Solver) solver,
-                                   (HYPRE_PtrToSolverFcn) precond,
-                                   (HYPRE_PtrToSolverFcn) precond_setup,
-                                   (HYPRE_Solver) precond_solver ) );
+   return ( HYPRE_LGMRESSetPrecond( (HYPRE_Solver) solver,
+                                    (HYPRE_PtrToSolverFcn) precond,
+                                    (HYPRE_PtrToSolverFcn) precond_setup,
+                                    (HYPRE_Solver) precond_solver ) );
 }
 
 /*==========================================================================*/
@@ -132,7 +134,7 @@ HYPRE_Int
 HYPRE_StructLGMRESSetLogging( HYPRE_StructSolver solver,
                               HYPRE_Int          logging )
 {
-   return( HYPRE_LGMRESSetLogging( (HYPRE_Solver) solver, logging ) );
+   return ( HYPRE_LGMRESSetLogging( (HYPRE_Solver) solver, logging ) );
 }
 
 /*==========================================================================*/
@@ -141,7 +143,7 @@ HYPRE_Int
 HYPRE_StructLGMRESSetPrintLevel( HYPRE_StructSolver solver,
                                  HYPRE_Int          print_level )
 {
-   return( HYPRE_LGMRESSetPrintLevel( (HYPRE_Solver) solver, print_level ) );
+   return ( HYPRE_LGMRESSetPrintLevel( (HYPRE_Solver) solver, print_level ) );
 }
 
 /*==========================================================================*/
@@ -150,7 +152,7 @@ HYPRE_Int
 HYPRE_StructLGMRESGetNumIterations( HYPRE_StructSolver  solver,
                                     HYPRE_Int          *num_iterations )
 {
-   return( HYPRE_LGMRESGetNumIterations( (HYPRE_Solver) solver, num_iterations ) );
+   return ( HYPRE_LGMRESGetNumIterations( (HYPRE_Solver) solver, num_iterations ) );
 }
 
 /*==========================================================================*/
@@ -159,8 +161,6 @@ HYPRE_Int
 HYPRE_StructLGMRESGetFinalRelativeResidualNorm( HYPRE_StructSolver  solver,
                                                 HYPRE_Real         *norm   )
 {
-   return( HYPRE_LGMRESGetFinalRelativeResidualNorm( (HYPRE_Solver) solver,
-                                                     norm ) );
+   return ( HYPRE_LGMRESGetFinalRelativeResidualNorm( (HYPRE_Solver) solver,
+                                                      norm ) );
 }
-
-
diff --git a/external/hypre/src/struct_ls/HYPRE_struct_ls.h b/external/hypre/src/struct_ls/HYPRE_struct_ls.h
index efe7a349..21adef37 100644
--- a/external/hypre/src/struct_ls/HYPRE_struct_ls.h
+++ b/external/hypre/src/struct_ls/HYPRE_struct_ls.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -22,10 +22,8 @@ extern "C" {
 /**
  * @defgroup StructSolvers Struct Solvers
  *
- * These solvers use matrix/vector storage schemes that are tailored
- * to structured grid problems.
- *
- * @memo Linear solvers for structured grids
+ * Linear solvers for structured grids. These solvers use matrix/vector storage
+ * schemes that are tailored to structured grid problems.
  *
  * @{
  **/
@@ -46,23 +44,17 @@ struct hypre_StructSolver_struct;
 typedef struct hypre_StructSolver_struct *HYPRE_StructSolver;
 
 typedef HYPRE_Int (*HYPRE_PtrToStructSolverFcn)(HYPRE_StructSolver,
-                                          HYPRE_StructMatrix,
-                                          HYPRE_StructVector,
-                                          HYPRE_StructVector);
+                                                HYPRE_StructMatrix,
+                                                HYPRE_StructVector,
+                                                HYPRE_StructVector);
 
 #ifndef HYPRE_MODIFYPC
 #define HYPRE_MODIFYPC
 /* if pc not defined, then may need HYPRE_SOLVER also */
 
- #ifndef HYPRE_SOLVER_STRUCT
- #define HYPRE_SOLVER_STRUCT
- struct hypre_Solver_struct;
- typedef struct hypre_Solver_struct *HYPRE_Solver;
- #endif
-
 typedef HYPRE_Int (*HYPRE_PtrToModifyPCFcn)(HYPRE_Solver,
-                                      HYPRE_Int,
-                                      HYPRE_Real);
+                                            HYPRE_Int,
+                                            HYPRE_Real);
 #endif
 
 /**@}*/
@@ -80,7 +72,7 @@ typedef HYPRE_Int (*HYPRE_PtrToModifyPCFcn)(HYPRE_Solver,
  * Create a solver object.
  **/
 HYPRE_Int HYPRE_StructJacobiCreate(MPI_Comm            comm,
-                             HYPRE_StructSolver *solver);
+                                   HYPRE_StructSolver *solver);
 
 /**
  * Destroy a solver object.  An object should be explicitly destroyed
@@ -98,23 +90,23 @@ HYPRE_Int HYPRE_StructJacobiDestroy(HYPRE_StructSolver solver);
  * ignored here, but information about the layout of the data may be used.
  **/
 HYPRE_Int HYPRE_StructJacobiSetup(HYPRE_StructSolver solver,
-                            HYPRE_StructMatrix A,
-                            HYPRE_StructVector b,
-                            HYPRE_StructVector x);
+                                  HYPRE_StructMatrix A,
+                                  HYPRE_StructVector b,
+                                  HYPRE_StructVector x);
 
 /**
  * Solve the system.
  **/
 HYPRE_Int HYPRE_StructJacobiSolve(HYPRE_StructSolver solver,
-                            HYPRE_StructMatrix A,
-                            HYPRE_StructVector b,
-                            HYPRE_StructVector x);
+                                  HYPRE_StructMatrix A,
+                                  HYPRE_StructVector b,
+                                  HYPRE_StructVector x);
 
 /**
  * (Optional) Set the convergence tolerance.
  **/
 HYPRE_Int HYPRE_StructJacobiSetTol(HYPRE_StructSolver solver,
-                             HYPRE_Real         tol);
+                                   HYPRE_Real         tol);
 
 
 HYPRE_Int HYPRE_StructJacobiGetTol(HYPRE_StructSolver solver,
@@ -124,7 +116,7 @@ HYPRE_Int HYPRE_StructJacobiGetTol(HYPRE_StructSolver solver,
  * (Optional) Set maximum number of iterations.
  **/
 HYPRE_Int HYPRE_StructJacobiSetMaxIter(HYPRE_StructSolver solver,
-                                 HYPRE_Int          max_iter);
+                                       HYPRE_Int          max_iter);
 
 HYPRE_Int HYPRE_StructJacobiGetMaxIter(HYPRE_StructSolver solver,
                                        HYPRE_Int *max_iter );
@@ -149,13 +141,13 @@ HYPRE_Int HYPRE_StructJacobiSetNonZeroGuess(HYPRE_StructSolver solver);
  * Return the number of iterations taken.
  **/
 HYPRE_Int HYPRE_StructJacobiGetNumIterations(HYPRE_StructSolver  solver,
-                                       HYPRE_Int          *num_iterations);
+                                             HYPRE_Int          *num_iterations);
 
 /**
  * Return the norm of the final relative residual.
  **/
 HYPRE_Int HYPRE_StructJacobiGetFinalRelativeResidualNorm(HYPRE_StructSolver  solver,
-                                                   HYPRE_Real         *norm);
+                                                         HYPRE_Real         *norm);
 
 /**@}*/
 
@@ -179,7 +171,7 @@ HYPRE_Int HYPRE_StructJacobiGetFinalRelativeResidualNorm(HYPRE_StructSolver  sol
  * Create a solver object.
  **/
 HYPRE_Int HYPRE_StructPFMGCreate(MPI_Comm            comm,
-                           HYPRE_StructSolver *solver);
+                                 HYPRE_StructSolver *solver);
 
 /**
  * Destroy a solver object.
@@ -191,23 +183,23 @@ HYPRE_Int HYPRE_StructPFMGDestroy(HYPRE_StructSolver solver);
  * ignored here, but information about the layout of the data may be used.
  **/
 HYPRE_Int HYPRE_StructPFMGSetup(HYPRE_StructSolver solver,
-                          HYPRE_StructMatrix A,
-                          HYPRE_StructVector b,
-                          HYPRE_StructVector x);
+                                HYPRE_StructMatrix A,
+                                HYPRE_StructVector b,
+                                HYPRE_StructVector x);
 
 /**
  * Solve the system.
  **/
 HYPRE_Int HYPRE_StructPFMGSolve(HYPRE_StructSolver solver,
-                          HYPRE_StructMatrix A,
-                          HYPRE_StructVector b,
-                          HYPRE_StructVector x);
+                                HYPRE_StructMatrix A,
+                                HYPRE_StructVector b,
+                                HYPRE_StructVector x);
 
 /**
  * (Optional) Set the convergence tolerance.
  **/
 HYPRE_Int HYPRE_StructPFMGSetTol(HYPRE_StructSolver solver,
-                           HYPRE_Real         tol);
+                                 HYPRE_Real         tol);
 
 HYPRE_Int HYPRE_StructPFMGGetTol (HYPRE_StructSolver solver,
                                   HYPRE_Real *tol);
@@ -216,7 +208,7 @@ HYPRE_Int HYPRE_StructPFMGGetTol (HYPRE_StructSolver solver,
  * (Optional) Set maximum number of iterations.
  **/
 HYPRE_Int HYPRE_StructPFMGSetMaxIter(HYPRE_StructSolver solver,
-                               HYPRE_Int          max_iter);
+                                     HYPRE_Int          max_iter);
 
 HYPRE_Int HYPRE_StructPFMGGetMaxIter(HYPRE_StructSolver solver,
                                      HYPRE_Int *max_iter);
@@ -225,7 +217,7 @@ HYPRE_Int HYPRE_StructPFMGGetMaxIter(HYPRE_StructSolver solver,
  * (Optional) Set maximum number of multigrid grid levels.
  **/
 HYPRE_Int HYPRE_StructPFMGSetMaxLevels(HYPRE_StructSolver solver,
-                                 HYPRE_Int          max_levels);
+                                       HYPRE_Int          max_levels);
 
 HYPRE_Int HYPRE_StructPFMGGetMaxLevels (HYPRE_StructSolver solver,
                                         HYPRE_Int *max_levels );
@@ -235,7 +227,7 @@ HYPRE_Int HYPRE_StructPFMGGetMaxLevels (HYPRE_StructSolver solver,
  * successive iterates be small.
  **/
 HYPRE_Int HYPRE_StructPFMGSetRelChange(HYPRE_StructSolver solver,
-                                 HYPRE_Int          rel_change);
+                                       HYPRE_Int          rel_change);
 
 HYPRE_Int HYPRE_StructPFMGGetRelChange (HYPRE_StructSolver solver,
                                         HYPRE_Int *rel_change);
@@ -267,7 +259,7 @@ HYPRE_Int HYPRE_StructPFMGSetNonZeroGuess(HYPRE_StructSolver solver);
  *    - 3 : Red/Black Gauss-Seidel (nonsymmetric: RB pre- and post-relaxation)
  **/
 HYPRE_Int HYPRE_StructPFMGSetRelaxType(HYPRE_StructSolver solver,
-                                 HYPRE_Int          relax_type);
+                                       HYPRE_Int          relax_type);
 
 HYPRE_Int HYPRE_StructPFMGGetRelaxType(HYPRE_StructSolver solver,
                                        HYPRE_Int *relax_type);
@@ -276,9 +268,9 @@ HYPRE_Int HYPRE_StructPFMGGetRelaxType(HYPRE_StructSolver solver,
  * (Optional) Set Jacobi weight (this is purposely not documented)
  */
 HYPRE_Int HYPRE_StructPFMGSetJacobiWeight(HYPRE_StructSolver solver,
-                                    HYPRE_Real         weight);
+                                          HYPRE_Real         weight);
 HYPRE_Int HYPRE_StructPFMGGetJacobiWeight(HYPRE_StructSolver solver,
-                                    HYPRE_Real        *weight);
+                                          HYPRE_Real        *weight);
 
 
 /**
@@ -294,7 +286,7 @@ HYPRE_Int HYPRE_StructPFMGGetJacobiWeight(HYPRE_StructSolver solver,
  * The stencil coefficients are computed by averaging techniques.
  **/
 HYPRE_Int HYPRE_StructPFMGSetRAPType(HYPRE_StructSolver solver,
-                               HYPRE_Int          rap_type);
+                                     HYPRE_Int          rap_type);
 
 HYPRE_Int HYPRE_StructPFMGGetRAPType(HYPRE_StructSolver solver,
                                      HYPRE_Int *rap_type );
@@ -303,7 +295,7 @@ HYPRE_Int HYPRE_StructPFMGGetRAPType(HYPRE_StructSolver solver,
  * (Optional) Set number of relaxation sweeps before coarse-grid correction.
  **/
 HYPRE_Int HYPRE_StructPFMGSetNumPreRelax(HYPRE_StructSolver solver,
-                                   HYPRE_Int          num_pre_relax);
+                                         HYPRE_Int          num_pre_relax);
 
 HYPRE_Int HYPRE_StructPFMGGetNumPreRelax(HYPRE_StructSolver solver,
                                          HYPRE_Int *num_pre_relax);
@@ -312,7 +304,7 @@ HYPRE_Int HYPRE_StructPFMGGetNumPreRelax(HYPRE_StructSolver solver,
  * (Optional) Set number of relaxation sweeps after coarse-grid correction.
  **/
 HYPRE_Int HYPRE_StructPFMGSetNumPostRelax(HYPRE_StructSolver solver,
-                                    HYPRE_Int          num_post_relax);
+                                          HYPRE_Int          num_post_relax);
 
 HYPRE_Int HYPRE_StructPFMGGetNumPostRelax(HYPRE_StructSolver solver,
                                           HYPRE_Int *num_post_relax);
@@ -323,7 +315,7 @@ HYPRE_Int HYPRE_StructPFMGGetNumPostRelax(HYPRE_StructSolver solver,
  * underlying problem is isotropic.
  **/
 HYPRE_Int HYPRE_StructPFMGSetSkipRelax(HYPRE_StructSolver solver,
-                                 HYPRE_Int          skip_relax);
+                                       HYPRE_Int          skip_relax);
 
 HYPRE_Int HYPRE_StructPFMGGetSkipRelax(HYPRE_StructSolver solver,
                                        HYPRE_Int *skip_relax);
@@ -332,13 +324,13 @@ HYPRE_Int HYPRE_StructPFMGGetSkipRelax(HYPRE_StructSolver solver,
  * RE-VISIT
  **/
 HYPRE_Int HYPRE_StructPFMGSetDxyz(HYPRE_StructSolver  solver,
-                            HYPRE_Real         *dxyz);
+                                  HYPRE_Real         *dxyz);
 
 /**
  * (Optional) Set the amount of logging to do.
  **/
 HYPRE_Int HYPRE_StructPFMGSetLogging(HYPRE_StructSolver solver,
-                               HYPRE_Int          logging);
+                                     HYPRE_Int          logging);
 
 HYPRE_Int HYPRE_StructPFMGGetLogging(HYPRE_StructSolver solver,
                                      HYPRE_Int *logging);
@@ -347,7 +339,7 @@ HYPRE_Int HYPRE_StructPFMGGetLogging(HYPRE_StructSolver solver,
  * (Optional) Set the amount of printing to do to the screen.
  **/
 HYPRE_Int HYPRE_StructPFMGSetPrintLevel(HYPRE_StructSolver solver,
-                                  HYPRE_Int          print_level);
+                                        HYPRE_Int          print_level);
 
 HYPRE_Int HYPRE_StructPFMGGetPrintLevel(HYPRE_StructSolver solver,
                                         HYPRE_Int *print_level);
@@ -356,13 +348,13 @@ HYPRE_Int HYPRE_StructPFMGGetPrintLevel(HYPRE_StructSolver solver,
  * Return the number of iterations taken.
  **/
 HYPRE_Int HYPRE_StructPFMGGetNumIterations(HYPRE_StructSolver  solver,
-                                     HYPRE_Int          *num_iterations);
+                                           HYPRE_Int          *num_iterations);
 
 /**
  * Return the norm of the final relative residual.
  **/
 HYPRE_Int HYPRE_StructPFMGGetFinalRelativeResidualNorm(HYPRE_StructSolver  solver,
-                                                 HYPRE_Real         *norm);
+                                                       HYPRE_Real         *norm);
 
 #if 0 //defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
 HYPRE_Int
@@ -389,7 +381,7 @@ HYPRE_StructPFMGSetDeviceLevel( HYPRE_StructSolver  solver,
  * Create a solver object.
  **/
 HYPRE_Int HYPRE_StructSMGCreate(MPI_Comm            comm,
-                          HYPRE_StructSolver *solver);
+                                HYPRE_StructSolver *solver);
 
 /**
  * Destroy a solver object.
@@ -401,23 +393,23 @@ HYPRE_Int HYPRE_StructSMGDestroy(HYPRE_StructSolver solver);
  * ignored here, but information about the layout of the data may be used.
  **/
 HYPRE_Int HYPRE_StructSMGSetup(HYPRE_StructSolver solver,
-                         HYPRE_StructMatrix A,
-                         HYPRE_StructVector b,
-                         HYPRE_StructVector x);
+                               HYPRE_StructMatrix A,
+                               HYPRE_StructVector b,
+                               HYPRE_StructVector x);
 
 /**
  * Solve the system.
  **/
 HYPRE_Int HYPRE_StructSMGSolve(HYPRE_StructSolver solver,
-                         HYPRE_StructMatrix A,
-                         HYPRE_StructVector b,
-                         HYPRE_StructVector x);
+                               HYPRE_StructMatrix A,
+                               HYPRE_StructVector b,
+                               HYPRE_StructVector x);
 
 /*
  * RE-VISIT
  **/
 HYPRE_Int HYPRE_StructSMGSetMemoryUse(HYPRE_StructSolver solver,
-                                HYPRE_Int          memory_use);
+                                      HYPRE_Int          memory_use);
 
 HYPRE_Int HYPRE_StructSMGGetMemoryUse(HYPRE_StructSolver solver,
                                       HYPRE_Int *memory_use);
@@ -426,7 +418,7 @@ HYPRE_Int HYPRE_StructSMGGetMemoryUse(HYPRE_StructSolver solver,
  * (Optional) Set the convergence tolerance.
  **/
 HYPRE_Int HYPRE_StructSMGSetTol(HYPRE_StructSolver solver,
-                          HYPRE_Real         tol);
+                                HYPRE_Real         tol);
 
 HYPRE_Int HYPRE_StructSMGGetTol(HYPRE_StructSolver solver,
                                 HYPRE_Real *tol);
@@ -435,7 +427,7 @@ HYPRE_Int HYPRE_StructSMGGetTol(HYPRE_StructSolver solver,
  * (Optional) Set maximum number of iterations.
  **/
 HYPRE_Int HYPRE_StructSMGSetMaxIter(HYPRE_StructSolver solver,
-                              HYPRE_Int          max_iter);
+                                    HYPRE_Int          max_iter);
 
 HYPRE_Int HYPRE_StructSMGGetMaxIter(HYPRE_StructSolver solver,
                                     HYPRE_Int *max_iter);
@@ -445,7 +437,7 @@ HYPRE_Int HYPRE_StructSMGGetMaxIter(HYPRE_StructSolver solver,
  * successive iterates be small.
  **/
 HYPRE_Int HYPRE_StructSMGSetRelChange(HYPRE_StructSolver solver,
-                                HYPRE_Int          rel_change);
+                                      HYPRE_Int          rel_change);
 
 HYPRE_Int HYPRE_StructSMGGetRelChange(HYPRE_StructSolver solver,
                                       HYPRE_Int *rel_change);
@@ -470,7 +462,7 @@ HYPRE_Int HYPRE_StructSMGSetNonZeroGuess(HYPRE_StructSolver solver);
  * (Optional) Set number of relaxation sweeps before coarse-grid correction.
  **/
 HYPRE_Int HYPRE_StructSMGSetNumPreRelax(HYPRE_StructSolver solver,
-                                  HYPRE_Int          num_pre_relax);
+                                        HYPRE_Int          num_pre_relax);
 
 HYPRE_Int HYPRE_StructSMGGetNumPreRelax(HYPRE_StructSolver solver,
                                         HYPRE_Int *num_pre_relax);
@@ -479,7 +471,7 @@ HYPRE_Int HYPRE_StructSMGGetNumPreRelax(HYPRE_StructSolver solver,
  * (Optional) Set number of relaxation sweeps after coarse-grid correction.
  **/
 HYPRE_Int HYPRE_StructSMGSetNumPostRelax(HYPRE_StructSolver solver,
-                                   HYPRE_Int          num_post_relax);
+                                         HYPRE_Int          num_post_relax);
 
 HYPRE_Int HYPRE_StructSMGGetNumPostRelax(HYPRE_StructSolver solver,
                                          HYPRE_Int *num_post_relax);
@@ -488,7 +480,7 @@ HYPRE_Int HYPRE_StructSMGGetNumPostRelax(HYPRE_StructSolver solver,
  * (Optional) Set the amount of logging to do.
  **/
 HYPRE_Int HYPRE_StructSMGSetLogging(HYPRE_StructSolver solver,
-                              HYPRE_Int          logging);
+                                    HYPRE_Int          logging);
 
 HYPRE_Int HYPRE_StructSMGGetLogging(HYPRE_StructSolver solver,
                                     HYPRE_Int *logging);
@@ -497,7 +489,7 @@ HYPRE_Int HYPRE_StructSMGGetLogging(HYPRE_StructSolver solver,
  * (Optional) Set the amount of printing to do to the screen.
  **/
 HYPRE_Int HYPRE_StructSMGSetPrintLevel(HYPRE_StructSolver solver,
-                                  HYPRE_Int          print_level);
+                                       HYPRE_Int          print_level);
 
 HYPRE_Int HYPRE_StructSMGGetPrintLevel(HYPRE_StructSolver solver,
                                        HYPRE_Int *print_level);
@@ -506,13 +498,13 @@ HYPRE_Int HYPRE_StructSMGGetPrintLevel(HYPRE_StructSolver solver,
  * Return the number of iterations taken.
  **/
 HYPRE_Int HYPRE_StructSMGGetNumIterations(HYPRE_StructSolver  solver,
-                                    HYPRE_Int          *num_iterations);
+                                          HYPRE_Int          *num_iterations);
 
 /**
  * Return the norm of the final relative residual.
  **/
 HYPRE_Int HYPRE_StructSMGGetFinalRelativeResidualNorm(HYPRE_StructSolver  solver,
-                                                HYPRE_Real         *norm);
+                                                      HYPRE_Real         *norm);
 
 #if 0 //defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
 HYPRE_Int
@@ -598,7 +590,7 @@ HYPRE_Int HYPRE_StructCycRedSetBase(HYPRE_StructSolver solver,
  * Create a solver object.
  **/
 HYPRE_Int HYPRE_StructPCGCreate(MPI_Comm            comm,
-                          HYPRE_StructSolver *solver);
+                                HYPRE_StructSolver *solver);
 
 /**
  * Destroy a solver object.
@@ -606,65 +598,65 @@ HYPRE_Int HYPRE_StructPCGCreate(MPI_Comm            comm,
 HYPRE_Int HYPRE_StructPCGDestroy(HYPRE_StructSolver solver);
 
 HYPRE_Int HYPRE_StructPCGSetup(HYPRE_StructSolver solver,
-                         HYPRE_StructMatrix A,
-                         HYPRE_StructVector b,
-                         HYPRE_StructVector x);
+                               HYPRE_StructMatrix A,
+                               HYPRE_StructVector b,
+                               HYPRE_StructVector x);
 
 HYPRE_Int HYPRE_StructPCGSolve(HYPRE_StructSolver solver,
-                         HYPRE_StructMatrix A,
-                         HYPRE_StructVector b,
-                         HYPRE_StructVector x);
+                               HYPRE_StructMatrix A,
+                               HYPRE_StructVector b,
+                               HYPRE_StructVector x);
 
 HYPRE_Int HYPRE_StructPCGSetTol(HYPRE_StructSolver solver,
-                          HYPRE_Real         tol);
+                                HYPRE_Real         tol);
 
 HYPRE_Int HYPRE_StructPCGSetAbsoluteTol(HYPRE_StructSolver solver,
-                                  HYPRE_Real         tol);
+                                        HYPRE_Real         tol);
 
 HYPRE_Int HYPRE_StructPCGSetMaxIter(HYPRE_StructSolver solver,
-                              HYPRE_Int          max_iter);
+                                    HYPRE_Int          max_iter);
 
 HYPRE_Int HYPRE_StructPCGSetTwoNorm(HYPRE_StructSolver solver,
-                              HYPRE_Int          two_norm);
+                                    HYPRE_Int          two_norm);
 
 HYPRE_Int HYPRE_StructPCGSetRelChange(HYPRE_StructSolver solver,
-                                HYPRE_Int          rel_change);
+                                      HYPRE_Int          rel_change);
 
 HYPRE_Int HYPRE_StructPCGSetPrecond(HYPRE_StructSolver         solver,
-                              HYPRE_PtrToStructSolverFcn precond,
-                              HYPRE_PtrToStructSolverFcn precond_setup,
-                              HYPRE_StructSolver         precond_solver);
+                                    HYPRE_PtrToStructSolverFcn precond,
+                                    HYPRE_PtrToStructSolverFcn precond_setup,
+                                    HYPRE_StructSolver         precond_solver);
 
 HYPRE_Int HYPRE_StructPCGSetLogging(HYPRE_StructSolver solver,
-                              HYPRE_Int          logging);
+                                    HYPRE_Int          logging);
 
 HYPRE_Int HYPRE_StructPCGSetPrintLevel(HYPRE_StructSolver solver,
-                                 HYPRE_Int          level);
+                                       HYPRE_Int          level);
 
 HYPRE_Int HYPRE_StructPCGGetNumIterations(HYPRE_StructSolver  solver,
-                                    HYPRE_Int          *num_iterations);
+                                          HYPRE_Int          *num_iterations);
 
 HYPRE_Int HYPRE_StructPCGGetFinalRelativeResidualNorm(HYPRE_StructSolver  solver,
-                                                HYPRE_Real         *norm);
+                                                      HYPRE_Real         *norm);
 
 HYPRE_Int HYPRE_StructPCGGetResidual(HYPRE_StructSolver   solver,
-                               void               **residual);
+                                     void               **residual);
 
 /**
  * Setup routine for diagonal preconditioning.
  **/
 HYPRE_Int HYPRE_StructDiagScaleSetup(HYPRE_StructSolver solver,
-                               HYPRE_StructMatrix A,
-                               HYPRE_StructVector y,
-                               HYPRE_StructVector x);
+                                     HYPRE_StructMatrix A,
+                                     HYPRE_StructVector y,
+                                     HYPRE_StructVector x);
 
 /**
  * Solve routine for diagonal preconditioning.
  **/
 HYPRE_Int HYPRE_StructDiagScale(HYPRE_StructSolver solver,
-                          HYPRE_StructMatrix HA,
-                          HYPRE_StructVector Hy,
-                          HYPRE_StructVector Hx);
+                                HYPRE_StructMatrix HA,
+                                HYPRE_StructVector Hy,
+                                HYPRE_StructVector Hx);
 
 /**@}*/
 
@@ -684,7 +676,7 @@ HYPRE_Int HYPRE_StructDiagScale(HYPRE_StructSolver solver,
  * Create a solver object.
  **/
 HYPRE_Int HYPRE_StructGMRESCreate(MPI_Comm            comm,
-                            HYPRE_StructSolver *solver);
+                                  HYPRE_StructSolver *solver);
 
 
 /**
@@ -693,46 +685,46 @@ HYPRE_Int HYPRE_StructGMRESCreate(MPI_Comm            comm,
 HYPRE_Int HYPRE_StructGMRESDestroy(HYPRE_StructSolver solver);
 
 HYPRE_Int HYPRE_StructGMRESSetup(HYPRE_StructSolver solver,
-                           HYPRE_StructMatrix A,
-                           HYPRE_StructVector b,
-                           HYPRE_StructVector x);
+                                 HYPRE_StructMatrix A,
+                                 HYPRE_StructVector b,
+                                 HYPRE_StructVector x);
 
 HYPRE_Int HYPRE_StructGMRESSolve(HYPRE_StructSolver solver,
-                           HYPRE_StructMatrix A,
-                           HYPRE_StructVector b,
-                           HYPRE_StructVector x);
+                                 HYPRE_StructMatrix A,
+                                 HYPRE_StructVector b,
+                                 HYPRE_StructVector x);
 
 HYPRE_Int HYPRE_StructGMRESSetTol(HYPRE_StructSolver solver,
-                            HYPRE_Real         tol);
+                                  HYPRE_Real         tol);
 
 HYPRE_Int HYPRE_StructGMRESSetAbsoluteTol(HYPRE_StructSolver solver,
-                                    HYPRE_Real         tol);
+                                          HYPRE_Real         tol);
 
 HYPRE_Int HYPRE_StructGMRESSetMaxIter(HYPRE_StructSolver solver,
-                                HYPRE_Int          max_iter);
+                                      HYPRE_Int          max_iter);
 
 HYPRE_Int HYPRE_StructGMRESSetKDim(HYPRE_StructSolver solver,
-                             HYPRE_Int          k_dim);
+                                   HYPRE_Int          k_dim);
 
 HYPRE_Int HYPRE_StructGMRESSetPrecond(HYPRE_StructSolver         solver,
-                                HYPRE_PtrToStructSolverFcn precond,
-                                HYPRE_PtrToStructSolverFcn precond_setup,
-                                HYPRE_StructSolver         precond_solver);
+                                      HYPRE_PtrToStructSolverFcn precond,
+                                      HYPRE_PtrToStructSolverFcn precond_setup,
+                                      HYPRE_StructSolver         precond_solver);
 
 HYPRE_Int HYPRE_StructGMRESSetLogging(HYPRE_StructSolver solver,
-                                HYPRE_Int          logging);
+                                      HYPRE_Int          logging);
 
 HYPRE_Int HYPRE_StructGMRESSetPrintLevel(HYPRE_StructSolver solver,
-                                   HYPRE_Int          level);
+                                         HYPRE_Int          level);
 
 HYPRE_Int HYPRE_StructGMRESGetNumIterations(HYPRE_StructSolver  solver,
-                                      HYPRE_Int          *num_iterations);
+                                            HYPRE_Int          *num_iterations);
 
 HYPRE_Int HYPRE_StructGMRESGetFinalRelativeResidualNorm(HYPRE_StructSolver  solver,
-                                                  HYPRE_Real         *norm);
+                                                        HYPRE_Real         *norm);
 
 HYPRE_Int HYPRE_StructGMRESGetResidual(HYPRE_StructSolver   solver,
-                                 void               **residual);
+                                       void               **residual);
 /**@}*/
 
 /*--------------------------------------------------------------------------
@@ -751,7 +743,7 @@ HYPRE_Int HYPRE_StructGMRESGetResidual(HYPRE_StructSolver   solver,
  * Create a solver object.
  **/
 HYPRE_Int HYPRE_StructFlexGMRESCreate(MPI_Comm            comm,
-                                HYPRE_StructSolver *solver);
+                                      HYPRE_StructSolver *solver);
 
 /**
  * Destroy a solver object.
@@ -759,49 +751,49 @@ HYPRE_Int HYPRE_StructFlexGMRESCreate(MPI_Comm            comm,
 HYPRE_Int HYPRE_StructFlexGMRESDestroy(HYPRE_StructSolver solver);
 
 HYPRE_Int HYPRE_StructFlexGMRESSetup(HYPRE_StructSolver solver,
-                               HYPRE_StructMatrix A,
-                               HYPRE_StructVector b,
-                               HYPRE_StructVector x);
+                                     HYPRE_StructMatrix A,
+                                     HYPRE_StructVector b,
+                                     HYPRE_StructVector x);
 
 HYPRE_Int HYPRE_StructFlexGMRESSolve(HYPRE_StructSolver solver,
-                               HYPRE_StructMatrix A,
-                               HYPRE_StructVector b,
-                               HYPRE_StructVector x);
+                                     HYPRE_StructMatrix A,
+                                     HYPRE_StructVector b,
+                                     HYPRE_StructVector x);
 
 HYPRE_Int HYPRE_StructFlexGMRESSetTol(HYPRE_StructSolver solver,
-                                HYPRE_Real         tol);
+                                      HYPRE_Real         tol);
 
 HYPRE_Int HYPRE_StructFlexGMRESSetAbsoluteTol(HYPRE_StructSolver solver,
-                                        HYPRE_Real         tol);
+                                              HYPRE_Real         tol);
 
 HYPRE_Int HYPRE_StructFlexGMRESSetMaxIter(HYPRE_StructSolver solver,
-                                    HYPRE_Int          max_iter);
+                                          HYPRE_Int          max_iter);
 
 HYPRE_Int HYPRE_StructFlexGMRESSetKDim(HYPRE_StructSolver solver,
-                                 HYPRE_Int          k_dim);
+                                       HYPRE_Int          k_dim);
 
 HYPRE_Int HYPRE_StructFlexGMRESSetPrecond(HYPRE_StructSolver         solver,
-                                    HYPRE_PtrToStructSolverFcn precond,
-                                    HYPRE_PtrToStructSolverFcn precond_setup,
-                                    HYPRE_StructSolver         precond_solver);
+                                          HYPRE_PtrToStructSolverFcn precond,
+                                          HYPRE_PtrToStructSolverFcn precond_setup,
+                                          HYPRE_StructSolver         precond_solver);
 
 HYPRE_Int HYPRE_StructFlexGMRESSetLogging(HYPRE_StructSolver solver,
-                                    HYPRE_Int          logging);
+                                          HYPRE_Int          logging);
 
 HYPRE_Int HYPRE_StructFlexGMRESSetPrintLevel(HYPRE_StructSolver solver,
-                                       HYPRE_Int          level);
+                                             HYPRE_Int          level);
 
 HYPRE_Int HYPRE_StructFlexGMRESGetNumIterations(HYPRE_StructSolver  solver,
-                                          HYPRE_Int          *num_iterations);
+                                                HYPRE_Int          *num_iterations);
 
 HYPRE_Int HYPRE_StructFlexGMRESGetFinalRelativeResidualNorm(HYPRE_StructSolver  solver,
-                                                      HYPRE_Real         *norm);
+                                                            HYPRE_Real         *norm);
 
 HYPRE_Int HYPRE_StructFlexGMRESGetResidual(HYPRE_StructSolver   solver,
-                                     void               **residual);
+                                           void               **residual);
 
 HYPRE_Int HYPRE_StructFlexGMRESSetModifyPC(HYPRE_StructSolver     solver,
-                                     HYPRE_PtrToModifyPCFcn modify_pc);
+                                           HYPRE_PtrToModifyPCFcn modify_pc);
 
 /**@}*/
 
@@ -821,7 +813,7 @@ HYPRE_Int HYPRE_StructFlexGMRESSetModifyPC(HYPRE_StructSolver     solver,
  * Create a solver object.
  **/
 HYPRE_Int HYPRE_StructLGMRESCreate(MPI_Comm            comm,
-                             HYPRE_StructSolver *solver);
+                                   HYPRE_StructSolver *solver);
 
 /**
  * Destroy a solver object.
@@ -829,49 +821,49 @@ HYPRE_Int HYPRE_StructLGMRESCreate(MPI_Comm            comm,
 HYPRE_Int HYPRE_StructLGMRESDestroy(HYPRE_StructSolver solver);
 
 HYPRE_Int HYPRE_StructLGMRESSetup(HYPRE_StructSolver solver,
-                            HYPRE_StructMatrix A,
-                            HYPRE_StructVector b,
-                            HYPRE_StructVector x);
+                                  HYPRE_StructMatrix A,
+                                  HYPRE_StructVector b,
+                                  HYPRE_StructVector x);
 
 HYPRE_Int HYPRE_StructLGMRESSolve(HYPRE_StructSolver solver,
-                            HYPRE_StructMatrix A,
-                            HYPRE_StructVector b,
-                            HYPRE_StructVector x);
+                                  HYPRE_StructMatrix A,
+                                  HYPRE_StructVector b,
+                                  HYPRE_StructVector x);
 
 HYPRE_Int HYPRE_StructLGMRESSetTol(HYPRE_StructSolver solver,
-                             HYPRE_Real         tol);
+                                   HYPRE_Real         tol);
 
 HYPRE_Int HYPRE_StructLGMRESSetAbsoluteTol(HYPRE_StructSolver solver,
-                                     HYPRE_Real         tol);
+                                           HYPRE_Real         tol);
 
 HYPRE_Int HYPRE_StructLGMRESSetMaxIter(HYPRE_StructSolver solver,
-                                 HYPRE_Int          max_iter);
+                                       HYPRE_Int          max_iter);
 
 HYPRE_Int HYPRE_StructLGMRESSetKDim(HYPRE_StructSolver solver,
-                              HYPRE_Int          k_dim);
+                                    HYPRE_Int          k_dim);
 
 HYPRE_Int HYPRE_StructLGMRESSetAugDim(HYPRE_StructSolver solver,
-                                HYPRE_Int          aug_dim);
+                                      HYPRE_Int          aug_dim);
 
 HYPRE_Int HYPRE_StructLGMRESSetPrecond(HYPRE_StructSolver         solver,
-                                 HYPRE_PtrToStructSolverFcn precond,
-                                 HYPRE_PtrToStructSolverFcn precond_setup,
-                                 HYPRE_StructSolver         precond_solver);
+                                       HYPRE_PtrToStructSolverFcn precond,
+                                       HYPRE_PtrToStructSolverFcn precond_setup,
+                                       HYPRE_StructSolver         precond_solver);
 
 HYPRE_Int HYPRE_StructLGMRESSetLogging(HYPRE_StructSolver solver,
-                                 HYPRE_Int          logging);
+                                       HYPRE_Int          logging);
 
 HYPRE_Int HYPRE_StructLGMRESSetPrintLevel(HYPRE_StructSolver solver,
-                                    HYPRE_Int          level);
+                                          HYPRE_Int          level);
 
 HYPRE_Int HYPRE_StructLGMRESGetNumIterations(HYPRE_StructSolver  solver,
-                                       HYPRE_Int          *num_iterations);
+                                             HYPRE_Int          *num_iterations);
 
 HYPRE_Int HYPRE_StructLGMRESGetFinalRelativeResidualNorm(HYPRE_StructSolver  solver,
-                                                   HYPRE_Real         *norm);
+                                                         HYPRE_Real         *norm);
 
 HYPRE_Int HYPRE_StructLGMRESGetResidual(HYPRE_StructSolver   solver,
-                                  void               **residual);
+                                        void               **residual);
 /**@}*/
 
 /*--------------------------------------------------------------------------
@@ -890,7 +882,7 @@ HYPRE_Int HYPRE_StructLGMRESGetResidual(HYPRE_StructSolver   solver,
  * Create a solver object.
  **/
 HYPRE_Int HYPRE_StructBiCGSTABCreate(MPI_Comm            comm,
-                               HYPRE_StructSolver *solver);
+                                     HYPRE_StructSolver *solver);
 
 /**
  * Destroy a solver object.
@@ -898,43 +890,43 @@ HYPRE_Int HYPRE_StructBiCGSTABCreate(MPI_Comm            comm,
 HYPRE_Int HYPRE_StructBiCGSTABDestroy(HYPRE_StructSolver solver);
 
 HYPRE_Int HYPRE_StructBiCGSTABSetup(HYPRE_StructSolver solver,
-                              HYPRE_StructMatrix A,
-                              HYPRE_StructVector b,
-                              HYPRE_StructVector x);
+                                    HYPRE_StructMatrix A,
+                                    HYPRE_StructVector b,
+                                    HYPRE_StructVector x);
 
 HYPRE_Int HYPRE_StructBiCGSTABSolve(HYPRE_StructSolver solver,
-                              HYPRE_StructMatrix A,
-                              HYPRE_StructVector b,
-                              HYPRE_StructVector x);
+                                    HYPRE_StructMatrix A,
+                                    HYPRE_StructVector b,
+                                    HYPRE_StructVector x);
 
 HYPRE_Int HYPRE_StructBiCGSTABSetTol(HYPRE_StructSolver solver,
-                               HYPRE_Real         tol);
+                                     HYPRE_Real         tol);
 
 HYPRE_Int HYPRE_StructBiCGSTABSetAbsoluteTol(HYPRE_StructSolver solver,
-                                       HYPRE_Real         tol);
+                                             HYPRE_Real         tol);
 
 HYPRE_Int HYPRE_StructBiCGSTABSetMaxIter(HYPRE_StructSolver solver,
-                                   HYPRE_Int          max_iter);
+                                         HYPRE_Int          max_iter);
 
 HYPRE_Int HYPRE_StructBiCGSTABSetPrecond(HYPRE_StructSolver         solver,
-                                   HYPRE_PtrToStructSolverFcn precond,
-                                   HYPRE_PtrToStructSolverFcn precond_setup,
-                                   HYPRE_StructSolver         precond_solver);
+                                         HYPRE_PtrToStructSolverFcn precond,
+                                         HYPRE_PtrToStructSolverFcn precond_setup,
+                                         HYPRE_StructSolver         precond_solver);
 
 HYPRE_Int HYPRE_StructBiCGSTABSetLogging(HYPRE_StructSolver solver,
-                                   HYPRE_Int          logging);
+                                         HYPRE_Int          logging);
 
 HYPRE_Int HYPRE_StructBiCGSTABSetPrintLevel(HYPRE_StructSolver solver,
-                                      HYPRE_Int          level);
+                                            HYPRE_Int          level);
 
 HYPRE_Int HYPRE_StructBiCGSTABGetNumIterations(HYPRE_StructSolver  solver,
-                                         HYPRE_Int          *num_iterations);
+                                               HYPRE_Int          *num_iterations);
 
 HYPRE_Int HYPRE_StructBiCGSTABGetFinalRelativeResidualNorm(HYPRE_StructSolver  solver,
-                                                     HYPRE_Real         *norm);
+                                                           HYPRE_Real         *norm);
 
 HYPRE_Int HYPRE_StructBiCGSTABGetResidual( HYPRE_StructSolver   solver,
-                                     void               **residual);
+                                           void               **residual);
 /**@}*/
 
 /*--------------------------------------------------------------------------
@@ -950,7 +942,7 @@ HYPRE_Int HYPRE_StructBiCGSTABGetResidual( HYPRE_StructSolver   solver,
  * Create a solver object.
  **/
 HYPRE_Int HYPRE_StructHybridCreate(MPI_Comm            comm,
-                             HYPRE_StructSolver *solver);
+                                   HYPRE_StructSolver *solver);
 
 /**
  * Destroy a solver object.
@@ -962,23 +954,23 @@ HYPRE_Int HYPRE_StructHybridDestroy(HYPRE_StructSolver solver);
  * ignored here, but information about the layout of the data may be used.
  **/
 HYPRE_Int HYPRE_StructHybridSetup(HYPRE_StructSolver solver,
-                            HYPRE_StructMatrix A,
-                            HYPRE_StructVector b,
-                            HYPRE_StructVector x);
+                                  HYPRE_StructMatrix A,
+                                  HYPRE_StructVector b,
+                                  HYPRE_StructVector x);
 
 /**
  * Solve the system.
  **/
 HYPRE_Int HYPRE_StructHybridSolve(HYPRE_StructSolver solver,
-                            HYPRE_StructMatrix A,
-                            HYPRE_StructVector b,
-                            HYPRE_StructVector x);
+                                  HYPRE_StructMatrix A,
+                                  HYPRE_StructVector b,
+                                  HYPRE_StructVector x);
 
 /**
  * (Optional) Set the convergence tolerance.
  **/
 HYPRE_Int HYPRE_StructHybridSetTol(HYPRE_StructSolver solver,
-                             HYPRE_Real         tol);
+                                   HYPRE_Real         tol);
 
 /**
  * (Optional) Set an accepted convergence tolerance for diagonal scaling (DS).
@@ -986,37 +978,37 @@ HYPRE_Int HYPRE_StructHybridSetTol(HYPRE_StructSolver solver,
  * than \e cf_tol.
  **/
 HYPRE_Int HYPRE_StructHybridSetConvergenceTol(HYPRE_StructSolver solver,
-                                        HYPRE_Real         cf_tol);
+                                              HYPRE_Real         cf_tol);
 
 /**
  * (Optional) Set maximum number of iterations for diagonal scaling (DS).  The
  * solver will switch preconditioners if DS reaches \e ds_max_its.
  **/
 HYPRE_Int HYPRE_StructHybridSetDSCGMaxIter(HYPRE_StructSolver solver,
-                                     HYPRE_Int          ds_max_its);
+                                           HYPRE_Int          ds_max_its);
 
 /**
  * (Optional) Set maximum number of iterations for general preconditioner (PRE).
  * The solver will stop if PRE reaches \e pre_max_its.
  **/
 HYPRE_Int HYPRE_StructHybridSetPCGMaxIter(HYPRE_StructSolver solver,
-                                    HYPRE_Int          pre_max_its);
+                                          HYPRE_Int          pre_max_its);
 
 /**
  * (Optional) Use the two-norm in stopping criteria.
  **/
 HYPRE_Int HYPRE_StructHybridSetTwoNorm(HYPRE_StructSolver solver,
-                                 HYPRE_Int          two_norm);
+                                       HYPRE_Int          two_norm);
 
 HYPRE_Int HYPRE_StructHybridSetStopCrit(HYPRE_StructSolver solver,
-                                 HYPRE_Int          stop_crit);
+                                        HYPRE_Int          stop_crit);
 
 /**
  * (Optional) Additionally require that the relative difference in
  * successive iterates be small.
  **/
 HYPRE_Int HYPRE_StructHybridSetRelChange(HYPRE_StructSolver solver,
-                                   HYPRE_Int          rel_change);
+                                         HYPRE_Int          rel_change);
 
 /**
  * (Optional) Set the type of Krylov solver to use.
@@ -1064,51 +1056,51 @@ HYPRE_StructHybridGetRecomputeResidualP( HYPRE_StructSolver  solver,
  * (Optional) Set the maximum size of the Krylov space when using GMRES.
  **/
 HYPRE_Int HYPRE_StructHybridSetKDim(HYPRE_StructSolver solver,
-                              HYPRE_Int          k_dim);
+                                    HYPRE_Int          k_dim);
 
 /**
  * (Optional) Set the preconditioner to use.
  **/
 HYPRE_Int HYPRE_StructHybridSetPrecond(HYPRE_StructSolver         solver,
-                                 HYPRE_PtrToStructSolverFcn precond,
-                                 HYPRE_PtrToStructSolverFcn precond_setup,
-                                 HYPRE_StructSolver         precond_solver);
+                                       HYPRE_PtrToStructSolverFcn precond,
+                                       HYPRE_PtrToStructSolverFcn precond_setup,
+                                       HYPRE_StructSolver         precond_solver);
 
 /**
  * (Optional) Set the amount of logging to do.
  **/
 HYPRE_Int HYPRE_StructHybridSetLogging(HYPRE_StructSolver solver,
-                                 HYPRE_Int          logging);
+                                       HYPRE_Int          logging);
 
 /**
  * (Optional) Set the amount of printing to do to the screen.
  **/
 HYPRE_Int HYPRE_StructHybridSetPrintLevel(HYPRE_StructSolver solver,
-                                    HYPRE_Int          print_level);
+                                          HYPRE_Int          print_level);
 
 /**
  * Return the number of iterations taken.
  **/
 HYPRE_Int HYPRE_StructHybridGetNumIterations(HYPRE_StructSolver  solver,
-                                       HYPRE_Int          *num_its);
+                                             HYPRE_Int          *num_its);
 
 /**
  * Return the number of diagonal scaling iterations taken.
  **/
 HYPRE_Int HYPRE_StructHybridGetDSCGNumIterations(HYPRE_StructSolver  solver,
-                                           HYPRE_Int          *ds_num_its);
+                                                 HYPRE_Int          *ds_num_its);
 
 /**
  * Return the number of general preconditioning iterations taken.
  **/
 HYPRE_Int HYPRE_StructHybridGetPCGNumIterations(HYPRE_StructSolver  solver,
-                                          HYPRE_Int          *pre_num_its);
+                                                HYPRE_Int          *pre_num_its);
 
 /**
  * Return the norm of the final relative residual.
  **/
 HYPRE_Int HYPRE_StructHybridGetFinalRelativeResidualNorm(HYPRE_StructSolver  solver,
-                                                   HYPRE_Real         *norm);
+                                                         HYPRE_Real         *norm);
 
 HYPRE_Int HYPRE_StructHybridSetPCGAbsoluteTolFactor(HYPRE_StructSolver solver,
                                                     HYPRE_Real pcg_atolf );
@@ -1123,63 +1115,63 @@ HYPRE_Int HYPRE_StructHybridSetPCGAbsoluteTolFactor(HYPRE_StructSolver solver,
  **/
 
 HYPRE_Int HYPRE_StructSparseMSGCreate(MPI_Comm            comm,
-                                HYPRE_StructSolver *solver);
+                                      HYPRE_StructSolver *solver);
 
 HYPRE_Int HYPRE_StructSparseMSGDestroy(HYPRE_StructSolver solver);
 
 HYPRE_Int HYPRE_StructSparseMSGSetup(HYPRE_StructSolver solver,
-                               HYPRE_StructMatrix A,
-                               HYPRE_StructVector b,
-                               HYPRE_StructVector x);
+                                     HYPRE_StructMatrix A,
+                                     HYPRE_StructVector b,
+                                     HYPRE_StructVector x);
 
 HYPRE_Int HYPRE_StructSparseMSGSolve(HYPRE_StructSolver solver,
-                               HYPRE_StructMatrix A,
-                               HYPRE_StructVector b,
-                               HYPRE_StructVector x);
+                                     HYPRE_StructMatrix A,
+                                     HYPRE_StructVector b,
+                                     HYPRE_StructVector x);
 
 HYPRE_Int HYPRE_StructSparseMSGSetTol(HYPRE_StructSolver solver,
-                                HYPRE_Real         tol);
+                                      HYPRE_Real         tol);
 
 HYPRE_Int HYPRE_StructSparseMSGSetMaxIter(HYPRE_StructSolver solver,
-                                    HYPRE_Int          max_iter);
+                                          HYPRE_Int          max_iter);
 
 HYPRE_Int HYPRE_StructSparseMSGSetJump(HYPRE_StructSolver solver,
-                                 HYPRE_Int          jump);
+                                       HYPRE_Int          jump);
 
 HYPRE_Int HYPRE_StructSparseMSGSetRelChange(HYPRE_StructSolver solver,
-                                      HYPRE_Int          rel_change);
+                                            HYPRE_Int          rel_change);
 
 HYPRE_Int HYPRE_StructSparseMSGSetZeroGuess(HYPRE_StructSolver solver);
 
 HYPRE_Int HYPRE_StructSparseMSGSetNonZeroGuess(HYPRE_StructSolver solver);
 
 HYPRE_Int HYPRE_StructSparseMSGSetRelaxType(HYPRE_StructSolver solver,
-                                      HYPRE_Int          relax_type);
+                                            HYPRE_Int          relax_type);
 
 HYPRE_Int HYPRE_StructSparseMSGSetJacobiWeight(HYPRE_StructSolver solver,
-                                         HYPRE_Real         weight);
+                                               HYPRE_Real         weight);
 
 HYPRE_Int HYPRE_StructSparseMSGSetNumPreRelax(HYPRE_StructSolver solver,
-                                        HYPRE_Int          num_pre_relax);
+                                              HYPRE_Int          num_pre_relax);
 
 HYPRE_Int HYPRE_StructSparseMSGSetNumPostRelax(HYPRE_StructSolver solver,
-                                         HYPRE_Int          num_post_relax);
+                                               HYPRE_Int          num_post_relax);
 
 HYPRE_Int HYPRE_StructSparseMSGSetNumFineRelax(HYPRE_StructSolver solver,
-                                         HYPRE_Int          num_fine_relax);
+                                               HYPRE_Int          num_fine_relax);
 
 HYPRE_Int HYPRE_StructSparseMSGSetLogging(HYPRE_StructSolver solver,
-                                    HYPRE_Int          logging);
+                                          HYPRE_Int          logging);
 
 HYPRE_Int HYPRE_StructSparseMSGSetPrintLevel(HYPRE_StructSolver solver,
-                                          HYPRE_Int   print_level);
+                                             HYPRE_Int   print_level);
 
 
 HYPRE_Int HYPRE_StructSparseMSGGetNumIterations(HYPRE_StructSolver  solver,
-                                          HYPRE_Int          *num_iterations);
+                                                HYPRE_Int          *num_iterations);
 
 HYPRE_Int HYPRE_StructSparseMSGGetFinalRelativeResidualNorm(HYPRE_StructSolver  solver,
-                                                      HYPRE_Real         *norm);
+                                                            HYPRE_Real         *norm);
 
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
diff --git a/external/hypre/src/struct_ls/HYPRE_struct_pcg.c b/external/hypre/src/struct_ls/HYPRE_struct_pcg.c
index 2ebb8b85..9bd14558 100644
--- a/external/hypre/src/struct_ls/HYPRE_struct_pcg.c
+++ b/external/hypre/src/struct_ls/HYPRE_struct_pcg.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -13,6 +13,8 @@
 HYPRE_Int
 HYPRE_StructPCGCreate( MPI_Comm comm, HYPRE_StructSolver *solver )
 {
+   HYPRE_UNUSED_VAR(comm);
+
    /* The function names with a PCG in them are in
       struct_ls/pcg_struct.c .  These functions do rather little -
       e.g., cast to the correct type - before calling something else.
@@ -40,7 +42,7 @@ HYPRE_StructPCGCreate( MPI_Comm comm, HYPRE_StructSolver *solver )
 HYPRE_Int
 HYPRE_StructPCGDestroy( HYPRE_StructSolver solver )
 {
-   return( hypre_PCGDestroy( (void *) solver ) );
+   return ( hypre_PCGDestroy( (void *) solver ) );
 }
 
 /*==========================================================================*/
@@ -51,10 +53,10 @@ HYPRE_StructPCGSetup( HYPRE_StructSolver solver,
                       HYPRE_StructVector b,
                       HYPRE_StructVector x      )
 {
-   return( HYPRE_PCGSetup( (HYPRE_Solver) solver,
-                           (HYPRE_Matrix) A,
-                           (HYPRE_Vector) b,
-                           (HYPRE_Vector) x ) );
+   return ( HYPRE_PCGSetup( (HYPRE_Solver) solver,
+                            (HYPRE_Matrix) A,
+                            (HYPRE_Vector) b,
+                            (HYPRE_Vector) x ) );
 }
 
 /*==========================================================================*/
@@ -65,10 +67,10 @@ HYPRE_StructPCGSolve( HYPRE_StructSolver solver,
                       HYPRE_StructVector b,
                       HYPRE_StructVector x      )
 {
-   return( HYPRE_PCGSolve( (HYPRE_Solver) solver,
-                           (HYPRE_Matrix) A,
-                           (HYPRE_Vector) b,
-                           (HYPRE_Vector) x ) );
+   return ( HYPRE_PCGSolve( (HYPRE_Solver) solver,
+                            (HYPRE_Matrix) A,
+                            (HYPRE_Vector) b,
+                            (HYPRE_Vector) x ) );
 }
 
 /*==========================================================================*/
@@ -77,7 +79,7 @@ HYPRE_Int
 HYPRE_StructPCGSetTol( HYPRE_StructSolver solver,
                        HYPRE_Real         tol    )
 {
-   return( HYPRE_PCGSetTol( (HYPRE_Solver) solver, tol ) );
+   return ( HYPRE_PCGSetTol( (HYPRE_Solver) solver, tol ) );
 }
 
 /*==========================================================================*/
@@ -86,7 +88,7 @@ HYPRE_Int
 HYPRE_StructPCGSetAbsoluteTol( HYPRE_StructSolver solver,
                                HYPRE_Real         tol    )
 {
-   return( HYPRE_PCGSetAbsoluteTol( (HYPRE_Solver) solver, tol ) );
+   return ( HYPRE_PCGSetAbsoluteTol( (HYPRE_Solver) solver, tol ) );
 }
 
 /*==========================================================================*/
@@ -95,7 +97,7 @@ HYPRE_Int
 HYPRE_StructPCGSetMaxIter( HYPRE_StructSolver solver,
                            HYPRE_Int          max_iter )
 {
-   return( HYPRE_PCGSetMaxIter( (HYPRE_Solver) solver, max_iter ) );
+   return ( HYPRE_PCGSetMaxIter( (HYPRE_Solver) solver, max_iter ) );
 }
 
 /*==========================================================================*/
@@ -104,7 +106,7 @@ HYPRE_Int
 HYPRE_StructPCGSetTwoNorm( HYPRE_StructSolver solver,
                            HYPRE_Int          two_norm )
 {
-   return( HYPRE_PCGSetTwoNorm( (HYPRE_Solver) solver, two_norm ) );
+   return ( HYPRE_PCGSetTwoNorm( (HYPRE_Solver) solver, two_norm ) );
 }
 
 /*==========================================================================*/
@@ -113,7 +115,7 @@ HYPRE_Int
 HYPRE_StructPCGSetRelChange( HYPRE_StructSolver solver,
                              HYPRE_Int          rel_change )
 {
-   return( HYPRE_PCGSetRelChange( (HYPRE_Solver) solver, rel_change ) );
+   return ( HYPRE_PCGSetRelChange( (HYPRE_Solver) solver, rel_change ) );
 }
 
 /*==========================================================================*/
@@ -124,10 +126,10 @@ HYPRE_StructPCGSetPrecond( HYPRE_StructSolver         solver,
                            HYPRE_PtrToStructSolverFcn precond_setup,
                            HYPRE_StructSolver         precond_solver )
 {
-   return( HYPRE_PCGSetPrecond( (HYPRE_Solver) solver,
-                                (HYPRE_PtrToSolverFcn) precond,
-                                (HYPRE_PtrToSolverFcn) precond_setup,
-                                (HYPRE_Solver) precond_solver ) );
+   return ( HYPRE_PCGSetPrecond( (HYPRE_Solver) solver,
+                                 (HYPRE_PtrToSolverFcn) precond,
+                                 (HYPRE_PtrToSolverFcn) precond_setup,
+                                 (HYPRE_Solver) precond_solver ) );
 }
 
 /*==========================================================================*/
@@ -136,7 +138,7 @@ HYPRE_Int
 HYPRE_StructPCGSetLogging( HYPRE_StructSolver solver,
                            HYPRE_Int          logging )
 {
-   return( HYPRE_PCGSetLogging( (HYPRE_Solver) solver, logging ) );
+   return ( HYPRE_PCGSetLogging( (HYPRE_Solver) solver, logging ) );
 }
 
 /*==========================================================================*/
@@ -145,7 +147,7 @@ HYPRE_Int
 HYPRE_StructPCGSetPrintLevel( HYPRE_StructSolver solver,
                               HYPRE_Int      print_level )
 {
-   return( HYPRE_PCGSetPrintLevel( (HYPRE_Solver) solver, print_level ) );
+   return ( HYPRE_PCGSetPrintLevel( (HYPRE_Solver) solver, print_level ) );
 }
 
 /*==========================================================================*/
@@ -154,7 +156,7 @@ HYPRE_Int
 HYPRE_StructPCGGetNumIterations( HYPRE_StructSolver  solver,
                                  HYPRE_Int          *num_iterations )
 {
-   return( HYPRE_PCGGetNumIterations( (HYPRE_Solver) solver, num_iterations ) );
+   return ( HYPRE_PCGGetNumIterations( (HYPRE_Solver) solver, num_iterations ) );
 }
 
 /*==========================================================================*/
@@ -163,7 +165,7 @@ HYPRE_Int
 HYPRE_StructPCGGetFinalRelativeResidualNorm( HYPRE_StructSolver  solver,
                                              HYPRE_Real         *norm   )
 {
-   return( HYPRE_PCGGetFinalRelativeResidualNorm( (HYPRE_Solver) solver, norm ) );
+   return ( HYPRE_PCGGetFinalRelativeResidualNorm( (HYPRE_Solver) solver, norm ) );
 }
 
 /*==========================================================================*/
@@ -174,6 +176,11 @@ HYPRE_StructDiagScaleSetup( HYPRE_StructSolver solver,
                             HYPRE_StructVector y,
                             HYPRE_StructVector x      )
 {
+   HYPRE_UNUSED_VAR(solver);
+   HYPRE_UNUSED_VAR(A);
+   HYPRE_UNUSED_VAR(y);
+   HYPRE_UNUSED_VAR(x);
+
    return hypre_error_flag;
 }
 
@@ -185,6 +192,8 @@ HYPRE_StructDiagScale( HYPRE_StructSolver solver,
                        HYPRE_StructVector Hy,
                        HYPRE_StructVector Hx      )
 {
+   HYPRE_UNUSED_VAR(solver);
+
    hypre_StructMatrix   *A = (hypre_StructMatrix *) HA;
    hypre_StructVector   *y = (hypre_StructVector *) Hy;
    hypre_StructVector   *x = (hypre_StructVector *) Hx;
@@ -241,4 +250,3 @@ HYPRE_StructDiagScale( HYPRE_StructSolver solver,
 
    return hypre_error_flag;
 }
-
diff --git a/external/hypre/src/struct_ls/HYPRE_struct_pfmg.c b/external/hypre/src/struct_ls/HYPRE_struct_pfmg.c
index 74659553..3a2899d9 100644
--- a/external/hypre/src/struct_ls/HYPRE_struct_pfmg.c
+++ b/external/hypre/src/struct_ls/HYPRE_struct_pfmg.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -24,7 +24,7 @@ HYPRE_StructPFMGCreate( MPI_Comm comm, HYPRE_StructSolver *solver )
 HYPRE_Int
 HYPRE_StructPFMGDestroy( HYPRE_StructSolver solver )
 {
-   return( hypre_PFMGDestroy( (void *) solver ) );
+   return ( hypre_PFMGDestroy( (void *) solver ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -36,10 +36,10 @@ HYPRE_StructPFMGSetup( HYPRE_StructSolver solver,
                        HYPRE_StructVector b,
                        HYPRE_StructVector x      )
 {
-   return( hypre_PFMGSetup( (void *) solver,
-                            (hypre_StructMatrix *) A,
-                            (hypre_StructVector *) b,
-                            (hypre_StructVector *) x ) );
+   return ( hypre_PFMGSetup( (void *) solver,
+                             (hypre_StructMatrix *) A,
+                             (hypre_StructVector *) b,
+                             (hypre_StructVector *) x ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -51,10 +51,10 @@ HYPRE_StructPFMGSolve( HYPRE_StructSolver solver,
                        HYPRE_StructVector b,
                        HYPRE_StructVector x      )
 {
-   return( hypre_PFMGSolve( (void *) solver,
-                            (hypre_StructMatrix *) A,
-                            (hypre_StructVector *) b,
-                            (hypre_StructVector *) x ) );
+   return ( hypre_PFMGSolve( (void *) solver,
+                             (hypre_StructMatrix *) A,
+                             (hypre_StructVector *) b,
+                             (hypre_StructVector *) x ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -64,14 +64,14 @@ HYPRE_Int
 HYPRE_StructPFMGSetTol( HYPRE_StructSolver solver,
                         HYPRE_Real         tol    )
 {
-   return( hypre_PFMGSetTol( (void *) solver, tol ) );
+   return ( hypre_PFMGSetTol( (void *) solver, tol ) );
 }
 
 HYPRE_Int
 HYPRE_StructPFMGGetTol( HYPRE_StructSolver solver,
                         HYPRE_Real       * tol    )
 {
-   return( hypre_PFMGGetTol( (void *) solver, tol ) );
+   return ( hypre_PFMGGetTol( (void *) solver, tol ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -81,14 +81,14 @@ HYPRE_Int
 HYPRE_StructPFMGSetMaxIter( HYPRE_StructSolver solver,
                             HYPRE_Int          max_iter  )
 {
-   return( hypre_PFMGSetMaxIter( (void *) solver, max_iter ) );
+   return ( hypre_PFMGSetMaxIter( (void *) solver, max_iter ) );
 }
 
 HYPRE_Int
 HYPRE_StructPFMGGetMaxIter( HYPRE_StructSolver solver,
                             HYPRE_Int        * max_iter  )
 {
-   return( hypre_PFMGGetMaxIter( (void *) solver, max_iter ) );
+   return ( hypre_PFMGGetMaxIter( (void *) solver, max_iter ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -98,14 +98,14 @@ HYPRE_Int
 HYPRE_StructPFMGSetMaxLevels( HYPRE_StructSolver solver,
                               HYPRE_Int          max_levels  )
 {
-   return( hypre_PFMGSetMaxLevels( (void *) solver, max_levels ) );
+   return ( hypre_PFMGSetMaxLevels( (void *) solver, max_levels ) );
 }
 
 HYPRE_Int
 HYPRE_StructPFMGGetMaxLevels( HYPRE_StructSolver solver,
                               HYPRE_Int        * max_levels  )
 {
-   return( hypre_PFMGGetMaxLevels( (void *) solver, max_levels ) );
+   return ( hypre_PFMGGetMaxLevels( (void *) solver, max_levels ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -115,14 +115,14 @@ HYPRE_Int
 HYPRE_StructPFMGSetRelChange( HYPRE_StructSolver solver,
                               HYPRE_Int          rel_change  )
 {
-   return( hypre_PFMGSetRelChange( (void *) solver, rel_change ) );
+   return ( hypre_PFMGSetRelChange( (void *) solver, rel_change ) );
 }
 
 HYPRE_Int
 HYPRE_StructPFMGGetRelChange( HYPRE_StructSolver solver,
                               HYPRE_Int        * rel_change  )
 {
-   return( hypre_PFMGGetRelChange( (void *) solver, rel_change ) );
+   return ( hypre_PFMGGetRelChange( (void *) solver, rel_change ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -131,14 +131,14 @@ HYPRE_StructPFMGGetRelChange( HYPRE_StructSolver solver,
 HYPRE_Int
 HYPRE_StructPFMGSetZeroGuess( HYPRE_StructSolver solver )
 {
-   return( hypre_PFMGSetZeroGuess( (void *) solver, 1 ) );
+   return ( hypre_PFMGSetZeroGuess( (void *) solver, 1 ) );
 }
 
 HYPRE_Int
 HYPRE_StructPFMGGetZeroGuess( HYPRE_StructSolver solver,
                               HYPRE_Int * zeroguess )
 {
-   return( hypre_PFMGGetZeroGuess( (void *) solver, zeroguess ) );
+   return ( hypre_PFMGGetZeroGuess( (void *) solver, zeroguess ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -147,7 +147,7 @@ HYPRE_StructPFMGGetZeroGuess( HYPRE_StructSolver solver,
 HYPRE_Int
 HYPRE_StructPFMGSetNonZeroGuess( HYPRE_StructSolver solver )
 {
-   return( hypre_PFMGSetZeroGuess( (void *) solver, 0 ) );
+   return ( hypre_PFMGSetZeroGuess( (void *) solver, 0 ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -159,27 +159,27 @@ HYPRE_Int
 HYPRE_StructPFMGSetRelaxType( HYPRE_StructSolver solver,
                               HYPRE_Int          relax_type )
 {
-   return( hypre_PFMGSetRelaxType( (void *) solver, relax_type) );
+   return ( hypre_PFMGSetRelaxType( (void *) solver, relax_type) );
 }
 
 HYPRE_Int
 HYPRE_StructPFMGGetRelaxType( HYPRE_StructSolver solver,
                               HYPRE_Int        * relax_type )
 {
-   return( hypre_PFMGGetRelaxType( (void *) solver, relax_type) );
+   return ( hypre_PFMGGetRelaxType( (void *) solver, relax_type) );
 }
 
 HYPRE_Int
 HYPRE_StructPFMGSetJacobiWeight(HYPRE_StructSolver solver,
                                 HYPRE_Real         weight)
 {
-   return( hypre_PFMGSetJacobiWeight( (void *) solver, weight) );
+   return ( hypre_PFMGSetJacobiWeight( (void *) solver, weight) );
 }
 HYPRE_Int
 HYPRE_StructPFMGGetJacobiWeight(HYPRE_StructSolver solver,
                                 HYPRE_Real        *weight)
 {
-   return( hypre_PFMGGetJacobiWeight( (void *) solver, weight) );
+   return ( hypre_PFMGGetJacobiWeight( (void *) solver, weight) );
 }
 
 /*--------------------------------------------------------------------------
@@ -189,14 +189,14 @@ HYPRE_Int
 HYPRE_StructPFMGSetRAPType( HYPRE_StructSolver solver,
                             HYPRE_Int          rap_type )
 {
-   return( hypre_PFMGSetRAPType( (void *) solver, rap_type) );
+   return ( hypre_PFMGSetRAPType( (void *) solver, rap_type) );
 }
 
 HYPRE_Int
 HYPRE_StructPFMGGetRAPType( HYPRE_StructSolver solver,
                             HYPRE_Int        * rap_type )
 {
-   return( hypre_PFMGGetRAPType( (void *) solver, rap_type) );
+   return ( hypre_PFMGGetRAPType( (void *) solver, rap_type) );
 }
 
 /*--------------------------------------------------------------------------
@@ -206,14 +206,14 @@ HYPRE_Int
 HYPRE_StructPFMGSetNumPreRelax( HYPRE_StructSolver solver,
                                 HYPRE_Int          num_pre_relax )
 {
-   return( hypre_PFMGSetNumPreRelax( (void *) solver, num_pre_relax) );
+   return ( hypre_PFMGSetNumPreRelax( (void *) solver, num_pre_relax) );
 }
 
 HYPRE_Int
 HYPRE_StructPFMGGetNumPreRelax( HYPRE_StructSolver solver,
                                 HYPRE_Int        * num_pre_relax )
 {
-   return( hypre_PFMGGetNumPreRelax( (void *) solver, num_pre_relax) );
+   return ( hypre_PFMGGetNumPreRelax( (void *) solver, num_pre_relax) );
 }
 
 /*--------------------------------------------------------------------------
@@ -223,14 +223,14 @@ HYPRE_Int
 HYPRE_StructPFMGSetNumPostRelax( HYPRE_StructSolver solver,
                                  HYPRE_Int          num_post_relax )
 {
-   return( hypre_PFMGSetNumPostRelax( (void *) solver, num_post_relax) );
+   return ( hypre_PFMGSetNumPostRelax( (void *) solver, num_post_relax) );
 }
 
 HYPRE_Int
 HYPRE_StructPFMGGetNumPostRelax( HYPRE_StructSolver solver,
                                  HYPRE_Int        * num_post_relax )
 {
-   return( hypre_PFMGGetNumPostRelax( (void *) solver, num_post_relax) );
+   return ( hypre_PFMGGetNumPostRelax( (void *) solver, num_post_relax) );
 }
 
 /*--------------------------------------------------------------------------
@@ -240,14 +240,14 @@ HYPRE_Int
 HYPRE_StructPFMGSetSkipRelax( HYPRE_StructSolver solver,
                               HYPRE_Int          skip_relax )
 {
-   return( hypre_PFMGSetSkipRelax( (void *) solver, skip_relax) );
+   return ( hypre_PFMGSetSkipRelax( (void *) solver, skip_relax) );
 }
 
 HYPRE_Int
 HYPRE_StructPFMGGetSkipRelax( HYPRE_StructSolver solver,
                               HYPRE_Int        * skip_relax )
 {
-   return( hypre_PFMGGetSkipRelax( (void *) solver, skip_relax) );
+   return ( hypre_PFMGGetSkipRelax( (void *) solver, skip_relax) );
 }
 
 /*--------------------------------------------------------------------------
@@ -257,7 +257,7 @@ HYPRE_Int
 HYPRE_StructPFMGSetDxyz( HYPRE_StructSolver  solver,
                          HYPRE_Real         *dxyz   )
 {
-   return( hypre_PFMGSetDxyz( (void *) solver, dxyz) );
+   return ( hypre_PFMGSetDxyz( (void *) solver, dxyz) );
 }
 
 /*--------------------------------------------------------------------------
@@ -267,14 +267,14 @@ HYPRE_Int
 HYPRE_StructPFMGSetLogging( HYPRE_StructSolver solver,
                             HYPRE_Int          logging )
 {
-   return( hypre_PFMGSetLogging( (void *) solver, logging) );
+   return ( hypre_PFMGSetLogging( (void *) solver, logging) );
 }
 
 HYPRE_Int
 HYPRE_StructPFMGGetLogging( HYPRE_StructSolver solver,
                             HYPRE_Int        * logging )
 {
-   return( hypre_PFMGGetLogging( (void *) solver, logging) );
+   return ( hypre_PFMGGetLogging( (void *) solver, logging) );
 }
 
 /*--------------------------------------------------------------------------
@@ -284,14 +284,14 @@ HYPRE_Int
 HYPRE_StructPFMGSetPrintLevel( HYPRE_StructSolver solver,
                                HYPRE_Int            print_level )
 {
-   return( hypre_PFMGSetPrintLevel( (void *) solver, print_level) );
+   return ( hypre_PFMGSetPrintLevel( (void *) solver, print_level) );
 }
 
 HYPRE_Int
 HYPRE_StructPFMGGetPrintLevel( HYPRE_StructSolver solver,
                                HYPRE_Int          * print_level )
 {
-   return( hypre_PFMGGetPrintLevel( (void *) solver, print_level) );
+   return ( hypre_PFMGGetPrintLevel( (void *) solver, print_level) );
 }
 
 /*--------------------------------------------------------------------------
@@ -301,7 +301,7 @@ HYPRE_Int
 HYPRE_StructPFMGGetNumIterations( HYPRE_StructSolver  solver,
                                   HYPRE_Int          *num_iterations )
 {
-   return( hypre_PFMGGetNumIterations( (void *) solver, num_iterations ) );
+   return ( hypre_PFMGGetNumIterations( (void *) solver, num_iterations ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -311,14 +311,14 @@ HYPRE_Int
 HYPRE_StructPFMGGetFinalRelativeResidualNorm( HYPRE_StructSolver  solver,
                                               HYPRE_Real         *norm   )
 {
-   return( hypre_PFMGGetFinalRelativeResidualNorm( (void *) solver, norm ) );
+   return ( hypre_PFMGGetFinalRelativeResidualNorm( (void *) solver, norm ) );
 }
 
-#if 0 //defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#if 0 //defined(HYPRE_USING_GPU)
 HYPRE_Int
 HYPRE_StructPFMGSetDeviceLevel( HYPRE_StructSolver  solver,
                                 HYPRE_Int   device_level  )
 {
-   return( hypre_PFMGSetDeviceLevel( (void *) solver, device_level ) );
+   return ( hypre_PFMGSetDeviceLevel( (void *) solver, device_level ) );
 }
 #endif
diff --git a/external/hypre/src/struct_ls/HYPRE_struct_smg.c b/external/hypre/src/struct_ls/HYPRE_struct_smg.c
index 87e6c36d..e95962bb 100644
--- a/external/hypre/src/struct_ls/HYPRE_struct_smg.c
+++ b/external/hypre/src/struct_ls/HYPRE_struct_smg.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -24,7 +24,7 @@ HYPRE_StructSMGCreate( MPI_Comm comm, HYPRE_StructSolver *solver )
 HYPRE_Int
 HYPRE_StructSMGDestroy( HYPRE_StructSolver solver )
 {
-   return( hypre_SMGDestroy( (void *) solver ) );
+   return ( hypre_SMGDestroy( (void *) solver ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -36,10 +36,10 @@ HYPRE_StructSMGSetup( HYPRE_StructSolver solver,
                       HYPRE_StructVector b,
                       HYPRE_StructVector x      )
 {
-   return( hypre_SMGSetup( (void *) solver,
-                           (hypre_StructMatrix *) A,
-                           (hypre_StructVector *) b,
-                           (hypre_StructVector *) x ) );
+   return ( hypre_SMGSetup( (void *) solver,
+                            (hypre_StructMatrix *) A,
+                            (hypre_StructVector *) b,
+                            (hypre_StructVector *) x ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -51,10 +51,10 @@ HYPRE_StructSMGSolve( HYPRE_StructSolver solver,
                       HYPRE_StructVector b,
                       HYPRE_StructVector x      )
 {
-   return( hypre_SMGSolve( (void *) solver,
-                           (hypre_StructMatrix *) A,
-                           (hypre_StructVector *) b,
-                           (hypre_StructVector *) x ) );
+   return ( hypre_SMGSolve( (void *) solver,
+                            (hypre_StructMatrix *) A,
+                            (hypre_StructVector *) b,
+                            (hypre_StructVector *) x ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -64,14 +64,14 @@ HYPRE_Int
 HYPRE_StructSMGSetMemoryUse( HYPRE_StructSolver solver,
                              HYPRE_Int          memory_use )
 {
-   return( hypre_SMGSetMemoryUse( (void *) solver, memory_use ) );
+   return ( hypre_SMGSetMemoryUse( (void *) solver, memory_use ) );
 }
 
 HYPRE_Int
 HYPRE_StructSMGGetMemoryUse( HYPRE_StructSolver solver,
                              HYPRE_Int        * memory_use )
 {
-   return( hypre_SMGGetMemoryUse( (void *) solver, memory_use ) );
+   return ( hypre_SMGGetMemoryUse( (void *) solver, memory_use ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -81,14 +81,14 @@ HYPRE_Int
 HYPRE_StructSMGSetTol( HYPRE_StructSolver solver,
                        HYPRE_Real         tol    )
 {
-   return( hypre_SMGSetTol( (void *) solver, tol ) );
+   return ( hypre_SMGSetTol( (void *) solver, tol ) );
 }
 
 HYPRE_Int
 HYPRE_StructSMGGetTol( HYPRE_StructSolver solver,
                        HYPRE_Real       * tol    )
 {
-   return( hypre_SMGGetTol( (void *) solver, tol ) );
+   return ( hypre_SMGGetTol( (void *) solver, tol ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -98,14 +98,14 @@ HYPRE_Int
 HYPRE_StructSMGSetMaxIter( HYPRE_StructSolver solver,
                            HYPRE_Int          max_iter  )
 {
-   return( hypre_SMGSetMaxIter( (void *) solver, max_iter ) );
+   return ( hypre_SMGSetMaxIter( (void *) solver, max_iter ) );
 }
 
 HYPRE_Int
 HYPRE_StructSMGGetMaxIter( HYPRE_StructSolver solver,
                            HYPRE_Int        * max_iter  )
 {
-   return( hypre_SMGGetMaxIter( (void *) solver, max_iter ) );
+   return ( hypre_SMGGetMaxIter( (void *) solver, max_iter ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -115,14 +115,14 @@ HYPRE_Int
 HYPRE_StructSMGSetRelChange( HYPRE_StructSolver solver,
                              HYPRE_Int          rel_change  )
 {
-   return( hypre_SMGSetRelChange( (void *) solver, rel_change ) );
+   return ( hypre_SMGSetRelChange( (void *) solver, rel_change ) );
 }
 
 HYPRE_Int
 HYPRE_StructSMGGetRelChange( HYPRE_StructSolver solver,
                              HYPRE_Int        * rel_change  )
 {
-   return( hypre_SMGGetRelChange( (void *) solver, rel_change ) );
+   return ( hypre_SMGGetRelChange( (void *) solver, rel_change ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -131,14 +131,14 @@ HYPRE_StructSMGGetRelChange( HYPRE_StructSolver solver,
 HYPRE_Int
 HYPRE_StructSMGSetZeroGuess( HYPRE_StructSolver solver )
 {
-   return( hypre_SMGSetZeroGuess( (void *) solver, 1 ) );
+   return ( hypre_SMGSetZeroGuess( (void *) solver, 1 ) );
 }
 
 HYPRE_Int
 HYPRE_StructSMGGetZeroGuess( HYPRE_StructSolver solver,
                              HYPRE_Int * zeroguess )
 {
-   return( hypre_SMGGetZeroGuess( (void *) solver, zeroguess ) );
+   return ( hypre_SMGGetZeroGuess( (void *) solver, zeroguess ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -147,7 +147,7 @@ HYPRE_StructSMGGetZeroGuess( HYPRE_StructSolver solver,
 HYPRE_Int
 HYPRE_StructSMGSetNonZeroGuess( HYPRE_StructSolver solver )
 {
-   return( hypre_SMGSetZeroGuess( (void *) solver, 0 ) );
+   return ( hypre_SMGSetZeroGuess( (void *) solver, 0 ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -158,14 +158,14 @@ HYPRE_Int
 HYPRE_StructSMGSetNumPreRelax( HYPRE_StructSolver solver,
                                HYPRE_Int          num_pre_relax )
 {
-   return( hypre_SMGSetNumPreRelax( (void *) solver, num_pre_relax) );
+   return ( hypre_SMGSetNumPreRelax( (void *) solver, num_pre_relax) );
 }
 
 HYPRE_Int
 HYPRE_StructSMGGetNumPreRelax( HYPRE_StructSolver solver,
                                HYPRE_Int        * num_pre_relax )
 {
-   return( hypre_SMGGetNumPreRelax( (void *) solver, num_pre_relax) );
+   return ( hypre_SMGGetNumPreRelax( (void *) solver, num_pre_relax) );
 }
 
 /*--------------------------------------------------------------------------
@@ -175,14 +175,14 @@ HYPRE_Int
 HYPRE_StructSMGSetNumPostRelax( HYPRE_StructSolver solver,
                                 HYPRE_Int          num_post_relax )
 {
-   return( hypre_SMGSetNumPostRelax( (void *) solver, num_post_relax) );
+   return ( hypre_SMGSetNumPostRelax( (void *) solver, num_post_relax) );
 }
 
 HYPRE_Int
 HYPRE_StructSMGGetNumPostRelax( HYPRE_StructSolver solver,
                                 HYPRE_Int        * num_post_relax )
 {
-   return( hypre_SMGGetNumPostRelax( (void *) solver, num_post_relax) );
+   return ( hypre_SMGGetNumPostRelax( (void *) solver, num_post_relax) );
 }
 
 /*--------------------------------------------------------------------------
@@ -192,14 +192,14 @@ HYPRE_Int
 HYPRE_StructSMGSetLogging( HYPRE_StructSolver solver,
                            HYPRE_Int          logging )
 {
-   return( hypre_SMGSetLogging( (void *) solver, logging) );
+   return ( hypre_SMGSetLogging( (void *) solver, logging) );
 }
 
 HYPRE_Int
 HYPRE_StructSMGGetLogging( HYPRE_StructSolver solver,
                            HYPRE_Int        * logging )
 {
-   return( hypre_SMGGetLogging( (void *) solver, logging) );
+   return ( hypre_SMGGetLogging( (void *) solver, logging) );
 }
 
 /*--------------------------------------------------------------------------
@@ -209,14 +209,14 @@ HYPRE_Int
 HYPRE_StructSMGSetPrintLevel( HYPRE_StructSolver solver,
                               HYPRE_Int  print_level )
 {
-   return( hypre_SMGSetPrintLevel( (void *) solver, print_level) );
+   return ( hypre_SMGSetPrintLevel( (void *) solver, print_level) );
 }
 
 HYPRE_Int
 HYPRE_StructSMGGetPrintLevel( HYPRE_StructSolver solver,
                               HYPRE_Int      * print_level )
 {
-   return( hypre_SMGGetPrintLevel( (void *) solver, print_level) );
+   return ( hypre_SMGGetPrintLevel( (void *) solver, print_level) );
 }
 
 /*--------------------------------------------------------------------------
@@ -226,7 +226,7 @@ HYPRE_Int
 HYPRE_StructSMGGetNumIterations( HYPRE_StructSolver  solver,
                                  HYPRE_Int          *num_iterations )
 {
-   return( hypre_SMGGetNumIterations( (void *) solver, num_iterations ) );
+   return ( hypre_SMGGetNumIterations( (void *) solver, num_iterations ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -236,7 +236,7 @@ HYPRE_Int
 HYPRE_StructSMGGetFinalRelativeResidualNorm( HYPRE_StructSolver  solver,
                                              HYPRE_Real         *norm   )
 {
-   return( hypre_SMGGetFinalRelativeResidualNorm( (void *) solver, norm ) );
+   return ( hypre_SMGGetFinalRelativeResidualNorm( (void *) solver, norm ) );
 }
 
 #if 0 //defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
diff --git a/external/hypre/src/struct_ls/HYPRE_struct_sparse_msg.c b/external/hypre/src/struct_ls/HYPRE_struct_sparse_msg.c
index b18b007f..5f9f8feb 100644
--- a/external/hypre/src/struct_ls/HYPRE_struct_sparse_msg.c
+++ b/external/hypre/src/struct_ls/HYPRE_struct_sparse_msg.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -29,42 +29,42 @@ HYPRE_StructSparseMSGCreate( MPI_Comm comm, HYPRE_StructSolver *solver )
  * HYPRE_StructSparseMSGDestroy
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_StructSparseMSGDestroy( HYPRE_StructSolver solver )
 {
-   return( hypre_SparseMSGDestroy( (void *) solver ) );
+   return ( hypre_SparseMSGDestroy( (void *) solver ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_StructSparseMSGSetup
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_StructSparseMSGSetup( HYPRE_StructSolver solver,
-                       HYPRE_StructMatrix A,
-                       HYPRE_StructVector b,
-                       HYPRE_StructVector x      )
+                            HYPRE_StructMatrix A,
+                            HYPRE_StructVector b,
+                            HYPRE_StructVector x      )
 {
-   return( hypre_SparseMSGSetup( (void *) solver,
-                            (hypre_StructMatrix *) A,
-                            (hypre_StructVector *) b,
-                            (hypre_StructVector *) x ) );
+   return ( hypre_SparseMSGSetup( (void *) solver,
+                                  (hypre_StructMatrix *) A,
+                                  (hypre_StructVector *) b,
+                                  (hypre_StructVector *) x ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_StructSparseMSGSolve
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 HYPRE_StructSparseMSGSolve( HYPRE_StructSolver solver,
-                       HYPRE_StructMatrix A,
-                       HYPRE_StructVector b,
-                       HYPRE_StructVector x      )
+                            HYPRE_StructMatrix A,
+                            HYPRE_StructVector b,
+                            HYPRE_StructVector x      )
 {
-   return( hypre_SparseMSGSolve( (void *) solver,
-                            (hypre_StructMatrix *) A,
-                            (hypre_StructVector *) b,
-                            (hypre_StructVector *) x ) );
+   return ( hypre_SparseMSGSolve( (void *) solver,
+                                  (hypre_StructMatrix *) A,
+                                  (hypre_StructVector *) b,
+                                  (hypre_StructVector *) x ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -73,9 +73,9 @@ HYPRE_StructSparseMSGSolve( HYPRE_StructSolver solver,
 
 HYPRE_Int
 HYPRE_StructSparseMSGSetTol( HYPRE_StructSolver solver,
-                        HYPRE_Real         tol    )
+                             HYPRE_Real         tol    )
 {
-   return( hypre_SparseMSGSetTol( (void *) solver, tol ) );
+   return ( hypre_SparseMSGSetTol( (void *) solver, tol ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -86,7 +86,7 @@ HYPRE_Int
 HYPRE_StructSparseMSGSetMaxIter( HYPRE_StructSolver solver,
                                  HYPRE_Int          max_iter  )
 {
-   return( hypre_SparseMSGSetMaxIter( (void *) solver, max_iter ) );
+   return ( hypre_SparseMSGSetMaxIter( (void *) solver, max_iter ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -97,7 +97,7 @@ HYPRE_Int
 HYPRE_StructSparseMSGSetJump( HYPRE_StructSolver solver,
                               HYPRE_Int              jump )
 {
-   return( hypre_SparseMSGSetJump( (void *) solver, jump ) );
+   return ( hypre_SparseMSGSetJump( (void *) solver, jump ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -108,27 +108,27 @@ HYPRE_Int
 HYPRE_StructSparseMSGSetRelChange( HYPRE_StructSolver solver,
                                    HYPRE_Int          rel_change  )
 {
-   return( hypre_SparseMSGSetRelChange( (void *) solver, rel_change ) );
+   return ( hypre_SparseMSGSetRelChange( (void *) solver, rel_change ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_StructSparseMSGSetZeroGuess
  *--------------------------------------------------------------------------*/
- 
+
 HYPRE_Int
 HYPRE_StructSparseMSGSetZeroGuess( HYPRE_StructSolver solver )
 {
-   return( hypre_SparseMSGSetZeroGuess( (void *) solver, 1 ) );
+   return ( hypre_SparseMSGSetZeroGuess( (void *) solver, 1 ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_StructSparseMSGSetNonZeroGuess
  *--------------------------------------------------------------------------*/
- 
+
 HYPRE_Int
 HYPRE_StructSparseMSGSetNonZeroGuess( HYPRE_StructSolver solver )
 {
-   return( hypre_SparseMSGSetZeroGuess( (void *) solver, 0 ) );
+   return ( hypre_SparseMSGSetZeroGuess( (void *) solver, 0 ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -137,9 +137,9 @@ HYPRE_StructSparseMSGSetNonZeroGuess( HYPRE_StructSolver solver )
 
 HYPRE_Int
 HYPRE_StructSparseMSGSetRelaxType( HYPRE_StructSolver solver,
-                              HYPRE_Int          relax_type )
+                                   HYPRE_Int          relax_type )
 {
-   return( hypre_SparseMSGSetRelaxType( (void *) solver, relax_type) );
+   return ( hypre_SparseMSGSetRelaxType( (void *) solver, relax_type) );
 }
 
 /*--------------------------------------------------------------------------
@@ -149,7 +149,7 @@ HYPRE_Int
 HYPRE_StructSparseMSGSetJacobiWeight(HYPRE_StructSolver solver,
                                      HYPRE_Real         weight)
 {
-   return( hypre_SparseMSGSetJacobiWeight( (void *) solver, weight) );
+   return ( hypre_SparseMSGSetJacobiWeight( (void *) solver, weight) );
 }
 
 
@@ -161,7 +161,7 @@ HYPRE_Int
 HYPRE_StructSparseMSGSetNumPreRelax( HYPRE_StructSolver solver,
                                      HYPRE_Int          num_pre_relax )
 {
-   return( hypre_SparseMSGSetNumPreRelax( (void *) solver, num_pre_relax) );
+   return ( hypre_SparseMSGSetNumPreRelax( (void *) solver, num_pre_relax) );
 }
 
 /*--------------------------------------------------------------------------
@@ -170,9 +170,9 @@ HYPRE_StructSparseMSGSetNumPreRelax( HYPRE_StructSolver solver,
 
 HYPRE_Int
 HYPRE_StructSparseMSGSetNumPostRelax( HYPRE_StructSolver solver,
-                                 HYPRE_Int          num_post_relax )
+                                      HYPRE_Int          num_post_relax )
 {
-   return( hypre_SparseMSGSetNumPostRelax( (void *) solver, num_post_relax) );
+   return ( hypre_SparseMSGSetNumPostRelax( (void *) solver, num_post_relax) );
 }
 
 /*--------------------------------------------------------------------------
@@ -181,9 +181,9 @@ HYPRE_StructSparseMSGSetNumPostRelax( HYPRE_StructSolver solver,
 
 HYPRE_Int
 HYPRE_StructSparseMSGSetNumFineRelax( HYPRE_StructSolver solver,
-                                 HYPRE_Int          num_fine_relax )
+                                      HYPRE_Int          num_fine_relax )
 {
-   return( hypre_SparseMSGSetNumFineRelax( (void *) solver, num_fine_relax) );
+   return ( hypre_SparseMSGSetNumFineRelax( (void *) solver, num_fine_relax) );
 }
 
 /*--------------------------------------------------------------------------
@@ -194,7 +194,7 @@ HYPRE_Int
 HYPRE_StructSparseMSGSetLogging( HYPRE_StructSolver solver,
                                  HYPRE_Int          logging )
 {
-   return( hypre_SparseMSGSetLogging( (void *) solver, logging) );
+   return ( hypre_SparseMSGSetLogging( (void *) solver, logging) );
 }
 
 /*--------------------------------------------------------------------------
@@ -205,7 +205,7 @@ HYPRE_Int
 HYPRE_StructSparseMSGSetPrintLevel( HYPRE_StructSolver solver,
                                     HYPRE_Int        print_level )
 {
-   return( hypre_SparseMSGSetPrintLevel( (void *) solver, print_level) );
+   return ( hypre_SparseMSGSetPrintLevel( (void *) solver, print_level) );
 }
 
 /*--------------------------------------------------------------------------
@@ -214,9 +214,9 @@ HYPRE_StructSparseMSGSetPrintLevel( HYPRE_StructSolver solver,
 
 HYPRE_Int
 HYPRE_StructSparseMSGGetNumIterations( HYPRE_StructSolver  solver,
-                                  HYPRE_Int          *num_iterations )
+                                       HYPRE_Int          *num_iterations )
 {
-   return( hypre_SparseMSGGetNumIterations( (void *) solver, num_iterations ) );
+   return ( hypre_SparseMSGGetNumIterations( (void *) solver, num_iterations ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -227,6 +227,6 @@ HYPRE_Int
 HYPRE_StructSparseMSGGetFinalRelativeResidualNorm( HYPRE_StructSolver  solver,
                                                    HYPRE_Real         *norm   )
 {
-   return( hypre_SparseMSGGetFinalRelativeResidualNorm( (void *) solver, norm ) );
+   return ( hypre_SparseMSGGetFinalRelativeResidualNorm( (void *) solver, norm ) );
 }
 
diff --git a/external/hypre/src/struct_ls/_hypre_struct_ls.h b/external/hypre/src/struct_ls/_hypre_struct_ls.h
index f8a753e6..867a641e 100644
--- a/external/hypre/src/struct_ls/_hypre_struct_ls.h
+++ b/external/hypre/src/struct_ls/_hypre_struct_ls.h
@@ -19,25 +19,33 @@ extern "C" {
 #endif
 
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
  ******************************************************************************/
 
 /* coarsen.c */
-HYPRE_Int hypre_StructMapFineToCoarse ( hypre_Index findex , hypre_Index index , hypre_Index stride , hypre_Index cindex );
-HYPRE_Int hypre_StructMapCoarseToFine ( hypre_Index cindex , hypre_Index index , hypre_Index stride , hypre_Index findex );
-HYPRE_Int hypre_StructCoarsen ( hypre_StructGrid *fgrid , hypre_Index index , hypre_Index stride , HYPRE_Int prune , hypre_StructGrid **cgrid_ptr );
+HYPRE_Int hypre_StructMapFineToCoarse ( hypre_Index findex, hypre_Index index, hypre_Index stride,
+                                        hypre_Index cindex );
+HYPRE_Int hypre_StructMapCoarseToFine ( hypre_Index cindex, hypre_Index index, hypre_Index stride,
+                                        hypre_Index findex );
+HYPRE_Int hypre_StructCoarsen ( hypre_StructGrid *fgrid, hypre_Index index, hypre_Index stride,
+                                HYPRE_Int prune, hypre_StructGrid **cgrid_ptr );
 
 /* cyclic_reduction.c */
 void *hypre_CyclicReductionCreate ( MPI_Comm comm );
-hypre_StructMatrix *hypre_CycRedCreateCoarseOp ( hypre_StructMatrix *A , hypre_StructGrid *coarse_grid , HYPRE_Int cdir );
-HYPRE_Int hypre_CycRedSetupCoarseOp ( hypre_StructMatrix *A , hypre_StructMatrix *Ac , hypre_Index cindex , hypre_Index cstride, HYPRE_Int cdir );
-HYPRE_Int hypre_CyclicReductionSetup ( void *cyc_red_vdata , hypre_StructMatrix *A , hypre_StructVector *b , hypre_StructVector *x );
-HYPRE_Int hypre_CyclicReduction ( void *cyc_red_vdata , hypre_StructMatrix *A , hypre_StructVector *b , hypre_StructVector *x );
-HYPRE_Int hypre_CyclicReductionSetCDir ( void *cyc_red_vdata , HYPRE_Int cdir );
-HYPRE_Int hypre_CyclicReductionSetBase ( void *cyc_red_vdata , hypre_Index base_index , hypre_Index base_stride );
+hypre_StructMatrix *hypre_CycRedCreateCoarseOp ( hypre_StructMatrix *A,
+                                                 hypre_StructGrid *coarse_grid, HYPRE_Int cdir );
+HYPRE_Int hypre_CycRedSetupCoarseOp ( hypre_StructMatrix *A, hypre_StructMatrix *Ac,
+                                      hypre_Index cindex, hypre_Index cstride, HYPRE_Int cdir );
+HYPRE_Int hypre_CyclicReductionSetup ( void *cyc_red_vdata, hypre_StructMatrix *A,
+                                       hypre_StructVector *b, hypre_StructVector *x );
+HYPRE_Int hypre_CyclicReduction ( void *cyc_red_vdata, hypre_StructMatrix *A, hypre_StructVector *b,
+                                  hypre_StructVector *x );
+HYPRE_Int hypre_CyclicReductionSetCDir ( void *cyc_red_vdata, HYPRE_Int cdir );
+HYPRE_Int hypre_CyclicReductionSetBase ( void *cyc_red_vdata, hypre_Index base_index,
+                                         hypre_Index base_stride );
 HYPRE_Int hypre_CyclicReductionDestroy ( void *cyc_red_vdata );
 HYPRE_Int hypre_CyclicReductionSetMaxLevel( void   *cyc_red_vdata, HYPRE_Int   max_level  );
 
@@ -47,33 +55,37 @@ HYPRE_Int hypre_Log2 ( HYPRE_Int p );
 /* hybrid.c */
 void *hypre_HybridCreate ( MPI_Comm comm );
 HYPRE_Int hypre_HybridDestroy ( void *hybrid_vdata );
-HYPRE_Int hypre_HybridSetTol ( void *hybrid_vdata , HYPRE_Real tol );
-HYPRE_Int hypre_HybridSetConvergenceTol ( void *hybrid_vdata , HYPRE_Real cf_tol );
-HYPRE_Int hypre_HybridSetDSCGMaxIter ( void *hybrid_vdata , HYPRE_Int dscg_max_its );
-HYPRE_Int hypre_HybridSetPCGMaxIter ( void *hybrid_vdata , HYPRE_Int pcg_max_its );
-HYPRE_Int hypre_HybridSetPCGAbsoluteTolFactor ( void *hybrid_vdata , HYPRE_Real pcg_atolf );
-HYPRE_Int hypre_HybridSetTwoNorm ( void *hybrid_vdata , HYPRE_Int two_norm );
-HYPRE_Int hypre_HybridSetStopCrit ( void *hybrid_vdata , HYPRE_Int stop_crit );
-HYPRE_Int hypre_HybridSetRelChange ( void *hybrid_vdata , HYPRE_Int rel_change );
-HYPRE_Int hypre_HybridSetSolverType ( void *hybrid_vdata , HYPRE_Int solver_type );
-HYPRE_Int hypre_HybridSetRecomputeResidual( void *hybrid_vdata , HYPRE_Int recompute_residual );
-HYPRE_Int hypre_HybridGetRecomputeResidual( void *hybrid_vdata , HYPRE_Int *recompute_residual );
-HYPRE_Int hypre_HybridSetRecomputeResidualP( void *hybrid_vdata , HYPRE_Int recompute_residual_p );
-HYPRE_Int hypre_HybridGetRecomputeResidualP( void *hybrid_vdata , HYPRE_Int *recompute_residual_p );
-HYPRE_Int hypre_HybridSetKDim ( void *hybrid_vdata , HYPRE_Int k_dim );
-HYPRE_Int hypre_HybridSetPrecond ( void *pcg_vdata , HYPRE_Int (*pcg_precond_solve )(void*, void*, void*, void*), HYPRE_Int (*pcg_precond_setup )(void*, void*, void*, void*), void *pcg_precond );
-HYPRE_Int hypre_HybridSetLogging ( void *hybrid_vdata , HYPRE_Int logging );
-HYPRE_Int hypre_HybridSetPrintLevel ( void *hybrid_vdata , HYPRE_Int print_level );
-HYPRE_Int hypre_HybridGetNumIterations ( void *hybrid_vdata , HYPRE_Int *num_its );
-HYPRE_Int hypre_HybridGetDSCGNumIterations ( void *hybrid_vdata , HYPRE_Int *dscg_num_its );
-HYPRE_Int hypre_HybridGetPCGNumIterations ( void *hybrid_vdata , HYPRE_Int *pcg_num_its );
-HYPRE_Int hypre_HybridGetFinalRelativeResidualNorm ( void *hybrid_vdata , HYPRE_Real *final_rel_res_norm );
-HYPRE_Int hypre_HybridSetup ( void *hybrid_vdata , hypre_StructMatrix *A , hypre_StructVector *b , hypre_StructVector *x );
-HYPRE_Int hypre_HybridSolve ( void *hybrid_vdata , hypre_StructMatrix *A , hypre_StructVector *b , hypre_StructVector *x );
+HYPRE_Int hypre_HybridSetTol ( void *hybrid_vdata, HYPRE_Real tol );
+HYPRE_Int hypre_HybridSetConvergenceTol ( void *hybrid_vdata, HYPRE_Real cf_tol );
+HYPRE_Int hypre_HybridSetDSCGMaxIter ( void *hybrid_vdata, HYPRE_Int dscg_max_its );
+HYPRE_Int hypre_HybridSetPCGMaxIter ( void *hybrid_vdata, HYPRE_Int pcg_max_its );
+HYPRE_Int hypre_HybridSetPCGAbsoluteTolFactor ( void *hybrid_vdata, HYPRE_Real pcg_atolf );
+HYPRE_Int hypre_HybridSetTwoNorm ( void *hybrid_vdata, HYPRE_Int two_norm );
+HYPRE_Int hypre_HybridSetStopCrit ( void *hybrid_vdata, HYPRE_Int stop_crit );
+HYPRE_Int hypre_HybridSetRelChange ( void *hybrid_vdata, HYPRE_Int rel_change );
+HYPRE_Int hypre_HybridSetSolverType ( void *hybrid_vdata, HYPRE_Int solver_type );
+HYPRE_Int hypre_HybridSetRecomputeResidual( void *hybrid_vdata, HYPRE_Int recompute_residual );
+HYPRE_Int hypre_HybridGetRecomputeResidual( void *hybrid_vdata, HYPRE_Int *recompute_residual );
+HYPRE_Int hypre_HybridSetRecomputeResidualP( void *hybrid_vdata, HYPRE_Int recompute_residual_p );
+HYPRE_Int hypre_HybridGetRecomputeResidualP( void *hybrid_vdata, HYPRE_Int *recompute_residual_p );
+HYPRE_Int hypre_HybridSetKDim ( void *hybrid_vdata, HYPRE_Int k_dim );
+HYPRE_Int hypre_HybridSetPrecond ( void *pcg_vdata, HYPRE_Int (*pcg_precond_solve )(void*, void*,
+                                                                                    void*, void*), HYPRE_Int (*pcg_precond_setup )(void*, void*, void*, void*), void *pcg_precond );
+HYPRE_Int hypre_HybridSetLogging ( void *hybrid_vdata, HYPRE_Int logging );
+HYPRE_Int hypre_HybridSetPrintLevel ( void *hybrid_vdata, HYPRE_Int print_level );
+HYPRE_Int hypre_HybridGetNumIterations ( void *hybrid_vdata, HYPRE_Int *num_its );
+HYPRE_Int hypre_HybridGetDSCGNumIterations ( void *hybrid_vdata, HYPRE_Int *dscg_num_its );
+HYPRE_Int hypre_HybridGetPCGNumIterations ( void *hybrid_vdata, HYPRE_Int *pcg_num_its );
+HYPRE_Int hypre_HybridGetFinalRelativeResidualNorm ( void *hybrid_vdata,
+                                                     HYPRE_Real *final_rel_res_norm );
+HYPRE_Int hypre_HybridSetup ( void *hybrid_vdata, hypre_StructMatrix *A, hypre_StructVector *b,
+                              hypre_StructVector *x );
+HYPRE_Int hypre_HybridSolve ( void *hybrid_vdata, hypre_StructMatrix *A, hypre_StructVector *b,
+                              hypre_StructVector *x );
 
 /* HYPRE_struct_int.c */
-HYPRE_Int hypre_StructVectorSetRandomValues ( hypre_StructVector *vector , HYPRE_Int seed );
-HYPRE_Int hypre_StructSetRandomValues ( void *v , HYPRE_Int seed );
+HYPRE_Int hypre_StructVectorSetRandomValues ( hypre_StructVector *vector, HYPRE_Int seed );
+HYPRE_Int hypre_StructSetRandomValues ( void *v, HYPRE_Int seed );
 
 /* HYPRE_struct_pfmg.c */
 HYPRE_Int hypre_PFMGSetDeviceLevel( void *pfmg_vdata, HYPRE_Int   device_level  );
@@ -81,257 +93,405 @@ HYPRE_Int hypre_PFMGSetDeviceLevel( void *pfmg_vdata, HYPRE_Int   device_level
 /* jacobi.c */
 void *hypre_JacobiCreate ( MPI_Comm comm );
 HYPRE_Int hypre_JacobiDestroy ( void *jacobi_vdata );
-HYPRE_Int hypre_JacobiSetup ( void *jacobi_vdata , hypre_StructMatrix *A , hypre_StructVector *b , hypre_StructVector *x );
-HYPRE_Int hypre_JacobiSolve ( void *jacobi_vdata , hypre_StructMatrix *A , hypre_StructVector *b , hypre_StructVector *x );
-HYPRE_Int hypre_JacobiSetTol ( void *jacobi_vdata , HYPRE_Real tol );
-HYPRE_Int hypre_JacobiGetTol ( void *jacobi_vdata , HYPRE_Real *tol );
-HYPRE_Int hypre_JacobiSetMaxIter ( void *jacobi_vdata , HYPRE_Int max_iter );
-HYPRE_Int hypre_JacobiGetMaxIter ( void *jacobi_vdata , HYPRE_Int *max_iter );
-HYPRE_Int hypre_JacobiSetZeroGuess ( void *jacobi_vdata , HYPRE_Int zero_guess );
-HYPRE_Int hypre_JacobiGetZeroGuess ( void *jacobi_vdata , HYPRE_Int *zero_guess );
-HYPRE_Int hypre_JacobiGetNumIterations ( void *jacobi_vdata , HYPRE_Int *num_iterations );
-HYPRE_Int hypre_JacobiSetTempVec ( void *jacobi_vdata , hypre_StructVector *t );
-HYPRE_Int hypre_JacobiGetFinalRelativeResidualNorm ( void *jacobi_vdata , HYPRE_Real *norm );
+HYPRE_Int hypre_JacobiSetup ( void *jacobi_vdata, hypre_StructMatrix *A, hypre_StructVector *b,
+                              hypre_StructVector *x );
+HYPRE_Int hypre_JacobiSolve ( void *jacobi_vdata, hypre_StructMatrix *A, hypre_StructVector *b,
+                              hypre_StructVector *x );
+HYPRE_Int hypre_JacobiSetTol ( void *jacobi_vdata, HYPRE_Real tol );
+HYPRE_Int hypre_JacobiGetTol ( void *jacobi_vdata, HYPRE_Real *tol );
+HYPRE_Int hypre_JacobiSetMaxIter ( void *jacobi_vdata, HYPRE_Int max_iter );
+HYPRE_Int hypre_JacobiGetMaxIter ( void *jacobi_vdata, HYPRE_Int *max_iter );
+HYPRE_Int hypre_JacobiSetZeroGuess ( void *jacobi_vdata, HYPRE_Int zero_guess );
+HYPRE_Int hypre_JacobiGetZeroGuess ( void *jacobi_vdata, HYPRE_Int *zero_guess );
+HYPRE_Int hypre_JacobiGetNumIterations ( void *jacobi_vdata, HYPRE_Int *num_iterations );
+HYPRE_Int hypre_JacobiSetTempVec ( void *jacobi_vdata, hypre_StructVector *t );
+HYPRE_Int hypre_JacobiGetFinalRelativeResidualNorm ( void *jacobi_vdata, HYPRE_Real *norm );
 
 /* pcg_struct.c */
 void *hypre_StructKrylovCAlloc ( size_t count, size_t elt_size, HYPRE_MemoryLocation location );
 HYPRE_Int hypre_StructKrylovFree ( void *ptr );
 void *hypre_StructKrylovCreateVector ( void *vvector );
-void *hypre_StructKrylovCreateVectorArray ( HYPRE_Int n , void *vvector );
+void *hypre_StructKrylovCreateVectorArray ( HYPRE_Int n, void *vvector );
 HYPRE_Int hypre_StructKrylovDestroyVector ( void *vvector );
-void *hypre_StructKrylovMatvecCreate ( void *A , void *x );
-HYPRE_Int hypre_StructKrylovMatvec ( void *matvec_data , HYPRE_Complex alpha , void *A , void *x , HYPRE_Complex beta , void *y );
+void *hypre_StructKrylovMatvecCreate ( void *A, void *x );
+HYPRE_Int hypre_StructKrylovMatvec ( void *matvec_data, HYPRE_Complex alpha, void *A, void *x,
+                                     HYPRE_Complex beta, void *y );
 HYPRE_Int hypre_StructKrylovMatvecDestroy ( void *matvec_data );
-HYPRE_Real hypre_StructKrylovInnerProd ( void *x , void *y );
-HYPRE_Int hypre_StructKrylovCopyVector ( void *x , void *y );
+HYPRE_Real hypre_StructKrylovInnerProd ( void *x, void *y );
+HYPRE_Int hypre_StructKrylovCopyVector ( void *x, void *y );
 HYPRE_Int hypre_StructKrylovClearVector ( void *x );
-HYPRE_Int hypre_StructKrylovScaleVector ( HYPRE_Complex alpha , void *x );
-HYPRE_Int hypre_StructKrylovAxpy ( HYPRE_Complex alpha , void *x , void *y );
-HYPRE_Int hypre_StructKrylovIdentitySetup ( void *vdata , void *A , void *b , void *x );
-HYPRE_Int hypre_StructKrylovIdentity ( void *vdata , void *A , void *b , void *x );
-HYPRE_Int hypre_StructKrylovCommInfo ( void *A , HYPRE_Int *my_id , HYPRE_Int *num_procs );
+HYPRE_Int hypre_StructKrylovScaleVector ( HYPRE_Complex alpha, void *x );
+HYPRE_Int hypre_StructKrylovAxpy ( HYPRE_Complex alpha, void *x, void *y );
+HYPRE_Int hypre_StructKrylovIdentitySetup ( void *vdata, void *A, void *b, void *x );
+HYPRE_Int hypre_StructKrylovIdentity ( void *vdata, void *A, void *b, void *x );
+HYPRE_Int hypre_StructKrylovCommInfo ( void *A, HYPRE_Int *my_id, HYPRE_Int *num_procs );
 
 /* pfmg2_setup_rap.c */
-hypre_StructMatrix *hypre_PFMG2CreateRAPOp ( hypre_StructMatrix *R , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructGrid *coarse_grid , HYPRE_Int cdir );
-HYPRE_Int hypre_PFMG2BuildRAPSym ( hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_StructMatrix *RAP );
-HYPRE_Int hypre_PFMG2BuildRAPSym_onebox_FSS5_CC0 ( HYPRE_Int ci , HYPRE_Int fi , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_StructMatrix *RAP );
-HYPRE_Int hypre_PFMG2BuildRAPSym_onebox_FSS5_CC1 ( HYPRE_Int ci , HYPRE_Int fi , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_StructMatrix *RAP );
-HYPRE_Int hypre_PFMG2BuildRAPSym_onebox_FSS9_CC0 ( HYPRE_Int ci , HYPRE_Int fi , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_StructMatrix *RAP );
-HYPRE_Int hypre_PFMG2BuildRAPSym_onebox_FSS9_CC1 ( HYPRE_Int ci , HYPRE_Int fi , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_StructMatrix *RAP );
-HYPRE_Int hypre_PFMG2BuildRAPNoSym ( hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_StructMatrix *RAP );
-HYPRE_Int hypre_PFMG2BuildRAPNoSym_onebox_FSS5_CC0 ( HYPRE_Int ci , HYPRE_Int fi , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_StructMatrix *RAP );
-HYPRE_Int hypre_PFMG2BuildRAPNoSym_onebox_FSS5_CC1 ( HYPRE_Int ci , HYPRE_Int fi , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_StructMatrix *RAP );
-HYPRE_Int hypre_PFMG2BuildRAPNoSym_onebox_FSS9_CC0 ( HYPRE_Int ci , HYPRE_Int fi , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_StructMatrix *RAP );
-HYPRE_Int hypre_PFMG2BuildRAPNoSym_onebox_FSS9_CC1 ( HYPRE_Int ci , HYPRE_Int fi , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_StructMatrix *RAP );
+hypre_StructMatrix *hypre_PFMG2CreateRAPOp ( hypre_StructMatrix *R, hypre_StructMatrix *A,
+                                             hypre_StructMatrix *P, hypre_StructGrid *coarse_grid, HYPRE_Int cdir );
+HYPRE_Int hypre_PFMG2BuildRAPSym ( hypre_StructMatrix *A, hypre_StructMatrix *P,
+                                   hypre_StructMatrix *R, HYPRE_Int cdir, hypre_Index cindex, hypre_Index cstride,
+                                   hypre_StructMatrix *RAP );
+HYPRE_Int hypre_PFMG2BuildRAPSym_onebox_FSS5_CC0 ( HYPRE_Int ci, HYPRE_Int fi,
+                                                   hypre_StructMatrix *A, hypre_StructMatrix *P, hypre_StructMatrix *R, HYPRE_Int cdir,
+                                                   hypre_Index cindex, hypre_Index cstride, hypre_StructMatrix *RAP );
+HYPRE_Int hypre_PFMG2BuildRAPSym_onebox_FSS5_CC1 ( HYPRE_Int ci, HYPRE_Int fi,
+                                                   hypre_StructMatrix *A, hypre_StructMatrix *P, hypre_StructMatrix *R, HYPRE_Int cdir,
+                                                   hypre_Index cindex, hypre_Index cstride, hypre_StructMatrix *RAP );
+HYPRE_Int hypre_PFMG2BuildRAPSym_onebox_FSS9_CC0 ( HYPRE_Int ci, HYPRE_Int fi,
+                                                   hypre_StructMatrix *A, hypre_StructMatrix *P, hypre_StructMatrix *R, HYPRE_Int cdir,
+                                                   hypre_Index cindex, hypre_Index cstride, hypre_StructMatrix *RAP );
+HYPRE_Int hypre_PFMG2BuildRAPSym_onebox_FSS9_CC1 ( HYPRE_Int ci, HYPRE_Int fi,
+                                                   hypre_StructMatrix *A, hypre_StructMatrix *P, hypre_StructMatrix *R, HYPRE_Int cdir,
+                                                   hypre_Index cindex, hypre_Index cstride, hypre_StructMatrix *RAP );
+HYPRE_Int hypre_PFMG2BuildRAPNoSym ( hypre_StructMatrix *A, hypre_StructMatrix *P,
+                                     hypre_StructMatrix *R, HYPRE_Int cdir, hypre_Index cindex, hypre_Index cstride,
+                                     hypre_StructMatrix *RAP );
+HYPRE_Int hypre_PFMG2BuildRAPNoSym_onebox_FSS5_CC0 ( HYPRE_Int ci, HYPRE_Int fi,
+                                                     hypre_StructMatrix *A, hypre_StructMatrix *P, hypre_StructMatrix *R, HYPRE_Int cdir,
+                                                     hypre_Index cindex, hypre_Index cstride, hypre_StructMatrix *RAP );
+HYPRE_Int hypre_PFMG2BuildRAPNoSym_onebox_FSS5_CC1 ( HYPRE_Int ci, HYPRE_Int fi,
+                                                     hypre_StructMatrix *A, hypre_StructMatrix *P, hypre_StructMatrix *R, HYPRE_Int cdir,
+                                                     hypre_Index cindex, hypre_Index cstride, hypre_StructMatrix *RAP );
+HYPRE_Int hypre_PFMG2BuildRAPNoSym_onebox_FSS9_CC0 ( HYPRE_Int ci, HYPRE_Int fi,
+                                                     hypre_StructMatrix *A, hypre_StructMatrix *P, hypre_StructMatrix *R, HYPRE_Int cdir,
+                                                     hypre_Index cindex, hypre_Index cstride, hypre_StructMatrix *RAP );
+HYPRE_Int hypre_PFMG2BuildRAPNoSym_onebox_FSS9_CC1 ( HYPRE_Int ci, HYPRE_Int fi,
+                                                     hypre_StructMatrix *A, hypre_StructMatrix *P, hypre_StructMatrix *R, HYPRE_Int cdir,
+                                                     hypre_Index cindex, hypre_Index cstride, hypre_StructMatrix *RAP );
 
 /* pfmg3_setup_rap.c */
-hypre_StructMatrix *hypre_PFMG3CreateRAPOp ( hypre_StructMatrix *R , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructGrid *coarse_grid , HYPRE_Int cdir );
-HYPRE_Int hypre_PFMG3BuildRAPSym ( hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_StructMatrix *RAP );
-HYPRE_Int hypre_PFMG3BuildRAPSym_onebox_FSS07_CC0 ( HYPRE_Int ci , HYPRE_Int fi , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_StructMatrix *RAP );
-HYPRE_Int hypre_PFMG3BuildRAPSym_onebox_FSS07_CC1 ( HYPRE_Int ci , HYPRE_Int fi , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_StructMatrix *RAP );
-HYPRE_Int hypre_PFMG3BuildRAPSym_onebox_FSS19_CC0 ( HYPRE_Int ci , HYPRE_Int fi , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_StructMatrix *RAP );
-HYPRE_Int hypre_PFMG3BuildRAPSym_onebox_FSS19_CC1 ( HYPRE_Int ci , HYPRE_Int fi , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_StructMatrix *RAP );
-HYPRE_Int hypre_PFMG3BuildRAPSym_onebox_FSS27_CC0 ( HYPRE_Int ci , HYPRE_Int fi , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_StructMatrix *RAP );
-HYPRE_Int hypre_PFMG3BuildRAPSym_onebox_FSS27_CC1 ( HYPRE_Int ci , HYPRE_Int fi , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_StructMatrix *RAP );
-HYPRE_Int hypre_PFMG3BuildRAPNoSym ( hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_StructMatrix *RAP );
-HYPRE_Int hypre_PFMG3BuildRAPNoSym_onebox_FSS07_CC0 ( HYPRE_Int ci , HYPRE_Int fi , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_StructMatrix *RAP );
-HYPRE_Int hypre_PFMG3BuildRAPNoSym_onebox_FSS07_CC1 ( HYPRE_Int ci , HYPRE_Int fi , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_StructMatrix *RAP );
-HYPRE_Int hypre_PFMG3BuildRAPNoSym_onebox_FSS19_CC0 ( HYPRE_Int ci , HYPRE_Int fi , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_StructMatrix *RAP );
-HYPRE_Int hypre_PFMG3BuildRAPNoSym_onebox_FSS19_CC1 ( HYPRE_Int ci , HYPRE_Int fi , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_StructMatrix *RAP );
-HYPRE_Int hypre_PFMG3BuildRAPNoSym_onebox_FSS27_CC0 ( HYPRE_Int ci , HYPRE_Int fi , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_StructMatrix *RAP );
-HYPRE_Int hypre_PFMG3BuildRAPNoSym_onebox_FSS27_CC1 ( HYPRE_Int ci , HYPRE_Int fi , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_StructMatrix *RAP );
+hypre_StructMatrix *hypre_PFMG3CreateRAPOp ( hypre_StructMatrix *R, hypre_StructMatrix *A,
+                                             hypre_StructMatrix *P, hypre_StructGrid *coarse_grid, HYPRE_Int cdir );
+HYPRE_Int hypre_PFMG3BuildRAPSym ( hypre_StructMatrix *A, hypre_StructMatrix *P,
+                                   hypre_StructMatrix *R, HYPRE_Int cdir, hypre_Index cindex, hypre_Index cstride,
+                                   hypre_StructMatrix *RAP );
+HYPRE_Int hypre_PFMG3BuildRAPSym_onebox_FSS07_CC0 ( HYPRE_Int ci, HYPRE_Int fi,
+                                                    hypre_StructMatrix *A, hypre_StructMatrix *P, hypre_StructMatrix *R, HYPRE_Int cdir,
+                                                    hypre_Index cindex, hypre_Index cstride, hypre_StructMatrix *RAP );
+HYPRE_Int hypre_PFMG3BuildRAPSym_onebox_FSS07_CC1 ( HYPRE_Int ci, HYPRE_Int fi,
+                                                    hypre_StructMatrix *A, hypre_StructMatrix *P, hypre_StructMatrix *R, HYPRE_Int cdir,
+                                                    hypre_Index cindex, hypre_Index cstride, hypre_StructMatrix *RAP );
+HYPRE_Int hypre_PFMG3BuildRAPSym_onebox_FSS19_CC0 ( HYPRE_Int ci, HYPRE_Int fi,
+                                                    hypre_StructMatrix *A, hypre_StructMatrix *P, hypre_StructMatrix *R, HYPRE_Int cdir,
+                                                    hypre_Index cindex, hypre_Index cstride, hypre_StructMatrix *RAP );
+HYPRE_Int hypre_PFMG3BuildRAPSym_onebox_FSS19_CC1 ( HYPRE_Int ci, HYPRE_Int fi,
+                                                    hypre_StructMatrix *A, hypre_StructMatrix *P, hypre_StructMatrix *R, HYPRE_Int cdir,
+                                                    hypre_Index cindex, hypre_Index cstride, hypre_StructMatrix *RAP );
+HYPRE_Int hypre_PFMG3BuildRAPSym_onebox_FSS27_CC0 ( HYPRE_Int ci, HYPRE_Int fi,
+                                                    hypre_StructMatrix *A, hypre_StructMatrix *P, hypre_StructMatrix *R, HYPRE_Int cdir,
+                                                    hypre_Index cindex, hypre_Index cstride, hypre_StructMatrix *RAP );
+HYPRE_Int hypre_PFMG3BuildRAPSym_onebox_FSS27_CC1 ( HYPRE_Int ci, HYPRE_Int fi,
+                                                    hypre_StructMatrix *A, hypre_StructMatrix *P, hypre_StructMatrix *R, HYPRE_Int cdir,
+                                                    hypre_Index cindex, hypre_Index cstride, hypre_StructMatrix *RAP );
+HYPRE_Int hypre_PFMG3BuildRAPNoSym ( hypre_StructMatrix *A, hypre_StructMatrix *P,
+                                     hypre_StructMatrix *R, HYPRE_Int cdir, hypre_Index cindex, hypre_Index cstride,
+                                     hypre_StructMatrix *RAP );
+HYPRE_Int hypre_PFMG3BuildRAPNoSym_onebox_FSS07_CC0 ( HYPRE_Int ci, HYPRE_Int fi,
+                                                      hypre_StructMatrix *A, hypre_StructMatrix *P, hypre_StructMatrix *R, HYPRE_Int cdir,
+                                                      hypre_Index cindex, hypre_Index cstride, hypre_StructMatrix *RAP );
+HYPRE_Int hypre_PFMG3BuildRAPNoSym_onebox_FSS07_CC1 ( HYPRE_Int ci, HYPRE_Int fi,
+                                                      hypre_StructMatrix *A, hypre_StructMatrix *P, hypre_StructMatrix *R, HYPRE_Int cdir,
+                                                      hypre_Index cindex, hypre_Index cstride, hypre_StructMatrix *RAP );
+HYPRE_Int hypre_PFMG3BuildRAPNoSym_onebox_FSS19_CC0 ( HYPRE_Int ci, HYPRE_Int fi,
+                                                      hypre_StructMatrix *A, hypre_StructMatrix *P, hypre_StructMatrix *R, HYPRE_Int cdir,
+                                                      hypre_Index cindex, hypre_Index cstride, hypre_StructMatrix *RAP );
+HYPRE_Int hypre_PFMG3BuildRAPNoSym_onebox_FSS19_CC1 ( HYPRE_Int ci, HYPRE_Int fi,
+                                                      hypre_StructMatrix *A, hypre_StructMatrix *P, hypre_StructMatrix *R, HYPRE_Int cdir,
+                                                      hypre_Index cindex, hypre_Index cstride, hypre_StructMatrix *RAP );
+HYPRE_Int hypre_PFMG3BuildRAPNoSym_onebox_FSS27_CC0 ( HYPRE_Int ci, HYPRE_Int fi,
+                                                      hypre_StructMatrix *A, hypre_StructMatrix *P, hypre_StructMatrix *R, HYPRE_Int cdir,
+                                                      hypre_Index cindex, hypre_Index cstride, hypre_StructMatrix *RAP );
+HYPRE_Int hypre_PFMG3BuildRAPNoSym_onebox_FSS27_CC1 ( HYPRE_Int ci, HYPRE_Int fi,
+                                                      hypre_StructMatrix *A, hypre_StructMatrix *P, hypre_StructMatrix *R, HYPRE_Int cdir,
+                                                      hypre_Index cindex, hypre_Index cstride, hypre_StructMatrix *RAP );
 
 /* pfmg.c */
 void *hypre_PFMGCreate ( MPI_Comm comm );
 HYPRE_Int hypre_PFMGDestroy ( void *pfmg_vdata );
-HYPRE_Int hypre_PFMGSetTol ( void *pfmg_vdata , HYPRE_Real tol );
-HYPRE_Int hypre_PFMGGetTol ( void *pfmg_vdata , HYPRE_Real *tol );
-HYPRE_Int hypre_PFMGSetMaxIter ( void *pfmg_vdata , HYPRE_Int max_iter );
-HYPRE_Int hypre_PFMGGetMaxIter ( void *pfmg_vdata , HYPRE_Int *max_iter );
-HYPRE_Int hypre_PFMGSetMaxLevels ( void *pfmg_vdata , HYPRE_Int max_levels );
-HYPRE_Int hypre_PFMGGetMaxLevels ( void *pfmg_vdata , HYPRE_Int *max_levels );
-HYPRE_Int hypre_PFMGSetRelChange ( void *pfmg_vdata , HYPRE_Int rel_change );
-HYPRE_Int hypre_PFMGGetRelChange ( void *pfmg_vdata , HYPRE_Int *rel_change );
-HYPRE_Int hypre_PFMGSetZeroGuess ( void *pfmg_vdata , HYPRE_Int zero_guess );
-HYPRE_Int hypre_PFMGGetZeroGuess ( void *pfmg_vdata , HYPRE_Int *zero_guess );
-HYPRE_Int hypre_PFMGSetRelaxType ( void *pfmg_vdata , HYPRE_Int relax_type );
-HYPRE_Int hypre_PFMGGetRelaxType ( void *pfmg_vdata , HYPRE_Int *relax_type );
-HYPRE_Int hypre_PFMGSetJacobiWeight ( void *pfmg_vdata , HYPRE_Real weight );
-HYPRE_Int hypre_PFMGGetJacobiWeight ( void *pfmg_vdata , HYPRE_Real *weight );
-HYPRE_Int hypre_PFMGSetRAPType ( void *pfmg_vdata , HYPRE_Int rap_type );
-HYPRE_Int hypre_PFMGGetRAPType ( void *pfmg_vdata , HYPRE_Int *rap_type );
-HYPRE_Int hypre_PFMGSetNumPreRelax ( void *pfmg_vdata , HYPRE_Int num_pre_relax );
-HYPRE_Int hypre_PFMGGetNumPreRelax ( void *pfmg_vdata , HYPRE_Int *num_pre_relax );
-HYPRE_Int hypre_PFMGSetNumPostRelax ( void *pfmg_vdata , HYPRE_Int num_post_relax );
-HYPRE_Int hypre_PFMGGetNumPostRelax ( void *pfmg_vdata , HYPRE_Int *num_post_relax );
-HYPRE_Int hypre_PFMGSetSkipRelax ( void *pfmg_vdata , HYPRE_Int skip_relax );
-HYPRE_Int hypre_PFMGGetSkipRelax ( void *pfmg_vdata , HYPRE_Int *skip_relax );
-HYPRE_Int hypre_PFMGSetDxyz ( void *pfmg_vdata , HYPRE_Real *dxyz );
-HYPRE_Int hypre_PFMGSetLogging ( void *pfmg_vdata , HYPRE_Int logging );
-HYPRE_Int hypre_PFMGGetLogging ( void *pfmg_vdata , HYPRE_Int *logging );
-HYPRE_Int hypre_PFMGSetPrintLevel ( void *pfmg_vdata , HYPRE_Int print_level );
-HYPRE_Int hypre_PFMGGetPrintLevel ( void *pfmg_vdata , HYPRE_Int *print_level );
-HYPRE_Int hypre_PFMGGetNumIterations ( void *pfmg_vdata , HYPRE_Int *num_iterations );
-HYPRE_Int hypre_PFMGPrintLogging ( void *pfmg_vdata , HYPRE_Int myid );
-HYPRE_Int hypre_PFMGGetFinalRelativeResidualNorm ( void *pfmg_vdata , HYPRE_Real *relative_residual_norm );
+HYPRE_Int hypre_PFMGSetTol ( void *pfmg_vdata, HYPRE_Real tol );
+HYPRE_Int hypre_PFMGGetTol ( void *pfmg_vdata, HYPRE_Real *tol );
+HYPRE_Int hypre_PFMGSetMaxIter ( void *pfmg_vdata, HYPRE_Int max_iter );
+HYPRE_Int hypre_PFMGGetMaxIter ( void *pfmg_vdata, HYPRE_Int *max_iter );
+HYPRE_Int hypre_PFMGSetMaxLevels ( void *pfmg_vdata, HYPRE_Int max_levels );
+HYPRE_Int hypre_PFMGGetMaxLevels ( void *pfmg_vdata, HYPRE_Int *max_levels );
+HYPRE_Int hypre_PFMGSetRelChange ( void *pfmg_vdata, HYPRE_Int rel_change );
+HYPRE_Int hypre_PFMGGetRelChange ( void *pfmg_vdata, HYPRE_Int *rel_change );
+HYPRE_Int hypre_PFMGSetZeroGuess ( void *pfmg_vdata, HYPRE_Int zero_guess );
+HYPRE_Int hypre_PFMGGetZeroGuess ( void *pfmg_vdata, HYPRE_Int *zero_guess );
+HYPRE_Int hypre_PFMGSetRelaxType ( void *pfmg_vdata, HYPRE_Int relax_type );
+HYPRE_Int hypre_PFMGGetRelaxType ( void *pfmg_vdata, HYPRE_Int *relax_type );
+HYPRE_Int hypre_PFMGSetJacobiWeight ( void *pfmg_vdata, HYPRE_Real weight );
+HYPRE_Int hypre_PFMGGetJacobiWeight ( void *pfmg_vdata, HYPRE_Real *weight );
+HYPRE_Int hypre_PFMGSetRAPType ( void *pfmg_vdata, HYPRE_Int rap_type );
+HYPRE_Int hypre_PFMGGetRAPType ( void *pfmg_vdata, HYPRE_Int *rap_type );
+HYPRE_Int hypre_PFMGSetNumPreRelax ( void *pfmg_vdata, HYPRE_Int num_pre_relax );
+HYPRE_Int hypre_PFMGGetNumPreRelax ( void *pfmg_vdata, HYPRE_Int *num_pre_relax );
+HYPRE_Int hypre_PFMGSetNumPostRelax ( void *pfmg_vdata, HYPRE_Int num_post_relax );
+HYPRE_Int hypre_PFMGGetNumPostRelax ( void *pfmg_vdata, HYPRE_Int *num_post_relax );
+HYPRE_Int hypre_PFMGSetSkipRelax ( void *pfmg_vdata, HYPRE_Int skip_relax );
+HYPRE_Int hypre_PFMGGetSkipRelax ( void *pfmg_vdata, HYPRE_Int *skip_relax );
+HYPRE_Int hypre_PFMGSetDxyz ( void *pfmg_vdata, HYPRE_Real *dxyz );
+HYPRE_Int hypre_PFMGSetLogging ( void *pfmg_vdata, HYPRE_Int logging );
+HYPRE_Int hypre_PFMGGetLogging ( void *pfmg_vdata, HYPRE_Int *logging );
+HYPRE_Int hypre_PFMGSetPrintLevel ( void *pfmg_vdata, HYPRE_Int print_level );
+HYPRE_Int hypre_PFMGGetPrintLevel ( void *pfmg_vdata, HYPRE_Int *print_level );
+HYPRE_Int hypre_PFMGGetNumIterations ( void *pfmg_vdata, HYPRE_Int *num_iterations );
+HYPRE_Int hypre_PFMGPrintLogging ( void *pfmg_vdata, HYPRE_Int myid );
+HYPRE_Int hypre_PFMGGetFinalRelativeResidualNorm ( void *pfmg_vdata,
+                                                   HYPRE_Real *relative_residual_norm );
 
 /* pfmg_relax.c */
 void *hypre_PFMGRelaxCreate ( MPI_Comm comm );
 HYPRE_Int hypre_PFMGRelaxDestroy ( void *pfmg_relax_vdata );
-HYPRE_Int hypre_PFMGRelax ( void *pfmg_relax_vdata , hypre_StructMatrix *A , hypre_StructVector *b , hypre_StructVector *x );
-HYPRE_Int hypre_PFMGRelaxSetup ( void *pfmg_relax_vdata , hypre_StructMatrix *A , hypre_StructVector *b , hypre_StructVector *x );
-HYPRE_Int hypre_PFMGRelaxSetType ( void *pfmg_relax_vdata , HYPRE_Int relax_type );
-HYPRE_Int hypre_PFMGRelaxSetJacobiWeight ( void *pfmg_relax_vdata , HYPRE_Real weight );
+HYPRE_Int hypre_PFMGRelax ( void *pfmg_relax_vdata, hypre_StructMatrix *A, hypre_StructVector *b,
+                            hypre_StructVector *x );
+HYPRE_Int hypre_PFMGRelaxSetup ( void *pfmg_relax_vdata, hypre_StructMatrix *A,
+                                 hypre_StructVector *b, hypre_StructVector *x );
+HYPRE_Int hypre_PFMGRelaxSetType ( void *pfmg_relax_vdata, HYPRE_Int relax_type );
+HYPRE_Int hypre_PFMGRelaxSetJacobiWeight ( void *pfmg_relax_vdata, HYPRE_Real weight );
 HYPRE_Int hypre_PFMGRelaxSetPreRelax ( void *pfmg_relax_vdata );
 HYPRE_Int hypre_PFMGRelaxSetPostRelax ( void *pfmg_relax_vdata );
-HYPRE_Int hypre_PFMGRelaxSetTol ( void *pfmg_relax_vdata , HYPRE_Real tol );
-HYPRE_Int hypre_PFMGRelaxSetMaxIter ( void *pfmg_relax_vdata , HYPRE_Int max_iter );
-HYPRE_Int hypre_PFMGRelaxSetZeroGuess ( void *pfmg_relax_vdata , HYPRE_Int zero_guess );
-HYPRE_Int hypre_PFMGRelaxSetTempVec ( void *pfmg_relax_vdata , hypre_StructVector *t );
+HYPRE_Int hypre_PFMGRelaxSetTol ( void *pfmg_relax_vdata, HYPRE_Real tol );
+HYPRE_Int hypre_PFMGRelaxSetMaxIter ( void *pfmg_relax_vdata, HYPRE_Int max_iter );
+HYPRE_Int hypre_PFMGRelaxSetZeroGuess ( void *pfmg_relax_vdata, HYPRE_Int zero_guess );
+HYPRE_Int hypre_PFMGRelaxSetTempVec ( void *pfmg_relax_vdata, hypre_StructVector *t );
 
 /* pfmg_setup.c */
-HYPRE_Int hypre_PFMGSetup ( void *pfmg_vdata , hypre_StructMatrix *A , hypre_StructVector *b , hypre_StructVector *x );
-HYPRE_Int hypre_PFMGComputeDxyz ( hypre_StructMatrix *A , HYPRE_Real *dxyz , HYPRE_Real *mean, HYPRE_Real *deviation);
-HYPRE_Int hypre_PFMGComputeDxyz_CS  ( HYPRE_Int bi, hypre_StructMatrix *A, HYPRE_Real *cxyz, HYPRE_Real *sqcxyz);
-HYPRE_Int hypre_PFMGComputeDxyz_SS5 ( HYPRE_Int bi, hypre_StructMatrix *A, HYPRE_Real *cxyz, HYPRE_Real *sqcxyz);
-HYPRE_Int hypre_PFMGComputeDxyz_SS9 ( HYPRE_Int bi, hypre_StructMatrix *A, HYPRE_Real *cxyz, HYPRE_Real *sqcxyz);
-HYPRE_Int hypre_PFMGComputeDxyz_SS7 ( HYPRE_Int bi, hypre_StructMatrix *A, HYPRE_Real *cxyz, HYPRE_Real *sqcxyz);
-HYPRE_Int hypre_PFMGComputeDxyz_SS19( HYPRE_Int bi, hypre_StructMatrix *A, HYPRE_Real *cxyz, HYPRE_Real *sqcxyz);
-HYPRE_Int hypre_PFMGComputeDxyz_SS27( HYPRE_Int bi, hypre_StructMatrix *A, HYPRE_Real *cxyz, HYPRE_Real *sqcxyz);
+HYPRE_Int hypre_PFMGSetup ( void *pfmg_vdata, hypre_StructMatrix *A, hypre_StructVector *b,
+                            hypre_StructVector *x );
+HYPRE_Int hypre_PFMGComputeDxyz ( hypre_StructMatrix *A, HYPRE_Real *dxyz, HYPRE_Real *mean,
+                                  HYPRE_Real *deviation);
+HYPRE_Int hypre_PFMGComputeDxyz_CS  ( HYPRE_Int bi, hypre_StructMatrix *A, HYPRE_Real *cxyz,
+                                      HYPRE_Real *sqcxyz);
+HYPRE_Int hypre_PFMGComputeDxyz_SS5 ( HYPRE_Int bi, hypre_StructMatrix *A, HYPRE_Real *cxyz,
+                                      HYPRE_Real *sqcxyz);
+HYPRE_Int hypre_PFMGComputeDxyz_SS9 ( HYPRE_Int bi, hypre_StructMatrix *A, HYPRE_Real *cxyz,
+                                      HYPRE_Real *sqcxyz);
+HYPRE_Int hypre_PFMGComputeDxyz_SS7 ( HYPRE_Int bi, hypre_StructMatrix *A, HYPRE_Real *cxyz,
+                                      HYPRE_Real *sqcxyz);
+HYPRE_Int hypre_PFMGComputeDxyz_SS19( HYPRE_Int bi, hypre_StructMatrix *A, HYPRE_Real *cxyz,
+                                      HYPRE_Real *sqcxyz);
+HYPRE_Int hypre_PFMGComputeDxyz_SS27( HYPRE_Int bi, hypre_StructMatrix *A, HYPRE_Real *cxyz,
+                                      HYPRE_Real *sqcxyz);
 HYPRE_Int hypre_ZeroDiagonal ( hypre_StructMatrix *A );
 
 /* pfmg_setup_interp.c */
-hypre_StructMatrix *hypre_PFMGCreateInterpOp ( hypre_StructMatrix *A , hypre_StructGrid *cgrid , HYPRE_Int cdir , HYPRE_Int rap_type );
-HYPRE_Int hypre_PFMGSetupInterpOp ( hypre_StructMatrix *A , HYPRE_Int cdir , hypre_Index findex , hypre_Index stride , hypre_StructMatrix *P , HYPRE_Int rap_type );
-HYPRE_Int hypre_PFMGSetupInterpOp_CC0 ( HYPRE_Int i , hypre_StructMatrix *A , hypre_Box *A_dbox , HYPRE_Int cdir , hypre_Index stride , hypre_Index stridec , hypre_Index start , hypre_IndexRef startc , hypre_Index loop_size , hypre_Box *P_dbox , HYPRE_Int Pstenc0 , HYPRE_Int Pstenc1 , HYPRE_Real *Pp0 , HYPRE_Real *Pp1 , HYPRE_Int rap_type , HYPRE_Int si0 , HYPRE_Int si1 );
-HYPRE_Int hypre_PFMGSetupInterpOp_CC1 ( HYPRE_Int i , hypre_StructMatrix *A , hypre_Box *A_dbox , HYPRE_Int cdir , hypre_Index stride , hypre_Index stridec , hypre_Index start , hypre_IndexRef startc , hypre_Index loop_size , hypre_Box *P_dbox , HYPRE_Int Pstenc0 , HYPRE_Int Pstenc1 , HYPRE_Real *Pp0 , HYPRE_Real *Pp1 , HYPRE_Int rap_type , HYPRE_Int si0 , HYPRE_Int si1 );
-HYPRE_Int hypre_PFMGSetupInterpOp_CC2 ( HYPRE_Int i , hypre_StructMatrix *A , hypre_Box *A_dbox , HYPRE_Int cdir , hypre_Index stride , hypre_Index stridec , hypre_Index start , hypre_IndexRef startc , hypre_Index loop_size , hypre_Box *P_dbox , HYPRE_Int Pstenc0 , HYPRE_Int Pstenc1 , HYPRE_Real *Pp0 , HYPRE_Real *Pp1 , HYPRE_Int rap_type , HYPRE_Int si0 , HYPRE_Int si1 );
-HYPRE_Int hypre_PFMGSetupInterpOp_CC0_SS5 ( HYPRE_Int i , hypre_StructMatrix *A , hypre_Box *A_dbox , HYPRE_Int cdir , hypre_Index stride , hypre_Index stridec , hypre_Index start , hypre_IndexRef startc , hypre_Index loop_size , hypre_Box *P_dbox , HYPRE_Int Pstenc0 , HYPRE_Int Pstenc1 , HYPRE_Real *Pp0 , HYPRE_Real *Pp1 , HYPRE_Int rap_type , hypre_Index *P_stencil_shape );
-HYPRE_Int hypre_PFMGSetupInterpOp_CC0_SS9 ( HYPRE_Int i , hypre_StructMatrix *A , hypre_Box *A_dbox , HYPRE_Int cdir , hypre_Index stride , hypre_Index stridec , hypre_Index start , hypre_IndexRef startc , hypre_Index loop_size , hypre_Box *P_dbox , HYPRE_Int Pstenc0 , HYPRE_Int Pstenc1 , HYPRE_Real *Pp0 , HYPRE_Real *Pp1 , HYPRE_Int rap_type , hypre_Index *P_stencil_shape );
-HYPRE_Int hypre_PFMGSetupInterpOp_CC0_SS7 ( HYPRE_Int i , hypre_StructMatrix *A , hypre_Box *A_dbox , HYPRE_Int cdir , hypre_Index stride , hypre_Index stridec , hypre_Index start , hypre_IndexRef startc , hypre_Index loop_size , hypre_Box *P_dbox , HYPRE_Int Pstenc0 , HYPRE_Int Pstenc1 , HYPRE_Real *Pp0 , HYPRE_Real *Pp1 , HYPRE_Int rap_type , hypre_Index *P_stencil_shape );
-
-HYPRE_Int hypre_PFMGSetupInterpOp_CC0_SS15 ( HYPRE_Int i , hypre_StructMatrix *A , hypre_Box *A_dbox , HYPRE_Int cdir , hypre_Index stride , hypre_Index stridec , hypre_Index start , hypre_IndexRef startc , hypre_Index loop_size , hypre_Box *P_dbox , HYPRE_Int Pstenc0 , HYPRE_Int Pstenc1 , HYPRE_Real *Pp0 , HYPRE_Real *Pp1 , HYPRE_Int rap_type , hypre_Index *P_stencil_shape );
-
-HYPRE_Int hypre_PFMGSetupInterpOp_CC0_SS19 ( HYPRE_Int i , hypre_StructMatrix *A , hypre_Box *A_dbox , HYPRE_Int cdir , hypre_Index stride , hypre_Index stridec , hypre_Index start , hypre_IndexRef startc , hypre_Index loop_size , hypre_Box *P_dbox , HYPRE_Int Pstenc0 , HYPRE_Int Pstenc1 , HYPRE_Real *Pp0 , HYPRE_Real *Pp1 , HYPRE_Int rap_type , hypre_Index *P_stencil_shape );
-
-HYPRE_Int hypre_PFMGSetupInterpOp_CC0_SS27 ( HYPRE_Int i , hypre_StructMatrix *A , hypre_Box *A_dbox , HYPRE_Int cdir , hypre_Index stride , hypre_Index stridec , hypre_Index start , hypre_IndexRef startc , hypre_Index loop_size , hypre_Box *P_dbox , HYPRE_Int Pstenc0 , HYPRE_Int Pstenc1 , HYPRE_Real *Pp0 , HYPRE_Real *Pp1 , HYPRE_Int rap_type , hypre_Index *P_stencil_shape );
+hypre_StructMatrix *hypre_PFMGCreateInterpOp ( hypre_StructMatrix *A, hypre_StructGrid *cgrid,
+                                               HYPRE_Int cdir, HYPRE_Int rap_type );
+HYPRE_Int hypre_PFMGSetupInterpOp ( hypre_StructMatrix *A, HYPRE_Int cdir, hypre_Index findex,
+                                    hypre_Index stride, hypre_StructMatrix *P, HYPRE_Int rap_type );
+HYPRE_Int hypre_PFMGSetupInterpOp_CC0 ( HYPRE_Int i, hypre_StructMatrix *A, hypre_Box *A_dbox,
+                                        HYPRE_Int cdir, hypre_Index stride, hypre_Index stridec, hypre_Index start, hypre_IndexRef startc,
+                                        hypre_Index loop_size, hypre_Box *P_dbox, HYPRE_Int Pstenc0, HYPRE_Int Pstenc1, HYPRE_Real *Pp0,
+                                        HYPRE_Real *Pp1, HYPRE_Int rap_type, HYPRE_Int si0, HYPRE_Int si1 );
+HYPRE_Int hypre_PFMGSetupInterpOp_CC1 ( HYPRE_Int i, hypre_StructMatrix *A, hypre_Box *A_dbox,
+                                        HYPRE_Int cdir, hypre_Index stride, hypre_Index stridec, hypre_Index start, hypre_IndexRef startc,
+                                        hypre_Index loop_size, hypre_Box *P_dbox, HYPRE_Int Pstenc0, HYPRE_Int Pstenc1, HYPRE_Real *Pp0,
+                                        HYPRE_Real *Pp1, HYPRE_Int rap_type, HYPRE_Int si0, HYPRE_Int si1 );
+HYPRE_Int hypre_PFMGSetupInterpOp_CC2 ( HYPRE_Int i, hypre_StructMatrix *A, hypre_Box *A_dbox,
+                                        HYPRE_Int cdir, hypre_Index stride, hypre_Index stridec, hypre_Index start, hypre_IndexRef startc,
+                                        hypre_Index loop_size, hypre_Box *P_dbox, HYPRE_Int Pstenc0, HYPRE_Int Pstenc1, HYPRE_Real *Pp0,
+                                        HYPRE_Real *Pp1, HYPRE_Int rap_type, HYPRE_Int si0, HYPRE_Int si1 );
+HYPRE_Int hypre_PFMGSetupInterpOp_CC0_SS5 ( HYPRE_Int i, hypre_StructMatrix *A, hypre_Box *A_dbox,
+                                            HYPRE_Int cdir, hypre_Index stride, hypre_Index stridec, hypre_Index start, hypre_IndexRef startc,
+                                            hypre_Index loop_size, hypre_Box *P_dbox, HYPRE_Int Pstenc0, HYPRE_Int Pstenc1, HYPRE_Real *Pp0,
+                                            HYPRE_Real *Pp1, HYPRE_Int rap_type, hypre_Index *P_stencil_shape );
+HYPRE_Int hypre_PFMGSetupInterpOp_CC0_SS9 ( HYPRE_Int i, hypre_StructMatrix *A, hypre_Box *A_dbox,
+                                            HYPRE_Int cdir, hypre_Index stride, hypre_Index stridec, hypre_Index start, hypre_IndexRef startc,
+                                            hypre_Index loop_size, hypre_Box *P_dbox, HYPRE_Int Pstenc0, HYPRE_Int Pstenc1, HYPRE_Real *Pp0,
+                                            HYPRE_Real *Pp1, HYPRE_Int rap_type, hypre_Index *P_stencil_shape );
+HYPRE_Int hypre_PFMGSetupInterpOp_CC0_SS7 ( HYPRE_Int i, hypre_StructMatrix *A, hypre_Box *A_dbox,
+                                            HYPRE_Int cdir, hypre_Index stride, hypre_Index stridec, hypre_Index start, hypre_IndexRef startc,
+                                            hypre_Index loop_size, hypre_Box *P_dbox, HYPRE_Int Pstenc0, HYPRE_Int Pstenc1, HYPRE_Real *Pp0,
+                                            HYPRE_Real *Pp1, HYPRE_Int rap_type, hypre_Index *P_stencil_shape );
+
+HYPRE_Int hypre_PFMGSetupInterpOp_CC0_SS15 ( HYPRE_Int i, hypre_StructMatrix *A, hypre_Box *A_dbox,
+                                             HYPRE_Int cdir, hypre_Index stride, hypre_Index stridec, hypre_Index start, hypre_IndexRef startc,
+                                             hypre_Index loop_size, hypre_Box *P_dbox, HYPRE_Int Pstenc0, HYPRE_Int Pstenc1, HYPRE_Real *Pp0,
+                                             HYPRE_Real *Pp1, HYPRE_Int rap_type, hypre_Index *P_stencil_shape );
+
+HYPRE_Int hypre_PFMGSetupInterpOp_CC0_SS19 ( HYPRE_Int i, hypre_StructMatrix *A, hypre_Box *A_dbox,
+                                             HYPRE_Int cdir, hypre_Index stride, hypre_Index stridec, hypre_Index start, hypre_IndexRef startc,
+                                             hypre_Index loop_size, hypre_Box *P_dbox, HYPRE_Int Pstenc0, HYPRE_Int Pstenc1, HYPRE_Real *Pp0,
+                                             HYPRE_Real *Pp1, HYPRE_Int rap_type, hypre_Index *P_stencil_shape );
+
+HYPRE_Int hypre_PFMGSetupInterpOp_CC0_SS27 ( HYPRE_Int i, hypre_StructMatrix *A, hypre_Box *A_dbox,
+                                             HYPRE_Int cdir, hypre_Index stride, hypre_Index stridec, hypre_Index start, hypre_IndexRef startc,
+                                             hypre_Index loop_size, hypre_Box *P_dbox, HYPRE_Int Pstenc0, HYPRE_Int Pstenc1, HYPRE_Real *Pp0,
+                                             HYPRE_Real *Pp1, HYPRE_Int rap_type, hypre_Index *P_stencil_shape );
 /* pfmg_setup_rap5.c */
-hypre_StructMatrix *hypre_PFMGCreateCoarseOp5 ( hypre_StructMatrix *R , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructGrid *coarse_grid , HYPRE_Int cdir );
-HYPRE_Int hypre_PFMGBuildCoarseOp5 ( hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_StructMatrix *RAP );
-HYPRE_Int hypre_PFMGBuildCoarseOp5_onebox_CC0 ( HYPRE_Int fi , HYPRE_Int ci , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_StructMatrix *RAP );
-HYPRE_Int hypre_PFMGBuildCoarseOp5_onebox_CC1 ( HYPRE_Int fi , HYPRE_Int ci , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_StructMatrix *RAP );
-HYPRE_Int hypre_PFMGBuildCoarseOp5_onebox_CC2 ( HYPRE_Int fi , HYPRE_Int ci , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_StructMatrix *RAP );
+hypre_StructMatrix *hypre_PFMGCreateCoarseOp5 ( hypre_StructMatrix *R, hypre_StructMatrix *A,
+                                                hypre_StructMatrix *P, hypre_StructGrid *coarse_grid, HYPRE_Int cdir );
+HYPRE_Int hypre_PFMGBuildCoarseOp5 ( hypre_StructMatrix *A, hypre_StructMatrix *P,
+                                     hypre_StructMatrix *R, HYPRE_Int cdir, hypre_Index cindex, hypre_Index cstride,
+                                     hypre_StructMatrix *RAP );
+HYPRE_Int hypre_PFMGBuildCoarseOp5_onebox_CC0 ( HYPRE_Int fi, HYPRE_Int ci, hypre_StructMatrix *A,
+                                                hypre_StructMatrix *P, hypre_StructMatrix *R, HYPRE_Int cdir, hypre_Index cindex,
+                                                hypre_Index cstride, hypre_StructMatrix *RAP );
+HYPRE_Int hypre_PFMGBuildCoarseOp5_onebox_CC1 ( HYPRE_Int fi, HYPRE_Int ci, hypre_StructMatrix *A,
+                                                hypre_StructMatrix *P, hypre_StructMatrix *R, HYPRE_Int cdir, hypre_Index cindex,
+                                                hypre_Index cstride, hypre_StructMatrix *RAP );
+HYPRE_Int hypre_PFMGBuildCoarseOp5_onebox_CC2 ( HYPRE_Int fi, HYPRE_Int ci, hypre_StructMatrix *A,
+                                                hypre_StructMatrix *P, hypre_StructMatrix *R, HYPRE_Int cdir, hypre_Index cindex,
+                                                hypre_Index cstride, hypre_StructMatrix *RAP );
 
 /* pfmg_setup_rap7.c */
-hypre_StructMatrix *hypre_PFMGCreateCoarseOp7 ( hypre_StructMatrix *R , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructGrid *coarse_grid , HYPRE_Int cdir );
-HYPRE_Int hypre_PFMGBuildCoarseOp7 ( hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_StructMatrix *RAP );
+hypre_StructMatrix *hypre_PFMGCreateCoarseOp7 ( hypre_StructMatrix *R, hypre_StructMatrix *A,
+                                                hypre_StructMatrix *P, hypre_StructGrid *coarse_grid, HYPRE_Int cdir );
+HYPRE_Int hypre_PFMGBuildCoarseOp7 ( hypre_StructMatrix *A, hypre_StructMatrix *P,
+                                     hypre_StructMatrix *R, HYPRE_Int cdir, hypre_Index cindex, hypre_Index cstride,
+                                     hypre_StructMatrix *RAP );
 
 /* pfmg_setup_rap.c */
-hypre_StructMatrix *hypre_PFMGCreateRAPOp ( hypre_StructMatrix *R , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructGrid *coarse_grid , HYPRE_Int cdir , HYPRE_Int rap_type );
-HYPRE_Int hypre_PFMGSetupRAPOp ( hypre_StructMatrix *R , hypre_StructMatrix *A , hypre_StructMatrix *P , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , HYPRE_Int rap_type , hypre_StructMatrix *Ac );
+hypre_StructMatrix *hypre_PFMGCreateRAPOp ( hypre_StructMatrix *R, hypre_StructMatrix *A,
+                                            hypre_StructMatrix *P, hypre_StructGrid *coarse_grid, HYPRE_Int cdir, HYPRE_Int rap_type );
+HYPRE_Int hypre_PFMGSetupRAPOp ( hypre_StructMatrix *R, hypre_StructMatrix *A,
+                                 hypre_StructMatrix *P, HYPRE_Int cdir, hypre_Index cindex, hypre_Index cstride, HYPRE_Int rap_type,
+                                 hypre_StructMatrix *Ac );
 
 /* pfmg_solve.c */
-HYPRE_Int hypre_PFMGSolve ( void *pfmg_vdata , hypre_StructMatrix *A , hypre_StructVector *b , hypre_StructVector *x );
+HYPRE_Int hypre_PFMGSolve ( void *pfmg_vdata, hypre_StructMatrix *A, hypre_StructVector *b,
+                            hypre_StructVector *x );
 
 /* point_relax.c */
 void *hypre_PointRelaxCreate ( MPI_Comm comm );
 HYPRE_Int hypre_PointRelaxDestroy ( void *relax_vdata );
-HYPRE_Int hypre_PointRelaxSetup ( void *relax_vdata , hypre_StructMatrix *A , hypre_StructVector *b , hypre_StructVector *x );
-HYPRE_Int hypre_PointRelax ( void *relax_vdata , hypre_StructMatrix *A , hypre_StructVector *b , hypre_StructVector *x );
-HYPRE_Int hypre_PointRelax_core0 ( void *relax_vdata , hypre_StructMatrix *A , HYPRE_Int constant_coefficient , hypre_Box *compute_box , HYPRE_Real *bp , HYPRE_Real *xp , HYPRE_Real *tp , HYPRE_Int boxarray_id , hypre_Box *A_data_box , hypre_Box *b_data_box , hypre_Box *x_data_box , hypre_Box *t_data_box , hypre_IndexRef stride );
-HYPRE_Int hypre_PointRelax_core12 ( void *relax_vdata , hypre_StructMatrix *A , HYPRE_Int constant_coefficient , hypre_Box *compute_box , HYPRE_Real *bp , HYPRE_Real *xp , HYPRE_Real *tp , HYPRE_Int boxarray_id , hypre_Box *A_data_box , hypre_Box *b_data_box , hypre_Box *x_data_box , hypre_Box *t_data_box , hypre_IndexRef stride );
-HYPRE_Int hypre_PointRelaxSetTol ( void *relax_vdata , HYPRE_Real tol );
-HYPRE_Int hypre_PointRelaxGetTol ( void *relax_vdata , HYPRE_Real *tol );
-HYPRE_Int hypre_PointRelaxSetMaxIter ( void *relax_vdata , HYPRE_Int max_iter );
-HYPRE_Int hypre_PointRelaxGetMaxIter ( void *relax_vdata , HYPRE_Int *max_iter );
-HYPRE_Int hypre_PointRelaxSetZeroGuess ( void *relax_vdata , HYPRE_Int zero_guess );
-HYPRE_Int hypre_PointRelaxGetZeroGuess ( void *relax_vdata , HYPRE_Int *zero_guess );
-HYPRE_Int hypre_PointRelaxGetNumIterations ( void *relax_vdata , HYPRE_Int *num_iterations );
-HYPRE_Int hypre_PointRelaxSetWeight ( void *relax_vdata , HYPRE_Real weight );
-HYPRE_Int hypre_PointRelaxSetNumPointsets ( void *relax_vdata , HYPRE_Int num_pointsets );
-HYPRE_Int hypre_PointRelaxSetPointset ( void *relax_vdata , HYPRE_Int pointset , HYPRE_Int pointset_size , hypre_Index pointset_stride , hypre_Index *pointset_indices );
-HYPRE_Int hypre_PointRelaxSetPointsetRank ( void *relax_vdata , HYPRE_Int pointset , HYPRE_Int pointset_rank );
-HYPRE_Int hypre_PointRelaxSetTempVec ( void *relax_vdata , hypre_StructVector *t );
-HYPRE_Int hypre_PointRelaxGetFinalRelativeResidualNorm ( void *relax_vdata , HYPRE_Real *norm );
-HYPRE_Int hypre_relax_wtx ( void *relax_vdata , HYPRE_Int pointset , hypre_StructVector *t , hypre_StructVector *x );
-HYPRE_Int hypre_relax_copy ( void *relax_vdata , HYPRE_Int pointset , hypre_StructVector *t , hypre_StructVector *x );
+HYPRE_Int hypre_PointRelaxSetup ( void *relax_vdata, hypre_StructMatrix *A, hypre_StructVector *b,
+                                  hypre_StructVector *x );
+HYPRE_Int hypre_PointRelax ( void *relax_vdata, hypre_StructMatrix *A, hypre_StructVector *b,
+                             hypre_StructVector *x );
+HYPRE_Int hypre_PointRelax_core0 ( void *relax_vdata, hypre_StructMatrix *A,
+                                   HYPRE_Int constant_coefficient, hypre_Box *compute_box, HYPRE_Real *bp, HYPRE_Real *xp,
+                                   HYPRE_Real *tp, HYPRE_Int boxarray_id, hypre_Box *A_data_box, hypre_Box *b_data_box,
+                                   hypre_Box *x_data_box, hypre_Box *t_data_box, hypre_IndexRef stride );
+HYPRE_Int hypre_PointRelax_core12 ( void *relax_vdata, hypre_StructMatrix *A,
+                                    HYPRE_Int constant_coefficient, hypre_Box *compute_box, HYPRE_Real *bp, HYPRE_Real *xp,
+                                    HYPRE_Real *tp, HYPRE_Int boxarray_id, hypre_Box *A_data_box, hypre_Box *b_data_box,
+                                    hypre_Box *x_data_box, hypre_Box *t_data_box, hypre_IndexRef stride );
+HYPRE_Int hypre_PointRelaxSetTol ( void *relax_vdata, HYPRE_Real tol );
+HYPRE_Int hypre_PointRelaxGetTol ( void *relax_vdata, HYPRE_Real *tol );
+HYPRE_Int hypre_PointRelaxSetMaxIter ( void *relax_vdata, HYPRE_Int max_iter );
+HYPRE_Int hypre_PointRelaxGetMaxIter ( void *relax_vdata, HYPRE_Int *max_iter );
+HYPRE_Int hypre_PointRelaxSetZeroGuess ( void *relax_vdata, HYPRE_Int zero_guess );
+HYPRE_Int hypre_PointRelaxGetZeroGuess ( void *relax_vdata, HYPRE_Int *zero_guess );
+HYPRE_Int hypre_PointRelaxGetNumIterations ( void *relax_vdata, HYPRE_Int *num_iterations );
+HYPRE_Int hypre_PointRelaxSetWeight ( void *relax_vdata, HYPRE_Real weight );
+HYPRE_Int hypre_PointRelaxSetNumPointsets ( void *relax_vdata, HYPRE_Int num_pointsets );
+HYPRE_Int hypre_PointRelaxSetPointset ( void *relax_vdata, HYPRE_Int pointset,
+                                        HYPRE_Int pointset_size, hypre_Index pointset_stride, hypre_Index *pointset_indices );
+HYPRE_Int hypre_PointRelaxSetPointsetRank ( void *relax_vdata, HYPRE_Int pointset,
+                                            HYPRE_Int pointset_rank );
+HYPRE_Int hypre_PointRelaxSetTempVec ( void *relax_vdata, hypre_StructVector *t );
+HYPRE_Int hypre_PointRelaxGetFinalRelativeResidualNorm ( void *relax_vdata, HYPRE_Real *norm );
+HYPRE_Int hypre_relax_wtx ( void *relax_vdata, HYPRE_Int pointset, hypre_StructVector *t,
+                            hypre_StructVector *x );
+HYPRE_Int hypre_relax_copy ( void *relax_vdata, HYPRE_Int pointset, hypre_StructVector *t,
+                             hypre_StructVector *x );
 
 /* red_black_constantcoef_gs.c */
-HYPRE_Int hypre_RedBlackConstantCoefGS ( void *relax_vdata , hypre_StructMatrix *A , hypre_StructVector *b , hypre_StructVector *x );
+HYPRE_Int hypre_RedBlackConstantCoefGS ( void *relax_vdata, hypre_StructMatrix *A,
+                                         hypre_StructVector *b, hypre_StructVector *x );
 
 /* red_black_gs.c */
 void *hypre_RedBlackGSCreate ( MPI_Comm comm );
 HYPRE_Int hypre_RedBlackGSDestroy ( void *relax_vdata );
-HYPRE_Int hypre_RedBlackGSSetup ( void *relax_vdata , hypre_StructMatrix *A , hypre_StructVector *b , hypre_StructVector *x );
-HYPRE_Int hypre_RedBlackGS ( void *relax_vdata , hypre_StructMatrix *A , hypre_StructVector *b , hypre_StructVector *x );
-HYPRE_Int hypre_RedBlackGSSetTol ( void *relax_vdata , HYPRE_Real tol );
-HYPRE_Int hypre_RedBlackGSSetMaxIter ( void *relax_vdata , HYPRE_Int max_iter );
-HYPRE_Int hypre_RedBlackGSSetZeroGuess ( void *relax_vdata , HYPRE_Int zero_guess );
+HYPRE_Int hypre_RedBlackGSSetup ( void *relax_vdata, hypre_StructMatrix *A, hypre_StructVector *b,
+                                  hypre_StructVector *x );
+HYPRE_Int hypre_RedBlackGS ( void *relax_vdata, hypre_StructMatrix *A, hypre_StructVector *b,
+                             hypre_StructVector *x );
+HYPRE_Int hypre_RedBlackGSSetTol ( void *relax_vdata, HYPRE_Real tol );
+HYPRE_Int hypre_RedBlackGSSetMaxIter ( void *relax_vdata, HYPRE_Int max_iter );
+HYPRE_Int hypre_RedBlackGSSetZeroGuess ( void *relax_vdata, HYPRE_Int zero_guess );
 HYPRE_Int hypre_RedBlackGSSetStartRed ( void *relax_vdata );
 HYPRE_Int hypre_RedBlackGSSetStartBlack ( void *relax_vdata );
 
 /* semi.c */
-HYPRE_Int hypre_StructInterpAssemble ( hypre_StructMatrix *A , hypre_StructMatrix *P , HYPRE_Int P_stored_as_transpose , HYPRE_Int cdir , hypre_Index index , hypre_Index stride );
+HYPRE_Int hypre_StructInterpAssemble ( hypre_StructMatrix *A, hypre_StructMatrix *P,
+                                       HYPRE_Int P_stored_as_transpose, HYPRE_Int cdir, hypre_Index index, hypre_Index stride );
 
 /* semi_interp.c */
 void *hypre_SemiInterpCreate ( void );
-HYPRE_Int hypre_SemiInterpSetup ( void *interp_vdata , hypre_StructMatrix *P , HYPRE_Int P_stored_as_transpose , hypre_StructVector *xc , hypre_StructVector *e , hypre_Index cindex , hypre_Index findex , hypre_Index stride );
-HYPRE_Int hypre_SemiInterp ( void *interp_vdata , hypre_StructMatrix *P , hypre_StructVector *xc , hypre_StructVector *e );
+HYPRE_Int hypre_SemiInterpSetup ( void *interp_vdata, hypre_StructMatrix *P,
+                                  HYPRE_Int P_stored_as_transpose, hypre_StructVector *xc, hypre_StructVector *e, hypre_Index cindex,
+                                  hypre_Index findex, hypre_Index stride );
+HYPRE_Int hypre_SemiInterp ( void *interp_vdata, hypre_StructMatrix *P, hypre_StructVector *xc,
+                             hypre_StructVector *e );
 HYPRE_Int hypre_SemiInterpDestroy ( void *interp_vdata );
 
 /* semi_restrict.c */
 void *hypre_SemiRestrictCreate ( void );
-HYPRE_Int hypre_SemiRestrictSetup ( void *restrict_vdata , hypre_StructMatrix *R , HYPRE_Int R_stored_as_transpose , hypre_StructVector *r , hypre_StructVector *rc , hypre_Index cindex , hypre_Index findex , hypre_Index stride );
-HYPRE_Int hypre_SemiRestrict ( void *restrict_vdata , hypre_StructMatrix *R , hypre_StructVector *r , hypre_StructVector *rc );
+HYPRE_Int hypre_SemiRestrictSetup ( void *restrict_vdata, hypre_StructMatrix *R,
+                                    HYPRE_Int R_stored_as_transpose, hypre_StructVector *r, hypre_StructVector *rc, hypre_Index cindex,
+                                    hypre_Index findex, hypre_Index stride );
+HYPRE_Int hypre_SemiRestrict ( void *restrict_vdata, hypre_StructMatrix *R, hypre_StructVector *r,
+                               hypre_StructVector *rc );
 HYPRE_Int hypre_SemiRestrictDestroy ( void *restrict_vdata );
 
 /* semi_setup_rap.c */
-hypre_StructMatrix *hypre_SemiCreateRAPOp ( hypre_StructMatrix *R , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructGrid *coarse_grid , HYPRE_Int cdir , HYPRE_Int P_stored_as_transpose );
-HYPRE_Int hypre_SemiBuildRAP ( hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , HYPRE_Int P_stored_as_transpose , hypre_StructMatrix *RAP );
+hypre_StructMatrix *hypre_SemiCreateRAPOp ( hypre_StructMatrix *R, hypre_StructMatrix *A,
+                                            hypre_StructMatrix *P, hypre_StructGrid *coarse_grid, HYPRE_Int cdir,
+                                            HYPRE_Int P_stored_as_transpose );
+HYPRE_Int hypre_SemiBuildRAP ( hypre_StructMatrix *A, hypre_StructMatrix *P, hypre_StructMatrix *R,
+                               HYPRE_Int cdir, hypre_Index cindex, hypre_Index cstride, HYPRE_Int P_stored_as_transpose,
+                               hypre_StructMatrix *RAP );
 
 /* smg2_setup_rap.c */
-hypre_StructMatrix *hypre_SMG2CreateRAPOp ( hypre_StructMatrix *R , hypre_StructMatrix *A , hypre_StructMatrix *PT , hypre_StructGrid *coarse_grid );
-HYPRE_Int hypre_SMG2BuildRAPSym ( hypre_StructMatrix *A , hypre_StructMatrix *PT , hypre_StructMatrix *R , hypre_StructMatrix *RAP , hypre_Index cindex , hypre_Index cstride );
-HYPRE_Int hypre_SMG2BuildRAPNoSym ( hypre_StructMatrix *A , hypre_StructMatrix *PT , hypre_StructMatrix *R , hypre_StructMatrix *RAP , hypre_Index cindex , hypre_Index cstride );
-HYPRE_Int hypre_SMG2RAPPeriodicSym ( hypre_StructMatrix *RAP , hypre_Index cindex , hypre_Index cstride );
-HYPRE_Int hypre_SMG2RAPPeriodicNoSym ( hypre_StructMatrix *RAP , hypre_Index cindex , hypre_Index cstride );
+hypre_StructMatrix *hypre_SMG2CreateRAPOp ( hypre_StructMatrix *R, hypre_StructMatrix *A,
+                                            hypre_StructMatrix *PT, hypre_StructGrid *coarse_grid );
+HYPRE_Int hypre_SMG2BuildRAPSym ( hypre_StructMatrix *A, hypre_StructMatrix *PT,
+                                  hypre_StructMatrix *R, hypre_StructMatrix *RAP, hypre_Index cindex, hypre_Index cstride );
+HYPRE_Int hypre_SMG2BuildRAPNoSym ( hypre_StructMatrix *A, hypre_StructMatrix *PT,
+                                    hypre_StructMatrix *R, hypre_StructMatrix *RAP, hypre_Index cindex, hypre_Index cstride );
+HYPRE_Int hypre_SMG2RAPPeriodicSym ( hypre_StructMatrix *RAP, hypre_Index cindex,
+                                     hypre_Index cstride );
+HYPRE_Int hypre_SMG2RAPPeriodicNoSym ( hypre_StructMatrix *RAP, hypre_Index cindex,
+                                       hypre_Index cstride );
 
 /* smg3_setup_rap.c */
-hypre_StructMatrix *hypre_SMG3CreateRAPOp ( hypre_StructMatrix *R , hypre_StructMatrix *A , hypre_StructMatrix *PT , hypre_StructGrid *coarse_grid );
-HYPRE_Int hypre_SMG3BuildRAPSym ( hypre_StructMatrix *A , hypre_StructMatrix *PT , hypre_StructMatrix *R , hypre_StructMatrix *RAP , hypre_Index cindex , hypre_Index cstride );
-HYPRE_Int hypre_SMG3BuildRAPNoSym ( hypre_StructMatrix *A , hypre_StructMatrix *PT , hypre_StructMatrix *R , hypre_StructMatrix *RAP , hypre_Index cindex , hypre_Index cstride );
-HYPRE_Int hypre_SMG3RAPPeriodicSym ( hypre_StructMatrix *RAP , hypre_Index cindex , hypre_Index cstride );
-HYPRE_Int hypre_SMG3RAPPeriodicNoSym ( hypre_StructMatrix *RAP , hypre_Index cindex , hypre_Index cstride );
+hypre_StructMatrix *hypre_SMG3CreateRAPOp ( hypre_StructMatrix *R, hypre_StructMatrix *A,
+                                            hypre_StructMatrix *PT, hypre_StructGrid *coarse_grid );
+HYPRE_Int hypre_SMG3BuildRAPSym ( hypre_StructMatrix *A, hypre_StructMatrix *PT,
+                                  hypre_StructMatrix *R, hypre_StructMatrix *RAP, hypre_Index cindex, hypre_Index cstride );
+HYPRE_Int hypre_SMG3BuildRAPNoSym ( hypre_StructMatrix *A, hypre_StructMatrix *PT,
+                                    hypre_StructMatrix *R, hypre_StructMatrix *RAP, hypre_Index cindex, hypre_Index cstride );
+HYPRE_Int hypre_SMG3RAPPeriodicSym ( hypre_StructMatrix *RAP, hypre_Index cindex,
+                                     hypre_Index cstride );
+HYPRE_Int hypre_SMG3RAPPeriodicNoSym ( hypre_StructMatrix *RAP, hypre_Index cindex,
+                                       hypre_Index cstride );
 
 /* smg_axpy.c */
-HYPRE_Int hypre_SMGAxpy ( HYPRE_Real alpha , hypre_StructVector *x , hypre_StructVector *y , hypre_Index base_index , hypre_Index base_stride );
+HYPRE_Int hypre_SMGAxpy ( HYPRE_Real alpha, hypre_StructVector *x, hypre_StructVector *y,
+                          hypre_Index base_index, hypre_Index base_stride );
 
 /* smg.c */
 void *hypre_SMGCreate ( MPI_Comm comm );
 HYPRE_Int hypre_SMGDestroy ( void *smg_vdata );
-HYPRE_Int hypre_SMGSetMemoryUse ( void *smg_vdata , HYPRE_Int memory_use );
-HYPRE_Int hypre_SMGGetMemoryUse ( void *smg_vdata , HYPRE_Int *memory_use );
-HYPRE_Int hypre_SMGSetTol ( void *smg_vdata , HYPRE_Real tol );
-HYPRE_Int hypre_SMGGetTol ( void *smg_vdata , HYPRE_Real *tol );
-HYPRE_Int hypre_SMGSetMaxIter ( void *smg_vdata , HYPRE_Int max_iter );
-HYPRE_Int hypre_SMGGetMaxIter ( void *smg_vdata , HYPRE_Int *max_iter );
-HYPRE_Int hypre_SMGSetRelChange ( void *smg_vdata , HYPRE_Int rel_change );
-HYPRE_Int hypre_SMGGetRelChange ( void *smg_vdata , HYPRE_Int *rel_change );
-HYPRE_Int hypre_SMGSetZeroGuess ( void *smg_vdata , HYPRE_Int zero_guess );
-HYPRE_Int hypre_SMGGetZeroGuess ( void *smg_vdata , HYPRE_Int *zero_guess );
-HYPRE_Int hypre_SMGSetNumPreRelax ( void *smg_vdata , HYPRE_Int num_pre_relax );
-HYPRE_Int hypre_SMGGetNumPreRelax ( void *smg_vdata , HYPRE_Int *num_pre_relax );
-HYPRE_Int hypre_SMGSetNumPostRelax ( void *smg_vdata , HYPRE_Int num_post_relax );
-HYPRE_Int hypre_SMGGetNumPostRelax ( void *smg_vdata , HYPRE_Int *num_post_relax );
-HYPRE_Int hypre_SMGSetBase ( void *smg_vdata , hypre_Index base_index , hypre_Index base_stride );
-HYPRE_Int hypre_SMGSetLogging ( void *smg_vdata , HYPRE_Int logging );
-HYPRE_Int hypre_SMGGetLogging ( void *smg_vdata , HYPRE_Int *logging );
-HYPRE_Int hypre_SMGSetPrintLevel ( void *smg_vdata , HYPRE_Int print_level );
-HYPRE_Int hypre_SMGGetPrintLevel ( void *smg_vdata , HYPRE_Int *print_level );
-HYPRE_Int hypre_SMGGetNumIterations ( void *smg_vdata , HYPRE_Int *num_iterations );
-HYPRE_Int hypre_SMGPrintLogging ( void *smg_vdata , HYPRE_Int myid );
-HYPRE_Int hypre_SMGGetFinalRelativeResidualNorm ( void *smg_vdata , HYPRE_Real *relative_residual_norm );
-HYPRE_Int hypre_SMGSetStructVectorConstantValues ( hypre_StructVector *vector , HYPRE_Real values , hypre_BoxArray *box_array , hypre_Index stride );
+HYPRE_Int hypre_SMGSetMemoryUse ( void *smg_vdata, HYPRE_Int memory_use );
+HYPRE_Int hypre_SMGGetMemoryUse ( void *smg_vdata, HYPRE_Int *memory_use );
+HYPRE_Int hypre_SMGSetTol ( void *smg_vdata, HYPRE_Real tol );
+HYPRE_Int hypre_SMGGetTol ( void *smg_vdata, HYPRE_Real *tol );
+HYPRE_Int hypre_SMGSetMaxIter ( void *smg_vdata, HYPRE_Int max_iter );
+HYPRE_Int hypre_SMGGetMaxIter ( void *smg_vdata, HYPRE_Int *max_iter );
+HYPRE_Int hypre_SMGSetRelChange ( void *smg_vdata, HYPRE_Int rel_change );
+HYPRE_Int hypre_SMGGetRelChange ( void *smg_vdata, HYPRE_Int *rel_change );
+HYPRE_Int hypre_SMGSetZeroGuess ( void *smg_vdata, HYPRE_Int zero_guess );
+HYPRE_Int hypre_SMGGetZeroGuess ( void *smg_vdata, HYPRE_Int *zero_guess );
+HYPRE_Int hypre_SMGSetNumPreRelax ( void *smg_vdata, HYPRE_Int num_pre_relax );
+HYPRE_Int hypre_SMGGetNumPreRelax ( void *smg_vdata, HYPRE_Int *num_pre_relax );
+HYPRE_Int hypre_SMGSetNumPostRelax ( void *smg_vdata, HYPRE_Int num_post_relax );
+HYPRE_Int hypre_SMGGetNumPostRelax ( void *smg_vdata, HYPRE_Int *num_post_relax );
+HYPRE_Int hypre_SMGSetBase ( void *smg_vdata, hypre_Index base_index, hypre_Index base_stride );
+HYPRE_Int hypre_SMGSetLogging ( void *smg_vdata, HYPRE_Int logging );
+HYPRE_Int hypre_SMGGetLogging ( void *smg_vdata, HYPRE_Int *logging );
+HYPRE_Int hypre_SMGSetPrintLevel ( void *smg_vdata, HYPRE_Int print_level );
+HYPRE_Int hypre_SMGGetPrintLevel ( void *smg_vdata, HYPRE_Int *print_level );
+HYPRE_Int hypre_SMGGetNumIterations ( void *smg_vdata, HYPRE_Int *num_iterations );
+HYPRE_Int hypre_SMGPrintLogging ( void *smg_vdata, HYPRE_Int myid );
+HYPRE_Int hypre_SMGGetFinalRelativeResidualNorm ( void *smg_vdata,
+                                                  HYPRE_Real *relative_residual_norm );
+HYPRE_Int hypre_SMGSetStructVectorConstantValues ( hypre_StructVector *vector, HYPRE_Real values,
+                                                   hypre_BoxArray *box_array, hypre_Index stride );
 HYPRE_Int hypre_StructSMGSetMaxLevel( void   *smg_vdata, HYPRE_Int   max_level  );
 
 /* smg_relax.c */
@@ -340,119 +500,170 @@ HYPRE_Int hypre_SMGRelaxDestroyTempVec ( void *relax_vdata );
 HYPRE_Int hypre_SMGRelaxDestroyARem ( void *relax_vdata );
 HYPRE_Int hypre_SMGRelaxDestroyASol ( void *relax_vdata );
 HYPRE_Int hypre_SMGRelaxDestroy ( void *relax_vdata );
-HYPRE_Int hypre_SMGRelax ( void *relax_vdata , hypre_StructMatrix *A , hypre_StructVector *b , hypre_StructVector *x );
-HYPRE_Int hypre_SMGRelaxSetup ( void *relax_vdata , hypre_StructMatrix *A , hypre_StructVector *b , hypre_StructVector *x );
-HYPRE_Int hypre_SMGRelaxSetupTempVec ( void *relax_vdata , hypre_StructMatrix *A , hypre_StructVector *b , hypre_StructVector *x );
-HYPRE_Int hypre_SMGRelaxSetupARem ( void *relax_vdata , hypre_StructMatrix *A , hypre_StructVector *b , hypre_StructVector *x );
-HYPRE_Int hypre_SMGRelaxSetupASol ( void *relax_vdata , hypre_StructMatrix *A , hypre_StructVector *b , hypre_StructVector *x );
-HYPRE_Int hypre_SMGRelaxSetTempVec ( void *relax_vdata , hypre_StructVector *temp_vec );
-HYPRE_Int hypre_SMGRelaxSetMemoryUse ( void *relax_vdata , HYPRE_Int memory_use );
-HYPRE_Int hypre_SMGRelaxSetTol ( void *relax_vdata , HYPRE_Real tol );
-HYPRE_Int hypre_SMGRelaxSetMaxIter ( void *relax_vdata , HYPRE_Int max_iter );
-HYPRE_Int hypre_SMGRelaxSetZeroGuess ( void *relax_vdata , HYPRE_Int zero_guess );
-HYPRE_Int hypre_SMGRelaxSetNumSpaces ( void *relax_vdata , HYPRE_Int num_spaces );
-HYPRE_Int hypre_SMGRelaxSetNumPreSpaces ( void *relax_vdata , HYPRE_Int num_pre_spaces );
-HYPRE_Int hypre_SMGRelaxSetNumRegSpaces ( void *relax_vdata , HYPRE_Int num_reg_spaces );
-HYPRE_Int hypre_SMGRelaxSetSpace ( void *relax_vdata , HYPRE_Int i , HYPRE_Int space_index , HYPRE_Int space_stride );
-HYPRE_Int hypre_SMGRelaxSetRegSpaceRank ( void *relax_vdata , HYPRE_Int i , HYPRE_Int reg_space_rank );
-HYPRE_Int hypre_SMGRelaxSetPreSpaceRank ( void *relax_vdata , HYPRE_Int i , HYPRE_Int pre_space_rank );
-HYPRE_Int hypre_SMGRelaxSetBase ( void *relax_vdata , hypre_Index base_index , hypre_Index base_stride );
-HYPRE_Int hypre_SMGRelaxSetNumPreRelax ( void *relax_vdata , HYPRE_Int num_pre_relax );
-HYPRE_Int hypre_SMGRelaxSetNumPostRelax ( void *relax_vdata , HYPRE_Int num_post_relax );
-HYPRE_Int hypre_SMGRelaxSetNewMatrixStencil ( void *relax_vdata , hypre_StructStencil *diff_stencil );
-HYPRE_Int hypre_SMGRelaxSetupBaseBoxArray ( void *relax_vdata , hypre_StructMatrix *A , hypre_StructVector *b , hypre_StructVector *x );
+HYPRE_Int hypre_SMGRelax ( void *relax_vdata, hypre_StructMatrix *A, hypre_StructVector *b,
+                           hypre_StructVector *x );
+HYPRE_Int hypre_SMGRelaxSetup ( void *relax_vdata, hypre_StructMatrix *A, hypre_StructVector *b,
+                                hypre_StructVector *x );
+HYPRE_Int hypre_SMGRelaxSetupTempVec ( void *relax_vdata, hypre_StructMatrix *A,
+                                       hypre_StructVector *b, hypre_StructVector *x );
+HYPRE_Int hypre_SMGRelaxSetupARem ( void *relax_vdata, hypre_StructMatrix *A, hypre_StructVector *b,
+                                    hypre_StructVector *x );
+HYPRE_Int hypre_SMGRelaxSetupASol ( void *relax_vdata, hypre_StructMatrix *A, hypre_StructVector *b,
+                                    hypre_StructVector *x );
+HYPRE_Int hypre_SMGRelaxSetTempVec ( void *relax_vdata, hypre_StructVector *temp_vec );
+HYPRE_Int hypre_SMGRelaxSetMemoryUse ( void *relax_vdata, HYPRE_Int memory_use );
+HYPRE_Int hypre_SMGRelaxSetTol ( void *relax_vdata, HYPRE_Real tol );
+HYPRE_Int hypre_SMGRelaxSetMaxIter ( void *relax_vdata, HYPRE_Int max_iter );
+HYPRE_Int hypre_SMGRelaxSetZeroGuess ( void *relax_vdata, HYPRE_Int zero_guess );
+HYPRE_Int hypre_SMGRelaxSetNumSpaces ( void *relax_vdata, HYPRE_Int num_spaces );
+HYPRE_Int hypre_SMGRelaxSetNumPreSpaces ( void *relax_vdata, HYPRE_Int num_pre_spaces );
+HYPRE_Int hypre_SMGRelaxSetNumRegSpaces ( void *relax_vdata, HYPRE_Int num_reg_spaces );
+HYPRE_Int hypre_SMGRelaxSetSpace ( void *relax_vdata, HYPRE_Int i, HYPRE_Int space_index,
+                                   HYPRE_Int space_stride );
+HYPRE_Int hypre_SMGRelaxSetRegSpaceRank ( void *relax_vdata, HYPRE_Int i,
+                                          HYPRE_Int reg_space_rank );
+HYPRE_Int hypre_SMGRelaxSetPreSpaceRank ( void *relax_vdata, HYPRE_Int i,
+                                          HYPRE_Int pre_space_rank );
+HYPRE_Int hypre_SMGRelaxSetBase ( void *relax_vdata, hypre_Index base_index,
+                                  hypre_Index base_stride );
+HYPRE_Int hypre_SMGRelaxSetNumPreRelax ( void *relax_vdata, HYPRE_Int num_pre_relax );
+HYPRE_Int hypre_SMGRelaxSetNumPostRelax ( void *relax_vdata, HYPRE_Int num_post_relax );
+HYPRE_Int hypre_SMGRelaxSetNewMatrixStencil ( void *relax_vdata,
+                                              hypre_StructStencil *diff_stencil );
+HYPRE_Int hypre_SMGRelaxSetupBaseBoxArray ( void *relax_vdata, hypre_StructMatrix *A,
+                                            hypre_StructVector *b, hypre_StructVector *x );
 HYPRE_Int hypre_SMGRelaxSetMaxLevel( void *relax_vdata, HYPRE_Int   num_max_level );
 
 /* smg_residual.c */
 void *hypre_SMGResidualCreate ( void );
-HYPRE_Int hypre_SMGResidualSetup ( void *residual_vdata , hypre_StructMatrix *A , hypre_StructVector *x , hypre_StructVector *b , hypre_StructVector *r );
-HYPRE_Int hypre_SMGResidual ( void *residual_vdata , hypre_StructMatrix *A , hypre_StructVector *x , hypre_StructVector *b , hypre_StructVector *r );
-HYPRE_Int hypre_SMGResidualSetBase ( void *residual_vdata , hypre_Index base_index , hypre_Index base_stride );
+HYPRE_Int hypre_SMGResidualSetup ( void *residual_vdata, hypre_StructMatrix *A,
+                                   hypre_StructVector *x, hypre_StructVector *b, hypre_StructVector *r );
+HYPRE_Int hypre_SMGResidual ( void *residual_vdata, hypre_StructMatrix *A, hypre_StructVector *x,
+                              hypre_StructVector *b, hypre_StructVector *r );
+HYPRE_Int hypre_SMGResidualSetBase ( void *residual_vdata, hypre_Index base_index,
+                                     hypre_Index base_stride );
 HYPRE_Int hypre_SMGResidualDestroy ( void *residual_vdata );
 
 /* smg_residual_unrolled.c */
 void *hypre_SMGResidualCreate ( void );
-HYPRE_Int hypre_SMGResidualSetup ( void *residual_vdata , hypre_StructMatrix *A , hypre_StructVector *x , hypre_StructVector *b , hypre_StructVector *r );
-HYPRE_Int hypre_SMGResidual ( void *residual_vdata , hypre_StructMatrix *A , hypre_StructVector *x , hypre_StructVector *b , hypre_StructVector *r );
-HYPRE_Int hypre_SMGResidualSetBase ( void *residual_vdata , hypre_Index base_index , hypre_Index base_stride );
+HYPRE_Int hypre_SMGResidualSetup ( void *residual_vdata, hypre_StructMatrix *A,
+                                   hypre_StructVector *x, hypre_StructVector *b, hypre_StructVector *r );
+HYPRE_Int hypre_SMGResidual ( void *residual_vdata, hypre_StructMatrix *A, hypre_StructVector *x,
+                              hypre_StructVector *b, hypre_StructVector *r );
+HYPRE_Int hypre_SMGResidualSetBase ( void *residual_vdata, hypre_Index base_index,
+                                     hypre_Index base_stride );
 HYPRE_Int hypre_SMGResidualDestroy ( void *residual_vdata );
 
 /* smg_setup.c */
-HYPRE_Int hypre_SMGSetup ( void *smg_vdata , hypre_StructMatrix *A , hypre_StructVector *b , hypre_StructVector *x );
+HYPRE_Int hypre_SMGSetup ( void *smg_vdata, hypre_StructMatrix *A, hypre_StructVector *b,
+                           hypre_StructVector *x );
 
 /* smg_setup_interp.c */
-hypre_StructMatrix *hypre_SMGCreateInterpOp ( hypre_StructMatrix *A , hypre_StructGrid *cgrid , HYPRE_Int cdir );
-HYPRE_Int hypre_SMGSetupInterpOp ( void *relax_data , hypre_StructMatrix *A , hypre_StructVector *b , hypre_StructVector *x , hypre_StructMatrix *PT , HYPRE_Int cdir , hypre_Index cindex , hypre_Index findex , hypre_Index stride );
+hypre_StructMatrix *hypre_SMGCreateInterpOp ( hypre_StructMatrix *A, hypre_StructGrid *cgrid,
+                                              HYPRE_Int cdir );
+HYPRE_Int hypre_SMGSetupInterpOp ( void *relax_data, hypre_StructMatrix *A, hypre_StructVector *b,
+                                   hypre_StructVector *x, hypre_StructMatrix *PT, HYPRE_Int cdir, hypre_Index cindex,
+                                   hypre_Index findex, hypre_Index stride );
 
 /* smg_setup_rap.c */
-hypre_StructMatrix *hypre_SMGCreateRAPOp ( hypre_StructMatrix *R , hypre_StructMatrix *A , hypre_StructMatrix *PT , hypre_StructGrid *coarse_grid );
-HYPRE_Int hypre_SMGSetupRAPOp ( hypre_StructMatrix *R , hypre_StructMatrix *A , hypre_StructMatrix *PT , hypre_StructMatrix *Ac , hypre_Index cindex , hypre_Index cstride );
+hypre_StructMatrix *hypre_SMGCreateRAPOp ( hypre_StructMatrix *R, hypre_StructMatrix *A,
+                                           hypre_StructMatrix *PT, hypre_StructGrid *coarse_grid );
+HYPRE_Int hypre_SMGSetupRAPOp ( hypre_StructMatrix *R, hypre_StructMatrix *A,
+                                hypre_StructMatrix *PT, hypre_StructMatrix *Ac, hypre_Index cindex, hypre_Index cstride );
 
 /* smg_setup_restrict.c */
-hypre_StructMatrix *hypre_SMGCreateRestrictOp ( hypre_StructMatrix *A , hypre_StructGrid *cgrid , HYPRE_Int cdir );
-HYPRE_Int hypre_SMGSetupRestrictOp ( hypre_StructMatrix *A , hypre_StructMatrix *R , hypre_StructVector *temp_vec , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride );
+hypre_StructMatrix *hypre_SMGCreateRestrictOp ( hypre_StructMatrix *A, hypre_StructGrid *cgrid,
+                                                HYPRE_Int cdir );
+HYPRE_Int hypre_SMGSetupRestrictOp ( hypre_StructMatrix *A, hypre_StructMatrix *R,
+                                     hypre_StructVector *temp_vec, HYPRE_Int cdir, hypre_Index cindex, hypre_Index cstride );
 
 /* smg_solve.c */
-HYPRE_Int hypre_SMGSolve ( void *smg_vdata , hypre_StructMatrix *A , hypre_StructVector *b , hypre_StructVector *x );
+HYPRE_Int hypre_SMGSolve ( void *smg_vdata, hypre_StructMatrix *A, hypre_StructVector *b,
+                           hypre_StructVector *x );
 
 /* sparse_msg2_setup_rap.c */
-hypre_StructMatrix *hypre_SparseMSG2CreateRAPOp ( hypre_StructMatrix *R , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructGrid *coarse_grid , HYPRE_Int cdir );
-HYPRE_Int hypre_SparseMSG2BuildRAPSym ( hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_Index stridePR , hypre_StructMatrix *RAP );
-HYPRE_Int hypre_SparseMSG2BuildRAPNoSym ( hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_Index stridePR , hypre_StructMatrix *RAP );
+hypre_StructMatrix *hypre_SparseMSG2CreateRAPOp ( hypre_StructMatrix *R, hypre_StructMatrix *A,
+                                                  hypre_StructMatrix *P, hypre_StructGrid *coarse_grid, HYPRE_Int cdir );
+HYPRE_Int hypre_SparseMSG2BuildRAPSym ( hypre_StructMatrix *A, hypre_StructMatrix *P,
+                                        hypre_StructMatrix *R, HYPRE_Int cdir, hypre_Index cindex, hypre_Index cstride,
+                                        hypre_Index stridePR, hypre_StructMatrix *RAP );
+HYPRE_Int hypre_SparseMSG2BuildRAPNoSym ( hypre_StructMatrix *A, hypre_StructMatrix *P,
+                                          hypre_StructMatrix *R, HYPRE_Int cdir, hypre_Index cindex, hypre_Index cstride,
+                                          hypre_Index stridePR, hypre_StructMatrix *RAP );
 
 /* sparse_msg3_setup_rap.c */
-hypre_StructMatrix *hypre_SparseMSG3CreateRAPOp ( hypre_StructMatrix *R , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructGrid *coarse_grid , HYPRE_Int cdir );
-HYPRE_Int hypre_SparseMSG3BuildRAPSym ( hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_Index stridePR , hypre_StructMatrix *RAP );
-HYPRE_Int hypre_SparseMSG3BuildRAPNoSym ( hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_Index stridePR , hypre_StructMatrix *RAP );
+hypre_StructMatrix *hypre_SparseMSG3CreateRAPOp ( hypre_StructMatrix *R, hypre_StructMatrix *A,
+                                                  hypre_StructMatrix *P, hypre_StructGrid *coarse_grid, HYPRE_Int cdir );
+HYPRE_Int hypre_SparseMSG3BuildRAPSym ( hypre_StructMatrix *A, hypre_StructMatrix *P,
+                                        hypre_StructMatrix *R, HYPRE_Int cdir, hypre_Index cindex, hypre_Index cstride,
+                                        hypre_Index stridePR, hypre_StructMatrix *RAP );
+HYPRE_Int hypre_SparseMSG3BuildRAPNoSym ( hypre_StructMatrix *A, hypre_StructMatrix *P,
+                                          hypre_StructMatrix *R, HYPRE_Int cdir, hypre_Index cindex, hypre_Index cstride,
+                                          hypre_Index stridePR, hypre_StructMatrix *RAP );
 
 /* sparse_msg.c */
 void *hypre_SparseMSGCreate ( MPI_Comm comm );
 HYPRE_Int hypre_SparseMSGDestroy ( void *smsg_vdata );
-HYPRE_Int hypre_SparseMSGSetTol ( void *smsg_vdata , HYPRE_Real tol );
-HYPRE_Int hypre_SparseMSGSetMaxIter ( void *smsg_vdata , HYPRE_Int max_iter );
-HYPRE_Int hypre_SparseMSGSetJump ( void *smsg_vdata , HYPRE_Int jump );
-HYPRE_Int hypre_SparseMSGSetRelChange ( void *smsg_vdata , HYPRE_Int rel_change );
-HYPRE_Int hypre_SparseMSGSetZeroGuess ( void *smsg_vdata , HYPRE_Int zero_guess );
-HYPRE_Int hypre_SparseMSGSetRelaxType ( void *smsg_vdata , HYPRE_Int relax_type );
-HYPRE_Int hypre_SparseMSGSetJacobiWeight ( void *smsg_vdata , HYPRE_Real weight );
-HYPRE_Int hypre_SparseMSGSetNumPreRelax ( void *smsg_vdata , HYPRE_Int num_pre_relax );
-HYPRE_Int hypre_SparseMSGSetNumPostRelax ( void *smsg_vdata , HYPRE_Int num_post_relax );
-HYPRE_Int hypre_SparseMSGSetNumFineRelax ( void *smsg_vdata , HYPRE_Int num_fine_relax );
-HYPRE_Int hypre_SparseMSGSetLogging ( void *smsg_vdata , HYPRE_Int logging );
-HYPRE_Int hypre_SparseMSGSetPrintLevel ( void *smsg_vdata , HYPRE_Int print_level );
-HYPRE_Int hypre_SparseMSGGetNumIterations ( void *smsg_vdata , HYPRE_Int *num_iterations );
-HYPRE_Int hypre_SparseMSGPrintLogging ( void *smsg_vdata , HYPRE_Int myid );
-HYPRE_Int hypre_SparseMSGGetFinalRelativeResidualNorm ( void *smsg_vdata , HYPRE_Real *relative_residual_norm );
+HYPRE_Int hypre_SparseMSGSetTol ( void *smsg_vdata, HYPRE_Real tol );
+HYPRE_Int hypre_SparseMSGSetMaxIter ( void *smsg_vdata, HYPRE_Int max_iter );
+HYPRE_Int hypre_SparseMSGSetJump ( void *smsg_vdata, HYPRE_Int jump );
+HYPRE_Int hypre_SparseMSGSetRelChange ( void *smsg_vdata, HYPRE_Int rel_change );
+HYPRE_Int hypre_SparseMSGSetZeroGuess ( void *smsg_vdata, HYPRE_Int zero_guess );
+HYPRE_Int hypre_SparseMSGSetRelaxType ( void *smsg_vdata, HYPRE_Int relax_type );
+HYPRE_Int hypre_SparseMSGSetJacobiWeight ( void *smsg_vdata, HYPRE_Real weight );
+HYPRE_Int hypre_SparseMSGSetNumPreRelax ( void *smsg_vdata, HYPRE_Int num_pre_relax );
+HYPRE_Int hypre_SparseMSGSetNumPostRelax ( void *smsg_vdata, HYPRE_Int num_post_relax );
+HYPRE_Int hypre_SparseMSGSetNumFineRelax ( void *smsg_vdata, HYPRE_Int num_fine_relax );
+HYPRE_Int hypre_SparseMSGSetLogging ( void *smsg_vdata, HYPRE_Int logging );
+HYPRE_Int hypre_SparseMSGSetPrintLevel ( void *smsg_vdata, HYPRE_Int print_level );
+HYPRE_Int hypre_SparseMSGGetNumIterations ( void *smsg_vdata, HYPRE_Int *num_iterations );
+HYPRE_Int hypre_SparseMSGPrintLogging ( void *smsg_vdata, HYPRE_Int myid );
+HYPRE_Int hypre_SparseMSGGetFinalRelativeResidualNorm ( void *smsg_vdata,
+                                                        HYPRE_Real *relative_residual_norm );
 
 /* sparse_msg_filter.c */
-HYPRE_Int hypre_SparseMSGFilterSetup ( hypre_StructMatrix *A , HYPRE_Int *num_grids , HYPRE_Int lx , HYPRE_Int ly , HYPRE_Int lz , HYPRE_Int jump , hypre_StructVector *visitx , hypre_StructVector *visity , hypre_StructVector *visitz );
-HYPRE_Int hypre_SparseMSGFilter ( hypre_StructVector *visit , hypre_StructVector *e , HYPRE_Int lx , HYPRE_Int ly , HYPRE_Int lz , HYPRE_Int jump );
+HYPRE_Int hypre_SparseMSGFilterSetup ( hypre_StructMatrix *A, HYPRE_Int *num_grids, HYPRE_Int lx,
+                                       HYPRE_Int ly, HYPRE_Int lz, HYPRE_Int jump, hypre_StructVector *visitx, hypre_StructVector *visity,
+                                       hypre_StructVector *visitz );
+HYPRE_Int hypre_SparseMSGFilter ( hypre_StructVector *visit, hypre_StructVector *e, HYPRE_Int lx,
+                                  HYPRE_Int ly, HYPRE_Int lz, HYPRE_Int jump );
 
 /* sparse_msg_interp.c */
 void *hypre_SparseMSGInterpCreate ( void );
-HYPRE_Int hypre_SparseMSGInterpSetup ( void *interp_vdata , hypre_StructMatrix *P , hypre_StructVector *xc , hypre_StructVector *e , hypre_Index cindex , hypre_Index findex , hypre_Index stride , hypre_Index strideP );
-HYPRE_Int hypre_SparseMSGInterp ( void *interp_vdata , hypre_StructMatrix *P , hypre_StructVector *xc , hypre_StructVector *e );
+HYPRE_Int hypre_SparseMSGInterpSetup ( void *interp_vdata, hypre_StructMatrix *P,
+                                       hypre_StructVector *xc, hypre_StructVector *e, hypre_Index cindex, hypre_Index findex,
+                                       hypre_Index stride, hypre_Index strideP );
+HYPRE_Int hypre_SparseMSGInterp ( void *interp_vdata, hypre_StructMatrix *P, hypre_StructVector *xc,
+                                  hypre_StructVector *e );
 HYPRE_Int hypre_SparseMSGInterpDestroy ( void *interp_vdata );
 
 /* sparse_msg_restrict.c */
 void *hypre_SparseMSGRestrictCreate ( void );
-HYPRE_Int hypre_SparseMSGRestrictSetup ( void *restrict_vdata , hypre_StructMatrix *R , hypre_StructVector *r , hypre_StructVector *rc , hypre_Index cindex , hypre_Index findex , hypre_Index stride , hypre_Index strideR );
-HYPRE_Int hypre_SparseMSGRestrict ( void *restrict_vdata , hypre_StructMatrix *R , hypre_StructVector *r , hypre_StructVector *rc );
+HYPRE_Int hypre_SparseMSGRestrictSetup ( void *restrict_vdata, hypre_StructMatrix *R,
+                                         hypre_StructVector *r, hypre_StructVector *rc, hypre_Index cindex, hypre_Index findex,
+                                         hypre_Index stride, hypre_Index strideR );
+HYPRE_Int hypre_SparseMSGRestrict ( void *restrict_vdata, hypre_StructMatrix *R,
+                                    hypre_StructVector *r, hypre_StructVector *rc );
 HYPRE_Int hypre_SparseMSGRestrictDestroy ( void *restrict_vdata );
 
 /* sparse_msg_setup.c */
-HYPRE_Int hypre_SparseMSGSetup ( void *smsg_vdata , hypre_StructMatrix *A , hypre_StructVector *b , hypre_StructVector *x );
+HYPRE_Int hypre_SparseMSGSetup ( void *smsg_vdata, hypre_StructMatrix *A, hypre_StructVector *b,
+                                 hypre_StructVector *x );
 
 /* sparse_msg_setup_rap.c */
-hypre_StructMatrix *hypre_SparseMSGCreateRAPOp ( hypre_StructMatrix *R , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructGrid *coarse_grid , HYPRE_Int cdir );
-HYPRE_Int hypre_SparseMSGSetupRAPOp ( hypre_StructMatrix *R , hypre_StructMatrix *A , hypre_StructMatrix *P , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_Index stridePR , hypre_StructMatrix *Ac );
+hypre_StructMatrix *hypre_SparseMSGCreateRAPOp ( hypre_StructMatrix *R, hypre_StructMatrix *A,
+                                                 hypre_StructMatrix *P, hypre_StructGrid *coarse_grid, HYPRE_Int cdir );
+HYPRE_Int hypre_SparseMSGSetupRAPOp ( hypre_StructMatrix *R, hypre_StructMatrix *A,
+                                      hypre_StructMatrix *P, HYPRE_Int cdir, hypre_Index cindex, hypre_Index cstride,
+                                      hypre_Index stridePR, hypre_StructMatrix *Ac );
 
 /* sparse_msg_solve.c */
-HYPRE_Int hypre_SparseMSGSolve ( void *smsg_vdata , hypre_StructMatrix *A , hypre_StructVector *b , hypre_StructVector *x );
-
+HYPRE_Int hypre_SparseMSGSolve ( void *smsg_vdata, hypre_StructMatrix *A, hypre_StructVector *b,
+                                 hypre_StructVector *x );
 
 #ifdef __cplusplus
 }
 #endif
 
 #endif
+
diff --git a/external/hypre/src/struct_ls/coarsen.c b/external/hypre/src/struct_ls/coarsen.c
index dc499056..91e503f9 100644
--- a/external/hypre/src/struct_ls/coarsen.c
+++ b/external/hypre/src/struct_ls/coarsen.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -56,7 +56,7 @@ HYPRE_Int
 hypre_StructMapCoarseToFine( hypre_Index cindex,
                              hypre_Index index,
                              hypre_Index stride,
-                             hypre_Index findex ) 
+                             hypre_Index findex )
 {
    hypre_IndexX(findex) =
       hypre_IndexX(cindex) * hypre_IndexX(stride) + hypre_IndexX(index);
@@ -80,7 +80,7 @@ hypre_StructMapCoarseToFine( hypre_Index cindex,
  *
  * This routine coarsens the grid, 'fgrid', by the coarsening factor, 'stride',
  * using the index mapping in 'hypre_StructMapFineToCoarse'.
- *  
+ *
  *  1.  A coarse grid is created with boxes that result from coarsening the fine
  *  grid boxes, bounding box, and periodicity information.
  *
@@ -134,13 +134,13 @@ hypre_StructCoarsen( hypre_StructGrid  *fgrid,
 
    hypre_BoxManEntry *entries;
    hypre_BoxManEntry  *entry;
-     
+
    void               *entry_info = NULL;
- 
-#if TIME_DEBUG  
+
+#if TIME_DEBUG
    HYPRE_Int tindex;
    char new_title[80];
-   hypre_sprintf(new_title,"Coarsen.%d",s_coarsen_num);
+   hypre_sprintf(new_title, "Coarsen.%d", s_coarsen_num);
    tindex = hypre_InitializeTiming(new_title);
    s_coarsen_num++;
 
@@ -156,7 +156,7 @@ hypre_StructCoarsen( hypre_StructGrid  *fgrid,
    comm  = hypre_StructGridComm(fgrid);
    ndim  = hypre_StructGridNDim(fgrid);
    max_distance = hypre_StructGridMaxDistance(fgrid);
-   
+
    /* initial */
    hypre_MPI_Comm_rank(comm, &myid );
 
@@ -172,12 +172,12 @@ hypre_StructCoarsen( hypre_StructGrid  *fgrid,
       hypre_StructCoarsenBox(box, index, stride);
       cids[i] = fids[i];
    }
-   
+
    /* prune? */
-   /* zero volume boxes are needed when forming P and P^T */ 
+   /* zero volume boxes are needed when forming P and P^T */
    if (prune)
    {
-      count = 0;    
+      count = 0;
       hypre_ForBoxI(i, my_boxes)
       {
          box = hypre_BoxArrayBox(my_boxes, i);
@@ -194,14 +194,14 @@ hypre_StructCoarsen( hypre_StructGrid  *fgrid,
    /* set coarse grid boxes */
    hypre_StructGridSetBoxes(cgrid, my_boxes);
 
-   /* set coarse grid ids */ 
+   /* set coarse grid ids */
    hypre_StructGridSetIDs(cgrid, cids);
 
    /* adjust periodicity and set for the coarse grid */
    hypre_CopyIndex(hypre_StructGridPeriodic(fgrid), periodic);
    for (i = 0; i < ndim; i++)
    {
-      hypre_IndexD(periodic,i) /= hypre_IndexD(stride,i);
+      hypre_IndexD(periodic, i) /= hypre_IndexD(stride, i);
    }
    hypre_StructGridSetPeriodic(cgrid, periodic);
 
@@ -215,23 +215,25 @@ hypre_StructCoarsen( hypre_StructGrid  *fgrid,
 
    for (i = 0; i < ndim; i++)
    {
-      coarsen_factor = hypre_IndexD(stride,i); 
-      hypre_IndexD(new_dist, i) = hypre_IndexD(max_distance,i)/coarsen_factor;
+      coarsen_factor = hypre_IndexD(stride, i);
+      hypre_IndexD(new_dist, i) = hypre_IndexD(max_distance, i) / coarsen_factor;
    }
    for (i = ndim; i < 3; i++)
    {
       hypre_IndexD(new_dist, i) = 2;
    }
-   
+
    hypre_BoxManGetAllGlobalKnown (fboxman, &known );
 
 
    /* large enough - don't need to re-gather */
    if ( (hypre_IndexMin(new_dist, ndim) > 1) || known )
    {
-      /* update new max distance value */  
+      /* update new max distance value */
       if (!known) /* only need to change if global info is not known */
+      {
          hypre_StructGridSetMaxDistance(cgrid, new_dist);
+      }
    }
    else  /* not large enough - set max_distance to 0 - neighbor info will be
             collected during the assemble */
@@ -243,24 +245,24 @@ hypre_StructCoarsen( hypre_StructGrid  *fgrid,
    /* update the new bounding box */
    bounding_box = hypre_BoxDuplicate(hypre_StructGridBoundingBox(fgrid));
    hypre_StructCoarsenBox(bounding_box, index, stride);
-   
+
    hypre_StructGridSetBoundingBox(cgrid, bounding_box);
-   
-   /* create a box manager for the coarse grid */ 
+
+   /* create a box manager for the coarse grid */
    info_size = hypre_BoxManEntryInfoSize(fboxman);
    max_nentries =  hypre_BoxManMaxNEntries(fboxman);
-   hypre_BoxManCreate(max_nentries, info_size, ndim, bounding_box, 
+   hypre_BoxManCreate(max_nentries, info_size, ndim, bounding_box,
                       comm, &cboxman);
-   
+
    hypre_BoxDestroy(bounding_box);
-   
+
    /* update all global known */
    hypre_BoxManSetAllGlobalKnown(cboxman, known );
-   
+
    /* now get the entries from the fgrid box manager, coarsen, and add to the
       coarse grid box manager (note: my boxes have already been coarsened) */
-   
-   hypre_BoxManGetAllEntries( fboxman , &num_entries, &entries); 
+
+   hypre_BoxManGetAllEntries( fboxman, &num_entries, &entries);
 
    new_box = hypre_BoxCreate(ndim);
    num = 0;
@@ -274,8 +276,8 @@ hypre_StructCoarsen( hypre_StructGrid  *fgrid,
    {
       entry = &entries[i];
       proc = hypre_BoxManEntryProc(entry);
-      
-      if  (proc != myid) /* not my boxes */ 
+
+      if  (proc != myid) /* not my boxes */
       {
          hypre_BoxManEntryGetExtents(entry, ilower, iupper);
          hypre_BoxSetExtents(new_box, ilower, iupper);
@@ -285,16 +287,16 @@ hypre_StructCoarsen( hypre_StructGrid  *fgrid,
             (we want these ids sequential - no gaps) - and zero boxes are not
             kept in the box manager */
          if (prune)
-         {  
-            if (proc != last_proc) 
+         {
+            if (proc != last_proc)
             {
                num = 0;
                last_proc = proc;
             }
             if (hypre_BoxVolume(new_box))
             {
-               
-               hypre_BoxManAddEntry( cboxman, hypre_BoxIMin(new_box) ,
+
+               hypre_BoxManAddEntry( cboxman, hypre_BoxIMin(new_box),
                                      hypre_BoxIMax(new_box), proc, num,
                                      entry_info);
                num++;
@@ -304,15 +306,15 @@ hypre_StructCoarsen( hypre_StructGrid  *fgrid,
                  saved in the box manager, so we will have gaps in the box
                  numbers) */
          {
-            hypre_BoxManAddEntry( cboxman, hypre_BoxIMin(new_box) ,
+            hypre_BoxManAddEntry( cboxman, hypre_BoxIMin(new_box),
                                   hypre_BoxIMax(new_box), proc, id,
                                   entry_info);
          }
-      } 
+      }
       else /* my boxes */
-           /* add my coarse grid boxes to the coarse grid box manager (have
-              already been pruned if necessary) - re-number the entry ids to be
-              sequential (this is the box number, really) */
+         /* add my coarse grid boxes to the coarse grid box manager (have
+            already been pruned if necessary) - re-number the entry ids to be
+            sequential (this is the box number, really) */
       {
          if (proc != last_proc) /* just do this once (the first myid) */
          {
@@ -327,33 +329,33 @@ hypre_StructCoarsen( hypre_StructGrid  *fgrid,
          }
       }
    } /* loop through entries */
-   
+
    /* these entries are sorted */
    hypre_BoxManSetIsEntriesSort(cboxman, 1 );
-   
+
    hypre_BoxDestroy(new_box);
 
-#if 0   
+#if 0
    /* if there is an assumed partition in the fg, then coarsen those boxes as
       well and add to cg */
    hypre_BoxManGetAssumedPartition ( fboxman, &fap);
-    
+
    if (fap)
    {
-      /* coarsen fap to get cap */ 
+      /* coarsen fap to get cap */
 
-      /* set cap */  
+      /* set cap */
       hypre_BoxManSetAssumedPartition (cboxman, cap);
    }
 #endif
 
    /* assign new box manager */
    hypre_StructGridSetBoxManager(cgrid, cboxman);
-      
+
    /* finally... assemble the new coarse grid */
    hypre_StructGridAssemble(cgrid);
 
-   /* return the coarse grid */   
+   /* return the coarse grid */
    *cgrid_ptr = cgrid;
 
 #if TIME_DEBUG
diff --git a/external/hypre/src/struct_ls/cyclic_reduction.c b/external/hypre/src/struct_ls/cyclic_reduction.c
index 00e6615d..7f045e5a 100644
--- a/external/hypre/src/struct_ls/cyclic_reduction.c
+++ b/external/hypre/src/struct_ls/cyclic_reduction.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -66,6 +66,7 @@ typedef struct
    hypre_BoxArray       *base_points;
    hypre_BoxArray      **fine_points_l;
 
+   HYPRE_MemoryLocation  memory_location; /* memory location of data */
    HYPRE_Real           *data;
    HYPRE_Real           *data_const;
    hypre_StructMatrix  **A_l;
@@ -100,6 +101,8 @@ hypre_CyclicReductionCreate( MPI_Comm  comm )
    hypre_SetIndex3((cyc_red_data -> base_index), 0, 0, 0);
    hypre_SetIndex3((cyc_red_data -> base_stride), 1, 1, 1);
 
+   (cyc_red_data -> memory_location) = hypre_HandleMemoryLocation(hypre_handle());
+
    return (void *) cyc_red_data;
 }
 
@@ -145,7 +148,7 @@ hypre_CycRedCreateCoarseOp( hypre_StructMatrix *A,
       for (i = -1; i < 2; i++)
       {
          /* Storage for 3 elements (c,w,e) */
-         hypre_SetIndex3(Ac_stencil_shape[stencil_rank],0,0,0);
+         hypre_SetIndex3(Ac_stencil_shape[stencil_rank], 0, 0, 0);
          hypre_IndexD(Ac_stencil_shape[stencil_rank], cdir) = i;
          stencil_rank++;
       }
@@ -169,7 +172,7 @@ hypre_CycRedCreateCoarseOp( hypre_StructMatrix *A,
       {
 
          /* Storage for 2 elements in (c,w) */
-         hypre_SetIndex3(Ac_stencil_shape[stencil_rank],0,0,0);
+         hypre_SetIndex3(Ac_stencil_shape[stencil_rank], 0, 0, 0);
          hypre_IndexD(Ac_stencil_shape[stencil_rank], cdir) = i;
          stencil_rank++;
       }
@@ -192,10 +195,10 @@ hypre_CycRedCreateCoarseOp( hypre_StructMatrix *A,
     * Set number of ghost points
     *-----------------------------------------------*/
 
-   Ac_num_ghost[2*cdir] = 1;
+   Ac_num_ghost[2 * cdir] = 1;
    if (!hypre_StructMatrixSymmetric(A))
    {
-      Ac_num_ghost[2*cdir + 1] = 1;
+      Ac_num_ghost[2 * cdir + 1] = 1;
    }
    hypre_StructMatrixSetNumGhost(Ac, Ac_num_ghost);
 
@@ -235,7 +238,7 @@ hypre_CycRedSetupCoarseOp( hypre_StructMatrix *A,
    hypre_Box              *Ac_dbox;
 
    HYPRE_Real             *a_cc, *a_cw, *a_ce;
-   HYPRE_Real             *ac_cc, *ac_cw, *ac_ce;
+   HYPRE_Real             *ac_cc, *ac_cw, *ac_ce = NULL;
 
    HYPRE_Int               offsetA;
 
@@ -273,7 +276,7 @@ hypre_CycRedSetupCoarseOp( hypre_StructMatrix *A,
        * a_ce is pointer for east coefficient
        *-----------------------------------------------*/
 
-      hypre_SetIndex3(index,0,0,0);
+      hypre_SetIndex3(index, 0, 0, 0);
       a_cc = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
       hypre_IndexD(index, cdir) = -1;
@@ -291,13 +294,13 @@ hypre_CycRedSetupCoarseOp( hypre_StructMatrix *A,
        * ac_cc is pointer for center coefficient (etc.)
        *-----------------------------------------------*/
 
-      hypre_SetIndex3(index,0,0,0);
+      hypre_SetIndex3(index, 0, 0, 0);
       ac_cc = hypre_StructMatrixExtractPointerByIndex(Ac, ci, index);
 
       hypre_IndexD(index, cdir) = -1;
       ac_cw = hypre_StructMatrixExtractPointerByIndex(Ac, ci, index);
 
-      if(!hypre_StructMatrixSymmetric(A))
+      if (!hypre_StructMatrixSymmetric(A))
       {
          hypre_IndexD(index, cdir) = 1;
          ac_ce = hypre_StructMatrixExtractPointerByIndex(Ac, ci, index);
@@ -313,15 +316,15 @@ hypre_CycRedSetupCoarseOp( hypre_StructMatrix *A,
        * other points.
        *-----------------------------------------------*/
 
-      hypre_SetIndex3(index,0,0,0);
+      hypre_SetIndex3(index, 0, 0, 0);
       hypre_IndexD(index, cdir) = 1;
-      offsetA = hypre_BoxOffsetDistance(A_dbox,index);
+      offsetA = hypre_BoxOffsetDistance(A_dbox, index);
 
       /*-----------------------------------------------
        * non-symmetric case
        *-----------------------------------------------*/
 
-      if(!hypre_StructMatrixSymmetric(A))
+      if (!hypre_StructMatrixSymmetric(A))
       {
          hypre_BoxGetSize(cgrid_box, loop_size);
 
@@ -397,13 +400,13 @@ hypre_CycRedSetupCoarseOp( hypre_StructMatrix *A,
           * ac_cc is pointer for center coefficient (etc.)
           *-----------------------------------------------*/
 
-         hypre_SetIndex3(index,0,0,0);
+         hypre_SetIndex3(index, 0, 0, 0);
          ac_cc = hypre_StructMatrixExtractPointerByIndex(Ac, ci, index);
 
          hypre_IndexD(index, cdir) = -1;
          ac_cw = hypre_StructMatrixExtractPointerByIndex(Ac, ci, index);
 
-         if(!hypre_StructMatrixSymmetric(A))
+         if (!hypre_StructMatrixSymmetric(A))
          {
             hypre_IndexD(index, cdir) = 1;
             ac_ce = hypre_StructMatrixExtractPointerByIndex(Ac, ci, index);
@@ -413,7 +416,7 @@ hypre_CycRedSetupCoarseOp( hypre_StructMatrix *A,
           * non-symmetric case
           *-----------------------------------------------*/
 
-         if(!hypre_StructMatrixSymmetric(A))
+         if (!hypre_StructMatrixSymmetric(A))
          {
             hypre_BoxGetSize(cgrid_box, loop_size);
 
@@ -467,6 +470,8 @@ hypre_CyclicReductionSetup( void               *cyc_red_vdata,
                             hypre_StructVector *b,
                             hypre_StructVector *x             )
 {
+   HYPRE_UNUSED_VAR(b);
+
    hypre_CyclicReductionData *cyc_red_data = (hypre_CyclicReductionData *) cyc_red_vdata;
 
    MPI_Comm                comm        = (cyc_red_data -> comm);
@@ -494,16 +499,12 @@ hypre_CyclicReductionSetup( void               *cyc_red_vdata,
    hypre_Index             stride;
 
    hypre_StructGrid       *grid;
-
    hypre_Box              *cbox;
-
    HYPRE_Int               l;
    HYPRE_Int               flop_divisor;
-
    HYPRE_Int               x_num_ghost[] = {0, 0, 0, 0, 0, 0};
-#if 0 //defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-   HYPRE_MemoryLocation    data_location = HYPRE_MEMORY_DEVICE;
-#endif
+
+   HYPRE_MemoryLocation    memory_location = hypre_StructMatrixMemoryLocation(A);
 
    /*-----------------------------------------------------
     * Set up coarse grids
@@ -548,9 +549,9 @@ hypre_CyclicReductionSetup( void               *cyc_red_vdata,
                                   hypre_BoxIMax(cbox));
 
       /* coarsen the grid */
-      hypre_StructCoarsen(grid_l[l], cindex, stride, 1, &grid_l[l+1]);
+      hypre_StructCoarsen(grid_l[l], cindex, stride, 1, &grid_l[l + 1]);
 #if 0 //defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-      hypre_StructGridDataLocation(grid_l[l+1]) = data_location;
+      hypre_StructGridDataLocation(grid_l[l + 1]) = data_location;
 #endif
    }
    num_levels = l + 1;
@@ -605,50 +606,52 @@ hypre_CyclicReductionSetup( void               *cyc_red_vdata,
    A_l[0] = hypre_StructMatrixRef(A);
    x_l[0] = hypre_StructVectorRef(x);
 
-   x_num_ghost[2*cdir]     = 1;
-   x_num_ghost[2*cdir + 1] = 1;
+   x_num_ghost[2 * cdir]     = 1;
+   x_num_ghost[2 * cdir + 1] = 1;
 
    for (l = 0; l < (num_levels - 1); l++)
    {
-      A_l[l+1] = hypre_CycRedCreateCoarseOp(A_l[l], grid_l[l+1], cdir);
+      A_l[l + 1] = hypre_CycRedCreateCoarseOp(A_l[l], grid_l[l + 1], cdir);
       //hypre_StructMatrixInitializeShell(A_l[l+1]);
-      data_size += hypre_StructMatrixDataSize(A_l[l+1]);
-      data_size_const += hypre_StructMatrixDataConstSize(A_l[l+1]);
+      data_size += hypre_StructMatrixDataSize(A_l[l + 1]);
+      data_size_const += hypre_StructMatrixDataConstSize(A_l[l + 1]);
 
-      x_l[l+1] = hypre_StructVectorCreate(comm, grid_l[l+1]);
-      hypre_StructVectorSetNumGhost(x_l[l+1], x_num_ghost);
-      hypre_StructVectorInitializeShell(x_l[l+1]);
-      hypre_StructVectorSetDataSize(x_l[l+1], &data_size, &data_size_const);
+      x_l[l + 1] = hypre_StructVectorCreate(comm, grid_l[l + 1]);
+      hypre_StructVectorSetNumGhost(x_l[l + 1], x_num_ghost);
+      hypre_StructVectorInitializeShell(x_l[l + 1]);
+      hypre_StructVectorSetDataSize(x_l[l + 1], &data_size, &data_size_const);
    }
 
-   data =  hypre_CTAlloc(HYPRE_Real, data_size, HYPRE_MEMORY_DEVICE);
-   data_const = hypre_CTAlloc(HYPRE_Real,data_size_const,HYPRE_MEMORY_HOST);
+   data = hypre_CTAlloc(HYPRE_Real, data_size, memory_location);
+   data_const = hypre_CTAlloc(HYPRE_Real, data_size_const, HYPRE_MEMORY_HOST);
+
+   (cyc_red_data -> memory_location) = memory_location;
    (cyc_red_data -> data) = data;
    (cyc_red_data -> data_const) = data_const;
 
    for (l = 0; l < (num_levels - 1); l++)
    {
-      hypre_StructMatrixInitializeData(A_l[l+1], data, data_const);
-      data += hypre_StructMatrixDataSize(A_l[l+1]);
-      data_const += hypre_StructMatrixDataConstSize(A_l[l+1]);
+      hypre_StructMatrixInitializeData(A_l[l + 1], data, data_const);
+      data += hypre_StructMatrixDataSize(A_l[l + 1]);
+      data_const += hypre_StructMatrixDataConstSize(A_l[l + 1]);
 
 #if 0 //defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
       if (data_location != HYPRE_MEMORY_HOST)
       {
-         hypre_StructVectorInitializeData(x_l[l+1], data);
-         hypre_StructVectorAssemble(x_l[l+1]);
-         data += hypre_StructVectorDataSize(x_l[l+1]);
+         hypre_StructVectorInitializeData(x_l[l + 1], data);
+         hypre_StructVectorAssemble(x_l[l + 1]);
+         data += hypre_StructVectorDataSize(x_l[l + 1]);
       }
       else
       {
-         hypre_StructVectorInitializeData(x_l[l+1], data_const);
-         hypre_StructVectorAssemble(x_l[l+1]);
-         data_const += hypre_StructVectorDataSize(x_l[l+1]);
+         hypre_StructVectorInitializeData(x_l[l + 1], data_const);
+         hypre_StructVectorAssemble(x_l[l + 1]);
+         data_const += hypre_StructVectorDataSize(x_l[l + 1]);
       }
 #else
-      hypre_StructVectorInitializeData(x_l[l+1], data);
-      hypre_StructVectorAssemble(x_l[l+1]);
-      data += hypre_StructVectorDataSize(x_l[l+1]);
+      hypre_StructVectorInitializeData(x_l[l + 1], data);
+      hypre_StructVectorAssemble(x_l[l + 1]);
+      data += hypre_StructVectorDataSize(x_l[l + 1]);
 #endif
    }
 
@@ -664,7 +667,7 @@ hypre_CyclicReductionSetup( void               *cyc_red_vdata,
       hypre_CycRedSetCIndex(base_index, base_stride, l, cdir, cindex);
       hypre_CycRedSetStride(base_index, base_stride, l, cdir, stride);
 
-      hypre_CycRedSetupCoarseOp(A_l[l], A_l[l+1], cindex, stride, cdir);
+      hypre_CycRedSetupCoarseOp(A_l[l], A_l[l + 1], cindex, stride, cdir);
    }
 
    /*----------------------------------------------------------
@@ -712,19 +715,19 @@ hypre_CyclicReductionSetup( void               *cyc_red_vdata,
                    hypre_IndexY(base_stride) *
                    hypre_IndexZ(base_stride)  );
    (cyc_red_data -> solve_flops) =
-      hypre_StructVectorGlobalSize(x_l[0])/2/(HYPRE_BigInt)flop_divisor;
+      hypre_StructVectorGlobalSize(x_l[0]) / 2 / (HYPRE_BigInt)flop_divisor;
    (cyc_red_data -> solve_flops) +=
-      5*hypre_StructVectorGlobalSize(x_l[0])/2/(HYPRE_BigInt)flop_divisor;
+      5 * hypre_StructVectorGlobalSize(x_l[0]) / 2 / (HYPRE_BigInt)flop_divisor;
    for (l = 1; l < (num_levels - 1); l++)
    {
       (cyc_red_data -> solve_flops) +=
-         10*hypre_StructVectorGlobalSize(x_l[l])/2;
+         10 * hypre_StructVectorGlobalSize(x_l[l]) / 2;
    }
 
    if (num_levels > 1)
    {
       (cyc_red_data -> solve_flops) +=
-         hypre_StructVectorGlobalSize(x_l[l])/2;
+         hypre_StructVectorGlobalSize(x_l[l]) / 2;
    }
 
 
@@ -906,13 +909,13 @@ hypre_CyclicReduction( void               *cyc_red_vdata,
       /* Step 2 */
       fgrid = hypre_StructVectorGrid(x_l[l]);
       fgrid_ids = hypre_StructGridIDs(fgrid);
-      cgrid = hypre_StructVectorGrid(x_l[l+1]);
+      cgrid = hypre_StructVectorGrid(x_l[l + 1]);
       cgrid_boxes = hypre_StructGridBoxes(cgrid);
       cgrid_ids = hypre_StructGridIDs(cgrid);
 
       for (compute_i = 0; compute_i < 2; compute_i++)
       {
-         switch(compute_i)
+         switch (compute_i)
          {
             case 0:
             {
@@ -943,10 +946,10 @@ hypre_CyclicReduction( void               *cyc_red_vdata,
 
             A_dbox  = hypre_BoxArrayBox(hypre_StructMatrixDataSpace(A_l[l]), fi);
             x_dbox  = hypre_BoxArrayBox(hypre_StructVectorDataSpace(x_l[l]), fi);
-            xc_dbox = hypre_BoxArrayBox(hypre_StructVectorDataSpace(x_l[l+1]), ci);
+            xc_dbox = hypre_BoxArrayBox(hypre_StructVectorDataSpace(x_l[l + 1]), ci);
 
             xp  = hypre_StructVectorBoxData(x_l[l], fi);
-            xcp = hypre_StructVectorBoxData(x_l[l+1], ci);
+            xcp = hypre_StructVectorBoxData(x_l[l + 1], ci);
 
             hypre_SetIndex3(index, 0, 0, 0);
             hypre_IndexD(index, cdir) = -1;
@@ -976,8 +979,8 @@ hypre_CyclicReduction( void               *cyc_red_vdata,
                                    x_dbox, start, stride, xi,
                                    xc_dbox, startc, stridec, xci);
                {
-                  xcp[xci] = xp[xi] - Awp[Ai] * xwp[xi+xwp_offset] -
-                                      Aep[Ai] * xep[xi+xep_offset];
+                  xcp[xci] = xp[xi] - Awp[Ai] * xwp[xi + xwp_offset] -
+                             Aep[Ai] * xep[xi + xep_offset];
                }
                hypre_BoxLoop3End(Ai, xi, xci);
 #undef DEVICE_VAR
@@ -1048,7 +1051,7 @@ hypre_CyclicReduction( void               *cyc_red_vdata,
       /* Step 1 */
       fgrid = hypre_StructVectorGrid(x_l[l]);
       fgrid_ids = hypre_StructGridIDs(fgrid);
-      cgrid = hypre_StructVectorGrid(x_l[l+1]);
+      cgrid = hypre_StructVectorGrid(x_l[l + 1]);
       cgrid_boxes = hypre_StructGridBoxes(cgrid);
       cgrid_ids = hypre_StructGridIDs(cgrid);
 
@@ -1066,10 +1069,10 @@ hypre_CyclicReduction( void               *cyc_red_vdata,
          hypre_StructMapCoarseToFine(startc, cindex, stride, start);
 
          x_dbox  = hypre_BoxArrayBox(hypre_StructVectorDataSpace(x_l[l]), fi);
-         xc_dbox = hypre_BoxArrayBox(hypre_StructVectorDataSpace(x_l[l+1]), ci);
+         xc_dbox = hypre_BoxArrayBox(hypre_StructVectorDataSpace(x_l[l + 1]), ci);
 
          xp  = hypre_StructVectorBoxData(x_l[l], fi);
-         xcp = hypre_StructVectorBoxData(x_l[l+1], ci);
+         xcp = hypre_StructVectorBoxData(x_l[l + 1], ci);
 
          hypre_BoxGetSize(compute_box, loop_size);
 
@@ -1087,7 +1090,7 @@ hypre_CyclicReduction( void               *cyc_red_vdata,
       /* Step 2 */
       for (compute_i = 0; compute_i < 2; compute_i++)
       {
-         switch(compute_i)
+         switch (compute_i)
          {
             case 0:
             {
@@ -1142,7 +1145,7 @@ hypre_CyclicReduction( void               *cyc_red_vdata,
                                    A_dbox, start, stride, Ai,
                                    x_dbox, start, stride, xi);
                {
-                  xp[xi] -= (Awp[Ai]*xp[xi+xwp_offset] + Aep[Ai]*xp[xi+xep_offset]) / Ap[Ai];
+                  xp[xi] -= (Awp[Ai] * xp[xi + xwp_offset] + Aep[Ai] * xp[xi + xep_offset]) / Ap[Ai];
                }
                hypre_BoxLoop2End(Ai, xi);
 #undef DEVICE_VAR
@@ -1212,21 +1215,23 @@ hypre_CyclicReductionDestroy( void *cyc_red_vdata )
 
    if (cyc_red_data)
    {
+      HYPRE_MemoryLocation memory_location = cyc_red_data -> memory_location;
+
       hypre_BoxArrayDestroy(cyc_red_data -> base_points);
       hypre_StructGridDestroy(cyc_red_data -> grid_l[0]);
       hypre_StructMatrixDestroy(cyc_red_data -> A_l[0]);
       hypre_StructVectorDestroy(cyc_red_data -> x_l[0]);
       for (l = 0; l < ((cyc_red_data -> num_levels) - 1); l++)
       {
-         hypre_StructGridDestroy(cyc_red_data -> grid_l[l+1]);
+         hypre_StructGridDestroy(cyc_red_data -> grid_l[l + 1]);
          hypre_BoxArrayDestroy(cyc_red_data -> fine_points_l[l]);
-         hypre_StructMatrixDestroy(cyc_red_data -> A_l[l+1]);
-         hypre_StructVectorDestroy(cyc_red_data -> x_l[l+1]);
+         hypre_StructMatrixDestroy(cyc_red_data -> A_l[l + 1]);
+         hypre_StructVectorDestroy(cyc_red_data -> x_l[l + 1]);
          hypre_ComputePkgDestroy(cyc_red_data -> down_compute_pkg_l[l]);
          hypre_ComputePkgDestroy(cyc_red_data -> up_compute_pkg_l[l]);
       }
       hypre_BoxArrayDestroy(cyc_red_data -> fine_points_l[l]);
-      hypre_TFree(cyc_red_data -> data, HYPRE_MEMORY_DEVICE);
+      hypre_TFree(cyc_red_data -> data, memory_location);
       hypre_TFree(cyc_red_data -> grid_l, HYPRE_MEMORY_HOST);
       hypre_TFree(cyc_red_data -> fine_points_l, HYPRE_MEMORY_HOST);
       hypre_TFree(cyc_red_data -> A_l, HYPRE_MEMORY_HOST);
diff --git a/external/hypre/src/struct_ls/headers b/external/hypre/src/struct_ls/headers
old mode 100644
new mode 100755
index c8886a8c..795d6943
--- a/external/hypre/src/struct_ls/headers
+++ b/external/hypre/src/struct_ls/headers
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/struct_ls/hybrid.c b/external/hypre/src/struct_ls/hybrid.c
index fe686a62..e9b40633 100644
--- a/external/hypre/src/struct_ls/hybrid.c
+++ b/external/hypre/src/struct_ls/hybrid.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -76,11 +76,11 @@ hypre_HybridCreate( MPI_Comm  comm )
    (hybrid_data -> krylov_precond)       = NULL;
 
    /* initialize */
-   (hybrid_data -> dscg_num_its)      = 0; 
+   (hybrid_data -> dscg_num_its)      = 0;
    (hybrid_data -> krylov_num_its)    = 0;
    (hybrid_data -> logging)           = 0;
    (hybrid_data -> print_level)       = 0;
-   
+
    return (void *) hybrid_data;
 }
 
@@ -314,12 +314,12 @@ hypre_HybridSetPrecond( void  *krylov_vdata,
                         void  *krylov_precond          )
 {
    hypre_HybridData *krylov_data = (hypre_HybridData *)krylov_vdata;
- 
+
    (krylov_data -> krylov_default)       = 0;
    (krylov_data -> krylov_precond_solve) = krylov_precond_solve;
    (krylov_data -> krylov_precond_setup) = krylov_precond_setup;
    (krylov_data -> krylov_precond)       = krylov_precond;
- 
+
    return hypre_error_flag;
 }
 
@@ -421,8 +421,13 @@ HYPRE_Int
 hypre_HybridSetup( void               *hybrid_vdata,
                    hypre_StructMatrix *A,
                    hypre_StructVector *b,
-                   hypre_StructVector *x            )
+                   hypre_StructVector *x )
 {
+   HYPRE_UNUSED_VAR(hybrid_vdata);
+   HYPRE_UNUSED_VAR(A);
+   HYPRE_UNUSED_VAR(b);
+   HYPRE_UNUSED_VAR(x);
+
    return hypre_error_flag;
 }
 
@@ -559,7 +564,7 @@ hypre_HybridSolve( void               *hybrid_vdata,
    HYPRE_Int          krylov_max_its    = (hybrid_data -> krylov_max_its);
    HYPRE_Int          logging        = (hybrid_data -> logging);
    HYPRE_Int          solver_type    = (hybrid_data -> solver_type);
-  
+
    HYPRE_Int          krylov_default = (hybrid_data -> krylov_default);
    HYPRE_Int        (*krylov_precond_solve)(void*, void*, void*, void*);
    HYPRE_Int        (*krylov_precond_setup)(void*, void*, void*, void*);
@@ -606,7 +611,7 @@ hypre_HybridSolve( void               *hybrid_vdata,
        * Get additional information from PCG if logging on for hybrid solver.
        * Currently used as debugging flag to print norms.
        *--------------------------------------------------------------------*/
-      if( logging > 1 )
+      if ( logging > 1 )
       {
          hypre_MPI_Comm_rank(comm, &myid );
          hypre_PCGPrintLogging(krylov_solver, myid);
@@ -652,7 +657,7 @@ hypre_HybridSolve( void               *hybrid_vdata,
       hypre_GMRESGetConverged(krylov_solver, &converged);
    }
 
-   else 
+   else
    {
       /*--------------------------------------------------------------------
        * Setup BiCGSTAB
@@ -688,17 +693,23 @@ hypre_HybridSolve( void               *hybrid_vdata,
    }
 
    /*-----------------------------------------------------------------------
-    * if converged, done... 
+    * if converged, done...
     *-----------------------------------------------------------------------*/
-   if( converged )
+   if ( converged )
    {
       (hybrid_data -> final_rel_res_norm) = res_norm;
       if (solver_type == 1)
+      {
          hypre_PCGDestroy(krylov_solver);
+      }
       else if (solver_type == 2)
+      {
          hypre_GMRESDestroy(krylov_solver);
+      }
       else
+      {
          hypre_BiCGSTABDestroy(krylov_solver);
+      }
    }
 
    /*-----------------------------------------------------------------------
@@ -775,7 +786,7 @@ hypre_HybridSolve( void               *hybrid_vdata,
           * Get additional information from PCG if logging on for hybrid solver.
           * Currently used as debugging flag to print norms.
           *-----------------------------------------------------------------*/
-         if( logging > 1 )
+         if ( logging > 1 )
          {
             hypre_MPI_Comm_rank(comm, &myid );
             hypre_PCGPrintLogging(krylov_solver, myid);
@@ -829,4 +840,3 @@ hypre_HybridSolve( void               *hybrid_vdata,
 
    return hypre_error_flag;
 }
-
diff --git a/external/hypre/src/struct_ls/jacobi.c b/external/hypre/src/struct_ls/jacobi.c
index 56345539..29bf986d 100644
--- a/external/hypre/src/struct_ls/jacobi.c
+++ b/external/hypre/src/struct_ls/jacobi.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -30,7 +30,7 @@ hypre_JacobiCreate( MPI_Comm  comm )
    hypre_SetIndex3(stride, 1, 1, 1);
    hypre_SetIndex3(indices[0], 0, 0, 0);
    hypre_PointRelaxSetPointset(relax_data, 0, 1, stride, indices);
-   hypre_PointRelaxSetTol(relax_data,1.0e-6);
+   hypre_PointRelaxSetTol(relax_data, 1.0e-6);
    (jacobi_data -> relax_data) = relax_data;
 
    return (void *) jacobi_data;
@@ -42,7 +42,7 @@ hypre_JacobiCreate( MPI_Comm  comm )
 HYPRE_Int
 hypre_JacobiDestroy( void *jacobi_vdata )
 {
-	hypre_JacobiData *jacobi_data = (hypre_JacobiData *)jacobi_vdata;
+   hypre_JacobiData *jacobi_data = (hypre_JacobiData *)jacobi_vdata;
 
    if (jacobi_data)
    {
diff --git a/external/hypre/src/struct_ls/pcg_struct.c b/external/hypre/src/struct_ls/pcg_struct.c
index 60d421f1..f2002f9c 100644
--- a/external/hypre/src/struct_ls/pcg_struct.c
+++ b/external/hypre/src/struct_ls/pcg_struct.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -24,7 +24,7 @@ hypre_StructKrylovCAlloc( size_t               count,
 HYPRE_Int
 hypre_StructKrylovFree( void *ptr )
 {
-   hypre_TFree( ptr , HYPRE_MEMORY_HOST);
+   hypre_TFree( ptr, HYPRE_MEMORY_HOST);
 
    return hypre_error_flag;
 }
@@ -37,7 +37,7 @@ hypre_StructKrylovCreateVector( void *vvector )
 {
    hypre_StructVector *vector = (hypre_StructVector *)vvector;
    hypre_StructVector *new_vector;
-   HYPRE_Int          *num_ghost= hypre_StructVectorNumGhost(vector);
+   HYPRE_Int          *num_ghost = hypre_StructVectorNumGhost(vector);
 
    new_vector = hypre_StructVectorCreate( hypre_StructVectorComm(vector),
                                           hypre_StructVectorGrid(vector) );
@@ -56,11 +56,11 @@ hypre_StructKrylovCreateVectorArray(HYPRE_Int n, void *vvector )
 {
    hypre_StructVector *vector = (hypre_StructVector *)vvector;
    hypre_StructVector **new_vector;
-   HYPRE_Int          *num_ghost= hypre_StructVectorNumGhost(vector);
+   HYPRE_Int          *num_ghost = hypre_StructVectorNumGhost(vector);
    HYPRE_Int i;
 
    new_vector = hypre_CTAlloc(hypre_StructVector*, n, HYPRE_MEMORY_HOST);
-   for (i=0; i < n; i++)
+   for (i = 0; i < n; i++)
    {
       HYPRE_StructVectorCreate(hypre_StructVectorComm(vector),
                                hypre_StructVectorGrid(vector),
@@ -81,7 +81,7 @@ hypre_StructKrylovDestroyVector( void *vvector )
 {
    hypre_StructVector *vector = (hypre_StructVector *)vvector;
 
-   return( hypre_StructVectorDestroy( vector ) );
+   return ( hypre_StructVectorDestroy( vector ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -94,7 +94,7 @@ hypre_StructKrylovMatvecCreate( void   *A,
    void *matvec_data;
 
    matvec_data = hypre_StructMatvecCreate();
-   hypre_StructMatvecSetup(matvec_data, (hypre_StructMatrix *)A,(hypre_StructVector *)x);
+   hypre_StructMatvecSetup(matvec_data, (hypre_StructMatrix *)A, (hypre_StructVector *)x);
 
    return ( matvec_data );
 }
@@ -131,7 +131,7 @@ hypre_StructKrylovMatvecDestroy( void *matvec_data )
  *--------------------------------------------------------------------------*/
 
 HYPRE_Real
-hypre_StructKrylovInnerProd( void *x, 
+hypre_StructKrylovInnerProd( void *x,
                              void *y )
 {
    return ( hypre_StructInnerProd( (hypre_StructVector *) x,
@@ -143,7 +143,7 @@ hypre_StructKrylovInnerProd( void *x,
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_StructKrylovCopyVector( void *x, 
+hypre_StructKrylovCopyVector( void *x,
                               void *y )
 {
    return ( hypre_StructCopy( (hypre_StructVector *) x,
@@ -192,6 +192,11 @@ hypre_StructKrylovIdentitySetup( void *vdata,
                                  void *x     )
 
 {
+   HYPRE_UNUSED_VAR(vdata);
+   HYPRE_UNUSED_VAR(A);
+   HYPRE_UNUSED_VAR(b);
+   HYPRE_UNUSED_VAR(x);
+
    return hypre_error_flag;
 }
 
@@ -205,7 +210,10 @@ hypre_StructKrylovIdentity( void *vdata,
                             void *x     )
 
 {
-   return( hypre_StructKrylovCopyVector( b, x ) );
+   HYPRE_UNUSED_VAR(vdata);
+   HYPRE_UNUSED_VAR(A);
+
+   return ( hypre_StructKrylovCopyVector( b, x ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -217,8 +225,7 @@ hypre_StructKrylovCommInfo( void  *A,
                             HYPRE_Int   *num_procs )
 {
    MPI_Comm comm = hypre_StructMatrixComm((hypre_StructMatrix *) A);
-   hypre_MPI_Comm_size(comm,num_procs);
-   hypre_MPI_Comm_rank(comm,my_id);
+   hypre_MPI_Comm_size(comm, num_procs);
+   hypre_MPI_Comm_rank(comm, my_id);
    return hypre_error_flag;
 }
-
diff --git a/external/hypre/src/struct_ls/pfmg.c b/external/hypre/src/struct_ls/pfmg.c
index 4b670b62..ce91045f 100644
--- a/external/hypre/src/struct_ls/pfmg.c
+++ b/external/hypre/src/struct_ls/pfmg.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -22,29 +22,29 @@ hypre_PFMGCreate( MPI_Comm  comm )
    (pfmg_data -> time_index) = hypre_InitializeTiming("PFMG");
 
    /* set defaults */
-   (pfmg_data -> tol)              = 1.0e-06;
-   (pfmg_data -> max_iter)         = 200;
-   (pfmg_data -> rel_change)       = 0;
-   (pfmg_data -> zero_guess)       = 0;
-   (pfmg_data -> max_levels)       = 0;
-   (pfmg_data -> dxyz)[0]          = 0.0;
-   (pfmg_data -> dxyz)[1]          = 0.0;
-   (pfmg_data -> dxyz)[2]          = 0.0;
-   (pfmg_data -> relax_type)       = 1;       /* weighted Jacobi */
-   (pfmg_data -> jacobi_weight)    = 0.0;
-   (pfmg_data -> usr_jacobi_weight)= 0;     /* no user Jacobi weight */
-   (pfmg_data -> rap_type)         = 0;
-   (pfmg_data -> num_pre_relax)    = 1;
-   (pfmg_data -> num_post_relax)   = 1;
-   (pfmg_data -> skip_relax)       = 1;
-   (pfmg_data -> logging)          = 0;
-   (pfmg_data -> print_level)      = 0;
+   (pfmg_data -> tol)               = 1.0e-06;
+   (pfmg_data -> max_iter)          = 200;
+   (pfmg_data -> rel_change)        = 0;
+   (pfmg_data -> zero_guess)        = 0;
+   (pfmg_data -> max_levels)        = 0;
+   (pfmg_data -> dxyz)[0]           = 0.0;
+   (pfmg_data -> dxyz)[1]           = 0.0;
+   (pfmg_data -> dxyz)[2]           = 0.0;
+   (pfmg_data -> relax_type)        = 1;       /* weighted Jacobi */
+   (pfmg_data -> jacobi_weight)     = 0.0;
+   (pfmg_data -> usr_jacobi_weight) = 0;    /* no user Jacobi weight */
+   (pfmg_data -> rap_type)          = 0;
+   (pfmg_data -> num_pre_relax)     = 1;
+   (pfmg_data -> num_post_relax)    = 1;
+   (pfmg_data -> skip_relax)        = 1;
+   (pfmg_data -> logging)           = 0;
+   (pfmg_data -> print_level)       = 0;
+
+   (pfmg_data -> memory_location)   = hypre_HandleMemoryLocation(hypre_handle());
 
    /* initialize */
    (pfmg_data -> num_levels)  = -1;
-#if 0 //defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-   (pfmg_data -> devicelevel) = 200;
-#endif
+
    return (void *) pfmg_data;
 }
 
@@ -68,6 +68,8 @@ hypre_PFMGDestroy( void *pfmg_vdata )
          hypre_TFree(pfmg_data -> rel_norms, HYPRE_MEMORY_HOST);
       }
 
+      HYPRE_MemoryLocation memory_location = pfmg_data -> memory_location;
+
       if ((pfmg_data -> num_levels) > -1)
       {
          for (l = 0; l < (pfmg_data -> num_levels); l++)
@@ -95,19 +97,19 @@ hypre_PFMGDestroy( void *pfmg_vdata )
          hypre_StructVectorDestroy(pfmg_data -> x_l[0]);
          for (l = 0; l < ((pfmg_data -> num_levels) - 1); l++)
          {
-            hypre_StructGridDestroy(pfmg_data -> grid_l[l+1]);
-            hypre_StructGridDestroy(pfmg_data -> P_grid_l[l+1]);
-            hypre_StructMatrixDestroy(pfmg_data -> A_l[l+1]);
+            hypre_StructGridDestroy(pfmg_data -> grid_l[l + 1]);
+            hypre_StructGridDestroy(pfmg_data -> P_grid_l[l + 1]);
+            hypre_StructMatrixDestroy(pfmg_data -> A_l[l + 1]);
             hypre_StructMatrixDestroy(pfmg_data -> P_l[l]);
-            hypre_StructVectorDestroy(pfmg_data -> b_l[l+1]);
-            hypre_StructVectorDestroy(pfmg_data -> x_l[l+1]);
-            hypre_StructVectorDestroy(pfmg_data -> tx_l[l+1]);
+            hypre_StructVectorDestroy(pfmg_data -> b_l[l + 1]);
+            hypre_StructVectorDestroy(pfmg_data -> x_l[l + 1]);
+            hypre_StructVectorDestroy(pfmg_data -> tx_l[l + 1]);
          }
 
-	 hypre_TFree(pfmg_data -> data, HYPRE_MEMORY_DEVICE);
-	 hypre_TFree(pfmg_data -> data_const, HYPRE_MEMORY_HOST);
+         hypre_TFree(pfmg_data -> data, memory_location);
+         hypre_TFree(pfmg_data -> data_const, HYPRE_MEMORY_HOST);
 
-          hypre_TFree(pfmg_data -> cdir_l, HYPRE_MEMORY_HOST);
+         hypre_TFree(pfmg_data -> cdir_l, HYPRE_MEMORY_HOST);
          hypre_TFree(pfmg_data -> active_l, HYPRE_MEMORY_HOST);
          hypre_TFree(pfmg_data -> grid_l, HYPRE_MEMORY_HOST);
          hypre_TFree(pfmg_data -> P_grid_l, HYPRE_MEMORY_HOST);
@@ -287,7 +289,7 @@ hypre_PFMGSetJacobiWeight( void  *pfmg_vdata,
    hypre_PFMGData *pfmg_data = (hypre_PFMGData *)pfmg_vdata;
 
    (pfmg_data -> jacobi_weight)    = weight;
-   (pfmg_data -> usr_jacobi_weight)= 1;
+   (pfmg_data -> usr_jacobi_weight) = 1;
 
    return hypre_error_flag;
 }
@@ -507,8 +509,8 @@ hypre_PFMGPrintLogging( void *pfmg_vdata,
          {
             for (i = 0; i < num_iterations; i++)
             {
-               hypre_printf("Residual norm[%d] = %e   ",i,norms[i]);
-               hypre_printf("Relative residual norm[%d] = %e\n",i,rel_norms[i]);
+               hypre_printf("Residual norm[%d] = %e   ", i, norms[i]);
+               hypre_printf("Relative residual norm[%d] = %e\n", i, rel_norms[i]);
             }
          }
       }
@@ -539,7 +541,7 @@ hypre_PFMGGetFinalRelativeResidualNorm( void   *pfmg_vdata,
       }
       else if (num_iterations == max_iter)
       {
-         *relative_residual_norm = rel_norms[num_iterations-1];
+         *relative_residual_norm = rel_norms[num_iterations - 1];
       }
       else
       {
diff --git a/external/hypre/src/struct_ls/pfmg.h b/external/hypre/src/struct_ls/pfmg.h
index 0b6c7ef3..1291ffd6 100644
--- a/external/hypre/src/struct_ls/pfmg.h
+++ b/external/hypre/src/struct_ls/pfmg.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -47,6 +47,7 @@ typedef struct
    hypre_StructGrid    **grid_l;
    hypre_StructGrid    **P_grid_l;
 
+   HYPRE_MemoryLocation  memory_location; /* memory location of data */
    HYPRE_Real           *data;
    HYPRE_Real           *data_const;
    hypre_StructMatrix  **A_l;
@@ -75,7 +76,7 @@ typedef struct
    HYPRE_Real           *norms;
    HYPRE_Real           *rel_norms;
 #if 0 //defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-  HYPRE_Int             devicelevel;
+   HYPRE_Int             devicelevel;
 #endif
 
 } hypre_PFMGData;
diff --git a/external/hypre/src/struct_ls/pfmg2_setup_rap.c b/external/hypre/src/struct_ls/pfmg2_setup_rap.c
index fd408cde..011f4f29 100644
--- a/external/hypre/src/struct_ls/pfmg2_setup_rap.c
+++ b/external/hypre/src/struct_ls/pfmg2_setup_rap.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -33,6 +33,9 @@ hypre_PFMG2CreateRAPOp( hypre_StructMatrix *R,
                         hypre_StructGrid   *coarse_grid,
                         HYPRE_Int           cdir        )
 {
+   HYPRE_UNUSED_VAR(R);
+   HYPRE_UNUSED_VAR(P);
+
    hypre_StructMatrix    *RAP;
 
    hypre_Index           *RAP_stencil_shape;
@@ -73,7 +76,7 @@ hypre_PFMG2CreateRAPOp( hypre_StructMatrix *R,
             /*--------------------------------------------------------------
              * Storage for 9 elements (c,w,e,n,s,sw,se,nw,se)
              *--------------------------------------------------------------*/
-            hypre_SetIndex3(index_temp,i,j,0);
+            hypre_SetIndex3(index_temp, i, j, 0);
             MapIndex(index_temp, cdir, RAP_stencil_shape[stencil_rank]);
             stencil_rank++;
          }
@@ -103,9 +106,9 @@ hypre_PFMG2CreateRAPOp( hypre_StructMatrix *R,
             /*--------------------------------------------------------------
              * Store 5 elements in (c,w,s,sw,se)
              *--------------------------------------------------------------*/
-            if( i+j <=0 )
+            if ( i + j <= 0 )
             {
-               hypre_SetIndex3(index_temp,i,j,0);
+               hypre_SetIndex3(index_temp, i, j, 0);
                MapIndex(index_temp, cdir, RAP_stencil_shape[stencil_rank]);
                stencil_rank++;
             }
@@ -185,16 +188,16 @@ hypre_PFMG2BuildRAPSym( hypre_StructMatrix *A,
 
    constant_coefficient = hypre_StructMatrixConstantCoefficient(RAP);
    constant_coefficient_A = hypre_StructMatrixConstantCoefficient(A);
-   hypre_assert( constant_coefficient==0 || constant_coefficient==1 );
+   hypre_assert( constant_coefficient == 0 || constant_coefficient == 1 );
    hypre_assert( hypre_StructMatrixConstantCoefficient(R) == constant_coefficient );
    hypre_assert( hypre_StructMatrixConstantCoefficient(P) == constant_coefficient );
-   if (constant_coefficient==1 )
+   if (constant_coefficient == 1 )
    {
-      hypre_assert( constant_coefficient_A==1 );
+      hypre_assert( constant_coefficient_A == 1 );
    }
    else
    {
-      hypre_assert( constant_coefficient_A==0 || constant_coefficient_A==2 );
+      hypre_assert( constant_coefficient_A == 0 || constant_coefficient_A == 2 );
    }
 
    fi = 0;
@@ -222,7 +225,7 @@ hypre_PFMG2BuildRAPSym( hypre_StructMatrix *A,
 
          case 5:
 
-            if ( constant_coefficient==1 )
+            if ( constant_coefficient == 1 )
             {
                hypre_PFMG2BuildRAPSym_onebox_FSS5_CC1(
                   ci, fi, A, P, R, cdir, cindex, cstride, RAP );
@@ -235,16 +238,16 @@ hypre_PFMG2BuildRAPSym( hypre_StructMatrix *A,
 
             break;
 
-            /*--------------------------------------------------------------
-             * Loop for symmetric 9-point fine grid operator; produces a
-             * symmetric 9-point coarse grid operator. We calculate only the
-             * lower triangular stencil entries: (southwest, south, southeast,
-             * west, and center).
-             *--------------------------------------------------------------*/
+         /*--------------------------------------------------------------
+          * Loop for symmetric 9-point fine grid operator; produces a
+          * symmetric 9-point coarse grid operator. We calculate only the
+          * lower triangular stencil entries: (southwest, south, southeast,
+          * west, and center).
+          *--------------------------------------------------------------*/
 
          default:
 
-            if ( constant_coefficient==1 )
+            if ( constant_coefficient == 1 )
             {
                hypre_PFMG2BuildRAPSym_onebox_FSS9_CC1(
                   ci, fi, A, P, R, cdir, cindex, cstride, RAP );
@@ -337,11 +340,11 @@ hypre_PFMG2BuildRAPSym_onebox_FSS5_CC0(
     * pb is pointer for weight for f-point below c-point
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,-1,0);
+   hypre_SetIndex3(index_temp, 0, -1, 0);
    MapIndex(index_temp, cdir, index);
    pa = hypre_StructMatrixExtractPointerByIndex(P, fi, index);
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
 
    pb = hypre_StructMatrixExtractPointerByIndex(P, fi, index);
@@ -354,11 +357,11 @@ hypre_PFMG2BuildRAPSym_onebox_FSS5_CC0(
     * rb is pointer for weight for f-point below c-point
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,-1,0);
+   hypre_SetIndex3(index_temp, 0, -1, 0);
    MapIndex(index_temp, cdir, index);
    ra = hypre_StructMatrixExtractPointerByIndex(R, fi, index);
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
 
    rb = hypre_StructMatrixExtractPointerByIndex(R, fi, index);
@@ -375,23 +378,23 @@ hypre_PFMG2BuildRAPSym_onebox_FSS5_CC0(
     * a_cn is pointer for north coefficient
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,0);
+   hypre_SetIndex3(index_temp, 0, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_cc = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,-1,0,0);
+   hypre_SetIndex3(index_temp, -1, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_cw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,0,0);
+   hypre_SetIndex3(index_temp, 1, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_ce = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,-1,0);
+   hypre_SetIndex3(index_temp, 0, -1, 0);
    MapIndex(index_temp, cdir, index);
    a_cs = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
    a_cn = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
@@ -404,23 +407,23 @@ hypre_PFMG2BuildRAPSym_onebox_FSS5_CC0(
     * rap_cc is pointer for center coefficient (etc.)
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,0);
+   hypre_SetIndex3(index_temp, 0, 0, 0);
    MapIndex(index_temp, cdir, index);
    rap_cc = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,-1,0,0);
+   hypre_SetIndex3(index_temp, -1, 0, 0);
    MapIndex(index_temp, cdir, index);
    rap_cw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,0,-1,0);
+   hypre_SetIndex3(index_temp, 0, -1, 0);
    MapIndex(index_temp, cdir, index);
    rap_cs = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,-1,-1,0);
+   hypre_SetIndex3(index_temp, -1, -1, 0);
    MapIndex(index_temp, cdir, index);
    rap_csw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,1,-1,0);
+   hypre_SetIndex3(index_temp, 1, -1, 0);
    MapIndex(index_temp, cdir, index);
    rap_cse = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
@@ -432,24 +435,24 @@ hypre_PFMG2BuildRAPSym_onebox_FSS5_CC0(
     * Offsets are used in refering to data associated with other points.
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
 
-   yOffsetP = hypre_BoxOffsetDistance(P_dbox,index);
+   yOffsetP = hypre_BoxOffsetDistance(P_dbox, index);
    if ( constant_coefficient_A == 0 )
    {
-      yOffsetA = hypre_BoxOffsetDistance(A_dbox,index);
+      yOffsetA = hypre_BoxOffsetDistance(A_dbox, index);
    }
    else
    {
       yOffsetA_offd = 0;
-      yOffsetA_diag = hypre_BoxOffsetDistance(A_dbox,index);
+      yOffsetA_diag = hypre_BoxOffsetDistance(A_dbox, index);
    }
 
-   hypre_SetIndex3(index_temp,1,0,0);
+   hypre_SetIndex3(index_temp, 1, 0, 0);
    MapIndex(index_temp, cdir, index);
 
-   xOffsetP = hypre_BoxOffsetDistance(P_dbox,index);
+   xOffsetP = hypre_BoxOffsetDistance(P_dbox, index);
 
 
    /*--------------------------------------------------------------
@@ -474,27 +477,27 @@ hypre_PFMG2BuildRAPSym_onebox_FSS5_CC0(
          HYPRE_Int iAp1 = iA + yOffsetA;
 
          HYPRE_Int iP1 = iP - yOffsetP - xOffsetP;
-         rap_csw[iAc] = rb[iR-rbOffset] * a_cw[iAm1] * pa[iP1];
+         rap_csw[iAc] = rb[iR - rbOffset] * a_cw[iAm1] * pa[iP1];
 
          iP1 = iP - yOffsetP;
-         rap_cs[iAc] = rb[iR-rbOffset] * a_cc[iAm1] * pa[iP1]
-            +          rb[iR-rbOffset] * a_cs[iAm1]
-            +                 a_cs[iA] * pa[iP1];
+         rap_cs[iAc] = rb[iR - rbOffset] * a_cc[iAm1] * pa[iP1]
+                       +          rb[iR - rbOffset] * a_cs[iAm1]
+                       +                 a_cs[iA] * pa[iP1];
          iP1 = iP - yOffsetP + xOffsetP;
-         rap_cse[iAc] = rb[iR-rbOffset] * a_ce[iAm1] * pa[iP1];
+         rap_cse[iAc] = rb[iR - rbOffset] * a_ce[iAm1] * pa[iP1];
 
          iP1 = iP - xOffsetP;
          rap_cw[iAc] =          a_cw[iA]
-            +          rb[iR-rbOffset] * a_cw[iAm1] * pb[iP1-pbOffset]
-            +          ra[iR] * a_cw[iAp1] * pa[iP1];
+                                +          rb[iR - rbOffset] * a_cw[iAm1] * pb[iP1 - pbOffset]
+                                +          ra[iR] * a_cw[iAp1] * pa[iP1];
 
          rap_cc[iAc] =          a_cc[iA]
-            +          rb[iR-rbOffset] * a_cc[iAm1] * pb[iP-pbOffset]
-            +          ra[iR] * a_cc[iAp1] * pa[iP]
-            +          rb[iR-rbOffset] * a_cn[iAm1]
-            +          ra[iR] * a_cs[iAp1]
-            +                   a_cs[iA]   * pb[iP-pbOffset]
-            +                   a_cn[iA]   * pa[iP];
+                                +          rb[iR - rbOffset] * a_cc[iAm1] * pb[iP - pbOffset]
+                                +          ra[iR] * a_cc[iAp1] * pa[iP]
+                                +          rb[iR - rbOffset] * a_cn[iAm1]
+                                +          ra[iR] * a_cs[iAp1]
+                                +                   a_cs[iA]   * pb[iP - pbOffset]
+                                +                   a_cn[iA]   * pa[iP];
       }
       hypre_BoxLoop4End(iP, iR, iA, iAc);
 #undef DEVICE_VAR
@@ -525,34 +528,34 @@ hypre_PFMG2BuildRAPSym_onebox_FSS5_CC0(
          HYPRE_Int iAp1 = iA + yOffsetA_diag;
 
          HYPRE_Int iP1 = iP - yOffsetP - xOffsetP;
-         rap_csw[iAc] = rb[iR-rbOffset] * a_cw_offdm1 * pa[iP1];
+         rap_csw[iAc] = rb[iR - rbOffset] * a_cw_offdm1 * pa[iP1];
 
          iP1 = iP - yOffsetP;
-         rap_cs[iAc] = rb[iR-rbOffset] * a_cc[iAm1] * pa[iP1]
-            +          rb[iR-rbOffset] * a_cs_offdm1
-            +                   a_cs_offd   * pa[iP1];
+         rap_cs[iAc] = rb[iR - rbOffset] * a_cc[iAm1] * pa[iP1]
+                       +          rb[iR - rbOffset] * a_cs_offdm1
+                       +                   a_cs_offd   * pa[iP1];
 
          iP1 = iP - yOffsetP + xOffsetP;
-         rap_cse[iAc] = rb[iR-rbOffset] * a_ce_offdm1 * pa[iP1];
+         rap_cse[iAc] = rb[iR - rbOffset] * a_ce_offdm1 * pa[iP1];
 
          iP1 = iP - xOffsetP;
          rap_cw[iAc] =          a_cw_offd
-            +          rb[iR-rbOffset] * a_cw_offdm1 * pb[iP1-pbOffset]
-            +          ra[iR] * a_cw_offdp1 * pa[iP1];
+                                +          rb[iR - rbOffset] * a_cw_offdm1 * pb[iP1 - pbOffset]
+                                +          ra[iR] * a_cw_offdp1 * pa[iP1];
 
          rap_cc[iAc] =          a_cc[iA]
-            +          rb[iR-rbOffset] * a_cc[iAm1] * pb[iP-pbOffset]
-            +          ra[iR] * a_cc[iAp1] * pa[iP]
-            +          rb[iR-rbOffset] * a_cn_offdm1
-            +          ra[iR] * a_cs_offdp1
-            +                   a_cs_offd  * pb[iP-pbOffset]
-            +                   a_cn_offd  * pa[iP];
+                                +          rb[iR - rbOffset] * a_cc[iAm1] * pb[iP - pbOffset]
+                                +          ra[iR] * a_cc[iAp1] * pa[iP]
+                                +          rb[iR - rbOffset] * a_cn_offdm1
+                                +          ra[iR] * a_cs_offdp1
+                                +                   a_cs_offd  * pb[iP - pbOffset]
+                                +                   a_cn_offd  * pa[iP];
       }
       hypre_BoxLoop4End(iP, iR, iA, iAc);
 #undef DEVICE_VAR
    }
 
-/*      } *//* end ForBoxI */
+   /*      } *//* end ForBoxI */
 
    return hypre_error_flag;
 }
@@ -610,11 +613,11 @@ hypre_PFMG2BuildRAPSym_onebox_FSS5_CC1(
     * pb is pointer for weight for f-point below c-point
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,-1,0);
+   hypre_SetIndex3(index_temp, 0, -1, 0);
    MapIndex(index_temp, cdir, index);
    pa = hypre_StructMatrixExtractPointerByIndex(P, fi, index);
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
 
    pb = hypre_StructMatrixExtractPointerByIndex(P, fi, index);
@@ -625,11 +628,11 @@ hypre_PFMG2BuildRAPSym_onebox_FSS5_CC1(
     * rb is pointer for weight for f-point below c-point
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,-1,0);
+   hypre_SetIndex3(index_temp, 0, -1, 0);
    MapIndex(index_temp, cdir, index);
    ra = hypre_StructMatrixExtractPointerByIndex(R, fi, index);
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
 
    rb = hypre_StructMatrixExtractPointerByIndex(R, fi, index);
@@ -644,23 +647,23 @@ hypre_PFMG2BuildRAPSym_onebox_FSS5_CC1(
     * a_cn is pointer for north coefficient
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,0);
+   hypre_SetIndex3(index_temp, 0, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_cc = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,-1,0,0);
+   hypre_SetIndex3(index_temp, -1, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_cw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,0,0);
+   hypre_SetIndex3(index_temp, 1, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_ce = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,-1,0);
+   hypre_SetIndex3(index_temp, 0, -1, 0);
    MapIndex(index_temp, cdir, index);
    a_cs = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
    a_cn = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
@@ -672,23 +675,23 @@ hypre_PFMG2BuildRAPSym_onebox_FSS5_CC1(
     * rap_cc is pointer for center coefficient (etc.)
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,0);
+   hypre_SetIndex3(index_temp, 0, 0, 0);
    MapIndex(index_temp, cdir, index);
    rap_cc = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,-1,0,0);
+   hypre_SetIndex3(index_temp, -1, 0, 0);
    MapIndex(index_temp, cdir, index);
    rap_cw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,0,-1,0);
+   hypre_SetIndex3(index_temp, 0, -1, 0);
    MapIndex(index_temp, cdir, index);
    rap_cs = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,-1,-1,0);
+   hypre_SetIndex3(index_temp, -1, -1, 0);
    MapIndex(index_temp, cdir, index);
    rap_csw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,1,-1,0);
+   hypre_SetIndex3(index_temp, 1, -1, 0);
    MapIndex(index_temp, cdir, index);
    rap_cse = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
@@ -700,13 +703,13 @@ hypre_PFMG2BuildRAPSym_onebox_FSS5_CC1(
     * Offsets are used in refering to data associated with other points.
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
 
    yOffsetA = 0;
    yOffsetP = 0;
 
-   hypre_SetIndex3(index_temp,1,0,0);
+   hypre_SetIndex3(index_temp, 1, 0, 0);
    MapIndex(index_temp, cdir, index);
 
    xOffsetP = 0;
@@ -736,26 +739,26 @@ hypre_PFMG2BuildRAPSym_onebox_FSS5_CC1(
 
    iP1 = iP - yOffsetP;
    rap_cs[iAc] = rb[iR] * a_cc[iAm1] * pa[iP1]
-      +          rb[iR] * a_cs[iAm1]
-      +                   a_cs[iA]   * pa[iP1];
+                 +          rb[iR] * a_cs[iAm1]
+                 +                   a_cs[iA]   * pa[iP1];
 
    iP1 = iP - yOffsetP + xOffsetP;
    rap_cse[iAc] = rb[iR] * a_ce[iAm1] * pa[iP1];
 
    iP1 = iP - xOffsetP;
    rap_cw[iAc] =          a_cw[iA]
-      +          rb[iR] * a_cw[iAm1] * pb[iP1]
-      +          ra[iR] * a_cw[iAp1] * pa[iP1];
+                          +          rb[iR] * a_cw[iAm1] * pb[iP1]
+                          +          ra[iR] * a_cw[iAp1] * pa[iP1];
 
    rap_cc[iAc] =          a_cc[iA]
-      +          rb[iR] * a_cc[iAm1] * pb[iP]
-      +          ra[iR] * a_cc[iAp1] * pa[iP]
-      +          rb[iR] * a_cn[iAm1]
-      +          ra[iR] * a_cs[iAp1]
-      +                   a_cs[iA]   * pb[iP]
-      +                   a_cn[iA]   * pa[iP];
+                          +          rb[iR] * a_cc[iAm1] * pb[iP]
+                          +          ra[iR] * a_cc[iAp1] * pa[iP]
+                          +          rb[iR] * a_cn[iAm1]
+                          +          ra[iR] * a_cs[iAp1]
+                          +                   a_cs[iA]   * pb[iP]
+                          +                   a_cn[iA]   * pa[iP];
 
-/*      } *//* end ForBoxI */
+   /*      } *//* end ForBoxI */
 
    return hypre_error_flag;
 }
@@ -836,11 +839,11 @@ hypre_PFMG2BuildRAPSym_onebox_FSS9_CC0(
     * pb is pointer for weight for f-point below c-point
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,-1,0);
+   hypre_SetIndex3(index_temp, 0, -1, 0);
    MapIndex(index_temp, cdir, index);
    pa = hypre_StructMatrixExtractPointerByIndex(P, fi, index);
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
 
    pb = hypre_StructMatrixExtractPointerByIndex(P, fi, index);
@@ -853,11 +856,11 @@ hypre_PFMG2BuildRAPSym_onebox_FSS9_CC0(
     * rb is pointer for weight for f-point below c-point
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,-1,0);
+   hypre_SetIndex3(index_temp, 0, -1, 0);
    MapIndex(index_temp, cdir, index);
    ra = hypre_StructMatrixExtractPointerByIndex(R, fi, index);
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
 
    rb = hypre_StructMatrixExtractPointerByIndex(R, fi, index);
@@ -873,23 +876,23 @@ hypre_PFMG2BuildRAPSym_onebox_FSS9_CC0(
     * a_cn is pointer for north coefficient
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,0);
+   hypre_SetIndex3(index_temp, 0, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_cc = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,-1,0,0);
+   hypre_SetIndex3(index_temp, -1, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_cw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,0,0);
+   hypre_SetIndex3(index_temp, 1, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_ce = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,-1,0);
+   hypre_SetIndex3(index_temp, 0, -1, 0);
    MapIndex(index_temp, cdir, index);
    a_cs = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
    a_cn = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
@@ -902,15 +905,15 @@ hypre_PFMG2BuildRAPSym_onebox_FSS9_CC0(
     * a_cne is pointer for northeast coefficient
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,-1,-1,0);
+   hypre_SetIndex3(index_temp, -1, -1, 0);
    MapIndex(index_temp, cdir, index);
    a_csw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,-1,0);
+   hypre_SetIndex3(index_temp, 1, -1, 0);
    MapIndex(index_temp, cdir, index);
    a_cse = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,-1,1,0);
+   hypre_SetIndex3(index_temp, -1, 1, 0);
    MapIndex(index_temp, cdir, index);
    a_cnw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
@@ -922,23 +925,23 @@ hypre_PFMG2BuildRAPSym_onebox_FSS9_CC0(
     * rap_cc is pointer for center coefficient (etc.)
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,0);
+   hypre_SetIndex3(index_temp, 0, 0, 0);
    MapIndex(index_temp, cdir, index);
    rap_cc = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,-1,0,0);
+   hypre_SetIndex3(index_temp, -1, 0, 0);
    MapIndex(index_temp, cdir, index);
    rap_cw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,0,-1,0);
+   hypre_SetIndex3(index_temp, 0, -1, 0);
    MapIndex(index_temp, cdir, index);
    rap_cs = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,-1,-1,0);
+   hypre_SetIndex3(index_temp, -1, -1, 0);
    MapIndex(index_temp, cdir, index);
    rap_csw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,1,-1,0);
+   hypre_SetIndex3(index_temp, 1, -1, 0);
    MapIndex(index_temp, cdir, index);
    rap_cse = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
@@ -950,13 +953,13 @@ hypre_PFMG2BuildRAPSym_onebox_FSS9_CC0(
     * Offsets are used in refering to data associated with other points.
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
 
-   yOffsetP = hypre_BoxOffsetDistance(P_dbox,index);
+   yOffsetP = hypre_BoxOffsetDistance(P_dbox, index);
    if ( constant_coefficient_A == 0 )
    {
-      yOffsetA = hypre_BoxOffsetDistance(A_dbox,index);
+      yOffsetA = hypre_BoxOffsetDistance(A_dbox, index);
    }
    else
    {
@@ -964,10 +967,10 @@ hypre_PFMG2BuildRAPSym_onebox_FSS9_CC0(
       yOffsetA_diag = 0;
    }
 
-   hypre_SetIndex3(index_temp,1,0,0);
+   hypre_SetIndex3(index_temp, 1, 0, 0);
    MapIndex(index_temp, cdir, index);
 
-   xOffsetP = hypre_BoxOffsetDistance(P_dbox,index);
+   xOffsetP = hypre_BoxOffsetDistance(P_dbox, index);
 
    /*--------------------------------------------------------------
     * Loop for symmetric 9-point fine grid operator; produces a
@@ -991,36 +994,36 @@ hypre_PFMG2BuildRAPSym_onebox_FSS9_CC0(
          HYPRE_Int iAp1 = iA + yOffsetA;
 
          HYPRE_Int iP1 = iP - yOffsetP - xOffsetP;
-         rap_csw[iAc] = rb[iR-rbOffset] * a_cw[iAm1] * pa[iP1]
-            +           rb[iR-rbOffset] * a_csw[iAm1]
-            +                    a_csw[iA]  * pa[iP1];
+         rap_csw[iAc] = rb[iR - rbOffset] * a_cw[iAm1] * pa[iP1]
+                        +           rb[iR - rbOffset] * a_csw[iAm1]
+                        +                    a_csw[iA]  * pa[iP1];
 
          iP1 = iP - yOffsetP;
-         rap_cs[iAc] = rb[iR-rbOffset] * a_cc[iAm1] * pa[iP1]
-            +          rb[iR-rbOffset] * a_cs[iAm1]
-            +                   a_cs[iA]   * pa[iP1];
+         rap_cs[iAc] = rb[iR - rbOffset] * a_cc[iAm1] * pa[iP1]
+                       +          rb[iR - rbOffset] * a_cs[iAm1]
+                       +                   a_cs[iA]   * pa[iP1];
 
          iP1 = iP - yOffsetP + xOffsetP;
-         rap_cse[iAc] = rb[iR-rbOffset] * a_ce[iAm1] * pa[iP1]
-            +           rb[iR-rbOffset] * a_cse[iAm1]
-            +                    a_cse[iA]  * pa[iP1];
+         rap_cse[iAc] = rb[iR - rbOffset] * a_ce[iAm1] * pa[iP1]
+                        +           rb[iR - rbOffset] * a_cse[iAm1]
+                        +                    a_cse[iA]  * pa[iP1];
 
          iP1 = iP - xOffsetP;
          rap_cw[iAc] =          a_cw[iA]
-            +          rb[iR-rbOffset] * a_cw[iAm1] * pb[iP1-pbOffset]
-            +          ra[iR] * a_cw[iAp1] * pa[iP1]
-            +          rb[iR-rbOffset] * a_cnw[iAm1]
-            +          ra[iR] * a_csw[iAp1]
-            +                   a_csw[iA]  * pb[iP1-pbOffset]
-            +                   a_cnw[iA]  * pa[iP1];
+                                +          rb[iR - rbOffset] * a_cw[iAm1] * pb[iP1 - pbOffset]
+                                +          ra[iR] * a_cw[iAp1] * pa[iP1]
+                                +          rb[iR - rbOffset] * a_cnw[iAm1]
+                                +          ra[iR] * a_csw[iAp1]
+                                +                   a_csw[iA]  * pb[iP1 - pbOffset]
+                                +                   a_cnw[iA]  * pa[iP1];
 
          rap_cc[iAc] =          a_cc[iA]
-            +          rb[iR-rbOffset] * a_cc[iAm1] * pb[iP-pbOffset]
-            +          ra[iR] * a_cc[iAp1] * pa[iP]
-            +          rb[iR-rbOffset] * a_cn[iAm1]
-            +          ra[iR] * a_cs[iAp1]
-            +                   a_cs[iA]   * pb[iP-pbOffset]
-            +                   a_cn[iA]   * pa[iP];
+                                +          rb[iR - rbOffset] * a_cc[iAm1] * pb[iP - pbOffset]
+                                +          ra[iR] * a_cc[iAp1] * pa[iP]
+                                +          rb[iR - rbOffset] * a_cn[iAm1]
+                                +          ra[iR] * a_cs[iAp1]
+                                +                   a_cs[iA]   * pb[iP - pbOffset]
+                                +                   a_cn[iA]   * pa[iP];
 
       }
       hypre_BoxLoop4End(iP, iR, iA, iAc);
@@ -1059,43 +1062,43 @@ hypre_PFMG2BuildRAPSym_onebox_FSS9_CC0(
          HYPRE_Int iAp1 = iA + yOffsetA_diag;
 
          HYPRE_Int iP1 = iP - yOffsetP - xOffsetP;
-         rap_csw[iAc] = rb[iR-rbOffset] * a_cw_offdm1 * pa[iP1]
-            +           rb[iR-rbOffset] * a_csw_offdm1
-            +                    a_csw_offd  * pa[iP1];
+         rap_csw[iAc] = rb[iR - rbOffset] * a_cw_offdm1 * pa[iP1]
+                        +           rb[iR - rbOffset] * a_csw_offdm1
+                        +                    a_csw_offd  * pa[iP1];
 
          iP1 = iP - yOffsetP;
-         rap_cs[iAc] = rb[iR-rbOffset] * a_cc[iAm1] * pa[iP1]
-            +          rb[iR-rbOffset] * a_cs_offdm1
-            +                   a_cs_offd   * pa[iP1];
+         rap_cs[iAc] = rb[iR - rbOffset] * a_cc[iAm1] * pa[iP1]
+                       +          rb[iR - rbOffset] * a_cs_offdm1
+                       +                   a_cs_offd   * pa[iP1];
 
          iP1 = iP - yOffsetP + xOffsetP;
-         rap_cse[iAc] = rb[iR-rbOffset] * a_ce_offdm1 * pa[iP1]
-            +           rb[iR-rbOffset] * a_cse_offdm1
-            +                    a_cse_offd  * pa[iP1];
+         rap_cse[iAc] = rb[iR - rbOffset] * a_ce_offdm1 * pa[iP1]
+                        +           rb[iR - rbOffset] * a_cse_offdm1
+                        +                    a_cse_offd  * pa[iP1];
 
          iP1 = iP - xOffsetP;
          rap_cw[iAc] =          a_cw_offd
-            +          rb[iR-rbOffset] * a_cw_offdm1 * pb[iP1-pbOffset]
-            +          ra[iR] * a_cw_offdp1 * pa[iP1]
-            +          rb[iR-rbOffset] * a_cnw_offdm1
-            +          ra[iR] * a_csw_offdp1
-            +                   a_csw_offd  * pb[iP1-pbOffset]
-            +                   a_cnw_offd  * pa[iP1];
+                                +          rb[iR - rbOffset] * a_cw_offdm1 * pb[iP1 - pbOffset]
+                                +          ra[iR] * a_cw_offdp1 * pa[iP1]
+                                +          rb[iR - rbOffset] * a_cnw_offdm1
+                                +          ra[iR] * a_csw_offdp1
+                                +                   a_csw_offd  * pb[iP1 - pbOffset]
+                                +                   a_cnw_offd  * pa[iP1];
 
          rap_cc[iAc] =          a_cc[iA]
-            +          rb[iR-rbOffset] * a_cc[iAm1] * pb[iP-pbOffset]
-            +          ra[iR] * a_cc[iAp1] * pa[iP]
-            +          rb[iR-rbOffset] * a_cn_offdm1
-            +          ra[iR] * a_cs_offdp1
-            +                   a_cs_offd   * pb[iP-pbOffset]
-            +                   a_cn_offd   * pa[iP];
+                                +          rb[iR - rbOffset] * a_cc[iAm1] * pb[iP - pbOffset]
+                                +          ra[iR] * a_cc[iAp1] * pa[iP]
+                                +          rb[iR - rbOffset] * a_cn_offdm1
+                                +          ra[iR] * a_cs_offdp1
+                                +                   a_cs_offd   * pb[iP - pbOffset]
+                                +                   a_cn_offd   * pa[iP];
 
       }
       hypre_BoxLoop4End(iP, iR, iA, iAc);
 #undef DEVICE_VAR
    }
 
-/*      }*/ /* end ForBoxI */
+   /*      }*/ /* end ForBoxI */
 
    return hypre_error_flag;
 }
@@ -1153,11 +1156,11 @@ hypre_PFMG2BuildRAPSym_onebox_FSS9_CC1(
     * pb is pointer for weight for f-point below c-point
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,-1,0);
+   hypre_SetIndex3(index_temp, 0, -1, 0);
    MapIndex(index_temp, cdir, index);
    pa = hypre_StructMatrixExtractPointerByIndex(P, fi, index);
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
 
    pb = hypre_StructMatrixExtractPointerByIndex(P, fi, index);
@@ -1168,11 +1171,11 @@ hypre_PFMG2BuildRAPSym_onebox_FSS9_CC1(
     * rb is pointer for weight for f-point below c-point
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,-1,0);
+   hypre_SetIndex3(index_temp, 0, -1, 0);
    MapIndex(index_temp, cdir, index);
    ra = hypre_StructMatrixExtractPointerByIndex(R, fi, index);
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
 
    rb = hypre_StructMatrixExtractPointerByIndex(R, fi, index);
@@ -1187,23 +1190,23 @@ hypre_PFMG2BuildRAPSym_onebox_FSS9_CC1(
     * a_cn is pointer for north coefficient
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,0);
+   hypre_SetIndex3(index_temp, 0, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_cc = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,-1,0,0);
+   hypre_SetIndex3(index_temp, -1, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_cw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,0,0);
+   hypre_SetIndex3(index_temp, 1, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_ce = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,-1,0);
+   hypre_SetIndex3(index_temp, 0, -1, 0);
    MapIndex(index_temp, cdir, index);
    a_cs = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
    a_cn = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
@@ -1216,15 +1219,15 @@ hypre_PFMG2BuildRAPSym_onebox_FSS9_CC1(
     * a_cne is pointer for northeast coefficient
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,-1,-1,0);
+   hypre_SetIndex3(index_temp, -1, -1, 0);
    MapIndex(index_temp, cdir, index);
    a_csw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,-1,0);
+   hypre_SetIndex3(index_temp, 1, -1, 0);
    MapIndex(index_temp, cdir, index);
    a_cse = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,-1,1,0);
+   hypre_SetIndex3(index_temp, -1, 1, 0);
    MapIndex(index_temp, cdir, index);
    a_cnw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
@@ -1236,23 +1239,23 @@ hypre_PFMG2BuildRAPSym_onebox_FSS9_CC1(
     * rap_cc is pointer for center coefficient (etc.)
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,0);
+   hypre_SetIndex3(index_temp, 0, 0, 0);
    MapIndex(index_temp, cdir, index);
    rap_cc = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,-1,0,0);
+   hypre_SetIndex3(index_temp, -1, 0, 0);
    MapIndex(index_temp, cdir, index);
    rap_cw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,0,-1,0);
+   hypre_SetIndex3(index_temp, 0, -1, 0);
    MapIndex(index_temp, cdir, index);
    rap_cs = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,-1,-1,0);
+   hypre_SetIndex3(index_temp, -1, -1, 0);
    MapIndex(index_temp, cdir, index);
    rap_csw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,1,-1,0);
+   hypre_SetIndex3(index_temp, 1, -1, 0);
    MapIndex(index_temp, cdir, index);
    rap_cse = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
@@ -1264,13 +1267,13 @@ hypre_PFMG2BuildRAPSym_onebox_FSS9_CC1(
     * Offsets are used in refering to data associated with other points.
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
 
    yOffsetA = 0;
    yOffsetP = 0;
 
-   hypre_SetIndex3(index_temp,1,0,0);
+   hypre_SetIndex3(index_temp, 1, 0, 0);
    MapIndex(index_temp, cdir, index);
 
    xOffsetP = 0;
@@ -1297,39 +1300,39 @@ hypre_PFMG2BuildRAPSym_onebox_FSS9_CC1(
 
    iP1 = iP - yOffsetP - xOffsetP;
    rap_csw[iAc] = rb[iR] * a_cw[iAm1] * pa[iP1]
-      +           rb[iR] * a_csw[iAm1]
-      +                    a_csw[iA]  * pa[iP1];
+                  +           rb[iR] * a_csw[iAm1]
+                  +                    a_csw[iA]  * pa[iP1];
 
    iP1 = iP - yOffsetP;
    rap_cs[iAc] = rb[iR] * a_cc[iAm1] * pa[iP1]
-      +          rb[iR] * a_cs[iAm1]
-      +                   a_cs[iA]   * pa[iP1];
+                 +          rb[iR] * a_cs[iAm1]
+                 +                   a_cs[iA]   * pa[iP1];
 
    iP1 = iP - yOffsetP + xOffsetP;
    rap_cse[iAc] = rb[iR] * a_ce[iAm1] * pa[iP1]
-      +           rb[iR] * a_cse[iAm1]
-      +                    a_cse[iA]  * pa[iP1];
+                  +           rb[iR] * a_cse[iAm1]
+                  +                    a_cse[iA]  * pa[iP1];
 
    iP1 = iP - xOffsetP;
    rap_cw[iAc] =          a_cw[iA]
-      +          rb[iR] * a_cw[iAm1] * pb[iP1]
-      +          ra[iR] * a_cw[iAp1] * pa[iP1]
-      +          rb[iR] * a_cnw[iAm1]
-      +          ra[iR] * a_csw[iAp1]
-      +                   a_csw[iA]  * pb[iP1]
-      +                   a_cnw[iA]  * pa[iP1];
+                          +          rb[iR] * a_cw[iAm1] * pb[iP1]
+                          +          ra[iR] * a_cw[iAp1] * pa[iP1]
+                          +          rb[iR] * a_cnw[iAm1]
+                          +          ra[iR] * a_csw[iAp1]
+                          +                   a_csw[iA]  * pb[iP1]
+                          +                   a_cnw[iA]  * pa[iP1];
 
    rap_cc[iAc] =          a_cc[iA]
-      +          rb[iR] * a_cc[iAm1] * pb[iP]
-      +          ra[iR] * a_cc[iAp1] * pa[iP]
-      +          rb[iR] * a_cn[iAm1]
-      +          ra[iR] * a_cs[iAp1]
-      +                   a_cs[iA]   * pb[iP]
-      +                   a_cn[iA]   * pa[iP];
+                          +          rb[iR] * a_cc[iAm1] * pb[iP]
+                          +          ra[iR] * a_cc[iAp1] * pa[iP]
+                          +          rb[iR] * a_cn[iAm1]
+                          +          ra[iR] * a_cs[iAp1]
+                          +                   a_cs[iA]   * pb[iP]
+                          +                   a_cn[iA]   * pa[iP];
 
 
 
-/*      }*/ /* end ForBoxI */
+   /*      }*/ /* end ForBoxI */
 
    return hypre_error_flag;
 }
@@ -1377,10 +1380,10 @@ hypre_PFMG2BuildRAPNoSym( hypre_StructMatrix *A,
    }
    else
    {
-/*      hypre_assert( hypre_StructMatrixConstantCoefficient(R)==0 );
-        hypre_assert( hypre_StructMatrixConstantCoefficient(A)==0 );
-        hypre_assert( hypre_StructMatrixConstantCoefficient(P)==0 );
-*/
+      /*      hypre_assert( hypre_StructMatrixConstantCoefficient(R)==0 );
+              hypre_assert( hypre_StructMatrixConstantCoefficient(A)==0 );
+              hypre_assert( hypre_StructMatrixConstantCoefficient(P)==0 );
+      */
    }
 
    fi = 0;
@@ -1407,7 +1410,7 @@ hypre_PFMG2BuildRAPNoSym( hypre_StructMatrix *A,
 
          case 5:
 
-            if ( constant_coefficient==1 )
+            if ( constant_coefficient == 1 )
             {
                hypre_PFMG2BuildRAPNoSym_onebox_FSS5_CC1(
                   ci, fi, A, P, R, cdir, cindex, cstride, RAP );
@@ -1421,15 +1424,15 @@ hypre_PFMG2BuildRAPNoSym( hypre_StructMatrix *A,
 
             break;
 
-            /*--------------------------------------------------------------
-             * Loop for 9-point fine grid operator; produces upper triangular
-             * part of 9-point coarse grid operator - excludes diagonal.
-             * stencil entries: (northeast, north, northwest, and east)
-             *--------------------------------------------------------------*/
+         /*--------------------------------------------------------------
+          * Loop for 9-point fine grid operator; produces upper triangular
+          * part of 9-point coarse grid operator - excludes diagonal.
+          * stencil entries: (northeast, north, northwest, and east)
+          *--------------------------------------------------------------*/
 
          default:
 
-            if ( constant_coefficient==1 )
+            if ( constant_coefficient == 1 )
             {
                hypre_PFMG2BuildRAPNoSym_onebox_FSS9_CC1(
                   ci, fi, A, P, R, cdir, cindex, cstride, RAP );
@@ -1507,14 +1510,14 @@ hypre_PFMG2BuildRAPNoSym_onebox_FSS5_CC0(
 
    constant_coefficient_A = hypre_StructMatrixConstantCoefficient(A);
 
-/*   fi = 0;
-     hypre_ForBoxI(ci, cgrid_boxes)
-     {
-     while (fgrid_ids[fi] != cgrid_ids[ci])
-     {
-     fi++;
-     }
-*/
+   /*   fi = 0;
+        hypre_ForBoxI(ci, cgrid_boxes)
+        {
+        while (fgrid_ids[fi] != cgrid_ids[ci])
+        {
+        fi++;
+        }
+   */
    cgrid_box = hypre_BoxArrayBox(cgrid_boxes, ci);
 
    cstart = hypre_BoxIMin(cgrid_box);
@@ -1531,11 +1534,11 @@ hypre_PFMG2BuildRAPNoSym_onebox_FSS5_CC0(
     * pb is pointer for weight for f-point below c-point
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,-1,0);
+   hypre_SetIndex3(index_temp, 0, -1, 0);
    MapIndex(index_temp, cdir, index);
    pa = hypre_StructMatrixExtractPointerByIndex(P, fi, index);
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
 
    pb = hypre_StructMatrixExtractPointerByIndex(P, fi, index);
@@ -1548,11 +1551,11 @@ hypre_PFMG2BuildRAPNoSym_onebox_FSS5_CC0(
     * rb is pointer for weight for f-point below c-point
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,-1,0);
+   hypre_SetIndex3(index_temp, 0, -1, 0);
    MapIndex(index_temp, cdir, index);
    ra = hypre_StructMatrixExtractPointerByIndex(R, fi, index);
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
 
    rb = hypre_StructMatrixExtractPointerByIndex(R, fi, index);
@@ -1569,19 +1572,19 @@ hypre_PFMG2BuildRAPNoSym_onebox_FSS5_CC0(
     * a_cn is pointer for north coefficient
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,0);
+   hypre_SetIndex3(index_temp, 0, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_cc = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,-1,0,0);
+   hypre_SetIndex3(index_temp, -1, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_cw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,0,0);
+   hypre_SetIndex3(index_temp, 1, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_ce = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
    a_cn = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
@@ -1593,19 +1596,19 @@ hypre_PFMG2BuildRAPNoSym_onebox_FSS5_CC0(
     * rap_ce is pointer for east coefficient (etc.)
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,1,0,0);
+   hypre_SetIndex3(index_temp, 1, 0, 0);
    MapIndex(index_temp, cdir, index);
    rap_ce = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
    rap_cn = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,1,1,0);
+   hypre_SetIndex3(index_temp, 1, 1, 0);
    MapIndex(index_temp, cdir, index);
    rap_cne = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,-1,1,0);
+   hypre_SetIndex3(index_temp, -1, 1, 0);
    MapIndex(index_temp, cdir, index);
    rap_cnw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
@@ -1617,25 +1620,25 @@ hypre_PFMG2BuildRAPNoSym_onebox_FSS5_CC0(
     * Offsets are used in refering to data associated with other points.
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
 
-   yOffsetP = hypre_BoxOffsetDistance(P_dbox,index);
+   yOffsetP = hypre_BoxOffsetDistance(P_dbox, index);
    if ( constant_coefficient_A == 0 )
    {
-      yOffsetA = hypre_BoxOffsetDistance(A_dbox,index);
+      yOffsetA = hypre_BoxOffsetDistance(A_dbox, index);
    }
    else
    {
-      hypre_assert( constant_coefficient_A==2 );
-      yOffsetA_diag = hypre_BoxOffsetDistance(A_dbox,index);
+      hypre_assert( constant_coefficient_A == 2 );
+      yOffsetA_diag = hypre_BoxOffsetDistance(A_dbox, index);
       yOffsetA_offd = 0;
    }
 
-   hypre_SetIndex3(index_temp,1,0,0);
+   hypre_SetIndex3(index_temp, 1, 0, 0);
    MapIndex(index_temp, cdir, index);
 
-   xOffsetP = hypre_BoxOffsetDistance(P_dbox,index);
+   xOffsetP = hypre_BoxOffsetDistance(P_dbox, index);
 
 
    /*--------------------------------------------------------------
@@ -1661,27 +1664,27 @@ hypre_PFMG2BuildRAPNoSym_onebox_FSS5_CC0(
          HYPRE_Int iAp1 = iA + yOffsetA;
 
          HYPRE_Int iP1 = iP + yOffsetP + xOffsetP;
-         rap_cne[iAc] = ra[iR] * a_ce[iAp1] * pb[iP1-pbOffset];
+         rap_cne[iAc] = ra[iR] * a_ce[iAp1] * pb[iP1 - pbOffset];
 
          iP1 = iP + yOffsetP;
-         rap_cn[iAc] = ra[iR] * a_cc[iAp1] * pb[iP1-pbOffset]
-            +          ra[iR] * a_cn[iAp1]
-            +                   a_cn[iA]   * pb[iP1-pbOffset];
+         rap_cn[iAc] = ra[iR] * a_cc[iAp1] * pb[iP1 - pbOffset]
+                       +          ra[iR] * a_cn[iAp1]
+                       +                   a_cn[iA]   * pb[iP1 - pbOffset];
 
          iP1 = iP + yOffsetP - xOffsetP;
-         rap_cnw[iAc] = ra[iR] * a_cw[iAp1] * pb[iP1-pbOffset];
+         rap_cnw[iAc] = ra[iR] * a_cw[iAp1] * pb[iP1 - pbOffset];
 
          iP1 = iP + xOffsetP;
          rap_ce[iAc] =          a_ce[iA]
-            +          rb[iR-rbOffset] * a_ce[iAm1] * pb[iP1-pbOffset]
-            +          ra[iR] * a_ce[iAp1] * pa[iP1];
+                                +          rb[iR - rbOffset] * a_ce[iAm1] * pb[iP1 - pbOffset]
+                                +          ra[iR] * a_ce[iAp1] * pa[iP1];
       }
       hypre_BoxLoop4End(iP, iR, iA, iAc);
 #undef DEVICE_VAR
    }
    else
    {
-      hypre_assert( constant_coefficient_A==2 );
+      hypre_assert( constant_coefficient_A == 2 );
       /*hypre_printf("nosym 5.0.2\n"); */
 
       iA_offd = 0;
@@ -1704,26 +1707,26 @@ hypre_PFMG2BuildRAPNoSym_onebox_FSS5_CC0(
          HYPRE_Int iAp1 = iA + yOffsetA_diag;
 
          HYPRE_Int iP1 = iP + yOffsetP + xOffsetP;
-         rap_cne[iAc] = ra[iR] * a_ce_offdp1 * pb[iP1-pbOffset];
+         rap_cne[iAc] = ra[iR] * a_ce_offdp1 * pb[iP1 - pbOffset];
 
          iP1 = iP + yOffsetP;
-         rap_cn[iAc] = ra[iR] * a_cc[iAp1] * pb[iP1-pbOffset]
-            +          ra[iR] * a_cn_offdp1
-            +                   a_cn_offd   * pb[iP1-pbOffset];
+         rap_cn[iAc] = ra[iR] * a_cc[iAp1] * pb[iP1 - pbOffset]
+                       +          ra[iR] * a_cn_offdp1
+                       +                   a_cn_offd   * pb[iP1 - pbOffset];
 
          iP1 = iP + yOffsetP - xOffsetP;
-         rap_cnw[iAc] = ra[iR] * a_cw_offdp1 * pb[iP1-pbOffset];
+         rap_cnw[iAc] = ra[iR] * a_cw_offdp1 * pb[iP1 - pbOffset];
 
          iP1 = iP + xOffsetP;
          rap_ce[iAc] =          a_ce_offd
-            +          rb[iR-rbOffset] * a_ce_offdm1 * pb[iP1-pbOffset]
-            +          ra[iR] * a_ce_offdp1 * pa[iP1];
+                                +          rb[iR - rbOffset] * a_ce_offdm1 * pb[iP1 - pbOffset]
+                                +          ra[iR] * a_ce_offdp1 * pa[iP1];
       }
       hypre_BoxLoop4End(iP, iR, iA, iAc);
 #undef DEVICE_VAR
    }
 
-/*      }*/ /* end ForBoxI */
+   /*      }*/ /* end ForBoxI */
 
    return hypre_error_flag;
 }
@@ -1781,11 +1784,11 @@ hypre_PFMG2BuildRAPNoSym_onebox_FSS5_CC1(
     * pb is pointer for weight for f-point below c-point
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,-1,0);
+   hypre_SetIndex3(index_temp, 0, -1, 0);
    MapIndex(index_temp, cdir, index);
    pa = hypre_StructMatrixExtractPointerByIndex(P, fi, index);
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
 
    pb = hypre_StructMatrixExtractPointerByIndex(P, fi, index);
@@ -1796,11 +1799,11 @@ hypre_PFMG2BuildRAPNoSym_onebox_FSS5_CC1(
     * rb is pointer for weight for f-point below c-point
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,-1,0);
+   hypre_SetIndex3(index_temp, 0, -1, 0);
    MapIndex(index_temp, cdir, index);
    ra = hypre_StructMatrixExtractPointerByIndex(R, fi, index);
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
 
    rb = hypre_StructMatrixExtractPointerByIndex(R, fi, index);
@@ -1815,19 +1818,19 @@ hypre_PFMG2BuildRAPNoSym_onebox_FSS5_CC1(
     * a_cn is pointer for north coefficient
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,0);
+   hypre_SetIndex3(index_temp, 0, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_cc = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,-1,0,0);
+   hypre_SetIndex3(index_temp, -1, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_cw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,0,0);
+   hypre_SetIndex3(index_temp, 1, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_ce = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
    a_cn = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
@@ -1839,19 +1842,19 @@ hypre_PFMG2BuildRAPNoSym_onebox_FSS5_CC1(
     * rap_ce is pointer for east coefficient (etc.)
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,1,0,0);
+   hypre_SetIndex3(index_temp, 1, 0, 0);
    MapIndex(index_temp, cdir, index);
    rap_ce = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
    rap_cn = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,1,1,0);
+   hypre_SetIndex3(index_temp, 1, 1, 0);
    MapIndex(index_temp, cdir, index);
    rap_cne = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,-1,1,0);
+   hypre_SetIndex3(index_temp, -1, 1, 0);
    MapIndex(index_temp, cdir, index);
    rap_cnw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
@@ -1863,13 +1866,13 @@ hypre_PFMG2BuildRAPNoSym_onebox_FSS5_CC1(
     * Offsets are used in refering to data associated with other points.
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
 
    yOffsetA = 0;
    yOffsetP = 0;
 
-   hypre_SetIndex3(index_temp,1,0,0);
+   hypre_SetIndex3(index_temp, 1, 0, 0);
    MapIndex(index_temp, cdir, index);
 
    xOffsetP = 0;
@@ -1898,19 +1901,19 @@ hypre_PFMG2BuildRAPNoSym_onebox_FSS5_CC1(
 
    iP1 = iP + yOffsetP;
    rap_cn[iAc] = ra[iR] * a_cc[iAp1] * pb[iP1]
-      +          ra[iR] * a_cn[iAp1]
-      +                   a_cn[iA]   * pb[iP1];
+                 +          ra[iR] * a_cn[iAp1]
+                 +                   a_cn[iA]   * pb[iP1];
 
    iP1 = iP + yOffsetP - xOffsetP;
    rap_cnw[iAc] = ra[iR] * a_cw[iAp1] * pb[iP1];
 
    iP1 = iP + xOffsetP;
    rap_ce[iAc] =          a_ce[iA]
-      +          rb[iR] * a_ce[iAm1] * pb[iP1]
-      +          ra[iR] * a_ce[iAp1] * pa[iP1];
+                          +          rb[iR] * a_ce[iAm1] * pb[iP1]
+                          +          ra[iR] * a_ce[iAp1] * pa[iP1];
 
 
-/*      }*/ /* end ForBoxI */
+   /*      }*/ /* end ForBoxI */
 
    return hypre_error_flag;
 }
@@ -1973,14 +1976,14 @@ hypre_PFMG2BuildRAPNoSym_onebox_FSS9_CC0(
 
    constant_coefficient_A = hypre_StructMatrixConstantCoefficient(A);
 
-/*   fi = 0;
-     hypre_ForBoxI(ci, cgrid_boxes)
-     {
-     while (fgrid_ids[fi] != cgrid_ids[ci])
-     {
-     fi++;
-     }
-*/
+   /*   fi = 0;
+        hypre_ForBoxI(ci, cgrid_boxes)
+        {
+        while (fgrid_ids[fi] != cgrid_ids[ci])
+        {
+        fi++;
+        }
+   */
    cgrid_box = hypre_BoxArrayBox(cgrid_boxes, ci);
 
    cstart = hypre_BoxIMin(cgrid_box);
@@ -1997,11 +2000,11 @@ hypre_PFMG2BuildRAPNoSym_onebox_FSS9_CC0(
     * pb is pointer for weight for f-point below c-point
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,-1,0);
+   hypre_SetIndex3(index_temp, 0, -1, 0);
    MapIndex(index_temp, cdir, index);
    pa = hypre_StructMatrixExtractPointerByIndex(P, fi, index);
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
 
    pb = hypre_StructMatrixExtractPointerByIndex(P, fi, index);
@@ -2014,11 +2017,11 @@ hypre_PFMG2BuildRAPNoSym_onebox_FSS9_CC0(
     * rb is pointer for weight for f-point below c-point
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,-1,0);
+   hypre_SetIndex3(index_temp, 0, -1, 0);
    MapIndex(index_temp, cdir, index);
    ra = hypre_StructMatrixExtractPointerByIndex(R, fi, index);
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
 
    rb = hypre_StructMatrixExtractPointerByIndex(R, fi, index);
@@ -2035,19 +2038,19 @@ hypre_PFMG2BuildRAPNoSym_onebox_FSS9_CC0(
     * a_cn is pointer for north coefficient
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,0);
+   hypre_SetIndex3(index_temp, 0, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_cc = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,-1,0,0);
+   hypre_SetIndex3(index_temp, -1, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_cw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,0,0);
+   hypre_SetIndex3(index_temp, 1, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_ce = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
    a_cn = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
@@ -2060,15 +2063,15 @@ hypre_PFMG2BuildRAPNoSym_onebox_FSS9_CC0(
     * a_cne is pointer for northeast coefficient
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,1,-1,0);
+   hypre_SetIndex3(index_temp, 1, -1, 0);
    MapIndex(index_temp, cdir, index);
    a_cse = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,-1,1,0);
+   hypre_SetIndex3(index_temp, -1, 1, 0);
    MapIndex(index_temp, cdir, index);
    a_cnw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,1,0);
+   hypre_SetIndex3(index_temp, 1, 1, 0);
    MapIndex(index_temp, cdir, index);
    a_cne = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
@@ -2080,19 +2083,19 @@ hypre_PFMG2BuildRAPNoSym_onebox_FSS9_CC0(
     * rap_ce is pointer for east coefficient (etc.)
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,1,0,0);
+   hypre_SetIndex3(index_temp, 1, 0, 0);
    MapIndex(index_temp, cdir, index);
    rap_ce = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
    rap_cn = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,1,1,0);
+   hypre_SetIndex3(index_temp, 1, 1, 0);
    MapIndex(index_temp, cdir, index);
    rap_cne = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,-1,1,0);
+   hypre_SetIndex3(index_temp, -1, 1, 0);
    MapIndex(index_temp, cdir, index);
    rap_cnw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
@@ -2104,25 +2107,25 @@ hypre_PFMG2BuildRAPNoSym_onebox_FSS9_CC0(
     * Offsets are used in refering to data associated with other points.
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
 
-   yOffsetP = hypre_BoxOffsetDistance(P_dbox,index);
+   yOffsetP = hypre_BoxOffsetDistance(P_dbox, index);
    if ( constant_coefficient_A == 0 )
    {
-      yOffsetA = hypre_BoxOffsetDistance(A_dbox,index);
+      yOffsetA = hypre_BoxOffsetDistance(A_dbox, index);
    }
    else
    {
-      hypre_assert( constant_coefficient_A==2 );
-      yOffsetA_diag = hypre_BoxOffsetDistance(A_dbox,index);
+      hypre_assert( constant_coefficient_A == 2 );
+      yOffsetA_diag = hypre_BoxOffsetDistance(A_dbox, index);
       yOffsetA_offd = 0;
    }
 
-   hypre_SetIndex3(index_temp,1,0,0);
+   hypre_SetIndex3(index_temp, 1, 0, 0);
    MapIndex(index_temp, cdir, index);
 
-   xOffsetP = hypre_BoxOffsetDistance(P_dbox,index);
+   xOffsetP = hypre_BoxOffsetDistance(P_dbox, index);
 
    /*-----------------------------------------------------------------
     * Switch statement to direct control to appropriate BoxLoop depending
@@ -2138,7 +2141,7 @@ hypre_PFMG2BuildRAPNoSym_onebox_FSS9_CC0(
 
    hypre_BoxGetSize(cgrid_box, loop_size);
 
-   if ( constant_coefficient_A==0 )
+   if ( constant_coefficient_A == 0 )
    {
       /*hypre_printf("nosym 9.0.0\n");*/
 
@@ -2153,28 +2156,28 @@ hypre_PFMG2BuildRAPNoSym_onebox_FSS9_CC0(
          HYPRE_Int iAp1 = iA + yOffsetA;
 
          HYPRE_Int iP1 = iP + yOffsetP + xOffsetP;
-         rap_cne[iAc] = ra[iR] * a_ce[iAp1] * pb[iP1-pbOffset]
-            +           ra[iR] * a_cne[iAp1]
-            +                    a_cne[iA]  * pb[iP1-pbOffset];
+         rap_cne[iAc] = ra[iR] * a_ce[iAp1] * pb[iP1 - pbOffset]
+                        +           ra[iR] * a_cne[iAp1]
+                        +                    a_cne[iA]  * pb[iP1 - pbOffset];
 
          iP1 = iP + yOffsetP;
-         rap_cn[iAc] = ra[iR] * a_cc[iAp1] * pb[iP1-pbOffset]
-            +          ra[iR] * a_cn[iAp1]
-            +                   a_cn[iA]   * pb[iP1-pbOffset];
+         rap_cn[iAc] = ra[iR] * a_cc[iAp1] * pb[iP1 - pbOffset]
+                       +          ra[iR] * a_cn[iAp1]
+                       +                   a_cn[iA]   * pb[iP1 - pbOffset];
 
          iP1 = iP + yOffsetP - xOffsetP;
-         rap_cnw[iAc] = ra[iR] * a_cw[iAp1] * pb[iP1-pbOffset]
-            +           ra[iR] * a_cnw[iAp1]
-            +                    a_cnw[iA]  * pb[iP1-pbOffset];
+         rap_cnw[iAc] = ra[iR] * a_cw[iAp1] * pb[iP1 - pbOffset]
+                        +           ra[iR] * a_cnw[iAp1]
+                        +                    a_cnw[iA]  * pb[iP1 - pbOffset];
 
          iP1 = iP + xOffsetP;
          rap_ce[iAc] =          a_ce[iA]
-            +          rb[iR-rbOffset] * a_ce[iAm1] * pb[iP1-pbOffset]
-            +          ra[iR] * a_ce[iAp1] * pa[iP1]
-            +          rb[iR-rbOffset] * a_cne[iAm1]
-            +          ra[iR] * a_cse[iAp1]
-            +                   a_cse[iA]  * pb[iP1-pbOffset]
-            +                   a_cne[iA]  * pa[iP1];
+                                +          rb[iR - rbOffset] * a_ce[iAm1] * pb[iP1 - pbOffset]
+                                +          ra[iR] * a_ce[iAp1] * pa[iP1]
+                                +          rb[iR - rbOffset] * a_cne[iAm1]
+                                +          ra[iR] * a_cse[iAp1]
+                                +                   a_cse[iA]  * pb[iP1 - pbOffset]
+                                +                   a_cne[iA]  * pa[iP1];
 
       }
       hypre_BoxLoop4End(iP, iR, iA, iAc);
@@ -2183,7 +2186,7 @@ hypre_PFMG2BuildRAPNoSym_onebox_FSS9_CC0(
    else
    {
       /*hypre_printf("nosym 9.0.2\n");*/
-      hypre_assert( constant_coefficient_A==2 );
+      hypre_assert( constant_coefficient_A == 2 );
       iA_offd = 0;
       iA_offdm1 = iA_offd - yOffsetA_offd;
       iA_offdp1 = iA_offd + yOffsetA_offd;
@@ -2211,35 +2214,35 @@ hypre_PFMG2BuildRAPNoSym_onebox_FSS9_CC0(
          HYPRE_Int iAp1 = iA + yOffsetA_diag;
 
          HYPRE_Int iP1 = iP + yOffsetP + xOffsetP;
-         rap_cne[iAc] = ra[iR] * a_ce_offdp1 * pb[iP1-pbOffset]
-            +           ra[iR] * a_cne_offdp1
-            +                    a_cne_offd  * pb[iP1-pbOffset];
+         rap_cne[iAc] = ra[iR] * a_ce_offdp1 * pb[iP1 - pbOffset]
+                        +           ra[iR] * a_cne_offdp1
+                        +                    a_cne_offd  * pb[iP1 - pbOffset];
 
          iP1 = iP + yOffsetP;
-         rap_cn[iAc] = ra[iR] * a_cc[iAp1] * pb[iP1-pbOffset]
-            +          ra[iR] * a_cn_offdp1
-            +                   a_cn_offd   * pb[iP1-pbOffset];
+         rap_cn[iAc] = ra[iR] * a_cc[iAp1] * pb[iP1 - pbOffset]
+                       +          ra[iR] * a_cn_offdp1
+                       +                   a_cn_offd   * pb[iP1 - pbOffset];
 
          iP1 = iP + yOffsetP - xOffsetP;
-         rap_cnw[iAc] = ra[iR] * a_cw_offdp1 * pb[iP1-pbOffset]
-            +           ra[iR] * a_cnw_offdp1
-            +                    a_cnw_offd  * pb[iP1-pbOffset];
+         rap_cnw[iAc] = ra[iR] * a_cw_offdp1 * pb[iP1 - pbOffset]
+                        +           ra[iR] * a_cnw_offdp1
+                        +                    a_cnw_offd  * pb[iP1 - pbOffset];
 
          iP1 = iP + xOffsetP;
          rap_ce[iAc] =          a_ce_offd
-            +          rb[iR-rbOffset] * a_ce_offdm1 * pb[iP1-pbOffset]
-            +          ra[iR] * a_ce_offdp1 * pa[iP1]
-            +          rb[iR-rbOffset] * a_cne_offdm1
-            +          ra[iR] * a_cse_offdp1
-            +                   a_cse_offd  * pb[iP1-pbOffset]
-            +                   a_cne_offd  * pa[iP1];
+                                +          rb[iR - rbOffset] * a_ce_offdm1 * pb[iP1 - pbOffset]
+                                +          ra[iR] * a_ce_offdp1 * pa[iP1]
+                                +          rb[iR - rbOffset] * a_cne_offdm1
+                                +          ra[iR] * a_cse_offdp1
+                                +                   a_cse_offd  * pb[iP1 - pbOffset]
+                                +                   a_cne_offd  * pa[iP1];
 
       }
       hypre_BoxLoop4End(iP, iR, iA, iAc);
 #undef DEVICE_VAR
    }
 
-/*      }*/ /* end ForBoxI */
+   /*      }*/ /* end ForBoxI */
 
    return hypre_error_flag;
 }
@@ -2298,11 +2301,11 @@ hypre_PFMG2BuildRAPNoSym_onebox_FSS9_CC1(
     * pb is pointer for weight for f-point below c-point
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,-1,0);
+   hypre_SetIndex3(index_temp, 0, -1, 0);
    MapIndex(index_temp, cdir, index);
    pa = hypre_StructMatrixExtractPointerByIndex(P, fi, index);
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
 
    pb = hypre_StructMatrixExtractPointerByIndex(P, fi, index);
@@ -2313,11 +2316,11 @@ hypre_PFMG2BuildRAPNoSym_onebox_FSS9_CC1(
     * rb is pointer for weight for f-point below c-point
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,-1,0);
+   hypre_SetIndex3(index_temp, 0, -1, 0);
    MapIndex(index_temp, cdir, index);
    ra = hypre_StructMatrixExtractPointerByIndex(R, fi, index);
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
 
    rb = hypre_StructMatrixExtractPointerByIndex(R, fi, index);
@@ -2332,19 +2335,19 @@ hypre_PFMG2BuildRAPNoSym_onebox_FSS9_CC1(
     * a_cn is pointer for north coefficient
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,0);
+   hypre_SetIndex3(index_temp, 0, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_cc = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,-1,0,0);
+   hypre_SetIndex3(index_temp, -1, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_cw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,0,0);
+   hypre_SetIndex3(index_temp, 1, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_ce = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
    a_cn = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
@@ -2357,15 +2360,15 @@ hypre_PFMG2BuildRAPNoSym_onebox_FSS9_CC1(
     * a_cne is pointer for northeast coefficient
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,1,-1,0);
+   hypre_SetIndex3(index_temp, 1, -1, 0);
    MapIndex(index_temp, cdir, index);
    a_cse = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,-1,1,0);
+   hypre_SetIndex3(index_temp, -1, 1, 0);
    MapIndex(index_temp, cdir, index);
    a_cnw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,1,0);
+   hypre_SetIndex3(index_temp, 1, 1, 0);
    MapIndex(index_temp, cdir, index);
    a_cne = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
@@ -2377,19 +2380,19 @@ hypre_PFMG2BuildRAPNoSym_onebox_FSS9_CC1(
     * rap_ce is pointer for east coefficient (etc.)
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,1,0,0);
+   hypre_SetIndex3(index_temp, 1, 0, 0);
    MapIndex(index_temp, cdir, index);
    rap_ce = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
    rap_cn = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,1,1,0);
+   hypre_SetIndex3(index_temp, 1, 1, 0);
    MapIndex(index_temp, cdir, index);
    rap_cne = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,-1,1,0);
+   hypre_SetIndex3(index_temp, -1, 1, 0);
    MapIndex(index_temp, cdir, index);
    rap_cnw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
@@ -2401,13 +2404,13 @@ hypre_PFMG2BuildRAPNoSym_onebox_FSS9_CC1(
     * Offsets are used in refering to data associated with other points.
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
 
    yOffsetA = 0;
    yOffsetP = 0;
 
-   hypre_SetIndex3(index_temp,1,0,0);
+   hypre_SetIndex3(index_temp, 1, 0, 0);
    MapIndex(index_temp, cdir, index);
 
    xOffsetP = 0;
@@ -2434,34 +2437,31 @@ hypre_PFMG2BuildRAPNoSym_onebox_FSS9_CC1(
 
    iP1 = iP + yOffsetP + xOffsetP;
    rap_cne[iAc] = ra[iR] * a_ce[iAp1] * pb[iP1]
-      +           ra[iR] * a_cne[iAp1]
-      +                    a_cne[iA]  * pb[iP1];
+                  +           ra[iR] * a_cne[iAp1]
+                  +                    a_cne[iA]  * pb[iP1];
 
    iP1 = iP + yOffsetP;
    rap_cn[iAc] = ra[iR] * a_cc[iAp1] * pb[iP1]
-      +          ra[iR] * a_cn[iAp1]
-      +                   a_cn[iA]   * pb[iP1];
+                 +          ra[iR] * a_cn[iAp1]
+                 +                   a_cn[iA]   * pb[iP1];
 
    iP1 = iP + yOffsetP - xOffsetP;
    rap_cnw[iAc] = ra[iR] * a_cw[iAp1] * pb[iP1]
-      +           ra[iR] * a_cnw[iAp1]
-      +                    a_cnw[iA]  * pb[iP1];
+                  +           ra[iR] * a_cnw[iAp1]
+                  +                    a_cnw[iA]  * pb[iP1];
 
    iP1 = iP + xOffsetP;
    rap_ce[iAc] =          a_ce[iA]
-      +          rb[iR] * a_ce[iAm1] * pb[iP1]
-      +          ra[iR] * a_ce[iAp1] * pa[iP1]
-      +          rb[iR] * a_cne[iAm1]
-      +          ra[iR] * a_cse[iAp1]
-      +                   a_cse[iA]  * pb[iP1]
-      +                   a_cne[iA]  * pa[iP1];
+                          +          rb[iR] * a_ce[iAm1] * pb[iP1]
+                          +          ra[iR] * a_ce[iAp1] * pa[iP1]
+                          +          rb[iR] * a_cne[iAm1]
+                          +          ra[iR] * a_cse[iAp1]
+                          +                   a_cse[iA]  * pb[iP1]
+                          +                   a_cne[iA]  * pa[iP1];
 
 
 
-/*      }*/ /* end ForBoxI */
+   /*      }*/ /* end ForBoxI */
 
    return hypre_error_flag;
 }
-
-
-
diff --git a/external/hypre/src/struct_ls/pfmg3_setup_rap.c b/external/hypre/src/struct_ls/pfmg3_setup_rap.c
index bc408b7b..f508e11f 100644
--- a/external/hypre/src/struct_ls/pfmg3_setup_rap.c
+++ b/external/hypre/src/struct_ls/pfmg3_setup_rap.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -34,6 +34,9 @@ hypre_PFMG3CreateRAPOp( hypre_StructMatrix *R,
                         hypre_StructGrid   *coarse_grid,
                         HYPRE_Int           cdir        )
 {
+   HYPRE_UNUSED_VAR(R);
+   HYPRE_UNUSED_VAR(P);
+
    hypre_StructMatrix    *RAP;
 
    hypre_Index           *RAP_stencil_shape;
@@ -73,7 +76,7 @@ hypre_PFMG3CreateRAPOp( hypre_StructMatrix *R,
     * lower triangular means the lower triangular part on the matrix
     * in the standard lexicographic ordering.
     *-----------------------------------------------------------------------*/
-   if( A_stencil_size == 7)
+   if ( A_stencil_size == 7)
    {
       RAP_stencil_size = 19;
       if (hypre_StructMatrixSymmetric(A))
@@ -87,9 +90,9 @@ hypre_PFMG3CreateRAPOp( hypre_StructMatrix *R,
          {
             for (i = -1; i < 2; i++)
             {
-               if ((i*j*k == 0) && (stencil_rank < RAP_stencil_size))
+               if ((i * j * k == 0) && (stencil_rank < RAP_stencil_size))
                {
-                  hypre_SetIndex3(index_temp,i,j,k);
+                  hypre_SetIndex3(index_temp, i, j, k);
                   MapIndex(index_temp, cdir,
                            RAP_stencil_shape[stencil_rank]);
                   stencil_rank++;
@@ -124,7 +127,7 @@ hypre_PFMG3CreateRAPOp( hypre_StructMatrix *R,
             {
                if (stencil_rank < RAP_stencil_size)
                {
-                  hypre_SetIndex3(index_temp,i,j,k);
+                  hypre_SetIndex3(index_temp, i, j, k);
                   MapIndex(index_temp, cdir,
                            RAP_stencil_shape[stencil_rank]);
                   stencil_rank++;
@@ -202,16 +205,16 @@ hypre_PFMG3BuildRAPSym( hypre_StructMatrix *A,
 
    constant_coefficient = hypre_StructMatrixConstantCoefficient(RAP);
    constant_coefficient_A = hypre_StructMatrixConstantCoefficient(A);
-   hypre_assert( constant_coefficient==0 || constant_coefficient==1 );
+   hypre_assert( constant_coefficient == 0 || constant_coefficient == 1 );
    hypre_assert( hypre_StructMatrixConstantCoefficient(R) == constant_coefficient );
    hypre_assert( hypre_StructMatrixConstantCoefficient(P) == constant_coefficient );
-   if (constant_coefficient==1 )
+   if (constant_coefficient == 1 )
    {
-      hypre_assert( constant_coefficient_A==1 );
+      hypre_assert( constant_coefficient_A == 1 );
    }
    else
    {
-      hypre_assert( constant_coefficient_A==0 || constant_coefficient_A==2 );
+      hypre_assert( constant_coefficient_A == 0 || constant_coefficient_A == 2 );
    }
 
    fi = 0;
@@ -240,7 +243,7 @@ hypre_PFMG3BuildRAPSym( hypre_StructMatrix *A,
 
          case 7:
 
-            if ( constant_coefficient==1 )
+            if ( constant_coefficient == 1 )
             {
                hypre_PFMG3BuildRAPSym_onebox_FSS07_CC1(
                   ci, fi, A, P, R, cdir, cindex, cstride, RAP );
@@ -253,18 +256,18 @@ hypre_PFMG3BuildRAPSym( hypre_StructMatrix *A,
             }
             break;
 
-            /*--------------------------------------------------------------
-             * Loop for symmetric 19-point fine grid operator; produces a
-             * symmetric 27-point coarse grid operator. We calculate only the
-             * lower triangular stencil entries: (below-southwest, below-south,
-             * below-southeast, below-west, below-center, below-east,
-             * below-northwest, below-north, below-northeast, center-southwest,
-             * center-south, center-southeast, center-west, and center-center).
-             *--------------------------------------------------------------*/
+         /*--------------------------------------------------------------
+          * Loop for symmetric 19-point fine grid operator; produces a
+          * symmetric 27-point coarse grid operator. We calculate only the
+          * lower triangular stencil entries: (below-southwest, below-south,
+          * below-southeast, below-west, below-center, below-east,
+          * below-northwest, below-north, below-northeast, center-southwest,
+          * center-south, center-southeast, center-west, and center-center).
+          *--------------------------------------------------------------*/
 
          case 19:
 
-            if ( constant_coefficient==1 )
+            if ( constant_coefficient == 1 )
             {
                hypre_PFMG3BuildRAPSym_onebox_FSS19_CC1(
                   ci, fi, A, P, R, cdir, cindex, cstride, RAP );
@@ -276,18 +279,18 @@ hypre_PFMG3BuildRAPSym( hypre_StructMatrix *A,
             }
             break;
 
-            /*--------------------------------------------------------------
-             * Loop for symmetric 27-point fine grid operator; produces a
-             * symmetric 27-point coarse grid operator. We calculate only the
-             * lower triangular stencil entries: (below-southwest, below-south,
-             * below-southeast, below-west, below-center, below-east,
-             * below-northwest, below-north, below-northeast, center-southwest,
-             * center-south, center-southeast, center-west, and center-center).
-             *--------------------------------------------------------------*/
+         /*--------------------------------------------------------------
+          * Loop for symmetric 27-point fine grid operator; produces a
+          * symmetric 27-point coarse grid operator. We calculate only the
+          * lower triangular stencil entries: (below-southwest, below-south,
+          * below-southeast, below-west, below-center, below-east,
+          * below-northwest, below-north, below-northeast, center-southwest,
+          * center-south, center-southeast, center-west, and center-center).
+          *--------------------------------------------------------------*/
 
          default:
 
-            if ( constant_coefficient==1 )
+            if ( constant_coefficient == 1 )
             {
                hypre_PFMG3BuildRAPSym_onebox_FSS27_CC1(
                   ci, fi, A, P, R, cdir, cindex, cstride, RAP );
@@ -388,11 +391,11 @@ hypre_PFMG3BuildRAPSym_onebox_FSS07_CC0(
     * pb is pointer for weight for f-point below c-point
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,-1);
+   hypre_SetIndex3(index_temp, 0, 0, -1);
    MapIndex(index_temp, cdir, index);
    pa = hypre_StructMatrixExtractPointerByIndex(P, fi, index);
 
-   hypre_SetIndex3(index_temp,0,0,1);
+   hypre_SetIndex3(index_temp, 0, 0, 1);
    MapIndex(index_temp, cdir, index);
 
    pb = hypre_StructMatrixExtractPointerByIndex(P, fi, index);
@@ -405,11 +408,11 @@ hypre_PFMG3BuildRAPSym_onebox_FSS07_CC0(
     * rb is pointer for weight for f-point below c-point
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,-1);
+   hypre_SetIndex3(index_temp, 0, 0, -1);
    MapIndex(index_temp, cdir, index);
    ra = hypre_StructMatrixExtractPointerByIndex(R, fi, index);
 
-   hypre_SetIndex3(index_temp,0,0,1);
+   hypre_SetIndex3(index_temp, 0, 0, 1);
    MapIndex(index_temp, cdir, index);
 
    rb = hypre_StructMatrixExtractPointerByIndex(R, fi, index);
@@ -428,31 +431,31 @@ hypre_PFMG3BuildRAPSym_onebox_FSS07_CC0(
     * a_bc is pointer for center coefficient in plane below
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,0);
+   hypre_SetIndex3(index_temp, 0, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_cc = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,-1,0,0);
+   hypre_SetIndex3(index_temp, -1, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_cw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,0,0);
+   hypre_SetIndex3(index_temp, 1, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_ce = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,-1,0);
+   hypre_SetIndex3(index_temp, 0, -1, 0);
    MapIndex(index_temp, cdir, index);
    a_cs = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
    a_cn = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,0,1);
+   hypre_SetIndex3(index_temp, 0, 0, 1);
    MapIndex(index_temp, cdir, index);
    a_ac = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,0,-1);
+   hypre_SetIndex3(index_temp, 0, 0, -1);
    MapIndex(index_temp, cdir, index);
    a_bc = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
@@ -465,43 +468,43 @@ hypre_PFMG3BuildRAPSym_onebox_FSS07_CC0(
     * rap_cc is pointer for center coefficient (etc.)
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,0);
+   hypre_SetIndex3(index_temp, 0, 0, 0);
    MapIndex(index_temp, cdir, index);
    rap_cc = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,-1,0,0);
+   hypre_SetIndex3(index_temp, -1, 0, 0);
    MapIndex(index_temp, cdir, index);
    rap_cw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,0,-1,0);
+   hypre_SetIndex3(index_temp, 0, -1, 0);
    MapIndex(index_temp, cdir, index);
    rap_cs = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,0,0,-1);
+   hypre_SetIndex3(index_temp, 0, 0, -1);
    MapIndex(index_temp, cdir, index);
    rap_bc = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,-1,0,-1);
+   hypre_SetIndex3(index_temp, -1, 0, -1);
    MapIndex(index_temp, cdir, index);
    rap_bw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,1,0,-1);
+   hypre_SetIndex3(index_temp, 1, 0, -1);
    MapIndex(index_temp, cdir, index);
    rap_be = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,0,-1,-1);
+   hypre_SetIndex3(index_temp, 0, -1, -1);
    MapIndex(index_temp, cdir, index);
    rap_bs = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,0,1,-1);
+   hypre_SetIndex3(index_temp, 0, 1, -1);
    MapIndex(index_temp, cdir, index);
    rap_bn = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,-1,-1,0);
+   hypre_SetIndex3(index_temp, -1, -1, 0);
    MapIndex(index_temp, cdir, index);
    rap_csw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,1,-1,0);
+   hypre_SetIndex3(index_temp, 1, -1, 0);
    MapIndex(index_temp, cdir, index);
    rap_cse = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
@@ -513,29 +516,29 @@ hypre_PFMG3BuildRAPSym_onebox_FSS07_CC0(
     * Offsets are used in refering to data associated with other points.
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,1);
+   hypre_SetIndex3(index_temp, 0, 0, 1);
    MapIndex(index_temp, cdir, index);
 
-   zOffsetP = hypre_BoxOffsetDistance(P_dbox,index);
+   zOffsetP = hypre_BoxOffsetDistance(P_dbox, index);
    if ( constant_coefficient_A == 0 )
    {
-      zOffsetA = hypre_BoxOffsetDistance(A_dbox,index);
+      zOffsetA = hypre_BoxOffsetDistance(A_dbox, index);
    }
    else
    {
-      zOffsetA_diag = hypre_BoxOffsetDistance(A_dbox,index);
+      zOffsetA_diag = hypre_BoxOffsetDistance(A_dbox, index);
       zOffsetA_offd = 0;
    }
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
 
-   yOffsetP = hypre_BoxOffsetDistance(P_dbox,index);
+   yOffsetP = hypre_BoxOffsetDistance(P_dbox, index);
 
-   hypre_SetIndex3(index_temp,1,0,0);
+   hypre_SetIndex3(index_temp, 1, 0, 0);
    MapIndex(index_temp, cdir, index);
 
-   xOffsetP = hypre_BoxOffsetDistance(P_dbox,index);
+   xOffsetP = hypre_BoxOffsetDistance(P_dbox, index);
 
    /*--------------------------------------------------------------------
     * Switch statement to direct control to apropriate BoxLoop depending
@@ -565,43 +568,43 @@ hypre_PFMG3BuildRAPSym_onebox_FSS07_CC0(
          HYPRE_Int iAp1 = iA + zOffsetA;
 
          HYPRE_Int iP1 = iP - zOffsetP - yOffsetP;
-         rap_bs[iAc] = rb[iR-rbOffset] * a_cs[iAm1] * pa[iP1];
+         rap_bs[iAc] = rb[iR - rbOffset] * a_cs[iAm1] * pa[iP1];
 
          iP1 = iP - zOffsetP - xOffsetP;
-         rap_bw[iAc] = rb[iR-rbOffset] * a_cw[iAm1] * pa[iP1];
+         rap_bw[iAc] = rb[iR - rbOffset] * a_cw[iAm1] * pa[iP1];
 
          iP1 = iP - zOffsetP;
          rap_bc[iAc] =          a_bc[iA]   * pa[iP1]
-            +          rb[iR-rbOffset] * a_cc[iAm1] * pa[iP1]
-            +          rb[iR-rbOffset] * a_bc[iAm1];
+                                +          rb[iR - rbOffset] * a_cc[iAm1] * pa[iP1]
+                                +          rb[iR - rbOffset] * a_bc[iAm1];
 
          iP1 = iP - zOffsetP + xOffsetP;
-         rap_be[iAc] = rb[iR-rbOffset] * a_ce[iAm1] * pa[iP1];
+         rap_be[iAc] = rb[iR - rbOffset] * a_ce[iAm1] * pa[iP1];
 
          iP1 = iP - zOffsetP + yOffsetP;
-         rap_bn[iAc] = rb[iR-rbOffset] * a_cn[iAm1] * pa[iP1];
+         rap_bn[iAc] = rb[iR - rbOffset] * a_cn[iAm1] * pa[iP1];
 
          iP1 = iP - yOffsetP;
          rap_cs[iAc] =          a_cs[iA]
-            +          rb[iR-rbOffset] * a_cs[iAm1] * pb[iP1-pbOffset]
-            +          ra[iR] * a_cs[iAp1] * pa[iP1];
+                                +          rb[iR - rbOffset] * a_cs[iAm1] * pb[iP1 - pbOffset]
+                                +          ra[iR] * a_cs[iAp1] * pa[iP1];
 
          iP1 = iP - xOffsetP;
          rap_cw[iAc] =          a_cw[iA]
-            +          rb[iR-rbOffset] * a_cw[iAm1] * pb[iP1-pbOffset]
-            +          ra[iR] * a_cw[iAp1] * pa[iP1];
+                                +          rb[iR - rbOffset] * a_cw[iAm1] * pb[iP1 - pbOffset]
+                                +          ra[iR] * a_cw[iAp1] * pa[iP1];
 
          rap_csw[iAc] = 0.0;
 
          rap_cse[iAc] = 0.0;
 
          rap_cc[iAc] =          a_cc[iA]
-            +          rb[iR-rbOffset] * a_cc[iAm1] * pb[iP-pbOffset]
-            +          ra[iR] * a_cc[iAp1] * pa[iP]
-            +          rb[iR-rbOffset] * a_ac[iAm1]
-            +          ra[iR] * a_bc[iAp1]
-            +                   a_bc[iA]   * pb[iP-pbOffset]
-            +                   a_ac[iA]   * pa[iP];
+                                +          rb[iR - rbOffset] * a_cc[iAm1] * pb[iP - pbOffset]
+                                +          ra[iR] * a_cc[iAp1] * pa[iP]
+                                +          rb[iR - rbOffset] * a_ac[iAm1]
+                                +          ra[iR] * a_bc[iAp1]
+                                +                   a_bc[iA]   * pb[iP - pbOffset]
+                                +                   a_ac[iA]   * pa[iP];
 
       }
       hypre_BoxLoop4End(iP, iR, iA, iAc);
@@ -637,43 +640,43 @@ hypre_PFMG3BuildRAPSym_onebox_FSS07_CC0(
          HYPRE_Int iAp1 = iA + zOffsetA_diag;
 
          HYPRE_Int iP1 = iP - zOffsetP - yOffsetP;
-         rap_bs[iAc] = rb[iR-rbOffset] * a_cs_offdm1 * pa[iP1];
+         rap_bs[iAc] = rb[iR - rbOffset] * a_cs_offdm1 * pa[iP1];
 
          iP1 = iP - zOffsetP - xOffsetP;
-         rap_bw[iAc] = rb[iR-rbOffset] * a_cw_offdm1 * pa[iP1];
+         rap_bw[iAc] = rb[iR - rbOffset] * a_cw_offdm1 * pa[iP1];
 
          iP1 = iP - zOffsetP;
          rap_bc[iAc] =          a_bc_offd   * pa[iP1]
-            +          rb[iR-rbOffset] * a_cc[iAm1] * pa[iP1]
-            +          rb[iR-rbOffset] * a_bc_offdm1;
+                                +          rb[iR - rbOffset] * a_cc[iAm1] * pa[iP1]
+                                +          rb[iR - rbOffset] * a_bc_offdm1;
 
          iP1 = iP - zOffsetP + xOffsetP;
-         rap_be[iAc] = rb[iR-rbOffset] * a_ce_offdm1 * pa[iP1];
+         rap_be[iAc] = rb[iR - rbOffset] * a_ce_offdm1 * pa[iP1];
 
          iP1 = iP - zOffsetP + yOffsetP;
-         rap_bn[iAc] = rb[iR-rbOffset] * a_cn_offdm1 * pa[iP1];
+         rap_bn[iAc] = rb[iR - rbOffset] * a_cn_offdm1 * pa[iP1];
 
          iP1 = iP - yOffsetP;
          rap_cs[iAc] =          a_cs_offd
-            +          rb[iR-rbOffset] * a_cs_offdm1 * pb[iP1-pbOffset]
-            +          ra[iR] * a_cs_offdp1 * pa[iP1];
+                                +          rb[iR - rbOffset] * a_cs_offdm1 * pb[iP1 - pbOffset]
+                                +          ra[iR] * a_cs_offdp1 * pa[iP1];
 
          iP1 = iP - xOffsetP;
          rap_cw[iAc] =          a_cw_offd
-            +          rb[iR-rbOffset] * a_cw_offdm1 * pb[iP1-pbOffset]
-            +          ra[iR] * a_cw_offdp1 * pa[iP1];
+                                +          rb[iR - rbOffset] * a_cw_offdm1 * pb[iP1 - pbOffset]
+                                +          ra[iR] * a_cw_offdp1 * pa[iP1];
 
          rap_csw[iAc] = 0.0;
 
          rap_cse[iAc] = 0.0;
 
          rap_cc[iAc] =          a_cc[iA]
-            +          rb[iR-rbOffset] * a_cc[iAm1] * pb[iP-pbOffset]
-            +          ra[iR] * a_cc[iAp1] * pa[iP]
-            +          rb[iR-rbOffset] * a_ac_offdm1
-            +          ra[iR] * a_bc_offdp1
-            +                   a_bc_offd   * pb[iP-pbOffset]
-            +                   a_ac_offd   * pa[iP];
+                                +          rb[iR - rbOffset] * a_cc[iAm1] * pb[iP - pbOffset]
+                                +          ra[iR] * a_cc[iAp1] * pa[iP]
+                                +          rb[iR - rbOffset] * a_ac_offdm1
+                                +          ra[iR] * a_bc_offdp1
+                                +                   a_bc_offd   * pb[iP - pbOffset]
+                                +                   a_ac_offd   * pa[iP];
 
       }
       hypre_BoxLoop4End(iP, iR, iA, iAc);
@@ -742,11 +745,11 @@ hypre_PFMG3BuildRAPSym_onebox_FSS07_CC1(
     * pb is pointer for weight for f-point below c-point
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,-1);
+   hypre_SetIndex3(index_temp, 0, 0, -1);
    MapIndex(index_temp, cdir, index);
    pa = hypre_StructMatrixExtractPointerByIndex(P, fi, index);
 
-   hypre_SetIndex3(index_temp,0,0,1);
+   hypre_SetIndex3(index_temp, 0, 0, 1);
    MapIndex(index_temp, cdir, index);
 
    pb = hypre_StructMatrixExtractPointerByIndex(P, fi, index);
@@ -757,11 +760,11 @@ hypre_PFMG3BuildRAPSym_onebox_FSS07_CC1(
     * rb is pointer for weight for f-point below c-point
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,-1);
+   hypre_SetIndex3(index_temp, 0, 0, -1);
    MapIndex(index_temp, cdir, index);
    ra = hypre_StructMatrixExtractPointerByIndex(R, fi, index);
 
-   hypre_SetIndex3(index_temp,0,0,1);
+   hypre_SetIndex3(index_temp, 0, 0, 1);
    MapIndex(index_temp, cdir, index);
 
    rb = hypre_StructMatrixExtractPointerByIndex(R, fi, index);
@@ -778,31 +781,31 @@ hypre_PFMG3BuildRAPSym_onebox_FSS07_CC1(
     * a_bc is pointer for center coefficient in plane below
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,0);
+   hypre_SetIndex3(index_temp, 0, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_cc = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,-1,0,0);
+   hypre_SetIndex3(index_temp, -1, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_cw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,0,0);
+   hypre_SetIndex3(index_temp, 1, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_ce = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,-1,0);
+   hypre_SetIndex3(index_temp, 0, -1, 0);
    MapIndex(index_temp, cdir, index);
    a_cs = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
    a_cn = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,0,1);
+   hypre_SetIndex3(index_temp, 0, 0, 1);
    MapIndex(index_temp, cdir, index);
    a_ac = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,0,-1);
+   hypre_SetIndex3(index_temp, 0, 0, -1);
    MapIndex(index_temp, cdir, index);
    a_bc = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
@@ -814,43 +817,43 @@ hypre_PFMG3BuildRAPSym_onebox_FSS07_CC1(
     * rap_cc is pointer for center coefficient (etc.)
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,0);
+   hypre_SetIndex3(index_temp, 0, 0, 0);
    MapIndex(index_temp, cdir, index);
    rap_cc = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,-1,0,0);
+   hypre_SetIndex3(index_temp, -1, 0, 0);
    MapIndex(index_temp, cdir, index);
    rap_cw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,0,-1,0);
+   hypre_SetIndex3(index_temp, 0, -1, 0);
    MapIndex(index_temp, cdir, index);
    rap_cs = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,0,0,-1);
+   hypre_SetIndex3(index_temp, 0, 0, -1);
    MapIndex(index_temp, cdir, index);
    rap_bc = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,-1,0,-1);
+   hypre_SetIndex3(index_temp, -1, 0, -1);
    MapIndex(index_temp, cdir, index);
    rap_bw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,1,0,-1);
+   hypre_SetIndex3(index_temp, 1, 0, -1);
    MapIndex(index_temp, cdir, index);
    rap_be = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,0,-1,-1);
+   hypre_SetIndex3(index_temp, 0, -1, -1);
    MapIndex(index_temp, cdir, index);
    rap_bs = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,0,1,-1);
+   hypre_SetIndex3(index_temp, 0, 1, -1);
    MapIndex(index_temp, cdir, index);
    rap_bn = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,-1,-1,0);
+   hypre_SetIndex3(index_temp, -1, -1, 0);
    MapIndex(index_temp, cdir, index);
    rap_csw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,1,-1,0);
+   hypre_SetIndex3(index_temp, 1, -1, 0);
    MapIndex(index_temp, cdir, index);
    rap_cse = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
@@ -862,18 +865,18 @@ hypre_PFMG3BuildRAPSym_onebox_FSS07_CC1(
     * Offsets are used in refering to data associated with other points.
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,1);
+   hypre_SetIndex3(index_temp, 0, 0, 1);
    MapIndex(index_temp, cdir, index);
 
    zOffsetA = 0;
    zOffsetP = 0;
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
 
    yOffsetP = 0;
 
-   hypre_SetIndex3(index_temp,1,0,0);
+   hypre_SetIndex3(index_temp, 1, 0, 0);
    MapIndex(index_temp, cdir, index);
 
    xOffsetP = 0;
@@ -907,8 +910,8 @@ hypre_PFMG3BuildRAPSym_onebox_FSS07_CC1(
 
    iP1 = iP - zOffsetP;
    rap_bc[iAc] =          a_bc[iA]   * pa[iP1]
-      +          rb[iR] * a_cc[iAm1] * pa[iP1]
-      +          rb[iR] * a_bc[iAm1];
+                          +          rb[iR] * a_cc[iAm1] * pa[iP1]
+                          +          rb[iR] * a_bc[iAm1];
 
    iP1 = iP - zOffsetP + xOffsetP;
    rap_be[iAc] = rb[iR] * a_ce[iAm1] * pa[iP1];
@@ -918,28 +921,28 @@ hypre_PFMG3BuildRAPSym_onebox_FSS07_CC1(
 
    iP1 = iP - yOffsetP;
    rap_cs[iAc] =          a_cs[iA]
-      +          rb[iR] * a_cs[iAm1] * pb[iP1]
-      +          ra[iR] * a_cs[iAp1] * pa[iP1];
+                          +          rb[iR] * a_cs[iAm1] * pb[iP1]
+                          +          ra[iR] * a_cs[iAp1] * pa[iP1];
 
    iP1 = iP - xOffsetP;
    rap_cw[iAc] =          a_cw[iA]
-      +          rb[iR] * a_cw[iAm1] * pb[iP1]
-      +          ra[iR] * a_cw[iAp1] * pa[iP1];
+                          +          rb[iR] * a_cw[iAm1] * pb[iP1]
+                          +          ra[iR] * a_cw[iAp1] * pa[iP1];
 
    rap_csw[iAc] = 0.0;
 
    rap_cse[iAc] = 0.0;
 
    rap_cc[iAc] =          a_cc[iA]
-      +          rb[iR] * a_cc[iAm1] * pb[iP]
-      +          ra[iR] * a_cc[iAp1] * pa[iP]
-      +          rb[iR] * a_ac[iAm1]
-      +          ra[iR] * a_bc[iAp1]
-      +                   a_bc[iA]   * pb[iP]
-      +                   a_ac[iA]   * pa[iP];
+                          +          rb[iR] * a_cc[iAm1] * pb[iP]
+                          +          ra[iR] * a_cc[iAp1] * pa[iP]
+                          +          rb[iR] * a_ac[iAm1]
+                          +          ra[iR] * a_bc[iAp1]
+                          +                   a_bc[iA]   * pb[iP]
+                          +                   a_ac[iA]   * pa[iP];
 
 
-/*      }*/ /* end ForBoxI */
+   /*      }*/ /* end ForBoxI */
 
    return hypre_error_flag;
 }
@@ -1039,11 +1042,11 @@ hypre_PFMG3BuildRAPSym_onebox_FSS19_CC0(
     * pb is pointer for weight for f-point below c-point
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,-1);
+   hypre_SetIndex3(index_temp, 0, 0, -1);
    MapIndex(index_temp, cdir, index);
    pa = hypre_StructMatrixExtractPointerByIndex(P, fi, index);
 
-   hypre_SetIndex3(index_temp,0,0,1);
+   hypre_SetIndex3(index_temp, 0, 0, 1);
    MapIndex(index_temp, cdir, index);
 
    pb = hypre_StructMatrixExtractPointerByIndex(P, fi, index);
@@ -1056,11 +1059,11 @@ hypre_PFMG3BuildRAPSym_onebox_FSS19_CC0(
     * rb is pointer for weight for f-point below c-point
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,-1);
+   hypre_SetIndex3(index_temp, 0, 0, -1);
    MapIndex(index_temp, cdir, index);
    ra = hypre_StructMatrixExtractPointerByIndex(R, fi, index);
 
-   hypre_SetIndex3(index_temp,0,0,1);
+   hypre_SetIndex3(index_temp, 0, 0, 1);
    MapIndex(index_temp, cdir, index);
 
    rb = hypre_StructMatrixExtractPointerByIndex(R, fi, index);
@@ -1079,31 +1082,31 @@ hypre_PFMG3BuildRAPSym_onebox_FSS19_CC0(
     * a_bc is pointer for center coefficient in plane below
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,0);
+   hypre_SetIndex3(index_temp, 0, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_cc = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,-1,0,0);
+   hypre_SetIndex3(index_temp, -1, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_cw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,0,0);
+   hypre_SetIndex3(index_temp, 1, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_ce = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,-1,0);
+   hypre_SetIndex3(index_temp, 0, -1, 0);
    MapIndex(index_temp, cdir, index);
    a_cs = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
    a_cn = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,0,1);
+   hypre_SetIndex3(index_temp, 0, 0, 1);
    MapIndex(index_temp, cdir, index);
    a_ac = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,0,-1);
+   hypre_SetIndex3(index_temp, 0, 0, -1);
    MapIndex(index_temp, cdir, index);
    a_bc = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
@@ -1124,43 +1127,43 @@ hypre_PFMG3BuildRAPSym_onebox_FSS19_CC0(
     * a_cne is pointer for northeast coefficient in same plane
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,-1,0,1);
+   hypre_SetIndex3(index_temp, -1, 0, 1);
    MapIndex(index_temp, cdir, index);
    a_aw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,-1,1);
+   hypre_SetIndex3(index_temp, 0, -1, 1);
    MapIndex(index_temp, cdir, index);
    a_as = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,-1,0,-1);
+   hypre_SetIndex3(index_temp, -1, 0, -1);
    MapIndex(index_temp, cdir, index);
    a_bw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,0,-1);
+   hypre_SetIndex3(index_temp, 1, 0, -1);
    MapIndex(index_temp, cdir, index);
    a_be = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,-1,-1);
+   hypre_SetIndex3(index_temp, 0, -1, -1);
    MapIndex(index_temp, cdir, index);
    a_bs = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,1,-1);
+   hypre_SetIndex3(index_temp, 0, 1, -1);
    MapIndex(index_temp, cdir, index);
    a_bn = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,-1,-1,0);
+   hypre_SetIndex3(index_temp, -1, -1, 0);
    MapIndex(index_temp, cdir, index);
    a_csw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,-1,0);
+   hypre_SetIndex3(index_temp, 1, -1, 0);
    MapIndex(index_temp, cdir, index);
    a_cse = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,-1,1,0);
+   hypre_SetIndex3(index_temp, -1, 1, 0);
    MapIndex(index_temp, cdir, index);
    a_cnw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,1,0);
+   hypre_SetIndex3(index_temp, 1, 1, 0);
    MapIndex(index_temp, cdir, index);
    a_cne = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
@@ -1173,43 +1176,43 @@ hypre_PFMG3BuildRAPSym_onebox_FSS19_CC0(
     * rap_cc is pointer for center coefficient (etc.)
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,0);
+   hypre_SetIndex3(index_temp, 0, 0, 0);
    MapIndex(index_temp, cdir, index);
    rap_cc = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,-1,0,0);
+   hypre_SetIndex3(index_temp, -1, 0, 0);
    MapIndex(index_temp, cdir, index);
    rap_cw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,0,-1,0);
+   hypre_SetIndex3(index_temp, 0, -1, 0);
    MapIndex(index_temp, cdir, index);
    rap_cs = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,0,0,-1);
+   hypre_SetIndex3(index_temp, 0, 0, -1);
    MapIndex(index_temp, cdir, index);
    rap_bc = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,-1,0,-1);
+   hypre_SetIndex3(index_temp, -1, 0, -1);
    MapIndex(index_temp, cdir, index);
    rap_bw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,1,0,-1);
+   hypre_SetIndex3(index_temp, 1, 0, -1);
    MapIndex(index_temp, cdir, index);
    rap_be = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,0,-1,-1);
+   hypre_SetIndex3(index_temp, 0, -1, -1);
    MapIndex(index_temp, cdir, index);
    rap_bs = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,0,1,-1);
+   hypre_SetIndex3(index_temp, 0, 1, -1);
    MapIndex(index_temp, cdir, index);
    rap_bn = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,-1,-1,0);
+   hypre_SetIndex3(index_temp, -1, -1, 0);
    MapIndex(index_temp, cdir, index);
    rap_csw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,1,-1,0);
+   hypre_SetIndex3(index_temp, 1, -1, 0);
    MapIndex(index_temp, cdir, index);
    rap_cse = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
@@ -1224,19 +1227,19 @@ hypre_PFMG3BuildRAPSym_onebox_FSS19_CC0(
     * rap_csw is pointer for southwest coefficient in same plane (etc.)
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,-1,-1,-1);
+   hypre_SetIndex3(index_temp, -1, -1, -1);
    MapIndex(index_temp, cdir, index);
    rap_bsw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,1,-1,-1);
+   hypre_SetIndex3(index_temp, 1, -1, -1);
    MapIndex(index_temp, cdir, index);
    rap_bse = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,-1,1,-1);
+   hypre_SetIndex3(index_temp, -1, 1, -1);
    MapIndex(index_temp, cdir, index);
    rap_bnw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,1,1,-1);
+   hypre_SetIndex3(index_temp, 1, 1, -1);
    MapIndex(index_temp, cdir, index);
    rap_bne = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
@@ -1248,28 +1251,28 @@ hypre_PFMG3BuildRAPSym_onebox_FSS19_CC0(
     * Offsets are used in refering to data associated with other points.
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,1);
+   hypre_SetIndex3(index_temp, 0, 0, 1);
    MapIndex(index_temp, cdir, index);
-   zOffsetP = hypre_BoxOffsetDistance(P_dbox,index);
+   zOffsetP = hypre_BoxOffsetDistance(P_dbox, index);
    if ( constant_coefficient_A == 0 )
    {
-      zOffsetA = hypre_BoxOffsetDistance(A_dbox,index);
+      zOffsetA = hypre_BoxOffsetDistance(A_dbox, index);
    }
    else
    {
-      zOffsetA_diag = hypre_BoxOffsetDistance(A_dbox,index);
+      zOffsetA_diag = hypre_BoxOffsetDistance(A_dbox, index);
       zOffsetA_offd = 0;
    }
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
 
-   yOffsetP = hypre_BoxOffsetDistance(P_dbox,index);
+   yOffsetP = hypre_BoxOffsetDistance(P_dbox, index);
 
-   hypre_SetIndex3(index_temp,1,0,0);
+   hypre_SetIndex3(index_temp, 1, 0, 0);
    MapIndex(index_temp, cdir, index);
 
-   xOffsetP = hypre_BoxOffsetDistance(P_dbox,index);
+   xOffsetP = hypre_BoxOffsetDistance(P_dbox, index);
 
    /*--------------------------------------------------------------------
     * Switch statement to direct control to apropriate BoxLoop depending
@@ -1287,7 +1290,7 @@ hypre_PFMG3BuildRAPSym_onebox_FSS19_CC0(
 
    hypre_BoxGetSize(cgrid_box, loop_size);
 
-   if ( constant_coefficient_A==0 )
+   if ( constant_coefficient_A == 0 )
    {
 #define DEVICE_VAR is_device_ptr(rap_bsw,rb,a_csw,pa,rap_bs,a_cs,a_bs,rap_bse,a_cse,rap_bw,a_cw,a_bw,rap_bc,a_bc,a_cc,rap_be,a_ce,a_be,rap_bnw,a_cnw,rap_bn,a_cn,a_bn,rap_bne,a_cne,rap_csw,pb,ra,rap_cs,a_as,rap_cse,rap_cw,a_aw,rap_cc,a_ac)
       hypre_BoxLoop4Begin(hypre_StructMatrixNDim(A), loop_size,
@@ -1300,77 +1303,77 @@ hypre_PFMG3BuildRAPSym_onebox_FSS19_CC0(
          HYPRE_Int iAp1 = iA + zOffsetA;
 
          HYPRE_Int iP1 = iP - zOffsetP - yOffsetP - xOffsetP;
-         rap_bsw[iAc] = rb[iR-rbOffset] * a_csw[iAm1] * pa[iP1];
+         rap_bsw[iAc] = rb[iR - rbOffset] * a_csw[iAm1] * pa[iP1];
 
          iP1 = iP - zOffsetP - yOffsetP;
-         rap_bs[iAc] = rb[iR-rbOffset] * a_cs[iAm1] * pa[iP1]
-            +          rb[iR-rbOffset] * a_bs[iAm1]
-            +                   a_bs[iA]   * pa[iP1];
+         rap_bs[iAc] = rb[iR - rbOffset] * a_cs[iAm1] * pa[iP1]
+                       +          rb[iR - rbOffset] * a_bs[iAm1]
+                       +                   a_bs[iA]   * pa[iP1];
 
          iP1 = iP - zOffsetP - yOffsetP + xOffsetP;
-         rap_bse[iAc] = rb[iR-rbOffset] * a_cse[iAm1] * pa[iP1];
+         rap_bse[iAc] = rb[iR - rbOffset] * a_cse[iAm1] * pa[iP1];
 
          iP1 = iP - zOffsetP - xOffsetP;
-         rap_bw[iAc] = rb[iR-rbOffset] * a_cw[iAm1] * pa[iP1]
-            +          rb[iR-rbOffset] * a_bw[iAm1]
-            +                   a_bw[iA]   * pa[iP1];
+         rap_bw[iAc] = rb[iR - rbOffset] * a_cw[iAm1] * pa[iP1]
+                       +          rb[iR - rbOffset] * a_bw[iAm1]
+                       +                   a_bw[iA]   * pa[iP1];
 
          iP1 = iP - zOffsetP;
          rap_bc[iAc] =          a_bc[iA] * pa[iP1]
-            +          rb[iR-rbOffset] * a_cc[iAm1] * pa[iP1]
-            +          rb[iR-rbOffset] * a_bc[iAm1];
+                                +          rb[iR - rbOffset] * a_cc[iAm1] * pa[iP1]
+                                +          rb[iR - rbOffset] * a_bc[iAm1];
 
          iP1 = iP - zOffsetP + xOffsetP;
-         rap_be[iAc] = rb[iR-rbOffset] * a_ce[iAm1] * pa[iP1]
-            +          rb[iR-rbOffset] * a_be[iAm1]
-            +                   a_be[iA]   * pa[iP1];
+         rap_be[iAc] = rb[iR - rbOffset] * a_ce[iAm1] * pa[iP1]
+                       +          rb[iR - rbOffset] * a_be[iAm1]
+                       +                   a_be[iA]   * pa[iP1];
 
          iP1 = iP - zOffsetP + yOffsetP - xOffsetP;
-         rap_bnw[iAc] = rb[iR-rbOffset] * a_cnw[iAm1] * pa[iP1];
+         rap_bnw[iAc] = rb[iR - rbOffset] * a_cnw[iAm1] * pa[iP1];
 
          iP1 = iP - zOffsetP + yOffsetP;
-         rap_bn[iAc] = rb[iR-rbOffset] * a_cn[iAm1] * pa[iP1]
-            +          rb[iR-rbOffset] * a_bn[iAm1]
-            +                   a_bn[iA]   * pa[iP1];
+         rap_bn[iAc] = rb[iR - rbOffset] * a_cn[iAm1] * pa[iP1]
+                       +          rb[iR - rbOffset] * a_bn[iAm1]
+                       +                   a_bn[iA]   * pa[iP1];
 
          iP1 = iP - zOffsetP + yOffsetP + xOffsetP;
-         rap_bne[iAc] = rb[iR-rbOffset] * a_cne[iAm1] * pa[iP1];
+         rap_bne[iAc] = rb[iR - rbOffset] * a_cne[iAm1] * pa[iP1];
 
          iP1 = iP - yOffsetP - xOffsetP;
          rap_csw[iAc] =         a_csw[iA]
-            +          rb[iR-rbOffset] * a_csw[iAm1] * pb[iP1-pbOffset]
-            +          ra[iR] * a_csw[iAp1] * pa[iP1];
+                                +          rb[iR - rbOffset] * a_csw[iAm1] * pb[iP1 - pbOffset]
+                                +          ra[iR] * a_csw[iAp1] * pa[iP1];
 
          iP1 = iP - yOffsetP;
          rap_cs[iAc] =          a_cs[iA]
-            +          rb[iR-rbOffset] * a_cs[iAm1] * pb[iP1-pbOffset]
-            +          ra[iR] * a_cs[iAp1] * pa[iP1]
-            +                   a_bs[iA]   * pb[iP1-pbOffset]
-            +                   a_as[iA]   * pa[iP1]
-            +          rb[iR-rbOffset] * a_as[iAm1]
-            +          ra[iR] * a_bs[iAp1];
+                                +          rb[iR - rbOffset] * a_cs[iAm1] * pb[iP1 - pbOffset]
+                                +          ra[iR] * a_cs[iAp1] * pa[iP1]
+                                +                   a_bs[iA]   * pb[iP1 - pbOffset]
+                                +                   a_as[iA]   * pa[iP1]
+                                +          rb[iR - rbOffset] * a_as[iAm1]
+                                +          ra[iR] * a_bs[iAp1];
 
          iP1 = iP - yOffsetP + xOffsetP;
          rap_cse[iAc] =          a_cse[iA]
-            +          rb[iR-rbOffset] * a_cse[iAm1] * pb[iP1-pbOffset]
-            +          ra[iR] * a_cse[iAp1] * pa[iP1];
+                                 +          rb[iR - rbOffset] * a_cse[iAm1] * pb[iP1 - pbOffset]
+                                 +          ra[iR] * a_cse[iAp1] * pa[iP1];
 
          iP1 = iP - xOffsetP;
          rap_cw[iAc] =          a_cw[iA]
-            +          rb[iR-rbOffset] * a_cw[iAm1] * pb[iP1-pbOffset]
-            +          ra[iR] * a_cw[iAp1] * pa[iP1]
-            +                   a_bw[iA]   * pb[iP1-pbOffset]
-            +                   a_aw[iA]   * pa[iP1]
-            +          rb[iR-rbOffset] * a_aw[iAm1]
-            +          ra[iR] * a_bw[iAp1];
+                                +          rb[iR - rbOffset] * a_cw[iAm1] * pb[iP1 - pbOffset]
+                                +          ra[iR] * a_cw[iAp1] * pa[iP1]
+                                +                   a_bw[iA]   * pb[iP1 - pbOffset]
+                                +                   a_aw[iA]   * pa[iP1]
+                                +          rb[iR - rbOffset] * a_aw[iAm1]
+                                +          ra[iR] * a_bw[iAp1];
 
          rap_cc[iAc] =          a_cc[iA]
-            +          rb[iR-rbOffset] * a_cc[iAm1] * pb[iP-pbOffset]
-            +          ra[iR] * a_cc[iAp1] * pa[iP]
-            +          rb[iR-rbOffset] * a_ac[iAm1]
-            +          ra[iR] * a_bc[iAp1]
-            +                   a_bc[iA]   * pb[iP-pbOffset]
-            +                   a_ac[iA]   * pa[iP];
+                                +          rb[iR - rbOffset] * a_cc[iAm1] * pb[iP - pbOffset]
+                                +          ra[iR] * a_cc[iAp1] * pa[iP]
+                                +          rb[iR - rbOffset] * a_ac[iAm1]
+                                +          ra[iR] * a_bc[iAp1]
+                                +                   a_bc[iA]   * pb[iP - pbOffset]
+                                +                   a_ac[iA]   * pa[iP];
 
       }
       hypre_BoxLoop4End(iP, iR, iA, iAc);
@@ -1428,84 +1431,84 @@ hypre_PFMG3BuildRAPSym_onebox_FSS19_CC0(
          HYPRE_Int iAp1 = iA + zOffsetA_diag;
 
          HYPRE_Int iP1 = iP - zOffsetP - yOffsetP - xOffsetP;
-         rap_bsw[iAc] = rb[iR-rbOffset] * a_csw_offdm1 * pa[iP1];
+         rap_bsw[iAc] = rb[iR - rbOffset] * a_csw_offdm1 * pa[iP1];
 
          iP1 = iP - zOffsetP - yOffsetP;
-         rap_bs[iAc] = rb[iR-rbOffset] * a_cs_offdm1 * pa[iP1]
-            +          rb[iR-rbOffset] * a_bs_offdm1
-            +                   a_bs_offd   * pa[iP1];
+         rap_bs[iAc] = rb[iR - rbOffset] * a_cs_offdm1 * pa[iP1]
+                       +          rb[iR - rbOffset] * a_bs_offdm1
+                       +                   a_bs_offd   * pa[iP1];
 
          iP1 = iP - zOffsetP - yOffsetP + xOffsetP;
-         rap_bse[iAc] = rb[iR-rbOffset] * a_cse_offdm1 * pa[iP1];
+         rap_bse[iAc] = rb[iR - rbOffset] * a_cse_offdm1 * pa[iP1];
 
          iP1 = iP - zOffsetP - xOffsetP;
-         rap_bw[iAc] = rb[iR-rbOffset] * a_cw_offdm1 * pa[iP1]
-            +          rb[iR-rbOffset] * a_bw_offdm1
-            +                   a_bw_offd   * pa[iP1];
+         rap_bw[iAc] = rb[iR - rbOffset] * a_cw_offdm1 * pa[iP1]
+                       +          rb[iR - rbOffset] * a_bw_offdm1
+                       +                   a_bw_offd   * pa[iP1];
 
          iP1 = iP - zOffsetP;
          rap_bc[iAc] =          a_bc_offd * pa[iP1]
-            +          rb[iR-rbOffset] * a_cc[iAm1] * pa[iP1]
-            +          rb[iR-rbOffset] * a_bc_offdm1;
+                                +          rb[iR - rbOffset] * a_cc[iAm1] * pa[iP1]
+                                +          rb[iR - rbOffset] * a_bc_offdm1;
 
          iP1 = iP - zOffsetP + xOffsetP;
-         rap_be[iAc] = rb[iR-rbOffset] * a_ce_offdm1 * pa[iP1]
-            +          rb[iR-rbOffset] * a_be_offdm1
-            +                   a_be_offd   * pa[iP1];
+         rap_be[iAc] = rb[iR - rbOffset] * a_ce_offdm1 * pa[iP1]
+                       +          rb[iR - rbOffset] * a_be_offdm1
+                       +                   a_be_offd   * pa[iP1];
 
          iP1 = iP - zOffsetP + yOffsetP - xOffsetP;
-         rap_bnw[iAc] = rb[iR-rbOffset] * a_cnw_offdm1 * pa[iP1];
+         rap_bnw[iAc] = rb[iR - rbOffset] * a_cnw_offdm1 * pa[iP1];
 
          iP1 = iP - zOffsetP + yOffsetP;
-         rap_bn[iAc] = rb[iR-rbOffset] * a_cn_offdm1 * pa[iP1]
-            +          rb[iR-rbOffset] * a_bn_offdm1
-            +                   a_bn_offd   * pa[iP1];
+         rap_bn[iAc] = rb[iR - rbOffset] * a_cn_offdm1 * pa[iP1]
+                       +          rb[iR - rbOffset] * a_bn_offdm1
+                       +                   a_bn_offd   * pa[iP1];
 
          iP1 = iP - zOffsetP + yOffsetP + xOffsetP;
-         rap_bne[iAc] = rb[iR-rbOffset] * a_cne_offdm1 * pa[iP1];
+         rap_bne[iAc] = rb[iR - rbOffset] * a_cne_offdm1 * pa[iP1];
 
          iP1 = iP - yOffsetP - xOffsetP;
          rap_csw[iAc] =         a_csw_offd
-            +          rb[iR-rbOffset] * a_csw_offdm1 * pb[iP1-pbOffset]
-            +          ra[iR] * a_csw_offdp1 * pa[iP1-pbOffset];
+                                +          rb[iR - rbOffset] * a_csw_offdm1 * pb[iP1 - pbOffset]
+                                +          ra[iR] * a_csw_offdp1 * pa[iP1 - pbOffset];
 
          iP1 = iP - yOffsetP;
          rap_cs[iAc] =          a_cs_offd
-            +          rb[iR-rbOffset] * a_cs_offdm1 * pb[iP1-pbOffset]
-            +          ra[iR] * a_cs_offdp1 * pa[iP1]
-            +                   a_bs_offd   * pb[iP1-pbOffset]
-            +                   a_as_offd   * pa[iP1]
-            +          rb[iR-rbOffset] * a_as_offdm1
-            +          ra[iR] * a_bs_offdp1;
+                                +          rb[iR - rbOffset] * a_cs_offdm1 * pb[iP1 - pbOffset]
+                                +          ra[iR] * a_cs_offdp1 * pa[iP1]
+                                +                   a_bs_offd   * pb[iP1 - pbOffset]
+                                +                   a_as_offd   * pa[iP1]
+                                +          rb[iR - rbOffset] * a_as_offdm1
+                                +          ra[iR] * a_bs_offdp1;
 
          iP1 = iP - yOffsetP + xOffsetP;
          rap_cse[iAc] =          a_cse_offd
-            +          rb[iR-rbOffset] * a_cse_offdm1 * pb[iP1-pbOffset]
-            +          ra[iR] * a_cse_offdp1 * pa[iP1];
+                                 +          rb[iR - rbOffset] * a_cse_offdm1 * pb[iP1 - pbOffset]
+                                 +          ra[iR] * a_cse_offdp1 * pa[iP1];
 
          iP1 = iP - xOffsetP;
          rap_cw[iAc] =          a_cw_offd
-            +          rb[iR-rbOffset] * a_cw_offdm1 * pb[iP1-pbOffset]
-            +          ra[iR] * a_cw_offdp1 * pa[iP1]
-            +                   a_bw_offd   * pb[iP1-pbOffset]
-            +                   a_aw_offd   * pa[iP1]
-            +          rb[iR-rbOffset] * a_aw_offdm1
-            +          ra[iR] * a_bw_offdp1;
+                                +          rb[iR - rbOffset] * a_cw_offdm1 * pb[iP1 - pbOffset]
+                                +          ra[iR] * a_cw_offdp1 * pa[iP1]
+                                +                   a_bw_offd   * pb[iP1 - pbOffset]
+                                +                   a_aw_offd   * pa[iP1]
+                                +          rb[iR - rbOffset] * a_aw_offdm1
+                                +          ra[iR] * a_bw_offdp1;
 
          rap_cc[iAc] =          a_cc[iA]
-            +          rb[iR-rbOffset] * a_cc[iAm1] * pb[iP-pbOffset]
-            +          ra[iR] * a_cc[iAp1] * pa[iP]
-            +          rb[iR-rbOffset] * a_ac_offdm1
-            +          ra[iR] * a_bc_offdp1
-            +                   a_bc_offd   * pb[iP-pbOffset]
-            +                   a_ac_offd   * pa[iP];
+                                +          rb[iR - rbOffset] * a_cc[iAm1] * pb[iP - pbOffset]
+                                +          ra[iR] * a_cc[iAp1] * pa[iP]
+                                +          rb[iR - rbOffset] * a_ac_offdm1
+                                +          ra[iR] * a_bc_offdp1
+                                +                   a_bc_offd   * pb[iP - pbOffset]
+                                +                   a_ac_offd   * pa[iP];
 
       }
       hypre_BoxLoop4End(iP, iR, iA, iAc);
 #undef DEVICE_VAR
    }
 
-/*      }*/ /* end ForBoxI */
+   /*      }*/ /* end ForBoxI */
 
    return hypre_error_flag;
 }
@@ -1571,11 +1574,11 @@ hypre_PFMG3BuildRAPSym_onebox_FSS19_CC1(
     * pb is pointer for weight for f-point below c-point
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,-1);
+   hypre_SetIndex3(index_temp, 0, 0, -1);
    MapIndex(index_temp, cdir, index);
    pa = hypre_StructMatrixExtractPointerByIndex(P, fi, index);
 
-   hypre_SetIndex3(index_temp,0,0,1);
+   hypre_SetIndex3(index_temp, 0, 0, 1);
    MapIndex(index_temp, cdir, index);
 
    pb = hypre_StructMatrixExtractPointerByIndex(P, fi, index);
@@ -1586,11 +1589,11 @@ hypre_PFMG3BuildRAPSym_onebox_FSS19_CC1(
     * rb is pointer for weight for f-point below c-point
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,-1);
+   hypre_SetIndex3(index_temp, 0, 0, -1);
    MapIndex(index_temp, cdir, index);
    ra = hypre_StructMatrixExtractPointerByIndex(R, fi, index);
 
-   hypre_SetIndex3(index_temp,0,0,1);
+   hypre_SetIndex3(index_temp, 0, 0, 1);
    MapIndex(index_temp, cdir, index);
 
    rb = hypre_StructMatrixExtractPointerByIndex(R, fi, index);
@@ -1607,31 +1610,31 @@ hypre_PFMG3BuildRAPSym_onebox_FSS19_CC1(
     * a_bc is pointer for center coefficient in plane below
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,0);
+   hypre_SetIndex3(index_temp, 0, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_cc = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,-1,0,0);
+   hypre_SetIndex3(index_temp, -1, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_cw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,0,0);
+   hypre_SetIndex3(index_temp, 1, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_ce = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,-1,0);
+   hypre_SetIndex3(index_temp, 0, -1, 0);
    MapIndex(index_temp, cdir, index);
    a_cs = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
    a_cn = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,0,1);
+   hypre_SetIndex3(index_temp, 0, 0, 1);
    MapIndex(index_temp, cdir, index);
    a_ac = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,0,-1);
+   hypre_SetIndex3(index_temp, 0, 0, -1);
    MapIndex(index_temp, cdir, index);
    a_bc = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
@@ -1652,43 +1655,43 @@ hypre_PFMG3BuildRAPSym_onebox_FSS19_CC1(
     * a_cne is pointer for northeast coefficient in same plane
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,-1,0,1);
+   hypre_SetIndex3(index_temp, -1, 0, 1);
    MapIndex(index_temp, cdir, index);
    a_aw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,-1,1);
+   hypre_SetIndex3(index_temp, 0, -1, 1);
    MapIndex(index_temp, cdir, index);
    a_as = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,-1,0,-1);
+   hypre_SetIndex3(index_temp, -1, 0, -1);
    MapIndex(index_temp, cdir, index);
    a_bw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,0,-1);
+   hypre_SetIndex3(index_temp, 1, 0, -1);
    MapIndex(index_temp, cdir, index);
    a_be = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,-1,-1);
+   hypre_SetIndex3(index_temp, 0, -1, -1);
    MapIndex(index_temp, cdir, index);
    a_bs = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,1,-1);
+   hypre_SetIndex3(index_temp, 0, 1, -1);
    MapIndex(index_temp, cdir, index);
    a_bn = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,-1,-1,0);
+   hypre_SetIndex3(index_temp, -1, -1, 0);
    MapIndex(index_temp, cdir, index);
    a_csw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,-1,0);
+   hypre_SetIndex3(index_temp, 1, -1, 0);
    MapIndex(index_temp, cdir, index);
    a_cse = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,-1,1,0);
+   hypre_SetIndex3(index_temp, -1, 1, 0);
    MapIndex(index_temp, cdir, index);
    a_cnw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,1,0);
+   hypre_SetIndex3(index_temp, 1, 1, 0);
    MapIndex(index_temp, cdir, index);
    a_cne = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
@@ -1700,43 +1703,43 @@ hypre_PFMG3BuildRAPSym_onebox_FSS19_CC1(
     * rap_cc is pointer for center coefficient (etc.)
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,0);
+   hypre_SetIndex3(index_temp, 0, 0, 0);
    MapIndex(index_temp, cdir, index);
    rap_cc = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,-1,0,0);
+   hypre_SetIndex3(index_temp, -1, 0, 0);
    MapIndex(index_temp, cdir, index);
    rap_cw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,0,-1,0);
+   hypre_SetIndex3(index_temp, 0, -1, 0);
    MapIndex(index_temp, cdir, index);
    rap_cs = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,0,0,-1);
+   hypre_SetIndex3(index_temp, 0, 0, -1);
    MapIndex(index_temp, cdir, index);
    rap_bc = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,-1,0,-1);
+   hypre_SetIndex3(index_temp, -1, 0, -1);
    MapIndex(index_temp, cdir, index);
    rap_bw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,1,0,-1);
+   hypre_SetIndex3(index_temp, 1, 0, -1);
    MapIndex(index_temp, cdir, index);
    rap_be = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,0,-1,-1);
+   hypre_SetIndex3(index_temp, 0, -1, -1);
    MapIndex(index_temp, cdir, index);
    rap_bs = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,0,1,-1);
+   hypre_SetIndex3(index_temp, 0, 1, -1);
    MapIndex(index_temp, cdir, index);
    rap_bn = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,-1,-1,0);
+   hypre_SetIndex3(index_temp, -1, -1, 0);
    MapIndex(index_temp, cdir, index);
    rap_csw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,1,-1,0);
+   hypre_SetIndex3(index_temp, 1, -1, 0);
    MapIndex(index_temp, cdir, index);
    rap_cse = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
@@ -1751,19 +1754,19 @@ hypre_PFMG3BuildRAPSym_onebox_FSS19_CC1(
     * rap_csw is pointer for southwest coefficient in same plane (etc.)
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,-1,-1,-1);
+   hypre_SetIndex3(index_temp, -1, -1, -1);
    MapIndex(index_temp, cdir, index);
    rap_bsw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,1,-1,-1);
+   hypre_SetIndex3(index_temp, 1, -1, -1);
    MapIndex(index_temp, cdir, index);
    rap_bse = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,-1,1,-1);
+   hypre_SetIndex3(index_temp, -1, 1, -1);
    MapIndex(index_temp, cdir, index);
    rap_bnw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,1,1,-1);
+   hypre_SetIndex3(index_temp, 1, 1, -1);
    MapIndex(index_temp, cdir, index);
    rap_bne = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
@@ -1775,18 +1778,18 @@ hypre_PFMG3BuildRAPSym_onebox_FSS19_CC1(
     * Offsets are used in refering to data associated with other points.
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,1);
+   hypre_SetIndex3(index_temp, 0, 0, 1);
    MapIndex(index_temp, cdir, index);
 
    zOffsetA = 0;
    zOffsetP = 0;
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
 
    yOffsetP = 0;
 
-   hypre_SetIndex3(index_temp,1,0,0);
+   hypre_SetIndex3(index_temp, 1, 0, 0);
    MapIndex(index_temp, cdir, index);
 
    xOffsetP = 0;
@@ -1818,75 +1821,75 @@ hypre_PFMG3BuildRAPSym_onebox_FSS19_CC1(
 
    iP1 = iP - zOffsetP - yOffsetP;
    rap_bs[iAc] = rb[iR] * a_cs[iAm1] * pa[iP1]
-      +          rb[iR] * a_bs[iAm1]
-      +                   a_bs[iA]   * pa[iP1];
+                 +          rb[iR] * a_bs[iAm1]
+                 +                   a_bs[iA]   * pa[iP1];
 
    iP1 = iP - zOffsetP - yOffsetP + xOffsetP;
    rap_bse[iAc] = rb[iR] * a_cse[iAm1] * pa[iP1];
 
    iP1 = iP - zOffsetP - xOffsetP;
    rap_bw[iAc] = rb[iR] * a_cw[iAm1] * pa[iP1]
-      +          rb[iR] * a_bw[iAm1]
-      +                   a_bw[iA]   * pa[iP1];
+                 +          rb[iR] * a_bw[iAm1]
+                 +                   a_bw[iA]   * pa[iP1];
 
    iP1 = iP - zOffsetP;
    rap_bc[iAc] =          a_bc[iA] * pa[iP1]
-      +          rb[iR] * a_cc[iAm1] * pa[iP1]
-      +          rb[iR] * a_bc[iAm1];
+                          +          rb[iR] * a_cc[iAm1] * pa[iP1]
+                          +          rb[iR] * a_bc[iAm1];
 
    iP1 = iP - zOffsetP + xOffsetP;
    rap_be[iAc] = rb[iR] * a_ce[iAm1] * pa[iP1]
-      +          rb[iR] * a_be[iAm1]
-      +                   a_be[iA]   * pa[iP1];
+                 +          rb[iR] * a_be[iAm1]
+                 +                   a_be[iA]   * pa[iP1];
 
    iP1 = iP - zOffsetP + yOffsetP - xOffsetP;
    rap_bnw[iAc] = rb[iR] * a_cnw[iAm1] * pa[iP1];
 
    iP1 = iP - zOffsetP + yOffsetP;
    rap_bn[iAc] = rb[iR] * a_cn[iAm1] * pa[iP1]
-      +          rb[iR] * a_bn[iAm1]
-      +                   a_bn[iA]   * pa[iP1];
+                 +          rb[iR] * a_bn[iAm1]
+                 +                   a_bn[iA]   * pa[iP1];
 
    iP1 = iP - zOffsetP + yOffsetP + xOffsetP;
    rap_bne[iAc] = rb[iR] * a_cne[iAm1] * pa[iP1];
 
    iP1 = iP - yOffsetP - xOffsetP;
    rap_csw[iAc] =         a_csw[iA]
-      +          rb[iR] * a_csw[iAm1] * pb[iP1]
-      +          ra[iR] * a_csw[iAp1] * pa[iP1];
+                          +          rb[iR] * a_csw[iAm1] * pb[iP1]
+                          +          ra[iR] * a_csw[iAp1] * pa[iP1];
 
    iP1 = iP - yOffsetP;
    rap_cs[iAc] =          a_cs[iA]
-      +          rb[iR] * a_cs[iAm1] * pb[iP1]
-      +          ra[iR] * a_cs[iAp1] * pa[iP1]
-      +                   a_bs[iA]   * pb[iP1]
-      +                   a_as[iA]   * pa[iP1]
-      +          rb[iR] * a_as[iAm1]
-      +          ra[iR] * a_bs[iAp1];
+                          +          rb[iR] * a_cs[iAm1] * pb[iP1]
+                          +          ra[iR] * a_cs[iAp1] * pa[iP1]
+                          +                   a_bs[iA]   * pb[iP1]
+                          +                   a_as[iA]   * pa[iP1]
+                          +          rb[iR] * a_as[iAm1]
+                          +          ra[iR] * a_bs[iAp1];
 
    iP1 = iP - yOffsetP + xOffsetP;
    rap_cse[iAc] =          a_cse[iA]
-      +          rb[iR] * a_cse[iAm1] * pb[iP1]
-      +          ra[iR] * a_cse[iAp1] * pa[iP1];
+                           +          rb[iR] * a_cse[iAm1] * pb[iP1]
+                           +          ra[iR] * a_cse[iAp1] * pa[iP1];
 
    iP1 = iP - xOffsetP;
    rap_cw[iAc] =          a_cw[iA]
-      +          rb[iR] * a_cw[iAm1] * pb[iP1]
-      +          ra[iR] * a_cw[iAp1] * pa[iP1]
-      +                   a_bw[iA]   * pb[iP1]
-      +                   a_aw[iA]   * pa[iP1]
-      +          rb[iR] * a_aw[iAm1]
-      +          ra[iR] * a_bw[iAp1];
+                          +          rb[iR] * a_cw[iAm1] * pb[iP1]
+                          +          ra[iR] * a_cw[iAp1] * pa[iP1]
+                          +                   a_bw[iA]   * pb[iP1]
+                          +                   a_aw[iA]   * pa[iP1]
+                          +          rb[iR] * a_aw[iAm1]
+                          +          ra[iR] * a_bw[iAp1];
 
    rap_cc[iAc] =          a_cc[iA]
-      +          rb[iR] * a_cc[iAm1] * pb[iP]
-      +          ra[iR] * a_cc[iAp1] * pa[iP]
-      +          rb[iR] * a_ac[iAm1]
-      +          ra[iR] * a_bc[iAp1]
-      +                   a_bc[iA]   * pb[iP]
-      +                   a_ac[iA]   * pa[iP];
+                          +          rb[iR] * a_cc[iAm1] * pb[iP]
+                          +          ra[iR] * a_cc[iAp1] * pa[iP]
+                          +          rb[iR] * a_ac[iAm1]
+                          +          ra[iR] * a_bc[iAp1]
+                          +                   a_bc[iA]   * pb[iP]
+                          +                   a_ac[iA]   * pa[iP];
 
-/*      }*/ /* end ForBoxI */
+   /*      }*/ /* end ForBoxI */
 
    return hypre_error_flag;
 }
@@ -1995,11 +1998,11 @@ hypre_PFMG3BuildRAPSym_onebox_FSS27_CC0(
     * pb is pointer for weight for f-point below c-point
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,-1);
+   hypre_SetIndex3(index_temp, 0, 0, -1);
    MapIndex(index_temp, cdir, index);
    pa = hypre_StructMatrixExtractPointerByIndex(P, fi, index);
 
-   hypre_SetIndex3(index_temp,0,0,1);
+   hypre_SetIndex3(index_temp, 0, 0, 1);
    MapIndex(index_temp, cdir, index);
 
    pb = hypre_StructMatrixExtractPointerByIndex(P, fi, index);
@@ -2012,11 +2015,11 @@ hypre_PFMG3BuildRAPSym_onebox_FSS27_CC0(
     * rb is pointer for weight for f-point below c-point
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,-1);
+   hypre_SetIndex3(index_temp, 0, 0, -1);
    MapIndex(index_temp, cdir, index);
    ra = hypre_StructMatrixExtractPointerByIndex(R, fi, index);
 
-   hypre_SetIndex3(index_temp,0,0,1);
+   hypre_SetIndex3(index_temp, 0, 0, 1);
    MapIndex(index_temp, cdir, index);
 
    rb = hypre_StructMatrixExtractPointerByIndex(R, fi, index);
@@ -2035,31 +2038,31 @@ hypre_PFMG3BuildRAPSym_onebox_FSS27_CC0(
     * a_bc is pointer for center coefficient in plane below
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,0);
+   hypre_SetIndex3(index_temp, 0, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_cc = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,-1,0,0);
+   hypre_SetIndex3(index_temp, -1, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_cw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,0,0);
+   hypre_SetIndex3(index_temp, 1, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_ce = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,-1,0);
+   hypre_SetIndex3(index_temp, 0, -1, 0);
    MapIndex(index_temp, cdir, index);
    a_cs = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
    a_cn = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,0,1);
+   hypre_SetIndex3(index_temp, 0, 0, 1);
    MapIndex(index_temp, cdir, index);
    a_ac = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,0,-1);
+   hypre_SetIndex3(index_temp, 0, 0, -1);
    MapIndex(index_temp, cdir, index);
    a_bc = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
@@ -2080,43 +2083,43 @@ hypre_PFMG3BuildRAPSym_onebox_FSS27_CC0(
     * a_cne is pointer for northeast coefficient in same plane
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,-1,0,1);
+   hypre_SetIndex3(index_temp, -1, 0, 1);
    MapIndex(index_temp, cdir, index);
    a_aw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,-1,1);
+   hypre_SetIndex3(index_temp, 0, -1, 1);
    MapIndex(index_temp, cdir, index);
    a_as = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,-1,0,-1);
+   hypre_SetIndex3(index_temp, -1, 0, -1);
    MapIndex(index_temp, cdir, index);
    a_bw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,0,-1);
+   hypre_SetIndex3(index_temp, 1, 0, -1);
    MapIndex(index_temp, cdir, index);
    a_be = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,-1,-1);
+   hypre_SetIndex3(index_temp, 0, -1, -1);
    MapIndex(index_temp, cdir, index);
    a_bs = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,1,-1);
+   hypre_SetIndex3(index_temp, 0, 1, -1);
    MapIndex(index_temp, cdir, index);
    a_bn = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,-1,-1,0);
+   hypre_SetIndex3(index_temp, -1, -1, 0);
    MapIndex(index_temp, cdir, index);
    a_csw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,-1,0);
+   hypre_SetIndex3(index_temp, 1, -1, 0);
    MapIndex(index_temp, cdir, index);
    a_cse = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,-1,1,0);
+   hypre_SetIndex3(index_temp, -1, 1, 0);
    MapIndex(index_temp, cdir, index);
    a_cnw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,1,0);
+   hypre_SetIndex3(index_temp, 1, 1, 0);
    MapIndex(index_temp, cdir, index);
    a_cne = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
@@ -2133,27 +2136,27 @@ hypre_PFMG3BuildRAPSym_onebox_FSS27_CC0(
     * a_bne is pointer for northeast coefficient in plane below
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,-1,-1,1);
+   hypre_SetIndex3(index_temp, -1, -1, 1);
    MapIndex(index_temp, cdir, index);
    a_asw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,-1,1);
+   hypre_SetIndex3(index_temp, 1, -1, 1);
    MapIndex(index_temp, cdir, index);
    a_ase = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,-1,-1,-1);
+   hypre_SetIndex3(index_temp, -1, -1, -1);
    MapIndex(index_temp, cdir, index);
    a_bsw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,-1,-1);
+   hypre_SetIndex3(index_temp, 1, -1, -1);
    MapIndex(index_temp, cdir, index);
    a_bse = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,-1,1,-1);
+   hypre_SetIndex3(index_temp, -1, 1, -1);
    MapIndex(index_temp, cdir, index);
    a_bnw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,1,-1);
+   hypre_SetIndex3(index_temp, 1, 1, -1);
    MapIndex(index_temp, cdir, index);
    a_bne = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
@@ -2165,43 +2168,43 @@ hypre_PFMG3BuildRAPSym_onebox_FSS27_CC0(
     * rap_cc is pointer for center coefficient (etc.)
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,0);
+   hypre_SetIndex3(index_temp, 0, 0, 0);
    MapIndex(index_temp, cdir, index);
    rap_cc = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,-1,0,0);
+   hypre_SetIndex3(index_temp, -1, 0, 0);
    MapIndex(index_temp, cdir, index);
    rap_cw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,0,-1,0);
+   hypre_SetIndex3(index_temp, 0, -1, 0);
    MapIndex(index_temp, cdir, index);
    rap_cs = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,0,0,-1);
+   hypre_SetIndex3(index_temp, 0, 0, -1);
    MapIndex(index_temp, cdir, index);
    rap_bc = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,-1,0,-1);
+   hypre_SetIndex3(index_temp, -1, 0, -1);
    MapIndex(index_temp, cdir, index);
    rap_bw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,1,0,-1);
+   hypre_SetIndex3(index_temp, 1, 0, -1);
    MapIndex(index_temp, cdir, index);
    rap_be = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,0,-1,-1);
+   hypre_SetIndex3(index_temp, 0, -1, -1);
    MapIndex(index_temp, cdir, index);
    rap_bs = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,0,1,-1);
+   hypre_SetIndex3(index_temp, 0, 1, -1);
    MapIndex(index_temp, cdir, index);
    rap_bn = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,-1,-1,0);
+   hypre_SetIndex3(index_temp, -1, -1, 0);
    MapIndex(index_temp, cdir, index);
    rap_csw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,1,-1,0);
+   hypre_SetIndex3(index_temp, 1, -1, 0);
    MapIndex(index_temp, cdir, index);
    rap_cse = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
@@ -2216,19 +2219,19 @@ hypre_PFMG3BuildRAPSym_onebox_FSS27_CC0(
     * rap_csw is pointer for southwest coefficient in same plane (etc.)
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,-1,-1,-1);
+   hypre_SetIndex3(index_temp, -1, -1, -1);
    MapIndex(index_temp, cdir, index);
    rap_bsw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,1,-1,-1);
+   hypre_SetIndex3(index_temp, 1, -1, -1);
    MapIndex(index_temp, cdir, index);
    rap_bse = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,-1,1,-1);
+   hypre_SetIndex3(index_temp, -1, 1, -1);
    MapIndex(index_temp, cdir, index);
    rap_bnw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,1,1,-1);
+   hypre_SetIndex3(index_temp, 1, 1, -1);
    MapIndex(index_temp, cdir, index);
    rap_bne = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
@@ -2240,29 +2243,29 @@ hypre_PFMG3BuildRAPSym_onebox_FSS27_CC0(
     * Offsets are used in refering to data associated with other points.
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,1);
+   hypre_SetIndex3(index_temp, 0, 0, 1);
    MapIndex(index_temp, cdir, index);
 
-   zOffsetP = hypre_BoxOffsetDistance(P_dbox,index);
+   zOffsetP = hypre_BoxOffsetDistance(P_dbox, index);
    if ( constant_coefficient_A == 0 )
    {
-      zOffsetA = hypre_BoxOffsetDistance(A_dbox,index);
+      zOffsetA = hypre_BoxOffsetDistance(A_dbox, index);
    }
    else
    {
-      zOffsetA_diag = hypre_BoxOffsetDistance(A_dbox,index);
+      zOffsetA_diag = hypre_BoxOffsetDistance(A_dbox, index);
       zOffsetA_offd = 0;
    }
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
 
-   yOffsetP = hypre_BoxOffsetDistance(P_dbox,index);
+   yOffsetP = hypre_BoxOffsetDistance(P_dbox, index);
 
-   hypre_SetIndex3(index_temp,1,0,0);
+   hypre_SetIndex3(index_temp, 1, 0, 0);
    MapIndex(index_temp, cdir, index);
 
-   xOffsetP = hypre_BoxOffsetDistance(P_dbox,index);
+   xOffsetP = hypre_BoxOffsetDistance(P_dbox, index);
 
    /*--------------------------------------------------------------------
     * Switch statement to direct control to apropriate BoxLoop depending
@@ -2293,93 +2296,93 @@ hypre_PFMG3BuildRAPSym_onebox_FSS27_CC0(
          HYPRE_Int iAp1 = iA + zOffsetA;
 
          HYPRE_Int iP1 = iP - zOffsetP - yOffsetP - xOffsetP;
-         rap_bsw[iAc] = rb[iR-rbOffset] * a_csw[iAm1] * pa[iP1]
-            +           rb[iR-rbOffset] * a_bsw[iAm1]
-            +                    a_bsw[iA]   * pa[iP1];
+         rap_bsw[iAc] = rb[iR - rbOffset] * a_csw[iAm1] * pa[iP1]
+                        +           rb[iR - rbOffset] * a_bsw[iAm1]
+                        +                    a_bsw[iA]   * pa[iP1];
 
          iP1 = iP - zOffsetP - yOffsetP;
-         rap_bs[iAc] = rb[iR-rbOffset] * a_cs[iAm1] * pa[iP1]
-            +          rb[iR-rbOffset] * a_bs[iAm1]
-            +                   a_bs[iA]   * pa[iP1];
+         rap_bs[iAc] = rb[iR - rbOffset] * a_cs[iAm1] * pa[iP1]
+                       +          rb[iR - rbOffset] * a_bs[iAm1]
+                       +                   a_bs[iA]   * pa[iP1];
 
          iP1 = iP - zOffsetP - yOffsetP + xOffsetP;
-         rap_bse[iAc] = rb[iR-rbOffset] * a_cse[iAm1] * pa[iP1]
-            +           rb[iR-rbOffset] * a_bse[iAm1]
-            +                    a_bse[iA]   * pa[iP1];
+         rap_bse[iAc] = rb[iR - rbOffset] * a_cse[iAm1] * pa[iP1]
+                        +           rb[iR - rbOffset] * a_bse[iAm1]
+                        +                    a_bse[iA]   * pa[iP1];
 
          iP1 = iP - zOffsetP - xOffsetP;
-         rap_bw[iAc] = rb[iR-rbOffset] * a_cw[iAm1] * pa[iP1]
-            +          rb[iR-rbOffset] * a_bw[iAm1]
-            +                   a_bw[iA]   * pa[iP1];
+         rap_bw[iAc] = rb[iR - rbOffset] * a_cw[iAm1] * pa[iP1]
+                       +          rb[iR - rbOffset] * a_bw[iAm1]
+                       +                   a_bw[iA]   * pa[iP1];
 
          iP1 = iP - zOffsetP;
          rap_bc[iAc] =          a_bc[iA]   * pa[iP1]
-            +          rb[iR-rbOffset] * a_cc[iAm1] * pa[iP1]
-            +          rb[iR-rbOffset] * a_bc[iAm1];
+                                +          rb[iR - rbOffset] * a_cc[iAm1] * pa[iP1]
+                                +          rb[iR - rbOffset] * a_bc[iAm1];
 
          iP1 = iP - zOffsetP + xOffsetP;
-         rap_be[iAc] = rb[iR-rbOffset] * a_ce[iAm1] * pa[iP1]
-            +          rb[iR-rbOffset] * a_be[iAm1]
-            +                   a_be[iA]   * pa[iP1];
+         rap_be[iAc] = rb[iR - rbOffset] * a_ce[iAm1] * pa[iP1]
+                       +          rb[iR - rbOffset] * a_be[iAm1]
+                       +                   a_be[iA]   * pa[iP1];
 
          iP1 = iP - zOffsetP + yOffsetP - xOffsetP;
-         rap_bnw[iAc] = rb[iR-rbOffset] * a_cnw[iAm1] * pa[iP1]
-            +           rb[iR-rbOffset] * a_bnw[iAm1]
-            +                    a_bnw[iA]   * pa[iP1];
+         rap_bnw[iAc] = rb[iR - rbOffset] * a_cnw[iAm1] * pa[iP1]
+                        +           rb[iR - rbOffset] * a_bnw[iAm1]
+                        +                    a_bnw[iA]   * pa[iP1];
 
          iP1 = iP - zOffsetP + yOffsetP;
-         rap_bn[iAc] = rb[iR-rbOffset] * a_cn[iAm1] * pa[iP1]
-            +          rb[iR-rbOffset] * a_bn[iAm1]
-            +                   a_bn[iA]   * pa[iP1];
+         rap_bn[iAc] = rb[iR - rbOffset] * a_cn[iAm1] * pa[iP1]
+                       +          rb[iR - rbOffset] * a_bn[iAm1]
+                       +                   a_bn[iA]   * pa[iP1];
 
          iP1 = iP - zOffsetP + yOffsetP + xOffsetP;
-         rap_bne[iAc] = rb[iR-rbOffset] * a_cne[iAm1] * pa[iP1]
-            +           rb[iR-rbOffset] * a_bne[iAm1]
-            +                    a_bne[iA]   * pa[iP1];
+         rap_bne[iAc] = rb[iR - rbOffset] * a_cne[iAm1] * pa[iP1]
+                        +           rb[iR - rbOffset] * a_bne[iAm1]
+                        +                    a_bne[iA]   * pa[iP1];
 
          iP1 = iP - yOffsetP - xOffsetP;
          rap_csw[iAc] =          a_csw[iA]
-            +          rb[iR-rbOffset] * a_csw[iAm1] * pb[iP1-pbOffset]
-            +          ra[iR] * a_csw[iAp1] * pa[iP1]
-            +                   a_bsw[iA]   * pb[iP1-pbOffset]
-            +                   a_asw[iA]   * pa[iP1]
-            +          rb[iR-rbOffset] * a_asw[iAm1]
-            +          ra[iR] * a_bsw[iAp1];
+                                 +          rb[iR - rbOffset] * a_csw[iAm1] * pb[iP1 - pbOffset]
+                                 +          ra[iR] * a_csw[iAp1] * pa[iP1]
+                                 +                   a_bsw[iA]   * pb[iP1 - pbOffset]
+                                 +                   a_asw[iA]   * pa[iP1]
+                                 +          rb[iR - rbOffset] * a_asw[iAm1]
+                                 +          ra[iR] * a_bsw[iAp1];
 
          iP1 = iP - yOffsetP;
          rap_cs[iAc] =          a_cs[iA]
-            +          rb[iR-rbOffset] * a_cs[iAm1] * pb[iP1-pbOffset]
-            +          ra[iR] * a_cs[iAp1] * pa[iP1]
-            +                   a_bs[iA]   * pb[iP1-pbOffset]
-            +                   a_as[iA]   * pa[iP1]
-            +          rb[iR-rbOffset] * a_as[iAm1]
-            +          ra[iR] * a_bs[iAp1];
+                                +          rb[iR - rbOffset] * a_cs[iAm1] * pb[iP1 - pbOffset]
+                                +          ra[iR] * a_cs[iAp1] * pa[iP1]
+                                +                   a_bs[iA]   * pb[iP1 - pbOffset]
+                                +                   a_as[iA]   * pa[iP1]
+                                +          rb[iR - rbOffset] * a_as[iAm1]
+                                +          ra[iR] * a_bs[iAp1];
 
          iP1 = iP - yOffsetP + xOffsetP;
          rap_cse[iAc] =          a_cse[iA]
-            +          rb[iR-rbOffset] * a_cse[iAm1] * pb[iP1-pbOffset]
-            +          ra[iR] * a_cse[iAp1] * pa[iP1]
-            +                   a_bse[iA]   * pb[iP1-pbOffset]
-            +                   a_ase[iA]   * pa[iP1]
-            +          rb[iR-rbOffset] * a_ase[iAm1]
-            +          ra[iR] * a_bse[iAp1];
+                                 +          rb[iR - rbOffset] * a_cse[iAm1] * pb[iP1 - pbOffset]
+                                 +          ra[iR] * a_cse[iAp1] * pa[iP1]
+                                 +                   a_bse[iA]   * pb[iP1 - pbOffset]
+                                 +                   a_ase[iA]   * pa[iP1]
+                                 +          rb[iR - rbOffset] * a_ase[iAm1]
+                                 +          ra[iR] * a_bse[iAp1];
 
          iP1 = iP - xOffsetP;
          rap_cw[iAc] =          a_cw[iA]
-            +          rb[iR-rbOffset] * a_cw[iAm1] * pb[iP1-pbOffset]
-            +          ra[iR] * a_cw[iAp1] * pa[iP1]
-            +                   a_bw[iA]   * pb[iP1-pbOffset]
-            +                   a_aw[iA]   * pa[iP1]
-            +          rb[iR-rbOffset] * a_aw[iAm1]
-            +          ra[iR] * a_bw[iAp1];
+                                +          rb[iR - rbOffset] * a_cw[iAm1] * pb[iP1 - pbOffset]
+                                +          ra[iR] * a_cw[iAp1] * pa[iP1]
+                                +                   a_bw[iA]   * pb[iP1 - pbOffset]
+                                +                   a_aw[iA]   * pa[iP1]
+                                +          rb[iR - rbOffset] * a_aw[iAm1]
+                                +          ra[iR] * a_bw[iAp1];
 
          rap_cc[iAc] =          a_cc[iA]
-            +          rb[iR-rbOffset] * a_cc[iAm1] * pb[iP-pbOffset]
-            +          ra[iR] * a_cc[iAp1] * pa[iP]
-            +          rb[iR-rbOffset] * a_ac[iAm1]
-            +          ra[iR] * a_bc[iAp1]
-            +                   a_bc[iA]   * pb[iP-pbOffset]
-            +                   a_ac[iA]   * pa[iP];
+                                +          rb[iR - rbOffset] * a_cc[iAm1] * pb[iP - pbOffset]
+                                +          ra[iR] * a_cc[iAp1] * pa[iP]
+                                +          rb[iR - rbOffset] * a_ac[iAm1]
+                                +          ra[iR] * a_bc[iAp1]
+                                +                   a_bc[iA]   * pb[iP - pbOffset]
+                                +                   a_ac[iA]   * pa[iP];
       }
       hypre_BoxLoop4End(iP, iR, iA, iAc);
 #undef DEVICE_VAR
@@ -2450,99 +2453,99 @@ hypre_PFMG3BuildRAPSym_onebox_FSS27_CC0(
          HYPRE_Int iAp1 = iA + zOffsetA_diag;
 
          HYPRE_Int iP1 = iP - zOffsetP - yOffsetP - xOffsetP;
-         rap_bsw[iAc] = rb[iR-rbOffset] * a_csw_offdm1 * pa[iP1]
-            +           rb[iR-rbOffset] * a_bsw_offdm1
-            +                    a_bsw_offd   * pa[iP1];
+         rap_bsw[iAc] = rb[iR - rbOffset] * a_csw_offdm1 * pa[iP1]
+                        +           rb[iR - rbOffset] * a_bsw_offdm1
+                        +                    a_bsw_offd   * pa[iP1];
 
          iP1 = iP - zOffsetP - yOffsetP;
-         rap_bs[iAc] = rb[iR-rbOffset] * a_cs_offdm1 * pa[iP1]
-            +          rb[iR-rbOffset] * a_bs_offdm1
-            +                   a_bs_offd   * pa[iP1];
+         rap_bs[iAc] = rb[iR - rbOffset] * a_cs_offdm1 * pa[iP1]
+                       +          rb[iR - rbOffset] * a_bs_offdm1
+                       +                   a_bs_offd   * pa[iP1];
 
          iP1 = iP - zOffsetP - yOffsetP + xOffsetP;
-         rap_bse[iAc] = rb[iR-rbOffset] * a_cse_offdm1 * pa[iP1]
-            +           rb[iR-rbOffset] * a_bse_offdm1
-            +                    a_bse_offd   * pa[iP1];
+         rap_bse[iAc] = rb[iR - rbOffset] * a_cse_offdm1 * pa[iP1]
+                        +           rb[iR - rbOffset] * a_bse_offdm1
+                        +                    a_bse_offd   * pa[iP1];
 
          iP1 = iP - zOffsetP - xOffsetP;
-         rap_bw[iAc] = rb[iR-rbOffset] * a_cw_offdm1 * pa[iP1]
-            +          rb[iR-rbOffset] * a_bw_offdm1
-            +                   a_bw_offd   * pa[iP1];
+         rap_bw[iAc] = rb[iR - rbOffset] * a_cw_offdm1 * pa[iP1]
+                       +          rb[iR - rbOffset] * a_bw_offdm1
+                       +                   a_bw_offd   * pa[iP1];
 
          iP1 = iP - zOffsetP;
          rap_bc[iAc] =          a_bc_offd   * pa[iP1]
-            +          rb[iR-rbOffset] * a_cc[iAm1] * pa[iP1]
-            +          rb[iR-rbOffset] * a_bc_offdm1;
+                                +          rb[iR - rbOffset] * a_cc[iAm1] * pa[iP1]
+                                +          rb[iR - rbOffset] * a_bc_offdm1;
 
          iP1 = iP - zOffsetP + xOffsetP;
-         rap_be[iAc] = rb[iR-rbOffset] * a_ce_offdm1 * pa[iP1]
-            +          rb[iR-rbOffset] * a_be_offdm1
-            +                   a_be_offd   * pa[iP1];
+         rap_be[iAc] = rb[iR - rbOffset] * a_ce_offdm1 * pa[iP1]
+                       +          rb[iR - rbOffset] * a_be_offdm1
+                       +                   a_be_offd   * pa[iP1];
 
          iP1 = iP - zOffsetP + yOffsetP - xOffsetP;
-         rap_bnw[iAc] = rb[iR-rbOffset] * a_cnw_offdm1 * pa[iP1]
-            +           rb[iR-rbOffset] * a_bnw_offdm1
-            +                    a_bnw_offd   * pa[iP1];
+         rap_bnw[iAc] = rb[iR - rbOffset] * a_cnw_offdm1 * pa[iP1]
+                        +           rb[iR - rbOffset] * a_bnw_offdm1
+                        +                    a_bnw_offd   * pa[iP1];
 
          iP1 = iP - zOffsetP + yOffsetP;
-         rap_bn[iAc] = rb[iR-rbOffset] * a_cn_offdm1 * pa[iP1]
-            +          rb[iR-rbOffset] * a_bn_offdm1
-            +                   a_bn_offd   * pa[iP1];
+         rap_bn[iAc] = rb[iR - rbOffset] * a_cn_offdm1 * pa[iP1]
+                       +          rb[iR - rbOffset] * a_bn_offdm1
+                       +                   a_bn_offd   * pa[iP1];
 
          iP1 = iP - zOffsetP + yOffsetP + xOffsetP;
-         rap_bne[iAc] = rb[iR-rbOffset] * a_cne_offdm1 * pa[iP1]
-            +           rb[iR-rbOffset] * a_bne_offdm1
-            +                    a_bne_offd   * pa[iP1];
+         rap_bne[iAc] = rb[iR - rbOffset] * a_cne_offdm1 * pa[iP1]
+                        +           rb[iR - rbOffset] * a_bne_offdm1
+                        +                    a_bne_offd   * pa[iP1];
 
          iP1 = iP - yOffsetP - xOffsetP;
          rap_csw[iAc] =          a_csw_offd
-            +          rb[iR-rbOffset] * a_csw_offdm1 * pb[iP1-pbOffset]
-            +          ra[iR] * a_csw_offdp1 * pa[iP1]
-            +                   a_bsw_offd   * pb[iP1-pbOffset]
-            +                   a_asw_offd   * pa[iP1]
-            +          rb[iR-rbOffset] * a_asw_offdm1
-            +          ra[iR] * a_bsw_offdp1;
+                                 +          rb[iR - rbOffset] * a_csw_offdm1 * pb[iP1 - pbOffset]
+                                 +          ra[iR] * a_csw_offdp1 * pa[iP1]
+                                 +                   a_bsw_offd   * pb[iP1 - pbOffset]
+                                 +                   a_asw_offd   * pa[iP1]
+                                 +          rb[iR - rbOffset] * a_asw_offdm1
+                                 +          ra[iR] * a_bsw_offdp1;
 
          iP1 = iP - yOffsetP;
          rap_cs[iAc] =          a_cs_offd
-            +          rb[iR-rbOffset] * a_cs_offdm1 * pb[iP1-pbOffset]
-            +          ra[iR] * a_cs_offdp1 * pa[iP1]
-            +                   a_bs_offd   * pb[iP1-pbOffset]
-            +                   a_as_offd   * pa[iP1]
-            +          rb[iR-rbOffset] * a_as_offdm1
-            +          ra[iR] * a_bs_offdp1;
+                                +          rb[iR - rbOffset] * a_cs_offdm1 * pb[iP1 - pbOffset]
+                                +          ra[iR] * a_cs_offdp1 * pa[iP1]
+                                +                   a_bs_offd   * pb[iP1 - pbOffset]
+                                +                   a_as_offd   * pa[iP1]
+                                +          rb[iR - rbOffset] * a_as_offdm1
+                                +          ra[iR] * a_bs_offdp1;
 
          iP1 = iP - yOffsetP + xOffsetP;
          rap_cse[iAc] =          a_cse_offd
-            +          rb[iR-rbOffset] * a_cse_offdm1 * pb[iP1-pbOffset]
-            +          ra[iR] * a_cse_offdp1 * pa[iP1]
-            +                   a_bse_offd   * pb[iP1-pbOffset]
-            +                   a_ase_offd   * pa[iP1]
-            +          rb[iR-rbOffset] * a_ase_offdm1
-            +          ra[iR] * a_bse_offdp1;
+                                 +          rb[iR - rbOffset] * a_cse_offdm1 * pb[iP1 - pbOffset]
+                                 +          ra[iR] * a_cse_offdp1 * pa[iP1]
+                                 +                   a_bse_offd   * pb[iP1 - pbOffset]
+                                 +                   a_ase_offd   * pa[iP1]
+                                 +          rb[iR - rbOffset] * a_ase_offdm1
+                                 +          ra[iR] * a_bse_offdp1;
 
          iP1 = iP - xOffsetP;
          rap_cw[iAc] =          a_cw_offd
-            +          rb[iR-rbOffset] * a_cw_offdm1 * pb[iP1-pbOffset]
-            +          ra[iR] * a_cw_offdp1 * pa[iP1]
-            +                   a_bw_offd   * pb[iP1-pbOffset]
-            +                   a_aw_offd   * pa[iP1]
-            +          rb[iR-rbOffset] * a_aw_offdm1
-            +          ra[iR] * a_bw_offdp1;
+                                +          rb[iR - rbOffset] * a_cw_offdm1 * pb[iP1 - pbOffset]
+                                +          ra[iR] * a_cw_offdp1 * pa[iP1]
+                                +                   a_bw_offd   * pb[iP1 - pbOffset]
+                                +                   a_aw_offd   * pa[iP1]
+                                +          rb[iR - rbOffset] * a_aw_offdm1
+                                +          ra[iR] * a_bw_offdp1;
 
          rap_cc[iAc] =          a_cc[iA]
-            +          rb[iR-rbOffset] * a_cc[iAm1] * pb[iP-pbOffset]
-            +          ra[iR] * a_cc[iAp1] * pa[iP]
-            +          rb[iR-rbOffset] * a_ac_offdm1
-            +          ra[iR] * a_bc_offdp1
-            +                   a_bc_offd   * pb[iP-pbOffset]
-            +                   a_ac_offd   * pa[iP];
+                                +          rb[iR - rbOffset] * a_cc[iAm1] * pb[iP - pbOffset]
+                                +          ra[iR] * a_cc[iAp1] * pa[iP]
+                                +          rb[iR - rbOffset] * a_ac_offdm1
+                                +          ra[iR] * a_bc_offdp1
+                                +                   a_bc_offd   * pb[iP - pbOffset]
+                                +                   a_ac_offd   * pa[iP];
       }
       hypre_BoxLoop4End(iP, iR, iA, iAc);
 #undef DEVICE_VAR
    }
 
-/*      }*/ /* end ForBoxI */
+   /*      }*/ /* end ForBoxI */
 
    return hypre_error_flag;
 }
@@ -2608,11 +2611,11 @@ hypre_PFMG3BuildRAPSym_onebox_FSS27_CC1(
     * pb is pointer for weight for f-point below c-point
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,-1);
+   hypre_SetIndex3(index_temp, 0, 0, -1);
    MapIndex(index_temp, cdir, index);
    pa = hypre_StructMatrixExtractPointerByIndex(P, fi, index);
 
-   hypre_SetIndex3(index_temp,0,0,1);
+   hypre_SetIndex3(index_temp, 0, 0, 1);
    MapIndex(index_temp, cdir, index);
 
    pb = hypre_StructMatrixExtractPointerByIndex(P, fi, index);
@@ -2623,11 +2626,11 @@ hypre_PFMG3BuildRAPSym_onebox_FSS27_CC1(
     * rb is pointer for weight for f-point below c-point
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,-1);
+   hypre_SetIndex3(index_temp, 0, 0, -1);
    MapIndex(index_temp, cdir, index);
    ra = hypre_StructMatrixExtractPointerByIndex(R, fi, index);
 
-   hypre_SetIndex3(index_temp,0,0,1);
+   hypre_SetIndex3(index_temp, 0, 0, 1);
    MapIndex(index_temp, cdir, index);
 
    rb = hypre_StructMatrixExtractPointerByIndex(R, fi, index);
@@ -2644,31 +2647,31 @@ hypre_PFMG3BuildRAPSym_onebox_FSS27_CC1(
     * a_bc is pointer for center coefficient in plane below
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,0);
+   hypre_SetIndex3(index_temp, 0, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_cc = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,-1,0,0);
+   hypre_SetIndex3(index_temp, -1, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_cw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,0,0);
+   hypre_SetIndex3(index_temp, 1, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_ce = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,-1,0);
+   hypre_SetIndex3(index_temp, 0, -1, 0);
    MapIndex(index_temp, cdir, index);
    a_cs = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
    a_cn = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,0,1);
+   hypre_SetIndex3(index_temp, 0, 0, 1);
    MapIndex(index_temp, cdir, index);
    a_ac = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,0,-1);
+   hypre_SetIndex3(index_temp, 0, 0, -1);
    MapIndex(index_temp, cdir, index);
    a_bc = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
@@ -2689,43 +2692,43 @@ hypre_PFMG3BuildRAPSym_onebox_FSS27_CC1(
     * a_cne is pointer for northeast coefficient in same plane
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,-1,0,1);
+   hypre_SetIndex3(index_temp, -1, 0, 1);
    MapIndex(index_temp, cdir, index);
    a_aw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,-1,1);
+   hypre_SetIndex3(index_temp, 0, -1, 1);
    MapIndex(index_temp, cdir, index);
    a_as = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,-1,0,-1);
+   hypre_SetIndex3(index_temp, -1, 0, -1);
    MapIndex(index_temp, cdir, index);
    a_bw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,0,-1);
+   hypre_SetIndex3(index_temp, 1, 0, -1);
    MapIndex(index_temp, cdir, index);
    a_be = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,-1,-1);
+   hypre_SetIndex3(index_temp, 0, -1, -1);
    MapIndex(index_temp, cdir, index);
    a_bs = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,1,-1);
+   hypre_SetIndex3(index_temp, 0, 1, -1);
    MapIndex(index_temp, cdir, index);
    a_bn = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,-1,-1,0);
+   hypre_SetIndex3(index_temp, -1, -1, 0);
    MapIndex(index_temp, cdir, index);
    a_csw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,-1,0);
+   hypre_SetIndex3(index_temp, 1, -1, 0);
    MapIndex(index_temp, cdir, index);
    a_cse = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,-1,1,0);
+   hypre_SetIndex3(index_temp, -1, 1, 0);
    MapIndex(index_temp, cdir, index);
    a_cnw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,1,0);
+   hypre_SetIndex3(index_temp, 1, 1, 0);
    MapIndex(index_temp, cdir, index);
    a_cne = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
@@ -2742,27 +2745,27 @@ hypre_PFMG3BuildRAPSym_onebox_FSS27_CC1(
     * a_bne is pointer for northeast coefficient in plane below
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,-1,-1,1);
+   hypre_SetIndex3(index_temp, -1, -1, 1);
    MapIndex(index_temp, cdir, index);
    a_asw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,-1,1);
+   hypre_SetIndex3(index_temp, 1, -1, 1);
    MapIndex(index_temp, cdir, index);
    a_ase = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,-1,-1,-1);
+   hypre_SetIndex3(index_temp, -1, -1, -1);
    MapIndex(index_temp, cdir, index);
    a_bsw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,-1,-1);
+   hypre_SetIndex3(index_temp, 1, -1, -1);
    MapIndex(index_temp, cdir, index);
    a_bse = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,-1,1,-1);
+   hypre_SetIndex3(index_temp, -1, 1, -1);
    MapIndex(index_temp, cdir, index);
    a_bnw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,1,-1);
+   hypre_SetIndex3(index_temp, 1, 1, -1);
    MapIndex(index_temp, cdir, index);
    a_bne = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
@@ -2774,43 +2777,43 @@ hypre_PFMG3BuildRAPSym_onebox_FSS27_CC1(
     * rap_cc is pointer for center coefficient (etc.)
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,0);
+   hypre_SetIndex3(index_temp, 0, 0, 0);
    MapIndex(index_temp, cdir, index);
    rap_cc = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,-1,0,0);
+   hypre_SetIndex3(index_temp, -1, 0, 0);
    MapIndex(index_temp, cdir, index);
    rap_cw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,0,-1,0);
+   hypre_SetIndex3(index_temp, 0, -1, 0);
    MapIndex(index_temp, cdir, index);
    rap_cs = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,0,0,-1);
+   hypre_SetIndex3(index_temp, 0, 0, -1);
    MapIndex(index_temp, cdir, index);
    rap_bc = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,-1,0,-1);
+   hypre_SetIndex3(index_temp, -1, 0, -1);
    MapIndex(index_temp, cdir, index);
    rap_bw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,1,0,-1);
+   hypre_SetIndex3(index_temp, 1, 0, -1);
    MapIndex(index_temp, cdir, index);
    rap_be = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,0,-1,-1);
+   hypre_SetIndex3(index_temp, 0, -1, -1);
    MapIndex(index_temp, cdir, index);
    rap_bs = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,0,1,-1);
+   hypre_SetIndex3(index_temp, 0, 1, -1);
    MapIndex(index_temp, cdir, index);
    rap_bn = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,-1,-1,0);
+   hypre_SetIndex3(index_temp, -1, -1, 0);
    MapIndex(index_temp, cdir, index);
    rap_csw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,1,-1,0);
+   hypre_SetIndex3(index_temp, 1, -1, 0);
    MapIndex(index_temp, cdir, index);
    rap_cse = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
@@ -2825,19 +2828,19 @@ hypre_PFMG3BuildRAPSym_onebox_FSS27_CC1(
     * rap_csw is pointer for southwest coefficient in same plane (etc.)
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,-1,-1,-1);
+   hypre_SetIndex3(index_temp, -1, -1, -1);
    MapIndex(index_temp, cdir, index);
    rap_bsw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,1,-1,-1);
+   hypre_SetIndex3(index_temp, 1, -1, -1);
    MapIndex(index_temp, cdir, index);
    rap_bse = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,-1,1,-1);
+   hypre_SetIndex3(index_temp, -1, 1, -1);
    MapIndex(index_temp, cdir, index);
    rap_bnw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,1,1,-1);
+   hypre_SetIndex3(index_temp, 1, 1, -1);
    MapIndex(index_temp, cdir, index);
    rap_bne = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
@@ -2849,18 +2852,18 @@ hypre_PFMG3BuildRAPSym_onebox_FSS27_CC1(
     * Offsets are used in refering to data associated with other points.
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,1);
+   hypre_SetIndex3(index_temp, 0, 0, 1);
    MapIndex(index_temp, cdir, index);
 
    zOffsetA = 0;
    zOffsetP = 0;
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
 
    yOffsetP = 0;
 
-   hypre_SetIndex3(index_temp,1,0,0);
+   hypre_SetIndex3(index_temp, 1, 0, 0);
    MapIndex(index_temp, cdir, index);
 
    xOffsetP = 0;
@@ -2889,94 +2892,94 @@ hypre_PFMG3BuildRAPSym_onebox_FSS27_CC1(
 
    iP1 = iP - zOffsetP - yOffsetP - xOffsetP;
    rap_bsw[iAc] = rb[iR] * a_csw[iAm1] * pa[iP1]
-      +           rb[iR] * a_bsw[iAm1]
-      +                    a_bsw[iA]   * pa[iP1];
+                  +           rb[iR] * a_bsw[iAm1]
+                  +                    a_bsw[iA]   * pa[iP1];
 
    iP1 = iP - zOffsetP - yOffsetP;
    rap_bs[iAc] = rb[iR] * a_cs[iAm1] * pa[iP1]
-      +          rb[iR] * a_bs[iAm1]
-      +                   a_bs[iA]   * pa[iP1];
+                 +          rb[iR] * a_bs[iAm1]
+                 +                   a_bs[iA]   * pa[iP1];
 
    iP1 = iP - zOffsetP - yOffsetP + xOffsetP;
    rap_bse[iAc] = rb[iR] * a_cse[iAm1] * pa[iP1]
-      +           rb[iR] * a_bse[iAm1]
-      +                    a_bse[iA]   * pa[iP1];
+                  +           rb[iR] * a_bse[iAm1]
+                  +                    a_bse[iA]   * pa[iP1];
 
    iP1 = iP - zOffsetP - xOffsetP;
    rap_bw[iAc] = rb[iR] * a_cw[iAm1] * pa[iP1]
-      +          rb[iR] * a_bw[iAm1]
-      +                   a_bw[iA]   * pa[iP1];
+                 +          rb[iR] * a_bw[iAm1]
+                 +                   a_bw[iA]   * pa[iP1];
 
    iP1 = iP - zOffsetP;
    rap_bc[iAc] =          a_bc[iA]   * pa[iP1]
-      +          rb[iR] * a_cc[iAm1] * pa[iP1]
-      +          rb[iR] * a_bc[iAm1];
+                          +          rb[iR] * a_cc[iAm1] * pa[iP1]
+                          +          rb[iR] * a_bc[iAm1];
 
    iP1 = iP - zOffsetP + xOffsetP;
    rap_be[iAc] = rb[iR] * a_ce[iAm1] * pa[iP1]
-      +          rb[iR] * a_be[iAm1]
-      +                   a_be[iA]   * pa[iP1];
+                 +          rb[iR] * a_be[iAm1]
+                 +                   a_be[iA]   * pa[iP1];
 
    iP1 = iP - zOffsetP + yOffsetP - xOffsetP;
    rap_bnw[iAc] = rb[iR] * a_cnw[iAm1] * pa[iP1]
-      +           rb[iR] * a_bnw[iAm1]
-      +                    a_bnw[iA]   * pa[iP1];
+                  +           rb[iR] * a_bnw[iAm1]
+                  +                    a_bnw[iA]   * pa[iP1];
 
    iP1 = iP - zOffsetP + yOffsetP;
    rap_bn[iAc] = rb[iR] * a_cn[iAm1] * pa[iP1]
-      +          rb[iR] * a_bn[iAm1]
-      +                   a_bn[iA]   * pa[iP1];
+                 +          rb[iR] * a_bn[iAm1]
+                 +                   a_bn[iA]   * pa[iP1];
 
    iP1 = iP - zOffsetP + yOffsetP + xOffsetP;
    rap_bne[iAc] = rb[iR] * a_cne[iAm1] * pa[iP1]
-      +           rb[iR] * a_bne[iAm1]
-      +                    a_bne[iA]   * pa[iP1];
+                  +           rb[iR] * a_bne[iAm1]
+                  +                    a_bne[iA]   * pa[iP1];
 
    iP1 = iP - yOffsetP - xOffsetP;
    rap_csw[iAc] =          a_csw[iA]
-      +          rb[iR] * a_csw[iAm1] * pb[iP1]
-      +          ra[iR] * a_csw[iAp1] * pa[iP1]
-      +                   a_bsw[iA]   * pb[iP1]
-      +                   a_asw[iA]   * pa[iP1]
-      +          rb[iR] * a_asw[iAm1]
-      +          ra[iR] * a_bsw[iAp1];
+                           +          rb[iR] * a_csw[iAm1] * pb[iP1]
+                           +          ra[iR] * a_csw[iAp1] * pa[iP1]
+                           +                   a_bsw[iA]   * pb[iP1]
+                           +                   a_asw[iA]   * pa[iP1]
+                           +          rb[iR] * a_asw[iAm1]
+                           +          ra[iR] * a_bsw[iAp1];
 
    iP1 = iP - yOffsetP;
    rap_cs[iAc] =          a_cs[iA]
-      +          rb[iR] * a_cs[iAm1] * pb[iP1]
-      +          ra[iR] * a_cs[iAp1] * pa[iP1]
-      +                   a_bs[iA]   * pb[iP1]
-      +                   a_as[iA]   * pa[iP1]
-      +          rb[iR] * a_as[iAm1]
-      +          ra[iR] * a_bs[iAp1];
+                          +          rb[iR] * a_cs[iAm1] * pb[iP1]
+                          +          ra[iR] * a_cs[iAp1] * pa[iP1]
+                          +                   a_bs[iA]   * pb[iP1]
+                          +                   a_as[iA]   * pa[iP1]
+                          +          rb[iR] * a_as[iAm1]
+                          +          ra[iR] * a_bs[iAp1];
 
    iP1 = iP - yOffsetP + xOffsetP;
    rap_cse[iAc] =          a_cse[iA]
-      +          rb[iR] * a_cse[iAm1] * pb[iP1]
-      +          ra[iR] * a_cse[iAp1] * pa[iP1]
-      +                   a_bse[iA]   * pb[iP1]
-      +                   a_ase[iA]   * pa[iP1]
-      +          rb[iR] * a_ase[iAm1]
-      +          ra[iR] * a_bse[iAp1];
+                           +          rb[iR] * a_cse[iAm1] * pb[iP1]
+                           +          ra[iR] * a_cse[iAp1] * pa[iP1]
+                           +                   a_bse[iA]   * pb[iP1]
+                           +                   a_ase[iA]   * pa[iP1]
+                           +          rb[iR] * a_ase[iAm1]
+                           +          ra[iR] * a_bse[iAp1];
 
    iP1 = iP - xOffsetP;
    rap_cw[iAc] =          a_cw[iA]
-      +          rb[iR] * a_cw[iAm1] * pb[iP1]
-      +          ra[iR] * a_cw[iAp1] * pa[iP1]
-      +                   a_bw[iA]   * pb[iP1]
-      +                   a_aw[iA]   * pa[iP1]
-      +          rb[iR] * a_aw[iAm1]
-      +          ra[iR] * a_bw[iAp1];
+                          +          rb[iR] * a_cw[iAm1] * pb[iP1]
+                          +          ra[iR] * a_cw[iAp1] * pa[iP1]
+                          +                   a_bw[iA]   * pb[iP1]
+                          +                   a_aw[iA]   * pa[iP1]
+                          +          rb[iR] * a_aw[iAm1]
+                          +          ra[iR] * a_bw[iAp1];
 
    rap_cc[iAc] =          a_cc[iA]
-      +          rb[iR] * a_cc[iAm1] * pb[iP]
-      +          ra[iR] * a_cc[iAp1] * pa[iP]
-      +          rb[iR] * a_ac[iAm1]
-      +          ra[iR] * a_bc[iAp1]
-      +                   a_bc[iA]   * pb[iP]
-      +                   a_ac[iA]   * pa[iP];
+                          +          rb[iR] * a_cc[iAm1] * pb[iP]
+                          +          ra[iR] * a_cc[iAp1] * pa[iP]
+                          +          rb[iR] * a_ac[iAm1]
+                          +          ra[iR] * a_bc[iAp1]
+                          +                   a_bc[iA]   * pb[iP]
+                          +                   a_ac[iA]   * pa[iP];
 
-/*      }*/ /* end ForBoxI */
+   /*      }*/ /* end ForBoxI */
 
    return hypre_error_flag;
 }
@@ -3017,16 +3020,16 @@ hypre_PFMG3BuildRAPNoSym( hypre_StructMatrix *A,
 
    constant_coefficient = hypre_StructMatrixConstantCoefficient(RAP);
    constant_coefficient_A = hypre_StructMatrixConstantCoefficient(A);
-   hypre_assert( constant_coefficient==0 || constant_coefficient==1 );
+   hypre_assert( constant_coefficient == 0 || constant_coefficient == 1 );
    hypre_assert( hypre_StructMatrixConstantCoefficient(R) == constant_coefficient );
    hypre_assert( hypre_StructMatrixConstantCoefficient(P) == constant_coefficient );
-   if (constant_coefficient==1 )
+   if (constant_coefficient == 1 )
    {
-      hypre_assert( constant_coefficient_A==1 );
+      hypre_assert( constant_coefficient_A == 1 );
    }
    else
    {
-      hypre_assert( constant_coefficient_A==0 || constant_coefficient_A==2 );
+      hypre_assert( constant_coefficient_A == 0 || constant_coefficient_A == 2 );
    }
 
    fi = 0;
@@ -3062,14 +3065,14 @@ hypre_PFMG3BuildRAPNoSym( hypre_StructMatrix *A,
 
             break;
 
-            /*--------------------------------------------------------------
-             * Loop for 19-point fine grid operator; produces upper triangular
-             * part of 27-point coarse grid operator. stencil entries:
-             * (above-northeast, above-north, above-northwest, above-east,
-             * above-center, above-west, above-southeast, above-south,
-             * above-southwest, center-northeast, center-north,
-             * center-northwest, and center-east).
-             *--------------------------------------------------------------*/
+         /*--------------------------------------------------------------
+          * Loop for 19-point fine grid operator; produces upper triangular
+          * part of 27-point coarse grid operator. stencil entries:
+          * (above-northeast, above-north, above-northwest, above-east,
+          * above-center, above-west, above-southeast, above-south,
+          * above-southwest, center-northeast, center-north,
+          * center-northwest, and center-east).
+          *--------------------------------------------------------------*/
 
          case 19:
 
@@ -3086,14 +3089,14 @@ hypre_PFMG3BuildRAPNoSym( hypre_StructMatrix *A,
 
             break;
 
-            /*--------------------------------------------------------------
-             * Loop for 27-point fine grid operator; produces upper triangular
-             * part of 27-point coarse grid operator. stencil entries:
-             * (above-northeast, above-north, above-northwest, above-east,
-             * above-center, above-west, above-southeast, above-south,
-             * above-southwest, center-northeast, center-north,
-             * center-northwest, and center-east).
-             *--------------------------------------------------------------*/
+         /*--------------------------------------------------------------
+          * Loop for 27-point fine grid operator; produces upper triangular
+          * part of 27-point coarse grid operator. stencil entries:
+          * (above-northeast, above-north, above-northwest, above-east,
+          * above-center, above-west, above-southeast, above-south,
+          * above-southwest, center-northeast, center-north,
+          * center-northwest, and center-east).
+          *--------------------------------------------------------------*/
 
          default:
 
@@ -3202,11 +3205,11 @@ hypre_PFMG3BuildRAPNoSym_onebox_FSS07_CC0(
     * pb is pointer for weight for f-point below c-point
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,-1);
+   hypre_SetIndex3(index_temp, 0, 0, -1);
    MapIndex(index_temp, cdir, index);
    pa = hypre_StructMatrixExtractPointerByIndex(P, fi, index);
 
-   hypre_SetIndex3(index_temp,0,0,1);
+   hypre_SetIndex3(index_temp, 0, 0, 1);
    MapIndex(index_temp, cdir, index);
 
    pb = hypre_StructMatrixExtractPointerByIndex(P, fi, index);
@@ -3219,11 +3222,11 @@ hypre_PFMG3BuildRAPNoSym_onebox_FSS07_CC0(
     * rb is pointer for weight for f-point below c-point
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,-1);
+   hypre_SetIndex3(index_temp, 0, 0, -1);
    MapIndex(index_temp, cdir, index);
    ra = hypre_StructMatrixExtractPointerByIndex(R, fi, index);
 
-   hypre_SetIndex3(index_temp,0,0,1);
+   hypre_SetIndex3(index_temp, 0, 0, 1);
    MapIndex(index_temp, cdir, index);
 
    rb = hypre_StructMatrixExtractPointerByIndex(R, fi, index);
@@ -3242,27 +3245,27 @@ hypre_PFMG3BuildRAPNoSym_onebox_FSS07_CC0(
     * a_bc is pointer for center coefficient in plane below
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,0);
+   hypre_SetIndex3(index_temp, 0, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_cc = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,-1,0,0);
+   hypre_SetIndex3(index_temp, -1, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_cw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,0,0);
+   hypre_SetIndex3(index_temp, 1, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_ce = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,-1,0);
+   hypre_SetIndex3(index_temp, 0, -1, 0);
    MapIndex(index_temp, cdir, index);
    a_cs = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
    a_cn = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,0,1);
+   hypre_SetIndex3(index_temp, 0, 0, 1);
    MapIndex(index_temp, cdir, index);
    a_ac = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
@@ -3274,39 +3277,39 @@ hypre_PFMG3BuildRAPNoSym_onebox_FSS07_CC0(
     * rap_ce is pointer for east coefficient in same plane (etc.)
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,1,0,0);
+   hypre_SetIndex3(index_temp, 1, 0, 0);
    MapIndex(index_temp, cdir, index);
    rap_ce = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
    rap_cn = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,0,0,1);
+   hypre_SetIndex3(index_temp, 0, 0, 1);
    MapIndex(index_temp, cdir, index);
    rap_ac = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,-1,0,1);
+   hypre_SetIndex3(index_temp, -1, 0, 1);
    MapIndex(index_temp, cdir, index);
    rap_aw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,1,0,1);
+   hypre_SetIndex3(index_temp, 1, 0, 1);
    MapIndex(index_temp, cdir, index);
    rap_ae = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,0,-1,1);
+   hypre_SetIndex3(index_temp, 0, -1, 1);
    MapIndex(index_temp, cdir, index);
    rap_as = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,0,1,1);
+   hypre_SetIndex3(index_temp, 0, 1, 1);
    MapIndex(index_temp, cdir, index);
    rap_an = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,-1,1,0);
+   hypre_SetIndex3(index_temp, -1, 1, 0);
    MapIndex(index_temp, cdir, index);
    rap_cnw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,1,1,0);
+   hypre_SetIndex3(index_temp, 1, 1, 0);
    MapIndex(index_temp, cdir, index);
    rap_cne = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
@@ -3318,29 +3321,29 @@ hypre_PFMG3BuildRAPNoSym_onebox_FSS07_CC0(
     * Offsets are used in refering to data associated with other points.
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,1);
+   hypre_SetIndex3(index_temp, 0, 0, 1);
    MapIndex(index_temp, cdir, index);
 
-   zOffsetP = hypre_BoxOffsetDistance(P_dbox,index);
+   zOffsetP = hypre_BoxOffsetDistance(P_dbox, index);
    if ( constant_coefficient_A == 0 )
    {
-      zOffsetA = hypre_BoxOffsetDistance(A_dbox,index);
+      zOffsetA = hypre_BoxOffsetDistance(A_dbox, index);
    }
    else
    {
-      zOffsetA_diag = hypre_BoxOffsetDistance(A_dbox,index);
+      zOffsetA_diag = hypre_BoxOffsetDistance(A_dbox, index);
       zOffsetA_offd = 0;
    }
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
 
-   yOffsetP = hypre_BoxOffsetDistance(P_dbox,index);
+   yOffsetP = hypre_BoxOffsetDistance(P_dbox, index);
 
-   hypre_SetIndex3(index_temp,1,0,0);
+   hypre_SetIndex3(index_temp, 1, 0, 0);
    MapIndex(index_temp, cdir, index);
 
-   xOffsetP = hypre_BoxOffsetDistance(P_dbox,index);
+   xOffsetP = hypre_BoxOffsetDistance(P_dbox, index);
 
    /*-----------------------------------------------------------------
     * Switch statement to direct control to apropriate BoxLoop depending
@@ -3369,31 +3372,31 @@ hypre_PFMG3BuildRAPNoSym_onebox_FSS07_CC0(
          HYPRE_Int iAp1 = iA + zOffsetA;
 
          HYPRE_Int iP1 = iP + zOffsetP + yOffsetP;
-         rap_an[iAc] = ra[iR] * a_cn[iAp1] * pb[iP1-pbOffset];
+         rap_an[iAc] = ra[iR] * a_cn[iAp1] * pb[iP1 - pbOffset];
 
          iP1 = iP + zOffsetP + xOffsetP;
-         rap_ae[iAc] = ra[iR] * a_ce[iAp1] * pb[iP1-pbOffset];
+         rap_ae[iAc] = ra[iR] * a_ce[iAp1] * pb[iP1 - pbOffset];
 
          iP1 = iP + zOffsetP;
-         rap_ac[iAc] =          a_ac[iA]   * pb[iP1-pbOffset]
-            +          ra[iR] * a_cc[iAp1] * pb[iP1-pbOffset]
-            +          ra[iR] * a_ac[iAp1];
+         rap_ac[iAc] =          a_ac[iA]   * pb[iP1 - pbOffset]
+                                +          ra[iR] * a_cc[iAp1] * pb[iP1 - pbOffset]
+                                +          ra[iR] * a_ac[iAp1];
 
          iP1 = iP + zOffsetP - xOffsetP;
-         rap_aw[iAc] = ra[iR] * a_cw[iAp1] * pb[iP1-pbOffset];
+         rap_aw[iAc] = ra[iR] * a_cw[iAp1] * pb[iP1 - pbOffset];
 
          iP1 = iP + zOffsetP - yOffsetP;
-         rap_as[iAc] = ra[iR] * a_cs[iAp1] * pb[iP1-pbOffset];
+         rap_as[iAc] = ra[iR] * a_cs[iAp1] * pb[iP1 - pbOffset];
 
          iP1 = iP + yOffsetP;
          rap_cn[iAc] =          a_cn[iA]
-            +          rb[iR-rbOffset] * a_cn[iAm1] * pb[iP1-pbOffset]
-            +          ra[iR] * a_cn[iAp1] * pa[iP1];
+                                +          rb[iR - rbOffset] * a_cn[iAm1] * pb[iP1 - pbOffset]
+                                +          ra[iR] * a_cn[iAp1] * pa[iP1];
 
          iP1 = iP + xOffsetP;
          rap_ce[iAc] =          a_ce[iA]
-            +          rb[iR-rbOffset] * a_ce[iAm1] * pb[iP1-pbOffset]
-            +          ra[iR] * a_ce[iAp1] * pa[iP1];
+                                +          rb[iR - rbOffset] * a_ce[iAm1] * pb[iP1 - pbOffset]
+                                +          ra[iR] * a_ce[iAp1] * pa[iP1];
 
          rap_cnw[iAc] = 0.0;
 
@@ -3429,31 +3432,31 @@ hypre_PFMG3BuildRAPNoSym_onebox_FSS07_CC0(
          HYPRE_Int iAp1 = iA + zOffsetA_diag;
 
          HYPRE_Int iP1 = iP + zOffsetP + yOffsetP;
-         rap_an[iAc] = ra[iR] * a_cn_offdp1 * pb[iP1-pbOffset];
+         rap_an[iAc] = ra[iR] * a_cn_offdp1 * pb[iP1 - pbOffset];
 
          iP1 = iP + zOffsetP + xOffsetP;
-         rap_ae[iAc] = ra[iR] * a_ce_offdp1 * pb[iP1-pbOffset];
+         rap_ae[iAc] = ra[iR] * a_ce_offdp1 * pb[iP1 - pbOffset];
 
          iP1 = iP + zOffsetP;
-         rap_ac[iAc] =          a_ac_offd   * pb[iP1-pbOffset]
-            +          ra[iR] * a_cc[iAp1] * pb[iP1-pbOffset]
-            +          ra[iR] * a_ac_offdp1;
+         rap_ac[iAc] =          a_ac_offd   * pb[iP1 - pbOffset]
+                                +          ra[iR] * a_cc[iAp1] * pb[iP1 - pbOffset]
+                                +          ra[iR] * a_ac_offdp1;
 
          iP1 = iP + zOffsetP - xOffsetP;
-         rap_aw[iAc] = ra[iR] * a_cw_offdp1 * pb[iP1-pbOffset];
+         rap_aw[iAc] = ra[iR] * a_cw_offdp1 * pb[iP1 - pbOffset];
 
          iP1 = iP + zOffsetP - yOffsetP;
-         rap_as[iAc] = ra[iR] * a_cs_offdp1 * pb[iP1-pbOffset];
+         rap_as[iAc] = ra[iR] * a_cs_offdp1 * pb[iP1 - pbOffset];
 
          iP1 = iP + yOffsetP;
          rap_cn[iAc] =          a_cn_offd
-            +          rb[iR-rbOffset] * a_cn_offdm1 * pb[iP1-pbOffset]
-            +          ra[iR] * a_cn_offdp1 * pa[iP1];
+                                +          rb[iR - rbOffset] * a_cn_offdm1 * pb[iP1 - pbOffset]
+                                +          ra[iR] * a_cn_offdp1 * pa[iP1];
 
          iP1 = iP + xOffsetP;
          rap_ce[iAc] =          a_ce_offd
-            +          rb[iR-rbOffset] * a_ce_offdm1 * pb[iP1-pbOffset]
-            +          ra[iR] * a_ce_offdp1 * pa[iP1];
+                                +          rb[iR - rbOffset] * a_ce_offdm1 * pb[iP1 - pbOffset]
+                                +          ra[iR] * a_ce_offdp1 * pa[iP1];
 
          rap_cnw[iAc] = 0.0;
 
@@ -3463,7 +3466,7 @@ hypre_PFMG3BuildRAPNoSym_onebox_FSS07_CC0(
 #undef DEVICE_VAR
    }
 
-/*      }*/ /* end ForBoxI */
+   /*      }*/ /* end ForBoxI */
 
    return hypre_error_flag;
 }
@@ -3523,11 +3526,11 @@ hypre_PFMG3BuildRAPNoSym_onebox_FSS07_CC1(
     * pb is pointer for weight for f-point below c-point
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,-1);
+   hypre_SetIndex3(index_temp, 0, 0, -1);
    MapIndex(index_temp, cdir, index);
    pa = hypre_StructMatrixExtractPointerByIndex(P, fi, index);
 
-   hypre_SetIndex3(index_temp,0,0,1);
+   hypre_SetIndex3(index_temp, 0, 0, 1);
    MapIndex(index_temp, cdir, index);
 
    pb = hypre_StructMatrixExtractPointerByIndex(P, fi, index);
@@ -3538,11 +3541,11 @@ hypre_PFMG3BuildRAPNoSym_onebox_FSS07_CC1(
     * rb is pointer for weight for f-point below c-point
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,-1);
+   hypre_SetIndex3(index_temp, 0, 0, -1);
    MapIndex(index_temp, cdir, index);
    ra = hypre_StructMatrixExtractPointerByIndex(R, fi, index);
 
-   hypre_SetIndex3(index_temp,0,0,1);
+   hypre_SetIndex3(index_temp, 0, 0, 1);
    MapIndex(index_temp, cdir, index);
 
    rb = hypre_StructMatrixExtractPointerByIndex(R, fi, index);
@@ -3559,27 +3562,27 @@ hypre_PFMG3BuildRAPNoSym_onebox_FSS07_CC1(
     * a_bc is pointer for center coefficient in plane below
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,0);
+   hypre_SetIndex3(index_temp, 0, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_cc = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,-1,0,0);
+   hypre_SetIndex3(index_temp, -1, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_cw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,0,0);
+   hypre_SetIndex3(index_temp, 1, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_ce = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,-1,0);
+   hypre_SetIndex3(index_temp, 0, -1, 0);
    MapIndex(index_temp, cdir, index);
    a_cs = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
    a_cn = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,0,1);
+   hypre_SetIndex3(index_temp, 0, 0, 1);
    MapIndex(index_temp, cdir, index);
    a_ac = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
@@ -3591,39 +3594,39 @@ hypre_PFMG3BuildRAPNoSym_onebox_FSS07_CC1(
     * rap_ce is pointer for east coefficient in same plane (etc.)
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,1,0,0);
+   hypre_SetIndex3(index_temp, 1, 0, 0);
    MapIndex(index_temp, cdir, index);
    rap_ce = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
    rap_cn = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,0,0,1);
+   hypre_SetIndex3(index_temp, 0, 0, 1);
    MapIndex(index_temp, cdir, index);
    rap_ac = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,-1,0,1);
+   hypre_SetIndex3(index_temp, -1, 0, 1);
    MapIndex(index_temp, cdir, index);
    rap_aw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,1,0,1);
+   hypre_SetIndex3(index_temp, 1, 0, 1);
    MapIndex(index_temp, cdir, index);
    rap_ae = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,0,-1,1);
+   hypre_SetIndex3(index_temp, 0, -1, 1);
    MapIndex(index_temp, cdir, index);
    rap_as = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,0,1,1);
+   hypre_SetIndex3(index_temp, 0, 1, 1);
    MapIndex(index_temp, cdir, index);
    rap_an = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,-1,1,0);
+   hypre_SetIndex3(index_temp, -1, 1, 0);
    MapIndex(index_temp, cdir, index);
    rap_cnw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,1,1,0);
+   hypre_SetIndex3(index_temp, 1, 1, 0);
    MapIndex(index_temp, cdir, index);
    rap_cne = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
@@ -3635,18 +3638,18 @@ hypre_PFMG3BuildRAPNoSym_onebox_FSS07_CC1(
     * Offsets are used in refering to data associated with other points.
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,1);
+   hypre_SetIndex3(index_temp, 0, 0, 1);
    MapIndex(index_temp, cdir, index);
 
    zOffsetA = 0;
    zOffsetP = 0;
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
 
    yOffsetP = 0;
 
-   hypre_SetIndex3(index_temp,1,0,0);
+   hypre_SetIndex3(index_temp, 1, 0, 0);
    MapIndex(index_temp, cdir, index);
 
    xOffsetP = 0;
@@ -3679,8 +3682,8 @@ hypre_PFMG3BuildRAPNoSym_onebox_FSS07_CC1(
 
    iP1 = iP + zOffsetP;
    rap_ac[iAc] =          a_ac[iA]   * pb[iP1]
-      +          ra[iR] * a_cc[iAp1] * pb[iP1]
-      +          ra[iR] * a_ac[iAp1];
+                          +          ra[iR] * a_cc[iAp1] * pb[iP1]
+                          +          ra[iR] * a_ac[iAp1];
 
    iP1 = iP + zOffsetP - xOffsetP;
    rap_aw[iAc] = ra[iR] * a_cw[iAp1] * pb[iP1];
@@ -3690,19 +3693,19 @@ hypre_PFMG3BuildRAPNoSym_onebox_FSS07_CC1(
 
    iP1 = iP + yOffsetP;
    rap_cn[iAc] =          a_cn[iA]
-      +          rb[iR] * a_cn[iAm1] * pb[iP1]
-      +          ra[iR] * a_cn[iAp1] * pa[iP1];
+                          +          rb[iR] * a_cn[iAm1] * pb[iP1]
+                          +          ra[iR] * a_cn[iAp1] * pa[iP1];
 
    iP1 = iP + xOffsetP;
    rap_ce[iAc] =          a_ce[iA]
-      +          rb[iR] * a_ce[iAm1] * pb[iP1]
-      +          ra[iR] * a_ce[iAp1] * pa[iP1];
+                          +          rb[iR] * a_ce[iAm1] * pb[iP1]
+                          +          ra[iR] * a_ce[iAp1] * pa[iP1];
 
    rap_cnw[iAc] = 0.0;
 
    rap_cne[iAc] = 0.0;
 
-/*      }*/ /* end ForBoxI */
+   /*      }*/ /* end ForBoxI */
 
    return hypre_error_flag;
 }
@@ -3803,11 +3806,11 @@ hypre_PFMG3BuildRAPNoSym_onebox_FSS19_CC0(
     * pb is pointer for weight for f-point below c-point
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,-1);
+   hypre_SetIndex3(index_temp, 0, 0, -1);
    MapIndex(index_temp, cdir, index);
    pa = hypre_StructMatrixExtractPointerByIndex(P, fi, index);
 
-   hypre_SetIndex3(index_temp,0,0,1);
+   hypre_SetIndex3(index_temp, 0, 0, 1);
    MapIndex(index_temp, cdir, index);
 
    pb = hypre_StructMatrixExtractPointerByIndex(P, fi, index);
@@ -3820,11 +3823,11 @@ hypre_PFMG3BuildRAPNoSym_onebox_FSS19_CC0(
     * rb is pointer for weight for f-point below c-point
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,-1);
+   hypre_SetIndex3(index_temp, 0, 0, -1);
    MapIndex(index_temp, cdir, index);
    ra = hypre_StructMatrixExtractPointerByIndex(R, fi, index);
 
-   hypre_SetIndex3(index_temp,0,0,1);
+   hypre_SetIndex3(index_temp, 0, 0, 1);
    MapIndex(index_temp, cdir, index);
 
    rb = hypre_StructMatrixExtractPointerByIndex(R, fi, index);
@@ -3843,27 +3846,27 @@ hypre_PFMG3BuildRAPNoSym_onebox_FSS19_CC0(
     * a_bc is pointer for center coefficient in plane below
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,0);
+   hypre_SetIndex3(index_temp, 0, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_cc = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,-1,0,0);
+   hypre_SetIndex3(index_temp, -1, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_cw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,0,0);
+   hypre_SetIndex3(index_temp, 1, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_ce = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,-1,0);
+   hypre_SetIndex3(index_temp, 0, -1, 0);
    MapIndex(index_temp, cdir, index);
    a_cs = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
    a_cn = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,0,1);
+   hypre_SetIndex3(index_temp, 0, 0, 1);
    MapIndex(index_temp, cdir, index);
    a_ac = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
@@ -3884,43 +3887,43 @@ hypre_PFMG3BuildRAPNoSym_onebox_FSS19_CC0(
     * a_cne is pointer for northeast coefficient in same plane
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,-1,0,1);
+   hypre_SetIndex3(index_temp, -1, 0, 1);
    MapIndex(index_temp, cdir, index);
    a_aw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,0,1);
+   hypre_SetIndex3(index_temp, 1, 0, 1);
    MapIndex(index_temp, cdir, index);
    a_ae = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,-1,1);
+   hypre_SetIndex3(index_temp, 0, -1, 1);
    MapIndex(index_temp, cdir, index);
    a_as = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,1,1);
+   hypre_SetIndex3(index_temp, 0, 1, 1);
    MapIndex(index_temp, cdir, index);
    a_an = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,0,-1);
+   hypre_SetIndex3(index_temp, 1, 0, -1);
    MapIndex(index_temp, cdir, index);
    a_be = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,1,-1);
+   hypre_SetIndex3(index_temp, 0, 1, -1);
    MapIndex(index_temp, cdir, index);
    a_bn = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,-1,-1,0);
+   hypre_SetIndex3(index_temp, -1, -1, 0);
    MapIndex(index_temp, cdir, index);
    a_csw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,-1,0);
+   hypre_SetIndex3(index_temp, 1, -1, 0);
    MapIndex(index_temp, cdir, index);
    a_cse = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,-1,1,0);
+   hypre_SetIndex3(index_temp, -1, 1, 0);
    MapIndex(index_temp, cdir, index);
    a_cnw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,1,0);
+   hypre_SetIndex3(index_temp, 1, 1, 0);
    MapIndex(index_temp, cdir, index);
    a_cne = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
@@ -3932,39 +3935,39 @@ hypre_PFMG3BuildRAPNoSym_onebox_FSS19_CC0(
     * rap_ce is pointer for east coefficient in same plane (etc.)
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,1,0,0);
+   hypre_SetIndex3(index_temp, 1, 0, 0);
    MapIndex(index_temp, cdir, index);
    rap_ce = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
    rap_cn = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,0,0,1);
+   hypre_SetIndex3(index_temp, 0, 0, 1);
    MapIndex(index_temp, cdir, index);
    rap_ac = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,-1,0,1);
+   hypre_SetIndex3(index_temp, -1, 0, 1);
    MapIndex(index_temp, cdir, index);
    rap_aw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,1,0,1);
+   hypre_SetIndex3(index_temp, 1, 0, 1);
    MapIndex(index_temp, cdir, index);
    rap_ae = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,0,-1,1);
+   hypre_SetIndex3(index_temp, 0, -1, 1);
    MapIndex(index_temp, cdir, index);
    rap_as = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,0,1,1);
+   hypre_SetIndex3(index_temp, 0, 1, 1);
    MapIndex(index_temp, cdir, index);
    rap_an = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,-1,1,0);
+   hypre_SetIndex3(index_temp, -1, 1, 0);
    MapIndex(index_temp, cdir, index);
    rap_cnw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,1,1,0);
+   hypre_SetIndex3(index_temp, 1, 1, 0);
    MapIndex(index_temp, cdir, index);
    rap_cne = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
@@ -3979,19 +3982,19 @@ hypre_PFMG3BuildRAPNoSym_onebox_FSS19_CC0(
     * rap_cnw is pointer for northwest coefficient in same plane (etc.)
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,-1,-1,1);
+   hypre_SetIndex3(index_temp, -1, -1, 1);
    MapIndex(index_temp, cdir, index);
    rap_asw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,1,-1,1);
+   hypre_SetIndex3(index_temp, 1, -1, 1);
    MapIndex(index_temp, cdir, index);
    rap_ase = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,-1,1,1);
+   hypre_SetIndex3(index_temp, -1, 1, 1);
    MapIndex(index_temp, cdir, index);
    rap_anw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,1,1,1);
+   hypre_SetIndex3(index_temp, 1, 1, 1);
    MapIndex(index_temp, cdir, index);
    rap_ane = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
@@ -4003,29 +4006,29 @@ hypre_PFMG3BuildRAPNoSym_onebox_FSS19_CC0(
     * Offsets are used in refering to data associated with other points.
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,1);
+   hypre_SetIndex3(index_temp, 0, 0, 1);
    MapIndex(index_temp, cdir, index);
 
-   zOffsetP = hypre_BoxOffsetDistance(P_dbox,index);
+   zOffsetP = hypre_BoxOffsetDistance(P_dbox, index);
    if ( constant_coefficient_A == 0 )
    {
-      zOffsetA = hypre_BoxOffsetDistance(A_dbox,index);
+      zOffsetA = hypre_BoxOffsetDistance(A_dbox, index);
    }
    else
    {
-      zOffsetA_diag = hypre_BoxOffsetDistance(A_dbox,index);
+      zOffsetA_diag = hypre_BoxOffsetDistance(A_dbox, index);
       zOffsetA_offd = 0;
    }
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
 
-   yOffsetP = hypre_BoxOffsetDistance(P_dbox,index);
+   yOffsetP = hypre_BoxOffsetDistance(P_dbox, index);
 
-   hypre_SetIndex3(index_temp,1,0,0);
+   hypre_SetIndex3(index_temp, 1, 0, 0);
    MapIndex(index_temp, cdir, index);
 
-   xOffsetP = hypre_BoxOffsetDistance(P_dbox,index);
+   xOffsetP = hypre_BoxOffsetDistance(P_dbox, index);
 
    /*-----------------------------------------------------------------
     * Switch statement to direct control to apropriate BoxLoop depending
@@ -4056,69 +4059,69 @@ hypre_PFMG3BuildRAPNoSym_onebox_FSS19_CC0(
          HYPRE_Int iAp1 = iA + zOffsetA;
 
          HYPRE_Int iP1 = iP + zOffsetP + yOffsetP + xOffsetP;
-         rap_ane[iAc] = ra[iR] * a_cne[iAp1] * pb[iP1-pbOffset];
+         rap_ane[iAc] = ra[iR] * a_cne[iAp1] * pb[iP1 - pbOffset];
 
          iP1 = iP + zOffsetP + yOffsetP;
-         rap_an[iAc] = ra[iR] * a_cn[iAp1] * pb[iP1-pbOffset]
-            +          ra[iR] * a_an[iAp1]
-            +                   a_an[iA]   * pb[iP1-pbOffset];
+         rap_an[iAc] = ra[iR] * a_cn[iAp1] * pb[iP1 - pbOffset]
+                       +          ra[iR] * a_an[iAp1]
+                       +                   a_an[iA]   * pb[iP1 - pbOffset];
 
          iP1 = iP + zOffsetP + yOffsetP - xOffsetP;
-         rap_anw[iAc] = ra[iR] * a_cnw[iAp1] * pb[iP1-pbOffset];
+         rap_anw[iAc] = ra[iR] * a_cnw[iAp1] * pb[iP1 - pbOffset];
 
          iP1 = iP + zOffsetP + xOffsetP;
-         rap_ae[iAc] = ra[iR] * a_ce[iAp1] * pb[iP1-pbOffset]
-            +          ra[iR] * a_ae[iAp1]
-            +                   a_ae[iA]   * pb[iP1-pbOffset];
+         rap_ae[iAc] = ra[iR] * a_ce[iAp1] * pb[iP1 - pbOffset]
+                       +          ra[iR] * a_ae[iAp1]
+                       +                   a_ae[iA]   * pb[iP1 - pbOffset];
 
          iP1 = iP + zOffsetP;
-         rap_ac[iAc] =          a_ac[iA]   * pb[iP1-pbOffset]
-            +          ra[iR] * a_cc[iAp1] * pb[iP1-pbOffset]
-            +          ra[iR] * a_ac[iAp1];
+         rap_ac[iAc] =          a_ac[iA]   * pb[iP1 - pbOffset]
+                                +          ra[iR] * a_cc[iAp1] * pb[iP1 - pbOffset]
+                                +          ra[iR] * a_ac[iAp1];
 
          iP1 = iP + zOffsetP - xOffsetP;
-         rap_aw[iAc] = ra[iR] * a_cw[iAp1] * pb[iP1-pbOffset]
-            +          ra[iR] * a_aw[iAp1]
-            +                   a_aw[iA]   * pb[iP1-pbOffset];
+         rap_aw[iAc] = ra[iR] * a_cw[iAp1] * pb[iP1 - pbOffset]
+                       +          ra[iR] * a_aw[iAp1]
+                       +                   a_aw[iA]   * pb[iP1 - pbOffset];
 
          iP1 = iP + zOffsetP - yOffsetP + xOffsetP;
-         rap_ase[iAc] = ra[iR] * a_cse[iAp1] * pb[iP1-pbOffset];
+         rap_ase[iAc] = ra[iR] * a_cse[iAp1] * pb[iP1 - pbOffset];
 
          iP1 = iP + zOffsetP - yOffsetP;
-         rap_as[iAc] = ra[iR] * a_cs[iAp1] * pb[iP1-pbOffset]
-            +          ra[iR] * a_as[iAp1]
-            +                   a_as[iA]   * pb[iP1-pbOffset];
+         rap_as[iAc] = ra[iR] * a_cs[iAp1] * pb[iP1 - pbOffset]
+                       +          ra[iR] * a_as[iAp1]
+                       +                   a_as[iA]   * pb[iP1 - pbOffset];
 
          iP1 = iP + zOffsetP - yOffsetP - xOffsetP;
-         rap_asw[iAc] = ra[iR] * a_csw[iAp1] * pb[iP1-pbOffset];
+         rap_asw[iAc] = ra[iR] * a_csw[iAp1] * pb[iP1 - pbOffset];
 
          iP1 = iP + yOffsetP + xOffsetP;
          rap_cne[iAc] =         a_cne[iA]
-            +          rb[iR-rbOffset] * a_cne[iAm1] * pb[iP1-pbOffset]
-            +          ra[iR] * a_cne[iAp1] * pa[iP1];
+                                +          rb[iR - rbOffset] * a_cne[iAm1] * pb[iP1 - pbOffset]
+                                +          ra[iR] * a_cne[iAp1] * pa[iP1];
 
          iP1 = iP + yOffsetP;
          rap_cn[iAc] =          a_cn[iA]
-            +          rb[iR-rbOffset] * a_cn[iAm1] * pb[iP1-pbOffset]
-            +          ra[iR] * a_cn[iAp1] * pa[iP1]
-            +                   a_bn[iA]   * pb[iP1-pbOffset]
-            +                   a_an[iA]   * pa[iP1]
-            +          rb[iR-rbOffset] * a_an[iAm1]
-            +          ra[iR] * a_bn[iAp1];
+                                +          rb[iR - rbOffset] * a_cn[iAm1] * pb[iP1 - pbOffset]
+                                +          ra[iR] * a_cn[iAp1] * pa[iP1]
+                                +                   a_bn[iA]   * pb[iP1 - pbOffset]
+                                +                   a_an[iA]   * pa[iP1]
+                                +          rb[iR - rbOffset] * a_an[iAm1]
+                                +          ra[iR] * a_bn[iAp1];
 
          iP1 = iP + yOffsetP - xOffsetP;
          rap_cnw[iAc] =         a_cnw[iA]
-            +          rb[iR-rbOffset] * a_cnw[iAm1] * pb[iP1-pbOffset]
-            +          ra[iR] * a_cnw[iAp1] * pa[iP1];
+                                +          rb[iR - rbOffset] * a_cnw[iAm1] * pb[iP1 - pbOffset]
+                                +          ra[iR] * a_cnw[iAp1] * pa[iP1];
 
          iP1 = iP + xOffsetP;
          rap_ce[iAc] =          a_ce[iA]
-            +          rb[iR-rbOffset] * a_ce[iAm1] * pb[iP1-pbOffset]
-            +          ra[iR] * a_ce[iAp1] * pa[iP1]
-            +                   a_be[iA]   * pb[iP1-pbOffset]
-            +                   a_ae[iA]   * pa[iP1]
-            +          rb[iR-rbOffset] * a_ae[iAm1]
-            +          ra[iR] * a_be[iAp1];
+                                +          rb[iR - rbOffset] * a_ce[iAm1] * pb[iP1 - pbOffset]
+                                +          ra[iR] * a_ce[iAp1] * pa[iP1]
+                                +                   a_be[iA]   * pb[iP1 - pbOffset]
+                                +                   a_ae[iA]   * pa[iP1]
+                                +          rb[iR - rbOffset] * a_ae[iAm1]
+                                +          ra[iR] * a_be[iAp1];
 
       }
       hypre_BoxLoop4End(iP, iR, iA, iAc);
@@ -4172,76 +4175,76 @@ hypre_PFMG3BuildRAPNoSym_onebox_FSS19_CC0(
          HYPRE_Int iAp1 = iA + zOffsetA_diag;
 
          HYPRE_Int iP1 = iP + zOffsetP + yOffsetP + xOffsetP;
-         rap_ane[iAc] = ra[iR] * a_cne_offdp1 * pb[iP1-pbOffset];
+         rap_ane[iAc] = ra[iR] * a_cne_offdp1 * pb[iP1 - pbOffset];
 
          iP1 = iP + zOffsetP + yOffsetP;
-         rap_an[iAc] = ra[iR] * a_cn_offdp1 * pb[iP1-pbOffset]
-            +          ra[iR] * a_an_offdp1
-            +                   a_an_offd   * pb[iP1-pbOffset];
+         rap_an[iAc] = ra[iR] * a_cn_offdp1 * pb[iP1 - pbOffset]
+                       +          ra[iR] * a_an_offdp1
+                       +                   a_an_offd   * pb[iP1 - pbOffset];
 
          iP1 = iP + zOffsetP + yOffsetP - xOffsetP;
-         rap_anw[iAc] = ra[iR] * a_cnw_offdp1 * pb[iP1-pbOffset];
+         rap_anw[iAc] = ra[iR] * a_cnw_offdp1 * pb[iP1 - pbOffset];
 
          iP1 = iP + zOffsetP + xOffsetP;
-         rap_ae[iAc] = ra[iR] * a_ce_offdp1 * pb[iP1-pbOffset]
-            +          ra[iR] * a_ae_offdp1
-            +                   a_ae_offd   * pb[iP1-pbOffset];
+         rap_ae[iAc] = ra[iR] * a_ce_offdp1 * pb[iP1 - pbOffset]
+                       +          ra[iR] * a_ae_offdp1
+                       +                   a_ae_offd   * pb[iP1 - pbOffset];
 
          iP1 = iP + zOffsetP;
-         rap_ac[iAc] =          a_ac_offd   * pb[iP1-pbOffset]
-            +          ra[iR] * a_cc[iAp1] * pb[iP1-pbOffset]
-            +          ra[iR] * a_ac_offdp1;
+         rap_ac[iAc] =          a_ac_offd   * pb[iP1 - pbOffset]
+                                +          ra[iR] * a_cc[iAp1] * pb[iP1 - pbOffset]
+                                +          ra[iR] * a_ac_offdp1;
 
          iP1 = iP + zOffsetP - xOffsetP;
-         rap_aw[iAc] = ra[iR] * a_cw_offdp1 * pb[iP1-pbOffset]
-            +          ra[iR] * a_aw_offdp1
-            +                   a_aw_offd   * pb[iP1-pbOffset];
+         rap_aw[iAc] = ra[iR] * a_cw_offdp1 * pb[iP1 - pbOffset]
+                       +          ra[iR] * a_aw_offdp1
+                       +                   a_aw_offd   * pb[iP1 - pbOffset];
 
          iP1 = iP + zOffsetP - yOffsetP + xOffsetP;
-         rap_ase[iAc] = ra[iR] * a_cse_offdp1 * pb[iP1-pbOffset];
+         rap_ase[iAc] = ra[iR] * a_cse_offdp1 * pb[iP1 - pbOffset];
 
          iP1 = iP + zOffsetP - yOffsetP;
-         rap_as[iAc] = ra[iR] * a_cs_offdp1 * pb[iP1-pbOffset]
-            +          ra[iR] * a_as_offdp1
-            +                   a_as_offd   * pb[iP1-pbOffset];
+         rap_as[iAc] = ra[iR] * a_cs_offdp1 * pb[iP1 - pbOffset]
+                       +          ra[iR] * a_as_offdp1
+                       +                   a_as_offd   * pb[iP1 - pbOffset];
 
          iP1 = iP + zOffsetP - yOffsetP - xOffsetP;
-         rap_asw[iAc] = ra[iR] * a_csw_offdp1 * pb[iP1-pbOffset];
+         rap_asw[iAc] = ra[iR] * a_csw_offdp1 * pb[iP1 - pbOffset];
 
          iP1 = iP + yOffsetP + xOffsetP;
          rap_cne[iAc] =         a_cne_offd
-            +          rb[iR-rbOffset] * a_cne_offdm1 * pb[iP1-pbOffset]
-            +          ra[iR] * a_cne_offdp1 * pa[iP1];
+                                +          rb[iR - rbOffset] * a_cne_offdm1 * pb[iP1 - pbOffset]
+                                +          ra[iR] * a_cne_offdp1 * pa[iP1];
 
          iP1 = iP + yOffsetP;
          rap_cn[iAc] =          a_cn_offd
-            +          rb[iR-rbOffset] * a_cn_offdm1 * pb[iP1-pbOffset]
-            +          ra[iR] * a_cn_offdp1 * pa[iP1]
-            +                   a_bn_offd   * pb[iP1-pbOffset]
-            +                   a_an_offd   * pa[iP1]
-            +          rb[iR-rbOffset] * a_an_offdm1
-            +          ra[iR] * a_bn_offdp1;
+                                +          rb[iR - rbOffset] * a_cn_offdm1 * pb[iP1 - pbOffset]
+                                +          ra[iR] * a_cn_offdp1 * pa[iP1]
+                                +                   a_bn_offd   * pb[iP1 - pbOffset]
+                                +                   a_an_offd   * pa[iP1]
+                                +          rb[iR - rbOffset] * a_an_offdm1
+                                +          ra[iR] * a_bn_offdp1;
 
          iP1 = iP + yOffsetP - xOffsetP;
          rap_cnw[iAc] =         a_cnw_offd
-            +          rb[iR-rbOffset] * a_cnw_offdm1 * pb[iP1-pbOffset]
-            +          ra[iR] * a_cnw_offdp1 * pa[iP1];
+                                +          rb[iR - rbOffset] * a_cnw_offdm1 * pb[iP1 - pbOffset]
+                                +          ra[iR] * a_cnw_offdp1 * pa[iP1];
 
          iP1 = iP + xOffsetP;
          rap_ce[iAc] =          a_ce_offd
-            +          rb[iR-rbOffset] * a_ce_offdm1 * pb[iP1-pbOffset]
-            +          ra[iR] * a_ce_offdp1 * pa[iP1]
-            +                   a_be_offd   * pb[iP1-pbOffset]
-            +                   a_ae_offd   * pa[iP1]
-            +          rb[iR-rbOffset] * a_ae_offdm1
-            +          ra[iR] * a_be_offdp1;
+                                +          rb[iR - rbOffset] * a_ce_offdm1 * pb[iP1 - pbOffset]
+                                +          ra[iR] * a_ce_offdp1 * pa[iP1]
+                                +                   a_be_offd   * pb[iP1 - pbOffset]
+                                +                   a_ae_offd   * pa[iP1]
+                                +          rb[iR - rbOffset] * a_ae_offdm1
+                                +          ra[iR] * a_be_offdp1;
 
       }
       hypre_BoxLoop4End(iP, iR, iA, iAc);
 #undef DEVICE_VAR
    }
 
-/*      }*/ /* end ForBoxI */
+   /*      }*/ /* end ForBoxI */
 
    return hypre_error_flag;
 }
@@ -4303,11 +4306,11 @@ hypre_PFMG3BuildRAPNoSym_onebox_FSS19_CC1(
     * pb is pointer for weight for f-point below c-point
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,-1);
+   hypre_SetIndex3(index_temp, 0, 0, -1);
    MapIndex(index_temp, cdir, index);
    pa = hypre_StructMatrixExtractPointerByIndex(P, fi, index);
 
-   hypre_SetIndex3(index_temp,0,0,1);
+   hypre_SetIndex3(index_temp, 0, 0, 1);
    MapIndex(index_temp, cdir, index);
 
    pb = hypre_StructMatrixExtractPointerByIndex(P, fi, index);
@@ -4318,11 +4321,11 @@ hypre_PFMG3BuildRAPNoSym_onebox_FSS19_CC1(
     * rb is pointer for weight for f-point below c-point
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,-1);
+   hypre_SetIndex3(index_temp, 0, 0, -1);
    MapIndex(index_temp, cdir, index);
    ra = hypre_StructMatrixExtractPointerByIndex(R, fi, index);
 
-   hypre_SetIndex3(index_temp,0,0,1);
+   hypre_SetIndex3(index_temp, 0, 0, 1);
    MapIndex(index_temp, cdir, index);
 
    rb = hypre_StructMatrixExtractPointerByIndex(R, fi, index);
@@ -4339,27 +4342,27 @@ hypre_PFMG3BuildRAPNoSym_onebox_FSS19_CC1(
     * a_bc is pointer for center coefficient in plane below
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,0);
+   hypre_SetIndex3(index_temp, 0, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_cc = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,-1,0,0);
+   hypre_SetIndex3(index_temp, -1, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_cw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,0,0);
+   hypre_SetIndex3(index_temp, 1, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_ce = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,-1,0);
+   hypre_SetIndex3(index_temp, 0, -1, 0);
    MapIndex(index_temp, cdir, index);
    a_cs = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
    a_cn = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,0,1);
+   hypre_SetIndex3(index_temp, 0, 0, 1);
    MapIndex(index_temp, cdir, index);
    a_ac = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
@@ -4380,43 +4383,43 @@ hypre_PFMG3BuildRAPNoSym_onebox_FSS19_CC1(
     * a_cne is pointer for northeast coefficient in same plane
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,-1,0,1);
+   hypre_SetIndex3(index_temp, -1, 0, 1);
    MapIndex(index_temp, cdir, index);
    a_aw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,0,1);
+   hypre_SetIndex3(index_temp, 1, 0, 1);
    MapIndex(index_temp, cdir, index);
    a_ae = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,-1,1);
+   hypre_SetIndex3(index_temp, 0, -1, 1);
    MapIndex(index_temp, cdir, index);
    a_as = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,1,1);
+   hypre_SetIndex3(index_temp, 0, 1, 1);
    MapIndex(index_temp, cdir, index);
    a_an = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,0,-1);
+   hypre_SetIndex3(index_temp, 1, 0, -1);
    MapIndex(index_temp, cdir, index);
    a_be = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,1,-1);
+   hypre_SetIndex3(index_temp, 0, 1, -1);
    MapIndex(index_temp, cdir, index);
    a_bn = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,-1,-1,0);
+   hypre_SetIndex3(index_temp, -1, -1, 0);
    MapIndex(index_temp, cdir, index);
    a_csw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,-1,0);
+   hypre_SetIndex3(index_temp, 1, -1, 0);
    MapIndex(index_temp, cdir, index);
    a_cse = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,-1,1,0);
+   hypre_SetIndex3(index_temp, -1, 1, 0);
    MapIndex(index_temp, cdir, index);
    a_cnw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,1,0);
+   hypre_SetIndex3(index_temp, 1, 1, 0);
    MapIndex(index_temp, cdir, index);
    a_cne = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
@@ -4428,39 +4431,39 @@ hypre_PFMG3BuildRAPNoSym_onebox_FSS19_CC1(
     * rap_ce is pointer for east coefficient in same plane (etc.)
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,1,0,0);
+   hypre_SetIndex3(index_temp, 1, 0, 0);
    MapIndex(index_temp, cdir, index);
    rap_ce = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
    rap_cn = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,0,0,1);
+   hypre_SetIndex3(index_temp, 0, 0, 1);
    MapIndex(index_temp, cdir, index);
    rap_ac = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,-1,0,1);
+   hypre_SetIndex3(index_temp, -1, 0, 1);
    MapIndex(index_temp, cdir, index);
    rap_aw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,1,0,1);
+   hypre_SetIndex3(index_temp, 1, 0, 1);
    MapIndex(index_temp, cdir, index);
    rap_ae = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,0,-1,1);
+   hypre_SetIndex3(index_temp, 0, -1, 1);
    MapIndex(index_temp, cdir, index);
    rap_as = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,0,1,1);
+   hypre_SetIndex3(index_temp, 0, 1, 1);
    MapIndex(index_temp, cdir, index);
    rap_an = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,-1,1,0);
+   hypre_SetIndex3(index_temp, -1, 1, 0);
    MapIndex(index_temp, cdir, index);
    rap_cnw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,1,1,0);
+   hypre_SetIndex3(index_temp, 1, 1, 0);
    MapIndex(index_temp, cdir, index);
    rap_cne = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
@@ -4475,19 +4478,19 @@ hypre_PFMG3BuildRAPNoSym_onebox_FSS19_CC1(
     * rap_cnw is pointer for northwest coefficient in same plane (etc.)
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,-1,-1,1);
+   hypre_SetIndex3(index_temp, -1, -1, 1);
    MapIndex(index_temp, cdir, index);
    rap_asw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,1,-1,1);
+   hypre_SetIndex3(index_temp, 1, -1, 1);
    MapIndex(index_temp, cdir, index);
    rap_ase = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,-1,1,1);
+   hypre_SetIndex3(index_temp, -1, 1, 1);
    MapIndex(index_temp, cdir, index);
    rap_anw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,1,1,1);
+   hypre_SetIndex3(index_temp, 1, 1, 1);
    MapIndex(index_temp, cdir, index);
    rap_ane = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
@@ -4499,18 +4502,18 @@ hypre_PFMG3BuildRAPNoSym_onebox_FSS19_CC1(
     * Offsets are used in refering to data associated with other points.
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,1);
+   hypre_SetIndex3(index_temp, 0, 0, 1);
    MapIndex(index_temp, cdir, index);
 
    zOffsetA = 0;
    zOffsetP = 0;
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
 
    yOffsetP = 0;
 
-   hypre_SetIndex3(index_temp,1,0,0);
+   hypre_SetIndex3(index_temp, 1, 0, 0);
    MapIndex(index_temp, cdir, index);
 
    xOffsetP = 0;
@@ -4542,65 +4545,65 @@ hypre_PFMG3BuildRAPNoSym_onebox_FSS19_CC1(
 
    iP1 = iP + zOffsetP + yOffsetP;
    rap_an[iAc] = ra[iR] * a_cn[iAp1] * pb[iP1]
-      +          ra[iR] * a_an[iAp1]
-      +                   a_an[iA]   * pb[iP1];
+                 +          ra[iR] * a_an[iAp1]
+                 +                   a_an[iA]   * pb[iP1];
 
    iP1 = iP + zOffsetP + yOffsetP - xOffsetP;
    rap_anw[iAc] = ra[iR] * a_cnw[iAp1] * pb[iP1];
 
    iP1 = iP + zOffsetP + xOffsetP;
    rap_ae[iAc] = ra[iR] * a_ce[iAp1] * pb[iP1]
-      +          ra[iR] * a_ae[iAp1]
-      +                   a_ae[iA]   * pb[iP1];
+                 +          ra[iR] * a_ae[iAp1]
+                 +                   a_ae[iA]   * pb[iP1];
 
    iP1 = iP + zOffsetP;
    rap_ac[iAc] =          a_ac[iA]   * pb[iP1]
-      +          ra[iR] * a_cc[iAp1] * pb[iP1]
-      +          ra[iR] * a_ac[iAp1];
+                          +          ra[iR] * a_cc[iAp1] * pb[iP1]
+                          +          ra[iR] * a_ac[iAp1];
 
    iP1 = iP + zOffsetP - xOffsetP;
    rap_aw[iAc] = ra[iR] * a_cw[iAp1] * pb[iP1]
-      +          ra[iR] * a_aw[iAp1]
-      +                   a_aw[iA]   * pb[iP1];
+                 +          ra[iR] * a_aw[iAp1]
+                 +                   a_aw[iA]   * pb[iP1];
 
    iP1 = iP + zOffsetP - yOffsetP + xOffsetP;
    rap_ase[iAc] = ra[iR] * a_cse[iAp1] * pb[iP1];
 
    iP1 = iP + zOffsetP - yOffsetP;
    rap_as[iAc] = ra[iR] * a_cs[iAp1] * pb[iP1]
-      +          ra[iR] * a_as[iAp1]
-      +                   a_as[iA]   * pb[iP1];
+                 +          ra[iR] * a_as[iAp1]
+                 +                   a_as[iA]   * pb[iP1];
 
    iP1 = iP + zOffsetP - yOffsetP - xOffsetP;
    rap_asw[iAc] = ra[iR] * a_csw[iAp1] * pb[iP1];
 
    iP1 = iP + yOffsetP + xOffsetP;
    rap_cne[iAc] =         a_cne[iA]
-      +          rb[iR] * a_cne[iAm1] * pb[iP1]
-      +          ra[iR] * a_cne[iAp1] * pa[iP1];
+                          +          rb[iR] * a_cne[iAm1] * pb[iP1]
+                          +          ra[iR] * a_cne[iAp1] * pa[iP1];
 
    iP1 = iP + yOffsetP;
    rap_cn[iAc] =          a_cn[iA]
-      +          rb[iR] * a_cn[iAm1] * pb[iP1]
-      +          ra[iR] * a_cn[iAp1] * pa[iP1]
-      +                   a_bn[iA]   * pb[iP1]
-      +                   a_an[iA]   * pa[iP1]
-      +          rb[iR] * a_an[iAm1]
-      +          ra[iR] * a_bn[iAp1];
+                          +          rb[iR] * a_cn[iAm1] * pb[iP1]
+                          +          ra[iR] * a_cn[iAp1] * pa[iP1]
+                          +                   a_bn[iA]   * pb[iP1]
+                          +                   a_an[iA]   * pa[iP1]
+                          +          rb[iR] * a_an[iAm1]
+                          +          ra[iR] * a_bn[iAp1];
 
    iP1 = iP + yOffsetP - xOffsetP;
    rap_cnw[iAc] =         a_cnw[iA]
-      +          rb[iR] * a_cnw[iAm1] * pb[iP1]
-      +          ra[iR] * a_cnw[iAp1] * pa[iP1];
+                          +          rb[iR] * a_cnw[iAm1] * pb[iP1]
+                          +          ra[iR] * a_cnw[iAp1] * pa[iP1];
 
    iP1 = iP + xOffsetP;
    rap_ce[iAc] =          a_ce[iA]
-      +          rb[iR] * a_ce[iAm1] * pb[iP1]
-      +          ra[iR] * a_ce[iAp1] * pa[iP1]
-      +                   a_be[iA]   * pb[iP1]
-      +                   a_ae[iA]   * pa[iP1]
-      +          rb[iR] * a_ae[iAm1]
-      +          ra[iR] * a_be[iAp1];
+                          +          rb[iR] * a_ce[iAm1] * pb[iP1]
+                          +          ra[iR] * a_ce[iAp1] * pa[iP1]
+                          +                   a_be[iA]   * pb[iP1]
+                          +                   a_ae[iA]   * pa[iP1]
+                          +          rb[iR] * a_ae[iAm1]
+                          +          ra[iR] * a_be[iAp1];
 
    /*      }*/ /* end ForBoxI */
 
@@ -4713,11 +4716,11 @@ hypre_PFMG3BuildRAPNoSym_onebox_FSS27_CC0(
     * pb is pointer for weight for f-point below c-point
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,-1);
+   hypre_SetIndex3(index_temp, 0, 0, -1);
    MapIndex(index_temp, cdir, index);
    pa = hypre_StructMatrixExtractPointerByIndex(P, fi, index);
 
-   hypre_SetIndex3(index_temp,0,0,1);
+   hypre_SetIndex3(index_temp, 0, 0, 1);
    MapIndex(index_temp, cdir, index);
 
    pb = hypre_StructMatrixExtractPointerByIndex(P, fi, index);
@@ -4730,11 +4733,11 @@ hypre_PFMG3BuildRAPNoSym_onebox_FSS27_CC0(
     * rb is pointer for weight for f-point below c-point
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,-1);
+   hypre_SetIndex3(index_temp, 0, 0, -1);
    MapIndex(index_temp, cdir, index);
    ra = hypre_StructMatrixExtractPointerByIndex(R, fi, index);
 
-   hypre_SetIndex3(index_temp,0,0,1);
+   hypre_SetIndex3(index_temp, 0, 0, 1);
    MapIndex(index_temp, cdir, index);
 
    rb = hypre_StructMatrixExtractPointerByIndex(R, fi, index);
@@ -4753,27 +4756,27 @@ hypre_PFMG3BuildRAPNoSym_onebox_FSS27_CC0(
     * a_bc is pointer for center coefficient in plane below
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,0);
+   hypre_SetIndex3(index_temp, 0, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_cc = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,-1,0,0);
+   hypre_SetIndex3(index_temp, -1, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_cw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,0,0);
+   hypre_SetIndex3(index_temp, 1, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_ce = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,-1,0);
+   hypre_SetIndex3(index_temp, 0, -1, 0);
    MapIndex(index_temp, cdir, index);
    a_cs = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
    a_cn = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,0,1);
+   hypre_SetIndex3(index_temp, 0, 0, 1);
    MapIndex(index_temp, cdir, index);
    a_ac = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
@@ -4794,43 +4797,43 @@ hypre_PFMG3BuildRAPNoSym_onebox_FSS27_CC0(
     * a_cne is pointer for northeast coefficient in same plane
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,-1,0,1);
+   hypre_SetIndex3(index_temp, -1, 0, 1);
    MapIndex(index_temp, cdir, index);
    a_aw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,0,1);
+   hypre_SetIndex3(index_temp, 1, 0, 1);
    MapIndex(index_temp, cdir, index);
    a_ae = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,-1,1);
+   hypre_SetIndex3(index_temp, 0, -1, 1);
    MapIndex(index_temp, cdir, index);
    a_as = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,1,1);
+   hypre_SetIndex3(index_temp, 0, 1, 1);
    MapIndex(index_temp, cdir, index);
    a_an = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,0,-1);
+   hypre_SetIndex3(index_temp, 1, 0, -1);
    MapIndex(index_temp, cdir, index);
    a_be = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,1,-1);
+   hypre_SetIndex3(index_temp, 0, 1, -1);
    MapIndex(index_temp, cdir, index);
    a_bn = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,-1,-1,0);
+   hypre_SetIndex3(index_temp, -1, -1, 0);
    MapIndex(index_temp, cdir, index);
    a_csw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,-1,0);
+   hypre_SetIndex3(index_temp, 1, -1, 0);
    MapIndex(index_temp, cdir, index);
    a_cse = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,-1,1,0);
+   hypre_SetIndex3(index_temp, -1, 1, 0);
    MapIndex(index_temp, cdir, index);
    a_cnw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,1,0);
+   hypre_SetIndex3(index_temp, 1, 1, 0);
    MapIndex(index_temp, cdir, index);
    a_cne = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
@@ -4847,27 +4850,27 @@ hypre_PFMG3BuildRAPNoSym_onebox_FSS27_CC0(
     * a_bne is pointer for northeast coefficient in plane below
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,-1,-1,1);
+   hypre_SetIndex3(index_temp, -1, -1, 1);
    MapIndex(index_temp, cdir, index);
    a_asw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,-1,1);
+   hypre_SetIndex3(index_temp, 1, -1, 1);
    MapIndex(index_temp, cdir, index);
    a_ase = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,-1,1,1);
+   hypre_SetIndex3(index_temp, -1, 1, 1);
    MapIndex(index_temp, cdir, index);
    a_anw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,1,1);
+   hypre_SetIndex3(index_temp, 1, 1, 1);
    MapIndex(index_temp, cdir, index);
    a_ane = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,-1,1,-1);
+   hypre_SetIndex3(index_temp, -1, 1, -1);
    MapIndex(index_temp, cdir, index);
    a_bnw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,1,-1);
+   hypre_SetIndex3(index_temp, 1, 1, -1);
    MapIndex(index_temp, cdir, index);
    a_bne = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
@@ -4879,39 +4882,39 @@ hypre_PFMG3BuildRAPNoSym_onebox_FSS27_CC0(
     * rap_ce is pointer for east coefficient in same plane (etc.)
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,1,0,0);
+   hypre_SetIndex3(index_temp, 1, 0, 0);
    MapIndex(index_temp, cdir, index);
    rap_ce = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
    rap_cn = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,0,0,1);
+   hypre_SetIndex3(index_temp, 0, 0, 1);
    MapIndex(index_temp, cdir, index);
    rap_ac = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,-1,0,1);
+   hypre_SetIndex3(index_temp, -1, 0, 1);
    MapIndex(index_temp, cdir, index);
    rap_aw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,1,0,1);
+   hypre_SetIndex3(index_temp, 1, 0, 1);
    MapIndex(index_temp, cdir, index);
    rap_ae = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,0,-1,1);
+   hypre_SetIndex3(index_temp, 0, -1, 1);
    MapIndex(index_temp, cdir, index);
    rap_as = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,0,1,1);
+   hypre_SetIndex3(index_temp, 0, 1, 1);
    MapIndex(index_temp, cdir, index);
    rap_an = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,-1,1,0);
+   hypre_SetIndex3(index_temp, -1, 1, 0);
    MapIndex(index_temp, cdir, index);
    rap_cnw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,1,1,0);
+   hypre_SetIndex3(index_temp, 1, 1, 0);
    MapIndex(index_temp, cdir, index);
    rap_cne = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
@@ -4926,19 +4929,19 @@ hypre_PFMG3BuildRAPNoSym_onebox_FSS27_CC0(
     * rap_cnw is pointer for northwest coefficient in same plane (etc.)
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,-1,-1,1);
+   hypre_SetIndex3(index_temp, -1, -1, 1);
    MapIndex(index_temp, cdir, index);
    rap_asw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,1,-1,1);
+   hypre_SetIndex3(index_temp, 1, -1, 1);
    MapIndex(index_temp, cdir, index);
    rap_ase = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,-1,1,1);
+   hypre_SetIndex3(index_temp, -1, 1, 1);
    MapIndex(index_temp, cdir, index);
    rap_anw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,1,1,1);
+   hypre_SetIndex3(index_temp, 1, 1, 1);
    MapIndex(index_temp, cdir, index);
    rap_ane = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
@@ -4950,29 +4953,29 @@ hypre_PFMG3BuildRAPNoSym_onebox_FSS27_CC0(
     * Offsets are used in refering to data associated with other points.
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,1);
+   hypre_SetIndex3(index_temp, 0, 0, 1);
    MapIndex(index_temp, cdir, index);
 
-   zOffsetP = hypre_BoxOffsetDistance(P_dbox,index);
+   zOffsetP = hypre_BoxOffsetDistance(P_dbox, index);
    if ( constant_coefficient_A == 0 )
    {
-      zOffsetA = hypre_BoxOffsetDistance(A_dbox,index);
+      zOffsetA = hypre_BoxOffsetDistance(A_dbox, index);
    }
    else
    {
-      zOffsetA_diag = hypre_BoxOffsetDistance(A_dbox,index);
+      zOffsetA_diag = hypre_BoxOffsetDistance(A_dbox, index);
       zOffsetA_offd = 0;
    }
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
 
-   yOffsetP = hypre_BoxOffsetDistance(P_dbox,index);
+   yOffsetP = hypre_BoxOffsetDistance(P_dbox, index);
 
-   hypre_SetIndex3(index_temp,1,0,0);
+   hypre_SetIndex3(index_temp, 1, 0, 0);
    MapIndex(index_temp, cdir, index);
 
-   xOffsetP = hypre_BoxOffsetDistance(P_dbox,index);
+   xOffsetP = hypre_BoxOffsetDistance(P_dbox, index);
 
    /*-----------------------------------------------------------------
     * Switch statement to direct control to apropriate BoxLoop depending
@@ -5003,86 +5006,86 @@ hypre_PFMG3BuildRAPNoSym_onebox_FSS27_CC0(
          HYPRE_Int iAp1 = iA + zOffsetA;
 
          HYPRE_Int iP1 = iP + zOffsetP + yOffsetP + xOffsetP;
-         rap_ane[iAc] = ra[iR] * a_cne[iAp1] * pb[iP1-pbOffset]
-            +           ra[iR] * a_ane[iAp1]
-            +                    a_ane[iA]   * pb[iP1-pbOffset];
+         rap_ane[iAc] = ra[iR] * a_cne[iAp1] * pb[iP1 - pbOffset]
+                        +           ra[iR] * a_ane[iAp1]
+                        +                    a_ane[iA]   * pb[iP1 - pbOffset];
 
          iP1 = iP + zOffsetP + yOffsetP;
-         rap_an[iAc] = ra[iR] * a_cn[iAp1] * pb[iP1-pbOffset]
-            +          ra[iR] * a_an[iAp1]
-            +                   a_an[iA]   * pb[iP1-pbOffset];
+         rap_an[iAc] = ra[iR] * a_cn[iAp1] * pb[iP1 - pbOffset]
+                       +          ra[iR] * a_an[iAp1]
+                       +                   a_an[iA]   * pb[iP1 - pbOffset];
 
          iP1 = iP + zOffsetP + yOffsetP - xOffsetP;
-         rap_anw[iAc] = ra[iR] * a_cnw[iAp1] * pb[iP1-pbOffset]
-            +           ra[iR] * a_anw[iAp1]
-            +                    a_anw[iA]   * pb[iP1-pbOffset];
+         rap_anw[iAc] = ra[iR] * a_cnw[iAp1] * pb[iP1 - pbOffset]
+                        +           ra[iR] * a_anw[iAp1]
+                        +                    a_anw[iA]   * pb[iP1 - pbOffset];
 
          iP1 = iP + zOffsetP + xOffsetP;
-         rap_ae[iAc] = ra[iR] * a_ce[iAp1] * pb[iP1-pbOffset]
-            +          ra[iR] * a_ae[iAp1]
-            +                   a_ae[iA]   * pb[iP1-pbOffset];
+         rap_ae[iAc] = ra[iR] * a_ce[iAp1] * pb[iP1 - pbOffset]
+                       +          ra[iR] * a_ae[iAp1]
+                       +                   a_ae[iA]   * pb[iP1 - pbOffset];
 
          iP1 = iP + zOffsetP;
-         rap_ac[iAc] =          a_ac[iA]   * pb[iP1-pbOffset]
-            +          ra[iR] * a_cc[iAp1] * pb[iP1-pbOffset]
-            +          ra[iR] * a_ac[iAp1];
+         rap_ac[iAc] =          a_ac[iA]   * pb[iP1 - pbOffset]
+                                +          ra[iR] * a_cc[iAp1] * pb[iP1 - pbOffset]
+                                +          ra[iR] * a_ac[iAp1];
 
          iP1 = iP + zOffsetP - xOffsetP;
-         rap_aw[iAc] = ra[iR] * a_cw[iAp1] * pb[iP1-pbOffset]
-            +          ra[iR] * a_aw[iAp1]
-            +                   a_aw[iA]   * pb[iP1-pbOffset];
+         rap_aw[iAc] = ra[iR] * a_cw[iAp1] * pb[iP1 - pbOffset]
+                       +          ra[iR] * a_aw[iAp1]
+                       +                   a_aw[iA]   * pb[iP1 - pbOffset];
 
          iP1 = iP + zOffsetP - yOffsetP + xOffsetP;
-         rap_ase[iAc] = ra[iR] * a_cse[iAp1] * pb[iP1-pbOffset]
-            +           ra[iR] * a_ase[iAp1]
-            +                    a_ase[iA]   * pb[iP1-pbOffset];
+         rap_ase[iAc] = ra[iR] * a_cse[iAp1] * pb[iP1 - pbOffset]
+                        +           ra[iR] * a_ase[iAp1]
+                        +                    a_ase[iA]   * pb[iP1 - pbOffset];
 
          iP1 = iP + zOffsetP - yOffsetP;
-         rap_as[iAc] = ra[iR] * a_cs[iAp1] * pb[iP1-pbOffset]
-            +          ra[iR] * a_as[iAp1]
-            +                   a_as[iA]   * pb[iP1-pbOffset];
+         rap_as[iAc] = ra[iR] * a_cs[iAp1] * pb[iP1 - pbOffset]
+                       +          ra[iR] * a_as[iAp1]
+                       +                   a_as[iA]   * pb[iP1 - pbOffset];
 
          iP1 = iP + zOffsetP - yOffsetP - xOffsetP;
-         rap_asw[iAc] = ra[iR] * a_csw[iAp1] * pb[iP1-pbOffset]
-            +           ra[iR] * a_asw[iAp1]
-            +                    a_asw[iA]   * pb[iP1-pbOffset];
+         rap_asw[iAc] = ra[iR] * a_csw[iAp1] * pb[iP1 - pbOffset]
+                        +           ra[iR] * a_asw[iAp1]
+                        +                    a_asw[iA]   * pb[iP1 - pbOffset];
 
 
          iP1 = iP + yOffsetP + xOffsetP;
          rap_cne[iAc] =         a_cne[iA]
-            +          rb[iR-rbOffset] * a_cne[iAm1] * pb[iP1-pbOffset]
-            +          ra[iR] * a_cne[iAp1] * pa[iP1]
-            +                   a_bne[iA]   * pb[iP1-pbOffset]
-            +                   a_ane[iA]   * pa[iP1]
-            +          rb[iR-rbOffset] * a_ane[iAm1]
-            +          ra[iR] * a_bne[iAp1];
+                                +          rb[iR - rbOffset] * a_cne[iAm1] * pb[iP1 - pbOffset]
+                                +          ra[iR] * a_cne[iAp1] * pa[iP1]
+                                +                   a_bne[iA]   * pb[iP1 - pbOffset]
+                                +                   a_ane[iA]   * pa[iP1]
+                                +          rb[iR - rbOffset] * a_ane[iAm1]
+                                +          ra[iR] * a_bne[iAp1];
 
          iP1 = iP + yOffsetP;
          rap_cn[iAc] =          a_cn[iA]
-            +          rb[iR-rbOffset] * a_cn[iAm1] * pb[iP1-pbOffset]
-            +          ra[iR] * a_cn[iAp1] * pa[iP1]
-            +                   a_bn[iA]   * pb[iP1-pbOffset]
-            +                   a_an[iA]   * pa[iP1]
-            +          rb[iR-rbOffset] * a_an[iAm1]
-            +          ra[iR] * a_bn[iAp1];
+                                +          rb[iR - rbOffset] * a_cn[iAm1] * pb[iP1 - pbOffset]
+                                +          ra[iR] * a_cn[iAp1] * pa[iP1]
+                                +                   a_bn[iA]   * pb[iP1 - pbOffset]
+                                +                   a_an[iA]   * pa[iP1]
+                                +          rb[iR - rbOffset] * a_an[iAm1]
+                                +          ra[iR] * a_bn[iAp1];
 
          iP1 = iP + yOffsetP - xOffsetP;
          rap_cnw[iAc] =         a_cnw[iA]
-            +          rb[iR-rbOffset] * a_cnw[iAm1] * pb[iP1-pbOffset]
-            +          ra[iR] * a_cnw[iAp1] * pa[iP1]
-            +                   a_bnw[iA]   * pb[iP1-pbOffset]
-            +                   a_anw[iA]   * pa[iP1]
-            +          rb[iR-rbOffset] * a_anw[iAm1]
-            +          ra[iR] * a_bnw[iAp1];
+                                +          rb[iR - rbOffset] * a_cnw[iAm1] * pb[iP1 - pbOffset]
+                                +          ra[iR] * a_cnw[iAp1] * pa[iP1]
+                                +                   a_bnw[iA]   * pb[iP1 - pbOffset]
+                                +                   a_anw[iA]   * pa[iP1]
+                                +          rb[iR - rbOffset] * a_anw[iAm1]
+                                +          ra[iR] * a_bnw[iAp1];
 
          iP1 = iP + xOffsetP;
          rap_ce[iAc] =          a_ce[iA]
-            +          rb[iR-rbOffset] * a_ce[iAm1] * pb[iP1-pbOffset]
-            +          ra[iR] * a_ce[iAp1] * pa[iP1]
-            +                   a_be[iA]   * pb[iP1-pbOffset]
-            +                   a_ae[iA]   * pa[iP1]
-            +          rb[iR-rbOffset] * a_ae[iAm1]
-            +          ra[iR] * a_be[iAp1];
+                                +          rb[iR - rbOffset] * a_ce[iAm1] * pb[iP1 - pbOffset]
+                                +          ra[iR] * a_ce[iAp1] * pa[iP1]
+                                +                   a_be[iA]   * pb[iP1 - pbOffset]
+                                +                   a_ae[iA]   * pa[iP1]
+                                +          rb[iR - rbOffset] * a_ae[iAm1]
+                                +          ra[iR] * a_be[iAp1];
 
       }
       hypre_BoxLoop4End(iP, iR, iA, iAc);
@@ -5150,85 +5153,85 @@ hypre_PFMG3BuildRAPNoSym_onebox_FSS27_CC0(
          HYPRE_Int iAp1 = iA + zOffsetA_diag;
 
          HYPRE_Int iP1 = iP + zOffsetP + yOffsetP + xOffsetP;
-         rap_ane[iAc] = ra[iR] * a_cne_offdp1 * pb[iP1-pbOffset]
-            +           ra[iR] * a_ane_offdp1
-            +                    a_ane_offd   * pb[iP1-pbOffset];
+         rap_ane[iAc] = ra[iR] * a_cne_offdp1 * pb[iP1 - pbOffset]
+                        +           ra[iR] * a_ane_offdp1
+                        +                    a_ane_offd   * pb[iP1 - pbOffset];
 
          iP1 = iP + zOffsetP + yOffsetP;
-         rap_an[iAc] = ra[iR] * a_cn_offdp1 * pb[iP1-pbOffset]
-            +          ra[iR] * a_an_offdp1
-            +                   a_an_offd   * pb[iP1-pbOffset];
+         rap_an[iAc] = ra[iR] * a_cn_offdp1 * pb[iP1 - pbOffset]
+                       +          ra[iR] * a_an_offdp1
+                       +                   a_an_offd   * pb[iP1 - pbOffset];
 
          iP1 = iP + zOffsetP + yOffsetP - xOffsetP;
-         rap_anw[iAc] = ra[iR] * a_cnw_offdp1 * pb[iP1-pbOffset]
-            +           ra[iR] * a_anw_offdp1
-            +                    a_anw_offd   * pb[iP1-pbOffset];
+         rap_anw[iAc] = ra[iR] * a_cnw_offdp1 * pb[iP1 - pbOffset]
+                        +           ra[iR] * a_anw_offdp1
+                        +                    a_anw_offd   * pb[iP1 - pbOffset];
 
          iP1 = iP + zOffsetP + xOffsetP;
-         rap_ae[iAc] = ra[iR] * a_ce_offdp1 * pb[iP1-pbOffset]
-            +          ra[iR] * a_ae_offdp1
-            +                   a_ae_offd   * pb[iP1-pbOffset];
+         rap_ae[iAc] = ra[iR] * a_ce_offdp1 * pb[iP1 - pbOffset]
+                       +          ra[iR] * a_ae_offdp1
+                       +                   a_ae_offd   * pb[iP1 - pbOffset];
 
          iP1 = iP + zOffsetP;
-         rap_ac[iAc] =          a_ac_offd   * pb[iP1-pbOffset]
-            +          ra[iR] * a_cc[iAp1] * pb[iP1-pbOffset]
-            +          ra[iR] * a_ac_offdp1;
+         rap_ac[iAc] =          a_ac_offd   * pb[iP1 - pbOffset]
+                                +          ra[iR] * a_cc[iAp1] * pb[iP1 - pbOffset]
+                                +          ra[iR] * a_ac_offdp1;
 
          iP1 = iP + zOffsetP - xOffsetP;
-         rap_aw[iAc] = ra[iR] * a_cw_offdp1 * pb[iP1-pbOffset]
-            +          ra[iR] * a_aw_offdp1
-            +                   a_aw_offd   * pb[iP1-pbOffset];
+         rap_aw[iAc] = ra[iR] * a_cw_offdp1 * pb[iP1 - pbOffset]
+                       +          ra[iR] * a_aw_offdp1
+                       +                   a_aw_offd   * pb[iP1 - pbOffset];
 
          iP1 = iP + zOffsetP - yOffsetP + xOffsetP;
-         rap_ase[iAc] = ra[iR] * a_cse_offdp1 * pb[iP1-pbOffset]
-            +           ra[iR] * a_ase_offdp1
-            +                    a_ase_offd   * pb[iP1-pbOffset];
+         rap_ase[iAc] = ra[iR] * a_cse_offdp1 * pb[iP1 - pbOffset]
+                        +           ra[iR] * a_ase_offdp1
+                        +                    a_ase_offd   * pb[iP1 - pbOffset];
 
          iP1 = iP + zOffsetP - yOffsetP;
-         rap_as[iAc] = ra[iR] * a_cs_offdp1 * pb[iP1-pbOffset]
-            +          ra[iR] * a_as_offdp1
-            +                   a_as_offd   * pb[iP1-pbOffset];
+         rap_as[iAc] = ra[iR] * a_cs_offdp1 * pb[iP1 - pbOffset]
+                       +          ra[iR] * a_as_offdp1
+                       +                   a_as_offd   * pb[iP1 - pbOffset];
 
          iP1 = iP + zOffsetP - yOffsetP - xOffsetP;
-         rap_asw[iAc] = ra[iR] * a_csw_offdp1 * pb[iP1-pbOffset]
-            +           ra[iR] * a_asw_offdp1
-            +                    a_asw_offd   * pb[iP1-pbOffset];
+         rap_asw[iAc] = ra[iR] * a_csw_offdp1 * pb[iP1 - pbOffset]
+                        +           ra[iR] * a_asw_offdp1
+                        +                    a_asw_offd   * pb[iP1 - pbOffset];
 
          iP1 = iP + yOffsetP + xOffsetP;
          rap_cne[iAc] =         a_cne_offd
-            +          rb[iR-rbOffset] * a_cne_offdm1 * pb[iP1-pbOffset]
-            +          ra[iR] * a_cne_offdp1 * pa[iP1]
-            +                   a_bne_offd   * pb[iP1-pbOffset]
-            +                   a_ane_offd   * pa[iP1]
-            +          rb[iR-rbOffset] * a_ane_offdm1
-            +          ra[iR] * a_bne_offdp1;
+                                +          rb[iR - rbOffset] * a_cne_offdm1 * pb[iP1 - pbOffset]
+                                +          ra[iR] * a_cne_offdp1 * pa[iP1]
+                                +                   a_bne_offd   * pb[iP1 - pbOffset]
+                                +                   a_ane_offd   * pa[iP1]
+                                +          rb[iR - rbOffset] * a_ane_offdm1
+                                +          ra[iR] * a_bne_offdp1;
 
          iP1 = iP + yOffsetP;
          rap_cn[iAc] =          a_cn_offd
-            +          rb[iR-rbOffset] * a_cn_offdm1 * pb[iP1-pbOffset]
-            +          ra[iR] * a_cn_offdp1 * pa[iP1]
-            +                   a_bn_offd   * pb[iP1-pbOffset]
-            +                   a_an_offd   * pa[iP1]
-            +          rb[iR-rbOffset] * a_an_offdm1
-            +          ra[iR] * a_bn_offdp1;
+                                +          rb[iR - rbOffset] * a_cn_offdm1 * pb[iP1 - pbOffset]
+                                +          ra[iR] * a_cn_offdp1 * pa[iP1]
+                                +                   a_bn_offd   * pb[iP1 - pbOffset]
+                                +                   a_an_offd   * pa[iP1]
+                                +          rb[iR - rbOffset] * a_an_offdm1
+                                +          ra[iR] * a_bn_offdp1;
 
          iP1 = iP + yOffsetP - xOffsetP;
          rap_cnw[iAc] =         a_cnw_offd
-            +          rb[iR-rbOffset] * a_cnw_offdm1 * pb[iP1-pbOffset]
-            +          ra[iR] * a_cnw_offdp1 * pa[iP1]
-            +                   a_bnw_offd   * pb[iP1-pbOffset]
-            +                   a_anw_offd   * pa[iP1]
-            +          rb[iR-rbOffset] * a_anw_offdm1
-            +          ra[iR] * a_bnw_offdp1;
+                                +          rb[iR - rbOffset] * a_cnw_offdm1 * pb[iP1 - pbOffset]
+                                +          ra[iR] * a_cnw_offdp1 * pa[iP1]
+                                +                   a_bnw_offd   * pb[iP1 - pbOffset]
+                                +                   a_anw_offd   * pa[iP1]
+                                +          rb[iR - rbOffset] * a_anw_offdm1
+                                +          ra[iR] * a_bnw_offdp1;
 
          iP1 = iP + xOffsetP;
          rap_ce[iAc] =          a_ce_offd
-            +          rb[iR-rbOffset] * a_ce_offdm1 * pb[iP1-pbOffset]
-            +          ra[iR] * a_ce_offdp1 * pa[iP1]
-            +                   a_be_offd   * pb[iP1-pbOffset]
-            +                   a_ae_offd   * pa[iP1]
-            +          rb[iR-rbOffset] * a_ae_offdm1
-            +          ra[iR] * a_be_offdp1;
+                                +          rb[iR - rbOffset] * a_ce_offdm1 * pb[iP1 - pbOffset]
+                                +          ra[iR] * a_ce_offdp1 * pa[iP1]
+                                +                   a_be_offd   * pb[iP1 - pbOffset]
+                                +                   a_ae_offd   * pa[iP1]
+                                +          rb[iR - rbOffset] * a_ae_offdm1
+                                +          ra[iR] * a_be_offdp1;
 
       }
       hypre_BoxLoop4End(iP, iR, iA, iAc);
@@ -5300,11 +5303,11 @@ hypre_PFMG3BuildRAPNoSym_onebox_FSS27_CC1(
     * pb is pointer for weight for f-point below c-point
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,-1);
+   hypre_SetIndex3(index_temp, 0, 0, -1);
    MapIndex(index_temp, cdir, index);
    pa = hypre_StructMatrixExtractPointerByIndex(P, fi, index);
 
-   hypre_SetIndex3(index_temp,0,0,1);
+   hypre_SetIndex3(index_temp, 0, 0, 1);
    MapIndex(index_temp, cdir, index);
 
    pb = hypre_StructMatrixExtractPointerByIndex(P, fi, index);
@@ -5315,11 +5318,11 @@ hypre_PFMG3BuildRAPNoSym_onebox_FSS27_CC1(
     * rb is pointer for weight for f-point below c-point
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,-1);
+   hypre_SetIndex3(index_temp, 0, 0, -1);
    MapIndex(index_temp, cdir, index);
    ra = hypre_StructMatrixExtractPointerByIndex(R, fi, index);
 
-   hypre_SetIndex3(index_temp,0,0,1);
+   hypre_SetIndex3(index_temp, 0, 0, 1);
    MapIndex(index_temp, cdir, index);
 
    rb = hypre_StructMatrixExtractPointerByIndex(R, fi, index);
@@ -5336,27 +5339,27 @@ hypre_PFMG3BuildRAPNoSym_onebox_FSS27_CC1(
     * a_bc is pointer for center coefficient in plane below
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,0);
+   hypre_SetIndex3(index_temp, 0, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_cc = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,-1,0,0);
+   hypre_SetIndex3(index_temp, -1, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_cw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,0,0);
+   hypre_SetIndex3(index_temp, 1, 0, 0);
    MapIndex(index_temp, cdir, index);
    a_ce = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,-1,0);
+   hypre_SetIndex3(index_temp, 0, -1, 0);
    MapIndex(index_temp, cdir, index);
    a_cs = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
    a_cn = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,0,1);
+   hypre_SetIndex3(index_temp, 0, 0, 1);
    MapIndex(index_temp, cdir, index);
    a_ac = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
@@ -5377,43 +5380,43 @@ hypre_PFMG3BuildRAPNoSym_onebox_FSS27_CC1(
     * a_cne is pointer for northeast coefficient in same plane
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,-1,0,1);
+   hypre_SetIndex3(index_temp, -1, 0, 1);
    MapIndex(index_temp, cdir, index);
    a_aw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,0,1);
+   hypre_SetIndex3(index_temp, 1, 0, 1);
    MapIndex(index_temp, cdir, index);
    a_ae = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,-1,1);
+   hypre_SetIndex3(index_temp, 0, -1, 1);
    MapIndex(index_temp, cdir, index);
    a_as = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,1,1);
+   hypre_SetIndex3(index_temp, 0, 1, 1);
    MapIndex(index_temp, cdir, index);
    a_an = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,0,-1);
+   hypre_SetIndex3(index_temp, 1, 0, -1);
    MapIndex(index_temp, cdir, index);
    a_be = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,0,1,-1);
+   hypre_SetIndex3(index_temp, 0, 1, -1);
    MapIndex(index_temp, cdir, index);
    a_bn = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,-1,-1,0);
+   hypre_SetIndex3(index_temp, -1, -1, 0);
    MapIndex(index_temp, cdir, index);
    a_csw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,-1,0);
+   hypre_SetIndex3(index_temp, 1, -1, 0);
    MapIndex(index_temp, cdir, index);
    a_cse = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,-1,1,0);
+   hypre_SetIndex3(index_temp, -1, 1, 0);
    MapIndex(index_temp, cdir, index);
    a_cnw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,1,0);
+   hypre_SetIndex3(index_temp, 1, 1, 0);
    MapIndex(index_temp, cdir, index);
    a_cne = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
@@ -5430,27 +5433,27 @@ hypre_PFMG3BuildRAPNoSym_onebox_FSS27_CC1(
     * a_bne is pointer for northeast coefficient in plane below
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,-1,-1,1);
+   hypre_SetIndex3(index_temp, -1, -1, 1);
    MapIndex(index_temp, cdir, index);
    a_asw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,-1,1);
+   hypre_SetIndex3(index_temp, 1, -1, 1);
    MapIndex(index_temp, cdir, index);
    a_ase = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,-1,1,1);
+   hypre_SetIndex3(index_temp, -1, 1, 1);
    MapIndex(index_temp, cdir, index);
    a_anw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,1,1);
+   hypre_SetIndex3(index_temp, 1, 1, 1);
    MapIndex(index_temp, cdir, index);
    a_ane = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,-1,1,-1);
+   hypre_SetIndex3(index_temp, -1, 1, -1);
    MapIndex(index_temp, cdir, index);
    a_bnw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-   hypre_SetIndex3(index_temp,1,1,-1);
+   hypre_SetIndex3(index_temp, 1, 1, -1);
    MapIndex(index_temp, cdir, index);
    a_bne = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
@@ -5462,39 +5465,39 @@ hypre_PFMG3BuildRAPNoSym_onebox_FSS27_CC1(
     * rap_ce is pointer for east coefficient in same plane (etc.)
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,1,0,0);
+   hypre_SetIndex3(index_temp, 1, 0, 0);
    MapIndex(index_temp, cdir, index);
    rap_ce = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
    rap_cn = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,0,0,1);
+   hypre_SetIndex3(index_temp, 0, 0, 1);
    MapIndex(index_temp, cdir, index);
    rap_ac = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,-1,0,1);
+   hypre_SetIndex3(index_temp, -1, 0, 1);
    MapIndex(index_temp, cdir, index);
    rap_aw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,1,0,1);
+   hypre_SetIndex3(index_temp, 1, 0, 1);
    MapIndex(index_temp, cdir, index);
    rap_ae = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,0,-1,1);
+   hypre_SetIndex3(index_temp, 0, -1, 1);
    MapIndex(index_temp, cdir, index);
    rap_as = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,0,1,1);
+   hypre_SetIndex3(index_temp, 0, 1, 1);
    MapIndex(index_temp, cdir, index);
    rap_an = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,-1,1,0);
+   hypre_SetIndex3(index_temp, -1, 1, 0);
    MapIndex(index_temp, cdir, index);
    rap_cnw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,1,1,0);
+   hypre_SetIndex3(index_temp, 1, 1, 0);
    MapIndex(index_temp, cdir, index);
    rap_cne = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
@@ -5509,19 +5512,19 @@ hypre_PFMG3BuildRAPNoSym_onebox_FSS27_CC1(
     * rap_cnw is pointer for northwest coefficient in same plane (etc.)
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,-1,-1,1);
+   hypre_SetIndex3(index_temp, -1, -1, 1);
    MapIndex(index_temp, cdir, index);
    rap_asw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,1,-1,1);
+   hypre_SetIndex3(index_temp, 1, -1, 1);
    MapIndex(index_temp, cdir, index);
    rap_ase = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,-1,1,1);
+   hypre_SetIndex3(index_temp, -1, 1, 1);
    MapIndex(index_temp, cdir, index);
    rap_anw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-   hypre_SetIndex3(index_temp,1,1,1);
+   hypre_SetIndex3(index_temp, 1, 1, 1);
    MapIndex(index_temp, cdir, index);
    rap_ane = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
@@ -5533,18 +5536,18 @@ hypre_PFMG3BuildRAPNoSym_onebox_FSS27_CC1(
     * Offsets are used in refering to data associated with other points.
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index_temp,0,0,1);
+   hypre_SetIndex3(index_temp, 0, 0, 1);
    MapIndex(index_temp, cdir, index);
 
    zOffsetA = 0;
    zOffsetP = 0;
 
-   hypre_SetIndex3(index_temp,0,1,0);
+   hypre_SetIndex3(index_temp, 0, 1, 0);
    MapIndex(index_temp, cdir, index);
 
    yOffsetP = 0;
 
-   hypre_SetIndex3(index_temp,1,0,0);
+   hypre_SetIndex3(index_temp, 1, 0, 0);
    MapIndex(index_temp, cdir, index);
 
    xOffsetP = 0;
@@ -5573,88 +5576,88 @@ hypre_PFMG3BuildRAPNoSym_onebox_FSS27_CC1(
 
    iP1 = iP + zOffsetP + yOffsetP + xOffsetP;
    rap_ane[iAc] = ra[iR] * a_cne[iAp1] * pb[iP1]
-      +           ra[iR] * a_ane[iAp1]
-      +                    a_ane[iA]   * pb[iP1];
+                  +           ra[iR] * a_ane[iAp1]
+                  +                    a_ane[iA]   * pb[iP1];
 
    iP1 = iP + zOffsetP + yOffsetP;
    rap_an[iAc] = ra[iR] * a_cn[iAp1] * pb[iP1]
-      +          ra[iR] * a_an[iAp1]
-      +                   a_an[iA]   * pb[iP1];
+                 +          ra[iR] * a_an[iAp1]
+                 +                   a_an[iA]   * pb[iP1];
 
    iP1 = iP + zOffsetP + yOffsetP - xOffsetP;
    rap_anw[iAc] = ra[iR] * a_cnw[iAp1] * pb[iP1]
-      +           ra[iR] * a_anw[iAp1]
-      +                    a_anw[iA]   * pb[iP1];
+                  +           ra[iR] * a_anw[iAp1]
+                  +                    a_anw[iA]   * pb[iP1];
 
    iP1 = iP + zOffsetP + xOffsetP;
    rap_ae[iAc] = ra[iR] * a_ce[iAp1] * pb[iP1]
-      +          ra[iR] * a_ae[iAp1]
-      +                   a_ae[iA]   * pb[iP1];
+                 +          ra[iR] * a_ae[iAp1]
+                 +                   a_ae[iA]   * pb[iP1];
 
    iP1 = iP + zOffsetP;
    rap_ac[iAc] =          a_ac[iA]   * pb[iP1]
-      +          ra[iR] * a_cc[iAp1] * pb[iP1]
-      +          ra[iR] * a_ac[iAp1];
+                          +          ra[iR] * a_cc[iAp1] * pb[iP1]
+                          +          ra[iR] * a_ac[iAp1];
 
    iP1 = iP + zOffsetP - xOffsetP;
    rap_aw[iAc] = ra[iR] * a_cw[iAp1] * pb[iP1]
-      +          ra[iR] * a_aw[iAp1]
-      +                   a_aw[iA]   * pb[iP1];
+                 +          ra[iR] * a_aw[iAp1]
+                 +                   a_aw[iA]   * pb[iP1];
 
    iP1 = iP + zOffsetP - yOffsetP + xOffsetP;
    rap_ase[iAc] = ra[iR] * a_cse[iAp1] * pb[iP1]
-      +           ra[iR] * a_ase[iAp1]
-      +                    a_ase[iA]   * pb[iP1];
+                  +           ra[iR] * a_ase[iAp1]
+                  +                    a_ase[iA]   * pb[iP1];
 
    iP1 = iP + zOffsetP - yOffsetP;
    rap_as[iAc] = ra[iR] * a_cs[iAp1] * pb[iP1]
-      +          ra[iR] * a_as[iAp1]
-      +                   a_as[iA]   * pb[iP1];
+                 +          ra[iR] * a_as[iAp1]
+                 +                   a_as[iA]   * pb[iP1];
 
    iP1 = iP + zOffsetP - yOffsetP - xOffsetP;
    rap_asw[iAc] = ra[iR] * a_csw[iAp1] * pb[iP1]
-      +           ra[iR] * a_asw[iAp1]
-      +                    a_asw[iA]   * pb[iP1];
+                  +           ra[iR] * a_asw[iAp1]
+                  +                    a_asw[iA]   * pb[iP1];
 
 
    iP1 = iP + yOffsetP + xOffsetP;
    rap_cne[iAc] =         a_cne[iA]
-      +          rb[iR] * a_cne[iAm1] * pb[iP1]
-      +          ra[iR] * a_cne[iAp1] * pa[iP1]
-      +                   a_bne[iA]   * pb[iP1]
-      +                   a_ane[iA]   * pa[iP1]
-      +          rb[iR] * a_ane[iAm1]
-      +          ra[iR] * a_bne[iAp1];
+                          +          rb[iR] * a_cne[iAm1] * pb[iP1]
+                          +          ra[iR] * a_cne[iAp1] * pa[iP1]
+                          +                   a_bne[iA]   * pb[iP1]
+                          +                   a_ane[iA]   * pa[iP1]
+                          +          rb[iR] * a_ane[iAm1]
+                          +          ra[iR] * a_bne[iAp1];
 
    iP1 = iP + yOffsetP;
    rap_cn[iAc] =          a_cn[iA]
-      +          rb[iR] * a_cn[iAm1] * pb[iP1]
-      +          ra[iR] * a_cn[iAp1] * pa[iP1]
-      +                   a_bn[iA]   * pb[iP1]
-      +                   a_an[iA]   * pa[iP1]
-      +          rb[iR] * a_an[iAm1]
-      +          ra[iR] * a_bn[iAp1];
+                          +          rb[iR] * a_cn[iAm1] * pb[iP1]
+                          +          ra[iR] * a_cn[iAp1] * pa[iP1]
+                          +                   a_bn[iA]   * pb[iP1]
+                          +                   a_an[iA]   * pa[iP1]
+                          +          rb[iR] * a_an[iAm1]
+                          +          ra[iR] * a_bn[iAp1];
 
    iP1 = iP + yOffsetP - xOffsetP;
    rap_cnw[iAc] =         a_cnw[iA]
-      +          rb[iR] * a_cnw[iAm1] * pb[iP1]
-      +          ra[iR] * a_cnw[iAp1] * pa[iP1]
-      +                   a_bnw[iA]   * pb[iP1]
-      +                   a_anw[iA]   * pa[iP1]
-      +          rb[iR] * a_anw[iAm1]
-      +          ra[iR] * a_bnw[iAp1];
+                          +          rb[iR] * a_cnw[iAm1] * pb[iP1]
+                          +          ra[iR] * a_cnw[iAp1] * pa[iP1]
+                          +                   a_bnw[iA]   * pb[iP1]
+                          +                   a_anw[iA]   * pa[iP1]
+                          +          rb[iR] * a_anw[iAm1]
+                          +          ra[iR] * a_bnw[iAp1];
 
    iP1 = iP + xOffsetP;
    rap_ce[iAc] =          a_ce[iA]
-      +          rb[iR] * a_ce[iAm1] * pb[iP1]
-      +          ra[iR] * a_ce[iAp1] * pa[iP1]
-      +                   a_be[iA]   * pb[iP1]
-      +                   a_ae[iA]   * pa[iP1]
-      +          rb[iR] * a_ae[iAm1]
-      +          ra[iR] * a_be[iAp1];
+                          +          rb[iR] * a_ce[iAm1] * pb[iP1]
+                          +          ra[iR] * a_ce[iAp1] * pa[iP1]
+                          +                   a_be[iA]   * pb[iP1]
+                          +                   a_ae[iA]   * pa[iP1]
+                          +          rb[iR] * a_ae[iAm1]
+                          +          ra[iR] * a_be[iAp1];
 
 
-/*      }*/ /* end ForBoxI */
+   /*      }*/ /* end ForBoxI */
 
    return hypre_error_flag;
 }
diff --git a/external/hypre/src/struct_ls/pfmg_relax.c b/external/hypre/src/struct_ls/pfmg_relax.c
index a75f10a8..04394a31 100644
--- a/external/hypre/src/struct_ls/pfmg_relax.c
+++ b/external/hypre/src/struct_ls/pfmg_relax.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -42,7 +42,7 @@ hypre_PFMGRelaxCreate( MPI_Comm  comm )
 HYPRE_Int
 hypre_PFMGRelaxDestroy( void *pfmg_relax_vdata )
 {
-	hypre_PFMGRelaxData *pfmg_relax_data = (hypre_PFMGRelaxData *)pfmg_relax_vdata;
+   hypre_PFMGRelaxData *pfmg_relax_data = (hypre_PFMGRelaxData *)pfmg_relax_vdata;
 
    if (pfmg_relax_data)
    {
@@ -65,9 +65,9 @@ hypre_PFMGRelax( void               *pfmg_relax_vdata,
 {
    hypre_PFMGRelaxData *pfmg_relax_data = (hypre_PFMGRelaxData *)pfmg_relax_vdata;
    HYPRE_Int    relax_type = (pfmg_relax_data -> relax_type);
-   HYPRE_Int    constant_coefficient= hypre_StructMatrixConstantCoefficient(A);
+   HYPRE_Int    constant_coefficient = hypre_StructMatrixConstantCoefficient(A);
 
-   switch(relax_type)
+   switch (relax_type)
    {
       case 0:
       case 1:
@@ -77,14 +77,14 @@ hypre_PFMGRelax( void               *pfmg_relax_vdata,
       case 3:
          if (constant_coefficient)
          {
-            hypre_RedBlackConstantCoefGS((pfmg_relax_data -> rb_relax_data), 
+            hypre_RedBlackConstantCoefGS((pfmg_relax_data -> rb_relax_data),
                                          A, b, x);
          }
          else
          {
             hypre_RedBlackGS((pfmg_relax_data -> rb_relax_data), A, b, x);
          }
-          
+
          break;
    }
 
@@ -102,9 +102,9 @@ hypre_PFMGRelaxSetup( void               *pfmg_relax_vdata,
 {
    hypre_PFMGRelaxData *pfmg_relax_data  = (hypre_PFMGRelaxData *)pfmg_relax_vdata;
    HYPRE_Int            relax_type       = (pfmg_relax_data -> relax_type);
-   HYPRE_Real           jacobi_weight    = (pfmg_relax_data -> jacobi_weight); 
+   HYPRE_Real           jacobi_weight    = (pfmg_relax_data -> jacobi_weight);
 
-   switch(relax_type)
+   switch (relax_type)
    {
       case 0:
       case 1:
@@ -116,11 +116,11 @@ hypre_PFMGRelaxSetup( void               *pfmg_relax_vdata,
          break;
    }
 
-   if (relax_type==1)
+   if (relax_type == 1)
    {
       hypre_PointRelaxSetWeight(pfmg_relax_data -> relax_data, jacobi_weight);
    }
-   
+
    return hypre_error_flag;
 }
 
@@ -136,7 +136,7 @@ hypre_PFMGRelaxSetType( void  *pfmg_relax_vdata,
 
    (pfmg_relax_data -> relax_type) = relax_type;
 
-   switch(relax_type)
+   switch (relax_type)
    {
       case 0: /* Jacobi */
       {
@@ -165,7 +165,7 @@ hypre_PFMGRelaxSetType( void  *pfmg_relax_vdata,
 
 HYPRE_Int
 hypre_PFMGRelaxSetJacobiWeight(void  *pfmg_relax_vdata,
-                               HYPRE_Real weight) 
+                               HYPRE_Real weight)
 {
    hypre_PFMGRelaxData *pfmg_relax_data = (hypre_PFMGRelaxData *)pfmg_relax_vdata;
 
@@ -183,7 +183,7 @@ hypre_PFMGRelaxSetPreRelax( void  *pfmg_relax_vdata )
    hypre_PFMGRelaxData *pfmg_relax_data = (hypre_PFMGRelaxData *)pfmg_relax_vdata;
    HYPRE_Int            relax_type = (pfmg_relax_data -> relax_type);
 
-   switch(relax_type)
+   switch (relax_type)
    {
       case 1: /* Weighted Jacobi */
       case 0: /* Jacobi */
@@ -210,7 +210,7 @@ hypre_PFMGRelaxSetPostRelax( void  *pfmg_relax_vdata )
    hypre_PFMGRelaxData *pfmg_relax_data = (hypre_PFMGRelaxData *)pfmg_relax_vdata;
    HYPRE_Int            relax_type = (pfmg_relax_data -> relax_type);
 
-   switch(relax_type)
+   switch (relax_type)
    {
       case 1: /* Weighted Jacobi */
       case 0: /* Jacobi */
diff --git a/external/hypre/src/struct_ls/pfmg_setup.c b/external/hypre/src/struct_ls/pfmg_setup.c
index b3db006d..f6384d98 100644
--- a/external/hypre/src/struct_ls/pfmg_setup.c
+++ b/external/hypre/src/struct_ls/pfmg_setup.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -70,7 +70,7 @@ hypre_PFMGSetup( void               *pfmg_vdata,
    MPI_Comm              comm = (pfmg_data -> comm);
 
    HYPRE_Int             relax_type =       (pfmg_data -> relax_type);
-   HYPRE_Int             usr_jacobi_weight= (pfmg_data -> usr_jacobi_weight);
+   HYPRE_Int             usr_jacobi_weight = (pfmg_data -> usr_jacobi_weight);
    HYPRE_Real            jacobi_weight    = (pfmg_data -> jacobi_weight);
    HYPRE_Int             skip_relax =       (pfmg_data -> skip_relax);
    HYPRE_Real           *dxyz       =       (pfmg_data -> dxyz);
@@ -129,19 +129,12 @@ hypre_PFMGSetup( void               *pfmg_vdata,
    HYPRE_Int             b_num_ghost[]  = {0, 0, 0, 0, 0, 0};
    HYPRE_Int             x_num_ghost[]  = {1, 1, 1, 1, 1, 1};
 
-#if 0 //defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-   HYPRE_Int             num_level_GPU = 0;
-   HYPRE_MemoryLocation  data_location = HYPRE_MEMORY_DEVICE;
-   HYPRE_Int             max_box_size  = 0;
-   HYPRE_Int             device_level  = (pfmg_data -> devicelevel);
-   HYPRE_Int             myrank;
-   hypre_MPI_Comm_rank(comm, &myrank );
-#endif
-
 #if DEBUG
    char                  filename[255];
 #endif
 
+   HYPRE_MemoryLocation  memory_location = hypre_StructMatrixMemoryLocation(A);
+
    HYPRE_ANNOTATE_FUNC_BEGIN;
 
    /*-----------------------------------------------------
@@ -184,8 +177,8 @@ hypre_PFMGSetup( void               *pfmg_vdata,
           * the squares of the coefficients stored in 'deviation'.  Care is
           * taken to avoid dividing by zero when the mean is zero. */
 
-         deviation[d] -= mean[d]*mean[d];
-         if ( deviation[d] > 0.1*(mean[d]*mean[d]) )
+         deviation[d] -= mean[d] * mean[d];
+         if ( deviation[d] > 0.1 * (mean[d]*mean[d]) )
          {
             dxyz_flag = 1;
             break;
@@ -232,7 +225,7 @@ hypre_PFMGSetup( void               *pfmg_vdata,
             min_dxyz = dxyz[d];
             cdir = d;
          }
-         alpha += 1.0/(dxyz[d]*dxyz[d]);
+         alpha += 1.0 / (dxyz[d] * dxyz[d]);
       }
       relax_weights[l] = 1.0;
 
@@ -242,7 +235,7 @@ hypre_PFMGSetup( void               *pfmg_vdata,
       {
          if (dxyz_flag)
          {
-            relax_weights[l] = 2.0/3.0;
+            relax_weights[l] = 2.0 / 3.0;
          }
 
          else
@@ -251,7 +244,7 @@ hypre_PFMGSetup( void               *pfmg_vdata,
             {
                if (d != cdir)
                {
-                  beta += 1.0/(dxyz[d]*dxyz[d]);
+                  beta += 1.0 / (dxyz[d] * dxyz[d]);
                }
             }
             if (beta == alpha)
@@ -260,17 +253,17 @@ hypre_PFMGSetup( void               *pfmg_vdata,
             }
             else
             {
-               alpha = beta/alpha;
+               alpha = beta / alpha;
             }
 
             /* determine level Jacobi weights */
             if (ndim > 1)
             {
-               relax_weights[l] = 2.0/(3.0 - alpha);
+               relax_weights[l] = 2.0 / (3.0 - alpha);
             }
             else
             {
-               relax_weights[l] = 2.0/3.0; /* always 2/3 for 1-d */
+               relax_weights[l] = 2.0 / 3.0; /* always 2/3 for 1-d */
             }
          }
       }
@@ -333,29 +326,29 @@ hypre_PFMGSetup( void               *pfmg_vdata,
                                   hypre_BoxIMax(cbox));
 
       /* build the interpolation grid */
-      hypre_StructCoarsen(grid_l[l], findex, stride, 0, &P_grid_l[l+1]);
+      hypre_StructCoarsen(grid_l[l], findex, stride, 0, &P_grid_l[l + 1]);
 
       /* build the coarse grid */
-      hypre_StructCoarsen(grid_l[l], cindex, stride, 1, &grid_l[l+1]);
+      hypre_StructCoarsen(grid_l[l], cindex, stride, 1, &grid_l[l + 1]);
 #if 0 //defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-      hypre_StructGridDataLocation(P_grid_l[l+1]) = data_location;
+      hypre_StructGridDataLocation(P_grid_l[l + 1]) = data_location;
       if (device_level == -1 && num_level_GPU > 0)
       {
-         max_box_size = hypre_StructGridGetMaxBoxSize(grid_l[l+1]);
+         max_box_size = hypre_StructGridGetMaxBoxSize(grid_l[l + 1]);
          if (max_box_size < HYPRE_MIN_GPU_SIZE)
          {
-            num_level_GPU = l+1;
+            num_level_GPU = l + 1;
             data_location = HYPRE_MEMORY_HOST;
             device_level  = num_level_GPU;
             //printf("num_level_GPU = %d,device_level = %d / %d\n",num_level_GPU,device_level,num_levels);
          }
       }
-      else if (l+1 == device_level)
+      else if (l + 1 == device_level)
       {
-         num_level_GPU = l+1;
+         num_level_GPU = l + 1;
          data_location = HYPRE_MEMORY_HOST;
       }
-      hypre_StructGridDataLocation(grid_l[l+1]) = data_location;
+      hypre_StructGridDataLocation(grid_l[l + 1]) = data_location;
 #endif
    }
 
@@ -389,7 +382,7 @@ hypre_PFMGSetup( void               *pfmg_vdata,
     *-----------------------------------------------------*/
    if (relax_type == 2 || relax_type == 3)   /* red-black gs */
    {
-      (pfmg_data -> rap_type)= 1;
+      (pfmg_data -> rap_type) = 1;
    }
    rap_type = (pfmg_data -> rap_type);
 
@@ -416,7 +409,7 @@ hypre_PFMGSetup( void               *pfmg_vdata,
    {
       cdir = cdir_l[l];
 
-      P_l[l]  = hypre_PFMGCreateInterpOp(A_l[l], P_grid_l[l+1], cdir, rap_type);
+      P_l[l]  = hypre_PFMGCreateInterpOp(A_l[l], P_grid_l[l + 1], cdir, rap_type);
       hypre_StructMatrixInitializeShell(P_l[l]);
       data_size += hypre_StructMatrixDataSize(P_l[l]);
       data_size_const += hypre_StructMatrixDataConstSize(P_l[l]);
@@ -431,46 +424,47 @@ hypre_PFMGSetup( void               *pfmg_vdata,
 #if 0
          /* Allow RT != P for non symmetric case */
          /* NOTE: Need to create a non-pruned grid for this to work */
-         RT_l[l]   = hypre_PFMGCreateRestrictOp(A_l[l], grid_l[l+1], cdir);
+         RT_l[l]   = hypre_PFMGCreateRestrictOp(A_l[l], grid_l[l + 1], cdir);
          hypre_StructMatrixInitializeShell(RT_l[l]);
          data_size += hypre_StructMatrixDataSize(RT_l[l]);
          data_size_const += hypre_StructMatrixDataConstSize(RT_l[l]);
 #endif
       }
 
-      A_l[l+1] = hypre_PFMGCreateRAPOp(RT_l[l], A_l[l], P_l[l],
-                                       grid_l[l+1], cdir, rap_type);
-      hypre_StructMatrixInitializeShell(A_l[l+1]);
-      data_size += hypre_StructMatrixDataSize(A_l[l+1]);
-      data_size_const += hypre_StructMatrixDataConstSize(A_l[l+1]);
-
-      b_l[l+1] = hypre_StructVectorCreate(comm, grid_l[l+1]);
-      hypre_StructVectorSetNumGhost(b_l[l+1], b_num_ghost);
-      hypre_StructVectorInitializeShell(b_l[l+1]);
-      hypre_StructVectorSetDataSize(b_l[l+1], &data_size, &data_size_const);
-
-      x_l[l+1] = hypre_StructVectorCreate(comm, grid_l[l+1]);
-      hypre_StructVectorSetNumGhost(x_l[l+1], x_num_ghost);
-      hypre_StructVectorInitializeShell(x_l[l+1]);
-      hypre_StructVectorSetDataSize(x_l[l+1], &data_size, &data_size_const);
-
-      tx_l[l+1] = hypre_StructVectorCreate(comm, grid_l[l+1]);
-      hypre_StructVectorSetNumGhost(tx_l[l+1], x_num_ghost);
-      hypre_StructVectorInitializeShell(tx_l[l+1]);
+      A_l[l + 1] = hypre_PFMGCreateRAPOp(RT_l[l], A_l[l], P_l[l],
+                                         grid_l[l + 1], cdir, rap_type);
+      hypre_StructMatrixInitializeShell(A_l[l + 1]);
+      data_size += hypre_StructMatrixDataSize(A_l[l + 1]);
+      data_size_const += hypre_StructMatrixDataConstSize(A_l[l + 1]);
+
+      b_l[l + 1] = hypre_StructVectorCreate(comm, grid_l[l + 1]);
+      hypre_StructVectorSetNumGhost(b_l[l + 1], b_num_ghost);
+      hypre_StructVectorInitializeShell(b_l[l + 1]);
+      hypre_StructVectorSetDataSize(b_l[l + 1], &data_size, &data_size_const);
+
+      x_l[l + 1] = hypre_StructVectorCreate(comm, grid_l[l + 1]);
+      hypre_StructVectorSetNumGhost(x_l[l + 1], x_num_ghost);
+      hypre_StructVectorInitializeShell(x_l[l + 1]);
+      hypre_StructVectorSetDataSize(x_l[l + 1], &data_size, &data_size_const);
+
+      tx_l[l + 1] = hypre_StructVectorCreate(comm, grid_l[l + 1]);
+      hypre_StructVectorSetNumGhost(tx_l[l + 1], x_num_ghost);
+      hypre_StructVectorInitializeShell(tx_l[l + 1]);
 #if 0 //defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-      if (l+1 == num_level_GPU)
+      if (l + 1 == num_level_GPU)
       {
-         hypre_StructVectorSetDataSize(tx_l[l+1], &data_size, &data_size_const);
+         hypre_StructVectorSetDataSize(tx_l[l + 1], &data_size, &data_size_const);
       }
 #endif
    }
 
-   data = hypre_CTAlloc(HYPRE_Real, data_size, HYPRE_MEMORY_DEVICE);
+   data = hypre_CTAlloc(HYPRE_Real, data_size, memory_location);
    data_const = hypre_CTAlloc(HYPRE_Real, data_size_const, HYPRE_MEMORY_HOST);
 #if 0 //defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    //hypre_printf("num_level_GPU = %d,device_level = %d / %d\n",num_level_GPU,device_level,num_levels);
 #endif
 
+   (pfmg_data -> memory_location) = memory_location;
    (pfmg_data -> data) = data;
    (pfmg_data -> data_const) = data_const;
 
@@ -511,60 +505,60 @@ hypre_PFMGSetup( void               *pfmg_vdata,
 #endif
 
 #if 0 //defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-      if (l+1 == num_level_GPU)
+      if (l + 1 == num_level_GPU)
       {
          data_location = HYPRE_MEMORY_HOST;
       }
 #endif
 
-      hypre_StructMatrixInitializeData(A_l[l+1], data, data_const);
-      data += hypre_StructMatrixDataSize(A_l[l+1]);
-      data_const += hypre_StructMatrixDataConstSize(A_l[l+1]);
+      hypre_StructMatrixInitializeData(A_l[l + 1], data, data_const);
+      data += hypre_StructMatrixDataSize(A_l[l + 1]);
+      data_const += hypre_StructMatrixDataConstSize(A_l[l + 1]);
 
 #if 0 //defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
       if (data_location != HYPRE_MEMORY_HOST)
       {
-         hypre_StructVectorInitializeData(b_l[l+1], data);
-         hypre_StructVectorAssemble(b_l[l+1]);
-         data += hypre_StructVectorDataSize(b_l[l+1]);
-
-         hypre_StructVectorInitializeData(x_l[l+1], data);
-         hypre_StructVectorAssemble(x_l[l+1]);
-         data += hypre_StructVectorDataSize(x_l[l+1]);
-         hypre_StructVectorInitializeData(tx_l[l+1],
-               hypre_StructVectorData(tx_l[0]));
-         hypre_StructVectorAssemble(tx_l[l+1]);
+         hypre_StructVectorInitializeData(b_l[l + 1], data);
+         hypre_StructVectorAssemble(b_l[l + 1]);
+         data += hypre_StructVectorDataSize(b_l[l + 1]);
+
+         hypre_StructVectorInitializeData(x_l[l + 1], data);
+         hypre_StructVectorAssemble(x_l[l + 1]);
+         data += hypre_StructVectorDataSize(x_l[l + 1]);
+         hypre_StructVectorInitializeData(tx_l[l + 1],
+                                          hypre_StructVectorData(tx_l[0]));
+         hypre_StructVectorAssemble(tx_l[l + 1]);
       }
       else
       {
-         hypre_StructVectorInitializeData(b_l[l+1], data_const);
-         hypre_StructVectorAssemble(b_l[l+1]);
-         data_const += hypre_StructVectorDataSize(b_l[l+1]);
-
-         hypre_StructVectorInitializeData(x_l[l+1], data_const);
-         hypre_StructVectorAssemble(x_l[l+1]);
-         data_const += hypre_StructVectorDataSize(x_l[l+1]);
-         if (l+1 == num_level_GPU)
+         hypre_StructVectorInitializeData(b_l[l + 1], data_const);
+         hypre_StructVectorAssemble(b_l[l + 1]);
+         data_const += hypre_StructVectorDataSize(b_l[l + 1]);
+
+         hypre_StructVectorInitializeData(x_l[l + 1], data_const);
+         hypre_StructVectorAssemble(x_l[l + 1]);
+         data_const += hypre_StructVectorDataSize(x_l[l + 1]);
+         if (l + 1 == num_level_GPU)
          {
-            hypre_StructVectorInitializeData(tx_l[l+1], data_const);
-            hypre_StructVectorAssemble(tx_l[l+1]);
-            data_const += hypre_StructVectorDataSize(tx_l[l+1]);
+            hypre_StructVectorInitializeData(tx_l[l + 1], data_const);
+            hypre_StructVectorAssemble(tx_l[l + 1]);
+            data_const += hypre_StructVectorDataSize(tx_l[l + 1]);
          }
-         hypre_StructVectorInitializeData(tx_l[l+1], hypre_StructVectorData(tx_l[num_level_GPU]));
-         hypre_StructVectorAssemble(tx_l[l+1]);
+         hypre_StructVectorInitializeData(tx_l[l + 1], hypre_StructVectorData(tx_l[num_level_GPU]));
+         hypre_StructVectorAssemble(tx_l[l + 1]);
       }
 #else
-      hypre_StructVectorInitializeData(b_l[l+1], data);
-      hypre_StructVectorAssemble(b_l[l+1]);
-      data += hypre_StructVectorDataSize(b_l[l+1]);
+      hypre_StructVectorInitializeData(b_l[l + 1], data);
+      hypre_StructVectorAssemble(b_l[l + 1]);
+      data += hypre_StructVectorDataSize(b_l[l + 1]);
 
-      hypre_StructVectorInitializeData(x_l[l+1], data);
-      hypre_StructVectorAssemble(x_l[l+1]);
-      data += hypre_StructVectorDataSize(x_l[l+1]);
+      hypre_StructVectorInitializeData(x_l[l + 1], data);
+      hypre_StructVectorAssemble(x_l[l + 1]);
+      data += hypre_StructVectorDataSize(x_l[l + 1]);
 
-      hypre_StructVectorInitializeData(tx_l[l+1],
+      hypre_StructVectorInitializeData(tx_l[l + 1],
                                        hypre_StructVectorData(tx_l[0]));
-      hypre_StructVectorAssemble(tx_l[l+1]);
+      hypre_StructVectorAssemble(tx_l[l + 1]);
 #endif
    }
 
@@ -588,6 +582,7 @@ hypre_PFMGSetup( void               *pfmg_vdata,
 
    for (l = 0; l < (num_levels - 1); l++)
    {
+      HYPRE_ANNOTATE_MGLEVEL_BEGIN(l);
 #if 0 //defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
       if (l == num_level_GPU)
       {
@@ -613,17 +608,19 @@ hypre_PFMGSetup( void               *pfmg_vdata,
 
       /* set up the coarse grid operator */
       hypre_PFMGSetupRAPOp(RT_l[l], A_l[l], P_l[l],
-                           cdir, cindex, stride, rap_type, A_l[l+1]);
+                           cdir, cindex, stride, rap_type, A_l[l + 1]);
 
       /* set up the interpolation routine */
       interp_data_l[l] = hypre_SemiInterpCreate();
-      hypre_SemiInterpSetup(interp_data_l[l], P_l[l], 0, x_l[l+1], e_l[l],
+      hypre_SemiInterpSetup(interp_data_l[l], P_l[l], 0, x_l[l + 1], e_l[l],
                             cindex, findex, stride);
 
       /* set up the restriction routine */
       restrict_data_l[l] = hypre_SemiRestrictCreate();
-      hypre_SemiRestrictSetup(restrict_data_l[l], RT_l[l], 1, r_l[l], b_l[l+1],
+      hypre_SemiRestrictSetup(restrict_data_l[l], RT_l[l], 1, r_l[l], b_l[l + 1],
                               cindex, findex, stride);
+
+      HYPRE_ANNOTATE_MGLEVEL_END(l);
    }
 
 #if 0 //defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
@@ -698,7 +695,7 @@ hypre_PFMGSetup( void               *pfmg_vdata,
          hypre_PFMGRelaxSetType(relax_data_l[l], 0);
          /* do no more work on the coarsest grid than the cost of a V-cycle
           * (estimating roughly 4 communications per V-cycle level) */
-         maxwork = 4*num_levels;
+         maxwork = 4 * num_levels;
          /* do sweeps proportional to the coarsest grid size */
          maxiter = hypre_min(maxwork, cmaxsize);
 #if 0
@@ -860,7 +857,7 @@ hypre_PFMGComputeDxyz( hypre_StructMatrix *A,
 
       for (d = 0; d < 3; d++)
       {
-         mean[d]= cxyz[d] / tot_size;
+         mean[d] = cxyz[d] / tot_size;
          deviation[d] = sqcxyz[d] / tot_size;
       }
    }
@@ -883,15 +880,15 @@ hypre_PFMGComputeDxyz( hypre_StructMatrix *A,
    /* Set dxyz values that are scaled appropriately for the coarsening routine */
    for (d = 0; d < 3; d++)
    {
-      HYPRE_Real  max_anisotropy = HYPRE_REAL_MAX/1000;
-      if (cxyz[d] > (cxyz_max/max_anisotropy))
+      HYPRE_Real  max_anisotropy = HYPRE_REAL_MAX / 1000;
+      if (cxyz[d] > (cxyz_max / max_anisotropy))
       {
          cxyz[d] /= cxyz_max;
-         dxyz[d] = sqrt(1.0 / cxyz[d]);
+         dxyz[d] = hypre_sqrt(1.0 / cxyz[d]);
       }
       else
       {
-         dxyz[d] = sqrt(max_anisotropy);
+         dxyz[d] = hypre_sqrt(max_anisotropy);
       }
    }
 
@@ -902,7 +899,7 @@ hypre_PFMGComputeDxyz( hypre_StructMatrix *A,
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_PFMGComputeDxyz_CS( HYPRE_Int i,
+hypre_PFMGComputeDxyz_CS( HYPRE_Int           i,
                           hypre_StructMatrix *A,
                           HYPRE_Real         *cxyz,
                           HYPRE_Real         *sqcxyz)
@@ -913,12 +910,11 @@ hypre_PFMGComputeDxyz_CS( HYPRE_Int i,
    HYPRE_Int              Ai;
    HYPRE_Real            *Ap;
    HYPRE_Int              constant_coefficient;
-
-   HYPRE_Real            tcx, tcy, tcz;
-   HYPRE_Real            Adiag = 0, diag;
-   HYPRE_Int             Astenc, sdiag = 0;
-
-   HYPRE_Int             si;
+   HYPRE_Real             tcx, tcy, tcz;
+   HYPRE_Real             Adiag = 0, diag;
+   HYPRE_Int              Astenc, sdiag = 0;
+   HYPRE_Int              si;
+   HYPRE_MemoryLocation   memory_location = hypre_StructMatrixMemoryLocation(A);
 
    stencil       = hypre_StructMatrixStencil(A);
    stencil_shape = hypre_StructStencilShape(stencil);
@@ -945,13 +941,13 @@ hypre_PFMGComputeDxyz_CS( HYPRE_Int i,
 
    /* get sign of diagonal */
    Ap = hypre_StructMatrixBoxData(A, i, sdiag);
-   if (constant_coefficient==1)
+   if (constant_coefficient == 1)
    {
       Adiag = Ap[Ai];
    }
-   else if (constant_coefficient==2)
+   else if (constant_coefficient == 2)
    {
-      hypre_TMemcpy(&Adiag,&Ap[Ai],HYPRE_Real,1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
+      hypre_TMemcpy(&Adiag, &Ap[Ai], HYPRE_Real, 1, HYPRE_MEMORY_HOST, memory_location);
    }
 
    diag = 1.0;
@@ -968,21 +964,21 @@ hypre_PFMGComputeDxyz_CS( HYPRE_Int i,
       Astenc = hypre_IndexD(stencil_shape[si], 0);
       if (Astenc)
       {
-         tcx -= Ap[Ai]*diag;
+         tcx -= Ap[Ai] * diag;
       }
 
       /* y-direction */
       Astenc = hypre_IndexD(stencil_shape[si], 1);
       if (Astenc)
       {
-         tcy -= Ap[Ai]*diag;
+         tcy -= Ap[Ai] * diag;
       }
 
       /* z-direction */
       Astenc = hypre_IndexD(stencil_shape[si], 2);
       if (Astenc)
       {
-         tcz -= Ap[Ai]*diag;
+         tcz -= Ap[Ai] * diag;
       }
    }
 
@@ -1016,7 +1012,7 @@ hypre_PFMGComputeDxyz_SS5( HYPRE_Int           bi,
    HYPRE_Real            *a_cc, *a_cw, *a_ce, *a_cs, *a_cn;
 #if 0 //defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    HYPRE_Int              data_location = hypre_StructGridDataLocation(
-                                          hypre_StructMatrixGrid(A) );
+                                             hypre_StructMatrixGrid(A) );
 #endif
 
    hypre_SetIndex3(stride, 1, 1, 1);
@@ -1051,8 +1047,8 @@ hypre_PFMGComputeDxyz_SS5( HYPRE_Int           bi,
    hypre_SetIndex3(index,  0,  1, 0);
    a_cn = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
-   // FIXME TODO HOW TO DO KOKKOS IN ONE BOXLOOP ?
-#if defined(HYPRE_USING_KOKKOS)
+   // FIXME TODO HOW TO DO KOKKOS (WM: and SYCL) IN ONE BOXLOOP ?
+#if defined(HYPRE_USING_KOKKOS) || defined(HYPRE_USING_SYCL)
 
    HYPRE_Real cxb = cxyz[0];
    hypre_BoxLoop1ReductionBegin(hypre_StructMatrixNDim(A), loop_size,
@@ -1094,10 +1090,11 @@ hypre_PFMGComputeDxyz_SS5( HYPRE_Int           bi,
    }
    hypre_BoxLoop1ReductionEnd(Ai, sqcyb)
 
-#else /* kokkos */
+#else // #if defined(HYPRE_USING_KOKKOS) || defined(HYPRE_USING_SYCL)
 
 #if defined(HYPRE_USING_RAJA)
-   ReduceSum<hypre_raja_reduce_policy, HYPRE_Real> cxb(cxyz[0]),cyb(cxyz[1]),sqcxb(sqcxyz[0]),sqcyb(sqcxyz[1]);
+   ReduceSum<hypre_raja_reduce_policy, HYPRE_Real> cxb(cxyz[0]), cyb(cxyz[1]), sqcxb(sqcxyz[0]),
+             sqcyb(sqcxyz[1]);
 #elif defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    HYPRE_double4 d4(cxyz[0], cxyz[1], sqcxyz[0], sqcxyz[1]);
    ReduceSum<HYPRE_double4> sum4(d4);
@@ -1130,7 +1127,7 @@ hypre_PFMGComputeDxyz_SS5( HYPRE_Int           bi,
       tcy = -diag * (a_cn[Ai] + a_cs[Ai]);
 
 #if !defined(HYPRE_USING_RAJA) && (defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP))
-      HYPRE_double4 tmp(tcx, tcy, tcx*tcx, tcy*tcy);
+      HYPRE_double4 tmp(tcx, tcy, tcx * tcx, tcy * tcy);
       sum4 += tmp;
 #else
       cxb += tcx;
@@ -1184,7 +1181,7 @@ hypre_PFMGComputeDxyz_SS9( HYPRE_Int bi,
    HYPRE_Real            *a_csw, *a_cse, *a_cne, *a_cnw;
 #if 0 //defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    HYPRE_Int              data_location = hypre_StructGridDataLocation(
-                                          hypre_StructMatrixGrid(A) );
+                                             hypre_StructMatrixGrid(A) );
 #endif
 
    hypre_SetIndex3(stride, 1, 1, 1);
@@ -1204,19 +1201,19 @@ hypre_PFMGComputeDxyz_SS9( HYPRE_Int bi,
     * a_cn is pointer for north coefficient
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index,0,0,0);
+   hypre_SetIndex3(index, 0, 0, 0);
    a_cc = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
-   hypre_SetIndex3(index,-1,0,0);
+   hypre_SetIndex3(index, -1, 0, 0);
    a_cw = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
-   hypre_SetIndex3(index,1,0,0);
+   hypre_SetIndex3(index, 1, 0, 0);
    a_ce = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
-   hypre_SetIndex3(index,0,-1,0);
+   hypre_SetIndex3(index, 0, -1, 0);
    a_cs = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
-   hypre_SetIndex3(index,0,1,0);
+   hypre_SetIndex3(index, 0, 1, 0);
    a_cn = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
    /*-----------------------------------------------------------------
@@ -1228,20 +1225,20 @@ hypre_PFMGComputeDxyz_SS9( HYPRE_Int bi,
     * a_cne is pointer for northeast coefficient
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index,-1,-1, 0);
+   hypre_SetIndex3(index, -1, -1, 0);
    a_csw = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
-   hypre_SetIndex3(index, 1,-1, 0);
+   hypre_SetIndex3(index, 1, -1, 0);
    a_cse = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
-   hypre_SetIndex3(index,-1, 1, 0);
+   hypre_SetIndex3(index, -1, 1, 0);
    a_cnw = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
    hypre_SetIndex3(index, 1, 1, 0);
    a_cne = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
    // FIXME TODO HOW TO DO KOKKOS IN ONE BOXLOOP ?
-#if defined(HYPRE_USING_KOKKOS)
+#if defined(HYPRE_USING_KOKKOS) || defined(HYPRE_USING_SYCL)
 
    HYPRE_Real cxb = cxyz[0];
    hypre_BoxLoop1ReductionBegin(hypre_StructMatrixNDim(A), loop_size,
@@ -1269,7 +1266,7 @@ hypre_PFMGComputeDxyz_SS9( HYPRE_Int bi,
    {
       HYPRE_Real diag = a_cc[Ai] < 0.0 ? -1.0 : 1.0;
       HYPRE_Real tcx = -diag * (a_cw[Ai] + a_ce[Ai] + a_csw[Ai] + a_cse[Ai] + a_cnw[Ai] + a_cne[Ai]);
-      sqcxb += tcx*tcx;
+      sqcxb += tcx * tcx;
    }
    hypre_BoxLoop1ReductionEnd(Ai, sqcxb)
 
@@ -1279,14 +1276,15 @@ hypre_PFMGComputeDxyz_SS9( HYPRE_Int bi,
    {
       HYPRE_Real diag = a_cc[Ai] < 0.0 ? -1.0 : 1.0;
       HYPRE_Real tcy = -diag * (a_cs[Ai] + a_cn[Ai] + a_csw[Ai] + a_cse[Ai] + a_cnw[Ai] + a_cne[Ai]);
-      sqcyb += tcy*tcy;
+      sqcyb += tcy * tcy;
    }
    hypre_BoxLoop1ReductionEnd(Ai, sqcyb)
 
 #else /* kokkos */
 
 #if defined(HYPRE_USING_RAJA)
-   ReduceSum<hypre_raja_reduce_policy, HYPRE_Real> cxb(cxyz[0]),cyb(cxyz[1]),sqcxb(sqcxyz[0]),sqcyb(sqcxyz[1]);
+   ReduceSum<hypre_raja_reduce_policy, HYPRE_Real> cxb(cxyz[0]), cyb(cxyz[1]), sqcxb(sqcxyz[0]),
+             sqcyb(sqcxyz[1]);
 #elif defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    HYPRE_double4 d4(cxyz[0], cxyz[1], sqcxyz[0], sqcxyz[1]);
    ReduceSum<HYPRE_double4> sum4(d4);
@@ -1313,20 +1311,20 @@ hypre_PFMGComputeDxyz_SS9( HYPRE_Int bi,
    hypre_BoxLoop1ReductionBegin(hypre_StructMatrixNDim(A), loop_size,
                                 A_dbox, start, stride, Ai, sum4)
    {
-       HYPRE_Real tcx, tcy;
-       HYPRE_Real diag = a_cc[Ai] < 0.0 ? -1.0 : 1.0;
+      HYPRE_Real tcx, tcy;
+      HYPRE_Real diag = a_cc[Ai] < 0.0 ? -1.0 : 1.0;
 
-       tcx = -diag * (a_cw[Ai] + a_ce[Ai] + a_csw[Ai] + a_cse[Ai] + a_cnw[Ai] + a_cne[Ai]);
-       tcy = -diag * (a_cs[Ai] + a_cn[Ai] + a_csw[Ai] + a_cse[Ai] + a_cnw[Ai] + a_cne[Ai]);
+      tcx = -diag * (a_cw[Ai] + a_ce[Ai] + a_csw[Ai] + a_cse[Ai] + a_cnw[Ai] + a_cne[Ai]);
+      tcy = -diag * (a_cs[Ai] + a_cn[Ai] + a_csw[Ai] + a_cse[Ai] + a_cnw[Ai] + a_cne[Ai]);
 
 #if !defined(HYPRE_USING_RAJA) && (defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP))
-       HYPRE_double4 tmp(tcx, tcy, tcx*tcx, tcy*tcy);
-       sum4 += tmp;
+      HYPRE_double4 tmp(tcx, tcy, tcx * tcx, tcy * tcy);
+      sum4 += tmp;
 #else
-       cxb += tcx;
-       cyb += tcy;
-       sqcxb += tcx * tcx;
-       sqcyb += tcy * tcy;
+      cxb += tcx;
+      cyb += tcy;
+      sqcxb += tcx * tcx;
+      sqcyb += tcy * tcy;
 #endif
    }
    hypre_BoxLoop1ReductionEnd(Ai, sum4)
@@ -1372,7 +1370,7 @@ hypre_PFMGComputeDxyz_SS7( HYPRE_Int           bi,
    HYPRE_Real            *a_cc, *a_cw, *a_ce, *a_cs, *a_cn, *a_ac, *a_bc;
 #if 0 //defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    HYPRE_Int              data_location = hypre_StructGridDataLocation(
-                                          hypre_StructMatrixGrid(A) );
+                                             hypre_StructMatrixGrid(A) );
 #endif
 
    hypre_SetIndex3(stride, 1, 1, 1);
@@ -1394,29 +1392,29 @@ hypre_PFMGComputeDxyz_SS7( HYPRE_Int           bi,
     * a_bc is pointer for center coefficient in plane below
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index,0,0,0);
+   hypre_SetIndex3(index, 0, 0, 0);
    a_cc = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
-   hypre_SetIndex3(index,-1,0,0);
+   hypre_SetIndex3(index, -1, 0, 0);
    a_cw = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
-   hypre_SetIndex3(index,1,0,0);
+   hypre_SetIndex3(index, 1, 0, 0);
    a_ce = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
-   hypre_SetIndex3(index,0,-1,0);
+   hypre_SetIndex3(index, 0, -1, 0);
    a_cs = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
-   hypre_SetIndex3(index,0,1,0);
+   hypre_SetIndex3(index, 0, 1, 0);
    a_cn = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
-   hypre_SetIndex3(index,0,0,1);
+   hypre_SetIndex3(index, 0, 0, 1);
    a_ac = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
-   hypre_SetIndex3(index,0,0,-1);
+   hypre_SetIndex3(index, 0, 0, -1);
    a_bc = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
    // FIXME TODO HOW TO DO KOKKOS IN ONE BOXLOOP ?
-#if defined(HYPRE_USING_KOKKOS)
+#if defined(HYPRE_USING_KOKKOS) || defined(HYPRE_USING_SYCL)
 
    HYPRE_Real cxb = cxyz[0];
    hypre_BoxLoop1ReductionBegin(hypre_StructMatrixNDim(A), loop_size,
@@ -1454,7 +1452,7 @@ hypre_PFMGComputeDxyz_SS7( HYPRE_Int           bi,
    {
       HYPRE_Real diag = a_cc[Ai] < 0.0 ? -1.0 : 1.0;
       HYPRE_Real tcx = -diag * (a_cw[Ai] + a_ce[Ai]);
-      sqcxb += tcx*tcx;
+      sqcxb += tcx * tcx;
    }
    hypre_BoxLoop1ReductionEnd(Ai, sqcxb)
 
@@ -1464,7 +1462,7 @@ hypre_PFMGComputeDxyz_SS7( HYPRE_Int           bi,
    {
       HYPRE_Real diag = a_cc[Ai] < 0.0 ? -1.0 : 1.0;
       HYPRE_Real tcy = -diag * (a_cs[Ai] + a_cn[Ai]);
-      sqcyb += tcy*tcy;
+      sqcyb += tcy * tcy;
    }
    hypre_BoxLoop1ReductionEnd(Ai, sqcyb)
 
@@ -1474,14 +1472,15 @@ hypre_PFMGComputeDxyz_SS7( HYPRE_Int           bi,
    {
       HYPRE_Real diag = a_cc[Ai] < 0.0 ? -1.0 : 1.0;
       HYPRE_Real tcz = -diag * (a_ac[Ai] + a_bc[Ai]);
-      sqczb += tcz*tcz;
+      sqczb += tcz * tcz;
    }
    hypre_BoxLoop1ReductionEnd(Ai, sqczb)
 
 #else /* kokkos */
 
 #if defined(HYPRE_USING_RAJA)
-   ReduceSum<hypre_raja_reduce_policy, HYPRE_Real> cxb(cxyz[0]),cyb(cxyz[1]),czb(cxyz[2]),sqcxb(sqcxyz[0]),sqcyb(sqcxyz[1]), sqczb(sqcxyz[2]);
+   ReduceSum<hypre_raja_reduce_policy, HYPRE_Real> cxb(cxyz[0]), cyb(cxyz[1]), czb(cxyz[2]),
+             sqcxb(sqcxyz[0]), sqcyb(sqcxyz[1]), sqczb(sqcxyz[2]);
 #elif defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    HYPRE_double6 d6(cxyz[0], cxyz[1], cxyz[2], sqcxyz[0], sqcxyz[1], sqcxyz[2]);
    ReduceSum<HYPRE_double6> sum6(d6);
@@ -1517,7 +1516,7 @@ hypre_PFMGComputeDxyz_SS7( HYPRE_Int           bi,
       tcy = -diag * (a_cs[Ai] + a_cn[Ai]);
       tcz = -diag * (a_ac[Ai] + a_bc[Ai]);
 #if !defined(HYPRE_USING_RAJA) && (defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP))
-      HYPRE_double6 tmp(tcx, tcy, tcz, tcx*tcx, tcy*tcy, tcz*tcz);
+      HYPRE_double6 tmp(tcx, tcy, tcz, tcx * tcx, tcy * tcy, tcz * tcz);
       sum6 += tmp;
 #else
       cxb += tcx;
@@ -1574,7 +1573,7 @@ hypre_PFMGComputeDxyz_SS19( HYPRE_Int           bi,
    HYPRE_Real            *a_aw, *a_ae, *a_as, *a_an, *a_bw, *a_be, *a_bs, *a_bn;
 #if 0 //defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    HYPRE_Int              data_location = hypre_StructGridDataLocation(
-                                          hypre_StructMatrixGrid(A) );
+                                             hypre_StructMatrixGrid(A) );
 #endif
 
    hypre_SetIndex3(stride, 1, 1, 1);
@@ -1596,25 +1595,25 @@ hypre_PFMGComputeDxyz_SS19( HYPRE_Int           bi,
     * a_bc is pointer for center coefficient in plane below
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index,0,0,0);
+   hypre_SetIndex3(index, 0, 0, 0);
    a_cc = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
-   hypre_SetIndex3(index,-1,0,0);
+   hypre_SetIndex3(index, -1, 0, 0);
    a_cw = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
-   hypre_SetIndex3(index,1,0,0);
+   hypre_SetIndex3(index, 1, 0, 0);
    a_ce = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
-   hypre_SetIndex3(index,0,-1,0);
+   hypre_SetIndex3(index, 0, -1, 0);
    a_cs = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
-   hypre_SetIndex3(index,0,1,0);
+   hypre_SetIndex3(index, 0, 1, 0);
    a_cn = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
-   hypre_SetIndex3(index,0,0,1);
+   hypre_SetIndex3(index, 0, 0, 1);
    a_ac = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
-   hypre_SetIndex3(index,0,0,-1);
+   hypre_SetIndex3(index, 0, 0, -1);
    a_bc = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
    /*-----------------------------------------------------------------
@@ -1634,52 +1633,53 @@ hypre_PFMGComputeDxyz_SS19( HYPRE_Int           bi,
     * a_cne is pointer for northeast coefficient in same plane
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index,-1, 0, 1);
+   hypre_SetIndex3(index, -1, 0, 1);
    a_aw = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
    hypre_SetIndex3(index, 1, 0, 1);
    a_ae = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
-   hypre_SetIndex3(index, 0,-1, 1);
+   hypre_SetIndex3(index, 0, -1, 1);
    a_as = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
    hypre_SetIndex3(index, 0, 1, 1);
    a_an = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
-   hypre_SetIndex3(index,-1, 0,-1);
+   hypre_SetIndex3(index, -1, 0, -1);
    a_bw = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
-   hypre_SetIndex3(index, 1, 0,-1);
+   hypre_SetIndex3(index, 1, 0, -1);
    a_be = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
-   hypre_SetIndex3(index, 0,-1,-1);
+   hypre_SetIndex3(index, 0, -1, -1);
    a_bs = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
-   hypre_SetIndex3(index, 0, 1,-1);
+   hypre_SetIndex3(index, 0, 1, -1);
    a_bn = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
-   hypre_SetIndex3(index,-1,-1, 0);
+   hypre_SetIndex3(index, -1, -1, 0);
    a_csw = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
-   hypre_SetIndex3(index, 1,-1, 0);
+   hypre_SetIndex3(index, 1, -1, 0);
    a_cse = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
-   hypre_SetIndex3(index,-1, 1, 0);
+   hypre_SetIndex3(index, -1, 1, 0);
    a_cnw = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
    hypre_SetIndex3(index, 1, 1, 0);
    a_cne = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
    // FIXME TODO HOW TO DO KOKKOS IN ONE BOXLOOP ?
-#if defined(HYPRE_USING_KOKKOS)
+#if defined(HYPRE_USING_KOKKOS) || defined(HYPRE_USING_SYCL)
 
    HYPRE_Real cxb = cxyz[0];
    hypre_BoxLoop1ReductionBegin(hypre_StructMatrixNDim(A), loop_size,
                                 A_dbox, start, stride, Ai, cxb)
    {
-       HYPRE_Real diag = a_cc[Ai] < 0.0 ? -1.0 : 1.0;
-       HYPRE_Real tcx = -diag * (a_cw[Ai] + a_ce[Ai] + a_aw[Ai] + a_ae[Ai] + a_bw[Ai] + a_be[Ai] + a_csw[Ai] + a_cse[Ai] + a_cnw[Ai] + a_cne[Ai]);
-       cxb += tcx;
+      HYPRE_Real diag = a_cc[Ai] < 0.0 ? -1.0 : 1.0;
+      HYPRE_Real tcx = -diag * (a_cw[Ai] + a_ce[Ai] + a_aw[Ai] + a_ae[Ai] + a_bw[Ai] + a_be[Ai] +
+                                a_csw[Ai] + a_cse[Ai] + a_cnw[Ai] + a_cne[Ai]);
+      cxb += tcx;
    }
    hypre_BoxLoop1ReductionEnd(Ai, cxb)
 
@@ -1688,7 +1688,8 @@ hypre_PFMGComputeDxyz_SS19( HYPRE_Int           bi,
                                 A_dbox, start, stride, Ai, cyb)
    {
       HYPRE_Real diag = a_cc[Ai] < 0.0 ? -1.0 : 1.0;
-      HYPRE_Real tcy = -diag * (a_cs[Ai] + a_cn[Ai] + a_an[Ai] + a_as[Ai] + a_bn[Ai] + a_bs[Ai] + a_csw[Ai] + a_cse[Ai] + a_cnw[Ai] + a_cne[Ai]);
+      HYPRE_Real tcy = -diag * (a_cs[Ai] + a_cn[Ai] + a_an[Ai] + a_as[Ai] + a_bn[Ai] + a_bs[Ai] +
+                                a_csw[Ai] + a_cse[Ai] + a_cnw[Ai] + a_cne[Ai]);
       cyb += tcy;
    }
    hypre_BoxLoop1ReductionEnd(Ai, cyb)
@@ -1698,7 +1699,8 @@ hypre_PFMGComputeDxyz_SS19( HYPRE_Int           bi,
                                 A_dbox, start, stride, Ai, czb)
    {
       HYPRE_Real diag = a_cc[Ai] < 0.0 ? -1.0 : 1.0;
-      HYPRE_Real tcz = -diag * (a_ac[Ai] + a_bc[Ai] + a_aw[Ai] + a_ae[Ai] + a_an[Ai] + a_as[Ai] +  a_bw[Ai]  + a_be[Ai] +  a_bn[Ai] +  a_bs[Ai]);
+      HYPRE_Real tcz = -diag * (a_ac[Ai] + a_bc[Ai] + a_aw[Ai] + a_ae[Ai] + a_an[Ai] + a_as[Ai] +
+                                a_bw[Ai]  + a_be[Ai] +  a_bn[Ai] +  a_bs[Ai]);
       czb += tcz;
    }
    hypre_BoxLoop1ReductionEnd(Ai, czb)
@@ -1708,8 +1710,9 @@ hypre_PFMGComputeDxyz_SS19( HYPRE_Int           bi,
                                 A_dbox, start, stride, Ai, sqcxb)
    {
       HYPRE_Real diag = a_cc[Ai] < 0.0 ? -1.0 : 1.0;
-      HYPRE_Real tcx = -diag * (a_cw[Ai] + a_ce[Ai] + a_aw[Ai] + a_ae[Ai] + a_bw[Ai] + a_be[Ai] + a_csw[Ai] + a_cse[Ai] + a_cnw[Ai] + a_cne[Ai]);
-      sqcxb += tcx*tcx;
+      HYPRE_Real tcx = -diag * (a_cw[Ai] + a_ce[Ai] + a_aw[Ai] + a_ae[Ai] + a_bw[Ai] + a_be[Ai] +
+                                a_csw[Ai] + a_cse[Ai] + a_cnw[Ai] + a_cne[Ai]);
+      sqcxb += tcx * tcx;
    }
    hypre_BoxLoop1ReductionEnd(Ai, sqcxb)
 
@@ -1718,8 +1721,9 @@ hypre_PFMGComputeDxyz_SS19( HYPRE_Int           bi,
                                 A_dbox, start, stride, Ai, sqcyb)
    {
       HYPRE_Real diag = a_cc[Ai] < 0.0 ? -1.0 : 1.0;
-      HYPRE_Real tcy = -diag * (a_cs[Ai] + a_cn[Ai] + a_an[Ai] + a_as[Ai] + a_bn[Ai] + a_bs[Ai] + a_csw[Ai] + a_cse[Ai] + a_cnw[Ai] + a_cne[Ai]);
-      sqcyb += tcy*tcy;
+      HYPRE_Real tcy = -diag * (a_cs[Ai] + a_cn[Ai] + a_an[Ai] + a_as[Ai] + a_bn[Ai] + a_bs[Ai] +
+                                a_csw[Ai] + a_cse[Ai] + a_cnw[Ai] + a_cne[Ai]);
+      sqcyb += tcy * tcy;
    }
    hypre_BoxLoop1ReductionEnd(Ai, sqcyb)
 
@@ -1728,15 +1732,17 @@ hypre_PFMGComputeDxyz_SS19( HYPRE_Int           bi,
                                 A_dbox, start, stride, Ai, sqczb)
    {
       HYPRE_Real diag = a_cc[Ai] < 0.0 ? -1.0 : 1.0;
-      HYPRE_Real tcz = -diag * (a_ac[Ai] + a_bc[Ai] + a_aw[Ai] + a_ae[Ai] + a_an[Ai] + a_as[Ai] +  a_bw[Ai]  + a_be[Ai] +  a_bn[Ai] +  a_bs[Ai]);
-      sqczb += tcz*tcz;
+      HYPRE_Real tcz = -diag * (a_ac[Ai] + a_bc[Ai] + a_aw[Ai] + a_ae[Ai] + a_an[Ai] + a_as[Ai] +
+                                a_bw[Ai]  + a_be[Ai] +  a_bn[Ai] +  a_bs[Ai]);
+      sqczb += tcz * tcz;
    }
    hypre_BoxLoop1ReductionEnd(Ai, sqczb)
 
 #else /* kokkos */
 
 #if defined(HYPRE_USING_RAJA)
-   ReduceSum<hypre_raja_reduce_policy, HYPRE_Real> cxb(cxyz[0]),cyb(cxyz[1]),czb(cxyz[2]),sqcxb(sqcxyz[0]),sqcyb(sqcxyz[1]), sqczb(sqcxyz[2]);
+   ReduceSum<hypre_raja_reduce_policy, HYPRE_Real> cxb(cxyz[0]), cyb(cxyz[1]), czb(cxyz[2]),
+             sqcxb(sqcxyz[0]), sqcyb(sqcxyz[1]), sqczb(sqcxyz[2]);
 #elif defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    HYPRE_double6 d6(cxyz[0], cxyz[1], cxyz[2], sqcxyz[0], sqcxyz[1], sqcxyz[2]);
    ReduceSum<HYPRE_double6> sum6(d6);
@@ -1768,12 +1774,15 @@ hypre_PFMGComputeDxyz_SS19( HYPRE_Int           bi,
       HYPRE_Real tcx, tcy, tcz;
       HYPRE_Real diag = a_cc[Ai] < 0.0 ? -1.0 : 1.0;
 
-      tcx = -diag * (a_cw[Ai] + a_ce[Ai] + a_aw[Ai] + a_ae[Ai] + a_bw[Ai] + a_be[Ai] + a_csw[Ai] + a_cse[Ai] + a_cnw[Ai] + a_cne[Ai]);
-      tcy = -diag * (a_cs[Ai] + a_cn[Ai] + a_an[Ai] + a_as[Ai] + a_bn[Ai] + a_bs[Ai] + a_csw[Ai] + a_cse[Ai] + a_cnw[Ai] + a_cne[Ai]);
-      tcz = -diag * (a_ac[Ai] + a_bc[Ai] + a_aw[Ai] + a_ae[Ai] + a_an[Ai] + a_as[Ai] +  a_bw[Ai]  + a_be[Ai] +  a_bn[Ai] +  a_bs[Ai]);
+      tcx = -diag * (a_cw[Ai] + a_ce[Ai] + a_aw[Ai] + a_ae[Ai] + a_bw[Ai] + a_be[Ai] + a_csw[Ai] +
+                     a_cse[Ai] + a_cnw[Ai] + a_cne[Ai]);
+      tcy = -diag * (a_cs[Ai] + a_cn[Ai] + a_an[Ai] + a_as[Ai] + a_bn[Ai] + a_bs[Ai] + a_csw[Ai] +
+                     a_cse[Ai] + a_cnw[Ai] + a_cne[Ai]);
+      tcz = -diag * (a_ac[Ai] + a_bc[Ai] + a_aw[Ai] + a_ae[Ai] + a_an[Ai] + a_as[Ai] +  a_bw[Ai]  +
+                     a_be[Ai] +  a_bn[Ai] +  a_bs[Ai]);
 
 #if !defined(HYPRE_USING_RAJA) && (defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP))
-      HYPRE_double6 tmp(tcx, tcy, tcz, tcx*tcx, tcy*tcy, tcz*tcz);
+      HYPRE_double6 tmp(tcx, tcy, tcz, tcx * tcx, tcy * tcy, tcz * tcz);
       sum6 += tmp;
 #else
       cxb += tcx;
@@ -1829,11 +1838,11 @@ hypre_PFMGComputeDxyz_SS27( HYPRE_Int           bi,
    HYPRE_Real            *a_cc, *a_cw, *a_ce, *a_cs, *a_cn, *a_ac, *a_bc;
    HYPRE_Real            *a_csw, *a_cse, *a_cne, *a_cnw;
    HYPRE_Real            *a_aw, *a_ae, *a_as, *a_an, *a_bw, *a_be, *a_bs, *a_bn;
-   HYPRE_Real            *a_asw, *a_ase, *a_ane, *a_anw,*a_bsw, *a_bse, *a_bne, *a_bnw;
+   HYPRE_Real            *a_asw, *a_ase, *a_ane, *a_anw, *a_bsw, *a_bse, *a_bne, *a_bnw;
 
 #if 0 //defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    HYPRE_Int              data_location = hypre_StructGridDataLocation(
-                                          hypre_StructMatrixGrid(A) );
+                                             hypre_StructMatrixGrid(A) );
 #endif
 
    hypre_SetIndex3(stride, 1, 1, 1);
@@ -1855,25 +1864,25 @@ hypre_PFMGComputeDxyz_SS27( HYPRE_Int           bi,
     * a_bc is pointer for center coefficient in plane below
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index,0,0,0);
+   hypre_SetIndex3(index, 0, 0, 0);
    a_cc = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
-   hypre_SetIndex3(index,-1,0,0);
+   hypre_SetIndex3(index, -1, 0, 0);
    a_cw = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
-   hypre_SetIndex3(index,1,0,0);
+   hypre_SetIndex3(index, 1, 0, 0);
    a_ce = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
-   hypre_SetIndex3(index,0,-1,0);
+   hypre_SetIndex3(index, 0, -1, 0);
    a_cs = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
-   hypre_SetIndex3(index,0,1,0);
+   hypre_SetIndex3(index, 0, 1, 0);
    a_cn = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
-   hypre_SetIndex3(index,0,0,1);
+   hypre_SetIndex3(index, 0, 0, 1);
    a_ac = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
-   hypre_SetIndex3(index,0,0,-1);
+   hypre_SetIndex3(index, 0, 0, -1);
    a_bc = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
    /*-----------------------------------------------------------------
@@ -1893,37 +1902,37 @@ hypre_PFMGComputeDxyz_SS27( HYPRE_Int           bi,
     * a_cne is pointer for northeast coefficient in same plane
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index,-1, 0, 1);
+   hypre_SetIndex3(index, -1, 0, 1);
    a_aw = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
    hypre_SetIndex3(index, 1, 0, 1);
    a_ae = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
-   hypre_SetIndex3(index, 0,-1, 1);
+   hypre_SetIndex3(index, 0, -1, 1);
    a_as = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
    hypre_SetIndex3(index, 0, 1, 1);
    a_an = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
-   hypre_SetIndex3(index,-1, 0,-1);
+   hypre_SetIndex3(index, -1, 0, -1);
    a_bw = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
-   hypre_SetIndex3(index, 1, 0,-1);
+   hypre_SetIndex3(index, 1, 0, -1);
    a_be = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
-   hypre_SetIndex3(index, 0,-1,-1);
+   hypre_SetIndex3(index, 0, -1, -1);
    a_bs = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
-   hypre_SetIndex3(index, 0, 1,-1);
+   hypre_SetIndex3(index, 0, 1, -1);
    a_bn = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
-   hypre_SetIndex3(index,-1,-1, 0);
+   hypre_SetIndex3(index, -1, -1, 0);
    a_csw = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
-   hypre_SetIndex3(index, 1,-1, 0);
+   hypre_SetIndex3(index, 1, -1, 0);
    a_cse = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
-   hypre_SetIndex3(index,-1, 1, 0);
+   hypre_SetIndex3(index, -1, 1, 0);
    a_cnw = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
    hypre_SetIndex3(index, 1, 1, 0);
@@ -1942,32 +1951,32 @@ hypre_PFMGComputeDxyz_SS27( HYPRE_Int           bi,
     * a_bne is pointer for northeast coefficient in plane below
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index,-1,-1, 1);
+   hypre_SetIndex3(index, -1, -1, 1);
    a_asw = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
-   hypre_SetIndex3(index, 1,-1, 1);
+   hypre_SetIndex3(index, 1, -1, 1);
    a_ase = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
-   hypre_SetIndex3(index,-1, 1, 1);
+   hypre_SetIndex3(index, -1, 1, 1);
    a_anw = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
    hypre_SetIndex3(index, 1, 1, 1);
    a_ane = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
-   hypre_SetIndex3(index,-1,-1,-1);
+   hypre_SetIndex3(index, -1, -1, -1);
    a_bsw = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
-   hypre_SetIndex3(index, 1,-1,-1);
+   hypre_SetIndex3(index, 1, -1, -1);
    a_bse = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
-   hypre_SetIndex3(index,-1, 1,-1);
+   hypre_SetIndex3(index, -1, 1, -1);
    a_bnw = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
-   hypre_SetIndex3(index, 1, 1,-1);
+   hypre_SetIndex3(index, 1, 1, -1);
    a_bne = hypre_StructMatrixExtractPointerByIndex(A, bi, index);
 
    // FIXME TODO HOW TO DO KOKKOS IN ONE BOXLOOP ?
-#if defined(HYPRE_USING_KOKKOS)
+#if defined(HYPRE_USING_KOKKOS) || defined(HYPRE_USING_SYCL)
 
    HYPRE_Real cxb = cxyz[0];
    hypre_BoxLoop1ReductionBegin(hypre_StructMatrixNDim(A), loop_size,
@@ -1975,8 +1984,10 @@ hypre_PFMGComputeDxyz_SS27( HYPRE_Int           bi,
    {
       HYPRE_Real tcx = 0.0;
       HYPRE_Real diag = a_cc[Ai] < 0.0 ? -1.0 : 1.0;
-      tcx -= diag * (a_cw[Ai]  + a_ce[Ai]  +  a_aw[Ai] +  a_ae[Ai] +  a_bw[Ai] +  a_be[Ai] + a_csw[Ai] + a_cse[Ai] + a_cnw[Ai] + a_cne[Ai]);
-      tcx -= diag * (a_asw[Ai] + a_ase[Ai] + a_anw[Ai] + a_ane[Ai] + a_bsw[Ai] + a_bse[Ai] + a_bnw[Ai] + a_bne[Ai]);
+      tcx -= diag * (a_cw[Ai]  + a_ce[Ai]  +  a_aw[Ai] +  a_ae[Ai] +  a_bw[Ai] +  a_be[Ai] + a_csw[Ai] +
+                     a_cse[Ai] + a_cnw[Ai] + a_cne[Ai]);
+      tcx -= diag * (a_asw[Ai] + a_ase[Ai] + a_anw[Ai] + a_ane[Ai] + a_bsw[Ai] + a_bse[Ai] + a_bnw[Ai] +
+                     a_bne[Ai]);
       cxb += tcx;
    }
    hypre_BoxLoop1ReductionEnd(Ai, cxb)
@@ -1987,8 +1998,10 @@ hypre_PFMGComputeDxyz_SS27( HYPRE_Int           bi,
    {
       HYPRE_Real tcy = 0.0;
       HYPRE_Real diag = a_cc[Ai] < 0.0 ? -1.0 : 1.0;
-      tcy -= diag * (a_cs[Ai]  + a_cn[Ai]  +  a_an[Ai] +  a_as[Ai] +  a_bn[Ai] +  a_bs[Ai] + a_csw[Ai] + a_cse[Ai] + a_cnw[Ai] + a_cne[Ai]);
-      tcy -= diag * (a_asw[Ai] + a_ase[Ai] + a_anw[Ai] + a_ane[Ai] + a_bsw[Ai] + a_bse[Ai] + a_bnw[Ai] + a_bne[Ai]);
+      tcy -= diag * (a_cs[Ai]  + a_cn[Ai]  +  a_an[Ai] +  a_as[Ai] +  a_bn[Ai] +  a_bs[Ai] + a_csw[Ai] +
+                     a_cse[Ai] + a_cnw[Ai] + a_cne[Ai]);
+      tcy -= diag * (a_asw[Ai] + a_ase[Ai] + a_anw[Ai] + a_ane[Ai] + a_bsw[Ai] + a_bse[Ai] + a_bnw[Ai] +
+                     a_bne[Ai]);
       cyb += tcy;
    }
    hypre_BoxLoop1ReductionEnd(Ai, cyb)
@@ -1999,8 +2012,10 @@ hypre_PFMGComputeDxyz_SS27( HYPRE_Int           bi,
    {
       HYPRE_Real tcz = 0.0;
       HYPRE_Real diag = a_cc[Ai] < 0.0 ? -1.0 : 1.0;
-      tcz -= diag * (a_ac[Ai]  +  a_bc[Ai] +  a_aw[Ai] +  a_ae[Ai] +  a_an[Ai] +  a_as[Ai] +  a_bw[Ai] +  a_be[Ai] + a_bn[Ai] + a_bs[Ai]);
-      tcz -= diag * (a_asw[Ai] + a_ase[Ai] + a_anw[Ai] + a_ane[Ai] + a_bsw[Ai] + a_bse[Ai] + a_bnw[Ai] + a_bne[Ai]);
+      tcz -= diag * (a_ac[Ai]  +  a_bc[Ai] +  a_aw[Ai] +  a_ae[Ai] +  a_an[Ai] +  a_as[Ai] +  a_bw[Ai] +
+                     a_be[Ai] + a_bn[Ai] + a_bs[Ai]);
+      tcz -= diag * (a_asw[Ai] + a_ase[Ai] + a_anw[Ai] + a_ane[Ai] + a_bsw[Ai] + a_bse[Ai] + a_bnw[Ai] +
+                     a_bne[Ai]);
       czb += tcz;
    }
    hypre_BoxLoop1ReductionEnd(Ai, czb)
@@ -2011,9 +2026,11 @@ hypre_PFMGComputeDxyz_SS27( HYPRE_Int           bi,
    {
       HYPRE_Real tcx = 0.0;
       HYPRE_Real diag = a_cc[Ai] < 0.0 ? -1.0 : 1.0;
-      tcx -= diag * (a_cw[Ai]  + a_ce[Ai]  +  a_aw[Ai] +  a_ae[Ai] +  a_bw[Ai] +  a_be[Ai] + a_csw[Ai] + a_cse[Ai] + a_cnw[Ai] + a_cne[Ai]);
-      tcx -= diag * (a_asw[Ai] + a_ase[Ai] + a_anw[Ai] + a_ane[Ai] + a_bsw[Ai] + a_bse[Ai] + a_bnw[Ai] + a_bne[Ai]);
-      sqcxb += tcx*tcx;
+      tcx -= diag * (a_cw[Ai]  + a_ce[Ai]  +  a_aw[Ai] +  a_ae[Ai] +  a_bw[Ai] +  a_be[Ai] + a_csw[Ai] +
+                     a_cse[Ai] + a_cnw[Ai] + a_cne[Ai]);
+      tcx -= diag * (a_asw[Ai] + a_ase[Ai] + a_anw[Ai] + a_ane[Ai] + a_bsw[Ai] + a_bse[Ai] + a_bnw[Ai] +
+                     a_bne[Ai]);
+      sqcxb += tcx * tcx;
    }
    hypre_BoxLoop1ReductionEnd(Ai, sqcxb)
 
@@ -2023,9 +2040,11 @@ hypre_PFMGComputeDxyz_SS27( HYPRE_Int           bi,
    {
       HYPRE_Real tcy = 0.0;
       HYPRE_Real diag = a_cc[Ai] < 0.0 ? -1.0 : 1.0;
-      tcy -= diag * (a_cs[Ai]  + a_cn[Ai]  +  a_an[Ai] +  a_as[Ai] +  a_bn[Ai] +  a_bs[Ai] + a_csw[Ai] + a_cse[Ai] + a_cnw[Ai] + a_cne[Ai]);
-      tcy -= diag * (a_asw[Ai] + a_ase[Ai] + a_anw[Ai] + a_ane[Ai] + a_bsw[Ai] + a_bse[Ai] + a_bnw[Ai] + a_bne[Ai]);
-      sqcyb += tcy*tcy;
+      tcy -= diag * (a_cs[Ai]  + a_cn[Ai]  +  a_an[Ai] +  a_as[Ai] +  a_bn[Ai] +  a_bs[Ai] + a_csw[Ai] +
+                     a_cse[Ai] + a_cnw[Ai] + a_cne[Ai]);
+      tcy -= diag * (a_asw[Ai] + a_ase[Ai] + a_anw[Ai] + a_ane[Ai] + a_bsw[Ai] + a_bse[Ai] + a_bnw[Ai] +
+                     a_bne[Ai]);
+      sqcyb += tcy * tcy;
    }
    hypre_BoxLoop1ReductionEnd(Ai, sqcyb);
 
@@ -2035,16 +2054,19 @@ hypre_PFMGComputeDxyz_SS27( HYPRE_Int           bi,
    {
       HYPRE_Real tcz = 0.0;
       HYPRE_Real diag = a_cc[Ai] < 0.0 ? -1.0 : 1.0;
-      tcz -= diag * (a_ac[Ai]  +  a_bc[Ai] +  a_aw[Ai] +  a_ae[Ai] +  a_an[Ai] +  a_as[Ai] +  a_bw[Ai] +  a_be[Ai] + a_bn[Ai] + a_bs[Ai]);
-      tcz -= diag * (a_asw[Ai] + a_ase[Ai] + a_anw[Ai] + a_ane[Ai] + a_bsw[Ai] + a_bse[Ai] + a_bnw[Ai] + a_bne[Ai]);
-      sqczb += tcz*tcz;
+      tcz -= diag * (a_ac[Ai]  +  a_bc[Ai] +  a_aw[Ai] +  a_ae[Ai] +  a_an[Ai] +  a_as[Ai] +  a_bw[Ai] +
+                     a_be[Ai] + a_bn[Ai] + a_bs[Ai]);
+      tcz -= diag * (a_asw[Ai] + a_ase[Ai] + a_anw[Ai] + a_ane[Ai] + a_bsw[Ai] + a_bse[Ai] + a_bnw[Ai] +
+                     a_bne[Ai]);
+      sqczb += tcz * tcz;
    }
    hypre_BoxLoop1ReductionEnd(Ai, sqczb)
 
 #else /* kokkos */
 
 #if defined(HYPRE_USING_RAJA)
-   ReduceSum<hypre_raja_reduce_policy, HYPRE_Real> cxb(cxyz[0]),cyb(cxyz[1]),czb(cxyz[2]),sqcxb(sqcxyz[0]),sqcyb(sqcxyz[1]), sqczb(sqcxyz[2]);
+   ReduceSum<hypre_raja_reduce_policy, HYPRE_Real> cxb(cxyz[0]), cyb(cxyz[1]), czb(cxyz[2]),
+             sqcxb(sqcxyz[0]), sqcyb(sqcxyz[1]), sqczb(sqcxyz[2]);
 #elif defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    HYPRE_double6 d6(cxyz[0], cxyz[1], cxyz[2], sqcxyz[0], sqcxyz[1], sqcxyz[2]);
    ReduceSum<HYPRE_double6> sum6(d6);
@@ -2076,16 +2098,22 @@ hypre_PFMGComputeDxyz_SS27( HYPRE_Int           bi,
       HYPRE_Real tcx = 0.0, tcy = 0.0, tcz = 0.0;
       HYPRE_Real diag = a_cc[Ai] < 0.0 ? -1.0 : 1.0;
 
-      tcx -= diag * (a_cw[Ai]  + a_ce[Ai]  +  a_aw[Ai] +  a_ae[Ai] +  a_bw[Ai] +  a_be[Ai] + a_csw[Ai] + a_cse[Ai] + a_cnw[Ai] + a_cne[Ai]);
-      tcx -= diag * (a_asw[Ai] + a_ase[Ai] + a_anw[Ai] + a_ane[Ai] + a_bsw[Ai] + a_bse[Ai] + a_bnw[Ai] + a_bne[Ai]);
+      tcx -= diag * (a_cw[Ai]  + a_ce[Ai]  +  a_aw[Ai] +  a_ae[Ai] +  a_bw[Ai] +  a_be[Ai] + a_csw[Ai] +
+                     a_cse[Ai] + a_cnw[Ai] + a_cne[Ai]);
+      tcx -= diag * (a_asw[Ai] + a_ase[Ai] + a_anw[Ai] + a_ane[Ai] + a_bsw[Ai] + a_bse[Ai] + a_bnw[Ai] +
+                     a_bne[Ai]);
 
-      tcy -= diag * (a_cs[Ai]  + a_cn[Ai]  +  a_an[Ai] +  a_as[Ai] +  a_bn[Ai] +  a_bs[Ai] + a_csw[Ai] + a_cse[Ai] + a_cnw[Ai] + a_cne[Ai]);
-      tcy -= diag * (a_asw[Ai] + a_ase[Ai] + a_anw[Ai] + a_ane[Ai] + a_bsw[Ai] + a_bse[Ai] + a_bnw[Ai] + a_bne[Ai]);
+      tcy -= diag * (a_cs[Ai]  + a_cn[Ai]  +  a_an[Ai] +  a_as[Ai] +  a_bn[Ai] +  a_bs[Ai] + a_csw[Ai] +
+                     a_cse[Ai] + a_cnw[Ai] + a_cne[Ai]);
+      tcy -= diag * (a_asw[Ai] + a_ase[Ai] + a_anw[Ai] + a_ane[Ai] + a_bsw[Ai] + a_bse[Ai] + a_bnw[Ai] +
+                     a_bne[Ai]);
 
-      tcz -= diag * (a_ac[Ai]  +  a_bc[Ai] +  a_aw[Ai] +  a_ae[Ai] +  a_an[Ai] +  a_as[Ai] +  a_bw[Ai] +  a_be[Ai] + a_bn[Ai] + a_bs[Ai]);
-      tcz -= diag * (a_asw[Ai] + a_ase[Ai] + a_anw[Ai] + a_ane[Ai] + a_bsw[Ai] + a_bse[Ai] + a_bnw[Ai] + a_bne[Ai]);
+      tcz -= diag * (a_ac[Ai]  +  a_bc[Ai] +  a_aw[Ai] +  a_ae[Ai] +  a_an[Ai] +  a_as[Ai] +  a_bw[Ai] +
+                     a_be[Ai] + a_bn[Ai] + a_bs[Ai]);
+      tcz -= diag * (a_asw[Ai] + a_ase[Ai] + a_anw[Ai] + a_ane[Ai] + a_bsw[Ai] + a_bse[Ai] + a_bnw[Ai] +
+                     a_bne[Ai]);
 #if !defined(HYPRE_USING_RAJA) && (defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP))
-      HYPRE_double6 tmp(tcx, tcy, tcz, tcx*tcx, tcy*tcy, tcz*tcz);
+      HYPRE_double6 tmp(tcx, tcy, tcz, tcx * tcx, tcy * tcy, tcz * tcz);
       sum6 += tmp;
 #else
       cxb += tcx;
@@ -2177,7 +2205,7 @@ hypre_ZeroDiagonal( hypre_StructMatrix *A )
       }
       else
       {
-#if defined(HYPRE_USING_KOKKOS)
+#if defined(HYPRE_USING_KOKKOS) || defined(HYPRE_USING_SYCL)
          HYPRE_Real diag_product_local = diag_product;
 #elif defined(HYPRE_USING_RAJA)
          ReduceSum<hypre_raja_reduce_policy, HYPRE_Real> diag_product_local(diag_product);
diff --git a/external/hypre/src/struct_ls/pfmg_setup_interp.c b/external/hypre/src/struct_ls/pfmg_setup_interp.c
index deb3b0c1..5f382e7a 100644
--- a/external/hypre/src/struct_ls/pfmg_setup_interp.c
+++ b/external/hypre/src/struct_ls/pfmg_setup_interp.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -56,11 +56,13 @@ hypre_PFMGCreateInterpOp( hypre_StructMatrix *A,
    hypre_StructMatrixSetNumGhost(P, num_ghost);
 
    constant_coefficient = hypre_StructMatrixConstantCoefficient(A);
-   if ( constant_coefficient==2 )
+   if ( constant_coefficient == 2 )
    {
-      if ( rap_type==0 )
+      if ( rap_type == 0 )
          /* A has variable diagonal, which will force all P coefficients to be variable */
+      {
          hypre_StructMatrixSetConstantCoefficient(P, 0 );
+      }
       else
       {
          /* We will force P to be 0.5's everywhere, ignoring A. */
@@ -122,6 +124,8 @@ hypre_PFMGSetupInterpOp( hypre_StructMatrix *A,
     * Initialize some things
     *----------------------------------------------------------*/
 
+   HYPRE_ANNOTATE_FUNC_BEGIN;
+
    stencil       = hypre_StructMatrixStencil(A);
    stencil_shape = hypre_StructStencilShape(stencil);
    stencil_size  = hypre_StructStencilSize(stencil);
@@ -189,20 +193,20 @@ hypre_PFMGSetupInterpOp( hypre_StructMatrix *A,
 
       hypre_BoxGetStrideSize(compute_box, stridec, loop_size);
 
-      if ( constant_coefficient==1 )
+      if ( constant_coefficient == 1 )
          /* all coefficients are constant */
       {
          hypre_PFMGSetupInterpOp_CC1
-            ( i, A, A_dbox, cdir, stride, stridec, start, startc, loop_size,
-              P_dbox, Pstenc0, Pstenc1, Pp0, Pp1, rap_type, si0, si1 );
+         ( i, A, A_dbox, cdir, stride, stridec, start, startc, loop_size,
+           P_dbox, Pstenc0, Pstenc1, Pp0, Pp1, rap_type, si0, si1 );
       }
 
-      else if ( constant_coefficient==2 )
+      else if ( constant_coefficient == 2 )
          /* all coefficients are constant except the diagonal is variable */
       {
          hypre_PFMGSetupInterpOp_CC2
-            ( i, A, A_dbox, cdir, stride, stridec, start, startc, loop_size,
-              P_dbox, Pstenc0, Pstenc1, Pp0, Pp1, rap_type, si0, si1 );
+         ( i, A, A_dbox, cdir, stride, stridec, start, startc, loop_size,
+           P_dbox, Pstenc0, Pstenc1, Pp0, Pp1, rap_type, si0, si1 );
       }
 
       else
@@ -210,40 +214,40 @@ hypre_PFMGSetupInterpOp( hypre_StructMatrix *A,
       {
 #if CC0_IMPLEMENTATION <= 1
          hypre_PFMGSetupInterpOp_CC0
-            ( i, A, A_dbox, cdir, stride, stridec, start, startc, loop_size,
-              P_dbox, Pstenc0, Pstenc1, Pp0, Pp1, rap_type, si0, si1 );
+         ( i, A, A_dbox, cdir, stride, stridec, start, startc, loop_size,
+           P_dbox, Pstenc0, Pstenc1, Pp0, Pp1, rap_type, si0, si1 );
 #else
          switch (stencil_size)
          {
             case 5:
                hypre_PFMGSetupInterpOp_CC0_SS5
-                  ( i, A, A_dbox, cdir, stride, stridec, start, startc, loop_size,
-                    P_dbox, Pstenc0, Pstenc1, Pp0, Pp1, rap_type, P_stencil_shape );
+               ( i, A, A_dbox, cdir, stride, stridec, start, startc, loop_size,
+                 P_dbox, Pstenc0, Pstenc1, Pp0, Pp1, rap_type, P_stencil_shape );
                break;
             case 9:
                hypre_PFMGSetupInterpOp_CC0_SS9
-                  ( i, A, A_dbox, cdir, stride, stridec, start, startc, loop_size,
-                    P_dbox, Pstenc0, Pstenc1, Pp0, Pp1, rap_type, P_stencil_shape );
+               ( i, A, A_dbox, cdir, stride, stridec, start, startc, loop_size,
+                 P_dbox, Pstenc0, Pstenc1, Pp0, Pp1, rap_type, P_stencil_shape );
                break;
             case 7:
                hypre_PFMGSetupInterpOp_CC0_SS7
-                  ( i, A, A_dbox, cdir, stride, stridec, start, startc, loop_size,
-                    P_dbox, Pstenc0, Pstenc1, Pp0, Pp1, rap_type, P_stencil_shape );
+               ( i, A, A_dbox, cdir, stride, stridec, start, startc, loop_size,
+                 P_dbox, Pstenc0, Pstenc1, Pp0, Pp1, rap_type, P_stencil_shape );
                break;
             case 15:
                hypre_PFMGSetupInterpOp_CC0_SS15
-                  ( i, A, A_dbox, cdir, stride, stridec, start, startc, loop_size,
-                    P_dbox, Pstenc0, Pstenc1, Pp0, Pp1, rap_type, P_stencil_shape );
+               ( i, A, A_dbox, cdir, stride, stridec, start, startc, loop_size,
+                 P_dbox, Pstenc0, Pstenc1, Pp0, Pp1, rap_type, P_stencil_shape );
                break;
             case 19:
                hypre_PFMGSetupInterpOp_CC0_SS19
-                  ( i, A, A_dbox, cdir, stride, stridec, start, startc, loop_size,
-                    P_dbox, Pstenc0, Pstenc1, Pp0, Pp1, rap_type, P_stencil_shape );
+               ( i, A, A_dbox, cdir, stride, stridec, start, startc, loop_size,
+                 P_dbox, Pstenc0, Pstenc1, Pp0, Pp1, rap_type, P_stencil_shape );
                break;
             case 27:
                hypre_PFMGSetupInterpOp_CC0_SS27
-                  ( i, A, A_dbox, cdir, stride, stridec, start, startc, loop_size,
-                    P_dbox, Pstenc0, Pstenc1, Pp0, Pp1, rap_type, P_stencil_shape );
+               ( i, A, A_dbox, cdir, stride, stridec, start, startc, loop_size,
+                 P_dbox, Pstenc0, Pstenc1, Pp0, Pp1, rap_type, P_stencil_shape );
                break;
             default:
                /*
@@ -265,6 +269,8 @@ hypre_PFMGSetupInterpOp( hypre_StructMatrix *A,
    hypre_StructInterpAssemble(A, P, 0, cdir, findex, stride);
 #endif
 
+   HYPRE_ANNOTATE_FUNC_END;
+
    return hypre_error_flag;
 }
 
@@ -290,31 +296,30 @@ hypre_PFMGSetupInterpOp_CC0
   HYPRE_Int           si0,
   HYPRE_Int           si1 )
 {
-   hypre_StructStencil   *stencil = hypre_StructMatrixStencil(A);
-   hypre_Index           *stencil_shape = hypre_StructStencilShape(stencil);
-   HYPRE_Int              stencil_size = hypre_StructStencilSize(stencil);
-   HYPRE_Int              warning_cnt= 0;
-
-#if 0 //defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-   HYPRE_Int              data_location = hypre_StructGridDataLocation(hypre_StructMatrixGrid(A));
-#endif
-
-   HYPRE_Int     **data_indices = hypre_StructMatrixDataIndices(A);
-   HYPRE_Complex  *matrixA_data = hypre_StructMatrixData(A);
-   HYPRE_Int      *data_indices_boxi_d; /* On device */
-   hypre_Index    *stencil_shape_d;
-
-   if (hypre_GetActualMemLocation(HYPRE_MEMORY_DEVICE) != hypre_MEMORY_HOST)
+   hypre_StructStencil *stencil = hypre_StructMatrixStencil(A);
+   hypre_Index         *stencil_shape = hypre_StructStencilShape(stencil);
+   HYPRE_Int            stencil_size = hypre_StructStencilSize(stencil);
+   HYPRE_Int            warning_cnt = 0;
+   HYPRE_Int            data_location = hypre_StructGridDataLocation(hypre_StructMatrixGrid(A));
+   HYPRE_Int          **data_indices = hypre_StructMatrixDataIndices(A);
+   HYPRE_Complex       *matrixA_data = hypre_StructMatrixData(A);
+   HYPRE_Int           *data_indices_boxi_d;
+   hypre_Index         *stencil_shape_d;
+   HYPRE_MemoryLocation memory_location = hypre_StructMatrixMemoryLocation(A);
+
+   if (hypre_GetExecPolicy1(memory_location) == HYPRE_EXEC_DEVICE)
    {
-      data_indices_boxi_d = hypre_TAlloc(HYPRE_Int,   stencil_size, HYPRE_MEMORY_DEVICE);
-      stencil_shape_d     = hypre_TAlloc(hypre_Index, stencil_size, HYPRE_MEMORY_DEVICE);
-      hypre_TMemcpy(data_indices_boxi_d, data_indices[i], HYPRE_Int, stencil_size, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
-      hypre_TMemcpy(stencil_shape_d, stencil_shape, hypre_Index, stencil_size, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
+      data_indices_boxi_d = hypre_TAlloc(HYPRE_Int, stencil_size, memory_location);
+      stencil_shape_d = hypre_TAlloc(hypre_Index, stencil_size, memory_location);
+      hypre_TMemcpy(data_indices_boxi_d, data_indices[i], HYPRE_Int, stencil_size, memory_location,
+                    HYPRE_MEMORY_HOST);
+      hypre_TMemcpy(stencil_shape_d, stencil_shape, hypre_Index, stencil_size, memory_location,
+                    HYPRE_MEMORY_HOST);
    }
    else
    {
       data_indices_boxi_d = data_indices[i];
-      stencil_shape_d     = stencil_shape;
+      stencil_shape_d = stencil_shape;
    }
 
 #define DEVICE_VAR is_device_ptr(Pp0,Pp1,matrixA_data,stencil_shape_d,data_indices_boxi_d)
@@ -409,10 +414,10 @@ hypre_PFMGSetupInterpOp_CC0
                         "Warning 0 center in interpolation. Setting interp = 0.");
    }
 
-   if (hypre_GetActualMemLocation(HYPRE_MEMORY_DEVICE) != hypre_MEMORY_HOST)
+   if (hypre_GetExecPolicy1(memory_location) == HYPRE_EXEC_DEVICE)
    {
-      hypre_TFree(data_indices_boxi_d, HYPRE_MEMORY_DEVICE);
-      hypre_TFree(stencil_shape_d,     HYPRE_MEMORY_DEVICE);
+      hypre_TFree(data_indices_boxi_d, memory_location);
+      hypre_TFree(stencil_shape_d, memory_location);
    }
 
    return hypre_error_flag;
@@ -448,16 +453,13 @@ hypre_PFMGSetupInterpOp_CC0
    HYPRE_Int              warning_cnt = 0;
    HYPRE_Int              dim, si, loop_length = 1, Astenc;
    HYPRE_Real            *Ap, *center, *Ap0, *Ap1;
-
-#if 0 //defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-   HYPRE_Int data_location = hypre_StructGridDataLocation(hypre_StructMatrixGrid(A));
-#endif
+   HYPRE_MemoryLocation   memory_location = hypre_StructMatrixMemoryLocation(A);
 
    for (dim = 0; dim < hypre_StructMatrixNDim(A); dim++)
    {
       loop_length *= loop_size[dim];
    }
-   center = hypre_CTAlloc(HYPRE_Real, loop_length, HYPRE_MEMORY_DEVICE);
+   center = hypre_CTAlloc(HYPRE_Real, loop_length, memory_location);
 
    for (si = 0; si < stencil_size; si++)
    {
@@ -470,7 +472,7 @@ hypre_PFMGSetupInterpOp_CC0
          hypre_BoxLoop2Begin(hypre_StructMatrixNDim(A), loop_size,
                              A_dbox, start,  stride,  Ai,
                              P_dbox, startc, stridec, Pi)
-            center[idx] += Ap[Ai];
+         center[idx] += Ap[Ai];
          hypre_BoxLoop2End(Ai, Pi)
 #undef DEVICE_VAR
       }
@@ -480,7 +482,7 @@ hypre_PFMGSetupInterpOp_CC0
          hypre_BoxLoop2Begin(hypre_StructMatrixNDim(A), loop_size,
                              A_dbox, start,  stride,  Ai,
                              P_dbox, startc, stridec, Pi)
-            Pp0[Pi] -= Ap[Ai];
+         Pp0[Pi] -= Ap[Ai];
          hypre_BoxLoop2End(Ai, Pi)
 #undef DEVICE_VAR
       }
@@ -490,7 +492,7 @@ hypre_PFMGSetupInterpOp_CC0
          hypre_BoxLoop2Begin(hypre_StructMatrixNDim(A), loop_size,
                              A_dbox, start,  stride,  Ai,
                              P_dbox, startc, stridec, Pi)
-            Pp1[Pi] -= Ap[Ai];
+         Pp1[Pi] -= Ap[Ai];
          hypre_BoxLoop2End(Ai, Pi)
 #undef DEVICE_VAR
       }
@@ -502,24 +504,24 @@ hypre_PFMGSetupInterpOp_CC0
    hypre_BoxLoop2Begin(hypre_StructMatrixNDim(A), loop_size,
                        A_dbox, start,  stride,  Ai,
                        P_dbox, startc, stridec, Pi)
-      HYPRE_Real cval = center[idx];
-      if (Ap0[Ai] == 0.0 || cval == 0.0)
-      {
-         Pp0[Pi] = 0.0;
-      }
-      else
-      {
-         Pp0[Pi] /= cval;
-      }
+   HYPRE_Real cval = center[idx];
+   if (Ap0[Ai] == 0.0 || cval == 0.0)
+   {
+      Pp0[Pi] = 0.0;
+   }
+   else
+   {
+      Pp0[Pi] /= cval;
+   }
 
-      if (Ap1[Ai] == 0.0 || cval == 0.0)
-      {
-         Pp1[Pi] = 0.0;
-      }
-      else
-      {
-         Pp1[Pi] /= cval;
-      }
+   if (Ap1[Ai] == 0.0 || cval == 0.0)
+   {
+      Pp1[Pi] = 0.0;
+   }
+   else
+   {
+      Pp1[Pi] /= cval;
+   }
    hypre_BoxLoop2End(Ai, Pi)
 #undef DEVICE_VAR
 
@@ -529,7 +531,7 @@ hypre_PFMGSetupInterpOp_CC0
                         "Warning 0 center in interpolation. Setting interp = 0.");
    }
 
-   hypre_TFree(center, HYPRE_MEMORY_DEVICE);
+   hypre_TFree(center, memory_location);
 
    return hypre_error_flag;
 }
@@ -557,6 +559,15 @@ hypre_PFMGSetupInterpOp_CC1
   HYPRE_Int           si0,
   HYPRE_Int           si1 )
 {
+   HYPRE_UNUSED_VAR(A_dbox);
+   HYPRE_UNUSED_VAR(stride);
+   HYPRE_UNUSED_VAR(stridec);
+   HYPRE_UNUSED_VAR(start);
+   HYPRE_UNUSED_VAR(startc);
+   HYPRE_UNUSED_VAR(loop_size);
+   HYPRE_UNUSED_VAR(P_dbox);
+   HYPRE_UNUSED_VAR(rap_type);
+
    HYPRE_Int              si;
    HYPRE_Int              Ai, Pi;
    HYPRE_Real            *Ap;
@@ -566,10 +577,10 @@ hypre_PFMGSetupInterpOp_CC1
    hypre_StructStencil   *stencil = hypre_StructMatrixStencil(A);
    hypre_Index           *stencil_shape = hypre_StructStencilShape(stencil);
    HYPRE_Int              stencil_size = hypre_StructStencilSize(stencil);
-   HYPRE_Int              warning_cnt= 0;
+   HYPRE_Int              warning_cnt = 0;
 
-   Ai = hypre_CCBoxIndexRank(A_dbox,start );
-   Pi = hypre_CCBoxIndexRank(P_dbox,startc);
+   Ai = hypre_CCBoxIndexRank(A_dbox, start );
+   Pi = hypre_CCBoxIndexRank(P_dbox, startc);
 
    center  = 0.0;
    Pp0[Pi] = 0.0;
@@ -679,15 +690,15 @@ hypre_PFMGSetupInterpOp_CC2
    HYPRE_Int              stencil_size = hypre_StructStencilSize(stencil);
    hypre_Index            diag_index;
    HYPRE_Int              diag_rank;
-   HYPRE_Int              warning_cnt= 0;
+   HYPRE_Int              warning_cnt = 0;
 
    hypre_SetIndex3(diag_index, 0, 0, 0);
    diag_rank = hypre_StructStencilElementRank(stencil, diag_index);
 
-   if ( rap_type!=0 )
+   if ( rap_type != 0 )
    {
       /* simply force P to be constant coefficient, all 0.5's */
-      Pi = hypre_CCBoxIndexRank(P_dbox,startc);
+      Pi = hypre_CCBoxIndexRank(P_dbox, startc);
       Pp0[Pi] = 0.5;
       Pp1[Pi] = 0.5;
    }
@@ -698,7 +709,7 @@ hypre_PFMGSetupInterpOp_CC2
          variable, and hence "center" below is variable. So we use the constant
          coefficient calculation to initialize the diagonal's variable
          coefficient calculation (which is like constant_coefficient=0). */
-      Ai = hypre_CCBoxIndexRank(A_dbox,start );
+      Ai = hypre_CCBoxIndexRank(A_dbox, start );
 
       center_offd  = 0.0;
       P0 = 0.0;
@@ -746,9 +757,9 @@ hypre_PFMGSetupInterpOp_CC2
                           A_dbox, start, stride, Ai,
                           P_dbox, startc, stridec, Pi);
       {
-         HYPRE_Int   mrk0,mrk1;
+         HYPRE_Int   mrk0, mrk1;
          HYPRE_Real  center;
-         HYPRE_Real  p0val,p1val;
+         HYPRE_Real  p0val, p1val;
 
          p0val = P0;
          p1val = P1;
@@ -831,14 +842,17 @@ hypre_PFMGSetupInterpOp_CC0_SS5
   HYPRE_Int           rap_type,
   hypre_Index        *P_stencil_shape )
 {
-  //hypre_StructStencil   *stencil = hypre_StructMatrixStencil(A);
-  //hypre_Index           *stencil_shape = hypre_StructStencilShape(stencil);
-  //HYPRE_Int              stencil_size = hypre_StructStencilSize(stencil);
-  //HYPRE_Int              warning_cnt= 0;
+   HYPRE_UNUSED_VAR(rap_type);
+   HYPRE_UNUSED_VAR(Pstenc1);
+
+   //hypre_StructStencil   *stencil = hypre_StructMatrixStencil(A);
+   //hypre_Index           *stencil_shape = hypre_StructStencilShape(stencil);
+   //HYPRE_Int              stencil_size = hypre_StructStencilSize(stencil);
+   //HYPRE_Int              warning_cnt= 0;
 
    hypre_Index            index;
    HYPRE_Real            *a_cc, *a_cw, *a_ce, *a_cs, *a_cn;
-   HYPRE_Real            *p0,*p1;
+   HYPRE_Real            *p0, *p1;
 
    p0 = hypre_StructMatrixExtractPointerByIndex(A, i, P_stencil_shape[0]);
    p1 = hypre_StructMatrixExtractPointerByIndex(A, i, P_stencil_shape[1]);
@@ -853,19 +867,19 @@ hypre_PFMGSetupInterpOp_CC0_SS5
     * a_cn is pointer for north coefficient
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index,0,0,0);
+   hypre_SetIndex3(index, 0, 0, 0);
    a_cc = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index,-1,0,0);
+   hypre_SetIndex3(index, -1, 0, 0);
    a_cw = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index,1,0,0);
+   hypre_SetIndex3(index, 1, 0, 0);
    a_ce = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index,0,-1,0);
+   hypre_SetIndex3(index, 0, -1, 0);
    a_cs = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index,0,1,0);
+   hypre_SetIndex3(index, 0, 1, 0);
    a_cn = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
 #define DEVICE_VAR is_device_ptr(a_cc,a_cs,a_cn,a_cw,a_ce,Pp0,Pp1,p0,p1)
@@ -873,19 +887,19 @@ hypre_PFMGSetupInterpOp_CC0_SS5
                        A_dbox, start, stride, Ai,
                        P_dbox, startc, stridec, Pi);
    {
-      HYPRE_Real center,left,right;
+      HYPRE_Real center, left, right;
 
       switch (cdir)
       {
          case 0:
             center = a_cc[Ai] + a_cs[Ai] + a_cn[Ai];
-            left   =-a_cw[Ai];
-            right  =-a_ce[Ai];
+            left   = -a_cw[Ai];
+            right  = -a_ce[Ai];
             break;
-         case 1:
+      case 1: default:
             center = a_cc[Ai] + a_cw[Ai] + a_ce[Ai];
-            left   =-a_cs[Ai];
-            right  =-a_cn[Ai];
+            left   = -a_cs[Ai];
+            right  = -a_cn[Ai];
             break;
       }
 
@@ -900,26 +914,26 @@ hypre_PFMGSetupInterpOp_CC0_SS5
          switch (Pstenc0)
          {
             case -1:
-               Pp0[Pi] = left/center;
+               Pp0[Pi] = left / center;
                break;
             case  1:
-               Pp0[Pi] = right/center;
+               Pp0[Pi] = right / center;
                break;
          }
 
          switch (Pstenc1)
          {
             case -1:
-               Pp1[Pi] = left/center;
+               Pp1[Pi] = left / center;
                break;
             case  1:
-               Pp1[Pi] = right/center;
+               Pp1[Pi] = right / center;
                break;
          }
       }
 
-      if (p0[Ai] == 0.0) Pp0[Pi] = 0.0;
-      if (p1[Ai] == 0.0) Pp1[Pi] = 0.0;
+      if (p0[Ai] == 0.0) { Pp0[Pi] = 0.0; }
+      if (p1[Ai] == 0.0) { Pp1[Pi] = 0.0; }
       /*----------------------------------------------
        * Set interpolation weight to zero, if stencil
        * entry in same direction is zero. Prevents
@@ -956,15 +970,18 @@ hypre_PFMGSetupInterpOp_CC0_SS9
   HYPRE_Int           rap_type,
   hypre_Index        *P_stencil_shape )
 {
-  //hypre_StructStencil   *stencil = hypre_StructMatrixStencil(A);
-  //hypre_Index           *stencil_shape = hypre_StructStencilShape(stencil);
-  //HYPRE_Int              stencil_size = hypre_StructStencilSize(stencil);
-  //HYPRE_Int              warning_cnt= 0;
+   HYPRE_UNUSED_VAR(rap_type);
+   HYPRE_UNUSED_VAR(Pstenc1);
+
+   //hypre_StructStencil   *stencil = hypre_StructMatrixStencil(A);
+   //hypre_Index           *stencil_shape = hypre_StructStencilShape(stencil);
+   //HYPRE_Int              stencil_size = hypre_StructStencilSize(stencil);
+   //HYPRE_Int              warning_cnt= 0;
 
    hypre_Index            index;
    HYPRE_Real            *a_cc, *a_cw, *a_ce, *a_cs, *a_cn;
    HYPRE_Real            *a_csw, *a_cse, *a_cne, *a_cnw;
-   HYPRE_Real            *p0,*p1;
+   HYPRE_Real            *p0, *p1;
 
    p0 = hypre_StructMatrixExtractPointerByIndex(A, i, P_stencil_shape[0]);
    p1 = hypre_StructMatrixExtractPointerByIndex(A, i, P_stencil_shape[1]);
@@ -978,19 +995,19 @@ hypre_PFMGSetupInterpOp_CC0_SS9
     * a_cn is pointer for north coefficient
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index,0,0,0);
+   hypre_SetIndex3(index, 0, 0, 0);
    a_cc = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index,-1,0,0);
+   hypre_SetIndex3(index, -1, 0, 0);
    a_cw = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index,1,0,0);
+   hypre_SetIndex3(index, 1, 0, 0);
    a_ce = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index,0,-1,0);
+   hypre_SetIndex3(index, 0, -1, 0);
    a_cs = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index,0,1,0);
+   hypre_SetIndex3(index, 0, 1, 0);
    a_cn = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
    /*-----------------------------------------------------------------
@@ -1002,13 +1019,13 @@ hypre_PFMGSetupInterpOp_CC0_SS9
     * a_cne is pointer for northeast coefficient
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index,-1,-1, 0);
+   hypre_SetIndex3(index, -1, -1, 0);
    a_csw = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index, 1,-1, 0);
+   hypre_SetIndex3(index, 1, -1, 0);
    a_cse = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index,-1, 1, 0);
+   hypre_SetIndex3(index, -1, 1, 0);
    a_cnw = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
    hypre_SetIndex3(index, 1, 1, 0);
@@ -1019,19 +1036,19 @@ hypre_PFMGSetupInterpOp_CC0_SS9
                        A_dbox, start, stride, Ai,
                        P_dbox, startc, stridec, Pi);
    {
-      HYPRE_Real center,left,right;
+      HYPRE_Real center, left, right;
 
       switch (cdir)
       {
          case 0:
             center = a_cc[Ai] +  a_cs[Ai] +  a_cn[Ai];
-            left   =-a_cw[Ai] - a_csw[Ai] - a_cnw[Ai];
-            right  =-a_ce[Ai] - a_cse[Ai] - a_cne[Ai];
+            left   = -a_cw[Ai] - a_csw[Ai] - a_cnw[Ai];
+            right  = -a_ce[Ai] - a_cse[Ai] - a_cne[Ai];
             break;
-         case 1:
+      case 1: default:
             center = a_cc[Ai] +  a_cw[Ai] +  a_ce[Ai];
-            left   =-a_cs[Ai] - a_csw[Ai] - a_cse[Ai];
-            right  =-a_cn[Ai] - a_cnw[Ai] - a_cne[Ai];
+            left   = -a_cs[Ai] - a_csw[Ai] - a_cse[Ai];
+            right  = -a_cn[Ai] - a_cnw[Ai] - a_cne[Ai];
             break;
       };
 
@@ -1046,12 +1063,12 @@ hypre_PFMGSetupInterpOp_CC0_SS9
          switch (Pstenc0)
          {
             case -1:
-               Pp0[Pi] = left/center;
-               Pp1[Pi] = right/center;
+               Pp0[Pi] = left / center;
+               Pp1[Pi] = right / center;
                break;
             case 1:
-               Pp0[Pi] = right/center;
-               Pp1[Pi] = left/center;
+               Pp0[Pi] = right / center;
+               Pp1[Pi] = left / center;
                break;
          };
          /*
@@ -1065,8 +1082,8 @@ hypre_PFMGSetupInterpOp_CC0_SS9
             */
       }
 
-      if (p0[Ai] == 0.0) Pp0[Pi] = 0.0;
-      if (p1[Ai] == 0.0) Pp1[Pi] = 0.0;
+      if (p0[Ai] == 0.0) { Pp0[Pi] = 0.0; }
+      if (p1[Ai] == 0.0) { Pp1[Pi] = 0.0; }
    }
    hypre_BoxLoop2End(Ai, Pi);
 #undef DEVICE_VAR
@@ -1093,14 +1110,17 @@ hypre_PFMGSetupInterpOp_CC0_SS7
   HYPRE_Int           rap_type,
   hypre_Index        *P_stencil_shape )
 {
-  //hypre_StructStencil   *stencil = hypre_StructMatrixStencil(A);
-  //hypre_Index           *stencil_shape = hypre_StructStencilShape(stencil);
-  //HYPRE_Int              stencil_size = hypre_StructStencilSize(stencil);
-  //HYPRE_Int              warning_cnt= 0;
+   HYPRE_UNUSED_VAR(rap_type);
+   HYPRE_UNUSED_VAR(Pstenc1);
+
+   //hypre_StructStencil   *stencil = hypre_StructMatrixStencil(A);
+   //hypre_Index           *stencil_shape = hypre_StructStencilShape(stencil);
+   //HYPRE_Int              stencil_size = hypre_StructStencilSize(stencil);
+   //HYPRE_Int              warning_cnt= 0;
 
    hypre_Index            index;
    HYPRE_Real            *a_cc, *a_cw, *a_ce, *a_cs, *a_cn, *a_ac, *a_bc;
-   HYPRE_Real            *p0,*p1;
+   HYPRE_Real            *p0, *p1;
 
    p0 = hypre_StructMatrixExtractPointerByIndex(A, i, P_stencil_shape[0]);
    p1 = hypre_StructMatrixExtractPointerByIndex(A, i, P_stencil_shape[1]);
@@ -1117,25 +1137,25 @@ hypre_PFMGSetupInterpOp_CC0_SS7
     * a_bc is pointer for center coefficient in plane below
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index,0,0,0);
+   hypre_SetIndex3(index, 0, 0, 0);
    a_cc = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index,-1,0,0);
+   hypre_SetIndex3(index, -1, 0, 0);
    a_cw = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index,1,0,0);
+   hypre_SetIndex3(index, 1, 0, 0);
    a_ce = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index,0,-1,0);
+   hypre_SetIndex3(index, 0, -1, 0);
    a_cs = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index,0,1,0);
+   hypre_SetIndex3(index, 0, 1, 0);
    a_cn = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index,0,0,1);
+   hypre_SetIndex3(index, 0, 0, 1);
    a_ac = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index,0,0,-1);
+   hypre_SetIndex3(index, 0, 0, -1);
    a_bc = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
 #define DEVICE_VAR is_device_ptr(a_cc,a_cs,a_cn,a_ac,a_bc,a_cw,a_ce,Pp0,Pp1,p0,p1)
@@ -1143,24 +1163,24 @@ hypre_PFMGSetupInterpOp_CC0_SS7
                        A_dbox, start, stride, Ai,
                        P_dbox, startc, stridec, Pi);
    {
-      HYPRE_Real center,left,right;
+      HYPRE_Real center, left, right;
 
       switch (cdir)
       {
          case 0:
             center = a_cc[Ai] +  a_cs[Ai] + a_cn[Ai] + a_ac[Ai] + a_bc[Ai];
-            left   =-a_cw[Ai];
-            right  =-a_ce[Ai];
+            left   = -a_cw[Ai];
+            right  = -a_ce[Ai];
             break;
          case 1:
             center = a_cc[Ai] +  a_cw[Ai] +  a_ce[Ai] + a_ac[Ai] + a_bc[Ai] ;
-            left   =-a_cs[Ai];
-            right  =-a_cn[Ai];
+            left   = -a_cs[Ai];
+            right  = -a_cn[Ai];
             break;
-         case 2:
+      case 2: default:
             center = a_cc[Ai] +  a_cw[Ai] +  a_ce[Ai] + a_cs[Ai] + a_cn[Ai] ;
-            left   =-a_bc[Ai];
-            right  =-a_ac[Ai];
+            left   = -a_bc[Ai];
+            right  = -a_ac[Ai];
             break;
       };
 
@@ -1174,12 +1194,12 @@ hypre_PFMGSetupInterpOp_CC0_SS7
          switch (Pstenc0)
          {
             case -1:
-               Pp0[Pi] = left/center;
-               Pp1[Pi] = right/center;
+               Pp0[Pi] = left / center;
+               Pp1[Pi] = right / center;
                break;
             case 1:
-               Pp0[Pi] = right/center;
-               Pp1[Pi] = left/center;
+               Pp0[Pi] = right / center;
+               Pp1[Pi] = left / center;
                break;
          };
          /*
@@ -1193,8 +1213,8 @@ hypre_PFMGSetupInterpOp_CC0_SS7
             */
       }
 
-      if (p0[Ai] == 0.0) Pp0[Pi] = 0.0;
-      if (p1[Ai] == 0.0) Pp1[Pi] = 0.0;
+      if (p0[Ai] == 0.0) { Pp0[Pi] = 0.0; }
+      if (p1[Ai] == 0.0) { Pp1[Pi] = 0.0; }
 
       //printf("%d: %d, Pp0[%d] = %e, Pp1 = %e, %e, %e, %e, cc=%e, cw=%e, ce=%e, cs=%e, cn=%e, bc=%e, ac=%e \n",Ai,cdir, Pi,Pp0[Pi],Pp1[Pi],center, left, right,
       //     a_cc[Ai],a_cw[Ai],a_ce[Ai],a_cs[Ai],a_cn[Ai],a_bc[Ai],a_ac[Ai]);
@@ -1225,12 +1245,15 @@ hypre_PFMGSetupInterpOp_CC0_SS15
   HYPRE_Int           rap_type,
   hypre_Index        *P_stencil_shape )
 {
+   HYPRE_UNUSED_VAR(rap_type);
+   HYPRE_UNUSED_VAR(Pstenc1);
+
    hypre_Index           index;
    HYPRE_Int             stencil_type15;
    HYPRE_Real           *a_cc, *a_cw, *a_ce, *a_cs, *a_cn, *a_ac, *a_bc;
    HYPRE_Real           *a_aw, *a_ae, *a_as, *a_an, *a_bw, *a_be, *a_bs, *a_bn;
    HYPRE_Real           *a_csw, *a_cse, *a_cnw, *a_cne;
-   HYPRE_Real           *p0,*p1;
+   HYPRE_Real           *p0, *p1;
 
    p0 = hypre_StructMatrixExtractPointerByIndex(A, i, P_stencil_shape[0]);
    p1 = hypre_StructMatrixExtractPointerByIndex(A, i, P_stencil_shape[1]);
@@ -1247,25 +1270,25 @@ hypre_PFMGSetupInterpOp_CC0_SS15
     * a_bc is pointer for center coefficient in plane below
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index,0,0,0);
+   hypre_SetIndex3(index, 0, 0, 0);
    a_cc = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index,-1,0,0);
+   hypre_SetIndex3(index, -1, 0, 0);
    a_cw = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index,1,0,0);
+   hypre_SetIndex3(index, 1, 0, 0);
    a_ce = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index,0,-1,0);
+   hypre_SetIndex3(index, 0, -1, 0);
    a_cs = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index,0,1,0);
+   hypre_SetIndex3(index, 0, 1, 0);
    a_cn = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index,0,0,1);
+   hypre_SetIndex3(index, 0, 0, 1);
    a_ac = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index,0,0,-1);
+   hypre_SetIndex3(index, 0, 0, -1);
    a_bc = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
    /*-----------------------------------------------------------------
@@ -1285,37 +1308,37 @@ hypre_PFMGSetupInterpOp_CC0_SS15
     * a_cne is pointer for northeast coefficient in same plane
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index,-1, 0, 1);
+   hypre_SetIndex3(index, -1, 0, 1);
    a_aw = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
    hypre_SetIndex3(index, 1, 0, 1);
    a_ae = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index, 0,-1, 1);
+   hypre_SetIndex3(index, 0, -1, 1);
    a_as = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
    hypre_SetIndex3(index, 0, 1, 1);
    a_an = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index,-1, 0,-1);
+   hypre_SetIndex3(index, -1, 0, -1);
    a_bw = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index, 1, 0,-1);
+   hypre_SetIndex3(index, 1, 0, -1);
    a_be = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index, 0,-1,-1);
+   hypre_SetIndex3(index, 0, -1, -1);
    a_bs = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index, 0, 1,-1);
+   hypre_SetIndex3(index, 0, 1, -1);
    a_bn = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index,-1,-1, 0);
+   hypre_SetIndex3(index, -1, -1, 0);
    a_csw = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index, 1,-1, 0);
+   hypre_SetIndex3(index, 1, -1, 0);
    a_cse = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index,-1, 1, 0);
+   hypre_SetIndex3(index, -1, 1, 0);
    a_cnw = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
    hypre_SetIndex3(index, 1, 1, 0);
@@ -1361,9 +1384,9 @@ hypre_PFMGSetupInterpOp_CC0_SS15
                left   = -a_cs[Ai] - a_csw[Ai] - a_cse[Ai]; /* front */
                right  = -a_cn[Ai] - a_cnw[Ai] - a_cne[Ai]; /* back */
                break;
-            case 2:
+         case 2: default:
                center =   a_cc[Ai] +  a_cw[Ai] +   a_ce[Ai] +  a_cs[Ai] + a_cn[Ai] +
-                         a_csw[Ai] + a_cse[Ai] +  a_cnw[Ai] - a_cne[Ai];
+                          a_csw[Ai] + a_cse[Ai] +  a_cnw[Ai] - a_cne[Ai];
                left   =  -a_bc[Ai] -  a_bw[Ai] -   a_be[Ai]; /* below */
                right  =  -a_ac[Ai] -  a_aw[Ai] -   a_ae[Ai]; /* above */
                break;
@@ -1403,8 +1426,8 @@ hypre_PFMGSetupInterpOp_CC0_SS15
    else if (stencil_type15 == 1)
    {
       hypre_BoxLoop2Begin(hypre_StructMatrixNDim(A), loop_size,
-            A_dbox, start, stride, Ai,
-            P_dbox, startc, stridec, Pi);
+                          A_dbox, start, stride, Ai,
+                          P_dbox, startc, stridec, Pi);
       {
          HYPRE_Real center, left, right;
 
@@ -1421,7 +1444,7 @@ hypre_PFMGSetupInterpOp_CC0_SS15
                left   = -a_cs[Ai] - a_as[Ai] - a_bs[Ai] - a_csw[Ai] - a_cse[Ai]; /* front */
                right  = -a_cn[Ai] - a_an[Ai] - a_bn[Ai] - a_cnw[Ai] - a_cne[Ai]; /* back */
                break;
-            case 2:
+         case 2: default:
                center =  a_cc[Ai] + a_cw[Ai] + a_ce[Ai] + a_cs[Ai] + a_cn[Ai] +
                          a_csw[Ai] + a_cse[Ai] + a_cnw[Ai] + a_cne[Ai];
                left   = -a_bc[Ai] - a_bs[Ai] - a_bn[Ai]; /* below */
@@ -1482,7 +1505,7 @@ hypre_PFMGSetupInterpOp_CC0_SS15
                left   = -a_cs[Ai] - a_as[Ai] - a_bs[Ai]; /* front */
                right  = -a_cn[Ai] - a_an[Ai] - a_bn[Ai]; /* back */
                break;
-            case 2:
+         case 2: default:
                center =  a_cc[Ai] + a_cw[Ai] + a_ce[Ai] + a_cs[Ai] + a_cn[Ai];
                left   = -a_bc[Ai] - a_bw[Ai] - a_be[Ai] - a_bs[Ai] - a_bn[Ai]; /* below */
                right  = -a_ac[Ai] - a_aw[Ai] - a_ae[Ai] - a_as[Ai] - a_an[Ai]; /* above */
@@ -1545,16 +1568,19 @@ hypre_PFMGSetupInterpOp_CC0_SS19
   HYPRE_Int           rap_type,
   hypre_Index        *P_stencil_shape )
 {
-  //hypre_StructStencil   *stencil = hypre_StructMatrixStencil(A);
-  // hypre_Index           *stencil_shape = hypre_StructStencilShape(stencil);
-  //HYPRE_Int              stencil_size = hypre_StructStencilSize(stencil);
-  //HYPRE_Int              warning_cnt= 0;
+   HYPRE_UNUSED_VAR(Pstenc1);
+   HYPRE_UNUSED_VAR(rap_type);
+
+   //hypre_StructStencil   *stencil = hypre_StructMatrixStencil(A);
+   // hypre_Index           *stencil_shape = hypre_StructStencilShape(stencil);
+   //HYPRE_Int              stencil_size = hypre_StructStencilSize(stencil);
+   //HYPRE_Int              warning_cnt= 0;
 
    hypre_Index            index;
    HYPRE_Real           *a_cc, *a_cw, *a_ce, *a_cs, *a_cn, *a_ac, *a_bc;
    HYPRE_Real           *a_csw, *a_cse, *a_cne, *a_cnw;
    HYPRE_Real           *a_aw, *a_ae, *a_as, *a_an, *a_bw, *a_be, *a_bs, *a_bn;
-   HYPRE_Real            *p0,*p1;
+   HYPRE_Real            *p0, *p1;
 
    p0 = hypre_StructMatrixExtractPointerByIndex(A, i, P_stencil_shape[0]);
    p1 = hypre_StructMatrixExtractPointerByIndex(A, i, P_stencil_shape[1]);
@@ -1571,25 +1597,25 @@ hypre_PFMGSetupInterpOp_CC0_SS19
     * a_bc is pointer for center coefficient in plane below
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index,0,0,0);
+   hypre_SetIndex3(index, 0, 0, 0);
    a_cc = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index,-1,0,0);
+   hypre_SetIndex3(index, -1, 0, 0);
    a_cw = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index,1,0,0);
+   hypre_SetIndex3(index, 1, 0, 0);
    a_ce = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index,0,-1,0);
+   hypre_SetIndex3(index, 0, -1, 0);
    a_cs = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index,0,1,0);
+   hypre_SetIndex3(index, 0, 1, 0);
    a_cn = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index,0,0,1);
+   hypre_SetIndex3(index, 0, 0, 1);
    a_ac = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index,0,0,-1);
+   hypre_SetIndex3(index, 0, 0, -1);
    a_bc = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
    /*-----------------------------------------------------------------
@@ -1609,37 +1635,37 @@ hypre_PFMGSetupInterpOp_CC0_SS19
     * a_cne is pointer for northeast coefficient in same plane
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index,-1, 0, 1);
+   hypre_SetIndex3(index, -1, 0, 1);
    a_aw = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
    hypre_SetIndex3(index, 1, 0, 1);
    a_ae = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index, 0,-1, 1);
+   hypre_SetIndex3(index, 0, -1, 1);
    a_as = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
    hypre_SetIndex3(index, 0, 1, 1);
    a_an = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index,-1, 0,-1);
+   hypre_SetIndex3(index, -1, 0, -1);
    a_bw = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index, 1, 0,-1);
+   hypre_SetIndex3(index, 1, 0, -1);
    a_be = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index, 0,-1,-1);
+   hypre_SetIndex3(index, 0, -1, -1);
    a_bs = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index, 0, 1,-1);
+   hypre_SetIndex3(index, 0, 1, -1);
    a_bn = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index,-1,-1, 0);
+   hypre_SetIndex3(index, -1, -1, 0);
    a_csw = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index, 1,-1, 0);
+   hypre_SetIndex3(index, 1, -1, 0);
    a_cse = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index,-1, 1, 0);
+   hypre_SetIndex3(index, -1, 1, 0);
    a_cnw = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
    hypre_SetIndex3(index, 1, 1, 0);
@@ -1650,24 +1676,27 @@ hypre_PFMGSetupInterpOp_CC0_SS19
                        A_dbox, start, stride, Ai,
                        P_dbox, startc, stridec, Pi);
    {
-      HYPRE_Real center,left,right;
+      HYPRE_Real center, left, right;
 
       switch (cdir)
       {
          case 0:
-            center = a_cc[Ai] +  a_cs[Ai] + a_cn[Ai] + a_ac[Ai] + a_bc[Ai] + a_as[Ai] + a_an[Ai] + a_bs[Ai] + a_bn[Ai];
-            left   =-a_cw[Ai] - a_aw[Ai] - a_bw[Ai] - a_csw[Ai] - a_cnw[Ai];
-            right  =-a_ce[Ai] - a_ae[Ai] - a_be[Ai] - a_cse[Ai] - a_cne[Ai];
+            center = a_cc[Ai] +  a_cs[Ai] + a_cn[Ai] + a_ac[Ai] + a_bc[Ai] + a_as[Ai] + a_an[Ai] + a_bs[Ai] +
+                     a_bn[Ai];
+            left   = -a_cw[Ai] - a_aw[Ai] - a_bw[Ai] - a_csw[Ai] - a_cnw[Ai];
+            right  = -a_ce[Ai] - a_ae[Ai] - a_be[Ai] - a_cse[Ai] - a_cne[Ai];
             break;
          case 1:
-            center = a_cc[Ai] +  a_cw[Ai] +  a_ce[Ai] + a_ac[Ai] + a_bc[Ai] + a_aw[Ai] + a_ae[Ai] + a_bw[Ai] + a_be[Ai];
-            left   =-a_cs[Ai] - a_as[Ai] - a_bs[Ai] - a_csw[Ai] - a_cse[Ai];
-            right  =-a_cn[Ai] - a_an[Ai] - a_bn[Ai] - a_cnw[Ai] - a_cne[Ai];
+            center = a_cc[Ai] +  a_cw[Ai] +  a_ce[Ai] + a_ac[Ai] + a_bc[Ai] + a_aw[Ai] + a_ae[Ai] + a_bw[Ai] +
+                     a_be[Ai];
+            left   = -a_cs[Ai] - a_as[Ai] - a_bs[Ai] - a_csw[Ai] - a_cse[Ai];
+            right  = -a_cn[Ai] - a_an[Ai] - a_bn[Ai] - a_cnw[Ai] - a_cne[Ai];
             break;
-         case 2:
-            center = a_cc[Ai] +  a_cw[Ai] +  a_ce[Ai] +  a_cs[Ai] + a_cn[Ai] + a_csw[Ai] + a_cse[Ai] + a_cnw[Ai] + a_cne[Ai];
-            left   =-a_bc[Ai] - a_bw[Ai] - a_be[Ai] - a_bs[Ai] - a_bn[Ai];
-            right  =-a_ac[Ai] - a_aw[Ai] - a_ae[Ai] - a_as[Ai] - a_an[Ai];
+      case 2: default:
+            center = a_cc[Ai] +  a_cw[Ai] +  a_ce[Ai] +  a_cs[Ai] + a_cn[Ai] + a_csw[Ai] + a_cse[Ai] + a_cnw[Ai]
+                     + a_cne[Ai];
+            left   = -a_bc[Ai] - a_bw[Ai] - a_be[Ai] - a_bs[Ai] - a_bn[Ai];
+            right  = -a_ac[Ai] - a_aw[Ai] - a_ae[Ai] - a_as[Ai] - a_an[Ai];
             break;
       };
 
@@ -1681,12 +1710,12 @@ hypre_PFMGSetupInterpOp_CC0_SS19
          switch (Pstenc0)
          {
             case -1:
-               Pp0[Pi] = left/center;
-               Pp1[Pi] = right/center;
+               Pp0[Pi] = left / center;
+               Pp1[Pi] = right / center;
                break;
             case 1:
-               Pp0[Pi] = right/center;
-               Pp1[Pi] = left/center;
+               Pp0[Pi] = right / center;
+               Pp1[Pi] = left / center;
                break;
          };
          /*
@@ -1700,8 +1729,8 @@ hypre_PFMGSetupInterpOp_CC0_SS19
             */
       }
 
-      if (p0[Ai] == 0.0) Pp0[Pi] = 0.0;
-      if (p1[Ai] == 0.0) Pp1[Pi] = 0.0;
+      if (p0[Ai] == 0.0) { Pp0[Pi] = 0.0; }
+      if (p1[Ai] == 0.0) { Pp1[Pi] = 0.0; }
       //printf("Pp0[%d] = %e, Pp1 = %e\n",Pi,Pp0[Pi],Pp1[Pi]);
    }
    hypre_BoxLoop2End(Ai, Pi);
@@ -1729,17 +1758,20 @@ hypre_PFMGSetupInterpOp_CC0_SS27
   HYPRE_Int           rap_type,
   hypre_Index        *P_stencil_shape )
 {
-  //hypre_StructStencil   *stencil = hypre_StructMatrixStencil(A);
-  //hypre_Index           *stencil_shape = hypre_StructStencilShape(stencil);
-  //HYPRE_Int              stencil_size = hypre_StructStencilSize(stencil);
-  //HYPRE_Int              warning_cnt= 0;
+   HYPRE_UNUSED_VAR(rap_type);
+   HYPRE_UNUSED_VAR(Pstenc1);
+
+   //hypre_StructStencil   *stencil = hypre_StructMatrixStencil(A);
+   //hypre_Index           *stencil_shape = hypre_StructStencilShape(stencil);
+   //HYPRE_Int              stencil_size = hypre_StructStencilSize(stencil);
+   //HYPRE_Int              warning_cnt= 0;
 
    hypre_Index            index;
    HYPRE_Real           *a_cc, *a_cw, *a_ce, *a_cs, *a_cn, *a_ac, *a_bc;
    HYPRE_Real           *a_csw, *a_cse, *a_cne, *a_cnw;
    HYPRE_Real           *a_aw, *a_ae, *a_as, *a_an, *a_bw, *a_be, *a_bs, *a_bn;
-   HYPRE_Real           *a_asw, *a_ase, *a_ane, *a_anw,*a_bsw, *a_bse, *a_bne, *a_bnw;
-   HYPRE_Real            *p0,*p1;
+   HYPRE_Real           *a_asw, *a_ase, *a_ane, *a_anw, *a_bsw, *a_bse, *a_bne, *a_bnw;
+   HYPRE_Real            *p0, *p1;
 
    p0 = hypre_StructMatrixExtractPointerByIndex(A, i, P_stencil_shape[0]);
    p1 = hypre_StructMatrixExtractPointerByIndex(A, i, P_stencil_shape[1]);
@@ -1756,25 +1788,25 @@ hypre_PFMGSetupInterpOp_CC0_SS27
     * a_bc is pointer for center coefficient in plane below
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index,0,0,0);
+   hypre_SetIndex3(index, 0, 0, 0);
    a_cc = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index,-1,0,0);
+   hypre_SetIndex3(index, -1, 0, 0);
    a_cw = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index,1,0,0);
+   hypre_SetIndex3(index, 1, 0, 0);
    a_ce = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index,0,-1,0);
+   hypre_SetIndex3(index, 0, -1, 0);
    a_cs = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index,0,1,0);
+   hypre_SetIndex3(index, 0, 1, 0);
    a_cn = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index,0,0,1);
+   hypre_SetIndex3(index, 0, 0, 1);
    a_ac = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index,0,0,-1);
+   hypre_SetIndex3(index, 0, 0, -1);
    a_bc = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
    /*-----------------------------------------------------------------
@@ -1794,37 +1826,37 @@ hypre_PFMGSetupInterpOp_CC0_SS27
     * a_cne is pointer for northeast coefficient in same plane
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index,-1, 0, 1);
+   hypre_SetIndex3(index, -1, 0, 1);
    a_aw = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
    hypre_SetIndex3(index, 1, 0, 1);
    a_ae = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index, 0,-1, 1);
+   hypre_SetIndex3(index, 0, -1, 1);
    a_as = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
    hypre_SetIndex3(index, 0, 1, 1);
    a_an = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index,-1, 0,-1);
+   hypre_SetIndex3(index, -1, 0, -1);
    a_bw = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index, 1, 0,-1);
+   hypre_SetIndex3(index, 1, 0, -1);
    a_be = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index, 0,-1,-1);
+   hypre_SetIndex3(index, 0, -1, -1);
    a_bs = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index, 0, 1,-1);
+   hypre_SetIndex3(index, 0, 1, -1);
    a_bn = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index,-1,-1, 0);
+   hypre_SetIndex3(index, -1, -1, 0);
    a_csw = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index, 1,-1, 0);
+   hypre_SetIndex3(index, 1, -1, 0);
    a_cse = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index,-1, 1, 0);
+   hypre_SetIndex3(index, -1, 1, 0);
    a_cnw = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
    hypre_SetIndex3(index, 1, 1, 0);
@@ -1843,28 +1875,28 @@ hypre_PFMGSetupInterpOp_CC0_SS27
     * a_bne is pointer for northeast coefficient in plane below
     *-----------------------------------------------------------------*/
 
-   hypre_SetIndex3(index,-1,-1, 1);
+   hypre_SetIndex3(index, -1, -1, 1);
    a_asw = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index, 1,-1, 1);
+   hypre_SetIndex3(index, 1, -1, 1);
    a_ase = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index,-1, 1, 1);
+   hypre_SetIndex3(index, -1, 1, 1);
    a_anw = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
    hypre_SetIndex3(index, 1, 1, 1);
    a_ane = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index,-1,-1,-1);
+   hypre_SetIndex3(index, -1, -1, -1);
    a_bsw = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index, 1,-1,-1);
+   hypre_SetIndex3(index, 1, -1, -1);
    a_bse = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index,-1, 1,-1);
+   hypre_SetIndex3(index, -1, 1, -1);
    a_bnw = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
-   hypre_SetIndex3(index, 1, 1,-1);
+   hypre_SetIndex3(index, 1, 1, -1);
    a_bne = hypre_StructMatrixExtractPointerByIndex(A, i, index);
 
 #define DEVICE_VAR is_device_ptr(a_cc,a_cs,a_cn,a_ac,a_bc,a_as,a_an,a_bs,a_bn,a_cw,a_aw,a_bw,a_csw,a_cnw,a_asw,a_anw,a_bsw,a_bnw,a_ce,a_ae,a_be,a_cse,a_cne,a_ase,a_ane,a_bse,a_bne,Pp0,Pp1,p0,p1)
@@ -1872,25 +1904,34 @@ hypre_PFMGSetupInterpOp_CC0_SS27
                        A_dbox, start, stride, Ai,
                        P_dbox, startc, stridec, Pi);
    {
-      HYPRE_Real center,left,right;
+      HYPRE_Real center, left, right;
 
       switch (cdir)
       {
-      case 0:
-         center = a_cc[Ai] +  a_cs[Ai] + a_cn[Ai] + a_ac[Ai] + a_bc[Ai] + a_as[Ai] + a_an[Ai] + a_bs[Ai] + a_bn[Ai];
-         left   =-a_cw[Ai] - a_aw[Ai] - a_bw[Ai] - a_csw[Ai] - a_cnw[Ai] - a_asw[Ai] - a_anw[Ai] - a_bsw[Ai] - a_bnw[Ai];
-         right  =-a_ce[Ai] - a_ae[Ai] - a_be[Ai] - a_cse[Ai] - a_cne[Ai] - a_ase[Ai] - a_ane[Ai] - a_bse[Ai] - a_bne[Ai];
-         break;
-      case 1:
-         center = a_cc[Ai] +  a_cw[Ai] +  a_ce[Ai] + a_ac[Ai] + a_bc[Ai] + a_aw[Ai] + a_ae[Ai] + a_bw[Ai] + a_be[Ai];
-         left   =-a_cs[Ai] - a_as[Ai] - a_bs[Ai] - a_csw[Ai] - a_cse[Ai] - a_asw[Ai] - a_ase[Ai] - a_bsw[Ai] - a_bse[Ai];
-         right  =-a_cn[Ai] - a_an[Ai] - a_bn[Ai] - a_cnw[Ai] - a_cne[Ai] - a_anw[Ai] - a_ane[Ai] - a_bnw[Ai] - a_bne[Ai];
-         break;
-      case 2:
-         center = a_cc[Ai] +  a_cw[Ai] +  a_ce[Ai] +  a_cs[Ai] + a_cn[Ai] + a_csw[Ai] + a_cse[Ai] + a_cnw[Ai] + a_cne[Ai];
-         left   =-a_bc[Ai] - a_bw[Ai] - a_be[Ai] - a_bs[Ai] - a_bn[Ai] - a_bsw[Ai] - a_bse[Ai] - a_bnw[Ai] - a_bne[Ai];
-         right  =-a_ac[Ai] - a_aw[Ai] - a_ae[Ai] - a_as[Ai] - a_an[Ai] - a_asw[Ai] - a_ase[Ai] - a_anw[Ai] - a_ane[Ai];
-         break;
+         case 0:
+            center = a_cc[Ai] +  a_cs[Ai] + a_cn[Ai] + a_ac[Ai] + a_bc[Ai] + a_as[Ai] + a_an[Ai] + a_bs[Ai] +
+                     a_bn[Ai];
+            left   = -a_cw[Ai] - a_aw[Ai] - a_bw[Ai] - a_csw[Ai] - a_cnw[Ai] - a_asw[Ai] - a_anw[Ai] - a_bsw[Ai]
+                     - a_bnw[Ai];
+            right  = -a_ce[Ai] - a_ae[Ai] - a_be[Ai] - a_cse[Ai] - a_cne[Ai] - a_ase[Ai] - a_ane[Ai] - a_bse[Ai]
+                     - a_bne[Ai];
+            break;
+         case 1:
+            center = a_cc[Ai] +  a_cw[Ai] +  a_ce[Ai] + a_ac[Ai] + a_bc[Ai] + a_aw[Ai] + a_ae[Ai] + a_bw[Ai] +
+                     a_be[Ai];
+            left   = -a_cs[Ai] - a_as[Ai] - a_bs[Ai] - a_csw[Ai] - a_cse[Ai] - a_asw[Ai] - a_ase[Ai] - a_bsw[Ai]
+                     - a_bse[Ai];
+            right  = -a_cn[Ai] - a_an[Ai] - a_bn[Ai] - a_cnw[Ai] - a_cne[Ai] - a_anw[Ai] - a_ane[Ai] - a_bnw[Ai]
+                     - a_bne[Ai];
+            break;
+      case 2: default:
+            center = a_cc[Ai] +  a_cw[Ai] +  a_ce[Ai] +  a_cs[Ai] + a_cn[Ai] + a_csw[Ai] + a_cse[Ai] + a_cnw[Ai]
+                     + a_cne[Ai];
+            left   = -a_bc[Ai] - a_bw[Ai] - a_be[Ai] - a_bs[Ai] - a_bn[Ai] - a_bsw[Ai] - a_bse[Ai] - a_bnw[Ai] -
+                     a_bne[Ai];
+            right  = -a_ac[Ai] - a_aw[Ai] - a_ae[Ai] - a_as[Ai] - a_an[Ai] - a_asw[Ai] - a_ase[Ai] - a_anw[Ai] -
+                     a_ane[Ai];
+            break;
       };
 
       if (!center)
@@ -1904,12 +1945,12 @@ hypre_PFMGSetupInterpOp_CC0_SS27
          switch (Pstenc0)
          {
             case -1:
-               Pp0[Pi] = left/center;
-               Pp1[Pi] = right/center;
+               Pp0[Pi] = left / center;
+               Pp1[Pi] = right / center;
                break;
             case 1:
-               Pp0[Pi] = right/center;
-               Pp1[Pi] = left/center;
+               Pp0[Pi] = right / center;
+               Pp1[Pi] = left / center;
                break;
          };
          /*
@@ -1923,8 +1964,8 @@ hypre_PFMGSetupInterpOp_CC0_SS27
             */
       }
 
-      if (p0[Ai] == 0.0) Pp0[Pi] = 0.0;
-      if (p1[Ai] == 0.0) Pp1[Pi] = 0.0;
+      if (p0[Ai] == 0.0) { Pp0[Pi] = 0.0; }
+      if (p1[Ai] == 0.0) { Pp1[Pi] = 0.0; }
       //printf("Pp0[%d] = %e, Pp1 = %e\n",Pi,Pp0[Pi],Pp1[Pi]);
    }
    hypre_BoxLoop2End(Ai, Pi);
@@ -1934,4 +1975,3 @@ hypre_PFMGSetupInterpOp_CC0_SS27
 }
 
 #endif
-
diff --git a/external/hypre/src/struct_ls/pfmg_setup_rap.c b/external/hypre/src/struct_ls/pfmg_setup_rap.c
index 331b7c85..2823f007 100644
--- a/external/hypre/src/struct_ls/pfmg_setup_rap.c
+++ b/external/hypre/src/struct_ls/pfmg_setup_rap.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -32,7 +32,7 @@ hypre_PFMGCreateRAPOp( hypre_StructMatrix *R,
                        HYPRE_Int           cdir,
                        HYPRE_Int           rap_type    )
 {
-   hypre_StructMatrix    *RAP=NULL;
+   hypre_StructMatrix    *RAP = NULL;
    hypre_StructStencil   *stencil;
    HYPRE_Int              P_stored_as_transpose = 0;
    HYPRE_Int              constant_coefficient;
@@ -44,11 +44,11 @@ hypre_PFMGCreateRAPOp( hypre_StructMatrix *R,
       switch (hypre_StructStencilNDim(stencil))
       {
          case 2:
-            RAP = hypre_PFMG2CreateRAPOp(R ,A, P, coarse_grid, cdir);
+            RAP = hypre_PFMG2CreateRAPOp(R, A, P, coarse_grid, cdir);
             break;
 
          case 3:
-            RAP = hypre_PFMG3CreateRAPOp(R ,A, P, coarse_grid, cdir);
+            RAP = hypre_PFMG3CreateRAPOp(R, A, P, coarse_grid, cdir);
             break;
       }
    }
@@ -58,23 +58,23 @@ hypre_PFMGCreateRAPOp( hypre_StructMatrix *R,
       switch (hypre_StructStencilNDim(stencil))
       {
          case 2:
-            RAP =  hypre_PFMGCreateCoarseOp5(R ,A, P, coarse_grid, cdir);
+            RAP =  hypre_PFMGCreateCoarseOp5(R, A, P, coarse_grid, cdir);
             break;
 
          case 3:
-            RAP =  hypre_PFMGCreateCoarseOp7(R ,A, P, coarse_grid, cdir);
+            RAP =  hypre_PFMGCreateCoarseOp7(R, A, P, coarse_grid, cdir);
             break;
       }
    }
    else if (rap_type == 2)
    {
-      RAP = hypre_SemiCreateRAPOp(R ,A, P, coarse_grid, cdir,
+      RAP = hypre_SemiCreateRAPOp(R, A, P, coarse_grid, cdir,
                                   P_stored_as_transpose);
    }
 
 
    constant_coefficient = hypre_StructMatrixConstantCoefficient(A);
-   if ( constant_coefficient==2 && rap_type==0 )
+   if ( constant_coefficient == 2 && rap_type == 0 )
    {
       /* A has variable diagonal, so, in the Galerkin case, P (and R) is
          entirely variable coefficient.  Thus RAP will be variable coefficient */
@@ -140,6 +140,8 @@ hypre_PFMGSetupRAPOp( hypre_StructMatrix *R,
 #endif
    stencil = hypre_StructMatrixStencil(A);
 
+   HYPRE_ANNOTATE_FUNC_BEGIN;
+
    if (rap_type == 0)
    {
       switch (hypre_StructStencilNDim(stencil))
@@ -153,8 +155,10 @@ hypre_PFMGSetupRAPOp( hypre_StructMatrix *R,
             /*--------------------------------------------------------------------
              *    For non-symmetric A, set upper triangular coefficients as well
              *--------------------------------------------------------------------*/
-            if(!hypre_StructMatrixSymmetric(A))
+            if (!hypre_StructMatrixSymmetric(A))
+            {
                hypre_PFMG2BuildRAPNoSym(A, P, R, cdir, cindex, cstride, Ac_tmp);
+            }
 
             break;
 
@@ -168,8 +172,10 @@ hypre_PFMGSetupRAPOp( hypre_StructMatrix *R,
             /*--------------------------------------------------------------------
              *    For non-symmetric A, set upper triangular coefficients as well
              *--------------------------------------------------------------------*/
-            if(!hypre_StructMatrixSymmetric(A))
+            if (!hypre_StructMatrixSymmetric(A))
+            {
                hypre_PFMG3BuildRAPNoSym(A, P, R, cdir, cindex, cstride, Ac_tmp);
+            }
 
             break;
       }
@@ -200,31 +206,39 @@ hypre_PFMGSetupRAPOp( hypre_StructMatrix *R,
 #if 0 //defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    if ( data_location_A != data_location_Ac )
    {
-     if (constant_coefficient == 0)
-     {
-        hypre_TMemcpy(hypre_StructMatrixDataConst(Ac),hypre_StructMatrixData(Ac_tmp),HYPRE_Complex,hypre_StructMatrixDataSize(Ac_tmp),HYPRE_MEMORY_HOST,HYPRE_MEMORY_DEVICE);
-     }
-     else if (constant_coefficient == 1)
-     {
-        hypre_TMemcpy(hypre_StructMatrixDataConst(Ac),hypre_StructMatrixDataConst(Ac_tmp),HYPRE_Complex,hypre_StructMatrixDataConstSize(Ac_tmp),HYPRE_MEMORY_HOST,HYPRE_MEMORY_HOST);
-     }
-     else if (constant_coefficient == 2)
-     {
-        hypre_TMemcpy(hypre_StructMatrixDataConst(Ac),hypre_StructMatrixDataConst(Ac_tmp),HYPRE_Complex,hypre_StructMatrixDataConstSize(Ac_tmp),HYPRE_MEMORY_HOST,HYPRE_MEMORY_HOST);
-        hypre_StructStencil *stencil_c       = hypre_StructMatrixStencil(Ac);
-        HYPRE_Int stencil_size  = hypre_StructStencilSize(stencil_c);
-        HYPRE_Complex       *Acdiag = hypre_StructMatrixDataConst(Ac) + stencil_size;
-        hypre_TMemcpy(Acdiag, hypre_StructMatrixData(Ac_tmp),HYPRE_Complex,hypre_StructMatrixDataSize(Ac_tmp),HYPRE_MEMORY_HOST,HYPRE_MEMORY_DEVICE);
-     }
-
-      hypre_HandleStructExecPolicy(hypre_handle()) = data_location_Ac == HYPRE_MEMORY_DEVICE ? HYPRE_EXEC_DEVICE : HYPRE_EXEC_HOST;
+      if (constant_coefficient == 0)
+      {
+         hypre_TMemcpy(hypre_StructMatrixDataConst(Ac), hypre_StructMatrixData(Ac_tmp), HYPRE_Complex,
+                       hypre_StructMatrixDataSize(Ac_tmp), HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
+      }
+      else if (constant_coefficient == 1)
+      {
+         hypre_TMemcpy(hypre_StructMatrixDataConst(Ac), hypre_StructMatrixDataConst(Ac_tmp), HYPRE_Complex,
+                       hypre_StructMatrixDataConstSize(Ac_tmp), HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
+      }
+      else if (constant_coefficient == 2)
+      {
+         hypre_TMemcpy(hypre_StructMatrixDataConst(Ac), hypre_StructMatrixDataConst(Ac_tmp), HYPRE_Complex,
+                       hypre_StructMatrixDataConstSize(Ac_tmp), HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
+         hypre_StructStencil *stencil_c       = hypre_StructMatrixStencil(Ac);
+         HYPRE_Int stencil_size  = hypre_StructStencilSize(stencil_c);
+         HYPRE_Complex       *Acdiag = hypre_StructMatrixDataConst(Ac) + stencil_size;
+         hypre_TMemcpy(Acdiag, hypre_StructMatrixData(Ac_tmp), HYPRE_Complex,
+                       hypre_StructMatrixDataSize(Ac_tmp), HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
+      }
+
+      hypre_HandleStructExecPolicy(hypre_handle()) = data_location_Ac == HYPRE_MEMORY_DEVICE ?
+                                                     HYPRE_EXEC_DEVICE : HYPRE_EXEC_HOST;
       hypre_StructGridDataLocation(hypre_StructMatrixGrid(Ac)) = data_location_Ac;
       hypre_StructMatrixAssemble(Ac);
-      hypre_HandleStructExecPolicy(hypre_handle()) = data_location_A == HYPRE_MEMORY_DEVICE ? HYPRE_EXEC_DEVICE : HYPRE_EXEC_HOST;
+      hypre_HandleStructExecPolicy(hypre_handle()) = data_location_A == HYPRE_MEMORY_DEVICE ?
+                                                     HYPRE_EXEC_DEVICE : HYPRE_EXEC_HOST;
       hypre_StructMatrixDestroy(Ac_tmp);
    }
 #endif
 
+   HYPRE_ANNOTATE_FUNC_END;
+
    return hypre_error_flag;
 }
 
diff --git a/external/hypre/src/struct_ls/pfmg_setup_rap5.c b/external/hypre/src/struct_ls/pfmg_setup_rap5.c
index 8b3c4186..48b8b8f1 100644
--- a/external/hypre/src/struct_ls/pfmg_setup_rap5.c
+++ b/external/hypre/src/struct_ls/pfmg_setup_rap5.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -35,6 +35,9 @@ hypre_PFMGCreateCoarseOp5( hypre_StructMatrix *R,
                            hypre_StructGrid   *coarse_grid,
                            HYPRE_Int           cdir        )
 {
+   HYPRE_UNUSED_VAR(R);
+   HYPRE_UNUSED_VAR(P);
+
    hypre_StructMatrix    *RAP;
 
    hypre_Index           *RAP_stencil_shape;
@@ -75,9 +78,9 @@ hypre_PFMGCreateCoarseOp5( hypre_StructMatrix *R,
             /*--------------------------------------------------------------
              * Storage for 5 elements (c,w,e,n,s)
              *--------------------------------------------------------------*/
-            if (i*j == 0)
+            if (i * j == 0)
             {
-               hypre_SetIndex3(index_temp,i,j,0);
+               hypre_SetIndex3(index_temp, i, j, 0);
                MapIndex(index_temp, cdir, RAP_stencil_shape[stencil_rank]);
                stencil_rank++;
             }
@@ -108,9 +111,9 @@ hypre_PFMGCreateCoarseOp5( hypre_StructMatrix *R,
             /*--------------------------------------------------------------
              * Store 3 elements in (c,w,s)
              *--------------------------------------------------------------*/
-            if( i*j == 0 )
+            if ( i * j == 0 )
             {
-               hypre_SetIndex3(index_temp,i,j,0);
+               hypre_SetIndex3(index_temp, i, j, 0);
                MapIndex(index_temp, cdir, RAP_stencil_shape[stencil_rank]);
                stencil_rank++;
             }
@@ -209,7 +212,7 @@ hypre_PFMGBuildCoarseOp5( hypre_StructMatrix *A,
 
    constant_coefficient = hypre_StructMatrixConstantCoefficient(RAP);
    hypre_assert( hypre_StructMatrixConstantCoefficient(A) == constant_coefficient );
-   if ( constant_coefficient==0 )
+   if ( constant_coefficient == 0 )
    {
       hypre_assert( hypre_StructMatrixConstantCoefficient(R) == 0 );
       hypre_assert( hypre_StructMatrixConstantCoefficient(P) == 0 );
@@ -248,11 +251,11 @@ hypre_PFMGBuildCoarseOp5( hypre_StructMatrix *A,
        * pa is pointer for weight for f-point above c-point
        *-----------------------------------------------------------------*/
 
-      hypre_SetIndex3(index_temp,0,-1,0);
+      hypre_SetIndex3(index_temp, 0, -1, 0);
       MapIndex(index_temp, cdir, index);
       pa = hypre_StructMatrixExtractPointerByIndex(P, fi, index);
 
-      hypre_SetIndex3(index_temp,0,1,0);
+      hypre_SetIndex3(index_temp, 0, 1, 0);
       MapIndex(index_temp, cdir, index);
       pb = hypre_StructMatrixExtractPointerByIndex(P, fi, index);
       //RL PTROFFSET
@@ -268,23 +271,23 @@ hypre_PFMGBuildCoarseOp5( hypre_StructMatrix *A,
        * a_ca is pointer for above coefficient
        *-----------------------------------------------------------------*/
 
-      hypre_SetIndex3(index_temp,0,0,0);
+      hypre_SetIndex3(index_temp, 0, 0, 0);
       MapIndex(index_temp, cdir, index);
       a_cc = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-      hypre_SetIndex3(index_temp,-1,0,0);
+      hypre_SetIndex3(index_temp, -1, 0, 0);
       MapIndex(index_temp, cdir, index);
       a_cw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-      hypre_SetIndex3(index_temp,1,0,0);
+      hypre_SetIndex3(index_temp, 1, 0, 0);
       MapIndex(index_temp, cdir, index);
       a_ce = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-      hypre_SetIndex3(index_temp,0,-1,0);
+      hypre_SetIndex3(index_temp, 0, -1, 0);
       MapIndex(index_temp, cdir, index);
       a_cb = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-      hypre_SetIndex3(index_temp,0,1,0);
+      hypre_SetIndex3(index_temp, 0, 1, 0);
       MapIndex(index_temp, cdir, index);
       a_ca = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
@@ -293,23 +296,23 @@ hypre_PFMGBuildCoarseOp5( hypre_StructMatrix *A,
        * rap_cc is pointer for center coefficient (etc.)
        *-----------------------------------------------------------------*/
 
-      hypre_SetIndex3(index_temp,0,0,0);
+      hypre_SetIndex3(index_temp, 0, 0, 0);
       MapIndex(index_temp, cdir, index);
       rap_cc = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-      hypre_SetIndex3(index_temp,-1,0,0);
+      hypre_SetIndex3(index_temp, -1, 0, 0);
       MapIndex(index_temp, cdir, index);
       rap_cw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-      hypre_SetIndex3(index_temp,1,0,0);
+      hypre_SetIndex3(index_temp, 1, 0, 0);
       MapIndex(index_temp, cdir, index);
       rap_ce = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-      hypre_SetIndex3(index_temp,0,-1,0);
+      hypre_SetIndex3(index_temp, 0, -1, 0);
       MapIndex(index_temp, cdir, index);
       rap_cb = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-      hypre_SetIndex3(index_temp,0,1,0);
+      hypre_SetIndex3(index_temp, 0, 1, 0);
       MapIndex(index_temp, cdir, index);
       rap_ca = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
@@ -321,18 +324,18 @@ hypre_PFMGBuildCoarseOp5( hypre_StructMatrix *A,
        * Offsets are used in refering to data associated with other points.
        *-----------------------------------------------------------------*/
 
-      hypre_SetIndex3(index_temp,0,1,0);
+      hypre_SetIndex3(index_temp, 0, 1, 0);
       MapIndex(index_temp, cdir, index);
 
-      OffsetP = hypre_BoxOffsetDistance(P_dbox,index);
-      OffsetA = hypre_BoxOffsetDistance(A_dbox,index);
+      OffsetP = hypre_BoxOffsetDistance(P_dbox, index);
+      OffsetA = hypre_BoxOffsetDistance(A_dbox, index);
 
       /*--------------------------------------------------------------
        * Loop for symmetric 5-point fine grid operator; produces a
        * symmetric 5-point coarse grid operator.
        *--------------------------------------------------------------*/
 
-      if ( constant_coefficient==0 )
+      if ( constant_coefficient == 0 )
       {
          hypre_BoxGetSize(cgrid_box, loop_size);
 
@@ -342,7 +345,7 @@ hypre_PFMGBuildCoarseOp5( hypre_StructMatrix *A,
                              A_dbox, fstart, stridef, iA,
                              RAP_dbox, cstart, stridec, iAc);
          {
-            HYPRE_Int iAm1,iAp1,iPm1,iPp1;
+            HYPRE_Int iAm1, iAp1, iPm1, iPp1;
             HYPRE_Real  west, east;
 
             iAm1 = iA - OffsetA;
@@ -352,7 +355,7 @@ hypre_PFMGBuildCoarseOp5( hypre_StructMatrix *A,
             iPp1 = iP + OffsetP;
 
             rap_cb[iAc] = a_cb[iA] * pa[iPm1];
-            rap_ca[iAc] = a_ca[iA] * pb[iPp1-pbOffset];
+            rap_ca[iAc] = a_ca[iA] * pb[iPp1 - pbOffset];
 
             west  = a_cw[iA] + 0.5 * a_cw[iAm1] + 0.5 * a_cw[iAp1];
             east  = a_ce[iA] + 0.5 * a_ce[iAm1] + 0.5 * a_ce[iAp1];
@@ -360,40 +363,40 @@ hypre_PFMGBuildCoarseOp5( hypre_StructMatrix *A,
             /*-----------------------------------------------------
              * Prevent non-zero entries reaching off grid
              *-----------------------------------------------------*/
-            if(a_cw[iA] == 0.0) west = 0.0;
-            if(a_ce[iA] == 0.0) east = 0.0;
+            if (a_cw[iA] == 0.0) { west = 0.0; }
+            if (a_ce[iA] == 0.0) { east = 0.0; }
 
             rap_cw[iAc] = west;
             rap_ce[iAc] = east;
 
             rap_cc[iAc] = a_cc[iA] + a_cw[iA] + a_ce[iA]
-               + a_cb[iA] * pb[iP-pbOffset] + a_ca[iA] * pa[iP]
-               - west - east;
+                          + a_cb[iA] * pb[iP - pbOffset] + a_ca[iA] * pa[iP]
+                          - west - east;
          }
          hypre_BoxLoop3End(iP, iA, iAc);
 #undef DEVICE_VAR
       }
 
-      else if ( constant_coefficient==1 )
+      else if ( constant_coefficient == 1 )
       {
          rap_cb[0] = rap_ca[0] = a_cb[0] * pa[0];
 
-         rap_cw[0] = rap_ce[0] = 2.0*a_cw[0];
+         rap_cw[0] = rap_ce[0] = 2.0 * a_cw[0];
 
-         rap_cc[0] = a_cc[0] - 2.0*( a_cw[0] - rap_cb[0] );
+         rap_cc[0] = a_cc[0] - 2.0 * ( a_cw[0] - rap_cb[0] );
       }
 
-      else if ( constant_coefficient==2 )
+      else if ( constant_coefficient == 2 )
       {
          /* NOTE: This does not reduce to either of the above operators unless
           * the row sum is zero and the interpolation weights are 1/2 */
 
-         rap_cb[0] = rap_ca[0] = 0.5*a_cb[0];
+         rap_cb[0] = rap_ca[0] = 0.5 * a_cb[0];
 
-         rap_cw[0] = rap_ce[0] = 2.0*a_cw[0];
+         rap_cw[0] = rap_ce[0] = 2.0 * a_cw[0];
 
-         center_int = 3.0*a_cb[0];
-         center_bdy = 0.5*a_cb[0] + (a_cw[0] + a_cb[0]);
+         center_int = 3.0 * a_cb[0];
+         center_bdy = 0.5 * a_cb[0] + (a_cw[0] + a_cb[0]);
 
          hypre_BoxGetSize(cgrid_box, loop_size);
 
@@ -402,7 +405,7 @@ hypre_PFMGBuildCoarseOp5( hypre_StructMatrix *A,
                              A_dbox, fstart, stridef, iA,
                              RAP_dbox, cstart, stridec, iAc);
          {
-            rap_cc[iAc] = 2.0*a_cc[iA] + center_int;
+            rap_cc[iAc] = 2.0 * a_cc[iA] + center_int;
          }
          hypre_BoxLoop2End(iA, iAc);
 #undef DEVICE_VAR
@@ -435,7 +438,7 @@ hypre_PFMGBuildCoarseOp5( hypre_StructMatrix *A,
                                 A_dbox, bfstart, stridef, iA,
                                 RAP_dbox, bcstart, stridec, iAc);
             {
-               rap_cc[iAc] -= 0.5*a_cc[iA] + center_bdy;
+               rap_cc[iAc] -= 0.5 * a_cc[iA] + center_bdy;
             }
             hypre_BoxLoop2End(iA, iAc);
 #undef DEVICE_VAR
diff --git a/external/hypre/src/struct_ls/pfmg_setup_rap7.c b/external/hypre/src/struct_ls/pfmg_setup_rap7.c
index ee8e46c8..a1f22849 100644
--- a/external/hypre/src/struct_ls/pfmg_setup_rap7.c
+++ b/external/hypre/src/struct_ls/pfmg_setup_rap7.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -36,6 +36,9 @@ hypre_PFMGCreateCoarseOp7( hypre_StructMatrix *R,
                            hypre_StructGrid   *coarse_grid,
                            HYPRE_Int           cdir        )
 {
+   HYPRE_UNUSED_VAR(R);
+   HYPRE_UNUSED_VAR(P);
+
    hypre_StructMatrix    *RAP;
 
    hypre_Index           *RAP_stencil_shape;
@@ -78,9 +81,9 @@ hypre_PFMGCreateCoarseOp7( hypre_StructMatrix *R,
                /*--------------------------------------------------------------
                 * Storage for 7 elements (c,w,e,n,s,a,b)
                 *--------------------------------------------------------------*/
-               if (i*j == 0 && i*k == 0 && j*k == 0)
+               if (i * j == 0 && i * k == 0 && j * k == 0)
                {
-                  hypre_SetIndex3(index_temp,i,j,k);
+                  hypre_SetIndex3(index_temp, i, j, k);
                   MapIndex(index_temp, cdir, RAP_stencil_shape[stencil_rank]);
                   stencil_rank++;
                }
@@ -114,9 +117,9 @@ hypre_PFMGCreateCoarseOp7( hypre_StructMatrix *R,
                /*--------------------------------------------------------------
                 * Store 4 elements in (c,w,s,b)
                 *--------------------------------------------------------------*/
-               if (i*j == 0 && i*k == 0 && j*k == 0)
+               if (i * j == 0 && i * k == 0 && j * k == 0)
                {
-                  hypre_SetIndex3(index_temp,i,j,k);
+                  hypre_SetIndex3(index_temp, i, j, k);
                   MapIndex(index_temp, cdir, RAP_stencil_shape[stencil_rank]);
                   stencil_rank++;
                }
@@ -215,7 +218,7 @@ hypre_PFMGBuildCoarseOp7( hypre_StructMatrix *A,
 
    constant_coefficient = hypre_StructMatrixConstantCoefficient(RAP);
    hypre_assert( hypre_StructMatrixConstantCoefficient(A) == constant_coefficient );
-   if ( constant_coefficient==0 )
+   if ( constant_coefficient == 0 )
    {
       hypre_assert( hypre_StructMatrixConstantCoefficient(R) == 0 );
       hypre_assert( hypre_StructMatrixConstantCoefficient(P) == 0 );
@@ -254,11 +257,11 @@ hypre_PFMGBuildCoarseOp7( hypre_StructMatrix *A,
        * pa is pointer for weight for f-point above c-point
        *-----------------------------------------------------------------*/
 
-      hypre_SetIndex3(index_temp,0,0,-1);
+      hypre_SetIndex3(index_temp, 0, 0, -1);
       MapIndex(index_temp, cdir, index);
       pa = hypre_StructMatrixExtractPointerByIndex(P, fi, index);
 
-      hypre_SetIndex3(index_temp,0,0,1);
+      hypre_SetIndex3(index_temp, 0, 0, 1);
       MapIndex(index_temp, cdir, index);
       pb = hypre_StructMatrixExtractPointerByIndex(P, fi, index);
       //RL PTROFFSET
@@ -276,31 +279,31 @@ hypre_PFMGBuildCoarseOp7( hypre_StructMatrix *A,
        * a_ca is pointer for above coefficient
        *-----------------------------------------------------------------*/
 
-      hypre_SetIndex3(index_temp,0,0,0);
+      hypre_SetIndex3(index_temp, 0, 0, 0);
       MapIndex(index_temp, cdir, index);
       a_cc = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-      hypre_SetIndex3(index_temp,-1,0,0);
+      hypre_SetIndex3(index_temp, -1, 0, 0);
       MapIndex(index_temp, cdir, index);
       a_cw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-      hypre_SetIndex3(index_temp,1,0,0);
+      hypre_SetIndex3(index_temp, 1, 0, 0);
       MapIndex(index_temp, cdir, index);
       a_ce = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-      hypre_SetIndex3(index_temp,0,-1,0);
+      hypre_SetIndex3(index_temp, 0, -1, 0);
       MapIndex(index_temp, cdir, index);
       a_cs = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-      hypre_SetIndex3(index_temp,0,1,0);
+      hypre_SetIndex3(index_temp, 0, 1, 0);
       MapIndex(index_temp, cdir, index);
       a_cn = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-      hypre_SetIndex3(index_temp,0,0,-1);
+      hypre_SetIndex3(index_temp, 0, 0, -1);
       MapIndex(index_temp, cdir, index);
       a_cb = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-      hypre_SetIndex3(index_temp,0,0,1);
+      hypre_SetIndex3(index_temp, 0, 0, 1);
       MapIndex(index_temp, cdir, index);
       a_ca = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
@@ -309,31 +312,31 @@ hypre_PFMGBuildCoarseOp7( hypre_StructMatrix *A,
        * rap_cc is pointer for center coefficient (etc.)
        *-----------------------------------------------------------------*/
 
-      hypre_SetIndex3(index_temp,0,0,0);
+      hypre_SetIndex3(index_temp, 0, 0, 0);
       MapIndex(index_temp, cdir, index);
       rap_cc = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-      hypre_SetIndex3(index_temp,-1,0,0);
+      hypre_SetIndex3(index_temp, -1, 0, 0);
       MapIndex(index_temp, cdir, index);
       rap_cw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-      hypre_SetIndex3(index_temp,1,0,0);
+      hypre_SetIndex3(index_temp, 1, 0, 0);
       MapIndex(index_temp, cdir, index);
       rap_ce = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-      hypre_SetIndex3(index_temp,0,-1,0);
+      hypre_SetIndex3(index_temp, 0, -1, 0);
       MapIndex(index_temp, cdir, index);
       rap_cs = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-      hypre_SetIndex3(index_temp,0,1,0);
+      hypre_SetIndex3(index_temp, 0, 1, 0);
       MapIndex(index_temp, cdir, index);
       rap_cn = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-      hypre_SetIndex3(index_temp,0,0,-1);
+      hypre_SetIndex3(index_temp, 0, 0, -1);
       MapIndex(index_temp, cdir, index);
       rap_cb = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-      hypre_SetIndex3(index_temp,0,0,1);
+      hypre_SetIndex3(index_temp, 0, 0, 1);
       MapIndex(index_temp, cdir, index);
       rap_ca = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
@@ -345,18 +348,18 @@ hypre_PFMGBuildCoarseOp7( hypre_StructMatrix *A,
        * Offsets are used in refering to data associated with other points.
        *-----------------------------------------------------------------*/
 
-      hypre_SetIndex3(index_temp,0,0,1);
+      hypre_SetIndex3(index_temp, 0, 0, 1);
       MapIndex(index_temp, cdir, index);
 
-      OffsetP = hypre_BoxOffsetDistance(P_dbox,index);
-      OffsetA = hypre_BoxOffsetDistance(A_dbox,index);
+      OffsetP = hypre_BoxOffsetDistance(P_dbox, index);
+      OffsetA = hypre_BoxOffsetDistance(A_dbox, index);
 
       /*--------------------------------------------------------------
        * Loop for symmetric 7-point fine grid operator; produces a
        * symmetric 7-point coarse grid operator.
        *--------------------------------------------------------------*/
 
-      if ( constant_coefficient==0 )
+      if ( constant_coefficient == 0 )
       {
          hypre_BoxGetSize(cgrid_box, loop_size);
 
@@ -366,8 +369,8 @@ hypre_PFMGBuildCoarseOp7( hypre_StructMatrix *A,
                              A_dbox, fstart, stridef, iA,
                              RAP_dbox, cstart, stridec, iAc);
          {
-            HYPRE_Int iAm1,iAp1,iPm1,iPp1;
-            HYPRE_Real west,east,south,north;
+            HYPRE_Int iAm1, iAp1, iPm1, iPp1;
+            HYPRE_Real west, east, south, north;
 
             iAm1 = iA - OffsetA;
             iAp1 = iA + OffsetA;
@@ -376,7 +379,7 @@ hypre_PFMGBuildCoarseOp7( hypre_StructMatrix *A,
             iPp1 = iP + OffsetP;
 
             rap_cb[iAc] = a_cb[iA] * pa[iPm1];
-            rap_ca[iAc] = a_ca[iA] * pb[iPp1-pbOffset];
+            rap_ca[iAc] = a_ca[iA] * pb[iPp1 - pbOffset];
 
             west  = a_cw[iA] + 0.5 * a_cw[iAm1] + 0.5 * a_cw[iAp1];
             east  = a_ce[iA] + 0.5 * a_ce[iAm1] + 0.5 * a_ce[iAp1];
@@ -386,10 +389,10 @@ hypre_PFMGBuildCoarseOp7( hypre_StructMatrix *A,
             /*-----------------------------------------------------
              * Prevent non-zero entries reaching off grid
              *-----------------------------------------------------*/
-            if(a_cw[iA] == 0.0) west = 0.0;
-            if(a_ce[iA] == 0.0) east = 0.0;
-            if(a_cs[iA] == 0.0) south = 0.0;
-            if(a_cn[iA] == 0.0) north = 0.0;
+            if (a_cw[iA] == 0.0) { west = 0.0; }
+            if (a_ce[iA] == 0.0) { east = 0.0; }
+            if (a_cs[iA] == 0.0) { south = 0.0; }
+            if (a_cn[iA] == 0.0) { north = 0.0; }
 
             rap_cw[iAc] = west;
             rap_ce[iAc] = east;
@@ -397,36 +400,36 @@ hypre_PFMGBuildCoarseOp7( hypre_StructMatrix *A,
             rap_cn[iAc] = north;
 
             rap_cc[iAc] = a_cc[iA]
-               + a_cw[iA] + a_ce[iA] + a_cs[iA] + a_cn[iA]
-               + a_cb[iA] * pb[iP-pbOffset] + a_ca[iA] * pa[iP]
-               - west - east - south - north;
+                          + a_cw[iA] + a_ce[iA] + a_cs[iA] + a_cn[iA]
+                          + a_cb[iA] * pb[iP - pbOffset] + a_ca[iA] * pa[iP]
+                          - west - east - south - north;
          }
          hypre_BoxLoop3End(iP, iA, iAc);
 #undef DEVICE_VAR
       }
 
-      else if ( constant_coefficient==1 )
+      else if ( constant_coefficient == 1 )
       {
          rap_cb[0] = rap_ca[0] = a_cb[0] * pa[0];
 
-         rap_cw[0] = rap_ce[0] = 2.0*a_cw[0];
-         rap_cs[0] = rap_cn[0] = 2.0*a_cs[0];
+         rap_cw[0] = rap_ce[0] = 2.0 * a_cw[0];
+         rap_cs[0] = rap_cn[0] = 2.0 * a_cs[0];
 
-         rap_cc[0] = a_cc[0] - 2.0*( a_cw[0] + a_cs[0] - rap_cb[0] );
+         rap_cc[0] = a_cc[0] - 2.0 * ( a_cw[0] + a_cs[0] - rap_cb[0] );
       }
 
-      else if ( constant_coefficient==2 )
+      else if ( constant_coefficient == 2 )
       {
          /* NOTE: This does not reduce to either of the above operators unless
           * the row sum is zero and the interpolation weights are 1/2 */
 
-         rap_cb[0] = rap_ca[0] = 0.5*a_cb[0];
+         rap_cb[0] = rap_ca[0] = 0.5 * a_cb[0];
 
-         rap_cw[0] = rap_ce[0] = 2.0*a_cw[0];
-         rap_cs[0] = rap_cn[0] = 2.0*a_cs[0];
+         rap_cw[0] = rap_ce[0] = 2.0 * a_cw[0];
+         rap_cs[0] = rap_cn[0] = 2.0 * a_cs[0];
 
-         center_int = 3.0*a_cb[0];
-         center_bdy = 0.5*a_cb[0] + (a_cw[0] + a_cs[0] + a_cb[0]);
+         center_int = 3.0 * a_cb[0];
+         center_bdy = 0.5 * a_cb[0] + (a_cw[0] + a_cs[0] + a_cb[0]);
 
          hypre_BoxGetSize(cgrid_box, loop_size);
 
@@ -435,7 +438,7 @@ hypre_PFMGBuildCoarseOp7( hypre_StructMatrix *A,
                              A_dbox, fstart, stridef, iA,
                              RAP_dbox, cstart, stridec, iAc);
          {
-            rap_cc[iAc] = 2.0*a_cc[iA] + center_int;
+            rap_cc[iAc] = 2.0 * a_cc[iA] + center_int;
          }
          hypre_BoxLoop2End(iA, iAc);
 #undef DEVICE_VAR
@@ -469,7 +472,7 @@ hypre_PFMGBuildCoarseOp7( hypre_StructMatrix *A,
                                 A_dbox, bfstart, stridef, iA,
                                 RAP_dbox, bcstart, stridec, iAc);
             {
-               rap_cc[iAc] -= 0.5*a_cc[iA] + center_bdy;
+               rap_cc[iAc] -= 0.5 * a_cc[iA] + center_bdy;
             }
             hypre_BoxLoop2End(iA, iAc);
 #undef DEVICE_VAR
diff --git a/external/hypre/src/struct_ls/pfmg_solve.c b/external/hypre/src/struct_ls/pfmg_solve.c
index 1f442e2a..06c279a3 100644
--- a/external/hypre/src/struct_ls/pfmg_solve.c
+++ b/external/hypre/src/struct_ls/pfmg_solve.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -105,7 +105,7 @@ hypre_PFMGSolve( void               *pfmg_vdata,
    {
       /* eps = (tol^2) */
       b_dot_b = hypre_StructInnerProd(b_l[0], b_l[0]);
-      eps = tol*tol;
+      eps = tol * tol;
 
       /* if rhs is zero, return a zero solution */
       if (b_dot_b == 0.0)
@@ -143,16 +143,20 @@ hypre_PFMGSolve( void               *pfmg_vdata,
       }
 
       /* fine grid pre-relaxation */
+      HYPRE_ANNOTATE_REGION_BEGIN("%s", "Relaxation");
       hypre_PFMGRelaxSetPreRelax(relax_data_l[0]);
       hypre_PFMGRelaxSetMaxIter(relax_data_l[0], num_pre_relax);
       hypre_PFMGRelaxSetZeroGuess(relax_data_l[0], zero_guess);
       hypre_PFMGRelax(relax_data_l[0], A_l[0], b_l[0], x_l[0]);
       zero_guess = 0;
+      HYPRE_ANNOTATE_REGION_END("%s", "Relaxation");
 
       /* compute fine grid residual (b - Ax) */
+      HYPRE_ANNOTATE_REGION_BEGIN("%s", "Residual");
       hypre_StructCopy(b_l[0], r_l[0]);
       hypre_StructMatvecCompute(matvec_data_l[0],
                                 -1.0, A_l[0], x_l[0], 1.0, r_l[0]);
+      HYPRE_ANNOTATE_REGION_END("%s", "Residual");
 
       /* convergence check */
       if (tol > 0.0)
@@ -161,10 +165,10 @@ hypre_PFMGSolve( void               *pfmg_vdata,
 
          if (logging > 0)
          {
-            norms[i] = sqrt(r_dot_r);
+            norms[i] = hypre_sqrt(r_dot_r);
             if (b_dot_b > 0)
             {
-               rel_norms[i] = sqrt(r_dot_r/b_dot_b);
+               rel_norms[i] = hypre_sqrt(r_dot_r / b_dot_b);
             }
             else
             {
@@ -173,9 +177,9 @@ hypre_PFMGSolve( void               *pfmg_vdata,
          }
 
          /* always do at least 1 V-cycle */
-         if ((r_dot_r/b_dot_b < eps) && (i > 0))
+         if ((r_dot_r / b_dot_b < eps) && (i > 0))
          {
-            if ( ((rel_change) && (e_dot_e/x_dot_x) < eps) || (!rel_change) )
+            if ( ((rel_change) && (e_dot_e / x_dot_x) < eps) || (!rel_change) )
             {
                HYPRE_ANNOTATE_MGLEVEL_END(0);
                break;
@@ -215,15 +219,19 @@ hypre_PFMGSolve( void               *pfmg_vdata,
             if (active_l[l])
             {
                /* pre-relaxation */
+               HYPRE_ANNOTATE_REGION_BEGIN("%s", "Relaxation");
                hypre_PFMGRelaxSetPreRelax(relax_data_l[l]);
                hypre_PFMGRelaxSetMaxIter(relax_data_l[l], num_pre_relax);
                hypre_PFMGRelaxSetZeroGuess(relax_data_l[l], 1);
                hypre_PFMGRelax(relax_data_l[l], A_l[l], b_l[l], x_l[l]);
+               HYPRE_ANNOTATE_REGION_END("%s", "Relaxation");
 
                /* compute residual (b - Ax) */
+               HYPRE_ANNOTATE_REGION_BEGIN("%s", "Residual");
                hypre_StructCopy(b_l[l], r_l[l]);
                hypre_StructMatvecCompute(matvec_data_l[l],
                                          -1.0, A_l[l], x_l[l], 1.0, r_l[l]);
+               HYPRE_ANNOTATE_REGION_END("%s", "Residual");
             }
             else
             {
@@ -233,15 +241,15 @@ hypre_PFMGSolve( void               *pfmg_vdata,
             }
 
             /* restrict residual */
-            hypre_SemiRestrict(restrict_data_l[l], RT_l[l], r_l[l], b_l[l+1]);
+            hypre_SemiRestrict(restrict_data_l[l], RT_l[l], r_l[l], b_l[l + 1]);
 #if DEBUG
-            hypre_printf("Level %d: b_l = %.30e\n",l+1, hypre_StructInnerProd(b_l[l+1], b_l[l+1]));
+            hypre_printf("Level %d: b_l = %.30e\n", l + 1, hypre_StructInnerProd(b_l[l + 1], b_l[l + 1]));
             hypre_sprintf(filename, "zout_xdown.%02d", l);
             hypre_StructVectorPrint(filename, x_l[l], 0);
             hypre_sprintf(filename, "zout_rdown.%02d", l);
             hypre_StructVectorPrint(filename, r_l[l], 0);
-            hypre_sprintf(filename, "zout_b.%02d", l+1);
-            hypre_StructVectorPrint(filename, b_l[l+1], 0);
+            hypre_sprintf(filename, "zout_b.%02d", l + 1);
+            hypre_StructVectorPrint(filename, b_l[l + 1], 0);
 #endif
 
             HYPRE_ANNOTATE_MGLEVEL_END(l);
@@ -254,8 +262,10 @@ hypre_PFMGSolve( void               *pfmg_vdata,
 
          if (active_l[l])
          {
+            HYPRE_ANNOTATE_REGION_BEGIN("%s", "Relaxation");
             hypre_PFMGRelaxSetZeroGuess(relax_data_l[l], 1);
             hypre_PFMGRelax(relax_data_l[l], A_l[l], b_l[l], x_l[l]);
+            HYPRE_ANNOTATE_REGION_END("%s", "Relaxation");
          }
          else
          {
@@ -264,7 +274,7 @@ hypre_PFMGSolve( void               *pfmg_vdata,
 #if DEBUG
          hypre_sprintf(filename, "zout_xbottom.%02d", l);
          hypre_StructVectorPrint(filename, x_l[l], 0);
-         hypre_printf("Level %d: x_l = %.30e\n",l, hypre_StructInnerProd(x_l[l], x_l[l]));
+         hypre_printf("Level %d: x_l = %.30e\n", l, hypre_StructInnerProd(x_l[l], x_l[l]));
 #endif
 
          /*--------------------------------------------------
@@ -284,7 +294,7 @@ hypre_PFMGSolve( void               *pfmg_vdata,
                hypre_StructVectorClearAllValues(e_l[l]);
             }
             /* interpolate error and correct (x = x + Pe_c) */
-            hypre_SemiInterp(interp_data_l[l], P_l[l], x_l[l+1], e_l[l]);
+            hypre_SemiInterp(interp_data_l[l], P_l[l], x_l[l + 1], e_l[l]);
             hypre_StructAxpy(1.0, e_l[l], x_l[l]);
             HYPRE_ANNOTATE_MGLEVEL_END(l + 1);
 #if DEBUG
@@ -292,17 +302,19 @@ hypre_PFMGSolve( void               *pfmg_vdata,
             hypre_StructVectorPrint(filename, e_l[l], 0);
             hypre_sprintf(filename, "zout_xup.%02d", l);
             hypre_StructVectorPrint(filename, x_l[l], 0);
-            hypre_printf("Level %d: x_l = %.15e\n",l, hypre_StructInnerProd(x_l[l], x_l[l]));
+            hypre_printf("Level %d: x_l = %.15e\n", l, hypre_StructInnerProd(x_l[l], x_l[l]));
 #endif
             HYPRE_ANNOTATE_MGLEVEL_BEGIN(l);
 
             if (active_l[l])
             {
                /* post-relaxation */
+               HYPRE_ANNOTATE_REGION_BEGIN("%s", "Relaxation");
                hypre_PFMGRelaxSetPostRelax(relax_data_l[l]);
                hypre_PFMGRelaxSetMaxIter(relax_data_l[l], num_post_relax);
                hypre_PFMGRelaxSetZeroGuess(relax_data_l[l], 0);
                hypre_PFMGRelax(relax_data_l[l], A_l[l], b_l[l], x_l[l]);
+               HYPRE_ANNOTATE_REGION_END("%s", "Relaxation");
             }
          }
 #if 0 //defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
@@ -344,10 +356,12 @@ hypre_PFMGSolve( void               *pfmg_vdata,
          }
       }
 
+      HYPRE_ANNOTATE_REGION_BEGIN("%s", "Relaxation");
       hypre_PFMGRelaxSetPostRelax(relax_data_l[0]);
       hypre_PFMGRelaxSetMaxIter(relax_data_l[0], num_post_relax);
       hypre_PFMGRelaxSetZeroGuess(relax_data_l[0], 0);
       hypre_PFMGRelax(relax_data_l[0], A_l[0], b_l[0], x_l[0]);
+      HYPRE_ANNOTATE_REGION_END("%s", "Relaxation");
       (pfmg_data -> num_iterations) = (i + 1);
 
       HYPRE_ANNOTATE_MGLEVEL_END(0);
diff --git a/external/hypre/src/struct_ls/point_relax.c b/external/hypre/src/struct_ls/point_relax.c
index 2c637faa..2eb44bd2 100644
--- a/external/hypre/src/struct_ls/point_relax.c
+++ b/external/hypre/src/struct_ls/point_relax.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -215,7 +215,7 @@ hypre_PointRelaxSetup( void               *relax_vdata,
 
       for (compute_i = 0; compute_i < 2; compute_i++)
       {
-         switch(compute_i)
+         switch (compute_i)
          {
             case 0:
                box_aa = orig_indt_boxes;
@@ -253,7 +253,7 @@ hypre_PointRelaxSetup( void               *relax_vdata,
             }
          }
 
-         switch(compute_i)
+         switch (compute_i)
          {
             case 0:
                hypre_ComputeInfoIndtBoxes(compute_info) = new_box_aa;
@@ -298,7 +298,7 @@ hypre_PointRelaxSetup( void               *relax_vdata,
       scale += (pointset_sizes[p] / frac);
    }
    (relax_data -> flops) = (HYPRE_BigInt)scale * (hypre_StructMatrixGlobalSize(A) +
-                                    hypre_StructVectorGlobalSize(x));
+                                                  hypre_StructVectorGlobalSize(x));
 
    return hypre_error_flag;
 }
@@ -324,7 +324,7 @@ hypre_PointRelax( void               *relax_vdata,
    HYPRE_Int              diag_rank        = (relax_data -> diag_rank);
    hypre_ComputePkg     **compute_pkgs     = (relax_data -> compute_pkgs);
    HYPRE_Real             tol              = (relax_data -> tol);
-   HYPRE_Real             tol2             = tol*tol;
+   HYPRE_Real             tol2             = tol * tol;
 
    hypre_ComputePkg      *compute_pkg;
    hypre_CommHandle      *comm_handle;
@@ -356,7 +356,7 @@ hypre_PointRelax( void               *relax_vdata,
    HYPRE_Int              iter, p, compute_i, i, j;
    HYPRE_Int              pointset;
 
-   HYPRE_Real             bsumsq, rsumsq;
+   HYPRE_Real             bsumsq = 1.0, rsumsq;
 
    /*----------------------------------------------------------
     * Initialize some things and deal with special cases
@@ -387,11 +387,13 @@ hypre_PointRelax( void               *relax_vdata,
    }
 
    constant_coefficient = hypre_StructMatrixConstantCoefficient(A);
-   if (constant_coefficient) hypre_StructVectorClearBoundGhostValues(x, 0);
+   if (constant_coefficient) { hypre_StructVectorClearBoundGhostValues(x, 0); }
 
    rsumsq = 0.0;
-   if ( tol>0.0 )
+   if ( tol > 0.0 )
+   {
       bsumsq = hypre_StructInnerProd( b, b );
+   }
 
    /*----------------------------------------------------------
     * Do zero_guess iteration
@@ -399,7 +401,7 @@ hypre_PointRelax( void               *relax_vdata,
 
    p    = 0;
    iter = 0;
-   if ( tol>0.0)
+   if ( tol > 0.0)
    {
       matvec_data = hypre_StructMatvecCreate();
       hypre_StructMatvecSetup( matvec_data, A, x );
@@ -407,7 +409,7 @@ hypre_PointRelax( void               *relax_vdata,
 
    if (zero_guess)
    {
-      if ( p==0 ) rsumsq = 0.0;
+      if ( p == 0 ) { rsumsq = 0.0; }
       if (num_pointsets > 1)
       {
          hypre_StructVectorSetConstantValues(x, 0.0);
@@ -418,7 +420,7 @@ hypre_PointRelax( void               *relax_vdata,
 
       for (compute_i = 0; compute_i < 2; compute_i++)
       {
-         switch(compute_i)
+         switch (compute_i)
          {
             case 0:
             {
@@ -456,10 +458,10 @@ hypre_PointRelax( void               *relax_vdata,
                hypre_BoxGetStrideSize(compute_box, stride, loop_size);
 
                /* all matrix coefficients are constant */
-               if ( constant_coefficient==1 )
+               if ( constant_coefficient == 1 )
                {
                   Ai = hypre_CCBoxIndexRank( A_data_box, start );
-                  AAp0 = 1/Ap[Ai];
+                  AAp0 = 1 / Ap[Ai];
 #define DEVICE_VAR is_device_ptr(xp,bp)
                   hypre_BoxLoop2Begin(hypre_StructVectorNDim(x), loop_size,
                                       b_data_box, start, stride, bi,
@@ -497,7 +499,7 @@ hypre_PointRelax( void               *relax_vdata,
       p    = (p + 1) % num_pointsets;
       iter = iter + (p == 0);
 
-      if ( tol>0.0 && p==0 )
+      if ( tol > 0.0 && p == 0 )
          /* ... p==0 here means we've finished going through all the pointsets,
             i.e. this iteration is complete.
             tol>0.0 means to do a convergence test, using tol.
@@ -507,7 +509,7 @@ hypre_PointRelax( void               *relax_vdata,
          hypre_StructMatvecCompute( matvec_data,
                                     -1.0, A, x, 1.0, t );  /* t = - A x + t = - A x + b */
          rsumsq = hypre_StructInnerProd( t, t ); /* <t,t> */
-         if ( rsumsq/bsumsq<tol2 ) max_iter = iter; /* converged; reset max_iter to prevent more iterations */
+         if ( rsumsq / bsumsq < tol2 ) { max_iter = iter; } /* converged; reset max_iter to prevent more iterations */
       }
    }
 
@@ -517,7 +519,7 @@ hypre_PointRelax( void               *relax_vdata,
 
    while (iter < max_iter)
    {
-      if ( p==0 ) rsumsq = 0.0;
+      if ( p == 0 ) { rsumsq = 0.0; }
       pointset = pointset_ranks[p];
       compute_pkg = compute_pkgs[pointset];
       stride = pointset_strides[pointset];
@@ -527,7 +529,7 @@ hypre_PointRelax( void               *relax_vdata,
 
       for (compute_i = 0; compute_i < 2; compute_i++)
       {
-         switch(compute_i)
+         switch (compute_i)
          {
             case 0:
             {
@@ -566,14 +568,14 @@ hypre_PointRelax( void               *relax_vdata,
             {
                compute_box = hypre_BoxArrayBox(compute_box_a, j);
 
-               if ( constant_coefficient==1 || constant_coefficient==2 )
+               if ( constant_coefficient == 1 || constant_coefficient == 2 )
                {
                   hypre_PointRelax_core12(
                      relax_vdata, A, constant_coefficient,
                      compute_box, bp, xp, tp, i,
                      A_data_box, b_data_box, x_data_box, t_data_box,
                      stride
-                     );
+                  );
                }
 
                else
@@ -583,12 +585,12 @@ hypre_PointRelax( void               *relax_vdata,
                      compute_box, bp, xp, tp, i,
                      A_data_box, b_data_box, x_data_box, t_data_box,
                      stride
-                     );
+                  );
                }
 
                Ap = hypre_StructMatrixBoxData(A, i, diag_rank);
 
-               if ( constant_coefficient==0 || constant_coefficient==2 )
+               if ( constant_coefficient == 0 || constant_coefficient == 2 )
                   /* divide by the variable diagonal */
                {
                   start  = hypre_BoxIMin(compute_box);
@@ -623,7 +625,7 @@ hypre_PointRelax( void               *relax_vdata,
       p    = (p + 1) % num_pointsets;
       iter = iter + (p == 0);
 
-      if ( tol>0.0 && p==0 )
+      if ( tol > 0.0 && p == 0 )
          /* ... p==0 here means we've finished going through all the pointsets,
             i.e. this iteration is complete.
             tol>0.0 means to do a convergence test, using tol.
@@ -633,16 +635,16 @@ hypre_PointRelax( void               *relax_vdata,
          hypre_StructMatvecCompute( matvec_data,
                                     -1.0, A, x, 1.0, t );  /* t = - A x + t = - A x + b */
          rsumsq = hypre_StructInnerProd( t, t ); /* <t,t> */
-         if ( rsumsq/bsumsq<tol2 ) break;
+         if ( rsumsq / bsumsq < tol2 ) { break; }
       }
    }
 
-   if ( tol>0.0 )
+   if ( tol > 0.0 )
    {
       hypre_StructMatvecDestroy( matvec_data );
    }
 
-   if ( tol>0.0 ) (relax_data -> rresnorm) = sqrt( rsumsq/bsumsq );
+   if ( tol > 0.0 ) { (relax_data -> rresnorm) = hypre_sqrt( rsumsq / bsumsq ); }
    (relax_data -> num_iterations) = iter;
 
    /*-----------------------------------------------------------------------
@@ -670,8 +672,10 @@ hypre_PointRelax_core0( void               *relax_vdata,
                         hypre_Box          *x_data_box,
                         hypre_Box          *t_data_box,
                         hypre_IndexRef      stride
-   )
+                      )
 {
+   HYPRE_UNUSED_VAR(constant_coefficient);
+
    hypre_PointRelaxData  *relax_data = (hypre_PointRelaxData *)relax_vdata;
 
    HYPRE_Real            *Ap0;
@@ -734,49 +738,48 @@ hypre_PointRelax_core0( void               *relax_vdata,
          }
       }
 
-      switch(depth)
+      switch (depth)
       {
          case 7:
             Ap6 = hypre_StructMatrixBoxData(A, boxarray_id, ssi[6]);
-            xoff6 = hypre_BoxOffsetDistance(
-               x_data_box, stencil_shape[ssi[6]]);
+            xoff6 = hypre_BoxOffsetDistance(x_data_box, stencil_shape[ssi[6]]);
+         /* fall through */
 
          case 6:
             Ap5 = hypre_StructMatrixBoxData(A, boxarray_id, ssi[5]);
-            xoff5 = hypre_BoxOffsetDistance(
-               x_data_box, stencil_shape[ssi[5]]);
+            xoff5 = hypre_BoxOffsetDistance(x_data_box, stencil_shape[ssi[5]]);
+         /* fall through */
 
          case 5:
             Ap4 = hypre_StructMatrixBoxData(A, boxarray_id, ssi[4]);
-            xoff4 = hypre_BoxOffsetDistance(
-               x_data_box, stencil_shape[ssi[4]]);
+            xoff4 = hypre_BoxOffsetDistance(x_data_box, stencil_shape[ssi[4]]);
+         /* fall through */
 
          case 4:
             Ap3 = hypre_StructMatrixBoxData(A, boxarray_id, ssi[3]);
-            xoff3 = hypre_BoxOffsetDistance(
-               x_data_box, stencil_shape[ssi[3]]);
+            xoff3 = hypre_BoxOffsetDistance(x_data_box, stencil_shape[ssi[3]]);
+         /* fall through */
 
          case 3:
             Ap2 = hypre_StructMatrixBoxData(A, boxarray_id, ssi[2]);
-            xoff2 = hypre_BoxOffsetDistance(
-               x_data_box, stencil_shape[ssi[2]]);
+            xoff2 = hypre_BoxOffsetDistance(x_data_box, stencil_shape[ssi[2]]);
+         /* fall through */
 
          case 2:
             Ap1 = hypre_StructMatrixBoxData(A, boxarray_id, ssi[1]);
-            xoff1 = hypre_BoxOffsetDistance(
-               x_data_box, stencil_shape[ssi[1]]);
+            xoff1 = hypre_BoxOffsetDistance(x_data_box, stencil_shape[ssi[1]]);
+         /* fall through */
 
          case 1:
             Ap0 = hypre_StructMatrixBoxData(A, boxarray_id, ssi[0]);
-            xoff0 = hypre_BoxOffsetDistance(
-               x_data_box, stencil_shape[ssi[0]]);
+            xoff0 = hypre_BoxOffsetDistance(x_data_box, stencil_shape[ssi[0]]);
+         /* fall through */
 
          case 0:
-
             break;
       }
 
-      switch(depth)
+      switch (depth)
       {
          case 7:
 #define DEVICE_VAR is_device_ptr(tp,Ap0,Ap1,Ap2,Ap3,Ap4,Ap5,Ap6,xp)
@@ -921,8 +924,10 @@ hypre_PointRelax_core12( void               *relax_vdata,
                          hypre_Box          *x_data_box,
                          hypre_Box          *t_data_box,
                          hypre_IndexRef      stride
-   )
+                       )
 {
+   HYPRE_UNUSED_VAR(A_data_box);
+
    hypre_PointRelaxData  *relax_data = (hypre_PointRelaxData *)relax_vdata;
 
    HYPRE_Real            *Apd;
@@ -976,10 +981,10 @@ hypre_PointRelax_core12( void               *relax_vdata,
    Ai = hypre_CCBoxIndexRank( A_data_box, start );
 
 #define DEVICE_VAR is_device_ptr(tp,bp)
-   if ( constant_coefficient==1 ) /* constant diagonal */
+   if ( constant_coefficient == 1 ) /* constant diagonal */
    {
       Apd = hypre_StructMatrixBoxData(A, boxarray_id, diag_rank);
-      AApd = 1/Apd[Ai];
+      AApd = 1 / Apd[Ai];
 
       hypre_BoxLoop2Begin(hypre_StructMatrixNDim(A), loop_size,
                           b_data_box, start, stride, bi,
@@ -1020,59 +1025,58 @@ hypre_PointRelax_core12( void               *relax_vdata,
          }
       }
 
-      switch(depth)
+      switch (depth)
       {
          case 7:
             Ap6 = hypre_StructMatrixBoxData(A, boxarray_id, ssi[6]);
-            xoff6 = hypre_BoxOffsetDistance(
-               x_data_box, stencil_shape[ssi[6]]);
+            xoff6 = hypre_BoxOffsetDistance(x_data_box, stencil_shape[ssi[6]]);
+         /* fall through */
 
          case 6:
             Ap5 = hypre_StructMatrixBoxData(A, boxarray_id, ssi[5]);
-            xoff5 = hypre_BoxOffsetDistance(
-               x_data_box, stencil_shape[ssi[5]]);
+            xoff5 = hypre_BoxOffsetDistance(x_data_box, stencil_shape[ssi[5]]);
+         /* fall through */
 
          case 5:
             Ap4 = hypre_StructMatrixBoxData(A, boxarray_id, ssi[4]);
-            xoff4 = hypre_BoxOffsetDistance(
-               x_data_box, stencil_shape[ssi[4]]);
+            xoff4 = hypre_BoxOffsetDistance(x_data_box, stencil_shape[ssi[4]]);
+         /* fall through */
 
          case 4:
             Ap3 = hypre_StructMatrixBoxData(A, boxarray_id, ssi[3]);
-            xoff3 = hypre_BoxOffsetDistance(
-               x_data_box, stencil_shape[ssi[3]]);
+            xoff3 = hypre_BoxOffsetDistance(x_data_box, stencil_shape[ssi[3]]);
+         /* fall through */
 
          case 3:
             Ap2 = hypre_StructMatrixBoxData(A, boxarray_id, ssi[2]);
-            xoff2 = hypre_BoxOffsetDistance(
-               x_data_box, stencil_shape[ssi[2]]);
+            xoff2 = hypre_BoxOffsetDistance(x_data_box, stencil_shape[ssi[2]]);
+         /* fall through */
 
          case 2:
             Ap1 = hypre_StructMatrixBoxData(A, boxarray_id, ssi[1]);
-            xoff1 = hypre_BoxOffsetDistance(
-               x_data_box, stencil_shape[ssi[1]]);
+            xoff1 = hypre_BoxOffsetDistance(x_data_box, stencil_shape[ssi[1]]);
+         /* fall through */
 
          case 1:
             Ap0 = hypre_StructMatrixBoxData(A, boxarray_id, ssi[0]);
-            xoff0 = hypre_BoxOffsetDistance(
-               x_data_box, stencil_shape[ssi[0]]);
+            xoff0 = hypre_BoxOffsetDistance(x_data_box, stencil_shape[ssi[0]]);
+         /* fall through */
 
          case 0:
-
             break;
       }
 
 #define DEVICE_VAR is_device_ptr(tp,xp)
-      switch(depth)
+      switch (depth)
       {
          case 7:
-            AAp0 = Ap0[Ai]*AApd;
-            AAp1 = Ap1[Ai]*AApd;
-            AAp2 = Ap2[Ai]*AApd;
-            AAp3 = Ap3[Ai]*AApd;
-            AAp4 = Ap4[Ai]*AApd;
-            AAp5 = Ap5[Ai]*AApd;
-            AAp6 = Ap6[Ai]*AApd;
+            AAp0 = Ap0[Ai] * AApd;
+            AAp1 = Ap1[Ai] * AApd;
+            AAp2 = Ap2[Ai] * AApd;
+            AAp3 = Ap3[Ai] * AApd;
+            AAp4 = Ap4[Ai] * AApd;
+            AAp5 = Ap5[Ai] * AApd;
+            AAp6 = Ap6[Ai] * AApd;
             hypre_BoxLoop2Begin(hypre_StructMatrixNDim(A), loop_size,
                                 x_data_box, start, stride, xi,
                                 t_data_box, start, stride, ti);
@@ -1090,12 +1094,12 @@ hypre_PointRelax_core12( void               *relax_vdata,
             break;
 
          case 6:
-            AAp0 = Ap0[Ai]*AApd;
-            AAp1 = Ap1[Ai]*AApd;
-            AAp2 = Ap2[Ai]*AApd;
-            AAp3 = Ap3[Ai]*AApd;
-            AAp4 = Ap4[Ai]*AApd;
-            AAp5 = Ap5[Ai]*AApd;
+            AAp0 = Ap0[Ai] * AApd;
+            AAp1 = Ap1[Ai] * AApd;
+            AAp2 = Ap2[Ai] * AApd;
+            AAp3 = Ap3[Ai] * AApd;
+            AAp4 = Ap4[Ai] * AApd;
+            AAp5 = Ap5[Ai] * AApd;
             hypre_BoxLoop2Begin(hypre_StructMatrixNDim(A), loop_size,
                                 x_data_box, start, stride, xi,
                                 t_data_box, start, stride, ti);
@@ -1112,11 +1116,11 @@ hypre_PointRelax_core12( void               *relax_vdata,
             break;
 
          case 5:
-            AAp0 = Ap0[Ai]*AApd;
-            AAp1 = Ap1[Ai]*AApd;
-            AAp2 = Ap2[Ai]*AApd;
-            AAp3 = Ap3[Ai]*AApd;
-            AAp4 = Ap4[Ai]*AApd;
+            AAp0 = Ap0[Ai] * AApd;
+            AAp1 = Ap1[Ai] * AApd;
+            AAp2 = Ap2[Ai] * AApd;
+            AAp3 = Ap3[Ai] * AApd;
+            AAp4 = Ap4[Ai] * AApd;
             hypre_BoxLoop2Begin(hypre_StructMatrixNDim(A), loop_size,
                                 x_data_box, start, stride, xi,
                                 t_data_box, start, stride, ti);
@@ -1132,10 +1136,10 @@ hypre_PointRelax_core12( void               *relax_vdata,
             break;
 
          case 4:
-            AAp0 = Ap0[Ai]*AApd;
-            AAp1 = Ap1[Ai]*AApd;
-            AAp2 = Ap2[Ai]*AApd;
-            AAp3 = Ap3[Ai]*AApd;
+            AAp0 = Ap0[Ai] * AApd;
+            AAp1 = Ap1[Ai] * AApd;
+            AAp2 = Ap2[Ai] * AApd;
+            AAp3 = Ap3[Ai] * AApd;
             hypre_BoxLoop2Begin(hypre_StructMatrixNDim(A), loop_size,
                                 x_data_box, start, stride, xi,
                                 t_data_box, start, stride, ti);
@@ -1150,9 +1154,9 @@ hypre_PointRelax_core12( void               *relax_vdata,
             break;
 
          case 3:
-            AAp0 = Ap0[Ai]*AApd;
-            AAp1 = Ap1[Ai]*AApd;
-            AAp2 = Ap2[Ai]*AApd;
+            AAp0 = Ap0[Ai] * AApd;
+            AAp1 = Ap1[Ai] * AApd;
+            AAp2 = Ap2[Ai] * AApd;
             hypre_BoxLoop2Begin(hypre_StructMatrixNDim(A), loop_size,
                                 x_data_box, start, stride, xi,
                                 t_data_box, start, stride, ti);
@@ -1166,8 +1170,8 @@ hypre_PointRelax_core12( void               *relax_vdata,
             break;
 
          case 2:
-            AAp0 = Ap0[Ai]*AApd;
-            AAp1 = Ap1[Ai]*AApd;
+            AAp0 = Ap0[Ai] * AApd;
+            AAp1 = Ap1[Ai] * AApd;
             hypre_BoxLoop2Begin(hypre_StructMatrixNDim(A), loop_size,
                                 x_data_box, start, stride, xi,
                                 t_data_box, start, stride, ti);
@@ -1180,7 +1184,7 @@ hypre_PointRelax_core12( void               *relax_vdata,
             break;
 
          case 1:
-            AAp0 = Ap0[Ai]*AApd;
+            AAp0 = Ap0[Ai] * AApd;
             hypre_BoxLoop2Begin(hypre_StructMatrixNDim(A), loop_size,
                                 x_data_box, start, stride, xi,
                                 t_data_box, start, stride, ti);
@@ -1459,7 +1463,7 @@ HYPRE_Int hypre_relax_wtx( void *relax_vdata, HYPRE_Int pointset,
 
    for (compute_i = 0; compute_i < 2; compute_i++)
    {
-      switch(compute_i)
+      switch (compute_i)
       {
          case 0:
          {
@@ -1498,7 +1502,7 @@ HYPRE_Int hypre_relax_wtx( void *relax_vdata, HYPRE_Int pointset,
                                 x_data_box, start, stride, xi,
                                 t_data_box, start, stride, ti);
             {
-               xp[xi] = weight*tp[ti] + weightc*xp[xi];
+               xp[xi] = weight * tp[ti] + weightc * xp[xi];
             }
             hypre_BoxLoop2End(xi, ti);
 #undef DEVICE_VAR
@@ -1514,8 +1518,10 @@ HYPRE_Int hypre_relax_wtx( void *relax_vdata, HYPRE_Int pointset,
  * vector copy on specified pointsets.
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int hypre_relax_copy( void *relax_vdata, HYPRE_Int pointset,
-                            hypre_StructVector *t, hypre_StructVector *x )
+HYPRE_Int hypre_relax_copy( void               *relax_vdata,
+                            HYPRE_Int           pointset,
+                            hypre_StructVector *t,
+                            hypre_StructVector *x )
 /* Sets x to t, x=t, but only in the specified pointset. */
 {
    hypre_PointRelaxData  *relax_data = (hypre_PointRelaxData *)relax_vdata;
@@ -1541,7 +1547,7 @@ HYPRE_Int hypre_relax_copy( void *relax_vdata, HYPRE_Int pointset,
 
    for (compute_i = 0; compute_i < 2; compute_i++)
    {
-      switch(compute_i)
+      switch (compute_i)
       {
          case 0:
          {
diff --git a/external/hypre/src/struct_ls/protos.h b/external/hypre/src/struct_ls/protos.h
index 67540ac0..1c8b9fcc 100644
--- a/external/hypre/src/struct_ls/protos.h
+++ b/external/hypre/src/struct_ls/protos.h
@@ -1,18 +1,31 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
  ******************************************************************************/
 
+/* coarsen.c */
+HYPRE_Int hypre_StructMapFineToCoarse ( hypre_Index findex, hypre_Index index, hypre_Index stride,
+                                        hypre_Index cindex );
+HYPRE_Int hypre_StructMapCoarseToFine ( hypre_Index cindex, hypre_Index index, hypre_Index stride,
+                                        hypre_Index findex );
+HYPRE_Int hypre_StructCoarsen ( hypre_StructGrid *fgrid, hypre_Index index, hypre_Index stride,
+                                HYPRE_Int prune, hypre_StructGrid **cgrid_ptr );
+
 /* cyclic_reduction.c */
 void *hypre_CyclicReductionCreate ( MPI_Comm comm );
-hypre_StructMatrix *hypre_CycRedCreateCoarseOp ( hypre_StructMatrix *A , hypre_StructGrid *coarse_grid , HYPRE_Int cdir );
-HYPRE_Int hypre_CycRedSetupCoarseOp ( hypre_StructMatrix *A , hypre_StructMatrix *Ac , hypre_Index cindex , hypre_Index cstride, HYPRE_Int cdir );
-HYPRE_Int hypre_CyclicReductionSetup ( void *cyc_red_vdata , hypre_StructMatrix *A , hypre_StructVector *b , hypre_StructVector *x );
-HYPRE_Int hypre_CyclicReduction ( void *cyc_red_vdata , hypre_StructMatrix *A , hypre_StructVector *b , hypre_StructVector *x );
-HYPRE_Int hypre_CyclicReductionSetCDir ( void *cyc_red_vdata , HYPRE_Int cdir );
-HYPRE_Int hypre_CyclicReductionSetBase ( void *cyc_red_vdata , hypre_Index base_index , hypre_Index base_stride );
+hypre_StructMatrix *hypre_CycRedCreateCoarseOp ( hypre_StructMatrix *A,
+                                                 hypre_StructGrid *coarse_grid, HYPRE_Int cdir );
+HYPRE_Int hypre_CycRedSetupCoarseOp ( hypre_StructMatrix *A, hypre_StructMatrix *Ac,
+                                      hypre_Index cindex, hypre_Index cstride, HYPRE_Int cdir );
+HYPRE_Int hypre_CyclicReductionSetup ( void *cyc_red_vdata, hypre_StructMatrix *A,
+                                       hypre_StructVector *b, hypre_StructVector *x );
+HYPRE_Int hypre_CyclicReduction ( void *cyc_red_vdata, hypre_StructMatrix *A, hypre_StructVector *b,
+                                  hypre_StructVector *x );
+HYPRE_Int hypre_CyclicReductionSetCDir ( void *cyc_red_vdata, HYPRE_Int cdir );
+HYPRE_Int hypre_CyclicReductionSetBase ( void *cyc_red_vdata, hypre_Index base_index,
+                                         hypre_Index base_stride );
 HYPRE_Int hypre_CyclicReductionDestroy ( void *cyc_red_vdata );
 HYPRE_Int hypre_CyclicReductionSetMaxLevel( void   *cyc_red_vdata, HYPRE_Int   max_level  );
 
@@ -22,33 +35,37 @@ HYPRE_Int hypre_Log2 ( HYPRE_Int p );
 /* hybrid.c */
 void *hypre_HybridCreate ( MPI_Comm comm );
 HYPRE_Int hypre_HybridDestroy ( void *hybrid_vdata );
-HYPRE_Int hypre_HybridSetTol ( void *hybrid_vdata , HYPRE_Real tol );
-HYPRE_Int hypre_HybridSetConvergenceTol ( void *hybrid_vdata , HYPRE_Real cf_tol );
-HYPRE_Int hypre_HybridSetDSCGMaxIter ( void *hybrid_vdata , HYPRE_Int dscg_max_its );
-HYPRE_Int hypre_HybridSetPCGMaxIter ( void *hybrid_vdata , HYPRE_Int pcg_max_its );
-HYPRE_Int hypre_HybridSetPCGAbsoluteTolFactor ( void *hybrid_vdata , HYPRE_Real pcg_atolf );
-HYPRE_Int hypre_HybridSetTwoNorm ( void *hybrid_vdata , HYPRE_Int two_norm );
-HYPRE_Int hypre_HybridSetStopCrit ( void *hybrid_vdata , HYPRE_Int stop_crit );
-HYPRE_Int hypre_HybridSetRelChange ( void *hybrid_vdata , HYPRE_Int rel_change );
-HYPRE_Int hypre_HybridSetSolverType ( void *hybrid_vdata , HYPRE_Int solver_type );
-HYPRE_Int hypre_HybridSetRecomputeResidual( void *hybrid_vdata , HYPRE_Int recompute_residual );
-HYPRE_Int hypre_HybridGetRecomputeResidual( void *hybrid_vdata , HYPRE_Int *recompute_residual );
-HYPRE_Int hypre_HybridSetRecomputeResidualP( void *hybrid_vdata , HYPRE_Int recompute_residual_p );
-HYPRE_Int hypre_HybridGetRecomputeResidualP( void *hybrid_vdata , HYPRE_Int *recompute_residual_p );
-HYPRE_Int hypre_HybridSetKDim ( void *hybrid_vdata , HYPRE_Int k_dim );
-HYPRE_Int hypre_HybridSetPrecond ( void *pcg_vdata , HYPRE_Int (*pcg_precond_solve )(void*, void*, void*, void*), HYPRE_Int (*pcg_precond_setup )(void*, void*, void*, void*), void *pcg_precond );
-HYPRE_Int hypre_HybridSetLogging ( void *hybrid_vdata , HYPRE_Int logging );
-HYPRE_Int hypre_HybridSetPrintLevel ( void *hybrid_vdata , HYPRE_Int print_level );
-HYPRE_Int hypre_HybridGetNumIterations ( void *hybrid_vdata , HYPRE_Int *num_its );
-HYPRE_Int hypre_HybridGetDSCGNumIterations ( void *hybrid_vdata , HYPRE_Int *dscg_num_its );
-HYPRE_Int hypre_HybridGetPCGNumIterations ( void *hybrid_vdata , HYPRE_Int *pcg_num_its );
-HYPRE_Int hypre_HybridGetFinalRelativeResidualNorm ( void *hybrid_vdata , HYPRE_Real *final_rel_res_norm );
-HYPRE_Int hypre_HybridSetup ( void *hybrid_vdata , hypre_StructMatrix *A , hypre_StructVector *b , hypre_StructVector *x );
-HYPRE_Int hypre_HybridSolve ( void *hybrid_vdata , hypre_StructMatrix *A , hypre_StructVector *b , hypre_StructVector *x );
+HYPRE_Int hypre_HybridSetTol ( void *hybrid_vdata, HYPRE_Real tol );
+HYPRE_Int hypre_HybridSetConvergenceTol ( void *hybrid_vdata, HYPRE_Real cf_tol );
+HYPRE_Int hypre_HybridSetDSCGMaxIter ( void *hybrid_vdata, HYPRE_Int dscg_max_its );
+HYPRE_Int hypre_HybridSetPCGMaxIter ( void *hybrid_vdata, HYPRE_Int pcg_max_its );
+HYPRE_Int hypre_HybridSetPCGAbsoluteTolFactor ( void *hybrid_vdata, HYPRE_Real pcg_atolf );
+HYPRE_Int hypre_HybridSetTwoNorm ( void *hybrid_vdata, HYPRE_Int two_norm );
+HYPRE_Int hypre_HybridSetStopCrit ( void *hybrid_vdata, HYPRE_Int stop_crit );
+HYPRE_Int hypre_HybridSetRelChange ( void *hybrid_vdata, HYPRE_Int rel_change );
+HYPRE_Int hypre_HybridSetSolverType ( void *hybrid_vdata, HYPRE_Int solver_type );
+HYPRE_Int hypre_HybridSetRecomputeResidual( void *hybrid_vdata, HYPRE_Int recompute_residual );
+HYPRE_Int hypre_HybridGetRecomputeResidual( void *hybrid_vdata, HYPRE_Int *recompute_residual );
+HYPRE_Int hypre_HybridSetRecomputeResidualP( void *hybrid_vdata, HYPRE_Int recompute_residual_p );
+HYPRE_Int hypre_HybridGetRecomputeResidualP( void *hybrid_vdata, HYPRE_Int *recompute_residual_p );
+HYPRE_Int hypre_HybridSetKDim ( void *hybrid_vdata, HYPRE_Int k_dim );
+HYPRE_Int hypre_HybridSetPrecond ( void *pcg_vdata, HYPRE_Int (*pcg_precond_solve )(void*, void*,
+                                                                                    void*, void*), HYPRE_Int (*pcg_precond_setup )(void*, void*, void*, void*), void *pcg_precond );
+HYPRE_Int hypre_HybridSetLogging ( void *hybrid_vdata, HYPRE_Int logging );
+HYPRE_Int hypre_HybridSetPrintLevel ( void *hybrid_vdata, HYPRE_Int print_level );
+HYPRE_Int hypre_HybridGetNumIterations ( void *hybrid_vdata, HYPRE_Int *num_its );
+HYPRE_Int hypre_HybridGetDSCGNumIterations ( void *hybrid_vdata, HYPRE_Int *dscg_num_its );
+HYPRE_Int hypre_HybridGetPCGNumIterations ( void *hybrid_vdata, HYPRE_Int *pcg_num_its );
+HYPRE_Int hypre_HybridGetFinalRelativeResidualNorm ( void *hybrid_vdata,
+                                                     HYPRE_Real *final_rel_res_norm );
+HYPRE_Int hypre_HybridSetup ( void *hybrid_vdata, hypre_StructMatrix *A, hypre_StructVector *b,
+                              hypre_StructVector *x );
+HYPRE_Int hypre_HybridSolve ( void *hybrid_vdata, hypre_StructMatrix *A, hypre_StructVector *b,
+                              hypre_StructVector *x );
 
 /* HYPRE_struct_int.c */
-HYPRE_Int hypre_StructVectorSetRandomValues ( hypre_StructVector *vector , HYPRE_Int seed );
-HYPRE_Int hypre_StructSetRandomValues ( void *v , HYPRE_Int seed );
+HYPRE_Int hypre_StructVectorSetRandomValues ( hypre_StructVector *vector, HYPRE_Int seed );
+HYPRE_Int hypre_StructSetRandomValues ( void *v, HYPRE_Int seed );
 
 /* HYPRE_struct_pfmg.c */
 HYPRE_Int hypre_PFMGSetDeviceLevel( void *pfmg_vdata, HYPRE_Int   device_level  );
@@ -56,257 +73,405 @@ HYPRE_Int hypre_PFMGSetDeviceLevel( void *pfmg_vdata, HYPRE_Int   device_level
 /* jacobi.c */
 void *hypre_JacobiCreate ( MPI_Comm comm );
 HYPRE_Int hypre_JacobiDestroy ( void *jacobi_vdata );
-HYPRE_Int hypre_JacobiSetup ( void *jacobi_vdata , hypre_StructMatrix *A , hypre_StructVector *b , hypre_StructVector *x );
-HYPRE_Int hypre_JacobiSolve ( void *jacobi_vdata , hypre_StructMatrix *A , hypre_StructVector *b , hypre_StructVector *x );
-HYPRE_Int hypre_JacobiSetTol ( void *jacobi_vdata , HYPRE_Real tol );
-HYPRE_Int hypre_JacobiGetTol ( void *jacobi_vdata , HYPRE_Real *tol );
-HYPRE_Int hypre_JacobiSetMaxIter ( void *jacobi_vdata , HYPRE_Int max_iter );
-HYPRE_Int hypre_JacobiGetMaxIter ( void *jacobi_vdata , HYPRE_Int *max_iter );
-HYPRE_Int hypre_JacobiSetZeroGuess ( void *jacobi_vdata , HYPRE_Int zero_guess );
-HYPRE_Int hypre_JacobiGetZeroGuess ( void *jacobi_vdata , HYPRE_Int *zero_guess );
-HYPRE_Int hypre_JacobiGetNumIterations ( void *jacobi_vdata , HYPRE_Int *num_iterations );
-HYPRE_Int hypre_JacobiSetTempVec ( void *jacobi_vdata , hypre_StructVector *t );
-HYPRE_Int hypre_JacobiGetFinalRelativeResidualNorm ( void *jacobi_vdata , HYPRE_Real *norm );
+HYPRE_Int hypre_JacobiSetup ( void *jacobi_vdata, hypre_StructMatrix *A, hypre_StructVector *b,
+                              hypre_StructVector *x );
+HYPRE_Int hypre_JacobiSolve ( void *jacobi_vdata, hypre_StructMatrix *A, hypre_StructVector *b,
+                              hypre_StructVector *x );
+HYPRE_Int hypre_JacobiSetTol ( void *jacobi_vdata, HYPRE_Real tol );
+HYPRE_Int hypre_JacobiGetTol ( void *jacobi_vdata, HYPRE_Real *tol );
+HYPRE_Int hypre_JacobiSetMaxIter ( void *jacobi_vdata, HYPRE_Int max_iter );
+HYPRE_Int hypre_JacobiGetMaxIter ( void *jacobi_vdata, HYPRE_Int *max_iter );
+HYPRE_Int hypre_JacobiSetZeroGuess ( void *jacobi_vdata, HYPRE_Int zero_guess );
+HYPRE_Int hypre_JacobiGetZeroGuess ( void *jacobi_vdata, HYPRE_Int *zero_guess );
+HYPRE_Int hypre_JacobiGetNumIterations ( void *jacobi_vdata, HYPRE_Int *num_iterations );
+HYPRE_Int hypre_JacobiSetTempVec ( void *jacobi_vdata, hypre_StructVector *t );
+HYPRE_Int hypre_JacobiGetFinalRelativeResidualNorm ( void *jacobi_vdata, HYPRE_Real *norm );
 
 /* pcg_struct.c */
 void *hypre_StructKrylovCAlloc ( size_t count, size_t elt_size, HYPRE_MemoryLocation location );
 HYPRE_Int hypre_StructKrylovFree ( void *ptr );
 void *hypre_StructKrylovCreateVector ( void *vvector );
-void *hypre_StructKrylovCreateVectorArray ( HYPRE_Int n , void *vvector );
+void *hypre_StructKrylovCreateVectorArray ( HYPRE_Int n, void *vvector );
 HYPRE_Int hypre_StructKrylovDestroyVector ( void *vvector );
-void *hypre_StructKrylovMatvecCreate ( void *A , void *x );
-HYPRE_Int hypre_StructKrylovMatvec ( void *matvec_data , HYPRE_Complex alpha , void *A , void *x , HYPRE_Complex beta , void *y );
+void *hypre_StructKrylovMatvecCreate ( void *A, void *x );
+HYPRE_Int hypre_StructKrylovMatvec ( void *matvec_data, HYPRE_Complex alpha, void *A, void *x,
+                                     HYPRE_Complex beta, void *y );
 HYPRE_Int hypre_StructKrylovMatvecDestroy ( void *matvec_data );
-HYPRE_Real hypre_StructKrylovInnerProd ( void *x , void *y );
-HYPRE_Int hypre_StructKrylovCopyVector ( void *x , void *y );
+HYPRE_Real hypre_StructKrylovInnerProd ( void *x, void *y );
+HYPRE_Int hypre_StructKrylovCopyVector ( void *x, void *y );
 HYPRE_Int hypre_StructKrylovClearVector ( void *x );
-HYPRE_Int hypre_StructKrylovScaleVector ( HYPRE_Complex alpha , void *x );
-HYPRE_Int hypre_StructKrylovAxpy ( HYPRE_Complex alpha , void *x , void *y );
-HYPRE_Int hypre_StructKrylovIdentitySetup ( void *vdata , void *A , void *b , void *x );
-HYPRE_Int hypre_StructKrylovIdentity ( void *vdata , void *A , void *b , void *x );
-HYPRE_Int hypre_StructKrylovCommInfo ( void *A , HYPRE_Int *my_id , HYPRE_Int *num_procs );
+HYPRE_Int hypre_StructKrylovScaleVector ( HYPRE_Complex alpha, void *x );
+HYPRE_Int hypre_StructKrylovAxpy ( HYPRE_Complex alpha, void *x, void *y );
+HYPRE_Int hypre_StructKrylovIdentitySetup ( void *vdata, void *A, void *b, void *x );
+HYPRE_Int hypre_StructKrylovIdentity ( void *vdata, void *A, void *b, void *x );
+HYPRE_Int hypre_StructKrylovCommInfo ( void *A, HYPRE_Int *my_id, HYPRE_Int *num_procs );
 
 /* pfmg2_setup_rap.c */
-hypre_StructMatrix *hypre_PFMG2CreateRAPOp ( hypre_StructMatrix *R , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructGrid *coarse_grid , HYPRE_Int cdir );
-HYPRE_Int hypre_PFMG2BuildRAPSym ( hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_StructMatrix *RAP );
-HYPRE_Int hypre_PFMG2BuildRAPSym_onebox_FSS5_CC0 ( HYPRE_Int ci , HYPRE_Int fi , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_StructMatrix *RAP );
-HYPRE_Int hypre_PFMG2BuildRAPSym_onebox_FSS5_CC1 ( HYPRE_Int ci , HYPRE_Int fi , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_StructMatrix *RAP );
-HYPRE_Int hypre_PFMG2BuildRAPSym_onebox_FSS9_CC0 ( HYPRE_Int ci , HYPRE_Int fi , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_StructMatrix *RAP );
-HYPRE_Int hypre_PFMG2BuildRAPSym_onebox_FSS9_CC1 ( HYPRE_Int ci , HYPRE_Int fi , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_StructMatrix *RAP );
-HYPRE_Int hypre_PFMG2BuildRAPNoSym ( hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_StructMatrix *RAP );
-HYPRE_Int hypre_PFMG2BuildRAPNoSym_onebox_FSS5_CC0 ( HYPRE_Int ci , HYPRE_Int fi , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_StructMatrix *RAP );
-HYPRE_Int hypre_PFMG2BuildRAPNoSym_onebox_FSS5_CC1 ( HYPRE_Int ci , HYPRE_Int fi , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_StructMatrix *RAP );
-HYPRE_Int hypre_PFMG2BuildRAPNoSym_onebox_FSS9_CC0 ( HYPRE_Int ci , HYPRE_Int fi , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_StructMatrix *RAP );
-HYPRE_Int hypre_PFMG2BuildRAPNoSym_onebox_FSS9_CC1 ( HYPRE_Int ci , HYPRE_Int fi , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_StructMatrix *RAP );
+hypre_StructMatrix *hypre_PFMG2CreateRAPOp ( hypre_StructMatrix *R, hypre_StructMatrix *A,
+                                             hypre_StructMatrix *P, hypre_StructGrid *coarse_grid, HYPRE_Int cdir );
+HYPRE_Int hypre_PFMG2BuildRAPSym ( hypre_StructMatrix *A, hypre_StructMatrix *P,
+                                   hypre_StructMatrix *R, HYPRE_Int cdir, hypre_Index cindex, hypre_Index cstride,
+                                   hypre_StructMatrix *RAP );
+HYPRE_Int hypre_PFMG2BuildRAPSym_onebox_FSS5_CC0 ( HYPRE_Int ci, HYPRE_Int fi,
+                                                   hypre_StructMatrix *A, hypre_StructMatrix *P, hypre_StructMatrix *R, HYPRE_Int cdir,
+                                                   hypre_Index cindex, hypre_Index cstride, hypre_StructMatrix *RAP );
+HYPRE_Int hypre_PFMG2BuildRAPSym_onebox_FSS5_CC1 ( HYPRE_Int ci, HYPRE_Int fi,
+                                                   hypre_StructMatrix *A, hypre_StructMatrix *P, hypre_StructMatrix *R, HYPRE_Int cdir,
+                                                   hypre_Index cindex, hypre_Index cstride, hypre_StructMatrix *RAP );
+HYPRE_Int hypre_PFMG2BuildRAPSym_onebox_FSS9_CC0 ( HYPRE_Int ci, HYPRE_Int fi,
+                                                   hypre_StructMatrix *A, hypre_StructMatrix *P, hypre_StructMatrix *R, HYPRE_Int cdir,
+                                                   hypre_Index cindex, hypre_Index cstride, hypre_StructMatrix *RAP );
+HYPRE_Int hypre_PFMG2BuildRAPSym_onebox_FSS9_CC1 ( HYPRE_Int ci, HYPRE_Int fi,
+                                                   hypre_StructMatrix *A, hypre_StructMatrix *P, hypre_StructMatrix *R, HYPRE_Int cdir,
+                                                   hypre_Index cindex, hypre_Index cstride, hypre_StructMatrix *RAP );
+HYPRE_Int hypre_PFMG2BuildRAPNoSym ( hypre_StructMatrix *A, hypre_StructMatrix *P,
+                                     hypre_StructMatrix *R, HYPRE_Int cdir, hypre_Index cindex, hypre_Index cstride,
+                                     hypre_StructMatrix *RAP );
+HYPRE_Int hypre_PFMG2BuildRAPNoSym_onebox_FSS5_CC0 ( HYPRE_Int ci, HYPRE_Int fi,
+                                                     hypre_StructMatrix *A, hypre_StructMatrix *P, hypre_StructMatrix *R, HYPRE_Int cdir,
+                                                     hypre_Index cindex, hypre_Index cstride, hypre_StructMatrix *RAP );
+HYPRE_Int hypre_PFMG2BuildRAPNoSym_onebox_FSS5_CC1 ( HYPRE_Int ci, HYPRE_Int fi,
+                                                     hypre_StructMatrix *A, hypre_StructMatrix *P, hypre_StructMatrix *R, HYPRE_Int cdir,
+                                                     hypre_Index cindex, hypre_Index cstride, hypre_StructMatrix *RAP );
+HYPRE_Int hypre_PFMG2BuildRAPNoSym_onebox_FSS9_CC0 ( HYPRE_Int ci, HYPRE_Int fi,
+                                                     hypre_StructMatrix *A, hypre_StructMatrix *P, hypre_StructMatrix *R, HYPRE_Int cdir,
+                                                     hypre_Index cindex, hypre_Index cstride, hypre_StructMatrix *RAP );
+HYPRE_Int hypre_PFMG2BuildRAPNoSym_onebox_FSS9_CC1 ( HYPRE_Int ci, HYPRE_Int fi,
+                                                     hypre_StructMatrix *A, hypre_StructMatrix *P, hypre_StructMatrix *R, HYPRE_Int cdir,
+                                                     hypre_Index cindex, hypre_Index cstride, hypre_StructMatrix *RAP );
 
 /* pfmg3_setup_rap.c */
-hypre_StructMatrix *hypre_PFMG3CreateRAPOp ( hypre_StructMatrix *R , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructGrid *coarse_grid , HYPRE_Int cdir );
-HYPRE_Int hypre_PFMG3BuildRAPSym ( hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_StructMatrix *RAP );
-HYPRE_Int hypre_PFMG3BuildRAPSym_onebox_FSS07_CC0 ( HYPRE_Int ci , HYPRE_Int fi , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_StructMatrix *RAP );
-HYPRE_Int hypre_PFMG3BuildRAPSym_onebox_FSS07_CC1 ( HYPRE_Int ci , HYPRE_Int fi , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_StructMatrix *RAP );
-HYPRE_Int hypre_PFMG3BuildRAPSym_onebox_FSS19_CC0 ( HYPRE_Int ci , HYPRE_Int fi , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_StructMatrix *RAP );
-HYPRE_Int hypre_PFMG3BuildRAPSym_onebox_FSS19_CC1 ( HYPRE_Int ci , HYPRE_Int fi , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_StructMatrix *RAP );
-HYPRE_Int hypre_PFMG3BuildRAPSym_onebox_FSS27_CC0 ( HYPRE_Int ci , HYPRE_Int fi , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_StructMatrix *RAP );
-HYPRE_Int hypre_PFMG3BuildRAPSym_onebox_FSS27_CC1 ( HYPRE_Int ci , HYPRE_Int fi , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_StructMatrix *RAP );
-HYPRE_Int hypre_PFMG3BuildRAPNoSym ( hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_StructMatrix *RAP );
-HYPRE_Int hypre_PFMG3BuildRAPNoSym_onebox_FSS07_CC0 ( HYPRE_Int ci , HYPRE_Int fi , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_StructMatrix *RAP );
-HYPRE_Int hypre_PFMG3BuildRAPNoSym_onebox_FSS07_CC1 ( HYPRE_Int ci , HYPRE_Int fi , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_StructMatrix *RAP );
-HYPRE_Int hypre_PFMG3BuildRAPNoSym_onebox_FSS19_CC0 ( HYPRE_Int ci , HYPRE_Int fi , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_StructMatrix *RAP );
-HYPRE_Int hypre_PFMG3BuildRAPNoSym_onebox_FSS19_CC1 ( HYPRE_Int ci , HYPRE_Int fi , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_StructMatrix *RAP );
-HYPRE_Int hypre_PFMG3BuildRAPNoSym_onebox_FSS27_CC0 ( HYPRE_Int ci , HYPRE_Int fi , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_StructMatrix *RAP );
-HYPRE_Int hypre_PFMG3BuildRAPNoSym_onebox_FSS27_CC1 ( HYPRE_Int ci , HYPRE_Int fi , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_StructMatrix *RAP );
+hypre_StructMatrix *hypre_PFMG3CreateRAPOp ( hypre_StructMatrix *R, hypre_StructMatrix *A,
+                                             hypre_StructMatrix *P, hypre_StructGrid *coarse_grid, HYPRE_Int cdir );
+HYPRE_Int hypre_PFMG3BuildRAPSym ( hypre_StructMatrix *A, hypre_StructMatrix *P,
+                                   hypre_StructMatrix *R, HYPRE_Int cdir, hypre_Index cindex, hypre_Index cstride,
+                                   hypre_StructMatrix *RAP );
+HYPRE_Int hypre_PFMG3BuildRAPSym_onebox_FSS07_CC0 ( HYPRE_Int ci, HYPRE_Int fi,
+                                                    hypre_StructMatrix *A, hypre_StructMatrix *P, hypre_StructMatrix *R, HYPRE_Int cdir,
+                                                    hypre_Index cindex, hypre_Index cstride, hypre_StructMatrix *RAP );
+HYPRE_Int hypre_PFMG3BuildRAPSym_onebox_FSS07_CC1 ( HYPRE_Int ci, HYPRE_Int fi,
+                                                    hypre_StructMatrix *A, hypre_StructMatrix *P, hypre_StructMatrix *R, HYPRE_Int cdir,
+                                                    hypre_Index cindex, hypre_Index cstride, hypre_StructMatrix *RAP );
+HYPRE_Int hypre_PFMG3BuildRAPSym_onebox_FSS19_CC0 ( HYPRE_Int ci, HYPRE_Int fi,
+                                                    hypre_StructMatrix *A, hypre_StructMatrix *P, hypre_StructMatrix *R, HYPRE_Int cdir,
+                                                    hypre_Index cindex, hypre_Index cstride, hypre_StructMatrix *RAP );
+HYPRE_Int hypre_PFMG3BuildRAPSym_onebox_FSS19_CC1 ( HYPRE_Int ci, HYPRE_Int fi,
+                                                    hypre_StructMatrix *A, hypre_StructMatrix *P, hypre_StructMatrix *R, HYPRE_Int cdir,
+                                                    hypre_Index cindex, hypre_Index cstride, hypre_StructMatrix *RAP );
+HYPRE_Int hypre_PFMG3BuildRAPSym_onebox_FSS27_CC0 ( HYPRE_Int ci, HYPRE_Int fi,
+                                                    hypre_StructMatrix *A, hypre_StructMatrix *P, hypre_StructMatrix *R, HYPRE_Int cdir,
+                                                    hypre_Index cindex, hypre_Index cstride, hypre_StructMatrix *RAP );
+HYPRE_Int hypre_PFMG3BuildRAPSym_onebox_FSS27_CC1 ( HYPRE_Int ci, HYPRE_Int fi,
+                                                    hypre_StructMatrix *A, hypre_StructMatrix *P, hypre_StructMatrix *R, HYPRE_Int cdir,
+                                                    hypre_Index cindex, hypre_Index cstride, hypre_StructMatrix *RAP );
+HYPRE_Int hypre_PFMG3BuildRAPNoSym ( hypre_StructMatrix *A, hypre_StructMatrix *P,
+                                     hypre_StructMatrix *R, HYPRE_Int cdir, hypre_Index cindex, hypre_Index cstride,
+                                     hypre_StructMatrix *RAP );
+HYPRE_Int hypre_PFMG3BuildRAPNoSym_onebox_FSS07_CC0 ( HYPRE_Int ci, HYPRE_Int fi,
+                                                      hypre_StructMatrix *A, hypre_StructMatrix *P, hypre_StructMatrix *R, HYPRE_Int cdir,
+                                                      hypre_Index cindex, hypre_Index cstride, hypre_StructMatrix *RAP );
+HYPRE_Int hypre_PFMG3BuildRAPNoSym_onebox_FSS07_CC1 ( HYPRE_Int ci, HYPRE_Int fi,
+                                                      hypre_StructMatrix *A, hypre_StructMatrix *P, hypre_StructMatrix *R, HYPRE_Int cdir,
+                                                      hypre_Index cindex, hypre_Index cstride, hypre_StructMatrix *RAP );
+HYPRE_Int hypre_PFMG3BuildRAPNoSym_onebox_FSS19_CC0 ( HYPRE_Int ci, HYPRE_Int fi,
+                                                      hypre_StructMatrix *A, hypre_StructMatrix *P, hypre_StructMatrix *R, HYPRE_Int cdir,
+                                                      hypre_Index cindex, hypre_Index cstride, hypre_StructMatrix *RAP );
+HYPRE_Int hypre_PFMG3BuildRAPNoSym_onebox_FSS19_CC1 ( HYPRE_Int ci, HYPRE_Int fi,
+                                                      hypre_StructMatrix *A, hypre_StructMatrix *P, hypre_StructMatrix *R, HYPRE_Int cdir,
+                                                      hypre_Index cindex, hypre_Index cstride, hypre_StructMatrix *RAP );
+HYPRE_Int hypre_PFMG3BuildRAPNoSym_onebox_FSS27_CC0 ( HYPRE_Int ci, HYPRE_Int fi,
+                                                      hypre_StructMatrix *A, hypre_StructMatrix *P, hypre_StructMatrix *R, HYPRE_Int cdir,
+                                                      hypre_Index cindex, hypre_Index cstride, hypre_StructMatrix *RAP );
+HYPRE_Int hypre_PFMG3BuildRAPNoSym_onebox_FSS27_CC1 ( HYPRE_Int ci, HYPRE_Int fi,
+                                                      hypre_StructMatrix *A, hypre_StructMatrix *P, hypre_StructMatrix *R, HYPRE_Int cdir,
+                                                      hypre_Index cindex, hypre_Index cstride, hypre_StructMatrix *RAP );
 
 /* pfmg.c */
 void *hypre_PFMGCreate ( MPI_Comm comm );
 HYPRE_Int hypre_PFMGDestroy ( void *pfmg_vdata );
-HYPRE_Int hypre_PFMGSetTol ( void *pfmg_vdata , HYPRE_Real tol );
-HYPRE_Int hypre_PFMGGetTol ( void *pfmg_vdata , HYPRE_Real *tol );
-HYPRE_Int hypre_PFMGSetMaxIter ( void *pfmg_vdata , HYPRE_Int max_iter );
-HYPRE_Int hypre_PFMGGetMaxIter ( void *pfmg_vdata , HYPRE_Int *max_iter );
-HYPRE_Int hypre_PFMGSetMaxLevels ( void *pfmg_vdata , HYPRE_Int max_levels );
-HYPRE_Int hypre_PFMGGetMaxLevels ( void *pfmg_vdata , HYPRE_Int *max_levels );
-HYPRE_Int hypre_PFMGSetRelChange ( void *pfmg_vdata , HYPRE_Int rel_change );
-HYPRE_Int hypre_PFMGGetRelChange ( void *pfmg_vdata , HYPRE_Int *rel_change );
-HYPRE_Int hypre_PFMGSetZeroGuess ( void *pfmg_vdata , HYPRE_Int zero_guess );
-HYPRE_Int hypre_PFMGGetZeroGuess ( void *pfmg_vdata , HYPRE_Int *zero_guess );
-HYPRE_Int hypre_PFMGSetRelaxType ( void *pfmg_vdata , HYPRE_Int relax_type );
-HYPRE_Int hypre_PFMGGetRelaxType ( void *pfmg_vdata , HYPRE_Int *relax_type );
-HYPRE_Int hypre_PFMGSetJacobiWeight ( void *pfmg_vdata , HYPRE_Real weight );
-HYPRE_Int hypre_PFMGGetJacobiWeight ( void *pfmg_vdata , HYPRE_Real *weight );
-HYPRE_Int hypre_PFMGSetRAPType ( void *pfmg_vdata , HYPRE_Int rap_type );
-HYPRE_Int hypre_PFMGGetRAPType ( void *pfmg_vdata , HYPRE_Int *rap_type );
-HYPRE_Int hypre_PFMGSetNumPreRelax ( void *pfmg_vdata , HYPRE_Int num_pre_relax );
-HYPRE_Int hypre_PFMGGetNumPreRelax ( void *pfmg_vdata , HYPRE_Int *num_pre_relax );
-HYPRE_Int hypre_PFMGSetNumPostRelax ( void *pfmg_vdata , HYPRE_Int num_post_relax );
-HYPRE_Int hypre_PFMGGetNumPostRelax ( void *pfmg_vdata , HYPRE_Int *num_post_relax );
-HYPRE_Int hypre_PFMGSetSkipRelax ( void *pfmg_vdata , HYPRE_Int skip_relax );
-HYPRE_Int hypre_PFMGGetSkipRelax ( void *pfmg_vdata , HYPRE_Int *skip_relax );
-HYPRE_Int hypre_PFMGSetDxyz ( void *pfmg_vdata , HYPRE_Real *dxyz );
-HYPRE_Int hypre_PFMGSetLogging ( void *pfmg_vdata , HYPRE_Int logging );
-HYPRE_Int hypre_PFMGGetLogging ( void *pfmg_vdata , HYPRE_Int *logging );
-HYPRE_Int hypre_PFMGSetPrintLevel ( void *pfmg_vdata , HYPRE_Int print_level );
-HYPRE_Int hypre_PFMGGetPrintLevel ( void *pfmg_vdata , HYPRE_Int *print_level );
-HYPRE_Int hypre_PFMGGetNumIterations ( void *pfmg_vdata , HYPRE_Int *num_iterations );
-HYPRE_Int hypre_PFMGPrintLogging ( void *pfmg_vdata , HYPRE_Int myid );
-HYPRE_Int hypre_PFMGGetFinalRelativeResidualNorm ( void *pfmg_vdata , HYPRE_Real *relative_residual_norm );
+HYPRE_Int hypre_PFMGSetTol ( void *pfmg_vdata, HYPRE_Real tol );
+HYPRE_Int hypre_PFMGGetTol ( void *pfmg_vdata, HYPRE_Real *tol );
+HYPRE_Int hypre_PFMGSetMaxIter ( void *pfmg_vdata, HYPRE_Int max_iter );
+HYPRE_Int hypre_PFMGGetMaxIter ( void *pfmg_vdata, HYPRE_Int *max_iter );
+HYPRE_Int hypre_PFMGSetMaxLevels ( void *pfmg_vdata, HYPRE_Int max_levels );
+HYPRE_Int hypre_PFMGGetMaxLevels ( void *pfmg_vdata, HYPRE_Int *max_levels );
+HYPRE_Int hypre_PFMGSetRelChange ( void *pfmg_vdata, HYPRE_Int rel_change );
+HYPRE_Int hypre_PFMGGetRelChange ( void *pfmg_vdata, HYPRE_Int *rel_change );
+HYPRE_Int hypre_PFMGSetZeroGuess ( void *pfmg_vdata, HYPRE_Int zero_guess );
+HYPRE_Int hypre_PFMGGetZeroGuess ( void *pfmg_vdata, HYPRE_Int *zero_guess );
+HYPRE_Int hypre_PFMGSetRelaxType ( void *pfmg_vdata, HYPRE_Int relax_type );
+HYPRE_Int hypre_PFMGGetRelaxType ( void *pfmg_vdata, HYPRE_Int *relax_type );
+HYPRE_Int hypre_PFMGSetJacobiWeight ( void *pfmg_vdata, HYPRE_Real weight );
+HYPRE_Int hypre_PFMGGetJacobiWeight ( void *pfmg_vdata, HYPRE_Real *weight );
+HYPRE_Int hypre_PFMGSetRAPType ( void *pfmg_vdata, HYPRE_Int rap_type );
+HYPRE_Int hypre_PFMGGetRAPType ( void *pfmg_vdata, HYPRE_Int *rap_type );
+HYPRE_Int hypre_PFMGSetNumPreRelax ( void *pfmg_vdata, HYPRE_Int num_pre_relax );
+HYPRE_Int hypre_PFMGGetNumPreRelax ( void *pfmg_vdata, HYPRE_Int *num_pre_relax );
+HYPRE_Int hypre_PFMGSetNumPostRelax ( void *pfmg_vdata, HYPRE_Int num_post_relax );
+HYPRE_Int hypre_PFMGGetNumPostRelax ( void *pfmg_vdata, HYPRE_Int *num_post_relax );
+HYPRE_Int hypre_PFMGSetSkipRelax ( void *pfmg_vdata, HYPRE_Int skip_relax );
+HYPRE_Int hypre_PFMGGetSkipRelax ( void *pfmg_vdata, HYPRE_Int *skip_relax );
+HYPRE_Int hypre_PFMGSetDxyz ( void *pfmg_vdata, HYPRE_Real *dxyz );
+HYPRE_Int hypre_PFMGSetLogging ( void *pfmg_vdata, HYPRE_Int logging );
+HYPRE_Int hypre_PFMGGetLogging ( void *pfmg_vdata, HYPRE_Int *logging );
+HYPRE_Int hypre_PFMGSetPrintLevel ( void *pfmg_vdata, HYPRE_Int print_level );
+HYPRE_Int hypre_PFMGGetPrintLevel ( void *pfmg_vdata, HYPRE_Int *print_level );
+HYPRE_Int hypre_PFMGGetNumIterations ( void *pfmg_vdata, HYPRE_Int *num_iterations );
+HYPRE_Int hypre_PFMGPrintLogging ( void *pfmg_vdata, HYPRE_Int myid );
+HYPRE_Int hypre_PFMGGetFinalRelativeResidualNorm ( void *pfmg_vdata,
+                                                   HYPRE_Real *relative_residual_norm );
 
 /* pfmg_relax.c */
 void *hypre_PFMGRelaxCreate ( MPI_Comm comm );
 HYPRE_Int hypre_PFMGRelaxDestroy ( void *pfmg_relax_vdata );
-HYPRE_Int hypre_PFMGRelax ( void *pfmg_relax_vdata , hypre_StructMatrix *A , hypre_StructVector *b , hypre_StructVector *x );
-HYPRE_Int hypre_PFMGRelaxSetup ( void *pfmg_relax_vdata , hypre_StructMatrix *A , hypre_StructVector *b , hypre_StructVector *x );
-HYPRE_Int hypre_PFMGRelaxSetType ( void *pfmg_relax_vdata , HYPRE_Int relax_type );
-HYPRE_Int hypre_PFMGRelaxSetJacobiWeight ( void *pfmg_relax_vdata , HYPRE_Real weight );
+HYPRE_Int hypre_PFMGRelax ( void *pfmg_relax_vdata, hypre_StructMatrix *A, hypre_StructVector *b,
+                            hypre_StructVector *x );
+HYPRE_Int hypre_PFMGRelaxSetup ( void *pfmg_relax_vdata, hypre_StructMatrix *A,
+                                 hypre_StructVector *b, hypre_StructVector *x );
+HYPRE_Int hypre_PFMGRelaxSetType ( void *pfmg_relax_vdata, HYPRE_Int relax_type );
+HYPRE_Int hypre_PFMGRelaxSetJacobiWeight ( void *pfmg_relax_vdata, HYPRE_Real weight );
 HYPRE_Int hypre_PFMGRelaxSetPreRelax ( void *pfmg_relax_vdata );
 HYPRE_Int hypre_PFMGRelaxSetPostRelax ( void *pfmg_relax_vdata );
-HYPRE_Int hypre_PFMGRelaxSetTol ( void *pfmg_relax_vdata , HYPRE_Real tol );
-HYPRE_Int hypre_PFMGRelaxSetMaxIter ( void *pfmg_relax_vdata , HYPRE_Int max_iter );
-HYPRE_Int hypre_PFMGRelaxSetZeroGuess ( void *pfmg_relax_vdata , HYPRE_Int zero_guess );
-HYPRE_Int hypre_PFMGRelaxSetTempVec ( void *pfmg_relax_vdata , hypre_StructVector *t );
+HYPRE_Int hypre_PFMGRelaxSetTol ( void *pfmg_relax_vdata, HYPRE_Real tol );
+HYPRE_Int hypre_PFMGRelaxSetMaxIter ( void *pfmg_relax_vdata, HYPRE_Int max_iter );
+HYPRE_Int hypre_PFMGRelaxSetZeroGuess ( void *pfmg_relax_vdata, HYPRE_Int zero_guess );
+HYPRE_Int hypre_PFMGRelaxSetTempVec ( void *pfmg_relax_vdata, hypre_StructVector *t );
 
 /* pfmg_setup.c */
-HYPRE_Int hypre_PFMGSetup ( void *pfmg_vdata , hypre_StructMatrix *A , hypre_StructVector *b , hypre_StructVector *x );
-HYPRE_Int hypre_PFMGComputeDxyz ( hypre_StructMatrix *A , HYPRE_Real *dxyz , HYPRE_Real *mean, HYPRE_Real *deviation);
-HYPRE_Int hypre_PFMGComputeDxyz_CS  ( HYPRE_Int bi, hypre_StructMatrix *A, HYPRE_Real *cxyz, HYPRE_Real *sqcxyz);
-HYPRE_Int hypre_PFMGComputeDxyz_SS5 ( HYPRE_Int bi, hypre_StructMatrix *A, HYPRE_Real *cxyz, HYPRE_Real *sqcxyz);
-HYPRE_Int hypre_PFMGComputeDxyz_SS9 ( HYPRE_Int bi, hypre_StructMatrix *A, HYPRE_Real *cxyz, HYPRE_Real *sqcxyz);
-HYPRE_Int hypre_PFMGComputeDxyz_SS7 ( HYPRE_Int bi, hypre_StructMatrix *A, HYPRE_Real *cxyz, HYPRE_Real *sqcxyz);
-HYPRE_Int hypre_PFMGComputeDxyz_SS19( HYPRE_Int bi, hypre_StructMatrix *A, HYPRE_Real *cxyz, HYPRE_Real *sqcxyz);
-HYPRE_Int hypre_PFMGComputeDxyz_SS27( HYPRE_Int bi, hypre_StructMatrix *A, HYPRE_Real *cxyz, HYPRE_Real *sqcxyz);
+HYPRE_Int hypre_PFMGSetup ( void *pfmg_vdata, hypre_StructMatrix *A, hypre_StructVector *b,
+                            hypre_StructVector *x );
+HYPRE_Int hypre_PFMGComputeDxyz ( hypre_StructMatrix *A, HYPRE_Real *dxyz, HYPRE_Real *mean,
+                                  HYPRE_Real *deviation);
+HYPRE_Int hypre_PFMGComputeDxyz_CS  ( HYPRE_Int bi, hypre_StructMatrix *A, HYPRE_Real *cxyz,
+                                      HYPRE_Real *sqcxyz);
+HYPRE_Int hypre_PFMGComputeDxyz_SS5 ( HYPRE_Int bi, hypre_StructMatrix *A, HYPRE_Real *cxyz,
+                                      HYPRE_Real *sqcxyz);
+HYPRE_Int hypre_PFMGComputeDxyz_SS9 ( HYPRE_Int bi, hypre_StructMatrix *A, HYPRE_Real *cxyz,
+                                      HYPRE_Real *sqcxyz);
+HYPRE_Int hypre_PFMGComputeDxyz_SS7 ( HYPRE_Int bi, hypre_StructMatrix *A, HYPRE_Real *cxyz,
+                                      HYPRE_Real *sqcxyz);
+HYPRE_Int hypre_PFMGComputeDxyz_SS19( HYPRE_Int bi, hypre_StructMatrix *A, HYPRE_Real *cxyz,
+                                      HYPRE_Real *sqcxyz);
+HYPRE_Int hypre_PFMGComputeDxyz_SS27( HYPRE_Int bi, hypre_StructMatrix *A, HYPRE_Real *cxyz,
+                                      HYPRE_Real *sqcxyz);
 HYPRE_Int hypre_ZeroDiagonal ( hypre_StructMatrix *A );
 
 /* pfmg_setup_interp.c */
-hypre_StructMatrix *hypre_PFMGCreateInterpOp ( hypre_StructMatrix *A , hypre_StructGrid *cgrid , HYPRE_Int cdir , HYPRE_Int rap_type );
-HYPRE_Int hypre_PFMGSetupInterpOp ( hypre_StructMatrix *A , HYPRE_Int cdir , hypre_Index findex , hypre_Index stride , hypre_StructMatrix *P , HYPRE_Int rap_type );
-HYPRE_Int hypre_PFMGSetupInterpOp_CC0 ( HYPRE_Int i , hypre_StructMatrix *A , hypre_Box *A_dbox , HYPRE_Int cdir , hypre_Index stride , hypre_Index stridec , hypre_Index start , hypre_IndexRef startc , hypre_Index loop_size , hypre_Box *P_dbox , HYPRE_Int Pstenc0 , HYPRE_Int Pstenc1 , HYPRE_Real *Pp0 , HYPRE_Real *Pp1 , HYPRE_Int rap_type , HYPRE_Int si0 , HYPRE_Int si1 );
-HYPRE_Int hypre_PFMGSetupInterpOp_CC1 ( HYPRE_Int i , hypre_StructMatrix *A , hypre_Box *A_dbox , HYPRE_Int cdir , hypre_Index stride , hypre_Index stridec , hypre_Index start , hypre_IndexRef startc , hypre_Index loop_size , hypre_Box *P_dbox , HYPRE_Int Pstenc0 , HYPRE_Int Pstenc1 , HYPRE_Real *Pp0 , HYPRE_Real *Pp1 , HYPRE_Int rap_type , HYPRE_Int si0 , HYPRE_Int si1 );
-HYPRE_Int hypre_PFMGSetupInterpOp_CC2 ( HYPRE_Int i , hypre_StructMatrix *A , hypre_Box *A_dbox , HYPRE_Int cdir , hypre_Index stride , hypre_Index stridec , hypre_Index start , hypre_IndexRef startc , hypre_Index loop_size , hypre_Box *P_dbox , HYPRE_Int Pstenc0 , HYPRE_Int Pstenc1 , HYPRE_Real *Pp0 , HYPRE_Real *Pp1 , HYPRE_Int rap_type , HYPRE_Int si0 , HYPRE_Int si1 );
-HYPRE_Int hypre_PFMGSetupInterpOp_CC0_SS5 ( HYPRE_Int i , hypre_StructMatrix *A , hypre_Box *A_dbox , HYPRE_Int cdir , hypre_Index stride , hypre_Index stridec , hypre_Index start , hypre_IndexRef startc , hypre_Index loop_size , hypre_Box *P_dbox , HYPRE_Int Pstenc0 , HYPRE_Int Pstenc1 , HYPRE_Real *Pp0 , HYPRE_Real *Pp1 , HYPRE_Int rap_type , hypre_Index *P_stencil_shape );
-HYPRE_Int hypre_PFMGSetupInterpOp_CC0_SS9 ( HYPRE_Int i , hypre_StructMatrix *A , hypre_Box *A_dbox , HYPRE_Int cdir , hypre_Index stride , hypre_Index stridec , hypre_Index start , hypre_IndexRef startc , hypre_Index loop_size , hypre_Box *P_dbox , HYPRE_Int Pstenc0 , HYPRE_Int Pstenc1 , HYPRE_Real *Pp0 , HYPRE_Real *Pp1 , HYPRE_Int rap_type , hypre_Index *P_stencil_shape );
-HYPRE_Int hypre_PFMGSetupInterpOp_CC0_SS7 ( HYPRE_Int i , hypre_StructMatrix *A , hypre_Box *A_dbox , HYPRE_Int cdir , hypre_Index stride , hypre_Index stridec , hypre_Index start , hypre_IndexRef startc , hypre_Index loop_size , hypre_Box *P_dbox , HYPRE_Int Pstenc0 , HYPRE_Int Pstenc1 , HYPRE_Real *Pp0 , HYPRE_Real *Pp1 , HYPRE_Int rap_type , hypre_Index *P_stencil_shape );
-
-HYPRE_Int hypre_PFMGSetupInterpOp_CC0_SS15 ( HYPRE_Int i , hypre_StructMatrix *A , hypre_Box *A_dbox , HYPRE_Int cdir , hypre_Index stride , hypre_Index stridec , hypre_Index start , hypre_IndexRef startc , hypre_Index loop_size , hypre_Box *P_dbox , HYPRE_Int Pstenc0 , HYPRE_Int Pstenc1 , HYPRE_Real *Pp0 , HYPRE_Real *Pp1 , HYPRE_Int rap_type , hypre_Index *P_stencil_shape );
-
-HYPRE_Int hypre_PFMGSetupInterpOp_CC0_SS19 ( HYPRE_Int i , hypre_StructMatrix *A , hypre_Box *A_dbox , HYPRE_Int cdir , hypre_Index stride , hypre_Index stridec , hypre_Index start , hypre_IndexRef startc , hypre_Index loop_size , hypre_Box *P_dbox , HYPRE_Int Pstenc0 , HYPRE_Int Pstenc1 , HYPRE_Real *Pp0 , HYPRE_Real *Pp1 , HYPRE_Int rap_type , hypre_Index *P_stencil_shape );
-
-HYPRE_Int hypre_PFMGSetupInterpOp_CC0_SS27 ( HYPRE_Int i , hypre_StructMatrix *A , hypre_Box *A_dbox , HYPRE_Int cdir , hypre_Index stride , hypre_Index stridec , hypre_Index start , hypre_IndexRef startc , hypre_Index loop_size , hypre_Box *P_dbox , HYPRE_Int Pstenc0 , HYPRE_Int Pstenc1 , HYPRE_Real *Pp0 , HYPRE_Real *Pp1 , HYPRE_Int rap_type , hypre_Index *P_stencil_shape );
+hypre_StructMatrix *hypre_PFMGCreateInterpOp ( hypre_StructMatrix *A, hypre_StructGrid *cgrid,
+                                               HYPRE_Int cdir, HYPRE_Int rap_type );
+HYPRE_Int hypre_PFMGSetupInterpOp ( hypre_StructMatrix *A, HYPRE_Int cdir, hypre_Index findex,
+                                    hypre_Index stride, hypre_StructMatrix *P, HYPRE_Int rap_type );
+HYPRE_Int hypre_PFMGSetupInterpOp_CC0 ( HYPRE_Int i, hypre_StructMatrix *A, hypre_Box *A_dbox,
+                                        HYPRE_Int cdir, hypre_Index stride, hypre_Index stridec, hypre_Index start, hypre_IndexRef startc,
+                                        hypre_Index loop_size, hypre_Box *P_dbox, HYPRE_Int Pstenc0, HYPRE_Int Pstenc1, HYPRE_Real *Pp0,
+                                        HYPRE_Real *Pp1, HYPRE_Int rap_type, HYPRE_Int si0, HYPRE_Int si1 );
+HYPRE_Int hypre_PFMGSetupInterpOp_CC1 ( HYPRE_Int i, hypre_StructMatrix *A, hypre_Box *A_dbox,
+                                        HYPRE_Int cdir, hypre_Index stride, hypre_Index stridec, hypre_Index start, hypre_IndexRef startc,
+                                        hypre_Index loop_size, hypre_Box *P_dbox, HYPRE_Int Pstenc0, HYPRE_Int Pstenc1, HYPRE_Real *Pp0,
+                                        HYPRE_Real *Pp1, HYPRE_Int rap_type, HYPRE_Int si0, HYPRE_Int si1 );
+HYPRE_Int hypre_PFMGSetupInterpOp_CC2 ( HYPRE_Int i, hypre_StructMatrix *A, hypre_Box *A_dbox,
+                                        HYPRE_Int cdir, hypre_Index stride, hypre_Index stridec, hypre_Index start, hypre_IndexRef startc,
+                                        hypre_Index loop_size, hypre_Box *P_dbox, HYPRE_Int Pstenc0, HYPRE_Int Pstenc1, HYPRE_Real *Pp0,
+                                        HYPRE_Real *Pp1, HYPRE_Int rap_type, HYPRE_Int si0, HYPRE_Int si1 );
+HYPRE_Int hypre_PFMGSetupInterpOp_CC0_SS5 ( HYPRE_Int i, hypre_StructMatrix *A, hypre_Box *A_dbox,
+                                            HYPRE_Int cdir, hypre_Index stride, hypre_Index stridec, hypre_Index start, hypre_IndexRef startc,
+                                            hypre_Index loop_size, hypre_Box *P_dbox, HYPRE_Int Pstenc0, HYPRE_Int Pstenc1, HYPRE_Real *Pp0,
+                                            HYPRE_Real *Pp1, HYPRE_Int rap_type, hypre_Index *P_stencil_shape );
+HYPRE_Int hypre_PFMGSetupInterpOp_CC0_SS9 ( HYPRE_Int i, hypre_StructMatrix *A, hypre_Box *A_dbox,
+                                            HYPRE_Int cdir, hypre_Index stride, hypre_Index stridec, hypre_Index start, hypre_IndexRef startc,
+                                            hypre_Index loop_size, hypre_Box *P_dbox, HYPRE_Int Pstenc0, HYPRE_Int Pstenc1, HYPRE_Real *Pp0,
+                                            HYPRE_Real *Pp1, HYPRE_Int rap_type, hypre_Index *P_stencil_shape );
+HYPRE_Int hypre_PFMGSetupInterpOp_CC0_SS7 ( HYPRE_Int i, hypre_StructMatrix *A, hypre_Box *A_dbox,
+                                            HYPRE_Int cdir, hypre_Index stride, hypre_Index stridec, hypre_Index start, hypre_IndexRef startc,
+                                            hypre_Index loop_size, hypre_Box *P_dbox, HYPRE_Int Pstenc0, HYPRE_Int Pstenc1, HYPRE_Real *Pp0,
+                                            HYPRE_Real *Pp1, HYPRE_Int rap_type, hypre_Index *P_stencil_shape );
+
+HYPRE_Int hypre_PFMGSetupInterpOp_CC0_SS15 ( HYPRE_Int i, hypre_StructMatrix *A, hypre_Box *A_dbox,
+                                             HYPRE_Int cdir, hypre_Index stride, hypre_Index stridec, hypre_Index start, hypre_IndexRef startc,
+                                             hypre_Index loop_size, hypre_Box *P_dbox, HYPRE_Int Pstenc0, HYPRE_Int Pstenc1, HYPRE_Real *Pp0,
+                                             HYPRE_Real *Pp1, HYPRE_Int rap_type, hypre_Index *P_stencil_shape );
+
+HYPRE_Int hypre_PFMGSetupInterpOp_CC0_SS19 ( HYPRE_Int i, hypre_StructMatrix *A, hypre_Box *A_dbox,
+                                             HYPRE_Int cdir, hypre_Index stride, hypre_Index stridec, hypre_Index start, hypre_IndexRef startc,
+                                             hypre_Index loop_size, hypre_Box *P_dbox, HYPRE_Int Pstenc0, HYPRE_Int Pstenc1, HYPRE_Real *Pp0,
+                                             HYPRE_Real *Pp1, HYPRE_Int rap_type, hypre_Index *P_stencil_shape );
+
+HYPRE_Int hypre_PFMGSetupInterpOp_CC0_SS27 ( HYPRE_Int i, hypre_StructMatrix *A, hypre_Box *A_dbox,
+                                             HYPRE_Int cdir, hypre_Index stride, hypre_Index stridec, hypre_Index start, hypre_IndexRef startc,
+                                             hypre_Index loop_size, hypre_Box *P_dbox, HYPRE_Int Pstenc0, HYPRE_Int Pstenc1, HYPRE_Real *Pp0,
+                                             HYPRE_Real *Pp1, HYPRE_Int rap_type, hypre_Index *P_stencil_shape );
 /* pfmg_setup_rap5.c */
-hypre_StructMatrix *hypre_PFMGCreateCoarseOp5 ( hypre_StructMatrix *R , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructGrid *coarse_grid , HYPRE_Int cdir );
-HYPRE_Int hypre_PFMGBuildCoarseOp5 ( hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_StructMatrix *RAP );
-HYPRE_Int hypre_PFMGBuildCoarseOp5_onebox_CC0 ( HYPRE_Int fi , HYPRE_Int ci , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_StructMatrix *RAP );
-HYPRE_Int hypre_PFMGBuildCoarseOp5_onebox_CC1 ( HYPRE_Int fi , HYPRE_Int ci , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_StructMatrix *RAP );
-HYPRE_Int hypre_PFMGBuildCoarseOp5_onebox_CC2 ( HYPRE_Int fi , HYPRE_Int ci , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_StructMatrix *RAP );
+hypre_StructMatrix *hypre_PFMGCreateCoarseOp5 ( hypre_StructMatrix *R, hypre_StructMatrix *A,
+                                                hypre_StructMatrix *P, hypre_StructGrid *coarse_grid, HYPRE_Int cdir );
+HYPRE_Int hypre_PFMGBuildCoarseOp5 ( hypre_StructMatrix *A, hypre_StructMatrix *P,
+                                     hypre_StructMatrix *R, HYPRE_Int cdir, hypre_Index cindex, hypre_Index cstride,
+                                     hypre_StructMatrix *RAP );
+HYPRE_Int hypre_PFMGBuildCoarseOp5_onebox_CC0 ( HYPRE_Int fi, HYPRE_Int ci, hypre_StructMatrix *A,
+                                                hypre_StructMatrix *P, hypre_StructMatrix *R, HYPRE_Int cdir, hypre_Index cindex,
+                                                hypre_Index cstride, hypre_StructMatrix *RAP );
+HYPRE_Int hypre_PFMGBuildCoarseOp5_onebox_CC1 ( HYPRE_Int fi, HYPRE_Int ci, hypre_StructMatrix *A,
+                                                hypre_StructMatrix *P, hypre_StructMatrix *R, HYPRE_Int cdir, hypre_Index cindex,
+                                                hypre_Index cstride, hypre_StructMatrix *RAP );
+HYPRE_Int hypre_PFMGBuildCoarseOp5_onebox_CC2 ( HYPRE_Int fi, HYPRE_Int ci, hypre_StructMatrix *A,
+                                                hypre_StructMatrix *P, hypre_StructMatrix *R, HYPRE_Int cdir, hypre_Index cindex,
+                                                hypre_Index cstride, hypre_StructMatrix *RAP );
 
 /* pfmg_setup_rap7.c */
-hypre_StructMatrix *hypre_PFMGCreateCoarseOp7 ( hypre_StructMatrix *R , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructGrid *coarse_grid , HYPRE_Int cdir );
-HYPRE_Int hypre_PFMGBuildCoarseOp7 ( hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_StructMatrix *RAP );
+hypre_StructMatrix *hypre_PFMGCreateCoarseOp7 ( hypre_StructMatrix *R, hypre_StructMatrix *A,
+                                                hypre_StructMatrix *P, hypre_StructGrid *coarse_grid, HYPRE_Int cdir );
+HYPRE_Int hypre_PFMGBuildCoarseOp7 ( hypre_StructMatrix *A, hypre_StructMatrix *P,
+                                     hypre_StructMatrix *R, HYPRE_Int cdir, hypre_Index cindex, hypre_Index cstride,
+                                     hypre_StructMatrix *RAP );
 
 /* pfmg_setup_rap.c */
-hypre_StructMatrix *hypre_PFMGCreateRAPOp ( hypre_StructMatrix *R , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructGrid *coarse_grid , HYPRE_Int cdir , HYPRE_Int rap_type );
-HYPRE_Int hypre_PFMGSetupRAPOp ( hypre_StructMatrix *R , hypre_StructMatrix *A , hypre_StructMatrix *P , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , HYPRE_Int rap_type , hypre_StructMatrix *Ac );
+hypre_StructMatrix *hypre_PFMGCreateRAPOp ( hypre_StructMatrix *R, hypre_StructMatrix *A,
+                                            hypre_StructMatrix *P, hypre_StructGrid *coarse_grid, HYPRE_Int cdir, HYPRE_Int rap_type );
+HYPRE_Int hypre_PFMGSetupRAPOp ( hypre_StructMatrix *R, hypre_StructMatrix *A,
+                                 hypre_StructMatrix *P, HYPRE_Int cdir, hypre_Index cindex, hypre_Index cstride, HYPRE_Int rap_type,
+                                 hypre_StructMatrix *Ac );
 
 /* pfmg_solve.c */
-HYPRE_Int hypre_PFMGSolve ( void *pfmg_vdata , hypre_StructMatrix *A , hypre_StructVector *b , hypre_StructVector *x );
+HYPRE_Int hypre_PFMGSolve ( void *pfmg_vdata, hypre_StructMatrix *A, hypre_StructVector *b,
+                            hypre_StructVector *x );
 
 /* point_relax.c */
 void *hypre_PointRelaxCreate ( MPI_Comm comm );
 HYPRE_Int hypre_PointRelaxDestroy ( void *relax_vdata );
-HYPRE_Int hypre_PointRelaxSetup ( void *relax_vdata , hypre_StructMatrix *A , hypre_StructVector *b , hypre_StructVector *x );
-HYPRE_Int hypre_PointRelax ( void *relax_vdata , hypre_StructMatrix *A , hypre_StructVector *b , hypre_StructVector *x );
-HYPRE_Int hypre_PointRelax_core0 ( void *relax_vdata , hypre_StructMatrix *A , HYPRE_Int constant_coefficient , hypre_Box *compute_box , HYPRE_Real *bp , HYPRE_Real *xp , HYPRE_Real *tp , HYPRE_Int boxarray_id , hypre_Box *A_data_box , hypre_Box *b_data_box , hypre_Box *x_data_box , hypre_Box *t_data_box , hypre_IndexRef stride );
-HYPRE_Int hypre_PointRelax_core12 ( void *relax_vdata , hypre_StructMatrix *A , HYPRE_Int constant_coefficient , hypre_Box *compute_box , HYPRE_Real *bp , HYPRE_Real *xp , HYPRE_Real *tp , HYPRE_Int boxarray_id , hypre_Box *A_data_box , hypre_Box *b_data_box , hypre_Box *x_data_box , hypre_Box *t_data_box , hypre_IndexRef stride );
-HYPRE_Int hypre_PointRelaxSetTol ( void *relax_vdata , HYPRE_Real tol );
-HYPRE_Int hypre_PointRelaxGetTol ( void *relax_vdata , HYPRE_Real *tol );
-HYPRE_Int hypre_PointRelaxSetMaxIter ( void *relax_vdata , HYPRE_Int max_iter );
-HYPRE_Int hypre_PointRelaxGetMaxIter ( void *relax_vdata , HYPRE_Int *max_iter );
-HYPRE_Int hypre_PointRelaxSetZeroGuess ( void *relax_vdata , HYPRE_Int zero_guess );
-HYPRE_Int hypre_PointRelaxGetZeroGuess ( void *relax_vdata , HYPRE_Int *zero_guess );
-HYPRE_Int hypre_PointRelaxGetNumIterations ( void *relax_vdata , HYPRE_Int *num_iterations );
-HYPRE_Int hypre_PointRelaxSetWeight ( void *relax_vdata , HYPRE_Real weight );
-HYPRE_Int hypre_PointRelaxSetNumPointsets ( void *relax_vdata , HYPRE_Int num_pointsets );
-HYPRE_Int hypre_PointRelaxSetPointset ( void *relax_vdata , HYPRE_Int pointset , HYPRE_Int pointset_size , hypre_Index pointset_stride , hypre_Index *pointset_indices );
-HYPRE_Int hypre_PointRelaxSetPointsetRank ( void *relax_vdata , HYPRE_Int pointset , HYPRE_Int pointset_rank );
-HYPRE_Int hypre_PointRelaxSetTempVec ( void *relax_vdata , hypre_StructVector *t );
-HYPRE_Int hypre_PointRelaxGetFinalRelativeResidualNorm ( void *relax_vdata , HYPRE_Real *norm );
-HYPRE_Int hypre_relax_wtx ( void *relax_vdata , HYPRE_Int pointset , hypre_StructVector *t , hypre_StructVector *x );
-HYPRE_Int hypre_relax_copy ( void *relax_vdata , HYPRE_Int pointset , hypre_StructVector *t , hypre_StructVector *x );
+HYPRE_Int hypre_PointRelaxSetup ( void *relax_vdata, hypre_StructMatrix *A, hypre_StructVector *b,
+                                  hypre_StructVector *x );
+HYPRE_Int hypre_PointRelax ( void *relax_vdata, hypre_StructMatrix *A, hypre_StructVector *b,
+                             hypre_StructVector *x );
+HYPRE_Int hypre_PointRelax_core0 ( void *relax_vdata, hypre_StructMatrix *A,
+                                   HYPRE_Int constant_coefficient, hypre_Box *compute_box, HYPRE_Real *bp, HYPRE_Real *xp,
+                                   HYPRE_Real *tp, HYPRE_Int boxarray_id, hypre_Box *A_data_box, hypre_Box *b_data_box,
+                                   hypre_Box *x_data_box, hypre_Box *t_data_box, hypre_IndexRef stride );
+HYPRE_Int hypre_PointRelax_core12 ( void *relax_vdata, hypre_StructMatrix *A,
+                                    HYPRE_Int constant_coefficient, hypre_Box *compute_box, HYPRE_Real *bp, HYPRE_Real *xp,
+                                    HYPRE_Real *tp, HYPRE_Int boxarray_id, hypre_Box *A_data_box, hypre_Box *b_data_box,
+                                    hypre_Box *x_data_box, hypre_Box *t_data_box, hypre_IndexRef stride );
+HYPRE_Int hypre_PointRelaxSetTol ( void *relax_vdata, HYPRE_Real tol );
+HYPRE_Int hypre_PointRelaxGetTol ( void *relax_vdata, HYPRE_Real *tol );
+HYPRE_Int hypre_PointRelaxSetMaxIter ( void *relax_vdata, HYPRE_Int max_iter );
+HYPRE_Int hypre_PointRelaxGetMaxIter ( void *relax_vdata, HYPRE_Int *max_iter );
+HYPRE_Int hypre_PointRelaxSetZeroGuess ( void *relax_vdata, HYPRE_Int zero_guess );
+HYPRE_Int hypre_PointRelaxGetZeroGuess ( void *relax_vdata, HYPRE_Int *zero_guess );
+HYPRE_Int hypre_PointRelaxGetNumIterations ( void *relax_vdata, HYPRE_Int *num_iterations );
+HYPRE_Int hypre_PointRelaxSetWeight ( void *relax_vdata, HYPRE_Real weight );
+HYPRE_Int hypre_PointRelaxSetNumPointsets ( void *relax_vdata, HYPRE_Int num_pointsets );
+HYPRE_Int hypre_PointRelaxSetPointset ( void *relax_vdata, HYPRE_Int pointset,
+                                        HYPRE_Int pointset_size, hypre_Index pointset_stride, hypre_Index *pointset_indices );
+HYPRE_Int hypre_PointRelaxSetPointsetRank ( void *relax_vdata, HYPRE_Int pointset,
+                                            HYPRE_Int pointset_rank );
+HYPRE_Int hypre_PointRelaxSetTempVec ( void *relax_vdata, hypre_StructVector *t );
+HYPRE_Int hypre_PointRelaxGetFinalRelativeResidualNorm ( void *relax_vdata, HYPRE_Real *norm );
+HYPRE_Int hypre_relax_wtx ( void *relax_vdata, HYPRE_Int pointset, hypre_StructVector *t,
+                            hypre_StructVector *x );
+HYPRE_Int hypre_relax_copy ( void *relax_vdata, HYPRE_Int pointset, hypre_StructVector *t,
+                             hypre_StructVector *x );
 
 /* red_black_constantcoef_gs.c */
-HYPRE_Int hypre_RedBlackConstantCoefGS ( void *relax_vdata , hypre_StructMatrix *A , hypre_StructVector *b , hypre_StructVector *x );
+HYPRE_Int hypre_RedBlackConstantCoefGS ( void *relax_vdata, hypre_StructMatrix *A,
+                                         hypre_StructVector *b, hypre_StructVector *x );
 
 /* red_black_gs.c */
 void *hypre_RedBlackGSCreate ( MPI_Comm comm );
 HYPRE_Int hypre_RedBlackGSDestroy ( void *relax_vdata );
-HYPRE_Int hypre_RedBlackGSSetup ( void *relax_vdata , hypre_StructMatrix *A , hypre_StructVector *b , hypre_StructVector *x );
-HYPRE_Int hypre_RedBlackGS ( void *relax_vdata , hypre_StructMatrix *A , hypre_StructVector *b , hypre_StructVector *x );
-HYPRE_Int hypre_RedBlackGSSetTol ( void *relax_vdata , HYPRE_Real tol );
-HYPRE_Int hypre_RedBlackGSSetMaxIter ( void *relax_vdata , HYPRE_Int max_iter );
-HYPRE_Int hypre_RedBlackGSSetZeroGuess ( void *relax_vdata , HYPRE_Int zero_guess );
+HYPRE_Int hypre_RedBlackGSSetup ( void *relax_vdata, hypre_StructMatrix *A, hypre_StructVector *b,
+                                  hypre_StructVector *x );
+HYPRE_Int hypre_RedBlackGS ( void *relax_vdata, hypre_StructMatrix *A, hypre_StructVector *b,
+                             hypre_StructVector *x );
+HYPRE_Int hypre_RedBlackGSSetTol ( void *relax_vdata, HYPRE_Real tol );
+HYPRE_Int hypre_RedBlackGSSetMaxIter ( void *relax_vdata, HYPRE_Int max_iter );
+HYPRE_Int hypre_RedBlackGSSetZeroGuess ( void *relax_vdata, HYPRE_Int zero_guess );
 HYPRE_Int hypre_RedBlackGSSetStartRed ( void *relax_vdata );
 HYPRE_Int hypre_RedBlackGSSetStartBlack ( void *relax_vdata );
 
 /* semi.c */
-HYPRE_Int hypre_StructInterpAssemble ( hypre_StructMatrix *A , hypre_StructMatrix *P , HYPRE_Int P_stored_as_transpose , HYPRE_Int cdir , hypre_Index index , hypre_Index stride );
+HYPRE_Int hypre_StructInterpAssemble ( hypre_StructMatrix *A, hypre_StructMatrix *P,
+                                       HYPRE_Int P_stored_as_transpose, HYPRE_Int cdir, hypre_Index index, hypre_Index stride );
 
 /* semi_interp.c */
 void *hypre_SemiInterpCreate ( void );
-HYPRE_Int hypre_SemiInterpSetup ( void *interp_vdata , hypre_StructMatrix *P , HYPRE_Int P_stored_as_transpose , hypre_StructVector *xc , hypre_StructVector *e , hypre_Index cindex , hypre_Index findex , hypre_Index stride );
-HYPRE_Int hypre_SemiInterp ( void *interp_vdata , hypre_StructMatrix *P , hypre_StructVector *xc , hypre_StructVector *e );
+HYPRE_Int hypre_SemiInterpSetup ( void *interp_vdata, hypre_StructMatrix *P,
+                                  HYPRE_Int P_stored_as_transpose, hypre_StructVector *xc, hypre_StructVector *e, hypre_Index cindex,
+                                  hypre_Index findex, hypre_Index stride );
+HYPRE_Int hypre_SemiInterp ( void *interp_vdata, hypre_StructMatrix *P, hypre_StructVector *xc,
+                             hypre_StructVector *e );
 HYPRE_Int hypre_SemiInterpDestroy ( void *interp_vdata );
 
 /* semi_restrict.c */
 void *hypre_SemiRestrictCreate ( void );
-HYPRE_Int hypre_SemiRestrictSetup ( void *restrict_vdata , hypre_StructMatrix *R , HYPRE_Int R_stored_as_transpose , hypre_StructVector *r , hypre_StructVector *rc , hypre_Index cindex , hypre_Index findex , hypre_Index stride );
-HYPRE_Int hypre_SemiRestrict ( void *restrict_vdata , hypre_StructMatrix *R , hypre_StructVector *r , hypre_StructVector *rc );
+HYPRE_Int hypre_SemiRestrictSetup ( void *restrict_vdata, hypre_StructMatrix *R,
+                                    HYPRE_Int R_stored_as_transpose, hypre_StructVector *r, hypre_StructVector *rc, hypre_Index cindex,
+                                    hypre_Index findex, hypre_Index stride );
+HYPRE_Int hypre_SemiRestrict ( void *restrict_vdata, hypre_StructMatrix *R, hypre_StructVector *r,
+                               hypre_StructVector *rc );
 HYPRE_Int hypre_SemiRestrictDestroy ( void *restrict_vdata );
 
 /* semi_setup_rap.c */
-hypre_StructMatrix *hypre_SemiCreateRAPOp ( hypre_StructMatrix *R , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructGrid *coarse_grid , HYPRE_Int cdir , HYPRE_Int P_stored_as_transpose );
-HYPRE_Int hypre_SemiBuildRAP ( hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , HYPRE_Int P_stored_as_transpose , hypre_StructMatrix *RAP );
+hypre_StructMatrix *hypre_SemiCreateRAPOp ( hypre_StructMatrix *R, hypre_StructMatrix *A,
+                                            hypre_StructMatrix *P, hypre_StructGrid *coarse_grid, HYPRE_Int cdir,
+                                            HYPRE_Int P_stored_as_transpose );
+HYPRE_Int hypre_SemiBuildRAP ( hypre_StructMatrix *A, hypre_StructMatrix *P, hypre_StructMatrix *R,
+                               HYPRE_Int cdir, hypre_Index cindex, hypre_Index cstride, HYPRE_Int P_stored_as_transpose,
+                               hypre_StructMatrix *RAP );
 
 /* smg2_setup_rap.c */
-hypre_StructMatrix *hypre_SMG2CreateRAPOp ( hypre_StructMatrix *R , hypre_StructMatrix *A , hypre_StructMatrix *PT , hypre_StructGrid *coarse_grid );
-HYPRE_Int hypre_SMG2BuildRAPSym ( hypre_StructMatrix *A , hypre_StructMatrix *PT , hypre_StructMatrix *R , hypre_StructMatrix *RAP , hypre_Index cindex , hypre_Index cstride );
-HYPRE_Int hypre_SMG2BuildRAPNoSym ( hypre_StructMatrix *A , hypre_StructMatrix *PT , hypre_StructMatrix *R , hypre_StructMatrix *RAP , hypre_Index cindex , hypre_Index cstride );
-HYPRE_Int hypre_SMG2RAPPeriodicSym ( hypre_StructMatrix *RAP , hypre_Index cindex , hypre_Index cstride );
-HYPRE_Int hypre_SMG2RAPPeriodicNoSym ( hypre_StructMatrix *RAP , hypre_Index cindex , hypre_Index cstride );
+hypre_StructMatrix *hypre_SMG2CreateRAPOp ( hypre_StructMatrix *R, hypre_StructMatrix *A,
+                                            hypre_StructMatrix *PT, hypre_StructGrid *coarse_grid );
+HYPRE_Int hypre_SMG2BuildRAPSym ( hypre_StructMatrix *A, hypre_StructMatrix *PT,
+                                  hypre_StructMatrix *R, hypre_StructMatrix *RAP, hypre_Index cindex, hypre_Index cstride );
+HYPRE_Int hypre_SMG2BuildRAPNoSym ( hypre_StructMatrix *A, hypre_StructMatrix *PT,
+                                    hypre_StructMatrix *R, hypre_StructMatrix *RAP, hypre_Index cindex, hypre_Index cstride );
+HYPRE_Int hypre_SMG2RAPPeriodicSym ( hypre_StructMatrix *RAP, hypre_Index cindex,
+                                     hypre_Index cstride );
+HYPRE_Int hypre_SMG2RAPPeriodicNoSym ( hypre_StructMatrix *RAP, hypre_Index cindex,
+                                       hypre_Index cstride );
 
 /* smg3_setup_rap.c */
-hypre_StructMatrix *hypre_SMG3CreateRAPOp ( hypre_StructMatrix *R , hypre_StructMatrix *A , hypre_StructMatrix *PT , hypre_StructGrid *coarse_grid );
-HYPRE_Int hypre_SMG3BuildRAPSym ( hypre_StructMatrix *A , hypre_StructMatrix *PT , hypre_StructMatrix *R , hypre_StructMatrix *RAP , hypre_Index cindex , hypre_Index cstride );
-HYPRE_Int hypre_SMG3BuildRAPNoSym ( hypre_StructMatrix *A , hypre_StructMatrix *PT , hypre_StructMatrix *R , hypre_StructMatrix *RAP , hypre_Index cindex , hypre_Index cstride );
-HYPRE_Int hypre_SMG3RAPPeriodicSym ( hypre_StructMatrix *RAP , hypre_Index cindex , hypre_Index cstride );
-HYPRE_Int hypre_SMG3RAPPeriodicNoSym ( hypre_StructMatrix *RAP , hypre_Index cindex , hypre_Index cstride );
+hypre_StructMatrix *hypre_SMG3CreateRAPOp ( hypre_StructMatrix *R, hypre_StructMatrix *A,
+                                            hypre_StructMatrix *PT, hypre_StructGrid *coarse_grid );
+HYPRE_Int hypre_SMG3BuildRAPSym ( hypre_StructMatrix *A, hypre_StructMatrix *PT,
+                                  hypre_StructMatrix *R, hypre_StructMatrix *RAP, hypre_Index cindex, hypre_Index cstride );
+HYPRE_Int hypre_SMG3BuildRAPNoSym ( hypre_StructMatrix *A, hypre_StructMatrix *PT,
+                                    hypre_StructMatrix *R, hypre_StructMatrix *RAP, hypre_Index cindex, hypre_Index cstride );
+HYPRE_Int hypre_SMG3RAPPeriodicSym ( hypre_StructMatrix *RAP, hypre_Index cindex,
+                                     hypre_Index cstride );
+HYPRE_Int hypre_SMG3RAPPeriodicNoSym ( hypre_StructMatrix *RAP, hypre_Index cindex,
+                                       hypre_Index cstride );
 
 /* smg_axpy.c */
-HYPRE_Int hypre_SMGAxpy ( HYPRE_Real alpha , hypre_StructVector *x , hypre_StructVector *y , hypre_Index base_index , hypre_Index base_stride );
+HYPRE_Int hypre_SMGAxpy ( HYPRE_Real alpha, hypre_StructVector *x, hypre_StructVector *y,
+                          hypre_Index base_index, hypre_Index base_stride );
 
 /* smg.c */
 void *hypre_SMGCreate ( MPI_Comm comm );
 HYPRE_Int hypre_SMGDestroy ( void *smg_vdata );
-HYPRE_Int hypre_SMGSetMemoryUse ( void *smg_vdata , HYPRE_Int memory_use );
-HYPRE_Int hypre_SMGGetMemoryUse ( void *smg_vdata , HYPRE_Int *memory_use );
-HYPRE_Int hypre_SMGSetTol ( void *smg_vdata , HYPRE_Real tol );
-HYPRE_Int hypre_SMGGetTol ( void *smg_vdata , HYPRE_Real *tol );
-HYPRE_Int hypre_SMGSetMaxIter ( void *smg_vdata , HYPRE_Int max_iter );
-HYPRE_Int hypre_SMGGetMaxIter ( void *smg_vdata , HYPRE_Int *max_iter );
-HYPRE_Int hypre_SMGSetRelChange ( void *smg_vdata , HYPRE_Int rel_change );
-HYPRE_Int hypre_SMGGetRelChange ( void *smg_vdata , HYPRE_Int *rel_change );
-HYPRE_Int hypre_SMGSetZeroGuess ( void *smg_vdata , HYPRE_Int zero_guess );
-HYPRE_Int hypre_SMGGetZeroGuess ( void *smg_vdata , HYPRE_Int *zero_guess );
-HYPRE_Int hypre_SMGSetNumPreRelax ( void *smg_vdata , HYPRE_Int num_pre_relax );
-HYPRE_Int hypre_SMGGetNumPreRelax ( void *smg_vdata , HYPRE_Int *num_pre_relax );
-HYPRE_Int hypre_SMGSetNumPostRelax ( void *smg_vdata , HYPRE_Int num_post_relax );
-HYPRE_Int hypre_SMGGetNumPostRelax ( void *smg_vdata , HYPRE_Int *num_post_relax );
-HYPRE_Int hypre_SMGSetBase ( void *smg_vdata , hypre_Index base_index , hypre_Index base_stride );
-HYPRE_Int hypre_SMGSetLogging ( void *smg_vdata , HYPRE_Int logging );
-HYPRE_Int hypre_SMGGetLogging ( void *smg_vdata , HYPRE_Int *logging );
-HYPRE_Int hypre_SMGSetPrintLevel ( void *smg_vdata , HYPRE_Int print_level );
-HYPRE_Int hypre_SMGGetPrintLevel ( void *smg_vdata , HYPRE_Int *print_level );
-HYPRE_Int hypre_SMGGetNumIterations ( void *smg_vdata , HYPRE_Int *num_iterations );
-HYPRE_Int hypre_SMGPrintLogging ( void *smg_vdata , HYPRE_Int myid );
-HYPRE_Int hypre_SMGGetFinalRelativeResidualNorm ( void *smg_vdata , HYPRE_Real *relative_residual_norm );
-HYPRE_Int hypre_SMGSetStructVectorConstantValues ( hypre_StructVector *vector , HYPRE_Real values , hypre_BoxArray *box_array , hypre_Index stride );
+HYPRE_Int hypre_SMGSetMemoryUse ( void *smg_vdata, HYPRE_Int memory_use );
+HYPRE_Int hypre_SMGGetMemoryUse ( void *smg_vdata, HYPRE_Int *memory_use );
+HYPRE_Int hypre_SMGSetTol ( void *smg_vdata, HYPRE_Real tol );
+HYPRE_Int hypre_SMGGetTol ( void *smg_vdata, HYPRE_Real *tol );
+HYPRE_Int hypre_SMGSetMaxIter ( void *smg_vdata, HYPRE_Int max_iter );
+HYPRE_Int hypre_SMGGetMaxIter ( void *smg_vdata, HYPRE_Int *max_iter );
+HYPRE_Int hypre_SMGSetRelChange ( void *smg_vdata, HYPRE_Int rel_change );
+HYPRE_Int hypre_SMGGetRelChange ( void *smg_vdata, HYPRE_Int *rel_change );
+HYPRE_Int hypre_SMGSetZeroGuess ( void *smg_vdata, HYPRE_Int zero_guess );
+HYPRE_Int hypre_SMGGetZeroGuess ( void *smg_vdata, HYPRE_Int *zero_guess );
+HYPRE_Int hypre_SMGSetNumPreRelax ( void *smg_vdata, HYPRE_Int num_pre_relax );
+HYPRE_Int hypre_SMGGetNumPreRelax ( void *smg_vdata, HYPRE_Int *num_pre_relax );
+HYPRE_Int hypre_SMGSetNumPostRelax ( void *smg_vdata, HYPRE_Int num_post_relax );
+HYPRE_Int hypre_SMGGetNumPostRelax ( void *smg_vdata, HYPRE_Int *num_post_relax );
+HYPRE_Int hypre_SMGSetBase ( void *smg_vdata, hypre_Index base_index, hypre_Index base_stride );
+HYPRE_Int hypre_SMGSetLogging ( void *smg_vdata, HYPRE_Int logging );
+HYPRE_Int hypre_SMGGetLogging ( void *smg_vdata, HYPRE_Int *logging );
+HYPRE_Int hypre_SMGSetPrintLevel ( void *smg_vdata, HYPRE_Int print_level );
+HYPRE_Int hypre_SMGGetPrintLevel ( void *smg_vdata, HYPRE_Int *print_level );
+HYPRE_Int hypre_SMGGetNumIterations ( void *smg_vdata, HYPRE_Int *num_iterations );
+HYPRE_Int hypre_SMGPrintLogging ( void *smg_vdata, HYPRE_Int myid );
+HYPRE_Int hypre_SMGGetFinalRelativeResidualNorm ( void *smg_vdata,
+                                                  HYPRE_Real *relative_residual_norm );
+HYPRE_Int hypre_SMGSetStructVectorConstantValues ( hypre_StructVector *vector, HYPRE_Real values,
+                                                   hypre_BoxArray *box_array, hypre_Index stride );
 HYPRE_Int hypre_StructSMGSetMaxLevel( void   *smg_vdata, HYPRE_Int   max_level  );
 
 /* smg_relax.c */
@@ -315,112 +480,163 @@ HYPRE_Int hypre_SMGRelaxDestroyTempVec ( void *relax_vdata );
 HYPRE_Int hypre_SMGRelaxDestroyARem ( void *relax_vdata );
 HYPRE_Int hypre_SMGRelaxDestroyASol ( void *relax_vdata );
 HYPRE_Int hypre_SMGRelaxDestroy ( void *relax_vdata );
-HYPRE_Int hypre_SMGRelax ( void *relax_vdata , hypre_StructMatrix *A , hypre_StructVector *b , hypre_StructVector *x );
-HYPRE_Int hypre_SMGRelaxSetup ( void *relax_vdata , hypre_StructMatrix *A , hypre_StructVector *b , hypre_StructVector *x );
-HYPRE_Int hypre_SMGRelaxSetupTempVec ( void *relax_vdata , hypre_StructMatrix *A , hypre_StructVector *b , hypre_StructVector *x );
-HYPRE_Int hypre_SMGRelaxSetupARem ( void *relax_vdata , hypre_StructMatrix *A , hypre_StructVector *b , hypre_StructVector *x );
-HYPRE_Int hypre_SMGRelaxSetupASol ( void *relax_vdata , hypre_StructMatrix *A , hypre_StructVector *b , hypre_StructVector *x );
-HYPRE_Int hypre_SMGRelaxSetTempVec ( void *relax_vdata , hypre_StructVector *temp_vec );
-HYPRE_Int hypre_SMGRelaxSetMemoryUse ( void *relax_vdata , HYPRE_Int memory_use );
-HYPRE_Int hypre_SMGRelaxSetTol ( void *relax_vdata , HYPRE_Real tol );
-HYPRE_Int hypre_SMGRelaxSetMaxIter ( void *relax_vdata , HYPRE_Int max_iter );
-HYPRE_Int hypre_SMGRelaxSetZeroGuess ( void *relax_vdata , HYPRE_Int zero_guess );
-HYPRE_Int hypre_SMGRelaxSetNumSpaces ( void *relax_vdata , HYPRE_Int num_spaces );
-HYPRE_Int hypre_SMGRelaxSetNumPreSpaces ( void *relax_vdata , HYPRE_Int num_pre_spaces );
-HYPRE_Int hypre_SMGRelaxSetNumRegSpaces ( void *relax_vdata , HYPRE_Int num_reg_spaces );
-HYPRE_Int hypre_SMGRelaxSetSpace ( void *relax_vdata , HYPRE_Int i , HYPRE_Int space_index , HYPRE_Int space_stride );
-HYPRE_Int hypre_SMGRelaxSetRegSpaceRank ( void *relax_vdata , HYPRE_Int i , HYPRE_Int reg_space_rank );
-HYPRE_Int hypre_SMGRelaxSetPreSpaceRank ( void *relax_vdata , HYPRE_Int i , HYPRE_Int pre_space_rank );
-HYPRE_Int hypre_SMGRelaxSetBase ( void *relax_vdata , hypre_Index base_index , hypre_Index base_stride );
-HYPRE_Int hypre_SMGRelaxSetNumPreRelax ( void *relax_vdata , HYPRE_Int num_pre_relax );
-HYPRE_Int hypre_SMGRelaxSetNumPostRelax ( void *relax_vdata , HYPRE_Int num_post_relax );
-HYPRE_Int hypre_SMGRelaxSetNewMatrixStencil ( void *relax_vdata , hypre_StructStencil *diff_stencil );
-HYPRE_Int hypre_SMGRelaxSetupBaseBoxArray ( void *relax_vdata , hypre_StructMatrix *A , hypre_StructVector *b , hypre_StructVector *x );
+HYPRE_Int hypre_SMGRelax ( void *relax_vdata, hypre_StructMatrix *A, hypre_StructVector *b,
+                           hypre_StructVector *x );
+HYPRE_Int hypre_SMGRelaxSetup ( void *relax_vdata, hypre_StructMatrix *A, hypre_StructVector *b,
+                                hypre_StructVector *x );
+HYPRE_Int hypre_SMGRelaxSetupTempVec ( void *relax_vdata, hypre_StructMatrix *A,
+                                       hypre_StructVector *b, hypre_StructVector *x );
+HYPRE_Int hypre_SMGRelaxSetupARem ( void *relax_vdata, hypre_StructMatrix *A, hypre_StructVector *b,
+                                    hypre_StructVector *x );
+HYPRE_Int hypre_SMGRelaxSetupASol ( void *relax_vdata, hypre_StructMatrix *A, hypre_StructVector *b,
+                                    hypre_StructVector *x );
+HYPRE_Int hypre_SMGRelaxSetTempVec ( void *relax_vdata, hypre_StructVector *temp_vec );
+HYPRE_Int hypre_SMGRelaxSetMemoryUse ( void *relax_vdata, HYPRE_Int memory_use );
+HYPRE_Int hypre_SMGRelaxSetTol ( void *relax_vdata, HYPRE_Real tol );
+HYPRE_Int hypre_SMGRelaxSetMaxIter ( void *relax_vdata, HYPRE_Int max_iter );
+HYPRE_Int hypre_SMGRelaxSetZeroGuess ( void *relax_vdata, HYPRE_Int zero_guess );
+HYPRE_Int hypre_SMGRelaxSetNumSpaces ( void *relax_vdata, HYPRE_Int num_spaces );
+HYPRE_Int hypre_SMGRelaxSetNumPreSpaces ( void *relax_vdata, HYPRE_Int num_pre_spaces );
+HYPRE_Int hypre_SMGRelaxSetNumRegSpaces ( void *relax_vdata, HYPRE_Int num_reg_spaces );
+HYPRE_Int hypre_SMGRelaxSetSpace ( void *relax_vdata, HYPRE_Int i, HYPRE_Int space_index,
+                                   HYPRE_Int space_stride );
+HYPRE_Int hypre_SMGRelaxSetRegSpaceRank ( void *relax_vdata, HYPRE_Int i,
+                                          HYPRE_Int reg_space_rank );
+HYPRE_Int hypre_SMGRelaxSetPreSpaceRank ( void *relax_vdata, HYPRE_Int i,
+                                          HYPRE_Int pre_space_rank );
+HYPRE_Int hypre_SMGRelaxSetBase ( void *relax_vdata, hypre_Index base_index,
+                                  hypre_Index base_stride );
+HYPRE_Int hypre_SMGRelaxSetNumPreRelax ( void *relax_vdata, HYPRE_Int num_pre_relax );
+HYPRE_Int hypre_SMGRelaxSetNumPostRelax ( void *relax_vdata, HYPRE_Int num_post_relax );
+HYPRE_Int hypre_SMGRelaxSetNewMatrixStencil ( void *relax_vdata,
+                                              hypre_StructStencil *diff_stencil );
+HYPRE_Int hypre_SMGRelaxSetupBaseBoxArray ( void *relax_vdata, hypre_StructMatrix *A,
+                                            hypre_StructVector *b, hypre_StructVector *x );
 HYPRE_Int hypre_SMGRelaxSetMaxLevel( void *relax_vdata, HYPRE_Int   num_max_level );
 
 /* smg_residual.c */
 void *hypre_SMGResidualCreate ( void );
-HYPRE_Int hypre_SMGResidualSetup ( void *residual_vdata , hypre_StructMatrix *A , hypre_StructVector *x , hypre_StructVector *b , hypre_StructVector *r );
-HYPRE_Int hypre_SMGResidual ( void *residual_vdata , hypre_StructMatrix *A , hypre_StructVector *x , hypre_StructVector *b , hypre_StructVector *r );
-HYPRE_Int hypre_SMGResidualSetBase ( void *residual_vdata , hypre_Index base_index , hypre_Index base_stride );
+HYPRE_Int hypre_SMGResidualSetup ( void *residual_vdata, hypre_StructMatrix *A,
+                                   hypre_StructVector *x, hypre_StructVector *b, hypre_StructVector *r );
+HYPRE_Int hypre_SMGResidual ( void *residual_vdata, hypre_StructMatrix *A, hypre_StructVector *x,
+                              hypre_StructVector *b, hypre_StructVector *r );
+HYPRE_Int hypre_SMGResidualSetBase ( void *residual_vdata, hypre_Index base_index,
+                                     hypre_Index base_stride );
 HYPRE_Int hypre_SMGResidualDestroy ( void *residual_vdata );
 
 /* smg_residual_unrolled.c */
 void *hypre_SMGResidualCreate ( void );
-HYPRE_Int hypre_SMGResidualSetup ( void *residual_vdata , hypre_StructMatrix *A , hypre_StructVector *x , hypre_StructVector *b , hypre_StructVector *r );
-HYPRE_Int hypre_SMGResidual ( void *residual_vdata , hypre_StructMatrix *A , hypre_StructVector *x , hypre_StructVector *b , hypre_StructVector *r );
-HYPRE_Int hypre_SMGResidualSetBase ( void *residual_vdata , hypre_Index base_index , hypre_Index base_stride );
+HYPRE_Int hypre_SMGResidualSetup ( void *residual_vdata, hypre_StructMatrix *A,
+                                   hypre_StructVector *x, hypre_StructVector *b, hypre_StructVector *r );
+HYPRE_Int hypre_SMGResidual ( void *residual_vdata, hypre_StructMatrix *A, hypre_StructVector *x,
+                              hypre_StructVector *b, hypre_StructVector *r );
+HYPRE_Int hypre_SMGResidualSetBase ( void *residual_vdata, hypre_Index base_index,
+                                     hypre_Index base_stride );
 HYPRE_Int hypre_SMGResidualDestroy ( void *residual_vdata );
 
 /* smg_setup.c */
-HYPRE_Int hypre_SMGSetup ( void *smg_vdata , hypre_StructMatrix *A , hypre_StructVector *b , hypre_StructVector *x );
+HYPRE_Int hypre_SMGSetup ( void *smg_vdata, hypre_StructMatrix *A, hypre_StructVector *b,
+                           hypre_StructVector *x );
 
 /* smg_setup_interp.c */
-hypre_StructMatrix *hypre_SMGCreateInterpOp ( hypre_StructMatrix *A , hypre_StructGrid *cgrid , HYPRE_Int cdir );
-HYPRE_Int hypre_SMGSetupInterpOp ( void *relax_data , hypre_StructMatrix *A , hypre_StructVector *b , hypre_StructVector *x , hypre_StructMatrix *PT , HYPRE_Int cdir , hypre_Index cindex , hypre_Index findex , hypre_Index stride );
+hypre_StructMatrix *hypre_SMGCreateInterpOp ( hypre_StructMatrix *A, hypre_StructGrid *cgrid,
+                                              HYPRE_Int cdir );
+HYPRE_Int hypre_SMGSetupInterpOp ( void *relax_data, hypre_StructMatrix *A, hypre_StructVector *b,
+                                   hypre_StructVector *x, hypre_StructMatrix *PT, HYPRE_Int cdir, hypre_Index cindex,
+                                   hypre_Index findex, hypre_Index stride );
 
 /* smg_setup_rap.c */
-hypre_StructMatrix *hypre_SMGCreateRAPOp ( hypre_StructMatrix *R , hypre_StructMatrix *A , hypre_StructMatrix *PT , hypre_StructGrid *coarse_grid );
-HYPRE_Int hypre_SMGSetupRAPOp ( hypre_StructMatrix *R , hypre_StructMatrix *A , hypre_StructMatrix *PT , hypre_StructMatrix *Ac , hypre_Index cindex , hypre_Index cstride );
+hypre_StructMatrix *hypre_SMGCreateRAPOp ( hypre_StructMatrix *R, hypre_StructMatrix *A,
+                                           hypre_StructMatrix *PT, hypre_StructGrid *coarse_grid );
+HYPRE_Int hypre_SMGSetupRAPOp ( hypre_StructMatrix *R, hypre_StructMatrix *A,
+                                hypre_StructMatrix *PT, hypre_StructMatrix *Ac, hypre_Index cindex, hypre_Index cstride );
 
 /* smg_setup_restrict.c */
-hypre_StructMatrix *hypre_SMGCreateRestrictOp ( hypre_StructMatrix *A , hypre_StructGrid *cgrid , HYPRE_Int cdir );
-HYPRE_Int hypre_SMGSetupRestrictOp ( hypre_StructMatrix *A , hypre_StructMatrix *R , hypre_StructVector *temp_vec , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride );
+hypre_StructMatrix *hypre_SMGCreateRestrictOp ( hypre_StructMatrix *A, hypre_StructGrid *cgrid,
+                                                HYPRE_Int cdir );
+HYPRE_Int hypre_SMGSetupRestrictOp ( hypre_StructMatrix *A, hypre_StructMatrix *R,
+                                     hypre_StructVector *temp_vec, HYPRE_Int cdir, hypre_Index cindex, hypre_Index cstride );
 
 /* smg_solve.c */
-HYPRE_Int hypre_SMGSolve ( void *smg_vdata , hypre_StructMatrix *A , hypre_StructVector *b , hypre_StructVector *x );
+HYPRE_Int hypre_SMGSolve ( void *smg_vdata, hypre_StructMatrix *A, hypre_StructVector *b,
+                           hypre_StructVector *x );
 
 /* sparse_msg2_setup_rap.c */
-hypre_StructMatrix *hypre_SparseMSG2CreateRAPOp ( hypre_StructMatrix *R , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructGrid *coarse_grid , HYPRE_Int cdir );
-HYPRE_Int hypre_SparseMSG2BuildRAPSym ( hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_Index stridePR , hypre_StructMatrix *RAP );
-HYPRE_Int hypre_SparseMSG2BuildRAPNoSym ( hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_Index stridePR , hypre_StructMatrix *RAP );
+hypre_StructMatrix *hypre_SparseMSG2CreateRAPOp ( hypre_StructMatrix *R, hypre_StructMatrix *A,
+                                                  hypre_StructMatrix *P, hypre_StructGrid *coarse_grid, HYPRE_Int cdir );
+HYPRE_Int hypre_SparseMSG2BuildRAPSym ( hypre_StructMatrix *A, hypre_StructMatrix *P,
+                                        hypre_StructMatrix *R, HYPRE_Int cdir, hypre_Index cindex, hypre_Index cstride,
+                                        hypre_Index stridePR, hypre_StructMatrix *RAP );
+HYPRE_Int hypre_SparseMSG2BuildRAPNoSym ( hypre_StructMatrix *A, hypre_StructMatrix *P,
+                                          hypre_StructMatrix *R, HYPRE_Int cdir, hypre_Index cindex, hypre_Index cstride,
+                                          hypre_Index stridePR, hypre_StructMatrix *RAP );
 
 /* sparse_msg3_setup_rap.c */
-hypre_StructMatrix *hypre_SparseMSG3CreateRAPOp ( hypre_StructMatrix *R , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructGrid *coarse_grid , HYPRE_Int cdir );
-HYPRE_Int hypre_SparseMSG3BuildRAPSym ( hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_Index stridePR , hypre_StructMatrix *RAP );
-HYPRE_Int hypre_SparseMSG3BuildRAPNoSym ( hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructMatrix *R , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_Index stridePR , hypre_StructMatrix *RAP );
+hypre_StructMatrix *hypre_SparseMSG3CreateRAPOp ( hypre_StructMatrix *R, hypre_StructMatrix *A,
+                                                  hypre_StructMatrix *P, hypre_StructGrid *coarse_grid, HYPRE_Int cdir );
+HYPRE_Int hypre_SparseMSG3BuildRAPSym ( hypre_StructMatrix *A, hypre_StructMatrix *P,
+                                        hypre_StructMatrix *R, HYPRE_Int cdir, hypre_Index cindex, hypre_Index cstride,
+                                        hypre_Index stridePR, hypre_StructMatrix *RAP );
+HYPRE_Int hypre_SparseMSG3BuildRAPNoSym ( hypre_StructMatrix *A, hypre_StructMatrix *P,
+                                          hypre_StructMatrix *R, HYPRE_Int cdir, hypre_Index cindex, hypre_Index cstride,
+                                          hypre_Index stridePR, hypre_StructMatrix *RAP );
 
 /* sparse_msg.c */
 void *hypre_SparseMSGCreate ( MPI_Comm comm );
 HYPRE_Int hypre_SparseMSGDestroy ( void *smsg_vdata );
-HYPRE_Int hypre_SparseMSGSetTol ( void *smsg_vdata , HYPRE_Real tol );
-HYPRE_Int hypre_SparseMSGSetMaxIter ( void *smsg_vdata , HYPRE_Int max_iter );
-HYPRE_Int hypre_SparseMSGSetJump ( void *smsg_vdata , HYPRE_Int jump );
-HYPRE_Int hypre_SparseMSGSetRelChange ( void *smsg_vdata , HYPRE_Int rel_change );
-HYPRE_Int hypre_SparseMSGSetZeroGuess ( void *smsg_vdata , HYPRE_Int zero_guess );
-HYPRE_Int hypre_SparseMSGSetRelaxType ( void *smsg_vdata , HYPRE_Int relax_type );
-HYPRE_Int hypre_SparseMSGSetJacobiWeight ( void *smsg_vdata , HYPRE_Real weight );
-HYPRE_Int hypre_SparseMSGSetNumPreRelax ( void *smsg_vdata , HYPRE_Int num_pre_relax );
-HYPRE_Int hypre_SparseMSGSetNumPostRelax ( void *smsg_vdata , HYPRE_Int num_post_relax );
-HYPRE_Int hypre_SparseMSGSetNumFineRelax ( void *smsg_vdata , HYPRE_Int num_fine_relax );
-HYPRE_Int hypre_SparseMSGSetLogging ( void *smsg_vdata , HYPRE_Int logging );
-HYPRE_Int hypre_SparseMSGSetPrintLevel ( void *smsg_vdata , HYPRE_Int print_level );
-HYPRE_Int hypre_SparseMSGGetNumIterations ( void *smsg_vdata , HYPRE_Int *num_iterations );
-HYPRE_Int hypre_SparseMSGPrintLogging ( void *smsg_vdata , HYPRE_Int myid );
-HYPRE_Int hypre_SparseMSGGetFinalRelativeResidualNorm ( void *smsg_vdata , HYPRE_Real *relative_residual_norm );
+HYPRE_Int hypre_SparseMSGSetTol ( void *smsg_vdata, HYPRE_Real tol );
+HYPRE_Int hypre_SparseMSGSetMaxIter ( void *smsg_vdata, HYPRE_Int max_iter );
+HYPRE_Int hypre_SparseMSGSetJump ( void *smsg_vdata, HYPRE_Int jump );
+HYPRE_Int hypre_SparseMSGSetRelChange ( void *smsg_vdata, HYPRE_Int rel_change );
+HYPRE_Int hypre_SparseMSGSetZeroGuess ( void *smsg_vdata, HYPRE_Int zero_guess );
+HYPRE_Int hypre_SparseMSGSetRelaxType ( void *smsg_vdata, HYPRE_Int relax_type );
+HYPRE_Int hypre_SparseMSGSetJacobiWeight ( void *smsg_vdata, HYPRE_Real weight );
+HYPRE_Int hypre_SparseMSGSetNumPreRelax ( void *smsg_vdata, HYPRE_Int num_pre_relax );
+HYPRE_Int hypre_SparseMSGSetNumPostRelax ( void *smsg_vdata, HYPRE_Int num_post_relax );
+HYPRE_Int hypre_SparseMSGSetNumFineRelax ( void *smsg_vdata, HYPRE_Int num_fine_relax );
+HYPRE_Int hypre_SparseMSGSetLogging ( void *smsg_vdata, HYPRE_Int logging );
+HYPRE_Int hypre_SparseMSGSetPrintLevel ( void *smsg_vdata, HYPRE_Int print_level );
+HYPRE_Int hypre_SparseMSGGetNumIterations ( void *smsg_vdata, HYPRE_Int *num_iterations );
+HYPRE_Int hypre_SparseMSGPrintLogging ( void *smsg_vdata, HYPRE_Int myid );
+HYPRE_Int hypre_SparseMSGGetFinalRelativeResidualNorm ( void *smsg_vdata,
+                                                        HYPRE_Real *relative_residual_norm );
 
 /* sparse_msg_filter.c */
-HYPRE_Int hypre_SparseMSGFilterSetup ( hypre_StructMatrix *A , HYPRE_Int *num_grids , HYPRE_Int lx , HYPRE_Int ly , HYPRE_Int lz , HYPRE_Int jump , hypre_StructVector *visitx , hypre_StructVector *visity , hypre_StructVector *visitz );
-HYPRE_Int hypre_SparseMSGFilter ( hypre_StructVector *visit , hypre_StructVector *e , HYPRE_Int lx , HYPRE_Int ly , HYPRE_Int lz , HYPRE_Int jump );
+HYPRE_Int hypre_SparseMSGFilterSetup ( hypre_StructMatrix *A, HYPRE_Int *num_grids, HYPRE_Int lx,
+                                       HYPRE_Int ly, HYPRE_Int lz, HYPRE_Int jump, hypre_StructVector *visitx, hypre_StructVector *visity,
+                                       hypre_StructVector *visitz );
+HYPRE_Int hypre_SparseMSGFilter ( hypre_StructVector *visit, hypre_StructVector *e, HYPRE_Int lx,
+                                  HYPRE_Int ly, HYPRE_Int lz, HYPRE_Int jump );
 
 /* sparse_msg_interp.c */
 void *hypre_SparseMSGInterpCreate ( void );
-HYPRE_Int hypre_SparseMSGInterpSetup ( void *interp_vdata , hypre_StructMatrix *P , hypre_StructVector *xc , hypre_StructVector *e , hypre_Index cindex , hypre_Index findex , hypre_Index stride , hypre_Index strideP );
-HYPRE_Int hypre_SparseMSGInterp ( void *interp_vdata , hypre_StructMatrix *P , hypre_StructVector *xc , hypre_StructVector *e );
+HYPRE_Int hypre_SparseMSGInterpSetup ( void *interp_vdata, hypre_StructMatrix *P,
+                                       hypre_StructVector *xc, hypre_StructVector *e, hypre_Index cindex, hypre_Index findex,
+                                       hypre_Index stride, hypre_Index strideP );
+HYPRE_Int hypre_SparseMSGInterp ( void *interp_vdata, hypre_StructMatrix *P, hypre_StructVector *xc,
+                                  hypre_StructVector *e );
 HYPRE_Int hypre_SparseMSGInterpDestroy ( void *interp_vdata );
 
 /* sparse_msg_restrict.c */
 void *hypre_SparseMSGRestrictCreate ( void );
-HYPRE_Int hypre_SparseMSGRestrictSetup ( void *restrict_vdata , hypre_StructMatrix *R , hypre_StructVector *r , hypre_StructVector *rc , hypre_Index cindex , hypre_Index findex , hypre_Index stride , hypre_Index strideR );
-HYPRE_Int hypre_SparseMSGRestrict ( void *restrict_vdata , hypre_StructMatrix *R , hypre_StructVector *r , hypre_StructVector *rc );
+HYPRE_Int hypre_SparseMSGRestrictSetup ( void *restrict_vdata, hypre_StructMatrix *R,
+                                         hypre_StructVector *r, hypre_StructVector *rc, hypre_Index cindex, hypre_Index findex,
+                                         hypre_Index stride, hypre_Index strideR );
+HYPRE_Int hypre_SparseMSGRestrict ( void *restrict_vdata, hypre_StructMatrix *R,
+                                    hypre_StructVector *r, hypre_StructVector *rc );
 HYPRE_Int hypre_SparseMSGRestrictDestroy ( void *restrict_vdata );
 
 /* sparse_msg_setup.c */
-HYPRE_Int hypre_SparseMSGSetup ( void *smsg_vdata , hypre_StructMatrix *A , hypre_StructVector *b , hypre_StructVector *x );
+HYPRE_Int hypre_SparseMSGSetup ( void *smsg_vdata, hypre_StructMatrix *A, hypre_StructVector *b,
+                                 hypre_StructVector *x );
 
 /* sparse_msg_setup_rap.c */
-hypre_StructMatrix *hypre_SparseMSGCreateRAPOp ( hypre_StructMatrix *R , hypre_StructMatrix *A , hypre_StructMatrix *P , hypre_StructGrid *coarse_grid , HYPRE_Int cdir );
-HYPRE_Int hypre_SparseMSGSetupRAPOp ( hypre_StructMatrix *R , hypre_StructMatrix *A , hypre_StructMatrix *P , HYPRE_Int cdir , hypre_Index cindex , hypre_Index cstride , hypre_Index stridePR , hypre_StructMatrix *Ac );
+hypre_StructMatrix *hypre_SparseMSGCreateRAPOp ( hypre_StructMatrix *R, hypre_StructMatrix *A,
+                                                 hypre_StructMatrix *P, hypre_StructGrid *coarse_grid, HYPRE_Int cdir );
+HYPRE_Int hypre_SparseMSGSetupRAPOp ( hypre_StructMatrix *R, hypre_StructMatrix *A,
+                                      hypre_StructMatrix *P, HYPRE_Int cdir, hypre_Index cindex, hypre_Index cstride,
+                                      hypre_Index stridePR, hypre_StructMatrix *Ac );
 
 /* sparse_msg_solve.c */
-HYPRE_Int hypre_SparseMSGSolve ( void *smsg_vdata , hypre_StructMatrix *A , hypre_StructVector *b , hypre_StructVector *x );
+HYPRE_Int hypre_SparseMSGSolve ( void *smsg_vdata, hypre_StructMatrix *A, hypre_StructVector *b,
+                                 hypre_StructVector *x );
diff --git a/external/hypre/src/struct_ls/red_black_constantcoef_gs.c b/external/hypre/src/struct_ls/red_black_constantcoef_gs.c
index 3dfe151d..63fd5fd6 100644
--- a/external/hypre/src/struct_ls/red_black_constantcoef_gs.c
+++ b/external/hypre/src/struct_ls/red_black_constantcoef_gs.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -44,7 +44,8 @@ hypre_RedBlackConstantCoefGS( void               *relax_vdata,
    HYPRE_Int              Ai, Astart, Ani, Anj;
    HYPRE_Int              bstart, bni, bnj;
    HYPRE_Int              xstart, xni, xnj;
-   HYPRE_Int              xoff0, xoff1, xoff2, xoff3, xoff4, xoff5;
+   HYPRE_Int              xoff0 = 0, xoff1 = 0, xoff2 = 0;
+   HYPRE_Int              xoff3 = 0, xoff4 = 0, xoff5 = 0;
 
    HYPRE_Real            *Ap;
    HYPRE_Real            *App;
@@ -52,8 +53,9 @@ hypre_RedBlackConstantCoefGS( void               *relax_vdata,
    HYPRE_Real            *xp;
 
    /* constant coefficient */
-   HYPRE_Int              constant_coeff= hypre_StructMatrixConstantCoefficient(A);
-   HYPRE_Real             App0, App1, App2, App3, App4, App5, AApd;
+   HYPRE_Int              constant_coeff = hypre_StructMatrixConstantCoefficient(A);
+   HYPRE_Real             App0 = 1.0, App1 = 1.0, App2 = 1.0;
+   HYPRE_Real             App3 = 1.0, App4 = 1.0, App5 = 1.0, AApd = 1.0;
 
    hypre_IndexRef         start;
    hypre_Index            loop_size;
@@ -125,7 +127,7 @@ hypre_RedBlackConstantCoefGS( void               *relax_vdata,
    {
       for (compute_i = 0; compute_i < 2; compute_i++)
       {
-         switch(compute_i)
+         switch (compute_i)
          {
             case 0:
             {
@@ -187,17 +189,17 @@ hypre_RedBlackConstantCoefGS( void               *relax_vdata,
 
                if (constant_coeff == 1)
                {
-                  Ai= hypre_CCBoxIndexRank(A_dbox, start);
-                  AApd= 1.0/Ap[Ai];
+                  Ai = hypre_CCBoxIndexRank(A_dbox, start);
+                  AApd = 1.0 / Ap[Ai];
 
                   hypre_RedBlackLoopInit();
 
 #define DEVICE_VAR is_device_ptr(xp,bp)
-                  hypre_RedBlackConstantcoefLoopBegin(ni,nj,nk,redblack,
-                                                      bstart,bni,bnj,bi,
-                                                      xstart,xni,xnj,xi);
+                  hypre_RedBlackConstantcoefLoopBegin(ni, nj, nk, redblack,
+                                                      bstart, bni, bnj, bi,
+                                                      xstart, xni, xnj, xi);
                   {
-                     xp[xi] = bp[bi]*AApd;
+                     xp[xi] = bp[bi] * AApd;
                   }
                   hypre_RedBlackConstantcoefLoopEnd();
 #undef DEVICE_VAR
@@ -211,10 +213,10 @@ hypre_RedBlackConstantCoefGS( void               *relax_vdata,
 
                   hypre_RedBlackLoopInit();
 #define DEVICE_VAR is_device_ptr(xp,bp,Ap)
-                  hypre_RedBlackLoopBegin(ni,nj,nk,redblack,
-                                          Astart,Ani,Anj,Ai,
-                                          bstart,bni,bnj,bi,
-                                          xstart,xni,xnj,xi);
+                  hypre_RedBlackLoopBegin(ni, nj, nk, redblack,
+                                          Astart, Ani, Anj, Ai,
+                                          bstart, bni, bnj, bi,
+                                          xstart, xni, xnj, xi);
                   {
                      xp[xi] = bp[bi] / Ap[Ai];
                   }
@@ -234,11 +236,11 @@ hypre_RedBlackConstantCoefGS( void               *relax_vdata,
     * Do regular iterations
     *----------------------------------------------------------*/
 
-   while (iter < 2*max_iter)
+   while (iter < 2 * max_iter)
    {
       for (compute_i = 0; compute_i < 2; compute_i++)
       {
-         switch(compute_i)
+         switch (compute_i)
          {
             case 0:
             {
@@ -288,10 +290,10 @@ hypre_RedBlackConstantCoefGS( void               *relax_vdata,
                ni = hypre_IndexX(loop_size);
                nj = hypre_IndexY(loop_size);
                nk = hypre_IndexZ(loop_size);
-               bni= hypre_BoxSizeX(b_dbox);
-               xni= hypre_BoxSizeX(x_dbox);
-               bnj= hypre_BoxSizeY(b_dbox);
-               xnj= hypre_BoxSizeY(x_dbox);
+               bni = hypre_BoxSizeX(b_dbox);
+               xni = hypre_BoxSizeX(x_dbox);
+               bnj = hypre_BoxSizeY(b_dbox);
+               xnj = hypre_BoxSizeY(x_dbox);
                Ai = hypre_CCBoxIndexRank(A_dbox, start);
                if (ndim < 3)
                {
@@ -302,61 +304,63 @@ hypre_RedBlackConstantCoefGS( void               *relax_vdata,
                   }
                }
 
-               switch(stencil_size)
+               switch (stencil_size)
                {
                   case 7:
                      App = hypre_StructMatrixBoxData(A, i, offd[5]);
-                     App5= App[Ai];
+                     App5 = App[Ai];
                      App = hypre_StructMatrixBoxData(A, i, offd[4]);
-                     App4= App[Ai];
+                     App4 = App[Ai];
                      xoff5 = hypre_BoxOffsetDistance(
-                        x_dbox, stencil_shape[offd[5]]);
+                                x_dbox, stencil_shape[offd[5]]);
                      xoff4 = hypre_BoxOffsetDistance(
-                        x_dbox, stencil_shape[offd[4]]);
+                                x_dbox, stencil_shape[offd[4]]);
+                  /* fall through */
 
                   case 5:
                      App = hypre_StructMatrixBoxData(A, i, offd[3]);
-                     App3= App[Ai];
+                     App3 = App[Ai];
                      App = hypre_StructMatrixBoxData(A, i, offd[2]);
-                     App2= App[Ai];
+                     App2 = App[Ai];
                      xoff3 = hypre_BoxOffsetDistance(
-                        x_dbox, stencil_shape[offd[3]]);
+                                x_dbox, stencil_shape[offd[3]]);
                      xoff2 = hypre_BoxOffsetDistance(
-                        x_dbox, stencil_shape[offd[2]]);
+                                x_dbox, stencil_shape[offd[2]]);
+                  /* fall through */
 
                   case 3:
                      App = hypre_StructMatrixBoxData(A, i, offd[1]);
-                     App1= App[Ai];
+                     App1 = App[Ai];
                      App = hypre_StructMatrixBoxData(A, i, offd[0]);
-                     App0= App[Ai];
+                     App0 = App[Ai];
                      xoff1 = hypre_BoxOffsetDistance(
-                        x_dbox, stencil_shape[offd[1]]);
+                                x_dbox, stencil_shape[offd[1]]);
                      xoff0 = hypre_BoxOffsetDistance(
-                        x_dbox, stencil_shape[offd[0]]);
+                                x_dbox, stencil_shape[offd[0]]);
                      break;
                }
 
                if (constant_coeff == 1)
                {
-                  AApd = 1/Ap[Ai];
+                  AApd = 1 / Ap[Ai];
 
-                  switch(stencil_size)
+                  switch (stencil_size)
                   {
                      case 7:
                         hypre_RedBlackLoopInit();
 #define DEVICE_VAR is_device_ptr(xp,bp)
-                        hypre_RedBlackConstantcoefLoopBegin(ni,nj,nk,redblack,
-                                                            bstart,bni,bnj,bi,
-                                                            xstart,xni,xnj,xi);
+                        hypre_RedBlackConstantcoefLoopBegin(ni, nj, nk, redblack,
+                                                            bstart, bni, bnj, bi,
+                                                            xstart, xni, xnj, xi);
                         {
                            xp[xi] =
                               (bp[bi] -
-                               App0*xp[xi + xoff0] -
-                               App1*xp[xi + xoff1] -
-                               App2*xp[xi + xoff2] -
-                               App3*xp[xi + xoff3] -
-                               App4*xp[xi + xoff4] -
-                               App5*xp[xi + xoff5])*AApd;
+                               App0 * xp[xi + xoff0] -
+                               App1 * xp[xi + xoff1] -
+                               App2 * xp[xi + xoff2] -
+                               App3 * xp[xi + xoff3] -
+                               App4 * xp[xi + xoff4] -
+                               App5 * xp[xi + xoff5]) * AApd;
                         }
                         hypre_RedBlackConstantcoefLoopEnd();
 #undef DEVICE_VAR
@@ -366,16 +370,16 @@ hypre_RedBlackConstantCoefGS( void               *relax_vdata,
                      case 5:
                         hypre_RedBlackLoopInit();
 #define DEVICE_VAR is_device_ptr(xp,bp)
-                        hypre_RedBlackConstantcoefLoopBegin(ni,nj,nk,redblack,
-                                                            bstart,bni,bnj,bi,
-                                                            xstart,xni,xnj,xi);
+                        hypre_RedBlackConstantcoefLoopBegin(ni, nj, nk, redblack,
+                                                            bstart, bni, bnj, bi,
+                                                            xstart, xni, xnj, xi);
                         {
                            xp[xi] =
                               (bp[bi] -
-                               App0*xp[xi + xoff0] -
-                               App1*xp[xi + xoff1] -
-                               App2*xp[xi + xoff2] -
-                               App3*xp[xi + xoff3])*AApd;
+                               App0 * xp[xi + xoff0] -
+                               App1 * xp[xi + xoff1] -
+                               App2 * xp[xi + xoff2] -
+                               App3 * xp[xi + xoff3]) * AApd;
                         }
                         hypre_RedBlackConstantcoefLoopEnd();
 #undef DEVICE_VAR
@@ -384,14 +388,14 @@ hypre_RedBlackConstantCoefGS( void               *relax_vdata,
                      case 3:
                         hypre_RedBlackLoopInit();
 #define DEVICE_VAR is_device_ptr(xp,bp)
-                        hypre_RedBlackConstantcoefLoopBegin(ni,nj,nk,redblack,
-                                                            bstart,bni,bnj,bi,
-                                                            xstart,xni,xnj,xi);
+                        hypre_RedBlackConstantcoefLoopBegin(ni, nj, nk, redblack,
+                                                            bstart, bni, bnj, bi,
+                                                            xstart, xni, xnj, xi);
                         {
                            xp[xi] =
                               (bp[bi] -
-                               App0*xp[xi + xoff0] -
-                               App1*xp[xi + xoff1])*AApd;
+                               App0 * xp[xi + xoff0] -
+                               App1 * xp[xi + xoff1]) * AApd;
                         }
                         hypre_RedBlackConstantcoefLoopEnd();
 #undef DEVICE_VAR
@@ -406,24 +410,24 @@ hypre_RedBlackConstantCoefGS( void               *relax_vdata,
                   Ani = hypre_BoxSizeX(A_dbox);
                   Anj = hypre_BoxSizeY(A_dbox);
 
-                  switch(stencil_size)
+                  switch (stencil_size)
                   {
                      case 7:
                         hypre_RedBlackLoopInit();
 #define DEVICE_VAR is_device_ptr(xp,bp,Ap)
-                        hypre_RedBlackLoopBegin(ni,nj,nk,redblack,
-                                                Astart,Ani,Anj,Ai,
-                                                bstart,bni,bnj,bi,
-                                                xstart,xni,xnj,xi);
+                        hypre_RedBlackLoopBegin(ni, nj, nk, redblack,
+                                                Astart, Ani, Anj, Ai,
+                                                bstart, bni, bnj, bi,
+                                                xstart, xni, xnj, xi);
                         {
                            xp[xi] =
                               (bp[bi] -
-                               App0*xp[xi + xoff0] -
-                               App1*xp[xi + xoff1] -
-                               App2*xp[xi + xoff2] -
-                               App3*xp[xi + xoff3] -
-                               App4*xp[xi + xoff4] -
-                               App5*xp[xi + xoff5]) / Ap[Ai];
+                               App0 * xp[xi + xoff0] -
+                               App1 * xp[xi + xoff1] -
+                               App2 * xp[xi + xoff2] -
+                               App3 * xp[xi + xoff3] -
+                               App4 * xp[xi + xoff4] -
+                               App5 * xp[xi + xoff5]) / Ap[Ai];
                         }
                         hypre_RedBlackLoopEnd();
 #undef DEVICE_VAR
@@ -432,17 +436,17 @@ hypre_RedBlackConstantCoefGS( void               *relax_vdata,
                      case 5:
                         hypre_RedBlackLoopInit();
 #define DEVICE_VAR is_device_ptr(xp,bp,Ap)
-                        hypre_RedBlackLoopBegin(ni,nj,nk,redblack,
-                                                Astart,Ani,Anj,Ai,
-                                                bstart,bni,bnj,bi,
-                                                xstart,xni,xnj,xi);
+                        hypre_RedBlackLoopBegin(ni, nj, nk, redblack,
+                                                Astart, Ani, Anj, Ai,
+                                                bstart, bni, bnj, bi,
+                                                xstart, xni, xnj, xi);
                         {
                            xp[xi] =
                               (bp[bi] -
-                               App0*xp[xi + xoff0] -
-                               App1*xp[xi + xoff1] -
-                               App2*xp[xi + xoff2] -
-                               App3*xp[xi + xoff3]) / Ap[Ai];
+                               App0 * xp[xi + xoff0] -
+                               App1 * xp[xi + xoff1] -
+                               App2 * xp[xi + xoff2] -
+                               App3 * xp[xi + xoff3]) / Ap[Ai];
                         }
                         hypre_RedBlackLoopEnd();
 #undef DEVICE_VAR
@@ -451,15 +455,15 @@ hypre_RedBlackConstantCoefGS( void               *relax_vdata,
                      case 3:
                         hypre_RedBlackLoopInit();
 #define DEVICE_VAR is_device_ptr(xp,bp,Ap)
-                        hypre_RedBlackLoopBegin(ni,nj,nk,redblack,
-                                                Astart,Ani,Anj,Ai,
-                                                bstart,bni,bnj,bi,
-                                                xstart,xni,xnj,xi);
+                        hypre_RedBlackLoopBegin(ni, nj, nk, redblack,
+                                                Astart, Ani, Anj, Ai,
+                                                bstart, bni, bnj, bi,
+                                                xstart, xni, xnj, xi);
                         {
                            xp[xi] =
                               (bp[bi] -
-                               App0*xp[xi + xoff0] -
-                               App1*xp[xi + xoff1]) / Ap[Ai];
+                               App0 * xp[xi + xoff0] -
+                               App1 * xp[xi + xoff1]) / Ap[Ai];
                         }
                         hypre_RedBlackLoopEnd();
 #undef DEVICE_VAR
@@ -486,5 +490,3 @@ hypre_RedBlackConstantCoefGS( void               *relax_vdata,
 
    return hypre_error_flag;
 }
-
-
diff --git a/external/hypre/src/struct_ls/red_black_gs.c b/external/hypre/src/struct_ls/red_black_gs.c
index 3cae7191..a2edbe35 100644
--- a/external/hypre/src/struct_ls/red_black_gs.c
+++ b/external/hypre/src/struct_ls/red_black_gs.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -221,7 +221,7 @@ hypre_RedBlackGS( void               *relax_vdata,
    {
       for (compute_i = 0; compute_i < 2; compute_i++)
       {
-         switch(compute_i)
+         switch (compute_i)
          {
             case 0:
             {
@@ -286,10 +286,10 @@ hypre_RedBlackGS( void               *relax_vdata,
 
                hypre_RedBlackLoopInit();
 #define DEVICE_VAR is_device_ptr(xp,bp,Ap)
-               hypre_RedBlackLoopBegin(ni,nj,nk,redblack,
-                                       Astart,Ani,Anj,Ai,
-                                       bstart,bni,bnj,bi,
-                                       xstart,xni,xnj,xi);
+               hypre_RedBlackLoopBegin(ni, nj, nk, redblack,
+                                       Astart, Ani, Anj, Ai,
+                                       bstart, bni, bnj, bi,
+                                       xstart, xni, xnj, xi);
                {
                   xp[xi] = bp[bi] / Ap[Ai];
                }
@@ -307,11 +307,11 @@ hypre_RedBlackGS( void               *relax_vdata,
     * Do regular iterations
     *----------------------------------------------------------*/
 
-   while (iter < 2*max_iter)
+   while (iter < 2 * max_iter)
    {
       for (compute_i = 0; compute_i < 2; compute_i++)
       {
-         switch(compute_i)
+         switch (compute_i)
          {
             case 0:
             {
@@ -377,43 +377,39 @@ hypre_RedBlackGS( void               *relax_vdata,
                   }
                }
 
-               switch(stencil_size)
+               switch (stencil_size)
                {
                   case 7:
                      Ap5 = hypre_StructMatrixBoxData(A, i, offd[5]);
                      Ap4 = hypre_StructMatrixBoxData(A, i, offd[4]);
-                     xoff5 = hypre_BoxOffsetDistance(
-                        x_dbox, stencil_shape[offd[5]]);
-                     xoff4 = hypre_BoxOffsetDistance(
-                        x_dbox, stencil_shape[offd[4]]);
+                     xoff5 = hypre_BoxOffsetDistance(x_dbox, stencil_shape[offd[5]]);
+                     xoff4 = hypre_BoxOffsetDistance(x_dbox, stencil_shape[offd[4]]);
+                  // fall through
 
                   case 5:
                      Ap3 = hypre_StructMatrixBoxData(A, i, offd[3]);
                      Ap2 = hypre_StructMatrixBoxData(A, i, offd[2]);
-                     xoff3 = hypre_BoxOffsetDistance(
-                        x_dbox, stencil_shape[offd[3]]);
-                     xoff2 = hypre_BoxOffsetDistance(
-                        x_dbox, stencil_shape[offd[2]]);
+                     xoff3 = hypre_BoxOffsetDistance(x_dbox, stencil_shape[offd[3]]);
+                     xoff2 = hypre_BoxOffsetDistance(x_dbox, stencil_shape[offd[2]]);
+                  // fall through
 
                   case 3:
                      Ap1 = hypre_StructMatrixBoxData(A, i, offd[1]);
                      Ap0 = hypre_StructMatrixBoxData(A, i, offd[0]);
-                     xoff1 = hypre_BoxOffsetDistance(
-                        x_dbox, stencil_shape[offd[1]]);
-                     xoff0 = hypre_BoxOffsetDistance(
-                        x_dbox, stencil_shape[offd[0]]);
+                     xoff1 = hypre_BoxOffsetDistance(x_dbox, stencil_shape[offd[1]]);
+                     xoff0 = hypre_BoxOffsetDistance(x_dbox, stencil_shape[offd[0]]);
                      break;
                }
 
-               switch(stencil_size)
+               switch (stencil_size)
                {
                   case 7:
                      hypre_RedBlackLoopInit();
 #define DEVICE_VAR is_device_ptr(xp,bp,Ap0,Ap1,Ap2,Ap3,Ap4,Ap5,Ap)
-                     hypre_RedBlackLoopBegin(ni,nj,nk,redblack,
-                                             Astart,Ani,Anj,Ai,
-                                             bstart,bni,bnj,bi,
-                                             xstart,xni,xnj,xi);
+                     hypre_RedBlackLoopBegin(ni, nj, nk, redblack,
+                                             Astart, Ani, Anj, Ai,
+                                             bstart, bni, bnj, bi,
+                                             xstart, xni, xnj, xi);
                      {
                         xp[xi] =
                            (bp[bi] -
@@ -431,10 +427,10 @@ hypre_RedBlackGS( void               *relax_vdata,
                   case 5:
                      hypre_RedBlackLoopInit();
 #define DEVICE_VAR is_device_ptr(xp,bp,Ap0,Ap1,Ap2,Ap3,Ap)
-                     hypre_RedBlackLoopBegin(ni,nj,nk,redblack,
-                                             Astart,Ani,Anj,Ai,
-                                             bstart,bni,bnj,bi,
-                                             xstart,xni,xnj,xi);
+                     hypre_RedBlackLoopBegin(ni, nj, nk, redblack,
+                                             Astart, Ani, Anj, Ai,
+                                             bstart, bni, bnj, bi,
+                                             xstart, xni, xnj, xi);
                      {
                         xp[xi] =
                            (bp[bi] -
@@ -450,10 +446,10 @@ hypre_RedBlackGS( void               *relax_vdata,
                   case 3:
                      hypre_RedBlackLoopInit();
 #define DEVICE_VAR is_device_ptr(xp,bp,Ap0,Ap1,Ap)
-                     hypre_RedBlackLoopBegin(ni,nj,nk,redblack,
-                                             Astart,Ani,Anj,Ai,
-                                             bstart,bni,bnj,bi,
-                                             xstart,xni,xnj,xi);
+                     hypre_RedBlackLoopBegin(ni, nj, nk, redblack,
+                                             Astart, Ani, Anj, Ai,
+                                             bstart, bni, bnj, bi,
+                                             xstart, xni, xnj, xi);
                      {
                         xp[xi] =
                            (bp[bi] -
@@ -552,4 +548,3 @@ hypre_RedBlackGSSetStartBlack( void *relax_vdata )
 
    return hypre_error_flag;
 }
-
diff --git a/external/hypre/src/struct_ls/red_black_gs.h b/external/hypre/src/struct_ls/red_black_gs.h
index afd8eabf..41c4008f 100644
--- a/external/hypre/src/struct_ls/red_black_gs.h
+++ b/external/hypre/src/struct_ls/red_black_gs.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -209,6 +209,65 @@ typedef struct
    });                                                              \
 }
 
+#elif defined(HYPRE_USING_SYCL)
+
+#define hypre_RedBlackLoopInit()
+#define hypre_RedBlackLoopBegin(ni,nj,nk,redblack,                  \
+                                Astart,Ani,Anj,Ai,                  \
+                                bstart,bni,bnj,bi,                  \
+                                xstart,xni,xnj,xi)                  \
+{                                                                   \
+   HYPRE_Int hypre__tot = nk*nj*((ni+1)/2);                         \
+   BoxLoopforall(hypre__tot, [=] (sycl::nd_item<3> item)            \
+   {                                                                \
+      HYPRE_Int idx = (HYPRE_Int) item.get_global_linear_id();      \
+      HYPRE_Int idx_local = idx;                                    \
+      HYPRE_Int ii,jj,kk,Ai,bi,xi;                                  \
+      HYPRE_Int local_ii;                                           \
+      kk = idx_local % nk;                                          \
+      idx_local = idx_local / nk;                                   \
+      jj = idx_local % nj;                                          \
+      idx_local = idx_local / nj;                                   \
+      local_ii = (kk + jj + redblack) % 2;                          \
+      ii = 2*idx_local + local_ii;                                  \
+      if (ii < ni)                                                  \
+      {                                                             \
+         Ai = Astart + kk*Anj*Ani + jj*Ani + ii;                    \
+         bi = bstart + kk*bnj*bni + jj*bni + ii;                    \
+         xi = xstart + kk*xnj*xni + jj*xni + ii;                    \
+
+#define hypre_RedBlackLoopEnd()                                     \
+      }                                                             \
+   });                                                              \
+}
+
+#define hypre_RedBlackConstantcoefLoopBegin(ni,nj,nk,redblack,      \
+                                            bstart,bni,bnj,bi,      \
+                                            xstart,xni,xnj,xi)      \
+{                                                                   \
+   HYPRE_Int hypre__tot = nk*nj*((ni+1)/2);                         \
+   BoxLoopforall(hypre__tot, [=] (sycl::nd_item<3> item)            \
+   {                                                                \
+      HYPRE_Int idx = (HYPRE_Int) item.get_global_linear_id();      \
+      HYPRE_Int idx_local = idx;                                    \
+      HYPRE_Int ii,jj,kk,bi,xi;                                     \
+      HYPRE_Int local_ii;                                           \
+      kk = idx_local % nk;                                          \
+      idx_local = idx_local / nk;                                   \
+      jj = idx_local % nj;                                          \
+      idx_local = idx_local / nj;                                   \
+      local_ii = (kk + jj + redblack) % 2;                          \
+      ii = 2*idx_local + local_ii;                                  \
+      if (ii < ni)                                                  \
+      {                                                             \
+         bi = bstart + kk*bnj*bni + jj*bni + ii;                    \
+         xi = xstart + kk*xnj*xni + jj*xni + ii;                    \
+
+#define hypre_RedBlackConstantcoefLoopEnd()                         \
+      }                                                             \
+   });                                                              \
+}
+
 #elif defined(HYPRE_USING_DEVICE_OPENMP)
 
 /* BEGIN OF OMP 4.5 */
@@ -298,11 +357,13 @@ typedef struct
 
 #ifdef HYPRE_USING_OPENMP
 #define HYPRE_BOX_REDUCTION
+#ifndef Pragma
 #if defined(WIN32) && defined(_MSC_VER)
-#define Pragma(x) __pragma(HYPRE_XSTR(x))
+#define Pragma(x) __pragma(x)
 #else
 #define Pragma(x) _Pragma(HYPRE_XSTR(x))
 #endif
+#endif
 #define OMPRB1 Pragma(omp parallel for private(HYPRE_REDBLACK_PRIVATE) HYPRE_BOX_REDUCTION HYPRE_SMP_SCHEDULE)
 #else
 #define OMPRB1
diff --git a/external/hypre/src/struct_ls/semi.c b/external/hypre/src/struct_ls/semi.c
index d319572d..a891eeb3 100644
--- a/external/hypre/src/struct_ls/semi.c
+++ b/external/hypre/src/struct_ls/semi.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -63,13 +63,13 @@ hypre_StructInterpAssemble( hypre_StructMatrix  *A,
    dim = hypre_StructGridNDim(grid);
    for (j = 0; j < dim; j++)
    {
-      num_ghost[2*j]   = 1;
-      num_ghost[2*j+1] = 1;
+      num_ghost[2 * j]   = 1;
+      num_ghost[2 * j + 1] = 1;
    }
    if (P_stored_as_transpose)
    {
-      num_ghost[2*cdir]   = 2;
-      num_ghost[2*cdir+1] = 2;
+      num_ghost[2 * cdir]   = 2;
+      num_ghost[2 * cdir + 1] = 2;
    }
 
    /* comm_info <-- From fine grid grown by num_ghost */
@@ -83,7 +83,7 @@ hypre_StructInterpAssemble( hypre_StructMatrix  *A,
 
    for (s = 0; s < 4; s++)
    {
-      switch(s)
+      switch (s)
       {
          case 0:
             box_aa = hypre_CommInfoSendBoxes(comm_info);
@@ -105,17 +105,17 @@ hypre_StructInterpAssemble( hypre_StructMatrix  *A,
       }
 
       hypre_ForBoxArrayI(j, box_aa)
+      {
+         box_a = hypre_BoxArrayArrayBoxArray(box_aa, j);
+         hypre_ForBoxI(i, box_a)
          {
-            box_a = hypre_BoxArrayArrayBoxArray(box_aa, j);
-            hypre_ForBoxI(i, box_a)
-               {
-                  box = hypre_BoxArrayBox(box_a, i);
-                  hypre_StructMapFineToCoarse(hypre_BoxIMin(box), index, stride,
-                                              hypre_BoxIMin(box));
-                  hypre_StructMapFineToCoarse(hypre_BoxIMax(box), index, stride,
-                                              hypre_BoxIMax(box));
-               }
+            box = hypre_BoxArrayBox(box_a, i);
+            hypre_StructMapFineToCoarse(hypre_BoxIMin(box), index, stride,
+                                        hypre_BoxIMin(box));
+            hypre_StructMapFineToCoarse(hypre_BoxIMax(box), index, stride,
+                                        hypre_BoxIMax(box));
          }
+      }
    }
 
    comm_pkg = hypre_StructMatrixCommPkg(P);
@@ -123,7 +123,7 @@ hypre_StructInterpAssemble( hypre_StructMatrix  *A,
    {
       hypre_CommPkgDestroy(comm_pkg);
    }
-   
+
    hypre_CommPkgCreate(comm_info,
                        hypre_StructMatrixDataSpace(P),
                        hypre_StructMatrixDataSpace(P),
@@ -136,7 +136,7 @@ hypre_StructInterpAssemble( hypre_StructMatrix  *A,
    hypre_InitializeCommunication(comm_pkg,
                                  hypre_StructMatrixStencilData(P)[0],//hypre_StructMatrixData(P),
                                  hypre_StructMatrixStencilData(P)[0],//hypre_StructMatrixData(P),
-				 0, 0,
+                                 0, 0,
                                  &comm_handle);
    hypre_FinalizeCommunication(comm_handle);
 
diff --git a/external/hypre/src/struct_ls/semi_interp.c b/external/hypre/src/struct_ls/semi_interp.c
index 7b4e2aa8..114a51f0 100644
--- a/external/hypre/src/struct_ls/semi_interp.c
+++ b/external/hypre/src/struct_ls/semi_interp.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -28,7 +28,7 @@ typedef struct
  *--------------------------------------------------------------------------*/
 
 void *
-hypre_SemiInterpCreate( )
+hypre_SemiInterpCreate( void )
 {
    hypre_SemiInterpData *interp_data;
 
@@ -51,6 +51,8 @@ hypre_SemiInterpSetup( void               *interp_vdata,
                        hypre_Index         findex,
                        hypre_Index         stride       )
 {
+   HYPRE_UNUSED_VAR(xc);
+
    hypre_SemiInterpData   *interp_data = (hypre_SemiInterpData   *)interp_vdata;
 
    hypre_StructGrid       *grid;
@@ -63,6 +65,8 @@ hypre_SemiInterpSetup( void               *interp_vdata,
     * Set up the compute package
     *----------------------------------------------------------*/
 
+   HYPRE_ANNOTATE_FUNC_BEGIN;
+
    grid    = hypre_StructVectorGrid(e);
    stencil = hypre_StructMatrixStencil(P);
 
@@ -84,6 +88,8 @@ hypre_SemiInterpSetup( void               *interp_vdata,
    hypre_CopyIndex(findex, (interp_data -> findex));
    hypre_CopyIndex(stride, (interp_data -> stride));
 
+   HYPRE_ANNOTATE_FUNC_END;
+
    return hypre_error_flag;
 }
 
@@ -142,6 +148,8 @@ hypre_SemiInterp( void               *interp_vdata,
     * Initialize some things
     *-----------------------------------------------------------------------*/
 
+   HYPRE_ANNOTATE_FUNC_BEGIN;
+
    hypre_BeginTiming(interp_data -> time_index);
 
    P_stored_as_transpose = (interp_data -> P_stored_as_transpose);
@@ -153,11 +161,11 @@ hypre_SemiInterp( void               *interp_vdata,
    stencil       = hypre_StructMatrixStencil(P);
    stencil_shape = hypre_StructStencilShape(stencil);
    constant_coefficient = hypre_StructMatrixConstantCoefficient(P);
-   hypre_assert( constant_coefficient==0 || constant_coefficient==1 );
+   hypre_assert( constant_coefficient == 0 || constant_coefficient == 1 );
    /* ... constant_coefficient==2 for P shouldn't happen, see
       hypre_PFMGCreateInterpOp in pfmg_setup_interp.c */
 
-   if (constant_coefficient) hypre_StructVectorClearBoundGhostValues(e, 0);
+   if (constant_coefficient) { hypre_StructVectorClearBoundGhostValues(e, 0); }
 
    hypre_SetIndex3(stridec, 1, 1, 1);
 
@@ -182,7 +190,8 @@ hypre_SemiInterp( void               *interp_vdata,
       hypre_StructGridDataLocation(cgrid) = data_location_f;
       hypre_StructVectorInitialize(xc_tmp);
       hypre_StructVectorAssemble(xc_tmp);
-      hypre_TMemcpy(hypre_StructVectorData(xc_tmp), hypre_StructVectorData(xc), HYPRE_Complex,hypre_StructVectorDataSize(xc),HYPRE_MEMORY_DEVICE,HYPRE_MEMORY_HOST);
+      hypre_TMemcpy(hypre_StructVectorData(xc_tmp), hypre_StructVectorData(xc), HYPRE_Complex,
+                    hypre_StructVectorDataSize(xc), HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
    }
    else
    {
@@ -229,7 +238,7 @@ hypre_SemiInterp( void               *interp_vdata,
 
    for (compute_i = 0; compute_i < 2; compute_i++)
    {
-      switch(compute_i)
+      switch (compute_i)
       {
          case 0:
          {
@@ -291,17 +300,17 @@ hypre_SemiInterp( void               *interp_vdata,
 
             if ( constant_coefficient )
             {
-               HYPRE_Complex Pp0val,Pp1val;
+               HYPRE_Complex Pp0val, Pp1val;
                Pi = hypre_CCBoxIndexRank( P_dbox, startc );
                Pp0val = Pp0[Pi];
-               Pp1val = Pp1[Pi+Pp1_offset];
+               Pp1val = Pp1[Pi + Pp1_offset];
 
 #define DEVICE_VAR is_device_ptr(ep)
                hypre_BoxLoop1Begin(hypre_StructMatrixNDim(P), loop_size,
                                    e_dbox, start, stride, ei);
                {
-                  ep[ei] =  (Pp0val * ep[ei+ep0_offset] +
-                             Pp1val * ep[ei+ep1_offset]);
+                  ep[ei] =  (Pp0val * ep[ei + ep0_offset] +
+                             Pp1val * ep[ei + ep1_offset]);
                }
                hypre_BoxLoop1End(ei);
 #undef DEVICE_VAR
@@ -313,8 +322,8 @@ hypre_SemiInterp( void               *interp_vdata,
                                    P_dbox, startc, stridec, Pi,
                                    e_dbox, start, stride, ei);
                {
-                  ep[ei] =  (Pp0[Pi]            * ep[ei+ep0_offset] +
-                             Pp1[Pi+Pp1_offset] * ep[ei+ep1_offset]);
+                  ep[ei] =  (Pp0[Pi]            * ep[ei + ep0_offset] +
+                             Pp1[Pi + Pp1_offset] * ep[ei + ep1_offset]);
                }
                hypre_BoxLoop2End(Pi, ei);
 #undef DEVICE_VAR
@@ -333,9 +342,11 @@ hypre_SemiInterp( void               *interp_vdata,
     * Return
     *-----------------------------------------------------------------------*/
 
-   hypre_IncFLOPCount(3*hypre_StructVectorGlobalSize(xc));
+   hypre_IncFLOPCount(3 * hypre_StructVectorGlobalSize(xc));
    hypre_EndTiming(interp_data -> time_index);
 
+   HYPRE_ANNOTATE_FUNC_END;
+
    return hypre_error_flag;
 }
 
@@ -357,4 +368,3 @@ hypre_SemiInterpDestroy( void *interp_vdata )
 
    return hypre_error_flag;
 }
-
diff --git a/external/hypre/src/struct_ls/semi_restrict.c b/external/hypre/src/struct_ls/semi_restrict.c
index 7105eabe..5bda1702 100644
--- a/external/hypre/src/struct_ls/semi_restrict.c
+++ b/external/hypre/src/struct_ls/semi_restrict.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -27,7 +27,7 @@ typedef struct
  *--------------------------------------------------------------------------*/
 
 void *
-hypre_SemiRestrictCreate( )
+hypre_SemiRestrictCreate( void )
 {
    hypre_SemiRestrictData *restrict_data;
 
@@ -51,6 +51,8 @@ hypre_SemiRestrictSetup( void               *restrict_vdata,
                          hypre_Index         findex,
                          hypre_Index         stride                )
 {
+   HYPRE_UNUSED_VAR(rc);
+
    hypre_SemiRestrictData *restrict_data = (hypre_SemiRestrictData *)restrict_vdata;
 
    hypre_StructGrid       *grid;
@@ -63,6 +65,8 @@ hypre_SemiRestrictSetup( void               *restrict_vdata,
     * Set up the compute package
     *----------------------------------------------------------*/
 
+   HYPRE_ANNOTATE_FUNC_BEGIN;
+
    grid    = hypre_StructVectorGrid(r);
    stencil = hypre_StructMatrixStencil(R);
 
@@ -80,8 +84,10 @@ hypre_SemiRestrictSetup( void               *restrict_vdata,
    (restrict_data -> R) = hypre_StructMatrixRef(R);
    (restrict_data -> R_stored_as_transpose) = R_stored_as_transpose;
    (restrict_data -> compute_pkg) = compute_pkg;
-   hypre_CopyIndex(cindex ,(restrict_data -> cindex));
-   hypre_CopyIndex(stride ,(restrict_data -> stride));
+   hypre_CopyIndex(cindex, (restrict_data -> cindex));
+   hypre_CopyIndex(stride, (restrict_data -> stride));
+
+   HYPRE_ANNOTATE_FUNC_END;
 
    return hypre_error_flag;
 }
@@ -139,6 +145,8 @@ hypre_SemiRestrict( void               *restrict_vdata,
     * Initialize some things.
     *-----------------------------------------------------------------------*/
 
+   HYPRE_ANNOTATE_FUNC_BEGIN;
+
    hypre_BeginTiming(restrict_data -> time_index);
 
    R_stored_as_transpose = (restrict_data -> R_stored_as_transpose);
@@ -149,10 +157,10 @@ hypre_SemiRestrict( void               *restrict_vdata,
    stencil       = hypre_StructMatrixStencil(R);
    stencil_shape = hypre_StructStencilShape(stencil);
    constant_coefficient = hypre_StructMatrixConstantCoefficient(R);
-   hypre_assert( constant_coefficient==0 || constant_coefficient==1 );
+   hypre_assert( constant_coefficient == 0 || constant_coefficient == 1 );
    /* ... if A has constant_coefficient==2, R has constant_coefficient==0 */
 
-   if (constant_coefficient) hypre_StructVectorClearBoundGhostValues(r, 0);
+   if (constant_coefficient) { hypre_StructVectorClearBoundGhostValues(r, 0); }
 
    hypre_SetIndex3(stridec, 1, 1, 1);
 
@@ -188,7 +196,7 @@ hypre_SemiRestrict( void               *restrict_vdata,
 
    for (compute_i = 0; compute_i < 2; compute_i++)
    {
-      switch(compute_i)
+      switch (compute_i)
       {
          case 0:
          {
@@ -259,18 +267,18 @@ hypre_SemiRestrict( void               *restrict_vdata,
 
             if ( constant_coefficient )
             {
-               HYPRE_Complex Rp0val,Rp1val;
+               HYPRE_Complex Rp0val, Rp1val;
                Ri = hypre_CCBoxIndexRank( R_dbox, startc );
 
-               Rp0val = Rp0[Ri+Rp0_offset];
+               Rp0val = Rp0[Ri + Rp0_offset];
                Rp1val = Rp1[Ri];
 #define DEVICE_VAR is_device_ptr(rcp,rp)
                hypre_BoxLoop2Begin(hypre_StructMatrixNDim(R), loop_size,
                                    r_dbox,  start,  stride,  ri,
                                    rc_dbox, startc, stridec, rci);
                {
-                  rcp[rci] = rp[ri] + (Rp0val * rp[ri+rp0_offset] +
-                                       Rp1val * rp[ri+rp1_offset]);
+                  rcp[rci] = rp[ri] + (Rp0val * rp[ri + rp0_offset] +
+                                       Rp1val * rp[ri + rp1_offset]);
                }
                hypre_BoxLoop2End(ri, rci);
 #undef DEVICE_VAR
@@ -283,8 +291,8 @@ hypre_SemiRestrict( void               *restrict_vdata,
                                    r_dbox,  start,  stride,  ri,
                                    rc_dbox, startc, stridec, rci);
                {
-                  rcp[rci] = rp[ri] + (Rp0[Ri+Rp0_offset] * rp[ri+rp0_offset] +
-                                       Rp1[Ri]            * rp[ri+rp1_offset]);
+                  rcp[rci] = rp[ri] + (Rp0[Ri + Rp0_offset] * rp[ri + rp0_offset] +
+                                       Rp1[Ri]            * rp[ri + rp1_offset]);
                }
                hypre_BoxLoop3End(Ri, ri, rci);
 #undef DEVICE_VAR
@@ -295,7 +303,8 @@ hypre_SemiRestrict( void               *restrict_vdata,
 #if 0 //defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    if (data_location_f != data_location_c)
    {
-      hypre_TMemcpy(hypre_StructVectorData(rc),hypre_StructVectorData(rc_tmp),HYPRE_Complex,hypre_StructVectorDataSize(rc_tmp),HYPRE_MEMORY_HOST,HYPRE_MEMORY_DEVICE);
+      hypre_TMemcpy(hypre_StructVectorData(rc), hypre_StructVectorData(rc_tmp), HYPRE_Complex,
+                    hypre_StructVectorDataSize(rc_tmp), HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
       hypre_StructVectorDestroy(rc_tmp);
       hypre_StructGridDataLocation(cgrid) = data_location_c;
    }
@@ -304,9 +313,11 @@ hypre_SemiRestrict( void               *restrict_vdata,
     * Return
     *-----------------------------------------------------------------------*/
 
-   hypre_IncFLOPCount(4*hypre_StructVectorGlobalSize(rc));
+   hypre_IncFLOPCount(4 * hypre_StructVectorGlobalSize(rc));
    hypre_EndTiming(restrict_data -> time_index);
 
+   HYPRE_ANNOTATE_FUNC_END;
+
    return hypre_error_flag;
 }
 
@@ -328,4 +339,3 @@ hypre_SemiRestrictDestroy( void *restrict_vdata )
 
    return hypre_error_flag;
 }
-
diff --git a/external/hypre/src/struct_ls/semi_setup_rap.c b/external/hypre/src/struct_ls/semi_setup_rap.c
index 325acb4e..3cc57c42 100644
--- a/external/hypre/src/struct_ls/semi_setup_rap.c
+++ b/external/hypre/src/struct_ls/semi_setup_rap.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -46,6 +46,10 @@ hypre_SemiCreateRAPOp( hypre_StructMatrix *R,
                        HYPRE_Int           cdir,
                        HYPRE_Int           P_stored_as_transpose )
 {
+   HYPRE_UNUSED_VAR(R);
+   HYPRE_UNUSED_VAR(P);
+   HYPRE_UNUSED_VAR(P_stored_as_transpose);
+
    hypre_StructMatrix    *RAP;
 
    hypre_Index           *RAP_stencil_shape;
@@ -54,7 +58,7 @@ hypre_SemiCreateRAPOp( hypre_StructMatrix *R,
    HYPRE_Int              dim;
    HYPRE_Int              RAP_num_ghost[] = {1, 1, 1, 1, 1, 1};
 
-   HYPRE_Int             *not_cdirs;
+   HYPRE_Int             *not_cdirs = NULL;
    hypre_StructStencil   *A_stencil;
    HYPRE_Int              A_stencil_size;
    hypre_Index           *A_stencil_shape;
@@ -105,13 +109,13 @@ hypre_SemiCreateRAPOp( hypre_StructMatrix *R,
     *-----------------------------------------------------------------------*/
    for (Rloop = -1; Rloop < 2; Rloop++)
    {
-      hypre_IndexD(indexR,cdir) = Rloop;
+      hypre_IndexD(indexR, cdir) = Rloop;
       for (Aloop = 0; Aloop < A_stencil_size; Aloop++)
       {
          for (d = 0; d < dim; d++)
          {
             hypre_IndexD(indexRA, d) = hypre_IndexD(indexR, d) +
-               hypre_IndexD(A_stencil_shape[Aloop], d);
+                                       hypre_IndexD(A_stencil_shape[Aloop], d);
          }
 
          /*-----------------------------------------------------------------
@@ -121,8 +125,8 @@ hypre_SemiCreateRAPOp( hypre_StructMatrix *R,
          if ((hypre_IndexD(indexRA, cdir) % 2) == 0)
          {
             hypre_CopyIndex(indexRA, indexRAP);
-            hypre_IndexD(indexRAP,cdir) /= 2;
-            hypre_MapRAPMarker(indexRAP,RAP_marker_rank);
+            hypre_IndexD(indexRAP, cdir) /= 2;
+            hypre_MapRAPMarker(indexRAP, RAP_marker_rank);
             RAP_marker[RAP_marker_rank]++;
          }
          /*-----------------------------------------------------------------
@@ -132,15 +136,15 @@ hypre_SemiCreateRAPOp( hypre_StructMatrix *R,
          else
          {
             hypre_CopyIndex(indexRA, indexRAP);
-            hypre_IndexD(indexRAP,cdir) += 1;
-            hypre_IndexD(indexRAP,cdir) /= 2;
-            hypre_MapRAPMarker(indexRAP,RAP_marker_rank);
+            hypre_IndexD(indexRAP, cdir) += 1;
+            hypre_IndexD(indexRAP, cdir) /= 2;
+            hypre_MapRAPMarker(indexRAP, RAP_marker_rank);
             RAP_marker[RAP_marker_rank]++;
 
             hypre_CopyIndex(indexRA, indexRAP);
-            hypre_IndexD(indexRAP,cdir) -= 1;
-            hypre_IndexD(indexRAP,cdir) /= 2;
-            hypre_MapRAPMarker(indexRAP,RAP_marker_rank);
+            hypre_IndexD(indexRAP, cdir) -= 1;
+            hypre_IndexD(indexRAP, cdir) /= 2;
+            hypre_MapRAPMarker(indexRAP, RAP_marker_rank);
             RAP_marker[RAP_marker_rank]++;
          }
       }
@@ -178,27 +182,27 @@ hypre_SemiCreateRAPOp( hypre_StructMatrix *R,
    {
       if (dim > 1)
       {
-         not_cdirs = hypre_CTAlloc(HYPRE_Int,  dim-1, HYPRE_MEMORY_HOST);
+         not_cdirs = hypre_CTAlloc(HYPRE_Int,  dim - 1, HYPRE_MEMORY_HOST);
       }
 
       for (d = 1; d < dim; d++)
       {
-         not_cdirs[d-1] = (dim+cdir-d) % dim;
+         not_cdirs[d - 1] = (dim + cdir - d) % dim;
       }
 
       hypre_SetIndex(indexRAP, 0);
       hypre_IndexD(indexRAP, cdir) = 1;
-      hypre_MapRAPMarker(indexRAP,RAP_marker_rank);
+      hypre_MapRAPMarker(indexRAP, RAP_marker_rank);
       RAP_marker[RAP_marker_rank] = 0;
 
       if (dim > 1)
       {
          hypre_SetIndex(indexRAP, 0);
-         hypre_IndexD(indexRAP,not_cdirs[0]) = 1;
+         hypre_IndexD(indexRAP, not_cdirs[0]) = 1;
          for (i = -1; i < 2; i++)
          {
-            hypre_IndexD(indexRAP,cdir) = i;
-            hypre_MapRAPMarker(indexRAP,RAP_marker_rank);
+            hypre_IndexD(indexRAP, cdir) = i;
+            hypre_MapRAPMarker(indexRAP, RAP_marker_rank);
             RAP_marker[RAP_marker_rank] = 0;
          }
       }
@@ -206,14 +210,14 @@ hypre_SemiCreateRAPOp( hypre_StructMatrix *R,
       if (dim > 2)
       {
          hypre_SetIndex(indexRAP, 0);
-         hypre_IndexD(indexRAP,not_cdirs[1]) = 1;
+         hypre_IndexD(indexRAP, not_cdirs[1]) = 1;
          for (i = -1; i < 2; i++)
          {
-            hypre_IndexD(indexRAP,not_cdirs[0]) = i;
+            hypre_IndexD(indexRAP, not_cdirs[0]) = i;
             for (j = -1; j < 2; j++)
             {
-               hypre_IndexD(indexRAP,cdir) = j;
-               hypre_MapRAPMarker(indexRAP,RAP_marker_rank);
+               hypre_IndexD(indexRAP, cdir) = j;
+               hypre_MapRAPMarker(indexRAP, RAP_marker_rank);
                RAP_marker[RAP_marker_rank] = 0;
 
             }
@@ -226,7 +230,7 @@ hypre_SemiCreateRAPOp( hypre_StructMatrix *R,
       }
    }
 
-   RAP_stencil_size= 0;
+   RAP_stencil_size = 0;
 
    for (i = 0; i < RAP_marker_size; i++)
    {
@@ -238,12 +242,12 @@ hypre_SemiCreateRAPOp( hypre_StructMatrix *R,
 
    RAP_stencil_shape = hypre_CTAlloc(hypre_Index,  RAP_stencil_size, HYPRE_MEMORY_HOST);
 
-   stencil_rank= 0;
+   stencil_rank = 0;
    for (i = 0; i < RAP_marker_size; i++)
    {
       if ( RAP_marker[i] != 0 )
       {
-         hypre_InverseMapRAPMarker(i,RAP_stencil_shape[stencil_rank]);
+         hypre_InverseMapRAPMarker(i, RAP_stencil_shape[stencil_rank]);
          stencil_rank++;
       }
    }
@@ -463,8 +467,8 @@ hypre_SemiBuildRAP( hypre_StructMatrix *A,
 
       hypre_SetIndex(index, 0);
       hypre_IndexD(index, cdir) = 1;
-      COffsetA = hypre_BoxOffsetDistance(A_dbox,index);
-      COffsetP = hypre_BoxOffsetDistance(P_dbox,index);
+      COffsetA = hypre_BoxOffsetDistance(A_dbox, index);
+      COffsetP = hypre_BoxOffsetDistance(P_dbox, index);
 
       /*-----------------------------------------------------------------
        * Entries in RAP are calculated by accumulation, must first
@@ -521,20 +525,20 @@ hypre_SemiBuildRAP( hypre_StructMatrix *A,
 
                   case 0:
 
-                     hypre_IndexD(index,cdir) = 1;
+                     hypre_IndexD(index, cdir) = 1;
                      rap_ptrU = hypre_StructMatrixExtractPointerByIndex(RAP,
                                                                         ci, index);
-                     hypre_IndexD(index,cdir) = -1;
+                     hypre_IndexD(index, cdir) = -1;
                      rap_ptrD = hypre_StructMatrixExtractPointerByIndex(RAP,
                                                                         ci, index);
-                     hypre_IndexD(index,cdir) = 0;
+                     hypre_IndexD(index, cdir) = 0;
                      AOffsetP = hypre_BoxOffsetDistance(P_dbox, index);
                      rap_ptrS = hypre_StructMatrixExtractPointerByIndex(RAP,
                                                                         ci, index);
                      diag = 0;
                      for (d = 0; d < dim; d++)
                      {
-                        diag += hypre_IndexD(index,d) * hypre_IndexD(index,d);
+                        diag += hypre_IndexD(index, d) * hypre_IndexD(index, d);
                      }
 
                      if (diag == 0 && hypre_StructMatrixSymmetric(RAP))
@@ -554,7 +558,7 @@ hypre_SemiBuildRAP( hypre_StructMatrix *A,
                                             A_dbox, fstart, stridef, iA,
                                             RAP_dbox, cstart, stridec, iAc);
                         {
-                           HYPRE_Int iAp,iPp;
+                           HYPRE_Int iAp, iPp;
                            /* path 1 : (stay,stay) */
                            rap_ptrS[iAc] +=          a_ptr[iA]           ;
 
@@ -567,11 +571,11 @@ hypre_SemiBuildRAP( hypre_StructMatrix *A,
 
                            /* path 4 : (down,up) */
                            iAp = iA - COffsetA;
-                           rap_ptrS[iAc] += rb[iR+rb_offset] * a_ptr[iAp] * pb[iPp+pb_offset];
+                           rap_ptrS[iAc] += rb[iR + rb_offset] * a_ptr[iAp] * pb[iPp + pb_offset];
 
                            /* path 5 : (down,down) */
                            iPp = iP - COffsetP + AOffsetP;
-                           rap_ptrD[iAc] += rb[iR+rb_offset] * a_ptr[iAp] * pa[iPp];
+                           rap_ptrD[iAc] += rb[iR + rb_offset] * a_ptr[iAp] * pa[iPp];
                         }
                         hypre_BoxLoop4End(iP, iR, iA, iAc);
 #undef DEVICE_VAR
@@ -589,14 +593,14 @@ hypre_SemiBuildRAP( hypre_StructMatrix *A,
                                             A_dbox, fstart, stridef, iA,
                                             RAP_dbox, cstart, stridec, iAc);
                         {
-                           HYPRE_Int iAp,iPp;
+                           HYPRE_Int iAp, iPp;
                            /* path 1 : (stay,stay) */
                            rap_ptrS[iAc] +=          a_ptr[iA]           ;
 
                            /* path 2 : (up,up) */
                            iAp = iA + COffsetA;
                            iPp = iP + COffsetP + AOffsetP;
-                           rap_ptrU[iAc] += ra[iR] * a_ptr[iAp] * pb[iPp+pb_offset];
+                           rap_ptrU[iAc] += ra[iR] * a_ptr[iAp] * pb[iPp + pb_offset];
 
                            /* path 3 : (up,down) */
                            iPp = iP + AOffsetP;
@@ -604,11 +608,11 @@ hypre_SemiBuildRAP( hypre_StructMatrix *A,
 
                            /* path 4 : (down,up) */
                            iAp = iA - COffsetA;
-                           rap_ptrS[iAc] += rb[iR+rb_offset] * a_ptr[iAp] * pb[iPp+pb_offset];
+                           rap_ptrS[iAc] += rb[iR + rb_offset] * a_ptr[iAp] * pb[iPp + pb_offset];
 
                            /* path 5 : (down,down) */
                            iPp = iP - COffsetP + AOffsetP;
-                           rap_ptrD[iAc] += rb[iR+rb_offset] * a_ptr[iAp] * pa[iPp];
+                           rap_ptrD[iAc] += rb[iR + rb_offset] * a_ptr[iAp] * pa[iPp];
                         }
                         hypre_BoxLoop4End(iP, iR, iA, iAc);
 #undef DEVICE_VAR
@@ -616,20 +620,20 @@ hypre_SemiBuildRAP( hypre_StructMatrix *A,
 
                      break;
 
-                     /*-----------------------------------------------------
-                      * If A stencil index is -1 in coarsened direction, need
-                      * to calculate (r,p) pairs (stay,up) (stay,down) (up,stay)
-                      * and (down,stay). Paths 2 & 4 {(s,d),(d,s)} contribute
-                      * to RAP with same stencil index as A. Paths 1 & 3
-                      * {(s,u),(u,s)} contribute to RAP with index 0 in
-                      * coarsened direction.
-                      *-----------------------------------------------------*/
+                  /*-----------------------------------------------------
+                   * If A stencil index is -1 in coarsened direction, need
+                   * to calculate (r,p) pairs (stay,up) (stay,down) (up,stay)
+                   * and (down,stay). Paths 2 & 4 {(s,d),(d,s)} contribute
+                   * to RAP with same stencil index as A. Paths 1 & 3
+                   * {(s,u),(u,s)} contribute to RAP with index 0 in
+                   * coarsened direction.
+                   *-----------------------------------------------------*/
 
                   case -1:
 
                      rap_ptrD = hypre_StructMatrixExtractPointerByIndex(RAP,
                                                                         ci, index);
-                     hypre_IndexD(index,cdir) = 0;
+                     hypre_IndexD(index, cdir) = 0;
                      AOffsetP = hypre_BoxOffsetDistance(P_dbox, index);
                      rap_ptrS = hypre_StructMatrixExtractPointerByIndex(RAP,
                                                                         ci, index);
@@ -647,7 +651,7 @@ hypre_SemiBuildRAP( hypre_StructMatrix *A,
                      diag = 0;
                      for (d = 0; d < dim; d++)
                      {
-                        diag += hypre_IndexD(index,d) * hypre_IndexD(index,d);
+                        diag += hypre_IndexD(index, d) * hypre_IndexD(index, d);
                      }
                      if (diag == 0 && hypre_StructMatrixSymmetric(RAP))
                      {
@@ -661,11 +665,11 @@ hypre_SemiBuildRAP( hypre_StructMatrix *A,
                                          A_dbox, fstart, stridef, iA,
                                          RAP_dbox, cstart, stridec, iAc);
                      {
-                        HYPRE_Int iAp,iPp;
+                        HYPRE_Int iAp, iPp;
                         /* Path 1 : (stay,up) & symmetric path  */
                         iPp = iP + AOffsetP;
                         rap_ptrS[iAc] += symm_path_multiplier *
-                           (a_ptr[iA]  * pb[iPp+pb_offset]);
+                                         (a_ptr[iA]  * pb[iPp + pb_offset]);
 
                         /* Path 2 : (stay,down) */
                         iPp = iP - COffsetP + AOffsetP;
@@ -674,31 +678,31 @@ hypre_SemiBuildRAP( hypre_StructMatrix *A,
                         /* Path 3 : (up,stay) */
                         iAp = iA + COffsetA;
                         rap_ptrS[iAc] += symm_path_multiplier *
-                           (ra[iR] * a_ptr[iAp]          );
+                                         (ra[iR] * a_ptr[iAp]          );
 
                         /* Path 4 : (down,stay) */
                         iAp = iA - COffsetA;
-                        rap_ptrD[iAc] += rb[iR+rb_offset] * a_ptr[iAp]          ;
+                        rap_ptrD[iAc] += rb[iR + rb_offset] * a_ptr[iAp]          ;
                      }
                      hypre_BoxLoop4End(iP, iR, iA, iAc);
 #undef DEVICE_VAR
 
                      break;
 
-                     /*-----------------------------------------------------
-                      * If A stencil index is +1 in coarsened direction, need
-                      * to calculate (r,p) pairs (stay,up) (stay,down) (up,stay)
-                      * and (down,stay). Paths 1 & 3 {(s,u),(u,s)} contribute
-                      * to RAP with same stencil index as A. Paths 2 & 4
-                      * {(s,d),(d,s)} contribute to RAP with index 0 in
-                      * coarsened direction.
-                      *-----------------------------------------------------*/
+                  /*-----------------------------------------------------
+                   * If A stencil index is +1 in coarsened direction, need
+                   * to calculate (r,p) pairs (stay,up) (stay,down) (up,stay)
+                   * and (down,stay). Paths 1 & 3 {(s,u),(u,s)} contribute
+                   * to RAP with same stencil index as A. Paths 2 & 4
+                   * {(s,d),(d,s)} contribute to RAP with index 0 in
+                   * coarsened direction.
+                   *-----------------------------------------------------*/
 
                   case 1:
 
                      rap_ptrU = hypre_StructMatrixExtractPointerByIndex(RAP,
                                                                         ci, index);
-                     hypre_IndexD(index,cdir) = 0;
+                     hypre_IndexD(index, cdir) = 0;
                      AOffsetP = hypre_BoxOffsetDistance(P_dbox, index);
                      rap_ptrS = hypre_StructMatrixExtractPointerByIndex(RAP,
                                                                         ci, index);
@@ -715,7 +719,7 @@ hypre_SemiBuildRAP( hypre_StructMatrix *A,
                      diag = 0;
                      for (d = 0; d < dim; d++)
                      {
-                        diag += hypre_IndexD(index,d) * hypre_IndexD(index,d);
+                        diag += hypre_IndexD(index, d) * hypre_IndexD(index, d);
                      }
                      if (diag == 0 && hypre_StructMatrixSymmetric(RAP))
                      {
@@ -729,15 +733,15 @@ hypre_SemiBuildRAP( hypre_StructMatrix *A,
                                          A_dbox, fstart, stridef, iA,
                                          RAP_dbox, cstart, stridec, iAc);
                      {
-                        HYPRE_Int iAp,iPp;
+                        HYPRE_Int iAp, iPp;
                         /* Path 1 : (stay,up) */
                         iPp = iP + COffsetP + AOffsetP;
-                        rap_ptrU[iAc] +=          a_ptr[iA]  * pb[iPp+pb_offset];
+                        rap_ptrU[iAc] +=          a_ptr[iA]  * pb[iPp + pb_offset];
 
                         /* Path 2 : (stay,down) */
                         iPp = iP + AOffsetP;
                         rap_ptrS[iAc] += symm_path_multiplier *
-                           (a_ptr[iA]  * pa[iPp]);
+                                         (a_ptr[iA]  * pa[iPp]);
 
                         /* Path 3 : (up,stay) */
                         iAp = iA + COffsetA;
@@ -746,7 +750,7 @@ hypre_SemiBuildRAP( hypre_StructMatrix *A,
                         /* Path 4 : (down,stay) */
                         iAp = iA - COffsetA;
                         rap_ptrS[iAc] += symm_path_multiplier *
-                           (rb[iR+rb_offset] * a_ptr[iAp]          );
+                                         (rb[iR + rb_offset] * a_ptr[iAp]          );
                      }
                      hypre_BoxLoop4End(iP, iR, iA, iAc);
 #undef DEVICE_VAR
@@ -767,7 +771,7 @@ hypre_SemiBuildRAP( hypre_StructMatrix *A,
     *  the coarsened direction.
     *-----------------------------------------------------------------*/
 
-   if (hypre_IndexD(hypre_StructGridPeriodic(cgrid),cdir) == 1)
+   if (hypre_IndexD(hypre_StructGridPeriodic(cgrid), cdir) == 1)
    {
       hypre_ForBoxI(ci, cgrid_boxes)
       {
@@ -797,11 +801,11 @@ hypre_SemiBuildRAP( hypre_StructMatrix *A,
 
                      break;
 
-                     /*-----------------------------------------------------
-                      * If RAP stencil index is +/-1 in coarsened direction,
-                      * to add entry to cooresponding entry with 0 in the
-                      * coarsened direction. Also zero out current index.
-                      *-----------------------------------------------------*/
+                  /*-----------------------------------------------------
+                   * If RAP stencil index is +/-1 in coarsened direction,
+                   * to add entry to cooresponding entry with 0 in the
+                   * coarsened direction. Also zero out current index.
+                   *-----------------------------------------------------*/
 
                   default:
 
@@ -812,7 +816,7 @@ hypre_SemiBuildRAP( hypre_StructMatrix *A,
                       *---------------------------------------------------------*/
                      rap_ptrD = hypre_StructMatrixExtractPointerByIndex(RAP,
                                                                         ci, index);
-                     hypre_IndexD(index,cdir) = 0;
+                     hypre_IndexD(index, cdir) = 0;
                      rap_ptrS = hypre_StructMatrixExtractPointerByIndex(RAP,
                                                                         ci, index);
 
@@ -825,7 +829,7 @@ hypre_SemiBuildRAP( hypre_StructMatrix *A,
                      diag = 0;
                      for (d = 0; d < dim; d++)
                      {
-                        diag += hypre_IndexD(index,d) * hypre_IndexD(index,d);
+                        diag += hypre_IndexD(index, d) * hypre_IndexD(index, d);
                      }
                      if (diag == 0 && hypre_StructMatrixSymmetric(RAP))
                      {
@@ -836,7 +840,7 @@ hypre_SemiBuildRAP( hypre_StructMatrix *A,
                                          RAP_dbox, cstart, stridec, iAc);
                      {
                         rap_ptrS[iAc] += symm_path_multiplier *
-                           (rap_ptrD[iAc]);
+                                         (rap_ptrD[iAc]);
 
                         rap_ptrD[iAc] = zero;
                      }
diff --git a/external/hypre/src/struct_ls/smg.c b/external/hypre/src/struct_ls/smg.c
index d790df0c..6f3be07d 100644
--- a/external/hypre/src/struct_ls/smg.c
+++ b/external/hypre/src/struct_ls/smg.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -17,7 +17,7 @@ hypre_SMGCreate( MPI_Comm  comm )
 {
    hypre_SMGData *smg_data;
 
-   smg_data = hypre_CTAlloc(hypre_SMGData,  1, HYPRE_MEMORY_HOST);
+   smg_data = hypre_CTAlloc(hypre_SMGData, 1, HYPRE_MEMORY_HOST);
 
    (smg_data -> comm)        = comm;
    (smg_data -> time_index)  = hypre_InitializeTiming("SMG");
@@ -37,11 +37,11 @@ hypre_SMGCreate( MPI_Comm  comm )
    (smg_data -> logging) = 0;
    (smg_data -> print_level) = 0;
 
+   (smg_data -> memory_location) = hypre_HandleMemoryLocation(hypre_handle());
+
    /* initialize */
    (smg_data -> num_levels) = -1;
-#if 0 //defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-   (smg_data -> devicelevel) = 200;
-#endif
+
    return (void *) smg_data;
 }
 
@@ -65,6 +65,8 @@ hypre_SMGDestroy( void *smg_vdata )
          hypre_TFree(smg_data -> rel_norms, HYPRE_MEMORY_HOST);
       }
 
+      HYPRE_MemoryLocation memory_location = smg_data -> memory_location;
+
       if ((smg_data -> num_levels) > -1)
       {
          for (l = 0; l < ((smg_data -> num_levels) - 1); l++)
@@ -92,9 +94,9 @@ hypre_SMGDestroy( void *smg_vdata )
          hypre_StructVectorDestroy(smg_data -> x_l[0]);
          for (l = 0; l < ((smg_data -> num_levels) - 1); l++)
          {
-            hypre_StructGridDestroy(smg_data -> grid_l[l+1]);
-            hypre_StructGridDestroy(smg_data -> PT_grid_l[l+1]);
-            hypre_StructMatrixDestroy(smg_data -> A_l[l+1]);
+            hypre_StructGridDestroy(smg_data -> grid_l[l + 1]);
+            hypre_StructGridDestroy(smg_data -> PT_grid_l[l + 1]);
+            hypre_StructMatrixDestroy(smg_data -> A_l[l + 1]);
             if (smg_data -> PT_l[l] == smg_data -> R_l[l])
             {
                hypre_StructMatrixDestroy(smg_data -> PT_l[l]);
@@ -104,12 +106,12 @@ hypre_SMGDestroy( void *smg_vdata )
                hypre_StructMatrixDestroy(smg_data -> PT_l[l]);
                hypre_StructMatrixDestroy(smg_data -> R_l[l]);
             }
-            hypre_StructVectorDestroy(smg_data -> b_l[l+1]);
-            hypre_StructVectorDestroy(smg_data -> x_l[l+1]);
-            hypre_StructVectorDestroy(smg_data -> tb_l[l+1]);
-            hypre_StructVectorDestroy(smg_data -> tx_l[l+1]);
+            hypre_StructVectorDestroy(smg_data -> b_l[l + 1]);
+            hypre_StructVectorDestroy(smg_data -> x_l[l + 1]);
+            hypre_StructVectorDestroy(smg_data -> tb_l[l + 1]);
+            hypre_StructVectorDestroy(smg_data -> tx_l[l + 1]);
          }
-          hypre_TFree(smg_data -> data, HYPRE_MEMORY_DEVICE);
+         hypre_TFree(smg_data -> data, memory_location);
          hypre_TFree(smg_data -> grid_l, HYPRE_MEMORY_HOST);
          hypre_TFree(smg_data -> PT_grid_l, HYPRE_MEMORY_HOST);
          hypre_TFree(smg_data -> A_l, HYPRE_MEMORY_HOST);
@@ -265,7 +267,7 @@ hypre_SMGSetNumPreRelax( void *smg_vdata,
 {
    hypre_SMGData *smg_data = (hypre_SMGData *)smg_vdata;
 
-   (smg_data -> num_pre_relax) = hypre_max(num_pre_relax,1);
+   (smg_data -> num_pre_relax) = hypre_max(num_pre_relax, 1);
 
    return hypre_error_flag;
 }
@@ -416,8 +418,8 @@ hypre_SMGPrintLogging( void *smg_vdata,
          {
             for (i = 0; i < num_iterations; i++)
             {
-               hypre_printf("Residual norm[%d] = %e   ",i,norms[i]);
-               hypre_printf("Relative residual norm[%d] = %e\n",i,rel_norms[i]);
+               hypre_printf("Residual norm[%d] = %e   ", i, norms[i]);
+               hypre_printf("Relative residual norm[%d] = %e\n", i, rel_norms[i]);
             }
          }
       }
@@ -444,7 +446,7 @@ hypre_SMGGetFinalRelativeResidualNorm( void   *smg_vdata,
    {
       if (num_iterations == max_iter)
       {
-         *relative_residual_norm = rel_norms[num_iterations-1];
+         *relative_residual_norm = rel_norms[num_iterations - 1];
       }
       else
       {
diff --git a/external/hypre/src/struct_ls/smg.h b/external/hypre/src/struct_ls/smg.h
index 0a1e15c2..4273defe 100644
--- a/external/hypre/src/struct_ls/smg.h
+++ b/external/hypre/src/struct_ls/smg.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -43,6 +43,7 @@ typedef struct
    hypre_StructGrid    **grid_l;
    hypre_StructGrid    **PT_grid_l;
 
+   HYPRE_MemoryLocation  memory_location; /* memory location of data */
    HYPRE_Real           *data;
    HYPRE_Real           *data_const;
    hypre_StructMatrix  **A_l;
@@ -66,15 +67,12 @@ typedef struct
    HYPRE_Int             num_iterations;
    HYPRE_Int             time_index;
 
-   HYPRE_Int            print_level;
+   HYPRE_Int             print_level;
 
    /* additional log info (logged when `logging' > 0) */
    HYPRE_Int             logging;
    HYPRE_Real           *norms;
    HYPRE_Real           *rel_norms;
-#if 0 //defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-   HYPRE_Int             devicelevel;
-#endif
 } hypre_SMGData;
 
 /*--------------------------------------------------------------------------
diff --git a/external/hypre/src/struct_ls/smg2_setup_rap.c b/external/hypre/src/struct_ls/smg2_setup_rap.c
index 88bbc106..8b4ed3a2 100644
--- a/external/hypre/src/struct_ls/smg2_setup_rap.c
+++ b/external/hypre/src/struct_ls/smg2_setup_rap.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -19,6 +19,9 @@ hypre_SMG2CreateRAPOp( hypre_StructMatrix *R,
                        hypre_StructMatrix *PT,
                        hypre_StructGrid   *coarse_grid )
 {
+   HYPRE_UNUSED_VAR(R);
+   HYPRE_UNUSED_VAR(PT);
+
    hypre_StructMatrix    *RAP;
 
    hypre_Index           *RAP_stencil_shape;
@@ -58,7 +61,7 @@ hypre_SMG2CreateRAPOp( hypre_StructMatrix *R,
             /*--------------------------------------------------------------
              * Storage for 9 elements (c,w,e,n,s,sw,se,nw,se)
              *--------------------------------------------------------------*/
-            hypre_SetIndex3(RAP_stencil_shape[stencil_rank],i,j,0);
+            hypre_SetIndex3(RAP_stencil_shape[stencil_rank], i, j, 0);
             stencil_rank++;
          }
       }
@@ -87,9 +90,9 @@ hypre_SMG2CreateRAPOp( hypre_StructMatrix *R,
             /*--------------------------------------------------------------
              * Store 5 elements in (c,w,s,sw,se)
              *--------------------------------------------------------------*/
-            if( i+j <=0 )
+            if ( i + j <= 0 )
             {
-               hypre_SetIndex3(RAP_stencil_shape[stencil_rank],i,j,0);
+               hypre_SetIndex3(RAP_stencil_shape[stencil_rank], i, j, 0);
                stencil_rank++;
             }
          }
@@ -177,7 +180,7 @@ hypre_SMG2BuildRAPSym( hypre_StructMatrix *A,
    HYPRE_Real           *ra, *rb;
 
    HYPRE_Real           *a_cc, *a_cw, *a_ce, *a_cs, *a_cn;
-   HYPRE_Real           *a_csw, *a_cse, *a_cnw;
+   HYPRE_Real           *a_csw = NULL, *a_cse = NULL, *a_cnw = NULL;
 
    HYPRE_Real           *rap_cc, *rap_cw, *rap_cs;
    HYPRE_Real           *rap_csw, *rap_cse;
@@ -223,10 +226,10 @@ hypre_SMG2BuildRAPSym( hypre_StructMatrix *A,
        * pb is pointer for weight for f-point below c-point
        *-----------------------------------------------------------------*/
 
-      hypre_SetIndex3(index,0,1,0);
+      hypre_SetIndex3(index, 0, 1, 0);
       pa = hypre_StructMatrixExtractPointerByIndex(PT, fi, index);
 
-      hypre_SetIndex3(index,0,-1,0);
+      hypre_SetIndex3(index, 0, -1, 0);
       pb = hypre_StructMatrixExtractPointerByIndex(PT, fi, index);
 
       /*-----------------------------------------------------------------
@@ -235,10 +238,10 @@ hypre_SMG2BuildRAPSym( hypre_StructMatrix *A,
        * rb is pointer for weight for f-point below c-point
        *-----------------------------------------------------------------*/
 
-      hypre_SetIndex3(index,0,1,0);
+      hypre_SetIndex3(index, 0, 1, 0);
       ra = hypre_StructMatrixExtractPointerByIndex(R, fi, index);
 
-      hypre_SetIndex3(index,0,-1,0);
+      hypre_SetIndex3(index, 0, -1, 0);
       rb = hypre_StructMatrixExtractPointerByIndex(R, fi, index);
 
       /*-----------------------------------------------------------------
@@ -251,19 +254,19 @@ hypre_SMG2BuildRAPSym( hypre_StructMatrix *A,
        * a_cn is pointer for north coefficient
        *-----------------------------------------------------------------*/
 
-      hypre_SetIndex3(index,0,0,0);
+      hypre_SetIndex3(index, 0, 0, 0);
       a_cc = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-      hypre_SetIndex3(index,-1,0,0);
+      hypre_SetIndex3(index, -1, 0, 0);
       a_cw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-      hypre_SetIndex3(index,1,0,0);
+      hypre_SetIndex3(index, 1, 0, 0);
       a_ce = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-      hypre_SetIndex3(index,0,-1,0);
+      hypre_SetIndex3(index, 0, -1, 0);
       a_cs = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-      hypre_SetIndex3(index,0,1,0);
+      hypre_SetIndex3(index, 0, 1, 0);
       a_cn = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
       /*-----------------------------------------------------------------
@@ -275,15 +278,15 @@ hypre_SMG2BuildRAPSym( hypre_StructMatrix *A,
        * a_cne is pointer for northeast coefficient
        *-----------------------------------------------------------------*/
 
-      if(fine_stencil_size > 5)
+      if (fine_stencil_size > 5)
       {
-         hypre_SetIndex3(index,-1,-1,0);
+         hypre_SetIndex3(index, -1, -1, 0);
          a_csw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index,1,-1,0);
+         hypre_SetIndex3(index, 1, -1, 0);
          a_cse = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index,-1,1,0);
+         hypre_SetIndex3(index, -1, 1, 0);
          a_cnw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
       }
 
@@ -295,19 +298,19 @@ hypre_SMG2BuildRAPSym( hypre_StructMatrix *A,
        * rap_cc is pointer for center coefficient (etc.)
        *-----------------------------------------------------------------*/
 
-      hypre_SetIndex3(index,0,0,0);
+      hypre_SetIndex3(index, 0, 0, 0);
       rap_cc = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-      hypre_SetIndex3(index,-1,0,0);
+      hypre_SetIndex3(index, -1, 0, 0);
       rap_cw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-      hypre_SetIndex3(index,0,-1,0);
+      hypre_SetIndex3(index, 0, -1, 0);
       rap_cs = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-      hypre_SetIndex3(index,-1,-1,0);
+      hypre_SetIndex3(index, -1, -1, 0);
       rap_csw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-      hypre_SetIndex3(index,1,-1,0);
+      hypre_SetIndex3(index, 1, -1, 0);
       rap_cse = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
       /*-----------------------------------------------------------------
@@ -318,11 +321,11 @@ hypre_SMG2BuildRAPSym( hypre_StructMatrix *A,
        * Offsets are used in refering to data associated with other points.
        *-----------------------------------------------------------------*/
 
-      hypre_SetIndex3(index,0,1,0);
-      yOffsetA = hypre_BoxOffsetDistance(A_dbox,index);
-      yOffsetP = hypre_BoxOffsetDistance(PT_dbox,index);
-      hypre_SetIndex3(index,1,0,0);
-      xOffsetP = hypre_BoxOffsetDistance(PT_dbox,index);
+      hypre_SetIndex3(index, 0, 1, 0);
+      yOffsetA = hypre_BoxOffsetDistance(A_dbox, index);
+      yOffsetP = hypre_BoxOffsetDistance(PT_dbox, index);
+      hypre_SetIndex3(index, 1, 0, 0);
+      xOffsetP = hypre_BoxOffsetDistance(PT_dbox, index);
 
       /*-----------------------------------------------------------------
        * Switch statement to direct control to apropriate BoxLoop depending
@@ -357,36 +360,36 @@ hypre_SMG2BuildRAPSym( hypre_StructMatrix *A,
 
                iP1 = iP - yOffsetP;
                rap_cs[iAc] = rb[iR] * a_cc[iAm1] * pa[iP1]
-                  +          rb[iR] * a_cs[iAm1]
-                  +                   a_cs[iA]   * pa[iP1];
+                             +          rb[iR] * a_cs[iAm1]
+                             +                   a_cs[iA]   * pa[iP1];
 
                iP1 = iP - yOffsetP + xOffsetP;
                rap_cse[iAc] = rb[iR] * a_ce[iAm1] * pa[iP1];
 
                iP1 = iP - xOffsetP;
                rap_cw[iAc] =          a_cw[iA]
-                  +          rb[iR] * a_cw[iAm1] * pb[iP1]
-                  +          ra[iR] * a_cw[iAp1] * pa[iP1];
+                                      +          rb[iR] * a_cw[iAm1] * pb[iP1]
+                                      +          ra[iR] * a_cw[iAp1] * pa[iP1];
 
                rap_cc[iAc] =          a_cc[iA]
-                  +          rb[iR] * a_cc[iAm1] * pb[iP]
-                  +          ra[iR] * a_cc[iAp1] * pa[iP]
-                  +          rb[iR] * a_cn[iAm1]
-                  +          ra[iR] * a_cs[iAp1]
-                  +                   a_cs[iA]   * pb[iP]
-                  +                   a_cn[iA]   * pa[iP];
+                                      +          rb[iR] * a_cc[iAm1] * pb[iP]
+                                      +          ra[iR] * a_cc[iAp1] * pa[iP]
+                                      +          rb[iR] * a_cn[iAm1]
+                                      +          ra[iR] * a_cs[iAp1]
+                                      +                   a_cs[iA]   * pb[iP]
+                                      +                   a_cn[iA]   * pa[iP];
             }
             hypre_BoxLoop4End(iP, iR, iA, iAc);
 #undef DEVICE_VAR
 
             break;
 
-            /*--------------------------------------------------------------
-             * Loop for symmetric 9-point fine grid operator; produces a
-             * symmetric 9-point coarse grid operator. We calculate only the
-             * lower triangular stencil entries: (southwest, south, southeast,
-             * west, and center).
-             *--------------------------------------------------------------*/
+         /*--------------------------------------------------------------
+          * Loop for symmetric 9-point fine grid operator; produces a
+          * symmetric 9-point coarse grid operator. We calculate only the
+          * lower triangular stencil entries: (southwest, south, southeast,
+          * west, and center).
+          *--------------------------------------------------------------*/
 
          default:
 
@@ -404,35 +407,35 @@ hypre_SMG2BuildRAPSym( hypre_StructMatrix *A,
 
                HYPRE_Int iP1 = iP - yOffsetP - xOffsetP;
                rap_csw[iAc] = rb[iR] * a_cw[iAm1] * pa[iP1]
-                  +           rb[iR] * a_csw[iAm1]
-                  +                    a_csw[iA]  * pa[iP1];
+                              +           rb[iR] * a_csw[iAm1]
+                              +                    a_csw[iA]  * pa[iP1];
 
                iP1 = iP - yOffsetP;
                rap_cs[iAc] = rb[iR] * a_cc[iAm1] * pa[iP1]
-                  +          rb[iR] * a_cs[iAm1]
-                  +                   a_cs[iA]   * pa[iP1];
+                             +          rb[iR] * a_cs[iAm1]
+                             +                   a_cs[iA]   * pa[iP1];
 
                iP1 = iP - yOffsetP + xOffsetP;
                rap_cse[iAc] = rb[iR] * a_ce[iAm1] * pa[iP1]
-                  +           rb[iR] * a_cse[iAm1]
-                  +                    a_cse[iA]  * pa[iP1];
+                              +           rb[iR] * a_cse[iAm1]
+                              +                    a_cse[iA]  * pa[iP1];
 
                iP1 = iP - xOffsetP;
                rap_cw[iAc] =          a_cw[iA]
-                  +          rb[iR] * a_cw[iAm1] * pb[iP1]
-                  +          ra[iR] * a_cw[iAp1] * pa[iP1]
-                  +          rb[iR] * a_cnw[iAm1]
-                  +          ra[iR] * a_csw[iAp1]
-                  +                   a_csw[iA]  * pb[iP1]
-                  +                   a_cnw[iA]  * pa[iP1];
+                                      +          rb[iR] * a_cw[iAm1] * pb[iP1]
+                                      +          ra[iR] * a_cw[iAp1] * pa[iP1]
+                                      +          rb[iR] * a_cnw[iAm1]
+                                      +          ra[iR] * a_csw[iAp1]
+                                      +                   a_csw[iA]  * pb[iP1]
+                                      +                   a_cnw[iA]  * pa[iP1];
 
                rap_cc[iAc] =          a_cc[iA]
-                  +          rb[iR] * a_cc[iAm1] * pb[iP]
-                  +          ra[iR] * a_cc[iAp1] * pa[iP]
-                  +          rb[iR] * a_cn[iAm1]
-                  +          ra[iR] * a_cs[iAp1]
-                  +                   a_cs[iA]   * pb[iP]
-                  +                   a_cn[iA]   * pa[iP];
+                                      +          rb[iR] * a_cc[iAm1] * pb[iP]
+                                      +          ra[iR] * a_cc[iAp1] * pa[iP]
+                                      +          rb[iR] * a_cn[iAm1]
+                                      +          ra[iR] * a_cs[iAp1]
+                                      +                   a_cs[iA]   * pb[iP]
+                                      +                   a_cn[iA]   * pa[iP];
 
             }
             hypre_BoxLoop4End(iP, iR, iA, iAc);
@@ -488,7 +491,7 @@ hypre_SMG2BuildRAPNoSym( hypre_StructMatrix *A,
    HYPRE_Real           *ra, *rb;
 
    HYPRE_Real           *a_cc, *a_cw, *a_ce, *a_cn;
-   HYPRE_Real           *a_cse, *a_cnw, *a_cne;
+   HYPRE_Real           *a_cse = NULL, *a_cnw = NULL, *a_cne = NULL;
 
    HYPRE_Real           *rap_ce, *rap_cn;
    HYPRE_Real           *rap_cnw, *rap_cne;
@@ -534,10 +537,10 @@ hypre_SMG2BuildRAPNoSym( hypre_StructMatrix *A,
        * pb is pointer for weight for f-point below c-point
        *-----------------------------------------------------------------*/
 
-      hypre_SetIndex3(index,0,1,0);
+      hypre_SetIndex3(index, 0, 1, 0);
       pa = hypre_StructMatrixExtractPointerByIndex(PT, fi, index);
 
-      hypre_SetIndex3(index,0,-1,0);
+      hypre_SetIndex3(index, 0, -1, 0);
       pb = hypre_StructMatrixExtractPointerByIndex(PT, fi, index);
 
       /*-----------------------------------------------------------------
@@ -546,10 +549,10 @@ hypre_SMG2BuildRAPNoSym( hypre_StructMatrix *A,
        * rb is pointer for weight for f-point below c-point
        *-----------------------------------------------------------------*/
 
-      hypre_SetIndex3(index,0,1,0);
+      hypre_SetIndex3(index, 0, 1, 0);
       ra = hypre_StructMatrixExtractPointerByIndex(R, fi, index);
 
-      hypre_SetIndex3(index,0,-1,0);
+      hypre_SetIndex3(index, 0, -1, 0);
       rb = hypre_StructMatrixExtractPointerByIndex(R, fi, index);
 
       /*-----------------------------------------------------------------
@@ -562,16 +565,16 @@ hypre_SMG2BuildRAPNoSym( hypre_StructMatrix *A,
        * a_cn is pointer for north coefficient
        *-----------------------------------------------------------------*/
 
-      hypre_SetIndex3(index,0,0,0);
+      hypre_SetIndex3(index, 0, 0, 0);
       a_cc = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-      hypre_SetIndex3(index,-1,0,0);
+      hypre_SetIndex3(index, -1, 0, 0);
       a_cw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-      hypre_SetIndex3(index,1,0,0);
+      hypre_SetIndex3(index, 1, 0, 0);
       a_ce = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-      hypre_SetIndex3(index,0,1,0);
+      hypre_SetIndex3(index, 0, 1, 0);
       a_cn = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
       /*-----------------------------------------------------------------
@@ -583,17 +586,16 @@ hypre_SMG2BuildRAPNoSym( hypre_StructMatrix *A,
        * a_cne is pointer for northeast coefficient
        *-----------------------------------------------------------------*/
 
-      if(fine_stencil_size > 5)
+      if (fine_stencil_size > 5)
       {
-         hypre_SetIndex3(index,1,-1,0);
+         hypre_SetIndex3(index, 1, -1, 0);
          a_cse = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index,-1,1,0);
+         hypre_SetIndex3(index, -1, 1, 0);
          a_cnw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index,1,1,0);
+         hypre_SetIndex3(index, 1, 1, 0);
          a_cne = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
-
       }
 
       /*-----------------------------------------------------------------
@@ -604,16 +606,16 @@ hypre_SMG2BuildRAPNoSym( hypre_StructMatrix *A,
        * rap_ce is pointer for east coefficient (etc.)
        *-----------------------------------------------------------------*/
 
-      hypre_SetIndex3(index,1,0,0);
+      hypre_SetIndex3(index, 1, 0, 0);
       rap_ce = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-      hypre_SetIndex3(index,0,1,0);
+      hypre_SetIndex3(index, 0, 1, 0);
       rap_cn = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-      hypre_SetIndex3(index,1,1,0);
+      hypre_SetIndex3(index, 1, 1, 0);
       rap_cne = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-      hypre_SetIndex3(index,-1,1,0);
+      hypre_SetIndex3(index, -1, 1, 0);
       rap_cnw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
       /*-----------------------------------------------------------------
@@ -624,11 +626,11 @@ hypre_SMG2BuildRAPNoSym( hypre_StructMatrix *A,
        * Offsets are used in refering to data associated with other points.
        *-----------------------------------------------------------------*/
 
-      hypre_SetIndex3(index,0,1,0);
-      yOffsetA = hypre_BoxOffsetDistance(A_dbox,index);
-      yOffsetP = hypre_BoxOffsetDistance(PT_dbox,index);
-      hypre_SetIndex3(index,1,0,0);
-      xOffsetP = hypre_BoxOffsetDistance(PT_dbox,index);
+      hypre_SetIndex3(index, 0, 1, 0);
+      yOffsetA = hypre_BoxOffsetDistance(A_dbox, index);
+      yOffsetP = hypre_BoxOffsetDistance(PT_dbox, index);
+      hypre_SetIndex3(index, 1, 0, 0);
+      xOffsetP = hypre_BoxOffsetDistance(PT_dbox, index);
 
       /*-----------------------------------------------------------------
        * Switch statement to direct control to apropriate BoxLoop depending
@@ -663,16 +665,16 @@ hypre_SMG2BuildRAPNoSym( hypre_StructMatrix *A,
 
                iP1 = iP + yOffsetP;
                rap_cn[iAc] = ra[iR] * a_cc[iAp1] * pb[iP1]
-                  +          ra[iR] * a_cn[iAp1]
-                  +                   a_cn[iA]   * pb[iP1];
+                             +          ra[iR] * a_cn[iAp1]
+                             +                   a_cn[iA]   * pb[iP1];
 
                iP1 = iP + yOffsetP - xOffsetP;
                rap_cnw[iAc] = ra[iR] * a_cw[iAp1] * pb[iP1];
 
                iP1 = iP + xOffsetP;
                rap_ce[iAc] =          a_ce[iA]
-                  +          rb[iR] * a_ce[iAm1] * pb[iP1]
-                  +          ra[iR] * a_ce[iAp1] * pa[iP1];
+                                      +          rb[iR] * a_ce[iAm1] * pb[iP1]
+                                      +          ra[iR] * a_ce[iAp1] * pa[iP1];
 
             }
             hypre_BoxLoop4End(iP, iR, iA, iAc);
@@ -680,11 +682,11 @@ hypre_SMG2BuildRAPNoSym( hypre_StructMatrix *A,
 
             break;
 
-            /*--------------------------------------------------------------
-             * Loop for 9-point fine grid operator; produces upper triangular
-             * part of 9-point coarse grid operator - excludes diagonal.
-             * stencil entries: (northeast, north, northwest, and east)
-             *--------------------------------------------------------------*/
+         /*--------------------------------------------------------------
+          * Loop for 9-point fine grid operator; produces upper triangular
+          * part of 9-point coarse grid operator - excludes diagonal.
+          * stencil entries: (northeast, north, northwest, and east)
+          *--------------------------------------------------------------*/
 
          default:
             hypre_BoxGetSize(cgrid_box, loop_size);
@@ -701,27 +703,27 @@ hypre_SMG2BuildRAPNoSym( hypre_StructMatrix *A,
 
                HYPRE_Int iP1 = iP + yOffsetP + xOffsetP;
                rap_cne[iAc] = ra[iR] * a_ce[iAp1] * pb[iP1]
-                  +           ra[iR] * a_cne[iAp1]
-                  +                    a_cne[iA]  * pb[iP1];
+                              +           ra[iR] * a_cne[iAp1]
+                              +                    a_cne[iA]  * pb[iP1];
 
                iP1 = iP + yOffsetP;
                rap_cn[iAc] = ra[iR] * a_cc[iAp1] * pb[iP1]
-                  +          ra[iR] * a_cn[iAp1]
-                  +                   a_cn[iA]   * pb[iP1];
+                             +          ra[iR] * a_cn[iAp1]
+                             +                   a_cn[iA]   * pb[iP1];
 
                iP1 = iP + yOffsetP - xOffsetP;
                rap_cnw[iAc] = ra[iR] * a_cw[iAp1] * pb[iP1]
-                  +           ra[iR] * a_cnw[iAp1]
-                  +                    a_cnw[iA]  * pb[iP1];
+                              +           ra[iR] * a_cnw[iAp1]
+                              +                    a_cnw[iA]  * pb[iP1];
 
                iP1 = iP + xOffsetP;
                rap_ce[iAc] =          a_ce[iA]
-                  +          rb[iR] * a_ce[iAm1] * pb[iP1]
-                  +          ra[iR] * a_ce[iAp1] * pa[iP1]
-                  +          rb[iR] * a_cne[iAm1]
-                  +          ra[iR] * a_cse[iAp1]
-                  +                   a_cse[iA]  * pb[iP1]
-                  +                   a_cne[iA]  * pa[iP1];
+                                      +          rb[iR] * a_ce[iAm1] * pb[iP1]
+                                      +          ra[iR] * a_ce[iAp1] * pa[iP1]
+                                      +          rb[iR] * a_cne[iAm1]
+                                      +          ra[iR] * a_cse[iAp1]
+                                      +                   a_cse[iA]  * pb[iP1]
+                                      +                   a_cne[iA]  * pa[iP1];
 
             }
             hypre_BoxLoop4End(iP, iR, iA, iAc);
@@ -748,6 +750,9 @@ hypre_SMG2RAPPeriodicSym( hypre_StructMatrix *RAP,
                           hypre_Index         cstride )
 
 {
+   HYPRE_UNUSED_VAR(cindex);
+   HYPRE_UNUSED_VAR(cstride);
+
    hypre_Index             index;
 
    hypre_StructGrid       *cgrid;
@@ -785,25 +790,25 @@ hypre_SMG2RAPPeriodicSym( hypre_StructMatrix *RAP,
          RAP_dbox =
             hypre_BoxArrayBox(hypre_StructMatrixDataSpace(RAP), ci);
 
-         hypre_SetIndex3(index,1,0,0);
-         xOffset = hypre_BoxOffsetDistance(RAP_dbox,index);
+         hypre_SetIndex3(index, 1, 0, 0);
+         xOffset = hypre_BoxOffsetDistance(RAP_dbox, index);
 
          /*-----------------------------------------------------------------
           * Extract pointers for coarse grid operator - always 9-point:
           *-----------------------------------------------------------------*/
-         hypre_SetIndex3(index,0,0,0);
+         hypre_SetIndex3(index, 0, 0, 0);
          rap_cc = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-         hypre_SetIndex3(index,-1,0,0);
+         hypre_SetIndex3(index, -1, 0, 0);
          rap_cw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-         hypre_SetIndex3(index,0,-1,0);
+         hypre_SetIndex3(index, 0, -1, 0);
          rap_cs = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-         hypre_SetIndex3(index,-1,-1,0);
+         hypre_SetIndex3(index, -1, -1, 0);
          rap_csw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-         hypre_SetIndex3(index,1,-1,0);
+         hypre_SetIndex3(index, 1, -1, 0);
          rap_cse = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
          hypre_BoxGetSize(cgrid_box, loop_size);
@@ -848,6 +853,9 @@ hypre_SMG2RAPPeriodicNoSym( hypre_StructMatrix *RAP,
                             hypre_Index         cstride )
 
 {
+   HYPRE_UNUSED_VAR(cindex);
+   HYPRE_UNUSED_VAR(cstride);
+
    hypre_Index             index;
 
    hypre_StructGrid       *cgrid;
@@ -886,31 +894,31 @@ hypre_SMG2RAPPeriodicNoSym( hypre_StructMatrix *RAP,
          /*-----------------------------------------------------------------
           * Extract pointers for coarse grid operator - always 9-point:
           *-----------------------------------------------------------------*/
-         hypre_SetIndex3(index,0,0,0);
+         hypre_SetIndex3(index, 0, 0, 0);
          rap_cc = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-         hypre_SetIndex3(index,-1,0,0);
+         hypre_SetIndex3(index, -1, 0, 0);
          rap_cw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-         hypre_SetIndex3(index,0,-1,0);
+         hypre_SetIndex3(index, 0, -1, 0);
          rap_cs = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-         hypre_SetIndex3(index,-1,-1,0);
+         hypre_SetIndex3(index, -1, -1, 0);
          rap_csw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-         hypre_SetIndex3(index,1,-1,0);
+         hypre_SetIndex3(index, 1, -1, 0);
          rap_cse = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-         hypre_SetIndex3(index,1,0,0);
+         hypre_SetIndex3(index, 1, 0, 0);
          rap_ce = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-         hypre_SetIndex3(index,0,1,0);
+         hypre_SetIndex3(index, 0, 1, 0);
          rap_cn = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-         hypre_SetIndex3(index,1,1,0);
+         hypre_SetIndex3(index, 1, 1, 0);
          rap_cne = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-         hypre_SetIndex3(index,-1,1,0);
+         hypre_SetIndex3(index, -1, 1, 0);
          rap_cnw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
 
@@ -941,4 +949,3 @@ hypre_SMG2RAPPeriodicNoSym( hypre_StructMatrix *RAP,
 
    return hypre_error_flag;
 }
-
diff --git a/external/hypre/src/struct_ls/smg3_setup_rap.c b/external/hypre/src/struct_ls/smg3_setup_rap.c
index 51a94d0e..45812162 100644
--- a/external/hypre/src/struct_ls/smg3_setup_rap.c
+++ b/external/hypre/src/struct_ls/smg3_setup_rap.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -19,6 +19,9 @@ hypre_SMG3CreateRAPOp( hypre_StructMatrix *R,
                        hypre_StructMatrix *PT,
                        hypre_StructGrid   *coarse_grid )
 {
+   HYPRE_UNUSED_VAR(R);
+   HYPRE_UNUSED_VAR(PT);
+
    hypre_StructMatrix    *RAP;
 
    hypre_Index           *RAP_stencil_shape;
@@ -54,7 +57,7 @@ hypre_SMG3CreateRAPOp( hypre_StructMatrix *R,
       /*--------------------------------------------------------------------
        * 7 or 15 point fine grid stencil produces 15 point RAP
        *--------------------------------------------------------------------*/
-      if( A_stencil_size <= 15)
+      if ( A_stencil_size <= 15)
       {
          RAP_stencil_size = 15;
          RAP_stencil_shape = hypre_CTAlloc(hypre_Index,  RAP_stencil_size, HYPRE_MEMORY_HOST);
@@ -68,9 +71,9 @@ hypre_SMG3CreateRAPOp( hypre_StructMatrix *R,
                   /*--------------------------------------------------------
                    * Storage for c,w,e,n,s elements in each plane
                    *--------------------------------------------------------*/
-                  if( i*j == 0 )
+                  if ( i * j == 0 )
                   {
-                     hypre_SetIndex3(RAP_stencil_shape[stencil_rank],i,j,k);
+                     hypre_SetIndex3(RAP_stencil_shape[stencil_rank], i, j, k);
                      stencil_rank++;
                   }
                }
@@ -96,7 +99,7 @@ hypre_SMG3CreateRAPOp( hypre_StructMatrix *R,
                    * Storage for 9 elements (c,w,e,n,s,sw,se,nw,se) in
                    * each plane
                    *--------------------------------------------------------*/
-                  hypre_SetIndex3(RAP_stencil_shape[stencil_rank],i,j,k);
+                  hypre_SetIndex3(RAP_stencil_shape[stencil_rank], i, j, k);
                   stencil_rank++;
                }
             }
@@ -117,7 +120,7 @@ hypre_SMG3CreateRAPOp( hypre_StructMatrix *R,
        * lower triangular means the lower triangular part on the matrix
        * in the standard lexicalgraphic ordering.
        *--------------------------------------------------------------------*/
-      if( A_stencil_size <= 15)
+      if ( A_stencil_size <= 15)
       {
          RAP_stencil_size = 8;
          RAP_stencil_shape = hypre_CTAlloc(hypre_Index,  RAP_stencil_size, HYPRE_MEMORY_HOST);
@@ -132,9 +135,9 @@ hypre_SMG3CreateRAPOp( hypre_StructMatrix *R,
                    * Store  5 elements in lower plane (c,w,e,s,n)
                    * and 3 elements in same plane (c,w,s)
                    *--------------------------------------------------------*/
-                  if( i*j == 0 && i+j+k <= 0)
+                  if ( i * j == 0 && i + j + k <= 0)
                   {
-                     hypre_SetIndex3(RAP_stencil_shape[stencil_rank],i,j,k);
+                     hypre_SetIndex3(RAP_stencil_shape[stencil_rank], i, j, k);
                      stencil_rank++;
                   }
                }
@@ -163,9 +166,9 @@ hypre_SMG3CreateRAPOp( hypre_StructMatrix *R,
                    * Store  9 elements in lower plane (c,w,e,s,n,sw,se,nw,ne)
                    * and 5 elements in same plane (c,w,s,sw,se)
                    *--------------------------------------------------------*/
-                  if( k < 0 || (i+j+k <=0 && j < 1) )
+                  if ( k < 0 || (i + j + k <= 0 && j < 1) )
                   {
-                     hypre_SetIndex3(RAP_stencil_shape[stencil_rank],i,j,k);
+                     hypre_SetIndex3(RAP_stencil_shape[stencil_rank], i, j, k);
                      stencil_rank++;
                   }
                }
@@ -254,16 +257,21 @@ hypre_SMG3BuildRAPSym( hypre_StructMatrix *A,
    HYPRE_Real           *ra, *rb;
 
    HYPRE_Real           *a_cc, *a_cw, *a_ce, *a_cs, *a_cn;
-   HYPRE_Real           *a_ac, *a_aw, *a_as;
-   HYPRE_Real           *a_bc, *a_bw, *a_be, *a_bs, *a_bn;
-   HYPRE_Real           *a_csw, *a_cse, *a_cnw, *a_cne;
-   HYPRE_Real           *a_asw, *a_ase;
-   HYPRE_Real           *a_bsw, *a_bse, *a_bnw, *a_bne;
+   HYPRE_Real           *a_ac, *a_bc;
+   HYPRE_Real           *a_aw  = NULL, *a_as  = NULL;
+   HYPRE_Real           *a_bw  = NULL, *a_be  = NULL;
+   HYPRE_Real           *a_bs  = NULL, *a_bn  = NULL;
+   HYPRE_Real           *a_csw = NULL, *a_cse = NULL;
+   HYPRE_Real           *a_cnw = NULL, *a_cne = NULL;
+   HYPRE_Real           *a_asw = NULL, *a_ase = NULL;
+   HYPRE_Real           *a_bsw = NULL, *a_bse = NULL;
+   HYPRE_Real           *a_bnw = NULL, *a_bne = NULL;
 
    HYPRE_Real           *rap_cc, *rap_cw, *rap_cs;
    HYPRE_Real           *rap_bc, *rap_bw, *rap_be, *rap_bs, *rap_bn;
-   HYPRE_Real           *rap_csw, *rap_cse;
-   HYPRE_Real           *rap_bsw, *rap_bse, *rap_bnw, *rap_bne;
+   HYPRE_Real           *rap_csw = NULL, *rap_cse = NULL;
+   HYPRE_Real           *rap_bsw = NULL, *rap_bse = NULL;
+   HYPRE_Real           *rap_bnw = NULL, *rap_bne = NULL;
 
    HYPRE_Int             zOffsetA;
    HYPRE_Int             xOffsetP;
@@ -307,10 +315,10 @@ hypre_SMG3BuildRAPSym( hypre_StructMatrix *A,
        * pb is pointer for weight for f-point below c-point
        *-----------------------------------------------------------------*/
 
-      hypre_SetIndex3(index,0,0,1);
+      hypre_SetIndex3(index, 0, 0, 1);
       pa = hypre_StructMatrixExtractPointerByIndex(PT, fi, index);
 
-      hypre_SetIndex3(index,0,0,-1);
+      hypre_SetIndex3(index, 0, 0, -1);
       pb = hypre_StructMatrixExtractPointerByIndex(PT, fi, index);
 
       /*-----------------------------------------------------------------
@@ -319,10 +327,10 @@ hypre_SMG3BuildRAPSym( hypre_StructMatrix *A,
        * rb is pointer for weight for f-point below c-point
        *-----------------------------------------------------------------*/
 
-      hypre_SetIndex3(index,0,0,1);
+      hypre_SetIndex3(index, 0, 0, 1);
       ra = hypre_StructMatrixExtractPointerByIndex(R, fi, index);
 
-      hypre_SetIndex3(index,0,0,-1);
+      hypre_SetIndex3(index, 0, 0, -1);
       rb = hypre_StructMatrixExtractPointerByIndex(R, fi, index);
 
       /*-----------------------------------------------------------------
@@ -337,25 +345,25 @@ hypre_SMG3BuildRAPSym( hypre_StructMatrix *A,
        * a_bc is pointer for center coefficient in plane below
        *-----------------------------------------------------------------*/
 
-      hypre_SetIndex3(index,0,0,0);
+      hypre_SetIndex3(index, 0, 0, 0);
       a_cc = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-      hypre_SetIndex3(index,-1,0,0);
+      hypre_SetIndex3(index, -1, 0, 0);
       a_cw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-      hypre_SetIndex3(index,1,0,0);
+      hypre_SetIndex3(index, 1, 0, 0);
       a_ce = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-      hypre_SetIndex3(index,0,-1,0);
+      hypre_SetIndex3(index, 0, -1, 0);
       a_cs = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-      hypre_SetIndex3(index,0,1,0);
+      hypre_SetIndex3(index, 0, 1, 0);
       a_cn = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-      hypre_SetIndex3(index,0,0,1);
+      hypre_SetIndex3(index, 0, 0, 1);
       a_ac = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-      hypre_SetIndex3(index,0,0,-1);
+      hypre_SetIndex3(index, 0, 0, -1);
       a_bc = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
       /*-----------------------------------------------------------------
@@ -371,24 +379,24 @@ hypre_SMG3BuildRAPSym( hypre_StructMatrix *A,
        * a_bn is pointer for north coefficient in plane below
        *-----------------------------------------------------------------*/
 
-      if(fine_stencil_size > 7)
+      if (fine_stencil_size > 7)
       {
-         hypre_SetIndex3(index,-1,0,1);
+         hypre_SetIndex3(index, -1, 0, 1);
          a_aw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index,0,-1,1);
+         hypre_SetIndex3(index, 0, -1, 1);
          a_as = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index,-1,0,-1);
+         hypre_SetIndex3(index, -1, 0, -1);
          a_bw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index,1,0,-1);
+         hypre_SetIndex3(index, 1, 0, -1);
          a_be = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index,0,-1,-1);
+         hypre_SetIndex3(index, 0, -1, -1);
          a_bs = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index,0,1,-1);
+         hypre_SetIndex3(index, 0, 1, -1);
          a_bn = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
       }
@@ -402,20 +410,19 @@ hypre_SMG3BuildRAPSym( hypre_StructMatrix *A,
        * a_cne is pointer for northeast coefficient in same plane
        *-----------------------------------------------------------------*/
 
-      if(fine_stencil_size > 15)
+      if (fine_stencil_size > 15)
       {
-         hypre_SetIndex3(index,-1,-1,0);
+         hypre_SetIndex3(index, -1, -1, 0);
          a_csw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index,1,-1,0);
+         hypre_SetIndex3(index, 1, -1, 0);
          a_cse = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index,-1,1,0);
+         hypre_SetIndex3(index, -1, 1, 0);
          a_cnw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index,1,1,0);
+         hypre_SetIndex3(index, 1, 1, 0);
          a_cne = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
-
       }
 
       /*-----------------------------------------------------------------
@@ -431,26 +438,25 @@ hypre_SMG3BuildRAPSym( hypre_StructMatrix *A,
        * a_bne is pointer for northeast coefficient in plane below
        *-----------------------------------------------------------------*/
 
-      if(fine_stencil_size > 19)
+      if (fine_stencil_size > 19)
       {
-         hypre_SetIndex3(index,-1,-1,1);
+         hypre_SetIndex3(index, -1, -1, 1);
          a_asw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index,1,-1,1);
+         hypre_SetIndex3(index, 1, -1, 1);
          a_ase = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index,-1,-1,-1);
+         hypre_SetIndex3(index, -1, -1, -1);
          a_bsw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index,1,-1,-1);
+         hypre_SetIndex3(index, 1, -1, -1);
          a_bse = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index,-1,1,-1);
+         hypre_SetIndex3(index, -1, 1, -1);
          a_bnw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index,1,1,-1);
+         hypre_SetIndex3(index, 1, 1, -1);
          a_bne = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
-
       }
 
       /*-----------------------------------------------------------------
@@ -461,28 +467,28 @@ hypre_SMG3BuildRAPSym( hypre_StructMatrix *A,
        * rap_cc is pointer for center coefficient (etc.)
        *-----------------------------------------------------------------*/
 
-      hypre_SetIndex3(index,0,0,0);
+      hypre_SetIndex3(index, 0, 0, 0);
       rap_cc = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-      hypre_SetIndex3(index,-1,0,0);
+      hypre_SetIndex3(index, -1, 0, 0);
       rap_cw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-      hypre_SetIndex3(index,0,-1,0);
+      hypre_SetIndex3(index, 0, -1, 0);
       rap_cs = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-      hypre_SetIndex3(index,0,0,-1);
+      hypre_SetIndex3(index, 0, 0, -1);
       rap_bc = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-      hypre_SetIndex3(index,-1,0,-1);
+      hypre_SetIndex3(index, -1, 0, -1);
       rap_bw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-      hypre_SetIndex3(index,1,0,-1);
+      hypre_SetIndex3(index, 1, 0, -1);
       rap_be = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-      hypre_SetIndex3(index,0,-1,-1);
+      hypre_SetIndex3(index, 0, -1, -1);
       rap_bs = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-      hypre_SetIndex3(index,0,1,-1);
+      hypre_SetIndex3(index, 0, 1, -1);
       rap_bn = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
       /*-----------------------------------------------------------------
@@ -496,29 +502,29 @@ hypre_SMG3BuildRAPSym( hypre_StructMatrix *A,
        * rap_csw is pointer for southwest coefficient in same plane (etc.)
        *-----------------------------------------------------------------*/
 
-      if(fine_stencil_size > 15)
+      if (fine_stencil_size > 15)
       {
-         hypre_SetIndex3(index,-1,-1,0);
+         hypre_SetIndex3(index, -1, -1, 0);
          rap_csw =
             hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-         hypre_SetIndex3(index,1,-1,0);
+         hypre_SetIndex3(index, 1, -1, 0);
          rap_cse =
             hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-         hypre_SetIndex3(index,-1,-1,-1);
+         hypre_SetIndex3(index, -1, -1, -1);
          rap_bsw =
             hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-         hypre_SetIndex3(index,1,-1,-1);
+         hypre_SetIndex3(index, 1, -1, -1);
          rap_bse =
             hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-         hypre_SetIndex3(index,-1,1,-1);
+         hypre_SetIndex3(index, -1, 1, -1);
          rap_bnw =
             hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-         hypre_SetIndex3(index,1,1,-1);
+         hypre_SetIndex3(index, 1, 1, -1);
          rap_bne =
             hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
@@ -532,13 +538,13 @@ hypre_SMG3BuildRAPSym( hypre_StructMatrix *A,
        * Offsets are used in refering to data associated with other points.
        *-----------------------------------------------------------------*/
 
-      hypre_SetIndex3(index,0,0,1);
-      zOffsetA = hypre_BoxOffsetDistance(A_dbox,index);
-      zOffsetP = hypre_BoxOffsetDistance(PT_dbox,index);
-      hypre_SetIndex3(index,0,1,0);
-      yOffsetP = hypre_BoxOffsetDistance(PT_dbox,index);
-      hypre_SetIndex3(index,1,0,0);
-      xOffsetP = hypre_BoxOffsetDistance(PT_dbox,index);
+      hypre_SetIndex3(index, 0, 0, 1);
+      zOffsetA = hypre_BoxOffsetDistance(A_dbox, index);
+      zOffsetP = hypre_BoxOffsetDistance(PT_dbox, index);
+      hypre_SetIndex3(index, 0, 1, 0);
+      yOffsetP = hypre_BoxOffsetDistance(PT_dbox, index);
+      hypre_SetIndex3(index, 1, 0, 0);
+      xOffsetP = hypre_BoxOffsetDistance(PT_dbox, index);
 
       /*--------------------------------------------------------------------
        * Switch statement to direct control to apropriate BoxLoop depending
@@ -578,8 +584,8 @@ hypre_SMG3BuildRAPSym( hypre_StructMatrix *A,
 
                iP1 = iP - zOffsetP;
                rap_bc[iAc] =          a_bc[iA]   * pa[iP1]
-                  +          rb[iR] * a_cc[iAm1] * pa[iP1]
-                  +          rb[iR] * a_bc[iAm1];
+                                      +          rb[iR] * a_cc[iAm1] * pa[iP1]
+                                      +          rb[iR] * a_bc[iAm1];
 
                iP1 = iP - zOffsetP + xOffsetP;
                rap_be[iAc] = rb[iR] * a_ce[iAm1] * pa[iP1];
@@ -589,21 +595,21 @@ hypre_SMG3BuildRAPSym( hypre_StructMatrix *A,
 
                iP1 = iP - yOffsetP;
                rap_cs[iAc] =          a_cs[iA]
-                  +          rb[iR] * a_cs[iAm1] * pb[iP1]
-                  +          ra[iR] * a_cs[iAp1] * pa[iP1];
+                                      +          rb[iR] * a_cs[iAm1] * pb[iP1]
+                                      +          ra[iR] * a_cs[iAp1] * pa[iP1];
 
                iP1 = iP - xOffsetP;
                rap_cw[iAc] =          a_cw[iA]
-                  +          rb[iR] * a_cw[iAm1] * pb[iP1]
-                  +          ra[iR] * a_cw[iAp1] * pa[iP1];
+                                      +          rb[iR] * a_cw[iAm1] * pb[iP1]
+                                      +          ra[iR] * a_cw[iAp1] * pa[iP1];
 
                rap_cc[iAc] =          a_cc[iA]
-                  +          rb[iR] * a_cc[iAm1] * pb[iP]
-                  +          ra[iR] * a_cc[iAp1] * pa[iP]
-                  +          rb[iR] * a_ac[iAm1]
-                  +          ra[iR] * a_bc[iAp1]
-                  +                   a_bc[iA]   * pb[iP]
-                  +                   a_ac[iA]   * pa[iP];
+                                      +          rb[iR] * a_cc[iAm1] * pb[iP]
+                                      +          ra[iR] * a_cc[iAp1] * pa[iP]
+                                      +          rb[iR] * a_ac[iAm1]
+                                      +          ra[iR] * a_bc[iAp1]
+                                      +                   a_bc[iA]   * pb[iP]
+                                      +                   a_ac[iA]   * pa[iP];
 
             }
             hypre_BoxLoop4End(iP, iR, iA, iAc);
@@ -611,13 +617,13 @@ hypre_SMG3BuildRAPSym( hypre_StructMatrix *A,
 
             break;
 
-            /*--------------------------------------------------------------
-             * Loop for symmetric 15-point fine grid operator; produces a
-             * symmetric 15-point coarse grid operator. We calculate only the
-             * lower triangular stencil entries: (below-south, below-west,
-             * below-center, below-east, below-north, center-south,
-             * center-west, and center-center).
-             *--------------------------------------------------------------*/
+         /*--------------------------------------------------------------
+          * Loop for symmetric 15-point fine grid operator; produces a
+          * symmetric 15-point coarse grid operator. We calculate only the
+          * lower triangular stencil entries: (below-south, below-west,
+          * below-center, below-east, below-north, center-south,
+          * center-west, and center-center).
+          *--------------------------------------------------------------*/
 
          case 15:
 
@@ -635,54 +641,54 @@ hypre_SMG3BuildRAPSym( hypre_StructMatrix *A,
 
                HYPRE_Int iP1 = iP - zOffsetP - yOffsetP;
                rap_bs[iAc] = rb[iR] * a_cs[iAm1] * pa[iP1]
-                  +          rb[iR] * a_bs[iAm1]
-                  +                   a_bs[iA]   * pa[iP1];
+                             +          rb[iR] * a_bs[iAm1]
+                             +                   a_bs[iA]   * pa[iP1];
 
                iP1 = iP - zOffsetP - xOffsetP;
                rap_bw[iAc] = rb[iR] * a_cw[iAm1] * pa[iP1]
-                  +          rb[iR] * a_bw[iAm1]
-                  +                   a_bw[iA]   * pa[iP1];
+                             +          rb[iR] * a_bw[iAm1]
+                             +                   a_bw[iA]   * pa[iP1];
 
                iP1 = iP - zOffsetP;
                rap_bc[iAc] =          a_bc[iA]   * pa[iP1]
-                  +          rb[iR] * a_cc[iAm1] * pa[iP1]
-                  +          rb[iR] * a_bc[iAm1];
+                                      +          rb[iR] * a_cc[iAm1] * pa[iP1]
+                                      +          rb[iR] * a_bc[iAm1];
 
                iP1 = iP - zOffsetP + xOffsetP;
                rap_be[iAc] = rb[iR] * a_ce[iAm1] * pa[iP1]
-                  +          rb[iR] * a_be[iAm1]
-                  +                   a_be[iA]   * pa[iP1];
+                             +          rb[iR] * a_be[iAm1]
+                             +                   a_be[iA]   * pa[iP1];
 
                iP1 = iP - zOffsetP + yOffsetP;
                rap_bn[iAc] = rb[iR] * a_cn[iAm1] * pa[iP1]
-                  +          rb[iR] * a_bn[iAm1]
-                  +                   a_bn[iA]   * pa[iP1];
+                             +          rb[iR] * a_bn[iAm1]
+                             +                   a_bn[iA]   * pa[iP1];
 
                iP1 = iP - yOffsetP;
                rap_cs[iAc] =          a_cs[iA]
-                  +          rb[iR] * a_cs[iAm1] * pb[iP1]
-                  +          ra[iR] * a_cs[iAp1] * pa[iP1]
-                  +                   a_bs[iA]   * pb[iP1]
-                  +                   a_as[iA]   * pa[iP1]
-                  +          rb[iR] * a_as[iAm1]
-                  +          ra[iR] * a_bs[iAp1];
+                                      +          rb[iR] * a_cs[iAm1] * pb[iP1]
+                                      +          ra[iR] * a_cs[iAp1] * pa[iP1]
+                                      +                   a_bs[iA]   * pb[iP1]
+                                      +                   a_as[iA]   * pa[iP1]
+                                      +          rb[iR] * a_as[iAm1]
+                                      +          ra[iR] * a_bs[iAp1];
 
                iP1 = iP - xOffsetP;
                rap_cw[iAc] =          a_cw[iA]
-                  +          rb[iR] * a_cw[iAm1] * pb[iP1]
-                  +          ra[iR] * a_cw[iAp1] * pa[iP1]
-                  +                   a_bw[iA]   * pb[iP1]
-                  +                   a_aw[iA]   * pa[iP1]
-                  +          rb[iR] * a_aw[iAm1]
-                  +          ra[iR] * a_bw[iAp1];
+                                      +          rb[iR] * a_cw[iAm1] * pb[iP1]
+                                      +          ra[iR] * a_cw[iAp1] * pa[iP1]
+                                      +                   a_bw[iA]   * pb[iP1]
+                                      +                   a_aw[iA]   * pa[iP1]
+                                      +          rb[iR] * a_aw[iAm1]
+                                      +          ra[iR] * a_bw[iAp1];
 
                rap_cc[iAc] =          a_cc[iA]
-                  +          rb[iR] * a_cc[iAm1] * pb[iP]
-                  +          ra[iR] * a_cc[iAp1] * pa[iP]
-                  +          rb[iR] * a_ac[iAm1]
-                  +          ra[iR] * a_bc[iAp1]
-                  +                   a_bc[iA]   * pb[iP]
-                  +                   a_ac[iA]   * pa[iP];
+                                      +          rb[iR] * a_cc[iAm1] * pb[iP]
+                                      +          ra[iR] * a_cc[iAp1] * pa[iP]
+                                      +          rb[iR] * a_ac[iAm1]
+                                      +          ra[iR] * a_bc[iAp1]
+                                      +                   a_bc[iA]   * pb[iP]
+                                      +                   a_ac[iA]   * pa[iP];
 
             }
             hypre_BoxLoop4End(iP, iR, iA, iAc);
@@ -690,14 +696,14 @@ hypre_SMG3BuildRAPSym( hypre_StructMatrix *A,
 
             break;
 
-            /*--------------------------------------------------------------
-             * Loop for symmetric 19-point fine grid operator; produces a
-             * symmetric 27-point coarse grid operator. We calculate only the
-             * lower triangular stencil entries: (below-southwest, below-south,
-             * below-southeast, below-west, below-center, below-east,
-             * below-northwest, below-north, below-northeast, center-southwest,
-             * center-south, center-southeast, center-west, and center-center).
-             *--------------------------------------------------------------*/
+         /*--------------------------------------------------------------
+          * Loop for symmetric 19-point fine grid operator; produces a
+          * symmetric 27-point coarse grid operator. We calculate only the
+          * lower triangular stencil entries: (below-southwest, below-south,
+          * below-southeast, below-west, below-center, below-east,
+          * below-northwest, below-north, below-northeast, center-southwest,
+          * center-south, center-southeast, center-west, and center-center).
+          *--------------------------------------------------------------*/
 
          case 19:
 
@@ -718,73 +724,73 @@ hypre_SMG3BuildRAPSym( hypre_StructMatrix *A,
 
                iP1 = iP - zOffsetP - yOffsetP;
                rap_bs[iAc] = rb[iR] * a_cs[iAm1] * pa[iP1]
-                  +          rb[iR] * a_bs[iAm1]
-                  +                   a_bs[iA]   * pa[iP1];
+                             +          rb[iR] * a_bs[iAm1]
+                             +                   a_bs[iA]   * pa[iP1];
 
                iP1 = iP - zOffsetP - yOffsetP + xOffsetP;
                rap_bse[iAc] = rb[iR] * a_cse[iAm1] * pa[iP1];
 
                iP1 = iP - zOffsetP - xOffsetP;
                rap_bw[iAc] = rb[iR] * a_cw[iAm1] * pa[iP1]
-                  +          rb[iR] * a_bw[iAm1]
-                  +                   a_bw[iA]   * pa[iP1];
+                             +          rb[iR] * a_bw[iAm1]
+                             +                   a_bw[iA]   * pa[iP1];
 
                iP1 = iP - zOffsetP;
                rap_bc[iAc] =          a_bc[iA] * pa[iP1]
-                  +          rb[iR] * a_cc[iAm1] * pa[iP1]
-                  +          rb[iR] * a_bc[iAm1];
+                                      +          rb[iR] * a_cc[iAm1] * pa[iP1]
+                                      +          rb[iR] * a_bc[iAm1];
 
                iP1 = iP - zOffsetP + xOffsetP;
                rap_be[iAc] = rb[iR] * a_ce[iAm1] * pa[iP1]
-                  +          rb[iR] * a_be[iAm1]
-                  +                   a_be[iA]   * pa[iP1];
+                             +          rb[iR] * a_be[iAm1]
+                             +                   a_be[iA]   * pa[iP1];
 
                iP1 = iP - zOffsetP + yOffsetP - xOffsetP;
                rap_bnw[iAc] = rb[iR] * a_cnw[iAm1] * pa[iP1];
 
                iP1 = iP - zOffsetP + yOffsetP;
                rap_bn[iAc] = rb[iR] * a_cn[iAm1] * pa[iP1]
-                  +          rb[iR] * a_bn[iAm1]
-                  +                   a_bn[iA]   * pa[iP1];
+                             +          rb[iR] * a_bn[iAm1]
+                             +                   a_bn[iA]   * pa[iP1];
 
                iP1 = iP - zOffsetP + yOffsetP + xOffsetP;
                rap_bne[iAc] = rb[iR] * a_cne[iAm1] * pa[iP1];
 
                iP1 = iP - yOffsetP - xOffsetP;
                rap_csw[iAc] =         a_csw[iA]
-                  +          rb[iR] * a_csw[iAm1] * pb[iP1]
-                  +          ra[iR] * a_csw[iAp1] * pa[iP1];
+                                      +          rb[iR] * a_csw[iAm1] * pb[iP1]
+                                      +          ra[iR] * a_csw[iAp1] * pa[iP1];
 
                iP1 = iP - yOffsetP;
                rap_cs[iAc] =          a_cs[iA]
-                  +          rb[iR] * a_cs[iAm1] * pb[iP1]
-                  +          ra[iR] * a_cs[iAp1] * pa[iP1]
-                  +                   a_bs[iA]   * pb[iP1]
-                  +                   a_as[iA]   * pa[iP1]
-                  +          rb[iR] * a_as[iAm1]
-                  +          ra[iR] * a_bs[iAp1];
+                                      +          rb[iR] * a_cs[iAm1] * pb[iP1]
+                                      +          ra[iR] * a_cs[iAp1] * pa[iP1]
+                                      +                   a_bs[iA]   * pb[iP1]
+                                      +                   a_as[iA]   * pa[iP1]
+                                      +          rb[iR] * a_as[iAm1]
+                                      +          ra[iR] * a_bs[iAp1];
 
                iP1 = iP - yOffsetP + xOffsetP;
                rap_cse[iAc] =          a_cse[iA]
-                  +          rb[iR] * a_cse[iAm1] * pb[iP1]
-                  +          ra[iR] * a_cse[iAp1] * pa[iP1];
+                                       +          rb[iR] * a_cse[iAm1] * pb[iP1]
+                                       +          ra[iR] * a_cse[iAp1] * pa[iP1];
 
                iP1 = iP - xOffsetP;
                rap_cw[iAc] =          a_cw[iA]
-                  +          rb[iR] * a_cw[iAm1] * pb[iP1]
-                  +          ra[iR] * a_cw[iAp1] * pa[iP1]
-                  +                   a_bw[iA]   * pb[iP1]
-                  +                   a_aw[iA]   * pa[iP1]
-                  +          rb[iR] * a_aw[iAm1]
-                  +          ra[iR] * a_bw[iAp1];
+                                      +          rb[iR] * a_cw[iAm1] * pb[iP1]
+                                      +          ra[iR] * a_cw[iAp1] * pa[iP1]
+                                      +                   a_bw[iA]   * pb[iP1]
+                                      +                   a_aw[iA]   * pa[iP1]
+                                      +          rb[iR] * a_aw[iAm1]
+                                      +          ra[iR] * a_bw[iAp1];
 
                rap_cc[iAc] =          a_cc[iA]
-                  +          rb[iR] * a_cc[iAm1] * pb[iP]
-                  +          ra[iR] * a_cc[iAp1] * pa[iP]
-                  +          rb[iR] * a_ac[iAm1]
-                  +          ra[iR] * a_bc[iAp1]
-                  +                   a_bc[iA]   * pb[iP]
-                  +                   a_ac[iA]   * pa[iP];
+                                      +          rb[iR] * a_cc[iAm1] * pb[iP]
+                                      +          ra[iR] * a_cc[iAp1] * pa[iP]
+                                      +          rb[iR] * a_ac[iAm1]
+                                      +          ra[iR] * a_bc[iAp1]
+                                      +                   a_bc[iA]   * pb[iP]
+                                      +                   a_ac[iA]   * pa[iP];
 
             }
             hypre_BoxLoop4End(iP, iR, iA, iAc);
@@ -792,14 +798,14 @@ hypre_SMG3BuildRAPSym( hypre_StructMatrix *A,
 
             break;
 
-            /*--------------------------------------------------------------
-             * Loop for symmetric 27-point fine grid operator; produces a
-             * symmetric 27-point coarse grid operator. We calculate only the
-             * lower triangular stencil entries: (below-southwest, below-south,
-             * below-southeast, below-west, below-center, below-east,
-             * below-northwest, below-north, below-northeast, center-southwest,
-             * center-south, center-southeast, center-west, and center-center).
-             *--------------------------------------------------------------*/
+         /*--------------------------------------------------------------
+          * Loop for symmetric 27-point fine grid operator; produces a
+          * symmetric 27-point coarse grid operator. We calculate only the
+          * lower triangular stencil entries: (below-southwest, below-south,
+          * below-southeast, below-west, below-center, below-east,
+          * below-northwest, below-north, below-northeast, center-southwest,
+          * center-south, center-southeast, center-west, and center-center).
+          *--------------------------------------------------------------*/
 
          default:
 
@@ -817,92 +823,92 @@ hypre_SMG3BuildRAPSym( hypre_StructMatrix *A,
 
                HYPRE_Int iP1 = iP - zOffsetP - yOffsetP - xOffsetP;
                rap_bsw[iAc] = rb[iR] * a_csw[iAm1] * pa[iP1]
-                  +           rb[iR] * a_bsw[iAm1]
-                  +                    a_bsw[iA]   * pa[iP1];
+                              +           rb[iR] * a_bsw[iAm1]
+                              +                    a_bsw[iA]   * pa[iP1];
 
                iP1 = iP - zOffsetP - yOffsetP;
                rap_bs[iAc] = rb[iR] * a_cs[iAm1] * pa[iP1]
-                  +          rb[iR] * a_bs[iAm1]
-                  +                   a_bs[iA]   * pa[iP1];
+                             +          rb[iR] * a_bs[iAm1]
+                             +                   a_bs[iA]   * pa[iP1];
 
                iP1 = iP - zOffsetP - yOffsetP + xOffsetP;
                rap_bse[iAc] = rb[iR] * a_cse[iAm1] * pa[iP1]
-                  +           rb[iR] * a_bse[iAm1]
-                  +                    a_bse[iA]   * pa[iP1];
+                              +           rb[iR] * a_bse[iAm1]
+                              +                    a_bse[iA]   * pa[iP1];
 
                iP1 = iP - zOffsetP - xOffsetP;
                rap_bw[iAc] = rb[iR] * a_cw[iAm1] * pa[iP1]
-                  +          rb[iR] * a_bw[iAm1]
-                  +                   a_bw[iA]   * pa[iP1];
+                             +          rb[iR] * a_bw[iAm1]
+                             +                   a_bw[iA]   * pa[iP1];
 
                iP1 = iP - zOffsetP;
                rap_bc[iAc] =          a_bc[iA] * pa[iP1]
-                  +          rb[iR] * a_cc[iAm1] * pa[iP1]
-                  +          rb[iR] * a_bc[iAm1];
+                                      +          rb[iR] * a_cc[iAm1] * pa[iP1]
+                                      +          rb[iR] * a_bc[iAm1];
 
                iP1 = iP - zOffsetP + xOffsetP;
                rap_be[iAc] = rb[iR] * a_ce[iAm1] * pa[iP1]
-                  +          rb[iR] * a_be[iAm1]
-                  +                   a_be[iA]   * pa[iP1];
+                             +          rb[iR] * a_be[iAm1]
+                             +                   a_be[iA]   * pa[iP1];
 
                iP1 = iP - zOffsetP + yOffsetP - xOffsetP;
                rap_bnw[iAc] = rb[iR] * a_cnw[iAm1] * pa[iP1]
-                  +           rb[iR] * a_bnw[iAm1]
-                  +                    a_bnw[iA]   * pa[iP1];
+                              +           rb[iR] * a_bnw[iAm1]
+                              +                    a_bnw[iA]   * pa[iP1];
 
                iP1 = iP - zOffsetP + yOffsetP;
                rap_bn[iAc] = rb[iR] * a_cn[iAm1] * pa[iP1]
-                  +          rb[iR] * a_bn[iAm1]
-                  +                   a_bn[iA]   * pa[iP1];
+                             +          rb[iR] * a_bn[iAm1]
+                             +                   a_bn[iA]   * pa[iP1];
 
                iP1 = iP - zOffsetP + yOffsetP + xOffsetP;
                rap_bne[iAc] = rb[iR] * a_cne[iAm1] * pa[iP1]
-                  +           rb[iR] * a_bne[iAm1]
-                  +                    a_bne[iA]   * pa[iP1];
+                              +           rb[iR] * a_bne[iAm1]
+                              +                    a_bne[iA]   * pa[iP1];
 
                iP1 = iP - yOffsetP - xOffsetP;
                rap_csw[iAc] =          a_csw[iA]
-                  +          rb[iR] * a_csw[iAm1] * pb[iP1]
-                  +          ra[iR] * a_csw[iAp1] * pa[iP1]
-                  +                   a_bsw[iA]   * pb[iP1]
-                  +                   a_asw[iA]   * pa[iP1]
-                  +          rb[iR] * a_asw[iAm1]
-                  +          ra[iR] * a_bsw[iAp1];
+                                       +          rb[iR] * a_csw[iAm1] * pb[iP1]
+                                       +          ra[iR] * a_csw[iAp1] * pa[iP1]
+                                       +                   a_bsw[iA]   * pb[iP1]
+                                       +                   a_asw[iA]   * pa[iP1]
+                                       +          rb[iR] * a_asw[iAm1]
+                                       +          ra[iR] * a_bsw[iAp1];
 
                iP1 = iP - yOffsetP;
                rap_cs[iAc] =          a_cs[iA]
-                  +          rb[iR] * a_cs[iAm1] * pb[iP1]
-                  +          ra[iR] * a_cs[iAp1] * pa[iP1]
-                  +                   a_bs[iA]   * pb[iP1]
-                  +                   a_as[iA]   * pa[iP1]
-                  +          rb[iR] * a_as[iAm1]
-                  +          ra[iR] * a_bs[iAp1];
+                                      +          rb[iR] * a_cs[iAm1] * pb[iP1]
+                                      +          ra[iR] * a_cs[iAp1] * pa[iP1]
+                                      +                   a_bs[iA]   * pb[iP1]
+                                      +                   a_as[iA]   * pa[iP1]
+                                      +          rb[iR] * a_as[iAm1]
+                                      +          ra[iR] * a_bs[iAp1];
 
                iP1 = iP - yOffsetP + xOffsetP;
                rap_cse[iAc] =          a_cse[iA]
-                  +          rb[iR] * a_cse[iAm1] * pb[iP1]
-                  +          ra[iR] * a_cse[iAp1] * pa[iP1]
-                  +                   a_bse[iA]   * pb[iP1]
-                  +                   a_ase[iA]   * pa[iP1]
-                  +          rb[iR] * a_ase[iAm1]
-                  +          ra[iR] * a_bse[iAp1];
+                                       +          rb[iR] * a_cse[iAm1] * pb[iP1]
+                                       +          ra[iR] * a_cse[iAp1] * pa[iP1]
+                                       +                   a_bse[iA]   * pb[iP1]
+                                       +                   a_ase[iA]   * pa[iP1]
+                                       +          rb[iR] * a_ase[iAm1]
+                                       +          ra[iR] * a_bse[iAp1];
 
                iP1 = iP - xOffsetP;
                rap_cw[iAc] =          a_cw[iA]
-                  +          rb[iR] * a_cw[iAm1] * pb[iP1]
-                  +          ra[iR] * a_cw[iAp1] * pa[iP1]
-                  +                   a_bw[iA]   * pb[iP1]
-                  +                   a_aw[iA]   * pa[iP1]
-                  +          rb[iR] * a_aw[iAm1]
-                  +          ra[iR] * a_bw[iAp1];
+                                      +          rb[iR] * a_cw[iAm1] * pb[iP1]
+                                      +          ra[iR] * a_cw[iAp1] * pa[iP1]
+                                      +                   a_bw[iA]   * pb[iP1]
+                                      +                   a_aw[iA]   * pa[iP1]
+                                      +          rb[iR] * a_aw[iAm1]
+                                      +          ra[iR] * a_bw[iAp1];
 
                rap_cc[iAc] =          a_cc[iA]
-                  +          rb[iR] * a_cc[iAm1] * pb[iP]
-                  +          ra[iR] * a_cc[iAp1] * pa[iP]
-                  +          rb[iR] * a_ac[iAm1]
-                  +          ra[iR] * a_bc[iAp1]
-                  +                   a_bc[iA]   * pb[iP]
-                  +                   a_ac[iA]   * pa[iP];
+                                      +          rb[iR] * a_cc[iAm1] * pb[iP]
+                                      +          ra[iR] * a_cc[iAp1] * pa[iP]
+                                      +          rb[iR] * a_ac[iAm1]
+                                      +          ra[iR] * a_bc[iAp1]
+                                      +                   a_bc[iA]   * pb[iP]
+                                      +                   a_ac[iA]   * pa[iP];
 
             }
             hypre_BoxLoop4End(iP, iR, iA, iAc);
@@ -958,16 +964,20 @@ hypre_SMG3BuildRAPNoSym( hypre_StructMatrix *A,
    HYPRE_Real           *ra, *rb;
 
    HYPRE_Real           *a_cc, *a_cw, *a_ce, *a_cs, *a_cn;
-   HYPRE_Real           *a_ac, *a_aw, *a_ae, *a_as, *a_an;
-   HYPRE_Real           *a_be, *a_bn;
-   HYPRE_Real           *a_csw, *a_cse, *a_cnw, *a_cne;
-   HYPRE_Real           *a_asw, *a_ase, *a_anw, *a_ane;
-   HYPRE_Real           *a_bnw, *a_bne;
+   HYPRE_Real           *a_ac, *a_aw = NULL, *a_ae = NULL;
+   HYPRE_Real           *a_as  = NULL, *a_an  = NULL;
+   HYPRE_Real           *a_be  = NULL, *a_bn  = NULL;
+   HYPRE_Real           *a_csw = NULL, *a_cse = NULL;
+   HYPRE_Real           *a_cnw = NULL, *a_cne = NULL;
+   HYPRE_Real           *a_asw = NULL, *a_ase = NULL;
+   HYPRE_Real           *a_anw = NULL, *a_ane = NULL;
+   HYPRE_Real           *a_bnw = NULL, *a_bne = NULL;
 
    HYPRE_Real           *rap_ce, *rap_cn;
    HYPRE_Real           *rap_ac, *rap_aw, *rap_ae, *rap_as, *rap_an;
-   HYPRE_Real           *rap_cnw, *rap_cne;
-   HYPRE_Real           *rap_asw, *rap_ase, *rap_anw, *rap_ane;
+   HYPRE_Real           *rap_cnw = NULL, *rap_cne = NULL;
+   HYPRE_Real           *rap_asw = NULL, *rap_ase = NULL;
+   HYPRE_Real           *rap_anw = NULL, *rap_ane = NULL;
 
    HYPRE_Int            zOffsetA;
    HYPRE_Int            xOffsetP;
@@ -1011,10 +1021,10 @@ hypre_SMG3BuildRAPNoSym( hypre_StructMatrix *A,
        * pb is pointer for weight for f-point below c-point
        *-----------------------------------------------------------------*/
 
-      hypre_SetIndex3(index,0,0,1);
+      hypre_SetIndex3(index, 0, 0, 1);
       pa = hypre_StructMatrixExtractPointerByIndex(PT, fi, index);
 
-      hypre_SetIndex3(index,0,0,-1);
+      hypre_SetIndex3(index, 0, 0, -1);
       pb = hypre_StructMatrixExtractPointerByIndex(PT, fi, index);
 
 
@@ -1024,10 +1034,10 @@ hypre_SMG3BuildRAPNoSym( hypre_StructMatrix *A,
        * rb is pointer for weight for f-point below c-point
        *-----------------------------------------------------------------*/
 
-      hypre_SetIndex3(index,0,0,1);
+      hypre_SetIndex3(index, 0, 0, 1);
       ra = hypre_StructMatrixExtractPointerByIndex(R, fi, index);
 
-      hypre_SetIndex3(index,0,0,-1);
+      hypre_SetIndex3(index, 0, 0, -1);
       rb = hypre_StructMatrixExtractPointerByIndex(R, fi, index);
 
 
@@ -1043,22 +1053,22 @@ hypre_SMG3BuildRAPNoSym( hypre_StructMatrix *A,
        * a_bc is pointer for center coefficient in plane below
        *-----------------------------------------------------------------*/
 
-      hypre_SetIndex3(index,0,0,0);
+      hypre_SetIndex3(index, 0, 0, 0);
       a_cc = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-      hypre_SetIndex3(index,-1,0,0);
+      hypre_SetIndex3(index, -1, 0, 0);
       a_cw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-      hypre_SetIndex3(index,1,0,0);
+      hypre_SetIndex3(index, 1, 0, 0);
       a_ce = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-      hypre_SetIndex3(index,0,-1,0);
+      hypre_SetIndex3(index, 0, -1, 0);
       a_cs = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-      hypre_SetIndex3(index,0,1,0);
+      hypre_SetIndex3(index, 0, 1, 0);
       a_cn = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-      hypre_SetIndex3(index,0,0,1);
+      hypre_SetIndex3(index, 0, 0, 1);
       a_ac = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
       /*-----------------------------------------------------------------
@@ -1074,26 +1084,25 @@ hypre_SMG3BuildRAPNoSym( hypre_StructMatrix *A,
        * a_bn is pointer for north coefficient in plane below
        *-----------------------------------------------------------------*/
 
-      if(fine_stencil_size > 7)
+      if (fine_stencil_size > 7)
       {
-         hypre_SetIndex3(index,-1,0,1);
+         hypre_SetIndex3(index, -1, 0, 1);
          a_aw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index,1,0,1);
+         hypre_SetIndex3(index, 1, 0, 1);
          a_ae = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index,0,-1,1);
+         hypre_SetIndex3(index, 0, -1, 1);
          a_as = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index,0,1,1);
+         hypre_SetIndex3(index, 0, 1, 1);
          a_an = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index,1,0,-1);
+         hypre_SetIndex3(index, 1, 0, -1);
          a_be = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index,0,1,-1);
+         hypre_SetIndex3(index, 0, 1, -1);
          a_bn = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
-
       }
 
       /*-----------------------------------------------------------------
@@ -1105,20 +1114,19 @@ hypre_SMG3BuildRAPNoSym( hypre_StructMatrix *A,
        * a_cne is pointer for northeast coefficient in same plane
        *-----------------------------------------------------------------*/
 
-      if(fine_stencil_size > 15)
+      if (fine_stencil_size > 15)
       {
-         hypre_SetIndex3(index,-1,-1,0);
+         hypre_SetIndex3(index, -1, -1, 0);
          a_csw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index,1,-1,0);
+         hypre_SetIndex3(index, 1, -1, 0);
          a_cse = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index,-1,1,0);
+         hypre_SetIndex3(index, -1, 1, 0);
          a_cnw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index,1,1,0);
+         hypre_SetIndex3(index, 1, 1, 0);
          a_cne = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
-
       }
 
       /*-----------------------------------------------------------------
@@ -1134,26 +1142,25 @@ hypre_SMG3BuildRAPNoSym( hypre_StructMatrix *A,
        * a_bne is pointer for northeast coefficient in plane below
        *-----------------------------------------------------------------*/
 
-      if(fine_stencil_size > 19)
+      if (fine_stencil_size > 19)
       {
-         hypre_SetIndex3(index,-1,-1,1);
+         hypre_SetIndex3(index, -1, -1, 1);
          a_asw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index,1,-1,1);
+         hypre_SetIndex3(index, 1, -1, 1);
          a_ase = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index,-1,1,1);
+         hypre_SetIndex3(index, -1, 1, 1);
          a_anw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index,1,1,1);
+         hypre_SetIndex3(index, 1, 1, 1);
          a_ane = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index,-1,1,-1);
+         hypre_SetIndex3(index, -1, 1, -1);
          a_bnw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index,1,1,-1);
+         hypre_SetIndex3(index, 1, 1, -1);
          a_bne = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
-
       }
 
       /*-----------------------------------------------------------------
@@ -1164,25 +1171,25 @@ hypre_SMG3BuildRAPNoSym( hypre_StructMatrix *A,
        * rap_ce is pointer for east coefficient in same plane (etc.)
        *-----------------------------------------------------------------*/
 
-      hypre_SetIndex3(index,1,0,0);
+      hypre_SetIndex3(index, 1, 0, 0);
       rap_ce = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-      hypre_SetIndex3(index,0,1,0);
+      hypre_SetIndex3(index, 0, 1, 0);
       rap_cn = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-      hypre_SetIndex3(index,0,0,1);
+      hypre_SetIndex3(index, 0, 0, 1);
       rap_ac = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-      hypre_SetIndex3(index,-1,0,1);
+      hypre_SetIndex3(index, -1, 0, 1);
       rap_aw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-      hypre_SetIndex3(index,1,0,1);
+      hypre_SetIndex3(index, 1, 0, 1);
       rap_ae = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-      hypre_SetIndex3(index,0,-1,1);
+      hypre_SetIndex3(index, 0, -1, 1);
       rap_as = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-      hypre_SetIndex3(index,0,1,1);
+      hypre_SetIndex3(index, 0, 1, 1);
       rap_an = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
       /*-----------------------------------------------------------------
@@ -1196,29 +1203,29 @@ hypre_SMG3BuildRAPNoSym( hypre_StructMatrix *A,
        * rap_cnw is pointer for northwest coefficient in same plane (etc.)
        *-----------------------------------------------------------------*/
 
-      if(fine_stencil_size > 15)
+      if (fine_stencil_size > 15)
       {
-         hypre_SetIndex3(index,-1,1,0);
+         hypre_SetIndex3(index, -1, 1, 0);
          rap_cnw =
             hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-         hypre_SetIndex3(index,1,1,0);
+         hypre_SetIndex3(index, 1, 1, 0);
          rap_cne =
             hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-         hypre_SetIndex3(index,-1,-1,1);
+         hypre_SetIndex3(index, -1, -1, 1);
          rap_asw =
             hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-         hypre_SetIndex3(index,1,-1,1);
+         hypre_SetIndex3(index, 1, -1, 1);
          rap_ase =
             hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-         hypre_SetIndex3(index,-1,1,1);
+         hypre_SetIndex3(index, -1, 1, 1);
          rap_anw =
             hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-         hypre_SetIndex3(index,1,1,1);
+         hypre_SetIndex3(index, 1, 1, 1);
          rap_ane =
             hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
@@ -1232,13 +1239,13 @@ hypre_SMG3BuildRAPNoSym( hypre_StructMatrix *A,
        * Offsets are used in refering to data associated with other points.
        *-----------------------------------------------------------------*/
 
-      hypre_SetIndex3(index,0,0,1);
-      zOffsetA = hypre_BoxOffsetDistance(A_dbox,index);
-      zOffsetP = hypre_BoxOffsetDistance(PT_dbox,index);
-      hypre_SetIndex3(index,0,1,0);
-      yOffsetP = hypre_BoxOffsetDistance(PT_dbox,index);
-      hypre_SetIndex3(index,1,0,0);
-      xOffsetP = hypre_BoxOffsetDistance(PT_dbox,index);
+      hypre_SetIndex3(index, 0, 0, 1);
+      zOffsetA = hypre_BoxOffsetDistance(A_dbox, index);
+      zOffsetP = hypre_BoxOffsetDistance(PT_dbox, index);
+      hypre_SetIndex3(index, 0, 1, 0);
+      yOffsetP = hypre_BoxOffsetDistance(PT_dbox, index);
+      hypre_SetIndex3(index, 1, 0, 0);
+      xOffsetP = hypre_BoxOffsetDistance(PT_dbox, index);
 
       /*-----------------------------------------------------------------
        * Switch statement to direct control to apropriate BoxLoop depending
@@ -1277,8 +1284,8 @@ hypre_SMG3BuildRAPNoSym( hypre_StructMatrix *A,
 
                iP1 = iP + zOffsetP;
                rap_ac[iAc] =          a_ac[iA]   * pb[iP1]
-                  +          ra[iR] * a_cc[iAp1] * pb[iP1]
-                  +          ra[iR] * a_ac[iAp1];
+                                      +          ra[iR] * a_cc[iAp1] * pb[iP1]
+                                      +          ra[iR] * a_ac[iAp1];
 
                iP1 = iP + zOffsetP - xOffsetP;
                rap_aw[iAc] = ra[iR] * a_cw[iAp1] * pb[iP1];
@@ -1288,13 +1295,13 @@ hypre_SMG3BuildRAPNoSym( hypre_StructMatrix *A,
 
                iP1 = iP + yOffsetP;
                rap_cn[iAc] =          a_cn[iA]
-                  +          rb[iR] * a_cn[iAm1] * pb[iP1]
-                  +          ra[iR] * a_cn[iAp1] * pa[iP1];
+                                      +          rb[iR] * a_cn[iAm1] * pb[iP1]
+                                      +          ra[iR] * a_cn[iAp1] * pa[iP1];
 
                iP1 = iP + xOffsetP;
                rap_ce[iAc] =          a_ce[iA]
-                  +          rb[iR] * a_ce[iAm1] * pb[iP1]
-                  +          ra[iR] * a_ce[iAp1] * pa[iP1];
+                                      +          rb[iR] * a_ce[iAm1] * pb[iP1]
+                                      +          ra[iR] * a_ce[iAp1] * pa[iP1];
 
             }
             hypre_BoxLoop4End(iP, iR, iA, iAc);
@@ -1302,12 +1309,12 @@ hypre_SMG3BuildRAPNoSym( hypre_StructMatrix *A,
 
             break;
 
-            /*--------------------------------------------------------------
-             * Loop for 15-point fine grid operator; produces upper triangular
-             * part of 15-point coarse grid operator. stencil entries:
-             * (above-north, above-east, above-center, above-west,
-             * above-south, center-north, and center-east).
-             *--------------------------------------------------------------*/
+         /*--------------------------------------------------------------
+          * Loop for 15-point fine grid operator; produces upper triangular
+          * part of 15-point coarse grid operator. stencil entries:
+          * (above-north, above-east, above-center, above-west,
+          * above-south, center-north, and center-east).
+          *--------------------------------------------------------------*/
 
          case 15:
 
@@ -1325,46 +1332,46 @@ hypre_SMG3BuildRAPNoSym( hypre_StructMatrix *A,
 
                HYPRE_Int iP1 = iP + zOffsetP + yOffsetP;
                rap_an[iAc] = ra[iR] * a_cn[iAp1] * pb[iP1]
-                  +          ra[iR] * a_an[iAp1]
-                  +                   a_an[iA]   * pb[iP1];
+                             +          ra[iR] * a_an[iAp1]
+                             +                   a_an[iA]   * pb[iP1];
 
                iP1 = iP + zOffsetP + xOffsetP;
                rap_ae[iAc] = ra[iR] * a_ce[iAp1] * pb[iP1]
-                  +          ra[iR] * a_ae[iAp1]
-                  +                   a_ae[iA]   * pb[iP1];
+                             +          ra[iR] * a_ae[iAp1]
+                             +                   a_ae[iA]   * pb[iP1];
 
                iP1 = iP + zOffsetP;
                rap_ac[iAc] =          a_ac[iA]   * pb[iP1]
-                  +          ra[iR] * a_cc[iAp1] * pb[iP1]
-                  +          ra[iR] * a_ac[iAp1];
+                                      +          ra[iR] * a_cc[iAp1] * pb[iP1]
+                                      +          ra[iR] * a_ac[iAp1];
 
                iP1 = iP + zOffsetP - xOffsetP;
                rap_aw[iAc] = ra[iR] * a_cw[iAp1] * pb[iP1]
-                  +          ra[iR] * a_aw[iAp1]
-                  +                   a_aw[iA]   * pb[iP1];
+                             +          ra[iR] * a_aw[iAp1]
+                             +                   a_aw[iA]   * pb[iP1];
 
                iP1 = iP + zOffsetP - yOffsetP;
                rap_as[iAc] = ra[iR] * a_cs[iAp1] * pb[iP1]
-                  +          ra[iR] * a_as[iAp1]
-                  +                   a_as[iA]   * pb[iP1];
+                             +          ra[iR] * a_as[iAp1]
+                             +                   a_as[iA]   * pb[iP1];
 
                iP1 = iP + yOffsetP;
                rap_cn[iAc] =          a_cn[iA]
-                  +          rb[iR] * a_cn[iAm1] * pb[iP1]
-                  +          ra[iR] * a_cn[iAp1] * pa[iP1]
-                  +                   a_bn[iA]   * pb[iP1]
-                  +                   a_an[iA]   * pa[iP1]
-                  +          rb[iR] * a_an[iAm1]
-                  +          ra[iR] * a_bn[iAp1];
+                                      +          rb[iR] * a_cn[iAm1] * pb[iP1]
+                                      +          ra[iR] * a_cn[iAp1] * pa[iP1]
+                                      +                   a_bn[iA]   * pb[iP1]
+                                      +                   a_an[iA]   * pa[iP1]
+                                      +          rb[iR] * a_an[iAm1]
+                                      +          ra[iR] * a_bn[iAp1];
 
                iP1 = iP + xOffsetP;
                rap_ce[iAc] =          a_ce[iA]
-                  +          rb[iR] * a_ce[iAm1] * pb[iP1]
-                  +          ra[iR] * a_ce[iAp1] * pa[iP1]
-                  +                   a_be[iA]   * pb[iP1]
-                  +                   a_ae[iA]   * pa[iP1]
-                  +          rb[iR] * a_ae[iAm1]
-                  +          ra[iR] * a_be[iAp1];
+                                      +          rb[iR] * a_ce[iAm1] * pb[iP1]
+                                      +          ra[iR] * a_ce[iAp1] * pa[iP1]
+                                      +                   a_be[iA]   * pb[iP1]
+                                      +                   a_ae[iA]   * pa[iP1]
+                                      +          rb[iR] * a_ae[iAm1]
+                                      +          ra[iR] * a_be[iAp1];
 
             }
             hypre_BoxLoop4End(iP, iR, iA, iAc);
@@ -1373,14 +1380,14 @@ hypre_SMG3BuildRAPNoSym( hypre_StructMatrix *A,
             break;
 
 
-            /*--------------------------------------------------------------
-             * Loop for 19-point fine grid operator; produces upper triangular
-             * part of 27-point coarse grid operator. stencil entries:
-             * (above-northeast, above-north, above-northwest, above-east,
-             * above-center, above-west, above-southeast, above-south,
-             * above-southwest, center-northeast, center-north,
-             * center-northwest, and center-east).
-             *--------------------------------------------------------------*/
+         /*--------------------------------------------------------------
+          * Loop for 19-point fine grid operator; produces upper triangular
+          * part of 27-point coarse grid operator. stencil entries:
+          * (above-northeast, above-north, above-northwest, above-east,
+          * above-center, above-west, above-southeast, above-south,
+          * above-southwest, center-northeast, center-north,
+          * center-northwest, and center-east).
+          *--------------------------------------------------------------*/
 
          case 19:
 
@@ -1401,65 +1408,65 @@ hypre_SMG3BuildRAPNoSym( hypre_StructMatrix *A,
 
                iP1 = iP + zOffsetP + yOffsetP;
                rap_an[iAc] = ra[iR] * a_cn[iAp1] * pb[iP1]
-                  +          ra[iR] * a_an[iAp1]
-                  +                   a_an[iA]   * pb[iP1];
+                             +          ra[iR] * a_an[iAp1]
+                             +                   a_an[iA]   * pb[iP1];
 
                iP1 = iP + zOffsetP + yOffsetP - xOffsetP;
                rap_anw[iAc] = ra[iR] * a_cnw[iAp1] * pb[iP1];
 
                iP1 = iP + zOffsetP + xOffsetP;
                rap_ae[iAc] = ra[iR] * a_ce[iAp1] * pb[iP1]
-                  +          ra[iR] * a_ae[iAp1]
-                  +                   a_ae[iA]   * pb[iP1];
+                             +          ra[iR] * a_ae[iAp1]
+                             +                   a_ae[iA]   * pb[iP1];
 
                iP1 = iP + zOffsetP;
                rap_ac[iAc] =          a_ac[iA]   * pb[iP1]
-                  +          ra[iR] * a_cc[iAp1] * pb[iP1]
-                  +          ra[iR] * a_ac[iAp1];
+                                      +          ra[iR] * a_cc[iAp1] * pb[iP1]
+                                      +          ra[iR] * a_ac[iAp1];
 
                iP1 = iP + zOffsetP - xOffsetP;
                rap_aw[iAc] = ra[iR] * a_cw[iAp1] * pb[iP1]
-                  +          ra[iR] * a_aw[iAp1]
-                  +                   a_aw[iA]   * pb[iP1];
+                             +          ra[iR] * a_aw[iAp1]
+                             +                   a_aw[iA]   * pb[iP1];
 
                iP1 = iP + zOffsetP - yOffsetP + xOffsetP;
                rap_ase[iAc] = ra[iR] * a_cse[iAp1] * pb[iP1];
 
                iP1 = iP + zOffsetP - yOffsetP;
                rap_as[iAc] = ra[iR] * a_cs[iAp1] * pb[iP1]
-                  +          ra[iR] * a_as[iAp1]
-                  +                   a_as[iA]   * pb[iP1];
+                             +          ra[iR] * a_as[iAp1]
+                             +                   a_as[iA]   * pb[iP1];
 
                iP1 = iP + zOffsetP - yOffsetP - xOffsetP;
                rap_asw[iAc] = ra[iR] * a_csw[iAp1] * pb[iP1];
 
                iP1 = iP + yOffsetP + xOffsetP;
                rap_cne[iAc] =         a_cne[iA]
-                  +          rb[iR] * a_cne[iAm1] * pb[iP1]
-                  +          ra[iR] * a_cne[iAp1] * pa[iP1];
+                                      +          rb[iR] * a_cne[iAm1] * pb[iP1]
+                                      +          ra[iR] * a_cne[iAp1] * pa[iP1];
 
                iP1 = iP + yOffsetP;
                rap_cn[iAc] =          a_cn[iA]
-                  +          rb[iR] * a_cn[iAm1] * pb[iP1]
-                  +          ra[iR] * a_cn[iAp1] * pa[iP1]
-                  +                   a_bn[iA]   * pb[iP1]
-                  +                   a_an[iA]   * pa[iP1]
-                  +          rb[iR] * a_an[iAm1]
-                  +          ra[iR] * a_bn[iAp1];
+                                      +          rb[iR] * a_cn[iAm1] * pb[iP1]
+                                      +          ra[iR] * a_cn[iAp1] * pa[iP1]
+                                      +                   a_bn[iA]   * pb[iP1]
+                                      +                   a_an[iA]   * pa[iP1]
+                                      +          rb[iR] * a_an[iAm1]
+                                      +          ra[iR] * a_bn[iAp1];
 
                iP1 = iP + yOffsetP - xOffsetP;
                rap_cnw[iAc] =         a_cnw[iA]
-                  +          rb[iR] * a_cnw[iAm1] * pb[iP1]
-                  +          ra[iR] * a_cnw[iAp1] * pa[iP1];
+                                      +          rb[iR] * a_cnw[iAm1] * pb[iP1]
+                                      +          ra[iR] * a_cnw[iAp1] * pa[iP1];
 
                iP1 = iP + xOffsetP;
                rap_ce[iAc] =          a_ce[iA]
-                  +          rb[iR] * a_ce[iAm1] * pb[iP1]
-                  +          ra[iR] * a_ce[iAp1] * pa[iP1]
-                  +                   a_be[iA]   * pb[iP1]
-                  +                   a_ae[iA]   * pa[iP1]
-                  +          rb[iR] * a_ae[iAm1]
-                  +          ra[iR] * a_be[iAp1];
+                                      +          rb[iR] * a_ce[iAm1] * pb[iP1]
+                                      +          ra[iR] * a_ce[iAp1] * pa[iP1]
+                                      +                   a_be[iA]   * pb[iP1]
+                                      +                   a_ae[iA]   * pa[iP1]
+                                      +          rb[iR] * a_ae[iAm1]
+                                      +          ra[iR] * a_be[iAp1];
 
             }
             hypre_BoxLoop4End(iP, iR, iA, iAc);
@@ -1467,14 +1474,14 @@ hypre_SMG3BuildRAPNoSym( hypre_StructMatrix *A,
 
             break;
 
-            /*--------------------------------------------------------------
-             * Loop for 27-point fine grid operator; produces upper triangular
-             * part of 27-point coarse grid operator. stencil entries:
-             * (above-northeast, above-north, above-northwest, above-east,
-             * above-center, above-west, above-southeast, above-south,
-             * above-southwest, center-northeast, center-north,
-             * center-northwest, and center-east).
-             *--------------------------------------------------------------*/
+         /*--------------------------------------------------------------
+          * Loop for 27-point fine grid operator; produces upper triangular
+          * part of 27-point coarse grid operator. stencil entries:
+          * (above-northeast, above-north, above-northwest, above-east,
+          * above-center, above-west, above-southeast, above-south,
+          * above-southwest, center-northeast, center-north,
+          * center-northwest, and center-east).
+          *--------------------------------------------------------------*/
 
          default:
 
@@ -1492,85 +1499,85 @@ hypre_SMG3BuildRAPNoSym( hypre_StructMatrix *A,
 
                HYPRE_Int iP1 = iP + zOffsetP + yOffsetP + xOffsetP;
                rap_ane[iAc] = ra[iR] * a_cne[iAp1] * pb[iP1]
-                  +           ra[iR] * a_ane[iAp1]
-                  +                    a_ane[iA]   * pb[iP1];
+                              +           ra[iR] * a_ane[iAp1]
+                              +                    a_ane[iA]   * pb[iP1];
 
                iP1 = iP + zOffsetP + yOffsetP;
                rap_an[iAc] = ra[iR] * a_cn[iAp1] * pb[iP1]
-                  +          ra[iR] * a_an[iAp1]
-                  +                   a_an[iA]   * pb[iP1];
+                             +          ra[iR] * a_an[iAp1]
+                             +                   a_an[iA]   * pb[iP1];
 
                iP1 = iP + zOffsetP + yOffsetP - xOffsetP;
                rap_anw[iAc] = ra[iR] * a_cnw[iAp1] * pb[iP1]
-                  +           ra[iR] * a_anw[iAp1]
-                  +                    a_anw[iA]   * pb[iP1];
+                              +           ra[iR] * a_anw[iAp1]
+                              +                    a_anw[iA]   * pb[iP1];
 
                iP1 = iP + zOffsetP + xOffsetP;
                rap_ae[iAc] = ra[iR] * a_ce[iAp1] * pb[iP1]
-                  +          ra[iR] * a_ae[iAp1]
-                  +                   a_ae[iA]   * pb[iP1];
+                             +          ra[iR] * a_ae[iAp1]
+                             +                   a_ae[iA]   * pb[iP1];
 
                iP1 = iP + zOffsetP;
                rap_ac[iAc] =          a_ac[iA]   * pb[iP1]
-                  +          ra[iR] * a_cc[iAp1] * pb[iP1]
-                  +          ra[iR] * a_ac[iAp1];
+                                      +          ra[iR] * a_cc[iAp1] * pb[iP1]
+                                      +          ra[iR] * a_ac[iAp1];
 
                iP1 = iP + zOffsetP - xOffsetP;
                rap_aw[iAc] = ra[iR] * a_cw[iAp1] * pb[iP1]
-                  +          ra[iR] * a_aw[iAp1]
-                  +                   a_aw[iA]   * pb[iP1];
+                             +          ra[iR] * a_aw[iAp1]
+                             +                   a_aw[iA]   * pb[iP1];
 
                iP1 = iP + zOffsetP - yOffsetP + xOffsetP;
                rap_ase[iAc] = ra[iR] * a_cse[iAp1] * pb[iP1]
-                  +           ra[iR] * a_ase[iAp1]
-                  +                    a_ase[iA]   * pb[iP1];
+                              +           ra[iR] * a_ase[iAp1]
+                              +                    a_ase[iA]   * pb[iP1];
 
                iP1 = iP + zOffsetP - yOffsetP;
                rap_as[iAc] = ra[iR] * a_cs[iAp1] * pb[iP1]
-                  +          ra[iR] * a_as[iAp1]
-                  +                   a_as[iA]   * pb[iP1];
+                             +          ra[iR] * a_as[iAp1]
+                             +                   a_as[iA]   * pb[iP1];
 
                iP1 = iP + zOffsetP - yOffsetP - xOffsetP;
                rap_asw[iAc] = ra[iR] * a_csw[iAp1] * pb[iP1]
-                  +           ra[iR] * a_asw[iAp1]
-                  +                    a_asw[iA]   * pb[iP1];
+                              +           ra[iR] * a_asw[iAp1]
+                              +                    a_asw[iA]   * pb[iP1];
 
 
                iP1 = iP + yOffsetP + xOffsetP;
                rap_cne[iAc] =         a_cne[iA]
-                  +          rb[iR] * a_cne[iAm1] * pb[iP1]
-                  +          ra[iR] * a_cne[iAp1] * pa[iP1]
-                  +                   a_bne[iA]   * pb[iP1]
-                  +                   a_ane[iA]   * pa[iP1]
-                  +          rb[iR] * a_ane[iAm1]
-                  +          ra[iR] * a_bne[iAp1];
+                                      +          rb[iR] * a_cne[iAm1] * pb[iP1]
+                                      +          ra[iR] * a_cne[iAp1] * pa[iP1]
+                                      +                   a_bne[iA]   * pb[iP1]
+                                      +                   a_ane[iA]   * pa[iP1]
+                                      +          rb[iR] * a_ane[iAm1]
+                                      +          ra[iR] * a_bne[iAp1];
 
                iP1 = iP + yOffsetP;
                rap_cn[iAc] =          a_cn[iA]
-                  +          rb[iR] * a_cn[iAm1] * pb[iP1]
-                  +          ra[iR] * a_cn[iAp1] * pa[iP1]
-                  +                   a_bn[iA]   * pb[iP1]
-                  +                   a_an[iA]   * pa[iP1]
-                  +          rb[iR] * a_an[iAm1]
-                  +          ra[iR] * a_bn[iAp1];
+                                      +          rb[iR] * a_cn[iAm1] * pb[iP1]
+                                      +          ra[iR] * a_cn[iAp1] * pa[iP1]
+                                      +                   a_bn[iA]   * pb[iP1]
+                                      +                   a_an[iA]   * pa[iP1]
+                                      +          rb[iR] * a_an[iAm1]
+                                      +          ra[iR] * a_bn[iAp1];
 
                iP1 = iP + yOffsetP - xOffsetP;
                rap_cnw[iAc] =         a_cnw[iA]
-                  +          rb[iR] * a_cnw[iAm1] * pb[iP1]
-                  +          ra[iR] * a_cnw[iAp1] * pa[iP1]
-                  +                   a_bnw[iA]   * pb[iP1]
-                  +                   a_anw[iA]   * pa[iP1]
-                  +          rb[iR] * a_anw[iAm1]
-                  +          ra[iR] * a_bnw[iAp1];
+                                      +          rb[iR] * a_cnw[iAm1] * pb[iP1]
+                                      +          ra[iR] * a_cnw[iAp1] * pa[iP1]
+                                      +                   a_bnw[iA]   * pb[iP1]
+                                      +                   a_anw[iA]   * pa[iP1]
+                                      +          rb[iR] * a_anw[iAm1]
+                                      +          ra[iR] * a_bnw[iAp1];
 
                iP1 = iP + xOffsetP;
                rap_ce[iAc] =          a_ce[iA]
-                  +          rb[iR] * a_ce[iAm1] * pb[iP1]
-                  +          ra[iR] * a_ce[iAp1] * pa[iP1]
-                  +                   a_be[iA]   * pb[iP1]
-                  +                   a_ae[iA]   * pa[iP1]
-                  +          rb[iR] * a_ae[iAm1]
-                  +          ra[iR] * a_be[iAp1];
+                                      +          rb[iR] * a_ce[iAm1] * pb[iP1]
+                                      +          ra[iR] * a_ce[iAp1] * pa[iP1]
+                                      +                   a_be[iA]   * pb[iP1]
+                                      +                   a_ae[iA]   * pa[iP1]
+                                      +          rb[iR] * a_ae[iAm1]
+                                      +          ra[iR] * a_be[iAp1];
 
             }
             hypre_BoxLoop4End(iP, iR, iA, iAc);
@@ -1596,6 +1603,8 @@ hypre_SMG3RAPPeriodicSym( hypre_StructMatrix *RAP,
                           hypre_Index         cstride )
 
 {
+   HYPRE_UNUSED_VAR(cindex);
+   HYPRE_UNUSED_VAR(cstride);
 
    hypre_Index             index;
 
@@ -1612,8 +1621,9 @@ hypre_SMG3RAPPeriodicSym( hypre_StructMatrix *RAP,
 
    HYPRE_Real           *rap_bc, *rap_bw, *rap_be, *rap_bs, *rap_bn;
    HYPRE_Real           *rap_cc, *rap_cw,  *rap_cs;
-   HYPRE_Real           *rap_bsw, *rap_bse, *rap_bnw, *rap_bne;
-   HYPRE_Real           *rap_csw, *rap_cse;
+   HYPRE_Real           *rap_bsw = NULL, *rap_bse = NULL;
+   HYPRE_Real           *rap_bnw = NULL, *rap_bne = NULL;
+   HYPRE_Real           *rap_csw = NULL, *rap_cse = NULL;
 
    HYPRE_Int            xOffset;
    HYPRE_Int            yOffset;
@@ -1643,62 +1653,62 @@ hypre_SMG3RAPPeriodicSym( hypre_StructMatrix *RAP,
 
          RAP_dbox = hypre_BoxArrayBox(hypre_StructMatrixDataSpace(RAP), ci);
 
-         hypre_SetIndex3(index,1,0,0);
-         xOffset = hypre_BoxOffsetDistance(RAP_dbox,index);
-         hypre_SetIndex3(index,0,1,0);
-         yOffset = hypre_BoxOffsetDistance(RAP_dbox,index);
+         hypre_SetIndex3(index, 1, 0, 0);
+         xOffset = hypre_BoxOffsetDistance(RAP_dbox, index);
+         hypre_SetIndex3(index, 0, 1, 0);
+         yOffset = hypre_BoxOffsetDistance(RAP_dbox, index);
 
 
          /*-----------------------------------------------------------------
           * Extract pointers for 15-point coarse grid operator:
           *-----------------------------------------------------------------*/
 
-         hypre_SetIndex3(index,0,0,-1);
+         hypre_SetIndex3(index, 0, 0, -1);
          rap_bc = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-         hypre_SetIndex3(index,-1,0,-1);
+         hypre_SetIndex3(index, -1, 0, -1);
          rap_bw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-         hypre_SetIndex3(index,1,0,-1);
+         hypre_SetIndex3(index, 1, 0, -1);
          rap_be = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-         hypre_SetIndex3(index,0,-1,-1);
+         hypre_SetIndex3(index, 0, -1, -1);
          rap_bs = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-         hypre_SetIndex3(index,0,1,-1);
+         hypre_SetIndex3(index, 0, 1, -1);
          rap_bn = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-         hypre_SetIndex3(index,0,0,0);
+         hypre_SetIndex3(index, 0, 0, 0);
          rap_cc = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-         hypre_SetIndex3(index,-1,0,0);
+         hypre_SetIndex3(index, -1, 0, 0);
          rap_cw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-         hypre_SetIndex3(index,0,-1,0);
+         hypre_SetIndex3(index, 0, -1, 0);
          rap_cs = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
          /*-----------------------------------------------------------------
           * Extract additional pointers for 27-point coarse grid operator:
           *-----------------------------------------------------------------*/
 
-         if(stencil_size == 27)
+         if (stencil_size == 27)
          {
-            hypre_SetIndex3(index,-1,-1,-1);
+            hypre_SetIndex3(index, -1, -1, -1);
             rap_bsw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-            hypre_SetIndex3(index,1,-1,-1);
+            hypre_SetIndex3(index, 1, -1, -1);
             rap_bse = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-            hypre_SetIndex3(index,-1,1,-1);
+            hypre_SetIndex3(index, -1, 1, -1);
             rap_bnw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-            hypre_SetIndex3(index,1,1,-1);
+            hypre_SetIndex3(index, 1, 1, -1);
             rap_bne = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-            hypre_SetIndex3(index,-1,-1,0);
+            hypre_SetIndex3(index, -1, -1, 0);
             rap_csw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-            hypre_SetIndex3(index,1,-1,0);
+            hypre_SetIndex3(index, 1, -1, 0);
             rap_cse = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
          }
 
@@ -1788,6 +1798,8 @@ hypre_SMG3RAPPeriodicNoSym( hypre_StructMatrix *RAP,
                             hypre_Index         cstride )
 
 {
+   HYPRE_UNUSED_VAR(cindex);
+   HYPRE_UNUSED_VAR(cstride);
 
    hypre_Index             index;
 
@@ -1836,92 +1848,92 @@ hypre_SMG3RAPPeriodicNoSym( hypre_StructMatrix *RAP,
           * Extract pointers for 15-point coarse grid operator:
           *-----------------------------------------------------------------*/
 
-         hypre_SetIndex3(index,0,0,-1);
+         hypre_SetIndex3(index, 0, 0, -1);
          rap_bc = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-         hypre_SetIndex3(index,-1,0,-1);
+         hypre_SetIndex3(index, -1, 0, -1);
          rap_bw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-         hypre_SetIndex3(index,1,0,-1);
+         hypre_SetIndex3(index, 1, 0, -1);
          rap_be = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-         hypre_SetIndex3(index,0,-1,-1);
+         hypre_SetIndex3(index, 0, -1, -1);
          rap_bs = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-         hypre_SetIndex3(index,0,1,-1);
+         hypre_SetIndex3(index, 0, 1, -1);
          rap_bn = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-         hypre_SetIndex3(index,0,0,0);
+         hypre_SetIndex3(index, 0, 0, 0);
          rap_cc = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-         hypre_SetIndex3(index,-1,0,0);
+         hypre_SetIndex3(index, -1, 0, 0);
          rap_cw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-         hypre_SetIndex3(index,1,0,0);
+         hypre_SetIndex3(index, 1, 0, 0);
          rap_ce = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-         hypre_SetIndex3(index,0,-1,0);
+         hypre_SetIndex3(index, 0, -1, 0);
          rap_cs = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-         hypre_SetIndex3(index,0,1,0);
+         hypre_SetIndex3(index, 0, 1, 0);
          rap_cn = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-         hypre_SetIndex3(index,0,0,1);
+         hypre_SetIndex3(index, 0, 0, 1);
          rap_ac = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-         hypre_SetIndex3(index,-1,0,1);
+         hypre_SetIndex3(index, -1, 0, 1);
          rap_aw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-         hypre_SetIndex3(index,1,0,1);
+         hypre_SetIndex3(index, 1, 0, 1);
          rap_ae = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-         hypre_SetIndex3(index,0,-1,1);
+         hypre_SetIndex3(index, 0, -1, 1);
          rap_as = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-         hypre_SetIndex3(index,0,1,1);
+         hypre_SetIndex3(index, 0, 1, 1);
          rap_an = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
          /*-----------------------------------------------------------------
           * Extract additional pointers for 27-point coarse grid operator:
           *-----------------------------------------------------------------*/
 
-         if(stencil_size == 27)
+         if (stencil_size == 27)
          {
 
-            hypre_SetIndex3(index,-1,-1,-1);
+            hypre_SetIndex3(index, -1, -1, -1);
             rap_bsw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-            hypre_SetIndex3(index,1,-1,-1);
+            hypre_SetIndex3(index, 1, -1, -1);
             rap_bse = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-            hypre_SetIndex3(index,-1,1,-1);
+            hypre_SetIndex3(index, -1, 1, -1);
             rap_bnw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-            hypre_SetIndex3(index,1,1,-1);
+            hypre_SetIndex3(index, 1, 1, -1);
             rap_bne = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-            hypre_SetIndex3(index,-1,-1,0);
+            hypre_SetIndex3(index, -1, -1, 0);
             rap_csw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-            hypre_SetIndex3(index,1,-1,0);
+            hypre_SetIndex3(index, 1, -1, 0);
             rap_cse = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-            hypre_SetIndex3(index,-1,1,0);
+            hypre_SetIndex3(index, -1, 1, 0);
             rap_cnw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-            hypre_SetIndex3(index,1,1,0);
+            hypre_SetIndex3(index, 1, 1, 0);
             rap_cne = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-            hypre_SetIndex3(index,-1,-1,1);
+            hypre_SetIndex3(index, -1, -1, 1);
             rap_asw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-            hypre_SetIndex3(index,1,-1,1);
+            hypre_SetIndex3(index, 1, -1, 1);
             rap_ase = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-            hypre_SetIndex3(index,-1,1,1);
+            hypre_SetIndex3(index, -1, 1, 1);
             rap_anw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-            hypre_SetIndex3(index,1,1,1);
+            hypre_SetIndex3(index, 1, 1, 1);
             rap_ane = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
          }
@@ -1997,4 +2009,3 @@ hypre_SMG3RAPPeriodicNoSym( hypre_StructMatrix *RAP,
 
    return hypre_error_flag;
 }
-
diff --git a/external/hypre/src/struct_ls/smg_axpy.c b/external/hypre/src/struct_ls/smg_axpy.c
index da1481cb..8b25283a 100644
--- a/external/hypre/src/struct_ls/smg_axpy.c
+++ b/external/hypre/src/struct_ls/smg_axpy.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/struct_ls/smg_relax.c b/external/hypre/src/struct_ls/smg_relax.c
index e8050e2a..9fc1f27e 100644
--- a/external/hypre/src/struct_ls/smg_relax.c
+++ b/external/hypre/src/struct_ls/smg_relax.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -157,9 +157,13 @@ hypre_SMGRelaxDestroyASol( void *relax_vdata )
       for (i = 0; i < (relax_data -> num_spaces); i++)
       {
          if (stencil_dim > 2)
+         {
             hypre_SMGDestroy(relax_data -> solve_data[i]);
+         }
          else
+         {
             hypre_CyclicReductionDestroy(relax_data -> solve_data[i]);
+         }
       }
       hypre_TFree(relax_data -> solve_data, HYPRE_MEMORY_HOST);
       hypre_StructMatrixDestroy(relax_data -> A_sol);
@@ -276,7 +280,7 @@ hypre_SMGRelax( void               *relax_vdata,
 
    for (k = 0; k < 2; k++)
    {
-      switch(k)
+      switch (k)
       {
          /* Do pre-relaxation iterations */
          case 0:
@@ -405,6 +409,9 @@ hypre_SMGRelaxSetupTempVec( void               *relax_vdata,
                             hypre_StructVector *b,
                             hypre_StructVector *x           )
 {
+   HYPRE_UNUSED_VAR(A);
+   HYPRE_UNUSED_VAR(x);
+
    hypre_SMGRelaxData  *relax_data = (hypre_SMGRelaxData  *)relax_vdata;
    hypre_StructVector  *temp_vec   = (relax_data -> temp_vec);
 
@@ -515,6 +522,8 @@ hypre_SMGRelaxSetupASol( void               *relax_vdata,
                          hypre_StructVector *b,
                          hypre_StructVector *x           )
 {
+   HYPRE_UNUSED_VAR(b);
+
    hypre_SMGRelaxData   *relax_data = (hypre_SMGRelaxData  *)relax_vdata;
 
    HYPRE_Int             num_spaces    = (relax_data -> num_spaces);
@@ -734,7 +743,9 @@ hypre_SMGRelaxSetNumPreSpaces( void *relax_vdata,
    (relax_data -> pre_space_ranks) = hypre_TAlloc(HYPRE_Int,  num_pre_spaces, HYPRE_MEMORY_HOST);
 
    for (i = 0; i < num_pre_spaces; i++)
+   {
       (relax_data -> pre_space_ranks[i]) = 0;
+   }
 
    return hypre_error_flag;
 }
@@ -755,7 +766,9 @@ hypre_SMGRelaxSetNumRegSpaces( void *relax_vdata,
    (relax_data -> reg_space_ranks) = hypre_TAlloc(HYPRE_Int,  num_reg_spaces, HYPRE_MEMORY_HOST);
 
    for (i = 0; i < num_reg_spaces; i++)
+   {
       (relax_data -> reg_space_ranks[i]) = 0;
+   }
 
    return hypre_error_flag;
 }
@@ -853,7 +866,7 @@ hypre_SMGRelaxSetNumPreRelax( void *relax_vdata,
 {
    hypre_SMGRelaxData *relax_data = (hypre_SMGRelaxData  *)relax_vdata;
 
-   (relax_data -> num_pre_relax) = hypre_max(num_pre_relax,1);
+   (relax_data -> num_pre_relax) = hypre_max(num_pre_relax, 1);
 
    return hypre_error_flag;
 }
@@ -913,6 +926,9 @@ hypre_SMGRelaxSetupBaseBoxArray( void               *relax_vdata,
                                  hypre_StructVector *b,
                                  hypre_StructVector *x           )
 {
+   HYPRE_UNUSED_VAR(A);
+   HYPRE_UNUSED_VAR(b);
+
    hypre_SMGRelaxData  *relax_data = (hypre_SMGRelaxData  *)relax_vdata;
 
    hypre_StructGrid    *grid;
diff --git a/external/hypre/src/struct_ls/smg_residual.c b/external/hypre/src/struct_ls/smg_residual.c
index 84fd792b..2a51cb33 100644
--- a/external/hypre/src/struct_ls/smg_residual.c
+++ b/external/hypre/src/struct_ls/smg_residual.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -32,7 +32,7 @@ typedef struct
  *--------------------------------------------------------------------------*/
 
 void *
-hypre_SMGResidualCreate( )
+hypre_SMGResidualCreate( void )
 {
    hypre_SMGResidualData *residual_data;
 
@@ -102,8 +102,8 @@ hypre_SMGResidualSetup( void               *residual_vdata,
    (residual_data -> flops) =
       (hypre_StructMatrixGlobalSize(A) + hypre_StructVectorGlobalSize(x)) /
       (HYPRE_BigInt)(hypre_IndexX(base_stride) *
-       hypre_IndexY(base_stride) *
-       hypre_IndexZ(base_stride)  );
+                     hypre_IndexY(base_stride) *
+                     hypre_IndexZ(base_stride)  );
 
    return hypre_error_flag;
 }
@@ -161,7 +161,7 @@ hypre_SMGResidual( void               *residual_vdata,
 
    for (compute_i = 0; compute_i < 2; compute_i++)
    {
-      switch(compute_i)
+      switch (compute_i)
       {
          case 0:
          {
@@ -234,7 +234,7 @@ hypre_SMGResidual( void               *residual_vdata,
             {
                Ap = hypre_StructMatrixBoxData(A, i, si);
                xp = hypre_StructVectorBoxData(x, i);
-//RL:PTROFFSET
+               //RL:PTROFFSET
                HYPRE_Int xp_off = hypre_BoxOffsetDistance(x_data_box, stencil_shape[si]);
 
                hypre_BoxGetStrideSize(compute_box, base_stride,
@@ -246,7 +246,7 @@ hypre_SMGResidual( void               *residual_vdata,
                                    x_data_box, start, base_stride, xi,
                                    r_data_box, start, base_stride, ri);
                {
-                  rp[ri] -= Ap[Ai] * xp[xi+xp_off];
+                  rp[ri] -= Ap[Ai] * xp[xi + xp_off];
                }
                hypre_BoxLoop3End(Ai, xi, ri);
 #undef DEVICE_VAR
diff --git a/external/hypre/src/struct_ls/smg_residual_unrolled.c b/external/hypre/src/struct_ls/smg_residual_unrolled.c
index 6fcbe476..6e468246 100644
--- a/external/hypre/src/struct_ls/smg_residual_unrolled.c
+++ b/external/hypre/src/struct_ls/smg_residual_unrolled.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -69,7 +69,7 @@ hypre_SMGResidualSetup( void               *residual_vdata,
 
    hypre_StructGrid       *grid;
    hypre_StructStencil    *stencil;
-                       
+
    hypre_BoxArray         *base_points;
    hypre_ComputeInfo      *compute_info;
    hypre_ComputePkg       *compute_pkg;
@@ -109,8 +109,8 @@ hypre_SMGResidualSetup( void               *residual_vdata,
    (residual_data -> flops) =
       (hypre_StructMatrixGlobalSize(A) + hypre_StructVectorGlobalSize(x)) /
       (HYPRE_BigInt)(hypre_IndexX(base_stride) *
-       hypre_IndexY(base_stride) *
-       hypre_IndexZ(base_stride)  );
+                     hypre_IndexY(base_stride) *
+                     hypre_IndexZ(base_stride)  );
 
    return ierr;
 }
@@ -135,29 +135,29 @@ hypre_SMGResidual( void               *residual_vdata,
    hypre_ComputePkg       *compute_pkg = (residual_data -> compute_pkg);
 
    hypre_CommHandle       *comm_handle;
-                       
+
    hypre_BoxArrayArray    *compute_box_aa;
    hypre_BoxArray         *compute_box_a;
    hypre_Box              *compute_box;
-                       
+
    hypre_Box              *A_data_box;
    hypre_Box              *x_data_box;
    hypre_Box              *b_data_box;
    hypre_Box              *r_data_box;
-                       
+
    HYPRE_Int               Ai;
    HYPRE_Int               xi;
    HYPRE_Int               bi;
    HYPRE_Int               ri;
-                         
+
    HYPRE_Real             *Ap0;
    HYPRE_Real             *xp0;
    HYPRE_Real             *bp;
    HYPRE_Real             *rp;
-                       
+
    hypre_Index             loop_size;
    hypre_IndexRef          start;
-                       
+
    hypre_StructStencil    *stencil;
    hypre_Index            *stencil_shape;
    HYPRE_Int               stencil_size;
@@ -191,7 +191,7 @@ hypre_SMGResidual( void               *residual_vdata,
 
    for (compute_i = 0; compute_i < 2; compute_i++)
    {
-      switch(compute_i)
+      switch (compute_i)
       {
          case 0:
          {
@@ -265,7 +265,7 @@ hypre_SMGResidual( void               *residual_vdata,
 
                Ap0 = hypre_StructMatrixBoxData(A, i, 0);
                xp0 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[0]);
+                     hypre_BoxOffsetDistance(x_data_box, stencil_shape[0]);
 
                break;
 
@@ -276,11 +276,11 @@ hypre_SMGResidual( void               *residual_vdata,
                Ap2 = hypre_StructMatrixBoxData(A, i, 2);
 
                xp0 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[0]);
+                     hypre_BoxOffsetDistance(x_data_box, stencil_shape[0]);
                xp1 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[1]);
+                     hypre_BoxOffsetDistance(x_data_box, stencil_shape[1]);
                xp2 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[2]);
+                     hypre_BoxOffsetDistance(x_data_box, stencil_shape[2]);
 
                break;
 
@@ -293,15 +293,15 @@ hypre_SMGResidual( void               *residual_vdata,
                Ap4 = hypre_StructMatrixBoxData(A, i, 4);
 
                xp0 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[0]);
+                     hypre_BoxOffsetDistance(x_data_box, stencil_shape[0]);
                xp1 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[1]);
+                     hypre_BoxOffsetDistance(x_data_box, stencil_shape[1]);
                xp2 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[2]);
+                     hypre_BoxOffsetDistance(x_data_box, stencil_shape[2]);
                xp3 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[3]);
+                     hypre_BoxOffsetDistance(x_data_box, stencil_shape[3]);
                xp4 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[4]);
+                     hypre_BoxOffsetDistance(x_data_box, stencil_shape[4]);
 
                break;
 
@@ -316,19 +316,19 @@ hypre_SMGResidual( void               *residual_vdata,
                Ap6 = hypre_StructMatrixBoxData(A, i, 6);
 
                xp0 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[0]);
+                     hypre_BoxOffsetDistance(x_data_box, stencil_shape[0]);
                xp1 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[1]);
+                     hypre_BoxOffsetDistance(x_data_box, stencil_shape[1]);
                xp2 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[2]);
+                     hypre_BoxOffsetDistance(x_data_box, stencil_shape[2]);
                xp3 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[3]);
+                     hypre_BoxOffsetDistance(x_data_box, stencil_shape[3]);
                xp4 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[4]);
+                     hypre_BoxOffsetDistance(x_data_box, stencil_shape[4]);
                xp5 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[5]);
+                     hypre_BoxOffsetDistance(x_data_box, stencil_shape[5]);
                xp6 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[6]);
+                     hypre_BoxOffsetDistance(x_data_box, stencil_shape[6]);
 
                break;
 
@@ -345,23 +345,23 @@ hypre_SMGResidual( void               *residual_vdata,
                Ap8 = hypre_StructMatrixBoxData(A, i, 8);
 
                xp0 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[0]);
+                     hypre_BoxOffsetDistance(x_data_box, stencil_shape[0]);
                xp1 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[1]);
+                     hypre_BoxOffsetDistance(x_data_box, stencil_shape[1]);
                xp2 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[2]);
+                     hypre_BoxOffsetDistance(x_data_box, stencil_shape[2]);
                xp3 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[3]);
+                     hypre_BoxOffsetDistance(x_data_box, stencil_shape[3]);
                xp4 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[4]);
+                     hypre_BoxOffsetDistance(x_data_box, stencil_shape[4]);
                xp5 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[5]);
+                     hypre_BoxOffsetDistance(x_data_box, stencil_shape[5]);
                xp6 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[6]);
+                     hypre_BoxOffsetDistance(x_data_box, stencil_shape[6]);
                xp7 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[7]);
+                     hypre_BoxOffsetDistance(x_data_box, stencil_shape[7]);
                xp8 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[8]);
+                     hypre_BoxOffsetDistance(x_data_box, stencil_shape[8]);
 
                break;
 
@@ -384,35 +384,35 @@ hypre_SMGResidual( void               *residual_vdata,
                Ap14 = hypre_StructMatrixBoxData(A, i, 14);
 
                xp0 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[0]);
+                     hypre_BoxOffsetDistance(x_data_box, stencil_shape[0]);
                xp1 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[1]);
+                     hypre_BoxOffsetDistance(x_data_box, stencil_shape[1]);
                xp2 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[2]);
+                     hypre_BoxOffsetDistance(x_data_box, stencil_shape[2]);
                xp3 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[3]);
+                     hypre_BoxOffsetDistance(x_data_box, stencil_shape[3]);
                xp4 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[4]);
+                     hypre_BoxOffsetDistance(x_data_box, stencil_shape[4]);
                xp5 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[5]);
+                     hypre_BoxOffsetDistance(x_data_box, stencil_shape[5]);
                xp6 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[6]);
+                     hypre_BoxOffsetDistance(x_data_box, stencil_shape[6]);
                xp7 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[7]);
+                     hypre_BoxOffsetDistance(x_data_box, stencil_shape[7]);
                xp8 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[8]);
+                     hypre_BoxOffsetDistance(x_data_box, stencil_shape[8]);
                xp9 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[9]);
+                     hypre_BoxOffsetDistance(x_data_box, stencil_shape[9]);
                xp10 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[10]);
+                      hypre_BoxOffsetDistance(x_data_box, stencil_shape[10]);
                xp11 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[11]);
+                      hypre_BoxOffsetDistance(x_data_box, stencil_shape[11]);
                xp12 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[12]);
+                      hypre_BoxOffsetDistance(x_data_box, stencil_shape[12]);
                xp13 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[13]);
+                      hypre_BoxOffsetDistance(x_data_box, stencil_shape[13]);
                xp14 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[14]);
+                      hypre_BoxOffsetDistance(x_data_box, stencil_shape[14]);
 
                break;
 
@@ -439,43 +439,43 @@ hypre_SMGResidual( void               *residual_vdata,
                Ap18 = hypre_StructMatrixBoxData(A, i, 18);
 
                xp0 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[0]);
+                     hypre_BoxOffsetDistance(x_data_box, stencil_shape[0]);
                xp1 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[1]);
+                     hypre_BoxOffsetDistance(x_data_box, stencil_shape[1]);
                xp2 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[2]);
+                     hypre_BoxOffsetDistance(x_data_box, stencil_shape[2]);
                xp3 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[3]);
+                     hypre_BoxOffsetDistance(x_data_box, stencil_shape[3]);
                xp4 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[4]);
+                     hypre_BoxOffsetDistance(x_data_box, stencil_shape[4]);
                xp5 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[5]);
+                     hypre_BoxOffsetDistance(x_data_box, stencil_shape[5]);
                xp6 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[6]);
+                     hypre_BoxOffsetDistance(x_data_box, stencil_shape[6]);
                xp7 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[7]);
+                     hypre_BoxOffsetDistance(x_data_box, stencil_shape[7]);
                xp8 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[8]);
+                     hypre_BoxOffsetDistance(x_data_box, stencil_shape[8]);
                xp9 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[9]);
+                     hypre_BoxOffsetDistance(x_data_box, stencil_shape[9]);
                xp10 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[10]);
+                      hypre_BoxOffsetDistance(x_data_box, stencil_shape[10]);
                xp11 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[11]);
+                      hypre_BoxOffsetDistance(x_data_box, stencil_shape[11]);
                xp12 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[12]);
+                      hypre_BoxOffsetDistance(x_data_box, stencil_shape[12]);
                xp13 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[13]);
+                      hypre_BoxOffsetDistance(x_data_box, stencil_shape[13]);
                xp14 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[14]);
+                      hypre_BoxOffsetDistance(x_data_box, stencil_shape[14]);
                xp15 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[15]);
+                      hypre_BoxOffsetDistance(x_data_box, stencil_shape[15]);
                xp16 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[16]);
+                      hypre_BoxOffsetDistance(x_data_box, stencil_shape[16]);
                xp17 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[17]);
+                      hypre_BoxOffsetDistance(x_data_box, stencil_shape[17]);
                xp18 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[18]);
+                      hypre_BoxOffsetDistance(x_data_box, stencil_shape[18]);
 
                break;
 
@@ -510,59 +510,59 @@ hypre_SMGResidual( void               *residual_vdata,
                Ap26 = hypre_StructMatrixBoxData(A, i, 26);
 
                xp0 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[0]);
+                     hypre_BoxOffsetDistance(x_data_box, stencil_shape[0]);
                xp1 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[1]);
+                     hypre_BoxOffsetDistance(x_data_box, stencil_shape[1]);
                xp2 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[2]);
+                     hypre_BoxOffsetDistance(x_data_box, stencil_shape[2]);
                xp3 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[3]);
+                     hypre_BoxOffsetDistance(x_data_box, stencil_shape[3]);
                xp4 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[4]);
+                     hypre_BoxOffsetDistance(x_data_box, stencil_shape[4]);
                xp5 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[5]);
+                     hypre_BoxOffsetDistance(x_data_box, stencil_shape[5]);
                xp6 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[6]);
+                     hypre_BoxOffsetDistance(x_data_box, stencil_shape[6]);
                xp7 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[7]);
+                     hypre_BoxOffsetDistance(x_data_box, stencil_shape[7]);
                xp8 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[8]);
+                     hypre_BoxOffsetDistance(x_data_box, stencil_shape[8]);
                xp9 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[9]);
+                     hypre_BoxOffsetDistance(x_data_box, stencil_shape[9]);
                xp10 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[10]);
+                      hypre_BoxOffsetDistance(x_data_box, stencil_shape[10]);
                xp11 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[11]);
+                      hypre_BoxOffsetDistance(x_data_box, stencil_shape[11]);
                xp12 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[12]);
+                      hypre_BoxOffsetDistance(x_data_box, stencil_shape[12]);
                xp13 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[13]);
+                      hypre_BoxOffsetDistance(x_data_box, stencil_shape[13]);
                xp14 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[14]);
+                      hypre_BoxOffsetDistance(x_data_box, stencil_shape[14]);
                xp15 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[15]);
+                      hypre_BoxOffsetDistance(x_data_box, stencil_shape[15]);
                xp16 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[16]);
+                      hypre_BoxOffsetDistance(x_data_box, stencil_shape[16]);
                xp17 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[17]);
+                      hypre_BoxOffsetDistance(x_data_box, stencil_shape[17]);
                xp18 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[18]);
+                      hypre_BoxOffsetDistance(x_data_box, stencil_shape[18]);
                xp19 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[19]);
+                      hypre_BoxOffsetDistance(x_data_box, stencil_shape[19]);
                xp20 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[20]);
+                      hypre_BoxOffsetDistance(x_data_box, stencil_shape[20]);
                xp21 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[21]);
+                      hypre_BoxOffsetDistance(x_data_box, stencil_shape[21]);
                xp22 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[22]);
+                      hypre_BoxOffsetDistance(x_data_box, stencil_shape[22]);
                xp23 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[23]);
+                      hypre_BoxOffsetDistance(x_data_box, stencil_shape[23]);
                xp24 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[24]);
+                      hypre_BoxOffsetDistance(x_data_box, stencil_shape[24]);
                xp25 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[25]);
+                      hypre_BoxOffsetDistance(x_data_box, stencil_shape[25]);
                xp26 = hypre_StructVectorBoxData(x, i) +
-                  hypre_BoxOffsetDistance(x_data_box, stencil_shape[26]);
+                      hypre_BoxOffsetDistance(x_data_box, stencil_shape[26]);
 
                break;
 
@@ -585,7 +585,7 @@ hypre_SMGResidual( void               *residual_vdata,
             {
 
                case 1:
-   
+
                   hypre_BoxGetStrideSize(compute_box, base_stride, loop_size);
 
 #define DEVICE_VAR is_device_ptr(rp,Ap0,xp0)
@@ -596,7 +596,7 @@ hypre_SMGResidual( void               *residual_vdata,
                   {
 
                      rp[ri] = rp[ri]
-                        - Ap0[Ai] * xp0[xi];
+                              - Ap0[Ai] * xp0[xi];
 
                   }
                   hypre_BoxLoop3End(Ai, xi, ri);
@@ -614,11 +614,11 @@ hypre_SMGResidual( void               *residual_vdata,
                                       x_data_box, start, base_stride, xi,
                                       r_data_box, start, base_stride, ri);
                   {
- 
+
                      rp[ri] = rp[ri]
-                        - Ap0[Ai] * xp0[xi]
-                        - Ap1[Ai] * xp1[xi]
-                        - Ap2[Ai] * xp2[xi];
+                              - Ap0[Ai] * xp0[xi]
+                              - Ap1[Ai] * xp1[xi]
+                              - Ap2[Ai] * xp2[xi];
 
                   }
                   hypre_BoxLoop3End(Ai, xi, ri);
@@ -636,13 +636,13 @@ hypre_SMGResidual( void               *residual_vdata,
                                       x_data_box, start, base_stride, xi,
                                       r_data_box, start, base_stride, ri);
                   {
- 
+
                      rp[ri] = rp[ri]
-                        - Ap0[Ai] * xp0[xi]
-                        - Ap1[Ai] * xp1[xi]
-                        - Ap2[Ai] * xp2[xi]
-                        - Ap3[Ai] * xp3[xi]
-                        - Ap4[Ai] * xp4[xi];
+                              - Ap0[Ai] * xp0[xi]
+                              - Ap1[Ai] * xp1[xi]
+                              - Ap2[Ai] * xp2[xi]
+                              - Ap3[Ai] * xp3[xi]
+                              - Ap4[Ai] * xp4[xi];
 
                   }
                   hypre_BoxLoop3End(Ai, xi, ri);
@@ -662,13 +662,13 @@ hypre_SMGResidual( void               *residual_vdata,
                   {
 
                      rp[ri] = rp[ri]
-                        - Ap0[Ai] * xp0[xi]
-                        - Ap1[Ai] * xp1[xi]
-                        - Ap2[Ai] * xp2[xi]
-                        - Ap3[Ai] * xp3[xi]
-                        - Ap4[Ai] * xp4[xi]
-                        - Ap5[Ai] * xp5[xi]
-                        - Ap6[Ai] * xp6[xi];
+                              - Ap0[Ai] * xp0[xi]
+                              - Ap1[Ai] * xp1[xi]
+                              - Ap2[Ai] * xp2[xi]
+                              - Ap3[Ai] * xp3[xi]
+                              - Ap4[Ai] * xp4[xi]
+                              - Ap5[Ai] * xp5[xi]
+                              - Ap6[Ai] * xp6[xi];
 
                   }
                   hypre_BoxLoop3End(Ai, xi, ri);
@@ -686,18 +686,18 @@ hypre_SMGResidual( void               *residual_vdata,
                                       x_data_box, start, base_stride, xi,
                                       r_data_box, start, base_stride, ri);
                   {
-   
+
                      rp[ri] = rp[ri]
-                        - Ap0[Ai] * xp0[xi]
-                        - Ap1[Ai] * xp1[xi]
-                        - Ap2[Ai] * xp2[xi]
-                        - Ap3[Ai] * xp3[xi]
-                        - Ap4[Ai] * xp4[xi]
-                        - Ap5[Ai] * xp5[xi]
-                        - Ap6[Ai] * xp6[xi]
-                        - Ap7[Ai] * xp7[xi]
-                        - Ap8[Ai] * xp8[xi];
-   
+                              - Ap0[Ai] * xp0[xi]
+                              - Ap1[Ai] * xp1[xi]
+                              - Ap2[Ai] * xp2[xi]
+                              - Ap3[Ai] * xp3[xi]
+                              - Ap4[Ai] * xp4[xi]
+                              - Ap5[Ai] * xp5[xi]
+                              - Ap6[Ai] * xp6[xi]
+                              - Ap7[Ai] * xp7[xi]
+                              - Ap8[Ai] * xp8[xi];
+
                   }
                   hypre_BoxLoop3End(Ai, xi, ri);
 #undef DEVICE_VAR
@@ -714,23 +714,23 @@ hypre_SMGResidual( void               *residual_vdata,
                                       x_data_box, start, base_stride, xi,
                                       r_data_box, start, base_stride, ri);
                   {
-   
+
                      rp[ri] = rp[ri]
-                        - Ap0[Ai] * xp0[xi]
-                        - Ap1[Ai] * xp1[xi]
-                        - Ap2[Ai] * xp2[xi]
-                        - Ap3[Ai] * xp3[xi]
-                        - Ap4[Ai] * xp4[xi]
-                        - Ap5[Ai] * xp5[xi]
-                        - Ap6[Ai] * xp6[xi]
-                        - Ap7[Ai] * xp7[xi]
-                        - Ap8[Ai] * xp8[xi]
-                        - Ap9[Ai] * xp9[xi]
-                        - Ap10[Ai] * xp10[xi]
-                        - Ap11[Ai] * xp11[xi]
-                        - Ap12[Ai] * xp12[xi]
-                        - Ap13[Ai] * xp13[xi]
-                        - Ap14[Ai] * xp14[xi];
+                              - Ap0[Ai] * xp0[xi]
+                              - Ap1[Ai] * xp1[xi]
+                              - Ap2[Ai] * xp2[xi]
+                              - Ap3[Ai] * xp3[xi]
+                              - Ap4[Ai] * xp4[xi]
+                              - Ap5[Ai] * xp5[xi]
+                              - Ap6[Ai] * xp6[xi]
+                              - Ap7[Ai] * xp7[xi]
+                              - Ap8[Ai] * xp8[xi]
+                              - Ap9[Ai] * xp9[xi]
+                              - Ap10[Ai] * xp10[xi]
+                              - Ap11[Ai] * xp11[xi]
+                              - Ap12[Ai] * xp12[xi]
+                              - Ap13[Ai] * xp13[xi]
+                              - Ap14[Ai] * xp14[xi];
 
                   }
                   hypre_BoxLoop3End(Ai, xi, ri);
@@ -748,34 +748,34 @@ hypre_SMGResidual( void               *residual_vdata,
                                       x_data_box, start, base_stride, xi,
                                       r_data_box, start, base_stride, ri);
                   {
-   
+
                      rp[ri] = rp[ri]
-                        - Ap0[Ai] * xp0[xi]
-                        - Ap1[Ai] * xp1[xi]
-                        - Ap2[Ai] * xp2[xi]
-                        - Ap3[Ai] * xp3[xi]
-                        - Ap4[Ai] * xp4[xi]
-                        - Ap5[Ai] * xp5[xi]
-                        - Ap6[Ai] * xp6[xi]
-                        - Ap7[Ai] * xp7[xi]
-                        - Ap8[Ai] * xp8[xi]
-                        - Ap9[Ai] * xp9[xi]
-                        - Ap10[Ai] * xp10[xi]
-                        - Ap11[Ai] * xp11[xi]
-                        - Ap12[Ai] * xp12[xi]
-                        - Ap13[Ai] * xp13[xi]
-                        - Ap14[Ai] * xp14[xi]
-                        - Ap15[Ai] * xp15[xi]
-                        - Ap16[Ai] * xp16[xi]
-                        - Ap17[Ai] * xp17[xi]
-                        - Ap18[Ai] * xp18[xi];
-   
+                              - Ap0[Ai] * xp0[xi]
+                              - Ap1[Ai] * xp1[xi]
+                              - Ap2[Ai] * xp2[xi]
+                              - Ap3[Ai] * xp3[xi]
+                              - Ap4[Ai] * xp4[xi]
+                              - Ap5[Ai] * xp5[xi]
+                              - Ap6[Ai] * xp6[xi]
+                              - Ap7[Ai] * xp7[xi]
+                              - Ap8[Ai] * xp8[xi]
+                              - Ap9[Ai] * xp9[xi]
+                              - Ap10[Ai] * xp10[xi]
+                              - Ap11[Ai] * xp11[xi]
+                              - Ap12[Ai] * xp12[xi]
+                              - Ap13[Ai] * xp13[xi]
+                              - Ap14[Ai] * xp14[xi]
+                              - Ap15[Ai] * xp15[xi]
+                              - Ap16[Ai] * xp16[xi]
+                              - Ap17[Ai] * xp17[xi]
+                              - Ap18[Ai] * xp18[xi];
+
                   }
                   hypre_BoxLoop3End(Ai, xi, ri);
 #undef DEVICE_VAR
-   
+
                   break;
-   
+
                case 27:
 
                   hypre_BoxGetStrideSize(compute_box, base_stride, loop_size);
@@ -786,40 +786,40 @@ hypre_SMGResidual( void               *residual_vdata,
                                       x_data_box, start, base_stride, xi,
                                       r_data_box, start, base_stride, ri);
                   {
-   
+
                      rp[ri] = rp[ri]
-                        - Ap0[Ai] * xp0[xi]
-                        - Ap1[Ai] * xp1[xi]
-                        - Ap2[Ai] * xp2[xi]
-                        - Ap3[Ai] * xp3[xi]
-                        - Ap4[Ai] * xp4[xi]
-                        - Ap5[Ai] * xp5[xi]
-                        - Ap6[Ai] * xp6[xi]
-                        - Ap7[Ai] * xp7[xi]
-                        - Ap8[Ai] * xp8[xi]
-                        - Ap9[Ai] * xp9[xi]
-                        - Ap10[Ai] * xp10[xi]
-                        - Ap11[Ai] * xp11[xi]
-                        - Ap12[Ai] * xp12[xi]
-                        - Ap13[Ai] * xp13[xi]
-                        - Ap14[Ai] * xp14[xi]
-                        - Ap15[Ai] * xp15[xi]
-                        - Ap16[Ai] * xp16[xi]
-                        - Ap17[Ai] * xp17[xi]
-                        - Ap18[Ai] * xp18[xi]
-                        - Ap19[Ai] * xp19[xi]
-                        - Ap20[Ai] * xp20[xi]
-                        - Ap21[Ai] * xp21[xi]
-                        - Ap22[Ai] * xp22[xi]
-                        - Ap23[Ai] * xp23[xi]
-                        - Ap24[Ai] * xp24[xi]
-                        - Ap25[Ai] * xp25[xi]
-                        - Ap26[Ai] * xp26[xi];
+                              - Ap0[Ai] * xp0[xi]
+                              - Ap1[Ai] * xp1[xi]
+                              - Ap2[Ai] * xp2[xi]
+                              - Ap3[Ai] * xp3[xi]
+                              - Ap4[Ai] * xp4[xi]
+                              - Ap5[Ai] * xp5[xi]
+                              - Ap6[Ai] * xp6[xi]
+                              - Ap7[Ai] * xp7[xi]
+                              - Ap8[Ai] * xp8[xi]
+                              - Ap9[Ai] * xp9[xi]
+                              - Ap10[Ai] * xp10[xi]
+                              - Ap11[Ai] * xp11[xi]
+                              - Ap12[Ai] * xp12[xi]
+                              - Ap13[Ai] * xp13[xi]
+                              - Ap14[Ai] * xp14[xi]
+                              - Ap15[Ai] * xp15[xi]
+                              - Ap16[Ai] * xp16[xi]
+                              - Ap17[Ai] * xp17[xi]
+                              - Ap18[Ai] * xp18[xi]
+                              - Ap19[Ai] * xp19[xi]
+                              - Ap20[Ai] * xp20[xi]
+                              - Ap21[Ai] * xp21[xi]
+                              - Ap22[Ai] * xp22[xi]
+                              - Ap23[Ai] * xp23[xi]
+                              - Ap24[Ai] * xp24[xi]
+                              - Ap25[Ai] * xp25[xi]
+                              - Ap26[Ai] * xp26[xi];
 
                   }
                   hypre_BoxLoop3End(Ai, xi, ri);
 #undef DEVICE_VAR
-   
+
                   break;
 
                default:
@@ -828,7 +828,7 @@ hypre_SMGResidual( void               *residual_vdata,
                   {
                      Ap0 = hypre_StructMatrixBoxData(A, i, si);
                      xp0 = hypre_StructVectorBoxData(x, i) +
-                        hypre_BoxOffsetDistance(x_data_box, stencil_shape[si]);
+                           hypre_BoxOffsetDistance(x_data_box, stencil_shape[si]);
 
                      hypre_BoxGetStrideSize(compute_box, base_stride,
                                             loop_size);
@@ -848,7 +848,7 @@ hypre_SMGResidual( void               *residual_vdata,
          }
       }
    }
-   
+
    /*-----------------------------------------------------------------------
     * Return
     *-----------------------------------------------------------------------*/
@@ -862,7 +862,7 @@ hypre_SMGResidual( void               *residual_vdata,
 /*--------------------------------------------------------------------------
  * hypre_SMGResidualSetBase
  *--------------------------------------------------------------------------*/
- 
+
 HYPRE_Int
 hypre_SMGResidualSetBase( void        *residual_vdata,
                           hypre_Index  base_index,
@@ -871,7 +871,7 @@ hypre_SMGResidualSetBase( void        *residual_vdata,
    hypre_SMGResidualData *residual_data = residual_vdata;
    HYPRE_Int              d;
    HYPRE_Int              ierr = 0;
- 
+
    for (d = 0; d < 3; d++)
    {
       hypre_IndexD((residual_data -> base_index),  d)
@@ -879,7 +879,7 @@ hypre_SMGResidualSetBase( void        *residual_vdata,
       hypre_IndexD((residual_data -> base_stride), d)
          = hypre_IndexD(base_stride, d);
    }
- 
+
    return ierr;
 }
 
diff --git a/external/hypre/src/struct_ls/smg_setup.c b/external/hypre/src/struct_ls/smg_setup.c
index dc440d21..20bd11bc 100644
--- a/external/hypre/src/struct_ls/smg_setup.c
+++ b/external/hypre/src/struct_ls/smg_setup.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -19,7 +19,7 @@ hypre_SMGSetup( void               *smg_vdata,
                 hypre_StructVector *b,
                 hypre_StructVector *x )
 {
-   hypre_SMGData        *smg_data = (hypre_SMGData        *)smg_vdata;
+   hypre_SMGData        *smg_data = (hypre_SMGData *) smg_vdata;
 
    MPI_Comm              comm = (smg_data -> comm);
    hypre_IndexRef        base_index  = (smg_data -> base_index);
@@ -71,9 +71,7 @@ hypre_SMGSetup( void               *smg_vdata,
    void                **interp_data_l;
 
    hypre_StructGrid     *grid;
-
    hypre_Box            *cbox;
-
    HYPRE_Int             i, l;
 
    HYPRE_Int             b_num_ghost[]  = {0, 0, 0, 0, 0, 0};
@@ -83,12 +81,8 @@ hypre_SMGSetup( void               *smg_vdata,
    char                  filename[255];
 #endif
 
-#if 0 //defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-   HYPRE_Int             num_level_GPU = 0;
-   HYPRE_MemoryLocation  data_location;
-   HYPRE_Int             max_box_size  = 0;
-   HYPRE_Int             device_level  = (smg_data -> devicelevel);
-#endif
+   HYPRE_MemoryLocation  memory_location = hypre_StructMatrixMemoryLocation(A);
+
    /*-----------------------------------------------------
     * Set up coarsening direction
     *-----------------------------------------------------*/
@@ -156,30 +150,30 @@ hypre_SMGSetup( void               *smg_vdata,
                                   hypre_BoxIMax(cbox));
 
       /* build the interpolation grid */
-      hypre_StructCoarsen(grid_l[l], cindex, stride, 0, &PT_grid_l[l+1]);
+      hypre_StructCoarsen(grid_l[l], cindex, stride, 0, &PT_grid_l[l + 1]);
 
       /* build the coarse grid */
-      hypre_StructCoarsen(grid_l[l], cindex, stride, 1, &grid_l[l+1]);
+      hypre_StructCoarsen(grid_l[l], cindex, stride, 1, &grid_l[l + 1]);
 #if 0 //defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-      hypre_StructGridDataLocation(PT_grid_l[l+1]) = data_location;
+      hypre_StructGridDataLocation(PT_grid_l[l + 1]) = data_location;
       if (device_level == -1 && num_level_GPU > 0)
       {
-         max_box_size = hypre_StructGridGetMaxBoxSize(grid_l[l+1]);
+         max_box_size = hypre_StructGridGetMaxBoxSize(grid_l[l + 1]);
          if (max_box_size < HYPRE_MIN_GPU_SIZE)
          {
-            num_level_GPU = l+1;
+            num_level_GPU = l + 1;
             data_location = HYPRE_MEMORY_HOST;
             device_level  = num_level_GPU;
             //printf("num_level_GPU = %d,device_level = %d\n",num_level_GPU,device_level);
          }
       }
-      else if (l+1 == device_level)
+      else if (l + 1 == device_level)
       {
-         num_level_GPU = l+1;
+         num_level_GPU = l + 1;
          data_location = HYPRE_MEMORY_HOST;
       }
 
-      hypre_StructGridDataLocation(grid_l[l+1]) = data_location;
+      hypre_StructGridDataLocation(grid_l[l + 1]) = data_location;
 #endif
    }
    num_levels = l + 1;
@@ -211,8 +205,8 @@ hypre_SMGSetup( void               *smg_vdata,
 
    for (i = 0; i <= cdir; i++)
    {
-      x_num_ghost[2*i]     = 1;
-      x_num_ghost[2*i + 1] = 1;
+      x_num_ghost[2 * i]     = 1;
+      x_num_ghost[2 * i + 1] = 1;
    }
 
    tb_l[0] = hypre_StructVectorCreate(comm, grid_l[0]);
@@ -227,7 +221,7 @@ hypre_SMGSetup( void               *smg_vdata,
 
    for (l = 0; l < (num_levels - 1); l++)
    {
-      PT_l[l]  = hypre_SMGCreateInterpOp(A_l[l], PT_grid_l[l+1], cdir);
+      PT_l[l]  = hypre_SMGCreateInterpOp(A_l[l], PT_grid_l[l + 1], cdir);
 
       hypre_StructMatrixInitializeShell(PT_l[l]);
       data_size += hypre_StructMatrixDataSize(PT_l[l]);
@@ -243,47 +237,48 @@ hypre_SMGSetup( void               *smg_vdata,
 #if 0
          /* Allow R != PT for non symmetric case */
          /* NOTE: Need to create a non-pruned grid for this to work */
-         R_l[l]   = hypre_SMGCreateRestrictOp(A_l[l], grid_l[l+1], cdir);
+         R_l[l]   = hypre_SMGCreateRestrictOp(A_l[l], grid_l[l + 1], cdir);
          hypre_StructMatrixInitializeShell(R_l[l]);
          data_size += hypre_StructMatrixDataSize(R_l[l]);
          data_size_const += hypre_StructMatrixDataConstSize(R_l[l]);
 #endif
       }
 
-      A_l[l+1] = hypre_SMGCreateRAPOp(R_l[l], A_l[l], PT_l[l], grid_l[l+1]);
-      hypre_StructMatrixInitializeShell(A_l[l+1]);
-      data_size += hypre_StructMatrixDataSize(A_l[l+1]);
-      data_size_const += hypre_StructMatrixDataConstSize(A_l[l+1]);
+      A_l[l + 1] = hypre_SMGCreateRAPOp(R_l[l], A_l[l], PT_l[l], grid_l[l + 1]);
+      hypre_StructMatrixInitializeShell(A_l[l + 1]);
+      data_size += hypre_StructMatrixDataSize(A_l[l + 1]);
+      data_size_const += hypre_StructMatrixDataConstSize(A_l[l + 1]);
 
-      b_l[l+1] = hypre_StructVectorCreate(comm, grid_l[l+1]);
-      hypre_StructVectorSetNumGhost(b_l[l+1], b_num_ghost);
-      hypre_StructVectorInitializeShell(b_l[l+1]);
-      hypre_StructVectorSetDataSize(b_l[l+1], &data_size, &data_size_const);
+      b_l[l + 1] = hypre_StructVectorCreate(comm, grid_l[l + 1]);
+      hypre_StructVectorSetNumGhost(b_l[l + 1], b_num_ghost);
+      hypre_StructVectorInitializeShell(b_l[l + 1]);
+      hypre_StructVectorSetDataSize(b_l[l + 1], &data_size, &data_size_const);
 
-      x_l[l+1] = hypre_StructVectorCreate(comm, grid_l[l+1]);
-      hypre_StructVectorSetNumGhost(x_l[l+1], x_num_ghost);
-      hypre_StructVectorInitializeShell(x_l[l+1]);
-      hypre_StructVectorSetDataSize(x_l[l+1], &data_size, &data_size_const);
+      x_l[l + 1] = hypre_StructVectorCreate(comm, grid_l[l + 1]);
+      hypre_StructVectorSetNumGhost(x_l[l + 1], x_num_ghost);
+      hypre_StructVectorInitializeShell(x_l[l + 1]);
+      hypre_StructVectorSetDataSize(x_l[l + 1], &data_size, &data_size_const);
 
-      tb_l[l+1] = hypre_StructVectorCreate(comm, grid_l[l+1]);
-      hypre_StructVectorSetNumGhost(tb_l[l+1], hypre_StructVectorNumGhost(b));
-      hypre_StructVectorInitializeShell(tb_l[l+1]);
+      tb_l[l + 1] = hypre_StructVectorCreate(comm, grid_l[l + 1]);
+      hypre_StructVectorSetNumGhost(tb_l[l + 1], hypre_StructVectorNumGhost(b));
+      hypre_StructVectorInitializeShell(tb_l[l + 1]);
 
-      tx_l[l+1] = hypre_StructVectorCreate(comm, grid_l[l+1]);
-      hypre_StructVectorSetNumGhost(tx_l[l+1], hypre_StructVectorNumGhost(x));
-      hypre_StructVectorInitializeShell(tx_l[l+1]);
+      tx_l[l + 1] = hypre_StructVectorCreate(comm, grid_l[l + 1]);
+      hypre_StructVectorSetNumGhost(tx_l[l + 1], hypre_StructVectorNumGhost(x));
+      hypre_StructVectorInitializeShell(tx_l[l + 1]);
 #if 0 //defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-      if (l+1 == num_level_GPU)
+      if (l + 1 == num_level_GPU)
       {
-         hypre_StructVectorSetDataSize(tb_l[l+1], &data_size, &data_size_const);
-         hypre_StructVectorSetDataSize(tx_l[l+1], &data_size, &data_size_const);
+         hypre_StructVectorSetDataSize(tb_l[l + 1], &data_size, &data_size_const);
+         hypre_StructVectorSetDataSize(tx_l[l + 1], &data_size, &data_size_const);
       }
 #endif
    }
 
-   data = hypre_CTAlloc(HYPRE_Real, data_size, HYPRE_MEMORY_DEVICE);
-   data_const = hypre_CTAlloc(HYPRE_Real,data_size_const,HYPRE_MEMORY_HOST);
-   //printf("data =%d,data_const=%d,data_location = %d\n",data_size,data_size_const,data_location);
+   data = hypre_CTAlloc(HYPRE_Real, data_size, memory_location);
+   data_const = hypre_CTAlloc(HYPRE_Real, data_size_const, HYPRE_MEMORY_HOST);
+
+   (smg_data -> memory_location) = memory_location;
    (smg_data -> data) = data;
    (smg_data -> data_const) = data_const;
 
@@ -337,82 +332,82 @@ hypre_SMGSetup( void               *smg_vdata,
 #endif
 
 #if 0 //defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-      if (l+1 == num_level_GPU)
+      if (l + 1 == num_level_GPU)
       {
          data_location = HYPRE_MEMORY_HOST;
       }
 #endif
 
-      hypre_StructMatrixInitializeData(A_l[l+1], data, data_const);
-      data += hypre_StructMatrixDataSize(A_l[l+1]);
-      data_const += hypre_StructMatrixDataConstSize(A_l[l+1]);
+      hypre_StructMatrixInitializeData(A_l[l + 1], data, data_const);
+      data += hypre_StructMatrixDataSize(A_l[l + 1]);
+      data_const += hypre_StructMatrixDataConstSize(A_l[l + 1]);
 
 #if 0 //defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
       if (data_location != HYPRE_MEMORY_HOST)
       {
-         hypre_StructVectorInitializeData(b_l[l+1], data);
-         hypre_StructVectorAssemble(b_l[l+1]);
-         data += hypre_StructVectorDataSize(b_l[l+1]);
-
-         hypre_StructVectorInitializeData(x_l[l+1], data);
-         hypre_StructVectorAssemble(x_l[l+1]);
-         data += hypre_StructVectorDataSize(x_l[l+1]);
-         hypre_StructVectorInitializeData(tb_l[l+1],
-               hypre_StructVectorData(tb_l[0]));
-         hypre_StructVectorAssemble(tb_l[l+1]);
-
-         hypre_StructVectorInitializeData(tx_l[l+1],
-               hypre_StructVectorData(tx_l[0]));
-         hypre_StructVectorAssemble(tx_l[l+1]);
+         hypre_StructVectorInitializeData(b_l[l + 1], data);
+         hypre_StructVectorAssemble(b_l[l + 1]);
+         data += hypre_StructVectorDataSize(b_l[l + 1]);
+
+         hypre_StructVectorInitializeData(x_l[l + 1], data);
+         hypre_StructVectorAssemble(x_l[l + 1]);
+         data += hypre_StructVectorDataSize(x_l[l + 1]);
+         hypre_StructVectorInitializeData(tb_l[l + 1],
+                                          hypre_StructVectorData(tb_l[0]));
+         hypre_StructVectorAssemble(tb_l[l + 1]);
+
+         hypre_StructVectorInitializeData(tx_l[l + 1],
+                                          hypre_StructVectorData(tx_l[0]));
+         hypre_StructVectorAssemble(tx_l[l + 1]);
          //printf("\n Alloc x_l,b_l[%d] on GPU\n",l+1);
       }
       else
       {
-         hypre_StructVectorInitializeData(b_l[l+1], data_const);
-         hypre_StructVectorAssemble(b_l[l+1]);
-         data_const += hypre_StructVectorDataSize(b_l[l+1]);
-
-         hypre_StructVectorInitializeData(x_l[l+1], data_const);
-         hypre_StructVectorAssemble(x_l[l+1]);
-         data_const += hypre_StructVectorDataSize(x_l[l+1]);
-         if (l+1 == num_level_GPU)
+         hypre_StructVectorInitializeData(b_l[l + 1], data_const);
+         hypre_StructVectorAssemble(b_l[l + 1]);
+         data_const += hypre_StructVectorDataSize(b_l[l + 1]);
+
+         hypre_StructVectorInitializeData(x_l[l + 1], data_const);
+         hypre_StructVectorAssemble(x_l[l + 1]);
+         data_const += hypre_StructVectorDataSize(x_l[l + 1]);
+         if (l + 1 == num_level_GPU)
          {
-            hypre_StructVectorInitializeData(tb_l[l+1], data_const);
-            hypre_StructVectorAssemble(tb_l[l+1]);
-            data_const += hypre_StructVectorDataSize(tb_l[l+1]);
-            hypre_StructVectorInitializeData(tx_l[l+1], data_const);
-            hypre_StructVectorAssemble(tx_l[l+1]);
-            data_const += hypre_StructVectorDataSize(tx_l[l+1]);
+            hypre_StructVectorInitializeData(tb_l[l + 1], data_const);
+            hypre_StructVectorAssemble(tb_l[l + 1]);
+            data_const += hypre_StructVectorDataSize(tb_l[l + 1]);
+            hypre_StructVectorInitializeData(tx_l[l + 1], data_const);
+            hypre_StructVectorAssemble(tx_l[l + 1]);
+            data_const += hypre_StructVectorDataSize(tx_l[l + 1]);
          }
          else
          {
-            hypre_StructVectorInitializeData(tb_l[l+1],
-                  hypre_StructVectorData(tb_l[num_level_GPU]));
-            hypre_StructVectorAssemble(tb_l[l+1]);
+            hypre_StructVectorInitializeData(tb_l[l + 1],
+                                             hypre_StructVectorData(tb_l[num_level_GPU]));
+            hypre_StructVectorAssemble(tb_l[l + 1]);
 
-            hypre_StructVectorInitializeData(tx_l[l+1],
-                  hypre_StructVectorData(tx_l[num_level_GPU]));
-            hypre_StructVectorAssemble(tx_l[l+1]);
+            hypre_StructVectorInitializeData(tx_l[l + 1],
+                                             hypre_StructVectorData(tx_l[num_level_GPU]));
+            hypre_StructVectorAssemble(tx_l[l + 1]);
          }
          //printf("\n Alloc x_l,b_l[%d] on CPU\n",l+1);
       }
 #else
 
-      hypre_StructVectorInitializeData(b_l[l+1], data);
-      hypre_StructVectorAssemble(b_l[l+1]);
-      data += hypre_StructVectorDataSize(b_l[l+1]);
+      hypre_StructVectorInitializeData(b_l[l + 1], data);
+      hypre_StructVectorAssemble(b_l[l + 1]);
+      data += hypre_StructVectorDataSize(b_l[l + 1]);
 
-      hypre_StructVectorInitializeData(x_l[l+1], data);
-      hypre_StructVectorAssemble(x_l[l+1]);
-      data += hypre_StructVectorDataSize(x_l[l+1]);
+      hypre_StructVectorInitializeData(x_l[l + 1], data);
+      hypre_StructVectorAssemble(x_l[l + 1]);
+      data += hypre_StructVectorDataSize(x_l[l + 1]);
 
-      hypre_StructVectorInitializeData(tb_l[l+1],
+      hypre_StructVectorInitializeData(tb_l[l + 1],
                                        hypre_StructVectorData(tb_l[0]));
-      hypre_StructVectorAssemble(tb_l[l+1]);
+      hypre_StructVectorAssemble(tb_l[l + 1]);
 
-      hypre_StructVectorInitializeData(tx_l[l+1],
+      hypre_StructVectorInitializeData(tx_l[l + 1],
                                        hypre_StructVectorData(tx_l[0]));
-      hypre_StructVectorAssemble(tx_l[l+1]);
+      hypre_StructVectorAssemble(tx_l[l + 1]);
 #endif
    }
 
@@ -500,7 +495,7 @@ hypre_SMGSetup( void               *smg_vdata,
 
       /* set up the interpolation routine */
       interp_data_l[l] = hypre_SemiInterpCreate();
-      hypre_SemiInterpSetup(interp_data_l[l], PT_l[l], 1, x_l[l+1], e_l[l],
+      hypre_SemiInterpSetup(interp_data_l[l], PT_l[l], 1, x_l[l + 1], e_l[l],
                             cindex, findex, stride);
 
       /* set up the restriction operator */
@@ -512,11 +507,11 @@ hypre_SMGSetup( void               *smg_vdata,
 #endif
       /* set up the restriction routine */
       restrict_data_l[l] = hypre_SemiRestrictCreate();
-      hypre_SemiRestrictSetup(restrict_data_l[l], R_l[l], 0, r_l[l], b_l[l+1],
+      hypre_SemiRestrictSetup(restrict_data_l[l], R_l[l], 0, r_l[l], b_l[l + 1],
                               cindex, findex, stride);
 
       /* set up the coarse grid operator */
-      hypre_SMGSetupRAPOp(R_l[l], A_l[l], PT_l[l], A_l[l+1],
+      hypre_SMGSetupRAPOp(R_l[l], A_l[l], PT_l[l], A_l[l + 1],
                           cindex, stride);
    }
 
@@ -539,7 +534,7 @@ hypre_SMGSetup( void               *smg_vdata,
    hypre_SMGRelaxSetup(relax_data_l[l], A_l[l], b_l[l], x_l[l]);
 
    /* set up the residual routine in case of a single grid level */
-   if( l == 0 )
+   if ( l == 0 )
    {
       residual_data_l[l] = hypre_SMGResidualCreate();
       hypre_SMGResidualSetBase(residual_data_l[l], bindex, bstride);
@@ -572,7 +567,7 @@ hypre_SMGSetup( void               *smg_vdata,
    }
 
 #if DEBUG
-   if(hypre_StructGridNDim(grid_l[0]) == 3)
+   if (hypre_StructGridNDim(grid_l[0]) == 3)
    {
       for (l = 0; l < (num_levels - 1); l++)
       {
@@ -585,12 +580,7 @@ hypre_SMGSetup( void               *smg_vdata,
       hypre_StructMatrixPrint(filename, A_l[l], 0);
    }
 #endif
-#if 0 //defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-   if (hypre_StructGridDataLocation(grid) != HYPRE_MEMORY_HOST)
-   {
-      hypre_SetDeviceOn();
-   }
-#endif
+
    HYPRE_ANNOTATE_FUNC_END;
 
    return hypre_error_flag;
diff --git a/external/hypre/src/struct_ls/smg_setup_interp.c b/external/hypre/src/struct_ls/smg_setup_interp.c
index ec459466..a377daa3 100644
--- a/external/hypre/src/struct_ls/smg_setup_interp.c
+++ b/external/hypre/src/struct_ls/smg_setup_interp.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -206,7 +206,7 @@ hypre_SMGSetupInterpOp( void               *relax_data,
 
       for (compute_i = 0; compute_i < 2; compute_i++)
       {
-         switch(compute_i)
+         switch (compute_i)
          {
             case 0:
             {
diff --git a/external/hypre/src/struct_ls/smg_setup_rap.c b/external/hypre/src/struct_ls/smg_setup_rap.c
index 27242c1e..f9439e0a 100644
--- a/external/hypre/src/struct_ls/smg_setup_rap.c
+++ b/external/hypre/src/struct_ls/smg_setup_rap.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -22,7 +22,7 @@ hypre_SMGCreateRAPOp( hypre_StructMatrix *R,
                       hypre_StructMatrix *PT,
                       hypre_StructGrid   *coarse_grid )
 {
-   hypre_StructMatrix    *RAP;
+   hypre_StructMatrix    *RAP = NULL;
    hypre_StructStencil   *stencil;
 
 #if NEWRAP
@@ -36,11 +36,11 @@ hypre_SMGCreateRAPOp( hypre_StructMatrix *R,
    switch (hypre_StructStencilNDim(stencil))
    {
       case 2:
-         RAP = hypre_SMG2CreateRAPOp(R ,A, PT, coarse_grid);
+         RAP = hypre_SMG2CreateRAPOp(R, A, PT, coarse_grid);
          break;
 
       case 3:
-         RAP = hypre_SMG3CreateRAPOp(R ,A, PT, coarse_grid);
+         RAP = hypre_SMG3CreateRAPOp(R, A, PT, coarse_grid);
          break;
    }
 #endif
@@ -50,13 +50,13 @@ hypre_SMGCreateRAPOp( hypre_StructMatrix *R,
    {
       case 2:
          cdir = 1;
-         RAP = hypre_SemiCreateRAPOp(R ,A, PT, coarse_grid, cdir,
+         RAP = hypre_SemiCreateRAPOp(R, A, PT, coarse_grid, cdir,
                                      P_stored_as_transpose);
          break;
 
       case 3:
          cdir = 2;
-         RAP = hypre_SemiCreateRAPOp(R ,A, PT, coarse_grid, cdir,
+         RAP = hypre_SemiCreateRAPOp(R, A, PT, coarse_grid, cdir,
                                      P_stored_as_transpose);
          break;
    }
@@ -119,7 +119,7 @@ hypre_SMGSetupRAPOp( hypre_StructMatrix *R,
          /*--------------------------------------------------------------------
           *    For non-symmetric A, set upper triangular coefficients as well
           *--------------------------------------------------------------------*/
-         if(!hypre_StructMatrixSymmetric(A))
+         if (!hypre_StructMatrixSymmetric(A))
          {
             hypre_SMG2BuildRAPNoSym(A, PT, R, Ac_tmp, cindex, cstride);
             /*-----------------------------------------------------------------
@@ -147,7 +147,7 @@ hypre_SMGSetupRAPOp( hypre_StructMatrix *R,
          /*--------------------------------------------------------------------
           *    For non-symmetric A, set upper triangular coefficients as well
           *--------------------------------------------------------------------*/
-         if(!hypre_StructMatrixSymmetric(A))
+         if (!hypre_StructMatrixSymmetric(A))
          {
             hypre_SMG3BuildRAPNoSym(A, PT, R, Ac_tmp, cindex, cstride);
             /*-----------------------------------------------------------------
@@ -193,7 +193,8 @@ hypre_SMGSetupRAPOp( hypre_StructMatrix *R,
    if (data_location_A != data_location_Ac)
    {
 
-     hypre_TMemcpy(hypre_StructMatrixDataConst(Ac), hypre_StructMatrixData(Ac_tmp),HYPRE_Complex,hypre_StructMatrixDataSize(Ac_tmp),HYPRE_MEMORY_HOST,HYPRE_MEMORY_DEVICE);
+      hypre_TMemcpy(hypre_StructMatrixDataConst(Ac), hypre_StructMatrixData(Ac_tmp), HYPRE_Complex,
+                    hypre_StructMatrixDataSize(Ac_tmp), HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
       hypre_SetDeviceOff();
       hypre_StructGridDataLocation(hypre_StructMatrixGrid(Ac)) = data_location_Ac;
       hypre_StructMatrixAssemble(Ac);
@@ -203,4 +204,3 @@ hypre_SMGSetupRAPOp( hypre_StructMatrix *R,
 #endif
    return hypre_error_flag;
 }
-
diff --git a/external/hypre/src/struct_ls/smg_setup_restrict.c b/external/hypre/src/struct_ls/smg_setup_restrict.c
index 0dcfc841..71f12d50 100644
--- a/external/hypre/src/struct_ls/smg_setup_restrict.c
+++ b/external/hypre/src/struct_ls/smg_setup_restrict.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -16,6 +16,10 @@ hypre_SMGCreateRestrictOp( hypre_StructMatrix *A,
                            hypre_StructGrid   *cgrid,
                            HYPRE_Int           cdir  )
 {
+   HYPRE_UNUSED_VAR(A);
+   HYPRE_UNUSED_VAR(cgrid);
+   HYPRE_UNUSED_VAR(cdir);
+
    hypre_StructMatrix *R = NULL;
 
    return R;
@@ -32,5 +36,12 @@ hypre_SMGSetupRestrictOp( hypre_StructMatrix *A,
                           hypre_Index         cindex,
                           hypre_Index         cstride  )
 {
+   HYPRE_UNUSED_VAR(A);
+   HYPRE_UNUSED_VAR(R);
+   HYPRE_UNUSED_VAR(temp_vec);
+   HYPRE_UNUSED_VAR(cdir);
+   HYPRE_UNUSED_VAR(cindex);
+   HYPRE_UNUSED_VAR(cstride);
+
    return hypre_error_flag;
 }
diff --git a/external/hypre/src/struct_ls/smg_solve.c b/external/hypre/src/struct_ls/smg_solve.c
index e5877780..b8d19a96 100644
--- a/external/hypre/src/struct_ls/smg_solve.c
+++ b/external/hypre/src/struct_ls/smg_solve.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -120,7 +120,7 @@ hypre_SMGSolve( void               *smg_vdata,
    {
       /* eps = (tol^2) */
       b_dot_b = hypre_StructInnerProd(b_l[0], b_l[0]);
-      eps = tol*tol;
+      eps = tol * tol;
 
       /* if rhs is zero, return a zero solution */
       if (b_dot_b == 0.0)
@@ -170,20 +170,26 @@ hypre_SMGSolve( void               *smg_vdata,
          r_dot_r = hypre_StructInnerProd(r_l[0], r_l[0]);
          if (logging > 0)
          {
-            norms[i] = sqrt(r_dot_r);
+            norms[i] = hypre_sqrt(r_dot_r);
             if (b_dot_b > 0)
-               rel_norms[i] = sqrt(r_dot_r/b_dot_b);
+            {
+               rel_norms[i] = hypre_sqrt(r_dot_r / b_dot_b);
+            }
             else
+            {
                rel_norms[i] = 0.0;
+            }
          }
 
          /* always do at least 1 V-cycle */
-         if ((r_dot_r/b_dot_b < eps) && (i > 0))
+         if ((r_dot_r / b_dot_b < eps) && (i > 0))
          {
             if (rel_change)
             {
-               if ((e_dot_e/x_dot_x) < eps)
+               if ((e_dot_e / x_dot_x) < eps)
+               {
                   break;
+               }
             }
             else
             {
@@ -197,7 +203,7 @@ hypre_SMGSolve( void               *smg_vdata,
          /* restrict fine grid residual */
          hypre_SemiRestrict(restrict_data_l[0], R_l[0], r_l[0], b_l[1]);
 #if DEBUG
-         if(hypre_StructStencilNDim(hypre_StructMatrixStencil(A)) == 3)
+         if (hypre_StructStencilNDim(hypre_StructMatrixStencil(A)) == 3)
          {
             hypre_sprintf(filename, "zout_xdown.%02d", 0);
             hypre_StructVectorPrint(filename, x_l[0], 0);
@@ -221,16 +227,16 @@ hypre_SMGSolve( void               *smg_vdata,
                               A_l[l], x_l[l], b_l[l], r_l[l]);
 
             /* restrict residual */
-            hypre_SemiRestrict(restrict_data_l[l], R_l[l], r_l[l], b_l[l+1]);
+            hypre_SemiRestrict(restrict_data_l[l], R_l[l], r_l[l], b_l[l + 1]);
 #if DEBUG
-            if(hypre_StructStencilNDim(hypre_StructMatrixStencil(A)) == 3)
+            if (hypre_StructStencilNDim(hypre_StructMatrixStencil(A)) == 3)
             {
                hypre_sprintf(filename, "zout_xdown.%02d", l);
                hypre_StructVectorPrint(filename, x_l[l], 0);
                hypre_sprintf(filename, "zout_rdown.%02d", l);
                hypre_StructVectorPrint(filename, r_l[l], 0);
-               hypre_sprintf(filename, "zout_b.%02d", l+1);
-               hypre_StructVectorPrint(filename, b_l[l+1], 0);
+               hypre_sprintf(filename, "zout_b.%02d", l + 1);
+               hypre_StructVectorPrint(filename, b_l[l + 1], 0);
             }
 #endif
          }
@@ -242,7 +248,7 @@ hypre_SMGSolve( void               *smg_vdata,
          hypre_SMGRelaxSetZeroGuess(relax_data_l[l], 1);
          hypre_SMGRelax(relax_data_l[l], A_l[l], b_l[l], x_l[l]);
 #if DEBUG
-         if(hypre_StructStencilNDim(hypre_StructMatrixStencil(A)) == 3)
+         if (hypre_StructStencilNDim(hypre_StructMatrixStencil(A)) == 3)
          {
             hypre_sprintf(filename, "zout_xbottom.%02d", l);
             hypre_StructVectorPrint(filename, x_l[l], 0);
@@ -256,10 +262,10 @@ hypre_SMGSolve( void               *smg_vdata,
          for (l = (num_levels - 2); l >= 1; l--)
          {
             /* interpolate error and correct (x = x + Pe_c) */
-            hypre_SemiInterp(interp_data_l[l], PT_l[l], x_l[l+1], e_l[l]);
+            hypre_SemiInterp(interp_data_l[l], PT_l[l], x_l[l + 1], e_l[l]);
             hypre_StructAxpy(1.0, e_l[l], x_l[l]);
 #if DEBUG
-            if(hypre_StructStencilNDim(hypre_StructMatrixStencil(A)) == 3)
+            if (hypre_StructStencilNDim(hypre_StructMatrixStencil(A)) == 3)
             {
                hypre_sprintf(filename, "zout_eup.%02d", l);
                hypre_StructVectorPrint(filename, e_l[l], 0);
@@ -279,7 +285,7 @@ hypre_SMGSolve( void               *smg_vdata,
          hypre_SemiInterp(interp_data_l[0], PT_l[0], x_l[1], e_l[0]);
          hypre_SMGAxpy(1.0, e_l[0], x_l[0], base_index, base_stride);
 #if DEBUG
-         if(hypre_StructStencilNDim(hypre_StructMatrixStencil(A)) == 3)
+         if (hypre_StructStencilNDim(hypre_StructMatrixStencil(A)) == 3)
          {
             hypre_sprintf(filename, "zout_eup.%02d", 0);
             hypre_StructVectorPrint(filename, e_l[0], 0);
diff --git a/external/hypre/src/struct_ls/sparse_msg.c b/external/hypre/src/struct_ls/sparse_msg.c
index d4787ffc..5e978920 100644
--- a/external/hypre/src/struct_ls/sparse_msg.c
+++ b/external/hypre/src/struct_ls/sparse_msg.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -35,7 +35,7 @@ hypre_SparseMSGCreate( MPI_Comm  comm )
    (smsg_data -> jump)             = 0;
    (smsg_data -> relax_type)       = 1;       /* weighted Jacobi */
    (smsg_data -> jacobi_weight)    = 0.0;
-   (smsg_data -> usr_jacobi_weight)= 0;     /* no user Jacobi weight */
+   (smsg_data -> usr_jacobi_weight) = 0;    /* no user Jacobi weight */
    (smsg_data -> num_pre_relax)    = 1;
    (smsg_data -> num_post_relax)   = 1;
    (smsg_data -> num_fine_relax)   = 1;
@@ -47,6 +47,8 @@ hypre_SparseMSGCreate( MPI_Comm  comm )
    (smsg_data -> num_grids[1])     = 1;
    (smsg_data -> num_grids[2])     = 1;
 
+   (smsg_data -> memory_location)  = hypre_HandleMemoryLocation(hypre_handle());
+
    return (void *) smsg_data;
 }
 
@@ -59,7 +61,7 @@ hypre_SparseMSGDestroy( void *smsg_vdata )
 {
    HYPRE_Int ierr = 0;
 
-/* RDF */
+   /* RDF */
 #if 0
    hypre_SparseMSGData *smsg_data = smsg_vdata;
 
@@ -99,20 +101,20 @@ hypre_SparseMSGDestroy( void *smsg_vdata )
          for (l = 0; l < (smsg_data -> num_grids[0]) - 1; l++)
          {
             hypre_StructMatrixDestroy(smsg_data -> Px_array[l]);
-            hypre_StructGridDestroy(smsg_data -> Px_grid_array[l]); 
+            hypre_StructGridDestroy(smsg_data -> Px_grid_array[l]);
          }
          for (l = 0; l < (smsg_data -> num_grids[1]) - 1; l++)
          {
             hypre_StructMatrixDestroy(smsg_data -> Py_array[l]);
-            hypre_StructGridDestroy(smsg_data -> Py_grid_array[l]); 
+            hypre_StructGridDestroy(smsg_data -> Py_grid_array[l]);
          }
          for (l = 0; l < (smsg_data -> num_grids[2]) - 1; l++)
          {
             hypre_StructMatrixDestroy(smsg_data -> Pz_array[l]);
-            hypre_StructGridDestroy(smsg_data -> Pz_grid_array[l]); 
+            hypre_StructGridDestroy(smsg_data -> Pz_grid_array[l]);
          }
 
-          hypre_TFree(smsg_data -> data, HYPRE_MEMORY_HOST);
+         hypre_TFree(smsg_data -> data, HYPRE_MEMORY_HOST);
 
          hypre_TFree(smsg_data -> relax_array, HYPRE_MEMORY_HOST);
          hypre_TFree(smsg_data -> matvec_array, HYPRE_MEMORY_HOST);
@@ -138,12 +140,14 @@ hypre_SparseMSGDestroy( void *smsg_vdata )
          hypre_TFree(smsg_data -> Py_grid_array, HYPRE_MEMORY_HOST);
          hypre_TFree(smsg_data -> Pz_grid_array, HYPRE_MEMORY_HOST);
       }
- 
+
       hypre_FinalizeTiming(smsg_data -> time_index);
       hypre_TFree(smsg_data, HYPRE_MEMORY_HOST);
    }
+#else
+   HYPRE_UNUSED_VAR(smsg_vdata);
 #endif
-/* RDF */
+   /* RDF */
 
    return ierr;
 }
@@ -156,11 +160,11 @@ HYPRE_Int
 hypre_SparseMSGSetTol( void   *smsg_vdata,
                        HYPRE_Real  tol        )
 {
-	hypre_SparseMSGData *smsg_data = (hypre_SparseMSGData *)smsg_vdata;
+   hypre_SparseMSGData *smsg_data = (hypre_SparseMSGData *)smsg_vdata;
    HYPRE_Int       ierr = 0;
- 
+
    (smsg_data -> tol) = tol;
- 
+
    return ierr;
 }
 
@@ -174,9 +178,9 @@ hypre_SparseMSGSetMaxIter( void *smsg_vdata,
 {
    hypre_SparseMSGData *smsg_data = (hypre_SparseMSGData *)smsg_vdata;
    HYPRE_Int       ierr = 0;
- 
+
    (smsg_data -> max_iter) = max_iter;
- 
+
    return ierr;
 }
 
@@ -207,25 +211,25 @@ hypre_SparseMSGSetRelChange( void *smsg_vdata,
 {
    hypre_SparseMSGData *smsg_data = (hypre_SparseMSGData *)smsg_vdata;
    HYPRE_Int       ierr = 0;
- 
+
    (smsg_data -> rel_change) = rel_change;
- 
+
    return ierr;
 }
 
 /*--------------------------------------------------------------------------
  * hypre_SparseMSGSetZeroGuess
  *--------------------------------------------------------------------------*/
- 
+
 HYPRE_Int
 hypre_SparseMSGSetZeroGuess( void *smsg_vdata,
                              HYPRE_Int   zero_guess )
 {
    hypre_SparseMSGData *smsg_data = (hypre_SparseMSGData *)smsg_vdata;
    HYPRE_Int       ierr = 0;
- 
+
    (smsg_data -> zero_guess) = zero_guess;
- 
+
    return ierr;
 }
 
@@ -239,9 +243,9 @@ hypre_SparseMSGSetRelaxType( void *smsg_vdata,
 {
    hypre_SparseMSGData *smsg_data = (hypre_SparseMSGData *)smsg_vdata;
    HYPRE_Int       ierr = 0;
- 
+
    (smsg_data -> relax_type) = relax_type;
- 
+
    return ierr;
 }
 
@@ -255,8 +259,8 @@ hypre_SparseMSGSetJacobiWeight( void  *smsg_vdata,
    hypre_SparseMSGData *smsg_data = (hypre_SparseMSGData *)smsg_vdata;
 
    (smsg_data -> jacobi_weight)    = weight;
-   (smsg_data -> usr_jacobi_weight)= 1;
-                                                                                                                                      
+   (smsg_data -> usr_jacobi_weight) = 1;
+
    return hypre_error_flag;
 }
 
@@ -270,9 +274,9 @@ hypre_SparseMSGSetNumPreRelax( void *smsg_vdata,
 {
    hypre_SparseMSGData *smsg_data = (hypre_SparseMSGData *)smsg_vdata;
    HYPRE_Int       ierr = 0;
- 
+
    (smsg_data -> num_pre_relax) = num_pre_relax;
- 
+
    return ierr;
 }
 
@@ -286,9 +290,9 @@ hypre_SparseMSGSetNumPostRelax( void *smsg_vdata,
 {
    hypre_SparseMSGData *smsg_data = (hypre_SparseMSGData *)smsg_vdata;
    HYPRE_Int       ierr = 0;
- 
+
    (smsg_data -> num_post_relax) = num_post_relax;
- 
+
    return ierr;
 }
 
@@ -302,9 +306,9 @@ hypre_SparseMSGSetNumFineRelax( void *smsg_vdata,
 {
    hypre_SparseMSGData *smsg_data = (hypre_SparseMSGData *)smsg_vdata;
    HYPRE_Int       ierr = 0;
- 
+
    (smsg_data -> num_fine_relax) = num_fine_relax;
- 
+
    return ierr;
 }
 
@@ -318,9 +322,9 @@ hypre_SparseMSGSetLogging( void *smsg_vdata,
 {
    hypre_SparseMSGData *smsg_data = (hypre_SparseMSGData *)smsg_vdata;
    HYPRE_Int       ierr = 0;
- 
+
    (smsg_data -> logging) = logging;
- 
+
    return ierr;
 }
 
@@ -330,13 +334,13 @@ hypre_SparseMSGSetLogging( void *smsg_vdata,
 
 HYPRE_Int
 hypre_SparseMSGSetPrintLevel( void *smsg_vdata,
-                           HYPRE_Int   print_level    )
+                              HYPRE_Int   print_level    )
 {
    hypre_SparseMSGData *smsg_data = (hypre_SparseMSGData *)smsg_vdata;
    HYPRE_Int       ierr = 0;
- 
+
    (smsg_data -> print_level) = print_level;
- 
+
    return ierr;
 }
 
@@ -375,19 +379,19 @@ hypre_SparseMSGPrintLogging( void *smsg_vdata,
 
    if (myid == 0)
    {
-     if (print_level > 0)
-     {
-        if (logging > 0)
-        {
-           for (i = 0; i < num_iterations; i++)
-           {
-              hypre_printf("Residual norm[%d] = %e   ",i,norms[i]);
-              hypre_printf("Relative residual norm[%d] = %e\n",i,rel_norms[i]);
-           }
-        }
-     }
+      if (print_level > 0)
+      {
+         if (logging > 0)
+         {
+            for (i = 0; i < num_iterations; i++)
+            {
+               hypre_printf("Residual norm[%d] = %e   ", i, norms[i]);
+               hypre_printf("Relative residual norm[%d] = %e\n", i, rel_norms[i]);
+            }
+         }
+      }
    }
-  
+
    return ierr;
 }
 
@@ -405,10 +409,10 @@ hypre_SparseMSGGetFinalRelativeResidualNorm( void   *smsg_vdata,
    HYPRE_Int       num_iterations  = (smsg_data -> num_iterations);
    HYPRE_Int       logging         = (smsg_data -> logging);
    HYPRE_Real     *rel_norms       = (smsg_data -> rel_norms);
-            
+
    HYPRE_Int       ierr = 0;
 
-   
+
    if (logging > 0)
    {
       if (max_iter == 0)
@@ -417,15 +421,13 @@ hypre_SparseMSGGetFinalRelativeResidualNorm( void   *smsg_vdata,
       }
       else if (num_iterations == max_iter)
       {
-         *relative_residual_norm = rel_norms[num_iterations-1];
+         *relative_residual_norm = rel_norms[num_iterations - 1];
       }
       else
       {
          *relative_residual_norm = rel_norms[num_iterations];
       }
    }
-   
+
    return ierr;
 }
-
-
diff --git a/external/hypre/src/struct_ls/sparse_msg.h b/external/hypre/src/struct_ls/sparse_msg.h
index bbdde573..c54ca289 100644
--- a/external/hypre/src/struct_ls/sparse_msg.h
+++ b/external/hypre/src/struct_ls/sparse_msg.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -21,7 +21,7 @@
 typedef struct
 {
    MPI_Comm              comm;
-                      
+
    HYPRE_Real            tol;
    HYPRE_Int             max_iter;
    HYPRE_Int             rel_change;
@@ -37,14 +37,15 @@ typedef struct
    HYPRE_Int             num_fine_relax; /* number of fine relaxation sweeps */
 
    HYPRE_Int             num_grids[3];   /* number of grids in each dim */
-   HYPRE_Int    		 num_all_grids;
-   HYPRE_Int    		 num_levels;
-                      
+   HYPRE_Int          num_all_grids;
+   HYPRE_Int          num_levels;
+
    hypre_StructGrid    **grid_array;
    hypre_StructGrid    **Px_grid_array;
    hypre_StructGrid    **Py_grid_array;
    hypre_StructGrid    **Pz_grid_array;
 
+   HYPRE_MemoryLocation  memory_location; /* memory location of data */
    HYPRE_Real           *data;
    hypre_StructMatrix  **A_array;
    hypre_StructMatrix  **Px_array;
diff --git a/external/hypre/src/struct_ls/sparse_msg2_setup_rap.c b/external/hypre/src/struct_ls/sparse_msg2_setup_rap.c
index 687d77f3..a247a2bc 100644
--- a/external/hypre/src/struct_ls/sparse_msg2_setup_rap.c
+++ b/external/hypre/src/struct_ls/sparse_msg2_setup_rap.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -33,6 +33,9 @@ hypre_SparseMSG2CreateRAPOp( hypre_StructMatrix *R,
                              hypre_StructGrid   *coarse_grid,
                              HYPRE_Int           cdir        )
 {
+   HYPRE_UNUSED_VAR(R);
+   HYPRE_UNUSED_VAR(P);
+
    hypre_StructMatrix    *RAP;
 
    hypre_Index           *RAP_stencil_shape;
@@ -73,7 +76,7 @@ hypre_SparseMSG2CreateRAPOp( hypre_StructMatrix *R,
             /*--------------------------------------------------------------
              * Storage for 9 elements (c,w,e,n,s,sw,se,nw,se)
              *--------------------------------------------------------------*/
-            hypre_SetIndex3(index_temp,i,j,0);
+            hypre_SetIndex3(index_temp, i, j, 0);
             MapIndex(index_temp, cdir, RAP_stencil_shape[stencil_rank]);
             stencil_rank++;
          }
@@ -103,9 +106,9 @@ hypre_SparseMSG2CreateRAPOp( hypre_StructMatrix *R,
             /*--------------------------------------------------------------
              * Store 5 elements in (c,w,s,sw,se)
              *--------------------------------------------------------------*/
-            if( i+j <=0 )
+            if ( i + j <= 0 )
             {
-               hypre_SetIndex3(index_temp,i,j,0);
+               hypre_SetIndex3(index_temp, i, j, 0);
                MapIndex(index_temp, cdir, RAP_stencil_shape[stencil_rank]);
                stencil_rank++;
             }
@@ -192,7 +195,7 @@ hypre_SparseMSG2BuildRAPSym( hypre_StructMatrix *A,
    HYPRE_Real           *ra, *rb;
 
    HYPRE_Real           *a_cc, *a_cw, *a_ce, *a_cs, *a_cn;
-   HYPRE_Real           *a_csw, *a_cse, *a_cnw;
+   HYPRE_Real           *a_csw = NULL, *a_cse = NULL, *a_cnw = NULL;
 
    HYPRE_Real           *rap_cc, *rap_cw, *rap_cs;
    HYPRE_Real           *rap_csw, *rap_cse;
@@ -241,14 +244,14 @@ hypre_SparseMSG2BuildRAPSym( hypre_StructMatrix *A,
        * pb is pointer for weight for f-point below c-point
        *-----------------------------------------------------------------*/
 
-      hypre_SetIndex3(index_temp,0,-1,0);
+      hypre_SetIndex3(index_temp, 0, -1, 0);
       MapIndex(index_temp, cdir, index);
       pa = hypre_StructMatrixExtractPointerByIndex(P, fi, index);
 
-      hypre_SetIndex3(index_temp,0,1,0);
+      hypre_SetIndex3(index_temp, 0, 1, 0);
       MapIndex(index_temp, cdir, index);
       pb = hypre_StructMatrixExtractPointerByIndex(P, fi, index) -
-         hypre_BoxOffsetDistance(P_dbox, index);
+           hypre_BoxOffsetDistance(P_dbox, index);
 
       /*-----------------------------------------------------------------
        * Extract pointers for restriction operator:
@@ -256,14 +259,14 @@ hypre_SparseMSG2BuildRAPSym( hypre_StructMatrix *A,
        * rb is pointer for weight for f-point below c-point
        *-----------------------------------------------------------------*/
 
-      hypre_SetIndex3(index_temp,0,-1,0);
+      hypre_SetIndex3(index_temp, 0, -1, 0);
       MapIndex(index_temp, cdir, index);
       ra = hypre_StructMatrixExtractPointerByIndex(R, fi, index);
 
-      hypre_SetIndex3(index_temp,0,1,0);
+      hypre_SetIndex3(index_temp, 0, 1, 0);
       MapIndex(index_temp, cdir, index);
       rb = hypre_StructMatrixExtractPointerByIndex(R, fi, index) -
-         hypre_BoxOffsetDistance(R_dbox, index);
+           hypre_BoxOffsetDistance(R_dbox, index);
 
       /*-----------------------------------------------------------------
        * Extract pointers for 5-point fine grid operator:
@@ -275,23 +278,23 @@ hypre_SparseMSG2BuildRAPSym( hypre_StructMatrix *A,
        * a_cn is pointer for north coefficient
        *-----------------------------------------------------------------*/
 
-      hypre_SetIndex3(index_temp,0,0,0);
+      hypre_SetIndex3(index_temp, 0, 0, 0);
       MapIndex(index_temp, cdir, index);
       a_cc = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-      hypre_SetIndex3(index_temp,-1,0,0);
+      hypre_SetIndex3(index_temp, -1, 0, 0);
       MapIndex(index_temp, cdir, index);
       a_cw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-      hypre_SetIndex3(index_temp,1,0,0);
+      hypre_SetIndex3(index_temp, 1, 0, 0);
       MapIndex(index_temp, cdir, index);
       a_ce = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-      hypre_SetIndex3(index_temp,0,-1,0);
+      hypre_SetIndex3(index_temp, 0, -1, 0);
       MapIndex(index_temp, cdir, index);
       a_cs = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-      hypre_SetIndex3(index_temp,0,1,0);
+      hypre_SetIndex3(index_temp, 0, 1, 0);
       MapIndex(index_temp, cdir, index);
       a_cn = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
@@ -304,17 +307,17 @@ hypre_SparseMSG2BuildRAPSym( hypre_StructMatrix *A,
        * a_cne is pointer for northeast coefficient
        *-----------------------------------------------------------------*/
 
-      if(fine_stencil_size > 5)
+      if (fine_stencil_size > 5)
       {
-         hypre_SetIndex3(index_temp,-1,-1,0);
+         hypre_SetIndex3(index_temp, -1, -1, 0);
          MapIndex(index_temp, cdir, index);
          a_csw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index_temp,1,-1,0);
+         hypre_SetIndex3(index_temp, 1, -1, 0);
          MapIndex(index_temp, cdir, index);
          a_cse = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index_temp,-1,1,0);
+         hypre_SetIndex3(index_temp, -1, 1, 0);
          MapIndex(index_temp, cdir, index);
          a_cnw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
       }
@@ -327,23 +330,23 @@ hypre_SparseMSG2BuildRAPSym( hypre_StructMatrix *A,
        * rap_cc is pointer for center coefficient (etc.)
        *-----------------------------------------------------------------*/
 
-      hypre_SetIndex3(index_temp,0,0,0);
+      hypre_SetIndex3(index_temp, 0, 0, 0);
       MapIndex(index_temp, cdir, index);
       rap_cc = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-      hypre_SetIndex3(index_temp,-1,0,0);
+      hypre_SetIndex3(index_temp, -1, 0, 0);
       MapIndex(index_temp, cdir, index);
       rap_cw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-      hypre_SetIndex3(index_temp,0,-1,0);
+      hypre_SetIndex3(index_temp, 0, -1, 0);
       MapIndex(index_temp, cdir, index);
       rap_cs = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-      hypre_SetIndex3(index_temp,-1,-1,0);
+      hypre_SetIndex3(index_temp, -1, -1, 0);
       MapIndex(index_temp, cdir, index);
       rap_csw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-      hypre_SetIndex3(index_temp,1,-1,0);
+      hypre_SetIndex3(index_temp, 1, -1, 0);
       MapIndex(index_temp, cdir, index);
       rap_cse = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
@@ -355,13 +358,13 @@ hypre_SparseMSG2BuildRAPSym( hypre_StructMatrix *A,
        * Offsets are used in refering to data associated with other points.
        *-----------------------------------------------------------------*/
 
-      hypre_SetIndex3(index_temp,0,1,0);
+      hypre_SetIndex3(index_temp, 0, 1, 0);
       MapIndex(index_temp, cdir, index);
-      yOffsetA = hypre_BoxOffsetDistance(A_dbox,index);
-      yOffsetP = hypre_BoxOffsetDistance(P_dbox,index);
-      hypre_SetIndex3(index_temp,1,0,0);
+      yOffsetA = hypre_BoxOffsetDistance(A_dbox, index);
+      yOffsetP = hypre_BoxOffsetDistance(P_dbox, index);
+      hypre_SetIndex3(index_temp, 1, 0, 0);
       MapIndex(index_temp, cdir, index);
-      xOffsetP = hypre_BoxOffsetDistance(P_dbox,index);
+      xOffsetP = hypre_BoxOffsetDistance(P_dbox, index);
 
       /*-----------------------------------------------------------------
        * Switch statement to direct control to apropriate BoxLoop depending
@@ -397,36 +400,36 @@ hypre_SparseMSG2BuildRAPSym( hypre_StructMatrix *A,
 
                iP1 = iP - yOffsetP;
                rap_cs[iAc] = rb[iR] * a_cc[iAm1] * pa[iP1]
-                  +          rb[iR] * a_cs[iAm1]
-                  +                   a_cs[iA]   * pa[iP1];
+                             +          rb[iR] * a_cs[iAm1]
+                             +                   a_cs[iA]   * pa[iP1];
 
                iP1 = iP - yOffsetP + xOffsetP;
                rap_cse[iAc] = rb[iR] * a_ce[iAm1] * pa[iP1];
 
                iP1 = iP - xOffsetP;
                rap_cw[iAc] =          a_cw[iA]
-                  +          rb[iR] * a_cw[iAm1] * pb[iP1]
-                  +          ra[iR] * a_cw[iAp1] * pa[iP1];
+                                      +          rb[iR] * a_cw[iAm1] * pb[iP1]
+                                      +          ra[iR] * a_cw[iAp1] * pa[iP1];
 
                rap_cc[iAc] =          a_cc[iA]
-                  +          rb[iR] * a_cc[iAm1] * pb[iP]
-                  +          ra[iR] * a_cc[iAp1] * pa[iP]
-                  +          rb[iR] * a_cn[iAm1]
-                  +          ra[iR] * a_cs[iAp1]
-                  +                   a_cs[iA]   * pb[iP]
-                  +                   a_cn[iA]   * pa[iP];
+                                      +          rb[iR] * a_cc[iAm1] * pb[iP]
+                                      +          ra[iR] * a_cc[iAp1] * pa[iP]
+                                      +          rb[iR] * a_cn[iAm1]
+                                      +          ra[iR] * a_cs[iAp1]
+                                      +                   a_cs[iA]   * pb[iP]
+                                      +                   a_cn[iA]   * pa[iP];
             }
             hypre_BoxLoop4End(iP, iR, iA, iAc);
 #undef DEVICE_VAR
 
             break;
 
-            /*--------------------------------------------------------------
-             * Loop for symmetric 9-point fine grid operator; produces a
-             * symmetric 9-point coarse grid operator. We calculate only the
-             * lower triangular stencil entries: (southwest, south, southeast,
-             * west, and center).
-             *--------------------------------------------------------------*/
+         /*--------------------------------------------------------------
+          * Loop for symmetric 9-point fine grid operator; produces a
+          * symmetric 9-point coarse grid operator. We calculate only the
+          * lower triangular stencil entries: (southwest, south, southeast,
+          * west, and center).
+          *--------------------------------------------------------------*/
 
          default:
 
@@ -444,35 +447,35 @@ hypre_SparseMSG2BuildRAPSym( hypre_StructMatrix *A,
 
                HYPRE_Int iP1 = iP - yOffsetP - xOffsetP;
                rap_csw[iAc] = rb[iR] * a_cw[iAm1] * pa[iP1]
-                  +           rb[iR] * a_csw[iAm1]
-                  +                    a_csw[iA]  * pa[iP1];
+                              +           rb[iR] * a_csw[iAm1]
+                              +                    a_csw[iA]  * pa[iP1];
 
                iP1 = iP - yOffsetP;
                rap_cs[iAc] = rb[iR] * a_cc[iAm1] * pa[iP1]
-                  +          rb[iR] * a_cs[iAm1]
-                  +                   a_cs[iA]   * pa[iP1];
+                             +          rb[iR] * a_cs[iAm1]
+                             +                   a_cs[iA]   * pa[iP1];
 
                iP1 = iP - yOffsetP + xOffsetP;
                rap_cse[iAc] = rb[iR] * a_ce[iAm1] * pa[iP1]
-                  +           rb[iR] * a_cse[iAm1]
-                  +                    a_cse[iA]  * pa[iP1];
+                              +           rb[iR] * a_cse[iAm1]
+                              +                    a_cse[iA]  * pa[iP1];
 
                iP1 = iP - xOffsetP;
                rap_cw[iAc] =          a_cw[iA]
-                  +          rb[iR] * a_cw[iAm1] * pb[iP1]
-                  +          ra[iR] * a_cw[iAp1] * pa[iP1]
-                  +          rb[iR] * a_cnw[iAm1]
-                  +          ra[iR] * a_csw[iAp1]
-                  +                   a_csw[iA]  * pb[iP1]
-                  +                   a_cnw[iA]  * pa[iP1];
+                                      +          rb[iR] * a_cw[iAm1] * pb[iP1]
+                                      +          ra[iR] * a_cw[iAp1] * pa[iP1]
+                                      +          rb[iR] * a_cnw[iAm1]
+                                      +          ra[iR] * a_csw[iAp1]
+                                      +                   a_csw[iA]  * pb[iP1]
+                                      +                   a_cnw[iA]  * pa[iP1];
 
                rap_cc[iAc] =          a_cc[iA]
-                  +          rb[iR] * a_cc[iAm1] * pb[iP]
-                  +          ra[iR] * a_cc[iAp1] * pa[iP]
-                  +          rb[iR] * a_cn[iAm1]
-                  +          ra[iR] * a_cs[iAp1]
-                  +                   a_cs[iA]   * pb[iP]
-                  +                   a_cn[iA]   * pa[iP];
+                                      +          rb[iR] * a_cc[iAm1] * pb[iP]
+                                      +          ra[iR] * a_cc[iAp1] * pa[iP]
+                                      +          rb[iR] * a_cn[iAm1]
+                                      +          ra[iR] * a_cs[iAp1]
+                                      +                   a_cs[iA]   * pb[iP]
+                                      +                   a_cn[iA]   * pa[iP];
 
             }
             hypre_BoxLoop4End(iP, iR, iA, iAc);
@@ -530,8 +533,8 @@ hypre_SparseMSG2BuildRAPNoSym( hypre_StructMatrix *A,
    HYPRE_Real           *pa, *pb;
    HYPRE_Real           *ra, *rb;
 
-   HYPRE_Real           *a_cc, *a_cw, *a_ce, *a_cn;
-   HYPRE_Real           *a_cse, *a_cnw, *a_cne;
+   HYPRE_Real           *a_cc = NULL, *a_cw = NULL, *a_ce = NULL, *a_cn = NULL;
+   HYPRE_Real           *a_cse = NULL, *a_cnw = NULL, *a_cne = NULL;
 
    HYPRE_Real           *rap_ce, *rap_cn;
    HYPRE_Real           *rap_cnw, *rap_cne;
@@ -580,14 +583,14 @@ hypre_SparseMSG2BuildRAPNoSym( hypre_StructMatrix *A,
        * pb is pointer for weight for f-point below c-point
        *-----------------------------------------------------------------*/
 
-      hypre_SetIndex3(index_temp,0,-1,0);
+      hypre_SetIndex3(index_temp, 0, -1, 0);
       MapIndex(index_temp, cdir, index);
       pa = hypre_StructMatrixExtractPointerByIndex(P, fi, index);
 
-      hypre_SetIndex3(index_temp,0,1,0);
+      hypre_SetIndex3(index_temp, 0, 1, 0);
       MapIndex(index_temp, cdir, index);
       pb = hypre_StructMatrixExtractPointerByIndex(P, fi, index) -
-         hypre_BoxOffsetDistance(P_dbox, index);
+           hypre_BoxOffsetDistance(P_dbox, index);
 
       /*-----------------------------------------------------------------
        * Extract pointers for restriction operator:
@@ -595,14 +598,14 @@ hypre_SparseMSG2BuildRAPNoSym( hypre_StructMatrix *A,
        * rb is pointer for weight for f-point below c-point
        *-----------------------------------------------------------------*/
 
-      hypre_SetIndex3(index_temp,0,-1,0);
+      hypre_SetIndex3(index_temp, 0, -1, 0);
       MapIndex(index_temp, cdir, index);
       ra = hypre_StructMatrixExtractPointerByIndex(R, fi, index);
 
-      hypre_SetIndex3(index_temp,0,1,0);
+      hypre_SetIndex3(index_temp, 0, 1, 0);
       MapIndex(index_temp, cdir, index);
       rb = hypre_StructMatrixExtractPointerByIndex(R, fi, index) -
-         hypre_BoxOffsetDistance(R_dbox, index);
+           hypre_BoxOffsetDistance(R_dbox, index);
 
       /*-----------------------------------------------------------------
        * Extract pointers for 5-point fine grid operator:
@@ -614,19 +617,19 @@ hypre_SparseMSG2BuildRAPNoSym( hypre_StructMatrix *A,
        * a_cn is pointer for north coefficient
        *-----------------------------------------------------------------*/
 
-      hypre_SetIndex3(index_temp,0,0,0);
+      hypre_SetIndex3(index_temp, 0, 0, 0);
       MapIndex(index_temp, cdir, index);
       a_cc = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-      hypre_SetIndex3(index_temp,-1,0,0);
+      hypre_SetIndex3(index_temp, -1, 0, 0);
       MapIndex(index_temp, cdir, index);
       a_cw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-      hypre_SetIndex3(index_temp,1,0,0);
+      hypre_SetIndex3(index_temp, 1, 0, 0);
       MapIndex(index_temp, cdir, index);
       a_ce = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-      hypre_SetIndex3(index_temp,0,1,0);
+      hypre_SetIndex3(index_temp, 0, 1, 0);
       MapIndex(index_temp, cdir, index);
       a_cn = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
@@ -639,17 +642,17 @@ hypre_SparseMSG2BuildRAPNoSym( hypre_StructMatrix *A,
        * a_cne is pointer for northeast coefficient
        *-----------------------------------------------------------------*/
 
-      if(fine_stencil_size > 5)
+      if (fine_stencil_size > 5)
       {
-         hypre_SetIndex3(index_temp,1,-1,0);
+         hypre_SetIndex3(index_temp, 1, -1, 0);
          MapIndex(index_temp, cdir, index);
          a_cse = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index_temp,-1,1,0);
+         hypre_SetIndex3(index_temp, -1, 1, 0);
          MapIndex(index_temp, cdir, index);
          a_cnw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index_temp,1,1,0);
+         hypre_SetIndex3(index_temp, 1, 1, 0);
          MapIndex(index_temp, cdir, index);
          a_cne = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
@@ -663,19 +666,19 @@ hypre_SparseMSG2BuildRAPNoSym( hypre_StructMatrix *A,
        * rap_ce is pointer for east coefficient (etc.)
        *-----------------------------------------------------------------*/
 
-      hypre_SetIndex3(index_temp,1,0,0);
+      hypre_SetIndex3(index_temp, 1, 0, 0);
       MapIndex(index_temp, cdir, index);
       rap_ce = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-      hypre_SetIndex3(index_temp,0,1,0);
+      hypre_SetIndex3(index_temp, 0, 1, 0);
       MapIndex(index_temp, cdir, index);
       rap_cn = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-      hypre_SetIndex3(index_temp,1,1,0);
+      hypre_SetIndex3(index_temp, 1, 1, 0);
       MapIndex(index_temp, cdir, index);
       rap_cne = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-      hypre_SetIndex3(index_temp,-1,1,0);
+      hypre_SetIndex3(index_temp, -1, 1, 0);
       MapIndex(index_temp, cdir, index);
       rap_cnw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
@@ -687,13 +690,13 @@ hypre_SparseMSG2BuildRAPNoSym( hypre_StructMatrix *A,
        * Offsets are used in refering to data associated with other points.
        *-----------------------------------------------------------------*/
 
-      hypre_SetIndex3(index_temp,0,1,0);
+      hypre_SetIndex3(index_temp, 0, 1, 0);
       MapIndex(index_temp, cdir, index);
-      yOffsetA = hypre_BoxOffsetDistance(A_dbox,index);
-      yOffsetP = hypre_BoxOffsetDistance(P_dbox,index);
-      hypre_SetIndex3(index_temp,1,0,0);
+      yOffsetA = hypre_BoxOffsetDistance(A_dbox, index);
+      yOffsetP = hypre_BoxOffsetDistance(P_dbox, index);
+      hypre_SetIndex3(index_temp, 1, 0, 0);
       MapIndex(index_temp, cdir, index);
-      xOffsetP = hypre_BoxOffsetDistance(P_dbox,index);
+      xOffsetP = hypre_BoxOffsetDistance(P_dbox, index);
 
       /*-----------------------------------------------------------------
        * Switch statement to direct control to appropriate BoxLoop depending
@@ -728,27 +731,27 @@ hypre_SparseMSG2BuildRAPNoSym( hypre_StructMatrix *A,
 
                iP1 = iP + yOffsetP;
                rap_cn[iAc] = ra[iR] * a_cc[iAp1] * pb[iP1]
-                  +          ra[iR] * a_cn[iAp1]
-                  +                   a_cn[iA]   * pb[iP1];
+                             +          ra[iR] * a_cn[iAp1]
+                             +                   a_cn[iA]   * pb[iP1];
 
                iP1 = iP + yOffsetP - xOffsetP;
                rap_cnw[iAc] = ra[iR] * a_cw[iAp1] * pb[iP1];
 
                iP1 = iP + xOffsetP;
                rap_ce[iAc] =          a_ce[iA]
-                  +          rb[iR] * a_ce[iAm1] * pb[iP1]
-                  +          ra[iR] * a_ce[iAp1] * pa[iP1];
+                                      +          rb[iR] * a_ce[iAm1] * pb[iP1]
+                                      +          ra[iR] * a_ce[iAp1] * pa[iP1];
             }
             hypre_BoxLoop4End(iP, iR, iA, iAc);
 #undef DEVICE_VAR
 
             break;
 
-            /*--------------------------------------------------------------
-             * Loop for 9-point fine grid operator; produces upper triangular
-             * part of 9-point coarse grid operator - excludes diagonal.
-             * stencil entries: (northeast, north, northwest, and east)
-             *--------------------------------------------------------------*/
+         /*--------------------------------------------------------------
+          * Loop for 9-point fine grid operator; produces upper triangular
+          * part of 9-point coarse grid operator - excludes diagonal.
+          * stencil entries: (northeast, north, northwest, and east)
+          *--------------------------------------------------------------*/
 
          default:
 
@@ -766,27 +769,27 @@ hypre_SparseMSG2BuildRAPNoSym( hypre_StructMatrix *A,
 
                HYPRE_Int iP1 = iP + yOffsetP + xOffsetP;
                rap_cne[iAc] = ra[iR] * a_ce[iAp1] * pb[iP1]
-                  +           ra[iR] * a_cne[iAp1]
-                  +                    a_cne[iA]  * pb[iP1];
+                              +           ra[iR] * a_cne[iAp1]
+                              +                    a_cne[iA]  * pb[iP1];
 
                iP1 = iP + yOffsetP;
                rap_cn[iAc] = ra[iR] * a_cc[iAp1] * pb[iP1]
-                  +          ra[iR] * a_cn[iAp1]
-                  +                   a_cn[iA]   * pb[iP1];
+                             +          ra[iR] * a_cn[iAp1]
+                             +                   a_cn[iA]   * pb[iP1];
 
                iP1 = iP + yOffsetP - xOffsetP;
                rap_cnw[iAc] = ra[iR] * a_cw[iAp1] * pb[iP1]
-                  +           ra[iR] * a_cnw[iAp1]
-                  +                    a_cnw[iA]  * pb[iP1];
+                              +           ra[iR] * a_cnw[iAp1]
+                              +                    a_cnw[iA]  * pb[iP1];
 
                iP1 = iP + xOffsetP;
                rap_ce[iAc] =          a_ce[iA]
-                  +          rb[iR] * a_ce[iAm1] * pb[iP1]
-                  +          ra[iR] * a_ce[iAp1] * pa[iP1]
-                  +          rb[iR] * a_cne[iAm1]
-                  +          ra[iR] * a_cse[iAp1]
-                  +                   a_cse[iA]  * pb[iP1]
-                  +                   a_cne[iA]  * pa[iP1];
+                                      +          rb[iR] * a_ce[iAm1] * pb[iP1]
+                                      +          ra[iR] * a_ce[iAp1] * pa[iP1]
+                                      +          rb[iR] * a_cne[iAm1]
+                                      +          ra[iR] * a_cse[iAp1]
+                                      +                   a_cse[iA]  * pb[iP1]
+                                      +                   a_cne[iA]  * pa[iP1];
             }
             hypre_BoxLoop4End(iP, iR, iA, iAc);
 #undef DEVICE_VAR
@@ -799,4 +802,3 @@ hypre_SparseMSG2BuildRAPNoSym( hypre_StructMatrix *A,
 
    return ierr;
 }
-
diff --git a/external/hypre/src/struct_ls/sparse_msg3_setup_rap.c b/external/hypre/src/struct_ls/sparse_msg3_setup_rap.c
index d4072863..6cd90a7e 100644
--- a/external/hypre/src/struct_ls/sparse_msg3_setup_rap.c
+++ b/external/hypre/src/struct_ls/sparse_msg3_setup_rap.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -34,6 +34,9 @@ hypre_SparseMSG3CreateRAPOp( hypre_StructMatrix *R,
                              hypre_StructGrid   *coarse_grid,
                              HYPRE_Int           cdir        )
 {
+   HYPRE_UNUSED_VAR(R);
+   HYPRE_UNUSED_VAR(P);
+
    hypre_StructMatrix    *RAP;
 
    hypre_Index           *RAP_stencil_shape;
@@ -73,7 +76,7 @@ hypre_SparseMSG3CreateRAPOp( hypre_StructMatrix *R,
     * lower triangular means the lower triangular part on the matrix
     * in the standard lexicographic ordering.
     *-----------------------------------------------------------------------*/
-   if( A_stencil_size == 7)
+   if ( A_stencil_size == 7)
    {
       RAP_stencil_size = 19;
       if (hypre_StructMatrixSymmetric(A))
@@ -87,9 +90,9 @@ hypre_SparseMSG3CreateRAPOp( hypre_StructMatrix *R,
          {
             for (i = -1; i < 2; i++)
             {
-               if ((i*j*k == 0) && (stencil_rank < RAP_stencil_size))
+               if ((i * j * k == 0) && (stencil_rank < RAP_stencil_size))
                {
-                  hypre_SetIndex3(index_temp,i,j,k);
+                  hypre_SetIndex3(index_temp, i, j, k);
                   MapIndex(index_temp, cdir,
                            RAP_stencil_shape[stencil_rank]);
                   stencil_rank++;
@@ -124,7 +127,7 @@ hypre_SparseMSG3CreateRAPOp( hypre_StructMatrix *R,
             {
                if (stencil_rank < RAP_stencil_size)
                {
-                  hypre_SetIndex3(index_temp,i,j,k);
+                  hypre_SetIndex3(index_temp, i, j, k);
                   MapIndex(index_temp, cdir,
                            RAP_stencil_shape[stencil_rank]);
                   stencil_rank++;
@@ -210,17 +213,18 @@ hypre_SparseMSG3BuildRAPSym( hypre_StructMatrix *A,
    HYPRE_Real           *pa, *pb;
    HYPRE_Real           *ra, *rb;
 
-   HYPRE_Real           *a_cc, *a_cw, *a_ce, *a_cs, *a_cn;
-   HYPRE_Real           *a_ac, *a_aw, *a_as;
-   HYPRE_Real           *a_bc, *a_bw, *a_be, *a_bs, *a_bn;
-   HYPRE_Real           *a_csw, *a_cse, *a_cnw, *a_cne;
-   HYPRE_Real           *a_asw, *a_ase;
-   HYPRE_Real           *a_bsw, *a_bse, *a_bnw, *a_bne;
+   HYPRE_Real           *a_cc = NULL, *a_cw = NULL, *a_ce = NULL, *a_cs = NULL, *a_cn = NULL;
+   HYPRE_Real           *a_ac = NULL, *a_aw = NULL, *a_as = NULL;
+   HYPRE_Real           *a_bc = NULL, *a_bw = NULL, *a_be = NULL, *a_bs = NULL, *a_bn = NULL;
+   HYPRE_Real           *a_csw = NULL, *a_cse = NULL, *a_cnw = NULL, *a_cne = NULL;
+   HYPRE_Real           *a_asw = NULL, *a_ase = NULL;
+   HYPRE_Real           *a_bsw = NULL, *a_bse = NULL, *a_bnw = NULL, *a_bne = NULL;
 
-   HYPRE_Real           *rap_cc, *rap_cw, *rap_cs;
-   HYPRE_Real           *rap_bc, *rap_bw, *rap_be, *rap_bs, *rap_bn;
-   HYPRE_Real           *rap_csw, *rap_cse;
-   HYPRE_Real           *rap_bsw, *rap_bse, *rap_bnw, *rap_bne;
+   HYPRE_Real           *rap_cc = NULL, *rap_cw = NULL, *rap_cs = NULL;
+   HYPRE_Real           *rap_bc = NULL, *rap_bw = NULL, *rap_be = NULL;
+   HYPRE_Real           *rap_bs = NULL, *rap_bn = NULL;
+   HYPRE_Real           *rap_csw = NULL, *rap_cse = NULL;
+   HYPRE_Real           *rap_bsw = NULL, *rap_bse = NULL, *rap_bnw = NULL, *rap_bne = NULL;
 
    HYPRE_Int             zOffsetA;
    HYPRE_Int             xOffsetP;
@@ -267,14 +271,14 @@ hypre_SparseMSG3BuildRAPSym( hypre_StructMatrix *A,
        * pb is pointer for weight for f-point below c-point
        *-----------------------------------------------------------------*/
 
-      hypre_SetIndex3(index_temp,0,0,-1);
+      hypre_SetIndex3(index_temp, 0, 0, -1);
       MapIndex(index_temp, cdir, index);
       pa = hypre_StructMatrixExtractPointerByIndex(P, fi, index);
 
-      hypre_SetIndex3(index_temp,0,0,1);
+      hypre_SetIndex3(index_temp, 0, 0, 1);
       MapIndex(index_temp, cdir, index);
       pb = hypre_StructMatrixExtractPointerByIndex(P, fi, index) -
-         hypre_BoxOffsetDistance(P_dbox, index);
+           hypre_BoxOffsetDistance(P_dbox, index);
 
       /*-----------------------------------------------------------------
        * Extract pointers for restriction operator:
@@ -282,14 +286,14 @@ hypre_SparseMSG3BuildRAPSym( hypre_StructMatrix *A,
        * rb is pointer for weight for f-point below c-point
        *-----------------------------------------------------------------*/
 
-      hypre_SetIndex3(index_temp,0,0,-1);
+      hypre_SetIndex3(index_temp, 0, 0, -1);
       MapIndex(index_temp, cdir, index);
       ra = hypre_StructMatrixExtractPointerByIndex(R, fi, index);
 
-      hypre_SetIndex3(index_temp,0,0,1);
+      hypre_SetIndex3(index_temp, 0, 0, 1);
       MapIndex(index_temp, cdir, index);
       rb = hypre_StructMatrixExtractPointerByIndex(R, fi, index) -
-         hypre_BoxOffsetDistance(R_dbox, index);
+           hypre_BoxOffsetDistance(R_dbox, index);
 
       /*-----------------------------------------------------------------
        * Extract pointers for 7-point fine grid operator:
@@ -303,31 +307,31 @@ hypre_SparseMSG3BuildRAPSym( hypre_StructMatrix *A,
        * a_bc is pointer for center coefficient in plane below
        *-----------------------------------------------------------------*/
 
-      hypre_SetIndex3(index_temp,0,0,0);
+      hypre_SetIndex3(index_temp, 0, 0, 0);
       MapIndex(index_temp, cdir, index);
       a_cc = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-      hypre_SetIndex3(index_temp,-1,0,0);
+      hypre_SetIndex3(index_temp, -1, 0, 0);
       MapIndex(index_temp, cdir, index);
       a_cw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-      hypre_SetIndex3(index_temp,1,0,0);
+      hypre_SetIndex3(index_temp, 1, 0, 0);
       MapIndex(index_temp, cdir, index);
       a_ce = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-      hypre_SetIndex3(index_temp,0,-1,0);
+      hypre_SetIndex3(index_temp, 0, -1, 0);
       MapIndex(index_temp, cdir, index);
       a_cs = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-      hypre_SetIndex3(index_temp,0,1,0);
+      hypre_SetIndex3(index_temp, 0, 1, 0);
       MapIndex(index_temp, cdir, index);
       a_cn = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-      hypre_SetIndex3(index_temp,0,0,1);
+      hypre_SetIndex3(index_temp, 0, 0, 1);
       MapIndex(index_temp, cdir, index);
       a_ac = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-      hypre_SetIndex3(index_temp,0,0,-1);
+      hypre_SetIndex3(index_temp, 0, 0, -1);
       MapIndex(index_temp, cdir, index);
       a_bc = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
@@ -350,43 +354,43 @@ hypre_SparseMSG3BuildRAPSym( hypre_StructMatrix *A,
 
       if (fine_stencil_size > 7)
       {
-         hypre_SetIndex3(index_temp,-1,0,1);
+         hypre_SetIndex3(index_temp, -1, 0, 1);
          MapIndex(index_temp, cdir, index);
          a_aw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index_temp,0,-1,1);
+         hypre_SetIndex3(index_temp, 0, -1, 1);
          MapIndex(index_temp, cdir, index);
          a_as = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index_temp,-1,0,-1);
+         hypre_SetIndex3(index_temp, -1, 0, -1);
          MapIndex(index_temp, cdir, index);
          a_bw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index_temp,1,0,-1);
+         hypre_SetIndex3(index_temp, 1, 0, -1);
          MapIndex(index_temp, cdir, index);
          a_be = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index_temp,0,-1,-1);
+         hypre_SetIndex3(index_temp, 0, -1, -1);
          MapIndex(index_temp, cdir, index);
          a_bs = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index_temp,0,1,-1);
+         hypre_SetIndex3(index_temp, 0, 1, -1);
          MapIndex(index_temp, cdir, index);
          a_bn = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index_temp,-1,-1,0);
+         hypre_SetIndex3(index_temp, -1, -1, 0);
          MapIndex(index_temp, cdir, index);
          a_csw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index_temp,1,-1,0);
+         hypre_SetIndex3(index_temp, 1, -1, 0);
          MapIndex(index_temp, cdir, index);
          a_cse = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index_temp,-1,1,0);
+         hypre_SetIndex3(index_temp, -1, 1, 0);
          MapIndex(index_temp, cdir, index);
          a_cnw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index_temp,1,1,0);
+         hypre_SetIndex3(index_temp, 1, 1, 0);
          MapIndex(index_temp, cdir, index);
          a_cne = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
       }
@@ -406,27 +410,27 @@ hypre_SparseMSG3BuildRAPSym( hypre_StructMatrix *A,
 
       if (fine_stencil_size > 19)
       {
-         hypre_SetIndex3(index_temp,-1,-1,1);
+         hypre_SetIndex3(index_temp, -1, -1, 1);
          MapIndex(index_temp, cdir, index);
          a_asw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index_temp,1,-1,1);
+         hypre_SetIndex3(index_temp, 1, -1, 1);
          MapIndex(index_temp, cdir, index);
          a_ase = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index_temp,-1,-1,-1);
+         hypre_SetIndex3(index_temp, -1, -1, -1);
          MapIndex(index_temp, cdir, index);
          a_bsw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index_temp,1,-1,-1);
+         hypre_SetIndex3(index_temp, 1, -1, -1);
          MapIndex(index_temp, cdir, index);
          a_bse = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index_temp,-1,1,-1);
+         hypre_SetIndex3(index_temp, -1, 1, -1);
          MapIndex(index_temp, cdir, index);
          a_bnw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index_temp,1,1,-1);
+         hypre_SetIndex3(index_temp, 1, 1, -1);
          MapIndex(index_temp, cdir, index);
          a_bne = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
       }
@@ -439,43 +443,43 @@ hypre_SparseMSG3BuildRAPSym( hypre_StructMatrix *A,
        * rap_cc is pointer for center coefficient (etc.)
        *-----------------------------------------------------------------*/
 
-      hypre_SetIndex3(index_temp,0,0,0);
+      hypre_SetIndex3(index_temp, 0, 0, 0);
       MapIndex(index_temp, cdir, index);
       rap_cc = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-      hypre_SetIndex3(index_temp,-1,0,0);
+      hypre_SetIndex3(index_temp, -1, 0, 0);
       MapIndex(index_temp, cdir, index);
       rap_cw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-      hypre_SetIndex3(index_temp,0,-1,0);
+      hypre_SetIndex3(index_temp, 0, -1, 0);
       MapIndex(index_temp, cdir, index);
       rap_cs = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-      hypre_SetIndex3(index_temp,0,0,-1);
+      hypre_SetIndex3(index_temp, 0, 0, -1);
       MapIndex(index_temp, cdir, index);
       rap_bc = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-      hypre_SetIndex3(index_temp,-1,0,-1);
+      hypre_SetIndex3(index_temp, -1, 0, -1);
       MapIndex(index_temp, cdir, index);
       rap_bw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-      hypre_SetIndex3(index_temp,1,0,-1);
+      hypre_SetIndex3(index_temp, 1, 0, -1);
       MapIndex(index_temp, cdir, index);
       rap_be = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-      hypre_SetIndex3(index_temp,0,-1,-1);
+      hypre_SetIndex3(index_temp, 0, -1, -1);
       MapIndex(index_temp, cdir, index);
       rap_bs = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-      hypre_SetIndex3(index_temp,0,1,-1);
+      hypre_SetIndex3(index_temp, 0, 1, -1);
       MapIndex(index_temp, cdir, index);
       rap_bn = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-      hypre_SetIndex3(index_temp,-1,-1,0);
+      hypre_SetIndex3(index_temp, -1, -1, 0);
       MapIndex(index_temp, cdir, index);
       rap_csw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-      hypre_SetIndex3(index_temp,1,-1,0);
+      hypre_SetIndex3(index_temp, 1, -1, 0);
       MapIndex(index_temp, cdir, index);
       rap_cse = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
@@ -492,19 +496,19 @@ hypre_SparseMSG3BuildRAPSym( hypre_StructMatrix *A,
 
       if (fine_stencil_size > 7)
       {
-         hypre_SetIndex3(index_temp,-1,-1,-1);
+         hypre_SetIndex3(index_temp, -1, -1, -1);
          MapIndex(index_temp, cdir, index);
          rap_bsw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-         hypre_SetIndex3(index_temp,1,-1,-1);
+         hypre_SetIndex3(index_temp, 1, -1, -1);
          MapIndex(index_temp, cdir, index);
          rap_bse = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-         hypre_SetIndex3(index_temp,-1,1,-1);
+         hypre_SetIndex3(index_temp, -1, 1, -1);
          MapIndex(index_temp, cdir, index);
          rap_bnw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-         hypre_SetIndex3(index_temp,1,1,-1);
+         hypre_SetIndex3(index_temp, 1, 1, -1);
          MapIndex(index_temp, cdir, index);
          rap_bne = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
       }
@@ -517,16 +521,16 @@ hypre_SparseMSG3BuildRAPSym( hypre_StructMatrix *A,
        * Offsets are used in refering to data associated with other points.
        *-----------------------------------------------------------------*/
 
-      hypre_SetIndex3(index_temp,0,0,1);
+      hypre_SetIndex3(index_temp, 0, 0, 1);
       MapIndex(index_temp, cdir, index);
-      zOffsetA = hypre_BoxOffsetDistance(A_dbox,index);
-      zOffsetP = hypre_BoxOffsetDistance(P_dbox,index);
-      hypre_SetIndex3(index_temp,0,1,0);
+      zOffsetA = hypre_BoxOffsetDistance(A_dbox, index);
+      zOffsetP = hypre_BoxOffsetDistance(P_dbox, index);
+      hypre_SetIndex3(index_temp, 0, 1, 0);
       MapIndex(index_temp, cdir, index);
-      yOffsetP = hypre_BoxOffsetDistance(P_dbox,index);
-      hypre_SetIndex3(index_temp,1,0,0);
+      yOffsetP = hypre_BoxOffsetDistance(P_dbox, index);
+      hypre_SetIndex3(index_temp, 1, 0, 0);
       MapIndex(index_temp, cdir, index);
-      xOffsetP = hypre_BoxOffsetDistance(P_dbox,index);
+      xOffsetP = hypre_BoxOffsetDistance(P_dbox, index);
 
       /*--------------------------------------------------------------------
        * Switch statement to direct control to apropriate BoxLoop depending
@@ -566,8 +570,8 @@ hypre_SparseMSG3BuildRAPSym( hypre_StructMatrix *A,
 
                iP1 = iP - zOffsetP;
                rap_bc[iAc] =          a_bc[iA]   * pa[iP1]
-                  +          rb[iR] * a_cc[iAm1] * pa[iP1]
-                  +          rb[iR] * a_bc[iAm1];
+                                      +          rb[iR] * a_cc[iAm1] * pa[iP1]
+                                      +          rb[iR] * a_bc[iAm1];
 
                iP1 = iP - zOffsetP + xOffsetP;
                rap_be[iAc] = rb[iR] * a_ce[iAm1] * pa[iP1];
@@ -577,25 +581,25 @@ hypre_SparseMSG3BuildRAPSym( hypre_StructMatrix *A,
 
                iP1 = iP - yOffsetP;
                rap_cs[iAc] =          a_cs[iA]
-                  +          rb[iR] * a_cs[iAm1] * pb[iP1]
-                  +          ra[iR] * a_cs[iAp1] * pa[iP1];
+                                      +          rb[iR] * a_cs[iAm1] * pb[iP1]
+                                      +          ra[iR] * a_cs[iAp1] * pa[iP1];
 
                iP1 = iP - xOffsetP;
                rap_cw[iAc] =          a_cw[iA]
-                  +          rb[iR] * a_cw[iAm1] * pb[iP1]
-                  +          ra[iR] * a_cw[iAp1] * pa[iP1];
+                                      +          rb[iR] * a_cw[iAm1] * pb[iP1]
+                                      +          ra[iR] * a_cw[iAp1] * pa[iP1];
 
                rap_csw[iAc] = 0.0;
 
                rap_cse[iAc] = 0.0;
 
                rap_cc[iAc] =          a_cc[iA]
-                  +          rb[iR] * a_cc[iAm1] * pb[iP]
-                  +          ra[iR] * a_cc[iAp1] * pa[iP]
-                  +          rb[iR] * a_ac[iAm1]
-                  +          ra[iR] * a_bc[iAp1]
-                  +                   a_bc[iA]   * pb[iP]
-                  +                   a_ac[iA]   * pa[iP];
+                                      +          rb[iR] * a_cc[iAm1] * pb[iP]
+                                      +          ra[iR] * a_cc[iAp1] * pa[iP]
+                                      +          rb[iR] * a_ac[iAm1]
+                                      +          ra[iR] * a_bc[iAp1]
+                                      +                   a_bc[iA]   * pb[iP]
+                                      +                   a_ac[iA]   * pa[iP];
 
             }
             hypre_BoxLoop4End(iP, iR, iA, iAc);
@@ -603,14 +607,14 @@ hypre_SparseMSG3BuildRAPSym( hypre_StructMatrix *A,
 
             break;
 
-            /*--------------------------------------------------------------
-             * Loop for symmetric 19-point fine grid operator; produces a
-             * symmetric 27-point coarse grid operator. We calculate only the
-             * lower triangular stencil entries: (below-southwest, below-south,
-             * below-southeast, below-west, below-center, below-east,
-             * below-northwest, below-north, below-northeast, center-southwest,
-             * center-south, center-southeast, center-west, and center-center).
-             *--------------------------------------------------------------*/
+         /*--------------------------------------------------------------
+          * Loop for symmetric 19-point fine grid operator; produces a
+          * symmetric 27-point coarse grid operator. We calculate only the
+          * lower triangular stencil entries: (below-southwest, below-south,
+          * below-southeast, below-west, below-center, below-east,
+          * below-northwest, below-north, below-northeast, center-southwest,
+          * center-south, center-southeast, center-west, and center-center).
+          *--------------------------------------------------------------*/
 
          case 19:
 
@@ -631,73 +635,73 @@ hypre_SparseMSG3BuildRAPSym( hypre_StructMatrix *A,
 
                iP1 = iP - zOffsetP - yOffsetP;
                rap_bs[iAc] = rb[iR] * a_cs[iAm1] * pa[iP1]
-                  +          rb[iR] * a_bs[iAm1]
-                  +                   a_bs[iA]   * pa[iP1];
+                             +          rb[iR] * a_bs[iAm1]
+                             +                   a_bs[iA]   * pa[iP1];
 
                iP1 = iP - zOffsetP - yOffsetP + xOffsetP;
                rap_bse[iAc] = rb[iR] * a_cse[iAm1] * pa[iP1];
 
                iP1 = iP - zOffsetP - xOffsetP;
                rap_bw[iAc] = rb[iR] * a_cw[iAm1] * pa[iP1]
-                  +          rb[iR] * a_bw[iAm1]
-                  +                   a_bw[iA]   * pa[iP1];
+                             +          rb[iR] * a_bw[iAm1]
+                             +                   a_bw[iA]   * pa[iP1];
 
                iP1 = iP - zOffsetP;
                rap_bc[iAc] =          a_bc[iA] * pa[iP1]
-                  +          rb[iR] * a_cc[iAm1] * pa[iP1]
-                  +          rb[iR] * a_bc[iAm1];
+                                      +          rb[iR] * a_cc[iAm1] * pa[iP1]
+                                      +          rb[iR] * a_bc[iAm1];
 
                iP1 = iP - zOffsetP + xOffsetP;
                rap_be[iAc] = rb[iR] * a_ce[iAm1] * pa[iP1]
-                  +          rb[iR] * a_be[iAm1]
-                  +                   a_be[iA]   * pa[iP1];
+                             +          rb[iR] * a_be[iAm1]
+                             +                   a_be[iA]   * pa[iP1];
 
                iP1 = iP - zOffsetP + yOffsetP - xOffsetP;
                rap_bnw[iAc] = rb[iR] * a_cnw[iAm1] * pa[iP1];
 
                iP1 = iP - zOffsetP + yOffsetP;
                rap_bn[iAc] = rb[iR] * a_cn[iAm1] * pa[iP1]
-                  +          rb[iR] * a_bn[iAm1]
-                  +                   a_bn[iA]   * pa[iP1];
+                             +          rb[iR] * a_bn[iAm1]
+                             +                   a_bn[iA]   * pa[iP1];
 
                iP1 = iP - zOffsetP + yOffsetP + xOffsetP;
                rap_bne[iAc] = rb[iR] * a_cne[iAm1] * pa[iP1];
 
                iP1 = iP - yOffsetP - xOffsetP;
                rap_csw[iAc] =         a_csw[iA]
-                  +          rb[iR] * a_csw[iAm1] * pb[iP1]
-                  +          ra[iR] * a_csw[iAp1] * pa[iP1];
+                                      +          rb[iR] * a_csw[iAm1] * pb[iP1]
+                                      +          ra[iR] * a_csw[iAp1] * pa[iP1];
 
                iP1 = iP - yOffsetP;
                rap_cs[iAc] =          a_cs[iA]
-                  +          rb[iR] * a_cs[iAm1] * pb[iP1]
-                  +          ra[iR] * a_cs[iAp1] * pa[iP1]
-                  +                   a_bs[iA]   * pb[iP1]
-                  +                   a_as[iA]   * pa[iP1]
-                  +          rb[iR] * a_as[iAm1]
-                  +          ra[iR] * a_bs[iAp1];
+                                      +          rb[iR] * a_cs[iAm1] * pb[iP1]
+                                      +          ra[iR] * a_cs[iAp1] * pa[iP1]
+                                      +                   a_bs[iA]   * pb[iP1]
+                                      +                   a_as[iA]   * pa[iP1]
+                                      +          rb[iR] * a_as[iAm1]
+                                      +          ra[iR] * a_bs[iAp1];
 
                iP1 = iP - yOffsetP + xOffsetP;
                rap_cse[iAc] =          a_cse[iA]
-                  +          rb[iR] * a_cse[iAm1] * pb[iP1]
-                  +          ra[iR] * a_cse[iAp1] * pa[iP1];
+                                       +          rb[iR] * a_cse[iAm1] * pb[iP1]
+                                       +          ra[iR] * a_cse[iAp1] * pa[iP1];
 
                iP1 = iP - xOffsetP;
                rap_cw[iAc] =          a_cw[iA]
-                  +          rb[iR] * a_cw[iAm1] * pb[iP1]
-                  +          ra[iR] * a_cw[iAp1] * pa[iP1]
-                  +                   a_bw[iA]   * pb[iP1]
-                  +                   a_aw[iA]   * pa[iP1]
-                  +          rb[iR] * a_aw[iAm1]
-                  +          ra[iR] * a_bw[iAp1];
+                                      +          rb[iR] * a_cw[iAm1] * pb[iP1]
+                                      +          ra[iR] * a_cw[iAp1] * pa[iP1]
+                                      +                   a_bw[iA]   * pb[iP1]
+                                      +                   a_aw[iA]   * pa[iP1]
+                                      +          rb[iR] * a_aw[iAm1]
+                                      +          ra[iR] * a_bw[iAp1];
 
                rap_cc[iAc] =          a_cc[iA]
-                  +          rb[iR] * a_cc[iAm1] * pb[iP]
-                  +          ra[iR] * a_cc[iAp1] * pa[iP]
-                  +          rb[iR] * a_ac[iAm1]
-                  +          ra[iR] * a_bc[iAp1]
-                  +                   a_bc[iA]   * pb[iP]
-                  +                   a_ac[iA]   * pa[iP];
+                                      +          rb[iR] * a_cc[iAm1] * pb[iP]
+                                      +          ra[iR] * a_cc[iAp1] * pa[iP]
+                                      +          rb[iR] * a_ac[iAm1]
+                                      +          ra[iR] * a_bc[iAp1]
+                                      +                   a_bc[iA]   * pb[iP]
+                                      +                   a_ac[iA]   * pa[iP];
 
             }
             hypre_BoxLoop4End(iP, iR, iA, iAc);
@@ -705,14 +709,14 @@ hypre_SparseMSG3BuildRAPSym( hypre_StructMatrix *A,
 
             break;
 
-            /*--------------------------------------------------------------
-             * Loop for symmetric 27-point fine grid operator; produces a
-             * symmetric 27-point coarse grid operator. We calculate only the
-             * lower triangular stencil entries: (below-southwest, below-south,
-             * below-southeast, below-west, below-center, below-east,
-             * below-northwest, below-north, below-northeast, center-southwest,
-             * center-south, center-southeast, center-west, and center-center).
-             *--------------------------------------------------------------*/
+         /*--------------------------------------------------------------
+          * Loop for symmetric 27-point fine grid operator; produces a
+          * symmetric 27-point coarse grid operator. We calculate only the
+          * lower triangular stencil entries: (below-southwest, below-south,
+          * below-southeast, below-west, below-center, below-east,
+          * below-northwest, below-north, below-northeast, center-southwest,
+          * center-south, center-southeast, center-west, and center-center).
+          *--------------------------------------------------------------*/
 
          default:
 
@@ -730,92 +734,92 @@ hypre_SparseMSG3BuildRAPSym( hypre_StructMatrix *A,
 
                HYPRE_Int iP1 = iP - zOffsetP - yOffsetP - xOffsetP;
                rap_bsw[iAc] = rb[iR] * a_csw[iAm1] * pa[iP1]
-                  +           rb[iR] * a_bsw[iAm1]
-                  +                    a_bsw[iA]   * pa[iP1];
+                              +           rb[iR] * a_bsw[iAm1]
+                              +                    a_bsw[iA]   * pa[iP1];
 
                iP1 = iP - zOffsetP - yOffsetP;
                rap_bs[iAc] = rb[iR] * a_cs[iAm1] * pa[iP1]
-                  +          rb[iR] * a_bs[iAm1]
-                  +                   a_bs[iA]   * pa[iP1];
+                             +          rb[iR] * a_bs[iAm1]
+                             +                   a_bs[iA]   * pa[iP1];
 
                iP1 = iP - zOffsetP - yOffsetP + xOffsetP;
                rap_bse[iAc] = rb[iR] * a_cse[iAm1] * pa[iP1]
-                  +           rb[iR] * a_bse[iAm1]
-                  +                    a_bse[iA]   * pa[iP1];
+                              +           rb[iR] * a_bse[iAm1]
+                              +                    a_bse[iA]   * pa[iP1];
 
                iP1 = iP - zOffsetP - xOffsetP;
                rap_bw[iAc] = rb[iR] * a_cw[iAm1] * pa[iP1]
-                  +          rb[iR] * a_bw[iAm1]
-                  +                   a_bw[iA]   * pa[iP1];
+                             +          rb[iR] * a_bw[iAm1]
+                             +                   a_bw[iA]   * pa[iP1];
 
                iP1 = iP - zOffsetP;
                rap_bc[iAc] =          a_bc[iA]   * pa[iP1]
-                  +          rb[iR] * a_cc[iAm1] * pa[iP1]
-                  +          rb[iR] * a_bc[iAm1];
+                                      +          rb[iR] * a_cc[iAm1] * pa[iP1]
+                                      +          rb[iR] * a_bc[iAm1];
 
                iP1 = iP - zOffsetP + xOffsetP;
                rap_be[iAc] = rb[iR] * a_ce[iAm1] * pa[iP1]
-                  +          rb[iR] * a_be[iAm1]
-                  +                   a_be[iA]   * pa[iP1];
+                             +          rb[iR] * a_be[iAm1]
+                             +                   a_be[iA]   * pa[iP1];
 
                iP1 = iP - zOffsetP + yOffsetP - xOffsetP;
                rap_bnw[iAc] = rb[iR] * a_cnw[iAm1] * pa[iP1]
-                  +           rb[iR] * a_bnw[iAm1]
-                  +                    a_bnw[iA]   * pa[iP1];
+                              +           rb[iR] * a_bnw[iAm1]
+                              +                    a_bnw[iA]   * pa[iP1];
 
                iP1 = iP - zOffsetP + yOffsetP;
                rap_bn[iAc] = rb[iR] * a_cn[iAm1] * pa[iP1]
-                  +          rb[iR] * a_bn[iAm1]
-                  +                   a_bn[iA]   * pa[iP1];
+                             +          rb[iR] * a_bn[iAm1]
+                             +                   a_bn[iA]   * pa[iP1];
 
                iP1 = iP - zOffsetP + yOffsetP + xOffsetP;
                rap_bne[iAc] = rb[iR] * a_cne[iAm1] * pa[iP1]
-                  +           rb[iR] * a_bne[iAm1]
-                  +                    a_bne[iA]   * pa[iP1];
+                              +           rb[iR] * a_bne[iAm1]
+                              +                    a_bne[iA]   * pa[iP1];
 
                iP1 = iP - yOffsetP - xOffsetP;
                rap_csw[iAc] =          a_csw[iA]
-                  +          rb[iR] * a_csw[iAm1] * pb[iP1]
-                  +          ra[iR] * a_csw[iAp1] * pa[iP1]
-                  +                   a_bsw[iA]   * pb[iP1]
-                  +                   a_asw[iA]   * pa[iP1]
-                  +          rb[iR] * a_asw[iAm1]
-                  +          ra[iR] * a_bsw[iAp1];
+                                       +          rb[iR] * a_csw[iAm1] * pb[iP1]
+                                       +          ra[iR] * a_csw[iAp1] * pa[iP1]
+                                       +                   a_bsw[iA]   * pb[iP1]
+                                       +                   a_asw[iA]   * pa[iP1]
+                                       +          rb[iR] * a_asw[iAm1]
+                                       +          ra[iR] * a_bsw[iAp1];
 
                iP1 = iP - yOffsetP;
                rap_cs[iAc] =          a_cs[iA]
-                  +          rb[iR] * a_cs[iAm1] * pb[iP1]
-                  +          ra[iR] * a_cs[iAp1] * pa[iP1]
-                  +                   a_bs[iA]   * pb[iP1]
-                  +                   a_as[iA]   * pa[iP1]
-                  +          rb[iR] * a_as[iAm1]
-                  +          ra[iR] * a_bs[iAp1];
+                                      +          rb[iR] * a_cs[iAm1] * pb[iP1]
+                                      +          ra[iR] * a_cs[iAp1] * pa[iP1]
+                                      +                   a_bs[iA]   * pb[iP1]
+                                      +                   a_as[iA]   * pa[iP1]
+                                      +          rb[iR] * a_as[iAm1]
+                                      +          ra[iR] * a_bs[iAp1];
 
                iP1 = iP - yOffsetP + xOffsetP;
                rap_cse[iAc] =          a_cse[iA]
-                  +          rb[iR] * a_cse[iAm1] * pb[iP1]
-                  +          ra[iR] * a_cse[iAp1] * pa[iP1]
-                  +                   a_bse[iA]   * pb[iP1]
-                  +                   a_ase[iA]   * pa[iP1]
-                  +          rb[iR] * a_ase[iAm1]
-                  +          ra[iR] * a_bse[iAp1];
+                                       +          rb[iR] * a_cse[iAm1] * pb[iP1]
+                                       +          ra[iR] * a_cse[iAp1] * pa[iP1]
+                                       +                   a_bse[iA]   * pb[iP1]
+                                       +                   a_ase[iA]   * pa[iP1]
+                                       +          rb[iR] * a_ase[iAm1]
+                                       +          ra[iR] * a_bse[iAp1];
 
                iP1 = iP - xOffsetP;
                rap_cw[iAc] =          a_cw[iA]
-                  +          rb[iR] * a_cw[iAm1] * pb[iP1]
-                  +          ra[iR] * a_cw[iAp1] * pa[iP1]
-                  +                   a_bw[iA]   * pb[iP1]
-                  +                   a_aw[iA]   * pa[iP1]
-                  +          rb[iR] * a_aw[iAm1]
-                  +          ra[iR] * a_bw[iAp1];
+                                      +          rb[iR] * a_cw[iAm1] * pb[iP1]
+                                      +          ra[iR] * a_cw[iAp1] * pa[iP1]
+                                      +                   a_bw[iA]   * pb[iP1]
+                                      +                   a_aw[iA]   * pa[iP1]
+                                      +          rb[iR] * a_aw[iAm1]
+                                      +          ra[iR] * a_bw[iAp1];
 
                rap_cc[iAc] =          a_cc[iA]
-                  +          rb[iR] * a_cc[iAm1] * pb[iP]
-                  +          ra[iR] * a_cc[iAp1] * pa[iP]
-                  +          rb[iR] * a_ac[iAm1]
-                  +          ra[iR] * a_bc[iAp1]
-                  +                   a_bc[iA]   * pb[iP]
-                  +                   a_ac[iA]   * pa[iP];
+                                      +          rb[iR] * a_cc[iAm1] * pb[iP]
+                                      +          ra[iR] * a_cc[iAp1] * pa[iP]
+                                      +          rb[iR] * a_ac[iAm1]
+                                      +          ra[iR] * a_bc[iAp1]
+                                      +                   a_bc[iA]   * pb[iP]
+                                      +                   a_ac[iA]   * pa[iP];
             }
             hypre_BoxLoop4End(iP, iR, iA, iAc);
 #undef DEVICE_VAR
@@ -872,17 +876,18 @@ hypre_SparseMSG3BuildRAPNoSym( hypre_StructMatrix *A,
    HYPRE_Real           *pa, *pb;
    HYPRE_Real           *ra, *rb;
 
-   HYPRE_Real           *a_cc, *a_cw, *a_ce, *a_cs, *a_cn;
-   HYPRE_Real           *a_ac, *a_aw, *a_ae, *a_as, *a_an;
-   HYPRE_Real           *a_be, *a_bn;
-   HYPRE_Real           *a_csw, *a_cse, *a_cnw, *a_cne;
-   HYPRE_Real           *a_asw, *a_ase, *a_anw, *a_ane;
-   HYPRE_Real           *a_bnw, *a_bne;
+   HYPRE_Real           *a_cc = NULL, *a_cw = NULL, *a_ce = NULL, *a_cs = NULL, *a_cn = NULL;
+   HYPRE_Real           *a_ac = NULL, *a_aw = NULL, *a_ae = NULL, *a_as = NULL, *a_an = NULL;
+   HYPRE_Real           *a_be = NULL, *a_bn = NULL;
+   HYPRE_Real           *a_csw = NULL, *a_cse = NULL, *a_cnw = NULL, *a_cne = NULL;
+   HYPRE_Real           *a_asw = NULL, *a_ase = NULL, *a_anw = NULL, *a_ane = NULL;
+   HYPRE_Real           *a_bnw = NULL, *a_bne = NULL;
 
-   HYPRE_Real           *rap_ce, *rap_cn;
-   HYPRE_Real           *rap_ac, *rap_aw, *rap_ae, *rap_as, *rap_an;
-   HYPRE_Real           *rap_cnw, *rap_cne;
-   HYPRE_Real           *rap_asw, *rap_ase, *rap_anw, *rap_ane;
+   HYPRE_Real           *rap_ce = NULL, *rap_cn = NULL;
+   HYPRE_Real           *rap_ac = NULL, *rap_aw = NULL, *rap_ae = NULL;
+   HYPRE_Real           *rap_as = NULL, *rap_an = NULL;
+   HYPRE_Real           *rap_cnw = NULL, *rap_cne = NULL;
+   HYPRE_Real           *rap_asw = NULL, *rap_ase = NULL, *rap_anw = NULL, *rap_ane = NULL;
 
    HYPRE_Int             zOffsetA;
    HYPRE_Int             xOffsetP;
@@ -929,14 +934,14 @@ hypre_SparseMSG3BuildRAPNoSym( hypre_StructMatrix *A,
        * pb is pointer for weight for f-point below c-point
        *-----------------------------------------------------------------*/
 
-      hypre_SetIndex3(index_temp,0,0,-1);
+      hypre_SetIndex3(index_temp, 0, 0, -1);
       MapIndex(index_temp, cdir, index);
       pa = hypre_StructMatrixExtractPointerByIndex(P, fi, index);
 
-      hypre_SetIndex3(index_temp,0,0,1);
+      hypre_SetIndex3(index_temp, 0, 0, 1);
       MapIndex(index_temp, cdir, index);
       pb = hypre_StructMatrixExtractPointerByIndex(P, fi, index) -
-         hypre_BoxOffsetDistance(P_dbox, index);
+           hypre_BoxOffsetDistance(P_dbox, index);
 
       /*-----------------------------------------------------------------
        * Extract pointers for restriction operator:
@@ -944,14 +949,14 @@ hypre_SparseMSG3BuildRAPNoSym( hypre_StructMatrix *A,
        * rb is pointer for weight for f-point below c-point
        *-----------------------------------------------------------------*/
 
-      hypre_SetIndex3(index_temp,0,0,-1);
+      hypre_SetIndex3(index_temp, 0, 0, -1);
       MapIndex(index_temp, cdir, index);
       ra = hypre_StructMatrixExtractPointerByIndex(R, fi, index);
 
-      hypre_SetIndex3(index_temp,0,0,1);
+      hypre_SetIndex3(index_temp, 0, 0, 1);
       MapIndex(index_temp, cdir, index);
       rb = hypre_StructMatrixExtractPointerByIndex(R, fi, index) -
-         hypre_BoxOffsetDistance(R_dbox, index);
+           hypre_BoxOffsetDistance(R_dbox, index);
 
       /*-----------------------------------------------------------------
        * Extract pointers for 7-point fine grid operator:
@@ -965,27 +970,27 @@ hypre_SparseMSG3BuildRAPNoSym( hypre_StructMatrix *A,
        * a_bc is pointer for center coefficient in plane below
        *-----------------------------------------------------------------*/
 
-      hypre_SetIndex3(index_temp,0,0,0);
+      hypre_SetIndex3(index_temp, 0, 0, 0);
       MapIndex(index_temp, cdir, index);
       a_cc = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-      hypre_SetIndex3(index_temp,-1,0,0);
+      hypre_SetIndex3(index_temp, -1, 0, 0);
       MapIndex(index_temp, cdir, index);
       a_cw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-      hypre_SetIndex3(index_temp,1,0,0);
+      hypre_SetIndex3(index_temp, 1, 0, 0);
       MapIndex(index_temp, cdir, index);
       a_ce = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-      hypre_SetIndex3(index_temp,0,-1,0);
+      hypre_SetIndex3(index_temp, 0, -1, 0);
       MapIndex(index_temp, cdir, index);
       a_cs = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-      hypre_SetIndex3(index_temp,0,1,0);
+      hypre_SetIndex3(index_temp, 0, 1, 0);
       MapIndex(index_temp, cdir, index);
       a_cn = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-      hypre_SetIndex3(index_temp,0,0,1);
+      hypre_SetIndex3(index_temp, 0, 0, 1);
       MapIndex(index_temp, cdir, index);
       a_ac = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
@@ -1008,43 +1013,43 @@ hypre_SparseMSG3BuildRAPNoSym( hypre_StructMatrix *A,
 
       if (fine_stencil_size > 7)
       {
-         hypre_SetIndex3(index_temp,-1,0,1);
+         hypre_SetIndex3(index_temp, -1, 0, 1);
          MapIndex(index_temp, cdir, index);
          a_aw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index_temp,1,0,1);
+         hypre_SetIndex3(index_temp, 1, 0, 1);
          MapIndex(index_temp, cdir, index);
          a_ae = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index_temp,0,-1,1);
+         hypre_SetIndex3(index_temp, 0, -1, 1);
          MapIndex(index_temp, cdir, index);
          a_as = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index_temp,0,1,1);
+         hypre_SetIndex3(index_temp, 0, 1, 1);
          MapIndex(index_temp, cdir, index);
          a_an = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index_temp,1,0,-1);
+         hypre_SetIndex3(index_temp, 1, 0, -1);
          MapIndex(index_temp, cdir, index);
          a_be = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index_temp,0,1,-1);
+         hypre_SetIndex3(index_temp, 0, 1, -1);
          MapIndex(index_temp, cdir, index);
          a_bn = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index_temp,-1,-1,0);
+         hypre_SetIndex3(index_temp, -1, -1, 0);
          MapIndex(index_temp, cdir, index);
          a_csw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index_temp,1,-1,0);
+         hypre_SetIndex3(index_temp, 1, -1, 0);
          MapIndex(index_temp, cdir, index);
          a_cse = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index_temp,-1,1,0);
+         hypre_SetIndex3(index_temp, -1, 1, 0);
          MapIndex(index_temp, cdir, index);
          a_cnw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index_temp,1,1,0);
+         hypre_SetIndex3(index_temp, 1, 1, 0);
          MapIndex(index_temp, cdir, index);
          a_cne = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
       }
@@ -1064,27 +1069,27 @@ hypre_SparseMSG3BuildRAPNoSym( hypre_StructMatrix *A,
 
       if (fine_stencil_size > 19)
       {
-         hypre_SetIndex3(index_temp,-1,-1,1);
+         hypre_SetIndex3(index_temp, -1, -1, 1);
          MapIndex(index_temp, cdir, index);
          a_asw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index_temp,1,-1,1);
+         hypre_SetIndex3(index_temp, 1, -1, 1);
          MapIndex(index_temp, cdir, index);
          a_ase = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index_temp,-1,1,1);
+         hypre_SetIndex3(index_temp, -1, 1, 1);
          MapIndex(index_temp, cdir, index);
          a_anw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index_temp,1,1,1);
+         hypre_SetIndex3(index_temp, 1, 1, 1);
          MapIndex(index_temp, cdir, index);
          a_ane = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index_temp,-1,1,-1);
+         hypre_SetIndex3(index_temp, -1, 1, -1);
          MapIndex(index_temp, cdir, index);
          a_bnw = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
-         hypre_SetIndex3(index_temp,1,1,-1);
+         hypre_SetIndex3(index_temp, 1, 1, -1);
          MapIndex(index_temp, cdir, index);
          a_bne = hypre_StructMatrixExtractPointerByIndex(A, fi, index);
 
@@ -1098,39 +1103,39 @@ hypre_SparseMSG3BuildRAPNoSym( hypre_StructMatrix *A,
        * rap_ce is pointer for east coefficient in same plane (etc.)
        *-----------------------------------------------------------------*/
 
-      hypre_SetIndex3(index_temp,1,0,0);
+      hypre_SetIndex3(index_temp, 1, 0, 0);
       MapIndex(index_temp, cdir, index);
       rap_ce = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-      hypre_SetIndex3(index_temp,0,1,0);
+      hypre_SetIndex3(index_temp, 0, 1, 0);
       MapIndex(index_temp, cdir, index);
       rap_cn = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-      hypre_SetIndex3(index_temp,0,0,1);
+      hypre_SetIndex3(index_temp, 0, 0, 1);
       MapIndex(index_temp, cdir, index);
       rap_ac = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-      hypre_SetIndex3(index_temp,-1,0,1);
+      hypre_SetIndex3(index_temp, -1, 0, 1);
       MapIndex(index_temp, cdir, index);
       rap_aw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-      hypre_SetIndex3(index_temp,1,0,1);
+      hypre_SetIndex3(index_temp, 1, 0, 1);
       MapIndex(index_temp, cdir, index);
       rap_ae = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-      hypre_SetIndex3(index_temp,0,-1,1);
+      hypre_SetIndex3(index_temp, 0, -1, 1);
       MapIndex(index_temp, cdir, index);
       rap_as = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-      hypre_SetIndex3(index_temp,0,1,1);
+      hypre_SetIndex3(index_temp, 0, 1, 1);
       MapIndex(index_temp, cdir, index);
       rap_an = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-      hypre_SetIndex3(index_temp,-1,1,0);
+      hypre_SetIndex3(index_temp, -1, 1, 0);
       MapIndex(index_temp, cdir, index);
       rap_cnw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-      hypre_SetIndex3(index_temp,1,1,0);
+      hypre_SetIndex3(index_temp, 1, 1, 0);
       MapIndex(index_temp, cdir, index);
       rap_cne = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
@@ -1147,19 +1152,19 @@ hypre_SparseMSG3BuildRAPNoSym( hypre_StructMatrix *A,
 
       if (fine_stencil_size > 7)
       {
-         hypre_SetIndex3(index_temp,-1,-1,1);
+         hypre_SetIndex3(index_temp, -1, -1, 1);
          MapIndex(index_temp, cdir, index);
          rap_asw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-         hypre_SetIndex3(index_temp,1,-1,1);
+         hypre_SetIndex3(index_temp, 1, -1, 1);
          MapIndex(index_temp, cdir, index);
          rap_ase = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-         hypre_SetIndex3(index_temp,-1,1,1);
+         hypre_SetIndex3(index_temp, -1, 1, 1);
          MapIndex(index_temp, cdir, index);
          rap_anw = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
 
-         hypre_SetIndex3(index_temp,1,1,1);
+         hypre_SetIndex3(index_temp, 1, 1, 1);
          MapIndex(index_temp, cdir, index);
          rap_ane = hypre_StructMatrixExtractPointerByIndex(RAP, ci, index);
       }
@@ -1172,16 +1177,16 @@ hypre_SparseMSG3BuildRAPNoSym( hypre_StructMatrix *A,
        * Offsets are used in refering to data associated with other points.
        *-----------------------------------------------------------------*/
 
-      hypre_SetIndex3(index_temp,0,0,1);
+      hypre_SetIndex3(index_temp, 0, 0, 1);
       MapIndex(index_temp, cdir, index);
-      zOffsetA = hypre_BoxOffsetDistance(A_dbox,index);
-      zOffsetP = hypre_BoxOffsetDistance(P_dbox,index);
-      hypre_SetIndex3(index_temp,0,1,0);
+      zOffsetA = hypre_BoxOffsetDistance(A_dbox, index);
+      zOffsetP = hypre_BoxOffsetDistance(P_dbox, index);
+      hypre_SetIndex3(index_temp, 0, 1, 0);
       MapIndex(index_temp, cdir, index);
-      yOffsetP = hypre_BoxOffsetDistance(P_dbox,index);
-      hypre_SetIndex3(index_temp,1,0,0);
+      yOffsetP = hypre_BoxOffsetDistance(P_dbox, index);
+      hypre_SetIndex3(index_temp, 1, 0, 0);
       MapIndex(index_temp, cdir, index);
-      xOffsetP = hypre_BoxOffsetDistance(P_dbox,index);
+      xOffsetP = hypre_BoxOffsetDistance(P_dbox, index);
 
       /*-----------------------------------------------------------------
        * Switch statement to direct control to apropriate BoxLoop depending
@@ -1220,8 +1225,8 @@ hypre_SparseMSG3BuildRAPNoSym( hypre_StructMatrix *A,
 
                iP1 = iP + zOffsetP;
                rap_ac[iAc] =          a_ac[iA]   * pb[iP1]
-                  +          ra[iR] * a_cc[iAp1] * pb[iP1]
-                  +          ra[iR] * a_ac[iAp1];
+                                      +          ra[iR] * a_cc[iAp1] * pb[iP1]
+                                      +          ra[iR] * a_ac[iAp1];
 
                iP1 = iP + zOffsetP - xOffsetP;
                rap_aw[iAc] = ra[iR] * a_cw[iAp1] * pb[iP1];
@@ -1231,13 +1236,13 @@ hypre_SparseMSG3BuildRAPNoSym( hypre_StructMatrix *A,
 
                iP1 = iP + yOffsetP;
                rap_cn[iAc] =          a_cn[iA]
-                  +          rb[iR] * a_cn[iAm1] * pb[iP1]
-                  +          ra[iR] * a_cn[iAp1] * pa[iP1];
+                                      +          rb[iR] * a_cn[iAm1] * pb[iP1]
+                                      +          ra[iR] * a_cn[iAp1] * pa[iP1];
 
                iP1 = iP + xOffsetP;
                rap_ce[iAc] =          a_ce[iA]
-                  +          rb[iR] * a_ce[iAm1] * pb[iP1]
-                  +          ra[iR] * a_ce[iAp1] * pa[iP1];
+                                      +          rb[iR] * a_ce[iAm1] * pb[iP1]
+                                      +          ra[iR] * a_ce[iAp1] * pa[iP1];
 
                rap_cnw[iAc] = 0.0;
 
@@ -1248,14 +1253,14 @@ hypre_SparseMSG3BuildRAPNoSym( hypre_StructMatrix *A,
 
             break;
 
-            /*--------------------------------------------------------------
-             * Loop for 19-point fine grid operator; produces upper triangular
-             * part of 27-point coarse grid operator. stencil entries:
-             * (above-northeast, above-north, above-northwest, above-east,
-             * above-center, above-west, above-southeast, above-south,
-             * above-southwest, center-northeast, center-north,
-             * center-northwest, and center-east).
-             *--------------------------------------------------------------*/
+         /*--------------------------------------------------------------
+          * Loop for 19-point fine grid operator; produces upper triangular
+          * part of 27-point coarse grid operator. stencil entries:
+          * (above-northeast, above-north, above-northwest, above-east,
+          * above-center, above-west, above-southeast, above-south,
+          * above-southwest, center-northeast, center-north,
+          * center-northwest, and center-east).
+          *--------------------------------------------------------------*/
 
          case 19:
 
@@ -1276,65 +1281,65 @@ hypre_SparseMSG3BuildRAPNoSym( hypre_StructMatrix *A,
 
                iP1 = iP + zOffsetP + yOffsetP;
                rap_an[iAc] = ra[iR] * a_cn[iAp1] * pb[iP1]
-                  +          ra[iR] * a_an[iAp1]
-                  +                   a_an[iA]   * pb[iP1];
+                             +          ra[iR] * a_an[iAp1]
+                             +                   a_an[iA]   * pb[iP1];
 
                iP1 = iP + zOffsetP + yOffsetP - xOffsetP;
                rap_anw[iAc] = ra[iR] * a_cnw[iAp1] * pb[iP1];
 
                iP1 = iP + zOffsetP + xOffsetP;
                rap_ae[iAc] = ra[iR] * a_ce[iAp1] * pb[iP1]
-                  +          ra[iR] * a_ae[iAp1]
-                  +                   a_ae[iA]   * pb[iP1];
+                             +          ra[iR] * a_ae[iAp1]
+                             +                   a_ae[iA]   * pb[iP1];
 
                iP1 = iP + zOffsetP;
                rap_ac[iAc] =          a_ac[iA]   * pb[iP1]
-                  +          ra[iR] * a_cc[iAp1] * pb[iP1]
-                  +          ra[iR] * a_ac[iAp1];
+                                      +          ra[iR] * a_cc[iAp1] * pb[iP1]
+                                      +          ra[iR] * a_ac[iAp1];
 
                iP1 = iP + zOffsetP - xOffsetP;
                rap_aw[iAc] = ra[iR] * a_cw[iAp1] * pb[iP1]
-                  +          ra[iR] * a_aw[iAp1]
-                  +                   a_aw[iA]   * pb[iP1];
+                             +          ra[iR] * a_aw[iAp1]
+                             +                   a_aw[iA]   * pb[iP1];
 
                iP1 = iP + zOffsetP - yOffsetP + xOffsetP;
                rap_ase[iAc] = ra[iR] * a_cse[iAp1] * pb[iP1];
 
                iP1 = iP + zOffsetP - yOffsetP;
                rap_as[iAc] = ra[iR] * a_cs[iAp1] * pb[iP1]
-                  +          ra[iR] * a_as[iAp1]
-                  +                   a_as[iA]   * pb[iP1];
+                             +          ra[iR] * a_as[iAp1]
+                             +                   a_as[iA]   * pb[iP1];
 
                iP1 = iP + zOffsetP - yOffsetP - xOffsetP;
                rap_asw[iAc] = ra[iR] * a_csw[iAp1] * pb[iP1];
 
                iP1 = iP + yOffsetP + xOffsetP;
                rap_cne[iAc] =         a_cne[iA]
-                  +          rb[iR] * a_cne[iAm1] * pb[iP1]
-                  +          ra[iR] * a_cne[iAp1] * pa[iP1];
+                                      +          rb[iR] * a_cne[iAm1] * pb[iP1]
+                                      +          ra[iR] * a_cne[iAp1] * pa[iP1];
 
                iP1 = iP + yOffsetP;
                rap_cn[iAc] =          a_cn[iA]
-                  +          rb[iR] * a_cn[iAm1] * pb[iP1]
-                  +          ra[iR] * a_cn[iAp1] * pa[iP1]
-                  +                   a_bn[iA]   * pb[iP1]
-                  +                   a_an[iA]   * pa[iP1]
-                  +          rb[iR] * a_an[iAm1]
-                  +          ra[iR] * a_bn[iAp1];
+                                      +          rb[iR] * a_cn[iAm1] * pb[iP1]
+                                      +          ra[iR] * a_cn[iAp1] * pa[iP1]
+                                      +                   a_bn[iA]   * pb[iP1]
+                                      +                   a_an[iA]   * pa[iP1]
+                                      +          rb[iR] * a_an[iAm1]
+                                      +          ra[iR] * a_bn[iAp1];
 
                iP1 = iP + yOffsetP - xOffsetP;
                rap_cnw[iAc] =         a_cnw[iA]
-                  +          rb[iR] * a_cnw[iAm1] * pb[iP1]
-                  +          ra[iR] * a_cnw[iAp1] * pa[iP1];
+                                      +          rb[iR] * a_cnw[iAm1] * pb[iP1]
+                                      +          ra[iR] * a_cnw[iAp1] * pa[iP1];
 
                iP1 = iP + xOffsetP;
                rap_ce[iAc] =          a_ce[iA]
-                  +          rb[iR] * a_ce[iAm1] * pb[iP1]
-                  +          ra[iR] * a_ce[iAp1] * pa[iP1]
-                  +                   a_be[iA]   * pb[iP1]
-                  +                   a_ae[iA]   * pa[iP1]
-                  +          rb[iR] * a_ae[iAm1]
-                  +          ra[iR] * a_be[iAp1];
+                                      +          rb[iR] * a_ce[iAm1] * pb[iP1]
+                                      +          ra[iR] * a_ce[iAp1] * pa[iP1]
+                                      +                   a_be[iA]   * pb[iP1]
+                                      +                   a_ae[iA]   * pa[iP1]
+                                      +          rb[iR] * a_ae[iAm1]
+                                      +          ra[iR] * a_be[iAp1];
 
             }
             hypre_BoxLoop4End(iP, iR, iA, iAc);
@@ -1342,14 +1347,14 @@ hypre_SparseMSG3BuildRAPNoSym( hypre_StructMatrix *A,
 
             break;
 
-            /*--------------------------------------------------------------
-             * Loop for 27-point fine grid operator; produces upper triangular
-             * part of 27-point coarse grid operator. stencil entries:
-             * (above-northeast, above-north, above-northwest, above-east,
-             * above-center, above-west, above-southeast, above-south,
-             * above-southwest, center-northeast, center-north,
-             * center-northwest, and center-east).
-             *--------------------------------------------------------------*/
+         /*--------------------------------------------------------------
+          * Loop for 27-point fine grid operator; produces upper triangular
+          * part of 27-point coarse grid operator. stencil entries:
+          * (above-northeast, above-north, above-northwest, above-east,
+          * above-center, above-west, above-southeast, above-south,
+          * above-southwest, center-northeast, center-north,
+          * center-northwest, and center-east).
+          *--------------------------------------------------------------*/
 
          default:
 
@@ -1367,85 +1372,85 @@ hypre_SparseMSG3BuildRAPNoSym( hypre_StructMatrix *A,
 
                HYPRE_Int iP1 = iP + zOffsetP + yOffsetP + xOffsetP;
                rap_ane[iAc] = ra[iR] * a_cne[iAp1] * pb[iP1]
-                  +           ra[iR] * a_ane[iAp1]
-                  +                    a_ane[iA]   * pb[iP1];
+                              +           ra[iR] * a_ane[iAp1]
+                              +                    a_ane[iA]   * pb[iP1];
 
                iP1 = iP + zOffsetP + yOffsetP;
                rap_an[iAc] = ra[iR] * a_cn[iAp1] * pb[iP1]
-                  +          ra[iR] * a_an[iAp1]
-                  +                   a_an[iA]   * pb[iP1];
+                             +          ra[iR] * a_an[iAp1]
+                             +                   a_an[iA]   * pb[iP1];
 
                iP1 = iP + zOffsetP + yOffsetP - xOffsetP;
                rap_anw[iAc] = ra[iR] * a_cnw[iAp1] * pb[iP1]
-                  +           ra[iR] * a_anw[iAp1]
-                  +                    a_anw[iA]   * pb[iP1];
+                              +           ra[iR] * a_anw[iAp1]
+                              +                    a_anw[iA]   * pb[iP1];
 
                iP1 = iP + zOffsetP + xOffsetP;
                rap_ae[iAc] = ra[iR] * a_ce[iAp1] * pb[iP1]
-                  +          ra[iR] * a_ae[iAp1]
-                  +                   a_ae[iA]   * pb[iP1];
+                             +          ra[iR] * a_ae[iAp1]
+                             +                   a_ae[iA]   * pb[iP1];
 
                iP1 = iP + zOffsetP;
                rap_ac[iAc] =          a_ac[iA]   * pb[iP1]
-                  +          ra[iR] * a_cc[iAp1] * pb[iP1]
-                  +          ra[iR] * a_ac[iAp1];
+                                      +          ra[iR] * a_cc[iAp1] * pb[iP1]
+                                      +          ra[iR] * a_ac[iAp1];
 
                iP1 = iP + zOffsetP - xOffsetP;
                rap_aw[iAc] = ra[iR] * a_cw[iAp1] * pb[iP1]
-                  +          ra[iR] * a_aw[iAp1]
-                  +                   a_aw[iA]   * pb[iP1];
+                             +          ra[iR] * a_aw[iAp1]
+                             +                   a_aw[iA]   * pb[iP1];
 
                iP1 = iP + zOffsetP - yOffsetP + xOffsetP;
                rap_ase[iAc] = ra[iR] * a_cse[iAp1] * pb[iP1]
-                  +           ra[iR] * a_ase[iAp1]
-                  +                    a_ase[iA]   * pb[iP1];
+                              +           ra[iR] * a_ase[iAp1]
+                              +                    a_ase[iA]   * pb[iP1];
 
                iP1 = iP + zOffsetP - yOffsetP;
                rap_as[iAc] = ra[iR] * a_cs[iAp1] * pb[iP1]
-                  +          ra[iR] * a_as[iAp1]
-                  +                   a_as[iA]   * pb[iP1];
+                             +          ra[iR] * a_as[iAp1]
+                             +                   a_as[iA]   * pb[iP1];
 
                iP1 = iP + zOffsetP - yOffsetP - xOffsetP;
                rap_asw[iAc] = ra[iR] * a_csw[iAp1] * pb[iP1]
-                  +           ra[iR] * a_asw[iAp1]
-                  +                    a_asw[iA]   * pb[iP1];
+                              +           ra[iR] * a_asw[iAp1]
+                              +                    a_asw[iA]   * pb[iP1];
 
 
                iP1 = iP + yOffsetP + xOffsetP;
                rap_cne[iAc] =         a_cne[iA]
-                  +          rb[iR] * a_cne[iAm1] * pb[iP1]
-                  +          ra[iR] * a_cne[iAp1] * pa[iP1]
-                  +                   a_bne[iA]   * pb[iP1]
-                  +                   a_ane[iA]   * pa[iP1]
-                  +          rb[iR] * a_ane[iAm1]
-                  +          ra[iR] * a_bne[iAp1];
+                                      +          rb[iR] * a_cne[iAm1] * pb[iP1]
+                                      +          ra[iR] * a_cne[iAp1] * pa[iP1]
+                                      +                   a_bne[iA]   * pb[iP1]
+                                      +                   a_ane[iA]   * pa[iP1]
+                                      +          rb[iR] * a_ane[iAm1]
+                                      +          ra[iR] * a_bne[iAp1];
 
                iP1 = iP + yOffsetP;
                rap_cn[iAc] =          a_cn[iA]
-                  +          rb[iR] * a_cn[iAm1] * pb[iP1]
-                  +          ra[iR] * a_cn[iAp1] * pa[iP1]
-                  +                   a_bn[iA]   * pb[iP1]
-                  +                   a_an[iA]   * pa[iP1]
-                  +          rb[iR] * a_an[iAm1]
-                  +          ra[iR] * a_bn[iAp1];
+                                      +          rb[iR] * a_cn[iAm1] * pb[iP1]
+                                      +          ra[iR] * a_cn[iAp1] * pa[iP1]
+                                      +                   a_bn[iA]   * pb[iP1]
+                                      +                   a_an[iA]   * pa[iP1]
+                                      +          rb[iR] * a_an[iAm1]
+                                      +          ra[iR] * a_bn[iAp1];
 
                iP1 = iP + yOffsetP - xOffsetP;
                rap_cnw[iAc] =         a_cnw[iA]
-                  +          rb[iR] * a_cnw[iAm1] * pb[iP1]
-                  +          ra[iR] * a_cnw[iAp1] * pa[iP1]
-                  +                   a_bnw[iA]   * pb[iP1]
-                  +                   a_anw[iA]   * pa[iP1]
-                  +          rb[iR] * a_anw[iAm1]
-                  +          ra[iR] * a_bnw[iAp1];
+                                      +          rb[iR] * a_cnw[iAm1] * pb[iP1]
+                                      +          ra[iR] * a_cnw[iAp1] * pa[iP1]
+                                      +                   a_bnw[iA]   * pb[iP1]
+                                      +                   a_anw[iA]   * pa[iP1]
+                                      +          rb[iR] * a_anw[iAm1]
+                                      +          ra[iR] * a_bnw[iAp1];
 
                iP1 = iP + xOffsetP;
                rap_ce[iAc] =          a_ce[iA]
-                  +          rb[iR] * a_ce[iAm1] * pb[iP1]
-                  +          ra[iR] * a_ce[iAp1] * pa[iP1]
-                  +                   a_be[iA]   * pb[iP1]
-                  +                   a_ae[iA]   * pa[iP1]
-                  +          rb[iR] * a_ae[iAm1]
-                  +          ra[iR] * a_be[iAp1];
+                                      +          rb[iR] * a_ce[iAm1] * pb[iP1]
+                                      +          ra[iR] * a_ce[iAp1] * pa[iP1]
+                                      +                   a_be[iA]   * pb[iP1]
+                                      +                   a_ae[iA]   * pa[iP1]
+                                      +          rb[iR] * a_ae[iAm1]
+                                      +          ra[iR] * a_be[iAp1];
 
             }
             hypre_BoxLoop4End(iP, iR, iA, iAc);
@@ -1459,4 +1464,3 @@ hypre_SparseMSG3BuildRAPNoSym( hypre_StructMatrix *A,
 
    return ierr;
 }
-
diff --git a/external/hypre/src/struct_ls/sparse_msg_filter.c b/external/hypre/src/struct_ls/sparse_msg_filter.c
index 63710650..11bfe493 100644
--- a/external/hypre/src/struct_ls/sparse_msg_filter.c
+++ b/external/hypre/src/struct_ls/sparse_msg_filter.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -120,7 +120,7 @@ hypre_SparseMSGFilterSetup( hypre_StructMatrix *A,
          HYPRE_Real lambday = 0.0;
          HYPRE_Real lambdaz = 0.0;
          HYPRE_Int si, dir, Astenc;
-         HYPRE_Real *Ap,lambda_max;
+         HYPRE_Real *Ap, lambda_max;
 
          for (si = 0; si < stencil_size; si++)
          {
@@ -307,6 +307,12 @@ hypre_SparseMSGFilterSetup( hypre_StructMatrix *A,
                             hypre_StructVector *visity,
                             hypre_StructVector *visitz    )
 {
+   HYPRE_UNUSED_VAR(num_grids);
+   HYPRE_UNUSED_VAR(jump);
+   HYPRE_UNUSED_VAR(lx);
+   HYPRE_UNUSED_VAR(ly);
+   HYPRE_UNUSED_VAR(lz);
+
    HYPRE_Int             ierr = 0;
 
    hypre_BoxArray        *compute_boxes;
@@ -319,7 +325,6 @@ hypre_SparseMSGFilterSetup( hypre_StructMatrix *A,
    HYPRE_Real            *vyp;
    HYPRE_Real            *vzp;
 
-
    hypre_StructStencil   *stencil;
    hypre_Index           *stencil_shape;
    HYPRE_Int              stencil_size;
@@ -330,8 +335,8 @@ hypre_SparseMSGFilterSetup( hypre_StructMatrix *A,
    hypre_Index            startv;
    hypre_Index            stride;
    hypre_Index            stridev;
-
    HYPRE_Int              i;
+   HYPRE_MemoryLocation   memory_location = hypre_StructMatrixMemoryLocation(A);
 
    /*----------------------------------------------------------
     * Initialize some things
@@ -361,17 +366,19 @@ hypre_SparseMSGFilterSetup( hypre_StructMatrix *A,
    HYPRE_Int      *data_indices_d; /* On device */
    hypre_Index    *stencil_shape_d;
 
-   if (hypre_GetActualMemLocation(HYPRE_MEMORY_DEVICE) != hypre_MEMORY_HOST)
+   if (hypre_GetExecPolicy1(memory_location) == HYPRE_EXEC_DEVICE)
    {
       HYPRE_Int nboxes = hypre_BoxArraySize(compute_boxes);
-      data_indices_d  = hypre_TAlloc(HYPRE_Int,   stencil_size*nboxes, HYPRE_MEMORY_DEVICE);
-      stencil_shape_d = hypre_TAlloc(hypre_Index, stencil_size,        HYPRE_MEMORY_DEVICE);
-      hypre_TMemcpy(data_indices_d, data_indices[0], HYPRE_Int, stencil_size*nboxes, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
-      hypre_TMemcpy(stencil_shape_d, stencil_shape, hypre_Index, stencil_size, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
+      data_indices_d  = hypre_TAlloc(HYPRE_Int, stencil_size * nboxes, memory_location);
+      stencil_shape_d = hypre_TAlloc(hypre_Index, stencil_size, memory_location);
+      hypre_TMemcpy(data_indices_d, data_indices[0], HYPRE_Int, stencil_size * nboxes,
+                    memory_location, HYPRE_MEMORY_HOST);
+      hypre_TMemcpy(stencil_shape_d, stencil_shape, hypre_Index, stencil_size,
+                    memory_location, HYPRE_MEMORY_HOST);
    }
    else
    {
-      data_indices_d  = data_indices[0];
+      data_indices_d = data_indices[0];
       stencil_shape_d = stencil_shape;
    }
 
@@ -395,7 +402,7 @@ hypre_SparseMSGFilterSetup( hypre_StructMatrix *A,
                           A_dbox, start,  stride,  Ai,
                           v_dbox, startv, stridev, vi);
       {
-         HYPRE_Real lambdax,lambday,lambdaz;
+         HYPRE_Real lambdax, lambday, lambdaz;
          HYPRE_Real *Ap;
          HYPRE_Int si, Astenc;
 
@@ -405,7 +412,7 @@ hypre_SparseMSGFilterSetup( hypre_StructMatrix *A,
 
          for (si = 0; si < stencil_size; si++)
          {
-            Ap = matrixA_data + data_indices_d[i*stencil_size+si];
+            Ap = matrixA_data + data_indices_d[i * stencil_size + si];
 
             /* compute lambdax */
             Astenc = hypre_IndexD(stencil_shape_d[si], 0);
@@ -453,10 +460,10 @@ hypre_SparseMSGFilterSetup( hypre_StructMatrix *A,
 #undef DEVICE_VAR
    }
 
-   if (hypre_GetActualMemLocation(HYPRE_MEMORY_DEVICE) != hypre_MEMORY_HOST)
+   if (hypre_GetExecPolicy1(memory_location) == HYPRE_EXEC_DEVICE)
    {
-      hypre_TFree(data_indices_d,  HYPRE_MEMORY_DEVICE);
-      hypre_TFree(stencil_shape_d, HYPRE_MEMORY_DEVICE);
+      hypre_TFree(data_indices_d, memory_location);
+      hypre_TFree(stencil_shape_d, memory_location);
    }
 
    return ierr;
@@ -474,6 +481,11 @@ hypre_SparseMSGFilter( hypre_StructVector *visit,
                        HYPRE_Int           lz,
                        HYPRE_Int           jump  )
 {
+   HYPRE_UNUSED_VAR(jump);
+   HYPRE_UNUSED_VAR(lx);
+   HYPRE_UNUSED_VAR(ly);
+   HYPRE_UNUSED_VAR(lz);
+
    HYPRE_Int             ierr = 0;
 
    hypre_BoxArray        *compute_boxes;
diff --git a/external/hypre/src/struct_ls/sparse_msg_interp.c b/external/hypre/src/struct_ls/sparse_msg_interp.c
index 87f826e5..b8197038 100644
--- a/external/hypre/src/struct_ls/sparse_msg_interp.c
+++ b/external/hypre/src/struct_ls/sparse_msg_interp.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -30,7 +30,7 @@ typedef struct
  *--------------------------------------------------------------------------*/
 
 void *
-hypre_SparseMSGInterpCreate( )
+hypre_SparseMSGInterpCreate( void )
 {
    hypre_SparseMSGInterpData *interp_data;
 
@@ -54,6 +54,8 @@ hypre_SparseMSGInterpSetup( void               *interp_vdata,
                             hypre_Index         stride,
                             hypre_Index         strideP       )
 {
+   HYPRE_UNUSED_VAR(xc);
+
    hypre_SparseMSGInterpData   *interp_data = (hypre_SparseMSGInterpData   *)interp_vdata;
 
    hypre_StructGrid       *grid;
@@ -208,7 +210,7 @@ hypre_SparseMSGInterp( void               *interp_vdata,
 
    for (compute_i = 0; compute_i < 2; compute_i++)
    {
-      switch(compute_i)
+      switch (compute_i)
       {
          case 0:
          {
@@ -267,7 +269,7 @@ hypre_SparseMSGInterp( void               *interp_vdata,
     * Return
     *-----------------------------------------------------------------------*/
 
-   hypre_IncFLOPCount(3*hypre_StructVectorGlobalSize(xc));
+   hypre_IncFLOPCount(3 * hypre_StructVectorGlobalSize(xc));
    hypre_EndTiming(interp_data -> time_index);
 
    return ierr;
@@ -294,4 +296,3 @@ hypre_SparseMSGInterpDestroy( void *interp_vdata )
 
    return ierr;
 }
-
diff --git a/external/hypre/src/struct_ls/sparse_msg_restrict.c b/external/hypre/src/struct_ls/sparse_msg_restrict.c
index 367af1a3..f5635269 100644
--- a/external/hypre/src/struct_ls/sparse_msg_restrict.c
+++ b/external/hypre/src/struct_ls/sparse_msg_restrict.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -29,7 +29,7 @@ typedef struct
  *--------------------------------------------------------------------------*/
 
 void *
-hypre_SparseMSGRestrictCreate( )
+hypre_SparseMSGRestrictCreate( void )
 {
    hypre_SparseMSGRestrictData *restrict_data;
 
@@ -54,6 +54,8 @@ hypre_SparseMSGRestrictSetup( void               *restrict_vdata,
                               hypre_Index         stride,
                               hypre_Index         strideR         )
 {
+   HYPRE_UNUSED_VAR(rc);
+
    hypre_SparseMSGRestrictData *restrict_data = (hypre_SparseMSGRestrictData *)restrict_vdata;
 
    hypre_StructGrid       *grid;
@@ -84,9 +86,9 @@ hypre_SparseMSGRestrictSetup( void               *restrict_vdata,
 
    (restrict_data -> R) = hypre_StructMatrixRef(R);
    (restrict_data -> compute_pkg) = compute_pkg;
-   hypre_CopyIndex(cindex ,(restrict_data -> cindex));
-   hypre_CopyIndex(stride ,(restrict_data -> stride));
-   hypre_CopyIndex(strideR ,(restrict_data -> strideR));
+   hypre_CopyIndex(cindex, (restrict_data -> cindex));
+   hypre_CopyIndex(stride, (restrict_data -> stride));
+   hypre_CopyIndex(strideR, (restrict_data -> strideR));
 
    return ierr;
 }
@@ -169,7 +171,7 @@ hypre_SparseMSGRestrict( void               *restrict_vdata,
 
    for (compute_i = 0; compute_i < 2; compute_i++)
    {
-      switch(compute_i)
+      switch (compute_i)
       {
          case 0:
          {
@@ -202,7 +204,7 @@ hypre_SparseMSGRestrict( void               *restrict_vdata,
          rc_dbox = hypre_BoxArrayBox(hypre_StructVectorDataSpace(rc), ci);
 
          Rp0 = hypre_StructMatrixBoxData(R, fi, 1) -
-            hypre_BoxOffsetDistance(R_dbox, stencil_shape[1]);
+               hypre_BoxOffsetDistance(R_dbox, stencil_shape[1]);
          Rp1 = hypre_StructMatrixBoxData(R, fi, 0);
          rp  = hypre_StructVectorBoxData(r, fi);
          rp0 = rp + hypre_BoxOffsetDistance(r_dbox, stencil_shape[0]);
@@ -238,7 +240,7 @@ hypre_SparseMSGRestrict( void               *restrict_vdata,
     * Return
     *-----------------------------------------------------------------------*/
 
-   hypre_IncFLOPCount(4*hypre_StructVectorGlobalSize(rc));
+   hypre_IncFLOPCount(4 * hypre_StructVectorGlobalSize(rc));
    hypre_EndTiming(restrict_data -> time_index);
 
    return ierr;
@@ -265,4 +267,3 @@ hypre_SparseMSGRestrictDestroy( void *restrict_vdata )
 
    return ierr;
 }
-
diff --git a/external/hypre/src/struct_ls/sparse_msg_setup.c b/external/hypre/src/struct_ls/sparse_msg_setup.c
index 8e6c4914..d8f1fa45 100644
--- a/external/hypre/src/struct_ls/sparse_msg_setup.c
+++ b/external/hypre/src/struct_ls/sparse_msg_setup.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -45,14 +45,14 @@ hypre_SparseMSGSetup( void               *smsg_vdata,
                       hypre_StructVector *b,
                       hypre_StructVector *x          )
 {
-   hypre_SparseMSGData  *smsg_data = (hypre_SparseMSGData  *)smsg_vdata;
+   hypre_SparseMSGData  *smsg_data = (hypre_SparseMSGData *) smsg_vdata;
 
    MPI_Comm              comm = (smsg_data -> comm);
-                     
+
    HYPRE_Int             max_iter;
    HYPRE_Int             jump       = (smsg_data -> jump);
    HYPRE_Int             relax_type = (smsg_data -> relax_type);
-   HYPRE_Int             usr_jacobi_weight= (smsg_data -> usr_jacobi_weight);
+   HYPRE_Int             usr_jacobi_weight = (smsg_data -> usr_jacobi_weight);
    HYPRE_Real            jacobi_weight    = (smsg_data -> jacobi_weight);
    HYPRE_Int            *num_grids  = (smsg_data -> num_grids);
    HYPRE_Int             num_all_grids;
@@ -62,7 +62,7 @@ hypre_SparseMSGSetup( void               *smsg_vdata,
    hypre_StructGrid    **Px_grid_a;
    hypre_StructGrid    **Py_grid_a;
    hypre_StructGrid    **Pz_grid_a;
-                    
+
    HYPRE_Real           *data;
    HYPRE_Real           *tdata;
    HYPRE_Int             data_size = 0;
@@ -102,15 +102,16 @@ hypre_SparseMSGSetup( void               *smsg_vdata,
 
    hypre_StructGrid     *grid;
    HYPRE_Int             dim;
-   hypre_Box            *cbox;   
+   hypre_Box            *cbox;
 
    HYPRE_Int             d, l, lx, ly, lz;
    HYPRE_Int             fi, ci;
-                       
+
    HYPRE_Int             b_num_ghost[]  = {0, 0, 0, 0, 0, 0};
    HYPRE_Int             x_num_ghost[]  = {1, 1, 1, 1, 1, 1};
 
    HYPRE_Int             ierr = 0;
+   HYPRE_MemoryLocation  memory_location = hypre_StructMatrixMemoryLocation(A);
 #if DEBUG
    char                  filename[255];
 #endif
@@ -128,7 +129,7 @@ hypre_SparseMSGSetup( void               *smsg_vdata,
    cbox = hypre_BoxDuplicate(hypre_StructGridBoundingBox(grid));
    for (d = 0; d < dim; d++)
    {
-      while ( hypre_BoxIMaxD(cbox,d) > hypre_BoxIMinD(cbox,d) )
+      while ( hypre_BoxIMaxD(cbox, d) > hypre_BoxIMinD(cbox, d) )
       {
          /* set cindex, findex, and stride */
          hypre_SparseMSGSetCIndex(d, cindex);
@@ -136,12 +137,12 @@ hypre_SparseMSGSetup( void               *smsg_vdata,
          hypre_SparseMSGSetStride(d, stride);
 
          /* coarsen cbox */
-         hypre_ProjectBox(cbox,cindex,stride);
+         hypre_ProjectBox(cbox, cindex, stride);
          hypre_StructMapFineToCoarse(hypre_BoxIMin(cbox),
-                                     cindex,stride,hypre_BoxIMin(cbox));
+                                     cindex, stride, hypre_BoxIMin(cbox));
          hypre_StructMapFineToCoarse(hypre_BoxIMax(cbox),
-                                     cindex,stride,hypre_BoxIMax(cbox));
-         
+                                     cindex, stride, hypre_BoxIMax(cbox));
+
          /* increment level counters */
          num_grids[d]++;
          num_levels++;
@@ -153,7 +154,7 @@ hypre_SparseMSGSetup( void               *smsg_vdata,
    num_grids[1] = 1;
    num_grids[2] = 1;
    num_levels = num_grids[0];
-#endif 
+#endif
 
    /* Compute the num_all_grids based on num_grids[] */
    num_all_grids = num_grids[0] * num_grids[1] * num_grids[2];
@@ -174,7 +175,7 @@ hypre_SparseMSGSetup( void               *smsg_vdata,
    Pz_grid_a[0] = NULL;
 
    /*-----------------------------------------
-    * Compute coarse grids 
+    * Compute coarse grids
     *-----------------------------------------*/
 
    if (num_levels > 1)
@@ -185,7 +186,7 @@ hypre_SparseMSGSetup( void               *smsg_vdata,
       for (lx = 0; lx < num_grids[0] - 1; lx++)
       {
          hypre_SparseMSGMapIndex(lx,   0, 0, num_grids, fi);
-         hypre_SparseMSGMapIndex(lx+1, 0, 0, num_grids, ci);
+         hypre_SparseMSGMapIndex(lx + 1, 0, 0, num_grids, ci);
          hypre_StructCoarsen(grid_a[fi], cindex, stride, 1,
                              &grid_a[ci]);
       }
@@ -198,7 +199,7 @@ hypre_SparseMSGSetup( void               *smsg_vdata,
          for (lx = 0; lx < num_grids[0]; lx++)
          {
             hypre_SparseMSGMapIndex(lx, ly,   0, num_grids, fi);
-            hypre_SparseMSGMapIndex(lx, ly+1, 0, num_grids, ci);
+            hypre_SparseMSGMapIndex(lx, ly + 1, 0, num_grids, ci);
             hypre_StructCoarsen(grid_a[fi], cindex, stride, 1,
                                 &grid_a[ci]);
          }
@@ -213,8 +214,8 @@ hypre_SparseMSGSetup( void               *smsg_vdata,
          {
             for (lx = 0; lx < num_grids[0]; lx++)
             {
-               hypre_SparseMSGMapIndex(lx, ly, lz  , num_grids, fi);
-               hypre_SparseMSGMapIndex(lx, ly, lz+1, num_grids, ci);
+               hypre_SparseMSGMapIndex(lx, ly, lz, num_grids, fi);
+               hypre_SparseMSGMapIndex(lx, ly, lz + 1, num_grids, ci);
                hypre_StructCoarsen(grid_a[fi], cindex, stride, 1,
                                    &grid_a[ci]);
             }
@@ -223,7 +224,7 @@ hypre_SparseMSGSetup( void               *smsg_vdata,
    }
 
    /*-----------------------------------------
-    * Compute interpolation grids 
+    * Compute interpolation grids
     *-----------------------------------------*/
 
    if (num_levels > 1)
@@ -235,7 +236,7 @@ hypre_SparseMSGSetup( void               *smsg_vdata,
       {
          hypre_SparseMSGMapIndex(lx, 0, 0, num_grids, fi);
          hypre_StructCoarsen(grid_a[fi], findex, stride, 1,
-                             &Px_grid_a[lx+1]);
+                             &Px_grid_a[lx + 1]);
       }
 
       /* coarsen in y direction */
@@ -245,7 +246,7 @@ hypre_SparseMSGSetup( void               *smsg_vdata,
       {
          hypre_SparseMSGMapIndex(0, ly, 0, num_grids, fi);
          hypre_StructCoarsen(grid_a[fi], findex, stride, 1,
-                             &Py_grid_a[ly+1]);
+                             &Py_grid_a[ly + 1]);
       }
 
       /* coarsen in z direction */
@@ -255,7 +256,7 @@ hypre_SparseMSGSetup( void               *smsg_vdata,
       {
          hypre_SparseMSGMapIndex(0, 0, lz, num_grids, fi);
          hypre_StructCoarsen(grid_a[fi], findex, stride, 1,
-                             &Pz_grid_a[lz+1]);
+                             &Pz_grid_a[lz + 1]);
       }
    }
 
@@ -299,7 +300,7 @@ hypre_SparseMSGSetup( void               *smsg_vdata,
              * create visit arrays
              *-------------------------------*/
 
-/* RDF */
+            /* RDF */
 #if 0
             l = lx + ly + lz;
             if ((l >= 1) && (l <= jump))
@@ -310,7 +311,7 @@ hypre_SparseMSGSetup( void               *smsg_vdata,
             }
             else
 #endif
-/* RDF */
+               /* RDF */
             {
                visitx_a[fi] = hypre_StructVectorCreate(comm, grid_a[fi]);
                visity_a[fi] = hypre_StructVectorCreate(comm, grid_a[fi]);
@@ -342,7 +343,7 @@ hypre_SparseMSGSetup( void               *smsg_vdata,
             if (lx < (num_grids[0] - 1))
             {
                hypre_SparseMSGMapIndex(lx, ly, lz, num_grids, fi);
-               hypre_SparseMSGMapIndex((lx+1), ly, lz, num_grids, ci);
+               hypre_SparseMSGMapIndex((lx + 1), ly, lz, num_grids, ci);
 
                hypre_SparseMSGSetCIndex(0, cindex);
                hypre_SparseMSGSetFIndex(0, findex);
@@ -352,7 +353,7 @@ hypre_SparseMSGSetup( void               *smsg_vdata,
                if ((lz == 0) && (ly == 0))
                {
                   Px_a[lx] = hypre_PFMGCreateInterpOp(A_a[fi],
-                                                      Px_grid_a[lx+1], 0, 0);
+                                                      Px_grid_a[lx + 1], 0, 0);
                   hypre_StructMatrixInitialize(Px_a[lx]);
                   hypre_PFMGSetupInterpOp(A_a[fi], 0, findex, stride,
                                           Px_a[lx], 0);
@@ -364,23 +365,23 @@ hypre_SparseMSGSetup( void               *smsg_vdata,
                   hypre_SparseMSGCreateRAPOp(RTx_a[lx], A_a[fi], Px_a[lx],
                                              grid_a[ci], 0);
                hypre_StructMatrixInitialize(A_a[ci]);
-               hypre_SetIndex3(stridePR, 1, pow(2, ly), pow(2, lz));
+               hypre_SetIndex3(stridePR, 1, hypre_pow2(ly), hypre_pow2(lz));
                hypre_SparseMSGSetupRAPOp(RTx_a[lx], A_a[fi], Px_a[lx],
                                          0, cindex, stride, stridePR, A_a[ci]);
             }
          }
 
-/* RDF */
+         /* RDF */
 #if 0
          /* free up some coarse-operators to conserve memory */
-         for (lx = 1; lx <= hypre_min((jump-ly-lz), (num_grids[0]-1)); lx++)
+         for (lx = 1; lx <= hypre_min((jump - ly - lz), (num_grids[0] - 1)); lx++)
          {
             hypre_SparseMSGMapIndex(lx, ly, lz, num_grids, fi);
             hypre_StructMatrixDestroy(A_a[fi]);
             A_a[fi] = NULL;
          }
 #endif
-/* RDF */
+         /* RDF */
 
          /*-------------------------------
           * compute Py, RTy, and A
@@ -389,7 +390,7 @@ hypre_SparseMSGSetup( void               *smsg_vdata,
          if (ly < (num_grids[1] - 1))
          {
             hypre_SparseMSGMapIndex(0, ly, lz, num_grids, fi);
-            hypre_SparseMSGMapIndex(0, (ly+1), lz, num_grids, ci);
+            hypre_SparseMSGMapIndex(0, (ly + 1), lz, num_grids, ci);
 
             hypre_SparseMSGSetCIndex(1, cindex);
             hypre_SparseMSGSetFIndex(1, findex);
@@ -399,7 +400,7 @@ hypre_SparseMSGSetup( void               *smsg_vdata,
             if (lz == 0)
             {
                Py_a[ly] = hypre_PFMGCreateInterpOp(A_a[fi],
-                                                   Py_grid_a[ly+1], 1, 0);
+                                                   Py_grid_a[ly + 1], 1, 0);
                hypre_StructMatrixInitialize(Py_a[ly]);
                hypre_PFMGSetupInterpOp(A_a[fi], 1, findex, stride,
                                        Py_a[ly], 0);
@@ -410,23 +411,23 @@ hypre_SparseMSGSetup( void               *smsg_vdata,
             A_a[ci] = hypre_SparseMSGCreateRAPOp(RTy_a[ly], A_a[fi], Py_a[ly],
                                                  grid_a[ci], 1);
             hypre_StructMatrixInitialize(A_a[ci]);
-            hypre_SetIndex3(stridePR, 1, 1, pow(2, lz));
+            hypre_SetIndex3(stridePR, 1, 1, hypre_pow2(lz));
             hypre_SparseMSGSetupRAPOp(RTy_a[ly], A_a[fi], Py_a[ly],
                                       1, cindex, stride, stridePR, A_a[ci]);
          }
       }
 
-/* RDF */
+      /* RDF */
 #if 0
       /* free up some coarse-operators to conserve memory */
-      for (ly = 1; ly <= hypre_min((jump-lz), (num_grids[1]-1)); ly++)
+      for (ly = 1; ly <= hypre_min((jump - lz), (num_grids[1] - 1)); ly++)
       {
          hypre_SparseMSGMapIndex(0, ly, lz, num_grids, fi);
          hypre_StructMatrixDestroy(A_a[fi]);
          A_a[fi] = NULL;
       }
 #endif
-/* RDF */
+      /* RDF */
 
       /*-------------------------------
        * compute Pz, RTz, and A
@@ -435,14 +436,14 @@ hypre_SparseMSGSetup( void               *smsg_vdata,
       if (lz < (num_grids[2] - 1))
       {
          hypre_SparseMSGMapIndex(0, 0, lz, num_grids, fi);
-         hypre_SparseMSGMapIndex(0, 0, (lz+1), num_grids, ci);
+         hypre_SparseMSGMapIndex(0, 0, (lz + 1), num_grids, ci);
 
          hypre_SparseMSGSetCIndex(2, cindex);
          hypre_SparseMSGSetFIndex(2, findex);
          hypre_SparseMSGSetStride(2, stride);
 
          /* compute z-transfer operators */
-         Pz_a[lz] = hypre_PFMGCreateInterpOp(A_a[fi], Pz_grid_a[lz+1], 2, 0);
+         Pz_a[lz] = hypre_PFMGCreateInterpOp(A_a[fi], Pz_grid_a[lz + 1], 2, 0);
          hypre_StructMatrixInitialize(Pz_a[lz]);
          hypre_PFMGSetupInterpOp(A_a[fi], 2, findex, stride, Pz_a[lz], 0);
          RTz_a[lz] = Pz_a[lz];
@@ -457,17 +458,17 @@ hypre_SparseMSGSetup( void               *smsg_vdata,
       }
    }
 
-/* RDF */
+   /* RDF */
 #if 0
    /* free up some coarse-operators to conserve memory */
-   for (lz = 1; lz <= hypre_min((jump), (num_grids[2]-1)); lz++)
+   for (lz = 1; lz <= hypre_min((jump), (num_grids[2] - 1)); lz++)
    {
       hypre_SparseMSGMapIndex(0, 0, lz, num_grids, fi);
       hypre_StructMatrixDestroy(A_a[fi]);
       A_a[fi] = NULL;
    }
 #endif
-/* RDF */
+   /* RDF */
 
    (smsg_data -> A_array)   = A_a;
    (smsg_data -> Px_array)  = Px_a;
@@ -552,8 +553,10 @@ hypre_SparseMSGSetup( void               *smsg_vdata,
       }
    }
 
-   data =  hypre_CTAlloc(HYPRE_Real, data_size, HYPRE_MEMORY_DEVICE);
+   data = hypre_CTAlloc(HYPRE_Real, data_size, memory_location);
+
    (smsg_data -> data) = data;
+   (smsg_data -> memory_location) = memory_location;
 
    hypre_StructVectorInitializeData(t_a[0], data);
    hypre_StructVectorAssemble(t_a[0]);
@@ -628,9 +631,9 @@ hypre_SparseMSGSetup( void               *smsg_vdata,
          for (ly = 0; ly < num_grids[1]; ly++)
          {
             hypre_SparseMSGMapIndex(lx, ly, lz, num_grids, fi);
-            hypre_SparseMSGMapIndex(lx+1, ly, lz, num_grids, ci);
+            hypre_SparseMSGMapIndex(lx + 1, ly, lz, num_grids, ci);
 
-            hypre_SetIndex3(stridePR, 1, pow(2, ly), pow(2, lz));
+            hypre_SetIndex3(stridePR, 1, hypre_pow2(ly), hypre_pow2(lz));
 
             interpx_a[fi] = hypre_SparseMSGInterpCreate();
             hypre_SparseMSGInterpSetup(interpx_a[fi], Px_a[lx],
@@ -657,9 +660,9 @@ hypre_SparseMSGSetup( void               *smsg_vdata,
          for (lx = 0; lx < num_grids[0]; lx++)
          {
             hypre_SparseMSGMapIndex(lx, ly, lz, num_grids, fi);
-            hypre_SparseMSGMapIndex(lx, ly+1, lz, num_grids, ci);
+            hypre_SparseMSGMapIndex(lx, ly + 1, lz, num_grids, ci);
 
-            hypre_SetIndex3(stridePR, pow(2, lx), 1, pow(2, lz));
+            hypre_SetIndex3(stridePR, hypre_pow2(lx), 1, hypre_pow2(lz));
 
             interpy_a[fi] = hypre_SparseMSGInterpCreate();
             hypre_SparseMSGInterpSetup(interpy_a[fi], Py_a[ly],
@@ -686,9 +689,9 @@ hypre_SparseMSGSetup( void               *smsg_vdata,
          for (lx = 0; lx < num_grids[0]; lx++)
          {
             hypre_SparseMSGMapIndex(lx, ly, lz, num_grids, fi);
-            hypre_SparseMSGMapIndex(lx, ly, lz+1, num_grids, ci);
+            hypre_SparseMSGMapIndex(lx, ly, lz + 1, num_grids, ci);
 
-            hypre_SetIndex3(stridePR, pow(2, lx), pow(2, ly), 1);
+            hypre_SetIndex3(stridePR, hypre_pow2(lx), hypre_pow2(ly), 1);
 
             interpz_a[fi] = hypre_SparseMSGInterpCreate();
             hypre_SparseMSGInterpSetup(interpz_a[fi], Pz_a[lz],
@@ -824,7 +827,7 @@ hypre_SparseMSGSetup( void               *smsg_vdata,
       hypre_StructMatrixPrint(filename, Pz_a[lz], 0);
    }
 #endif
-   
+
    return ierr;
 }
 
diff --git a/external/hypre/src/struct_ls/sparse_msg_setup_rap.c b/external/hypre/src/struct_ls/sparse_msg_setup_rap.c
index 7c195312..45eb6e34 100644
--- a/external/hypre/src/struct_ls/sparse_msg_setup_rap.c
+++ b/external/hypre/src/struct_ls/sparse_msg_setup_rap.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -18,7 +18,7 @@
  *   Wrapper for 2 and 3d CreateRAPOp routines which set up new coarse
  *   grid structures.
  *--------------------------------------------------------------------------*/
- 
+
 hypre_StructMatrix *
 hypre_SparseMSGCreateRAPOp( hypre_StructMatrix *R,
                             hypre_StructMatrix *A,
@@ -26,21 +26,21 @@ hypre_SparseMSGCreateRAPOp( hypre_StructMatrix *R,
                             hypre_StructGrid   *coarse_grid,
                             HYPRE_Int           cdir        )
 {
-   hypre_StructMatrix    *RAP;
+   hypre_StructMatrix    *RAP = NULL;
    hypre_StructStencil   *stencil;
 
    stencil = hypre_StructMatrixStencil(A);
 
-   switch (hypre_StructStencilNDim(stencil)) 
+   switch (hypre_StructStencilNDim(stencil))
    {
       case 2:
-      RAP = hypre_SparseMSG2CreateRAPOp(R ,A, P, coarse_grid, cdir);
-      break;
-    
+         RAP = hypre_SparseMSG2CreateRAPOp(R, A, P, coarse_grid, cdir);
+         break;
+
       case 3:
-      RAP = hypre_SparseMSG3CreateRAPOp(R ,A, P, coarse_grid, cdir);
-      break;
-   } 
+         RAP = hypre_SparseMSG3CreateRAPOp(R, A, P, coarse_grid, cdir);
+         break;
+   }
 
    return RAP;
 }
@@ -49,9 +49,9 @@ hypre_SparseMSGCreateRAPOp( hypre_StructMatrix *R,
  * hypre_SparseMSGSetupRAPOp
  *
  * Wrapper for 2 and 3d, symmetric and non-symmetric routines to calculate
- * entries in RAP. Incomplete error handling at the moment. 
+ * entries in RAP. Incomplete error handling at the moment.
  *--------------------------------------------------------------------------*/
- 
+
 HYPRE_Int
 hypre_SparseMSGSetupRAPOp( hypre_StructMatrix *R,
                            hypre_StructMatrix *A,
@@ -63,47 +63,47 @@ hypre_SparseMSGSetupRAPOp( hypre_StructMatrix *R,
                            hypre_StructMatrix *Ac       )
 {
    HYPRE_Int ierr = 0;
- 
+
    hypre_StructStencil   *stencil;
 
    stencil = hypre_StructMatrixStencil(A);
 
-   switch (hypre_StructStencilNDim(stencil)) 
+   switch (hypre_StructStencilNDim(stencil))
    {
 
       case 2:
 
-      /*--------------------------------------------------------------------
-       *    Set lower triangular (+ diagonal) coefficients
-       *--------------------------------------------------------------------*/
-      ierr = hypre_SparseMSG2BuildRAPSym(A, P, R, cdir,
-                                         cindex, cstride, stridePR, Ac);
+         /*--------------------------------------------------------------------
+          *    Set lower triangular (+ diagonal) coefficients
+          *--------------------------------------------------------------------*/
+         ierr = hypre_SparseMSG2BuildRAPSym(A, P, R, cdir,
+                                            cindex, cstride, stridePR, Ac);
 
-      /*--------------------------------------------------------------------
-       *    For non-symmetric A, set upper triangular coefficients as well
-       *--------------------------------------------------------------------*/
-      if(!hypre_StructMatrixSymmetric(A))
-         ierr += hypre_SparseMSG2BuildRAPNoSym(A, P, R, cdir,
-                                               cindex, cstride, stridePR, Ac);
+         /*--------------------------------------------------------------------
+          *    For non-symmetric A, set upper triangular coefficients as well
+          *--------------------------------------------------------------------*/
+         if (!hypre_StructMatrixSymmetric(A))
+            ierr += hypre_SparseMSG2BuildRAPNoSym(A, P, R, cdir,
+                                                  cindex, cstride, stridePR, Ac);
 
-      break;
+         break;
 
       case 3:
 
-      /*--------------------------------------------------------------------
-       *    Set lower triangular (+ diagonal) coefficients
-       *--------------------------------------------------------------------*/
-      ierr = hypre_SparseMSG3BuildRAPSym(A, P, R, cdir,
-                                         cindex, cstride, stridePR, Ac);
+         /*--------------------------------------------------------------------
+          *    Set lower triangular (+ diagonal) coefficients
+          *--------------------------------------------------------------------*/
+         ierr = hypre_SparseMSG3BuildRAPSym(A, P, R, cdir,
+                                            cindex, cstride, stridePR, Ac);
 
-      /*--------------------------------------------------------------------
-       *    For non-symmetric A, set upper triangular coefficients as well
-       *--------------------------------------------------------------------*/
-      if(!hypre_StructMatrixSymmetric(A))
-         ierr += hypre_SparseMSG3BuildRAPNoSym(A, P, R, cdir,
-                                               cindex, cstride, stridePR, Ac);
+         /*--------------------------------------------------------------------
+          *    For non-symmetric A, set upper triangular coefficients as well
+          *--------------------------------------------------------------------*/
+         if (!hypre_StructMatrixSymmetric(A))
+            ierr += hypre_SparseMSG3BuildRAPNoSym(A, P, R, cdir,
+                                                  cindex, cstride, stridePR, Ac);
 
-      break;
+         break;
 
    }
 
@@ -111,4 +111,3 @@ hypre_SparseMSGSetupRAPOp( hypre_StructMatrix *R,
 
    return ierr;
 }
-
diff --git a/external/hypre/src/struct_ls/sparse_msg_solve.c b/external/hypre/src/struct_ls/sparse_msg_solve.c
index c024ac5c..863374ae 100644
--- a/external/hypre/src/struct_ls/sparse_msg_solve.c
+++ b/external/hypre/src/struct_ls/sparse_msg_solve.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -25,7 +25,7 @@ hypre_SparseMSGSolve( void               *smsg_vdata,
                       hypre_StructVector *b,
                       hypre_StructVector *x          )
 {
-	hypre_SparseMSGData  *smsg_data = (hypre_SparseMSGData  *)smsg_vdata;
+   hypre_SparseMSGData  *smsg_data = (hypre_SparseMSGData  *)smsg_vdata;
 
    HYPRE_Real            tol                 = (smsg_data -> tol);
    HYPRE_Int             max_iter            = (smsg_data -> max_iter);
@@ -68,12 +68,12 @@ hypre_SparseMSGSolve( void               *smsg_vdata,
 
    HYPRE_Int            *restrict_count;
 
-   HYPRE_Real            b_dot_b, r_dot_r, eps;
-   HYPRE_Real            e_dot_e, x_dot_x;
-                    
+   HYPRE_Real            b_dot_b = 0.0, r_dot_r, eps = 0.0;
+   HYPRE_Real            e_dot_e = 1.0, x_dot_x = 1.0;
+
    HYPRE_Int             i, l, lx, ly, lz;
    HYPRE_Int             lymin, lymax, lzmin, lzmax;
-   HYPRE_Int             fi, ci;                              
+   HYPRE_Int             fi, ci;
    HYPRE_Int             ierr = 0;
 
 #if DEBUG
@@ -113,7 +113,7 @@ hypre_SparseMSGSolve( void               *smsg_vdata,
    {
       /* eps = (tol^2) */
       b_dot_b = hypre_StructInnerProd(b_array[0], b_array[0]);
-      eps = tol*tol;
+      eps = tol * tol;
 
       /* if rhs is zero, return a zero solution */
       if (b_dot_b == 0.0)
@@ -163,26 +163,32 @@ hypre_SparseMSGSolve( void               *smsg_vdata,
 
          if (logging > 0)
          {
-            norms[i] = sqrt(r_dot_r);
-            if (b_dot_b > 0)
-               rel_norms[i] = sqrt(r_dot_r/b_dot_b);
+            norms[i] = hypre_sqrt(r_dot_r);
+            if (b_dot_b > 0.0)
+            {
+               rel_norms[i] = hypre_sqrt(r_dot_r / b_dot_b);
+            }
             else
+            {
                rel_norms[i] = 0.0;
+            }
          }
-/* RDF */
+         /* RDF */
 #if 0
 
-hypre_printf("iter = %d, rel_norm = %e\n", i, rel_norms[i]);
+         hypre_printf("iter = %d, rel_norm = %e\n", i, rel_norms[i]);
 
 #endif
 
          /* always do at least 1 V-cycle */
-         if ((r_dot_r/b_dot_b < eps) && (i > 0))
+         if ((r_dot_r / b_dot_b < eps) && (i > 0))
          {
             if (rel_change)
             {
-               if ((e_dot_e/x_dot_x) < eps)
+               if ((e_dot_e / x_dot_x) < eps)
+               {
                   break;
+               }
             }
             else
             {
@@ -220,7 +226,7 @@ hypre_printf("iter = %d, rel_norm = %e\n", i, rel_norms[i]);
 
                   if (restrict_count[fi] > 1)
                   {
-                     hypre_StructScale((1.0/restrict_count[fi]), b_array[fi]);
+                     hypre_StructScale((1.0 / restrict_count[fi]), b_array[fi]);
                   }
 
                   if (l > jump)
@@ -238,11 +244,11 @@ hypre_printf("iter = %d, rel_norm = %e\n", i, rel_norms[i]);
                                                -1.0, A_array[fi], x_array[fi],
                                                1.0, r_array[fi]);
                   }
-                        
-                  if ((lx+1) < num_grids[0])
+
+                  if ((lx + 1) < num_grids[0])
                   {
                      /* restrict to ((lx+1), ly, lz) */
-                     hypre_SparseMSGMapIndex((lx+1), ly, lz, num_grids, ci);
+                     hypre_SparseMSGMapIndex((lx + 1), ly, lz, num_grids, ci);
                      if (grid_on[ci])
                      {
                         if (restrict_count[ci])
@@ -261,10 +267,10 @@ hypre_printf("iter = %d, rel_norm = %e\n", i, rel_norms[i]);
                         restrict_count[ci]++;
                      }
                   }
-                  if ((ly+1) < num_grids[1])
+                  if ((ly + 1) < num_grids[1])
                   {
                      /* restrict to (lx, (ly+1), lz) */
-                     hypre_SparseMSGMapIndex(lx, (ly+1), lz, num_grids, ci);
+                     hypre_SparseMSGMapIndex(lx, (ly + 1), lz, num_grids, ci);
                      if (grid_on[ci])
                      {
                         if (restrict_count[ci])
@@ -283,10 +289,10 @@ hypre_printf("iter = %d, rel_norm = %e\n", i, rel_norms[i]);
                         restrict_count[ci]++;
                      }
                   }
-                  if ((lz+1) < num_grids[2])
+                  if ((lz + 1) < num_grids[2])
                   {
                      /* restrict to (lx, ly, (lz+1)) */
-                     hypre_SparseMSGMapIndex(lx, ly, (lz+1), num_grids, ci);
+                     hypre_SparseMSGMapIndex(lx, ly, (lz + 1), num_grids, ci);
                      if (grid_on[ci])
                      {
                         if (restrict_count[ci])
@@ -320,12 +326,12 @@ hypre_printf("iter = %d, rel_norm = %e\n", i, rel_norms[i]);
          /*--------------------------------------------------
           * Bottom
           *--------------------------------------------------*/
-      
+
          fi = num_all_grids - 1;
 
          if (restrict_count[fi] > 1)
          {
-            hypre_StructScale((1.0/restrict_count[fi]), b_array[fi]);
+            hypre_StructScale((1.0 / restrict_count[fi]), b_array[fi]);
          }
 
          hypre_PFMGRelaxSetZeroGuess(relax_array[fi], 1);
@@ -357,7 +363,7 @@ hypre_printf("iter = %d, rel_norm = %e\n", i, rel_norms[i]);
                   lx = l - lz - ly;
 
                   hypre_SparseMSGMapIndex(lx, ly, lz, num_grids, fi);
-                     
+
                   if (!grid_on[fi])
                   {
                      break;
@@ -367,10 +373,10 @@ hypre_printf("iter = %d, rel_norm = %e\n", i, rel_norms[i]);
                   {
                      hypre_StructVectorSetConstantValues(x_array[fi], 0.0);
                   }
-                  if ((lx+1) < num_grids[0])
+                  if ((lx + 1) < num_grids[0])
                   {
                      /* interpolate from ((lx+1), ly, lz) */
-                     hypre_SparseMSGMapIndex((lx+1), ly, lz, num_grids, ci);
+                     hypre_SparseMSGMapIndex((lx + 1), ly, lz, num_grids, ci);
                      if (grid_on[ci])
                      {
                         hypre_SparseMSGInterp(interpx_array[fi],
@@ -381,10 +387,10 @@ hypre_printf("iter = %d, rel_norm = %e\n", i, rel_norms[i]);
                         hypre_StructAxpy(1.0, e_array[fi], x_array[fi]);
                      }
                   }
-                  if ((ly+1) < num_grids[1])
+                  if ((ly + 1) < num_grids[1])
                   {
                      /* interpolate from (lx, (ly+1), lz) */
-                     hypre_SparseMSGMapIndex(lx, (ly+1), lz, num_grids, ci);
+                     hypre_SparseMSGMapIndex(lx, (ly + 1), lz, num_grids, ci);
                      if (grid_on[ci])
                      {
                         hypre_SparseMSGInterp(interpy_array[fi],
@@ -395,10 +401,10 @@ hypre_printf("iter = %d, rel_norm = %e\n", i, rel_norms[i]);
                         hypre_StructAxpy(1.0, e_array[fi], x_array[fi]);
                      }
                   }
-                  if ((lz+1) < num_grids[2])
+                  if ((lz + 1) < num_grids[2])
                   {
                      /* interpolate from (lx, ly, (lz+1)) */
-                     hypre_SparseMSGMapIndex(lx, ly, (lz+1), num_grids, ci);
+                     hypre_SparseMSGMapIndex(lx, ly, (lz + 1), num_grids, ci);
                      if (grid_on[ci])
                      {
                         hypre_SparseMSGInterp(interpz_array[fi],
@@ -408,7 +414,7 @@ hypre_printf("iter = %d, rel_norm = %e\n", i, rel_norms[i]);
                                               lx, ly, lz, jump);
                         hypre_StructAxpy(1.0, e_array[fi], x_array[fi]);
                      }
-                  }               
+                  }
 #if DEBUG
                   hypre_sprintf(filename, "zoutSMSG_xup.%d.%d.%d", lx, ly, lz);
                   hypre_StructVectorPrint(filename, x_array[fi], 0);
@@ -456,4 +462,3 @@ hypre_printf("iter = %d, rel_norm = %e\n", i, rel_norms[i]);
 
    return ierr;
 }
-
diff --git a/external/hypre/src/struct_mv/CMakeLists.txt b/external/hypre/src/struct_mv/CMakeLists.txt
index b77c8863..20e4dc1f 100644
--- a/external/hypre/src/struct_mv/CMakeLists.txt
+++ b/external/hypre/src/struct_mv/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -44,8 +44,8 @@ target_sources(${PROJECT_NAME}
           ${HDRS}
 )
 
-if (HYPRE_USING_CUDA)
-  set(CUDA_SRCS
+if (HYPRE_USING_GPU)
+  set(GPU_SRCS
     struct_axpy.c
     struct_communication.c
     struct_copy.c
@@ -55,8 +55,8 @@ if (HYPRE_USING_CUDA)
     struct_scale.c
     struct_vector.c
   )
-  convert_filenames_to_full_paths(CUDA_SRCS)
-  set(HYPRE_CUDA_SOURCES ${HYPRE_CUDA_SOURCES} ${CUDA_SRCS} PARENT_SCOPE)
+  convert_filenames_to_full_paths(GPU_SRCS)
+  set(HYPRE_GPU_SOURCES ${HYPRE_GPU_SOURCES} ${GPU_SRCS} PARENT_SCOPE)
 endif ()
 
 convert_filenames_to_full_paths(HDRS)
diff --git a/external/hypre/src/struct_mv/F90_HYPRE_struct_grid.c b/external/hypre/src/struct_mv/F90_HYPRE_struct_grid.c
index 47ef9c0e..0136f7bf 100644
--- a/external/hypre/src/struct_mv/F90_HYPRE_struct_grid.c
+++ b/external/hypre/src/struct_mv/F90_HYPRE_struct_grid.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -17,23 +17,23 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-    
+
 /*--------------------------------------------------------------------------
  * HYPRE_StructGridCreate
  *--------------------------------------------------------------------------*/
 
 void
 hypre_F90_IFACE(hypre_structgridcreate, HYPRE_STRUCTGRIDCREATE)
-   ( hypre_F90_Comm *comm,
-     hypre_F90_Int *dim,
-     hypre_F90_Obj *grid,
-     hypre_F90_Int *ierr )
+( hypre_F90_Comm *comm,
+  hypre_F90_Int *dim,
+  hypre_F90_Obj *grid,
+  hypre_F90_Int *ierr )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructGridCreate(
-           hypre_F90_PassComm (comm),
-           hypre_F90_PassInt (dim),
-           hypre_F90_PassObjRef (HYPRE_StructGrid, grid) ) );
+           ( HYPRE_StructGridCreate(
+                hypre_F90_PassComm (comm),
+                hypre_F90_PassInt (dim),
+                hypre_F90_PassObjRef (HYPRE_StructGrid, grid) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -42,12 +42,12 @@ hypre_F90_IFACE(hypre_structgridcreate, HYPRE_STRUCTGRIDCREATE)
 
 void
 hypre_F90_IFACE(hypre_structgriddestroy, HYPRE_STRUCTGRIDDESTROY)
-   ( hypre_F90_Obj *grid,
-     hypre_F90_Int *ierr )
+( hypre_F90_Obj *grid,
+  hypre_F90_Int *ierr )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructGridDestroy(
-           hypre_F90_PassObj (HYPRE_StructGrid, grid) ) );
+           ( HYPRE_StructGridDestroy(
+                hypre_F90_PassObj (HYPRE_StructGrid, grid) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -56,16 +56,16 @@ hypre_F90_IFACE(hypre_structgriddestroy, HYPRE_STRUCTGRIDDESTROY)
 
 void
 hypre_F90_IFACE(hypre_structgridsetextents, HYPRE_STRUCTGRIDSETEXTENTS)
-   ( hypre_F90_Obj *grid,
-     hypre_F90_IntArray *ilower,
-     hypre_F90_IntArray *iupper,
-     hypre_F90_Int *ierr )
+( hypre_F90_Obj *grid,
+  hypre_F90_IntArray *ilower,
+  hypre_F90_IntArray *iupper,
+  hypre_F90_Int *ierr )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructGridSetExtents(
-           hypre_F90_PassObj (HYPRE_StructGrid, grid),
-           hypre_F90_PassIntArray (ilower),
-           hypre_F90_PassIntArray (iupper) ) );
+           ( HYPRE_StructGridSetExtents(
+                hypre_F90_PassObj (HYPRE_StructGrid, grid),
+                hypre_F90_PassIntArray (ilower),
+                hypre_F90_PassIntArray (iupper) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -74,14 +74,14 @@ hypre_F90_IFACE(hypre_structgridsetextents, HYPRE_STRUCTGRIDSETEXTENTS)
 
 void
 hypre_F90_IFACE(hypre_structgridsetperiodic, HYPRE_STRUCTGRIDSETPERIODIC)
-   ( hypre_F90_Obj *grid,
-     hypre_F90_IntArray *periodic,
-     hypre_F90_Int *ierr)
+( hypre_F90_Obj *grid,
+  hypre_F90_IntArray *periodic,
+  hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructGridSetPeriodic(
-           hypre_F90_PassObj (HYPRE_StructGrid, grid),
-           hypre_F90_PassIntArray (periodic)) );
+           ( HYPRE_StructGridSetPeriodic(
+                hypre_F90_PassObj (HYPRE_StructGrid, grid),
+                hypre_F90_PassIntArray (periodic)) );
 }
 
 /*--------------------------------------------------------------------------
@@ -90,12 +90,12 @@ hypre_F90_IFACE(hypre_structgridsetperiodic, HYPRE_STRUCTGRIDSETPERIODIC)
 
 void
 hypre_F90_IFACE(hypre_structgridassemble, HYPRE_STRUCTGRIDASSEMBLE)
-   ( hypre_F90_Obj *grid,
-     hypre_F90_Int *ierr )
+( hypre_F90_Obj *grid,
+  hypre_F90_Int *ierr )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructGridAssemble(
-           hypre_F90_PassObj (HYPRE_StructGrid, grid)) );
+           ( HYPRE_StructGridAssemble(
+                hypre_F90_PassObj (HYPRE_StructGrid, grid)) );
 }
 
 /*--------------------------------------------------------------------------
@@ -104,16 +104,16 @@ hypre_F90_IFACE(hypre_structgridassemble, HYPRE_STRUCTGRIDASSEMBLE)
 
 void
 hypre_F90_IFACE(hypre_structgridsetnumghost, HYPRE_STRUCTGRIDSETNUMGHOST)
-   ( hypre_F90_Obj *grid,
-     hypre_F90_IntArray *num_ghost,
-     hypre_F90_Int *ierr )
+( hypre_F90_Obj *grid,
+  hypre_F90_IntArray *num_ghost,
+  hypre_F90_Int *ierr )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructGridSetNumGhost(
-           hypre_F90_PassObj (HYPRE_StructGrid, grid),
-           hypre_F90_PassIntArray (num_ghost)) );
+           ( HYPRE_StructGridSetNumGhost(
+                hypre_F90_PassObj (HYPRE_StructGrid, grid),
+                hypre_F90_PassIntArray (num_ghost)) );
 }
-    
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/external/hypre/src/struct_mv/F90_HYPRE_struct_matrix.c b/external/hypre/src/struct_mv/F90_HYPRE_struct_matrix.c
index 893df8ea..1dbea175 100644
--- a/external/hypre/src/struct_mv/F90_HYPRE_struct_matrix.c
+++ b/external/hypre/src/struct_mv/F90_HYPRE_struct_matrix.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -17,37 +17,37 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-    
+
 /*--------------------------------------------------------------------------
  * HYPRE_StructMatrixCreate
  *--------------------------------------------------------------------------*/
 
 void
 hypre_F90_IFACE(hypre_structmatrixcreate, HYPRE_STRUCTMATRIXCREATE)
-   (hypre_F90_Comm *comm,
-    hypre_F90_Obj *grid,
-    hypre_F90_Obj *stencil,
-    hypre_F90_Obj *matrix,
-    hypre_F90_Int *ierr)
+(hypre_F90_Comm *comm,
+ hypre_F90_Obj *grid,
+ hypre_F90_Obj *stencil,
+ hypre_F90_Obj *matrix,
+ hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int) HYPRE_StructMatrixCreate(
-      hypre_F90_PassComm (comm),
-      hypre_F90_PassObj (HYPRE_StructGrid, grid),
-      hypre_F90_PassObj (HYPRE_StructStencil, stencil),
-      hypre_F90_PassObjRef (HYPRE_StructMatrix, matrix)   );
+              hypre_F90_PassComm (comm),
+              hypre_F90_PassObj (HYPRE_StructGrid, grid),
+              hypre_F90_PassObj (HYPRE_StructStencil, stencil),
+              hypre_F90_PassObjRef (HYPRE_StructMatrix, matrix)   );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_StructMatrixDestroy
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_structmatrixdestroy, HYPRE_STRUCTMATRIXDESTROY)
-   ( hypre_F90_Obj *matrix,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *matrix,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int) HYPRE_StructMatrixDestroy(
-      hypre_F90_PassObj (HYPRE_StructMatrix, matrix) );
+              hypre_F90_PassObj (HYPRE_StructMatrix, matrix) );
 }
 
 /*--------------------------------------------------------------------------
@@ -56,188 +56,188 @@ hypre_F90_IFACE(hypre_structmatrixdestroy, HYPRE_STRUCTMATRIXDESTROY)
 
 void
 hypre_F90_IFACE(hypre_structmatrixinitialize, HYPRE_STRUCTMATRIXINITIALIZE)
-   ( hypre_F90_Obj *matrix,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *matrix,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int) HYPRE_StructMatrixInitialize(
-      hypre_F90_PassObj (HYPRE_StructMatrix, matrix) );
+              hypre_F90_PassObj (HYPRE_StructMatrix, matrix) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_StructMatrixSetValues
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_structmatrixsetvalues, HYPRE_STRUCTMATRIXSETVALUES)
-   ( hypre_F90_Obj *matrix,
-     hypre_F90_IntArray *grid_index,
-     hypre_F90_Int *num_stencil_indices,
-     hypre_F90_IntArray *stencil_indices,
-     hypre_F90_ComplexArray *values,
-     hypre_F90_Int *ierr                )
+( hypre_F90_Obj *matrix,
+  hypre_F90_IntArray *grid_index,
+  hypre_F90_Int *num_stencil_indices,
+  hypre_F90_IntArray *stencil_indices,
+  hypre_F90_ComplexArray *values,
+  hypre_F90_Int *ierr                )
 {
    *ierr = (hypre_F90_Int) HYPRE_StructMatrixSetValues(
-      hypre_F90_PassObj (HYPRE_StructMatrix, matrix),
-      hypre_F90_PassIntArray (grid_index),
-      hypre_F90_PassInt (num_stencil_indices),
-      hypre_F90_PassIntArray (stencil_indices),
-      hypre_F90_PassComplexArray (values)           );
+              hypre_F90_PassObj (HYPRE_StructMatrix, matrix),
+              hypre_F90_PassIntArray (grid_index),
+              hypre_F90_PassInt (num_stencil_indices),
+              hypre_F90_PassIntArray (stencil_indices),
+              hypre_F90_PassComplexArray (values)           );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_StructMatrixSetBoxValues
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_structmatrixsetboxvalues, HYPRE_STRUCTMATRIXSETBOXVALUES)
-   ( hypre_F90_Obj *matrix,
-     hypre_F90_IntArray *ilower,
-     hypre_F90_IntArray *iupper,
-     hypre_F90_Int *num_stencil_indices,
-     hypre_F90_IntArray *stencil_indices,
-     hypre_F90_ComplexArray *values,
-     hypre_F90_Int *ierr              )
+( hypre_F90_Obj *matrix,
+  hypre_F90_IntArray *ilower,
+  hypre_F90_IntArray *iupper,
+  hypre_F90_Int *num_stencil_indices,
+  hypre_F90_IntArray *stencil_indices,
+  hypre_F90_ComplexArray *values,
+  hypre_F90_Int *ierr              )
 {
    *ierr = (hypre_F90_Int) HYPRE_StructMatrixSetBoxValues(
-      hypre_F90_PassObj (HYPRE_StructMatrix, matrix),
-      hypre_F90_PassIntArray (ilower),
-      hypre_F90_PassIntArray (iupper),
-      hypre_F90_PassInt (num_stencil_indices),
-      hypre_F90_PassIntArray (stencil_indices),
-      hypre_F90_PassComplexArray (values)        );
+              hypre_F90_PassObj (HYPRE_StructMatrix, matrix),
+              hypre_F90_PassIntArray (ilower),
+              hypre_F90_PassIntArray (iupper),
+              hypre_F90_PassInt (num_stencil_indices),
+              hypre_F90_PassIntArray (stencil_indices),
+              hypre_F90_PassComplexArray (values)        );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_StructMatrixGetBoxValues
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_structmatrixgetboxvalues, HYPRE_STRUCTMATRIXGETBOXVALUES)
-   ( hypre_F90_Obj *matrix,
-     hypre_F90_IntArray *ilower,
-     hypre_F90_IntArray *iupper,
-     hypre_F90_Int *num_stencil_indices,
-     hypre_F90_IntArray *stencil_indices,
-     hypre_F90_ComplexArray *values,
-     hypre_F90_Int *ierr              )
+( hypre_F90_Obj *matrix,
+  hypre_F90_IntArray *ilower,
+  hypre_F90_IntArray *iupper,
+  hypre_F90_Int *num_stencil_indices,
+  hypre_F90_IntArray *stencil_indices,
+  hypre_F90_ComplexArray *values,
+  hypre_F90_Int *ierr              )
 {
    *ierr = (hypre_F90_Int) HYPRE_StructMatrixGetBoxValues(
-      hypre_F90_PassObj (HYPRE_StructMatrix, matrix),
-      hypre_F90_PassIntArray (ilower),
-      hypre_F90_PassIntArray (iupper),
-      hypre_F90_PassInt (num_stencil_indices),
-      hypre_F90_PassIntArray (stencil_indices),
-      hypre_F90_PassComplexArray (values)        );
+              hypre_F90_PassObj (HYPRE_StructMatrix, matrix),
+              hypre_F90_PassIntArray (ilower),
+              hypre_F90_PassIntArray (iupper),
+              hypre_F90_PassInt (num_stencil_indices),
+              hypre_F90_PassIntArray (stencil_indices),
+              hypre_F90_PassComplexArray (values)        );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_StructMatrixSetConstantValues
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_structmatrixsetconstantva, HYPRE_STRUCTMATRIXSETCONSTANTVA)
-   ( hypre_F90_Obj *matrix,
-     hypre_F90_Int *num_stencil_indices,
-     hypre_F90_IntArray *stencil_indices,
-     hypre_F90_ComplexArray *values,
-     hypre_F90_Int *ierr                )
+( hypre_F90_Obj *matrix,
+  hypre_F90_Int *num_stencil_indices,
+  hypre_F90_IntArray *stencil_indices,
+  hypre_F90_ComplexArray *values,
+  hypre_F90_Int *ierr                )
 {
    *ierr = (hypre_F90_Int) HYPRE_StructMatrixSetConstantValues(
-      hypre_F90_PassObj (HYPRE_StructMatrix, matrix),
-      hypre_F90_PassInt (num_stencil_indices),
-      hypre_F90_PassIntArray (stencil_indices),
-      hypre_F90_PassComplexArray (values)           );
+              hypre_F90_PassObj (HYPRE_StructMatrix, matrix),
+              hypre_F90_PassInt (num_stencil_indices),
+              hypre_F90_PassIntArray (stencil_indices),
+              hypre_F90_PassComplexArray (values)           );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_StructMatrixAddToValues
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_structmatrixaddtovalues, HYPRE_STRUCTMATRIXADDTOVALUES)
-   ( hypre_F90_Obj *matrix,
-     hypre_F90_IntArray *grid_index,
-     hypre_F90_Int *num_stencil_indices,
-     hypre_F90_IntArray *stencil_indices,
-     hypre_F90_ComplexArray *values,
-     hypre_F90_Int *ierr                )
+( hypre_F90_Obj *matrix,
+  hypre_F90_IntArray *grid_index,
+  hypre_F90_Int *num_stencil_indices,
+  hypre_F90_IntArray *stencil_indices,
+  hypre_F90_ComplexArray *values,
+  hypre_F90_Int *ierr                )
 {
    *ierr = (hypre_F90_Int) HYPRE_StructMatrixAddToValues(
-      hypre_F90_PassObj (HYPRE_StructMatrix, matrix),
-      hypre_F90_PassIntArray (grid_index),
-      hypre_F90_PassInt (num_stencil_indices),
-      hypre_F90_PassIntArray (stencil_indices),
-      hypre_F90_PassComplexArray (values)           );
+              hypre_F90_PassObj (HYPRE_StructMatrix, matrix),
+              hypre_F90_PassIntArray (grid_index),
+              hypre_F90_PassInt (num_stencil_indices),
+              hypre_F90_PassIntArray (stencil_indices),
+              hypre_F90_PassComplexArray (values)           );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_StructMatrixAddToBoxValues
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_structmatrixaddtoboxvalues, HYPRE_STRUCTMATRIXADDTOBOXVALUES)
-   ( hypre_F90_Obj *matrix,
-     hypre_F90_IntArray *ilower,
-     hypre_F90_IntArray *iupper,
-     hypre_F90_Int *num_stencil_indices,
-     hypre_F90_IntArray *stencil_indices,
-     hypre_F90_ComplexArray *values,
-     hypre_F90_Int *ierr              )
+( hypre_F90_Obj *matrix,
+  hypre_F90_IntArray *ilower,
+  hypre_F90_IntArray *iupper,
+  hypre_F90_Int *num_stencil_indices,
+  hypre_F90_IntArray *stencil_indices,
+  hypre_F90_ComplexArray *values,
+  hypre_F90_Int *ierr              )
 {
    *ierr = (hypre_F90_Int) HYPRE_StructMatrixAddToBoxValues(
-      hypre_F90_PassObj (HYPRE_StructMatrix, matrix),
-      hypre_F90_PassIntArray (ilower),
-      hypre_F90_PassIntArray (iupper),
-      hypre_F90_PassInt (num_stencil_indices),
-      hypre_F90_PassIntArray (stencil_indices),
-      hypre_F90_PassComplexArray (values)        );
+              hypre_F90_PassObj (HYPRE_StructMatrix, matrix),
+              hypre_F90_PassIntArray (ilower),
+              hypre_F90_PassIntArray (iupper),
+              hypre_F90_PassInt (num_stencil_indices),
+              hypre_F90_PassIntArray (stencil_indices),
+              hypre_F90_PassComplexArray (values)        );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_StructMatrixAddToConstantValues
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_structmatrixaddtoconstant, HYPRE_STRUCTMATRIXADDTOCONSTANT)
-   ( hypre_F90_Obj *matrix,
-     hypre_F90_Int *num_stencil_indices,
-     hypre_F90_IntArray *stencil_indices,
-     hypre_F90_ComplexArray *values,
-     hypre_F90_Int *ierr              )
+( hypre_F90_Obj *matrix,
+  hypre_F90_Int *num_stencil_indices,
+  hypre_F90_IntArray *stencil_indices,
+  hypre_F90_ComplexArray *values,
+  hypre_F90_Int *ierr              )
 {
    *ierr = (hypre_F90_Int) HYPRE_StructMatrixSetConstantValues(
-      hypre_F90_PassObj (HYPRE_StructMatrix, matrix),
-      hypre_F90_PassInt (num_stencil_indices),
-      hypre_F90_PassIntArray (stencil_indices),
-      hypre_F90_PassComplexArray (values)        );
+              hypre_F90_PassObj (HYPRE_StructMatrix, matrix),
+              hypre_F90_PassInt (num_stencil_indices),
+              hypre_F90_PassIntArray (stencil_indices),
+              hypre_F90_PassComplexArray (values)        );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_StructMatrixAssemble
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_structmatrixassemble, HYPRE_STRUCTMATRIXASSEMBLE)
-   ( hypre_F90_Obj *matrix,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *matrix,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int) HYPRE_StructMatrixAssemble(
-      hypre_F90_PassObj (HYPRE_StructMatrix, matrix) );
+              hypre_F90_PassObj (HYPRE_StructMatrix, matrix) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_StructMatrixSetNumGhost
  *--------------------------------------------------------------------------*/
- 
+
 void
 hypre_F90_IFACE(hypre_structmatrixsetnumghost, HYPRE_STRUCTMATRIXSETNUMGHOST)
-   ( hypre_F90_Obj *matrix,
-     hypre_F90_IntArray *num_ghost,
-     hypre_F90_Int *ierr      )
+( hypre_F90_Obj *matrix,
+  hypre_F90_IntArray *num_ghost,
+  hypre_F90_Int *ierr      )
 {
    *ierr = (hypre_F90_Int) HYPRE_StructMatrixSetNumGhost(
-      hypre_F90_PassObj (HYPRE_StructMatrix, matrix),
-      hypre_F90_PassIntArray (num_ghost) );
+              hypre_F90_PassObj (HYPRE_StructMatrix, matrix),
+              hypre_F90_PassIntArray (num_ghost) );
 }
 
 /*--------------------------------------------------------------------------
@@ -246,45 +246,45 @@ hypre_F90_IFACE(hypre_structmatrixsetnumghost, HYPRE_STRUCTMATRIXSETNUMGHOST)
 
 void
 hypre_F90_IFACE(hypre_structmatrixgetgrid, HYPRE_STRUCTMATRIXGETGRID)
-   ( hypre_F90_Obj *matrix,
-     hypre_F90_Obj *grid,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *matrix,
+  hypre_F90_Obj *grid,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int) HYPRE_StructMatrixGetGrid(
-      hypre_F90_PassObj (HYPRE_StructMatrix, matrix),
-      hypre_F90_PassObjRef (HYPRE_StructGrid, grid) );
+              hypre_F90_PassObj (HYPRE_StructMatrix, matrix),
+              hypre_F90_PassObjRef (HYPRE_StructGrid, grid) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_StructMatrixSetSymmetric
  *--------------------------------------------------------------------------*/
- 
+
 void
 hypre_F90_IFACE(hypre_structmatrixsetsymmetric, HYPRE_STRUCTMATRIXSETSYMMETRIC)
-   ( hypre_F90_Obj *matrix,
-     hypre_F90_Int *symmetric,
-     hypre_F90_Int *ierr      )
+( hypre_F90_Obj *matrix,
+  hypre_F90_Int *symmetric,
+  hypre_F90_Int *ierr      )
 {
    *ierr = (hypre_F90_Int) HYPRE_StructMatrixSetSymmetric(
-      hypre_F90_PassObj (HYPRE_StructMatrix, matrix),
-      hypre_F90_PassInt (symmetric) );
+              hypre_F90_PassObj (HYPRE_StructMatrix, matrix),
+              hypre_F90_PassInt (symmetric) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_StructMatrixSetConstantEntries
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_structmatrixsetconstanten, HYPRE_STRUCTMATRIXSETCONSTANTEN)
-   ( hypre_F90_Obj *matrix,
-     hypre_F90_Int *nentries,
-     hypre_F90_IntArray *entries,
-     hypre_F90_Int *ierr                )
+( hypre_F90_Obj *matrix,
+  hypre_F90_Int *nentries,
+  hypre_F90_IntArray *entries,
+  hypre_F90_Int *ierr                )
 {
    *ierr = (hypre_F90_Int) HYPRE_StructMatrixSetConstantEntries(
-      hypre_F90_PassObj (HYPRE_StructMatrix, matrix),
-      hypre_F90_PassInt (nentries),
-      hypre_F90_PassIntArray (entries)           );
+              hypre_F90_PassObj (HYPRE_StructMatrix, matrix),
+              hypre_F90_PassInt (nentries),
+              hypre_F90_PassIntArray (entries)           );
 }
 
 /*--------------------------------------------------------------------------
@@ -293,38 +293,38 @@ hypre_F90_IFACE(hypre_structmatrixsetconstanten, HYPRE_STRUCTMATRIXSETCONSTANTEN
 
 void
 hypre_F90_IFACE(hypre_structmatrixprint, HYPRE_STRUCTMATRIXPRINT)
-   (
-      hypre_F90_Obj *matrix,
-      hypre_F90_Int *all,
-      hypre_F90_Int *ierr )
+(
+   hypre_F90_Obj *matrix,
+   hypre_F90_Int *all,
+   hypre_F90_Int *ierr )
 {
    *ierr = (hypre_F90_Int) HYPRE_StructMatrixPrint(
-      "HYPRE_StructMatrix.out",
-      hypre_F90_PassObj (HYPRE_StructMatrix, matrix),
-      hypre_F90_PassInt (all));
+              "HYPRE_StructMatrix.out",
+              hypre_F90_PassObj (HYPRE_StructMatrix, matrix),
+              hypre_F90_PassInt (all));
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_StructMatrixMatvec
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_structmatrixmatvec, HYPRE_STRUCTMATRIXMATVEC)
-   ( hypre_F90_Complex *alpha,
-     hypre_F90_Obj *A,
-     hypre_F90_Obj *x,
-     hypre_F90_Complex *beta,
-     hypre_F90_Obj *y,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Complex *alpha,
+  hypre_F90_Obj *A,
+  hypre_F90_Obj *x,
+  hypre_F90_Complex *beta,
+  hypre_F90_Obj *y,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int) HYPRE_StructMatrixMatvec(
-      hypre_F90_PassComplex (alpha),
-      hypre_F90_PassObj (HYPRE_StructMatrix, A),
-      hypre_F90_PassObj (HYPRE_StructVector, x),
-      hypre_F90_PassComplex (beta),
-      hypre_F90_PassObj (HYPRE_StructVector, y)  );
+              hypre_F90_PassComplex (alpha),
+              hypre_F90_PassObj (HYPRE_StructMatrix, A),
+              hypre_F90_PassObj (HYPRE_StructVector, x),
+              hypre_F90_PassComplex (beta),
+              hypre_F90_PassObj (HYPRE_StructVector, y)  );
 }
-    
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/external/hypre/src/struct_mv/F90_HYPRE_struct_stencil.c b/external/hypre/src/struct_mv/F90_HYPRE_struct_stencil.c
index aca0f4c1..a7f53ff5 100644
--- a/external/hypre/src/struct_mv/F90_HYPRE_struct_stencil.c
+++ b/external/hypre/src/struct_mv/F90_HYPRE_struct_stencil.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -17,22 +17,22 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-    
+
 /*--------------------------------------------------------------------------
  * HYPRE_StructStencilCreate
  *--------------------------------------------------------------------------*/
 
 void
 hypre_F90_IFACE(hypre_structstencilcreate, HYPRE_STRUCTSTENCILCREATE)
-   ( hypre_F90_Int *dim,
-     hypre_F90_Int *size,
-     hypre_F90_Obj *stencil,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Int *dim,
+  hypre_F90_Int *size,
+  hypre_F90_Obj *stencil,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int) HYPRE_StructStencilCreate(
-      hypre_F90_PassInt (dim),
-      hypre_F90_PassInt (size),
-      hypre_F90_PassObjRef (HYPRE_StructStencil, stencil) );
+              hypre_F90_PassInt (dim),
+              hypre_F90_PassInt (size),
+              hypre_F90_PassObjRef (HYPRE_StructStencil, stencil) );
 }
 
 /*--------------------------------------------------------------------------
@@ -41,15 +41,15 @@ hypre_F90_IFACE(hypre_structstencilcreate, HYPRE_STRUCTSTENCILCREATE)
 
 void
 hypre_F90_IFACE(hypre_structstencilsetelement, HYPRE_STRUCTSTENCILSETELEMENT)
-   ( hypre_F90_Obj *stencil,
-     hypre_F90_Int *element_index,
-     hypre_F90_IntArray *offset,
-     hypre_F90_Int *ierr          )
+( hypre_F90_Obj *stencil,
+  hypre_F90_Int *element_index,
+  hypre_F90_IntArray *offset,
+  hypre_F90_Int *ierr          )
 {
    *ierr = (hypre_F90_Int) HYPRE_StructStencilSetElement(
-      hypre_F90_PassObj (HYPRE_StructStencil, stencil),
-      hypre_F90_PassInt (element_index),
-      hypre_F90_PassIntArray (offset)       );
+              hypre_F90_PassObj (HYPRE_StructStencil, stencil),
+              hypre_F90_PassInt (element_index),
+              hypre_F90_PassIntArray (offset)       );
 }
 
 /*--------------------------------------------------------------------------
@@ -58,13 +58,13 @@ hypre_F90_IFACE(hypre_structstencilsetelement, HYPRE_STRUCTSTENCILSETELEMENT)
 
 void
 hypre_F90_IFACE(hypre_structstencildestroy, HYPRE_STRUCTSTENCILDESTROY)
-   ( hypre_F90_Obj *stencil,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Obj *stencil,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int) HYPRE_StructStencilDestroy(
-      hypre_F90_PassObj (HYPRE_StructStencil, stencil) );
+              hypre_F90_PassObj (HYPRE_StructStencil, stencil) );
 }
-    
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/external/hypre/src/struct_mv/F90_HYPRE_struct_vector.c b/external/hypre/src/struct_mv/F90_HYPRE_struct_vector.c
index 9c53ec8c..b53e01b9 100644
--- a/external/hypre/src/struct_mv/F90_HYPRE_struct_vector.c
+++ b/external/hypre/src/struct_mv/F90_HYPRE_struct_vector.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -17,37 +17,37 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-    
+
 /*--------------------------------------------------------------------------
  * HYPRE_StructVectorCreate
  *--------------------------------------------------------------------------*/
 
 void
 hypre_F90_IFACE(hypre_structvectorcreate, HYPRE_STRUCTVECTORCREATE)
-   ( hypre_F90_Comm *comm,
-     hypre_F90_Obj *grid,
-     hypre_F90_Obj *vector,
-     hypre_F90_Int *ierr    )
+( hypre_F90_Comm *comm,
+  hypre_F90_Obj *grid,
+  hypre_F90_Obj *vector,
+  hypre_F90_Int *ierr    )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructVectorCreate(
-           hypre_F90_PassComm (comm),
-           hypre_F90_PassObj (HYPRE_StructGrid, grid),
-           hypre_F90_PassObjRef (HYPRE_StructVector, vector)   ) );
+           ( HYPRE_StructVectorCreate(
+                hypre_F90_PassComm (comm),
+                hypre_F90_PassObj (HYPRE_StructGrid, grid),
+                hypre_F90_PassObjRef (HYPRE_StructVector, vector)   ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_StructVectorDestroy
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_structvectordestroy, HYPRE_STRUCTVECTORDESTROY)
-   ( hypre_F90_Obj *vector,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *vector,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructVectorDestroy(
-           hypre_F90_PassObj (HYPRE_StructVector, vector) ) );
+           ( HYPRE_StructVectorDestroy(
+                hypre_F90_PassObj (HYPRE_StructVector, vector) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -56,188 +56,188 @@ hypre_F90_IFACE(hypre_structvectordestroy, HYPRE_STRUCTVECTORDESTROY)
 
 void
 hypre_F90_IFACE(hypre_structvectorinitialize, HYPRE_STRUCTVECTORINITIALIZE)
-   ( hypre_F90_Obj *vector,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *vector,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructVectorInitialize(
-           hypre_F90_PassObj (HYPRE_StructVector, vector) ) );
+           ( HYPRE_StructVectorInitialize(
+                hypre_F90_PassObj (HYPRE_StructVector, vector) ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_StructVectorSetValues
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_structvectorsetvalues, HYPRE_STRUCTVECTORSETVALUES)
-   ( hypre_F90_Obj *vector,
-     hypre_F90_IntArray *grid_index,
-     hypre_F90_Complex *values,
-     hypre_F90_Int *ierr       )
+( hypre_F90_Obj *vector,
+  hypre_F90_IntArray *grid_index,
+  hypre_F90_Complex *values,
+  hypre_F90_Int *ierr       )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructVectorSetValues(
-           hypre_F90_PassObj (HYPRE_StructVector, vector),
-           hypre_F90_PassIntArray (grid_index),
-           hypre_F90_PassComplex (values)     ) );
+           ( HYPRE_StructVectorSetValues(
+                hypre_F90_PassObj (HYPRE_StructVector, vector),
+                hypre_F90_PassIntArray (grid_index),
+                hypre_F90_PassComplex (values)     ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_StructVectorSetBoxValues
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_structvectorsetboxvalues, HYPRE_STRUCTVECTORSETBOXVALUES)
-   ( hypre_F90_Obj *vector,
-     hypre_F90_IntArray *ilower,
-     hypre_F90_IntArray *iupper,
-     hypre_F90_ComplexArray *values,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *vector,
+  hypre_F90_IntArray *ilower,
+  hypre_F90_IntArray *iupper,
+  hypre_F90_ComplexArray *values,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructVectorSetBoxValues(
-           hypre_F90_PassObj (HYPRE_StructVector, vector),
-           hypre_F90_PassIntArray (ilower),
-           hypre_F90_PassIntArray (iupper),
-           hypre_F90_PassComplexArray (values)  ) );
+           ( HYPRE_StructVectorSetBoxValues(
+                hypre_F90_PassObj (HYPRE_StructVector, vector),
+                hypre_F90_PassIntArray (ilower),
+                hypre_F90_PassIntArray (iupper),
+                hypre_F90_PassComplexArray (values)  ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_StructVectorAddToValues
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_structvectoraddtovalues, HYPRE_STRUCTVECTORADDTOVALUES)
-   ( hypre_F90_Obj *vector,
-     hypre_F90_IntArray *grid_index,
-     hypre_F90_Complex *values,
-     hypre_F90_Int *ierr       )
+( hypre_F90_Obj *vector,
+  hypre_F90_IntArray *grid_index,
+  hypre_F90_Complex *values,
+  hypre_F90_Int *ierr       )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructVectorAddToValues(
-           hypre_F90_PassObj (HYPRE_StructVector, vector),
-           hypre_F90_PassIntArray (grid_index),
-           hypre_F90_PassComplex (values)     ) );
+           ( HYPRE_StructVectorAddToValues(
+                hypre_F90_PassObj (HYPRE_StructVector, vector),
+                hypre_F90_PassIntArray (grid_index),
+                hypre_F90_PassComplex (values)     ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_StructVectorAddToBoxValues
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_structvectoraddtoboxvalue, HYPRE_STRUCTVECTORADDTOBOXVALUE)
-   ( hypre_F90_Obj *vector,
-     hypre_F90_IntArray *ilower,
-     hypre_F90_IntArray *iupper,
-     hypre_F90_ComplexArray *values,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *vector,
+  hypre_F90_IntArray *ilower,
+  hypre_F90_IntArray *iupper,
+  hypre_F90_ComplexArray *values,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructVectorAddToBoxValues(
-           hypre_F90_PassObj (HYPRE_StructVector, vector),
-           hypre_F90_PassIntArray (ilower),
-           hypre_F90_PassIntArray (iupper),
-           hypre_F90_PassComplexArray (values)  ) );
+           ( HYPRE_StructVectorAddToBoxValues(
+                hypre_F90_PassObj (HYPRE_StructVector, vector),
+                hypre_F90_PassIntArray (ilower),
+                hypre_F90_PassIntArray (iupper),
+                hypre_F90_PassComplexArray (values)  ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_StructVectorScaleValues
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_structvectorscalevalues, HYPRE_STRUCTVECTORSCALEVALUES)
-   ( hypre_F90_Obj *vector,
-     hypre_F90_Complex *factor,
-     hypre_F90_Int *ierr       )
+( hypre_F90_Obj *vector,
+  hypre_F90_Complex *factor,
+  hypre_F90_Int *ierr       )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructVectorScaleValues(
-           hypre_F90_PassObj (HYPRE_StructVector, vector),
-           hypre_F90_PassComplex (factor) ) );
+           ( HYPRE_StructVectorScaleValues(
+                hypre_F90_PassObj (HYPRE_StructVector, vector),
+                hypre_F90_PassComplex (factor) ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_StructVectorGetValues
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_structvectorgetvalues, HYPRE_STRUCTVECTORGETVALUES)
-   ( hypre_F90_Obj *vector,
-     hypre_F90_IntArray *grid_index,
-     hypre_F90_Complex *values_ptr,
-     hypre_F90_Int *ierr       )
+( hypre_F90_Obj *vector,
+  hypre_F90_IntArray *grid_index,
+  hypre_F90_Complex *values_ptr,
+  hypre_F90_Int *ierr       )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructVectorGetValues(
-           hypre_F90_PassObj (HYPRE_StructVector, vector),
-           hypre_F90_PassIntArray (grid_index),
-           hypre_F90_PassComplexRef (values_ptr) ) );
+           ( HYPRE_StructVectorGetValues(
+                hypre_F90_PassObj (HYPRE_StructVector, vector),
+                hypre_F90_PassIntArray (grid_index),
+                hypre_F90_PassComplexRef (values_ptr) ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_StructVectorGetBoxValues
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_structvectorgetboxvalues, HYPRE_STRUCTVECTORGETBOXVALUES)
-   ( hypre_F90_Obj *vector,
-     hypre_F90_IntArray *ilower,
-     hypre_F90_IntArray *iupper,
-     hypre_F90_ComplexArray *values,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *vector,
+  hypre_F90_IntArray *ilower,
+  hypre_F90_IntArray *iupper,
+  hypre_F90_ComplexArray *values,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructVectorGetBoxValues(
-           hypre_F90_PassObj (HYPRE_StructVector, vector),
-           hypre_F90_PassIntArray (ilower),
-           hypre_F90_PassIntArray (iupper),
-           hypre_F90_PassComplexArray (values)  ) );
+           ( HYPRE_StructVectorGetBoxValues(
+                hypre_F90_PassObj (HYPRE_StructVector, vector),
+                hypre_F90_PassIntArray (ilower),
+                hypre_F90_PassIntArray (iupper),
+                hypre_F90_PassComplexArray (values)  ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_StructVectorAssemble
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_structvectorassemble, HYPRE_STRUCTVECTORASSEMBLE)
-   ( hypre_F90_Obj *vector,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *vector,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructVectorAssemble(
-           hypre_F90_PassObj (HYPRE_StructVector, vector) ) );
+           ( HYPRE_StructVectorAssemble(
+                hypre_F90_PassObj (HYPRE_StructVector, vector) ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_StructVectorSetNumGhost
  *--------------------------------------------------------------------------*/
- 
+
 void
 hypre_F90_IFACE(hypre_structvectorsetnumghost, HYPRE_STRUCTVECTORSETNUMGHOST)
-   ( hypre_F90_Obj *vector,
-     hypre_F90_IntArray *num_ghost,
-     hypre_F90_Int *ierr      )
+( hypre_F90_Obj *vector,
+  hypre_F90_IntArray *num_ghost,
+  hypre_F90_Int *ierr      )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructVectorSetNumGhost(
-           hypre_F90_PassObj (HYPRE_StructVector, vector),
-           hypre_F90_PassIntArray (num_ghost) ) );
+           ( HYPRE_StructVectorSetNumGhost(
+                hypre_F90_PassObj (HYPRE_StructVector, vector),
+                hypre_F90_PassIntArray (num_ghost) ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_StructVectorCopy
  *--------------------------------------------------------------------------*/
- 
+
 void
 hypre_F90_IFACE(hypre_structvectorcopy, HYPRE_STRUCTVECTORCOPY)
-   ( hypre_F90_Obj *x,
-     hypre_F90_Obj *y,
-     hypre_F90_Int *ierr )
+( hypre_F90_Obj *x,
+  hypre_F90_Obj *y,
+  hypre_F90_Int *ierr )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructVectorCopy(
-           hypre_F90_PassObj (HYPRE_StructVector, x),
-           hypre_F90_PassObj (HYPRE_StructVector, y) ) );
+           ( HYPRE_StructVectorCopy(
+                hypre_F90_PassObj (HYPRE_StructVector, x),
+                hypre_F90_PassObj (HYPRE_StructVector, y) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -246,14 +246,14 @@ hypre_F90_IFACE(hypre_structvectorcopy, HYPRE_STRUCTVECTORCOPY)
 
 void
 hypre_F90_IFACE(hypre_structvectorsetconstantva, HYPRE_STRUCTVECTORSETCONSTANTVA)
-   ( hypre_F90_Obj *vector,
-     hypre_F90_Complex *values,
-     hypre_F90_Int *ierr   )
+( hypre_F90_Obj *vector,
+  hypre_F90_Complex *values,
+  hypre_F90_Int *ierr   )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructVectorSetConstantValues(
-           hypre_F90_PassObj (HYPRE_StructVector, vector),
-           hypre_F90_PassComplex (values) ) );
+           ( HYPRE_StructVectorSetConstantValues(
+                hypre_F90_PassObj (HYPRE_StructVector, vector),
+                hypre_F90_PassComplex (values) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -262,34 +262,34 @@ hypre_F90_IFACE(hypre_structvectorsetconstantva, HYPRE_STRUCTVECTORSETCONSTANTVA
 
 void
 hypre_F90_IFACE(hypre_structvectorgetmigratecom, HYPRE_STRUCTVECTORGETMIGRATECOM)
-   ( hypre_F90_Obj *from_vector,
-     hypre_F90_Obj *to_vector,
-     hypre_F90_Obj *comm_pkg,
-     hypre_F90_Int *ierr        )
+( hypre_F90_Obj *from_vector,
+  hypre_F90_Obj *to_vector,
+  hypre_F90_Obj *comm_pkg,
+  hypre_F90_Int *ierr        )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructVectorGetMigrateCommPkg(
-           hypre_F90_PassObj (HYPRE_StructVector, from_vector),
-           hypre_F90_PassObj (HYPRE_StructVector, to_vector),
-           hypre_F90_PassObjRef (HYPRE_CommPkg, comm_pkg)    ) );
+           ( HYPRE_StructVectorGetMigrateCommPkg(
+                hypre_F90_PassObj (HYPRE_StructVector, from_vector),
+                hypre_F90_PassObj (HYPRE_StructVector, to_vector),
+                hypre_F90_PassObjRef (HYPRE_CommPkg, comm_pkg)    ) );
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_StructVectorMigrate
  *--------------------------------------------------------------------------*/
 
-void 
+void
 hypre_F90_IFACE(hypre_structvectormigrate, HYPRE_STRUCTVECTORMIGRATE)
-   ( hypre_F90_Obj *comm_pkg,
-     hypre_F90_Obj *from_vector,
-     hypre_F90_Obj *to_vector,
-     hypre_F90_Int *ierr        )
+( hypre_F90_Obj *comm_pkg,
+  hypre_F90_Obj *from_vector,
+  hypre_F90_Obj *to_vector,
+  hypre_F90_Int *ierr        )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructVectorMigrate(
-           hypre_F90_PassObj (HYPRE_CommPkg, comm_pkg),
-           hypre_F90_PassObj (HYPRE_StructVector, from_vector),
-           hypre_F90_PassObj (HYPRE_StructVector, to_vector)   ) );
+           ( HYPRE_StructVectorMigrate(
+                hypre_F90_PassObj (HYPRE_CommPkg, comm_pkg),
+                hypre_F90_PassObj (HYPRE_StructVector, from_vector),
+                hypre_F90_PassObj (HYPRE_StructVector, to_vector)   ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -298,12 +298,12 @@ hypre_F90_IFACE(hypre_structvectormigrate, HYPRE_STRUCTVECTORMIGRATE)
 
 void
 hypre_F90_IFACE(hypre_destroycommpkg, HYPRE_DESTROYCOMMPKG)
-   ( hypre_F90_Obj *comm_pkg,
-     hypre_F90_Int *ierr     )
+( hypre_F90_Obj *comm_pkg,
+  hypre_F90_Int *ierr     )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_CommPkgDestroy(
-           hypre_F90_PassObj (HYPRE_CommPkg, comm_pkg) ) );
+           ( HYPRE_CommPkgDestroy(
+                hypre_F90_PassObj (HYPRE_CommPkg, comm_pkg) ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -312,18 +312,18 @@ hypre_F90_IFACE(hypre_destroycommpkg, HYPRE_DESTROYCOMMPKG)
 
 void
 hypre_F90_IFACE(hypre_structvectorprint, HYPRE_STRUCTVECTORPRINT)
-   (
-      hypre_F90_Obj *vector,
-      hypre_F90_Int *all,
-      hypre_F90_Int *ierr )
+(
+   hypre_F90_Obj *vector,
+   hypre_F90_Int *all,
+   hypre_F90_Int *ierr )
 {
    *ierr = (hypre_F90_Int)
-      ( HYPRE_StructVectorPrint(
-           "HYPRE_StructVector.out",
-           hypre_F90_PassObj (HYPRE_StructVector, vector),
-           hypre_F90_PassInt (all)) );
+           ( HYPRE_StructVectorPrint(
+                "HYPRE_StructVector.out",
+                hypre_F90_PassObj (HYPRE_StructVector, vector),
+                hypre_F90_PassInt (all)) );
 }
-    
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/external/hypre/src/struct_mv/HYPRE_struct_grid.c b/external/hypre/src/struct_mv/HYPRE_struct_grid.c
index 215e18c0..27387260 100644
--- a/external/hypre/src/struct_mv/HYPRE_struct_grid.c
+++ b/external/hypre/src/struct_mv/HYPRE_struct_grid.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/struct_mv/HYPRE_struct_matrix.c b/external/hypre/src/struct_mv/HYPRE_struct_matrix.c
index 3ed09716..4538f87e 100644
--- a/external/hypre/src/struct_mv/HYPRE_struct_matrix.c
+++ b/external/hypre/src/struct_mv/HYPRE_struct_matrix.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -33,7 +33,7 @@ HYPRE_StructMatrixCreate( MPI_Comm             comm,
 HYPRE_Int
 HYPRE_StructMatrixDestroy( HYPRE_StructMatrix matrix )
 {
-   return( hypre_StructMatrixDestroy(matrix) );
+   return ( hypre_StructMatrixDestroy(matrix) );
 }
 
 /*--------------------------------------------------------------------------
@@ -217,7 +217,7 @@ HYPRE_StructMatrixSetConstantValues( HYPRE_StructMatrix matrix,
                                      HYPRE_Complex     *values )
 {
    return hypre_StructMatrixSetConstantValues(
-      matrix, num_stencil_indices, stencil_indices, values, 0 );
+             matrix, num_stencil_indices, stencil_indices, values, 0 );
 }
 
 /*--------------------------------------------------------------------------
@@ -311,7 +311,7 @@ HYPRE_StructMatrixAddToConstantValues( HYPRE_StructMatrix matrix,
                                        HYPRE_Complex     *values )
 {
    return hypre_StructMatrixSetConstantValues(
-      matrix, num_stencil_indices, stencil_indices, values, 1 );
+             matrix, num_stencil_indices, stencil_indices, values, 1 );
 }
 
 /*--------------------------------------------------------------------------
@@ -320,7 +320,7 @@ HYPRE_StructMatrixAddToConstantValues( HYPRE_StructMatrix matrix,
 HYPRE_Int
 HYPRE_StructMatrixAssemble( HYPRE_StructMatrix matrix )
 {
-   return( hypre_StructMatrixAssemble(matrix) );
+   return ( hypre_StructMatrixAssemble(matrix) );
 }
 
 /*--------------------------------------------------------------------------
@@ -372,8 +372,8 @@ HYPRE_StructMatrixSetSymmetric( HYPRE_StructMatrix  matrix,
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int  HYPRE_StructMatrixSetConstantEntries( HYPRE_StructMatrix  matrix,
-                                           HYPRE_Int           nentries,
-                                           HYPRE_Int          *entries )
+                                                 HYPRE_Int           nentries,
+                                                 HYPRE_Int          *entries )
 {
    return hypre_StructMatrixSetConstantEntries( matrix, nentries, entries );
 }
@@ -389,6 +389,26 @@ HYPRE_StructMatrixPrint( const char         *filename,
    return ( hypre_StructMatrixPrint(filename, matrix, all) );
 }
 
+/*--------------------------------------------------------------------------
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_StructMatrixRead( MPI_Comm             comm,
+                        const char          *filename,
+                        HYPRE_Int           *num_ghost,
+                        HYPRE_StructMatrix  *matrix )
+{
+   if (!matrix)
+   {
+      hypre_error_in_arg(4);
+      return hypre_error_flag;
+   }
+
+   *matrix = (HYPRE_StructMatrix) hypre_StructMatrixRead(comm, filename, num_ghost);
+
+   return hypre_error_flag;
+}
+
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
 
@@ -410,5 +430,5 @@ HYPRE_StructMatrixMatvec( HYPRE_Complex      alpha,
 HYPRE_Int
 HYPRE_StructMatrixClearBoundary( HYPRE_StructMatrix matrix )
 {
-   return( hypre_StructMatrixClearBoundary(matrix) );
+   return ( hypre_StructMatrixClearBoundary(matrix) );
 }
diff --git a/external/hypre/src/struct_mv/HYPRE_struct_mv.h b/external/hypre/src/struct_mv/HYPRE_struct_mv.h
index 84bd9932..5298abc9 100644
--- a/external/hypre/src/struct_mv/HYPRE_struct_mv.h
+++ b/external/hypre/src/struct_mv/HYPRE_struct_mv.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -27,10 +27,8 @@ typedef struct hypre_StructVector_struct *HYPRE_StructVector;
 /**
  * @defgroup StructSystemInterface Struct System Interface
  *
- * This interface represents a structured-grid conceptual view of a linear
- * system.
- *
- * @memo A structured-grid conceptual interface
+ * A structured-grid conceptual interface. This interface represents a
+ * structured-grid conceptual view of a linear system.
  *
  * @{
  **/
@@ -55,8 +53,8 @@ typedef struct hypre_StructGrid_struct *HYPRE_StructGrid;
  * Create an <em>ndim</em>-dimensional grid object.
  **/
 HYPRE_Int HYPRE_StructGridCreate(MPI_Comm          comm,
-                           HYPRE_Int         ndim,
-                           HYPRE_StructGrid *grid);
+                                 HYPRE_Int         ndim,
+                                 HYPRE_StructGrid *grid);
 
 /**
  * Destroy a grid object.  An object should be explicitly destroyed using this
@@ -346,7 +344,7 @@ HYPRE_Int HYPRE_StructMatrixSetConstantEntries( HYPRE_StructMatrix matrix,
                                                 HYPRE_Int         *entries );
 
 /**
- * Set the ghost layer in the matrix 
+ * Set the ghost layer in the matrix
  **/
 HYPRE_Int HYPRE_StructMatrixSetNumGhost(HYPRE_StructMatrix  matrix,
                                         HYPRE_Int          *num_ghost);
@@ -359,6 +357,14 @@ HYPRE_Int HYPRE_StructMatrixPrint(const char         *filename,
                                   HYPRE_StructMatrix  matrix,
                                   HYPRE_Int           all);
 
+/**
+ * Read the matrix from file.  This is mainly for debugging purposes.
+ **/
+HYPRE_Int HYPRE_StructMatrixRead( MPI_Comm             comm,
+                                  const char          *filename,
+                                  HYPRE_Int           *num_ghost,
+                                  HYPRE_StructMatrix  *matrix );
+
 /**
  * Matvec operator.  This operation is \f$y = \alpha A x + \beta y\f$ .
  * Note that you can do a simple matrix-vector multiply by setting
@@ -520,6 +526,14 @@ HYPRE_Int HYPRE_StructVectorPrint(const char         *filename,
                                   HYPRE_StructVector  vector,
                                   HYPRE_Int           all);
 
+/**
+ * Read the vector from file.  This is mainly for debugging purposes.
+ **/
+HYPRE_Int HYPRE_StructVectorRead( MPI_Comm             comm,
+                                  const char          *filename,
+                                  HYPRE_Int           *num_ghost,
+                                  HYPRE_StructVector  *vector );
+
 /**@}*/
 /**@}*/
 
@@ -562,4 +576,3 @@ HYPRE_StructGridSetDataLocation( HYPRE_StructGrid grid, HYPRE_MemoryLocation dat
 #endif
 
 #endif
-
diff --git a/external/hypre/src/struct_mv/HYPRE_struct_stencil.c b/external/hypre/src/struct_mv/HYPRE_struct_stencil.c
index aeaa2430..b5608211 100644
--- a/external/hypre/src/struct_mv/HYPRE_struct_stencil.c
+++ b/external/hypre/src/struct_mv/HYPRE_struct_stencil.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -23,9 +23,9 @@ HYPRE_StructStencilCreate( HYPRE_Int            dim,
                            HYPRE_StructStencil *stencil )
 {
    hypre_Index  *shape;
- 
+
    shape = hypre_CTAlloc(hypre_Index,  size, HYPRE_MEMORY_HOST);
- 
+
    *stencil = hypre_StructStencilCreate(dim, size, shape);
 
    return hypre_error_flag;
@@ -42,7 +42,7 @@ HYPRE_StructStencilSetElement( HYPRE_StructStencil  stencil,
 {
    hypre_Index  *shape;
    HYPRE_Int     d;
- 
+
    shape = hypre_StructStencilShape(stencil);
    hypre_SetIndex(shape[element_index], 0);
    for (d = 0; d < hypre_StructStencilNDim(stencil); d++)
diff --git a/external/hypre/src/struct_mv/HYPRE_struct_vector.c b/external/hypre/src/struct_mv/HYPRE_struct_vector.c
index b8957378..66d567f8 100644
--- a/external/hypre/src/struct_mv/HYPRE_struct_vector.c
+++ b/external/hypre/src/struct_mv/HYPRE_struct_vector.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -34,7 +34,7 @@ HYPRE_StructVectorCreate( MPI_Comm             comm,
 HYPRE_Int
 HYPRE_StructVectorDestroy( HYPRE_StructVector struct_vector )
 {
-   return( hypre_StructVectorDestroy(struct_vector) );
+   return ( hypre_StructVectorDestroy(struct_vector) );
 }
 
 /*--------------------------------------------------------------------------
@@ -284,7 +284,7 @@ HYPRE_StructVectorGetBoxValues2( HYPRE_StructVector  vector,
 HYPRE_Int
 HYPRE_StructVectorAssemble( HYPRE_StructVector vector )
 {
-   return( hypre_StructVectorAssemble(vector) );
+   return ( hypre_StructVectorAssemble(vector) );
 }
 
 /*--------------------------------------------------------------------------
@@ -299,6 +299,26 @@ HYPRE_StructVectorPrint( const char         *filename,
    return ( hypre_StructVectorPrint(filename, vector, all) );
 }
 
+/*--------------------------------------------------------------------------
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_StructVectorRead( MPI_Comm             comm,
+                        const char          *filename,
+                        HYPRE_Int           *num_ghost,
+                        HYPRE_StructVector  *vector )
+{
+   if (!vector)
+   {
+      hypre_error_in_arg(4);
+      return hypre_error_flag;
+   }
+
+   *vector = (HYPRE_StructVector) hypre_StructVectorRead(comm, filename, num_ghost);
+
+   return hypre_error_flag;
+}
+
 /*--------------------------------------------------------------------------
  * HYPRE_StructVectorSetNumGhost
  *--------------------------------------------------------------------------*/
@@ -320,7 +340,7 @@ HYPRE_StructVectorSetNumGhost( HYPRE_StructVector  vector,
 HYPRE_Int
 HYPRE_StructVectorCopy( HYPRE_StructVector x, HYPRE_StructVector y )
 {
-   return( hypre_StructVectorCopy( x, y ) );
+   return ( hypre_StructVectorCopy( x, y ) );
 }
 
 /*--------------------------------------------------------------------------
@@ -331,7 +351,7 @@ HYPRE_Int
 HYPRE_StructVectorSetConstantValues( HYPRE_StructVector  vector,
                                      HYPRE_Complex       values )
 {
-   return( hypre_StructVectorSetConstantValues(vector, values) );
+   return ( hypre_StructVectorSetConstantValues(vector, values) );
 }
 
 /*--------------------------------------------------------------------------
@@ -357,7 +377,7 @@ HYPRE_StructVectorMigrate( HYPRE_CommPkg      comm_pkg,
                            HYPRE_StructVector from_vector,
                            HYPRE_StructVector to_vector )
 {
-   return( hypre_StructVectorMigrate( comm_pkg, from_vector, to_vector) );
+   return ( hypre_StructVectorMigrate( comm_pkg, from_vector, to_vector) );
 }
 
 /*--------------------------------------------------------------------------
diff --git a/external/hypre/src/struct_mv/_hypre_struct_mv.h b/external/hypre/src/struct_mv/_hypre_struct_mv.h
index f95c4a74..fdb019e1 100644
--- a/external/hypre/src/struct_mv/_hypre_struct_mv.h
+++ b/external/hypre/src/struct_mv/_hypre_struct_mv.h
@@ -16,7 +16,7 @@
 extern "C" {
 #endif
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -35,12 +35,6 @@ extern "C" {
 #define HYPRE_MAXDIM 3
 #endif
 
-#if defined(HYPRE_USING_RAJA) || defined(HYPRE_USING_KOKKOS) || defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_DEVICE_OPENMP) || defined(HYPRE_USING_HIP)
-#define hypre_BoxLoopSetOneBlock()
-#else
-#define hypre_BoxLoopSetOneBlock zypre_BoxLoopSetOneBlock
-#endif
-
 /*--------------------------------------------------------------------------
  * hypre_Index:
  *   This is used to define indices in index space, or dimension
@@ -144,7 +138,7 @@ hypre_max(0, (hypre_BoxIMaxD(box, d) - hypre_BoxIMinD(box, d) + 1))
 #define hypre_CCBoxIndexRank(box, index) 0
 #define hypre_CCBoxIndexRank_noargs() 0
 #define hypre_CCBoxOffsetDistance(box, index) 0
-  
+
 /*----- Avoid using these Box macros -----*/
 
 #define hypre_BoxSizeX(box)    hypre_BoxSizeD(box, 0)
@@ -184,92 +178,6 @@ for (i = 0; i < hypre_BoxArraySize(box_array); i++)
 #define hypre_ForBoxArrayI(i, box_array_array) \
 for (i = 0; i < hypre_BoxArrayArraySize(box_array_array); i++)
 
-/*--------------------------------------------------------------------------
- * BoxLoop macros:
- *--------------------------------------------------------------------------*/
-#define hypre_SerialBoxLoop0Begin(ndim, loop_size)\
-{\
-   zypre_BoxLoopDeclare();\
-   zypre_BoxLoopInit(ndim, loop_size);\
-   hypre_BoxLoopSetOneBlock();\
-   for (hypre__block = 0; hypre__block < hypre__num_blocks; hypre__block++)\
-   {\
-      zypre_BoxLoopSet();\
-      for (hypre__J = 0; hypre__J < hypre__JN; hypre__J++)\
-      {\
-         for (hypre__I = 0; hypre__I < hypre__IN; hypre__I++)\
-         {
-
-#define hypre_SerialBoxLoop0End()\
-         }\
-         zypre_BoxLoopInc1();\
-         zypre_BoxLoopInc2();\
-      }\
-   }\
-}
-
-#define hypre_SerialBoxLoop1Begin(ndim, loop_size,\
-                                  dbox1, start1, stride1, i1)\
-{\
-   HYPRE_Int i1;\
-   zypre_BoxLoopDeclare();\
-   zypre_BoxLoopDeclareK(1);\
-   zypre_BoxLoopInit(ndim, loop_size);\
-   zypre_BoxLoopInitK(1, dbox1, start1, stride1, i1);\
-   zypre_BoxLoopSetOneBlock();\
-   for (hypre__block = 0; hypre__block < hypre__num_blocks; hypre__block++)\
-   {\
-      zypre_BoxLoopSet();\
-      zypre_BoxLoopSetK(1, i1);\
-      for (hypre__J = 0; hypre__J < hypre__JN; hypre__J++)\
-      {\
-         for (hypre__I = 0; hypre__I < hypre__IN; hypre__I++)\
-         {
-
-#define hypre_SerialBoxLoop1End(i1)\
-            i1 += hypre__i0inc1;\
-         }\
-         zypre_BoxLoopInc1();\
-         i1 += hypre__ikinc1[hypre__d];\
-         zypre_BoxLoopInc2();\
-      }\
-   }\
-}
-
-#define hypre_SerialBoxLoop2Begin(ndim, loop_size,\
-                                  dbox1, start1, stride1, i1,\
-                                  dbox2, start2, stride2, i2)\
-{\
-   HYPRE_Int i1,i2;\
-   zypre_BoxLoopDeclare();\
-   zypre_BoxLoopDeclareK(1);\
-   zypre_BoxLoopDeclareK(2);\
-   zypre_BoxLoopInit(ndim, loop_size);\
-   zypre_BoxLoopInitK(1, dbox1, start1, stride1, i1);\
-   zypre_BoxLoopInitK(2, dbox2, start2, stride2, i2);\
-   zypre_BoxLoopSetOneBlock();\
-   for (hypre__block = 0; hypre__block < hypre__num_blocks; hypre__block++)\
-   {\
-      zypre_BoxLoopSet();\
-      zypre_BoxLoopSetK(1, i1);\
-      zypre_BoxLoopSetK(2, i2);\
-      for (hypre__J = 0; hypre__J < hypre__JN; hypre__J++)\
-      {\
-         for (hypre__I = 0; hypre__I < hypre__IN; hypre__I++)\
-         {
-
-#define hypre_SerialBoxLoop2End(i1, i2)\
-            i1 += hypre__i0inc1;\
-            i2 += hypre__i0inc2;\
-         }\
-         zypre_BoxLoopInc1();\
-         i1 += hypre__ikinc1[hypre__d];\
-         i2 += hypre__ikinc2[hypre__d];\
-         zypre_BoxLoopInc2();\
-      }\
-   }\
-}
-
 #define ZYPRE_BOX_PRIVATE hypre__IN,hypre__JN,hypre__I,hypre__J,hypre__d,hypre__i
 #define HYPRE_BOX_PRIVATE ZYPRE_BOX_PRIVATE
 
@@ -303,6 +211,11 @@ if (hypre__num_blocks > 0)\
 {\
    hypre__div = hypre__tot / hypre__num_blocks;\
    hypre__mod = hypre__tot % hypre__num_blocks;\
+}\
+else\
+{\
+   hypre__div = 0;\
+   hypre__mod = 0;\
 }
 
 #define zypre_BoxLoopInitK(k, dboxk, startk, stridek, ik) \
@@ -380,199 +293,6 @@ for (hypre__d = 1; hypre__d < hypre__ndim; hypre__d++)\
 /* Use this to get the block iteration inside a BoxLoop */
 #define zypre_BoxLoopBlock() hypre__block
 
-
-
-
-/* FIXME: Remove !!! */
-/*-----------------------------------*/
-#define zypre_BoxLoop0Begin(ndim, loop_size)\
-{\
-   zypre_BoxLoopDeclare();\
-   zypre_BoxLoopInit(ndim, loop_size);
-
-#define zypre_BoxLoop0For()\
-   for (hypre__block = 0; hypre__block < hypre__num_blocks; hypre__block++)\
-   {\
-      zypre_BoxLoopSet();\
-      for (hypre__J = 0; hypre__J < hypre__JN; hypre__J++)\
-      {\
-         for (hypre__I = 0; hypre__I < hypre__IN; hypre__I++)\
-         {
-
-#define zypre_BoxLoop0End()\
-         }\
-         zypre_BoxLoopInc1();\
-         zypre_BoxLoopInc2();\
-      }\
-   }\
-}
-
-/*-----------------------------------*/
-
-#define zypre_BoxLoop1Begin(ndim, loop_size,\
-                            dbox1, start1, stride1, i1)\
-{\
-   HYPRE_Int i1;\
-   zypre_BoxLoopDeclare();\
-   zypre_BoxLoopDeclareK(1);\
-   zypre_BoxLoopInit(ndim, loop_size);\
-   zypre_BoxLoopInitK(1, dbox1, start1, stride1, i1);
-
-#define zypre_BoxLoop1For(i1)\
-   for (hypre__block = 0; hypre__block < hypre__num_blocks; hypre__block++)\
-   {\
-      HYPRE_Int i1;\
-      zypre_BoxLoopSet();\
-      zypre_BoxLoopSetK(1, i1);\
-      for (hypre__J = 0; hypre__J < hypre__JN; hypre__J++)\
-      {\
-         for (hypre__I = 0; hypre__I < hypre__IN; hypre__I++)\
-         {
-
-#define zypre_BoxLoop1End(i1)\
-            i1 += hypre__i0inc1;\
-         }\
-         zypre_BoxLoopInc1();\
-         i1 += hypre__ikinc1[hypre__d];\
-         zypre_BoxLoopInc2();\
-      }\
-   }\
-}
-
-/*-----------------------------------*/
-
-#define zypre_BoxLoop2Begin(ndim, loop_size,\
-                            dbox1, start1, stride1, i1,\
-                            dbox2, start2, stride2, i2)\
-{\
-   HYPRE_Int i1,i2;\
-   zypre_BoxLoopDeclare();\
-   zypre_BoxLoopDeclareK(1);\
-   zypre_BoxLoopDeclareK(2);\
-   zypre_BoxLoopInit(ndim, loop_size);\
-   zypre_BoxLoopInitK(1, dbox1, start1, stride1, i1);\
-   zypre_BoxLoopInitK(2, dbox2, start2, stride2, i2);
-
-#define zypre_BoxLoop2For(i1, i2)\
-   for (hypre__block = 0; hypre__block < hypre__num_blocks; hypre__block++)\
-   {\
-      HYPRE_Int i1,i2;\
-      zypre_BoxLoopSet();\
-      zypre_BoxLoopSetK(1, i1);\
-      zypre_BoxLoopSetK(2, i2);\
-      for (hypre__J = 0; hypre__J < hypre__JN; hypre__J++)\
-      {\
-         for (hypre__I = 0; hypre__I < hypre__IN; hypre__I++)\
-         {
-
-#define zypre_BoxLoop2End(i1, i2)\
-            i1 += hypre__i0inc1;\
-            i2 += hypre__i0inc2;\
-         }\
-         zypre_BoxLoopInc1();\
-         i1 += hypre__ikinc1[hypre__d];\
-         i2 += hypre__ikinc2[hypre__d];\
-         zypre_BoxLoopInc2();\
-      }\
-   }\
-}
-
-/*-----------------------------------*/
-
-#define zypre_BoxLoop3Begin(ndim, loop_size,\
-                            dbox1, start1, stride1, i1,\
-                            dbox2, start2, stride2, i2,\
-                            dbox3, start3, stride3, i3)\
-{\
-   HYPRE_Int i1,i2,i3;\
-   zypre_BoxLoopDeclare();\
-   zypre_BoxLoopDeclareK(1);\
-   zypre_BoxLoopDeclareK(2);\
-   zypre_BoxLoopDeclareK(3);\
-   zypre_BoxLoopInit(ndim, loop_size);\
-   zypre_BoxLoopInitK(1, dbox1, start1, stride1, i1);\
-   zypre_BoxLoopInitK(2, dbox2, start2, stride2, i2);\
-   zypre_BoxLoopInitK(3, dbox3, start3, stride3, i3);
-
-#define zypre_BoxLoop3For(i1, i2, i3)\
-   for (hypre__block = 0; hypre__block < hypre__num_blocks; hypre__block++)\
-   {\
-      HYPRE_Int i1,i2,i3;\
-      zypre_BoxLoopSet();\
-      zypre_BoxLoopSetK(1, i1);\
-      zypre_BoxLoopSetK(2, i2);\
-      zypre_BoxLoopSetK(3, i3);\
-      for (hypre__J = 0; hypre__J < hypre__JN; hypre__J++)\
-      {\
-         for (hypre__I = 0; hypre__I < hypre__IN; hypre__I++)\
-         {
-
-#define zypre_BoxLoop3End(i1, i2, i3)\
-            i1 += hypre__i0inc1;\
-            i2 += hypre__i0inc2;\
-            i3 += hypre__i0inc3;\
-         }\
-         zypre_BoxLoopInc1();\
-         i1 += hypre__ikinc1[hypre__d];\
-         i2 += hypre__ikinc2[hypre__d];\
-         i3 += hypre__ikinc3[hypre__d];\
-         zypre_BoxLoopInc2();\
-      }\
-   }\
-}
-
-/*-----------------------------------*/
-
-#define zypre_BoxLoop4Begin(ndim, loop_size,\
-                            dbox1, start1, stride1, i1,\
-                            dbox2, start2, stride2, i2,\
-                            dbox3, start3, stride3, i3,\
-                            dbox4, start4, stride4, i4)\
-{\
-   HYPRE_Int i1,i2,i3,i4;\
-   zypre_BoxLoopDeclare();\
-   zypre_BoxLoopDeclareK(1);\
-   zypre_BoxLoopDeclareK(2);\
-   zypre_BoxLoopDeclareK(3);\
-   zypre_BoxLoopDeclareK(4);\
-   zypre_BoxLoopInit(ndim, loop_size);\
-   zypre_BoxLoopInitK(1, dbox1, start1, stride1, i1);\
-   zypre_BoxLoopInitK(2, dbox2, start2, stride2, i2);\
-   zypre_BoxLoopInitK(3, dbox3, start3, stride3, i3);\
-   zypre_BoxLoopInitK(4, dbox4, start4, stride4, i4);
-
-#define zypre_BoxLoop4For(i1, i2, i3, i4)\
-   for (hypre__block = 0; hypre__block < hypre__num_blocks; hypre__block++)\
-   {\
-      HYPRE_Int i1,i2,i3,i4;\
-      zypre_BoxLoopSet();\
-      zypre_BoxLoopSetK(1, i1);\
-      zypre_BoxLoopSetK(2, i2);\
-      zypre_BoxLoopSetK(3, i3);\
-      zypre_BoxLoopSetK(4, i4);\
-      for (hypre__J = 0; hypre__J < hypre__JN; hypre__J++)\
-      {\
-         for (hypre__I = 0; hypre__I < hypre__IN; hypre__I++)\
-         {
-
-#define zypre_BoxLoop4End(i1, i2, i3, i4)\
-            i1 += hypre__i0inc1;\
-            i2 += hypre__i0inc2;\
-            i3 += hypre__i0inc3;\
-            i4 += hypre__i0inc4;\
-         }\
-         zypre_BoxLoopInc1();\
-         i1 += hypre__ikinc1[hypre__d];\
-         i2 += hypre__ikinc2[hypre__d];\
-         i3 += hypre__ikinc3[hypre__d];\
-         i4 += hypre__ikinc4[hypre__d];\
-         zypre_BoxLoopInc2();\
-      }\
-   }\
-}
-
-/*-----------------------------------*/
-
 #define zypre_BasicBoxLoopInitK(k, stridek) \
 hypre__sk##k[0] = stridek[0];\
 hypre__ikinc##k[0] = 0;\
@@ -586,25 +306,6 @@ hypre__i0inc##k = hypre__sk##k[0];\
 hypre__ikinc##k[hypre__ndim] = 0;\
 hypre__ikstart##k = 0
 
-#define zypre_BasicBoxLoop2Begin(ndim, loop_size,\
-                                 stride1, i1,\
-                                 stride2, i2)\
-{\
-   zypre_BoxLoopDeclare();\
-   zypre_BoxLoopDeclareK(1);\
-   zypre_BoxLoopDeclareK(2);\
-   zypre_BoxLoopInit(ndim, loop_size);\
-   zypre_BasicBoxLoopInitK(1, stride1);\
-   zypre_BasicBoxLoopInitK(2, stride2);
-
-/*-----------------------------------*/
-
-#endif
-
-
-
-
-
 /*--------------------------------------------------------------------------
  * NOTES - Keep these for reference here and elsewhere in the code
  *--------------------------------------------------------------------------*/
@@ -612,8 +313,8 @@ hypre__ikstart##k = 0
 #if 0
 
 #define hypre_BoxLoop2Begin(loop_size,
-                            dbox1, start1, stride1, i1,
-                            dbox2, start2, stride2, i2)
+dbox1, start1, stride1, i1,
+       dbox2, start2, stride2, i2)
 {
    /* init hypre__i1start */
    HYPRE_Int  hypre__i1start = hypre_BoxIndexRank(dbox1, start1);
@@ -628,28 +329,28 @@ hypre__ikstart##k = 0
 #define hypre_BoxLoop2For(i, j, k, i1, i2)
    for (hypre__block = 0; hypre__block < hypre__num_blocks; hypre__block++)
    {
-   /* set i and hypre__n */
-   hypre_BoxLoopSet(i, j, k);
-   /* set i1 */
-   i1 = hypre__i1start + i*hypre__sx1 + j*hypre__sy1 + k*hypre__sz1;
-   i2 = hypre__i2start + i*hypre__sx2 + j*hypre__sy2 + k*hypre__sz2;
-   for (k = 0; k < hypre__nz; k++)
-   {
-      for (j = 0; j < hypre__ny; j++)
+      /* set i and hypre__n */
+      hypre_BoxLoopSet(i, j, k);
+      /* set i1 */
+      i1 = hypre__i1start + i * hypre__sx1 + j * hypre__sy1 + k * hypre__sz1;
+      i2 = hypre__i2start + i * hypre__sx2 + j * hypre__sy2 + k * hypre__sz2;
+      for (k = 0; k < hypre__nz; k++)
       {
-         for (i = 0; i < hypre__nx; i++)
+         for (j = 0; j < hypre__ny; j++)
          {
+            for (i = 0; i < hypre__nx; i++)
+            {
 
 #define hypre_BoxLoop2End(i1, i2)
-            i1 += hypre__sx1;
-            i2 += hypre__sx2;
+               i1 += hypre__sx1;
+               i2 += hypre__sx2;
+            }
+            i1 += hypre__sy1 - hypre__nx * hypre__sx1;
+            i2 += hypre__sy2 - hypre__nx * hypre__sx2;
          }
-         i1 += hypre__sy1 - hypre__nx*hypre__sx1;
-         i2 += hypre__sy2 - hypre__nx*hypre__sx2;
+         i1 += hypre__sz1 - hypre__ny * hypre__sy1;
+         i2 += hypre__sz2 - hypre__ny * hypre__sy2;
       }
-      i1 += hypre__sz1 - hypre__ny*hypre__sy1;
-      i2 += hypre__sz2 - hypre__ny*hypre__sy2;
-   }
    }
 }
 
@@ -660,7 +361,7 @@ hypre__ikstart##k = 0
 N = 1;
 for (d = 0; d < ndim; d++)
 {
-   N *= n[d];
+N *= n[d];
    i[d] = 0;
    n[d] -= 2; /* this produces a simpler comparison below */
 }
@@ -668,9 +369,9 @@ i[ndim] = 0;
 n[ndim] = 0;
 for (I = 0; I < N; I++)
 {
-   /* loop body */
+/* loop body */
 
-   for (d = 0; i[d] > n[d]; d++)
+for (d = 0; i[d] > n[d]; d++)
    {
       i[d] = 0;
    }
@@ -686,7 +387,7 @@ for (I = 0; I < N; I++)
 N = 1;
 for (d = 1; d < ndim; d++)
 {
-   N *= n[d];
+N *= n[d];
    i[d] = 0;
    n[d] -= 2; /* this produces a simpler comparison below */
 }
@@ -694,7 +395,7 @@ i[ndim] = 0;
 n[ndim] = 0;
 for (J = 0; J < N; J++)
 {
-   for (I = 0; I < n[0]; I++)
+for (I = 0; I < n[0]; I++)
    {
       /* loop body */
 
@@ -711,8 +412,9 @@ for (J = 0; J < N; J++)
 }
 
 #endif
+#endif /* #ifndef hypre_BOX_HEADER */
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -727,13 +429,13 @@ for (J = 0; J < N; J++)
 #ifndef hypre_ASSUMED_PART_HEADER
 #define hypre_ASSUMED_PART_HEADER
 
-typedef struct 
+typedef struct
 {
-   /* the entries will be the same for all procs */  
+   /* the entries will be the same for all procs */
    HYPRE_Int           ndim;             /* number of dimensions */
    hypre_BoxArray     *regions;          /* areas of the grid with boxes */
-   HYPRE_Int           num_regions;      /* how many regions */    
-   HYPRE_Int          *proc_partitions;  /* proc ids assigned to each region  
+   HYPRE_Int           num_regions;      /* how many regions */
+   HYPRE_Int          *proc_partitions;  /* proc ids assigned to each region
                                             (this is size num_regions +1) */
    hypre_Index        *divisions;        /* number of proc divisions in each
                                             direction for each region */
@@ -742,22 +444,22 @@ typedef struct
    hypre_BoxArray     *my_partition_boxes;  /* boxes in my portion */
    HYPRE_Int          *my_partition_proc_ids;
    HYPRE_Int          *my_partition_boxnums;
-   HYPRE_Int           my_partition_ids_size;   
+   HYPRE_Int           my_partition_ids_size;
    HYPRE_Int           my_partition_ids_alloc;
    HYPRE_Int           my_partition_num_distinct_procs;
-    
+
 } hypre_StructAssumedPart;
 
 
 /*Accessor macros */
 
-#define hypre_StructAssumedPartNDim(apart) ((apart)->ndim) 
-#define hypre_StructAssumedPartRegions(apart) ((apart)->regions) 
-#define hypre_StructAssumedPartNumRegions(apart) ((apart)->num_regions) 
-#define hypre_StructAssumedPartDivisions(apart) ((apart)->divisions) 
-#define hypre_StructAssumedPartDivision(apart, i) ((apart)->divisions[i]) 
-#define hypre_StructAssumedPartProcPartitions(apart) ((apart)->proc_partitions) 
-#define hypre_StructAssumedPartProcPartition(apart, i) ((apart)->proc_partitions[i]) 
+#define hypre_StructAssumedPartNDim(apart) ((apart)->ndim)
+#define hypre_StructAssumedPartRegions(apart) ((apart)->regions)
+#define hypre_StructAssumedPartNumRegions(apart) ((apart)->num_regions)
+#define hypre_StructAssumedPartDivisions(apart) ((apart)->divisions)
+#define hypre_StructAssumedPartDivision(apart, i) ((apart)->divisions[i])
+#define hypre_StructAssumedPartProcPartitions(apart) ((apart)->proc_partitions)
+#define hypre_StructAssumedPartProcPartition(apart, i) ((apart)->proc_partitions[i])
 #define hypre_StructAssumedPartMyPartition(apart) ((apart)->my_partition)
 #define hypre_StructAssumedPartMyPartitionBoxes(apart) ((apart)->my_partition_boxes)
 #define hypre_StructAssumedPartMyPartitionProcIds(apart) ((apart)->my_partition_proc_ids)
@@ -770,7 +472,7 @@ typedef struct
 #define hypre_StructAssumedPartMyPartitionBoxnum(apart, i) ((apart)->my_partition_boxnums[i])
 #endif
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -791,14 +493,14 @@ typedef struct hypre_BoxManEntry_struct
 
    HYPRE_Int proc; /* This is a two-part unique id: (proc, id) */
    HYPRE_Int id;
-   HYPRE_Int num_ghost[2*HYPRE_MAXDIM];
+   HYPRE_Int num_ghost[2 * HYPRE_MAXDIM];
 
    HYPRE_Int position; /* This indicates the location of the entry in the the
                         * box manager entries array and is used for pairing with
                         * the info object (populated in addentry) */
-   
+
    void *boxman; /* The owning manager (populated in addentry) */
-   
+
    struct hypre_BoxManEntry_struct  *next;
 
 } hypre_BoxManEntry;
@@ -812,32 +514,32 @@ typedef struct
    MPI_Comm            comm;
 
    HYPRE_Int           max_nentries; /* storage allocated for entries */
-    
+
    HYPRE_Int           is_gather_called; /* Boolean to indicate whether
                                             GatherEntries function has been
                                             called (prior to assemble) - may not
                                             want this (can tell by the size of
                                             gather_regions array) */
-   
+
    hypre_BoxArray     *gather_regions; /* This is where we collect boxes input
                                           by calls to BoxManGatherEntries - to
                                           be gathered in the assemble.  These
                                           are then deleted after the assemble */
-   
+
 
    HYPRE_Int           all_global_known; /* Boolean to say that every processor
                                             already has all of the global data
                                             for this manager (this could be
                                             accessed by a coarsening routine,
                                             for example) */
-   
+
    HYPRE_Int           is_entries_sort; /* Boolean to say that entries were
                                            added in sorted order (id, proc)
                                            (this could be accessed by a
                                            coarsening routine, for example) */
 
    HYPRE_Int           entry_info_size; /* In bytes, the (max) size of the info
-                                           object for the entries */ 
+                                           object for the entries */
 
    HYPRE_Int           is_assembled; /* Flag to indicate if the box manager has
                                         been assembled (used to control whether
@@ -851,7 +553,7 @@ typedef struct
 
    HYPRE_Int         *procs_sort; /* The sorted procs corresponding to entries */
    HYPRE_Int         *ids_sort; /* Sorted ids corresponding to the entries */
- 
+
    HYPRE_Int          num_procs_sort; /* Number of distinct procs in entries */
    HYPRE_Int         *procs_sort_offsets; /* Offsets for procs into the
                                              entry_sort array */
@@ -867,19 +569,19 @@ typedef struct
                                                  imax of each box in the entries
                                                  array */
    HYPRE_Int           size[HYPRE_MAXDIM]; /* How many indexes in each
-                                              direction */ 
+                                              direction */
 
    HYPRE_Int           last_index[HYPRE_MAXDIM]; /* Last index used in the
                                                     indexes map */
 
    HYPRE_Int           num_my_entries; /* Num entries with proc_id = myid */
-   HYPRE_Int          *my_ids; /* Array of ids corresponding to my entries */ 
+   HYPRE_Int          *my_ids; /* Array of ids corresponding to my entries */
    hypre_BoxManEntry **my_entries; /* Points into entries that are mine and
                                       corresponds to my_ids array.  This is
                                       destroyed in the assemble. */
-   
+
    void               *info_objects; /* Array of info objects (each of size
-                                        entry_info_size), managed byte-wise */ 
+                                        entry_info_size), managed byte-wise */
 
    hypre_StructAssumedPart *assumed_partition; /* The assumed partition object.
                                                   For now this is only used
@@ -890,10 +592,10 @@ typedef struct
    hypre_Box          *bounding_box; /* Bounding box from associated grid */
 
    HYPRE_Int           next_id; /* Counter to indicate the next id that would be
-                                   unique (regardless of proc id) */  
+                                   unique (regardless of proc id) */
 
    /* Ghost stuff  */
-   HYPRE_Int           num_ghost[2*HYPRE_MAXDIM];
+   HYPRE_Int           num_ghost[2 * HYPRE_MAXDIM];
 
 } hypre_BoxManager;
 
@@ -913,7 +615,7 @@ typedef struct
 #define hypre_BoxManNEntries(manager)           ((manager) -> nentries)
 #define hypre_BoxManEntries(manager)            ((manager) -> entries)
 #define hypre_BoxManInfoObjects(manager)        ((manager) -> info_objects)
-#define hypre_BoxManIsAssembled(manager)        ((manager) -> is_assembled) 
+#define hypre_BoxManIsAssembled(manager)        ((manager) -> is_assembled)
 
 #define hypre_BoxManProcsSort(manager)          ((manager) -> procs_sort)
 #define hypre_BoxManIdsSort(manager)            ((manager) -> ids_sort)
@@ -962,7 +664,7 @@ typedef struct
 
 #endif
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -1006,12 +708,9 @@ typedef struct hypre_StructGrid_struct
 
 
    HYPRE_Int            ghlocal_size; /* Number of vars in box including ghosts */
-   HYPRE_Int            num_ghost[2*HYPRE_MAXDIM]; /* ghost layer size */
+   HYPRE_Int            num_ghost[2 * HYPRE_MAXDIM]; /* ghost layer size */
 
    hypre_BoxManager    *boxman;
-#if 0 //defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-   HYPRE_MemoryLocation data_location;
-#endif
 } hypre_StructGrid;
 
 /*--------------------------------------------------------------------------
@@ -1057,7 +756,7 @@ typedef struct hypre_StructGrid_struct
 #endif
 
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -1080,7 +779,7 @@ typedef struct hypre_StructStencil_struct
 {
    hypre_Index   *shape;   /* Description of a stencil's shape */
    HYPRE_Int      size;    /* Number of stencil coefficients */
-                
+
    HYPRE_Int      ndim;    /* Number of dimensions */
 
    HYPRE_Int      ref_count;
@@ -1098,7 +797,7 @@ typedef struct hypre_StructStencil_struct
 
 #endif
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -1149,7 +848,7 @@ typedef struct hypre_CommEntryType_struct
    HYPRE_Int  offset;                       /* offset for the data */
    HYPRE_Int  dim;                          /* dimension of the communication */
    HYPRE_Int  length_array[HYPRE_MAXDIM];   /* last dim has length num_values */
-   HYPRE_Int  stride_array[HYPRE_MAXDIM+1];
+   HYPRE_Int  stride_array[HYPRE_MAXDIM + 1];
    HYPRE_Int *order;                        /* order of last dim values */
 
 } hypre_CommEntryType;
@@ -1178,43 +877,50 @@ typedef struct hypre_CommType_struct
 
 typedef struct hypre_CommPkg_struct
 {
-   MPI_Comm          comm;
+   MPI_Comm             comm;
 
-   HYPRE_Int         first_comm; /* is this the first communication? */
+   /* is this the first communication? */
+   HYPRE_Int            first_comm;
 
-   HYPRE_Int         ndim;
-   HYPRE_Int         num_values;
-   hypre_Index       send_stride;
-   hypre_Index       recv_stride;
+   HYPRE_Int            ndim;
+   HYPRE_Int            num_values;
+   hypre_Index          send_stride;
+   hypre_Index          recv_stride;
 
-   HYPRE_Int         send_bufsize;            /* total send buffer size (in doubles) */
-   HYPRE_Int         recv_bufsize;            /* total recv buffer size (in doubles) */
-   HYPRE_Int         send_bufsize_first_comm; /* total send buffer size (in doubles) at the first comm. */
-   HYPRE_Int         recv_bufsize_first_comm; /* total recv buffer size (in doubles) at the first comm. */
+   /* total send buffer size (in doubles) */
+   HYPRE_Int            send_bufsize;
+   /* total recv buffer size (in doubles) */
+   HYPRE_Int            recv_bufsize;
+   /* total send buffer size (in doubles) at the first comm. */
+   HYPRE_Int            send_bufsize_first_comm;
+   /* total recv buffer size (in doubles) at the first comm. */
+   HYPRE_Int            recv_bufsize_first_comm;
 
-   HYPRE_Int         num_sends;
-   HYPRE_Int         num_recvs;
-   hypre_CommType   *send_types;
-   hypre_CommType   *recv_types;
+   HYPRE_Int            num_sends;
+   HYPRE_Int            num_recvs;
+   hypre_CommType      *send_types;
+   hypre_CommType      *recv_types;
 
-   hypre_CommType   *copy_from_type;
-   hypre_CommType   *copy_to_type;
+   hypre_CommType      *copy_from_type;
+   hypre_CommType      *copy_to_type;
 
    /* these pointers are just to help free up memory for send/from types */
    hypre_CommEntryType *entries;
    HYPRE_Int           *rem_boxnums;
    hypre_Box           *rem_boxes;
 
-   HYPRE_Int         num_orders;
-   HYPRE_Int       **orders;            /* num_orders x num_values */
-
-   HYPRE_Int        *recv_data_offsets; /* offsets into recv data (by box) */
-   hypre_BoxArray   *recv_data_space;   /* recv data dimensions (by box) */
+   HYPRE_Int            num_orders;
+   /* num_orders x num_values */
+   HYPRE_Int          **orders;
 
-   hypre_Index       identity_coord;
-   hypre_Index       identity_dir;
-   HYPRE_Int        *identity_order;
+   /* offsets into recv data (by box) */
+   HYPRE_Int           *recv_data_offsets;
+   /* recv data dimensions (by box) */
+   hypre_BoxArray      *recv_data_space;
 
+   hypre_Index          identity_coord;
+   hypre_Index          identity_dir;
+   HYPRE_Int           *identity_order;
 } hypre_CommPkg;
 
 /*--------------------------------------------------------------------------
@@ -1234,9 +940,8 @@ typedef struct hypre_CommHandle_struct
    HYPRE_Complex    **send_buffers;
    HYPRE_Complex    **recv_buffers;
 
-   /* these are copies of send/recv buffers on device */
-   HYPRE_Complex    **send_buffers_device;
-   HYPRE_Complex    **recv_buffers_device;
+   HYPRE_Complex    **send_buffers_mpi;
+   HYPRE_Complex    **recv_buffers_mpi;
 
    /* set = 0, add = 1 */
    HYPRE_Int          action;
@@ -1347,12 +1052,12 @@ typedef struct hypre_CommHandle_struct
 #define hypre_CommHandleSendBuffers(comm_handle)          (comm_handle -> send_buffers)
 #define hypre_CommHandleRecvBuffers(comm_handle)          (comm_handle -> recv_buffers)
 #define hypre_CommHandleAction(comm_handle)               (comm_handle -> action)
-#define hypre_CommHandleSendBuffersDevice(comm_handle)    (comm_handle -> send_buffers_device)
-#define hypre_CommHandleRecvBuffersDevice(comm_handle)    (comm_handle -> recv_buffers_device)
+#define hypre_CommHandleSendBuffersMPI(comm_handle)       (comm_handle -> send_buffers_mpi)
+#define hypre_CommHandleRecvBuffersMPI(comm_handle)       (comm_handle -> recv_buffers_mpi)
 
 #endif
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -1403,7 +1108,7 @@ typedef struct hypre_ComputePkg_struct
 /*--------------------------------------------------------------------------
  * Accessor macros: hypre_ComputeInfo
  *--------------------------------------------------------------------------*/
- 
+
 #define hypre_ComputeInfoCommInfo(info)     (info -> comm_info)
 #define hypre_ComputeInfoIndtBoxes(info)    (info -> indt_boxes)
 #define hypre_ComputeInfoDeptBoxes(info)    (info -> dept_boxes)
@@ -1412,7 +1117,7 @@ typedef struct hypre_ComputePkg_struct
 /*--------------------------------------------------------------------------
  * Accessor macros: hypre_ComputePkg
  *--------------------------------------------------------------------------*/
- 
+
 #define hypre_ComputePkgCommPkg(compute_pkg)      (compute_pkg -> comm_pkg)
 
 #define hypre_ComputePkgIndtBoxes(compute_pkg)    (compute_pkg -> indt_boxes)
@@ -1425,7 +1130,7 @@ typedef struct hypre_ComputePkg_struct
 
 #endif
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -1455,6 +1160,7 @@ typedef struct hypre_StructMatrix_struct
 
    hypre_BoxArray       *data_space;
 
+   HYPRE_MemoryLocation  memory_location;           /* memory location of data */
    HYPRE_Complex        *data;                      /* Pointer to variable matrix data */
    HYPRE_Complex        *data_const;                /* Pointer to constant matrix data */
    HYPRE_Complex       **stencil_data;              /* Pointer for each stencil */
@@ -1473,7 +1179,7 @@ typedef struct hypre_StructMatrix_struct
 
    HYPRE_Int             symmetric;                 /* Is the matrix symmetric */
    HYPRE_Int            *symm_elements;             /* Which elements are "symmetric" */
-   HYPRE_Int             num_ghost[2*HYPRE_MAXDIM]; /* Num ghost layers in each direction */
+   HYPRE_Int             num_ghost[2 * HYPRE_MAXDIM]; /* Num ghost layers in each direction */
 
    HYPRE_BigInt          global_size;               /* Total number of nonzero coeffs */
 
@@ -1493,6 +1199,7 @@ typedef struct hypre_StructMatrix_struct
 #define hypre_StructMatrixStencil(matrix)             ((matrix) -> stencil)
 #define hypre_StructMatrixNumValues(matrix)           ((matrix) -> num_values)
 #define hypre_StructMatrixDataSpace(matrix)           ((matrix) -> data_space)
+#define hypre_StructMatrixMemoryLocation(matrix)      ((matrix) -> memory_location)
 #define hypre_StructMatrixData(matrix)                ((matrix) -> data)
 #define hypre_StructMatrixDataConst(matrix)           ((matrix) -> data_const)
 #define hypre_StructMatrixStencilData(matrix)         ((matrix) -> stencil_data)
@@ -1527,7 +1234,7 @@ hypre_BoxArrayBox(hypre_StructMatrixDataSpace(matrix), b)
 
 #endif
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -1554,19 +1261,20 @@ typedef struct hypre_StructVector_struct
 
    hypre_BoxArray       *data_space;
 
-   HYPRE_Complex        *data;         /* Pointer to vector data on device*/
-   HYPRE_Int             data_alloced; /* Boolean used for freeing data */
-   HYPRE_Int             data_size;    /* Size of vector data */
-   HYPRE_Int            *data_indices; /* num-boxes array of indices into
-                                          the data array.  data_indices[b]
-                                          is the starting index of vector
-                                          data corresponding to box b. */
+   HYPRE_MemoryLocation  memory_location;             /* memory location of data */
+   HYPRE_Complex        *data;                        /* Pointer to vector data on device*/
+   HYPRE_Int             data_alloced;                /* Boolean used for freeing data */
+   HYPRE_Int             data_size;                   /* Size of vector data */
+   HYPRE_Int            *data_indices;                /* num-boxes array of indices into
+                                                         the data array.  data_indices[b]
+                                                         is the starting index of vector
+                                                         data corresponding to box b. */
 
-   HYPRE_Int             num_ghost[2*HYPRE_MAXDIM]; /* Num ghost layers in each
-                                                     * direction */
-   HYPRE_Int             bghost_not_clear; /* Are boundary ghosts clear? */
+   HYPRE_Int             num_ghost[2 * HYPRE_MAXDIM]; /* Num ghost layers in each
+                                                       * direction */
+   HYPRE_Int             bghost_not_clear;            /* Are boundary ghosts clear? */
 
-   HYPRE_BigInt          global_size;  /* Total number coefficients */
+   HYPRE_BigInt          global_size;                 /* Total number coefficients */
 
    HYPRE_Int             ref_count;
 
@@ -1576,17 +1284,18 @@ typedef struct hypre_StructVector_struct
  * Accessor macros: hypre_StructVector
  *--------------------------------------------------------------------------*/
 
-#define hypre_StructVectorComm(vector)          ((vector) -> comm)
-#define hypre_StructVectorGrid(vector)          ((vector) -> grid)
-#define hypre_StructVectorDataSpace(vector)     ((vector) -> data_space)
-#define hypre_StructVectorData(vector)          ((vector) -> data)
-#define hypre_StructVectorDataAlloced(vector)   ((vector) -> data_alloced)
-#define hypre_StructVectorDataSize(vector)      ((vector) -> data_size)
-#define hypre_StructVectorDataIndices(vector)   ((vector) -> data_indices)
-#define hypre_StructVectorNumGhost(vector)      ((vector) -> num_ghost)
-#define hypre_StructVectorBGhostNotClear(vector)((vector) -> bghost_not_clear)
-#define hypre_StructVectorGlobalSize(vector)    ((vector) -> global_size)
-#define hypre_StructVectorRefCount(vector)      ((vector) -> ref_count)
+#define hypre_StructVectorComm(vector)           ((vector) -> comm)
+#define hypre_StructVectorGrid(vector)           ((vector) -> grid)
+#define hypre_StructVectorDataSpace(vector)      ((vector) -> data_space)
+#define hypre_StructVectorMemoryLocation(vector) ((vector) -> memory_location)
+#define hypre_StructVectorData(vector)           ((vector) -> data)
+#define hypre_StructVectorDataAlloced(vector)    ((vector) -> data_alloced)
+#define hypre_StructVectorDataSize(vector)       ((vector) -> data_size)
+#define hypre_StructVectorDataIndices(vector)    ((vector) -> data_indices)
+#define hypre_StructVectorNumGhost(vector)       ((vector) -> num_ghost)
+#define hypre_StructVectorBGhostNotClear(vector) ((vector) -> bghost_not_clear)
+#define hypre_StructVectorGlobalSize(vector)     ((vector) -> global_size)
+#define hypre_StructVectorRefCount(vector)       ((vector) -> ref_count)
 
 #define hypre_StructVectorNDim(vector) \
 hypre_StructGridNDim(hypre_StructVectorGrid(vector))
@@ -1603,314 +1312,461 @@ hypre_BoxArrayBox(hypre_StructVectorDataSpace(vector), b)
 
 #endif
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
  ******************************************************************************/
 
 /* assumed_part.c */
-HYPRE_Int hypre_APSubdivideRegion ( hypre_Box *region , HYPRE_Int dim , HYPRE_Int level , hypre_BoxArray *box_array , HYPRE_Int *num_new_boxes );
-HYPRE_Int hypre_APFindMyBoxesInRegions ( hypre_BoxArray *region_array , hypre_BoxArray *my_box_array , HYPRE_Int **p_count_array , HYPRE_Real **p_vol_array );
-HYPRE_Int hypre_APGetAllBoxesInRegions ( hypre_BoxArray *region_array , hypre_BoxArray *my_box_array , HYPRE_Int **p_count_array , HYPRE_Real **p_vol_array , MPI_Comm comm );
-HYPRE_Int hypre_APShrinkRegions ( hypre_BoxArray *region_array , hypre_BoxArray *my_box_array , MPI_Comm comm );
-HYPRE_Int hypre_APPruneRegions ( hypre_BoxArray *region_array , HYPRE_Int **p_count_array , HYPRE_Real **p_vol_array );
-HYPRE_Int hypre_APRefineRegionsByVol ( hypre_BoxArray *region_array , HYPRE_Real *vol_array , HYPRE_Int max_regions , HYPRE_Real gamma , HYPRE_Int dim , HYPRE_Int *return_code , MPI_Comm comm );
-HYPRE_Int hypre_StructAssumedPartitionCreate ( HYPRE_Int dim , hypre_Box *bounding_box , HYPRE_Real global_boxes_size , HYPRE_Int global_num_boxes , hypre_BoxArray *local_boxes , HYPRE_Int *local_boxnums , HYPRE_Int max_regions , HYPRE_Int max_refinements , HYPRE_Real gamma , MPI_Comm comm , hypre_StructAssumedPart **p_assumed_partition );
+HYPRE_Int hypre_APSubdivideRegion ( hypre_Box *region, HYPRE_Int dim, HYPRE_Int level,
+                                    hypre_BoxArray *box_array, HYPRE_Int *num_new_boxes );
+HYPRE_Int hypre_APFindMyBoxesInRegions ( hypre_BoxArray *region_array, hypre_BoxArray *my_box_array,
+                                         HYPRE_Int **p_count_array, HYPRE_Real **p_vol_array );
+HYPRE_Int hypre_APGetAllBoxesInRegions ( hypre_BoxArray *region_array, hypre_BoxArray *my_box_array,
+                                         HYPRE_Int **p_count_array, HYPRE_Real **p_vol_array, MPI_Comm comm );
+HYPRE_Int hypre_APShrinkRegions ( hypre_BoxArray *region_array, hypre_BoxArray *my_box_array,
+                                  MPI_Comm comm );
+HYPRE_Int hypre_APPruneRegions ( hypre_BoxArray *region_array, HYPRE_Int **p_count_array,
+                                 HYPRE_Real **p_vol_array );
+HYPRE_Int hypre_APRefineRegionsByVol ( hypre_BoxArray *region_array, HYPRE_Real *vol_array,
+                                       HYPRE_Int max_regions, HYPRE_Real gamma, HYPRE_Int dim, HYPRE_Int *return_code, MPI_Comm comm );
+HYPRE_Int hypre_StructAssumedPartitionCreate ( HYPRE_Int dim, hypre_Box *bounding_box,
+                                               HYPRE_Real global_boxes_size, HYPRE_Int global_num_boxes, hypre_BoxArray *local_boxes,
+                                               HYPRE_Int *local_boxnums, HYPRE_Int max_regions, HYPRE_Int max_refinements, HYPRE_Real gamma,
+                                               MPI_Comm comm, hypre_StructAssumedPart **p_assumed_partition );
 HYPRE_Int hypre_StructAssumedPartitionDestroy ( hypre_StructAssumedPart *assumed_part );
-HYPRE_Int hypre_APFillResponseStructAssumedPart ( void *p_recv_contact_buf , HYPRE_Int contact_size , HYPRE_Int contact_proc , void *ro , MPI_Comm comm , void **p_send_response_buf , HYPRE_Int *response_message_size );
-HYPRE_Int hypre_StructAssumedPartitionGetRegionsFromProc ( hypre_StructAssumedPart *assumed_part , HYPRE_Int proc_id , hypre_BoxArray *assumed_regions );
-HYPRE_Int hypre_StructAssumedPartitionGetProcsFromBox ( hypre_StructAssumedPart *assumed_part , hypre_Box *box , HYPRE_Int *num_proc_array , HYPRE_Int *size_alloc_proc_array , HYPRE_Int **p_proc_array );
+HYPRE_Int hypre_APFillResponseStructAssumedPart ( void *p_recv_contact_buf, HYPRE_Int contact_size,
+                                                  HYPRE_Int contact_proc, void *ro, MPI_Comm comm, void **p_send_response_buf,
+                                                  HYPRE_Int *response_message_size );
+HYPRE_Int hypre_StructAssumedPartitionGetRegionsFromProc ( hypre_StructAssumedPart *assumed_part,
+                                                           HYPRE_Int proc_id, hypre_BoxArray *assumed_regions );
+HYPRE_Int hypre_StructAssumedPartitionGetProcsFromBox ( hypre_StructAssumedPart *assumed_part,
+                                                        hypre_Box *box, HYPRE_Int *num_proc_array, HYPRE_Int *size_alloc_proc_array,
+                                                        HYPRE_Int **p_proc_array );
 
 /* box_algebra.c */
-HYPRE_Int hypre_IntersectBoxes ( hypre_Box *box1 , hypre_Box *box2 , hypre_Box *ibox );
-HYPRE_Int hypre_SubtractBoxes ( hypre_Box *box1 , hypre_Box *box2 , hypre_BoxArray *box_array );
-HYPRE_Int hypre_SubtractBoxArrays ( hypre_BoxArray *box_array1 , hypre_BoxArray *box_array2 , hypre_BoxArray *tmp_box_array );
+HYPRE_Int hypre_IntersectBoxes ( hypre_Box *box1, hypre_Box *box2, hypre_Box *ibox );
+HYPRE_Int hypre_SubtractBoxes ( hypre_Box *box1, hypre_Box *box2, hypre_BoxArray *box_array );
+HYPRE_Int hypre_SubtractBoxArrays ( hypre_BoxArray *box_array1, hypre_BoxArray *box_array2,
+                                    hypre_BoxArray *tmp_box_array );
 HYPRE_Int hypre_UnionBoxes ( hypre_BoxArray *boxes );
 HYPRE_Int hypre_MinUnionBoxes ( hypre_BoxArray *boxes );
 
 /* box_boundary.c */
-HYPRE_Int hypre_BoxBoundaryIntersect ( hypre_Box *box , hypre_StructGrid *grid , HYPRE_Int d , HYPRE_Int dir , hypre_BoxArray *boundary );
-HYPRE_Int hypre_BoxBoundaryG ( hypre_Box *box , hypre_StructGrid *g , hypre_BoxArray *boundary );
-HYPRE_Int hypre_BoxBoundaryDG ( hypre_Box *box , hypre_StructGrid *g , hypre_BoxArray *boundarym , hypre_BoxArray *boundaryp , HYPRE_Int d );
-HYPRE_Int hypre_GeneralBoxBoundaryIntersect( hypre_Box *box, hypre_StructGrid *grid, hypre_Index stencil_element, hypre_BoxArray *boundary );
+HYPRE_Int hypre_BoxBoundaryIntersect ( hypre_Box *box, hypre_StructGrid *grid, HYPRE_Int d,
+                                       HYPRE_Int dir, hypre_BoxArray *boundary );
+HYPRE_Int hypre_BoxBoundaryG ( hypre_Box *box, hypre_StructGrid *g, hypre_BoxArray *boundary );
+HYPRE_Int hypre_BoxBoundaryDG ( hypre_Box *box, hypre_StructGrid *g, hypre_BoxArray *boundarym,
+                                hypre_BoxArray *boundaryp, HYPRE_Int d );
+HYPRE_Int hypre_GeneralBoxBoundaryIntersect( hypre_Box *box, hypre_StructGrid *grid,
+                                             hypre_Index stencil_element, hypre_BoxArray *boundary );
 
 /* box.c */
-HYPRE_Int hypre_SetIndex ( hypre_Index index , HYPRE_Int val );
-HYPRE_Int hypre_CopyIndex( hypre_Index in_index , hypre_Index out_index );
-HYPRE_Int hypre_CopyToCleanIndex( hypre_Index in_index , HYPRE_Int ndim , hypre_Index out_index );
-HYPRE_Int hypre_IndexEqual ( hypre_Index index , HYPRE_Int val , HYPRE_Int ndim );
-HYPRE_Int hypre_IndexMin( hypre_Index index , HYPRE_Int ndim );
-HYPRE_Int hypre_IndexMax( hypre_Index index , HYPRE_Int ndim );
-HYPRE_Int hypre_AddIndexes ( hypre_Index index1 , hypre_Index index2 , HYPRE_Int ndim , hypre_Index result );
-HYPRE_Int hypre_SubtractIndexes ( hypre_Index index1 , hypre_Index index2 , HYPRE_Int ndim , hypre_Index result );
-HYPRE_Int hypre_IndexesEqual ( hypre_Index index1 , hypre_Index index2 , HYPRE_Int ndim );
+HYPRE_Int hypre_SetIndex ( hypre_Index index, HYPRE_Int val );
+HYPRE_Int hypre_CopyIndex( hypre_Index in_index, hypre_Index out_index );
+HYPRE_Int hypre_CopyToCleanIndex( hypre_Index in_index, HYPRE_Int ndim, hypre_Index out_index );
+HYPRE_Int hypre_IndexEqual ( hypre_Index index, HYPRE_Int val, HYPRE_Int ndim );
+HYPRE_Int hypre_IndexMin( hypre_Index index, HYPRE_Int ndim );
+HYPRE_Int hypre_IndexMax( hypre_Index index, HYPRE_Int ndim );
+HYPRE_Int hypre_AddIndexes ( hypre_Index index1, hypre_Index index2, HYPRE_Int ndim,
+                             hypre_Index result );
+HYPRE_Int hypre_SubtractIndexes ( hypre_Index index1, hypre_Index index2, HYPRE_Int ndim,
+                                  hypre_Index result );
+HYPRE_Int hypre_IndexesEqual ( hypre_Index index1, hypre_Index index2, HYPRE_Int ndim );
+HYPRE_Int hypre_IndexPrint ( FILE *file, HYPRE_Int ndim, hypre_Index index );
+HYPRE_Int hypre_IndexRead ( FILE *file, HYPRE_Int ndim, hypre_Index index );
 hypre_Box *hypre_BoxCreate ( HYPRE_Int ndim );
 HYPRE_Int hypre_BoxDestroy ( hypre_Box *box );
-HYPRE_Int hypre_BoxInit( hypre_Box *box , HYPRE_Int  ndim );
-HYPRE_Int hypre_BoxSetExtents ( hypre_Box *box , hypre_Index imin , hypre_Index imax );
-HYPRE_Int hypre_CopyBox( hypre_Box *box1 , hypre_Box *box2 );
+HYPRE_Int hypre_BoxInit( hypre_Box *box, HYPRE_Int  ndim );
+HYPRE_Int hypre_BoxSetExtents ( hypre_Box *box, hypre_Index imin, hypre_Index imax );
+HYPRE_Int hypre_CopyBox( hypre_Box *box1, hypre_Box *box2 );
 hypre_Box *hypre_BoxDuplicate ( hypre_Box *box );
 HYPRE_Int hypre_BoxVolume( hypre_Box *box );
 HYPRE_Real hypre_doubleBoxVolume( hypre_Box *box );
-HYPRE_Int hypre_IndexInBox ( hypre_Index index , hypre_Box *box );
-HYPRE_Int hypre_BoxGetSize ( hypre_Box *box , hypre_Index size );
-HYPRE_Int hypre_BoxGetStrideSize ( hypre_Box *box , hypre_Index stride , hypre_Index size );
-HYPRE_Int hypre_BoxGetStrideVolume ( hypre_Box *box , hypre_Index stride , HYPRE_Int *volume_ptr );
-HYPRE_Int hypre_BoxIndexRank( hypre_Box *box , hypre_Index index );
-HYPRE_Int hypre_BoxRankIndex( hypre_Box *box , HYPRE_Int rank , hypre_Index index );
-HYPRE_Int hypre_BoxOffsetDistance( hypre_Box *box , hypre_Index index );
-HYPRE_Int hypre_BoxShiftPos( hypre_Box *box , hypre_Index shift );
-HYPRE_Int hypre_BoxShiftNeg( hypre_Box *box , hypre_Index shift );
-HYPRE_Int hypre_BoxGrowByIndex( hypre_Box *box , hypre_Index  index );
-HYPRE_Int hypre_BoxGrowByValue( hypre_Box *box , HYPRE_Int val );
-HYPRE_Int hypre_BoxGrowByArray ( hypre_Box *box , HYPRE_Int *array );
-hypre_BoxArray *hypre_BoxArrayCreate ( HYPRE_Int size , HYPRE_Int ndim );
+HYPRE_Int hypre_IndexInBox ( hypre_Index index, hypre_Box *box );
+HYPRE_Int hypre_BoxGetSize ( hypre_Box *box, hypre_Index size );
+HYPRE_Int hypre_BoxGetStrideSize ( hypre_Box *box, hypre_Index stride, hypre_Index size );
+HYPRE_Int hypre_BoxGetStrideVolume ( hypre_Box *box, hypre_Index stride, HYPRE_Int *volume_ptr );
+HYPRE_Int hypre_BoxIndexRank( hypre_Box *box, hypre_Index index );
+HYPRE_Int hypre_BoxRankIndex( hypre_Box *box, HYPRE_Int rank, hypre_Index index );
+HYPRE_Int hypre_BoxOffsetDistance( hypre_Box *box, hypre_Index index );
+HYPRE_Int hypre_BoxShiftPos( hypre_Box *box, hypre_Index shift );
+HYPRE_Int hypre_BoxShiftNeg( hypre_Box *box, hypre_Index shift );
+HYPRE_Int hypre_BoxGrowByIndex( hypre_Box *box, hypre_Index  index );
+HYPRE_Int hypre_BoxGrowByValue( hypre_Box *box, HYPRE_Int val );
+HYPRE_Int hypre_BoxGrowByArray ( hypre_Box *box, HYPRE_Int *array );
+HYPRE_Int hypre_BoxPrint ( FILE *file, hypre_Box *box );
+HYPRE_Int hypre_BoxRead ( FILE *file, HYPRE_Int ndim, hypre_Box **box_ptr );
+hypre_BoxArray *hypre_BoxArrayCreate ( HYPRE_Int size, HYPRE_Int ndim );
 HYPRE_Int hypre_BoxArrayDestroy ( hypre_BoxArray *box_array );
-HYPRE_Int hypre_BoxArraySetSize ( hypre_BoxArray *box_array , HYPRE_Int size );
+HYPRE_Int hypre_BoxArraySetSize ( hypre_BoxArray *box_array, HYPRE_Int size );
 hypre_BoxArray *hypre_BoxArrayDuplicate ( hypre_BoxArray *box_array );
-HYPRE_Int hypre_AppendBox ( hypre_Box *box , hypre_BoxArray *box_array );
-HYPRE_Int hypre_DeleteBox ( hypre_BoxArray *box_array , HYPRE_Int index );
-HYPRE_Int hypre_DeleteMultipleBoxes ( hypre_BoxArray *box_array , HYPRE_Int *indices , HYPRE_Int num );
-HYPRE_Int hypre_AppendBoxArray ( hypre_BoxArray *box_array_0 , hypre_BoxArray *box_array_1 );
-hypre_BoxArrayArray *hypre_BoxArrayArrayCreate ( HYPRE_Int size , HYPRE_Int ndim );
+HYPRE_Int hypre_AppendBox ( hypre_Box *box, hypre_BoxArray *box_array );
+HYPRE_Int hypre_DeleteBox ( hypre_BoxArray *box_array, HYPRE_Int index );
+HYPRE_Int hypre_DeleteMultipleBoxes ( hypre_BoxArray *box_array, HYPRE_Int *indices,
+                                      HYPRE_Int num );
+HYPRE_Int hypre_AppendBoxArray ( hypre_BoxArray *box_array_0, hypre_BoxArray *box_array_1 );
+hypre_BoxArrayArray *hypre_BoxArrayArrayCreate ( HYPRE_Int size, HYPRE_Int ndim );
 HYPRE_Int hypre_BoxArrayArrayDestroy ( hypre_BoxArrayArray *box_array_array );
 hypre_BoxArrayArray *hypre_BoxArrayArrayDuplicate ( hypre_BoxArrayArray *box_array_array );
 
 /* box_manager.c */
-HYPRE_Int hypre_BoxManEntryGetInfo ( hypre_BoxManEntry *entry , void **info_ptr );
-HYPRE_Int hypre_BoxManEntryGetExtents ( hypre_BoxManEntry *entry , hypre_Index imin , hypre_Index imax );
-HYPRE_Int hypre_BoxManEntryCopy ( hypre_BoxManEntry *fromentry , hypre_BoxManEntry *toentry );
-HYPRE_Int hypre_BoxManSetAllGlobalKnown ( hypre_BoxManager *manager , HYPRE_Int known );
-HYPRE_Int hypre_BoxManGetAllGlobalKnown ( hypre_BoxManager *manager , HYPRE_Int *known );
-HYPRE_Int hypre_BoxManSetIsEntriesSort ( hypre_BoxManager *manager , HYPRE_Int is_sort );
-HYPRE_Int hypre_BoxManGetIsEntriesSort ( hypre_BoxManager *manager , HYPRE_Int *is_sort );
-HYPRE_Int hypre_BoxManGetGlobalIsGatherCalled ( hypre_BoxManager *manager , MPI_Comm comm , HYPRE_Int *is_gather );
-HYPRE_Int hypre_BoxManGetAssumedPartition ( hypre_BoxManager *manager , hypre_StructAssumedPart **assumed_partition );
-HYPRE_Int hypre_BoxManSetAssumedPartition ( hypre_BoxManager *manager , hypre_StructAssumedPart *assumed_partition );
-HYPRE_Int hypre_BoxManSetBoundingBox ( hypre_BoxManager *manager , hypre_Box *bounding_box );
-HYPRE_Int hypre_BoxManSetNumGhost ( hypre_BoxManager *manager , HYPRE_Int *num_ghost );
-HYPRE_Int hypre_BoxManDeleteMultipleEntriesAndInfo ( hypre_BoxManager *manager , HYPRE_Int *indices , HYPRE_Int num );
-HYPRE_Int hypre_BoxManCreate ( HYPRE_Int max_nentries , HYPRE_Int info_size , HYPRE_Int dim , hypre_Box *bounding_box , MPI_Comm comm , hypre_BoxManager **manager_ptr );
-HYPRE_Int hypre_BoxManIncSize ( hypre_BoxManager *manager , HYPRE_Int inc_size );
+HYPRE_Int hypre_BoxManEntryGetInfo ( hypre_BoxManEntry *entry, void **info_ptr );
+HYPRE_Int hypre_BoxManEntryGetExtents ( hypre_BoxManEntry *entry, hypre_Index imin,
+                                        hypre_Index imax );
+HYPRE_Int hypre_BoxManEntryCopy ( hypre_BoxManEntry *fromentry, hypre_BoxManEntry *toentry );
+HYPRE_Int hypre_BoxManSetAllGlobalKnown ( hypre_BoxManager *manager, HYPRE_Int known );
+HYPRE_Int hypre_BoxManGetAllGlobalKnown ( hypre_BoxManager *manager, HYPRE_Int *known );
+HYPRE_Int hypre_BoxManSetIsEntriesSort ( hypre_BoxManager *manager, HYPRE_Int is_sort );
+HYPRE_Int hypre_BoxManGetIsEntriesSort ( hypre_BoxManager *manager, HYPRE_Int *is_sort );
+HYPRE_Int hypre_BoxManGetGlobalIsGatherCalled ( hypre_BoxManager *manager, MPI_Comm comm,
+                                                HYPRE_Int *is_gather );
+HYPRE_Int hypre_BoxManGetAssumedPartition ( hypre_BoxManager *manager,
+                                            hypre_StructAssumedPart **assumed_partition );
+HYPRE_Int hypre_BoxManSetAssumedPartition ( hypre_BoxManager *manager,
+                                            hypre_StructAssumedPart *assumed_partition );
+HYPRE_Int hypre_BoxManSetBoundingBox ( hypre_BoxManager *manager, hypre_Box *bounding_box );
+HYPRE_Int hypre_BoxManSetNumGhost ( hypre_BoxManager *manager, HYPRE_Int *num_ghost );
+HYPRE_Int hypre_BoxManDeleteMultipleEntriesAndInfo ( hypre_BoxManager *manager, HYPRE_Int *indices,
+                                                     HYPRE_Int num );
+HYPRE_Int hypre_BoxManCreate ( HYPRE_Int max_nentries, HYPRE_Int info_size, HYPRE_Int dim,
+                               hypre_Box *bounding_box, MPI_Comm comm, hypre_BoxManager **manager_ptr );
+HYPRE_Int hypre_BoxManIncSize ( hypre_BoxManager *manager, HYPRE_Int inc_size );
 HYPRE_Int hypre_BoxManDestroy ( hypre_BoxManager *manager );
-HYPRE_Int hypre_BoxManAddEntry ( hypre_BoxManager *manager , hypre_Index imin , hypre_Index imax , HYPRE_Int proc_id , HYPRE_Int box_id , void *info );
-HYPRE_Int hypre_BoxManGetEntry ( hypre_BoxManager *manager , HYPRE_Int proc , HYPRE_Int id , hypre_BoxManEntry **entry_ptr );
-HYPRE_Int hypre_BoxManGetAllEntries ( hypre_BoxManager *manager , HYPRE_Int *num_entries , hypre_BoxManEntry **entries );
-HYPRE_Int hypre_BoxManGetAllEntriesBoxes ( hypre_BoxManager *manager , hypre_BoxArray *boxes );
-HYPRE_Int hypre_BoxManGetLocalEntriesBoxes ( hypre_BoxManager *manager , hypre_BoxArray *boxes );
-HYPRE_Int hypre_BoxManGetAllEntriesBoxesProc ( hypre_BoxManager *manager , hypre_BoxArray *boxes , HYPRE_Int **procs_ptr );
-HYPRE_Int hypre_BoxManGatherEntries ( hypre_BoxManager *manager , hypre_Index imin , hypre_Index imax );
+HYPRE_Int hypre_BoxManAddEntry ( hypre_BoxManager *manager, hypre_Index imin, hypre_Index imax,
+                                 HYPRE_Int proc_id, HYPRE_Int box_id, void *info );
+HYPRE_Int hypre_BoxManGetEntry ( hypre_BoxManager *manager, HYPRE_Int proc, HYPRE_Int id,
+                                 hypre_BoxManEntry **entry_ptr );
+HYPRE_Int hypre_BoxManGetAllEntries ( hypre_BoxManager *manager, HYPRE_Int *num_entries,
+                                      hypre_BoxManEntry **entries );
+HYPRE_Int hypre_BoxManGetAllEntriesBoxes ( hypre_BoxManager *manager, hypre_BoxArray *boxes );
+HYPRE_Int hypre_BoxManGetLocalEntriesBoxes ( hypre_BoxManager *manager, hypre_BoxArray *boxes );
+HYPRE_Int hypre_BoxManGetAllEntriesBoxesProc ( hypre_BoxManager *manager, hypre_BoxArray *boxes,
+                                               HYPRE_Int **procs_ptr );
+HYPRE_Int hypre_BoxManGatherEntries ( hypre_BoxManager *manager, hypre_Index imin,
+                                      hypre_Index imax );
 HYPRE_Int hypre_BoxManAssemble ( hypre_BoxManager *manager );
-HYPRE_Int hypre_BoxManIntersect ( hypre_BoxManager *manager , hypre_Index ilower , hypre_Index iupper , hypre_BoxManEntry ***entries_ptr , HYPRE_Int *nentries_ptr );
-HYPRE_Int hypre_FillResponseBoxManAssemble1 ( void *p_recv_contact_buf , HYPRE_Int contact_size , HYPRE_Int contact_proc , void *ro , MPI_Comm comm , void **p_send_response_buf , HYPRE_Int *response_message_size );
-HYPRE_Int hypre_FillResponseBoxManAssemble2 ( void *p_recv_contact_buf , HYPRE_Int contact_size , HYPRE_Int contact_proc , void *ro , MPI_Comm comm , void **p_send_response_buf , HYPRE_Int *response_message_size );
+HYPRE_Int hypre_BoxManIntersect ( hypre_BoxManager *manager, hypre_Index ilower, hypre_Index iupper,
+                                  hypre_BoxManEntry ***entries_ptr, HYPRE_Int *nentries_ptr );
+HYPRE_Int hypre_FillResponseBoxManAssemble1 ( void *p_recv_contact_buf, HYPRE_Int contact_size,
+                                              HYPRE_Int contact_proc, void *ro, MPI_Comm comm, void **p_send_response_buf,
+                                              HYPRE_Int *response_message_size );
+HYPRE_Int hypre_FillResponseBoxManAssemble2 ( void *p_recv_contact_buf, HYPRE_Int contact_size,
+                                              HYPRE_Int contact_proc, void *ro, MPI_Comm comm, void **p_send_response_buf,
+                                              HYPRE_Int *response_message_size );
 
 /* communication_info.c */
-HYPRE_Int hypre_CommInfoCreate ( hypre_BoxArrayArray *send_boxes , hypre_BoxArrayArray *recv_boxes , HYPRE_Int **send_procs , HYPRE_Int **recv_procs , HYPRE_Int **send_rboxnums , HYPRE_Int **recv_rboxnums , hypre_BoxArrayArray *send_rboxes , hypre_BoxArrayArray *recv_rboxes , HYPRE_Int boxes_match , hypre_CommInfo **comm_info_ptr );
-HYPRE_Int hypre_CommInfoSetTransforms ( hypre_CommInfo *comm_info , HYPRE_Int num_transforms , hypre_Index *coords , hypre_Index *dirs , HYPRE_Int **send_transforms , HYPRE_Int **recv_transforms );
-HYPRE_Int hypre_CommInfoGetTransforms ( hypre_CommInfo *comm_info , HYPRE_Int *num_transforms , hypre_Index **coords , hypre_Index **dirs );
-HYPRE_Int hypre_CommInfoProjectSend ( hypre_CommInfo *comm_info , hypre_Index index , hypre_Index stride );
-HYPRE_Int hypre_CommInfoProjectRecv ( hypre_CommInfo *comm_info , hypre_Index index , hypre_Index stride );
+HYPRE_Int hypre_CommInfoCreate ( hypre_BoxArrayArray *send_boxes, hypre_BoxArrayArray *recv_boxes,
+                                 HYPRE_Int **send_procs, HYPRE_Int **recv_procs, HYPRE_Int **send_rboxnums,
+                                 HYPRE_Int **recv_rboxnums, hypre_BoxArrayArray *send_rboxes, hypre_BoxArrayArray *recv_rboxes,
+                                 HYPRE_Int boxes_match, hypre_CommInfo **comm_info_ptr );
+HYPRE_Int hypre_CommInfoSetTransforms ( hypre_CommInfo *comm_info, HYPRE_Int num_transforms,
+                                        hypre_Index *coords, hypre_Index *dirs, HYPRE_Int **send_transforms, HYPRE_Int **recv_transforms );
+HYPRE_Int hypre_CommInfoGetTransforms ( hypre_CommInfo *comm_info, HYPRE_Int *num_transforms,
+                                        hypre_Index **coords, hypre_Index **dirs );
+HYPRE_Int hypre_CommInfoProjectSend ( hypre_CommInfo *comm_info, hypre_Index index,
+                                      hypre_Index stride );
+HYPRE_Int hypre_CommInfoProjectRecv ( hypre_CommInfo *comm_info, hypre_Index index,
+                                      hypre_Index stride );
 HYPRE_Int hypre_CommInfoDestroy ( hypre_CommInfo *comm_info );
-HYPRE_Int hypre_CreateCommInfoFromStencil ( hypre_StructGrid *grid , hypre_StructStencil *stencil , hypre_CommInfo **comm_info_ptr );
-HYPRE_Int hypre_CreateCommInfoFromNumGhost ( hypre_StructGrid *grid , HYPRE_Int *num_ghost , hypre_CommInfo **comm_info_ptr );
-HYPRE_Int hypre_CreateCommInfoFromGrids ( hypre_StructGrid *from_grid , hypre_StructGrid *to_grid , hypre_CommInfo **comm_info_ptr );
+HYPRE_Int hypre_CreateCommInfoFromStencil ( hypre_StructGrid *grid, hypre_StructStencil *stencil,
+                                            hypre_CommInfo **comm_info_ptr );
+HYPRE_Int hypre_CreateCommInfoFromNumGhost ( hypre_StructGrid *grid, HYPRE_Int *num_ghost,
+                                             hypre_CommInfo **comm_info_ptr );
+HYPRE_Int hypre_CreateCommInfoFromGrids ( hypre_StructGrid *from_grid, hypre_StructGrid *to_grid,
+                                          hypre_CommInfo **comm_info_ptr );
 
 /* computation.c */
-HYPRE_Int hypre_ComputeInfoCreate ( hypre_CommInfo *comm_info , hypre_BoxArrayArray *indt_boxes , hypre_BoxArrayArray *dept_boxes , hypre_ComputeInfo **compute_info_ptr );
-HYPRE_Int hypre_ComputeInfoProjectSend ( hypre_ComputeInfo *compute_info , hypre_Index index , hypre_Index stride );
-HYPRE_Int hypre_ComputeInfoProjectRecv ( hypre_ComputeInfo *compute_info , hypre_Index index , hypre_Index stride );
-HYPRE_Int hypre_ComputeInfoProjectComp ( hypre_ComputeInfo *compute_info , hypre_Index index , hypre_Index stride );
+HYPRE_Int hypre_ComputeInfoCreate ( hypre_CommInfo *comm_info, hypre_BoxArrayArray *indt_boxes,
+                                    hypre_BoxArrayArray *dept_boxes, hypre_ComputeInfo **compute_info_ptr );
+HYPRE_Int hypre_ComputeInfoProjectSend ( hypre_ComputeInfo *compute_info, hypre_Index index,
+                                         hypre_Index stride );
+HYPRE_Int hypre_ComputeInfoProjectRecv ( hypre_ComputeInfo *compute_info, hypre_Index index,
+                                         hypre_Index stride );
+HYPRE_Int hypre_ComputeInfoProjectComp ( hypre_ComputeInfo *compute_info, hypre_Index index,
+                                         hypre_Index stride );
 HYPRE_Int hypre_ComputeInfoDestroy ( hypre_ComputeInfo *compute_info );
-HYPRE_Int hypre_CreateComputeInfo ( hypre_StructGrid *grid , hypre_StructStencil *stencil , hypre_ComputeInfo **compute_info_ptr );
-HYPRE_Int hypre_ComputePkgCreate ( hypre_ComputeInfo *compute_info , hypre_BoxArray *data_space , HYPRE_Int num_values , hypre_StructGrid *grid , hypre_ComputePkg **compute_pkg_ptr );
+HYPRE_Int hypre_CreateComputeInfo ( hypre_StructGrid *grid, hypre_StructStencil *stencil,
+                                    hypre_ComputeInfo **compute_info_ptr );
+HYPRE_Int hypre_ComputePkgCreate ( hypre_ComputeInfo *compute_info, hypre_BoxArray *data_space,
+                                   HYPRE_Int num_values, hypre_StructGrid *grid, hypre_ComputePkg **compute_pkg_ptr );
 HYPRE_Int hypre_ComputePkgDestroy ( hypre_ComputePkg *compute_pkg );
-HYPRE_Int hypre_InitializeIndtComputations ( hypre_ComputePkg *compute_pkg , HYPRE_Complex *data , hypre_CommHandle **comm_handle_ptr );
+HYPRE_Int hypre_InitializeIndtComputations ( hypre_ComputePkg *compute_pkg, HYPRE_Complex *data,
+                                             hypre_CommHandle **comm_handle_ptr );
 HYPRE_Int hypre_FinalizeIndtComputations ( hypre_CommHandle *comm_handle );
 
 /* HYPRE_struct_grid.c */
-HYPRE_Int HYPRE_StructGridCreate ( MPI_Comm comm , HYPRE_Int dim , HYPRE_StructGrid *grid );
+HYPRE_Int HYPRE_StructGridCreate ( MPI_Comm comm, HYPRE_Int dim, HYPRE_StructGrid *grid );
 HYPRE_Int HYPRE_StructGridDestroy ( HYPRE_StructGrid grid );
-HYPRE_Int HYPRE_StructGridSetExtents ( HYPRE_StructGrid grid , HYPRE_Int *ilower , HYPRE_Int *iupper );
-HYPRE_Int HYPRE_StructGridSetPeriodic ( HYPRE_StructGrid grid , HYPRE_Int *periodic );
+HYPRE_Int HYPRE_StructGridSetExtents ( HYPRE_StructGrid grid, HYPRE_Int *ilower,
+                                       HYPRE_Int *iupper );
+HYPRE_Int HYPRE_StructGridSetPeriodic ( HYPRE_StructGrid grid, HYPRE_Int *periodic );
 HYPRE_Int HYPRE_StructGridAssemble ( HYPRE_StructGrid grid );
-HYPRE_Int HYPRE_StructGridSetNumGhost ( HYPRE_StructGrid grid , HYPRE_Int *num_ghost );
+HYPRE_Int HYPRE_StructGridSetNumGhost ( HYPRE_StructGrid grid, HYPRE_Int *num_ghost );
 
 /* HYPRE_struct_matrix.c */
-HYPRE_Int HYPRE_StructMatrixCreate ( MPI_Comm comm , HYPRE_StructGrid grid , HYPRE_StructStencil stencil , HYPRE_StructMatrix *matrix );
+HYPRE_Int HYPRE_StructMatrixCreate ( MPI_Comm comm, HYPRE_StructGrid grid,
+                                     HYPRE_StructStencil stencil, HYPRE_StructMatrix *matrix );
 HYPRE_Int HYPRE_StructMatrixDestroy ( HYPRE_StructMatrix matrix );
 HYPRE_Int HYPRE_StructMatrixInitialize ( HYPRE_StructMatrix matrix );
-HYPRE_Int HYPRE_StructMatrixSetValues ( HYPRE_StructMatrix matrix , HYPRE_Int *grid_index , HYPRE_Int num_stencil_indices , HYPRE_Int *stencil_indices , HYPRE_Complex *values );
-HYPRE_Int HYPRE_StructMatrixGetValues ( HYPRE_StructMatrix matrix , HYPRE_Int *grid_index , HYPRE_Int num_stencil_indices , HYPRE_Int *stencil_indices , HYPRE_Complex *values );
-HYPRE_Int HYPRE_StructMatrixSetBoxValues ( HYPRE_StructMatrix matrix , HYPRE_Int *ilower , HYPRE_Int *iupper , HYPRE_Int num_stencil_indices , HYPRE_Int *stencil_indices , HYPRE_Complex *values );
-HYPRE_Int HYPRE_StructMatrixGetBoxValues ( HYPRE_StructMatrix matrix , HYPRE_Int *ilower , HYPRE_Int *iupper , HYPRE_Int num_stencil_indices , HYPRE_Int *stencil_indices , HYPRE_Complex *values );
-HYPRE_Int HYPRE_StructMatrixSetConstantValues ( HYPRE_StructMatrix matrix , HYPRE_Int num_stencil_indices , HYPRE_Int *stencil_indices , HYPRE_Complex *values );
-HYPRE_Int HYPRE_StructMatrixAddToValues ( HYPRE_StructMatrix matrix , HYPRE_Int *grid_index , HYPRE_Int num_stencil_indices , HYPRE_Int *stencil_indices , HYPRE_Complex *values );
-HYPRE_Int HYPRE_StructMatrixAddToBoxValues ( HYPRE_StructMatrix matrix , HYPRE_Int *ilower , HYPRE_Int *iupper , HYPRE_Int num_stencil_indices , HYPRE_Int *stencil_indices , HYPRE_Complex *values );
-HYPRE_Int HYPRE_StructMatrixAddToConstantValues ( HYPRE_StructMatrix matrix , HYPRE_Int num_stencil_indices , HYPRE_Int *stencil_indices , HYPRE_Complex *values );
+HYPRE_Int HYPRE_StructMatrixSetValues ( HYPRE_StructMatrix matrix, HYPRE_Int *grid_index,
+                                        HYPRE_Int num_stencil_indices, HYPRE_Int *stencil_indices, HYPRE_Complex *values );
+HYPRE_Int HYPRE_StructMatrixGetValues ( HYPRE_StructMatrix matrix, HYPRE_Int *grid_index,
+                                        HYPRE_Int num_stencil_indices, HYPRE_Int *stencil_indices, HYPRE_Complex *values );
+HYPRE_Int HYPRE_StructMatrixSetBoxValues ( HYPRE_StructMatrix matrix, HYPRE_Int *ilower,
+                                           HYPRE_Int *iupper, HYPRE_Int num_stencil_indices, HYPRE_Int *stencil_indices,
+                                           HYPRE_Complex *values );
+HYPRE_Int HYPRE_StructMatrixGetBoxValues ( HYPRE_StructMatrix matrix, HYPRE_Int *ilower,
+                                           HYPRE_Int *iupper, HYPRE_Int num_stencil_indices, HYPRE_Int *stencil_indices,
+                                           HYPRE_Complex *values );
+HYPRE_Int HYPRE_StructMatrixSetConstantValues ( HYPRE_StructMatrix matrix,
+                                                HYPRE_Int num_stencil_indices, HYPRE_Int *stencil_indices, HYPRE_Complex *values );
+HYPRE_Int HYPRE_StructMatrixAddToValues ( HYPRE_StructMatrix matrix, HYPRE_Int *grid_index,
+                                          HYPRE_Int num_stencil_indices, HYPRE_Int *stencil_indices, HYPRE_Complex *values );
+HYPRE_Int HYPRE_StructMatrixAddToBoxValues ( HYPRE_StructMatrix matrix, HYPRE_Int *ilower,
+                                             HYPRE_Int *iupper, HYPRE_Int num_stencil_indices, HYPRE_Int *stencil_indices,
+                                             HYPRE_Complex *values );
+HYPRE_Int HYPRE_StructMatrixAddToConstantValues ( HYPRE_StructMatrix matrix,
+                                                  HYPRE_Int num_stencil_indices, HYPRE_Int *stencil_indices, HYPRE_Complex *values );
 HYPRE_Int HYPRE_StructMatrixAssemble ( HYPRE_StructMatrix matrix );
-HYPRE_Int HYPRE_StructMatrixSetNumGhost ( HYPRE_StructMatrix matrix , HYPRE_Int *num_ghost );
-HYPRE_Int HYPRE_StructMatrixGetGrid ( HYPRE_StructMatrix matrix , HYPRE_StructGrid *grid );
-HYPRE_Int HYPRE_StructMatrixSetSymmetric ( HYPRE_StructMatrix matrix , HYPRE_Int symmetric );
-HYPRE_Int HYPRE_StructMatrixSetConstantEntries ( HYPRE_StructMatrix matrix , HYPRE_Int nentries , HYPRE_Int *entries );
-HYPRE_Int HYPRE_StructMatrixPrint ( const char *filename , HYPRE_StructMatrix matrix , HYPRE_Int all );
-HYPRE_Int HYPRE_StructMatrixMatvec ( HYPRE_Complex alpha , HYPRE_StructMatrix A , HYPRE_StructVector x , HYPRE_Complex beta , HYPRE_StructVector y );
+HYPRE_Int HYPRE_StructMatrixSetNumGhost ( HYPRE_StructMatrix matrix, HYPRE_Int *num_ghost );
+HYPRE_Int HYPRE_StructMatrixGetGrid ( HYPRE_StructMatrix matrix, HYPRE_StructGrid *grid );
+HYPRE_Int HYPRE_StructMatrixSetSymmetric ( HYPRE_StructMatrix matrix, HYPRE_Int symmetric );
+HYPRE_Int HYPRE_StructMatrixSetConstantEntries ( HYPRE_StructMatrix matrix, HYPRE_Int nentries,
+                                                 HYPRE_Int *entries );
+HYPRE_Int HYPRE_StructMatrixPrint ( const char *filename, HYPRE_StructMatrix matrix,
+                                    HYPRE_Int all );
+HYPRE_Int HYPRE_StructMatrixMatvec ( HYPRE_Complex alpha, HYPRE_StructMatrix A,
+                                     HYPRE_StructVector x, HYPRE_Complex beta, HYPRE_StructVector y );
 HYPRE_Int HYPRE_StructMatrixClearBoundary( HYPRE_StructMatrix matrix );
 
 /* HYPRE_struct_stencil.c */
-HYPRE_Int HYPRE_StructStencilCreate ( HYPRE_Int dim , HYPRE_Int size , HYPRE_StructStencil *stencil );
-HYPRE_Int HYPRE_StructStencilSetElement ( HYPRE_StructStencil stencil , HYPRE_Int element_index , HYPRE_Int *offset );
+HYPRE_Int HYPRE_StructStencilCreate ( HYPRE_Int dim, HYPRE_Int size, HYPRE_StructStencil *stencil );
+HYPRE_Int HYPRE_StructStencilSetElement ( HYPRE_StructStencil stencil, HYPRE_Int element_index,
+                                          HYPRE_Int *offset );
 HYPRE_Int HYPRE_StructStencilDestroy ( HYPRE_StructStencil stencil );
 
 /* HYPRE_struct_vector.c */
-HYPRE_Int HYPRE_StructVectorCreate ( MPI_Comm comm , HYPRE_StructGrid grid , HYPRE_StructVector *vector );
+HYPRE_Int HYPRE_StructVectorCreate ( MPI_Comm comm, HYPRE_StructGrid grid,
+                                     HYPRE_StructVector *vector );
 HYPRE_Int HYPRE_StructVectorDestroy ( HYPRE_StructVector struct_vector );
 HYPRE_Int HYPRE_StructVectorInitialize ( HYPRE_StructVector vector );
-HYPRE_Int HYPRE_StructVectorSetValues ( HYPRE_StructVector vector , HYPRE_Int *grid_index , HYPRE_Complex values );
-HYPRE_Int HYPRE_StructVectorSetBoxValues ( HYPRE_StructVector vector , HYPRE_Int *ilower , HYPRE_Int *iupper , HYPRE_Complex *values );
-HYPRE_Int HYPRE_StructVectorAddToValues ( HYPRE_StructVector vector , HYPRE_Int *grid_index , HYPRE_Complex values );
-HYPRE_Int HYPRE_StructVectorAddToBoxValues ( HYPRE_StructVector vector , HYPRE_Int *ilower , HYPRE_Int *iupper , HYPRE_Complex *values );
-HYPRE_Int HYPRE_StructVectorScaleValues ( HYPRE_StructVector vector , HYPRE_Complex factor );
-HYPRE_Int HYPRE_StructVectorGetValues ( HYPRE_StructVector vector , HYPRE_Int *grid_index , HYPRE_Complex *values );
-HYPRE_Int HYPRE_StructVectorGetBoxValues ( HYPRE_StructVector vector , HYPRE_Int *ilower , HYPRE_Int *iupper , HYPRE_Complex *values );
+HYPRE_Int HYPRE_StructVectorSetValues ( HYPRE_StructVector vector, HYPRE_Int *grid_index,
+                                        HYPRE_Complex values );
+HYPRE_Int HYPRE_StructVectorSetBoxValues ( HYPRE_StructVector vector, HYPRE_Int *ilower,
+                                           HYPRE_Int *iupper, HYPRE_Complex *values );
+HYPRE_Int HYPRE_StructVectorAddToValues ( HYPRE_StructVector vector, HYPRE_Int *grid_index,
+                                          HYPRE_Complex values );
+HYPRE_Int HYPRE_StructVectorAddToBoxValues ( HYPRE_StructVector vector, HYPRE_Int *ilower,
+                                             HYPRE_Int *iupper, HYPRE_Complex *values );
+HYPRE_Int HYPRE_StructVectorScaleValues ( HYPRE_StructVector vector, HYPRE_Complex factor );
+HYPRE_Int HYPRE_StructVectorGetValues ( HYPRE_StructVector vector, HYPRE_Int *grid_index,
+                                        HYPRE_Complex *values );
+HYPRE_Int HYPRE_StructVectorGetBoxValues ( HYPRE_StructVector vector, HYPRE_Int *ilower,
+                                           HYPRE_Int *iupper, HYPRE_Complex *values );
 HYPRE_Int HYPRE_StructVectorAssemble ( HYPRE_StructVector vector );
-HYPRE_Int HYPRE_StructVectorPrint ( const char *filename , HYPRE_StructVector vector , HYPRE_Int all );
-HYPRE_Int HYPRE_StructVectorSetNumGhost ( HYPRE_StructVector vector , HYPRE_Int *num_ghost );
-HYPRE_Int HYPRE_StructVectorCopy ( HYPRE_StructVector x , HYPRE_StructVector y );
-HYPRE_Int HYPRE_StructVectorSetConstantValues ( HYPRE_StructVector vector , HYPRE_Complex values );
-HYPRE_Int HYPRE_StructVectorGetMigrateCommPkg ( HYPRE_StructVector from_vector , HYPRE_StructVector to_vector , HYPRE_CommPkg *comm_pkg );
-HYPRE_Int HYPRE_StructVectorMigrate ( HYPRE_CommPkg comm_pkg , HYPRE_StructVector from_vector , HYPRE_StructVector to_vector );
+HYPRE_Int hypre_StructVectorPrintData ( FILE *file, hypre_StructVector *vector, HYPRE_Int all );
+HYPRE_Int hypre_StructVectorReadData ( FILE *file, hypre_StructVector *vector );
+HYPRE_Int HYPRE_StructVectorPrint ( const char *filename, HYPRE_StructVector vector,
+                                    HYPRE_Int all );
+HYPRE_Int HYPRE_StructVectorRead ( MPI_Comm comm, const char *filename,
+                                   HYPRE_Int *num_ghost, HYPRE_StructVector *vector );
+HYPRE_Int HYPRE_StructVectorSetNumGhost ( HYPRE_StructVector vector, HYPRE_Int *num_ghost );
+HYPRE_Int HYPRE_StructVectorCopy ( HYPRE_StructVector x, HYPRE_StructVector y );
+HYPRE_Int HYPRE_StructVectorSetConstantValues ( HYPRE_StructVector vector, HYPRE_Complex values );
+HYPRE_Int HYPRE_StructVectorGetMigrateCommPkg ( HYPRE_StructVector from_vector,
+                                                HYPRE_StructVector to_vector, HYPRE_CommPkg *comm_pkg );
+HYPRE_Int HYPRE_StructVectorMigrate ( HYPRE_CommPkg comm_pkg, HYPRE_StructVector from_vector,
+                                      HYPRE_StructVector to_vector );
 HYPRE_Int HYPRE_CommPkgDestroy ( HYPRE_CommPkg comm_pkg );
 
 /* project.c */
-HYPRE_Int hypre_ProjectBox ( hypre_Box *box , hypre_Index index , hypre_Index stride );
-HYPRE_Int hypre_ProjectBoxArray ( hypre_BoxArray *box_array , hypre_Index index , hypre_Index stride );
-HYPRE_Int hypre_ProjectBoxArrayArray ( hypre_BoxArrayArray *box_array_array , hypre_Index index , hypre_Index stride );
+HYPRE_Int hypre_ProjectBox ( hypre_Box *box, hypre_Index index, hypre_Index stride );
+HYPRE_Int hypre_ProjectBoxArray ( hypre_BoxArray *box_array, hypre_Index index,
+                                  hypre_Index stride );
+HYPRE_Int hypre_ProjectBoxArrayArray ( hypre_BoxArrayArray *box_array_array, hypre_Index index,
+                                       hypre_Index stride );
 
 /* struct_axpy.c */
-HYPRE_Int hypre_StructAxpy ( HYPRE_Complex alpha , hypre_StructVector *x , hypre_StructVector *y );
+HYPRE_Int hypre_StructAxpy ( HYPRE_Complex alpha, hypre_StructVector *x, hypre_StructVector *y );
 
 /* struct_communication.c */
-HYPRE_Int hypre_CommPkgCreate ( hypre_CommInfo *comm_info , hypre_BoxArray *send_data_space , hypre_BoxArray *recv_data_space , HYPRE_Int num_values , HYPRE_Int **orders , HYPRE_Int reverse , MPI_Comm comm , hypre_CommPkg **comm_pkg_ptr );
-HYPRE_Int hypre_CommTypeSetEntries ( hypre_CommType *comm_type , HYPRE_Int *boxnums , hypre_Box *boxes , hypre_Index stride , hypre_Index coord , hypre_Index dir , HYPRE_Int *order , hypre_BoxArray *data_space , HYPRE_Int *data_offsets );
-HYPRE_Int hypre_CommTypeSetEntry ( hypre_Box *box , hypre_Index stride , hypre_Index coord , hypre_Index dir , HYPRE_Int *order , hypre_Box *data_box , HYPRE_Int data_box_offset , hypre_CommEntryType *comm_entry );
-HYPRE_Int hypre_InitializeCommunication ( hypre_CommPkg *comm_pkg , HYPRE_Complex *send_data , HYPRE_Complex *recv_data , HYPRE_Int action , HYPRE_Int tag , hypre_CommHandle **comm_handle_ptr );
+HYPRE_Int hypre_CommPkgCreate ( hypre_CommInfo *comm_info, hypre_BoxArray *send_data_space,
+                                hypre_BoxArray *recv_data_space, HYPRE_Int num_values, HYPRE_Int **orders, HYPRE_Int reverse,
+                                MPI_Comm comm, hypre_CommPkg **comm_pkg_ptr );
+HYPRE_Int hypre_CommTypeSetEntries ( hypre_CommType *comm_type, HYPRE_Int *boxnums,
+                                     hypre_Box *boxes, hypre_Index stride, hypre_Index coord, hypre_Index dir, HYPRE_Int *order,
+                                     hypre_BoxArray *data_space, HYPRE_Int *data_offsets );
+HYPRE_Int hypre_CommTypeSetEntry ( hypre_Box *box, hypre_Index stride, hypre_Index coord,
+                                   hypre_Index dir, HYPRE_Int *order, hypre_Box *data_box, HYPRE_Int data_box_offset,
+                                   hypre_CommEntryType *comm_entry );
+HYPRE_Int hypre_InitializeCommunication ( hypre_CommPkg *comm_pkg, HYPRE_Complex *send_data,
+                                          HYPRE_Complex *recv_data, HYPRE_Int action, HYPRE_Int tag, hypre_CommHandle **comm_handle_ptr );
 HYPRE_Int hypre_FinalizeCommunication ( hypre_CommHandle *comm_handle );
-HYPRE_Int hypre_ExchangeLocalData ( hypre_CommPkg *comm_pkg , HYPRE_Complex *send_data , HYPRE_Complex *recv_data , HYPRE_Int action );
+HYPRE_Int hypre_ExchangeLocalData ( hypre_CommPkg *comm_pkg, HYPRE_Complex *send_data,
+                                    HYPRE_Complex *recv_data, HYPRE_Int action );
 HYPRE_Int hypre_CommPkgDestroy ( hypre_CommPkg *comm_pkg );
 
 /* struct_copy.c */
-HYPRE_Int hypre_StructCopy ( hypre_StructVector *x , hypre_StructVector *y );
-HYPRE_Int hypre_StructPartialCopy ( hypre_StructVector *x , hypre_StructVector *y , hypre_BoxArrayArray *array_boxes );
+HYPRE_Int hypre_StructCopy ( hypre_StructVector *x, hypre_StructVector *y );
+HYPRE_Int hypre_StructPartialCopy ( hypre_StructVector *x, hypre_StructVector *y,
+                                    hypre_BoxArrayArray *array_boxes );
 
 /* struct_grid.c */
-HYPRE_Int hypre_StructGridCreate ( MPI_Comm comm , HYPRE_Int dim , hypre_StructGrid **grid_ptr );
-HYPRE_Int hypre_StructGridRef ( hypre_StructGrid *grid , hypre_StructGrid **grid_ref );
+HYPRE_Int hypre_StructGridCreate ( MPI_Comm comm, HYPRE_Int dim, hypre_StructGrid **grid_ptr );
+HYPRE_Int hypre_StructGridRef ( hypre_StructGrid *grid, hypre_StructGrid **grid_ref );
 HYPRE_Int hypre_StructGridDestroy ( hypre_StructGrid *grid );
-HYPRE_Int hypre_StructGridSetPeriodic ( hypre_StructGrid *grid , hypre_Index periodic );
-HYPRE_Int hypre_StructGridSetExtents ( hypre_StructGrid *grid , hypre_Index ilower , hypre_Index iupper );
-HYPRE_Int hypre_StructGridSetBoxes ( hypre_StructGrid *grid , hypre_BoxArray *boxes );
-HYPRE_Int hypre_StructGridSetBoundingBox ( hypre_StructGrid *grid , hypre_Box *new_bb );
-HYPRE_Int hypre_StructGridSetIDs ( hypre_StructGrid *grid , HYPRE_Int *ids );
-HYPRE_Int hypre_StructGridSetBoxManager ( hypre_StructGrid *grid , hypre_BoxManager *boxman );
-HYPRE_Int hypre_StructGridSetMaxDistance ( hypre_StructGrid *grid , hypre_Index dist );
+HYPRE_Int hypre_StructGridSetPeriodic ( hypre_StructGrid *grid, hypre_Index periodic );
+HYPRE_Int hypre_StructGridSetExtents ( hypre_StructGrid *grid, hypre_Index ilower,
+                                       hypre_Index iupper );
+HYPRE_Int hypre_StructGridSetBoxes ( hypre_StructGrid *grid, hypre_BoxArray *boxes );
+HYPRE_Int hypre_StructGridSetBoundingBox ( hypre_StructGrid *grid, hypre_Box *new_bb );
+HYPRE_Int hypre_StructGridSetIDs ( hypre_StructGrid *grid, HYPRE_Int *ids );
+HYPRE_Int hypre_StructGridSetBoxManager ( hypre_StructGrid *grid, hypre_BoxManager *boxman );
+HYPRE_Int hypre_StructGridSetMaxDistance ( hypre_StructGrid *grid, hypre_Index dist );
 HYPRE_Int hypre_StructGridAssemble ( hypre_StructGrid *grid );
-HYPRE_Int hypre_GatherAllBoxes ( MPI_Comm comm , hypre_BoxArray *boxes , HYPRE_Int dim , hypre_BoxArray **all_boxes_ptr , HYPRE_Int **all_procs_ptr , HYPRE_Int *first_local_ptr );
-HYPRE_Int hypre_ComputeBoxnums ( hypre_BoxArray *boxes , HYPRE_Int *procs , HYPRE_Int **boxnums_ptr );
-HYPRE_Int hypre_StructGridPrint ( FILE *file , hypre_StructGrid *grid );
-HYPRE_Int hypre_StructGridRead ( MPI_Comm comm , FILE *file , hypre_StructGrid **grid_ptr );
-HYPRE_Int hypre_StructGridSetNumGhost ( hypre_StructGrid *grid , HYPRE_Int *num_ghost );
+HYPRE_Int hypre_GatherAllBoxes ( MPI_Comm comm, hypre_BoxArray *boxes, HYPRE_Int dim,
+                                 hypre_BoxArray **all_boxes_ptr, HYPRE_Int **all_procs_ptr, HYPRE_Int *first_local_ptr );
+HYPRE_Int hypre_ComputeBoxnums ( hypre_BoxArray *boxes, HYPRE_Int *procs, HYPRE_Int **boxnums_ptr );
+HYPRE_Int hypre_StructGridPrint ( FILE *file, hypre_StructGrid *grid );
+HYPRE_Int hypre_StructGridRead ( MPI_Comm comm, FILE *file, hypre_StructGrid **grid_ptr );
+HYPRE_Int hypre_StructGridSetNumGhost ( hypre_StructGrid *grid, HYPRE_Int *num_ghost );
+HYPRE_Int hypre_StructGridGetMaxBoxSize ( hypre_StructGrid *grid );
 #if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-HYPRE_Int hypre_StructGridGetMaxBoxSize(hypre_StructGrid *grid);
-HYPRE_Int hypre_StructGridSetDataLocation( HYPRE_StructGrid grid, HYPRE_MemoryLocation data_location );
+HYPRE_Int hypre_StructGridSetDataLocation( HYPRE_StructGrid grid,
+                                           HYPRE_MemoryLocation data_location );
 #endif
 /* struct_innerprod.c */
-HYPRE_Real hypre_StructInnerProd ( hypre_StructVector *x , hypre_StructVector *y );
+HYPRE_Real hypre_StructInnerProd ( hypre_StructVector *x, hypre_StructVector *y );
 
 /* struct_io.c */
-HYPRE_Int hypre_PrintBoxArrayData ( FILE *file , hypre_BoxArray *box_array , hypre_BoxArray *data_space , HYPRE_Int num_values , HYPRE_Int dim , HYPRE_Complex *data );
-HYPRE_Int hypre_PrintCCVDBoxArrayData ( FILE *file , hypre_BoxArray *box_array , hypre_BoxArray *data_space , HYPRE_Int num_values , HYPRE_Int center_rank , HYPRE_Int stencil_size , HYPRE_Int *symm_elements , HYPRE_Int dim , HYPRE_Complex *data );
-HYPRE_Int hypre_PrintCCBoxArrayData ( FILE *file , hypre_BoxArray *box_array , hypre_BoxArray *data_space , HYPRE_Int num_values , HYPRE_Complex *data );
-HYPRE_Int hypre_ReadBoxArrayData ( FILE *file , hypre_BoxArray *box_array , hypre_BoxArray *data_space , HYPRE_Int num_values , HYPRE_Int dim , HYPRE_Complex *data );
-HYPRE_Int hypre_ReadBoxArrayData_CC ( FILE *file , hypre_BoxArray *box_array , hypre_BoxArray *data_space , HYPRE_Int stencil_size , HYPRE_Int real_stencil_size , HYPRE_Int constant_coefficient , HYPRE_Int dim , HYPRE_Complex *data );
+HYPRE_Int hypre_PrintBoxArrayData ( FILE *file, hypre_BoxArray *box_array,
+                                    hypre_BoxArray *data_space, HYPRE_Int num_values, HYPRE_Int dim, HYPRE_Complex *data );
+HYPRE_Int hypre_PrintCCVDBoxArrayData ( FILE *file, hypre_BoxArray *box_array,
+                                        hypre_BoxArray *data_space, HYPRE_Int num_values, HYPRE_Int center_rank, HYPRE_Int stencil_size,
+                                        HYPRE_Int *symm_elements, HYPRE_Int dim, HYPRE_Complex *data );
+HYPRE_Int hypre_PrintCCBoxArrayData ( FILE *file, hypre_BoxArray *box_array,
+                                      hypre_BoxArray *data_space, HYPRE_Int num_values, HYPRE_Complex *data );
+HYPRE_Int hypre_ReadBoxArrayData ( FILE *file, hypre_BoxArray *box_array,
+                                   hypre_BoxArray *data_space, HYPRE_Int num_values, HYPRE_Int dim, HYPRE_Complex *data );
+HYPRE_Int hypre_ReadBoxArrayData_CC ( FILE *file, hypre_BoxArray *box_array,
+                                      hypre_BoxArray *data_space, HYPRE_Int stencil_size, HYPRE_Int real_stencil_size,
+                                      HYPRE_Int constant_coefficient, HYPRE_Int dim, HYPRE_Complex *data );
 
 /* struct_matrix.c */
-HYPRE_Complex *hypre_StructMatrixExtractPointerByIndex ( hypre_StructMatrix *matrix , HYPRE_Int b , hypre_Index index );
-hypre_StructMatrix *hypre_StructMatrixCreate ( MPI_Comm comm , hypre_StructGrid *grid , hypre_StructStencil *user_stencil );
+HYPRE_Complex *hypre_StructMatrixExtractPointerByIndex ( hypre_StructMatrix *matrix, HYPRE_Int b,
+                                                         hypre_Index index );
+hypre_StructMatrix *hypre_StructMatrixCreate ( MPI_Comm comm, hypre_StructGrid *grid,
+                                               hypre_StructStencil *user_stencil );
 hypre_StructMatrix *hypre_StructMatrixRef ( hypre_StructMatrix *matrix );
 HYPRE_Int hypre_StructMatrixDestroy ( hypre_StructMatrix *matrix );
 HYPRE_Int hypre_StructMatrixInitializeShell ( hypre_StructMatrix *matrix );
-HYPRE_Int hypre_StructMatrixInitializeData ( hypre_StructMatrix *matrix , HYPRE_Complex *data ,HYPRE_Complex *data_const);
+HYPRE_Int hypre_StructMatrixInitializeData ( hypre_StructMatrix *matrix, HYPRE_Complex *data,
+                                             HYPRE_Complex *data_const);
 HYPRE_Int hypre_StructMatrixInitialize ( hypre_StructMatrix *matrix );
-HYPRE_Int hypre_StructMatrixSetValues ( hypre_StructMatrix *matrix , hypre_Index grid_index , HYPRE_Int num_stencil_indices , HYPRE_Int *stencil_indices , HYPRE_Complex *values , HYPRE_Int action , HYPRE_Int boxnum , HYPRE_Int outside );
-HYPRE_Int hypre_StructMatrixSetBoxValues ( hypre_StructMatrix *matrix , hypre_Box *set_box , hypre_Box *value_box , HYPRE_Int num_stencil_indices , HYPRE_Int *stencil_indices , HYPRE_Complex *values , HYPRE_Int action , HYPRE_Int boxnum , HYPRE_Int outside );
-HYPRE_Int hypre_StructMatrixSetConstantValues ( hypre_StructMatrix *matrix , HYPRE_Int num_stencil_indices , HYPRE_Int *stencil_indices , HYPRE_Complex *values , HYPRE_Int action );
-HYPRE_Int hypre_StructMatrixClearValues ( hypre_StructMatrix *matrix , hypre_Index grid_index , HYPRE_Int num_stencil_indices , HYPRE_Int *stencil_indices , HYPRE_Int boxnum , HYPRE_Int outside );
-HYPRE_Int hypre_StructMatrixClearBoxValues ( hypre_StructMatrix *matrix , hypre_Box *clear_box , HYPRE_Int num_stencil_indices , HYPRE_Int *stencil_indices , HYPRE_Int boxnum , HYPRE_Int outside );
+HYPRE_Int hypre_StructMatrixSetValues ( hypre_StructMatrix *matrix, hypre_Index grid_index,
+                                        HYPRE_Int num_stencil_indices, HYPRE_Int *stencil_indices, HYPRE_Complex *values, HYPRE_Int action,
+                                        HYPRE_Int boxnum, HYPRE_Int outside );
+HYPRE_Int hypre_StructMatrixSetBoxValues ( hypre_StructMatrix *matrix, hypre_Box *set_box,
+                                           hypre_Box *value_box, HYPRE_Int num_stencil_indices, HYPRE_Int *stencil_indices,
+                                           HYPRE_Complex *values, HYPRE_Int action, HYPRE_Int boxnum, HYPRE_Int outside );
+HYPRE_Int hypre_StructMatrixSetConstantValues ( hypre_StructMatrix *matrix,
+                                                HYPRE_Int num_stencil_indices, HYPRE_Int *stencil_indices, HYPRE_Complex *values,
+                                                HYPRE_Int action );
+HYPRE_Int hypre_StructMatrixClearValues ( hypre_StructMatrix *matrix, hypre_Index grid_index,
+                                          HYPRE_Int num_stencil_indices, HYPRE_Int *stencil_indices, HYPRE_Int boxnum, HYPRE_Int outside );
+HYPRE_Int hypre_StructMatrixClearBoxValues ( hypre_StructMatrix *matrix, hypre_Box *clear_box,
+                                             HYPRE_Int num_stencil_indices, HYPRE_Int *stencil_indices, HYPRE_Int boxnum, HYPRE_Int outside );
 HYPRE_Int hypre_StructMatrixAssemble ( hypre_StructMatrix *matrix );
-HYPRE_Int hypre_StructMatrixSetNumGhost ( hypre_StructMatrix *matrix , HYPRE_Int *num_ghost );
-HYPRE_Int hypre_StructMatrixSetConstantCoefficient ( hypre_StructMatrix *matrix , HYPRE_Int constant_coefficient );
-HYPRE_Int hypre_StructMatrixSetConstantEntries ( hypre_StructMatrix *matrix , HYPRE_Int nentries , HYPRE_Int *entries );
+HYPRE_Int hypre_StructMatrixSetNumGhost ( hypre_StructMatrix *matrix, HYPRE_Int *num_ghost );
+HYPRE_Int hypre_StructMatrixSetConstantCoefficient ( hypre_StructMatrix *matrix,
+                                                     HYPRE_Int constant_coefficient );
+HYPRE_Int hypre_StructMatrixSetConstantEntries ( hypre_StructMatrix *matrix, HYPRE_Int nentries,
+                                                 HYPRE_Int *entries );
 HYPRE_Int hypre_StructMatrixClearGhostValues ( hypre_StructMatrix *matrix );
-HYPRE_Int hypre_StructMatrixPrint ( const char *filename , hypre_StructMatrix *matrix , HYPRE_Int all );
-HYPRE_Int hypre_StructMatrixMigrate ( hypre_StructMatrix *from_matrix , hypre_StructMatrix *to_matrix );
-hypre_StructMatrix *hypre_StructMatrixRead ( MPI_Comm comm , const char *filename , HYPRE_Int *num_ghost );
+HYPRE_Int hypre_StructMatrixPrintData ( FILE *file, hypre_StructMatrix *matrix, HYPRE_Int all );
+HYPRE_Int hypre_StructMatrixReadData ( FILE *file, hypre_StructMatrix *matrix );
+HYPRE_Int hypre_StructMatrixPrint ( const char *filename, hypre_StructMatrix *matrix,
+                                    HYPRE_Int all );
+hypre_StructMatrix *hypre_StructMatrixRead ( MPI_Comm comm, const char *filename,
+                                             HYPRE_Int *num_ghost );
+HYPRE_Int hypre_StructMatrixMigrate ( hypre_StructMatrix *from_matrix,
+                                      hypre_StructMatrix *to_matrix );
 HYPRE_Int hypre_StructMatrixClearBoundary( hypre_StructMatrix *matrix);
 
 /* struct_matrix_mask.c */
-hypre_StructMatrix *hypre_StructMatrixCreateMask ( hypre_StructMatrix *matrix , HYPRE_Int num_stencil_indices , HYPRE_Int *stencil_indices );
+hypre_StructMatrix *hypre_StructMatrixCreateMask ( hypre_StructMatrix *matrix,
+                                                   HYPRE_Int num_stencil_indices, HYPRE_Int *stencil_indices );
 
 /* struct_matvec.c */
 void *hypre_StructMatvecCreate ( void );
-HYPRE_Int hypre_StructMatvecSetup ( void *matvec_vdata , hypre_StructMatrix *A , hypre_StructVector *x );
-HYPRE_Int hypre_StructMatvecCompute ( void *matvec_vdata , HYPRE_Complex alpha , hypre_StructMatrix *A , hypre_StructVector *x , HYPRE_Complex beta , hypre_StructVector *y );
-HYPRE_Int hypre_StructMatvecCC0 ( HYPRE_Complex alpha , hypre_StructMatrix *A , hypre_StructVector *x , hypre_StructVector *y , hypre_BoxArrayArray *compute_box_aa , hypre_IndexRef stride );
-HYPRE_Int hypre_StructMatvecCC1 ( HYPRE_Complex alpha , hypre_StructMatrix *A , hypre_StructVector *x , hypre_StructVector *y , hypre_BoxArrayArray *compute_box_aa , hypre_IndexRef stride );
-HYPRE_Int hypre_StructMatvecCC2 ( HYPRE_Complex alpha , hypre_StructMatrix *A , hypre_StructVector *x , hypre_StructVector *y , hypre_BoxArrayArray *compute_box_aa , hypre_IndexRef stride );
+HYPRE_Int hypre_StructMatvecSetup ( void *matvec_vdata, hypre_StructMatrix *A,
+                                    hypre_StructVector *x );
+HYPRE_Int hypre_StructMatvecCompute ( void *matvec_vdata, HYPRE_Complex alpha,
+                                      hypre_StructMatrix *A, hypre_StructVector *x, HYPRE_Complex beta, hypre_StructVector *y );
+HYPRE_Int hypre_StructMatvecCC0 ( HYPRE_Complex alpha, hypre_StructMatrix *A, hypre_StructVector *x,
+                                  hypre_StructVector *y, hypre_BoxArrayArray *compute_box_aa, hypre_IndexRef stride );
+HYPRE_Int hypre_StructMatvecCC1 ( HYPRE_Complex alpha, hypre_StructMatrix *A, hypre_StructVector *x,
+                                  hypre_StructVector *y, hypre_BoxArrayArray *compute_box_aa, hypre_IndexRef stride );
+HYPRE_Int hypre_StructMatvecCC2 ( HYPRE_Complex alpha, hypre_StructMatrix *A, hypre_StructVector *x,
+                                  hypre_StructVector *y, hypre_BoxArrayArray *compute_box_aa, hypre_IndexRef stride );
 HYPRE_Int hypre_StructMatvecDestroy ( void *matvec_vdata );
-HYPRE_Int hypre_StructMatvec ( HYPRE_Complex alpha , hypre_StructMatrix *A , hypre_StructVector *x , HYPRE_Complex beta , hypre_StructVector *y );
+HYPRE_Int hypre_StructMatvec ( HYPRE_Complex alpha, hypre_StructMatrix *A, hypre_StructVector *x,
+                               HYPRE_Complex beta, hypre_StructVector *y );
 
 /* struct_scale.c */
-HYPRE_Int hypre_StructScale ( HYPRE_Complex alpha , hypre_StructVector *y );
+HYPRE_Int hypre_StructScale ( HYPRE_Complex alpha, hypre_StructVector *y );
 
 /* struct_stencil.c */
-hypre_StructStencil *hypre_StructStencilCreate ( HYPRE_Int dim , HYPRE_Int size , hypre_Index *shape );
+hypre_StructStencil *hypre_StructStencilCreate ( HYPRE_Int dim, HYPRE_Int size,
+                                                 hypre_Index *shape );
 hypre_StructStencil *hypre_StructStencilRef ( hypre_StructStencil *stencil );
 HYPRE_Int hypre_StructStencilDestroy ( hypre_StructStencil *stencil );
-HYPRE_Int hypre_StructStencilElementRank ( hypre_StructStencil *stencil , hypre_Index stencil_element );
-HYPRE_Int hypre_StructStencilSymmetrize ( hypre_StructStencil *stencil , hypre_StructStencil **symm_stencil_ptr , HYPRE_Int **symm_elements_ptr );
+HYPRE_Int hypre_StructStencilElementRank ( hypre_StructStencil *stencil,
+                                           hypre_Index stencil_element );
+HYPRE_Int hypre_StructStencilSymmetrize ( hypre_StructStencil *stencil,
+                                          hypre_StructStencil **symm_stencil_ptr, HYPRE_Int **symm_elements_ptr );
 
 /* struct_vector.c */
-hypre_StructVector *hypre_StructVectorCreate ( MPI_Comm comm , hypre_StructGrid *grid );
+hypre_StructVector *hypre_StructVectorCreate ( MPI_Comm comm, hypre_StructGrid *grid );
 hypre_StructVector *hypre_StructVectorRef ( hypre_StructVector *vector );
 HYPRE_Int hypre_StructVectorDestroy ( hypre_StructVector *vector );
 HYPRE_Int hypre_StructVectorInitializeShell ( hypre_StructVector *vector );
-HYPRE_Int hypre_StructVectorInitializeData ( hypre_StructVector *vector , HYPRE_Complex *data);
+HYPRE_Int hypre_StructVectorInitializeData ( hypre_StructVector *vector, HYPRE_Complex *data);
 HYPRE_Int hypre_StructVectorInitialize ( hypre_StructVector *vector );
-HYPRE_Int hypre_StructVectorSetValues ( hypre_StructVector *vector , hypre_Index grid_index , HYPRE_Complex *values , HYPRE_Int action , HYPRE_Int boxnum , HYPRE_Int outside );
-HYPRE_Int hypre_StructVectorSetBoxValues ( hypre_StructVector *vector , hypre_Box *set_box , hypre_Box *value_box , HYPRE_Complex *values , HYPRE_Int action , HYPRE_Int boxnum , HYPRE_Int outside );
-HYPRE_Int hypre_StructVectorClearValues ( hypre_StructVector *vector , hypre_Index grid_index , HYPRE_Int boxnum , HYPRE_Int outside );
-HYPRE_Int hypre_StructVectorClearBoxValues ( hypre_StructVector *vector , hypre_Box *clear_box , HYPRE_Int boxnum , HYPRE_Int outside );
+HYPRE_Int hypre_StructVectorSetValues ( hypre_StructVector *vector, hypre_Index grid_index,
+                                        HYPRE_Complex *values, HYPRE_Int action, HYPRE_Int boxnum, HYPRE_Int outside );
+HYPRE_Int hypre_StructVectorSetBoxValues ( hypre_StructVector *vector, hypre_Box *set_box,
+                                           hypre_Box *value_box, HYPRE_Complex *values, HYPRE_Int action, HYPRE_Int boxnum,
+                                           HYPRE_Int outside );
+HYPRE_Int hypre_StructVectorClearValues ( hypre_StructVector *vector, hypre_Index grid_index,
+                                          HYPRE_Int boxnum, HYPRE_Int outside );
+HYPRE_Int hypre_StructVectorClearBoxValues ( hypre_StructVector *vector, hypre_Box *clear_box,
+                                             HYPRE_Int boxnum, HYPRE_Int outside );
 HYPRE_Int hypre_StructVectorClearAllValues ( hypre_StructVector *vector );
-HYPRE_Int hypre_StructVectorSetNumGhost ( hypre_StructVector *vector , HYPRE_Int *num_ghost );
-HYPRE_Int hypre_StructVectorSetDataSize(hypre_StructVector *vector , HYPRE_Int *data_size, HYPRE_Int *data_host_size);
+HYPRE_Int hypre_StructVectorSetNumGhost ( hypre_StructVector *vector, HYPRE_Int *num_ghost );
+HYPRE_Int hypre_StructVectorSetDataSize(hypre_StructVector *vector, HYPRE_Int *data_size,
+                                        HYPRE_Int *data_host_size);
 HYPRE_Int hypre_StructVectorAssemble ( hypre_StructVector *vector );
-HYPRE_Int hypre_StructVectorCopy ( hypre_StructVector *x , hypre_StructVector *y );
-HYPRE_Int hypre_StructVectorSetConstantValues ( hypre_StructVector *vector , HYPRE_Complex values );
-HYPRE_Int hypre_StructVectorSetFunctionValues ( hypre_StructVector *vector , HYPRE_Complex (*fcn )());
+HYPRE_Int hypre_StructVectorCopy ( hypre_StructVector *x, hypre_StructVector *y );
+HYPRE_Int hypre_StructVectorSetConstantValues ( hypre_StructVector *vector, HYPRE_Complex values );
+HYPRE_Int hypre_StructVectorSetFunctionValues ( hypre_StructVector *vector,
+                                                HYPRE_Complex (*fcn )( HYPRE_Int, HYPRE_Int, HYPRE_Int ));
 HYPRE_Int hypre_StructVectorClearGhostValues ( hypre_StructVector *vector );
-HYPRE_Int hypre_StructVectorClearBoundGhostValues ( hypre_StructVector *vector , HYPRE_Int force );
-HYPRE_Int hypre_StructVectorScaleValues ( hypre_StructVector *vector , HYPRE_Complex factor );
-hypre_CommPkg *hypre_StructVectorGetMigrateCommPkg ( hypre_StructVector *from_vector , hypre_StructVector *to_vector );
-HYPRE_Int hypre_StructVectorMigrate ( hypre_CommPkg *comm_pkg , hypre_StructVector *from_vector , hypre_StructVector *to_vector );
-HYPRE_Int hypre_StructVectorPrint ( const char *filename , hypre_StructVector *vector , HYPRE_Int all );
-hypre_StructVector *hypre_StructVectorRead ( MPI_Comm comm , const char *filename , HYPRE_Int *num_ghost );
+HYPRE_Int hypre_StructVectorClearBoundGhostValues ( hypre_StructVector *vector, HYPRE_Int force );
+HYPRE_Int hypre_StructVectorScaleValues ( hypre_StructVector *vector, HYPRE_Complex factor );
+hypre_CommPkg *hypre_StructVectorGetMigrateCommPkg ( hypre_StructVector *from_vector,
+                                                     hypre_StructVector *to_vector );
+HYPRE_Int hypre_StructVectorMigrate ( hypre_CommPkg *comm_pkg, hypre_StructVector *from_vector,
+                                      hypre_StructVector *to_vector );
+HYPRE_Int hypre_StructVectorPrint ( const char *filename, hypre_StructVector *vector,
+                                    HYPRE_Int all );
+hypre_StructVector *hypre_StructVectorRead ( MPI_Comm comm, const char *filename,
+                                             HYPRE_Int *num_ghost );
 hypre_StructVector *hypre_StructVectorClone ( hypre_StructVector *vector );
-
-#if defined(HYPRE_USING_DEVICE_OPENMP)
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -1926,8 +1782,10 @@ hypre_StructVector *hypre_StructVectorClone ( hypre_StructVector *vector );
  * BoxLoop macros:
  *--------------------------------------------------------------------------*/
 
-#ifndef HYPRE_NEWBOXLOOP_HEADER
-#define HYPRE_NEWBOXLOOP_HEADER
+#ifndef HYPRE_BOXLOOP_DEVICEOMP_HEADER
+#define HYPRE_BOXLOOP_DEVICEOMP_HEADER
+
+#if defined(HYPRE_USING_DEVICE_OPENMP) && !defined(HYPRE_USING_RAJA) && !defined(HYPRE_USING_KOKKOS)
 
 #include "omp.h"
 
@@ -1944,7 +1802,7 @@ hypre_StructVector *hypre_StructVectorClone ( hypre_StructVector *vector );
 
 #ifndef AUTO_OMP_TEAM
 /* omp team size (aka. gpu block size) */
-#define hypre_gpu_block_size 512
+#define hypre_gpu_block_size HYPRE_1D_BLOCK_SIZE
 /* the max number of omp teams */
 #define hypre_max_num_blocks 1000000
 #endif
@@ -1979,7 +1837,7 @@ hypre_StructVector *hypre_StructVectorClone ( hypre_StructVector *vector );
 #define hypre_BoxLoop3End    zypre_omp4_dist_BoxLoopEnd
 #define hypre_BoxLoop4Begin  zypre_omp4_dist_BoxLoop4Begin
 #define hypre_BoxLoop4End    zypre_omp4_dist_BoxLoopEnd
-#define hypre_LoopBegin      zypre_LoopBegin
+#define hypre_LoopBegin      zypre_omp4_dist_LoopBegin
 #define hypre_LoopEnd        zypre_omp4_dist_BoxLoopEnd
 
 /* Look for more in struct_ls/red_black_gs.h" */
@@ -2442,7 +2300,7 @@ hypre__J = hypre__thread;  i1 = i2 = 0; \
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  * Basic Loop
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/
-#define zypre_LoopBegin(size, idx) \
+#define zypre_omp4_dist_LoopBegin(size, idx) \
 { \
    /* host code: */ \
    /* HYPRE_Int idx = 0; */\
@@ -2453,14 +2311,6 @@ hypre__J = hypre__thread;  i1 = i2 = 0; \
    for (HYPRE_Int idx = 0; idx < hypre__tot; idx++) \
    {
 
-#if 0
-#define hypre_LoopBegin0(size, idx) \
-{ \
-   HYPRE_Int idx, hypre__size = size; \
-   for (idx = 0; idx < hypre__size; idx++) \
-   {
-#endif
-
 #define hypre_BoxLoopGetIndex(index) \
   index[0] = hypre__id_0; \
   index[1] = hypre__id_1; \
@@ -2483,10 +2333,10 @@ hypre__J = hypre__thread;  i1 = i2 = 0; \
 
 #endif
 
+#endif /* #ifndef HYPRE_BOXLOOP_DEVICEOMP_HEADER */
 
-#elif !defined(HYPRE_USING_RAJA) && !defined(HYPRE_USING_KOKKOS) && !defined(HYPRE_USING_CUDA) && !defined(HYPRE_USING_HIP)
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -2502,32 +2352,25 @@ hypre__J = hypre__thread;  i1 = i2 = 0; \
  * BoxLoop macros:
  *--------------------------------------------------------------------------*/
 
-#ifndef HYPRE_NEWBOXLOOP_HEADER
-#define HYPRE_NEWBOXLOOP_HEADER
+#ifndef HYPRE_BOXLOOP_HOST_HEADER
+#define HYPRE_BOXLOOP_HOST_HEADER
 
-#ifdef HYPRE_USING_OPENMP
+#if defined(HYPRE_USING_OPENMP)
 #define HYPRE_BOX_REDUCTION
+#define HYPRE_OMP_CLAUSE
 #if defined(WIN32) && defined(_MSC_VER)
-#define Pragma(x) __pragma(HYPRE_XSTR(x))
+#define Pragma(x) __pragma(x)
 #else
 #define Pragma(x) _Pragma(HYPRE_XSTR(x))
 #endif
-#define OMP0 Pragma(omp parallel for HYPRE_BOX_REDUCTION HYPRE_SMP_SCHEDULE)
-#define OMP1 Pragma(omp parallel for private(HYPRE_BOX_PRIVATE) HYPRE_BOX_REDUCTION HYPRE_SMP_SCHEDULE)
-#else /* #ifdef HYPRE_USING_OPENMP */
+#define OMP0 Pragma(omp parallel for HYPRE_OMP_CLAUSE HYPRE_BOX_REDUCTION HYPRE_SMP_SCHEDULE)
+#define OMP1 Pragma(omp parallel for private(HYPRE_BOX_PRIVATE) HYPRE_OMP_CLAUSE HYPRE_BOX_REDUCTION HYPRE_SMP_SCHEDULE)
+#else /* #if defined(HYPRE_USING_OPENMP) */
 #define OMP0
 #define OMP1
-#endif /* #ifdef HYPRE_USING_OPENMP */
-
-typedef struct hypre_Boxloop_struct
-{
-   HYPRE_Int lsize0,lsize1,lsize2;
-   HYPRE_Int strides0,strides1,strides2;
-   HYPRE_Int bstart0,bstart1,bstart2;
-   HYPRE_Int bsize0,bsize1,bsize2;
-} hypre_Boxloop;
+#endif /* #if defined(HYPRE_USING_OPENMP) */
 
-#define zypre_newBoxLoop0Begin(ndim, loop_size)                               \
+#define zypre_BoxLoop0Begin(ndim, loop_size)                                  \
 {                                                                             \
    zypre_BoxLoopDeclare();                                                    \
    zypre_BoxLoopInit(ndim, loop_size);                                        \
@@ -2540,7 +2383,7 @@ typedef struct hypre_Boxloop_struct
          for (hypre__I = 0; hypre__I < hypre__IN; hypre__I++)                 \
          {
 
-#define zypre_newBoxLoop0End()                                                \
+#define zypre_BoxLoop0End()                                                   \
          }                                                                    \
          zypre_BoxLoopInc1();                                                 \
          zypre_BoxLoopInc2();                                                 \
@@ -2548,8 +2391,8 @@ typedef struct hypre_Boxloop_struct
    }                                                                          \
 }
 
-#define zypre_newBoxLoop1Begin(ndim, loop_size,                               \
-                               dbox1, start1, stride1, i1)                    \
+#define zypre_BoxLoop1Begin(ndim, loop_size,                                  \
+                            dbox1, start1, stride1, i1)                       \
 {                                                                             \
    HYPRE_Int i1;                                                              \
    zypre_BoxLoopDeclare();                                                    \
@@ -2567,7 +2410,7 @@ typedef struct hypre_Boxloop_struct
          for (hypre__I = 0; hypre__I < hypre__IN; hypre__I++)                 \
          {
 
-#define zypre_newBoxLoop1End(i1)                                              \
+#define zypre_BoxLoop1End(i1)                                                 \
             i1 += hypre__i0inc1;                                              \
          }                                                                    \
          zypre_BoxLoopInc1();                                                 \
@@ -2578,9 +2421,9 @@ typedef struct hypre_Boxloop_struct
 }
 
 
-#define zypre_newBoxLoop2Begin(ndim, loop_size,                               \
-                               dbox1, start1, stride1, i1,                    \
-                               dbox2, start2, stride2, i2)                    \
+#define zypre_BoxLoop2Begin(ndim, loop_size,                                  \
+                            dbox1, start1, stride1, i1,                       \
+                            dbox2, start2, stride2, i2)                       \
 {                                                                             \
    HYPRE_Int i1, i2;                                                          \
    zypre_BoxLoopDeclare();                                                    \
@@ -2601,7 +2444,7 @@ typedef struct hypre_Boxloop_struct
          for (hypre__I = 0; hypre__I < hypre__IN; hypre__I++)                 \
          {
 
-#define zypre_newBoxLoop2End(i1, i2)                                          \
+#define zypre_BoxLoop2End(i1, i2)                                             \
             i1 += hypre__i0inc1;                                              \
             i2 += hypre__i0inc2;                                              \
          }                                                                    \
@@ -2614,10 +2457,10 @@ typedef struct hypre_Boxloop_struct
 }
 
 
-#define zypre_newBoxLoop3Begin(ndim, loop_size,                               \
-                               dbox1, start1, stride1, i1,                    \
-                               dbox2, start2, stride2, i2,                    \
-                               dbox3, start3, stride3, i3)                    \
+#define zypre_BoxLoop3Begin(ndim, loop_size,                                  \
+                            dbox1, start1, stride1, i1,                       \
+                            dbox2, start2, stride2, i2,                       \
+                            dbox3, start3, stride3, i3)                       \
 {                                                                             \
    HYPRE_Int i1, i2, i3;                                                      \
    zypre_BoxLoopDeclare();                                                    \
@@ -2641,7 +2484,7 @@ typedef struct hypre_Boxloop_struct
          for (hypre__I = 0; hypre__I < hypre__IN; hypre__I++)                 \
          {
 
-#define zypre_newBoxLoop3End(i1, i2, i3)                                      \
+#define zypre_BoxLoop3End(i1, i2, i3)                                         \
             i1 += hypre__i0inc1;                                              \
             i2 += hypre__i0inc2;                                              \
             i3 += hypre__i0inc3;                                              \
@@ -2655,7 +2498,7 @@ typedef struct hypre_Boxloop_struct
    }                                                                          \
 }
 
-#define zypre_newBoxLoop4Begin(ndim, loop_size,                               \
+#define zypre_BoxLoop4Begin(ndim, loop_size,                                  \
                             dbox1, start1, stride1, i1,                       \
                             dbox2, start2, stride2, i2,                       \
                             dbox3, start3, stride3, i3,                       \
@@ -2686,7 +2529,7 @@ typedef struct hypre_Boxloop_struct
          for (hypre__I = 0; hypre__I < hypre__IN; hypre__I++)                 \
          {
 
-#define zypre_newBoxLoop4End(i1, i2, i3, i4)                                  \
+#define zypre_BoxLoop4End(i1, i2, i3, i4)                                     \
             i1 += hypre__i0inc1;                                              \
             i2 += hypre__i0inc2;                                              \
             i3 += hypre__i0inc3;                                              \
@@ -2702,9 +2545,27 @@ typedef struct hypre_Boxloop_struct
    }                                                                          \
 }
 
-#define zypre_newBasicBoxLoop2Begin(ndim, loop_size,                          \
-                                    stride1, i1,                              \
-                                    stride2, i2)                              \
+#define zypre_BasicBoxLoop1Begin(ndim, loop_size,                             \
+                                 stride1, i1)                                 \
+{                                                                             \
+   zypre_BoxLoopDeclare();                                                    \
+   zypre_BoxLoopDeclareK(1);                                                  \
+   zypre_BoxLoopInit(ndim, loop_size);                                        \
+   zypre_BasicBoxLoopInitK(1, stride1);                                       \
+   OMP1                                                                       \
+   for (hypre__block = 0; hypre__block < hypre__num_blocks; hypre__block++)   \
+   {                                                                          \
+      HYPRE_Int i1;                                                           \
+      zypre_BoxLoopSet();                                                     \
+      zypre_BoxLoopSetK(1, i1);                                               \
+      for (hypre__J = 0; hypre__J < hypre__JN; hypre__J++)                    \
+      {                                                                       \
+         for (hypre__I = 0; hypre__I < hypre__IN; hypre__I++)                 \
+         {
+
+#define zypre_BasicBoxLoop2Begin(ndim, loop_size,                             \
+                                 stride1, i1,                                 \
+                                 stride2, i2)                                 \
 {                                                                             \
    zypre_BoxLoopDeclare();                                                    \
    zypre_BoxLoopDeclareK(1);                                                  \
@@ -2725,50 +2586,150 @@ typedef struct hypre_Boxloop_struct
          {
 
 
-#define hypre_LoopBegin(size, idx)                                            \
+#define zypre_LoopBegin(size, idx)                                            \
 {                                                                             \
    HYPRE_Int idx;                                                             \
    OMP0                                                                       \
    for (idx = 0; idx < size; idx ++)                                          \
    {
 
-#define hypre_LoopEnd()                                                       \
-  }                                                                           \
+#define zypre_LoopEnd()                                                       \
+   }                                                                          \
 }
 
-#define hypre_BoxLoopGetIndex    zypre_BoxLoopGetIndex
-
-#define hypre_BoxLoopBlock       zypre_BoxLoopBlock
-#define hypre_BoxLoop0Begin      zypre_newBoxLoop0Begin
-#define hypre_BoxLoop0End        zypre_newBoxLoop0End
-#define hypre_BoxLoop1Begin      zypre_newBoxLoop1Begin
-#define hypre_BoxLoop1End        zypre_newBoxLoop1End
-#define hypre_BoxLoop2Begin      zypre_newBoxLoop2Begin
-#define hypre_BoxLoop2End        zypre_newBoxLoop2End
-#define hypre_BoxLoop3Begin      zypre_newBoxLoop3Begin
-#define hypre_BoxLoop3End        zypre_newBoxLoop3End
-#define hypre_BoxLoop4Begin      zypre_newBoxLoop4Begin
-#define hypre_BoxLoop4End        zypre_newBoxLoop4End
-#define hypre_BasicBoxLoop2Begin zypre_newBasicBoxLoop2Begin
+/*--------------------------------------------------------------------------
+ * Serial BoxLoop macros:
+ * [same as the ones above (without OMP and with SetOneBlock)]
+ * TODO: combine them
+ *--------------------------------------------------------------------------*/
+#define hypre_SerialBoxLoop0Begin(ndim, loop_size)                            \
+{                                                                             \
+   zypre_BoxLoopDeclare();                                                    \
+   zypre_BoxLoopInit(ndim, loop_size);                                        \
+   zypre_BoxLoopSetOneBlock();                                                \
+   for (hypre__block = 0; hypre__block < hypre__num_blocks; hypre__block++)   \
+   {                                                                          \
+      zypre_BoxLoopSet();                                                     \
+      for (hypre__J = 0; hypre__J < hypre__JN; hypre__J++)                    \
+      {                                                                       \
+         for (hypre__I = 0; hypre__I < hypre__IN; hypre__I++)                 \
+         {
 
-/* Reduction */
-#define hypre_BoxLoop1ReductionBegin(ndim, loop_size, dbox1, start1, stride1, i1, reducesum) \
-        hypre_BoxLoop1Begin(ndim, loop_size, dbox1, start1, stride1, i1)
+#define hypre_SerialBoxLoop0End()                                             \
+         }                                                                    \
+         zypre_BoxLoopInc1();                                                 \
+         zypre_BoxLoopInc2();                                                 \
+      }                                                                       \
+   }                                                                          \
+}
 
-#define hypre_BoxLoop1ReductionEnd(i1, reducesum) \
-        hypre_BoxLoop1End(i1)
+#define hypre_SerialBoxLoop1Begin(ndim, loop_size,                            \
+                                  dbox1, start1, stride1, i1)                 \
+{                                                                             \
+   HYPRE_Int i1;                                                              \
+   zypre_BoxLoopDeclare();                                                    \
+   zypre_BoxLoopDeclareK(1);                                                  \
+   zypre_BoxLoopInit(ndim, loop_size);                                        \
+   zypre_BoxLoopInitK(1, dbox1, start1, stride1, i1);                         \
+   zypre_BoxLoopSetOneBlock();                                                \
+   for (hypre__block = 0; hypre__block < hypre__num_blocks; hypre__block++)   \
+   {                                                                          \
+      zypre_BoxLoopSet();                                                     \
+      zypre_BoxLoopSetK(1, i1);                                               \
+      for (hypre__J = 0; hypre__J < hypre__JN; hypre__J++)                    \
+      {                                                                       \
+         for (hypre__I = 0; hypre__I < hypre__IN; hypre__I++)                 \
+         {
 
-#define hypre_BoxLoop2ReductionBegin(ndim, loop_size, dbox1, start1, stride1, i1, \
+#define hypre_SerialBoxLoop1End(i1)  zypre_BoxLoop1End(i1)
+
+#define hypre_SerialBoxLoop2Begin(ndim, loop_size,                            \
+                                  dbox1, start1, stride1, i1,                 \
+                                  dbox2, start2, stride2, i2)                 \
+{                                                                             \
+   HYPRE_Int i1,i2;                                                           \
+   zypre_BoxLoopDeclare();                                                    \
+   zypre_BoxLoopDeclareK(1);                                                  \
+   zypre_BoxLoopDeclareK(2);                                                  \
+   zypre_BoxLoopInit(ndim, loop_size);                                        \
+   zypre_BoxLoopInitK(1, dbox1, start1, stride1, i1);                         \
+   zypre_BoxLoopInitK(2, dbox2, start2, stride2, i2);                         \
+   zypre_BoxLoopSetOneBlock();                                                \
+   for (hypre__block = 0; hypre__block < hypre__num_blocks; hypre__block++)   \
+   {                                                                          \
+      zypre_BoxLoopSet();                                                     \
+      zypre_BoxLoopSetK(1, i1);                                               \
+      zypre_BoxLoopSetK(2, i2);                                               \
+      for (hypre__J = 0; hypre__J < hypre__JN; hypre__J++)                    \
+      {                                                                       \
+         for (hypre__I = 0; hypre__I < hypre__IN; hypre__I++)                 \
+         {
+
+#define hypre_SerialBoxLoop2End(i1, i2) zypre_BoxLoop2End(i1, i2)
+
+/* Reduction BoxLoop1 */
+#define zypre_BoxLoop1ReductionBegin(ndim, loop_size, dbox1, start1, stride1, i1, reducesum) \
+        zypre_BoxLoop1Begin(ndim, loop_size, dbox1, start1, stride1, i1)
+
+#define zypre_BoxLoop1ReductionEnd(i1, reducesum) zypre_BoxLoop1End(i1)
+
+/* Reduction BoxLoop2 */
+#define zypre_BoxLoop2ReductionBegin(ndim, loop_size, dbox1, start1, stride1, i1,            \
                                                       dbox2, start2, stride2, i2, reducesum) \
-        hypre_BoxLoop2Begin(ndim, loop_size, dbox1, start1, stride1, i1, \
+        zypre_BoxLoop2Begin(ndim, loop_size, dbox1, start1, stride1, i1,                     \
                                              dbox2, start2, stride2, i2)
 
-#define hypre_BoxLoop2ReductionEnd(i1, i2, reducesum) \
-        hypre_BoxLoop2End(i1, i2)
-
+#define zypre_BoxLoop2ReductionEnd(i1, i2, reducesum) zypre_BoxLoop2End(i1, i2)
+
+
+/* Renaming */
+#define hypre_BoxLoopGetIndexHost          zypre_BoxLoopGetIndex
+#define hypre_BoxLoopBlockHost             zypre_BoxLoopBlock
+#define hypre_BoxLoop0BeginHost            zypre_BoxLoop0Begin
+#define hypre_BoxLoop0EndHost              zypre_BoxLoop0End
+#define hypre_BoxLoop1BeginHost            zypre_BoxLoop1Begin
+#define hypre_BoxLoop1EndHost              zypre_BoxLoop1End
+#define hypre_BoxLoop2BeginHost            zypre_BoxLoop2Begin
+#define hypre_BoxLoop2EndHost              zypre_BoxLoop2End
+#define hypre_BoxLoop3BeginHost            zypre_BoxLoop3Begin
+#define hypre_BoxLoop3EndHost              zypre_BoxLoop3End
+#define hypre_BoxLoop4BeginHost            zypre_BoxLoop4Begin
+#define hypre_BoxLoop4EndHost              zypre_BoxLoop4End
+#define hypre_BasicBoxLoop1BeginHost       zypre_BasicBoxLoop1Begin
+#define hypre_BasicBoxLoop2BeginHost       zypre_BasicBoxLoop2Begin
+#define hypre_LoopBeginHost                zypre_LoopBegin
+#define hypre_LoopEndHost                  zypre_LoopEnd
+#define hypre_BoxLoop1ReductionBeginHost   zypre_BoxLoop1ReductionBegin
+#define hypre_BoxLoop1ReductionEndHost     zypre_BoxLoop1ReductionEnd
+#define hypre_BoxLoop2ReductionBeginHost   zypre_BoxLoop2ReductionBegin
+#define hypre_BoxLoop2ReductionEndHost     zypre_BoxLoop2ReductionEnd
+
+//TODO TEMP FIX
+#if !defined(HYPRE_USING_RAJA) && !defined(HYPRE_USING_KOKKOS) && !defined(HYPRE_USING_CUDA) && !defined(HYPRE_USING_HIP) && !defined(HYPRE_USING_DEVICE_OPENMP) && !defined(HYPRE_USING_SYCL)
+#define hypre_BoxLoopGetIndex          hypre_BoxLoopGetIndexHost
+#define hypre_BoxLoopBlock()           0
+#define hypre_BoxLoop0Begin            hypre_BoxLoop0BeginHost
+#define hypre_BoxLoop0End              hypre_BoxLoop0EndHost
+#define hypre_BoxLoop1Begin            hypre_BoxLoop1BeginHost
+#define hypre_BoxLoop1End              hypre_BoxLoop1EndHost
+#define hypre_BoxLoop2Begin            hypre_BoxLoop2BeginHost
+#define hypre_BoxLoop2End              hypre_BoxLoop2EndHost
+#define hypre_BoxLoop3Begin            hypre_BoxLoop3BeginHost
+#define hypre_BoxLoop3End              hypre_BoxLoop3EndHost
+#define hypre_BoxLoop4Begin            hypre_BoxLoop4BeginHost
+#define hypre_BoxLoop4End              hypre_BoxLoop4EndHost
+#define hypre_BasicBoxLoop1Begin       hypre_BasicBoxLoop1BeginHost
+#define hypre_BasicBoxLoop2Begin       hypre_BasicBoxLoop2BeginHost
+#define hypre_LoopBegin                hypre_LoopBeginHost
+#define hypre_LoopEnd                  hypre_LoopEndHost
+#define hypre_BoxLoop1ReductionBegin   hypre_BoxLoop1ReductionBeginHost
+#define hypre_BoxLoop1ReductionEnd     hypre_BoxLoop1ReductionEndHost
+#define hypre_BoxLoop2ReductionBegin   hypre_BoxLoop2ReductionBeginHost
+#define hypre_BoxLoop2ReductionEnd     hypre_BoxLoop2ReductionEndHost
 #endif
 
-#endif
+#endif /* #ifndef HYPRE_BOXLOOP_HOST_HEADER */
+
 
 #ifdef __cplusplus
 }
diff --git a/external/hypre/src/struct_mv/_hypre_struct_mv.hpp b/external/hypre/src/struct_mv/_hypre_struct_mv.hpp
index d72e0c8f..839ae009 100644
--- a/external/hypre/src/struct_mv/_hypre_struct_mv.hpp
+++ b/external/hypre/src/struct_mv/_hypre_struct_mv.hpp
@@ -1,6 +1,7 @@
 
 /*** DO NOT EDIT THIS FILE DIRECTLY (use 'headers' to generate) ***/
 
+
 #ifndef hypre_STRUCT_MV_HPP
 #define hypre_STRUCT_MV_HPP
 
@@ -9,10 +10,8 @@
 #ifdef __cplusplus
 extern "C++" {
 #endif
-
-#if defined(HYPRE_USING_RAJA)
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -28,34 +27,39 @@ extern "C++" {
  * BoxLoop macros:
  *--------------------------------------------------------------------------*/
 
-#ifndef HYPRE_NEWBOXLOOP_HEADER
-#define HYPRE_NEWBOXLOOP_HEADER
+#ifndef HYPRE_BOXLOOP_RAJA_HEADER
+#define HYPRE_BOXLOOP_RAJA_HEADER
+
+#if defined(HYPRE_USING_RAJA)
 
 #ifdef __cplusplus
-extern "C++" {
+extern "C++"
+{
 #endif
 
 #include <RAJA/RAJA.hpp>
-using namespace RAJA;
+   using namespace RAJA;
 
 #ifdef __cplusplus
 }
 #endif
 
-typedef struct hypre_Boxloop_struct {
-    HYPRE_Int lsize0, lsize1, lsize2;
-    HYPRE_Int strides0, strides1, strides2;
-    HYPRE_Int bstart0, bstart1, bstart2;
-    HYPRE_Int bsize0, bsize1, bsize2;
+typedef struct hypre_Boxloop_struct
+{
+   HYPRE_Int lsize0, lsize1, lsize2;
+   HYPRE_Int strides0, strides1, strides2;
+   HYPRE_Int bstart0, bstart1, bstart2;
+   HYPRE_Int bsize0, bsize1, bsize2;
 } hypre_Boxloop;
 
+
 #if defined(HYPRE_USING_CUDA) /* RAJA with CUDA, running on device */
 
-#define BLOCKSIZE 256
-#define hypre_RAJA_DEVICE RAJA_DEVICE
-#define hypre_raja_exec_policy cuda_exec<BLOCKSIZE>
+#define BLOCKSIZE                HYPRE_1D_BLOCK_SIZE
+#define hypre_RAJA_DEVICE        RAJA_DEVICE
+#define hypre_raja_exec_policy   cuda_exec<BLOCKSIZE>
 /* #define hypre_raja_reduce_policy cuda_reduce_atomic<BLOCKSIZE> */
-#define hypre_raja_reduce_policy cuda_reduce//<BLOCKSIZE>
+#define hypre_raja_reduce_policy cuda_reduce //<BLOCKSIZE>
 #define hypre_fence()
 /*
 #define hypre_fence() \
@@ -68,124 +72,147 @@ hypre_CheckErrorDevice(cudaDeviceSynchronize());
 
 #elif defined(HYPRE_USING_DEVICE_OPENMP) /* RAJA with OpenMP (>4.5), running on device */
 
-//TODO
+#define hypre_RAJA_DEVICE
+#define hypre_raja_exec_policy   omp_target_parallel_for_exec<BLOCKSIZE>
+#define hypre_raja_reduce_policy omp_target_reduce
+#define hypre_fence()
 
 #elif defined(HYPRE_USING_OPENMP) /* RAJA with OpenMP, running on host (CPU) */
 
 #define hypre_RAJA_DEVICE
-#define hypre_raja_exec_policy omp_for_exec
+#define hypre_raja_exec_policy   omp_for_exec
 #define hypre_raja_reduce_policy omp_reduce
 #define hypre_fence()
 
 #else /* RAJA, running on host (CPU) */
 
 #define hypre_RAJA_DEVICE
-#define hypre_raja_exec_policy seq_exec
+#define hypre_raja_exec_policy   seq_exec
 #define hypre_raja_reduce_policy seq_reduce
 #define hypre_fence()
 
 #endif /* #if defined(HYPRE_USING_CUDA) */
 
-#define zypre_BoxLoopIncK(k, box, hypre__i)                                                                  \
-    HYPRE_Int hypre_boxD##k = 1;                                                                             \
-    HYPRE_Int hypre__i = 0;                                                                                  \
-    hypre__i += (hypre_IndexD(local_idx, 0) * box.strides0 + box.bstart0) * hypre_boxD##k;                   \
-    hypre_boxD##k *= hypre_max(0, box.bsize0 + 1);                                                           \
-    hypre__i += (hypre_IndexD(local_idx, 1) * box.strides1 + box.bstart1) * hypre_boxD##k;                   \
-    hypre_boxD##k *= hypre_max(0, box.bsize1 + 1);                                                           \
-    hypre__i += (hypre_IndexD(local_idx, 2) * box.strides2 + box.bstart2) * hypre_boxD##k;                   \
-    hypre_boxD##k *= hypre_max(0, box.bsize2 + 1);
-
-#define zypre_newBoxLoopInit(ndim, loop_size)                                                                \
-    HYPRE_Int hypre__tot = 1;                                                                                \
-    for (HYPRE_Int d = 0; d < ndim; d++) hypre__tot *= loop_size[d];
-
-#define zypre_newBoxLoopDeclare(box)                                                                         \
-    hypre_Index local_idx;                                                                                   \
-    HYPRE_Int idx_local = idx;                                                                               \
-    hypre_IndexD(local_idx, 0) = idx_local % box.lsize0;                                                     \
-    idx_local = idx_local / box.lsize0;                                                                      \
-    hypre_IndexD(local_idx, 1) = idx_local % box.lsize1;                                                     \
-    idx_local = idx_local / box.lsize1;                                                                      \
-    hypre_IndexD(local_idx, 2) = idx_local % box.lsize2;
-
-#define zypre_BoxLoopDataDeclareK(k, ndim, loop_size, dbox, start, stride)                                   \
-    hypre_Boxloop databox##k;                                                                                \
-    databox##k.lsize0 = loop_size[0];                                                                        \
-    databox##k.strides0 = stride[0];                                                                         \
-    databox##k.bstart0 = start[0] - dbox->imin[0];                                                           \
-    databox##k.bsize0 = dbox->imax[0] - dbox->imin[0];                                                       \
-    if (ndim > 1) {                                                                                          \
-        databox##k.lsize1 = loop_size[1];                                                                    \
-        databox##k.strides1 = stride[1];                                                                     \
-        databox##k.bstart1 = start[1] - dbox->imin[1];                                                       \
-        databox##k.bsize1 = dbox->imax[1] - dbox->imin[1];                                                   \
-    } else {                                                                                                 \
-        databox##k.lsize1 = 1;                                                                               \
-        databox##k.strides1 = 0;                                                                             \
-        databox##k.bstart1 = 0;                                                                              \
-        databox##k.bsize1 = 0;                                                                               \
-    }                                                                                                        \
-    if (ndim == 3) {                                                                                         \
-        databox##k.lsize2 = loop_size[2];                                                                    \
-        databox##k.strides2 = stride[2];                                                                     \
-        databox##k.bstart2 = start[2] - dbox->imin[2];                                                       \
-        databox##k.bsize2 = dbox->imax[2] - dbox->imin[2];                                                   \
-    } else {                                                                                                 \
-        databox##k.lsize2 = 1;                                                                               \
-        databox##k.strides2 = 0;                                                                             \
-        databox##k.bstart2 = 0;                                                                              \
-        databox##k.bsize2 = 0;                                                                               \
-    }
 
-#define zypre_newBoxLoop0Begin(ndim, loop_size)                                                              \
-    {                                                                                                        \
-        zypre_newBoxLoopInit(ndim, loop_size);                                                               \
+
+
+#define zypre_BoxLoopIncK(k,box,hypre__i)                                               \
+   HYPRE_Int hypre_boxD##k = 1;                                                         \
+   HYPRE_Int hypre__i = 0;                                                              \
+   hypre__i += (hypre_IndexD(local_idx, 0)*box.strides0 + box.bstart0) * hypre_boxD##k; \
+   hypre_boxD##k *= hypre_max(0, box.bsize0 + 1);                                       \
+   hypre__i += (hypre_IndexD(local_idx, 1)*box.strides1 + box.bstart1) * hypre_boxD##k; \
+   hypre_boxD##k *= hypre_max(0, box.bsize1 + 1);                                       \
+   hypre__i += (hypre_IndexD(local_idx, 2)*box.strides2 + box.bstart2) * hypre_boxD##k; \
+   hypre_boxD##k *= hypre_max(0, box.bsize2 + 1);                                       \
+
+
+#define zypre_newBoxLoopInit(ndim,loop_size)                                \
+  HYPRE_Int hypre__tot = 1;                                                 \
+  for (HYPRE_Int d = 0;d < ndim;d ++)                                       \
+      hypre__tot *= loop_size[d];
+
+
+#define zypre_newBoxLoopDeclare(box)                                    \
+  hypre_Index local_idx;                                                \
+  HYPRE_Int idx_local = idx;                                            \
+  hypre_IndexD(local_idx, 0)  = idx_local % box.lsize0;                 \
+  idx_local = idx_local / box.lsize0;                                   \
+  hypre_IndexD(local_idx, 1)  = idx_local % box.lsize1;                 \
+  idx_local = idx_local / box.lsize1;                                   \
+  hypre_IndexD(local_idx, 2)  = idx_local % box.lsize2;
+
+#define zypre_BoxLoopDataDeclareK(k,ndim,loop_size,dbox,start,stride)   \
+   hypre_Boxloop databox##k;                                            \
+   databox##k.lsize0 = loop_size[0];                                    \
+   databox##k.strides0 = stride[0];                                     \
+   databox##k.bstart0  = start[0] - dbox->imin[0];                      \
+   databox##k.bsize0   = dbox->imax[0]-dbox->imin[0];                   \
+   if (ndim > 1)                                                        \
+   {                                                                    \
+      databox##k.lsize1 = loop_size[1];                                 \
+      databox##k.strides1 = stride[1];                                  \
+      databox##k.bstart1  = start[1] - dbox->imin[1];                   \
+      databox##k.bsize1   = dbox->imax[1]-dbox->imin[1];                \
+   }                                                                    \
+   else                                                                 \
+   {                                                                    \
+      databox##k.lsize1 = 1;                                            \
+      databox##k.strides1 = 0;                                          \
+      databox##k.bstart1  = 0;                                          \
+      databox##k.bsize1   = 0;                                          \
+   }                                                                    \
+   if (ndim == 3)                                                       \
+   {                                                                    \
+      databox##k.lsize2 = loop_size[2];                                 \
+      databox##k.strides2 = stride[2];                                  \
+      databox##k.bstart2  = start[2] - dbox->imin[2];                   \
+      databox##k.bsize2   = dbox->imax[2]-dbox->imin[2];                \
+   }                                                                    \
+   else                                                                 \
+   {                                                                    \
+      databox##k.lsize2 = 1;                                            \
+      databox##k.strides2 = 0;                                          \
+      databox##k.bstart2  = 0;                                          \
+      databox##k.bsize2   = 0;                                          \
+   }
+
+#define zypre_newBoxLoop0Begin(ndim, loop_size)                                                   \
+{                                                                                                 \
+   zypre_newBoxLoopInit(ndim,loop_size);                                                          \
    forall< hypre_raja_exec_policy >(RangeSegment(0, hypre__tot), [=] hypre_RAJA_DEVICE (HYPRE_Int idx) \
    {
 
-#define zypre_newBoxLoop0End()                                                                               \
-    });                                                                                                      \
-    hypre_fence();                                                                                           \
-    }
 
-#define zypre_newBoxLoop1Begin(ndim, loop_size, dbox1, start1, stride1, i1)                                  \
-    {                                                                                                        \
-        zypre_newBoxLoopInit(ndim, loop_size);                                                               \
-        zypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                               \
+#define zypre_newBoxLoop0End()    \
+        });                       \
+        hypre_fence();            \
+}
+
+#define zypre_newBoxLoop1Begin(ndim, loop_size,                                                    \
+                               dbox1, start1, stride1, i1)                                         \
+{                                                                                                  \
+    zypre_newBoxLoopInit(ndim,loop_size);                                                          \
+    zypre_BoxLoopDataDeclareK(1,ndim,loop_size,dbox1,start1,stride1);                              \
     forall< hypre_raja_exec_policy >(RangeSegment(0, hypre__tot), [=] hypre_RAJA_DEVICE (HYPRE_Int idx) \
     {                                                                                              \
        zypre_newBoxLoopDeclare(databox1);                                                          \
        zypre_BoxLoopIncK(1,databox1,i1);
 
-#define zypre_newBoxLoop1End(i1)                                                                             \
-    });                                                                                                      \
-    hypre_fence();                                                                                           \
-    }
 
-#define zypre_newBoxLoop2Begin(ndim, loop_size, dbox1, start1, stride1, i1, dbox2, start2, stride2, i2)      \
-    {                                                                                                        \
-        zypre_newBoxLoopInit(ndim, loop_size);                                                               \
-        zypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                               \
-        zypre_BoxLoopDataDeclareK(2, ndim, loop_size, dbox2, start2, stride2);                               \
+#define zypre_newBoxLoop1End(i1) \
+    });                          \
+    hypre_fence();               \
+}
+
+#define zypre_newBoxLoop2Begin(ndim, loop_size,                                                  \
+                               dbox1, start1, stride1, i1,                                       \
+                               dbox2, start2, stride2, i2)                                       \
+{                                                                                                \
+  zypre_newBoxLoopInit(ndim,loop_size);                                                          \
+  zypre_BoxLoopDataDeclareK(1,ndim,loop_size,dbox1,start1,stride1);                              \
+  zypre_BoxLoopDataDeclareK(2,ndim,loop_size,dbox2,start2,stride2);                              \
   forall< hypre_raja_exec_policy >(RangeSegment(0, hypre__tot), [=] hypre_RAJA_DEVICE (HYPRE_Int idx) \
   {                                                                                              \
      zypre_newBoxLoopDeclare(databox1);                                                          \
      zypre_BoxLoopIncK(1,databox1,i1);                                                           \
      zypre_BoxLoopIncK(2,databox2,i2);
 
-#define zypre_newBoxLoop2End(i1, i2)                                                                         \
-    });                                                                                                      \
-    hypre_fence();                                                                                           \
-    }
 
-#define zypre_newBoxLoop3Begin(ndim, loop_size, dbox1, start1, stride1, i1, dbox2, start2, stride2, i2,      \
-                               dbox3, start3, stride3, i3)                                                   \
-    {                                                                                                        \
-        zypre_newBoxLoopInit(ndim, loop_size);                                                               \
-        zypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                               \
-        zypre_BoxLoopDataDeclareK(2, ndim, loop_size, dbox2, start2, stride2);                               \
-        zypre_BoxLoopDataDeclareK(3, ndim, loop_size, dbox3, start3, stride3);                               \
+#define zypre_newBoxLoop2End(i1, i2) \
+  });                                \
+  hypre_fence();                     \
+}
+
+#define zypre_newBoxLoop3Begin(ndim, loop_size,                                                   \
+                               dbox1, start1, stride1, i1,                                        \
+                               dbox2, start2, stride2, i2,                                        \
+                               dbox3, start3, stride3, i3)                                        \
+{                                                                                                 \
+   zypre_newBoxLoopInit(ndim,loop_size);                                                          \
+   zypre_BoxLoopDataDeclareK(1,ndim,loop_size,dbox1,start1,stride1);                              \
+   zypre_BoxLoopDataDeclareK(2,ndim,loop_size,dbox2,start2,stride2);                              \
+   zypre_BoxLoopDataDeclareK(3,ndim,loop_size,dbox3,start3,stride3);                              \
    forall< hypre_raja_exec_policy >(RangeSegment(0, hypre__tot), [=] hypre_RAJA_DEVICE (HYPRE_Int idx) \
    {                                                                                              \
       zypre_newBoxLoopDeclare(databox1);                                                          \
@@ -193,19 +220,22 @@ hypre_CheckErrorDevice(cudaDeviceSynchronize());
       zypre_BoxLoopIncK(2,databox2,i2);                                                           \
       zypre_BoxLoopIncK(3,databox3,i3);
 
-#define zypre_newBoxLoop3End(i1, i2, i3)                                                                     \
-    });                                                                                                      \
-    hypre_fence();                                                                                           \
-    }
+#define zypre_newBoxLoop3End(i1, i2, i3)                                      \
+    });                                                                       \
+    hypre_fence();                                                            \
+}
 
-#define zypre_newBoxLoop4Begin(ndim, loop_size, dbox1, start1, stride1, i1, dbox2, start2, stride2, i2,      \
-                               dbox3, start3, stride3, i3, dbox4, start4, stride4, i4)                       \
-    {                                                                                                        \
-        zypre_newBoxLoopInit(ndim, loop_size);                                                               \
-        zypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                               \
-        zypre_BoxLoopDataDeclareK(2, ndim, loop_size, dbox2, start2, stride2);                               \
-        zypre_BoxLoopDataDeclareK(3, ndim, loop_size, dbox3, start3, stride3);                               \
-        zypre_BoxLoopDataDeclareK(4, ndim, loop_size, dbox4, start4, stride4);                               \
+#define zypre_newBoxLoop4Begin(ndim, loop_size,                                                   \
+                               dbox1, start1, stride1, i1,                                        \
+                               dbox2, start2, stride2, i2,                                        \
+                               dbox3, start3, stride3, i3,                                        \
+                               dbox4, start4, stride4, i4)                                        \
+{                                                                                                 \
+   zypre_newBoxLoopInit(ndim,loop_size);                                                          \
+   zypre_BoxLoopDataDeclareK(1,ndim,loop_size,dbox1,start1,stride1);                              \
+   zypre_BoxLoopDataDeclareK(2,ndim,loop_size,dbox2,start2,stride2);                              \
+   zypre_BoxLoopDataDeclareK(3,ndim,loop_size,dbox3,start3,stride3);                              \
+   zypre_BoxLoopDataDeclareK(4,ndim,loop_size,dbox4,start4,stride4);                              \
    forall< hypre_raja_exec_policy >(RangeSegment(0, hypre__tot), [=] hypre_RAJA_DEVICE (HYPRE_Int idx) \
    {                                                                                              \
       zypre_newBoxLoopDeclare(databox1);                                                          \
@@ -214,103 +244,115 @@ hypre_CheckErrorDevice(cudaDeviceSynchronize());
       zypre_BoxLoopIncK(3,databox3,i3);                                                           \
       zypre_BoxLoopIncK(4,databox4,i4);
 
-#define zypre_newBoxLoop4End(i1, i2, i3, i4)                                                                 \
-    });                                                                                                      \
-    hypre_fence();                                                                                           \
-    }
-
-#define zypre_BasicBoxLoopDataDeclareK(k, ndim, loop_size, stride)                                           \
-    hypre_Boxloop databox##k;                                                                                \
-    databox##k.lsize0 = loop_size[0];                                                                        \
-    databox##k.strides0 = stride[0];                                                                         \
-    databox##k.bstart0 = 0;                                                                                  \
-    databox##k.bsize0 = 0;                                                                                   \
-    if (ndim > 1) {                                                                                          \
-        databox##k.lsize1 = loop_size[1];                                                                    \
-        databox##k.strides1 = stride[1];                                                                     \
-        databox##k.bstart1 = 0;                                                                              \
-        databox##k.bsize1 = 0;                                                                               \
-    } else {                                                                                                 \
-        databox##k.lsize1 = 1;                                                                               \
-        databox##k.strides1 = 0;                                                                             \
-        databox##k.bstart1 = 0;                                                                              \
-        databox##k.bsize1 = 0;                                                                               \
-    }                                                                                                        \
-    if (ndim == 3) {                                                                                         \
-        databox##k.lsize2 = loop_size[2];                                                                    \
-        databox##k.strides2 = stride[2];                                                                     \
-        databox##k.bstart2 = 0;                                                                              \
-        databox##k.bsize2 = 0;                                                                               \
-    } else {                                                                                                 \
-        databox##k.lsize2 = 1;                                                                               \
-        databox##k.strides2 = 0;                                                                             \
-        databox##k.bstart2 = 0;                                                                              \
-        databox##k.bsize2 = 0;                                                                               \
-    }
+#define zypre_newBoxLoop4End(i1, i2, i3, i4)                                  \
+   });                                                                        \
+   hypre_fence();                                                             \
+}
 
-#define zypre_newBasicBoxLoop2Begin(ndim, loop_size, stride1, i1, stride2, i2)                               \
-    {                                                                                                        \
-        zypre_newBoxLoopInit(ndim, loop_size);                                                               \
-        zypre_BasicBoxLoopDataDeclareK(1, ndim, loop_size, stride1);                                         \
-        zypre_BasicBoxLoopDataDeclareK(2, ndim, loop_size, stride2);                                         \
+#define zypre_BasicBoxLoopDataDeclareK(k,ndim,loop_size,stride)               \
+   hypre_Boxloop databox##k;                                                  \
+   databox##k.lsize0   = loop_size[0];                                        \
+   databox##k.strides0 = stride[0];                                           \
+   databox##k.bstart0  = 0;                                                   \
+   databox##k.bsize0   = 0;                                                   \
+   if (ndim > 1)                                                              \
+   {                                                                          \
+      databox##k.lsize1   = loop_size[1];                                     \
+      databox##k.strides1 = stride[1];                                        \
+      databox##k.bstart1  = 0;                                                \
+      databox##k.bsize1   = 0;                                                \
+   }                                                                          \
+   else                                                                       \
+   {                                                                          \
+      databox##k.lsize1   = 1;                                                \
+      databox##k.strides1 = 0;                                                \
+      databox##k.bstart1  = 0;                                                \
+      databox##k.bsize1   = 0;                                                \
+   }                                                                          \
+   if (ndim == 3)                                                             \
+   {                                                                          \
+      databox##k.lsize2   = loop_size[2];                                     \
+      databox##k.strides2 = stride[2];                                        \
+      databox##k.bstart2  = 0;                                                \
+      databox##k.bsize2   = 0;                                                \
+   }                                                                          \
+   else                                                                       \
+   {                                                                          \
+      databox##k.lsize2   = 1;                                                \
+      databox##k.strides2 = 0;                                                \
+      databox##k.bstart2  = 0;                                                \
+      databox##k.bsize2   = 0;                                                \
+   }
+
+#define zypre_newBasicBoxLoop2Begin(ndim, loop_size,                                               \
+                                    stride1, i1,                                                   \
+                                    stride2, i2)                                                   \
+{                                                                                                  \
+    zypre_newBoxLoopInit(ndim,loop_size);                                                          \
+    zypre_BasicBoxLoopDataDeclareK(1,ndim,loop_size,stride1);                                      \
+    zypre_BasicBoxLoopDataDeclareK(2,ndim,loop_size,stride2);                                      \
     forall< hypre_raja_exec_policy >(RangeSegment(0, hypre__tot), [=] hypre_RAJA_DEVICE (HYPRE_Int idx) \
     {                                                                                              \
        zypre_newBoxLoopDeclare(databox1);                                                          \
        zypre_BoxLoopIncK(1,databox1,i1);                                                           \
-       zypre_BoxLoopIncK(2,databox2,i2);
+       zypre_BoxLoopIncK(2,databox2,i2);                                                           \
 
-#define hypre_LoopBegin(size, idx)                                                                           \
-    {                                                                                                        \
+#define hypre_LoopBegin(size,idx)                                                           \
+{                                                                                           \
    forall< hypre_raja_exec_policy >(RangeSegment(0, size), [=] hypre_RAJA_DEVICE (HYPRE_Int idx) \
    {
 
-#define hypre_LoopEnd()                                                                                      \
-    });                                                                                                      \
-    hypre_fence();                                                                                           \
-    }
+#define hypre_LoopEnd()                                                        \
+   });                                                                         \
+   hypre_fence();                                                              \
+}
 
-#define hypre_newBoxLoopGetIndex(index)                                                                      \
-    index[0] = hypre_IndexD(local_idx, 0);                                                                   \
-    index[1] = hypre_IndexD(local_idx, 1);                                                                   \
-    index[2] = hypre_IndexD(local_idx, 2);
-
-#define hypre_BoxLoopBlock() 0
-#define hypre_BoxLoop0Begin zypre_newBoxLoop0Begin
-#define hypre_BoxLoop0For zypre_newBoxLoop0For
-#define hypre_BoxLoop0End zypre_newBoxLoop0End
-#define hypre_BoxLoop1Begin zypre_newBoxLoop1Begin
-#define hypre_BoxLoop1For zypre_newBoxLoop1For
-#define hypre_BoxLoop1End zypre_newBoxLoop1End
-#define hypre_BoxLoop2Begin zypre_newBoxLoop2Begin
-#define hypre_BoxLoop2For zypre_newBoxLoop2For
-#define hypre_BoxLoop2End zypre_newBoxLoop2End
-#define hypre_BoxLoop3Begin zypre_newBoxLoop3Begin
-#define hypre_BoxLoop3For zypre_newBoxLoop3For
-#define hypre_BoxLoop3End zypre_newBoxLoop3End
-#define hypre_BoxLoop4Begin zypre_newBoxLoop4Begin
-#define hypre_BoxLoop4For zypre_newBoxLoop4For
-#define hypre_BoxLoop4End zypre_newBoxLoop4End
-#define hypre_newBoxLoopInit zypre_newBoxLoopInit
+#define hypre_BoxLoopGetIndex(index)                                           \
+  index[0] = hypre_IndexD(local_idx, 0);                                       \
+  index[1] = hypre_IndexD(local_idx, 1);                                       \
+  index[2] = hypre_IndexD(local_idx, 2);
+
+#define hypre_BoxLoopBlock()       0
+#define hypre_BoxLoop0Begin      zypre_newBoxLoop0Begin
+#define hypre_BoxLoop0For        zypre_newBoxLoop0For
+#define hypre_BoxLoop0End        zypre_newBoxLoop0End
+#define hypre_BoxLoop1Begin      zypre_newBoxLoop1Begin
+#define hypre_BoxLoop1For        zypre_newBoxLoop1For
+#define hypre_BoxLoop1End        zypre_newBoxLoop1End
+#define hypre_BoxLoop2Begin      zypre_newBoxLoop2Begin
+#define hypre_BoxLoop2For        zypre_newBoxLoop2For
+#define hypre_BoxLoop2End        zypre_newBoxLoop2End
+#define hypre_BoxLoop3Begin      zypre_newBoxLoop3Begin
+#define hypre_BoxLoop3For        zypre_newBoxLoop3For
+#define hypre_BoxLoop3End        zypre_newBoxLoop3End
+#define hypre_BoxLoop4Begin      zypre_newBoxLoop4Begin
+#define hypre_BoxLoop4For        zypre_newBoxLoop4For
+#define hypre_BoxLoop4End        zypre_newBoxLoop4End
+#define hypre_newBoxLoopInit     zypre_newBoxLoopInit
 
 #define hypre_BasicBoxLoop2Begin zypre_newBasicBoxLoop2Begin
 
 /* Reduction */
-#define hypre_BoxLoop1ReductionBegin(ndim, loop_size, dbox1, start1, stride1, i1, reducesum)                 \
-    hypre_BoxLoop1Begin(ndim, loop_size, dbox1, start1, stride1, i1)
+#define hypre_BoxLoop1ReductionBegin(ndim, loop_size, dbox1, start1, stride1, i1, reducesum) \
+        hypre_BoxLoop1Begin(ndim, loop_size, dbox1, start1, stride1, i1)
 
-#define hypre_BoxLoop1ReductionEnd(i1, reducesum) hypre_BoxLoop1End(i1)
+#define hypre_BoxLoop1ReductionEnd(i1, reducesum) \
+        hypre_BoxLoop1End(i1)
 
-#define hypre_BoxLoop2ReductionBegin(ndim, loop_size, dbox1, start1, stride1, i1, dbox2, start2, stride2,    \
-                                     i2, reducesum)                                                          \
-    hypre_BoxLoop2Begin(ndim, loop_size, dbox1, start1, stride1, i1, dbox2, start2, stride2, i2)
+#define hypre_BoxLoop2ReductionBegin(ndim, loop_size, dbox1, start1, stride1, i1, \
+                                                      dbox2, start2, stride2, i2, reducesum) \
+        hypre_BoxLoop2Begin(ndim, loop_size, dbox1, start1, stride1, i1, \
+                                             dbox2, start2, stride2, i2)
 
-#define hypre_BoxLoop2ReductionEnd(i1, i2, reducesum) hypre_BoxLoop2End(i1, i2)
+#define hypre_BoxLoop2ReductionEnd(i1, i2, reducesum) \
+        hypre_BoxLoop2End(i1, i2)
 
 #endif
 
-#elif defined(HYPRE_USING_KOKKOS)
+#endif /* #ifndef HYPRE_BOXLOOP_RAJA_HEADER */
+
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -326,31 +368,36 @@ hypre_CheckErrorDevice(cudaDeviceSynchronize());
  * BoxLoop macros:
  *--------------------------------------------------------------------------*/
 
-#ifndef HYPRE_NEWBOXLOOP_HEADER
-#define HYPRE_NEWBOXLOOP_HEADER
+#ifndef HYPRE_BOXLOOP_KOKKOS_HEADER
+#define HYPRE_BOXLOOP_KOKKOS_HEADER
+
+#if defined(HYPRE_USING_KOKKOS)
 
 #ifdef __cplusplus
-extern "C++" {
+extern "C++"
+{
 #endif
 
 #include <Kokkos_Core.hpp>
-using namespace Kokkos;
+   using namespace Kokkos;
 
 #ifdef __cplusplus
 }
 #endif
 
-#if defined(KOKKOS_HAVE_MPI)
+#if defined( KOKKOS_HAVE_MPI )
 #include <mpi.h>
 #endif
 
-typedef struct hypre_Boxloop_struct {
-    HYPRE_Int lsize0, lsize1, lsize2;
-    HYPRE_Int strides0, strides1, strides2;
-    HYPRE_Int bstart0, bstart1, bstart2;
-    HYPRE_Int bsize0, bsize1, bsize2;
+typedef struct hypre_Boxloop_struct
+{
+   HYPRE_Int lsize0, lsize1, lsize2;
+   HYPRE_Int strides0, strides1, strides2;
+   HYPRE_Int bstart0, bstart1, bstart2;
+   HYPRE_Int bsize0, bsize1, bsize2;
 } hypre_Boxloop;
 
+
 #define hypre_fence()
 /*
 #define hypre_fence()                                \
@@ -361,106 +408,125 @@ typedef struct hypre_Boxloop_struct {
    hypre_CheckErrorDevice(cudaDeviceSynchronize());
 */
 
-#define hypre_newBoxLoopInit(ndim, loop_size)                                                                \
-    HYPRE_Int hypre__tot = 1;                                                                                \
-    for (HYPRE_Int d = 0; d < ndim; d++) hypre__tot *= loop_size[d];
-
-#define hypre_BoxLoopIncK(k, box, hypre__i)                                                                  \
-    HYPRE_Int hypre_boxD##k = 1;                                                                             \
-    HYPRE_Int hypre__i = 0;                                                                                  \
-    hypre__i += (hypre_IndexD(local_idx, 0) * box.strides0 + box.bstart0) * hypre_boxD##k;                   \
-    hypre_boxD##k *= hypre_max(0, box.bsize0 + 1);                                                           \
-    hypre__i += (hypre_IndexD(local_idx, 1) * box.strides1 + box.bstart1) * hypre_boxD##k;                   \
-    hypre_boxD##k *= hypre_max(0, box.bsize1 + 1);                                                           \
-    hypre__i += (hypre_IndexD(local_idx, 2) * box.strides2 + box.bstart2) * hypre_boxD##k;                   \
-    hypre_boxD##k *= hypre_max(0, box.bsize2 + 1);
-
-#define hypre_newBoxLoopDeclare(box)                                                                         \
-    hypre_Index local_idx;                                                                                   \
-    HYPRE_Int idx_local = idx;                                                                               \
-    hypre_IndexD(local_idx, 0) = idx_local % box.lsize0;                                                     \
-    idx_local = idx_local / box.lsize0;                                                                      \
-    hypre_IndexD(local_idx, 1) = idx_local % box.lsize1;                                                     \
-    idx_local = idx_local / box.lsize1;                                                                      \
-    hypre_IndexD(local_idx, 2) = idx_local % box.lsize2;
-
-#define hypre_BoxLoopDataDeclareK(k, ndim, loop_size, dbox, start, stride)                                   \
-    hypre_Boxloop databox##k;                                                                                \
-    databox##k.lsize0 = loop_size[0];                                                                        \
-    databox##k.strides0 = stride[0];                                                                         \
-    databox##k.bstart0 = start[0] - dbox->imin[0];                                                           \
-    databox##k.bsize0 = dbox->imax[0] - dbox->imin[0];                                                       \
-    if (ndim > 1) {                                                                                          \
-        databox##k.lsize1 = loop_size[1];                                                                    \
-        databox##k.strides1 = stride[1];                                                                     \
-        databox##k.bstart1 = start[1] - dbox->imin[1];                                                       \
-        databox##k.bsize1 = dbox->imax[1] - dbox->imin[1];                                                   \
-    } else {                                                                                                 \
-        databox##k.lsize1 = 1;                                                                               \
-        databox##k.strides1 = 0;                                                                             \
-        databox##k.bstart1 = 0;                                                                              \
-        databox##k.bsize1 = 0;                                                                               \
-    }                                                                                                        \
-    if (ndim == 3) {                                                                                         \
-        databox##k.lsize2 = loop_size[2];                                                                    \
-        databox##k.strides2 = stride[2];                                                                     \
-        databox##k.bstart2 = start[2] - dbox->imin[2];                                                       \
-        databox##k.bsize2 = dbox->imax[2] - dbox->imin[2];                                                   \
-    } else {                                                                                                 \
-        databox##k.lsize2 = 1;                                                                               \
-        databox##k.strides2 = 0;                                                                             \
-        databox##k.bstart2 = 0;                                                                              \
-        databox##k.bsize2 = 0;                                                                               \
-    }
 
-#define hypre_newBoxLoop0Begin(ndim, loop_size)                                                              \
-    {                                                                                                        \
-        hypre_newBoxLoopInit(ndim, loop_size);                                                               \
+#define hypre_newBoxLoopInit(ndim,loop_size)                                \
+   HYPRE_Int hypre__tot = 1;                                                \
+   for (HYPRE_Int d = 0;d < ndim;d ++)                                      \
+      hypre__tot *= loop_size[d];
+
+
+#define hypre_BoxLoopIncK(k,box,hypre__i)                                                \
+   HYPRE_Int hypre_boxD##k = 1;                                                          \
+   HYPRE_Int hypre__i = 0;                                                               \
+   hypre__i += (hypre_IndexD(local_idx, 0)*box.strides0 + box.bstart0) * hypre_boxD##k;  \
+   hypre_boxD##k *= hypre_max(0, box.bsize0 + 1);                                        \
+   hypre__i += (hypre_IndexD(local_idx, 1)*box.strides1 + box.bstart1) * hypre_boxD##k;  \
+   hypre_boxD##k *= hypre_max(0, box.bsize1 + 1);                                        \
+   hypre__i += (hypre_IndexD(local_idx, 2)*box.strides2 + box.bstart2) * hypre_boxD##k;  \
+   hypre_boxD##k *= hypre_max(0, box.bsize2 + 1);                                        \
+
+#define hypre_newBoxLoopDeclare(box)                                        \
+  hypre_Index local_idx;                                                    \
+  HYPRE_Int idx_local = idx;                                                \
+  hypre_IndexD(local_idx, 0)  = idx_local % box.lsize0;                     \
+  idx_local = idx_local / box.lsize0;                                       \
+  hypre_IndexD(local_idx, 1)  = idx_local % box.lsize1;                     \
+  idx_local = idx_local / box.lsize1;                                       \
+  hypre_IndexD(local_idx, 2)  = idx_local % box.lsize2;
+
+#define hypre_BoxLoopDataDeclareK(k,ndim,loop_size,dbox,start,stride)       \
+   hypre_Boxloop databox##k;                                                \
+   databox##k.lsize0 = loop_size[0];                                        \
+   databox##k.strides0 = stride[0];                                         \
+   databox##k.bstart0  = start[0] - dbox->imin[0];                          \
+   databox##k.bsize0   = dbox->imax[0]-dbox->imin[0];                       \
+   if (ndim > 1)                                                            \
+   {                                                                        \
+      databox##k.lsize1 = loop_size[1];                                     \
+      databox##k.strides1 = stride[1];                                      \
+      databox##k.bstart1  = start[1] - dbox->imin[1];                       \
+      databox##k.bsize1   = dbox->imax[1]-dbox->imin[1];                    \
+   }                                                                        \
+   else                                                                     \
+   {                                                                        \
+      databox##k.lsize1 = 1;                                                \
+      databox##k.strides1 = 0;                                              \
+      databox##k.bstart1  = 0;                                              \
+      databox##k.bsize1   = 0;                                              \
+   }                                                                        \
+   if (ndim == 3)                                                           \
+   {                                                                        \
+      databox##k.lsize2 = loop_size[2];                                     \
+      databox##k.strides2 = stride[2];                                      \
+      databox##k.bstart2  = start[2] - dbox->imin[2];                       \
+      databox##k.bsize2   = dbox->imax[2]-dbox->imin[2];                    \
+   }                                                                        \
+   else                                                                     \
+   {                                                                        \
+      databox##k.lsize2 = 1;                                                \
+      databox##k.strides2 = 0;                                              \
+      databox##k.bstart2  = 0;                                              \
+      databox##k.bsize2   = 0;                                              \
+   }
+
+#define hypre_newBoxLoop0Begin(ndim, loop_size)                         \
+{                                                                       \
+   hypre_newBoxLoopInit(ndim,loop_size);                                \
    Kokkos::parallel_for (hypre__tot, KOKKOS_LAMBDA (HYPRE_Int idx)      \
    {
 
-#define hypre_newBoxLoop0End(i1)                                                                             \
-    });                                                                                                      \
-    hypre_fence();                                                                                           \
-    }
 
-#define hypre_newBoxLoop1Begin(ndim, loop_size, dbox1, start1, stride1, i1)                                  \
-    {                                                                                                        \
-        hypre_newBoxLoopInit(ndim, loop_size)                                                                \
-                hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                       \
+#define hypre_newBoxLoop0End(i1)                                        \
+   });                                                                  \
+   hypre_fence();                                                       \
+}
+
+
+#define hypre_newBoxLoop1Begin(ndim, loop_size,                         \
+                               dbox1, start1, stride1, i1)              \
+{                                                                       \
+   hypre_newBoxLoopInit(ndim,loop_size)                                 \
+   hypre_BoxLoopDataDeclareK(1,ndim,loop_size,dbox1,start1,stride1);    \
    Kokkos::parallel_for (hypre__tot, KOKKOS_LAMBDA (HYPRE_Int idx)      \
    {                                                                    \
       hypre_newBoxLoopDeclare(databox1);                                \
       hypre_BoxLoopIncK(1,databox1,i1);
 
-#define hypre_newBoxLoop1End(i1)                                                                             \
-    });                                                                                                      \
-    hypre_fence();                                                                                           \
-    }
 
-#define hypre_newBoxLoop2Begin(ndim, loop_size, dbox1, start1, stride1, i1, dbox2, start2, stride2, i2)      \
-    {                                                                                                        \
-        hypre_newBoxLoopInit(ndim, loop_size);                                                               \
-        hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                               \
-        hypre_BoxLoopDataDeclareK(2, ndim, loop_size, dbox2, start2, stride2);                               \
+#define hypre_newBoxLoop1End(i1)                                        \
+   });                                                                  \
+     hypre_fence();                                                     \
+ }
+
+
+#define hypre_newBoxLoop2Begin(ndim, loop_size,                         \
+                               dbox1, start1, stride1, i1,              \
+                               dbox2, start2, stride2, i2)              \
+{                                                                       \
+   hypre_newBoxLoopInit(ndim,loop_size);                                \
+   hypre_BoxLoopDataDeclareK(1,ndim,loop_size,dbox1,start1,stride1);    \
+   hypre_BoxLoopDataDeclareK(2,ndim,loop_size,dbox2,start2,stride2);    \
    Kokkos::parallel_for (hypre__tot, KOKKOS_LAMBDA (HYPRE_Int idx)      \
    {                                                                    \
       hypre_newBoxLoopDeclare(databox1)                                 \
       hypre_BoxLoopIncK(1,databox1,i1);                                 \
       hypre_BoxLoopIncK(2,databox2,i2);
 
-#define hypre_newBoxLoop2End(i1, i2)                                                                         \
-    });                                                                                                      \
-    hypre_fence();                                                                                           \
-    }
+#define hypre_newBoxLoop2End(i1, i2)                                    \
+   });                                                                  \
+   hypre_fence();                                                       \
+}
 
-#define hypre_newBoxLoop3Begin(ndim, loop_size, dbox1, start1, stride1, i1, dbox2, start2, stride2, i2,      \
-                               dbox3, start3, stride3, i3)                                                   \
-    {                                                                                                        \
-        hypre_newBoxLoopInit(ndim, loop_size);                                                               \
-        hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                               \
-        hypre_BoxLoopDataDeclareK(2, ndim, loop_size, dbox2, start2, stride2);                               \
-        hypre_BoxLoopDataDeclareK(3, ndim, loop_size, dbox3, start3, stride3);                               \
+
+#define hypre_newBoxLoop3Begin(ndim, loop_size,                         \
+                               dbox1, start1, stride1, i1,              \
+                               dbox2, start2, stride2, i2,              \
+                               dbox3, start3, stride3, i3)              \
+{                                                                       \
+   hypre_newBoxLoopInit(ndim,loop_size);                                \
+   hypre_BoxLoopDataDeclareK(1,ndim,loop_size,dbox1,start1,stride1);    \
+   hypre_BoxLoopDataDeclareK(2,ndim,loop_size,dbox2,start2,stride2);    \
+   hypre_BoxLoopDataDeclareK(3,ndim,loop_size,dbox3,start3,stride3);    \
    Kokkos::parallel_for (hypre__tot, KOKKOS_LAMBDA (HYPRE_Int idx)      \
    {                                                                    \
       hypre_newBoxLoopDeclare(databox1);                                \
@@ -468,19 +534,22 @@ typedef struct hypre_Boxloop_struct {
       hypre_BoxLoopIncK(2,databox2,i2);                                 \
       hypre_BoxLoopIncK(3,databox3,i3);
 
-#define hypre_newBoxLoop3End(i1, i2, i3)                                                                     \
-    });                                                                                                      \
-    hypre_fence();                                                                                           \
-    }
+#define hypre_newBoxLoop3End(i1, i2, i3)                                \
+   });                                                                  \
+   hypre_fence();                                                       \
+}
 
-#define hypre_newBoxLoop4Begin(ndim, loop_size, dbox1, start1, stride1, i1, dbox2, start2, stride2, i2,      \
-                               dbox3, start3, stride3, i3, dbox4, start4, stride4, i4)                       \
-    {                                                                                                        \
-        hypre_newBoxLoopInit(ndim, loop_size);                                                               \
-        hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                               \
-        hypre_BoxLoopDataDeclareK(2, ndim, loop_size, dbox2, start2, stride2);                               \
-        hypre_BoxLoopDataDeclareK(3, ndim, loop_size, dbox3, start3, stride3);                               \
-        hypre_BoxLoopDataDeclareK(4, ndim, loop_size, dbox4, start4, stride4);                               \
+#define hypre_newBoxLoop4Begin(ndim, loop_size,                         \
+                               dbox1, start1, stride1, i1,              \
+                               dbox2, start2, stride2, i2,              \
+                               dbox3, start3, stride3, i3,              \
+                               dbox4, start4, stride4, i4)              \
+{                                                                       \
+   hypre_newBoxLoopInit(ndim,loop_size);                                \
+   hypre_BoxLoopDataDeclareK(1,ndim,loop_size,dbox1,start1,stride1);    \
+   hypre_BoxLoopDataDeclareK(2,ndim,loop_size,dbox2,start2,stride2);    \
+   hypre_BoxLoopDataDeclareK(3,ndim,loop_size,dbox3,start3,stride3);    \
+   hypre_BoxLoopDataDeclareK(4,ndim,loop_size,dbox4,start4,stride4);    \
    Kokkos::parallel_for (hypre__tot, KOKKOS_LAMBDA (HYPRE_Int idx)      \
    {                                                                    \
       hypre_newBoxLoopDeclare(databox1);                                \
@@ -489,99 +558,114 @@ typedef struct hypre_Boxloop_struct {
       hypre_BoxLoopIncK(3,databox3,i3);                                 \
       hypre_BoxLoopIncK(4,databox4,i4);
 
-#define hypre_newBoxLoop4End(i1, i2, i3, i4)                                                                 \
-    });                                                                                                      \
-    hypre_fence();                                                                                           \
-    }
 
-#define hypre_BasicBoxLoopDataDeclareK(k, ndim, loop_size, stride)                                           \
-    hypre_Boxloop databox##k;                                                                                \
-    databox##k.lsize0 = loop_size[0];                                                                        \
-    databox##k.strides0 = stride[0];                                                                         \
-    databox##k.bstart0 = 0;                                                                                  \
-    databox##k.bsize0 = 0;                                                                                   \
-    if (ndim > 1) {                                                                                          \
-        databox##k.lsize1 = loop_size[1];                                                                    \
-        databox##k.strides1 = stride[1];                                                                     \
-        databox##k.bstart1 = 0;                                                                              \
-        databox##k.bsize1 = 0;                                                                               \
-    } else {                                                                                                 \
-        databox##k.lsize1 = 1;                                                                               \
-        databox##k.strides1 = 0;                                                                             \
-        databox##k.bstart1 = 0;                                                                              \
-        databox##k.bsize1 = 0;                                                                               \
-    }                                                                                                        \
-    if (ndim == 3) {                                                                                         \
-        databox##k.lsize2 = loop_size[2];                                                                    \
-        databox##k.strides2 = stride[2];                                                                     \
-        databox##k.bstart2 = 0;                                                                              \
-        databox##k.bsize2 = 0;                                                                               \
-    } else {                                                                                                 \
-        databox##k.lsize2 = 1;                                                                               \
-        databox##k.strides2 = 0;                                                                             \
-        databox##k.bstart2 = 0;                                                                              \
-        databox##k.bsize2 = 0;                                                                               \
-    }
+#define hypre_newBoxLoop4End(i1, i2, i3, i4)                            \
+   });                                                                  \
+   hypre_fence();                                                       \
+}
 
-#define hypre_newBasicBoxLoop2Begin(ndim, loop_size, stride1, i1, stride2, i2)                               \
-    {                                                                                                        \
-        hypre_newBoxLoopInit(ndim, loop_size);                                                               \
-        hypre_BasicBoxLoopDataDeclareK(1, ndim, loop_size, stride1);                                         \
-        hypre_BasicBoxLoopDataDeclareK(2, ndim, loop_size, stride2);                                         \
+#define hypre_BasicBoxLoopDataDeclareK(k,ndim,loop_size,stride)         \
+        hypre_Boxloop databox##k;                                       \
+        databox##k.lsize0 = loop_size[0];                               \
+        databox##k.strides0 = stride[0];                                \
+        databox##k.bstart0  = 0;                                        \
+        databox##k.bsize0   = 0;                                        \
+        if (ndim > 1)                                                   \
+        {                                                               \
+            databox##k.lsize1 = loop_size[1];                           \
+            databox##k.strides1 = stride[1];                            \
+            databox##k.bstart1  = 0;                                    \
+            databox##k.bsize1   = 0;                                    \
+        }                                                               \
+        else                                                            \
+        {                                                               \
+                databox##k.lsize1 = 1;                                  \
+                databox##k.strides1 = 0;                                \
+                databox##k.bstart1  = 0;                                \
+                databox##k.bsize1   = 0;                                \
+        }                                                               \
+        if (ndim == 3)                                                  \
+        {                                                               \
+            databox##k.lsize2 = loop_size[2];                           \
+            databox##k.strides2 = stride[2];                            \
+            databox##k.bstart2  = 0;                                    \
+            databox##k.bsize2   = 0;                                    \
+        }                                                               \
+        else                                                            \
+        {                                                               \
+            databox##k.lsize2 = 1;                                      \
+            databox##k.strides2 = 0;                                    \
+            databox##k.bstart2  = 0;                                    \
+            databox##k.bsize2   = 0;                                    \
+        }
+
+#define hypre_newBasicBoxLoop2Begin(ndim, loop_size,                    \
+                                    stride1, i1,                        \
+                                    stride2, i2)                        \
+{                                                                       \
+   hypre_newBoxLoopInit(ndim,loop_size);                                \
+   hypre_BasicBoxLoopDataDeclareK(1,ndim,loop_size,stride1);            \
+   hypre_BasicBoxLoopDataDeclareK(2,ndim,loop_size,stride2);            \
    Kokkos::parallel_for (hypre__tot, KOKKOS_LAMBDA (HYPRE_Int idx)      \
    {                                                                    \
       hypre_newBoxLoopDeclare(databox1);                                \
       hypre_BoxLoopIncK(1,databox1,i1);                                 \
-      hypre_BoxLoopIncK(2,databox2,i2);
+      hypre_BoxLoopIncK(2,databox2,i2);                                 \
 
-#define hypre_BoxLoop1ReductionBegin(ndim, loop_size, dbox1, start1, stride1, i1, HYPRE_BOX_REDUCTION)       \
-    {                                                                                                        \
-        HYPRE_Real __hypre_sum_tmp = HYPRE_BOX_REDUCTION;                                                    \
-        HYPRE_BOX_REDUCTION = 0.0;                                                                           \
-        hypre_newBoxLoopInit(ndim, loop_size);                                                               \
-        hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                               \
+#define hypre_BoxLoop1ReductionBegin(ndim, loop_size,                   \
+                                     dbox1, start1, stride1, i1,        \
+                                     HYPRE_BOX_REDUCTION)               \
+ {                                                                      \
+     HYPRE_Real __hypre_sum_tmp = HYPRE_BOX_REDUCTION;                  \
+     HYPRE_BOX_REDUCTION = 0.0;                                         \
+     hypre_newBoxLoopInit(ndim,loop_size);                              \
+     hypre_BoxLoopDataDeclareK(1,ndim,loop_size,dbox1,start1,stride1);  \
      Kokkos::parallel_reduce (hypre__tot, KOKKOS_LAMBDA (HYPRE_Int idx, \
                               HYPRE_Real &HYPRE_BOX_REDUCTION)          \
      {                                                                  \
         hypre_newBoxLoopDeclare(databox1);                              \
-        hypre_BoxLoopIncK(1,databox1,i1);
-
-#define hypre_BoxLoop1ReductionEnd(i1, HYPRE_BOX_REDUCTION)                                                  \
-    }, HYPRE_BOX_REDUCTION);                                                                                 \
-    hypre_fence();                                                                                           \
-    HYPRE_BOX_REDUCTION += __hypre_sum_tmp;                                                                  \
-    }
-
-#define hypre_BoxLoop2ReductionBegin(ndim, loop_size, dbox1, start1, stride1, i1, dbox2, start2, stride2,    \
-                                     i2, HYPRE_BOX_REDUCTION)                                                \
-    {                                                                                                        \
-        HYPRE_Real __hypre_sum_tmp = HYPRE_BOX_REDUCTION;                                                    \
-        HYPRE_BOX_REDUCTION = 0.0;                                                                           \
-        hypre_newBoxLoopInit(ndim, loop_size);                                                               \
-        hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                               \
-        hypre_BoxLoopDataDeclareK(2, ndim, loop_size, dbox2, start2, stride2);                               \
+        hypre_BoxLoopIncK(1,databox1,i1);                               \
+
+
+
+#define hypre_BoxLoop1ReductionEnd(i1, HYPRE_BOX_REDUCTION)            \
+     }, HYPRE_BOX_REDUCTION);                                           \
+     hypre_fence();                                                     \
+     HYPRE_BOX_REDUCTION += __hypre_sum_tmp;                            \
+ }
+
+#define hypre_BoxLoop2ReductionBegin(ndim, loop_size,                  \
+                                      dbox1, start1, stride1, i1,       \
+                                      dbox2, start2, stride2, i2,       \
+                                      HYPRE_BOX_REDUCTION)              \
+ {                                                                      \
+     HYPRE_Real __hypre_sum_tmp = HYPRE_BOX_REDUCTION;                  \
+     HYPRE_BOX_REDUCTION = 0.0;                                         \
+     hypre_newBoxLoopInit(ndim,loop_size);                              \
+     hypre_BoxLoopDataDeclareK(1,ndim,loop_size,dbox1,start1,stride1);  \
+     hypre_BoxLoopDataDeclareK(2,ndim,loop_size,dbox2,start2,stride2);  \
      Kokkos::parallel_reduce (hypre__tot, KOKKOS_LAMBDA (HYPRE_Int idx, \
                               HYPRE_Real &HYPRE_BOX_REDUCTION)          \
      {                                                                  \
          hypre_newBoxLoopDeclare(databox1);                             \
          hypre_BoxLoopIncK(1,databox1,i1);                              \
-         hypre_BoxLoopIncK(2,databox2,i2);
+         hypre_BoxLoopIncK(2,databox2,i2);                              \
 
-#define hypre_BoxLoop2ReductionEnd(i1, i2, HYPRE_BOX_REDUCTION)                                              \
-    }, HYPRE_BOX_REDUCTION);                                                                                 \
-    hypre_fence();                                                                                           \
-    HYPRE_BOX_REDUCTION += __hypre_sum_tmp;                                                                  \
-    }
+#define hypre_BoxLoop2ReductionEnd(i1, i2, HYPRE_BOX_REDUCTION)        \
+     }, HYPRE_BOX_REDUCTION);                                           \
+     hypre_fence();                                                     \
+     HYPRE_BOX_REDUCTION += __hypre_sum_tmp;                            \
+ }
 
-#define hypre_LoopBegin(size, idx)                                                                           \
-    {                                                                                                        \
+#define hypre_LoopBegin(size,idx)                                       \
+{                                                                       \
    Kokkos::parallel_for(size, KOKKOS_LAMBDA (HYPRE_Int idx)             \
    {
 
-#define hypre_LoopEnd()                                                                                      \
-    });                                                                                                      \
-    hypre_fence();                                                                                           \
-    }
+#define hypre_LoopEnd()                                                 \
+   });                                                                  \
+   hypre_fence();                                                       \
+}
 
 /*
 extern "C++"
@@ -620,34 +704,36 @@ struct ColumnSums
 }
 */
 
-#define hypre_BoxLoopGetIndex(index)                                                                         \
-    index[0] = hypre_IndexD(local_idx, 0);                                                                   \
-    index[1] = hypre_IndexD(local_idx, 1);                                                                   \
-    index[2] = hypre_IndexD(local_idx, 2);
-
-#define hypre_BoxLoopBlock() 0
-#define hypre_BoxLoop0Begin hypre_newBoxLoop0Begin
-#define hypre_BoxLoop0For hypre_newBoxLoop0For
-#define hypre_BoxLoop0End hypre_newBoxLoop0End
-#define hypre_BoxLoop1Begin hypre_newBoxLoop1Begin
-#define hypre_BoxLoop1For hypre_newBoxLoop1For
-#define hypre_BoxLoop1End hypre_newBoxLoop1End
-#define hypre_BoxLoop2Begin hypre_newBoxLoop2Begin
-#define hypre_BoxLoop2For hypre_newBoxLoop2For
-#define hypre_BoxLoop2End hypre_newBoxLoop2End
-#define hypre_BoxLoop3Begin hypre_newBoxLoop3Begin
-#define hypre_BoxLoop3For hypre_newBoxLoop3For
-#define hypre_BoxLoop3End hypre_newBoxLoop3End
-#define hypre_BoxLoop4Begin hypre_newBoxLoop4Begin
-#define hypre_BoxLoop4For hypre_newBoxLoop4For
-#define hypre_BoxLoop4End hypre_newBoxLoop4End
+#define hypre_BoxLoopGetIndex(index)     \
+  index[0] = hypre_IndexD(local_idx, 0); \
+  index[1] = hypre_IndexD(local_idx, 1); \
+  index[2] = hypre_IndexD(local_idx, 2);
+
+#define hypre_BoxLoopBlock()       0
+#define hypre_BoxLoop0Begin      hypre_newBoxLoop0Begin
+#define hypre_BoxLoop0For        hypre_newBoxLoop0For
+#define hypre_BoxLoop0End        hypre_newBoxLoop0End
+#define hypre_BoxLoop1Begin      hypre_newBoxLoop1Begin
+#define hypre_BoxLoop1For        hypre_newBoxLoop1For
+#define hypre_BoxLoop1End        hypre_newBoxLoop1End
+#define hypre_BoxLoop2Begin      hypre_newBoxLoop2Begin
+#define hypre_BoxLoop2For        hypre_newBoxLoop2For
+#define hypre_BoxLoop2End        hypre_newBoxLoop2End
+#define hypre_BoxLoop3Begin      hypre_newBoxLoop3Begin
+#define hypre_BoxLoop3For        hypre_newBoxLoop3For
+#define hypre_BoxLoop3End        hypre_newBoxLoop3End
+#define hypre_BoxLoop4Begin      hypre_newBoxLoop4Begin
+#define hypre_BoxLoop4For        hypre_newBoxLoop4For
+#define hypre_BoxLoop4End        hypre_newBoxLoop4End
 
 #define hypre_BasicBoxLoop2Begin hypre_newBasicBoxLoop2Begin
+
 #endif
 
-#elif defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#endif /* #ifndef HYPRE_BOXLOOP_KOKKOS_HEADER */
+
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -666,238 +752,299 @@ struct ColumnSums
 #ifndef HYPRE_BOXLOOP_CUDA_HEADER
 #define HYPRE_BOXLOOP_CUDA_HEADER
 
-#define HYPRE_LAMBDA [=] __host__ __device__
+#if (defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)) && !defined(HYPRE_USING_RAJA) && !defined(HYPRE_USING_KOKKOS)
+
+#define HYPRE_LAMBDA [=] __host__  __device__
 
 /* TODO: RL: support 4-D */
-typedef struct hypre_Boxloop_struct {
-    HYPRE_Int lsize0, lsize1, lsize2;
-    HYPRE_Int strides0, strides1, strides2;
-    HYPRE_Int bstart0, bstart1, bstart2;
-    HYPRE_Int bsize0, bsize1, bsize2;
+typedef struct hypre_Boxloop_struct
+{
+   HYPRE_Int lsize0, lsize1, lsize2;
+   HYPRE_Int strides0, strides1, strides2;
+   HYPRE_Int bstart0, bstart1, bstart2;
+   HYPRE_Int bsize0, bsize1, bsize2;
 } hypre_Boxloop;
 
 #ifdef __cplusplus
-extern "C++" {
+extern "C++"
+{
 #endif
 
-/* -------------------------
- *     parfor-loop
- * ------------------------*/
+   /* -------------------------
+    *     parfor-loop
+    * ------------------------*/
 
-template <typename LOOP_BODY>
-__global__ void forall_kernel(LOOP_BODY loop_body, HYPRE_Int length) {
-    const HYPRE_Int idx = hypre_cuda_get_grid_thread_id<1, 1>();
-    /* const HYPRE_Int number_threads = hypre_cuda_get_grid_num_threads<1,1>(); */
-
-    if (idx < length) { loop_body(idx); }
-}
-
-template <typename LOOP_BODY>
-void BoxLoopforall(HYPRE_Int length, LOOP_BODY loop_body) {
-    HYPRE_ExecutionPolicy exec_policy = hypre_HandleStructExecPolicy(hypre_handle());
+   template <typename LOOP_BODY>
+   __global__ void
+   forall_kernel( hypre_DeviceItem & item,
+                  LOOP_BODY loop_body,
+                  HYPRE_Int length )
+   {
+      const HYPRE_Int idx = hypre_gpu_get_grid_thread_id<1, 1>(item);
+      /* const HYPRE_Int number_threads = hypre_gpu_get_grid_num_threads<1,1>(item); */
+
+      if (idx < length)
+      {
+         loop_body(idx);
+      }
+   }
+
+   template<typename LOOP_BODY>
+   void
+   BoxLoopforall( HYPRE_Int length,
+                  LOOP_BODY loop_body )
+   {
+      const HYPRE_MemoryLocation memory_location = hypre_HandleMemoryLocation(hypre_handle());
+      const HYPRE_ExecutionPolicy exec_policy = hypre_GetExecPolicy1(memory_location);
 
-    if (exec_policy == HYPRE_EXEC_HOST) {
+      if (exec_policy == HYPRE_EXEC_HOST)
+      {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for HYPRE_SMP_SCHEDULE
+         #pragma omp parallel for HYPRE_SMP_SCHEDULE
 #endif
-        for (HYPRE_Int idx = 0; idx < length; idx++) { loop_body(idx); }
-    } else if (exec_policy == HYPRE_EXEC_DEVICE) {
-        const dim3 bDim = hypre_GetDefaultCUDABlockDimension();
-        const dim3 gDim = hypre_GetDefaultCUDAGridDimension(length, "thread", bDim);
-
-        HYPRE_CUDA_LAUNCH(forall_kernel, gDim, bDim, loop_body, length);
-    }
-}
-
-/* ------------------------------
- *     parforreduction-loop
- * -----------------------------*/
-
-template <typename LOOP_BODY, typename REDUCER>
-__global__ void reductionforall_kernel(HYPRE_Int length, REDUCER reducer, LOOP_BODY loop_body) {
-    const HYPRE_Int thread_id = hypre_cuda_get_grid_thread_id<1, 1>();
-    const HYPRE_Int n_threads = hypre_cuda_get_grid_num_threads<1, 1>();
-
-    for (HYPRE_Int idx = thread_id; idx < length; idx += n_threads) { loop_body(idx, reducer); }
-
-    /* reduction in block-level and the save the results in reducer */
-    reducer.BlockReduce();
-}
-
-template <typename LOOP_BODY, typename REDUCER>
-void ReductionBoxLoopforall(HYPRE_Int length, REDUCER &reducer, LOOP_BODY loop_body) {
-    if (length <= 0) { return; }
-
-    HYPRE_ExecutionPolicy exec_policy = hypre_HandleStructExecPolicy(hypre_handle());
-
-    if (exec_policy == HYPRE_EXEC_HOST) {
-        for (HYPRE_Int idx = 0; idx < length; idx++) { loop_body(idx, reducer); }
-    } else if (exec_policy == HYPRE_EXEC_DEVICE) {
-        const dim3 bDim = hypre_GetDefaultCUDABlockDimension();
-        dim3 gDim = hypre_GetDefaultCUDAGridDimension(length, "thread", bDim);
-
-        /* Note: we assume gDim cannot exceed 1024
-       *       and bDim < WARP * WARP
-       */
-        gDim.x = hypre_min(gDim.x, 1024);
-        reducer.nblocks = gDim.x;
-
-        /*
-      hypre_printf("length= %d, blocksize = %d, gridsize = %d\n", length, bDim.x, gDim.x);
-      */
-
-        HYPRE_CUDA_LAUNCH(reductionforall_kernel, gDim, bDim, length, reducer, loop_body);
-    }
-}
+         for (HYPRE_Int idx = 0; idx < length; idx++)
+         {
+            loop_body(idx);
+         }
+      }
+      else if (exec_policy == HYPRE_EXEC_DEVICE)
+      {
+         const dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+         const dim3 gDim = hypre_GetDefaultDeviceGridDimension(length, "thread", bDim);
+
+         HYPRE_GPU_LAUNCH( forall_kernel, gDim, bDim, loop_body, length );
+      }
+   }
+
+   /* ------------------------------
+    *     parforreduction-loop
+    * -----------------------------*/
+
+   template <typename LOOP_BODY, typename REDUCER>
+   __global__ void
+   reductionforall_kernel( hypre_DeviceItem & item,
+                           HYPRE_Int length,
+                           REDUCER   reducer,
+                           LOOP_BODY loop_body )
+   {
+      const HYPRE_Int thread_id = hypre_gpu_get_grid_thread_id<1, 1>(item);
+      const HYPRE_Int n_threads = hypre_gpu_get_grid_num_threads<1, 1>(item);
+
+      for (HYPRE_Int idx = thread_id; idx < length; idx += n_threads)
+      {
+         loop_body(idx, reducer);
+      }
+
+      /* reduction in block-level and the save the results in reducer */
+      reducer.BlockReduce();
+   }
+
+   template<typename LOOP_BODY, typename REDUCER>
+   void
+   ReductionBoxLoopforall( HYPRE_Int  length,
+                           REDUCER   & reducer,
+                           LOOP_BODY  loop_body )
+   {
+      if (length <= 0)
+      {
+         return;
+      }
+
+      const HYPRE_MemoryLocation memory_location = hypre_HandleMemoryLocation(hypre_handle());
+      const HYPRE_ExecutionPolicy exec_policy = hypre_GetExecPolicy1(memory_location);
+
+      if (exec_policy == HYPRE_EXEC_HOST)
+      {
+         for (HYPRE_Int idx = 0; idx < length; idx++)
+         {
+            loop_body(idx, reducer);
+         }
+      }
+      else if (exec_policy == HYPRE_EXEC_DEVICE)
+      {
+         /* Assume gDim cannot exceed HYPRE_MAX_NTHREADS_BLOCK (the max size for the 2nd reduction)
+          * and bDim <= WARP * WARP (because we use 1 warp fro the block-level reduction) */
+         const dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+         dim3 gDim = hypre_GetDefaultDeviceGridDimension(length, "thread", bDim);
+         gDim.x = hypre_min(gDim.x, HYPRE_MAX_NTHREADS_BLOCK);
+
+         reducer.nblocks = gDim.x;
+
+         reducer.Allocate2ndPhaseBuffer();
+
+         /*
+         hypre_printf("length= %d, blocksize = %d, gridsize = %d\n", length, bDim.x, gDim.x);
+         */
+
+         HYPRE_GPU_LAUNCH( reductionforall_kernel, gDim, bDim, length, reducer, loop_body );
+      }
+   }
 
 #ifdef __cplusplus
 }
 #endif
 
 /* Get 1-D length of the loop, in hypre__tot */
-#define hypre_newBoxLoopInit(ndim, loop_size)                                                                \
-    HYPRE_Int hypre__tot = 1;                                                                                \
-    for (HYPRE_Int hypre_d = 0; hypre_d < ndim; hypre_d++) { hypre__tot *= loop_size[hypre_d]; }
+#define hypre_newBoxLoopInit(ndim, loop_size)              \
+   HYPRE_Int hypre__tot = 1;                               \
+   for (HYPRE_Int hypre_d = 0; hypre_d < ndim; hypre_d ++) \
+   {                                                       \
+      hypre__tot *= loop_size[hypre_d];                    \
+   }
 
 /* Initialize struct for box-k */
-#define hypre_BoxLoopDataDeclareK(k, ndim, loop_size, dbox, start, stride)                                   \
-    hypre_Boxloop databox##k;                                                                                \
-    /* dim 0 */                                                                                              \
-    databox##k.lsize0 = loop_size[0];                                                                        \
-    databox##k.strides0 = stride[0];                                                                         \
-    databox##k.bstart0 = start[0] - dbox->imin[0];                                                           \
-    databox##k.bsize0 = dbox->imax[0] - dbox->imin[0];                                                       \
-    /* dim 1 */                                                                                              \
-    if (ndim > 1) {                                                                                          \
-        databox##k.lsize1 = loop_size[1];                                                                    \
-        databox##k.strides1 = stride[1];                                                                     \
-        databox##k.bstart1 = start[1] - dbox->imin[1];                                                       \
-        databox##k.bsize1 = dbox->imax[1] - dbox->imin[1];                                                   \
-    } else {                                                                                                 \
-        databox##k.lsize1 = 1;                                                                               \
-        databox##k.strides1 = 0;                                                                             \
-        databox##k.bstart1 = 0;                                                                              \
-        databox##k.bsize1 = 0;                                                                               \
-    }                                                                                                        \
-    /* dim 2 */                                                                                              \
-    if (ndim == 3) {                                                                                         \
-        databox##k.lsize2 = loop_size[2];                                                                    \
-        databox##k.strides2 = stride[2];                                                                     \
-        databox##k.bstart2 = start[2] - dbox->imin[2];                                                       \
-        databox##k.bsize2 = dbox->imax[2] - dbox->imin[2];                                                   \
-    } else {                                                                                                 \
-        databox##k.lsize2 = 1;                                                                               \
-        databox##k.strides2 = 0;                                                                             \
-        databox##k.bstart2 = 0;                                                                              \
-        databox##k.bsize2 = 0;                                                                               \
-    }
-
-#define zypre_BasicBoxLoopDataDeclareK(k, ndim, loop_size, stride)                                           \
-    hypre_Boxloop databox##k;                                                                                \
-    databox##k.lsize0 = loop_size[0];                                                                        \
-    databox##k.strides0 = stride[0];                                                                         \
-    databox##k.bstart0 = 0;                                                                                  \
-    databox##k.bsize0 = 0;                                                                                   \
-    if (ndim > 1) {                                                                                          \
-        databox##k.lsize1 = loop_size[1];                                                                    \
-        databox##k.strides1 = stride[1];                                                                     \
-        databox##k.bstart1 = 0;                                                                              \
-        databox##k.bsize1 = 0;                                                                               \
-    } else {                                                                                                 \
-        databox##k.lsize1 = 1;                                                                               \
-        databox##k.strides1 = 0;                                                                             \
-        databox##k.bstart1 = 0;                                                                              \
-        databox##k.bsize1 = 0;                                                                               \
-    }                                                                                                        \
-    if (ndim == 3) {                                                                                         \
-        databox##k.lsize2 = loop_size[2];                                                                    \
-        databox##k.strides2 = stride[2];                                                                     \
-        databox##k.bstart2 = 0;                                                                              \
-        databox##k.bsize2 = 0;                                                                               \
-    } else {                                                                                                 \
-        databox##k.lsize2 = 1;                                                                               \
-        databox##k.strides2 = 0;                                                                             \
-        databox##k.bstart2 = 0;                                                                              \
-        databox##k.bsize2 = 0;                                                                               \
-    }
+#define hypre_BoxLoopDataDeclareK(k, ndim, loop_size, dbox, start, stride) \
+   hypre_Boxloop databox##k;                                               \
+   /* dim 0 */                                                             \
+   databox##k.lsize0   = loop_size[0];                                     \
+   databox##k.strides0 = stride[0];                                        \
+   databox##k.bstart0  = start[0] - dbox->imin[0];                         \
+   databox##k.bsize0   = dbox->imax[0] - dbox->imin[0];                    \
+   /* dim 1 */                                                             \
+   if (ndim > 1)                                                           \
+   {                                                                       \
+      databox##k.lsize1   = loop_size[1];                                  \
+      databox##k.strides1 = stride[1];                                     \
+      databox##k.bstart1  = start[1] - dbox->imin[1];                      \
+      databox##k.bsize1   = dbox->imax[1] - dbox->imin[1];                 \
+   }                                                                       \
+   else                                                                    \
+   {                                                                       \
+      databox##k.lsize1   = 1;                                             \
+      databox##k.strides1 = 0;                                             \
+      databox##k.bstart1  = 0;                                             \
+      databox##k.bsize1   = 0;                                             \
+   }                                                                       \
+   /* dim 2 */                                                             \
+   if (ndim == 3)                                                          \
+   {                                                                       \
+      databox##k.lsize2   = loop_size[2];                                  \
+      databox##k.strides2 = stride[2];                                     \
+      databox##k.bstart2  = start[2] - dbox->imin[2];                      \
+      databox##k.bsize2   = dbox->imax[2] - dbox->imin[2];                 \
+   }                                                                       \
+   else                                                                    \
+   {                                                                       \
+      databox##k.lsize2   = 1;                                             \
+      databox##k.strides2 = 0;                                             \
+      databox##k.bstart2  = 0;                                             \
+      databox##k.bsize2   = 0;                                             \
+   }
+
+#define hypre_BasicBoxLoopDataDeclareK(k,ndim,loop_size,stride) \
+hypre_Boxloop databox##k;                                       \
+databox##k.lsize0   = loop_size[0];                             \
+databox##k.strides0 = stride[0];                                \
+databox##k.bstart0  = 0;                                        \
+databox##k.bsize0   = 0;                                        \
+if (ndim > 1)                                                   \
+{                                                               \
+   databox##k.lsize1   = loop_size[1];                          \
+   databox##k.strides1 = stride[1];                             \
+   databox##k.bstart1  = 0;                                     \
+   databox##k.bsize1   = 0;                                     \
+}                                                               \
+else                                                            \
+{                                                               \
+   databox##k.lsize1   = 1;                                     \
+   databox##k.strides1 = 0;                                     \
+   databox##k.bstart1  = 0;                                     \
+   databox##k.bsize1   = 0;                                     \
+}                                                               \
+if (ndim == 3)                                                  \
+{                                                               \
+   databox##k.lsize2   = loop_size[2];                          \
+   databox##k.strides2 = stride[2];                             \
+   databox##k.bstart2  = 0;                                     \
+   databox##k.bsize2   = 0;                                     \
+}                                                               \
+else                                                            \
+{                                                               \
+    databox##k.lsize2   = 1;                                    \
+    databox##k.strides2 = 0;                                    \
+    databox##k.bstart2  = 0;                                    \
+    databox##k.bsize2   = 0;                                    \
+}
 
 /* RL: TODO loop_size out of box struct, bsize +1 */
 /* Given input 1-D 'idx' in box, get 3-D 'local_idx' in loop_size */
-#define hypre_newBoxLoopDeclare(box)                                                                         \
-    hypre_Index local_idx;                                                                                   \
-    HYPRE_Int idx_local = idx;                                                                               \
-    hypre_IndexD(local_idx, 0) = idx_local % box.lsize0;                                                     \
-    idx_local = idx_local / box.lsize0;                                                                      \
-    hypre_IndexD(local_idx, 1) = idx_local % box.lsize1;                                                     \
-    idx_local = idx_local / box.lsize1;                                                                      \
-    hypre_IndexD(local_idx, 2) = idx_local % box.lsize2;
+#define hypre_newBoxLoopDeclare(box)                     \
+   hypre_Index local_idx;                                \
+   HYPRE_Int idx_local = idx;                            \
+   hypre_IndexD(local_idx, 0)  = idx_local % box.lsize0; \
+   idx_local = idx_local / box.lsize0;                   \
+   hypre_IndexD(local_idx, 1)  = idx_local % box.lsize1; \
+   idx_local = idx_local / box.lsize1;                   \
+   hypre_IndexD(local_idx, 2)  = idx_local % box.lsize2; \
 
 /* Given input 3-D 'local_idx', get 1-D 'hypre__i' in 'box' */
-#define hypre_BoxLoopIncK(k, box, hypre__i)                                                                  \
-    HYPRE_Int hypre_boxD##k = 1;                                                                             \
-    HYPRE_Int hypre__i = 0;                                                                                  \
-    hypre__i += (hypre_IndexD(local_idx, 0) * box.strides0 + box.bstart0) * hypre_boxD##k;                   \
-    hypre_boxD##k *= hypre_max(0, box.bsize0 + 1);                                                           \
-    hypre__i += (hypre_IndexD(local_idx, 1) * box.strides1 + box.bstart1) * hypre_boxD##k;                   \
-    hypre_boxD##k *= hypre_max(0, box.bsize1 + 1);                                                           \
-    hypre__i += (hypre_IndexD(local_idx, 2) * box.strides2 + box.bstart2) * hypre_boxD##k;                   \
-    hypre_boxD##k *= hypre_max(0, box.bsize2 + 1);
+#define hypre_BoxLoopIncK(k, box, hypre__i)                                               \
+   HYPRE_Int hypre_boxD##k = 1;                                                           \
+   HYPRE_Int hypre__i = 0;                                                                \
+   hypre__i += (hypre_IndexD(local_idx, 0) * box.strides0 + box.bstart0) * hypre_boxD##k; \
+   hypre_boxD##k *= hypre_max(0, box.bsize0 + 1);                                         \
+   hypre__i += (hypre_IndexD(local_idx, 1) * box.strides1 + box.bstart1) * hypre_boxD##k; \
+   hypre_boxD##k *= hypre_max(0, box.bsize1 + 1);                                         \
+   hypre__i += (hypre_IndexD(local_idx, 2) * box.strides2 + box.bstart2) * hypre_boxD##k; \
+   hypre_boxD##k *= hypre_max(0, box.bsize2 + 1);
 
 /* get 3-D local_idx into 'index' */
-#define hypre_BoxLoopGetIndex(index)                                                                         \
-    index[0] = hypre_IndexD(local_idx, 0);                                                                   \
-    index[1] = hypre_IndexD(local_idx, 1);                                                                   \
-    index[2] = hypre_IndexD(local_idx, 2);
+#define hypre_BoxLoopGetIndexCUDA(index)                                                              \
+   index[0] = hypre_IndexD(local_idx, 0);                                                             \
+   index[1] = hypre_IndexD(local_idx, 1);                                                             \
+   index[2] = hypre_IndexD(local_idx, 2);
 
 /* BoxLoop 0 */
-#define hypre_newBoxLoop0Begin(ndim, loop_size)                                                              \
-    {                                                                                                        \
-        hypre_newBoxLoopInit(ndim, loop_size);                                                               \
+#define hypre_BoxLoop0BeginCUDA(ndim, loop_size)                                                      \
+{                                                                                                     \
+   hypre_newBoxLoopInit(ndim, loop_size);                                                             \
    BoxLoopforall(hypre__tot, HYPRE_LAMBDA (HYPRE_Int idx)                                             \
    {
 
-#define hypre_newBoxLoop0End()                                                                               \
-    });                                                                                                      \
-    }
+#define hypre_BoxLoop0EndCUDA()                                                                       \
+   });                                                                                                \
+}
 
 /* BoxLoop 1 */
-#define hypre_newBoxLoop1Begin(ndim, loop_size, dbox1, start1, stride1, i1)                                  \
-    {                                                                                                        \
-        hypre_newBoxLoopInit(ndim, loop_size);                                                               \
-        hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                               \
+#define hypre_BoxLoop1BeginCUDA(ndim, loop_size, dbox1, start1, stride1, i1)                          \
+{                                                                                                     \
+   hypre_newBoxLoopInit(ndim, loop_size);                                                             \
+   hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                             \
    BoxLoopforall(hypre__tot, HYPRE_LAMBDA (HYPRE_Int idx)                                             \
    {                                                                                                  \
       hypre_newBoxLoopDeclare(databox1);                                                              \
       hypre_BoxLoopIncK(1, databox1, i1);
 
-#define hypre_newBoxLoop1End(i1)                                                                             \
-    });                                                                                                      \
-    }
+#define hypre_BoxLoop1EndCUDA(i1)                                                                     \
+   });                                                                                                \
+}
 
 /* BoxLoop 2 */
-#define hypre_newBoxLoop2Begin(ndim, loop_size, dbox1, start1, stride1, i1, dbox2, start2, stride2, i2)      \
-    {                                                                                                        \
-        hypre_newBoxLoopInit(ndim, loop_size);                                                               \
-        hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                               \
-        hypre_BoxLoopDataDeclareK(2, ndim, loop_size, dbox2, start2, stride2);                               \
+#define hypre_BoxLoop2BeginCUDA(ndim, loop_size, dbox1, start1, stride1, i1,                          \
+                                                 dbox2, start2, stride2, i2)                          \
+{                                                                                                     \
+   hypre_newBoxLoopInit(ndim, loop_size);                                                             \
+   hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                             \
+   hypre_BoxLoopDataDeclareK(2, ndim, loop_size, dbox2, start2, stride2);                             \
    BoxLoopforall(hypre__tot, HYPRE_LAMBDA (HYPRE_Int idx)                                             \
    {                                                                                                  \
       hypre_newBoxLoopDeclare(databox1);                                                              \
       hypre_BoxLoopIncK(1, databox1, i1);                                                             \
       hypre_BoxLoopIncK(2, databox2, i2);
 
-#define hypre_newBoxLoop2End(i1, i2)                                                                         \
-    });                                                                                                      \
-    }
+#define hypre_BoxLoop2EndCUDA(i1, i2)                                                                 \
+   });                                                                                                \
+}
 
 /* BoxLoop 3 */
-#define hypre_newBoxLoop3Begin(ndim, loop_size, dbox1, start1, stride1, i1, dbox2, start2, stride2, i2,      \
-                               dbox3, start3, stride3, i3)                                                   \
-    {                                                                                                        \
-        hypre_newBoxLoopInit(ndim, loop_size);                                                               \
-        hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                               \
-        hypre_BoxLoopDataDeclareK(2, ndim, loop_size, dbox2, start2, stride2);                               \
-        hypre_BoxLoopDataDeclareK(3, ndim, loop_size, dbox3, start3, stride3);                               \
+#define hypre_BoxLoop3BeginCUDA(ndim, loop_size, dbox1, start1, stride1, i1,                          \
+                                                 dbox2, start2, stride2, i2,                          \
+                                                 dbox3, start3, stride3, i3)                          \
+{                                                                                                     \
+   hypre_newBoxLoopInit(ndim, loop_size);                                                             \
+   hypre_BoxLoopDataDeclareK(1, ndim,loop_size, dbox1, start1, stride1);                              \
+   hypre_BoxLoopDataDeclareK(2, ndim,loop_size, dbox2, start2, stride2);                              \
+   hypre_BoxLoopDataDeclareK(3, ndim,loop_size, dbox3, start3, stride3);                              \
    BoxLoopforall(hypre__tot, HYPRE_LAMBDA (HYPRE_Int idx)                                             \
    {                                                                                                  \
       hypre_newBoxLoopDeclare(databox1);                                                              \
@@ -905,19 +1052,21 @@ void ReductionBoxLoopforall(HYPRE_Int length, REDUCER &reducer, LOOP_BODY loop_b
       hypre_BoxLoopIncK(2, databox2, i2);                                                             \
       hypre_BoxLoopIncK(3, databox3, i3);
 
-#define hypre_newBoxLoop3End(i1, i2, i3)                                                                     \
-    });                                                                                                      \
-    }
+#define hypre_BoxLoop3EndCUDA(i1, i2, i3)                                                             \
+   });                                                                                                \
+}
 
 /* BoxLoop 4 */
-#define hypre_newBoxLoop4Begin(ndim, loop_size, dbox1, start1, stride1, i1, dbox2, start2, stride2, i2,      \
-                               dbox3, start3, stride3, i3, dbox4, start4, stride4, i4)                       \
-    {                                                                                                        \
-        hypre_newBoxLoopInit(ndim, loop_size);                                                               \
-        hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                               \
-        hypre_BoxLoopDataDeclareK(2, ndim, loop_size, dbox2, start2, stride2);                               \
-        hypre_BoxLoopDataDeclareK(3, ndim, loop_size, dbox3, start3, stride3);                               \
-        hypre_BoxLoopDataDeclareK(4, ndim, loop_size, dbox4, start4, stride4);                               \
+#define hypre_BoxLoop4BeginCUDA(ndim, loop_size, dbox1, start1, stride1, i1,                          \
+                                                 dbox2, start2, stride2, i2,                          \
+                                                 dbox3, start3, stride3, i3,                          \
+                                                 dbox4, start4, stride4, i4)                          \
+{                                                                                                     \
+   hypre_newBoxLoopInit(ndim, loop_size);                                                             \
+   hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                             \
+   hypre_BoxLoopDataDeclareK(2, ndim, loop_size, dbox2, start2, stride2);                             \
+   hypre_BoxLoopDataDeclareK(3, ndim, loop_size, dbox3, start3, stride3);                             \
+   hypre_BoxLoopDataDeclareK(4, ndim, loop_size, dbox4, start4, stride4);                             \
    BoxLoopforall(hypre__tot, HYPRE_LAMBDA (HYPRE_Int idx)                                             \
    {                                                                                                  \
       hypre_newBoxLoopDeclare(databox1);                                                              \
@@ -926,102 +1075,564 @@ void ReductionBoxLoopforall(HYPRE_Int length, REDUCER &reducer, LOOP_BODY loop_b
       hypre_BoxLoopIncK(3, databox3, i3);                                                             \
       hypre_BoxLoopIncK(4, databox4, i4);
 
-#define hypre_newBoxLoop4End(i1, i2, i3, i4)                                                                 \
-    });                                                                                                      \
-    }
+#define hypre_BoxLoop4EndCUDA(i1, i2, i3, i4)                                                         \
+   });                                                                                                \
+}
 
 /* Basic BoxLoops have no boxes */
 /* BoxLoop 1 */
-#define zypre_newBasicBoxLoop1Begin(ndim, loop_size, stride1, i1)                                            \
-    {                                                                                                        \
-        hypre_newBoxLoopInit(ndim, loop_size);                                                               \
-        zypre_BasicBoxLoopDataDeclareK(1, ndim, loop_size, stride1);                                         \
+#define hypre_BasicBoxLoop1BeginCUDA(ndim, loop_size, stride1, i1)                                    \
+{                                                                                                     \
+   hypre_newBoxLoopInit(ndim, loop_size);                                                             \
+   hypre_BasicBoxLoopDataDeclareK(1, ndim, loop_size, stride1);                                       \
    BoxLoopforall(hypre__tot, HYPRE_LAMBDA (HYPRE_Int idx)                                             \
    {                                                                                                  \
       hypre_newBoxLoopDeclare(databox1);                                                              \
       hypre_BoxLoopIncK(1, databox1, i1);
 
 /* BoxLoop 2 */
-#define zypre_newBasicBoxLoop2Begin(ndim, loop_size, stride1, i1, stride2, i2)                               \
-    {                                                                                                        \
-        hypre_newBoxLoopInit(ndim, loop_size);                                                               \
-        zypre_BasicBoxLoopDataDeclareK(1, ndim, loop_size, stride1);                                         \
-        zypre_BasicBoxLoopDataDeclareK(2, ndim, loop_size, stride2);                                         \
+#define hypre_BasicBoxLoop2BeginCUDA(ndim, loop_size, stride1, i1, stride2, i2)                       \
+{                                                                                                     \
+   hypre_newBoxLoopInit(ndim, loop_size);                                                             \
+   hypre_BasicBoxLoopDataDeclareK(1, ndim, loop_size, stride1);                                       \
+   hypre_BasicBoxLoopDataDeclareK(2, ndim, loop_size, stride2);                                       \
    BoxLoopforall(hypre__tot, HYPRE_LAMBDA (HYPRE_Int idx)                                             \
    {                                                                                                  \
       hypre_newBoxLoopDeclare(databox1);                                                              \
       hypre_BoxLoopIncK(1, databox1, i1);                                                             \
-      hypre_BoxLoopIncK(2, databox2, i2);
+      hypre_BoxLoopIncK(2, databox2, i2);                                                             \
 
-/* TODO: RL just parallel-for, it should not be here, better in utilities */
-#define hypre_LoopBegin(size, idx)                                                                           \
-    {                                                                                                        \
+/* Parallel for-loop */
+#define hypre_LoopBeginCUDA(size, idx)                                                                \
+{                                                                                                     \
    BoxLoopforall(size, HYPRE_LAMBDA (HYPRE_Int idx)                                                   \
    {
 
-#define hypre_LoopEnd()                                                                                      \
-    });                                                                                                      \
-    }
+#define hypre_LoopEndCUDA()                                                                           \
+   });                                                                                                \
+}
 
 /* Reduction BoxLoop1 */
-#define hypre_BoxLoop1ReductionBegin(ndim, loop_size, dbox1, start1, stride1, i1, reducesum)                  \
-    {                                                                                                         \
-        hypre_newBoxLoopInit(ndim, loop_size);                                                                \
-        hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                                \
+#define hypre_BoxLoop1ReductionBeginCUDA(ndim, loop_size, dbox1, start1, stride1, i1, reducesum)                 \
+{                                                                                                                \
+   hypre_newBoxLoopInit(ndim, loop_size);                                                                        \
+   hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                                        \
    ReductionBoxLoopforall(hypre__tot, reducesum, HYPRE_LAMBDA (HYPRE_Int idx, decltype(reducesum) &reducesum)    \
    {                                                                                                             \
       hypre_newBoxLoopDeclare(databox1);                                                                         \
       hypre_BoxLoopIncK(1, databox1, i1);
 
-#define hypre_BoxLoop1ReductionEnd(i1, reducesum)                                                            \
-    });                                                                                                      \
-    }
+#define hypre_BoxLoop1ReductionEndCUDA(i1, reducesum)                                                            \
+   });                                                                                                           \
+}
 
 /* Reduction BoxLoop2 */
-#define hypre_BoxLoop2ReductionBegin(ndim, loop_size, dbox1, start1, stride1, i1, dbox2, start2, stride2,     \
-                                     i2, reducesum)                                                           \
-    {                                                                                                         \
-        hypre_newBoxLoopInit(ndim, loop_size);                                                                \
-        hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                                \
-        hypre_BoxLoopDataDeclareK(2, ndim, loop_size, dbox2, start2, stride2);                                \
+#define hypre_BoxLoop2ReductionBeginCUDA(ndim, loop_size, dbox1, start1, stride1, i1,                            \
+                                                          dbox2, start2, stride2, i2, reducesum)                 \
+{                                                                                                                \
+   hypre_newBoxLoopInit(ndim, loop_size);                                                                        \
+   hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                                        \
+   hypre_BoxLoopDataDeclareK(2, ndim, loop_size, dbox2, start2, stride2);                                        \
    ReductionBoxLoopforall(hypre__tot, reducesum, HYPRE_LAMBDA (HYPRE_Int idx, decltype(reducesum) &reducesum)    \
    {                                                                                                             \
       hypre_newBoxLoopDeclare(databox1);                                                                         \
       hypre_BoxLoopIncK(1, databox1, i1);                                                                        \
       hypre_BoxLoopIncK(2, databox2, i2);
 
-#define hypre_BoxLoop2ReductionEnd(i1, i2, reducesum)                                                        \
-    });                                                                                                      \
-    }
+#define hypre_BoxLoop2ReductionEndCUDA(i1, i2, reducesum)                                                        \
+   });                                                                                                           \
+}
 
 /* Renamings */
-#define hypre_BoxLoopBlock() 0
-
-#define hypre_BoxLoop0Begin hypre_newBoxLoop0Begin
-#define hypre_BoxLoop0For hypre_newBoxLoop0For
-#define hypre_BoxLoop0End hypre_newBoxLoop0End
-#define hypre_BoxLoop1Begin hypre_newBoxLoop1Begin
-#define hypre_BoxLoop1For hypre_newBoxLoop1For
-#define hypre_BoxLoop1End hypre_newBoxLoop1End
-#define hypre_BoxLoop2Begin hypre_newBoxLoop2Begin
-#define hypre_BoxLoop2For hypre_newBoxLoop2For
-#define hypre_BoxLoop2End hypre_newBoxLoop2End
-#define hypre_BoxLoop3Begin hypre_newBoxLoop3Begin
-#define hypre_BoxLoop3For hypre_newBoxLoop3For
-#define hypre_BoxLoop3End hypre_newBoxLoop3End
-#define hypre_BoxLoop4Begin hypre_newBoxLoop4Begin
-#define hypre_BoxLoop4For hypre_newBoxLoop4For
-#define hypre_BoxLoop4End hypre_newBoxLoop4End
-
-#define hypre_BasicBoxLoop1Begin zypre_newBasicBoxLoop1Begin
-#define hypre_BasicBoxLoop2Begin zypre_newBasicBoxLoop2Begin
+#define hypre_BoxLoopGetIndexDevice          hypre_BoxLoopGetIndexCUDA
+#define hypre_BoxLoopBlockDevice()           0
+#define hypre_BoxLoop0BeginDevice            hypre_BoxLoop0BeginCUDA
+#define hypre_BoxLoop0EndDevice              hypre_BoxLoop0EndCUDA
+#define hypre_BoxLoop1BeginDevice            hypre_BoxLoop1BeginCUDA
+#define hypre_BoxLoop1EndDevice              hypre_BoxLoop1EndCUDA
+#define hypre_BoxLoop2BeginDevice            hypre_BoxLoop2BeginCUDA
+#define hypre_BoxLoop2EndDevice              hypre_BoxLoop2EndCUDA
+#define hypre_BoxLoop3BeginDevice            hypre_BoxLoop3BeginCUDA
+#define hypre_BoxLoop3EndDevice              hypre_BoxLoop3EndCUDA
+#define hypre_BoxLoop4BeginDevice            hypre_BoxLoop4BeginCUDA
+#define hypre_BoxLoop4EndDevice              hypre_BoxLoop4EndCUDA
+#define hypre_BasicBoxLoop1BeginDevice       hypre_BasicBoxLoop1BeginCUDA
+#define hypre_BasicBoxLoop2BeginDevice       hypre_BasicBoxLoop2BeginCUDA
+#define hypre_LoopBeginDevice                hypre_LoopBeginCUDA
+#define hypre_LoopEndDevice                  hypre_LoopEndCUDA
+#define hypre_BoxLoop1ReductionBeginDevice   hypre_BoxLoop1ReductionBeginCUDA
+#define hypre_BoxLoop1ReductionEndDevice     hypre_BoxLoop1ReductionEndCUDA
+#define hypre_BoxLoop2ReductionBeginDevice   hypre_BoxLoop2ReductionBeginCUDA
+#define hypre_BoxLoop2ReductionEndDevice     hypre_BoxLoop2ReductionEndCUDA
+
+
+//TODO TEMP FIX
+#define hypre_BoxLoopGetIndex          hypre_BoxLoopGetIndexDevice
+#define hypre_BoxLoopBlock()           0
+#define hypre_BoxLoop0Begin            hypre_BoxLoop0BeginDevice
+#define hypre_BoxLoop0End              hypre_BoxLoop0EndDevice
+#define hypre_BoxLoop1Begin            hypre_BoxLoop1BeginDevice
+#define hypre_BoxLoop1End              hypre_BoxLoop1EndDevice
+#define hypre_BoxLoop2Begin            hypre_BoxLoop2BeginDevice
+#define hypre_BoxLoop2End              hypre_BoxLoop2EndDevice
+#define hypre_BoxLoop3Begin            hypre_BoxLoop3BeginDevice
+#define hypre_BoxLoop3End              hypre_BoxLoop3EndDevice
+#define hypre_BoxLoop4Begin            hypre_BoxLoop4BeginDevice
+#define hypre_BoxLoop4End              hypre_BoxLoop4EndDevice
+#define hypre_BasicBoxLoop1Begin       hypre_BasicBoxLoop1BeginDevice
+#define hypre_BasicBoxLoop2Begin       hypre_BasicBoxLoop2BeginDevice
+#define hypre_LoopBegin                hypre_LoopBeginDevice
+#define hypre_LoopEnd                  hypre_LoopEndDevice
+#define hypre_BoxLoop1ReductionBegin   hypre_BoxLoop1ReductionBeginDevice
+#define hypre_BoxLoop1ReductionEnd     hypre_BoxLoop1ReductionEndDevice
+#define hypre_BoxLoop2ReductionBegin   hypre_BoxLoop2ReductionBeginDevice
+#define hypre_BoxLoop2ReductionEnd     hypre_BoxLoop2ReductionEndDevice
+
+#endif
 
 #endif /* #ifndef HYPRE_BOXLOOP_CUDA_HEADER */
 
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ * Header info for the BoxLoop
+ *
+ *****************************************************************************/
+
+/*--------------------------------------------------------------------------
+ * BoxLoop macros:
+ *--------------------------------------------------------------------------*/
+
+#ifndef HYPRE_BOXLOOP_SYCL_HEADER
+#define HYPRE_BOXLOOP_SYCL_HEADER
+
+#if defined(HYPRE_USING_SYCL) && !defined(HYPRE_USING_RAJA) && !defined(HYPRE_USING_KOKKOS)
+
+typedef struct hypre_Boxloop_struct
+{
+   HYPRE_Int lsize0, lsize1, lsize2;
+   HYPRE_Int strides0, strides1, strides2;
+   HYPRE_Int bstart0, bstart1, bstart2;
+   HYPRE_Int bsize0, bsize1, bsize2;
+} hypre_Boxloop;
+
+
+#ifdef __cplusplus
+extern "C++"
+{
+#endif
+
+   /*********************************************************************
+    * wrapper functions calling sycl parallel_for
+    * WM: todo - add runtime switch between CPU/GPU execution
+    *********************************************************************/
+
+   template<typename LOOP_BODY>
+   void
+   BoxLoopforall( HYPRE_Int length,
+                  LOOP_BODY loop_body)
+   {
+      if (length <= 0)
+      {
+         return;
+      }
+      dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+      dim3 gDim = hypre_GetDefaultDeviceGridDimension(length, "thread", bDim);
+
+      hypre_HandleComputeStream(hypre_handle())->submit([&] (sycl::handler & cgh)
+      {
+         cgh.parallel_for(sycl::nd_range<3>(gDim * bDim, bDim), loop_body);
+      }).wait_and_throw();
+   }
+
+   template<typename LOOP_BODY>
+   void
+   ReductionBoxLoopforall( LOOP_BODY  loop_body,
+                           HYPRE_Int length,
+                           HYPRE_Real * shared_sum_var )
+   {
+      if (length <= 0)
+      {
+         return;
+      }
+      dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+      dim3 gDim = hypre_GetDefaultDeviceGridDimension(length, "thread", bDim);
+
+      hypre_HandleComputeStream(hypre_handle())->submit([&] (sycl::handler & cgh)
+      {
+         cgh.parallel_for(sycl::nd_range<3>(gDim * bDim, bDim), sycl::reduction(shared_sum_var,
+                                                                                std::plus<>()), loop_body);
+      }).wait_and_throw();
+   }
+
+#ifdef __cplusplus
+}
+#endif
+
+
+/*********************************************************************
+ * Init/Declare/IncK etc.
+ *********************************************************************/
+
+/* Get 1-D length of the loop, in hypre__tot */
+#define hypre_newBoxLoopInit(ndim, loop_size)              \
+   HYPRE_Int hypre__tot = 1;                               \
+   for (HYPRE_Int hypre_d = 0; hypre_d < ndim; hypre_d ++) \
+   {                                                       \
+      hypre__tot *= loop_size[hypre_d];                    \
+   }
+
+/* Initialize struct for box-k */
+#define hypre_BoxLoopDataDeclareK(k, ndim, loop_size, dbox, start, stride) \
+   hypre_Boxloop databox##k;                                               \
+   databox##k.lsize0   = loop_size[0];                                     \
+   databox##k.strides0 = stride[0];                                        \
+   databox##k.bstart0  = start[0] - dbox->imin[0];                         \
+   databox##k.bsize0   = dbox->imax[0] - dbox->imin[0];                    \
+   if (ndim > 1)                                                           \
+   {                                                                       \
+      databox##k.lsize1   = loop_size[1];                                  \
+      databox##k.strides1 = stride[1];                                     \
+      databox##k.bstart1  = start[1] - dbox->imin[1];                      \
+      databox##k.bsize1   = dbox->imax[1] - dbox->imin[1];                 \
+   }                                                                       \
+   else                                                                    \
+   {                                                                       \
+      databox##k.lsize1   = 1;                                             \
+      databox##k.strides1 = 0;                                             \
+      databox##k.bstart1  = 0;                                             \
+      databox##k.bsize1   = 0;                                             \
+   }                                                                       \
+   if (ndim == 3)                                                          \
+   {                                                                       \
+      databox##k.lsize2   = loop_size[2];                                  \
+      databox##k.strides2 = stride[2];                                     \
+      databox##k.bstart2  = start[2] - dbox->imin[2];                      \
+      databox##k.bsize2   = dbox->imax[2] - dbox->imin[2];                 \
+   }                                                                       \
+   else                                                                    \
+   {                                                                       \
+      databox##k.lsize2   = 1;                                             \
+      databox##k.strides2 = 0;                                             \
+      databox##k.bstart2  = 0;                                             \
+      databox##k.bsize2   = 0;                                             \
+   }
+
+#define hypre_BasicBoxLoopDataDeclareK(k,ndim,loop_size,stride) \
+hypre_Boxloop databox##k;                                       \
+databox##k.lsize0   = loop_size[0];                             \
+databox##k.strides0 = stride[0];                                \
+databox##k.bstart0  = 0;                                        \
+databox##k.bsize0   = 0;                                        \
+if (ndim > 1)                                                   \
+{                                                               \
+   databox##k.lsize1   = loop_size[1];                          \
+   databox##k.strides1 = stride[1];                             \
+   databox##k.bstart1  = 0;                                     \
+   databox##k.bsize1   = 0;                                     \
+}                                                               \
+else                                                            \
+{                                                               \
+   databox##k.lsize1   = 1;                                     \
+   databox##k.strides1 = 0;                                     \
+   databox##k.bstart1  = 0;                                     \
+   databox##k.bsize1   = 0;                                     \
+}                                                               \
+if (ndim == 3)                                                  \
+{                                                               \
+   databox##k.lsize2   = loop_size[2];                          \
+   databox##k.strides2 = stride[2];                             \
+   databox##k.bstart2  = 0;                                     \
+   databox##k.bsize2   = 0;                                     \
+}                                                               \
+else                                                            \
+{                                                               \
+    databox##k.lsize2   = 1;                                    \
+    databox##k.strides2 = 0;                                    \
+    databox##k.bstart2  = 0;                                    \
+    databox##k.bsize2   = 0;                                    \
+}
+
+/* Given input 1-D 'idx' in box, get 3-D 'local_idx' in loop_size */
+#define hypre_newBoxLoopDeclare(box)                     \
+   hypre_Index local_idx;                                \
+   HYPRE_Int idx_local = idx;                            \
+   hypre_IndexD(local_idx, 0)  = idx_local % box.lsize0; \
+   idx_local = idx_local / box.lsize0;                   \
+   hypre_IndexD(local_idx, 1)  = idx_local % box.lsize1; \
+   idx_local = idx_local / box.lsize1;                   \
+   hypre_IndexD(local_idx, 2)  = idx_local % box.lsize2; \
+
+/* Given input 3-D 'local_idx', get 1-D 'hypre__i' in 'box' */
+#define hypre_BoxLoopIncK(k, box, hypre__i)                                               \
+   HYPRE_Int hypre_boxD##k = 1;                                                           \
+   HYPRE_Int hypre__i = 0;                                                                \
+   hypre__i += (hypre_IndexD(local_idx, 0) * box.strides0 + box.bstart0) * hypre_boxD##k; \
+   hypre_boxD##k *= hypre_max(0, box.bsize0 + 1);                                         \
+   hypre__i += (hypre_IndexD(local_idx, 1) * box.strides1 + box.bstart1) * hypre_boxD##k; \
+   hypre_boxD##k *= hypre_max(0, box.bsize1 + 1);                                         \
+   hypre__i += (hypre_IndexD(local_idx, 2) * box.strides2 + box.bstart2) * hypre_boxD##k; \
+   hypre_boxD##k *= hypre_max(0, box.bsize2 + 1);
+
+/* get 3-D local_idx into 'index' */
+#define hypre_BoxLoopGetIndex(index)      \
+   index[0] = hypre_IndexD(local_idx, 0); \
+   index[1] = hypre_IndexD(local_idx, 1); \
+   index[2] = hypre_IndexD(local_idx, 2);
+
+
+/*********************************************************************
+ * Boxloops
+ *********************************************************************/
+
+/* BoxLoop 0 */
+#define hypre_newBoxLoop0Begin(ndim, loop_size)                                                       \
+{                                                                                                     \
+   hypre_newBoxLoopInit(ndim, loop_size);                                                             \
+   BoxLoopforall(hypre__tot, [=] (sycl::nd_item<3> item)                                              \
+   {                                                                                                  \
+      HYPRE_Int idx = (HYPRE_Int) item.get_global_linear_id();                                        \
+      if (idx < hypre__tot)                                                                           \
+      {                                                                                               \
+
+#define hypre_newBoxLoop0End()                                                                        \
+      }                                                                                               \
+   });                                                                                                \
+}
+
+/* BoxLoop 1 */
+#define hypre_newBoxLoop1Begin(ndim, loop_size, dbox1, start1, stride1, i1)                           \
+{                                                                                                     \
+   hypre_newBoxLoopInit(ndim, loop_size);                                                             \
+   hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                             \
+   BoxLoopforall(hypre__tot, [=] (sycl::nd_item<3> item)                                              \
+   {                                                                                                  \
+      HYPRE_Int idx = (HYPRE_Int) item.get_global_linear_id();                                        \
+      if (idx < hypre__tot)                                                                           \
+      {                                                                                               \
+         hypre_newBoxLoopDeclare(databox1);                                                           \
+         hypre_BoxLoopIncK(1, databox1, i1);
+
+#define hypre_newBoxLoop1End(i1)                                                                      \
+      }                                                                                               \
+   });                                                                                                \
+}
+
+/* BoxLoop 2 */
+#define hypre_newBoxLoop2Begin(ndim, loop_size, dbox1, start1, stride1, i1,                           \
+                                                dbox2, start2, stride2, i2)                           \
+{                                                                                                     \
+   hypre_newBoxLoopInit(ndim, loop_size);                                                             \
+   hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                             \
+   hypre_BoxLoopDataDeclareK(2, ndim, loop_size, dbox2, start2, stride2);                             \
+   BoxLoopforall(hypre__tot, [=] (sycl::nd_item<3> item)                                              \
+   {                                                                                                  \
+      HYPRE_Int idx = (HYPRE_Int) item.get_global_linear_id();                                        \
+      if (idx < hypre__tot)                                                                           \
+      {                                                                                               \
+         hypre_newBoxLoopDeclare(databox1);                                                           \
+         hypre_BoxLoopIncK(1, databox1, i1);                                                          \
+         hypre_BoxLoopIncK(2, databox2, i2);
+
+#define hypre_newBoxLoop2End(i1, i2)                                                                  \
+      }                                                                                               \
+   });                                                                                                \
+}
+
+/* BoxLoop 3 */
+#define hypre_newBoxLoop3Begin(ndim, loop_size, dbox1, start1, stride1, i1,                           \
+                                                dbox2, start2, stride2, i2,                           \
+                                                dbox3, start3, stride3, i3)                           \
+{                                                                                                     \
+   hypre_newBoxLoopInit(ndim, loop_size);                                                             \
+   hypre_BoxLoopDataDeclareK(1, ndim,loop_size, dbox1, start1, stride1);                              \
+   hypre_BoxLoopDataDeclareK(2, ndim,loop_size, dbox2, start2, stride2);                              \
+   hypre_BoxLoopDataDeclareK(3, ndim,loop_size, dbox3, start3, stride3);                              \
+   BoxLoopforall(hypre__tot, [=] (sycl::nd_item<3> item)                                              \
+   {                                                                                                  \
+      HYPRE_Int idx = (HYPRE_Int) item.get_global_linear_id();                                        \
+      if (idx < hypre__tot)                                                                           \
+      {                                                                                               \
+         hypre_newBoxLoopDeclare(databox1);                                                           \
+         hypre_BoxLoopIncK(1, databox1, i1);                                                          \
+         hypre_BoxLoopIncK(2, databox2, i2);                                                          \
+         hypre_BoxLoopIncK(3, databox3, i3);
+
+#define hypre_newBoxLoop3End(i1, i2, i3)                                                              \
+      }                                                                                               \
+   });                                                                                                \
+}
+
+/* BoxLoop 4 */
+#define hypre_newBoxLoop4Begin(ndim, loop_size, dbox1, start1, stride1, i1,                           \
+                                                dbox2, start2, stride2, i2,                           \
+                                                dbox3, start3, stride3, i3,                           \
+                                                dbox4, start4, stride4, i4)                           \
+{                                                                                                     \
+   hypre_newBoxLoopInit(ndim, loop_size);                                                             \
+   hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                             \
+   hypre_BoxLoopDataDeclareK(2, ndim, loop_size, dbox2, start2, stride2);                             \
+   hypre_BoxLoopDataDeclareK(3, ndim, loop_size, dbox3, start3, stride3);                             \
+   hypre_BoxLoopDataDeclareK(4, ndim, loop_size, dbox4, start4, stride4);                             \
+   BoxLoopforall(hypre__tot, [=] (sycl::nd_item<3> item)                                              \
+   {                                                                                                  \
+      HYPRE_Int idx = (HYPRE_Int) item.get_global_linear_id();                                        \
+      if (idx < hypre__tot)                                                                           \
+      {                                                                                               \
+         hypre_newBoxLoopDeclare(databox1);                                                           \
+         hypre_BoxLoopIncK(1, databox1, i1);                                                          \
+         hypre_BoxLoopIncK(2, databox2, i2);                                                          \
+         hypre_BoxLoopIncK(3, databox3, i3);                                                          \
+         hypre_BoxLoopIncK(4, databox4, i4);
+
+#define hypre_newBoxLoop4End(i1, i2, i3, i4)                                                          \
+      }                                                                                               \
+   });                                                                                                \
+}
+
+
+/* Basic BoxLoops have no boxes */
+/* BoxLoop 1 */
+#define hypre_newBasicBoxLoop1Begin(ndim, loop_size, stride1, i1)                                     \
+{                                                                                                     \
+   hypre_newBoxLoopInit(ndim, loop_size);                                                             \
+   hypre_BasicBoxLoopDataDeclareK(1, ndim, loop_size, stride1);                                       \
+   BoxLoopforall(hypre__tot, [=] (sycl::nd_item<3> item)                                              \
+   {                                                                                                  \
+      HYPRE_Int idx = (HYPRE_Int) item.get_global_linear_id();                                        \
+      if (idx < hypre__tot)                                                                           \
+      {                                                                                               \
+         hypre_newBoxLoopDeclare(databox1);                                                           \
+         hypre_BoxLoopIncK(1, databox1, i1);
+
+/* BoxLoop 2 */
+#define hypre_newBasicBoxLoop2Begin(ndim, loop_size, stride1, i1, stride2, i2)                        \
+{                                                                                                     \
+   hypre_newBoxLoopInit(ndim, loop_size);                                                             \
+   hypre_BasicBoxLoopDataDeclareK(1, ndim, loop_size, stride1);                                       \
+   hypre_BasicBoxLoopDataDeclareK(2, ndim, loop_size, stride2);                                       \
+   BoxLoopforall(hypre__tot, [=] (sycl::nd_item<3> item)                                              \
+   {                                                                                                  \
+      HYPRE_Int idx = (HYPRE_Int) item.get_global_linear_id();                                        \
+      if (idx < hypre__tot)                                                                           \
+      {                                                                                               \
+         hypre_newBoxLoopDeclare(databox1);                                                           \
+         hypre_BoxLoopIncK(1, databox1, i1);                                                          \
+         hypre_BoxLoopIncK(2, databox2, i2);
+
+
+/* Reduction BoxLoop1 */
+#define hypre_newBoxLoop1ReductionBegin(ndim, loop_size, dbox1, start1, stride1, i1, sum_var)         \
+{                                                                                                     \
+   hypre_newBoxLoopInit(ndim, loop_size);                                                             \
+   hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                             \
+   HYPRE_Real *shared_sum_var = hypre_CTAlloc(HYPRE_Real, 1, HYPRE_MEMORY_DEVICE);                    \
+   hypre_TMemcpy(shared_sum_var, &sum_var, HYPRE_Real, 1, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);    \
+   ReductionBoxLoopforall( [=,hypre_unused_var=sum_var] (sycl::nd_item<3> item, auto &sum_var)        \
+   {                                                                                                  \
+      HYPRE_Int idx = (HYPRE_Int) item.get_global_linear_id();                                        \
+      if (idx < hypre__tot)                                                                           \
+      {                                                                                               \
+         hypre_newBoxLoopDeclare(databox1);                                                           \
+         hypre_BoxLoopIncK(1, databox1, i1);
+
+#define hypre_newBoxLoop1ReductionEnd(i1, sum_var)                                                    \
+      }                                                                                               \
+   }, hypre__tot, shared_sum_var);                                                                    \
+   hypre_TMemcpy(&sum_var, shared_sum_var, HYPRE_Real, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);    \
+   hypre_TFree(shared_sum_var, HYPRE_MEMORY_DEVICE);                                                  \
+}
+
+/* Reduction BoxLoop2 */
+#define hypre_newBoxLoop2ReductionBegin(ndim, loop_size, dbox1, start1, stride1, i1,                  \
+                                                      dbox2, start2, stride2, i2, sum_var)            \
+{                                                                                                     \
+   hypre_newBoxLoopInit(ndim, loop_size);                                                             \
+   hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                             \
+   hypre_BoxLoopDataDeclareK(2, ndim, loop_size, dbox2, start2, stride2);                             \
+   HYPRE_Real *shared_sum_var = hypre_CTAlloc(HYPRE_Real, 1, HYPRE_MEMORY_DEVICE);                    \
+   hypre_TMemcpy(shared_sum_var, &sum_var, HYPRE_Real, 1, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);    \
+   ReductionBoxLoopforall( [=,hypre_unused_var=sum_var] (sycl::nd_item<3> item, auto &sum_var)        \
+   {                                                                                                  \
+      HYPRE_Int idx = (HYPRE_Int) item.get_global_linear_id();                                        \
+      if (idx < hypre__tot)                                                                           \
+      {                                                                                               \
+         hypre_newBoxLoopDeclare(databox1);                                                           \
+         hypre_BoxLoopIncK(1, databox1, i1);                                                          \
+         hypre_BoxLoopIncK(2, databox2, i2);
+
+#define hypre_newBoxLoop2ReductionEnd(i1, i2, sum_var)                                                \
+      }                                                                                               \
+   }, hypre__tot, shared_sum_var);                                                                    \
+   hypre_TMemcpy(&sum_var, shared_sum_var, HYPRE_Real, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);    \
+   hypre_TFree(shared_sum_var, HYPRE_MEMORY_DEVICE);                                                  \
+}
+
+/* Plain parallel_for loop */
+#define hypre_LoopBegin(size, idx)                                                                    \
+{                                                                                                     \
+   HYPRE_Int hypre__tot = size;                                                                       \
+   BoxLoopforall(hypre__tot, [=] (sycl::nd_item<3> item)                                              \
+   {                                                                                                  \
+      HYPRE_Int idx = (HYPRE_Int) item.get_global_linear_id();                                        \
+      if (idx < hypre__tot)                                                                           \
+      {                                                                                               \
+
+#define hypre_LoopEnd()                                                                               \
+      }                                                                                               \
+   });                                                                                                \
+}
+
+
+/*********************************************************************
+ * renamings
+ *********************************************************************/
+
+#define hypre_BoxLoopBlock()       0
+
+#define hypre_BoxLoop0Begin      hypre_newBoxLoop0Begin
+#define hypre_BoxLoop0End        hypre_newBoxLoop0End
+#define hypre_BoxLoop1Begin      hypre_newBoxLoop1Begin
+#define hypre_BoxLoop1End        hypre_newBoxLoop1End
+#define hypre_BoxLoop2Begin      hypre_newBoxLoop2Begin
+#define hypre_BoxLoop2End        hypre_newBoxLoop2End
+#define hypre_BoxLoop3Begin      hypre_newBoxLoop3Begin
+#define hypre_BoxLoop3End        hypre_newBoxLoop3End
+#define hypre_BoxLoop4Begin      hypre_newBoxLoop4Begin
+#define hypre_BoxLoop4End        hypre_newBoxLoop4End
+
+#define hypre_BasicBoxLoop1Begin hypre_newBasicBoxLoop1Begin
+#define hypre_BasicBoxLoop2Begin hypre_newBasicBoxLoop2Begin
+
+/* Reduction */
+#define hypre_BoxLoop1ReductionBegin(ndim, loop_size, dbox1, start1, stride1, i1, reducesum) \
+        hypre_newBoxLoop1ReductionBegin(ndim, loop_size, dbox1, start1, stride1, i1, reducesum)
+
+#define hypre_BoxLoop1ReductionEnd(i1, reducesum) \
+        hypre_newBoxLoop1ReductionEnd(i1, reducesum)
+
+#define hypre_BoxLoop2ReductionBegin(ndim, loop_size, dbox1, start1, stride1, i1, \
+                                                      dbox2, start2, stride2, i2, reducesum) \
+        hypre_newBoxLoop2ReductionBegin(ndim, loop_size, dbox1, start1, stride1, i1, \
+                                                         dbox2, start2, stride2, i2, reducesum)
+
+#define hypre_BoxLoop2ReductionEnd(i1, i2, reducesum) \
+        hypre_newBoxLoop2ReductionEnd(i1, i2, reducesum)
+
 #endif
 
+#endif /* #ifndef HYPRE_BOXLOOP_SYCL_HEADER */
+
+
 #ifdef __cplusplus
 }
 #endif
 
 #endif
+
diff --git a/external/hypre/src/struct_mv/assumed_part.c b/external/hypre/src/struct_mv/assumed_part.c
index 2ced440f..a7badb37 100644
--- a/external/hypre/src/struct_mv/assumed_part.c
+++ b/external/hypre/src/struct_mv/assumed_part.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -50,7 +50,7 @@ hypre_IndexFromRank( HYPRE_Int    rank,
    HYPRE_Int  d, r, s;
 
    r = rank;
-   for (d = ndim-1; d >= 0; d--)
+   for (d = ndim - 1; d >= 0; d--)
    {
       s = hypre_IndexProd(bsize, d);
       hypre_IndexD(index, d) = r / s;
@@ -87,6 +87,9 @@ hypre_APSubdivideRegion( hypre_Box      *region,
    hypre_Index  isize, index, div;
    hypre_Box   *box;
 
+   /* Initialize div */
+   hypre_SetIndex(div, 0);
+
    /* if level = 0 then no dividing */
    if (!level)
    {
@@ -112,18 +115,18 @@ hypre_APSubdivideRegion( hypre_Box      *region,
    {
       dv = 1;
       sz = hypre_IndexD(isize, i);
-      for (j = 0; j< level; j++)
+      for (j = 0; j < level; j++)
       {
-         if (sz >= 2*dv*min_gridpts)  /* Cut each dim in half */
+         if (sz >= 2 * dv * min_gridpts) /* Cut each dim in half */
          {
             dv *= 2;
          }
       }
 
       /* Space for each partition */
-      partition[i] = hypre_TAlloc(HYPRE_Int,  dv+1, HYPRE_MEMORY_HOST);
+      partition[i] = hypre_TAlloc(HYPRE_Int,  dv + 1, HYPRE_MEMORY_HOST);
       /* Total number of regions to create */
-      total = total*dv;
+      total = total * dv;
 
       hypre_IndexD(div, i) = dv;
    }
@@ -143,7 +146,7 @@ hypre_APSubdivideRegion( hypre_Box      *region,
       extra =  points % dv;
       for (j = 1; j < dv; j++)
       {
-         partition[i][j] = partition[i][j-1] + width;
+         partition[i][j] = partition[i][j - 1] + width;
          if (j <= extra)
          {
             partition[i][j]++;
@@ -161,7 +164,7 @@ hypre_APSubdivideRegion( hypre_Box      *region,
       {
          j = hypre_IndexD(index, i);
          hypre_BoxIMinD(box, i) = partition[i][j];
-         hypre_BoxIMaxD(box, i) = partition[i][j+1]-1;
+         hypre_BoxIMaxD(box, i) = partition[i][j + 1] - 1;
       }
       count++;
    }
@@ -216,20 +219,20 @@ hypre_APFindMyBoxesInRegions( hypre_BoxArray *region_array,
 
       region = hypre_BoxArrayBox(region_array, i);
 
-      for (j = 0; j< num_boxes; j++)
+      for (j = 0; j < num_boxes; j++)
       {
          my_box = hypre_BoxArrayBox(my_box_array, j);
          /* Check if its a zero volume box.  If so, it still need to be counted,
             so expand until volume is non-zero, then intersect. */
-	 if (hypre_BoxVolume(my_box) == 0)
-	 {
+         if (hypre_BoxVolume(my_box) == 0)
+         {
             hypre_CopyBox(my_box, grow_box);
             for (d = 0; d < ndim; d++)
             {
-               if(!hypre_BoxSizeD(my_box, d))
+               if (!hypre_BoxSizeD(my_box, d))
                {
                   hypre_IndexD(grow_index, d) =
-                     (hypre_BoxIMinD(my_box, d) - hypre_BoxIMaxD(my_box, d) + 1)/2;
+                     (hypre_BoxIMinD(my_box, d) - hypre_BoxIMaxD(my_box, d) + 1) / 2;
                }
                else
                {
@@ -240,12 +243,12 @@ hypre_APFindMyBoxesInRegions( hypre_BoxArray *region_array,
             hypre_BoxGrowByIndex(grow_box, grow_index);
             /* Do they intersect? */
             hypre_IntersectBoxes(grow_box, region, result_box);
-	 }
-	 else
-	 {
+         }
+         else
+         {
             /* Do they intersect? */
             hypre_IntersectBoxes(my_box, region, result_box);
-	 }
+         }
          if (hypre_BoxVolume(result_box) > 0)
          {
             count_array[i]++;
@@ -292,9 +295,11 @@ hypre_APGetAllBoxesInRegions( hypre_BoxArray *region_array,
    num_regions = hypre_BoxArraySize(region_array);
 
    send_buf_count = hypre_CTAlloc(HYPRE_Int,  num_regions, HYPRE_MEMORY_HOST);
-   send_buf_vol = hypre_CTAlloc(HYPRE_Real,  num_regions*2, HYPRE_MEMORY_HOST); /* allocate HYPRE_Real */
+   send_buf_vol = hypre_CTAlloc(HYPRE_Real,  num_regions * 2,
+                                HYPRE_MEMORY_HOST); /* allocate HYPRE_Real */
 
-   dbl_vol_and_count =  hypre_CTAlloc(HYPRE_Real,  num_regions*2, HYPRE_MEMORY_HOST); /* allocate HYPRE_Real */
+   dbl_vol_and_count =  hypre_CTAlloc(HYPRE_Real,  num_regions * 2,
+                                      HYPRE_MEMORY_HOST); /* allocate HYPRE_Real */
 
    hypre_APFindMyBoxesInRegions( region_array, my_box_array, &send_buf_count,
                                  &send_buf_vol);
@@ -303,17 +308,17 @@ hypre_APGetAllBoxesInRegions( hypre_BoxArray *region_array,
    /* Copy ints to doubles so we can do one Allreduce */
    for (i = 0; i < num_regions; i++)
    {
-      send_buf_vol[num_regions+i] = (HYPRE_Real) send_buf_count[i];
+      send_buf_vol[num_regions + i] = (HYPRE_Real) send_buf_count[i];
    }
 
-   hypre_MPI_Allreduce(send_buf_vol, dbl_vol_and_count, num_regions*2,
+   hypre_MPI_Allreduce(send_buf_vol, dbl_vol_and_count, num_regions * 2,
                        HYPRE_MPI_REAL, hypre_MPI_SUM, comm);
 
    /* Unpack */
    for (i = 0; i < num_regions; i++)
    {
       vol_array[i] = dbl_vol_and_count[i];
-      count_array[i] = (HYPRE_Int) dbl_vol_and_count[num_regions+i];
+      count_array[i] = (HYPRE_Int) dbl_vol_and_count[num_regions + i];
    }
 
    /* Clean up */
@@ -348,13 +353,13 @@ hypre_APShrinkRegions( hypre_BoxArray *region_array,
    hypre_Index   grow_index, imin, imax;
 
    ndim  = hypre_BoxArrayNDim(my_box_array);
-   ndim2 = 2*ndim;
+   ndim2 = 2 * ndim;
 
    num_boxes   = hypre_BoxArraySize(my_box_array);
    num_regions = hypre_BoxArraySize(region_array);
 
-   indices = hypre_CTAlloc(HYPRE_Int,  num_regions*ndim2, HYPRE_MEMORY_HOST);
-   recvbuf = hypre_CTAlloc(HYPRE_Int,  num_regions*ndim2, HYPRE_MEMORY_HOST);
+   indices = hypre_CTAlloc(HYPRE_Int,  num_regions * ndim2, HYPRE_MEMORY_HOST);
+   recvbuf = hypre_CTAlloc(HYPRE_Int,  num_regions * ndim2, HYPRE_MEMORY_HOST);
 
    result_box = hypre_BoxCreate(ndim);
 
@@ -377,15 +382,15 @@ hypre_APShrinkRegions( hypre_BoxArray *region_array,
 
          /* Check if its a zero volume box.  If so, it still needs to be
             checked, so expand until volume is nonzero, then intersect. */
-	 if (hypre_BoxVolume(my_box) == 0)
-	 {
+         if (hypre_BoxVolume(my_box) == 0)
+         {
             hypre_CopyBox(my_box, grow_box);
             for (d = 0; d < ndim; d++)
             {
-               if(!hypre_BoxSizeD(my_box, d))
+               if (!hypre_BoxSizeD(my_box, d))
                {
                   hypre_IndexD(grow_index, d) =
-                     (hypre_BoxIMinD(my_box, d) - hypre_BoxIMaxD(my_box, d) + 1)/2;
+                     (hypre_BoxIMinD(my_box, d) - hypre_BoxIMaxD(my_box, d) + 1) / 2;
                }
                else
                {
@@ -396,9 +401,9 @@ hypre_APShrinkRegions( hypre_BoxArray *region_array,
             hypre_BoxGrowByIndex(grow_box, grow_index);
             /* Do they intersect? */
             hypre_IntersectBoxes(grow_box, region, result_box);
-	 }
-	 else
-	 {
+         }
+         else
+         {
             /* Do they intersect? */
             hypre_IntersectBoxes( my_box, region, result_box);
          }
@@ -407,11 +412,11 @@ hypre_APShrinkRegions( hypre_BoxArray *region_array,
          {
             if (!count) /* Set min and max for first box */
             {
-               ii = i*ndim2;
+               ii = i * ndim2;
                for (d = 0; d < ndim; d++)
                {
                   indices[ii + d] = hypre_BoxIMinD(result_box, d);
-                  indices[ii + ndim +d] = hypre_BoxIMaxD(result_box, d);
+                  indices[ii + ndim + d] = hypre_BoxIMaxD(result_box, d);
                }
             }
 
@@ -419,7 +424,7 @@ hypre_APShrinkRegions( hypre_BoxArray *region_array,
 
             /* Boxes intersect, so get max and min extents of the result box
                (this keeps the bounds inside the region) */
-            ii = i*ndim2;
+            ii = i * ndim2;
             for (d = 0; d < ndim; d++)
             {
                indices[ii + d] = hypre_min(indices[ii + d],
@@ -434,7 +439,7 @@ hypre_APShrinkRegions( hypre_BoxArray *region_array,
          the region and the max to the min! */
       if (!count)
       {
-         ii = i*ndim2;
+         ii = i * ndim2;
          for (d = 0; d < ndim; d++)
          {
             indices[ii + d] = hypre_BoxIMaxD(region, d);
@@ -444,7 +449,7 @@ hypre_APShrinkRegions( hypre_BoxArray *region_array,
 
       /* Negate max indices for the Allreduce */
       /* Note: min(x)= -max(-x) */
-      ii = i*ndim2;
+      ii = i * ndim2;
       for (d = 0; d < ndim; d++)
       {
          indices[ii + ndim + d] = -indices[ii + ndim + d];
@@ -452,7 +457,7 @@ hypre_APShrinkRegions( hypre_BoxArray *region_array,
    }
 
    /* Do an Allreduce on size and volume to get the global information */
-   hypre_MPI_Allreduce(indices, recvbuf, num_regions*ndim2, HYPRE_MPI_INT,
+   hypre_MPI_Allreduce(indices, recvbuf, num_regions * ndim2, HYPRE_MPI_INT,
                        hypre_MPI_MIN, comm);
 
    /* Unpack the "shrunk" regions */
@@ -463,7 +468,7 @@ hypre_APShrinkRegions( hypre_BoxArray *region_array,
       region = hypre_BoxArrayBox(region_array, i);
 
       /* Resize the box */
-      ii = i*ndim2;
+      ii = i * ndim2;
       for (d = 0; d < ndim; d++)
       {
          hypre_IndexD(imin, d) =  recvbuf[ii + d];
@@ -530,14 +535,14 @@ hypre_APPruneRegions( hypre_BoxArray *region_array,
       {
          if (j < count)
          {
-            while ((i+j) == delete_indices[j])
+            while ((i + j) == delete_indices[j])
             {
                j++; /* Increase the shift */
-               if (j == count) break;
+               if (j == count) { break; }
             }
          }
-         vol_array[i] = vol_array[i+j];
-         count_array[i] = count_array[i+j];
+         vol_array[i] = vol_array[i + j];
+         count_array[i] = count_array[i + j];
       }
    }
 
@@ -602,7 +607,7 @@ hypre_APRefineRegionsByVol( hypre_BoxArray *region_array,
 
    /* Want to refine the regions starting with those that are the least full */
    /* Sort the fraction AND the index */
-   hypre_qsort2(order, fraction_full, 0, num_regions-1);
+   hypre_qsort2(order, fraction_full, 0, num_regions - 1);
 
    /* Now we can subdivide any that are not full enough */
    /* When this is called, we know that size < max_regions */
@@ -626,7 +631,7 @@ hypre_APRefineRegionsByVol( hypre_BoxArray *region_array,
       est_size = num_regions + hypre_pow2(ndim) - 1;
       if (est_size > num_procs)
       {
-         if (loop==0)
+         if (loop == 0)
          {
             /* Some are less than gamma full, but we cannot further subdivide
                due to max processors limit (no subdividing occured) */
@@ -658,7 +663,7 @@ hypre_APRefineRegionsByVol( hypre_BoxArray *region_array,
       }
 
       /* If we are on the last region */
-      if  ((loop+1) == init_num_regions)
+      if  ((loop + 1) == init_num_regions)
       {
          break;
       }
@@ -670,7 +675,7 @@ hypre_APRefineRegionsByVol( hypre_BoxArray *region_array,
       if (num_regions >= max_regions)
       {
          /* See if next regions satifies gamma */
-         if (fraction_full[order[loop+1]] > gamma)
+         if (fraction_full[order[loop + 1]] > gamma)
          {
             /* All regions less than gamma full have been subdivided (and we
                have reached max) */
@@ -687,7 +692,7 @@ hypre_APRefineRegionsByVol( hypre_BoxArray *region_array,
       loop++; /* Increment to repeat loop */
    }
 
-   if (count ==0 )
+   if (count == 0 )
    {
       /* No refining occured so don't do any more */
       *return_code = 1;
@@ -696,7 +701,7 @@ hypre_APRefineRegionsByVol( hypre_BoxArray *region_array,
    {
       /* We subdivided count regions */
       /* Delete the old regions */
-      hypre_qsort0(delete_indices, 0, count-1); /* Put deleted indices in asc order */
+      hypre_qsort0(delete_indices, 0, count - 1); /* Put deleted indices in asc order */
       hypre_DeleteMultipleBoxes( region_array, delete_indices, count );
    }
 
@@ -745,12 +750,12 @@ hypre_StructAssumedPartitionCreate(
    HYPRE_Int          myid, num_procs;
    HYPRE_Int          num_proc_partitions;
    HYPRE_Int          count_array_size;
-   HYPRE_Int         *count_array=NULL;
-   HYPRE_Real        *vol_array=NULL, one_volume, dbl_vol;
+   HYPRE_Int         *count_array = NULL;
+   HYPRE_Real        *vol_array = NULL, one_volume, dbl_vol;
    HYPRE_Int          return_code;
    HYPRE_Int          num_refine;
    HYPRE_Int          total_boxes, proc_count, max_position;
-   HYPRE_Int         *proc_array=NULL;
+   HYPRE_Int         *proc_array = NULL;
    HYPRE_Int          initial_level;
    HYPRE_Int          dmax;
    HYPRE_Real         width, wmin, wmax;
@@ -764,9 +769,9 @@ hypre_StructAssumedPartitionCreate(
 
    HYPRE_Int   proc_alloc, count, box_count;
    HYPRE_Int   max_response_size;
-   HYPRE_Int  *response_buf = NULL, *response_buf_starts=NULL;
+   HYPRE_Int  *response_buf = NULL, *response_buf_starts = NULL;
    HYPRE_Int  *tmp_proc_ids = NULL, *tmp_box_nums = NULL, *tmp_box_inds = NULL;
-   HYPRE_Int  *proc_array_starts=NULL;
+   HYPRE_Int  *proc_array_starts = NULL;
 
    hypre_BoxArray              *my_partition;
    hypre_DataExchangeResponse  response_obj;
@@ -822,7 +827,7 @@ hypre_StructAssumedPartitionCreate(
    max_regions = hypre_min(num_procs, max_regions);
 
    /* Don't want more regions than boxes either */
-   if (global_num_boxes) max_regions = hypre_min(global_num_boxes, max_regions);
+   if (global_num_boxes) { max_regions = hypre_min(global_num_boxes, max_regions); }
 
    /* Start with a region array of size 0 */
    region_array = hypre_BoxArrayCreate(0, ndim);
@@ -832,8 +837,8 @@ hypre_StructAssumedPartitionCreate(
 
    one_volume = hypre_doubleBoxVolume(bounding_box);
 
-   if( ((global_boxes_size/one_volume) > gamma) ||
-       (global_num_boxes > one_volume) || (global_num_boxes == 0) )
+   if ( ((global_boxes_size / one_volume) > gamma) ||
+        (global_num_boxes > one_volume) || (global_num_boxes == 0) )
    {
       /* Don't bother with any refinements.  We are full enough, or we have a
          small bounding box and we are not full because of empty boxes */
@@ -849,10 +854,10 @@ hypre_StructAssumedPartitionCreate(
          we have a smaller number of procs */
       for (i = 0; i < initial_level; i++)
       {
-         if ( hypre_pow2(initial_level*ndim) > num_procs) initial_level --;
+         if ( hypre_pow2(initial_level * ndim) > num_procs) { initial_level --; }
 
          /* Not be able to do any refinements due to the number of processors */
-         if (!initial_level) max_refinements = 0;
+         if (!initial_level) { max_refinements = 0; }
       }
    }
 
@@ -862,7 +867,7 @@ hypre_StructAssumedPartitionCreate(
 #endif
 
 #if REFINE_INFO
-   if (myid ==0)
+   if (myid == 0)
    {
       hypre_printf("gamma =  %g\n", gamma);
       hypre_printf("max_regions =  %d\n", max_regions);
@@ -874,7 +879,7 @@ hypre_StructAssumedPartitionCreate(
    /* Divide the bounding box */
    hypre_APSubdivideRegion(bounding_box, ndim, initial_level, region_array, &size);
    /* If no subdividing occured (because too small) then don't try to refine */
-   if (initial_level > 0 && size ==1) max_refinements = 0;
+   if (initial_level > 0 && size == 1) { max_refinements = 0; }
 
    /* Need space for count and volume */
    size = hypre_BoxArraySize(region_array);
@@ -889,7 +894,7 @@ hypre_StructAssumedPartitionCreate(
    /* Don't do any initial prune and shrink if we have only one region and we
       can't do any refinements */
 
-   if ( !(size ==1 && max_refinements == 0))
+   if ( !(size == 1 && max_refinements == 0))
    {
       /* Get rid of regions with no boxes (and adjust count and vol arrays) */
       hypre_APPruneRegions( region_array, &count_array, &vol_array);
@@ -934,7 +939,7 @@ hypre_StructAssumedPartitionCreate(
       {
          count_array = hypre_TReAlloc(count_array,  HYPRE_Int,   size, HYPRE_MEMORY_HOST);
          vol_array =  hypre_TReAlloc(vol_array,  HYPRE_Real,   size, HYPRE_MEMORY_HOST);
-         count_array_size =size;
+         count_array_size = size;
       }
 
       /* FUTURE MOD: Just count and prune and shrink in the modified regions
@@ -954,7 +959,7 @@ hypre_StructAssumedPartitionCreate(
       /* 5 = all regions < gamma full were subdivided and max reached */
       /* 3 = some regions were divided (not all that needed) and max reached */
       if ( (return_code == 3 || return_code == 5)
-           && size ==hypre_BoxArraySize(region_array) )
+           && size == hypre_BoxArraySize(region_array) )
       {
          break;
       }
@@ -978,7 +983,7 @@ hypre_StructAssumedPartitionCreate(
    }
 
 #if REGION_STAT
-   if (myid ==0)
+   if (myid == 0)
    {
       hypre_printf("myid = %d, %d REGIONS (after refining %d times\n",
                    myid, hypre_BoxArraySize(region_array), num_refine);
@@ -1044,15 +1049,15 @@ hypre_StructAssumedPartitionCreate(
       else
       {
          proc_array[i] = (HYPRE_Int)
-            hypre_round( ((HYPRE_Real)count_array[i]/(HYPRE_Real)total_boxes) *
-                         (HYPRE_Real) num_proc_partitions );
+                         hypre_round( ((HYPRE_Real)count_array[i] / (HYPRE_Real)total_boxes) *
+                                      (HYPRE_Real) num_proc_partitions );
       }
 
       box =  hypre_BoxArrayBox(region_array, i);
       dbl_vol = hypre_doubleBoxVolume(box);
 
       /* Can't have any zeros! */
-      if (!proc_array[i]) proc_array[i] = 1;
+      if (!proc_array[i]) { proc_array[i] = 1; }
 
       if (dbl_vol < (HYPRE_Real) proc_array[i])
       {
@@ -1102,7 +1107,7 @@ hypre_StructAssumedPartitionCreate(
       }
       else
       {
-         while (i < size && proc_array[i] <=1) /* size is the number of regions */
+         while (i < size && proc_array[i] <= 1) /* size is the number of regions */
          {
             i++;
          }
@@ -1117,11 +1122,11 @@ hypre_StructAssumedPartitionCreate(
       processor partition */
    /* size = # of regions */
    hypre_StructAssumedPartProcPartitions(assumed_part) =
-      hypre_CTAlloc(HYPRE_Int,  size+ 1, HYPRE_MEMORY_HOST);
+      hypre_CTAlloc(HYPRE_Int,  size + 1, HYPRE_MEMORY_HOST);
    hypre_StructAssumedPartProcPartition(assumed_part, 0) = 0;
    for (i = 0; i < size; i++)
    {
-      hypre_StructAssumedPartProcPartition(assumed_part, i+1) =
+      hypre_StructAssumedPartProcPartition(assumed_part, i + 1) =
          hypre_StructAssumedPartProcPartition(assumed_part, i) + proc_array[i];
    }
 
@@ -1160,23 +1165,23 @@ hypre_StructAssumedPartitionCreate(
          rn_cube_divs, then div_index[dmax] is incremented until we have more
          partitions than processors. */
 
-      rn_cubes = hypre_doubleBoxVolume(box) / pow(wmin, ndim);
+      rn_cubes = hypre_doubleBoxVolume(box) / hypre_pow(wmin, ndim);
       rn_cube_procs = proc_count / rn_cubes;
-      rn_cube_divs = pow(rn_cube_procs, (1.0/(HYPRE_Real)ndim));
+      rn_cube_divs = hypre_pow(rn_cube_procs, (1.0 / (HYPRE_Real)ndim));
 
       for (d = 0; d < ndim; d++)
       {
          width = hypre_BoxSizeD(box, d);
-         rdiv = rn_cube_divs*(width/wmin);
+         rdiv = rn_cube_divs * (width / wmin);
          /* Add a small number to compensate for roundoff issues */
-         hypre_IndexD(div_index, d) = (HYPRE_Int) floor(rdiv + 1.0e-6);
+         hypre_IndexD(div_index, d) = (HYPRE_Int) hypre_floor(rdiv + 1.0e-6);
          /* Make sure div_index[d] is at least 1 */
          hypre_IndexD(div_index, d) = hypre_max(hypre_IndexD(div_index, d), 1);
       }
 
       /* Decrease div_index to ensure no more than 2 partitions per processor.
        * This is only needed when div_index[d] is adjusted to 1 above. */
-      while (hypre_IndexProd(div_index, ndim) >= 2*proc_count)
+      while (hypre_IndexProd(div_index, ndim) >= 2 * proc_count)
       {
          /* Decrease the max dimension by a factor of 2 without going below 1 */
          hypre_IndexD(div_index, dmax) = (hypre_IndexD(div_index, dmax) + 1) / 2;
@@ -1246,7 +1251,7 @@ hypre_StructAssumedPartitionCreate(
 
    /* Probably there will mostly be one proc per box */
    /* Don't want to allocate too much memory here */
-   size = 1.2 * hypre_BoxArraySize(local_boxes);
+   size = (HYPRE_Int)(1.2 * hypre_BoxArraySize(local_boxes));
 
    /* Each local box may live on multiple procs in the assumed partition */
    tmp_proc_ids = hypre_CTAlloc(HYPRE_Int,  size, HYPRE_MEMORY_HOST); /* local box proc ids */
@@ -1266,7 +1271,7 @@ hypre_StructAssumedPartitionCreate(
       /* Do we need more storage? */
       if ((count + proc_count) > size)
       {
-         size = size + proc_count + 1.2*(hypre_BoxArraySize(local_boxes)-i);
+         size = (HYPRE_Int)(size + proc_count + 1.2 * (hypre_BoxArraySize(local_boxes) - i));
          /* hypre_printf("myid = %d, *adjust* alloc size = %d\n", myid, size);*/
          tmp_proc_ids = hypre_TReAlloc(tmp_proc_ids,  HYPRE_Int,  size, HYPRE_MEMORY_HOST);
          tmp_box_nums = hypre_TReAlloc(tmp_box_nums,  HYPRE_Int,  size, HYPRE_MEMORY_HOST);
@@ -1288,16 +1293,16 @@ hypre_StructAssumedPartitionCreate(
       and then create a new buffer to send to the exchange data function. */
 
    /* Sort the proc_ids */
-   hypre_qsort3i(tmp_proc_ids, tmp_box_nums, tmp_box_inds, 0, count-1);
+   hypre_qsort3i(tmp_proc_ids, tmp_box_nums, tmp_box_inds, 0, count - 1);
 
    /* Use proc_array for the processor ids to contact.  Use box array to get our
       boxes and then pass the array only (not the structure) to exchange data. */
    box_count = count;
 
-   contact_boxinfo = hypre_CTAlloc(HYPRE_Int,  box_count*(1+2*ndim), HYPRE_MEMORY_HOST);
+   contact_boxinfo = hypre_CTAlloc(HYPRE_Int,  box_count * (1 + 2 * ndim), HYPRE_MEMORY_HOST);
 
    proc_array = hypre_TReAlloc(proc_array,  HYPRE_Int,  box_count, HYPRE_MEMORY_HOST);
-   proc_array_starts = hypre_CTAlloc(HYPRE_Int,  box_count+1, HYPRE_MEMORY_HOST);
+   proc_array_starts = hypre_CTAlloc(HYPRE_Int,  box_count + 1, HYPRE_MEMORY_HOST);
    proc_array_starts[0] = 0;
 
    proc_count = 0;
@@ -1319,7 +1324,7 @@ hypre_StructAssumedPartitionCreate(
 
    for (i = 1; i < box_count; i++)
    {
-      if (tmp_proc_ids[i]  != proc_array[proc_count-1])
+      if (tmp_proc_ids[i]  != proc_array[proc_count - 1])
       {
          proc_array[proc_count] = tmp_proc_ids[i];
          proc_array_starts[proc_count] = i;
@@ -1371,7 +1376,7 @@ hypre_StructAssumedPartitionCreate(
 
    hypre_DataExchangeList(proc_count, proc_array,
                           contact_boxinfo, proc_array_starts,
-                          (1+2*ndim)*sizeof(HYPRE_Int),
+                          (1 + 2 * ndim)*sizeof(HYPRE_Int),
                           sizeof(HYPRE_Int), &response_obj, max_response_size, 1,
                           comm, (void**) &response_buf, &response_buf_starts);
 
@@ -1416,15 +1421,16 @@ hypre_StructAssumedPartitionDestroy( hypre_StructAssumedPart *assumed_part )
  *****************************************************************************/
 
 HYPRE_Int
-hypre_APFillResponseStructAssumedPart(
-   void      *p_recv_contact_buf,
-   HYPRE_Int  contact_size,
-   HYPRE_Int  contact_proc,
-   void      *ro,
-   MPI_Comm   comm,
-   void     **p_send_response_buf,
-   HYPRE_Int *response_message_size )
+hypre_APFillResponseStructAssumedPart(void      *p_recv_contact_buf,
+                                      HYPRE_Int  contact_size,
+                                      HYPRE_Int  contact_proc,
+                                      void      *ro,
+                                      MPI_Comm   comm,
+                                      void     **p_send_response_buf,
+                                      HYPRE_Int *response_message_size )
 {
+   HYPRE_UNUSED_VAR(p_send_response_buf);
+
    HYPRE_Int    ndim, size, alloc_size, myid, i, d, index;
    HYPRE_Int   *ids, *boxnums;
    HYPRE_Int   *recv_contact_buf;
@@ -1466,8 +1472,8 @@ hypre_APFillResponseStructAssumedPart(
    index = 0;
    for (i = 0; i < contact_size; i++)
    {
-      ids[size+i] = contact_proc; /* Set the proc id */
-      boxnums[size+i] = recv_contact_buf[index++];
+      ids[size + i] = contact_proc; /* Set the proc id */
+      boxnums[size + i] = recv_contact_buf[index++];
       for (d = 0; d < ndim; d++)
       {
          hypre_BoxIMinD(box, d) = recv_contact_buf[index++];
@@ -1533,7 +1539,7 @@ hypre_StructAssumedPartitionGetRegionsFromProc(
       in_region = 0;
       if (num_regions > 1)
       {
-         while (proc_id >= proc_partitions[in_region+1])
+         while (proc_id >= proc_partitions[in_region + 1])
          {
             in_region++;
          }
@@ -1542,7 +1548,7 @@ hypre_StructAssumedPartitionGetRegionsFromProc(
       /* First processor in the range */
       proc_start = proc_partitions[in_region];
       /* How many processors in that region? */
-      proc_count = proc_partitions[in_region+1] - proc_partitions[in_region];
+      proc_count = proc_partitions[in_region + 1] - proc_partitions[in_region];
       /* Get the region */
       region = hypre_BoxArrayBox(hypre_StructAssumedPartRegions(assumed_part),
                                  in_region);
@@ -1570,7 +1576,7 @@ hypre_StructAssumedPartitionGetRegionsFromProc(
       /* Get my partition number */
       if (adj_proc_id < extra)
       {
-         part_num = adj_proc_id*2;
+         part_num = adj_proc_id * 2;
          num_assumed = 2;
       }
       else
@@ -1587,15 +1593,15 @@ hypre_StructAssumedPartitionGetRegionsFromProc(
    {
       hypre_IndexFromRank(part_num + i, div, divindex, ndim);
 
-      for (d = ndim-1; d >= 0; d--)
+      for (d = ndim - 1; d >= 0; d--)
       {
          width = hypre_IndexD(rsize, d) / hypre_IndexD(div, d);
          extra = hypre_IndexD(rsize, d) % hypre_IndexD(div, d);
 
          divi = hypre_IndexD(divindex, d);
-         hypre_IndexD(imin, d) = divi*width + hypre_min(divi, extra);
+         hypre_IndexD(imin, d) = divi * width + hypre_min(divi, extra);
          divi = hypre_IndexD(divindex, d) + 1;
-         hypre_IndexD(imax, d) = divi*width + hypre_min(divi, extra) - 1;
+         hypre_IndexD(imax, d) = divi * width + hypre_min(divi, extra) - 1;
 
          /* Change relative coordinates to absolute */
          hypre_IndexD(imin, d) +=  hypre_BoxIMinD(region, d);
@@ -1711,7 +1717,7 @@ hypre_StructAssumedPartitionGetProcsFromBox(
       /* First processor in the range */
       proc_start = proc_partitions[this_region];
       /* How many processors in that region? */
-      proc_count = proc_partitions[this_region+1] - proc_start;
+      proc_count = proc_partitions[this_region + 1] - proc_start;
       /* Size of the regions */
       hypre_BoxGetSize(region, rsize);
       /* Get the divisons in each dimension */
@@ -1730,27 +1736,27 @@ hypre_StructAssumedPartitionGetProcsFromBox(
 
          /* imin component, shifted by region imin */
          i = hypre_BoxIMinD(result_box, d) - hypre_BoxIMinD(region, d);
-         p = i/(width+1);
+         p = i / (width + 1);
          if (p < extra)
          {
             hypre_BoxIMinD(part_box, d) = p + 1;
          }
          else
          {
-            q = (i - extra*(width+1))/width;
+            q = (i - extra * (width + 1)) / width;
             hypre_BoxIMinD(part_box, d) = extra + q + 1;
          }
 
          /* imax component, shifted by region imin  */
          i = hypre_BoxIMaxD(result_box, d) - hypre_BoxIMinD(region, d);
-         p = i/(width+1);
+         p = i / (width + 1);
          if (p < extra)
          {
             hypre_BoxIMaxD(part_box, d) = p + 1;
          }
          else
          {
-            q = (i - extra*(width+1))/width;
+            q = (i - extra * (width + 1)) / width;
             hypre_BoxIMaxD(part_box, d) = extra + q + 1;
          }
       }
@@ -1768,13 +1774,13 @@ hypre_StructAssumedPartitionGetProcsFromBox(
       hypre_SerialBoxLoop1Begin(ndim, loop_size, part_dbox, start, stride, part_num);
       {
          /*convert the partition number to a processor number*/
-         if (part_num < (2*extra))
+         if (part_num < (2 * extra))
          {
-            adj_proc_id = part_num/2 ;
+            adj_proc_id = part_num / 2 ;
          }
          else
          {
-            adj_proc_id =  extra + (part_num - 2*extra);
+            adj_proc_id =  extra + (part_num - 2 * extra);
          }
 
          if (num_proc_ids == size_proc_ids)
@@ -1794,7 +1800,7 @@ hypre_StructAssumedPartitionGetProcsFromBox(
    {
       /* Determine unique proc_ids (could be duplicates due to a processor
          owning more than one partiton in a region).  Sort the array. */
-      hypre_qsort0(proc_ids, 0, num_proc_ids-1);
+      hypre_qsort0(proc_ids, 0, num_proc_ids - 1);
 
       /* Make sure we have enough space from proc_array */
       if (*size_alloc_proc_array < num_proc_ids)
@@ -1808,7 +1814,7 @@ hypre_StructAssumedPartitionGetProcsFromBox(
       proc_array_count = 1;
       for (i = 1; i < num_proc_ids; i++)
       {
-         if  (proc_ids[i] != proc_array[proc_array_count-1])
+         if  (proc_ids[i] != proc_array[proc_array_count - 1])
          {
             proc_array[proc_array_count] = proc_ids[i];
             proc_array_count++;
@@ -1869,7 +1875,7 @@ hypre_StructCoarsenAP(hypre_StructAssumedPart  *ap,
    hypre_StructAssumedPartRegions(new_ap) = regions_array;
    hypre_StructAssumedPartNumRegions(new_ap) = num_regions;
    hypre_StructAssumedPartProcPartitions(new_ap) =
-      hypre_CTAlloc(HYPRE_Int,  num_regions+1, HYPRE_MEMORY_HOST);
+      hypre_CTAlloc(HYPRE_Int,  num_regions + 1, HYPRE_MEMORY_HOST);
    hypre_StructAssumedPartDivisions(new_ap) =
       hypre_CTAlloc(HYPRE_Int,  num_regions, HYPRE_MEMORY_HOST);
 
@@ -1884,8 +1890,8 @@ hypre_StructCoarsenAP(hypre_StructAssumedPart  *ap,
       hypre_StructAssumedPartDivision(new_ap, i) =
          hypre_StructAssumedPartDivision(new_ap, i);
 
-      hypre_StructAssumedPartProcPartition(new_ap, i+1)=
-         hypre_StructAssumedPartProcPartition(ap, i+1);
+      hypre_StructAssumedPartProcPartition(new_ap, i + 1) =
+         hypre_StructAssumedPartProcPartition(ap, i + 1);
    }
 
    /* Copy my partition (at most 2 boxes)*/
@@ -1919,7 +1925,7 @@ hypre_StructCoarsenAP(hypre_StructAssumedPart  *ap,
 
    hypre_ForBoxI(i, fine_boxes)
    {
-      box =  hypre_BoxArrayBox(fine_boxes,i);
+      box =  hypre_BoxArrayBox(fine_boxes, i);
       hypre_CopyBox(box, new_box);
       hypre_StructCoarsenBox(new_box, index, stride);
    }
diff --git a/external/hypre/src/struct_mv/assumed_part.h b/external/hypre/src/struct_mv/assumed_part.h
index f67ccd4b..8ec5edd2 100644
--- a/external/hypre/src/struct_mv/assumed_part.h
+++ b/external/hypre/src/struct_mv/assumed_part.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -14,13 +14,13 @@
 #ifndef hypre_ASSUMED_PART_HEADER
 #define hypre_ASSUMED_PART_HEADER
 
-typedef struct 
+typedef struct
 {
-   /* the entries will be the same for all procs */  
+   /* the entries will be the same for all procs */
    HYPRE_Int           ndim;             /* number of dimensions */
    hypre_BoxArray     *regions;          /* areas of the grid with boxes */
-   HYPRE_Int           num_regions;      /* how many regions */    
-   HYPRE_Int          *proc_partitions;  /* proc ids assigned to each region  
+   HYPRE_Int           num_regions;      /* how many regions */
+   HYPRE_Int          *proc_partitions;  /* proc ids assigned to each region
                                             (this is size num_regions +1) */
    hypre_Index        *divisions;        /* number of proc divisions in each
                                             direction for each region */
@@ -29,22 +29,22 @@ typedef struct
    hypre_BoxArray     *my_partition_boxes;  /* boxes in my portion */
    HYPRE_Int          *my_partition_proc_ids;
    HYPRE_Int          *my_partition_boxnums;
-   HYPRE_Int           my_partition_ids_size;   
+   HYPRE_Int           my_partition_ids_size;
    HYPRE_Int           my_partition_ids_alloc;
    HYPRE_Int           my_partition_num_distinct_procs;
-    
+
 } hypre_StructAssumedPart;
 
 
 /*Accessor macros */
 
-#define hypre_StructAssumedPartNDim(apart) ((apart)->ndim) 
-#define hypre_StructAssumedPartRegions(apart) ((apart)->regions) 
-#define hypre_StructAssumedPartNumRegions(apart) ((apart)->num_regions) 
-#define hypre_StructAssumedPartDivisions(apart) ((apart)->divisions) 
-#define hypre_StructAssumedPartDivision(apart, i) ((apart)->divisions[i]) 
-#define hypre_StructAssumedPartProcPartitions(apart) ((apart)->proc_partitions) 
-#define hypre_StructAssumedPartProcPartition(apart, i) ((apart)->proc_partitions[i]) 
+#define hypre_StructAssumedPartNDim(apart) ((apart)->ndim)
+#define hypre_StructAssumedPartRegions(apart) ((apart)->regions)
+#define hypre_StructAssumedPartNumRegions(apart) ((apart)->num_regions)
+#define hypre_StructAssumedPartDivisions(apart) ((apart)->divisions)
+#define hypre_StructAssumedPartDivision(apart, i) ((apart)->divisions[i])
+#define hypre_StructAssumedPartProcPartitions(apart) ((apart)->proc_partitions)
+#define hypre_StructAssumedPartProcPartition(apart, i) ((apart)->proc_partitions[i])
 #define hypre_StructAssumedPartMyPartition(apart) ((apart)->my_partition)
 #define hypre_StructAssumedPartMyPartitionBoxes(apart) ((apart)->my_partition_boxes)
 #define hypre_StructAssumedPartMyPartitionProcIds(apart) ((apart)->my_partition_proc_ids)
diff --git a/external/hypre/src/struct_mv/box.c b/external/hypre/src/struct_mv/box.c
index 7679a91e..4ce82449 100644
--- a/external/hypre/src/struct_mv/box.c
+++ b/external/hypre/src/struct_mv/box.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -199,6 +199,51 @@ hypre_IndexesEqual( hypre_Index  index1,
    return equal;
 }
 
+/*--------------------------------------------------------------------------
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_IndexPrint( FILE        *file,
+                  HYPRE_Int    ndim,
+                  hypre_Index  index )
+{
+   HYPRE_Int d;
+
+   hypre_fprintf(file, "[%d", hypre_IndexD(index, 0));
+   for (d = 1; d < ndim; d++)
+   {
+      hypre_fprintf(file, " %d", hypre_IndexD(index, d));
+   }
+   hypre_fprintf(file, "]");
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_IndexRead( FILE        *file,
+                 HYPRE_Int    ndim,
+                 hypre_Index  index )
+{
+   HYPRE_Int d;
+
+   hypre_fscanf(file, "[%d", &hypre_IndexD(index, 0));
+   for (d = 1; d < ndim; d++)
+   {
+      hypre_fscanf(file, " %d", &hypre_IndexD(index, d));
+   }
+   hypre_fscanf(file, "]");
+
+   for (d = ndim; d < HYPRE_MAXDIM; d++)
+   {
+      hypre_IndexD(index, d) = 0;
+   }
+
+   return hypre_error_flag;
+}
+
 /*==========================================================================
  * Member functions: hypre_Box
  *==========================================================================*/
@@ -220,7 +265,7 @@ hypre_BoxCreate( HYPRE_Int  ndim )
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 hypre_BoxDestroy( hypre_Box *box )
 {
    if (box)
@@ -290,7 +335,7 @@ hypre_BoxDuplicate( hypre_Box *box )
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 hypre_BoxVolume( hypre_Box *box )
 {
    HYPRE_Int volume, d, ndim = hypre_BoxNDim(box);
@@ -365,7 +410,7 @@ hypre_BoxGetSize( hypre_Box   *box,
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 hypre_BoxGetStrideSize( hypre_Box   *box,
                         hypre_Index  stride,
                         hypre_Index  size   )
@@ -388,7 +433,7 @@ hypre_BoxGetStrideSize( hypre_Box   *box,
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 hypre_BoxGetStrideVolume( hypre_Box   *box,
                           hypre_Index  stride,
                           HYPRE_Int   *volume_ptr )
@@ -447,7 +492,7 @@ hypre_BoxRankIndex( hypre_Box   *box,
 
    r = rank;
    s = hypre_BoxVolume(box);
-   for (d = ndim-1; d >= 0; d--)
+   for (d = ndim - 1; d >= 0; d--)
    {
       s = s / hypre_BoxSizeD(box, d);
       hypre_IndexD(index, d) = r / s;
@@ -487,7 +532,7 @@ hypre_BoxOffsetDistance( hypre_Box   *box,
 HYPRE_Int
 hypre_BoxShiftPos( hypre_Box   *box,
                    hypre_Index  shift )
-{ 
+{
    HYPRE_Int  d, ndim = hypre_BoxNDim(box);
 
    for (d = 0; d < ndim; d++)
@@ -495,7 +540,7 @@ hypre_BoxShiftPos( hypre_Box   *box,
       hypre_BoxIMinD(box, d) += hypre_IndexD(shift, d);
       hypre_BoxIMaxD(box, d) += hypre_IndexD(shift, d);
    }
-  
+
    return hypre_error_flag;
 }
 
@@ -506,7 +551,7 @@ hypre_BoxShiftPos( hypre_Box   *box,
 HYPRE_Int
 hypre_BoxShiftNeg( hypre_Box   *box,
                    hypre_Index  shift )
-{ 
+{
    HYPRE_Int  d, ndim = hypre_BoxNDim(box);
 
    for (d = 0; d < ndim; d++)
@@ -514,7 +559,7 @@ hypre_BoxShiftNeg( hypre_Box   *box,
       hypre_BoxIMinD(box, d) -= hypre_IndexD(shift, d);
       hypre_BoxIMaxD(box, d) -= hypre_IndexD(shift, d);
    }
-  
+
    return hypre_error_flag;
 }
 
@@ -525,7 +570,7 @@ hypre_BoxShiftNeg( hypre_Box   *box,
 HYPRE_Int
 hypre_BoxGrowByIndex( hypre_Box   *box,
                       hypre_Index  index )
-{ 
+{
    hypre_IndexRef  imin = hypre_BoxIMin(box);
    hypre_IndexRef  imax = hypre_BoxIMax(box);
    HYPRE_Int       ndim = hypre_BoxNDim(box);
@@ -537,7 +582,7 @@ hypre_BoxGrowByIndex( hypre_Box   *box,
       hypre_IndexD(imin, d) -= i;
       hypre_IndexD(imax, d) += i;
    }
-  
+
    return hypre_error_flag;
 }
 
@@ -548,18 +593,18 @@ hypre_BoxGrowByIndex( hypre_Box   *box,
 HYPRE_Int
 hypre_BoxGrowByValue( hypre_Box  *box,
                       HYPRE_Int   val )
-{ 
+{
    HYPRE_Int  *imin = hypre_BoxIMin(box);
    HYPRE_Int  *imax = hypre_BoxIMax(box);
    HYPRE_Int   ndim = hypre_BoxNDim(box);
-   HYPRE_Int  d; 
+   HYPRE_Int  d;
 
    for (d = 0; d < ndim; d++)
    {
       hypre_IndexD(imin, d) -= val;
       hypre_IndexD(imax, d) += val;
    }
-  
+
    return hypre_error_flag;
 }
 
@@ -570,18 +615,84 @@ hypre_BoxGrowByValue( hypre_Box  *box,
 HYPRE_Int
 hypre_BoxGrowByArray( hypre_Box  *box,
                       HYPRE_Int  *array )
-{ 
+{
    HYPRE_Int  *imin = hypre_BoxIMin(box);
    HYPRE_Int  *imax = hypre_BoxIMax(box);
    HYPRE_Int   ndim = hypre_BoxNDim(box);
-   HYPRE_Int   d; 
+   HYPRE_Int   d;
 
    for (d = 0; d < ndim; d++)
    {
-      imin[d] -= array[2*d];
-      imax[d] += array[2*d+1];
+      imin[d] -= array[2 * d];
+      imax[d] += array[2 * d + 1];
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * Print a box to file
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_BoxPrint( FILE      *file,
+                hypre_Box *box )
+{
+   HYPRE_Int   ndim = hypre_BoxNDim(box);
+   HYPRE_Int   d;
+
+   hypre_fprintf(file, "(%d", hypre_BoxIMinD(box, 0));
+   for (d = 1; d < ndim; d++)
+   {
+      hypre_fprintf(file, ", %d", hypre_BoxIMinD(box, d));
+   }
+   hypre_fprintf(file, ") x (%d", hypre_BoxIMaxD(box, 0));
+   for (d = 1; d < ndim; d++)
+   {
+      hypre_fprintf(file, ", %d", hypre_BoxIMaxD(box, d));
+   }
+   hypre_fprintf(file, ")");
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * Read a box from file
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_BoxRead( FILE       *file,
+               HYPRE_Int   ndim,
+               hypre_Box **box_ptr )
+{
+   hypre_Box  *box;
+   HYPRE_Int   d;
+
+   /* Don't create a new box if the output box already exists */
+   if (*box_ptr)
+   {
+      box = *box_ptr;
+      hypre_BoxInit(box, ndim);
+   }
+   else
+   {
+      box = hypre_BoxCreate(ndim);
+   }
+
+   hypre_fscanf(file, "(%d", &hypre_BoxIMinD(box, 0));
+   for (d = 1; d < ndim; d++)
+   {
+      hypre_fscanf(file, ", %d", &hypre_BoxIMinD(box, d));
    }
-  
+   hypre_fscanf(file, ") x (%d", &hypre_BoxIMaxD(box, 0));
+   for (d = 1; d < ndim; d++)
+   {
+      hypre_fscanf(file, ", %d", &hypre_BoxIMaxD(box, d));
+   }
+   hypre_fscanf(file, ")");
+
+   *box_ptr = box;
+
    return hypre_error_flag;
 }
 
@@ -618,7 +729,7 @@ hypre_BoxArrayCreate( HYPRE_Int size,
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 hypre_BoxArrayDestroy( hypre_BoxArray *box_array )
 {
    if (box_array)
@@ -676,7 +787,7 @@ hypre_BoxArrayDuplicate( hypre_BoxArray *box_array )
    HYPRE_Int        i;
 
    new_box_array = hypre_BoxArrayCreate(
-      hypre_BoxArraySize(box_array), hypre_BoxArrayNDim(box_array));
+                      hypre_BoxArraySize(box_array), hypre_BoxArrayNDim(box_array));
    hypre_ForBoxI(i, box_array)
    {
       hypre_CopyBox(hypre_BoxArrayBox(box_array, i),
@@ -691,7 +802,7 @@ hypre_BoxArrayDuplicate( hypre_BoxArray *box_array )
  * The box_array may be empty.
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 hypre_AppendBox( hypre_Box      *box,
                  hypre_BoxArray *box_array )
 {
@@ -708,7 +819,7 @@ hypre_AppendBox( hypre_Box      *box,
  * Delete box from box_array.
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 hypre_DeleteBox( hypre_BoxArray *box_array,
                  HYPRE_Int       index     )
 {
@@ -716,7 +827,7 @@ hypre_DeleteBox( hypre_BoxArray *box_array,
 
    for (i = index; i < hypre_BoxArraySize(box_array) - 1; i++)
    {
-      hypre_CopyBox(hypre_BoxArrayBox(box_array, i+1),
+      hypre_CopyBox(hypre_BoxArrayBox(box_array, i + 1),
                     hypre_BoxArrayBox(box_array, i));
    }
 
@@ -730,7 +841,7 @@ hypre_DeleteBox( hypre_BoxArray *box_array,
  * Assumes indices are in ascending order. (AB 11/04)
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 hypre_DeleteMultipleBoxes( hypre_BoxArray *box_array,
                            HYPRE_Int*  indices,
                            HYPRE_Int num )
@@ -742,30 +853,30 @@ hypre_DeleteMultipleBoxes( hypre_BoxArray *box_array,
       return hypre_error_flag;
    }
 
-   array_size =  hypre_BoxArraySize(box_array);   
+   array_size =  hypre_BoxArraySize(box_array);
    start = indices[0];
    j = 0;
-   
+
    for (i = start; (i + j) < array_size; i++)
    {
       if (j < num)
       {
-         while ((i+j) == indices[j]) /* see if deleting consecutive items */
+         while ((i + j) == indices[j]) /* see if deleting consecutive items */
          {
             j++; /*increase the shift*/
-            if (j == num) break;
+            if (j == num) { break; }
          }
       }
-            
-      if ( (i+j) < array_size)  /* if deleting the last item then no moving */
+
+      if ( (i + j) < array_size) /* if deleting the last item then no moving */
       {
-         hypre_CopyBox(hypre_BoxArrayBox(box_array, i+j),
+         hypre_CopyBox(hypre_BoxArrayBox(box_array, i + j),
                        hypre_BoxArrayBox(box_array, i));
       }
    }
 
    hypre_BoxArraySize(box_array) = array_size - num;
-   
+
    return hypre_error_flag;
 }
 
@@ -774,7 +885,7 @@ hypre_DeleteMultipleBoxes( hypre_BoxArray *box_array,
  * The box_array_1 may be empty.
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int 
+HYPRE_Int
 hypre_AppendBoxArray( hypre_BoxArray *box_array_0,
                       hypre_BoxArray *box_array_1 )
 {
@@ -808,12 +919,12 @@ hypre_BoxArrayArrayCreate( HYPRE_Int size,
 {
    hypre_BoxArrayArray  *box_array_array;
    HYPRE_Int             i;
- 
+
    box_array_array = hypre_CTAlloc(hypre_BoxArrayArray,  1, HYPRE_MEMORY_HOST);
- 
+
    hypre_BoxArrayArrayBoxArrays(box_array_array) =
       hypre_CTAlloc(hypre_BoxArray *,  size, HYPRE_MEMORY_HOST);
- 
+
    for (i = 0; i < size; i++)
    {
       hypre_BoxArrayArrayBoxArray(box_array_array, i) =
@@ -821,7 +932,7 @@ hypre_BoxArrayArrayCreate( HYPRE_Int size,
    }
    hypre_BoxArrayArraySize(box_array_array) = size;
    hypre_BoxArrayArrayNDim(box_array_array) = ndim;
- 
+
    return box_array_array;
 }
 
@@ -832,12 +943,12 @@ HYPRE_Int
 hypre_BoxArrayArrayDestroy( hypre_BoxArrayArray *box_array_array )
 {
    HYPRE_Int  i;
- 
+
    if (box_array_array)
    {
       hypre_ForBoxArrayI(i, box_array_array)
-         hypre_BoxArrayDestroy(
-            hypre_BoxArrayArrayBoxArray(box_array_array, i));
+      hypre_BoxArrayDestroy(
+         hypre_BoxArrayArrayBoxArray(box_array_array, i));
 
       hypre_TFree(hypre_BoxArrayArrayBoxArrays(box_array_array), HYPRE_MEMORY_HOST);
       hypre_TFree(box_array_array, HYPRE_MEMORY_HOST);
@@ -856,24 +967,24 @@ hypre_BoxArrayArrayDuplicate( hypre_BoxArrayArray *box_array_array )
    hypre_BoxArrayArray  *new_box_array_array;
    hypre_BoxArray      **new_box_arrays;
    HYPRE_Int             new_size;
- 
+
    hypre_BoxArray      **box_arrays;
    HYPRE_Int             i;
- 
+
    new_size = hypre_BoxArrayArraySize(box_array_array);
    new_box_array_array = hypre_BoxArrayArrayCreate(
-      new_size, hypre_BoxArrayArrayNDim(box_array_array));
- 
+                            new_size, hypre_BoxArrayArrayNDim(box_array_array));
+
    if (new_size)
    {
       new_box_arrays = hypre_BoxArrayArrayBoxArrays(new_box_array_array);
       box_arrays     = hypre_BoxArrayArrayBoxArrays(box_array_array);
- 
+
       for (i = 0; i < new_size; i++)
       {
          hypre_AppendBoxArray(box_arrays[i], new_box_arrays[i]);
       }
    }
- 
+
    return new_box_array_array;
 }
diff --git a/external/hypre/src/struct_mv/box.h b/external/hypre/src/struct_mv/box.h
index eae00613..8d4c97de 100644
--- a/external/hypre/src/struct_mv/box.h
+++ b/external/hypre/src/struct_mv/box.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -18,12 +18,6 @@
 #define HYPRE_MAXDIM 3
 #endif
 
-#if defined(HYPRE_USING_RAJA) || defined(HYPRE_USING_KOKKOS) || defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_DEVICE_OPENMP) || defined(HYPRE_USING_HIP)
-#define hypre_BoxLoopSetOneBlock()
-#else
-#define hypre_BoxLoopSetOneBlock zypre_BoxLoopSetOneBlock
-#endif
-
 /*--------------------------------------------------------------------------
  * hypre_Index:
  *   This is used to define indices in index space, or dimension
@@ -127,7 +121,7 @@ hypre_max(0, (hypre_BoxIMaxD(box, d) - hypre_BoxIMinD(box, d) + 1))
 #define hypre_CCBoxIndexRank(box, index) 0
 #define hypre_CCBoxIndexRank_noargs() 0
 #define hypre_CCBoxOffsetDistance(box, index) 0
-  
+
 /*----- Avoid using these Box macros -----*/
 
 #define hypre_BoxSizeX(box)    hypre_BoxSizeD(box, 0)
@@ -167,92 +161,6 @@ for (i = 0; i < hypre_BoxArraySize(box_array); i++)
 #define hypre_ForBoxArrayI(i, box_array_array) \
 for (i = 0; i < hypre_BoxArrayArraySize(box_array_array); i++)
 
-/*--------------------------------------------------------------------------
- * BoxLoop macros:
- *--------------------------------------------------------------------------*/
-#define hypre_SerialBoxLoop0Begin(ndim, loop_size)\
-{\
-   zypre_BoxLoopDeclare();\
-   zypre_BoxLoopInit(ndim, loop_size);\
-   hypre_BoxLoopSetOneBlock();\
-   for (hypre__block = 0; hypre__block < hypre__num_blocks; hypre__block++)\
-   {\
-      zypre_BoxLoopSet();\
-      for (hypre__J = 0; hypre__J < hypre__JN; hypre__J++)\
-      {\
-         for (hypre__I = 0; hypre__I < hypre__IN; hypre__I++)\
-         {
-
-#define hypre_SerialBoxLoop0End()\
-         }\
-         zypre_BoxLoopInc1();\
-         zypre_BoxLoopInc2();\
-      }\
-   }\
-}
-
-#define hypre_SerialBoxLoop1Begin(ndim, loop_size,\
-                                  dbox1, start1, stride1, i1)\
-{\
-   HYPRE_Int i1;\
-   zypre_BoxLoopDeclare();\
-   zypre_BoxLoopDeclareK(1);\
-   zypre_BoxLoopInit(ndim, loop_size);\
-   zypre_BoxLoopInitK(1, dbox1, start1, stride1, i1);\
-   zypre_BoxLoopSetOneBlock();\
-   for (hypre__block = 0; hypre__block < hypre__num_blocks; hypre__block++)\
-   {\
-      zypre_BoxLoopSet();\
-      zypre_BoxLoopSetK(1, i1);\
-      for (hypre__J = 0; hypre__J < hypre__JN; hypre__J++)\
-      {\
-         for (hypre__I = 0; hypre__I < hypre__IN; hypre__I++)\
-         {
-
-#define hypre_SerialBoxLoop1End(i1)\
-            i1 += hypre__i0inc1;\
-         }\
-         zypre_BoxLoopInc1();\
-         i1 += hypre__ikinc1[hypre__d];\
-         zypre_BoxLoopInc2();\
-      }\
-   }\
-}
-
-#define hypre_SerialBoxLoop2Begin(ndim, loop_size,\
-                                  dbox1, start1, stride1, i1,\
-                                  dbox2, start2, stride2, i2)\
-{\
-   HYPRE_Int i1,i2;\
-   zypre_BoxLoopDeclare();\
-   zypre_BoxLoopDeclareK(1);\
-   zypre_BoxLoopDeclareK(2);\
-   zypre_BoxLoopInit(ndim, loop_size);\
-   zypre_BoxLoopInitK(1, dbox1, start1, stride1, i1);\
-   zypre_BoxLoopInitK(2, dbox2, start2, stride2, i2);\
-   zypre_BoxLoopSetOneBlock();\
-   for (hypre__block = 0; hypre__block < hypre__num_blocks; hypre__block++)\
-   {\
-      zypre_BoxLoopSet();\
-      zypre_BoxLoopSetK(1, i1);\
-      zypre_BoxLoopSetK(2, i2);\
-      for (hypre__J = 0; hypre__J < hypre__JN; hypre__J++)\
-      {\
-         for (hypre__I = 0; hypre__I < hypre__IN; hypre__I++)\
-         {
-
-#define hypre_SerialBoxLoop2End(i1, i2)\
-            i1 += hypre__i0inc1;\
-            i2 += hypre__i0inc2;\
-         }\
-         zypre_BoxLoopInc1();\
-         i1 += hypre__ikinc1[hypre__d];\
-         i2 += hypre__ikinc2[hypre__d];\
-         zypre_BoxLoopInc2();\
-      }\
-   }\
-}
-
 #define ZYPRE_BOX_PRIVATE hypre__IN,hypre__JN,hypre__I,hypre__J,hypre__d,hypre__i
 #define HYPRE_BOX_PRIVATE ZYPRE_BOX_PRIVATE
 
@@ -286,6 +194,11 @@ if (hypre__num_blocks > 0)\
 {\
    hypre__div = hypre__tot / hypre__num_blocks;\
    hypre__mod = hypre__tot % hypre__num_blocks;\
+}\
+else\
+{\
+   hypre__div = 0;\
+   hypre__mod = 0;\
 }
 
 #define zypre_BoxLoopInitK(k, dboxk, startk, stridek, ik) \
@@ -363,199 +276,6 @@ for (hypre__d = 1; hypre__d < hypre__ndim; hypre__d++)\
 /* Use this to get the block iteration inside a BoxLoop */
 #define zypre_BoxLoopBlock() hypre__block
 
-
-
-
-/* FIXME: Remove !!! */
-/*-----------------------------------*/
-#define zypre_BoxLoop0Begin(ndim, loop_size)\
-{\
-   zypre_BoxLoopDeclare();\
-   zypre_BoxLoopInit(ndim, loop_size);
-
-#define zypre_BoxLoop0For()\
-   for (hypre__block = 0; hypre__block < hypre__num_blocks; hypre__block++)\
-   {\
-      zypre_BoxLoopSet();\
-      for (hypre__J = 0; hypre__J < hypre__JN; hypre__J++)\
-      {\
-         for (hypre__I = 0; hypre__I < hypre__IN; hypre__I++)\
-         {
-
-#define zypre_BoxLoop0End()\
-         }\
-         zypre_BoxLoopInc1();\
-         zypre_BoxLoopInc2();\
-      }\
-   }\
-}
-
-/*-----------------------------------*/
-
-#define zypre_BoxLoop1Begin(ndim, loop_size,\
-                            dbox1, start1, stride1, i1)\
-{\
-   HYPRE_Int i1;\
-   zypre_BoxLoopDeclare();\
-   zypre_BoxLoopDeclareK(1);\
-   zypre_BoxLoopInit(ndim, loop_size);\
-   zypre_BoxLoopInitK(1, dbox1, start1, stride1, i1);
-
-#define zypre_BoxLoop1For(i1)\
-   for (hypre__block = 0; hypre__block < hypre__num_blocks; hypre__block++)\
-   {\
-      HYPRE_Int i1;\
-      zypre_BoxLoopSet();\
-      zypre_BoxLoopSetK(1, i1);\
-      for (hypre__J = 0; hypre__J < hypre__JN; hypre__J++)\
-      {\
-         for (hypre__I = 0; hypre__I < hypre__IN; hypre__I++)\
-         {
-
-#define zypre_BoxLoop1End(i1)\
-            i1 += hypre__i0inc1;\
-         }\
-         zypre_BoxLoopInc1();\
-         i1 += hypre__ikinc1[hypre__d];\
-         zypre_BoxLoopInc2();\
-      }\
-   }\
-}
-
-/*-----------------------------------*/
-
-#define zypre_BoxLoop2Begin(ndim, loop_size,\
-                            dbox1, start1, stride1, i1,\
-                            dbox2, start2, stride2, i2)\
-{\
-   HYPRE_Int i1,i2;\
-   zypre_BoxLoopDeclare();\
-   zypre_BoxLoopDeclareK(1);\
-   zypre_BoxLoopDeclareK(2);\
-   zypre_BoxLoopInit(ndim, loop_size);\
-   zypre_BoxLoopInitK(1, dbox1, start1, stride1, i1);\
-   zypre_BoxLoopInitK(2, dbox2, start2, stride2, i2);
-
-#define zypre_BoxLoop2For(i1, i2)\
-   for (hypre__block = 0; hypre__block < hypre__num_blocks; hypre__block++)\
-   {\
-      HYPRE_Int i1,i2;\
-      zypre_BoxLoopSet();\
-      zypre_BoxLoopSetK(1, i1);\
-      zypre_BoxLoopSetK(2, i2);\
-      for (hypre__J = 0; hypre__J < hypre__JN; hypre__J++)\
-      {\
-         for (hypre__I = 0; hypre__I < hypre__IN; hypre__I++)\
-         {
-
-#define zypre_BoxLoop2End(i1, i2)\
-            i1 += hypre__i0inc1;\
-            i2 += hypre__i0inc2;\
-         }\
-         zypre_BoxLoopInc1();\
-         i1 += hypre__ikinc1[hypre__d];\
-         i2 += hypre__ikinc2[hypre__d];\
-         zypre_BoxLoopInc2();\
-      }\
-   }\
-}
-
-/*-----------------------------------*/
-
-#define zypre_BoxLoop3Begin(ndim, loop_size,\
-                            dbox1, start1, stride1, i1,\
-                            dbox2, start2, stride2, i2,\
-                            dbox3, start3, stride3, i3)\
-{\
-   HYPRE_Int i1,i2,i3;\
-   zypre_BoxLoopDeclare();\
-   zypre_BoxLoopDeclareK(1);\
-   zypre_BoxLoopDeclareK(2);\
-   zypre_BoxLoopDeclareK(3);\
-   zypre_BoxLoopInit(ndim, loop_size);\
-   zypre_BoxLoopInitK(1, dbox1, start1, stride1, i1);\
-   zypre_BoxLoopInitK(2, dbox2, start2, stride2, i2);\
-   zypre_BoxLoopInitK(3, dbox3, start3, stride3, i3);
-
-#define zypre_BoxLoop3For(i1, i2, i3)\
-   for (hypre__block = 0; hypre__block < hypre__num_blocks; hypre__block++)\
-   {\
-      HYPRE_Int i1,i2,i3;\
-      zypre_BoxLoopSet();\
-      zypre_BoxLoopSetK(1, i1);\
-      zypre_BoxLoopSetK(2, i2);\
-      zypre_BoxLoopSetK(3, i3);\
-      for (hypre__J = 0; hypre__J < hypre__JN; hypre__J++)\
-      {\
-         for (hypre__I = 0; hypre__I < hypre__IN; hypre__I++)\
-         {
-
-#define zypre_BoxLoop3End(i1, i2, i3)\
-            i1 += hypre__i0inc1;\
-            i2 += hypre__i0inc2;\
-            i3 += hypre__i0inc3;\
-         }\
-         zypre_BoxLoopInc1();\
-         i1 += hypre__ikinc1[hypre__d];\
-         i2 += hypre__ikinc2[hypre__d];\
-         i3 += hypre__ikinc3[hypre__d];\
-         zypre_BoxLoopInc2();\
-      }\
-   }\
-}
-
-/*-----------------------------------*/
-
-#define zypre_BoxLoop4Begin(ndim, loop_size,\
-                            dbox1, start1, stride1, i1,\
-                            dbox2, start2, stride2, i2,\
-                            dbox3, start3, stride3, i3,\
-                            dbox4, start4, stride4, i4)\
-{\
-   HYPRE_Int i1,i2,i3,i4;\
-   zypre_BoxLoopDeclare();\
-   zypre_BoxLoopDeclareK(1);\
-   zypre_BoxLoopDeclareK(2);\
-   zypre_BoxLoopDeclareK(3);\
-   zypre_BoxLoopDeclareK(4);\
-   zypre_BoxLoopInit(ndim, loop_size);\
-   zypre_BoxLoopInitK(1, dbox1, start1, stride1, i1);\
-   zypre_BoxLoopInitK(2, dbox2, start2, stride2, i2);\
-   zypre_BoxLoopInitK(3, dbox3, start3, stride3, i3);\
-   zypre_BoxLoopInitK(4, dbox4, start4, stride4, i4);
-
-#define zypre_BoxLoop4For(i1, i2, i3, i4)\
-   for (hypre__block = 0; hypre__block < hypre__num_blocks; hypre__block++)\
-   {\
-      HYPRE_Int i1,i2,i3,i4;\
-      zypre_BoxLoopSet();\
-      zypre_BoxLoopSetK(1, i1);\
-      zypre_BoxLoopSetK(2, i2);\
-      zypre_BoxLoopSetK(3, i3);\
-      zypre_BoxLoopSetK(4, i4);\
-      for (hypre__J = 0; hypre__J < hypre__JN; hypre__J++)\
-      {\
-         for (hypre__I = 0; hypre__I < hypre__IN; hypre__I++)\
-         {
-
-#define zypre_BoxLoop4End(i1, i2, i3, i4)\
-            i1 += hypre__i0inc1;\
-            i2 += hypre__i0inc2;\
-            i3 += hypre__i0inc3;\
-            i4 += hypre__i0inc4;\
-         }\
-         zypre_BoxLoopInc1();\
-         i1 += hypre__ikinc1[hypre__d];\
-         i2 += hypre__ikinc2[hypre__d];\
-         i3 += hypre__ikinc3[hypre__d];\
-         i4 += hypre__ikinc4[hypre__d];\
-         zypre_BoxLoopInc2();\
-      }\
-   }\
-}
-
-/*-----------------------------------*/
-
 #define zypre_BasicBoxLoopInitK(k, stridek) \
 hypre__sk##k[0] = stridek[0];\
 hypre__ikinc##k[0] = 0;\
@@ -569,25 +289,6 @@ hypre__i0inc##k = hypre__sk##k[0];\
 hypre__ikinc##k[hypre__ndim] = 0;\
 hypre__ikstart##k = 0
 
-#define zypre_BasicBoxLoop2Begin(ndim, loop_size,\
-                                 stride1, i1,\
-                                 stride2, i2)\
-{\
-   zypre_BoxLoopDeclare();\
-   zypre_BoxLoopDeclareK(1);\
-   zypre_BoxLoopDeclareK(2);\
-   zypre_BoxLoopInit(ndim, loop_size);\
-   zypre_BasicBoxLoopInitK(1, stride1);\
-   zypre_BasicBoxLoopInitK(2, stride2);
-
-/*-----------------------------------*/
-
-#endif
-
-
-
-
-
 /*--------------------------------------------------------------------------
  * NOTES - Keep these for reference here and elsewhere in the code
  *--------------------------------------------------------------------------*/
@@ -595,8 +296,8 @@ hypre__ikstart##k = 0
 #if 0
 
 #define hypre_BoxLoop2Begin(loop_size,
-                            dbox1, start1, stride1, i1,
-                            dbox2, start2, stride2, i2)
+dbox1, start1, stride1, i1,
+       dbox2, start2, stride2, i2)
 {
    /* init hypre__i1start */
    HYPRE_Int  hypre__i1start = hypre_BoxIndexRank(dbox1, start1);
@@ -611,28 +312,28 @@ hypre__ikstart##k = 0
 #define hypre_BoxLoop2For(i, j, k, i1, i2)
    for (hypre__block = 0; hypre__block < hypre__num_blocks; hypre__block++)
    {
-   /* set i and hypre__n */
-   hypre_BoxLoopSet(i, j, k);
-   /* set i1 */
-   i1 = hypre__i1start + i*hypre__sx1 + j*hypre__sy1 + k*hypre__sz1;
-   i2 = hypre__i2start + i*hypre__sx2 + j*hypre__sy2 + k*hypre__sz2;
-   for (k = 0; k < hypre__nz; k++)
-   {
-      for (j = 0; j < hypre__ny; j++)
+      /* set i and hypre__n */
+      hypre_BoxLoopSet(i, j, k);
+      /* set i1 */
+      i1 = hypre__i1start + i * hypre__sx1 + j * hypre__sy1 + k * hypre__sz1;
+      i2 = hypre__i2start + i * hypre__sx2 + j * hypre__sy2 + k * hypre__sz2;
+      for (k = 0; k < hypre__nz; k++)
       {
-         for (i = 0; i < hypre__nx; i++)
+         for (j = 0; j < hypre__ny; j++)
          {
+            for (i = 0; i < hypre__nx; i++)
+            {
 
 #define hypre_BoxLoop2End(i1, i2)
-            i1 += hypre__sx1;
-            i2 += hypre__sx2;
+               i1 += hypre__sx1;
+               i2 += hypre__sx2;
+            }
+            i1 += hypre__sy1 - hypre__nx * hypre__sx1;
+            i2 += hypre__sy2 - hypre__nx * hypre__sx2;
          }
-         i1 += hypre__sy1 - hypre__nx*hypre__sx1;
-         i2 += hypre__sy2 - hypre__nx*hypre__sx2;
+         i1 += hypre__sz1 - hypre__ny * hypre__sy1;
+         i2 += hypre__sz2 - hypre__ny * hypre__sy2;
       }
-      i1 += hypre__sz1 - hypre__ny*hypre__sy1;
-      i2 += hypre__sz2 - hypre__ny*hypre__sy2;
-   }
    }
 }
 
@@ -643,7 +344,7 @@ hypre__ikstart##k = 0
 N = 1;
 for (d = 0; d < ndim; d++)
 {
-   N *= n[d];
+N *= n[d];
    i[d] = 0;
    n[d] -= 2; /* this produces a simpler comparison below */
 }
@@ -651,9 +352,9 @@ i[ndim] = 0;
 n[ndim] = 0;
 for (I = 0; I < N; I++)
 {
-   /* loop body */
+/* loop body */
 
-   for (d = 0; i[d] > n[d]; d++)
+for (d = 0; i[d] > n[d]; d++)
    {
       i[d] = 0;
    }
@@ -669,7 +370,7 @@ for (I = 0; I < N; I++)
 N = 1;
 for (d = 1; d < ndim; d++)
 {
-   N *= n[d];
+N *= n[d];
    i[d] = 0;
    n[d] -= 2; /* this produces a simpler comparison below */
 }
@@ -677,7 +378,7 @@ i[ndim] = 0;
 n[ndim] = 0;
 for (J = 0; J < N; J++)
 {
-   for (I = 0; I < n[0]; I++)
+for (I = 0; I < n[0]; I++)
    {
       /* loop body */
 
@@ -694,3 +395,4 @@ for (J = 0; J < N; J++)
 }
 
 #endif
+#endif /* #ifndef hypre_BOX_HEADER */
diff --git a/external/hypre/src/struct_mv/box_algebra.c b/external/hypre/src/struct_mv/box_algebra.c
index df80589b..9b175623 100644
--- a/external/hypre/src/struct_mv/box_algebra.c
+++ b/external/hypre/src/struct_mv/box_algebra.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -55,7 +55,7 @@ hypre_SubtractBoxes( hypre_Box      *box1,
     * plus one, to have space for the remainder box.
     *------------------------------------------------------*/
 
-   maxboxes = 2*ndim;
+   maxboxes = 2 * ndim;
 
    size = hypre_BoxArraySize(box_array);
    hypre_BoxArraySetSize(box_array, (size + maxboxes + 1));
@@ -88,7 +88,7 @@ hypre_SubtractBoxes( hypre_Box      *box1,
             hypre_CopyBox(rembox, box);
             hypre_BoxIMaxD(box, d) = hypre_BoxIMinD(box2, d) - 1;
             hypre_BoxIMinD(rembox, d) = hypre_BoxIMinD(box2, d);
-            if ( hypre_BoxVolume(box) > 0 ) size++;
+            if ( hypre_BoxVolume(box) > 0 ) { size++; }
          }
          if ( hypre_BoxIMaxD(box2, d) < hypre_BoxIMaxD(rembox, d) )
          {
@@ -96,7 +96,7 @@ hypre_SubtractBoxes( hypre_Box      *box1,
             hypre_CopyBox(rembox, box);
             hypre_BoxIMinD(box, d) = hypre_BoxIMaxD(box2, d) + 1;
             hypre_BoxIMaxD(rembox, d) = hypre_BoxIMaxD(box2, d);
-            if ( hypre_BoxVolume(box) > 0 ) size++;
+            if ( hypre_BoxVolume(box) > 0 ) { size++; }
          }
       }
    }
@@ -196,16 +196,16 @@ hypre_UnionBoxes( hypre_BoxArray *boxes )
    HYPRE_Int        index;
    HYPRE_Int        size;
    HYPRE_Int        factor[3];
-                  
+
    HYPRE_Int        iminmax[2], imin[3], imax[3];
    HYPRE_Int        ii[3], dd[3];
    HYPRE_Int        join;
    HYPRE_Int        i_tmp0, i_tmp1;
    HYPRE_Int        ioff, joff, koff;
    HYPRE_Int        bi, d, i, j, k;
-                  
+
    HYPRE_Int        index_not_there;
-            
+
    /*------------------------------------------------------
     * If the size of boxes is less than 2, return
     *------------------------------------------------------*/
@@ -214,20 +214,20 @@ hypre_UnionBoxes( hypre_BoxArray *boxes )
    {
       return hypre_error_flag;
    }
-      
+
    /*------------------------------------------------------
     * Set up the block_index array
     *------------------------------------------------------*/
-      
+
    i_tmp0 = 2 * hypre_BoxArraySize(boxes);
    block_index[0] = hypre_TAlloc(HYPRE_Int,  3 * i_tmp0, HYPRE_MEMORY_HOST);
    block_sz[0] = 0;
    for (d = 1; d < 3; d++)
    {
-      block_index[d] = block_index[d-1] + i_tmp0;
+      block_index[d] = block_index[d - 1] + i_tmp0;
       block_sz[d] = 0;
    }
-      
+
    hypre_ForBoxI(bi, boxes)
    {
       box = hypre_BoxArrayBox(boxes, bi);
@@ -246,7 +246,9 @@ hypre_UnionBoxes( hypre_BoxArray *boxes )
                if (iminmax[i] <= block_index[d][j])
                {
                   if (iminmax[i] == block_index[d][j])
+                  {
                      index_not_there = 0;
+                  }
                   break;
                }
             }
@@ -255,7 +257,9 @@ hypre_UnionBoxes( hypre_BoxArray *boxes )
             if (index_not_there)
             {
                for (k = block_sz[d]; k > j; k--)
-                  block_index[d][k] = block_index[d][k-1];
+               {
+                  block_index[d][k] = block_index[d][k - 1];
+               }
                block_index[d][j] = iminmax[i];
                block_sz[d]++;
             }
@@ -264,23 +268,25 @@ hypre_UnionBoxes( hypre_BoxArray *boxes )
    }
 
    for (d = 0; d < 3; d++)
+   {
       block_sz[d]--;
+   }
    block_volume = block_sz[0] * block_sz[1] * block_sz[2];
-      
+
    /*------------------------------------------------------
     * Set factor values
     *------------------------------------------------------*/
-      
+
    factor[0] = 1;
    factor[1] = (block_sz[0] + 1);
    factor[2] = (block_sz[1] + 1) * factor[1];
-      
+
    /*------------------------------------------------------
     * Set up the block array
     *------------------------------------------------------*/
-      
+
    block = hypre_CTAlloc(HYPRE_Int,  block_volume, HYPRE_MEMORY_HOST);
-      
+
    hypre_ForBoxI(bi, boxes)
    {
       box = hypre_BoxArrayBox(boxes, bi);
@@ -291,11 +297,15 @@ hypre_UnionBoxes( hypre_BoxArray *boxes )
          j = 0;
 
          while (hypre_BoxIMinD(box, d) != block_index[d][j])
+         {
             j++;
+         }
          imin[d] = j;
 
          while (hypre_BoxIMaxD(box, d) + 1 != block_index[d][j])
+         {
             j++;
+         }
          imax[d] = j;
       }
 
@@ -313,7 +323,7 @@ hypre_UnionBoxes( hypre_BoxArray *boxes )
          }
       }
    }
-      
+
    /*------------------------------------------------------
     * Join block array in x, then y, then z
     *
@@ -326,7 +336,7 @@ hypre_UnionBoxes( hypre_BoxArray *boxes )
 
    for (d = 0; d < 3; d++)
    {
-      switch(d)
+      switch (d)
       {
          case 0: /* join in x */
             dd[0] = 0;
@@ -370,13 +380,15 @@ hypre_UnionBoxes( hypre_BoxArray *boxes )
                      join  = 1;
                   }
                   else
+                  {
                      join = 0;
+                  }
                }
             }
          }
       }
    }
-      
+
    /*------------------------------------------------------
     * Set up the boxes BoxArray
     *------------------------------------------------------*/
@@ -385,7 +397,9 @@ hypre_UnionBoxes( hypre_BoxArray *boxes )
    for (index = 0; index < block_volume; index++)
    {
       if (block[index])
+      {
          size++;
+      }
    }
    hypre_BoxArraySetSize(boxes, size);
 
@@ -413,7 +427,7 @@ hypre_UnionBoxes( hypre_BoxArray *boxes )
 
                size++;
             }
-               
+
             index++;
          }
       }
@@ -425,7 +439,7 @@ hypre_UnionBoxes( hypre_BoxArray *boxes )
 
    hypre_TFree(block_index[0], HYPRE_MEMORY_HOST);
    hypre_TFree(block, HYPRE_MEMORY_HOST);
-   
+
    return hypre_error_flag;
 }
 
@@ -450,23 +464,23 @@ hypre_MinUnionBoxes( hypre_BoxArray *boxes )
 
    HYPRE_Int                i, j, size, min_size, array;
 
-   size= hypre_BoxArraySize(boxes);
-   rotated_box= hypre_CTAlloc(hypre_Box,  1, HYPRE_MEMORY_HOST);
-   rotated_array= hypre_BoxArrayArrayCreate(5, hypre_BoxArrayNDim(boxes));
+   size = hypre_BoxArraySize(boxes);
+   rotated_box = hypre_CTAlloc(hypre_Box,  1, HYPRE_MEMORY_HOST);
+   rotated_array = hypre_BoxArrayArrayCreate(5, hypre_BoxArrayNDim(boxes));
 
-   for (i= 0; i< 5; i++)
+   for (i = 0; i < 5; i++)
    {
-      rotated_boxes= hypre_BoxArrayArrayBoxArray(rotated_array, i);
-      switch(i)
+      rotated_boxes = hypre_BoxArrayArrayBoxArray(rotated_array, i);
+      switch (i)
       {
          case 0:
-            for (j= 0; j< size; j++)
+            for (j = 0; j < size; j++)
             {
-               box= hypre_BoxArrayBox(boxes, j);
+               box = hypre_BoxArrayBox(boxes, j);
                hypre_SetIndex3(lower, hypre_BoxIMin(box)[0],  hypre_BoxIMin(box)[2],
-                              hypre_BoxIMin(box)[1]);
+                               hypre_BoxIMin(box)[1]);
                hypre_SetIndex3(upper, hypre_BoxIMax(box)[0],  hypre_BoxIMax(box)[2],
-                              hypre_BoxIMax(box)[1]);
+                               hypre_BoxIMax(box)[1]);
                hypre_BoxSetExtents(rotated_box, lower, upper);
                hypre_AppendBox(rotated_box, rotated_boxes);
             }
@@ -474,13 +488,13 @@ hypre_MinUnionBoxes( hypre_BoxArray *boxes )
             break;
 
          case 1:
-            for (j= 0; j< size; j++)
+            for (j = 0; j < size; j++)
             {
-               box= hypre_BoxArrayBox(boxes, j);
+               box = hypre_BoxArrayBox(boxes, j);
                hypre_SetIndex3(lower, hypre_BoxIMin(box)[1],  hypre_BoxIMin(box)[2],
-                              hypre_BoxIMin(box)[0]);
+                               hypre_BoxIMin(box)[0]);
                hypre_SetIndex3(upper, hypre_BoxIMax(box)[1],  hypre_BoxIMax(box)[2],
-                              hypre_BoxIMax(box)[0]);
+                               hypre_BoxIMax(box)[0]);
                hypre_BoxSetExtents(rotated_box, lower, upper);
                hypre_AppendBox(rotated_box, rotated_boxes);
             }
@@ -488,13 +502,13 @@ hypre_MinUnionBoxes( hypre_BoxArray *boxes )
             break;
 
          case 2:
-            for (j= 0; j< size; j++)
+            for (j = 0; j < size; j++)
             {
-               box= hypre_BoxArrayBox(boxes, j);
+               box = hypre_BoxArrayBox(boxes, j);
                hypre_SetIndex3(lower, hypre_BoxIMin(box)[1],  hypre_BoxIMin(box)[0],
-                              hypre_BoxIMin(box)[2]);
+                               hypre_BoxIMin(box)[2]);
                hypre_SetIndex3(upper, hypre_BoxIMax(box)[1],  hypre_BoxIMax(box)[0],
-                              hypre_BoxIMax(box)[2]);
+                               hypre_BoxIMax(box)[2]);
                hypre_BoxSetExtents(rotated_box, lower, upper);
                hypre_AppendBox(rotated_box, rotated_boxes);
             }
@@ -502,13 +516,13 @@ hypre_MinUnionBoxes( hypre_BoxArray *boxes )
             break;
 
          case 3:
-            for (j= 0; j< size; j++)
+            for (j = 0; j < size; j++)
             {
-               box= hypre_BoxArrayBox(boxes, j);
+               box = hypre_BoxArrayBox(boxes, j);
                hypre_SetIndex3(lower, hypre_BoxIMin(box)[2],  hypre_BoxIMin(box)[0],
-                              hypre_BoxIMin(box)[1]);
+                               hypre_BoxIMin(box)[1]);
                hypre_SetIndex3(upper, hypre_BoxIMax(box)[2],  hypre_BoxIMax(box)[0],
-                              hypre_BoxIMax(box)[1]);
+                               hypre_BoxIMax(box)[1]);
                hypre_BoxSetExtents(rotated_box, lower, upper);
                hypre_AppendBox(rotated_box, rotated_boxes);
             }
@@ -516,13 +530,13 @@ hypre_MinUnionBoxes( hypre_BoxArray *boxes )
             break;
 
          case 4:
-            for (j= 0; j< size; j++)
+            for (j = 0; j < size; j++)
             {
-               box= hypre_BoxArrayBox(boxes, j);
+               box = hypre_BoxArrayBox(boxes, j);
                hypre_SetIndex3(lower, hypre_BoxIMin(box)[2],  hypre_BoxIMin(box)[1],
-                              hypre_BoxIMin(box)[0]);
+                               hypre_BoxIMin(box)[0]);
                hypre_SetIndex3(upper, hypre_BoxIMax(box)[2],  hypre_BoxIMax(box)[1],
-                              hypre_BoxIMax(box)[0]);
+                               hypre_BoxIMax(box)[0]);
                hypre_BoxSetExtents(rotated_box, lower, upper);
                hypre_AppendBox(rotated_box, rotated_boxes);
             }
@@ -535,97 +549,97 @@ hypre_MinUnionBoxes( hypre_BoxArray *boxes )
 
    hypre_UnionBoxes(boxes);
 
-   array= 5;
-   min_size= hypre_BoxArraySize(boxes);
-    
-   for (i= 0; i< 5; i++)
+   array = 5;
+   min_size = hypre_BoxArraySize(boxes);
+
+   for (i = 0; i < 5; i++)
    {
-      rotated_boxes= hypre_BoxArrayArrayBoxArray(rotated_array, i);
+      rotated_boxes = hypre_BoxArrayArrayBoxArray(rotated_array, i);
       if (hypre_BoxArraySize(rotated_boxes) < min_size)
       {
-         min_size= hypre_BoxArraySize(rotated_boxes);
-         array= i;
+         min_size = hypre_BoxArraySize(rotated_boxes);
+         array = i;
       }
    }
- 
+
    /* copy the box_array with the minimum number of boxes to boxes */
    if (array != 5)
-   {  
-      rotated_boxes= hypre_BoxArrayArrayBoxArray(rotated_array, array);
-      hypre_BoxArraySize(boxes)= min_size;
+   {
+      rotated_boxes = hypre_BoxArrayArrayBoxArray(rotated_array, array);
+      hypre_BoxArraySize(boxes) = min_size;
 
-      switch(array)
+      switch (array)
       {
          case 0:
-            for (j= 0; j< min_size; j++)
+            for (j = 0; j < min_size; j++)
             {
-               rotated_box= hypre_BoxArrayBox(rotated_boxes, j);
+               rotated_box = hypre_BoxArrayBox(rotated_boxes, j);
                hypre_SetIndex3(lower, hypre_BoxIMin(rotated_box)[0],
-                              hypre_BoxIMin(rotated_box)[2],
-                              hypre_BoxIMin(rotated_box)[1]);
+                               hypre_BoxIMin(rotated_box)[2],
+                               hypre_BoxIMin(rotated_box)[1]);
                hypre_SetIndex3(upper, hypre_BoxIMax(rotated_box)[0],
-                              hypre_BoxIMax(rotated_box)[2],
-                              hypre_BoxIMax(rotated_box)[1]);
+                               hypre_BoxIMax(rotated_box)[2],
+                               hypre_BoxIMax(rotated_box)[1]);
 
                hypre_BoxSetExtents( hypre_BoxArrayBox(boxes, j), lower, upper);
             }
             break;
 
          case 1:
-            for (j= 0; j< min_size; j++)
+            for (j = 0; j < min_size; j++)
             {
-               rotated_box= hypre_BoxArrayBox(rotated_boxes, j);
+               rotated_box = hypre_BoxArrayBox(rotated_boxes, j);
                hypre_SetIndex3(lower, hypre_BoxIMin(rotated_box)[2],
-                              hypre_BoxIMin(rotated_box)[0],
-                              hypre_BoxIMin(rotated_box)[1]);
+                               hypre_BoxIMin(rotated_box)[0],
+                               hypre_BoxIMin(rotated_box)[1]);
                hypre_SetIndex3(upper, hypre_BoxIMax(rotated_box)[2],
-                              hypre_BoxIMax(rotated_box)[0],
-                              hypre_BoxIMax(rotated_box)[1]);
+                               hypre_BoxIMax(rotated_box)[0],
+                               hypre_BoxIMax(rotated_box)[1]);
 
                hypre_BoxSetExtents( hypre_BoxArrayBox(boxes, j), lower, upper);
             }
             break;
 
          case 2:
-            for (j= 0; j< min_size; j++)
+            for (j = 0; j < min_size; j++)
             {
-               rotated_box= hypre_BoxArrayBox(rotated_boxes, j);
+               rotated_box = hypre_BoxArrayBox(rotated_boxes, j);
                hypre_SetIndex3(lower, hypre_BoxIMin(rotated_box)[1],
-                              hypre_BoxIMin(rotated_box)[0],
-                              hypre_BoxIMin(rotated_box)[2]);
+                               hypre_BoxIMin(rotated_box)[0],
+                               hypre_BoxIMin(rotated_box)[2]);
                hypre_SetIndex3(upper, hypre_BoxIMax(rotated_box)[1],
-                              hypre_BoxIMax(rotated_box)[0],
-                              hypre_BoxIMax(rotated_box)[2]);
+                               hypre_BoxIMax(rotated_box)[0],
+                               hypre_BoxIMax(rotated_box)[2]);
 
                hypre_BoxSetExtents( hypre_BoxArrayBox(boxes, j), lower, upper);
             }
             break;
 
          case 3:
-            for (j= 0; j< min_size; j++)
+            for (j = 0; j < min_size; j++)
             {
-               rotated_box= hypre_BoxArrayBox(rotated_boxes, j);
+               rotated_box = hypre_BoxArrayBox(rotated_boxes, j);
                hypre_SetIndex3(lower, hypre_BoxIMin(rotated_box)[1],
-                              hypre_BoxIMin(rotated_box)[2],
-                              hypre_BoxIMin(rotated_box)[0]);
+                               hypre_BoxIMin(rotated_box)[2],
+                               hypre_BoxIMin(rotated_box)[0]);
                hypre_SetIndex3(upper, hypre_BoxIMax(rotated_box)[1],
-                              hypre_BoxIMax(rotated_box)[2],
-                              hypre_BoxIMax(rotated_box)[0]);
+                               hypre_BoxIMax(rotated_box)[2],
+                               hypre_BoxIMax(rotated_box)[0]);
 
                hypre_BoxSetExtents( hypre_BoxArrayBox(boxes, j), lower, upper);
             }
             break;
 
          case 4:
-            for (j= 0; j< min_size; j++)
+            for (j = 0; j < min_size; j++)
             {
-               rotated_box= hypre_BoxArrayBox(rotated_boxes, j);
+               rotated_box = hypre_BoxArrayBox(rotated_boxes, j);
                hypre_SetIndex3(lower, hypre_BoxIMin(rotated_box)[2],
-                              hypre_BoxIMin(rotated_box)[1],
-                              hypre_BoxIMin(rotated_box)[0]);
+                               hypre_BoxIMin(rotated_box)[1],
+                               hypre_BoxIMin(rotated_box)[0]);
                hypre_SetIndex3(upper, hypre_BoxIMax(rotated_box)[2],
-                              hypre_BoxIMax(rotated_box)[1],
-                              hypre_BoxIMax(rotated_box)[0]);
+                               hypre_BoxIMax(rotated_box)[1],
+                               hypre_BoxIMax(rotated_box)[0]);
 
                hypre_BoxSetExtents( hypre_BoxArrayBox(boxes, j), lower, upper);
             }
diff --git a/external/hypre/src/struct_mv/box_boundary.c b/external/hypre/src/struct_mv/box_boundary.c
index dcb3afe7..9a2ebd2c 100644
--- a/external/hypre/src/struct_mv/box_boundary.c
+++ b/external/hypre/src/struct_mv/box_boundary.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -9,13 +9,13 @@
  *
  * NOTE: The following routines are currently only used as follows in hypre, and
  * also appear in '_hypre_struct_mv.h':
- * 
+ *
  * hypre_BoxBoundaryG
  * struct_mv/box_boundary.c
  * struct_mv/struct_vector.c
  * sstruct_ls/maxwell_grad.c
  * sstruct_ls/maxwell_TV_setup.c
- * 
+ *
  * hypre_BoxBoundaryDG
  * struct_mv/box_boundary.c
  * sstruct_ls/maxwell_grad.c
@@ -103,7 +103,7 @@ hypre_BoxBoundaryG( hypre_Box *box,
    HYPRE_Int       ndim = hypre_BoxNDim(box);
    hypre_BoxArray *boundary_d;
    HYPRE_Int       d;
- 
+
    boundary_d = hypre_BoxArrayCreate(0, ndim);
    for (d = 0; d < ndim; d++)
    {
@@ -140,7 +140,7 @@ hypre_BoxBoundaryDG( hypre_Box *box,
 
 /*--------------------------------------------------------------------------
  * Intersect a surface of 'box' with the physical boundary.  A stencil element
- * indicates in which direction the surface should be determined. 
+ * indicates in which direction the surface should be determined.
  *
  * The result will be returned in the box array 'boundary'.  Any boxes already
  * in 'boundary' will be overwritten.
@@ -148,9 +148,9 @@ hypre_BoxBoundaryDG( hypre_Box *box,
 
 HYPRE_Int
 hypre_GeneralBoxBoundaryIntersect( hypre_Box *box,
-                            hypre_StructGrid *grid,
-                            hypre_Index stencil_element,
-                            hypre_BoxArray *boundary )
+                                   hypre_StructGrid *grid,
+                                   hypre_Index stencil_element,
+                                   hypre_BoxArray *boundary )
 {
    hypre_BoxManager   *boxman;
    hypre_BoxManEntry **entries;
@@ -163,8 +163,10 @@ hypre_GeneralBoxBoundaryIntersect( hypre_Box *box,
    ndim = hypre_StructGridNDim(grid);
    dd = hypre_CTAlloc(HYPRE_Int,  ndim, HYPRE_MEMORY_HOST);
 
-   for (i=0; i < ndim; i++)
-     dd[i] = hypre_IndexD(stencil_element, i);
+   for (i = 0; i < ndim; i++)
+   {
+      dd[i] = hypre_IndexD(stencil_element, i);
+   }
 
    /* set bbox to the box surface of interest */
    hypre_BoxArraySetSize(boundary, 1);
@@ -172,7 +174,7 @@ hypre_GeneralBoxBoundaryIntersect( hypre_Box *box,
    hypre_CopyBox(box, bbox);
 
    /* temporarily shift bbox in direction dir and intersect with the grid */
-   for (i=0; i < ndim; i++)
+   for (i = 0; i < ndim; i++)
    {
       hypre_BoxIMinD(bbox, i) += dd[i];
       hypre_BoxIMaxD(bbox, i) += dd[i];
@@ -181,7 +183,7 @@ hypre_GeneralBoxBoundaryIntersect( hypre_Box *box,
    boxman = hypre_StructGridBoxMan(grid);
    hypre_BoxManIntersect(boxman, hypre_BoxIMin(bbox), hypre_BoxIMax(bbox),
                          &entries, &nentries);
-   for (i=0; i < ndim; i++)
+   for (i = 0; i < ndim; i++)
    {
       hypre_BoxIMinD(bbox, i) -= dd[i];
       hypre_BoxIMaxD(bbox, i) -= dd[i];
@@ -195,7 +197,7 @@ hypre_GeneralBoxBoundaryIntersect( hypre_Box *box,
       ibox = hypre_BoxArrayBox(int_boxes, i);
       hypre_BoxManEntryGetExtents(
          entries[i], hypre_BoxIMin(ibox), hypre_BoxIMax(ibox));
-      for (j=0; j < ndim; j++)
+      for (j = 0; j < ndim; j++)
       {
          hypre_BoxIMinD(ibox, j) -= dd[j];
          hypre_BoxIMaxD(ibox, j) -= dd[j];
diff --git a/external/hypre/src/struct_mv/box_manager.c b/external/hypre/src/struct_mv/box_manager.c
index 23871914..b0ac4cf6 100644
--- a/external/hypre/src/struct_mv/box_manager.c
+++ b/external/hypre/src/struct_mv/box_manager.c
@@ -1,19 +1,19 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
  ******************************************************************************/
 
 /*******************************************************************************
-            
+
 BoxManager:
 
 AHB 10/06, updated 10/09 (changes to info object)
 
 purpose::  organize arbitrary information in a spatial way
 
-misc. notes/considerations/open questions: 
+misc. notes/considerations/open questions:
 
   (1) In the struct code, we want to use Box Manager instead of
   current box neighbor stuff (see Struct function
@@ -23,7 +23,7 @@ misc. notes/considerations/open questions:
   (2) will associate a Box Manager with the struct grid (implement
   under the struct grid)
 
-  (3) will interface with the Box Manager in the struct coarsen routine 
+  (3) will interface with the Box Manager in the struct coarsen routine
 
     the coarsen routine:
 
@@ -32,7 +32,7 @@ misc. notes/considerations/open questions:
     adding the boxes via AddEntry
 
     (b) check the max_distance value and see if we have
-        all the neighbor info we need in the current box manager.  
+        all the neighbor info we need in the current box manager.
 
     (c) if (b) is no, then call GatherEntries as needed on the coarse
     box manager
@@ -40,16 +40,16 @@ misc. notes/considerations/open questions:
 
     (d) call assemble for the new coarse box manager (note: if gather
     entries has not been called, then no communication is required
-          
+
   (4) We will associate an assumed partition with the box manager
-      (this will be created in the box manager assemble routine)     
+      (this will be created in the box manager assemble routine)
 
   (5) We use the box manager with sstruct "on the side" as
   the boxmap is now, (at issue is modifying
   the "info" associated with an entry after the box manager has
   already been assembled through the underlying struct grid)
 
-  (6) In SStruct we will have a separate box manager for the 
+  (6) In SStruct we will have a separate box manager for the
       neighbor box information
 
 ********************************************************************************/
@@ -71,7 +71,7 @@ hypre_entryswap2( HYPRE_Int  *v,
    HYPRE_Int temp;
 
    hypre_BoxManEntry *temp_e;
-   
+
    temp = v[i];
    v[i] = v[j];
    v[j] = temp;
@@ -93,9 +93,9 @@ hypre_entryqsort2( HYPRE_Int *v,
    {
       return;
    }
-   hypre_entryswap2( v, ent, left, (left+right)/2);
+   hypre_entryswap2( v, ent, left, (left + right) / 2);
    last = left;
-   for (i = left+1; i <= right; i++)
+   for (i = left + 1; i <= right; i++)
    {
       if (v[i] < v[left])
       {
@@ -103,8 +103,8 @@ hypre_entryqsort2( HYPRE_Int *v,
       }
    }
    hypre_entryswap2(v, ent, left, last);
-   hypre_entryqsort2(v, ent, left, last-1);
-   hypre_entryqsort2(v, ent, last+1, right);
+   hypre_entryqsort2(v, ent, left, last - 1);
+   hypre_entryqsort2(v, ent, last + 1, right);
 }
 
 /*--------------------------------------------------------------------------
@@ -131,7 +131,7 @@ hypre_BoxManEntryGetInfo (hypre_BoxManEntry *entry,
 {
    HYPRE_Int position = hypre_BoxManEntryPosition(entry);
    hypre_BoxManager *boxman;
-   
+
    boxman = (hypre_BoxManager *) hypre_BoxManEntryBoxMan(entry);
 
    *info_ptr =  hypre_BoxManInfoObject(boxman, position);
@@ -172,7 +172,7 @@ hypre_BoxManEntryCopy( hypre_BoxManEntry *fromentry,
 {
    HYPRE_Int ndim = hypre_BoxManEntryNDim(fromentry);
    HYPRE_Int d;
-   
+
    hypre_Index imin;
    hypre_Index imax;
 
@@ -191,15 +191,15 @@ hypre_BoxManEntryCopy( hypre_BoxManEntry *fromentry,
       hypre_IndexD(toentry_imax, d) = hypre_IndexD(imax, d);
    }
    hypre_BoxManEntryNDim(toentry) = ndim;
-  
+
    /* copy proc and id */
    hypre_BoxManEntryProc(toentry) =  hypre_BoxManEntryProc(fromentry);
    hypre_BoxManEntryId(toentry) = hypre_BoxManEntryId(fromentry);
 
    /*copy ghost */
-   for (d = 0; d < 2*ndim; d++)
+   for (d = 0; d < 2 * ndim; d++)
    {
-      hypre_BoxManEntryNumGhost(toentry)[d] =  
+      hypre_BoxManEntryNumGhost(toentry)[d] =
          hypre_BoxManEntryNumGhost(fromentry)[d];
    }
 
@@ -210,7 +210,7 @@ hypre_BoxManEntryCopy( hypre_BoxManEntry *fromentry,
 
    /* copy list pointer */
    hypre_BoxManEntryNext(toentry) =  hypre_BoxManEntryNext(fromentry);
-   
+
    return hypre_error_flag;
 }
 
@@ -265,13 +265,13 @@ hypre_BoxManGetIsEntriesSort ( hypre_BoxManager *manager,
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_BoxManGetGlobalIsGatherCalled( hypre_BoxManager *manager, 
-                                     MPI_Comm  comm, 
+hypre_BoxManGetGlobalIsGatherCalled( hypre_BoxManager *manager,
+                                     MPI_Comm  comm,
                                      HYPRE_Int *is_gather )
 {
    HYPRE_Int loc_is_gather;
    HYPRE_Int nprocs;
-   
+
    hypre_MPI_Comm_size(comm, &nprocs);
 
    loc_is_gather = hypre_BoxManIsGatherCalled(manager);
@@ -293,7 +293,7 @@ hypre_BoxManGetGlobalIsGatherCalled( hypre_BoxManager *manager,
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_BoxManGetAssumedPartition( hypre_BoxManager *manager,  
+hypre_BoxManGetAssumedPartition( hypre_BoxManager *manager,
                                  hypre_StructAssumedPart **assumed_partition )
 {
    *assumed_partition = hypre_BoxManAssumedPartition(manager);
@@ -321,7 +321,7 @@ hypre_BoxManSetBoundingBox ( hypre_BoxManager *manager,
                              hypre_Box *bounding_box )
 {
    hypre_Box* bbox = hypre_BoxManBoundingBox(manager);
-   
+
    hypre_BoxSetExtents(bbox,  hypre_BoxIMin(bounding_box),
                        hypre_BoxIMax(bounding_box));
 
@@ -336,8 +336,8 @@ hypre_BoxManSetNumGhost( hypre_BoxManager *manager,
                          HYPRE_Int  *num_ghost )
 {
    HYPRE_Int  i, ndim = hypre_BoxManNDim(manager);
-  
-   for (i = 0; i < 2*ndim; i++)
+
+   for (i = 0; i < 2 * ndim; i++)
    {
       hypre_BoxManNumGhost(manager)[i] = num_ghost[i];
    }
@@ -353,8 +353,8 @@ hypre_BoxManSetNumGhost( hypre_BoxManager *manager,
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_BoxManDeleteMultipleEntriesAndInfo( hypre_BoxManager *manager, 
-                                          HYPRE_Int*  indices ,
+hypre_BoxManDeleteMultipleEntriesAndInfo( hypre_BoxManager *manager,
+                                          HYPRE_Int*  indices,
                                           HYPRE_Int num )
 {
    HYPRE_Int  i, j, start;
@@ -364,37 +364,37 @@ hypre_BoxManDeleteMultipleEntriesAndInfo( hypre_BoxManager *manager,
 
    void *to_ptr;
    void *from_ptr;
-   
+
    hypre_BoxManEntry  *entries  = hypre_BoxManEntries(manager);
 
-   if (num > 0) 
+   if (num > 0)
    {
       start = indices[0];
 
       j = 0;
-   
+
       for (i = start; (i + j) < array_size; i++)
       {
          if (j < num)
          {
-            while ((i+j) == indices[j]) /* see if deleting consecutive items */
+            while ((i + j) == indices[j]) /* see if deleting consecutive items */
             {
                j++; /*increase the shift*/
-               if (j == num) break;
+               if (j == num) { break; }
             }
          }
-            
-         if ( (i+j) < array_size)  /* if deleting the last item then no moving */
+
+         if ( (i + j) < array_size) /* if deleting the last item then no moving */
          {
             /*copy the entry */
-            hypre_BoxManEntryCopy(&entries[i+j], &entries[i]);
-            
+            hypre_BoxManEntryCopy(&entries[i + j], &entries[i]);
+
             /* change the position */
             hypre_BoxManEntryPosition(&entries[i]) = i;
-            
+
             /* copy the info object */
             to_ptr = hypre_BoxManInfoObject(manager, i);
-            from_ptr = hypre_BoxManInfoObject(manager, i+j);
+            from_ptr = hypre_BoxManInfoObject(manager, i + j);
 
             hypre_TMemcpy(to_ptr,  from_ptr, char, info_size, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
          }
@@ -415,7 +415,7 @@ hypre_BoxManDeleteMultipleEntriesAndInfo( hypre_BoxManager *manager,
  * adding entries with BoxManAddEntry
  *
  * (2) info_size indicates the size (in bytes) of the info object that
- * will be attached to each entry in this box manager. 
+ * will be attached to each entry in this box manager.
  *
  * (3) we will collect the bounding box - this is used by the AP
  *
@@ -434,7 +434,7 @@ hypre_BoxManCreate( HYPRE_Int max_nentries,
    hypre_BoxManager   *manager;
    hypre_Box          *bbox;
 
-   HYPRE_Int  i, d;                          
+   HYPRE_Int  i, d;
    /* allocate object */
    manager = hypre_CTAlloc(hypre_BoxManager,  1, HYPRE_MEMORY_HOST);
 
@@ -449,15 +449,15 @@ hypre_BoxManCreate( HYPRE_Int max_nentries,
    {
       hypre_BoxManIndexesD(manager, d) = NULL;
    }
-   
+
    hypre_BoxManNEntries(manager) = 0;
    hypre_BoxManEntries(manager)  = hypre_CTAlloc(hypre_BoxManEntry,  max_nentries, HYPRE_MEMORY_HOST);
 
    hypre_BoxManInfoObjects(manager) = NULL;
-   hypre_BoxManInfoObjects(manager) = hypre_TAlloc(char, max_nentries*info_size, HYPRE_MEMORY_HOST);
+   hypre_BoxManInfoObjects(manager) = hypre_TAlloc(char, max_nentries * info_size, HYPRE_MEMORY_HOST);
 
    hypre_BoxManIndexTable(manager) = NULL;
-   
+
    hypre_BoxManNumProcsSort(manager)     = 0;
    hypre_BoxManIdsSort(manager)          = hypre_CTAlloc(HYPRE_Int,  max_nentries, HYPRE_MEMORY_HOST);
    hypre_BoxManProcsSort(manager)        = hypre_CTAlloc(HYPRE_Int,  max_nentries, HYPRE_MEMORY_HOST);
@@ -475,7 +475,7 @@ hypre_BoxManCreate( HYPRE_Int max_nentries,
    hypre_BoxManNumMyEntries(manager) = 0;
    hypre_BoxManMyIds(manager)        = NULL;
    hypre_BoxManMyEntries(manager)    = NULL;
-                            
+
    hypre_BoxManAssumedPartition(manager) = NULL;
 
    hypre_BoxManMyIds(manager) = hypre_CTAlloc(HYPRE_Int,  max_nentries, HYPRE_MEMORY_HOST);
@@ -488,9 +488,9 @@ hypre_BoxManCreate( HYPRE_Int max_nentries,
                        hypre_BoxIMax(bounding_box));
 
    hypre_BoxManNextId(manager) = 0;
-      
+
    /* ghost points: we choose a default that will give zero everywhere..*/
-   for (i = 0; i < 2*HYPRE_MAXDIM; i++)
+   for (i = 0; i < 2 * HYPRE_MAXDIM; i++)
    {
       hypre_BoxManNumGhost(manager)[i] = 0;
    }
@@ -504,7 +504,7 @@ hypre_BoxManCreate( HYPRE_Int max_nentries,
 /*--------------------------------------------------------------------------
  * Increase storage for entries (for future calls to BoxManAddEntry).
  *
- * Notes: 
+ * Notes:
  *
  * In addition, we will dynamically allocate more memory if needed when a call
  * to BoxManAddEntry is made and there is not enough storage available.
@@ -518,7 +518,7 @@ hypre_BoxManIncSize ( hypre_BoxManager *manager,
    HYPRE_Int  *ids          = hypre_BoxManIdsSort(manager);
    HYPRE_Int  *procs        = hypre_BoxManProcsSort(manager);
    HYPRE_Int   info_size    = hypre_BoxManEntryInfoSize(manager);
-   
+
    void *info         = hypre_BoxManInfoObjects(manager);
 
    hypre_BoxManEntry  *entries = hypre_BoxManEntries(manager);
@@ -529,7 +529,7 @@ hypre_BoxManIncSize ( hypre_BoxManager *manager,
    entries = hypre_TReAlloc(entries,  hypre_BoxManEntry,  max_nentries, HYPRE_MEMORY_HOST);
    ids = hypre_TReAlloc(ids,  HYPRE_Int,  max_nentries, HYPRE_MEMORY_HOST);
    procs =  hypre_TReAlloc(procs,  HYPRE_Int,  max_nentries, HYPRE_MEMORY_HOST);
-   info = (void *) hypre_TReAlloc((char *)info, char, max_nentries*info_size, HYPRE_MEMORY_HOST);
+   info = (void *) hypre_TReAlloc((char *)info, char, max_nentries * info_size, HYPRE_MEMORY_HOST);
 
    /* update manager */
    hypre_BoxManMaxNEntries(manager) = max_nentries;
@@ -542,15 +542,15 @@ hypre_BoxManIncSize ( hypre_BoxManager *manager,
    {
       HYPRE_Int *my_ids = hypre_BoxManMyIds(manager);
       hypre_BoxManEntry  **my_entries = hypre_BoxManMyEntries(manager);
-            
+
       my_ids = hypre_TReAlloc(my_ids,  HYPRE_Int,  max_nentries, HYPRE_MEMORY_HOST);
 
       my_entries = hypre_TReAlloc(my_entries,  hypre_BoxManEntry *,  max_nentries, HYPRE_MEMORY_HOST);
-   
+
       hypre_BoxManMyIds(manager) = my_ids;
       hypre_BoxManMyEntries(manager) = my_entries;
    }
-   
+
    return hypre_error_flag;
 }
 
@@ -574,13 +574,13 @@ hypre_BoxManDestroy( hypre_BoxManager *manager )
       hypre_TFree(hypre_BoxManEntries(manager), HYPRE_MEMORY_HOST);
 
       hypre_TFree(hypre_BoxManInfoObjects(manager), HYPRE_MEMORY_HOST);
-      
+
       hypre_TFree(hypre_BoxManIndexTable(manager), HYPRE_MEMORY_HOST);
-      
+
       hypre_TFree(hypre_BoxManIdsSort(manager), HYPRE_MEMORY_HOST);
       hypre_TFree(hypre_BoxManProcsSort(manager), HYPRE_MEMORY_HOST);
       hypre_TFree(hypre_BoxManProcsSortOffsets(manager), HYPRE_MEMORY_HOST);
-      
+
       hypre_BoxArrayDestroy(hypre_BoxManGatherRegions(manager));
 
       hypre_TFree(hypre_BoxManMyIds(manager), HYPRE_MEMORY_HOST);
@@ -597,7 +597,7 @@ hypre_BoxManDestroy( hypre_BoxManager *manager )
 }
 
 /*--------------------------------------------------------------------------
- * Add a box (entry) to the box manager. Each entry is given a 
+ * Add a box (entry) to the box manager. Each entry is given a
  * unique id (proc_id, box_id).  Need to assemble after adding entries.
  *
  * Notes:
@@ -610,7 +610,7 @@ hypre_BoxManDestroy( hypre_BoxManager *manager )
  *
  * (3) Only add entries whose boxes have non-zero volume.
  *
- * (4) The info object will be copied (according to the info size given in 
+ * (4) The info object will be copied (according to the info size given in
  * the create) to storage within the box manager.
  *
  * (5) If the id passed in is negative (user doesn't care what it is) ,
@@ -620,7 +620,7 @@ hypre_BoxManDestroy( hypre_BoxManager *manager )
 
 HYPRE_Int
 hypre_BoxManAddEntry( hypre_BoxManager *manager,
-                      hypre_Index imin, 
+                      hypre_Index imin,
                       hypre_Index imax,
                       HYPRE_Int proc_id,
                       HYPRE_Int box_id,
@@ -633,50 +633,50 @@ hypre_BoxManAddEntry( hypre_BoxManager *manager,
 
    hypre_BoxManEntry  *entries  = hypre_BoxManEntries(manager);
    hypre_BoxManEntry  *entry;
- 
+
    hypre_IndexRef      entry_imin;
    hypre_IndexRef      entry_imax;
- 
+
    HYPRE_Int           d;
-   HYPRE_Int           *num_ghost = hypre_BoxManNumGhost(manager);  
+   HYPRE_Int           *num_ghost = hypre_BoxManNumGhost(manager);
    HYPRE_Int           volume;
-   
+
    HYPRE_Int           id;
-   
+
    hypre_Box           *box;
- 
+
    /* can only use before assembling */
    if (hypre_BoxManIsAssembled(manager))
    {
       hypre_error_in_arg(1);
       return hypre_error_flag;
    }
-   
-   /* check to see if we have a non-zero box volume (only add if non-zero) */ 
+
+   /* check to see if we have a non-zero box volume (only add if non-zero) */
    box = hypre_BoxCreate(hypre_BoxManNDim(manager));
    hypre_BoxSetExtents( box, imin, imax );
    volume = hypre_BoxVolume(box);
    hypre_BoxDestroy(box);
-   
-   if (volume) 
+
+   if (volume)
    {
       hypre_MPI_Comm_rank(hypre_BoxManComm(manager), &myid );
-      
+
       /* check to make sure that there is enough storage available
          for this new entry - if not add space for 10 more */
-      
+
       if (nentries + 1 > hypre_BoxManMaxNEntries(manager))
       {
          hypre_BoxManIncSize(manager, 10);
-         
+
          entries = hypre_BoxManEntries(manager);
       }
-      
+
       /* we add this to the end entry list - get pointer to location*/
       entry = &entries[nentries];
       entry_imin = hypre_BoxManEntryIMin(entry);
       entry_imax = hypre_BoxManEntryIMax(entry);
-      
+
       /* copy information into entry */
       for (d = 0; d < ndim; d++)
       {
@@ -684,7 +684,7 @@ hypre_BoxManAddEntry( hypre_BoxManager *manager,
          hypre_IndexD(entry_imax, d) = hypre_IndexD(imax, d);
       }
       hypre_BoxManEntryNDim(entry) = ndim;
-      
+
       /* set the processor */
       hypre_BoxManEntryProc(entry) = proc_id;
 
@@ -699,11 +699,11 @@ hypre_BoxManAddEntry( hypre_BoxManager *manager,
          /* increment fir next time */
          hypre_BoxManNextId(manager) = id + 1;
       }
-      
+
       hypre_BoxManEntryId(entry) = id;
 
       /* this is the current position in the entries array */
-      hypre_BoxManEntryPosition(entry) = nentries; 
+      hypre_BoxManEntryPosition(entry) = nentries;
 
       /*this associates it with the box manager */
       hypre_BoxManEntryBoxMan(entry) = (void *) manager;
@@ -717,48 +717,48 @@ hypre_BoxManAddEntry( hypre_BoxManager *manager,
          index_ptr =  hypre_BoxManInfoObject(manager, nentries);
          hypre_TMemcpy(index_ptr,  info, char, info_size, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
       }
-            
+
       /* inherit and inject the numghost from manager into the entry (as
        * in boxmap) */
-      for (d = 0; d < 2*ndim; d++)
+      for (d = 0; d < 2 * ndim; d++)
       {
          hypre_BoxManEntryNumGhost(entry)[d] = num_ghost[d];
       }
-      hypre_BoxManEntryNext(entry)= NULL;
-      
+      hypre_BoxManEntryNext(entry) = NULL;
+
       /* add proc and id to procs_sort and ids_sort array */
       hypre_BoxManProcsSort(manager)[nentries] = proc_id;
       hypre_BoxManIdsSort(manager)[nentries] = id;
-      
+
       /* here we need to keep track of my entries separately just to improve
          speed at the beginning of the assemble - then this gets deleted when
          the entries are sorted. */
-      
+
       if (proc_id == myid)
       {
          HYPRE_Int *my_ids =   hypre_BoxManMyIds(manager);
          hypre_BoxManEntry **my_entries = hypre_BoxManMyEntries(manager);
          HYPRE_Int num_my_entries = hypre_BoxManNumMyEntries(manager);
-         
+
          my_ids[num_my_entries] = id;
          my_entries[num_my_entries] = &entries[nentries];
          num_my_entries++;
-         
+
          hypre_BoxManNumMyEntries(manager) = num_my_entries;
       }
 
       /* increment number of entries */
       hypre_BoxManNEntries(manager) = nentries + 1;
-   
+
    } /* end of  vol > 0 */
-   
+
    return hypre_error_flag;
 }
 
 /*--------------------------------------------------------------------------
- * Given an id: (proc_id, box_id), return a pointer to the box entry.  
+ * Given an id: (proc_id, box_id), return a pointer to the box entry.
  *
- * Notes: 
+ * Notes:
  *
  * (1) Use of this is generally to get back something that has been
  * added by the above function.  If no entry is found, an error is returned.
@@ -780,7 +780,7 @@ hypre_BoxManGetEntry( hypre_BoxManager *manager,
 {
    /* find proc_id in procs array.  then find id in ids array, then grab the
       corresponding entry */
-  
+
    hypre_BoxManEntry *entry;
 
    HYPRE_Int  myid;
@@ -803,7 +803,7 @@ hypre_BoxManGetEntry( hypre_BoxManager *manager,
 
    hypre_MPI_Comm_rank(hypre_BoxManComm(manager), &myid );
 
-   if (nentries) 
+   if (nentries)
    {
       /* check to see if it is the local id first - this will be the case most
        * of the time (currently it is only used in this manner)*/
@@ -812,10 +812,10 @@ hypre_BoxManGetEntry( hypre_BoxManager *manager,
          start = first_local;
          if (start >= 0 )
          {
-            finish =  proc_offsets[hypre_BoxManLocalProcOffset(manager)+1];
+            finish =  proc_offsets[hypre_BoxManLocalProcOffset(manager) + 1];
          }
       }
-      
+
       else /* otherwise find proc (TO DO: just have procs_sort not contain
               duplicates - then we could do a regular binary search (though this
               list is probably short)- this has to be changed in assemble, then
@@ -823,13 +823,13 @@ hypre_BoxManGetEntry( hypre_BoxManager *manager,
               necessary because proc = myid for all current hypre calls) */
       {
          start = -1;
-         for (i = 0; i< num_proc; i++)
+         for (i = 0; i < num_proc; i++)
          {
             offset = proc_offsets[i];
             if (proc == procs_sort[offset])
             {
                start = offset;
-               finish = proc_offsets[i+1];
+               finish = proc_offsets[i + 1];
                break;
             }
          }
@@ -837,7 +837,7 @@ hypre_BoxManGetEntry( hypre_BoxManager *manager,
       if (start >= 0 )
       {
          /* now look for the id - returns -1 if not found*/
-         location = hypre_BinarySearch(&ids_sort[start], id, finish-start);
+         location = hypre_BinarySearch(&ids_sort[start], id, finish - start);
       }
       else
       {
@@ -854,12 +854,14 @@ hypre_BoxManGetEntry( hypre_BoxManager *manager,
       /* this location is relative to where we started searching - so fix if
        * non-negative */
       location += start;
-      /* now grab entry */ 
+      /* now grab entry */
       entry =  &hypre_BoxManEntries(manager)[location];
    }
    else
+   {
       entry = NULL;
-   
+   }
+
    *entry_ptr = entry;
 
    return hypre_error_flag;
@@ -875,7 +877,7 @@ hypre_BoxManGetEntry( hypre_BoxManager *manager,
 
 HYPRE_Int
 hypre_BoxManGetAllEntries( hypre_BoxManager *manager,
-                           HYPRE_Int *num_entries, 
+                           HYPRE_Int *num_entries,
                            hypre_BoxManEntry **entries)
 {
    /* can only use after assembling */
@@ -884,7 +886,7 @@ hypre_BoxManGetAllEntries( hypre_BoxManager *manager,
       hypre_error_in_arg(1);
       return hypre_error_flag;
    }
- 
+
    /* return */
    *num_entries = hypre_BoxManNEntries(manager);
    *entries =  hypre_BoxManEntries(manager);
@@ -903,16 +905,16 @@ hypre_BoxManGetAllEntries( hypre_BoxManager *manager,
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_BoxManGetAllEntriesBoxes( hypre_BoxManager *manager, 
+hypre_BoxManGetAllEntriesBoxes( hypre_BoxManager *manager,
                                 hypre_BoxArray *boxes )
 {
    hypre_BoxManEntry entry;
-   
+
    HYPRE_Int          i, nentries;
    hypre_Index       ilower, iupper;
 
    hypre_BoxManEntry  *boxman_entries  = hypre_BoxManEntries(manager);
-   
+
    /* can only use after assembling */
    if (!hypre_BoxManIsAssembled(manager))
    {
@@ -924,12 +926,12 @@ hypre_BoxManGetAllEntriesBoxes( hypre_BoxManager *manager,
    nentries = hypre_BoxManNEntries(manager);
 
    hypre_BoxArraySetSize(boxes, nentries);
-   
-   for (i= 0; i< nentries; i++)
+
+   for (i = 0; i < nentries; i++)
    {
       entry = boxman_entries[i];
       hypre_BoxManEntryGetExtents(&entry, ilower, iupper);
-      hypre_BoxSetExtents(hypre_BoxArrayBox(boxes,i), ilower, iupper);
+      hypre_BoxSetExtents(hypre_BoxArrayBox(boxes, i), ilower, iupper);
    }
 
    /* return */
@@ -945,11 +947,11 @@ hypre_BoxManGetAllEntriesBoxes( hypre_BoxManager *manager,
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_BoxManGetLocalEntriesBoxes( hypre_BoxManager *manager, 
+hypre_BoxManGetLocalEntriesBoxes( hypre_BoxManager *manager,
                                   hypre_BoxArray *boxes )
 {
    hypre_BoxManEntry entry;
-   
+
    HYPRE_Int          i;
 
    hypre_Index        ilower, iupper;
@@ -961,7 +963,7 @@ hypre_BoxManGetLocalEntriesBoxes( hypre_BoxManager *manager,
    hypre_BoxManEntry  *boxman_entries  = hypre_BoxManEntries(manager);
 
    HYPRE_Int *offsets = hypre_BoxManProcsSortOffsets(manager);
-   
+
    /* can only use after assembling */
    if (!hypre_BoxManIsAssembled(manager))
    {
@@ -972,18 +974,18 @@ hypre_BoxManGetLocalEntriesBoxes( hypre_BoxManager *manager,
    /* set array size  */
    hypre_BoxArraySetSize(boxes, num_my_entries);
 
-   finish =  offsets[hypre_BoxManLocalProcOffset(manager)+1];
+   finish =  offsets[hypre_BoxManLocalProcOffset(manager) + 1];
 
    if (num_my_entries && ((finish - start) != num_my_entries))
    {
       hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Something's wrong with box manager!");
    }
 
-   for (i= 0; i< num_my_entries; i++)
+   for (i = 0; i < num_my_entries; i++)
    {
       entry = boxman_entries[start + i];
       hypre_BoxManEntryGetExtents(&entry, ilower, iupper);
-      hypre_BoxSetExtents(hypre_BoxArrayBox(boxes,i), ilower, iupper);
+      hypre_BoxSetExtents(hypre_BoxArrayBox(boxes, i), ilower, iupper);
    }
 
    /* return */
@@ -1016,14 +1018,14 @@ hypre_BoxManGetAllEntriesBoxesProc( hypre_BoxManager *manager,
    /* set array size  */
    nentries = hypre_BoxManNEntries(manager);
    hypre_BoxArraySetSize(boxes, nentries);
-   procs= hypre_TAlloc(HYPRE_Int,  nentries, HYPRE_MEMORY_HOST);
+   procs = hypre_TAlloc(HYPRE_Int,  nentries, HYPRE_MEMORY_HOST);
 
-   for (i= 0; i< nentries; i++)
+   for (i = 0; i < nentries; i++)
    {
       entry = boxman_entries[i];
       hypre_BoxManEntryGetExtents(&entry, ilower, iupper);
-      hypre_BoxSetExtents(hypre_BoxArrayBox(boxes,i), ilower, iupper);
-      procs[i]= hypre_BoxManEntryProc(&entry);
+      hypre_BoxSetExtents(hypre_BoxArrayBox(boxes, i), ilower, iupper);
+      procs[i] = hypre_BoxManEntryProc(&entry);
    }
 
    /* return */
@@ -1037,7 +1039,7 @@ hypre_BoxManGetAllEntriesBoxesProc( hypre_BoxManager *manager,
  * processor's local box manager.  Multiple calls may be made to this
  * function. The box extents supplied here are not retained after the assemble.
  *
- * Note: 
+ * Note:
  *
  * (1) This affects whether or not calls to BoxManIntersect() can be answered
  * correctly.  In other words, the user needs to anticipate the areas of the
@@ -1056,7 +1058,7 @@ hypre_BoxManGatherEntries(hypre_BoxManager *manager,
    hypre_Box *box;
 
    hypre_BoxArray  *gather_regions;
-   
+
    /* can only use before assembling */
    if (hypre_BoxManIsAssembled(manager))
    {
@@ -1067,7 +1069,7 @@ hypre_BoxManGatherEntries(hypre_BoxManager *manager,
    /* initialize */
    hypre_BoxManIsGatherCalled(manager) = 1;
    gather_regions = hypre_BoxManGatherRegions(manager);
-   
+
    /* add the box to the gather region array */
    box = hypre_BoxCreate(hypre_BoxManNDim(manager));
    hypre_BoxSetExtents( box, imin, imax );
@@ -1086,7 +1088,7 @@ hypre_BoxManGatherEntries(hypre_BoxManager *manager,
  * is gathered that corresponds to the regions input by calls to
  * hypre_BoxManGatherEntries().
  *
- * Notes: 
+ * Notes:
  *
  * (1) In the assumed partition (AP) case, the boxes gathered are those that
  * correspond to boxes living in the assumed partition regions that intersect
@@ -1115,7 +1117,7 @@ hypre_BoxManGatherEntries(hypre_BoxManager *manager,
  * to GatherEntries().  If this was done well, then the AP and non-AP would not
  * have to be treated separately at all!
  *
- * **Assumptions: 
+ * **Assumptions:
  *
  * 1. A processor has used "add entry" to put all of the boxes that it owns into
  * its box manager
@@ -1136,7 +1138,7 @@ hypre_BoxManAssemble( hypre_BoxManager *manager )
 
    HYPRE_Int need_to_sort = 1; /* default it to sort */
    //HYPRE_Int short_sort = 0; /*do abreviated sort */
-   
+
    HYPRE_Int  non_ap_gather = 1; /* default to gather w/out ap*/
 
    HYPRE_Int  global_num_boxes = 0;
@@ -1146,7 +1148,7 @@ hypre_BoxManAssemble( hypre_BoxManager *manager )
    hypre_BoxArray  *gather_regions;
 
    MPI_Comm comm = hypre_BoxManComm(manager);
-  
+
    /* cannot re-assemble */
    if (hypre_BoxManIsAssembled(manager))
    {
@@ -1162,7 +1164,7 @@ hypre_BoxManAssemble( hypre_BoxManager *manager )
    nentries = hypre_BoxManNEntries(manager);
    entries =  hypre_BoxManEntries(manager);
    procs_sort = hypre_BoxManProcsSort(manager);
-   
+
    ids_sort = hypre_BoxManIdsSort(manager);
 
    /* do we need to gather entries - check to see if ANY processor called a
@@ -1188,11 +1190,11 @@ hypre_BoxManAssemble( hypre_BoxManager *manager )
       global_is_gather = 0;
    }
 
-   /* ----------------------------GATHER? ------------------------------------*/  
+   /* ----------------------------GATHER? ------------------------------------*/
 
    if (global_is_gather)
    {
-      
+
       HYPRE_Int *my_ids         = hypre_BoxManMyIds(manager);
       HYPRE_Int  num_my_entries = hypre_BoxManNumMyEntries(manager);
 
@@ -1205,15 +1207,15 @@ hypre_BoxManAssemble( hypre_BoxManager *manager )
          AP here, so this sorting needs to be done at the beginning for that
          too).  If non-ap, then we want the allgatherv to already be sorted - so
          this takes care of that */
-  
+
       /* my entries may already be sorted (if all entries are then my entries
          are - so check first */
-      
-      if (hypre_BoxManIsEntriesSort(manager)==0)
+
+      if (hypre_BoxManIsEntriesSort(manager) == 0)
       {
          hypre_entryqsort2(my_ids, my_entries, 0, num_my_entries - 1);
       }
-      
+
       /* if AP, use AP to find out who owns the data we need.  In the non-AP,
          then just gather everything for now. */
 
@@ -1231,7 +1233,7 @@ hypre_BoxManAssemble( hypre_BoxManager *manager )
          HYPRE_Int *proc_array;
          HYPRE_Int *ap_proc_ids;
          HYPRE_Int  count;
-        
+
          HYPRE_Int  max_response_size;
          HYPRE_Int  non_info_size, entry_size_bytes;
          HYPRE_Int *neighbor_proc_ids = NULL;
@@ -1246,7 +1248,7 @@ hypre_BoxManAssemble( hypre_BoxManager *manager )
          HYPRE_Int *contact_proc_ids = NULL;
 
          HYPRE_Int max_regions, max_refinements, ologp;
-         
+
          HYPRE_Int  *local_boxnums;
 
          HYPRE_Int statbuf[3];
@@ -1269,76 +1271,76 @@ hypre_BoxManAssemble( hypre_BoxManager *manager )
          hypre_StructAssumedPart *ap;
 
          hypre_DataExchangeResponse  response_obj, response_obj2;
-       
-         hypre_BoxManEntry *entry_ptr;         
+
+         hypre_BoxManEntry *entry_ptr;
 
          hypre_Index imin, imax;
 
          hypre_IndexRef  min_ref, max_ref;
-         
+
          /* 1.  Create an assumed partition? (may have been added in the coarsen
-            routine) */   
+            routine) */
 
          if (hypre_BoxManAssumedPartition(manager) == NULL)
          {
-            
+
             /* create an array of local boxes.  get the global box size/volume
                (as a HYPRE_Real). */
 
             local_boxes = hypre_BoxArrayCreate(num_my_entries, ndim);
             local_boxnums = hypre_CTAlloc(HYPRE_Int,  num_my_entries, HYPRE_MEMORY_HOST);
-            
+
             local_volume = 0.0;
-         
-            for (i=0; i< num_my_entries; i++)
+
+            for (i = 0; i < num_my_entries; i++)
             {
-               /* get entry */           
+               /* get entry */
                entry_ptr = my_entries[i];
-               
+
                /* copy box info to local_boxes */
                min_ref = hypre_BoxManEntryIMin(entry_ptr);
                max_ref =  hypre_BoxManEntryIMax(entry_ptr);
                box = hypre_BoxArrayBox(local_boxes, i);
                hypre_BoxSetExtents( box, min_ref, max_ref );
-               
+
                /* keep box num also */
                local_boxnums[i] =   hypre_BoxManEntryId(entry_ptr);
-               
-               /* calculate volume */ 
+
+               /* calculate volume */
                local_volume += (HYPRE_Real) hypre_BoxVolume(box);
-               
+
             }/* end of local boxes */
-     
+
             /* get the number of global entries and the global volume */
 
             sendbuf2[0] = local_volume;
             sendbuf2[1] = (HYPRE_Real) num_my_entries;
-            
+
             hypre_MPI_Allreduce(&sendbuf2, &recvbuf2, 2, HYPRE_MPI_REAL,
-                                hypre_MPI_SUM, comm);   
-            
+                                hypre_MPI_SUM, comm);
+
             global_volume = recvbuf2[0];
             global_num_boxes = (HYPRE_Int) recvbuf2[1];
-            
-            /* estimates for the assumed partition */ 
-            d = nprocs/2;
+
+            /* estimates for the assumed partition */
+            d = nprocs / 2;
             ologp = 0;
             while ( d > 0)
             {
-               d = d/2; /* note - d is an HYPRE_Int - so this is floored */
+               d = d / 2; /* note - d is an HYPRE_Int - so this is floored */
                ologp++;
             }
-            
-            max_regions =  hypre_min(hypre_pow2(ologp+1), 10*ologp);
+
+            max_regions =  hypre_min(hypre_pow2(ologp + 1), 10 * ologp);
             max_refinements = ologp;
-            gamma = .6; /* percentage a region must be full to 
-                           avoid refinement */  
-            
+            gamma = .6; /* percentage a region must be full to
+                           avoid refinement */
+
             hypre_StructAssumedPartitionCreate(
                ndim, hypre_BoxManBoundingBox(manager), global_volume,
                global_num_boxes, local_boxes, local_boxnums,
-               max_regions, max_refinements, gamma,comm, &ap);
-            
+               max_regions, max_refinements, gamma, comm, &ap);
+
             hypre_BoxManAssumedPartition(manager) = ap;
 
             hypre_BoxArrayDestroy(local_boxes);
@@ -1348,7 +1350,7 @@ hypre_BoxManAssemble( hypre_BoxManager *manager )
          {
             ap = hypre_BoxManAssumedPartition(manager);
          }
-         
+
          /* 2.  Now go thru gather regions and find out which processor's AP
             region they intersect - only do the rest if we have global boxes!*/
 
@@ -1356,45 +1358,45 @@ hypre_BoxManAssemble( hypre_BoxManager *manager )
          {
             gather_regions = hypre_BoxManGatherRegions(manager);
 
-            /*allocate space to store info from one box */  
+            /*allocate space to store info from one box */
             proc_count = 0;
             proc_alloc = hypre_pow2(ndim); /* Just an initial estimate */
             proc_array = hypre_CTAlloc(HYPRE_Int,  proc_alloc, HYPRE_MEMORY_HOST);
-            
+
             /* probably there will mostly be one proc per box - allocate space
              * for 2 */
-            size = 2*hypre_BoxArraySize(gather_regions);
+            size = 2 * hypre_BoxArraySize(gather_regions);
             tmp_proc_ids =  hypre_CTAlloc(HYPRE_Int,  size, HYPRE_MEMORY_HOST);
             count = 0;
-            
+
             /* loop through all boxes */
-            hypre_ForBoxI(i, gather_regions) 
+            hypre_ForBoxI(i, gather_regions)
             {
                hypre_StructAssumedPartitionGetProcsFromBox(
-                  ap, hypre_BoxArrayBox(gather_regions, i), 
+                  ap, hypre_BoxArrayBox(gather_regions, i),
                   &proc_count, &proc_alloc, &proc_array);
-               
-               if ((count + proc_count) > size)       
+
+               if ((count + proc_count) > size)
                {
-                  size = size + proc_count 
-                     + 2*(hypre_BoxArraySize(gather_regions)-i);
+                  size = size + proc_count
+                         + 2 * (hypre_BoxArraySize(gather_regions) - i);
                   tmp_proc_ids = hypre_TReAlloc(tmp_proc_ids,  HYPRE_Int,  size, HYPRE_MEMORY_HOST);
                }
-               for (j = 0; j< proc_count; j++)
+               for (j = 0; j < proc_count; j++)
                {
                   tmp_proc_ids[count] = proc_array[j];
                   count++;
                }
             }
-            
-            hypre_TFree(proc_array, HYPRE_MEMORY_HOST);     
-            
+
+            hypre_TFree(proc_array, HYPRE_MEMORY_HOST);
+
             /* now get rid of redundencies in tmp_proc_ids (since a box can lie
-               in more than one AP - put in ap_proc_ids*/      
-            hypre_qsort0(tmp_proc_ids, 0, count-1);
+               in more than one AP - put in ap_proc_ids*/
+            hypre_qsort0(tmp_proc_ids, 0, count - 1);
             proc_count = 0;
             ap_proc_ids = hypre_CTAlloc(HYPRE_Int,  count, HYPRE_MEMORY_HOST);
-            
+
             if (count)
             {
                ap_proc_ids[0] = tmp_proc_ids[0];
@@ -1402,18 +1404,18 @@ hypre_BoxManAssemble( hypre_BoxManager *manager )
             }
             for (i = 1; i < count; i++)
             {
-               if (tmp_proc_ids[i]  != ap_proc_ids[proc_count-1])
+               if (tmp_proc_ids[i]  != ap_proc_ids[proc_count - 1])
                {
                   ap_proc_ids[proc_count] = tmp_proc_ids[i];
-                  proc_count++; 
+                  proc_count++;
                }
             }
             hypre_TFree(tmp_proc_ids, HYPRE_MEMORY_HOST);
-            
+
             /* 3.  now we have a sorted list with no duplicates in ap_proc_ids */
             /* for each of these processor ids, we need to get infomation about
                the boxes in their assumed partition region */
-            
+
             /* get some stats: check how many point to point communications?
                (what is the max?) */
             /* also get the max distinct AP procs and the max # of entries) */
@@ -1423,22 +1425,22 @@ hypre_BoxManAssemble( hypre_BoxManager *manager )
             send_statbuf[2] = num_my_entries;
 
             hypre_MPI_Allreduce(send_statbuf, statbuf, 3, HYPRE_MPI_INT,
-                                hypre_MPI_MAX, comm);   
+                                hypre_MPI_MAX, comm);
 
             //max_proc_count = statbuf[0];
-            
+
             /* we do not want a single processor to do a ton of point to point
                communications (relative to the number of total processors - how
                much is too much?*/
 
-            /* is there a better way to figure the threshold? */ 
+            /* is there a better way to figure the threshold? */
 
             /* 3/07 - take out threshold calculation - shouldn't be a problem on
              * large number of processors if box sizes are relativesly
-             * similar */ 
+             * similar */
 
 #if 0
-            threshold = hypre_min(12*ologp, nprocs);
+            threshold = hypre_min(12 * ologp, nprocs);
 
             if ( max_proc_count >=  threshold)
             {
@@ -1449,89 +1451,89 @@ hypre_BoxManAssemble( hypre_BoxManager *manager )
                /* change coarse midstream!- now we will just gather everything! */
                non_ap_gather = 1;
 
-               /*clean up from above */ 
+               /*clean up from above */
                hypre_TFree(ap_proc_ids, HYPRE_MEMORY_HOST);
             }
 #endif
-       
+
             if (!non_ap_gather)
             {
                /* EXCHANGE DATA information (2 required) :
-               
+
                if we simply return the boxes in the AP region, we will not have
                the entry information- in particular, we will not have the "info"
                obj.  So we have to get this info by doing a second communication
                where we contact the actual owners of the boxes and request the
                entry info...So:
-               
+
                (1) exchange #1: contact the AP processor, get the ids of the
                procs with boxes in that AP region (for now we ignore the box
                numbers - since we will get all of the entries from each
                processor)
-               
+
                (2) exchange #2: use this info to contact the owner processors
                and from them get the rest of the entry infomation: box extents,
                info object, etc. ***note: we will get all of the entries from
                that processor, not just the ones in a particular AP region
                (whose box numbers we ignored above) */
-               
+
                /* exchange #1 - we send nothing, and the contacted proc returns
                 * all of the procs with boxes in its AP region*/
-               
+
                /* build response object*/
                response_obj.fill_response = hypre_FillResponseBoxManAssemble1;
-               response_obj.data1 = ap; /* needed to fill responses*/ 
-               response_obj.data2 = NULL;           
-               
+               response_obj.data1 = ap; /* needed to fill responses*/
+               response_obj.data2 = NULL;
+
                send_buf = NULL;
                send_buf_starts = hypre_CTAlloc(HYPRE_Int,  proc_count + 1, HYPRE_MEMORY_HOST);
-               for (i=0; i< proc_count+1; i++)
+               for (i = 0; i < proc_count + 1; i++)
                {
-                  send_buf_starts[i] = 0;  
+                  send_buf_starts[i] = 0;
                }
-               
+
                response_buf = NULL; /*this and the next are allocated in
                                      * exchange data */
                response_buf_starts = NULL;
-               
+
                /*we expect back the proc id for each box owned */
                size =  sizeof(HYPRE_Int);
-               
-               /* this parameter needs to be the same on all processors */ 
+
+               /* this parameter needs to be the same on all processors */
                /* max_response_size = (global_num_boxes/nprocs)*2;*/
                /* modification - should reduce data passed */
                max_response_size = statbuf[1]; /*max num of distinct procs */
-               
-               hypre_DataExchangeList(proc_count, ap_proc_ids, 
-                                      send_buf, send_buf_starts, 
-                                      0, size, &response_obj, max_response_size, 3, 
+
+               hypre_DataExchangeList(proc_count, ap_proc_ids,
+                                      send_buf, send_buf_starts,
+                                      0, size, &response_obj, max_response_size, 3,
                                       comm, (void**) &response_buf,
                                       &response_buf_starts);
-               
+
                /*how many items were returned? */
                size = response_buf_starts[proc_count];
-               
-               /* alias the response buffer */ 
+
+               /* alias the response buffer */
                neighbor_proc_ids = response_buf;
-                                            
+
                /*clean up*/
                hypre_TFree(send_buf_starts, HYPRE_MEMORY_HOST);
                hypre_TFree(ap_proc_ids, HYPRE_MEMORY_HOST);
                hypre_TFree(response_buf_starts, HYPRE_MEMORY_HOST);
-               
+
                /* create a contact list of these processors (eliminate duplicate
                 * procs and also my id ) */
-               
+
                /*first sort on proc_id  */
-               hypre_qsort0(neighbor_proc_ids, 0, size-1);
-               
+               hypre_qsort0(neighbor_proc_ids, 0, size - 1);
+
                /* new contact list: */
                contact_proc_ids = hypre_CTAlloc(HYPRE_Int,  size, HYPRE_MEMORY_HOST);
                proc_count = 0; /* to determine the number of unique ids) */
-               
+
                last_id = -1;
-               
-               for (i=0; i< size; i++)
+
+               for (i = 0; i < size; i++)
                {
                   if (neighbor_proc_ids[i] != last_id)
                   {
@@ -1543,18 +1545,18 @@ hypre_BoxManAssemble( hypre_BoxManager *manager )
                      }
                   }
                }
-                      
+
                /* check to see if we have any entries from a processor before
                   contacting(if we have one entry from a processor, then we have
                   all of the entries)
-                  
+
                   we will do we only do this if we have sorted - otherwise we
                   can't easily seach the proc list - this will be most common
                   usage anyways */
-               
+
                if (hypre_BoxManIsEntriesSort(manager) && nentries)
                {
-                  /* so we can eliminate duplicate contacts */                
+                  /* so we can eliminate duplicate contacts */
 
                   HYPRE_Int new_count = 0;
                   HYPRE_Int proc_spot = 0;
@@ -1564,11 +1566,11 @@ hypre_BoxManAssemble( hypre_BoxManager *manager )
                      not have any duplicate proc ids */
                   //short_sort = 1;
 
-                  for (i=0; i< proc_count; i++)
+                  for (i = 0; i < proc_count; i++)
                   {
                      contact_id = contact_proc_ids[i];
-                     
-                     while (proc_spot < nentries) 
+
+                     while (proc_spot < nentries)
                      {
                         known_id = procs_sort[proc_spot];
                         if (contact_id > known_id)
@@ -1597,7 +1599,7 @@ hypre_BoxManAssemble( hypre_BoxManager *manager )
                         new_count++;
                      }
                   }
-                  
+
                   proc_count = new_count;
                }
 #if 0
@@ -1610,24 +1612,24 @@ hypre_BoxManAssemble( hypre_BoxManager *manager )
 #endif
 
                send_buf_starts = hypre_CTAlloc(HYPRE_Int,  proc_count + 1, HYPRE_MEMORY_HOST);
-               for (i=0; i< proc_count+1; i++)
+               for (i = 0; i < proc_count + 1; i++)
                {
-                  send_buf_starts[i] = 0;  
+                  send_buf_starts[i] = 0;
                }
                send_buf = NULL;
-               
+
                /* exchange #2 - now we contact processors (send nothing) and
                   that processor needs to send us all of their local entry
-                  information*/ 
-               
+                  information*/
+
                entry_response_buf = NULL; /*this and the next are allocated
                                            * in exchange data */
                response_buf_starts = NULL;
-               
+
                response_obj2.fill_response = hypre_FillResponseBoxManAssemble2;
-               response_obj2.data1 = manager; /* needed to fill responses*/ 
-               response_obj2.data2 = NULL;   
-               
+               response_obj2.data1 = manager; /* needed to fill responses*/
+               response_obj2.data2 = NULL;
+
                /* How big is an entry?
                     extents - 2*ndim HYPRE_Ints
                     proc    - 1 HYPRE_Int
@@ -1637,41 +1639,41 @@ hypre_BoxManAssemble( hypre_BoxManager *manager )
                   Note: For now, we do not need to send num_ghost, position, or
                   boxman, since this is just generated in addentry. */
 
-               non_info_size = 2*ndim + 2;
-               entry_size_bytes = non_info_size*sizeof(HYPRE_Int) 
-                  + hypre_BoxManEntryInfoSize(manager);
-               
-               /* modification -  use an true max_response_size 
+               non_info_size = 2 * ndim + 2;
+               entry_size_bytes = non_info_size * sizeof(HYPRE_Int)
+                                  + hypre_BoxManEntryInfoSize(manager);
+
+               /* modification -  use an true max_response_size
                   (should be faster and less communication */
                max_response_size = statbuf[2]; /* max of num_my_entries */
-               
-               hypre_DataExchangeList(proc_count, contact_proc_ids, 
+
+               hypre_DataExchangeList(proc_count, contact_proc_ids,
                                       send_buf, send_buf_starts, sizeof(HYPRE_Int),
-                                      entry_size_bytes, &response_obj2, 
-                                      max_response_size, 4, 
-                                      comm,  &entry_response_buf, 
+                                      entry_size_bytes, &response_obj2,
+                                      max_response_size, 4,
+                                      comm,  &entry_response_buf,
                                       &response_buf_starts);
-               
+
                /* now we can add entries that are in response_buf - we check for
                   duplicates later  */
-               
+
                /*how many entries do we have?*/
-               response_size = response_buf_starts[proc_count];  
-               
+               response_size = response_buf_starts[proc_count];
+
                /* do we need more storage ?*/
                if (nentries + response_size >  hypre_BoxManMaxNEntries(manager))
                {
                   HYPRE_Int inc_size;
-                  
-                  inc_size = (response_size + nentries 
+
+                  inc_size = (response_size + nentries
                               - hypre_BoxManMaxNEntries(manager));
                   hypre_BoxManIncSize ( manager, inc_size);
-                  
+
                   entries =  hypre_BoxManEntries(manager);
                   procs_sort = hypre_BoxManProcsSort(manager);
                   ids_sort = hypre_BoxManIdsSort(manager);
                }
-               
+
                index_ptr = entry_response_buf; /* point into response buf */
                for (i = 0; i < response_size; i++)
                {
@@ -1679,51 +1681,51 @@ hypre_BoxManAssemble( hypre_BoxManager *manager )
                   /* imin */
                   for (d = 0; d < ndim; d++)
                   {
-					 hypre_TMemcpy( &tmp_int,  index_ptr, HYPRE_Int, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
+                     hypre_TMemcpy( &tmp_int,  index_ptr, HYPRE_Int, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
                      index_ptr =  (void *) ((char *) index_ptr + size);
                      hypre_IndexD(imin, d) = tmp_int;
                   }
-                  
+
                   /*imax */
                   for (d = 0; d < ndim; d++)
                   {
-					 hypre_TMemcpy( &tmp_int,  index_ptr, HYPRE_Int, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
+                     hypre_TMemcpy( &tmp_int,  index_ptr, HYPRE_Int, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
                      index_ptr =  (void *) ((char *) index_ptr + size);
                      hypre_IndexD(imax, d) = tmp_int;
                   }
-                  
-                  /* proc */  
+
+                  /* proc */
                   tmp_int_ptr = (HYPRE_Int *) index_ptr;
                   proc = *tmp_int_ptr;
                   index_ptr =  (void *) ((char *) index_ptr + size);
-                  
+
                   /* id */
                   tmp_int_ptr = (HYPRE_Int *) index_ptr;
                   id = *tmp_int_ptr;
                   index_ptr =  (void *) ((char *) index_ptr + size);
-                  
-                  /* the info object (now pointer to by index_ptr) 
+
+                  /* the info object (now pointer to by index_ptr)
                      is copied by AddEntry*/
                   hypre_BoxManAddEntry(manager, imin, imax, proc, id, index_ptr);
-                  
-                  /* start of next entry */  
+
+                  /* start of next entry */
                   index_ptr = (void *)
-                     ((char *) index_ptr + hypre_BoxManEntryInfoSize(manager));
+                              ((char *) index_ptr + hypre_BoxManEntryInfoSize(manager));
                }
-               
+
                /* clean up from this section of code*/
                hypre_TFree(entry_response_buf, HYPRE_MEMORY_HOST);
                hypre_TFree(response_buf_starts, HYPRE_MEMORY_HOST);
                hypre_TFree(send_buf_starts, HYPRE_MEMORY_HOST);
                hypre_TFree(contact_proc_ids, HYPRE_MEMORY_HOST);
                hypre_TFree(neighbor_proc_ids, HYPRE_MEMORY_HOST); /* response_buf - aliased */
-               
+
             } /* end of nested non_ap_gather -exchange 1*/
-            
+
          } /* end of if global boxes */
-         
+
       } /********** end of gathering for the AP case *****************/
-      
+
       if (non_ap_gather) /* beginning of gathering for the non-AP case */
       {
          /* collect global data - here we will just send each processor's local
@@ -1739,7 +1741,7 @@ hypre_BoxManAssemble( hypre_BoxManager *manager )
          HYPRE_Int  proc, id;
          HYPRE_Int  tmp_int;
          HYPRE_Int *tmp_int_ptr;
-      
+
          void *send_buf = NULL;
          void *recv_buf = NULL;
 
@@ -1757,19 +1759,19 @@ hypre_BoxManAssemble( hypre_BoxManager *manager )
             proc    - 1 HYPRE_Int
             id      - 1 HYPRE_Int
             info    - info_size in bytes
-            
+
             Note: For now, we do not need to send num_ghost, position, or
             boxman, since this is just generated in addentry. */
 
-         non_info_size = 2*ndim + 2;
-         entry_size_bytes = non_info_size*sizeof(HYPRE_Int) 
-            + hypre_BoxManEntryInfoSize(manager);
+         non_info_size = 2 * ndim + 2;
+         entry_size_bytes = non_info_size * sizeof(HYPRE_Int)
+                            + hypre_BoxManEntryInfoSize(manager);
 
-         /* figure out how many entries each proc has - let the group know */ 
+         /* figure out how many entries each proc has - let the group know */
          send_count =  num_my_entries;
-         send_count_bytes = send_count*entry_size_bytes;
+         send_count_bytes = send_count * entry_size_bytes;
          recv_counts = hypre_CTAlloc(HYPRE_Int,  nprocs, HYPRE_MEMORY_HOST);
-      
+
          hypre_MPI_Allgather(&send_count_bytes, 1, HYPRE_MPI_INT,
                              recv_counts, 1, HYPRE_MPI_INT, comm);
 
@@ -1778,10 +1780,10 @@ hypre_BoxManAssemble( hypre_BoxManager *manager )
          recv_buf_size_bytes = recv_counts[0];
          for (i = 1; i < nprocs; i++)
          {
-            displs[i] = displs[i-1] + recv_counts[i-1];
+            displs[i] = displs[i - 1] + recv_counts[i - 1];
             recv_buf_size_bytes += recv_counts[i];
          }
-         recv_buf_size = recv_buf_size_bytes/ entry_size_bytes;
+         recv_buf_size = recv_buf_size_bytes / entry_size_bytes;
          /* mydispls = displs[myid]/entry_size_bytes; */
 
          global_num_boxes = recv_buf_size;
@@ -1792,15 +1794,15 @@ hypre_BoxManAssemble( hypre_BoxManager *manager )
          recv_buf = hypre_TAlloc(char, recv_buf_size_bytes, HYPRE_MEMORY_HOST);
 
          index_ptr = send_buf; /* step through send_buf with this pointer */
-         /* loop over my entries */  
-         for (i=0; i < send_count; i++)
+         /* loop over my entries */
+         for (i = 0; i < send_count; i++)
          {
             entry = my_entries[i];
 
             size = sizeof(HYPRE_Int);
 
             /* imin */
-            index = hypre_BoxManEntryIMin(entry); 
+            index = hypre_BoxManEntryIMin(entry);
             for (d = 0; d < ndim; d++)
             {
                tmp_int = hypre_IndexD(index, d);
@@ -1808,7 +1810,7 @@ hypre_BoxManAssemble( hypre_BoxManager *manager )
                index_ptr =  (void *) ((char *) index_ptr + size);
             }
 
-            /* imax */  
+            /* imax */
             index = hypre_BoxManEntryIMax(entry);
             for (d = 0; d < ndim; d++)
             {
@@ -1826,7 +1828,7 @@ hypre_BoxManAssemble( hypre_BoxManager *manager )
             tmp_int = hypre_BoxManEntryId(entry);
             hypre_TMemcpy( index_ptr,  &tmp_int, HYPRE_Int, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
             index_ptr =  (void *) ((char *) index_ptr + size);
-   
+
             /*info object*/
             size = hypre_BoxManEntryInfoSize(manager);
             position = hypre_BoxManEntryPosition(entry);
@@ -1834,10 +1836,10 @@ hypre_BoxManAssemble( hypre_BoxManager *manager )
 
             hypre_TMemcpy(index_ptr,  info, char, size, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
             index_ptr =  (void *) ((char *) index_ptr + size);
-       
+
          } /* end of loop over my entries */
 
-         /* now send_buf is ready to go! */  
+         /* now send_buf is ready to go! */
 
          hypre_MPI_Allgatherv(send_buf, send_count_bytes, hypre_MPI_BYTE,
                               recv_buf, recv_counts, displs, hypre_MPI_BYTE, comm);
@@ -1845,15 +1847,15 @@ hypre_BoxManAssemble( hypre_BoxManager *manager )
          /* unpack recv_buf into entries - let's just unpack them all into the
             entries table - this way they will already be sorted - so we set
             nentries to zero so that add entries starts at the beginning (i.e.,
-            we are deleting the current entries and re-creating)*/ 
- 
+            we are deleting the current entries and re-creating)*/
+
          if (recv_buf_size > hypre_BoxManMaxNEntries(manager))
          {
             HYPRE_Int inc_size;
-         
+
             inc_size = (recv_buf_size - hypre_BoxManMaxNEntries(manager));
             hypre_BoxManIncSize ( manager, inc_size);
-            
+
             nentries = hypre_BoxManNEntries(manager);
             entries =  hypre_BoxManEntries(manager);
             procs_sort = hypre_BoxManProcsSort(manager);
@@ -1868,25 +1870,25 @@ hypre_BoxManAssemble( hypre_BoxManager *manager )
          index_ptr = recv_buf;
          for (i = 0; i < recv_buf_size; i++)
          {
-            
+
             size = sizeof(HYPRE_Int);
             /* imin */
             for (d = 0; d < ndim; d++)
             {
-			   hypre_TMemcpy( &tmp_int,  index_ptr, HYPRE_Int, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
+               hypre_TMemcpy( &tmp_int,  index_ptr, HYPRE_Int, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
                index_ptr =  (void *) ((char *) index_ptr + size);
                hypre_IndexD(imin, d) = tmp_int;
             }
-         
+
             /*imax */
             for (d = 0; d < ndim; d++)
             {
-			   hypre_TMemcpy( &tmp_int,  index_ptr, HYPRE_Int, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
+               hypre_TMemcpy( &tmp_int,  index_ptr, HYPRE_Int, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
                index_ptr =  (void *) ((char *) index_ptr + size);
                hypre_IndexD(imax, d) = tmp_int;
             }
 
-            /* proc */  
+            /* proc */
             tmp_int_ptr = (HYPRE_Int *) index_ptr;
             proc = *tmp_int_ptr;
             index_ptr =  (void *) ((char *) index_ptr + size);
@@ -1895,29 +1897,29 @@ hypre_BoxManAssemble( hypre_BoxManager *manager )
             tmp_int_ptr = (HYPRE_Int *) index_ptr;
             id = *tmp_int_ptr;
             index_ptr =  (void *) ((char *) index_ptr + size);
-            
-            /* info is copied by AddEntry and index_ptr is at info */            
-            hypre_BoxManAddEntry( manager , imin , 
-                                  imax , proc, id, 
+
+            /* info is copied by AddEntry and index_ptr is at info */
+            hypre_BoxManAddEntry( manager, imin,
+                                  imax, proc, id,
                                   index_ptr );
 
-            /* start of next entry */  
-            index_ptr = (void *) ((char *) index_ptr + 
+            /* start of next entry */
+            index_ptr = (void *) ((char *) index_ptr +
                                   hypre_BoxManEntryInfoSize(manager));
          }
-         
+
          hypre_BoxManAllGlobalKnown(manager) = 1;
-         
+
          hypre_TFree(send_buf, HYPRE_MEMORY_HOST);
          hypre_TFree(recv_buf, HYPRE_MEMORY_HOST);
          hypre_TFree(recv_counts, HYPRE_MEMORY_HOST);
          hypre_TFree(displs, HYPRE_MEMORY_HOST);
-         
+
          /* now the entries and procs_sort and ids_sort are already
             sorted */
          need_to_sort = 0;
          hypre_BoxManIsEntriesSort(manager) = 1;
-         
+
       } /********* end of non-AP gather *****************/
 
    }/* end of if (gather entries) for both AP and non-AP */
@@ -1925,10 +1927,12 @@ hypre_BoxManAssemble( hypre_BoxManager *manager )
    {
       /* no gather - so check to see if the entries have been sorted by the user
          - if so we don't need to sort! */
-      if  (hypre_BoxManIsEntriesSort(manager))     
+      if  (hypre_BoxManIsEntriesSort(manager))
+      {
          need_to_sort = 0;
+      }
    }
-   
+
    /* we don't need special access to my entries anymore - because we will
       create the sort table */
 
@@ -1947,7 +1951,7 @@ hypre_BoxManAssemble( hypre_BoxManager *manager )
 
    /* check for and remove duplicate boxes - based on (proc, id) */
    /* at the same time sort the procs_sort and ids_sort and then sort the
-    * entries*/   
+    * entries*/
    {
       HYPRE_Int *order_index = NULL;
       HYPRE_Int *delete_array = NULL;
@@ -1959,7 +1963,7 @@ hypre_BoxManAssemble( hypre_BoxManager *manager )
       HYPRE_Int size;
 
       hypre_BoxManEntry  *new_entries;
-      
+
       /* (TO DO): if we are sorting after the ap gather, then the box ids may
          already be sorted within processor number (depends on if the check for
          contacting duplicate processors was performed....if so, then there may
@@ -1969,12 +1973,12 @@ hypre_BoxManAssemble( hypre_BoxManager *manager )
       /* initial... */
       nentries = hypre_BoxManNEntries(manager);
       entries =  hypre_BoxManEntries(manager);
- 
+
       /* these are negative if a proc does not have any local entries in the
          manager */
       first_local = -1;
       myoffset = -1;
-      
+
       if (need_to_sort)
       {
 
@@ -1989,19 +1993,19 @@ hypre_BoxManAssemble( hypre_BoxManager *manager )
          }
          else
          {
-            /*stuff below */   
+            /*stuff below */
          }
-#endif         
+#endif
          order_index = hypre_CTAlloc(HYPRE_Int,  nentries, HYPRE_MEMORY_HOST);
          delete_array =  hypre_CTAlloc(HYPRE_Int,  nentries, HYPRE_MEMORY_HOST);
          index = 0;
-               
-         for (i=0; i< nentries; i++)
+
+         for (i = 0; i < nentries; i++)
          {
             order_index[i] = i;
          }
-         /* sort by proc_id */ 
-         hypre_qsort3i(procs_sort, ids_sort, order_index, 0, nentries-1);
+         /* sort by proc_id */
+         hypre_qsort3i(procs_sort, ids_sort, order_index, 0, nentries - 1);
          num_procs_sort = 0;
          /* get first id */
          if (nentries)
@@ -2009,44 +2013,44 @@ hypre_BoxManAssemble( hypre_BoxManager *manager )
             tmp_id = procs_sort[0];
             num_procs_sort++;
          }
-         
+
          /* now sort on ids within each processor number*/
          start = 0;
-         for (i=1; i< nentries; i++)
+         for (i = 1; i < nentries; i++)
          {
-            if (procs_sort[i] != tmp_id) 
+            if (procs_sort[i] != tmp_id)
             {
-               hypre_qsort2i(ids_sort, order_index, start, i-1);
-               /*now find duplicate ids */ 
-               for (j=start+1; j< i; j++)
+               hypre_qsort2i(ids_sort, order_index, start, i - 1);
+               /*now find duplicate ids */
+               for (j = start + 1; j < i; j++)
                {
-                  if (ids_sort[j] == ids_sort[j-1])
+                  if (ids_sort[j] == ids_sort[j - 1])
                   {
                      delete_array[index++] = j;
                   }
                }
-               /* update start and tmp_id */  
+               /* update start and tmp_id */
                start = i;
                tmp_id = procs_sort[i];
-               num_procs_sort++; 
+               num_procs_sort++;
             }
          }
          /* final sort and purge (the last group doesn't get caught in the above
             loop) */
          if (nentries)
          {
-            hypre_qsort2i(ids_sort, order_index, start, nentries-1);
-            /*now find duplicate boxnums */ 
-            for (j=start+1; j<nentries; j++)
+            hypre_qsort2i(ids_sort, order_index, start, nentries - 1);
+            /*now find duplicate boxnums */
+            for (j = start + 1; j < nentries; j++)
             {
-               if (ids_sort[j] == ids_sort[j-1])
+               if (ids_sort[j] == ids_sort[j - 1])
                {
                   delete_array[index++] = j;
                }
             }
          }
-         /* now index = the number to delete (in delete_array) */     
-         
+         /* now index = the number to delete (in delete_array) */
+
          if (index)
          {
             /* now delete from sort procs and sort ids -use delete_array because
@@ -2057,52 +2061,52 @@ hypre_BoxManAssemble( hypre_BoxManager *manager )
             {
                if (j < index)
                {
-                  while ((i+j) == delete_array[j]) /* see if deleting
+                  while ((i + j) == delete_array[j]) /* see if deleting
                                                     * consec. items */
                   {
                      j++; /*increase the shift*/
-                     if (j == index) break;
+                     if (j == index) { break; }
                   }
                }
-               if ((i+j) < nentries) /* if deleting the last item then no moving */
+               if ((i + j) < nentries) /* if deleting the last item then no moving */
                {
-                  ids_sort[i] = ids_sort[i+j];
-                  procs_sort[i] =  procs_sort[i+j];
-                  order_index[i] = order_index[i+j];
+                  ids_sort[i] = ids_sort[i + j];
+                  procs_sort[i] =  procs_sort[i + j];
+                  order_index[i] = order_index[i + j];
                }
             }
          }
-         
+
          /*** create new sorted entries and info arrays - delete old one ****/
          {
             HYPRE_Int position;
             HYPRE_Int info_size = hypre_BoxManEntryInfoSize(manager);
-            
+
             void *index_ptr;
             void *new_info;
             void *info;
 
             size = nentries - index;
             new_entries =  hypre_CTAlloc(hypre_BoxManEntry,  size, HYPRE_MEMORY_HOST);
-            
-            new_info = hypre_TAlloc(char, size*info_size, HYPRE_MEMORY_HOST);
+
+            new_info = hypre_TAlloc(char, size * info_size, HYPRE_MEMORY_HOST);
             index_ptr = new_info;
-            
-            for (i= 0; i< size; i++)
+
+            for (i = 0; i < size; i++)
             {
                /* copy the entry */
                hypre_BoxManEntryCopy(&entries[order_index[i]], &new_entries[i]);
 
                /* set the new position */
                hypre_BoxManEntryPosition(&new_entries[i]) = i;
-               
+
                /* copy the info object */
                position = hypre_BoxManEntryPosition(&entries[order_index[i]]);
                info = hypre_BoxManInfoObject(manager, position);
-               
+
                hypre_TMemcpy(index_ptr,  info, char,  info_size, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
                index_ptr =  (void *) ((char *) index_ptr + info_size);
-               
+
             }
             hypre_TFree(entries, HYPRE_MEMORY_HOST);
             hypre_TFree(hypre_BoxManInfoObjects(manager), HYPRE_MEMORY_HOST);
@@ -2112,25 +2116,25 @@ hypre_BoxManAssemble( hypre_BoxManager *manager )
             hypre_BoxManNEntries(manager) = size;
 
             hypre_BoxManInfoObjects(manager) = new_info;
-            
+
             nentries = hypre_BoxManNEntries(manager);
             entries = hypre_BoxManEntries(manager);
          }
-         
+
       } /* end of if (need_to_sort) */
 
       else
       {
          /* no sorting - just get num_procs_sort by looping through procs_sort
             array*/
-        
+
          num_procs_sort = 0;
          if (nentries > 0)
          {
             tmp_id = procs_sort[0];
             num_procs_sort++;
          }
-         for (i=1; i < nentries; i++) 
+         for (i = 1; i < nentries; i++)
          {
             if (procs_sort[i] != tmp_id)
             {
@@ -2148,19 +2152,19 @@ hypre_BoxManAssemble( hypre_BoxManager *manager )
       proc_offsets[0] = 0;
       if (nentries > 0)
       {
-         j=1;
+         j = 1;
          tmp_id = procs_sort[0];
-         if (myid == tmp_id) 
+         if (myid == tmp_id)
          {
-            myoffset =0;
+            myoffset = 0;
             first_local = 0;
          }
-         
-         for (i=0; i < nentries; i++) 
+
+         for (i = 0; i < nentries; i++)
          {
             if (procs_sort[i] != tmp_id)
             {
-               if (myid == procs_sort[i]) 
+               if (myid == procs_sort[i])
                {
                   myoffset = j;
                   first_local = i;
@@ -2171,7 +2175,7 @@ hypre_BoxManAssemble( hypre_BoxManager *manager )
          }
          proc_offsets[j] = nentries; /* last one */
       }
-    
+
       hypre_BoxManProcsSortOffsets(manager) = proc_offsets;
       hypre_BoxManFirstLocal(manager) = first_local;
       hypre_BoxManLocalProcOffset(manager) = myoffset;
@@ -2189,22 +2193,22 @@ hypre_BoxManAssemble( hypre_BoxManager *manager )
 
       HYPRE_Int all_known = 0;
       HYPRE_Int global_all_known;
-      
+
       nentries = hypre_BoxManNEntries(manager);
-   
+
       if (!hypre_BoxManAllGlobalKnown(manager) && global_is_gather)
       {
          /*if every processor has its nentries = global_num_boxes, then all is
-          * known */  
-         if (global_num_boxes == nentries) all_known = 1;
-    
+          * known */
+         if (global_num_boxes == nentries) { all_known = 1; }
+
          hypre_MPI_Allreduce(&all_known, &global_all_known, 1, HYPRE_MPI_INT,
                              hypre_MPI_LAND, comm);
-            
+
          hypre_BoxManAllGlobalKnown(manager) = global_all_known;
       }
    }
-   
+
    /*------------------------------INDEX TABLE ---------------------------*/
 
    /* now build the index_table and indexes array */
@@ -2247,7 +2251,7 @@ hypre_BoxManAssemble( hypre_BoxManager *manager )
       for (d = 0; d < ndim; d++)
       {
          /* room for min and max of each entry in each dim */
-         indexes[d] = hypre_CTAlloc(HYPRE_Int,  2*nentries, HYPRE_MEMORY_HOST);
+         indexes[d] = hypre_CTAlloc(HYPRE_Int,  2 * nentries, HYPRE_MEMORY_HOST);
          size[d] = 0;
       }
       /* loop through each entry and get index */
@@ -2257,7 +2261,7 @@ hypre_BoxManAssemble( hypre_BoxManager *manager )
          entry_imin = hypre_BoxManEntryIMin(entry);
          entry_imax = hypre_BoxManEntryIMax(entry);
 
-          /* in each dim, check if min/max positions are already in the table */
+         /* in each dim, check if min/max positions are already in the table */
          for (d = 0; d < ndim; d++)
          {
             iminmax[0] = hypre_IndexD(entry_imin, d);
@@ -2272,22 +2276,22 @@ hypre_BoxManAssemble( hypre_BoxManager *manager )
                if (!i)
                {
                   location = hypre_BinarySearch2(indexes[d], iminmax[i], 0,
-                                                 size[d]-1, &j);
-                  if (location != -1) index_not_there = 0;               
+                                                 size[d] - 1, &j);
+                  if (location != -1) { index_not_there = 0; }
                }
                else /* for max, we can start seach at min position */
                {
                   location = hypre_BinarySearch2(indexes[d], iminmax[i], j,
-                                                 size[d]-1, &j);
-                  if (location != -1) index_not_there = 0;
+                                                 size[d] - 1, &j);
+                  if (location != -1) { index_not_there = 0; }
                }
-               
+
                /* if the index is already there, don't add it again */
                if (index_not_there)
                {
                   for (k = size[d]; k > j; k--) /* make room for new index */
                   {
-                     indexes[d][k] = indexes[d][k-1];
+                     indexes[d][k] = indexes[d][k - 1];
                   }
                   indexes[d][j] = iminmax[i];
                   size[d]++; /* increase the size in that dimension */
@@ -2296,7 +2300,7 @@ hypre_BoxManAssemble( hypre_BoxManager *manager )
          } /* end of for each dimension of the entry */
       } /* end of for each entry loop */
 
-      if (nentries) 
+      if (nentries)
       {
          itsize = 1;
          for (d = 0; d < ndim; d++)
@@ -2320,10 +2324,10 @@ hypre_BoxManAssemble( hypre_BoxManager *manager )
       hypre_SetIndex(stride, 1);
       hypre_BoxSetExtents(table_box, stride, size);
       hypre_BoxShiftNeg(table_box, stride); /* Want box to start at 0*/
-            
-      /* which are my entries? (on-processor) */ 
+
+      /* which are my entries? (on-processor) */
       mystart = hypre_BoxManFirstLocal(manager);
-      if (mystart >= 0 ) /*  we have local entries) because 
+      if (mystart >= 0 ) /*  we have local entries) because
                              firstlocal = -1 if no local entries */
       {
          loop_num = 3;
@@ -2332,15 +2336,15 @@ hypre_BoxManAssemble( hypre_BoxManager *manager )
             ordering is because creating the linked list for overlapping
             boxes */
 
-         myfinish =  proc_offsets[hypre_BoxManLocalProcOffset(manager)+1];
+         myfinish =  proc_offsets[hypre_BoxManLocalProcOffset(manager) + 1];
          /* #1 do off proc. entries - lower range */
          start_loop[0] = 0;
          end_loop[0] = mystart;
          /* #2 do off proc. entries - upper range */
-         start_loop[1]= myfinish;
+         start_loop[1] = myfinish;
          end_loop[1] = nentries;
          /* #3 do ON proc. entries */
-         start_loop[2]= mystart;
+         start_loop[2] = mystart;
          end_loop[2] = myfinish;
       }
       else /* no on-proc entries */
@@ -2349,7 +2353,7 @@ hypre_BoxManAssemble( hypre_BoxManager *manager )
          start_loop[0] = 0;
          end_loop[0] = nentries;
       }
-      
+
       for (loop = 0; loop < loop_num; loop++)
       {
          for (range = start_loop[loop]; range < end_loop[loop]; range++)
@@ -2357,18 +2361,18 @@ hypre_BoxManAssemble( hypre_BoxManager *manager )
             entry = &entries[range];
             entry_imin = hypre_BoxManEntryIMin(entry);
             entry_imax = hypre_BoxManEntryIMax(entry);
-            
+
             /* find the indexes corresponding to the current box - put in imin
                and imax */
             for (d = 0; d < ndim; d++)
             {
                /* need to go to size[d] because that contains the last element */
                location = hypre_BinarySearch2(
-                  indexes[d], hypre_IndexD(entry_imin, d), 0, size[d], &spot);
+                             indexes[d], hypre_IndexD(entry_imin, d), 0, size[d], &spot);
                hypre_IndexD(imin, d) = location;
 
                location = hypre_BinarySearch2(
-                  indexes[d], hypre_IndexD(entry_imax, d) + 1 , 0, size[d], &spot);
+                             indexes[d], hypre_IndexD(entry_imax, d) + 1, 0, size[d], &spot);
                hypre_IndexD(imax, d) = location - 1;
 
             } /* now have imin and imax location in index array*/
@@ -2394,7 +2398,7 @@ hypre_BoxManAssemble( hypre_BoxManager *manager )
          } /* end of subset of entries */
       }/* end of three loops over subsets */
 
-      /* done with the index_table! */ 
+      /* done with the index_table! */
       hypre_TFree( hypre_BoxManIndexTable(manager), HYPRE_MEMORY_HOST); /* in case this is a
                                                         re-assemble - shouldn't
                                                         be though */
@@ -2410,14 +2414,14 @@ hypre_BoxManAssemble( hypre_BoxManager *manager )
 
       hypre_BoxDestroy(index_box);
       hypre_BoxDestroy(table_box);
-      
+
    } /* end of building index table group */
 
    /* clean up and update*/
 
    hypre_BoxManNEntries(manager) = nentries;
    hypre_BoxManEntries(manager) = entries;
-   
+
    hypre_BoxManIsGatherCalled(manager) = 0;
    hypre_BoxArrayDestroy(gather_regions);
    hypre_BoxManGatherRegions(manager) =  hypre_BoxArrayCreate(0, ndim);
@@ -2432,12 +2436,12 @@ hypre_BoxManAssemble( hypre_BoxManager *manager )
  * grid that are intersected by this box. The user must insure that a processor
  * owns the correct global information to do the intersection. For now this is
  * virtually the same as the box map intersect.
- * 
- * Notes: 
- *  
+ *
+ * Notes:
+ *
  * (1) This function can also be used in the way that hypre_BoxMapFindEntry was
  * previously used - just pass in iupper=ilower.
- * 
+ *
  * (2) return NULL for entries if none are found
  *
  *--------------------------------------------------------------------------*/
@@ -2475,7 +2479,7 @@ hypre_BoxManIntersect ( hypre_BoxManager *manager,
       hypre_error_in_arg(1);
       return hypre_error_flag;
    }
-   
+
    /* Check whether the box manager contains any entries */
    if (hypre_BoxManNEntries(manager) == 0)
    {
@@ -2514,7 +2518,7 @@ hypre_BoxManIntersect ( hypre_BoxManager *manager,
          current_index_d ++;
       }
 
-      if( current_index_d > (man_index_size_d - 1) )
+      if ( current_index_d > (man_index_size_d - 1) )
       {
          *entries_ptr  = NULL;
          *nentries_ptr = 0;
@@ -2526,16 +2530,16 @@ hypre_BoxManIntersect ( hypre_BoxManager *manager,
       }
 
       /* -----find location of iupper[d] in  indexes-----*/
-      
+
       find_index_d = hypre_IndexD(iupper, d);
 
       /* Loop upward if target index is greater than current location */
-      while ( (current_index_d <= (man_index_size_d-1)) &&
-              (find_index_d >= man_indexes_d[current_index_d+1]) )
+      while ( (current_index_d <= (man_index_size_d - 1)) &&
+              (find_index_d >= man_indexes_d[current_index_d + 1]) )
       {
          current_index_d ++;
       }
-      if( current_index_d < 0 )
+      if ( current_index_d < 0 )
       {
          *entries_ptr  = NULL;
          *nentries_ptr = 0;
@@ -2543,7 +2547,7 @@ hypre_BoxManIntersect ( hypre_BoxManager *manager,
       }
       else
       {
-         man_iupper[d] = hypre_min(current_index_d, (man_index_size_d-1));
+         man_iupper[d] = hypre_min(current_index_d, (man_index_size_d - 1));
       }
    }
 
@@ -2613,26 +2617,31 @@ hypre_BoxManIntersect ( hypre_BoxManager *manager,
  *****************************************************************************/
 
 HYPRE_Int
-hypre_FillResponseBoxManAssemble1( void *p_recv_contact_buf, 
-                                   HYPRE_Int contact_size,
-                                   HYPRE_Int contact_proc,
-                                   void *ro, MPI_Comm comm,
-                                   void **p_send_response_buf, 
-                                   HYPRE_Int *response_message_size )
+hypre_FillResponseBoxManAssemble1( void       *p_recv_contact_buf,
+                                   HYPRE_Int   contact_size,
+                                   HYPRE_Int   contact_proc,
+                                   void       *ro,
+                                   MPI_Comm    comm,
+                                   void      **p_send_response_buf,
+                                   HYPRE_Int  *response_message_size )
 {
+   HYPRE_UNUSED_VAR(p_recv_contact_buf);
+   HYPRE_UNUSED_VAR(contact_size);
+   HYPRE_UNUSED_VAR(contact_proc);
+
    HYPRE_Int    myid, i, index;
    HYPRE_Int    size, num_boxes, num_objects;
    HYPRE_Int   *proc_ids;
    HYPRE_Int   *send_response_buf = (HYPRE_Int *) *p_send_response_buf;
- 
-   hypre_DataExchangeResponse  *response_obj = (hypre_DataExchangeResponse  *)ro;  
-   hypre_StructAssumedPart     *ap = (hypre_StructAssumedPart     *)response_obj->data1;  
+
+   hypre_DataExchangeResponse  *response_obj = (hypre_DataExchangeResponse  *)ro;
+   hypre_StructAssumedPart     *ap = (hypre_StructAssumedPart     *)response_obj->data1;
 
    HYPRE_Int overhead = response_obj->send_response_overhead;
 
    /* initialize stuff */
    hypre_MPI_Comm_rank(comm, &myid );
-  
+
    proc_ids =  hypre_StructAssumedPartMyPartitionProcIds(ap);
 
    /* we need to send back the list of all the processor ids for the boxes */
@@ -2644,32 +2653,36 @@ hypre_FillResponseBoxManAssemble1( void *p_recv_contact_buf,
    num_boxes = hypre_StructAssumedPartMyPartitionIdsSize(ap);
    /* how many procs do we have in the AP?*/
    num_objects = hypre_StructAssumedPartMyPartitionNumDistinctProcs(ap);
-   
+
    /* num_objects is then how much we need to send*/
-     
+
    /* check storage in send_buf for adding the information */
    /* note: we are returning objects that are 1 ints in size */
 
    if ( response_obj->send_response_storage  < num_objects  )
    {
-      response_obj->send_response_storage =  hypre_max(num_objects, 10); 
-      size =  1*(response_obj->send_response_storage + overhead);
-      send_response_buf = hypre_TReAlloc( send_response_buf,  HYPRE_Int,  
+      response_obj->send_response_storage =  hypre_max(num_objects, 10);
+      size =  1 * (response_obj->send_response_storage + overhead);
+      send_response_buf = hypre_TReAlloc( send_response_buf,  HYPRE_Int,
                                           size, HYPRE_MEMORY_HOST);
-      *p_send_response_buf = send_response_buf;  
+      *p_send_response_buf = send_response_buf;
    }
 
    /* populate send_response_buf with distinct proc ids*/
    index = 0;
 
-   if (num_objects > 0) 
+   if (num_objects > 0)
+   {
       send_response_buf[index++] = proc_ids[0];
+   }
 
    for (i = 1; i < num_boxes && index < num_objects; i++)
    {
       /* processor id */
-      if (proc_ids[i] != proc_ids[i-1])
+      if (proc_ids[i] != proc_ids[i - 1])
+      {
          send_response_buf[index++] = proc_ids[i];
+      }
    }
 
    /* return variables */
@@ -2684,23 +2697,28 @@ hypre_FillResponseBoxManAssemble1( void *p_recv_contact_buf,
  *****************************************************************************/
 
 HYPRE_Int
-hypre_FillResponseBoxManAssemble2( void *p_recv_contact_buf, 
-                                   HYPRE_Int contact_size,
-                                   HYPRE_Int contact_proc,
-                                   void *ro, MPI_Comm comm,
-                                   void **p_send_response_buf, 
-                                   HYPRE_Int *response_message_size )
+hypre_FillResponseBoxManAssemble2( void       *p_recv_contact_buf,
+                                   HYPRE_Int   contact_size,
+                                   HYPRE_Int   contact_proc,
+                                   void       *ro,
+                                   MPI_Comm    comm,
+                                   void      **p_send_response_buf,
+                                   HYPRE_Int  *response_message_size )
 {
+   HYPRE_UNUSED_VAR(p_recv_contact_buf);
+   HYPRE_UNUSED_VAR(contact_size);
+   HYPRE_UNUSED_VAR(contact_proc);
+
    HYPRE_Int          myid, i, d, size, position;
    HYPRE_Int          proc_id, box_id, tmp_int;
    HYPRE_Int          entry_size_bytes;
    hypre_BoxManEntry *entry;
    hypre_IndexRef     index;
    void              *info, *index_ptr;
-  
+
    void                       *send_response_buf = (void *) *p_send_response_buf;
-   hypre_DataExchangeResponse *response_obj = (hypre_DataExchangeResponse *)ro;  
-   hypre_BoxManager           *manager = (hypre_BoxManager           *)response_obj->data1;  
+   hypre_DataExchangeResponse *response_obj = (hypre_DataExchangeResponse *)ro;
+   hypre_BoxManager           *manager = (hypre_BoxManager           *)response_obj->data1;
    HYPRE_Int                   overhead = response_obj->send_response_overhead;
 
    HYPRE_Int           ndim = hypre_BoxManNDim(manager);
@@ -2710,37 +2728,37 @@ hypre_FillResponseBoxManAssemble2( void *p_recv_contact_buf,
    /*initialize stuff */
    hypre_MPI_Comm_rank(comm, &myid );
 
-   entry_size_bytes = 8*sizeof(HYPRE_Int) + hypre_BoxManEntryInfoSize(manager);
-   
+   entry_size_bytes = 8 * sizeof(HYPRE_Int) + hypre_BoxManEntryInfoSize(manager);
+
    /* num_my_entries is the amount of information to send */
 
    /*check storage in send_buf for adding the information */
    if ( response_obj->send_response_storage  < num_my_entries  )
    {
-      response_obj->send_response_storage =  num_my_entries; 
-      size =  entry_size_bytes*(response_obj->send_response_storage + overhead);
+      response_obj->send_response_storage =  num_my_entries;
+      size =  entry_size_bytes * (response_obj->send_response_storage + overhead);
       send_response_buf = hypre_TReAlloc( (char*)send_response_buf, char, size, HYPRE_MEMORY_HOST);
-      *p_send_response_buf = send_response_buf;  
+      *p_send_response_buf = send_response_buf;
    }
 
    index_ptr = send_response_buf; /* step through send_buf with this pointer */
 
-   for (i=0; i < num_my_entries; i++)
+   for (i = 0; i < num_my_entries; i++)
    {
       entry = my_entries[i];
-      
+
       /*pack response buffer with information */
-      
+
       size = sizeof(HYPRE_Int);
       /* imin */
-      index = hypre_BoxManEntryIMin(entry); 
+      index = hypre_BoxManEntryIMin(entry);
       for (d = 0; d < ndim; d++)
       {
          tmp_int = hypre_IndexD(index, d);
          hypre_TMemcpy( index_ptr,  &tmp_int, HYPRE_Int, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
          index_ptr =  (void *) ((char *) index_ptr + size);
       }
-      /* imax */  
+      /* imax */
       index = hypre_BoxManEntryIMax(entry);
       for (d = 0; d < ndim; d++)
       {
@@ -2752,12 +2770,12 @@ hypre_FillResponseBoxManAssemble2( void *p_recv_contact_buf,
       proc_id =  hypre_BoxManEntryProc(entry);
       hypre_TMemcpy( index_ptr,  &proc_id, HYPRE_Int, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
       index_ptr =  (void *) ((char *) index_ptr + size);
-      
+
       /* id */
       box_id = hypre_BoxManEntryId(entry);
       hypre_TMemcpy( index_ptr,  &box_id, HYPRE_Int, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
       index_ptr =  (void *) ((char *) index_ptr + size);
-      
+
       /*info*/
       size = hypre_BoxManEntryInfoSize(manager);
       position = hypre_BoxManEntryPosition(entry);
@@ -2766,10 +2784,10 @@ hypre_FillResponseBoxManAssemble2( void *p_recv_contact_buf,
       hypre_TMemcpy(index_ptr,  info, char, size, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
 
       index_ptr =  (void *) ((char *) index_ptr + size);
-      
+
    }
-   
-   /* now send_response_buf is full */  
+
+   /* now send_response_buf is full */
 
    /* return variable */
    *response_message_size = num_my_entries;
diff --git a/external/hypre/src/struct_mv/box_manager.h b/external/hypre/src/struct_mv/box_manager.h
index 349a8a90..f162430d 100644
--- a/external/hypre/src/struct_mv/box_manager.h
+++ b/external/hypre/src/struct_mv/box_manager.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -20,14 +20,14 @@ typedef struct hypre_BoxManEntry_struct
 
    HYPRE_Int proc; /* This is a two-part unique id: (proc, id) */
    HYPRE_Int id;
-   HYPRE_Int num_ghost[2*HYPRE_MAXDIM];
+   HYPRE_Int num_ghost[2 * HYPRE_MAXDIM];
 
    HYPRE_Int position; /* This indicates the location of the entry in the the
                         * box manager entries array and is used for pairing with
                         * the info object (populated in addentry) */
-   
+
    void *boxman; /* The owning manager (populated in addentry) */
-   
+
    struct hypre_BoxManEntry_struct  *next;
 
 } hypre_BoxManEntry;
@@ -41,32 +41,32 @@ typedef struct
    MPI_Comm            comm;
 
    HYPRE_Int           max_nentries; /* storage allocated for entries */
-    
+
    HYPRE_Int           is_gather_called; /* Boolean to indicate whether
                                             GatherEntries function has been
                                             called (prior to assemble) - may not
                                             want this (can tell by the size of
                                             gather_regions array) */
-   
+
    hypre_BoxArray     *gather_regions; /* This is where we collect boxes input
                                           by calls to BoxManGatherEntries - to
                                           be gathered in the assemble.  These
                                           are then deleted after the assemble */
-   
+
 
    HYPRE_Int           all_global_known; /* Boolean to say that every processor
                                             already has all of the global data
                                             for this manager (this could be
                                             accessed by a coarsening routine,
                                             for example) */
-   
+
    HYPRE_Int           is_entries_sort; /* Boolean to say that entries were
                                            added in sorted order (id, proc)
                                            (this could be accessed by a
                                            coarsening routine, for example) */
 
    HYPRE_Int           entry_info_size; /* In bytes, the (max) size of the info
-                                           object for the entries */ 
+                                           object for the entries */
 
    HYPRE_Int           is_assembled; /* Flag to indicate if the box manager has
                                         been assembled (used to control whether
@@ -80,7 +80,7 @@ typedef struct
 
    HYPRE_Int         *procs_sort; /* The sorted procs corresponding to entries */
    HYPRE_Int         *ids_sort; /* Sorted ids corresponding to the entries */
- 
+
    HYPRE_Int          num_procs_sort; /* Number of distinct procs in entries */
    HYPRE_Int         *procs_sort_offsets; /* Offsets for procs into the
                                              entry_sort array */
@@ -96,19 +96,19 @@ typedef struct
                                                  imax of each box in the entries
                                                  array */
    HYPRE_Int           size[HYPRE_MAXDIM]; /* How many indexes in each
-                                              direction */ 
+                                              direction */
 
    HYPRE_Int           last_index[HYPRE_MAXDIM]; /* Last index used in the
                                                     indexes map */
 
    HYPRE_Int           num_my_entries; /* Num entries with proc_id = myid */
-   HYPRE_Int          *my_ids; /* Array of ids corresponding to my entries */ 
+   HYPRE_Int          *my_ids; /* Array of ids corresponding to my entries */
    hypre_BoxManEntry **my_entries; /* Points into entries that are mine and
                                       corresponds to my_ids array.  This is
                                       destroyed in the assemble. */
-   
+
    void               *info_objects; /* Array of info objects (each of size
-                                        entry_info_size), managed byte-wise */ 
+                                        entry_info_size), managed byte-wise */
 
    hypre_StructAssumedPart *assumed_partition; /* The assumed partition object.
                                                   For now this is only used
@@ -119,10 +119,10 @@ typedef struct
    hypre_Box          *bounding_box; /* Bounding box from associated grid */
 
    HYPRE_Int           next_id; /* Counter to indicate the next id that would be
-                                   unique (regardless of proc id) */  
+                                   unique (regardless of proc id) */
 
    /* Ghost stuff  */
-   HYPRE_Int           num_ghost[2*HYPRE_MAXDIM];
+   HYPRE_Int           num_ghost[2 * HYPRE_MAXDIM];
 
 } hypre_BoxManager;
 
@@ -142,7 +142,7 @@ typedef struct
 #define hypre_BoxManNEntries(manager)           ((manager) -> nentries)
 #define hypre_BoxManEntries(manager)            ((manager) -> entries)
 #define hypre_BoxManInfoObjects(manager)        ((manager) -> info_objects)
-#define hypre_BoxManIsAssembled(manager)        ((manager) -> is_assembled) 
+#define hypre_BoxManIsAssembled(manager)        ((manager) -> is_assembled)
 
 #define hypre_BoxManProcsSort(manager)          ((manager) -> procs_sort)
 #define hypre_BoxManIdsSort(manager)            ((manager) -> ids_sort)
diff --git a/external/hypre/src/struct_mv/boxloop_cuda.h b/external/hypre/src/struct_mv/boxloop_cuda.h
index a5e54462..71fa486c 100644
--- a/external/hypre/src/struct_mv/boxloop_cuda.h
+++ b/external/hypre/src/struct_mv/boxloop_cuda.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -18,6 +18,8 @@
 #ifndef HYPRE_BOXLOOP_CUDA_HEADER
 #define HYPRE_BOXLOOP_CUDA_HEADER
 
+#if (defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)) && !defined(HYPRE_USING_RAJA) && !defined(HYPRE_USING_KOKKOS)
+
 #define HYPRE_LAMBDA [=] __host__  __device__
 
 /* TODO: RL: support 4-D */
@@ -30,113 +32,119 @@ typedef struct hypre_Boxloop_struct
 } hypre_Boxloop;
 
 #ifdef __cplusplus
-extern "C++" {
+extern "C++"
+{
 #endif
 
-/* -------------------------
- *     parfor-loop
- * ------------------------*/
-
-template <typename LOOP_BODY>
-__global__ void
-forall_kernel( LOOP_BODY loop_body,
-               HYPRE_Int length )
-{
-   const HYPRE_Int idx = hypre_cuda_get_grid_thread_id<1,1>();
-   /* const HYPRE_Int number_threads = hypre_cuda_get_grid_num_threads<1,1>(); */
+   /* -------------------------
+    *     parfor-loop
+    * ------------------------*/
 
-   if (idx < length)
+   template <typename LOOP_BODY>
+   __global__ void
+   forall_kernel( hypre_DeviceItem & item,
+                  LOOP_BODY loop_body,
+                  HYPRE_Int length )
    {
-      loop_body(idx);
-   }
-}
+      const HYPRE_Int idx = hypre_gpu_get_grid_thread_id<1, 1>(item);
+      /* const HYPRE_Int number_threads = hypre_gpu_get_grid_num_threads<1,1>(item); */
 
-template<typename LOOP_BODY>
-void
-BoxLoopforall( HYPRE_Int length,
-               LOOP_BODY loop_body )
-{
-   HYPRE_ExecutionPolicy exec_policy = hypre_HandleStructExecPolicy(hypre_handle());
+      if (idx < length)
+      {
+         loop_body(idx);
+      }
+   }
 
-   if (exec_policy == HYPRE_EXEC_HOST)
+   template<typename LOOP_BODY>
+   void
+   BoxLoopforall( HYPRE_Int length,
+                  LOOP_BODY loop_body )
    {
+      const HYPRE_MemoryLocation memory_location = hypre_HandleMemoryLocation(hypre_handle());
+      const HYPRE_ExecutionPolicy exec_policy = hypre_GetExecPolicy1(memory_location);
+
+      if (exec_policy == HYPRE_EXEC_HOST)
+      {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for HYPRE_SMP_SCHEDULE
+         #pragma omp parallel for HYPRE_SMP_SCHEDULE
 #endif
-      for (HYPRE_Int idx = 0; idx < length; idx++)
+         for (HYPRE_Int idx = 0; idx < length; idx++)
+         {
+            loop_body(idx);
+         }
+      }
+      else if (exec_policy == HYPRE_EXEC_DEVICE)
       {
-         loop_body(idx);
+         const dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+         const dim3 gDim = hypre_GetDefaultDeviceGridDimension(length, "thread", bDim);
+
+         HYPRE_GPU_LAUNCH( forall_kernel, gDim, bDim, loop_body, length );
       }
    }
-   else if (exec_policy == HYPRE_EXEC_DEVICE)
-   {
-      const dim3 bDim = hypre_GetDefaultCUDABlockDimension();
-      const dim3 gDim = hypre_GetDefaultCUDAGridDimension(length, "thread", bDim);
 
-      HYPRE_CUDA_LAUNCH( forall_kernel, gDim, bDim, loop_body, length );
-   }
-}
+   /* ------------------------------
+    *     parforreduction-loop
+    * -----------------------------*/
 
-/* ------------------------------
- *     parforreduction-loop
- * -----------------------------*/
+   template <typename LOOP_BODY, typename REDUCER>
+   __global__ void
+   reductionforall_kernel( hypre_DeviceItem & item,
+                           HYPRE_Int length,
+                           REDUCER   reducer,
+                           LOOP_BODY loop_body )
+   {
+      const HYPRE_Int thread_id = hypre_gpu_get_grid_thread_id<1, 1>(item);
+      const HYPRE_Int n_threads = hypre_gpu_get_grid_num_threads<1, 1>(item);
 
-template <typename LOOP_BODY, typename REDUCER>
-__global__ void
-reductionforall_kernel( HYPRE_Int length,
-                        REDUCER   reducer,
-                        LOOP_BODY loop_body )
-{
-   const HYPRE_Int thread_id = hypre_cuda_get_grid_thread_id<1,1>();
-   const HYPRE_Int n_threads = hypre_cuda_get_grid_num_threads<1,1>();
+      for (HYPRE_Int idx = thread_id; idx < length; idx += n_threads)
+      {
+         loop_body(idx, reducer);
+      }
 
-   for (HYPRE_Int idx = thread_id; idx < length; idx += n_threads)
-   {
-      loop_body(idx, reducer);
+      /* reduction in block-level and the save the results in reducer */
+      reducer.BlockReduce();
    }
 
-   /* reduction in block-level and the save the results in reducer */
-   reducer.BlockReduce();
-}
-
-template<typename LOOP_BODY, typename REDUCER>
-void
-ReductionBoxLoopforall( HYPRE_Int  length,
-                        REDUCER   &reducer,
-                        LOOP_BODY  loop_body )
-{
-   if (length <= 0)
+   template<typename LOOP_BODY, typename REDUCER>
+   void
+   ReductionBoxLoopforall( HYPRE_Int  length,
+                           REDUCER   & reducer,
+                           LOOP_BODY  loop_body )
    {
-      return;
-   }
+      if (length <= 0)
+      {
+         return;
+      }
 
-   HYPRE_ExecutionPolicy exec_policy = hypre_HandleStructExecPolicy(hypre_handle());
+      const HYPRE_MemoryLocation memory_location = hypre_HandleMemoryLocation(hypre_handle());
+      const HYPRE_ExecutionPolicy exec_policy = hypre_GetExecPolicy1(memory_location);
 
-   if (exec_policy == HYPRE_EXEC_HOST)
-   {
-      for (HYPRE_Int idx = 0; idx < length; idx++)
+      if (exec_policy == HYPRE_EXEC_HOST)
       {
-         loop_body(idx, reducer);
+         for (HYPRE_Int idx = 0; idx < length; idx++)
+         {
+            loop_body(idx, reducer);
+         }
       }
-   }
-   else if (exec_policy == HYPRE_EXEC_DEVICE)
-   {
-      const dim3 bDim = hypre_GetDefaultCUDABlockDimension();
-      dim3 gDim = hypre_GetDefaultCUDAGridDimension(length, "thread", bDim);
+      else if (exec_policy == HYPRE_EXEC_DEVICE)
+      {
+         /* Assume gDim cannot exceed HYPRE_MAX_NTHREADS_BLOCK (the max size for the 2nd reduction)
+          * and bDim <= WARP * WARP (because we use 1 warp fro the block-level reduction) */
+         const dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+         dim3 gDim = hypre_GetDefaultDeviceGridDimension(length, "thread", bDim);
+         gDim.x = hypre_min(gDim.x, HYPRE_MAX_NTHREADS_BLOCK);
+
+         reducer.nblocks = gDim.x;
 
-      /* Note: we assume gDim cannot exceed 1024
-       *       and bDim < WARP * WARP
-       */
-      gDim.x = hypre_min(gDim.x, 1024);
-      reducer.nblocks = gDim.x;
+         reducer.Allocate2ndPhaseBuffer();
 
-      /*
-      hypre_printf("length= %d, blocksize = %d, gridsize = %d\n", length, bDim.x, gDim.x);
-      */
+         /*
+         hypre_printf("length= %d, blocksize = %d, gridsize = %d\n", length, bDim.x, gDim.x);
+         */
 
-      HYPRE_CUDA_LAUNCH( reductionforall_kernel, gDim, bDim, length, reducer, loop_body );
+         HYPRE_GPU_LAUNCH( reductionforall_kernel, gDim, bDim, length, reducer, loop_body );
+      }
    }
-}
 
 #ifdef __cplusplus
 }
@@ -189,7 +197,7 @@ ReductionBoxLoopforall( HYPRE_Int  length,
       databox##k.bsize2   = 0;                                             \
    }
 
-#define zypre_BasicBoxLoopDataDeclareK(k,ndim,loop_size,stride) \
+#define hypre_BasicBoxLoopDataDeclareK(k,ndim,loop_size,stride) \
 hypre_Boxloop databox##k;                                       \
 databox##k.lsize0   = loop_size[0];                             \
 databox##k.strides0 = stride[0];                                \
@@ -247,24 +255,24 @@ else                                                            \
    hypre_boxD##k *= hypre_max(0, box.bsize2 + 1);
 
 /* get 3-D local_idx into 'index' */
-#define hypre_BoxLoopGetIndex(index)      \
-   index[0] = hypre_IndexD(local_idx, 0); \
-   index[1] = hypre_IndexD(local_idx, 1); \
+#define hypre_BoxLoopGetIndexCUDA(index)                                                              \
+   index[0] = hypre_IndexD(local_idx, 0);                                                             \
+   index[1] = hypre_IndexD(local_idx, 1);                                                             \
    index[2] = hypre_IndexD(local_idx, 2);
 
 /* BoxLoop 0 */
-#define hypre_newBoxLoop0Begin(ndim, loop_size)                                                       \
+#define hypre_BoxLoop0BeginCUDA(ndim, loop_size)                                                      \
 {                                                                                                     \
    hypre_newBoxLoopInit(ndim, loop_size);                                                             \
    BoxLoopforall(hypre__tot, HYPRE_LAMBDA (HYPRE_Int idx)                                             \
    {
 
-#define hypre_newBoxLoop0End()                                                                        \
+#define hypre_BoxLoop0EndCUDA()                                                                       \
    });                                                                                                \
 }
 
 /* BoxLoop 1 */
-#define hypre_newBoxLoop1Begin(ndim, loop_size, dbox1, start1, stride1, i1)                           \
+#define hypre_BoxLoop1BeginCUDA(ndim, loop_size, dbox1, start1, stride1, i1)                          \
 {                                                                                                     \
    hypre_newBoxLoopInit(ndim, loop_size);                                                             \
    hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                             \
@@ -273,13 +281,13 @@ else                                                            \
       hypre_newBoxLoopDeclare(databox1);                                                              \
       hypre_BoxLoopIncK(1, databox1, i1);
 
-#define hypre_newBoxLoop1End(i1)                                                                      \
+#define hypre_BoxLoop1EndCUDA(i1)                                                                     \
    });                                                                                                \
 }
 
 /* BoxLoop 2 */
-#define hypre_newBoxLoop2Begin(ndim, loop_size, dbox1, start1, stride1, i1,                           \
-                                                dbox2, start2, stride2, i2)                           \
+#define hypre_BoxLoop2BeginCUDA(ndim, loop_size, dbox1, start1, stride1, i1,                          \
+                                                 dbox2, start2, stride2, i2)                          \
 {                                                                                                     \
    hypre_newBoxLoopInit(ndim, loop_size);                                                             \
    hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                             \
@@ -290,14 +298,14 @@ else                                                            \
       hypre_BoxLoopIncK(1, databox1, i1);                                                             \
       hypre_BoxLoopIncK(2, databox2, i2);
 
-#define hypre_newBoxLoop2End(i1, i2)                                                                  \
+#define hypre_BoxLoop2EndCUDA(i1, i2)                                                                 \
    });                                                                                                \
 }
 
 /* BoxLoop 3 */
-#define hypre_newBoxLoop3Begin(ndim, loop_size, dbox1, start1, stride1, i1,                           \
-                                                dbox2, start2, stride2, i2,                           \
-                                                dbox3, start3, stride3, i3)                           \
+#define hypre_BoxLoop3BeginCUDA(ndim, loop_size, dbox1, start1, stride1, i1,                          \
+                                                 dbox2, start2, stride2, i2,                          \
+                                                 dbox3, start3, stride3, i3)                          \
 {                                                                                                     \
    hypre_newBoxLoopInit(ndim, loop_size);                                                             \
    hypre_BoxLoopDataDeclareK(1, ndim,loop_size, dbox1, start1, stride1);                              \
@@ -310,15 +318,15 @@ else                                                            \
       hypre_BoxLoopIncK(2, databox2, i2);                                                             \
       hypre_BoxLoopIncK(3, databox3, i3);
 
-#define hypre_newBoxLoop3End(i1, i2, i3)                                                              \
+#define hypre_BoxLoop3EndCUDA(i1, i2, i3)                                                             \
    });                                                                                                \
 }
 
 /* BoxLoop 4 */
-#define hypre_newBoxLoop4Begin(ndim, loop_size, dbox1, start1, stride1, i1,                           \
-                                                dbox2, start2, stride2, i2,                           \
-                                                dbox3, start3, stride3, i3,                           \
-                                                dbox4, start4, stride4, i4)                           \
+#define hypre_BoxLoop4BeginCUDA(ndim, loop_size, dbox1, start1, stride1, i1,                          \
+                                                 dbox2, start2, stride2, i2,                          \
+                                                 dbox3, start3, stride3, i3,                          \
+                                                 dbox4, start4, stride4, i4)                          \
 {                                                                                                     \
    hypre_newBoxLoopInit(ndim, loop_size);                                                             \
    hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                             \
@@ -333,45 +341,45 @@ else                                                            \
       hypre_BoxLoopIncK(3, databox3, i3);                                                             \
       hypre_BoxLoopIncK(4, databox4, i4);
 
-#define hypre_newBoxLoop4End(i1, i2, i3, i4)                                                          \
+#define hypre_BoxLoop4EndCUDA(i1, i2, i3, i4)                                                         \
    });                                                                                                \
 }
 
 /* Basic BoxLoops have no boxes */
 /* BoxLoop 1 */
-#define zypre_newBasicBoxLoop1Begin(ndim, loop_size, stride1, i1)                                     \
+#define hypre_BasicBoxLoop1BeginCUDA(ndim, loop_size, stride1, i1)                                    \
 {                                                                                                     \
    hypre_newBoxLoopInit(ndim, loop_size);                                                             \
-   zypre_BasicBoxLoopDataDeclareK(1, ndim, loop_size, stride1);                                       \
+   hypre_BasicBoxLoopDataDeclareK(1, ndim, loop_size, stride1);                                       \
    BoxLoopforall(hypre__tot, HYPRE_LAMBDA (HYPRE_Int idx)                                             \
    {                                                                                                  \
       hypre_newBoxLoopDeclare(databox1);                                                              \
       hypre_BoxLoopIncK(1, databox1, i1);
 
 /* BoxLoop 2 */
-#define zypre_newBasicBoxLoop2Begin(ndim, loop_size, stride1, i1, stride2, i2)                        \
+#define hypre_BasicBoxLoop2BeginCUDA(ndim, loop_size, stride1, i1, stride2, i2)                       \
 {                                                                                                     \
    hypre_newBoxLoopInit(ndim, loop_size);                                                             \
-   zypre_BasicBoxLoopDataDeclareK(1, ndim, loop_size, stride1);                                       \
-   zypre_BasicBoxLoopDataDeclareK(2, ndim, loop_size, stride2);                                       \
+   hypre_BasicBoxLoopDataDeclareK(1, ndim, loop_size, stride1);                                       \
+   hypre_BasicBoxLoopDataDeclareK(2, ndim, loop_size, stride2);                                       \
    BoxLoopforall(hypre__tot, HYPRE_LAMBDA (HYPRE_Int idx)                                             \
    {                                                                                                  \
       hypre_newBoxLoopDeclare(databox1);                                                              \
       hypre_BoxLoopIncK(1, databox1, i1);                                                             \
       hypre_BoxLoopIncK(2, databox2, i2);                                                             \
 
-/* TODO: RL just parallel-for, it should not be here, better in utilities */
-#define hypre_LoopBegin(size, idx)                                                                    \
+/* Parallel for-loop */
+#define hypre_LoopBeginCUDA(size, idx)                                                                \
 {                                                                                                     \
    BoxLoopforall(size, HYPRE_LAMBDA (HYPRE_Int idx)                                                   \
    {
 
-#define hypre_LoopEnd()                                                                               \
+#define hypre_LoopEndCUDA()                                                                           \
    });                                                                                                \
 }
 
 /* Reduction BoxLoop1 */
-#define hypre_BoxLoop1ReductionBegin(ndim, loop_size, dbox1, start1, stride1, i1, reducesum)                     \
+#define hypre_BoxLoop1ReductionBeginCUDA(ndim, loop_size, dbox1, start1, stride1, i1, reducesum)                 \
 {                                                                                                                \
    hypre_newBoxLoopInit(ndim, loop_size);                                                                        \
    hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                                        \
@@ -380,13 +388,13 @@ else                                                            \
       hypre_newBoxLoopDeclare(databox1);                                                                         \
       hypre_BoxLoopIncK(1, databox1, i1);
 
-#define hypre_BoxLoop1ReductionEnd(i1, reducesum)                                                                \
+#define hypre_BoxLoop1ReductionEndCUDA(i1, reducesum)                                                            \
    });                                                                                                           \
 }
 
 /* Reduction BoxLoop2 */
-#define hypre_BoxLoop2ReductionBegin(ndim, loop_size, dbox1, start1, stride1, i1,                                \
-                                                      dbox2, start2, stride2, i2, reducesum)                     \
+#define hypre_BoxLoop2ReductionBeginCUDA(ndim, loop_size, dbox1, start1, stride1, i1,                            \
+                                                          dbox2, start2, stride2, i2, reducesum)                 \
 {                                                                                                                \
    hypre_newBoxLoopInit(ndim, loop_size);                                                                        \
    hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                                        \
@@ -397,30 +405,56 @@ else                                                            \
       hypre_BoxLoopIncK(1, databox1, i1);                                                                        \
       hypre_BoxLoopIncK(2, databox2, i2);
 
-#define hypre_BoxLoop2ReductionEnd(i1, i2, reducesum)                                                            \
+#define hypre_BoxLoop2ReductionEndCUDA(i1, i2, reducesum)                                                        \
    });                                                                                                           \
 }
 
 /* Renamings */
-#define hypre_BoxLoopBlock()       0
-
-#define hypre_BoxLoop0Begin      hypre_newBoxLoop0Begin
-#define hypre_BoxLoop0For        hypre_newBoxLoop0For
-#define hypre_BoxLoop0End        hypre_newBoxLoop0End
-#define hypre_BoxLoop1Begin      hypre_newBoxLoop1Begin
-#define hypre_BoxLoop1For        hypre_newBoxLoop1For
-#define hypre_BoxLoop1End        hypre_newBoxLoop1End
-#define hypre_BoxLoop2Begin      hypre_newBoxLoop2Begin
-#define hypre_BoxLoop2For        hypre_newBoxLoop2For
-#define hypre_BoxLoop2End        hypre_newBoxLoop2End
-#define hypre_BoxLoop3Begin      hypre_newBoxLoop3Begin
-#define hypre_BoxLoop3For        hypre_newBoxLoop3For
-#define hypre_BoxLoop3End        hypre_newBoxLoop3End
-#define hypre_BoxLoop4Begin      hypre_newBoxLoop4Begin
-#define hypre_BoxLoop4For        hypre_newBoxLoop4For
-#define hypre_BoxLoop4End        hypre_newBoxLoop4End
-
-#define hypre_BasicBoxLoop1Begin zypre_newBasicBoxLoop1Begin
-#define hypre_BasicBoxLoop2Begin zypre_newBasicBoxLoop2Begin
+#define hypre_BoxLoopGetIndexDevice          hypre_BoxLoopGetIndexCUDA
+#define hypre_BoxLoopBlockDevice()           0
+#define hypre_BoxLoop0BeginDevice            hypre_BoxLoop0BeginCUDA
+#define hypre_BoxLoop0EndDevice              hypre_BoxLoop0EndCUDA
+#define hypre_BoxLoop1BeginDevice            hypre_BoxLoop1BeginCUDA
+#define hypre_BoxLoop1EndDevice              hypre_BoxLoop1EndCUDA
+#define hypre_BoxLoop2BeginDevice            hypre_BoxLoop2BeginCUDA
+#define hypre_BoxLoop2EndDevice              hypre_BoxLoop2EndCUDA
+#define hypre_BoxLoop3BeginDevice            hypre_BoxLoop3BeginCUDA
+#define hypre_BoxLoop3EndDevice              hypre_BoxLoop3EndCUDA
+#define hypre_BoxLoop4BeginDevice            hypre_BoxLoop4BeginCUDA
+#define hypre_BoxLoop4EndDevice              hypre_BoxLoop4EndCUDA
+#define hypre_BasicBoxLoop1BeginDevice       hypre_BasicBoxLoop1BeginCUDA
+#define hypre_BasicBoxLoop2BeginDevice       hypre_BasicBoxLoop2BeginCUDA
+#define hypre_LoopBeginDevice                hypre_LoopBeginCUDA
+#define hypre_LoopEndDevice                  hypre_LoopEndCUDA
+#define hypre_BoxLoop1ReductionBeginDevice   hypre_BoxLoop1ReductionBeginCUDA
+#define hypre_BoxLoop1ReductionEndDevice     hypre_BoxLoop1ReductionEndCUDA
+#define hypre_BoxLoop2ReductionBeginDevice   hypre_BoxLoop2ReductionBeginCUDA
+#define hypre_BoxLoop2ReductionEndDevice     hypre_BoxLoop2ReductionEndCUDA
+
+
+//TODO TEMP FIX
+#define hypre_BoxLoopGetIndex          hypre_BoxLoopGetIndexDevice
+#define hypre_BoxLoopBlock()           0
+#define hypre_BoxLoop0Begin            hypre_BoxLoop0BeginDevice
+#define hypre_BoxLoop0End              hypre_BoxLoop0EndDevice
+#define hypre_BoxLoop1Begin            hypre_BoxLoop1BeginDevice
+#define hypre_BoxLoop1End              hypre_BoxLoop1EndDevice
+#define hypre_BoxLoop2Begin            hypre_BoxLoop2BeginDevice
+#define hypre_BoxLoop2End              hypre_BoxLoop2EndDevice
+#define hypre_BoxLoop3Begin            hypre_BoxLoop3BeginDevice
+#define hypre_BoxLoop3End              hypre_BoxLoop3EndDevice
+#define hypre_BoxLoop4Begin            hypre_BoxLoop4BeginDevice
+#define hypre_BoxLoop4End              hypre_BoxLoop4EndDevice
+#define hypre_BasicBoxLoop1Begin       hypre_BasicBoxLoop1BeginDevice
+#define hypre_BasicBoxLoop2Begin       hypre_BasicBoxLoop2BeginDevice
+#define hypre_LoopBegin                hypre_LoopBeginDevice
+#define hypre_LoopEnd                  hypre_LoopEndDevice
+#define hypre_BoxLoop1ReductionBegin   hypre_BoxLoop1ReductionBeginDevice
+#define hypre_BoxLoop1ReductionEnd     hypre_BoxLoop1ReductionEndDevice
+#define hypre_BoxLoop2ReductionBegin   hypre_BoxLoop2ReductionBeginDevice
+#define hypre_BoxLoop2ReductionEnd     hypre_BoxLoop2ReductionEndDevice
+
+#endif
 
 #endif /* #ifndef HYPRE_BOXLOOP_CUDA_HEADER */
+
diff --git a/external/hypre/src/struct_mv/boxloop_host.h b/external/hypre/src/struct_mv/boxloop_host.h
index d7ecad1f..6b4672c3 100644
--- a/external/hypre/src/struct_mv/boxloop_host.h
+++ b/external/hypre/src/struct_mv/boxloop_host.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -15,32 +15,25 @@
  * BoxLoop macros:
  *--------------------------------------------------------------------------*/
 
-#ifndef HYPRE_NEWBOXLOOP_HEADER
-#define HYPRE_NEWBOXLOOP_HEADER
+#ifndef HYPRE_BOXLOOP_HOST_HEADER
+#define HYPRE_BOXLOOP_HOST_HEADER
 
-#ifdef HYPRE_USING_OPENMP
+#if defined(HYPRE_USING_OPENMP)
 #define HYPRE_BOX_REDUCTION
+#define HYPRE_OMP_CLAUSE
 #if defined(WIN32) && defined(_MSC_VER)
-#define Pragma(x) __pragma(HYPRE_XSTR(x))
+#define Pragma(x) __pragma(x)
 #else
 #define Pragma(x) _Pragma(HYPRE_XSTR(x))
 #endif
-#define OMP0 Pragma(omp parallel for HYPRE_BOX_REDUCTION HYPRE_SMP_SCHEDULE)
-#define OMP1 Pragma(omp parallel for private(HYPRE_BOX_PRIVATE) HYPRE_BOX_REDUCTION HYPRE_SMP_SCHEDULE)
-#else /* #ifdef HYPRE_USING_OPENMP */
+#define OMP0 Pragma(omp parallel for HYPRE_OMP_CLAUSE HYPRE_BOX_REDUCTION HYPRE_SMP_SCHEDULE)
+#define OMP1 Pragma(omp parallel for private(HYPRE_BOX_PRIVATE) HYPRE_OMP_CLAUSE HYPRE_BOX_REDUCTION HYPRE_SMP_SCHEDULE)
+#else /* #if defined(HYPRE_USING_OPENMP) */
 #define OMP0
 #define OMP1
-#endif /* #ifdef HYPRE_USING_OPENMP */
+#endif /* #if defined(HYPRE_USING_OPENMP) */
 
-typedef struct hypre_Boxloop_struct
-{
-   HYPRE_Int lsize0,lsize1,lsize2;
-   HYPRE_Int strides0,strides1,strides2;
-   HYPRE_Int bstart0,bstart1,bstart2;
-   HYPRE_Int bsize0,bsize1,bsize2;
-} hypre_Boxloop;
-
-#define zypre_newBoxLoop0Begin(ndim, loop_size)                               \
+#define zypre_BoxLoop0Begin(ndim, loop_size)                                  \
 {                                                                             \
    zypre_BoxLoopDeclare();                                                    \
    zypre_BoxLoopInit(ndim, loop_size);                                        \
@@ -53,7 +46,7 @@ typedef struct hypre_Boxloop_struct
          for (hypre__I = 0; hypre__I < hypre__IN; hypre__I++)                 \
          {
 
-#define zypre_newBoxLoop0End()                                                \
+#define zypre_BoxLoop0End()                                                   \
          }                                                                    \
          zypre_BoxLoopInc1();                                                 \
          zypre_BoxLoopInc2();                                                 \
@@ -61,8 +54,8 @@ typedef struct hypre_Boxloop_struct
    }                                                                          \
 }
 
-#define zypre_newBoxLoop1Begin(ndim, loop_size,                               \
-                               dbox1, start1, stride1, i1)                    \
+#define zypre_BoxLoop1Begin(ndim, loop_size,                                  \
+                            dbox1, start1, stride1, i1)                       \
 {                                                                             \
    HYPRE_Int i1;                                                              \
    zypre_BoxLoopDeclare();                                                    \
@@ -80,7 +73,7 @@ typedef struct hypre_Boxloop_struct
          for (hypre__I = 0; hypre__I < hypre__IN; hypre__I++)                 \
          {
 
-#define zypre_newBoxLoop1End(i1)                                              \
+#define zypre_BoxLoop1End(i1)                                                 \
             i1 += hypre__i0inc1;                                              \
          }                                                                    \
          zypre_BoxLoopInc1();                                                 \
@@ -91,9 +84,9 @@ typedef struct hypre_Boxloop_struct
 }
 
 
-#define zypre_newBoxLoop2Begin(ndim, loop_size,                               \
-                               dbox1, start1, stride1, i1,                    \
-                               dbox2, start2, stride2, i2)                    \
+#define zypre_BoxLoop2Begin(ndim, loop_size,                                  \
+                            dbox1, start1, stride1, i1,                       \
+                            dbox2, start2, stride2, i2)                       \
 {                                                                             \
    HYPRE_Int i1, i2;                                                          \
    zypre_BoxLoopDeclare();                                                    \
@@ -114,7 +107,7 @@ typedef struct hypre_Boxloop_struct
          for (hypre__I = 0; hypre__I < hypre__IN; hypre__I++)                 \
          {
 
-#define zypre_newBoxLoop2End(i1, i2)                                          \
+#define zypre_BoxLoop2End(i1, i2)                                             \
             i1 += hypre__i0inc1;                                              \
             i2 += hypre__i0inc2;                                              \
          }                                                                    \
@@ -127,10 +120,10 @@ typedef struct hypre_Boxloop_struct
 }
 
 
-#define zypre_newBoxLoop3Begin(ndim, loop_size,                               \
-                               dbox1, start1, stride1, i1,                    \
-                               dbox2, start2, stride2, i2,                    \
-                               dbox3, start3, stride3, i3)                    \
+#define zypre_BoxLoop3Begin(ndim, loop_size,                                  \
+                            dbox1, start1, stride1, i1,                       \
+                            dbox2, start2, stride2, i2,                       \
+                            dbox3, start3, stride3, i3)                       \
 {                                                                             \
    HYPRE_Int i1, i2, i3;                                                      \
    zypre_BoxLoopDeclare();                                                    \
@@ -154,7 +147,7 @@ typedef struct hypre_Boxloop_struct
          for (hypre__I = 0; hypre__I < hypre__IN; hypre__I++)                 \
          {
 
-#define zypre_newBoxLoop3End(i1, i2, i3)                                      \
+#define zypre_BoxLoop3End(i1, i2, i3)                                         \
             i1 += hypre__i0inc1;                                              \
             i2 += hypre__i0inc2;                                              \
             i3 += hypre__i0inc3;                                              \
@@ -168,7 +161,7 @@ typedef struct hypre_Boxloop_struct
    }                                                                          \
 }
 
-#define zypre_newBoxLoop4Begin(ndim, loop_size,                               \
+#define zypre_BoxLoop4Begin(ndim, loop_size,                                  \
                             dbox1, start1, stride1, i1,                       \
                             dbox2, start2, stride2, i2,                       \
                             dbox3, start3, stride3, i3,                       \
@@ -199,7 +192,7 @@ typedef struct hypre_Boxloop_struct
          for (hypre__I = 0; hypre__I < hypre__IN; hypre__I++)                 \
          {
 
-#define zypre_newBoxLoop4End(i1, i2, i3, i4)                                  \
+#define zypre_BoxLoop4End(i1, i2, i3, i4)                                     \
             i1 += hypre__i0inc1;                                              \
             i2 += hypre__i0inc2;                                              \
             i3 += hypre__i0inc3;                                              \
@@ -215,9 +208,27 @@ typedef struct hypre_Boxloop_struct
    }                                                                          \
 }
 
-#define zypre_newBasicBoxLoop2Begin(ndim, loop_size,                          \
-                                    stride1, i1,                              \
-                                    stride2, i2)                              \
+#define zypre_BasicBoxLoop1Begin(ndim, loop_size,                             \
+                                 stride1, i1)                                 \
+{                                                                             \
+   zypre_BoxLoopDeclare();                                                    \
+   zypre_BoxLoopDeclareK(1);                                                  \
+   zypre_BoxLoopInit(ndim, loop_size);                                        \
+   zypre_BasicBoxLoopInitK(1, stride1);                                       \
+   OMP1                                                                       \
+   for (hypre__block = 0; hypre__block < hypre__num_blocks; hypre__block++)   \
+   {                                                                          \
+      HYPRE_Int i1;                                                           \
+      zypre_BoxLoopSet();                                                     \
+      zypre_BoxLoopSetK(1, i1);                                               \
+      for (hypre__J = 0; hypre__J < hypre__JN; hypre__J++)                    \
+      {                                                                       \
+         for (hypre__I = 0; hypre__I < hypre__IN; hypre__I++)                 \
+         {
+
+#define zypre_BasicBoxLoop2Begin(ndim, loop_size,                             \
+                                 stride1, i1,                                 \
+                                 stride2, i2)                                 \
 {                                                                             \
    zypre_BoxLoopDeclare();                                                    \
    zypre_BoxLoopDeclareK(1);                                                  \
@@ -238,45 +249,147 @@ typedef struct hypre_Boxloop_struct
          {
 
 
-#define hypre_LoopBegin(size, idx)                                            \
+#define zypre_LoopBegin(size, idx)                                            \
 {                                                                             \
    HYPRE_Int idx;                                                             \
    OMP0                                                                       \
    for (idx = 0; idx < size; idx ++)                                          \
    {
 
-#define hypre_LoopEnd()                                                       \
-  }                                                                           \
+#define zypre_LoopEnd()                                                       \
+   }                                                                          \
+}
+
+/*--------------------------------------------------------------------------
+ * Serial BoxLoop macros:
+ * [same as the ones above (without OMP and with SetOneBlock)]
+ * TODO: combine them
+ *--------------------------------------------------------------------------*/
+#define hypre_SerialBoxLoop0Begin(ndim, loop_size)                            \
+{                                                                             \
+   zypre_BoxLoopDeclare();                                                    \
+   zypre_BoxLoopInit(ndim, loop_size);                                        \
+   zypre_BoxLoopSetOneBlock();                                                \
+   for (hypre__block = 0; hypre__block < hypre__num_blocks; hypre__block++)   \
+   {                                                                          \
+      zypre_BoxLoopSet();                                                     \
+      for (hypre__J = 0; hypre__J < hypre__JN; hypre__J++)                    \
+      {                                                                       \
+         for (hypre__I = 0; hypre__I < hypre__IN; hypre__I++)                 \
+         {
+
+#define hypre_SerialBoxLoop0End()                                             \
+         }                                                                    \
+         zypre_BoxLoopInc1();                                                 \
+         zypre_BoxLoopInc2();                                                 \
+      }                                                                       \
+   }                                                                          \
 }
 
-#define hypre_BoxLoopGetIndex    zypre_BoxLoopGetIndex
-
-#define hypre_BoxLoopBlock       zypre_BoxLoopBlock
-#define hypre_BoxLoop0Begin      zypre_newBoxLoop0Begin
-#define hypre_BoxLoop0End        zypre_newBoxLoop0End
-#define hypre_BoxLoop1Begin      zypre_newBoxLoop1Begin
-#define hypre_BoxLoop1End        zypre_newBoxLoop1End
-#define hypre_BoxLoop2Begin      zypre_newBoxLoop2Begin
-#define hypre_BoxLoop2End        zypre_newBoxLoop2End
-#define hypre_BoxLoop3Begin      zypre_newBoxLoop3Begin
-#define hypre_BoxLoop3End        zypre_newBoxLoop3End
-#define hypre_BoxLoop4Begin      zypre_newBoxLoop4Begin
-#define hypre_BoxLoop4End        zypre_newBoxLoop4End
-#define hypre_BasicBoxLoop2Begin zypre_newBasicBoxLoop2Begin
-
-/* Reduction */
-#define hypre_BoxLoop1ReductionBegin(ndim, loop_size, dbox1, start1, stride1, i1, reducesum) \
-        hypre_BoxLoop1Begin(ndim, loop_size, dbox1, start1, stride1, i1)
-
-#define hypre_BoxLoop1ReductionEnd(i1, reducesum) \
-        hypre_BoxLoop1End(i1)
-
-#define hypre_BoxLoop2ReductionBegin(ndim, loop_size, dbox1, start1, stride1, i1, \
+#define hypre_SerialBoxLoop1Begin(ndim, loop_size,                            \
+                                  dbox1, start1, stride1, i1)                 \
+{                                                                             \
+   HYPRE_Int i1;                                                              \
+   zypre_BoxLoopDeclare();                                                    \
+   zypre_BoxLoopDeclareK(1);                                                  \
+   zypre_BoxLoopInit(ndim, loop_size);                                        \
+   zypre_BoxLoopInitK(1, dbox1, start1, stride1, i1);                         \
+   zypre_BoxLoopSetOneBlock();                                                \
+   for (hypre__block = 0; hypre__block < hypre__num_blocks; hypre__block++)   \
+   {                                                                          \
+      zypre_BoxLoopSet();                                                     \
+      zypre_BoxLoopSetK(1, i1);                                               \
+      for (hypre__J = 0; hypre__J < hypre__JN; hypre__J++)                    \
+      {                                                                       \
+         for (hypre__I = 0; hypre__I < hypre__IN; hypre__I++)                 \
+         {
+
+#define hypre_SerialBoxLoop1End(i1)  zypre_BoxLoop1End(i1)
+
+#define hypre_SerialBoxLoop2Begin(ndim, loop_size,                            \
+                                  dbox1, start1, stride1, i1,                 \
+                                  dbox2, start2, stride2, i2)                 \
+{                                                                             \
+   HYPRE_Int i1,i2;                                                           \
+   zypre_BoxLoopDeclare();                                                    \
+   zypre_BoxLoopDeclareK(1);                                                  \
+   zypre_BoxLoopDeclareK(2);                                                  \
+   zypre_BoxLoopInit(ndim, loop_size);                                        \
+   zypre_BoxLoopInitK(1, dbox1, start1, stride1, i1);                         \
+   zypre_BoxLoopInitK(2, dbox2, start2, stride2, i2);                         \
+   zypre_BoxLoopSetOneBlock();                                                \
+   for (hypre__block = 0; hypre__block < hypre__num_blocks; hypre__block++)   \
+   {                                                                          \
+      zypre_BoxLoopSet();                                                     \
+      zypre_BoxLoopSetK(1, i1);                                               \
+      zypre_BoxLoopSetK(2, i2);                                               \
+      for (hypre__J = 0; hypre__J < hypre__JN; hypre__J++)                    \
+      {                                                                       \
+         for (hypre__I = 0; hypre__I < hypre__IN; hypre__I++)                 \
+         {
+
+#define hypre_SerialBoxLoop2End(i1, i2) zypre_BoxLoop2End(i1, i2)
+
+/* Reduction BoxLoop1 */
+#define zypre_BoxLoop1ReductionBegin(ndim, loop_size, dbox1, start1, stride1, i1, reducesum) \
+        zypre_BoxLoop1Begin(ndim, loop_size, dbox1, start1, stride1, i1)
+
+#define zypre_BoxLoop1ReductionEnd(i1, reducesum) zypre_BoxLoop1End(i1)
+
+/* Reduction BoxLoop2 */
+#define zypre_BoxLoop2ReductionBegin(ndim, loop_size, dbox1, start1, stride1, i1,            \
                                                       dbox2, start2, stride2, i2, reducesum) \
-        hypre_BoxLoop2Begin(ndim, loop_size, dbox1, start1, stride1, i1, \
+        zypre_BoxLoop2Begin(ndim, loop_size, dbox1, start1, stride1, i1,                     \
                                              dbox2, start2, stride2, i2)
 
-#define hypre_BoxLoop2ReductionEnd(i1, i2, reducesum) \
-        hypre_BoxLoop2End(i1, i2)
+#define zypre_BoxLoop2ReductionEnd(i1, i2, reducesum) zypre_BoxLoop2End(i1, i2)
+
+
+/* Renaming */
+#define hypre_BoxLoopGetIndexHost          zypre_BoxLoopGetIndex
+#define hypre_BoxLoopBlockHost             zypre_BoxLoopBlock
+#define hypre_BoxLoop0BeginHost            zypre_BoxLoop0Begin
+#define hypre_BoxLoop0EndHost              zypre_BoxLoop0End
+#define hypre_BoxLoop1BeginHost            zypre_BoxLoop1Begin
+#define hypre_BoxLoop1EndHost              zypre_BoxLoop1End
+#define hypre_BoxLoop2BeginHost            zypre_BoxLoop2Begin
+#define hypre_BoxLoop2EndHost              zypre_BoxLoop2End
+#define hypre_BoxLoop3BeginHost            zypre_BoxLoop3Begin
+#define hypre_BoxLoop3EndHost              zypre_BoxLoop3End
+#define hypre_BoxLoop4BeginHost            zypre_BoxLoop4Begin
+#define hypre_BoxLoop4EndHost              zypre_BoxLoop4End
+#define hypre_BasicBoxLoop1BeginHost       zypre_BasicBoxLoop1Begin
+#define hypre_BasicBoxLoop2BeginHost       zypre_BasicBoxLoop2Begin
+#define hypre_LoopBeginHost                zypre_LoopBegin
+#define hypre_LoopEndHost                  zypre_LoopEnd
+#define hypre_BoxLoop1ReductionBeginHost   zypre_BoxLoop1ReductionBegin
+#define hypre_BoxLoop1ReductionEndHost     zypre_BoxLoop1ReductionEnd
+#define hypre_BoxLoop2ReductionBeginHost   zypre_BoxLoop2ReductionBegin
+#define hypre_BoxLoop2ReductionEndHost     zypre_BoxLoop2ReductionEnd
 
+//TODO TEMP FIX
+#if !defined(HYPRE_USING_RAJA) && !defined(HYPRE_USING_KOKKOS) && !defined(HYPRE_USING_CUDA) && !defined(HYPRE_USING_HIP) && !defined(HYPRE_USING_DEVICE_OPENMP) && !defined(HYPRE_USING_SYCL)
+#define hypre_BoxLoopGetIndex          hypre_BoxLoopGetIndexHost
+#define hypre_BoxLoopBlock()           0
+#define hypre_BoxLoop0Begin            hypre_BoxLoop0BeginHost
+#define hypre_BoxLoop0End              hypre_BoxLoop0EndHost
+#define hypre_BoxLoop1Begin            hypre_BoxLoop1BeginHost
+#define hypre_BoxLoop1End              hypre_BoxLoop1EndHost
+#define hypre_BoxLoop2Begin            hypre_BoxLoop2BeginHost
+#define hypre_BoxLoop2End              hypre_BoxLoop2EndHost
+#define hypre_BoxLoop3Begin            hypre_BoxLoop3BeginHost
+#define hypre_BoxLoop3End              hypre_BoxLoop3EndHost
+#define hypre_BoxLoop4Begin            hypre_BoxLoop4BeginHost
+#define hypre_BoxLoop4End              hypre_BoxLoop4EndHost
+#define hypre_BasicBoxLoop1Begin       hypre_BasicBoxLoop1BeginHost
+#define hypre_BasicBoxLoop2Begin       hypre_BasicBoxLoop2BeginHost
+#define hypre_LoopBegin                hypre_LoopBeginHost
+#define hypre_LoopEnd                  hypre_LoopEndHost
+#define hypre_BoxLoop1ReductionBegin   hypre_BoxLoop1ReductionBeginHost
+#define hypre_BoxLoop1ReductionEnd     hypre_BoxLoop1ReductionEndHost
+#define hypre_BoxLoop2ReductionBegin   hypre_BoxLoop2ReductionBeginHost
+#define hypre_BoxLoop2ReductionEnd     hypre_BoxLoop2ReductionEndHost
 #endif
+
+#endif /* #ifndef HYPRE_BOXLOOP_HOST_HEADER */
+
diff --git a/external/hypre/src/struct_mv/boxloop_kokkos.h b/external/hypre/src/struct_mv/boxloop_kokkos.h
index 6e42a23a..e8d8062f 100644
--- a/external/hypre/src/struct_mv/boxloop_kokkos.h
+++ b/external/hypre/src/struct_mv/boxloop_kokkos.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -15,15 +15,18 @@
  * BoxLoop macros:
  *--------------------------------------------------------------------------*/
 
-#ifndef HYPRE_NEWBOXLOOP_HEADER
-#define HYPRE_NEWBOXLOOP_HEADER
+#ifndef HYPRE_BOXLOOP_KOKKOS_HEADER
+#define HYPRE_BOXLOOP_KOKKOS_HEADER
+
+#if defined(HYPRE_USING_KOKKOS)
 
 #ifdef __cplusplus
-extern "C++" {
+extern "C++"
+{
 #endif
 
 #include <Kokkos_Core.hpp>
-using namespace Kokkos;
+   using namespace Kokkos;
 
 #ifdef __cplusplus
 }
@@ -35,10 +38,10 @@ using namespace Kokkos;
 
 typedef struct hypre_Boxloop_struct
 {
-   HYPRE_Int lsize0,lsize1,lsize2;
-   HYPRE_Int strides0,strides1,strides2;
-   HYPRE_Int bstart0,bstart1,bstart2;
-   HYPRE_Int bsize0,bsize1,bsize2;
+   HYPRE_Int lsize0, lsize1, lsize2;
+   HYPRE_Int strides0, strides1, strides2;
+   HYPRE_Int bstart0, bstart1, bstart2;
+   HYPRE_Int bsize0, bsize1, bsize2;
 } hypre_Boxloop;
 
 
@@ -272,13 +275,13 @@ typedef struct hypre_Boxloop_struct
 
 
 
- #define hypre_BoxLoop1ReductionEnd(i1, HYPRE_BOX_REDUCTION)            \
+#define hypre_BoxLoop1ReductionEnd(i1, HYPRE_BOX_REDUCTION)            \
      }, HYPRE_BOX_REDUCTION);                                           \
      hypre_fence();                                                     \
      HYPRE_BOX_REDUCTION += __hypre_sum_tmp;                            \
  }
 
- #define hypre_BoxLoop2ReductionBegin(ndim, loop_size,                  \
+#define hypre_BoxLoop2ReductionBegin(ndim, loop_size,                  \
                                       dbox1, start1, stride1, i1,       \
                                       dbox2, start2, stride2, i2,       \
                                       HYPRE_BOX_REDUCTION)              \
@@ -295,7 +298,7 @@ typedef struct hypre_Boxloop_struct
          hypre_BoxLoopIncK(1,databox1,i1);                              \
          hypre_BoxLoopIncK(2,databox2,i2);                              \
 
- #define hypre_BoxLoop2ReductionEnd(i1, i2, HYPRE_BOX_REDUCTION)        \
+#define hypre_BoxLoop2ReductionEnd(i1, i2, HYPRE_BOX_REDUCTION)        \
      }, HYPRE_BOX_REDUCTION);                                           \
      hypre_fence();                                                     \
      HYPRE_BOX_REDUCTION += __hypre_sum_tmp;                            \
@@ -371,4 +374,8 @@ struct ColumnSums
 #define hypre_BoxLoop4End        hypre_newBoxLoop4End
 
 #define hypre_BasicBoxLoop2Begin hypre_newBasicBoxLoop2Begin
+
 #endif
+
+#endif /* #ifndef HYPRE_BOXLOOP_KOKKOS_HEADER */
+
diff --git a/external/hypre/src/struct_mv/boxloop_omp_device.h b/external/hypre/src/struct_mv/boxloop_omp_device.h
index e3de12d5..801146a5 100644
--- a/external/hypre/src/struct_mv/boxloop_omp_device.h
+++ b/external/hypre/src/struct_mv/boxloop_omp_device.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -15,8 +15,10 @@
  * BoxLoop macros:
  *--------------------------------------------------------------------------*/
 
-#ifndef HYPRE_NEWBOXLOOP_HEADER
-#define HYPRE_NEWBOXLOOP_HEADER
+#ifndef HYPRE_BOXLOOP_DEVICEOMP_HEADER
+#define HYPRE_BOXLOOP_DEVICEOMP_HEADER
+
+#if defined(HYPRE_USING_DEVICE_OPENMP) && !defined(HYPRE_USING_RAJA) && !defined(HYPRE_USING_KOKKOS)
 
 #include "omp.h"
 
@@ -33,7 +35,7 @@
 
 #ifndef AUTO_OMP_TEAM
 /* omp team size (aka. gpu block size) */
-#define hypre_gpu_block_size 512
+#define hypre_gpu_block_size HYPRE_1D_BLOCK_SIZE
 /* the max number of omp teams */
 #define hypre_max_num_blocks 1000000
 #endif
@@ -68,7 +70,7 @@
 #define hypre_BoxLoop3End    zypre_omp4_dist_BoxLoopEnd
 #define hypre_BoxLoop4Begin  zypre_omp4_dist_BoxLoop4Begin
 #define hypre_BoxLoop4End    zypre_omp4_dist_BoxLoopEnd
-#define hypre_LoopBegin      zypre_LoopBegin
+#define hypre_LoopBegin      zypre_omp4_dist_LoopBegin
 #define hypre_LoopEnd        zypre_omp4_dist_BoxLoopEnd
 
 /* Look for more in struct_ls/red_black_gs.h" */
@@ -531,7 +533,7 @@ hypre__J = hypre__thread;  i1 = i2 = 0; \
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  * Basic Loop
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/
-#define zypre_LoopBegin(size, idx) \
+#define zypre_omp4_dist_LoopBegin(size, idx) \
 { \
    /* host code: */ \
    /* HYPRE_Int idx = 0; */\
@@ -542,14 +544,6 @@ hypre__J = hypre__thread;  i1 = i2 = 0; \
    for (HYPRE_Int idx = 0; idx < hypre__tot; idx++) \
    {
 
-#if 0
-#define hypre_LoopBegin0(size, idx) \
-{ \
-   HYPRE_Int idx, hypre__size = size; \
-   for (idx = 0; idx < hypre__size; idx++) \
-   {
-#endif
-
 #define hypre_BoxLoopGetIndex(index) \
   index[0] = hypre__id_0; \
   index[1] = hypre__id_1; \
@@ -572,3 +566,5 @@ hypre__J = hypre__thread;  i1 = i2 = 0; \
 
 #endif
 
+#endif /* #ifndef HYPRE_BOXLOOP_DEVICEOMP_HEADER */
+
diff --git a/external/hypre/src/struct_mv/boxloop_raja.h b/external/hypre/src/struct_mv/boxloop_raja.h
index 216f292d..c9b7f7a2 100644
--- a/external/hypre/src/struct_mv/boxloop_raja.h
+++ b/external/hypre/src/struct_mv/boxloop_raja.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -15,15 +15,18 @@
  * BoxLoop macros:
  *--------------------------------------------------------------------------*/
 
-#ifndef HYPRE_NEWBOXLOOP_HEADER
-#define HYPRE_NEWBOXLOOP_HEADER
+#ifndef HYPRE_BOXLOOP_RAJA_HEADER
+#define HYPRE_BOXLOOP_RAJA_HEADER
+
+#if defined(HYPRE_USING_RAJA)
 
 #ifdef __cplusplus
-extern "C++" {
+extern "C++"
+{
 #endif
 
 #include <RAJA/RAJA.hpp>
-using namespace RAJA;
+   using namespace RAJA;
 
 #ifdef __cplusplus
 }
@@ -31,17 +34,17 @@ using namespace RAJA;
 
 typedef struct hypre_Boxloop_struct
 {
-   HYPRE_Int lsize0,lsize1,lsize2;
-   HYPRE_Int strides0,strides1,strides2;
-   HYPRE_Int bstart0,bstart1,bstart2;
-   HYPRE_Int bsize0,bsize1,bsize2;
+   HYPRE_Int lsize0, lsize1, lsize2;
+   HYPRE_Int strides0, strides1, strides2;
+   HYPRE_Int bstart0, bstart1, bstart2;
+   HYPRE_Int bsize0, bsize1, bsize2;
 } hypre_Boxloop;
 
 
 #if defined(HYPRE_USING_CUDA) /* RAJA with CUDA, running on device */
 
-#define BLOCKSIZE 256
-#define hypre_RAJA_DEVICE   RAJA_DEVICE
+#define BLOCKSIZE                HYPRE_1D_BLOCK_SIZE
+#define hypre_RAJA_DEVICE        RAJA_DEVICE
 #define hypre_raja_exec_policy   cuda_exec<BLOCKSIZE>
 /* #define hypre_raja_reduce_policy cuda_reduce_atomic<BLOCKSIZE> */
 #define hypre_raja_reduce_policy cuda_reduce //<BLOCKSIZE>
@@ -57,7 +60,10 @@ hypre_CheckErrorDevice(cudaDeviceSynchronize());
 
 #elif defined(HYPRE_USING_DEVICE_OPENMP) /* RAJA with OpenMP (>4.5), running on device */
 
-//TODO
+#define hypre_RAJA_DEVICE
+#define hypre_raja_exec_policy   omp_target_parallel_for_exec<BLOCKSIZE>
+#define hypre_raja_reduce_policy omp_target_reduce
+#define hypre_fence()
 
 #elif defined(HYPRE_USING_OPENMP) /* RAJA with OpenMP, running on host (CPU) */
 
@@ -289,7 +295,7 @@ hypre_CheckErrorDevice(cudaDeviceSynchronize());
    hypre_fence();                                                              \
 }
 
-#define hypre_newBoxLoopGetIndex(index)                                        \
+#define hypre_BoxLoopGetIndex(index)                                           \
   index[0] = hypre_IndexD(local_idx, 0);                                       \
   index[1] = hypre_IndexD(local_idx, 1);                                       \
   index[2] = hypre_IndexD(local_idx, 2);
@@ -330,3 +336,6 @@ hypre_CheckErrorDevice(cudaDeviceSynchronize());
         hypre_BoxLoop2End(i1, i2)
 
 #endif
+
+#endif /* #ifndef HYPRE_BOXLOOP_RAJA_HEADER */
+
diff --git a/external/hypre/src/struct_mv/boxloop_sycl.h b/external/hypre/src/struct_mv/boxloop_sycl.h
new file mode 100644
index 00000000..fded90e7
--- /dev/null
+++ b/external/hypre/src/struct_mv/boxloop_sycl.h
@@ -0,0 +1,437 @@
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ * Header info for the BoxLoop
+ *
+ *****************************************************************************/
+
+/*--------------------------------------------------------------------------
+ * BoxLoop macros:
+ *--------------------------------------------------------------------------*/
+
+#ifndef HYPRE_BOXLOOP_SYCL_HEADER
+#define HYPRE_BOXLOOP_SYCL_HEADER
+
+#if defined(HYPRE_USING_SYCL) && !defined(HYPRE_USING_RAJA) && !defined(HYPRE_USING_KOKKOS)
+
+typedef struct hypre_Boxloop_struct
+{
+   HYPRE_Int lsize0, lsize1, lsize2;
+   HYPRE_Int strides0, strides1, strides2;
+   HYPRE_Int bstart0, bstart1, bstart2;
+   HYPRE_Int bsize0, bsize1, bsize2;
+} hypre_Boxloop;
+
+
+#ifdef __cplusplus
+extern "C++"
+{
+#endif
+
+   /*********************************************************************
+    * wrapper functions calling sycl parallel_for
+    * WM: todo - add runtime switch between CPU/GPU execution
+    *********************************************************************/
+
+   template<typename LOOP_BODY>
+   void
+   BoxLoopforall( HYPRE_Int length,
+                  LOOP_BODY loop_body)
+   {
+      if (length <= 0)
+      {
+         return;
+      }
+      dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+      dim3 gDim = hypre_GetDefaultDeviceGridDimension(length, "thread", bDim);
+
+      hypre_HandleComputeStream(hypre_handle())->submit([&] (sycl::handler & cgh)
+      {
+         cgh.parallel_for(sycl::nd_range<3>(gDim * bDim, bDim), loop_body);
+      }).wait_and_throw();
+   }
+
+   template<typename LOOP_BODY>
+   void
+   ReductionBoxLoopforall( LOOP_BODY  loop_body,
+                           HYPRE_Int length,
+                           HYPRE_Real * shared_sum_var )
+   {
+      if (length <= 0)
+      {
+         return;
+      }
+      dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+      dim3 gDim = hypre_GetDefaultDeviceGridDimension(length, "thread", bDim);
+
+      hypre_HandleComputeStream(hypre_handle())->submit([&] (sycl::handler & cgh)
+      {
+         cgh.parallel_for(sycl::nd_range<3>(gDim * bDim, bDim), sycl::reduction(shared_sum_var,
+                                                                                std::plus<>()), loop_body);
+      }).wait_and_throw();
+   }
+
+#ifdef __cplusplus
+}
+#endif
+
+
+/*********************************************************************
+ * Init/Declare/IncK etc.
+ *********************************************************************/
+
+/* Get 1-D length of the loop, in hypre__tot */
+#define hypre_newBoxLoopInit(ndim, loop_size)              \
+   HYPRE_Int hypre__tot = 1;                               \
+   for (HYPRE_Int hypre_d = 0; hypre_d < ndim; hypre_d ++) \
+   {                                                       \
+      hypre__tot *= loop_size[hypre_d];                    \
+   }
+
+/* Initialize struct for box-k */
+#define hypre_BoxLoopDataDeclareK(k, ndim, loop_size, dbox, start, stride) \
+   hypre_Boxloop databox##k;                                               \
+   databox##k.lsize0   = loop_size[0];                                     \
+   databox##k.strides0 = stride[0];                                        \
+   databox##k.bstart0  = start[0] - dbox->imin[0];                         \
+   databox##k.bsize0   = dbox->imax[0] - dbox->imin[0];                    \
+   if (ndim > 1)                                                           \
+   {                                                                       \
+      databox##k.lsize1   = loop_size[1];                                  \
+      databox##k.strides1 = stride[1];                                     \
+      databox##k.bstart1  = start[1] - dbox->imin[1];                      \
+      databox##k.bsize1   = dbox->imax[1] - dbox->imin[1];                 \
+   }                                                                       \
+   else                                                                    \
+   {                                                                       \
+      databox##k.lsize1   = 1;                                             \
+      databox##k.strides1 = 0;                                             \
+      databox##k.bstart1  = 0;                                             \
+      databox##k.bsize1   = 0;                                             \
+   }                                                                       \
+   if (ndim == 3)                                                          \
+   {                                                                       \
+      databox##k.lsize2   = loop_size[2];                                  \
+      databox##k.strides2 = stride[2];                                     \
+      databox##k.bstart2  = start[2] - dbox->imin[2];                      \
+      databox##k.bsize2   = dbox->imax[2] - dbox->imin[2];                 \
+   }                                                                       \
+   else                                                                    \
+   {                                                                       \
+      databox##k.lsize2   = 1;                                             \
+      databox##k.strides2 = 0;                                             \
+      databox##k.bstart2  = 0;                                             \
+      databox##k.bsize2   = 0;                                             \
+   }
+
+#define hypre_BasicBoxLoopDataDeclareK(k,ndim,loop_size,stride) \
+hypre_Boxloop databox##k;                                       \
+databox##k.lsize0   = loop_size[0];                             \
+databox##k.strides0 = stride[0];                                \
+databox##k.bstart0  = 0;                                        \
+databox##k.bsize0   = 0;                                        \
+if (ndim > 1)                                                   \
+{                                                               \
+   databox##k.lsize1   = loop_size[1];                          \
+   databox##k.strides1 = stride[1];                             \
+   databox##k.bstart1  = 0;                                     \
+   databox##k.bsize1   = 0;                                     \
+}                                                               \
+else                                                            \
+{                                                               \
+   databox##k.lsize1   = 1;                                     \
+   databox##k.strides1 = 0;                                     \
+   databox##k.bstart1  = 0;                                     \
+   databox##k.bsize1   = 0;                                     \
+}                                                               \
+if (ndim == 3)                                                  \
+{                                                               \
+   databox##k.lsize2   = loop_size[2];                          \
+   databox##k.strides2 = stride[2];                             \
+   databox##k.bstart2  = 0;                                     \
+   databox##k.bsize2   = 0;                                     \
+}                                                               \
+else                                                            \
+{                                                               \
+    databox##k.lsize2   = 1;                                    \
+    databox##k.strides2 = 0;                                    \
+    databox##k.bstart2  = 0;                                    \
+    databox##k.bsize2   = 0;                                    \
+}
+
+/* Given input 1-D 'idx' in box, get 3-D 'local_idx' in loop_size */
+#define hypre_newBoxLoopDeclare(box)                     \
+   hypre_Index local_idx;                                \
+   HYPRE_Int idx_local = idx;                            \
+   hypre_IndexD(local_idx, 0)  = idx_local % box.lsize0; \
+   idx_local = idx_local / box.lsize0;                   \
+   hypre_IndexD(local_idx, 1)  = idx_local % box.lsize1; \
+   idx_local = idx_local / box.lsize1;                   \
+   hypre_IndexD(local_idx, 2)  = idx_local % box.lsize2; \
+
+/* Given input 3-D 'local_idx', get 1-D 'hypre__i' in 'box' */
+#define hypre_BoxLoopIncK(k, box, hypre__i)                                               \
+   HYPRE_Int hypre_boxD##k = 1;                                                           \
+   HYPRE_Int hypre__i = 0;                                                                \
+   hypre__i += (hypre_IndexD(local_idx, 0) * box.strides0 + box.bstart0) * hypre_boxD##k; \
+   hypre_boxD##k *= hypre_max(0, box.bsize0 + 1);                                         \
+   hypre__i += (hypre_IndexD(local_idx, 1) * box.strides1 + box.bstart1) * hypre_boxD##k; \
+   hypre_boxD##k *= hypre_max(0, box.bsize1 + 1);                                         \
+   hypre__i += (hypre_IndexD(local_idx, 2) * box.strides2 + box.bstart2) * hypre_boxD##k; \
+   hypre_boxD##k *= hypre_max(0, box.bsize2 + 1);
+
+/* get 3-D local_idx into 'index' */
+#define hypre_BoxLoopGetIndex(index)      \
+   index[0] = hypre_IndexD(local_idx, 0); \
+   index[1] = hypre_IndexD(local_idx, 1); \
+   index[2] = hypre_IndexD(local_idx, 2);
+
+
+/*********************************************************************
+ * Boxloops
+ *********************************************************************/
+
+/* BoxLoop 0 */
+#define hypre_newBoxLoop0Begin(ndim, loop_size)                                                       \
+{                                                                                                     \
+   hypre_newBoxLoopInit(ndim, loop_size);                                                             \
+   BoxLoopforall(hypre__tot, [=] (sycl::nd_item<3> item)                                              \
+   {                                                                                                  \
+      HYPRE_Int idx = (HYPRE_Int) item.get_global_linear_id();                                        \
+      if (idx < hypre__tot)                                                                           \
+      {                                                                                               \
+
+#define hypre_newBoxLoop0End()                                                                        \
+      }                                                                                               \
+   });                                                                                                \
+}
+
+/* BoxLoop 1 */
+#define hypre_newBoxLoop1Begin(ndim, loop_size, dbox1, start1, stride1, i1)                           \
+{                                                                                                     \
+   hypre_newBoxLoopInit(ndim, loop_size);                                                             \
+   hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                             \
+   BoxLoopforall(hypre__tot, [=] (sycl::nd_item<3> item)                                              \
+   {                                                                                                  \
+      HYPRE_Int idx = (HYPRE_Int) item.get_global_linear_id();                                        \
+      if (idx < hypre__tot)                                                                           \
+      {                                                                                               \
+         hypre_newBoxLoopDeclare(databox1);                                                           \
+         hypre_BoxLoopIncK(1, databox1, i1);
+
+#define hypre_newBoxLoop1End(i1)                                                                      \
+      }                                                                                               \
+   });                                                                                                \
+}
+
+/* BoxLoop 2 */
+#define hypre_newBoxLoop2Begin(ndim, loop_size, dbox1, start1, stride1, i1,                           \
+                                                dbox2, start2, stride2, i2)                           \
+{                                                                                                     \
+   hypre_newBoxLoopInit(ndim, loop_size);                                                             \
+   hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                             \
+   hypre_BoxLoopDataDeclareK(2, ndim, loop_size, dbox2, start2, stride2);                             \
+   BoxLoopforall(hypre__tot, [=] (sycl::nd_item<3> item)                                              \
+   {                                                                                                  \
+      HYPRE_Int idx = (HYPRE_Int) item.get_global_linear_id();                                        \
+      if (idx < hypre__tot)                                                                           \
+      {                                                                                               \
+         hypre_newBoxLoopDeclare(databox1);                                                           \
+         hypre_BoxLoopIncK(1, databox1, i1);                                                          \
+         hypre_BoxLoopIncK(2, databox2, i2);
+
+#define hypre_newBoxLoop2End(i1, i2)                                                                  \
+      }                                                                                               \
+   });                                                                                                \
+}
+
+/* BoxLoop 3 */
+#define hypre_newBoxLoop3Begin(ndim, loop_size, dbox1, start1, stride1, i1,                           \
+                                                dbox2, start2, stride2, i2,                           \
+                                                dbox3, start3, stride3, i3)                           \
+{                                                                                                     \
+   hypre_newBoxLoopInit(ndim, loop_size);                                                             \
+   hypre_BoxLoopDataDeclareK(1, ndim,loop_size, dbox1, start1, stride1);                              \
+   hypre_BoxLoopDataDeclareK(2, ndim,loop_size, dbox2, start2, stride2);                              \
+   hypre_BoxLoopDataDeclareK(3, ndim,loop_size, dbox3, start3, stride3);                              \
+   BoxLoopforall(hypre__tot, [=] (sycl::nd_item<3> item)                                              \
+   {                                                                                                  \
+      HYPRE_Int idx = (HYPRE_Int) item.get_global_linear_id();                                        \
+      if (idx < hypre__tot)                                                                           \
+      {                                                                                               \
+         hypre_newBoxLoopDeclare(databox1);                                                           \
+         hypre_BoxLoopIncK(1, databox1, i1);                                                          \
+         hypre_BoxLoopIncK(2, databox2, i2);                                                          \
+         hypre_BoxLoopIncK(3, databox3, i3);
+
+#define hypre_newBoxLoop3End(i1, i2, i3)                                                              \
+      }                                                                                               \
+   });                                                                                                \
+}
+
+/* BoxLoop 4 */
+#define hypre_newBoxLoop4Begin(ndim, loop_size, dbox1, start1, stride1, i1,                           \
+                                                dbox2, start2, stride2, i2,                           \
+                                                dbox3, start3, stride3, i3,                           \
+                                                dbox4, start4, stride4, i4)                           \
+{                                                                                                     \
+   hypre_newBoxLoopInit(ndim, loop_size);                                                             \
+   hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                             \
+   hypre_BoxLoopDataDeclareK(2, ndim, loop_size, dbox2, start2, stride2);                             \
+   hypre_BoxLoopDataDeclareK(3, ndim, loop_size, dbox3, start3, stride3);                             \
+   hypre_BoxLoopDataDeclareK(4, ndim, loop_size, dbox4, start4, stride4);                             \
+   BoxLoopforall(hypre__tot, [=] (sycl::nd_item<3> item)                                              \
+   {                                                                                                  \
+      HYPRE_Int idx = (HYPRE_Int) item.get_global_linear_id();                                        \
+      if (idx < hypre__tot)                                                                           \
+      {                                                                                               \
+         hypre_newBoxLoopDeclare(databox1);                                                           \
+         hypre_BoxLoopIncK(1, databox1, i1);                                                          \
+         hypre_BoxLoopIncK(2, databox2, i2);                                                          \
+         hypre_BoxLoopIncK(3, databox3, i3);                                                          \
+         hypre_BoxLoopIncK(4, databox4, i4);
+
+#define hypre_newBoxLoop4End(i1, i2, i3, i4)                                                          \
+      }                                                                                               \
+   });                                                                                                \
+}
+
+
+/* Basic BoxLoops have no boxes */
+/* BoxLoop 1 */
+#define hypre_newBasicBoxLoop1Begin(ndim, loop_size, stride1, i1)                                     \
+{                                                                                                     \
+   hypre_newBoxLoopInit(ndim, loop_size);                                                             \
+   hypre_BasicBoxLoopDataDeclareK(1, ndim, loop_size, stride1);                                       \
+   BoxLoopforall(hypre__tot, [=] (sycl::nd_item<3> item)                                              \
+   {                                                                                                  \
+      HYPRE_Int idx = (HYPRE_Int) item.get_global_linear_id();                                        \
+      if (idx < hypre__tot)                                                                           \
+      {                                                                                               \
+         hypre_newBoxLoopDeclare(databox1);                                                           \
+         hypre_BoxLoopIncK(1, databox1, i1);
+
+/* BoxLoop 2 */
+#define hypre_newBasicBoxLoop2Begin(ndim, loop_size, stride1, i1, stride2, i2)                        \
+{                                                                                                     \
+   hypre_newBoxLoopInit(ndim, loop_size);                                                             \
+   hypre_BasicBoxLoopDataDeclareK(1, ndim, loop_size, stride1);                                       \
+   hypre_BasicBoxLoopDataDeclareK(2, ndim, loop_size, stride2);                                       \
+   BoxLoopforall(hypre__tot, [=] (sycl::nd_item<3> item)                                              \
+   {                                                                                                  \
+      HYPRE_Int idx = (HYPRE_Int) item.get_global_linear_id();                                        \
+      if (idx < hypre__tot)                                                                           \
+      {                                                                                               \
+         hypre_newBoxLoopDeclare(databox1);                                                           \
+         hypre_BoxLoopIncK(1, databox1, i1);                                                          \
+         hypre_BoxLoopIncK(2, databox2, i2);
+
+
+/* Reduction BoxLoop1 */
+#define hypre_newBoxLoop1ReductionBegin(ndim, loop_size, dbox1, start1, stride1, i1, sum_var)         \
+{                                                                                                     \
+   hypre_newBoxLoopInit(ndim, loop_size);                                                             \
+   hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                             \
+   HYPRE_Real *shared_sum_var = hypre_CTAlloc(HYPRE_Real, 1, HYPRE_MEMORY_DEVICE);                    \
+   hypre_TMemcpy(shared_sum_var, &sum_var, HYPRE_Real, 1, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);    \
+   ReductionBoxLoopforall( [=,hypre_unused_var=sum_var] (sycl::nd_item<3> item, auto &sum_var)        \
+   {                                                                                                  \
+      HYPRE_Int idx = (HYPRE_Int) item.get_global_linear_id();                                        \
+      if (idx < hypre__tot)                                                                           \
+      {                                                                                               \
+         hypre_newBoxLoopDeclare(databox1);                                                           \
+         hypre_BoxLoopIncK(1, databox1, i1);
+
+#define hypre_newBoxLoop1ReductionEnd(i1, sum_var)                                                    \
+      }                                                                                               \
+   }, hypre__tot, shared_sum_var);                                                                    \
+   hypre_TMemcpy(&sum_var, shared_sum_var, HYPRE_Real, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);    \
+   hypre_TFree(shared_sum_var, HYPRE_MEMORY_DEVICE);                                                  \
+}
+
+/* Reduction BoxLoop2 */
+#define hypre_newBoxLoop2ReductionBegin(ndim, loop_size, dbox1, start1, stride1, i1,                  \
+                                                      dbox2, start2, stride2, i2, sum_var)            \
+{                                                                                                     \
+   hypre_newBoxLoopInit(ndim, loop_size);                                                             \
+   hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                             \
+   hypre_BoxLoopDataDeclareK(2, ndim, loop_size, dbox2, start2, stride2);                             \
+   HYPRE_Real *shared_sum_var = hypre_CTAlloc(HYPRE_Real, 1, HYPRE_MEMORY_DEVICE);                    \
+   hypre_TMemcpy(shared_sum_var, &sum_var, HYPRE_Real, 1, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);    \
+   ReductionBoxLoopforall( [=,hypre_unused_var=sum_var] (sycl::nd_item<3> item, auto &sum_var)        \
+   {                                                                                                  \
+      HYPRE_Int idx = (HYPRE_Int) item.get_global_linear_id();                                        \
+      if (idx < hypre__tot)                                                                           \
+      {                                                                                               \
+         hypre_newBoxLoopDeclare(databox1);                                                           \
+         hypre_BoxLoopIncK(1, databox1, i1);                                                          \
+         hypre_BoxLoopIncK(2, databox2, i2);
+
+#define hypre_newBoxLoop2ReductionEnd(i1, i2, sum_var)                                                \
+      }                                                                                               \
+   }, hypre__tot, shared_sum_var);                                                                    \
+   hypre_TMemcpy(&sum_var, shared_sum_var, HYPRE_Real, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);    \
+   hypre_TFree(shared_sum_var, HYPRE_MEMORY_DEVICE);                                                  \
+}
+
+/* Plain parallel_for loop */
+#define hypre_LoopBegin(size, idx)                                                                    \
+{                                                                                                     \
+   HYPRE_Int hypre__tot = size;                                                                       \
+   BoxLoopforall(hypre__tot, [=] (sycl::nd_item<3> item)                                              \
+   {                                                                                                  \
+      HYPRE_Int idx = (HYPRE_Int) item.get_global_linear_id();                                        \
+      if (idx < hypre__tot)                                                                           \
+      {                                                                                               \
+
+#define hypre_LoopEnd()                                                                               \
+      }                                                                                               \
+   });                                                                                                \
+}
+
+
+/*********************************************************************
+ * renamings
+ *********************************************************************/
+
+#define hypre_BoxLoopBlock()       0
+
+#define hypre_BoxLoop0Begin      hypre_newBoxLoop0Begin
+#define hypre_BoxLoop0End        hypre_newBoxLoop0End
+#define hypre_BoxLoop1Begin      hypre_newBoxLoop1Begin
+#define hypre_BoxLoop1End        hypre_newBoxLoop1End
+#define hypre_BoxLoop2Begin      hypre_newBoxLoop2Begin
+#define hypre_BoxLoop2End        hypre_newBoxLoop2End
+#define hypre_BoxLoop3Begin      hypre_newBoxLoop3Begin
+#define hypre_BoxLoop3End        hypre_newBoxLoop3End
+#define hypre_BoxLoop4Begin      hypre_newBoxLoop4Begin
+#define hypre_BoxLoop4End        hypre_newBoxLoop4End
+
+#define hypre_BasicBoxLoop1Begin hypre_newBasicBoxLoop1Begin
+#define hypre_BasicBoxLoop2Begin hypre_newBasicBoxLoop2Begin
+
+/* Reduction */
+#define hypre_BoxLoop1ReductionBegin(ndim, loop_size, dbox1, start1, stride1, i1, reducesum) \
+        hypre_newBoxLoop1ReductionBegin(ndim, loop_size, dbox1, start1, stride1, i1, reducesum)
+
+#define hypre_BoxLoop1ReductionEnd(i1, reducesum) \
+        hypre_newBoxLoop1ReductionEnd(i1, reducesum)
+
+#define hypre_BoxLoop2ReductionBegin(ndim, loop_size, dbox1, start1, stride1, i1, \
+                                                      dbox2, start2, stride2, i2, reducesum) \
+        hypre_newBoxLoop2ReductionBegin(ndim, loop_size, dbox1, start1, stride1, i1, \
+                                                         dbox2, start2, stride2, i2, reducesum)
+
+#define hypre_BoxLoop2ReductionEnd(i1, i2, reducesum) \
+        hypre_newBoxLoop2ReductionEnd(i1, i2, reducesum)
+
+#endif
+
+#endif /* #ifndef HYPRE_BOXLOOP_SYCL_HEADER */
+
diff --git a/external/hypre/src/struct_mv/communication_info.c b/external/hypre/src/struct_mv/communication_info.c
index 3db012fe..60eb4b0a 100644
--- a/external/hypre/src/struct_mv/communication_info.c
+++ b/external/hypre/src/struct_mv/communication_info.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -134,72 +134,75 @@ hypre_CommInfoDestroy( hypre_CommInfo  *comm_info )
    HYPRE_Int           **transforms;
    HYPRE_Int             i, size;
 
-   size = hypre_BoxArrayArraySize(hypre_CommInfoSendBoxes(comm_info));
-   hypre_BoxArrayArrayDestroy(hypre_CommInfoSendBoxes(comm_info));
-   processes = hypre_CommInfoSendProcesses(comm_info);
-   for (i = 0; i < size; i++)
-   {
-      hypre_TFree(processes[i], HYPRE_MEMORY_HOST);
-   }
-   hypre_TFree(processes, HYPRE_MEMORY_HOST);
-   rboxnums = hypre_CommInfoSendRBoxnums(comm_info);
-   if (rboxnums != NULL)
+   if (comm_info)
    {
+      size = hypre_BoxArrayArraySize(hypre_CommInfoSendBoxes(comm_info));
+      hypre_BoxArrayArrayDestroy(hypre_CommInfoSendBoxes(comm_info));
+      processes = hypre_CommInfoSendProcesses(comm_info);
       for (i = 0; i < size; i++)
       {
-         hypre_TFree(rboxnums[i], HYPRE_MEMORY_HOST);
+         hypre_TFree(processes[i], HYPRE_MEMORY_HOST);
       }
-      hypre_TFree(rboxnums, HYPRE_MEMORY_HOST);
-   }
-   hypre_BoxArrayArrayDestroy(hypre_CommInfoSendRBoxes(comm_info));
-   transforms = hypre_CommInfoSendTransforms(comm_info);
-   if (transforms != NULL)
-   {
-      for (i = 0; i < size; i++)
+      hypre_TFree(processes, HYPRE_MEMORY_HOST);
+      rboxnums = hypre_CommInfoSendRBoxnums(comm_info);
+      if (rboxnums != NULL)
       {
-         hypre_TFree(transforms[i], HYPRE_MEMORY_HOST);
+         for (i = 0; i < size; i++)
+         {
+            hypre_TFree(rboxnums[i], HYPRE_MEMORY_HOST);
+         }
+         hypre_TFree(rboxnums, HYPRE_MEMORY_HOST);
+      }
+      hypre_BoxArrayArrayDestroy(hypre_CommInfoSendRBoxes(comm_info));
+      transforms = hypre_CommInfoSendTransforms(comm_info);
+      if (transforms != NULL)
+      {
+         for (i = 0; i < size; i++)
+         {
+            hypre_TFree(transforms[i], HYPRE_MEMORY_HOST);
+         }
+         hypre_TFree(transforms, HYPRE_MEMORY_HOST);
       }
-      hypre_TFree(transforms, HYPRE_MEMORY_HOST);
-   }
 
-   size = hypre_BoxArrayArraySize(hypre_CommInfoRecvBoxes(comm_info));
-   hypre_BoxArrayArrayDestroy(hypre_CommInfoRecvBoxes(comm_info));
-   processes = hypre_CommInfoRecvProcesses(comm_info);
-   for (i = 0; i < size; i++)
-   {
-      hypre_TFree(processes[i], HYPRE_MEMORY_HOST);
-   }
-   hypre_TFree(processes, HYPRE_MEMORY_HOST);
-   rboxnums = hypre_CommInfoRecvRBoxnums(comm_info);
-   if (rboxnums != NULL)
-   {
+      size = hypre_BoxArrayArraySize(hypre_CommInfoRecvBoxes(comm_info));
+      hypre_BoxArrayArrayDestroy(hypre_CommInfoRecvBoxes(comm_info));
+      processes = hypre_CommInfoRecvProcesses(comm_info);
       for (i = 0; i < size; i++)
       {
-         hypre_TFree(rboxnums[i], HYPRE_MEMORY_HOST);
+         hypre_TFree(processes[i], HYPRE_MEMORY_HOST);
       }
-      hypre_TFree(rboxnums, HYPRE_MEMORY_HOST);
-   }
-   hypre_BoxArrayArrayDestroy(hypre_CommInfoRecvRBoxes(comm_info));
-   transforms = hypre_CommInfoRecvTransforms(comm_info);
-   if (transforms != NULL)
-   {
-      for (i = 0; i < size; i++)
+      hypre_TFree(processes, HYPRE_MEMORY_HOST);
+      rboxnums = hypre_CommInfoRecvRBoxnums(comm_info);
+      if (rboxnums != NULL)
       {
-         hypre_TFree(transforms[i], HYPRE_MEMORY_HOST);
+         for (i = 0; i < size; i++)
+         {
+            hypre_TFree(rboxnums[i], HYPRE_MEMORY_HOST);
+         }
+         hypre_TFree(rboxnums, HYPRE_MEMORY_HOST);
+      }
+      hypre_BoxArrayArrayDestroy(hypre_CommInfoRecvRBoxes(comm_info));
+      transforms = hypre_CommInfoRecvTransforms(comm_info);
+      if (transforms != NULL)
+      {
+         for (i = 0; i < size; i++)
+         {
+            hypre_TFree(transforms[i], HYPRE_MEMORY_HOST);
+         }
+         hypre_TFree(transforms, HYPRE_MEMORY_HOST);
       }
-      hypre_TFree(transforms, HYPRE_MEMORY_HOST);
-   }
 
-   hypre_TFree(hypre_CommInfoCoords(comm_info), HYPRE_MEMORY_HOST);
-   hypre_TFree(hypre_CommInfoDirs(comm_info), HYPRE_MEMORY_HOST);
+      hypre_TFree(hypre_CommInfoCoords(comm_info), HYPRE_MEMORY_HOST);
+      hypre_TFree(hypre_CommInfoDirs(comm_info), HYPRE_MEMORY_HOST);
 
-   hypre_TFree(comm_info, HYPRE_MEMORY_HOST);
+      hypre_TFree(comm_info, HYPRE_MEMORY_HOST);
+   }
 
    return hypre_error_flag;
 }
 
 /*--------------------------------------------------------------------------
- * NEW version that uses the box manager to find neighbors boxes. 
+ * NEW version that uses the box manager to find neighbors boxes.
  * AHB 9/06
  *
  * Return descriptions of communications patterns for a given
@@ -223,20 +226,20 @@ hypre_CommInfoDestroy( hypre_CommInfo  *comm_info )
  * difference between doing 26 communications versus 6):
  *
  * To compute send/recv regions, do
- * 
+ *
  *   for i = local box
  *   {
  *      gbox_i = grow box i according to stencil
  *
- *      //find neighbors of i  
- *      call BoxManIntersect on gbox_i (and periodic gbox_i)  
+ *      //find neighbors of i
+ *      call BoxManIntersect on gbox_i (and periodic gbox_i)
  *
  *      // receives
  *      for j = neighbor box of i
  *      {
  *         intersect gbox_i with box j and add to recv region
  *      }
- * 
+ *
  *      // sends
  *      for j = neighbor box of i
  *      {
@@ -244,21 +247,21 @@ hypre_CommInfoDestroy( hypre_CommInfo  *comm_info )
  *         intersect gbox_j with box i and add to send region
  *      }
  *   }
- * 
- *   (Note: no ordering is assumed) 
+ *
+ *   (Note: no ordering is assumed)
  *
  * 2. Optimization on basic algorithm:
- * 
+ *
  * Before looping over the neighbors in the above algorithm, do a
  * preliminary sweep through the neighbors to select a subset of
  * neighbors to do the intersections with.  To select the subset,
  * compute a so-called "distance index" and check the corresponding
  * entry in the so-called "stencil grid" to decide whether or not to
  * use the box.
- * 
+ *
  * The "stencil grid" is a 3x3x3 grid in 3D that is built from the
  * stencil as follows:
- * 
+ *
  *   // assume for simplicity that i,j,k are -1, 0, or 1
  *   for each stencil entry (i,j,k)
  *   {
@@ -268,25 +271,25 @@ hypre_CommInfoDestroy( hypre_CommInfo  *comm_info )
  *
  *
  * 3. Complications with periodicity:
- * 
+ *
  * When periodicity is on, it is possible to have a box-pair region
  * (the description of a communication pattern between two boxes) that
  * consists of more than one box.
- * 
+ *
  * 4.  Box Manager
  *
- *   The box manager is used to determine neighbors.  It is assumed 
- *   that the grid's box manager contains sufficient neighbor 
+ *   The box manager is used to determine neighbors.  It is assumed
+ *   that the grid's box manager contains sufficient neighbor
  *   information.
  *
- * NOTES: 
+ * NOTES:
  *
  *    A. No concept of data ownership is assumed.  As a result,
  *       redundant communication patterns can be produced when the grid
  *       boxes overlap.
  *
  *    B. Boxes in the send and recv regions do not need to be in any
- *       particular order (including those that are periodic).  
+ *       particular order (including those that are periodic).
  *
  *--------------------------------------------------------------------------*/
 
@@ -296,7 +299,7 @@ hypre_CreateCommInfoFromStencil( hypre_StructGrid      *grid,
                                  hypre_CommInfo       **comm_info_ptr )
 {
    HYPRE_Int              ndim = hypre_StructGridNDim(grid);
-   HYPRE_Int              i,j,k, d, m, s, si;
+   HYPRE_Int              i, j, k, d, m, s, si;
 
    hypre_BoxArrayArray   *send_boxes;
    hypre_BoxArrayArray   *recv_boxes;
@@ -312,25 +315,25 @@ hypre_CreateCommInfoFromStencil( hypre_StructGrid      *grid,
    HYPRE_Int              num_boxes;
 
    hypre_BoxManager      *boxman;
-                       
+
    hypre_Index           *stencil_shape;
    hypre_IndexRef         stencil_offset;
    hypre_IndexRef         pshift;
-                          
+
    hypre_Box             *box;
    hypre_Box             *hood_box;
    hypre_Box             *grow_box;
    hypre_Box             *extend_box;
    hypre_Box             *int_box;
    hypre_Box             *periodic_box;
-   
+
    hypre_Box             *stencil_box, *sbox; /* extents of the stencil grid */
    HYPRE_Int             *stencil_grid;
    HYPRE_Int              grow[HYPRE_MAXDIM][2];
-                       
+
    hypre_BoxManEntry    **entries;
    hypre_BoxManEntry     *entry;
-   
+
    HYPRE_Int              num_entries;
    hypre_BoxArray        *neighbor_boxes = NULL;
    HYPRE_Int             *neighbor_procs = NULL;
@@ -345,19 +348,19 @@ hypre_CreateCommInfoFromStencil( hypre_StructGrid      *grid,
    hypre_BoxArray        *recv_box_array;
    hypre_BoxArray        *send_rbox_array;
    hypre_BoxArray        *recv_rbox_array;
-                       
+
    hypre_Box            **cboxes;
    hypre_Box             *cboxes_mem;
    HYPRE_Int             *cboxes_neighbor_location;
    HYPRE_Int              num_cboxes, cbox_alloc;
-                       
+
    hypre_Index            istart, istop, sgindex;
    hypre_IndexRef         start;
    hypre_Index            loop_size, stride;
 
    HYPRE_Int              num_periods, loc, box_id, id, proc_id;
    HYPRE_Int              myid;
-   
+
    MPI_Comm               comm;
 
    /*------------------------------------------------------
@@ -373,10 +376,10 @@ hypre_CreateCommInfoFromStencil( hypre_StructGrid      *grid,
    local_boxes = hypre_StructGridBoxes(grid);
    num_boxes   = hypre_BoxArraySize(local_boxes);
    num_periods = hypre_StructGridNumPeriods(grid);
-   
+
    boxman = hypre_StructGridBoxMan(grid);
    comm   = hypre_StructGridComm(grid);
-   
+
    hypre_MPI_Comm_rank(comm, &myid);
 
    stencil_box = hypre_BoxCreate(ndim);
@@ -388,7 +391,7 @@ hypre_CreateCommInfoFromStencil( hypre_StructGrid      *grid,
 
    sbox = hypre_BoxCreate(ndim);
    hypre_SetIndex(stride, 1);
-   
+
    /*------------------------------------------------------
     * Compute the "grow" information from the stencil
     *------------------------------------------------------*/
@@ -430,7 +433,7 @@ hypre_CreateCommInfoFromStencil( hypre_StructGrid      *grid,
       hypre_BoxGetSize(sbox, loop_size);
 
       hypre_SerialBoxLoop1Begin(ndim, loop_size,
-                          stencil_box, start, stride, si);
+                                stencil_box, start, stride, si);
       {
          stencil_grid[si] = 1;
       }
@@ -460,7 +463,7 @@ hypre_CreateCommInfoFromStencil( hypre_StructGrid      *grid,
    extend_box = hypre_BoxCreate(hypre_StructGridNDim(grid));
    int_box  = hypre_BoxCreate(hypre_StructGridNDim(grid));
    periodic_box =  hypre_BoxCreate(hypre_StructGridNDim(grid));
- 
+
    /* storage we will use and keep track of the neighbors */
    neighbor_alloc = 30; /* initial guess at max size */
    neighbor_boxes = hypre_BoxArrayCreate(neighbor_alloc, ndim);
@@ -484,7 +487,7 @@ hypre_CreateCommInfoFromStencil( hypre_StructGrid      *grid,
       /* get the box */
       box = hypre_BoxArrayBox(local_boxes, i);
       box_id = i;
-      
+
       /* grow box local i according to the stencil*/
       hypre_CopyBox(box, grow_box);
       for (d = 0; d < ndim; d++)
@@ -498,16 +501,16 @@ hypre_CreateCommInfoFromStencil( hypre_StructGrid      *grid,
          in one dimension [0] and not the other [1] */
       hypre_CopyBox(box, extend_box);
       for (d = 0; d < ndim; d++)
-      { 
-         hypre_BoxIMinD(extend_box, d) -= hypre_max(grow[d][0],grow[d][1]);
-         hypre_BoxIMaxD(extend_box, d) += hypre_max(grow[d][0],grow[d][1]);
+      {
+         hypre_BoxIMinD(extend_box, d) -= hypre_max(grow[d][0], grow[d][1]);
+         hypre_BoxIMaxD(extend_box, d) += hypre_max(grow[d][0], grow[d][1]);
       }
 
       /*------------------------------------------------
        * Determine the neighbors of box i
        *------------------------------------------------*/
-     
-      /* Do this by intersecting the extend box with the BoxManager. 
+
+      /* Do this by intersecting the extend box with the BoxManager.
          We must also check for periodic neighbors. */
 
       neighbor_count = 0;
@@ -518,23 +521,23 @@ hypre_CreateCommInfoFromStencil( hypre_StructGrid      *grid,
          hypre_CopyBox(extend_box, periodic_box);
          pshift = hypre_StructGridPShift(grid, k);
          hypre_BoxShiftPos(periodic_box, pshift);
-         
+
          /* get the intersections */
-         hypre_BoxManIntersect(boxman, hypre_BoxIMin(periodic_box) , 
-                               hypre_BoxIMax(periodic_box) , 
-                               &entries , &num_entries);
-      
+         hypre_BoxManIntersect(boxman, hypre_BoxIMin(periodic_box),
+                               hypre_BoxIMax(periodic_box),
+                               &entries, &num_entries);
+
          /* note: do we need to remove the intersection with our original box?
-            no if periodic, yes if non-periodic (k=0) */ 
+            no if periodic, yes if non-periodic (k=0) */
 
          /* unpack entries (first check storage) */
          if (neighbor_count + num_entries > neighbor_alloc)
          {
             neighbor_alloc = neighbor_count + num_entries + 5;
-            neighbor_procs = hypre_TReAlloc(neighbor_procs,  HYPRE_Int, 
+            neighbor_procs = hypre_TReAlloc(neighbor_procs,  HYPRE_Int,
                                             neighbor_alloc, HYPRE_MEMORY_HOST);
             neighbor_ids = hypre_TReAlloc(neighbor_ids,  HYPRE_Int,  neighbor_alloc, HYPRE_MEMORY_HOST);
-            neighbor_shifts = hypre_TReAlloc(neighbor_shifts,  HYPRE_Int, 
+            neighbor_shifts = hypre_TReAlloc(neighbor_shifts,  HYPRE_Int,
                                              neighbor_alloc, HYPRE_MEMORY_HOST);
          }
          /* check storage for the array */
@@ -543,18 +546,18 @@ hypre_CreateCommInfoFromStencil( hypre_StructGrid      *grid,
          for (j = 0; j < num_entries; j++)
          {
             entry = entries[j];
-            proc_id = hypre_BoxManEntryProc(entry);        
-            id = hypre_BoxManEntryId(entry); 
-            /* don't keep box i in the non-periodic case*/  
+            proc_id = hypre_BoxManEntryProc(entry);
+            id = hypre_BoxManEntryId(entry);
+            /* don't keep box i in the non-periodic case*/
             if (!k)
             {
-               if((myid == proc_id) && (box_id == id))
+               if ((myid == proc_id) && (box_id == id))
                {
                   continue;
                }
             }
 
-            hypre_BoxManEntryGetExtents(entry, ilower, iupper);        
+            hypre_BoxManEntryGetExtents(entry, ilower, iupper);
             hypre_BoxSetExtents(hypre_BoxArrayBox(neighbor_boxes, neighbor_count),
                                 ilower, iupper);
             /* shift the periodic boxes (needs to be the opposite of above) */
@@ -563,7 +566,7 @@ hypre_CreateCommInfoFromStencil( hypre_StructGrid      *grid,
                hypre_BoxShiftNeg(
                   hypre_BoxArrayBox(neighbor_boxes, neighbor_count), pshift);
             }
-            
+
             neighbor_procs[neighbor_count] = proc_id;
             neighbor_ids[neighbor_count] = id;
             neighbor_shifts[neighbor_count] = k;
@@ -572,7 +575,7 @@ hypre_CreateCommInfoFromStencil( hypre_StructGrid      *grid,
          hypre_BoxArraySetSize(neighbor_boxes, neighbor_count);
 
          hypre_TFree(entries, HYPRE_MEMORY_HOST);
-  
+
       } /* end of loop through periods k */
 
       /* Now we have a list of all of the neighbors for box i! */
@@ -581,8 +584,8 @@ hypre_CreateCommInfoFromStencil( hypre_StructGrid      *grid,
          different intersections (TO DO: put more thought into if there are ever
          any exceptions to this? - the intersection routine already eliminates
          duplicates - so what i mean is eliminating duplicates from multiple
-         intersection calls in periodic case)  */  
-    
+         intersection calls in periodic case)  */
+
       /*------------------------------------------------
        * Compute recv_box_array for box i
        *------------------------------------------------*/
@@ -593,7 +596,7 @@ hypre_CreateCommInfoFromStencil( hypre_StructGrid      *grid,
       if (neighbor_count > cbox_alloc)
       {
          cbox_alloc = neighbor_count;
-         cboxes_neighbor_location = hypre_TReAlloc(cboxes_neighbor_location,  
+         cboxes_neighbor_location = hypre_TReAlloc(cboxes_neighbor_location,
                                                    HYPRE_Int,  cbox_alloc, HYPRE_MEMORY_HOST);
          cboxes = hypre_TReAlloc(cboxes,  hypre_Box *,  cbox_alloc, HYPRE_MEMORY_HOST);
          cboxes_mem = hypre_TReAlloc(cboxes_mem,  hypre_Box,  cbox_alloc, HYPRE_MEMORY_HOST);
@@ -605,7 +608,7 @@ hypre_CreateCommInfoFromStencil( hypre_StructGrid      *grid,
          we need to (positive) shift it back. */
 
       num_cboxes = 0;
-      
+
       for (k = 0; k < neighbor_count; k++)
       {
          hood_box = hypre_BoxArrayBox(neighbor_boxes, k);
@@ -613,7 +616,7 @@ hypre_CreateCommInfoFromStencil( hypre_StructGrid      *grid,
          for (d = 0; d < ndim; d++)
          {
             sgindex[d] = 1;
-               
+
             s = hypre_BoxIMinD(hood_box, d) - hypre_BoxIMaxD(box, d);
             if (s > 0)
             {
@@ -625,8 +628,8 @@ hypre_CreateCommInfoFromStencil( hypre_StructGrid      *grid,
                sgindex[d] = 0;
             }
          }
-         /* it makes sense only if we have at least one non-zero entry */   
-         si = hypre_BoxIndexRank(stencil_box, sgindex); 
+         /* it makes sense only if we have at least one non-zero entry */
+         si = hypre_BoxIndexRank(stencil_box, sgindex);
          if (stencil_grid[si])
          {
             /* intersect - result is int_box */
@@ -687,7 +690,7 @@ hypre_CreateCommInfoFromStencil( hypre_StructGrid      *grid,
          for (d = 0; d < ndim; d++)
          {
             sgindex[d] = 1;
-            
+
             s = hypre_BoxIMinD(box, d) - hypre_BoxIMaxD(hood_box, d);
             if (s > 0)
             {
@@ -699,8 +702,8 @@ hypre_CreateCommInfoFromStencil( hypre_StructGrid      *grid,
                sgindex[d] = 0;
             }
          }
-         /* it makes sense only if we have at least one non-zero entry */   
-         si = hypre_BoxIndexRank(stencil_box, sgindex); 
+         /* it makes sense only if we have at least one non-zero entry */
+         si = hypre_BoxIndexRank(stencil_box, sgindex);
          if (stencil_grid[si])
          {
             /* grow the neighbor box and intersect */
@@ -765,7 +768,7 @@ hypre_CreateCommInfoFromStencil( hypre_StructGrid      *grid,
    hypre_BoxDestroy(int_box);
    hypre_BoxDestroy(periodic_box);
    hypre_BoxDestroy(extend_box);
-   
+
    hypre_BoxDestroy(stencil_box);
    hypre_BoxDestroy(sbox);
    hypre_TFree(stencil_grid, HYPRE_MEMORY_HOST);
@@ -800,13 +803,13 @@ hypre_CreateCommInfoFromNumGhost( hypre_StructGrid      *grid,
    hypre_IndexRef        start;
    HYPRE_Int             i, d, size;
 
-   size = (HYPRE_Int)(pow(3, ndim) + 0.5);
+   size = (HYPRE_Int)(pow(3.0, ndim) + 0.5);
    stencil_shape = hypre_CTAlloc(hypre_Index,  size, HYPRE_MEMORY_HOST);
    box = hypre_BoxCreate(ndim);
    for (d = 0; d < ndim; d++)
    {
-      hypre_BoxIMinD(box, d) = -(num_ghost[2*d]   ? 1 : 0);
-      hypre_BoxIMaxD(box, d) =  (num_ghost[2*d+1] ? 1 : 0);
+      hypre_BoxIMinD(box, d) = -(num_ghost[2 * d]   ? 1 : 0);
+      hypre_BoxIMaxD(box, d) =  (num_ghost[2 * d + 1] ? 1 : 0);
    }
 
    size = 0;
@@ -817,14 +820,14 @@ hypre_CreateCommInfoFromNumGhost( hypre_StructGrid      *grid,
       zypre_BoxLoopGetIndex(ii);
       for (d = 0; d < ndim; d++)
       {
-         i = ii[d]+start[d];
+         i = ii[d] + start[d];
          if (i < 0)
          {
-            stencil_shape[size][d] = -num_ghost[2*d];
+            stencil_shape[size][d] = -num_ghost[2 * d];
          }
          else if (i > 0)
          {
-            stencil_shape[size][d] =  num_ghost[2*d+1];
+            stencil_shape[size][d] =  num_ghost[2 * d + 1];
          }
       }
       size++;
@@ -883,12 +886,12 @@ hypre_CreateCommInfoFromGrids( hypre_StructGrid      *from_grid,
    /*------------------------------------------------------
     * Set up communication info
     *------------------------------------------------------*/
- 
+
    ndim = hypre_StructGridNDim(from_grid);
 
    for (r = 0; r < 2; r++)
    {
-      switch(r)
+      switch (r)
       {
          case 0:
             local_grid  = from_grid;
@@ -939,16 +942,16 @@ hypre_CreateCommInfoFromGrids( hypre_StructGrid      *from_grid,
                k = hypre_BoxArraySize(comm_box_array);
                comm_procs[i][k] = remote_all_procs[j];
                comm_boxnums[i][k] = remote_all_boxnums[j];
-                     
+
                hypre_AppendBox(comm_box, comm_box_array);
             }
          }
 
          comm_procs[i] =
-            hypre_TReAlloc(comm_procs[i], 
+            hypre_TReAlloc(comm_procs[i],
                            HYPRE_Int,  hypre_BoxArraySize(comm_box_array), HYPRE_MEMORY_HOST);
          comm_boxnums[i] =
-            hypre_TReAlloc(comm_boxnums[i], 
+            hypre_TReAlloc(comm_boxnums[i],
                            HYPRE_Int,  hypre_BoxArraySize(comm_box_array), HYPRE_MEMORY_HOST);
       }
       hypre_BoxDestroy(comm_box);
@@ -957,7 +960,7 @@ hypre_CreateCommInfoFromGrids( hypre_StructGrid      *from_grid,
       hypre_TFree(remote_all_procs, HYPRE_MEMORY_HOST);
       hypre_TFree(remote_all_boxnums, HYPRE_MEMORY_HOST);
 
-      switch(r)
+      switch (r)
       {
          case 0:
             send_boxes = comm_boxes;
diff --git a/external/hypre/src/struct_mv/computation.c b/external/hypre/src/struct_mv/computation.c
index e357fde7..6677f46d 100644
--- a/external/hypre/src/struct_mv/computation.c
+++ b/external/hypre/src/struct_mv/computation.c
@@ -1,12 +1,12 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
  ******************************************************************************/
 
 /******************************************************************************
- * 
+ *
  *****************************************************************************/
 
 #include "_hypre_struct_mv.h"
@@ -172,7 +172,7 @@ hypre_CreateComputeInfo( hypre_StructGrid      *grid,
    hypre_ForBoxI(i, boxes)
    {
       cbox_array = hypre_BoxArrayArrayBoxArray(dept_boxes, i);
-      hypre_BoxArraySetSize(cbox_array, 2*ndim);
+      hypre_BoxArraySetSize(cbox_array, 2 * ndim);
 
       hypre_CopyBox(hypre_BoxArrayBox(boxes, i), rembox);
       cbox_array_size = 0;
@@ -288,7 +288,7 @@ hypre_ComputePkgCreate( hypre_ComputeInfo     *compute_info,
    hypre_CommInfoDestroy(hypre_ComputeInfoCommInfo(compute_info));
    hypre_ComputePkgCommPkg(compute_pkg) = comm_pkg;
 
-   hypre_ComputePkgIndtBoxes(compute_pkg) = 
+   hypre_ComputePkgIndtBoxes(compute_pkg) =
       hypre_ComputeInfoIndtBoxes(compute_info);
    hypre_ComputePkgDeptBoxes(compute_pkg) =
       hypre_ComputeInfoDeptBoxes(compute_info);
diff --git a/external/hypre/src/struct_mv/computation.h b/external/hypre/src/struct_mv/computation.h
index 49ef9155..eed2d7bd 100644
--- a/external/hypre/src/struct_mv/computation.h
+++ b/external/hypre/src/struct_mv/computation.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -50,7 +50,7 @@ typedef struct hypre_ComputePkg_struct
 /*--------------------------------------------------------------------------
  * Accessor macros: hypre_ComputeInfo
  *--------------------------------------------------------------------------*/
- 
+
 #define hypre_ComputeInfoCommInfo(info)     (info -> comm_info)
 #define hypre_ComputeInfoIndtBoxes(info)    (info -> indt_boxes)
 #define hypre_ComputeInfoDeptBoxes(info)    (info -> dept_boxes)
@@ -59,7 +59,7 @@ typedef struct hypre_ComputePkg_struct
 /*--------------------------------------------------------------------------
  * Accessor macros: hypre_ComputePkg
  *--------------------------------------------------------------------------*/
- 
+
 #define hypre_ComputePkgCommPkg(compute_pkg)      (compute_pkg -> comm_pkg)
 
 #define hypre_ComputePkgIndtBoxes(compute_pkg)    (compute_pkg -> indt_boxes)
diff --git a/external/hypre/src/struct_mv/headers b/external/hypre/src/struct_mv/headers
old mode 100644
new mode 100755
index 645f39c4..0e3b688f
--- a/external/hypre/src/struct_mv/headers
+++ b/external/hypre/src/struct_mv/headers
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -51,25 +51,8 @@ cat protos.h               >> $INTERNAL_HEADER
 #===========================================================================
 # BoxLoops
 #===========================================================================
-
-cat >> $INTERNAL_HEADER <<@
-
-#if defined(HYPRE_USING_DEVICE_OPENMP)
-@
-
-cat boxloop_omp_device.h          >> $INTERNAL_HEADER
-
-cat >> $INTERNAL_HEADER <<@
-
-#elif !defined(HYPRE_USING_RAJA) && !defined(HYPRE_USING_KOKKOS) && !defined(HYPRE_USING_CUDA) && !defined(HYPRE_USING_HIP)
-@
-
-cat boxloop_host.h                >> $INTERNAL_HEADER
-
-cat >> $INTERNAL_HEADER <<@
-
-#endif
-@
+cat boxloop_omp_device.h   >> $INTERNAL_HEADER
+cat boxloop_host.h         >> $INTERNAL_HEADER
 
 #===========================================================================
 # Include guards
@@ -114,31 +97,10 @@ extern "C++" {
 # BoxLoops
 #===========================================================================
 
-cat >> $INTERNAL_HEADER <<@
-
-#if defined(HYPRE_USING_RAJA)
-@
-
-cat boxloop_raja.h                >> $INTERNAL_HEADER
-
-cat >> $INTERNAL_HEADER <<@
-
-#elif defined(HYPRE_USING_KOKKOS)
-@
-
-cat boxloop_kokkos.h              >> $INTERNAL_HEADER
-
-cat >> $INTERNAL_HEADER <<@
-
-#elif defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-@
-
-cat boxloop_cuda.h                >> $INTERNAL_HEADER
-
-cat >> $INTERNAL_HEADER <<@
-
-#endif
-@
+cat boxloop_raja.h         >> $INTERNAL_HEADER
+cat boxloop_kokkos.h       >> $INTERNAL_HEADER
+cat boxloop_cuda.h         >> $INTERNAL_HEADER
+cat boxloop_sycl.h         >> $INTERNAL_HEADER
 
 #===========================================================================
 # Include guards
diff --git a/external/hypre/src/struct_mv/project.c b/external/hypre/src/struct_mv/project.c
index c1604926..3aad2200 100644
--- a/external/hypre/src/struct_mv/project.c
+++ b/external/hypre/src/struct_mv/project.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -42,14 +42,22 @@ hypre_ProjectBox( hypre_Box    *box,
       hu = hypre_BoxIMaxD(box, d) - i;
 
       if ( hl <= 0 )
+      {
          kl = (HYPRE_Int) (hl / s);
+      }
       else
-         kl = (HYPRE_Int) ((hl + (s-1)) / s);
+      {
+         kl = (HYPRE_Int) ((hl + (s - 1)) / s);
+      }
 
       if ( hu >= 0 )
+      {
          ku = (HYPRE_Int) (hu / s);
+      }
       else
-         ku = (HYPRE_Int) ((hu - (s-1)) / s);
+      {
+         ku = (HYPRE_Int) ((hu - (s - 1)) / s);
+      }
 
       hypre_BoxIMinD(box, d) = i + kl * s;
       hypre_BoxIMaxD(box, d) = i + ku * s;
diff --git a/external/hypre/src/struct_mv/protos.h b/external/hypre/src/struct_mv/protos.h
index 9c5ae4a4..640a1c5d 100644
--- a/external/hypre/src/struct_mv/protos.h
+++ b/external/hypre/src/struct_mv/protos.h
@@ -1,305 +1,454 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
  ******************************************************************************/
 
 /* assumed_part.c */
-HYPRE_Int hypre_APSubdivideRegion ( hypre_Box *region , HYPRE_Int dim , HYPRE_Int level , hypre_BoxArray *box_array , HYPRE_Int *num_new_boxes );
-HYPRE_Int hypre_APFindMyBoxesInRegions ( hypre_BoxArray *region_array , hypre_BoxArray *my_box_array , HYPRE_Int **p_count_array , HYPRE_Real **p_vol_array );
-HYPRE_Int hypre_APGetAllBoxesInRegions ( hypre_BoxArray *region_array , hypre_BoxArray *my_box_array , HYPRE_Int **p_count_array , HYPRE_Real **p_vol_array , MPI_Comm comm );
-HYPRE_Int hypre_APShrinkRegions ( hypre_BoxArray *region_array , hypre_BoxArray *my_box_array , MPI_Comm comm );
-HYPRE_Int hypre_APPruneRegions ( hypre_BoxArray *region_array , HYPRE_Int **p_count_array , HYPRE_Real **p_vol_array );
-HYPRE_Int hypre_APRefineRegionsByVol ( hypre_BoxArray *region_array , HYPRE_Real *vol_array , HYPRE_Int max_regions , HYPRE_Real gamma , HYPRE_Int dim , HYPRE_Int *return_code , MPI_Comm comm );
-HYPRE_Int hypre_StructAssumedPartitionCreate ( HYPRE_Int dim , hypre_Box *bounding_box , HYPRE_Real global_boxes_size , HYPRE_Int global_num_boxes , hypre_BoxArray *local_boxes , HYPRE_Int *local_boxnums , HYPRE_Int max_regions , HYPRE_Int max_refinements , HYPRE_Real gamma , MPI_Comm comm , hypre_StructAssumedPart **p_assumed_partition );
+HYPRE_Int hypre_APSubdivideRegion ( hypre_Box *region, HYPRE_Int dim, HYPRE_Int level,
+                                    hypre_BoxArray *box_array, HYPRE_Int *num_new_boxes );
+HYPRE_Int hypre_APFindMyBoxesInRegions ( hypre_BoxArray *region_array, hypre_BoxArray *my_box_array,
+                                         HYPRE_Int **p_count_array, HYPRE_Real **p_vol_array );
+HYPRE_Int hypre_APGetAllBoxesInRegions ( hypre_BoxArray *region_array, hypre_BoxArray *my_box_array,
+                                         HYPRE_Int **p_count_array, HYPRE_Real **p_vol_array, MPI_Comm comm );
+HYPRE_Int hypre_APShrinkRegions ( hypre_BoxArray *region_array, hypre_BoxArray *my_box_array,
+                                  MPI_Comm comm );
+HYPRE_Int hypre_APPruneRegions ( hypre_BoxArray *region_array, HYPRE_Int **p_count_array,
+                                 HYPRE_Real **p_vol_array );
+HYPRE_Int hypre_APRefineRegionsByVol ( hypre_BoxArray *region_array, HYPRE_Real *vol_array,
+                                       HYPRE_Int max_regions, HYPRE_Real gamma, HYPRE_Int dim, HYPRE_Int *return_code, MPI_Comm comm );
+HYPRE_Int hypre_StructAssumedPartitionCreate ( HYPRE_Int dim, hypre_Box *bounding_box,
+                                               HYPRE_Real global_boxes_size, HYPRE_Int global_num_boxes, hypre_BoxArray *local_boxes,
+                                               HYPRE_Int *local_boxnums, HYPRE_Int max_regions, HYPRE_Int max_refinements, HYPRE_Real gamma,
+                                               MPI_Comm comm, hypre_StructAssumedPart **p_assumed_partition );
 HYPRE_Int hypre_StructAssumedPartitionDestroy ( hypre_StructAssumedPart *assumed_part );
-HYPRE_Int hypre_APFillResponseStructAssumedPart ( void *p_recv_contact_buf , HYPRE_Int contact_size , HYPRE_Int contact_proc , void *ro , MPI_Comm comm , void **p_send_response_buf , HYPRE_Int *response_message_size );
-HYPRE_Int hypre_StructAssumedPartitionGetRegionsFromProc ( hypre_StructAssumedPart *assumed_part , HYPRE_Int proc_id , hypre_BoxArray *assumed_regions );
-HYPRE_Int hypre_StructAssumedPartitionGetProcsFromBox ( hypre_StructAssumedPart *assumed_part , hypre_Box *box , HYPRE_Int *num_proc_array , HYPRE_Int *size_alloc_proc_array , HYPRE_Int **p_proc_array );
+HYPRE_Int hypre_APFillResponseStructAssumedPart ( void *p_recv_contact_buf, HYPRE_Int contact_size,
+                                                  HYPRE_Int contact_proc, void *ro, MPI_Comm comm, void **p_send_response_buf,
+                                                  HYPRE_Int *response_message_size );
+HYPRE_Int hypre_StructAssumedPartitionGetRegionsFromProc ( hypre_StructAssumedPart *assumed_part,
+                                                           HYPRE_Int proc_id, hypre_BoxArray *assumed_regions );
+HYPRE_Int hypre_StructAssumedPartitionGetProcsFromBox ( hypre_StructAssumedPart *assumed_part,
+                                                        hypre_Box *box, HYPRE_Int *num_proc_array, HYPRE_Int *size_alloc_proc_array,
+                                                        HYPRE_Int **p_proc_array );
 
 /* box_algebra.c */
-HYPRE_Int hypre_IntersectBoxes ( hypre_Box *box1 , hypre_Box *box2 , hypre_Box *ibox );
-HYPRE_Int hypre_SubtractBoxes ( hypre_Box *box1 , hypre_Box *box2 , hypre_BoxArray *box_array );
-HYPRE_Int hypre_SubtractBoxArrays ( hypre_BoxArray *box_array1 , hypre_BoxArray *box_array2 , hypre_BoxArray *tmp_box_array );
+HYPRE_Int hypre_IntersectBoxes ( hypre_Box *box1, hypre_Box *box2, hypre_Box *ibox );
+HYPRE_Int hypre_SubtractBoxes ( hypre_Box *box1, hypre_Box *box2, hypre_BoxArray *box_array );
+HYPRE_Int hypre_SubtractBoxArrays ( hypre_BoxArray *box_array1, hypre_BoxArray *box_array2,
+                                    hypre_BoxArray *tmp_box_array );
 HYPRE_Int hypre_UnionBoxes ( hypre_BoxArray *boxes );
 HYPRE_Int hypre_MinUnionBoxes ( hypre_BoxArray *boxes );
 
 /* box_boundary.c */
-HYPRE_Int hypre_BoxBoundaryIntersect ( hypre_Box *box , hypre_StructGrid *grid , HYPRE_Int d , HYPRE_Int dir , hypre_BoxArray *boundary );
-HYPRE_Int hypre_BoxBoundaryG ( hypre_Box *box , hypre_StructGrid *g , hypre_BoxArray *boundary );
-HYPRE_Int hypre_BoxBoundaryDG ( hypre_Box *box , hypre_StructGrid *g , hypre_BoxArray *boundarym , hypre_BoxArray *boundaryp , HYPRE_Int d );
-HYPRE_Int hypre_GeneralBoxBoundaryIntersect( hypre_Box *box, hypre_StructGrid *grid, hypre_Index stencil_element, hypre_BoxArray *boundary );
+HYPRE_Int hypre_BoxBoundaryIntersect ( hypre_Box *box, hypre_StructGrid *grid, HYPRE_Int d,
+                                       HYPRE_Int dir, hypre_BoxArray *boundary );
+HYPRE_Int hypre_BoxBoundaryG ( hypre_Box *box, hypre_StructGrid *g, hypre_BoxArray *boundary );
+HYPRE_Int hypre_BoxBoundaryDG ( hypre_Box *box, hypre_StructGrid *g, hypre_BoxArray *boundarym,
+                                hypre_BoxArray *boundaryp, HYPRE_Int d );
+HYPRE_Int hypre_GeneralBoxBoundaryIntersect( hypre_Box *box, hypre_StructGrid *grid,
+                                             hypre_Index stencil_element, hypre_BoxArray *boundary );
 
 /* box.c */
-HYPRE_Int hypre_SetIndex ( hypre_Index index , HYPRE_Int val );
-HYPRE_Int hypre_CopyIndex( hypre_Index in_index , hypre_Index out_index );
-HYPRE_Int hypre_CopyToCleanIndex( hypre_Index in_index , HYPRE_Int ndim , hypre_Index out_index );
-HYPRE_Int hypre_IndexEqual ( hypre_Index index , HYPRE_Int val , HYPRE_Int ndim );
-HYPRE_Int hypre_IndexMin( hypre_Index index , HYPRE_Int ndim );
-HYPRE_Int hypre_IndexMax( hypre_Index index , HYPRE_Int ndim );
-HYPRE_Int hypre_AddIndexes ( hypre_Index index1 , hypre_Index index2 , HYPRE_Int ndim , hypre_Index result );
-HYPRE_Int hypre_SubtractIndexes ( hypre_Index index1 , hypre_Index index2 , HYPRE_Int ndim , hypre_Index result );
-HYPRE_Int hypre_IndexesEqual ( hypre_Index index1 , hypre_Index index2 , HYPRE_Int ndim );
+HYPRE_Int hypre_SetIndex ( hypre_Index index, HYPRE_Int val );
+HYPRE_Int hypre_CopyIndex( hypre_Index in_index, hypre_Index out_index );
+HYPRE_Int hypre_CopyToCleanIndex( hypre_Index in_index, HYPRE_Int ndim, hypre_Index out_index );
+HYPRE_Int hypre_IndexEqual ( hypre_Index index, HYPRE_Int val, HYPRE_Int ndim );
+HYPRE_Int hypre_IndexMin( hypre_Index index, HYPRE_Int ndim );
+HYPRE_Int hypre_IndexMax( hypre_Index index, HYPRE_Int ndim );
+HYPRE_Int hypre_AddIndexes ( hypre_Index index1, hypre_Index index2, HYPRE_Int ndim,
+                             hypre_Index result );
+HYPRE_Int hypre_SubtractIndexes ( hypre_Index index1, hypre_Index index2, HYPRE_Int ndim,
+                                  hypre_Index result );
+HYPRE_Int hypre_IndexesEqual ( hypre_Index index1, hypre_Index index2, HYPRE_Int ndim );
+HYPRE_Int hypre_IndexPrint ( FILE *file, HYPRE_Int ndim, hypre_Index index );
+HYPRE_Int hypre_IndexRead ( FILE *file, HYPRE_Int ndim, hypre_Index index );
 hypre_Box *hypre_BoxCreate ( HYPRE_Int ndim );
 HYPRE_Int hypre_BoxDestroy ( hypre_Box *box );
-HYPRE_Int hypre_BoxInit( hypre_Box *box , HYPRE_Int  ndim );
-HYPRE_Int hypre_BoxSetExtents ( hypre_Box *box , hypre_Index imin , hypre_Index imax );
-HYPRE_Int hypre_CopyBox( hypre_Box *box1 , hypre_Box *box2 );
+HYPRE_Int hypre_BoxInit( hypre_Box *box, HYPRE_Int  ndim );
+HYPRE_Int hypre_BoxSetExtents ( hypre_Box *box, hypre_Index imin, hypre_Index imax );
+HYPRE_Int hypre_CopyBox( hypre_Box *box1, hypre_Box *box2 );
 hypre_Box *hypre_BoxDuplicate ( hypre_Box *box );
 HYPRE_Int hypre_BoxVolume( hypre_Box *box );
 HYPRE_Real hypre_doubleBoxVolume( hypre_Box *box );
-HYPRE_Int hypre_IndexInBox ( hypre_Index index , hypre_Box *box );
-HYPRE_Int hypre_BoxGetSize ( hypre_Box *box , hypre_Index size );
-HYPRE_Int hypre_BoxGetStrideSize ( hypre_Box *box , hypre_Index stride , hypre_Index size );
-HYPRE_Int hypre_BoxGetStrideVolume ( hypre_Box *box , hypre_Index stride , HYPRE_Int *volume_ptr );
-HYPRE_Int hypre_BoxIndexRank( hypre_Box *box , hypre_Index index );
-HYPRE_Int hypre_BoxRankIndex( hypre_Box *box , HYPRE_Int rank , hypre_Index index );
-HYPRE_Int hypre_BoxOffsetDistance( hypre_Box *box , hypre_Index index );
-HYPRE_Int hypre_BoxShiftPos( hypre_Box *box , hypre_Index shift );
-HYPRE_Int hypre_BoxShiftNeg( hypre_Box *box , hypre_Index shift );
-HYPRE_Int hypre_BoxGrowByIndex( hypre_Box *box , hypre_Index  index );
-HYPRE_Int hypre_BoxGrowByValue( hypre_Box *box , HYPRE_Int val );
-HYPRE_Int hypre_BoxGrowByArray ( hypre_Box *box , HYPRE_Int *array );
-hypre_BoxArray *hypre_BoxArrayCreate ( HYPRE_Int size , HYPRE_Int ndim );
+HYPRE_Int hypre_IndexInBox ( hypre_Index index, hypre_Box *box );
+HYPRE_Int hypre_BoxGetSize ( hypre_Box *box, hypre_Index size );
+HYPRE_Int hypre_BoxGetStrideSize ( hypre_Box *box, hypre_Index stride, hypre_Index size );
+HYPRE_Int hypre_BoxGetStrideVolume ( hypre_Box *box, hypre_Index stride, HYPRE_Int *volume_ptr );
+HYPRE_Int hypre_BoxIndexRank( hypre_Box *box, hypre_Index index );
+HYPRE_Int hypre_BoxRankIndex( hypre_Box *box, HYPRE_Int rank, hypre_Index index );
+HYPRE_Int hypre_BoxOffsetDistance( hypre_Box *box, hypre_Index index );
+HYPRE_Int hypre_BoxShiftPos( hypre_Box *box, hypre_Index shift );
+HYPRE_Int hypre_BoxShiftNeg( hypre_Box *box, hypre_Index shift );
+HYPRE_Int hypre_BoxGrowByIndex( hypre_Box *box, hypre_Index  index );
+HYPRE_Int hypre_BoxGrowByValue( hypre_Box *box, HYPRE_Int val );
+HYPRE_Int hypre_BoxGrowByArray ( hypre_Box *box, HYPRE_Int *array );
+HYPRE_Int hypre_BoxPrint ( FILE *file, hypre_Box *box );
+HYPRE_Int hypre_BoxRead ( FILE *file, HYPRE_Int ndim, hypre_Box **box_ptr );
+hypre_BoxArray *hypre_BoxArrayCreate ( HYPRE_Int size, HYPRE_Int ndim );
 HYPRE_Int hypre_BoxArrayDestroy ( hypre_BoxArray *box_array );
-HYPRE_Int hypre_BoxArraySetSize ( hypre_BoxArray *box_array , HYPRE_Int size );
+HYPRE_Int hypre_BoxArraySetSize ( hypre_BoxArray *box_array, HYPRE_Int size );
 hypre_BoxArray *hypre_BoxArrayDuplicate ( hypre_BoxArray *box_array );
-HYPRE_Int hypre_AppendBox ( hypre_Box *box , hypre_BoxArray *box_array );
-HYPRE_Int hypre_DeleteBox ( hypre_BoxArray *box_array , HYPRE_Int index );
-HYPRE_Int hypre_DeleteMultipleBoxes ( hypre_BoxArray *box_array , HYPRE_Int *indices , HYPRE_Int num );
-HYPRE_Int hypre_AppendBoxArray ( hypre_BoxArray *box_array_0 , hypre_BoxArray *box_array_1 );
-hypre_BoxArrayArray *hypre_BoxArrayArrayCreate ( HYPRE_Int size , HYPRE_Int ndim );
+HYPRE_Int hypre_AppendBox ( hypre_Box *box, hypre_BoxArray *box_array );
+HYPRE_Int hypre_DeleteBox ( hypre_BoxArray *box_array, HYPRE_Int index );
+HYPRE_Int hypre_DeleteMultipleBoxes ( hypre_BoxArray *box_array, HYPRE_Int *indices,
+                                      HYPRE_Int num );
+HYPRE_Int hypre_AppendBoxArray ( hypre_BoxArray *box_array_0, hypre_BoxArray *box_array_1 );
+hypre_BoxArrayArray *hypre_BoxArrayArrayCreate ( HYPRE_Int size, HYPRE_Int ndim );
 HYPRE_Int hypre_BoxArrayArrayDestroy ( hypre_BoxArrayArray *box_array_array );
 hypre_BoxArrayArray *hypre_BoxArrayArrayDuplicate ( hypre_BoxArrayArray *box_array_array );
 
 /* box_manager.c */
-HYPRE_Int hypre_BoxManEntryGetInfo ( hypre_BoxManEntry *entry , void **info_ptr );
-HYPRE_Int hypre_BoxManEntryGetExtents ( hypre_BoxManEntry *entry , hypre_Index imin , hypre_Index imax );
-HYPRE_Int hypre_BoxManEntryCopy ( hypre_BoxManEntry *fromentry , hypre_BoxManEntry *toentry );
-HYPRE_Int hypre_BoxManSetAllGlobalKnown ( hypre_BoxManager *manager , HYPRE_Int known );
-HYPRE_Int hypre_BoxManGetAllGlobalKnown ( hypre_BoxManager *manager , HYPRE_Int *known );
-HYPRE_Int hypre_BoxManSetIsEntriesSort ( hypre_BoxManager *manager , HYPRE_Int is_sort );
-HYPRE_Int hypre_BoxManGetIsEntriesSort ( hypre_BoxManager *manager , HYPRE_Int *is_sort );
-HYPRE_Int hypre_BoxManGetGlobalIsGatherCalled ( hypre_BoxManager *manager , MPI_Comm comm , HYPRE_Int *is_gather );
-HYPRE_Int hypre_BoxManGetAssumedPartition ( hypre_BoxManager *manager , hypre_StructAssumedPart **assumed_partition );
-HYPRE_Int hypre_BoxManSetAssumedPartition ( hypre_BoxManager *manager , hypre_StructAssumedPart *assumed_partition );
-HYPRE_Int hypre_BoxManSetBoundingBox ( hypre_BoxManager *manager , hypre_Box *bounding_box );
-HYPRE_Int hypre_BoxManSetNumGhost ( hypre_BoxManager *manager , HYPRE_Int *num_ghost );
-HYPRE_Int hypre_BoxManDeleteMultipleEntriesAndInfo ( hypre_BoxManager *manager , HYPRE_Int *indices , HYPRE_Int num );
-HYPRE_Int hypre_BoxManCreate ( HYPRE_Int max_nentries , HYPRE_Int info_size , HYPRE_Int dim , hypre_Box *bounding_box , MPI_Comm comm , hypre_BoxManager **manager_ptr );
-HYPRE_Int hypre_BoxManIncSize ( hypre_BoxManager *manager , HYPRE_Int inc_size );
+HYPRE_Int hypre_BoxManEntryGetInfo ( hypre_BoxManEntry *entry, void **info_ptr );
+HYPRE_Int hypre_BoxManEntryGetExtents ( hypre_BoxManEntry *entry, hypre_Index imin,
+                                        hypre_Index imax );
+HYPRE_Int hypre_BoxManEntryCopy ( hypre_BoxManEntry *fromentry, hypre_BoxManEntry *toentry );
+HYPRE_Int hypre_BoxManSetAllGlobalKnown ( hypre_BoxManager *manager, HYPRE_Int known );
+HYPRE_Int hypre_BoxManGetAllGlobalKnown ( hypre_BoxManager *manager, HYPRE_Int *known );
+HYPRE_Int hypre_BoxManSetIsEntriesSort ( hypre_BoxManager *manager, HYPRE_Int is_sort );
+HYPRE_Int hypre_BoxManGetIsEntriesSort ( hypre_BoxManager *manager, HYPRE_Int *is_sort );
+HYPRE_Int hypre_BoxManGetGlobalIsGatherCalled ( hypre_BoxManager *manager, MPI_Comm comm,
+                                                HYPRE_Int *is_gather );
+HYPRE_Int hypre_BoxManGetAssumedPartition ( hypre_BoxManager *manager,
+                                            hypre_StructAssumedPart **assumed_partition );
+HYPRE_Int hypre_BoxManSetAssumedPartition ( hypre_BoxManager *manager,
+                                            hypre_StructAssumedPart *assumed_partition );
+HYPRE_Int hypre_BoxManSetBoundingBox ( hypre_BoxManager *manager, hypre_Box *bounding_box );
+HYPRE_Int hypre_BoxManSetNumGhost ( hypre_BoxManager *manager, HYPRE_Int *num_ghost );
+HYPRE_Int hypre_BoxManDeleteMultipleEntriesAndInfo ( hypre_BoxManager *manager, HYPRE_Int *indices,
+                                                     HYPRE_Int num );
+HYPRE_Int hypre_BoxManCreate ( HYPRE_Int max_nentries, HYPRE_Int info_size, HYPRE_Int dim,
+                               hypre_Box *bounding_box, MPI_Comm comm, hypre_BoxManager **manager_ptr );
+HYPRE_Int hypre_BoxManIncSize ( hypre_BoxManager *manager, HYPRE_Int inc_size );
 HYPRE_Int hypre_BoxManDestroy ( hypre_BoxManager *manager );
-HYPRE_Int hypre_BoxManAddEntry ( hypre_BoxManager *manager , hypre_Index imin , hypre_Index imax , HYPRE_Int proc_id , HYPRE_Int box_id , void *info );
-HYPRE_Int hypre_BoxManGetEntry ( hypre_BoxManager *manager , HYPRE_Int proc , HYPRE_Int id , hypre_BoxManEntry **entry_ptr );
-HYPRE_Int hypre_BoxManGetAllEntries ( hypre_BoxManager *manager , HYPRE_Int *num_entries , hypre_BoxManEntry **entries );
-HYPRE_Int hypre_BoxManGetAllEntriesBoxes ( hypre_BoxManager *manager , hypre_BoxArray *boxes );
-HYPRE_Int hypre_BoxManGetLocalEntriesBoxes ( hypre_BoxManager *manager , hypre_BoxArray *boxes );
-HYPRE_Int hypre_BoxManGetAllEntriesBoxesProc ( hypre_BoxManager *manager , hypre_BoxArray *boxes , HYPRE_Int **procs_ptr );
-HYPRE_Int hypre_BoxManGatherEntries ( hypre_BoxManager *manager , hypre_Index imin , hypre_Index imax );
+HYPRE_Int hypre_BoxManAddEntry ( hypre_BoxManager *manager, hypre_Index imin, hypre_Index imax,
+                                 HYPRE_Int proc_id, HYPRE_Int box_id, void *info );
+HYPRE_Int hypre_BoxManGetEntry ( hypre_BoxManager *manager, HYPRE_Int proc, HYPRE_Int id,
+                                 hypre_BoxManEntry **entry_ptr );
+HYPRE_Int hypre_BoxManGetAllEntries ( hypre_BoxManager *manager, HYPRE_Int *num_entries,
+                                      hypre_BoxManEntry **entries );
+HYPRE_Int hypre_BoxManGetAllEntriesBoxes ( hypre_BoxManager *manager, hypre_BoxArray *boxes );
+HYPRE_Int hypre_BoxManGetLocalEntriesBoxes ( hypre_BoxManager *manager, hypre_BoxArray *boxes );
+HYPRE_Int hypre_BoxManGetAllEntriesBoxesProc ( hypre_BoxManager *manager, hypre_BoxArray *boxes,
+                                               HYPRE_Int **procs_ptr );
+HYPRE_Int hypre_BoxManGatherEntries ( hypre_BoxManager *manager, hypre_Index imin,
+                                      hypre_Index imax );
 HYPRE_Int hypre_BoxManAssemble ( hypre_BoxManager *manager );
-HYPRE_Int hypre_BoxManIntersect ( hypre_BoxManager *manager , hypre_Index ilower , hypre_Index iupper , hypre_BoxManEntry ***entries_ptr , HYPRE_Int *nentries_ptr );
-HYPRE_Int hypre_FillResponseBoxManAssemble1 ( void *p_recv_contact_buf , HYPRE_Int contact_size , HYPRE_Int contact_proc , void *ro , MPI_Comm comm , void **p_send_response_buf , HYPRE_Int *response_message_size );
-HYPRE_Int hypre_FillResponseBoxManAssemble2 ( void *p_recv_contact_buf , HYPRE_Int contact_size , HYPRE_Int contact_proc , void *ro , MPI_Comm comm , void **p_send_response_buf , HYPRE_Int *response_message_size );
+HYPRE_Int hypre_BoxManIntersect ( hypre_BoxManager *manager, hypre_Index ilower, hypre_Index iupper,
+                                  hypre_BoxManEntry ***entries_ptr, HYPRE_Int *nentries_ptr );
+HYPRE_Int hypre_FillResponseBoxManAssemble1 ( void *p_recv_contact_buf, HYPRE_Int contact_size,
+                                              HYPRE_Int contact_proc, void *ro, MPI_Comm comm, void **p_send_response_buf,
+                                              HYPRE_Int *response_message_size );
+HYPRE_Int hypre_FillResponseBoxManAssemble2 ( void *p_recv_contact_buf, HYPRE_Int contact_size,
+                                              HYPRE_Int contact_proc, void *ro, MPI_Comm comm, void **p_send_response_buf,
+                                              HYPRE_Int *response_message_size );
 
 /* communication_info.c */
-HYPRE_Int hypre_CommInfoCreate ( hypre_BoxArrayArray *send_boxes , hypre_BoxArrayArray *recv_boxes , HYPRE_Int **send_procs , HYPRE_Int **recv_procs , HYPRE_Int **send_rboxnums , HYPRE_Int **recv_rboxnums , hypre_BoxArrayArray *send_rboxes , hypre_BoxArrayArray *recv_rboxes , HYPRE_Int boxes_match , hypre_CommInfo **comm_info_ptr );
-HYPRE_Int hypre_CommInfoSetTransforms ( hypre_CommInfo *comm_info , HYPRE_Int num_transforms , hypre_Index *coords , hypre_Index *dirs , HYPRE_Int **send_transforms , HYPRE_Int **recv_transforms );
-HYPRE_Int hypre_CommInfoGetTransforms ( hypre_CommInfo *comm_info , HYPRE_Int *num_transforms , hypre_Index **coords , hypre_Index **dirs );
-HYPRE_Int hypre_CommInfoProjectSend ( hypre_CommInfo *comm_info , hypre_Index index , hypre_Index stride );
-HYPRE_Int hypre_CommInfoProjectRecv ( hypre_CommInfo *comm_info , hypre_Index index , hypre_Index stride );
+HYPRE_Int hypre_CommInfoCreate ( hypre_BoxArrayArray *send_boxes, hypre_BoxArrayArray *recv_boxes,
+                                 HYPRE_Int **send_procs, HYPRE_Int **recv_procs, HYPRE_Int **send_rboxnums,
+                                 HYPRE_Int **recv_rboxnums, hypre_BoxArrayArray *send_rboxes, hypre_BoxArrayArray *recv_rboxes,
+                                 HYPRE_Int boxes_match, hypre_CommInfo **comm_info_ptr );
+HYPRE_Int hypre_CommInfoSetTransforms ( hypre_CommInfo *comm_info, HYPRE_Int num_transforms,
+                                        hypre_Index *coords, hypre_Index *dirs, HYPRE_Int **send_transforms, HYPRE_Int **recv_transforms );
+HYPRE_Int hypre_CommInfoGetTransforms ( hypre_CommInfo *comm_info, HYPRE_Int *num_transforms,
+                                        hypre_Index **coords, hypre_Index **dirs );
+HYPRE_Int hypre_CommInfoProjectSend ( hypre_CommInfo *comm_info, hypre_Index index,
+                                      hypre_Index stride );
+HYPRE_Int hypre_CommInfoProjectRecv ( hypre_CommInfo *comm_info, hypre_Index index,
+                                      hypre_Index stride );
 HYPRE_Int hypre_CommInfoDestroy ( hypre_CommInfo *comm_info );
-HYPRE_Int hypre_CreateCommInfoFromStencil ( hypre_StructGrid *grid , hypre_StructStencil *stencil , hypre_CommInfo **comm_info_ptr );
-HYPRE_Int hypre_CreateCommInfoFromNumGhost ( hypre_StructGrid *grid , HYPRE_Int *num_ghost , hypre_CommInfo **comm_info_ptr );
-HYPRE_Int hypre_CreateCommInfoFromGrids ( hypre_StructGrid *from_grid , hypre_StructGrid *to_grid , hypre_CommInfo **comm_info_ptr );
+HYPRE_Int hypre_CreateCommInfoFromStencil ( hypre_StructGrid *grid, hypre_StructStencil *stencil,
+                                            hypre_CommInfo **comm_info_ptr );
+HYPRE_Int hypre_CreateCommInfoFromNumGhost ( hypre_StructGrid *grid, HYPRE_Int *num_ghost,
+                                             hypre_CommInfo **comm_info_ptr );
+HYPRE_Int hypre_CreateCommInfoFromGrids ( hypre_StructGrid *from_grid, hypre_StructGrid *to_grid,
+                                          hypre_CommInfo **comm_info_ptr );
 
 /* computation.c */
-HYPRE_Int hypre_ComputeInfoCreate ( hypre_CommInfo *comm_info , hypre_BoxArrayArray *indt_boxes , hypre_BoxArrayArray *dept_boxes , hypre_ComputeInfo **compute_info_ptr );
-HYPRE_Int hypre_ComputeInfoProjectSend ( hypre_ComputeInfo *compute_info , hypre_Index index , hypre_Index stride );
-HYPRE_Int hypre_ComputeInfoProjectRecv ( hypre_ComputeInfo *compute_info , hypre_Index index , hypre_Index stride );
-HYPRE_Int hypre_ComputeInfoProjectComp ( hypre_ComputeInfo *compute_info , hypre_Index index , hypre_Index stride );
+HYPRE_Int hypre_ComputeInfoCreate ( hypre_CommInfo *comm_info, hypre_BoxArrayArray *indt_boxes,
+                                    hypre_BoxArrayArray *dept_boxes, hypre_ComputeInfo **compute_info_ptr );
+HYPRE_Int hypre_ComputeInfoProjectSend ( hypre_ComputeInfo *compute_info, hypre_Index index,
+                                         hypre_Index stride );
+HYPRE_Int hypre_ComputeInfoProjectRecv ( hypre_ComputeInfo *compute_info, hypre_Index index,
+                                         hypre_Index stride );
+HYPRE_Int hypre_ComputeInfoProjectComp ( hypre_ComputeInfo *compute_info, hypre_Index index,
+                                         hypre_Index stride );
 HYPRE_Int hypre_ComputeInfoDestroy ( hypre_ComputeInfo *compute_info );
-HYPRE_Int hypre_CreateComputeInfo ( hypre_StructGrid *grid , hypre_StructStencil *stencil , hypre_ComputeInfo **compute_info_ptr );
-HYPRE_Int hypre_ComputePkgCreate ( hypre_ComputeInfo *compute_info , hypre_BoxArray *data_space , HYPRE_Int num_values , hypre_StructGrid *grid , hypre_ComputePkg **compute_pkg_ptr );
+HYPRE_Int hypre_CreateComputeInfo ( hypre_StructGrid *grid, hypre_StructStencil *stencil,
+                                    hypre_ComputeInfo **compute_info_ptr );
+HYPRE_Int hypre_ComputePkgCreate ( hypre_ComputeInfo *compute_info, hypre_BoxArray *data_space,
+                                   HYPRE_Int num_values, hypre_StructGrid *grid, hypre_ComputePkg **compute_pkg_ptr );
 HYPRE_Int hypre_ComputePkgDestroy ( hypre_ComputePkg *compute_pkg );
-HYPRE_Int hypre_InitializeIndtComputations ( hypre_ComputePkg *compute_pkg , HYPRE_Complex *data , hypre_CommHandle **comm_handle_ptr );
+HYPRE_Int hypre_InitializeIndtComputations ( hypre_ComputePkg *compute_pkg, HYPRE_Complex *data,
+                                             hypre_CommHandle **comm_handle_ptr );
 HYPRE_Int hypre_FinalizeIndtComputations ( hypre_CommHandle *comm_handle );
 
 /* HYPRE_struct_grid.c */
-HYPRE_Int HYPRE_StructGridCreate ( MPI_Comm comm , HYPRE_Int dim , HYPRE_StructGrid *grid );
+HYPRE_Int HYPRE_StructGridCreate ( MPI_Comm comm, HYPRE_Int dim, HYPRE_StructGrid *grid );
 HYPRE_Int HYPRE_StructGridDestroy ( HYPRE_StructGrid grid );
-HYPRE_Int HYPRE_StructGridSetExtents ( HYPRE_StructGrid grid , HYPRE_Int *ilower , HYPRE_Int *iupper );
-HYPRE_Int HYPRE_StructGridSetPeriodic ( HYPRE_StructGrid grid , HYPRE_Int *periodic );
+HYPRE_Int HYPRE_StructGridSetExtents ( HYPRE_StructGrid grid, HYPRE_Int *ilower,
+                                       HYPRE_Int *iupper );
+HYPRE_Int HYPRE_StructGridSetPeriodic ( HYPRE_StructGrid grid, HYPRE_Int *periodic );
 HYPRE_Int HYPRE_StructGridAssemble ( HYPRE_StructGrid grid );
-HYPRE_Int HYPRE_StructGridSetNumGhost ( HYPRE_StructGrid grid , HYPRE_Int *num_ghost );
+HYPRE_Int HYPRE_StructGridSetNumGhost ( HYPRE_StructGrid grid, HYPRE_Int *num_ghost );
 
 /* HYPRE_struct_matrix.c */
-HYPRE_Int HYPRE_StructMatrixCreate ( MPI_Comm comm , HYPRE_StructGrid grid , HYPRE_StructStencil stencil , HYPRE_StructMatrix *matrix );
+HYPRE_Int HYPRE_StructMatrixCreate ( MPI_Comm comm, HYPRE_StructGrid grid,
+                                     HYPRE_StructStencil stencil, HYPRE_StructMatrix *matrix );
 HYPRE_Int HYPRE_StructMatrixDestroy ( HYPRE_StructMatrix matrix );
 HYPRE_Int HYPRE_StructMatrixInitialize ( HYPRE_StructMatrix matrix );
-HYPRE_Int HYPRE_StructMatrixSetValues ( HYPRE_StructMatrix matrix , HYPRE_Int *grid_index , HYPRE_Int num_stencil_indices , HYPRE_Int *stencil_indices , HYPRE_Complex *values );
-HYPRE_Int HYPRE_StructMatrixGetValues ( HYPRE_StructMatrix matrix , HYPRE_Int *grid_index , HYPRE_Int num_stencil_indices , HYPRE_Int *stencil_indices , HYPRE_Complex *values );
-HYPRE_Int HYPRE_StructMatrixSetBoxValues ( HYPRE_StructMatrix matrix , HYPRE_Int *ilower , HYPRE_Int *iupper , HYPRE_Int num_stencil_indices , HYPRE_Int *stencil_indices , HYPRE_Complex *values );
-HYPRE_Int HYPRE_StructMatrixGetBoxValues ( HYPRE_StructMatrix matrix , HYPRE_Int *ilower , HYPRE_Int *iupper , HYPRE_Int num_stencil_indices , HYPRE_Int *stencil_indices , HYPRE_Complex *values );
-HYPRE_Int HYPRE_StructMatrixSetConstantValues ( HYPRE_StructMatrix matrix , HYPRE_Int num_stencil_indices , HYPRE_Int *stencil_indices , HYPRE_Complex *values );
-HYPRE_Int HYPRE_StructMatrixAddToValues ( HYPRE_StructMatrix matrix , HYPRE_Int *grid_index , HYPRE_Int num_stencil_indices , HYPRE_Int *stencil_indices , HYPRE_Complex *values );
-HYPRE_Int HYPRE_StructMatrixAddToBoxValues ( HYPRE_StructMatrix matrix , HYPRE_Int *ilower , HYPRE_Int *iupper , HYPRE_Int num_stencil_indices , HYPRE_Int *stencil_indices , HYPRE_Complex *values );
-HYPRE_Int HYPRE_StructMatrixAddToConstantValues ( HYPRE_StructMatrix matrix , HYPRE_Int num_stencil_indices , HYPRE_Int *stencil_indices , HYPRE_Complex *values );
+HYPRE_Int HYPRE_StructMatrixSetValues ( HYPRE_StructMatrix matrix, HYPRE_Int *grid_index,
+                                        HYPRE_Int num_stencil_indices, HYPRE_Int *stencil_indices, HYPRE_Complex *values );
+HYPRE_Int HYPRE_StructMatrixGetValues ( HYPRE_StructMatrix matrix, HYPRE_Int *grid_index,
+                                        HYPRE_Int num_stencil_indices, HYPRE_Int *stencil_indices, HYPRE_Complex *values );
+HYPRE_Int HYPRE_StructMatrixSetBoxValues ( HYPRE_StructMatrix matrix, HYPRE_Int *ilower,
+                                           HYPRE_Int *iupper, HYPRE_Int num_stencil_indices, HYPRE_Int *stencil_indices,
+                                           HYPRE_Complex *values );
+HYPRE_Int HYPRE_StructMatrixGetBoxValues ( HYPRE_StructMatrix matrix, HYPRE_Int *ilower,
+                                           HYPRE_Int *iupper, HYPRE_Int num_stencil_indices, HYPRE_Int *stencil_indices,
+                                           HYPRE_Complex *values );
+HYPRE_Int HYPRE_StructMatrixSetConstantValues ( HYPRE_StructMatrix matrix,
+                                                HYPRE_Int num_stencil_indices, HYPRE_Int *stencil_indices, HYPRE_Complex *values );
+HYPRE_Int HYPRE_StructMatrixAddToValues ( HYPRE_StructMatrix matrix, HYPRE_Int *grid_index,
+                                          HYPRE_Int num_stencil_indices, HYPRE_Int *stencil_indices, HYPRE_Complex *values );
+HYPRE_Int HYPRE_StructMatrixAddToBoxValues ( HYPRE_StructMatrix matrix, HYPRE_Int *ilower,
+                                             HYPRE_Int *iupper, HYPRE_Int num_stencil_indices, HYPRE_Int *stencil_indices,
+                                             HYPRE_Complex *values );
+HYPRE_Int HYPRE_StructMatrixAddToConstantValues ( HYPRE_StructMatrix matrix,
+                                                  HYPRE_Int num_stencil_indices, HYPRE_Int *stencil_indices, HYPRE_Complex *values );
 HYPRE_Int HYPRE_StructMatrixAssemble ( HYPRE_StructMatrix matrix );
-HYPRE_Int HYPRE_StructMatrixSetNumGhost ( HYPRE_StructMatrix matrix , HYPRE_Int *num_ghost );
-HYPRE_Int HYPRE_StructMatrixGetGrid ( HYPRE_StructMatrix matrix , HYPRE_StructGrid *grid );
-HYPRE_Int HYPRE_StructMatrixSetSymmetric ( HYPRE_StructMatrix matrix , HYPRE_Int symmetric );
-HYPRE_Int HYPRE_StructMatrixSetConstantEntries ( HYPRE_StructMatrix matrix , HYPRE_Int nentries , HYPRE_Int *entries );
-HYPRE_Int HYPRE_StructMatrixPrint ( const char *filename , HYPRE_StructMatrix matrix , HYPRE_Int all );
-HYPRE_Int HYPRE_StructMatrixMatvec ( HYPRE_Complex alpha , HYPRE_StructMatrix A , HYPRE_StructVector x , HYPRE_Complex beta , HYPRE_StructVector y );
+HYPRE_Int HYPRE_StructMatrixSetNumGhost ( HYPRE_StructMatrix matrix, HYPRE_Int *num_ghost );
+HYPRE_Int HYPRE_StructMatrixGetGrid ( HYPRE_StructMatrix matrix, HYPRE_StructGrid *grid );
+HYPRE_Int HYPRE_StructMatrixSetSymmetric ( HYPRE_StructMatrix matrix, HYPRE_Int symmetric );
+HYPRE_Int HYPRE_StructMatrixSetConstantEntries ( HYPRE_StructMatrix matrix, HYPRE_Int nentries,
+                                                 HYPRE_Int *entries );
+HYPRE_Int HYPRE_StructMatrixPrint ( const char *filename, HYPRE_StructMatrix matrix,
+                                    HYPRE_Int all );
+HYPRE_Int HYPRE_StructMatrixMatvec ( HYPRE_Complex alpha, HYPRE_StructMatrix A,
+                                     HYPRE_StructVector x, HYPRE_Complex beta, HYPRE_StructVector y );
 HYPRE_Int HYPRE_StructMatrixClearBoundary( HYPRE_StructMatrix matrix );
 
 /* HYPRE_struct_stencil.c */
-HYPRE_Int HYPRE_StructStencilCreate ( HYPRE_Int dim , HYPRE_Int size , HYPRE_StructStencil *stencil );
-HYPRE_Int HYPRE_StructStencilSetElement ( HYPRE_StructStencil stencil , HYPRE_Int element_index , HYPRE_Int *offset );
+HYPRE_Int HYPRE_StructStencilCreate ( HYPRE_Int dim, HYPRE_Int size, HYPRE_StructStencil *stencil );
+HYPRE_Int HYPRE_StructStencilSetElement ( HYPRE_StructStencil stencil, HYPRE_Int element_index,
+                                          HYPRE_Int *offset );
 HYPRE_Int HYPRE_StructStencilDestroy ( HYPRE_StructStencil stencil );
 
 /* HYPRE_struct_vector.c */
-HYPRE_Int HYPRE_StructVectorCreate ( MPI_Comm comm , HYPRE_StructGrid grid , HYPRE_StructVector *vector );
+HYPRE_Int HYPRE_StructVectorCreate ( MPI_Comm comm, HYPRE_StructGrid grid,
+                                     HYPRE_StructVector *vector );
 HYPRE_Int HYPRE_StructVectorDestroy ( HYPRE_StructVector struct_vector );
 HYPRE_Int HYPRE_StructVectorInitialize ( HYPRE_StructVector vector );
-HYPRE_Int HYPRE_StructVectorSetValues ( HYPRE_StructVector vector , HYPRE_Int *grid_index , HYPRE_Complex values );
-HYPRE_Int HYPRE_StructVectorSetBoxValues ( HYPRE_StructVector vector , HYPRE_Int *ilower , HYPRE_Int *iupper , HYPRE_Complex *values );
-HYPRE_Int HYPRE_StructVectorAddToValues ( HYPRE_StructVector vector , HYPRE_Int *grid_index , HYPRE_Complex values );
-HYPRE_Int HYPRE_StructVectorAddToBoxValues ( HYPRE_StructVector vector , HYPRE_Int *ilower , HYPRE_Int *iupper , HYPRE_Complex *values );
-HYPRE_Int HYPRE_StructVectorScaleValues ( HYPRE_StructVector vector , HYPRE_Complex factor );
-HYPRE_Int HYPRE_StructVectorGetValues ( HYPRE_StructVector vector , HYPRE_Int *grid_index , HYPRE_Complex *values );
-HYPRE_Int HYPRE_StructVectorGetBoxValues ( HYPRE_StructVector vector , HYPRE_Int *ilower , HYPRE_Int *iupper , HYPRE_Complex *values );
+HYPRE_Int HYPRE_StructVectorSetValues ( HYPRE_StructVector vector, HYPRE_Int *grid_index,
+                                        HYPRE_Complex values );
+HYPRE_Int HYPRE_StructVectorSetBoxValues ( HYPRE_StructVector vector, HYPRE_Int *ilower,
+                                           HYPRE_Int *iupper, HYPRE_Complex *values );
+HYPRE_Int HYPRE_StructVectorAddToValues ( HYPRE_StructVector vector, HYPRE_Int *grid_index,
+                                          HYPRE_Complex values );
+HYPRE_Int HYPRE_StructVectorAddToBoxValues ( HYPRE_StructVector vector, HYPRE_Int *ilower,
+                                             HYPRE_Int *iupper, HYPRE_Complex *values );
+HYPRE_Int HYPRE_StructVectorScaleValues ( HYPRE_StructVector vector, HYPRE_Complex factor );
+HYPRE_Int HYPRE_StructVectorGetValues ( HYPRE_StructVector vector, HYPRE_Int *grid_index,
+                                        HYPRE_Complex *values );
+HYPRE_Int HYPRE_StructVectorGetBoxValues ( HYPRE_StructVector vector, HYPRE_Int *ilower,
+                                           HYPRE_Int *iupper, HYPRE_Complex *values );
 HYPRE_Int HYPRE_StructVectorAssemble ( HYPRE_StructVector vector );
-HYPRE_Int HYPRE_StructVectorPrint ( const char *filename , HYPRE_StructVector vector , HYPRE_Int all );
-HYPRE_Int HYPRE_StructVectorSetNumGhost ( HYPRE_StructVector vector , HYPRE_Int *num_ghost );
-HYPRE_Int HYPRE_StructVectorCopy ( HYPRE_StructVector x , HYPRE_StructVector y );
-HYPRE_Int HYPRE_StructVectorSetConstantValues ( HYPRE_StructVector vector , HYPRE_Complex values );
-HYPRE_Int HYPRE_StructVectorGetMigrateCommPkg ( HYPRE_StructVector from_vector , HYPRE_StructVector to_vector , HYPRE_CommPkg *comm_pkg );
-HYPRE_Int HYPRE_StructVectorMigrate ( HYPRE_CommPkg comm_pkg , HYPRE_StructVector from_vector , HYPRE_StructVector to_vector );
+HYPRE_Int hypre_StructVectorPrintData ( FILE *file, hypre_StructVector *vector, HYPRE_Int all );
+HYPRE_Int hypre_StructVectorReadData ( FILE *file, hypre_StructVector *vector );
+HYPRE_Int HYPRE_StructVectorPrint ( const char *filename, HYPRE_StructVector vector,
+                                    HYPRE_Int all );
+HYPRE_Int HYPRE_StructVectorRead ( MPI_Comm comm, const char *filename,
+                                   HYPRE_Int *num_ghost, HYPRE_StructVector *vector );
+HYPRE_Int HYPRE_StructVectorSetNumGhost ( HYPRE_StructVector vector, HYPRE_Int *num_ghost );
+HYPRE_Int HYPRE_StructVectorCopy ( HYPRE_StructVector x, HYPRE_StructVector y );
+HYPRE_Int HYPRE_StructVectorSetConstantValues ( HYPRE_StructVector vector, HYPRE_Complex values );
+HYPRE_Int HYPRE_StructVectorGetMigrateCommPkg ( HYPRE_StructVector from_vector,
+                                                HYPRE_StructVector to_vector, HYPRE_CommPkg *comm_pkg );
+HYPRE_Int HYPRE_StructVectorMigrate ( HYPRE_CommPkg comm_pkg, HYPRE_StructVector from_vector,
+                                      HYPRE_StructVector to_vector );
 HYPRE_Int HYPRE_CommPkgDestroy ( HYPRE_CommPkg comm_pkg );
 
 /* project.c */
-HYPRE_Int hypre_ProjectBox ( hypre_Box *box , hypre_Index index , hypre_Index stride );
-HYPRE_Int hypre_ProjectBoxArray ( hypre_BoxArray *box_array , hypre_Index index , hypre_Index stride );
-HYPRE_Int hypre_ProjectBoxArrayArray ( hypre_BoxArrayArray *box_array_array , hypre_Index index , hypre_Index stride );
+HYPRE_Int hypre_ProjectBox ( hypre_Box *box, hypre_Index index, hypre_Index stride );
+HYPRE_Int hypre_ProjectBoxArray ( hypre_BoxArray *box_array, hypre_Index index,
+                                  hypre_Index stride );
+HYPRE_Int hypre_ProjectBoxArrayArray ( hypre_BoxArrayArray *box_array_array, hypre_Index index,
+                                       hypre_Index stride );
 
 /* struct_axpy.c */
-HYPRE_Int hypre_StructAxpy ( HYPRE_Complex alpha , hypre_StructVector *x , hypre_StructVector *y );
+HYPRE_Int hypre_StructAxpy ( HYPRE_Complex alpha, hypre_StructVector *x, hypre_StructVector *y );
 
 /* struct_communication.c */
-HYPRE_Int hypre_CommPkgCreate ( hypre_CommInfo *comm_info , hypre_BoxArray *send_data_space , hypre_BoxArray *recv_data_space , HYPRE_Int num_values , HYPRE_Int **orders , HYPRE_Int reverse , MPI_Comm comm , hypre_CommPkg **comm_pkg_ptr );
-HYPRE_Int hypre_CommTypeSetEntries ( hypre_CommType *comm_type , HYPRE_Int *boxnums , hypre_Box *boxes , hypre_Index stride , hypre_Index coord , hypre_Index dir , HYPRE_Int *order , hypre_BoxArray *data_space , HYPRE_Int *data_offsets );
-HYPRE_Int hypre_CommTypeSetEntry ( hypre_Box *box , hypre_Index stride , hypre_Index coord , hypre_Index dir , HYPRE_Int *order , hypre_Box *data_box , HYPRE_Int data_box_offset , hypre_CommEntryType *comm_entry );
-HYPRE_Int hypre_InitializeCommunication ( hypre_CommPkg *comm_pkg , HYPRE_Complex *send_data , HYPRE_Complex *recv_data , HYPRE_Int action , HYPRE_Int tag , hypre_CommHandle **comm_handle_ptr );
+HYPRE_Int hypre_CommPkgCreate ( hypre_CommInfo *comm_info, hypre_BoxArray *send_data_space,
+                                hypre_BoxArray *recv_data_space, HYPRE_Int num_values, HYPRE_Int **orders, HYPRE_Int reverse,
+                                MPI_Comm comm, hypre_CommPkg **comm_pkg_ptr );
+HYPRE_Int hypre_CommTypeSetEntries ( hypre_CommType *comm_type, HYPRE_Int *boxnums,
+                                     hypre_Box *boxes, hypre_Index stride, hypre_Index coord, hypre_Index dir, HYPRE_Int *order,
+                                     hypre_BoxArray *data_space, HYPRE_Int *data_offsets );
+HYPRE_Int hypre_CommTypeSetEntry ( hypre_Box *box, hypre_Index stride, hypre_Index coord,
+                                   hypre_Index dir, HYPRE_Int *order, hypre_Box *data_box, HYPRE_Int data_box_offset,
+                                   hypre_CommEntryType *comm_entry );
+HYPRE_Int hypre_InitializeCommunication ( hypre_CommPkg *comm_pkg, HYPRE_Complex *send_data,
+                                          HYPRE_Complex *recv_data, HYPRE_Int action, HYPRE_Int tag, hypre_CommHandle **comm_handle_ptr );
 HYPRE_Int hypre_FinalizeCommunication ( hypre_CommHandle *comm_handle );
-HYPRE_Int hypre_ExchangeLocalData ( hypre_CommPkg *comm_pkg , HYPRE_Complex *send_data , HYPRE_Complex *recv_data , HYPRE_Int action );
+HYPRE_Int hypre_ExchangeLocalData ( hypre_CommPkg *comm_pkg, HYPRE_Complex *send_data,
+                                    HYPRE_Complex *recv_data, HYPRE_Int action );
 HYPRE_Int hypre_CommPkgDestroy ( hypre_CommPkg *comm_pkg );
 
 /* struct_copy.c */
-HYPRE_Int hypre_StructCopy ( hypre_StructVector *x , hypre_StructVector *y );
-HYPRE_Int hypre_StructPartialCopy ( hypre_StructVector *x , hypre_StructVector *y , hypre_BoxArrayArray *array_boxes );
+HYPRE_Int hypre_StructCopy ( hypre_StructVector *x, hypre_StructVector *y );
+HYPRE_Int hypre_StructPartialCopy ( hypre_StructVector *x, hypre_StructVector *y,
+                                    hypre_BoxArrayArray *array_boxes );
 
 /* struct_grid.c */
-HYPRE_Int hypre_StructGridCreate ( MPI_Comm comm , HYPRE_Int dim , hypre_StructGrid **grid_ptr );
-HYPRE_Int hypre_StructGridRef ( hypre_StructGrid *grid , hypre_StructGrid **grid_ref );
+HYPRE_Int hypre_StructGridCreate ( MPI_Comm comm, HYPRE_Int dim, hypre_StructGrid **grid_ptr );
+HYPRE_Int hypre_StructGridRef ( hypre_StructGrid *grid, hypre_StructGrid **grid_ref );
 HYPRE_Int hypre_StructGridDestroy ( hypre_StructGrid *grid );
-HYPRE_Int hypre_StructGridSetPeriodic ( hypre_StructGrid *grid , hypre_Index periodic );
-HYPRE_Int hypre_StructGridSetExtents ( hypre_StructGrid *grid , hypre_Index ilower , hypre_Index iupper );
-HYPRE_Int hypre_StructGridSetBoxes ( hypre_StructGrid *grid , hypre_BoxArray *boxes );
-HYPRE_Int hypre_StructGridSetBoundingBox ( hypre_StructGrid *grid , hypre_Box *new_bb );
-HYPRE_Int hypre_StructGridSetIDs ( hypre_StructGrid *grid , HYPRE_Int *ids );
-HYPRE_Int hypre_StructGridSetBoxManager ( hypre_StructGrid *grid , hypre_BoxManager *boxman );
-HYPRE_Int hypre_StructGridSetMaxDistance ( hypre_StructGrid *grid , hypre_Index dist );
+HYPRE_Int hypre_StructGridSetPeriodic ( hypre_StructGrid *grid, hypre_Index periodic );
+HYPRE_Int hypre_StructGridSetExtents ( hypre_StructGrid *grid, hypre_Index ilower,
+                                       hypre_Index iupper );
+HYPRE_Int hypre_StructGridSetBoxes ( hypre_StructGrid *grid, hypre_BoxArray *boxes );
+HYPRE_Int hypre_StructGridSetBoundingBox ( hypre_StructGrid *grid, hypre_Box *new_bb );
+HYPRE_Int hypre_StructGridSetIDs ( hypre_StructGrid *grid, HYPRE_Int *ids );
+HYPRE_Int hypre_StructGridSetBoxManager ( hypre_StructGrid *grid, hypre_BoxManager *boxman );
+HYPRE_Int hypre_StructGridSetMaxDistance ( hypre_StructGrid *grid, hypre_Index dist );
 HYPRE_Int hypre_StructGridAssemble ( hypre_StructGrid *grid );
-HYPRE_Int hypre_GatherAllBoxes ( MPI_Comm comm , hypre_BoxArray *boxes , HYPRE_Int dim , hypre_BoxArray **all_boxes_ptr , HYPRE_Int **all_procs_ptr , HYPRE_Int *first_local_ptr );
-HYPRE_Int hypre_ComputeBoxnums ( hypre_BoxArray *boxes , HYPRE_Int *procs , HYPRE_Int **boxnums_ptr );
-HYPRE_Int hypre_StructGridPrint ( FILE *file , hypre_StructGrid *grid );
-HYPRE_Int hypre_StructGridRead ( MPI_Comm comm , FILE *file , hypre_StructGrid **grid_ptr );
-HYPRE_Int hypre_StructGridSetNumGhost ( hypre_StructGrid *grid , HYPRE_Int *num_ghost );
+HYPRE_Int hypre_GatherAllBoxes ( MPI_Comm comm, hypre_BoxArray *boxes, HYPRE_Int dim,
+                                 hypre_BoxArray **all_boxes_ptr, HYPRE_Int **all_procs_ptr, HYPRE_Int *first_local_ptr );
+HYPRE_Int hypre_ComputeBoxnums ( hypre_BoxArray *boxes, HYPRE_Int *procs, HYPRE_Int **boxnums_ptr );
+HYPRE_Int hypre_StructGridPrint ( FILE *file, hypre_StructGrid *grid );
+HYPRE_Int hypre_StructGridRead ( MPI_Comm comm, FILE *file, hypre_StructGrid **grid_ptr );
+HYPRE_Int hypre_StructGridSetNumGhost ( hypre_StructGrid *grid, HYPRE_Int *num_ghost );
+HYPRE_Int hypre_StructGridGetMaxBoxSize ( hypre_StructGrid *grid );
 #if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-HYPRE_Int hypre_StructGridGetMaxBoxSize(hypre_StructGrid *grid);
-HYPRE_Int hypre_StructGridSetDataLocation( HYPRE_StructGrid grid, HYPRE_MemoryLocation data_location );
+HYPRE_Int hypre_StructGridSetDataLocation( HYPRE_StructGrid grid,
+                                           HYPRE_MemoryLocation data_location );
 #endif
 /* struct_innerprod.c */
-HYPRE_Real hypre_StructInnerProd ( hypre_StructVector *x , hypre_StructVector *y );
+HYPRE_Real hypre_StructInnerProd ( hypre_StructVector *x, hypre_StructVector *y );
 
 /* struct_io.c */
-HYPRE_Int hypre_PrintBoxArrayData ( FILE *file , hypre_BoxArray *box_array , hypre_BoxArray *data_space , HYPRE_Int num_values , HYPRE_Int dim , HYPRE_Complex *data );
-HYPRE_Int hypre_PrintCCVDBoxArrayData ( FILE *file , hypre_BoxArray *box_array , hypre_BoxArray *data_space , HYPRE_Int num_values , HYPRE_Int center_rank , HYPRE_Int stencil_size , HYPRE_Int *symm_elements , HYPRE_Int dim , HYPRE_Complex *data );
-HYPRE_Int hypre_PrintCCBoxArrayData ( FILE *file , hypre_BoxArray *box_array , hypre_BoxArray *data_space , HYPRE_Int num_values , HYPRE_Complex *data );
-HYPRE_Int hypre_ReadBoxArrayData ( FILE *file , hypre_BoxArray *box_array , hypre_BoxArray *data_space , HYPRE_Int num_values , HYPRE_Int dim , HYPRE_Complex *data );
-HYPRE_Int hypre_ReadBoxArrayData_CC ( FILE *file , hypre_BoxArray *box_array , hypre_BoxArray *data_space , HYPRE_Int stencil_size , HYPRE_Int real_stencil_size , HYPRE_Int constant_coefficient , HYPRE_Int dim , HYPRE_Complex *data );
+HYPRE_Int hypre_PrintBoxArrayData ( FILE *file, hypre_BoxArray *box_array,
+                                    hypre_BoxArray *data_space, HYPRE_Int num_values, HYPRE_Int dim, HYPRE_Complex *data );
+HYPRE_Int hypre_PrintCCVDBoxArrayData ( FILE *file, hypre_BoxArray *box_array,
+                                        hypre_BoxArray *data_space, HYPRE_Int num_values, HYPRE_Int center_rank, HYPRE_Int stencil_size,
+                                        HYPRE_Int *symm_elements, HYPRE_Int dim, HYPRE_Complex *data );
+HYPRE_Int hypre_PrintCCBoxArrayData ( FILE *file, hypre_BoxArray *box_array,
+                                      hypre_BoxArray *data_space, HYPRE_Int num_values, HYPRE_Complex *data );
+HYPRE_Int hypre_ReadBoxArrayData ( FILE *file, hypre_BoxArray *box_array,
+                                   hypre_BoxArray *data_space, HYPRE_Int num_values, HYPRE_Int dim, HYPRE_Complex *data );
+HYPRE_Int hypre_ReadBoxArrayData_CC ( FILE *file, hypre_BoxArray *box_array,
+                                      hypre_BoxArray *data_space, HYPRE_Int stencil_size, HYPRE_Int real_stencil_size,
+                                      HYPRE_Int constant_coefficient, HYPRE_Int dim, HYPRE_Complex *data );
 
 /* struct_matrix.c */
-HYPRE_Complex *hypre_StructMatrixExtractPointerByIndex ( hypre_StructMatrix *matrix , HYPRE_Int b , hypre_Index index );
-hypre_StructMatrix *hypre_StructMatrixCreate ( MPI_Comm comm , hypre_StructGrid *grid , hypre_StructStencil *user_stencil );
+HYPRE_Complex *hypre_StructMatrixExtractPointerByIndex ( hypre_StructMatrix *matrix, HYPRE_Int b,
+                                                         hypre_Index index );
+hypre_StructMatrix *hypre_StructMatrixCreate ( MPI_Comm comm, hypre_StructGrid *grid,
+                                               hypre_StructStencil *user_stencil );
 hypre_StructMatrix *hypre_StructMatrixRef ( hypre_StructMatrix *matrix );
 HYPRE_Int hypre_StructMatrixDestroy ( hypre_StructMatrix *matrix );
 HYPRE_Int hypre_StructMatrixInitializeShell ( hypre_StructMatrix *matrix );
-HYPRE_Int hypre_StructMatrixInitializeData ( hypre_StructMatrix *matrix , HYPRE_Complex *data ,HYPRE_Complex *data_const);
+HYPRE_Int hypre_StructMatrixInitializeData ( hypre_StructMatrix *matrix, HYPRE_Complex *data,
+                                             HYPRE_Complex *data_const);
 HYPRE_Int hypre_StructMatrixInitialize ( hypre_StructMatrix *matrix );
-HYPRE_Int hypre_StructMatrixSetValues ( hypre_StructMatrix *matrix , hypre_Index grid_index , HYPRE_Int num_stencil_indices , HYPRE_Int *stencil_indices , HYPRE_Complex *values , HYPRE_Int action , HYPRE_Int boxnum , HYPRE_Int outside );
-HYPRE_Int hypre_StructMatrixSetBoxValues ( hypre_StructMatrix *matrix , hypre_Box *set_box , hypre_Box *value_box , HYPRE_Int num_stencil_indices , HYPRE_Int *stencil_indices , HYPRE_Complex *values , HYPRE_Int action , HYPRE_Int boxnum , HYPRE_Int outside );
-HYPRE_Int hypre_StructMatrixSetConstantValues ( hypre_StructMatrix *matrix , HYPRE_Int num_stencil_indices , HYPRE_Int *stencil_indices , HYPRE_Complex *values , HYPRE_Int action );
-HYPRE_Int hypre_StructMatrixClearValues ( hypre_StructMatrix *matrix , hypre_Index grid_index , HYPRE_Int num_stencil_indices , HYPRE_Int *stencil_indices , HYPRE_Int boxnum , HYPRE_Int outside );
-HYPRE_Int hypre_StructMatrixClearBoxValues ( hypre_StructMatrix *matrix , hypre_Box *clear_box , HYPRE_Int num_stencil_indices , HYPRE_Int *stencil_indices , HYPRE_Int boxnum , HYPRE_Int outside );
+HYPRE_Int hypre_StructMatrixSetValues ( hypre_StructMatrix *matrix, hypre_Index grid_index,
+                                        HYPRE_Int num_stencil_indices, HYPRE_Int *stencil_indices, HYPRE_Complex *values, HYPRE_Int action,
+                                        HYPRE_Int boxnum, HYPRE_Int outside );
+HYPRE_Int hypre_StructMatrixSetBoxValues ( hypre_StructMatrix *matrix, hypre_Box *set_box,
+                                           hypre_Box *value_box, HYPRE_Int num_stencil_indices, HYPRE_Int *stencil_indices,
+                                           HYPRE_Complex *values, HYPRE_Int action, HYPRE_Int boxnum, HYPRE_Int outside );
+HYPRE_Int hypre_StructMatrixSetConstantValues ( hypre_StructMatrix *matrix,
+                                                HYPRE_Int num_stencil_indices, HYPRE_Int *stencil_indices, HYPRE_Complex *values,
+                                                HYPRE_Int action );
+HYPRE_Int hypre_StructMatrixClearValues ( hypre_StructMatrix *matrix, hypre_Index grid_index,
+                                          HYPRE_Int num_stencil_indices, HYPRE_Int *stencil_indices, HYPRE_Int boxnum, HYPRE_Int outside );
+HYPRE_Int hypre_StructMatrixClearBoxValues ( hypre_StructMatrix *matrix, hypre_Box *clear_box,
+                                             HYPRE_Int num_stencil_indices, HYPRE_Int *stencil_indices, HYPRE_Int boxnum, HYPRE_Int outside );
 HYPRE_Int hypre_StructMatrixAssemble ( hypre_StructMatrix *matrix );
-HYPRE_Int hypre_StructMatrixSetNumGhost ( hypre_StructMatrix *matrix , HYPRE_Int *num_ghost );
-HYPRE_Int hypre_StructMatrixSetConstantCoefficient ( hypre_StructMatrix *matrix , HYPRE_Int constant_coefficient );
-HYPRE_Int hypre_StructMatrixSetConstantEntries ( hypre_StructMatrix *matrix , HYPRE_Int nentries , HYPRE_Int *entries );
+HYPRE_Int hypre_StructMatrixSetNumGhost ( hypre_StructMatrix *matrix, HYPRE_Int *num_ghost );
+HYPRE_Int hypre_StructMatrixSetConstantCoefficient ( hypre_StructMatrix *matrix,
+                                                     HYPRE_Int constant_coefficient );
+HYPRE_Int hypre_StructMatrixSetConstantEntries ( hypre_StructMatrix *matrix, HYPRE_Int nentries,
+                                                 HYPRE_Int *entries );
 HYPRE_Int hypre_StructMatrixClearGhostValues ( hypre_StructMatrix *matrix );
-HYPRE_Int hypre_StructMatrixPrint ( const char *filename , hypre_StructMatrix *matrix , HYPRE_Int all );
-HYPRE_Int hypre_StructMatrixMigrate ( hypre_StructMatrix *from_matrix , hypre_StructMatrix *to_matrix );
-hypre_StructMatrix *hypre_StructMatrixRead ( MPI_Comm comm , const char *filename , HYPRE_Int *num_ghost );
+HYPRE_Int hypre_StructMatrixPrintData ( FILE *file, hypre_StructMatrix *matrix, HYPRE_Int all );
+HYPRE_Int hypre_StructMatrixReadData ( FILE *file, hypre_StructMatrix *matrix );
+HYPRE_Int hypre_StructMatrixPrint ( const char *filename, hypre_StructMatrix *matrix,
+                                    HYPRE_Int all );
+hypre_StructMatrix *hypre_StructMatrixRead ( MPI_Comm comm, const char *filename,
+                                             HYPRE_Int *num_ghost );
+HYPRE_Int hypre_StructMatrixMigrate ( hypre_StructMatrix *from_matrix,
+                                      hypre_StructMatrix *to_matrix );
 HYPRE_Int hypre_StructMatrixClearBoundary( hypre_StructMatrix *matrix);
 
 /* struct_matrix_mask.c */
-hypre_StructMatrix *hypre_StructMatrixCreateMask ( hypre_StructMatrix *matrix , HYPRE_Int num_stencil_indices , HYPRE_Int *stencil_indices );
+hypre_StructMatrix *hypre_StructMatrixCreateMask ( hypre_StructMatrix *matrix,
+                                                   HYPRE_Int num_stencil_indices, HYPRE_Int *stencil_indices );
 
 /* struct_matvec.c */
 void *hypre_StructMatvecCreate ( void );
-HYPRE_Int hypre_StructMatvecSetup ( void *matvec_vdata , hypre_StructMatrix *A , hypre_StructVector *x );
-HYPRE_Int hypre_StructMatvecCompute ( void *matvec_vdata , HYPRE_Complex alpha , hypre_StructMatrix *A , hypre_StructVector *x , HYPRE_Complex beta , hypre_StructVector *y );
-HYPRE_Int hypre_StructMatvecCC0 ( HYPRE_Complex alpha , hypre_StructMatrix *A , hypre_StructVector *x , hypre_StructVector *y , hypre_BoxArrayArray *compute_box_aa , hypre_IndexRef stride );
-HYPRE_Int hypre_StructMatvecCC1 ( HYPRE_Complex alpha , hypre_StructMatrix *A , hypre_StructVector *x , hypre_StructVector *y , hypre_BoxArrayArray *compute_box_aa , hypre_IndexRef stride );
-HYPRE_Int hypre_StructMatvecCC2 ( HYPRE_Complex alpha , hypre_StructMatrix *A , hypre_StructVector *x , hypre_StructVector *y , hypre_BoxArrayArray *compute_box_aa , hypre_IndexRef stride );
+HYPRE_Int hypre_StructMatvecSetup ( void *matvec_vdata, hypre_StructMatrix *A,
+                                    hypre_StructVector *x );
+HYPRE_Int hypre_StructMatvecCompute ( void *matvec_vdata, HYPRE_Complex alpha,
+                                      hypre_StructMatrix *A, hypre_StructVector *x, HYPRE_Complex beta, hypre_StructVector *y );
+HYPRE_Int hypre_StructMatvecCC0 ( HYPRE_Complex alpha, hypre_StructMatrix *A, hypre_StructVector *x,
+                                  hypre_StructVector *y, hypre_BoxArrayArray *compute_box_aa, hypre_IndexRef stride );
+HYPRE_Int hypre_StructMatvecCC1 ( HYPRE_Complex alpha, hypre_StructMatrix *A, hypre_StructVector *x,
+                                  hypre_StructVector *y, hypre_BoxArrayArray *compute_box_aa, hypre_IndexRef stride );
+HYPRE_Int hypre_StructMatvecCC2 ( HYPRE_Complex alpha, hypre_StructMatrix *A, hypre_StructVector *x,
+                                  hypre_StructVector *y, hypre_BoxArrayArray *compute_box_aa, hypre_IndexRef stride );
 HYPRE_Int hypre_StructMatvecDestroy ( void *matvec_vdata );
-HYPRE_Int hypre_StructMatvec ( HYPRE_Complex alpha , hypre_StructMatrix *A , hypre_StructVector *x , HYPRE_Complex beta , hypre_StructVector *y );
+HYPRE_Int hypre_StructMatvec ( HYPRE_Complex alpha, hypre_StructMatrix *A, hypre_StructVector *x,
+                               HYPRE_Complex beta, hypre_StructVector *y );
 
 /* struct_scale.c */
-HYPRE_Int hypre_StructScale ( HYPRE_Complex alpha , hypre_StructVector *y );
+HYPRE_Int hypre_StructScale ( HYPRE_Complex alpha, hypre_StructVector *y );
 
 /* struct_stencil.c */
-hypre_StructStencil *hypre_StructStencilCreate ( HYPRE_Int dim , HYPRE_Int size , hypre_Index *shape );
+hypre_StructStencil *hypre_StructStencilCreate ( HYPRE_Int dim, HYPRE_Int size,
+                                                 hypre_Index *shape );
 hypre_StructStencil *hypre_StructStencilRef ( hypre_StructStencil *stencil );
 HYPRE_Int hypre_StructStencilDestroy ( hypre_StructStencil *stencil );
-HYPRE_Int hypre_StructStencilElementRank ( hypre_StructStencil *stencil , hypre_Index stencil_element );
-HYPRE_Int hypre_StructStencilSymmetrize ( hypre_StructStencil *stencil , hypre_StructStencil **symm_stencil_ptr , HYPRE_Int **symm_elements_ptr );
+HYPRE_Int hypre_StructStencilElementRank ( hypre_StructStencil *stencil,
+                                           hypre_Index stencil_element );
+HYPRE_Int hypre_StructStencilSymmetrize ( hypre_StructStencil *stencil,
+                                          hypre_StructStencil **symm_stencil_ptr, HYPRE_Int **symm_elements_ptr );
 
 /* struct_vector.c */
-hypre_StructVector *hypre_StructVectorCreate ( MPI_Comm comm , hypre_StructGrid *grid );
+hypre_StructVector *hypre_StructVectorCreate ( MPI_Comm comm, hypre_StructGrid *grid );
 hypre_StructVector *hypre_StructVectorRef ( hypre_StructVector *vector );
 HYPRE_Int hypre_StructVectorDestroy ( hypre_StructVector *vector );
 HYPRE_Int hypre_StructVectorInitializeShell ( hypre_StructVector *vector );
-HYPRE_Int hypre_StructVectorInitializeData ( hypre_StructVector *vector , HYPRE_Complex *data);
+HYPRE_Int hypre_StructVectorInitializeData ( hypre_StructVector *vector, HYPRE_Complex *data);
 HYPRE_Int hypre_StructVectorInitialize ( hypre_StructVector *vector );
-HYPRE_Int hypre_StructVectorSetValues ( hypre_StructVector *vector , hypre_Index grid_index , HYPRE_Complex *values , HYPRE_Int action , HYPRE_Int boxnum , HYPRE_Int outside );
-HYPRE_Int hypre_StructVectorSetBoxValues ( hypre_StructVector *vector , hypre_Box *set_box , hypre_Box *value_box , HYPRE_Complex *values , HYPRE_Int action , HYPRE_Int boxnum , HYPRE_Int outside );
-HYPRE_Int hypre_StructVectorClearValues ( hypre_StructVector *vector , hypre_Index grid_index , HYPRE_Int boxnum , HYPRE_Int outside );
-HYPRE_Int hypre_StructVectorClearBoxValues ( hypre_StructVector *vector , hypre_Box *clear_box , HYPRE_Int boxnum , HYPRE_Int outside );
+HYPRE_Int hypre_StructVectorSetValues ( hypre_StructVector *vector, hypre_Index grid_index,
+                                        HYPRE_Complex *values, HYPRE_Int action, HYPRE_Int boxnum, HYPRE_Int outside );
+HYPRE_Int hypre_StructVectorSetBoxValues ( hypre_StructVector *vector, hypre_Box *set_box,
+                                           hypre_Box *value_box, HYPRE_Complex *values, HYPRE_Int action, HYPRE_Int boxnum,
+                                           HYPRE_Int outside );
+HYPRE_Int hypre_StructVectorClearValues ( hypre_StructVector *vector, hypre_Index grid_index,
+                                          HYPRE_Int boxnum, HYPRE_Int outside );
+HYPRE_Int hypre_StructVectorClearBoxValues ( hypre_StructVector *vector, hypre_Box *clear_box,
+                                             HYPRE_Int boxnum, HYPRE_Int outside );
 HYPRE_Int hypre_StructVectorClearAllValues ( hypre_StructVector *vector );
-HYPRE_Int hypre_StructVectorSetNumGhost ( hypre_StructVector *vector , HYPRE_Int *num_ghost );
-HYPRE_Int hypre_StructVectorSetDataSize(hypre_StructVector *vector , HYPRE_Int *data_size, HYPRE_Int *data_host_size);
+HYPRE_Int hypre_StructVectorSetNumGhost ( hypre_StructVector *vector, HYPRE_Int *num_ghost );
+HYPRE_Int hypre_StructVectorSetDataSize(hypre_StructVector *vector, HYPRE_Int *data_size,
+                                        HYPRE_Int *data_host_size);
 HYPRE_Int hypre_StructVectorAssemble ( hypre_StructVector *vector );
-HYPRE_Int hypre_StructVectorCopy ( hypre_StructVector *x , hypre_StructVector *y );
-HYPRE_Int hypre_StructVectorSetConstantValues ( hypre_StructVector *vector , HYPRE_Complex values );
-HYPRE_Int hypre_StructVectorSetFunctionValues ( hypre_StructVector *vector , HYPRE_Complex (*fcn )());
+HYPRE_Int hypre_StructVectorCopy ( hypre_StructVector *x, hypre_StructVector *y );
+HYPRE_Int hypre_StructVectorSetConstantValues ( hypre_StructVector *vector, HYPRE_Complex values );
+HYPRE_Int hypre_StructVectorSetFunctionValues ( hypre_StructVector *vector,
+                                                HYPRE_Complex (*fcn )( HYPRE_Int, HYPRE_Int, HYPRE_Int ));
 HYPRE_Int hypre_StructVectorClearGhostValues ( hypre_StructVector *vector );
-HYPRE_Int hypre_StructVectorClearBoundGhostValues ( hypre_StructVector *vector , HYPRE_Int force );
-HYPRE_Int hypre_StructVectorScaleValues ( hypre_StructVector *vector , HYPRE_Complex factor );
-hypre_CommPkg *hypre_StructVectorGetMigrateCommPkg ( hypre_StructVector *from_vector , hypre_StructVector *to_vector );
-HYPRE_Int hypre_StructVectorMigrate ( hypre_CommPkg *comm_pkg , hypre_StructVector *from_vector , hypre_StructVector *to_vector );
-HYPRE_Int hypre_StructVectorPrint ( const char *filename , hypre_StructVector *vector , HYPRE_Int all );
-hypre_StructVector *hypre_StructVectorRead ( MPI_Comm comm , const char *filename , HYPRE_Int *num_ghost );
+HYPRE_Int hypre_StructVectorClearBoundGhostValues ( hypre_StructVector *vector, HYPRE_Int force );
+HYPRE_Int hypre_StructVectorScaleValues ( hypre_StructVector *vector, HYPRE_Complex factor );
+hypre_CommPkg *hypre_StructVectorGetMigrateCommPkg ( hypre_StructVector *from_vector,
+                                                     hypre_StructVector *to_vector );
+HYPRE_Int hypre_StructVectorMigrate ( hypre_CommPkg *comm_pkg, hypre_StructVector *from_vector,
+                                      hypre_StructVector *to_vector );
+HYPRE_Int hypre_StructVectorPrint ( const char *filename, hypre_StructVector *vector,
+                                    HYPRE_Int all );
+hypre_StructVector *hypre_StructVectorRead ( MPI_Comm comm, const char *filename,
+                                             HYPRE_Int *num_ghost );
 hypre_StructVector *hypre_StructVectorClone ( hypre_StructVector *vector );
diff --git a/external/hypre/src/struct_mv/struct_axpy.c b/external/hypre/src/struct_mv/struct_axpy.c
index 561543fb..e6b0cd59 100644
--- a/external/hypre/src/struct_mv/struct_axpy.c
+++ b/external/hypre/src/struct_mv/struct_axpy.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -53,6 +53,18 @@ hypre_StructAxpy( HYPRE_Complex       alpha,
 
       hypre_BoxGetSize(box, loop_size);
 
+#if 0
+      HYPRE_BOXLOOP (
+         hypre_BoxLoop2Begin, (hypre_StructVectorNDim(x), loop_size,
+                               x_data_box, start, unit_stride, xi,
+                               y_data_box, start, unit_stride, yi),
+      {
+         yp[yi] += alpha * xp[xi];
+      },
+      hypre_BoxLoop2End, (xi, yi) )
+
+#else
+
 #define DEVICE_VAR is_device_ptr(yp,xp)
       hypre_BoxLoop2Begin(hypre_StructVectorNDim(x), loop_size,
                           x_data_box, start, unit_stride, xi,
@@ -62,7 +74,10 @@ hypre_StructAxpy( HYPRE_Complex       alpha,
       }
       hypre_BoxLoop2End(xi, yi);
 #undef DEVICE_VAR
+
+#endif
    }
 
    return hypre_error_flag;
 }
+
diff --git a/external/hypre/src/struct_mv/struct_communication.c b/external/hypre/src/struct_mv/struct_communication.c
index 81be1bb7..a6ea8a8d 100644
--- a/external/hypre/src/struct_mv/struct_communication.c
+++ b/external/hypre/src/struct_mv/struct_communication.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -212,7 +212,7 @@ hypre_CommPkgCreate( hypre_CommInfo   *comm_info,
          num_boxes++;
       }
    }
-   hypre_qsort3i(comm_boxes_p, comm_boxes_i, comm_boxes_j, 0, num_boxes-1);
+   hypre_qsort3i(comm_boxes_p, comm_boxes_i, comm_boxes_j, 0, num_boxes - 1);
 
    /* compute comm_types */
 
@@ -228,6 +228,7 @@ hypre_CommPkgCreate( hypre_CommInfo   *comm_info,
    p_old = -1;
    num_comms = 0;
    comm_bufsize = 0;
+   comm_type = &comm_types[0];
    for (m = 0; m < num_boxes; m++)
    {
       i = comm_boxes_i[m];
@@ -246,7 +247,7 @@ hypre_CommPkgCreate( hypre_CommInfo   *comm_info,
          {
             if (p != my_proc)
             {
-               comm_type = &comm_types[num_comms+1];
+               comm_type = &comm_types[num_comms + 1];
                num_comms++;
             }
             else
@@ -264,8 +265,8 @@ hypre_CommPkgCreate( hypre_CommInfo   *comm_info,
 
          k = hypre_CommTypeNumEntries(comm_type);
          hypre_BoxGetStrideVolume(box, send_stride, &size);
-         hypre_CommTypeBufsize(comm_type) += (size*num_values);
-         comm_bufsize                     += (size*num_values);
+         hypre_CommTypeBufsize(comm_type) += (size * num_values);
+         comm_bufsize                     += (size * num_values);
          rbox_array = hypre_BoxArrayArrayBoxArray(send_rboxes, i);
          data_box = hypre_BoxArrayBox(send_data_space, i);
          if (send_transforms != NULL)
@@ -350,7 +351,7 @@ hypre_CommPkgCreate( hypre_CommInfo   *comm_info,
          num_boxes++;
       }
    }
-   hypre_qsort3i(comm_boxes_p, comm_boxes_i, comm_boxes_j, 0, num_boxes-1);
+   hypre_qsort3i(comm_boxes_p, comm_boxes_i, comm_boxes_j, 0, num_boxes - 1);
 
    /* compute comm_types */
 
@@ -360,6 +361,7 @@ hypre_CommPkgCreate( hypre_CommInfo   *comm_info,
    p_old = -1;
    num_comms = 0;
    comm_bufsize = 0;
+   comm_type = &comm_types[0];
    for (m = 0; m < num_boxes; m++)
    {
       i = comm_boxes_i[m];
@@ -378,7 +380,7 @@ hypre_CommPkgCreate( hypre_CommInfo   *comm_info,
          {
             if (p != my_proc)
             {
-               comm_type = &comm_types[num_comms+1];
+               comm_type = &comm_types[num_comms + 1];
                num_comms++;
             }
             else
@@ -393,8 +395,8 @@ hypre_CommPkgCreate( hypre_CommInfo   *comm_info,
 
          k = hypre_CommTypeNumEntries(comm_type);
          hypre_BoxGetStrideVolume(box, recv_stride, &size);
-         hypre_CommTypeBufsize(comm_type) += (size*num_values);
-         comm_bufsize                     += (size*num_values);
+         hypre_CommTypeBufsize(comm_type) += (size * num_values);
+         comm_bufsize                     += (size * num_values);
          hypre_CommTypeNumEntries(comm_type) ++;
       }
    }
@@ -689,7 +691,7 @@ hypre_CommTypeSetEntry( hypre_Box           *box,
    {
       if (dir[i] < 0)
       {
-         offset += (length_array[i] - 1)*stride_array[i];
+         offset += (length_array[i] - 1) * stride_array[i];
          stride_array[i] = -stride_array[i];
       }
    }
@@ -712,12 +714,12 @@ hypre_CommTypeSetEntry( hypre_Box           *box,
    i = 0;
    while (i < dim)
    {
-      if(length_array[i] == 1)
+      if (length_array[i] == 1)
       {
-         for(j = i; j < (dim - 1); j++)
+         for (j = i; j < (dim - 1); j++)
          {
-            length_array[j] = length_array[j+1];
-            stride_array[j] = stride_array[j+1];
+            length_array[j] = length_array[j + 1];
+            stride_array[j] = stride_array[j + 1];
          }
          length_array[dim - 1] = 1;
          stride_array[dim - 1] = 1;
@@ -731,26 +733,26 @@ hypre_CommTypeSetEntry( hypre_Box           *box,
 
 #if 0
    /* sort the array according to length_array (largest to smallest) */
-   for (i = (dim-1); i > 0; i--)
+   for (i = (dim - 1); i > 0; i--)
    {
       for (j = 0; j < i; j++)
       {
-         if (length_array[j] < length_array[j+1])
+         if (length_array[j] < length_array[j + 1])
          {
             i_tmp             = length_array[j];
-            length_array[j]   = length_array[j+1];
-            length_array[j+1] = i_tmp;
+            length_array[j]   = length_array[j + 1];
+            length_array[j + 1] = i_tmp;
 
             i_tmp             = stride_array[j];
-            stride_array[j]   = stride_array[j+1];
-            stride_array[j+1] = i_tmp;
+            stride_array[j]   = stride_array[j + 1];
+            stride_array[j + 1] = i_tmp;
          }
       }
    }
 #endif
 
    /* if every len was 1 we need to fix to communicate at least one */
-   if(!dim)
+   if (!dim)
    {
       dim = 1;
    }
@@ -762,6 +764,47 @@ hypre_CommTypeSetEntry( hypre_Box           *box,
    return hypre_error_flag;
 }
 
+HYPRE_Complex *
+hypre_StructCommunicationGetBuffer(HYPRE_MemoryLocation memory_location,
+                                   HYPRE_Int            size)
+{
+   HYPRE_Complex *ptr;
+
+#if defined(HYPRE_USING_GPU) || defined(HYPRE_USING_DEVICE_OPENMP)
+   if (hypre_GetActualMemLocation(memory_location) != hypre_MEMORY_HOST)
+   {
+      if (size > hypre_HandleStructCommSendBufferSize(hypre_handle()))
+      {
+         HYPRE_Int new_size = 5 * size;
+         hypre_HandleStructCommSendBufferSize(hypre_handle()) = new_size;
+         hypre_TFree(hypre_HandleStructCommSendBuffer(hypre_handle()), memory_location);
+         hypre_HandleStructCommSendBuffer(hypre_handle()) = hypre_CTAlloc(HYPRE_Complex, new_size,
+                                                                          memory_location);
+      }
+
+      ptr = hypre_HandleStructCommSendBuffer(hypre_handle());
+   }
+   else
+#endif
+   {
+      ptr = hypre_CTAlloc(HYPRE_Complex, size, memory_location);
+   }
+
+   return ptr;
+}
+
+HYPRE_Int
+hypre_StructCommunicationReleaseBuffer(HYPRE_Complex       *buffer,
+                                       HYPRE_MemoryLocation memory_location)
+{
+   if (hypre_GetActualMemLocation(memory_location) == hypre_MEMORY_HOST)
+   {
+      hypre_TFree(buffer, memory_location);
+   }
+
+   return hypre_error_flag;
+}
+
 /*--------------------------------------------------------------------------
  * Initialize a non-blocking communication exchange.
  *
@@ -774,12 +817,12 @@ hypre_CommTypeSetEntry( hypre_Box           *box,
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_InitializeCommunication( hypre_CommPkg     *comm_pkg,
-                               HYPRE_Complex     *send_data,
-                               HYPRE_Complex     *recv_data,
-                               HYPRE_Int          action,
-                               HYPRE_Int          tag,
-                               hypre_CommHandle **comm_handle_ptr )
+hypre_InitializeCommunication( hypre_CommPkg        *comm_pkg,
+                               HYPRE_Complex        *send_data,
+                               HYPRE_Complex        *recv_data,
+                               HYPRE_Int             action,
+                               HYPRE_Int             tag,
+                               hypre_CommHandle    **comm_handle_ptr )
 {
    hypre_CommHandle    *comm_handle;
 
@@ -795,15 +838,15 @@ hypre_InitializeCommunication( hypre_CommPkg     *comm_pkg,
 
    HYPRE_Complex      **send_buffers;
    HYPRE_Complex      **recv_buffers;
-   HYPRE_Complex      **send_buffers_device;
-   HYPRE_Complex      **recv_buffers_device;
+   HYPRE_Complex      **send_buffers_mpi;
+   HYPRE_Complex      **recv_buffers_mpi;
 
    hypre_CommType      *comm_type, *from_type, *to_type;
    hypre_CommEntryType *comm_entry;
    HYPRE_Int            num_entries;
 
    HYPRE_Int           *length_array;
-   HYPRE_Int           *stride_array, unitst_array[HYPRE_MAXDIM+1];
+   HYPRE_Int           *stride_array, unitst_array[HYPRE_MAXDIM + 1];
    HYPRE_Int           *order;
 
    HYPRE_Complex       *dptr, *kptr, *lptr;
@@ -812,13 +855,16 @@ hypre_InitializeCommunication( hypre_CommPkg     *comm_pkg,
    HYPRE_Int            i, j, d, ll;
    HYPRE_Int            size;
 
+   HYPRE_MemoryLocation memory_location     = hypre_HandleMemoryLocation(hypre_handle());
+   HYPRE_MemoryLocation memory_location_mpi = memory_location;
+
    /*--------------------------------------------------------------------
     * allocate requests and status
     *--------------------------------------------------------------------*/
 
    num_requests = num_sends + num_recvs;
    requests = hypre_CTAlloc(hypre_MPI_Request, num_requests, HYPRE_MEMORY_HOST);
-   status   = hypre_CTAlloc(hypre_MPI_Status, num_requests, HYPRE_MEMORY_HOST);
+   status = hypre_CTAlloc(hypre_MPI_Status, num_requests, HYPRE_MEMORY_HOST);
 
    /*--------------------------------------------------------------------
     * allocate buffers
@@ -829,103 +875,28 @@ hypre_InitializeCommunication( hypre_CommPkg     *comm_pkg,
    if (num_sends > 0)
    {
       size = hypre_CommPkgSendBufsize(comm_pkg);
-      send_buffers[0] =  hypre_CTAlloc(HYPRE_Complex, size, HYPRE_MEMORY_HOST);
+      send_buffers[0] = hypre_StructCommunicationGetBuffer(memory_location, size);
       for (i = 1; i < num_sends; i++)
       {
-         comm_type = hypre_CommPkgSendType(comm_pkg, i-1);
+         comm_type = hypre_CommPkgSendType(comm_pkg, i - 1);
          size = hypre_CommTypeBufsize(comm_type);
-         send_buffers[i] = send_buffers[i-1] + size;
+         send_buffers[i] = send_buffers[i - 1] + size;
       }
    }
 
-   /* allocate device send buffer
-    * If boxloops run on GPUs, allocate device buffer,
-    * since cannot access host memory from device */
-   HYPRE_Int alloc_dev_buffer = 0;
-   /* In the case of running on device and cannot access host memory from device */
-#if defined(HYPRE_USING_GPU)
-#if defined(HYPRE_USING_RAJA) || defined(HYPRE_USING_KOKKOS)
-   alloc_dev_buffer = 1;
-#elif defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-   alloc_dev_buffer = (hypre_HandleStructExecPolicy(hypre_handle()) == HYPRE_EXEC_DEVICE);
-#elif defined(HYPRE_USING_DEVICE_OPENMP)
-   alloc_dev_buffer = hypre__global_offload;
-#endif
-#endif
-
-#if defined(HYPRE_USING_GPU)
-   if (alloc_dev_buffer)
-   {
-      send_buffers_device = hypre_TAlloc(HYPRE_Complex *, num_sends, HYPRE_MEMORY_HOST);
-      if (num_sends > 0)
-      {
-         size = hypre_CommPkgSendBufsize(comm_pkg);
-         if (size > hypre_HandleStructCommSendBufferSize(hypre_handle()))
-         {
-            hypre_TFree(hypre_HandleStructCommSendBuffer(hypre_handle()), HYPRE_MEMORY_DEVICE);
-            hypre_HandleStructCommSendBufferSize(hypre_handle()) = 5 * size;
-            hypre_HandleStructCommSendBuffer(hypre_handle()) =
-               hypre_CTAlloc(HYPRE_Complex, hypre_HandleStructCommSendBufferSize(hypre_handle()), HYPRE_MEMORY_DEVICE);
-         }
-         send_buffers_device[0] = hypre_HandleStructCommSendBuffer(hypre_handle());
-         for (i = 1; i < num_sends; i++)
-         {
-            comm_type = hypre_CommPkgSendType(comm_pkg, i-1);
-            size = hypre_CommTypeBufsize(comm_type);
-            send_buffers_device[i] = send_buffers_device[i-1] + size;
-         }
-      }
-   }
-   else
-#endif
-   {
-      send_buffers_device = send_buffers;
-   }
-
    /* allocate recv buffers */
    recv_buffers = hypre_TAlloc(HYPRE_Complex *, num_recvs, HYPRE_MEMORY_HOST);
    if (num_recvs > 0)
    {
       size = hypre_CommPkgRecvBufsize(comm_pkg);
-      recv_buffers[0] =  hypre_TAlloc(HYPRE_Complex, size, HYPRE_MEMORY_HOST);
+      recv_buffers[0] = hypre_StructCommunicationGetBuffer(memory_location, size);
       for (i = 1; i < num_recvs; i++)
       {
-         comm_type = hypre_CommPkgRecvType(comm_pkg, i-1);
+         comm_type = hypre_CommPkgRecvType(comm_pkg, i - 1);
          size = hypre_CommTypeBufsize(comm_type);
-         recv_buffers[i] = recv_buffers[i-1] + size;
-      }
-   }
-
-   /* allocate device recv buffers */
-#if defined(HYPRE_USING_GPU)
-   if (alloc_dev_buffer)
-   {
-      recv_buffers_device = hypre_TAlloc(HYPRE_Complex *, num_recvs, HYPRE_MEMORY_HOST);
-      if (num_recvs > 0)
-      {
-         size = hypre_CommPkgRecvBufsize(comm_pkg);
-
-         if (size > hypre_HandleStructCommRecvBufferSize(hypre_handle()))
-         {
-            hypre_TFree(hypre_HandleStructCommRecvBuffer(hypre_handle()), HYPRE_MEMORY_DEVICE);
-            hypre_HandleStructCommRecvBufferSize(hypre_handle()) = 5 * size;
-            hypre_HandleStructCommRecvBuffer(hypre_handle()) =
-               hypre_CTAlloc(HYPRE_Complex, hypre_HandleStructCommRecvBufferSize(hypre_handle()), HYPRE_MEMORY_DEVICE);
-         }
-         recv_buffers_device[0] = hypre_HandleStructCommRecvBuffer(hypre_handle());
-         for (i = 1; i < num_recvs; i++)
-         {
-            comm_type = hypre_CommPkgRecvType(comm_pkg, i-1);
-            size = hypre_CommTypeBufsize(comm_type);
-            recv_buffers_device[i] = recv_buffers_device[i-1] + size;
-         }
+         recv_buffers[i] = recv_buffers[i - 1] + size;
       }
    }
-   else
-#endif
-   {
-      recv_buffers_device = recv_buffers;
-   }
 
    /*--------------------------------------------------------------------
     * pack send buffers
@@ -936,7 +907,7 @@ hypre_InitializeCommunication( hypre_CommPkg     *comm_pkg,
       comm_type = hypre_CommPkgSendType(comm_pkg, i);
       num_entries = hypre_CommTypeNumEntries(comm_type);
 
-      dptr = (HYPRE_Complex *) send_buffers_device[i];
+      dptr = (HYPRE_Complex *) send_buffers[i];
       if ( hypre_CommPkgFirstComm(comm_pkg) )
       {
          dptr += hypre_CommPrefixSize(num_entries);
@@ -951,7 +922,7 @@ hypre_InitializeCommunication( hypre_CommPkg     *comm_pkg,
          unitst_array[0] = 1;
          for (d = 1; d <= ndim; d++)
          {
-            unitst_array[d] = unitst_array[d-1]*length_array[d-1];
+            unitst_array[d] = unitst_array[d - 1] * length_array[d - 1];
          }
 
          lptr = send_data + hypre_CommEntryTypeOffset(comm_entry);
@@ -959,7 +930,7 @@ hypre_InitializeCommunication( hypre_CommPkg     *comm_pkg,
          {
             if (order[ll] > -1)
             {
-               kptr = lptr + order[ll]*stride_array[ndim];
+               kptr = lptr + order[ll] * stride_array[ndim];
 
 #define DEVICE_VAR is_device_ptr(dptr,kptr)
                hypre_BasicBoxLoop2Begin(ndim, length_array,
@@ -981,7 +952,7 @@ hypre_InitializeCommunication( hypre_CommPkg     *comm_pkg,
                   size *= length_array[d];
                }
 
-               hypre_Memset(dptr, 0, size*sizeof(HYPRE_Complex), HYPRE_MEMORY_DEVICE);
+               hypre_Memset(dptr, 0, size * sizeof(HYPRE_Complex), memory_location);
 
                dptr += size;
             }
@@ -989,37 +960,71 @@ hypre_InitializeCommunication( hypre_CommPkg     *comm_pkg,
       }
    }
 
-   /* Copy buffer data from Device to Host */
-   if (num_sends > 0 && alloc_dev_buffer)
+#if defined(HYPRE_USING_GPU) || defined(HYPRE_USING_DEVICE_OPENMP)
+   if (hypre_GetActualMemLocation(memory_location) != hypre_MEMORY_HOST)
    {
-      HYPRE_Complex  *dptr_host;
-      size = hypre_CommPkgSendBufsize(comm_pkg);
-      dptr_host = (HYPRE_Complex *) send_buffers[0];
-      dptr      = (HYPRE_Complex *) send_buffers_device[0];
-      if (dptr_host != dptr)
+      if (hypre_GetGpuAwareMPI())
       {
-         hypre_TMemcpy(dptr_host, dptr, HYPRE_Complex, size, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
+#if defined(HYPRE_USING_GPU)
+         hypre_ForceSyncComputeStream();
+#endif
+         send_buffers_mpi = send_buffers;
+         recv_buffers_mpi = recv_buffers;
+      }
+      else
+      {
+         memory_location_mpi = HYPRE_MEMORY_HOST;
+
+         send_buffers_mpi = hypre_TAlloc(HYPRE_Complex *, num_sends, HYPRE_MEMORY_HOST);
+         if (num_sends > 0)
+         {
+            size = hypre_CommPkgSendBufsize(comm_pkg);
+            send_buffers_mpi[0] = hypre_CTAlloc(HYPRE_Complex, size, memory_location_mpi);
+            for (i = 1; i < num_sends; i++)
+            {
+               send_buffers_mpi[i] = send_buffers_mpi[i - 1] + (send_buffers[i] - send_buffers[i - 1]);
+            }
+            hypre_TMemcpy(send_buffers_mpi[0], send_buffers[0], HYPRE_Complex, size, HYPRE_MEMORY_HOST,
+                          memory_location);
+         }
+
+         recv_buffers_mpi = hypre_TAlloc(HYPRE_Complex *, num_recvs, HYPRE_MEMORY_HOST);
+         if (num_recvs > 0)
+         {
+            size = hypre_CommPkgRecvBufsize(comm_pkg);
+            recv_buffers_mpi[0] = hypre_CTAlloc(HYPRE_Complex, size, memory_location_mpi);
+            for (i = 1; i < num_recvs; i++)
+            {
+               recv_buffers_mpi[i] = recv_buffers_mpi[i - 1] + (recv_buffers[i] - recv_buffers[i - 1]);
+            }
+         }
       }
    }
+   else
+#endif
+   {
+      send_buffers_mpi = send_buffers;
+      recv_buffers_mpi = recv_buffers;
+   }
 
    for (i = 0; i < num_sends; i++)
    {
       comm_type = hypre_CommPkgSendType(comm_pkg, i);
       num_entries = hypre_CommTypeNumEntries(comm_type);
 
-      dptr = (HYPRE_Complex *) send_buffers[i];
       if ( hypre_CommPkgFirstComm(comm_pkg) )
       {
-         qptr = (HYPRE_Int *) send_buffers[i];
-         *qptr = num_entries;
+         qptr = (HYPRE_Int *) send_buffers_mpi[i];
+         hypre_TMemcpy(qptr, &num_entries,
+                       HYPRE_Int, 1, memory_location_mpi, HYPRE_MEMORY_HOST);
          qptr ++;
          hypre_TMemcpy(qptr, hypre_CommTypeRemBoxnums(comm_type),
-                       HYPRE_Int, num_entries, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
+                       HYPRE_Int, num_entries, memory_location_mpi, HYPRE_MEMORY_HOST);
          qptr += num_entries;
          hypre_TMemcpy(qptr, hypre_CommTypeRemBoxes(comm_type),
-                       hypre_Box, num_entries, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
+                       hypre_Box, num_entries, memory_location_mpi, HYPRE_MEMORY_HOST);
          hypre_CommTypeRemBoxnums(comm_type) = NULL;
-         hypre_CommTypeRemBoxes(comm_type)   = NULL;
+         hypre_CommTypeRemBoxes(comm_type) = NULL;
       }
    }
 
@@ -1031,7 +1036,7 @@ hypre_InitializeCommunication( hypre_CommPkg     *comm_pkg,
    for (i = 0; i < num_recvs; i++)
    {
       comm_type = hypre_CommPkgRecvType(comm_pkg, i);
-      hypre_MPI_Irecv(recv_buffers[i],
+      hypre_MPI_Irecv(recv_buffers_mpi[i],
                       hypre_CommTypeBufsize(comm_type)*sizeof(HYPRE_Complex),
                       hypre_MPI_BYTE, hypre_CommTypeProc(comm_type),
                       tag, comm, &requests[j++]);
@@ -1043,10 +1048,10 @@ hypre_InitializeCommunication( hypre_CommPkg     *comm_pkg,
       }
    }
 
-   for(i = 0; i < num_sends; i++)
+   for (i = 0; i < num_sends; i++)
    {
       comm_type = hypre_CommPkgSendType(comm_pkg, i);
-      hypre_MPI_Isend(send_buffers[i],
+      hypre_MPI_Isend(send_buffers_mpi[i],
                       hypre_CommTypeBufsize(comm_type)*sizeof(HYPRE_Complex),
                       hypre_MPI_BYTE, hypre_CommTypeProc(comm_type),
                       tag, comm, &requests[j++]);
@@ -1091,17 +1096,17 @@ hypre_InitializeCommunication( hypre_CommPkg     *comm_pkg,
 
    comm_handle = hypre_TAlloc(hypre_CommHandle, 1, HYPRE_MEMORY_HOST);
 
-   hypre_CommHandleCommPkg(comm_handle)     = comm_pkg;
-   hypre_CommHandleSendData(comm_handle)    = send_data;
-   hypre_CommHandleRecvData(comm_handle)    = recv_data;
-   hypre_CommHandleNumRequests(comm_handle) = num_requests;
-   hypre_CommHandleRequests(comm_handle)    = requests;
-   hypre_CommHandleStatus(comm_handle)      = status;
-   hypre_CommHandleSendBuffers(comm_handle) = send_buffers;
-   hypre_CommHandleRecvBuffers(comm_handle) = recv_buffers;
-   hypre_CommHandleAction(comm_handle)      = action;
-   hypre_CommHandleSendBuffersDevice(comm_handle) = send_buffers_device;
-   hypre_CommHandleRecvBuffersDevice(comm_handle) = recv_buffers_device;
+   hypre_CommHandleCommPkg(comm_handle)        = comm_pkg;
+   hypre_CommHandleSendData(comm_handle)       = send_data;
+   hypre_CommHandleRecvData(comm_handle)       = recv_data;
+   hypre_CommHandleNumRequests(comm_handle)    = num_requests;
+   hypre_CommHandleRequests(comm_handle)       = requests;
+   hypre_CommHandleStatus(comm_handle)         = status;
+   hypre_CommHandleSendBuffers(comm_handle)    = send_buffers;
+   hypre_CommHandleRecvBuffers(comm_handle)    = recv_buffers;
+   hypre_CommHandleAction(comm_handle)         = action;
+   hypre_CommHandleSendBuffersMPI(comm_handle) = send_buffers_mpi;
+   hypre_CommHandleRecvBuffersMPI(comm_handle) = recv_buffers_mpi;
 
    *comm_handle_ptr = comm_handle;
 
@@ -1119,10 +1124,12 @@ hypre_InitializeCommunication( hypre_CommPkg     *comm_pkg,
 HYPRE_Int
 hypre_FinalizeCommunication( hypre_CommHandle *comm_handle )
 {
-   hypre_CommPkg       *comm_pkg     = hypre_CommHandleCommPkg(comm_handle);
-   HYPRE_Complex      **send_buffers = hypre_CommHandleSendBuffers(comm_handle);
-   HYPRE_Complex      **recv_buffers = hypre_CommHandleRecvBuffers(comm_handle);
-   HYPRE_Int            action       = hypre_CommHandleAction(comm_handle);
+   hypre_CommPkg       *comm_pkg         = hypre_CommHandleCommPkg(comm_handle);
+   HYPRE_Complex      **send_buffers     = hypre_CommHandleSendBuffers(comm_handle);
+   HYPRE_Complex      **recv_buffers     = hypre_CommHandleRecvBuffers(comm_handle);
+   HYPRE_Complex      **send_buffers_mpi = hypre_CommHandleSendBuffersMPI(comm_handle);
+   HYPRE_Complex      **recv_buffers_mpi = hypre_CommHandleRecvBuffersMPI(comm_handle);
+   HYPRE_Int            action           = hypre_CommHandleAction(comm_handle);
 
    HYPRE_Int            ndim         = hypre_CommPkgNDim(comm_pkg);
    HYPRE_Int            num_values   = hypre_CommPkgNumValues(comm_pkg);
@@ -1134,7 +1141,7 @@ hypre_FinalizeCommunication( hypre_CommHandle *comm_handle )
    HYPRE_Int            num_entries;
 
    HYPRE_Int           *length_array;
-   HYPRE_Int           *stride_array, unitst_array[HYPRE_MAXDIM+1];
+   HYPRE_Int           *stride_array, unitst_array[HYPRE_MAXDIM + 1];
 
    HYPRE_Complex       *kptr, *lptr;
    HYPRE_Complex       *dptr;
@@ -1145,8 +1152,15 @@ hypre_FinalizeCommunication( hypre_CommHandle *comm_handle )
 
    HYPRE_Int            i, j, d, ll;
 
-   HYPRE_Complex      **send_buffers_device = hypre_CommHandleSendBuffersDevice(comm_handle);
-   HYPRE_Complex      **recv_buffers_device = hypre_CommHandleRecvBuffersDevice(comm_handle);
+   HYPRE_MemoryLocation memory_location     = hypre_HandleMemoryLocation(hypre_handle());
+   HYPRE_MemoryLocation memory_location_mpi = memory_location;
+
+#if defined(HYPRE_USING_GPU) || defined(HYPRE_USING_DEVICE_OPENMP)
+   if (!hypre_GetGpuAwareMPI())
+   {
+      memory_location_mpi = HYPRE_MEMORY_HOST;
+   }
+#endif
 
    /*--------------------------------------------------------------------
     * finish communications
@@ -1166,15 +1180,18 @@ hypre_FinalizeCommunication( hypre_CommHandle *comm_handle )
 
    if ( hypre_CommPkgFirstComm(comm_pkg) )
    {
-      hypre_CommEntryType  *ct_entries;
+      hypre_CommEntryType *ct_entries;
 
       num_entries = 0;
       for (i = 0; i < num_recvs; i++)
       {
          comm_type = hypre_CommPkgRecvType(comm_pkg, i);
 
-         qptr = (HYPRE_Int *) recv_buffers[i];
-         hypre_CommTypeNumEntries(comm_type) = *qptr;
+         qptr = (HYPRE_Int *) recv_buffers_mpi[i];
+
+         hypre_TMemcpy(&hypre_CommTypeNumEntries(comm_type), qptr,
+                       HYPRE_Int, 1, HYPRE_MEMORY_HOST, memory_location_mpi);
+
          num_entries += hypre_CommTypeNumEntries(comm_type);
       }
 
@@ -1185,15 +1202,34 @@ hypre_FinalizeCommunication( hypre_CommHandle *comm_handle )
       for (i = 0; i < num_recvs; i++)
       {
          comm_type = hypre_CommPkgRecvType(comm_pkg, i);
+
+         /* Assign the entries to the comm_type */
          hypre_CommTypeEntries(comm_type) = ct_entries;
-         ct_entries += hypre_CommTypeNumEntries(comm_type);
+         num_entries = hypre_CommTypeNumEntries(comm_type);
+         ct_entries += num_entries;
 
-         qptr = (HYPRE_Int *) recv_buffers[i];
-         num_entries = *qptr;
-         qptr ++;
-         boxnums = qptr;
-         qptr += num_entries;
-         boxes = (hypre_Box *) qptr;
+         qptr = (HYPRE_Int *) recv_buffers_mpi[i];
+         qptr++;
+
+         /* Set boxnums and boxes from MPI recv buffer */
+         if (!hypre_GetGpuAwareMPI())
+         {
+            boxnums = (HYPRE_Int*) qptr;
+            qptr += num_entries;
+            boxes = (hypre_Box*) qptr;
+         }
+         else
+         {
+            boxnums = hypre_TAlloc(HYPRE_Int, num_entries, HYPRE_MEMORY_HOST);
+            hypre_TMemcpy(boxnums, qptr, HYPRE_Int, num_entries,
+                          HYPRE_MEMORY_HOST, memory_location_mpi);
+            qptr += num_entries;
+            boxes = hypre_TAlloc(hypre_Box, num_entries, HYPRE_MEMORY_HOST);
+            hypre_TMemcpy(boxes, qptr, hypre_Box, num_entries,
+                          HYPRE_MEMORY_HOST, memory_location_mpi);
+         }
+
+         /* Set the entries for the comm_type */
          hypre_CommTypeSetEntries(comm_type, boxnums, boxes,
                                   hypre_CommPkgRecvStride(comm_pkg),
                                   hypre_CommPkgIdentityCoord(comm_pkg),
@@ -1201,6 +1237,13 @@ hypre_FinalizeCommunication( hypre_CommHandle *comm_handle )
                                   hypre_CommPkgIdentityOrder(comm_pkg),
                                   hypre_CommPkgRecvDataSpace(comm_pkg),
                                   hypre_CommPkgRecvDataOffsets(comm_pkg));
+
+         /* Free allocated memory if using GPU-aware MPI */
+         if (hypre_GetGpuAwareMPI())
+         {
+            hypre_TFree(boxnums, HYPRE_MEMORY_HOST);
+            hypre_TFree(boxes, HYPRE_MEMORY_HOST);
+         }
       }
    }
 
@@ -1208,35 +1251,18 @@ hypre_FinalizeCommunication( hypre_CommHandle *comm_handle )
     * unpack receive buffer data
     *--------------------------------------------------------------------*/
 
-   /* if boxloops run on GPUs, since cannot access host memory from device,
-    * copy the received buffer data in the host buffer to the device buffer,
-    * which was allocated in hypre_InitializeCommunication and has the same size of the host buffer
-    */
-    /* **be cautious to hypre_CommPkgRecvBufsize that is different in the first comm.** */
-
-   HYPRE_Int alloc_dev_buffer = 0;
-#if defined(HYPRE_USING_GPU)
-#if defined(HYPRE_USING_RAJA) || defined(HYPRE_USING_KOKKOS)
-   alloc_dev_buffer = 1;
-#elif defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-   alloc_dev_buffer = (hypre_HandleStructExecPolicy(hypre_handle()) == HYPRE_EXEC_DEVICE);
-#elif defined(HYPRE_USING_DEVICE_OPENMP)
-   alloc_dev_buffer = hypre__global_offload;
-#endif
-#endif
-
-   if (num_recvs > 0 && alloc_dev_buffer)
+   /* Note: hypre_CommPkgRecvBufsize is different in the first comm */
+   if (recv_buffers != recv_buffers_mpi)
    {
-      HYPRE_Complex  *dptr_host;
-      size_t recv_buf_size = hypre_CommPkgFirstComm(comm_pkg) ? hypre_CommPkgRecvBufsizeFirstComm(comm_pkg) :
-                                                                hypre_CommPkgRecvBufsize(comm_pkg);
+      if (num_recvs > 0)
+      {
+         HYPRE_Int recv_buf_size;
 
-      dptr_host = (HYPRE_Complex *) recv_buffers[0];
-      dptr      = (HYPRE_Complex *) recv_buffers_device[0];
+         recv_buf_size = hypre_CommPkgFirstComm(comm_pkg) ? hypre_CommPkgRecvBufsizeFirstComm(comm_pkg) :
+                         hypre_CommPkgRecvBufsize(comm_pkg);
 
-      if (dptr != dptr_host)
-      {
-         hypre_TMemcpy( dptr, dptr_host, HYPRE_Complex, recv_buf_size, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST );
+         hypre_TMemcpy(recv_buffers[0], recv_buffers_mpi[0], HYPRE_Complex, recv_buf_size,
+                       memory_location, memory_location_mpi);
       }
    }
 
@@ -1245,7 +1271,7 @@ hypre_FinalizeCommunication( hypre_CommHandle *comm_handle )
       comm_type = hypre_CommPkgRecvType(comm_pkg, i);
       num_entries = hypre_CommTypeNumEntries(comm_type);
 
-      dptr = (HYPRE_Complex *) recv_buffers_device[i];
+      dptr = (HYPRE_Complex *) recv_buffers[i];
 
       if ( hypre_CommPkgFirstComm(comm_pkg) )
       {
@@ -1260,14 +1286,14 @@ hypre_FinalizeCommunication( hypre_CommHandle *comm_handle )
          unitst_array[0] = 1;
          for (d = 1; d <= ndim; d++)
          {
-            unitst_array[d] = unitst_array[d-1]*length_array[d-1];
+            unitst_array[d] = unitst_array[d - 1] * length_array[d - 1];
          }
 
          lptr = hypre_CommHandleRecvData(comm_handle) +
-            hypre_CommEntryTypeOffset(comm_entry);
+                hypre_CommEntryTypeOffset(comm_entry);
          for (ll = 0; ll < num_values; ll++)
          {
-            kptr = lptr + ll*stride_array[ndim];
+            kptr = lptr + ll * stride_array[ndim];
 
 #define DEVICE_VAR is_device_ptr(kptr,dptr)
             hypre_BasicBoxLoop2Begin(ndim, length_array,
@@ -1305,34 +1331,29 @@ hypre_FinalizeCommunication( hypre_CommHandle *comm_handle )
    hypre_TFree(hypre_CommHandleStatus(comm_handle), HYPRE_MEMORY_HOST);
    if (num_sends > 0)
    {
-       hypre_TFree(send_buffers[0], HYPRE_MEMORY_HOST);
+      hypre_StructCommunicationReleaseBuffer(send_buffers[0], memory_location);
    }
    if (num_recvs > 0)
    {
-       hypre_TFree(recv_buffers[0], HYPRE_MEMORY_HOST);
+      hypre_StructCommunicationReleaseBuffer(recv_buffers[0], memory_location);
    }
 
    hypre_TFree(comm_handle, HYPRE_MEMORY_HOST);
 
-   if (send_buffers == send_buffers_device)
+   if (send_buffers != send_buffers_mpi)
    {
-      hypre_TFree(send_buffers, HYPRE_MEMORY_HOST);
+      hypre_TFree(send_buffers_mpi[0], memory_location_mpi);
+      hypre_TFree(send_buffers_mpi, HYPRE_MEMORY_HOST);
    }
-   else
-   {
-      hypre_TFree(send_buffers, HYPRE_MEMORY_HOST);
-      hypre_TFree(send_buffers_device, HYPRE_MEMORY_HOST);
-   }
-   if (recv_buffers == recv_buffers_device)
+   if (recv_buffers != recv_buffers_mpi)
    {
-      hypre_TFree(recv_buffers, HYPRE_MEMORY_HOST);
-   }
-   else
-   {
-      hypre_TFree(recv_buffers, HYPRE_MEMORY_HOST);
-      hypre_TFree(recv_buffers_device, HYPRE_MEMORY_HOST);
+      hypre_TFree(recv_buffers_mpi[0], memory_location_mpi);
+      hypre_TFree(recv_buffers_mpi, HYPRE_MEMORY_HOST);
    }
 
+   hypre_TFree(send_buffers, HYPRE_MEMORY_HOST);
+   hypre_TFree(recv_buffers, HYPRE_MEMORY_HOST);
+
    return hypre_error_flag;
 }
 
@@ -1392,8 +1413,8 @@ hypre_ExchangeLocalData( hypre_CommPkg *comm_pkg,
          {
             if (order[ll] > -1)
             {
-               fr_dpl = fr_dp + (order[ll])*fr_stride_array[ndim];
-               to_dpl = to_dp + (      ll )*to_stride_array[ndim];
+               fr_dpl = fr_dp + (order[ll]) * fr_stride_array[ndim];
+               to_dpl = to_dp + (      ll ) * to_stride_array[ndim];
 
 #define DEVICE_VAR is_device_ptr(to_dpl,fr_dpl)
                hypre_BasicBoxLoop2Begin(ndim, length_array,
diff --git a/external/hypre/src/struct_mv/struct_communication.h b/external/hypre/src/struct_mv/struct_communication.h
index fcb9bf87..fa5ddf1a 100644
--- a/external/hypre/src/struct_mv/struct_communication.h
+++ b/external/hypre/src/struct_mv/struct_communication.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -50,7 +50,7 @@ typedef struct hypre_CommEntryType_struct
    HYPRE_Int  offset;                       /* offset for the data */
    HYPRE_Int  dim;                          /* dimension of the communication */
    HYPRE_Int  length_array[HYPRE_MAXDIM];   /* last dim has length num_values */
-   HYPRE_Int  stride_array[HYPRE_MAXDIM+1];
+   HYPRE_Int  stride_array[HYPRE_MAXDIM + 1];
    HYPRE_Int *order;                        /* order of last dim values */
 
 } hypre_CommEntryType;
@@ -79,43 +79,50 @@ typedef struct hypre_CommType_struct
 
 typedef struct hypre_CommPkg_struct
 {
-   MPI_Comm          comm;
+   MPI_Comm             comm;
 
-   HYPRE_Int         first_comm; /* is this the first communication? */
+   /* is this the first communication? */
+   HYPRE_Int            first_comm;
 
-   HYPRE_Int         ndim;
-   HYPRE_Int         num_values;
-   hypre_Index       send_stride;
-   hypre_Index       recv_stride;
+   HYPRE_Int            ndim;
+   HYPRE_Int            num_values;
+   hypre_Index          send_stride;
+   hypre_Index          recv_stride;
 
-   HYPRE_Int         send_bufsize;            /* total send buffer size (in doubles) */
-   HYPRE_Int         recv_bufsize;            /* total recv buffer size (in doubles) */
-   HYPRE_Int         send_bufsize_first_comm; /* total send buffer size (in doubles) at the first comm. */
-   HYPRE_Int         recv_bufsize_first_comm; /* total recv buffer size (in doubles) at the first comm. */
+   /* total send buffer size (in doubles) */
+   HYPRE_Int            send_bufsize;
+   /* total recv buffer size (in doubles) */
+   HYPRE_Int            recv_bufsize;
+   /* total send buffer size (in doubles) at the first comm. */
+   HYPRE_Int            send_bufsize_first_comm;
+   /* total recv buffer size (in doubles) at the first comm. */
+   HYPRE_Int            recv_bufsize_first_comm;
 
-   HYPRE_Int         num_sends;
-   HYPRE_Int         num_recvs;
-   hypre_CommType   *send_types;
-   hypre_CommType   *recv_types;
+   HYPRE_Int            num_sends;
+   HYPRE_Int            num_recvs;
+   hypre_CommType      *send_types;
+   hypre_CommType      *recv_types;
 
-   hypre_CommType   *copy_from_type;
-   hypre_CommType   *copy_to_type;
+   hypre_CommType      *copy_from_type;
+   hypre_CommType      *copy_to_type;
 
    /* these pointers are just to help free up memory for send/from types */
    hypre_CommEntryType *entries;
    HYPRE_Int           *rem_boxnums;
    hypre_Box           *rem_boxes;
 
-   HYPRE_Int         num_orders;
-   HYPRE_Int       **orders;            /* num_orders x num_values */
+   HYPRE_Int            num_orders;
+   /* num_orders x num_values */
+   HYPRE_Int          **orders;
 
-   HYPRE_Int        *recv_data_offsets; /* offsets into recv data (by box) */
-   hypre_BoxArray   *recv_data_space;   /* recv data dimensions (by box) */
-
-   hypre_Index       identity_coord;
-   hypre_Index       identity_dir;
-   HYPRE_Int        *identity_order;
+   /* offsets into recv data (by box) */
+   HYPRE_Int           *recv_data_offsets;
+   /* recv data dimensions (by box) */
+   hypre_BoxArray      *recv_data_space;
 
+   hypre_Index          identity_coord;
+   hypre_Index          identity_dir;
+   HYPRE_Int           *identity_order;
 } hypre_CommPkg;
 
 /*--------------------------------------------------------------------------
@@ -135,9 +142,8 @@ typedef struct hypre_CommHandle_struct
    HYPRE_Complex    **send_buffers;
    HYPRE_Complex    **recv_buffers;
 
-   /* these are copies of send/recv buffers on device */
-   HYPRE_Complex    **send_buffers_device;
-   HYPRE_Complex    **recv_buffers_device;
+   HYPRE_Complex    **send_buffers_mpi;
+   HYPRE_Complex    **recv_buffers_mpi;
 
    /* set = 0, add = 1 */
    HYPRE_Int          action;
@@ -248,7 +254,7 @@ typedef struct hypre_CommHandle_struct
 #define hypre_CommHandleSendBuffers(comm_handle)          (comm_handle -> send_buffers)
 #define hypre_CommHandleRecvBuffers(comm_handle)          (comm_handle -> recv_buffers)
 #define hypre_CommHandleAction(comm_handle)               (comm_handle -> action)
-#define hypre_CommHandleSendBuffersDevice(comm_handle)    (comm_handle -> send_buffers_device)
-#define hypre_CommHandleRecvBuffersDevice(comm_handle)    (comm_handle -> recv_buffers_device)
+#define hypre_CommHandleSendBuffersMPI(comm_handle)       (comm_handle -> send_buffers_mpi)
+#define hypre_CommHandleRecvBuffersMPI(comm_handle)       (comm_handle -> recv_buffers_mpi)
 
 #endif
diff --git a/external/hypre/src/struct_mv/struct_copy.c b/external/hypre/src/struct_mv/struct_copy.c
index a9f30af6..425fc641 100644
--- a/external/hypre/src/struct_mv/struct_copy.c
+++ b/external/hypre/src/struct_mv/struct_copy.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/struct_mv/struct_grid.c b/external/hypre/src/struct_mv/struct_grid.c
index c98e6b43..254a47fa 100644
--- a/external/hypre/src/struct_mv/struct_grid.c
+++ b/external/hypre/src/struct_mv/struct_grid.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -42,7 +42,7 @@ hypre_StructGridCreate( MPI_Comm           comm,
    hypre_StructGridBoxes(grid)       = hypre_BoxArrayCreate(0, ndim);
    hypre_StructGridIDs(grid)         = NULL;
 
-   hypre_SetIndex(hypre_StructGridMaxDistance(grid),8);
+   hypre_SetIndex(hypre_StructGridMaxDistance(grid), 8);
 
    hypre_StructGridBoundingBox(grid) = NULL;
    hypre_StructGridLocalSize(grid)   = 0;
@@ -55,14 +55,11 @@ hypre_StructGridCreate( MPI_Comm           comm,
    hypre_StructGridPShifts(grid)     = NULL;
 
    hypre_StructGridGhlocalSize(grid)  = 0;
-   for (i = 0; i < 2*ndim; i++)
+   for (i = 0; i < 2 * ndim; i++)
    {
       hypre_StructGridNumGhost(grid)[i] = 1;
    }
 
-#if 0 //defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-   hypre_StructGridDataLocation(grid) = HYPRE_MEMORY_DEVICE;
-#endif
    *grid_ptr = grid;
 
    return hypre_error_flag;
@@ -243,7 +240,7 @@ hypre_StructGridAssemble( hypre_StructGrid *grid )
    HYPRE_Int *ids = NULL;
    HYPRE_Int  iperiodic, notcenter;
 
-   HYPRE_Int  sendbuf6[2*HYPRE_MAXDIM], recvbuf6[2*HYPRE_MAXDIM];
+   HYPRE_Int  sendbuf6[2 * HYPRE_MAXDIM], recvbuf6[2 * HYPRE_MAXDIM];
 
    hypre_Box  *box;
    hypre_Box  *ghostbox;
@@ -268,7 +265,9 @@ hypre_StructGridAssemble( hypre_StructGrid *grid )
    HYPRE_Int           *numghost     = hypre_StructGridNumGhost(grid);
 
    if (!time_index)
+   {
       time_index = hypre_InitializeTiming("StructGridAssemble");
+   }
 
    hypre_BeginTiming(time_index);
 
@@ -293,7 +292,7 @@ hypre_StructGridAssemble( hypre_StructGrid *grid )
    if (hypre_StructGridIDs(grid) == NULL)
    {
       ids = hypre_CTAlloc(HYPRE_Int,  num_local_boxes, HYPRE_MEMORY_HOST);
-      for (i=0; i< num_local_boxes; i++)
+      for (i = 0; i < num_local_boxes; i++)
       {
          ids[i] = i;
       }
@@ -434,15 +433,15 @@ hypre_StructGridAssemble( hypre_StructGrid *grid )
       for (d = 0; d < ndim; d++)
       {
          sendbuf6[d] = hypre_BoxIMinD(bounding_box, d);
-         sendbuf6[d+ndim] = -hypre_BoxIMaxD(bounding_box, d);
+         sendbuf6[d + ndim] = -hypre_BoxIMaxD(bounding_box, d);
       }
-      hypre_MPI_Allreduce(sendbuf6, recvbuf6, 2*ndim, HYPRE_MPI_INT,
+      hypre_MPI_Allreduce(sendbuf6, recvbuf6, 2 * ndim, HYPRE_MPI_INT,
                           hypre_MPI_MIN, comm);
       /* unpack buffer */
       for (d = 0; d < ndim; d++)
       {
          hypre_BoxIMinD(bounding_box, d) = recvbuf6[d];
-         hypre_BoxIMaxD(bounding_box, d) = -recvbuf6[d+ndim];
+         hypre_BoxIMaxD(bounding_box, d) = -recvbuf6[d + ndim];
       }
 
       hypre_StructGridBoundingBox(grid) = bounding_box;
@@ -470,13 +469,13 @@ hypre_StructGridAssemble( hypre_StructGrid *grid )
                                myid, i, entry_info );
 
          /* now expand box by max_distance or larger and gather entries */
-         hypre_CopyBox(box ,grow_box);
+         hypre_CopyBox(box, grow_box);
          hypre_BoxGrowByIndex(grow_box, max_distance);
          hypre_BoxManGatherEntries(boxman, hypre_BoxIMin(grow_box),
                                    hypre_BoxIMax(grow_box));
 
          /* now repeat for any periodic boxes - by shifting the grow_box*/
-         for (k=1; k < num_periods; k++) /* k=0 is original box */
+         for (k = 1; k < num_periods; k++) /* k=0 is original box */
          {
             hypre_CopyBox(grow_box, periodic_box);
             pshift = pshifts[k];
@@ -516,13 +515,13 @@ hypre_StructGridAssemble( hypre_StructGrid *grid )
          box = hypre_BoxArrayBox(local_boxes, i);
 
          /* now expand box by max_distance or larger and gather entries */
-         hypre_CopyBox(box ,grow_box);
+         hypre_CopyBox(box, grow_box);
          hypre_BoxGrowByIndex(grow_box, max_distance);
          hypre_BoxManGatherEntries(boxman, hypre_BoxIMin(grow_box),
                                    hypre_BoxIMax(grow_box));
 
          /* now repeat for any periodic boxes - by shifting the grow_box*/
-         for (k=1; k < num_periods; k++) /* k=0 is original box */
+         for (k = 1; k < num_periods; k++) /* k=0 is original box */
          {
             hypre_CopyBox(grow_box, periodic_box);
             pshift = pshifts[k];
@@ -596,8 +595,8 @@ hypre_GatherAllBoxes(MPI_Comm         comm,
    hypre_MPI_Comm_rank(comm, &my_rank);
 
    /* compute recvcounts and displs */
-   item_size = 2*ndim + 1;
-   sendcount = item_size*hypre_BoxArraySize(boxes);
+   item_size = 2 * ndim + 1;
+   sendcount = item_size * hypre_BoxArraySize(boxes);
    recvcounts =  hypre_TAlloc(HYPRE_Int,  num_all_procs, HYPRE_MEMORY_HOST);
    displs = hypre_TAlloc(HYPRE_Int,  num_all_procs, HYPRE_MEMORY_HOST);
    hypre_MPI_Allgather(&sendcount, 1, HYPRE_MPI_INT,
@@ -606,7 +605,7 @@ hypre_GatherAllBoxes(MPI_Comm         comm,
    recvbuf_size = recvcounts[0];
    for (p = 1; p < num_all_procs; p++)
    {
-      displs[p] = displs[p-1] + recvcounts[p-1];
+      displs[p] = displs[p - 1] + recvcounts[p - 1];
       recvbuf_size += recvcounts[p];
    }
 
@@ -671,8 +670,8 @@ hypre_GatherAllBoxes(MPI_Comm         comm,
     *-----------------------------------------------------*/
 
    hypre_TFree(sendbuf, HYPRE_MEMORY_HOST);
-    hypre_TFree(recvbuf, HYPRE_MEMORY_HOST);
-    hypre_TFree(recvcounts, HYPRE_MEMORY_HOST);
+   hypre_TFree(recvbuf, HYPRE_MEMORY_HOST);
+   hypre_TFree(recvcounts, HYPRE_MEMORY_HOST);
    hypre_TFree(displs, HYPRE_MEMORY_HOST);
 
    *all_boxes_ptr   = all_boxes;
@@ -701,7 +700,8 @@ hypre_ComputeBoxnums(hypre_BoxArray *boxes,
 
    HYPRE_Int         *boxnums;
    HYPRE_Int          num_boxes;
-   HYPRE_Int          p, b, boxnum;
+   HYPRE_Int          p, b;
+   HYPRE_Int          boxnum = 0;
 
    /*-----------------------------------------------------
     *-----------------------------------------------------*/
@@ -710,7 +710,7 @@ hypre_ComputeBoxnums(hypre_BoxArray *boxes,
    boxnums = hypre_TAlloc(HYPRE_Int,  num_boxes, HYPRE_MEMORY_HOST);
 
    p = -1;
-   for(b = 0; b < num_boxes; b++)
+   for (b = 0; b < num_boxes; b++)
    {
       /* start boxnum count at zero for each new process */
       if (procs[b] != p)
@@ -847,7 +847,7 @@ hypre_StructGridSetNumGhost( hypre_StructGrid *grid, HYPRE_Int  *num_ghost )
 {
    HYPRE_Int  i, ndim = hypre_StructGridNDim(grid);
 
-   for (i = 0; i < 2*ndim; i++)
+   for (i = 0; i < 2 * ndim; i++)
    {
       hypre_StructGridNumGhost(grid)[i] = num_ghost[i];
    }
@@ -855,29 +855,28 @@ hypre_StructGridSetNumGhost( hypre_StructGrid *grid, HYPRE_Int  *num_ghost )
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_StructGridGetMaxBoxSize
+ *--------------------------------------------------------------------------*/
 
-#if 0 //defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
 HYPRE_Int
-hypre_StructGridGetMaxBoxSize(hypre_StructGrid *grid)
+hypre_StructGridGetMaxBoxSize( hypre_StructGrid *grid )
 {
-   hypre_Box  *box;
-   hypre_BoxArray  *boxes;
-   HYPRE_Int box_size;
-   HYPRE_Int i;
-   HYPRE_Int        max_box_size = 0;
+   hypre_BoxArray   *boxes;
+   hypre_Box        *box;
+   HYPRE_Int         i, max_box_size = 0;
+
    boxes = hypre_StructGridBoxes(grid);
    hypre_ForBoxI(i, boxes)
    {
       box = hypre_BoxArrayBox(hypre_StructGridBoxes(grid), i);
-      box_size = hypre_BoxVolume(box);
-      if (box_size > max_box_size)
-      {
-         max_box_size = box_size;
-      }
+      max_box_size = hypre_max(max_box_size, hypre_BoxVolume(box));
    }
+
    return max_box_size;
 }
 
+#if 0 //defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
 HYPRE_Int
 hypre_StructGridSetDataLocation( HYPRE_StructGrid grid, HYPRE_MemoryLocation data_location )
 {
diff --git a/external/hypre/src/struct_mv/struct_grid.h b/external/hypre/src/struct_mv/struct_grid.h
index 3d4c43b6..d22a4aca 100644
--- a/external/hypre/src/struct_mv/struct_grid.h
+++ b/external/hypre/src/struct_mv/struct_grid.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -43,12 +43,9 @@ typedef struct hypre_StructGrid_struct
 
 
    HYPRE_Int            ghlocal_size; /* Number of vars in box including ghosts */
-   HYPRE_Int            num_ghost[2*HYPRE_MAXDIM]; /* ghost layer size */
+   HYPRE_Int            num_ghost[2 * HYPRE_MAXDIM]; /* ghost layer size */
 
    hypre_BoxManager    *boxman;
-#if 0 //defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-   HYPRE_MemoryLocation data_location;
-#endif
 } hypre_StructGrid;
 
 /*--------------------------------------------------------------------------
diff --git a/external/hypre/src/struct_mv/struct_innerprod.c b/external/hypre/src/struct_mv/struct_innerprod.c
index 497cd428..d15b5cc0 100644
--- a/external/hypre/src/struct_mv/struct_innerprod.c
+++ b/external/hypre/src/struct_mv/struct_innerprod.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -62,7 +62,7 @@ hypre_StructInnerProd( hypre_StructVector *x,
 
       hypre_BoxGetSize(box, loop_size);
 
-#if defined(HYPRE_USING_KOKKOS)
+#if defined(HYPRE_USING_KOKKOS) || defined(HYPRE_USING_SYCL)
       HYPRE_Real box_sum = 0.0;
 #elif defined(HYPRE_USING_RAJA)
       ReduceSum<hypre_raja_reduce_policy, HYPRE_Real> box_sum(0.0);
@@ -101,7 +101,7 @@ hypre_StructInnerProd( hypre_StructVector *x,
    hypre_MPI_Allreduce(&process_result, &final_innerprod_result, 1,
                        HYPRE_MPI_REAL, hypre_MPI_SUM, hypre_StructVectorComm(x));
 
-   hypre_IncFLOPCount(2*hypre_StructVectorGlobalSize(x));
+   hypre_IncFLOPCount(2 * hypre_StructVectorGlobalSize(x));
 
    return final_innerprod_result;
 }
diff --git a/external/hypre/src/struct_mv/struct_io.c b/external/hypre/src/struct_mv/struct_io.c
index 0b69e85c..34046c4f 100644
--- a/external/hypre/src/struct_mv/struct_io.c
+++ b/external/hypre/src/struct_mv/struct_io.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -15,6 +15,8 @@
 
 /*--------------------------------------------------------------------------
  * hypre_PrintBoxArrayData
+ *
+ * Note: data array is expected to live on the host memory.
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
@@ -37,32 +39,9 @@ hypre_PrintBoxArrayData( FILE            *file,
 
    HYPRE_Int        i, j, d;
    HYPRE_Complex    value;
-   HYPRE_Complex   *data_host;
-   HYPRE_Complex   *data_host_saved = NULL;
-
-   /*----------------------------------------
-    * Print data
-    *----------------------------------------*/
-   if (hypre_GetActualMemLocation(HYPRE_MEMORY_DEVICE) != hypre_MEMORY_HOST)
-   {
-      HYPRE_Int tot_size = 0;
-      hypre_ForBoxI(i, data_space)
-      {
-         data_box = hypre_BoxArrayBox(data_space, i);
-         data_box_volume = hypre_BoxVolume(data_box);
-         tot_size += num_values * data_box_volume;
-      }
-      data_host = hypre_CTAlloc(HYPRE_Complex, tot_size, HYPRE_MEMORY_HOST);
-      hypre_TMemcpy(data_host, data, HYPRE_Complex, tot_size, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
-      data_host_saved = data_host;
-   }
-   else
-   {
-      data_host = data;
-   }
 
+   /* Print data from the host */
    hypre_SetIndex(stride, 1);
-
    hypre_ForBoxI(i, box_array)
    {
       box      = hypre_BoxArrayBox(box_array, i);
@@ -87,7 +66,7 @@ hypre_PrintBoxArrayData( FILE            *file,
                hypre_fprintf(file, ", %d",
                              hypre_IndexD(start, d) + hypre_IndexD(index, d));
             }
-            value = data_host[datai + j*data_box_volume];
+            value = data[datai + j * data_box_volume];
 #ifdef HYPRE_COMPLEX
             hypre_fprintf(file, "; %d) %.14e , %.14e\n",
                           j, hypre_creal(value), hypre_cimag(value));
@@ -98,18 +77,20 @@ hypre_PrintBoxArrayData( FILE            *file,
       }
       hypre_SerialBoxLoop1End(datai);
 
-      data_host += num_values*data_box_volume;
+      data += num_values * data_box_volume;
    }
 
-   hypre_TFree(data_host_saved, HYPRE_MEMORY_HOST);
-
    return hypre_error_flag;
 }
 
 /*--------------------------------------------------------------------------
  * hypre_PrintCCVDBoxArrayData
- * Note that the the stencil loop (j) is _outside_ the space index loop (datai),
- * unlie hypre_PrintBoxArrayData (there is no j loop in hypre_PrintCCBoxArrayData)
+ *
+ * Note that the the stencil loop (j) is _outside_ the space index loop
+ * (datai), unlike hypre_PrintBoxArrayData (there is no j loop in
+ * hypre_PrintCCBoxArrayData)
+ *
+ * Note: data array is expected to live on the host memory.
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
@@ -123,6 +104,9 @@ hypre_PrintCCVDBoxArrayData( FILE            *file,
                              HYPRE_Int        dim,
                              HYPRE_Complex   *data       )
 {
+   HYPRE_UNUSED_VAR(num_values);
+   HYPRE_UNUSED_VAR(data_space);
+
    hypre_Box       *box;
    hypre_Box       *data_box;
 
@@ -143,9 +127,9 @@ hypre_PrintCCVDBoxArrayData( FILE            *file,
    hypre_SetIndex(stride, 1);
 
    /* First is the constant, off-diagonal, part of the matrix: */
-   for (  j=0; j<stencil_size; ++j )
+   for (j = 0; j < stencil_size; j++)
    {
-      if (symm_elements[j] < 0 && j!=center_rank )
+      if (symm_elements[j] < 0 && j != center_rank)
       {
 #ifdef HYPRE_COMPLEX
          hypre_fprintf( file, "*: (*, *, *; %d) %.14e , %.14e\n",
@@ -158,7 +142,6 @@ hypre_PrintCCVDBoxArrayData( FILE            *file,
       ++data;
    }
 
-
    /* Then each box has a variable, diagonal, part of the matrix: */
    hypre_ForBoxI(i, box_array)
    {
@@ -199,7 +182,10 @@ hypre_PrintCCVDBoxArrayData( FILE            *file,
 
 /*--------------------------------------------------------------------------
  * hypre_PrintCCBoxArrayData
+ *
  * same as hypre_PrintBoxArrayData but for constant coefficients
+ *
+ * Note: data array is expected to live on the host memory.
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
@@ -209,6 +195,8 @@ hypre_PrintCCBoxArrayData( FILE            *file,
                            HYPRE_Int        num_values,
                            HYPRE_Complex   *data       )
 {
+   HYPRE_UNUSED_VAR(data_space);
+
    HYPRE_Int        datai;
 
    HYPRE_Int        i, j;
@@ -241,6 +229,8 @@ hypre_PrintCCBoxArrayData( FILE            *file,
 
 /*--------------------------------------------------------------------------
  * hypre_ReadBoxArrayData  (for non-constant coefficients)
+ *
+ * Note: data array is expected to live on the host memory.
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
@@ -262,12 +252,8 @@ hypre_ReadBoxArrayData( FILE            *file,
 
    HYPRE_Int        i, j, d, idummy;
 
-   /*----------------------------------------
-    * Read data
-    *----------------------------------------*/
-
+   /* Read data on the host */
    hypre_SetIndex(stride, 1);
-
    hypre_ForBoxI(i, box_array)
    {
       box      = hypre_BoxArrayBox(box_array, i);
@@ -290,12 +276,12 @@ hypre_ReadBoxArrayData( FILE            *file,
                hypre_fscanf(file, ", %d", &idummy);
             }
             hypre_fscanf(file, "; %d) %le\n",
-                         &idummy, &data[datai + j*data_box_volume]);
+                         &idummy, &data[datai + j * data_box_volume]);
          }
       }
       hypre_SerialBoxLoop1End(datai);
 
-      data += num_values*data_box_volume;
+      data += num_values * data_box_volume;
    }
 
    return hypre_error_flag;
@@ -303,6 +289,8 @@ hypre_ReadBoxArrayData( FILE            *file,
 
 /*--------------------------------------------------------------------------
  * hypre_ReadBoxArrayData_CC  (for when there are some constant coefficients)
+ *
+ * Note: data array is expected to live on the host memory.
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
@@ -318,7 +306,8 @@ hypre_ReadBoxArrayData_CC( FILE            *file,
    hypre_Box       *box;
    hypre_Box       *data_box;
 
-   HYPRE_Int        data_box_volume, constant_stencil_size;
+   HYPRE_Int        data_box_volume;
+   HYPRE_Int        constant_stencil_size;
 
    hypre_Index      loop_size;
    hypre_IndexRef   start;
@@ -330,11 +319,22 @@ hypre_ReadBoxArrayData_CC( FILE            *file,
     * Read data
     *----------------------------------------*/
 
-   if ( constant_coefficient==1 ) constant_stencil_size = stencil_size;
-   if ( constant_coefficient==2 ) constant_stencil_size = stencil_size - 1;
+   switch (constant_coefficient)
+   {
+      case 1:
+         constant_stencil_size = stencil_size;
+         break;
+
+      case 2:
+         constant_stencil_size = stencil_size - 1;
+         break;
 
-   hypre_SetIndex(stride, 1);
+      default:
+         constant_stencil_size = 0;
+         break;
+   }
 
+   hypre_SetIndex(stride, 1);
    hypre_ForBoxI(i, box_array)
    {
       box      = hypre_BoxArrayBox(box_array, i);
@@ -348,7 +348,7 @@ hypre_ReadBoxArrayData_CC( FILE            *file,
       /* First entries will be the constant part of the matrix.
          There is one entry for each constant stencil element,
          excluding ones which are redundant due to symmetry.*/
-      for (j=0; j <constant_stencil_size; j++)
+      for (j = 0; j < constant_stencil_size; j++)
       {
          hypre_fscanf(file, "*: (*, *, *; %d) %le\n", &idummy, &data[j]);
       }
@@ -356,7 +356,7 @@ hypre_ReadBoxArrayData_CC( FILE            *file,
       /* Next entries, if any, will be for a variable diagonal: */
       data += real_stencil_size;
 
-      if ( constant_coefficient==2 )
+      if (constant_coefficient == 2)
       {
          hypre_SerialBoxLoop1Begin(dim, loop_size,
                                    data_box, start, stride, datai);
@@ -372,9 +372,7 @@ hypre_ReadBoxArrayData_CC( FILE            *file,
          hypre_SerialBoxLoop1End(datai);
          data += data_box_volume;
       }
-
    }
 
    return hypre_error_flag;
 }
-
diff --git a/external/hypre/src/struct_mv/struct_matrix.c b/external/hypre/src/struct_mv/struct_matrix.c
index 5cdd8582..e4131e3a 100644
--- a/external/hypre/src/struct_mv/struct_matrix.c
+++ b/external/hypre/src/struct_mv/struct_matrix.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -55,7 +55,7 @@ hypre_StructMatrixCreate( MPI_Comm             comm,
    hypre_StructMatrix  *matrix;
    HYPRE_Int            i;
 
-   matrix = hypre_CTAlloc(hypre_StructMatrix,  1, HYPRE_MEMORY_HOST);
+   matrix = hypre_CTAlloc(hypre_StructMatrix, 1, HYPRE_MEMORY_HOST);
 
    hypre_StructMatrixComm(matrix)        = comm;
    hypre_StructGridRef(grid, &hypre_StructMatrixGrid(matrix));
@@ -66,11 +66,13 @@ hypre_StructMatrixCreate( MPI_Comm             comm,
    /* set defaults */
    hypre_StructMatrixSymmetric(matrix) = 0;
    hypre_StructMatrixConstantCoefficient(matrix) = 0;
-   for (i = 0; i < 2*ndim; i++)
+   for (i = 0; i < 2 * ndim; i++)
    {
       hypre_StructMatrixNumGhost(matrix)[i] = hypre_StructGridNumGhost(grid)[i];
    }
 
+   hypre_StructMatrixMemoryLocation(matrix) = hypre_HandleMemoryLocation(hypre_handle());
+
    return matrix;
 }
 
@@ -100,16 +102,16 @@ hypre_StructMatrixDestroy( hypre_StructMatrix *matrix )
       {
          if (hypre_StructMatrixDataAlloced(matrix))
          {
-            hypre_TFree(hypre_StructMatrixData(matrix),HYPRE_MEMORY_DEVICE);
-            hypre_TFree(hypre_StructMatrixDataConst(matrix),HYPRE_MEMORY_HOST);
+            hypre_TFree(hypre_StructMatrixData(matrix), hypre_StructMatrixMemoryLocation(matrix));
+            hypre_TFree(hypre_StructMatrixDataConst(matrix), HYPRE_MEMORY_HOST);
          }
-         hypre_TFree(hypre_StructMatrixStencilData(matrix),HYPRE_MEMORY_HOST);
+         hypre_TFree(hypre_StructMatrixStencilData(matrix), HYPRE_MEMORY_HOST);
          hypre_CommPkgDestroy(hypre_StructMatrixCommPkg(matrix));
          if (hypre_BoxArraySize(hypre_StructMatrixDataSpace(matrix)) > 0)
          {
-            hypre_TFree(hypre_StructMatrixDataIndices(matrix)[0],HYPRE_MEMORY_HOST);
+            hypre_TFree(hypre_StructMatrixDataIndices(matrix)[0], HYPRE_MEMORY_HOST);
          }
-         hypre_TFree(hypre_StructMatrixDataIndices(matrix),HYPRE_MEMORY_HOST);
+         hypre_TFree(hypre_StructMatrixDataIndices(matrix), HYPRE_MEMORY_HOST);
          hypre_BoxArrayDestroy(hypre_StructMatrixDataSpace(matrix));
          hypre_TFree(hypre_StructMatrixSymmElements(matrix), HYPRE_MEMORY_HOST);
          hypre_StructStencilDestroy(hypre_StructMatrixUserStencil(matrix));
@@ -142,7 +144,7 @@ hypre_StructMatrixInitializeShell( hypre_StructMatrix *matrix )
    HYPRE_Int             constant_coefficient;
 
    HYPRE_Int            *num_ghost;
-   HYPRE_Int             extra_ghost[2*HYPRE_MAXDIM];
+   HYPRE_Int             extra_ghost[2 * HYPRE_MAXDIM];
 
    hypre_BoxArray       *data_space;
    hypre_BoxArray       *boxes;
@@ -211,7 +213,7 @@ hypre_StructMatrixInitializeShell( hypre_StructMatrix *matrix )
    stencil_data  = hypre_TAlloc(HYPRE_Complex*, stencil_size, HYPRE_MEMORY_HOST);
    hypre_StructMatrixStencilData(matrix) = stencil_data;
 
-   for (d = 0; d < 2*ndim; d++)
+   for (d = 0; d < 2 * ndim; d++)
    {
       extra_ghost[d] = 0;
    }
@@ -222,18 +224,18 @@ hypre_StructMatrixInitializeShell( hypre_StructMatrix *matrix )
       {
          for (d = 0; d < ndim; d++)
          {
-            extra_ghost[2*d]     = hypre_max( extra_ghost[2*d],
-                                             -hypre_IndexD(stencil_shape[i], d) );
-            extra_ghost[2*d + 1] = hypre_max( extra_ghost[2*d + 1],
-                                              hypre_IndexD(stencil_shape[i], d) );
+            extra_ghost[2 * d]     = hypre_max( extra_ghost[2 * d],
+                                                -hypre_IndexD(stencil_shape[i], d) );
+            extra_ghost[2 * d + 1] = hypre_max( extra_ghost[2 * d + 1],
+                                                hypre_IndexD(stencil_shape[i], d) );
          }
       }
    }
 
    for (d = 0; d < ndim; d++)
    {
-      num_ghost[2*d]     += extra_ghost[2*d];
-      num_ghost[2*d + 1] += extra_ghost[2*d + 1];
+      num_ghost[2 * d]     += extra_ghost[2 * d];
+      num_ghost[2 * d + 1] += extra_ghost[2 * d + 1];
    }
 
    /*-----------------------------------------------------------------------
@@ -253,8 +255,8 @@ hypre_StructMatrixInitializeShell( hypre_StructMatrix *matrix )
          hypre_CopyBox(box, data_box);
          for (d = 0; d < ndim; d++)
          {
-            hypre_BoxIMinD(data_box, d) -= num_ghost[2*d];
-            hypre_BoxIMaxD(data_box, d) += num_ghost[2*d + 1];
+            hypre_BoxIMinD(data_box, d) -= num_ghost[2 * d];
+            hypre_BoxIMaxD(data_box, d) += num_ghost[2 * d + 1];
          }
       }
 
@@ -272,7 +274,7 @@ hypre_StructMatrixInitializeShell( hypre_StructMatrix *matrix )
                                   HYPRE_MEMORY_HOST);
       if (hypre_BoxArraySize(data_space) > 0)
       {
-         data_indices[0] = hypre_TAlloc(HYPRE_Int, stencil_size*hypre_BoxArraySize(data_space),
+         data_indices[0] = hypre_TAlloc(HYPRE_Int, stencil_size * hypre_BoxArraySize(data_space),
                                         HYPRE_MEMORY_HOST);
       }
       constant_coefficient = hypre_StructMatrixConstantCoefficient(matrix);
@@ -385,7 +387,7 @@ hypre_StructMatrixInitializeShell( hypre_StructMatrix *matrix )
                   if (hypre_IndexEqual(stencil_shape[j], 0, ndim))
                   {
                      data_indices[i][j] = data_indices[i][symm_elements[j]] +
-                        hypre_BoxOffsetDistance(data_box, stencil_shape[j]);
+                                          hypre_BoxOffsetDistance(data_box, stencil_shape[j]);
                   }
                   /* off-diagonal, constant coefficient */
                   else
@@ -532,8 +534,10 @@ hypre_StructMatrixInitialize( hypre_StructMatrix *matrix )
 
    hypre_StructMatrixInitializeShell(matrix);
 
-   data = hypre_CTAlloc(HYPRE_Complex, hypre_StructMatrixDataSize(matrix), HYPRE_MEMORY_DEVICE);
-   data_const = hypre_CTAlloc(HYPRE_Complex, hypre_StructMatrixDataConstSize(matrix), HYPRE_MEMORY_HOST);
+   data = hypre_CTAlloc(HYPRE_Complex, hypre_StructMatrixDataSize(matrix),
+                        hypre_StructMatrixMemoryLocation(matrix));
+   data_const = hypre_CTAlloc(HYPRE_Complex, hypre_StructMatrixDataConstSize(matrix),
+                              HYPRE_MEMORY_HOST);
 
 
    hypre_StructMatrixInitializeData(matrix, data, data_const);
@@ -568,10 +572,11 @@ hypre_StructMatrixSetValues( hypre_StructMatrix *matrix,
    HYPRE_Int            center_rank;
    HYPRE_Int           *symm_elements;
    HYPRE_Int            constant_coefficient;
-
    HYPRE_Complex       *matp;
-
    HYPRE_Int            i, s, istart, istop;
+#if defined(HYPRE_USING_GPU)
+   HYPRE_MemoryLocation memory_location = hypre_StructMatrixMemoryLocation(matrix);
+#endif
 
    /*-----------------------------------------------------------------------
     * Initialize some things
@@ -605,7 +610,7 @@ hypre_StructMatrixSetValues( hypre_StructMatrix *matrix,
     *-----------------------------------------------------------------------*/
 
    center_rank = 0;
-   if ( constant_coefficient==2 )
+   if ( constant_coefficient == 2 )
    {
       hypre_SetIndex(center_index, 0);
       stencil = hypre_StructMatrixStencil(matrix);
@@ -623,8 +628,8 @@ hypre_StructMatrixSetValues( hypre_StructMatrix *matrix,
             /* only set stored stencil values */
             if (symm_elements[stencil_indices[s]] < 0)
             {
-               if ( (constant_coefficient==1) ||
-                    (constant_coefficient==2 && stencil_indices[s]!=center_rank) )
+               if ( (constant_coefficient == 1) ||
+                    (constant_coefficient == 2 && stencil_indices[s] != center_rank) )
                {
                   /* call SetConstantValues instead */
                   hypre_error(HYPRE_ERROR_GENERIC);
@@ -635,7 +640,8 @@ hypre_StructMatrixSetValues( hypre_StructMatrix *matrix,
                   matp = hypre_StructMatrixBoxDataValue(matrix, i, stencil_indices[s], grid_index);
                }
 
-               if (hypre_GetActualMemLocation(HYPRE_MEMORY_DEVICE) != hypre_MEMORY_HOST)
+#if defined(HYPRE_USING_GPU)
+               if (hypre_GetExecPolicy1(memory_location) == HYPRE_EXEC_DEVICE)
                {
                   if (action > 0)
                   {
@@ -649,14 +655,15 @@ hypre_StructMatrixSetValues( hypre_StructMatrix *matrix,
                   }
                   else if (action > -1)
                   {
-                     hypre_TMemcpy(matp, values + s, HYPRE_Complex, 1, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+                     hypre_TMemcpy(matp, values + s, HYPRE_Complex, 1, memory_location, memory_location);
                   }
                   else /* action < 0 */
                   {
-                     hypre_TMemcpy(values + s, matp, HYPRE_Complex, 1, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+                     hypre_TMemcpy(values + s, matp, HYPRE_Complex, 1, memory_location, memory_location);
                   }
                }
                else
+#endif
                {
                   if (action > 0)
                   {
@@ -705,7 +712,7 @@ hypre_StructMatrixSetBoxValues( hypre_StructMatrix *matrix,
    hypre_Box           *int_box;
    hypre_Index          center_index;
    hypre_StructStencil *stencil;
-   HYPRE_Int            center_rank;
+   HYPRE_Int            center_rank = 0;
 
    HYPRE_Int           *symm_elements;
    hypre_BoxArray      *data_space;
@@ -781,11 +788,11 @@ hypre_StructMatrixSetBoxValues( hypre_StructMatrix *matrix,
          hypre_CopyIndex(data_start, dval_start);
          hypre_IndexD(dval_start, 0) *= num_stencil_indices;
 
-         if ( constant_coefficient==2 )
+         if (constant_coefficient == 2)
          {
             hypre_SetIndex(center_index, 0);
             stencil = hypre_StructMatrixStencil(matrix);
-            center_rank = hypre_StructStencilElementRank( stencil, center_index );
+            center_rank = hypre_StructStencilElementRank(stencil, center_index);
          }
 
          for (s = 0; s < num_stencil_indices; s++)
@@ -795,8 +802,8 @@ hypre_StructMatrixSetBoxValues( hypre_StructMatrix *matrix,
             {
                datap = hypre_StructMatrixBoxData(matrix, i, stencil_indices[s]);
 
-               if ( (constant_coefficient==1) ||
-                    (constant_coefficient==2 && stencil_indices[s]!=center_rank ))
+               if ( (constant_coefficient == 1) ||
+                    (constant_coefficient == 2 && stencil_indices[s] != center_rank ))
                   /* datap has only one data point for a given i and s */
                {
                   /* should have called SetConstantValues */
@@ -805,20 +812,20 @@ hypre_StructMatrixSetBoxValues( hypre_StructMatrix *matrix,
 
                   if (action > 0)
                   {
-                     datai = hypre_CCBoxIndexRank(data_box,data_start);
-                     dvali = hypre_BoxIndexRank(dval_box,dval_start);
+                     datai = hypre_CCBoxIndexRank(data_box, data_start);
+                     dvali = hypre_BoxIndexRank(dval_box, dval_start);
                      datap[datai] += values[dvali];
                   }
                   else if (action > -1)
                   {
-                     datai = hypre_CCBoxIndexRank(data_box,data_start);
-                     dvali = hypre_BoxIndexRank(dval_box,dval_start);
+                     datai = hypre_CCBoxIndexRank(data_box, data_start);
+                     dvali = hypre_BoxIndexRank(dval_box, dval_start);
                      datap[datai] = values[dvali];
                   }
                   else
                   {
-                     datai = hypre_CCBoxIndexRank(data_box,data_start);
-                     dvali = hypre_BoxIndexRank(dval_box,dval_start);
+                     datai = hypre_CCBoxIndexRank(data_box, data_start);
+                     dvali = hypre_BoxIndexRank(dval_box, dval_start);
                      values[dvali] = datap[datai];
                      if (action == -2)
                      {
@@ -836,8 +843,8 @@ hypre_StructMatrixSetBoxValues( hypre_StructMatrix *matrix,
                   if (action > 0)
                   {
                      hypre_BoxLoop2Begin(hypre_StructMatrixNDim(matrix), loop_size,
-                                         data_box,data_start,data_stride,datai,
-                                         dval_box,dval_start,dval_stride,dvali);
+                                         data_box, data_start, data_stride, datai,
+                                         dval_box, dval_start, dval_stride, dvali);
                      {
                         datap[datai] += values[dvali];
                      }
@@ -846,8 +853,8 @@ hypre_StructMatrixSetBoxValues( hypre_StructMatrix *matrix,
                   else if (action > -1)
                   {
                      hypre_BoxLoop2Begin(hypre_StructMatrixNDim(matrix), loop_size,
-                                         data_box,data_start,data_stride,datai,
-                                         dval_box,dval_start,dval_stride,dvali);
+                                         data_box, data_start, data_stride, datai,
+                                         dval_box, dval_start, dval_stride, dvali);
                      {
                         datap[datai] = values[dvali];
                      }
@@ -856,8 +863,8 @@ hypre_StructMatrixSetBoxValues( hypre_StructMatrix *matrix,
                   else if (action == -2)
                   {
                      hypre_BoxLoop2Begin(hypre_StructMatrixNDim(matrix), loop_size,
-                                         data_box,data_start,data_stride,datai,
-                                         dval_box,dval_start,dval_stride,dvali);
+                                         data_box, data_start, data_stride, datai,
+                                         dval_box, dval_start, dval_stride, dvali);
                      {
                         values[dvali] = datap[datai];
                         datap[datai] = 0;
@@ -867,8 +874,8 @@ hypre_StructMatrixSetBoxValues( hypre_StructMatrix *matrix,
                   else
                   {
                      hypre_BoxLoop2Begin(hypre_StructMatrixNDim(matrix), loop_size,
-                                         data_box,data_start,data_stride,datai,
-                                         dval_box,dval_start,dval_stride,dvali);
+                                         data_box, data_start, data_stride, datai,
+                                         dval_box, dval_start, dval_stride, dvali);
                      {
                         values[dvali] = datap[datai];
                      }
@@ -918,7 +925,7 @@ hypre_StructMatrixSetConstantValues( hypre_StructMatrix *matrix,
    boxes = hypre_StructGridBoxes(hypre_StructMatrixGrid(matrix));
    constant_coefficient = hypre_StructMatrixConstantCoefficient(matrix);
 
-   if ( constant_coefficient==1 )
+   if ( constant_coefficient == 1 )
    {
       hypre_ForBoxI(i, boxes)
       {
@@ -952,7 +959,7 @@ hypre_StructMatrixSetConstantValues( hypre_StructMatrix *matrix,
          }
       }
    }
-   else if ( constant_coefficient==2 )
+   else if ( constant_coefficient == 2 )
    {
       hypre_SetIndex(center_index, 0);
       stencil = hypre_StructMatrixStencil(matrix);
@@ -962,7 +969,8 @@ hypre_StructMatrixSetConstantValues( hypre_StructMatrix *matrix,
          for (s = 0; s < num_stencil_indices; s++)
          {
             if ( stencil_indices[s] == center_rank )
-            {  /* center (diagonal), like constant_coefficient==0
+            {
+               /* center (diagonal), like constant_coefficient==0
                   We consider it an error, but do the best we can. */
                hypre_error(HYPRE_ERROR_GENERIC);
                hypre_ForBoxI(i, boxes)
@@ -975,7 +983,8 @@ hypre_StructMatrixSetConstantValues( hypre_StructMatrix *matrix,
                }
             }
             else
-            {  /* non-center, like constant_coefficient==1 */
+            {
+               /* non-center, like constant_coefficient==1 */
                matp = hypre_StructMatrixBoxData(matrix, 0,
                                                 stencil_indices[s]);
                *matp += values[s];
@@ -987,7 +996,8 @@ hypre_StructMatrixSetConstantValues( hypre_StructMatrix *matrix,
          for (s = 0; s < num_stencil_indices; s++)
          {
             if ( stencil_indices[s] == center_rank )
-            {  /* center (diagonal), like constant_coefficient==0
+            {
+               /* center (diagonal), like constant_coefficient==0
                   We consider it an error, but do the best we can. */
                hypre_error(HYPRE_ERROR_GENERIC);
                hypre_ForBoxI(i, boxes)
@@ -1000,7 +1010,8 @@ hypre_StructMatrixSetConstantValues( hypre_StructMatrix *matrix,
                }
             }
             else
-            {  /* non-center, like constant_coefficient==1 */
+            {
+               /* non-center, like constant_coefficient==1 */
                matp = hypre_StructMatrixBoxData(matrix, 0,
                                                 stencil_indices[s]);
                *matp += values[s];
@@ -1012,7 +1023,8 @@ hypre_StructMatrixSetConstantValues( hypre_StructMatrix *matrix,
          for (s = 0; s < num_stencil_indices; s++)
          {
             if ( stencil_indices[s] == center_rank )
-            {  /* center (diagonal), like constant_coefficient==0
+            {
+               /* center (diagonal), like constant_coefficient==0
                   We consider it an error, but do the best we can. */
                hypre_error(HYPRE_ERROR_GENERIC);
                hypre_ForBoxI(i, boxes)
@@ -1025,7 +1037,8 @@ hypre_StructMatrixSetConstantValues( hypre_StructMatrix *matrix,
                }
             }
             else
-            {  /* non-center, like constant_coefficient==1 */
+            {
+               /* non-center, like constant_coefficient==1 */
                matp = hypre_StructMatrixBoxData(matrix, 0,
                                                 stencil_indices[s]);
                values[s] = *matp;
@@ -1201,7 +1214,7 @@ hypre_StructMatrixClearBoxValues( hypre_StructMatrix *matrix,
 
 #define DEVICE_VAR is_device_ptr(datap)
                hypre_BoxLoop1Begin(hypre_StructMatrixNDim(matrix), loop_size,
-                                   data_box,data_start,data_stride,datai);
+                                   data_box, data_start, data_stride, datai);
                {
                   datap[datai] = 0.0;
                }
@@ -1271,14 +1284,14 @@ hypre_StructMatrixAssemble( hypre_StructMatrix *matrix )
     * the neighbors from the box to get the boundary boxes.
     *-----------------------------------------------------------------------*/
 
-   if ( constant_coefficient!=1 )
+   if ( constant_coefficient != 1 )
    {
       data_space = hypre_StructMatrixDataSpace(matrix);
       grid       = hypre_StructMatrixGrid(matrix);
       boxman     = hypre_StructGridBoxMan(grid);
 
       boundary_boxes = hypre_BoxArrayArrayCreate(
-         hypre_BoxArraySize(data_space), ndim);
+                          hypre_BoxArraySize(data_space), ndim);
       entry_box_a    = hypre_BoxArrayCreate(0, ndim);
       tmp_box_a      = hypre_BoxArrayCreate(0, ndim);
       hypre_ForBoxI(i, data_space)
@@ -1292,7 +1305,7 @@ hypre_StructMatrixAssemble( hypre_StructMatrix *matrix )
          hypre_BoxManIntersect(boxman,
                                hypre_BoxIMin(boundary_box),
                                hypre_BoxIMax(boundary_box),
-                               &entries , &num_entries);
+                               &entries, &num_entries);
 
          /* put neighbor boxes into entry_box_a */
          hypre_BoxArraySetSize(entry_box_a, num_entries);
@@ -1360,7 +1373,7 @@ hypre_StructMatrixAssemble( hypre_StructMatrix *matrix )
 
    mat_num_values = hypre_StructMatrixNumValues(matrix);
 
-   if ( constant_coefficient==0 )
+   if ( constant_coefficient == 0 )
    {
       comm_num_values = mat_num_values;
 #if 0 //defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
@@ -1370,7 +1383,7 @@ hypre_StructMatrixAssemble( hypre_StructMatrix *matrix )
       }
 #endif
    }
-   else if ( constant_coefficient==1 )
+   else if ( constant_coefficient == 1 )
    {
       comm_num_values = 0;
    }
@@ -1414,7 +1427,7 @@ hypre_StructMatrixAssemble( hypre_StructMatrix *matrix )
     * a matrix with a very similar one, we may not want to recompute comm_pkg.
     *-----------------------------------------------------------------------*/
 
-   if ( constant_coefficient!=1 )
+   if ( constant_coefficient != 1 )
    {
       hypre_InitializeCommunication( comm_pkg,
                                      matrix_data_comm,
@@ -1438,8 +1451,8 @@ hypre_StructMatrixSetNumGhost( hypre_StructMatrix *matrix,
 
    for (d = 0; d < ndim; d++)
    {
-      hypre_StructMatrixNumGhost(matrix)[2*d]     = num_ghost[2*d];
-      hypre_StructMatrixNumGhost(matrix)[2*d + 1] = num_ghost[2*d + 1];
+      hypre_StructMatrixNumGhost(matrix)[2 * d]     = num_ghost[2 * d];
+      hypre_StructMatrixNumGhost(matrix)[2 * d + 1] = num_ghost[2 * d + 1];
    }
 
    return hypre_error_flag;
@@ -1495,39 +1508,39 @@ HYPRE_Int  hypre_StructMatrixSetConstantEntries( hypre_StructMatrix *matrix,
    hypre_Index diag_index;
    HYPRE_Int i, j;
 
-   for ( i=0; i<nentries; ++i )
+   for ( i = 0; i < nentries; ++i )
    {
       offdconst[ entries[i] ] = 1;
    }
 
-   for ( j=0; j<stencil_size; ++j )
+   for ( j = 0; j < stencil_size; ++j )
    {
       nconst += offdconst[j];
    }
 
-   if ( nconst<=0 )
+   if ( nconst <= 0 )
    {
-      constant_coefficient=0;
+      constant_coefficient = 0;
    }
-   else if ( nconst>=stencil_size )
+   else if ( nconst >= stencil_size )
    {
-      constant_coefficient=1;
+      constant_coefficient = 1;
    }
    else
    {
       hypre_SetIndex(diag_index, 0);
       diag_rank = hypre_StructStencilElementRank( stencil, diag_index );
-      if ( offdconst[diag_rank]==0 )
+      if ( offdconst[diag_rank] == 0 )
       {
-         constant_coefficient=2;
-         if ( nconst!=(stencil_size-1) )
+         constant_coefficient = 2;
+         if ( nconst != (stencil_size - 1) )
          {
             hypre_error(HYPRE_ERROR_GENERIC);
          }
       }
       else
       {
-         constant_coefficient=0;
+         constant_coefficient = 0;
          hypre_error(HYPRE_ERROR_GENERIC);
       }
    }
@@ -1608,6 +1621,146 @@ hypre_StructMatrixClearGhostValues( hypre_StructMatrix *matrix )
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_StructMatrixPrintData
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_StructMatrixPrintData( FILE               *file,
+                             hypre_StructMatrix *matrix,
+                             HYPRE_Int           all )
+{
+   HYPRE_Int             ndim            = hypre_StructMatrixNDim(matrix);
+   HYPRE_Int             num_values      = hypre_StructMatrixNumValues(matrix);
+   HYPRE_Int             ctecoef         = hypre_StructMatrixConstantCoefficient(matrix);
+   hypre_StructGrid     *grid            = hypre_StructMatrixGrid(matrix);
+   hypre_StructStencil  *stencil         = hypre_StructMatrixStencil(matrix);
+   HYPRE_Int             stencil_size    = hypre_StructStencilSize(stencil);
+   HYPRE_Int            *symm_elements   = hypre_StructMatrixSymmElements(matrix);
+   hypre_BoxArray       *data_space      = hypre_StructMatrixDataSpace(matrix);
+   HYPRE_Int             data_size       = hypre_StructMatrixDataSize(matrix);
+   hypre_BoxArray       *grid_boxes      = hypre_StructGridBoxes(grid);
+   HYPRE_Complex        *data            = hypre_StructMatrixData(matrix);
+   HYPRE_MemoryLocation  memory_location = hypre_StructMatrixMemoryLocation(matrix);
+   hypre_BoxArray       *boxes;
+   hypre_Index           center_index;
+   HYPRE_Int             center_rank;
+   HYPRE_Complex        *h_data;
+
+   /* Allocate/Point to data on the host memory */
+   if (hypre_GetActualMemLocation(memory_location) != hypre_MEMORY_HOST)
+   {
+      h_data = hypre_CTAlloc(HYPRE_Complex, data_size, HYPRE_MEMORY_HOST);
+      hypre_TMemcpy(h_data, data, HYPRE_Complex, data_size,
+                    HYPRE_MEMORY_HOST, memory_location);
+   }
+   else
+   {
+      h_data = data;
+   }
+
+   /* Print ghost data (all) also or only real data? */
+   boxes = (all) ? data_space : grid_boxes;
+
+   /* Print data to file */
+   if (ctecoef == 1)
+   {
+      hypre_PrintCCBoxArrayData(file, boxes, data_space, num_values, h_data);
+   }
+   else if (ctecoef == 2)
+   {
+      hypre_SetIndex(center_index, 0);
+      center_rank = hypre_StructStencilElementRank(stencil, center_index);
+
+      hypre_PrintCCVDBoxArrayData(file, boxes, data_space, num_values,
+                                  center_rank, stencil_size, symm_elements,
+                                  ndim, h_data);
+   }
+   else
+   {
+      hypre_PrintBoxArrayData(file, boxes, data_space, num_values,
+                              ndim, h_data);
+   }
+
+   /* Free memory */
+   if (hypre_GetActualMemLocation(memory_location) != hypre_MEMORY_HOST)
+   {
+      hypre_TFree(h_data, HYPRE_MEMORY_HOST);
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_StructMatrixReadData
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_StructMatrixReadData( FILE               *file,
+                            hypre_StructMatrix *matrix )
+{
+   HYPRE_Int             ndim            = hypre_StructMatrixNDim(matrix);
+   HYPRE_Int             num_values      = hypre_StructMatrixNumValues(matrix);
+   HYPRE_Int             ctecoef         = hypre_StructMatrixConstantCoefficient(matrix);
+   hypre_StructGrid     *grid            = hypre_StructMatrixGrid(matrix);
+   hypre_StructStencil  *stencil         = hypre_StructMatrixStencil(matrix);
+   HYPRE_Int             stencil_size    = hypre_StructStencilSize(stencil);
+   HYPRE_Int             symmetric       = hypre_StructMatrixSymmetric(matrix);
+   hypre_BoxArray       *data_space      = hypre_StructMatrixDataSpace(matrix);
+   hypre_BoxArray       *boxes           = hypre_StructGridBoxes(grid);
+   HYPRE_Complex        *data            = hypre_StructMatrixData(matrix);
+   HYPRE_Int             data_size       = hypre_StructMatrixDataSize(matrix);
+   HYPRE_MemoryLocation  memory_location = hypre_StructMatrixMemoryLocation(matrix);
+   HYPRE_Complex        *h_data;
+   HYPRE_Int             real_stencil_size;
+
+   /* Allocate/Point to data on the host memory */
+   if (hypre_GetActualMemLocation(memory_location) != hypre_MEMORY_HOST)
+   {
+      h_data = hypre_CTAlloc(HYPRE_Complex, data_size, HYPRE_MEMORY_HOST);
+   }
+   else
+   {
+      h_data = data;
+   }
+
+   /* real_stencil_size is the stencil size of the matrix after it's fixed up
+      by the call (if any) of hypre_StructStencilSymmetrize from
+      hypre_StructMatrixInitializeShell.*/
+   if (symmetric)
+   {
+      real_stencil_size = 2 * stencil_size - 1;
+   }
+   else
+   {
+      real_stencil_size = stencil_size;
+   }
+
+   /* Read data from file */
+   if (ctecoef == 0)
+   {
+      hypre_ReadBoxArrayData(file, boxes, data_space,
+                             num_values, ndim, h_data);
+   }
+   else
+   {
+      hypre_assert(ctecoef <= 2);
+      hypre_ReadBoxArrayData_CC(file, boxes, data_space,
+                                stencil_size, real_stencil_size,
+                                ctecoef, ndim, h_data);
+   }
+
+   /* Move data to the device memory if necessary and free host data */
+   if (hypre_GetActualMemLocation(memory_location) != hypre_MEMORY_HOST)
+   {
+      hypre_TMemcpy(data, h_data, HYPRE_Complex, data_size,
+                    memory_location, HYPRE_MEMORY_HOST);
+      hypre_TFree(h_data, HYPRE_MEMORY_HOST);
+   }
+
+   return hypre_error_flag;
+}
+
 /*--------------------------------------------------------------------------
  * hypre_StructMatrixPrint
  *--------------------------------------------------------------------------*/
@@ -1621,26 +1774,18 @@ hypre_StructMatrixPrint( const char         *filename,
    char                  new_filename[255];
 
    hypre_StructGrid     *grid;
-   hypre_BoxArray       *boxes;
 
    hypre_StructStencil  *stencil;
    hypre_Index          *stencil_shape;
    HYPRE_Int             stencil_size;
-   hypre_Index           center_index;
 
    HYPRE_Int             ndim, num_values;
 
-   hypre_BoxArray       *data_space;
-
    HYPRE_Int            *symm_elements;
 
    HYPRE_Int             i, j, d;
-   HYPRE_Int             constant_coefficient;
-   HYPRE_Int             center_rank;
    HYPRE_Int             myid;
 
-   constant_coefficient = hypre_StructMatrixConstantCoefficient(matrix);
-
    /*----------------------------------------
     * Open file
     *----------------------------------------*/
@@ -1681,7 +1826,7 @@ hypre_StructMatrixPrint( const char         *filename,
    hypre_fprintf(file, "%d\n", num_values);
    stencil_size = hypre_StructStencilSize(stencil);
    j = 0;
-   for (i=0; i<stencil_size; i++)
+   for (i = 0; i < stencil_size; i++)
    {
       if (symm_elements[i] < 0)
       {
@@ -1699,36 +1844,8 @@ hypre_StructMatrixPrint( const char         *filename,
     * Print data
     *----------------------------------------*/
 
-   data_space = hypre_StructMatrixDataSpace(matrix);
-
-   if (all)
-      boxes = data_space;
-   else
-      boxes = hypre_StructGridBoxes(grid);
-
    hypre_fprintf(file, "\nData:\n");
-   if ( constant_coefficient==1 )
-   {
-      hypre_PrintCCBoxArrayData(file, boxes, data_space, num_values,
-                                hypre_StructMatrixData(matrix));
-   }
-   else if ( constant_coefficient==2 )
-   {
-      hypre_SetIndex(center_index, 0);
-      center_rank = hypre_StructStencilElementRank( stencil, center_index );
-
-      hypre_PrintCCVDBoxArrayData(file, boxes, data_space, num_values,
-                                  center_rank, stencil_size, symm_elements,
-                                  hypre_StructGridNDim(grid),
-                                  hypre_StructMatrixData(matrix));
-   }
-   else
-   {
-
-      hypre_PrintBoxArrayData(file, boxes, data_space, num_values,
-                              hypre_StructGridNDim(grid),
-                              hypre_StructMatrixData(matrix));
-   }
+   hypre_StructMatrixPrintData(file, matrix, all);
 
    /*----------------------------------------
     * Close file
@@ -1740,93 +1857,6 @@ hypre_StructMatrixPrint( const char         *filename,
    return hypre_error_flag;
 }
 
-/*--------------------------------------------------------------------------
- * hypre_StructMatrixMigrate
- *--------------------------------------------------------------------------*/
-
-HYPRE_Int
-hypre_StructMatrixMigrate( hypre_StructMatrix *from_matrix,
-                           hypre_StructMatrix *to_matrix   )
-{
-   hypre_CommInfo        *comm_info;
-   hypre_CommPkg         *comm_pkg;
-   hypre_CommHandle      *comm_handle;
-
-   HYPRE_Int              constant_coefficient, comm_num_values;
-   HYPRE_Int              stencil_size, mat_num_values;
-   hypre_StructStencil   *stencil;
-
-   HYPRE_Complex         *matrix_data_from = hypre_StructMatrixData(from_matrix);
-   HYPRE_Complex         *matrix_data_to = hypre_StructMatrixData(to_matrix);
-   HYPRE_Complex         *matrix_data_comm_from = matrix_data_from;
-   HYPRE_Complex         *matrix_data_comm_to = matrix_data_to;
-
-   /*------------------------------------------------------
-    * Set up hypre_CommPkg
-    *------------------------------------------------------*/
-
-   constant_coefficient = hypre_StructMatrixConstantCoefficient( from_matrix );
-   hypre_assert( constant_coefficient == hypre_StructMatrixConstantCoefficient( to_matrix ) );
-
-   mat_num_values = hypre_StructMatrixNumValues(from_matrix);
-   hypre_assert( mat_num_values == hypre_StructMatrixNumValues(to_matrix) );
-
-   if ( constant_coefficient==0 )
-   {
-      comm_num_values = mat_num_values;
-   }
-   else if ( constant_coefficient==1 )
-   {
-      comm_num_values = 0;
-   }
-   else /* constant_coefficient==2 */
-   {
-      comm_num_values = 1;
-      stencil = hypre_StructMatrixStencil(from_matrix);
-      stencil_size = hypre_StructStencilSize(stencil);
-      hypre_assert(stencil_size ==
-                   hypre_StructStencilSize( hypre_StructMatrixStencil(to_matrix) ) );
-#if 0 //defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-      if (hypre_StructGridDataLocation(hypre_StructMatrixGrid(from_matrix)) == HYPRE_MEMORY_HOST)
-      {
-         stencil = hypre_StructMatrixStencil(from_matrix);
-         stencil_size  = hypre_StructStencilSize(stencil);
-         matrix_data_comm_from = hypre_StructMatrixDataConst(from_matrix) + stencil_size;
-         stencil = hypre_StructMatrixStencil(to_matrix);
-         stencil_size  = hypre_StructStencilSize(stencil);
-         matrix_data_comm_to = hypre_StructMatrixDataConst(to_matrix) + stencil_size;
-      }
-#endif
-   }
-
-   hypre_CreateCommInfoFromGrids(hypre_StructMatrixGrid(from_matrix),
-                                 hypre_StructMatrixGrid(to_matrix),
-                                 &comm_info);
-   hypre_CommPkgCreate(comm_info,
-                       hypre_StructMatrixDataSpace(from_matrix),
-                       hypre_StructMatrixDataSpace(to_matrix),
-                       comm_num_values, NULL, 0,
-                       hypre_StructMatrixComm(from_matrix), &comm_pkg);
-   hypre_CommInfoDestroy(comm_info);
-   /* is this correct for periodic? */
-
-   /*-----------------------------------------------------------------------
-    * Migrate the matrix data
-    *-----------------------------------------------------------------------*/
-
-   if ( constant_coefficient!=1 )
-   {
-      hypre_InitializeCommunication( comm_pkg,
-                                     matrix_data_comm_from,
-                                     matrix_data_comm_to, 0, 0,
-                                     &comm_handle );
-      hypre_FinalizeCommunication( comm_handle );
-   }
-   hypre_CommPkgDestroy(comm_pkg);
-
-   return hypre_error_flag;
-}
-
 /*--------------------------------------------------------------------------
  * hypre_StructMatrixRead
  *--------------------------------------------------------------------------*/
@@ -1842,17 +1872,11 @@ hypre_StructMatrixRead( MPI_Comm    comm,
    hypre_StructMatrix   *matrix;
 
    hypre_StructGrid     *grid;
-   hypre_BoxArray       *boxes;
    HYPRE_Int             ndim;
 
    hypre_StructStencil  *stencil;
    hypre_Index          *stencil_shape;
-   HYPRE_Int             stencil_size, real_stencil_size;
-
-   HYPRE_Int             num_values;
-
-   hypre_BoxArray       *data_space;
-
+   HYPRE_Int             stencil_size;
    HYPRE_Int             symmetric;
    HYPRE_Int             constant_coefficient;
 
@@ -1885,17 +1909,12 @@ hypre_StructMatrixRead( MPI_Comm    comm,
 
    /* read grid info */
    hypre_fscanf(file, "\nGrid:\n");
-   hypre_StructGridRead(comm,file,&grid);
+   hypre_StructGridRead(comm, file, &grid);
 
    /* read stencil info */
    hypre_fscanf(file, "\nStencil:\n");
    ndim = hypre_StructGridNDim(grid);
    hypre_fscanf(file, "%d\n", &stencil_size);
-   if (symmetric) { real_stencil_size = 2*stencil_size-1; }
-   else { real_stencil_size = stencil_size; }
-   /* ... real_stencil_size is the stencil size of the matrix after it's fixed up
-      by the call (if any) of hypre_StructStencilSymmetrize from
-      hypre_StructMatrixInitializeShell.*/
    stencil_shape = hypre_CTAlloc(hypre_Index,  stencil_size, HYPRE_MEMORY_HOST);
    for (i = 0; i < stencil_size; i++)
    {
@@ -1923,26 +1942,8 @@ hypre_StructMatrixRead( MPI_Comm    comm,
     * Read data
     *----------------------------------------*/
 
-   boxes      = hypre_StructGridBoxes(grid);
-   data_space = hypre_StructMatrixDataSpace(matrix);
-   num_values = hypre_StructMatrixNumValues(matrix);
-
    hypre_fscanf(file, "\nData:\n");
-   if ( constant_coefficient==0 )
-   {
-      hypre_ReadBoxArrayData(file, boxes, data_space, num_values,
-                             hypre_StructGridNDim(grid),
-                             hypre_StructMatrixData(matrix));
-   }
-   else
-   {
-      hypre_assert( constant_coefficient<=2 );
-      hypre_ReadBoxArrayData_CC( file, boxes, data_space,
-                                 stencil_size, real_stencil_size,
-                                 constant_coefficient,
-                                 hypre_StructGridNDim(grid),
-                                 hypre_StructMatrixData(matrix));
-   }
+   hypre_StructMatrixReadData(file, matrix);
 
    /*----------------------------------------
     * Assemble the matrix
@@ -1958,6 +1959,94 @@ hypre_StructMatrixRead( MPI_Comm    comm,
 
    return matrix;
 }
+
+/*--------------------------------------------------------------------------
+ * hypre_StructMatrixMigrate
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_StructMatrixMigrate( hypre_StructMatrix *from_matrix,
+                           hypre_StructMatrix *to_matrix   )
+{
+   hypre_CommInfo        *comm_info;
+   hypre_CommPkg         *comm_pkg;
+   hypre_CommHandle      *comm_handle;
+
+   HYPRE_Int              constant_coefficient, comm_num_values;
+   HYPRE_Int              stencil_size, mat_num_values;
+   hypre_StructStencil   *stencil;
+
+   HYPRE_Complex         *matrix_data_from = hypre_StructMatrixData(from_matrix);
+   HYPRE_Complex         *matrix_data_to = hypre_StructMatrixData(to_matrix);
+   HYPRE_Complex         *matrix_data_comm_from = matrix_data_from;
+   HYPRE_Complex         *matrix_data_comm_to = matrix_data_to;
+
+   /*------------------------------------------------------
+    * Set up hypre_CommPkg
+    *------------------------------------------------------*/
+
+   constant_coefficient = hypre_StructMatrixConstantCoefficient( from_matrix );
+   hypre_assert( constant_coefficient == hypre_StructMatrixConstantCoefficient( to_matrix ) );
+
+   mat_num_values = hypre_StructMatrixNumValues(from_matrix);
+   hypre_assert( mat_num_values == hypre_StructMatrixNumValues(to_matrix) );
+
+   if ( constant_coefficient == 0 )
+   {
+      comm_num_values = mat_num_values;
+   }
+   else if ( constant_coefficient == 1 )
+   {
+      comm_num_values = 0;
+   }
+   else /* constant_coefficient==2 */
+   {
+      comm_num_values = 1;
+      stencil = hypre_StructMatrixStencil(from_matrix);
+      stencil_size = hypre_StructStencilSize(stencil);
+      hypre_assert(stencil_size ==
+                   hypre_StructStencilSize( hypre_StructMatrixStencil(to_matrix) ) );
+#if 0 //defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+      if (hypre_StructGridDataLocation(hypre_StructMatrixGrid(from_matrix)) == HYPRE_MEMORY_HOST)
+      {
+         stencil = hypre_StructMatrixStencil(from_matrix);
+         stencil_size  = hypre_StructStencilSize(stencil);
+         matrix_data_comm_from = hypre_StructMatrixDataConst(from_matrix) + stencil_size;
+         stencil = hypre_StructMatrixStencil(to_matrix);
+         stencil_size  = hypre_StructStencilSize(stencil);
+         matrix_data_comm_to = hypre_StructMatrixDataConst(to_matrix) + stencil_size;
+      }
+#endif
+   }
+
+   hypre_CreateCommInfoFromGrids(hypre_StructMatrixGrid(from_matrix),
+                                 hypre_StructMatrixGrid(to_matrix),
+                                 &comm_info);
+   hypre_CommPkgCreate(comm_info,
+                       hypre_StructMatrixDataSpace(from_matrix),
+                       hypre_StructMatrixDataSpace(to_matrix),
+                       comm_num_values, NULL, 0,
+                       hypre_StructMatrixComm(from_matrix), &comm_pkg);
+   hypre_CommInfoDestroy(comm_info);
+   /* is this correct for periodic? */
+
+   /*-----------------------------------------------------------------------
+    * Migrate the matrix data
+    *-----------------------------------------------------------------------*/
+
+   if ( constant_coefficient != 1 )
+   {
+      hypre_InitializeCommunication( comm_pkg,
+                                     matrix_data_comm_from,
+                                     matrix_data_comm_to, 0, 0,
+                                     &comm_handle );
+      hypre_FinalizeCommunication( comm_handle );
+   }
+   hypre_CommPkgDestroy(comm_pkg);
+
+   return hypre_error_flag;
+}
+
 /*--------------------------------------------------------------------------
  * clears matrix stencil coefficients reaching outside of the physical boundaries
  *--------------------------------------------------------------------------*/
@@ -1998,7 +2087,7 @@ hypre_StructMatrixClearBoundary( hypre_StructMatrix *matrix)
 
    for (j = 0; j < hypre_StructStencilSize(stencil); j++)
    {
-      hypre_CopyIndex(shape[j],stencil_element);
+      hypre_CopyIndex(shape[j], stencil_element);
       if (!hypre_IndexEqual(stencil_element, 0, ndim))
       {
          hypre_ForBoxI(i, grid_boxes)
@@ -2029,4 +2118,3 @@ hypre_StructMatrixClearBoundary( hypre_StructMatrix *matrix)
 
    return hypre_error_flag;
 }
-
diff --git a/external/hypre/src/struct_mv/struct_matrix.h b/external/hypre/src/struct_mv/struct_matrix.h
index 041bd852..f6b086e5 100644
--- a/external/hypre/src/struct_mv/struct_matrix.h
+++ b/external/hypre/src/struct_mv/struct_matrix.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -29,6 +29,7 @@ typedef struct hypre_StructMatrix_struct
 
    hypre_BoxArray       *data_space;
 
+   HYPRE_MemoryLocation  memory_location;           /* memory location of data */
    HYPRE_Complex        *data;                      /* Pointer to variable matrix data */
    HYPRE_Complex        *data_const;                /* Pointer to constant matrix data */
    HYPRE_Complex       **stencil_data;              /* Pointer for each stencil */
@@ -47,7 +48,7 @@ typedef struct hypre_StructMatrix_struct
 
    HYPRE_Int             symmetric;                 /* Is the matrix symmetric */
    HYPRE_Int            *symm_elements;             /* Which elements are "symmetric" */
-   HYPRE_Int             num_ghost[2*HYPRE_MAXDIM]; /* Num ghost layers in each direction */
+   HYPRE_Int             num_ghost[2 * HYPRE_MAXDIM]; /* Num ghost layers in each direction */
 
    HYPRE_BigInt          global_size;               /* Total number of nonzero coeffs */
 
@@ -67,6 +68,7 @@ typedef struct hypre_StructMatrix_struct
 #define hypre_StructMatrixStencil(matrix)             ((matrix) -> stencil)
 #define hypre_StructMatrixNumValues(matrix)           ((matrix) -> num_values)
 #define hypre_StructMatrixDataSpace(matrix)           ((matrix) -> data_space)
+#define hypre_StructMatrixMemoryLocation(matrix)      ((matrix) -> memory_location)
 #define hypre_StructMatrixData(matrix)                ((matrix) -> data)
 #define hypre_StructMatrixDataConst(matrix)           ((matrix) -> data_const)
 #define hypre_StructMatrixStencilData(matrix)         ((matrix) -> stencil_data)
diff --git a/external/hypre/src/struct_mv/struct_matrix_mask.c b/external/hypre/src/struct_mv/struct_matrix_mask.c
index dff84266..fda89755 100644
--- a/external/hypre/src/struct_mv/struct_matrix_mask.c
+++ b/external/hypre/src/struct_mv/struct_matrix_mask.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -56,7 +56,7 @@ hypre_StructMatrixCreateMask( hypre_StructMatrix *matrix,
    stencil_size  = hypre_StructStencilSize(stencil);
    stencil_data  = hypre_StructMatrixStencilData(matrix);
 
-   mask = hypre_CTAlloc(hypre_StructMatrix,  1, HYPRE_MEMORY_HOST);
+   mask = hypre_CTAlloc(hypre_StructMatrix, 1, HYPRE_MEMORY_HOST);
 
    hypre_StructMatrixComm(mask) = hypre_StructMatrixComm(matrix);
 
@@ -67,7 +67,7 @@ hypre_StructMatrixCreateMask( hypre_StructMatrix *matrix,
       hypre_StructStencilRef(hypre_StructMatrixUserStencil(matrix));
 
    mask_stencil_size  = num_stencil_indices;
-   mask_stencil_shape = hypre_CTAlloc(hypre_Index,  num_stencil_indices, HYPRE_MEMORY_HOST);
+   mask_stencil_shape = hypre_CTAlloc(hypre_Index, num_stencil_indices, HYPRE_MEMORY_HOST);
    for (i = 0; i < num_stencil_indices; i++)
    {
       hypre_CopyIndex(stencil_shape[stencil_indices[i]],
@@ -83,9 +83,11 @@ hypre_StructMatrixCreateMask( hypre_StructMatrix *matrix,
    hypre_StructMatrixDataSpace(mask) =
       hypre_BoxArrayDuplicate(hypre_StructMatrixDataSpace(matrix));
 
+   hypre_StructMatrixMemoryLocation(mask) = hypre_StructMatrixMemoryLocation(matrix);
+
    hypre_StructMatrixData(mask) = hypre_StructMatrixData(matrix);
    hypre_StructMatrixDataConst(mask) = hypre_StructMatrixDataConst(matrix);
-   
+
    hypre_StructMatrixDataAlloced(mask) = 0;
    hypre_StructMatrixDataSize(mask) = hypre_StructMatrixDataSize(matrix);
    hypre_StructMatrixDataConstSize(mask) = hypre_StructMatrixDataConstSize(matrix);
@@ -94,11 +96,15 @@ hypre_StructMatrixCreateMask( hypre_StructMatrix *matrix,
    mask_data_indices = hypre_CTAlloc(HYPRE_Int *,  hypre_BoxArraySize(data_space), HYPRE_MEMORY_HOST);
    mask_stencil_data  = hypre_TAlloc(HYPRE_Complex*, mask_stencil_size, HYPRE_MEMORY_HOST);
    if (hypre_BoxArraySize(data_space) > 0)
-	   mask_data_indices[0] = hypre_TAlloc(HYPRE_Int,  num_stencil_indices*hypre_BoxArraySize(data_space), HYPRE_MEMORY_HOST);
-   
+   {
+      mask_data_indices[0] = hypre_TAlloc(HYPRE_Int,
+                                          num_stencil_indices * hypre_BoxArraySize(data_space),
+                                          HYPRE_MEMORY_HOST);
+   }
+
    hypre_ForBoxI(i, data_space)
    {
-      mask_data_indices[i] = mask_data_indices[0] + num_stencil_indices*i;
+      mask_data_indices[i] = mask_data_indices[0] + num_stencil_indices * i;
       for (j = 0; j < num_stencil_indices; j++)
       {
          mask_data_indices[i][j] = data_indices[i][stencil_indices[j]];
@@ -121,7 +127,7 @@ hypre_StructMatrixCreateMask( hypre_StructMatrix *matrix,
          hypre_StructMatrixSymmElements(matrix)[i];
    }
 
-   for (i = 0; i < 2*ndim; i++)
+   for (i = 0; i < 2 * ndim; i++)
    {
       hypre_StructMatrixNumGhost(mask)[i] =
          hypre_StructMatrixNumGhost(matrix)[i];
diff --git a/external/hypre/src/struct_mv/struct_matvec.c b/external/hypre/src/struct_mv/struct_matvec.c
index 6434bf14..7fd38a04 100644
--- a/external/hypre/src/struct_mv/struct_matvec.c
+++ b/external/hypre/src/struct_mv/struct_matvec.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -37,7 +37,7 @@ typedef struct
  *--------------------------------------------------------------------------*/
 
 void *
-hypre_StructMatvecCreate( )
+hypre_StructMatvecCreate( void )
 {
    hypre_StructMatvecData *matvec_data;
 
@@ -62,6 +62,8 @@ hypre_StructMatvecSetup( void               *matvec_vdata,
    hypre_ComputeInfo       *compute_info;
    hypre_ComputePkg        *compute_pkg;
 
+   HYPRE_ANNOTATE_FUNC_BEGIN;
+
    /*----------------------------------------------------------
     * Set up the compute package
     *----------------------------------------------------------*/
@@ -81,6 +83,8 @@ hypre_StructMatvecSetup( void               *matvec_vdata,
    (matvec_data -> x)           = hypre_StructVectorRef(x);
    (matvec_data -> compute_pkg) = compute_pkg;
 
+   HYPRE_ANNOTATE_FUNC_END;
+
    return hypre_error_flag;
 }
 
@@ -125,8 +129,10 @@ hypre_StructMatvecCompute( void               *matvec_vdata,
     * Initialize some things
     *-----------------------------------------------------------------------*/
 
+   HYPRE_ANNOTATE_FUNC_BEGIN;
+
    constant_coefficient = hypre_StructMatrixConstantCoefficient(A);
-   if (constant_coefficient) hypre_StructVectorClearBoundGhostValues(x, 0);
+   if (constant_coefficient) { hypre_StructVectorClearBoundGhostValues(x, 0); }
 
    compute_pkg = (matvec_data -> compute_pkg);
 
@@ -173,7 +179,7 @@ hypre_StructMatvecCompute( void               *matvec_vdata,
 
    for (compute_i = 0; compute_i < 2; compute_i++)
    {
-      switch(compute_i)
+      switch (compute_i)
       {
          case 0:
          {
@@ -187,7 +193,7 @@ hypre_StructMatvecCompute( void               *matvec_vdata,
              * beta*y for constant coefficient (where only Ax gets multiplied by alpha)
              *--------------------------------------------------------------*/
 
-            if ( constant_coefficient==1 )
+            if ( constant_coefficient == 1 )
             {
                temp = beta;
             }
@@ -248,7 +254,7 @@ hypre_StructMatvecCompute( void               *matvec_vdata,
        * y += A*x
        *--------------------------------------------------------------------*/
 
-      switch( constant_coefficient )
+      switch ( constant_coefficient )
       {
          case 0:
          {
@@ -275,6 +281,8 @@ hypre_StructMatvecCompute( void               *matvec_vdata,
       x = y;
    }
 
+   HYPRE_ANNOTATE_FUNC_END;
+
    return hypre_error_flag;
 }
 
@@ -290,7 +298,7 @@ HYPRE_Int hypre_StructMatvecCC0( HYPRE_Complex       alpha,
                                  hypre_StructVector *y,
                                  hypre_BoxArrayArray     *compute_box_aa,
                                  hypre_IndexRef           stride
-   )
+                               )
 {
    HYPRE_Int i, j, si;
    HYPRE_Complex           *Ap0;
@@ -348,34 +356,34 @@ HYPRE_Int hypre_StructMatvecCC0( HYPRE_Complex       alpha,
          start  = hypre_BoxIMin(compute_box);
 
          /* unroll up to depth MAX_DEPTH */
-         for (si = 0; si < stencil_size; si+= MAX_DEPTH)
+         for (si = 0; si < stencil_size; si += MAX_DEPTH)
          {
-            depth = hypre_min(MAX_DEPTH, (stencil_size -si));
-            switch(depth)
+            depth = hypre_min(MAX_DEPTH, (stencil_size - si));
+            switch (depth)
             {
                case 7:
-                  Ap0 = hypre_StructMatrixBoxData(A, i, si+0);
-                  Ap1 = hypre_StructMatrixBoxData(A, i, si+1);
-                  Ap2 = hypre_StructMatrixBoxData(A, i, si+2);
-                  Ap3 = hypre_StructMatrixBoxData(A, i, si+3);
-                  Ap4 = hypre_StructMatrixBoxData(A, i, si+4);
-                  Ap5 = hypre_StructMatrixBoxData(A, i, si+5);
-                  Ap6 = hypre_StructMatrixBoxData(A, i, si+6);
+                  Ap0 = hypre_StructMatrixBoxData(A, i, si + 0);
+                  Ap1 = hypre_StructMatrixBoxData(A, i, si + 1);
+                  Ap2 = hypre_StructMatrixBoxData(A, i, si + 2);
+                  Ap3 = hypre_StructMatrixBoxData(A, i, si + 3);
+                  Ap4 = hypre_StructMatrixBoxData(A, i, si + 4);
+                  Ap5 = hypre_StructMatrixBoxData(A, i, si + 5);
+                  Ap6 = hypre_StructMatrixBoxData(A, i, si + 6);
 
                   xoff0 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+0]);
+                                                  stencil_shape[si + 0]);
                   xoff1 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+1]);
+                                                  stencil_shape[si + 1]);
                   xoff2 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+2]);
+                                                  stencil_shape[si + 2]);
                   xoff3 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+3]);
+                                                  stencil_shape[si + 3]);
                   xoff4 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+4]);
+                                                  stencil_shape[si + 4]);
                   xoff5 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+5]);
+                                                  stencil_shape[si + 5]);
                   xoff6 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+6]);
+                                                  stencil_shape[si + 6]);
 
 #define DEVICE_VAR is_device_ptr(yp,Ap0,Ap1,Ap2,Ap3,Ap4,Ap5,Ap6,xp)
                   hypre_BoxLoop3Begin(ndim, loop_size,
@@ -398,25 +406,25 @@ HYPRE_Int hypre_StructMatvecCC0( HYPRE_Complex       alpha,
                   break;
 
                case 6:
-                  Ap0 = hypre_StructMatrixBoxData(A, i, si+0);
-                  Ap1 = hypre_StructMatrixBoxData(A, i, si+1);
-                  Ap2 = hypre_StructMatrixBoxData(A, i, si+2);
-                  Ap3 = hypre_StructMatrixBoxData(A, i, si+3);
-                  Ap4 = hypre_StructMatrixBoxData(A, i, si+4);
-                  Ap5 = hypre_StructMatrixBoxData(A, i, si+5);
+                  Ap0 = hypre_StructMatrixBoxData(A, i, si + 0);
+                  Ap1 = hypre_StructMatrixBoxData(A, i, si + 1);
+                  Ap2 = hypre_StructMatrixBoxData(A, i, si + 2);
+                  Ap3 = hypre_StructMatrixBoxData(A, i, si + 3);
+                  Ap4 = hypre_StructMatrixBoxData(A, i, si + 4);
+                  Ap5 = hypre_StructMatrixBoxData(A, i, si + 5);
 
                   xoff0 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+0]);
+                                                  stencil_shape[si + 0]);
                   xoff1 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+1]);
+                                                  stencil_shape[si + 1]);
                   xoff2 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+2]);
+                                                  stencil_shape[si + 2]);
                   xoff3 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+3]);
+                                                  stencil_shape[si + 3]);
                   xoff4 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+4]);
+                                                  stencil_shape[si + 4]);
                   xoff5 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+5]);
+                                                  stencil_shape[si + 5]);
 
 #define DEVICE_VAR is_device_ptr(yp,Ap0,Ap1,Ap2,Ap3,Ap4,Ap5,xp)
                   hypre_BoxLoop3Begin(ndim, loop_size,
@@ -438,22 +446,22 @@ HYPRE_Int hypre_StructMatvecCC0( HYPRE_Complex       alpha,
                   break;
 
                case 5:
-                  Ap0 = hypre_StructMatrixBoxData(A, i, si+0);
-                  Ap1 = hypre_StructMatrixBoxData(A, i, si+1);
-                  Ap2 = hypre_StructMatrixBoxData(A, i, si+2);
-                  Ap3 = hypre_StructMatrixBoxData(A, i, si+3);
-                  Ap4 = hypre_StructMatrixBoxData(A, i, si+4);
+                  Ap0 = hypre_StructMatrixBoxData(A, i, si + 0);
+                  Ap1 = hypre_StructMatrixBoxData(A, i, si + 1);
+                  Ap2 = hypre_StructMatrixBoxData(A, i, si + 2);
+                  Ap3 = hypre_StructMatrixBoxData(A, i, si + 3);
+                  Ap4 = hypre_StructMatrixBoxData(A, i, si + 4);
 
                   xoff0 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+0]);
+                                                  stencil_shape[si + 0]);
                   xoff1 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+1]);
+                                                  stencil_shape[si + 1]);
                   xoff2 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+2]);
+                                                  stencil_shape[si + 2]);
                   xoff3 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+3]);
+                                                  stencil_shape[si + 3]);
                   xoff4 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+4]);
+                                                  stencil_shape[si + 4]);
 
 #define DEVICE_VAR is_device_ptr(yp,Ap0,Ap1,Ap2,Ap3,Ap4,xp)
                   hypre_BoxLoop3Begin(ndim, loop_size,
@@ -474,19 +482,19 @@ HYPRE_Int hypre_StructMatvecCC0( HYPRE_Complex       alpha,
                   break;
 
                case 4:
-                  Ap0 = hypre_StructMatrixBoxData(A, i, si+0);
-                  Ap1 = hypre_StructMatrixBoxData(A, i, si+1);
-                  Ap2 = hypre_StructMatrixBoxData(A, i, si+2);
-                  Ap3 = hypre_StructMatrixBoxData(A, i, si+3);
+                  Ap0 = hypre_StructMatrixBoxData(A, i, si + 0);
+                  Ap1 = hypre_StructMatrixBoxData(A, i, si + 1);
+                  Ap2 = hypre_StructMatrixBoxData(A, i, si + 2);
+                  Ap3 = hypre_StructMatrixBoxData(A, i, si + 3);
 
                   xoff0 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+0]);
+                                                  stencil_shape[si + 0]);
                   xoff1 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+1]);
+                                                  stencil_shape[si + 1]);
                   xoff2 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+2]);
+                                                  stencil_shape[si + 2]);
                   xoff3 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+3]);
+                                                  stencil_shape[si + 3]);
 
 #define DEVICE_VAR is_device_ptr(yp,Ap0,Ap1,Ap2,Ap3,xp)
                   hypre_BoxLoop3Begin(ndim, loop_size,
@@ -506,16 +514,16 @@ HYPRE_Int hypre_StructMatvecCC0( HYPRE_Complex       alpha,
                   break;
 
                case 3:
-                  Ap0 = hypre_StructMatrixBoxData(A, i, si+0);
-                  Ap1 = hypre_StructMatrixBoxData(A, i, si+1);
-                  Ap2 = hypre_StructMatrixBoxData(A, i, si+2);
+                  Ap0 = hypre_StructMatrixBoxData(A, i, si + 0);
+                  Ap1 = hypre_StructMatrixBoxData(A, i, si + 1);
+                  Ap2 = hypre_StructMatrixBoxData(A, i, si + 2);
 
                   xoff0 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+0]);
+                                                  stencil_shape[si + 0]);
                   xoff1 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+1]);
+                                                  stencil_shape[si + 1]);
                   xoff2 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+2]);
+                                                  stencil_shape[si + 2]);
 
 #define DEVICE_VAR is_device_ptr(yp,Ap0,Ap1,Ap2,xp)
                   hypre_BoxLoop3Begin(ndim, loop_size,
@@ -534,13 +542,13 @@ HYPRE_Int hypre_StructMatvecCC0( HYPRE_Complex       alpha,
                   break;
 
                case 2:
-                  Ap0 = hypre_StructMatrixBoxData(A, i, si+0);
-                  Ap1 = hypre_StructMatrixBoxData(A, i, si+1);
+                  Ap0 = hypre_StructMatrixBoxData(A, i, si + 0);
+                  Ap1 = hypre_StructMatrixBoxData(A, i, si + 1);
 
                   xoff0 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+0]);
+                                                  stencil_shape[si + 0]);
                   xoff1 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+1]);
+                                                  stencil_shape[si + 1]);
 
 #define DEVICE_VAR is_device_ptr(yp,Ap0,Ap1,xp)
                   hypre_BoxLoop3Begin(ndim, loop_size,
@@ -558,10 +566,10 @@ HYPRE_Int hypre_StructMatvecCC0( HYPRE_Complex       alpha,
                   break;
 
                case 1:
-                  Ap0 = hypre_StructMatrixBoxData(A, i, si+0);
+                  Ap0 = hypre_StructMatrixBoxData(A, i, si + 0);
 
                   xoff0 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+0]);
+                                                  stencil_shape[si + 0]);
 
 #define DEVICE_VAR is_device_ptr(yp,Ap0,xp)
                   hypre_BoxLoop3Begin(ndim, loop_size,
@@ -608,7 +616,7 @@ HYPRE_Int hypre_StructMatvecCC1( HYPRE_Complex       alpha,
                                  hypre_StructVector *y,
                                  hypre_BoxArrayArray     *compute_box_aa,
                                  hypre_IndexRef           stride
-   )
+                               )
 {
    HYPRE_Int i, j, si;
    HYPRE_Complex           *Ap0;
@@ -675,41 +683,41 @@ HYPRE_Int hypre_StructMatvecCC1( HYPRE_Complex       alpha,
          Ai = 0;
 
          /* unroll up to depth MAX_DEPTH */
-         for (si = 0; si < stencil_size; si+= MAX_DEPTH)
+         for (si = 0; si < stencil_size; si += MAX_DEPTH)
          {
-            depth = hypre_min(MAX_DEPTH, (stencil_size -si));
-            switch(depth)
+            depth = hypre_min(MAX_DEPTH, (stencil_size - si));
+            switch (depth)
             {
                case 7:
-                  Ap0 = hypre_StructMatrixBoxData(A, i, si+0);
-                  Ap1 = hypre_StructMatrixBoxData(A, i, si+1);
-                  Ap2 = hypre_StructMatrixBoxData(A, i, si+2);
-                  Ap3 = hypre_StructMatrixBoxData(A, i, si+3);
-                  Ap4 = hypre_StructMatrixBoxData(A, i, si+4);
-                  Ap5 = hypre_StructMatrixBoxData(A, i, si+5);
-                  Ap6 = hypre_StructMatrixBoxData(A, i, si+6);
-                  AAp0 = Ap0[Ai]*alpha;
-                  AAp1 = Ap1[Ai]*alpha;
-                  AAp2 = Ap2[Ai]*alpha;
-                  AAp3 = Ap3[Ai]*alpha;
-                  AAp4 = Ap4[Ai]*alpha;
-                  AAp5 = Ap5[Ai]*alpha;
-                  AAp6 = Ap6[Ai]*alpha;
+                  Ap0 = hypre_StructMatrixBoxData(A, i, si + 0);
+                  Ap1 = hypre_StructMatrixBoxData(A, i, si + 1);
+                  Ap2 = hypre_StructMatrixBoxData(A, i, si + 2);
+                  Ap3 = hypre_StructMatrixBoxData(A, i, si + 3);
+                  Ap4 = hypre_StructMatrixBoxData(A, i, si + 4);
+                  Ap5 = hypre_StructMatrixBoxData(A, i, si + 5);
+                  Ap6 = hypre_StructMatrixBoxData(A, i, si + 6);
+                  AAp0 = Ap0[Ai] * alpha;
+                  AAp1 = Ap1[Ai] * alpha;
+                  AAp2 = Ap2[Ai] * alpha;
+                  AAp3 = Ap3[Ai] * alpha;
+                  AAp4 = Ap4[Ai] * alpha;
+                  AAp5 = Ap5[Ai] * alpha;
+                  AAp6 = Ap6[Ai] * alpha;
 
                   xoff0 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+0]);
+                                                  stencil_shape[si + 0]);
                   xoff1 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+1]);
+                                                  stencil_shape[si + 1]);
                   xoff2 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+2]);
+                                                  stencil_shape[si + 2]);
                   xoff3 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+3]);
+                                                  stencil_shape[si + 3]);
                   xoff4 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+4]);
+                                                  stencil_shape[si + 4]);
                   xoff5 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+5]);
+                                                  stencil_shape[si + 5]);
                   xoff6 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+6]);
+                                                  stencil_shape[si + 6]);
 
 #define DEVICE_VAR is_device_ptr(yp,xp)
                   hypre_BoxLoop2Begin(ndim, loop_size,
@@ -730,31 +738,31 @@ HYPRE_Int hypre_StructMatvecCC1( HYPRE_Complex       alpha,
                   break;
 
                case 6:
-                  Ap0 = hypre_StructMatrixBoxData(A, i, si+0);
-                  Ap1 = hypre_StructMatrixBoxData(A, i, si+1);
-                  Ap2 = hypre_StructMatrixBoxData(A, i, si+2);
-                  Ap3 = hypre_StructMatrixBoxData(A, i, si+3);
-                  Ap4 = hypre_StructMatrixBoxData(A, i, si+4);
-                  Ap5 = hypre_StructMatrixBoxData(A, i, si+5);
-                  AAp0 = Ap0[Ai]*alpha;
-                  AAp1 = Ap1[Ai]*alpha;
-                  AAp2 = Ap2[Ai]*alpha;
-                  AAp3 = Ap3[Ai]*alpha;
-                  AAp4 = Ap4[Ai]*alpha;
-                  AAp5 = Ap5[Ai]*alpha;
+                  Ap0 = hypre_StructMatrixBoxData(A, i, si + 0);
+                  Ap1 = hypre_StructMatrixBoxData(A, i, si + 1);
+                  Ap2 = hypre_StructMatrixBoxData(A, i, si + 2);
+                  Ap3 = hypre_StructMatrixBoxData(A, i, si + 3);
+                  Ap4 = hypre_StructMatrixBoxData(A, i, si + 4);
+                  Ap5 = hypre_StructMatrixBoxData(A, i, si + 5);
+                  AAp0 = Ap0[Ai] * alpha;
+                  AAp1 = Ap1[Ai] * alpha;
+                  AAp2 = Ap2[Ai] * alpha;
+                  AAp3 = Ap3[Ai] * alpha;
+                  AAp4 = Ap4[Ai] * alpha;
+                  AAp5 = Ap5[Ai] * alpha;
 
                   xoff0 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+0]);
+                                                  stencil_shape[si + 0]);
                   xoff1 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+1]);
+                                                  stencil_shape[si + 1]);
                   xoff2 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+2]);
+                                                  stencil_shape[si + 2]);
                   xoff3 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+3]);
+                                                  stencil_shape[si + 3]);
                   xoff4 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+4]);
+                                                  stencil_shape[si + 4]);
                   xoff5 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+5]);
+                                                  stencil_shape[si + 5]);
 
 #define DEVICE_VAR is_device_ptr(yp,xp)
                   hypre_BoxLoop2Begin(ndim, loop_size,
@@ -774,27 +782,27 @@ HYPRE_Int hypre_StructMatvecCC1( HYPRE_Complex       alpha,
                   break;
 
                case 5:
-                  Ap0 = hypre_StructMatrixBoxData(A, i, si+0);
-                  Ap1 = hypre_StructMatrixBoxData(A, i, si+1);
-                  Ap2 = hypre_StructMatrixBoxData(A, i, si+2);
-                  Ap3 = hypre_StructMatrixBoxData(A, i, si+3);
-                  Ap4 = hypre_StructMatrixBoxData(A, i, si+4);
-                  AAp0 = Ap0[Ai]*alpha;
-                  AAp1 = Ap1[Ai]*alpha;
-                  AAp2 = Ap2[Ai]*alpha;
-                  AAp3 = Ap3[Ai]*alpha;
-                  AAp4 = Ap4[Ai]*alpha;
+                  Ap0 = hypre_StructMatrixBoxData(A, i, si + 0);
+                  Ap1 = hypre_StructMatrixBoxData(A, i, si + 1);
+                  Ap2 = hypre_StructMatrixBoxData(A, i, si + 2);
+                  Ap3 = hypre_StructMatrixBoxData(A, i, si + 3);
+                  Ap4 = hypre_StructMatrixBoxData(A, i, si + 4);
+                  AAp0 = Ap0[Ai] * alpha;
+                  AAp1 = Ap1[Ai] * alpha;
+                  AAp2 = Ap2[Ai] * alpha;
+                  AAp3 = Ap3[Ai] * alpha;
+                  AAp4 = Ap4[Ai] * alpha;
 
                   xoff0 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+0]);
+                                                  stencil_shape[si + 0]);
                   xoff1 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+1]);
+                                                  stencil_shape[si + 1]);
                   xoff2 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+2]);
+                                                  stencil_shape[si + 2]);
                   xoff3 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+3]);
+                                                  stencil_shape[si + 3]);
                   xoff4 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+4]);
+                                                  stencil_shape[si + 4]);
 
 #define DEVICE_VAR is_device_ptr(yp,xp)
                   hypre_BoxLoop2Begin(ndim, loop_size,
@@ -813,23 +821,23 @@ HYPRE_Int hypre_StructMatvecCC1( HYPRE_Complex       alpha,
                   break;
 
                case 4:
-                  Ap0 = hypre_StructMatrixBoxData(A, i, si+0);
-                  Ap1 = hypre_StructMatrixBoxData(A, i, si+1);
-                  Ap2 = hypre_StructMatrixBoxData(A, i, si+2);
-                  Ap3 = hypre_StructMatrixBoxData(A, i, si+3);
-                  AAp0 = Ap0[Ai]*alpha;
-                  AAp1 = Ap1[Ai]*alpha;
-                  AAp2 = Ap2[Ai]*alpha;
-                  AAp3 = Ap3[Ai]*alpha;
+                  Ap0 = hypre_StructMatrixBoxData(A, i, si + 0);
+                  Ap1 = hypre_StructMatrixBoxData(A, i, si + 1);
+                  Ap2 = hypre_StructMatrixBoxData(A, i, si + 2);
+                  Ap3 = hypre_StructMatrixBoxData(A, i, si + 3);
+                  AAp0 = Ap0[Ai] * alpha;
+                  AAp1 = Ap1[Ai] * alpha;
+                  AAp2 = Ap2[Ai] * alpha;
+                  AAp3 = Ap3[Ai] * alpha;
 
                   xoff0 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+0]);
+                                                  stencil_shape[si + 0]);
                   xoff1 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+1]);
+                                                  stencil_shape[si + 1]);
                   xoff2 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+2]);
+                                                  stencil_shape[si + 2]);
                   xoff3 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+3]);
+                                                  stencil_shape[si + 3]);
 
 #define DEVICE_VAR is_device_ptr(yp,xp)
                   hypre_BoxLoop2Begin(ndim, loop_size,
@@ -847,19 +855,19 @@ HYPRE_Int hypre_StructMatvecCC1( HYPRE_Complex       alpha,
                   break;
 
                case 3:
-                  Ap0 = hypre_StructMatrixBoxData(A, i, si+0);
-                  Ap1 = hypre_StructMatrixBoxData(A, i, si+1);
-                  Ap2 = hypre_StructMatrixBoxData(A, i, si+2);
-                  AAp0 = Ap0[Ai]*alpha;
-                  AAp1 = Ap1[Ai]*alpha;
-                  AAp2 = Ap2[Ai]*alpha;
+                  Ap0 = hypre_StructMatrixBoxData(A, i, si + 0);
+                  Ap1 = hypre_StructMatrixBoxData(A, i, si + 1);
+                  Ap2 = hypre_StructMatrixBoxData(A, i, si + 2);
+                  AAp0 = Ap0[Ai] * alpha;
+                  AAp1 = Ap1[Ai] * alpha;
+                  AAp2 = Ap2[Ai] * alpha;
 
                   xoff0 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+0]);
+                                                  stencil_shape[si + 0]);
                   xoff1 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+1]);
+                                                  stencil_shape[si + 1]);
                   xoff2 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+2]);
+                                                  stencil_shape[si + 2]);
 
 #define DEVICE_VAR is_device_ptr(yp,xp)
                   hypre_BoxLoop2Begin(ndim, loop_size,
@@ -876,15 +884,15 @@ HYPRE_Int hypre_StructMatvecCC1( HYPRE_Complex       alpha,
                   break;
 
                case 2:
-                  Ap0 = hypre_StructMatrixBoxData(A, i, si+0);
-                  Ap1 = hypre_StructMatrixBoxData(A, i, si+1);
-                  AAp0 = Ap0[Ai]*alpha;
-                  AAp1 = Ap1[Ai]*alpha;
+                  Ap0 = hypre_StructMatrixBoxData(A, i, si + 0);
+                  Ap1 = hypre_StructMatrixBoxData(A, i, si + 1);
+                  AAp0 = Ap0[Ai] * alpha;
+                  AAp1 = Ap1[Ai] * alpha;
 
                   xoff0 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+0]);
+                                                  stencil_shape[si + 0]);
                   xoff1 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+1]);
+                                                  stencil_shape[si + 1]);
 
 #define DEVICE_VAR is_device_ptr(yp,xp)
                   hypre_BoxLoop2Begin(ndim, loop_size,
@@ -900,11 +908,11 @@ HYPRE_Int hypre_StructMatvecCC1( HYPRE_Complex       alpha,
                   break;
 
                case 1:
-                  Ap0 = hypre_StructMatrixBoxData(A, i, si+0);
-                  AAp0 = Ap0[Ai]*alpha;
+                  Ap0 = hypre_StructMatrixBoxData(A, i, si + 0);
+                  AAp0 = Ap0[Ai] * alpha;
 
                   xoff0 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+0]);
+                                                  stencil_shape[si + 0]);
 
 #define DEVICE_VAR is_device_ptr(yp,xp)
                   hypre_BoxLoop2Begin(ndim, loop_size,
@@ -936,7 +944,7 @@ HYPRE_Int hypre_StructMatvecCC2( HYPRE_Complex       alpha,
                                  hypre_StructVector *y,
                                  hypre_BoxArrayArray     *compute_box_aa,
                                  hypre_IndexRef           stride
-   )
+                               )
 {
    HYPRE_Int i, j, si;
    HYPRE_Complex           *Ap0;
@@ -979,7 +987,7 @@ HYPRE_Int hypre_StructMatvecCC2( HYPRE_Complex       alpha,
    hypre_Index              loop_size;
    hypre_IndexRef           start;
    HYPRE_Int                ndim;
-   HYPRE_Complex            zero[1]={0};
+   HYPRE_Complex            zero[1] = {0};
 
    stencil       = hypre_StructMatrixStencil(A);
    stencil_shape = hypre_StructStencilShape(stencil);
@@ -1016,22 +1024,22 @@ HYPRE_Int hypre_StructMatvecCC2( HYPRE_Complex       alpha,
          /* unroll up to depth MAX_DEPTH
             Only the constant coefficient part of the matrix is referenced here,
             the center (variable) coefficient part is deferred. */
-         for (si = 0; si < stencil_size; si+= MAX_DEPTH)
+         for (si = 0; si < stencil_size; si += MAX_DEPTH)
          {
-            depth = hypre_min(MAX_DEPTH, (stencil_size -si));
-            switch(depth)
+            depth = hypre_min(MAX_DEPTH, (stencil_size - si));
+            switch (depth)
             {
                case 7:
-                  Ap0 = hypre_StructMatrixBoxData(A, i, si+0);
-                  Ap1 = hypre_StructMatrixBoxData(A, i, si+1);
-                  Ap2 = hypre_StructMatrixBoxData(A, i, si+2);
-                  Ap3 = hypre_StructMatrixBoxData(A, i, si+3);
-                  Ap4 = hypre_StructMatrixBoxData(A, i, si+4);
-                  Ap5 = hypre_StructMatrixBoxData(A, i, si+5);
-                  Ap6 = hypre_StructMatrixBoxData(A, i, si+6);
-                  if ( (0 <= si_center-si) && (si_center-si < 7) )
+                  Ap0 = hypre_StructMatrixBoxData(A, i, si + 0);
+                  Ap1 = hypre_StructMatrixBoxData(A, i, si + 1);
+                  Ap2 = hypre_StructMatrixBoxData(A, i, si + 2);
+                  Ap3 = hypre_StructMatrixBoxData(A, i, si + 3);
+                  Ap4 = hypre_StructMatrixBoxData(A, i, si + 4);
+                  Ap5 = hypre_StructMatrixBoxData(A, i, si + 5);
+                  Ap6 = hypre_StructMatrixBoxData(A, i, si + 6);
+                  if ( (0 <= si_center - si) && (si_center - si < 7) )
                   {
-                     switch ( si_center-si )
+                     switch ( si_center - si )
                      {
                         case 0: Ap0 = zero; break;
                         case 1: Ap1 = zero; break;
@@ -1053,21 +1061,21 @@ HYPRE_Int hypre_StructMatvecCC2( HYPRE_Complex       alpha,
 
 
                   xoff0 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+0]);
+                                                  stencil_shape[si + 0]);
                   xoff0 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+0]);
+                                                  stencil_shape[si + 0]);
                   xoff1 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+1]);
+                                                  stencil_shape[si + 1]);
                   xoff2 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+2]);
+                                                  stencil_shape[si + 2]);
                   xoff3 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+3]);
+                                                  stencil_shape[si + 3]);
                   xoff4 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+4]);
+                                                  stencil_shape[si + 4]);
                   xoff5 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+5]);
+                                                  stencil_shape[si + 5]);
                   xoff6 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+6]);
+                                                  stencil_shape[si + 6]);
 
 #define DEVICE_VAR is_device_ptr(yp,xp)
                   hypre_BoxLoop2Begin(ndim, loop_size,
@@ -1089,15 +1097,15 @@ HYPRE_Int hypre_StructMatvecCC2( HYPRE_Complex       alpha,
                   break;
 
                case 6:
-                  Ap0 = hypre_StructMatrixBoxData(A, i, si+0);
-                  Ap1 = hypre_StructMatrixBoxData(A, i, si+1);
-                  Ap2 = hypre_StructMatrixBoxData(A, i, si+2);
-                  Ap3 = hypre_StructMatrixBoxData(A, i, si+3);
-                  Ap4 = hypre_StructMatrixBoxData(A, i, si+4);
-                  Ap5 = hypre_StructMatrixBoxData(A, i, si+5);
-                  if ( (0 <= si_center-si) && (si_center-si < 6) )
+                  Ap0 = hypre_StructMatrixBoxData(A, i, si + 0);
+                  Ap1 = hypre_StructMatrixBoxData(A, i, si + 1);
+                  Ap2 = hypre_StructMatrixBoxData(A, i, si + 2);
+                  Ap3 = hypre_StructMatrixBoxData(A, i, si + 3);
+                  Ap4 = hypre_StructMatrixBoxData(A, i, si + 4);
+                  Ap5 = hypre_StructMatrixBoxData(A, i, si + 5);
+                  if ( (0 <= si_center - si) && (si_center - si < 6) )
                   {
-                     switch ( si_center-si )
+                     switch ( si_center - si )
                      {
                         case 0: Ap0 = zero; break;
                         case 1: Ap1 = zero; break;
@@ -1115,17 +1123,17 @@ HYPRE_Int hypre_StructMatvecCC2( HYPRE_Complex       alpha,
                   AAp5 = Ap5[Ai_CC];
 
                   xoff0 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+0]);
+                                                  stencil_shape[si + 0]);
                   xoff1 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+1]);
+                                                  stencil_shape[si + 1]);
                   xoff2 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+2]);
+                                                  stencil_shape[si + 2]);
                   xoff3 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+3]);
+                                                  stencil_shape[si + 3]);
                   xoff4 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+4]);
+                                                  stencil_shape[si + 4]);
                   xoff5 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+5]);
+                                                  stencil_shape[si + 5]);
 
 #define DEVICE_VAR is_device_ptr(yp,xp)
                   hypre_BoxLoop2Begin(ndim, loop_size,
@@ -1145,14 +1153,14 @@ HYPRE_Int hypre_StructMatvecCC2( HYPRE_Complex       alpha,
                   break;
 
                case 5:
-                  Ap0 = hypre_StructMatrixBoxData(A, i, si+0);
-                  Ap1 = hypre_StructMatrixBoxData(A, i, si+1);
-                  Ap2 = hypre_StructMatrixBoxData(A, i, si+2);
-                  Ap3 = hypre_StructMatrixBoxData(A, i, si+3);
-                  Ap4 = hypre_StructMatrixBoxData(A, i, si+4);
-                  if ( (0 <= si_center-si) && (si_center-si < 5) )
+                  Ap0 = hypre_StructMatrixBoxData(A, i, si + 0);
+                  Ap1 = hypre_StructMatrixBoxData(A, i, si + 1);
+                  Ap2 = hypre_StructMatrixBoxData(A, i, si + 2);
+                  Ap3 = hypre_StructMatrixBoxData(A, i, si + 3);
+                  Ap4 = hypre_StructMatrixBoxData(A, i, si + 4);
+                  if ( (0 <= si_center - si) && (si_center - si < 5) )
                   {
-                     switch ( si_center-si )
+                     switch ( si_center - si )
                      {
                         case 0: Ap0 = zero; break;
                         case 1: Ap1 = zero; break;
@@ -1168,15 +1176,15 @@ HYPRE_Int hypre_StructMatvecCC2( HYPRE_Complex       alpha,
                   AAp4 = Ap4[Ai_CC];
 
                   xoff0 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+0]);
+                                                  stencil_shape[si + 0]);
                   xoff1 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+1]);
+                                                  stencil_shape[si + 1]);
                   xoff2 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+2]);
+                                                  stencil_shape[si + 2]);
                   xoff3 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+3]);
+                                                  stencil_shape[si + 3]);
                   xoff4 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+4]);
+                                                  stencil_shape[si + 4]);
 
 #define DEVICE_VAR is_device_ptr(yp,xp)
                   hypre_BoxLoop2Begin(ndim, loop_size,
@@ -1195,13 +1203,13 @@ HYPRE_Int hypre_StructMatvecCC2( HYPRE_Complex       alpha,
                   break;
 
                case 4:
-                  Ap0 = hypre_StructMatrixBoxData(A, i, si+0);
-                  Ap1 = hypre_StructMatrixBoxData(A, i, si+1);
-                  Ap2 = hypre_StructMatrixBoxData(A, i, si+2);
-                  Ap3 = hypre_StructMatrixBoxData(A, i, si+3);
-                  if ( (0 <= si_center-si) && (si_center-si < 4) )
+                  Ap0 = hypre_StructMatrixBoxData(A, i, si + 0);
+                  Ap1 = hypre_StructMatrixBoxData(A, i, si + 1);
+                  Ap2 = hypre_StructMatrixBoxData(A, i, si + 2);
+                  Ap3 = hypre_StructMatrixBoxData(A, i, si + 3);
+                  if ( (0 <= si_center - si) && (si_center - si < 4) )
                   {
-                     switch ( si_center-si )
+                     switch ( si_center - si )
                      {
                         case 0: Ap0 = zero; break;
                         case 1: Ap1 = zero; break;
@@ -1215,13 +1223,13 @@ HYPRE_Int hypre_StructMatvecCC2( HYPRE_Complex       alpha,
                   AAp3 = Ap3[Ai_CC];
 
                   xoff0 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+0]);
+                                                  stencil_shape[si + 0]);
                   xoff1 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+1]);
+                                                  stencil_shape[si + 1]);
                   xoff2 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+2]);
+                                                  stencil_shape[si + 2]);
                   xoff3 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+3]);
+                                                  stencil_shape[si + 3]);
 
 #define DEVICE_VAR is_device_ptr(yp,xp)
                   hypre_BoxLoop2Begin(ndim, loop_size,
@@ -1239,12 +1247,12 @@ HYPRE_Int hypre_StructMatvecCC2( HYPRE_Complex       alpha,
                   break;
 
                case 3:
-                  Ap0 = hypre_StructMatrixBoxData(A, i, si+0);
-                  Ap1 = hypre_StructMatrixBoxData(A, i, si+1);
-                  Ap2 = hypre_StructMatrixBoxData(A, i, si+2);
-                  if ( (0 <= si_center-si) && (si_center-si < 3) )
+                  Ap0 = hypre_StructMatrixBoxData(A, i, si + 0);
+                  Ap1 = hypre_StructMatrixBoxData(A, i, si + 1);
+                  Ap2 = hypre_StructMatrixBoxData(A, i, si + 2);
+                  if ( (0 <= si_center - si) && (si_center - si < 3) )
                   {
-                     switch ( si_center-si )
+                     switch ( si_center - si )
                      {
                         case 0: Ap0 = zero; break;
                         case 1: Ap1 = zero; break;
@@ -1256,11 +1264,11 @@ HYPRE_Int hypre_StructMatvecCC2( HYPRE_Complex       alpha,
                   AAp2 = Ap2[Ai_CC];
 
                   xoff0 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+0]);
+                                                  stencil_shape[si + 0]);
                   xoff1 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+1]);
+                                                  stencil_shape[si + 1]);
                   xoff2 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+2]);
+                                                  stencil_shape[si + 2]);
 
 #define DEVICE_VAR is_device_ptr(yp,xp)
                   hypre_BoxLoop2Begin(ndim, loop_size,
@@ -1277,11 +1285,11 @@ HYPRE_Int hypre_StructMatvecCC2( HYPRE_Complex       alpha,
                   break;
 
                case 2:
-                  Ap0 = hypre_StructMatrixBoxData(A, i, si+0);
-                  Ap1 = hypre_StructMatrixBoxData(A, i, si+1);
-                  if ( (0 <= si_center-si) && (si_center-si < 2) )
+                  Ap0 = hypre_StructMatrixBoxData(A, i, si + 0);
+                  Ap1 = hypre_StructMatrixBoxData(A, i, si + 1);
+                  if ( (0 <= si_center - si) && (si_center - si < 2) )
                   {
-                     switch ( si_center-si )
+                     switch ( si_center - si )
                      {
                         case 0: Ap0 = zero; break;
                         case 1: Ap1 = zero; break;
@@ -1291,9 +1299,9 @@ HYPRE_Int hypre_StructMatvecCC2( HYPRE_Complex       alpha,
                   AAp1 = Ap1[Ai_CC];
 
                   xoff0 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+0]);
+                                                  stencil_shape[si + 0]);
                   xoff1 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+1]);
+                                                  stencil_shape[si + 1]);
 
 #define DEVICE_VAR is_device_ptr(yp,xp)
                   hypre_BoxLoop2Begin(ndim, loop_size,
@@ -1309,15 +1317,15 @@ HYPRE_Int hypre_StructMatvecCC2( HYPRE_Complex       alpha,
                   break;
 
                case 1:
-                  Ap0 = hypre_StructMatrixBoxData(A, i, si+0);
-                  if ( si_center-si == 0 )
+                  Ap0 = hypre_StructMatrixBoxData(A, i, si + 0);
+                  if ( si_center - si == 0 )
                   {
                      Ap0 = zero;
                   }
                   AAp0 = Ap0[Ai_CC];
 
                   xoff0 = hypre_BoxOffsetDistance(x_data_box,
-                                                  stencil_shape[si+0]);
+                                                  stencil_shape[si + 0]);
 
 #define DEVICE_VAR is_device_ptr(yp,xp)
                   hypre_BoxLoop2Begin(ndim, loop_size,
@@ -1337,7 +1345,7 @@ HYPRE_Int hypre_StructMatvecCC2( HYPRE_Complex       alpha,
          Ap0 = hypre_StructMatrixBoxData(A, i, si_center);
          xoff0 = hypre_BoxOffsetDistance(x_data_box,
                                          stencil_shape[si_center]);
-         if (alpha!= 1.0 )
+         if (alpha != 1.0 )
          {
 #define DEVICE_VAR is_device_ptr(yp,Ap0,xp)
             hypre_BoxLoop3Begin(ndim, loop_size,
diff --git a/external/hypre/src/struct_mv/struct_scale.c b/external/hypre/src/struct_mv/struct_scale.c
index d8f1ef0a..cdbdb117 100644
--- a/external/hypre/src/struct_mv/struct_scale.c
+++ b/external/hypre/src/struct_mv/struct_scale.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/struct_mv/struct_stencil.c b/external/hypre/src/struct_mv/struct_stencil.c
index e1ded8e6..25bd74f1 100644
--- a/external/hypre/src/struct_mv/struct_stencil.c
+++ b/external/hypre/src/struct_mv/struct_stencil.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -111,7 +111,7 @@ hypre_StructStencilSymmetrize( hypre_StructStencil  *stencil,
                                HYPRE_Int           **symm_elements_ptr )
 {
    hypre_Index          *stencil_shape = hypre_StructStencilShape(stencil);
-   HYPRE_Int             stencil_size  = hypre_StructStencilSize(stencil); 
+   HYPRE_Int             stencil_size  = hypre_StructStencilSize(stencil);
 
    hypre_StructStencil  *symm_stencil;
    hypre_Index          *symm_stencil_shape;
@@ -120,13 +120,13 @@ hypre_StructStencilSymmetrize( hypre_StructStencil  *stencil,
 
    HYPRE_Int             no_symmetric_stencil_element, symmetric;
    HYPRE_Int             i, j, d, ndim;
-                       
+
    /*------------------------------------------------------
     * Copy stencil elements into `symm_stencil_shape'
     *------------------------------------------------------*/
 
    ndim = hypre_StructStencilNDim(stencil);
-   symm_stencil_shape = hypre_CTAlloc(hypre_Index,  2*stencil_size, HYPRE_MEMORY_HOST);
+   symm_stencil_shape = hypre_CTAlloc(hypre_Index,  2 * stencil_size, HYPRE_MEMORY_HOST);
    for (i = 0; i < stencil_size; i++)
    {
       hypre_CopyIndex(stencil_shape[i], symm_stencil_shape[i]);
@@ -136,9 +136,11 @@ hypre_StructStencilSymmetrize( hypre_StructStencil  *stencil,
     * Create symmetric stencil elements and `symm_elements'
     *------------------------------------------------------*/
 
-   symm_elements = hypre_CTAlloc(HYPRE_Int,  2*stencil_size, HYPRE_MEMORY_HOST);
-   for (i = 0; i < 2*stencil_size; i++)
+   symm_elements = hypre_CTAlloc(HYPRE_Int,  2 * stencil_size, HYPRE_MEMORY_HOST);
+   for (i = 0; i < 2 * stencil_size; i++)
+   {
       symm_elements[i] = -1;
+   }
 
    symm_stencil_size = stencil_size;
    for (i = 0; i < stencil_size; i++)
@@ -178,7 +180,7 @@ hypre_StructStencilSymmetrize( hypre_StructStencil  *stencil,
                hypre_IndexD(symm_stencil_shape[symm_stencil_size], d) =
                   -hypre_IndexD(symm_stencil_shape[i], d);
             }
-               
+
             symm_elements[symm_stencil_size] = i;
             symm_stencil_size++;
          }
diff --git a/external/hypre/src/struct_mv/struct_stencil.h b/external/hypre/src/struct_mv/struct_stencil.h
index 4d1566a7..8c74313c 100644
--- a/external/hypre/src/struct_mv/struct_stencil.h
+++ b/external/hypre/src/struct_mv/struct_stencil.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -22,7 +22,7 @@ typedef struct hypre_StructStencil_struct
 {
    hypre_Index   *shape;   /* Description of a stencil's shape */
    HYPRE_Int      size;    /* Number of stencil coefficients */
-                
+
    HYPRE_Int      ndim;    /* Number of dimensions */
 
    HYPRE_Int      ref_count;
diff --git a/external/hypre/src/struct_mv/struct_vector.c b/external/hypre/src/struct_mv/struct_vector.c
index 07841d89..1a5d418f 100644
--- a/external/hypre/src/struct_mv/struct_vector.c
+++ b/external/hypre/src/struct_mv/struct_vector.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -25,7 +25,7 @@ hypre_StructVectorCreate( MPI_Comm          comm,
    hypre_StructVector  *vector;
    HYPRE_Int            i;
 
-   vector = hypre_CTAlloc(hypre_StructVector,  1, HYPRE_MEMORY_HOST);
+   vector = hypre_CTAlloc(hypre_StructVector, 1, HYPRE_MEMORY_HOST);
 
    hypre_StructVectorComm(vector)           = comm;
    hypre_StructGridRef(grid, &hypre_StructVectorGrid(vector));
@@ -34,11 +34,13 @@ hypre_StructVectorCreate( MPI_Comm          comm,
    hypre_StructVectorRefCount(vector)       = 1;
 
    /* set defaults */
-   for (i = 0; i < 2*ndim; i++)
+   for (i = 0; i < 2 * ndim; i++)
    {
       hypre_StructVectorNumGhost(vector)[i] = hypre_StructGridNumGhost(grid)[i];
    }
 
+   hypre_StructVectorMemoryLocation(vector) = hypre_HandleMemoryLocation(hypre_handle());
+
    return vector;
 }
 
@@ -66,20 +68,9 @@ hypre_StructVectorDestroy( hypre_StructVector *vector )
       {
          if (hypre_StructVectorDataAlloced(vector))
          {
-#if 0 //defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-            hypre_StructGrid     *grid = hypre_StructVectorGrid(vector);
-            if (hypre_StructGridDataLocation(grid) != HYPRE_MEMORY_HOST)
-            {
-               hypre_TFree(hypre_StructVectorData(vector),HYPRE_MEMORY_DEVICE);
-            }
-            else
-            {
-               hypre_TFree(hypre_StructVectorData(vector),HYPRE_MEMORY_HOST);
-            }
-#else
-            hypre_TFree(hypre_StructVectorData(vector),HYPRE_MEMORY_DEVICE);
-#endif
+            hypre_TFree(hypre_StructVectorData(vector), hypre_StructVectorMemoryLocation(vector));
          }
+
          hypre_TFree(hypre_StructVectorDataIndices(vector), HYPRE_MEMORY_HOST);
          hypre_BoxArrayDestroy(hypre_StructVectorDataSpace(vector));
          hypre_StructGridDestroy(hypre_StructVectorGrid(vector));
@@ -132,8 +123,8 @@ hypre_StructVectorInitializeShell( hypre_StructVector *vector )
          hypre_CopyBox(box, data_box);
          for (d = 0; d < ndim; d++)
          {
-            hypre_BoxIMinD(data_box, d) -= num_ghost[2*d];
-            hypre_BoxIMaxD(data_box, d) += num_ghost[2*d + 1];
+            hypre_BoxIMinD(data_box, d) -= num_ghost[2 * d];
+            hypre_BoxIMaxD(data_box, d) += num_ghost[2 * d + 1];
          }
       }
 
@@ -195,19 +186,9 @@ hypre_StructVectorInitialize( hypre_StructVector *vector )
    HYPRE_Complex *data;
 
    hypre_StructVectorInitializeShell(vector);
-#if 0 //defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-   hypre_StructGrid     *grid = hypre_StructVectorGrid(vector);
-   if (hypre_StructGridDataLocation(grid) != HYPRE_MEMORY_HOST)
-   {
-      data = hypre_CTAlloc(HYPRE_Complex, hypre_StructVectorDataSize(vector),HYPRE_MEMORY_DEVICE);
-   }
-   else
-   {
-      data = hypre_CTAlloc(HYPRE_Complex, hypre_StructVectorDataSize(vector),HYPRE_MEMORY_HOST);
-   }
-#else
-   data = hypre_CTAlloc(HYPRE_Complex, hypre_StructVectorDataSize(vector),HYPRE_MEMORY_DEVICE);
-#endif
+
+   data = hypre_CTAlloc(HYPRE_Complex, hypre_StructVectorDataSize(vector),
+                        hypre_StructVectorMemoryLocation(vector));
 
    hypre_StructVectorInitializeData(vector, data);
    hypre_StructVectorDataAlloced(vector) = 1;
@@ -235,12 +216,13 @@ hypre_StructVectorSetValues( hypre_StructVector *vector,
                              HYPRE_Int           boxnum,
                              HYPRE_Int           outside    )
 {
-   hypre_BoxArray     *grid_boxes;
-   hypre_Box          *grid_box;
-
-   HYPRE_Complex      *vecp;
-
-   HYPRE_Int           i, istart, istop;
+   hypre_BoxArray      *grid_boxes;
+   hypre_Box           *grid_box;
+   HYPRE_Complex       *vecp;
+   HYPRE_Int            i, istart, istop;
+#if defined(HYPRE_USING_GPU)
+   HYPRE_MemoryLocation memory_location = hypre_StructVectorMemoryLocation(vector);
+#endif
 
    if (outside > 0)
    {
@@ -270,7 +252,8 @@ hypre_StructVectorSetValues( hypre_StructVector *vector,
       {
          vecp = hypre_StructVectorBoxDataValue(vector, i, grid_index);
 
-         if (hypre_GetActualMemLocation(HYPRE_MEMORY_DEVICE) != hypre_MEMORY_HOST)
+#if defined(HYPRE_USING_GPU)
+         if (hypre_GetExecPolicy1(memory_location) == HYPRE_EXEC_DEVICE)
          {
             if (action > 0)
             {
@@ -284,14 +267,15 @@ hypre_StructVectorSetValues( hypre_StructVector *vector,
             }
             else if (action > -1)
             {
-               hypre_TMemcpy(vecp, values, HYPRE_Complex, 1, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+               hypre_TMemcpy(vecp, values, HYPRE_Complex, 1, memory_location, memory_location);
             }
             else /* action < 0 */
             {
-               hypre_TMemcpy(values, vecp, HYPRE_Complex, 1, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+               hypre_TMemcpy(values, vecp, HYPRE_Complex, 1, memory_location, memory_location);
             }
          }
          else
+#endif
          {
             if (action > 0)
             {
@@ -407,8 +391,8 @@ hypre_StructVectorSetBoxValues( hypre_StructVector *vector,
          if (action > 0)
          {
             hypre_BoxLoop2Begin(hypre_StructVectorNDim(vector), loop_size,
-                                data_box,data_start,data_stride,datai,
-                                dval_box,dval_start,dval_stride,dvali);
+                                data_box, data_start, data_stride, datai,
+                                dval_box, dval_start, dval_stride, dvali);
             {
                datap[datai] += values[dvali];
             }
@@ -417,8 +401,8 @@ hypre_StructVectorSetBoxValues( hypre_StructVector *vector,
          else if (action > -1)
          {
             hypre_BoxLoop2Begin(hypre_StructVectorNDim(vector), loop_size,
-                                data_box,data_start,data_stride,datai,
-                                dval_box,dval_start,dval_stride,dvali);
+                                data_box, data_start, data_stride, datai,
+                                dval_box, dval_start, dval_stride, dvali);
             {
                datap[datai] = values[dvali];
             }
@@ -427,8 +411,8 @@ hypre_StructVectorSetBoxValues( hypre_StructVector *vector,
          else /* action < 0 */
          {
             hypre_BoxLoop2Begin(hypre_StructVectorNDim(vector), loop_size,
-                                data_box,data_start,data_stride,datai,
-                                dval_box,dval_start,dval_stride,dvali);
+                                data_box, data_start, data_stride, datai,
+                                dval_box, dval_start, dval_stride, dvali);
             {
                values[dvali] = datap[datai];
             }
@@ -455,12 +439,13 @@ hypre_StructVectorClearValues( hypre_StructVector *vector,
                                HYPRE_Int           boxnum,
                                HYPRE_Int           outside    )
 {
-   hypre_BoxArray     *grid_boxes;
-   hypre_Box          *grid_box;
-
-   HYPRE_Complex      *vecp;
-
-   HYPRE_Int           i, istart, istop;
+   hypre_BoxArray      *grid_boxes;
+   hypre_Box           *grid_box;
+   HYPRE_Complex       *vecp;
+   HYPRE_Int            i, istart, istop;
+#if defined(HYPRE_USING_GPU)
+   HYPRE_MemoryLocation memory_location = hypre_StructVectorMemoryLocation(vector);
+#endif
 
    if (outside > 0)
    {
@@ -490,7 +475,8 @@ hypre_StructVectorClearValues( hypre_StructVector *vector,
       {
          vecp = hypre_StructVectorBoxDataValue(vector, i, grid_index);
 
-         if (hypre_GetActualMemLocation(HYPRE_MEMORY_DEVICE) != hypre_MEMORY_HOST)
+#if defined(HYPRE_USING_GPU)
+         if (hypre_GetExecPolicy1(memory_location) == HYPRE_EXEC_DEVICE)
          {
 #define DEVICE_VAR is_device_ptr(vecp)
             hypre_LoopBegin(1, k)
@@ -501,6 +487,7 @@ hypre_StructVectorClearValues( hypre_StructVector *vector,
 #undef DEVICE_VAR
          }
          else
+#endif
          {
             *vecp = 0.0;
          }
@@ -586,7 +573,7 @@ hypre_StructVectorClearBoxValues( hypre_StructVector *vector,
 
 #define DEVICE_VAR is_device_ptr(datap)
          hypre_BoxLoop1Begin(hypre_StructVectorNDim(vector), loop_size,
-                             data_box,data_start,data_stride,datai);
+                             data_box, data_start, data_stride, datai);
          {
             datap[datai] = 0.0;
          }
@@ -641,8 +628,8 @@ hypre_StructVectorSetNumGhost( hypre_StructVector *vector,
 
    for (d = 0; d < ndim; d++)
    {
-      hypre_StructVectorNumGhost(vector)[2*d]     = num_ghost[2*d];
-      hypre_StructVectorNumGhost(vector)[2*d + 1] = num_ghost[2*d + 1];
+      hypre_StructVectorNumGhost(vector)[2 * d]     = num_ghost[2 * d];
+      hypre_StructVectorNumGhost(vector)[2 * d + 1] = num_ghost[2 * d + 1];
    }
 
    return hypre_error_flag;
@@ -656,6 +643,8 @@ hypre_StructVectorSetDataSize(hypre_StructVector *vector,
                               HYPRE_Int          *data_size,
                               HYPRE_Int          *data_host_size)
 {
+   HYPRE_UNUSED_VAR(data_host_size);
+
 #if 0 //defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
    hypre_StructGrid     *grid = hypre_StructVectorGrid(vector);
    if (hypre_StructGridDataLocation(grid) != HYPRE_MEMORY_HOST)
@@ -678,6 +667,8 @@ hypre_StructVectorSetDataSize(hypre_StructVector *vector,
 HYPRE_Int
 hypre_StructVectorAssemble( hypre_StructVector *vector )
 {
+   HYPRE_UNUSED_VAR(vector);
+
    return hypre_error_flag;
 }
 
@@ -713,7 +704,7 @@ hypre_StructVectorCopy( hypre_StructVector *x,
    boxes = hypre_StructGridBoxes( hypre_StructVectorGrid(x) );
    hypre_ForBoxI(i, boxes)
    {
-      box      = hypre_BoxArrayBox(boxes, i);
+      box   = hypre_BoxArrayBox(boxes, i);
       start = hypre_BoxIMin(box);
 
       x_data_box =
@@ -1070,6 +1061,93 @@ hypre_StructVectorMigrate( hypre_CommPkg      *comm_pkg,
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_StructVectorPrintData
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_StructVectorPrintData( FILE               *file,
+                             hypre_StructVector *vector,
+                             HYPRE_Int           all )
+{
+   HYPRE_Int            ndim            = hypre_StructVectorNDim(vector);
+   hypre_StructGrid    *grid            = hypre_StructVectorGrid(vector);
+   hypre_BoxArray      *grid_boxes      = hypre_StructGridBoxes(grid);
+   hypre_BoxArray      *data_space      = hypre_StructVectorDataSpace(vector);
+   HYPRE_Int            data_size       = hypre_StructVectorDataSize(vector);
+   HYPRE_Complex       *data            = hypre_StructVectorData(vector);
+   HYPRE_MemoryLocation memory_location = hypre_StructVectorMemoryLocation(vector);
+   hypre_BoxArray      *boxes;
+   HYPRE_Complex       *h_data;
+
+   /* Allocate/Point to data on the host memory */
+   if (hypre_GetActualMemLocation(memory_location) != hypre_MEMORY_HOST)
+   {
+      h_data = hypre_CTAlloc(HYPRE_Complex, data_size, HYPRE_MEMORY_HOST);
+      hypre_TMemcpy(h_data, data, HYPRE_Complex, data_size,
+                    HYPRE_MEMORY_HOST, memory_location);
+   }
+   else
+   {
+      h_data = data;
+   }
+
+   /* Print ghost data (all) also or only real data? */
+   boxes = (all) ? data_space : grid_boxes;
+
+   /* Print data to file */
+   hypre_PrintBoxArrayData(file, boxes, data_space, 1, ndim, h_data);
+
+   /* Free memory */
+   if (hypre_GetActualMemLocation(memory_location) != hypre_MEMORY_HOST)
+   {
+      hypre_TFree(h_data, HYPRE_MEMORY_HOST);
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_StructVectorReadData
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_StructVectorReadData( FILE               *file,
+                            hypre_StructVector *vector )
+{
+   HYPRE_Int            ndim            = hypre_StructVectorNDim(vector);
+   hypre_StructGrid    *grid            = hypre_StructVectorGrid(vector);
+   hypre_BoxArray      *grid_boxes      = hypre_StructGridBoxes(grid);
+   hypre_BoxArray      *data_space      = hypre_StructVectorDataSpace(vector);
+   HYPRE_Int            data_size       = hypre_StructVectorDataSize(vector);
+   HYPRE_Complex       *data            = hypre_StructVectorData(vector);
+   HYPRE_MemoryLocation memory_location = hypre_StructVectorMemoryLocation(vector);
+   HYPRE_Complex       *h_data;
+
+   /* Allocate/Point to data on the host memory */
+   if (hypre_GetActualMemLocation(memory_location) != hypre_MEMORY_HOST)
+   {
+      h_data = hypre_CTAlloc(HYPRE_Complex, data_size, HYPRE_MEMORY_HOST);
+   }
+   else
+   {
+      h_data = data;
+   }
+
+   /* Read data from file */
+   hypre_ReadBoxArrayData(file, grid_boxes, data_space, 1, ndim, h_data);
+
+   /* Move data to the device memory if necessary and free host data */
+   if (hypre_GetActualMemLocation(memory_location) != hypre_MEMORY_HOST)
+   {
+      hypre_TMemcpy(data, h_data, HYPRE_Complex, data_size,
+                    memory_location, HYPRE_MEMORY_HOST);
+      hypre_TFree(h_data, HYPRE_MEMORY_HOST);
+   }
+
+   return hypre_error_flag;
+}
+
 /*--------------------------------------------------------------------------
  * hypre_StructVectorPrint
  *--------------------------------------------------------------------------*/
@@ -1083,24 +1161,21 @@ hypre_StructVectorPrint( const char         *filename,
    char               new_filename[255];
 
    hypre_StructGrid  *grid;
-   hypre_BoxArray    *boxes;
-
-   hypre_BoxArray    *data_space;
-
    HYPRE_Int          myid;
 
    /*----------------------------------------
     * Open file
     *----------------------------------------*/
 
-   hypre_MPI_Comm_rank(hypre_StructVectorComm(vector), &myid );
-
+   hypre_MPI_Comm_rank(hypre_StructVectorComm(vector), &myid);
    hypre_sprintf(new_filename, "%s.%05d", filename, myid);
 
    if ((file = fopen(new_filename, "w")) == NULL)
    {
       hypre_printf("Error: can't open output file %s\n", new_filename);
-      exit(1);
+      hypre_error_in_arg(1);
+
+      return hypre_error_flag;
    }
 
    /*----------------------------------------
@@ -1118,17 +1193,8 @@ hypre_StructVectorPrint( const char         *filename,
     * Print data
     *----------------------------------------*/
 
-   data_space = hypre_StructVectorDataSpace(vector);
-
-   if (all)
-      boxes = data_space;
-   else
-      boxes = hypre_StructGridBoxes(grid);
-
    hypre_fprintf(file, "\nData:\n");
-   hypre_PrintBoxArrayData(file, boxes, data_space, 1,
-                           hypre_StructGridNDim(grid),
-                           hypre_StructVectorData(vector));
+   hypre_StructVectorPrintData(file, vector, all);
 
    /*----------------------------------------
     * Close file
@@ -1141,6 +1207,7 @@ hypre_StructVectorPrint( const char         *filename,
 }
 
 /*--------------------------------------------------------------------------
+ * hypre_StructVectorRead
  *--------------------------------------------------------------------------*/
 
 hypre_StructVector *
@@ -1152,11 +1219,7 @@ hypre_StructVectorRead( MPI_Comm    comm,
    char                  new_filename[255];
 
    hypre_StructVector   *vector;
-
    hypre_StructGrid     *grid;
-   hypre_BoxArray       *boxes;
-
-   hypre_BoxArray       *data_space;
 
    HYPRE_Int             myid;
 
@@ -1164,13 +1227,13 @@ hypre_StructVectorRead( MPI_Comm    comm,
     * Open file
     *----------------------------------------*/
 
-   hypre_MPI_Comm_rank(comm, &myid );
-
+   hypre_MPI_Comm_rank(comm, &myid);
    hypre_sprintf(new_filename, "%s.%05d", filename, myid);
 
    if ((file = fopen(new_filename, "r")) == NULL)
    {
-      hypre_printf("Error: can't open output file %s\n", new_filename);
+      hypre_printf("Error: can't open input file %s\n", new_filename);
+      hypre_error_in_arg(2);
       exit(1);
    }
 
@@ -1182,7 +1245,7 @@ hypre_StructVectorRead( MPI_Comm    comm,
 
    /* read grid info */
    hypre_fscanf(file, "\nGrid:\n");
-   hypre_StructGridRead(comm,file,&grid);
+   hypre_StructGridRead(comm, file, &grid);
 
    /*----------------------------------------
     * Initialize the vector
@@ -1196,13 +1259,8 @@ hypre_StructVectorRead( MPI_Comm    comm,
     * Read data
     *----------------------------------------*/
 
-   boxes      = hypre_StructGridBoxes(grid);
-   data_space = hypre_StructVectorDataSpace(vector);
-
    hypre_fscanf(file, "\nData:\n");
-   hypre_ReadBoxArrayData(file, boxes, data_space, 1,
-                          hypre_StructGridNDim(grid),
-                          hypre_StructVectorData(vector));
+   hypre_StructVectorReadData(file, vector);
 
    /*----------------------------------------
     * Assemble the vector
@@ -1225,36 +1283,40 @@ hypre_StructVectorRead( MPI_Comm    comm,
  * hypre_StructVectorClone
  * Returns a complete copy of x - a deep copy, with its own copy of the data.
  *--------------------------------------------------------------------------*/
+
 hypre_StructVector *
 hypre_StructVectorClone(hypre_StructVector *x)
 {
-   MPI_Comm             comm = hypre_StructVectorComm(x);
-   hypre_StructGrid    *grid = hypre_StructVectorGrid(x);
-   hypre_BoxArray      *data_space = hypre_StructVectorDataSpace(x);
-   HYPRE_Int           *data_indices = hypre_StructVectorDataIndices(x);
-   HYPRE_Int            data_size = hypre_StructVectorDataSize(x);
-   HYPRE_Int            ndim = hypre_StructGridNDim(grid);
+   MPI_Comm             comm            = hypre_StructVectorComm(x);
+   hypre_StructGrid    *grid            = hypre_StructVectorGrid(x);
+   HYPRE_MemoryLocation memory_location = hypre_StructVectorMemoryLocation(x);
+   hypre_BoxArray      *data_space      = hypre_StructVectorDataSpace(x);
+   HYPRE_Int           *data_indices    = hypre_StructVectorDataIndices(x);
+   HYPRE_Int            data_size       = hypre_StructVectorDataSize(x);
+   HYPRE_Int            ndim            = hypre_StructGridNDim(grid);
    HYPRE_Int            data_space_size = hypre_BoxArraySize(data_space);
+   hypre_StructVector  *y               = hypre_StructVectorCreate(comm, grid);
    HYPRE_Int            i;
-   hypre_StructVector  *y = hypre_StructVectorCreate(comm, grid);
 
-   hypre_StructVectorDataSize(y) = data_size;
-   hypre_StructVectorDataSpace(y) = hypre_BoxArrayDuplicate(data_space);
-   hypre_StructVectorData(y) =  hypre_CTAlloc(HYPRE_Complex,  data_size, HYPRE_MEMORY_DEVICE);
+   hypre_StructVectorDataSize(y)    = data_size;
+   hypre_StructVectorDataSpace(y)   = hypre_BoxArrayDuplicate(data_space);
+   hypre_StructVectorData(y)        = hypre_CTAlloc(HYPRE_Complex, data_size, memory_location);
+   hypre_StructVectorDataIndices(y) = hypre_CTAlloc(HYPRE_Int, data_space_size, HYPRE_MEMORY_HOST);
 
-   hypre_StructVectorDataIndices(y) = hypre_CTAlloc(HYPRE_Int,  data_space_size, HYPRE_MEMORY_HOST);
-
-   for (i=0; i < data_space_size; i++)
+   for (i = 0; i < data_space_size; i++)
+   {
       hypre_StructVectorDataIndices(y)[i] = data_indices[i];
+   }
 
    hypre_StructVectorCopy( x, y );
 
-   for (i=0; i < 2*ndim; i++)
+   for (i = 0; i < 2 * ndim; i++)
+   {
       hypre_StructVectorNumGhost(y)[i] = hypre_StructVectorNumGhost(x)[i];
+   }
 
    hypre_StructVectorBGhostNotClear(y) = hypre_StructVectorBGhostNotClear(x);
    hypre_StructVectorGlobalSize(y) = hypre_StructVectorGlobalSize(x);
 
    return y;
 }
-
diff --git a/external/hypre/src/struct_mv/struct_vector.h b/external/hypre/src/struct_mv/struct_vector.h
index 7e396afd..551a9505 100644
--- a/external/hypre/src/struct_mv/struct_vector.h
+++ b/external/hypre/src/struct_mv/struct_vector.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -26,19 +26,20 @@ typedef struct hypre_StructVector_struct
 
    hypre_BoxArray       *data_space;
 
-   HYPRE_Complex        *data;         /* Pointer to vector data on device*/
-   HYPRE_Int             data_alloced; /* Boolean used for freeing data */
-   HYPRE_Int             data_size;    /* Size of vector data */
-   HYPRE_Int            *data_indices; /* num-boxes array of indices into
-                                          the data array.  data_indices[b]
-                                          is the starting index of vector
-                                          data corresponding to box b. */
+   HYPRE_MemoryLocation  memory_location;             /* memory location of data */
+   HYPRE_Complex        *data;                        /* Pointer to vector data on device*/
+   HYPRE_Int             data_alloced;                /* Boolean used for freeing data */
+   HYPRE_Int             data_size;                   /* Size of vector data */
+   HYPRE_Int            *data_indices;                /* num-boxes array of indices into
+                                                         the data array.  data_indices[b]
+                                                         is the starting index of vector
+                                                         data corresponding to box b. */
 
-   HYPRE_Int             num_ghost[2*HYPRE_MAXDIM]; /* Num ghost layers in each
-                                                     * direction */
-   HYPRE_Int             bghost_not_clear; /* Are boundary ghosts clear? */
+   HYPRE_Int             num_ghost[2 * HYPRE_MAXDIM]; /* Num ghost layers in each
+                                                       * direction */
+   HYPRE_Int             bghost_not_clear;            /* Are boundary ghosts clear? */
 
-   HYPRE_BigInt          global_size;  /* Total number coefficients */
+   HYPRE_BigInt          global_size;                 /* Total number coefficients */
 
    HYPRE_Int             ref_count;
 
@@ -48,17 +49,18 @@ typedef struct hypre_StructVector_struct
  * Accessor macros: hypre_StructVector
  *--------------------------------------------------------------------------*/
 
-#define hypre_StructVectorComm(vector)          ((vector) -> comm)
-#define hypre_StructVectorGrid(vector)          ((vector) -> grid)
-#define hypre_StructVectorDataSpace(vector)     ((vector) -> data_space)
-#define hypre_StructVectorData(vector)          ((vector) -> data)
-#define hypre_StructVectorDataAlloced(vector)   ((vector) -> data_alloced)
-#define hypre_StructVectorDataSize(vector)      ((vector) -> data_size)
-#define hypre_StructVectorDataIndices(vector)   ((vector) -> data_indices)
-#define hypre_StructVectorNumGhost(vector)      ((vector) -> num_ghost)
-#define hypre_StructVectorBGhostNotClear(vector)((vector) -> bghost_not_clear)
-#define hypre_StructVectorGlobalSize(vector)    ((vector) -> global_size)
-#define hypre_StructVectorRefCount(vector)      ((vector) -> ref_count)
+#define hypre_StructVectorComm(vector)           ((vector) -> comm)
+#define hypre_StructVectorGrid(vector)           ((vector) -> grid)
+#define hypre_StructVectorDataSpace(vector)      ((vector) -> data_space)
+#define hypre_StructVectorMemoryLocation(vector) ((vector) -> memory_location)
+#define hypre_StructVectorData(vector)           ((vector) -> data)
+#define hypre_StructVectorDataAlloced(vector)    ((vector) -> data_alloced)
+#define hypre_StructVectorDataSize(vector)       ((vector) -> data_size)
+#define hypre_StructVectorDataIndices(vector)    ((vector) -> data_indices)
+#define hypre_StructVectorNumGhost(vector)       ((vector) -> num_ghost)
+#define hypre_StructVectorBGhostNotClear(vector) ((vector) -> bghost_not_clear)
+#define hypre_StructVectorGlobalSize(vector)     ((vector) -> global_size)
+#define hypre_StructVectorRefCount(vector)       ((vector) -> ref_count)
 
 #define hypre_StructVectorNDim(vector) \
 hypre_StructGridNDim(hypre_StructVectorGrid(vector))
diff --git a/external/hypre/src/tarch b/external/hypre/src/tarch
old mode 100644
new mode 100755
index f62254ec..d4fbb04f
--- a/external/hypre/src/tarch
+++ b/external/hypre/src/tarch
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /bin/bash
 # set -x
 #
 #  Returns the architecture of the host machine
@@ -59,7 +59,7 @@ for LARCH in $ARCHLIST ; do
 	mips|dec-5000)   FARCH=dec5000 ; break ;;
         IP12|iris-4d)    GARCH=IRIX ;;
         cray|CRAY*)      GARCH=CRAY ;;
-	KSR1|KSR2)       FARCH=ksr ; break ;;	
+	KSR1|KSR2)       FARCH=ksr ; break ;;
         FreeBSD)         FARCH=freebsd ; break ;;
 	i386)            GARCH=ipsc2 ;;
 	ULTRIX|RISC)     GARCH=dec5000 ;;
diff --git a/external/hypre/src/test/CMakeLists.txt b/external/hypre/src/test/CMakeLists.txt
index b5eaa3a1..9c286cc2 100644
--- a/external/hypre/src/test/CMakeLists.txt
+++ b/external/hypre/src/test/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -9,6 +9,11 @@ if (MSVC)
   add_definitions(-D_CRT_SECURE_NO_WARNINGS)
 endif ()
 
+# Set default tolerance if not defined
+if(NOT DEFINED HYPRE_CHECK_TOL)
+  set(HYPRE_CHECK_TOL 1.0e-6)
+endif()
+
 set(TEST_SRCS
   ij.c
   sstruct.c
@@ -17,8 +22,118 @@ set(TEST_SRCS
   maxwell_unscaled.c
   struct_migrate.c
   sstruct_fac.c
-  ij_mv.c
+  ij_assembly.c
 )
 
 add_hypre_executables(TEST_SRCS)
- 
+
+# Copy test input files
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/TEST_sstruct/sstruct.in.default
+               ${CMAKE_CURRENT_BINARY_DIR}/sstruct.in.default COPYONLY)
+
+# Add check target
+find_program(BASH_PROGRAM bash)
+
+# Run check target
+add_custom_target(check
+  COMMAND ${CMAKE_COMMAND} -E echo "Checking the library..."
+  COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} 1 $<TARGET_FILE:ij> 2> ij.err
+  COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} 1 $<TARGET_FILE:struct> 2> struct.err
+  COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} 1 $<TARGET_FILE:sstruct> 2> sstruct.err
+  COMMAND ${CMAKE_COMMAND} -E echo "Test error files:"
+  COMMAND ${CMAKE_COMMAND} -E cat ij.err struct.err sstruct.err
+  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+  DEPENDS ij struct sstruct
+  COMMENT "Running basic library check"
+  VERBATIM
+)
+
+# Add checkpar target for parallel testing
+add_custom_target(checkpar
+  COMMAND ${CMAKE_COMMAND} -E echo "Checking the library..."
+
+  COMMAND ${CMAKE_COMMAND} -E echo_append "Testing IJ... "
+  COMMAND ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_DIR}/runtest.sh
+          -atol ${HYPRE_CHECK_TOL}
+          -mpi "${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG}"
+          ${CMAKE_CURRENT_SOURCE_DIR}/TEST_ij/solvers.sh
+  COMMAND ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_DIR}/checktest.sh
+  COMMAND ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_DIR}/cleantest.sh
+  COMMAND echo ""
+
+  COMMAND ${CMAKE_COMMAND} -E echo_append "Testing Struct... "
+  COMMAND ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_DIR}/runtest.sh
+          -atol ${HYPRE_CHECK_TOL}
+          -mpi "${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG}"
+          ${CMAKE_CURRENT_SOURCE_DIR}/TEST_struct/solvers.sh
+  COMMAND ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_DIR}/checktest.sh
+  COMMAND ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_DIR}/cleantest.sh
+  COMMAND echo ""
+
+  COMMAND ${CMAKE_COMMAND} -E echo_append "Testing SStruct... "
+  COMMAND ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_DIR}/runtest.sh
+          -atol ${HYPRE_CHECK_TOL}
+          -mpi "${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG}"
+          ${CMAKE_CURRENT_SOURCE_DIR}/TEST_sstruct/solvers.sh
+  COMMAND ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_DIR}/checktest.sh
+  COMMAND ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_DIR}/cleantest.sh
+  COMMAND echo ""
+
+  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+  DEPENDS ${TEST_SRCS}
+  COMMENT "Running parallel tests"
+  VERBATIM
+)
+
+# Add CTest support
+if(BUILD_TESTING)
+  message(STATUS "Building tests with CTest support")
+
+  # IJ tests
+  add_test(NAME test_ij_solvers
+    COMMAND ${BASH_PROGRAM} -c "\
+      ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_DIR}/runtest.sh \
+        -atol ${HYPRE_CHECK_TOL} \
+        -mpi \"${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG}\" \
+        ${CMAKE_CURRENT_SOURCE_DIR}/TEST_ij/solvers.sh && \
+      ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_DIR}/checktest.sh && \
+      ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_DIR}/cleantest.sh"
+  )
+  set_tests_properties(test_ij_solvers PROPERTIES
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    DEPENDS ij
+    FAIL_REGULAR_EXPRESSION "Failed"
+  )
+
+  # Struct tests
+  add_test(NAME test_struct_solvers
+    COMMAND ${BASH_PROGRAM} -c "\
+      ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_DIR}/runtest.sh \
+        -atol ${HYPRE_CHECK_TOL} \
+        -mpi \"${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG}\" \
+        ${CMAKE_CURRENT_SOURCE_DIR}/TEST_struct/solvers.sh && \
+      ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_DIR}/checktest.sh && \
+      ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_DIR}/cleantest.sh"
+  )
+  set_tests_properties(test_struct_solvers PROPERTIES
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    DEPENDS struct
+    FAIL_REGULAR_EXPRESSION "Failed"
+  )
+
+  # SStruct tests
+  add_test(NAME test_sstruct_solvers
+    COMMAND ${BASH_PROGRAM} -c "\
+      ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_DIR}/runtest.sh \
+        -atol ${HYPRE_CHECK_TOL} \
+        -mpi \"${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG}\" \
+        ${CMAKE_CURRENT_SOURCE_DIR}/TEST_sstruct/solvers.sh && \
+      ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_DIR}/checktest.sh && \
+      ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_DIR}/cleantest.sh"
+  )
+  set_tests_properties(test_sstruct_solvers PROPERTIES
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    DEPENDS sstruct
+    FAIL_REGULAR_EXPRESSION "Failed"
+  )
+endif()
diff --git a/external/hypre/src/test/TEST_ams/solvers.jobs b/external/hypre/src/test/TEST_ams/solvers.jobs
old mode 100644
new mode 100755
index 625932a9..3121faff
--- a/external/hypre/src/test/TEST_ams/solvers.jobs
+++ b/external/hypre/src/test/TEST_ams/solvers.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_ams/solvers.saved b/external/hypre/src/test/TEST_ams/solvers.saved
index 8b486edc..bcea4aee 100644
--- a/external/hypre/src/test/TEST_ams/solvers.saved
+++ b/external/hypre/src/test/TEST_ams/solvers.saved
@@ -37,81 +37,81 @@
 # Output file: solvers.out.4
 
 Iterations = 6
-Final Relative Residual Norm = 6.440027e-07
+Final Relative Residual Norm = 6.440062e-07
 
 # Output file: solvers.out.5
 
 Iterations = 6
-Final Relative Residual Norm = 6.440027e-07
+Final Relative Residual Norm = 6.440062e-07
 
 # Output file: solvers.out.6
 
 Iterations = 9
-Final Relative Residual Norm = 9.646705e-07
+Final Relative Residual Norm = 9.646675e-07
 
 # Output file: solvers.out.7
 
 Iterations = 9
-Final Relative Residual Norm = 9.646705e-07
+Final Relative Residual Norm = 9.646675e-07
 
 # Output file: solvers.out.12
 
 Iterations = 18
-Final Relative Residual Norm = 4.160115e-03
+Final Relative Residual Norm = 4.151612e-03
 
 # Output file: solvers.out.8
 
-Eigenvalue lambda   3.02357653918323e+01
-Eigenvalue lambda   3.03135374700825e+01
-Eigenvalue lambda   3.85013899426296e+01
-Eigenvalue lambda   5.14395940109411e+01
-Eigenvalue lambda   5.15742481830257e+01
-Residual   4.25157808772846e-05
-Residual   4.19035189193737e-05
-Residual   4.81288033011393e-05
-Residual   7.10760463298080e-05
-Residual   8.91382143494275e-05
+Eigenvalue lambda   3.02357653918321e+01
+Eigenvalue lambda   3.03135374700838e+01
+Eigenvalue lambda   3.85013899426301e+01
+Eigenvalue lambda   5.14395940109376e+01
+Eigenvalue lambda   5.15742481830319e+01
+Residual   4.25157808820118e-05
+Residual   4.19035189015216e-05
+Residual   4.81288033055862e-05
+Residual   7.10760463267777e-05
+Residual   8.91382144508726e-05
 
 17 iterations
 # Output file: solvers.out.9
 
-Eigenvalue lambda   3.02357653918323e+01
-Eigenvalue lambda   3.03135374700825e+01
-Eigenvalue lambda   3.85013899426296e+01
-Eigenvalue lambda   5.14395940109411e+01
-Eigenvalue lambda   5.15742481830257e+01
-Residual   4.25157808772846e-05
-Residual   4.19035189193737e-05
-Residual   4.81288033011393e-05
-Residual   7.10760463298080e-05
-Residual   8.91382143494275e-05
+Eigenvalue lambda   3.02357653918321e+01
+Eigenvalue lambda   3.03135374700838e+01
+Eigenvalue lambda   3.85013899426301e+01
+Eigenvalue lambda   5.14395940109376e+01
+Eigenvalue lambda   5.15742481830319e+01
+Residual   4.25157808820118e-05
+Residual   4.19035189015216e-05
+Residual   4.81288033055862e-05
+Residual   7.10760463267777e-05
+Residual   8.91382144508726e-05
 
 17 iterations
 # Output file: solvers.out.10
 
-Eigenvalue lambda   3.02357653920282e+01
-Eigenvalue lambda   3.03135374703452e+01
-Eigenvalue lambda   3.85013899427150e+01
-Eigenvalue lambda   5.14395940116978e+01
-Eigenvalue lambda   5.15742481833418e+01
-Residual   8.05720052499174e-05
-Residual   9.77366136433341e-05
-Residual   5.87715311094864e-05
-Residual   1.00991497914808e-04
-Residual   9.93611224113933e-05
+Eigenvalue lambda   3.02357653920285e+01
+Eigenvalue lambda   3.03135374703450e+01
+Eigenvalue lambda   3.85013899427157e+01
+Eigenvalue lambda   5.14395940117001e+01
+Eigenvalue lambda   5.15742481833368e+01
+Residual   8.05720052532315e-05
+Residual   9.77366136479502e-05
+Residual   5.87715311287244e-05
+Residual   1.00991497909373e-04
+Residual   9.93611224218808e-05
 
 23 iterations
 # Output file: solvers.out.11
 
-Eigenvalue lambda   3.02357653920282e+01
-Eigenvalue lambda   3.03135374703452e+01
-Eigenvalue lambda   3.85013899427150e+01
-Eigenvalue lambda   5.14395940116978e+01
-Eigenvalue lambda   5.15742481833418e+01
-Residual   8.05720052499174e-05
-Residual   9.77366136433341e-05
-Residual   5.87715311094864e-05
-Residual   1.00991497914808e-04
-Residual   9.93611224113933e-05
+Eigenvalue lambda   3.02357653920285e+01
+Eigenvalue lambda   3.03135374703450e+01
+Eigenvalue lambda   3.85013899427157e+01
+Eigenvalue lambda   5.14395940117001e+01
+Eigenvalue lambda   5.15742481833368e+01
+Residual   8.05720052532315e-05
+Residual   9.77366136479502e-05
+Residual   5.87715311287244e-05
+Residual   1.00991497909373e-04
+Residual   9.93611224218808e-05
 
 23 iterations
diff --git a/external/hypre/src/test/TEST_ams/solvers.saved.lassen b/external/hypre/src/test/TEST_ams/solvers.saved.lassen
index a4a47fac..2a4d0684 100644
--- a/external/hypre/src/test/TEST_ams/solvers.saved.lassen
+++ b/external/hypre/src/test/TEST_ams/solvers.saved.lassen
@@ -1,117 +1,117 @@
 # Output file: solvers.out.0
-    Cycle 14   1.003820e-04    0.443695     7.475878e-06 
-    Cycle 15   4.456509e-05    0.443955     3.318954e-06 
-    Cycle 16   1.978675e-05    0.443997     1.473605e-06 
-    Cycle 17   8.792626e-06    0.444369     6.548248e-07 
+    Cycle 58   2.180961e-05    0.801052     1.624256e-06 
+    Cycle 59   1.747620e-05    0.801308     1.301528e-06 
+    Cycle 60   1.400242e-05    0.801228     1.042821e-06 
+    Cycle 61   1.121910e-05    0.801226     8.355349e-07 
 
 
- Average Convergence Factor = 0.432756
+ Average Convergence Factor = 0.794987
 
 # Output file: solvers.out.1
-    Cycle 14   1.003820e-04    0.443695     7.475878e-06 
-    Cycle 15   4.456509e-05    0.443955     3.318954e-06 
-    Cycle 16   1.978675e-05    0.443997     1.473605e-06 
-    Cycle 17   8.792626e-06    0.444369     6.548248e-07 
+    Cycle 58   2.180961e-05    0.801052     1.624256e-06 
+    Cycle 59   1.747620e-05    0.801308     1.301528e-06 
+    Cycle 60   1.400242e-05    0.801228     1.042821e-06 
+    Cycle 61   1.121910e-05    0.801226     8.355349e-07 
 
 
- Average Convergence Factor = 0.432756
+ Average Convergence Factor = 0.794987
 
 # Output file: solvers.out.2
-    Cycle 38   3.369434e-05    0.713724     2.509363e-06 
-    Cycle 39   2.404713e-05    0.713685     1.790894e-06 
-    Cycle 40   1.716799e-05    0.713931     1.278574e-06 
-    Cycle 41   1.225526e-05    0.713844     9.127023e-07 
+    Cycle 97   1.784019e-05    0.873467     1.328636e-06 
+    Cycle 98   1.557979e-05    0.873297     1.160294e-06 
+    Cycle 99   1.360847e-05    0.873470     1.013482e-06 
+    Cycle 100   1.188950e-05    0.873684     8.854624e-07 
 
 
- Average Convergence Factor = 0.712346
+ Average Convergence Factor = 0.869905
 
 # Output file: solvers.out.3
-    Cycle 38   3.369434e-05    0.713724     2.509363e-06 
-    Cycle 39   2.404713e-05    0.713685     1.790894e-06 
-    Cycle 40   1.716799e-05    0.713931     1.278574e-06 
-    Cycle 41   1.225526e-05    0.713844     9.127023e-07 
+    Cycle 97   1.784019e-05    0.873467     1.328636e-06 
+    Cycle 98   1.557979e-05    0.873297     1.160294e-06 
+    Cycle 99   1.360847e-05    0.873470     1.013482e-06 
+    Cycle 100   1.188950e-05    0.873684     8.854624e-07 
 
 
- Average Convergence Factor = 0.712346
+ Average Convergence Factor = 0.869905
 
 # Output file: solvers.out.4
 
-Iterations = 6
-Final Relative Residual Norm = 6.842679e-07
+Iterations = 13
+Final Relative Residual Norm = 4.939034e-07
 
 # Output file: solvers.out.5
 
-Iterations = 6
-Final Relative Residual Norm = 6.842679e-07
+Iterations = 13
+Final Relative Residual Norm = 4.939034e-07
 
 # Output file: solvers.out.6
 
-Iterations = 9
-Final Relative Residual Norm = 9.378342e-07
+Iterations = 16
+Final Relative Residual Norm = 6.410653e-07
 
 # Output file: solvers.out.7
 
-Iterations = 9
-Final Relative Residual Norm = 9.378342e-07
+Iterations = 16
+Final Relative Residual Norm = 6.410653e-07
 
 # Output file: solvers.out.12
 
 Iterations = 18
-Final Relative Residual Norm = 5.754561e-02
+Final Relative Residual Norm = 2.433983e+01
 
 # Output file: solvers.out.8
 
-Eigenvalue lambda   3.02357653918663e+01
-Eigenvalue lambda   3.03135374700730e+01
-Eigenvalue lambda   3.85013899425891e+01
-Eigenvalue lambda   5.14395940123130e+01
-Eigenvalue lambda   5.15742481829733e+01
-Residual   5.33482232270343e-05
-Residual   5.22860302078229e-05
-Residual   4.48232393059438e-05
-Residual   1.06939003829700e-04
-Residual   1.08675530154519e-04
-
-17 iterations
+Eigenvalue lambda   3.02357653920079e+01
+Eigenvalue lambda   3.03135374702236e+01
+Eigenvalue lambda   3.85013899430559e+01
+Eigenvalue lambda   5.14395940112081e+01
+Eigenvalue lambda   5.15742481823856e+01
+Residual   7.45352588578718e-05
+Residual   7.43880032620007e-05
+Residual   1.26594022215394e-04
+Residual   8.99904406834779e-05
+Residual   9.30548921427010e-05
+
+24 iterations
 # Output file: solvers.out.9
 
-Eigenvalue lambda   3.02357653918663e+01
-Eigenvalue lambda   3.03135374700730e+01
-Eigenvalue lambda   3.85013899425891e+01
-Eigenvalue lambda   5.14395940123130e+01
-Eigenvalue lambda   5.15742481829733e+01
-Residual   5.33482232270343e-05
-Residual   5.22860302078229e-05
-Residual   4.48232393059438e-05
-Residual   1.06939003829700e-04
-Residual   1.08675530154519e-04
-
-17 iterations
+Eigenvalue lambda   3.02357653920079e+01
+Eigenvalue lambda   3.03135374702236e+01
+Eigenvalue lambda   3.85013899430559e+01
+Eigenvalue lambda   5.14395940112081e+01
+Eigenvalue lambda   5.15742481823856e+01
+Residual   7.45352588578718e-05
+Residual   7.43880032620007e-05
+Residual   1.26594022215394e-04
+Residual   8.99904406834779e-05
+Residual   9.30548921427010e-05
+
+24 iterations
 # Output file: solvers.out.10
 
-Eigenvalue lambda   3.02357653920130e+01
-Eigenvalue lambda   3.03135374702041e+01
-Eigenvalue lambda   3.85013899426646e+01
-Eigenvalue lambda   5.14395940117347e+01
-Eigenvalue lambda   5.15742481837296e+01
-Residual   8.66608457629204e-05
-Residual   7.54689609250768e-05
-Residual   5.61686440230009e-05
-Residual   9.69558816562899e-05
-Residual   1.09642437331197e-04
-
-23 iterations
+Eigenvalue lambda   3.02357653967707e+01
+Eigenvalue lambda   3.03135374800728e+01
+Eigenvalue lambda   3.85013899397799e+01
+Eigenvalue lambda   5.14395940101665e+01
+Eigenvalue lambda   5.15742480845151e+01
+Residual   8.77562666069003e-05
+Residual   1.06541449357735e-04
+Residual   8.94425865221178e-05
+Residual   1.08234881163452e-04
+Residual   1.17205182508686e-04
+
+35 iterations
 # Output file: solvers.out.11
 
-Eigenvalue lambda   3.02357653920130e+01
-Eigenvalue lambda   3.03135374702041e+01
-Eigenvalue lambda   3.85013899426646e+01
-Eigenvalue lambda   5.14395940117347e+01
-Eigenvalue lambda   5.15742481837296e+01
-Residual   8.66608457629204e-05
-Residual   7.54689609250768e-05
-Residual   5.61686440230009e-05
-Residual   9.69558816562899e-05
-Residual   1.09642437331197e-04
-
-23 iterations
+Eigenvalue lambda   3.02357653967707e+01
+Eigenvalue lambda   3.03135374800728e+01
+Eigenvalue lambda   3.85013899397799e+01
+Eigenvalue lambda   5.14395940101665e+01
+Eigenvalue lambda   5.15742480845151e+01
+Residual   8.77562666069003e-05
+Residual   1.06541449357735e-04
+Residual   8.94425865221178e-05
+Residual   1.08234881163452e-04
+Residual   1.17205182508686e-04
+
+35 iterations
diff --git a/external/hypre/src/test/TEST_ams/solvers.saved.lassen_cpu b/external/hypre/src/test/TEST_ams/solvers.saved.lassen_cpu
new file mode 100644
index 00000000..ce26acea
--- /dev/null
+++ b/external/hypre/src/test/TEST_ams/solvers.saved.lassen_cpu
@@ -0,0 +1,117 @@
+# Output file: solvers.out.0
+    Cycle 14   7.391091e-05    0.433321     5.504465e-06 
+    Cycle 15   3.204423e-05    0.433552     2.386472e-06 
+    Cycle 16   1.390144e-05    0.433820     1.035300e-06 
+    Cycle 17   6.033147e-06    0.433994     4.493145e-07 
+
+
+ Average Convergence Factor = 0.423273
+
+# Output file: solvers.out.1
+    Cycle 14   7.391091e-05    0.433321     5.504465e-06 
+    Cycle 15   3.204423e-05    0.433552     2.386472e-06 
+    Cycle 16   1.390144e-05    0.433820     1.035300e-06 
+    Cycle 17   6.033147e-06    0.433994     4.493145e-07 
+
+
+ Average Convergence Factor = 0.423273
+
+# Output file: solvers.out.2
+    Cycle 39   3.557147e-05    0.721153     2.649161e-06 
+    Cycle 40   2.564968e-05    0.721074     1.910242e-06 
+    Cycle 41   1.849492e-05    0.721059     1.377397e-06 
+    Cycle 42   1.334509e-05    0.721554     9.938662e-07 
+
+
+ Average Convergence Factor = 0.719580
+
+# Output file: solvers.out.3
+    Cycle 39   3.557147e-05    0.721153     2.649161e-06 
+    Cycle 40   2.564968e-05    0.721074     1.910242e-06 
+    Cycle 41   1.849492e-05    0.721059     1.377397e-06 
+    Cycle 42   1.334509e-05    0.721554     9.938662e-07 
+
+
+ Average Convergence Factor = 0.719580
+
+# Output file: solvers.out.4
+
+Iterations = 6
+Final Relative Residual Norm = 6.440241e-07
+
+# Output file: solvers.out.5
+
+Iterations = 6
+Final Relative Residual Norm = 6.440241e-07
+
+# Output file: solvers.out.6
+
+Iterations = 9
+Final Relative Residual Norm = 9.646766e-07
+
+# Output file: solvers.out.7
+
+Iterations = 9
+Final Relative Residual Norm = 9.646766e-07
+
+# Output file: solvers.out.12
+
+Iterations = 18
+Final Relative Residual Norm = 4.179935e-03
+
+# Output file: solvers.out.8
+
+Eigenvalue lambda   3.02357653918326e+01
+Eigenvalue lambda   3.03135374700829e+01
+Eigenvalue lambda   3.85013899426297e+01
+Eigenvalue lambda   5.14395940109399e+01
+Eigenvalue lambda   5.15742481830345e+01
+Residual   4.25157808762576e-05
+Residual   4.19035188905720e-05
+Residual   4.81288032817812e-05
+Residual   7.10760463236367e-05
+Residual   8.91382143291588e-05
+
+17 iterations
+# Output file: solvers.out.9
+
+Eigenvalue lambda   3.02357653918326e+01
+Eigenvalue lambda   3.03135374700829e+01
+Eigenvalue lambda   3.85013899426297e+01
+Eigenvalue lambda   5.14395940109399e+01
+Eigenvalue lambda   5.15742481830345e+01
+Residual   4.25157808762576e-05
+Residual   4.19035188905720e-05
+Residual   4.81288032817812e-05
+Residual   7.10760463236367e-05
+Residual   8.91382143291588e-05
+
+17 iterations
+# Output file: solvers.out.10
+
+Eigenvalue lambda   3.02357653920283e+01
+Eigenvalue lambda   3.03135374703454e+01
+Eigenvalue lambda   3.85013899427141e+01
+Eigenvalue lambda   5.14395940116978e+01
+Eigenvalue lambda   5.15742481833472e+01
+Residual   8.05720052502644e-05
+Residual   9.77366136562239e-05
+Residual   5.87715311134351e-05
+Residual   1.00991497903153e-04
+Residual   9.93611223972704e-05
+
+23 iterations
+# Output file: solvers.out.11
+
+Eigenvalue lambda   3.02357653920283e+01
+Eigenvalue lambda   3.03135374703454e+01
+Eigenvalue lambda   3.85013899427141e+01
+Eigenvalue lambda   5.14395940116978e+01
+Eigenvalue lambda   5.15742481833472e+01
+Residual   8.05720052502644e-05
+Residual   9.77366136562239e-05
+Residual   5.87715311134351e-05
+Residual   1.00991497903153e-04
+Residual   9.93611223972704e-05
+
+23 iterations
diff --git a/external/hypre/src/test/TEST_ams/solvers.saved.ray b/external/hypre/src/test/TEST_ams/solvers.saved.ray
deleted file mode 100644
index a435b678..00000000
--- a/external/hypre/src/test/TEST_ams/solvers.saved.ray
+++ /dev/null
@@ -1,117 +0,0 @@
-# Output file: solvers.out.0
-    Cycle 14   1.003795e-04    0.443687     7.475693e-06 
-    Cycle 15   4.455956e-05    0.443911     3.318543e-06 
-    Cycle 16   1.979036e-05    0.444133     1.473873e-06 
-    Cycle 17   8.791560e-06    0.444234     6.547454e-07 
-
-
- Average Convergence Factor = 0.432752
-
-# Output file: solvers.out.1
-    Cycle 14   1.003795e-04    0.443687     7.475693e-06 
-    Cycle 15   4.455956e-05    0.443911     3.318543e-06 
-    Cycle 16   1.979036e-05    0.444133     1.473873e-06 
-    Cycle 17   8.791560e-06    0.444234     6.547454e-07 
-
-
- Average Convergence Factor = 0.432752
-
-# Output file: solvers.out.2
-    Cycle 38   3.369300e-05    0.713688     2.509263e-06 
-    Cycle 39   2.405174e-05    0.713850     1.791237e-06 
-    Cycle 40   1.716435e-05    0.713643     1.278303e-06 
-    Cycle 41   1.225445e-05    0.713948     9.126416e-07 
-
-
- Average Convergence Factor = 0.712345
-
-# Output file: solvers.out.3
-    Cycle 38   3.369300e-05    0.713688     2.509263e-06 
-    Cycle 39   2.405174e-05    0.713850     1.791237e-06 
-    Cycle 40   1.716435e-05    0.713643     1.278303e-06 
-    Cycle 41   1.225445e-05    0.713948     9.126416e-07 
-
-
- Average Convergence Factor = 0.712345
-
-# Output file: solvers.out.4
-
-Iterations = 6
-Final Relative Residual Norm = 6.843299e-07
-
-# Output file: solvers.out.5
-
-Iterations = 6
-Final Relative Residual Norm = 6.843299e-07
-
-# Output file: solvers.out.6
-
-Iterations = 9
-Final Relative Residual Norm = 9.378478e-07
-
-# Output file: solvers.out.7
-
-Iterations = 9
-Final Relative Residual Norm = 9.378478e-07
-
-# Output file: solvers.out.12
-
-Iterations = 18
-Final Relative Residual Norm = 4.582470e-02
-
-# Output file: solvers.out.8
-
-Eigenvalue lambda   3.02357653918664e+01
-Eigenvalue lambda   3.03135374700725e+01
-Eigenvalue lambda   3.85013899425893e+01
-Eigenvalue lambda   5.14395940123201e+01
-Eigenvalue lambda   5.15742481829777e+01
-Residual   5.33481978661958e-05
-Residual   5.22859545027289e-05
-Residual   4.48232237385845e-05
-Residual   1.06939001504331e-04
-Residual   1.08675672218529e-04
-
-17 iterations
-# Output file: solvers.out.9
-
-Eigenvalue lambda   3.02357653918664e+01
-Eigenvalue lambda   3.03135374700725e+01
-Eigenvalue lambda   3.85013899425893e+01
-Eigenvalue lambda   5.14395940123201e+01
-Eigenvalue lambda   5.15742481829777e+01
-Residual   5.33481978661958e-05
-Residual   5.22859545027289e-05
-Residual   4.48232237385845e-05
-Residual   1.06939001504331e-04
-Residual   1.08675672218529e-04
-
-17 iterations
-# Output file: solvers.out.10
-
-Eigenvalue lambda   3.02357653920128e+01
-Eigenvalue lambda   3.03135374702037e+01
-Eigenvalue lambda   3.85013899426639e+01
-Eigenvalue lambda   5.14395940117345e+01
-Eigenvalue lambda   5.15742481837252e+01
-Residual   8.66608457691982e-05
-Residual   7.54689609111018e-05
-Residual   5.61686440464391e-05
-Residual   9.69558816609399e-05
-Residual   1.09642437334342e-04
-
-23 iterations
-# Output file: solvers.out.11
-
-Eigenvalue lambda   3.02357653920128e+01
-Eigenvalue lambda   3.03135374702037e+01
-Eigenvalue lambda   3.85013899426639e+01
-Eigenvalue lambda   5.14395940117345e+01
-Eigenvalue lambda   5.15742481837252e+01
-Residual   8.66608457691982e-05
-Residual   7.54689609111018e-05
-Residual   5.61686440464391e-05
-Residual   9.69558816609399e-05
-Residual   1.09642437334342e-04
-
-23 iterations
diff --git a/external/hypre/src/test/TEST_ams/solvers.saved.tioga b/external/hypre/src/test/TEST_ams/solvers.saved.tioga
new file mode 100644
index 00000000..b3bab421
--- /dev/null
+++ b/external/hypre/src/test/TEST_ams/solvers.saved.tioga
@@ -0,0 +1,117 @@
+# Output file: solvers.out.0
+    Cycle 52   2.432799e-05    0.789655     1.811810e-06 
+    Cycle 53   1.921940e-05    0.790012     1.431352e-06 
+    Cycle 54   1.518539e-05    0.790107     1.130921e-06 
+    Cycle 55   1.200092e-05    0.790294     8.937605e-07 
+
+
+ Average Convergence Factor = 0.776287
+
+# Output file: solvers.out.1
+    Cycle 52   2.432799e-05    0.789655     1.811810e-06 
+    Cycle 53   1.921940e-05    0.790012     1.431352e-06 
+    Cycle 54   1.518539e-05    0.790107     1.130921e-06 
+    Cycle 55   1.200092e-05    0.790294     8.937605e-07 
+
+
+ Average Convergence Factor = 0.776287
+
+# Output file: solvers.out.2
+    Cycle 102   1.884886e-05    0.881924     1.403756e-06 
+    Cycle 103   1.662181e-05    0.881847     1.237898e-06 
+    Cycle 104   1.465878e-05    0.881900     1.091702e-06 
+    Cycle 105   1.292522e-05    0.881739     9.625970e-07 
+
+
+ Average Convergence Factor = 0.876394
+
+# Output file: solvers.out.3
+    Cycle 102   1.884886e-05    0.881924     1.403756e-06 
+    Cycle 103   1.662181e-05    0.881847     1.237898e-06 
+    Cycle 104   1.465878e-05    0.881900     1.091702e-06 
+    Cycle 105   1.292522e-05    0.881739     9.625970e-07 
+
+
+ Average Convergence Factor = 0.876394
+
+# Output file: solvers.out.4
+
+Iterations = 13
+Final Relative Residual Norm = 4.186509e-07
+
+# Output file: solvers.out.5
+
+Iterations = 13
+Final Relative Residual Norm = 4.186509e-07
+
+# Output file: solvers.out.6
+
+Iterations = 16
+Final Relative Residual Norm = 9.720506e-07
+
+# Output file: solvers.out.7
+
+Iterations = 16
+Final Relative Residual Norm = 9.720506e-07
+
+# Output file: solvers.out.12
+
+Iterations = 18
+Final Relative Residual Norm = 1.952380e+01
+
+# Output file: solvers.out.8
+
+Eigenvalue lambda   3.02357653921852e+01
+Eigenvalue lambda   3.03135374702992e+01
+Eigenvalue lambda   3.85013899428591e+01
+Eigenvalue lambda   5.14395940113556e+01
+Eigenvalue lambda   5.15742481828119e+01
+Residual   1.12566352525743e-04
+Residual   1.02377055805912e-04
+Residual   9.77540709672278e-05
+Residual   1.08807691685354e-04
+Residual   1.16451618925874e-04
+
+24 iterations
+# Output file: solvers.out.9
+
+Eigenvalue lambda   3.02357653921852e+01
+Eigenvalue lambda   3.03135374702992e+01
+Eigenvalue lambda   3.85013899428591e+01
+Eigenvalue lambda   5.14395940113556e+01
+Eigenvalue lambda   5.15742481828119e+01
+Residual   1.12566352525743e-04
+Residual   1.02377055805912e-04
+Residual   9.77540709672278e-05
+Residual   1.08807691685354e-04
+Residual   1.16451618925874e-04
+
+24 iterations
+# Output file: solvers.out.10
+
+Eigenvalue lambda   3.02357653918967e+01
+Eigenvalue lambda   3.03135374700399e+01
+Eigenvalue lambda   3.85013899425749e+01
+Eigenvalue lambda   5.14395940102517e+01
+Eigenvalue lambda   5.15742481828689e+01
+Residual   9.46960846127793e-05
+Residual   7.49350518395312e-05
+Residual   9.49105044744681e-05
+Residual   1.18284840227265e-04
+Residual   1.04914545371963e-04
+
+31 iterations
+# Output file: solvers.out.11
+
+Eigenvalue lambda   3.02357653918967e+01
+Eigenvalue lambda   3.03135374700399e+01
+Eigenvalue lambda   3.85013899425749e+01
+Eigenvalue lambda   5.14395940102517e+01
+Eigenvalue lambda   5.15742481828689e+01
+Residual   9.46960846127793e-05
+Residual   7.49350518395312e-05
+Residual   9.49105044744681e-05
+Residual   1.18284840227265e-04
+Residual   1.04914545371963e-04
+
+31 iterations
diff --git a/external/hypre/src/test/TEST_ams/solvers.sh b/external/hypre/src/test/TEST_ams/solvers.sh
old mode 100644
new mode 100755
index 2c80ad4a..53b16a33
--- a/external/hypre/src/test/TEST_ams/solvers.sh
+++ b/external/hypre/src/test/TEST_ams/solvers.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_bench/benchmark_ij.jobs b/external/hypre/src/test/TEST_bench/benchmark_ij.jobs
old mode 100644
new mode 100755
index f16ded69..3829785b
--- a/external/hypre/src/test/TEST_bench/benchmark_ij.jobs
+++ b/external/hypre/src/test/TEST_bench/benchmark_ij.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -9,80 +9,85 @@
 #=============================================================================
 
 # RAP 1
-mpirun -np 4 ./ij -n 256 256 128 -P 2 2 1       -pmis -keepT 1 -rlx 18        -exec_device -rap 1 -mod_rap2 1 -mm_cusparse 0 -interptype  3 -solver 1 \
+mpirun -np 4 ./ij -n 256 256 128 -P 2 2 1       -pmis -keepT 1 -rlx 18        -exec_device -rap 1 -mod_rap2 1 -mm_vendor 0 -interptype  3 -solver 1 -benchmark 1 \
  > benchmark_ij.out.1
 
-mpirun -np 3 ./ij -n 128 128 384 -P 1 1 3       -pmis -keepT 1 -rlx 7 -w 0.85 -exec_device -rap 1 -mod_rap2 1 -mm_cusparse 0 -interptype  3 -solver 1 \
+mpirun -np 3 ./ij -n 128 128 384 -P 1 1 3       -pmis -keepT 1 -rlx 7 -w 0.85 -exec_device -rap 1 -mod_rap2 1 -mm_vendor 0 -interptype  3 -solver 1 -benchmark 1 \
  >> benchmark_ij.out.2
 
-mpirun -np 4 ./ij -n 4096 4096 1 -P 2 2 1 -9pt  -pmis -keepT 1 -rlx 18        -exec_device -rap 1 -mod_rap2 1 -mm_cusparse 0 -interptype  3 -solver 1 \
+mpirun -np 4 ./ij -n 4096 4096 1 -P 2 2 1 -9pt  -pmis -keepT 1 -rlx 18        -exec_device -rap 1 -mod_rap2 1 -mm_vendor 0 -interptype  3 -solver 1 -benchmark 1 \
  >> benchmark_ij.out.3
 
-mpirun -np 4 ./ij -n 256 256 128 -P 2 2 1       -pmis -keepT 1 -rlx 18        -exec_device -rap 1 -mod_rap2 1 -mm_cusparse 0 -interptype 14 -solver 1 \
+mpirun -np 4 ./ij -n 256 256 128 -P 2 2 1       -pmis -keepT 1 -rlx 18        -exec_device -rap 1 -mod_rap2 1 -mm_vendor 0 -interptype 14 -solver 1 -benchmark 1 \
  >> benchmark_ij.out.4
 
-mpirun -np 4 ./ij -n 256 256 128 -P 2 2 1 -27pt -pmis -keepT 1 -rlx 18        -exec_device -rap 1 -mod_rap2 1 -mm_cusparse 0 -interptype  6 -solver 1 \
+mpirun -np 4 ./ij -n 256 256 128 -P 2 2 1 -27pt -pmis -keepT 1 -rlx 18        -exec_device -rap 1 -mod_rap2 1 -mm_vendor 0 -interptype  6 -solver 1 -benchmark 1 \
  >> benchmark_ij.out.5
 
-mpirun -np 4 ./ij -n 4096 4096 1 -P 2 2 1 -9pt  -pmis -keepT 1 -rlx 18        -exec_device -rap 1 -mod_rap2 1 -mm_cusparse 0 -interptype 15 -solver 1 \
+mpirun -np 4 ./ij -n 4096 4096 1 -P 2 2 1 -9pt  -pmis -keepT 1 -rlx 18        -exec_device -rap 1 -mod_rap2 1 -mm_vendor 0 -interptype 15 -solver 1 -benchmark 1 \
  >> benchmark_ij.out.6
 
-mpirun -np 4 ./ij -n 4096 4096 1 -P 2 2 1 -9pt  -pmis -keepT 1 -rlx 18        -exec_device -rap 1 -mod_rap2 1 -mm_cusparse 0 -interptype 18 -solver 1 \
+mpirun -np 4 ./ij -n 4096 4096 1 -P 2 2 1 -9pt  -pmis -keepT 1 -rlx 18        -exec_device -rap 1 -mod_rap2 1 -mm_vendor 0 -interptype 18 -solver 1 -benchmark 1 \
  >> benchmark_ij.out.7
 
 # RAP 0
-mpirun -np 4 ./ij -n 256 256 128 -P 2 2 1       -pmis -keepT 1 -rlx 18        -exec_device -rap 0 -mod_rap2 1 -mm_cusparse 0 -interptype  3 -solver 1 \
+mpirun -np 4 ./ij -n 256 256 128 -P 2 2 1       -pmis -keepT 1 -rlx 18        -exec_device -rap 0 -mod_rap2 1 -mm_vendor 0 -interptype  3 -solver 1 -benchmark 1 \
  > benchmark_ij.out.8
 
-mpirun -np 3 ./ij -n 128 128 384 -P 1 1 3       -pmis -keepT 1 -rlx 7 -w 0.85 -exec_device -rap 0 -mod_rap2 1 -mm_cusparse 0 -interptype  3 -solver 1 \
+mpirun -np 3 ./ij -n 128 128 384 -P 1 1 3       -pmis -keepT 1 -rlx 7 -w 0.85 -exec_device -rap 0 -mod_rap2 1 -mm_vendor 0 -interptype  3 -solver 1 -benchmark 1 \
  >> benchmark_ij.out.9
 
-mpirun -np 4 ./ij -n 4096 4096 1 -P 2 2 1 -9pt  -pmis -keepT 1 -rlx 18        -exec_device -rap 0 -mod_rap2 1 -mm_cusparse 0 -interptype  3 -solver 1 \
+mpirun -np 4 ./ij -n 4096 4096 1 -P 2 2 1 -9pt  -pmis -keepT 1 -rlx 18        -exec_device -rap 0 -mod_rap2 1 -mm_vendor 0 -interptype  3 -solver 1 -benchmark 1 \
  >> benchmark_ij.out.10
 
-mpirun -np 4 ./ij -n 256 256 128 -P 2 2 1       -pmis -keepT 1 -rlx 18        -exec_device -rap 0 -mod_rap2 1 -mm_cusparse 0 -interptype 14 -solver 1 \
+mpirun -np 4 ./ij -n 256 256 128 -P 2 2 1       -pmis -keepT 1 -rlx 18        -exec_device -rap 0 -mod_rap2 1 -mm_vendor 0 -interptype 14 -solver 1 -benchmark 1 \
  >> benchmark_ij.out.11
 
-mpirun -np 4 ./ij -n 256 256 128 -P 2 2 1 -27pt -pmis -keepT 1 -rlx 18        -exec_device -rap 0 -mod_rap2 1 -mm_cusparse 0 -interptype  6 -solver 1 \
+mpirun -np 4 ./ij -n 256 256 128 -P 2 2 1 -27pt -pmis -keepT 1 -rlx 18        -exec_device -rap 0 -mod_rap2 1 -mm_vendor 0 -interptype  6 -solver 1 -benchmark 1 \
  >> benchmark_ij.out.12
 
-mpirun -np 4 ./ij -n 4096 4096 1 -P 2 2 1 -9pt  -pmis -keepT 1 -rlx 18        -exec_device -rap 0 -mod_rap2 1 -mm_cusparse 0 -interptype 15 -solver 1 \
+mpirun -np 4 ./ij -n 4096 4096 1 -P 2 2 1 -9pt  -pmis -keepT 1 -rlx 18        -exec_device -rap 0 -mod_rap2 1 -mm_vendor 0 -interptype 15 -solver 1 -benchmark 1 \
  >> benchmark_ij.out.13
 
-
-mpirun -np 1 ./ij -n 256 256 256 -P 1 1 1       -pmis -keepT 1 -rlx 18        -exec_device -rap 1 -mod_rap2 1 -mm_cusparse 0 -interptype  6 -solver 1 \
+mpirun -np 1 ./ij -n 256 256 256 -P 1 1 1       -pmis -keepT 1 -rlx 18        -exec_device -rap 1 -mod_rap2 1 -mm_vendor 0 -interptype  6 -solver 1 -benchmark 1 \
  >> benchmark_ij.out.14
 
-mpirun -np 1 ./ij -n 256 256 256 -P 1 1 1       -pmis -keepT 1 -rlx 18        -exec_device -rap 0 -mod_rap2 1 -mm_cusparse 0 -interptype 14 -solver 1 \
+mpirun -np 1 ./ij -n 256 256 256 -P 1 1 1       -pmis -keepT 1 -rlx 18        -exec_device -rap 0 -mod_rap2 1 -mm_vendor 0 -interptype 14 -solver 1 -benchmark 1 \
  >> benchmark_ij.out.15
 
-mpirun -np 1 ./ij -n 256 256 256 -P 1 1 1       -pmis -keepT 1 -rlx 18        -exec_device -rap 0 -mod_rap2 1 -mm_cusparse 0 -interptype 18 -solver 1 \
+mpirun -np 1 ./ij -n 256 256 256 -P 1 1 1       -pmis -keepT 1 -rlx 18        -exec_device -rap 0 -mod_rap2 1 -mm_vendor 0 -interptype 18 -solver 1 -benchmark 1 \
  >> benchmark_ij.out.16
 
-mpirun -np 4 ./ij -n 256 256 128 -P 2 2 1 -27pt -pmis -keepT 1 -rlx 7 -w 0.85        -exec_device -mm_cusparse 0 -agg_nl 1 -agg_interp 5 -solver 1 \
+mpirun -np 4 ./ij -n 256 256 128 -P 2 2 1 -27pt -pmis -keepT 1 -rlx 7 -w 0.85 -exec_device -mm_vendor 0 -agg_nl 1 -agg_interp 5 -solver 1 -benchmark 1 \
  >> benchmark_ij.out.17
 
-mpirun -np 4 ./ij -n 256 256 128 -P 2 2 1       -pmis -keepT 1 -rlx 7 -w 0.85        -exec_device -mm_cusparse 0 -agg_nl 1 -agg_interp 7 -agg_P12_mx 4 -solver 1 \
+mpirun -np 4 ./ij -n 256 256 128 -P 2 2 1       -pmis -keepT 1 -rlx 7 -w 0.85 -exec_device -mm_vendor 0 -agg_nl 1 -agg_interp 7 -agg_P12_mx 4 -solver 1 -benchmark 1 \
  >> benchmark_ij.out.18
 
-mpirun -np 4 ./ij -n 128 128 128 -P 2 2 1       -pmis -keepT 1 -rlx 7 -w 0.5        -exec_device -mm_cusparse 0 -agg_nl 1 -agg_interp 5 -agg_Pmx 4 -interptype 18 -solver 1 -sysL 3 -nf 3 \
+mpirun -np 4 ./ij -n 128 128 128 -P 2 2 1       -pmis -keepT 1 -rlx 7 -w 0.5  -exec_device -mm_vendor 0 -agg_nl 1 -agg_interp 5 -agg_Pmx 4 -interptype 18 -solver 1 -sysL 3 -nf 3 -benchmark 1 \
  >> benchmark_ij.out.19
 
-mpirun -np 2 ./ij -n 200 128 128 -P 2 1 1       -pmis -keepT 1 -rlx 7 -w 0.7        -exec_device -mm_cusparse 0 -agg_nl 1 -agg_interp 5 -agg_Pmx 4 -interptype 18 -solver 1 -vardifconv -eps 1 \
+mpirun -np 2 ./ij -n 200 128 128 -P 2 1 1       -pmis -keepT 1 -rlx 7 -w 0.7  -exec_device -mm_vendor 0 -agg_nl 1 -agg_interp 5 -agg_Pmx 4 -interptype 18 -solver 1 -vardifconv -eps 1 -benchmark 1 \
  >> benchmark_ij.out.20
 
-mpirun -np 4 ./ij -n 200 200 200 -P 2 2 1       -pmis -keepT 1 -rlx 18 -ns 2        -exec_device -mm_cusparse 0 -agg_nl 3 -agg_interp 7 -agg_P12_mx 6 -interptype 6 -solver 1 \
+mpirun -np 4 ./ij -n 200 200 200 -P 2 2 1       -pmis -keepT 1 -rlx 18 -ns 2  -exec_device -mm_vendor 0 -agg_nl 3 -agg_interp 7 -agg_P12_mx 6 -interptype 6 -solver 1 -benchmark 1 \
  >> benchmark_ij.out.21
 
-
-mpirun -np 4 ./ij -n 256 256 128 -P 2 2 1       -rlx 16 -cheby_scale 1 -cheby_eig_est 10        -exec_device -solver 1 \
+mpirun -np 4 ./ij -n 256 256 128 -P 2 2 1       -rlx 16 -cheby_scale 1 -cheby_eig_est 10 -exec_device -solver 1 -benchmark 1 \
  >> benchmark_ij.out.22
 
-mpirun -np 4 ./ij -n 256 256 128 -P 2 2 1       -rlx 16 -cheby_scale 0 -cheby_eig_est 10        -exec_device -solver 1 \
+mpirun -np 4 ./ij -n 256 256 128 -P 2 2 1       -rlx 16 -cheby_scale 0 -cheby_eig_est 10 -exec_device -solver 1 -benchmark 1 \
  >> benchmark_ij.out.23
 
-mpirun -np 4 ./ij -n 256 256 128 -P 2 2 1       -rlx 16 -cheby_scale 1 -cheby_eig_est 0        -exec_device -solver 1 \
+mpirun -np 4 ./ij -n 256 256 128 -P 2 2 1       -rlx 16 -cheby_scale 1 -cheby_eig_est 0 -exec_device -solver 1 -benchmark 1 \
  >> benchmark_ij.out.24
 
-mpirun -np 4 ./ij -n 256 256 128 -P 2 2 1       -rlx 16 -cheby_scale 0 -cheby_eig_est 0        -exec_device -solver 1 \
+mpirun -np 4 ./ij -n 256 256 128 -P 2 2 1       -rlx 16 -cheby_scale 0 -cheby_eig_est 0 -exec_device -solver 1 -benchmark 1 \
  >> benchmark_ij.out.25
+
+mpirun -np 4 ./ij -n 248 248 248 -P 2 2 1 -27pt -pmis -keepT 1 -rlx 18 -ns 2  -exec_device -rap 1 -mod_rap2 1 -mm_vendor 0 -agg_nl 2 -agg_interp 8 -interptype 6 -mxrs 0.9  -Pmx 8 -solver 1 -benchmark 1 \
+ >> benchmark_ij.out.26
+
+mpirun -np 4 ./ij -n 256 256 256 -P 1 2 2 -27pt -pmis -keepT 1 -rlx 18 -ns 2  -exec_device -rap 0 -mod_rap2 1 -mm_vendor 0 -agg_nl 1 -agg_interp 9 -interptype 6 -mxrs 0.9  -Pmx 8 -solver 1 -benchmark 1 \
+ >> benchmark_ij.out.27
+
diff --git a/external/hypre/src/test/TEST_bench/benchmark_ij.perf.saved.lassen b/external/hypre/src/test/TEST_bench/benchmark_ij.perf.saved.lassen
index 91e850d0..f4162a30 100644
--- a/external/hypre/src/test/TEST_bench/benchmark_ij.perf.saved.lassen
+++ b/external/hypre/src/test/TEST_bench/benchmark_ij.perf.saved.lassen
@@ -1,75 +1,81 @@
 # Output file: benchmark_ij.out.1
-PCG Setup wall clock time = 0.442274 seconds
-PCG Solve wall clock time = 0.586363 seconds
+PCG Setup wall clock time = 0.160712 seconds
+PCG Solve wall clock time = 0.411117 seconds
 # Output file: benchmark_ij.out.2
-PCG Setup wall clock time = 0.421415 seconds
-PCG Solve wall clock time = 0.481981 seconds
+PCG Setup wall clock time = 0.153834 seconds
+PCG Solve wall clock time = 0.333679 seconds
 # Output file: benchmark_ij.out.3
-PCG Setup wall clock time = 0.592196 seconds
-PCG Solve wall clock time = 1.116149 seconds
+PCG Setup wall clock time = 0.190193 seconds
+PCG Solve wall clock time = 0.867654 seconds
 # Output file: benchmark_ij.out.4
-PCG Setup wall clock time = 0.574467 seconds
-PCG Solve wall clock time = 0.224829 seconds
+PCG Setup wall clock time = 0.219071 seconds
+PCG Solve wall clock time = 0.155456 seconds
 # Output file: benchmark_ij.out.5
-PCG Setup wall clock time = 0.760889 seconds
-PCG Solve wall clock time = 0.208459 seconds
+PCG Setup wall clock time = 0.251006 seconds
+PCG Solve wall clock time = 0.160191 seconds
 # Output file: benchmark_ij.out.6
-PCG Setup wall clock time = 0.551022 seconds
-PCG Solve wall clock time = 1.059372 seconds
+PCG Setup wall clock time = 0.187103 seconds
+PCG Solve wall clock time = 0.823428 seconds
 # Output file: benchmark_ij.out.7
-PCG Setup wall clock time = 0.759444 seconds
-PCG Solve wall clock time = 0.265704 seconds
+PCG Setup wall clock time = 0.270900 seconds
+PCG Solve wall clock time = 0.199480 seconds
 # Output file: benchmark_ij.out.8
-PCG Setup wall clock time = 0.411739 seconds
-PCG Solve wall clock time = 0.572450 seconds
+PCG Setup wall clock time = 0.147579 seconds
+PCG Solve wall clock time = 0.400133 seconds
 # Output file: benchmark_ij.out.9
-PCG Setup wall clock time = 0.409877 seconds
-PCG Solve wall clock time = 0.485815 seconds
+PCG Setup wall clock time = 0.139928 seconds
+PCG Solve wall clock time = 0.339869 seconds
 # Output file: benchmark_ij.out.10
-PCG Setup wall clock time = 0.537107 seconds
-PCG Solve wall clock time = 1.159050 seconds
+PCG Setup wall clock time = 0.175378 seconds
+PCG Solve wall clock time = 0.877038 seconds
 # Output file: benchmark_ij.out.11
-PCG Setup wall clock time = 0.588887 seconds
-PCG Solve wall clock time = 0.225021 seconds
+PCG Setup wall clock time = 0.205073 seconds
+PCG Solve wall clock time = 0.154485 seconds
 # Output file: benchmark_ij.out.12
-PCG Setup wall clock time = 0.738114 seconds
-PCG Solve wall clock time = 0.206896 seconds
+PCG Setup wall clock time = 0.236875 seconds
+PCG Solve wall clock time = 0.155606 seconds
 # Output file: benchmark_ij.out.13
-PCG Setup wall clock time = 0.576056 seconds
-PCG Solve wall clock time = 1.061516 seconds
+PCG Setup wall clock time = 0.169760 seconds
+PCG Solve wall clock time = 0.823498 seconds
 # Output file: benchmark_ij.out.14
-PCG Setup wall clock time = 3.096025 seconds
-PCG Solve wall clock time = 0.745310 seconds
+PCG Setup wall clock time = 0.705901 seconds
+PCG Solve wall clock time = 0.580016 seconds
 # Output file: benchmark_ij.out.15
-PCG Setup wall clock time = 3.102031 seconds
-PCG Solve wall clock time = 0.794782 seconds
+PCG Setup wall clock time = 0.671039 seconds
+PCG Solve wall clock time = 0.647755 seconds
 # Output file: benchmark_ij.out.16
-PCG Setup wall clock time = 3.024356 seconds
-PCG Solve wall clock time = 0.745560 seconds
+PCG Setup wall clock time = 0.693543 seconds
+PCG Solve wall clock time = 0.607744 seconds
 # Output file: benchmark_ij.out.17
-PCG Setup wall clock time = 0.735291 seconds
-PCG Solve wall clock time = 0.199601 seconds
+PCG Setup wall clock time = 0.263890 seconds
+PCG Solve wall clock time = 0.160268 seconds
 # Output file: benchmark_ij.out.18
-PCG Setup wall clock time = 0.441699 seconds
-PCG Solve wall clock time = 0.180786 seconds
+PCG Setup wall clock time = 0.223569 seconds
+PCG Solve wall clock time = 0.125239 seconds
 # Output file: benchmark_ij.out.19
-PCG Setup wall clock time = 0.599613 seconds
-PCG Solve wall clock time = 0.423136 seconds
+PCG Setup wall clock time = 0.264460 seconds
+PCG Solve wall clock time = 0.315377 seconds
 # Output file: benchmark_ij.out.20
-PCG Setup wall clock time = 0.351212 seconds
-PCG Solve wall clock time = 0.248475 seconds
+PCG Setup wall clock time = 0.175446 seconds
+PCG Solve wall clock time = 0.179951 seconds
 # Output file: benchmark_ij.out.21
-PCG Setup wall clock time = 0.473500 seconds
-PCG Solve wall clock time = 0.245645 seconds
+PCG Setup wall clock time = 0.233091 seconds
+PCG Solve wall clock time = 0.208051 seconds
 # Output file: benchmark_ij.out.22
-PCG Setup wall clock time = 0.585721 seconds
-PCG Solve wall clock time = 0.184083 seconds
+PCG Setup wall clock time = 0.242838 seconds
+PCG Solve wall clock time = 0.194378 seconds
 # Output file: benchmark_ij.out.23
-PCG Setup wall clock time = 0.577237 seconds
-PCG Solve wall clock time = 0.187903 seconds
+PCG Setup wall clock time = 0.238777 seconds
+PCG Solve wall clock time = 0.178903 seconds
 # Output file: benchmark_ij.out.24
-PCG Setup wall clock time = 0.554462 seconds
-PCG Solve wall clock time = 0.212726 seconds
+PCG Setup wall clock time = 0.211336 seconds
+PCG Solve wall clock time = 0.193785 seconds
 # Output file: benchmark_ij.out.25
-PCG Setup wall clock time = 0.572496 seconds
-PCG Solve wall clock time = 0.214806 seconds
+PCG Setup wall clock time = 0.211109 seconds
+PCG Solve wall clock time = 0.202104 seconds
+# Output file: benchmark_ij.out.26
+PCG Setup wall clock time = 0.256645 seconds
+PCG Solve wall clock time = 0.618981 seconds
+# Output file: benchmark_ij.out.27
+PCG Setup wall clock time = 0.282368 seconds
+PCG Solve wall clock time = 0.411413 seconds
diff --git a/external/hypre/src/test/TEST_bench/benchmark_ij.perf.saved.ray b/external/hypre/src/test/TEST_bench/benchmark_ij.perf.saved.ray
deleted file mode 100644
index 3f925306..00000000
--- a/external/hypre/src/test/TEST_bench/benchmark_ij.perf.saved.ray
+++ /dev/null
@@ -1,75 +0,0 @@
-# Output file: benchmark_ij.out.1
-PCG Setup wall clock time = 0.447182 seconds
-PCG Solve wall clock time = 0.667648 seconds
-# Output file: benchmark_ij.out.2
-PCG Setup wall clock time = 0.442885 seconds
-PCG Solve wall clock time = 0.525688 seconds
-# Output file: benchmark_ij.out.3
-PCG Setup wall clock time = 0.594930 seconds
-PCG Solve wall clock time = 1.403769 seconds
-# Output file: benchmark_ij.out.4
-PCG Setup wall clock time = 0.598627 seconds
-PCG Solve wall clock time = 0.272439 seconds
-# Output file: benchmark_ij.out.5
-PCG Setup wall clock time = 0.771948 seconds
-PCG Solve wall clock time = 0.267343 seconds
-# Output file: benchmark_ij.out.6
-PCG Setup wall clock time = 0.589172 seconds
-PCG Solve wall clock time = 1.272172 seconds
-# Output file: benchmark_ij.out.7
-PCG Setup wall clock time = 0.803751 seconds
-PCG Solve wall clock time = 0.328909 seconds
-# Output file: benchmark_ij.out.8
-PCG Setup wall clock time = 0.417764 seconds
-PCG Solve wall clock time = 0.655497 seconds
-# Output file: benchmark_ij.out.9
-PCG Setup wall clock time = 0.410270 seconds
-PCG Solve wall clock time = 0.525057 seconds
-# Output file: benchmark_ij.out.10
-PCG Setup wall clock time = 0.565856 seconds
-PCG Solve wall clock time = 1.398698 seconds
-# Output file: benchmark_ij.out.11
-PCG Setup wall clock time = 0.575358 seconds
-PCG Solve wall clock time = 0.268788 seconds
-# Output file: benchmark_ij.out.12
-PCG Setup wall clock time = 0.733949 seconds
-PCG Solve wall clock time = 0.266458 seconds
-# Output file: benchmark_ij.out.13
-PCG Setup wall clock time = 0.561592 seconds
-PCG Solve wall clock time = 1.272704 seconds
-# Output file: benchmark_ij.out.14
-PCG Setup wall clock time = 3.677906 seconds
-PCG Solve wall clock time = 1.281065 seconds
-# Output file: benchmark_ij.out.15
-PCG Setup wall clock time = 3.627375 seconds
-PCG Solve wall clock time = 1.379409 seconds
-# Output file: benchmark_ij.out.16
-PCG Setup wall clock time = 3.566712 seconds
-PCG Solve wall clock time = 1.223101 seconds
-# Output file: benchmark_ij.out.17
-PCG Setup wall clock time = 0.767321 seconds
-PCG Solve wall clock time = 0.259651 seconds
-# Output file: benchmark_ij.out.18
-PCG Setup wall clock time = 0.487871 seconds
-PCG Solve wall clock time = 0.194575 seconds
-# Output file: benchmark_ij.out.19
-PCG Setup wall clock time = 0.633908 seconds
-PCG Solve wall clock time = 0.498295 seconds
-# Output file: benchmark_ij.out.20
-PCG Setup wall clock time = 0.372523 seconds
-PCG Solve wall clock time = 0.292024 seconds
-# Output file: benchmark_ij.out.21
-PCG Setup wall clock time = 0.495310 seconds
-PCG Solve wall clock time = 0.306979 seconds
-# Output file: benchmark_ij.out.22
-PCG Setup wall clock time = 0.621549 seconds
-PCG Solve wall clock time = 0.237298 seconds
-# Output file: benchmark_ij.out.23
-PCG Setup wall clock time = 0.604897 seconds
-PCG Solve wall clock time = 0.232853 seconds
-# Output file: benchmark_ij.out.24
-PCG Setup wall clock time = 0.610861 seconds
-PCG Solve wall clock time = 0.261864 seconds
-# Output file: benchmark_ij.out.25
-PCG Setup wall clock time = 0.574478 seconds
-PCG Solve wall clock time = 0.268362 seconds
diff --git a/external/hypre/src/test/TEST_bench/benchmark_ij.perf.saved.tioga b/external/hypre/src/test/TEST_bench/benchmark_ij.perf.saved.tioga
new file mode 100644
index 00000000..f335bba3
--- /dev/null
+++ b/external/hypre/src/test/TEST_bench/benchmark_ij.perf.saved.tioga
@@ -0,0 +1,81 @@
+# Output file: benchmark_ij.out.1
+PCG Setup wall clock time = 0.170772 seconds
+PCG Solve wall clock time = 0.335337 seconds
+# Output file: benchmark_ij.out.2
+PCG Setup wall clock time = 0.163119 seconds
+PCG Solve wall clock time = 0.271529 seconds
+# Output file: benchmark_ij.out.3
+PCG Setup wall clock time = 0.201941 seconds
+PCG Solve wall clock time = 0.672232 seconds
+# Output file: benchmark_ij.out.4
+PCG Setup wall clock time = 0.226705 seconds
+PCG Solve wall clock time = 0.152017 seconds
+# Output file: benchmark_ij.out.5
+PCG Setup wall clock time = 0.254766 seconds
+PCG Solve wall clock time = 0.137966 seconds
+# Output file: benchmark_ij.out.6
+PCG Setup wall clock time = 0.204024 seconds
+PCG Solve wall clock time = 0.613917 seconds
+# Output file: benchmark_ij.out.7
+PCG Setup wall clock time = 0.282569 seconds
+PCG Solve wall clock time = 0.158339 seconds
+# Output file: benchmark_ij.out.8
+PCG Setup wall clock time = 0.159975 seconds
+PCG Solve wall clock time = 0.334356 seconds
+# Output file: benchmark_ij.out.9
+PCG Setup wall clock time = 0.151504 seconds
+PCG Solve wall clock time = 0.272460 seconds
+# Output file: benchmark_ij.out.10
+PCG Setup wall clock time = 0.190785 seconds
+PCG Solve wall clock time = 0.639297 seconds
+# Output file: benchmark_ij.out.11
+PCG Setup wall clock time = 0.217895 seconds
+PCG Solve wall clock time = 0.145796 seconds
+# Output file: benchmark_ij.out.12
+PCG Setup wall clock time = 0.245100 seconds
+PCG Solve wall clock time = 0.132285 seconds
+# Output file: benchmark_ij.out.13
+PCG Setup wall clock time = 0.188967 seconds
+PCG Solve wall clock time = 0.596166 seconds
+# Output file: benchmark_ij.out.14
+PCG Setup wall clock time = 0.953187 seconds
+PCG Solve wall clock time = 0.680926 seconds
+# Output file: benchmark_ij.out.15
+PCG Setup wall clock time = 0.868636 seconds
+PCG Solve wall clock time = 0.733326 seconds
+# Output file: benchmark_ij.out.16
+PCG Setup wall clock time = 0.882904 seconds
+PCG Solve wall clock time = 0.647630 seconds
+# Output file: benchmark_ij.out.17
+PCG Setup wall clock time = 0.243402 seconds
+PCG Solve wall clock time = 0.143477 seconds
+# Output file: benchmark_ij.out.18
+PCG Setup wall clock time = 0.231762 seconds
+PCG Solve wall clock time = 0.111623 seconds
+# Output file: benchmark_ij.out.19
+PCG Setup wall clock time = 0.276950 seconds
+PCG Solve wall clock time = 0.324065 seconds
+# Output file: benchmark_ij.out.20
+PCG Setup wall clock time = 0.185776 seconds
+PCG Solve wall clock time = 0.177456 seconds
+# Output file: benchmark_ij.out.21
+PCG Setup wall clock time = 0.240707 seconds
+PCG Solve wall clock time = 0.189251 seconds
+# Output file: benchmark_ij.out.22
+PCG Setup wall clock time = 0.291317 seconds
+PCG Solve wall clock time = 0.205310 seconds
+# Output file: benchmark_ij.out.23
+PCG Setup wall clock time = 0.288176 seconds
+PCG Solve wall clock time = 0.199249 seconds
+# Output file: benchmark_ij.out.24
+PCG Setup wall clock time = 0.258924 seconds
+PCG Solve wall clock time = 0.228139 seconds
+# Output file: benchmark_ij.out.25
+PCG Setup wall clock time = 0.257346 seconds
+PCG Solve wall clock time = 0.233506 seconds
+# Output file: benchmark_ij.out.26
+PCG Setup wall clock time = 0.265667 seconds
+PCG Solve wall clock time = 0.438971 seconds
+# Output file: benchmark_ij.out.27
+PCG Setup wall clock time = 0.287397 seconds
+PCG Solve wall clock time = 0.319967 seconds
diff --git a/external/hypre/src/test/TEST_bench/benchmark_ij.saved.lassen b/external/hypre/src/test/TEST_bench/benchmark_ij.saved.lassen
index 75f7d84d..4f85e851 100644
--- a/external/hypre/src/test/TEST_bench/benchmark_ij.saved.lassen
+++ b/external/hypre/src/test/TEST_bench/benchmark_ij.saved.lassen
@@ -1,200 +1,108 @@
 # Output file: benchmark_ij.out.1
-     Complexity:    grid = 1.386675
-                operator = 2.320880
-                memory = 2.744642
-
-Iterations = 56
-Final Relative Residual Norm = 8.307127e-09
+Iterations = 55
+Final Relative Residual Norm = 7.087579e-09
 
 # Output file: benchmark_ij.out.2
-     Complexity:    grid = 1.387055
-                operator = 2.317302
-                memory = 2.741383
-
-Iterations = 47
-Final Relative Residual Norm = 6.442666e-09
+Iterations = 46
+Final Relative Residual Norm = 9.524807e-09
 
 # Output file: benchmark_ij.out.3
-     Complexity:    grid = 1.233928
-                operator = 1.239456
-                memory = 1.468423
-
-Iterations = 91
-Final Relative Residual Norm = 8.690762e-09
+Iterations = 92
+Final Relative Residual Norm = 8.647764e-09
 
 # Output file: benchmark_ij.out.4
-     Complexity:    grid = 1.364012
-                operator = 2.855853
-                memory = 3.482026
-
 Iterations = 21
-Final Relative Residual Norm = 4.058213e-09
+Final Relative Residual Norm = 4.137778e-09
 
 # Output file: benchmark_ij.out.5
-     Complexity:    grid = 1.091824
-                operator = 1.219624
-                memory = 1.372738
-
 Iterations = 18
-Final Relative Residual Norm = 7.323212e-09
+Final Relative Residual Norm = 6.100830e-09
 
 # Output file: benchmark_ij.out.6
-     Complexity:    grid = 1.233919
-                operator = 1.239480
-                memory = 1.468487
-
-Iterations = 86
-Final Relative Residual Norm = 8.703512e-09
+Iterations = 87
+Final Relative Residual Norm = 8.492893e-09
 
 # Output file: benchmark_ij.out.7
-     Complexity:    grid = 1.223590
-                operator = 1.527021
-                memory = 1.986749
-
 Iterations = 20
-Final Relative Residual Norm = 6.987022e-09
+Final Relative Residual Norm = 6.894372e-09
 
 # Output file: benchmark_ij.out.8
-     Complexity:    grid = 1.386664
-                operator = 2.320762
-                memory = 2.744512
-
-Iterations = 55
-Final Relative Residual Norm = 8.845940e-09
+Iterations = 54
+Final Relative Residual Norm = 6.808957e-09
 
 # Output file: benchmark_ij.out.9
-     Complexity:    grid = 1.387055
-                operator = 2.317302
-                memory = 2.741383
-
 Iterations = 47
-Final Relative Residual Norm = 6.443110e-09
+Final Relative Residual Norm = 7.886349e-09
 
 # Output file: benchmark_ij.out.10
-     Complexity:    grid = 1.233928
-                operator = 1.239458
-                memory = 1.468426
-
 Iterations = 93
-Final Relative Residual Norm = 7.570811e-09
+Final Relative Residual Norm = 8.244493e-09
 
 # Output file: benchmark_ij.out.11
-     Complexity:    grid = 1.364012
-                operator = 2.855853
-                memory = 3.482026
-
 Iterations = 21
-Final Relative Residual Norm = 4.058213e-09
+Final Relative Residual Norm = 4.060704e-09
 
 # Output file: benchmark_ij.out.12
-     Complexity:    grid = 1.091824
-                operator = 1.219624
-                memory = 1.372738
-
 Iterations = 18
-Final Relative Residual Norm = 7.323212e-09
+Final Relative Residual Norm = 6.100830e-09
 
 # Output file: benchmark_ij.out.13
-     Complexity:    grid = 1.233919
-                operator = 1.239480
-                memory = 1.468487
-
-Iterations = 86
-Final Relative Residual Norm = 8.703480e-09
+Iterations = 87
+Final Relative Residual Norm = 8.492862e-09
 
 # Output file: benchmark_ij.out.14
-     Complexity:    grid = 1.353519
-                operator = 2.780828
-                memory = 3.404837
-
-Iterations = 21
-Final Relative Residual Norm = 3.421896e-09
+Iterations = 20
+Final Relative Residual Norm = 7.903625e-09
 
 # Output file: benchmark_ij.out.15
-     Complexity:    grid = 1.363215
-                operator = 2.858849
-                memory = 3.484214
-
 Iterations = 22
-Final Relative Residual Norm = 5.645705e-09
+Final Relative Residual Norm = 5.658262e-09
 
 # Output file: benchmark_ij.out.16
-     Complexity:    grid = 1.353517
-                operator = 2.783027
-                memory = 3.407035
-
 Iterations = 21
-Final Relative Residual Norm = 3.301396e-09
+Final Relative Residual Norm = 4.524887e-09
 
 # Output file: benchmark_ij.out.17
-     Complexity:    grid = 1.015779
-                operator = 1.046674
-                memory = 1.317909
-
 Iterations = 20
 Final Relative Residual Norm = 3.328281e-09
 
 # Output file: benchmark_ij.out.18
-     Complexity:    grid = 1.070875
-                operator = 1.447982
-                memory = 1.989067
-
 Iterations = 20
-Final Relative Residual Norm = 3.966823e-09
+Final Relative Residual Norm = 4.132101e-09
 
 # Output file: benchmark_ij.out.19
-     Complexity:    grid = 1.079926
-                operator = 1.533788
-                memory = 1.702008
-
 Iterations = 43
-Final Relative Residual Norm = 6.701259e-09
+Final Relative Residual Norm = 7.821010e-09
 
 # Output file: benchmark_ij.out.20
-     Complexity:    grid = 1.082226
-                operator = 1.551614
-                memory = 2.055232
-
-Iterations = 38
-Final Relative Residual Norm = 6.553323e-09
+Iterations = 37
+Final Relative Residual Norm = 8.751003e-09
 
 # Output file: benchmark_ij.out.21
-     Complexity:    grid = 1.061711
-                operator = 1.424330
-                memory = 2.083418
-
 Iterations = 26
-Final Relative Residual Norm = 9.192336e-09
+Final Relative Residual Norm = 9.541467e-09
 
 # Output file: benchmark_ij.out.22
-     Complexity:    grid = 1.354713
-                operator = 2.779966
-                memory = 3.404837
-
-Iterations = 12
-Final Relative Residual Norm = 9.479329e-09
+Iterations = 13
+Final Relative Residual Norm = 1.759314e-09
 
 # Output file: benchmark_ij.out.23
-     Complexity:    grid = 1.354713
-                operator = 2.779966
-                memory = 3.404837
-
 Iterations = 13
-Final Relative Residual Norm = 5.649324e-09
+Final Relative Residual Norm = 5.903110e-09
 
 # Output file: benchmark_ij.out.24
-     Complexity:    grid = 1.354713
-                operator = 2.779966
-                memory = 3.404837
-
-Iterations = 14
-Final Relative Residual Norm = 2.350370e-09
+Iterations = 13
+Final Relative Residual Norm = 9.939673e-09
 
 # Output file: benchmark_ij.out.25
-     Complexity:    grid = 1.354713
-                operator = 2.779966
-                memory = 3.404837
-
 Iterations = 15
-Final Relative Residual Norm = 4.896099e-09
+Final Relative Residual Norm = 4.124880e-09
+
+# Output file: benchmark_ij.out.26
+Iterations = 37
+Final Relative Residual Norm = 7.069482e-09
+
+# Output file: benchmark_ij.out.27
+Iterations = 22
+Final Relative Residual Norm = 9.619150e-09
 
diff --git a/external/hypre/src/test/TEST_bench/benchmark_ij.saved.ray b/external/hypre/src/test/TEST_bench/benchmark_ij.saved.ray
deleted file mode 100644
index 459f18f8..00000000
--- a/external/hypre/src/test/TEST_bench/benchmark_ij.saved.ray
+++ /dev/null
@@ -1,200 +0,0 @@
-# Output file: benchmark_ij.out.1
-     Complexity:    grid = 1.386675
-                operator = 2.320880
-                memory = 2.744642
-
-Iterations = 56
-Final Relative Residual Norm = 8.310273e-09
-
-# Output file: benchmark_ij.out.2
-     Complexity:    grid = 1.387054
-                operator = 2.317317
-                memory = 2.741399
-
-Iterations = 46
-Final Relative Residual Norm = 9.983060e-09
-
-# Output file: benchmark_ij.out.3
-     Complexity:    grid = 1.233935
-                operator = 1.239483
-                memory = 1.468458
-
-Iterations = 95
-Final Relative Residual Norm = 9.752976e-09
-
-# Output file: benchmark_ij.out.4
-     Complexity:    grid = 1.364009
-                operator = 2.855804
-                memory = 3.481976
-
-Iterations = 21
-Final Relative Residual Norm = 4.823877e-09
-
-# Output file: benchmark_ij.out.5
-     Complexity:    grid = 1.091841
-                operator = 1.219680
-                memory = 1.372794
-
-Iterations = 18
-Final Relative Residual Norm = 7.067935e-09
-
-# Output file: benchmark_ij.out.6
-     Complexity:    grid = 1.233924
-                operator = 1.239488
-                memory = 1.468501
-
-Iterations = 86
-Final Relative Residual Norm = 8.776839e-09
-
-# Output file: benchmark_ij.out.7
-     Complexity:    grid = 1.223589
-                operator = 1.527003
-                memory = 1.986731
-
-Iterations = 20
-Final Relative Residual Norm = 6.113255e-09
-
-# Output file: benchmark_ij.out.8
-     Complexity:    grid = 1.386664
-                operator = 2.320762
-                memory = 2.744512
-
-Iterations = 55
-Final Relative Residual Norm = 8.842660e-09
-
-# Output file: benchmark_ij.out.9
-     Complexity:    grid = 1.387054
-                operator = 2.317317
-                memory = 2.741399
-
-Iterations = 46
-Final Relative Residual Norm = 9.984042e-09
-
-# Output file: benchmark_ij.out.10
-     Complexity:    grid = 1.233941
-                operator = 1.239494
-                memory = 1.468474
-
-Iterations = 94
-Final Relative Residual Norm = 8.552975e-09
-
-# Output file: benchmark_ij.out.11
-     Complexity:    grid = 1.364009
-                operator = 2.855804
-                memory = 3.481976
-
-Iterations = 21
-Final Relative Residual Norm = 4.823877e-09
-
-# Output file: benchmark_ij.out.12
-     Complexity:    grid = 1.091841
-                operator = 1.219680
-                memory = 1.372794
-
-Iterations = 18
-Final Relative Residual Norm = 7.067935e-09
-
-# Output file: benchmark_ij.out.13
-     Complexity:    grid = 1.233924
-                operator = 1.239488
-                memory = 1.468501
-
-Iterations = 86
-Final Relative Residual Norm = 8.776848e-09
-
-# Output file: benchmark_ij.out.14
-     Complexity:    grid = 1.353525
-                operator = 2.780984
-                memory = 3.404994
-
-Iterations = 21
-Final Relative Residual Norm = 3.275619e-09
-
-# Output file: benchmark_ij.out.15
-     Complexity:    grid = 1.363207
-                operator = 2.858725
-                memory = 3.484089
-
-Iterations = 22
-Final Relative Residual Norm = 5.998149e-09
-
-# Output file: benchmark_ij.out.16
-     Complexity:    grid = 1.353543
-                operator = 2.783373
-                memory = 3.407385
-
-Iterations = 20
-Final Relative Residual Norm = 9.658787e-09
-
-# Output file: benchmark_ij.out.17
-     Complexity:    grid = 1.015779
-                operator = 1.046674
-                memory = 1.317909
-
-Iterations = 20
-Final Relative Residual Norm = 3.328281e-09
-
-# Output file: benchmark_ij.out.18
-     Complexity:    grid = 1.070876
-                operator = 1.447936
-                memory = 1.989021
-
-Iterations = 20
-Final Relative Residual Norm = 4.032191e-09
-
-# Output file: benchmark_ij.out.19
-     Complexity:    grid = 1.079936
-                operator = 1.533947
-                memory = 1.702168
-
-Iterations = 43
-Final Relative Residual Norm = 6.646561e-09
-
-# Output file: benchmark_ij.out.20
-     Complexity:    grid = 1.082238
-                operator = 1.551861
-                memory = 2.055481
-
-Iterations = 38
-Final Relative Residual Norm = 7.983322e-09
-
-# Output file: benchmark_ij.out.21
-     Complexity:    grid = 1.061719
-                operator = 1.424455
-                memory = 2.083605
-
-Iterations = 27
-Final Relative Residual Norm = 5.988024e-09
-
-# Output file: benchmark_ij.out.22
-     Complexity:    grid = 1.354729
-                operator = 2.780162
-                memory = 3.405036
-
-Iterations = 12
-Final Relative Residual Norm = 7.696220e-09
-
-# Output file: benchmark_ij.out.23
-     Complexity:    grid = 1.354729
-                operator = 2.780162
-                memory = 3.405036
-
-Iterations = 13
-Final Relative Residual Norm = 5.699345e-09
-
-# Output file: benchmark_ij.out.24
-     Complexity:    grid = 1.354729
-                operator = 2.780162
-                memory = 3.405036
-
-Iterations = 14
-Final Relative Residual Norm = 2.049078e-09
-
-# Output file: benchmark_ij.out.25
-     Complexity:    grid = 1.354729
-                operator = 2.780162
-                memory = 3.405036
-
-Iterations = 15
-Final Relative Residual Norm = 3.378361e-09
-
diff --git a/external/hypre/src/test/TEST_bench/benchmark_ij.saved.tioga b/external/hypre/src/test/TEST_bench/benchmark_ij.saved.tioga
new file mode 100644
index 00000000..c0268171
--- /dev/null
+++ b/external/hypre/src/test/TEST_bench/benchmark_ij.saved.tioga
@@ -0,0 +1,107 @@
+# Output file: benchmark_ij.out.1
+Iterations = 55
+Final Relative Residual Norm = 9.274314e-09
+
+# Output file: benchmark_ij.out.2
+Iterations = 46
+Final Relative Residual Norm = 9.988931e-09
+
+# Output file: benchmark_ij.out.3
+Iterations = 98
+Final Relative Residual Norm = 7.887687e-09
+
+# Output file: benchmark_ij.out.4
+Iterations = 21
+Final Relative Residual Norm = 3.469813e-09
+
+# Output file: benchmark_ij.out.5
+Iterations = 18
+Final Relative Residual Norm = 4.722489e-09
+
+# Output file: benchmark_ij.out.6
+Iterations = 87
+Final Relative Residual Norm = 7.730705e-09
+
+# Output file: benchmark_ij.out.7
+Iterations = 20
+Final Relative Residual Norm = 4.901688e-09
+
+# Output file: benchmark_ij.out.8
+Iterations = 55
+Final Relative Residual Norm = 8.477809e-09
+
+# Output file: benchmark_ij.out.9
+Iterations = 46
+Final Relative Residual Norm = 9.985837e-09
+
+# Output file: benchmark_ij.out.10
+Iterations = 93
+Final Relative Residual Norm = 8.530145e-09
+
+# Output file: benchmark_ij.out.11
+Iterations = 21
+Final Relative Residual Norm = 3.234870e-09
+
+# Output file: benchmark_ij.out.12
+Iterations = 18
+Final Relative Residual Norm = 4.722489e-09
+
+# Output file: benchmark_ij.out.13
+Iterations = 87
+Final Relative Residual Norm = 7.730127e-09
+
+# Output file: benchmark_ij.out.14
+Iterations = 21
+Final Relative Residual Norm = 3.509276e-09
+
+# Output file: benchmark_ij.out.15
+Iterations = 22
+Final Relative Residual Norm = 5.410863e-09
+
+# Output file: benchmark_ij.out.16
+Iterations = 20
+Final Relative Residual Norm = 9.649695e-09
+
+# Output file: benchmark_ij.out.17
+Iterations = 20
+Final Relative Residual Norm = 3.529822e-09
+
+# Output file: benchmark_ij.out.18
+Iterations = 20
+Final Relative Residual Norm = 3.320123e-09
+
+# Output file: benchmark_ij.out.19
+Iterations = 43
+Final Relative Residual Norm = 7.541043e-09
+
+# Output file: benchmark_ij.out.20
+Iterations = 38
+Final Relative Residual Norm = 4.440293e-09
+
+# Output file: benchmark_ij.out.21
+Iterations = 27
+Final Relative Residual Norm = 4.476621e-09
+
+# Output file: benchmark_ij.out.22
+Iterations = 13
+Final Relative Residual Norm = 1.810780e-09
+
+# Output file: benchmark_ij.out.23
+Iterations = 13
+Final Relative Residual Norm = 6.103525e-09
+
+# Output file: benchmark_ij.out.24
+Iterations = 14
+Final Relative Residual Norm = 3.116077e-09
+
+# Output file: benchmark_ij.out.25
+Iterations = 15
+Final Relative Residual Norm = 5.382858e-09
+
+# Output file: benchmark_ij.out.26
+Iterations = 37
+Final Relative Residual Norm = 6.305999e-09
+
+# Output file: benchmark_ij.out.27
+Iterations = 22
+Final Relative Residual Norm = 8.787135e-09
diff --git a/external/hypre/src/test/TEST_bench/benchmark_ij.sh b/external/hypre/src/test/TEST_bench/benchmark_ij.sh
old mode 100644
new mode 100755
index e81c2a35..dbcbeb2a
--- a/external/hypre/src/test/TEST_bench/benchmark_ij.sh
+++ b/external/hypre/src/test/TEST_bench/benchmark_ij.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -38,6 +38,8 @@ FILES="\
  ${TNAME}.out.23\
  ${TNAME}.out.24\
  ${TNAME}.out.25\
+ ${TNAME}.out.26\
+ ${TNAME}.out.27\
 "
 
 for i in $FILES
@@ -58,26 +60,11 @@ done > ${TNAME}.perf.out
 
 # Make sure that the output file is reasonable
 RUNCOUNT=`echo $FILES | wc -w`
-OUTCOUNT=`grep "Complexity" ${TNAME}.out | wc -l`
+OUTCOUNT=`grep "Iterations" ${TNAME}.out | wc -l`
 if [ "$OUTCOUNT" != "$RUNCOUNT" ]; then
    echo "Incorrect number of runs in ${TNAME}.out" >&2
 fi
 
-# Check performance
-HOST=`hostname`
-case $HOST in
-   lassen*)
-      SavePerfExt="saved.lassen"
-      rtol=0.15
-      ;;
-   *) SavePerfExt=""
-      ;;
-esac
-
-if [ -n "$SavePerfExt" ]; then
-   ../runcheck.sh $TNAME.perf.out $TNAME.perf.$SavePerfExt $rtol >&2
-fi
-
 #=============================================================================
 # remove temporary files
 #=============================================================================
diff --git a/external/hypre/src/test/TEST_bench/benchmark_spgemm.jobs b/external/hypre/src/test/TEST_bench/benchmark_spgemm.jobs
new file mode 100755
index 00000000..b79ee824
--- /dev/null
+++ b/external/hypre/src/test/TEST_bench/benchmark_spgemm.jobs
@@ -0,0 +1,65 @@
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+#=============================================================================
+# ij_mm: SpGEMM GPU benchmarks
+#=============================================================================
+
+# A^2
+
+mpirun -np 1 ./ij_mm -n 128 128 128  -7pt -verify 1 -spgemm_binned 0 -spgemmalg 1 -rep 10 > benchmark_spgemm.out.1
+mpirun -np 1 ./ij_mm -n 128 128 128 -27pt -verify 1 -spgemm_binned 0 -spgemmalg 1 -rep 10 > benchmark_spgemm.out.2
+mpirun -np 1 ./ij_mm -n 1024 1024 1  -5pt -verify 1 -spgemm_binned 0 -spgemmalg 1 -rep 10 > benchmark_spgemm.out.3
+mpirun -np 1 ./ij_mm -n 1024 1024 1  -9pt -verify 1 -spgemm_binned 0 -spgemmalg 1 -rep 10 > benchmark_spgemm.out.4
+
+mpirun -np 1 ./ij_mm -n 128 128 128  -7pt -verify 1 -spgemm_binned 1 -spgemmalg 1 -rep 10 > benchmark_spgemm.out.5
+mpirun -np 1 ./ij_mm -n 128 128 128 -27pt -verify 1 -spgemm_binned 1 -spgemmalg 1 -rep 10 > benchmark_spgemm.out.6
+mpirun -np 1 ./ij_mm -n 1024 1024 1  -5pt -verify 1 -spgemm_binned 1 -spgemmalg 1 -rep 10 > benchmark_spgemm.out.7
+mpirun -np 1 ./ij_mm -n 1024 1024 1  -9pt -verify 1 -spgemm_binned 1 -spgemmalg 1 -rep 10 > benchmark_spgemm.out.8
+
+mpirun -np 1 ./ij_mm -n 128 128 128  -7pt -verify 1 -spgemm_binned 0 -spgemmalg 3 -rep 10 > benchmark_spgemm.out.9
+mpirun -np 1 ./ij_mm -n 128 128 128 -27pt -verify 1 -spgemm_binned 0 -spgemmalg 3 -rep 10 > benchmark_spgemm.out.10
+mpirun -np 1 ./ij_mm -n 1024 1024 1  -5pt -verify 1 -spgemm_binned 0 -spgemmalg 3 -rep 10 > benchmark_spgemm.out.11
+mpirun -np 1 ./ij_mm -n 1024 1024 1  -9pt -verify 1 -spgemm_binned 0 -spgemmalg 3 -rep 10 > benchmark_spgemm.out.12
+
+mpirun -np 1 ./ij_mm -n 128 128 128  -7pt -verify 1 -vendor 1                     -rep 10 > benchmark_spgemm.out.13
+mpirun -np 1 ./ij_mm -n 80   80  80 -27pt -verify 1 -vendor 1                     -rep 10 > benchmark_spgemm.out.14
+mpirun -np 1 ./ij_mm -n 1024 1024 1  -5pt -verify 1 -vendor 1                     -rep 10 > benchmark_spgemm.out.15
+mpirun -np 1 ./ij_mm -n 1024 1024 1  -9pt -verify 1 -vendor 1                     -rep 10 > benchmark_spgemm.out.16
+
+# Diag(A) * A
+
+mpirun -np 1 ./ij_mm -n 128 128 128  -7pt -verify 1 -spgemm_binned 1 -spgemmalg 1 -job 5 -rep 10 > benchmark_spgemm.out.17
+mpirun -np 1 ./ij_mm -n 128 128 128 -27pt -verify 1 -spgemm_binned 1 -spgemmalg 1 -job 5 -rep 10 > benchmark_spgemm.out.18
+mpirun -np 1 ./ij_mm -n 1024 1024 1  -5pt -verify 1 -spgemm_binned 1 -spgemmalg 1 -job 5 -rep 10 > benchmark_spgemm.out.19
+mpirun -np 1 ./ij_mm -n 1024 1024 1  -9pt -verify 1 -spgemm_binned 1 -spgemmalg 1 -job 5 -rep 10 > benchmark_spgemm.out.20
+
+# A^2
+
+mpirun -np 4 ./ij_mm -n 256 256 128 -P 2 2 1  -7pt -verify 1 -rep 10 > benchmark_spgemm.out.21
+mpirun -np 4 ./ij_mm -n 256 256 128 -P 2 2 1 -27pt -verify 1 -rep 10 > benchmark_spgemm.out.22
+mpirun -np 4 ./ij_mm -n 2048 2048 1 -P 2 2 1  -5pt -verify 1 -rep 10 > benchmark_spgemm.out.23
+mpirun -np 4 ./ij_mm -n 2048 2048 1 -P 2 2 1  -9pt -verify 1 -rep 10 > benchmark_spgemm.out.24
+
+# A^T * A
+
+mpirun -np 4 ./ij_mm -n 256 256 128 -P 2 2 1  -7pt -verify 1 -rep 10 -job 2 > benchmark_spgemm.out.25
+mpirun -np 4 ./ij_mm -n 256 256 128 -P 2 2 1 -27pt -verify 1 -rep 10 -job 2 > benchmark_spgemm.out.26
+mpirun -np 4 ./ij_mm -n 2048 2048 1 -P 2 2 1  -5pt -verify 1 -rep 10 -job 2 > benchmark_spgemm.out.27
+mpirun -np 4 ./ij_mm -n 2048 2048 1 -P 2 2 1  -9pt -verify 1 -rep 10 -job 2 > benchmark_spgemm.out.28
+
+# P^T*A*P
+
+mpirun -np 4 ./ij_mm -n 256 256 128 -P 2 2 1  -7pt -verify 1 -rep 10 -rap2 0 -job 4 > benchmark_spgemm.out.29
+mpirun -np 4 ./ij_mm -n 256 256 128 -P 2 2 1 -27pt -verify 1 -rep 10 -rap2 0 -job 4 > benchmark_spgemm.out.30
+mpirun -np 4 ./ij_mm -n 2048 2048 1 -P 2 2 1  -5pt -verify 1 -rep 10 -rap2 0 -job 4 > benchmark_spgemm.out.31
+mpirun -np 4 ./ij_mm -n 2048 2048 1 -P 2 2 1  -9pt -verify 1 -rep 10 -rap2 0 -job 4 > benchmark_spgemm.out.32
+
+mpirun -np 4 ./ij_mm -n 256 256 128 -P 2 2 1  -7pt -verify 1 -rep 10 -rap2 1 -job 4 > benchmark_spgemm.out.33
+mpirun -np 4 ./ij_mm -n 256 256 128 -P 2 2 1 -27pt -verify 1 -rep 10 -rap2 1 -job 4 > benchmark_spgemm.out.34
+mpirun -np 4 ./ij_mm -n 2048 2048 1 -P 2 2 1  -5pt -verify 1 -rep 10 -rap2 1 -job 4 > benchmark_spgemm.out.35
+mpirun -np 4 ./ij_mm -n 2048 2048 1 -P 2 2 1  -9pt -verify 1 -rep 10 -rap2 1 -job 4 > benchmark_spgemm.out.36
+
diff --git a/external/hypre/src/test/TEST_bench/benchmark_spgemm.perf.saved.lassen b/external/hypre/src/test/TEST_bench/benchmark_spgemm.perf.saved.lassen
new file mode 100644
index 00000000..a03752cc
--- /dev/null
+++ b/external/hypre/src/test/TEST_bench/benchmark_spgemm.perf.saved.lassen
@@ -0,0 +1,72 @@
+# Output file: benchmark_spgemm.out.1
+Device Parcsr Matrix-by-Matrix wall clock time = 0.010967 seconds
+# Output file: benchmark_spgemm.out.2
+Device Parcsr Matrix-by-Matrix wall clock time = 0.078255 seconds
+# Output file: benchmark_spgemm.out.3
+Device Parcsr Matrix-by-Matrix wall clock time = 0.004247 seconds
+# Output file: benchmark_spgemm.out.4
+Device Parcsr Matrix-by-Matrix wall clock time = 0.006737 seconds
+# Output file: benchmark_spgemm.out.5
+Device Parcsr Matrix-by-Matrix wall clock time = 0.006479 seconds
+# Output file: benchmark_spgemm.out.6
+Device Parcsr Matrix-by-Matrix wall clock time = 0.078124 seconds
+# Output file: benchmark_spgemm.out.7
+Device Parcsr Matrix-by-Matrix wall clock time = 0.002043 seconds
+# Output file: benchmark_spgemm.out.8
+Device Parcsr Matrix-by-Matrix wall clock time = 0.004348 seconds
+# Output file: benchmark_spgemm.out.9
+Device Parcsr Matrix-by-Matrix wall clock time = 0.021769 seconds
+# Output file: benchmark_spgemm.out.10
+Device Parcsr Matrix-by-Matrix wall clock time = 0.097855 seconds
+# Output file: benchmark_spgemm.out.11
+Device Parcsr Matrix-by-Matrix wall clock time = 0.008427 seconds
+# Output file: benchmark_spgemm.out.12
+Device Parcsr Matrix-by-Matrix wall clock time = 0.011918 seconds
+# Output file: benchmark_spgemm.out.13
+Device Parcsr Matrix-by-Matrix wall clock time = 0.027048 seconds
+# Output file: benchmark_spgemm.out.14
+Device Parcsr Matrix-by-Matrix wall clock time = 0.064765 seconds
+# Output file: benchmark_spgemm.out.15
+Device Parcsr Matrix-by-Matrix wall clock time = 0.006528 seconds
+# Output file: benchmark_spgemm.out.16
+Device Parcsr Matrix-by-Matrix wall clock time = 0.018399 seconds
+# Output file: benchmark_spgemm.out.17
+Device Parcsr Matrix-by-Matrix wall clock time = 0.001937 seconds
+# Output file: benchmark_spgemm.out.18
+Device Parcsr Matrix-by-Matrix wall clock time = 0.006223 seconds
+# Output file: benchmark_spgemm.out.19
+Device Parcsr Matrix-by-Matrix wall clock time = 0.001117 seconds
+# Output file: benchmark_spgemm.out.20
+Device Parcsr Matrix-by-Matrix wall clock time = 0.001318 seconds
+# Output file: benchmark_spgemm.out.21
+Device Parcsr Matrix-by-Matrix wall clock time = 0.026565 seconds
+# Output file: benchmark_spgemm.out.22
+Device Parcsr Matrix-by-Matrix wall clock time = 0.138814 seconds
+# Output file: benchmark_spgemm.out.23
+Device Parcsr Matrix-by-Matrix wall clock time = 0.009921 seconds
+# Output file: benchmark_spgemm.out.24
+Device Parcsr Matrix-by-Matrix wall clock time = 0.015210 seconds
+# Output file: benchmark_spgemm.out.25
+Device Parcsr Matrix-by-Matrix wall clock time = 0.044715 seconds
+# Output file: benchmark_spgemm.out.26
+Device Parcsr Matrix-by-Matrix wall clock time = 0.213106 seconds
+# Output file: benchmark_spgemm.out.27
+Device Parcsr Matrix-by-Matrix wall clock time = 0.016736 seconds
+# Output file: benchmark_spgemm.out.28
+Device Parcsr Matrix-by-Matrix wall clock time = 0.024992 seconds
+# Output file: benchmark_spgemm.out.29
+Device Parcsr Matrix-by-Matrix wall clock time = 0.043242 seconds
+# Output file: benchmark_spgemm.out.30
+Device Parcsr Matrix-by-Matrix wall clock time = 0.057250 seconds
+# Output file: benchmark_spgemm.out.31
+Device Parcsr Matrix-by-Matrix wall clock time = 0.014796 seconds
+# Output file: benchmark_spgemm.out.32
+Device Parcsr Matrix-by-Matrix wall clock time = 0.015555 seconds
+# Output file: benchmark_spgemm.out.33
+Device Parcsr Matrix-by-Matrix wall clock time = 0.052184 seconds
+# Output file: benchmark_spgemm.out.34
+Device Parcsr Matrix-by-Matrix wall clock time = 0.072126 seconds
+# Output file: benchmark_spgemm.out.35
+Device Parcsr Matrix-by-Matrix wall clock time = 0.017392 seconds
+# Output file: benchmark_spgemm.out.36
+Device Parcsr Matrix-by-Matrix wall clock time = 0.019193 seconds
diff --git a/external/hypre/src/test/TEST_bench/benchmark_spgemm.perf.saved.tioga b/external/hypre/src/test/TEST_bench/benchmark_spgemm.perf.saved.tioga
new file mode 100644
index 00000000..9e3aaa30
--- /dev/null
+++ b/external/hypre/src/test/TEST_bench/benchmark_spgemm.perf.saved.tioga
@@ -0,0 +1,72 @@
+# Output file: benchmark_spgemm.out.1
+Device Parcsr Matrix-by-Matrix wall clock time = 0.019578 seconds
+# Output file: benchmark_spgemm.out.2
+Device Parcsr Matrix-by-Matrix wall clock time = 0.076419 seconds
+# Output file: benchmark_spgemm.out.3
+Device Parcsr Matrix-by-Matrix wall clock time = 0.008474 seconds
+# Output file: benchmark_spgemm.out.4
+Device Parcsr Matrix-by-Matrix wall clock time = 0.009719 seconds
+# Output file: benchmark_spgemm.out.5
+Device Parcsr Matrix-by-Matrix wall clock time = 0.007846 seconds
+# Output file: benchmark_spgemm.out.6
+Device Parcsr Matrix-by-Matrix wall clock time = 0.080421 seconds
+# Output file: benchmark_spgemm.out.7
+Device Parcsr Matrix-by-Matrix wall clock time = 0.002626 seconds
+# Output file: benchmark_spgemm.out.8
+Device Parcsr Matrix-by-Matrix wall clock time = 0.006074 seconds
+# Output file: benchmark_spgemm.out.9
+Device Parcsr Matrix-by-Matrix wall clock time = 0.038709 seconds
+# Output file: benchmark_spgemm.out.10
+Device Parcsr Matrix-by-Matrix wall clock time = 0.115453 seconds
+# Output file: benchmark_spgemm.out.11
+Device Parcsr Matrix-by-Matrix wall clock time = 0.016367 seconds
+# Output file: benchmark_spgemm.out.12
+Device Parcsr Matrix-by-Matrix wall clock time = 0.019611 seconds
+# Output file: benchmark_spgemm.out.13
+Device Parcsr Matrix-by-Matrix wall clock time = 0.018017 seconds
+# Output file: benchmark_spgemm.out.14
+Device Parcsr Matrix-by-Matrix wall clock time = 0.014804 seconds
+# Output file: benchmark_spgemm.out.15
+Device Parcsr Matrix-by-Matrix wall clock time = 0.006545 seconds
+# Output file: benchmark_spgemm.out.16
+Device Parcsr Matrix-by-Matrix wall clock time = 0.013026 seconds
+# Output file: benchmark_spgemm.out.17
+Device Parcsr Matrix-by-Matrix wall clock time = 0.002087 seconds
+# Output file: benchmark_spgemm.out.18
+Device Parcsr Matrix-by-Matrix wall clock time = 0.005301 seconds
+# Output file: benchmark_spgemm.out.19
+Device Parcsr Matrix-by-Matrix wall clock time = 0.001359 seconds
+# Output file: benchmark_spgemm.out.20
+Device Parcsr Matrix-by-Matrix wall clock time = 0.001621 seconds
+# Output file: benchmark_spgemm.out.21
+Device Parcsr Matrix-by-Matrix wall clock time = 0.031799 seconds
+# Output file: benchmark_spgemm.out.22
+Device Parcsr Matrix-by-Matrix wall clock time = 0.112757 seconds
+# Output file: benchmark_spgemm.out.23
+Device Parcsr Matrix-by-Matrix wall clock time = 0.013535 seconds
+# Output file: benchmark_spgemm.out.24
+Device Parcsr Matrix-by-Matrix wall clock time = 0.016090 seconds
+# Output file: benchmark_spgemm.out.25
+Device Parcsr Matrix-by-Matrix wall clock time = 0.057450 seconds
+# Output file: benchmark_spgemm.out.26
+Device Parcsr Matrix-by-Matrix wall clock time = 0.587366 seconds
+# Output file: benchmark_spgemm.out.27
+Device Parcsr Matrix-by-Matrix wall clock time = 0.022603 seconds
+# Output file: benchmark_spgemm.out.28
+Device Parcsr Matrix-by-Matrix wall clock time = 0.028229 seconds
+# Output file: benchmark_spgemm.out.29
+Device Parcsr Matrix-by-Matrix wall clock time = 0.057857 seconds
+# Output file: benchmark_spgemm.out.30
+Device Parcsr Matrix-by-Matrix wall clock time = 0.060432 seconds
+# Output file: benchmark_spgemm.out.31
+Device Parcsr Matrix-by-Matrix wall clock time = 0.020985 seconds
+# Output file: benchmark_spgemm.out.32
+Device Parcsr Matrix-by-Matrix wall clock time = 0.019986 seconds
+# Output file: benchmark_spgemm.out.33
+Device Parcsr Matrix-by-Matrix wall clock time = 0.063040 seconds
+# Output file: benchmark_spgemm.out.34
+Device Parcsr Matrix-by-Matrix wall clock time = 0.067800 seconds
+# Output file: benchmark_spgemm.out.35
+Device Parcsr Matrix-by-Matrix wall clock time = 0.023271 seconds
+# Output file: benchmark_spgemm.out.36
+Device Parcsr Matrix-by-Matrix wall clock time = 0.022089 seconds
diff --git a/external/hypre/src/test/TEST_bench/benchmark_spgemm.saved.lassen b/external/hypre/src/test/TEST_bench/benchmark_spgemm.saved.lassen
new file mode 100644
index 00000000..2c1fd8cd
--- /dev/null
+++ b/external/hypre/src/test/TEST_bench/benchmark_spgemm.saved.lassen
@@ -0,0 +1,108 @@
+# Output file: benchmark_spgemm.out.1
+A^2: 2097152 x 2097152, nnz [CPU 51742208, GPU 51742208], CPU-GPU err 0.000000e+00
+B 2097152 x 2097152, NNZ 51742208, RNZ 24
+# Output file: benchmark_spgemm.out.2
+A^2: 2097152 x 2097152, nnz [CPU 254840104, GPU 254840104], CPU-GPU err 0.000000e+00
+B 2097152 x 2097152, NNZ 254840104, RNZ 121
+# Output file: benchmark_spgemm.out.3
+A^2: 1048576 x 1048576, nnz [CPU 13611012, GPU 13611012], CPU-GPU err 0.000000e+00
+B 1048576 x 1048576, NNZ 13611012, RNZ 12
+# Output file: benchmark_spgemm.out.4
+A^2: 1048576 x 1048576, nnz [CPU 26152996, GPU 26152996], CPU-GPU err 0.000000e+00
+B 1048576 x 1048576, NNZ 26152996, RNZ 24
+# Output file: benchmark_spgemm.out.5
+A^2: 2097152 x 2097152, nnz [CPU 51742208, GPU 51742208], CPU-GPU err 0.000000e+00
+B 2097152 x 2097152, NNZ 51742208, RNZ 24
+# Output file: benchmark_spgemm.out.6
+A^2: 2097152 x 2097152, nnz [CPU 254840104, GPU 254840104], CPU-GPU err 0.000000e+00
+B 2097152 x 2097152, NNZ 254840104, RNZ 121
+# Output file: benchmark_spgemm.out.7
+A^2: 1048576 x 1048576, nnz [CPU 13611012, GPU 13611012], CPU-GPU err 0.000000e+00
+B 1048576 x 1048576, NNZ 13611012, RNZ 12
+# Output file: benchmark_spgemm.out.8
+A^2: 1048576 x 1048576, nnz [CPU 26152996, GPU 26152996], CPU-GPU err 0.000000e+00
+B 1048576 x 1048576, NNZ 26152996, RNZ 24
+# Output file: benchmark_spgemm.out.9
+A^2: 2097152 x 2097152, nnz [CPU 51742208, GPU 51742208], CPU-GPU err 0.000000e+00
+B 2097152 x 2097152, NNZ 51742208, RNZ 24
+# Output file: benchmark_spgemm.out.10
+A^2: 2097152 x 2097152, nnz [CPU 254840104, GPU 254840104], CPU-GPU err 0.000000e+00
+B 2097152 x 2097152, NNZ 254840104, RNZ 121
+# Output file: benchmark_spgemm.out.11
+A^2: 1048576 x 1048576, nnz [CPU 13611012, GPU 13611012], CPU-GPU err 0.000000e+00
+B 1048576 x 1048576, NNZ 13611012, RNZ 12
+# Output file: benchmark_spgemm.out.12
+A^2: 1048576 x 1048576, nnz [CPU 26152996, GPU 26152996], CPU-GPU err 0.000000e+00
+B 1048576 x 1048576, NNZ 26152996, RNZ 24
+# Output file: benchmark_spgemm.out.13
+A^2: 2097152 x 2097152, nnz [CPU 51742208, GPU 51742208], CPU-GPU err 0.000000e+00
+B 2097152 x 2097152, NNZ 51742208, RNZ 24
+# Output file: benchmark_spgemm.out.14
+A^2: 512000 x 512000, nnz [CPU 61162984, GPU 61162984], CPU-GPU err 0.000000e+00
+B 512000 x 512000, NNZ 61162984, RNZ 119
+# Output file: benchmark_spgemm.out.15
+A^2: 1048576 x 1048576, nnz [CPU 13611012, GPU 13611012], CPU-GPU err 0.000000e+00
+B 1048576 x 1048576, NNZ 13611012, RNZ 12
+# Output file: benchmark_spgemm.out.16
+A^2: 1048576 x 1048576, nnz [CPU 26152996, GPU 26152996], CPU-GPU err 0.000000e+00
+B 1048576 x 1048576, NNZ 26152996, RNZ 24
+# Output file: benchmark_spgemm.out.17
+Diag(A)*A: 2097152 x 2097152, nnz [CPU 14581760, GPU 14581760], CPU-GPU err 0.000000e+00
+B 2097152 x 2097152, NNZ 14581760, RNZ 6
+# Output file: benchmark_spgemm.out.18
+Diag(A)*A: 2097152 x 2097152, nnz [CPU 55742968, GPU 55742968], CPU-GPU err 0.000000e+00
+B 2097152 x 2097152, NNZ 55742968, RNZ 26
+# Output file: benchmark_spgemm.out.19
+Diag(A)*A: 1048576 x 1048576, nnz [CPU 5238784, GPU 5238784], CPU-GPU err 0.000000e+00
+B 1048576 x 1048576, NNZ 5238784, RNZ 4
+# Output file: benchmark_spgemm.out.20
+Diag(A)*A: 1048576 x 1048576, nnz [CPU 9424900, GPU 9424900], CPU-GPU err 0.000000e+00
+B 1048576 x 1048576, NNZ 9424900, RNZ 8
+# Output file: benchmark_spgemm.out.21
+A^2: 8388608 x 8388608, nnz [CPU 207882752, GPU 207882752], CPU-GPU err 0.000000e+00
+B 8388608 x 8388608, NNZ 207882752, RNZ 24
+# Output file: benchmark_spgemm.out.22
+A^2: 8388608 x 8388608, nnz [CPU 1029030184, GPU 1029030184], CPU-GPU err 0.000000e+00
+B 8388608 x 8388608, NNZ 1029030184, RNZ 122
+# Output file: benchmark_spgemm.out.23
+A^2: 4194304 x 4194304, nnz [CPU 54484996, GPU 54484996], CPU-GPU err 0.000000e+00
+B 4194304 x 4194304, NNZ 54484996, RNZ 12
+# Output file: benchmark_spgemm.out.24
+A^2: 4194304 x 4194304, nnz [CPU 104734756, GPU 104734756], CPU-GPU err 0.000000e+00
+B 4194304 x 4194304, NNZ 104734756, RNZ 24
+# Output file: benchmark_spgemm.out.25
+A^T*A: 8388608 x 8388608, nnz [CPU 207882752, GPU 207882752], CPU-GPU err 0.000000e+00
+B 8388608 x 8388608, NNZ 207882752, RNZ 24
+# Output file: benchmark_spgemm.out.26
+A^T*A: 8388608 x 8388608, nnz [CPU 1029030184, GPU 1029030184], CPU-GPU err 0.000000e+00
+B 8388608 x 8388608, NNZ 1029030184, RNZ 122
+# Output file: benchmark_spgemm.out.27
+A^T*A: 4194304 x 4194304, nnz [CPU 54484996, GPU 54484996], CPU-GPU err 0.000000e+00
+B 4194304 x 4194304, NNZ 54484996, RNZ 12
+# Output file: benchmark_spgemm.out.28
+A^T*A: 4194304 x 4194304, nnz [CPU 104734756, GPU 104734756], CPU-GPU err 0.000000e+00
+B 4194304 x 4194304, NNZ 104734756, RNZ 24
+# Output file: benchmark_spgemm.out.29
+AH: 2584577 x 2584577, nnz [CPU 135117205, GPU 135117205], CPU-GPU err 1.014792e-16
+AH 2584577 x 2584577, NNZ 135117205, RNZ 52
+# Output file: benchmark_spgemm.out.30
+AH: 681352 x 681352, nnz [CPU 63795454, GPU 63795454], CPU-GPU err 1.495569e-16
+AH 681352 x 681352, NNZ 63795454, RNZ 93
+# Output file: benchmark_spgemm.out.31
+AH: 1526810 x 1526810, nnz [CPU 22113948, GPU 22113948], CPU-GPU err 7.252008e-17
+AH 1526810 x 1526810, NNZ 22113948, RNZ 14
+# Output file: benchmark_spgemm.out.32
+AH: 785055 x 785055, nnz [CPU 17526581, GPU 17526581], CPU-GPU err 1.037485e-16
+AH 785055 x 785055, NNZ 17526581, RNZ 22
+# Output file: benchmark_spgemm.out.33
+AH: 2584577 x 2584577, nnz [CPU 135117205, GPU 135117205], CPU-GPU err 1.014372e-16
+AH 2584577 x 2584577, NNZ 135117205, RNZ 52
+# Output file: benchmark_spgemm.out.34
+AH: 681352 x 681352, nnz [CPU 63795454, GPU 63795454], CPU-GPU err 1.498314e-16
+AH 681352 x 681352, NNZ 63795454, RNZ 93
+# Output file: benchmark_spgemm.out.35
+AH: 1526810 x 1526810, nnz [CPU 22113948, GPU 22113948], CPU-GPU err 7.252372e-17
+AH 1526810 x 1526810, NNZ 22113948, RNZ 14
+# Output file: benchmark_spgemm.out.36
+AH: 785055 x 785055, nnz [CPU 17526581, GPU 17526581], CPU-GPU err 1.037275e-16
+AH 785055 x 785055, NNZ 17526581, RNZ 22
diff --git a/external/hypre/src/test/TEST_bench/benchmark_spgemm.saved.tioga b/external/hypre/src/test/TEST_bench/benchmark_spgemm.saved.tioga
new file mode 100644
index 00000000..9e15f62d
--- /dev/null
+++ b/external/hypre/src/test/TEST_bench/benchmark_spgemm.saved.tioga
@@ -0,0 +1,108 @@
+# Output file: benchmark_spgemm.out.1
+A^2: 2097152 x 2097152, nnz [CPU 51742208, GPU 51742208], CPU-GPU err 0.000000e+00
+B 2097152 x 2097152, NNZ 51742208, RNZ 24
+# Output file: benchmark_spgemm.out.2
+A^2: 2097152 x 2097152, nnz [CPU 254840104, GPU 254840104], CPU-GPU err 0.000000e+00
+B 2097152 x 2097152, NNZ 254840104, RNZ 121
+# Output file: benchmark_spgemm.out.3
+A^2: 1048576 x 1048576, nnz [CPU 13611012, GPU 13611012], CPU-GPU err 0.000000e+00
+B 1048576 x 1048576, NNZ 13611012, RNZ 12
+# Output file: benchmark_spgemm.out.4
+A^2: 1048576 x 1048576, nnz [CPU 26152996, GPU 26152996], CPU-GPU err 0.000000e+00
+B 1048576 x 1048576, NNZ 26152996, RNZ 24
+# Output file: benchmark_spgemm.out.5
+A^2: 2097152 x 2097152, nnz [CPU 51742208, GPU 51742208], CPU-GPU err 0.000000e+00
+B 2097152 x 2097152, NNZ 51742208, RNZ 24
+# Output file: benchmark_spgemm.out.6
+A^2: 2097152 x 2097152, nnz [CPU 254840104, GPU 254840104], CPU-GPU err 0.000000e+00
+B 2097152 x 2097152, NNZ 254840104, RNZ 121
+# Output file: benchmark_spgemm.out.7
+A^2: 1048576 x 1048576, nnz [CPU 13611012, GPU 13611012], CPU-GPU err 0.000000e+00
+B 1048576 x 1048576, NNZ 13611012, RNZ 12
+# Output file: benchmark_spgemm.out.8
+A^2: 1048576 x 1048576, nnz [CPU 26152996, GPU 26152996], CPU-GPU err 0.000000e+00
+B 1048576 x 1048576, NNZ 26152996, RNZ 24
+# Output file: benchmark_spgemm.out.9
+A^2: 2097152 x 2097152, nnz [CPU 51742208, GPU 51742208], CPU-GPU err 0.000000e+00
+B 2097152 x 2097152, NNZ 51742208, RNZ 24
+# Output file: benchmark_spgemm.out.10
+A^2: 2097152 x 2097152, nnz [CPU 254840104, GPU 254840104], CPU-GPU err 0.000000e+00
+B 2097152 x 2097152, NNZ 254840104, RNZ 121
+# Output file: benchmark_spgemm.out.11
+A^2: 1048576 x 1048576, nnz [CPU 13611012, GPU 13611012], CPU-GPU err 0.000000e+00
+B 1048576 x 1048576, NNZ 13611012, RNZ 12
+# Output file: benchmark_spgemm.out.12
+A^2: 1048576 x 1048576, nnz [CPU 26152996, GPU 26152996], CPU-GPU err 0.000000e+00
+B 1048576 x 1048576, NNZ 26152996, RNZ 24
+# Output file: benchmark_spgemm.out.13
+A^2: 2097152 x 2097152, nnz [CPU 51742208, GPU 51742208], CPU-GPU err 0.000000e+00
+B 2097152 x 2097152, NNZ 51742208, RNZ 24
+# Output file: benchmark_spgemm.out.14
+A^2: 512000 x 512000, nnz [CPU 61162984, GPU 61162984], CPU-GPU err 0.000000e+00
+B 512000 x 512000, NNZ 61162984, RNZ 119
+# Output file: benchmark_spgemm.out.15
+A^2: 1048576 x 1048576, nnz [CPU 13611012, GPU 13611012], CPU-GPU err 0.000000e+00
+B 1048576 x 1048576, NNZ 13611012, RNZ 12
+# Output file: benchmark_spgemm.out.16
+A^2: 1048576 x 1048576, nnz [CPU 26152996, GPU 26152996], CPU-GPU err 0.000000e+00
+B 1048576 x 1048576, NNZ 26152996, RNZ 24
+# Output file: benchmark_spgemm.out.17
+Diag(A)*A: 2097152 x 2097152, nnz [CPU 14581760, GPU 14581760], CPU-GPU err 0.000000e+00
+B 2097152 x 2097152, NNZ 14581760, RNZ 6
+# Output file: benchmark_spgemm.out.18
+Diag(A)*A: 2097152 x 2097152, nnz [CPU 55742968, GPU 55742968], CPU-GPU err 0.000000e+00
+B 2097152 x 2097152, NNZ 55742968, RNZ 26
+# Output file: benchmark_spgemm.out.19
+Diag(A)*A: 1048576 x 1048576, nnz [CPU 5238784, GPU 5238784], CPU-GPU err 0.000000e+00
+B 1048576 x 1048576, NNZ 5238784, RNZ 4
+# Output file: benchmark_spgemm.out.20
+Diag(A)*A: 1048576 x 1048576, nnz [CPU 9424900, GPU 9424900], CPU-GPU err 0.000000e+00
+B 1048576 x 1048576, NNZ 9424900, RNZ 8
+# Output file: benchmark_spgemm.out.21
+A^2: 8388608 x 8388608, nnz [CPU 207882752, GPU 207882752], CPU-GPU err 0.000000e+00
+B 8388608 x 8388608, NNZ 207882752, RNZ 24
+# Output file: benchmark_spgemm.out.22
+A^2: 8388608 x 8388608, nnz [CPU 1029030184, GPU 1029030184], CPU-GPU err 0.000000e+00
+B 8388608 x 8388608, NNZ 1029030184, RNZ 122
+# Output file: benchmark_spgemm.out.23
+A^2: 4194304 x 4194304, nnz [CPU 54484996, GPU 54484996], CPU-GPU err 0.000000e+00
+B 4194304 x 4194304, NNZ 54484996, RNZ 12
+# Output file: benchmark_spgemm.out.24
+A^2: 4194304 x 4194304, nnz [CPU 104734756, GPU 104734756], CPU-GPU err 0.000000e+00
+B 4194304 x 4194304, NNZ 104734756, RNZ 24
+# Output file: benchmark_spgemm.out.25
+A^T*A: 8388608 x 8388608, nnz [CPU 207882752, GPU 207882752], CPU-GPU err 0.000000e+00
+B 8388608 x 8388608, NNZ 207882752, RNZ 24
+# Output file: benchmark_spgemm.out.26
+A^T*A: 8388608 x 8388608, nnz [CPU 1029030184, GPU 1029030184], CPU-GPU err 0.000000e+00
+B 8388608 x 8388608, NNZ 1029030184, RNZ 122
+# Output file: benchmark_spgemm.out.27
+A^T*A: 4194304 x 4194304, nnz [CPU 54484996, GPU 54484996], CPU-GPU err 0.000000e+00
+B 4194304 x 4194304, NNZ 54484996, RNZ 12
+# Output file: benchmark_spgemm.out.28
+A^T*A: 4194304 x 4194304, nnz [CPU 104734756, GPU 104734756], CPU-GPU err 0.000000e+00
+B 4194304 x 4194304, NNZ 104734756, RNZ 24
+# Output file: benchmark_spgemm.out.29
+AH: 2583446 x 2583446, nnz [CPU 135091866, GPU 135091866], CPU-GPU err 1.147135e-16
+AH 2583446 x 2583446, NNZ 135091866, RNZ 52
+# Output file: benchmark_spgemm.out.30
+AH: 680505 x 680505, nnz [CPU 63647301, GPU 63647301], CPU-GPU err 1.755166e-16
+AH 680505 x 680505, NNZ 63647301, RNZ 93
+# Output file: benchmark_spgemm.out.31
+AH: 1528997 x 1528997, nnz [CPU 22132459, GPU 22132459], CPU-GPU err 6.243446e-17
+AH 1528997 x 1528997, NNZ 22132459, RNZ 14
+# Output file: benchmark_spgemm.out.32
+AH: 784265 x 784265, nnz [CPU 17497231, GPU 17497231], CPU-GPU err 1.048829e-16
+AH 784265 x 784265, NNZ 17497231, RNZ 22
+# Output file: benchmark_spgemm.out.33
+AH: 2583446 x 2583446, nnz [CPU 135091866, GPU 135091866], CPU-GPU err 1.145884e-16
+AH 2583446 x 2583446, NNZ 135091866, RNZ 52
+# Output file: benchmark_spgemm.out.34
+AH: 680505 x 680505, nnz [CPU 63647301, GPU 63647301], CPU-GPU err 1.759819e-16
+AH 680505 x 680505, NNZ 63647301, RNZ 93
+# Output file: benchmark_spgemm.out.35
+AH: 1528997 x 1528997, nnz [CPU 22132459, GPU 22132459], CPU-GPU err 6.242405e-17
+AH 1528997 x 1528997, NNZ 22132459, RNZ 14
+# Output file: benchmark_spgemm.out.36
+AH: 784265 x 784265, nnz [CPU 17497231, GPU 17497231], CPU-GPU err 1.048567e-16
+AH 784265 x 784265, NNZ 17497231, RNZ 22
diff --git a/external/hypre/src/test/TEST_bench/benchmark_spgemm.sh b/external/hypre/src/test/TEST_bench/benchmark_spgemm.sh
new file mode 100755
index 00000000..6cfdff63
--- /dev/null
+++ b/external/hypre/src/test/TEST_bench/benchmark_spgemm.sh
@@ -0,0 +1,78 @@
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+TNAME=`basename $0 .sh`
+RTOL=$1
+ATOL=$2
+
+#=============================================================================
+# compare with baseline case
+#=============================================================================
+
+FILES="\
+ ${TNAME}.out.1\
+ ${TNAME}.out.2\
+ ${TNAME}.out.3\
+ ${TNAME}.out.4\
+ ${TNAME}.out.5\
+ ${TNAME}.out.6\
+ ${TNAME}.out.7\
+ ${TNAME}.out.8\
+ ${TNAME}.out.9\
+ ${TNAME}.out.10\
+ ${TNAME}.out.11\
+ ${TNAME}.out.12\
+ ${TNAME}.out.13\
+ ${TNAME}.out.14\
+ ${TNAME}.out.15\
+ ${TNAME}.out.16\
+ ${TNAME}.out.17\
+ ${TNAME}.out.18\
+ ${TNAME}.out.19\
+ ${TNAME}.out.20\
+ ${TNAME}.out.21\
+ ${TNAME}.out.22\
+ ${TNAME}.out.23\
+ ${TNAME}.out.24\
+ ${TNAME}.out.25\
+ ${TNAME}.out.26\
+ ${TNAME}.out.27\
+ ${TNAME}.out.28\
+ ${TNAME}.out.29\
+ ${TNAME}.out.30\
+ ${TNAME}.out.31\
+ ${TNAME}.out.32\
+ ${TNAME}.out.33\
+ ${TNAME}.out.34\
+ ${TNAME}.out.35\
+ ${TNAME}.out.36\
+"
+
+for i in $FILES
+do
+  echo "# Output file: $i"
+  tail -2 $i
+done > ${TNAME}.out
+
+for i in $FILES
+do
+  echo "# Output file: $i"
+  setup_time=$(grep -A 1 "Device Parcsr Matrix-by-Matrix" $i | tail -n 1)
+  echo "Device Parcsr Matrix-by-Matrix"${setup_time}
+done > ${TNAME}.perf.out
+
+# Make sure that the output file is reasonable
+RUNCOUNT=`echo $FILES | wc -w`
+OUTCOUNT=`grep "CPU-GPU err" ${TNAME}.out | wc -l`
+if [ "$OUTCOUNT" != "$RUNCOUNT" ]; then
+   echo "Incorrect number of runs in ${TNAME}.out" >&2
+fi
+
+#=============================================================================
+# remove temporary files
+#=============================================================================
+
+rm -f ${TNAME}.testdata*
diff --git a/external/hypre/src/test/TEST_bench/benchmark_struct.jobs b/external/hypre/src/test/TEST_bench/benchmark_struct.jobs
old mode 100644
new mode 100755
index c695b6ff..98e7309f
--- a/external/hypre/src/test/TEST_bench/benchmark_struct.jobs
+++ b/external/hypre/src/test/TEST_bench/benchmark_struct.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -9,20 +9,20 @@
 #=============================================================================
 
 # SMG CG
-mpirun -np 4 ./struct -n 2048 2048 1 -d 2 -solver 10 > benchmark_struct.out.1
+mpirun -np 4 ./struct -n 2048 2048 1 -d 2 -solver 10 -repeats 2 > benchmark_struct.out.1
 
-mpirun -np 4 ./struct -n 3072 3072 1 -d 2 -solver 10 > benchmark_struct.out.2
+mpirun -np 4 ./struct -n 3072 3072 1 -d 2 -solver 10 -repeats 2 > benchmark_struct.out.2
 
-mpirun -np 4 ./struct -n 128 128 128      -solver 10 > benchmark_struct.out.3
+mpirun -np 4 ./struct -n 128 128 128      -solver 10 -repeats 2 > benchmark_struct.out.3
 
-mpirun -np 4 ./struct -n 200 200 200      -solver 10 > benchmark_struct.out.4
+mpirun -np 4 ./struct -n 200 200 200      -solver 10 -repeats 2 > benchmark_struct.out.4
 
 # PFMG CG
-mpirun -np 4 ./struct -n 2048 2048 1 -d 2 -solver 11 > benchmark_struct.out.5
+mpirun -np 4 ./struct -n 2048 2048 1 -d 2 -solver 11 -repeats 2 > benchmark_struct.out.5
 
-mpirun -np 4 ./struct -n 4096 4096 1 -d 2 -solver 11 > benchmark_struct.out.6
+mpirun -np 4 ./struct -n 4096 4096 1 -d 2 -solver 11 -repeats 2 > benchmark_struct.out.6
 
-mpirun -np 4 ./struct -n 256 256 256      -solver 11 > benchmark_struct.out.7
+mpirun -np 4 ./struct -n 256 256 256      -solver 11 -repeats 2 > benchmark_struct.out.7
 
-mpirun -np 4 ./struct -n 300 300 300      -solver 11 > benchmark_struct.out.8
+mpirun -np 4 ./struct -n 300 300 300      -solver 11 -repeats 2 > benchmark_struct.out.8
 
diff --git a/external/hypre/src/test/TEST_bench/benchmark_struct.perf.saved.lassen b/external/hypre/src/test/TEST_bench/benchmark_struct.perf.saved.lassen
index eff61569..73f95744 100644
--- a/external/hypre/src/test/TEST_bench/benchmark_struct.perf.saved.lassen
+++ b/external/hypre/src/test/TEST_bench/benchmark_struct.perf.saved.lassen
@@ -1,24 +1,24 @@
 # Output file: benchmark_struct.out.1
-PCG Setup wall clock time = 0.160423 seconds
-PCG Solve wall clock time = 0.611084 seconds
+PCG Setup wall clock time = 0.120866 seconds
+PCG Solve wall clock time = 0.577228 seconds
 # Output file: benchmark_struct.out.2
-PCG Setup wall clock time = 0.205320 seconds
-PCG Solve wall clock time = 0.816661 seconds
+PCG Setup wall clock time = 0.139227 seconds
+PCG Solve wall clock time = 0.769984 seconds
 # Output file: benchmark_struct.out.3
-PCG Setup wall clock time = 1.361077 seconds
-PCG Solve wall clock time = 6.217676 seconds
+PCG Setup wall clock time = 1.197938 seconds
+PCG Solve wall clock time = 6.011690 seconds
 # Output file: benchmark_struct.out.4
-PCG Setup wall clock time = 2.124761 seconds
-PCG Solve wall clock time = 9.681350 seconds
+PCG Setup wall clock time = 1.791265 seconds
+PCG Solve wall clock time = 9.300076 seconds
 # Output file: benchmark_struct.out.5
-PCG Setup wall clock time = 0.036715 seconds
-PCG Solve wall clock time = 0.122633 seconds
+PCG Setup wall clock time = 0.012325 seconds
+PCG Solve wall clock time = 0.138208 seconds
 # Output file: benchmark_struct.out.6
-PCG Setup wall clock time = 0.219045 seconds
-PCG Solve wall clock time = 0.331478 seconds
+PCG Setup wall clock time = 0.019830 seconds
+PCG Solve wall clock time = 0.313756 seconds
 # Output file: benchmark_struct.out.7
-PCG Setup wall clock time = 0.250209 seconds
-PCG Solve wall clock time = 0.429207 seconds
+PCG Setup wall clock time = 0.050781 seconds
+PCG Solve wall clock time = 0.408700 seconds
 # Output file: benchmark_struct.out.8
-PCG Setup wall clock time = 0.249751 seconds
-PCG Solve wall clock time = 0.654347 seconds
+PCG Setup wall clock time = 0.069028 seconds
+PCG Solve wall clock time = 0.629209 seconds
diff --git a/external/hypre/src/test/TEST_bench/benchmark_struct.perf.saved.ray b/external/hypre/src/test/TEST_bench/benchmark_struct.perf.saved.ray
deleted file mode 100644
index e286f477..00000000
--- a/external/hypre/src/test/TEST_bench/benchmark_struct.perf.saved.ray
+++ /dev/null
@@ -1,24 +0,0 @@
-# Output file: benchmark_struct.out.1
-PCG Setup wall clock time = 0.117209 seconds
-PCG Solve wall clock time = 0.512375 seconds
-# Output file: benchmark_struct.out.2
-PCG Setup wall clock time = 0.144187 seconds
-PCG Solve wall clock time = 0.752631 seconds
-# Output file: benchmark_struct.out.3
-PCG Setup wall clock time = 1.032979 seconds
-PCG Solve wall clock time = 4.858539 seconds
-# Output file: benchmark_struct.out.4
-PCG Setup wall clock time = 1.623183 seconds
-PCG Solve wall clock time = 7.950859 seconds
-# Output file: benchmark_struct.out.5
-PCG Setup wall clock time = 0.021501 seconds
-PCG Solve wall clock time = 0.144316 seconds
-# Output file: benchmark_struct.out.6
-PCG Setup wall clock time = 0.049996 seconds
-PCG Solve wall clock time = 0.445686 seconds
-# Output file: benchmark_struct.out.7
-PCG Setup wall clock time = 0.084665 seconds
-PCG Solve wall clock time = 0.588257 seconds
-# Output file: benchmark_struct.out.8
-PCG Setup wall clock time = 0.107986 seconds
-PCG Solve wall clock time = 0.917126 seconds
diff --git a/external/hypre/src/test/TEST_bench/benchmark_struct.perf.saved.tioga b/external/hypre/src/test/TEST_bench/benchmark_struct.perf.saved.tioga
new file mode 100644
index 00000000..7703d652
--- /dev/null
+++ b/external/hypre/src/test/TEST_bench/benchmark_struct.perf.saved.tioga
@@ -0,0 +1,24 @@
+# Output file: benchmark_struct.out.1
+PCG Setup wall clock time = 0.091983 seconds
+PCG Solve wall clock time = 0.421361 seconds
+# Output file: benchmark_struct.out.2
+PCG Setup wall clock time = 0.114076 seconds
+PCG Solve wall clock time = 0.568872 seconds
+# Output file: benchmark_struct.out.3
+PCG Setup wall clock time = 0.862025 seconds
+PCG Solve wall clock time = 4.294343 seconds
+# Output file: benchmark_struct.out.4
+PCG Setup wall clock time = 1.412173 seconds
+PCG Solve wall clock time = 7.285773 seconds
+# Output file: benchmark_struct.out.5
+PCG Setup wall clock time = 0.012046 seconds
+PCG Solve wall clock time = 0.095558 seconds
+# Output file: benchmark_struct.out.6
+PCG Setup wall clock time = 0.016907 seconds
+PCG Solve wall clock time = 0.241860 seconds
+# Output file: benchmark_struct.out.7
+PCG Setup wall clock time = 0.044571 seconds
+PCG Solve wall clock time = 0.333274 seconds
+# Output file: benchmark_struct.out.8
+PCG Setup wall clock time = 0.071390 seconds
+PCG Solve wall clock time = 0.519030 seconds
diff --git a/external/hypre/src/test/TEST_bench/benchmark_struct.saved.ray b/external/hypre/src/test/TEST_bench/benchmark_struct.saved.tioga
similarity index 100%
rename from external/hypre/src/test/TEST_bench/benchmark_struct.saved.ray
rename to external/hypre/src/test/TEST_bench/benchmark_struct.saved.tioga
diff --git a/external/hypre/src/test/TEST_bench/benchmark_struct.sh b/external/hypre/src/test/TEST_bench/benchmark_struct.sh
old mode 100644
new mode 100755
index 749db9c9..d0ba7ba5
--- a/external/hypre/src/test/TEST_bench/benchmark_struct.sh
+++ b/external/hypre/src/test/TEST_bench/benchmark_struct.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -45,21 +45,6 @@ if [ "$OUTCOUNT" != "$RUNCOUNT" ]; then
    echo "Incorrect number of runs in ${TNAME}.out" >&2
 fi
 
-# Check performance
-HOST=`hostname`
-case $HOST in
-   lassen*)
-      SavePerfExt="saved.lassen"
-      rtol=0.15
-      ;;
-   *) SavePerfExt=""
-      ;;
-esac
-
-if [ -n "$SavePerfExt" ]; then
-   ../runcheck.sh $TNAME.perf.out $TNAME.perf.$SavePerfExt $rtol >&2
-fi
-
 #=============================================================================
 # remove temporary files
 #=============================================================================
diff --git a/external/hypre/src/test/TEST_error/error.jobs b/external/hypre/src/test/TEST_error/error.jobs
new file mode 100755
index 00000000..2edd62aa
--- /dev/null
+++ b/external/hypre/src/test/TEST_error/error.jobs
@@ -0,0 +1,22 @@
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+#=============================================================================
+# These runs generate errors
+#=============================================================================
+
+mpirun -np 2 ./ij -solver 2 -max_iter 2                         > error.out.0
+mpirun -np 2 ./ij -solver 1 -mg_max_iter 2                      > error.out.1
+mpirun -np 2 ./ij -solver 1 -mg_max_iter 2 -difconv -c 0 0 0    > error.out.2
+mpirun -np 2 ./ij -solver 1 -mg_max_iter 2 -rlx 0 -w -1.0       > error.out.3
+mpirun -np 2 ./ij -solver 0 -mg_max_iter 2                      > error.out.4
+
+# Test the HYPRE_GetErrorMessages() and HYPRE_SetPrintErrorVerbosity() routines
+mpirun -np 2 ./ij -solver 1 -mg_max_iter 2 -rlx 0 -w -1.0                 > error.out.10
+mpirun -np 2 ./ij -solver 0 -mg_max_iter 1 -ns 0 -nc 2                    > error.out.11
+mpirun -np 2 ./ij -solver 1 -mg_max_iter 2 -rlx 0 -w -1.0 -test_error 1   > error.out.15
+mpirun -np 2 ./ij -solver 0 -mg_max_iter 1 -ns 0 -nc 2    -test_error 1   > error.out.16
+
diff --git a/external/hypre/src/test/TEST_error/error.saved b/external/hypre/src/test/TEST_error/error.saved
new file mode 100644
index 00000000..56e0f3c0
--- /dev/null
+++ b/external/hypre/src/test/TEST_error/error.saved
@@ -0,0 +1,97 @@
+# Output file: error.out.0
+
+
+Iters       ||r||_2     conv.rate  ||r||_2/||b||_2
+-----    ------------   ---------  ------------ 
+    1    3.651484e+01    1.154701    1.154701e+00
+    2    2.779522e+01    0.761203    8.789620e-01
+# Output file: error.out.1
+
+
+Iters       ||r||_2     conv.rate  ||r||_2/||b||_2
+-----    ------------   ---------  ------------ 
+    1    9.666492e+00    0.305681    3.056813e-01
+    2    6.025557e-01    0.062334    1.905448e-02
+# Output file: error.out.2
+<b,b>: 1.000000e+03
+
+
+Iters       ||r||_2     conv.rate  ||r||_2/||b||_2
+-----    ------------   ---------  ------------ 
+    1    1.995213e+00    0.063094    6.309416e-02
+# Output file: error.out.3
+
+
+Iters       ||r||_2     conv.rate  ||r||_2/||b||_2
+-----    ------------   ---------  ------------ 
+    1    5.298880e+01    1.675653    1.675653e+00
+    2    5.298880e+01    1.000000    1.675653e+00
+# Output file: error.out.4
+ Average Convergence Factor = 0.235234
+
+     Complexity:    grid = 1.555000
+                operator = 2.667344
+                   cycle = 5.332187
+
+# Output file: error.out.10
+
+
+Iters       ||r||_2     conv.rate  ||r||_2/||b||_2
+-----    ------------   ---------  ------------ 
+    1    5.298880e+01    1.675653    1.675653e+00
+    2    5.298880e+01    1.000000    1.675653e+00
+# Output file: error.out.11
+ Average Convergence Factor = 1.379821
+
+     Complexity:    grid = 1.555000
+                operator = 2.667344
+                   cycle = 5.332187
+
+# Output file: error.out.15
+
+
+Iters       ||r||_2     conv.rate  ||r||_2/||b||_2
+-----    ------------   ---------  ------------ 
+    1    5.298880e+01    1.675653    1.675653e+00
+    2    5.298880e+01    1.000000    1.675653e+00
+# Output file: error.out.16
+ Average Convergence Factor = 1.379821
+
+     Complexity:    grid = 1.555000
+                operator = 2.667344
+                   cycle = 5.332187
+
+0: hypre error in file "par_amg.c", line 2025, error code = 20
+0: hypre error in file "par_amg_solve.c", line 341, error code = 256
+0: hypre error in file "par_amg_solve.c", line 341, error code = 256
+0: hypre error in file "par_relax.c", line 753, error code = 1 - Hybrid GS relaxation doesn't support multicomponent vectors
+0: hypre error in file "par_relax.c", line 753, error code = 1 - Hybrid GS relaxation doesn't support multicomponent vectors
+0: hypre error in file "par_relax.c", line 753, error code = 1 - Hybrid GS relaxation doesn't support multicomponent vectors
+0: hypre error in file "par_relax.c", line 753, error code = 1 - Hybrid GS relaxation doesn't support multicomponent vectors
+0: hypre error in file "par_relax.c", line 753, error code = 1 - Hybrid GS relaxation doesn't support multicomponent vectors
+0: hypre error in file "par_relax.c", line 753, error code = 1 - Hybrid GS relaxation doesn't support multicomponent vectors
+0: hypre error in file "par_relax.c", line 753, error code = 1 - Hybrid GS relaxation doesn't support multicomponent vectors
+0: hypre error in file "par_relax.c", line 753, error code = 1 - Hybrid GS relaxation doesn't support multicomponent vectors
+0: hypre error in file "par_relax.c", line 753, error code = 1 - Hybrid GS relaxation doesn't support multicomponent vectors
+0: hypre error in file "par_relax.c", line 753, error code = 1 - Hybrid GS relaxation doesn't support multicomponent vectors
+0: hypre error in file "par_relax.c", line 753, error code = 1 - Hybrid GS relaxation doesn't support multicomponent vectors
+0: hypre error in file "par_relax.c", line 753, error code = 1 - Hybrid GS relaxation doesn't support multicomponent vectors
+0: hypre error in file "par_relax.c", line 753, error code = 1 - Hybrid GS relaxation doesn't support multicomponent vectors
+0: hypre error in file "par_relax.c", line 753, error code = 1 - Hybrid GS relaxation doesn't support multicomponent vectors
+0: hypre error in file "par_relax.c", line 753, error code = 1 - Hybrid GS relaxation doesn't support multicomponent vectors
+0: hypre error in file "par_relax.c", line 753, error code = 1 - Hybrid GS relaxation doesn't support multicomponent vectors
+0: hypre error in file "pcg.c", line 851, error code = 256 - Negative or zero gamma value in PCG
+0: hypre error in file "pcg.c", line 851, error code = 256 - Negative or zero gamma value in PCG
+0: hypre error in file "pcg.c", line 851, error code = 256 - Negative or zero gamma value in PCG
+0: hypre error in file "pcg.c", line 992, error code = 256 - Reached max iterations 2 in PCG before convergence
+0: hypre error in file "pcg.c", line 992, error code = 256 - Reached max iterations 2 in PCG before convergence
+0: hypre error in file "pcg.c", line 992, error code = 256 - Reached max iterations 2 in PCG before convergence
+0: hypre error in file "pcg.c", line 992, error code = 256 - Reached max iterations 2 in PCG before convergence
+1: hypre error in file "par_relax.c", line 753, error code = 1 - Hybrid GS relaxation doesn't support multicomponent vectors
+1: hypre error in file "par_relax.c", line 753, error code = 1 - Hybrid GS relaxation doesn't support multicomponent vectors
+1: hypre error in file "par_relax.c", line 753, error code = 1 - Hybrid GS relaxation doesn't support multicomponent vectors
+1: hypre error in file "par_relax.c", line 753, error code = 1 - Hybrid GS relaxation doesn't support multicomponent vectors
+1: hypre error in file "par_relax.c", line 753, error code = 1 - Hybrid GS relaxation doesn't support multicomponent vectors
+1: hypre error in file "par_relax.c", line 753, error code = 1 - Hybrid GS relaxation doesn't support multicomponent vectors
+1: hypre error in file "par_relax.c", line 753, error code = 1 - Hybrid GS relaxation doesn't support multicomponent vectors
+1: hypre error in file "par_relax.c", line 753, error code = 1 - Hybrid GS relaxation doesn't support multicomponent vectors
diff --git a/external/hypre/src/test/TEST_error/error.saved.lassen b/external/hypre/src/test/TEST_error/error.saved.lassen
new file mode 100644
index 00000000..dfbd1791
--- /dev/null
+++ b/external/hypre/src/test/TEST_error/error.saved.lassen
@@ -0,0 +1,71 @@
+# Output file: error.out.0
+
+
+Iters       ||r||_2     conv.rate  ||r||_2/||b||_2
+-----    ------------   ---------  ------------ 
+    1    3.651484e+01    1.154701    1.154701e+00
+    2    2.779522e+01    0.761203    8.789620e-01
+# Output file: error.out.1
+
+
+Iters       ||r||_2     conv.rate  ||r||_2/||b||_2
+-----    ------------   ---------  ------------ 
+    1    1.382238e+01    0.437102    4.371021e-01
+    2    2.890219e+00    0.209097    9.139676e-02
+# Output file: error.out.2
+<b,b>: 1.000000e+03
+
+
+Iters       ||r||_2     conv.rate  ||r||_2/||b||_2
+-----    ------------   ---------  ------------ 
+    1    1.880957e+01    0.594811    5.948108e-01
+# Output file: error.out.3
+
+
+Iters       ||r||_2     conv.rate  ||r||_2/||b||_2
+-----    ------------   ---------  ------------ 
+    1    5.536410e+01    1.750767    1.750767e+00
+    2    5.536410e+01    1.000000    1.750767e+00
+# Output file: error.out.4
+ Average Convergence Factor = 0.388883
+
+     Complexity:    grid = 1.427000
+                operator = 2.492344
+                   cycle = 4.982188
+
+# Output file: error.out.10
+
+
+Iters       ||r||_2     conv.rate  ||r||_2/||b||_2
+-----    ------------   ---------  ------------ 
+    1    5.536410e+01    1.750767    1.750767e+00
+    2    5.536410e+01    1.000000    1.750767e+00
+# Output file: error.out.11
+ Average Convergence Factor = 0.397074
+
+     Complexity:    grid = 1.427000
+                operator = 2.492344
+                   cycle = 4.982188
+
+# Output file: error.out.15
+
+
+Iters       ||r||_2     conv.rate  ||r||_2/||b||_2
+-----    ------------   ---------  ------------ 
+    1    5.536410e+01    1.750767    1.750767e+00
+    2    5.536410e+01    1.000000    1.750767e+00
+# Output file: error.out.16
+ Average Convergence Factor = 0.397074
+
+     Complexity:    grid = 1.427000
+                operator = 2.492344
+                   cycle = 4.982188
+
+0: hypre error in file "par_amg.c", line 2025, error code = 20
+0: hypre error in file "par_amg_solve.c", line 341, error code = 256
+0: hypre error in file "par_amg_solve.c", line 341, error code = 256
+0: hypre error in file "pcg.c", line 851, error code = 256 - Negative or zero gamma value in PCG
+0: hypre error in file "pcg.c", line 992, error code = 256 - Reached max iterations 2 in PCG before convergence
+0: hypre error in file "pcg.c", line 992, error code = 256 - Reached max iterations 2 in PCG before convergence
+0: hypre error in file "pcg.c", line 992, error code = 256 - Reached max iterations 2 in PCG before convergence
+0: hypre error in file "pcg.c", line 992, error code = 256 - Reached max iterations 2 in PCG before convergence
diff --git a/external/hypre/src/test/TEST_error/error.sh b/external/hypre/src/test/TEST_error/error.sh
new file mode 100755
index 00000000..f6a900ae
--- /dev/null
+++ b/external/hypre/src/test/TEST_error/error.sh
@@ -0,0 +1,43 @@
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+TNAME=`basename $0 .sh`
+RTOL=$1
+ATOL=$2
+
+#=============================================================================
+# compare with baseline case
+#=============================================================================
+
+FILES="\
+ ${TNAME}.out.0\
+ ${TNAME}.out.1\
+ ${TNAME}.out.2\
+ ${TNAME}.out.3\
+ ${TNAME}.out.4\
+ ${TNAME}.out.10\
+ ${TNAME}.out.11\
+ ${TNAME}.out.15\
+ ${TNAME}.out.16\
+"
+
+for i in $FILES
+do
+  echo "# Output file: $i"
+  tail -21 $i | head -6
+done > ${TNAME}.out
+
+# Remove the "hypre error" lines from '.err' file and append them to '.out'
+mv ${TNAME}.err ${TNAME}.tmp
+egrep    "hypre error" ${TNAME}.tmp | sort >> ${TNAME}.out
+egrep -v "hypre error" ${TNAME}.tmp        >  ${TNAME}.err
+
+#=============================================================================
+# remove temporary files
+#=============================================================================
+
+rm -f ${TNAME}.testdata*
+rm -f ${TNAME}.tmp
diff --git a/external/hypre/src/test/TEST_examples/bigint.jobs b/external/hypre/src/test/TEST_examples/bigint.jobs
old mode 100644
new mode 100755
index 9ce12ac3..55084409
--- a/external/hypre/src/test/TEST_examples/bigint.jobs
+++ b/external/hypre/src/test/TEST_examples/bigint.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_examples/bigint.saved b/external/hypre/src/test/TEST_examples/bigint.saved
index 9fd2ce36..63fb6e33 100644
--- a/external/hypre/src/test/TEST_examples/bigint.saved
+++ b/external/hypre/src/test/TEST_examples/bigint.saved
@@ -9,3 +9,4 @@ Final Relative Residual Norm = 6.309891e-09
 
 Iterations = 7
 Final Relative Residual Norm = 4.81542e-07
+
diff --git a/external/hypre/src/test/TEST_examples/bigint.sh b/external/hypre/src/test/TEST_examples/bigint.sh
old mode 100644
new mode 100755
index 3383a615..ccfab3d0
--- a/external/hypre/src/test/TEST_examples/bigint.sh
+++ b/external/hypre/src/test/TEST_examples/bigint.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_examples/complex.jobs b/external/hypre/src/test/TEST_examples/complex.jobs
old mode 100644
new mode 100755
index 3904b791..ad564611
--- a/external/hypre/src/test/TEST_examples/complex.jobs
+++ b/external/hypre/src/test/TEST_examples/complex.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_examples/complex.sh b/external/hypre/src/test/TEST_examples/complex.sh
old mode 100644
new mode 100755
index 7e4b5b02..d07a6312
--- a/external/hypre/src/test/TEST_examples/complex.sh
+++ b/external/hypre/src/test/TEST_examples/complex.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_examples/default.jobs b/external/hypre/src/test/TEST_examples/default.jobs
old mode 100644
new mode 100755
index 4df8d6f4..9907a3e6
--- a/external/hypre/src/test/TEST_examples/default.jobs
+++ b/external/hypre/src/test/TEST_examples/default.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_examples/default.saved b/external/hypre/src/test/TEST_examples/default.saved
index 02da5792..b443f0b7 100644
--- a/external/hypre/src/test/TEST_examples/default.saved
+++ b/external/hypre/src/test/TEST_examples/default.saved
@@ -87,3 +87,4 @@ Final Relative Residual Norm = 2.7253e-07
 
 Iterations = 7
 Final Relative Residual Norm = 4.81542e-07
+
diff --git a/external/hypre/src/test/TEST_examples/default.sh b/external/hypre/src/test/TEST_examples/default.sh
old mode 100644
new mode 100755
index 3f76cb86..de64a25d
--- a/external/hypre/src/test/TEST_examples/default.sh
+++ b/external/hypre/src/test/TEST_examples/default.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_examples/fortran_examples.jobs b/external/hypre/src/test/TEST_examples/fortran_examples.jobs
old mode 100644
new mode 100755
index 00188a95..d13be0df
--- a/external/hypre/src/test/TEST_examples/fortran_examples.jobs
+++ b/external/hypre/src/test/TEST_examples/fortran_examples.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_examples/fortran_examples.sh b/external/hypre/src/test/TEST_examples/fortran_examples.sh
old mode 100644
new mode 100755
index 9c21c1de..9409d51c
--- a/external/hypre/src/test/TEST_examples/fortran_examples.sh
+++ b/external/hypre/src/test/TEST_examples/fortran_examples.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_examples/gpu.jobs b/external/hypre/src/test/TEST_examples/gpu.jobs
old mode 100644
new mode 100755
index 3d80562a..36074efc
--- a/external/hypre/src/test/TEST_examples/gpu.jobs
+++ b/external/hypre/src/test/TEST_examples/gpu.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -18,7 +18,7 @@ mpirun -np 16 ./ex4 -n 33 -solver 10 -K 3 -B 0 -C 1 -UO 2 -F 4 > gpu.out.4
 
 mpirun -np 4 ./ex5 > gpu.out.5
 
-# mpirun -np 4 ./ex5f > gpu.out.5f
+mpirun -np 4 ./ex5f > gpu.out.5f
 
 mpirun -np 2 ./ex6 > gpu.out.6
 
@@ -32,7 +32,7 @@ mpirun -np 16 ./ex9 -n 33 -solver 0 -v 1 1 > gpu.out.9
 
 mpirun -np 2 ./ex12 -pfmg > gpu.out.12
 
-# mpirun -np 2 ./ex12f -pfmg > gpu.out.12f
+mpirun -np 2 ./ex12f -pfmg > gpu.out.12f
 
 mpirun -np 6 ./ex13 -n 10 > gpu.out.13
 
diff --git a/external/hypre/src/test/TEST_examples/gpu.saved.lassen b/external/hypre/src/test/TEST_examples/gpu.saved.lassen
index dff1f699..e53456de 100644
--- a/external/hypre/src/test/TEST_examples/gpu.saved.lassen
+++ b/external/hypre/src/test/TEST_examples/gpu.saved.lassen
@@ -25,9 +25,15 @@ Final Relative Residual Norm = 5.961443e-08
 # Output file: gpu.out.5
 
 
-Iterations = 7
-Final Relative Residual Norm = 8.839175e-09
+Iterations = 6
+Final Relative Residual Norm = 8.921046e-08
+
+# Output file: gpu.out.5f
 
+ 
+ Iterations =  6
+ Final Relative Residual Norm =   8.92104626E-08
+ 
 # Output file: gpu.out.6
     1    3.503257e-02    0.004729    4.728807e-03
     2    1.386843e-04    0.003959    1.872005e-05
@@ -58,15 +64,21 @@ Final Relative Residual Norm = 6.57147e-07
     4    1.544291e-06    0.023226    2.725642e-07
 
 
+# Output file: gpu.out.12f
+    2    3.255341e-03    0.014358    5.745609e-04
+    3    6.649011e-05    0.020425    1.173537e-05
+    4    1.544291e-06    0.023226    2.725642e-07
+
+
 # Output file: gpu.out.13
 
 
 Iterations = 11
-Final Relative Residual Norm = 7.02512e-07
+Final Relative Residual Norm = 9.59155e-07
 
 # Output file: gpu.out.14
 
 
 Iterations = 11
-Final Relative Residual Norm = 7.02512e-07
+Final Relative Residual Norm = 9.59155e-07
 
diff --git a/external/hypre/src/test/TEST_examples/gpu.saved.ray b/external/hypre/src/test/TEST_examples/gpu.saved.ray
deleted file mode 100644
index 8f8c3d2a..00000000
--- a/external/hypre/src/test/TEST_examples/gpu.saved.ray
+++ /dev/null
@@ -1,78 +0,0 @@
-# Output file: gpu.out.1
-   11    5.329671e-05    0.179526    1.256215e-05
-   12    7.308483e-06    0.137128    1.722626e-06
-   13    7.411552e-07    0.101410    1.746920e-07
-
-
-# Output file: gpu.out.2
-    1    3.503257e-02    0.004729    4.728807e-03
-    2    1.386843e-04    0.003959    1.872005e-05
-    3    8.429961e-07    0.006079    1.137903e-07
-
-
-# Output file: gpu.out.3
-
-
-Iterations = 5
-Final Relative Residual Norm = 9.21374e-08
-
-# Output file: gpu.out.4
-
-
-Iterations = 6
-Final Relative Residual Norm = 5.961443e-08
-
-# Output file: gpu.out.5
-
-
-Iterations = 7
-Final Relative Residual Norm = 8.839174e-09
-
-# Output file: gpu.out.6
-    1    3.503257e-02    0.004729    4.728807e-03
-    2    1.386843e-04    0.003959    1.872005e-05
-    3    8.429961e-07    0.006079    1.137903e-07
-
-
-# Output file: gpu.out.7
-
-
-Iterations = 6
-Final Relative Residual Norm = 5.961443e-08
-
-# Output file: gpu.out.8
-    7    1.315332e-04    0.128961    2.233203e-05
-    8    1.350294e-05    0.102658    2.292562e-06
-    9    4.148659e-06    0.307241    7.043691e-07
-
-
-# Output file: gpu.out.9
-
-
-Iterations = 9
-Final Relative Residual Norm = 6.57147e-07
-
-# Output file: gpu.out.12
-    2    3.255341e-03    0.014358    5.745609e-04
-    3    6.649011e-05    0.020425    1.173537e-05
-    4    1.544291e-06    0.023226    2.725642e-07
-
-
-# Output file: gpu.out.13
-
-
-Iterations = 11
-Final Relative Residual Norm = 7.02512e-07
-
-# Output file: gpu.out.14
-
-
-Iterations = 11
-Final Relative Residual Norm = 7.02512e-07
-
-# Output file: gpu.out.15
-
-
-#Iterations = 6
-#Final Relative Residual Norm = 7.75826e-07
-
diff --git a/external/hypre/src/test/TEST_examples/gpu.sh b/external/hypre/src/test/TEST_examples/gpu.sh
old mode 100644
new mode 100755
index 8d303c1f..1397dea7
--- a/external/hypre/src/test/TEST_examples/gpu.sh
+++ b/external/hypre/src/test/TEST_examples/gpu.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -16,11 +16,13 @@ FILES="\
  ${TNAME}.out.3\
  ${TNAME}.out.4\
  ${TNAME}.out.5\
+ ${TNAME}.out.5f\
  ${TNAME}.out.6\
  ${TNAME}.out.7\
  ${TNAME}.out.8\
  ${TNAME}.out.9\
  ${TNAME}.out.12\
+ ${TNAME}.out.12f\
  ${TNAME}.out.13\
  ${TNAME}.out.14\
 "
@@ -34,7 +36,7 @@ do
 done > ${TNAME}.out
 
 # Make sure that the output file is reasonable
-RUNCOUNT=7
+RUNCOUNT=8
 OUTCOUNT=`grep "Iterations" ${TNAME}.out | wc -l`
 if [ "$OUTCOUNT" != "$RUNCOUNT" ]; then
    echo "Incorrect number of runs in ${TNAME}.out" >&2
diff --git a/external/hypre/src/test/TEST_examples/maxdim.jobs b/external/hypre/src/test/TEST_examples/maxdim.jobs
old mode 100644
new mode 100755
index 9caff4bc..3cc39c41
--- a/external/hypre/src/test/TEST_examples/maxdim.jobs
+++ b/external/hypre/src/test/TEST_examples/maxdim.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_examples/maxdim.sh b/external/hypre/src/test/TEST_examples/maxdim.sh
old mode 100644
new mode 100755
index 28d3e338..5178e97a
--- a/external/hypre/src/test/TEST_examples/maxdim.sh
+++ b/external/hypre/src/test/TEST_examples/maxdim.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_fac/3lev.in b/external/hypre/src/test/TEST_fac/3lev.in
index 52edb010..d1399042 100644
--- a/external/hypre/src/test/TEST_fac/3lev.in
+++ b/external/hypre/src/test/TEST_fac/3lev.in
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_fac/3lev_multibox.in b/external/hypre/src/test/TEST_fac/3lev_multibox.in
index d4598ff6..fbd33db2 100644
--- a/external/hypre/src/test/TEST_fac/3lev_multibox.in
+++ b/external/hypre/src/test/TEST_fac/3lev_multibox.in
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_fac/4lev.in b/external/hypre/src/test/TEST_fac/4lev.in
index 736db1fc..45af06ae 100644
--- a/external/hypre/src/test/TEST_fac/4lev.in
+++ b/external/hypre/src/test/TEST_fac/4lev.in
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_fac/5lev.in b/external/hypre/src/test/TEST_fac/5lev.in
index 6b629076..2c04e7cb 100644
--- a/external/hypre/src/test/TEST_fac/5lev.in
+++ b/external/hypre/src/test/TEST_fac/5lev.in
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_fac/6lev.in b/external/hypre/src/test/TEST_fac/6lev.in
index 390469f3..4a553f0c 100644
--- a/external/hypre/src/test/TEST_fac/6lev.in
+++ b/external/hypre/src/test/TEST_fac/6lev.in
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_fac/7lev.in b/external/hypre/src/test/TEST_fac/7lev.in
index 867235d3..b01a036e 100644
--- a/external/hypre/src/test/TEST_fac/7lev.in
+++ b/external/hypre/src/test/TEST_fac/7lev.in
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_fac/sstruct_fac.jobs b/external/hypre/src/test/TEST_fac/sstruct_fac.jobs
old mode 100644
new mode 100755
index 3ed8807e..d3ae37e7
--- a/external/hypre/src/test/TEST_fac/sstruct_fac.jobs
+++ b/external/hypre/src/test/TEST_fac/sstruct_fac.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh 
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash 
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -17,11 +17,13 @@ mpirun -np 2 ./sstruct_fac -in 3lev.in -solver 99 -P 2 1 1 > sstruct_fac.out.1
 # mpirun -np 6 ./sstruct_fac -in 3lev_multibox.in -solver 99 -P 2 3 1 \
 #  > sstruct_fac.out.3
 
-mpirun -np 1 ./sstruct_fac -in 4lev.in -solver 99 -r 1 2 2 > sstruct_fac.out.4
-mpirun -np 4 ./sstruct_fac -in 4lev.in -solver 99 -P 1 2 2 > sstruct_fac.out.5
+# RDF: AddFEMBoxValues() breaks these for some reason
+# mpirun -np 1 ./sstruct_fac -in 4lev.in -solver 99 -r 1 2 2 > sstruct_fac.out.4
+# mpirun -np 4 ./sstruct_fac -in 4lev.in -solver 99 -P 1 2 2 > sstruct_fac.out.5
 
-mpirun -np 1 ./sstruct_fac -in 5lev.in -solver 99 -r 1 5 1 > sstruct_fac.out.6
-mpirun -np 5 ./sstruct_fac -in 5lev.in -solver 99 -P 1 5 1 > sstruct_fac.out.7
+# RDF: AddFEMBoxValues() breaks these for some reason
+# mpirun -np 1 ./sstruct_fac -in 5lev.in -solver 99 -r 1 5 1 > sstruct_fac.out.6
+# mpirun -np 5 ./sstruct_fac -in 5lev.in -solver 99 -P 1 5 1 > sstruct_fac.out.7
 
 # RLU: For the new memory model, these two examples does not work right now
 #mpirun -np 1 ./sstruct_fac -in 6lev.in -solver 99 -r 2 1 2 > sstruct_fac.out.8
diff --git a/external/hypre/src/test/TEST_fac/sstruct_fac.saved b/external/hypre/src/test/TEST_fac/sstruct_fac.saved
index 81f48a4e..58746e20 100644
--- a/external/hypre/src/test/TEST_fac/sstruct_fac.saved
+++ b/external/hypre/src/test/TEST_fac/sstruct_fac.saved
@@ -6,22 +6,6 @@ Final Relative Residual Norm = 9.546812e-07
 Iterations = 14
 Final Relative Residual Norm = 9.546812e-07
 
-# Output file: sstruct_fac.out.4
-Iterations = 16
-Final Relative Residual Norm = 4.466155e-07
-
-# Output file: sstruct_fac.out.5
-Iterations = 16
-Final Relative Residual Norm = 4.466155e-07
-
-# Output file: sstruct_fac.out.6
-Iterations = 16
-Final Relative Residual Norm = 6.294807e-07
-
-# Output file: sstruct_fac.out.7
-Iterations = 16
-Final Relative Residual Norm = 6.294807e-07
-
 # Output file: sstruct_fac.out.10
 Iterations = 14
 Final Relative Residual Norm = 7.049377e-07
diff --git a/external/hypre/src/test/TEST_fac/sstruct_fac.sh b/external/hypre/src/test/TEST_fac/sstruct_fac.sh
old mode 100644
new mode 100755
index b4865108..ad4f0f74
--- a/external/hypre/src/test/TEST_fac/sstruct_fac.sh
+++ b/external/hypre/src/test/TEST_fac/sstruct_fac.sh
@@ -1,5 +1,5 @@
-#!/bin/sh 
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash 
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -23,15 +23,15 @@ diff ${TNAME}.testdata ${TNAME}.testdata.temp >&2
 
 #=============================================================================
 
-tail -3 ${TNAME}.out.4 > ${TNAME}.testdata
-tail -3 ${TNAME}.out.5 > ${TNAME}.testdata.temp
-diff ${TNAME}.testdata ${TNAME}.testdata.temp >&2
+# tail -3 ${TNAME}.out.4 > ${TNAME}.testdata
+# tail -3 ${TNAME}.out.5 > ${TNAME}.testdata.temp
+# diff ${TNAME}.testdata ${TNAME}.testdata.temp >&2
 
 #=============================================================================
 
-tail -3 ${TNAME}.out.6 > ${TNAME}.testdata
-tail -3 ${TNAME}.out.7 > ${TNAME}.testdata.temp
-diff ${TNAME}.testdata ${TNAME}.testdata.temp >&2
+# tail -3 ${TNAME}.out.6 > ${TNAME}.testdata
+# tail -3 ${TNAME}.out.7 > ${TNAME}.testdata.temp
+# diff ${TNAME}.testdata ${TNAME}.testdata.temp >&2
 
 #=============================================================================
 
@@ -52,15 +52,15 @@ diff ${TNAME}.testdata ${TNAME}.testdata.temp >&2
 FILES="\
  ${TNAME}.out.0\
  ${TNAME}.out.1\
- ${TNAME}.out.4\
- ${TNAME}.out.5\
- ${TNAME}.out.6\
- ${TNAME}.out.7\
  ${TNAME}.out.10\
  ${TNAME}.out.11\
 "
-#  ${TNAME}.out.2\
-#  ${TNAME}.out.3\
+# ${TNAME}.out.2\
+# ${TNAME}.out.3\
+# ${TNAME}.out.4\
+# ${TNAME}.out.5\
+# ${TNAME}.out.6\
+# ${TNAME}.out.7\
 # ${TNAME}.out.8\
 # ${TNAME}.out.9\
 for i in $FILES
diff --git a/external/hypre/src/test/TEST_fei/solvers.jobs b/external/hypre/src/test/TEST_fei/solvers.jobs
old mode 100644
new mode 100755
index d0e09ed0..1bf1a7c0
--- a/external/hypre/src/test/TEST_fei/solvers.jobs
+++ b/external/hypre/src/test/TEST_fei/solvers.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_fei/solvers.sh b/external/hypre/src/test/TEST_fei/solvers.sh
old mode 100644
new mode 100755
index 74f9e0ed..a1869927
--- a/external/hypre/src/test/TEST_fei/solvers.sh
+++ b/external/hypre/src/test/TEST_fei/solvers.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_gpumemcheck/gpu.jobs b/external/hypre/src/test/TEST_gpumemcheck/gpu.jobs
new file mode 100644
index 00000000..eda10d23
--- /dev/null
+++ b/external/hypre/src/test/TEST_gpumemcheck/gpu.jobs
@@ -0,0 +1,13 @@
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+mpirun -np 4 ./ij -n 20 20 10 -P 2 2 1 -solver 1 > gpu.out.1
+
+mpirun -np 4 ./ij -n 20 20 10 -P 2 2 1 -solver 3 > gpu.out.2
+
+mpirun -np 4 ./struct -P 2 2 1 -solver 0 > gpu.out.3
+
+mpirun -np 4 ./struct -P 2 2 1 -solver 1 > gpu.out.4
diff --git a/external/hypre/src/test/TEST_gpumemcheck/gpu.saved.lassen b/external/hypre/src/test/TEST_gpumemcheck/gpu.saved.lassen
new file mode 100644
index 00000000..2279d14e
--- /dev/null
+++ b/external/hypre/src/test/TEST_gpumemcheck/gpu.saved.lassen
@@ -0,0 +1,40 @@
+# Output file: gpu.out.1
+========= LEAK SUMMARY: 0 bytes leaked in 0 allocations
+========= LEAK SUMMARY: 0 bytes leaked in 0 allocations
+========= LEAK SUMMARY: 0 bytes leaked in 0 allocations
+========= LEAK SUMMARY: 0 bytes leaked in 0 allocations
+========= ERROR SUMMARY: 0 errors
+========= ERROR SUMMARY: 0 errors
+========= ERROR SUMMARY: 0 errors
+========= ERROR SUMMARY: 0 errors
+
+# Output file: gpu.out.2
+========= LEAK SUMMARY: 0 bytes leaked in 0 allocations
+========= LEAK SUMMARY: 0 bytes leaked in 0 allocations
+========= LEAK SUMMARY: 0 bytes leaked in 0 allocations
+========= LEAK SUMMARY: 0 bytes leaked in 0 allocations
+========= ERROR SUMMARY: 0 errors
+========= ERROR SUMMARY: 0 errors
+========= ERROR SUMMARY: 0 errors
+========= ERROR SUMMARY: 0 errors
+
+# Output file: gpu.out.3
+========= LEAK SUMMARY: 0 bytes leaked in 0 allocations
+========= LEAK SUMMARY: 0 bytes leaked in 0 allocations
+========= LEAK SUMMARY: 0 bytes leaked in 0 allocations
+========= LEAK SUMMARY: 0 bytes leaked in 0 allocations
+========= ERROR SUMMARY: 0 errors
+========= ERROR SUMMARY: 0 errors
+========= ERROR SUMMARY: 0 errors
+========= ERROR SUMMARY: 0 errors
+
+# Output file: gpu.out.4
+========= LEAK SUMMARY: 0 bytes leaked in 0 allocations
+========= LEAK SUMMARY: 0 bytes leaked in 0 allocations
+========= LEAK SUMMARY: 0 bytes leaked in 0 allocations
+========= LEAK SUMMARY: 0 bytes leaked in 0 allocations
+========= ERROR SUMMARY: 0 errors
+========= ERROR SUMMARY: 0 errors
+========= ERROR SUMMARY: 0 errors
+========= ERROR SUMMARY: 0 errors
+
diff --git a/external/hypre/src/test/TEST_gpumemcheck/gpu.sh b/external/hypre/src/test/TEST_gpumemcheck/gpu.sh
new file mode 100755
index 00000000..e15f65c0
--- /dev/null
+++ b/external/hypre/src/test/TEST_gpumemcheck/gpu.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+TNAME=`basename $0 .sh`
+RTOL=$1
+ATOL=$2
+
+#=============================================================================
+# compare with baseline case
+#=============================================================================
+
+FILES="\
+ ${TNAME}.out.1\
+ ${TNAME}.out.2\
+ ${TNAME}.out.3\
+ ${TNAME}.out.4\
+"
+
+for i in $FILES
+do
+  echo "# Output file: $i"
+  grep "LEAK SUMMARY" $i
+  grep "ERROR SUMMARY" $i
+  echo
+done > ${TNAME}.out
+
+#=============================================================================
+# remove temporary files
+#=============================================================================
+
+rm -f ${TNAME}.testdata*
diff --git a/external/hypre/src/test/TEST_ij/agg_interp.jobs b/external/hypre/src/test/TEST_ij/agg_interp.jobs
old mode 100644
new mode 100755
index 0caf46c5..3f06c369
--- a/external/hypre/src/test/TEST_ij/agg_interp.jobs
+++ b/external/hypre/src/test/TEST_ij/agg_interp.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -26,6 +26,7 @@
 #    18: 2s-mod-ext interpolation all levels for systems problem hybrid approach
 #    19: 2s-mod-ee interpolation 1 levels (agg_tr 0.3)
 #    20: 2s-mod-ee interpolation all levels (agg_Pmx 4 agg_P12_mx 4)
+#    22: multipass interpolation all levels (agg_Pmx 4 agg_P12_mx 4)
 #=============================================================================
 
 mpirun -np 8 ./ij    -rhsrand -n 30 29 31 -P 2 2 2 -agg_nl 1 -agg_interp 1 -agg_Pmx 4 -solver 1 -rlx 6 \
@@ -40,6 +41,12 @@ mpirun -np 8 ./ij    -rhsrand -n 30 29 31 -P 2 2 2 -agg_nl 1 -agg_interp 3 -agg_
 mpirun -np 8 ./ij    -rhsrand -n 30 29 31 -P 2 2 2 -agg_nl 1 -agg_interp 4  -solver 1 -rlx 6 \
  >> agg_interp.out.4
 
+mpirun -np 8 ./ij    -rhsrand -n 30 29 31 -P 2 2 2 -agg_nl 1 -agg_interp 8  -solver 1 -rlx 6 \
+ >> agg_interp.out.4.1
+
+mpirun -np 8 ./ij    -rhsrand -n 30 29 31 -P 2 2 2 -agg_nl 1 -agg_interp 9  -solver 1 -rlx 6 \
+ >> agg_interp.out.4.2
+
 mpirun -np 8 ./ij    -rhsrand -n 30 29 31 -P 2 2 2 -agg_nl 10 -agg_interp 1 -agg_Pmx 4 -solver 1 -rlx 6 \
  > agg_interp.out.5
 
@@ -52,18 +59,36 @@ mpirun -np 8 ./ij    -rhsrand -n 30 29 31 -P 2 2 2 -agg_nl 10 -agg_interp 3 -agg
 mpirun -np 8 ./ij    -rhsrand -n 30 29 31 -P 2 2 2 -agg_nl 10 -agg_interp 4 -solver 1 -rlx 6 \
  >> agg_interp.out.8
 
+mpirun -np 8 ./ij    -rhsrand -n 30 29 31 -P 2 2 2 -agg_nl 10 -agg_interp 8 -solver 1 -rlx 6 \
+ >> agg_interp.out.8.1
+
+mpirun -np 8 ./ij    -rhsrand -n 30 29 31 -P 2 2 2 -agg_nl 10 -agg_interp 9 -solver 1 -rlx 6 \
+ >> agg_interp.out.8.2
+
 mpirun -np 8 ./ij    -rhsrand -n 30 29 31 -P 2 2 2 -agg_nl 1 -agg_interp 1 -agg_Pmx 4 -agg_P12_mx 3 -solver 1 -rlx 6 \
  > agg_interp.out.9
 
 mpirun -np 8 ./ij    -rhsrand -n 20 19 22 -P 2 2 2 -sysL 3 -nf 3 -agg_nl 10 -agg_interp 4 -solver 1 -rlx 6 \
  >> agg_interp.out.10
 
+mpirun -np 8 ./ij    -rhsrand -n 20 19 22 -P 2 2 2 -sysL 3 -nf 3 -agg_nl 10 -agg_interp 8 -solver 1 -rlx 6 \
+ >> agg_interp.out.10.1
+
+mpirun -np 8 ./ij    -rhsrand -n 20 19 22 -P 2 2 2 -sysL 3 -nf 3 -agg_nl 10 -agg_interp 9 -solver 1 -rlx 6 \
+ >> agg_interp.out.10.2
+
 mpirun -np 8 ./ij    -rhsrand -n 20 19 22 -P 2 2 2 -sysL 3 -nf 3 -agg_nl 10 -agg_interp 1 -agg_Pmx 4 -agg_P12_mx 4 -solver 1 -rlx 6 \
  >> agg_interp.out.11
 
 mpirun -np 8 ./ij    -rhsrand -n 20 19 22 -P 2 2 2 -sysL 3 -nf 3 -agg_nl 10 -agg_interp 4 -nodal 1 -solver 1 -rlx 6 \
  >> agg_interp.out.12
 
+mpirun -np 8 ./ij    -rhsrand -n 20 19 22 -P 2 2 2 -sysL 3 -nf 3 -agg_nl 10 -agg_interp 8 -nodal 1 -solver 1 -rlx 6 \
+ >> agg_interp.out.12.1
+
+mpirun -np 8 ./ij    -rhsrand -n 20 19 22 -P 2 2 2 -sysL 3 -nf 3 -agg_nl 10 -agg_interp 9 -nodal 1 -solver 1 -rlx 6 \
+ >> agg_interp.out.12.2
+
 mpirun -np 8 ./ij    -rhsrand -n 20 19 22 -P 2 2 2 -sysL 3 -nf 3 -agg_nl 10 -agg_interp 1 -agg_Pmx 4 -agg_P12_mx 4 -nodal 1 -solver 1 -rlx 6 \
  >> agg_interp.out.13
 
@@ -85,6 +110,17 @@ mpirun -np 8 ./ij    -rhsrand -n 20 19 22 -P 2 2 2 -sysL 3 -nf 3 -agg_nl 10 -int
 mpirun -np 8 ./ij    -rhsrand -n 30 29 31 -P 2 2 2 -agg_nl 1 -agg_interp 7 -interptype 18 -agg_tr 0.3 -solver 1 -rlx 8 \
  >> agg_interp.out.19
 
+mpirun -np 8 ./ij    -rhsrand -n 30 29 31 -P 2 2 2 -agg_nl 1 -agg_interp 7 -interptype 18 -agg_tr 0.3 -solver 1 -rlx 88 \
+ >> agg_interp.out.19.1
+
+mpirun -np 8 ./ij    -rhsrand -n 30 29 31 -P 2 2 2 -agg_nl 1 -agg_interp 7 -interptype 18 -agg_tr 0.3 -solver 1 -rlx 89 \
+ >> agg_interp.out.19.2
+
 mpirun -np 8 ./ij    -rhsrand -n 30 29 31 -P 2 2 2 -agg_nl 10 -agg_interp 7 -agg_Pmx 4 -agg_P12_mx 4 -solver 1 -rlx 6 \
  >> agg_interp.out.20
 
+mpirun -np 2 ./ij -fromfile tst -agg_nl 1 -agg_interp 8 \
+ >> agg_interp.out.21
+
+mpirun -np 8 ./ij    -rhsrand -n 30 29 31 -P 2 2 2 -agg_nl 10 -agg_interp 8 -agg_Pmx 4 -agg_P12_mx 4 -solver 1 -rlx 6 \
+ >> agg_interp.out.22
diff --git a/external/hypre/src/test/TEST_ij/agg_interp.saved b/external/hypre/src/test/TEST_ij/agg_interp.saved
index 5fdfc79a..8b522a3f 100644
--- a/external/hypre/src/test/TEST_ij/agg_interp.saved
+++ b/external/hypre/src/test/TEST_ij/agg_interp.saved
@@ -19,6 +19,18 @@ Final Relative Residual Norm = 7.511453e-09
 # Output file: agg_interp.out.4
 
 
+Iterations = 12
+Final Relative Residual Norm = 3.507939e-09
+
+# Output file: agg_interp.out.4.1
+
+
+Iterations = 12
+Final Relative Residual Norm = 3.309428e-09
+
+# Output file: agg_interp.out.4.2
+
+
 Iterations = 12
 Final Relative Residual Norm = 3.507939e-09
 
@@ -43,6 +55,18 @@ Final Relative Residual Norm = 5.781132e-09
 # Output file: agg_interp.out.8
 
 
+Iterations = 15
+Final Relative Residual Norm = 5.637036e-09
+
+# Output file: agg_interp.out.8.1
+
+
+Iterations = 15
+Final Relative Residual Norm = 6.004315e-09
+
+# Output file: agg_interp.out.8.2
+
+
 Iterations = 15
 Final Relative Residual Norm = 5.637036e-09
 
@@ -55,6 +79,18 @@ Final Relative Residual Norm = 4.335635e-09
 # Output file: agg_interp.out.10
 
 
+Iterations = 22
+Final Relative Residual Norm = 8.737365e-09
+
+# Output file: agg_interp.out.10.1
+
+
+Iterations = 22
+Final Relative Residual Norm = 8.190338e-09
+
+# Output file: agg_interp.out.10.2
+
+
 Iterations = 22
 Final Relative Residual Norm = 8.737365e-09
 
@@ -67,6 +103,18 @@ Final Relative Residual Norm = 9.807905e-09
 # Output file: agg_interp.out.12
 
 
+Iterations = 20
+Final Relative Residual Norm = 5.870410e-09
+
+# Output file: agg_interp.out.12.1
+
+
+Iterations = 20
+Final Relative Residual Norm = 5.148867e-09
+
+# Output file: agg_interp.out.12.2
+
+
 Iterations = 20
 Final Relative Residual Norm = 5.870410e-09
 
@@ -112,9 +160,33 @@ Final Relative Residual Norm = 3.612041e-09
 Iterations = 10
 Final Relative Residual Norm = 2.874370e-09
 
+# Output file: agg_interp.out.19.1
+
+
+Iterations = 10
+Final Relative Residual Norm = 5.100843e-09
+
+# Output file: agg_interp.out.19.2
+
+
+Iterations = 9
+Final Relative Residual Norm = 4.307036e-09
+
 # Output file: agg_interp.out.20
 
 
 Iterations = 11
 Final Relative Residual Norm = 1.654514e-09
 
+# Output file: agg_interp.out.21
+
+
+BoomerAMG Iterations = 1
+Final Relative Residual Norm = 0.000000e+00
+
+# Output file: agg_interp.out.22
+
+
+Iterations = 15
+Final Relative Residual Norm = 6.535343e-09
+
diff --git a/external/hypre/src/test/TEST_ij/agg_interp.saved.aurora b/external/hypre/src/test/TEST_ij/agg_interp.saved.aurora
new file mode 100644
index 00000000..87885e1c
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/agg_interp.saved.aurora
@@ -0,0 +1,192 @@
+# Output file: agg_interp.out.1
+
+
+Iterations = 10
+Final Relative Residual Norm = 6.498298e-09
+
+# Output file: agg_interp.out.2
+
+
+Iterations = 10
+Final Relative Residual Norm = 4.080317e-09
+
+# Output file: agg_interp.out.3
+
+
+Iterations = 12
+Final Relative Residual Norm = 2.800234e-09
+
+# Output file: agg_interp.out.4
+
+
+Iterations = 14
+Final Relative Residual Norm = 3.104296e-09
+
+# Output file: agg_interp.out.4.1
+
+
+Iterations = 14
+Final Relative Residual Norm = 2.931926e-09
+
+# Output file: agg_interp.out.4.2
+
+
+Iterations = 14
+Final Relative Residual Norm = 3.104296e-09
+
+# Output file: agg_interp.out.5
+
+
+Iterations = 11
+Final Relative Residual Norm = 5.531986e-09
+
+# Output file: agg_interp.out.6
+
+
+Iterations = 11
+Final Relative Residual Norm = 5.806018e-09
+
+# Output file: agg_interp.out.7
+
+
+Iterations = 14
+Final Relative Residual Norm = 4.328016e-09
+
+# Output file: agg_interp.out.8
+
+
+Iterations = 16
+Final Relative Residual Norm = 8.158525e-09
+
+# Output file: agg_interp.out.8.1
+
+
+Iterations = 17
+Final Relative Residual Norm = 3.991337e-09
+
+# Output file: agg_interp.out.8.2
+
+
+Iterations = 16
+Final Relative Residual Norm = 8.158525e-09
+
+# Output file: agg_interp.out.9
+
+
+Iterations = 12
+Final Relative Residual Norm = 2.787662e-09
+
+# Output file: agg_interp.out.10
+
+
+Iterations = 25
+Final Relative Residual Norm = 7.794962e-09
+
+# Output file: agg_interp.out.10.1
+
+
+Iterations = 25
+Final Relative Residual Norm = 7.309743e-09
+
+# Output file: agg_interp.out.10.2
+
+
+Iterations = 25
+Final Relative Residual Norm = 7.794962e-09
+
+# Output file: agg_interp.out.11
+
+
+Iterations = 18
+Final Relative Residual Norm = 9.111019e-09
+
+# Output file: agg_interp.out.12
+
+
+Iterations = 22
+Final Relative Residual Norm = 5.756606e-09
+
+# Output file: agg_interp.out.12.1
+
+
+Iterations = 22
+Final Relative Residual Norm = 4.462172e-09
+
+# Output file: agg_interp.out.12.2
+
+
+Iterations = 22
+Final Relative Residual Norm = 5.756606e-09
+
+# Output file: agg_interp.out.13
+
+
+Iterations = 16
+Final Relative Residual Norm = 6.401116e-09
+
+# Output file: agg_interp.out.14
+
+
+Iterations = 11
+Final Relative Residual Norm = 7.565865e-09
+
+# Output file: agg_interp.out.15
+
+
+Iterations = 12
+Final Relative Residual Norm = 2.808498e-09
+
+# Output file: agg_interp.out.16
+
+
+Iterations = 11
+Final Relative Residual Norm = 1.781423e-09
+
+# Output file: agg_interp.out.17
+
+
+Iterations = 20
+Final Relative Residual Norm = 8.742609e-09
+
+# Output file: agg_interp.out.18
+
+
+Iterations = 19
+Final Relative Residual Norm = 3.903948e-09
+
+# Output file: agg_interp.out.19
+
+
+Iterations = 11
+Final Relative Residual Norm = 2.045275e-09
+
+# Output file: agg_interp.out.19.1
+
+
+Iterations = 11
+Final Relative Residual Norm = 3.407818e-09
+
+# Output file: agg_interp.out.19.2
+
+
+Iterations = 10
+Final Relative Residual Norm = 4.782432e-09
+
+# Output file: agg_interp.out.20
+
+
+Iterations = 12
+Final Relative Residual Norm = 2.136187e-09
+
+# Output file: agg_interp.out.21
+
+
+BoomerAMG Iterations = 9
+Final Relative Residual Norm = 2.176372e-09
+
+# Output file: agg_interp.out.22
+
+
+Iterations = 17
+Final Relative Residual Norm = 4.919351e-09
+
diff --git a/external/hypre/src/test/TEST_ij/agg_interp.saved.lassen b/external/hypre/src/test/TEST_ij/agg_interp.saved.lassen
index d61cedc0..dc3ddd6c 100644
--- a/external/hypre/src/test/TEST_ij/agg_interp.saved.lassen
+++ b/external/hypre/src/test/TEST_ij/agg_interp.saved.lassen
@@ -2,13 +2,13 @@
 
 
 Iterations = 10
-Final Relative Residual Norm = 4.534816e-09
+Final Relative Residual Norm = 4.175693e-09
 
 # Output file: agg_interp.out.2
 
 
 Iterations = 10
-Final Relative Residual Norm = 3.245546e-09
+Final Relative Residual Norm = 3.083921e-09
 
 # Output file: agg_interp.out.3
 
@@ -19,6 +19,18 @@ Final Relative Residual Norm = 6.408748e-09
 # Output file: agg_interp.out.4
 
 
+Iterations = 13
+Final Relative Residual Norm = 9.962426e-09
+
+# Output file: agg_interp.out.4.1
+
+
+Iterations = 13
+Final Relative Residual Norm = 9.947240e-09
+
+# Output file: agg_interp.out.4.2
+
+
 Iterations = 13
 Final Relative Residual Norm = 9.962426e-09
 
@@ -26,23 +38,35 @@ Final Relative Residual Norm = 9.962426e-09
 
 
 Iterations = 11
-Final Relative Residual Norm = 3.901126e-09
+Final Relative Residual Norm = 5.655711e-09
 
 # Output file: agg_interp.out.6
 
 
 Iterations = 11
-Final Relative Residual Norm = 4.614195e-09
+Final Relative Residual Norm = 3.179034e-09
 
 # Output file: agg_interp.out.7
 
 
 Iterations = 13
-Final Relative Residual Norm = 8.031241e-09
+Final Relative Residual Norm = 8.027473e-09
 
 # Output file: agg_interp.out.8
 
 
+Iterations = 16
+Final Relative Residual Norm = 8.359411e-09
+
+# Output file: agg_interp.out.8.1
+
+
+Iterations = 16
+Final Relative Residual Norm = 7.750810e-09
+
+# Output file: agg_interp.out.8.2
+
+
 Iterations = 16
 Final Relative Residual Norm = 8.359411e-09
 
@@ -50,11 +74,23 @@ Final Relative Residual Norm = 8.359411e-09
 
 
 Iterations = 11
-Final Relative Residual Norm = 7.761156e-09
+Final Relative Residual Norm = 7.218488e-09
 
 # Output file: agg_interp.out.10
 
 
+Iterations = 25
+Final Relative Residual Norm = 8.200302e-09
+
+# Output file: agg_interp.out.10.1
+
+
+Iterations = 25
+Final Relative Residual Norm = 8.671776e-09
+
+# Output file: agg_interp.out.10.2
+
+
 Iterations = 25
 Final Relative Residual Norm = 8.200302e-09
 
@@ -62,25 +98,37 @@ Final Relative Residual Norm = 8.200302e-09
 
 
 Iterations = 19
-Final Relative Residual Norm = 4.085208e-09
+Final Relative Residual Norm = 4.180972e-09
 
 # Output file: agg_interp.out.12
 
 
+Iterations = 22
+Final Relative Residual Norm = 4.656670e-09
+
+# Output file: agg_interp.out.12.1
+
+
+Iterations = 22
+Final Relative Residual Norm = 5.415649e-09
+
+# Output file: agg_interp.out.12.2
+
+
 Iterations = 22
 Final Relative Residual Norm = 4.656670e-09
 
 # Output file: agg_interp.out.13
 
 
-Iterations = 17
-Final Relative Residual Norm = 3.479761e-09
+Iterations = 16
+Final Relative Residual Norm = 9.072689e-09
 
 # Output file: agg_interp.out.14
 
 
 Iterations = 11
-Final Relative Residual Norm = 4.065039e-09
+Final Relative Residual Norm = 4.051025e-09
 
 # Output file: agg_interp.out.15
 
@@ -92,29 +140,53 @@ Final Relative Residual Norm = 6.606006e-09
 
 
 Iterations = 10
-Final Relative Residual Norm = 3.954124e-09
+Final Relative Residual Norm = 4.938299e-09
 
 # Output file: agg_interp.out.17
 
 
 Iterations = 20
-Final Relative Residual Norm = 8.245507e-09
+Final Relative Residual Norm = 6.711024e-09
 
 # Output file: agg_interp.out.18
 
 
 Iterations = 18
-Final Relative Residual Norm = 5.326617e-09
+Final Relative Residual Norm = 5.325382e-09
 
 # Output file: agg_interp.out.19
 
 
 Iterations = 10
-Final Relative Residual Norm = 6.953099e-09
+Final Relative Residual Norm = 6.953719e-09
 
-# Output file: agg_interp.out.20
+# Output file: agg_interp.out.19.1
 
 
 Iterations = 11
-Final Relative Residual Norm = 9.091177e-09
+Final Relative Residual Norm = 1.959614e-09
+
+# Output file: agg_interp.out.19.2
+
+
+Iterations = 10
+Final Relative Residual Norm = 2.361979e-09
+
+# Output file: agg_interp.out.20
+
+
+Iterations = 12
+Final Relative Residual Norm = 2.442371e-09
+
+# Output file: agg_interp.out.21
+
+
+BoomerAMG Iterations = 9
+Final Relative Residual Norm = 2.176372e-09
+
+# Output file: agg_interp.out.22
+
+
+Iterations = 16
+Final Relative Residual Norm = 7.077723e-09
 
diff --git a/external/hypre/src/test/TEST_ij/agg_interp.saved.lassen_cpu b/external/hypre/src/test/TEST_ij/agg_interp.saved.lassen_cpu
new file mode 100644
index 00000000..e3532833
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/agg_interp.saved.lassen_cpu
@@ -0,0 +1,192 @@
+# Output file: agg_interp.out.1
+
+
+Iterations = 9
+Final Relative Residual Norm = 4.675538e-09
+
+# Output file: agg_interp.out.2
+
+
+Iterations = 9
+Final Relative Residual Norm = 3.807119e-09
+
+# Output file: agg_interp.out.3
+
+
+Iterations = 10
+Final Relative Residual Norm = 7.511453e-09
+
+# Output file: agg_interp.out.4
+
+
+Iterations = 12
+Final Relative Residual Norm = 3.507939e-09
+
+# Output file: agg_interp.out.4.1
+
+
+Iterations = 12
+Final Relative Residual Norm = 3.309428e-09
+
+# Output file: agg_interp.out.4.2
+
+
+Iterations = 12
+Final Relative Residual Norm = 3.507939e-09
+
+# Output file: agg_interp.out.5
+
+
+Iterations = 10
+Final Relative Residual Norm = 7.397596e-09
+
+# Output file: agg_interp.out.6
+
+
+Iterations = 10
+Final Relative Residual Norm = 5.088038e-09
+
+# Output file: agg_interp.out.7
+
+
+Iterations = 12
+Final Relative Residual Norm = 5.781132e-09
+
+# Output file: agg_interp.out.8
+
+
+Iterations = 15
+Final Relative Residual Norm = 5.637036e-09
+
+# Output file: agg_interp.out.8.1
+
+
+Iterations = 15
+Final Relative Residual Norm = 6.004315e-09
+
+# Output file: agg_interp.out.8.2
+
+
+Iterations = 15
+Final Relative Residual Norm = 5.637036e-09
+
+# Output file: agg_interp.out.9
+
+
+Iterations = 10
+Final Relative Residual Norm = 4.335635e-09
+
+# Output file: agg_interp.out.10
+
+
+Iterations = 22
+Final Relative Residual Norm = 8.737365e-09
+
+# Output file: agg_interp.out.10.1
+
+
+Iterations = 22
+Final Relative Residual Norm = 8.190338e-09
+
+# Output file: agg_interp.out.10.2
+
+
+Iterations = 22
+Final Relative Residual Norm = 8.737365e-09
+
+# Output file: agg_interp.out.11
+
+
+Iterations = 17
+Final Relative Residual Norm = 9.807905e-09
+
+# Output file: agg_interp.out.12
+
+
+Iterations = 20
+Final Relative Residual Norm = 5.870410e-09
+
+# Output file: agg_interp.out.12.1
+
+
+Iterations = 20
+Final Relative Residual Norm = 5.148867e-09
+
+# Output file: agg_interp.out.12.2
+
+
+Iterations = 20
+Final Relative Residual Norm = 5.870410e-09
+
+# Output file: agg_interp.out.13
+
+
+Iterations = 16
+Final Relative Residual Norm = 5.163837e-09
+
+# Output file: agg_interp.out.14
+
+
+Iterations = 10
+Final Relative Residual Norm = 2.493000e-09
+
+# Output file: agg_interp.out.15
+
+
+Iterations = 10
+Final Relative Residual Norm = 7.511453e-09
+
+# Output file: agg_interp.out.16
+
+
+Iterations = 9
+Final Relative Residual Norm = 6.146679e-09
+
+# Output file: agg_interp.out.17
+
+
+Iterations = 17
+Final Relative Residual Norm = 7.573922e-09
+
+# Output file: agg_interp.out.18
+
+
+Iterations = 16
+Final Relative Residual Norm = 5.577693e-09
+
+# Output file: agg_interp.out.19
+
+
+Iterations = 10
+Final Relative Residual Norm = 2.864587e-09
+
+# Output file: agg_interp.out.19.1
+
+
+Iterations = 10
+Final Relative Residual Norm = 5.100364e-09
+
+# Output file: agg_interp.out.19.2
+
+
+Iterations = 9
+Final Relative Residual Norm = 4.344114e-09
+
+# Output file: agg_interp.out.20
+
+
+Iterations = 10
+Final Relative Residual Norm = 5.375178e-09
+
+# Output file: agg_interp.out.21
+
+
+BoomerAMG Iterations = 1
+Final Relative Residual Norm = 0.000000e+00
+
+# Output file: agg_interp.out.22
+
+
+Iterations = 15
+Final Relative Residual Norm = 6.853574e-09
+
diff --git a/external/hypre/src/test/TEST_ij/agg_interp.saved.ray b/external/hypre/src/test/TEST_ij/agg_interp.saved.ray
deleted file mode 100644
index d790905b..00000000
--- a/external/hypre/src/test/TEST_ij/agg_interp.saved.ray
+++ /dev/null
@@ -1,120 +0,0 @@
-# Output file: agg_interp.out.1
-
-
-Iterations = 10
-Final Relative Residual Norm = 4.534816e-09
-
-# Output file: agg_interp.out.2
-
-
-Iterations = 10
-Final Relative Residual Norm = 3.245546e-09
-
-# Output file: agg_interp.out.3
-
-
-Iterations = 11
-Final Relative Residual Norm = 6.408748e-09
-
-# Output file: agg_interp.out.4
-
-
-Iterations = 13
-Final Relative Residual Norm = 9.962426e-09
-
-# Output file: agg_interp.out.5
-
-
-Iterations = 11
-Final Relative Residual Norm = 3.901126e-09
-
-# Output file: agg_interp.out.6
-
-
-Iterations = 11
-Final Relative Residual Norm = 4.614195e-09
-
-# Output file: agg_interp.out.7
-
-
-Iterations = 13
-Final Relative Residual Norm = 8.031241e-09
-
-# Output file: agg_interp.out.8
-
-
-Iterations = 16
-Final Relative Residual Norm = 8.359411e-09
-
-# Output file: agg_interp.out.9
-
-
-Iterations = 11
-Final Relative Residual Norm = 7.761156e-09
-
-# Output file: agg_interp.out.10
-
-
-Iterations = 25
-Final Relative Residual Norm = 8.200302e-09
-
-# Output file: agg_interp.out.11
-
-
-Iterations = 19
-Final Relative Residual Norm = 4.085208e-09
-
-# Output file: agg_interp.out.12
-
-
-Iterations = 22
-Final Relative Residual Norm = 4.656670e-09
-
-# Output file: agg_interp.out.13
-
-
-Iterations = 17
-Final Relative Residual Norm = 3.479761e-09
-
-# Output file: agg_interp.out.14
-
-
-Iterations = 11
-Final Relative Residual Norm = 4.065039e-09
-
-# Output file: agg_interp.out.15
-
-
-Iterations = 11
-Final Relative Residual Norm = 6.606006e-09
-
-# Output file: agg_interp.out.16
-
-
-Iterations = 10
-Final Relative Residual Norm = 3.954075e-09
-
-# Output file: agg_interp.out.17
-
-
-Iterations = 20
-Final Relative Residual Norm = 8.245507e-09
-
-# Output file: agg_interp.out.18
-
-
-Iterations = 18
-Final Relative Residual Norm = 5.326617e-09
-
-# Output file: agg_interp.out.19
-
-
-Iterations = 10
-Final Relative Residual Norm = 6.953719e-09
-
-# Output file: agg_interp.out.20
-
-
-Iterations = 11
-Final Relative Residual Norm = 9.106706e-09
-
diff --git a/external/hypre/src/test/TEST_ij/agg_interp.sh b/external/hypre/src/test/TEST_ij/agg_interp.sh
old mode 100644
new mode 100755
index 32ccbde0..2ae82bc8
--- a/external/hypre/src/test/TEST_ij/agg_interp.sh
+++ b/external/hypre/src/test/TEST_ij/agg_interp.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -17,14 +17,22 @@ FILES="\
  ${TNAME}.out.2\
  ${TNAME}.out.3\
  ${TNAME}.out.4\
+ ${TNAME}.out.4.1\
+ ${TNAME}.out.4.2\
  ${TNAME}.out.5\
  ${TNAME}.out.6\
  ${TNAME}.out.7\
  ${TNAME}.out.8\
+ ${TNAME}.out.8.1\
+ ${TNAME}.out.8.2\
  ${TNAME}.out.9\
  ${TNAME}.out.10\
+ ${TNAME}.out.10.1\
+ ${TNAME}.out.10.2\
  ${TNAME}.out.11\
  ${TNAME}.out.12\
+ ${TNAME}.out.12.1\
+ ${TNAME}.out.12.2\
  ${TNAME}.out.13\
  ${TNAME}.out.14\
  ${TNAME}.out.15\
@@ -32,7 +40,11 @@ FILES="\
  ${TNAME}.out.17\
  ${TNAME}.out.18\
  ${TNAME}.out.19\
+ ${TNAME}.out.19.1\
+ ${TNAME}.out.19.2\
  ${TNAME}.out.20\
+ ${TNAME}.out.21\
+ ${TNAME}.out.22\
 "
 
 for i in $FILES
diff --git a/external/hypre/src/test/TEST_ij/air.jobs b/external/hypre/src/test/TEST_ij/air.jobs
old mode 100644
new mode 100755
index c479f78c..34d92461
--- a/external/hypre/src/test/TEST_ij/air.jobs
+++ b/external/hypre/src/test/TEST_ij/air.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_ij/air.saved.aurora b/external/hypre/src/test/TEST_ij/air.saved.aurora
new file mode 100644
index 00000000..af57a0c2
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/air.saved.aurora
@@ -0,0 +1,48 @@
+# Output file: air.out.20
+BoomerAMG Iterations = 25
+Final Relative Residual Norm = 5.387301e-09
+
+# Output file: air.out.21
+BoomerAMG Iterations = 18
+Final Relative Residual Norm = 7.663841e-09
+
+# Output file: air.out.22
+BoomerAMG Iterations = 15
+Final Relative Residual Norm = 4.043648e-09
+
+# Output file: air.out.23
+GMRES Iterations = 13
+Final GMRES Relative Residual Norm = 9.567861e-09
+
+# Output file: air.out.24
+GMRES Iterations = 11
+Final GMRES Relative Residual Norm = 5.102120e-09
+
+# Output file: air.out.25
+GMRES Iterations = 9
+Final GMRES Relative Residual Norm = 9.575076e-09
+
+# Output file: air.out.26
+BoomerAMG Iterations = 11
+Final Relative Residual Norm = 2.902926e-10
+
+# Output file: air.out.27
+BoomerAMG Iterations = 10
+Final Relative Residual Norm = 3.965599e-09
+
+# Output file: air.out.28
+BoomerAMG Iterations = 10
+Final Relative Residual Norm = 6.850225e-09
+
+# Output file: air.out.29
+GMRES Iterations = 11
+Final GMRES Relative Residual Norm = 2.978902e-09
+
+# Output file: air.out.30
+GMRES Iterations = 10
+Final GMRES Relative Residual Norm = 2.603853e-09
+
+# Output file: air.out.31
+GMRES Iterations = 10
+Final GMRES Relative Residual Norm = 5.553389e-09
+
diff --git a/external/hypre/src/test/TEST_ij/air.saved.lassen b/external/hypre/src/test/TEST_ij/air.saved.lassen
index 9332f596..7c381d45 100644
--- a/external/hypre/src/test/TEST_ij/air.saved.lassen
+++ b/external/hypre/src/test/TEST_ij/air.saved.lassen
@@ -4,11 +4,11 @@ Final Relative Residual Norm = 9.312591e-09
 
 # Output file: air.out.21
 BoomerAMG Iterations = 18
-Final Relative Residual Norm = 7.892897e-09
+Final Relative Residual Norm = 7.891369e-09
 
 # Output file: air.out.22
 BoomerAMG Iterations = 16
-Final Relative Residual Norm = 6.456267e-09
+Final Relative Residual Norm = 6.452598e-09
 
 # Output file: air.out.23
 GMRES Iterations = 14
@@ -16,11 +16,11 @@ Final GMRES Relative Residual Norm = 3.144844e-09
 
 # Output file: air.out.24
 GMRES Iterations = 11
-Final GMRES Relative Residual Norm = 9.682026e-09
+Final GMRES Relative Residual Norm = 9.678669e-09
 
 # Output file: air.out.25
 GMRES Iterations = 10
-Final GMRES Relative Residual Norm = 1.934862e-09
+Final GMRES Relative Residual Norm = 1.934858e-09
 
 # Output file: air.out.26
 BoomerAMG Iterations = 11
@@ -40,9 +40,9 @@ Final GMRES Relative Residual Norm = 1.821590e-09
 
 # Output file: air.out.30
 GMRES Iterations = 10
-Final GMRES Relative Residual Norm = 3.031157e-09
+Final GMRES Relative Residual Norm = 3.031124e-09
 
 # Output file: air.out.31
 GMRES Iterations = 10
-Final GMRES Relative Residual Norm = 6.135785e-09
+Final GMRES Relative Residual Norm = 6.029147e-09
 
diff --git a/external/hypre/src/test/TEST_ij/air.saved.lassen_cpu b/external/hypre/src/test/TEST_ij/air.saved.lassen_cpu
new file mode 100644
index 00000000..70ce6b33
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/air.saved.lassen_cpu
@@ -0,0 +1,48 @@
+# Output file: air.out.20
+BoomerAMG Iterations = 24
+Final Relative Residual Norm = 7.174911e-09
+
+# Output file: air.out.21
+BoomerAMG Iterations = 17
+Final Relative Residual Norm = 3.655624e-09
+
+# Output file: air.out.22
+BoomerAMG Iterations = 15
+Final Relative Residual Norm = 3.128157e-09
+
+# Output file: air.out.23
+GMRES Iterations = 14
+Final GMRES Relative Residual Norm = 4.260195e-09
+
+# Output file: air.out.24
+GMRES Iterations = 11
+Final GMRES Relative Residual Norm = 2.336948e-09
+
+# Output file: air.out.25
+GMRES Iterations = 10
+Final GMRES Relative Residual Norm = 2.980381e-09
+
+# Output file: air.out.26
+BoomerAMG Iterations = 11
+Final Relative Residual Norm = 1.195660e-10
+
+# Output file: air.out.27
+BoomerAMG Iterations = 10
+Final Relative Residual Norm = 2.607892e-10
+
+# Output file: air.out.28
+BoomerAMG Iterations = 10
+Final Relative Residual Norm = 9.100800e-10
+
+# Output file: air.out.29
+GMRES Iterations = 11
+Final GMRES Relative Residual Norm = 4.903657e-09
+
+# Output file: air.out.30
+GMRES Iterations = 10
+Final GMRES Relative Residual Norm = 2.748050e-10
+
+# Output file: air.out.31
+GMRES Iterations = 10
+Final GMRES Relative Residual Norm = 1.904458e-09
+
diff --git a/external/hypre/src/test/TEST_ij/air.saved.ray b/external/hypre/src/test/TEST_ij/air.saved.ray
deleted file mode 100644
index 567eb164..00000000
--- a/external/hypre/src/test/TEST_ij/air.saved.ray
+++ /dev/null
@@ -1,48 +0,0 @@
-# Output file: air.out.20
-BoomerAMG Iterations = 25
-Final Relative Residual Norm = 9.312591e-09
-
-# Output file: air.out.21
-BoomerAMG Iterations = 18
-Final Relative Residual Norm = 7.892897e-09
-
-# Output file: air.out.22
-BoomerAMG Iterations = 16
-Final Relative Residual Norm = 6.453441e-09
-
-# Output file: air.out.23
-GMRES Iterations = 14
-Final GMRES Relative Residual Norm = 3.144844e-09
-
-# Output file: air.out.24
-GMRES Iterations = 11
-Final GMRES Relative Residual Norm = 9.682026e-09
-
-# Output file: air.out.25
-GMRES Iterations = 10
-Final GMRES Relative Residual Norm = 1.935052e-09
-
-# Output file: air.out.26
-BoomerAMG Iterations = 11
-Final Relative Residual Norm = 1.541616e-09
-
-# Output file: air.out.27
-BoomerAMG Iterations = 10
-Final Relative Residual Norm = 4.818763e-09
-
-# Output file: air.out.28
-BoomerAMG Iterations = 10
-Final Relative Residual Norm = 4.701521e-09
-
-# Output file: air.out.29
-GMRES Iterations = 12
-Final GMRES Relative Residual Norm = 1.821590e-09
-
-# Output file: air.out.30
-GMRES Iterations = 10
-Final GMRES Relative Residual Norm = 3.031157e-09
-
-# Output file: air.out.31
-GMRES Iterations = 10
-Final GMRES Relative Residual Norm = 6.135785e-09
-
diff --git a/external/hypre/src/test/TEST_ij/air.sh b/external/hypre/src/test/TEST_ij/air.sh
old mode 100644
new mode 100755
index 39fb573a..40c7618c
--- a/external/hypre/src/test/TEST_ij/air.sh
+++ b/external/hypre/src/test/TEST_ij/air.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_ij/amgdd.jobs b/external/hypre/src/test/TEST_ij/amgdd.jobs
old mode 100644
new mode 100755
index a5b99da1..31d83063
--- a/external/hypre/src/test/TEST_ij/amgdd.jobs
+++ b/external/hypre/src/test/TEST_ij/amgdd.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_ij/amgdd.saved.aurora b/external/hypre/src/test/TEST_ij/amgdd.saved.aurora
new file mode 100644
index 00000000..bd911cc4
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/amgdd.saved.aurora
@@ -0,0 +1,64 @@
+# Output file: amgdd.out.900
+BoomerAMG-DD Iterations = 10
+Final Relative Residual Norm = 1.974236e-09
+
+# Output file: amgdd.out.901
+BoomerAMG-DD Iterations = 10
+Final Relative Residual Norm = 6.283398e-09
+
+# Output file: amgdd.out.902
+BoomerAMG-DD Iterations = 10
+Final Relative Residual Norm = 5.065796e-09
+
+# Output file: amgdd.out.903
+BoomerAMG-DD Iterations = 23
+Final Relative Residual Norm = 9.593628e-09
+
+# Output file: amgdd.out.904
+BoomerAMG-DD Iterations = 23
+Final Relative Residual Norm = 9.593628e-09
+
+# Output file: amgdd.out.905
+BoomerAMG-DD Iterations = 10
+Final Relative Residual Norm = 4.862475e-09
+
+# Output file: amgdd.out.906
+BoomerAMG-DD Iterations = 10
+Final Relative Residual Norm = 4.878252e-09
+
+# Output file: amgdd.out.910
+GMRES Iterations = 7
+Final GMRES Relative Residual Norm = 9.651980e-10
+
+# Output file: amgdd.out.911
+GMRES Iterations = 7
+Final GMRES Relative Residual Norm = 3.485453e-09
+
+# Output file: amgdd.out.912
+GMRES Iterations = 7
+Final GMRES Relative Residual Norm = 4.261629e-09
+
+# Output file: amgdd.out.913
+GMRES Iterations = 6
+Final GMRES Relative Residual Norm = 1.693835e-09
+
+# Output file: amgdd.out.914
+GMRES Iterations = 15
+Final GMRES Relative Residual Norm = 3.189651e-09
+
+# Output file: amgdd.out.915
+GMRES Iterations = 5
+Final GMRES Relative Residual Norm = 7.922017e-09
+
+# Output file: amgdd.out.916
+GMRES Iterations = 15
+Final GMRES Relative Residual Norm = 3.188967e-03
+
+# Output file: amgdd.out.917
+GMRES Iterations = 7
+Final GMRES Relative Residual Norm = 1.815824e-09
+
+# Output file: amgdd.out.918
+GMRES Iterations = 7
+Final GMRES Relative Residual Norm = 1.073711e-09
+
diff --git a/external/hypre/src/test/TEST_ij/amgdd.saved.lassen b/external/hypre/src/test/TEST_ij/amgdd.saved.lassen
index 4a6bc20e..82bc4353 100644
--- a/external/hypre/src/test/TEST_ij/amgdd.saved.lassen
+++ b/external/hypre/src/test/TEST_ij/amgdd.saved.lassen
@@ -1,64 +1,64 @@
 # Output file: amgdd.out.900
-BoomerAMG-DD Iterations = 10
-Final Relative Residual Norm = 8.474980e-09
+BoomerAMG-DD Iterations = 11
+Final Relative Residual Norm = 2.637142e-09
 
 # Output file: amgdd.out.901
-BoomerAMG-DD Iterations = 11
-Final Relative Residual Norm = 3.978926e-09
+BoomerAMG-DD Iterations = 10
+Final Relative Residual Norm = 5.434597e-09
 
 # Output file: amgdd.out.902
 BoomerAMG-DD Iterations = 11
-Final Relative Residual Norm = 3.608239e-09
+Final Relative Residual Norm = 3.272845e-09
 
 # Output file: amgdd.out.903
 BoomerAMG-DD Iterations = 25
-Final Relative Residual Norm = 6.743448e-09
+Final Relative Residual Norm = 6.508851e-09
 
 # Output file: amgdd.out.904
 BoomerAMG-DD Iterations = 25
-Final Relative Residual Norm = 7.071246e-09
+Final Relative Residual Norm = 6.758206e-09
 
 # Output file: amgdd.out.905
 BoomerAMG-DD Iterations = 11
-Final Relative Residual Norm = 2.865652e-09
+Final Relative Residual Norm = 2.682944e-09
 
 # Output file: amgdd.out.906
 BoomerAMG-DD Iterations = 11
-Final Relative Residual Norm = 2.872730e-09
+Final Relative Residual Norm = 2.688644e-09
 
 # Output file: amgdd.out.910
 GMRES Iterations = 7
-Final GMRES Relative Residual Norm = 2.627495e-09
+Final GMRES Relative Residual Norm = 2.783446e-09
 
 # Output file: amgdd.out.911
 GMRES Iterations = 7
-Final GMRES Relative Residual Norm = 6.257514e-09
+Final GMRES Relative Residual Norm = 3.807194e-09
 
 # Output file: amgdd.out.912
 GMRES Iterations = 7
-Final GMRES Relative Residual Norm = 6.425568e-09
+Final GMRES Relative Residual Norm = 6.374572e-09
 
 # Output file: amgdd.out.913
 GMRES Iterations = 6
-Final GMRES Relative Residual Norm = 2.720128e-09
+Final GMRES Relative Residual Norm = 2.680719e-09
 
 # Output file: amgdd.out.914
-GMRES Iterations = 14
-Final GMRES Relative Residual Norm = 6.291930e-09
+GMRES Iterations = 15
+Final GMRES Relative Residual Norm = 3.887000e-09
 
 # Output file: amgdd.out.915
 GMRES Iterations = 5
-Final GMRES Relative Residual Norm = 4.766657e-09
+Final GMRES Relative Residual Norm = 5.001224e-09
 
 # Output file: amgdd.out.916
 GMRES Iterations = 13
-Final GMRES Relative Residual Norm = 1.700551e-03
+Final GMRES Relative Residual Norm = 1.087777e-03
 
 # Output file: amgdd.out.917
 GMRES Iterations = 7
-Final GMRES Relative Residual Norm = 4.118020e-09
+Final GMRES Relative Residual Norm = 4.055942e-09
 
 # Output file: amgdd.out.918
 GMRES Iterations = 7
-Final GMRES Relative Residual Norm = 1.980700e-09
+Final GMRES Relative Residual Norm = 2.041613e-09
 
diff --git a/external/hypre/src/test/TEST_ij/amgdd.saved.lassen_cpu b/external/hypre/src/test/TEST_ij/amgdd.saved.lassen_cpu
new file mode 100644
index 00000000..5b964144
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/amgdd.saved.lassen_cpu
@@ -0,0 +1,64 @@
+# Output file: amgdd.out.900
+BoomerAMG-DD Iterations = 5
+Final Relative Residual Norm = 3.991216e-09
+
+# Output file: amgdd.out.901
+BoomerAMG-DD Iterations = 10
+Final Relative Residual Norm = 5.653340e-09
+
+# Output file: amgdd.out.902
+BoomerAMG-DD Iterations = 10
+Final Relative Residual Norm = 9.214818e-09
+
+# Output file: amgdd.out.903
+BoomerAMG-DD Iterations = 12
+Final Relative Residual Norm = 3.122094e-09
+
+# Output file: amgdd.out.904
+BoomerAMG-DD Iterations = 12
+Final Relative Residual Norm = 3.342726e-09
+
+# Output file: amgdd.out.905
+BoomerAMG-DD Iterations = 10
+Final Relative Residual Norm = 4.924406e-09
+
+# Output file: amgdd.out.906
+BoomerAMG-DD Iterations = 10
+Final Relative Residual Norm = 4.724593e-09
+
+# Output file: amgdd.out.910
+GMRES Iterations = 4
+Final GMRES Relative Residual Norm = 6.125599e-09
+
+# Output file: amgdd.out.911
+GMRES Iterations = 7
+Final GMRES Relative Residual Norm = 1.821559e-09
+
+# Output file: amgdd.out.912
+GMRES Iterations = 7
+Final GMRES Relative Residual Norm = 5.755980e-09
+
+# Output file: amgdd.out.913
+GMRES Iterations = 6
+Final GMRES Relative Residual Norm = 2.248814e-09
+
+# Output file: amgdd.out.914
+GMRES Iterations = 15
+Final GMRES Relative Residual Norm = 4.036024e-09
+
+# Output file: amgdd.out.915
+GMRES Iterations = 5
+Final GMRES Relative Residual Norm = 5.121200e-09
+
+# Output file: amgdd.out.916
+GMRES Iterations = 14
+Final GMRES Relative Residual Norm = 5.260812e-03
+
+# Output file: amgdd.out.917
+GMRES Iterations = 7
+Final GMRES Relative Residual Norm = 3.281089e-09
+
+# Output file: amgdd.out.918
+GMRES Iterations = 7
+Final GMRES Relative Residual Norm = 1.828708e-09
+
diff --git a/external/hypre/src/test/TEST_ij/amgdd.saved.ray b/external/hypre/src/test/TEST_ij/amgdd.saved.ray
deleted file mode 100644
index 4a6bc20e..00000000
--- a/external/hypre/src/test/TEST_ij/amgdd.saved.ray
+++ /dev/null
@@ -1,64 +0,0 @@
-# Output file: amgdd.out.900
-BoomerAMG-DD Iterations = 10
-Final Relative Residual Norm = 8.474980e-09
-
-# Output file: amgdd.out.901
-BoomerAMG-DD Iterations = 11
-Final Relative Residual Norm = 3.978926e-09
-
-# Output file: amgdd.out.902
-BoomerAMG-DD Iterations = 11
-Final Relative Residual Norm = 3.608239e-09
-
-# Output file: amgdd.out.903
-BoomerAMG-DD Iterations = 25
-Final Relative Residual Norm = 6.743448e-09
-
-# Output file: amgdd.out.904
-BoomerAMG-DD Iterations = 25
-Final Relative Residual Norm = 7.071246e-09
-
-# Output file: amgdd.out.905
-BoomerAMG-DD Iterations = 11
-Final Relative Residual Norm = 2.865652e-09
-
-# Output file: amgdd.out.906
-BoomerAMG-DD Iterations = 11
-Final Relative Residual Norm = 2.872730e-09
-
-# Output file: amgdd.out.910
-GMRES Iterations = 7
-Final GMRES Relative Residual Norm = 2.627495e-09
-
-# Output file: amgdd.out.911
-GMRES Iterations = 7
-Final GMRES Relative Residual Norm = 6.257514e-09
-
-# Output file: amgdd.out.912
-GMRES Iterations = 7
-Final GMRES Relative Residual Norm = 6.425568e-09
-
-# Output file: amgdd.out.913
-GMRES Iterations = 6
-Final GMRES Relative Residual Norm = 2.720128e-09
-
-# Output file: amgdd.out.914
-GMRES Iterations = 14
-Final GMRES Relative Residual Norm = 6.291930e-09
-
-# Output file: amgdd.out.915
-GMRES Iterations = 5
-Final GMRES Relative Residual Norm = 4.766657e-09
-
-# Output file: amgdd.out.916
-GMRES Iterations = 13
-Final GMRES Relative Residual Norm = 1.700551e-03
-
-# Output file: amgdd.out.917
-GMRES Iterations = 7
-Final GMRES Relative Residual Norm = 4.118020e-09
-
-# Output file: amgdd.out.918
-GMRES Iterations = 7
-Final GMRES Relative Residual Norm = 1.980700e-09
-
diff --git a/external/hypre/src/test/TEST_ij/amgdd.sh b/external/hypre/src/test/TEST_ij/amgdd.sh
old mode 100644
new mode 100755
index 261f5d33..4854a4f2
--- a/external/hypre/src/test/TEST_ij/amgdd.sh
+++ b/external/hypre/src/test/TEST_ij/amgdd.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_ij/assembly.jobs b/external/hypre/src/test/TEST_ij/assembly.jobs
new file mode 100755
index 00000000..851fe71d
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/assembly.jobs
@@ -0,0 +1,20 @@
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+#=============================================================================
+# ij_assembly: Run default case
+#=============================================================================
+
+mpirun -np 1  ./ij_assembly > assembly.out.0
+
+mpirun -np 2  ./ij_assembly > assembly.out.1
+
+mpirun -np 3  ./ij_assembly > assembly.out.2
+
+mpirun -np 7  ./ij_assembly > assembly.out.3
+
+mpirun -np 7  ./ij_assembly -early 1 > assembly.out.4
+
diff --git a/external/hypre/src/test/TEST_ij/assembly.sh b/external/hypre/src/test/TEST_ij/assembly.sh
new file mode 100755
index 00000000..ceb39a54
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/assembly.sh
@@ -0,0 +1,49 @@
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+TNAME=`basename $0 .sh`
+RTOL=$1
+ATOL=$2
+
+#=============================================================================
+# compare with baseline case
+#=============================================================================
+
+FILES="\
+ ${TNAME}.out.0\
+ ${TNAME}.out.1\
+ ${TNAME}.out.2\
+ ${TNAME}.out.3\
+ ${TNAME}.out.4\
+"
+
+for i in $FILES
+do
+  echo "# Output file: $i"
+  tail -1 $i
+done > ${TNAME}.out
+
+# Make sure that the output file is reasonable
+RUNCOUNT=`echo $FILES | wc -w`
+OUTCOUNT=`grep "error code" ${TNAME}.out | wc -l`
+if [ "$OUTCOUNT" != "$RUNCOUNT" ]; then
+  echo "Incorrect number of runs in ${TNAME}.out" >&2
+fi
+
+# Make sure that the output file has no errors
+for i in $FILES
+do
+  echo "# Output file: $i"
+  echo "Test error code = 0"
+done > ${TNAME}.testdata
+
+diff ${TNAME}.testdata ${TNAME}.out >&2
+
+#=============================================================================
+# remove temporary files
+#=============================================================================
+
+rm -f ${TNAME}.testdata
diff --git a/external/hypre/src/test/TEST_ij/coarsening.jobs b/external/hypre/src/test/TEST_ij/coarsening.jobs
old mode 100644
new mode 100755
index 5efb00c7..aca335af
--- a/external/hypre/src/test/TEST_ij/coarsening.jobs
+++ b/external/hypre/src/test/TEST_ij/coarsening.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_ij/coarsening.saved.ray b/external/hypre/src/test/TEST_ij/coarsening.saved.aurora
similarity index 61%
rename from external/hypre/src/test/TEST_ij/coarsening.saved.ray
rename to external/hypre/src/test/TEST_ij/coarsening.saved.aurora
index 80ea51ea..43c084e2 100644
--- a/external/hypre/src/test/TEST_ij/coarsening.saved.ray
+++ b/external/hypre/src/test/TEST_ij/coarsening.saved.aurora
@@ -20,45 +20,45 @@
                    cycle = 2.756625
 
 # Output file: coarsening.out.3
- Average Convergence Factor = 0.347587
+ Average Convergence Factor = 0.347564
 
-     Complexity:    grid = 1.204889
-                operator = 1.315634
-                   cycle = 2.631094
+     Complexity:    grid = 1.202667
+                operator = 1.314765
+                   cycle = 2.628293
 
 # Output file: coarsening.out.4
- Average Convergence Factor = 0.427978
+ Average Convergence Factor = 0.438291
 
-     Complexity:    grid = 1.100889
-                operator = 1.158136
-                   cycle = 2.315962
+     Complexity:    grid = 1.107556
+                operator = 1.162559
+                   cycle = 2.323882
 
 # Output file: coarsening.out.5
- Average Convergence Factor = 0.427978
+ Average Convergence Factor = 0.438291
 
-     Complexity:    grid = 1.100889
-                operator = 1.158136
-                   cycle = 2.315962
+     Complexity:    grid = 1.107556
+                operator = 1.162559
+                   cycle = 2.323882
 
 # Output file: coarsening.out.6
 Iterations = 12
-Final Relative Residual Norm = 3.729996e-09
+Final Relative Residual Norm = 4.310193e-09
 
 # Output file: coarsening.out.7
 Iterations = 13
-Final Relative Residual Norm = 2.767220e-09
+Final Relative Residual Norm = 3.231950e-09
 
 # Output file: coarsening.out.8
 BoomerAMG Iterations = 21
-Final Relative Residual Norm = 5.888646e-09
+Final Relative Residual Norm = 5.651891e-09
 
 # Output file: coarsening.out.9
 BoomerAMG Iterations = 26
-Final Relative Residual Norm = 9.316749e-09
+Final Relative Residual Norm = 9.810361e-09
 
 # Output file: coarsening.out.11
-BoomerAMG Iterations = 21
-Final Relative Residual Norm = 5.008125e-09
+BoomerAMG Iterations = 20
+Final Relative Residual Norm = 9.665671e-09
 
 # Output file: coarsening.out.12
 BoomerAMG Iterations = 15
@@ -66,7 +66,7 @@ Final Relative Residual Norm = 3.865632e-09
 
 # Output file: coarsening.out.13
 BoomerAMG Iterations = 24
-Final Relative Residual Norm = 9.878259e-09
+Final Relative Residual Norm = 8.745416e-09
 
 # Output file: coarsening.out.14
 BoomerAMG Iterations = 10
diff --git a/external/hypre/src/test/TEST_ij/coarsening.saved.lassen b/external/hypre/src/test/TEST_ij/coarsening.saved.lassen
index 80ea51ea..e4e1f69a 100644
--- a/external/hypre/src/test/TEST_ij/coarsening.saved.lassen
+++ b/external/hypre/src/test/TEST_ij/coarsening.saved.lassen
@@ -20,25 +20,25 @@
                    cycle = 2.756625
 
 # Output file: coarsening.out.3
- Average Convergence Factor = 0.347587
+ Average Convergence Factor = 0.347564
 
-     Complexity:    grid = 1.204889
-                operator = 1.315634
-                   cycle = 2.631094
+     Complexity:    grid = 1.202667
+                operator = 1.314765
+                   cycle = 2.628293
 
 # Output file: coarsening.out.4
- Average Convergence Factor = 0.427978
+ Average Convergence Factor = 0.427073
 
-     Complexity:    grid = 1.100889
-                operator = 1.158136
-                   cycle = 2.315962
+     Complexity:    grid = 1.102222
+                operator = 1.158928
+                   cycle = 2.317160
 
 # Output file: coarsening.out.5
- Average Convergence Factor = 0.427978
+ Average Convergence Factor = 0.427073
 
-     Complexity:    grid = 1.100889
-                operator = 1.158136
-                   cycle = 2.315962
+     Complexity:    grid = 1.102222
+                operator = 1.158928
+                   cycle = 2.317160
 
 # Output file: coarsening.out.6
 Iterations = 12
@@ -50,15 +50,15 @@ Final Relative Residual Norm = 2.767220e-09
 
 # Output file: coarsening.out.8
 BoomerAMG Iterations = 21
-Final Relative Residual Norm = 5.888646e-09
+Final Relative Residual Norm = 5.651891e-09
 
 # Output file: coarsening.out.9
 BoomerAMG Iterations = 26
-Final Relative Residual Norm = 9.316749e-09
+Final Relative Residual Norm = 9.673887e-09
 
 # Output file: coarsening.out.11
-BoomerAMG Iterations = 21
-Final Relative Residual Norm = 5.008125e-09
+BoomerAMG Iterations = 20
+Final Relative Residual Norm = 9.665671e-09
 
 # Output file: coarsening.out.12
 BoomerAMG Iterations = 15
@@ -66,7 +66,7 @@ Final Relative Residual Norm = 3.865632e-09
 
 # Output file: coarsening.out.13
 BoomerAMG Iterations = 24
-Final Relative Residual Norm = 9.878259e-09
+Final Relative Residual Norm = 9.339080e-09
 
 # Output file: coarsening.out.14
 BoomerAMG Iterations = 10
diff --git a/external/hypre/src/test/TEST_ij/coarsening.saved.lassen_cpu b/external/hypre/src/test/TEST_ij/coarsening.saved.lassen_cpu
new file mode 100644
index 00000000..5a3e1c7b
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/coarsening.saved.lassen_cpu
@@ -0,0 +1,74 @@
+# Output file: coarsening.out.0
+ Average Convergence Factor = 0.094028
+
+     Complexity:    grid = 1.220000
+                operator = 1.408310
+                   cycle = 2.816445
+
+# Output file: coarsening.out.1
+ Average Convergence Factor = 0.124105
+
+     Complexity:    grid = 1.190222
+                operator = 1.269219
+                   cycle = 2.538129
+
+# Output file: coarsening.out.2
+ Average Convergence Factor = 0.121893
+
+     Complexity:    grid = 1.236444
+                operator = 1.378931
+                   cycle = 2.756625
+
+# Output file: coarsening.out.3
+ Average Convergence Factor = 0.114604
+
+     Complexity:    grid = 1.204889
+                operator = 1.315634
+                   cycle = 2.631094
+
+# Output file: coarsening.out.4
+ Average Convergence Factor = 0.126924
+
+     Complexity:    grid = 1.104889
+                operator = 1.161632
+                   cycle = 2.322568
+
+# Output file: coarsening.out.5
+ Average Convergence Factor = 0.115880
+
+     Complexity:    grid = 1.130222
+                operator = 1.225044
+                   cycle = 2.449915
+
+# Output file: coarsening.out.6
+Iterations = 12
+Final Relative Residual Norm = 3.821883e-09
+
+# Output file: coarsening.out.7
+Iterations = 11
+Final Relative Residual Norm = 7.519111e-09
+
+# Output file: coarsening.out.8
+BoomerAMG Iterations = 13
+Final Relative Residual Norm = 3.043813e-09
+
+# Output file: coarsening.out.9
+BoomerAMG Iterations = 15
+Final Relative Residual Norm = 3.616706e-09
+
+# Output file: coarsening.out.11
+BoomerAMG Iterations = 13
+Final Relative Residual Norm = 5.238459e-09
+
+# Output file: coarsening.out.12
+BoomerAMG Iterations = 13
+Final Relative Residual Norm = 2.784140e-09
+
+# Output file: coarsening.out.13
+BoomerAMG Iterations = 14
+Final Relative Residual Norm = 3.301634e-09
+
+# Output file: coarsening.out.14
+BoomerAMG Iterations = 10
+Final Relative Residual Norm = 7.834527e-09
+
diff --git a/external/hypre/src/test/TEST_ij/coarsening.sh b/external/hypre/src/test/TEST_ij/coarsening.sh
old mode 100644
new mode 100755
index aa4235af..03a2380e
--- a/external/hypre/src/test/TEST_ij/coarsening.sh
+++ b/external/hypre/src/test/TEST_ij/coarsening.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_ij/data/beam_hex_dof459_np2/A.IJ.00000 b/external/hypre/src/test/TEST_ij/data/beam_hex_dof459_np2/A.IJ.00000
new file mode 100644
index 00000000..e6267520
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/data/beam_hex_dof459_np2/A.IJ.00000
@@ -0,0 +1,11467 @@
+0 242 0 242
+0 0 1.00000000000000e+00
+0 233 0.00000000000000e+00
+0 173 0.00000000000000e+00
+0 86 0.00000000000000e+00
+0 71 0.00000000000000e+00
+0 170 0.00000000000000e+00
+0 62 0.00000000000000e+00
+0 2 0.00000000000000e+00
+0 181 0.00000000000000e+00
+0 232 0.00000000000000e+00
+0 172 0.00000000000000e+00
+0 85 0.00000000000000e+00
+0 70 0.00000000000000e+00
+0 169 0.00000000000000e+00
+0 61 0.00000000000000e+00
+0 1 0.00000000000000e+00
+0 180 0.00000000000000e+00
+0 231 0.00000000000000e+00
+0 171 0.00000000000000e+00
+0 84 0.00000000000000e+00
+0 69 0.00000000000000e+00
+0 168 0.00000000000000e+00
+0 60 0.00000000000000e+00
+0 182 0.00000000000000e+00
+1 1 1.00000000000000e+00
+1 233 0.00000000000000e+00
+1 173 0.00000000000000e+00
+1 86 0.00000000000000e+00
+1 71 0.00000000000000e+00
+1 170 0.00000000000000e+00
+1 62 0.00000000000000e+00
+1 2 0.00000000000000e+00
+1 181 0.00000000000000e+00
+1 232 0.00000000000000e+00
+1 172 0.00000000000000e+00
+1 85 0.00000000000000e+00
+1 70 0.00000000000000e+00
+1 169 0.00000000000000e+00
+1 61 0.00000000000000e+00
+1 182 0.00000000000000e+00
+1 180 0.00000000000000e+00
+1 231 0.00000000000000e+00
+1 171 0.00000000000000e+00
+1 84 0.00000000000000e+00
+1 69 0.00000000000000e+00
+1 168 0.00000000000000e+00
+1 60 0.00000000000000e+00
+1 0 0.00000000000000e+00
+2 2 1.00000000000000e+00
+2 233 0.00000000000000e+00
+2 173 0.00000000000000e+00
+2 86 0.00000000000000e+00
+2 71 0.00000000000000e+00
+2 170 0.00000000000000e+00
+2 62 0.00000000000000e+00
+2 182 0.00000000000000e+00
+2 181 0.00000000000000e+00
+2 232 0.00000000000000e+00
+2 172 0.00000000000000e+00
+2 85 0.00000000000000e+00
+2 70 0.00000000000000e+00
+2 169 0.00000000000000e+00
+2 61 0.00000000000000e+00
+2 1 0.00000000000000e+00
+2 180 0.00000000000000e+00
+2 231 0.00000000000000e+00
+2 171 0.00000000000000e+00
+2 84 0.00000000000000e+00
+2 69 0.00000000000000e+00
+2 168 0.00000000000000e+00
+2 60 0.00000000000000e+00
+2 0 0.00000000000000e+00
+3 3 2.77777777777778e+01
+3 191 -4.16666666666667e+00
+3 188 -2.54787510534094e-17
+3 98 1.84178844050975e-16
+3 235 -2.08333333333333e+00
+3 190 3.30681662608079e-17
+3 187 -4.16666666666667e+00
+3 97 2.14699135206442e-16
+3 234 -3.47222222222222e+00
+3 189 -4.86111111111111e+00
+3 186 -4.86111111111111e+00
+3 96 -5.55555555555555e+00
+3 233 2.08333333333333e+00
+3 176 1.92554305833426e-16
+3 89 -1.50812522192734e-16
+3 173 4.16666666666667e+00
+3 170 -9.45424294407360e-17
+3 65 8.88178419700125e-16
+3 5 8.88178419700125e-16
+3 62 -9.36750677027476e-17
+3 232 2.08333333333333e+00
+3 175 6.15826833971767e-17
+3 88 -4.44089209850063e-16
+3 172 1.30104260698261e-17
+3 169 4.16666666666666e+00
+3 64 -9.25908655302621e-17
+3 4 -8.88178419700125e-16
+3 61 -1.96891114523368e-16
+3 231 -3.47222222222222e+00
+3 174 -1.38888888888889e+00
+3 87 5.55555555555556e+00
+3 171 -4.86111111111112e+00
+3 168 -4.86111111111111e+00
+3 63 5.55555555555556e+00
+3 236 -2.08333333333333e+00
+3 60 -5.55555555555555e+00
+4 4 2.77777777777778e+01
+4 191 3.13984949151802e-16
+4 188 6.94973592563208e-17
+4 98 2.08333333333333e+00
+4 235 -3.47222222222222e+00
+4 190 -6.94444444444444e-01
+4 187 -4.86111111111111e+00
+4 97 2.77777777777778e+00
+4 234 -2.08333333333333e+00
+4 189 5.55111512312578e-17
+4 186 -4.16666666666667e+00
+4 96 2.53161207275365e-16
+4 233 -2.08333333333333e+00
+4 176 -8.33333333333333e+00
+4 89 2.18141477104083e-16
+4 173 1.50920942409982e-16
+4 170 1.95590071916385e-16
+4 65 -2.29891518148395e-16
+4 5 8.33333333333333e+00
+4 62 2.08333333333333e+00
+4 232 -3.47222222222222e+00
+4 175 -9.72222222222223e+00
+4 88 5.55555555555556e+00
+4 172 -6.94444444444445e-01
+4 169 -4.86111111111111e+00
+4 64 -1.11111111111111e+01
+4 236 -2.08333333333333e+00
+4 61 2.77777777777778e+00
+4 231 2.08333333333333e+00
+4 174 6.88468379528295e-17
+4 87 -4.44089209850063e-16
+4 171 -3.39355279987963e-17
+4 168 4.16666666666666e+00
+4 63 1.95562966862073e-17
+4 3 0.00000000000000e+00
+4 60 -2.07299455379228e-16
+5 5 2.77777777777778e+01
+5 191 -4.86111111111111e+00
+5 188 -6.94444444444443e-01
+5 98 2.77777777777778e+00
+5 235 -2.08333333333333e+00
+5 190 2.53486467927111e-16
+5 187 1.63931368479808e-16
+5 97 2.08333333333333e+00
+5 234 -2.08333333333333e+00
+5 189 -4.16666666666667e+00
+5 186 1.41379963292110e-16
+5 96 1.55908272403416e-16
+5 233 -3.47222222222222e+00
+5 176 -9.72222222222222e+00
+5 89 -1.11111111111111e+01
+5 173 -4.86111111111111e+00
+5 170 -6.94444444444443e-01
+5 65 5.55555555555556e+00
+5 236 -3.47222222222222e+00
+5 62 2.77777777777778e+00
+5 232 -2.08333333333333e+00
+5 175 -8.33333333333333e+00
+5 88 3.33798743853975e-17
+5 172 7.44846892497542e-17
+5 169 1.56992474575901e-16
+5 64 -1.81061762805079e-17
+5 4 8.33333333333333e+00
+5 61 2.08333333333333e+00
+5 231 2.08333333333333e+00
+5 174 1.72713406076941e-16
+5 87 -5.13884724703817e-16
+5 171 4.16666666666666e+00
+5 168 4.11996825544492e-18
+5 63 8.88178419700125e-16
+5 3 8.88178419700125e-16
+5 60 -9.87979229677416e-18
+6 6 2.77777777777778e+01
+6 206 -4.16666666666667e+00
+6 203 -2.24321429487251e-16
+6 122 2.15281893874153e-16
+6 238 -2.08333333333333e+00
+6 205 -9.26992857475106e-17
+6 202 -4.16666666666667e+00
+6 121 -9.34311222139383e-17
+6 237 -3.47222222222222e+00
+6 204 -4.86111111111112e+00
+6 201 -4.86111111111111e+00
+6 120 -5.55555555555556e+00
+6 236 2.08333333333333e+00
+6 194 5.13478148889135e-16
+6 116 3.82940207321880e-16
+6 191 4.16666666666667e+00
+6 188 -1.08420217248550e-16
+6 101 8.88178419700125e-16
+6 8 3.55271367880050e-15
+6 98 -9.74914593498966e-16
+6 235 2.08333333333333e+00
+6 193 2.26381413614973e-16
+6 115 0.00000000000000e+00
+6 190 -2.16840434497101e-17
+6 187 4.16666666666667e+00
+6 100 2.93276687657329e-16
+6 7 -8.88178419700125e-16
+6 97 -1.98625837999344e-16
+6 234 -3.47222222222222e+00
+6 192 -1.38888888888889e+00
+6 114 5.55555555555556e+00
+6 189 -4.86111111111111e+00
+6 186 -4.86111111111111e+00
+6 99 5.55555555555556e+00
+6 239 -2.08333333333333e+00
+6 96 -5.55555555555555e+00
+7 7 2.77777777777778e+01
+7 206 -3.64291929955129e-16
+7 203 -3.84891771232354e-17
+7 122 2.08333333333333e+00
+7 238 -3.47222222222222e+00
+7 205 -6.94444444444445e-01
+7 202 -4.86111111111111e+00
+7 121 2.77777777777778e+00
+7 237 -2.08333333333333e+00
+7 204 -6.93889390390723e-18
+7 201 -4.16666666666667e+00
+7 120 1.94397449526651e-16
+7 236 -2.08333333333333e+00
+7 194 -8.33333333333333e+00
+7 116 8.32016747165376e-16
+7 191 2.64545330086463e-16
+7 188 4.56882795485392e-16
+7 101 6.76054264653336e-16
+7 8 8.33333333333333e+00
+7 98 2.08333333333333e+00
+7 235 -3.47222222222222e+00
+7 193 -9.72222222222223e+00
+7 115 5.55555555555556e+00
+7 190 -6.94444444444444e-01
+7 187 -4.86111111111111e+00
+7 100 -1.11111111111111e+01
+7 239 -2.08333333333333e+00
+7 97 2.77777777777778e+00
+7 234 2.08333333333333e+00
+7 192 1.42897846333589e-16
+7 114 0.00000000000000e+00
+7 189 -4.84638371101020e-17
+7 186 4.16666666666666e+00
+7 99 2.90755917606300e-16
+7 6 -8.88178419700125e-16
+7 96 -1.21511958481313e-16
+8 8 2.77777777777778e+01
+8 206 -4.86111111111111e+00
+8 203 -6.94444444444444e-01
+8 122 2.77777777777777e+00
+8 238 -2.08333333333333e+00
+8 205 -3.07262895682392e-16
+8 202 -1.05818132034585e-16
+8 121 2.08333333333333e+00
+8 237 -2.08333333333333e+00
+8 204 -4.16666666666667e+00
+8 201 -1.30104260698261e-16
+8 120 2.67147415300428e-16
+8 236 -3.47222222222222e+00
+8 194 -9.72222222222222e+00
+8 116 -1.11111111111111e+01
+8 191 -4.86111111111111e+00
+8 188 -6.94444444444444e-01
+8 101 5.55555555555556e+00
+8 239 -3.47222222222222e+00
+8 98 2.77777777777778e+00
+8 235 -2.08333333333333e+00
+8 193 -8.33333333333333e+00
+8 115 4.13053922662665e-16
+8 190 1.96782694306119e-16
+8 187 4.90059381963448e-16
+8 100 1.03259414907519e-15
+8 7 8.33333333333333e+00
+8 97 2.08333333333333e+00
+8 234 2.08333333333333e+00
+8 192 2.63786388565723e-16
+8 114 2.64260727016186e-16
+8 189 4.16666666666666e+00
+8 186 -1.64690310000548e-16
+8 99 8.88178419700125e-16
+8 6 3.55271367880050e-15
+8 96 -1.13957779844520e-15
+9 9 2.77777777777778e+01
+9 221 -4.16666666666667e+00
+9 218 1.61220863048595e-16
+9 146 -8.16729496533330e-16
+9 241 -2.08333333333333e+00
+9 220 -9.44340092234874e-17
+9 217 -4.16666666666667e+00
+9 145 -4.88297553433159e-16
+9 240 -3.47222222222222e+00
+9 219 -4.86111111111111e+00
+9 216 -4.86111111111111e+00
+9 144 -5.55555555555555e+00
+9 239 2.08333333333333e+00
+9 209 -7.80625564189563e-18
+9 140 9.38810661155198e-16
+9 206 4.16666666666667e+00
+9 203 -1.11022302462516e-16
+9 125 4.44089209850063e-16
+9 11 2.66453525910038e-15
+9 122 -1.14817010066215e-15
+9 238 2.08333333333333e+00
+9 208 -1.12757025938492e-17
+9 139 -8.88178419700125e-16
+9 205 2.25514051876985e-16
+9 202 4.16666666666667e+00
+9 124 -8.78203759713259e-18
+9 10 0.00000000000000e+00
+9 121 9.24824453130135e-16
+9 237 -3.47222222222222e+00
+9 207 -1.38888888888889e+00
+9 138 5.55555555555555e+00
+9 204 -4.86111111111111e+00
+9 201 -4.86111111111111e+00
+9 123 5.55555555555556e+00
+9 242 -2.08333333333333e+00
+9 120 -5.55555555555554e+00
+10 10 2.77777777777778e+01
+10 221 -2.60208521396521e-16
+10 218 -5.33427468862868e-16
+10 146 2.08333333333333e+00
+10 241 -3.47222222222222e+00
+10 220 -6.94444444444445e-01
+10 217 -4.86111111111111e+00
+10 145 2.77777777777778e+00
+10 240 -2.08333333333333e+00
+10 219 -2.86229373536173e-17
+10 216 -4.16666666666667e+00
+10 144 -4.28043017697277e-16
+10 239 -2.08333333333333e+00
+10 209 -8.33333333333334e+00
+10 140 -5.41016884070267e-16
+10 206 -4.11129463806503e-16
+10 203 -5.38848479725296e-17
+10 125 4.19355847790237e-16
+10 11 8.33333333333333e+00
+10 122 2.08333333333333e+00
+10 238 -3.47222222222222e+00
+10 208 -9.72222222222223e+00
+10 139 5.55555555555556e+00
+10 205 -6.94444444444444e-01
+10 202 -4.86111111111111e+00
+10 124 -1.11111111111111e+01
+10 242 -2.08333333333333e+00
+10 121 2.77777777777778e+00
+10 237 2.08333333333333e+00
+10 207 4.15249432061948e-17
+10 138 -8.88178419700125e-16
+10 204 2.67147415300428e-16
+10 201 4.16666666666666e+00
+10 123 -1.59513244626930e-17
+10 9 -8.88178419700125e-16
+10 120 9.10092856111488e-16
+11 11 2.77777777777778e+01
+11 221 -4.86111111111111e+00
+11 218 -6.94444444444444e-01
+11 146 2.77777777777778e+00
+11 241 -2.08333333333333e+00
+11 220 -3.72965547335014e-16
+11 217 -5.52509427098613e-16
+11 145 2.08333333333333e+00
+11 240 -2.08333333333333e+00
+11 219 -4.16666666666667e+00
+11 216 1.00613961606655e-16
+11 144 -9.26559176606112e-16
+11 239 -3.47222222222222e+00
+11 209 -9.72222222222222e+00
+11 140 -1.11111111111111e+01
+11 206 -4.86111111111111e+00
+11 203 -6.94444444444443e-01
+11 125 5.55555555555556e+00
+11 242 -3.47222222222222e+00
+11 122 2.77777777777778e+00
+11 238 -2.08333333333333e+00
+11 208 -8.33333333333334e+00
+11 139 -6.01339182441929e-16
+11 205 -2.68990558993654e-16
+11 202 -6.41847686111419e-17
+11 124 6.67001176513082e-16
+11 10 8.33333333333333e+00
+11 121 2.08333333333333e+00
+11 237 2.08333333333333e+00
+11 207 7.32920668600201e-17
+11 138 7.98121876748048e-16
+11 204 4.16666666666666e+00
+11 201 -1.55257751099924e-16
+11 123 4.44089209850063e-16
+11 9 2.66453525910038e-15
+11 120 -1.33897613049244e-15
+12 12 1.41666666666667e+01
+12 164 -8.04701628682319e-16
+12 149 -2.04166666666667e+00
+12 14 -4.08333333333333e+00
+12 223 -2.15620707053055e-17
+12 163 -2.04166666666667e+00
+12 148 5.77337656848531e-17
+12 13 -4.08333333333333e+00
+12 222 -7.08333333333333e-01
+12 162 2.83333333333334e+00
+12 147 2.83333333333334e+00
+12 224 8.09085871217308e-18
+12 221 4.16666666666667e+00
+12 218 1.27502175484295e-16
+12 146 6.97358837342676e-16
+12 241 2.08333333333333e+00
+12 220 1.30104260698261e-17
+12 217 4.16666666666667e+00
+12 145 -8.67361737988404e-17
+12 240 -3.47222222222222e+00
+12 219 -4.86111111111112e+00
+12 216 -4.86111111111111e+00
+12 242 2.08333333333333e+00
+12 144 -5.55555555555556e+00
+12 449 -4.16666666666667e-02
+12 392 -8.33333333333333e-02
+12 389 -1.39082809939156e-18
+12 293 2.28836538612590e-17
+12 448 -4.16666666666667e-02
+12 391 9.09713385351119e-19
+12 388 -8.33333333333334e-02
+12 292 1.43783842796417e-19
+12 447 -6.94444444444445e-02
+12 390 -9.72222222222222e-02
+12 387 -9.72222222222222e-02
+12 291 -1.11111111111111e-01
+13 13 1.41666666666667e+01
+13 164 2.26630441301466e-16
+13 149 4.76153218551901e-17
+13 14 4.25000000000000e+00
+13 223 -4.95833333333333e+00
+13 163 2.83333333333333e+00
+13 148 -5.66666666666666e+00
+13 224 -4.25000000000000e+00
+13 222 -1.59089728153303e-17
+13 162 -2.04166666666667e+00
+13 147 1.73936098136302e-16
+13 12 -4.08333333333333e+00
+13 221 1.54390389361936e-16
+13 218 -8.82540568403201e-17
+13 146 2.08333333333333e+00
+13 241 -3.47222222222222e+00
+13 220 -6.94444444444446e-01
+13 217 -4.86111111111111e+00
+13 242 -2.08333333333333e+00
+13 145 2.77777777777778e+00
+13 240 2.08333333333333e+00
+13 219 3.96817995129695e-17
+13 216 4.16666666666666e+00
+13 144 -1.59066011230780e-16
+13 449 -4.16666666666667e-02
+13 392 -7.99599102208060e-18
+13 389 7.74357520379881e-18
+13 293 4.16666666666666e-02
+13 448 -6.94444444444444e-02
+13 391 -1.38888888888889e-02
+13 388 -9.72222222222222e-02
+13 292 5.55555555555555e-02
+13 447 -4.16666666666667e-02
+13 390 7.45388993583784e-19
+13 387 -8.33333333333334e-02
+13 291 4.33680868994202e-19
+14 14 1.41666666666667e+01
+14 164 -5.66666666666666e+00
+14 149 2.83333333333333e+00
+14 224 -4.95833333333333e+00
+14 223 -4.25000000000000e+00
+14 163 -6.77708943515798e-17
+14 148 -9.84404750640003e-17
+14 13 4.25000000000000e+00
+14 222 -1.57463424894574e-17
+14 162 -3.83377276322663e-16
+14 147 -2.04166666666667e+00
+14 12 -4.08333333333333e+00
+14 221 -4.86111111111111e+00
+14 218 -6.94444444444444e-01
+14 242 -3.47222222222222e+00
+14 146 2.77777777777778e+00
+14 241 -2.08333333333333e+00
+14 220 3.31765864780564e-17
+14 217 -2.25514051876985e-17
+14 145 2.08333333333333e+00
+14 240 2.08333333333333e+00
+14 219 4.16666666666667e+00
+14 216 1.71520783687207e-16
+14 144 6.84876959831937e-16
+14 449 -6.94444444444444e-02
+14 392 -9.72222222222222e-02
+14 389 -1.38888888888889e-02
+14 293 5.55555555555555e-02
+14 448 -4.16666666666667e-02
+14 391 -7.70630575411962e-18
+14 388 6.65429083362978e-18
+14 292 4.16666666666666e-02
+14 447 -4.16666666666667e-02
+14 390 -8.33333333333333e-02
+14 387 -2.84603070277445e-19
+14 291 2.64477567450683e-17
+15 15 1.00000000000000e+00
+15 179 0.00000000000000e+00
+15 233 0.00000000000000e+00
+15 182 0.00000000000000e+00
+15 17 0.00000000000000e+00
+15 68 0.00000000000000e+00
+15 170 0.00000000000000e+00
+15 71 0.00000000000000e+00
+15 94 0.00000000000000e+00
+15 178 0.00000000000000e+00
+15 232 0.00000000000000e+00
+15 181 0.00000000000000e+00
+15 16 0.00000000000000e+00
+15 67 0.00000000000000e+00
+15 169 0.00000000000000e+00
+15 70 0.00000000000000e+00
+15 93 0.00000000000000e+00
+15 177 0.00000000000000e+00
+15 231 0.00000000000000e+00
+15 180 0.00000000000000e+00
+15 95 0.00000000000000e+00
+15 66 0.00000000000000e+00
+15 168 0.00000000000000e+00
+15 69 0.00000000000000e+00
+16 16 1.00000000000000e+00
+16 179 0.00000000000000e+00
+16 233 0.00000000000000e+00
+16 182 0.00000000000000e+00
+16 17 0.00000000000000e+00
+16 68 0.00000000000000e+00
+16 170 0.00000000000000e+00
+16 71 0.00000000000000e+00
+16 94 0.00000000000000e+00
+16 178 0.00000000000000e+00
+16 232 0.00000000000000e+00
+16 181 0.00000000000000e+00
+16 95 0.00000000000000e+00
+16 67 0.00000000000000e+00
+16 169 0.00000000000000e+00
+16 70 0.00000000000000e+00
+16 93 0.00000000000000e+00
+16 177 0.00000000000000e+00
+16 231 0.00000000000000e+00
+16 180 0.00000000000000e+00
+16 15 0.00000000000000e+00
+16 66 0.00000000000000e+00
+16 168 0.00000000000000e+00
+16 69 0.00000000000000e+00
+17 17 1.00000000000000e+00
+17 179 0.00000000000000e+00
+17 233 0.00000000000000e+00
+17 182 0.00000000000000e+00
+17 95 0.00000000000000e+00
+17 68 0.00000000000000e+00
+17 170 0.00000000000000e+00
+17 71 0.00000000000000e+00
+17 94 0.00000000000000e+00
+17 178 0.00000000000000e+00
+17 232 0.00000000000000e+00
+17 181 0.00000000000000e+00
+17 16 0.00000000000000e+00
+17 67 0.00000000000000e+00
+17 169 0.00000000000000e+00
+17 70 0.00000000000000e+00
+17 93 0.00000000000000e+00
+17 177 0.00000000000000e+00
+17 231 0.00000000000000e+00
+17 180 0.00000000000000e+00
+17 15 0.00000000000000e+00
+17 66 0.00000000000000e+00
+17 168 0.00000000000000e+00
+17 69 0.00000000000000e+00
+18 18 2.77777777777778e+01
+18 236 -2.08333333333333e+00
+18 104 -9.62771529167128e-17
+18 188 -7.92551788086904e-17
+18 196 6.50521303491303e-17
+18 235 2.08333333333333e+00
+18 103 6.84131570838353e-17
+18 187 4.16666666666666e+00
+18 195 -4.86111111111111e+00
+18 234 -3.47222222222222e+00
+18 102 -5.55555555555555e+00
+18 186 -4.86111111111111e+00
+18 179 4.16666666666667e+00
+18 92 1.24900090270330e-16
+18 176 7.37257477290143e-17
+18 233 2.08333333333333e+00
+18 68 -2.15105711021124e-16
+18 20 0.00000000000000e+00
+18 65 8.88178419700125e-16
+18 170 1.48318857196017e-16
+18 178 -9.71445146547012e-17
+18 91 8.88178419700125e-16
+18 175 2.09251019289702e-17
+18 232 -2.08333333333333e+00
+18 67 -1.70870262383715e-16
+18 19 0.00000000000000e+00
+18 64 -3.43285512863223e-17
+18 169 -4.16666666666667e+00
+18 177 -4.86111111111111e+00
+18 90 5.55555555555556e+00
+18 174 -1.38888888888889e+00
+18 231 -3.47222222222222e+00
+18 66 -5.55555555555555e+00
+18 197 -4.16666666666667e+00
+18 63 5.55555555555556e+00
+18 168 -4.86111111111111e+00
+19 19 2.77777777777778e+01
+19 236 2.08333333333333e+00
+19 104 -2.08333333333333e+00
+19 188 2.18575157973078e-16
+19 196 -6.94444444444445e-01
+19 235 -3.47222222222222e+00
+19 103 2.77777777777778e+00
+19 187 -4.86111111111111e+00
+19 195 -4.85722573273506e-17
+19 234 2.08333333333333e+00
+19 102 -5.37764277552810e-17
+19 186 4.16666666666667e+00
+19 179 1.17961196366423e-16
+19 92 -2.41993924898765e-16
+19 176 8.33333333333333e+00
+19 233 2.08333333333333e+00
+19 68 -2.08333333333333e+00
+19 20 -8.33333333333333e+00
+19 65 2.59341159658533e-16
+19 170 1.20563281580388e-16
+19 178 -6.94444444444445e-01
+19 91 5.55555555555556e+00
+19 175 -9.72222222222223e+00
+19 232 -3.47222222222222e+00
+19 67 2.77777777777778e+00
+19 197 1.11022302462516e-16
+19 64 -1.11111111111111e+01
+19 169 -4.86111111111111e+00
+19 177 -8.32667268468867e-17
+19 90 8.88178419700125e-16
+19 174 6.85215773010839e-17
+19 231 -2.08333333333333e+00
+19 66 -2.15539391890118e-16
+19 18 -8.88178419700125e-16
+19 63 1.85398571495021e-17
+19 168 -4.16666666666667e+00
+20 20 2.77777777777778e+01
+20 236 -3.47222222222222e+00
+20 104 2.77777777777778e+00
+20 188 -6.94444444444444e-01
+20 196 -1.38777878078145e-17
+20 235 2.08333333333333e+00
+20 103 -2.08333333333333e+00
+20 187 2.07407875596477e-16
+20 195 -4.16666666666667e+00
+20 234 -2.08333333333333e+00
+20 102 -1.59594559789866e-16
+20 186 -9.28077059647592e-17
+20 179 -4.86111111111111e+00
+20 92 -1.11111111111111e+01
+20 176 -9.72222222222222e+00
+20 233 -3.47222222222222e+00
+20 68 2.77777777777778e+00
+20 197 -4.86111111111111e+00
+20 65 5.55555555555556e+00
+20 170 -6.94444444444444e-01
+20 178 2.14238349283136e-16
+20 91 -3.71881345162528e-17
+20 175 8.33333333333333e+00
+20 232 2.08333333333333e+00
+20 67 -2.08333333333333e+00
+20 19 -8.33333333333333e+00
+20 64 -7.84691322336384e-18
+20 169 1.02782365951626e-16
+20 177 4.16666666666667e+00
+20 90 9.54097911787244e-18
+20 174 2.70508442035133e-16
+20 231 2.08333333333333e+00
+20 66 -8.93382590128056e-17
+20 18 0.00000000000000e+00
+20 63 8.88178419700125e-16
+20 168 8.99887803162969e-17
+21 21 2.77777777777778e+01
+21 239 -2.08333333333333e+00
+21 128 -1.36089056690381e-15
+21 203 -2.96312453740288e-16
+21 211 -1.46584133720040e-16
+21 238 2.08333333333333e+00
+21 127 -1.56667213924155e-16
+21 202 4.16666666666666e+00
+21 210 -4.86111111111112e+00
+21 237 -3.47222222222222e+00
+21 126 -5.55555555555556e+00
+21 201 -4.86111111111111e+00
+21 197 4.16666666666667e+00
+21 119 9.08995101411847e-16
+21 194 4.57966997657877e-16
+21 236 2.08333333333333e+00
+21 104 -6.73072708679001e-16
+21 23 1.77635683940025e-15
+21 101 8.88178419700125e-16
+21 188 2.60208521396521e-18
+21 196 -2.77555756156289e-17
+21 118 8.88178419700125e-16
+21 193 1.30646361784503e-16
+21 235 -2.08333333333333e+00
+21 103 -3.39138439553466e-16
+21 22 -8.88178419700125e-16
+21 100 4.08825534189972e-16
+21 187 -4.16666666666667e+00
+21 195 -4.86111111111111e+00
+21 117 5.55555555555556e+00
+21 192 -1.38888888888889e+00
+21 234 -3.47222222222222e+00
+21 102 -5.55555555555555e+00
+21 212 -4.16666666666667e+00
+21 99 5.55555555555556e+00
+21 186 -4.86111111111111e+00
+22 22 2.77777777777778e+01
+22 239 2.08333333333333e+00
+22 128 -2.08333333333333e+00
+22 203 8.30065183254902e-16
+22 211 -6.94444444444446e-01
+22 238 -3.47222222222222e+00
+22 127 2.77777777777778e+00
+22 202 -4.86111111111111e+00
+22 210 -1.52655665885959e-16
+22 237 2.08333333333333e+00
+22 126 -2.78423117894278e-16
+22 201 4.16666666666667e+00
+22 197 2.98372437868011e-16
+22 119 -7.77156117237610e-16
+22 194 8.33333333333333e+00
+22 236 2.08333333333333e+00
+22 104 -2.08333333333333e+00
+22 23 -8.33333333333333e+00
+22 101 9.84021891747844e-16
+22 188 -5.01335084557297e-16
+22 196 -6.94444444444444e-01
+22 118 5.55555555555556e+00
+22 193 -9.72222222222223e+00
+22 235 -3.47222222222222e+00
+22 103 2.77777777777778e+00
+22 212 8.32667268468867e-17
+22 100 -1.11111111111111e+01
+22 187 -4.86111111111111e+00
+22 195 -5.81132364452230e-17
+22 117 8.88178419700125e-16
+22 192 1.16226472890446e-16
+22 234 -2.08333333333333e+00
+22 102 -3.02492406123456e-16
+22 21 -8.88178419700125e-16
+22 99 2.93276687657329e-16
+22 186 -4.16666666666667e+00
+23 23 2.77777777777778e+01
+23 239 -3.47222222222222e+00
+23 128 2.77777777777778e+00
+23 203 -6.94444444444444e-01
+23 211 8.50014503228635e-17
+23 238 2.08333333333333e+00
+23 127 -2.08333333333333e+00
+23 202 8.49255561707896e-16
+23 210 -4.16666666666667e+00
+23 237 -2.08333333333333e+00
+23 126 -1.40859546249317e-15
+23 201 -2.47198095326695e-16
+23 197 -4.86111111111111e+00
+23 119 -1.11111111111111e+01
+23 194 -9.72222222222222e+00
+23 236 -3.47222222222222e+00
+23 104 2.77777777777778e+00
+23 212 -4.86111111111111e+00
+23 101 5.55555555555556e+00
+23 188 -6.94444444444444e-01
+23 196 3.09648140461860e-16
+23 118 -3.57461456268471e-16
+23 193 8.33333333333333e+00
+23 235 2.08333333333333e+00
+23 103 -2.08333333333333e+00
+23 22 -8.33333333333333e+00
+23 100 8.91159975674460e-16
+23 187 -4.36282954208167e-16
+23 195 4.16666666666667e+00
+23 117 7.39859562504108e-16
+23 192 1.52764086103208e-16
+23 234 2.08333333333333e+00
+23 102 -5.03069808033274e-16
+23 21 1.77635683940025e-15
+23 99 8.88178419700125e-16
+23 186 -4.42354486374086e-17
+24 24 2.77777777777778e+01
+24 242 -2.08333333333333e+00
+24 152 6.75674793892966e-16
+24 218 6.59194920871187e-17
+24 226 -9.19403442267708e-17
+24 241 2.08333333333333e+00
+24 151 -4.39535560725623e-16
+24 217 4.16666666666666e+00
+24 225 -4.86111111111111e+00
+24 240 -3.47222222222222e+00
+24 150 -5.55555555555555e+00
+24 216 -4.86111111111111e+00
+24 212 4.16666666666667e+00
+24 143 -9.78384040450919e-16
+24 209 -4.94396190653390e-17
+24 239 2.08333333333333e+00
+24 128 4.64905891561784e-16
+24 26 0.00000000000000e+00
+24 125 4.44089209850063e-16
+24 203 -1.23165366794353e-16
+24 211 2.84494650060196e-16
+24 142 8.88178419700125e-16
+24 208 -5.42101086242752e-18
+24 238 -2.08333333333333e+00
+24 127 6.76542155630955e-16
+24 25 -1.77635683940025e-15
+24 124 -1.42166009867162e-17
+24 202 -4.16666666666667e+00
+24 210 -4.86111111111111e+00
+24 141 5.55555555555555e+00
+24 207 -1.38888888888889e+00
+24 237 -3.47222222222222e+00
+24 126 -5.55555555555555e+00
+24 227 -4.16666666666667e+00
+24 123 5.55555555555556e+00
+24 201 -4.86111111111111e+00
+25 25 2.77777777777778e+01
+25 242 2.08333333333333e+00
+25 152 -2.08333333333333e+00
+25 218 -5.64652491430451e-16
+25 226 -6.94444444444443e-01
+25 241 -3.47222222222222e+00
+25 151 2.77777777777778e+00
+25 217 -4.86111111111111e+00
+25 225 -9.02056207507940e-17
+25 240 2.08333333333333e+00
+25 150 -4.79651041107587e-16
+25 216 4.16666666666667e+00
+25 212 -5.96744875736022e-16
+25 143 -1.10068204550728e-15
+25 209 8.33333333333334e+00
+25 239 2.08333333333333e+00
+25 128 -2.08333333333333e+00
+25 26 -8.33333333333334e+00
+25 125 1.06251812903579e-15
+25 203 -7.10369263412503e-16
+25 211 -6.94444444444445e-01
+25 142 5.55555555555556e+00
+25 208 -9.72222222222223e+00
+25 238 -3.47222222222222e+00
+25 127 2.77777777777778e+00
+25 227 8.32667268468867e-17
+25 124 -1.11111111111111e+01
+25 202 -4.86111111111111e+00
+25 210 2.94035629178069e-16
+25 141 8.88178419700125e-16
+25 207 -2.51534904016637e-17
+25 237 -2.08333333333333e+00
+25 126 8.35160933465584e-16
+25 24 -1.77635683940025e-15
+25 123 9.87708179134295e-17
+25 201 -4.16666666666667e+00
+26 26 2.77777777777778e+01
+26 242 -3.47222222222222e+00
+26 152 2.77777777777778e+00
+26 218 -6.94444444444443e-01
+26 226 1.21430643318376e-17
+26 241 2.08333333333333e+00
+26 151 -2.08333333333333e+00
+26 217 -5.58906219916278e-16
+26 225 -4.16666666666667e+00
+26 240 -2.08333333333333e+00
+26 150 7.28583859910259e-16
+26 216 -2.34187669256869e-17
+26 212 -4.86111111111111e+00
+26 143 -1.11111111111111e+01
+26 209 -9.72222222222222e+00
+26 239 -3.47222222222222e+00
+26 128 2.77777777777778e+00
+26 227 -4.86111111111111e+00
+26 125 5.55555555555556e+00
+26 203 -6.94444444444442e-01
+26 211 -6.33174068731535e-16
+26 142 -8.99670962728472e-16
+26 208 8.33333333333334e+00
+26 238 2.08333333333333e+00
+26 127 -2.08333333333333e+00
+26 25 -8.33333333333334e+00
+26 124 5.58133725868382e-16
+26 202 -6.57026516526216e-16
+26 210 4.16666666666667e+00
+26 141 -7.28583859910259e-16
+26 207 8.08814820674186e-17
+26 237 2.08333333333333e+00
+26 126 5.16080234103100e-16
+26 24 0.00000000000000e+00
+26 123 4.44089209850063e-16
+26 201 -1.04191828775857e-16
+27 27 1.41666666666667e+01
+27 224 -4.74202925190848e-17
+27 29 -4.08333333333334e+00
+27 149 -2.04166666666667e+00
+27 166 2.04166666666667e+00
+27 223 -1.50568576703924e-17
+27 28 4.08333333333333e+00
+27 148 6.63832426257404e-17
+27 165 2.83333333333333e+00
+27 222 -7.08333333333333e-01
+27 167 2.92951427005583e-16
+27 147 2.83333333333334e+00
+27 242 2.08333333333333e+00
+27 152 6.24500451351651e-17
+27 218 2.59341159658533e-16
+27 226 6.93889390390723e-17
+27 241 -2.08333333333333e+00
+27 151 -6.07153216591882e-18
+27 217 -4.16666666666667e+00
+27 225 -4.86111111111111e+00
+27 240 -3.47222222222222e+00
+27 150 -5.55555555555556e+00
+27 227 4.16666666666667e+00
+27 216 -4.86111111111111e+00
+27 398 -8.33333333333334e-02
+27 449 -4.16666666666667e-02
+27 299 -3.46944695195361e-17
+27 389 -3.22041926546085e-18
+27 397 -6.77626357803440e-20
+27 448 4.16666666666667e-02
+27 298 -1.66696084019646e-18
+27 388 8.33333333333334e-02
+27 396 -9.72222222222223e-02
+27 447 -6.94444444444445e-02
+27 297 -1.11111111111111e-01
+27 387 -9.72222222222222e-02
+28 28 1.41666666666667e+01
+28 224 4.25000000000000e+00
+28 29 -4.25000000000000e+00
+28 149 2.93661240615382e-16
+28 166 2.83333333333333e+00
+28 223 -4.95833333333333e+00
+28 167 -5.69788899222601e-16
+28 148 -5.66666666666666e+00
+28 165 2.04166666666667e+00
+28 222 -2.15485181781494e-17
+28 27 4.08333333333333e+00
+28 147 5.68664039468647e-17
+28 242 2.08333333333333e+00
+28 152 -2.08333333333333e+00
+28 218 3.57353036051222e-16
+28 226 -6.94444444444445e-01
+28 241 -3.47222222222222e+00
+28 151 2.77777777777778e+00
+28 227 -2.22044604925031e-16
+28 217 -4.86111111111111e+00
+28 225 6.41847686111419e-17
+28 240 -2.08333333333333e+00
+28 150 -1.14925430283463e-17
+28 216 -4.16666666666667e+00
+28 398 -1.26851654180804e-17
+28 449 4.16666666666667e-02
+28 299 -4.16666666666667e-02
+28 389 1.57073789738837e-17
+28 397 -1.38888888888889e-02
+28 448 -6.94444444444444e-02
+28 298 5.55555555555555e-02
+28 388 -9.72222222222222e-02
+28 396 -5.42101086242752e-19
+28 447 4.16666666666667e-02
+28 297 -8.53809210832335e-19
+28 387 8.33333333333334e-02
+29 29 1.41666666666667e+01
+29 224 -4.95833333333333e+00
+29 167 -5.66666666666667e+00
+29 149 2.83333333333333e+00
+29 166 -2.25827454067469e-16
+29 223 4.25000000000000e+00
+29 28 -4.25000000000000e+00
+29 148 1.88127711651075e-16
+29 165 1.15860554657232e-16
+29 222 4.23499532968205e-17
+29 27 -4.08333333333334e+00
+29 147 -2.04166666666667e+00
+29 242 -3.47222222222222e+00
+29 152 2.77777777777778e+00
+29 227 -4.86111111111111e+00
+29 218 -6.94444444444444e-01
+29 226 -1.83880688453542e-16
+29 241 2.08333333333333e+00
+29 151 -2.08333333333333e+00
+29 217 3.43041567374414e-16
+29 225 4.16666666666667e+00
+29 240 2.08333333333333e+00
+29 150 -6.85215773010839e-17
+29 216 2.54028569013354e-16
+29 398 -9.72222222222223e-02
+29 449 -6.94444444444444e-02
+29 299 5.55555555555556e-02
+29 389 -1.38888888888889e-02
+29 397 -1.35389746289127e-17
+29 448 4.16666666666667e-02
+29 298 -4.16666666666667e-02
+29 388 1.57785297414531e-17
+29 396 -8.33333333333334e-02
+29 447 -4.16666666666667e-02
+29 297 -3.31765864780564e-17
+29 387 -2.23616698075135e-18
+30 30 1.00000000000000e+00
+30 185 0.00000000000000e+00
+30 74 0.00000000000000e+00
+30 32 0.00000000000000e+00
+30 182 0.00000000000000e+00
+30 233 0.00000000000000e+00
+30 173 0.00000000000000e+00
+30 86 0.00000000000000e+00
+30 82 0.00000000000000e+00
+30 184 0.00000000000000e+00
+30 73 0.00000000000000e+00
+30 31 0.00000000000000e+00
+30 181 0.00000000000000e+00
+30 232 0.00000000000000e+00
+30 172 0.00000000000000e+00
+30 85 0.00000000000000e+00
+30 81 0.00000000000000e+00
+30 183 0.00000000000000e+00
+30 72 0.00000000000000e+00
+30 83 0.00000000000000e+00
+30 180 0.00000000000000e+00
+30 231 0.00000000000000e+00
+30 171 0.00000000000000e+00
+30 84 0.00000000000000e+00
+31 31 1.00000000000000e+00
+31 185 0.00000000000000e+00
+31 74 0.00000000000000e+00
+31 32 0.00000000000000e+00
+31 182 0.00000000000000e+00
+31 233 0.00000000000000e+00
+31 173 0.00000000000000e+00
+31 86 0.00000000000000e+00
+31 82 0.00000000000000e+00
+31 184 0.00000000000000e+00
+31 73 0.00000000000000e+00
+31 83 0.00000000000000e+00
+31 181 0.00000000000000e+00
+31 232 0.00000000000000e+00
+31 172 0.00000000000000e+00
+31 85 0.00000000000000e+00
+31 81 0.00000000000000e+00
+31 183 0.00000000000000e+00
+31 72 0.00000000000000e+00
+31 30 0.00000000000000e+00
+31 180 0.00000000000000e+00
+31 231 0.00000000000000e+00
+31 171 0.00000000000000e+00
+31 84 0.00000000000000e+00
+32 32 1.00000000000000e+00
+32 185 0.00000000000000e+00
+32 74 0.00000000000000e+00
+32 83 0.00000000000000e+00
+32 182 0.00000000000000e+00
+32 233 0.00000000000000e+00
+32 173 0.00000000000000e+00
+32 86 0.00000000000000e+00
+32 82 0.00000000000000e+00
+32 184 0.00000000000000e+00
+32 73 0.00000000000000e+00
+32 31 0.00000000000000e+00
+32 181 0.00000000000000e+00
+32 232 0.00000000000000e+00
+32 172 0.00000000000000e+00
+32 85 0.00000000000000e+00
+32 81 0.00000000000000e+00
+32 183 0.00000000000000e+00
+32 72 0.00000000000000e+00
+32 30 0.00000000000000e+00
+32 180 0.00000000000000e+00
+32 231 0.00000000000000e+00
+32 171 0.00000000000000e+00
+32 84 0.00000000000000e+00
+33 33 2.77777777777778e+01
+33 107 2.29850860566927e-16
+33 236 2.08333333333333e+00
+33 191 4.16666666666667e+00
+33 199 -4.16666666666667e+00
+33 106 2.11636264069170e-16
+33 235 -2.08333333333333e+00
+33 190 5.55111512312578e-17
+33 198 -4.86111111111111e+00
+33 105 -5.55555555555555e+00
+33 234 -3.47222222222222e+00
+33 189 -4.86111111111111e+00
+33 185 -1.11022302462516e-16
+33 77 8.88178419700125e-16
+33 35 -8.88178419700125e-16
+33 74 2.42861286636753e-17
+33 233 -2.08333333333333e+00
+33 176 1.65666091955785e-16
+33 89 -6.99174875981590e-17
+33 173 -4.16666666666667e+00
+33 184 4.16666666666667e+00
+33 76 7.63278329429795e-17
+33 34 0.00000000000000e+00
+33 73 -2.28983498828939e-16
+33 232 2.08333333333333e+00
+33 175 5.46437894932694e-17
+33 88 -4.44089209850063e-16
+33 172 1.30104260698261e-17
+33 183 -4.86111111111111e+00
+33 75 5.55555555555556e+00
+33 200 1.82145964977565e-17
+33 72 -5.55555555555556e+00
+33 231 -3.47222222222222e+00
+33 174 -1.38888888888889e+00
+33 87 5.55555555555556e+00
+33 171 -4.86111111111112e+00
+34 34 2.77777777777778e+01
+34 107 -2.08333333333333e+00
+34 236 2.08333333333333e+00
+34 191 -1.23599047663348e-17
+34 199 -4.86111111111111e+00
+34 106 2.77777777777778e+00
+34 235 -3.47222222222222e+00
+34 190 -6.94444444444445e-01
+34 198 -4.16666666666667e+00
+34 105 2.35922392732846e-16
+34 234 -2.08333333333333e+00
+34 189 5.03069808033274e-17
+34 185 2.09901540593194e-16
+34 77 1.78676518025611e-16
+34 35 -8.33333333333333e+00
+34 74 -2.08333333333333e+00
+34 233 2.08333333333333e+00
+34 176 8.33333333333333e+00
+34 89 3.33798743853975e-17
+34 173 -1.35742111995185e-16
+34 184 -4.86111111111111e+00
+34 76 -1.11111111111111e+01
+34 200 7.54604712049911e-17
+34 73 2.77777777777778e+00
+34 232 -3.47222222222222e+00
+34 175 -9.72222222222223e+00
+34 88 5.55555555555556e+00
+34 172 -6.94444444444445e-01
+34 183 4.16666666666667e+00
+34 75 6.76542155630955e-17
+34 33 0.00000000000000e+00
+34 72 -2.13370987545147e-16
+34 231 2.08333333333333e+00
+34 174 9.75781955236954e-19
+34 87 -4.44089209850063e-16
+34 171 -3.39355279987963e-17
+35 35 2.77777777777778e+01
+35 107 2.77777777777778e+00
+35 236 -3.47222222222222e+00
+35 191 -4.86111111111111e+00
+35 199 3.46944695195361e-17
+35 106 -2.08333333333333e+00
+35 235 2.08333333333333e+00
+35 190 -2.16840434497101e-17
+35 198 6.93889390390723e-18
+35 105 1.35308431126191e-16
+35 234 2.08333333333333e+00
+35 189 4.16666666666667e+00
+35 185 -6.94444444444444e-01
+35 77 5.55555555555556e+00
+35 200 -6.94444444444445e-01
+35 74 2.77777777777778e+00
+35 233 -3.47222222222222e+00
+35 176 -9.72222222222222e+00
+35 89 -1.11111111111111e+01
+35 173 -4.86111111111111e+00
+35 184 2.49800180540660e-16
+35 76 -5.37764277552810e-17
+35 34 -8.33333333333333e+00
+35 73 -2.08333333333333e+00
+35 232 2.08333333333333e+00
+35 175 8.33333333333333e+00
+35 88 2.73652628335341e-16
+35 172 -8.67361737988404e-17
+35 183 -4.33680868994202e-17
+35 75 8.88178419700125e-16
+35 33 -1.77635683940025e-15
+35 72 -7.53520509877426e-17
+35 231 -2.08333333333333e+00
+35 174 8.84708972748172e-17
+35 87 -3.97902197302180e-17
+35 171 -4.16666666666667e+00
+36 36 2.77777777777778e+01
+36 131 1.93313247354165e-16
+36 239 2.08333333333333e+00
+36 206 4.16666666666667e+00
+36 214 -4.16666666666667e+00
+36 130 -7.97972798949331e-17
+36 238 -2.08333333333333e+00
+36 205 -1.06577073555325e-16
+36 213 -4.86111111111111e+00
+36 129 -5.55555555555556e+00
+36 237 -3.47222222222222e+00
+36 204 -4.86111111111112e+00
+36 200 -8.32667268468867e-17
+36 110 8.88178419700125e-16
+36 38 8.88178419700125e-16
+36 107 -9.23740250957650e-16
+36 236 -2.08333333333333e+00
+36 194 3.89553840574042e-16
+36 116 3.19880298464692e-16
+36 191 -4.16666666666667e+00
+36 199 4.16666666666667e+00
+36 109 5.06539254985228e-16
+36 37 8.88178419700125e-16
+36 106 -2.28983498828939e-16
+36 235 2.08333333333333e+00
+36 193 1.16226472890446e-16
+36 115 0.00000000000000e+00
+36 190 3.38271077815477e-17
+36 198 -4.86111111111111e+00
+36 108 5.55555555555556e+00
+36 215 -2.53269627492614e-16
+36 105 -5.55555555555556e+00
+36 234 -3.47222222222222e+00
+36 192 -1.38888888888889e+00
+36 114 5.55555555555556e+00
+36 189 -4.86111111111112e+00
+37 37 2.77777777777778e+01
+37 131 -2.08333333333333e+00
+37 239 2.08333333333333e+00
+37 206 -1.25767452008319e-17
+37 214 -4.86111111111111e+00
+37 130 2.77777777777778e+00
+37 238 -3.47222222222222e+00
+37 205 -6.94444444444446e-01
+37 213 -4.16666666666667e+00
+37 129 2.08166817117217e-16
+37 237 -2.08333333333333e+00
+37 204 -1.99493199737333e-17
+37 200 3.09648140461860e-16
+37 110 -3.82723366887383e-17
+37 38 -8.33333333333333e+00
+37 107 -2.08333333333333e+00
+37 236 2.08333333333333e+00
+37 194 8.33333333333333e+00
+37 116 4.82442861701737e-16
+37 191 1.67400815431762e-16
+37 199 -4.86111111111111e+00
+37 109 -1.11111111111111e+01
+37 215 -4.07660016854550e-17
+37 106 2.77777777777778e+00
+37 235 -3.47222222222222e+00
+37 193 -9.72222222222223e+00
+37 115 5.55555555555556e+00
+37 190 -6.94444444444446e-01
+37 198 4.16666666666667e+00
+37 108 2.23779328401008e-16
+37 36 8.88178419700125e-16
+37 105 -1.70002900645727e-16
+37 234 2.08333333333333e+00
+37 192 1.44524149592318e-16
+37 114 0.00000000000000e+00
+37 189 -2.77555756156289e-17
+38 38 2.77777777777778e+01
+38 131 2.77777777777778e+00
+38 239 -3.47222222222222e+00
+38 206 -4.86111111111111e+00
+38 109 9.71445146547012e-17
+38 214 -9.71445146547012e-17
+38 130 -2.08333333333333e+00
+38 238 2.08333333333333e+00
+38 205 -1.76941794549634e-16
+38 213 -2.98372437868011e-16
+38 129 1.21430643318376e-17
+38 237 2.08333333333333e+00
+38 204 4.16666666666667e+00
+38 200 -6.94444444444444e-01
+38 110 5.55555555555555e+00
+38 215 -6.94444444444444e-01
+38 107 2.77777777777778e+00
+38 236 -3.47222222222222e+00
+38 194 -9.72222222222222e+00
+38 116 -1.11111111111111e+01
+38 191 -4.86111111111111e+00
+38 199 2.98372437868011e-16
+38 37 -8.33333333333333e+00
+38 106 -2.08333333333333e+00
+38 235 2.08333333333333e+00
+38 193 8.33333333333333e+00
+38 115 8.38955641069283e-16
+38 190 1.33573707650214e-16
+38 198 -9.28077059647592e-17
+38 108 8.88178419700125e-16
+38 36 8.88178419700125e-16
+38 105 -1.04419511232079e-15
+38 234 -2.08333333333333e+00
+38 192 4.85722573273506e-16
+38 114 1.88542757795229e-16
+38 189 -4.16666666666667e+00
+39 39 2.77777777777778e+01
+39 155 -7.15898694492179e-16
+39 242 2.08333333333333e+00
+39 221 4.16666666666667e+00
+39 229 -4.16666666666667e+00
+39 154 -4.89192020225460e-16
+39 241 -2.08333333333333e+00
+39 220 -1.01372903127395e-16
+39 228 -4.86111111111111e+00
+39 153 -5.55555555555555e+00
+39 240 -3.47222222222222e+00
+39 219 -4.86111111111111e+00
+39 215 -1.73472347597681e-16
+39 134 0.00000000000000e+00
+39 41 8.88178419700125e-16
+39 131 -1.43635103810880e-15
+39 239 -2.08333333333333e+00
+39 209 2.54787510534094e-17
+39 140 7.98121876748048e-16
+39 206 -4.16666666666667e+00
+39 214 4.16666666666667e+00
+39 133 2.15105711021124e-16
+39 40 0.00000000000000e+00
+39 130 8.95117313604032e-16
+39 238 2.08333333333333e+00
+39 208 -2.42861286636753e-17
+39 139 -8.88178419700125e-16
+39 205 2.20309881449055e-16
+39 213 -4.86111111111111e+00
+39 132 5.55555555555555e+00
+39 230 1.80411241501588e-16
+39 129 -5.55555555555555e+00
+39 237 -3.47222222222222e+00
+39 207 -1.38888888888889e+00
+39 138 5.55555555555555e+00
+39 204 -4.86111111111111e+00
+40 40 2.77777777777778e+01
+40 155 -2.08333333333333e+00
+40 242 2.08333333333333e+00
+40 221 2.44053909026487e-16
+40 229 -4.86111111111111e+00
+40 154 2.77777777777778e+00
+40 241 -3.47222222222222e+00
+40 220 -6.94444444444443e-01
+40 228 -4.16666666666667e+00
+40 153 -4.51028103753970e-16
+40 240 -2.08333333333333e+00
+40 219 -5.63785129692462e-17
+40 215 3.10515502199848e-16
+40 134 2.78206277459780e-16
+40 41 -8.33333333333334e+00
+40 131 -2.08333333333333e+00
+40 239 2.08333333333333e+00
+40 209 8.33333333333334e+00
+40 140 -6.49911439769280e-16
+40 206 6.82180006927879e-16
+40 214 -4.86111111111111e+00
+40 133 -1.11111111111111e+01
+40 230 -2.22911966663020e-16
+40 130 2.77777777777778e+00
+40 238 -3.47222222222222e+00
+40 208 -9.72222222222223e+00
+40 139 5.55555555555556e+00
+40 205 -6.94444444444446e-01
+40 213 4.16666666666667e+00
+40 132 -8.76035355368288e-17
+40 39 0.00000000000000e+00
+40 129 9.11597186625812e-16
+40 237 2.08333333333333e+00
+40 207 -5.52943107967607e-18
+40 138 -8.88178419700125e-16
+40 204 2.73977888987087e-16
+41 41 2.77777777777778e+01
+41 155 2.77777777777778e+00
+41 242 -3.47222222222222e+00
+41 221 -4.86111111111111e+00
+41 229 -2.63677968348475e-16
+41 154 -2.08333333333333e+00
+41 241 2.08333333333333e+00
+41 220 3.62557206479153e-16
+41 228 2.63677968348475e-16
+41 153 -6.60062282609175e-16
+41 240 2.08333333333333e+00
+41 219 4.16666666666667e+00
+41 215 -6.94444444444445e-01
+41 134 5.55555555555556e+00
+41 230 -6.94444444444444e-01
+41 131 2.77777777777778e+00
+41 239 -3.47222222222222e+00
+41 209 -9.72222222222222e+00
+41 140 -1.11111111111111e+01
+41 206 -4.86111111111111e+00
+41 214 4.02455846426619e-16
+41 133 7.71951946809679e-17
+41 40 -8.33333333333334e+00
+41 130 -2.08333333333333e+00
+41 238 2.08333333333333e+00
+41 208 8.33333333333334e+00
+41 139 -4.23055687703844e-16
+41 205 8.43942971062717e-16
+41 213 -1.77809156287623e-16
+41 132 0.00000000000000e+00
+41 39 8.88178419700125e-16
+41 129 -1.35406009321715e-15
+41 237 -2.08333333333333e+00
+41 207 -4.94396190653390e-17
+41 138 1.04983296361771e-15
+41 204 -4.16666666666667e+00
+42 42 1.41666666666667e+01
+42 44 4.08333333333333e+00
+42 224 -6.95380168377890e-17
+42 164 -6.01952434295741e-16
+42 157 5.74627151417317e-17
+42 43 -4.08333333333333e+00
+42 223 -2.15620707053055e-17
+42 163 -2.04166666666667e+00
+42 156 2.83333333333333e+00
+42 158 2.04166666666667e+00
+42 222 -7.08333333333333e-01
+42 162 2.83333333333334e+00
+42 155 6.92154666914746e-16
+42 242 -2.08333333333333e+00
+42 221 -4.16666666666667e+00
+42 229 4.16666666666667e+00
+42 154 -2.28983498828939e-16
+42 241 2.08333333333333e+00
+42 220 6.07153216591882e-18
+42 228 -4.86111111111111e+00
+42 230 1.17961196366423e-16
+42 153 -5.55555555555556e+00
+42 240 -3.47222222222222e+00
+42 219 -4.86111111111112e+00
+42 401 -1.34170018845081e-18
+42 302 2.31070588010973e-17
+42 449 4.16666666666667e-02
+42 392 8.33333333333334e-02
+42 400 -8.33333333333333e-02
+42 301 3.76760254938713e-18
+42 448 -4.16666666666667e-02
+42 391 7.11507675693612e-20
+42 399 -9.72222222222222e-02
+42 300 -1.11111111111111e-01
+42 447 -6.94444444444445e-02
+42 390 -9.72222222222223e-02
+43 43 1.41666666666667e+01
+43 44 -4.25000000000000e+00
+43 224 4.25000000000000e+00
+43 164 -6.77708943515798e-17
+43 157 -5.66666666666667e+00
+43 158 -7.16808407877530e-16
+43 223 -4.95833333333333e+00
+43 163 2.83333333333333e+00
+43 156 1.04164723721545e-16
+43 42 -4.08333333333333e+00
+43 222 -1.41911899982985e-17
+43 162 -2.04166666666667e+00
+43 155 -2.08333333333333e+00
+43 242 2.08333333333333e+00
+43 221 -6.63531729561129e-17
+43 229 -4.86111111111111e+00
+43 230 -4.61436444609831e-16
+43 154 2.77777777777778e+00
+43 241 -3.47222222222222e+00
+43 220 -6.94444444444445e-01
+43 228 4.16666666666667e+00
+43 153 -1.24032728532342e-16
+43 240 2.08333333333333e+00
+43 219 3.96817995129695e-17
+43 401 8.18572640226556e-18
+43 302 -4.16666666666667e-02
+43 449 4.16666666666667e-02
+43 392 -9.01243055878576e-18
+43 400 -9.72222222222222e-02
+43 301 5.55555555555555e-02
+43 448 -6.94444444444444e-02
+43 391 -1.38888888888889e-02
+43 399 -8.33333333333334e-02
+43 300 1.08420217248550e-18
+43 447 -4.16666666666667e-02
+43 390 2.16840434497101e-19
+44 44 1.41666666666667e+01
+44 158 2.83333333333333e+00
+44 224 -4.95833333333333e+00
+44 164 -5.66666666666666e+00
+44 157 -6.14932367179466e-16
+44 43 -4.25000000000000e+00
+44 223 4.25000000000000e+00
+44 163 1.71171806112938e-16
+44 156 2.04166666666667e+00
+44 42 4.08333333333333e+00
+44 222 -4.74067399919287e-17
+44 162 -8.05514780311684e-16
+44 230 -6.94444444444445e-01
+44 155 2.77777777777778e+00
+44 242 -3.47222222222222e+00
+44 221 -4.86111111111111e+00
+44 229 -4.99600361081320e-16
+44 154 -2.08333333333333e+00
+44 241 2.08333333333333e+00
+44 220 -1.00613961606655e-16
+44 228 1.89084858881472e-16
+44 153 7.68265659423228e-16
+44 240 -2.08333333333333e+00
+44 219 -4.16666666666667e+00
+44 401 -1.38888888888889e-02
+44 302 5.55555555555555e-02
+44 449 -6.94444444444445e-02
+44 392 -9.72222222222223e-02
+44 400 6.39679281766448e-18
+44 301 -4.16666666666667e-02
+44 448 4.16666666666667e-02
+44 391 -9.14795583034644e-18
+44 399 -7.58941520739853e-19
+44 300 2.26191678234788e-17
+44 447 4.16666666666667e-02
+44 390 8.33333333333334e-02
+45 45 1.00000000000000e+00
+45 80 0.00000000000000e+00
+45 185 0.00000000000000e+00
+45 83 0.00000000000000e+00
+45 95 0.00000000000000e+00
+45 179 0.00000000000000e+00
+45 233 0.00000000000000e+00
+45 182 0.00000000000000e+00
+45 46 0.00000000000000e+00
+45 79 0.00000000000000e+00
+45 184 0.00000000000000e+00
+45 82 0.00000000000000e+00
+45 94 0.00000000000000e+00
+45 178 0.00000000000000e+00
+45 232 0.00000000000000e+00
+45 181 0.00000000000000e+00
+45 47 0.00000000000000e+00
+45 78 0.00000000000000e+00
+45 183 0.00000000000000e+00
+45 81 0.00000000000000e+00
+45 93 0.00000000000000e+00
+45 177 0.00000000000000e+00
+45 231 0.00000000000000e+00
+45 180 0.00000000000000e+00
+46 46 1.00000000000000e+00
+46 80 0.00000000000000e+00
+46 185 0.00000000000000e+00
+46 83 0.00000000000000e+00
+46 95 0.00000000000000e+00
+46 179 0.00000000000000e+00
+46 233 0.00000000000000e+00
+46 182 0.00000000000000e+00
+46 47 0.00000000000000e+00
+46 79 0.00000000000000e+00
+46 184 0.00000000000000e+00
+46 82 0.00000000000000e+00
+46 94 0.00000000000000e+00
+46 178 0.00000000000000e+00
+46 232 0.00000000000000e+00
+46 181 0.00000000000000e+00
+46 45 0.00000000000000e+00
+46 78 0.00000000000000e+00
+46 183 0.00000000000000e+00
+46 81 0.00000000000000e+00
+46 93 0.00000000000000e+00
+46 177 0.00000000000000e+00
+46 231 0.00000000000000e+00
+46 180 0.00000000000000e+00
+47 47 1.00000000000000e+00
+47 80 0.00000000000000e+00
+47 185 0.00000000000000e+00
+47 83 0.00000000000000e+00
+47 95 0.00000000000000e+00
+47 179 0.00000000000000e+00
+47 233 0.00000000000000e+00
+47 182 0.00000000000000e+00
+47 46 0.00000000000000e+00
+47 79 0.00000000000000e+00
+47 184 0.00000000000000e+00
+47 82 0.00000000000000e+00
+47 94 0.00000000000000e+00
+47 178 0.00000000000000e+00
+47 232 0.00000000000000e+00
+47 181 0.00000000000000e+00
+47 45 0.00000000000000e+00
+47 78 0.00000000000000e+00
+47 183 0.00000000000000e+00
+47 81 0.00000000000000e+00
+47 93 0.00000000000000e+00
+47 177 0.00000000000000e+00
+47 231 0.00000000000000e+00
+47 180 0.00000000000000e+00
+48 48 2.77777777777778e+01
+48 200 -1.07552855510562e-16
+48 197 4.16666666666667e+00
+48 236 2.08333333333333e+00
+48 112 6.93889390390723e-17
+48 199 4.16666666666667e+00
+48 196 8.67361737988404e-18
+48 235 2.08333333333333e+00
+48 111 -5.55555555555555e+00
+48 198 -4.86111111111111e+00
+48 195 -4.86111111111111e+00
+48 234 -3.47222222222222e+00
+48 80 -2.22044604925031e-16
+48 50 0.00000000000000e+00
+48 77 8.88178419700125e-16
+48 185 1.17961196366423e-16
+48 179 -4.16666666666667e+00
+48 92 2.94902990916057e-16
+48 176 1.71846044338952e-16
+48 233 -2.08333333333333e+00
+48 79 -1.66533453693773e-16
+48 49 0.00000000000000e+00
+48 76 2.41126563160776e-16
+48 184 -4.16666666666667e+00
+48 178 -9.02056207507940e-17
+48 91 8.88178419700125e-16
+48 175 6.88468379528295e-17
+48 232 -2.08333333333333e+00
+48 78 -5.55555555555556e+00
+48 113 -2.42861286636753e-16
+48 75 5.55555555555556e+00
+48 183 -4.86111111111111e+00
+48 177 -4.86111111111111e+00
+48 90 5.55555555555556e+00
+48 174 -1.38888888888889e+00
+48 231 -3.47222222222222e+00
+49 49 2.77777777777778e+01
+49 200 1.87350135405495e-16
+49 197 -2.90566182226115e-16
+49 236 -2.08333333333333e+00
+49 112 2.77777777777778e+00
+49 199 -4.86111111111111e+00
+49 196 -6.94444444444444e-01
+49 235 -3.47222222222222e+00
+49 111 0.00000000000000e+00
+49 198 4.16666666666667e+00
+49 195 -6.24500451351651e-17
+49 234 2.08333333333333e+00
+49 80 2.08333333333333e+00
+49 50 8.33333333333333e+00
+49 77 1.96023752785379e-16
+49 185 9.02056207507940e-17
+49 179 -2.47198095326695e-16
+49 92 -4.06575814682064e-17
+49 176 -8.33333333333333e+00
+49 233 -2.08333333333333e+00
+49 79 2.77777777777778e+00
+49 113 2.08333333333333e+00
+49 76 -1.11111111111111e+01
+49 184 -4.86111111111111e+00
+49 178 -6.94444444444445e-01
+49 91 5.55555555555556e+00
+49 175 -9.72222222222223e+00
+49 232 -3.47222222222222e+00
+49 78 -2.77555756156289e-16
+49 48 0.00000000000000e+00
+49 75 3.53883589099269e-16
+49 183 -4.16666666666667e+00
+49 177 -6.85215773010839e-17
+49 90 8.88178419700125e-16
+49 174 4.77048955893622e-17
+49 231 -2.08333333333333e+00
+50 50 2.77777777777778e+01
+50 200 -6.94444444444445e-01
+50 197 -4.86111111111111e+00
+50 236 -3.47222222222222e+00
+50 112 2.08333333333333e+00
+50 199 1.74339709335669e-16
+50 196 -1.38777878078145e-16
+50 235 -2.08333333333333e+00
+50 111 -2.77555756156289e-16
+50 198 -1.31838984174237e-16
+50 195 4.16666666666667e+00
+50 234 2.08333333333333e+00
+50 80 2.77777777777778e+00
+50 113 2.77777777777778e+00
+50 77 5.55555555555556e+00
+50 185 -6.94444444444445e-01
+50 179 -4.86111111111111e+00
+50 92 -1.11111111111111e+01
+50 176 -9.72222222222222e+00
+50 233 -3.47222222222222e+00
+50 79 2.08333333333333e+00
+50 49 8.33333333333333e+00
+50 76 1.75315491290906e-16
+50 184 7.54604712049911e-17
+50 178 -1.80411241501588e-16
+50 91 -1.03216046820620e-16
+50 175 -8.33333333333333e+00
+50 232 -2.08333333333333e+00
+50 78 -1.80411241501588e-16
+50 48 0.00000000000000e+00
+50 75 8.88178419700125e-16
+50 183 7.45931094670027e-17
+50 177 -4.16666666666667e+00
+50 90 2.91433543964104e-16
+50 174 -3.12250225675825e-17
+50 231 -2.08333333333333e+00
+51 51 2.77777777777778e+01
+51 215 -3.01841884819964e-16
+51 212 4.16666666666667e+00
+51 239 2.08333333333333e+00
+51 136 -1.24900090270330e-16
+51 214 4.16666666666667e+00
+51 211 -1.75207071073658e-16
+51 238 2.08333333333333e+00
+51 135 -5.55555555555556e+00
+51 213 -4.86111111111111e+00
+51 210 -4.86111111111111e+00
+51 237 -3.47222222222222e+00
+51 113 -4.44089209850063e-16
+51 53 2.66453525910038e-15
+51 110 8.88178419700125e-16
+51 200 2.77555756156289e-17
+51 197 -4.16666666666667e+00
+51 119 7.38992200766120e-16
+51 194 1.11239142897013e-16
+51 236 -2.08333333333333e+00
+51 112 -3.33066907387547e-16
+51 52 8.88178419700125e-16
+51 109 3.34801630863524e-16
+51 199 -4.16666666666667e+00
+51 196 -2.77555756156289e-17
+51 118 8.88178419700125e-16
+51 193 1.70761842166467e-16
+51 235 -2.08333333333333e+00
+51 111 -5.55555555555556e+00
+51 137 -1.40859546249317e-15
+51 108 5.55555555555556e+00
+51 198 -4.86111111111111e+00
+51 195 -4.86111111111111e+00
+51 117 5.55555555555556e+00
+51 192 -1.38888888888889e+00
+51 234 -3.47222222222222e+00
+52 52 2.77777777777778e+01
+52 215 7.00828284294630e-16
+52 212 1.83013326715553e-16
+52 239 -2.08333333333333e+00
+52 136 2.77777777777778e+00
+52 214 -4.86111111111111e+00
+52 211 -6.94444444444444e-01
+52 238 -3.47222222222222e+00
+52 135 -2.22044604925031e-16
+52 213 4.16666666666667e+00
+52 210 -2.08166817117217e-16
+52 237 2.08333333333333e+00
+52 113 2.08333333333333e+00
+52 53 8.33333333333333e+00
+52 110 3.74700270810990e-16
+52 200 -6.03683769639929e-16
+52 197 9.54097911787244e-17
+52 119 -3.50414142147315e-16
+52 194 -8.33333333333333e+00
+52 236 -2.08333333333333e+00
+52 112 2.77777777777778e+00
+52 137 2.08333333333333e+00
+52 109 -1.11111111111111e+01
+52 199 -4.86111111111111e+00
+52 196 -6.94444444444445e-01
+52 118 5.55555555555556e+00
+52 193 -9.72222222222223e+00
+52 235 -3.47222222222222e+00
+52 111 -3.53883589099269e-16
+52 51 8.88178419700125e-16
+52 108 5.06539254985228e-16
+52 198 -4.16666666666667e+00
+52 195 -8.41340885848751e-17
+52 117 8.88178419700125e-16
+52 192 2.41126563160776e-16
+52 234 -2.08333333333333e+00
+53 53 2.77777777777778e+01
+53 215 -6.94444444444444e-01
+53 212 -4.86111111111111e+00
+53 239 -3.47222222222222e+00
+53 136 2.08333333333333e+00
+53 214 6.74807432154978e-16
+53 211 2.91433543964104e-16
+53 238 -2.08333333333333e+00
+53 135 -1.44328993201270e-15
+53 213 -4.37150315946155e-16
+53 210 4.16666666666667e+00
+53 237 2.08333333333333e+00
+53 113 2.77777777777778e+00
+53 137 2.77777777777778e+00
+53 110 5.55555555555555e+00
+53 200 -6.94444444444444e-01
+53 197 -4.86111111111111e+00
+53 119 -1.11111111111111e+01
+53 194 -9.72222222222222e+00
+53 236 -3.47222222222222e+00
+53 112 2.08333333333333e+00
+53 52 8.33333333333333e+00
+53 109 1.83772268236293e-16
+53 199 -5.36896915814822e-16
+53 196 -4.85722573273506e-17
+53 118 -7.77156117237610e-16
+53 193 -8.33333333333333e+00
+53 235 -2.08333333333333e+00
+53 111 -5.75928194024300e-16
+53 51 2.66453525910038e-15
+53 108 8.88178419700125e-16
+53 198 1.90819582357449e-17
+53 195 -4.16666666666667e+00
+53 117 9.08995101411847e-16
+53 192 4.85722573273506e-16
+53 234 -2.08333333333333e+00
+54 54 2.77777777777778e+01
+54 230 5.55111512312578e-17
+54 227 4.16666666666667e+00
+54 242 2.08333333333333e+00
+54 160 -4.09394740330526e-16
+54 229 4.16666666666667e+00
+54 226 -1.13624387676481e-16
+54 241 2.08333333333333e+00
+54 159 -5.55555555555555e+00
+54 228 -4.86111111111111e+00
+54 225 -4.86111111111111e+00
+54 240 -3.47222222222222e+00
+54 137 5.55111512312578e-16
+54 56 -8.88178419700125e-16
+54 134 4.44089209850063e-16
+54 215 -4.85722573273506e-17
+54 212 -4.16666666666667e+00
+54 143 -7.28583859910259e-16
+54 209 -3.87060175577325e-17
+54 239 -2.08333333333333e+00
+54 136 7.77156117237610e-16
+54 55 0.00000000000000e+00
+54 133 -8.76035355368288e-17
+54 214 -4.16666666666667e+00
+54 211 3.12250225675825e-16
+54 142 8.88178419700125e-16
+54 208 6.84131570838353e-17
+54 238 -2.08333333333333e+00
+54 135 -5.55555555555555e+00
+54 161 7.21644966006352e-16
+54 132 5.55555555555555e+00
+54 213 -4.86111111111111e+00
+54 210 -4.86111111111111e+00
+54 141 5.55555555555555e+00
+54 207 -1.38888888888889e+00
+54 237 -3.47222222222222e+00
+55 55 2.77777777777778e+01
+55 230 -2.49800180540660e-16
+55 227 5.68989300120393e-16
+55 242 -2.08333333333333e+00
+55 160 2.77777777777778e+00
+55 229 -4.86111111111111e+00
+55 226 -6.94444444444445e-01
+55 241 -3.47222222222222e+00
+55 159 -4.99600361081320e-16
+55 228 4.16666666666667e+00
+55 225 -9.02056207507940e-17
+55 240 2.08333333333333e+00
+55 137 2.08333333333333e+00
+55 56 8.33333333333333e+00
+55 134 3.54750950837257e-16
+55 215 -9.02056207507940e-17
+55 212 4.77048955893622e-16
+55 143 -7.81601346144800e-16
+55 209 -8.33333333333334e+00
+55 239 -2.08333333333333e+00
+55 136 2.77777777777778e+00
+55 161 2.08333333333333e+00
+55 133 -1.11111111111111e+01
+55 214 -4.86111111111111e+00
+55 211 -6.94444444444444e-01
+55 142 5.55555555555556e+00
+55 208 -9.72222222222223e+00
+55 238 -3.47222222222222e+00
+55 135 7.97972798949331e-16
+55 54 0.00000000000000e+00
+55 132 2.63677968348475e-16
+55 213 -4.16666666666667e+00
+55 210 3.15719672627779e-16
+55 141 4.44089209850063e-16
+55 207 -1.12757025938492e-17
+55 237 -2.08333333333333e+00
+56 56 2.77777777777778e+01
+56 230 -6.94444444444443e-01
+56 227 -4.86111111111111e+00
+56 242 -3.47222222222222e+00
+56 160 2.08333333333333e+00
+56 229 -3.20056481317721e-16
+56 226 6.93889390390723e-16
+56 241 -2.08333333333333e+00
+56 159 6.66133814775094e-16
+56 228 1.52655665885959e-16
+56 225 4.16666666666667e+00
+56 240 2.08333333333333e+00
+56 137 2.77777777777778e+00
+56 161 2.77777777777778e+00
+56 134 5.55555555555556e+00
+56 215 -6.94444444444444e-01
+56 212 -4.86111111111111e+00
+56 143 -1.11111111111111e+01
+56 209 -9.72222222222222e+00
+56 239 -3.47222222222222e+00
+56 136 2.08333333333333e+00
+56 55 8.33333333333333e+00
+56 133 4.51678625057461e-16
+56 214 -1.06685493772574e-16
+56 211 5.20417042793042e-16
+56 142 -1.15619319673854e-15
+56 208 -8.33333333333334e+00
+56 238 -2.08333333333333e+00
+56 135 5.75928194024300e-16
+56 54 -8.88178419700125e-16
+56 132 4.44089209850063e-16
+56 213 -8.06646416329215e-17
+56 210 -4.16666666666667e+00
+56 141 -1.02695629777827e-15
+56 207 -7.80625564189563e-18
+56 237 -2.08333333333333e+00
+57 57 1.41666666666667e+01
+57 158 2.04166666666667e+00
+57 167 1.15847002130076e-16
+57 224 -7.11609319647283e-17
+57 58 4.08333333333333e+00
+57 157 1.04164723721545e-16
+57 166 2.04166666666667e+00
+57 223 -1.93462325152882e-18
+57 59 4.08333333333333e+00
+57 156 2.83333333333333e+00
+57 165 2.83333333333333e+00
+57 222 -7.08333333333333e-01
+57 230 3.46944695195361e-16
+57 227 -4.16666666666667e+00
+57 242 -2.08333333333333e+00
+57 160 -2.22044604925031e-16
+57 229 -4.16666666666667e+00
+57 226 6.24500451351651e-17
+57 241 -2.08333333333333e+00
+57 159 -5.55555555555556e+00
+57 161 -1.11022302462516e-16
+57 228 -4.86111111111111e+00
+57 225 -4.86111111111111e+00
+57 240 -3.47222222222222e+00
+57 308 -3.32850066953050e-17
+57 401 -2.98155597433514e-18
+57 398 8.33333333333333e-02
+57 449 4.16666666666667e-02
+57 307 1.95156391047391e-18
+57 400 8.33333333333334e-02
+57 397 -5.14996031930615e-19
+57 448 4.16666666666667e-02
+57 306 -1.11111111111111e-01
+57 399 -9.72222222222222e-02
+57 396 -9.72222222222223e-02
+57 447 -6.94444444444445e-02
+58 58 1.41666666666667e+01
+58 158 -5.02188893768130e-16
+58 167 -5.92397902650713e-17
+58 224 -4.25000000000000e+00
+58 59 4.25000000000000e+00
+58 157 -5.66666666666667e+00
+58 166 2.83333333333333e+00
+58 223 -4.95833333333333e+00
+58 57 4.08333333333333e+00
+58 156 1.68593437821496e-16
+58 165 2.04166666666667e+00
+58 222 -2.32967941812823e-17
+58 230 1.38777878078145e-17
+58 227 -1.21430643318376e-16
+58 242 -2.08333333333333e+00
+58 160 2.77777777777778e+00
+58 161 2.08333333333333e+00
+58 229 -4.86111111111111e+00
+58 226 -6.94444444444445e-01
+58 241 -3.47222222222222e+00
+58 159 -9.71445146547012e-17
+58 228 -4.16666666666667e+00
+58 225 7.19910242530375e-17
+58 240 -2.08333333333333e+00
+58 308 4.16666666666666e-02
+58 401 1.44198888940572e-17
+58 398 -1.35931847375370e-17
+58 449 -4.16666666666666e-02
+58 307 5.55555555555555e-02
+58 400 -9.72222222222222e-02
+58 397 -1.38888888888889e-02
+58 448 -6.94444444444444e-02
+58 306 0.00000000000000e+00
+58 399 8.33333333333333e-02
+58 396 -1.08420217248550e-18
+58 447 4.16666666666667e-02
+59 59 1.41666666666667e+01
+59 158 2.83333333333333e+00
+59 167 -5.66666666666667e+00
+59 224 -4.95833333333333e+00
+59 58 4.25000000000000e+00
+59 157 -5.48486020599155e-16
+59 166 -5.69788899222601e-16
+59 223 -4.25000000000000e+00
+59 57 4.08333333333333e+00
+59 156 2.04166666666667e+00
+59 165 4.04082149685348e-16
+59 222 -1.58442594981600e-16
+59 161 2.77777777777778e+00
+59 230 -6.94444444444445e-01
+59 227 -4.86111111111111e+00
+59 242 -3.47222222222222e+00
+59 160 2.08333333333333e+00
+59 229 5.29090660172926e-17
+59 226 -4.16333634234434e-17
+59 241 -2.08333333333333e+00
+59 159 -9.71445146547012e-17
+59 228 2.80157841370254e-16
+59 225 -4.16666666666667e+00
+59 240 -2.08333333333333e+00
+59 308 5.55555555555555e-02
+59 401 -1.38888888888889e-02
+59 398 -9.72222222222222e-02
+59 449 -6.94444444444445e-02
+59 307 4.16666666666666e-02
+59 400 1.54092233764502e-17
+59 397 -1.27935856353290e-17
+59 448 -4.16666666666666e-02
+59 306 -3.38271077815477e-17
+59 399 -2.71050543121376e-18
+59 396 8.33333333333333e-02
+59 447 4.16666666666667e-02
+60 60 2.77777777777778e+01
+60 89 -4.16666666666667e+00
+60 65 -1.66967134562768e-17
+60 5 4.55229387172351e-17
+60 175 -2.08333333333333e+00
+60 88 -3.30681662608079e-17
+60 64 -4.16666666666667e+00
+60 4 -2.07407875596477e-16
+60 174 -3.47222222222222e+00
+60 87 -4.86111111111112e+00
+60 63 -4.86111111111111e+00
+60 3 -5.55555555555555e+00
+60 182 0.00000000000000e+00
+60 233 3.64291929955129e-17
+60 173 -3.83807569059869e-17
+60 86 0.00000000000000e+00
+60 71 0.00000000000000e+00
+60 170 4.44089209850063e-16
+60 62 1.77635683940025e-15
+60 2 0.00000000000000e+00
+60 181 0.00000000000000e+00
+60 232 3.38271077815477e-17
+60 172 0.00000000000000e+00
+60 85 0.00000000000000e+00
+60 70 0.00000000000000e+00
+60 169 3.48245737802344e-16
+60 61 -8.88178419700125e-16
+60 1 0.00000000000000e+00
+60 180 0.00000000000000e+00
+60 231 -1.38888888888889e+00
+60 171 5.55555555555556e+00
+60 84 0.00000000000000e+00
+60 69 0.00000000000000e+00
+60 168 5.55555555555556e+00
+60 176 -2.08333333333333e+00
+60 0 0.00000000000000e+00
+61 61 2.77777777777778e+01
+61 89 -1.42247325030098e-16
+61 65 1.02782365951626e-16
+61 5 2.08333333333333e+00
+61 175 -3.47222222222222e+00
+61 88 -6.94444444444445e-01
+61 64 -4.86111111111111e+00
+61 4 2.77777777777778e+00
+61 174 -2.08333333333333e+00
+61 87 1.30104260698261e-17
+61 63 -4.16666666666667e+00
+61 3 -8.68445940160889e-17
+61 182 0.00000000000000e+00
+61 233 -8.33333333333333e+00
+61 173 4.36174533990918e-16
+61 86 0.00000000000000e+00
+61 71 0.00000000000000e+00
+61 170 -7.18283939271647e-17
+61 62 8.33333333333333e+00
+61 2 0.00000000000000e+00
+61 181 0.00000000000000e+00
+61 232 -9.72222222222223e+00
+61 172 5.55555555555556e+00
+61 85 0.00000000000000e+00
+61 70 0.00000000000000e+00
+61 169 -1.11111111111111e+01
+61 176 -2.08333333333333e+00
+61 1 0.00000000000000e+00
+61 180 0.00000000000000e+00
+61 231 7.68699340292223e-17
+61 171 0.00000000000000e+00
+61 84 0.00000000000000e+00
+61 69 0.00000000000000e+00
+61 168 3.00717025066011e-16
+61 60 -8.88178419700125e-16
+61 0 0.00000000000000e+00
+62 62 2.77777777777778e+01
+62 89 -4.86111111111111e+00
+62 65 -6.94444444444444e-01
+62 5 2.77777777777778e+00
+62 175 -2.08333333333333e+00
+62 88 -1.35742111995185e-16
+62 64 1.20563281580388e-16
+62 4 2.08333333333333e+00
+62 174 -2.08333333333333e+00
+62 87 -4.16666666666667e+00
+62 63 -8.06646416329215e-17
+62 3 1.72388145425195e-17
+62 182 0.00000000000000e+00
+62 233 -9.72222222222222e+00
+62 173 -1.11111111111111e+01
+62 86 0.00000000000000e+00
+62 71 0.00000000000000e+00
+62 170 5.55555555555556e+00
+62 176 -3.47222222222222e+00
+62 2 0.00000000000000e+00
+62 181 0.00000000000000e+00
+62 232 -8.33333333333333e+00
+62 172 3.62015105392910e-16
+62 85 0.00000000000000e+00
+62 70 0.00000000000000e+00
+62 169 -1.81603863891322e-16
+62 61 8.33333333333333e+00
+62 1 0.00000000000000e+00
+62 180 0.00000000000000e+00
+62 231 1.75966012594397e-16
+62 171 4.31092336307393e-16
+62 84 0.00000000000000e+00
+62 69 0.00000000000000e+00
+62 168 4.44089209850063e-16
+62 60 1.77635683940025e-15
+62 0 0.00000000000000e+00
+63 63 5.55555555555556e+01
+63 104 8.55435514091063e-17
+63 196 -2.08333333333333e+00
+63 103 -4.16666666666667e+00
+63 195 -3.47222222222222e+00
+63 102 -4.86111111111111e+00
+63 236 -8.33333333333333e+00
+63 191 -2.08333333333333e+00
+63 188 -2.31070588010973e-17
+63 98 4.01154803819637e-18
+63 235 9.81202966099382e-17
+63 190 2.08333333333333e+00
+63 187 2.83112292290277e-16
+63 97 4.16666666666666e+00
+63 234 -9.72222222222223e+00
+63 189 -3.47222222222222e+00
+63 186 -1.11111111111111e+01
+63 96 -4.86111111111111e+00
+63 179 2.08333333333333e+00
+63 92 8.06646416329215e-17
+63 68 -1.01481323344643e-16
+63 20 8.88178419700125e-16
+63 178 2.08333333333333e+00
+63 91 6.15826833971767e-17
+63 67 4.16666666666666e+00
+63 19 -9.25908655302621e-17
+63 177 -3.47222222222222e+00
+63 90 -1.38888888888889e+00
+63 66 -4.86111111111111e+00
+63 18 5.55555555555556e+00
+63 233 8.33333333333333e+00
+63 176 -2.59124319224036e-17
+63 89 7.37257477290143e-17
+63 173 2.08333333333333e+00
+63 170 -1.97758476261356e-16
+63 65 8.88178419700125e-16
+63 5 8.88178419700125e-16
+63 62 -8.06646416329215e-17
+63 232 -8.41340885848751e-17
+63 175 4.44089209850063e-16
+63 88 2.09251019289702e-17
+63 172 -2.08333333333333e+00
+63 169 -3.67761376907083e-16
+63 64 -8.88178419700125e-16
+63 4 -3.43285512863223e-17
+63 61 -4.16666666666667e+00
+63 231 -9.72222222222223e+00
+63 174 1.11111111111111e+01
+63 87 -1.38888888888889e+00
+63 171 -3.47222222222222e+00
+63 168 -1.11111111111111e+01
+63 197 -2.08333333333333e+00
+63 3 5.55555555555556e+00
+63 60 -4.86111111111111e+00
+64 64 5.55555555555556e+01
+64 104 6.96057794735694e-17
+64 196 -3.47222222222222e+00
+64 103 -4.86111111111111e+00
+64 195 -2.08333333333333e+00
+64 102 -4.16666666666667e+00
+64 236 4.24139889876329e-16
+64 191 2.08333333333333e+00
+64 188 1.77635683940025e-15
+64 98 2.18575157973078e-16
+64 235 -1.38888888888889e+00
+64 190 -3.47222222222222e+00
+64 187 5.55555555555556e+00
+64 97 -4.86111111111111e+00
+64 234 6.93889390390723e-18
+64 189 2.08333333333333e+00
+64 186 1.99384779520084e-16
+64 96 4.16666666666667e+00
+64 179 -2.08333333333333e+00
+64 92 -8.33333333333333e+00
+64 68 1.95590071916385e-16
+64 20 -1.18869215685879e-16
+64 178 -3.47222222222222e+00
+64 91 -9.72222222222223e+00
+64 67 -4.86111111111111e+00
+64 19 -1.11111111111111e+01
+64 177 2.08333333333333e+00
+64 90 6.88468379528295e-17
+64 66 4.16666666666666e+00
+64 18 1.95562966862073e-17
+64 233 2.68882138776405e-16
+64 176 -2.39608680119296e-17
+64 89 8.33333333333333e+00
+64 173 2.08333333333333e+00
+64 170 8.88178419700125e-16
+64 65 -2.66453525910038e-15
+64 5 3.72965547335014e-17
+64 62 1.20563281580388e-16
+64 232 -1.38888888888889e+00
+64 175 1.11111111111111e+01
+64 88 -9.72222222222223e+00
+64 172 -3.47222222222222e+00
+64 169 5.55555555555556e+00
+64 197 -2.08333333333333e+00
+64 4 -1.11111111111111e+01
+64 61 -4.86111111111111e+00
+64 231 -1.17202254845683e-16
+64 174 4.44089209850063e-16
+64 87 6.85215773010839e-17
+64 171 -2.08333333333333e+00
+64 168 -4.22838847269347e-16
+64 63 -8.88178419700125e-16
+64 3 1.85398571495021e-17
+64 60 -4.16666666666667e+00
+65 65 5.55555555555556e+01
+65 104 -6.94444444444443e-01
+65 196 -2.08333333333333e+00
+65 103 1.63931368479808e-16
+65 195 -2.08333333333333e+00
+65 102 1.41379963292110e-16
+65 236 -9.72222222222222e+00
+65 191 -3.47222222222222e+00
+65 188 5.55555555555556e+00
+65 98 -6.94444444444444e-01
+65 235 2.38741318381308e-16
+65 190 2.08333333333333e+00
+65 187 1.77635683940025e-15
+65 97 1.48427277413266e-16
+65 234 -8.33333333333333e+00
+65 189 -2.08333333333333e+00
+65 186 -1.14708589848966e-16
+65 96 1.29236898960272e-16
+65 179 -3.47222222222222e+00
+65 92 -9.72222222222222e+00
+65 68 -6.94444444444443e-01
+65 20 5.55555555555556e+00
+65 178 -2.08333333333333e+00
+65 91 -8.33333333333333e+00
+65 67 2.68014777038417e-16
+65 19 2.03938428644523e-16
+65 177 2.08333333333333e+00
+65 90 1.71846044338952e-16
+65 66 -7.91467585914418e-17
+65 18 8.88178419700125e-16
+65 233 -9.72222222222222e+00
+65 176 -2.22222222222222e+01
+65 89 -9.72222222222222e+00
+65 173 -3.47222222222222e+00
+65 170 5.55555555555556e+00
+65 197 -3.47222222222222e+00
+65 5 5.55555555555556e+00
+65 62 -6.94444444444444e-01
+65 232 2.88614618315641e-16
+65 175 2.17260562838939e-16
+65 88 8.33333333333333e+00
+65 172 2.08333333333333e+00
+65 169 8.88178419700125e-16
+65 64 -2.66453525910038e-15
+65 4 -1.18869215685879e-16
+65 61 1.02782365951626e-16
+65 231 8.33333333333333e+00
+65 174 -2.82204272970821e-16
+65 87 2.69749500514394e-16
+65 171 2.08333333333333e+00
+65 168 -1.54729202540838e-16
+65 63 8.88178419700125e-16
+65 3 8.88178419700125e-16
+65 60 3.25260651745651e-18
+66 66 2.77777777777778e+01
+66 182 0.00000000000000e+00
+66 17 0.00000000000000e+00
+66 71 0.00000000000000e+00
+66 94 0.00000000000000e+00
+66 181 0.00000000000000e+00
+66 16 0.00000000000000e+00
+66 70 0.00000000000000e+00
+66 93 0.00000000000000e+00
+66 180 0.00000000000000e+00
+66 15 0.00000000000000e+00
+66 69 0.00000000000000e+00
+66 179 5.96744875736022e-16
+66 92 -4.16666666666667e+00
+66 176 -2.08333333333333e+00
+66 233 3.72965547335014e-17
+66 68 0.00000000000000e+00
+66 20 -8.93382590128056e-17
+66 65 -8.60856524953491e-17
+66 170 4.44089209850063e-16
+66 178 8.88178419700125e-16
+66 91 -3.38271077815477e-17
+66 175 2.08333333333333e+00
+66 232 7.84962372879505e-17
+66 67 -8.88178419700125e-16
+66 19 -2.15539391890118e-16
+66 64 4.16666666666666e+00
+66 169 4.10004604052550e-16
+66 177 5.55555555555556e+00
+66 90 -4.86111111111111e+00
+66 174 -3.47222222222222e+00
+66 231 -1.38888888888889e+00
+66 95 0.00000000000000e+00
+66 18 -5.55555555555555e+00
+66 63 -4.86111111111111e+00
+66 168 5.55555555555556e+00
+67 67 2.77777777777778e+01
+67 182 0.00000000000000e+00
+67 17 0.00000000000000e+00
+67 71 0.00000000000000e+00
+67 94 0.00000000000000e+00
+67 181 0.00000000000000e+00
+67 16 0.00000000000000e+00
+67 70 0.00000000000000e+00
+67 93 0.00000000000000e+00
+67 180 0.00000000000000e+00
+67 15 0.00000000000000e+00
+67 69 0.00000000000000e+00
+67 179 -2.41126563160776e-16
+67 92 -1.80411241501588e-16
+67 176 2.08333333333333e+00
+67 233 8.33333333333333e+00
+67 68 -8.33333333333333e+00
+67 20 -2.08333333333333e+00
+67 65 2.68014777038417e-16
+67 170 4.04407410337093e-17
+67 178 5.55555555555556e+00
+67 91 -6.94444444444445e-01
+67 175 -3.47222222222222e+00
+67 232 -9.72222222222223e+00
+67 95 0.00000000000000e+00
+67 19 2.77777777777778e+00
+67 64 -4.86111111111111e+00
+67 169 -1.11111111111111e+01
+67 177 8.88178419700125e-16
+67 90 -7.63278329429795e-17
+67 174 2.08333333333333e+00
+67 231 1.45716771982052e-16
+67 66 -8.88178419700125e-16
+67 18 -1.72604985859692e-16
+67 63 4.16666666666666e+00
+67 168 3.48245737802344e-16
+68 68 2.77777777777778e+01
+68 182 0.00000000000000e+00
+68 17 0.00000000000000e+00
+68 71 0.00000000000000e+00
+68 94 0.00000000000000e+00
+68 181 0.00000000000000e+00
+68 16 0.00000000000000e+00
+68 70 0.00000000000000e+00
+68 93 0.00000000000000e+00
+68 180 0.00000000000000e+00
+68 15 0.00000000000000e+00
+68 69 0.00000000000000e+00
+68 179 -1.11111111111111e+01
+68 92 -4.86111111111111e+00
+68 176 -3.47222222222222e+00
+68 233 -9.72222222222222e+00
+68 95 0.00000000000000e+00
+68 20 2.77777777777778e+00
+68 65 -6.94444444444443e-01
+68 170 5.55555555555556e+00
+68 178 -5.06322414550731e-17
+68 91 -2.48065457064683e-16
+68 175 2.08333333333333e+00
+68 232 8.33333333333333e+00
+68 67 -8.33333333333333e+00
+68 19 -2.08333333333333e+00
+68 64 1.95590071916385e-16
+68 169 5.30581438160094e-17
+68 177 -6.76542155630955e-17
+68 90 -4.16666666666667e+00
+68 174 -2.08333333333333e+00
+68 231 1.77592315853126e-16
+68 66 0.00000000000000e+00
+68 18 -2.70616862252382e-16
+68 63 -1.00613961606655e-16
+68 168 4.44089209850063e-16
+69 69 1.00000000000000e+00
+69 179 0.00000000000000e+00
+69 17 0.00000000000000e+00
+69 68 0.00000000000000e+00
+69 94 0.00000000000000e+00
+69 178 0.00000000000000e+00
+69 16 0.00000000000000e+00
+69 67 0.00000000000000e+00
+69 93 0.00000000000000e+00
+69 177 0.00000000000000e+00
+69 15 0.00000000000000e+00
+69 66 0.00000000000000e+00
+69 182 0.00000000000000e+00
+69 233 0.00000000000000e+00
+69 173 0.00000000000000e+00
+69 86 0.00000000000000e+00
+69 71 0.00000000000000e+00
+69 170 0.00000000000000e+00
+69 62 0.00000000000000e+00
+69 2 0.00000000000000e+00
+69 181 0.00000000000000e+00
+69 232 0.00000000000000e+00
+69 172 0.00000000000000e+00
+69 85 0.00000000000000e+00
+69 70 0.00000000000000e+00
+69 169 0.00000000000000e+00
+69 61 0.00000000000000e+00
+69 1 0.00000000000000e+00
+69 180 0.00000000000000e+00
+69 231 0.00000000000000e+00
+69 171 0.00000000000000e+00
+69 84 0.00000000000000e+00
+69 95 0.00000000000000e+00
+69 168 0.00000000000000e+00
+69 60 0.00000000000000e+00
+69 0 0.00000000000000e+00
+70 70 1.00000000000000e+00
+70 179 0.00000000000000e+00
+70 17 0.00000000000000e+00
+70 68 0.00000000000000e+00
+70 94 0.00000000000000e+00
+70 178 0.00000000000000e+00
+70 16 0.00000000000000e+00
+70 67 0.00000000000000e+00
+70 93 0.00000000000000e+00
+70 177 0.00000000000000e+00
+70 15 0.00000000000000e+00
+70 66 0.00000000000000e+00
+70 182 0.00000000000000e+00
+70 233 0.00000000000000e+00
+70 173 0.00000000000000e+00
+70 86 0.00000000000000e+00
+70 71 0.00000000000000e+00
+70 170 0.00000000000000e+00
+70 62 0.00000000000000e+00
+70 2 0.00000000000000e+00
+70 181 0.00000000000000e+00
+70 232 0.00000000000000e+00
+70 172 0.00000000000000e+00
+70 85 0.00000000000000e+00
+70 95 0.00000000000000e+00
+70 169 0.00000000000000e+00
+70 61 0.00000000000000e+00
+70 1 0.00000000000000e+00
+70 180 0.00000000000000e+00
+70 231 0.00000000000000e+00
+70 171 0.00000000000000e+00
+70 84 0.00000000000000e+00
+70 69 0.00000000000000e+00
+70 168 0.00000000000000e+00
+70 60 0.00000000000000e+00
+70 0 0.00000000000000e+00
+71 71 1.00000000000000e+00
+71 179 0.00000000000000e+00
+71 17 0.00000000000000e+00
+71 68 0.00000000000000e+00
+71 94 0.00000000000000e+00
+71 178 0.00000000000000e+00
+71 16 0.00000000000000e+00
+71 67 0.00000000000000e+00
+71 93 0.00000000000000e+00
+71 177 0.00000000000000e+00
+71 15 0.00000000000000e+00
+71 66 0.00000000000000e+00
+71 182 0.00000000000000e+00
+71 233 0.00000000000000e+00
+71 173 0.00000000000000e+00
+71 86 0.00000000000000e+00
+71 95 0.00000000000000e+00
+71 170 0.00000000000000e+00
+71 62 0.00000000000000e+00
+71 2 0.00000000000000e+00
+71 181 0.00000000000000e+00
+71 232 0.00000000000000e+00
+71 172 0.00000000000000e+00
+71 85 0.00000000000000e+00
+71 70 0.00000000000000e+00
+71 169 0.00000000000000e+00
+71 61 0.00000000000000e+00
+71 1 0.00000000000000e+00
+71 180 0.00000000000000e+00
+71 231 0.00000000000000e+00
+71 171 0.00000000000000e+00
+71 84 0.00000000000000e+00
+71 69 0.00000000000000e+00
+71 168 0.00000000000000e+00
+71 60 0.00000000000000e+00
+71 0 0.00000000000000e+00
+72 72 2.77777777777778e+01
+72 35 -2.07082614944731e-17
+72 176 2.08333333333333e+00
+72 89 4.16666666666667e+00
+72 76 -4.16666666666667e+00
+72 34 -2.13370987545147e-16
+72 175 -2.08333333333333e+00
+72 88 -4.08744219027035e-17
+72 75 -4.86111111111111e+00
+72 33 -5.55555555555556e+00
+72 174 -3.47222222222222e+00
+72 87 -4.86111111111112e+00
+72 83 0.00000000000000e+00
+72 185 8.88178419700125e-16
+72 74 0.00000000000000e+00
+72 32 0.00000000000000e+00
+72 182 0.00000000000000e+00
+72 233 1.77700736070374e-16
+72 173 4.31078783780237e-16
+72 86 0.00000000000000e+00
+72 82 0.00000000000000e+00
+72 184 2.77555756156289e-17
+72 73 8.88178419700125e-16
+72 31 0.00000000000000e+00
+72 181 0.00000000000000e+00
+72 232 1.45716771982052e-16
+72 172 -4.44089209850063e-16
+72 85 0.00000000000000e+00
+72 81 0.00000000000000e+00
+72 183 5.55555555555556e+00
+72 77 -3.64291929955129e-17
+72 30 0.00000000000000e+00
+72 180 0.00000000000000e+00
+72 231 -1.38888888888889e+00
+72 171 5.55555555555556e+00
+72 84 0.00000000000000e+00
+73 73 2.77777777777778e+01
+73 35 -2.08333333333333e+00
+73 176 2.08333333333333e+00
+73 89 1.29995840481012e-16
+73 76 -4.86111111111111e+00
+73 34 2.77777777777778e+00
+73 175 -3.47222222222222e+00
+73 88 -6.94444444444445e-01
+73 75 -4.16666666666667e+00
+73 33 -2.28983498828939e-16
+73 174 -2.08333333333333e+00
+73 87 -6.93889390390723e-18
+73 83 0.00000000000000e+00
+73 185 -9.67108337857070e-17
+73 74 -8.33333333333333e+00
+73 32 0.00000000000000e+00
+73 182 0.00000000000000e+00
+73 233 8.33333333333333e+00
+73 173 2.50979250403238e-16
+73 86 0.00000000000000e+00
+73 82 0.00000000000000e+00
+73 184 -1.11111111111111e+01
+73 77 1.90819582357449e-17
+73 31 0.00000000000000e+00
+73 181 0.00000000000000e+00
+73 232 -9.72222222222223e+00
+73 172 5.55555555555556e+00
+73 85 0.00000000000000e+00
+73 81 0.00000000000000e+00
+73 183 1.38777878078145e-16
+73 72 8.88178419700125e-16
+73 30 0.00000000000000e+00
+73 180 0.00000000000000e+00
+73 231 7.83878170707020e-17
+73 171 0.00000000000000e+00
+73 84 0.00000000000000e+00
+74 74 2.77777777777778e+01
+74 35 2.77777777777778e+00
+74 176 -3.47222222222222e+00
+74 89 -4.86111111111111e+00
+74 76 -2.08166817117217e-17
+74 34 -2.08333333333333e+00
+74 175 2.08333333333333e+00
+74 88 1.50920942409982e-16
+74 75 -1.04083408558608e-16
+74 33 2.34187669256869e-17
+74 174 2.08333333333333e+00
+74 87 4.16666666666667e+00
+74 83 0.00000000000000e+00
+74 185 5.55555555555556e+00
+74 77 -6.94444444444445e-01
+74 32 0.00000000000000e+00
+74 182 0.00000000000000e+00
+74 233 -9.72222222222222e+00
+74 173 -1.11111111111111e+01
+74 86 0.00000000000000e+00
+74 82 0.00000000000000e+00
+74 184 -2.31585584042904e-16
+74 73 -8.33333333333333e+00
+74 31 0.00000000000000e+00
+74 181 0.00000000000000e+00
+74 232 8.33333333333333e+00
+74 172 4.91685685222176e-16
+74 85 0.00000000000000e+00
+74 81 0.00000000000000e+00
+74 183 8.88178419700125e-16
+74 72 0.00000000000000e+00
+74 30 0.00000000000000e+00
+74 180 0.00000000000000e+00
+74 231 3.72965547335014e-17
+74 171 -3.83807569059869e-17
+74 84 0.00000000000000e+00
+75 75 5.55555555555556e+01
+75 197 2.08333333333333e+00
+75 112 -4.16666666666667e+00
+75 196 -2.08333333333333e+00
+75 111 -4.86111111111111e+00
+75 195 -3.47222222222222e+00
+75 200 -1.24791670053082e-16
+75 107 -2.42861286636753e-17
+75 236 8.33333333333333e+00
+75 191 2.08333333333333e+00
+75 199 2.81025203108243e-16
+75 106 4.16666666666667e+00
+75 235 6.41847686111419e-17
+75 190 2.08333333333333e+00
+75 198 -1.11111111111111e+01
+75 105 -4.86111111111111e+00
+75 234 -9.72222222222223e+00
+75 189 -3.47222222222222e+00
+75 80 -1.11022302462516e-16
+75 50 8.88178419700125e-16
+75 179 -2.08333333333333e+00
+75 92 5.45353692760209e-17
+75 79 4.16666666666667e+00
+75 49 7.63278329429795e-17
+75 178 2.08333333333333e+00
+75 91 5.46437894932694e-17
+75 78 -4.86111111111111e+00
+75 48 5.55555555555556e+00
+75 177 -3.47222222222222e+00
+75 90 -1.38888888888889e+00
+75 185 -1.97758476261356e-16
+75 77 -8.88178419700125e-16
+75 35 8.88178419700125e-16
+75 74 -1.04083408558608e-16
+75 233 -8.33333333333333e+00
+75 176 2.25093923535147e-16
+75 89 2.83735708539457e-16
+75 173 -2.08333333333333e+00
+75 184 -3.95516952522712e-16
+75 76 0.00000000000000e+00
+75 34 2.41126563160776e-16
+75 73 -4.16666666666667e+00
+75 232 -7.71951946809679e-17
+75 175 4.44089209850063e-16
+75 88 6.88468379528295e-17
+75 172 -2.08333333333333e+00
+75 183 -1.11111111111111e+01
+75 113 7.45931094670027e-17
+75 33 5.55555555555556e+00
+75 72 -4.86111111111111e+00
+75 231 -9.72222222222223e+00
+75 174 1.11111111111111e+01
+75 87 -1.38888888888889e+00
+75 171 -3.47222222222222e+00
+76 76 5.55555555555556e+01
+76 197 2.08333333333333e+00
+76 112 -4.86111111111111e+00
+76 196 -3.47222222222222e+00
+76 111 -4.16666666666667e+00
+76 195 -2.08333333333333e+00
+76 200 8.88178419700125e-16
+76 107 2.08166817117217e-17
+76 236 -3.03034507209698e-16
+76 191 -2.08333333333333e+00
+76 199 5.55555555555556e+00
+76 106 -4.86111111111111e+00
+76 235 -1.38888888888889e+00
+76 190 -3.47222222222222e+00
+76 198 2.35922392732846e-16
+76 105 4.16666666666667e+00
+76 234 -1.21430643318376e-17
+76 189 2.08333333333333e+00
+76 80 2.10768902331182e-16
+76 50 2.89807240705375e-16
+76 179 2.08333333333333e+00
+76 92 8.33333333333333e+00
+76 79 -4.86111111111111e+00
+76 49 -1.11111111111111e+01
+76 178 -3.47222222222222e+00
+76 91 -9.72222222222223e+00
+76 78 4.16666666666667e+00
+76 48 6.76542155630955e-17
+76 177 2.08333333333333e+00
+76 90 9.75781955236954e-19
+76 185 4.44089209850063e-16
+76 77 0.00000000000000e+00
+76 35 -2.60208521396521e-17
+76 74 -2.08166817117217e-17
+76 233 -3.83048627539129e-16
+76 176 2.14644925097818e-16
+76 89 -8.33333333333333e+00
+76 173 -2.08333333333333e+00
+76 184 5.55555555555556e+00
+76 113 7.63278329429795e-17
+76 34 -1.11111111111111e+01
+76 73 -4.86111111111111e+00
+76 232 -1.38888888888889e+00
+76 175 1.11111111111111e+01
+76 88 -9.72222222222223e+00
+76 172 -3.47222222222222e+00
+76 183 -4.90926743701436e-16
+76 75 0.00000000000000e+00
+76 33 3.53883589099269e-16
+76 72 -4.16666666666667e+00
+76 231 -1.02457105299880e-16
+76 174 4.44089209850063e-16
+76 87 4.77048955893622e-17
+76 171 -2.08333333333333e+00
+77 77 5.55555555555556e+01
+77 197 -3.47222222222222e+00
+77 112 3.46944695195361e-17
+77 196 2.08333333333333e+00
+77 111 6.93889390390723e-18
+77 195 2.08333333333333e+00
+77 200 5.55555555555556e+00
+77 107 -6.94444444444445e-01
+77 236 -9.72222222222222e+00
+77 191 -3.47222222222222e+00
+77 199 0.00000000000000e+00
+77 106 1.17961196366423e-16
+77 235 -1.60461921527855e-16
+77 190 -2.08333333333333e+00
+77 198 -2.54136989230602e-16
+77 105 -1.24900090270330e-16
+77 234 8.33333333333333e+00
+77 189 2.08333333333333e+00
+77 80 -6.94444444444444e-01
+77 50 5.55555555555556e+00
+77 179 -3.47222222222222e+00
+77 92 -9.72222222222222e+00
+77 79 2.49800180540660e-16
+77 49 1.68268177169750e-16
+77 178 2.08333333333333e+00
+77 91 8.33333333333333e+00
+77 78 -9.88792381306780e-17
+77 48 8.88178419700125e-16
+77 177 -2.08333333333333e+00
+77 90 8.84708972748172e-17
+77 185 5.55555555555556e+00
+77 113 -6.94444444444445e-01
+77 35 5.55555555555556e+00
+77 74 -6.94444444444445e-01
+77 233 -9.72222222222222e+00
+77 176 -2.22222222222222e+01
+77 89 -9.72222222222222e+00
+77 173 -3.47222222222222e+00
+77 184 8.88178419700125e-16
+77 76 0.00000000000000e+00
+77 34 -5.37764277552810e-17
+77 73 1.90819582357449e-17
+77 232 -2.68014777038417e-16
+77 175 1.70328161297473e-16
+77 88 -8.33333333333333e+00
+77 172 -2.08333333333333e+00
+77 183 -2.00143721040824e-16
+77 75 -8.88178419700125e-16
+77 33 8.88178419700125e-16
+77 72 -3.72965547335014e-17
+77 231 -8.33333333333333e+00
+77 174 2.52402265754625e-16
+77 87 8.06646416329215e-17
+77 171 -2.08333333333333e+00
+78 78 2.77777777777778e+01
+78 83 0.00000000000000e+00
+78 95 0.00000000000000e+00
+78 182 0.00000000000000e+00
+78 46 0.00000000000000e+00
+78 82 0.00000000000000e+00
+78 94 0.00000000000000e+00
+78 181 0.00000000000000e+00
+78 45 0.00000000000000e+00
+78 81 0.00000000000000e+00
+78 93 0.00000000000000e+00
+78 180 0.00000000000000e+00
+78 80 -8.88178419700125e-16
+78 50 -1.80411241501588e-16
+78 77 -7.11236625150491e-17
+78 185 8.88178419700125e-16
+78 179 -6.76542155630955e-17
+78 92 4.16666666666667e+00
+78 176 2.08333333333333e+00
+78 233 6.49437101318817e-17
+78 79 -8.88178419700125e-16
+78 49 -2.15105711021124e-16
+78 76 4.16666666666667e+00
+78 184 1.38777878078145e-16
+78 178 8.88178419700125e-16
+78 91 -9.02056207507940e-17
+78 175 2.08333333333333e+00
+78 232 7.67615138119737e-17
+78 47 0.00000000000000e+00
+78 48 -5.55555555555556e+00
+78 75 -4.86111111111111e+00
+78 183 5.55555555555556e+00
+78 177 5.55555555555556e+00
+78 90 -4.86111111111111e+00
+78 174 -3.47222222222222e+00
+78 231 -1.38888888888889e+00
+79 79 2.77777777777778e+01
+79 83 0.00000000000000e+00
+79 95 0.00000000000000e+00
+79 182 0.00000000000000e+00
+79 46 0.00000000000000e+00
+79 82 0.00000000000000e+00
+79 94 0.00000000000000e+00
+79 181 0.00000000000000e+00
+79 45 0.00000000000000e+00
+79 81 0.00000000000000e+00
+79 93 0.00000000000000e+00
+79 180 0.00000000000000e+00
+79 80 8.33333333333333e+00
+79 50 2.08333333333333e+00
+79 77 1.94289029309402e-16
+79 185 2.12503625807159e-16
+79 179 -4.35849273339173e-17
+79 92 1.04950770296597e-16
+79 176 -2.08333333333333e+00
+79 233 -8.33333333333333e+00
+79 47 0.00000000000000e+00
+79 49 2.77777777777778e+00
+79 76 -4.86111111111111e+00
+79 184 -1.11111111111111e+01
+79 178 5.55555555555556e+00
+79 91 -6.94444444444445e-01
+79 175 -3.47222222222222e+00
+79 232 -9.72222222222223e+00
+79 78 0.00000000000000e+00
+79 48 -1.66533453693773e-16
+79 75 4.16666666666667e+00
+79 183 2.77555756156289e-17
+79 177 8.88178419700125e-16
+79 90 -1.04083408558608e-16
+79 174 2.08333333333333e+00
+79 231 3.38271077815477e-17
+80 80 2.77777777777778e+01
+80 83 0.00000000000000e+00
+80 95 0.00000000000000e+00
+80 182 0.00000000000000e+00
+80 46 0.00000000000000e+00
+80 82 0.00000000000000e+00
+80 94 0.00000000000000e+00
+80 181 0.00000000000000e+00
+80 45 0.00000000000000e+00
+80 81 0.00000000000000e+00
+80 93 0.00000000000000e+00
+80 180 0.00000000000000e+00
+80 47 0.00000000000000e+00
+80 50 2.77777777777778e+00
+80 77 -6.94444444444444e-01
+80 185 5.55555555555556e+00
+80 179 -1.11111111111111e+01
+80 92 -4.86111111111111e+00
+80 176 -3.47222222222222e+00
+80 233 -9.72222222222222e+00
+80 79 8.33333333333333e+00
+80 49 2.08333333333333e+00
+80 76 2.11636264069170e-16
+80 184 2.13587827979644e-17
+80 178 -2.41126563160776e-16
+80 91 1.11022302462516e-16
+80 175 -2.08333333333333e+00
+80 232 -8.33333333333333e+00
+80 78 -8.88178419700125e-16
+80 48 -2.22044604925031e-16
+80 75 -1.17961196366423e-16
+80 183 8.88178419700125e-16
+80 177 5.96744875736022e-16
+80 90 4.16666666666667e+00
+80 174 2.08333333333333e+00
+80 231 -7.45931094670027e-17
+81 81 1.00000000000000e+00
+81 80 0.00000000000000e+00
+81 95 0.00000000000000e+00
+81 179 0.00000000000000e+00
+81 46 0.00000000000000e+00
+81 79 0.00000000000000e+00
+81 94 0.00000000000000e+00
+81 178 0.00000000000000e+00
+81 45 0.00000000000000e+00
+81 78 0.00000000000000e+00
+81 93 0.00000000000000e+00
+81 177 0.00000000000000e+00
+81 83 0.00000000000000e+00
+81 185 0.00000000000000e+00
+81 74 0.00000000000000e+00
+81 32 0.00000000000000e+00
+81 182 0.00000000000000e+00
+81 233 0.00000000000000e+00
+81 173 0.00000000000000e+00
+81 86 0.00000000000000e+00
+81 82 0.00000000000000e+00
+81 184 0.00000000000000e+00
+81 73 0.00000000000000e+00
+81 31 0.00000000000000e+00
+81 181 0.00000000000000e+00
+81 232 0.00000000000000e+00
+81 172 0.00000000000000e+00
+81 85 0.00000000000000e+00
+81 47 0.00000000000000e+00
+81 183 0.00000000000000e+00
+81 72 0.00000000000000e+00
+81 30 0.00000000000000e+00
+81 180 0.00000000000000e+00
+81 231 0.00000000000000e+00
+81 171 0.00000000000000e+00
+81 84 0.00000000000000e+00
+82 82 1.00000000000000e+00
+82 80 0.00000000000000e+00
+82 95 0.00000000000000e+00
+82 179 0.00000000000000e+00
+82 46 0.00000000000000e+00
+82 79 0.00000000000000e+00
+82 94 0.00000000000000e+00
+82 178 0.00000000000000e+00
+82 45 0.00000000000000e+00
+82 78 0.00000000000000e+00
+82 93 0.00000000000000e+00
+82 177 0.00000000000000e+00
+82 83 0.00000000000000e+00
+82 185 0.00000000000000e+00
+82 74 0.00000000000000e+00
+82 32 0.00000000000000e+00
+82 182 0.00000000000000e+00
+82 233 0.00000000000000e+00
+82 173 0.00000000000000e+00
+82 86 0.00000000000000e+00
+82 47 0.00000000000000e+00
+82 184 0.00000000000000e+00
+82 73 0.00000000000000e+00
+82 31 0.00000000000000e+00
+82 181 0.00000000000000e+00
+82 232 0.00000000000000e+00
+82 172 0.00000000000000e+00
+82 85 0.00000000000000e+00
+82 81 0.00000000000000e+00
+82 183 0.00000000000000e+00
+82 72 0.00000000000000e+00
+82 30 0.00000000000000e+00
+82 180 0.00000000000000e+00
+82 231 0.00000000000000e+00
+82 171 0.00000000000000e+00
+82 84 0.00000000000000e+00
+83 83 1.00000000000000e+00
+83 80 0.00000000000000e+00
+83 95 0.00000000000000e+00
+83 179 0.00000000000000e+00
+83 46 0.00000000000000e+00
+83 79 0.00000000000000e+00
+83 94 0.00000000000000e+00
+83 178 0.00000000000000e+00
+83 45 0.00000000000000e+00
+83 78 0.00000000000000e+00
+83 93 0.00000000000000e+00
+83 177 0.00000000000000e+00
+83 47 0.00000000000000e+00
+83 185 0.00000000000000e+00
+83 74 0.00000000000000e+00
+83 32 0.00000000000000e+00
+83 182 0.00000000000000e+00
+83 233 0.00000000000000e+00
+83 173 0.00000000000000e+00
+83 86 0.00000000000000e+00
+83 82 0.00000000000000e+00
+83 184 0.00000000000000e+00
+83 73 0.00000000000000e+00
+83 31 0.00000000000000e+00
+83 181 0.00000000000000e+00
+83 232 0.00000000000000e+00
+83 172 0.00000000000000e+00
+83 85 0.00000000000000e+00
+83 81 0.00000000000000e+00
+83 183 0.00000000000000e+00
+83 72 0.00000000000000e+00
+83 30 0.00000000000000e+00
+83 180 0.00000000000000e+00
+83 231 0.00000000000000e+00
+83 171 0.00000000000000e+00
+83 84 0.00000000000000e+00
+84 84 1.00000000000000e+00
+84 185 0.00000000000000e+00
+84 74 0.00000000000000e+00
+84 32 0.00000000000000e+00
+84 82 0.00000000000000e+00
+84 184 0.00000000000000e+00
+84 73 0.00000000000000e+00
+84 31 0.00000000000000e+00
+84 81 0.00000000000000e+00
+84 183 0.00000000000000e+00
+84 72 0.00000000000000e+00
+84 30 0.00000000000000e+00
+84 182 0.00000000000000e+00
+84 233 0.00000000000000e+00
+84 173 0.00000000000000e+00
+84 86 0.00000000000000e+00
+84 71 0.00000000000000e+00
+84 170 0.00000000000000e+00
+84 62 0.00000000000000e+00
+84 2 0.00000000000000e+00
+84 181 0.00000000000000e+00
+84 232 0.00000000000000e+00
+84 172 0.00000000000000e+00
+84 85 0.00000000000000e+00
+84 70 0.00000000000000e+00
+84 169 0.00000000000000e+00
+84 61 0.00000000000000e+00
+84 1 0.00000000000000e+00
+84 180 0.00000000000000e+00
+84 231 0.00000000000000e+00
+84 171 0.00000000000000e+00
+84 83 0.00000000000000e+00
+84 69 0.00000000000000e+00
+84 168 0.00000000000000e+00
+84 60 0.00000000000000e+00
+84 0 0.00000000000000e+00
+85 85 1.00000000000000e+00
+85 185 0.00000000000000e+00
+85 74 0.00000000000000e+00
+85 32 0.00000000000000e+00
+85 82 0.00000000000000e+00
+85 184 0.00000000000000e+00
+85 73 0.00000000000000e+00
+85 31 0.00000000000000e+00
+85 81 0.00000000000000e+00
+85 183 0.00000000000000e+00
+85 72 0.00000000000000e+00
+85 30 0.00000000000000e+00
+85 182 0.00000000000000e+00
+85 233 0.00000000000000e+00
+85 173 0.00000000000000e+00
+85 86 0.00000000000000e+00
+85 71 0.00000000000000e+00
+85 170 0.00000000000000e+00
+85 62 0.00000000000000e+00
+85 2 0.00000000000000e+00
+85 181 0.00000000000000e+00
+85 232 0.00000000000000e+00
+85 172 0.00000000000000e+00
+85 83 0.00000000000000e+00
+85 70 0.00000000000000e+00
+85 169 0.00000000000000e+00
+85 61 0.00000000000000e+00
+85 1 0.00000000000000e+00
+85 180 0.00000000000000e+00
+85 231 0.00000000000000e+00
+85 171 0.00000000000000e+00
+85 84 0.00000000000000e+00
+85 69 0.00000000000000e+00
+85 168 0.00000000000000e+00
+85 60 0.00000000000000e+00
+85 0 0.00000000000000e+00
+86 86 1.00000000000000e+00
+86 185 0.00000000000000e+00
+86 74 0.00000000000000e+00
+86 32 0.00000000000000e+00
+86 82 0.00000000000000e+00
+86 184 0.00000000000000e+00
+86 73 0.00000000000000e+00
+86 31 0.00000000000000e+00
+86 81 0.00000000000000e+00
+86 183 0.00000000000000e+00
+86 72 0.00000000000000e+00
+86 30 0.00000000000000e+00
+86 182 0.00000000000000e+00
+86 233 0.00000000000000e+00
+86 173 0.00000000000000e+00
+86 83 0.00000000000000e+00
+86 71 0.00000000000000e+00
+86 170 0.00000000000000e+00
+86 62 0.00000000000000e+00
+86 2 0.00000000000000e+00
+86 181 0.00000000000000e+00
+86 232 0.00000000000000e+00
+86 172 0.00000000000000e+00
+86 85 0.00000000000000e+00
+86 70 0.00000000000000e+00
+86 169 0.00000000000000e+00
+86 61 0.00000000000000e+00
+86 1 0.00000000000000e+00
+86 180 0.00000000000000e+00
+86 231 0.00000000000000e+00
+86 171 0.00000000000000e+00
+86 84 0.00000000000000e+00
+86 69 0.00000000000000e+00
+86 168 0.00000000000000e+00
+86 60 0.00000000000000e+00
+86 0 0.00000000000000e+00
+87 87 5.55555555555556e+01
+87 107 -4.16666666666667e+00
+87 199 -2.08333333333333e+00
+87 106 3.39355279987963e-17
+87 198 -3.47222222222222e+00
+87 105 -4.86111111111111e+00
+87 236 -7.26415455565288e-18
+87 191 4.14029704617902e-16
+87 188 2.08333333333333e+00
+87 98 4.16666666666667e+00
+87 235 -8.33333333333333e+00
+87 190 4.24709096016884e-16
+87 187 -2.08333333333333e+00
+87 97 6.93889390390723e-17
+87 234 -9.72222222222222e+00
+87 189 -1.11111111111111e+01
+87 186 -3.47222222222222e+00
+87 96 -4.86111111111111e+00
+87 185 2.08333333333333e+00
+87 77 1.92554305833426e-16
+87 35 -1.50812522192734e-16
+87 74 4.16666666666667e+00
+87 184 2.08333333333333e+00
+87 76 4.77048955893622e-17
+87 34 -4.44089209850063e-16
+87 73 -8.67361737988404e-19
+87 183 -3.47222222222222e+00
+87 75 -1.38888888888889e+00
+87 33 5.55555555555556e+00
+87 72 -4.86111111111112e+00
+87 233 -2.05564731903252e-16
+87 176 1.77635683940025e-15
+87 89 0.00000000000000e+00
+87 173 -6.93889390390723e-17
+87 170 -2.08333333333333e+00
+87 65 1.65666091955785e-16
+87 5 -6.99174875981590e-17
+87 62 -4.16666666666667e+00
+87 232 8.33333333333333e+00
+87 175 -1.62630325872826e-17
+87 88 -1.77635683940025e-15
+87 172 -4.26741975090295e-16
+87 169 2.08333333333333e+00
+87 64 5.46437894932694e-17
+87 4 -4.44089209850063e-16
+87 61 1.30104260698261e-17
+87 231 -9.72222222222222e+00
+87 174 1.11111111111111e+01
+87 200 -2.08333333333333e+00
+87 171 -1.11111111111111e+01
+87 168 -3.47222222222222e+00
+87 63 -1.38888888888889e+00
+87 3 5.55555555555556e+00
+87 60 -4.86111111111112e+00
+88 88 5.55555555555556e+01
+88 107 3.13984949151802e-16
+88 199 -3.47222222222222e+00
+88 106 -6.94444444444445e-01
+88 198 -2.08333333333333e+00
+88 105 5.55111512312578e-17
+88 236 1.44849410244063e-16
+88 191 8.88178419700125e-16
+88 188 2.08333333333333e+00
+88 98 -1.23599047663348e-17
+88 235 -9.72222222222222e+00
+88 190 5.55555555555556e+00
+88 187 -3.47222222222222e+00
+88 97 -6.94444444444445e-01
+88 234 -8.33333333333333e+00
+88 189 4.87348876532234e-16
+88 186 -2.08333333333333e+00
+88 96 5.03069808033274e-17
+88 185 -2.08333333333333e+00
+88 77 -8.33333333333333e+00
+88 35 2.73652628335341e-16
+88 74 1.50920942409982e-16
+88 184 -3.47222222222222e+00
+88 76 -9.72222222222223e+00
+88 34 5.55555555555556e+00
+88 73 -6.94444444444445e-01
+88 183 2.08333333333333e+00
+88 75 6.88468379528295e-17
+88 33 -4.44089209850063e-16
+88 72 -4.08744219027035e-17
+88 233 4.01913745340376e-16
+88 176 -6.59737021957429e-17
+88 89 -2.66453525910038e-15
+88 173 0.00000000000000e+00
+88 170 2.08333333333333e+00
+88 65 8.33333333333333e+00
+88 5 3.33798743853975e-17
+88 62 -1.35742111995185e-16
+88 232 -9.72222222222222e+00
+88 175 -2.22222222222222e+01
+88 200 -2.08333333333333e+00
+88 172 5.55555555555556e+00
+88 169 -3.47222222222222e+00
+88 64 -9.72222222222223e+00
+88 4 5.55555555555556e+00
+88 61 -6.94444444444445e-01
+88 231 8.33333333333333e+00
+88 174 9.07748268913489e-17
+88 87 -8.88178419700125e-16
+88 171 -4.22296746183104e-16
+88 168 2.08333333333333e+00
+88 63 2.16840434497101e-19
+88 3 -4.44089209850063e-16
+88 60 -3.39355279987963e-17
+89 89 5.55555555555556e+01
+89 107 -4.86111111111111e+00
+89 199 -2.08333333333333e+00
+89 106 2.53486467927111e-16
+89 198 -2.08333333333333e+00
+89 105 -4.16666666666667e+00
+89 236 -1.38888888888889e+00
+89 191 5.55555555555556e+00
+89 188 -3.47222222222222e+00
+89 98 -4.86111111111111e+00
+89 235 1.98625837999344e-16
+89 190 8.88178419700125e-16
+89 187 2.08333333333333e+00
+89 97 -2.16840434497101e-17
+89 234 1.48318857196017e-16
+89 189 2.91216703529606e-16
+89 186 2.08333333333333e+00
+89 96 4.16666666666667e+00
+89 185 -3.47222222222222e+00
+89 77 -9.72222222222222e+00
+89 35 -1.11111111111111e+01
+89 74 -4.86111111111111e+00
+89 184 -2.08333333333333e+00
+89 76 -8.33333333333333e+00
+89 34 3.33798743853975e-17
+89 73 7.44846892497542e-17
+89 183 2.08333333333333e+00
+89 75 1.72713406076941e-16
+89 33 -5.13884724703817e-16
+89 72 4.16666666666666e+00
+89 233 -1.38888888888889e+00
+89 176 1.11111111111111e+01
+89 200 -3.47222222222222e+00
+89 173 5.55555555555556e+00
+89 170 -3.47222222222222e+00
+89 65 -9.72222222222222e+00
+89 5 -1.11111111111111e+01
+89 62 -4.86111111111111e+00
+89 232 4.06792655116561e-16
+89 175 -7.19910242530375e-17
+89 88 -2.66453525910038e-15
+89 172 0.00000000000000e+00
+89 169 2.08333333333333e+00
+89 64 8.33333333333333e+00
+89 4 2.18141477104083e-16
+89 61 -8.67361737988404e-17
+89 231 -3.92481186439753e-17
+89 174 1.77635683940025e-15
+89 87 -8.88178419700125e-16
+89 171 -8.52318432845167e-17
+89 168 -2.08333333333333e+00
+89 63 8.84708972748172e-17
+89 3 -3.97902197302180e-17
+89 60 -4.16666666666667e+00
+90 90 5.55555555555556e+01
+90 200 -2.08333333333333e+00
+90 112 6.59194920871187e-17
+90 199 2.08333333333333e+00
+90 111 -4.86111111111111e+00
+90 198 -3.47222222222222e+00
+90 197 -3.39138439553466e-16
+90 236 -1.86808034319252e-16
+90 104 4.16666666666667e+00
+90 188 2.08333333333333e+00
+90 196 1.36934734384919e-16
+90 235 8.33333333333333e+00
+90 103 2.25514051876985e-17
+90 187 2.08333333333333e+00
+90 195 -1.11111111111111e+01
+90 234 -9.72222222222222e+00
+90 102 -4.86111111111111e+00
+90 186 -3.47222222222222e+00
+90 80 4.16666666666667e+00
+90 50 1.24900090270330e-16
+90 77 7.37257477290143e-17
+90 185 2.08333333333333e+00
+90 79 -1.04083408558608e-16
+90 49 8.88178419700125e-16
+90 76 2.17924636669586e-17
+90 184 -2.08333333333333e+00
+90 78 -4.86111111111111e+00
+90 48 5.55555555555556e+00
+90 75 -1.38888888888889e+00
+90 183 -3.47222222222222e+00
+90 179 -4.37150315946155e-16
+90 92 0.00000000000000e+00
+90 176 1.77635683940025e-15
+90 233 2.66280053562440e-16
+90 68 -4.16666666666667e+00
+90 20 2.94902990916057e-16
+90 65 1.71846044338952e-16
+90 170 -2.08333333333333e+00
+90 178 -3.38271077815477e-16
+90 91 0.00000000000000e+00
+90 175 2.08627603040523e-16
+90 232 -8.33333333333333e+00
+90 67 -9.02056207507940e-17
+90 19 8.88178419700125e-16
+90 64 8.27246257606440e-17
+90 169 -2.08333333333333e+00
+90 177 -1.11111111111111e+01
+90 113 -4.16666666666667e+00
+90 174 1.11111111111111e+01
+90 231 -9.72222222222222e+00
+90 66 -4.86111111111111e+00
+90 18 5.55555555555556e+00
+90 63 -1.38888888888889e+00
+90 168 -3.47222222222222e+00
+91 91 5.55555555555556e+01
+91 200 2.08333333333333e+00
+91 112 -6.94444444444445e-01
+91 199 -3.47222222222222e+00
+91 111 -4.85722573273506e-17
+91 198 2.08333333333333e+00
+91 197 1.77635683940025e-15
+91 236 4.05925293378573e-16
+91 104 -2.91433543964104e-16
+91 188 -2.08333333333333e+00
+91 196 5.55555555555556e+00
+91 235 -9.72222222222222e+00
+91 103 -6.94444444444444e-01
+91 187 -3.47222222222222e+00
+91 195 -5.46437894932694e-17
+91 234 8.33333333333333e+00
+91 102 -4.16333634234434e-17
+91 186 2.08333333333333e+00
+91 80 1.17961196366423e-16
+91 50 -2.41993924898765e-16
+91 77 8.33333333333333e+00
+91 185 2.08333333333333e+00
+91 79 -6.94444444444445e-01
+91 49 5.55555555555556e+00
+91 76 -9.72222222222223e+00
+91 184 -3.47222222222222e+00
+91 78 -9.02056207507940e-17
+91 48 8.88178419700125e-16
+91 75 6.85215773010839e-17
+91 183 -2.08333333333333e+00
+91 179 1.77635683940025e-15
+91 92 0.00000000000000e+00
+91 176 4.55364912443912e-16
+91 233 2.02962646689286e-16
+91 68 -2.48065457064683e-16
+91 20 -4.77048955893622e-17
+91 65 -8.33333333333333e+00
+91 170 -2.08333333333333e+00
+91 178 5.55555555555556e+00
+91 113 1.11022302462516e-16
+91 175 -2.22222222222222e+01
+91 232 -9.72222222222222e+00
+91 67 -6.94444444444445e-01
+91 19 5.55555555555556e+00
+91 64 -9.72222222222223e+00
+91 169 -3.47222222222222e+00
+91 177 -4.93854089567147e-16
+91 90 -8.88178419700125e-16
+91 174 3.72423446248771e-16
+91 231 -8.33333333333333e+00
+91 66 -6.93889390390723e-17
+91 18 8.88178419700125e-16
+91 63 6.15826833971767e-17
+91 168 -2.08333333333333e+00
+92 92 5.55555555555556e+01
+92 200 -3.47222222222222e+00
+92 112 -1.30104260698261e-17
+92 199 2.08333333333333e+00
+92 111 -4.16666666666667e+00
+92 198 -2.08333333333333e+00
+92 197 5.55555555555556e+00
+92 236 -1.38888888888889e+00
+92 104 -4.86111111111111e+00
+92 188 -3.47222222222222e+00
+92 196 8.88178419700125e-16
+92 235 3.78169717762944e-16
+92 103 -1.38777878078145e-16
+92 187 -2.08333333333333e+00
+92 195 -4.37150315946155e-16
+92 234 -2.24646690138997e-16
+92 102 4.16666666666667e+00
+92 186 2.08333333333333e+00
+92 80 -4.86111111111111e+00
+92 50 -1.11111111111111e+01
+92 77 -9.72222222222222e+00
+92 185 -3.47222222222222e+00
+92 79 2.15105711021124e-16
+92 49 -3.70797142990043e-17
+92 76 8.33333333333333e+00
+92 184 2.08333333333333e+00
+92 78 4.16666666666667e+00
+92 48 9.54097911787244e-18
+92 75 2.70508442035133e-16
+92 183 2.08333333333333e+00
+92 179 5.55555555555556e+00
+92 113 -4.86111111111111e+00
+92 176 1.11111111111111e+01
+92 233 -1.38888888888889e+00
+92 68 -4.86111111111111e+00
+92 20 -1.11111111111111e+01
+92 65 -9.72222222222222e+00
+92 170 -3.47222222222222e+00
+92 178 1.77635683940025e-15
+92 91 0.00000000000000e+00
+92 175 1.66601216329554e-16
+92 232 1.78134416939368e-16
+92 67 -1.80411241501588e-16
+92 19 -1.03216046820620e-16
+92 64 -8.33333333333333e+00
+92 169 -2.08333333333333e+00
+92 177 -2.69749500514394e-16
+92 90 0.00000000000000e+00
+92 174 1.77635683940025e-15
+92 231 1.64581889783300e-16
+92 66 -4.16666666666667e+00
+92 18 2.91433543964104e-16
+92 63 -3.12250225675825e-17
+92 168 -2.08333333333333e+00
+93 93 1.00000000000000e+00
+93 80 0.00000000000000e+00
+93 185 0.00000000000000e+00
+93 83 0.00000000000000e+00
+93 46 0.00000000000000e+00
+93 79 0.00000000000000e+00
+93 184 0.00000000000000e+00
+93 82 0.00000000000000e+00
+93 45 0.00000000000000e+00
+93 78 0.00000000000000e+00
+93 183 0.00000000000000e+00
+93 81 0.00000000000000e+00
+93 95 0.00000000000000e+00
+93 179 0.00000000000000e+00
+93 233 0.00000000000000e+00
+93 182 0.00000000000000e+00
+93 17 0.00000000000000e+00
+93 68 0.00000000000000e+00
+93 170 0.00000000000000e+00
+93 71 0.00000000000000e+00
+93 94 0.00000000000000e+00
+93 178 0.00000000000000e+00
+93 232 0.00000000000000e+00
+93 181 0.00000000000000e+00
+93 16 0.00000000000000e+00
+93 67 0.00000000000000e+00
+93 169 0.00000000000000e+00
+93 70 0.00000000000000e+00
+93 47 0.00000000000000e+00
+93 177 0.00000000000000e+00
+93 231 0.00000000000000e+00
+93 180 0.00000000000000e+00
+93 15 0.00000000000000e+00
+93 66 0.00000000000000e+00
+93 168 0.00000000000000e+00
+93 69 0.00000000000000e+00
+94 94 1.00000000000000e+00
+94 80 0.00000000000000e+00
+94 185 0.00000000000000e+00
+94 83 0.00000000000000e+00
+94 46 0.00000000000000e+00
+94 79 0.00000000000000e+00
+94 184 0.00000000000000e+00
+94 82 0.00000000000000e+00
+94 45 0.00000000000000e+00
+94 78 0.00000000000000e+00
+94 183 0.00000000000000e+00
+94 81 0.00000000000000e+00
+94 95 0.00000000000000e+00
+94 179 0.00000000000000e+00
+94 233 0.00000000000000e+00
+94 182 0.00000000000000e+00
+94 17 0.00000000000000e+00
+94 68 0.00000000000000e+00
+94 170 0.00000000000000e+00
+94 71 0.00000000000000e+00
+94 47 0.00000000000000e+00
+94 178 0.00000000000000e+00
+94 232 0.00000000000000e+00
+94 181 0.00000000000000e+00
+94 16 0.00000000000000e+00
+94 67 0.00000000000000e+00
+94 169 0.00000000000000e+00
+94 70 0.00000000000000e+00
+94 93 0.00000000000000e+00
+94 177 0.00000000000000e+00
+94 231 0.00000000000000e+00
+94 180 0.00000000000000e+00
+94 15 0.00000000000000e+00
+94 66 0.00000000000000e+00
+94 168 0.00000000000000e+00
+94 69 0.00000000000000e+00
+95 95 1.00000000000000e+00
+95 80 0.00000000000000e+00
+95 185 0.00000000000000e+00
+95 83 0.00000000000000e+00
+95 46 0.00000000000000e+00
+95 79 0.00000000000000e+00
+95 184 0.00000000000000e+00
+95 82 0.00000000000000e+00
+95 45 0.00000000000000e+00
+95 78 0.00000000000000e+00
+95 183 0.00000000000000e+00
+95 81 0.00000000000000e+00
+95 47 0.00000000000000e+00
+95 179 0.00000000000000e+00
+95 233 0.00000000000000e+00
+95 182 0.00000000000000e+00
+95 17 0.00000000000000e+00
+95 68 0.00000000000000e+00
+95 170 0.00000000000000e+00
+95 71 0.00000000000000e+00
+95 94 0.00000000000000e+00
+95 178 0.00000000000000e+00
+95 232 0.00000000000000e+00
+95 181 0.00000000000000e+00
+95 16 0.00000000000000e+00
+95 67 0.00000000000000e+00
+95 169 0.00000000000000e+00
+95 70 0.00000000000000e+00
+95 93 0.00000000000000e+00
+95 177 0.00000000000000e+00
+95 231 0.00000000000000e+00
+95 180 0.00000000000000e+00
+95 15 0.00000000000000e+00
+95 66 0.00000000000000e+00
+95 168 0.00000000000000e+00
+95 69 0.00000000000000e+00
+96 96 2.77777777777778e+01
+96 116 -4.16666666666667e+00
+96 101 -1.02348685082632e-16
+96 8 -1.02866391619993e-15
+96 193 -2.08333333333333e+00
+96 115 -2.68882138776405e-17
+96 100 -4.16666666666667e+00
+96 7 -1.79733615143784e-16
+96 192 -3.47222222222222e+00
+96 114 -4.86111111111112e+00
+96 99 -4.86111111111111e+00
+96 6 -5.55555555555555e+00
+96 176 2.08333333333333e+00
+96 236 1.98625837999344e-16
+96 191 3.96492734477949e-16
+96 89 4.16666666666667e+00
+96 65 1.29236898960272e-16
+96 188 4.44089209850063e-16
+96 98 3.55271367880050e-15
+96 5 1.42030484595601e-16
+96 175 2.08333333333333e+00
+96 235 -5.11743425413158e-17
+96 190 -4.44089209850063e-16
+96 88 4.94396190653390e-17
+96 64 4.16666666666666e+00
+96 187 1.86591193884755e-16
+96 97 0.00000000000000e+00
+96 4 2.53161207275365e-16
+96 174 -3.47222222222222e+00
+96 234 -1.38888888888889e+00
+96 189 5.55555555555556e+00
+96 87 -4.86111111111111e+00
+96 63 -4.86111111111111e+00
+96 186 5.55555555555556e+00
+96 194 -2.08333333333333e+00
+96 3 -5.55555555555555e+00
+97 97 2.77777777777778e+01
+97 116 1.61329283265843e-16
+97 101 -4.63171168085807e-16
+97 8 2.08333333333333e+00
+97 193 -3.47222222222222e+00
+97 115 -6.94444444444446e-01
+97 100 -4.86111111111111e+00
+97 7 2.77777777777778e+00
+97 192 -2.08333333333333e+00
+97 114 6.07153216591882e-18
+97 99 -4.16666666666667e+00
+97 6 -2.00468981692570e-16
+97 176 -2.08333333333333e+00
+97 236 -8.33333333333333e+00
+97 191 1.18481613409216e-15
+97 89 -2.16840434497101e-17
+97 65 1.48427277413266e-16
+97 188 1.29670579829266e-16
+97 98 8.33333333333333e+00
+97 5 2.08333333333333e+00
+97 175 -3.47222222222222e+00
+97 235 -9.72222222222223e+00
+97 190 5.55555555555556e+00
+97 88 -6.94444444444445e-01
+97 64 -4.86111111111111e+00
+97 187 -1.11111111111111e+01
+97 194 -2.08333333333333e+00
+97 4 2.77777777777778e+00
+97 174 2.08333333333333e+00
+97 234 4.07660016854550e-17
+97 189 0.00000000000000e+00
+97 87 2.77555756156289e-17
+97 63 4.16666666666667e+00
+97 186 1.69000013636178e-17
+97 96 -8.88178419700125e-16
+97 3 1.30673466838815e-16
+98 98 2.77777777777778e+01
+98 116 -4.86111111111111e+00
+98 101 -6.94444444444444e-01
+98 8 2.77777777777778e+00
+98 193 -2.08333333333333e+00
+98 115 1.68268177169750e-16
+98 100 -5.08273978461204e-16
+98 7 2.08333333333333e+00
+98 192 -2.08333333333333e+00
+98 114 -4.16666666666667e+00
+98 99 -1.04950770296597e-16
+98 6 -9.85431354572075e-16
+98 176 -3.47222222222222e+00
+98 236 -9.72222222222222e+00
+98 191 -1.11111111111111e+01
+98 89 -4.86111111111111e+00
+98 65 -6.94444444444444e-01
+98 188 5.55555555555556e+00
+98 194 -3.47222222222222e+00
+98 5 2.77777777777778e+00
+98 175 -2.08333333333333e+00
+98 235 -8.33333333333334e+00
+98 190 5.71171256992520e-16
+98 88 -1.23599047663348e-17
+98 64 1.49186218934005e-16
+98 187 5.67254576644416e-16
+98 97 8.33333333333333e+00
+98 4 2.08333333333333e+00
+98 174 2.08333333333333e+00
+98 234 1.67400815431762e-16
+98 189 3.69387680165811e-16
+98 87 4.16666666666667e+00
+98 63 -2.37440275774325e-17
+98 186 4.44089209850063e-16
+98 96 3.55271367880050e-15
+98 3 2.25812207474418e-16
+99 99 5.55555555555556e+01
+99 128 -1.13299127024735e-16
+99 211 -2.08333333333333e+00
+99 127 -4.16666666666667e+00
+99 210 -3.47222222222222e+00
+99 126 -4.86111111111111e+00
+99 239 -8.33333333333333e+00
+99 206 -2.08333333333333e+00
+99 203 -1.20111982426091e-15
+99 122 -2.37331855557077e-16
+99 238 -2.39283419467551e-16
+99 205 2.08333333333333e+00
+99 202 -2.50098336138094e-16
+99 121 4.16666666666666e+00
+99 237 -9.72222222222223e+00
+99 204 -3.47222222222222e+00
+99 201 -1.11111111111111e+01
+99 120 -4.86111111111111e+00
+99 197 2.08333333333333e+00
+99 119 4.02455846426619e-16
+99 104 -2.19442519711066e-16
+99 23 1.33226762955019e-15
+99 196 2.08333333333333e+00
+99 118 2.26381413614973e-16
+99 103 4.16666666666667e+00
+99 22 2.93276687657329e-16
+99 195 -3.47222222222222e+00
+99 117 -1.38888888888889e+00
+99 102 -4.86111111111111e+00
+99 21 5.55555555555556e+00
+99 236 8.33333333333333e+00
+99 194 1.29193530873373e-15
+99 116 4.57966997657877e-16
+99 191 2.08333333333333e+00
+99 188 -1.64798730217797e-15
+99 101 4.44089209850063e-15
+99 8 8.88178419700125e-16
+99 98 -1.08420217248550e-16
+99 235 -4.94396190653390e-17
+99 193 8.88178419700125e-16
+99 115 1.30646361784503e-16
+99 190 -2.08333333333333e+00
+99 187 -5.37764277552810e-16
+99 100 -1.77635683940025e-15
+99 7 4.08825534189972e-16
+99 97 -4.16666666666667e+00
+99 234 -9.72222222222223e+00
+99 192 1.11111111111111e+01
+99 114 -1.38888888888889e+00
+99 189 -3.47222222222222e+00
+99 186 -1.11111111111111e+01
+99 212 -2.08333333333333e+00
+99 6 5.55555555555556e+00
+99 96 -4.86111111111111e+00
+100 100 5.55555555555556e+01
+100 128 -3.84891771232354e-17
+100 211 -3.47222222222222e+00
+100 127 -4.86111111111111e+00
+100 210 -2.08333333333333e+00
+100 126 -4.16666666666667e+00
+100 239 -2.81025203108243e-16
+100 206 2.08333333333333e+00
+100 203 1.33226762955019e-15
+100 122 8.30065183254902e-16
+100 238 -1.38888888888889e+00
+100 205 -3.47222222222222e+00
+100 202 5.55555555555555e+00
+100 121 -4.86111111111111e+00
+100 237 -1.59594559789866e-16
+100 204 2.08333333333333e+00
+100 201 -8.40256683676266e-17
+100 120 4.16666666666667e+00
+100 197 -2.08333333333333e+00
+100 119 -8.33333333333333e+00
+100 104 5.12393946716649e-16
+100 23 7.87076567115852e-16
+100 196 -3.47222222222222e+00
+100 118 -9.72222222222223e+00
+100 103 -4.86111111111111e+00
+100 22 -1.11111111111111e+01
+100 195 2.08333333333333e+00
+100 117 1.42897846333589e-16
+100 102 4.16666666666666e+00
+100 21 2.90755917606300e-16
+100 236 4.51895465491958e-16
+100 194 4.98949839777829e-16
+100 116 8.33333333333333e+00
+100 191 2.08333333333333e+00
+100 188 1.33226762955019e-15
+100 101 -5.32907051820075e-15
+100 8 9.84021891747844e-16
+100 98 -5.01335084557297e-16
+100 235 -1.38888888888889e+00
+100 193 1.11111111111111e+01
+100 115 -9.72222222222223e+00
+100 190 -3.47222222222222e+00
+100 187 5.55555555555556e+00
+100 212 -2.08333333333333e+00
+100 7 -1.11111111111111e+01
+100 97 -4.86111111111111e+00
+100 234 -1.06577073555325e-16
+100 192 8.88178419700125e-16
+100 114 1.16226472890446e-16
+100 189 -2.08333333333333e+00
+100 186 -4.24004364604769e-16
+100 99 -1.77635683940025e-15
+100 6 2.93276687657329e-16
+100 96 -4.16666666666667e+00
+101 101 5.55555555555556e+01
+101 128 -6.94444444444444e-01
+101 211 -2.08333333333333e+00
+101 127 -1.05818132034585e-16
+101 210 -2.08333333333333e+00
+101 126 -1.90819582357449e-17
+101 239 -9.72222222222222e+00
+101 206 -3.47222222222222e+00
+101 203 5.55555555555555e+00
+101 122 -6.94444444444444e-01
+101 238 -2.22369865576777e-16
+101 205 2.08333333333333e+00
+101 202 8.88178419700125e-16
+101 121 7.38233259245380e-16
+101 237 -8.33333333333333e+00
+101 204 -2.08333333333333e+00
+101 201 -1.14144804719274e-15
+101 120 -1.36175792864179e-16
+101 197 -3.47222222222222e+00
+101 119 -9.72222222222222e+00
+101 104 -6.94444444444444e-01
+101 23 5.55555555555556e+00
+101 196 -2.08333333333333e+00
+101 118 -8.33333333333333e+00
+101 103 5.03937169771262e-16
+101 22 1.08810530030645e-15
+101 195 2.08333333333333e+00
+101 117 1.52764086103208e-16
+101 102 -2.20201461231806e-16
+101 21 1.33226762955019e-15
+101 236 -9.72222222222222e+00
+101 194 -2.22222222222222e+01
+101 116 -9.72222222222222e+00
+101 191 -3.47222222222222e+00
+101 188 5.55555555555555e+00
+101 212 -3.47222222222222e+00
+101 8 5.55555555555556e+00
+101 98 -6.94444444444444e-01
+101 235 3.95300112088215e-16
+101 193 2.77623518792069e-16
+101 115 8.33333333333333e+00
+101 190 2.08333333333333e+00
+101 187 1.33226762955019e-15
+101 100 -6.21724893790088e-15
+101 7 6.69115370749429e-16
+101 97 -4.91794105439425e-16
+101 234 8.33333333333333e+00
+101 192 1.00410673699314e-15
+101 114 1.52764086103208e-16
+101 189 2.08333333333333e+00
+101 186 -1.64264760647848e-15
+101 99 4.44089209850063e-15
+101 6 8.88178419700125e-16
+101 96 -1.27502175484295e-16
+102 102 2.77777777777778e+01
+102 176 2.08333333333333e+00
+102 20 -1.66533453693773e-16
+102 65 1.27502175484295e-16
+102 91 -4.16333634234434e-17
+102 175 -2.08333333333333e+00
+102 19 5.81132364452230e-17
+102 64 -4.16666666666667e+00
+102 90 -4.86111111111111e+00
+102 174 -3.47222222222222e+00
+102 18 -5.55555555555555e+00
+102 63 -4.86111111111111e+00
+102 197 2.84494650060196e-16
+102 119 -4.16666666666667e+00
+102 194 -2.08333333333333e+00
+102 236 1.43114686768087e-16
+102 104 8.88178419700125e-16
+102 23 -5.03069808033274e-16
+102 101 -1.89084858881472e-16
+102 188 4.44089209850063e-16
+102 196 8.88178419700125e-16
+102 118 -8.50014503228635e-17
+102 193 2.08333333333333e+00
+102 235 7.52436307704940e-17
+102 103 -1.77635683940025e-15
+102 22 -2.99890320909491e-16
+102 100 4.16666666666666e+00
+102 187 -3.86111498676400e-17
+102 195 5.55555555555556e+00
+102 117 -4.86111111111111e+00
+102 192 -3.47222222222222e+00
+102 234 -1.38888888888889e+00
+102 92 4.16666666666667e+00
+102 21 -5.55555555555555e+00
+102 99 -4.86111111111111e+00
+102 186 5.55555555555556e+00
+103 103 2.77777777777778e+01
+103 176 2.08333333333333e+00
+103 20 -2.08333333333333e+00
+103 65 1.09287578986539e-16
+103 91 -6.94444444444444e-01
+103 175 -3.47222222222222e+00
+103 19 2.77777777777778e+00
+103 64 -4.86111111111111e+00
+103 90 3.64291929955129e-17
+103 174 -2.08333333333333e+00
+103 18 2.34838190560360e-16
+103 63 -4.16666666666667e+00
+103 197 -8.29197821516914e-16
+103 119 -5.55111512312578e-17
+103 194 2.08333333333333e+00
+103 236 8.33333333333333e+00
+103 104 -8.33333333333333e+00
+103 23 -2.08333333333333e+00
+103 101 5.03937169771262e-16
+103 188 6.29704621779581e-16
+103 196 5.55555555555556e+00
+103 118 -6.94444444444445e-01
+103 193 -3.47222222222222e+00
+103 235 -9.72222222222223e+00
+103 92 -1.66533453693773e-16
+103 22 2.77777777777778e+00
+103 100 -4.86111111111111e+00
+103 187 -1.11111111111111e+01
+103 195 8.88178419700125e-16
+103 117 -2.77555756156289e-17
+103 192 2.08333333333333e+00
+103 234 -9.54097911787244e-18
+103 102 -1.77635683940025e-15
+103 21 -2.26381413614973e-16
+103 99 4.16666666666667e+00
+103 186 7.20994444702860e-17
+104 104 2.77777777777778e+01
+104 176 -3.47222222222222e+00
+104 20 2.77777777777778e+00
+104 65 -6.94444444444443e-01
+104 91 -1.80411241501588e-16
+104 175 2.08333333333333e+00
+104 19 -2.08333333333333e+00
+104 64 1.25116930704827e-16
+104 90 4.16666666666667e+00
+104 174 2.08333333333333e+00
+104 18 -2.15105711021124e-16
+104 63 8.39172481503780e-17
+104 197 -1.11111111111111e+01
+104 119 -4.86111111111111e+00
+104 194 -3.47222222222222e+00
+104 236 -9.72222222222222e+00
+104 92 -4.86111111111111e+00
+104 23 2.77777777777778e+00
+104 101 -6.94444444444444e-01
+104 188 5.55555555555556e+00
+104 196 -3.46727854760864e-16
+104 118 9.45424294407360e-17
+104 193 2.08333333333333e+00
+104 235 8.33333333333333e+00
+104 103 -8.33333333333333e+00
+104 22 -2.08333333333333e+00
+104 100 5.71374544899861e-16
+104 187 4.69676381120721e-16
+104 195 2.59341159658533e-16
+104 117 -4.16666666666667e+00
+104 192 -2.08333333333333e+00
+104 234 5.78963960107259e-17
+104 102 8.88178419700125e-16
+104 21 -6.73072708679001e-16
+104 99 -2.35922392732846e-16
+104 186 4.44089209850063e-16
+105 105 2.77777777777778e+01
+105 38 -9.88683961089531e-16
+105 194 2.08333333333333e+00
+105 116 4.16666666666666e+00
+105 109 -4.16666666666667e+00
+105 37 -2.81025203108243e-16
+105 193 -2.08333333333333e+00
+105 115 -6.24500451351651e-17
+105 108 -4.86111111111111e+00
+105 36 -5.55555555555556e+00
+105 192 -3.47222222222222e+00
+105 114 -4.86111111111111e+00
+105 77 -1.38777878078145e-17
+105 200 1.33226762955019e-15
+105 107 -8.88178419700125e-16
+105 35 1.37043154602168e-16
+105 176 -2.08333333333333e+00
+105 236 1.67292395214513e-16
+105 191 4.24898831397069e-16
+105 89 -4.16666666666667e+00
+105 76 4.16666666666667e+00
+105 199 1.73472347597681e-16
+105 106 8.88178419700125e-16
+105 34 2.28983498828939e-16
+105 175 2.08333333333333e+00
+105 235 4.33680868994202e-18
+105 190 0.00000000000000e+00
+105 88 4.16333634234434e-17
+105 75 -4.86111111111111e+00
+105 198 5.55555555555555e+00
+105 110 -9.28077059647592e-17
+105 33 -5.55555555555555e+00
+105 174 -3.47222222222222e+00
+105 234 -1.38888888888889e+00
+105 189 5.55555555555556e+00
+105 87 -4.86111111111111e+00
+106 106 2.77777777777778e+01
+106 38 -2.08333333333333e+00
+106 194 2.08333333333333e+00
+106 116 8.57603918436034e-17
+106 109 -4.86111111111111e+00
+106 37 2.77777777777778e+00
+106 193 -3.47222222222222e+00
+106 115 -6.94444444444444e-01
+106 108 -4.16666666666667e+00
+106 36 -3.40005801291454e-16
+106 192 -2.08333333333333e+00
+106 114 -2.77555756156289e-17
+106 77 1.17961196366423e-16
+106 200 -4.02347426209371e-16
+106 107 -8.33333333333333e+00
+106 35 -2.08333333333333e+00
+106 176 2.08333333333333e+00
+106 236 8.33333333333333e+00
+106 191 5.50354575280798e-16
+106 89 2.53594888144359e-16
+106 76 -4.86111111111111e+00
+106 199 -1.11111111111111e+01
+106 110 -5.93275428784068e-16
+106 34 2.77777777777778e+00
+106 175 -3.47222222222222e+00
+106 235 -9.72222222222223e+00
+106 190 5.55555555555556e+00
+106 88 -6.94444444444445e-01
+106 75 4.16666666666667e+00
+106 198 1.34441069388203e-16
+106 105 8.88178419700125e-16
+106 33 1.35308431126191e-16
+106 174 2.08333333333333e+00
+106 234 7.60025722912339e-17
+106 189 0.00000000000000e+00
+106 87 3.29597460435593e-17
+107 107 2.77777777777778e+01
+107 38 2.77777777777778e+00
+107 194 -3.47222222222222e+00
+107 116 -4.86111111111111e+00
+107 109 -7.21644966006352e-16
+107 37 -2.08333333333333e+00
+107 193 2.08333333333333e+00
+107 115 2.92300905702092e-16
+107 108 -8.32667268468867e-17
+107 36 -1.14578485588268e-15
+107 192 2.08333333333333e+00
+107 114 4.16666666666667e+00
+107 77 -6.94444444444445e-01
+107 200 5.55555555555556e+00
+107 110 -6.94444444444444e-01
+107 35 2.77777777777778e+00
+107 176 -3.47222222222222e+00
+107 236 -9.72222222222222e+00
+107 191 -1.11111111111111e+01
+107 89 -4.86111111111111e+00
+107 76 4.85722573273506e-17
+107 199 -5.51642065360625e-16
+107 106 -8.33333333333333e+00
+107 34 -2.08333333333333e+00
+107 175 2.08333333333333e+00
+107 235 8.33333333333333e+00
+107 190 1.12236608895699e-15
+107 88 3.69496100383060e-16
+107 75 1.82145964977565e-17
+107 198 1.33226762955019e-15
+107 105 -8.88178419700125e-16
+107 33 1.75207071073658e-16
+107 174 -2.08333333333333e+00
+107 234 1.36175792864179e-16
+107 189 2.86337793753422e-16
+107 87 -4.16666666666667e+00
+108 108 5.55555555555556e+01
+108 212 2.08333333333333e+00
+108 136 -4.16666666666667e+00
+108 211 -2.08333333333333e+00
+108 135 -4.86111111111111e+00
+108 210 -3.47222222222222e+00
+108 215 -1.27155230789100e-15
+108 131 -2.67147415300428e-16
+108 239 8.33333333333333e+00
+108 206 2.08333333333333e+00
+108 214 -2.04697370165263e-16
+108 130 4.16666666666667e+00
+108 238 -2.81784144628983e-16
+108 205 2.08333333333333e+00
+108 213 -1.11111111111111e+01
+108 129 -4.86111111111111e+00
+108 237 -9.72222222222223e+00
+108 204 -3.47222222222222e+00
+108 113 -8.32667268468867e-17
+108 53 8.88178419700125e-16
+108 197 -2.08333333333333e+00
+108 119 3.33934269125535e-16
+108 112 4.16666666666667e+00
+108 52 5.06539254985228e-16
+108 196 2.08333333333333e+00
+108 118 1.16226472890446e-16
+108 111 -4.86111111111111e+00
+108 51 5.55555555555556e+00
+108 195 -3.47222222222222e+00
+108 117 -1.38888888888889e+00
+108 200 -1.47885176327023e-15
+108 110 3.55271367880050e-15
+108 38 8.88178419700125e-16
+108 107 -8.32667268468867e-17
+108 236 -8.33333333333333e+00
+108 194 1.05885894670366e-15
+108 116 3.33283747822044e-16
+108 191 -2.08333333333333e+00
+108 199 -5.62050406216485e-16
+108 109 1.77635683940025e-15
+108 37 3.34801630863524e-16
+108 106 -4.16666666666667e+00
+108 235 6.07153216591882e-18
+108 193 8.88178419700125e-16
+108 115 1.70761842166467e-16
+108 190 -2.08333333333333e+00
+108 198 -1.11111111111111e+01
+108 137 -1.13624387676481e-16
+108 36 5.55555555555556e+00
+108 105 -4.86111111111111e+00
+108 234 -9.72222222222223e+00
+108 192 1.11111111111111e+01
+108 114 -1.38888888888889e+00
+108 189 -3.47222222222222e+00
+109 109 5.55555555555556e+01
+109 212 2.08333333333333e+00
+109 136 -4.86111111111111e+00
+109 211 -3.47222222222222e+00
+109 135 -4.16666666666667e+00
+109 210 -2.08333333333333e+00
+109 215 4.44089209850063e-16
+109 131 7.00828284294630e-16
+109 38 4.16333634234434e-17
+109 239 1.14817010066215e-16
+109 206 -2.08333333333333e+00
+109 214 5.55555555555555e+00
+109 130 -4.86111111111111e+00
+109 238 -1.38888888888889e+00
+109 205 -3.47222222222222e+00
+109 213 -1.38777878078145e-17
+109 129 4.16666666666667e+00
+109 237 -2.28116137090950e-16
+109 204 2.08333333333333e+00
+109 113 3.65159291693118e-16
+109 53 4.05925293378573e-16
+109 197 2.08333333333333e+00
+109 119 8.33333333333333e+00
+109 112 -4.86111111111111e+00
+109 52 -1.11111111111111e+01
+109 196 -3.47222222222222e+00
+109 118 -9.72222222222223e+00
+109 111 4.16666666666667e+00
+109 51 2.23779328401008e-16
+109 195 2.08333333333333e+00
+109 117 1.44524149592318e-16
+109 200 1.77635683940025e-15
+109 110 0.00000000000000e+00
+109 107 -7.14706072102445e-16
+109 236 2.62810606610486e-16
+109 194 2.98548620721040e-16
+109 116 -8.33333333333333e+00
+109 191 -2.08333333333333e+00
+109 199 5.55555555555556e+00
+109 137 -3.98986399474666e-17
+109 37 -1.11111111111111e+01
+109 106 -4.86111111111111e+00
+109 235 -1.38888888888889e+00
+109 193 1.11111111111111e+01
+109 115 -9.72222222222223e+00
+109 190 -3.47222222222222e+00
+109 198 -5.23886489744996e-16
+109 108 1.77635683940025e-15
+109 36 5.06539254985228e-16
+109 105 -4.16666666666667e+00
+109 234 -1.11889664200504e-16
+109 192 8.88178419700125e-16
+109 114 2.41126563160776e-16
+109 189 -2.08333333333333e+00
+110 110 5.55555555555556e+01
+110 212 -3.47222222222222e+00
+110 136 -4.16333634234434e-17
+110 211 2.08333333333333e+00
+110 135 -1.80411241501588e-16
+110 210 2.08333333333333e+00
+110 215 5.55555555555555e+00
+110 131 -6.94444444444444e-01
+110 239 -9.72222222222222e+00
+110 206 -3.47222222222222e+00
+110 214 4.44089209850063e-16
+110 130 6.74807432154978e-16
+110 238 1.13624387676481e-16
+110 205 -2.08333333333333e+00
+110 213 -1.43114686768087e-15
+110 129 -3.19189119579733e-16
+110 237 8.33333333333333e+00
+110 204 2.08333333333333e+00
+110 113 -6.94444444444444e-01
+110 53 5.55555555555555e+00
+110 197 -3.47222222222222e+00
+110 119 -9.72222222222222e+00
+110 112 3.53883589099269e-16
+110 52 4.30211422042248e-16
+110 196 2.08333333333333e+00
+110 118 8.33333333333333e+00
+110 111 -1.76074432811646e-16
+110 51 8.88178419700125e-16
+110 195 -2.08333333333333e+00
+110 117 4.30211422042248e-16
+110 200 5.55555555555556e+00
+110 137 -6.94444444444444e-01
+110 38 5.55555555555555e+00
+110 107 -6.94444444444444e-01
+110 236 -9.72222222222222e+00
+110 194 -2.22222222222222e+01
+110 116 -9.72222222222222e+00
+110 191 -3.47222222222222e+00
+110 199 2.22044604925031e-15
+110 109 8.88178419700125e-16
+110 37 -3.82723366887383e-17
+110 106 -5.93275428784068e-16
+110 235 8.50014503228635e-17
+110 193 5.05888733681736e-16
+110 115 -8.33333333333333e+00
+110 190 -2.08333333333333e+00
+110 198 -1.50899258366533e-15
+110 108 3.55271367880050e-15
+110 36 8.88178419700125e-16
+110 105 -9.28077059647592e-17
+110 234 -8.33333333333333e+00
+110 192 1.54162706905714e-15
+110 114 5.96744875736022e-16
+110 189 -2.08333333333333e+00
+111 111 2.77777777777778e+01
+111 77 1.24900090270330e-16
+111 92 -4.16666666666667e+00
+111 176 -2.08333333333333e+00
+111 49 5.55111512312578e-17
+111 76 -4.16666666666667e+00
+111 91 -2.77555756156289e-17
+111 175 -2.08333333333333e+00
+111 48 -5.55555555555555e+00
+111 75 -4.86111111111111e+00
+111 90 -4.86111111111111e+00
+111 174 -3.47222222222222e+00
+111 113 8.88178419700125e-16
+111 53 -5.75928194024300e-16
+111 110 -1.76074432811646e-16
+111 200 1.33226762955019e-15
+111 197 3.72965547335014e-17
+111 119 4.16666666666667e+00
+111 194 2.08333333333333e+00
+111 236 5.71374544899861e-17
+111 112 0.00000000000000e+00
+111 52 -2.98372437868011e-16
+111 109 4.16666666666667e+00
+111 199 1.64798730217797e-17
+111 196 8.88178419700125e-16
+111 118 -5.81132364452230e-17
+111 193 2.08333333333333e+00
+111 235 2.67797936603920e-17
+111 50 -1.11022302462516e-16
+111 51 -5.55555555555556e+00
+111 108 -4.86111111111111e+00
+111 198 5.55555555555555e+00
+111 195 5.55555555555556e+00
+111 117 -4.86111111111111e+00
+111 192 -3.47222222222222e+00
+111 234 -1.38888888888889e+00
+112 112 2.77777777777778e+01
+112 77 3.46944695195361e-17
+112 92 9.80118763926896e-17
+112 176 -2.08333333333333e+00
+112 49 2.77777777777778e+00
+112 76 -4.86111111111111e+00
+112 91 -6.94444444444445e-01
+112 175 -3.47222222222222e+00
+112 48 2.91433543964104e-16
+112 75 -4.16666666666667e+00
+112 90 6.50521303491303e-17
+112 174 -2.08333333333333e+00
+112 113 8.33333333333333e+00
+112 53 2.08333333333333e+00
+112 110 3.53883589099269e-16
+112 200 -1.07552855510562e-16
+112 197 -4.47233396150271e-16
+112 119 3.10515502199848e-16
+112 194 -2.08333333333333e+00
+112 236 -8.33333333333334e+00
+112 50 2.08333333333333e+00
+112 52 2.77777777777778e+00
+112 109 -4.86111111111111e+00
+112 199 -1.11111111111111e+01
+112 196 5.55555555555556e+00
+112 118 -6.94444444444444e-01
+112 193 -3.47222222222222e+00
+112 235 -9.72222222222223e+00
+112 111 0.00000000000000e+00
+112 51 -2.77555756156289e-16
+112 108 4.16666666666667e+00
+112 198 5.55111512312578e-17
+112 195 8.88178419700125e-16
+112 117 -3.46944695195361e-17
+112 192 2.08333333333333e+00
+112 234 -5.11743425413158e-17
+113 113 2.77777777777778e+01
+113 77 -6.94444444444445e-01
+113 92 -4.86111111111111e+00
+113 176 -3.47222222222222e+00
+113 49 2.08333333333333e+00
+113 76 2.08166817117217e-17
+113 91 1.11022302462516e-16
+113 175 -2.08333333333333e+00
+113 48 -1.87350135405495e-16
+113 75 7.37257477290143e-17
+113 90 -4.16666666666667e+00
+113 174 -2.08333333333333e+00
+113 50 2.77777777777778e+00
+113 53 2.77777777777778e+00
+113 110 -6.94444444444444e-01
+113 200 5.55555555555556e+00
+113 197 -1.11111111111111e+01
+113 119 -4.86111111111111e+00
+113 194 -3.47222222222222e+00
+113 236 -9.72222222222222e+00
+113 112 8.33333333333333e+00
+113 52 2.08333333333333e+00
+113 109 4.20670442924376e-16
+113 199 -1.76724954115137e-16
+113 196 -7.73686670285656e-16
+113 118 2.98372437868011e-16
+113 193 -2.08333333333333e+00
+113 235 -8.33333333333333e+00
+113 111 8.88178419700125e-16
+113 51 -3.88578058618805e-16
+113 108 -8.32667268468867e-17
+113 198 1.33226762955019e-15
+113 195 2.22044604925031e-16
+113 117 4.16666666666667e+00
+113 192 2.08333333333333e+00
+113 234 -2.34187669256869e-17
+114 114 5.55555555555556e+01
+114 131 -4.16666666666667e+00
+114 214 -2.08333333333333e+00
+114 130 -8.57603918436034e-17
+114 213 -3.47222222222222e+00
+114 129 -4.86111111111112e+00
+114 239 -4.77591056979865e-16
+114 206 4.08595141228318e-16
+114 203 2.08333333333333e+00
+114 122 4.16666666666667e+00
+114 238 -8.33333333333333e+00
+114 205 -1.73987343629611e-16
+114 202 -2.08333333333333e+00
+114 121 -9.26992857475106e-17
+114 237 -9.72222222222222e+00
+114 204 -1.11111111111111e+01
+114 201 -3.47222222222222e+00
+114 120 -4.86111111111112e+00
+114 200 2.08333333333333e+00
+114 110 5.13478148889135e-16
+114 38 3.82940207321880e-16
+114 107 4.16666666666667e+00
+114 199 2.08333333333333e+00
+114 109 2.40259201422788e-16
+114 37 0.00000000000000e+00
+114 106 -2.86229373536173e-17
+114 198 -3.47222222222222e+00
+114 108 -1.38888888888889e+00
+114 36 5.55555555555556e+00
+114 105 -4.86111111111111e+00
+114 236 -1.91686944095437e-16
+114 194 1.77635683940025e-15
+114 116 4.44089209850063e-15
+114 191 -1.89865484445662e-15
+114 188 -2.08333333333333e+00
+114 101 3.89553840574042e-16
+114 8 3.19880298464692e-16
+114 98 -4.16666666666667e+00
+114 235 8.33333333333333e+00
+114 193 7.99815942642557e-16
+114 115 0.00000000000000e+00
+114 190 -4.28476698566271e-16
+114 187 2.08333333333333e+00
+114 100 1.16226472890446e-16
+114 7 0.00000000000000e+00
+114 97 3.38271077815477e-17
+114 234 -9.72222222222222e+00
+114 192 1.11111111111111e+01
+114 215 -2.08333333333333e+00
+114 189 -1.11111111111111e+01
+114 186 -3.47222222222222e+00
+114 99 -1.38888888888889e+00
+114 6 5.55555555555556e+00
+114 96 -4.86111111111112e+00
+115 115 5.55555555555556e+01
+115 131 -3.64291929955129e-16
+115 214 -3.47222222222222e+00
+115 130 -6.94444444444445e-01
+115 213 -2.08333333333333e+00
+115 129 -6.93889390390723e-18
+115 239 -8.28330459778925e-17
+115 206 -4.44089209850063e-16
+115 203 2.08333333333333e+00
+115 122 -1.25767452008319e-17
+115 238 -9.72222222222222e+00
+115 205 5.55555555555555e+00
+115 202 -3.47222222222222e+00
+115 121 -6.94444444444446e-01
+115 237 -8.33333333333333e+00
+115 204 4.01696904905879e-16
+115 201 -2.08333333333333e+00
+115 120 8.67361737988404e-19
+115 200 -2.08333333333333e+00
+115 110 -8.33333333333333e+00
+115 38 8.87527898396634e-16
+115 107 2.64545330086463e-16
+115 199 -3.47222222222222e+00
+115 109 -9.72222222222223e+00
+115 37 5.55555555555556e+00
+115 106 -6.94444444444444e-01
+115 198 2.08333333333333e+00
+115 108 1.56775634141404e-16
+115 36 0.00000000000000e+00
+115 105 -5.54027310140093e-17
+115 236 7.66422515730003e-16
+115 194 6.23023225891639e-16
+115 116 -4.44089209850063e-15
+115 191 0.00000000000000e+00
+115 188 2.08333333333333e+00
+115 101 8.33333333333333e+00
+115 8 4.13053922662665e-16
+115 98 1.67400815431762e-16
+115 235 -9.72222222222222e+00
+115 193 -2.22222222222222e+01
+115 215 -2.08333333333333e+00
+115 190 5.55555555555556e+00
+115 187 -3.47222222222222e+00
+115 100 -9.72222222222223e+00
+115 7 5.55555555555556e+00
+115 97 -6.94444444444446e-01
+115 234 8.33333333333333e+00
+115 192 5.18099560649354e-16
+115 114 0.00000000000000e+00
+115 189 -2.93141162385768e-16
+115 186 2.08333333333333e+00
+115 99 1.43765208071578e-16
+115 6 0.00000000000000e+00
+115 96 -2.86229373536173e-17
+116 116 5.55555555555556e+01
+116 131 -4.86111111111111e+00
+116 214 -2.08333333333333e+00
+116 130 -3.07262895682392e-16
+116 213 -2.08333333333333e+00
+116 129 -4.16666666666667e+00
+116 239 -1.38888888888889e+00
+116 206 5.55555555555555e+00
+116 203 -3.47222222222222e+00
+116 122 -4.86111111111111e+00
+116 238 -2.02962646689286e-16
+116 205 0.00000000000000e+00
+116 202 2.08333333333333e+00
+116 121 -1.76941794549634e-16
+116 237 -4.28476698566271e-16
+116 204 2.79290479632266e-16
+116 201 2.08333333333333e+00
+116 120 4.16666666666667e+00
+116 200 -3.47222222222222e+00
+116 110 -9.72222222222222e+00
+116 38 -1.11111111111111e+01
+116 107 -4.86111111111111e+00
+116 199 -2.08333333333333e+00
+116 109 -8.33333333333333e+00
+116 37 4.82442861701737e-16
+116 106 1.96782694306119e-16
+116 193 1.11575245570483e-15
+116 198 2.08333333333333e+00
+116 108 2.63786388565723e-16
+116 36 2.64260727016186e-16
+116 105 4.16666666666666e+00
+116 236 -1.38888888888889e+00
+116 194 1.11111111111111e+01
+116 215 -3.47222222222222e+00
+116 191 5.55555555555556e+00
+116 188 -3.47222222222222e+00
+116 101 -9.72222222222222e+00
+116 8 -1.11111111111111e+01
+116 98 -4.86111111111111e+00
+116 235 7.88431819831459e-16
+116 115 -4.44089209850063e-15
+116 190 4.44089209850063e-16
+116 187 2.08333333333333e+00
+116 100 8.33333333333333e+00
+116 7 7.83444489838026e-16
+116 97 1.33573707650214e-16
+116 234 -2.57498015965307e-16
+116 192 1.77635683940025e-15
+116 114 4.44089209850063e-15
+116 189 -2.18377291076599e-15
+116 186 -2.08333333333333e+00
+116 99 4.85722573273506e-16
+116 6 1.88542757795229e-16
+116 96 -4.16666666666667e+00
+117 117 5.55555555555556e+01
+117 215 -2.08333333333333e+00
+117 136 -1.45716771982052e-16
+117 214 2.08333333333333e+00
+117 135 -4.86111111111112e+00
+117 213 -3.47222222222222e+00
+117 212 -2.76948602939697e-15
+117 239 -5.98154338560253e-16
+117 128 4.16666666666667e+00
+117 203 2.08333333333333e+00
+117 211 -2.82326245715225e-16
+117 238 8.33333333333333e+00
+117 127 -1.68268177169750e-16
+117 202 2.08333333333333e+00
+117 210 -1.11111111111111e+01
+117 237 -9.72222222222222e+00
+117 126 -4.86111111111111e+00
+117 201 -3.47222222222222e+00
+117 113 4.16666666666667e+00
+117 53 9.08995101411847e-16
+117 110 4.57966997657877e-16
+117 200 2.08333333333333e+00
+117 112 -3.46944695195361e-17
+117 52 8.88178419700125e-16
+117 109 1.45283091113058e-16
+117 199 -2.08333333333333e+00
+117 111 -4.86111111111111e+00
+117 51 5.55555555555556e+00
+117 108 -1.38888888888889e+00
+117 198 -3.47222222222222e+00
+117 197 -1.11716191852906e-15
+117 119 4.44089209850063e-15
+117 194 1.77635683940025e-15
+117 236 3.03576608295941e-17
+117 104 -4.16666666666667e+00
+117 23 7.38992200766120e-16
+117 101 1.11239142897013e-16
+117 188 -2.08333333333333e+00
+117 196 -6.73072708679001e-16
+117 118 -8.88178419700125e-16
+117 193 7.43613612526339e-16
+117 235 -8.33333333333333e+00
+117 103 -2.77555756156289e-17
+117 22 8.88178419700125e-16
+117 100 1.70761842166467e-16
+117 187 -2.08333333333333e+00
+117 195 -1.11111111111111e+01
+117 137 -4.16666666666667e+00
+117 192 1.11111111111111e+01
+117 234 -9.72222222222222e+00
+117 102 -4.86111111111111e+00
+117 21 5.55555555555556e+00
+117 99 -1.38888888888889e+00
+117 186 -3.47222222222222e+00
+118 118 5.55555555555556e+01
+118 215 2.08333333333333e+00
+118 136 -6.94444444444446e-01
+118 214 -3.47222222222222e+00
+118 135 -1.52655665885959e-16
+118 213 2.08333333333333e+00
+118 212 2.22044604925031e-15
+118 239 1.53089346754953e-15
+118 128 1.82145964977565e-16
+118 203 -2.08333333333333e+00
+118 211 5.55555555555555e+00
+118 238 -9.72222222222222e+00
+118 127 -6.94444444444444e-01
+118 202 -3.47222222222222e+00
+118 210 -5.02202446295286e-16
+118 237 8.33333333333333e+00
+118 126 -1.87350135405495e-16
+118 201 2.08333333333333e+00
+118 113 2.98372437868011e-16
+118 53 -7.77156117237610e-16
+118 110 8.33333333333333e+00
+118 200 2.08333333333333e+00
+118 112 -6.94444444444444e-01
+118 52 5.55555555555556e+00
+118 109 -9.72222222222223e+00
+118 199 -3.47222222222222e+00
+118 111 -7.19910242530375e-17
+118 51 8.88178419700125e-16
+118 108 1.16226472890446e-16
+118 198 -2.08333333333333e+00
+118 197 3.10862446895044e-15
+118 119 -1.77635683940025e-15
+118 194 1.34473595453377e-15
+118 236 -1.10501885419723e-15
+118 104 9.45424294407360e-17
+118 23 -3.57461456268471e-16
+118 101 -8.33333333333333e+00
+118 188 -2.08333333333333e+00
+118 196 5.55555555555556e+00
+118 137 8.32667268468867e-17
+118 193 -2.22222222222222e+01
+118 235 -9.72222222222222e+00
+118 103 -6.94444444444445e-01
+118 22 5.55555555555556e+00
+118 100 -9.72222222222223e+00
+118 187 -3.47222222222222e+00
+118 195 -6.57134936743464e-16
+118 117 -8.88178419700125e-16
+118 192 7.99815942642557e-16
+118 234 -8.33333333333333e+00
+118 102 -8.50014503228635e-17
+118 21 8.88178419700125e-16
+118 99 2.27248775352962e-16
+118 186 -2.08333333333333e+00
+119 119 5.55555555555556e+01
+119 215 -3.47222222222222e+00
+119 136 8.58688120608520e-17
+119 214 2.08333333333333e+00
+119 135 -4.16666666666667e+00
+119 213 -2.08333333333333e+00
+119 212 5.55555555555555e+00
+119 239 -1.38888888888889e+00
+119 128 -4.86111111111111e+00
+119 203 -3.47222222222222e+00
+119 211 1.77635683940025e-15
+119 238 1.52395457364563e-15
+119 127 2.91433543964104e-16
+119 202 -2.08333333333333e+00
+119 210 -2.85188539450587e-15
+119 237 -6.84348411272850e-16
+119 126 4.16666666666667e+00
+119 201 2.08333333333333e+00
+119 113 -4.86111111111111e+00
+119 53 -1.11111111111111e+01
+119 110 -9.72222222222222e+00
+119 200 -3.47222222222222e+00
+119 112 3.10515502199848e-16
+119 52 -3.50414142147315e-16
+119 109 8.33333333333333e+00
+119 199 2.08333333333333e+00
+119 111 4.16666666666667e+00
+119 51 7.39859562504108e-16
+119 108 1.52764086103208e-16
+119 198 2.08333333333333e+00
+119 197 5.55555555555556e+00
+119 137 -4.86111111111111e+00
+119 194 1.11111111111111e+01
+119 236 -1.38888888888889e+00
+119 104 -4.86111111111111e+00
+119 23 -1.11111111111111e+01
+119 101 -9.72222222222222e+00
+119 188 -3.47222222222222e+00
+119 196 3.10862446895044e-15
+119 118 -8.88178419700125e-16
+119 193 1.06017354183779e-15
+119 235 -9.73179870022989e-16
+119 103 -4.85722573273506e-17
+119 22 -7.77156117237610e-16
+119 100 -8.33333333333333e+00
+119 187 -2.08333333333333e+00
+119 195 -1.07899800205757e-15
+119 117 4.44089209850063e-15
+119 192 1.77635683940025e-15
+119 234 -2.51534904016637e-17
+119 102 -4.16666666666667e+00
+119 21 9.08995101411847e-16
+119 99 4.85722573273506e-16
+119 186 -2.08333333333333e+00
+120 120 2.77777777777778e+01
+120 140 -4.16666666666667e+00
+120 125 -1.95156391047391e-16
+120 11 -1.28693442621314e-15
+120 208 -2.08333333333333e+00
+120 139 2.65412691824451e-16
+120 124 -4.16666666666667e+00
+120 10 9.10092856111488e-16
+120 207 -3.47222222222222e+00
+120 138 -4.86111111111111e+00
+120 123 -4.86111111111111e+00
+120 9 -5.55555555555554e+00
+120 194 2.08333333333333e+00
+120 239 2.89698820488127e-16
+120 206 1.16443313324943e-16
+120 116 4.16666666666667e+00
+120 101 -1.92554305833426e-16
+120 203 8.88178419700125e-16
+120 122 1.77635683940025e-15
+120 8 2.67038995083180e-16
+120 193 2.08333333333333e+00
+120 238 3.29597460435593e-17
+120 205 -4.44089209850063e-16
+120 115 -6.24500451351651e-17
+120 100 4.16666666666667e+00
+120 202 -1.66316613259276e-16
+120 121 -1.77635683940025e-15
+120 7 2.60208521396521e-17
+120 192 -3.47222222222222e+00
+120 237 -1.38888888888889e+00
+120 204 5.55555555555556e+00
+120 114 -4.86111111111112e+00
+120 99 -4.86111111111111e+00
+120 201 5.55555555555556e+00
+120 209 -2.08333333333333e+00
+120 6 -5.55555555555556e+00
+121 121 2.77777777777778e+01
+121 140 8.54351311918577e-16
+121 125 -6.60495963478169e-16
+121 11 2.08333333333333e+00
+121 208 -3.47222222222222e+00
+121 139 -6.94444444444446e-01
+121 124 -4.86111111111111e+00
+121 10 2.77777777777778e+00
+121 207 -2.08333333333333e+00
+121 138 2.08166817117217e-16
+121 123 -4.16666666666667e+00
+121 9 8.14669512405608e-16
+121 194 -2.08333333333333e+00
+121 239 -8.33333333333334e+00
+121 206 6.37185616769731e-16
+121 116 -1.21430643318376e-16
+121 101 7.86805516572731e-16
+121 203 -1.53425449428424e-15
+121 122 8.33333333333333e+00
+121 8 2.08333333333333e+00
+121 193 -3.47222222222222e+00
+121 238 -9.72222222222223e+00
+121 205 5.55555555555556e+00
+121 115 -6.94444444444446e-01
+121 100 -4.86111111111111e+00
+121 202 -1.11111111111111e+01
+121 209 -2.08333333333333e+00
+121 7 2.77777777777778e+00
+121 192 2.08333333333333e+00
+121 237 4.35849273339173e-17
+121 204 -8.88178419700125e-16
+121 114 -1.28369537222284e-16
+121 99 4.16666666666666e+00
+121 201 -1.63999131115589e-16
+121 120 -1.77635683940025e-15
+121 6 -2.06296568369679e-16
+122 122 2.77777777777778e+01
+122 140 -4.86111111111111e+00
+122 125 -6.94444444444442e-01
+122 11 2.77777777777778e+00
+122 208 -2.08333333333333e+00
+122 139 6.82180006927879e-16
+122 124 -6.86083134748827e-16
+122 10 2.08333333333333e+00
+122 207 -2.08333333333333e+00
+122 138 -4.16666666666667e+00
+122 123 -2.22044604925031e-16
+122 9 -1.37368415253913e-15
+122 194 -3.47222222222222e+00
+122 239 -9.72222222222222e+00
+122 206 -1.11111111111111e+01
+122 116 -4.86111111111111e+00
+122 101 -6.94444444444444e-01
+122 203 5.55555555555556e+00
+122 209 -3.47222222222222e+00
+122 8 2.77777777777777e+00
+122 193 -2.08333333333333e+00
+122 238 -8.33333333333334e+00
+122 205 2.16081492976361e-16
+122 115 -1.23599047663348e-16
+122 100 7.45931094670027e-16
+122 202 -1.49305481172979e-15
+122 121 8.33333333333333e+00
+122 7 2.08333333333333e+00
+122 192 2.08333333333333e+00
+122 237 4.29560900738757e-16
+122 204 5.86919293547872e-16
+122 114 4.16666666666667e+00
+122 99 -2.30392961653170e-16
+122 201 8.88178419700125e-16
+122 120 1.77635683940025e-15
+122 6 1.59323509246745e-16
+123 123 5.55555555555556e+01
+123 152 2.44487589895481e-16
+123 226 -2.08333333333333e+00
+123 151 -4.16666666666667e+00
+123 225 -3.47222222222222e+00
+123 150 -4.86111111111111e+00
+123 242 -8.33333333333333e+00
+123 221 -2.08333333333333e+00
+123 218 -1.41054702640364e-16
+123 146 1.28369537222284e-16
+123 241 -1.86374353450258e-16
+123 220 2.08333333333333e+00
+123 217 -9.27833114158783e-16
+123 145 4.16666666666666e+00
+123 240 -9.72222222222222e+00
+123 219 -3.47222222222222e+00
+123 216 -1.11111111111111e+01
+123 144 -4.86111111111111e+00
+123 212 2.08333333333333e+00
+123 143 -7.80625564189563e-18
+123 128 -3.33066907387547e-16
+123 26 4.44089209850063e-16
+123 211 2.08333333333333e+00
+123 142 -1.12757025938492e-17
+123 127 4.16666666666667e+00
+123 25 -8.78203759713259e-18
+123 210 -3.47222222222222e+00
+123 141 -1.38888888888889e+00
+123 126 -4.86111111111111e+00
+123 24 5.55555555555556e+00
+123 239 8.33333333333333e+00
+123 209 1.82471225629310e-16
+123 140 6.15826833971767e-17
+123 206 2.08333333333333e+00
+123 203 -9.05308814025396e-16
+123 125 3.55271367880050e-15
+123 11 4.44089209850063e-16
+123 122 -1.23165366794353e-16
+123 238 5.10008701937181e-16
+123 208 0.00000000000000e+00
+123 139 -5.42101086242752e-18
+123 205 -2.08333333333333e+00
+123 202 1.60136660876109e-15
+123 124 -1.77635683940025e-15
+123 10 -1.42166009867162e-17
+123 121 -4.16666666666667e+00
+123 237 -9.72222222222222e+00
+123 207 1.11111111111111e+01
+123 138 -1.38888888888889e+00
+123 204 -3.47222222222222e+00
+123 201 -1.11111111111111e+01
+123 227 -2.08333333333333e+00
+123 9 5.55555555555556e+00
+123 120 -4.86111111111111e+00
+124 124 5.55555555555556e+01
+124 152 -5.33427468862868e-16
+124 226 -3.47222222222222e+00
+124 151 -4.86111111111111e+00
+124 225 -2.08333333333333e+00
+124 150 -4.16666666666667e+00
+124 242 -1.76941794549634e-16
+124 221 2.08333333333333e+00
+124 218 1.77635683940025e-15
+124 146 -6.75674793892966e-16
+124 241 -1.38888888888889e+00
+124 220 -3.47222222222222e+00
+124 217 5.55555555555556e+00
+124 145 -4.86111111111111e+00
+124 240 -1.18828558104411e-16
+124 219 2.08333333333333e+00
+124 216 -9.07694058804864e-16
+124 144 4.16666666666667e+00
+124 212 -2.08333333333333e+00
+124 143 -8.33333333333334e+00
+124 128 1.62630325872826e-18
+124 26 5.30378150252753e-16
+124 211 -3.47222222222222e+00
+124 142 -9.72222222222223e+00
+124 127 -4.86111111111111e+00
+124 25 -1.11111111111111e+01
+124 210 2.08333333333333e+00
+124 141 4.15249432061948e-17
+124 126 4.16666666666666e+00
+124 24 -1.59513244626930e-17
+124 239 -1.00787433954252e-15
+124 209 -1.41976274486977e-15
+124 140 8.33333333333334e+00
+124 206 2.08333333333333e+00
+124 203 1.77635683940025e-15
+124 125 -8.88178419700125e-16
+124 11 8.40473524110763e-16
+124 122 -7.10369263412503e-16
+124 238 -1.38888888888889e+00
+124 208 1.11111111111111e+01
+124 139 -9.72222222222223e+00
+124 205 -3.47222222222222e+00
+124 202 5.55555555555557e+00
+124 227 -2.08333333333333e+00
+124 10 -1.11111111111111e+01
+124 121 -4.86111111111111e+00
+124 237 5.61183044478497e-16
+124 207 0.00000000000000e+00
+124 138 -2.51534904016637e-17
+124 204 -2.08333333333333e+00
+124 201 1.74525378957707e-15
+124 123 -2.66453525910038e-15
+124 9 9.87708179134295e-17
+124 120 -4.16666666666667e+00
+125 125 5.55555555555556e+01
+125 152 -6.94444444444444e-01
+125 226 -2.08333333333333e+00
+125 151 -4.96998275867355e-16
+125 225 -2.08333333333333e+00
+125 150 2.11636264069170e-16
+125 242 -9.72222222222222e+00
+125 221 -3.47222222222222e+00
+125 218 5.55555555555556e+00
+125 146 -6.94444444444443e-01
+125 241 -3.60930903220424e-16
+125 220 2.08333333333333e+00
+125 217 2.22044604925031e-15
+125 145 -6.69928522378793e-16
+125 240 -8.33333333333333e+00
+125 219 -2.08333333333333e+00
+125 216 -3.08997619158369e-16
+125 144 2.12503625807159e-16
+125 212 -3.47222222222222e+00
+125 143 -9.72222222222222e+00
+125 128 -6.94444444444443e-01
+125 26 5.55555555555556e+00
+125 211 -2.08333333333333e+00
+125 142 -8.33333333333334e+00
+125 127 -8.67361737988404e-18
+125 25 8.89045781438114e-16
+125 210 2.08333333333333e+00
+125 141 -3.77302356024956e-17
+125 126 -2.41993924898765e-16
+125 24 0.00000000000000e+00
+125 239 -9.72222222222222e+00
+125 209 -2.22222222222222e+01
+125 140 -9.72222222222222e+00
+125 206 -3.47222222222222e+00
+125 203 5.55555555555556e+00
+125 227 -3.47222222222222e+00
+125 11 5.55555555555556e+00
+125 122 -6.94444444444442e-01
+125 238 -9.02164627725188e-16
+125 208 -1.27984645451051e-15
+125 139 8.33333333333334e+00
+125 205 2.08333333333333e+00
+125 202 2.22044604925031e-15
+125 124 -1.77635683940025e-15
+125 10 4.47111423405866e-16
+125 121 -7.12537667757474e-16
+125 237 8.33333333333333e+00
+125 207 6.96328845278815e-17
+125 138 8.01225405466788e-17
+125 204 2.08333333333333e+00
+125 201 -9.33918198851857e-16
+125 123 3.55271367880050e-15
+125 9 4.44089209850063e-16
+125 120 -1.90928002574697e-16
+126 126 2.77777777777778e+01
+126 194 2.08333333333333e+00
+126 23 -1.40859546249317e-15
+126 101 -1.99493199737333e-17
+126 118 -1.87350135405495e-16
+126 193 -2.08333333333333e+00
+126 22 -1.67400815431762e-16
+126 100 -4.16666666666667e+00
+126 117 -4.86111111111111e+00
+126 192 -3.47222222222222e+00
+126 21 -5.55555555555556e+00
+126 99 -4.86111111111111e+00
+126 212 6.86950496486816e-16
+126 143 -4.16666666666667e+00
+126 209 -2.08333333333333e+00
+126 239 1.24032728532342e-16
+126 128 8.88178419700125e-16
+126 26 4.67507976775750e-16
+126 125 -2.43728648374741e-16
+126 203 8.88178419700125e-16
+126 211 8.88178419700125e-16
+126 142 3.07913416985883e-16
+126 208 2.08333333333333e+00
+126 238 -5.19332840620557e-17
+126 127 -1.77635683940025e-15
+126 25 7.78782420496338e-16
+126 124 4.16666666666667e+00
+126 202 -2.75021433578104e-16
+126 210 5.55555555555556e+00
+126 141 -4.86111111111111e+00
+126 207 -3.47222222222222e+00
+126 237 -1.38888888888889e+00
+126 119 4.16666666666667e+00
+126 24 -5.55555555555555e+00
+126 123 -4.86111111111111e+00
+126 201 5.55555555555556e+00
+127 127 2.77777777777778e+01
+127 194 2.08333333333333e+00
+127 23 -2.08333333333333e+00
+127 101 -1.12757025938492e-16
+127 118 -6.94444444444444e-01
+127 193 -3.47222222222222e+00
+127 22 2.77777777777778e+00
+127 100 -4.86111111111111e+00
+127 117 -1.61329283265843e-16
+127 192 -2.08333333333333e+00
+127 21 -4.48859699408999e-17
+127 99 -4.16666666666667e+00
+127 212 7.01695646032618e-16
+127 143 4.92661467177413e-16
+127 209 2.08333333333333e+00
+127 239 8.33333333333333e+00
+127 128 -8.33333333333333e+00
+127 26 -2.08333333333333e+00
+127 125 -8.67361737988404e-18
+127 203 -1.48611591782588e-15
+127 211 5.55555555555556e+00
+127 142 -6.94444444444444e-01
+127 208 -3.47222222222222e+00
+127 238 -9.72222222222223e+00
+127 119 2.91433543964104e-16
+127 25 2.77777777777778e+00
+127 124 -4.86111111111111e+00
+127 202 -1.11111111111111e+01
+127 210 8.88178419700125e-16
+127 141 3.12250225675825e-16
+127 207 2.08333333333333e+00
+127 237 -7.71951946809679e-17
+127 126 -1.77635683940025e-15
+127 24 8.98586760555986e-16
+127 123 4.16666666666667e+00
+127 201 -3.86518074491082e-16
+128 128 2.77777777777778e+01
+128 194 -3.47222222222222e+00
+128 23 2.77777777777778e+00
+128 101 -6.94444444444444e-01
+128 118 1.82145964977565e-16
+128 193 2.08333333333333e+00
+128 22 -2.08333333333333e+00
+128 100 -3.83807569059869e-17
+128 117 4.16666666666667e+00
+128 192 2.08333333333333e+00
+128 21 -1.41640171813506e-15
+128 99 -1.55691431968918e-16
+128 212 -1.11111111111111e+01
+128 143 -4.86111111111111e+00
+128 209 -3.47222222222222e+00
+128 239 -9.72222222222222e+00
+128 119 -4.86111111111111e+00
+128 26 2.77777777777778e+00
+128 125 -6.94444444444443e-01
+128 203 5.55555555555556e+00
+128 211 3.02600826340704e-16
+128 142 4.83120488059541e-16
+128 208 2.08333333333333e+00
+128 238 8.33333333333333e+00
+128 127 -8.33333333333333e+00
+128 25 -2.08333333333333e+00
+128 124 1.62630325872826e-18
+128 202 -1.17343201128106e-15
+128 210 9.06393016197882e-16
+128 141 -4.16666666666667e+00
+128 207 -2.08333333333333e+00
+128 237 3.20164901534969e-16
+128 126 8.88178419700125e-16
+128 24 5.06539254985228e-16
+128 123 -3.43475248243408e-16
+128 201 8.88178419700125e-16
+129 129 2.77777777777778e+01
+129 41 -1.35406009321715e-15
+129 209 2.08333333333333e+00
+129 140 4.16666666666666e+00
+129 133 -4.16666666666667e+00
+129 40 8.56086035394554e-16
+129 208 -2.08333333333333e+00
+129 139 2.68014777038417e-16
+129 132 -4.86111111111111e+00
+129 39 -5.55555555555555e+00
+129 207 -3.47222222222222e+00
+129 138 -4.86111111111111e+00
+129 110 -2.91433543964104e-16
+129 215 1.77635683940025e-15
+129 131 8.88178419700125e-16
+129 38 4.07660016854550e-17
+129 194 -2.08333333333333e+00
+129 239 3.75676052766227e-16
+129 206 5.31408142316614e-16
+129 116 -4.16666666666667e+00
+129 109 4.16666666666667e+00
+129 214 7.63278329429795e-17
+129 130 -8.88178419700125e-16
+129 37 -5.55111512312578e-17
+129 193 2.08333333333333e+00
+129 238 3.38271077815477e-17
+129 205 -4.44089209850063e-16
+129 115 -6.93889390390723e-17
+129 108 -4.86111111111111e+00
+129 213 5.55555555555556e+00
+129 134 -1.63931368479808e-16
+129 36 -5.55555555555556e+00
+129 192 -3.47222222222222e+00
+129 237 -1.38888888888889e+00
+129 204 5.55555555555556e+00
+129 114 -4.86111111111112e+00
+130 130 2.77777777777778e+01
+130 41 -2.08333333333333e+00
+130 209 2.08333333333333e+00
+130 140 -2.68990558993654e-16
+130 133 -4.86111111111111e+00
+130 40 2.77777777777778e+00
+130 208 -3.47222222222222e+00
+130 139 -6.94444444444444e-01
+130 132 -4.16666666666667e+00
+130 39 8.39606162372775e-16
+130 207 -2.08333333333333e+00
+130 138 3.36536354339501e-16
+130 110 7.02563007770607e-16
+130 215 -6.89661001918029e-16
+130 131 -8.33333333333333e+00
+130 38 -2.08333333333333e+00
+130 194 2.08333333333333e+00
+130 239 8.33333333333333e+00
+130 206 2.15214131238373e-16
+130 116 -3.07371315899641e-16
+130 109 -4.86111111111111e+00
+130 214 -1.11111111111111e+01
+130 134 -2.10768902331182e-16
+130 37 2.77777777777778e+00
+130 193 -3.47222222222222e+00
+130 238 -9.72222222222223e+00
+130 205 5.55555555555556e+00
+130 115 -6.94444444444445e-01
+130 108 4.16666666666667e+00
+130 213 2.61075883134509e-16
+130 129 -8.88178419700125e-16
+130 36 -1.90819582357449e-16
+130 192 2.08333333333333e+00
+130 237 4.51028103753970e-17
+130 204 -8.88178419700125e-16
+130 114 -9.35666474854990e-17
+131 131 2.77777777777778e+01
+131 41 2.77777777777778e+00
+131 209 -3.47222222222222e+00
+131 140 -4.86111111111111e+00
+131 133 -2.28983498828939e-16
+131 40 -2.08333333333333e+00
+131 208 2.08333333333333e+00
+131 139 -4.11129463806503e-16
+131 132 -1.04083408558608e-16
+131 39 -1.43635103810880e-15
+131 207 2.08333333333333e+00
+131 138 4.16666666666667e+00
+131 110 -6.94444444444444e-01
+131 215 5.55555555555555e+00
+131 134 -6.94444444444444e-01
+131 38 2.77777777777778e+00
+131 194 -3.47222222222222e+00
+131 239 -9.72222222222222e+00
+131 206 -1.11111111111111e+01
+131 116 -4.86111111111111e+00
+131 109 7.84095011141517e-16
+131 214 -8.52616588442601e-16
+131 130 -8.33333333333333e+00
+131 37 -2.08333333333333e+00
+131 193 2.08333333333333e+00
+131 238 8.33333333333333e+00
+131 205 4.70652163075957e-16
+131 115 -3.15719672627779e-16
+131 108 -2.68014777038417e-16
+131 213 1.77635683940025e-15
+131 129 8.88178419700125e-16
+131 36 2.49691760323412e-16
+131 192 -2.08333333333333e+00
+131 237 2.07299455379228e-16
+131 204 8.35919874986324e-17
+131 114 -4.16666666666667e+00
+132 132 5.55555555555556e+01
+132 227 2.08333333333333e+00
+132 160 -4.16666666666667e+00
+132 226 -2.08333333333333e+00
+132 159 -4.86111111111111e+00
+132 225 -3.47222222222222e+00
+132 230 -1.06902334207071e-16
+132 155 1.52655665885959e-16
+132 242 8.33333333333333e+00
+132 221 2.08333333333333e+00
+132 229 -8.98586760555986e-16
+132 154 4.16666666666667e+00
+132 241 -2.14997290803876e-16
+132 220 2.08333333333333e+00
+132 228 -1.11111111111111e+01
+132 153 -4.86111111111111e+00
+132 240 -9.72222222222222e+00
+132 219 -3.47222222222222e+00
+132 137 -1.80411241501588e-16
+132 56 4.44089209850063e-16
+132 212 -2.08333333333333e+00
+132 143 -8.47846098883664e-17
+132 136 4.16666666666667e+00
+132 55 2.15105711021124e-16
+132 211 2.08333333333333e+00
+132 142 -2.42861286636753e-17
+132 135 -4.86111111111111e+00
+132 54 5.55555555555555e+00
+132 210 -3.47222222222222e+00
+132 141 -1.38888888888889e+00
+132 215 -6.60062282609175e-16
+132 134 1.77635683940025e-15
+132 41 0.00000000000000e+00
+132 131 -1.59594559789866e-16
+132 239 -8.33333333333333e+00
+132 209 2.91677489452913e-16
+132 140 7.23162849047831e-17
+132 206 -2.08333333333333e+00
+132 214 1.67227343084164e-15
+132 133 0.00000000000000e+00
+132 40 -8.76035355368288e-17
+132 130 -4.16666666666667e+00
+132 238 5.32560107124880e-16
+132 208 0.00000000000000e+00
+132 139 6.84131570838353e-17
+132 205 -2.08333333333333e+00
+132 213 -1.11111111111111e+01
+132 161 2.64545330086463e-16
+132 39 5.55555555555555e+00
+132 129 -4.86111111111111e+00
+132 237 -9.72222222222222e+00
+132 207 1.11111111111111e+01
+132 138 -1.38888888888889e+00
+132 204 -3.47222222222222e+00
+133 133 5.55555555555556e+01
+133 227 2.08333333333333e+00
+133 160 -4.86111111111111e+00
+133 226 -3.47222222222222e+00
+133 159 -4.16666666666667e+00
+133 225 -2.08333333333333e+00
+133 230 8.88178419700125e-16
+133 155 -3.60822483003176e-16
+133 242 8.12934788929631e-16
+133 221 -2.08333333333333e+00
+133 229 5.55555555555556e+00
+133 154 -4.86111111111111e+00
+133 241 -1.38888888888889e+00
+133 220 -3.47222222222222e+00
+133 228 -9.50628464835290e-16
+133 153 4.16666666666667e+00
+133 240 -1.46584133720040e-16
+133 219 2.08333333333333e+00
+133 137 3.11382863937837e-16
+133 56 5.07298196505968e-16
+133 212 2.08333333333333e+00
+133 143 8.33333333333334e+00
+133 136 -4.86111111111111e+00
+133 55 -1.11111111111111e+01
+133 211 -3.47222222222222e+00
+133 142 -9.72222222222223e+00
+133 135 4.16666666666667e+00
+133 54 -8.76035355368288e-17
+133 210 2.08333333333333e+00
+133 141 -5.52943107967607e-18
+133 215 1.33226762955019e-15
+133 134 -6.21724893790088e-15
+133 41 1.32706345912226e-16
+133 131 -2.01227923213310e-16
+133 239 1.15912054260425e-15
+133 209 -1.48790485141048e-15
+133 140 -8.33333333333334e+00
+133 206 -2.08333333333333e+00
+133 214 5.55555555555556e+00
+133 161 -2.22911966663020e-16
+133 40 -1.11111111111111e+01
+133 130 -4.86111111111111e+00
+133 238 -1.38888888888889e+00
+133 208 1.11111111111111e+01
+133 139 -9.72222222222223e+00
+133 205 -3.47222222222222e+00
+133 213 1.70956998557514e-15
+133 132 0.00000000000000e+00
+133 39 2.63677968348475e-16
+133 129 -4.16666666666667e+00
+133 237 5.89697561614866e-16
+133 207 -4.44089209850063e-16
+133 138 -1.12757025938492e-17
+133 204 -2.08333333333333e+00
+134 134 5.55555555555556e+01
+134 227 -3.47222222222222e+00
+134 160 -2.08166817117217e-16
+134 226 2.08333333333333e+00
+134 159 2.63677968348475e-16
+134 225 2.08333333333333e+00
+134 230 5.55555555555556e+00
+134 155 -6.94444444444443e-01
+134 242 -9.72222222222222e+00
+134 221 -3.47222222222222e+00
+134 229 1.33226762955019e-15
+134 154 -3.76434994286967e-16
+134 241 1.05644659686988e-15
+134 220 -2.08333333333333e+00
+134 228 -5.03069808033274e-17
+134 153 2.15105711021124e-16
+134 240 8.33333333333333e+00
+134 219 2.08333333333333e+00
+134 137 -6.94444444444445e-01
+134 56 5.55555555555556e+00
+134 212 -3.47222222222222e+00
+134 143 -9.72222222222222e+00
+134 136 4.02455846426619e-16
+134 55 4.10262102068515e-16
+134 211 2.08333333333333e+00
+134 142 8.33333333333334e+00
+134 135 -2.40259201422788e-16
+134 54 4.44089209850063e-16
+134 210 -2.08333333333333e+00
+134 141 -4.94396190653390e-17
+134 215 5.55555555555556e+00
+134 161 -6.94444444444444e-01
+134 41 5.55555555555556e+00
+134 131 -6.94444444444444e-01
+134 239 -9.72222222222222e+00
+134 209 -2.22222222222222e+01
+134 140 -9.72222222222222e+00
+134 206 -3.47222222222222e+00
+134 214 1.33226762955019e-15
+134 133 -5.32907051820075e-15
+134 40 3.33717428691038e-16
+134 130 -2.17707796235089e-16
+134 238 1.36349265211777e-15
+134 208 -1.35731269973460e-15
+134 139 -8.33333333333334e+00
+134 205 -2.08333333333333e+00
+134 213 -7.78999260930835e-16
+134 132 1.77635683940025e-15
+134 39 0.00000000000000e+00
+134 129 -1.63931368479808e-16
+134 237 -8.33333333333333e+00
+134 207 2.44921270764475e-16
+134 138 -7.80625564189563e-18
+134 204 -2.08333333333333e+00
+135 135 2.77777777777778e+01
+135 110 -1.52655665885959e-16
+135 119 -4.16666666666667e+00
+135 194 -2.08333333333333e+00
+135 52 -1.11022302462516e-16
+135 109 -4.16666666666667e+00
+135 118 -1.52655665885959e-16
+135 193 -2.08333333333333e+00
+135 51 -5.55555555555556e+00
+135 108 -4.86111111111111e+00
+135 117 -4.86111111111112e+00
+135 192 -3.47222222222222e+00
+135 137 0.00000000000000e+00
+135 56 5.20417042793042e-16
+135 134 -2.40259201422788e-16
+135 215 1.33226762955019e-15
+135 212 7.95370713735366e-16
+135 143 4.16666666666667e+00
+135 209 2.08333333333333e+00
+135 239 4.29560900738757e-16
+135 136 -8.88178419700125e-16
+135 55 8.53483950180589e-16
+135 133 4.16666666666667e+00
+135 214 -1.83013326715553e-16
+135 211 8.88178419700125e-16
+135 142 2.73218947466347e-16
+135 208 2.08333333333333e+00
+135 238 -1.19262238973405e-17
+135 53 -1.33226762955019e-15
+135 54 -5.55555555555555e+00
+135 132 -4.86111111111111e+00
+135 213 5.55555555555556e+00
+135 210 5.55555555555556e+00
+135 141 -4.86111111111111e+00
+135 207 -3.47222222222222e+00
+135 237 -1.38888888888889e+00
+136 136 2.77777777777778e+01
+136 110 -4.16333634234434e-17
+136 119 8.50014503228635e-17
+136 194 -2.08333333333333e+00
+136 52 2.77777777777778e+00
+136 109 -4.86111111111111e+00
+136 118 -6.94444444444446e-01
+136 193 -3.47222222222222e+00
+136 51 -6.24500451351651e-17
+136 108 -4.16666666666667e+00
+136 117 -1.38777878078145e-16
+136 192 -2.08333333333333e+00
+136 137 8.33333333333334e+00
+136 56 2.08333333333333e+00
+136 134 3.74700270810990e-16
+136 215 -5.75060832286312e-16
+136 212 3.09648140461860e-16
+136 143 -6.32306706993546e-16
+136 209 -2.08333333333333e+00
+136 239 -8.33333333333334e+00
+136 53 2.08333333333333e+00
+136 55 2.77777777777778e+00
+136 133 -4.86111111111111e+00
+136 214 -1.11111111111111e+01
+136 211 5.55555555555556e+00
+136 142 -6.94444444444445e-01
+136 208 -3.47222222222222e+00
+136 238 -9.72222222222223e+00
+136 135 -8.88178419700125e-16
+136 54 7.77156117237610e-16
+136 132 4.16666666666667e+00
+136 213 -1.45716771982052e-16
+136 210 8.88178419700125e-16
+136 141 2.77555756156289e-16
+136 207 2.08333333333333e+00
+136 237 5.46437894932694e-17
+137 137 2.77777777777778e+01
+137 110 -6.94444444444444e-01
+137 119 -4.86111111111111e+00
+137 194 -3.47222222222222e+00
+137 52 2.08333333333333e+00
+137 109 -3.98986399474666e-17
+137 118 0.00000000000000e+00
+137 193 -2.08333333333333e+00
+137 51 -1.35308431126191e-15
+137 108 -1.13624387676481e-16
+137 117 -4.16666666666667e+00
+137 192 -2.08333333333333e+00
+137 53 2.77777777777778e+00
+137 56 2.77777777777778e+00
+137 134 -6.94444444444445e-01
+137 215 5.55555555555555e+00
+137 212 -1.11111111111111e+01
+137 143 -4.86111111111111e+00
+137 209 -3.47222222222222e+00
+137 239 -9.72222222222222e+00
+137 136 8.33333333333334e+00
+137 55 2.08333333333333e+00
+137 133 3.11382863937837e-16
+137 214 -3.49655200626575e-16
+137 211 7.57206797263876e-16
+137 142 -5.96744875736022e-16
+137 208 -2.08333333333333e+00
+137 238 -8.33333333333334e+00
+137 135 0.00000000000000e+00
+137 54 5.55111512312578e-16
+137 132 -1.80411241501588e-16
+137 213 1.33226762955019e-15
+137 210 6.86950496486816e-16
+137 141 4.16666666666667e+00
+137 207 2.08333333333333e+00
+137 237 2.14238349283136e-16
+138 138 5.55555555555556e+01
+138 155 -4.16666666666667e+00
+138 229 -2.08333333333333e+00
+138 154 -9.35666474854990e-17
+138 228 -3.47222222222222e+00
+138 153 -4.86111111111111e+00
+138 242 3.41632104550182e-16
+138 221 -1.53262819102551e-15
+138 218 2.08333333333333e+00
+138 146 4.16666666666667e+00
+138 241 -8.33333333333333e+00
+138 220 -9.79115876917347e-16
+138 217 -2.08333333333333e+00
+138 145 -9.44340092234874e-17
+138 240 -9.72222222222222e+00
+138 219 -1.11111111111111e+01
+138 216 -3.47222222222222e+00
+138 144 -4.86111111111111e+00
+138 215 2.08333333333333e+00
+138 134 -7.80625564189563e-18
+138 41 9.38810661155198e-16
+138 131 4.16666666666667e+00
+138 214 2.08333333333333e+00
+138 133 2.60208521396521e-18
+138 40 -8.88178419700125e-16
+138 130 2.18575157973078e-16
+138 213 -3.47222222222222e+00
+138 132 -1.38888888888889e+00
+138 39 5.55555555555555e+00
+138 129 -4.86111111111111e+00
+138 239 -2.84494650060196e-16
+138 209 4.44089209850063e-16
+138 140 3.55271367880050e-15
+138 206 -2.58452113877095e-15
+138 203 -2.08333333333333e+00
+138 125 2.54787510534094e-17
+138 11 7.98121876748048e-16
+138 122 -4.16666666666667e+00
+138 238 8.33333333333333e+00
+138 208 2.06323673423991e-16
+138 139 8.88178419700125e-16
+138 205 1.81907440499618e-15
+138 202 2.08333333333333e+00
+138 124 -2.42861286636753e-17
+138 10 -8.88178419700125e-16
+138 121 2.20309881449055e-16
+138 237 -9.72222222222222e+00
+138 207 1.11111111111111e+01
+138 230 -2.08333333333333e+00
+138 204 -1.11111111111111e+01
+138 201 -3.47222222222222e+00
+138 123 -1.38888888888889e+00
+138 9 5.55555555555555e+00
+138 120 -4.86111111111111e+00
+139 139 5.55555555555556e+01
+139 155 -2.60208521396521e-16
+139 229 -3.47222222222222e+00
+139 154 -6.94444444444445e-01
+139 228 -2.08333333333333e+00
+139 153 -2.86229373536173e-17
+139 242 -7.56447855743136e-16
+139 221 0.00000000000000e+00
+139 218 2.08333333333333e+00
+139 146 2.40584462074533e-16
+139 241 -9.72222222222222e+00
+139 220 5.55555555555556e+00
+139 217 -3.47222222222222e+00
+139 145 -6.94444444444443e-01
+139 240 -8.33333333333333e+00
+139 219 -8.79071121451247e-16
+139 216 -2.08333333333333e+00
+139 144 -2.16840434497101e-17
+139 215 -2.08333333333333e+00
+139 134 -8.33333333333334e+00
+139 41 -5.41016884070267e-16
+139 131 -4.11129463806503e-16
+139 214 -3.47222222222222e+00
+139 133 -9.72222222222223e+00
+139 40 5.55555555555556e+00
+139 130 -6.94444444444444e-01
+139 213 2.08333333333333e+00
+139 132 4.15249432061948e-17
+139 39 -8.88178419700125e-16
+139 129 2.60208521396521e-16
+139 239 2.53052787058117e-16
+139 209 6.96681210984873e-16
+139 140 -5.32907051820075e-15
+139 206 1.33226762955019e-15
+139 203 2.08333333333333e+00
+139 125 8.33333333333334e+00
+139 11 -7.05422591000537e-16
+139 122 6.82180006927879e-16
+139 238 -9.72222222222222e+00
+139 208 -2.22222222222222e+01
+139 230 -2.08333333333333e+00
+139 205 5.55555555555556e+00
+139 202 -3.47222222222222e+00
+139 124 -9.72222222222223e+00
+139 10 5.55555555555556e+00
+139 121 -6.94444444444446e-01
+139 237 8.33333333333333e+00
+139 207 -1.03446439782273e-16
+139 138 -8.88178419700125e-16
+139 204 1.82006373947857e-15
+139 201 2.08333333333333e+00
+139 123 -6.28837260041593e-18
+139 9 -8.88178419700125e-16
+139 120 2.73110527249099e-16
+140 140 5.55555555555556e+01
+140 155 -4.86111111111111e+00
+140 229 -2.08333333333333e+00
+140 154 -3.66026653431106e-16
+140 228 -2.08333333333333e+00
+140 153 -4.16666666666667e+00
+140 242 -1.38888888888889e+00
+140 221 5.55555555555556e+00
+140 218 -3.47222222222222e+00
+140 146 -4.86111111111111e+00
+140 241 -8.23126289350995e-16
+140 220 4.44089209850063e-16
+140 217 2.08333333333333e+00
+140 145 3.62557206479153e-16
+140 240 3.64291929955129e-16
+140 219 -1.58662145921529e-15
+140 216 2.08333333333333e+00
+140 144 4.16666666666667e+00
+140 215 -3.47222222222222e+00
+140 134 -9.72222222222222e+00
+140 41 -1.11111111111111e+01
+140 131 -4.86111111111111e+00
+140 214 -2.08333333333333e+00
+140 133 -8.33333333333334e+00
+140 40 -5.38889137306764e-16
+140 130 -2.68990558993654e-16
+140 213 2.08333333333333e+00
+140 132 7.32920668600201e-17
+140 39 7.98121876748048e-16
+140 129 4.16666666666666e+00
+140 239 -1.38888888888889e+00
+140 209 1.11111111111111e+01
+140 230 -3.47222222222222e+00
+140 206 5.55555555555557e+00
+140 203 -3.47222222222222e+00
+140 125 -9.72222222222222e+00
+140 11 -1.11111111111111e+01
+140 122 -4.86111111111111e+00
+140 238 3.38271077815477e-16
+140 208 7.37257477290143e-16
+140 139 -5.32907051820075e-15
+140 205 1.77635683940025e-15
+140 202 2.08333333333333e+00
+140 124 8.33333333333334e+00
+140 10 -4.23055687703844e-16
+140 121 8.43942971062717e-16
+140 237 -3.33066907387547e-16
+140 207 4.44089209850063e-16
+140 138 3.55271367880050e-15
+140 204 -2.69303622370959e-15
+140 201 -2.08333333333333e+00
+140 123 -4.94396190653390e-17
+140 9 1.04983296361771e-15
+140 120 -4.16666666666667e+00
+141 141 5.55555555555556e+01
+141 230 -2.08333333333333e+00
+141 160 -9.10729824887824e-17
+141 229 2.08333333333333e+00
+141 159 -4.86111111111111e+00
+141 228 -3.47222222222222e+00
+141 227 1.39731975989932e-15
+141 242 1.21430643318376e-16
+141 152 4.16666666666667e+00
+141 218 2.08333333333333e+00
+141 226 -8.50556604314878e-16
+141 241 8.33333333333333e+00
+141 151 -1.06685493772574e-16
+141 217 2.08333333333333e+00
+141 225 -1.11111111111111e+01
+141 240 -9.72222222222222e+00
+141 150 -4.86111111111111e+00
+141 216 -3.47222222222222e+00
+141 137 4.16666666666667e+00
+141 56 -9.78384040450919e-16
+141 134 -4.94396190653390e-17
+141 215 2.08333333333333e+00
+141 136 2.77555756156289e-16
+141 55 8.88178419700125e-16
+141 133 -4.66206934168767e-18
+141 214 -2.08333333333333e+00
+141 135 -4.86111111111111e+00
+141 54 5.55555555555555e+00
+141 132 -1.38888888888889e+00
+141 213 -3.47222222222222e+00
+141 212 1.02001740387436e-15
+141 143 -8.88178419700125e-16
+141 209 8.88178419700125e-16
+141 239 -1.71737624121704e-16
+141 128 -4.16666666666667e+00
+141 26 -7.28583859910259e-16
+141 125 -3.87060175577325e-17
+141 203 -2.08333333333333e+00
+141 211 1.45109618765460e-15
+141 142 -1.77635683940025e-15
+141 208 -9.99905453574756e-17
+141 238 -8.33333333333333e+00
+141 127 3.12250225675825e-16
+141 25 8.88178419700125e-16
+141 124 6.84131570838353e-17
+141 202 -2.08333333333333e+00
+141 210 -1.11111111111111e+01
+141 161 -4.16666666666667e+00
+141 207 1.11111111111111e+01
+141 237 -9.72222222222222e+00
+141 126 -4.86111111111111e+00
+141 24 5.55555555555555e+00
+141 123 -1.38888888888889e+00
+141 201 -3.47222222222222e+00
+142 142 5.55555555555556e+01
+142 230 2.08333333333333e+00
+142 160 -6.94444444444443e-01
+142 229 -3.47222222222222e+00
+142 159 -9.02056207507940e-17
+142 228 2.08333333333333e+00
+142 227 2.66453525910038e-15
+142 242 -8.14452671971111e-16
+142 152 5.68121938382404e-16
+142 218 -2.08333333333333e+00
+142 226 5.55555555555556e+00
+142 241 -9.72222222222222e+00
+142 151 -6.94444444444445e-01
+142 217 -3.47222222222222e+00
+142 225 -9.80118763926896e-16
+142 240 8.33333333333333e+00
+142 150 -8.32667268468867e-17
+142 216 2.08333333333333e+00
+142 137 -5.96744875736022e-16
+142 56 -1.10068204550728e-15
+142 134 8.33333333333334e+00
+142 215 2.08333333333333e+00
+142 136 -6.94444444444445e-01
+142 55 5.55555555555556e+00
+142 133 -9.72222222222223e+00
+142 214 -3.47222222222222e+00
+142 135 2.87096735274162e-16
+142 54 8.88178419700125e-16
+142 132 -2.51534904016637e-17
+142 213 -2.08333333333333e+00
+142 212 1.77635683940025e-15
+142 143 -8.88178419700125e-16
+142 209 1.40339129206524e-15
+142 239 -8.00574884163296e-16
+142 128 4.76181594155634e-16
+142 26 -7.88648660265956e-16
+142 125 -8.33333333333334e+00
+142 203 -2.08333333333333e+00
+142 211 5.55555555555556e+00
+142 161 8.32667268468867e-17
+142 208 -2.22222222222222e+01
+142 238 -9.72222222222222e+00
+142 127 -6.94444444444444e-01
+142 25 5.55555555555556e+00
+142 124 -9.72222222222223e+00
+142 202 -3.47222222222222e+00
+142 210 1.63150742915619e-15
+142 141 -1.77635683940025e-15
+142 207 3.64183509737881e-16
+142 237 -8.33333333333333e+00
+142 126 3.07913416985883e-16
+142 24 4.44089209850063e-16
+142 123 -1.12757025938492e-17
+142 201 -2.08333333333333e+00
+143 143 5.55555555555556e+01
+143 230 -3.47222222222222e+00
+143 160 1.30104260698261e-17
+143 229 2.08333333333333e+00
+143 159 -4.16666666666667e+00
+143 228 -2.08333333333333e+00
+143 227 5.55555555555556e+00
+143 242 -1.38888888888889e+00
+143 152 -4.86111111111111e+00
+143 218 -3.47222222222222e+00
+143 226 3.10862446895044e-15
+143 241 -8.79071121451247e-16
+143 151 6.93889390390723e-16
+143 217 -2.08333333333333e+00
+143 225 1.39471767468535e-15
+143 240 1.29236898960272e-16
+143 150 4.16666666666667e+00
+143 216 2.08333333333333e+00
+143 137 -4.86111111111111e+00
+143 56 -1.11111111111111e+01
+143 134 -9.72222222222222e+00
+143 215 -3.47222222222222e+00
+143 136 -6.32306706993546e-16
+143 55 -8.92623648607316e-16
+143 133 8.33333333333334e+00
+143 214 2.08333333333333e+00
+143 135 4.16666666666667e+00
+143 54 -7.28583859910259e-16
+143 132 8.08814820674186e-17
+143 213 2.08333333333333e+00
+143 212 5.55555555555556e+00
+143 161 -4.86111111111111e+00
+143 209 1.11111111111111e+01
+143 239 -1.38888888888889e+00
+143 128 -4.86111111111111e+00
+143 26 -1.11111111111111e+01
+143 125 -9.72222222222222e+00
+143 203 -3.47222222222222e+00
+143 211 1.77635683940025e-15
+143 142 -8.88178419700125e-16
+143 208 9.95053648852884e-16
+143 238 -7.63820430516038e-16
+143 127 5.20417042793042e-16
+143 25 -1.15619319673854e-15
+143 124 -8.33333333333334e+00
+143 202 -2.08333333333333e+00
+143 210 1.09200842812740e-15
+143 141 -8.88178419700125e-16
+143 207 8.88178419700125e-16
+143 237 -1.84856470408779e-16
+143 126 -4.16666666666667e+00
+143 24 -1.02695629777827e-15
+143 123 -7.80625564189563e-18
+143 201 -2.08333333333333e+00
+144 144 2.77777777777778e+01
+144 164 -4.16666666666667e+00
+144 149 1.47234655023532e-16
+144 14 7.40279690845946e-16
+144 223 -2.08333333333333e+00
+144 163 3.27429056090622e-17
+144 148 -4.16666666666667e+00
+144 13 -4.72847672475241e-17
+144 222 -3.47222222222222e+00
+144 162 -4.86111111111112e+00
+144 147 -4.86111111111111e+00
+144 12 -5.55555555555556e+00
+144 209 2.08333333333333e+00
+144 242 -2.68882138776405e-17
+144 221 3.67436116255337e-16
+144 140 4.16666666666667e+00
+144 125 1.04950770296597e-16
+144 218 -4.44089209850063e-16
+144 146 1.77635683940025e-15
+144 11 -9.36967517461973e-16
+144 208 2.08333333333333e+00
+144 241 2.16840434497101e-17
+144 220 0.00000000000000e+00
+144 139 -4.94396190653390e-17
+144 124 4.16666666666667e+00
+144 217 7.62953068778049e-16
+144 145 0.00000000000000e+00
+144 10 -4.23597788790087e-16
+144 207 -3.47222222222222e+00
+144 240 -1.38888888888889e+00
+144 219 5.55555555555556e+00
+144 138 -4.86111111111111e+00
+144 123 -4.86111111111111e+00
+144 216 5.55555555555556e+00
+144 224 -2.08333333333333e+00
+144 9 -5.55555555555555e+00
+145 145 2.77777777777778e+01
+145 164 -5.89805981832114e-17
+145 149 3.42933147157165e-16
+145 14 2.08333333333333e+00
+145 223 -3.47222222222222e+00
+145 163 -6.94444444444445e-01
+145 148 -4.86111111111111e+00
+145 13 2.77777777777778e+00
+145 222 -2.08333333333333e+00
+145 162 6.07153216591882e-18
+145 147 -4.16666666666667e+00
+145 12 2.41777084464267e-17
+145 209 -2.08333333333333e+00
+145 242 -8.33333333333333e+00
+145 221 -2.85470432015433e-16
+145 140 2.51534904016637e-16
+145 125 -6.65483293471603e-16
+145 218 8.31284910698948e-16
+145 146 8.33333333333333e+00
+145 11 2.08333333333333e+00
+145 208 -3.47222222222222e+00
+145 241 -9.72222222222223e+00
+145 220 5.55555555555556e+00
+145 139 -6.94444444444443e-01
+145 124 -4.86111111111111e+00
+145 217 -1.11111111111111e+01
+145 224 -2.08333333333333e+00
+145 10 2.77777777777778e+00
+145 207 2.08333333333333e+00
+145 240 6.97141996908179e-17
+145 219 0.00000000000000e+00
+145 138 -9.35666474854990e-17
+145 123 4.16666666666666e+00
+145 216 4.79366438037310e-16
+145 144 0.00000000000000e+00
+145 9 -4.30062344243531e-16
+146 146 2.77777777777778e+01
+146 164 -4.86111111111111e+00
+146 149 -6.94444444444444e-01
+146 14 2.77777777777778e+00
+146 223 -2.08333333333333e+00
+146 163 -6.63531729561129e-17
+146 148 3.84241249928863e-16
+146 13 2.08333333333333e+00
+146 222 -2.08333333333333e+00
+146 162 -4.16666666666667e+00
+146 147 1.41379963292110e-16
+146 12 6.97250417125428e-16
+146 209 -3.47222222222222e+00
+146 242 -9.72222222222222e+00
+146 221 -1.11111111111111e+01
+146 140 -4.86111111111111e+00
+146 125 -6.94444444444443e-01
+146 218 5.55555555555556e+00
+146 224 -3.47222222222222e+00
+146 11 2.77777777777778e+00
+146 208 -2.08333333333333e+00
+146 241 -8.33333333333333e+00
+146 220 -2.45111006144660e-16
+146 139 2.41451823812522e-16
+146 124 -6.75674793892966e-16
+146 217 6.99852502339393e-16
+146 145 8.33333333333333e+00
+146 10 2.08333333333333e+00
+146 207 2.08333333333333e+00
+146 240 -1.18178036800920e-17
+146 219 5.99279198314207e-16
+146 138 4.16666666666667e+00
+146 123 1.31730563956989e-16
+146 216 -4.44089209850063e-16
+146 144 1.77635683940025e-15
+146 9 -8.13138076836972e-16
+147 147 2.83333333333334e+01
+147 29 -2.04166666666667e+00
+147 166 -2.15620707053055e-17
+147 28 5.77337656848531e-17
+147 165 -7.08333333333333e-01
+147 27 2.83333333333334e+00
+147 224 -5.11750201676736e-16
+147 164 -4.74202925190848e-17
+147 149 -8.16666666666667e+00
+147 14 -2.04166666666667e+00
+147 223 -6.93889390390723e-18
+147 163 -1.50568576703924e-17
+147 148 1.77635683940025e-15
+147 13 6.63832426257404e-17
+147 222 5.66666666666667e+00
+147 162 -7.08333333333333e-01
+147 167 -4.74202925190848e-17
+147 12 2.83333333333334e+00
+147 152 1.27502175484295e-16
+147 226 2.08333333333333e+00
+147 151 4.16666666666667e+00
+147 225 -3.47222222222222e+00
+147 150 -4.86111111111111e+00
+147 242 8.33333333333333e+00
+147 221 2.08333333333333e+00
+147 218 7.59808882477842e-16
+147 146 1.48318857196017e-16
+147 241 8.23993651088983e-17
+147 220 -2.08333333333333e+00
+147 217 -9.28077059647592e-17
+147 145 -4.16666666666667e+00
+147 240 -9.72222222222223e+00
+147 219 -3.47222222222222e+00
+147 216 -1.11111111111111e+01
+147 227 2.08333333333333e+00
+147 144 -4.86111111111111e+00
+147 398 -4.16666666666667e-02
+147 299 8.31786354203723e-19
+147 397 -4.16666666666667e-02
+147 298 -8.33333333333334e-02
+147 396 -6.94444444444445e-02
+147 297 -9.72222222222222e-02
+147 449 -1.66666666666667e-01
+147 392 -4.16666666666667e-02
+147 389 -1.18108156582772e-17
+147 293 -1.37727557223549e-18
+147 448 8.41950749570775e-19
+147 391 4.16666666666667e-02
+147 388 -1.52317699740005e-18
+147 292 8.33333333333334e-02
+147 447 -1.94444444444445e-01
+147 390 -6.94444444444445e-02
+147 387 -2.22222222222222e-01
+147 291 -9.72222222222222e-02
+148 148 2.83333333333333e+01
+148 29 1.60372347793683e-16
+148 166 -4.95833333333333e+00
+148 28 -5.66666666666666e+00
+148 165 -1.59089728153303e-17
+148 27 1.73936098136302e-16
+148 224 -3.43158457921135e-16
+148 164 4.25000000000000e+00
+148 149 -3.58046925441613e-15
+148 14 -4.28751137241182e-17
+148 223 5.66666666666667e+00
+148 163 -4.95833333333333e+00
+148 167 -4.25000000000000e+00
+148 13 -5.66666666666666e+00
+148 222 -6.93889390390723e-18
+148 162 -2.15485181781494e-17
+148 147 1.77635683940025e-15
+148 12 5.68664039468647e-17
+148 152 -8.82540568403201e-17
+148 226 -3.47222222222222e+00
+148 151 -4.86111111111111e+00
+148 225 2.08333333333333e+00
+148 150 4.16666666666666e+00
+148 242 -6.76542155630955e-17
+148 221 2.08333333333333e+00
+148 218 1.77635683940025e-15
+148 146 3.56485674313234e-16
+148 241 -1.38888888888889e+00
+148 220 -3.47222222222222e+00
+148 217 5.55555555555555e+00
+148 227 -2.08333333333333e+00
+148 145 -4.86111111111111e+00
+148 240 1.03866568124111e-16
+148 219 -2.08333333333333e+00
+148 216 -1.70558554259126e-16
+148 144 -4.16666666666667e+00
+148 398 -4.16666666666667e-02
+148 299 8.61093694178722e-18
+148 397 -6.94444444444444e-02
+148 298 -9.72222222222222e-02
+148 396 -4.16666666666667e-02
+148 297 -8.33333333333334e-02
+148 449 -1.89464329641842e-17
+148 392 4.16666666666667e-02
+148 389 -4.16333634234434e-17
+148 293 1.57073789738837e-17
+148 448 -2.77777777777778e-02
+148 391 -6.94444444444444e-02
+148 388 1.11111111111111e-01
+148 292 -9.72222222222222e-02
+148 447 2.03287907341032e-19
+148 390 4.16666666666667e-02
+148 387 -4.20128341838133e-19
+148 291 8.33333333333334e-02
+149 149 2.83333333333333e+01
+149 29 2.83333333333333e+00
+149 166 -4.25000000000000e+00
+149 28 2.38095879275500e-16
+149 165 -7.12574937207153e-17
+149 27 -2.04166666666667e+00
+149 224 -1.13333333333333e+01
+149 164 -4.95833333333333e+00
+149 167 -4.95833333333333e+00
+149 14 2.83333333333333e+00
+149 223 -2.94465921915274e-16
+149 163 4.25000000000000e+00
+149 148 -4.46864767411626e-15
+149 13 6.32276213807445e-17
+149 222 -2.67408513206419e-16
+149 162 4.14842856247266e-17
+149 147 -8.16666666666667e+00
+149 12 -2.04166666666667e+00
+149 152 -6.94444444444444e-01
+149 226 -2.08333333333333e+00
+149 151 -2.25514051876985e-17
+149 225 2.08333333333333e+00
+149 150 8.13151629364128e-17
+149 242 -9.72222222222222e+00
+149 221 -3.47222222222222e+00
+149 218 5.55555555555555e+00
+149 227 -3.47222222222222e+00
+149 146 -6.94444444444444e-01
+149 241 -1.50812522192734e-16
+149 220 2.08333333333333e+00
+149 217 1.77635683940025e-15
+149 145 3.42933147157165e-16
+149 240 8.33333333333333e+00
+149 219 2.08333333333333e+00
+149 216 5.05346632595494e-16
+149 144 1.67183974997265e-16
+149 398 -6.94444444444444e-02
+149 299 -1.38888888888889e-02
+149 397 -4.16666666666667e-02
+149 298 6.87113126812688e-18
+149 396 -4.16666666666667e-02
+149 297 2.42590236093632e-18
+149 449 -1.94444444444444e-01
+149 392 -6.94444444444444e-02
+149 389 1.11111111111111e-01
+149 293 -1.38888888888889e-02
+149 448 -1.77775274969733e-17
+149 391 4.16666666666667e-02
+149 388 -4.16333634234434e-17
+149 292 1.40438062654763e-17
+149 447 -1.66666666666667e-01
+149 390 -4.16666666666667e-02
+149 387 -6.72882973298816e-18
+149 291 -1.15196480826585e-18
+150 150 2.77777777777778e+01
+150 209 2.08333333333333e+00
+150 26 7.21644966006352e-16
+150 125 2.14238349283136e-16
+150 142 -9.02056207507940e-17
+150 208 -2.08333333333333e+00
+150 25 -4.78783679369599e-16
+150 124 -4.16666666666667e+00
+150 141 -4.86111111111111e+00
+150 207 -3.47222222222222e+00
+150 24 -5.55555555555555e+00
+150 123 -4.86111111111111e+00
+150 227 -4.57966997657877e-16
+150 167 -4.16666666666667e+00
+150 224 -2.08333333333333e+00
+150 242 -1.92554305833426e-16
+150 152 -1.77635683940025e-15
+150 29 -1.99493199737333e-17
+150 149 1.02131844648135e-16
+150 218 -4.44089209850063e-16
+150 226 8.88178419700125e-16
+150 166 7.11236625150491e-17
+150 223 2.08333333333333e+00
+150 241 7.13405029495462e-17
+150 151 0.00000000000000e+00
+150 28 -1.22514845490862e-16
+150 148 4.16666666666666e+00
+150 217 5.93966607669028e-16
+150 225 5.55555555555556e+00
+150 165 -4.86111111111111e+00
+150 222 -3.47222222222222e+00
+150 240 -1.38888888888889e+00
+150 143 4.16666666666667e+00
+150 27 -5.55555555555556e+00
+150 147 -4.86111111111111e+00
+150 216 5.55555555555556e+00
+151 151 2.77777777777778e+01
+151 209 2.08333333333333e+00
+151 26 -2.08333333333333e+00
+151 125 -5.52509427098613e-16
+151 142 -6.94444444444445e-01
+151 208 -3.47222222222222e+00
+151 25 2.77777777777778e+00
+151 124 -4.86111111111111e+00
+151 141 -1.13624387676481e-16
+151 207 -2.08333333333333e+00
+151 24 -4.97648797170847e-16
+151 123 -4.16666666666667e+00
+151 227 -1.18047932540222e-15
+151 167 -5.55111512312578e-17
+151 224 2.08333333333333e+00
+151 242 8.33333333333333e+00
+151 152 -8.33333333333333e+00
+151 29 -2.08333333333333e+00
+151 149 -2.60208521396521e-17
+151 218 8.10874804801909e-16
+151 226 5.55555555555556e+00
+151 166 -6.94444444444445e-01
+151 223 -3.47222222222222e+00
+151 241 -9.72222222222223e+00
+151 143 6.93889390390723e-16
+151 28 2.77777777777778e+00
+151 148 -4.86111111111111e+00
+151 217 -1.11111111111111e+01
+151 225 8.88178419700125e-16
+151 165 6.24500451351651e-17
+151 222 2.08333333333333e+00
+151 240 2.25514051876985e-17
+151 150 0.00000000000000e+00
+151 27 -2.28983498828939e-16
+151 147 4.16666666666667e+00
+151 216 6.56267575005476e-16
+152 152 2.77777777777778e+01
+152 209 -3.47222222222222e+00
+152 26 2.77777777777778e+00
+152 125 -6.94444444444444e-01
+152 142 5.68121938382404e-16
+152 208 2.08333333333333e+00
+152 25 -2.08333333333333e+00
+152 124 -4.70977423727703e-16
+152 141 4.16666666666667e+00
+152 207 2.08333333333333e+00
+152 24 7.38124839028131e-16
+152 123 2.47957036847435e-16
+152 227 -1.11111111111111e+01
+152 167 -4.86111111111111e+00
+152 224 -3.47222222222222e+00
+152 242 -9.72222222222222e+00
+152 143 -4.86111111111111e+00
+152 29 2.77777777777778e+00
+152 149 -6.94444444444444e-01
+152 218 5.55555555555556e+00
+152 226 -1.49587373737825e-15
+152 166 -1.22298005056365e-16
+152 223 2.08333333333333e+00
+152 241 8.33333333333333e+00
+152 151 -8.33333333333333e+00
+152 28 -2.08333333333333e+00
+152 148 -8.82540568403201e-17
+152 217 9.49259659592527e-16
+152 225 -6.74807432154978e-16
+152 165 -4.16666666666667e+00
+152 222 -2.08333333333333e+00
+152 240 -1.21322223101128e-16
+152 150 -1.77635683940025e-15
+152 27 6.93889390390723e-18
+152 147 1.35308431126191e-16
+152 216 -4.44089209850063e-16
+153 153 2.77777777777778e+01
+153 44 7.95153873300869e-16
+153 224 2.08333333333333e+00
+153 164 4.16666666666667e+00
+153 157 -4.16666666666667e+00
+153 43 -2.41993924898765e-16
+153 223 -2.08333333333333e+00
+153 163 1.88651178012478e-17
+153 156 -4.86111111111111e+00
+153 42 -5.55555555555556e+00
+153 222 -3.47222222222222e+00
+153 162 -4.86111111111112e+00
+153 134 1.59594559789866e-16
+153 230 0.00000000000000e+00
+153 155 -1.77635683940025e-15
+153 41 -6.59194920871187e-16
+153 209 -2.08333333333333e+00
+153 242 -6.57026516526216e-17
+153 221 4.88256895851691e-16
+153 140 -4.16666666666667e+00
+153 133 4.16666666666667e+00
+153 229 4.85722573273506e-16
+153 154 8.88178419700125e-16
+153 40 -4.51028103753970e-16
+153 208 2.08333333333333e+00
+153 241 5.72458747072346e-17
+153 220 0.00000000000000e+00
+153 139 -1.56125112837913e-17
+153 132 -4.86111111111111e+00
+153 228 5.55555555555555e+00
+153 158 1.96023752785379e-16
+153 39 -5.55555555555555e+00
+153 207 -3.47222222222222e+00
+153 240 -1.38888888888889e+00
+153 219 5.55555555555556e+00
+153 138 -4.86111111111111e+00
+154 154 2.77777777777778e+01
+154 44 -2.08333333333333e+00
+154 224 2.08333333333333e+00
+154 164 3.31765864780564e-17
+154 157 -4.86111111111111e+00
+154 43 2.77777777777778e+00
+154 223 -3.47222222222222e+00
+154 163 -6.94444444444446e-01
+154 156 -4.16666666666667e+00
+154 42 -2.84494650060196e-16
+154 222 -2.08333333333333e+00
+154 162 -6.93889390390723e-18
+154 134 -3.76434994286967e-16
+154 230 5.58038858178289e-16
+154 155 -8.33333333333333e+00
+154 41 -2.08333333333333e+00
+154 209 2.08333333333333e+00
+154 242 8.33333333333333e+00
+154 221 -4.60216717165784e-16
+154 140 -3.65918233213858e-16
+154 133 -4.86111111111111e+00
+154 229 -1.11111111111111e+01
+154 158 5.20417042793042e-17
+154 40 2.77777777777778e+00
+154 208 -3.47222222222222e+00
+154 241 -9.72222222222223e+00
+154 220 5.55555555555556e+00
+154 139 -6.94444444444445e-01
+154 132 4.16666666666667e+00
+154 228 4.21537804662364e-16
+154 153 0.00000000000000e+00
+154 39 -4.25874613352306e-16
+154 207 2.08333333333333e+00
+154 240 1.96132173002628e-16
+154 219 0.00000000000000e+00
+154 138 -7.96888596776846e-17
+155 155 2.77777777777778e+01
+155 44 2.77777777777778e+00
+155 224 -3.47222222222222e+00
+155 164 -4.86111111111111e+00
+155 157 1.38777878078145e-17
+155 43 -2.08333333333333e+00
+155 223 2.08333333333333e+00
+155 163 1.61329283265843e-16
+155 156 1.24900090270330e-16
+155 42 6.91287305176758e-16
+155 222 2.08333333333333e+00
+155 162 4.16666666666667e+00
+155 134 -6.94444444444443e-01
+155 230 5.55555555555556e+00
+155 158 -6.94444444444445e-01
+155 41 2.77777777777778e+00
+155 209 -3.47222222222222e+00
+155 242 -9.72222222222222e+00
+155 221 -1.11111111111111e+01
+155 140 -4.86111111111111e+00
+155 133 -3.53883589099269e-16
+155 229 6.51388665229291e-16
+155 154 -8.33333333333333e+00
+155 40 -2.08333333333333e+00
+155 208 2.08333333333333e+00
+155 241 8.33333333333333e+00
+155 220 -2.29959280784175e-16
+155 139 -2.32452945780892e-16
+155 132 1.80411241501588e-16
+155 228 0.00000000000000e+00
+155 153 -1.77635683940025e-15
+155 39 -7.70542483985448e-16
+155 207 -2.08333333333333e+00
+155 240 -3.29597460435593e-17
+155 219 5.93817529870311e-16
+155 138 -4.16666666666667e+00
+156 156 2.83333333333333e+01
+156 167 -6.86706550998006e-17
+156 58 5.74627151417317e-17
+156 166 -2.15620707053055e-17
+156 57 2.83333333333333e+00
+156 165 -7.08333333333333e-01
+156 158 8.16666666666667e+00
+156 44 2.04166666666667e+00
+156 224 -4.85997011948416e-16
+156 164 -1.56497807334705e-17
+156 157 0.00000000000000e+00
+156 43 1.04164723721545e-16
+156 223 0.00000000000000e+00
+156 163 -1.93462325152882e-18
+156 59 2.04166666666667e+00
+156 42 2.83333333333333e+00
+156 222 5.66666666666667e+00
+156 162 -7.08333333333333e-01
+156 227 -2.08333333333333e+00
+156 160 4.16666666666667e+00
+156 226 2.08333333333333e+00
+156 159 -4.86111111111111e+00
+156 225 -3.47222222222222e+00
+156 230 5.80265002714242e-16
+156 155 1.24900090270330e-16
+156 242 -8.33333333333333e+00
+156 221 -2.08333333333333e+00
+156 229 -4.51028103753970e-16
+156 154 -4.16666666666667e+00
+156 241 6.85215773010839e-17
+156 220 -2.08333333333333e+00
+156 228 -1.11111111111111e+01
+156 161 1.11022302462516e-16
+156 153 -4.86111111111111e+00
+156 240 -9.72222222222223e+00
+156 219 -3.47222222222222e+00
+156 308 3.93023287525995e-19
+156 398 4.16666666666667e-02
+156 307 -8.33333333333333e-02
+156 397 -4.16666666666667e-02
+156 306 -9.72222222222222e-02
+156 396 -6.94444444444445e-02
+156 401 -1.19397764244966e-17
+156 302 -1.57209315010398e-18
+156 449 1.66666666666667e-01
+156 392 4.16666666666667e-02
+156 400 5.71916645986104e-18
+156 301 8.33333333333334e-02
+156 448 -4.43845264361253e-19
+156 391 4.16666666666667e-02
+156 399 -2.22222222222222e-01
+156 300 -9.72222222222222e-02
+156 447 -1.94444444444445e-01
+156 390 -6.94444444444445e-02
+157 157 2.83333333333333e+01
+157 167 4.25000000000000e+00
+157 58 -5.66666666666667e+00
+157 166 -4.95833333333333e+00
+157 57 1.04164723721545e-16
+157 165 -1.41911899982985e-17
+157 158 9.02056207507940e-16
+157 44 -6.14945919706622e-16
+157 224 -1.27878046354639e-16
+157 164 -4.25000000000000e+00
+157 59 -6.04051381939037e-16
+157 43 -5.66666666666667e+00
+157 223 5.66666666666667e+00
+157 163 -4.95833333333333e+00
+157 156 0.00000000000000e+00
+157 42 1.68593437821496e-16
+157 222 0.00000000000000e+00
+157 162 -2.32967941812823e-17
+157 227 2.08333333333333e+00
+157 160 -4.86111111111111e+00
+157 226 -3.47222222222222e+00
+157 159 4.16666666666667e+00
+157 225 2.08333333333333e+00
+157 230 8.88178419700125e-16
+157 155 1.38777878078145e-17
+157 242 -1.88759598229726e-16
+157 221 -2.08333333333333e+00
+157 229 5.55555555555555e+00
+157 161 -4.05925293378573e-16
+157 154 -4.86111111111111e+00
+157 241 -1.38888888888889e+00
+157 220 -3.47222222222222e+00
+157 228 -2.21177243187043e-16
+157 153 -4.16666666666667e+00
+157 240 1.11672823766007e-16
+157 219 -2.08333333333333e+00
+157 308 8.18572640226556e-18
+157 398 4.16666666666667e-02
+157 307 -9.72222222222222e-02
+157 397 -6.94444444444444e-02
+157 306 -8.33333333333334e-02
+157 396 -4.16666666666667e-02
+157 401 -2.08166817117217e-17
+157 302 1.35525271560688e-17
+157 449 -2.26056152963228e-17
+157 392 -4.16666666666666e-02
+157 400 1.11111111111111e-01
+157 301 -9.72222222222222e-02
+157 448 -2.77777777777778e-02
+157 391 -6.94444444444444e-02
+157 399 1.08420217248550e-18
+157 300 8.33333333333333e-02
+157 447 -8.67361737988404e-19
+157 390 4.16666666666667e-02
+158 158 2.83333333333333e+01
+158 167 -4.95833333333333e+00
+158 58 -5.02175341240974e-16
+158 166 4.25000000000000e+00
+158 57 2.04166666666667e+00
+158 165 -4.74067399919287e-17
+158 59 2.83333333333333e+00
+158 44 2.83333333333333e+00
+158 224 -1.13333333333333e+01
+158 164 -4.95833333333333e+00
+158 157 9.02056207507940e-16
+158 43 -6.68183634507449e-16
+158 223 -3.98617093109663e-16
+158 163 -4.25000000000000e+00
+158 156 8.16666666666667e+00
+158 42 2.04166666666667e+00
+158 222 -4.01432630626336e-16
+158 162 -4.74202925190848e-17
+158 227 -3.47222222222222e+00
+158 160 -4.44089209850063e-16
+158 226 2.08333333333333e+00
+158 159 9.88792381306780e-17
+158 225 -2.08333333333333e+00
+158 230 5.55555555555555e+00
+158 161 -6.94444444444445e-01
+158 155 -6.94444444444445e-01
+158 242 -9.72222222222222e+00
+158 221 -3.47222222222222e+00
+158 229 1.33226762955019e-15
+158 154 5.20417042793042e-17
+158 241 -1.43982048506075e-16
+158 220 -2.08333333333333e+00
+158 228 6.14851052016530e-16
+158 153 1.96023752785379e-16
+158 240 -8.33333333333333e+00
+158 219 -2.08333333333333e+00
+158 308 -1.38888888888889e-02
+158 398 -6.94444444444445e-02
+158 307 7.26415455565288e-18
+158 397 4.16666666666667e-02
+158 306 1.08420217248550e-19
+158 396 4.16666666666667e-02
+158 401 1.11111111111111e-01
+158 302 -1.38888888888889e-02
+158 449 -1.94444444444444e-01
+158 392 -6.94444444444445e-02
+158 400 -2.77555756156289e-17
+158 301 1.36609473733174e-17
+158 448 -2.36762649416522e-17
+158 391 -4.16666666666666e-02
+158 399 -1.12214924852250e-17
+158 300 -8.67361737988404e-19
+158 447 1.66666666666667e-01
+158 390 4.16666666666667e-02
+159 159 2.77777777777778e+01
+159 134 2.70616862252382e-16
+159 143 -4.16666666666667e+00
+159 209 -2.08333333333333e+00
+159 55 -4.99600361081320e-16
+159 133 -4.16666666666667e+00
+159 142 -8.32667268468867e-17
+159 208 -2.08333333333333e+00
+159 54 -5.55555555555555e+00
+159 132 -4.86111111111111e+00
+159 141 -4.86111111111111e+00
+159 207 -3.47222222222222e+00
+159 161 0.00000000000000e+00
+159 59 -9.71445146547012e-17
+159 158 1.26634813746307e-16
+159 230 0.00000000000000e+00
+159 227 -6.74807432154978e-16
+159 167 4.16666666666667e+00
+159 224 2.08333333333333e+00
+159 242 -1.23707467880596e-16
+159 160 8.88178419700125e-16
+159 58 -1.52655665885959e-16
+159 157 4.16666666666667e+00
+159 229 3.10515502199848e-16
+159 226 8.88178419700125e-16
+159 166 5.72458747072346e-17
+159 223 2.08333333333333e+00
+159 241 5.58364118830035e-17
+159 56 4.99600361081320e-16
+159 57 -5.55555555555556e+00
+159 156 -4.86111111111111e+00
+159 228 5.55555555555555e+00
+159 225 5.55555555555556e+00
+159 165 -4.86111111111111e+00
+159 222 -3.47222222222222e+00
+159 240 -1.38888888888889e+00
+160 160 2.77777777777778e+01
+160 134 -2.08166817117217e-16
+160 143 1.30104260698261e-17
+160 209 -2.08333333333333e+00
+160 55 2.77777777777778e+00
+160 133 -4.86111111111111e+00
+160 142 -6.94444444444443e-01
+160 208 -3.47222222222222e+00
+160 54 -4.64905891561784e-16
+160 132 -4.16666666666667e+00
+160 141 -1.05818132034585e-16
+160 207 -2.08333333333333e+00
+160 161 8.33333333333333e+00
+160 59 2.08333333333333e+00
+160 158 -4.99600361081320e-16
+160 230 7.06899816460549e-16
+160 227 -1.26678181833206e-15
+160 167 -1.83013326715553e-16
+160 224 -2.08333333333333e+00
+160 242 -8.33333333333333e+00
+160 56 2.08333333333333e+00
+160 58 2.77777777777778e+00
+160 157 -4.86111111111111e+00
+160 229 -1.11111111111111e+01
+160 226 5.55555555555556e+00
+160 166 -6.94444444444445e-01
+160 223 -3.47222222222222e+00
+160 241 -9.72222222222223e+00
+160 159 8.88178419700125e-16
+160 57 -2.22044604925031e-16
+160 156 4.16666666666667e+00
+160 228 4.85722573273506e-16
+160 225 8.88178419700125e-16
+160 165 4.85722573273506e-17
+160 222 2.08333333333333e+00
+160 240 1.47451495458029e-17
+161 161 2.77777777777778e+01
+161 134 -6.94444444444444e-01
+161 143 -4.86111111111111e+00
+161 209 -3.47222222222222e+00
+161 55 2.08333333333333e+00
+161 133 -2.22044604925031e-16
+161 142 8.32667268468867e-17
+161 208 -2.08333333333333e+00
+161 54 6.59194920871187e-16
+161 132 2.64545330086463e-16
+161 141 -4.16666666666667e+00
+161 207 -2.08333333333333e+00
+161 56 2.77777777777778e+00
+161 59 2.77777777777778e+00
+161 158 -6.94444444444445e-01
+161 230 5.55555555555556e+00
+161 227 -1.11111111111111e+01
+161 167 -4.86111111111111e+00
+161 224 -3.47222222222222e+00
+161 242 -9.72222222222222e+00
+161 160 8.33333333333333e+00
+161 58 2.08333333333333e+00
+161 157 -4.05057931640584e-16
+161 229 6.76108474761961e-16
+161 226 -1.62370117351429e-15
+161 166 -2.22044604925031e-16
+161 223 -2.08333333333333e+00
+161 241 -8.33333333333333e+00
+161 159 0.00000000000000e+00
+161 57 -1.11022302462516e-16
+161 156 1.11022302462516e-16
+161 228 0.00000000000000e+00
+161 225 -5.13478148889135e-16
+161 165 4.16666666666667e+00
+161 222 2.08333333333333e+00
+161 240 -9.02056207507940e-17
+162 162 2.83333333333333e+01
+162 44 -8.04701628682319e-16
+162 157 -2.15620707053055e-17
+162 43 -2.04166666666667e+00
+162 156 -7.08333333333333e-01
+162 42 2.83333333333334e+00
+162 224 1.33226762955019e-15
+162 164 3.58046925441613e-15
+162 149 -6.95380168377890e-17
+162 14 -6.01952434295741e-16
+162 223 1.18665927778538e-16
+162 163 -8.16666666666667e+00
+162 148 -2.15620707053055e-17
+162 13 -2.04166666666667e+00
+162 222 5.66666666666667e+00
+162 158 8.09085871217308e-18
+162 147 -7.08333333333333e-01
+162 12 2.83333333333334e+00
+162 155 4.16666666666667e+00
+162 229 2.08333333333333e+00
+162 154 6.07153216591882e-18
+162 228 -3.47222222222222e+00
+162 153 -4.86111111111112e+00
+162 242 2.45463371850718e-16
+162 221 1.38951350425742e-15
+162 218 -2.08333333333333e+00
+162 146 -4.16666666666667e+00
+162 241 8.33333333333333e+00
+162 220 -3.16587034365767e-16
+162 217 2.08333333333333e+00
+162 145 6.07153216591882e-18
+162 240 -9.72222222222222e+00
+162 230 2.08333333333333e+00
+162 219 -1.11111111111111e+01
+162 216 -3.47222222222222e+00
+162 144 -4.86111111111112e+00
+162 401 -4.16666666666667e-02
+162 302 -8.33333333333333e-02
+162 400 -4.16666666666667e-02
+162 301 1.03168612975574e-18
+162 399 -6.94444444444445e-02
+162 300 -9.72222222222222e-02
+162 449 -2.73252828784237e-18
+162 392 4.59907126623563e-17
+162 389 4.16666666666667e-02
+162 293 8.33333333333334e-02
+162 448 -1.66666666666667e-01
+162 391 3.88597540376592e-18
+162 388 -4.16666666666667e-02
+162 292 2.87991202066462e-19
+162 447 -1.94444444444444e-01
+162 390 -2.22222222222222e-01
+162 387 -6.94444444444445e-02
+162 291 -9.72222222222223e-02
+163 163 2.83333333333333e+01
+163 44 2.26630441301466e-16
+163 157 -4.95833333333333e+00
+163 43 2.83333333333333e+00
+163 156 -1.59089728153303e-17
+163 42 -2.04166666666667e+00
+163 224 -6.70060659518565e-16
+163 164 -8.60422844084496e-16
+163 149 4.25000000000000e+00
+163 14 -6.77708943515798e-17
+163 223 -1.13333333333333e+01
+163 158 -4.25000000000000e+00
+163 148 -4.95833333333333e+00
+163 13 2.83333333333333e+00
+163 222 2.81678477268813e-16
+163 162 -8.16666666666667e+00
+163 147 -1.50568576703924e-17
+163 12 -2.04166666666667e+00
+163 155 1.54390389361936e-16
+163 229 -3.47222222222222e+00
+163 154 -6.94444444444446e-01
+163 228 2.08333333333333e+00
+163 153 3.27429056090622e-17
+163 242 -5.49798921667399e-16
+163 221 4.44089209850063e-16
+163 218 2.08333333333333e+00
+163 146 -6.63531729561129e-17
+163 241 -9.72222222222222e+00
+163 230 -2.08333333333333e+00
+163 220 5.55555555555555e+00
+163 217 -3.47222222222222e+00
+163 145 -6.94444444444445e-01
+163 240 8.33333333333333e+00
+163 219 -2.83857681283861e-16
+163 216 2.08333333333333e+00
+163 144 3.96817995129695e-17
+163 401 -4.16666666666667e-02
+163 302 -7.99599102208060e-18
+163 400 -6.94444444444444e-02
+163 301 -1.38888888888889e-02
+163 399 -4.16666666666667e-02
+163 300 8.53809210832335e-19
+163 449 1.58191873229213e-17
+163 392 -2.08166817117217e-17
+163 389 4.16666666666667e-02
+163 293 -9.01243055878576e-18
+163 448 -1.94444444444444e-01
+163 391 1.11111111111111e-01
+163 388 -6.94444444444444e-02
+163 292 -1.38888888888889e-02
+163 447 -1.66666666666667e-01
+163 390 1.47722546001150e-18
+163 387 -4.16666666666667e-02
+163 291 5.42101086242752e-19
+164 164 2.83333333333333e+01
+164 44 -5.66666666666666e+00
+164 157 -4.25000000000000e+00
+164 43 -6.77708943515798e-17
+164 156 -1.57463424894574e-17
+164 42 -3.83377276322663e-16
+164 224 5.66666666666667e+00
+164 158 -4.95833333333333e+00
+164 149 -4.95833333333333e+00
+164 14 -5.66666666666666e+00
+164 223 -7.13372842243466e-16
+164 163 -8.60422844084496e-16
+164 148 4.25000000000000e+00
+164 13 1.71171806112938e-16
+164 222 1.33226762955019e-15
+164 162 3.58046925441613e-15
+164 147 -4.74067399919287e-17
+164 12 -8.05514780311684e-16
+164 155 -4.86111111111111e+00
+164 229 -2.08333333333333e+00
+164 154 3.31765864780564e-17
+164 228 2.08333333333333e+00
+164 153 4.16666666666667e+00
+164 242 -1.38888888888889e+00
+164 230 -3.47222222222222e+00
+164 221 5.55555555555555e+00
+164 218 -3.47222222222222e+00
+164 146 -4.86111111111111e+00
+164 241 -5.25621213220973e-16
+164 220 8.88178419700125e-16
+164 217 2.08333333333333e+00
+164 145 -1.14491749414469e-16
+164 240 3.60605642568679e-16
+164 219 1.45314261925517e-15
+164 216 -2.08333333333333e+00
+164 144 -4.16666666666667e+00
+164 401 -6.94444444444444e-02
+164 302 -9.72222222222222e-02
+164 400 -4.16666666666667e-02
+164 301 -7.59788553687107e-18
+164 399 -4.16666666666667e-02
+164 300 -8.33333333333333e-02
+164 449 -2.77777777777778e-02
+164 392 1.11111111111111e-01
+164 389 -6.94444444444445e-02
+164 293 -9.72222222222223e-02
+164 448 1.29426634340457e-17
+164 391 -2.77555756156289e-17
+164 388 4.16666666666667e-02
+164 292 -9.14795583034644e-18
+164 447 -1.04354459101730e-18
+164 390 4.90669245685471e-17
+164 387 4.16666666666667e-02
+164 291 8.33333333333334e-02
+165 165 2.83333333333333e+01
+165 158 -4.74202925190848e-17
+165 58 2.04166666666667e+00
+165 157 -1.50568576703924e-17
+165 57 2.83333333333333e+00
+165 156 -7.08333333333333e-01
+165 167 -1.69309011255336e-15
+165 224 1.33920652345410e-15
+165 29 1.15847002130076e-16
+165 149 -7.11609319647283e-17
+165 166 8.16666666666667e+00
+165 223 1.74125833516487e-16
+165 28 2.04166666666667e+00
+165 148 -1.58124110593433e-17
+165 59 2.92951427005583e-16
+165 222 5.66666666666667e+00
+165 27 2.83333333333333e+00
+165 147 -7.08333333333333e-01
+165 230 2.08333333333333e+00
+165 160 5.55111512312578e-17
+165 229 -2.08333333333333e+00
+165 159 -4.86111111111111e+00
+165 228 -3.47222222222222e+00
+165 227 -4.85722573273506e-17
+165 242 6.06285854853894e-16
+165 152 -4.16666666666667e+00
+165 218 -2.08333333333333e+00
+165 226 -2.28116137090950e-16
+165 241 -8.33333333333333e+00
+165 151 6.24500451351651e-17
+165 217 -2.08333333333333e+00
+165 225 -1.11111111111111e+01
+165 161 4.16666666666667e+00
+165 240 -9.72222222222222e+00
+165 150 -4.86111111111111e+00
+165 216 -3.47222222222222e+00
+165 308 -8.33333333333334e-02
+165 401 -4.16666666666667e-02
+165 307 -6.77626357803440e-20
+165 400 4.16666666666667e-02
+165 306 -9.72222222222223e-02
+165 399 -6.94444444444445e-02
+165 398 -6.79794762148411e-17
+165 449 -6.20197523979599e-18
+165 299 8.33333333333333e-02
+165 389 4.16666666666667e-02
+165 397 2.71050543121376e-19
+165 448 1.66666666666667e-01
+165 298 -2.98155597433514e-19
+165 388 4.16666666666667e-02
+165 396 -2.22222222222222e-01
+165 447 -1.94444444444444e-01
+165 297 -9.72222222222223e-02
+165 387 -6.94444444444445e-02
+166 166 2.83333333333333e+01
+166 158 4.25000000000000e+00
+166 58 2.83333333333333e+00
+166 157 -4.95833333333333e+00
+166 57 2.04166666666667e+00
+166 156 -2.15485181781494e-17
+166 167 -2.70616862252382e-15
+166 224 -2.08527653152747e-16
+166 29 -1.21691529466131e-16
+166 149 -4.25000000000000e+00
+166 59 -5.69788899222601e-16
+166 223 -1.13333333333333e+01
+166 28 2.83333333333333e+00
+166 148 -4.95833333333333e+00
+166 165 8.16666666666667e+00
+166 222 2.29796650458303e-16
+166 27 2.04166666666667e+00
+166 147 -2.32967941812823e-17
+166 230 2.08333333333333e+00
+166 160 -6.94444444444445e-01
+166 229 -3.47222222222222e+00
+166 159 5.72458747072346e-17
+166 228 -2.08333333333333e+00
+166 227 2.22044604925031e-15
+166 242 3.70363462121048e-16
+166 152 -1.22298005056365e-16
+166 218 -2.08333333333333e+00
+166 226 5.55555555555555e+00
+166 161 -2.22044604925031e-16
+166 241 -9.72222222222222e+00
+166 151 -6.94444444444445e-01
+166 217 -3.47222222222222e+00
+166 225 -1.09395999203787e-16
+166 240 -8.33333333333333e+00
+166 150 7.11236625150491e-17
+166 216 -2.08333333333333e+00
+166 308 -1.26851654180804e-17
+166 401 4.16666666666667e-02
+166 307 -1.38888888888889e-02
+166 400 -6.94444444444444e-02
+166 306 -3.25260651745651e-19
+166 399 4.16666666666667e-02
+166 398 -4.16333634234434e-17
+166 449 3.01272678679410e-17
+166 299 -1.36067372646931e-17
+166 389 -4.16666666666666e-02
+166 397 1.11111111111111e-01
+166 448 -1.94444444444444e-01
+166 298 -1.38888888888889e-02
+166 388 -6.94444444444444e-02
+166 396 -8.67361737988404e-19
+166 447 1.66666666666667e-01
+166 297 -5.42101086242752e-19
+166 387 4.16666666666667e-02
+167 167 2.83333333333333e+01
+167 158 -4.95833333333333e+00
+167 58 -1.70316302836211e-16
+167 157 4.25000000000000e+00
+167 57 1.15860554657232e-16
+167 156 4.23499532968205e-17
+167 59 -5.66666666666667e+00
+167 224 5.66666666666667e+00
+167 29 -5.66666666666667e+00
+167 149 -4.95833333333333e+00
+167 166 -2.70616862252382e-15
+167 223 -3.74236096755895e-16
+167 28 -5.69788899222601e-16
+167 148 -4.25000000000000e+00
+167 165 -1.69309011255336e-15
+167 222 1.33920652345410e-15
+167 27 4.04082149685348e-16
+167 147 -1.58442594981600e-16
+167 230 -3.47222222222222e+00
+167 160 -1.83013326715553e-16
+167 229 2.08333333333333e+00
+167 159 4.16666666666667e+00
+167 228 2.08333333333333e+00
+167 227 5.55555555555555e+00
+167 161 -4.86111111111111e+00
+167 242 -1.38888888888889e+00
+167 152 -4.86111111111111e+00
+167 218 -3.47222222222222e+00
+167 226 2.22044604925031e-15
+167 241 3.95842213174458e-16
+167 151 -4.85722573273506e-17
+167 217 -2.08333333333333e+00
+167 225 -1.65666091955785e-16
+167 240 5.34186410383608e-16
+167 150 -4.16666666666667e+00
+167 216 -2.08333333333333e+00
+167 308 -9.72222222222223e-02
+167 401 -6.94444444444444e-02
+167 307 -1.35389746289127e-17
+167 400 4.16666666666667e-02
+167 306 -8.33333333333334e-02
+167 399 -4.16666666666667e-02
+167 398 1.11111111111111e-01
+167 449 -2.77777777777778e-02
+167 299 -9.72222222222222e-02
+167 389 -6.94444444444445e-02
+167 397 -4.16333634234434e-17
+167 448 3.11877531179033e-17
+167 298 -1.29020058525775e-17
+167 388 -4.16666666666666e-02
+167 396 -6.70036942596042e-17
+167 447 -4.94667241196511e-18
+167 297 8.33333333333333e-02
+167 387 4.16666666666667e-02
+168 168 5.55555555555556e+01
+168 17 0.00000000000000e+00
+168 94 0.00000000000000e+00
+168 16 0.00000000000000e+00
+168 93 0.00000000000000e+00
+168 15 0.00000000000000e+00
+168 179 -7.45931094670027e-17
+168 92 -2.08333333333333e+00
+168 68 4.44089209850063e-16
+168 20 9.77950359581925e-17
+168 178 3.38271077815477e-17
+168 91 -2.08333333333333e+00
+168 67 3.48245737802344e-16
+168 19 -4.16666666666667e+00
+168 177 -1.38888888888889e+00
+168 90 -3.47222222222222e+00
+168 66 5.55555555555556e+00
+168 18 -4.86111111111111e+00
+168 176 -8.33333333333333e+00
+168 89 -2.08333333333333e+00
+168 65 -1.54837622758086e-16
+168 5 -2.81892564846231e-18
+168 175 -6.68952740423556e-17
+168 88 2.08333333333333e+00
+168 64 -4.22947267486595e-16
+168 4 4.16666666666666e+00
+168 174 -9.72222222222223e+00
+168 87 -3.47222222222222e+00
+168 63 -1.11111111111111e+01
+168 3 -4.86111111111111e+00
+168 182 0.00000000000000e+00
+168 233 5.58364118830035e-16
+168 173 3.72965547335014e-17
+168 86 0.00000000000000e+00
+168 71 0.00000000000000e+00
+168 170 1.77635683940025e-15
+168 62 4.44089209850063e-16
+168 2 0.00000000000000e+00
+168 181 0.00000000000000e+00
+168 232 8.88178419700125e-16
+168 172 7.84962372879505e-17
+168 85 0.00000000000000e+00
+168 70 0.00000000000000e+00
+168 169 -1.77635683940025e-15
+168 61 4.10004604052550e-16
+168 1 0.00000000000000e+00
+168 180 0.00000000000000e+00
+168 231 1.11111111111111e+01
+168 171 -1.38888888888889e+00
+168 84 0.00000000000000e+00
+168 69 0.00000000000000e+00
+168 95 0.00000000000000e+00
+168 60 5.55555555555556e+00
+168 0 0.00000000000000e+00
+169 169 5.55555555555556e+01
+169 17 0.00000000000000e+00
+169 94 0.00000000000000e+00
+169 16 0.00000000000000e+00
+169 93 0.00000000000000e+00
+169 15 0.00000000000000e+00
+169 179 -8.33333333333333e+00
+169 92 -2.08333333333333e+00
+169 68 3.91939085353510e-17
+169 20 1.02782365951626e-16
+169 178 -9.72222222222223e+00
+169 91 -3.47222222222222e+00
+169 67 -1.11111111111111e+01
+169 19 -4.86111111111111e+00
+169 177 7.68699340292223e-17
+169 90 -2.08333333333333e+00
+169 66 3.00717025066011e-16
+169 18 -4.16666666666667e+00
+169 176 -3.23525928269675e-16
+169 89 2.08333333333333e+00
+169 65 8.88178419700125e-16
+169 5 1.56992474575901e-16
+169 175 -1.38888888888889e+00
+169 88 -3.47222222222222e+00
+169 64 5.55555555555556e+00
+169 4 -4.86111111111111e+00
+169 174 -6.33174068731535e-17
+169 87 2.08333333333333e+00
+169 63 -2.59449579875781e-16
+169 3 4.16666666666666e+00
+169 182 0.00000000000000e+00
+169 233 1.95047970830142e-16
+169 173 8.33333333333333e+00
+169 86 0.00000000000000e+00
+169 71 0.00000000000000e+00
+169 170 -8.88178419700125e-16
+169 62 -1.81603863891322e-16
+169 2 0.00000000000000e+00
+169 181 0.00000000000000e+00
+169 232 1.11111111111111e+01
+169 172 -9.72222222222223e+00
+169 85 0.00000000000000e+00
+169 70 0.00000000000000e+00
+169 95 0.00000000000000e+00
+169 61 -1.11111111111111e+01
+169 1 0.00000000000000e+00
+169 180 0.00000000000000e+00
+169 231 8.88178419700125e-16
+169 171 1.45716771982052e-16
+169 84 0.00000000000000e+00
+169 69 0.00000000000000e+00
+169 168 -1.77635683940025e-15
+169 60 3.48245737802344e-16
+169 0 0.00000000000000e+00
+170 170 5.55555555555556e+01
+170 17 0.00000000000000e+00
+170 94 0.00000000000000e+00
+170 16 0.00000000000000e+00
+170 93 0.00000000000000e+00
+170 15 0.00000000000000e+00
+170 179 -9.72222222222222e+00
+170 92 -3.47222222222222e+00
+170 68 5.55555555555556e+00
+170 20 -6.94444444444444e-01
+170 178 -8.33333333333333e+00
+170 91 -2.08333333333333e+00
+170 67 4.04407410337093e-17
+170 19 1.20563281580388e-16
+170 177 1.75966012594397e-16
+170 90 -2.08333333333333e+00
+170 66 4.44089209850063e-16
+170 18 1.41379963292110e-16
+170 176 -9.72222222222222e+00
+170 89 -3.47222222222222e+00
+170 65 5.55555555555556e+00
+170 5 -6.94444444444443e-01
+170 175 -3.83915989277117e-16
+170 88 2.08333333333333e+00
+170 64 8.88178419700125e-16
+170 4 1.95590071916385e-16
+170 174 -8.33333333333333e+00
+170 87 -2.08333333333333e+00
+170 63 -2.53378047709862e-16
+170 3 -9.36750677027476e-17
+170 182 0.00000000000000e+00
+170 233 -2.22222222222222e+01
+170 173 -9.72222222222222e+00
+170 86 0.00000000000000e+00
+170 71 0.00000000000000e+00
+170 95 0.00000000000000e+00
+170 62 5.55555555555556e+00
+170 2 0.00000000000000e+00
+170 181 0.00000000000000e+00
+170 232 8.84573447476611e-17
+170 172 8.33333333333333e+00
+170 85 0.00000000000000e+00
+170 70 0.00000000000000e+00
+170 169 -8.88178419700125e-16
+170 61 -7.18419464543207e-17
+170 1 0.00000000000000e+00
+170 180 0.00000000000000e+00
+170 231 1.41488383509358e-16
+170 171 1.76833374332386e-16
+170 84 0.00000000000000e+00
+170 69 0.00000000000000e+00
+170 168 1.77635683940025e-15
+170 60 4.44089209850063e-16
+170 0 0.00000000000000e+00
+171 171 5.55555555555556e+01
+171 35 -4.16666666666667e+00
+171 76 -2.08333333333333e+00
+171 34 -3.30681662608079e-17
+171 75 -3.47222222222222e+00
+171 33 -4.86111111111112e+00
+171 83 0.00000000000000e+00
+171 185 3.64291929955129e-17
+171 74 -3.83807569059869e-17
+171 32 0.00000000000000e+00
+171 82 0.00000000000000e+00
+171 184 3.38271077815477e-17
+171 73 0.00000000000000e+00
+171 31 0.00000000000000e+00
+171 81 0.00000000000000e+00
+171 183 -1.38888888888889e+00
+171 72 5.55555555555556e+00
+171 30 0.00000000000000e+00
+171 176 -5.31259064517897e-17
+171 89 2.48146772227620e-17
+171 65 2.08333333333333e+00
+171 5 4.16666666666667e+00
+171 175 -8.33333333333333e+00
+171 88 -4.22513586617601e-16
+171 64 -2.08333333333333e+00
+171 4 -3.39355279987963e-17
+171 174 -9.72222222222222e+00
+171 87 -1.11111111111111e+01
+171 63 -3.47222222222222e+00
+171 3 -4.86111111111112e+00
+171 182 0.00000000000000e+00
+171 233 1.33226762955019e-15
+171 173 1.77635683940025e-15
+171 86 0.00000000000000e+00
+171 71 0.00000000000000e+00
+171 170 1.77700736070374e-16
+171 62 4.31078783780237e-16
+171 2 0.00000000000000e+00
+171 181 0.00000000000000e+00
+171 232 3.75892893200724e-16
+171 172 0.00000000000000e+00
+171 85 0.00000000000000e+00
+171 70 0.00000000000000e+00
+171 169 1.45716771982052e-16
+171 61 -4.44089209850063e-16
+171 1 0.00000000000000e+00
+171 180 0.00000000000000e+00
+171 231 1.11111111111111e+01
+171 77 -2.08333333333333e+00
+171 84 0.00000000000000e+00
+171 69 0.00000000000000e+00
+171 168 -1.38888888888889e+00
+171 60 5.55555555555556e+00
+171 0 0.00000000000000e+00
+172 172 5.55555555555556e+01
+172 35 -1.42247325030098e-16
+172 76 -3.47222222222222e+00
+172 34 -6.94444444444445e-01
+172 75 -2.08333333333333e+00
+172 33 1.30104260698261e-17
+172 83 0.00000000000000e+00
+172 185 -8.33333333333333e+00
+172 74 4.91685685222176e-16
+172 32 0.00000000000000e+00
+172 82 0.00000000000000e+00
+172 184 -9.72222222222223e+00
+172 73 5.55555555555556e+00
+172 31 0.00000000000000e+00
+172 81 0.00000000000000e+00
+172 183 7.68699340292223e-17
+172 72 0.00000000000000e+00
+172 30 0.00000000000000e+00
+172 176 1.21755903970122e-16
+172 89 0.00000000000000e+00
+172 65 2.08333333333333e+00
+172 5 1.29995840481012e-16
+172 175 -9.72222222222222e+00
+172 88 5.55555555555556e+00
+172 64 -3.47222222222222e+00
+172 4 -6.94444444444445e-01
+172 174 -8.33333333333333e+00
+172 87 -3.15828092845027e-16
+172 63 -2.08333333333333e+00
+172 3 0.00000000000000e+00
+172 182 0.00000000000000e+00
+172 233 -1.83297929785831e-16
+172 173 0.00000000000000e+00
+172 86 0.00000000000000e+00
+172 71 0.00000000000000e+00
+172 170 8.33333333333333e+00
+172 62 1.39956947940723e-16
+172 2 0.00000000000000e+00
+172 181 0.00000000000000e+00
+172 232 -2.22222222222222e+01
+172 77 -2.08333333333333e+00
+172 85 0.00000000000000e+00
+172 70 0.00000000000000e+00
+172 169 -9.72222222222223e+00
+172 61 5.55555555555556e+00
+172 1 0.00000000000000e+00
+172 180 0.00000000000000e+00
+172 231 4.39589770834248e-16
+172 171 0.00000000000000e+00
+172 84 0.00000000000000e+00
+172 69 0.00000000000000e+00
+172 168 7.76288755499621e-17
+172 60 0.00000000000000e+00
+172 0 0.00000000000000e+00
+173 173 5.55555555555556e+01
+173 35 -4.86111111111111e+00
+173 76 -2.08333333333333e+00
+173 34 -1.35742111995185e-16
+173 75 -2.08333333333333e+00
+173 33 -4.16666666666667e+00
+173 83 0.00000000000000e+00
+173 185 -9.72222222222222e+00
+173 74 -1.11111111111111e+01
+173 32 0.00000000000000e+00
+173 82 0.00000000000000e+00
+173 184 -8.33333333333333e+00
+173 73 3.62015105392910e-16
+173 31 0.00000000000000e+00
+173 81 0.00000000000000e+00
+173 183 1.75966012594397e-16
+173 72 4.31092336307393e-16
+173 30 0.00000000000000e+00
+173 176 -1.38888888888889e+00
+173 89 5.55555555555556e+00
+173 65 -3.47222222222222e+00
+173 5 -4.86111111111111e+00
+173 175 9.19403442267708e-17
+173 88 0.00000000000000e+00
+173 64 2.08333333333333e+00
+173 4 1.50920942409982e-16
+173 174 -1.84748050191530e-16
+173 87 4.06575814682064e-17
+173 63 2.08333333333333e+00
+173 3 4.16666666666667e+00
+173 182 0.00000000000000e+00
+173 233 1.11111111111111e+01
+173 77 -3.47222222222222e+00
+173 86 0.00000000000000e+00
+173 71 0.00000000000000e+00
+173 170 -9.72222222222222e+00
+173 62 -1.11111111111111e+01
+173 2 0.00000000000000e+00
+173 181 0.00000000000000e+00
+173 232 -4.13189447934226e-16
+173 172 0.00000000000000e+00
+173 85 0.00000000000000e+00
+173 70 0.00000000000000e+00
+173 169 8.33333333333333e+00
+173 61 4.36174533990918e-16
+173 1 0.00000000000000e+00
+173 180 0.00000000000000e+00
+173 231 1.33226762955019e-15
+173 171 1.77635683940025e-15
+173 84 0.00000000000000e+00
+173 69 0.00000000000000e+00
+173 168 3.72965547335014e-17
+173 60 -3.83807569059869e-17
+173 0 0.00000000000000e+00
+174 174 1.11111111111111e+02
+174 112 -2.08333333333333e+00
+174 111 -3.47222222222222e+00
+174 200 -8.33333333333333e+00
+174 107 -2.08333333333333e+00
+174 199 9.98550200859150e-17
+174 106 2.08333333333333e+00
+174 198 -9.72222222222223e+00
+174 105 -3.47222222222222e+00
+174 197 1.60136660876109e-16
+174 104 2.08333333333333e+00
+174 196 -8.33333333333333e+00
+174 103 -2.08333333333333e+00
+174 195 -9.72222222222222e+00
+174 102 -3.47222222222222e+00
+174 236 -1.47898728854179e-16
+174 191 -2.02745806254789e-17
+174 188 8.33333333333333e+00
+174 98 2.08333333333333e+00
+174 235 5.61643830401803e-16
+174 190 8.33333333333333e+00
+174 187 9.19403442267708e-17
+174 97 2.08333333333333e+00
+174 234 -2.22222222222222e+01
+174 189 -9.72222222222222e+00
+174 186 -9.72222222222223e+00
+174 96 -3.47222222222222e+00
+174 80 2.08333333333333e+00
+174 50 8.06646416329215e-17
+174 79 2.08333333333333e+00
+174 49 4.77048955893622e-17
+174 78 -3.47222222222222e+00
+174 48 -1.38888888888889e+00
+174 185 8.33333333333333e+00
+174 77 -2.59124319224036e-17
+174 35 7.37257477290143e-17
+174 74 2.08333333333333e+00
+174 184 -1.04950770296597e-16
+174 76 4.44089209850063e-16
+174 34 2.17924636669586e-17
+174 73 -2.08333333333333e+00
+174 183 -9.72222222222223e+00
+174 75 1.11111111111111e+01
+174 33 -1.38888888888889e+00
+174 72 -3.47222222222222e+00
+174 179 -2.12503625807159e-16
+174 92 1.77635683940025e-15
+174 68 -2.08333333333333e+00
+174 20 5.45353692760209e-17
+174 178 8.33333333333333e+00
+174 91 -1.62630325872826e-17
+174 67 2.08333333333333e+00
+174 19 5.46437894932694e-17
+174 177 -9.72222222222222e+00
+174 90 1.11111111111111e+01
+174 66 -3.47222222222222e+00
+174 18 -1.38888888888889e+00
+174 233 -3.95516952522712e-16
+174 176 8.88178419700125e-16
+174 89 1.77635683940025e-15
+174 173 -1.84748050191530e-16
+174 170 -8.33333333333333e+00
+174 65 2.25093923535147e-16
+174 5 2.83735708539457e-16
+174 62 -2.08333333333333e+00
+174 232 -7.65013052905772e-16
+174 175 -8.88178419700125e-16
+174 88 2.08627603040523e-16
+174 172 -8.33333333333333e+00
+174 169 -7.71951946809679e-17
+174 64 4.44089209850063e-16
+174 4 8.27246257606440e-17
+174 61 -2.08333333333333e+00
+174 231 -2.22222222222222e+01
+174 113 -2.08333333333333e+00
+174 87 1.11111111111111e+01
+174 171 -9.72222222222222e+00
+174 168 -9.72222222222223e+00
+174 63 1.11111111111111e+01
+174 3 -1.38888888888889e+00
+174 60 -3.47222222222222e+00
+175 175 1.11111111111111e+02
+175 112 -3.47222222222222e+00
+175 111 -2.08333333333333e+00
+175 200 4.24139889876329e-16
+175 107 2.08333333333333e+00
+175 199 -1.38888888888889e+00
+175 106 -3.47222222222222e+00
+175 198 6.93889390390723e-18
+175 105 2.08333333333333e+00
+175 197 1.45825192199300e-16
+175 104 2.08333333333333e+00
+175 196 -9.72222222222222e+00
+175 103 -3.47222222222222e+00
+175 195 -8.33333333333333e+00
+175 102 -2.08333333333333e+00
+175 236 2.66453525910038e-15
+175 191 2.39391839684799e-16
+175 188 -3.03901868947687e-16
+175 98 -2.08333333333333e+00
+175 235 1.11111111111111e+01
+175 190 -9.72222222222222e+00
+175 187 -1.38888888888889e+00
+175 97 -3.47222222222222e+00
+175 234 4.32705087038965e-16
+175 189 8.33333333333333e+00
+175 186 8.67361737988404e-18
+175 96 2.08333333333333e+00
+175 80 -2.08333333333333e+00
+175 50 -8.33333333333333e+00
+175 79 -3.47222222222222e+00
+175 49 -9.72222222222223e+00
+175 78 2.08333333333333e+00
+175 48 6.88468379528295e-17
+175 185 2.68882138776405e-16
+175 77 3.15502832193282e-17
+175 35 8.33333333333333e+00
+175 74 2.08333333333333e+00
+175 184 -1.38888888888889e+00
+175 76 1.11111111111111e+01
+175 34 -9.72222222222223e+00
+175 73 -3.47222222222222e+00
+175 183 -1.31080042653497e-16
+175 75 4.44089209850063e-16
+175 33 6.85215773010839e-17
+175 72 -2.08333333333333e+00
+175 179 4.02781107078365e-16
+175 92 1.56192875473693e-16
+175 68 2.08333333333333e+00
+175 20 8.33333333333333e+00
+175 178 -9.72222222222222e+00
+175 91 -2.22222222222222e+01
+175 67 -3.47222222222222e+00
+175 19 -9.72222222222223e+00
+175 177 8.33333333333333e+00
+175 90 9.07748268913489e-17
+175 66 2.08333333333333e+00
+175 18 2.16840434497101e-19
+175 233 1.33226762955019e-15
+175 176 -2.66453525910038e-15
+175 89 1.11672823766007e-17
+175 173 9.19403442267708e-17
+175 170 -3.83915989277117e-16
+175 65 2.07597610976662e-16
+175 5 -8.33333333333333e+00
+175 62 -2.08333333333333e+00
+175 232 1.11111111111111e+01
+175 113 -2.08333333333333e+00
+175 88 -2.22222222222222e+01
+175 172 -9.72222222222222e+00
+175 169 -1.38888888888889e+00
+175 64 1.11111111111111e+01
+175 4 -9.72222222222223e+00
+175 61 -3.47222222222222e+00
+175 231 -9.16150835750251e-16
+175 174 -8.88178419700125e-16
+175 87 3.72423446248771e-16
+175 171 -8.33333333333333e+00
+175 168 -1.03324467037869e-16
+175 63 4.44089209850063e-16
+175 3 6.15826833971767e-17
+175 60 -2.08333333333333e+00
+176 176 1.11111111111111e+02
+176 112 -2.08333333333333e+00
+176 111 -2.08333333333333e+00
+176 200 -9.72222222222222e+00
+176 107 -3.47222222222222e+00
+176 199 2.39608680119296e-16
+176 106 2.08333333333333e+00
+176 198 -8.33333333333333e+00
+176 105 -2.08333333333333e+00
+176 197 -1.38888888888889e+00
+176 104 -3.47222222222222e+00
+176 196 1.98625837999344e-16
+176 103 2.08333333333333e+00
+176 195 1.48318857196017e-16
+176 102 2.08333333333333e+00
+176 236 1.11111111111111e+01
+176 191 -1.38888888888889e+00
+176 188 -9.72222222222222e+00
+176 98 -3.47222222222222e+00
+176 235 1.77635683940025e-15
+176 190 2.66280053562440e-16
+176 187 -1.60461921527855e-16
+176 97 -2.08333333333333e+00
+176 234 -3.68845579079569e-16
+176 189 4.33680868994202e-18
+176 186 8.33333333333333e+00
+176 96 2.08333333333333e+00
+176 80 -3.47222222222222e+00
+176 50 -9.72222222222222e+00
+176 79 -2.08333333333333e+00
+176 49 -8.33333333333333e+00
+176 78 2.08333333333333e+00
+176 48 1.71846044338952e-16
+176 185 -9.72222222222222e+00
+176 77 -2.22222222222222e+01
+176 35 -9.72222222222222e+00
+176 74 -3.47222222222222e+00
+176 184 2.89481980053630e-16
+176 76 2.17368983056188e-16
+176 34 8.33333333333333e+00
+176 73 2.08333333333333e+00
+176 183 8.33333333333333e+00
+176 75 -2.82204272970821e-16
+176 33 2.69749500514394e-16
+176 72 2.08333333333333e+00
+176 179 -1.38888888888889e+00
+176 92 1.11111111111111e+01
+176 68 -3.47222222222222e+00
+176 20 -9.72222222222222e+00
+176 178 5.17814957579077e-16
+176 91 3.72206605814274e-16
+176 67 2.08333333333333e+00
+176 19 8.33333333333333e+00
+176 177 -1.78025996722120e-16
+176 90 1.77635683940025e-15
+176 66 -2.08333333333333e+00
+176 18 8.84708972748172e-17
+176 233 1.11111111111111e+01
+176 113 -3.47222222222222e+00
+176 89 1.11111111111111e+01
+176 173 -1.38888888888889e+00
+176 170 -9.72222222222222e+00
+176 65 -2.22222222222222e+01
+176 5 -9.72222222222222e+00
+176 62 -3.47222222222222e+00
+176 232 1.77635683940025e-15
+176 175 -2.66453525910038e-15
+176 88 -1.73526557706305e-16
+176 172 1.21755903970122e-16
+176 169 -2.68014777038417e-16
+176 64 1.14817010066215e-16
+176 4 -8.33333333333333e+00
+176 61 -2.08333333333333e+00
+176 231 -3.54872923581662e-16
+176 174 8.88178419700125e-16
+176 87 1.77635683940025e-15
+176 171 -3.40439482160448e-17
+176 168 -8.33333333333333e+00
+176 63 2.52402265754625e-16
+176 3 8.06646416329215e-17
+176 60 -2.08333333333333e+00
+177 177 5.55555555555556e+01
+177 83 0.00000000000000e+00
+177 46 0.00000000000000e+00
+177 82 0.00000000000000e+00
+177 45 0.00000000000000e+00
+177 81 0.00000000000000e+00
+177 80 5.96744875736022e-16
+177 50 -4.16666666666667e+00
+177 77 -2.08333333333333e+00
+177 185 3.72965547335014e-17
+177 79 8.88178419700125e-16
+177 49 -3.38271077815477e-17
+177 76 2.08333333333333e+00
+177 184 7.92551788086904e-17
+177 78 5.55555555555556e+00
+177 48 -4.86111111111111e+00
+177 75 -3.47222222222222e+00
+177 183 -1.38888888888889e+00
+177 95 0.00000000000000e+00
+177 182 0.00000000000000e+00
+177 17 0.00000000000000e+00
+177 71 0.00000000000000e+00
+177 94 0.00000000000000e+00
+177 181 0.00000000000000e+00
+177 16 0.00000000000000e+00
+177 70 0.00000000000000e+00
+177 93 0.00000000000000e+00
+177 180 0.00000000000000e+00
+177 15 0.00000000000000e+00
+177 69 0.00000000000000e+00
+177 179 -8.88178419700125e-16
+177 92 -2.69749500514394e-16
+177 176 -1.57209315010398e-16
+177 233 1.33226762955019e-15
+177 68 -6.76542155630955e-17
+177 20 4.16666666666667e+00
+177 65 2.08333333333333e+00
+177 170 6.49437101318817e-17
+177 178 -1.77635683940025e-15
+177 91 -4.31404044431982e-16
+177 175 8.33333333333333e+00
+177 232 5.48877349820787e-16
+177 67 8.88178419700125e-16
+177 19 -8.32667268468867e-17
+177 64 2.08333333333333e+00
+177 169 7.67615138119737e-17
+177 47 0.00000000000000e+00
+177 90 -1.11111111111111e+01
+177 174 -9.72222222222222e+00
+177 231 1.11111111111111e+01
+177 66 5.55555555555556e+00
+177 18 -4.86111111111111e+00
+177 63 -3.47222222222222e+00
+177 168 -1.38888888888889e+00
+178 178 5.55555555555556e+01
+178 83 0.00000000000000e+00
+178 46 0.00000000000000e+00
+178 82 0.00000000000000e+00
+178 45 0.00000000000000e+00
+178 81 0.00000000000000e+00
+178 80 -2.41126563160776e-16
+178 50 -1.80411241501588e-16
+178 77 2.08333333333333e+00
+178 185 8.33333333333333e+00
+178 79 5.55555555555556e+00
+178 49 -6.94444444444445e-01
+178 76 -3.47222222222222e+00
+178 184 -9.72222222222223e+00
+178 78 8.88178419700125e-16
+178 48 -7.63278329429795e-17
+178 75 2.08333333333333e+00
+178 183 1.45716771982052e-16
+178 95 0.00000000000000e+00
+178 182 0.00000000000000e+00
+178 17 0.00000000000000e+00
+178 71 0.00000000000000e+00
+178 94 0.00000000000000e+00
+178 181 0.00000000000000e+00
+178 16 0.00000000000000e+00
+178 70 0.00000000000000e+00
+178 93 0.00000000000000e+00
+178 180 0.00000000000000e+00
+178 15 0.00000000000000e+00
+178 69 0.00000000000000e+00
+178 179 -8.88178419700125e-16
+178 92 1.77635683940025e-15
+178 176 4.62303806347819e-16
+178 233 2.52944366840868e-16
+178 68 -5.06322414550731e-17
+178 20 1.04083408558608e-16
+178 65 -2.08333333333333e+00
+178 170 -8.33333333333333e+00
+178 47 0.00000000000000e+00
+178 91 5.55555555555556e+00
+178 175 -9.72222222222222e+00
+178 232 -2.22222222222222e+01
+178 67 5.55555555555556e+00
+178 19 -6.94444444444445e-01
+178 64 -3.47222222222222e+00
+178 169 -9.72222222222223e+00
+178 177 -8.88178419700125e-16
+178 90 -3.39138439553466e-16
+178 174 8.33333333333333e+00
+178 231 3.74158169724748e-16
+178 66 8.88178419700125e-16
+178 18 -9.71445146547012e-17
+178 63 2.08333333333333e+00
+178 168 3.38271077815477e-17
+179 179 5.55555555555556e+01
+179 83 0.00000000000000e+00
+179 46 0.00000000000000e+00
+179 82 0.00000000000000e+00
+179 45 0.00000000000000e+00
+179 81 0.00000000000000e+00
+179 80 -1.11111111111111e+01
+179 50 -4.86111111111111e+00
+179 77 -3.47222222222222e+00
+179 185 -9.72222222222222e+00
+179 79 -4.36933475511658e-17
+179 49 -2.47198095326695e-16
+179 76 2.08333333333333e+00
+179 184 8.33333333333333e+00
+179 78 -6.76542155630955e-17
+179 48 -4.16666666666667e+00
+179 75 -2.08333333333333e+00
+179 183 1.77592315853126e-16
+179 95 0.00000000000000e+00
+179 182 0.00000000000000e+00
+179 17 0.00000000000000e+00
+179 71 0.00000000000000e+00
+179 94 0.00000000000000e+00
+179 181 0.00000000000000e+00
+179 16 0.00000000000000e+00
+179 70 0.00000000000000e+00
+179 93 0.00000000000000e+00
+179 180 0.00000000000000e+00
+179 15 0.00000000000000e+00
+179 69 0.00000000000000e+00
+179 47 0.00000000000000e+00
+179 92 5.55555555555556e+00
+179 176 -1.38888888888889e+00
+179 233 1.11111111111111e+01
+179 68 -1.11111111111111e+01
+179 20 -4.86111111111111e+00
+179 65 -3.47222222222222e+00
+179 170 -9.72222222222222e+00
+179 178 -8.88178419700125e-16
+179 91 1.77635683940025e-15
+179 175 4.07117915768307e-16
+179 232 5.96582245410149e-17
+179 67 -2.41126563160776e-16
+179 19 1.11022302462516e-16
+179 64 -2.08333333333333e+00
+179 169 -8.33333333333333e+00
+179 177 -8.88178419700125e-16
+179 90 -4.92661467177413e-16
+179 174 -2.18575157973078e-16
+179 231 1.33226762955019e-15
+179 66 5.96744875736022e-16
+179 18 4.16666666666667e+00
+179 63 2.08333333333333e+00
+179 168 -7.45931094670027e-17
+180 180 1.00000000000000e+00
+180 80 0.00000000000000e+00
+180 46 0.00000000000000e+00
+180 79 0.00000000000000e+00
+180 45 0.00000000000000e+00
+180 78 0.00000000000000e+00
+180 83 0.00000000000000e+00
+180 185 0.00000000000000e+00
+180 74 0.00000000000000e+00
+180 32 0.00000000000000e+00
+180 82 0.00000000000000e+00
+180 184 0.00000000000000e+00
+180 73 0.00000000000000e+00
+180 31 0.00000000000000e+00
+180 81 0.00000000000000e+00
+180 183 0.00000000000000e+00
+180 72 0.00000000000000e+00
+180 30 0.00000000000000e+00
+180 95 0.00000000000000e+00
+180 179 0.00000000000000e+00
+180 17 0.00000000000000e+00
+180 68 0.00000000000000e+00
+180 94 0.00000000000000e+00
+180 178 0.00000000000000e+00
+180 16 0.00000000000000e+00
+180 67 0.00000000000000e+00
+180 93 0.00000000000000e+00
+180 177 0.00000000000000e+00
+180 15 0.00000000000000e+00
+180 66 0.00000000000000e+00
+180 182 0.00000000000000e+00
+180 233 0.00000000000000e+00
+180 173 0.00000000000000e+00
+180 86 0.00000000000000e+00
+180 71 0.00000000000000e+00
+180 170 0.00000000000000e+00
+180 62 0.00000000000000e+00
+180 2 0.00000000000000e+00
+180 181 0.00000000000000e+00
+180 232 0.00000000000000e+00
+180 172 0.00000000000000e+00
+180 85 0.00000000000000e+00
+180 70 0.00000000000000e+00
+180 169 0.00000000000000e+00
+180 61 0.00000000000000e+00
+180 1 0.00000000000000e+00
+180 47 0.00000000000000e+00
+180 231 0.00000000000000e+00
+180 171 0.00000000000000e+00
+180 84 0.00000000000000e+00
+180 69 0.00000000000000e+00
+180 168 0.00000000000000e+00
+180 60 0.00000000000000e+00
+180 0 0.00000000000000e+00
+181 181 1.00000000000000e+00
+181 80 0.00000000000000e+00
+181 46 0.00000000000000e+00
+181 79 0.00000000000000e+00
+181 45 0.00000000000000e+00
+181 78 0.00000000000000e+00
+181 83 0.00000000000000e+00
+181 185 0.00000000000000e+00
+181 74 0.00000000000000e+00
+181 32 0.00000000000000e+00
+181 82 0.00000000000000e+00
+181 184 0.00000000000000e+00
+181 73 0.00000000000000e+00
+181 31 0.00000000000000e+00
+181 81 0.00000000000000e+00
+181 183 0.00000000000000e+00
+181 72 0.00000000000000e+00
+181 30 0.00000000000000e+00
+181 95 0.00000000000000e+00
+181 179 0.00000000000000e+00
+181 17 0.00000000000000e+00
+181 68 0.00000000000000e+00
+181 94 0.00000000000000e+00
+181 178 0.00000000000000e+00
+181 16 0.00000000000000e+00
+181 67 0.00000000000000e+00
+181 93 0.00000000000000e+00
+181 177 0.00000000000000e+00
+181 15 0.00000000000000e+00
+181 66 0.00000000000000e+00
+181 182 0.00000000000000e+00
+181 233 0.00000000000000e+00
+181 173 0.00000000000000e+00
+181 86 0.00000000000000e+00
+181 71 0.00000000000000e+00
+181 170 0.00000000000000e+00
+181 62 0.00000000000000e+00
+181 2 0.00000000000000e+00
+181 47 0.00000000000000e+00
+181 232 0.00000000000000e+00
+181 172 0.00000000000000e+00
+181 85 0.00000000000000e+00
+181 70 0.00000000000000e+00
+181 169 0.00000000000000e+00
+181 61 0.00000000000000e+00
+181 1 0.00000000000000e+00
+181 180 0.00000000000000e+00
+181 231 0.00000000000000e+00
+181 171 0.00000000000000e+00
+181 84 0.00000000000000e+00
+181 69 0.00000000000000e+00
+181 168 0.00000000000000e+00
+181 60 0.00000000000000e+00
+181 0 0.00000000000000e+00
+182 182 1.00000000000000e+00
+182 80 0.00000000000000e+00
+182 46 0.00000000000000e+00
+182 79 0.00000000000000e+00
+182 45 0.00000000000000e+00
+182 78 0.00000000000000e+00
+182 83 0.00000000000000e+00
+182 185 0.00000000000000e+00
+182 74 0.00000000000000e+00
+182 32 0.00000000000000e+00
+182 82 0.00000000000000e+00
+182 184 0.00000000000000e+00
+182 73 0.00000000000000e+00
+182 31 0.00000000000000e+00
+182 81 0.00000000000000e+00
+182 183 0.00000000000000e+00
+182 72 0.00000000000000e+00
+182 30 0.00000000000000e+00
+182 95 0.00000000000000e+00
+182 179 0.00000000000000e+00
+182 17 0.00000000000000e+00
+182 68 0.00000000000000e+00
+182 94 0.00000000000000e+00
+182 178 0.00000000000000e+00
+182 16 0.00000000000000e+00
+182 67 0.00000000000000e+00
+182 93 0.00000000000000e+00
+182 177 0.00000000000000e+00
+182 15 0.00000000000000e+00
+182 66 0.00000000000000e+00
+182 47 0.00000000000000e+00
+182 233 0.00000000000000e+00
+182 173 0.00000000000000e+00
+182 86 0.00000000000000e+00
+182 71 0.00000000000000e+00
+182 170 0.00000000000000e+00
+182 62 0.00000000000000e+00
+182 2 0.00000000000000e+00
+182 181 0.00000000000000e+00
+182 232 0.00000000000000e+00
+182 172 0.00000000000000e+00
+182 85 0.00000000000000e+00
+182 70 0.00000000000000e+00
+182 169 0.00000000000000e+00
+182 61 0.00000000000000e+00
+182 1 0.00000000000000e+00
+182 180 0.00000000000000e+00
+182 231 0.00000000000000e+00
+182 171 0.00000000000000e+00
+182 84 0.00000000000000e+00
+182 69 0.00000000000000e+00
+182 168 0.00000000000000e+00
+182 60 0.00000000000000e+00
+182 0 0.00000000000000e+00
+183 183 5.55555555555556e+01
+183 95 0.00000000000000e+00
+183 46 0.00000000000000e+00
+183 94 0.00000000000000e+00
+183 45 0.00000000000000e+00
+183 93 0.00000000000000e+00
+183 80 8.88178419700125e-16
+183 50 7.45931094670027e-17
+183 179 1.78459677591114e-16
+183 92 2.08333333333333e+00
+183 79 2.77555756156289e-17
+183 49 -4.16666666666667e+00
+183 178 1.45716771982052e-16
+183 91 -2.08333333333333e+00
+183 78 5.55555555555556e+00
+183 48 -4.86111111111111e+00
+183 177 -1.38888888888889e+00
+183 90 -3.47222222222222e+00
+183 77 -2.01011082778813e-16
+183 35 -1.56125112837913e-17
+183 176 8.33333333333333e+00
+183 89 2.08333333333333e+00
+183 76 -4.28476698566271e-16
+183 34 4.16666666666667e+00
+183 175 -1.31080042653497e-16
+183 88 2.08333333333333e+00
+183 75 -1.11111111111111e+01
+183 33 -4.86111111111111e+00
+183 174 -9.72222222222223e+00
+183 87 -3.47222222222222e+00
+183 83 0.00000000000000e+00
+183 185 -1.77635683940025e-15
+183 74 8.88178419700125e-16
+183 32 0.00000000000000e+00
+183 182 0.00000000000000e+00
+183 233 3.63519435907234e-16
+183 173 1.75966012594397e-16
+183 86 0.00000000000000e+00
+183 82 0.00000000000000e+00
+183 184 0.00000000000000e+00
+183 73 1.38777878078145e-16
+183 31 0.00000000000000e+00
+183 181 0.00000000000000e+00
+183 232 4.44089209850063e-16
+183 172 7.67615138119737e-17
+183 85 0.00000000000000e+00
+183 81 0.00000000000000e+00
+183 47 0.00000000000000e+00
+183 72 5.55555555555556e+00
+183 30 0.00000000000000e+00
+183 180 0.00000000000000e+00
+183 231 1.11111111111111e+01
+183 171 -1.38888888888889e+00
+183 84 0.00000000000000e+00
+184 184 5.55555555555556e+01
+184 95 0.00000000000000e+00
+184 46 0.00000000000000e+00
+184 94 0.00000000000000e+00
+184 45 0.00000000000000e+00
+184 93 0.00000000000000e+00
+184 80 1.32381085260480e-16
+184 50 1.30971622436249e-16
+184 179 8.33333333333333e+00
+184 92 2.08333333333333e+00
+184 79 -1.11111111111111e+01
+184 49 -4.86111111111111e+00
+184 178 -9.72222222222223e+00
+184 91 -3.47222222222222e+00
+184 78 1.38777878078145e-16
+184 48 -4.16666666666667e+00
+184 177 7.83878170707020e-17
+184 90 -2.08333333333333e+00
+184 77 4.44089209850063e-16
+184 35 1.94289029309402e-16
+184 176 2.34838190560360e-16
+184 89 -2.08333333333333e+00
+184 76 5.55555555555556e+00
+184 34 -4.86111111111111e+00
+184 175 -1.38888888888889e+00
+184 88 -3.47222222222222e+00
+184 75 -3.95516952522712e-16
+184 33 4.16666666666667e+00
+184 174 -1.11022302462516e-16
+184 87 2.08333333333333e+00
+184 83 0.00000000000000e+00
+184 185 -8.88178419700125e-16
+184 74 -2.31585584042904e-16
+184 32 0.00000000000000e+00
+184 182 0.00000000000000e+00
+184 233 9.55046588688169e-17
+184 173 -8.33333333333333e+00
+184 86 0.00000000000000e+00
+184 82 0.00000000000000e+00
+184 47 0.00000000000000e+00
+184 73 -1.11111111111111e+01
+184 31 0.00000000000000e+00
+184 181 0.00000000000000e+00
+184 232 1.11111111111111e+01
+184 172 -9.72222222222223e+00
+184 85 0.00000000000000e+00
+184 81 0.00000000000000e+00
+184 183 8.88178419700125e-16
+184 72 2.77555756156289e-17
+184 30 0.00000000000000e+00
+184 180 0.00000000000000e+00
+184 231 8.88178419700125e-16
+184 171 3.38271077815477e-17
+184 84 0.00000000000000e+00
+185 185 5.55555555555556e+01
+185 95 0.00000000000000e+00
+185 46 0.00000000000000e+00
+185 94 0.00000000000000e+00
+185 45 0.00000000000000e+00
+185 93 0.00000000000000e+00
+185 80 5.55555555555556e+00
+185 50 -6.94444444444445e-01
+185 179 -9.72222222222222e+00
+185 92 -3.47222222222222e+00
+185 79 3.23525928269675e-16
+185 49 9.02056207507940e-17
+185 178 8.33333333333333e+00
+185 91 2.08333333333333e+00
+185 78 8.88178419700125e-16
+185 48 6.93889390390723e-18
+185 177 3.72965547335014e-17
+185 90 2.08333333333333e+00
+185 77 5.55555555555556e+00
+185 35 -6.94444444444444e-01
+185 176 -9.72222222222222e+00
+185 89 -3.47222222222222e+00
+185 76 4.44089209850063e-16
+185 34 2.10768902331182e-16
+185 175 2.61943244872498e-16
+185 88 -2.08333333333333e+00
+185 75 -1.99493199737333e-16
+185 33 -1.11022302462516e-16
+185 174 8.33333333333333e+00
+185 87 2.08333333333333e+00
+185 83 0.00000000000000e+00
+185 47 0.00000000000000e+00
+185 74 5.55555555555556e+00
+185 32 0.00000000000000e+00
+185 182 0.00000000000000e+00
+185 233 -2.22222222222222e+01
+185 173 -9.72222222222222e+00
+185 86 0.00000000000000e+00
+185 82 0.00000000000000e+00
+185 184 -8.88178419700125e-16
+185 73 -2.07733136248223e-16
+185 31 0.00000000000000e+00
+185 181 0.00000000000000e+00
+185 232 2.50559122061400e-16
+185 172 -8.33333333333333e+00
+185 85 0.00000000000000e+00
+185 81 0.00000000000000e+00
+185 183 -1.77635683940025e-15
+185 72 8.88178419700125e-16
+185 30 0.00000000000000e+00
+185 180 0.00000000000000e+00
+185 231 5.58364118830035e-16
+185 171 3.64291929955129e-17
+185 84 0.00000000000000e+00
+186 186 5.55555555555556e+01
+186 20 -9.28077059647592e-17
+186 91 2.08333333333333e+00
+186 19 4.16666666666666e+00
+186 90 -3.47222222222222e+00
+186 18 -4.86111111111111e+00
+186 197 8.76035355368288e-17
+186 119 -2.08333333333333e+00
+186 104 4.44089209850063e-16
+186 23 -1.90819582357449e-17
+186 196 -5.11743425413158e-17
+186 118 -2.08333333333333e+00
+186 103 1.86591193884755e-16
+186 22 -4.16666666666667e+00
+186 195 -1.38888888888889e+00
+186 117 -3.47222222222222e+00
+186 102 5.55555555555556e+00
+186 21 -4.86111111111111e+00
+186 194 -8.33333333333333e+00
+186 116 -2.08333333333333e+00
+186 101 -1.53173372423321e-15
+186 8 -1.33573707650214e-16
+186 193 -1.11889664200504e-16
+186 115 2.08333333333333e+00
+186 100 -4.79623936053275e-16
+186 7 4.16666666666666e+00
+186 192 -9.72222222222223e+00
+186 114 -3.47222222222222e+00
+186 99 -1.11111111111111e+01
+186 6 -4.86111111111111e+00
+186 176 8.33333333333333e+00
+186 236 6.80987384538145e-16
+186 191 1.98625837999344e-16
+186 89 2.08333333333333e+00
+186 65 -1.35525271560688e-16
+186 188 3.55271367880050e-15
+186 98 4.44089209850063e-16
+186 5 1.64798730217797e-17
+186 175 7.80625564189563e-18
+186 235 4.44089209850063e-16
+186 190 7.52436307704940e-17
+186 88 -2.08333333333333e+00
+186 64 3.11274443720588e-16
+186 187 -1.77635683940025e-15
+186 97 -3.86111498676400e-17
+186 4 -4.16666666666667e+00
+186 174 -9.72222222222223e+00
+186 234 1.11111111111111e+01
+186 189 -1.38888888888889e+00
+186 87 -3.47222222222222e+00
+186 63 -1.11111111111111e+01
+186 92 2.08333333333333e+00
+186 96 5.55555555555556e+00
+186 3 -4.86111111111111e+00
+187 187 5.55555555555556e+01
+187 20 2.07407875596477e-16
+187 91 -3.47222222222222e+00
+187 19 -4.86111111111111e+00
+187 90 2.08333333333333e+00
+187 18 4.16666666666667e+00
+187 197 -8.33333333333333e+00
+187 119 -2.08333333333333e+00
+187 104 3.51715184754298e-16
+187 23 -4.07660016854550e-16
+187 196 -9.72222222222223e+00
+187 118 -3.47222222222222e+00
+187 103 -1.11111111111111e+01
+187 22 -4.86111111111111e+00
+187 195 4.07660016854550e-17
+187 117 -2.08333333333333e+00
+187 102 1.69000013636178e-17
+187 21 -4.16666666666667e+00
+187 194 1.05818132034585e-16
+187 116 2.08333333333333e+00
+187 101 1.77635683940025e-15
+187 8 4.90059381963448e-16
+187 193 -1.38888888888889e+00
+187 115 -3.47222222222222e+00
+187 100 5.55555555555556e+00
+187 7 -4.86111111111111e+00
+187 192 -2.16840434497101e-17
+187 114 2.08333333333333e+00
+187 99 -4.26850395307543e-16
+187 6 4.16666666666667e+00
+187 176 -1.88217497143484e-16
+187 236 -8.84708972748172e-17
+187 191 8.33333333333333e+00
+187 89 2.08333333333333e+00
+187 65 1.77635683940025e-15
+187 188 -3.55271367880050e-15
+187 98 5.04804531509251e-16
+187 5 1.09287578986539e-16
+187 175 -1.38888888888889e+00
+187 235 1.11111111111111e+01
+187 190 -9.72222222222223e+00
+187 88 -3.47222222222222e+00
+187 64 5.55555555555556e+00
+187 92 -2.08333333333333e+00
+187 97 -1.11111111111111e+01
+187 4 -4.86111111111111e+00
+187 174 6.41847686111419e-17
+187 234 8.88178419700125e-16
+187 189 -9.54097911787244e-18
+187 87 -2.08333333333333e+00
+187 63 3.65511657399176e-16
+187 186 -2.66453525910038e-15
+187 96 7.20994444702860e-17
+187 3 -4.16666666666667e+00
+188 188 5.55555555555556e+01
+188 20 -6.94444444444444e-01
+188 91 -2.08333333333333e+00
+188 19 1.63064006741820e-16
+188 90 2.08333333333333e+00
+188 18 -1.07010754424319e-16
+188 197 -9.72222222222222e+00
+188 119 -3.47222222222222e+00
+188 104 5.55555555555556e+00
+188 23 -6.94444444444444e-01
+188 196 -8.33333333333334e+00
+188 118 -2.08333333333333e+00
+188 103 6.92154666914746e-16
+188 22 -5.08273978461204e-16
+188 195 1.67400815431762e-16
+188 117 -2.08333333333333e+00
+188 102 4.44089209850063e-16
+188 21 6.07153216591882e-18
+188 194 -9.72222222222222e+00
+188 116 -3.47222222222222e+00
+188 101 5.55555555555555e+00
+188 8 -6.94444444444444e-01
+188 193 2.62810606610486e-16
+188 115 2.08333333333333e+00
+188 100 1.33226762955019e-15
+188 7 5.15863393668603e-16
+188 192 -8.33333333333333e+00
+188 114 -2.08333333333333e+00
+188 99 -1.76952636571359e-15
+188 6 -1.24900090270330e-16
+188 176 -9.72222222222222e+00
+188 236 -2.22222222222222e+01
+188 191 -9.72222222222222e+00
+188 89 -3.47222222222222e+00
+188 65 5.55555555555556e+00
+188 92 -3.47222222222222e+00
+188 98 5.55555555555556e+00
+188 5 -6.94444444444443e-01
+188 175 -3.03793448730438e-16
+188 235 1.68051336735253e-16
+188 190 8.33333333333333e+00
+188 88 2.08333333333333e+00
+188 64 1.77635683940025e-15
+188 187 -3.55271367880050e-15
+188 97 1.36609473733174e-16
+188 4 1.25116930704827e-16
+188 174 8.33333333333333e+00
+188 234 4.06779102589405e-16
+188 189 5.71374544899861e-17
+188 87 2.08333333333333e+00
+188 63 -1.00302253482065e-16
+188 186 3.55271367880050e-15
+188 96 4.44089209850063e-16
+188 3 -2.72134745293862e-17
+189 189 5.55555555555556e+01
+189 38 -4.16666666666667e+00
+189 109 -2.08333333333333e+00
+189 37 -2.68882138776405e-17
+189 108 -3.47222222222222e+00
+189 36 -4.86111111111112e+00
+189 77 2.08333333333333e+00
+189 200 1.98625837999344e-16
+189 107 3.96492734477949e-16
+189 35 4.16666666666667e+00
+189 76 2.08333333333333e+00
+189 199 -3.72965547335014e-17
+189 106 -4.44089209850063e-16
+189 34 4.25007251614318e-17
+189 75 -3.47222222222222e+00
+189 198 -1.38888888888889e+00
+189 105 5.55555555555556e+00
+189 33 -4.86111111111111e+00
+189 194 -1.95156391047391e-16
+189 116 -2.01734787728947e-15
+189 101 2.08333333333333e+00
+189 8 4.16666666666666e+00
+189 193 -8.33333333333333e+00
+189 115 -4.62493541728004e-16
+189 100 -2.08333333333333e+00
+189 7 -5.55111512312578e-17
+189 192 -9.72222222222222e+00
+189 114 -1.11111111111111e+01
+189 99 -3.47222222222222e+00
+189 6 -4.86111111111111e+00
+189 176 1.15359111152458e-16
+189 236 1.77635683940025e-15
+189 191 2.66453525910038e-15
+189 89 2.79073639197769e-16
+189 65 -2.08333333333333e+00
+189 188 1.67292395214513e-16
+189 98 4.24898831397069e-16
+189 5 -4.16666666666667e+00
+189 175 8.33333333333333e+00
+189 235 3.60063541482436e-16
+189 190 8.88178419700125e-16
+189 88 4.80409982628327e-16
+189 64 2.08333333333333e+00
+189 187 4.33680868994202e-18
+189 97 0.00000000000000e+00
+189 4 4.16333634234434e-17
+189 174 -9.72222222222222e+00
+189 234 1.11111111111111e+01
+189 110 -2.08333333333333e+00
+189 87 -1.11111111111111e+01
+189 63 -3.47222222222222e+00
+189 186 -1.38888888888889e+00
+189 96 5.55555555555556e+00
+189 3 -4.86111111111111e+00
+190 190 5.55555555555556e+01
+190 38 1.61329283265843e-16
+190 109 -3.47222222222222e+00
+190 37 -6.94444444444446e-01
+190 108 -2.08333333333333e+00
+190 36 6.07153216591882e-18
+190 77 -2.08333333333333e+00
+190 200 -8.33333333333333e+00
+190 107 1.18481613409216e-15
+190 35 -2.16840434497101e-17
+190 76 -3.47222222222222e+00
+190 199 -9.72222222222223e+00
+190 106 5.55555555555556e+00
+190 34 -6.94444444444445e-01
+190 75 2.08333333333333e+00
+190 198 4.07660016854550e-17
+190 105 0.00000000000000e+00
+190 33 1.38777878078145e-17
+190 194 -1.05644659686988e-15
+190 116 4.44089209850063e-16
+190 101 2.08333333333333e+00
+190 8 8.57603918436034e-17
+190 193 -9.72222222222222e+00
+190 115 5.55555555555556e+00
+190 100 -3.47222222222222e+00
+190 7 -6.94444444444444e-01
+190 192 -8.33333333333333e+00
+190 114 -5.42209506460001e-16
+190 99 -2.08333333333333e+00
+190 6 -2.08166817117217e-17
+190 176 2.66280053562440e-16
+190 236 -2.80496654549156e-16
+190 191 -8.88178419700125e-16
+190 89 8.88178419700125e-16
+190 65 2.08333333333333e+00
+190 188 8.33333333333333e+00
+190 98 5.50354575280798e-16
+190 5 2.53594888144359e-16
+190 175 -9.72222222222222e+00
+190 235 -2.22222222222222e+01
+190 110 -2.08333333333333e+00
+190 88 5.55555555555556e+00
+190 64 -3.47222222222222e+00
+190 187 -9.72222222222223e+00
+190 97 5.55555555555556e+00
+190 4 -6.94444444444444e-01
+190 174 8.33333333333333e+00
+190 234 1.51435938441913e-16
+190 189 0.00000000000000e+00
+190 87 2.64247174489030e-16
+190 63 2.08333333333333e+00
+190 186 7.52436307704940e-17
+190 96 0.00000000000000e+00
+190 3 3.20923843055709e-17
+191 191 5.55555555555556e+01
+191 38 -4.86111111111111e+00
+191 109 -2.08333333333333e+00
+191 37 1.68268177169750e-16
+191 108 -2.08333333333333e+00
+191 36 -4.16666666666667e+00
+191 77 -3.47222222222222e+00
+191 200 -9.72222222222222e+00
+191 107 -1.11111111111111e+01
+191 35 -4.86111111111111e+00
+191 76 -2.08333333333333e+00
+191 199 -8.33333333333334e+00
+191 106 5.78110150896427e-16
+191 34 -1.23599047663348e-17
+191 75 2.08333333333333e+00
+191 198 1.67400815431762e-16
+191 105 3.69387680165811e-16
+191 33 4.16666666666667e+00
+191 194 -1.38888888888889e+00
+191 116 5.55555555555556e+00
+191 101 -3.47222222222222e+00
+191 8 -4.86111111111111e+00
+191 193 -1.23685783837146e-15
+191 115 0.00000000000000e+00
+191 100 2.08333333333333e+00
+191 7 2.92300905702092e-16
+191 192 -1.88217497143484e-16
+191 114 -2.13121621045476e-15
+191 99 2.08333333333333e+00
+191 6 4.16666666666667e+00
+191 176 -1.38888888888889e+00
+191 236 1.11111111111111e+01
+191 110 -3.47222222222222e+00
+191 89 5.55555555555556e+00
+191 65 -3.47222222222222e+00
+191 188 -9.72222222222222e+00
+191 98 -1.11111111111111e+01
+191 5 -4.86111111111111e+00
+191 175 1.97758476261356e-16
+191 235 8.67361737988404e-18
+191 190 -8.88178419700125e-16
+191 88 8.88178419700125e-16
+191 64 2.08333333333333e+00
+191 187 8.33333333333333e+00
+191 97 1.12236608895699e-15
+191 4 3.69496100383060e-16
+191 174 -5.52943107967607e-18
+191 234 1.77635683940025e-15
+191 189 2.66453525910038e-15
+191 87 4.01019278548076e-16
+191 63 -2.08333333333333e+00
+191 186 1.36175792864179e-16
+191 96 2.86337793753422e-16
+191 3 -4.16666666666667e+00
+192 192 1.11111111111111e+02
+192 136 -2.08333333333333e+00
+192 135 -3.47222222222222e+00
+192 215 -8.33333333333333e+00
+192 131 -2.08333333333333e+00
+192 214 -2.31477163825655e-16
+192 130 2.08333333333333e+00
+192 213 -9.72222222222223e+00
+192 129 -3.47222222222222e+00
+192 212 -2.26923514701216e-16
+192 128 2.08333333333333e+00
+192 211 -8.33333333333333e+00
+192 127 -2.08333333333333e+00
+192 210 -9.72222222222222e+00
+192 126 -3.47222222222222e+00
+192 239 -2.47267213215191e-15
+192 206 -5.04479270857505e-16
+192 203 8.33333333333333e+00
+192 122 2.08333333333333e+00
+192 238 -4.56313589344837e-16
+192 205 8.33333333333333e+00
+192 202 -2.60967462917261e-16
+192 121 2.08333333333333e+00
+192 237 -2.22222222222222e+01
+192 204 -9.72222222222222e+00
+192 201 -9.72222222222223e+00
+192 120 -3.47222222222222e+00
+192 113 2.08333333333333e+00
+192 53 4.02455846426619e-16
+192 112 2.08333333333333e+00
+192 52 2.40259201422788e-16
+192 111 -3.47222222222222e+00
+192 51 -1.38888888888889e+00
+192 200 8.33333333333333e+00
+192 110 1.29193530873373e-15
+192 38 4.57966997657877e-16
+192 107 2.08333333333333e+00
+192 199 -6.33174068731535e-17
+192 109 8.88178419700125e-16
+192 37 1.45283091113058e-16
+192 106 -2.08333333333333e+00
+192 198 -9.72222222222223e+00
+192 108 1.11111111111111e+01
+192 36 -1.38888888888889e+00
+192 105 -3.47222222222222e+00
+192 197 -3.02709246557953e-16
+192 119 2.22044604925031e-15
+192 104 -2.08333333333333e+00
+192 23 3.33934269125535e-16
+192 196 8.33333333333333e+00
+192 118 7.99815942642557e-16
+192 103 2.08333333333333e+00
+192 22 1.16226472890446e-16
+192 195 -9.72222222222222e+00
+192 117 1.11111111111111e+01
+192 102 -3.47222222222222e+00
+192 21 -1.38888888888889e+00
+192 236 -3.12683906544819e-15
+192 194 7.99360577730113e-15
+192 116 1.77635683940025e-15
+192 191 -1.91686944095437e-16
+192 188 -8.33333333333333e+00
+192 101 1.05885894670366e-15
+192 8 3.33283747822044e-16
+192 98 -2.08333333333333e+00
+192 235 -1.10154940724527e-15
+192 193 0.00000000000000e+00
+192 115 7.43613612526339e-16
+192 190 -8.33333333333333e+00
+192 187 6.07153216591882e-18
+192 100 8.88178419700125e-16
+192 7 1.70761842166467e-16
+192 97 -2.08333333333333e+00
+192 234 -2.22222222222222e+01
+192 137 -2.08333333333333e+00
+192 114 1.11111111111111e+01
+192 189 -9.72222222222222e+00
+192 186 -9.72222222222223e+00
+192 99 1.11111111111111e+01
+192 6 -1.38888888888889e+00
+192 96 -3.47222222222222e+00
+193 193 1.11111111111111e+02
+193 136 -3.47222222222222e+00
+193 135 -2.08333333333333e+00
+193 215 -2.81025203108243e-16
+193 131 2.08333333333333e+00
+193 214 -1.38888888888889e+00
+193 130 -3.47222222222222e+00
+193 213 -1.59594559789866e-16
+193 129 2.08333333333333e+00
+193 212 -8.19656842399041e-17
+193 128 2.08333333333333e+00
+193 211 -9.72222222222222e+00
+193 127 -3.47222222222222e+00
+193 210 -8.33333333333333e+00
+193 126 -2.08333333333333e+00
+193 239 1.77635683940025e-15
+193 206 1.53089346754953e-15
+193 203 1.13949648328227e-16
+193 122 -2.08333333333333e+00
+193 238 1.11111111111111e+01
+193 205 -9.72222222222222e+00
+193 202 -1.38888888888889e+00
+193 121 -3.47222222222222e+00
+193 237 -1.00505541389406e-16
+193 204 8.33333333333333e+00
+193 201 -1.86482773667507e-16
+193 120 2.08333333333333e+00
+193 113 -2.08333333333333e+00
+193 53 -8.33333333333333e+00
+193 112 -3.47222222222222e+00
+193 52 -9.72222222222223e+00
+193 111 2.08333333333333e+00
+193 51 1.56775634141404e-16
+193 200 4.51895465491958e-16
+193 110 5.54460991009087e-16
+193 38 8.33333333333333e+00
+193 107 2.08333333333333e+00
+193 116 9.97791259338410e-16
+193 199 -1.38888888888889e+00
+193 109 1.11111111111111e+01
+193 37 -9.72222222222223e+00
+193 106 -3.47222222222222e+00
+193 198 -1.27393755267047e-16
+193 108 8.88178419700125e-16
+193 36 1.16226472890446e-16
+193 105 -2.08333333333333e+00
+193 197 8.77444818192519e-16
+193 119 1.17824315842147e-15
+193 104 2.08333333333333e+00
+193 23 8.33333333333333e+00
+193 196 -9.72222222222222e+00
+193 118 -2.22222222222222e+01
+193 103 -3.47222222222222e+00
+193 22 -9.72222222222223e+00
+193 195 8.33333333333333e+00
+193 117 5.18099560649354e-16
+193 102 2.08333333333333e+00
+193 21 1.43765208071578e-16
+193 236 3.10862446895044e-15
+193 194 -5.32907051820075e-15
+193 191 -1.21604115665974e-15
+193 188 2.61943244872498e-16
+193 101 2.77623518792069e-16
+193 8 -8.33333333333333e+00
+193 98 -2.08333333333333e+00
+193 235 1.11111111111111e+01
+193 137 -2.08333333333333e+00
+193 115 -2.22222222222222e+01
+193 190 -9.72222222222222e+00
+193 187 -1.38888888888889e+00
+193 100 1.11111111111111e+01
+193 7 -9.72222222222223e+00
+193 97 -3.47222222222222e+00
+193 234 -9.50276099129232e-16
+193 192 0.00000000000000e+00
+193 114 7.99815942642557e-16
+193 189 -8.33333333333333e+00
+193 186 -1.13624387676481e-16
+193 99 8.88178419700125e-16
+193 6 2.27248775352962e-16
+193 96 -2.08333333333333e+00
+194 194 1.11111111111111e+02
+194 136 -2.08333333333333e+00
+194 135 -2.08333333333333e+00
+194 215 -9.72222222222222e+00
+194 131 -3.47222222222222e+00
+194 214 -2.21502503838789e-16
+194 130 2.08333333333333e+00
+194 213 -8.33333333333333e+00
+194 129 -2.08333333333333e+00
+194 212 -1.38888888888889e+00
+194 128 -3.47222222222222e+00
+194 211 -1.47451495458029e-16
+194 127 2.08333333333333e+00
+194 210 -1.99493199737333e-16
+194 126 2.08333333333333e+00
+194 239 1.11111111111111e+01
+194 206 -1.38888888888889e+00
+194 203 -9.72222222222222e+00
+194 122 -3.47222222222222e+00
+194 238 1.33226762955019e-15
+194 205 1.41293227118311e-15
+194 202 1.13624387676481e-16
+194 121 -2.08333333333333e+00
+194 237 -2.57259491487360e-15
+194 204 -4.55364912443912e-16
+194 201 8.33333333333333e+00
+194 120 2.08333333333333e+00
+194 113 -3.47222222222222e+00
+194 53 -9.72222222222222e+00
+194 112 -2.08333333333333e+00
+194 52 -8.33333333333333e+00
+194 111 2.08333333333333e+00
+194 51 1.52764086103208e-16
+194 200 -9.72222222222222e+00
+194 110 -2.22222222222222e+01
+194 38 -9.72222222222222e+00
+194 107 -3.47222222222222e+00
+194 199 3.96167473826203e-16
+194 109 2.98548620721040e-16
+194 37 8.33333333333333e+00
+194 106 2.08333333333333e+00
+194 198 8.33333333333333e+00
+194 108 1.00410673699314e-15
+194 36 1.52764086103208e-16
+194 105 2.08333333333333e+00
+194 197 -1.38888888888889e+00
+194 119 1.11111111111111e+01
+194 104 -3.47222222222222e+00
+194 23 -9.72222222222222e+00
+194 196 8.43942971062717e-16
+194 118 1.47657493870801e-15
+194 103 2.08333333333333e+00
+194 22 8.33333333333333e+00
+194 195 -3.96275894043452e-16
+194 117 2.22044604925031e-15
+194 102 -2.08333333333333e+00
+194 21 4.30211422042248e-16
+194 236 1.11111111111111e+01
+194 137 -3.47222222222222e+00
+194 116 1.11111111111111e+01
+194 191 -1.38888888888889e+00
+194 188 -9.72222222222222e+00
+194 101 -2.22222222222222e+01
+194 8 -9.72222222222222e+00
+194 98 -3.47222222222222e+00
+194 235 3.55271367880050e-15
+194 193 -5.32907051820075e-15
+194 115 6.16084331987732e-16
+194 190 -1.08506953422349e-15
+194 187 8.50014503228635e-17
+194 100 4.50377582450479e-16
+194 7 -8.33333333333333e+00
+194 97 -2.08333333333333e+00
+194 234 -3.15164019014380e-15
+194 192 7.99360577730113e-15
+194 114 1.77635683940025e-15
+194 189 -2.20309881449055e-16
+194 186 -8.33333333333333e+00
+194 99 1.54162706905714e-15
+194 6 5.96744875736022e-16
+194 96 -2.08333333333333e+00
+195 195 5.55555555555556e+01
+195 77 2.08333333333333e+00
+195 49 -4.85722573273506e-17
+195 76 -2.08333333333333e+00
+195 48 -4.86111111111111e+00
+195 75 -3.47222222222222e+00
+195 113 2.84494650060196e-16
+195 53 -4.16666666666667e+00
+195 110 -2.08333333333333e+00
+195 200 1.43114686768087e-16
+195 112 8.88178419700125e-16
+195 52 -8.41340885848751e-17
+195 109 2.08333333333333e+00
+195 199 7.60025722912339e-17
+195 111 5.55555555555556e+00
+195 51 -4.86111111111111e+00
+195 108 -3.47222222222222e+00
+195 198 -1.38888888888889e+00
+195 92 -2.77555756156289e-16
+195 176 2.52402265754625e-16
+195 20 -4.16666666666667e+00
+195 65 -2.08333333333333e+00
+195 91 1.12757025938492e-16
+195 175 -8.33333333333333e+00
+195 19 -3.46944695195361e-17
+195 64 -2.08333333333333e+00
+195 90 -1.11111111111111e+01
+195 174 -9.72222222222222e+00
+195 18 -4.86111111111111e+00
+195 63 -3.47222222222222e+00
+195 197 1.77635683940025e-15
+195 119 -1.07899800205757e-15
+195 194 -3.65159291693118e-16
+195 236 1.77635683940025e-15
+195 104 3.72965547335014e-17
+195 23 4.16666666666667e+00
+195 101 2.08333333333333e+00
+195 188 5.71374544899861e-17
+195 196 -1.77635683940025e-15
+195 118 -5.99021700298241e-16
+195 193 8.33333333333333e+00
+195 235 -2.20364091557679e-17
+195 103 8.88178419700125e-16
+195 22 -4.42354486374086e-17
+195 100 2.08333333333333e+00
+195 187 1.29020058525775e-17
+195 50 4.16666666666667e+00
+195 117 -1.11111111111111e+01
+195 192 -9.72222222222222e+00
+195 234 1.11111111111111e+01
+195 102 5.55555555555556e+00
+195 21 -4.86111111111111e+00
+195 99 -3.47222222222222e+00
+195 186 -1.38888888888889e+00
+196 196 5.55555555555556e+01
+196 77 2.08333333333333e+00
+196 49 -6.94444444444444e-01
+196 76 -3.47222222222222e+00
+196 48 2.94902990916057e-17
+196 75 -2.08333333333333e+00
+196 113 -7.73686670285656e-16
+196 53 -5.55111512312578e-17
+196 110 2.08333333333333e+00
+196 200 8.33333333333333e+00
+196 112 5.55555555555556e+00
+196 52 -6.94444444444445e-01
+196 109 -3.47222222222222e+00
+196 199 -9.72222222222223e+00
+196 111 8.88178419700125e-16
+196 51 -2.77555756156289e-17
+196 108 2.08333333333333e+00
+196 198 -9.54097911787244e-18
+196 92 1.33226762955019e-15
+196 176 1.43982048506075e-16
+196 20 9.71445146547012e-17
+196 65 -2.08333333333333e+00
+196 91 5.55555555555556e+00
+196 175 -9.72222222222222e+00
+196 19 -6.94444444444445e-01
+196 64 -3.47222222222222e+00
+196 90 5.25512793003724e-16
+196 174 -8.33333333333333e+00
+196 18 6.41847686111419e-17
+196 63 -2.08333333333333e+00
+196 197 0.00000000000000e+00
+196 119 3.10862446895044e-15
+196 194 8.43942971062717e-16
+196 236 5.08273978461204e-16
+196 104 -4.54280710271426e-16
+196 23 3.09648140461860e-16
+196 101 -2.08333333333333e+00
+196 188 -8.33333333333334e+00
+196 50 -1.66533453693773e-16
+196 118 5.55555555555556e+00
+196 193 -9.72222222222222e+00
+196 235 -2.22222222222222e+01
+196 103 5.55555555555556e+00
+196 22 -6.94444444444444e-01
+196 100 -3.47222222222222e+00
+196 187 -9.72222222222223e+00
+196 195 -1.77635683940025e-15
+196 117 -5.06539254985228e-16
+196 192 8.33333333333333e+00
+196 234 1.27610595701544e-16
+196 102 8.88178419700125e-16
+196 21 -2.77555756156289e-17
+196 99 2.08333333333333e+00
+196 186 -5.11743425413158e-17
+197 197 5.55555555555556e+01
+197 77 -3.47222222222222e+00
+197 49 -1.79543879763600e-16
+197 76 2.08333333333333e+00
+197 48 4.16666666666667e+00
+197 75 2.08333333333333e+00
+197 113 -1.11111111111111e+01
+197 53 -4.86111111111111e+00
+197 110 -3.47222222222222e+00
+197 200 -9.72222222222222e+00
+197 112 -3.39680540639709e-16
+197 52 9.54097911787244e-17
+197 109 2.08333333333333e+00
+197 199 8.33333333333333e+00
+197 111 2.59341159658533e-16
+197 51 -4.16666666666667e+00
+197 108 -2.08333333333333e+00
+197 198 5.78963960107259e-17
+197 92 5.55555555555556e+00
+197 176 -1.38888888888889e+00
+197 20 -4.86111111111111e+00
+197 65 -3.47222222222222e+00
+197 91 1.77635683940025e-15
+197 175 1.45933612416549e-16
+197 19 1.11022302462516e-16
+197 64 -2.08333333333333e+00
+197 90 -4.02455846426619e-16
+197 174 1.57642995879392e-16
+197 18 -4.16666666666667e+00
+197 63 -2.08333333333333e+00
+197 50 -4.86111111111111e+00
+197 119 5.55555555555556e+00
+197 194 -1.38888888888889e+00
+197 236 1.11111111111111e+01
+197 104 -1.11111111111111e+01
+197 23 -4.86111111111111e+00
+197 101 -3.47222222222222e+00
+197 188 -9.72222222222222e+00
+197 196 -1.77635683940025e-15
+197 118 2.66453525910038e-15
+197 193 9.91936567606988e-16
+197 235 2.85131618836532e-16
+197 103 -8.29197821516914e-16
+197 22 2.98372437868011e-16
+197 100 -2.08333333333333e+00
+197 187 -8.33333333333333e+00
+197 195 1.77635683940025e-15
+197 117 -1.06165076729781e-15
+197 192 -3.19189119579733e-16
+197 234 1.77635683940025e-15
+197 102 2.22044604925031e-16
+197 21 4.16666666666667e+00
+197 99 2.08333333333333e+00
+197 186 -2.34187669256869e-17
+198 198 5.55555555555556e+01
+198 92 -2.08333333333333e+00
+198 49 4.16666666666667e+00
+198 91 2.08333333333333e+00
+198 48 -4.86111111111111e+00
+198 90 -3.47222222222222e+00
+198 113 1.33226762955019e-15
+198 53 -8.67361737988404e-18
+198 197 1.68051336735253e-16
+198 119 2.08333333333333e+00
+198 112 1.73472347597681e-16
+198 52 -4.16666666666667e+00
+198 196 4.33680868994202e-18
+198 118 -2.08333333333333e+00
+198 111 5.55555555555555e+00
+198 51 -4.86111111111111e+00
+198 195 -1.38888888888889e+00
+198 117 -3.47222222222222e+00
+198 110 -1.62001488612784e-15
+198 38 -1.20563281580388e-16
+198 194 8.33333333333333e+00
+198 116 2.08333333333333e+00
+198 109 -5.79397640976254e-16
+198 37 4.16666666666667e+00
+198 193 -1.20563281580388e-16
+198 115 2.08333333333333e+00
+198 108 -1.11111111111111e+01
+198 36 -4.86111111111111e+00
+198 192 -9.72222222222223e+00
+198 114 -3.47222222222222e+00
+198 77 -8.58688120608520e-17
+198 200 0.00000000000000e+00
+198 107 1.33226762955019e-15
+198 35 1.38777878078145e-17
+198 176 -8.33333333333333e+00
+198 236 2.95756800126890e-16
+198 191 1.68159756952502e-16
+198 89 -2.08333333333333e+00
+198 76 2.84494650060196e-16
+198 199 8.88178419700125e-16
+198 106 1.64798730217797e-17
+198 34 -4.16666666666667e+00
+198 175 1.38777878078145e-17
+198 235 8.88178419700125e-16
+198 190 2.67797936603920e-17
+198 88 -2.08333333333333e+00
+198 75 -1.11111111111111e+01
+198 50 -1.24900090270330e-16
+198 105 5.55555555555555e+00
+198 33 -4.86111111111111e+00
+198 174 -9.72222222222223e+00
+198 234 1.11111111111111e+01
+198 189 -1.38888888888889e+00
+198 87 -3.47222222222222e+00
+199 199 5.55555555555556e+01
+199 92 2.08333333333333e+00
+199 49 -4.86111111111111e+00
+199 91 -3.47222222222222e+00
+199 48 4.16666666666667e+00
+199 90 2.08333333333333e+00
+199 113 -1.73255507163184e-16
+199 53 -5.36896915814822e-16
+199 197 8.33333333333333e+00
+199 119 2.08333333333333e+00
+199 112 -1.11111111111111e+01
+199 52 -4.86111111111111e+00
+199 196 -9.72222222222223e+00
+199 118 -3.47222222222222e+00
+199 111 1.34441069388203e-16
+199 51 -4.16666666666667e+00
+199 195 7.60025722912339e-17
+199 117 -2.08333333333333e+00
+199 110 2.22044604925031e-15
+199 38 2.98372437868011e-16
+199 194 3.96167473826203e-16
+199 116 -2.08333333333333e+00
+199 109 5.55555555555556e+00
+199 37 -4.86111111111111e+00
+199 193 -1.38888888888889e+00
+199 115 -3.47222222222222e+00
+199 108 -6.17561557447743e-16
+199 36 4.16666666666667e+00
+199 192 -6.24500451351651e-17
+199 114 2.08333333333333e+00
+199 77 4.44089209850063e-16
+199 200 2.66453525910038e-15
+199 107 -5.51642065360625e-16
+199 35 3.46944695195361e-17
+199 176 3.50630982581812e-16
+199 236 1.02240264865383e-16
+199 191 -8.33333333333334e+00
+199 89 -2.08333333333333e+00
+199 76 5.55555555555556e+00
+199 50 1.74339709335669e-16
+199 106 -1.11111111111111e+01
+199 34 -4.86111111111111e+00
+199 175 -1.38888888888889e+00
+199 235 1.11111111111111e+01
+199 190 -9.72222222222223e+00
+199 88 -3.47222222222222e+00
+199 75 4.26741975090295e-16
+199 198 8.88178419700125e-16
+199 105 5.55111512312578e-17
+199 33 -4.16666666666667e+00
+199 174 9.80118763926896e-17
+199 234 8.88178419700125e-16
+199 189 -5.11743425413158e-17
+199 87 -2.08333333333333e+00
+200 200 5.55555555555556e+01
+200 92 -3.47222222222222e+00
+200 49 1.59594559789866e-16
+200 91 2.08333333333333e+00
+200 48 -6.50521303491303e-17
+200 90 -2.08333333333333e+00
+200 113 5.55555555555556e+00
+200 53 -6.94444444444444e-01
+200 197 -9.72222222222222e+00
+200 119 -3.47222222222222e+00
+200 112 -3.29597460435593e-16
+200 52 -6.10622663543836e-16
+200 196 8.33333333333333e+00
+200 118 2.08333333333333e+00
+200 111 1.33226762955019e-15
+200 51 2.77555756156289e-17
+200 195 1.36175792864179e-16
+200 117 2.08333333333333e+00
+200 110 5.55555555555556e+00
+200 38 -6.94444444444444e-01
+200 194 -9.72222222222222e+00
+200 116 -3.47222222222222e+00
+200 109 1.33226762955019e-15
+200 37 3.09648140461860e-16
+200 193 5.35162192338845e-16
+200 115 -2.08333333333333e+00
+200 108 -1.42334061203897e-15
+200 36 -8.32667268468867e-17
+200 192 8.33333333333333e+00
+200 114 2.08333333333333e+00
+200 77 5.55555555555556e+00
+200 50 -6.94444444444445e-01
+200 107 5.55555555555556e+00
+200 35 -6.94444444444445e-01
+200 176 -9.72222222222222e+00
+200 236 -2.22222222222222e+01
+200 191 -9.72222222222222e+00
+200 89 -3.47222222222222e+00
+200 76 8.88178419700125e-16
+200 199 8.88178419700125e-16
+200 106 -5.16839175623840e-16
+200 34 1.99493199737333e-17
+200 175 5.90673343570103e-16
+200 235 -9.54097911787244e-17
+200 190 -8.33333333333333e+00
+200 88 -2.08333333333333e+00
+200 75 -6.84131570838353e-17
+200 198 0.00000000000000e+00
+200 105 1.33226762955019e-15
+200 33 1.82145964977565e-17
+200 174 -8.33333333333333e+00
+200 234 7.30427003603484e-16
+200 189 8.76035355368288e-17
+200 87 -2.08333333333333e+00
+201 201 5.55555555555556e+01
+201 23 -2.48065457064683e-16
+201 118 2.08333333333333e+00
+201 22 4.16666666666667e+00
+201 117 -3.47222222222222e+00
+201 21 -4.86111111111111e+00
+201 212 1.78676518025611e-16
+201 143 -2.08333333333333e+00
+201 128 8.88178419700125e-16
+201 26 -8.06646416329215e-17
+201 211 3.29597460435593e-17
+201 142 -2.08333333333333e+00
+201 127 -1.66316613259276e-16
+201 25 -4.16666666666667e+00
+201 210 -1.38888888888889e+00
+201 141 -3.47222222222222e+00
+201 126 5.55555555555556e+00
+201 24 -4.86111111111111e+00
+201 209 -8.33333333333333e+00
+201 140 -2.08333333333333e+00
+201 125 -9.30448751899904e-16
+201 11 -1.56992474575901e-16
+201 208 5.73326108810335e-16
+201 139 2.08333333333333e+00
+201 124 1.68887527660783e-15
+201 10 4.16666666666667e+00
+201 207 -9.72222222222222e+00
+201 138 -3.47222222222222e+00
+201 123 -1.11111111111111e+01
+201 9 -4.86111111111111e+00
+201 194 8.33333333333333e+00
+201 239 8.03393809811759e-16
+201 206 2.35055030994857e-16
+201 116 2.08333333333333e+00
+201 101 -1.14155646740999e-15
+201 203 2.66453525910038e-15
+201 122 8.88178419700125e-16
+201 8 -2.41993924898765e-16
+201 193 -2.49800180540660e-16
+201 238 4.44089209850063e-16
+201 205 -5.19332840620557e-17
+201 115 -2.08333333333333e+00
+201 100 -1.41379963292110e-16
+201 202 -3.55271367880050e-15
+201 121 -2.75021433578104e-16
+201 7 -4.16666666666667e+00
+201 192 -9.72222222222223e+00
+201 237 1.11111111111111e+01
+201 204 -1.38888888888889e+00
+201 114 -3.47222222222222e+00
+201 99 -1.11111111111111e+01
+201 119 2.08333333333333e+00
+201 120 5.55555555555556e+00
+201 6 -4.86111111111111e+00
+202 202 5.55555555555556e+01
+202 23 8.42316667803988e-16
+202 118 -3.47222222222222e+00
+202 22 -4.86111111111111e+00
+202 117 2.08333333333333e+00
+202 21 4.16666666666666e+00
+202 212 -8.33333333333334e+00
+202 143 -2.08333333333333e+00
+202 128 -1.20118758689669e-15
+202 26 -6.60495963478169e-16
+202 211 -9.72222222222223e+00
+202 142 -3.47222222222222e+00
+202 127 -1.11111111111111e+01
+202 25 -4.86111111111111e+00
+202 210 4.35849273339173e-17
+202 141 -2.08333333333333e+00
+202 126 -1.63999131115589e-16
+202 24 -4.16666666666667e+00
+202 209 1.34614541735800e-15
+202 140 2.08333333333333e+00
+202 125 2.22044604925031e-15
+202 11 -6.41847686111419e-17
+202 208 -1.38888888888889e+00
+202 139 -3.47222222222222e+00
+202 124 5.55555555555557e+00
+202 10 -4.86111111111111e+00
+202 207 5.20417042793042e-16
+202 138 2.08333333333333e+00
+202 123 1.71325627296159e-15
+202 9 4.16666666666667e+00
+202 194 1.69135538907739e-16
+202 239 1.22785896033983e-15
+202 206 8.33333333333333e+00
+202 116 2.08333333333333e+00
+202 101 8.88178419700125e-16
+202 203 -8.88178419700125e-16
+202 122 -1.70816052275091e-15
+202 8 -1.12757025938492e-16
+202 193 -1.38888888888889e+00
+202 238 1.11111111111111e+01
+202 205 -9.72222222222223e+00
+202 115 -3.47222222222222e+00
+202 100 5.55555555555555e+00
+202 119 -2.08333333333333e+00
+202 121 -1.11111111111111e+01
+202 7 -4.86111111111111e+00
+202 192 -2.89698820488127e-16
+202 237 0.00000000000000e+00
+202 204 -7.71951946809679e-17
+202 114 -2.08333333333333e+00
+202 99 -2.51182538310579e-16
+202 201 -3.55271367880050e-15
+202 120 -3.86518074491082e-16
+202 6 -4.16666666666667e+00
+203 203 5.55555555555556e+01
+203 23 -6.94444444444444e-01
+203 118 -2.08333333333333e+00
+203 22 8.56953397132543e-16
+203 117 2.08333333333333e+00
+203 21 -2.85904112884428e-16
+203 212 -9.72222222222222e+00
+203 143 -3.47222222222222e+00
+203 128 5.55555555555556e+00
+203 26 -6.94444444444442e-01
+203 211 -8.33333333333334e+00
+203 142 -2.08333333333333e+00
+203 127 -1.27101020680476e-15
+203 25 -6.86083134748827e-16
+203 210 4.29560900738757e-16
+203 141 -2.08333333333333e+00
+203 126 8.88178419700125e-16
+203 24 -1.11022302462516e-16
+203 209 -9.72222222222222e+00
+203 140 -3.47222222222222e+00
+203 125 5.55555555555556e+00
+203 11 -6.94444444444443e-01
+203 208 1.16530049498742e-15
+203 139 2.08333333333333e+00
+203 124 1.77635683940025e-15
+203 10 -5.38848479725296e-17
+203 207 -8.33333333333333e+00
+203 138 -2.08333333333333e+00
+203 123 -8.67144897553906e-16
+203 9 -2.32452945780892e-16
+203 194 -9.72222222222222e+00
+203 239 -2.22222222222222e+01
+203 206 -9.72222222222222e+00
+203 116 -3.47222222222222e+00
+203 101 5.55555555555555e+00
+203 119 -3.47222222222222e+00
+203 122 5.55555555555555e+00
+203 8 -6.94444444444444e-01
+203 193 1.69460799559484e-16
+203 238 8.50881864966624e-16
+203 205 8.33333333333333e+00
+203 115 2.08333333333333e+00
+203 100 8.88178419700125e-16
+203 202 -8.88178419700125e-16
+203 121 -1.50649891866861e-15
+203 7 -9.38919081372447e-17
+203 192 8.33333333333333e+00
+203 237 1.43790957873174e-15
+203 204 4.31187203997485e-16
+203 114 2.08333333333333e+00
+203 99 -1.31258936011958e-15
+203 201 2.66453525910038e-15
+203 120 8.88178419700125e-16
+203 6 -2.38958158815805e-16
+204 204 5.55555555555556e+01
+204 41 -4.16666666666667e+00
+204 133 -2.08333333333333e+00
+204 40 2.66280053562440e-16
+204 132 -3.47222222222222e+00
+204 39 -4.86111111111111e+00
+204 110 2.08333333333333e+00
+204 215 2.89698820488127e-16
+204 131 1.16443313324943e-16
+204 38 4.16666666666667e+00
+204 109 2.08333333333333e+00
+204 214 4.68375338513738e-17
+204 130 -4.44089209850063e-16
+204 37 -8.32667268468867e-17
+204 108 -3.47222222222222e+00
+204 213 -1.38888888888889e+00
+204 129 5.55555555555556e+00
+204 36 -4.86111111111112e+00
+204 209 -3.59087759527199e-16
+204 140 -2.64099451943028e-15
+204 125 2.08333333333333e+00
+204 11 4.16666666666666e+00
+204 208 -8.33333333333333e+00
+204 139 1.76455258824731e-15
+204 124 -2.08333333333333e+00
+204 10 2.74953670942324e-16
+204 207 -9.72222222222222e+00
+204 138 -1.11111111111111e+01
+204 123 -3.47222222222222e+00
+204 9 -4.86111111111111e+00
+204 194 -4.83987849797529e-16
+204 239 2.66453525910038e-15
+204 206 2.66453525910038e-15
+204 116 3.07804996768635e-16
+204 101 -2.08333333333333e+00
+204 203 3.75676052766227e-16
+204 122 5.31408142316614e-16
+204 8 -4.16666666666667e+00
+204 193 8.33333333333333e+00
+204 238 -8.82540568403201e-17
+204 205 -2.66453525910038e-15
+204 115 -3.03576608295941e-17
+204 100 2.08333333333333e+00
+204 202 3.38271077815477e-17
+204 121 -4.44089209850063e-16
+204 7 -6.93889390390723e-17
+204 192 -9.72222222222222e+00
+204 237 1.11111111111111e+01
+204 134 -2.08333333333333e+00
+204 114 -1.11111111111111e+01
+204 99 -3.47222222222222e+00
+204 201 -1.38888888888889e+00
+204 120 5.55555555555556e+00
+204 6 -4.86111111111112e+00
+205 205 5.55555555555556e+01
+205 41 8.54351311918577e-16
+205 133 -3.47222222222222e+00
+205 40 -6.94444444444446e-01
+205 132 -2.08333333333333e+00
+205 39 2.08166817117217e-16
+205 110 -2.08333333333333e+00
+205 215 -8.33333333333334e+00
+205 131 6.37185616769731e-16
+205 38 -1.21430643318376e-16
+205 109 -3.47222222222222e+00
+205 214 -9.72222222222223e+00
+205 130 5.55555555555556e+00
+205 37 -6.94444444444446e-01
+205 108 2.08333333333333e+00
+205 213 5.74627151417317e-17
+205 129 -8.88178419700125e-16
+205 36 -1.42247325030098e-16
+205 209 -8.71264865809351e-16
+205 140 1.77635683940025e-15
+205 125 2.08333333333333e+00
+205 11 -2.68990558993654e-16
+205 208 -9.72222222222222e+00
+205 139 5.55555555555556e+00
+205 124 -3.47222222222222e+00
+205 10 -6.94444444444444e-01
+205 207 -8.33333333333333e+00
+205 138 1.65340831304039e-15
+205 123 -2.08333333333333e+00
+205 9 3.36536354339501e-16
+205 194 1.48926010412609e-15
+205 239 -2.22479641046741e-15
+205 206 0.00000000000000e+00
+205 116 -4.44089209850063e-16
+205 101 2.08333333333333e+00
+205 203 8.33333333333333e+00
+205 122 2.15214131238373e-16
+205 8 -3.07371315899641e-16
+205 193 -9.72222222222222e+00
+205 238 -2.22222222222222e+01
+205 134 -2.08333333333333e+00
+205 115 5.55555555555555e+00
+205 100 -3.47222222222222e+00
+205 202 -9.72222222222223e+00
+205 121 5.55555555555556e+00
+205 7 -6.94444444444445e-01
+205 192 8.33333333333333e+00
+205 237 9.71716197090133e-17
+205 204 -2.66453525910038e-15
+205 114 -3.97875092247868e-16
+205 99 2.08333333333333e+00
+205 201 3.04660810468427e-17
+205 120 -8.88178419700125e-16
+205 6 -1.00505541389406e-16
+206 206 5.55555555555556e+01
+206 41 -4.86111111111111e+00
+206 133 -2.08333333333333e+00
+206 40 6.82180006927879e-16
+206 132 -2.08333333333333e+00
+206 39 -4.16666666666667e+00
+206 110 -3.47222222222222e+00
+206 215 -9.72222222222222e+00
+206 131 -1.11111111111111e+01
+206 38 -4.86111111111111e+00
+206 109 -2.08333333333333e+00
+206 214 -8.33333333333334e+00
+206 130 2.16081492976361e-16
+206 37 -1.23599047663348e-16
+206 108 2.08333333333333e+00
+206 213 4.29560900738757e-16
+206 129 5.86919293547872e-16
+206 36 4.16666666666667e+00
+206 209 -1.38888888888889e+00
+206 140 5.55555555555557e+00
+206 125 -3.47222222222222e+00
+206 11 -4.86111111111111e+00
+206 208 -9.15066633577766e-16
+206 139 1.33226762955019e-15
+206 124 2.08333333333333e+00
+206 10 -4.11129463806503e-16
+206 207 -3.26128013483640e-16
+206 138 -2.81003519064793e-15
+206 123 2.08333333333333e+00
+206 9 4.16666666666667e+00
+206 194 -1.38888888888889e+00
+206 239 1.11111111111111e+01
+206 134 -3.47222222222222e+00
+206 116 5.55555555555555e+00
+206 101 -3.47222222222222e+00
+206 203 -9.72222222222222e+00
+206 122 -1.11111111111111e+01
+206 8 -4.86111111111111e+00
+206 193 1.53002610581154e-15
+206 238 -2.35954918798020e-15
+206 205 -1.77635683940025e-15
+206 115 -4.44089209850063e-16
+206 100 2.08333333333333e+00
+206 202 8.33333333333333e+00
+206 121 4.70652163075957e-16
+206 7 -3.15719672627779e-16
+206 192 -4.98407738691586e-16
+206 237 2.66453525910038e-15
+206 204 2.66453525910038e-15
+206 114 4.09015269570157e-16
+206 99 -2.08333333333333e+00
+206 201 2.07299455379228e-16
+206 120 8.35919874986324e-17
+206 6 -4.16666666666667e+00
+207 207 1.11111111111111e+02
+207 160 -2.08333333333333e+00
+207 159 -3.47222222222222e+00
+207 230 -8.33333333333333e+00
+207 155 -2.08333333333333e+00
+207 229 -1.84639629974281e-16
+207 154 2.08333333333333e+00
+207 228 -9.72222222222222e+00
+207 153 -3.47222222222222e+00
+207 227 5.09032919981944e-16
+207 152 2.08333333333333e+00
+207 226 -8.33333333333333e+00
+207 151 -2.08333333333333e+00
+207 225 -9.72222222222222e+00
+207 150 -3.47222222222222e+00
+207 242 -2.47957036847435e-16
+207 221 2.81025203108243e-16
+207 218 8.33333333333333e+00
+207 146 2.08333333333333e+00
+207 241 -1.82967248123223e-15
+207 220 8.33333333333333e+00
+207 217 -2.01119502996061e-16
+207 145 2.08333333333333e+00
+207 240 -2.22222222222222e+01
+207 219 -9.72222222222222e+00
+207 216 -9.72222222222222e+00
+207 144 -3.47222222222222e+00
+207 137 2.08333333333333e+00
+207 56 -7.80625564189563e-18
+207 136 2.08333333333333e+00
+207 55 2.60208521396521e-18
+207 135 -3.47222222222222e+00
+207 54 -1.38888888888889e+00
+207 215 8.33333333333333e+00
+207 134 1.82471225629310e-16
+207 41 6.15826833971767e-17
+207 131 2.08333333333333e+00
+207 214 4.96130914129367e-16
+207 133 0.00000000000000e+00
+207 40 -4.66206934168767e-18
+207 130 -2.08333333333333e+00
+207 213 -9.72222222222222e+00
+207 132 1.11111111111111e+01
+207 39 -1.38888888888889e+00
+207 129 -3.47222222222222e+00
+207 212 -5.13478148889135e-16
+207 143 8.88178419700125e-16
+207 128 -2.08333333333333e+00
+207 26 -8.47846098883664e-17
+207 211 8.33333333333333e+00
+207 142 2.06323673423991e-16
+207 127 2.08333333333333e+00
+207 25 -2.42861286636753e-17
+207 210 -9.72222222222222e+00
+207 141 1.11111111111111e+01
+207 126 -3.47222222222222e+00
+207 24 -1.38888888888889e+00
+207 239 -1.56537109663457e-15
+207 209 5.32907051820075e-15
+207 140 4.44089209850063e-16
+207 206 -2.82759926584220e-16
+207 203 -8.33333333333333e+00
+207 125 2.91677489452913e-16
+207 11 7.23162849047831e-17
+207 122 -2.08333333333333e+00
+207 238 3.27017059265078e-15
+207 208 -1.77635683940025e-15
+207 139 -9.99905453574756e-17
+207 205 -8.33333333333333e+00
+207 202 5.32560107124880e-16
+207 124 0.00000000000000e+00
+207 10 6.84131570838353e-17
+207 121 -2.08333333333333e+00
+207 237 -2.22222222222222e+01
+207 161 -2.08333333333333e+00
+207 138 1.11111111111111e+01
+207 204 -9.72222222222222e+00
+207 201 -9.72222222222222e+00
+207 123 1.11111111111111e+01
+207 9 -1.38888888888889e+00
+207 120 -3.47222222222222e+00
+208 208 1.11111111111111e+02
+208 160 -3.47222222222222e+00
+208 159 -2.08333333333333e+00
+208 230 -1.76941794549634e-16
+208 155 2.08333333333333e+00
+208 229 -1.38888888888889e+00
+208 154 -3.47222222222222e+00
+208 228 -1.18828558104411e-16
+208 153 2.08333333333333e+00
+208 227 -7.56447855743136e-16
+208 152 2.08333333333333e+00
+208 226 -9.72222222222222e+00
+208 151 -3.47222222222222e+00
+208 225 -8.33333333333333e+00
+208 150 -2.08333333333333e+00
+208 242 2.66453525910038e-15
+208 221 -1.03649727689614e-15
+208 218 8.08597980239689e-16
+208 146 -2.08333333333333e+00
+208 241 1.11111111111111e+01
+208 220 -9.72222222222222e+00
+208 217 -1.38888888888889e+00
+208 145 -3.47222222222222e+00
+208 240 -1.85918988537814e-15
+208 219 8.33333333333333e+00
+208 216 -1.04950770296597e-16
+208 144 2.08333333333333e+00
+208 137 -2.08333333333333e+00
+208 56 -8.33333333333334e+00
+208 136 -3.47222222222222e+00
+208 55 -9.72222222222223e+00
+208 135 2.08333333333333e+00
+208 54 4.15249432061948e-17
+208 215 -1.00787433954252e-15
+208 134 -1.41976274486977e-15
+208 41 8.33333333333334e+00
+208 131 2.08333333333333e+00
+208 214 -1.38888888888889e+00
+208 133 1.11111111111111e+01
+208 40 -9.72222222222223e+00
+208 130 -3.47222222222222e+00
+208 213 5.47305256670683e-16
+208 132 0.00000000000000e+00
+208 39 -2.51534904016637e-17
+208 129 -2.08333333333333e+00
+208 212 3.09431300027363e-16
+208 143 1.03679543249358e-15
+208 128 2.08333333333333e+00
+208 26 8.33333333333334e+00
+208 211 -9.72222222222222e+00
+208 142 -2.22222222222222e+01
+208 127 -3.47222222222222e+00
+208 25 -9.72222222222223e+00
+208 210 8.33333333333333e+00
+208 141 -1.03446439782273e-16
+208 126 2.08333333333333e+00
+208 24 -6.28837260041593e-18
+208 239 3.10862446895044e-15
+208 209 -7.10542735760100e-15
+208 140 9.59302082215174e-16
+208 206 -9.11597186625812e-16
+208 203 1.15825318086626e-15
+208 125 -1.49495216553164e-15
+208 11 -8.33333333333334e+00
+208 122 -2.08333333333333e+00
+208 238 1.11111111111111e+01
+208 161 -2.08333333333333e+00
+208 139 -2.22222222222222e+01
+208 205 -9.72222222222222e+00
+208 202 -1.38888888888889e+00
+208 124 1.11111111111111e+01
+208 10 -9.72222222222223e+00
+208 121 -3.47222222222222e+00
+208 237 3.45157116863476e-15
+208 207 -2.66453525910038e-15
+208 138 3.64183509737881e-16
+208 204 -8.33333333333333e+00
+208 201 5.81023944234982e-16
+208 123 -4.44089209850063e-16
+208 9 -1.12757025938492e-17
+208 120 -2.08333333333333e+00
+209 209 1.11111111111111e+02
+209 160 -2.08333333333333e+00
+209 159 -2.08333333333333e+00
+209 230 -9.72222222222222e+00
+209 155 -3.47222222222222e+00
+209 229 -3.53124647578529e-16
+209 154 2.08333333333333e+00
+209 228 -8.33333333333333e+00
+209 153 -2.08333333333333e+00
+209 227 -1.38888888888889e+00
+209 152 -3.47222222222222e+00
+209 226 -7.12103986888479e-16
+209 151 2.08333333333333e+00
+209 225 4.75314232417645e-16
+209 150 2.08333333333333e+00
+209 242 1.11111111111111e+01
+209 221 -1.38888888888889e+00
+209 218 -9.72222222222222e+00
+209 146 -3.47222222222222e+00
+209 241 3.55271367880050e-15
+209 220 -1.04647193688301e-15
+209 217 1.05644659686988e-15
+209 145 -2.08333333333333e+00
+209 240 -3.59304599961696e-16
+209 219 4.27609336828283e-16
+209 216 8.33333333333333e+00
+209 144 2.08333333333333e+00
+209 137 -3.47222222222222e+00
+209 56 -9.72222222222222e+00
+209 136 -2.08333333333333e+00
+209 55 -8.33333333333334e+00
+209 135 2.08333333333333e+00
+209 54 -3.77302356024956e-17
+209 215 -9.72222222222222e+00
+209 134 -2.22222222222222e+01
+209 41 -9.72222222222222e+00
+209 131 -3.47222222222222e+00
+209 214 -9.01297265987200e-16
+209 133 -1.26586024648545e-15
+209 40 8.33333333333334e+00
+209 130 2.08333333333333e+00
+209 213 8.33333333333333e+00
+209 132 6.96328845278815e-17
+209 39 8.01225405466788e-17
+209 129 2.08333333333333e+00
+209 212 -1.38888888888889e+00
+209 143 1.11111111111111e+01
+209 128 -3.47222222222222e+00
+209 26 -9.72222222222222e+00
+209 211 3.93782229046735e-16
+209 142 1.29236898960272e-15
+209 127 2.08333333333333e+00
+209 25 8.33333333333334e+00
+209 210 -4.82253126321552e-16
+209 141 4.44089209850063e-16
+209 126 -2.08333333333333e+00
+209 24 -4.94396190653390e-17
+209 239 1.11111111111111e+01
+209 161 -3.47222222222222e+00
+209 140 1.11111111111111e+01
+209 206 -1.38888888888889e+00
+209 203 -9.72222222222222e+00
+209 125 -2.22222222222222e+01
+209 11 -9.72222222222222e+00
+209 122 -3.47222222222222e+00
+209 238 3.55271367880050e-15
+209 208 -7.10542735760100e-15
+209 139 7.66070150023945e-16
+209 205 -9.30353884209811e-16
+209 202 1.36349265211777e-15
+209 124 -1.35731269973460e-15
+209 10 -8.33333333333334e+00
+209 121 -2.08333333333333e+00
+209 237 -1.71291745978269e-15
+209 207 5.32907051820075e-15
+209 138 4.44089209850063e-16
+209 204 -3.54859371054506e-16
+209 201 -8.33333333333333e+00
+209 123 2.44921270764475e-16
+209 9 -7.80625564189563e-18
+209 120 -2.08333333333333e+00
+210 210 5.55555555555556e+01
+210 110 2.08333333333333e+00
+210 52 -1.94289029309402e-16
+210 109 -2.08333333333333e+00
+210 51 -4.86111111111111e+00
+210 108 -3.47222222222222e+00
+210 137 6.86950496486816e-16
+210 56 -4.16666666666667e+00
+210 134 -2.08333333333333e+00
+210 215 1.24032728532342e-16
+210 136 8.88178419700125e-16
+210 55 3.08780778723872e-16
+210 133 2.08333333333333e+00
+210 214 -5.19332840620557e-17
+210 135 5.55555555555556e+00
+210 54 -4.86111111111111e+00
+210 132 -3.47222222222222e+00
+210 213 -1.38888888888889e+00
+210 119 -2.74086309204336e-15
+210 194 -1.72604985859692e-16
+210 23 -4.16666666666667e+00
+210 101 -2.08333333333333e+00
+210 118 -2.80157841370254e-16
+210 193 -8.33333333333333e+00
+210 22 -1.52655665885959e-16
+210 100 -2.08333333333333e+00
+210 117 -1.11111111111111e+01
+210 192 -9.72222222222222e+00
+210 21 -4.86111111111112e+00
+210 99 -3.47222222222222e+00
+210 212 8.88178419700125e-16
+210 143 9.87925019568792e-16
+210 209 -4.83987849797529e-16
+210 239 2.22044604925031e-15
+210 128 7.95370713735366e-16
+210 26 4.16666666666667e+00
+210 125 2.08333333333333e+00
+210 203 4.29560900738757e-16
+210 211 -2.66453525910038e-15
+210 142 1.63053164720095e-15
+210 208 8.33333333333333e+00
+210 238 -4.56205169127588e-16
+210 127 8.88178419700125e-16
+210 25 2.80157841370254e-16
+210 124 2.08333333333333e+00
+210 202 -2.58040117051550e-17
+210 53 4.16666666666667e+00
+210 141 -1.11111111111111e+01
+210 207 -9.72222222222222e+00
+210 237 1.11111111111111e+01
+210 126 5.55555555555556e+00
+210 24 -4.86111111111111e+00
+210 123 -3.47222222222222e+00
+210 201 -1.38888888888889e+00
+211 211 5.55555555555556e+01
+211 110 2.08333333333333e+00
+211 52 -6.94444444444444e-01
+211 109 -3.47222222222222e+00
+211 51 -1.68268177169750e-16
+211 108 -2.08333333333333e+00
+211 137 7.01695646032618e-16
+211 56 4.92661467177413e-16
+211 134 2.08333333333333e+00
+211 215 8.33333333333333e+00
+211 136 5.55555555555556e+00
+211 55 -6.94444444444444e-01
+211 133 -3.47222222222222e+00
+211 214 -9.72222222222223e+00
+211 135 8.88178419700125e-16
+211 54 3.12250225675825e-16
+211 132 2.08333333333333e+00
+211 213 -7.71951946809679e-17
+211 119 1.77635683940025e-15
+211 194 -1.54390389361936e-16
+211 23 8.50014503228635e-17
+211 101 -2.08333333333333e+00
+211 118 5.55555555555555e+00
+211 193 -9.72222222222222e+00
+211 22 -6.94444444444446e-01
+211 100 -3.47222222222222e+00
+211 117 -1.08094956596805e-16
+211 192 -8.33333333333333e+00
+211 21 -1.39645239816133e-16
+211 99 -2.08333333333333e+00
+211 212 3.55271367880050e-15
+211 143 1.77635683940025e-15
+211 209 3.66026653431106e-16
+211 239 -2.07505453792001e-15
+211 128 3.09539720244612e-16
+211 26 -6.33174068731535e-16
+211 125 -2.08333333333333e+00
+211 203 -8.33333333333334e+00
+211 53 2.91433543964104e-16
+211 142 5.55555555555556e+00
+211 208 -9.72222222222222e+00
+211 238 -2.22222222222222e+01
+211 127 5.55555555555556e+00
+211 25 -6.94444444444445e-01
+211 124 -3.47222222222222e+00
+211 202 -9.72222222222223e+00
+211 210 -2.66453525910038e-15
+211 141 1.67487551605561e-15
+211 207 8.33333333333333e+00
+211 237 -5.30500122997157e-16
+211 126 8.88178419700125e-16
+211 24 2.98372437868011e-16
+211 123 2.08333333333333e+00
+211 201 4.07660016854550e-17
+212 212 5.55555555555556e+01
+212 110 -3.47222222222222e+00
+212 52 1.82145964977565e-16
+212 109 2.08333333333333e+00
+212 51 4.16666666666667e+00
+212 108 2.08333333333333e+00
+212 137 -1.11111111111111e+01
+212 56 -4.86111111111111e+00
+212 134 -3.47222222222222e+00
+212 215 -9.72222222222222e+00
+212 136 4.20562022707127e-16
+212 55 4.83987849797529e-16
+212 133 2.08333333333333e+00
+212 214 8.33333333333333e+00
+212 135 9.06393016197882e-16
+212 54 -4.16666666666667e+00
+212 132 -2.08333333333333e+00
+212 213 3.20164901534969e-16
+212 119 5.55555555555555e+00
+212 194 -1.38888888888889e+00
+212 23 -4.86111111111111e+00
+212 101 -3.47222222222222e+00
+212 118 2.22044604925031e-15
+212 193 -8.18572640226556e-17
+212 22 0.00000000000000e+00
+212 100 -2.08333333333333e+00
+212 117 -2.76948602939697e-15
+212 192 -2.69315819645399e-16
+212 21 -4.16666666666667e+00
+212 99 -2.08333333333333e+00
+212 53 -4.86111111111111e+00
+212 143 5.55555555555556e+00
+212 209 -1.38888888888889e+00
+212 239 1.11111111111111e+01
+212 128 -1.11111111111111e+01
+212 26 -4.86111111111111e+00
+212 125 -3.47222222222222e+00
+212 203 -9.72222222222222e+00
+212 211 2.66453525910038e-15
+212 142 1.77635683940025e-15
+212 208 3.12900746979317e-16
+212 238 -1.53784591398060e-15
+212 127 7.57206797263876e-16
+212 25 -5.96744875736022e-16
+212 124 -2.08333333333333e+00
+212 202 -8.33333333333334e+00
+212 210 8.88178419700125e-16
+212 141 1.06165076729781e-15
+212 207 -5.23886489744996e-16
+212 237 2.22044604925031e-15
+212 126 6.86950496486816e-16
+212 24 4.16666666666667e+00
+212 123 2.08333333333333e+00
+212 201 2.14238349283136e-16
+213 213 5.55555555555556e+01
+213 119 -2.08333333333333e+00
+213 52 4.16666666666667e+00
+213 118 2.08333333333333e+00
+213 51 -4.86111111111111e+00
+213 117 -3.47222222222222e+00
+213 137 1.33226762955019e-15
+213 56 -5.29090660172926e-17
+213 212 2.65521112041700e-16
+213 143 2.08333333333333e+00
+213 136 7.63278329429795e-17
+213 55 -4.16666666666667e+00
+213 211 3.38271077815477e-17
+213 142 -2.08333333333333e+00
+213 135 5.55555555555556e+00
+213 54 -4.86111111111111e+00
+213 210 -1.38888888888889e+00
+213 141 -3.47222222222222e+00
+213 134 -8.34510412162093e-16
+213 41 -1.77809156287623e-16
+213 209 8.33333333333333e+00
+213 140 2.08333333333333e+00
+213 133 1.70956998557514e-15
+213 40 4.16666666666667e+00
+213 208 5.41233724504764e-16
+213 139 2.08333333333333e+00
+213 132 -1.11111111111111e+01
+213 39 -4.86111111111111e+00
+213 207 -9.72222222222222e+00
+213 138 -3.47222222222222e+00
+213 110 -1.29236898960272e-15
+213 215 8.88178419700125e-16
+213 131 1.77635683940025e-15
+213 38 -2.70616862252382e-16
+213 194 -8.33333333333333e+00
+213 239 1.32677885605198e-15
+213 206 5.40583203201273e-16
+213 116 -2.08333333333333e+00
+213 109 -1.66533453693773e-16
+213 214 -1.77635683940025e-15
+213 130 -1.83013326715553e-16
+213 37 -4.16666666666667e+00
+213 193 -2.22044604925031e-16
+213 238 4.44089209850063e-16
+213 205 -1.19262238973405e-17
+213 115 -2.08333333333333e+00
+213 108 -1.11111111111111e+01
+213 53 -2.98372437868011e-16
+213 129 5.55555555555556e+00
+213 36 -4.86111111111111e+00
+213 192 -9.72222222222223e+00
+213 237 1.11111111111111e+01
+213 204 -1.38888888888889e+00
+213 114 -3.47222222222222e+00
+214 214 5.55555555555556e+01
+214 119 2.08333333333333e+00
+214 52 -4.86111111111111e+00
+214 118 -3.47222222222222e+00
+214 51 4.16666666666667e+00
+214 117 2.08333333333333e+00
+214 137 -4.67616396992998e-16
+214 56 -1.55257751099924e-16
+214 212 8.33333333333333e+00
+214 143 2.08333333333333e+00
+214 136 -1.11111111111111e+01
+214 55 -4.86111111111111e+00
+214 211 -9.72222222222223e+00
+214 142 -3.47222222222222e+00
+214 135 2.61075883134509e-16
+214 54 -4.16666666666667e+00
+214 210 4.51028103753970e-17
+214 141 -2.08333333333333e+00
+214 134 1.33226762955019e-15
+214 41 3.74700270810990e-16
+214 209 -9.01297265987200e-16
+214 140 -2.08333333333333e+00
+214 133 5.55555555555556e+00
+214 40 -4.86111111111111e+00
+214 208 -1.38888888888889e+00
+214 139 -3.47222222222222e+00
+214 132 1.61676227961038e-15
+214 39 4.16666666666667e+00
+214 207 6.14092110495790e-16
+214 138 2.08333333333333e+00
+214 110 0.00000000000000e+00
+214 215 3.55271367880050e-15
+214 131 -5.75060832286312e-16
+214 38 -9.71445146547012e-17
+214 194 -2.22478285794026e-16
+214 239 7.46906876625264e-16
+214 206 -8.33333333333334e+00
+214 116 -2.08333333333333e+00
+214 109 5.55555555555555e+00
+214 53 7.31185945124224e-16
+214 130 -1.11111111111111e+01
+214 37 -4.86111111111111e+00
+214 193 -1.38888888888889e+00
+214 238 1.11111111111111e+01
+214 205 -9.72222222222223e+00
+214 115 -3.47222222222222e+00
+214 108 -2.53269627492614e-16
+214 213 -1.77635683940025e-15
+214 129 -1.45716771982052e-16
+214 36 -4.16666666666667e+00
+214 192 -2.32344525563644e-16
+214 237 0.00000000000000e+00
+214 204 5.46437894932694e-17
+214 114 -2.08333333333333e+00
+215 215 5.55555555555556e+01
+215 119 -3.47222222222222e+00
+215 52 7.84095011141517e-16
+215 118 2.08333333333333e+00
+215 51 -3.02709246557953e-16
+215 117 -2.08333333333333e+00
+215 137 5.55555555555555e+00
+215 56 -6.94444444444444e-01
+215 212 -9.72222222222222e+00
+215 143 -3.47222222222222e+00
+215 136 -6.30571983517569e-16
+215 55 -2.28983498828939e-16
+215 211 8.33333333333333e+00
+215 142 2.08333333333333e+00
+215 135 1.33226762955019e-15
+215 54 -4.85722573273506e-17
+215 210 9.62771529167128e-17
+215 141 2.08333333333333e+00
+215 134 5.55555555555556e+00
+215 41 -6.94444444444445e-01
+215 209 -9.72222222222222e+00
+215 140 -3.47222222222222e+00
+215 133 1.33226762955019e-15
+215 40 3.10515502199848e-16
+215 208 -1.00787433954252e-15
+215 139 -2.08333333333333e+00
+215 132 -7.15573433840433e-16
+215 39 -1.17961196366423e-16
+215 207 8.33333333333333e+00
+215 138 2.08333333333333e+00
+215 110 5.55555555555555e+00
+215 53 -6.94444444444444e-01
+215 131 5.55555555555555e+00
+215 38 -6.94444444444444e-01
+215 194 -9.72222222222222e+00
+215 239 -2.22222222222222e+01
+215 206 -9.72222222222222e+00
+215 116 -3.47222222222222e+00
+215 109 8.88178419700125e-16
+215 214 3.55271367880050e-15
+215 130 -8.00683304380545e-16
+215 37 -9.54097911787244e-17
+215 193 -3.15719672627779e-16
+215 238 1.11683665787732e-15
+215 205 -8.33333333333334e+00
+215 115 -2.08333333333333e+00
+215 108 -1.15977106390774e-15
+215 213 8.88178419700125e-16
+215 129 1.77635683940025e-15
+215 36 -1.97758476261356e-16
+215 192 -8.33333333333333e+00
+215 237 7.70542483985448e-16
+215 204 2.14238349283136e-16
+215 114 -2.08333333333333e+00
+216 216 5.55555555555556e+01
+216 26 -1.99493199737333e-17
+216 142 2.08333333333333e+00
+216 25 4.16666666666667e+00
+216 141 -3.47222222222222e+00
+216 24 -4.86111111111111e+00
+216 227 -1.38777878078145e-16
+216 167 -2.08333333333333e+00
+216 152 -4.44089209850063e-16
+216 29 2.58365377703296e-16
+216 226 2.16840434497101e-17
+216 166 -2.08333333333333e+00
+216 151 7.62953068778049e-16
+216 28 -4.16666666666667e+00
+216 225 -1.38888888888889e+00
+216 165 -3.47222222222222e+00
+216 150 5.55555555555556e+00
+216 27 -4.86111111111111e+00
+216 224 -8.33333333333333e+00
+216 164 -2.08333333333333e+00
+216 149 6.64832772168111e-16
+216 14 1.64581889783300e-16
+216 223 1.03866568124111e-16
+216 163 2.08333333333333e+00
+216 148 -1.69799612738386e-16
+216 13 4.16666666666666e+00
+216 222 -9.72222222222223e+00
+216 162 -3.47222222222222e+00
+216 147 -1.11111111111111e+01
+216 12 -4.86111111111111e+00
+216 209 8.33333333333333e+00
+216 242 -3.12683906544819e-16
+216 221 -1.92554305833426e-16
+216 140 2.08333333333333e+00
+216 125 -2.15322551455621e-16
+216 218 0.00000000000000e+00
+216 146 -4.44089209850063e-16
+216 11 2.14238349283136e-16
+216 208 -1.39645239816133e-16
+216 241 8.88178419700125e-16
+216 220 7.13405029495462e-17
+216 139 -2.08333333333333e+00
+216 124 -9.02381468159685e-16
+216 217 0.00000000000000e+00
+216 145 5.93966607669028e-16
+216 10 -4.16666666666667e+00
+216 207 -9.72222222222222e+00
+216 240 1.11111111111111e+01
+216 219 -1.38888888888889e+00
+216 138 -3.47222222222222e+00
+216 123 -1.11111111111111e+01
+216 143 2.08333333333333e+00
+216 144 5.55555555555556e+00
+216 9 -4.86111111111111e+00
+217 217 5.55555555555556e+01
+217 26 -5.54460991009087e-16
+217 142 -3.47222222222222e+00
+217 25 -4.86111111111111e+00
+217 141 2.08333333333333e+00
+217 24 4.16666666666666e+00
+217 227 -8.33333333333333e+00
+217 167 -2.08333333333333e+00
+217 152 8.31284910698948e-16
+217 29 3.43041567374414e-16
+217 226 -9.72222222222223e+00
+217 166 -3.47222222222222e+00
+217 151 -1.11111111111111e+01
+217 28 -4.86111111111111e+00
+217 225 6.97141996908179e-17
+217 165 -2.08333333333333e+00
+217 150 4.79366438037310e-16
+217 27 -4.16666666666667e+00
+217 224 -1.16226472890446e-16
+217 164 2.08333333333333e+00
+217 149 1.77635683940025e-15
+217 14 -2.60208521396521e-17
+217 223 -1.38888888888889e+00
+217 163 -3.47222222222222e+00
+217 148 5.55555555555555e+00
+217 13 -4.86111111111111e+00
+217 222 6.85215773010839e-17
+217 162 2.08333333333333e+00
+217 147 -2.04805790382512e-16
+217 12 4.16666666666667e+00
+217 209 9.45424294407360e-16
+217 242 -1.24401357270987e-15
+217 221 8.33333333333333e+00
+217 140 2.08333333333333e+00
+217 125 2.22044604925031e-15
+217 218 -3.55271367880050e-15
+217 146 6.99852502339393e-16
+217 11 -5.52509427098613e-16
+217 208 -1.38888888888889e+00
+217 241 1.11111111111111e+01
+217 220 -9.72222222222223e+00
+217 139 -3.47222222222222e+00
+217 124 5.55555555555556e+00
+217 143 -2.08333333333333e+00
+217 145 -1.11111111111111e+01
+217 10 -4.86111111111111e+00
+217 207 -2.07191035161980e-16
+217 240 8.88178419700125e-16
+217 219 2.25514051876985e-17
+217 138 -2.08333333333333e+00
+217 123 -9.27711141414378e-16
+217 216 0.00000000000000e+00
+217 144 6.56267575005476e-16
+217 9 -4.16666666666667e+00
+218 218 5.55555555555556e+01
+218 26 -6.94444444444443e-01
+218 142 -2.08333333333333e+00
+218 25 -5.64652491430451e-16
+218 141 2.08333333333333e+00
+218 24 4.15249432061948e-17
+218 227 -9.72222222222222e+00
+218 167 -3.47222222222222e+00
+218 152 5.55555555555556e+00
+218 29 -6.94444444444444e-01
+218 226 -8.33333333333333e+00
+218 166 -2.08333333333333e+00
+218 151 8.10874804801909e-16
+218 28 3.85108611666851e-16
+218 225 -1.23707467880596e-16
+218 165 -2.08333333333333e+00
+218 150 -4.44089209850063e-16
+218 27 3.63424568217141e-16
+218 224 -9.72222222222222e+00
+218 164 -3.47222222222222e+00
+218 149 5.55555555555555e+00
+218 14 -6.94444444444444e-01
+218 223 -1.89626959967715e-16
+218 163 2.08333333333333e+00
+218 148 1.77635683940025e-15
+218 13 -8.82540568403201e-17
+218 222 -8.33333333333333e+00
+218 162 -2.08333333333333e+00
+218 147 7.04189311029335e-16
+218 12 1.35308431126191e-16
+218 209 -9.72222222222222e+00
+218 242 -2.22222222222222e+01
+218 221 -9.72222222222222e+00
+218 140 -3.47222222222222e+00
+218 125 5.55555555555556e+00
+218 143 -3.47222222222222e+00
+218 146 5.55555555555556e+00
+218 11 -6.94444444444444e-01
+218 208 8.09465341977678e-16
+218 241 -1.51992947308027e-15
+218 220 8.33333333333333e+00
+218 139 2.08333333333333e+00
+218 124 1.77635683940025e-15
+218 217 -3.55271367880050e-15
+218 145 7.27201502140340e-16
+218 10 -5.33427468862868e-16
+218 207 8.33333333333333e+00
+218 240 -7.55417863679275e-17
+218 219 -1.22081164621868e-16
+218 138 2.08333333333333e+00
+218 123 -7.50132378088408e-17
+218 216 0.00000000000000e+00
+218 144 -4.44089209850063e-16
+218 9 1.64690310000548e-16
+219 219 5.55555555555556e+01
+219 44 -4.16666666666667e+00
+219 157 -2.08333333333333e+00
+219 43 3.36102673470506e-17
+219 156 -3.47222222222222e+00
+219 42 -4.86111111111112e+00
+219 134 2.08333333333333e+00
+219 230 -2.68882138776405e-17
+219 155 3.67436116255337e-16
+219 41 4.16666666666667e+00
+219 133 2.08333333333333e+00
+219 229 2.16840434497101e-17
+219 154 0.00000000000000e+00
+219 40 -4.94396190653390e-17
+219 132 -3.47222222222222e+00
+219 228 -1.38888888888889e+00
+219 153 5.55555555555556e+00
+219 39 -4.86111111111111e+00
+219 224 3.43258407808911e-16
+219 164 1.53543356414682e-15
+219 149 2.08333333333333e+00
+219 14 4.16666666666667e+00
+219 223 -8.33333333333333e+00
+219 163 -2.91013415622265e-16
+219 148 -2.08333333333333e+00
+219 13 2.58040117051550e-17
+219 222 -9.72222222222222e+00
+219 162 -1.11111111111111e+01
+219 147 -3.47222222222222e+00
+219 12 -4.86111111111112e+00
+219 209 2.64545330086463e-16
+219 242 -4.44089209850063e-16
+219 221 0.00000000000000e+00
+219 140 -1.59616243833316e-15
+219 125 -2.08333333333333e+00
+219 218 -6.57026516526216e-17
+219 146 4.88256895851691e-16
+219 11 -4.16666666666667e+00
+219 208 8.33333333333333e+00
+219 241 1.24867564205156e-15
+219 220 8.88178419700125e-16
+219 139 -8.77227977758022e-16
+219 124 2.08333333333333e+00
+219 217 2.25514051876985e-17
+219 145 0.00000000000000e+00
+219 10 -1.56125112837913e-17
+219 207 -9.72222222222222e+00
+219 240 1.11111111111111e+01
+219 158 -2.08333333333333e+00
+219 138 -1.11111111111111e+01
+219 123 -3.47222222222222e+00
+219 216 -1.38888888888889e+00
+219 144 5.55555555555556e+00
+219 9 -4.86111111111111e+00
+220 220 5.55555555555556e+01
+220 44 -4.51028103753970e-17
+220 157 -3.47222222222222e+00
+220 43 -6.94444444444445e-01
+220 156 -2.08333333333333e+00
+220 42 6.07153216591882e-18
+220 134 -2.08333333333333e+00
+220 230 -8.33333333333333e+00
+220 155 -2.29959280784175e-16
+220 41 2.51534904016637e-16
+220 133 -3.47222222222222e+00
+220 229 -9.72222222222223e+00
+220 154 5.55555555555556e+00
+220 40 -6.94444444444443e-01
+220 132 2.08333333333333e+00
+220 228 6.97141996908179e-17
+220 153 0.00000000000000e+00
+220 39 -1.00505541389406e-16
+220 224 3.94974851436469e-16
+220 164 8.88178419700125e-16
+220 149 2.08333333333333e+00
+220 14 3.31765864780564e-17
+220 223 -9.72222222222222e+00
+220 163 5.55555555555555e+00
+220 148 -3.47222222222222e+00
+220 13 -6.94444444444446e-01
+220 222 -8.33333333333333e+00
+220 162 -2.61184303351758e-16
+220 147 -2.08333333333333e+00
+220 12 -6.93889390390723e-18
+220 209 -1.04202670797582e-15
+220 242 1.36762617290037e-15
+220 221 -3.55271367880050e-15
+220 140 4.44089209850063e-16
+220 125 2.08333333333333e+00
+220 218 8.33333333333333e+00
+220 146 -4.67155611069692e-16
+220 11 -3.72857127117765e-16
+220 208 -9.72222222222222e+00
+220 241 -2.22222222222222e+01
+220 158 -2.08333333333333e+00
+220 139 5.55555555555556e+00
+220 124 -3.47222222222222e+00
+220 217 -9.72222222222223e+00
+220 145 5.55555555555556e+00
+220 10 -6.94444444444445e-01
+220 207 8.33333333333333e+00
+220 240 9.02733833865743e-16
+220 219 0.00000000000000e+00
+220 138 -8.57563260854566e-16
+220 123 2.08333333333333e+00
+220 216 1.95373231481888e-16
+220 144 0.00000000000000e+00
+220 9 -8.05562214156730e-17
+221 221 5.55555555555556e+01
+221 44 -4.86111111111111e+00
+221 157 -2.08333333333333e+00
+221 43 -6.63531729561129e-17
+221 156 -2.08333333333333e+00
+221 42 -4.16666666666667e+00
+221 134 -3.47222222222222e+00
+221 230 -9.72222222222222e+00
+221 155 -1.11111111111111e+01
+221 41 -4.86111111111111e+00
+221 133 -2.08333333333333e+00
+221 229 -8.33333333333333e+00
+221 154 -2.45111006144660e-16
+221 40 2.44921270764475e-16
+221 132 2.08333333333333e+00
+221 228 -1.18178036800920e-17
+221 153 5.99279198314207e-16
+221 39 4.16666666666667e+00
+221 224 -1.38888888888889e+00
+221 164 5.55555555555555e+00
+221 149 -3.47222222222222e+00
+221 14 -4.86111111111111e+00
+221 223 3.98119037736677e-16
+221 163 4.44089209850063e-16
+221 148 2.08333333333333e+00
+221 13 1.61329283265843e-16
+221 222 2.66280053562440e-16
+221 162 1.38853772230219e-15
+221 147 2.08333333333333e+00
+221 12 4.16666666666667e+00
+221 209 -1.38888888888889e+00
+221 242 1.11111111111111e+01
+221 158 -3.47222222222222e+00
+221 140 5.55555555555556e+00
+221 125 -3.47222222222222e+00
+221 218 -9.72222222222222e+00
+221 146 -1.11111111111111e+01
+221 11 -4.86111111111111e+00
+221 208 -1.02955838299224e-15
+221 241 1.34430227366478e-15
+221 220 -3.55271367880050e-15
+221 139 -4.44089209850063e-16
+221 124 2.08333333333333e+00
+221 217 8.33333333333333e+00
+221 145 -2.85470432015433e-16
+221 10 -2.32452945780892e-16
+221 207 3.12141805458577e-16
+221 240 -4.44089209850063e-16
+221 219 0.00000000000000e+00
+221 138 -1.58368056082242e-15
+221 123 -2.08333333333333e+00
+221 216 -3.29597460435593e-17
+221 144 5.93817529870311e-16
+221 9 -4.16666666666667e+00
+222 222 5.66666666666667e+01
+222 58 -2.15620707053055e-17
+222 57 -7.08333333333333e-01
+222 158 -5.11750201676736e-16
+222 44 -4.74202925190848e-17
+222 157 -6.93889390390723e-18
+222 43 -1.50568576703924e-17
+222 156 5.66666666666667e+00
+222 42 -7.08333333333333e-01
+222 167 1.33920652345410e-15
+222 29 -6.86706550998006e-17
+222 166 1.18665927778538e-16
+222 28 -2.15620707053055e-17
+222 165 5.66666666666667e+00
+222 27 -7.08333333333333e-01
+222 224 1.85962356624714e-15
+222 164 1.33226762955019e-15
+222 149 -4.85997011948416e-16
+222 14 -1.56497807334705e-17
+222 223 1.77635683940025e-15
+222 163 1.74125833516487e-16
+222 148 0.00000000000000e+00
+222 13 -1.58124110593433e-17
+222 59 -4.74202925190848e-17
+222 162 5.66666666666667e+00
+222 147 5.66666666666667e+00
+222 12 -7.08333333333333e-01
+222 160 2.08333333333333e+00
+222 159 -3.47222222222222e+00
+222 230 8.33333333333333e+00
+222 155 2.08333333333333e+00
+222 229 6.15826833971767e-17
+222 154 -2.08333333333333e+00
+222 228 -9.72222222222223e+00
+222 153 -3.47222222222222e+00
+222 227 2.38524477946811e-16
+222 152 -2.08333333333333e+00
+222 226 8.33333333333333e+00
+222 151 2.08333333333333e+00
+222 225 -9.72222222222222e+00
+222 150 -3.47222222222222e+00
+222 242 1.34007388519208e-15
+222 221 2.73218947466347e-16
+222 218 -8.33333333333333e+00
+222 146 -2.08333333333333e+00
+222 241 -5.44703171456717e-16
+222 220 -8.33333333333333e+00
+222 217 6.85215773010839e-17
+222 145 -2.08333333333333e+00
+222 240 -2.22222222222222e+01
+222 161 2.08333333333333e+00
+222 219 -9.72222222222222e+00
+222 216 -9.72222222222223e+00
+222 144 -3.47222222222222e+00
+222 308 -4.16666666666667e-02
+222 307 -4.16666666666667e-02
+222 306 -6.94444444444445e-02
+222 401 -1.66666666666667e-01
+222 302 -4.16666666666667e-02
+222 400 9.63923493975394e-19
+222 301 4.16666666666667e-02
+222 399 -1.94444444444445e-01
+222 300 -6.94444444444445e-02
+222 398 1.22480964172972e-18
+222 299 4.16666666666667e-02
+222 397 -1.66666666666667e-01
+222 298 -4.16666666666667e-02
+222 396 -1.94444444444444e-01
+222 297 -6.94444444444445e-02
+222 449 -2.37505920827738e-17
+222 392 -2.94936872233947e-18
+222 389 1.66666666666667e-01
+222 293 4.16666666666667e-02
+222 448 4.15702594688729e-18
+222 391 1.66666666666667e-01
+222 388 -1.01643953670516e-20
+222 292 4.16666666666667e-02
+222 447 -4.44444444444445e-01
+222 390 -1.94444444444444e-01
+222 387 -1.94444444444445e-01
+222 291 -6.94444444444445e-02
+223 223 5.66666666666667e+01
+223 58 -4.95833333333333e+00
+223 57 -1.59089728153303e-17
+223 158 -3.43158457921135e-16
+223 44 4.25000000000000e+00
+223 157 5.66666666666667e+00
+223 43 -4.95833333333333e+00
+223 156 -6.93889390390723e-18
+223 42 -2.15485181781494e-17
+223 167 -4.44546607641580e-16
+223 29 4.25000000000000e+00
+223 166 -1.13333333333333e+01
+223 28 -4.95833333333333e+00
+223 165 2.81678477268813e-16
+223 27 -1.50568576703924e-17
+223 224 -2.67841304690819e-15
+223 164 -6.57821033430740e-16
+223 149 -1.90329785555699e-16
+223 14 -4.25000000000000e+00
+223 59 -4.25000000000000e+00
+223 163 -1.13333333333333e+01
+223 148 5.66666666666667e+00
+223 13 -4.95833333333333e+00
+223 222 1.77635683940025e-15
+223 162 2.29796650458303e-16
+223 147 0.00000000000000e+00
+223 12 -2.32967941812823e-17
+223 160 -3.47222222222222e+00
+223 159 2.08333333333333e+00
+223 230 -6.76542155630955e-17
+223 155 2.08333333333333e+00
+223 229 -1.38888888888889e+00
+223 154 -3.47222222222222e+00
+223 228 8.99887803162969e-17
+223 153 -2.08333333333333e+00
+223 227 -4.94287770436141e-16
+223 152 2.08333333333333e+00
+223 226 -9.72222222222222e+00
+223 151 -3.47222222222222e+00
+223 225 8.33333333333333e+00
+223 150 2.08333333333333e+00
+223 242 2.66453525910038e-15
+223 221 3.70363462121048e-16
+223 218 -1.89626959967715e-16
+223 146 -2.08333333333333e+00
+223 241 1.11111111111111e+01
+223 161 -2.08333333333333e+00
+223 220 -9.72222222222222e+00
+223 217 -1.38888888888889e+00
+223 145 -3.47222222222222e+00
+223 240 -3.93253680487649e-16
+223 219 -8.33333333333333e+00
+223 216 1.10805462028019e-16
+223 144 -2.08333333333333e+00
+223 308 -4.16666666666667e-02
+223 307 -6.94444444444444e-02
+223 306 -4.16666666666667e-02
+223 401 -1.89464329641842e-17
+223 302 4.16666666666667e-02
+223 400 -2.77777777777778e-02
+223 301 -6.94444444444444e-02
+223 399 5.28548559086683e-19
+223 300 4.16666666666667e-02
+223 398 1.66865490609097e-17
+223 299 4.16666666666667e-02
+223 397 -1.94444444444444e-01
+223 298 -6.94444444444444e-02
+223 396 -1.66666666666667e-01
+223 297 -4.16666666666667e-02
+223 449 -6.24500451351651e-17
+223 392 2.92599061299526e-17
+223 389 -2.26191678234788e-17
+223 293 -4.16666666666666e-02
+223 448 2.22222222222222e-01
+223 391 -1.94444444444444e-01
+223 388 -2.77777777777778e-02
+223 292 -6.94444444444444e-02
+223 447 6.09863722023096e-19
+223 390 1.66666666666667e-01
+223 387 0.00000000000000e+00
+223 291 4.16666666666667e-02
+224 224 5.66666666666667e+01
+224 58 -4.25000000000000e+00
+224 57 -7.12574937207153e-17
+224 158 -1.13333333333333e+01
+224 44 -4.95833333333333e+00
+224 157 -2.38954770684016e-16
+224 43 4.25000000000000e+00
+224 156 -2.67408513206419e-16
+224 42 4.14842856247266e-17
+224 167 5.66666666666667e+00
+224 29 -4.95833333333333e+00
+224 166 -2.64079461965473e-16
+224 28 4.25000000000000e+00
+224 165 1.33920652345410e-15
+224 27 -4.74067399919287e-17
+224 59 -4.95833333333333e+00
+224 164 5.66666666666667e+00
+224 149 -1.13333333333333e+01
+224 14 -4.95833333333333e+00
+224 223 -3.56659146660832e-15
+224 163 -6.18833800934519e-16
+224 148 -3.98617093109663e-16
+224 13 -4.25000000000000e+00
+224 222 1.85962356624714e-15
+224 162 1.33226762955019e-15
+224 147 -4.01432630626336e-16
+224 12 -4.74202925190848e-17
+224 160 -2.08333333333333e+00
+224 159 2.08333333333333e+00
+224 230 -9.72222222222222e+00
+224 155 -3.47222222222222e+00
+224 229 -1.49945160454745e-16
+224 154 2.08333333333333e+00
+224 228 8.33333333333333e+00
+224 153 2.08333333333333e+00
+224 227 -1.38888888888889e+00
+224 152 -3.47222222222222e+00
+224 226 -4.70110061989715e-16
+224 151 2.08333333333333e+00
+224 225 1.80194401067091e-16
+224 150 -2.08333333333333e+00
+224 242 1.11111111111111e+01
+224 161 -3.47222222222222e+00
+224 221 -1.38888888888889e+00
+224 218 -9.72222222222222e+00
+224 146 -3.47222222222222e+00
+224 241 3.10862446895044e-15
+224 220 3.94974851436469e-16
+224 217 -1.64798730217797e-16
+224 145 -2.08333333333333e+00
+224 240 1.12019768461202e-15
+224 219 3.63207727782644e-16
+224 216 -8.33333333333333e+00
+224 144 -2.08333333333333e+00
+224 308 -6.94444444444444e-02
+224 307 -4.16666666666667e-02
+224 306 -4.16666666666667e-02
+224 401 -1.94444444444444e-01
+224 302 -6.94444444444444e-02
+224 400 -1.76691072797247e-17
+224 301 4.16666666666667e-02
+224 399 -1.66666666666667e-01
+224 300 -4.16666666666667e-02
+224 398 -2.77777777777778e-02
+224 299 -6.94444444444445e-02
+224 397 1.40268656065312e-17
+224 298 4.16666666666667e-02
+224 396 2.53432257818487e-18
+224 297 4.16666666666667e-02
+224 449 2.22222222222222e-01
+224 392 -2.77777777777778e-02
+224 389 -1.94444444444444e-01
+224 293 -6.94444444444445e-02
+224 448 -6.93889390390723e-17
+224 391 2.75963334215451e-17
+224 388 -2.37846851589008e-17
+224 292 -4.16666666666666e-02
+224 447 -1.79503222182131e-17
+224 390 -2.01932654625425e-18
+224 387 1.66666666666667e-01
+224 291 4.16666666666667e-02
+225 225 5.55555555555556e+01
+225 134 2.08333333333333e+00
+225 55 -9.02056207507940e-17
+225 133 -2.08333333333333e+00
+225 54 -4.86111111111111e+00
+225 132 -3.47222222222222e+00
+225 161 -4.57966997657877e-16
+225 59 -4.16666666666667e+00
+225 158 -2.08333333333333e+00
+225 230 -1.92554305833426e-16
+225 160 8.88178419700125e-16
+225 58 7.19910242530375e-17
+225 157 2.08333333333333e+00
+225 229 7.20994444702860e-17
+225 159 5.55555555555556e+00
+225 57 -4.86111111111111e+00
+225 156 -3.47222222222222e+00
+225 228 -1.38888888888889e+00
+225 143 1.22124532708767e-15
+225 209 4.84855211535518e-16
+225 26 -4.16666666666667e+00
+225 125 -2.08333333333333e+00
+225 142 -9.79251402188908e-16
+225 208 -8.33333333333333e+00
+225 25 -8.32667268468867e-17
+225 124 -2.08333333333333e+00
+225 141 -1.11111111111111e+01
+225 207 -9.72222222222222e+00
+225 24 -4.86111111111111e+00
+225 123 -3.47222222222222e+00
+225 227 -1.77635683940025e-15
+225 167 -1.17093834628434e-16
+225 224 2.28766658394441e-16
+225 242 -4.44089209850063e-16
+225 152 -6.74807432154978e-16
+225 29 4.16666666666667e+00
+225 149 2.08333333333333e+00
+225 218 -1.23707467880596e-16
+225 226 8.88178419700125e-16
+225 166 -2.75929452897561e-16
+225 223 8.33333333333333e+00
+225 241 9.06325253562101e-16
+225 151 8.88178419700125e-16
+225 28 6.41847686111419e-17
+225 148 2.08333333333333e+00
+225 217 5.58364118830035e-17
+225 56 4.16666666666667e+00
+225 165 -1.11111111111111e+01
+225 222 -9.72222222222222e+00
+225 240 1.11111111111111e+01
+225 150 5.55555555555556e+00
+225 27 -4.86111111111111e+00
+225 147 -3.47222222222222e+00
+225 216 -1.38888888888889e+00
+226 226 5.55555555555556e+01
+226 134 2.08333333333333e+00
+226 55 -6.94444444444445e-01
+226 133 -3.47222222222222e+00
+226 54 -1.20563281580388e-16
+226 132 -2.08333333333333e+00
+226 161 -1.17961196366423e-15
+226 59 -4.85722573273506e-17
+226 158 2.08333333333333e+00
+226 230 8.33333333333333e+00
+226 160 5.55555555555556e+00
+226 58 -6.94444444444445e-01
+226 157 -3.47222222222222e+00
+226 229 -9.72222222222223e+00
+226 159 8.88178419700125e-16
+226 57 6.24500451351651e-17
+226 156 2.08333333333333e+00
+226 228 5.03069808033274e-17
+226 143 3.10862446895044e-15
+226 209 -7.67615138119737e-16
+226 26 1.21430643318376e-17
+226 125 -2.08333333333333e+00
+226 142 5.55555555555556e+00
+226 208 -9.72222222222222e+00
+226 25 -6.94444444444443e-01
+226 124 -3.47222222222222e+00
+226 141 -9.64180991991359e-16
+226 207 -8.33333333333333e+00
+226 24 -1.06685493772574e-16
+226 123 -2.08333333333333e+00
+226 227 -1.77635683940025e-15
+226 167 2.22044604925031e-15
+226 224 -5.25621213220973e-16
+226 242 1.51777462126246e-15
+226 152 -1.27382913245322e-15
+226 29 -1.83013326715553e-16
+226 149 -2.08333333333333e+00
+226 218 -8.33333333333333e+00
+226 56 6.93889390390723e-16
+226 166 5.55555555555555e+00
+226 223 -9.72222222222222e+00
+226 241 -2.22222222222222e+01
+226 151 5.55555555555556e+00
+226 28 -6.94444444444445e-01
+226 148 -3.47222222222222e+00
+226 217 -9.72222222222223e+00
+226 225 8.88178419700125e-16
+226 165 -4.51895465491958e-16
+226 222 8.33333333333333e+00
+226 240 1.14199014827898e-15
+226 150 8.88178419700125e-16
+226 27 5.55111512312578e-17
+226 147 2.08333333333333e+00
+226 216 1.47451495458029e-17
+227 227 5.55555555555556e+01
+227 134 -3.47222222222222e+00
+227 55 5.68989300120393e-16
+227 133 2.08333333333333e+00
+227 54 4.16666666666667e+00
+227 132 2.08333333333333e+00
+227 161 -1.11111111111111e+01
+227 59 -4.86111111111111e+00
+227 158 -3.47222222222222e+00
+227 230 -9.72222222222222e+00
+227 160 -1.48893484347434e-15
+227 58 -1.21430643318376e-16
+227 157 2.08333333333333e+00
+227 229 8.33333333333333e+00
+227 159 -6.74807432154978e-16
+227 57 -4.16666666666667e+00
+227 156 -2.08333333333333e+00
+227 228 -1.21322223101128e-16
+227 143 5.55555555555556e+00
+227 209 -1.38888888888889e+00
+227 26 -4.86111111111111e+00
+227 125 -3.47222222222222e+00
+227 142 2.66453525910038e-15
+227 208 -6.93130448869983e-16
+227 25 8.32667268468867e-17
+227 124 -2.08333333333333e+00
+227 141 1.39731975989932e-15
+227 207 5.12502366933898e-16
+227 24 -4.16666666666667e+00
+227 123 -2.08333333333333e+00
+227 56 -4.86111111111111e+00
+227 167 5.55555555555555e+00
+227 224 -1.38888888888889e+00
+227 242 1.11111111111111e+01
+227 152 -1.11111111111111e+01
+227 29 -4.86111111111111e+00
+227 149 -3.47222222222222e+00
+227 218 -9.72222222222222e+00
+227 226 -1.77635683940025e-15
+227 166 2.22044604925031e-15
+227 223 -4.93420408698153e-16
+227 241 1.61754832618544e-15
+227 151 -1.62456853525228e-15
+227 28 -2.22044604925031e-16
+227 148 -2.08333333333333e+00
+227 217 -8.33333333333333e+00
+227 225 -1.77635683940025e-15
+227 165 -1.04083408558608e-16
+227 222 2.46330733588707e-16
+227 240 -4.44089209850063e-16
+227 150 -5.13478148889135e-16
+227 27 4.16666666666667e+00
+227 147 2.08333333333333e+00
+227 216 -9.02056207507940e-17
+228 228 5.55555555555556e+01
+228 143 -2.08333333333333e+00
+228 55 4.16666666666667e+00
+228 142 2.08333333333333e+00
+228 54 -4.86111111111111e+00
+228 141 -3.47222222222222e+00
+228 161 0.00000000000000e+00
+228 59 2.80157841370254e-16
+228 227 -6.40763483938933e-17
+228 167 2.08333333333333e+00
+228 160 4.85722573273506e-16
+228 58 -4.16666666666667e+00
+228 226 5.72458747072346e-17
+228 166 -2.08333333333333e+00
+228 159 5.55555555555555e+00
+228 57 -4.86111111111111e+00
+228 225 -1.38888888888889e+00
+228 165 -3.47222222222222e+00
+228 158 6.69494841509799e-16
+228 44 1.61329283265843e-16
+228 224 8.33333333333333e+00
+228 164 2.08333333333333e+00
+228 157 -3.94649590784724e-16
+228 43 4.16666666666667e+00
+228 223 7.61109925084824e-17
+228 163 2.08333333333333e+00
+228 156 -1.11111111111111e+01
+228 42 -4.86111111111111e+00
+228 222 -9.72222222222223e+00
+228 162 -3.47222222222222e+00
+228 134 -2.72351585728359e-16
+228 230 -8.88178419700125e-16
+228 155 0.00000000000000e+00
+228 41 1.59594559789866e-16
+228 209 -8.33333333333333e+00
+228 242 -1.86442116086039e-16
+228 221 -1.18178036800920e-17
+228 140 -2.08333333333333e+00
+228 133 -9.50628464835290e-16
+228 229 1.77635683940025e-15
+228 154 3.10515502199848e-16
+228 40 -4.16666666666667e+00
+228 208 -9.88792381306780e-17
+228 241 8.88178419700125e-16
+228 220 5.58364118830035e-17
+228 139 -2.08333333333333e+00
+228 132 -1.11111111111111e+01
+228 56 1.45716771982052e-16
+228 153 5.55555555555555e+00
+228 39 -4.86111111111111e+00
+228 207 -9.72222222222222e+00
+228 240 1.11111111111111e+01
+228 219 -1.38888888888889e+00
+228 138 -3.47222222222222e+00
+229 229 5.55555555555556e+01
+229 143 2.08333333333333e+00
+229 55 -4.86111111111111e+00
+229 142 -3.47222222222222e+00
+229 54 4.16666666666667e+00
+229 141 2.08333333333333e+00
+229 161 6.76000054544712e-16
+229 59 1.08420217248550e-16
+229 227 8.33333333333333e+00
+229 167 2.08333333333333e+00
+229 160 -1.11111111111111e+01
+229 58 -4.86111111111111e+00
+229 226 -9.72222222222223e+00
+229 166 -3.47222222222222e+00
+229 159 4.21537804662364e-16
+229 57 -4.16666666666667e+00
+229 225 1.96132173002628e-16
+229 165 -2.08333333333333e+00
+229 158 1.33226762955019e-15
+229 44 -4.99600361081320e-16
+229 224 -1.49945160454745e-16
+229 164 -2.08333333333333e+00
+229 157 5.55555555555555e+00
+229 43 -4.86111111111111e+00
+229 223 -1.38888888888889e+00
+229 163 -3.47222222222222e+00
+229 156 -5.06539254985228e-16
+229 42 4.16666666666667e+00
+229 222 4.16333634234434e-17
+229 162 2.08333333333333e+00
+229 134 1.33226762955019e-15
+229 230 0.00000000000000e+00
+229 155 5.95877513998033e-16
+229 41 -2.63677968348475e-16
+229 209 -3.53124647578529e-16
+229 242 -1.50681062679320e-15
+229 221 -8.33333333333333e+00
+229 140 -2.08333333333333e+00
+229 133 5.55555555555556e+00
+229 56 -3.19189119579733e-16
+229 154 -1.11111111111111e+01
+229 40 -4.86111111111111e+00
+229 208 -1.38888888888889e+00
+229 241 1.11111111111111e+01
+229 220 -9.72222222222223e+00
+229 139 -3.47222222222222e+00
+229 132 -8.90780504914090e-16
+229 228 8.88178419700125e-16
+229 153 4.85722573273506e-16
+229 39 -4.16666666666667e+00
+229 207 -1.85506991712270e-16
+229 240 8.88178419700125e-16
+229 219 1.47451495458029e-17
+229 138 -2.08333333333333e+00
+230 230 5.55555555555556e+01
+230 143 -3.47222222222222e+00
+230 55 -2.42861286636753e-16
+230 142 2.08333333333333e+00
+230 54 5.55111512312578e-17
+230 141 -2.08333333333333e+00
+230 161 5.55555555555556e+00
+230 59 -6.94444444444445e-01
+230 227 -9.72222222222222e+00
+230 167 -3.47222222222222e+00
+230 160 7.62410967691807e-16
+230 58 1.38777878078145e-17
+230 226 8.33333333333333e+00
+230 166 2.08333333333333e+00
+230 159 0.00000000000000e+00
+230 57 3.46944695195361e-16
+230 225 -2.55004350968591e-16
+230 165 2.08333333333333e+00
+230 158 5.55555555555555e+00
+230 44 -6.94444444444445e-01
+230 224 -9.72222222222222e+00
+230 164 -3.47222222222222e+00
+230 157 8.88178419700125e-16
+230 43 -4.61436444609831e-16
+230 223 -6.07153216591882e-17
+230 163 -2.08333333333333e+00
+230 156 5.79397640976254e-16
+230 42 1.17961196366423e-16
+230 222 8.33333333333333e+00
+230 162 2.08333333333333e+00
+230 134 5.55555555555556e+00
+230 56 -6.94444444444443e-01
+230 155 5.55555555555556e+00
+230 41 -6.94444444444444e-01
+230 209 -9.72222222222222e+00
+230 242 -2.22222222222222e+01
+230 221 -9.72222222222222e+00
+230 140 -3.47222222222222e+00
+230 133 8.88178419700125e-16
+230 229 0.00000000000000e+00
+230 154 5.58038858178289e-16
+230 40 -2.22911966663020e-16
+230 208 -1.49186218934005e-16
+230 241 -1.18763505974062e-15
+230 220 -8.33333333333333e+00
+230 139 -2.08333333333333e+00
+230 132 -2.79507320066763e-16
+230 228 -8.88178419700125e-16
+230 153 0.00000000000000e+00
+230 39 1.80411241501588e-16
+230 207 -8.33333333333333e+00
+230 240 -1.41813644161104e-16
+230 219 2.16840434497101e-17
+230 138 -2.08333333333333e+00
+231 231 1.11111111111111e+02
+231 46 0.00000000000000e+00
+231 45 0.00000000000000e+00
+231 80 -7.45931094670027e-17
+231 50 -2.08333333333333e+00
+231 79 3.38271077815477e-17
+231 49 -2.08333333333333e+00
+231 78 -1.38888888888889e+00
+231 48 -3.47222222222222e+00
+231 77 -8.33333333333333e+00
+231 35 -2.08333333333333e+00
+231 76 -6.68952740423556e-17
+231 34 2.08333333333333e+00
+231 75 -9.72222222222223e+00
+231 33 -3.47222222222222e+00
+231 83 0.00000000000000e+00
+231 185 5.58364118830035e-16
+231 74 3.72965547335014e-17
+231 32 0.00000000000000e+00
+231 82 0.00000000000000e+00
+231 184 8.88178419700125e-16
+231 73 7.92551788086904e-17
+231 31 0.00000000000000e+00
+231 81 0.00000000000000e+00
+231 183 1.11111111111111e+01
+231 72 -1.38888888888889e+00
+231 30 0.00000000000000e+00
+231 95 0.00000000000000e+00
+231 17 0.00000000000000e+00
+231 94 0.00000000000000e+00
+231 16 0.00000000000000e+00
+231 93 0.00000000000000e+00
+231 15 0.00000000000000e+00
+231 179 1.33226762955019e-15
+231 92 1.72388145425195e-16
+231 68 1.78459677591114e-16
+231 20 2.08333333333333e+00
+231 178 3.75892893200724e-16
+231 91 -8.33333333333333e+00
+231 67 1.45716771982052e-16
+231 19 -2.08333333333333e+00
+231 177 1.11111111111111e+01
+231 90 -9.72222222222222e+00
+231 66 -1.38888888888889e+00
+231 18 -3.47222222222222e+00
+231 176 -3.55848705536899e-16
+231 89 -1.84314369322536e-17
+231 65 8.33333333333333e+00
+231 5 2.08333333333333e+00
+231 175 -8.53917631049583e-16
+231 88 8.33333333333333e+00
+231 64 -1.17202254845683e-16
+231 4 2.08333333333333e+00
+231 174 -2.22222222222222e+01
+231 87 -9.72222222222222e+00
+231 63 -9.72222222222223e+00
+231 3 -3.47222222222222e+00
+231 182 0.00000000000000e+00
+231 233 0.00000000000000e+00
+231 173 1.33226762955019e-15
+231 86 0.00000000000000e+00
+231 71 0.00000000000000e+00
+231 170 3.63519435907234e-16
+231 62 1.75966012594397e-16
+231 2 0.00000000000000e+00
+231 181 0.00000000000000e+00
+231 232 -1.77635683940025e-15
+231 172 5.48877349820787e-16
+231 85 0.00000000000000e+00
+231 70 0.00000000000000e+00
+231 169 4.44089209850063e-16
+231 61 7.67615138119737e-17
+231 1 0.00000000000000e+00
+231 180 0.00000000000000e+00
+231 47 0.00000000000000e+00
+231 171 1.11111111111111e+01
+231 84 0.00000000000000e+00
+231 69 0.00000000000000e+00
+231 168 1.11111111111111e+01
+231 60 -1.38888888888889e+00
+231 0 0.00000000000000e+00
+232 232 1.11111111111111e+02
+232 46 0.00000000000000e+00
+232 45 0.00000000000000e+00
+232 80 -8.33333333333333e+00
+232 50 -2.08333333333333e+00
+232 79 -9.72222222222223e+00
+232 49 -3.47222222222222e+00
+232 78 7.68699340292223e-17
+232 48 -2.08333333333333e+00
+232 77 -3.23525928269675e-16
+232 35 2.08333333333333e+00
+232 76 -1.38888888888889e+00
+232 34 -3.47222222222222e+00
+232 75 -6.33174068731535e-17
+232 33 2.08333333333333e+00
+232 83 0.00000000000000e+00
+232 185 2.50559122061400e-16
+232 74 8.33333333333333e+00
+232 32 0.00000000000000e+00
+232 82 0.00000000000000e+00
+232 184 1.11111111111111e+01
+232 73 -9.72222222222223e+00
+232 31 0.00000000000000e+00
+232 81 0.00000000000000e+00
+232 183 8.88178419700125e-16
+232 72 1.45716771982052e-16
+232 30 0.00000000000000e+00
+232 95 0.00000000000000e+00
+232 17 0.00000000000000e+00
+232 94 0.00000000000000e+00
+232 16 0.00000000000000e+00
+232 93 0.00000000000000e+00
+232 15 0.00000000000000e+00
+232 179 1.56816291722872e-16
+232 92 2.33645568170626e-16
+232 68 8.33333333333333e+00
+232 20 2.08333333333333e+00
+232 178 -2.22222222222222e+01
+232 91 -9.72222222222222e+00
+232 67 -9.72222222222223e+00
+232 19 -3.47222222222222e+00
+232 177 4.39589770834248e-16
+232 90 -8.33333333333333e+00
+232 66 7.76288755499621e-17
+232 18 -2.08333333333333e+00
+232 176 1.33226762955019e-15
+232 89 3.51281503885303e-16
+232 65 2.33970828822372e-16
+232 5 -2.08333333333333e+00
+232 175 1.11111111111111e+01
+232 88 -9.72222222222222e+00
+232 64 -1.38888888888889e+00
+232 4 -3.47222222222222e+00
+232 174 -6.54966532398493e-16
+232 87 8.33333333333333e+00
+232 63 -9.71445146547012e-17
+232 3 2.08333333333333e+00
+232 182 0.00000000000000e+00
+232 233 -2.66453525910038e-15
+232 173 -4.13189447934226e-16
+232 86 0.00000000000000e+00
+232 71 0.00000000000000e+00
+232 170 8.84573447476611e-17
+232 62 -8.33333333333333e+00
+232 2 0.00000000000000e+00
+232 181 0.00000000000000e+00
+232 47 0.00000000000000e+00
+232 172 -2.22222222222222e+01
+232 85 0.00000000000000e+00
+232 70 0.00000000000000e+00
+232 169 1.11111111111111e+01
+232 61 -9.72222222222223e+00
+232 1 0.00000000000000e+00
+232 180 0.00000000000000e+00
+232 231 -8.88178419700125e-16
+232 171 3.74158169724748e-16
+232 84 0.00000000000000e+00
+232 69 0.00000000000000e+00
+232 168 8.88178419700125e-16
+232 60 3.38271077815477e-17
+232 0 0.00000000000000e+00
+233 233 1.11111111111111e+02
+233 46 0.00000000000000e+00
+233 45 0.00000000000000e+00
+233 80 -9.72222222222222e+00
+233 50 -3.47222222222222e+00
+233 79 -8.33333333333333e+00
+233 49 -2.08333333333333e+00
+233 78 1.75966012594397e-16
+233 48 -2.08333333333333e+00
+233 77 -9.72222222222222e+00
+233 35 -3.47222222222222e+00
+233 76 -3.83048627539129e-16
+233 34 2.08333333333333e+00
+233 75 -8.33333333333333e+00
+233 33 -2.08333333333333e+00
+233 83 0.00000000000000e+00
+233 185 -2.22222222222222e+01
+233 74 -9.72222222222222e+00
+233 32 0.00000000000000e+00
+233 82 0.00000000000000e+00
+233 184 9.53962386515683e-17
+233 73 8.33333333333333e+00
+233 31 0.00000000000000e+00
+233 81 0.00000000000000e+00
+233 183 1.41488383509358e-16
+233 72 1.76833374332386e-16
+233 30 0.00000000000000e+00
+233 95 0.00000000000000e+00
+233 17 0.00000000000000e+00
+233 94 0.00000000000000e+00
+233 16 0.00000000000000e+00
+233 93 0.00000000000000e+00
+233 15 0.00000000000000e+00
+233 179 1.11111111111111e+01
+233 92 -1.38888888888889e+00
+233 68 -9.72222222222222e+00
+233 20 -3.47222222222222e+00
+233 178 3.63966669303384e-16
+233 91 2.02962646689286e-16
+233 67 8.33333333333333e+00
+233 19 2.08333333333333e+00
+233 177 1.33226762955019e-15
+233 90 1.48318857196017e-16
+233 66 3.72965547335014e-17
+233 18 2.08333333333333e+00
+233 176 1.11111111111111e+01
+233 89 -1.38888888888889e+00
+233 65 -9.72222222222222e+00
+233 5 -3.47222222222222e+00
+233 175 1.33226762955019e-15
+233 88 4.06250554030319e-16
+233 64 2.61943244872498e-16
+233 4 -2.08333333333333e+00
+233 174 -4.52871247447195e-16
+233 87 -2.04697370165263e-16
+233 63 8.33333333333333e+00
+233 3 2.08333333333333e+00
+233 182 0.00000000000000e+00
+233 47 0.00000000000000e+00
+233 173 1.11111111111111e+01
+233 86 0.00000000000000e+00
+233 71 0.00000000000000e+00
+233 170 -2.22222222222222e+01
+233 62 -9.72222222222222e+00
+233 2 0.00000000000000e+00
+233 181 0.00000000000000e+00
+233 232 -2.66453525910038e-15
+233 172 -2.80455996967688e-16
+233 85 0.00000000000000e+00
+233 70 0.00000000000000e+00
+233 169 1.95047970830142e-16
+233 61 -8.33333333333333e+00
+233 1 0.00000000000000e+00
+233 180 0.00000000000000e+00
+233 231 0.00000000000000e+00
+233 171 1.33226762955019e-15
+233 84 0.00000000000000e+00
+233 69 0.00000000000000e+00
+233 168 5.58364118830035e-16
+233 60 3.64291929955129e-17
+233 0 0.00000000000000e+00
+234 234 1.11111111111111e+02
+234 49 2.08333333333333e+00
+234 48 -3.47222222222222e+00
+234 113 8.76035355368288e-17
+234 53 -2.08333333333333e+00
+234 112 -3.72965547335014e-17
+234 52 -2.08333333333333e+00
+234 111 -1.38888888888889e+00
+234 51 -3.47222222222222e+00
+234 110 -8.33333333333333e+00
+234 38 -2.08333333333333e+00
+234 109 -1.11022302462516e-16
+234 37 2.08333333333333e+00
+234 108 -9.72222222222223e+00
+234 36 -3.47222222222222e+00
+234 77 8.33333333333333e+00
+234 200 6.80987384538145e-16
+234 107 1.98625837999344e-16
+234 35 2.08333333333333e+00
+234 76 -6.07153216591882e-18
+234 199 4.44089209850063e-16
+234 106 7.60025722912339e-17
+234 34 -2.08333333333333e+00
+234 75 -9.72222222222223e+00
+234 198 1.11111111111111e+01
+234 105 -1.38888888888889e+00
+234 33 -3.47222222222222e+00
+234 92 -2.17707796235089e-16
+234 20 -2.08333333333333e+00
+234 91 8.33333333333333e+00
+234 19 2.08333333333333e+00
+234 90 -9.72222222222222e+00
+234 18 -3.47222222222222e+00
+234 197 1.77635683940025e-15
+234 119 -2.77555756156289e-17
+234 104 1.68051336735253e-16
+234 23 2.08333333333333e+00
+234 196 3.60063541482436e-16
+234 118 -8.33333333333333e+00
+234 103 4.33680868994202e-18
+234 22 -2.08333333333333e+00
+234 195 1.11111111111111e+01
+234 117 -9.72222222222222e+00
+234 102 -1.38888888888889e+00
+234 21 -3.47222222222222e+00
+234 194 -3.15174861036105e-15
+234 116 -2.54136989230602e-16
+234 101 8.33333333333333e+00
+234 8 2.08333333333333e+00
+234 193 -1.06151524202625e-15
+234 115 8.33333333333333e+00
+234 100 -9.97465998686664e-17
+234 7 2.08333333333333e+00
+234 192 -2.22222222222222e+01
+234 114 -9.72222222222222e+00
+234 99 -9.72222222222223e+00
+234 6 -3.47222222222222e+00
+234 176 -2.21394083621540e-16
+234 236 3.55271367880050e-15
+234 191 1.77635683940025e-15
+234 89 3.03576608295941e-17
+234 65 -8.33333333333333e+00
+234 188 2.95756800126890e-16
+234 98 1.68159756952502e-16
+234 5 -2.08333333333333e+00
+234 175 5.93167008566819e-16
+234 235 -8.88178419700125e-16
+234 190 -2.20364091557679e-17
+234 88 -8.33333333333333e+00
+234 64 6.93889390390723e-18
+234 187 8.88178419700125e-16
+234 97 1.29020058525775e-17
+234 4 -2.08333333333333e+00
+234 174 -2.22222222222222e+01
+234 50 2.08333333333333e+00
+234 189 1.11111111111111e+01
+234 87 -9.72222222222222e+00
+234 63 -9.72222222222223e+00
+234 186 1.11111111111111e+01
+234 96 -1.38888888888889e+00
+234 3 -3.47222222222222e+00
+235 235 1.11111111111111e+02
+235 49 -3.47222222222222e+00
+235 48 2.08333333333333e+00
+235 113 -8.33333333333333e+00
+235 53 -2.08333333333333e+00
+235 112 -9.72222222222223e+00
+235 52 -3.47222222222222e+00
+235 111 4.07660016854550e-17
+235 51 -2.08333333333333e+00
+235 110 1.05818132034585e-16
+235 38 2.08333333333333e+00
+235 109 -1.38888888888889e+00
+235 37 -3.47222222222222e+00
+235 108 -2.16840434497101e-17
+235 36 2.08333333333333e+00
+235 77 -1.88217497143484e-16
+235 200 -3.29597460435593e-17
+235 107 8.33333333333333e+00
+235 35 2.08333333333333e+00
+235 76 -1.38888888888889e+00
+235 199 1.11111111111111e+01
+235 106 -9.72222222222223e+00
+235 34 -3.47222222222222e+00
+235 75 4.33680868994202e-17
+235 198 8.88178419700125e-16
+235 105 -9.54097911787244e-18
+235 33 -2.08333333333333e+00
+235 92 3.78169717762944e-16
+235 20 2.08333333333333e+00
+235 91 -9.72222222222222e+00
+235 19 -3.47222222222222e+00
+235 90 8.33333333333333e+00
+235 18 2.08333333333333e+00
+235 197 1.70639869422062e-16
+235 119 -9.44556932669371e-16
+235 104 8.33333333333333e+00
+235 23 2.08333333333333e+00
+235 196 -2.22222222222222e+01
+235 118 -9.72222222222222e+00
+235 103 -9.72222222222223e+00
+235 22 -3.47222222222222e+00
+235 195 1.51435938441913e-16
+235 117 -8.33333333333333e+00
+235 102 7.52436307704940e-17
+235 21 -2.08333333333333e+00
+235 194 3.99680288865056e-15
+235 116 7.88431819831459e-16
+235 101 3.95300112088215e-16
+235 8 -2.08333333333333e+00
+235 193 1.11111111111111e+01
+235 115 -9.72222222222222e+00
+235 100 -1.38888888888889e+00
+235 7 -3.47222222222222e+00
+235 192 -1.04874876144523e-15
+235 114 8.33333333333333e+00
+235 99 -4.85722573273506e-17
+235 6 2.08333333333333e+00
+235 176 2.22044604925031e-15
+235 236 -1.77635683940025e-15
+235 191 -4.68375338513738e-17
+235 89 1.43982048506075e-16
+235 65 3.49763620843824e-16
+235 188 9.51929507442273e-17
+235 98 -8.33333333333334e+00
+235 5 -2.08333333333333e+00
+235 175 1.11111111111111e+01
+235 50 -2.08333333333333e+00
+235 190 -2.22222222222222e+01
+235 88 -9.72222222222222e+00
+235 64 -1.38888888888889e+00
+235 187 1.11111111111111e+01
+235 97 -9.72222222222223e+00
+235 4 -3.47222222222222e+00
+235 174 7.89759967492754e-16
+235 234 -1.77635683940025e-15
+235 189 1.27610595701544e-16
+235 87 -8.33333333333333e+00
+235 63 9.62771529167128e-17
+235 186 8.88178419700125e-16
+235 96 -5.11743425413158e-17
+235 3 -2.08333333333333e+00
+236 236 1.11111111111111e+02
+236 49 -2.08333333333333e+00
+236 48 2.08333333333333e+00
+236 113 -9.72222222222222e+00
+236 53 -3.47222222222222e+00
+236 112 -8.33333333333334e+00
+236 52 -2.08333333333333e+00
+236 111 1.67400815431762e-16
+236 51 -2.08333333333333e+00
+236 110 -9.72222222222222e+00
+236 38 -3.47222222222222e+00
+236 109 2.63677968348475e-16
+236 37 2.08333333333333e+00
+236 108 -8.33333333333333e+00
+236 36 -2.08333333333333e+00
+236 77 -9.72222222222222e+00
+236 200 -2.22222222222222e+01
+236 107 -9.72222222222222e+00
+236 35 -3.47222222222222e+00
+236 76 -3.02926086992450e-16
+236 199 2.37548695991574e-16
+236 106 8.33333333333333e+00
+236 34 2.08333333333333e+00
+236 75 8.33333333333333e+00
+236 198 4.06779102589405e-16
+236 105 5.71374544899861e-17
+236 33 2.08333333333333e+00
+236 92 -1.38888888888889e+00
+236 20 -3.47222222222222e+00
+236 91 3.22658566531686e-16
+236 19 2.08333333333333e+00
+236 90 -1.72062884773450e-16
+236 18 -2.08333333333333e+00
+236 197 1.11111111111111e+01
+236 119 -1.38888888888889e+00
+236 104 -9.72222222222222e+00
+236 23 -3.47222222222222e+00
+236 196 3.41740524767431e-16
+236 118 -1.12583553590895e-15
+236 103 8.33333333333333e+00
+236 22 2.08333333333333e+00
+236 195 1.77635683940025e-15
+236 117 3.38271077815477e-17
+236 102 1.36175792864179e-16
+236 21 2.08333333333333e+00
+236 194 1.11111111111111e+01
+236 116 -1.38888888888889e+00
+236 101 -9.72222222222222e+00
+236 8 -3.47222222222222e+00
+236 193 2.66453525910038e-15
+236 115 8.25403113913215e-16
+236 100 5.35162192338845e-16
+236 7 -2.08333333333333e+00
+236 192 -3.19286697775256e-15
+236 114 -2.08166817117217e-16
+236 99 8.33333333333333e+00
+236 6 2.08333333333333e+00
+236 176 1.11111111111111e+01
+236 50 -3.47222222222222e+00
+236 191 1.11111111111111e+01
+236 89 -1.38888888888889e+00
+236 65 -9.72222222222222e+00
+236 188 -2.22222222222222e+01
+236 98 -9.72222222222222e+00
+236 5 -3.47222222222222e+00
+236 175 2.66453525910038e-15
+236 235 -1.77635683940025e-15
+236 190 -3.88049510059718e-16
+236 88 1.44957830461312e-16
+236 64 5.90673343570103e-16
+236 187 -1.50920942409982e-16
+236 97 -8.33333333333333e+00
+236 4 -2.08333333333333e+00
+236 174 -1.68715410565901e-16
+236 234 3.55271367880050e-15
+236 189 1.77635683940025e-15
+236 87 -8.99887803162969e-18
+236 63 -8.33333333333333e+00
+236 186 7.30427003603484e-16
+236 96 8.76035355368288e-17
+236 3 -2.08333333333333e+00
+237 237 1.11111111111111e+02
+237 52 2.08333333333333e+00
+237 51 -3.47222222222222e+00
+237 137 1.78676518025611e-16
+237 56 -2.08333333333333e+00
+237 136 4.68375338513738e-17
+237 55 -2.08333333333333e+00
+237 135 -1.38888888888889e+00
+237 54 -3.47222222222222e+00
+237 134 -8.33333333333333e+00
+237 41 -2.08333333333333e+00
+237 133 5.75060832286312e-16
+237 40 2.08333333333333e+00
+237 132 -9.72222222222222e+00
+237 39 -3.47222222222222e+00
+237 110 8.33333333333333e+00
+237 215 8.03393809811759e-16
+237 131 2.35055030994857e-16
+237 38 2.08333333333333e+00
+237 109 -2.77555756156289e-16
+237 214 4.44089209850063e-16
+237 130 -5.19332840620557e-17
+237 37 -2.08333333333333e+00
+237 108 -9.72222222222223e+00
+237 213 1.11111111111111e+01
+237 129 -1.38888888888889e+00
+237 36 -3.47222222222222e+00
+237 119 -5.46437894932694e-16
+237 23 -2.08333333333333e+00
+237 118 8.33333333333333e+00
+237 22 2.08333333333333e+00
+237 117 -9.72222222222222e+00
+237 21 -3.47222222222222e+00
+237 212 2.22044604925031e-15
+237 143 -1.33573707650214e-16
+237 128 2.65521112041700e-16
+237 26 2.08333333333333e+00
+237 211 -8.82540568403201e-17
+237 142 -8.33333333333333e+00
+237 127 3.38271077815477e-17
+237 25 -2.08333333333333e+00
+237 210 1.11111111111111e+01
+237 141 -9.72222222222222e+00
+237 126 -1.38888888888889e+00
+237 24 -3.47222222222222e+00
+237 209 -1.76495916406200e-15
+237 140 -3.34801630863524e-16
+237 125 8.33333333333333e+00
+237 11 2.08333333333333e+00
+237 208 3.39508423544826e-15
+237 139 8.33333333333333e+00
+237 124 5.55111512312578e-16
+237 10 2.08333333333333e+00
+237 207 -2.22222222222222e+01
+237 138 -9.72222222222222e+00
+237 123 -9.72222222222222e+00
+237 9 -3.47222222222222e+00
+237 194 -2.43392545701271e-15
+237 239 3.55271367880050e-15
+237 206 2.66453525910038e-15
+237 116 -5.12610787151146e-16
+237 101 -8.33333333333333e+00
+237 203 1.32677885605198e-15
+237 122 5.40583203201273e-16
+237 8 -2.08333333333333e+00
+237 193 -3.10515502199848e-16
+237 238 -5.32907051820075e-15
+237 205 -4.56205169127588e-16
+237 115 -8.33333333333333e+00
+237 100 -2.22044604925031e-16
+237 202 4.44089209850063e-16
+237 121 -2.58040117051550e-17
+237 7 -2.08333333333333e+00
+237 192 -2.22222222222222e+01
+237 53 2.08333333333333e+00
+237 204 1.11111111111111e+01
+237 114 -9.72222222222222e+00
+237 99 -9.72222222222223e+00
+237 201 1.11111111111111e+01
+237 120 -1.38888888888889e+00
+237 6 -3.47222222222222e+00
+238 238 1.11111111111111e+02
+238 52 -3.47222222222222e+00
+238 51 2.08333333333333e+00
+238 137 -8.33333333333334e+00
+238 56 -2.08333333333333e+00
+238 136 -9.72222222222223e+00
+238 55 -3.47222222222222e+00
+238 135 5.74627151417317e-17
+238 54 -2.08333333333333e+00
+238 134 1.34614541735800e-15
+238 41 2.08333333333333e+00
+238 133 -1.38888888888889e+00
+238 40 -3.47222222222222e+00
+238 132 5.20417042793042e-16
+238 39 2.08333333333333e+00
+238 110 1.69135538907739e-16
+238 215 1.22785896033983e-15
+238 131 8.33333333333333e+00
+238 38 2.08333333333333e+00
+238 109 -1.38888888888889e+00
+238 214 1.11111111111111e+01
+238 130 -9.72222222222223e+00
+238 37 -3.47222222222222e+00
+238 108 -3.10515502199848e-16
+238 213 0.00000000000000e+00
+238 129 -7.71951946809679e-17
+238 36 -2.08333333333333e+00
+238 119 1.57339419271096e-15
+238 23 2.08333333333333e+00
+238 118 -9.72222222222222e+00
+238 22 -3.47222222222222e+00
+238 117 8.33333333333333e+00
+238 21 2.08333333333333e+00
+238 212 -1.66968489815483e-15
+238 143 -8.15753714578094e-16
+238 128 8.33333333333333e+00
+238 26 2.08333333333333e+00
+238 211 -2.22222222222222e+01
+238 142 -9.72222222222222e+00
+238 127 -9.72222222222223e+00
+238 25 -3.47222222222222e+00
+238 210 9.71716197090133e-17
+238 141 -8.33333333333333e+00
+238 126 3.04660810468427e-17
+238 24 -2.08333333333333e+00
+238 209 3.55271367880050e-15
+238 140 3.10515502199848e-16
+238 125 -9.02164627725188e-16
+238 11 -2.08333333333333e+00
+238 208 1.11111111111111e+01
+238 139 -9.72222222222222e+00
+238 124 -1.38888888888889e+00
+238 10 -3.47222222222222e+00
+238 207 3.32828382909600e-15
+238 138 8.33333333333333e+00
+238 123 6.34908792207511e-16
+238 9 2.08333333333333e+00
+238 194 8.88178419700125e-16
+238 239 2.66453525910038e-15
+238 206 -2.29709914284504e-15
+238 116 -2.09901540593194e-16
+238 101 -2.22478285794026e-16
+238 203 7.46798456408015e-16
+238 122 -8.33333333333334e+00
+238 8 -2.08333333333333e+00
+238 193 1.11111111111111e+01
+238 53 -2.08333333333333e+00
+238 205 -2.22222222222222e+01
+238 115 -9.72222222222222e+00
+238 100 -1.38888888888889e+00
+238 202 1.11111111111111e+01
+238 121 -9.72222222222223e+00
+238 7 -3.47222222222222e+00
+238 192 -5.05970048844673e-16
+238 237 -5.32907051820075e-15
+238 204 -5.30500122997157e-16
+238 114 -8.33333333333333e+00
+238 99 -2.40150781205539e-16
+238 201 0.00000000000000e+00
+238 120 4.07660016854550e-17
+238 6 -2.08333333333333e+00
+239 239 1.11111111111111e+02
+239 52 -2.08333333333333e+00
+239 51 2.08333333333333e+00
+239 137 -9.72222222222222e+00
+239 56 -3.47222222222222e+00
+239 136 -8.33333333333334e+00
+239 55 -2.08333333333333e+00
+239 135 4.29560900738757e-16
+239 54 -2.08333333333333e+00
+239 134 -9.72222222222222e+00
+239 41 -3.47222222222222e+00
+239 133 1.16616785672541e-15
+239 40 2.08333333333333e+00
+239 132 -8.33333333333333e+00
+239 39 -2.08333333333333e+00
+239 110 -9.72222222222222e+00
+239 215 -2.22222222222222e+01
+239 131 -9.72222222222222e+00
+239 38 -3.47222222222222e+00
+239 109 1.69460799559484e-16
+239 214 9.68843061333047e-16
+239 130 8.33333333333333e+00
+239 37 2.08333333333333e+00
+239 108 8.33333333333333e+00
+239 213 1.43790957873174e-15
+239 129 4.31187203997485e-16
+239 36 2.08333333333333e+00
+239 119 -1.38888888888889e+00
+239 23 -3.47222222222222e+00
+239 118 1.64104840827406e-15
+239 22 2.08333333333333e+00
+239 117 -5.88613359442380e-16
+239 21 -2.08333333333333e+00
+239 212 1.11111111111111e+01
+239 143 -1.38888888888889e+00
+239 128 -9.72222222222222e+00
+239 26 -3.47222222222222e+00
+239 211 -1.91545997813014e-15
+239 142 -9.15066633577766e-16
+239 127 8.33333333333333e+00
+239 25 2.08333333333333e+00
+239 210 2.22044604925031e-15
+239 141 -1.59594559789866e-16
+239 126 9.62771529167128e-17
+239 24 2.08333333333333e+00
+239 209 1.11111111111111e+01
+239 140 -1.38888888888889e+00
+239 125 -9.72222222222222e+00
+239 11 -3.47222222222222e+00
+239 208 3.10862446895044e-15
+239 139 2.56522234010070e-16
+239 124 -1.00787433954252e-15
+239 10 -2.08333333333333e+00
+239 207 -1.58271833139434e-15
+239 138 -3.50414142147315e-16
+239 123 8.33333333333333e+00
+239 9 2.08333333333333e+00
+239 194 1.11111111111111e+01
+239 53 -3.47222222222222e+00
+239 206 1.11111111111111e+01
+239 116 -1.38888888888889e+00
+239 101 -9.72222222222222e+00
+239 203 -2.22222222222222e+01
+239 122 -9.72222222222222e+00
+239 8 -3.47222222222222e+00
+239 193 1.77635683940025e-15
+239 238 2.66453525910038e-15
+239 205 -2.32194092512211e-15
+239 115 -1.92879566485171e-16
+239 100 -3.15719672627779e-16
+239 202 1.11683665787732e-15
+239 121 -8.33333333333334e+00
+239 7 -2.08333333333333e+00
+239 192 -2.47236042402732e-15
+239 237 3.55271367880050e-15
+239 204 2.66453525910038e-15
+239 114 -4.36716635077161e-16
+239 99 -8.33333333333333e+00
+239 201 7.70542483985448e-16
+239 120 2.14238349283136e-16
+239 6 -2.08333333333333e+00
+240 240 1.11111111111111e+02
+240 55 2.08333333333333e+00
+240 54 -3.47222222222222e+00
+240 161 -1.38777878078145e-16
+240 59 -2.08333333333333e+00
+240 160 2.16840434497101e-17
+240 58 -2.08333333333333e+00
+240 159 -1.38888888888889e+00
+240 57 -3.47222222222222e+00
+240 158 -8.33333333333333e+00
+240 44 -2.08333333333333e+00
+240 157 1.05601291600088e-16
+240 43 2.08333333333333e+00
+240 156 -9.72222222222223e+00
+240 42 -3.47222222222222e+00
+240 134 8.33333333333333e+00
+240 230 -3.12683906544819e-16
+240 155 -1.92554305833426e-16
+240 41 2.08333333333333e+00
+240 133 -1.39645239816133e-16
+240 229 8.88178419700125e-16
+240 154 7.20994444702860e-17
+240 40 -2.08333333333333e+00
+240 132 -9.72222222222222e+00
+240 228 1.11111111111111e+01
+240 153 -1.38888888888889e+00
+240 39 -3.47222222222222e+00
+240 143 1.25767452008319e-16
+240 26 -2.08333333333333e+00
+240 142 8.33333333333333e+00
+240 25 2.08333333333333e+00
+240 141 -9.72222222222222e+00
+240 24 -3.47222222222222e+00
+240 227 -4.44089209850063e-16
+240 167 5.38523219073550e-16
+240 152 -6.40763483938933e-17
+240 29 2.08333333333333e+00
+240 226 1.24867564205156e-15
+240 166 -8.33333333333333e+00
+240 151 2.25514051876985e-17
+240 28 -2.08333333333333e+00
+240 225 1.11111111111111e+01
+240 165 -9.72222222222222e+00
+240 150 -1.38888888888889e+00
+240 27 -3.47222222222222e+00
+240 224 1.33432761367791e-15
+240 164 3.25911173049143e-16
+240 149 8.33333333333333e+00
+240 14 2.08333333333333e+00
+240 223 -5.66942868519826e-16
+240 163 8.33333333333333e+00
+240 148 8.99887803162969e-17
+240 13 2.08333333333333e+00
+240 222 -2.22222222222222e+01
+240 162 -9.72222222222222e+00
+240 147 -9.72222222222223e+00
+240 12 -3.47222222222222e+00
+240 209 -4.87674137183980e-16
+240 242 -8.88178419700125e-16
+240 221 -4.44089209850063e-16
+240 140 3.73832909073002e-16
+240 125 -8.33333333333333e+00
+240 218 -1.86442116086039e-16
+240 146 -1.18178036800920e-17
+240 11 -2.08333333333333e+00
+240 208 -1.85647937994693e-15
+240 241 1.77635683940025e-15
+240 220 9.06325253562101e-16
+240 139 -8.33333333333333e+00
+240 124 -9.88792381306780e-17
+240 217 8.88178419700125e-16
+240 145 5.58364118830035e-17
+240 10 -2.08333333333333e+00
+240 207 -2.22222222222222e+01
+240 56 2.08333333333333e+00
+240 219 1.11111111111111e+01
+240 138 -9.72222222222222e+00
+240 123 -9.72222222222222e+00
+240 216 1.11111111111111e+01
+240 144 -1.38888888888889e+00
+240 9 -3.47222222222222e+00
+241 241 1.11111111111111e+02
+241 55 -3.47222222222222e+00
+241 54 2.08333333333333e+00
+241 161 -8.33333333333333e+00
+241 59 -2.08333333333333e+00
+241 160 -9.72222222222223e+00
+241 58 -3.47222222222222e+00
+241 159 6.97141996908179e-17
+241 57 -2.08333333333333e+00
+241 158 -9.54097911787244e-17
+241 44 2.08333333333333e+00
+241 157 -1.38888888888889e+00
+241 43 -3.47222222222222e+00
+241 156 6.85215773010839e-17
+241 42 2.08333333333333e+00
+241 134 9.45424294407360e-16
+241 230 -1.18763505974062e-15
+241 155 8.33333333333333e+00
+241 41 2.08333333333333e+00
+241 133 -1.38888888888889e+00
+241 229 1.11111111111111e+01
+241 154 -9.72222222222223e+00
+241 40 -3.47222222222222e+00
+241 132 -2.21068822969794e-16
+241 228 8.88178419700125e-16
+241 153 5.03069808033274e-17
+241 39 -2.08333333333333e+00
+241 143 -8.73758530806068e-16
+241 26 2.08333333333333e+00
+241 142 -9.72222222222222e+00
+241 25 -3.47222222222222e+00
+241 141 8.33333333333333e+00
+241 24 2.08333333333333e+00
+241 227 1.49947870960176e-15
+241 167 4.51353364405715e-16
+241 152 8.33333333333333e+00
+241 29 2.08333333333333e+00
+241 226 -2.22222222222222e+01
+241 166 -9.72222222222222e+00
+241 151 -9.72222222222223e+00
+241 28 -3.47222222222222e+00
+241 225 9.02733833865743e-16
+241 165 -8.33333333333333e+00
+241 150 1.95373231481888e-16
+241 27 -2.08333333333333e+00
+241 224 3.10862446895044e-15
+241 164 -5.25621213220973e-16
+241 149 -1.49945160454745e-16
+241 14 -2.08333333333333e+00
+241 223 1.11111111111111e+01
+241 163 -9.72222222222222e+00
+241 148 -1.38888888888889e+00
+241 13 -3.47222222222222e+00
+241 222 -7.13079768843716e-16
+241 162 8.33333333333333e+00
+241 147 4.85722573273506e-17
+241 12 2.08333333333333e+00
+241 209 3.55271367880050e-15
+241 242 -3.55271367880050e-15
+241 221 1.29573001633743e-15
+241 140 -8.23126289350995e-16
+241 125 -3.60930903220424e-16
+241 218 -1.52079683481826e-15
+241 146 -8.33333333333333e+00
+241 11 -2.08333333333333e+00
+241 208 1.11111111111111e+01
+241 56 -2.08333333333333e+00
+241 220 -2.22222222222222e+01
+241 139 -9.72222222222222e+00
+241 124 -1.38888888888889e+00
+241 217 1.11111111111111e+01
+241 145 -9.72222222222223e+00
+241 10 -3.47222222222222e+00
+241 207 -1.82174425284592e-15
+241 240 8.88178419700125e-16
+241 219 1.14199014827898e-15
+241 138 -8.33333333333333e+00
+241 123 -1.87241715188247e-16
+241 216 8.88178419700125e-16
+241 144 1.47451495458029e-17
+241 9 -2.08333333333333e+00
+242 242 1.11111111111111e+02
+242 55 -2.08333333333333e+00
+242 54 2.08333333333333e+00
+242 161 -9.72222222222222e+00
+242 59 -3.47222222222222e+00
+242 160 -8.33333333333333e+00
+242 58 -2.08333333333333e+00
+242 159 -1.23707467880596e-16
+242 57 -2.08333333333333e+00
+242 158 -9.72222222222222e+00
+242 44 -3.47222222222222e+00
+242 157 -1.88759598229726e-16
+242 43 2.08333333333333e+00
+242 156 -8.33333333333333e+00
+242 42 -2.08333333333333e+00
+242 134 -9.72222222222222e+00
+242 230 -2.22222222222222e+01
+242 155 -9.72222222222222e+00
+242 41 -3.47222222222222e+00
+242 133 8.13802150667620e-16
+242 229 -1.51299057917637e-15
+242 154 8.33333333333333e+00
+242 40 2.08333333333333e+00
+242 132 8.33333333333333e+00
+242 228 -7.55417863679275e-17
+242 153 -1.22081164621868e-16
+242 39 2.08333333333333e+00
+242 143 -1.38888888888889e+00
+242 26 -3.47222222222222e+00
+242 142 -8.07513778067204e-16
+242 25 2.08333333333333e+00
+242 141 9.70360944374526e-17
+242 24 -2.08333333333333e+00
+242 227 1.11111111111111e+01
+242 167 -1.38888888888889e+00
+242 152 -9.72222222222222e+00
+242 29 -3.47222222222222e+00
+242 226 1.56634687858981e-15
+242 166 3.98119037736677e-16
+242 151 8.33333333333333e+00
+242 28 2.08333333333333e+00
+242 225 -4.44089209850063e-16
+242 165 7.10369263412503e-16
+242 150 -2.55004350968591e-16
+242 27 2.08333333333333e+00
+242 224 1.11111111111111e+01
+242 164 -1.38888888888889e+00
+242 149 -9.72222222222222e+00
+242 14 -3.47222222222222e+00
+242 223 2.66453525910038e-15
+242 163 -5.49798921667399e-16
+242 148 -6.07153216591882e-17
+242 13 -2.08333333333333e+00
+242 222 1.28358695200559e-15
+242 162 2.53269627492614e-16
+242 147 8.33333333333333e+00
+242 12 2.08333333333333e+00
+242 209 1.11111111111111e+01
+242 56 -3.47222222222222e+00
+242 221 1.11111111111111e+01
+242 140 -1.38888888888889e+00
+242 125 -9.72222222222222e+00
+242 218 -2.22222222222222e+01
+242 146 -9.72222222222222e+00
+242 11 -3.47222222222222e+00
+242 208 2.66453525910038e-15
+242 241 -3.55271367880050e-15
+242 220 1.27742055214958e-15
+242 139 -7.56447855743136e-16
+242 124 -1.49186218934005e-16
+242 217 -1.24401357270987e-15
+242 145 -8.33333333333333e+00
+242 10 -2.08333333333333e+00
+242 207 -3.54520557875604e-16
+242 240 -8.88178419700125e-16
+242 219 -4.44089209850063e-16
+242 138 3.45101551502136e-16
+242 123 -8.33333333333333e+00
+242 216 -1.41813644161104e-16
+242 144 2.16840434497101e-17
+242 9 -2.08333333333333e+00
diff --git a/external/hypre/src/test/TEST_ij/data/beam_hex_dof459_np2/A.IJ.00001 b/external/hypre/src/test/TEST_ij/data/beam_hex_dof459_np2/A.IJ.00001
new file mode 100644
index 00000000..ae4d64a0
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/data/beam_hex_dof459_np2/A.IJ.00001
@@ -0,0 +1,10142 @@
+243 458 243 458
+243 243 5.55555555555555e-01
+243 407 -8.33333333333334e-02
+243 404 -1.21871100450949e-17
+243 317 -7.15747075594620e-17
+243 451 -4.16666666666667e-02
+243 406 -7.44372554047079e-18
+243 403 -8.33333333333334e-02
+243 316 -4.50100602676726e-17
+243 450 -6.94444444444444e-02
+243 405 -9.72222222222222e-02
+243 402 -9.72222222222221e-02
+243 315 -1.11111111111111e-01
+243 449 4.16666666666667e-02
+243 395 1.25496401465197e-17
+243 311 5.25651706407074e-17
+243 392 8.33333333333333e-02
+243 389 -1.47451495458029e-17
+243 296 4.16333634234434e-17
+243 245 1.11022302462516e-16
+243 293 -4.60260762879042e-17
+243 448 4.16666666666667e-02
+243 394 7.67073037033494e-18
+243 310 1.38777878078145e-17
+243 391 -8.40256683676266e-18
+243 388 8.33333333333334e-02
+243 295 2.84823298843731e-17
+243 244 4.16333634234434e-17
+243 292 -1.44622405414199e-17
+243 447 -6.94444444444444e-02
+243 393 -2.77777777777779e-02
+243 309 1.11111111111111e-01
+243 390 -9.72222222222223e-02
+243 387 -9.72222222222223e-02
+243 294 1.11111111111111e-01
+243 452 -4.16666666666667e-02
+243 291 -1.11111111111111e-01
+244 244 5.55555555555556e-01
+244 407 -2.01390553539182e-17
+244 404 -3.32629838386764e-17
+244 317 4.16666666666667e-02
+244 451 -6.94444444444445e-02
+244 406 -1.38888888888889e-02
+244 403 -9.72222222222224e-02
+244 316 5.55555555555557e-02
+244 450 -4.16666666666667e-02
+244 405 -7.38612730005750e-18
+244 402 -8.33333333333334e-02
+244 315 -4.19975875907627e-17
+244 449 -4.16666666666666e-02
+244 395 -1.66666666666667e-01
+244 311 2.20702904736580e-17
+244 392 -3.38813178901720e-19
+244 389 3.39541627236359e-17
+244 296 -3.51963365407843e-18
+244 245 1.66666666666667e-01
+244 293 4.16666666666666e-02
+244 448 -6.94444444444444e-02
+244 394 -1.94444444444445e-01
+244 310 1.11111111111111e-01
+244 391 -1.38888888888889e-02
+244 388 -9.72222222222221e-02
+244 295 -2.22222222222222e-01
+244 452 -4.16666666666668e-02
+244 292 5.55555555555554e-02
+244 447 4.16666666666667e-02
+244 393 9.03953561309789e-18
+244 309 1.38777878078145e-17
+244 390 -9.91536768055884e-18
+244 387 8.33333333333334e-02
+244 294 3.21883107868475e-17
+244 243 4.16333634234434e-17
+244 291 -1.47330793263045e-17
+245 245 5.55555555555556e-01
+245 407 -9.72222222222225e-02
+245 404 -1.38888888888889e-02
+245 317 5.55555555555557e-02
+245 451 -4.16666666666668e-02
+245 406 -2.04287406218792e-17
+245 403 -3.29326409892472e-17
+245 316 4.16666666666667e-02
+245 450 -4.16666666666667e-02
+245 405 -8.33333333333334e-02
+245 402 -1.29833210155139e-17
+245 315 -7.26957556651531e-17
+245 449 -6.94444444444444e-02
+245 395 -1.94444444444445e-01
+245 311 -2.22222222222222e-01
+245 392 -9.72222222222221e-02
+245 389 -1.38888888888889e-02
+245 296 1.11111111111111e-01
+245 452 -6.94444444444445e-02
+245 293 5.55555555555554e-02
+245 448 -4.16666666666666e-02
+245 394 -1.66666666666667e-01
+245 310 1.94944632810577e-17
+245 391 5.86146799499976e-19
+245 388 3.28648783534669e-17
+245 295 -8.12643409595776e-18
+245 244 1.66666666666667e-01
+245 292 4.16666666666666e-02
+245 447 4.16666666666667e-02
+245 393 1.45554141656179e-17
+245 309 4.70810558237094e-17
+245 390 8.33333333333333e-02
+245 387 -1.33424629851497e-17
+245 294 4.16333634234434e-17
+245 243 1.11022302462516e-16
+245 291 -4.49395447748137e-17
+246 246 5.55555555555555e-01
+246 422 -8.33333333333334e-02
+246 419 -1.58733974315456e-17
+246 341 -2.12969493928149e-17
+246 454 -4.16666666666667e-02
+246 421 3.34408607575998e-18
+246 418 -8.33333333333334e-02
+246 340 1.11545768823919e-17
+246 453 -6.94444444444444e-02
+246 420 -9.72222222222223e-02
+246 417 -9.72222222222222e-02
+246 339 -1.11111111111111e-01
+246 452 4.16666666666667e-02
+246 410 1.51788304147971e-18
+246 335 -2.45639554703747e-18
+246 407 8.33333333333334e-02
+246 404 6.83047368665868e-18
+246 320 6.93889390390723e-18
+246 248 0.00000000000000e+00
+246 317 6.22738622821362e-18
+246 451 4.16666666666667e-02
+246 409 -4.11996825544492e-18
+246 334 -6.93889390390723e-18
+246 406 3.79470760369927e-18
+246 403 8.33333333333334e-02
+246 319 -1.18889544476614e-17
+246 247 0.00000000000000e+00
+246 316 8.32125167382625e-18
+246 450 -6.94444444444445e-02
+246 408 -2.77777777777777e-02
+246 333 1.11111111111111e-01
+246 405 -9.72222222222222e-02
+246 402 -9.72222222222222e-02
+246 318 1.11111111111111e-01
+246 455 -4.16666666666667e-02
+246 315 -1.11111111111111e-01
+247 247 5.55555555555556e-01
+247 422 1.40268656065312e-17
+247 419 -3.78488202151112e-17
+247 341 4.16666666666667e-02
+247 454 -6.94444444444444e-02
+247 421 -1.38888888888889e-02
+247 418 -9.72222222222221e-02
+247 340 5.55555555555555e-02
+247 453 -4.16666666666667e-02
+247 420 3.15773882736403e-18
+247 417 -8.33333333333334e-02
+247 339 1.27021060770255e-17
+247 452 -4.16666666666667e-02
+247 410 -1.66666666666667e-01
+247 335 -8.52115144937826e-19
+247 407 -1.09504419421036e-17
+247 404 1.56192875473693e-18
+247 320 1.01290317415037e-17
+247 248 1.66666666666667e-01
+247 317 4.16666666666667e-02
+247 451 -6.94444444444445e-02
+247 409 -1.94444444444444e-01
+247 334 1.11111111111111e-01
+247 406 -1.38888888888889e-02
+247 403 -9.72222222222222e-02
+247 319 -2.22222222222222e-01
+247 455 -4.16666666666667e-02
+247 316 5.55555555555555e-02
+247 450 4.16666666666667e-02
+247 408 -4.42320605056196e-18
+247 333 0.00000000000000e+00
+247 405 4.34019682173103e-18
+247 402 8.33333333333334e-02
+247 318 -1.61016728108306e-17
+247 246 0.00000000000000e+00
+247 315 1.10588621593521e-17
+248 248 5.55555555555555e-01
+248 422 -9.72222222222223e-02
+248 419 -1.38888888888889e-02
+248 341 5.55555555555556e-02
+248 454 -4.16666666666667e-02
+248 421 1.27292111313376e-17
+248 418 -3.80690487813973e-17
+248 340 4.16666666666667e-02
+248 453 -4.16666666666667e-02
+248 420 -8.33333333333334e-02
+248 417 -1.53008031592017e-17
+248 339 -2.15281893874153e-17
+248 452 -6.94444444444445e-02
+248 410 -1.94444444444444e-01
+248 335 -2.22222222222222e-01
+248 407 -9.72222222222222e-02
+248 404 -1.38888888888889e-02
+248 320 1.11111111111111e-01
+248 455 -6.94444444444445e-02
+248 317 5.55555555555555e-02
+248 451 -4.16666666666667e-02
+248 409 -1.66666666666667e-01
+248 334 -3.38622596488588e-18
+248 406 -1.31561157367538e-17
+248 403 3.17129135452010e-18
+248 319 1.51940770078476e-17
+248 247 1.66666666666667e-01
+248 316 4.16666666666667e-02
+248 450 4.16666666666667e-02
+248 408 2.90871114087127e-18
+248 333 1.02533338265133e-18
+248 405 8.33333333333334e-02
+248 402 6.70003061278152e-18
+248 318 6.93889390390723e-18
+248 246 0.00000000000000e+00
+248 315 6.78346335808606e-18
+249 249 5.55555555555555e-01
+249 437 -8.33333333333333e-02
+249 434 8.36868551887249e-18
+249 365 3.66822440885052e-17
+249 457 -4.16666666666667e-02
+249 436 3.80148386727730e-18
+249 433 -8.33333333333334e-02
+249 364 -1.41899194488777e-18
+249 456 -6.94444444444444e-02
+249 435 -9.72222222222222e-02
+249 432 -9.72222222222222e-02
+249 363 -1.11111111111111e-01
+249 455 4.16666666666667e-02
+249 425 2.31748214368777e-18
+249 359 -5.67156320822534e-17
+249 422 8.33333333333334e-02
+249 419 5.14996031930615e-18
+249 344 -2.77555756156289e-17
+249 251 -1.38777878078145e-16
+249 341 7.92585669404794e-17
+249 454 4.16666666666667e-02
+249 424 -1.06929439261383e-17
+249 358 -1.38777878078145e-17
+249 421 8.89045781438114e-18
+249 418 8.33333333333334e-02
+249 343 -1.83890852848909e-17
+249 250 -5.55111512312578e-17
+249 340 4.02747225760475e-17
+249 453 -6.94444444444444e-02
+249 423 -2.77777777777778e-02
+249 357 1.11111111111111e-01
+249 420 -9.72222222222222e-02
+249 417 -9.72222222222221e-02
+249 342 1.11111111111111e-01
+249 458 -4.16666666666667e-02
+249 339 -1.11111111111111e-01
+250 250 5.55555555555556e-01
+250 437 4.14707330975705e-18
+250 434 9.24282352043893e-18
+250 365 4.16666666666667e-02
+250 457 -6.94444444444444e-02
+250 436 -1.38888888888889e-02
+250 433 -9.72222222222222e-02
+250 364 5.55555555555555e-02
+250 456 -4.16666666666667e-02
+250 435 2.68340037690162e-18
+250 432 -8.33333333333334e-02
+250 363 2.82909004382936e-19
+250 455 -4.16666666666667e-02
+250 425 -1.66666666666667e-01
+250 359 1.54024471128722e-17
+250 422 -3.16587034365767e-17
+250 419 -1.60648268776251e-17
+250 344 -7.35436356453546e-18
+250 251 1.66666666666667e-01
+250 341 4.16666666666667e-02
+250 454 -6.94444444444445e-02
+250 424 -1.94444444444445e-01
+250 358 1.11111111111111e-01
+250 421 -1.38888888888889e-02
+250 418 -9.72222222222223e-02
+250 343 -2.22222222222222e-01
+250 458 -4.16666666666667e-02
+250 340 5.55555555555556e-02
+250 453 4.16666666666667e-02
+250 423 -6.50013083722950e-18
+250 357 -1.38777878078145e-17
+250 420 8.91417473690426e-18
+250 417 8.33333333333334e-02
+250 342 -1.72011215763667e-17
+250 249 -5.55111512312578e-17
+250 339 4.08553636613903e-17
+251 251 5.55555555555556e-01
+251 437 -9.72222222222222e-02
+251 434 -1.38888888888889e-02
+251 365 5.55555555555555e-02
+251 457 -4.16666666666667e-02
+251 436 4.54009659728305e-18
+251 433 9.13440330319037e-18
+251 364 4.16666666666667e-02
+251 456 -4.16666666666667e-02
+251 435 -8.33333333333333e-02
+251 432 6.96599895821937e-18
+251 363 3.71305362758395e-17
+251 455 -6.94444444444445e-02
+251 425 -1.94444444444444e-01
+251 359 -2.22222222222222e-01
+251 422 -9.72222222222224e-02
+251 419 -1.38888888888889e-02
+251 344 1.11111111111111e-01
+251 458 -6.94444444444444e-02
+251 341 5.55555555555556e-02
+251 454 -4.16666666666667e-02
+251 424 -1.66666666666667e-01
+251 358 2.75179828739241e-17
+251 421 -3.10403693850811e-17
+251 418 -1.63714528045311e-17
+251 343 -7.14895807482629e-18
+251 250 1.66666666666667e-01
+251 340 4.16666666666667e-02
+251 453 4.16666666666667e-02
+251 423 2.06506632540598e-18
+251 357 -6.60867810942014e-17
+251 420 8.33333333333334e-02
+251 417 3.79131947191025e-18
+251 342 -2.77555756156289e-17
+251 249 -1.24900090270330e-16
+251 339 8.11656616212224e-17
+252 252 2.77777777777778e-01
+252 440 -6.61363325216158e-18
+252 383 -2.13858878522766e-17
+252 437 8.33333333333334e-02
+252 434 8.13151629364128e-18
+252 368 -4.16666666666667e-02
+252 254 -8.33333333333334e-02
+252 365 4.34765071166687e-17
+252 457 4.16666666666667e-02
+252 439 -5.42101086242752e-19
+252 382 -4.16666666666667e-02
+252 436 1.40946282423116e-18
+252 433 8.33333333333334e-02
+252 367 2.62919026827735e-18
+252 253 -8.33333333333334e-02
+252 364 -2.26327203506349e-18
+252 456 -6.94444444444444e-02
+252 438 -1.38888888888889e-02
+252 381 5.55555555555555e-02
+252 435 -9.72222222222223e-02
+252 432 -9.72222222222222e-02
+252 366 5.55555555555556e-02
+252 458 4.16666666666667e-02
+252 363 -1.11111111111111e-01
+253 253 2.77777777777778e-01
+253 440 -8.33333333333334e-02
+253 383 2.25514051876985e-17
+253 437 -4.06575814682064e-18
+253 434 -1.07928938139143e-17
+253 368 -1.18042511529359e-17
+253 254 8.33333333333334e-02
+253 365 4.16666666666667e-02
+253 457 -6.94444444444444e-02
+253 439 -9.72222222222223e-02
+253 382 5.55555555555556e-02
+253 436 -1.38888888888889e-02
+253 433 -9.72222222222222e-02
+253 367 -1.11111111111111e-01
+253 458 -4.16666666666667e-02
+253 364 5.55555555555555e-02
+253 456 4.16666666666667e-02
+253 438 -8.94466792300541e-19
+253 381 -4.16666666666667e-02
+253 435 1.10622502911412e-18
+253 432 8.33333333333334e-02
+253 366 3.99799551104030e-19
+253 252 -8.33333333333334e-02
+253 363 -1.26970238793420e-18
+254 254 2.77777777777778e-01
+254 440 -9.72222222222222e-02
+254 383 -1.11111111111111e-01
+254 437 -9.72222222222223e-02
+254 434 -1.38888888888889e-02
+254 368 5.55555555555556e-02
+254 458 -6.94444444444445e-02
+254 365 5.55555555555555e-02
+254 457 -4.16666666666667e-02
+254 439 -8.33333333333334e-02
+254 382 2.27953506765077e-17
+254 436 -4.54517879496658e-18
+254 433 -8.94466792300541e-18
+254 367 -1.21430643318376e-17
+254 253 8.33333333333334e-02
+254 364 4.16666666666667e-02
+254 456 4.16666666666667e-02
+254 438 -2.64274279543342e-18
+254 381 -2.18551441050555e-17
+254 435 8.33333333333334e-02
+254 432 6.86604907044336e-18
+254 366 -4.16666666666667e-02
+254 252 -8.33333333333334e-02
+254 363 4.30690842690394e-17
+255 255 5.55555555555555e-01
+255 452 -4.16666666666667e-02
+255 323 3.07642366442762e-18
+255 404 -1.36880524276295e-17
+255 412 -9.14795583034644e-18
+255 451 4.16666666666667e-02
+255 322 -4.73355892243593e-17
+255 403 8.33333333333333e-02
+255 411 -9.72222222222221e-02
+255 450 -6.94444444444444e-02
+255 321 -1.11111111111111e-01
+255 402 -9.72222222222220e-02
+255 398 8.33333333333334e-02
+255 314 4.11996825544492e-18
+255 395 1.23327997120226e-17
+255 449 4.16666666666667e-02
+255 299 -1.58293517182884e-17
+255 257 1.38777878078145e-17
+255 296 3.46944695195361e-17
+255 389 -1.12892551210053e-17
+255 397 -9.10729824887824e-18
+255 313 2.77555756156289e-17
+255 394 1.08928437016903e-17
+255 448 -4.16666666666667e-02
+255 298 -1.66153982933404e-17
+255 256 6.93889390390723e-17
+255 295 3.21902166109788e-17
+255 388 -8.33333333333334e-02
+255 396 -9.72222222222222e-02
+255 312 1.11111111111111e-01
+255 393 -2.77777777777779e-02
+255 447 -6.94444444444445e-02
+255 297 -1.11111111111111e-01
+255 413 -8.33333333333334e-02
+255 294 1.11111111111111e-01
+255 387 -9.72222222222223e-02
+256 256 5.55555555555555e-01
+256 452 4.16666666666667e-02
+256 323 -4.16666666666667e-02
+256 404 1.33898968301960e-17
+256 412 -1.38888888888888e-02
+256 451 -6.94444444444444e-02
+256 322 5.55555555555557e-02
+256 403 -9.72222222222221e-02
+256 411 -7.26415455565288e-18
+256 450 4.16666666666667e-02
+256 321 -4.72170046117437e-17
+256 402 8.33333333333333e-02
+256 398 2.27682456221956e-18
+256 314 -1.99222149194211e-17
+256 395 1.66666666666667e-01
+256 449 4.16666666666667e-02
+256 299 -4.16666666666667e-02
+256 257 -1.66666666666667e-01
+256 296 -3.21872519956634e-19
+256 389 -7.86046575051991e-18
+256 397 -1.38888888888889e-02
+256 313 1.11111111111111e-01
+256 394 -1.94444444444445e-01
+256 448 -6.94444444444444e-02
+256 298 5.55555555555555e-02
+256 413 -2.87313575708659e-17
+256 295 -2.22222222222222e-01
+256 388 -9.72222222222222e-02
+256 396 -9.87979229677416e-18
+256 312 2.77555756156289e-17
+256 393 5.93600689435814e-18
+256 447 -4.16666666666667e-02
+256 297 -1.81773270480773e-17
+256 255 5.55111512312578e-17
+256 294 3.07032502720739e-17
+256 387 -8.33333333333334e-02
+257 257 5.55555555555556e-01
+257 452 -6.94444444444445e-02
+257 323 5.55555555555557e-02
+257 404 -1.38888888888888e-02
+257 412 -2.97477971075710e-17
+257 451 4.16666666666667e-02
+257 322 -4.16666666666667e-02
+257 403 1.43521262582769e-17
+257 411 -8.33333333333334e-02
+257 450 -4.16666666666667e-02
+257 321 1.84314369322536e-18
+257 402 -1.30104260698261e-17
+257 398 -9.72222222222222e-02
+257 314 -2.22222222222222e-01
+257 395 -1.94444444444445e-01
+257 449 -6.94444444444444e-02
+257 299 5.55555555555556e-02
+257 413 -9.72222222222222e-02
+257 296 1.11111111111111e-01
+257 389 -1.38888888888889e-02
+257 397 1.62630325872826e-18
+257 313 -1.62325394011814e-17
+257 394 1.66666666666667e-01
+257 448 4.16666666666667e-02
+257 298 -4.16666666666667e-02
+257 256 -1.66666666666667e-01
+257 295 -5.49787910239085e-18
+257 388 -6.72713566709365e-18
+257 396 8.33333333333334e-02
+257 312 3.29326409892472e-18
+257 393 1.01203496537944e-17
+257 447 4.16666666666667e-02
+257 297 -1.67915811463692e-17
+257 255 1.38777878078145e-17
+257 294 3.46944695195361e-17
+257 387 -1.13756524816253e-17
+258 258 5.55555555555556e-01
+258 455 -4.16666666666667e-02
+258 347 -5.30039337073851e-17
+258 419 -1.68915310341453e-17
+258 427 2.90024081139872e-18
+258 454 4.16666666666667e-02
+258 346 1.15670819277047e-17
+258 418 8.33333333333334e-02
+258 426 -9.72222222222223e-02
+258 453 -6.94444444444444e-02
+258 345 -1.11111111111111e-01
+258 417 -9.72222222222223e-02
+258 413 8.33333333333333e-02
+258 338 3.75133951679985e-17
+258 410 3.26615904461258e-18
+258 452 4.16666666666667e-02
+258 323 -2.10335221462188e-17
+258 260 6.93889390390723e-17
+258 320 6.93889390390723e-18
+258 404 1.05167610731094e-17
+258 412 3.25260651745651e-18
+258 337 -1.38777878078145e-17
+258 409 -4.18095462764723e-18
+258 451 -4.16666666666667e-02
+258 322 9.62229428080885e-18
+258 259 -1.38777878078145e-17
+258 319 -1.34199664998235e-17
+258 403 -8.33333333333334e-02
+258 411 -9.72222222222222e-02
+258 336 1.11111111111111e-01
+258 408 -2.77777777777777e-02
+258 450 -6.94444444444444e-02
+258 321 -1.11111111111111e-01
+258 428 -8.33333333333333e-02
+258 318 1.11111111111111e-01
+258 402 -9.72222222222222e-02
+259 259 5.55555555555555e-01
+259 455 4.16666666666667e-02
+259 347 -4.16666666666667e-02
+259 419 1.52194879962653e-17
+259 427 -1.38888888888889e-02
+259 454 -6.94444444444444e-02
+259 346 5.55555555555555e-02
+259 418 -9.72222222222222e-02
+259 426 3.03576608295941e-18
+259 453 4.16666666666667e-02
+259 345 9.79847713383775e-18
+259 417 8.33333333333334e-02
+259 413 -5.74627151417317e-18
+259 338 -1.63443477502190e-17
+259 410 1.66666666666667e-01
+259 452 4.16666666666667e-02
+259 323 -4.16666666666667e-02
+259 260 -1.66666666666667e-01
+259 320 1.68237683983649e-17
+259 404 4.30970363562988e-18
+259 412 -1.38888888888889e-02
+259 337 1.11111111111111e-01
+259 409 -1.94444444444444e-01
+259 451 -6.94444444444444e-02
+259 322 5.55555555555555e-02
+259 428 5.09575021068187e-18
+259 319 -2.22222222222222e-01
+259 403 -9.72222222222221e-02
+259 411 3.27971157176865e-18
+259 336 -1.38777878078145e-17
+259 408 -4.11996825544492e-18
+259 450 -4.16666666666667e-02
+259 321 7.81811410315719e-18
+259 258 -1.38777878078145e-17
+259 318 -1.17534291761007e-17
+259 402 -8.33333333333334e-02
+260 260 5.55555555555556e-01
+260 455 -6.94444444444445e-02
+260 347 5.55555555555555e-02
+260 419 -1.38888888888889e-02
+260 427 2.18195687212708e-18
+260 454 4.16666666666667e-02
+260 346 -4.16666666666667e-02
+260 418 1.70287503716005e-17
+260 426 -8.33333333333334e-02
+260 453 -4.16666666666667e-02
+260 345 -5.24753851482984e-17
+260 417 -1.73201297054559e-17
+260 413 -9.72222222222222e-02
+260 338 -2.22222222222222e-01
+260 410 -1.94444444444444e-01
+260 452 -6.94444444444445e-02
+260 323 5.55555555555556e-02
+260 428 -9.72222222222223e-02
+260 320 1.11111111111111e-01
+260 404 -1.38888888888889e-02
+260 412 -6.60008072500551e-18
+260 337 -1.60766853388866e-17
+260 409 1.66666666666667e-01
+260 451 4.16666666666667e-02
+260 322 -4.16666666666667e-02
+260 259 -1.66666666666667e-01
+260 319 1.86059257193880e-17
+260 403 4.37407813962121e-18
+260 411 8.33333333333334e-02
+260 336 3.80961538357094e-17
+260 408 1.22650370762423e-18
+260 450 4.16666666666667e-02
+260 321 -2.12503625807159e-17
+260 258 6.93889390390723e-17
+260 318 6.93889390390723e-18
+260 402 9.12762703961234e-18
+261 261 5.55555555555556e-01
+261 458 -4.16666666666667e-02
+261 371 -3.23905399030044e-18
+261 434 6.03934491392316e-18
+261 442 2.18195687212708e-18
+261 457 4.16666666666667e-02
+261 370 -2.91887553623832e-18
+261 433 8.33333333333334e-02
+261 441 -9.72222222222223e-02
+261 456 -6.94444444444444e-02
+261 369 -1.11111111111111e-01
+261 432 -9.72222222222222e-02
+261 428 8.33333333333334e-02
+261 362 -6.61363325216158e-18
+261 425 2.19550939928315e-18
+261 455 4.16666666666667e-02
+261 347 1.75640751942652e-17
+261 263 -5.55111512312578e-17
+261 344 -2.77555756156289e-17
+261 419 5.12285526499401e-18
+261 427 8.13151629364128e-18
+261 361 -6.93889390390723e-18
+261 424 -6.05289744107923e-18
+261 454 -4.16666666666667e-02
+261 346 3.80012861456169e-17
+261 262 -2.77555756156289e-17
+261 343 -1.37318863826499e-17
+261 418 -8.33333333333334e-02
+261 426 -9.72222222222222e-02
+261 360 1.11111111111111e-01
+261 423 -2.77777777777778e-02
+261 453 -6.94444444444444e-02
+261 345 -1.11111111111111e-01
+261 443 -8.33333333333334e-02
+261 342 1.11111111111111e-01
+261 417 -9.72222222222221e-02
+262 262 5.55555555555555e-01
+262 458 4.16666666666667e-02
+262 371 -4.16666666666667e-02
+262 434 -1.36202897918491e-17
+262 442 -1.38888888888889e-02
+262 457 -6.94444444444444e-02
+262 370 5.55555555555555e-02
+262 433 -9.72222222222222e-02
+262 441 3.25260651745651e-18
+262 456 4.16666666666667e-02
+262 369 -2.75116301268197e-18
+262 432 8.33333333333334e-02
+262 428 -2.87313575708659e-17
+262 362 -1.22785896033983e-17
+262 425 1.66666666666667e-01
+262 455 4.16666666666667e-02
+262 347 -4.16666666666667e-02
+262 263 -1.66666666666667e-01
+262 344 -2.75963334215451e-18
+262 419 3.68493213373511e-17
+262 427 -1.38888888888889e-02
+262 361 1.11111111111111e-01
+262 424 -1.94444444444445e-01
+262 454 -6.94444444444444e-02
+262 346 5.55555555555557e-02
+262 443 -9.32413868337534e-18
+262 343 -2.22222222222222e-01
+262 418 -9.72222222222221e-02
+262 426 9.14795583034644e-18
+262 360 -6.93889390390723e-18
+262 423 -1.07064964532944e-17
+262 453 -4.16666666666667e-02
+262 345 3.96021784159276e-17
+262 261 -2.77555756156289e-17
+262 342 -2.05591836957564e-17
+262 417 -8.33333333333334e-02
+263 263 5.55555555555556e-01
+263 458 -6.94444444444444e-02
+263 371 5.55555555555555e-02
+263 434 -1.38888888888889e-02
+263 442 -8.40256683676266e-18
+263 457 4.16666666666667e-02
+263 370 -4.16666666666667e-02
+263 433 -1.25835214644099e-17
+263 441 -8.33333333333334e-02
+263 456 -4.16666666666667e-02
+263 369 -5.09575021068187e-18
+263 432 5.89534931288993e-18
+263 428 -9.72222222222223e-02
+263 362 -2.22222222222222e-01
+263 425 -1.94444444444445e-01
+263 455 -6.94444444444445e-02
+263 347 5.55555555555557e-02
+263 443 -9.72222222222222e-02
+263 344 1.11111111111111e-01
+263 419 -1.38888888888888e-02
+263 427 -2.91921434941722e-17
+263 361 -1.35237280358622e-17
+263 424 1.66666666666667e-01
+263 454 4.16666666666667e-02
+263 346 -4.16666666666667e-02
+263 262 -1.66666666666667e-01
+263 343 -1.98629226131133e-19
+263 418 3.52450409352514e-17
+263 426 8.33333333333334e-02
+263 360 -7.04731412115578e-18
+263 423 1.95495204226293e-18
+263 453 4.16666666666667e-02
+263 345 1.59784295170051e-17
+263 261 -5.55111512312578e-17
+263 342 -2.08166817117217e-17
+263 417 5.69206140554890e-18
+264 264 2.77777777777778e-01
+264 386 6.07153216591882e-18
+264 440 -6.61363325216158e-18
+264 458 4.16666666666667e-02
+264 371 -1.62630325872826e-18
+264 266 -8.33333333333334e-02
+264 368 -4.16666666666667e-02
+264 434 9.85268724246202e-18
+264 442 1.95156391047391e-18
+264 385 4.16666666666667e-02
+264 439 -1.09775469964157e-18
+264 457 -4.16666666666667e-02
+264 370 -9.35124373768748e-19
+264 265 8.33333333333334e-02
+264 367 1.31967733182220e-18
+264 433 -8.33333333333334e-02
+264 441 -9.72222222222223e-02
+264 384 5.55555555555555e-02
+264 438 -1.38888888888889e-02
+264 456 -6.94444444444444e-02
+264 369 -1.11111111111111e-01
+264 443 8.33333333333334e-02
+264 366 5.55555555555556e-02
+264 432 -9.72222222222222e-02
+265 265 2.77777777777778e-01
+265 386 -8.67361737988404e-18
+265 440 8.33333333333333e-02
+265 458 4.16666666666667e-02
+265 371 -4.16666666666667e-02
+265 266 -8.33333333333334e-02
+265 368 -8.56519716263549e-18
+265 434 1.79570984817912e-17
+265 442 -1.38888888888889e-02
+265 385 5.55555555555556e-02
+265 439 -9.72222222222223e-02
+265 457 -6.94444444444445e-02
+265 370 5.55555555555555e-02
+265 443 -2.60208521396521e-18
+265 367 -1.11111111111111e-01
+265 433 -9.72222222222222e-02
+265 441 9.35124373768748e-19
+265 384 4.16666666666667e-02
+265 438 -1.40946282423116e-18
+265 456 -4.16666666666667e-02
+265 369 -3.61344255298685e-18
+265 264 8.33333333333334e-02
+265 366 2.62919026827735e-18
+265 432 -8.33333333333334e-02
+266 266 2.77777777777778e-01
+266 386 -1.11111111111111e-01
+266 440 -9.72222222222223e-02
+266 458 -6.94444444444445e-02
+266 371 5.55555555555555e-02
+266 443 -9.72222222222222e-02
+266 368 5.55555555555556e-02
+266 434 -1.38888888888889e-02
+266 442 -1.72117094882074e-18
+266 385 -8.67361737988404e-18
+266 439 8.33333333333334e-02
+266 457 4.16666666666667e-02
+266 370 -4.16666666666667e-02
+266 265 -8.33333333333334e-02
+266 367 -8.33480420098232e-18
+266 433 1.81265050712420e-17
+266 441 8.33333333333334e-02
+266 384 5.74627151417317e-18
+266 438 -6.08508469307489e-18
+266 456 4.16666666666667e-02
+266 369 -1.70761842166467e-18
+266 264 -8.33333333333334e-02
+266 366 -4.16666666666667e-02
+266 432 9.22757692738835e-18
+267 267 5.55555555555556e-01
+267 326 -7.45490637537455e-17
+267 452 4.16666666666667e-02
+267 407 8.33333333333333e-02
+267 415 -8.33333333333334e-02
+267 325 -4.46284719249346e-17
+267 451 -4.16666666666667e-02
+267 406 -8.25348903804590e-18
+267 414 -9.72222222222222e-02
+267 324 -1.11111111111111e-01
+267 450 -6.94444444444444e-02
+267 405 -9.72222222222220e-02
+267 401 -1.31188462870746e-17
+267 305 1.38777878078145e-17
+267 269 1.24900090270330e-16
+267 302 -4.26226979058364e-17
+267 449 -4.16666666666667e-02
+267 395 1.01067971266383e-17
+267 311 5.06047128842873e-17
+267 392 -8.33333333333334e-02
+267 400 8.33333333333333e-02
+267 304 3.10081821330854e-17
+267 268 6.93889390390723e-17
+267 301 -1.40946282423116e-17
+267 448 4.16666666666667e-02
+267 394 7.67073037033494e-18
+267 310 6.93889390390723e-18
+267 391 -8.36190925529445e-18
+267 399 -9.72222222222222e-02
+267 303 1.11111111111111e-01
+267 416 -1.28342432167972e-17
+267 300 -1.11111111111111e-01
+267 447 -6.94444444444445e-02
+267 393 -2.77777777777778e-02
+267 309 1.11111111111111e-01
+267 390 -9.72222222222223e-02
+268 268 5.55555555555556e-01
+268 326 -4.16666666666667e-02
+268 452 4.16666666666667e-02
+268 407 2.66578209159873e-17
+268 415 -9.72222222222224e-02
+268 325 5.55555555555557e-02
+268 451 -6.94444444444445e-02
+268 406 -1.38888888888888e-02
+268 414 -8.33333333333334e-02
+268 324 -4.39101879856629e-17
+268 450 -4.16666666666667e-02
+268 405 -8.15862134795342e-18
+268 401 4.62412226565068e-17
+268 305 -5.10354291379661e-17
+268 269 -1.66666666666667e-01
+268 302 -4.16666666666667e-02
+268 449 4.16666666666667e-02
+268 395 1.66666666666667e-01
+268 311 1.94946750392945e-17
+268 392 -2.35305752747245e-17
+268 400 -9.72222222222222e-02
+268 304 -2.22222222222222e-01
+268 416 -2.34594245071551e-17
+268 301 5.55555555555555e-02
+268 448 -6.94444444444444e-02
+268 394 -1.94444444444445e-01
+268 310 1.11111111111111e-01
+268 391 -1.38888888888889e-02
+268 399 8.33333333333333e-02
+268 303 3.64698505769812e-17
+268 267 8.32667268468867e-17
+268 300 -1.52872506320456e-17
+268 447 4.16666666666667e-02
+268 393 1.09030080970574e-17
+268 309 6.93889390390723e-18
+268 390 -9.11576857835078e-18
+269 269 5.55555555555555e-01
+269 326 5.55555555555557e-02
+269 452 -6.94444444444445e-02
+269 407 -9.72222222222220e-02
+269 415 -2.43945488809238e-17
+269 325 -4.16666666666667e-02
+269 451 4.16666666666667e-02
+269 406 2.58582218137793e-17
+269 414 -1.36609473733174e-17
+269 324 -7.49590277002166e-17
+269 450 4.16666666666667e-02
+269 405 8.33333333333333e-02
+269 401 -1.38888888888889e-02
+269 305 1.11111111111111e-01
+269 416 -1.38888888888889e-02
+269 302 5.55555555555556e-02
+269 449 -6.94444444444444e-02
+269 395 -1.94444444444445e-01
+269 311 -2.22222222222222e-01
+269 392 -9.72222222222223e-02
+269 400 4.78133158066107e-17
+269 304 -5.67850887839283e-17
+269 268 -1.66666666666667e-01
+269 301 -4.16666666666667e-02
+269 448 4.16666666666667e-02
+269 394 1.66666666666667e-01
+269 310 2.72727668356940e-17
+269 391 -2.11012847819991e-17
+269 399 -1.29020058525775e-17
+269 303 6.93889390390723e-18
+269 267 1.24900090270330e-16
+269 300 -4.54331532248262e-17
+269 447 -4.16666666666667e-02
+269 393 1.34170018845081e-17
+269 309 4.95683680733217e-17
+269 390 -8.33333333333334e-02
+270 270 5.55555555555556e-01
+270 350 -2.20025278378777e-17
+270 455 4.16666666666667e-02
+270 422 8.33333333333333e-02
+270 430 -8.33333333333333e-02
+270 349 1.25902977279879e-17
+270 454 -4.16666666666667e-02
+270 421 3.45081222711402e-18
+270 429 -9.72222222222223e-02
+270 348 -1.11111111111111e-01
+270 453 -6.94444444444444e-02
+270 420 -9.72222222222222e-02
+270 416 6.72205346941013e-18
+270 329 -1.38777878078145e-17
+270 272 1.38777878078145e-17
+270 326 8.34835672813838e-18
+270 452 -4.16666666666667e-02
+270 410 1.19939865331209e-18
+270 335 1.02194525086231e-18
+270 407 -8.33333333333333e-02
+270 415 8.33333333333333e-02
+270 328 -7.58941520739853e-18
+270 271 -1.38777878078145e-17
+270 325 1.06251812903579e-17
+270 451 4.16666666666667e-02
+270 409 -4.10641572828885e-18
+270 334 -6.93889390390723e-18
+270 406 3.88957529379175e-18
+270 414 -9.72222222222223e-02
+270 327 1.11111111111111e-01
+270 431 -1.65069780760918e-17
+270 324 -1.11111111111111e-01
+270 450 -6.94444444444444e-02
+270 408 -2.77777777777777e-02
+270 333 1.11111111111111e-01
+270 405 -9.72222222222222e-02
+271 271 5.55555555555556e-01
+271 350 -4.16666666666666e-02
+271 455 4.16666666666666e-02
+271 422 2.06506632540598e-18
+271 430 -9.72222222222222e-02
+271 349 5.55555555555555e-02
+271 454 -6.94444444444444e-02
+271 421 -1.38888888888889e-02
+271 429 -8.33333333333333e-02
+271 348 1.50704101975485e-17
+271 453 -4.16666666666667e-02
+271 420 2.84603070277445e-18
+271 416 1.01779478942077e-17
+271 329 -8.84302396933490e-19
+271 272 -1.66666666666667e-01
+271 326 -4.16666666666667e-02
+271 452 4.16666666666667e-02
+271 410 1.66666666666667e-01
+271 335 8.97854924089558e-20
+271 407 -1.86177841806495e-18
+271 415 -9.72222222222223e-02
+271 328 -2.22222222222222e-01
+271 431 -3.39219754716402e-17
+271 325 5.55555555555555e-02
+271 451 -6.94444444444444e-02
+271 409 -1.94444444444444e-01
+271 334 1.11111111111111e-01
+271 406 -1.38888888888889e-02
+271 414 8.33333333333334e-02
+271 327 -9.28348110190713e-18
+271 270 -1.38777878078145e-17
+271 324 9.31058615621927e-18
+271 450 4.16666666666667e-02
+271 408 -3.93700913883799e-18
+271 333 0.00000000000000e+00
+271 405 3.98783111567325e-18
+272 272 5.55555555555555e-01
+272 350 5.55555555555554e-02
+272 455 -6.94444444444444e-02
+272 422 -9.72222222222222e-02
+272 430 -3.17671236538253e-17
+272 349 -4.16666666666666e-02
+272 454 4.16666666666666e-02
+272 421 1.70761842166467e-18
+272 429 -1.64798730217797e-17
+272 348 -2.21854869544846e-17
+272 453 4.16666666666667e-02
+272 420 8.33333333333333e-02
+272 416 -1.38888888888889e-02
+272 329 1.11111111111111e-01
+272 431 -1.38888888888889e-02
+272 326 5.55555555555555e-02
+272 452 -6.94444444444444e-02
+272 410 -1.94444444444444e-01
+272 335 -2.22222222222222e-01
+272 407 -9.72222222222222e-02
+272 415 6.72205346941013e-18
+272 328 2.30392961653170e-18
+272 271 -1.66666666666667e-01
+272 325 -4.16666666666667e-02
+272 451 4.16666666666667e-02
+272 409 1.66666666666667e-01
+272 334 3.48808167679321e-18
+272 406 2.24971950790742e-18
+272 414 6.43745039913268e-18
+272 327 -1.38777878078145e-17
+272 270 1.38777878078145e-17
+272 324 8.34496859634937e-18
+272 450 -4.16666666666667e-02
+272 408 1.08420217248550e-18
+272 333 -1.14180041289880e-18
+272 405 -8.33333333333333e-02
+273 273 5.55555555555556e-01
+273 374 3.57329319128699e-17
+273 458 4.16666666666667e-02
+273 437 8.33333333333334e-02
+273 445 -8.33333333333334e-02
+273 373 -3.23905399030044e-18
+273 457 -4.16666666666667e-02
+273 436 2.75963334215451e-18
+273 444 -9.72222222222222e-02
+273 372 -1.11111111111111e-01
+273 456 -6.94444444444444e-02
+273 435 -9.72222222222222e-02
+273 431 2.05998412772246e-18
+273 353 0.00000000000000e+00
+273 275 -1.11022302462516e-16
+273 350 8.00412253837424e-17
+273 455 -4.16666666666667e-02
+273 425 1.94309358100136e-18
+273 359 -6.17789832827028e-17
+273 422 -8.33333333333333e-02
+273 430 8.33333333333334e-02
+273 352 -2.56955914879065e-17
+273 274 -5.55111512312578e-17
+273 349 4.73796349376165e-17
+273 454 4.16666666666667e-02
+273 424 -1.02728155843002e-17
+273 358 -1.38777878078145e-17
+273 421 9.28348110190713e-18
+273 429 -9.72222222222223e-02
+273 351 1.11111111111111e-01
+273 446 6.95244643106330e-18
+273 348 -1.11111111111111e-01
+273 453 -6.94444444444445e-02
+273 423 -2.77777777777778e-02
+273 357 1.11111111111111e-01
+273 420 -9.72222222222221e-02
+274 274 5.55555555555556e-01
+274 374 -4.16666666666667e-02
+274 458 4.16666666666667e-02
+274 437 9.01751275646928e-18
+274 445 -9.72222222222223e-02
+274 373 5.55555555555556e-02
+274 457 -6.94444444444444e-02
+274 436 -1.38888888888889e-02
+274 444 -8.33333333333334e-02
+274 372 -5.96311194867027e-18
+274 456 -4.16666666666667e-02
+274 435 2.38524477946811e-18
+274 431 -5.47522097105180e-18
+274 353 -3.70644677059537e-17
+274 275 -1.66666666666667e-01
+274 350 -4.16666666666667e-02
+274 455 4.16666666666667e-02
+274 425 1.66666666666667e-01
+274 359 2.42789288836236e-17
+274 422 1.32509834268463e-17
+274 430 -9.72222222222224e-02
+274 352 -2.22222222222222e-01
+274 446 1.06793913989822e-17
+274 349 5.55555555555557e-02
+274 454 -6.94444444444445e-02
+274 424 -1.94444444444445e-01
+274 358 1.11111111111111e-01
+274 421 -1.38888888888888e-02
+274 429 8.33333333333334e-02
+274 351 -2.00577401909818e-17
+274 273 -5.55111512312578e-17
+274 348 4.61192499121021e-17
+274 453 4.16666666666667e-02
+274 423 -6.70511281046504e-18
+274 357 -1.38777878078145e-17
+274 420 8.93111539584934e-18
+275 275 5.55555555555555e-01
+275 374 5.55555555555555e-02
+275 458 -6.94444444444444e-02
+275 437 -9.72222222222223e-02
+275 445 9.75781955236954e-18
+275 373 -4.16666666666667e-02
+275 457 4.16666666666667e-02
+275 436 1.03134731657684e-17
+275 444 8.23993651088983e-18
+275 372 3.67680061744147e-17
+275 456 4.16666666666667e-02
+275 435 8.33333333333334e-02
+275 431 -1.38888888888889e-02
+275 353 1.11111111111111e-01
+275 446 -1.38888888888889e-02
+275 350 5.55555555555558e-02
+275 455 -6.94444444444445e-02
+275 425 -1.94444444444444e-01
+275 359 -2.22222222222222e-01
+275 422 -9.72222222222220e-02
+275 430 -7.04731412115578e-18
+275 352 -3.65647182670736e-17
+275 274 -1.66666666666667e-01
+275 349 -4.16666666666667e-02
+275 454 4.16666666666667e-02
+275 424 1.66666666666667e-01
+275 358 1.37202396796252e-17
+275 421 1.45147565841497e-17
+275 429 2.31748214368777e-18
+275 351 0.00000000000000e+00
+275 273 -1.11022302462516e-16
+275 348 7.72239938011746e-17
+275 453 -4.16666666666667e-02
+275 423 2.30392961653170e-18
+275 357 -5.93194113621132e-17
+275 420 -8.33333333333333e-02
+276 276 2.77777777777778e-01
+276 377 4.16666666666667e-02
+276 278 8.33333333333333e-02
+276 374 4.20263867109694e-17
+276 458 -4.16666666666667e-02
+276 440 -2.64274279543342e-18
+276 383 -2.09352663243373e-17
+276 437 -8.33333333333333e-02
+276 445 8.33333333333333e-02
+276 376 2.60208521396521e-18
+276 277 -8.33333333333333e-02
+276 373 -7.58941520739853e-19
+276 457 4.16666666666667e-02
+276 439 -9.75781955236954e-19
+276 382 -4.16666666666667e-02
+276 436 1.82959116606929e-18
+276 444 -9.72222222222222e-02
+276 375 5.55555555555555e-02
+276 446 6.93889390390723e-18
+276 372 -1.11111111111111e-01
+276 456 -6.94444444444444e-02
+276 438 -1.38888888888889e-02
+276 381 5.55555555555555e-02
+276 435 -9.72222222222222e-02
+277 277 2.77777777777778e-01
+277 377 -1.48535697630514e-17
+277 278 -8.33333333333333e-02
+277 374 -4.16666666666667e-02
+277 458 4.16666666666667e-02
+277 440 8.33333333333334e-02
+277 383 2.28089032036638e-17
+277 437 -2.20228566286118e-18
+277 445 -9.72222222222222e-02
+277 376 -1.11111111111111e-01
+277 446 -8.57874968979155e-18
+277 373 5.55555555555556e-02
+277 457 -6.94444444444444e-02
+277 439 -9.72222222222223e-02
+277 382 5.55555555555556e-02
+277 436 -1.38888888888889e-02
+277 444 8.33333333333334e-02
+277 375 6.50521303491303e-19
+277 276 -8.33333333333333e-02
+277 372 -2.57498015965307e-18
+277 456 4.16666666666667e-02
+277 438 0.00000000000000e+00
+277 381 -4.16666666666667e-02
+277 435 1.32475952950573e-18
+278 278 2.77777777777778e-01
+278 377 5.55555555555555e-02
+278 446 -1.38888888888889e-02
+278 374 5.55555555555556e-02
+278 458 -6.94444444444444e-02
+278 440 -9.72222222222222e-02
+278 383 -1.11111111111111e-01
+278 437 -9.72222222222221e-02
+278 445 -7.80625564189563e-18
+278 376 -1.47451495458029e-17
+278 277 -8.33333333333333e-02
+278 373 -4.16666666666667e-02
+278 457 4.16666666666667e-02
+278 439 8.33333333333333e-02
+278 382 2.26598254049470e-17
+278 436 -2.53432257818487e-18
+278 444 6.57297567069337e-18
+278 375 4.16666666666667e-02
+278 276 8.33333333333333e-02
+278 372 4.19772588000286e-17
+278 456 -4.16666666666667e-02
+278 438 -6.61363325216158e-18
+278 381 -2.13858878522766e-17
+278 435 -8.33333333333333e-02
+279 279 5.55555555555556e-01
+279 416 -1.40268656065312e-17
+279 413 8.33333333333333e-02
+279 452 4.16666666666667e-02
+279 331 -4.45607092891542e-17
+279 415 8.33333333333333e-02
+279 412 -8.71427496135224e-18
+279 451 4.16666666666667e-02
+279 330 -1.11111111111111e-01
+279 414 -9.72222222222221e-02
+279 411 -9.72222222222221e-02
+279 450 -6.94444444444444e-02
+279 308 -1.47451495458029e-17
+279 281 0.00000000000000e+00
+279 305 6.93889390390723e-18
+279 401 -1.02999206386123e-17
+279 398 -8.33333333333334e-02
+279 314 -6.77626357803440e-20
+279 395 1.09775469964157e-17
+279 449 -4.16666666666667e-02
+279 307 -1.64798730217797e-17
+279 280 8.32667268468867e-17
+279 304 3.48435473182529e-17
+279 400 -8.33333333333334e-02
+279 397 -8.99887803162969e-18
+279 313 2.77555756156289e-17
+279 394 1.06793913989822e-17
+279 448 -4.16666666666667e-02
+279 306 -1.11111111111111e-01
+279 332 2.27682456221956e-18
+279 303 1.11111111111111e-01
+279 399 -9.72222222222223e-02
+279 396 -9.72222222222223e-02
+279 312 1.11111111111111e-01
+279 393 -2.77777777777778e-02
+279 447 -6.94444444444445e-02
+280 280 5.55555555555556e-01
+280 416 2.08166817117217e-17
+280 413 2.55736187435018e-17
+280 452 -4.16666666666667e-02
+280 331 5.55555555555558e-02
+280 415 -9.72222222222222e-02
+280 412 -1.38888888888888e-02
+280 451 -6.94444444444444e-02
+280 330 -4.33680868994202e-17
+280 414 8.33333333333333e-02
+280 411 -7.58941520739853e-18
+280 450 4.16666666666667e-02
+280 308 4.16666666666667e-02
+280 281 1.66666666666667e-01
+280 305 -4.42083435830964e-17
+280 401 3.46944695195361e-18
+280 398 -2.11825999449355e-17
+280 314 -1.62291512693924e-17
+280 395 -1.66666666666667e-01
+280 449 -4.16666666666667e-02
+280 307 5.55555555555556e-02
+280 332 4.16666666666667e-02
+280 304 -2.22222222222222e-01
+280 400 -9.72222222222222e-02
+280 397 -1.38888888888889e-02
+280 313 1.11111111111111e-01
+280 394 -1.94444444444445e-01
+280 448 -6.94444444444445e-02
+280 306 -1.65882932390282e-17
+280 279 8.32667268468867e-17
+280 303 3.18755438710738e-17
+280 399 -8.33333333333334e-02
+280 396 -9.31058615621927e-18
+280 312 2.77555756156289e-17
+280 393 8.30769914667018e-18
+280 447 -4.16666666666667e-02
+281 281 5.55555555555556e-01
+281 416 -1.38888888888888e-02
+281 413 -9.72222222222223e-02
+281 452 -6.94444444444444e-02
+281 331 4.16666666666667e-02
+281 415 2.38253427403690e-17
+281 412 2.73218947466347e-17
+281 451 -4.16666666666667e-02
+281 330 1.73472347597681e-18
+281 414 -1.52872506320456e-17
+281 411 8.33333333333333e-02
+281 450 4.16666666666667e-02
+281 308 5.55555555555554e-02
+281 332 5.55555555555558e-02
+281 305 1.11111111111111e-01
+281 401 -1.38888888888889e-02
+281 398 -9.72222222222222e-02
+281 314 -2.22222222222222e-01
+281 395 -1.94444444444445e-01
+281 449 -6.94444444444445e-02
+281 307 4.16666666666667e-02
+281 280 1.66666666666667e-01
+281 304 -4.74575619687639e-17
+281 400 6.28837260041593e-18
+281 397 -2.17924636669586e-17
+281 313 -1.99086623922651e-17
+281 394 -1.66666666666667e-01
+281 448 -4.16666666666667e-02
+281 306 -1.53956708492942e-17
+281 279 0.00000000000000e+00
+281 303 6.93889390390723e-18
+281 399 -1.04896560187973e-17
+281 396 -8.33333333333334e-02
+281 312 4.98732999343332e-18
+281 393 1.35118695746006e-17
+281 447 -4.16666666666667e-02
+282 282 5.55555555555555e-01
+282 431 -1.79299934274790e-17
+282 428 8.33333333333334e-02
+282 455 4.16666666666667e-02
+282 355 1.34441069388203e-17
+282 430 8.33333333333334e-02
+282 427 2.45300741524845e-18
+282 454 4.16666666666667e-02
+282 354 -1.11111111111111e-01
+282 429 -9.72222222222223e-02
+282 426 -9.72222222222222e-02
+282 453 -6.94444444444444e-02
+282 332 -1.99493199737333e-17
+282 284 4.16333634234434e-17
+282 329 -1.38777878078145e-17
+282 416 8.45677694538693e-18
+282 413 -8.33333333333334e-02
+282 338 3.10488397145536e-17
+282 410 1.27054942088145e-18
+282 452 -4.16666666666667e-02
+282 331 5.20417042793042e-18
+282 283 -4.16333634234434e-17
+282 328 -9.17506088465858e-18
+282 415 -8.33333333333334e-02
+282 412 4.98732999343332e-18
+282 337 -1.38777878078145e-17
+282 409 -3.87941089842470e-18
+282 451 -4.16666666666667e-02
+282 330 -1.11111111111111e-01
+282 356 -5.24753851482984e-17
+282 327 1.11111111111111e-01
+282 414 -9.72222222222223e-02
+282 411 -9.72222222222222e-02
+282 336 1.11111111111111e-01
+282 408 -2.77777777777777e-02
+282 450 -6.94444444444444e-02
+283 283 5.55555555555555e-01
+283 431 1.88651178012478e-17
+283 428 -1.14654379740342e-17
+283 455 -4.16666666666667e-02
+283 355 5.55555555555555e-02
+283 430 -9.72222222222223e-02
+283 427 -1.38888888888888e-02
+283 454 -6.94444444444444e-02
+283 354 1.56125112837913e-17
+283 429 8.33333333333334e-02
+283 426 2.60208521396521e-18
+283 453 4.16666666666667e-02
+283 332 4.16666666666667e-02
+283 284 1.66666666666667e-01
+283 329 2.31748214368777e-18
+283 416 1.00830802041152e-17
+283 413 -2.16840434497101e-19
+283 338 -1.23903979524359e-17
+283 410 -1.66666666666667e-01
+283 452 -4.16666666666667e-02
+283 331 5.55555555555555e-02
+283 356 4.16666666666667e-02
+283 328 -2.22222222222222e-01
+283 415 -9.72222222222222e-02
+283 412 -1.38888888888889e-02
+283 337 1.11111111111111e-01
+283 409 -1.94444444444444e-01
+283 451 -6.94444444444444e-02
+283 330 7.15573433840433e-18
+283 282 -4.16333634234434e-17
+283 327 -7.69783542464708e-18
+283 414 -8.33333333333333e-02
+283 411 3.07642366442762e-18
+283 336 -6.93889390390723e-18
+283 408 -3.67273485929465e-18
+283 450 -4.16666666666667e-02
+284 284 5.55555555555555e-01
+284 431 -1.38888888888889e-02
+284 428 -9.72222222222221e-02
+284 455 -6.94444444444444e-02
+284 355 4.16666666666667e-02
+284 430 1.95427441590512e-17
+284 427 -1.19262238973405e-17
+284 454 -4.16666666666667e-02
+284 354 -5.03069808033274e-17
+284 429 -1.75640751942652e-17
+284 426 8.33333333333333e-02
+284 453 4.16666666666667e-02
+284 332 5.55555555555555e-02
+284 356 5.55555555555555e-02
+284 329 1.11111111111111e-01
+284 416 -1.38888888888889e-02
+284 413 -9.72222222222222e-02
+284 338 -2.22222222222222e-01
+284 410 -1.94444444444444e-01
+284 452 -6.94444444444444e-02
+284 331 4.16666666666667e-02
+284 283 1.66666666666667e-01
+284 328 1.01305140491614e-18
+284 415 1.10859672136643e-17
+284 412 5.42101086242752e-19
+284 337 -2.24023273889817e-17
+284 409 -1.66666666666667e-01
+284 451 -4.16666666666667e-02
+284 330 -2.02745806254789e-17
+284 282 4.16333634234434e-17
+284 327 -1.38777878078145e-17
+284 414 8.61940727125976e-18
+284 411 -8.33333333333334e-02
+284 336 3.39355279987963e-17
+284 408 1.20617491689012e-18
+284 450 -4.16666666666667e-02
+285 285 5.55555555555555e-01
+285 446 5.31259064517897e-18
+285 443 8.33333333333334e-02
+285 458 4.16666666666667e-02
+285 379 -5.09575021068187e-18
+285 445 8.33333333333334e-02
+285 442 1.73472347597681e-18
+285 457 4.16666666666667e-02
+285 378 -1.11111111111111e-01
+285 444 -9.72222222222223e-02
+285 441 -9.72222222222222e-02
+285 456 -6.94444444444444e-02
+285 356 1.82145964977565e-17
+285 287 1.38777878078145e-17
+285 353 -6.93889390390723e-18
+285 431 3.79470760369927e-18
+285 428 -8.33333333333333e-02
+285 362 -1.39862080250630e-17
+285 425 -1.30781887056064e-18
+285 455 -4.16666666666667e-02
+285 355 4.42354486374086e-17
+285 286 -2.77555756156289e-17
+285 352 -2.17924636669586e-17
+285 430 -8.33333333333333e-02
+285 427 8.34835672813838e-18
+285 361 -6.93889390390723e-18
+285 424 -5.53620734325411e-18
+285 454 -4.16666666666667e-02
+285 354 -1.11111111111111e-01
+285 380 -4.22838847269347e-18
+285 351 1.11111111111111e-01
+285 429 -9.72222222222222e-02
+285 426 -9.72222222222222e-02
+285 360 1.11111111111111e-01
+285 423 -2.77777777777778e-02
+285 453 -6.94444444444444e-02
+286 286 5.55555555555556e-01
+286 446 -1.17093834628434e-17
+286 443 -6.42389787197661e-18
+286 458 -4.16666666666667e-02
+286 379 5.55555555555555e-02
+286 445 -9.72222222222222e-02
+286 442 -1.38888888888889e-02
+286 457 -6.94444444444444e-02
+286 378 -3.46944695195361e-18
+286 444 8.33333333333333e-02
+286 441 2.81892564846231e-18
+286 456 4.16666666666667e-02
+286 356 4.16666666666667e-02
+286 287 1.66666666666667e-01
+286 353 -2.87720151523341e-17
+286 431 4.41270284201600e-17
+286 428 2.17653586126465e-17
+286 362 -1.33594036440948e-17
+286 425 -1.66666666666667e-01
+286 455 -4.16666666666667e-02
+286 355 5.55555555555557e-02
+286 380 4.16666666666667e-02
+286 352 -2.22222222222222e-01
+286 430 -9.72222222222221e-02
+286 427 -1.38888888888888e-02
+286 361 1.11111111111111e-01
+286 424 -1.94444444444445e-01
+286 454 -6.94444444444444e-02
+286 354 4.53196508098941e-17
+286 285 -2.77555756156289e-17
+286 351 -2.39608680119296e-17
+286 429 -8.33333333333333e-02
+286 426 9.16150835750251e-18
+286 360 -6.93889390390723e-18
+286 423 -1.02728155843002e-17
+286 453 -4.16666666666667e-02
+287 287 5.55555555555556e-01
+287 446 -1.38888888888889e-02
+287 443 -9.72222222222222e-02
+287 458 -6.94444444444444e-02
+287 379 4.16666666666667e-02
+287 445 -1.16280682999070e-17
+287 442 -4.77048955893622e-18
+287 457 -4.16666666666667e-02
+287 378 -6.93889390390723e-18
+287 444 6.28837260041593e-18
+287 441 8.33333333333334e-02
+287 456 4.16666666666667e-02
+287 356 5.55555555555556e-02
+287 380 5.55555555555555e-02
+287 353 1.11111111111111e-01
+287 431 -1.38888888888888e-02
+287 428 -9.72222222222222e-02
+287 362 -2.22222222222222e-01
+287 425 -1.94444444444444e-01
+287 455 -6.94444444444445e-02
+287 355 4.16666666666667e-02
+287 286 1.66666666666667e-01
+287 352 -2.99612494102791e-17
+287 430 4.58346468418247e-17
+287 427 2.11419423634673e-17
+287 361 -1.14247803925660e-17
+287 424 -1.66666666666667e-01
+287 454 -4.16666666666667e-02
+287 354 1.58293517182884e-17
+287 285 1.38777878078145e-17
+287 351 -6.93889390390723e-18
+287 429 4.93311988480905e-18
+287 426 -8.33333333333333e-02
+287 360 -6.61363325216158e-18
+287 423 5.69206140554890e-19
+287 453 -4.16666666666667e-02
+288 288 2.77777777777778e-01
+288 377 4.16666666666667e-02
+288 446 9.54097911787244e-18
+288 443 -8.33333333333334e-02
+288 386 2.27682456221956e-18
+288 440 -2.64274279543342e-18
+288 458 -4.16666666666667e-02
+288 379 -1.73472347597681e-18
+288 289 8.33333333333334e-02
+288 376 5.42101086242752e-19
+288 445 -8.33333333333334e-02
+288 442 2.16840434497101e-18
+288 385 4.16666666666667e-02
+288 439 -9.08019319456610e-19
+288 457 -4.16666666666667e-02
+288 378 -1.11111111111111e-01
+288 290 8.33333333333333e-02
+288 375 5.55555555555555e-02
+288 444 -9.72222222222222e-02
+288 441 -9.72222222222223e-02
+288 384 5.55555555555555e-02
+288 438 -1.38888888888889e-02
+288 456 -6.94444444444444e-02
+289 289 2.77777777777778e-01
+289 290 8.33333333333334e-02
+289 377 -1.12757025938492e-17
+289 446 1.98408997564847e-17
+289 443 -7.79270311473956e-18
+289 386 -8.45677694538693e-18
+289 440 -8.33333333333334e-02
+289 458 -4.16666666666666e-02
+289 379 5.55555555555555e-02
+289 380 4.16666666666667e-02
+289 376 -1.11111111111111e-01
+289 445 -9.72222222222222e-02
+289 442 -1.38888888888889e-02
+289 385 5.55555555555556e-02
+289 439 -9.72222222222223e-02
+289 457 -6.94444444444444e-02
+289 378 -1.95156391047391e-18
+289 288 8.33333333333334e-02
+289 375 2.60208521396521e-18
+289 444 -8.33333333333334e-02
+289 441 8.53809210832335e-19
+289 384 4.16666666666667e-02
+289 438 -5.42101086242752e-19
+289 456 -4.16666666666667e-02
+290 290 2.77777777777778e-01
+290 380 5.55555555555555e-02
+290 377 5.55555555555555e-02
+290 446 -1.38888888888889e-02
+290 443 -9.72222222222222e-02
+290 386 -1.11111111111111e-01
+290 440 -9.72222222222222e-02
+290 458 -6.94444444444444e-02
+290 379 4.16666666666667e-02
+290 289 8.33333333333334e-02
+290 376 -9.54097911787244e-18
+290 445 1.90955107629009e-17
+290 442 -7.04731412115578e-18
+290 385 -7.80625564189563e-18
+290 439 -8.33333333333334e-02
+290 457 -4.16666666666667e-02
+290 378 -1.95156391047391e-18
+290 288 8.33333333333333e-02
+290 375 4.16666666666667e-02
+290 444 8.76848506997652e-18
+290 441 -8.33333333333333e-02
+290 384 6.07153216591882e-18
+290 438 -6.61363325216158e-18
+290 456 -4.16666666666667e-02
+291 291 5.55555555555555e-01
+291 311 -8.33333333333334e-02
+291 296 -1.33153579308376e-17
+291 245 -4.58700104673726e-17
+291 394 -4.16666666666667e-02
+291 310 -8.71088682956322e-18
+291 295 -8.33333333333334e-02
+291 244 -1.43436559288043e-17
+291 393 -6.94444444444445e-02
+291 309 -9.72222222222223e-02
+291 294 -9.72222222222223e-02
+291 243 -1.11111111111111e-01
+291 449 1.12892551210053e-17
+291 392 7.73849300611529e-18
+291 389 2.77555756156289e-17
+291 293 1.38777878078145e-17
+291 448 1.47722546001150e-18
+291 391 2.77555756156289e-17
+291 388 9.46644021851406e-18
+291 292 0.00000000000000e+00
+291 447 -2.77777777777777e-02
+291 390 1.11111111111111e-01
+291 387 1.11111111111111e-01
+291 395 -4.16666666666667e-02
+291 224 4.16666666666667e-02
+291 164 8.33333333333334e-02
+291 149 -1.08420217248550e-18
+291 14 2.49840838122128e-17
+291 223 4.16666666666667e-02
+291 163 5.42101086242752e-19
+291 148 8.33333333333334e-02
+291 13 -1.24683249835833e-18
+291 222 -6.94444444444445e-02
+291 162 -9.72222222222223e-02
+291 147 -9.72222222222222e-02
+291 12 -1.11111111111111e-01
+292 292 5.55555555555556e-01
+292 311 -2.10877322548431e-17
+292 296 -7.48607718783351e-18
+292 245 4.16666666666666e-02
+292 394 -6.94444444444445e-02
+292 310 -1.38888888888889e-02
+292 295 -9.72222222222222e-02
+292 244 5.55555555555554e-02
+292 393 -4.16666666666667e-02
+292 309 -8.37546178245052e-18
+292 294 -8.33333333333334e-02
+292 243 -1.45503319679344e-17
+292 449 -1.66666666666667e-01
+292 392 2.48959923856984e-17
+292 389 -3.65793295854138e-17
+292 293 1.66666666666667e-01
+292 448 -1.94444444444444e-01
+292 391 1.11111111111111e-01
+292 388 -2.22222222222222e-01
+292 395 -4.16666666666667e-02
+292 447 3.46267068837558e-18
+292 390 2.08166817117217e-17
+292 387 1.14196981948825e-17
+292 291 0.00000000000000e+00
+292 224 -4.16666666666667e-02
+292 164 -9.29703362906320e-18
+292 149 1.40438062654763e-17
+292 14 4.16666666666666e-02
+292 223 -6.94444444444444e-02
+292 163 -1.38888888888889e-02
+292 148 -9.72222222222222e-02
+292 13 5.55555555555555e-02
+292 222 4.16666666666667e-02
+292 162 2.86297136171954e-19
+292 147 8.33333333333334e-02
+292 12 -6.67673720673202e-19
+293 293 5.55555555555556e-01
+293 311 -9.72222222222223e-02
+293 296 -1.38888888888889e-02
+293 245 5.55555555555554e-02
+293 394 -4.16666666666667e-02
+293 310 -2.35305752747245e-17
+293 295 -8.28059409235804e-18
+293 244 4.16666666666666e-02
+293 393 -4.16666666666667e-02
+293 309 -8.33333333333334e-02
+293 294 -1.40946282423116e-17
+293 243 -4.43472569864461e-17
+293 449 -1.94444444444444e-01
+293 392 -2.22222222222222e-01
+293 389 1.11111111111111e-01
+293 395 -6.94444444444445e-02
+293 448 -1.66666666666667e-01
+293 391 3.31621869179531e-17
+293 388 -3.57397081764479e-17
+293 292 1.66666666666667e-01
+293 447 1.16348445634851e-17
+293 390 1.21301470793920e-17
+293 387 3.46944695195361e-17
+293 291 1.38777878078145e-17
+293 224 -6.94444444444445e-02
+293 164 -9.72222222222223e-02
+293 149 -1.38888888888889e-02
+293 14 5.55555555555555e-02
+293 223 -4.16666666666666e-02
+293 163 -9.01243055878576e-18
+293 148 1.56667213924155e-17
+293 13 4.16666666666666e-02
+293 222 4.16666666666667e-02
+293 162 8.33333333333334e-02
+293 147 -1.75844039849993e-18
+293 12 2.20702904736580e-17
+294 294 1.11111111111111e+00
+294 323 -9.96449559149959e-18
+294 412 -4.16666666666667e-02
+294 322 -8.33333333333334e-02
+294 411 -6.94444444444444e-02
+294 321 -9.72222222222221e-02
+294 452 -1.66666666666667e-01
+294 407 -4.16666666666667e-02
+294 404 -7.02330073710112e-17
+294 317 -1.19533289516527e-17
+294 451 -1.65916813708172e-17
+294 406 4.16666666666667e-02
+294 403 -9.23456494920320e-17
+294 316 8.33333333333333e-02
+294 450 -1.94444444444444e-01
+294 405 -6.94444444444444e-02
+294 402 -2.22222222222222e-01
+294 315 -9.72222222222220e-02
+294 398 4.16666666666667e-02
+294 314 1.25496401465197e-17
+294 299 -1.47451495458029e-17
+294 257 3.46944695195361e-17
+294 397 4.16666666666667e-02
+294 313 7.67073037033494e-18
+294 298 8.33333333333334e-02
+294 256 2.84823298843731e-17
+294 396 -6.94444444444444e-02
+294 312 -2.77777777777778e-02
+294 297 -9.72222222222223e-02
+294 255 1.11111111111111e-01
+294 449 1.66666666666667e-01
+294 395 6.01545858481059e-17
+294 311 1.23327997120226e-17
+294 392 4.16666666666667e-02
+294 389 -6.35901514821693e-17
+294 296 1.24900090270330e-16
+294 245 3.46944695195361e-17
+294 293 -1.47587020729589e-17
+294 448 -1.75098650856409e-17
+294 394 4.16333634234434e-17
+294 310 1.08928437016903e-17
+294 391 -4.16666666666667e-02
+294 388 -3.10776388347603e-17
+294 295 1.11022302462516e-16
+294 244 3.21902166109788e-17
+294 292 -8.33333333333334e-02
+294 447 -1.94444444444445e-01
+294 393 2.22222222222222e-01
+294 309 -2.77777777777778e-02
+294 390 -6.94444444444445e-02
+294 387 -2.22222222222223e-01
+294 413 -4.16666666666667e-02
+294 243 1.11111111111111e-01
+294 291 -9.72222222222223e-02
+295 295 1.11111111111111e+00
+295 323 -3.15282603626996e-17
+295 412 -6.94444444444445e-02
+295 322 -9.72222222222224e-02
+295 411 -4.16666666666667e-02
+295 321 -8.33333333333334e-02
+295 452 -4.71356894488073e-17
+295 407 4.16666666666667e-02
+295 404 0.00000000000000e+00
+295 317 1.33898968301960e-17
+295 451 -2.77777777777777e-02
+295 406 -6.94444444444444e-02
+295 403 1.11111111111111e-01
+295 316 -9.72222222222221e-02
+295 450 -1.46502818557104e-17
+295 405 4.16666666666667e-02
+295 402 -8.92145922025064e-17
+295 315 8.33333333333333e-02
+295 398 -4.16666666666666e-02
+295 314 -1.66666666666667e-01
+295 299 3.48215244616243e-17
+295 257 -5.01867021248173e-20
+295 397 -6.94444444444444e-02
+295 313 -1.94444444444445e-01
+295 298 -9.72222222222221e-02
+295 256 -2.22222222222222e-01
+295 396 4.16666666666667e-02
+295 312 9.03953561309789e-18
+295 297 8.33333333333334e-02
+295 255 3.21883107868475e-17
+295 449 3.67273485929465e-18
+295 395 2.14807555423691e-18
+295 311 1.66666666666667e-01
+295 392 4.16666666666667e-02
+295 389 -9.71445146547012e-17
+295 296 1.94289029309402e-16
+295 245 -7.26076642386386e-18
+295 293 -7.86046575051991e-18
+295 448 -2.77777777777777e-02
+295 394 2.22222222222222e-01
+295 310 -1.94444444444445e-01
+295 391 -6.94444444444444e-02
+295 388 1.11111111111111e-01
+295 413 -4.16666666666668e-02
+295 244 -2.22222222222222e-01
+295 292 -9.72222222222222e-02
+295 447 -1.97951599773330e-17
+295 393 4.16333634234434e-17
+295 309 5.93600689435814e-18
+295 390 -4.16666666666667e-02
+295 387 -3.29104063743818e-17
+295 294 9.71445146547012e-17
+295 243 3.07032502720739e-17
+295 291 -8.33333333333334e-02
+296 296 1.11111111111111e+00
+296 323 -1.38888888888889e-02
+296 412 -4.16666666666668e-02
+296 322 -2.94631940372936e-17
+296 411 -4.16666666666667e-02
+296 321 -9.51387406356030e-18
+296 452 -1.94444444444445e-01
+296 407 -6.94444444444445e-02
+296 404 1.11111111111111e-01
+296 317 -1.38888888888888e-02
+296 451 -5.01765377294502e-17
+296 406 4.16666666666667e-02
+296 403 -6.93889390390723e-18
+296 316 1.34847645202885e-17
+296 450 -1.66666666666667e-01
+296 405 -4.16666666666667e-02
+296 402 -7.08526119719277e-17
+296 315 -1.29020058525775e-17
+296 398 -6.94444444444444e-02
+296 314 -1.94444444444445e-01
+296 299 -1.38888888888889e-02
+296 257 1.11111111111111e-01
+296 397 -4.16666666666666e-02
+296 313 -1.66666666666667e-01
+296 298 3.45996018294437e-17
+296 256 2.28190675990309e-18
+296 396 4.16666666666667e-02
+296 312 1.10859672136643e-17
+296 297 -1.50771864611265e-17
+296 255 3.46944695195361e-17
+296 449 -1.94444444444444e-01
+296 395 -4.44444444444445e-01
+296 311 -1.94444444444445e-01
+296 392 -6.94444444444444e-02
+296 389 1.11111111111111e-01
+296 413 -6.94444444444445e-02
+296 245 1.11111111111111e-01
+296 293 -1.38888888888889e-02
+296 448 2.21075599233372e-18
+296 394 3.24815959448343e-18
+296 310 1.66666666666667e-01
+296 391 4.16666666666667e-02
+296 388 -9.71445146547012e-17
+296 295 1.94289029309402e-16
+296 244 -9.18416648884157e-18
+296 292 -7.59449740508206e-18
+296 447 1.66666666666667e-01
+296 393 5.55799726582222e-17
+296 309 1.01084911925328e-17
+296 390 4.16666666666667e-02
+296 387 -6.43332111351482e-17
+296 294 1.24900090270330e-16
+296 243 4.16333634234434e-17
+296 291 -1.26766950886079e-17
+297 297 5.55555555555556e-01
+297 398 6.28837260041593e-18
+297 314 -8.33333333333334e-02
+297 395 -4.16666666666667e-02
+297 449 1.12892551210053e-17
+297 299 2.77555756156289e-17
+297 257 -1.77673631016062e-17
+297 296 -1.51042915154387e-17
+297 389 2.77555756156289e-17
+297 397 -6.93889390390723e-18
+297 313 -9.10729824887824e-18
+297 394 4.16666666666667e-02
+297 448 3.26954717640160e-18
+297 298 1.38777878078145e-17
+297 256 -1.72964127829328e-17
+297 295 8.33333333333334e-02
+297 388 8.00255552742182e-18
+297 396 1.11111111111111e-01
+297 312 -9.72222222222223e-02
+297 393 -6.94444444444445e-02
+297 447 -2.77777777777778e-02
+297 255 -1.11111111111111e-01
+297 294 -9.72222222222223e-02
+297 387 1.11111111111111e-01
+297 224 4.16666666666667e-02
+297 29 -3.66460334300100e-17
+297 149 1.62630325872826e-18
+297 166 -5.42101086242752e-19
+297 223 -4.16666666666667e-02
+297 28 -2.58853268680914e-18
+297 148 -8.33333333333334e-02
+297 165 -9.72222222222223e-02
+297 222 -6.94444444444445e-02
+297 27 -1.11111111111111e-01
+297 147 -9.72222222222222e-02
+297 167 8.33333333333333e-02
+298 298 5.55555555555555e-01
+298 398 2.11419423634673e-18
+298 314 -2.17924636669586e-17
+298 395 4.16666666666667e-02
+298 449 1.66666666666667e-01
+298 299 -1.66666666666667e-01
+298 257 -4.16666666666667e-02
+298 296 3.50332826984379e-17
+298 389 -3.22702612244943e-17
+298 397 1.11111111111111e-01
+298 313 -1.38888888888889e-02
+298 394 -6.94444444444444e-02
+298 448 -1.94444444444444e-01
+298 256 5.55555555555555e-02
+298 295 -9.72222222222221e-02
+298 388 -2.22222222222222e-01
+298 396 -6.93889390390723e-18
+298 312 -8.89045781438114e-18
+298 393 4.16666666666667e-02
+298 447 1.02999206386123e-18
+298 297 1.38777878078145e-17
+298 255 -1.48671222902075e-17
+298 294 8.33333333333334e-02
+298 387 1.29341931045732e-17
+298 224 4.16666666666667e-02
+298 29 -4.16666666666667e-02
+298 149 6.91178884959509e-18
+298 166 -1.38888888888889e-02
+298 223 -6.94444444444444e-02
+298 28 5.55555555555555e-02
+298 148 -9.72222222222222e-02
+298 165 -1.89735380184963e-19
+298 222 -4.16666666666667e-02
+298 27 -2.04643160056639e-18
+298 147 -8.33333333333334e-02
+298 167 -1.29020058525775e-17
+299 299 5.55555555555555e-01
+299 398 -2.22222222222222e-01
+299 314 -9.72222222222222e-02
+299 395 -6.94444444444444e-02
+299 449 -1.94444444444444e-01
+299 257 5.55555555555556e-02
+299 296 -1.38888888888889e-02
+299 389 1.11111111111111e-01
+299 397 1.27969737671180e-17
+299 313 -2.11961524720916e-17
+299 394 4.16666666666667e-02
+299 448 1.66666666666667e-01
+299 298 -1.66666666666667e-01
+299 256 -4.16666666666667e-02
+299 295 3.48198303957298e-17
+299 388 -3.14156049807147e-17
+299 396 1.75640751942652e-17
+299 312 -8.33333333333334e-02
+299 393 -4.16666666666667e-02
+299 447 8.18911453405458e-18
+299 297 2.77555756156289e-17
+299 255 -1.58293517182884e-17
+299 294 -1.48942273445196e-17
+299 387 2.08166817117217e-17
+299 224 -6.94444444444445e-02
+299 29 5.55555555555556e-02
+299 149 -1.38888888888889e-02
+299 166 -1.37287100090977e-17
+299 223 4.16666666666667e-02
+299 28 -4.16666666666667e-02
+299 148 8.61093694178722e-18
+299 165 8.33333333333333e-02
+299 222 4.16666666666667e-02
+299 27 -3.55753837846806e-17
+299 147 4.52315593833796e-19
+299 167 -9.72222222222222e-02
+300 300 5.55555555555556e-01
+300 269 -4.54314591589317e-17
+300 395 4.16666666666667e-02
+300 311 8.33333333333333e-02
+300 400 5.85469173142172e-18
+300 304 -8.33333333333334e-02
+300 268 -1.61681648971901e-17
+300 394 -4.16666666666667e-02
+300 310 -9.29364549727418e-18
+300 303 -9.72222222222223e-02
+300 267 -1.11111111111111e-01
+300 393 -6.94444444444445e-02
+300 309 -9.72222222222223e-02
+300 401 0.00000000000000e+00
+300 302 1.38777878078145e-17
+300 449 8.17556200689851e-18
+300 392 8.71279265369455e-18
+300 301 2.77555756156289e-17
+300 448 1.15196480826585e-18
+300 391 1.38777878078145e-17
+300 399 1.11111111111111e-01
+300 305 -1.26580603637683e-17
+300 447 -2.77777777777777e-02
+300 390 1.11111111111111e-01
+300 158 -8.67361737988404e-19
+300 44 2.26191678234788e-17
+300 224 -4.16666666666667e-02
+300 164 -8.33333333333333e-02
+300 157 8.33333333333333e-02
+300 43 2.81892564846231e-18
+300 223 4.16666666666667e-02
+300 163 8.53809210832335e-19
+300 156 -9.72222222222222e-02
+300 42 -1.11111111111111e-01
+300 222 -6.94444444444445e-02
+300 162 -9.72222222222222e-02
+301 301 5.55555555555556e-01
+301 269 -4.16666666666667e-02
+301 395 4.16666666666667e-02
+301 311 5.84452733605467e-19
+301 304 -9.72222222222222e-02
+301 268 5.55555555555555e-02
+301 394 -6.94444444444444e-02
+301 310 -1.38888888888889e-02
+301 303 -8.33333333333333e-02
+301 267 -1.75640751942652e-17
+301 393 -4.16666666666667e-02
+301 309 -8.94466792300541e-18
+301 401 -7.70139296302555e-17
+301 302 -1.66666666666667e-01
+301 449 1.66666666666667e-01
+301 392 3.31621869179531e-17
+301 400 -2.22222222222222e-01
+301 305 5.42101086242752e-18
+301 448 -1.94444444444444e-01
+301 391 1.11111111111111e-01
+301 399 5.97666447582634e-18
+301 300 2.77555756156289e-17
+301 447 3.28140563766316e-18
+301 390 3.46944695195361e-17
+301 158 1.35660796832249e-17
+301 44 -4.16666666666667e-02
+301 224 4.16666666666667e-02
+301 164 -7.59788553687107e-18
+301 157 -9.72222222222222e-02
+301 43 5.55555555555555e-02
+301 223 -6.94444444444444e-02
+301 163 -1.38888888888889e-02
+301 156 8.33333333333334e-02
+301 42 3.86247023947961e-18
+301 222 4.16666666666667e-02
+301 162 1.03168612975574e-18
+302 302 5.55555555555555e-01
+302 269 5.55555555555556e-02
+302 395 -6.94444444444444e-02
+302 311 -9.72222222222221e-02
+302 304 2.60208521396521e-18
+302 268 -4.16666666666667e-02
+302 394 4.16666666666667e-02
+302 310 1.40946282423116e-18
+302 303 -1.29020058525775e-17
+302 267 -4.26226979058364e-17
+302 393 4.16666666666667e-02
+302 309 8.33333333333333e-02
+302 401 1.11111111111111e-01
+302 305 -1.38888888888889e-02
+302 449 -1.94444444444444e-01
+302 392 -2.22222222222222e-01
+302 400 -7.59890197640778e-17
+302 301 -1.66666666666667e-01
+302 448 1.66666666666667e-01
+302 391 3.19416124409597e-17
+302 399 0.00000000000000e+00
+302 300 1.38777878078145e-17
+302 447 7.81980816905170e-18
+302 390 5.16181878056771e-18
+302 158 -1.38888888888889e-02
+302 44 5.55555555555555e-02
+302 224 -6.94444444444444e-02
+302 164 -9.72222222222222e-02
+302 157 1.35525271560688e-17
+302 43 -4.16666666666667e-02
+302 223 4.16666666666667e-02
+302 163 -7.94178091345632e-18
+302 156 -1.47722546001150e-18
+302 42 2.27275880407274e-17
+302 222 -4.16666666666667e-02
+302 162 -8.33333333333333e-02
+303 303 1.11111111111111e+00
+303 413 4.16666666666667e-02
+303 331 -8.33333333333334e-02
+303 412 -4.16666666666667e-02
+303 330 -9.72222222222222e-02
+303 411 -6.94444444444444e-02
+303 416 -7.09711965845433e-17
+303 326 -1.31595038685428e-17
+303 452 1.66666666666667e-01
+303 407 4.16666666666667e-02
+303 415 -8.91891812140888e-17
+303 325 8.33333333333333e-02
+303 451 -1.69677639993981e-17
+303 406 4.16666666666667e-02
+303 414 -2.22222222222222e-01
+303 324 -9.72222222222221e-02
+303 450 -1.94444444444444e-01
+303 405 -6.94444444444444e-02
+303 308 -1.58293517182884e-17
+303 281 6.93889390390723e-18
+303 398 -4.16666666666667e-02
+303 314 1.01339021809504e-17
+303 307 8.33333333333333e-02
+303 280 3.10081821330854e-17
+303 397 4.16666666666667e-02
+303 313 7.67073037033494e-18
+303 306 -9.72222222222222e-02
+303 279 1.11111111111111e-01
+303 396 -6.94444444444445e-02
+303 312 -2.77777777777779e-02
+303 401 -5.91296759819282e-17
+303 305 1.52655665885959e-16
+303 269 6.93889390390723e-18
+303 302 -1.29020058525775e-17
+303 449 -1.66666666666667e-01
+303 395 5.57445088082264e-17
+303 311 1.44469939483693e-17
+303 392 -4.16666666666667e-02
+303 400 -3.05745012640912e-17
+303 304 1.52655665885959e-16
+303 268 3.48435473182529e-17
+303 301 -8.33333333333334e-02
+303 448 -1.73607872869241e-17
+303 394 3.46944695195361e-17
+303 310 1.06793913989822e-17
+303 391 -4.16666666666667e-02
+303 399 -2.22222222222222e-01
+303 332 -1.06658388718261e-17
+303 267 1.11111111111111e-01
+303 300 -9.72222222222223e-02
+303 447 -1.94444444444445e-01
+303 393 2.22222222222222e-01
+303 309 -2.77777777777779e-02
+303 390 -6.94444444444445e-02
+304 304 1.11111111111111e+00
+304 413 4.16666666666667e-02
+304 331 -9.72222222222224e-02
+304 412 -6.94444444444445e-02
+304 330 -8.33333333333334e-02
+304 411 -4.16666666666667e-02
+304 416 3.46944695195361e-17
+304 326 2.08166817117217e-17
+304 452 5.22314396594892e-17
+304 407 -4.16666666666667e-02
+304 415 1.11111111111111e-01
+304 325 -9.72222222222222e-02
+304 451 -2.77777777777776e-02
+304 406 -6.94444444444444e-02
+304 414 -8.72782748850831e-17
+304 324 8.33333333333333e-02
+304 450 -1.57480365553520e-17
+304 405 4.16666666666667e-02
+304 308 4.79894986596396e-17
+304 281 -4.90838652274922e-17
+304 398 4.16666666666667e-02
+304 314 1.66666666666667e-01
+304 307 -9.72222222222222e-02
+304 280 -2.22222222222222e-01
+304 397 -6.94444444444444e-02
+304 313 -1.94444444444445e-01
+304 306 8.33333333333333e-02
+304 279 3.64698505769812e-17
+304 396 4.16666666666667e-02
+304 312 1.09030080970574e-17
+304 401 1.38777878078145e-17
+304 305 -1.38777878078145e-17
+304 269 -5.11472374870037e-17
+304 302 2.60208521396521e-18
+304 449 -4.64495927615313e-17
+304 395 3.23841871559000e-18
+304 311 -1.66666666666667e-01
+304 392 -4.16666666666667e-02
+304 400 1.11111111111111e-01
+304 332 -2.17247010311783e-17
+304 268 -2.22222222222222e-01
+304 301 -9.72222222222222e-02
+304 448 -2.77777777777778e-02
+304 394 2.22222222222222e-01
+304 310 -1.94444444444445e-01
+304 391 -6.94444444444445e-02
+304 399 -3.18755438710738e-17
+304 303 1.66533453693773e-16
+304 267 3.18755438710738e-17
+304 300 -8.33333333333334e-02
+304 447 -1.84263547345700e-17
+304 393 3.46944695195361e-17
+304 309 8.30769914667018e-18
+304 390 -4.16666666666667e-02
+305 305 1.11111111111111e+00
+305 413 -6.94444444444445e-02
+305 331 -2.26598254049470e-17
+305 412 4.16666666666667e-02
+305 330 -1.10588621593521e-17
+305 411 4.16666666666667e-02
+305 416 1.11111111111111e-01
+305 326 -1.38888888888888e-02
+305 452 -1.94444444444444e-01
+305 407 -6.94444444444444e-02
+305 415 3.46944695195361e-17
+305 325 2.38253427403690e-17
+305 451 5.31801165604140e-17
+305 406 -4.16666666666667e-02
+305 414 -7.23569424862514e-17
+305 324 -1.26851654180804e-17
+305 450 1.66666666666667e-01
+305 405 4.16666666666667e-02
+305 308 -1.38888888888889e-02
+305 281 1.11111111111111e-01
+305 398 -6.94444444444444e-02
+305 314 -1.94444444444445e-01
+305 307 4.86806775445991e-17
+305 280 -4.63767479280675e-17
+305 397 4.16666666666667e-02
+305 313 1.66666666666667e-01
+305 306 -1.47451495458029e-17
+305 279 6.93889390390723e-18
+305 396 -4.16666666666667e-02
+305 312 1.34170018845081e-17
+305 401 1.11111111111111e-01
+305 332 -1.38888888888889e-02
+305 269 1.11111111111111e-01
+305 302 -1.38888888888889e-02
+305 449 -1.94444444444444e-01
+305 395 -4.44444444444445e-01
+305 311 -1.94444444444445e-01
+305 392 -6.94444444444445e-02
+305 400 1.38777878078145e-17
+305 304 -1.38777878078145e-17
+305 268 -5.10371232038606e-17
+305 301 5.40745833527145e-18
+305 448 -4.46284719249346e-17
+305 394 7.36410444342889e-18
+305 310 -1.66666666666667e-01
+305 391 -4.16666666666667e-02
+305 399 -6.08542350625380e-17
+305 303 1.24900090270330e-16
+305 267 1.38777878078145e-17
+305 300 -1.22379320219301e-17
+305 447 -1.66666666666667e-01
+305 393 5.45556980667550e-17
+305 309 1.35118695746006e-17
+305 390 -4.16666666666667e-02
+306 306 5.55555555555555e-01
+306 308 2.77555756156289e-17
+306 281 -1.53956708492942e-17
+306 305 -1.47315970186468e-17
+306 401 0.00000000000000e+00
+306 398 1.39726554979069e-17
+306 314 8.33333333333334e-02
+306 395 4.16666666666667e-02
+306 449 8.13659849132481e-18
+306 307 -1.38777878078145e-17
+306 280 -1.65882932390282e-17
+306 304 8.33333333333333e-02
+306 400 5.97666447582634e-18
+306 397 -6.93889390390723e-18
+306 313 -9.98821251402271e-18
+306 394 4.16666666666667e-02
+306 448 3.66426452982210e-18
+306 279 -1.11111111111111e-01
+306 303 -9.72222222222222e-02
+306 399 1.11111111111111e-01
+306 396 1.11111111111111e-01
+306 312 -9.72222222222222e-02
+306 393 -6.94444444444444e-02
+306 447 -2.77777777777777e-02
+306 158 2.16840434497101e-19
+306 167 -8.33333333333334e-02
+306 224 -4.16666666666667e-02
+306 58 8.67361737988404e-19
+306 157 -8.33333333333334e-02
+306 166 -3.25260651745651e-19
+306 223 -4.16666666666667e-02
+306 57 -1.11111111111111e-01
+306 156 -9.72222222222222e-02
+306 165 -9.72222222222223e-02
+306 222 -6.94444444444445e-02
+306 59 -3.29597460435593e-17
+307 307 5.55555555555555e-01
+307 308 1.66666666666667e-01
+307 281 4.16666666666667e-02
+307 305 4.86806775445991e-17
+307 401 -7.33869345501126e-17
+307 398 1.24751012471613e-17
+307 314 1.63985578588433e-18
+307 395 -4.16666666666666e-02
+307 449 -1.66666666666667e-01
+307 280 5.55555555555556e-02
+307 304 -9.72222222222222e-02
+307 400 -2.22222222222222e-01
+307 397 1.11111111111111e-01
+307 313 -1.38888888888889e-02
+307 394 -6.94444444444444e-02
+307 448 -1.94444444444444e-01
+307 306 -1.38777878078145e-17
+307 279 -1.56125112837913e-17
+307 303 8.33333333333333e-02
+307 399 5.74627151417317e-18
+307 396 -6.93889390390723e-18
+307 312 -9.43255890062389e-18
+307 393 4.16666666666667e-02
+307 447 1.46367293285543e-18
+307 158 7.26415455565288e-18
+307 167 -1.34305544116642e-17
+307 224 -4.16666666666667e-02
+307 58 5.55555555555555e-02
+307 157 -9.72222222222222e-02
+307 166 -1.38888888888889e-02
+307 223 -6.94444444444444e-02
+307 57 1.95156391047391e-18
+307 156 -8.33333333333333e-02
+307 165 -3.79470760369927e-19
+307 222 -4.16666666666667e-02
+307 59 4.16666666666666e-02
+308 308 5.55555555555555e-01
+308 281 5.55555555555554e-02
+308 305 -1.38888888888889e-02
+308 401 1.11111111111111e-01
+308 398 -2.22222222222222e-01
+308 314 -9.72222222222222e-02
+308 395 -6.94444444444444e-02
+308 449 -1.94444444444444e-01
+308 307 1.66666666666667e-01
+308 280 4.16666666666667e-02
+308 304 4.71221369216512e-17
+308 400 -7.00750357263483e-17
+308 397 1.26038502551440e-18
+308 313 2.27682456221956e-18
+308 394 -4.16666666666666e-02
+308 448 -1.66666666666667e-01
+308 306 2.77555756156289e-17
+308 279 -1.64798730217797e-17
+308 303 -1.40946282423116e-17
+308 399 0.00000000000000e+00
+308 396 6.17995238316738e-18
+308 312 8.33333333333334e-02
+308 393 4.16666666666667e-02
+308 447 8.02309607639273e-18
+308 158 -1.38888888888889e-02
+308 167 -9.72222222222223e-02
+308 224 -6.94444444444444e-02
+308 58 4.16666666666666e-02
+308 157 8.29414661951411e-18
+308 166 -1.26851654180804e-17
+308 223 -4.16666666666667e-02
+308 57 -3.32850066953050e-17
+308 156 4.06575814682064e-19
+308 165 -8.33333333333334e-02
+308 222 -4.16666666666667e-02
+308 59 5.55555555555555e-02
+309 309 1.11111111111111e+00
+309 326 -8.33333333333334e-02
+309 415 -4.16666666666667e-02
+309 325 -7.32175279606617e-18
+309 414 -6.94444444444444e-02
+309 324 -9.72222222222222e-02
+309 452 -2.50213532618920e-17
+309 407 -1.46123771313207e-16
+309 404 4.16666666666667e-02
+309 317 8.33333333333333e-02
+309 451 -1.66666666666667e-01
+309 406 -8.96774957081809e-17
+309 403 -4.16666666666667e-02
+309 316 -7.92822838630025e-18
+309 450 -1.94444444444444e-01
+309 405 -2.22222222222222e-01
+309 402 -6.94444444444444e-02
+309 315 -9.72222222222220e-02
+309 401 4.16666666666667e-02
+309 305 1.25496401465197e-17
+309 269 5.25651706407074e-17
+309 302 8.33333333333333e-02
+309 400 4.16666666666667e-02
+309 304 7.88757080483204e-18
+309 268 6.93889390390723e-18
+309 301 -8.72782748850831e-18
+309 399 -6.94444444444444e-02
+309 303 -2.77777777777779e-02
+309 267 1.11111111111111e-01
+309 300 -9.72222222222223e-02
+309 449 -2.78639958328775e-17
+309 395 5.55111512312578e-17
+309 311 2.35922392732846e-16
+309 392 -8.86487741937406e-17
+309 389 -4.16666666666667e-02
+309 296 1.01067971266383e-17
+309 245 5.06047128842873e-17
+309 293 -8.33333333333334e-02
+309 448 1.66666666666667e-01
+309 394 5.94888179515640e-17
+309 310 1.11022302462516e-16
+309 391 -2.85975263651997e-17
+309 388 4.16666666666667e-02
+309 295 7.67073037033494e-18
+309 244 1.38777878078145e-17
+309 292 -8.36190925529445e-18
+309 447 -1.94444444444444e-01
+309 393 2.22222222222222e-01
+309 416 -4.16666666666667e-02
+309 390 -2.22222222222223e-01
+309 387 -6.94444444444445e-02
+309 294 -2.77777777777778e-02
+309 243 1.11111111111111e-01
+309 291 -9.72222222222223e-02
+310 310 1.11111111111111e+00
+310 326 -2.01390553539182e-17
+310 415 -6.94444444444445e-02
+310 325 -1.38888888888889e-02
+310 414 -4.16666666666667e-02
+310 324 -7.27770708280895e-18
+310 452 -5.67241024117260e-17
+310 407 2.77555756156289e-17
+310 404 4.16666666666667e-02
+310 317 2.65494006987388e-17
+310 451 -1.94444444444445e-01
+310 406 1.11111111111111e-01
+310 403 -6.94444444444445e-02
+310 316 -1.38888888888888e-02
+310 450 -1.66666666666667e-01
+310 405 -8.59213281035817e-17
+310 402 -4.16666666666667e-02
+310 315 -7.83336069620777e-18
+310 401 -4.16666666666666e-02
+310 305 -1.66666666666667e-01
+310 269 2.29376522116465e-17
+310 302 -3.38813178901720e-19
+310 400 -6.94444444444444e-02
+310 304 -1.94444444444445e-01
+310 268 1.11111111111111e-01
+310 301 -1.38888888888889e-02
+310 399 4.16666666666667e-02
+310 303 9.25637604759499e-18
+310 267 6.93889390390723e-18
+310 300 -1.01322081150559e-17
+310 449 8.01919972483536e-17
+310 395 -5.47992200390906e-17
+310 311 1.38777878078145e-16
+310 392 -4.85722573273506e-17
+310 389 4.16666666666667e-02
+310 296 1.66666666666667e-01
+310 245 1.94946750392945e-17
+310 293 -2.35305752747245e-17
+310 448 -1.94444444444444e-01
+310 394 -4.44444444444445e-01
+310 416 -4.16666666666668e-02
+310 391 1.11111111111111e-01
+310 388 -6.94444444444444e-02
+310 295 -1.94444444444445e-01
+310 244 1.11111111111111e-01
+310 292 -1.38888888888889e-02
+310 447 1.66666666666667e-01
+310 393 6.86867487257985e-17
+310 309 1.38777878078145e-16
+310 390 -3.00592934739238e-17
+310 387 4.16666666666667e-02
+310 294 1.06624507400371e-17
+310 243 1.38777878078145e-17
+310 291 -9.14287363266292e-18
+311 311 1.11111111111111e+00
+311 326 -9.72222222222225e-02
+311 415 -4.16666666666668e-02
+311 325 -2.04287406218792e-17
+311 414 -4.16666666666667e-02
+311 324 -8.33333333333334e-02
+311 452 -2.77777777777778e-02
+311 407 1.11111111111111e-01
+311 404 -6.94444444444445e-02
+311 317 -9.72222222222220e-02
+311 451 -5.73407423973271e-17
+311 406 3.46944695195361e-17
+311 403 4.16666666666667e-02
+311 316 2.58582218137793e-17
+311 450 -2.66442683888313e-17
+311 405 -1.47654783365370e-16
+311 402 4.16666666666667e-02
+311 315 8.33333333333333e-02
+311 401 -6.94444444444444e-02
+311 305 -1.94444444444445e-01
+311 269 -2.22222222222222e-01
+311 302 -9.72222222222221e-02
+311 400 -4.16666666666666e-02
+311 304 -1.66666666666667e-01
+311 268 1.94944632810577e-17
+311 301 5.86146799499976e-19
+311 399 4.16666666666667e-02
+311 303 1.45554141656179e-17
+311 267 4.70810558237094e-17
+311 300 8.33333333333333e-02
+311 449 -2.77777777777778e-02
+311 395 2.22222222222222e-01
+311 416 -6.94444444444445e-02
+311 392 1.11111111111111e-01
+311 389 -6.94444444444444e-02
+311 296 -1.94444444444445e-01
+311 245 -2.22222222222222e-01
+311 293 -9.72222222222223e-02
+311 448 8.06781941600776e-17
+311 394 -6.51283633143832e-17
+311 310 1.38777878078145e-16
+311 391 -4.85722573273506e-17
+311 388 4.16666666666667e-02
+311 295 1.66666666666667e-01
+311 244 2.64054050977056e-17
+311 292 -2.11012847819991e-17
+311 447 -2.62444688377272e-17
+311 393 4.85722573273506e-17
+311 309 2.35922392732846e-16
+311 390 -9.03726979996399e-17
+311 387 -4.16666666666667e-02
+311 294 1.34170018845081e-17
+311 243 4.95683680733217e-17
+311 291 -8.33333333333334e-02
+312 312 1.11111111111111e+00
+312 416 -4.16666666666667e-02
+312 331 -9.13440330319037e-18
+312 415 4.16666666666667e-02
+312 330 -9.72222222222221e-02
+312 414 -6.94444444444444e-02
+312 413 5.35324822664718e-18
+312 452 -2.77149180341607e-17
+312 323 8.33333333333333e-02
+312 404 4.16666666666667e-02
+312 412 -9.19488145562433e-17
+312 451 1.66666666666667e-01
+312 322 -8.38901430960659e-18
+312 403 4.16666666666667e-02
+312 411 -2.22222222222222e-01
+312 450 -1.94444444444444e-01
+312 321 -9.72222222222221e-02
+312 402 -6.94444444444444e-02
+312 308 8.33333333333334e-02
+312 281 4.11996825544492e-18
+312 305 1.23327997120226e-17
+312 401 4.16666666666667e-02
+312 307 -9.32413868337534e-18
+312 280 2.77555756156289e-17
+312 304 1.08911496357958e-17
+312 400 -4.16666666666667e-02
+312 306 -9.72222222222222e-02
+312 279 1.11111111111111e-01
+312 303 -2.77777777777779e-02
+312 399 -6.94444444444445e-02
+312 398 -3.05745012640912e-17
+312 314 1.38777878078145e-17
+312 395 4.16333634234434e-17
+312 449 -2.15891757596176e-17
+312 299 -8.33333333333334e-02
+312 257 -6.77626357803440e-20
+312 296 1.09775469964157e-17
+312 389 -4.16666666666667e-02
+312 397 -3.31223763694322e-17
+312 313 1.52655665885959e-16
+312 394 6.70604454670702e-17
+312 448 -1.66666666666667e-01
+312 298 -8.99887803162969e-18
+312 256 2.77555756156289e-17
+312 295 1.06793913989822e-17
+312 388 -4.16666666666667e-02
+312 396 -2.22222222222222e-01
+312 332 -8.33333333333334e-02
+312 393 2.22222222222222e-01
+312 447 -1.94444444444445e-01
+312 297 -9.72222222222223e-02
+312 255 1.11111111111111e-01
+312 294 -2.77777777777778e-02
+312 387 -6.94444444444445e-02
+313 313 1.11111111111111e+00
+313 416 4.16666666666667e-02
+313 331 -1.38888888888888e-02
+313 415 -6.94444444444444e-02
+313 330 -7.26415455565288e-18
+313 414 4.16666666666667e-02
+313 413 -6.93889390390723e-18
+313 452 3.42065785419177e-17
+313 323 2.55600662163458e-17
+313 404 -4.16666666666667e-02
+313 412 1.11111111111112e-01
+313 451 -1.94444444444444e-01
+313 322 -1.38888888888888e-02
+313 403 -6.94444444444444e-02
+313 411 -9.05986440383200e-17
+313 450 1.66666666666667e-01
+313 321 -7.26415455565288e-18
+313 402 4.16666666666667e-02
+313 308 2.27682456221956e-18
+313 281 -1.99086623922651e-17
+313 305 1.66666666666667e-01
+313 401 4.16666666666667e-02
+313 307 -1.38888888888889e-02
+313 280 1.11111111111111e-01
+313 304 -1.94444444444445e-01
+313 400 -6.94444444444444e-02
+313 306 -9.98821251402271e-18
+313 279 2.77555756156289e-17
+313 303 5.93600689435814e-18
+313 399 -4.16666666666667e-02
+313 398 -3.46944695195361e-17
+313 314 4.16333634234434e-17
+313 395 -4.47470565375502e-17
+313 449 -4.39101879856629e-18
+313 299 -2.11961524720916e-17
+313 257 -1.63409596184300e-17
+313 296 -1.66666666666667e-01
+313 389 -4.16666666666667e-02
+313 397 1.11111111111111e-01
+313 332 -2.87313575708659e-17
+313 394 -4.44444444444445e-01
+313 448 -1.94444444444444e-01
+313 298 -1.38888888888889e-02
+313 256 1.11111111111111e-01
+313 295 -1.94444444444445e-01
+313 388 -6.94444444444445e-02
+313 396 -3.47774787483671e-17
+313 312 1.52655665885959e-16
+313 393 6.25771000772532e-17
+313 447 -1.66666666666667e-01
+313 297 -9.32413868337534e-18
+313 255 2.77555756156289e-17
+313 294 8.09085871217308e-18
+313 387 -4.16666666666667e-02
+314 314 1.11111111111111e+00
+314 416 -6.94444444444445e-02
+314 331 -2.97342445804150e-17
+314 415 4.16666666666667e-02
+314 330 -8.33333333333334e-02
+314 414 -4.16666666666667e-02
+314 413 1.11111111111111e-01
+314 452 -2.77777777777776e-02
+314 323 -9.72222222222223e-02
+314 404 -6.94444444444444e-02
+314 412 -6.93889390390723e-18
+314 451 3.81740808668568e-17
+314 322 2.73218947466347e-17
+314 403 -4.16666666666667e-02
+314 411 3.57786716920216e-18
+314 450 -2.82976767018717e-17
+314 321 8.33333333333333e-02
+314 402 4.16666666666667e-02
+314 308 -9.72222222222222e-02
+314 281 -2.22222222222222e-01
+314 305 -1.94444444444445e-01
+314 401 -6.94444444444444e-02
+314 307 1.62630325872826e-18
+314 280 -1.62308453352869e-17
+314 304 1.66666666666667e-01
+314 400 4.16666666666667e-02
+314 306 8.33333333333334e-02
+314 279 3.29326409892472e-18
+314 303 1.01203496537944e-17
+314 399 4.16666666666667e-02
+314 398 1.11111111111111e-01
+314 332 -9.72222222222222e-02
+314 395 2.22222222222222e-01
+314 449 -2.77777777777778e-02
+314 299 -9.72222222222222e-02
+314 257 -2.22222222222222e-01
+314 296 -1.94444444444445e-01
+314 389 -6.94444444444445e-02
+314 397 -3.46944695195361e-17
+314 313 4.16333634234434e-17
+314 394 -5.33895454566226e-17
+314 448 -4.38763066677728e-19
+314 298 -2.17924636669586e-17
+314 256 -1.99222149194211e-17
+314 295 -1.66666666666667e-01
+314 388 -4.16666666666667e-02
+314 396 -3.21872519956634e-17
+314 312 1.38777878078145e-17
+314 393 4.16333634234434e-17
+314 447 -2.18653085004225e-17
+314 297 -8.33333333333334e-02
+314 255 4.98732999343332e-18
+314 294 1.35118695746006e-17
+314 387 -4.16666666666667e-02
+315 315 5.55555555555555e-01
+315 335 -8.33333333333333e-02
+315 320 7.33869345501126e-18
+315 248 6.56662292358896e-18
+315 409 -4.16666666666667e-02
+315 334 4.31478583331341e-18
+315 319 -8.33333333333334e-02
+315 247 8.82290693683761e-18
+315 408 -6.94444444444444e-02
+315 333 -9.72222222222222e-02
+315 318 -9.72222222222222e-02
+315 246 -1.11111111111111e-01
+315 395 4.16666666666667e-02
+315 452 4.05220561966457e-18
+315 407 3.00086832553254e-17
+315 311 8.33333333333333e-02
+315 296 -1.30781887056064e-17
+315 404 -1.38777878078145e-17
+315 317 8.32667268468867e-17
+315 245 -7.09051280146575e-17
+315 394 4.16666666666667e-02
+315 451 -6.77626357803440e-19
+315 406 -2.77555756156289e-17
+315 310 -7.73849300611529e-18
+315 295 8.33333333333333e-02
+315 403 1.71388646547435e-17
+315 316 4.16333634234434e-17
+315 244 -4.36509959038031e-17
+315 393 -6.94444444444444e-02
+315 450 -2.77777777777778e-02
+315 405 1.11111111111111e-01
+315 309 -9.72222222222220e-02
+315 294 -9.72222222222220e-02
+315 402 1.11111111111111e-01
+315 410 -4.16666666666667e-02
+315 243 -1.11111111111111e-01
+316 316 5.55555555555555e-01
+316 335 2.08708918203460e-18
+316 320 3.50502233573829e-18
+316 248 4.16666666666667e-02
+316 409 -6.94444444444444e-02
+316 334 -1.38888888888889e-02
+316 319 -9.72222222222221e-02
+316 247 5.55555555555555e-02
+316 408 -4.16666666666667e-02
+316 333 3.56431464204610e-18
+316 318 -8.33333333333334e-02
+316 246 5.65140382408069e-18
+316 395 -4.16666666666667e-02
+316 452 -1.66666666666667e-01
+316 407 -1.99239089853157e-17
+316 311 2.75793927626000e-17
+316 296 1.34830704543940e-17
+316 404 9.06897000801498e-18
+316 317 1.66666666666667e-01
+316 245 4.16666666666667e-02
+316 394 -6.94444444444444e-02
+316 451 -1.94444444444445e-01
+316 406 1.11111111111111e-01
+316 310 -1.38888888888888e-02
+316 295 -9.72222222222221e-02
+316 403 -2.22222222222222e-01
+316 410 -4.16666666666667e-02
+316 244 5.55555555555557e-02
+316 393 4.16666666666667e-02
+316 450 1.11300129269215e-18
+316 405 -2.08166817117217e-17
+316 309 -7.90112333198811e-18
+316 294 8.33333333333333e-02
+316 402 2.32421605561844e-17
+316 315 4.16333634234434e-17
+316 243 -4.49134985116856e-17
+317 317 5.55555555555556e-01
+317 335 -9.72222222222222e-02
+317 320 -1.38888888888889e-02
+317 248 5.55555555555555e-02
+317 409 -4.16666666666667e-02
+317 334 -1.86177841806495e-18
+317 319 4.25549352700560e-18
+317 247 4.16666666666667e-02
+317 408 -4.16666666666667e-02
+317 333 -8.33333333333333e-02
+317 318 8.78203759713259e-18
+317 246 9.69683318016723e-18
+317 395 -6.94444444444444e-02
+317 452 -1.94444444444445e-01
+317 407 -2.22222222222222e-01
+317 311 -9.72222222222220e-02
+317 296 -1.38888888888888e-02
+317 404 1.11111111111111e-01
+317 410 -6.94444444444444e-02
+317 245 5.55555555555557e-02
+317 394 -4.16666666666667e-02
+317 451 -1.66666666666667e-01
+317 406 -2.37042170289116e-17
+317 310 2.56820389607504e-17
+317 295 1.33763443030399e-17
+317 403 6.28837260041593e-18
+317 316 1.66666666666667e-01
+317 244 4.16666666666667e-02
+317 393 4.16666666666667e-02
+317 450 1.83297929785831e-18
+317 405 2.55280907225869e-17
+317 309 8.33333333333333e-02
+317 294 -1.21024067503694e-17
+317 402 -1.38777878078145e-17
+317 315 6.93889390390723e-17
+317 243 -7.32552209268145e-17
+318 318 1.11111111111111e+00
+318 347 -1.37049930865746e-17
+318 427 -4.16666666666667e-02
+318 346 -8.33333333333334e-02
+318 426 -6.94444444444444e-02
+318 345 -9.72222222222222e-02
+318 455 -1.66666666666667e-01
+318 422 -4.16666666666667e-02
+318 419 -7.34369094940006e-17
+318 341 -1.64442976379950e-17
+318 454 6.24432688715870e-18
+318 421 4.16666666666667e-02
+318 418 2.27216588100966e-17
+318 340 8.33333333333334e-02
+318 453 -1.94444444444445e-01
+318 420 -6.94444444444444e-02
+318 417 -2.22222222222223e-01
+318 339 -9.72222222222223e-02
+318 413 4.16666666666667e-02
+318 338 1.51788304147971e-18
+318 323 6.83047368665868e-18
+318 260 6.93889390390723e-18
+318 412 4.16666666666667e-02
+318 337 -4.11996825544492e-18
+318 322 8.33333333333334e-02
+318 259 -1.18889544476614e-17
+318 411 -6.94444444444445e-02
+318 336 -2.77777777777777e-02
+318 321 -9.72222222222222e-02
+318 258 1.11111111111111e-01
+318 452 1.66666666666667e-01
+318 410 3.50569996209610e-17
+318 335 1.53143556863578e-18
+318 407 4.16666666666667e-02
+318 404 -1.30714124420284e-17
+318 320 8.32667268468867e-17
+318 248 6.93889390390723e-18
+318 317 7.91467585914418e-18
+318 451 7.04731412115578e-18
+318 409 -2.08166817117217e-17
+318 334 -4.18095462764723e-18
+318 406 -4.16666666666667e-02
+318 403 1.79435459546351e-17
+318 319 -1.38777878078145e-17
+318 247 -1.34199664998235e-17
+318 316 -8.33333333333334e-02
+318 450 -1.94444444444444e-01
+318 408 2.22222222222222e-01
+318 333 -2.77777777777777e-02
+318 405 -6.94444444444444e-02
+318 402 -2.22222222222222e-01
+318 428 -4.16666666666667e-02
+318 246 1.11111111111111e-01
+318 315 -9.72222222222222e-02
+319 319 1.11111111111111e+00
+319 347 -3.69814584771228e-17
+319 427 -6.94444444444444e-02
+319 346 -9.72222222222221e-02
+319 426 -4.16666666666667e-02
+319 345 -8.33333333333334e-02
+319 455 1.91226158172131e-17
+319 422 4.16666666666667e-02
+319 419 6.93889390390723e-18
+319 341 1.52059354691092e-17
+319 454 -2.77777777777778e-02
+319 421 -6.94444444444444e-02
+319 418 1.11111111111111e-01
+319 340 -9.72222222222222e-02
+319 453 6.19350491032344e-18
+319 420 4.16666666666667e-02
+319 417 2.25005832108632e-17
+319 339 8.33333333333334e-02
+319 413 -4.16666666666667e-02
+319 338 -1.66666666666667e-01
+319 323 1.56192875473693e-18
+319 260 1.70679256454110e-17
+319 412 -6.94444444444445e-02
+319 337 -1.94444444444444e-01
+319 322 -9.72222222222222e-02
+319 259 -2.22222222222222e-01
+319 411 4.16666666666667e-02
+319 336 -4.42320605056196e-18
+319 321 8.33333333333334e-02
+319 258 -1.61016728108306e-17
+319 452 -1.66967134562768e-17
+319 410 -1.71964628951568e-17
+319 335 1.66666666666667e-01
+319 407 4.16666666666667e-02
+319 404 -3.46944695195361e-17
+319 320 6.93889390390723e-17
+319 248 1.50890449223881e-17
+319 317 4.30970363562988e-18
+319 451 -2.77777777777778e-02
+319 409 2.22222222222222e-01
+319 334 -1.94444444444444e-01
+319 406 -6.94444444444444e-02
+319 403 1.11111111111111e-01
+319 428 -4.16666666666667e-02
+319 247 -2.22222222222222e-01
+319 316 -9.72222222222221e-02
+319 450 7.61990839349969e-18
+319 408 -1.38777878078145e-17
+319 333 -4.11996825544492e-18
+319 405 -4.16666666666667e-02
+319 402 1.88769762625093e-17
+319 318 -1.38777878078145e-17
+319 246 -1.17534291761007e-17
+319 315 -8.33333333333334e-02
+320 320 1.11111111111111e+00
+320 347 -1.38888888888889e-02
+320 427 -4.16666666666667e-02
+320 346 -3.80690487813973e-17
+320 426 -4.16666666666667e-02
+320 345 -1.44334414212133e-17
+320 455 -1.94444444444445e-01
+320 422 -6.94444444444445e-02
+320 419 1.11111111111111e-01
+320 341 -1.38888888888889e-02
+320 454 1.49094739375702e-17
+320 421 4.16666666666667e-02
+320 418 6.93889390390723e-18
+320 340 1.52923328297291e-17
+320 453 -1.66666666666667e-01
+320 420 -4.16666666666667e-02
+320 417 -7.40069626675027e-17
+320 339 -1.64392154403115e-17
+320 413 -6.94444444444445e-02
+320 338 -1.94444444444444e-01
+320 323 -1.38888888888889e-02
+320 260 1.11111111111111e-01
+320 412 -4.16666666666667e-02
+320 337 -1.66666666666667e-01
+320 322 3.17129135452010e-18
+320 259 1.51940770078476e-17
+320 411 4.16666666666667e-02
+320 336 2.90871114087127e-18
+320 321 5.34477789717464e-18
+320 258 6.93889390390723e-18
+320 452 -1.94444444444444e-01
+320 410 -4.44444444444445e-01
+320 335 -1.94444444444444e-01
+320 407 -6.94444444444445e-02
+320 404 1.11111111111111e-01
+320 428 -6.94444444444445e-02
+320 248 1.11111111111111e-01
+320 317 -1.38888888888889e-02
+320 451 -1.97578905276538e-17
+320 409 -1.60072286372118e-17
+320 334 1.66666666666667e-01
+320 406 4.16666666666667e-02
+320 403 -3.46944695195361e-17
+320 319 6.93889390390723e-17
+320 247 1.16670318154807e-17
+320 316 3.50671640163280e-18
+320 450 1.66666666666667e-01
+320 408 3.91229695260184e-17
+320 333 4.68409219831628e-18
+320 405 4.16666666666667e-02
+320 402 -1.27321757466530e-17
+320 318 8.32667268468867e-17
+320 246 6.93889390390723e-18
+320 315 7.33869345501126e-18
+321 321 5.55555555555556e-01
+321 395 4.16666666666667e-02
+321 257 2.92734586571086e-18
+321 296 -9.24282352043893e-18
+321 313 -7.15573433840433e-18
+321 394 -4.16666666666667e-02
+321 256 -4.72034520845876e-17
+321 295 -8.33333333333334e-02
+321 312 -9.72222222222221e-02
+321 393 -6.94444444444444e-02
+321 255 -1.11111111111111e-01
+321 294 -9.72222222222221e-02
+321 413 1.08420217248550e-17
+321 338 -8.33333333333334e-02
+321 410 -4.16666666666667e-02
+321 452 4.06575814682064e-18
+321 323 -1.38777878078145e-17
+321 260 -1.95156391047391e-17
+321 320 6.21213963516304e-18
+321 404 -6.93889390390723e-18
+321 412 6.93889390390723e-18
+321 337 3.71339244076285e-18
+321 409 4.16666666666667e-02
+321 451 1.91260039490021e-18
+321 322 5.55111512312578e-17
+321 259 8.75323847692594e-18
+321 319 8.33333333333334e-02
+321 403 1.89038695585847e-17
+321 411 1.11111111111111e-01
+321 336 -9.72222222222222e-02
+321 408 -6.94444444444444e-02
+321 450 -2.77777777777779e-02
+321 314 8.33333333333333e-02
+321 258 -1.11111111111111e-01
+321 318 -9.72222222222222e-02
+321 402 1.11111111111111e-01
+322 322 5.55555555555556e-01
+322 395 4.16666666666667e-02
+322 257 -4.16666666666667e-02
+322 296 -3.11979175132704e-17
+322 313 -1.38888888888888e-02
+322 394 -6.94444444444445e-02
+322 256 5.55555555555557e-02
+322 295 -9.72222222222224e-02
+322 312 -8.49743452685514e-18
+322 393 -4.16666666666667e-02
+322 255 -4.64411224320588e-17
+322 294 -8.33333333333334e-02
+322 413 -2.42996811908314e-17
+322 338 5.42101086242752e-19
+322 410 4.16666666666667e-02
+322 452 1.66666666666667e-01
+322 323 -1.66666666666667e-01
+322 260 -4.16666666666667e-02
+322 320 3.22550146314438e-18
+322 404 8.94636198889992e-18
+322 412 1.11111111111111e-01
+322 337 -1.38888888888889e-02
+322 409 -6.94444444444444e-02
+322 451 -1.94444444444445e-01
+322 314 2.77555756156289e-17
+322 259 5.55555555555555e-02
+322 319 -9.72222222222222e-02
+322 403 -2.22222222222222e-01
+322 411 6.93889390390723e-18
+322 336 5.09575021068187e-18
+322 408 4.16666666666667e-02
+322 450 1.93801138331784e-18
+322 321 5.55111512312578e-17
+322 258 9.63584680796492e-18
+322 318 8.33333333333334e-02
+322 402 1.66933253244878e-17
+323 323 5.55555555555556e-01
+323 395 -6.94444444444445e-02
+323 257 5.55555555555557e-02
+323 296 -1.38888888888889e-02
+323 313 2.73896573824151e-17
+323 394 4.16666666666667e-02
+323 256 -4.16666666666667e-02
+323 295 -3.15248722309106e-17
+323 312 8.33333333333333e-02
+323 393 4.16666666666667e-02
+323 255 4.81114714040443e-18
+323 294 -9.42070043936233e-18
+323 413 -2.22222222222222e-01
+323 338 -9.72222222222222e-02
+323 410 -6.94444444444444e-02
+323 452 -1.94444444444445e-01
+323 314 -9.72222222222223e-02
+323 260 5.55555555555556e-02
+323 320 -1.38888888888889e-02
+323 404 1.11111111111111e-01
+323 412 -1.89379626347116e-17
+323 337 -3.52365706057789e-19
+323 409 4.16666666666667e-02
+323 451 1.66666666666667e-01
+323 322 -1.66666666666667e-01
+323 259 -4.16666666666667e-02
+323 319 2.43098455861984e-18
+323 403 1.25384169599686e-17
+323 411 7.87401827767598e-18
+323 336 -8.33333333333334e-02
+323 408 -4.16666666666667e-02
+323 450 1.76352259618345e-18
+323 321 -1.38777878078145e-17
+323 258 -1.75640751942652e-17
+323 318 7.68428289749101e-18
+323 402 -6.93889390390723e-18
+324 324 5.55555555555556e-01
+324 272 8.29245255361960e-18
+324 410 4.16666666666667e-02
+324 335 8.33333333333334e-02
+324 328 -8.33333333333333e-02
+324 271 9.29703362906320e-18
+324 409 -4.16666666666667e-02
+324 334 3.79809573548828e-18
+324 327 -9.72222222222223e-02
+324 270 -1.11111111111111e-01
+324 408 -6.94444444444444e-02
+324 333 -9.72222222222222e-02
+324 305 -1.29020058525775e-17
+324 416 2.08166817117217e-17
+324 326 5.55111512312578e-17
+324 269 -7.36444325660779e-17
+324 395 -4.16666666666667e-02
+324 452 1.74997006902738e-18
+324 407 2.89958436086460e-17
+324 311 -8.33333333333334e-02
+324 304 8.33333333333333e-02
+324 415 1.74556549770166e-17
+324 325 2.77555756156289e-17
+324 268 -4.39101879856629e-17
+324 394 4.16666666666667e-02
+324 451 2.16840434497101e-18
+324 406 -2.77555756156289e-17
+324 310 -7.06086664831185e-18
+324 303 -9.72222222222221e-02
+324 414 1.11111111111111e-01
+324 329 6.88468379528295e-18
+324 267 -1.11111111111111e-01
+324 393 -6.94444444444444e-02
+324 450 -2.77777777777778e-02
+324 405 1.11111111111111e-01
+324 309 -9.72222222222222e-02
+325 325 5.55555555555556e-01
+325 272 -4.16666666666667e-02
+325 410 4.16666666666667e-02
+325 335 -1.31578098026483e-17
+325 328 -9.72222222222222e-02
+325 271 5.55555555555555e-02
+325 409 -6.94444444444444e-02
+325 334 -1.38888888888889e-02
+325 327 -8.33333333333334e-02
+325 270 7.15573433840433e-18
+325 408 -4.16666666666667e-02
+325 333 3.57786716920216e-18
+325 305 2.37033699959643e-17
+325 416 3.22092748522920e-17
+325 326 -1.66666666666667e-01
+325 269 -4.16666666666667e-02
+325 395 4.16666666666667e-02
+325 452 1.66666666666667e-01
+325 407 -2.02349818351948e-17
+325 311 -2.04253524900902e-17
+325 304 -9.72222222222222e-02
+325 415 -2.22222222222222e-01
+325 329 1.09639944692597e-17
+325 268 5.55555555555557e-02
+325 394 -6.94444444444444e-02
+325 451 -1.94444444444445e-01
+325 406 1.11111111111111e-01
+325 310 -1.38888888888889e-02
+325 303 8.33333333333333e-02
+325 414 2.04643160056639e-17
+325 324 2.77555756156289e-17
+325 267 -4.46284719249346e-17
+325 393 4.16666666666667e-02
+325 450 1.07064964532944e-18
+325 405 -2.08166817117217e-17
+325 309 -7.53689916466876e-18
+326 326 5.55555555555556e-01
+326 272 5.55555555555555e-02
+326 410 -6.94444444444445e-02
+326 335 -9.72222222222222e-02
+326 328 1.00830802041152e-17
+326 271 -4.16666666666667e-02
+326 409 4.16666666666667e-02
+326 334 -1.08962318334793e-17
+326 327 6.72205346941013e-18
+326 270 7.46744246299391e-18
+326 408 4.16666666666667e-02
+326 333 8.33333333333334e-02
+326 305 -1.38888888888888e-02
+326 416 1.11111111111111e-01
+326 329 -1.38888888888889e-02
+326 269 5.55555555555557e-02
+326 395 -6.94444444444445e-02
+326 452 -1.94444444444445e-01
+326 407 -2.22222222222222e-01
+326 311 -9.72222222222225e-02
+326 304 2.08166817117217e-17
+326 415 3.03170032481259e-17
+326 325 -1.66666666666667e-01
+326 268 -4.16666666666667e-02
+326 394 4.16666666666667e-02
+326 451 1.66666666666667e-01
+326 406 -1.98680048107969e-17
+326 310 -2.01390553539182e-17
+326 303 -1.26174027823001e-17
+326 414 1.38777878078145e-17
+326 324 5.55111512312578e-17
+326 267 -7.41170769506458e-17
+326 393 -4.16666666666667e-02
+326 450 3.63207727782644e-18
+326 405 2.96156599677994e-17
+326 309 -8.33333333333334e-02
+327 327 1.11111111111111e+00
+327 428 4.16666666666667e-02
+327 355 -8.33333333333333e-02
+327 427 -4.16666666666667e-02
+327 354 -9.72222222222223e-02
+327 426 -6.94444444444444e-02
+327 431 -7.62261889893090e-17
+327 350 -1.65205306032479e-17
+327 455 1.66666666666667e-01
+327 422 4.16666666666667e-02
+327 430 2.60344046668082e-17
+327 349 8.33333333333334e-02
+327 454 5.90381964236247e-18
+327 421 4.16666666666667e-02
+327 429 -2.22222222222222e-01
+327 348 -9.72222222222223e-02
+327 453 -1.94444444444444e-01
+327 420 -6.94444444444444e-02
+327 332 4.77048955893622e-18
+327 284 -1.38777878078145e-17
+327 413 -4.16666666666667e-02
+327 338 1.22650370762423e-18
+327 331 8.33333333333333e-02
+327 283 -7.58941520739853e-18
+327 412 4.16666666666667e-02
+327 337 -4.10641572828885e-18
+327 330 -9.72222222222223e-02
+327 282 1.11111111111111e-01
+327 411 -6.94444444444444e-02
+327 336 -2.77777777777777e-02
+327 416 -1.24954300378954e-17
+327 329 5.55111512312578e-17
+327 272 -1.38777878078145e-17
+327 326 6.72205346941013e-18
+327 452 -1.66666666666667e-01
+327 410 3.29415348351934e-17
+327 335 1.27054942088145e-18
+327 407 -4.16666666666667e-02
+327 415 1.58293517182884e-17
+327 328 -5.55111512312578e-17
+327 271 -9.17506088465858e-18
+327 325 -8.33333333333334e-02
+327 451 8.87690528722507e-18
+327 409 -2.08166817117217e-17
+327 334 -3.87941089842470e-18
+327 406 -4.16666666666667e-02
+327 414 -2.22222222222222e-01
+327 356 -1.43385737311208e-17
+327 270 1.11111111111111e-01
+327 324 -9.72222222222223e-02
+327 450 -1.94444444444444e-01
+327 408 2.22222222222222e-01
+327 333 -2.77777777777777e-02
+327 405 -6.94444444444444e-02
+328 328 1.11111111111111e+00
+328 428 4.16666666666666e-02
+328 355 -9.72222222222222e-02
+328 427 -6.94444444444444e-02
+328 354 -8.33333333333333e-02
+328 426 -4.16666666666667e-02
+328 431 5.55111512312578e-17
+328 350 1.88651178012478e-17
+328 455 -9.42747670294036e-18
+328 422 -4.16666666666667e-02
+328 430 1.11111111111111e-01
+328 349 -9.72222222222223e-02
+328 454 -2.77777777777777e-02
+328 421 -6.94444444444444e-02
+328 429 3.06829214813398e-17
+328 348 8.33333333333334e-02
+328 453 5.44811591673966e-18
+328 420 4.16666666666667e-02
+328 332 1.01915004213637e-17
+328 284 1.06726151354042e-18
+328 413 4.16666666666667e-02
+328 338 1.66666666666667e-01
+328 331 -9.72222222222223e-02
+328 283 -2.22222222222222e-01
+328 412 -6.94444444444444e-02
+328 337 -1.94444444444444e-01
+328 330 8.33333333333334e-02
+328 282 -9.28348110190713e-18
+328 411 4.16666666666667e-02
+328 336 -3.93700913883799e-18
+328 416 -1.38777878078145e-17
+328 329 0.00000000000000e+00
+328 272 -1.15196480826585e-18
+328 326 1.00830802041152e-17
+328 452 -3.45589442479755e-19
+328 410 -1.23277175143391e-17
+328 335 -1.66666666666667e-01
+328 407 -4.16666666666667e-02
+328 415 1.11111111111111e-01
+328 356 -3.39219754716402e-17
+328 271 -2.22222222222222e-01
+328 325 -9.72222222222222e-02
+328 451 -2.77777777777778e-02
+328 409 2.22222222222222e-01
+328 334 -1.94444444444444e-01
+328 406 -6.94444444444444e-02
+328 414 1.64663204946236e-17
+328 327 -5.55111512312578e-17
+328 270 -7.69783542464708e-18
+328 324 -8.33333333333333e-02
+328 450 7.06425478010086e-18
+328 408 -6.93889390390723e-18
+328 333 -3.67273485929465e-18
+328 405 -4.16666666666667e-02
+329 329 1.11111111111111e+00
+329 428 -6.94444444444444e-02
+329 355 -3.17671236538253e-17
+329 427 4.16666666666666e-02
+329 354 -1.47451495458029e-17
+329 426 4.16666666666667e-02
+329 431 1.11111111111111e-01
+329 350 -1.38888888888889e-02
+329 455 -1.94444444444444e-01
+329 422 -6.94444444444444e-02
+329 430 5.55111512312578e-17
+329 349 1.86618298939067e-17
+329 454 -1.02321580028319e-17
+329 421 -4.16666666666667e-02
+329 429 -7.51081054989333e-17
+329 348 -1.65882932390282e-17
+329 453 1.66666666666667e-01
+329 420 4.16666666666667e-02
+329 332 -1.38888888888889e-02
+329 284 1.11111111111111e-01
+329 413 -6.94444444444444e-02
+329 338 -1.94444444444444e-01
+329 331 8.45677694538693e-18
+329 283 2.30392961653170e-18
+329 412 4.16666666666667e-02
+329 337 1.66666666666667e-01
+329 330 5.78692909564138e-18
+329 282 -1.38777878078145e-17
+329 411 -4.16666666666667e-02
+329 336 2.81892564846231e-18
+329 416 1.11111111111111e-01
+329 356 -1.38888888888889e-02
+329 272 1.11111111111111e-01
+329 326 -1.38888888888889e-02
+329 452 -1.94444444444444e-01
+329 410 -4.44444444444445e-01
+329 335 -1.94444444444444e-01
+329 407 -6.94444444444444e-02
+329 415 -2.08166817117217e-17
+329 328 0.00000000000000e+00
+329 271 -8.31786354203723e-19
+329 325 9.33769121053141e-18
+329 451 4.51299154297091e-18
+329 409 -2.23836926641421e-17
+329 334 -1.66666666666667e-01
+329 406 -4.16666666666667e-02
+329 414 -1.28223847555356e-17
+329 327 5.55111512312578e-17
+329 270 -1.38777878078145e-17
+329 324 6.87113126812688e-18
+329 450 -1.66666666666667e-01
+329 408 3.27937275858975e-17
+329 333 1.20617491689012e-18
+329 405 -4.16666666666667e-02
+330 330 5.55555555555555e-01
+330 305 -1.04083408558608e-17
+330 314 -8.33333333333334e-02
+330 395 -4.16666666666667e-02
+330 280 -4.33680868994202e-17
+330 304 -8.33333333333334e-02
+330 313 -8.23993651088983e-18
+330 394 -4.16666666666667e-02
+330 279 -1.11111111111111e-01
+330 303 -9.72222222222222e-02
+330 312 -9.72222222222221e-02
+330 393 -6.94444444444444e-02
+330 332 1.38777878078145e-17
+330 284 -2.02745806254789e-17
+330 329 5.80048162279745e-18
+330 416 2.08166817117217e-17
+330 413 1.13299127024735e-17
+330 338 8.33333333333334e-02
+330 410 4.16666666666667e-02
+330 452 1.94139951510686e-18
+330 331 2.77555756156289e-17
+330 283 6.28837260041593e-18
+330 328 8.33333333333334e-02
+330 415 2.04643160056639e-17
+330 412 6.93889390390723e-18
+330 337 2.73761048552590e-18
+330 409 4.16666666666667e-02
+330 451 2.30562368242621e-18
+330 281 1.73472347597681e-18
+330 282 -1.11111111111111e-01
+330 327 -9.72222222222223e-02
+330 414 1.11111111111111e-01
+330 411 1.11111111111111e-01
+330 336 -9.72222222222222e-02
+330 408 -6.94444444444445e-02
+330 450 -2.77777777777778e-02
+331 331 5.55555555555556e-01
+331 305 -2.39608680119296e-17
+331 314 -2.96122718360103e-17
+331 395 -4.16666666666668e-02
+331 280 5.55555555555558e-02
+331 304 -9.72222222222224e-02
+331 313 -1.38888888888888e-02
+331 394 -6.94444444444445e-02
+331 279 -4.62954327651310e-17
+331 303 -8.33333333333334e-02
+331 312 -8.03664860354880e-18
+331 393 -4.16666666666667e-02
+331 332 1.66666666666667e-01
+331 284 4.16666666666667e-02
+331 329 8.45677694538693e-18
+331 416 3.55211736760563e-17
+331 413 -1.86635239598013e-17
+331 338 -6.45100292628875e-18
+331 410 -4.16666666666667e-02
+331 452 -1.66666666666667e-01
+331 281 4.16666666666667e-02
+331 283 5.55555555555555e-02
+331 328 -9.72222222222223e-02
+331 415 -2.22222222222222e-01
+331 412 1.11111111111111e-01
+331 337 -1.38888888888889e-02
+331 409 -6.94444444444445e-02
+331 451 -1.94444444444445e-01
+331 330 5.55111512312578e-17
+331 282 6.07153216591882e-18
+331 327 8.33333333333333e-02
+331 414 1.82145964977565e-17
+331 411 1.38777878078145e-17
+331 336 4.77048955893622e-18
+331 408 4.16666666666667e-02
+331 450 -1.20617491689012e-18
+332 332 5.55555555555556e-01
+332 305 -1.38888888888889e-02
+332 314 -9.72222222222222e-02
+332 395 -6.94444444444445e-02
+332 280 4.16666666666667e-02
+332 304 -2.18195687212708e-17
+332 313 -2.87313575708659e-17
+332 394 -4.16666666666668e-02
+332 279 3.14418630020796e-18
+332 303 -1.06522863446701e-17
+332 312 -8.33333333333334e-02
+332 393 -4.16666666666667e-02
+332 281 5.55555555555558e-02
+332 284 5.55555555555555e-02
+332 329 -1.38888888888889e-02
+332 416 1.11111111111111e-01
+332 413 -2.22222222222222e-01
+332 338 -9.72222222222222e-02
+332 410 -6.94444444444445e-02
+332 452 -1.94444444444445e-01
+332 331 1.66666666666667e-01
+332 283 4.16666666666667e-02
+332 328 1.02999206386123e-17
+332 415 3.58430461960130e-17
+332 412 -1.82145964977565e-17
+332 337 -5.74627151417317e-18
+332 409 -4.16666666666667e-02
+332 451 -1.66666666666667e-01
+332 330 -1.38777878078145e-17
+332 282 -1.99493199737333e-17
+332 327 4.77048955893622e-18
+332 414 1.38777878078145e-17
+332 411 3.90312782094782e-18
+332 336 8.33333333333333e-02
+332 408 4.16666666666667e-02
+332 450 3.51010453342182e-18
+333 333 1.11111111111111e+00
+333 350 -8.33333333333334e-02
+333 430 -4.16666666666667e-02
+333 349 3.35763860291605e-18
+333 429 -6.94444444444444e-02
+333 348 -9.72222222222223e-02
+333 455 -3.23803755076374e-17
+333 422 -4.32994772306926e-17
+333 419 4.16666666666667e-02
+333 341 8.33333333333333e-02
+333 454 -1.66666666666667e-01
+333 421 2.37330161491182e-17
+333 418 -4.16666666666667e-02
+333 340 3.66765266161112e-18
+333 453 -1.94444444444445e-01
+333 420 -2.22222222222223e-01
+333 417 -6.94444444444444e-02
+333 339 -9.72222222222222e-02
+333 416 4.16666666666667e-02
+333 329 1.51788304147971e-18
+333 272 -2.45639554703747e-18
+333 326 8.33333333333334e-02
+333 415 4.16666666666667e-02
+333 328 -3.68628738645072e-18
+333 271 -6.93889390390723e-18
+333 325 3.46944695195361e-18
+333 414 -6.94444444444445e-02
+333 327 -2.77777777777777e-02
+333 270 1.11111111111111e-01
+333 324 -9.72222222222222e-02
+333 452 1.35525271560688e-17
+333 410 -6.93889390390723e-18
+333 335 1.38777878078145e-17
+333 407 1.45757429563520e-17
+333 404 -4.16666666666667e-02
+333 320 1.19939865331209e-18
+333 248 1.02194525086231e-18
+333 317 -8.33333333333333e-02
+333 451 1.66666666666667e-01
+333 409 -1.93970544921235e-17
+333 334 -1.38777878078145e-17
+333 406 1.89057753827160e-17
+333 403 4.16666666666667e-02
+333 319 -4.54009659728305e-18
+333 247 -6.93889390390723e-18
+333 316 3.67273485929465e-18
+333 450 -1.94444444444445e-01
+333 408 2.22222222222222e-01
+333 431 -4.16666666666667e-02
+333 405 -2.22222222222222e-01
+333 402 -6.94444444444444e-02
+333 318 -2.77777777777777e-02
+333 246 1.11111111111111e-01
+333 315 -9.72222222222222e-02
+334 334 1.11111111111111e+00
+334 350 1.40268656065312e-17
+334 430 -6.94444444444444e-02
+334 349 -1.38888888888889e-02
+334 429 -4.16666666666667e-02
+334 348 3.15773882736403e-18
+334 455 -7.17724897526459e-17
+334 422 6.24500451351651e-17
+334 419 4.16666666666666e-02
+334 341 2.06506632540598e-18
+334 454 -1.94444444444444e-01
+334 421 1.11111111111111e-01
+334 418 -6.94444444444444e-02
+334 340 -1.38888888888889e-02
+334 453 -1.66666666666667e-01
+334 420 2.77589637474179e-17
+334 417 -4.16666666666667e-02
+334 339 3.17129135452010e-18
+334 416 -4.16666666666667e-02
+334 329 -1.66666666666667e-01
+334 272 2.61733180701579e-18
+334 326 -1.09504419421036e-17
+334 415 -6.94444444444445e-02
+334 328 -1.94444444444444e-01
+334 271 1.11111111111111e-01
+334 325 -1.38888888888889e-02
+334 414 4.16666666666667e-02
+334 327 -4.20636561606486e-18
+334 270 0.00000000000000e+00
+334 324 4.01493616998538e-18
+334 452 1.17381825830501e-17
+334 410 9.01412462468026e-18
+334 335 1.38777878078145e-16
+334 407 -1.38777878078145e-17
+334 404 4.16666666666667e-02
+334 320 1.66666666666667e-01
+334 248 8.97854924089558e-20
+334 317 -1.86177841806495e-18
+334 451 -1.94444444444444e-01
+334 409 -4.44444444444444e-01
+334 431 -4.16666666666667e-02
+334 406 1.11111111111111e-01
+334 403 -6.94444444444444e-02
+334 319 -1.94444444444444e-01
+334 247 1.11111111111111e-01
+334 316 -1.38888888888889e-02
+334 450 1.66666666666667e-01
+334 408 -2.53294614964558e-17
+334 333 -1.38777878078145e-17
+334 405 2.03440373271538e-17
+334 402 4.16666666666667e-02
+334 318 -4.16570803459665e-18
+334 246 0.00000000000000e+00
+334 315 3.97427858851718e-18
+335 335 1.11111111111111e+00
+335 350 -9.72222222222223e-02
+335 430 -4.16666666666667e-02
+335 349 1.27292111313376e-17
+335 429 -4.16666666666667e-02
+335 348 -8.33333333333334e-02
+335 455 -2.77777777777778e-02
+335 422 1.11111111111111e-01
+335 419 -6.94444444444444e-02
+335 341 -9.72222222222222e-02
+335 454 -6.98361724352226e-17
+335 421 5.55111512312578e-17
+335 418 4.16666666666666e-02
+335 340 1.70761842166467e-18
+335 453 -3.17806761809813e-17
+335 420 -4.37136763418999e-17
+335 417 4.16666666666667e-02
+335 339 8.33333333333333e-02
+335 416 -6.94444444444445e-02
+335 329 -1.94444444444444e-01
+335 272 -2.22222222222222e-01
+335 326 -9.72222222222222e-02
+335 415 -4.16666666666667e-02
+335 328 -1.66666666666667e-01
+335 271 -3.38622596488588e-18
+335 325 -1.31561157367538e-17
+335 414 4.16666666666667e-02
+335 327 2.90871114087127e-18
+335 270 1.02533338265133e-18
+335 324 8.33333333333334e-02
+335 452 -2.77777777777778e-02
+335 410 2.22222222222222e-01
+335 431 -6.94444444444445e-02
+335 407 1.11111111111111e-01
+335 404 -6.94444444444444e-02
+335 320 -1.94444444444444e-01
+335 248 -2.22222222222222e-01
+335 317 -9.72222222222222e-02
+335 451 9.89334482393023e-18
+335 409 1.72811661898822e-17
+335 334 1.38777878078145e-16
+335 406 -1.38777878078145e-17
+335 403 4.16666666666667e-02
+335 319 1.66666666666667e-01
+335 247 1.86347248395946e-20
+335 316 2.24971950790742e-18
+335 450 1.31374810119142e-17
+335 408 -6.93889390390723e-18
+335 333 1.38777878078145e-17
+335 405 1.51284319544354e-17
+335 402 -4.16666666666667e-02
+335 318 1.08420217248550e-18
+335 246 -1.14180041289880e-18
+335 315 -8.33333333333333e-02
+336 336 1.11111111111111e+00
+336 431 -4.16666666666667e-02
+336 355 2.90024081139872e-18
+336 430 4.16666666666667e-02
+336 354 -9.72222222222223e-02
+336 429 -6.94444444444444e-02
+336 428 -1.05479318855684e-16
+336 455 -3.48215244616243e-17
+336 347 8.33333333333334e-02
+336 419 4.16666666666667e-02
+336 427 2.49840838122128e-17
+336 454 1.66666666666667e-01
+336 346 2.66984784974555e-18
+336 418 4.16666666666667e-02
+336 426 -2.22222222222222e-01
+336 453 -1.94444444444445e-01
+336 345 -9.72222222222222e-02
+336 417 -6.94444444444444e-02
+336 332 8.33333333333333e-02
+336 284 3.75133951679985e-17
+336 329 3.26615904461258e-18
+336 416 4.16666666666667e-02
+336 331 2.60208521396521e-18
+336 283 -1.38777878078145e-17
+336 328 -3.93700913883799e-18
+336 415 -4.16666666666667e-02
+336 330 -9.72222222222222e-02
+336 282 1.11111111111111e-01
+336 327 -2.77777777777777e-02
+336 414 -6.94444444444444e-02
+336 413 -4.09828421199521e-17
+336 338 1.11022302462516e-16
+336 410 -6.93889390390723e-18
+336 452 1.89735380184963e-17
+336 323 -8.33333333333334e-02
+336 260 3.10488397145536e-17
+336 320 1.27054942088145e-18
+336 404 -4.16666666666667e-02
+336 412 1.47722546001150e-17
+336 337 -6.93889390390723e-17
+336 409 -2.25645341983809e-17
+336 451 -1.66666666666667e-01
+336 322 4.98732999343332e-18
+336 259 -1.38777878078145e-17
+336 319 -4.09625133292180e-18
+336 403 -4.16666666666667e-02
+336 411 -2.22222222222222e-01
+336 356 -8.33333333333333e-02
+336 408 2.22222222222222e-01
+336 450 -1.94444444444444e-01
+336 321 -9.72222222222222e-02
+336 258 1.11111111111111e-01
+336 318 -2.77777777777777e-02
+336 402 -6.94444444444444e-02
+337 337 1.11111111111111e+00
+337 431 4.16666666666667e-02
+337 355 -1.38888888888889e-02
+337 430 -6.94444444444444e-02
+337 354 3.03576608295941e-18
+337 429 4.16666666666667e-02
+337 428 0.00000000000000e+00
+337 455 3.40710532703570e-17
+337 347 -1.14789905011903e-17
+337 419 -4.16666666666667e-02
+337 427 1.11111111111111e-01
+337 454 -1.94444444444445e-01
+337 346 -1.38888888888888e-02
+337 418 -6.94444444444444e-02
+337 426 2.53703308361608e-17
+337 453 1.66666666666667e-01
+337 345 2.71050543121376e-18
+337 417 4.16666666666667e-02
+337 332 -5.63785129692462e-18
+337 284 -1.63443477502190e-17
+337 329 1.66666666666667e-01
+337 416 4.16666666666667e-02
+337 331 -1.38888888888889e-02
+337 283 1.11111111111111e-01
+337 328 -1.94444444444444e-01
+337 415 -6.94444444444444e-02
+337 330 2.95445092002300e-18
+337 282 -1.38777878078145e-17
+337 327 -3.68628738645072e-18
+337 414 -4.16666666666667e-02
+337 413 -3.46944695195361e-17
+337 338 -6.93889390390723e-17
+337 410 1.91412505420527e-17
+337 452 1.43792313125890e-17
+337 323 -2.30392961653170e-19
+337 260 -1.25005122355790e-17
+337 320 -1.66666666666667e-01
+337 404 -4.16666666666667e-02
+337 412 1.11111111111111e-01
+337 356 5.09575021068187e-18
+337 409 -4.44444444444444e-01
+337 451 -1.94444444444444e-01
+337 322 -1.38888888888889e-02
+337 259 1.11111111111111e-01
+337 319 -1.94444444444444e-01
+337 403 -6.94444444444444e-02
+337 411 1.49348849259878e-17
+337 336 -6.93889390390723e-17
+337 408 -1.93970544921235e-17
+337 450 -1.66666666666667e-01
+337 321 3.06287113727155e-18
+337 258 -6.93889390390723e-18
+337 318 -4.10641572828885e-18
+337 402 -4.16666666666667e-02
+338 338 1.11111111111111e+00
+338 431 -6.94444444444445e-02
+338 355 2.18195687212708e-18
+338 430 4.16666666666667e-02
+338 354 -8.33333333333334e-02
+338 429 -4.16666666666667e-02
+338 428 1.11111111111111e-01
+338 455 -2.77777777777778e-02
+338 347 -9.72222222222221e-02
+338 419 -6.94444444444444e-02
+338 427 6.93889390390723e-18
+338 454 3.64630743134031e-17
+338 346 -1.19262238973405e-17
+338 418 -4.16666666666667e-02
+338 426 -1.02782365951626e-16
+338 453 -3.48842048997211e-17
+338 345 8.33333333333333e-02
+338 417 4.16666666666667e-02
+338 332 -9.72222222222222e-02
+338 284 -2.22222222222222e-01
+338 329 -1.94444444444444e-01
+338 416 -6.94444444444445e-02
+338 331 -6.57297567069337e-18
+338 283 -1.58598449043895e-17
+338 328 1.66666666666667e-01
+338 415 4.16666666666667e-02
+338 330 8.33333333333334e-02
+338 282 3.80961538357094e-17
+338 327 1.22650370762423e-18
+338 414 4.16666666666667e-02
+338 413 1.11111111111111e-01
+338 356 -9.72222222222223e-02
+338 410 2.22222222222222e-01
+338 452 -2.77777777777778e-02
+338 323 -9.72222222222222e-02
+338 260 -2.22222222222222e-01
+338 320 -1.94444444444444e-01
+338 404 -6.94444444444444e-02
+338 412 -4.16333634234434e-17
+338 337 -6.93889390390723e-17
+338 409 1.91717437281538e-17
+338 451 1.54566572214965e-17
+338 322 5.42101086242752e-19
+338 259 -2.24023273889817e-17
+338 319 -1.66666666666667e-01
+338 403 -4.16666666666667e-02
+338 411 -4.15249432061948e-17
+338 336 1.11022302462516e-16
+338 408 -6.93889390390723e-18
+338 450 1.77470343108721e-17
+338 321 -8.33333333333334e-02
+338 258 3.39355279987963e-17
+338 318 1.20617491689012e-18
+338 402 -4.16666666666667e-02
+339 339 5.55555555555555e-01
+339 359 -8.33333333333333e-02
+339 344 3.87602276663568e-18
+339 251 7.94292440793511e-17
+339 424 -4.16666666666667e-02
+339 358 8.91756286869327e-18
+339 343 -8.33333333333334e-02
+339 250 4.08282586070782e-17
+339 423 -6.94444444444444e-02
+339 357 -9.72222222222221e-02
+339 342 -9.72222222222221e-02
+339 249 -1.11111111111111e-01
+339 410 4.16666666666667e-02
+339 455 6.57297567069337e-18
+339 422 -3.41337337084538e-17
+339 335 8.33333333333333e-02
+339 320 -1.63307952230629e-17
+339 419 2.08166817117217e-17
+339 341 -6.93889390390723e-17
+339 248 -2.15281893874153e-17
+339 409 4.16666666666667e-02
+339 454 -5.67850887839283e-18
+339 421 0.00000000000000e+00
+339 334 3.38813178901720e-18
+339 319 8.33333333333334e-02
+339 418 -2.32375018749745e-17
+339 340 -5.55111512312578e-17
+339 247 1.01542309716846e-17
+339 408 -6.94444444444444e-02
+339 453 -2.77777777777778e-02
+339 420 1.11111111111111e-01
+339 333 -9.72222222222222e-02
+339 318 -9.72222222222223e-02
+339 417 1.11111111111111e-01
+339 425 -4.16666666666667e-02
+339 246 -1.11111111111111e-01
+340 340 5.55555555555555e-01
+340 359 1.27800331081729e-17
+340 344 3.42692589800145e-17
+340 251 4.16666666666667e-02
+340 424 -6.94444444444444e-02
+340 358 -1.38888888888888e-02
+340 343 -9.72222222222221e-02
+340 250 5.55555555555556e-02
+340 423 -4.16666666666667e-02
+340 357 7.54875762593032e-18
+340 342 -8.33333333333334e-02
+340 249 3.84569898712397e-17
+340 410 -4.16666666666667e-02
+340 455 -1.66666666666667e-01
+340 422 -3.72863903381343e-17
+340 335 1.59919820441612e-18
+340 320 1.52940268956236e-17
+340 419 8.14083365606108e-18
+340 341 1.66666666666667e-01
+340 248 4.16666666666667e-02
+340 409 -6.94444444444444e-02
+340 454 -1.94444444444445e-01
+340 421 1.11111111111111e-01
+340 334 -1.38888888888889e-02
+340 319 -9.72222222222222e-02
+340 418 -2.22222222222222e-01
+340 425 -4.16666666666667e-02
+340 247 5.55555555555555e-02
+340 408 4.16666666666667e-02
+340 453 -5.42101086242752e-18
+340 420 6.93889390390723e-18
+340 333 3.34239200986547e-18
+340 318 8.33333333333334e-02
+340 417 -2.55795479741326e-17
+340 339 -5.55111512312578e-17
+340 246 1.20911835638183e-17
+341 341 5.55555555555555e-01
+341 359 -9.72222222222220e-02
+341 344 -1.38888888888888e-02
+341 251 5.55555555555556e-02
+341 424 -4.16666666666667e-02
+341 358 1.32645359540023e-17
+341 343 3.53314382958714e-17
+341 250 4.16666666666667e-02
+341 423 -4.16666666666667e-02
+341 357 -8.33333333333333e-02
+341 342 4.03865309250850e-18
+341 249 7.92585669404794e-17
+341 410 -6.94444444444444e-02
+341 455 -1.94444444444445e-01
+341 422 -2.22222222222222e-01
+341 335 -9.72222222222222e-02
+341 320 -1.38888888888889e-02
+341 419 1.11111111111111e-01
+341 425 -6.94444444444445e-02
+341 248 5.55555555555556e-02
+341 409 -4.16666666666667e-02
+341 454 -1.66666666666667e-01
+341 421 -3.80529551553994e-17
+341 334 2.06676039130049e-18
+341 319 1.52059354691092e-17
+341 418 9.55114351323949e-18
+341 340 1.66666666666667e-01
+341 247 4.16666666666667e-02
+341 408 4.16666666666667e-02
+341 453 4.54009659728305e-18
+341 420 -2.88202960303276e-17
+341 333 8.33333333333333e-02
+341 318 -1.60241692961569e-17
+341 417 2.08166817117217e-17
+341 339 -6.93889390390723e-17
+341 246 -2.13496771937815e-17
+342 342 1.11111111111111e+00
+342 371 9.66972812585509e-18
+342 442 -4.16666666666667e-02
+342 370 -8.33333333333334e-02
+342 441 -6.94444444444444e-02
+342 369 -9.72222222222222e-02
+342 458 -1.66666666666667e-01
+342 437 -4.16666666666667e-02
+342 434 3.13289958618580e-17
+342 365 7.50301784677859e-18
+342 457 5.98344073940438e-18
+342 436 4.16666666666667e-02
+342 433 -4.33786748112609e-18
+342 364 8.33333333333334e-02
+342 456 -1.94444444444444e-01
+342 435 -6.94444444444444e-02
+342 432 -2.22222222222223e-01
+342 363 -9.72222222222222e-02
+342 428 4.16666666666667e-02
+342 362 5.82758667710959e-19
+342 347 2.54787510534094e-18
+342 263 -2.08166817117217e-17
+342 427 4.16666666666667e-02
+342 361 -1.06929439261383e-17
+342 346 8.33333333333334e-02
+342 262 -1.83890852848909e-17
+342 426 -6.94444444444444e-02
+342 360 -2.77777777777778e-02
+342 345 -9.72222222222221e-02
+342 261 1.11111111111111e-01
+342 455 1.66666666666667e-01
+342 425 -6.33292653344150e-17
+342 359 2.19550939928315e-18
+342 422 4.16666666666667e-02
+342 419 1.00292089086698e-16
+342 344 -2.08166817117217e-16
+342 251 -2.77555756156289e-17
+342 341 5.01443504774546e-18
+342 454 1.70219741080224e-17
+342 424 -2.08166817117217e-17
+342 358 -6.05289744107923e-18
+342 421 -4.16666666666667e-02
+342 418 7.82760087216644e-17
+342 343 -8.32667268468867e-17
+342 250 -1.37318863826499e-17
+342 340 -8.33333333333334e-02
+342 453 -1.94444444444444e-01
+342 423 2.22222222222222e-01
+342 357 -2.77777777777778e-02
+342 420 -6.94444444444444e-02
+342 417 -2.22222222222222e-01
+342 443 -4.16666666666667e-02
+342 249 1.11111111111111e-01
+342 339 -9.72222222222221e-02
+343 343 1.11111111111111e+00
+343 371 1.09775469964157e-17
+343 442 -6.94444444444444e-02
+343 370 -9.72222222222222e-02
+343 441 -4.16666666666667e-02
+343 369 -8.33333333333334e-02
+343 458 -4.30970363562988e-18
+343 437 4.16666666666667e-02
+343 434 6.93889390390723e-18
+343 365 -1.53550132678260e-17
+343 457 -2.77777777777778e-02
+343 436 -6.94444444444444e-02
+343 433 1.11111111111111e-01
+343 364 -9.72222222222222e-02
+343 456 5.93600689435814e-18
+343 435 4.16666666666667e-02
+343 432 -2.46825400829903e-18
+343 363 8.33333333333334e-02
+343 428 -4.16666666666667e-02
+343 362 -1.66666666666667e-01
+343 347 -1.43301034016483e-17
+343 263 -2.15019313660504e-18
+343 427 -6.94444444444445e-02
+343 361 -1.94444444444445e-01
+343 346 -9.72222222222223e-02
+343 262 -2.22222222222222e-01
+343 426 4.16666666666667e-02
+343 360 -6.50013083722950e-18
+343 345 8.33333333333334e-02
+343 261 -1.72011215763667e-17
+343 455 -6.03900610074426e-17
+343 425 3.12385750947386e-18
+343 359 1.66666666666667e-01
+343 422 4.16666666666667e-02
+343 419 -5.55111512312578e-17
+343 344 1.66533453693773e-16
+343 251 -6.22908029410812e-18
+343 341 3.51145978613743e-17
+343 454 -2.77777777777778e-02
+343 424 2.22222222222222e-01
+343 358 -1.94444444444445e-01
+343 421 -6.94444444444444e-02
+343 418 1.11111111111111e-01
+343 443 -4.16666666666667e-02
+343 250 -2.22222222222222e-01
+343 340 -9.72222222222221e-02
+343 453 1.80621305672507e-17
+343 423 -2.08166817117217e-17
+343 357 -1.07064964532944e-17
+343 420 -4.16666666666667e-02
+343 417 8.04575420773179e-17
+343 342 -8.32667268468867e-17
+343 249 -2.05591836957564e-17
+343 339 -8.33333333333334e-02
+344 344 1.11111111111111e+00
+344 371 -1.38888888888889e-02
+344 442 -4.16666666666667e-02
+344 370 1.08691267791672e-17
+344 441 -4.16666666666667e-02
+344 369 1.04354459101730e-17
+344 458 -1.94444444444444e-01
+344 437 -6.94444444444444e-02
+344 434 1.11111111111111e-01
+344 365 -1.38888888888889e-02
+344 457 -2.99680256738571e-18
+344 436 4.16666666666667e-02
+344 433 0.00000000000000e+00
+344 364 -1.35593034196468e-17
+344 456 -1.66666666666667e-01
+344 435 -4.16666666666667e-02
+344 432 2.68306156372272e-17
+344 363 6.97955148537543e-18
+344 428 -6.94444444444445e-02
+344 362 -1.94444444444444e-01
+344 347 -1.38888888888889e-02
+344 263 1.11111111111111e-01
+344 427 -4.16666666666667e-02
+344 361 -1.66666666666667e-01
+344 346 -1.63714528045311e-17
+344 262 -3.67951112287268e-18
+344 426 4.16666666666667e-02
+344 360 -1.40438062654763e-18
+344 345 2.49027686492764e-18
+344 261 -2.77555756156289e-17
+344 455 -1.94444444444445e-01
+344 425 -4.44444444444445e-01
+344 359 -1.94444444444444e-01
+344 422 -6.94444444444445e-02
+344 419 1.11111111111111e-01
+344 443 -6.94444444444444e-02
+344 251 1.11111111111111e-01
+344 341 -1.38888888888888e-02
+344 454 -6.02342069451478e-17
+344 424 1.05110436007154e-17
+344 358 1.66666666666667e-01
+344 421 4.16666666666667e-02
+344 418 -5.55111512312578e-17
+344 343 1.66533453693773e-16
+344 250 -3.66807617808475e-18
+344 340 3.42692589800145e-17
+344 453 1.66666666666667e-01
+344 423 -6.87958042177575e-17
+344 357 1.94478764689587e-18
+344 420 4.16666666666667e-02
+344 417 9.71440911382276e-17
+344 342 -1.80411241501588e-16
+344 249 -2.77555756156289e-17
+344 339 3.90312782094782e-18
+345 345 5.55555555555556e-01
+345 410 4.16666666666667e-02
+345 260 -5.14996031930615e-17
+345 320 -1.44334414212133e-17
+345 337 2.71050543121376e-18
+345 409 -4.16666666666667e-02
+345 259 1.15332006098146e-17
+345 319 -8.33333333333334e-02
+345 336 -9.72222222222222e-02
+345 408 -6.94444444444444e-02
+345 258 -1.11111111111111e-01
+345 318 -9.72222222222222e-02
+345 428 1.81061762805079e-17
+345 362 -8.33333333333333e-02
+345 425 -4.16666666666667e-02
+345 455 5.61074624261249e-18
+345 347 4.16333634234434e-17
+345 263 1.85805147309703e-17
+345 344 2.58683862091463e-18
+345 419 2.08166817117217e-17
+345 427 -1.38777878078145e-17
+345 361 8.17217387510949e-18
+345 424 4.16666666666667e-02
+345 454 -4.21483594553740e-18
+345 346 -5.55111512312578e-17
+345 262 3.86789125034204e-17
+345 343 8.33333333333334e-02
+345 418 -2.55827243476848e-17
+345 426 1.11111111111111e-01
+345 360 -9.72222222222222e-02
+345 423 -6.94444444444445e-02
+345 453 -2.77777777777778e-02
+345 338 8.33333333333334e-02
+345 261 -1.11111111111111e-01
+345 342 -9.72222222222221e-02
+345 417 1.11111111111111e-01
+346 346 5.55555555555556e-01
+346 410 4.16666666666666e-02
+346 260 -4.16666666666667e-02
+346 320 -3.80012861456169e-17
+346 337 -1.38888888888888e-02
+346 409 -6.94444444444444e-02
+346 259 5.55555555555555e-02
+346 319 -9.72222222222221e-02
+346 336 2.99510850149121e-18
+346 408 -4.16666666666667e-02
+346 258 1.16060454432784e-17
+346 318 -8.33333333333334e-02
+346 428 1.99764250280454e-17
+346 362 2.46113893154210e-17
+346 425 4.16666666666667e-02
+346 455 1.66666666666667e-01
+346 347 -1.66666666666667e-01
+346 263 -4.16666666666667e-02
+346 344 -1.54092233764502e-17
+346 419 9.55114351323949e-18
+346 427 1.11111111111111e-01
+346 361 -1.38888888888888e-02
+346 424 -6.94444444444445e-02
+346 454 -1.94444444444445e-01
+346 338 -1.19262238973405e-17
+346 262 5.55555555555557e-02
+346 343 -9.72222222222223e-02
+346 418 -2.22222222222222e-01
+346 426 -1.38777878078145e-17
+346 360 7.69783542464708e-18
+346 423 4.16666666666667e-02
+346 453 -4.79759461324836e-18
+346 345 -5.55111512312578e-17
+346 261 3.93158812797556e-17
+346 342 8.33333333333334e-02
+346 417 -2.44843343733328e-17
+347 347 5.55555555555556e-01
+347 410 -6.94444444444444e-02
+347 260 5.55555555555555e-02
+347 320 -1.38888888888889e-02
+347 337 -1.14789905011903e-17
+347 409 4.16666666666666e-02
+347 259 -4.16666666666667e-02
+347 319 -3.78352676879551e-17
+347 336 8.33333333333333e-02
+347 408 4.16666666666667e-02
+347 258 -5.12556577042522e-17
+347 318 -1.36507829779503e-17
+347 428 -2.22222222222222e-01
+347 362 -9.72222222222222e-02
+347 425 -6.94444444444445e-02
+347 455 -1.94444444444445e-01
+347 338 -9.72222222222221e-02
+347 263 5.55555555555557e-02
+347 344 -1.38888888888889e-02
+347 419 1.11111111111111e-01
+347 427 2.27953506765077e-17
+347 361 2.17382535583344e-17
+347 424 4.16666666666667e-02
+347 454 1.66666666666667e-01
+347 346 -1.66666666666667e-01
+347 262 -4.16666666666667e-02
+347 343 -1.34746001249214e-17
+347 418 1.01197143790839e-17
+347 426 1.54634334850745e-17
+347 360 -8.33333333333333e-02
+347 423 -4.16666666666667e-02
+347 453 1.86686061574848e-18
+347 345 4.16333634234434e-17
+347 261 2.00577401909818e-17
+347 342 1.57209315010398e-18
+347 417 2.08166817117217e-17
+348 348 5.55555555555556e-01
+348 275 7.98243849492453e-17
+348 425 4.16666666666667e-02
+348 359 8.33333333333334e-02
+348 352 -8.33333333333333e-02
+348 274 4.76371329535819e-17
+348 424 -4.16666666666667e-02
+348 358 8.82100111270628e-18
+348 351 -9.72222222222222e-02
+348 273 -1.11111111111111e-01
+348 423 -6.94444444444444e-02
+348 357 -9.72222222222222e-02
+348 329 -1.66967134562768e-17
+348 431 1.38777878078145e-17
+348 350 -5.55111512312578e-17
+348 272 -2.21854869544846e-17
+348 410 -4.16666666666667e-02
+348 455 4.45878143434664e-18
+348 422 -3.31585870279273e-17
+348 335 -8.33333333333334e-02
+348 328 8.33333333333334e-02
+348 430 -3.48028897367847e-17
+348 349 -4.16333634234434e-17
+348 271 1.24683249835833e-17
+348 409 4.16666666666667e-02
+348 454 -5.55653613398821e-18
+348 421 0.00000000000000e+00
+348 334 2.95445092002300e-18
+348 327 -9.72222222222223e-02
+348 429 1.11111111111111e-01
+348 353 2.31748214368777e-18
+348 270 -1.11111111111111e-01
+348 408 -6.94444444444444e-02
+348 453 -2.77777777777778e-02
+348 420 1.11111111111111e-01
+348 333 -9.72222222222223e-02
+349 349 5.55555555555556e-01
+349 275 -4.16666666666667e-02
+349 425 4.16666666666667e-02
+349 359 -3.10386753191866e-17
+349 352 -9.72222222222221e-02
+349 274 5.55555555555557e-02
+349 424 -6.94444444444444e-02
+349 358 -1.38888888888889e-02
+349 351 -8.33333333333333e-02
+349 273 4.30428262476745e-17
+349 423 -4.16666666666667e-02
+349 357 8.67361737988404e-18
+349 329 1.86618298939067e-17
+349 431 1.12485975395371e-18
+349 350 -1.66666666666667e-01
+349 272 -4.16666666666666e-02
+349 410 4.16666666666667e-02
+349 455 1.66666666666667e-01
+349 422 -4.32433612979370e-17
+349 335 1.27292111313376e-17
+349 328 -9.72222222222223e-02
+349 430 -2.22222222222222e-01
+349 353 4.49401800495242e-17
+349 271 5.55555555555555e-02
+349 409 -6.94444444444444e-02
+349 454 -1.94444444444445e-01
+349 421 1.11111111111111e-01
+349 334 -1.38888888888889e-02
+349 327 8.33333333333334e-02
+349 429 -2.95309566730739e-17
+349 348 -4.16333634234434e-17
+349 270 1.26038502551440e-17
+349 408 4.16666666666667e-02
+349 453 -3.97427858851718e-18
+349 420 6.93889390390723e-18
+349 333 3.46605882016460e-18
+350 350 5.55555555555556e-01
+350 275 5.55555555555558e-02
+350 425 -6.94444444444445e-02
+350 359 -9.72222222222224e-02
+350 352 4.36933475511658e-17
+350 274 -4.16666666666667e-02
+350 424 4.16666666666667e-02
+350 358 -3.16722559637328e-17
+350 351 1.95156391047391e-18
+350 273 8.00547779108984e-17
+350 423 4.16666666666667e-02
+350 357 8.33333333333334e-02
+350 329 -1.38888888888889e-02
+350 431 1.11111111111111e-01
+350 353 -1.38888888888888e-02
+350 272 5.55555555555554e-02
+350 410 -6.94444444444445e-02
+350 455 -1.94444444444445e-01
+350 422 -2.22222222222222e-01
+350 335 -9.72222222222223e-02
+350 328 1.88651178012478e-17
+350 430 9.13440330319037e-18
+350 349 -1.66666666666667e-01
+350 271 -4.16666666666666e-02
+350 409 4.16666666666667e-02
+350 454 1.66666666666667e-01
+350 421 -3.56600870794060e-17
+350 334 1.40404181336873e-17
+350 327 -1.66289508204964e-17
+350 429 1.38777878078145e-17
+350 348 -5.55111512312578e-17
+350 270 -2.11368601657838e-17
+350 408 -4.16666666666667e-02
+350 453 8.32125167382625e-18
+350 420 -3.50146479735983e-17
+350 333 -8.33333333333334e-02
+351 351 1.11111111111111e+00
+351 443 4.16666666666667e-02
+351 379 -8.33333333333334e-02
+351 442 -4.16666666666667e-02
+351 378 -9.72222222222222e-02
+351 441 -6.94444444444444e-02
+351 446 2.97427149098875e-17
+351 374 6.83047368665868e-18
+351 458 1.66666666666667e-01
+351 437 4.16666666666667e-02
+351 445 -8.33480420098232e-18
+351 373 8.33333333333334e-02
+351 457 4.49435681813132e-18
+351 436 4.16666666666667e-02
+351 444 -2.22222222222222e-01
+351 372 -9.72222222222223e-02
+351 456 -1.94444444444444e-01
+351 435 -6.94444444444444e-02
+351 356 1.08420217248550e-19
+351 287 -6.93889390390723e-18
+351 428 -4.16666666666667e-02
+351 362 1.97019863531350e-18
+351 355 8.33333333333334e-02
+351 286 -2.56955914879065e-17
+351 427 4.16666666666667e-02
+351 361 -1.02728155843002e-17
+351 354 -9.72222222222223e-02
+351 285 1.11111111111111e-01
+351 426 -6.94444444444445e-02
+351 360 -2.77777777777778e-02
+351 431 9.82287168271867e-17
+351 353 -1.38777878078145e-16
+351 275 0.00000000000000e+00
+351 350 2.05998412772246e-18
+351 455 -1.66666666666667e-01
+351 425 -7.22923562240232e-17
+351 359 2.16162808139297e-18
+351 422 -4.16666666666667e-02
+351 430 9.16150835750251e-17
+351 352 -8.32667268468867e-17
+351 274 -2.17924636669586e-17
+351 349 -8.33333333333333e-02
+351 454 1.76318378300455e-17
+351 424 -2.08166817117217e-17
+351 358 -5.53620734325411e-18
+351 421 -4.16666666666667e-02
+351 429 -2.22222222222222e-01
+351 380 9.55453164502851e-18
+351 273 1.11111111111111e-01
+351 348 -9.72222222222222e-02
+351 453 -1.94444444444444e-01
+351 423 2.22222222222222e-01
+351 357 -2.77777777777778e-02
+351 420 -6.94444444444444e-02
+352 352 1.11111111111111e+00
+352 443 4.16666666666667e-02
+352 379 -9.72222222222223e-02
+352 442 -6.94444444444444e-02
+352 378 -8.33333333333334e-02
+352 441 -4.16666666666667e-02
+352 446 6.93889390390723e-18
+352 374 -1.51788304147971e-17
+352 458 8.58891408515861e-19
+352 437 -4.16666666666667e-02
+352 445 1.11111111111111e-01
+352 373 -9.72222222222222e-02
+352 457 -2.77777777777778e-02
+352 436 -6.94444444444444e-02
+352 444 -9.43255890062389e-18
+352 372 8.33333333333333e-02
+352 456 5.20417042793042e-18
+352 435 4.16666666666667e-02
+352 356 -5.44811591673966e-18
+352 287 -2.82824301088211e-17
+352 428 4.16666666666667e-02
+352 362 1.66666666666667e-01
+352 355 -9.72222222222224e-02
+352 286 -2.22222222222222e-01
+352 427 -6.94444444444445e-02
+352 361 -1.94444444444445e-01
+352 354 8.33333333333334e-02
+352 285 -2.00577401909818e-17
+352 426 4.16666666666667e-02
+352 360 -6.70511281046504e-18
+352 431 -1.38777878078145e-17
+352 353 2.77555756156289e-17
+352 275 -3.57109090562413e-17
+352 350 4.41270284201600e-17
+352 455 3.50146479735983e-17
+352 425 7.42297323326306e-18
+352 359 -1.66666666666667e-01
+352 422 -4.16666666666667e-02
+352 430 1.11111111111111e-01
+352 380 1.15467531369706e-17
+352 274 -2.22222222222222e-01
+352 349 -9.72222222222221e-02
+352 454 -2.77777777777777e-02
+352 424 2.22222222222222e-01
+352 358 -1.94444444444445e-01
+352 421 -6.94444444444444e-02
+352 429 9.14389007219962e-17
+352 351 -8.32667268468867e-17
+352 273 -2.39608680119296e-17
+352 348 -8.33333333333333e-02
+352 453 1.80926237533519e-17
+352 423 -2.08166817117217e-17
+352 357 -1.02728155843002e-17
+352 420 -4.16666666666667e-02
+353 353 1.11111111111111e+00
+353 443 -6.94444444444445e-02
+353 379 1.14925430283463e-17
+353 442 4.16666666666667e-02
+353 378 9.97465998686664e-18
+353 441 4.16666666666667e-02
+353 446 1.11111111111111e-01
+353 374 -1.38888888888889e-02
+353 458 -1.94444444444444e-01
+353 437 -6.94444444444444e-02
+353 445 1.38777878078145e-17
+353 373 -1.25089825650515e-17
+353 457 3.80826013085533e-18
+353 436 -4.16666666666667e-02
+353 444 3.15502832193282e-17
+353 372 7.26415455565288e-18
+353 456 1.66666666666667e-01
+353 435 4.16666666666667e-02
+353 356 -1.38888888888889e-02
+353 287 1.11111111111111e-01
+353 428 -6.94444444444445e-02
+353 362 -1.94444444444445e-01
+353 355 -5.31259064517897e-18
+353 286 -2.96258243631664e-17
+353 427 4.16666666666667e-02
+353 361 1.66666666666667e-01
+353 354 1.23327997120226e-18
+353 285 -6.93889390390723e-18
+353 426 -4.16666666666667e-02
+353 360 2.30392961653170e-18
+353 431 1.11111111111111e-01
+353 380 -1.38888888888889e-02
+353 275 1.11111111111111e-01
+353 350 -1.38888888888888e-02
+353 455 -1.94444444444444e-01
+353 425 -4.44444444444445e-01
+353 359 -1.94444444444444e-01
+353 422 -6.94444444444445e-02
+353 430 -1.38777878078145e-17
+353 352 1.38777878078145e-17
+353 274 -3.52755341213526e-17
+353 349 4.49537325766802e-17
+353 454 3.39219754716402e-17
+353 424 2.29545928705915e-18
+353 358 -1.66666666666667e-01
+353 421 -4.16666666666667e-02
+353 429 9.30279345310453e-17
+353 351 -1.24900090270330e-16
+353 273 0.00000000000000e+00
+353 348 2.31748214368777e-18
+353 453 -1.66666666666667e-01
+353 423 -6.59330446142747e-17
+353 357 2.30392961653170e-18
+353 420 -4.16666666666667e-02
+354 354 5.55555555555555e-01
+354 329 -1.48535697630514e-17
+354 338 -8.33333333333334e-02
+354 410 -4.16666666666667e-02
+354 283 1.30104260698261e-17
+354 328 -8.33333333333333e-02
+354 337 2.71050543121376e-18
+354 409 -4.16666666666667e-02
+354 282 -1.11111111111111e-01
+354 327 -9.72222222222223e-02
+354 336 -9.72222222222223e-02
+354 408 -6.94444444444444e-02
+354 356 6.93889390390723e-17
+354 287 1.57209315010398e-17
+354 353 1.21972744404619e-18
+354 431 1.38777878078145e-17
+354 428 1.90548531814327e-17
+354 362 8.33333333333334e-02
+354 425 4.16666666666667e-02
+354 455 2.91548740444930e-18
+354 355 -6.93889390390723e-17
+354 286 4.43438688546571e-17
+354 352 8.33333333333334e-02
+354 430 -2.75658402354440e-17
+354 427 -1.38777878078145e-17
+354 361 7.83336069620777e-18
+354 424 4.16666666666667e-02
+354 454 -4.66037527579316e-18
+354 284 -5.29090660172926e-17
+354 285 -1.11111111111111e-01
+354 351 -9.72222222222223e-02
+354 429 1.11111111111111e-01
+354 426 1.11111111111111e-01
+354 360 -9.72222222222222e-02
+354 423 -6.94444444444444e-02
+354 453 -2.77777777777778e-02
+355 355 5.55555555555556e-01
+355 329 -3.17671236538253e-17
+355 338 2.18195687212708e-18
+355 410 -4.16666666666667e-02
+355 283 5.55555555555555e-02
+355 328 -9.72222222222222e-02
+355 337 -1.38888888888889e-02
+355 409 -6.94444444444444e-02
+355 282 1.35525271560688e-17
+355 327 -8.33333333333333e-02
+355 336 2.79182059415017e-18
+355 408 -4.16666666666667e-02
+355 356 1.66666666666667e-01
+355 287 4.16666666666667e-02
+355 353 -5.20417042793042e-18
+355 431 8.71427496135224e-18
+355 428 3.00611992980551e-17
+355 362 -2.91921434941722e-17
+355 425 -4.16666666666667e-02
+355 455 -1.66666666666667e-01
+355 284 4.16666666666667e-02
+355 286 5.55555555555557e-02
+355 352 -9.72222222222224e-02
+355 430 -2.22222222222222e-01
+355 427 1.11111111111111e-01
+355 361 -1.38888888888889e-02
+355 424 -6.94444444444445e-02
+355 454 -1.94444444444445e-01
+355 354 -6.93889390390723e-17
+355 285 4.42354486374086e-17
+355 351 8.33333333333334e-02
+355 429 -3.65376132127615e-17
+355 426 -1.38777878078145e-17
+355 360 7.69783542464708e-18
+355 423 4.16666666666667e-02
+355 453 -4.81114714040443e-18
+356 356 5.55555555555556e-01
+356 329 -1.38888888888889e-02
+356 338 -9.72222222222223e-02
+356 410 -6.94444444444445e-02
+356 283 4.16666666666667e-02
+356 328 -3.30546137336518e-17
+356 337 5.09575021068187e-18
+356 409 -4.16666666666667e-02
+356 282 -5.41016884070267e-17
+356 327 -1.43385737311208e-17
+356 336 -8.33333333333333e-02
+356 408 -4.16666666666667e-02
+356 284 5.55555555555555e-02
+356 287 5.55555555555556e-02
+356 353 -1.38888888888889e-02
+356 431 1.11111111111111e-01
+356 428 -2.22222222222222e-01
+356 362 -9.72222222222223e-02
+356 425 -6.94444444444445e-02
+356 455 -1.94444444444444e-01
+356 355 1.66666666666667e-01
+356 286 4.16666666666667e-02
+356 352 -5.46166844389573e-18
+356 430 4.92126142354748e-18
+356 427 2.17247010311783e-17
+356 361 -2.81892564846231e-17
+356 424 -4.16666666666667e-02
+356 454 -1.66666666666667e-01
+356 354 8.32667268468867e-17
+356 285 1.82145964977565e-17
+356 351 2.16840434497101e-19
+356 429 1.38777878078145e-17
+356 426 1.81061762805079e-17
+356 360 8.33333333333334e-02
+356 423 4.16666666666667e-02
+356 453 3.21194893598831e-18
+357 357 1.11111111111111e+00
+357 374 -8.33333333333333e-02
+357 445 -4.16666666666667e-02
+357 373 3.92345661168192e-18
+357 444 -6.94444444444444e-02
+357 372 -9.72222222222222e-02
+357 458 1.53211319499358e-17
+357 437 7.24151760013751e-17
+357 434 4.16666666666667e-02
+357 365 8.33333333333334e-02
+357 457 -1.66666666666667e-01
+357 436 -4.68345692360584e-18
+357 433 -4.16666666666667e-02
+357 364 2.97647377665161e-18
+357 456 -1.94444444444444e-01
+357 435 -2.22222222222222e-01
+357 432 -6.94444444444444e-02
+357 363 -9.72222222222222e-02
+357 431 4.16666666666667e-02
+357 353 2.31748214368777e-18
+357 275 -5.67156320822534e-17
+357 350 8.33333333333334e-02
+357 430 4.16666666666667e-02
+357 352 -1.06929439261383e-17
+357 274 -1.38777878078145e-17
+357 349 8.56519716263549e-18
+357 429 -6.94444444444444e-02
+357 351 -2.77777777777778e-02
+357 273 1.11111111111111e-01
+357 348 -9.72222222222222e-02
+357 455 7.20994444702860e-18
+357 425 -2.77555756156289e-17
+357 359 -2.49800180540660e-16
+357 422 1.59299792324222e-16
+357 419 -4.16666666666667e-02
+357 344 1.94309358100136e-18
+357 251 -6.17789832827028e-17
+357 341 -8.33333333333333e-02
+357 454 1.66666666666667e-01
+357 424 -4.40846767727973e-17
+357 358 -1.11022302462516e-16
+357 421 8.76136999321958e-17
+357 418 4.16666666666667e-02
+357 343 -1.02728155843002e-17
+357 250 -1.38777878078145e-17
+357 340 9.28348110190713e-18
+357 453 -1.94444444444444e-01
+357 423 2.22222222222222e-01
+357 446 -4.16666666666667e-02
+357 420 -2.22222222222222e-01
+357 417 -6.94444444444445e-02
+357 342 -2.77777777777778e-02
+357 249 1.11111111111111e-01
+357 339 -9.72222222222221e-02
+358 358 1.11111111111111e+00
+358 374 4.14707330975705e-18
+358 445 -6.94444444444444e-02
+358 373 -1.38888888888889e-02
+358 444 -4.16666666666667e-02
+358 372 2.90024081139872e-18
+358 458 1.99205208535266e-17
+358 437 1.38777878078145e-17
+358 434 4.16666666666667e-02
+358 365 9.01751275646928e-18
+358 457 -1.94444444444444e-01
+358 436 1.11111111111111e-01
+358 433 -6.94444444444444e-02
+358 364 -1.38888888888889e-02
+358 456 -1.66666666666667e-01
+358 435 -5.70730799859948e-18
+358 432 -4.16666666666667e-02
+358 363 2.49366499671666e-18
+358 431 -4.16666666666667e-02
+358 353 -1.66666666666667e-01
+358 275 1.54024471128722e-17
+358 350 -3.16587034365767e-17
+358 430 -6.94444444444445e-02
+358 352 -1.94444444444445e-01
+358 274 1.11111111111111e-01
+358 349 -1.38888888888889e-02
+358 429 4.16666666666667e-02
+358 351 -6.50013083722950e-18
+358 273 -1.38777878078145e-17
+358 348 8.69733430240716e-18
+358 455 -2.15417419145714e-17
+358 425 -4.48662764248762e-17
+358 359 1.80411241501588e-16
+358 422 -2.77555756156289e-17
+358 419 4.16666666666667e-02
+358 344 1.66666666666667e-01
+358 251 2.40620884491265e-17
+358 341 1.32509834268463e-17
+358 454 -1.94444444444445e-01
+358 424 -4.44444444444445e-01
+358 446 -4.16666666666667e-02
+358 421 1.11111111111111e-01
+358 418 -6.94444444444445e-02
+358 343 -1.94444444444445e-01
+358 250 1.11111111111111e-01
+358 340 -1.38888888888888e-02
+358 453 1.66666666666667e-01
+358 423 -3.72302744053787e-17
+358 357 -1.11022302462516e-16
+358 420 8.69492025850748e-17
+358 417 4.16666666666667e-02
+358 342 -6.71527720583209e-18
+358 249 -1.38777878078145e-17
+358 339 8.91756286869327e-18
+359 359 1.11111111111111e+00
+359 374 -9.72222222222222e-02
+359 445 -4.16666666666667e-02
+359 373 4.54009659728305e-18
+359 444 -4.16666666666667e-02
+359 372 -8.33333333333333e-02
+359 458 -2.77777777777778e-02
+359 437 1.11111111111111e-01
+359 434 -6.94444444444444e-02
+359 365 -9.72222222222223e-02
+359 457 1.88922228555599e-17
+359 436 1.38777878078145e-17
+359 433 4.16666666666667e-02
+359 364 1.03134731657684e-17
+359 456 1.52059354691092e-17
+359 435 7.38985424502542e-17
+359 432 4.16666666666667e-02
+359 363 8.33333333333334e-02
+359 431 -6.94444444444445e-02
+359 353 -1.94444444444444e-01
+359 275 -2.22222222222222e-01
+359 350 -9.72222222222224e-02
+359 430 -4.16666666666667e-02
+359 352 -1.66666666666667e-01
+359 274 2.77348233084212e-17
+359 349 -3.10403693850811e-17
+359 429 4.16666666666667e-02
+359 351 2.06506632540598e-18
+359 273 -6.60867810942014e-17
+359 348 8.33333333333334e-02
+359 455 -2.77777777777778e-02
+359 425 2.22222222222222e-01
+359 446 -6.94444444444444e-02
+359 422 1.11111111111111e-01
+359 419 -6.94444444444445e-02
+359 344 -1.94444444444444e-01
+359 251 -2.22222222222222e-01
+359 341 -9.72222222222220e-02
+359 454 -2.34323194528430e-17
+359 424 -4.41473572108941e-17
+359 358 1.80411241501588e-16
+359 421 -2.77555756156289e-17
+359 418 4.16666666666667e-02
+359 343 1.66666666666667e-01
+359 250 1.37202396796252e-17
+359 340 1.45147565841497e-17
+359 453 6.10880161559801e-18
+359 423 -2.77555756156289e-17
+359 357 -2.35922392732846e-16
+359 420 1.58389655422397e-16
+359 417 -4.16666666666667e-02
+359 342 2.30392961653170e-18
+359 249 -5.93194113621132e-17
+359 339 -8.33333333333333e-02
+360 360 1.11111111111111e+00
+360 446 -4.16666666666667e-02
+360 379 2.18195687212708e-18
+360 445 4.16666666666667e-02
+360 378 -9.72222222222223e-02
+360 444 -6.94444444444444e-02
+360 443 -7.46744246299391e-18
+360 458 1.13519355591021e-17
+360 371 8.33333333333334e-02
+360 434 4.16666666666667e-02
+360 442 -8.05528332838840e-18
+360 457 1.66666666666667e-01
+360 370 2.05998412772246e-18
+360 433 4.16666666666667e-02
+360 441 -2.22222222222222e-01
+360 456 -1.94444444444444e-01
+360 369 -9.72222222222222e-02
+360 432 -6.94444444444444e-02
+360 356 8.33333333333334e-02
+360 287 -6.61363325216158e-18
+360 353 2.19550939928315e-18
+360 431 4.16666666666667e-02
+360 355 7.91467585914418e-18
+360 286 -6.93889390390723e-18
+360 352 -6.05289744107923e-18
+360 430 -4.16666666666667e-02
+360 354 -9.72222222222222e-02
+360 285 1.11111111111111e-01
+360 351 -2.77777777777778e-02
+360 429 -6.94444444444444e-02
+360 428 3.57786716920216e-17
+360 362 -4.16333634234434e-17
+360 425 -3.46944695195361e-17
+360 455 8.91756286869327e-18
+360 347 -8.33333333333333e-02
+360 263 -1.39862080250630e-17
+360 344 -1.30781887056064e-18
+360 419 -4.16666666666667e-02
+360 427 8.22638398373376e-17
+360 361 -5.55111512312578e-17
+360 424 -3.55243500496085e-17
+360 454 -1.66666666666667e-01
+360 346 8.13151629364128e-18
+360 262 -6.93889390390723e-18
+360 343 -5.53620734325411e-18
+360 418 -4.16666666666667e-02
+360 426 -2.22222222222222e-01
+360 380 -8.33333333333334e-02
+360 423 2.22222222222222e-01
+360 453 -1.94444444444444e-01
+360 345 -9.72222222222222e-02
+360 261 1.11111111111111e-01
+360 342 -2.77777777777778e-02
+360 417 -6.94444444444444e-02
+361 361 1.11111111111111e+00
+361 446 4.16666666666667e-02
+361 379 -1.38888888888889e-02
+361 445 -6.94444444444444e-02
+361 378 3.25260651745651e-18
+361 444 4.16666666666667e-02
+361 443 0.00000000000000e+00
+361 458 -2.53296732546926e-17
+361 371 -6.43745039913268e-18
+361 434 -4.16666666666667e-02
+361 442 1.11111111111111e-01
+361 457 -1.94444444444444e-01
+361 370 -1.38888888888889e-02
+361 433 -6.94444444444444e-02
+361 441 -6.23416249179165e-18
+361 456 1.66666666666667e-01
+361 369 3.36102673470506e-18
+361 432 4.16666666666667e-02
+361 356 -2.87313575708659e-17
+361 287 -1.22785896033983e-17
+361 353 1.66666666666667e-01
+361 431 4.16666666666667e-02
+361 355 -1.38888888888889e-02
+361 286 1.11111111111111e-01
+361 352 -1.94444444444445e-01
+361 430 -6.94444444444444e-02
+361 354 9.03953561309789e-18
+361 285 -6.93889390390723e-18
+361 351 -1.02728155843002e-17
+361 429 -4.16666666666667e-02
+361 428 -4.16333634234434e-17
+361 362 0.00000000000000e+00
+361 425 -3.19653293634828e-17
+361 455 8.09763497575111e-17
+361 347 2.17518060854904e-17
+361 263 -1.34695179272379e-17
+361 344 -1.66666666666667e-01
+361 419 -4.16666666666667e-02
+361 427 1.11111111111111e-01
+361 380 -9.32413868337534e-18
+361 424 -4.44444444444445e-01
+361 454 -1.94444444444444e-01
+361 346 -1.38888888888888e-02
+361 262 1.11111111111111e-01
+361 343 -1.94444444444445e-01
+361 418 -6.94444444444444e-02
+361 426 8.49370758188722e-17
+361 360 -5.55111512312578e-17
+361 423 -4.45200517076860e-17
+361 453 -1.66666666666667e-01
+361 345 9.14795583034644e-18
+361 261 -6.93889390390723e-18
+361 342 -1.02728155843002e-17
+361 417 -4.16666666666667e-02
+362 362 1.11111111111111e+00
+362 446 -6.94444444444444e-02
+362 379 -8.40256683676266e-18
+362 445 4.16666666666667e-02
+362 378 -8.33333333333334e-02
+362 444 -4.16666666666667e-02
+362 443 1.11111111111111e-01
+362 458 -2.77777777777778e-02
+362 371 -9.72222222222222e-02
+362 434 -6.94444444444444e-02
+362 442 6.93889390390723e-18
+362 457 -2.42115897643169e-17
+362 370 -4.77048955893622e-18
+362 433 -4.16666666666667e-02
+362 441 -1.20346441145891e-17
+362 456 1.21837219133059e-17
+362 369 8.33333333333334e-02
+362 432 4.16666666666667e-02
+362 356 -9.72222222222223e-02
+362 287 -2.22222222222222e-01
+362 353 -1.94444444444445e-01
+362 431 -6.94444444444445e-02
+362 355 -2.91921434941722e-17
+362 286 -1.35237280358622e-17
+362 352 1.66666666666667e-01
+362 430 4.16666666666667e-02
+362 354 8.33333333333334e-02
+362 285 -7.04731412115578e-18
+362 351 1.95495204226293e-18
+362 429 4.16666666666667e-02
+362 428 1.11111111111111e-01
+362 380 -9.72222222222222e-02
+362 425 2.22222222222222e-01
+362 455 -2.77777777777777e-02
+362 347 -9.72222222222222e-02
+362 263 -2.22222222222222e-01
+362 344 -1.94444444444444e-01
+362 419 -6.94444444444445e-02
+362 427 -4.16333634234434e-17
+362 361 0.00000000000000e+00
+362 424 -3.05935595054044e-17
+362 454 8.10796877770761e-17
+362 346 2.11419423634673e-17
+362 262 -1.14247803925660e-17
+362 343 -1.66666666666667e-01
+362 418 -4.16666666666667e-02
+362 426 3.18077812352935e-17
+362 360 -4.16333634234434e-17
+362 423 -2.77555756156289e-17
+362 453 1.06251812903579e-17
+362 345 -8.33333333333333e-02
+362 261 -6.61363325216158e-18
+362 342 5.69206140554890e-19
+362 417 -4.16666666666667e-02
+363 363 5.55555555555555e-01
+363 383 -8.33333333333333e-02
+363 368 7.38273916826848e-18
+363 254 4.30148741604151e-17
+363 439 -4.16666666666667e-02
+363 382 1.74488787134386e-18
+363 367 -8.33333333333334e-02
+363 253 -1.75928743144718e-18
+363 438 -6.94444444444444e-02
+363 381 -9.72222222222222e-02
+363 366 -9.72222222222222e-02
+363 252 -1.11111111111111e-01
+363 425 4.16666666666667e-02
+363 458 -9.87979229677416e-18
+363 437 -3.52145477491503e-17
+363 359 8.33333333333334e-02
+363 344 7.02020906684364e-18
+363 434 -4.16333634234434e-17
+363 365 -6.93889390390723e-17
+363 251 3.69662118840722e-17
+363 424 4.16666666666667e-02
+363 457 -1.20617491689012e-18
+363 436 -6.93889390390723e-18
+363 358 3.36102673470506e-18
+363 343 8.33333333333334e-02
+363 433 4.68409219831628e-18
+363 364 1.38777878078145e-17
+363 250 -5.57347679293330e-19
+363 423 -6.94444444444444e-02
+363 456 -2.77777777777778e-02
+363 435 1.11111111111111e-01
+363 357 -9.72222222222223e-02
+363 342 -9.72222222222222e-02
+363 432 1.11111111111111e-01
+363 440 -4.16666666666667e-02
+363 249 -1.11111111111111e-01
+364 364 5.55555555555555e-01
+364 383 -2.58853268680914e-18
+364 368 1.72574492673591e-17
+364 254 4.16666666666667e-02
+364 439 -6.94444444444444e-02
+364 382 -1.38888888888889e-02
+364 367 -9.72222222222222e-02
+364 253 5.55555555555555e-02
+364 438 -4.16666666666667e-02
+364 381 1.61275073157219e-18
+364 366 -8.33333333333334e-02
+364 252 -3.18484388167617e-18
+364 425 -4.16666666666667e-02
+364 458 -1.66666666666667e-01
+364 437 1.56108172178968e-17
+364 359 9.48676900924816e-18
+364 344 -1.35576093537523e-17
+364 434 3.94251485299514e-18
+364 365 1.66666666666667e-01
+364 251 4.16666666666667e-02
+364 424 -6.94444444444444e-02
+364 457 -1.94444444444444e-01
+364 436 1.11111111111111e-01
+364 358 -1.38888888888889e-02
+364 343 -9.72222222222222e-02
+364 433 -2.22222222222222e-01
+364 440 -4.16666666666667e-02
+364 250 5.55555555555555e-02
+364 423 4.16666666666667e-02
+364 456 -3.48638761089870e-18
+364 435 0.00000000000000e+00
+364 357 2.97477971075710e-18
+364 342 8.33333333333334e-02
+364 432 3.82922419629988e-18
+364 363 1.38777878078145e-17
+364 249 -2.25755456266952e-18
+365 365 5.55555555555556e-01
+365 383 -9.72222222222221e-02
+365 368 -1.38888888888889e-02
+365 254 5.55555555555555e-02
+365 439 -4.16666666666666e-02
+365 382 -2.20228566286118e-18
+365 367 1.78893358460108e-17
+365 253 4.16666666666667e-02
+365 438 -4.16666666666667e-02
+365 381 -8.33333333333333e-02
+365 366 8.06375365786094e-18
+365 252 4.34222970080445e-17
+365 425 -6.94444444444444e-02
+365 458 -1.94444444444444e-01
+365 437 -2.22222222222222e-01
+365 359 -9.72222222222223e-02
+365 344 -1.38888888888889e-02
+365 434 1.11111111111111e-01
+365 440 -6.94444444444444e-02
+365 251 5.55555555555555e-02
+365 424 -4.16666666666667e-02
+365 457 -1.66666666666667e-01
+365 436 1.74137268461275e-17
+365 358 7.28448334638698e-18
+365 343 -1.51923829419531e-17
+365 433 1.29934854108810e-18
+365 364 1.66666666666667e-01
+365 250 4.16666666666667e-02
+365 423 4.16666666666667e-02
+365 456 -9.99160064581173e-18
+365 435 -3.62049410227274e-17
+365 357 8.33333333333334e-02
+365 342 7.55553388950836e-18
+365 432 -3.46944695195361e-17
+365 363 -6.93889390390723e-17
+365 249 3.55438318073954e-17
+366 366 5.55555555555555e-01
+366 386 -6.61363325216158e-18
+366 371 7.15573433840433e-18
+366 266 -4.16666666666667e-02
+366 442 4.16666666666667e-02
+366 385 -5.42101086242752e-19
+366 370 8.33333333333334e-02
+366 265 2.62919026827735e-18
+366 441 -6.94444444444444e-02
+366 384 -1.38888888888889e-02
+366 369 -9.72222222222222e-02
+366 264 5.55555555555556e-02
+366 458 1.66666666666667e-01
+366 440 -1.53143556863578e-17
+366 383 -6.61363325216158e-18
+366 437 4.16666666666667e-02
+366 434 4.01154803819637e-17
+366 368 -1.66666666666667e-01
+366 254 -4.16666666666667e-02
+366 365 8.11796376648521e-18
+366 457 3.36102673470506e-18
+366 439 -1.38777878078145e-17
+366 382 -1.09775469964157e-18
+366 436 -4.16666666666667e-02
+366 433 -3.19839640883224e-18
+366 367 2.77555756156289e-17
+366 253 1.31967733182220e-18
+366 364 -8.33333333333334e-02
+366 456 -1.94444444444445e-01
+366 438 1.11111111111111e-01
+366 381 -1.38888888888889e-02
+366 435 -6.94444444444444e-02
+366 432 -2.22222222222223e-01
+366 443 4.16666666666667e-02
+366 252 5.55555555555556e-02
+366 363 -9.72222222222222e-02
+367 367 5.55555555555556e-01
+367 386 -8.33333333333334e-02
+367 371 -9.92553207592589e-18
+367 266 -8.33480420098232e-18
+367 442 -6.94444444444444e-02
+367 385 -9.72222222222223e-02
+367 370 -9.72222222222222e-02
+367 265 -1.11111111111111e-01
+367 441 4.16666666666667e-02
+367 384 -8.94466792300541e-19
+367 369 8.33333333333334e-02
+367 264 3.99799551104030e-19
+367 458 -6.66784336078585e-18
+367 440 1.38777878078145e-17
+367 383 8.33333333333333e-02
+367 437 4.16666666666667e-02
+367 434 -6.93889390390723e-18
+367 368 5.55111512312578e-17
+367 254 -1.20346441145891e-17
+367 365 1.79435459546351e-17
+367 457 -2.77777777777778e-02
+367 439 1.11111111111111e-01
+367 382 -9.72222222222223e-02
+367 436 -6.94444444444445e-02
+367 433 1.11111111111111e-01
+367 443 -4.16666666666667e-02
+367 253 -1.11111111111111e-01
+367 364 -9.72222222222222e-02
+367 456 2.04134940288286e-18
+367 438 -6.93889390390723e-18
+367 381 -1.40946282423116e-18
+367 435 -4.16666666666667e-02
+367 432 -4.88314494092104e-18
+367 366 2.77555756156289e-17
+367 252 2.62919026827735e-18
+367 363 -8.33333333333334e-02
+368 368 5.55555555555556e-01
+368 386 -9.72222222222222e-02
+368 371 -1.38888888888889e-02
+368 266 5.55555555555556e-02
+368 442 -4.16666666666667e-02
+368 385 -8.33333333333334e-02
+368 370 -8.94466792300541e-18
+368 265 -8.67361737988404e-18
+368 441 4.16666666666667e-02
+368 384 -2.64274279543342e-18
+368 369 5.45658624621220e-18
+368 264 -4.16666666666667e-02
+368 458 -1.94444444444444e-01
+368 440 -2.22222222222222e-01
+368 383 -9.72222222222222e-02
+368 437 -6.94444444444445e-02
+368 434 1.11111111111111e-01
+368 443 -6.94444444444445e-02
+368 254 5.55555555555556e-02
+368 365 -1.38888888888889e-02
+368 457 -6.26804380968182e-18
+368 439 1.41081807694676e-17
+368 382 8.33333333333334e-02
+368 436 4.16666666666667e-02
+368 433 -6.93889390390723e-18
+368 367 5.55111512312578e-17
+368 253 -1.20210915874330e-17
+368 364 1.71490290501106e-17
+368 456 1.66666666666667e-01
+368 438 -8.30092288309214e-18
+368 381 -2.62919026827735e-18
+368 435 4.16666666666667e-02
+368 432 4.04943158676231e-17
+368 366 -1.66666666666667e-01
+368 252 -4.16666666666667e-02
+368 363 7.00326840789856e-18
+369 369 5.55555555555556e-01
+369 425 4.16666666666667e-02
+369 263 -3.36102673470506e-18
+369 344 9.63584680796492e-18
+369 361 3.36102673470506e-18
+369 424 -4.16666666666667e-02
+369 262 -2.75116301268197e-18
+369 343 -8.33333333333334e-02
+369 360 -9.72222222222222e-02
+369 423 -6.94444444444444e-02
+369 261 -1.11111111111111e-01
+369 342 -9.72222222222222e-02
+369 443 5.09575021068187e-18
+369 386 -8.33333333333333e-02
+369 440 -4.16666666666667e-02
+369 458 -1.09639944692597e-17
+369 371 -4.16333634234434e-17
+369 266 -8.26704156520197e-19
+369 368 5.89196118110091e-18
+369 434 -4.16333634234434e-17
+369 442 0.00000000000000e+00
+369 385 1.17906986257799e-18
+369 439 4.16666666666667e-02
+369 457 -2.83925443919641e-18
+369 370 0.00000000000000e+00
+369 265 -2.69017664047966e-18
+369 367 8.33333333333334e-02
+369 433 2.14871082894735e-18
+369 441 1.11111111111111e-01
+369 384 -9.72222222222223e-02
+369 438 -6.94444444444444e-02
+369 456 -2.77777777777778e-02
+369 362 8.33333333333334e-02
+369 264 -1.11111111111111e-01
+369 366 -9.72222222222222e-02
+369 432 1.11111111111111e-01
+370 370 5.55555555555555e-01
+370 425 4.16666666666667e-02
+370 263 -4.16666666666667e-02
+370 344 1.09097843606354e-17
+370 361 -1.38888888888889e-02
+370 424 -6.94444444444444e-02
+370 262 5.55555555555555e-02
+370 343 -9.72222222222222e-02
+370 360 2.05998412772246e-18
+370 423 -4.16666666666667e-02
+370 261 -2.92056960213283e-18
+370 342 -8.33333333333334e-02
+370 443 -2.54109884176290e-17
+370 386 -7.04731412115578e-18
+370 440 4.16666666666667e-02
+370 458 1.66666666666667e-01
+370 371 -1.66666666666667e-01
+370 266 -4.16666666666667e-02
+370 368 -8.90401034153721e-18
+370 434 5.79878755690294e-18
+370 442 1.11111111111111e-01
+370 385 -1.38888888888889e-02
+370 439 -6.94444444444444e-02
+370 457 -1.94444444444444e-01
+370 362 -4.77048955893622e-18
+370 265 5.55555555555555e-02
+370 367 -9.72222222222222e-02
+370 433 -2.22222222222222e-01
+370 441 0.00000000000000e+00
+370 384 2.05998412772246e-18
+370 438 4.16666666666667e-02
+370 456 -2.49366499671666e-18
+370 369 0.00000000000000e+00
+370 264 -2.66984784974555e-18
+370 366 8.33333333333334e-02
+370 432 4.68409219831628e-18
+371 371 5.55555555555555e-01
+371 425 -6.94444444444445e-02
+371 263 5.55555555555555e-02
+371 344 -1.38888888888889e-02
+371 361 -6.54587061638123e-18
+371 424 4.16666666666667e-02
+371 262 -4.16666666666667e-02
+371 343 1.10859672136643e-17
+371 360 8.33333333333334e-02
+371 423 4.16666666666667e-02
+371 261 -3.23905399030044e-18
+371 342 9.72563230037388e-18
+371 443 -2.22222222222222e-01
+371 386 -9.72222222222222e-02
+371 440 -6.94444444444444e-02
+371 458 -1.94444444444445e-01
+371 362 -9.72222222222222e-02
+371 266 5.55555555555555e-02
+371 368 -1.38888888888889e-02
+371 434 1.11111111111111e-01
+371 442 -2.44809462415438e-17
+371 385 -7.91467585914418e-18
+371 439 4.16666666666667e-02
+371 457 1.66666666666667e-01
+371 370 -1.66666666666667e-01
+371 265 -4.16666666666667e-02
+371 367 -9.92722614182040e-18
+371 433 9.13313275376949e-18
+371 441 8.38901430960659e-18
+371 384 -8.33333333333334e-02
+371 438 -4.16666666666667e-02
+371 456 -1.10656384229302e-17
+371 369 -4.16333634234434e-17
+371 264 -1.62630325872826e-18
+371 366 7.10152422978005e-18
+371 432 -2.77555756156289e-17
+372 372 5.55555555555556e-01
+372 278 4.29005247125358e-17
+372 440 4.16666666666667e-02
+372 383 8.33333333333334e-02
+372 376 -8.33333333333334e-02
+372 277 -1.69406589450860e-18
+372 439 -4.16666666666667e-02
+372 382 1.32475952950573e-18
+372 375 -9.72222222222222e-02
+372 276 -1.11111111111111e-01
+372 438 -6.94444444444444e-02
+372 381 -9.72222222222223e-02
+372 353 7.26415455565288e-18
+372 446 -6.93889390390723e-18
+372 374 -5.55111512312578e-17
+372 275 3.67680061744147e-17
+372 425 -4.16666666666667e-02
+372 458 -1.08623505155891e-17
+372 437 -3.61507309141031e-17
+372 359 -8.33333333333333e-02
+372 352 8.33333333333333e-02
+372 445 5.09575021068187e-18
+372 373 0.00000000000000e+00
+372 274 -2.49366499671666e-18
+372 424 4.16666666666667e-02
+372 457 -2.50721752387273e-18
+372 436 -6.93889390390723e-18
+372 358 3.78115507654320e-18
+372 351 -9.72222222222223e-02
+372 444 1.11111111111111e-01
+372 377 6.60008072500551e-18
+372 273 -1.11111111111111e-01
+372 423 -6.94444444444444e-02
+372 456 -2.77777777777778e-02
+372 435 1.11111111111111e-01
+372 357 -9.72222222222222e-02
+373 373 5.55555555555556e-01
+373 278 -4.16666666666667e-02
+373 440 4.16666666666667e-02
+373 383 -4.54687286086108e-18
+373 376 -9.72222222222222e-02
+373 277 5.55555555555556e-02
+373 439 -6.94444444444444e-02
+373 382 -1.38888888888889e-02
+373 375 -8.33333333333334e-02
+373 276 -2.49366499671666e-18
+373 438 -4.16666666666667e-02
+373 381 1.30104260698261e-18
+373 353 -1.26174027823001e-17
+373 446 -1.94817577868489e-19
+373 374 -1.66666666666667e-01
+373 275 -4.16666666666667e-02
+373 425 4.16666666666667e-02
+373 458 1.66666666666667e-01
+373 437 1.74135150878907e-17
+373 359 4.54009659728305e-18
+373 352 -9.72222222222222e-02
+373 445 -2.22222222222222e-01
+373 377 1.89870905456524e-17
+373 274 5.55555555555556e-02
+373 424 -6.94444444444444e-02
+373 457 -1.94444444444444e-01
+373 436 1.11111111111111e-01
+373 358 -1.38888888888889e-02
+373 351 8.33333333333334e-02
+373 444 -2.01932654625425e-18
+373 372 0.00000000000000e+00
+373 273 -7.45388993583784e-19
+373 423 4.16666666666667e-02
+373 456 -3.69306365002875e-18
+373 435 0.00000000000000e+00
+373 357 4.04712342198105e-18
+374 374 5.55555555555555e-01
+374 278 5.55555555555556e-02
+374 440 -6.94444444444445e-02
+374 383 -9.72222222222223e-02
+374 376 1.90819582357449e-17
+374 277 -4.16666666666667e-02
+374 439 4.16666666666667e-02
+374 382 -4.02510056535244e-18
+374 375 6.93889390390723e-18
+374 276 4.37475576597901e-17
+374 438 4.16666666666667e-02
+374 381 8.33333333333334e-02
+374 353 -1.38888888888889e-02
+374 446 1.11111111111111e-01
+374 377 -1.38888888888889e-02
+374 275 5.55555555555555e-02
+374 425 -6.94444444444444e-02
+374 458 -1.94444444444444e-01
+374 437 -2.22222222222222e-01
+374 359 -9.72222222222222e-02
+374 352 -1.51788304147971e-17
+374 445 -1.11130722679764e-18
+374 373 -1.66666666666667e-01
+374 274 -4.16666666666667e-02
+374 424 4.16666666666667e-02
+374 457 1.66666666666667e-01
+374 436 2.02186764509601e-17
+374 358 4.18773089122526e-18
+374 351 6.39679281766448e-18
+374 444 -6.93889390390723e-18
+374 372 -5.55111512312578e-17
+374 273 3.31291526330102e-17
+374 423 -4.16666666666667e-02
+374 456 -1.00830802041152e-17
+374 435 -3.52281002763064e-17
+374 357 -8.33333333333333e-02
+375 375 5.55555555555556e-01
+375 290 4.16666666666667e-02
+375 443 -4.16666666666667e-02
+375 386 -6.08508469307489e-18
+375 379 8.33333333333333e-02
+375 289 2.60208521396521e-18
+375 442 4.16666666666667e-02
+375 385 -9.75781955236954e-19
+375 378 -9.72222222222222e-02
+375 288 5.55555555555555e-02
+375 441 -6.94444444444444e-02
+375 384 -1.38888888888889e-02
+375 446 4.02645581806804e-17
+375 377 1.66666666666667e-01
+375 278 4.16666666666667e-02
+375 374 6.93889390390723e-18
+375 458 -1.66666666666667e-01
+375 440 -1.17178537923160e-17
+375 383 -2.64274279543342e-18
+375 437 -4.16666666666667e-02
+375 445 -2.49366499671666e-18
+375 376 1.38777878078145e-17
+375 277 5.42101086242752e-19
+375 373 -8.33333333333334e-02
+375 457 3.99799551104030e-18
+375 439 -1.38777878078145e-17
+375 382 -9.08019319456610e-19
+375 436 -4.16666666666667e-02
+375 444 -2.22222222222222e-01
+375 380 4.98732999343332e-18
+375 276 5.55555555555555e-02
+375 372 -9.72222222222222e-02
+375 456 -1.94444444444444e-01
+375 438 1.11111111111111e-01
+375 381 -1.38888888888889e-02
+375 435 -6.94444444444444e-02
+376 376 5.55555555555555e-01
+376 290 -9.43255890062389e-18
+376 443 4.16666666666667e-02
+376 386 8.33333333333334e-02
+376 379 -9.72222222222222e-02
+376 289 -1.11111111111111e-01
+376 442 -6.94444444444444e-02
+376 385 -9.72222222222223e-02
+376 378 8.33333333333334e-02
+376 288 6.50521303491303e-19
+376 441 4.16666666666667e-02
+376 384 0.00000000000000e+00
+376 446 0.00000000000000e+00
+376 377 4.16333634234434e-17
+376 278 -1.47451495458029e-17
+376 374 1.89735380184963e-17
+376 458 -8.27551189467451e-18
+376 440 1.43250212039647e-17
+376 383 -8.33333333333334e-02
+376 437 -4.16666666666666e-02
+376 445 1.11111111111111e-01
+376 380 -7.68428289749101e-18
+376 277 -1.11111111111111e-01
+376 373 -9.72222222222222e-02
+376 457 -2.77777777777778e-02
+376 439 1.11111111111111e-01
+376 382 -9.72222222222223e-02
+376 436 -6.94444444444444e-02
+376 444 -4.52654407012698e-18
+376 375 1.38777878078145e-17
+376 276 2.60208521396521e-18
+376 372 -8.33333333333334e-02
+376 456 2.17856874033806e-18
+376 438 -6.93889390390723e-18
+376 381 -5.42101086242752e-19
+376 435 -4.16666666666667e-02
+377 377 5.55555555555555e-01
+377 290 5.55555555555555e-02
+377 443 -6.94444444444444e-02
+377 386 -9.72222222222223e-02
+377 379 -7.80625564189563e-18
+377 289 -1.12757025938492e-17
+377 442 4.16666666666667e-02
+377 385 8.33333333333333e-02
+377 378 5.05509262921366e-18
+377 288 4.16666666666667e-02
+377 441 -4.16666666666667e-02
+377 384 -6.61363325216158e-18
+377 446 1.11111111111111e-01
+377 380 -1.38888888888889e-02
+377 278 5.55555555555555e-02
+377 374 -1.38888888888889e-02
+377 458 -1.94444444444444e-01
+377 440 -2.22222222222222e-01
+377 383 -9.72222222222222e-02
+377 437 -6.94444444444444e-02
+377 445 0.00000000000000e+00
+377 376 4.16333634234434e-17
+377 277 -1.48535697630514e-17
+377 373 1.82145964977565e-17
+377 457 -7.87401827767598e-18
+377 439 1.48535697630514e-17
+377 382 -8.33333333333334e-02
+377 436 -4.16666666666667e-02
+377 444 4.00002839011371e-17
+377 375 1.66666666666667e-01
+377 276 4.16666666666667e-02
+377 372 6.58652819784944e-18
+377 456 -1.66666666666667e-01
+377 438 -1.53143556863578e-17
+377 381 -6.61363325216158e-18
+377 435 -4.16666666666667e-02
+378 378 5.55555555555555e-01
+378 353 9.97465998686664e-18
+378 362 -8.33333333333334e-02
+378 425 -4.16666666666667e-02
+378 286 -3.46944695195361e-18
+378 352 -8.33333333333334e-02
+378 361 3.25260651745651e-18
+378 424 -4.16666666666667e-02
+378 285 -1.11111111111111e-01
+378 351 -9.72222222222222e-02
+378 360 -9.72222222222223e-02
+378 423 -6.94444444444444e-02
+378 380 2.77555756156289e-17
+378 290 -1.19262238973405e-18
+378 377 5.05509262921366e-18
+378 446 -6.93889390390723e-18
+378 443 8.38901430960659e-18
+378 386 8.33333333333334e-02
+378 440 4.16666666666667e-02
+378 458 -9.70530350963977e-18
+378 379 4.16333634234434e-17
+378 289 -2.05998412772246e-18
+378 376 8.33333333333334e-02
+378 445 4.91956735765298e-18
+378 442 6.93889390390723e-18
+378 385 3.93023287525995e-19
+378 439 4.16666666666667e-02
+378 457 -1.88549534058807e-18
+378 287 -6.93889390390723e-18
+378 288 -1.11111111111111e-01
+378 375 -9.72222222222222e-02
+378 444 1.11111111111111e-01
+378 441 1.11111111111111e-01
+378 384 -9.72222222222223e-02
+378 438 -6.94444444444444e-02
+378 456 -2.77777777777778e-02
+379 379 5.55555555555555e-01
+379 353 1.06251812903579e-17
+379 362 -8.29414661951411e-18
+379 425 -4.16666666666667e-02
+379 286 5.55555555555555e-02
+379 352 -9.72222222222223e-02
+379 361 -1.38888888888889e-02
+379 424 -6.94444444444444e-02
+379 285 -5.09575021068187e-18
+379 351 -8.33333333333334e-02
+379 360 2.18195687212708e-18
+379 423 -4.16666666666667e-02
+379 380 1.66666666666667e-01
+379 290 4.16666666666667e-02
+379 377 -7.69783542464708e-18
+379 446 6.69494841509799e-18
+379 443 -2.44267361329195e-17
+379 386 -1.59919820441612e-18
+379 440 -4.16666666666667e-02
+379 458 -1.66666666666667e-01
+379 287 4.16666666666667e-02
+379 289 5.55555555555555e-02
+379 376 -9.72222222222222e-02
+379 445 -2.22222222222222e-01
+379 442 1.11111111111111e-01
+379 385 -1.38888888888889e-02
+379 439 -6.94444444444444e-02
+379 457 -1.94444444444444e-01
+379 378 4.16333634234434e-17
+379 288 -2.60208521396521e-18
+379 375 8.33333333333333e-02
+379 444 5.20417042793042e-18
+379 441 6.93889390390723e-18
+379 384 1.84314369322536e-18
+379 438 4.16666666666667e-02
+379 456 -2.94089839286693e-18
+380 380 5.55555555555555e-01
+380 353 -1.38888888888889e-02
+380 362 -9.72222222222222e-02
+380 425 -6.94444444444444e-02
+380 286 4.16666666666667e-02
+380 352 1.16551733542192e-17
+380 361 -9.32413868337534e-18
+380 424 -4.16666666666667e-02
+380 285 -4.22838847269347e-18
+380 351 9.55453164502851e-18
+380 360 -8.33333333333334e-02
+380 423 -4.16666666666667e-02
+380 287 5.55555555555555e-02
+380 290 5.55555555555556e-02
+380 377 -1.38888888888889e-02
+380 446 1.11111111111111e-01
+380 443 -2.22222222222222e-01
+380 386 -9.72222222222222e-02
+380 440 -6.94444444444445e-02
+380 458 -1.94444444444444e-01
+380 379 1.66666666666667e-01
+380 289 4.16666666666667e-02
+380 376 -7.57586268024246e-18
+380 445 3.32883948270940e-18
+380 442 -2.53974358904729e-17
+380 385 -2.49366499671666e-18
+380 439 -4.16666666666667e-02
+380 457 -1.66666666666667e-01
+380 378 2.77555756156289e-17
+380 375 4.98732999343332e-18
+380 444 0.00000000000000e+00
+380 441 5.20417042793042e-18
+380 384 8.33333333333334e-02
+380 438 4.16666666666667e-02
+380 456 -1.00017650411788e-17
+381 381 5.55555555555555e-01
+381 377 -6.61363325216158e-18
+381 278 -2.13858878522766e-17
+381 374 8.33333333333334e-02
+381 445 4.16666666666667e-02
+381 376 -5.42101086242752e-19
+381 277 -4.16666666666667e-02
+381 373 1.30104260698261e-18
+381 444 -6.94444444444444e-02
+381 375 -1.38888888888889e-02
+381 276 5.55555555555555e-02
+381 372 -9.72222222222223e-02
+381 458 1.50704101975485e-17
+381 440 -2.77555756156289e-17
+381 383 -1.24900090270330e-16
+381 437 8.55028938276381e-17
+381 434 -4.16666666666667e-02
+381 368 -2.64274279543342e-18
+381 254 -2.09352663243373e-17
+381 365 -8.33333333333333e-02
+381 457 1.66666666666667e-01
+381 439 5.27193306371077e-18
+381 382 -1.66666666666667e-01
+381 436 -3.03576608295941e-18
+381 433 4.16666666666667e-02
+381 367 -1.40946282423116e-18
+381 253 -4.16666666666667e-02
+381 364 1.82959116606929e-18
+381 456 -1.94444444444444e-01
+381 438 1.11111111111111e-01
+381 446 4.16666666666667e-02
+381 435 -2.22222222222222e-01
+381 432 -6.94444444444444e-02
+381 366 -1.38888888888889e-02
+381 252 5.55555555555555e-02
+381 363 -9.72222222222222e-02
+382 382 5.55555555555556e-01
+382 377 -8.33333333333334e-02
+382 278 2.25514051876985e-17
+382 374 -4.06575814682064e-18
+382 445 -6.94444444444444e-02
+382 376 -9.72222222222223e-02
+382 277 5.55555555555556e-02
+382 373 -1.38888888888889e-02
+382 444 4.16666666666667e-02
+382 375 -8.94466792300541e-19
+382 276 -4.16666666666667e-02
+382 372 9.97804811865566e-19
+382 458 -1.93733375696004e-17
+382 440 -2.68882138776405e-17
+382 383 1.11022302462516e-16
+382 437 6.93889390390723e-18
+382 434 4.16666666666667e-02
+382 368 8.33333333333334e-02
+382 254 2.25920627691667e-17
+382 365 -2.20228566286118e-18
+382 457 -1.94444444444444e-01
+382 439 -2.22222222222222e-01
+382 446 -4.16666666666667e-02
+382 436 1.11111111111111e-01
+382 433 -6.94444444444444e-02
+382 367 -9.72222222222223e-02
+382 253 5.55555555555556e-02
+382 364 -1.38888888888889e-02
+382 456 1.66666666666667e-01
+382 438 1.07911997480198e-18
+382 381 -1.66666666666667e-01
+382 435 -3.85654100884883e-18
+382 432 4.16666666666667e-02
+382 366 -2.30392961653170e-19
+382 252 -4.16666666666667e-02
+382 363 1.31120700234966e-18
+383 383 5.55555555555555e-01
+383 377 -9.72222222222222e-02
+383 278 -1.11111111111111e-01
+383 374 -9.72222222222223e-02
+383 445 -4.16666666666667e-02
+383 376 -8.33333333333334e-02
+383 277 2.27953506765077e-17
+383 373 -4.54517879496658e-18
+383 444 4.16666666666667e-02
+383 375 -2.64274279543342e-18
+383 276 -2.18551441050555e-17
+383 372 8.33333333333334e-02
+383 458 -2.77777777777778e-02
+383 440 1.11111111111111e-01
+383 446 -6.94444444444445e-02
+383 437 1.11111111111111e-01
+383 434 -6.94444444444444e-02
+383 368 -9.72222222222222e-02
+383 254 -1.11111111111111e-01
+383 365 -9.72222222222221e-02
+383 457 -1.68593437821496e-17
+383 439 -2.68882138776405e-17
+383 382 1.11022302462516e-16
+383 436 6.93889390390723e-18
+383 433 4.16666666666667e-02
+383 367 8.33333333333333e-02
+383 253 2.26598254049470e-17
+383 364 -2.53432257818487e-18
+383 456 1.34390247411367e-17
+383 438 -2.08166817117217e-17
+383 381 -1.24900090270330e-16
+383 435 8.50463430690680e-17
+383 432 -4.16666666666667e-02
+383 366 -6.61363325216158e-18
+383 252 -2.13858878522766e-17
+383 363 -8.33333333333333e-02
+384 384 5.55555555555556e-01
+384 290 6.07153216591882e-18
+384 377 -6.61363325216158e-18
+384 446 4.16666666666667e-02
+384 443 -1.62630325872826e-18
+384 379 1.84314369322536e-18
+384 289 4.16666666666667e-02
+384 376 -8.67361737988404e-19
+384 445 -4.16666666666667e-02
+384 378 -9.72222222222223e-02
+384 288 5.55555555555555e-02
+384 375 -1.38888888888889e-02
+384 444 -6.94444444444444e-02
+384 386 -4.16333634234434e-17
+384 440 -2.77555756156289e-17
+384 458 1.93936663603345e-17
+384 371 -8.33333333333334e-02
+384 266 2.27682456221956e-18
+384 368 -2.64274279543342e-18
+384 434 -4.16666666666667e-02
+384 442 -2.71050543121376e-18
+384 385 1.66666666666667e-01
+384 439 1.89227160416611e-18
+384 457 -1.66666666666667e-01
+384 370 2.16840434497101e-18
+384 265 4.16666666666667e-02
+384 367 -9.08019319456610e-19
+384 433 -4.16666666666667e-02
+384 441 -2.22222222222222e-01
+384 380 8.33333333333334e-02
+384 438 1.11111111111111e-01
+384 456 -1.94444444444444e-01
+384 369 -9.72222222222223e-02
+384 264 5.55555555555555e-02
+384 366 -1.38888888888889e-02
+384 432 -6.94444444444444e-02
+385 385 5.55555555555555e-01
+385 290 -8.67361737988404e-18
+385 377 8.33333333333333e-02
+385 446 4.16666666666667e-02
+385 379 -1.38888888888889e-02
+385 289 5.55555555555556e-02
+385 376 -9.72222222222223e-02
+385 445 -6.94444444444445e-02
+385 378 7.18283939271647e-19
+385 288 4.16666666666667e-02
+385 375 -9.75781955236954e-19
+385 444 -4.16666666666667e-02
+385 443 -6.93889390390723e-18
+385 386 -1.38777878078145e-17
+385 440 -1.98408997564847e-17
+385 458 3.77844457111198e-17
+385 371 -7.80625564189563e-18
+385 266 -8.67361737988404e-18
+385 368 -8.33333333333334e-02
+385 434 -4.16666666666666e-02
+385 442 1.11111111111111e-01
+385 380 -2.60208521396521e-18
+385 439 -2.22222222222222e-01
+385 457 -1.94444444444444e-01
+385 370 -1.38888888888889e-02
+385 265 5.55555555555556e-02
+385 367 -9.72222222222223e-02
+385 433 -6.94444444444444e-02
+385 441 -5.59041745187838e-18
+385 384 1.66666666666667e-01
+385 438 5.27193306371077e-18
+385 456 -1.66666666666667e-01
+385 369 7.31836466427715e-19
+385 264 4.16666666666667e-02
+385 366 -5.42101086242752e-19
+385 432 -4.16666666666667e-02
+386 386 5.55555555555555e-01
+386 290 -1.11111111111111e-01
+386 377 -9.72222222222223e-02
+386 446 -6.94444444444445e-02
+386 379 -1.70761842166467e-18
+386 289 -8.56519716263549e-18
+386 376 8.33333333333334e-02
+386 445 4.16666666666667e-02
+386 378 8.33333333333334e-02
+386 288 5.74627151417317e-18
+386 375 -6.08508469307489e-18
+386 444 4.16666666666667e-02
+386 443 1.11111111111111e-01
+386 380 -9.72222222222222e-02
+386 440 1.11111111111111e-01
+386 458 -2.77777777777778e-02
+386 371 -9.72222222222222e-02
+386 266 -1.11111111111111e-01
+386 368 -9.72222222222222e-02
+386 434 -6.94444444444444e-02
+386 442 -6.93889390390723e-18
+386 385 -1.38777878078145e-17
+386 439 -1.81061762805079e-17
+386 457 3.71102074851054e-17
+386 370 -7.04731412115578e-18
+386 265 -7.80625564189563e-18
+386 367 -8.33333333333334e-02
+386 433 -4.16666666666667e-02
+386 441 -3.65918233213858e-18
+386 384 -4.16333634234434e-17
+386 438 -2.08166817117217e-17
+386 456 1.79960619973649e-17
+386 369 -8.33333333333333e-02
+386 264 6.07153216591882e-18
+386 366 -6.61363325216158e-18
+386 432 -4.16666666666667e-02
+387 387 1.11111111111111e+00
+387 398 7.81980816905170e-18
+387 314 -4.16666666666667e-02
+387 299 2.77555756156289e-17
+387 257 -1.15264243462365e-17
+387 397 1.47722546001150e-18
+387 313 -4.16666666666667e-02
+387 298 9.46644021851406e-18
+387 256 -8.33333333333334e-02
+387 396 -2.77777777777777e-02
+387 312 -6.94444444444445e-02
+387 297 1.11111111111111e-01
+387 255 -9.72222222222223e-02
+387 395 -1.66666666666667e-01
+387 311 -4.16666666666667e-02
+387 296 -6.53720970449556e-17
+387 245 -1.33695680394619e-17
+387 394 -1.78181850784415e-17
+387 310 4.16666666666667e-02
+387 295 -3.16400687117371e-17
+387 244 8.33333333333334e-02
+387 393 -1.94444444444445e-01
+387 309 -6.94444444444445e-02
+387 294 -2.22222222222223e-01
+387 243 -9.72222222222223e-02
+387 449 1.40268656065312e-17
+387 392 7.81980816905170e-18
+387 389 5.55111512312578e-17
+387 293 2.77555756156289e-17
+387 448 2.08166817117217e-17
+387 391 3.26954717640160e-18
+387 388 1.38777878078145e-17
+387 292 8.00255552742182e-18
+387 447 2.22222222222222e-01
+387 390 -2.77777777777777e-02
+387 291 1.11111111111111e-01
+387 29 -3.03576608295941e-18
+387 166 4.16666666666667e-02
+387 28 8.33333333333334e-02
+387 165 -6.94444444444445e-02
+387 27 -9.72222222222222e-02
+387 224 1.66666666666667e-01
+387 164 4.16666666666667e-02
+387 149 -1.33966730937740e-17
+387 14 -1.08420217248550e-18
+387 223 0.00000000000000e+00
+387 163 -4.16666666666667e-02
+387 148 -3.83536518516747e-18
+387 13 -8.33333333333334e-02
+387 222 -1.94444444444445e-01
+387 162 -6.94444444444445e-02
+387 147 -2.22222222222222e-01
+387 167 4.16666666666667e-02
+387 12 -9.72222222222222e-02
+388 388 1.11111111111111e+00
+388 398 -1.66666666666667e-01
+388 314 -4.16666666666667e-02
+388 299 -3.31098826334602e-17
+388 257 -6.61871544984510e-18
+388 397 -1.94444444444444e-01
+388 313 -6.94444444444445e-02
+388 298 -2.22222222222222e-01
+388 256 -9.72222222222222e-02
+388 396 3.46267068837558e-18
+388 312 -4.16666666666667e-02
+388 297 1.14196981948825e-17
+388 255 -8.33333333333334e-02
+388 395 -4.46149193977785e-17
+388 311 4.16666666666667e-02
+388 296 -9.02056207507940e-17
+388 245 3.32985592224611e-17
+388 394 -2.77777777777778e-02
+388 310 -6.94444444444444e-02
+388 295 1.11111111111111e-01
+388 244 -9.72222222222221e-02
+388 393 -1.72659195968317e-17
+388 309 4.16666666666667e-02
+388 294 -2.94174542581419e-17
+388 243 8.33333333333334e-02
+388 449 2.69017664047966e-17
+388 392 1.66666666666667e-01
+388 389 1.52655665885959e-16
+388 293 -3.57397081764479e-17
+388 448 2.22222222222222e-01
+388 391 -1.94444444444444e-01
+388 292 -2.22222222222222e-01
+388 447 1.38777878078145e-17
+388 390 1.02999206386123e-18
+388 387 1.38777878078145e-17
+388 291 1.29341931045732e-17
+388 29 1.57785297414531e-17
+388 166 -6.94444444444444e-02
+388 28 -9.72222222222222e-02
+388 165 4.16666666666667e-02
+388 27 8.33333333333334e-02
+388 224 -2.39337629576175e-17
+388 164 4.16666666666667e-02
+388 149 -4.16333634234434e-17
+388 14 6.69494841509799e-18
+388 223 -2.77777777777778e-02
+388 163 -6.94444444444444e-02
+388 148 1.11111111111111e-01
+388 167 -4.16666666666667e-02
+388 13 -9.72222222222222e-02
+388 222 9.65617559869902e-20
+388 162 -4.16666666666667e-02
+388 147 -2.71410532123959e-18
+388 12 -8.33333333333334e-02
+389 389 1.11111111111111e+00
+389 398 -1.94444444444444e-01
+389 314 -6.94444444444445e-02
+389 299 1.11111111111111e-01
+389 257 -1.38888888888889e-02
+389 397 -1.66666666666667e-01
+389 313 -4.16666666666667e-02
+389 298 -3.05355377485175e-17
+389 256 -8.28059409235804e-18
+389 396 8.16539761153146e-18
+389 312 -4.16666666666667e-02
+389 297 3.46944695195361e-17
+389 255 -1.13841228110978e-17
+389 395 -1.94444444444444e-01
+389 311 -6.94444444444444e-02
+389 296 1.11111111111111e-01
+389 245 -1.38888888888889e-02
+389 394 -4.64631452886874e-17
+389 310 4.16666666666667e-02
+389 295 -9.71445146547012e-17
+389 244 3.39524686577414e-17
+389 393 -1.66666666666667e-01
+389 309 -4.16666666666667e-02
+389 294 -6.36460556566881e-17
+389 243 -1.39184453892827e-17
+389 449 -4.44444444444444e-01
+389 392 -1.94444444444444e-01
+389 293 1.11111111111111e-01
+389 448 4.59453963996782e-17
+389 391 1.66666666666667e-01
+389 388 1.52655665885959e-16
+389 292 -3.83544988846220e-17
+389 447 2.96954928230781e-17
+389 390 8.17725607279302e-18
+389 387 4.16333634234434e-17
+389 291 2.08166817117217e-17
+389 29 -1.38888888888889e-02
+389 166 -4.16666666666666e-02
+389 28 1.74014448683923e-17
+389 165 4.16666666666667e-02
+389 27 -3.60158409172529e-18
+389 224 -1.94444444444444e-01
+389 164 -6.94444444444445e-02
+389 149 1.11111111111111e-01
+389 167 -6.94444444444445e-02
+389 14 -1.38888888888889e-02
+389 223 -2.10081111578012e-17
+389 163 4.16666666666667e-02
+389 148 -4.16333634234434e-17
+389 13 7.74357520379881e-18
+389 222 1.66666666666667e-01
+389 162 4.16666666666667e-02
+389 147 -1.43724550490110e-17
+389 12 -1.77029885976149e-18
+390 390 1.11111111111111e+00
+390 269 -8.33333333333334e-02
+390 304 -4.16666666666667e-02
+390 268 -8.68378177525109e-18
+390 303 -6.94444444444445e-02
+390 267 -9.72222222222223e-02
+390 401 1.12892551210053e-17
+390 302 7.73849300611529e-18
+390 400 1.47722546001150e-18
+390 301 2.77555756156289e-17
+390 399 -2.77777777777777e-02
+390 300 1.11111111111111e-01
+390 395 -2.59734182946059e-17
+390 311 -9.13014696263042e-17
+390 296 4.16666666666667e-02
+390 245 8.33333333333333e-02
+390 448 1.53753420585601e-17
+390 394 -1.66666666666667e-01
+390 310 -3.05507843415681e-17
+390 295 -4.16666666666667e-02
+390 244 -9.07680506277708e-18
+390 393 -1.94444444444445e-01
+390 309 -2.22222222222223e-01
+390 294 -6.94444444444445e-02
+390 243 -9.72222222222223e-02
+390 449 2.77555756156289e-17
+390 392 2.77555756156289e-17
+390 389 8.17556200689851e-18
+390 293 8.71279265369455e-18
+390 391 2.77555756156289e-17
+390 388 1.04354459101730e-18
+390 292 1.38777878078145e-17
+390 447 2.22222222222222e-01
+390 305 -4.16666666666667e-02
+390 387 -2.77777777777777e-02
+390 291 1.11111111111111e-01
+390 158 4.16666666666667e-02
+390 44 8.33333333333334e-02
+390 157 4.16666666666667e-02
+390 43 2.16840434497101e-19
+390 156 -6.94444444444445e-02
+390 42 -9.72222222222223e-02
+390 224 -1.95156391047391e-18
+390 164 4.76032516356917e-17
+390 149 -4.16666666666667e-02
+390 14 -8.33333333333333e-02
+390 223 1.66666666666667e-01
+390 163 1.53143556863578e-18
+390 148 4.16666666666667e-02
+390 13 7.45388993583784e-19
+390 222 -1.94444444444444e-01
+390 162 -2.22222222222222e-01
+390 147 -6.94444444444445e-02
+390 12 -9.72222222222222e-02
+391 391 1.11111111111111e+00
+391 269 -2.10877322548431e-17
+391 304 -6.94444444444445e-02
+391 268 -1.38888888888889e-02
+391 303 -4.16666666666667e-02
+391 267 -8.37546178245052e-18
+391 401 -1.66666666666667e-01
+391 302 2.48959923856984e-17
+391 400 -1.94444444444444e-01
+391 301 1.11111111111111e-01
+391 399 3.67951112287268e-18
+391 300 2.08166817117217e-17
+391 395 -2.06676039130049e-18
+391 311 -4.16333634234434e-17
+391 296 4.16666666666667e-02
+391 245 5.84452733605467e-19
+391 394 -1.94444444444444e-01
+391 310 1.11111111111111e-01
+391 295 -6.94444444444444e-02
+391 244 -1.38888888888889e-02
+391 393 -1.66666666666667e-01
+391 309 -3.21279596893556e-17
+391 294 -4.16666666666667e-02
+391 243 -8.40256683676266e-18
+391 449 -1.13823863935559e-16
+391 392 2.77555756156289e-16
+391 389 1.66666666666667e-01
+391 293 3.31621869179531e-17
+391 448 -4.44444444444444e-01
+391 305 -4.16666666666667e-02
+391 388 -1.94444444444444e-01
+391 292 1.11111111111111e-01
+391 447 1.73995390442610e-17
+391 390 2.77555756156289e-17
+391 387 3.26954717640160e-18
+391 291 3.46944695195361e-17
+391 158 -4.16666666666667e-02
+391 44 -9.29703362906320e-18
+391 157 -6.94444444444444e-02
+391 43 -1.38888888888889e-02
+391 156 4.16666666666667e-02
+391 42 6.94567016748526e-20
+391 224 2.76081918828067e-17
+391 164 -2.77555756156289e-17
+391 149 4.16666666666667e-02
+391 14 -7.70630575411962e-18
+391 223 -1.94444444444444e-01
+391 163 1.11111111111111e-01
+391 148 -6.94444444444444e-02
+391 13 -1.38888888888889e-02
+391 222 1.66666666666667e-01
+391 162 3.16938553038878e-18
+391 147 4.16666666666667e-02
+391 12 1.01813360259967e-18
+392 392 1.11111111111111e+00
+392 269 -9.72222222222223e-02
+392 304 -4.16666666666667e-02
+392 268 -2.35305752747245e-17
+392 303 -4.16666666666667e-02
+392 267 -8.33333333333334e-02
+392 401 -1.94444444444444e-01
+392 302 -2.22222222222222e-01
+392 400 -1.66666666666667e-01
+392 301 3.31621869179531e-17
+392 399 1.16348445634851e-17
+392 300 1.21301470793920e-17
+392 395 -2.77777777777778e-02
+392 311 1.11111111111111e-01
+392 296 -6.94444444444444e-02
+392 245 -9.72222222222221e-02
+392 394 -5.67850887839283e-18
+392 310 -4.85722573273506e-17
+392 295 4.16666666666667e-02
+392 244 1.40946282423116e-18
+392 393 -2.69966340948891e-17
+392 309 -8.69699548922825e-17
+392 294 4.16666666666667e-02
+392 243 8.33333333333333e-02
+392 449 2.22222222222222e-01
+392 305 -6.94444444444445e-02
+392 389 -1.94444444444444e-01
+392 293 -2.22222222222222e-01
+392 448 -1.11945568375023e-16
+392 391 2.49800180540660e-16
+392 388 1.66666666666667e-01
+392 292 3.19416124409597e-17
+392 447 3.46944695195361e-17
+392 390 2.77555756156289e-17
+392 387 7.81980816905170e-18
+392 291 5.16181878056771e-18
+392 158 -6.94444444444445e-02
+392 44 -9.72222222222223e-02
+392 157 -4.16666666666666e-02
+392 43 -9.01243055878576e-18
+392 156 4.16666666666667e-02
+392 42 8.33333333333334e-02
+392 224 -2.77777777777778e-02
+392 164 1.11111111111111e-01
+392 149 -6.94444444444444e-02
+392 14 -9.72222222222222e-02
+392 223 2.92192485484843e-17
+392 163 -2.08166817117217e-17
+392 148 4.16666666666667e-02
+392 13 -7.94178091345632e-18
+392 222 -3.23566585851143e-18
+392 162 4.47978785143854e-17
+392 147 -4.16666666666667e-02
+392 12 -8.33333333333333e-02
+393 393 2.22222222222222e+00
+393 331 -4.16666666666667e-02
+393 330 -6.94444444444444e-02
+393 416 -1.66666666666667e-01
+393 326 -4.16666666666667e-02
+393 415 -1.64561560992565e-17
+393 325 4.16666666666667e-02
+393 414 -1.94444444444444e-01
+393 324 -6.94444444444444e-02
+393 413 -2.06303344633257e-17
+393 323 4.16666666666667e-02
+393 412 -1.66666666666667e-01
+393 322 -4.16666666666667e-02
+393 411 -1.94444444444444e-01
+393 321 -6.94444444444444e-02
+393 452 -1.41204203955555e-16
+393 407 -2.51128328201955e-17
+393 404 1.66666666666667e-01
+393 317 4.16666666666667e-02
+393 451 -1.81626310264424e-16
+393 406 1.66666666666667e-01
+393 403 -1.63172426959068e-17
+393 316 4.16666666666667e-02
+393 450 -4.44444444444444e-01
+393 405 -1.94444444444444e-01
+393 402 -1.94444444444444e-01
+393 315 -6.94444444444444e-02
+393 308 4.16666666666667e-02
+393 281 1.25496401465197e-17
+393 307 4.16666666666667e-02
+393 280 7.88757080483204e-18
+393 306 -6.94444444444444e-02
+393 279 -2.77777777777778e-02
+393 401 1.66666666666667e-01
+393 305 6.01545858481059e-17
+393 269 1.23327997120226e-17
+393 302 4.16666666666667e-02
+393 400 -1.80519661718836e-17
+393 304 3.46944695195361e-17
+393 268 1.08911496357958e-17
+393 301 -4.16666666666667e-02
+393 399 -1.94444444444445e-01
+393 303 2.22222222222222e-01
+393 267 -2.77777777777778e-02
+393 300 -6.94444444444445e-02
+393 398 -3.05745012640912e-17
+393 314 4.16333634234434e-17
+393 299 -4.16666666666667e-02
+393 257 1.01339021809504e-17
+393 397 1.66666666666667e-01
+393 313 5.94888179515640e-17
+393 298 4.16666666666667e-02
+393 256 7.67073037033494e-18
+393 396 -1.94444444444444e-01
+393 312 2.22222222222222e-01
+393 297 -6.94444444444445e-02
+393 255 -2.77777777777779e-02
+393 449 -1.22719827464098e-16
+393 395 2.63677968348475e-16
+393 311 4.16333634234434e-17
+393 392 -2.76607079255364e-17
+393 389 -1.66666666666667e-01
+393 296 5.57445088082264e-17
+393 245 1.44469939483693e-17
+393 293 -4.16666666666667e-02
+393 448 -6.17199027346318e-17
+393 394 2.63677968348475e-16
+393 310 6.70604454670702e-17
+393 391 -1.66666666666667e-01
+393 388 -1.73607872869241e-17
+393 295 4.16333634234434e-17
+393 244 1.06793913989822e-17
+393 292 -4.16666666666667e-02
+393 447 -4.44444444444445e-01
+393 332 -4.16666666666667e-02
+393 309 2.22222222222222e-01
+393 390 -1.94444444444445e-01
+393 387 -1.94444444444445e-01
+393 294 2.22222222222222e-01
+393 243 -2.77777777777779e-02
+393 291 -6.94444444444445e-02
+394 394 2.22222222222222e+00
+394 331 -6.94444444444445e-02
+394 330 -4.16666666666667e-02
+394 416 -4.71356894488073e-17
+394 326 4.16666666666667e-02
+394 415 -2.77777777777777e-02
+394 325 -6.94444444444444e-02
+394 414 -1.45418616384618e-17
+394 324 4.16666666666667e-02
+394 413 -5.32546554597724e-17
+394 323 4.16666666666667e-02
+394 412 -1.94444444444445e-01
+394 322 -6.94444444444445e-02
+394 411 -1.66666666666667e-01
+394 321 -4.16666666666667e-02
+394 452 2.77555756156289e-17
+394 407 3.42065785419177e-17
+394 404 5.21094669150846e-17
+394 317 -4.16666666666667e-02
+394 451 2.22222222222223e-01
+394 406 -1.94444444444444e-01
+394 403 -2.77777777777776e-02
+394 316 -6.94444444444444e-02
+394 450 -1.76519972141902e-16
+394 405 1.66666666666667e-01
+394 402 -1.50975152518606e-17
+394 315 4.16666666666667e-02
+394 308 -4.16666666666666e-02
+394 281 -1.66666666666667e-01
+394 307 -6.94444444444444e-02
+394 280 -1.94444444444445e-01
+394 306 4.16666666666667e-02
+394 279 9.25637604759499e-18
+394 401 3.67273485929465e-18
+394 305 3.02898981938138e-18
+394 269 1.66666666666667e-01
+394 302 4.16666666666667e-02
+394 400 -2.77777777777777e-02
+394 304 2.22222222222222e-01
+394 268 -1.94444444444445e-01
+394 301 -6.94444444444444e-02
+394 399 -2.01204206290787e-17
+394 303 3.46944695195361e-17
+394 267 5.93600689435814e-18
+394 300 -4.16666666666667e-02
+394 398 8.28076349894749e-17
+394 314 -4.93782091766631e-17
+394 299 4.16666666666667e-02
+394 257 1.66666666666667e-01
+394 397 -1.94444444444444e-01
+394 313 -4.44444444444445e-01
+394 298 -6.94444444444444e-02
+394 256 -1.94444444444445e-01
+394 396 1.66666666666667e-01
+394 312 6.86867487257985e-17
+394 297 4.16666666666667e-02
+394 255 1.06624507400371e-17
+394 449 -8.32667268468867e-17
+394 395 1.80411241501588e-16
+394 311 -5.86248443453646e-17
+394 392 -5.25838053655470e-18
+394 389 -4.64631452886874e-17
+394 296 3.12661036655244e-18
+394 245 -1.66666666666667e-01
+394 293 -4.16666666666667e-02
+394 448 2.22222222222222e-01
+394 332 -4.16666666666668e-02
+394 310 -4.44444444444445e-01
+394 391 -1.94444444444444e-01
+394 388 -2.77777777777778e-02
+394 295 2.22222222222222e-01
+394 244 -1.94444444444445e-01
+394 292 -6.94444444444445e-02
+394 447 -6.48367722222909e-17
+394 393 2.63677968348475e-16
+394 309 6.25771000772532e-17
+394 390 -1.66666666666667e-01
+394 387 -1.84670123160383e-17
+394 294 4.16333634234434e-17
+394 243 8.09085871217308e-18
+394 291 -4.16666666666667e-02
+395 395 2.22222222222222e+00
+395 331 -4.16666666666668e-02
+395 330 -4.16666666666667e-02
+395 416 -1.94444444444445e-01
+395 326 -6.94444444444445e-02
+395 415 -5.01629852022942e-17
+395 325 4.16666666666667e-02
+395 414 -1.66666666666667e-01
+395 324 -4.16666666666667e-02
+395 413 -2.77777777777778e-02
+395 323 -6.94444444444445e-02
+395 412 -5.21365719693967e-17
+395 322 4.16666666666667e-02
+395 411 -2.05727362229124e-17
+395 321 4.16666666666667e-02
+395 452 2.22222222222223e-01
+395 407 -2.77777777777776e-02
+395 404 -1.94444444444444e-01
+395 317 -6.94444444444444e-02
+395 451 2.08166817117217e-17
+395 406 3.73067191288684e-17
+395 403 5.31801165604140e-17
+395 316 -4.16666666666667e-02
+395 450 -1.43209554458179e-16
+395 405 -2.55871712706579e-17
+395 402 1.66666666666667e-01
+395 315 4.16666666666667e-02
+395 308 -6.94444444444444e-02
+395 281 -1.94444444444445e-01
+395 307 -4.16666666666666e-02
+395 280 -1.66666666666667e-01
+395 306 4.16666666666667e-02
+395 279 1.10859672136643e-17
+395 401 -1.94444444444444e-01
+395 305 -4.44444444444445e-01
+395 269 -1.94444444444445e-01
+395 302 -6.94444444444444e-02
+395 400 2.21075599233372e-18
+395 304 3.24985366037794e-18
+395 268 1.66666666666667e-01
+395 301 4.16666666666667e-02
+395 399 1.66666666666667e-01
+395 303 5.55799726582222e-17
+395 267 1.01084911925328e-17
+395 300 4.16666666666667e-02
+395 398 -2.77777777777778e-02
+395 314 2.22222222222222e-01
+395 299 -6.94444444444444e-02
+395 257 -1.94444444444445e-01
+395 397 8.32802793740428e-17
+395 313 -4.43116816026615e-17
+395 298 4.16666666666667e-02
+395 256 1.66666666666667e-01
+395 396 -2.98223360069294e-17
+395 312 4.16333634234434e-17
+395 297 -4.16666666666667e-02
+395 255 1.34170018845081e-17
+395 449 2.22222222222222e-01
+395 332 -6.94444444444445e-02
+395 311 2.22222222222222e-01
+395 392 -2.77777777777778e-02
+395 389 -1.94444444444444e-01
+395 296 -4.44444444444445e-01
+395 245 -1.94444444444445e-01
+395 293 -6.94444444444445e-02
+395 448 -8.32667268468867e-17
+395 394 1.80411241501588e-16
+395 310 -6.04385536436729e-17
+395 391 -2.18703906981060e-18
+395 388 -4.46284719249346e-17
+395 295 6.48319017828441e-18
+395 244 -1.66666666666667e-01
+395 292 -4.16666666666667e-02
+395 447 -1.25187446197686e-16
+395 393 2.63677968348475e-16
+395 309 5.55111512312578e-17
+395 390 -2.49146271105380e-17
+395 387 -1.66666666666667e-01
+395 294 5.45556980667550e-17
+395 243 1.35118695746006e-17
+395 291 -4.16666666666667e-02
+396 396 1.11111111111111e+00
+396 308 6.28837260041593e-18
+396 281 -8.33333333333334e-02
+396 305 -4.16666666666667e-02
+396 401 1.12892551210053e-17
+396 307 -6.93889390390723e-18
+396 280 -9.08019319456610e-18
+396 304 4.16666666666667e-02
+396 400 3.28140563766316e-18
+396 306 1.11111111111111e-01
+396 279 -9.72222222222223e-02
+396 303 -6.94444444444445e-02
+396 399 -2.77777777777778e-02
+396 398 5.55111512312578e-17
+396 314 -3.31630339509004e-17
+396 395 -2.98358885340855e-17
+396 449 2.77555756156289e-17
+396 299 1.39726554979069e-17
+396 257 8.33333333333334e-02
+396 296 4.16666666666667e-02
+396 389 8.13659849132481e-18
+396 397 0.00000000000000e+00
+396 313 -3.38965644832226e-17
+396 394 1.66666666666667e-01
+396 448 1.39823963768004e-17
+396 298 -6.93889390390723e-18
+396 256 -9.87979229677416e-18
+396 295 4.16666666666667e-02
+396 388 3.44742409532500e-18
+396 312 -2.22222222222222e-01
+396 393 -1.94444444444444e-01
+396 447 2.22222222222222e-01
+396 297 1.11111111111111e-01
+396 255 -9.72222222222222e-02
+396 294 -6.94444444444444e-02
+396 387 -2.77777777777777e-02
+396 158 4.16666666666667e-02
+396 58 -1.08420217248550e-18
+396 157 -4.16666666666667e-02
+396 57 -9.72222222222223e-02
+396 156 -6.94444444444445e-02
+396 167 -6.96057794735694e-17
+396 224 1.84314369322536e-18
+396 29 -8.33333333333334e-02
+396 149 -4.16666666666667e-02
+396 166 -1.73472347597681e-18
+396 223 -1.66666666666667e-01
+396 28 -5.42101086242752e-19
+396 148 -4.16666666666667e-02
+396 165 -2.22222222222222e-01
+396 222 -1.94444444444444e-01
+396 27 -9.72222222222223e-02
+396 147 -6.94444444444445e-02
+396 59 8.33333333333333e-02
+397 397 1.11111111111111e+00
+397 308 2.11419423634673e-18
+397 281 -2.17924636669586e-17
+397 305 4.16666666666667e-02
+397 401 1.66666666666667e-01
+397 307 1.11111111111111e-01
+397 280 -1.38888888888889e-02
+397 304 -6.94444444444444e-02
+397 400 -1.94444444444444e-01
+397 306 -6.93889390390723e-18
+397 279 -8.89045781438114e-18
+397 303 4.16666666666667e-02
+397 399 1.13841228110978e-18
+397 398 1.38777878078145e-17
+397 314 -3.46944695195361e-17
+397 395 8.37139602430370e-17
+397 449 -1.05657195774607e-16
+397 299 1.22565667467697e-17
+397 257 1.62630325872826e-18
+397 296 -4.16666666666666e-02
+397 389 -1.66666666666667e-01
+397 313 1.11111111111111e-01
+397 394 -1.94444444444444e-01
+397 448 -4.44444444444444e-01
+397 298 1.11111111111111e-01
+397 256 -1.38888888888889e-02
+397 295 -6.94444444444444e-02
+397 388 -1.94444444444444e-01
+397 396 0.00000000000000e+00
+397 312 -3.05338436826230e-17
+397 393 1.66666666666667e-01
+397 447 1.87346747273706e-17
+397 297 -6.93889390390723e-18
+397 255 -8.99887803162969e-18
+397 294 4.16666666666667e-02
+397 387 1.46367293285543e-18
+397 158 4.16666666666667e-02
+397 58 -1.38888888888889e-02
+397 157 -6.94444444444444e-02
+397 57 -4.06575814682064e-19
+397 156 -4.16666666666667e-02
+397 167 -4.16333634234434e-17
+397 224 1.40675231879994e-17
+397 29 -1.34441069388203e-17
+397 149 -4.16666666666667e-02
+397 166 1.11111111111111e-01
+397 223 -1.94444444444444e-01
+397 28 -1.38888888888889e-02
+397 148 -6.94444444444444e-02
+397 165 -1.20278678510111e-19
+397 222 -1.66666666666667e-01
+397 27 -3.93023287525995e-19
+397 147 -4.16666666666667e-02
+397 59 -1.27935856353290e-17
+398 398 1.11111111111111e+00
+398 308 -2.22222222222222e-01
+398 281 -9.72222222222222e-02
+398 305 -6.94444444444444e-02
+398 401 -1.94444444444444e-01
+398 307 1.29087821161555e-17
+398 280 -2.11825999449355e-17
+398 304 4.16666666666667e-02
+398 400 1.66666666666667e-01
+398 306 1.75640751942652e-17
+398 279 -8.33333333333334e-02
+398 303 -4.16666666666667e-02
+398 399 8.18911453405458e-18
+398 314 1.11111111111111e-01
+398 395 -2.77777777777778e-02
+398 449 2.22222222222222e-01
+398 299 -2.22222222222222e-01
+398 257 -9.72222222222222e-02
+398 296 -6.94444444444444e-02
+398 389 -1.94444444444444e-01
+398 397 1.38777878078145e-17
+398 313 -3.46944695195361e-17
+398 394 8.19402732514865e-17
+398 448 -1.01735009712346e-16
+398 298 1.26038502551440e-18
+398 256 2.27682456221956e-18
+398 295 -4.16666666666666e-02
+398 388 -1.66666666666667e-01
+398 396 5.55111512312578e-17
+398 312 -3.23092247400680e-17
+398 393 -2.89888555868312e-17
+398 447 2.08166817117217e-17
+398 297 6.17995238316738e-18
+398 255 8.33333333333334e-02
+398 294 4.16666666666667e-02
+398 387 8.02309607639273e-18
+398 158 -6.94444444444445e-02
+398 58 -1.37016049547856e-17
+398 157 4.16666666666667e-02
+398 57 8.33333333333333e-02
+398 156 4.16666666666667e-02
+398 167 1.11111111111111e-01
+398 224 -2.77777777777778e-02
+398 29 -9.72222222222223e-02
+398 149 -6.94444444444444e-02
+398 166 -4.16333634234434e-17
+398 223 1.67932752122638e-17
+398 28 -1.26851654180804e-17
+398 148 -4.16666666666667e-02
+398 165 -6.88603904799856e-17
+398 222 8.58891408515861e-19
+398 27 -8.33333333333334e-02
+398 147 -4.16666666666667e-02
+398 59 -9.72222222222222e-02
+399 399 1.11111111111111e+00
+399 308 0.00000000000000e+00
+399 281 -1.09233368877915e-17
+399 398 8.20266706121064e-18
+399 314 4.16666666666667e-02
+399 307 5.85469173142172e-18
+399 280 -8.33333333333334e-02
+399 397 1.15196480826585e-18
+399 313 -4.16666666666667e-02
+399 306 1.11111111111111e-01
+399 279 -9.72222222222223e-02
+399 396 -2.77777777777778e-02
+399 312 -6.94444444444445e-02
+399 305 -6.17215968005264e-17
+399 269 -1.28884533254214e-17
+399 395 1.66666666666667e-01
+399 311 4.16666666666667e-02
+399 304 -3.27564581362183e-17
+399 268 8.33333333333333e-02
+399 394 -1.92818580112969e-17
+399 310 4.16666666666667e-02
+399 303 -2.22222222222222e-01
+399 267 -9.72222222222222e-02
+399 393 -1.94444444444445e-01
+399 309 -6.94444444444444e-02
+399 401 5.55111512312578e-17
+399 302 0.00000000000000e+00
+399 449 2.26871422174960e-17
+399 392 1.16060454432784e-17
+399 400 1.38777878078145e-17
+399 301 5.97666447582634e-18
+399 448 6.93889390390723e-18
+399 391 3.66426452982210e-18
+399 300 1.11111111111111e-01
+399 447 2.22222222222222e-01
+399 390 -2.77777777777777e-02
+399 167 -4.16666666666667e-02
+399 58 8.33333333333333e-02
+399 166 4.16666666666667e-02
+399 57 -9.72222222222222e-02
+399 165 -6.94444444444445e-02
+399 158 -1.03676832743926e-17
+399 44 -6.50521303491303e-19
+399 224 -1.66666666666667e-01
+399 164 -4.16666666666667e-02
+399 157 3.68628738645072e-18
+399 43 -8.33333333333334e-02
+399 223 5.28548559086683e-19
+399 163 -4.16666666666667e-02
+399 156 -2.22222222222222e-01
+399 59 -3.57786716920216e-18
+399 42 -9.72222222222222e-02
+399 222 -1.94444444444445e-01
+399 162 -6.94444444444445e-02
+400 400 1.11111111111111e+00
+400 308 -6.99666155090997e-17
+400 281 5.42101086242752e-18
+400 398 1.66666666666667e-01
+400 314 4.16666666666667e-02
+400 307 -2.22222222222222e-01
+400 280 -9.72222222222222e-02
+400 397 -1.94444444444444e-01
+400 313 -6.94444444444444e-02
+400 306 5.97666447582634e-18
+400 279 -8.33333333333333e-02
+400 396 3.28140563766316e-18
+400 312 -4.16666666666667e-02
+400 305 1.38777878078145e-17
+400 269 4.69459540686223e-17
+400 395 2.22430851948979e-18
+400 311 -4.16666666666666e-02
+400 304 1.11111111111111e-01
+400 268 -9.72222222222222e-02
+400 394 -2.77777777777777e-02
+400 310 -6.94444444444444e-02
+400 303 -3.31765864780564e-17
+400 267 8.33333333333333e-02
+400 300 5.74627151417317e-18
+400 393 -1.83772268236293e-17
+400 309 4.16666666666667e-02
+400 401 9.71445146547012e-17
+400 302 -7.68563815020662e-17
+400 449 4.21407361588487e-17
+400 392 -1.66666666666667e-01
+400 301 -2.22222222222222e-01
+400 448 2.22222222222222e-01
+400 391 -1.94444444444444e-01
+400 399 1.38777878078145e-17
+400 447 2.77555756156289e-17
+400 390 1.46367293285543e-18
+400 167 4.16666666666667e-02
+400 58 -9.72222222222222e-02
+400 166 -6.94444444444444e-02
+400 57 8.33333333333334e-02
+400 165 4.16666666666667e-02
+400 158 -2.77555756156289e-17
+400 44 6.39679281766448e-18
+400 224 -1.75623811283707e-17
+400 164 -4.16666666666667e-02
+400 157 1.11111111111111e-01
+400 59 1.53143556863578e-17
+400 43 -9.72222222222222e-02
+400 223 -2.77777777777778e-02
+400 163 -6.94444444444444e-02
+400 156 5.81403414995352e-18
+400 42 -8.33333333333333e-02
+400 222 6.52215369385811e-19
+400 162 -4.16666666666667e-02
+401 401 1.11111111111111e+00
+401 308 1.11111111111111e-01
+401 281 -1.38888888888889e-02
+401 398 -1.94444444444444e-01
+401 314 -6.94444444444444e-02
+401 307 -7.25195728121242e-17
+401 280 3.46944695195361e-18
+401 397 1.66666666666667e-01
+401 313 4.16666666666667e-02
+401 306 0.00000000000000e+00
+401 279 -1.02999206386123e-17
+401 396 1.12892551210053e-17
+401 312 4.16666666666667e-02
+401 305 1.11111111111111e-01
+401 269 -1.38888888888889e-02
+401 395 -1.94444444444444e-01
+401 311 -6.94444444444444e-02
+401 304 1.38777878078145e-17
+401 268 4.62276701293507e-17
+401 394 3.68628738645072e-18
+401 310 -4.16666666666666e-02
+401 303 -6.25855704067257e-17
+401 267 -1.21430643318376e-17
+401 393 1.66666666666667e-01
+401 309 4.16666666666667e-02
+401 302 1.11111111111111e-01
+401 449 -4.44444444444444e-01
+401 392 -1.94444444444444e-01
+401 400 8.32667268468867e-17
+401 301 -7.53893204374217e-17
+401 448 3.32019974664741e-17
+401 391 -1.66666666666667e-01
+401 399 5.55111512312578e-17
+401 300 0.00000000000000e+00
+401 447 1.13417711637351e-17
+401 390 1.14925430283463e-17
+401 167 -6.94444444444444e-02
+401 58 1.44198888940572e-17
+401 166 4.16666666666667e-02
+401 57 -2.88668828424266e-18
+401 165 -4.16666666666667e-02
+401 158 1.11111111111111e-01
+401 59 -1.38888888888889e-02
+401 44 -1.38888888888889e-02
+401 224 -1.94444444444444e-01
+401 164 -6.94444444444444e-02
+401 157 -2.08166817117217e-17
+401 43 7.41323235436964e-18
+401 223 -1.88922228555599e-17
+401 163 -4.16666666666667e-02
+401 156 -1.18838722499778e-17
+401 42 -1.34170018845081e-18
+401 222 -1.66666666666667e-01
+401 162 -4.16666666666667e-02
+402 402 1.11111111111111e+00
+402 257 -1.30781887056064e-17
+402 313 4.16666666666667e-02
+402 256 8.33333333333333e-02
+402 312 -6.94444444444444e-02
+402 255 -9.72222222222220e-02
+402 413 4.05220561966457e-18
+402 338 -4.16666666666667e-02
+402 323 -1.38777878078145e-17
+402 260 9.94077866897647e-18
+402 412 -6.77626357803440e-19
+402 337 -4.16666666666667e-02
+402 322 1.71388646547435e-17
+402 259 -8.33333333333334e-02
+402 411 -2.77777777777778e-02
+402 336 -6.94444444444444e-02
+402 321 1.11111111111111e-01
+402 258 -9.72222222222222e-02
+402 410 -1.66666666666667e-01
+402 335 -4.16666666666667e-02
+402 320 -1.29490161811501e-17
+402 248 7.13371148177572e-18
+402 409 8.02817827407626e-18
+402 334 4.16666666666667e-02
+402 319 1.75761454137635e-17
+402 247 8.33333333333334e-02
+402 408 -1.94444444444444e-01
+402 333 -6.94444444444444e-02
+402 318 -2.22222222222222e-01
+402 246 -9.72222222222222e-02
+402 395 1.66666666666667e-01
+402 452 4.08507049801804e-17
+402 407 4.06575814682064e-18
+402 311 4.16666666666667e-02
+402 296 -6.97125056249234e-17
+402 404 5.55111512312578e-17
+402 317 -6.93889390390723e-18
+402 245 -1.18449087344041e-17
+402 394 -1.48942273445196e-17
+402 451 -2.08166817117217e-17
+402 406 1.91260039490021e-18
+402 310 -4.16666666666667e-02
+402 295 -9.08544479883908e-17
+402 403 9.71445146547012e-17
+402 316 1.89038695585847e-17
+402 244 -8.33333333333334e-02
+402 393 -1.94444444444444e-01
+402 450 2.22222222222222e-01
+402 405 -2.77777777777778e-02
+402 309 -6.94444444444444e-02
+402 294 -2.22222222222222e-01
+402 314 4.16666666666667e-02
+402 315 1.11111111111111e-01
+402 243 -9.72222222222221e-02
+403 403 1.11111111111111e+00
+403 257 1.34830704543940e-17
+403 313 -6.94444444444444e-02
+403 256 -9.72222222222221e-02
+403 312 4.16666666666667e-02
+403 255 8.33333333333333e-02
+403 413 -1.66666666666667e-01
+403 338 -4.16666666666667e-02
+403 323 1.42731404359454e-17
+403 260 4.37238407372670e-18
+403 412 -1.94444444444445e-01
+403 337 -6.94444444444444e-02
+403 322 -2.22222222222222e-01
+403 259 -9.72222222222221e-02
+403 411 1.11300129269215e-18
+403 336 -4.16666666666667e-02
+403 321 2.32421605561844e-17
+403 258 -8.33333333333334e-02
+403 410 4.35036121709809e-18
+403 335 4.16666666666667e-02
+403 320 -3.46944695195361e-17
+403 248 3.22550146314438e-18
+403 409 -2.77777777777778e-02
+403 334 -6.94444444444444e-02
+403 319 1.11111111111111e-01
+403 247 -9.72222222222222e-02
+403 408 8.66006485272797e-18
+403 333 4.16666666666667e-02
+403 318 1.52872506320456e-17
+403 246 8.33333333333334e-02
+403 395 5.53349683782289e-17
+403 452 -3.03458023683326e-17
+403 407 1.66666666666667e-01
+403 311 4.16666666666667e-02
+403 296 -6.93889390390723e-18
+403 404 -8.32667268468867e-17
+403 317 5.47691503694631e-18
+403 245 -3.29326409892472e-17
+403 394 -2.77777777777776e-02
+403 451 2.22222222222222e-01
+403 406 -1.94444444444445e-01
+403 310 -6.94444444444445e-02
+403 295 1.11111111111111e-01
+403 314 -4.16666666666667e-02
+403 316 -2.22222222222222e-01
+403 244 -9.72222222222224e-02
+403 393 -1.63985578588433e-17
+403 450 -1.38777878078145e-17
+403 405 1.93801138331784e-18
+403 309 -4.16666666666667e-02
+403 294 -9.13546209437444e-17
+403 402 9.71445146547012e-17
+403 315 1.66933253244878e-17
+403 243 -8.33333333333334e-02
+404 404 1.11111111111111e+00
+404 257 -1.38888888888888e-02
+404 313 -4.16666666666667e-02
+404 256 1.33763443030399e-17
+404 312 4.16666666666667e-02
+404 255 -1.34034493573520e-17
+404 413 -1.94444444444445e-01
+404 338 -6.94444444444444e-02
+404 323 1.11111111111111e-01
+404 260 -1.38888888888889e-02
+404 412 -1.66666666666667e-01
+404 337 -4.16666666666667e-02
+404 322 1.32272665043232e-17
+404 259 4.25549352700560e-18
+404 411 1.83297929785831e-18
+404 336 -4.16666666666667e-02
+404 321 -6.93889390390723e-18
+404 258 1.05167610731094e-17
+404 410 -1.94444444444444e-01
+404 335 -6.94444444444444e-02
+404 320 1.11111111111111e-01
+404 248 -1.38888888888889e-02
+404 409 -4.81114714040443e-19
+404 334 4.16666666666667e-02
+404 319 -3.46944695195361e-17
+404 247 2.43098455861984e-18
+404 408 -1.66666666666667e-01
+404 333 -4.16666666666667e-02
+404 318 -7.86724201409794e-18
+404 246 7.68428289749101e-18
+404 395 -1.94444444444444e-01
+404 452 -4.44444444444445e-01
+404 407 -1.94444444444445e-01
+404 311 -6.94444444444445e-02
+404 296 1.11111111111111e-01
+404 314 -6.94444444444444e-02
+404 317 1.11111111111111e-01
+404 245 -1.38888888888889e-02
+404 394 5.30700022772709e-17
+404 451 -3.57034975179528e-17
+404 406 1.66666666666667e-01
+404 310 4.16666666666667e-02
+404 295 -6.93889390390723e-18
+404 403 -8.32667268468867e-17
+404 316 9.06897000801498e-18
+404 244 -3.32595957068874e-17
+404 393 1.66666666666667e-01
+404 450 3.34018972420261e-17
+404 405 1.76521666207796e-18
+404 309 4.16666666666667e-02
+404 294 -6.93114355243985e-17
+404 402 5.55111512312578e-17
+404 315 -6.93889390390723e-18
+404 243 -1.15891047843333e-17
+405 405 1.11111111111111e+00
+405 272 -8.33333333333333e-02
+405 328 -4.16666666666667e-02
+405 271 4.32833836046947e-18
+405 327 -6.94444444444444e-02
+405 270 -9.72222222222222e-02
+405 305 4.16666666666667e-02
+405 416 4.05220561966457e-18
+405 326 3.00086832553254e-17
+405 269 8.33333333333333e-02
+405 304 4.16666666666667e-02
+405 415 -6.77626357803440e-19
+405 325 -2.77555756156289e-17
+405 268 -8.28059409235804e-18
+405 303 -6.94444444444444e-02
+405 414 -2.77777777777778e-02
+405 324 1.11111111111111e-01
+405 267 -9.72222222222220e-02
+405 410 1.42233772502942e-17
+405 335 1.48590754772086e-17
+405 320 4.16666666666667e-02
+405 248 8.33333333333334e-02
+405 409 -1.66666666666667e-01
+405 334 1.80945295774832e-17
+405 319 -4.16666666666667e-02
+405 247 4.12335638723393e-18
+405 408 -1.94444444444444e-01
+405 333 -2.22222222222222e-01
+405 318 -6.94444444444444e-02
+405 246 -9.72222222222222e-02
+405 395 -2.59801945581839e-17
+405 452 6.93889390390723e-18
+405 407 1.38777878078145e-16
+405 311 -1.44549560580735e-16
+405 296 -4.16666666666667e-02
+405 404 1.74997006902738e-18
+405 317 2.89958436086460e-17
+405 245 -8.33333333333334e-02
+405 394 1.66666666666667e-01
+405 451 3.45945196317601e-17
+405 406 6.93889390390723e-17
+405 310 -8.76018414709342e-17
+405 295 4.16666666666667e-02
+405 403 1.73472347597681e-18
+405 316 -2.77555756156289e-17
+405 244 -7.06086664831185e-18
+405 393 -1.94444444444444e-01
+405 450 2.22222222222222e-01
+405 329 -4.16666666666667e-02
+405 309 -2.22222222222222e-01
+405 294 -6.94444444444444e-02
+405 402 -2.77777777777778e-02
+405 315 1.11111111111111e-01
+405 243 -9.72222222222222e-02
+406 406 1.11111111111111e+00
+406 272 2.08708918203460e-18
+406 328 -6.94444444444444e-02
+406 271 -1.38888888888889e-02
+406 327 -4.16666666666667e-02
+406 270 3.56431464204610e-18
+406 305 -4.16666666666667e-02
+406 416 -1.66666666666667e-01
+406 326 -1.99239089853157e-17
+406 269 2.75793927626000e-17
+406 304 -6.94444444444444e-02
+406 415 -1.94444444444445e-01
+406 325 1.11111111111111e-01
+406 268 -1.38888888888888e-02
+406 303 4.16666666666667e-02
+406 414 1.11300129269215e-18
+406 324 -2.08166817117217e-17
+406 267 -8.22638398373376e-18
+406 410 1.44673227391034e-17
+406 335 -2.08166817117217e-17
+406 320 4.16666666666667e-02
+406 248 -1.31578098026483e-17
+406 409 -1.94444444444444e-01
+406 334 1.11111111111111e-01
+406 319 -6.94444444444444e-02
+406 247 -1.38888888888889e-02
+406 408 -1.66666666666667e-01
+406 333 1.27664805810168e-17
+406 318 -4.16666666666667e-02
+406 246 3.68628738645072e-18
+406 395 3.71847463844638e-17
+406 452 4.10476401404170e-17
+406 407 -2.77555756156289e-17
+406 311 3.46944695195361e-17
+406 296 4.16666666666667e-02
+406 404 1.66666666666667e-01
+406 317 -2.02349818351948e-17
+406 245 -2.04253524900902e-17
+406 394 -1.94444444444444e-01
+406 451 -4.44444444444445e-01
+406 329 -4.16666666666667e-02
+406 310 1.11111111111111e-01
+406 295 -6.94444444444444e-02
+406 403 -1.94444444444445e-01
+406 316 1.11111111111111e-01
+406 244 -1.38888888888889e-02
+406 393 1.66666666666667e-01
+406 450 4.37350639238181e-17
+406 405 6.93889390390723e-17
+406 309 -8.95809339521939e-17
+406 294 4.16666666666667e-02
+406 402 1.05879118406788e-18
+406 315 -2.08166817117217e-17
+406 243 -7.55045169182483e-18
+407 407 1.11111111111111e+00
+407 272 -9.72222222222222e-02
+407 328 -4.16666666666667e-02
+407 271 -1.86177841806495e-18
+407 327 -4.16666666666667e-02
+407 270 -8.33333333333333e-02
+407 305 -6.94444444444444e-02
+407 416 -1.94444444444445e-01
+407 326 -2.22222222222222e-01
+407 269 -9.72222222222220e-02
+407 304 -4.16666666666667e-02
+407 415 -1.66666666666667e-01
+407 325 -2.37042170289116e-17
+407 268 2.57904591779989e-17
+407 303 4.16666666666667e-02
+407 414 1.83297929785831e-18
+407 324 2.55280907225869e-17
+407 267 8.33333333333333e-02
+407 410 -2.77777777777778e-02
+407 335 1.11111111111111e-01
+407 320 -6.94444444444445e-02
+407 248 -9.72222222222222e-02
+407 409 1.43250212039647e-17
+407 334 -1.38777878078145e-17
+407 319 4.16666666666667e-02
+407 247 -1.08962318334793e-17
+407 408 1.55040910665427e-17
+407 333 1.71642756431611e-17
+407 318 4.16666666666667e-02
+407 246 8.33333333333334e-02
+407 395 -2.77777777777776e-02
+407 452 2.22222222222222e-01
+407 329 -6.94444444444444e-02
+407 311 1.11111111111111e-01
+407 296 -6.94444444444445e-02
+407 404 -1.94444444444445e-01
+407 317 -2.22222222222222e-01
+407 245 -9.72222222222225e-02
+407 394 3.41930260147616e-17
+407 451 3.62801151967962e-17
+407 406 -2.77555756156289e-17
+407 310 2.77555756156289e-17
+407 295 4.16666666666667e-02
+407 403 1.66666666666667e-01
+407 316 -1.98680048107969e-17
+407 244 -2.01390553539182e-17
+407 393 -2.47198095326695e-17
+407 450 0.00000000000000e+00
+407 405 1.24900090270330e-16
+407 309 -1.47372297877460e-16
+407 294 -4.16666666666667e-02
+407 402 3.63207727782644e-18
+407 315 2.96156599677994e-17
+407 243 -8.33333333333334e-02
+408 408 2.22222222222222e+00
+408 355 -4.16666666666667e-02
+408 354 -6.94444444444444e-02
+408 431 -1.66666666666667e-01
+408 350 -4.16666666666667e-02
+408 430 6.25787941431477e-18
+408 349 4.16666666666667e-02
+408 429 -1.94444444444445e-01
+408 348 -6.94444444444444e-02
+408 428 -2.80435668176954e-17
+408 347 4.16666666666667e-02
+408 427 -1.66666666666667e-01
+408 346 -4.16666666666667e-02
+408 426 -1.94444444444445e-01
+408 345 -6.94444444444444e-02
+408 455 -1.49663098483310e-16
+408 422 -3.29648282412429e-17
+408 419 1.66666666666667e-01
+408 341 4.16666666666667e-02
+408 454 4.87170999613311e-17
+408 421 1.66666666666667e-01
+408 418 6.33750051135668e-18
+408 340 4.16666666666667e-02
+408 453 -4.44444444444445e-01
+408 420 -1.94444444444445e-01
+408 417 -1.94444444444444e-01
+408 339 -6.94444444444444e-02
+408 332 4.16666666666667e-02
+408 284 1.51788304147971e-18
+408 331 4.16666666666667e-02
+408 283 -3.68628738645072e-18
+408 330 -6.94444444444445e-02
+408 282 -2.77777777777777e-02
+408 416 1.66666666666667e-01
+408 329 3.50569996209610e-17
+408 272 1.53143556863578e-18
+408 326 4.16666666666667e-02
+408 415 6.07153216591882e-18
+408 328 -2.08166817117217e-17
+408 271 -3.93700913883799e-18
+408 325 -4.16666666666667e-02
+408 414 -1.94444444444444e-01
+408 327 2.22222222222222e-01
+408 270 -2.77777777777777e-02
+408 324 -6.94444444444444e-02
+408 413 1.16009632455949e-17
+408 338 -6.93889390390723e-18
+408 323 -4.16666666666667e-02
+408 260 1.22650370762423e-18
+408 412 1.66666666666667e-01
+408 337 -1.93970544921235e-17
+408 322 4.16666666666667e-02
+408 259 -4.54009659728305e-18
+408 411 -1.94444444444445e-01
+408 336 2.22222222222222e-01
+408 321 -6.94444444444444e-02
+408 258 -2.77777777777777e-02
+408 452 -2.55668424799238e-17
+408 410 1.38777878078145e-16
+408 335 -6.93889390390723e-18
+408 407 1.46367293285543e-17
+408 404 -1.66666666666667e-01
+408 320 3.29415348351934e-17
+408 248 1.27054942088145e-18
+408 317 -4.16666666666667e-02
+408 451 3.36780299828310e-17
+408 409 -6.93889390390723e-17
+408 334 -2.25645341983809e-17
+408 406 -1.66666666666667e-01
+408 403 8.66006485272797e-18
+408 319 -2.08166817117217e-17
+408 247 -4.09625133292180e-18
+408 316 -4.16666666666667e-02
+408 450 -4.44444444444445e-01
+408 356 -4.16666666666667e-02
+408 333 2.22222222222222e-01
+408 405 -1.94444444444444e-01
+408 402 -1.94444444444444e-01
+408 318 2.22222222222222e-01
+408 246 -2.77777777777777e-02
+408 315 -6.94444444444444e-02
+409 409 2.22222222222222e+00
+409 355 -6.94444444444444e-02
+409 354 -4.16666666666667e-02
+409 431 1.91226158172131e-17
+409 350 4.16666666666667e-02
+409 430 -2.77777777777778e-02
+409 349 -6.94444444444444e-02
+409 429 6.19350491032344e-18
+409 348 4.16666666666667e-02
+409 428 -7.09051280146575e-17
+409 347 4.16666666666666e-02
+409 427 -1.94444444444444e-01
+409 346 -6.94444444444444e-02
+409 426 -1.66666666666667e-01
+409 345 -4.16666666666667e-02
+409 455 6.24500451351651e-17
+409 422 3.40710532703570e-17
+409 419 -9.44102923009643e-18
+409 341 -4.16666666666667e-02
+409 454 2.22222222222222e-01
+409 421 -1.94444444444445e-01
+409 418 -2.77777777777777e-02
+409 340 -6.94444444444444e-02
+409 453 5.31292945835787e-17
+409 420 1.66666666666667e-01
+409 417 5.88179678573386e-18
+409 339 4.16666666666667e-02
+409 332 -4.16666666666667e-02
+409 284 -1.66666666666667e-01
+409 331 -6.94444444444445e-02
+409 283 -1.94444444444444e-01
+409 330 4.16666666666667e-02
+409 282 -4.20636561606486e-18
+409 416 -1.65882932390282e-17
+409 329 -1.71964628951568e-17
+409 272 1.66666666666667e-01
+409 326 4.16666666666667e-02
+409 415 -2.77777777777778e-02
+409 328 2.22222222222222e-01
+409 271 -1.94444444444444e-01
+409 325 -6.94444444444444e-02
+409 414 6.96938709000838e-18
+409 327 -1.38777878078145e-17
+409 270 -3.68628738645072e-18
+409 324 -4.16666666666667e-02
+409 413 1.17517351102062e-17
+409 338 1.79045824390614e-17
+409 323 4.16666666666667e-02
+409 260 1.66666666666667e-01
+409 412 -1.94444444444444e-01
+409 337 -4.44444444444444e-01
+409 322 -6.94444444444444e-02
+409 259 -1.94444444444444e-01
+409 411 1.66666666666667e-01
+409 336 -2.53294614964558e-17
+409 321 4.16666666666667e-02
+409 258 -4.16570803459665e-18
+409 452 -4.85722573273506e-17
+409 410 6.93889390390723e-17
+409 335 1.39370801141223e-17
+409 407 1.43792313125890e-17
+409 404 -3.59141969635823e-19
+409 320 -1.24378317974821e-17
+409 248 -1.66666666666667e-01
+409 317 -4.16666666666667e-02
+409 451 2.22222222222222e-01
+409 356 -4.16666666666667e-02
+409 334 -4.44444444444444e-01
+409 406 -1.94444444444444e-01
+409 403 -2.77777777777778e-02
+409 319 2.22222222222222e-01
+409 247 -1.94444444444444e-01
+409 316 -6.94444444444444e-02
+409 450 3.52789222531416e-17
+409 408 -6.93889390390723e-17
+409 333 -1.93970544921235e-17
+409 405 -1.66666666666667e-01
+409 402 7.03714972578873e-18
+409 318 -6.93889390390723e-18
+409 246 -4.10641572828885e-18
+409 315 -4.16666666666667e-02
+410 410 2.22222222222222e+00
+410 355 -4.16666666666667e-02
+410 354 -4.16666666666667e-02
+410 431 -1.94444444444445e-01
+410 350 -6.94444444444445e-02
+410 430 1.49094739375702e-17
+410 349 4.16666666666667e-02
+410 429 -1.66666666666667e-01
+410 348 -4.16666666666667e-02
+410 428 -2.77777777777778e-02
+410 347 -6.94444444444444e-02
+410 427 -6.98361724352226e-17
+410 346 4.16666666666666e-02
+410 426 -2.91785909670161e-17
+410 345 4.16666666666667e-02
+410 455 2.22222222222222e-01
+410 422 -2.77777777777778e-02
+410 419 -1.94444444444444e-01
+410 341 -6.94444444444444e-02
+410 454 6.24500451351651e-17
+410 421 3.38457425063873e-17
+410 418 -1.02321580028319e-17
+410 340 -4.16666666666667e-02
+410 453 -1.49115068166436e-16
+410 420 -3.30275086793397e-17
+410 417 1.66666666666667e-01
+410 339 4.16666666666667e-02
+410 332 -6.94444444444445e-02
+410 284 -1.94444444444444e-01
+410 331 -4.16666666666667e-02
+410 283 -1.66666666666667e-01
+410 330 4.16666666666667e-02
+410 282 2.90871114087127e-18
+410 416 -1.94444444444444e-01
+410 329 -4.44444444444445e-01
+410 272 -1.94444444444444e-01
+410 326 -6.94444444444445e-02
+410 415 -1.97307854733417e-17
+410 328 -1.57903882027147e-17
+410 271 1.66666666666667e-01
+410 325 4.16666666666667e-02
+410 414 1.66666666666667e-01
+410 327 3.91229695260184e-17
+410 270 4.68409219831628e-18
+410 324 4.16666666666667e-02
+410 413 -2.77777777777778e-02
+410 338 2.22222222222222e-01
+410 323 -6.94444444444444e-02
+410 260 -1.94444444444444e-01
+410 412 1.16280682999070e-17
+410 337 1.72811661898822e-17
+410 322 4.16666666666667e-02
+410 259 1.66666666666667e-01
+410 411 1.11317069928160e-17
+410 336 -6.93889390390723e-18
+410 321 -4.16666666666667e-02
+410 258 2.81892564846231e-18
+410 452 2.22222222222222e-01
+410 356 -6.94444444444445e-02
+410 335 2.22222222222222e-01
+410 407 -2.77777777777778e-02
+410 404 -1.94444444444444e-01
+410 320 -4.44444444444445e-01
+410 248 -1.94444444444444e-01
+410 317 -6.94444444444444e-02
+410 451 -5.55111512312578e-17
+410 409 6.93889390390723e-17
+410 334 1.03880120651267e-17
+410 406 1.28410194803752e-17
+410 403 4.51299154297091e-18
+410 319 -2.23836926641421e-17
+410 247 -1.66666666666667e-01
+410 316 -4.16666666666667e-02
+410 450 -2.55545605021886e-17
+410 408 1.38777878078145e-16
+410 333 -6.93889390390723e-18
+410 405 1.42098247231381e-17
+410 402 -1.66666666666667e-01
+410 318 3.27937275858975e-17
+410 246 1.20617491689012e-18
+410 315 -4.16666666666667e-02
+411 411 1.11111111111111e+00
+411 305 4.16666666666667e-02
+411 280 -7.48099499014998e-18
+411 304 -4.16666666666667e-02
+411 279 -9.72222222222221e-02
+411 303 -6.94444444444444e-02
+411 332 1.08420217248550e-17
+411 284 -8.33333333333334e-02
+411 329 -4.16666666666667e-02
+411 416 4.06575814682064e-18
+411 331 6.93889390390723e-18
+411 283 3.72694496791892e-18
+411 328 4.16666666666667e-02
+411 415 1.93801138331784e-18
+411 330 1.11111111111111e-01
+411 282 -9.72222222222222e-02
+411 327 -6.94444444444444e-02
+411 414 -2.77777777777779e-02
+411 314 4.66206934168767e-18
+411 395 -1.96511643762998e-17
+411 257 -8.33333333333334e-02
+411 296 -4.16666666666667e-02
+411 313 -9.06257490926321e-17
+411 394 -1.66666666666667e-01
+411 256 -8.23993651088983e-18
+411 295 -4.16666666666667e-02
+411 312 -2.22222222222222e-01
+411 393 -1.94444444444444e-01
+411 255 -9.72222222222221e-02
+411 294 -6.94444444444444e-02
+411 413 0.00000000000000e+00
+411 338 -3.97902197302180e-17
+411 410 1.20126212579605e-17
+411 452 1.38777878078145e-17
+411 323 1.13299127024735e-17
+411 260 8.33333333333334e-02
+411 320 4.16666666666667e-02
+411 404 1.94139951510686e-18
+411 412 8.32667268468867e-17
+411 337 1.50026475617682e-17
+411 409 1.66666666666667e-01
+411 451 3.94255720464250e-17
+411 322 6.93889390390723e-18
+411 259 3.06287113727155e-18
+411 319 4.16666666666667e-02
+411 403 2.08878324792910e-18
+411 281 8.33333333333333e-02
+411 336 -2.22222222222222e-01
+411 408 -1.94444444444445e-01
+411 450 2.22222222222222e-01
+411 321 1.11111111111111e-01
+411 258 -9.72222222222222e-02
+411 318 -6.94444444444445e-02
+411 402 -2.77777777777778e-02
+412 412 1.11111111111111e+00
+412 305 4.16666666666667e-02
+412 280 -1.38888888888888e-02
+412 304 -6.94444444444445e-02
+412 279 -8.82269517860079e-18
+412 303 -4.16666666666667e-02
+412 332 -2.42996811908314e-17
+412 284 5.42101086242752e-19
+412 329 4.16666666666667e-02
+412 416 1.66666666666667e-01
+412 331 1.11111111111111e-01
+412 283 -1.38888888888889e-02
+412 328 -6.94444444444444e-02
+412 415 -1.94444444444445e-01
+412 330 6.93889390390723e-18
+412 282 5.09575021068187e-18
+412 327 4.16666666666667e-02
+412 414 1.93801138331784e-18
+412 314 -6.93889390390723e-18
+412 395 -5.51723380523561e-17
+412 257 -2.96258243631664e-17
+412 296 -4.16666666666668e-02
+412 313 1.11111111111112e-01
+412 394 -1.94444444444445e-01
+412 256 -1.38888888888888e-02
+412 295 -6.94444444444445e-02
+412 312 -9.27873771740251e-17
+412 393 -1.66666666666667e-01
+412 255 -8.05020113070487e-18
+412 294 -4.16666666666667e-02
+412 413 -6.93889390390723e-17
+412 338 -3.46944695195361e-17
+412 410 1.16822784085313e-17
+412 452 4.41422750132106e-17
+412 323 -1.87736382429443e-17
+412 260 -6.46455545344482e-18
+412 320 -4.16666666666667e-02
+412 404 -1.66666666666667e-01
+412 281 2.77555756156289e-17
+412 337 1.11111111111111e-01
+412 409 -1.94444444444444e-01
+412 451 -4.44444444444445e-01
+412 322 1.11111111111111e-01
+412 259 -1.38888888888889e-02
+412 319 -6.94444444444445e-02
+412 403 -1.94444444444445e-01
+412 411 1.11022302462516e-16
+412 336 1.56667213924155e-17
+412 408 1.66666666666667e-01
+412 450 3.49079218222442e-17
+412 321 1.38777878078145e-17
+412 258 4.87890977618477e-18
+412 318 4.16666666666667e-02
+412 402 -1.42301535138722e-18
+413 413 1.11111111111111e+00
+413 305 -6.94444444444445e-02
+413 280 2.74167624367272e-17
+413 304 4.16666666666667e-02
+413 279 8.33333333333333e-02
+413 303 4.16666666666667e-02
+413 332 -2.22222222222222e-01
+413 284 -9.72222222222222e-02
+413 329 -6.94444444444444e-02
+413 416 -1.94444444444445e-01
+413 331 -1.88278483515686e-17
+413 283 -3.25260651745651e-19
+413 328 4.16666666666667e-02
+413 415 1.66666666666667e-01
+413 330 7.87401827767598e-18
+413 282 -8.33333333333334e-02
+413 327 -4.16666666666667e-02
+413 414 1.76352259618345e-18
+413 314 1.11111111111111e-01
+413 395 -2.77777777777778e-02
+413 257 -9.72222222222222e-02
+413 296 -6.94444444444445e-02
+413 313 0.00000000000000e+00
+413 394 -5.33478290839703e-17
+413 256 -2.87313575708659e-17
+413 295 -4.16666666666668e-02
+413 312 7.95533344061239e-18
+413 393 -2.00729867840324e-17
+413 255 -8.33333333333334e-02
+413 294 -4.16666666666667e-02
+413 281 -9.72222222222223e-02
+413 338 1.11111111111111e-01
+413 410 -2.77777777777778e-02
+413 452 2.22222222222222e-01
+413 323 -2.22222222222222e-01
+413 260 -9.72222222222222e-02
+413 320 -6.94444444444445e-02
+413 404 -1.94444444444445e-01
+413 412 -6.93889390390723e-17
+413 337 -3.46944695195361e-17
+413 409 1.27292111313376e-17
+413 451 4.81506466778548e-17
+413 322 -1.82145964977565e-17
+413 259 -5.85469173142172e-18
+413 319 -4.16666666666667e-02
+413 403 -1.66666666666667e-01
+413 411 -2.77555756156289e-17
+413 336 -3.75133951679985e-17
+413 408 1.24547724564272e-17
+413 450 6.93889390390723e-18
+413 321 3.90312782094782e-18
+413 258 8.33333333333333e-02
+413 318 4.16666666666667e-02
+413 402 3.51010453342182e-18
+414 414 1.11111111111111e+00
+414 314 -4.16666666666667e-02
+414 280 8.33333333333333e-02
+414 313 4.16666666666667e-02
+414 279 -9.72222222222221e-02
+414 312 -6.94444444444444e-02
+414 332 2.08166817117217e-17
+414 284 8.61940727125976e-18
+414 413 1.74997006902738e-18
+414 338 4.16666666666667e-02
+414 331 1.74556549770166e-17
+414 283 -8.33333333333333e-02
+414 412 2.16840434497101e-18
+414 337 -4.16666666666667e-02
+414 330 1.11111111111111e-01
+414 282 -9.72222222222223e-02
+414 411 -2.77777777777779e-02
+414 336 -6.94444444444444e-02
+414 329 -1.28765948641599e-17
+414 272 6.88468379528295e-18
+414 410 1.66666666666667e-01
+414 335 4.16666666666667e-02
+414 328 1.55854062294791e-17
+414 271 8.33333333333334e-02
+414 409 6.53570622101418e-18
+414 334 4.16666666666667e-02
+414 327 -2.22222222222222e-01
+414 270 -9.72222222222223e-02
+414 408 -1.94444444444444e-01
+414 333 -6.94444444444445e-02
+414 305 -7.01749856141243e-17
+414 416 8.32667268468867e-17
+414 326 2.08166817117217e-17
+414 269 -1.21430643318376e-17
+414 395 -1.66666666666667e-01
+414 452 3.68563093591659e-17
+414 407 1.94139951510686e-18
+414 311 -4.16666666666667e-02
+414 304 -8.72782748850831e-17
+414 415 5.55111512312578e-17
+414 325 2.04643160056639e-17
+414 268 -8.33333333333334e-02
+414 394 -1.53008031592017e-17
+414 451 -2.08166817117217e-17
+414 406 2.30562368242621e-18
+414 310 -4.16666666666667e-02
+414 303 -2.22222222222222e-01
+414 281 -1.37693675905659e-17
+414 324 1.11111111111111e-01
+414 267 -9.72222222222222e-02
+414 393 -1.94444444444444e-01
+414 450 2.22222222222222e-01
+414 405 -2.77777777777778e-02
+414 309 -6.94444444444444e-02
+415 415 1.11111111111111e+00
+415 314 4.16666666666667e-02
+415 280 -9.72222222222222e-02
+415 313 -6.94444444444444e-02
+415 279 8.33333333333333e-02
+415 312 4.16666666666667e-02
+415 332 3.39439983282688e-17
+415 284 1.09639944692597e-17
+415 413 1.66666666666667e-01
+415 338 4.16666666666667e-02
+415 331 -2.22222222222222e-01
+415 283 -9.72222222222222e-02
+415 412 -1.94444444444445e-01
+415 337 -6.94444444444444e-02
+415 330 2.04643160056639e-17
+415 282 -8.33333333333334e-02
+415 411 1.07064964532944e-18
+415 336 -4.16666666666667e-02
+415 329 -2.08166817117217e-17
+415 272 8.45677694538693e-18
+415 410 -1.96088127289371e-17
+415 335 -4.16666666666667e-02
+415 328 1.11111111111111e-01
+415 271 -9.72222222222223e-02
+415 409 -2.77777777777778e-02
+415 334 -6.94444444444445e-02
+415 327 1.32272665043232e-17
+415 270 8.33333333333333e-02
+415 408 8.34835672813838e-18
+415 333 4.16666666666667e-02
+415 305 3.46944695195361e-17
+415 416 1.38777878078145e-17
+415 326 3.37864502000795e-17
+415 269 -2.39608680119296e-17
+415 395 -4.83029008501237e-17
+415 452 -3.19596118910888e-17
+415 407 -1.66666666666667e-01
+415 311 -4.16666666666668e-02
+415 304 1.11111111111111e-01
+415 281 2.37033699959643e-17
+415 325 -2.22222222222222e-01
+415 268 -9.72222222222224e-02
+415 394 -2.77777777777777e-02
+415 451 2.22222222222222e-01
+415 406 -1.94444444444445e-01
+415 310 -6.94444444444445e-02
+415 303 -9.09239046900656e-17
+415 414 8.32667268468867e-17
+415 324 1.82145964977565e-17
+415 267 -8.33333333333334e-02
+415 393 -1.55735477682176e-17
+415 450 -6.93889390390723e-18
+415 405 -1.20617491689012e-18
+415 309 -4.16666666666667e-02
+416 416 1.11111111111111e+00
+416 314 -6.94444444444445e-02
+416 280 2.08166817117217e-17
+416 313 4.16666666666667e-02
+416 279 -1.39184453892827e-17
+416 312 -4.16666666666667e-02
+416 332 1.11111111111111e-01
+416 284 -1.38888888888889e-02
+416 413 -1.94444444444445e-01
+416 338 -6.94444444444445e-02
+416 331 3.20517267241027e-17
+416 283 1.00830802041152e-17
+416 412 1.66666666666667e-01
+416 337 4.16666666666667e-02
+416 330 1.38777878078145e-17
+416 282 8.45677694538693e-18
+416 411 3.63207727782644e-18
+416 336 4.16666666666667e-02
+416 329 1.11111111111111e-01
+416 272 -1.38888888888889e-02
+416 410 -1.94444444444444e-01
+416 335 -6.94444444444445e-02
+416 328 -1.38777878078145e-17
+416 271 1.02863681114562e-17
+416 409 -1.66425033476525e-17
+416 334 -4.16666666666667e-02
+416 327 -1.33627917758838e-17
+416 270 5.74627151417317e-18
+416 408 1.66666666666667e-01
+416 333 4.16666666666667e-02
+416 305 1.11111111111111e-01
+416 281 -1.38888888888888e-02
+416 326 1.11111111111111e-01
+416 269 -1.38888888888889e-02
+416 395 -1.94444444444445e-01
+416 452 -4.44444444444445e-01
+416 407 -1.94444444444445e-01
+416 311 -6.94444444444445e-02
+416 304 3.46944695195361e-17
+416 415 1.38777878078145e-17
+416 325 3.06371817021880e-17
+416 268 -2.27004829864152e-17
+416 394 -4.71356894488073e-17
+416 451 -2.76742604526925e-17
+416 406 -1.66666666666667e-01
+416 310 -4.16666666666668e-02
+416 303 -7.05375157155491e-17
+416 414 5.55111512312578e-17
+416 324 1.38777878078145e-17
+416 267 -1.24005623478030e-17
+416 393 -1.66666666666667e-01
+416 450 3.35187877887472e-17
+416 405 3.51010453342182e-18
+416 309 -4.16666666666667e-02
+417 417 1.11111111111111e+00
+417 260 -1.72117094882074e-17
+417 337 4.16666666666667e-02
+417 259 8.33333333333334e-02
+417 336 -6.94444444444444e-02
+417 258 -9.72222222222223e-02
+417 428 3.21194893598831e-18
+417 362 -4.16666666666667e-02
+417 347 2.08166817117217e-17
+417 263 5.61074624261249e-18
+417 427 -5.67850887839283e-18
+417 361 -4.16666666666667e-02
+417 346 -2.32375018749745e-17
+417 262 -8.33333333333334e-02
+417 426 -2.77777777777778e-02
+417 360 -6.94444444444444e-02
+417 345 1.11111111111111e-01
+417 261 -9.72222222222221e-02
+417 425 -1.66666666666667e-01
+417 359 -4.16666666666667e-02
+417 344 9.97444822862983e-17
+417 251 3.88788122789724e-18
+417 424 1.70897367438028e-17
+417 358 4.16666666666667e-02
+417 343 7.95071711104985e-17
+417 250 8.33333333333334e-02
+417 423 -1.94444444444444e-01
+417 357 -6.94444444444445e-02
+417 342 -2.22222222222222e-01
+417 249 -9.72222222222221e-02
+417 410 1.66666666666667e-01
+417 455 -1.60021464395282e-17
+417 422 8.21283145657770e-18
+417 335 4.16666666666667e-02
+417 320 -7.30311807122658e-17
+417 419 -2.77555756156289e-17
+417 341 2.08166817117217e-17
+417 248 -1.61681648971901e-17
+417 409 6.09863722023096e-18
+417 454 -1.38777878078145e-17
+417 421 -4.21483594553740e-18
+417 334 -4.16666666666667e-02
+417 319 2.16874315814991e-17
+417 418 -1.11022302462516e-16
+417 340 -2.55827243476848e-17
+417 247 -8.33333333333334e-02
+417 408 -1.94444444444444e-01
+417 453 2.22222222222222e-01
+417 420 -2.77777777777778e-02
+417 333 -6.94444444444444e-02
+417 318 -2.22222222222223e-01
+417 338 4.16666666666667e-02
+417 339 1.11111111111111e-01
+417 246 -9.72222222222222e-02
+418 418 1.11111111111111e+00
+418 260 1.70304444374950e-17
+418 337 -6.94444444444444e-02
+418 259 -9.72222222222222e-02
+418 336 4.16666666666667e-02
+418 258 8.33333333333334e-02
+418 428 -1.66666666666667e-01
+418 362 -4.16666666666667e-02
+418 347 9.90266218635003e-18
+418 263 3.52450409352514e-17
+418 427 -1.94444444444445e-01
+418 361 -6.94444444444444e-02
+418 346 -2.22222222222222e-01
+418 262 -9.72222222222221e-02
+418 426 -5.42101086242752e-18
+418 360 -4.16666666666667e-02
+418 345 -2.55795479741326e-17
+418 261 -8.33333333333334e-02
+418 425 3.73914224235938e-17
+418 359 4.16666666666667e-02
+418 344 -5.55111512312578e-17
+418 251 -1.71439468524270e-17
+418 424 -2.77777777777777e-02
+418 358 -6.94444444444445e-02
+418 343 1.11111111111111e-01
+418 250 -9.72222222222223e-02
+418 423 1.52465930505774e-17
+418 357 4.16666666666667e-02
+418 342 7.77728711509953e-17
+418 249 8.33333333333334e-02
+418 410 -1.03541307472366e-17
+418 455 -1.04811856893247e-17
+418 422 1.66666666666667e-01
+418 335 4.16666666666666e-02
+418 320 0.00000000000000e+00
+418 419 1.38777878078145e-17
+418 341 7.81642003726268e-18
+418 248 -3.80012861456169e-17
+418 409 -2.77777777777777e-02
+418 454 2.22222222222222e-01
+418 421 -1.94444444444445e-01
+418 334 -6.94444444444444e-02
+418 319 1.11111111111111e-01
+418 338 -4.16666666666667e-02
+418 340 -2.22222222222222e-01
+418 247 -9.72222222222221e-02
+418 408 6.33750051135668e-18
+418 453 -6.93889390390723e-18
+418 420 -4.79759461324836e-18
+418 333 -4.16666666666667e-02
+418 318 2.36972290070967e-17
+418 417 -1.11022302462516e-16
+418 339 -2.44843343733328e-17
+418 246 -8.33333333333334e-02
+419 419 1.11111111111111e+00
+419 260 -1.38888888888889e-02
+419 337 -4.16666666666667e-02
+419 259 1.52194879962653e-17
+419 336 4.16666666666667e-02
+419 258 -1.69050835613013e-17
+419 428 -1.94444444444444e-01
+419 362 -6.94444444444445e-02
+419 347 1.11111111111111e-01
+419 263 -1.38888888888888e-02
+419 427 -1.66666666666667e-01
+419 361 -4.16666666666667e-02
+419 346 9.55114351323949e-18
+419 262 3.70661617718482e-17
+419 426 4.64851681453160e-18
+419 360 -4.16666666666667e-02
+419 345 2.08166817117217e-17
+419 261 4.90601483049691e-18
+419 425 -1.94444444444444e-01
+419 359 -6.94444444444445e-02
+419 344 1.11111111111111e-01
+419 251 -1.38888888888889e-02
+419 424 3.50010954464422e-17
+419 358 4.16666666666667e-02
+419 343 -5.55111512312578e-17
+419 250 -1.52093236008982e-17
+419 423 -1.66666666666667e-01
+419 357 -4.16666666666667e-02
+419 342 1.01051030607438e-16
+419 249 3.30681662608079e-18
+419 410 -1.94444444444444e-01
+419 455 -4.44444444444445e-01
+419 422 -1.94444444444445e-01
+419 335 -6.94444444444444e-02
+419 320 1.11111111111111e-01
+419 338 -6.94444444444444e-02
+419 341 1.11111111111111e-01
+419 248 -1.38888888888889e-02
+419 409 -9.44102923009643e-18
+419 454 -1.53797889815331e-17
+419 421 1.66666666666667e-01
+419 334 4.16666666666666e-02
+419 319 1.38777878078145e-17
+419 418 1.38777878078145e-17
+419 340 6.63671489997426e-18
+419 247 -3.78352676879551e-17
+419 408 1.66666666666667e-01
+419 453 -1.42091894484277e-17
+419 420 2.72236389247532e-18
+419 333 4.16666666666667e-02
+419 318 -7.17413612918343e-17
+419 417 -2.77555756156289e-17
+419 339 2.08166817117217e-17
+419 246 -1.58733974315456e-17
+420 420 1.11111111111111e+00
+420 275 -8.33333333333333e-02
+420 352 -4.16666666666667e-02
+420 274 8.93111539584934e-18
+420 351 -6.94444444444444e-02
+420 273 -9.72222222222221e-02
+420 329 4.16666666666667e-02
+420 431 6.57297567069337e-18
+420 350 -3.41337337084538e-17
+420 272 8.33333333333333e-02
+420 328 4.16666666666667e-02
+420 430 -5.67850887839283e-18
+420 349 0.00000000000000e+00
+420 271 3.06287113727155e-18
+420 327 -6.94444444444444e-02
+420 429 -2.77777777777778e-02
+420 348 1.11111111111111e-01
+420 270 -9.72222222222222e-02
+420 425 6.19350491032344e-18
+420 359 1.59253629028596e-16
+420 344 4.16666666666667e-02
+420 251 8.33333333333334e-02
+420 424 -1.66666666666667e-01
+420 358 8.84399805722424e-17
+420 343 -4.16666666666667e-02
+420 250 9.03784154720338e-18
+420 423 -1.94444444444444e-01
+420 357 -2.22222222222222e-01
+420 342 -6.94444444444444e-02
+420 249 -9.72222222222222e-02
+420 410 -3.30275086793397e-17
+420 455 3.46944695195361e-17
+420 422 -1.24900090270330e-16
+420 335 -4.37136763418999e-17
+420 320 -4.16666666666667e-02
+420 419 4.45878143434664e-18
+420 341 -3.31585870279273e-17
+420 248 -8.33333333333334e-02
+420 409 1.66666666666667e-01
+420 454 -5.80014280961855e-17
+420 421 -9.71445146547012e-17
+420 334 2.26090034281118e-17
+420 319 4.16666666666667e-02
+420 418 -5.55653613398821e-18
+420 340 0.00000000000000e+00
+420 247 2.95445092002300e-18
+420 408 -1.94444444444445e-01
+420 453 2.22222222222222e-01
+420 353 -4.16666666666667e-02
+420 333 -2.22222222222223e-01
+420 318 -6.94444444444444e-02
+420 417 -2.77777777777778e-02
+420 339 1.11111111111111e-01
+420 246 -9.72222222222223e-02
+421 421 1.11111111111111e+00
+421 275 1.27800331081729e-17
+421 352 -6.94444444444444e-02
+421 274 -1.38888888888888e-02
+421 351 -4.16666666666667e-02
+421 273 7.54875762593032e-18
+421 329 -4.16666666666667e-02
+421 431 -1.66666666666667e-01
+421 350 -3.38169433861807e-17
+421 272 1.59919820441612e-18
+421 328 -6.94444444444444e-02
+421 430 -1.94444444444445e-01
+421 349 1.11111111111111e-01
+421 271 -1.38888888888889e-02
+421 327 4.16666666666667e-02
+421 429 -5.20417042793042e-18
+421 348 6.93889390390723e-18
+421 270 3.12555157536837e-18
+421 425 7.92077449636441e-17
+421 359 -2.77555756156289e-17
+421 344 4.16666666666667e-02
+421 251 -3.11470955364351e-17
+421 424 -1.94444444444444e-01
+421 358 1.11111111111111e-01
+421 343 -6.94444444444444e-02
+421 250 -1.38888888888889e-02
+421 423 -1.66666666666667e-01
+421 357 8.14862635917582e-17
+421 342 -4.16666666666667e-02
+421 249 8.99887803162969e-18
+421 410 3.38457425063873e-17
+421 455 9.03508869012481e-18
+421 422 -1.38777878078145e-17
+421 335 5.55111512312578e-17
+421 320 4.16666666666667e-02
+421 419 1.66666666666667e-01
+421 341 -4.32433612979370e-17
+421 248 1.27292111313376e-17
+421 409 -1.94444444444445e-01
+421 454 -4.44444444444445e-01
+421 353 -4.16666666666667e-02
+421 334 1.11111111111111e-01
+421 319 -6.94444444444444e-02
+421 418 -1.94444444444445e-01
+421 340 1.11111111111111e-01
+421 247 -1.38888888888889e-02
+421 408 1.66666666666667e-01
+421 453 -5.50819172852367e-17
+421 420 -9.71445146547012e-17
+421 333 2.46696228305447e-17
+421 318 4.16666666666667e-02
+421 417 -3.98613704977874e-18
+421 339 6.93889390390723e-18
+421 246 3.45250629300853e-18
+422 422 1.11111111111111e+00
+422 275 -9.72222222222220e-02
+422 352 -4.16666666666667e-02
+422 274 1.32645359540023e-17
+422 351 -4.16666666666667e-02
+422 273 -8.33333333333333e-02
+422 329 -6.94444444444444e-02
+422 431 -1.94444444444445e-01
+422 350 -2.22222222222222e-01
+422 272 -9.72222222222222e-02
+422 328 -4.16666666666667e-02
+422 430 -1.66666666666667e-01
+422 349 -3.80529551553994e-17
+422 271 2.06676039130049e-18
+422 327 4.16666666666667e-02
+422 429 4.54009659728305e-18
+422 348 -2.88202960303276e-17
+422 270 8.33333333333333e-02
+422 425 -2.77777777777777e-02
+422 359 1.11111111111111e-01
+422 344 -6.94444444444445e-02
+422 251 -9.72222222222224e-02
+422 424 7.90247858470372e-17
+422 358 -2.77555756156289e-17
+422 343 4.16666666666667e-02
+422 250 -3.16722559637328e-17
+422 423 5.99021700298241e-18
+422 357 1.59313344851378e-16
+422 342 4.16666666666667e-02
+422 249 8.33333333333334e-02
+422 410 -2.77777777777778e-02
+422 455 2.22222222222222e-01
+422 353 -6.94444444444445e-02
+422 335 1.11111111111111e-01
+422 320 -6.94444444444445e-02
+422 419 -1.94444444444445e-01
+422 341 -2.22222222222222e-01
+422 248 -9.72222222222223e-02
+422 409 3.40710532703570e-17
+422 454 1.82501718815412e-17
+422 421 -1.38777878078145e-17
+422 334 6.24500451351651e-17
+422 319 4.16666666666667e-02
+422 418 1.66666666666667e-01
+422 340 -3.91295340313597e-17
+422 247 1.40404181336873e-17
+422 408 -3.26531201166533e-17
+422 453 3.46944695195361e-17
+422 420 -1.24900090270330e-16
+422 333 -4.24865373595653e-17
+422 318 -4.16666666666667e-02
+422 417 8.32125167382625e-18
+422 339 -3.50146479735983e-17
+422 246 -8.33333333333334e-02
+423 423 2.22222222222222e+00
+423 379 -4.16666666666667e-02
+423 378 -6.94444444444444e-02
+423 446 -1.66666666666667e-01
+423 374 -4.16666666666667e-02
+423 445 6.10541348380900e-18
+423 373 4.16666666666667e-02
+423 444 -1.94444444444444e-01
+423 372 -6.94444444444444e-02
+423 443 1.92242597708836e-17
+423 371 4.16666666666667e-02
+423 442 -1.66666666666667e-01
+423 370 -4.16666666666667e-02
+423 441 -1.94444444444444e-01
+423 369 -6.94444444444444e-02
+423 458 6.10717107717455e-17
+423 437 1.43334915334373e-17
+423 434 1.66666666666667e-01
+423 365 4.16666666666667e-02
+423 457 -1.27387402519942e-17
+423 436 1.66666666666667e-01
+423 433 5.03645790437407e-18
+423 364 4.16666666666667e-02
+423 456 -4.44444444444445e-01
+423 435 -1.94444444444444e-01
+423 432 -1.94444444444444e-01
+423 363 -6.94444444444444e-02
+423 356 4.16666666666667e-02
+423 287 5.82758667710959e-19
+423 355 4.16666666666667e-02
+423 286 -1.06929439261383e-17
+423 354 -6.94444444444444e-02
+423 285 -2.77777777777778e-02
+423 431 1.66666666666667e-01
+423 353 -6.33292653344150e-17
+423 275 2.19550939928315e-18
+423 350 4.16666666666667e-02
+423 430 1.64798730217797e-17
+423 352 -2.08166817117217e-17
+423 274 -6.05289744107923e-18
+423 349 -4.16666666666667e-02
+423 429 -1.94444444444444e-01
+423 351 2.22222222222222e-01
+423 273 -2.77777777777778e-02
+423 348 -6.94444444444444e-02
+423 428 2.65629532258949e-18
+423 362 -2.77555756156289e-17
+423 347 -4.16666666666667e-02
+423 263 1.97019863531350e-18
+423 427 1.66666666666667e-01
+423 361 -4.40846767727973e-17
+423 346 4.16666666666667e-02
+423 262 -1.02728155843002e-17
+423 426 -1.94444444444444e-01
+423 360 2.22222222222222e-01
+423 345 -6.94444444444445e-02
+423 261 -2.77777777777778e-02
+423 455 1.98520805913885e-16
+423 425 -3.19189119579733e-16
+423 359 -2.77555756156289e-17
+423 422 7.07441917546792e-18
+423 419 -1.66666666666667e-01
+423 344 -7.22923562240232e-17
+423 251 2.16162808139297e-18
+423 341 -4.16666666666667e-02
+423 454 1.69877539769533e-16
+423 424 -1.66533453693773e-16
+423 358 -3.55243500496085e-17
+423 421 -1.66666666666667e-01
+423 418 1.74149973955484e-17
+423 343 -2.08166817117217e-17
+423 250 -5.53620734325411e-18
+423 340 -4.16666666666667e-02
+423 453 -4.44444444444444e-01
+423 380 -4.16666666666667e-02
+423 357 2.22222222222222e-01
+423 420 -1.94444444444444e-01
+423 417 -1.94444444444444e-01
+423 342 2.22222222222222e-01
+423 249 -2.77777777777778e-02
+423 339 -6.94444444444444e-02
+424 424 2.22222222222222e+00
+424 379 -6.94444444444444e-02
+424 378 -4.16666666666667e-02
+424 446 -4.30970363562988e-18
+424 374 4.16666666666667e-02
+424 445 -2.77777777777778e-02
+424 373 -6.94444444444444e-02
+424 444 6.15284732885524e-18
+424 372 4.16666666666667e-02
+424 443 2.25226060674918e-17
+424 371 4.16666666666667e-02
+424 442 -1.94444444444444e-01
+424 370 -6.94444444444444e-02
+424 441 -1.66666666666667e-01
+424 369 -4.16666666666667e-02
+424 458 1.38777878078145e-17
+424 437 -3.05338436826230e-17
+424 434 8.45338881359792e-19
+424 365 -4.16666666666667e-02
+424 457 2.22222222222222e-01
+424 436 -1.94444444444444e-01
+424 433 -2.77777777777778e-02
+424 364 -6.94444444444444e-02
+424 456 -1.19414704903911e-17
+424 435 1.66666666666667e-01
+424 432 5.85469173142172e-18
+424 363 4.16666666666667e-02
+424 356 -4.16666666666667e-02
+424 287 -1.66666666666667e-01
+424 355 -6.94444444444445e-02
+424 286 -1.94444444444445e-01
+424 354 4.16666666666667e-02
+424 285 -6.50013083722950e-18
+424 431 -6.03900610074426e-17
+424 353 3.12385750947386e-18
+424 275 1.66666666666667e-01
+424 350 4.16666666666667e-02
+424 430 -2.77777777777778e-02
+424 352 2.22222222222222e-01
+424 274 -1.94444444444445e-01
+424 349 -6.94444444444444e-02
+424 429 1.77368699155050e-17
+424 351 -2.08166817117217e-17
+424 273 -1.02728155843002e-17
+424 348 -4.16666666666667e-02
+424 428 -1.97799133842824e-17
+424 362 -3.08800683998132e-17
+424 347 4.16666666666667e-02
+424 263 1.66666666666667e-01
+424 427 -1.94444444444445e-01
+424 361 -4.44444444444445e-01
+424 346 -6.94444444444445e-02
+424 262 -1.94444444444445e-01
+424 426 1.66666666666667e-01
+424 360 -3.72302744053787e-17
+424 345 4.16666666666667e-02
+424 261 -6.71527720583209e-18
+424 455 -6.93889390390723e-17
+424 425 1.80411241501588e-16
+424 359 -4.23736702193436e-17
+424 422 7.92416262815343e-17
+424 419 3.50010954464422e-17
+424 344 7.09601851562290e-18
+424 251 -1.66666666666667e-01
+424 341 -4.16666666666667e-02
+424 454 2.22222222222223e-01
+424 380 -4.16666666666667e-02
+424 358 -4.44444444444445e-01
+424 421 -1.94444444444444e-01
+424 418 -2.77777777777777e-02
+424 343 2.22222222222222e-01
+424 250 -1.94444444444445e-01
+424 340 -6.94444444444444e-02
+424 453 1.71886278403947e-16
+424 423 -1.66533453693773e-16
+424 357 -4.45200517076860e-17
+424 420 -1.66666666666667e-01
+424 417 1.80655186990397e-17
+424 342 -2.08166817117217e-17
+424 249 -1.02728155843002e-17
+424 339 -4.16666666666667e-02
+425 425 2.22222222222222e+00
+425 379 -4.16666666666667e-02
+425 378 -4.16666666666667e-02
+425 446 -1.94444444444444e-01
+425 374 -6.94444444444444e-02
+425 445 -2.99680256738571e-18
+425 373 4.16666666666667e-02
+425 444 -1.66666666666667e-01
+425 372 -4.16666666666667e-02
+425 443 -2.77777777777778e-02
+425 371 -6.94444444444445e-02
+425 442 2.23616698075135e-17
+425 370 4.16666666666667e-02
+425 441 2.04101058970396e-17
+425 369 4.16666666666667e-02
+425 458 2.22222222222222e-01
+425 437 -2.77777777777778e-02
+425 434 -1.94444444444444e-01
+425 365 -6.94444444444444e-02
+425 457 1.38777878078145e-17
+425 436 -2.60682859846983e-17
+425 433 3.80826013085533e-18
+425 364 -4.16666666666667e-02
+425 456 5.83808988565554e-17
+425 435 1.42437060410283e-17
+425 432 1.66666666666667e-01
+425 363 4.16666666666667e-02
+425 356 -6.94444444444445e-02
+425 287 -1.94444444444444e-01
+425 355 -4.16666666666667e-02
+425 286 -1.66666666666667e-01
+425 354 4.16666666666667e-02
+425 285 -1.40438062654763e-18
+425 431 -1.94444444444445e-01
+425 353 -4.44444444444445e-01
+425 275 -1.94444444444444e-01
+425 350 -6.94444444444445e-02
+425 430 -6.02342069451478e-17
+425 352 1.07278840352125e-17
+425 274 1.66666666666667e-01
+425 349 4.16666666666667e-02
+425 429 1.66666666666667e-01
+425 351 -6.87958042177575e-17
+425 273 1.94478764689587e-18
+425 348 4.16666666666667e-02
+425 428 -2.77777777777778e-02
+425 362 2.22222222222222e-01
+425 347 -6.94444444444445e-02
+425 263 -1.94444444444445e-01
+425 427 -2.16975959768662e-17
+425 361 -3.37390163550333e-17
+425 346 4.16666666666667e-02
+425 262 1.66666666666667e-01
+425 426 3.72355683612990e-18
+425 360 -3.46944695195361e-17
+425 345 -4.16666666666667e-02
+425 261 2.30392961653170e-18
+425 455 2.22222222222223e-01
+425 380 -6.94444444444444e-02
+425 359 2.22222222222222e-01
+425 422 -2.77777777777777e-02
+425 419 -1.94444444444444e-01
+425 344 -4.44444444444445e-01
+425 251 -1.94444444444444e-01
+425 341 -6.94444444444445e-02
+425 454 -6.93889390390723e-17
+425 424 1.80411241501588e-16
+425 358 -3.93772911684315e-17
+425 421 7.92229915566947e-17
+425 418 3.39219754716402e-17
+425 343 2.29545928705915e-18
+425 250 -1.66666666666667e-01
+425 340 -4.16666666666667e-02
+425 453 1.90172025669273e-16
+425 423 -3.19189119579733e-16
+425 357 -2.77555756156289e-17
+425 420 6.22060996463558e-18
+425 417 -1.66666666666667e-01
+425 342 -6.59330446142747e-17
+425 249 2.30392961653170e-18
+425 339 -4.16666666666667e-02
+426 426 1.11111111111111e+00
+426 329 4.16666666666667e-02
+426 283 2.60208521396521e-18
+426 328 -4.16666666666667e-02
+426 282 -9.72222222222222e-02
+426 327 -6.94444444444444e-02
+426 356 1.81061762805079e-17
+426 287 -8.33333333333333e-02
+426 353 -4.16666666666667e-02
+426 431 5.61074624261249e-18
+426 355 -1.38777878078145e-17
+426 286 8.18572640226556e-18
+426 352 4.16666666666667e-02
+426 430 -3.98783111567325e-18
+426 354 1.11111111111111e-01
+426 285 -9.72222222222222e-02
+426 351 -6.94444444444445e-02
+426 429 -2.77777777777778e-02
+426 338 -1.04408669210354e-16
+426 410 -2.92870111842647e-17
+426 260 -8.33333333333334e-02
+426 320 -4.16666666666667e-02
+426 337 2.45029690981724e-17
+426 409 -1.66666666666667e-01
+426 259 2.71050543121376e-18
+426 319 -4.16666666666667e-02
+426 336 -2.22222222222222e-01
+426 408 -1.94444444444445e-01
+426 258 -9.72222222222223e-02
+426 318 -6.94444444444444e-02
+426 428 1.11022302462516e-16
+426 362 3.43014462320101e-17
+426 425 3.80656606496083e-18
+426 455 3.46944695195361e-17
+426 347 1.90548531814327e-17
+426 263 8.33333333333334e-02
+426 344 4.16666666666667e-02
+426 419 2.91548740444930e-18
+426 427 -1.24900090270330e-16
+426 361 8.30261694898665e-17
+426 424 1.66666666666667e-01
+426 454 -5.30642848048770e-17
+426 346 -1.38777878078145e-17
+426 262 7.94178091345632e-18
+426 343 4.16666666666667e-02
+426 418 -4.87721571029026e-18
+426 284 8.33333333333334e-02
+426 360 -2.22222222222222e-01
+426 423 -1.94444444444444e-01
+426 453 2.22222222222222e-01
+426 345 1.11111111111111e-01
+426 261 -9.72222222222222e-02
+426 342 -6.94444444444444e-02
+426 417 -2.77777777777778e-02
+427 427 1.11111111111111e+00
+427 329 4.16666666666666e-02
+427 283 -1.38888888888888e-02
+427 328 -6.94444444444444e-02
+427 282 2.77826806699411e-18
+427 327 -4.16666666666667e-02
+427 356 2.08437867660338e-17
+427 287 2.46113893154210e-17
+427 353 4.16666666666667e-02
+427 431 1.66666666666667e-01
+427 355 1.11111111111111e-01
+427 286 -1.38888888888888e-02
+427 352 -6.94444444444445e-02
+427 430 -1.94444444444445e-01
+427 354 -1.38777878078145e-17
+427 285 7.91467585914418e-18
+427 351 4.16666666666667e-02
+427 429 -4.79759461324836e-18
+427 338 0.00000000000000e+00
+427 410 -6.97684097994422e-17
+427 260 2.16840434497101e-18
+427 320 -4.16666666666667e-02
+427 337 1.11111111111111e-01
+427 409 -1.94444444444444e-01
+427 259 -1.38888888888889e-02
+427 319 -6.94444444444444e-02
+427 336 2.51331616109296e-17
+427 408 -1.66666666666667e-01
+427 258 2.77826806699411e-18
+427 318 -4.16666666666667e-02
+427 428 5.55111512312578e-17
+427 362 -4.16333634234434e-17
+427 425 -2.06269463315367e-17
+427 455 1.78300435397030e-17
+427 347 2.99510850149121e-17
+427 263 -2.92056960213283e-17
+427 344 -4.16666666666667e-02
+427 419 -1.66666666666667e-01
+427 284 -1.19262238973405e-17
+427 361 1.11111111111111e-01
+427 424 -1.94444444444445e-01
+427 454 -4.44444444444445e-01
+427 346 1.11111111111111e-01
+427 262 -1.38888888888889e-02
+427 343 -6.94444444444445e-02
+427 418 -1.94444444444445e-01
+427 426 -1.24900090270330e-16
+427 360 8.35377773900081e-17
+427 423 1.66666666666667e-01
+427 453 -6.09829840705206e-17
+427 345 -1.38777878078145e-17
+427 261 7.80625564189563e-18
+427 342 4.16666666666667e-02
+427 417 -4.81114714040443e-18
+428 428 1.11111111111111e+00
+428 329 -6.94444444444444e-02
+428 283 -1.14654379740342e-17
+428 328 4.16666666666666e-02
+428 282 8.33333333333333e-02
+428 327 4.16666666666667e-02
+428 356 -2.22222222222222e-01
+428 287 -9.72222222222222e-02
+428 353 -6.94444444444445e-02
+428 431 -1.94444444444445e-01
+428 355 2.30155792427938e-17
+428 286 2.17653586126465e-17
+428 352 4.16666666666667e-02
+428 430 1.66666666666667e-01
+428 354 1.54634334850745e-17
+428 285 -8.33333333333333e-02
+428 351 -4.16666666666667e-02
+428 429 1.86686061574848e-18
+428 338 1.11111111111111e-01
+428 410 -2.77777777777778e-02
+428 260 -9.72222222222223e-02
+428 320 -6.94444444444445e-02
+428 337 6.93889390390723e-18
+428 409 -7.08915754875014e-17
+428 259 5.09575021068187e-18
+428 319 -4.16666666666667e-02
+428 336 -1.05357346111279e-16
+428 408 -2.79893567090711e-17
+428 258 -8.33333333333333e-02
+428 318 -4.16666666666667e-02
+428 284 -9.72222222222221e-02
+428 362 1.11111111111111e-01
+428 425 -2.77777777777778e-02
+428 455 2.22222222222222e-01
+428 347 -2.22222222222222e-01
+428 263 -9.72222222222223e-02
+428 344 -6.94444444444445e-02
+428 419 -1.94444444444444e-01
+428 427 5.55111512312578e-17
+428 361 -4.16333634234434e-17
+428 424 -1.89379626347116e-17
+428 454 1.45933188900075e-17
+428 346 2.08573392931899e-17
+428 262 -2.81892564846231e-17
+428 343 -4.16666666666667e-02
+428 418 -1.66666666666667e-01
+428 426 1.24900090270330e-16
+428 360 3.82723366887383e-17
+428 423 1.78893358460108e-18
+428 453 3.46944695195361e-17
+428 345 1.81061762805079e-17
+428 261 8.33333333333334e-02
+428 342 4.16666666666667e-02
+428 417 3.21194893598831e-18
+429 429 1.11111111111111e+00
+429 338 -4.16666666666667e-02
+429 283 8.33333333333334e-02
+429 337 4.16666666666667e-02
+429 282 -9.72222222222223e-02
+429 336 -6.94444444444444e-02
+429 356 1.38777878078145e-17
+429 287 4.93311988480905e-18
+429 428 3.60158409172529e-18
+429 362 4.16666666666667e-02
+429 355 -3.48028897367847e-17
+429 286 -8.33333333333333e-02
+429 427 -5.55653613398821e-18
+429 361 -4.16666666666667e-02
+429 354 1.11111111111111e-01
+429 285 -9.72222222222222e-02
+429 426 -2.77777777777778e-02
+429 360 -6.94444444444444e-02
+429 353 9.46542377897736e-17
+429 275 2.30392961653170e-18
+429 425 1.66666666666667e-01
+429 359 4.16666666666667e-02
+429 352 9.19810018082390e-17
+429 274 8.33333333333334e-02
+429 424 1.66543618089141e-17
+429 358 4.16666666666667e-02
+429 351 -2.22222222222222e-01
+429 273 -9.72222222222223e-02
+429 423 -1.94444444444444e-01
+429 357 -6.94444444444444e-02
+429 329 -7.68428289749101e-17
+429 431 2.77555756156289e-17
+429 350 1.38777878078145e-17
+429 272 -1.65882932390282e-17
+429 410 -1.66666666666667e-01
+429 455 -1.40872167040231e-17
+429 422 2.80706718720075e-18
+429 335 -4.16666666666667e-02
+429 328 2.54787510534094e-17
+429 430 -1.11022302462516e-16
+429 349 -2.75658402354440e-17
+429 271 -8.33333333333333e-02
+429 409 5.66495635123676e-18
+429 454 -1.38777878078145e-17
+429 421 -4.66037527579316e-18
+429 334 -4.16666666666667e-02
+429 327 -2.22222222222222e-01
+429 284 -1.68051336735253e-17
+429 348 1.11111111111111e-01
+429 270 -9.72222222222223e-02
+429 408 -1.94444444444445e-01
+429 453 2.22222222222222e-01
+429 420 -2.77777777777778e-02
+429 333 -6.94444444444444e-02
+430 430 1.11111111111111e+00
+430 338 4.16666666666667e-02
+430 283 -9.72222222222223e-02
+430 337 -6.94444444444444e-02
+430 282 8.33333333333334e-02
+430 336 4.16666666666667e-02
+430 356 4.81453527219344e-18
+430 287 4.49672851038363e-17
+430 428 1.66666666666667e-01
+430 362 4.16666666666667e-02
+430 355 -2.22222222222222e-01
+430 286 -9.72222222222221e-02
+430 427 -1.94444444444445e-01
+430 361 -6.94444444444444e-02
+430 354 -2.95309566730739e-17
+430 285 -8.33333333333333e-02
+430 426 -3.97427858851718e-18
+430 360 -4.16666666666667e-02
+430 353 -1.38777878078145e-17
+430 275 -6.93889390390723e-18
+430 425 -6.02325128792533e-17
+430 359 -4.16666666666667e-02
+430 352 1.11111111111111e-01
+430 274 -9.72222222222224e-02
+430 424 -2.77777777777778e-02
+430 358 -6.94444444444445e-02
+430 351 8.72782748850831e-17
+430 273 8.33333333333334e-02
+430 423 1.63714528045311e-17
+430 357 4.16666666666667e-02
+430 329 5.55111512312578e-17
+430 431 0.00000000000000e+00
+430 350 3.51010453342182e-18
+430 272 -3.17671236538253e-17
+430 410 1.49094739375702e-17
+430 455 -1.50528342638930e-17
+430 422 -1.66666666666667e-01
+430 335 -4.16666666666667e-02
+430 328 1.11111111111111e-01
+430 284 1.95427441590512e-17
+430 349 -2.22222222222222e-01
+430 271 -9.72222222222222e-02
+430 409 -2.77777777777778e-02
+430 454 2.22222222222222e-01
+430 421 -1.94444444444445e-01
+430 334 -6.94444444444444e-02
+430 327 2.61563774112128e-17
+430 429 -1.11022302462516e-16
+430 348 -3.65376132127615e-17
+430 270 -8.33333333333333e-02
+430 408 6.25787941431477e-18
+430 453 -6.93889390390723e-18
+430 420 -4.81114714040443e-18
+430 333 -4.16666666666667e-02
+431 431 1.11111111111111e+00
+431 338 -6.94444444444445e-02
+431 283 1.88651178012478e-17
+431 337 4.16666666666667e-02
+431 282 -1.80384136447276e-17
+431 336 -4.16666666666667e-02
+431 356 1.11111111111111e-01
+431 287 -1.38888888888888e-02
+431 428 -1.94444444444445e-01
+431 362 -6.94444444444445e-02
+431 355 1.26038502551440e-17
+431 286 4.36933475511658e-17
+431 427 1.66666666666667e-01
+431 361 4.16666666666667e-02
+431 354 1.38777878078145e-17
+431 285 3.79470760369927e-18
+431 426 5.71916645986104e-18
+431 360 4.16666666666667e-02
+431 353 1.11111111111111e-01
+431 275 -1.38888888888889e-02
+431 425 -1.94444444444445e-01
+431 359 -6.94444444444445e-02
+431 352 -1.38777878078145e-17
+431 274 -5.48877349820787e-18
+431 424 -5.98615124483559e-17
+431 358 -4.16666666666667e-02
+431 351 9.73884601435104e-17
+431 273 2.05998412772246e-18
+431 423 1.66666666666667e-01
+431 357 4.16666666666667e-02
+431 329 1.11111111111111e-01
+431 284 -1.38888888888889e-02
+431 350 1.11111111111111e-01
+431 272 -1.38888888888889e-02
+431 410 -1.94444444444445e-01
+431 455 -4.44444444444445e-01
+431 422 -1.94444444444445e-01
+431 335 -6.94444444444445e-02
+431 328 5.55111512312578e-17
+431 430 1.38777878078145e-17
+431 349 -2.12774676350280e-18
+431 271 -3.39355279987963e-17
+431 409 1.91361683443692e-17
+431 454 -1.40455003313708e-17
+431 421 -1.66666666666667e-01
+431 334 -4.16666666666667e-02
+431 327 -7.69851305100488e-17
+431 429 2.77555756156289e-17
+431 348 1.38777878078145e-17
+431 270 -1.65205306032479e-17
+431 408 -1.66666666666667e-01
+431 453 -1.68830607046727e-17
+431 420 6.57297567069337e-18
+431 333 -4.16666666666667e-02
+432 432 1.11111111111111e+00
+432 263 5.93600689435814e-18
+432 361 4.16666666666667e-02
+432 262 8.33333333333334e-02
+432 360 -6.94444444444444e-02
+432 261 -9.72222222222222e-02
+432 443 -9.89334482393023e-18
+432 386 -4.16666666666667e-02
+432 371 -4.16333634234434e-17
+432 266 9.55453164502851e-18
+432 442 -1.20617491689012e-18
+432 385 -4.16666666666667e-02
+432 370 4.68409219831628e-18
+432 265 -8.33333333333334e-02
+432 441 -2.77777777777778e-02
+432 384 -6.94444444444444e-02
+432 369 1.11111111111111e-01
+432 264 -9.72222222222222e-02
+432 440 -1.66666666666667e-01
+432 383 -4.16666666666667e-02
+432 368 3.95865083064034e-17
+432 254 7.73510487432627e-18
+432 439 2.92395773392184e-18
+432 382 4.16666666666667e-02
+432 367 -4.44946407192684e-18
+432 253 8.33333333333334e-02
+432 438 -1.94444444444444e-01
+432 381 -6.94444444444444e-02
+432 366 -2.22222222222223e-01
+432 252 -9.72222222222222e-02
+432 425 1.66666666666667e-01
+432 458 -3.01221856702574e-17
+432 437 -1.09639944692597e-17
+432 359 4.16666666666667e-02
+432 344 3.01357381974135e-17
+432 434 -1.11022302462516e-16
+432 365 -4.16333634234434e-17
+432 251 7.90112333198811e-18
+432 424 6.72205346941013e-18
+432 457 -6.93889390390723e-18
+432 436 -2.83925443919641e-18
+432 358 -4.16666666666667e-02
+432 343 -3.30851069197530e-18
+432 433 1.38777878078145e-17
+432 364 2.14871082894735e-18
+432 250 -8.33333333333334e-02
+432 423 -1.94444444444444e-01
+432 456 2.22222222222222e-01
+432 435 -2.77777777777778e-02
+432 357 -6.94444444444444e-02
+432 342 -2.22222222222223e-01
+432 362 4.16666666666667e-02
+432 363 1.11111111111111e-01
+432 249 -9.72222222222222e-02
+433 433 1.11111111111111e+00
+433 263 -1.26902476157639e-17
+433 361 -6.94444444444444e-02
+433 262 -9.72222222222222e-02
+433 360 4.16666666666667e-02
+433 261 8.33333333333334e-02
+433 443 -1.66666666666667e-01
+433 386 -4.16666666666667e-02
+433 371 3.94272661123195e-18
+433 266 1.81265050712420e-17
+433 442 -1.94444444444444e-01
+433 385 -6.94444444444444e-02
+433 370 -2.22222222222222e-01
+433 265 -9.72222222222222e-02
+433 441 -3.48638761089870e-18
+433 384 -4.16666666666667e-02
+433 369 3.82922419629988e-18
+433 264 -8.33333333333334e-02
+433 440 -7.92822838630025e-18
+433 383 4.16666666666667e-02
+433 368 -6.93889390390723e-18
+433 254 -8.90401034153721e-18
+433 439 -2.77777777777778e-02
+433 382 -6.94444444444444e-02
+433 367 1.11111111111111e-01
+433 253 -9.72222222222222e-02
+433 438 3.67273485929465e-18
+433 381 4.16666666666667e-02
+433 366 -5.85469173142172e-18
+433 252 8.33333333333334e-02
+433 425 2.98155597433514e-18
+433 458 -1.67407591695340e-17
+433 437 1.66666666666667e-01
+433 359 4.16666666666667e-02
+433 344 6.93889390390723e-18
+433 434 5.55111512312578e-17
+433 365 1.46197886696092e-18
+433 251 9.17506088465858e-18
+433 424 -2.77777777777778e-02
+433 457 2.22222222222222e-01
+433 436 -1.94444444444444e-01
+433 358 -6.94444444444444e-02
+433 343 1.11111111111111e-01
+433 362 -4.16666666666667e-02
+433 364 -2.22222222222222e-01
+433 250 -9.72222222222222e-02
+433 423 5.03476383847956e-18
+433 456 0.00000000000000e+00
+433 435 -2.49366499671666e-18
+433 357 -4.16666666666667e-02
+433 342 -5.17812416480235e-18
+433 432 1.38777878078145e-17
+433 363 4.68409219831628e-18
+433 249 -8.33333333333334e-02
+434 434 1.11111111111111e+00
+434 263 -1.38888888888889e-02
+434 361 -4.16666666666667e-02
+434 262 -1.34576594659763e-17
+434 360 4.16666666666667e-02
+434 261 6.52554182564713e-18
+434 443 -1.94444444444444e-01
+434 386 -6.94444444444444e-02
+434 371 1.11111111111111e-01
+434 266 -1.38888888888889e-02
+434 442 -1.66666666666667e-01
+434 385 -4.16666666666666e-02
+434 370 5.63615723103011e-18
+434 265 1.79028883731669e-17
+434 441 -1.00051531729678e-17
+434 384 -4.16666666666667e-02
+434 369 -2.77555756156289e-17
+434 264 9.79847713383775e-18
+434 440 -1.94444444444444e-01
+434 383 -6.94444444444444e-02
+434 368 1.11111111111111e-01
+434 254 -1.38888888888889e-02
+434 439 -8.39748463907913e-18
+434 382 4.16666666666667e-02
+434 367 -6.93889390390723e-18
+434 253 -1.07945878798088e-17
+434 438 -1.66666666666667e-01
+434 381 -4.16666666666667e-02
+434 366 4.17959937493162e-17
+434 252 8.07730618501701e-18
+434 425 -1.94444444444444e-01
+434 458 -4.44444444444445e-01
+434 437 -1.94444444444444e-01
+434 359 -6.94444444444444e-02
+434 344 1.11111111111111e-01
+434 362 -6.94444444444444e-02
+434 365 1.11111111111111e-01
+434 251 -1.38888888888889e-02
+434 424 7.35224598216733e-19
+434 457 -1.05523364568941e-17
+434 436 1.66666666666667e-01
+434 358 4.16666666666667e-02
+434 343 6.93889390390723e-18
+434 433 5.55111512312578e-17
+434 364 3.92875056760226e-18
+434 250 9.24282352043893e-18
+434 423 1.66666666666667e-01
+434 456 -2.78178325372521e-17
+434 435 -1.10774968841917e-17
+434 357 4.16666666666667e-02
+434 342 3.14916261877308e-17
+434 432 -1.11022302462516e-16
+434 363 -3.46944695195361e-17
+434 249 7.99090882439707e-18
+435 435 1.11111111111111e+00
+435 278 -8.33333333333333e-02
+435 376 -4.16666666666667e-02
+435 277 1.74488787134386e-18
+435 375 -6.94444444444444e-02
+435 276 -9.72222222222222e-02
+435 353 4.16666666666667e-02
+435 446 -9.87979229677416e-18
+435 374 -3.52145477491503e-17
+435 275 8.33333333333334e-02
+435 352 4.16666666666667e-02
+435 445 -7.72494047895922e-19
+435 373 -6.93889390390723e-18
+435 274 3.25260651745651e-18
+435 351 -6.94444444444444e-02
+435 444 -2.77777777777778e-02
+435 372 1.11111111111111e-01
+435 273 -9.72222222222223e-02
+435 440 1.39828198932740e-17
+435 383 8.59153988729509e-17
+435 368 4.16666666666667e-02
+435 254 8.33333333333334e-02
+435 439 -1.66666666666667e-01
+435 382 -3.46521178721734e-18
+435 367 -4.16666666666667e-02
+435 253 1.43317974675428e-18
+435 438 -1.94444444444444e-01
+435 381 -2.22222222222222e-01
+435 366 -6.94444444444444e-02
+435 252 -9.72222222222223e-02
+435 425 1.42843636224965e-17
+435 458 -4.85722573273506e-17
+435 437 -1.24900090270330e-16
+435 359 7.37342180584868e-17
+435 344 -4.16666666666667e-02
+435 434 -1.08623505155891e-17
+435 365 -3.61507309141031e-17
+435 251 -8.33333333333333e-02
+435 424 1.66666666666667e-01
+435 457 9.80694746331029e-18
+435 436 1.38777878078145e-17
+435 358 -3.05101267600999e-18
+435 343 4.16666666666667e-02
+435 433 -2.50721752387273e-18
+435 364 -6.93889390390723e-18
+435 250 3.78115507654320e-18
+435 423 -1.94444444444444e-01
+435 456 2.22222222222222e-01
+435 377 -4.16666666666667e-02
+435 357 -2.22222222222222e-01
+435 342 -6.94444444444444e-02
+435 432 -2.77777777777778e-02
+435 363 1.11111111111111e-01
+435 249 -9.72222222222222e-02
+436 436 1.11111111111111e+00
+436 278 -2.58853268680914e-18
+436 376 -6.94444444444444e-02
+436 277 -1.38888888888889e-02
+436 375 -4.16666666666667e-02
+436 276 1.61275073157219e-18
+436 353 -4.16666666666667e-02
+436 446 -1.66666666666667e-01
+436 374 1.64781789558852e-17
+436 275 9.48676900924816e-18
+436 352 -6.94444444444444e-02
+436 445 -1.94444444444444e-01
+436 373 1.11111111111111e-01
+436 274 -1.38888888888889e-02
+436 351 4.16666666666667e-02
+436 444 -3.26954717640160e-18
+436 372 0.00000000000000e+00
+436 273 2.75793927626000e-18
+436 440 3.61327314639739e-17
+436 383 6.93889390390723e-18
+436 368 4.16666666666667e-02
+436 254 -4.54687286086108e-18
+436 439 -1.94444444444444e-01
+436 382 1.11111111111111e-01
+436 367 -6.94444444444444e-02
+436 253 -1.38888888888889e-02
+436 438 -1.66666666666667e-01
+436 381 -5.71916645986104e-18
+436 366 -4.16666666666667e-02
+436 252 1.40946282423116e-18
+436 425 -2.61767062019469e-17
+436 458 3.50332826984379e-18
+436 437 5.55111512312578e-17
+436 359 1.38777878078145e-17
+436 344 4.16666666666667e-02
+436 434 1.66666666666667e-01
+436 365 1.74135150878907e-17
+436 251 4.54009659728305e-18
+436 424 -1.94444444444444e-01
+436 457 -4.44444444444445e-01
+436 377 -4.16666666666667e-02
+436 358 1.11111111111111e-01
+436 343 -6.94444444444444e-02
+436 433 -1.94444444444444e-01
+436 364 1.11111111111111e-01
+436 250 -1.38888888888889e-02
+436 423 1.66666666666667e-01
+436 456 1.83848501201546e-18
+436 435 1.38777878078145e-17
+436 357 -3.01480201751487e-18
+436 342 4.16666666666667e-02
+436 432 -3.70492211129031e-18
+436 363 0.00000000000000e+00
+436 249 3.92515067757643e-18
+437 437 1.11111111111111e+00
+437 278 -9.72222222222221e-02
+437 376 -4.16666666666666e-02
+437 277 -2.20228566286118e-18
+437 375 -4.16666666666667e-02
+437 276 -8.33333333333333e-02
+437 353 -6.94444444444444e-02
+437 446 -1.94444444444444e-01
+437 374 -2.22222222222222e-01
+437 275 -9.72222222222223e-02
+437 352 -4.16666666666667e-02
+437 445 -1.66666666666667e-01
+437 373 1.74137268461275e-17
+437 274 7.28448334638698e-18
+437 351 4.16666666666667e-02
+437 444 -9.99160064581173e-18
+437 372 -3.62049410227274e-17
+437 273 8.33333333333334e-02
+437 440 -2.77777777777778e-02
+437 383 1.11111111111111e-01
+437 368 -6.94444444444445e-02
+437 254 -9.72222222222223e-02
+437 439 3.69712940817557e-17
+437 382 6.93889390390723e-18
+437 367 4.16666666666667e-02
+437 253 -4.02510056535244e-18
+437 438 1.50026475617682e-17
+437 381 8.71698546678346e-17
+437 366 4.16666666666667e-02
+437 252 8.33333333333334e-02
+437 425 -2.77777777777778e-02
+437 458 2.22222222222222e-01
+437 377 -6.94444444444444e-02
+437 359 1.11111111111111e-01
+437 344 -6.94444444444444e-02
+437 434 -1.94444444444444e-01
+437 365 -2.22222222222222e-01
+437 251 -9.72222222222222e-02
+437 424 -3.03712133567502e-17
+437 457 -2.87991202066462e-20
+437 436 5.55111512312578e-17
+437 358 1.38777878078145e-17
+437 343 4.16666666666667e-02
+437 433 1.66666666666667e-01
+437 364 1.93513147129717e-17
+437 250 4.18773089122526e-18
+437 423 1.39523267071728e-17
+437 456 -4.16333634234434e-17
+437 435 -1.24900090270330e-16
+437 357 6.86729844404056e-17
+437 342 -4.16666666666667e-02
+437 432 -1.00830802041152e-17
+437 363 -3.52281002763064e-17
+437 249 -8.33333333333333e-02
+438 438 1.11111111111111e+00
+438 290 -6.61363325216158e-18
+438 379 4.16666666666667e-02
+438 289 -5.42101086242752e-19
+438 378 -6.94444444444444e-02
+438 288 -1.38888888888889e-02
+438 446 1.66666666666667e-01
+438 377 -1.53143556863578e-17
+438 278 -6.61363325216158e-18
+438 374 4.16666666666667e-02
+438 445 3.14418630020796e-18
+438 376 -1.38777878078145e-17
+438 277 -8.67361737988404e-19
+438 373 -4.16666666666667e-02
+438 444 -1.94444444444445e-01
+438 375 1.11111111111111e-01
+438 276 -1.38888888888889e-02
+438 372 -6.94444444444444e-02
+438 443 1.21430643318376e-17
+438 386 -2.77555756156289e-17
+438 371 -4.16666666666667e-02
+438 266 -6.08508469307489e-18
+438 442 1.66666666666667e-01
+438 385 5.27193306371077e-18
+438 370 4.16666666666667e-02
+438 265 -1.40946282423116e-18
+438 441 -1.94444444444444e-01
+438 384 1.11111111111111e-01
+438 369 -6.94444444444444e-02
+438 264 -1.38888888888889e-02
+438 458 8.03800385626441e-17
+438 440 -1.80411241501588e-16
+438 383 -2.77555756156289e-17
+438 437 1.50568576703924e-17
+438 434 -1.66666666666667e-01
+438 368 -1.17178537923160e-17
+438 254 -2.64274279543342e-18
+438 365 -4.16666666666667e-02
+438 457 -5.74627151417317e-18
+438 439 4.16333634234434e-17
+438 382 1.89227160416611e-18
+438 436 -1.66666666666667e-01
+438 433 3.99799551104030e-18
+438 367 -1.38777878078145e-17
+438 253 -9.08019319456610e-19
+438 364 -4.16666666666667e-02
+438 456 -4.44444444444445e-01
+438 380 4.16666666666667e-02
+438 381 1.11111111111111e-01
+438 435 -1.94444444444444e-01
+438 432 -1.94444444444444e-01
+438 366 1.11111111111111e-01
+438 252 -1.38888888888889e-02
+438 363 -6.94444444444444e-02
+439 439 1.11111111111111e+00
+439 290 -8.33333333333334e-02
+439 379 -6.94444444444444e-02
+439 289 -9.72222222222223e-02
+439 378 4.16666666666667e-02
+439 288 -8.94466792300541e-19
+439 446 -6.66784336078585e-18
+439 377 1.38777878078145e-17
+439 278 8.33333333333333e-02
+439 374 4.16666666666667e-02
+439 445 -2.77777777777778e-02
+439 376 1.11111111111111e-01
+439 277 -9.72222222222223e-02
+439 373 -6.94444444444445e-02
+439 444 1.71608875113721e-18
+439 375 -6.93889390390723e-18
+439 276 -9.75781955236954e-19
+439 372 -4.16666666666667e-02
+439 443 -1.76115090393114e-17
+439 386 -1.79977560632594e-17
+439 371 4.16666666666667e-02
+439 266 8.33333333333334e-02
+439 442 -1.94444444444444e-01
+439 385 -2.22222222222222e-01
+439 370 -6.94444444444444e-02
+439 265 -9.72222222222223e-02
+439 441 1.66666666666667e-01
+439 384 1.07911997480198e-18
+439 369 4.16666666666667e-02
+439 264 -2.30392961653170e-19
+439 458 -6.93889390390723e-18
+439 440 9.71445146547012e-17
+439 383 -2.67797936603920e-17
+439 437 3.69170839731314e-17
+439 434 -8.28906442183058e-18
+439 368 1.38913403349705e-17
+439 254 -8.33333333333334e-02
+439 365 -4.16666666666666e-02
+439 457 2.22222222222222e-01
+439 380 -4.16666666666667e-02
+439 382 -2.22222222222222e-01
+439 436 -1.94444444444444e-01
+439 433 -2.77777777777778e-02
+439 367 1.11111111111111e-01
+439 253 -9.72222222222223e-02
+439 364 -6.94444444444444e-02
+439 456 -9.44695846072721e-18
+439 438 4.16333634234434e-17
+439 381 5.27193306371077e-18
+439 435 -1.66666666666667e-01
+439 432 2.04304346877737e-18
+439 366 -6.93889390390723e-18
+439 252 -5.42101086242752e-19
+439 363 -4.16666666666667e-02
+440 440 1.11111111111111e+00
+440 290 -9.72222222222222e-02
+440 379 -4.16666666666667e-02
+440 289 -8.33333333333334e-02
+440 378 4.16666666666667e-02
+440 288 -2.64274279543342e-18
+440 446 -1.94444444444444e-01
+440 377 -2.22222222222222e-01
+440 278 -9.72222222222222e-02
+440 374 -6.94444444444445e-02
+440 445 -6.25449128252575e-18
+440 376 1.42166009867162e-17
+440 277 8.33333333333334e-02
+440 373 4.16666666666667e-02
+440 444 1.66666666666667e-01
+440 375 -8.30092288309214e-18
+440 276 -2.62919026827735e-18
+440 372 4.16666666666667e-02
+440 443 -2.77777777777778e-02
+440 386 1.11111111111111e-01
+440 371 -6.94444444444444e-02
+440 266 -9.72222222222223e-02
+440 442 -1.68593437821496e-17
+440 385 -1.99493199737333e-17
+440 370 4.16666666666667e-02
+440 265 8.33333333333333e-02
+440 441 1.05116788754259e-17
+440 384 -2.08166817117217e-17
+440 369 -4.16666666666667e-02
+440 264 -6.61363325216158e-18
+440 458 2.22222222222222e-01
+440 380 -6.94444444444445e-02
+440 383 1.11111111111111e-01
+440 437 -2.77777777777778e-02
+440 434 -1.94444444444444e-01
+440 368 -2.22222222222222e-01
+440 254 -9.72222222222222e-02
+440 365 -6.94444444444444e-02
+440 457 -6.93889390390723e-18
+440 439 9.71445146547012e-17
+440 382 -2.71050543121376e-17
+440 436 3.53602374160780e-17
+440 433 -7.87401827767598e-18
+440 367 1.48535697630514e-17
+440 253 -8.33333333333334e-02
+440 364 -4.16666666666667e-02
+440 456 8.04945997687602e-17
+440 438 -1.80411241501588e-16
+440 381 -2.08166817117217e-17
+440 435 1.35897966057480e-17
+440 432 -1.66666666666667e-01
+440 366 -1.53143556863578e-17
+440 252 -6.61363325216158e-18
+440 363 -4.16666666666667e-02
+441 441 1.11111111111111e+00
+441 353 4.16666666666667e-02
+441 286 2.71050543121376e-18
+441 352 -4.16666666666667e-02
+441 285 -9.72222222222222e-02
+441 351 -6.94444444444444e-02
+441 380 5.09575021068187e-18
+441 290 -8.33333333333333e-02
+441 377 -4.16666666666667e-02
+441 446 -1.09639944692597e-17
+441 379 0.00000000000000e+00
+441 289 1.28749007982654e-18
+441 376 4.16666666666667e-02
+441 445 -2.81214938488428e-18
+441 378 1.11111111111111e-01
+441 288 -9.72222222222223e-02
+441 375 -6.94444444444444e-02
+441 444 -2.77777777777778e-02
+441 362 -1.02999206386123e-17
+441 425 1.96105067948316e-17
+441 263 -8.33333333333334e-02
+441 344 -4.16666666666667e-02
+441 361 -6.24771501894772e-18
+441 424 -1.66666666666667e-01
+441 262 3.25260651745651e-18
+441 343 -4.16666666666667e-02
+441 360 -2.22222222222222e-01
+441 423 -1.94444444444444e-01
+441 261 -9.72222222222223e-02
+441 342 -6.94444444444444e-02
+441 443 -1.38777878078145e-17
+441 386 -2.01932654625425e-18
+441 440 1.09470538103146e-17
+441 458 -4.85722573273506e-17
+441 371 8.38901430960659e-18
+441 266 8.33333333333334e-02
+441 368 4.16666666666667e-02
+441 434 -9.70530350963977e-18
+441 442 4.16333634234434e-17
+441 385 -4.77726582251425e-18
+441 439 1.66666666666667e-01
+441 457 7.09707730680697e-18
+441 370 6.93889390390723e-18
+441 265 6.09863722023096e-19
+441 367 4.16666666666667e-02
+441 433 -2.10233577508517e-18
+441 287 8.33333333333334e-02
+441 384 -2.22222222222222e-01
+441 438 -1.94444444444444e-01
+441 456 2.22222222222222e-01
+441 369 1.11111111111111e-01
+441 264 -9.72222222222223e-02
+441 366 -6.94444444444444e-02
+441 432 -2.77777777777778e-02
+442 442 1.11111111111111e+00
+442 353 4.16666666666667e-02
+442 286 -1.38888888888889e-02
+442 352 -6.94444444444444e-02
+442 285 1.73472347597681e-18
+442 351 -4.16666666666667e-02
+442 380 -2.53974358904729e-17
+442 290 -7.04731412115578e-18
+442 377 4.16666666666667e-02
+442 446 1.66666666666667e-01
+442 379 1.11111111111111e-01
+442 289 -1.38888888888889e-02
+442 376 -6.94444444444444e-02
+442 445 -1.94444444444444e-01
+442 378 0.00000000000000e+00
+442 288 2.05998412772246e-18
+442 375 4.16666666666667e-02
+442 444 -2.49366499671666e-18
+442 362 6.93889390390723e-18
+442 425 2.15349656509933e-17
+442 263 -8.30769914667018e-18
+442 344 -4.16666666666667e-02
+442 361 1.11111111111111e-01
+442 424 -1.94444444444444e-01
+442 262 -1.38888888888889e-02
+442 343 -6.94444444444444e-02
+442 360 -8.05358926249389e-18
+442 423 -1.66666666666667e-01
+442 261 2.16840434497101e-18
+442 342 -4.16666666666667e-02
+442 443 -2.77555756156289e-17
+442 386 -6.93889390390723e-18
+442 440 -1.67102659834328e-17
+442 458 1.22768955375038e-17
+442 371 -2.45368504160626e-17
+442 266 -1.61275073157219e-18
+442 368 -4.16666666666667e-02
+442 434 -1.66666666666667e-01
+442 287 -4.77048955893622e-18
+442 385 1.11111111111111e-01
+442 439 -1.94444444444444e-01
+442 457 -4.44444444444444e-01
+442 370 1.11111111111111e-01
+442 265 -1.38888888888889e-02
+442 367 -6.94444444444444e-02
+442 433 -1.94444444444444e-01
+442 441 4.16333634234434e-17
+442 384 -5.31259064517897e-18
+442 438 1.66666666666667e-01
+442 456 9.91536768055884e-18
+442 369 6.93889390390723e-18
+442 264 1.95156391047391e-18
+442 366 4.16666666666667e-02
+442 432 -3.37457926186113e-18
+443 443 1.11111111111111e+00
+443 353 -6.94444444444445e-02
+443 286 -6.51876556206910e-18
+443 352 4.16666666666667e-02
+443 285 8.33333333333334e-02
+443 351 4.16666666666667e-02
+443 380 -2.22222222222222e-01
+443 290 -9.72222222222222e-02
+443 377 -6.94444444444444e-02
+443 446 -1.94444444444445e-01
+443 379 -2.43725260242952e-17
+443 289 -7.91467585914418e-18
+443 376 4.16666666666667e-02
+443 445 1.66666666666667e-01
+443 378 8.38901430960659e-18
+443 288 -8.33333333333334e-02
+443 375 -4.16666666666667e-02
+443 444 -1.10656384229302e-17
+443 384 -1.62630325872826e-18
+443 362 1.11111111111111e-01
+443 425 -2.77777777777778e-02
+443 263 -9.72222222222222e-02
+443 344 -6.94444444444444e-02
+443 361 0.00000000000000e+00
+443 424 2.27377524360944e-17
+443 262 -9.32413868337534e-18
+443 343 -4.16666666666667e-02
+443 360 -7.46744246299391e-18
+443 423 1.92801639454024e-17
+443 261 -8.33333333333334e-02
+443 342 -4.16666666666667e-02
+443 287 -9.72222222222222e-02
+443 386 1.11111111111111e-01
+443 440 -2.77777777777778e-02
+443 458 2.22222222222222e-01
+443 371 -2.22222222222222e-01
+443 266 -9.72222222222222e-02
+443 368 -6.94444444444445e-02
+443 434 -1.94444444444444e-01
+443 442 -2.77555756156289e-17
+443 385 -6.93889390390723e-18
+443 439 -1.75030888220629e-17
+443 457 1.22180267476697e-17
+443 370 -2.54109884176290e-17
+443 265 -2.49366499671666e-18
+443 367 -4.16666666666667e-02
+443 433 -1.66666666666667e-01
+443 441 -1.38777878078145e-17
+443 438 1.20888542232134e-17
+443 456 -2.77555756156289e-17
+443 369 5.20417042793042e-18
+443 264 8.33333333333334e-02
+443 366 4.16666666666667e-02
+443 432 -1.00017650411788e-17
+444 444 1.11111111111111e+00
+444 362 -4.16666666666667e-02
+444 286 8.33333333333333e-02
+444 361 4.16666666666667e-02
+444 285 -9.72222222222223e-02
+444 360 -6.94444444444444e-02
+444 380 -6.93889390390723e-18
+444 290 9.20216593897072e-18
+444 443 -1.08352454612770e-17
+444 386 4.16666666666667e-02
+444 379 5.09575021068187e-18
+444 289 -8.33333333333334e-02
+444 442 -2.50721752387273e-18
+444 385 -4.16666666666667e-02
+444 378 1.11111111111111e-01
+444 288 -9.72222222222222e-02
+444 441 -2.77777777777778e-02
+444 384 -6.94444444444444e-02
+444 377 4.16807972684896e-17
+444 278 6.57297567069337e-18
+444 440 1.66666666666667e-01
+444 383 4.16666666666667e-02
+444 376 -3.75405002223106e-18
+444 277 8.33333333333334e-02
+444 439 1.71778281703172e-18
+444 382 4.16666666666667e-02
+444 375 -2.22222222222222e-01
+444 276 -9.72222222222222e-02
+444 438 -1.94444444444445e-01
+444 381 -6.94444444444444e-02
+444 353 2.63325602642417e-17
+444 446 -5.55111512312578e-17
+444 374 -6.93889390390723e-18
+444 275 7.37257477290143e-18
+444 425 -1.66666666666667e-01
+444 458 -2.77634106703910e-17
+444 437 -9.69175098248370e-18
+444 359 -4.16666666666667e-02
+444 352 -5.96311194867027e-18
+444 445 4.16333634234434e-17
+444 373 4.91956735765298e-18
+444 274 -8.33333333333334e-02
+444 424 7.03376159399971e-18
+444 457 0.00000000000000e+00
+444 436 -1.88549534058807e-18
+444 358 -4.16666666666667e-02
+444 351 -2.22222222222222e-01
+444 287 6.17995238316738e-18
+444 372 1.11111111111111e-01
+444 273 -9.72222222222222e-02
+444 423 -1.94444444444444e-01
+444 456 2.22222222222222e-01
+444 435 -2.77777777777778e-02
+444 357 -6.94444444444444e-02
+445 445 1.11111111111111e+00
+445 362 4.16666666666667e-02
+445 286 -9.72222222222222e-02
+445 361 -6.94444444444444e-02
+445 285 8.33333333333334e-02
+445 360 4.16666666666667e-02
+445 380 6.85249654328729e-18
+445 290 1.89870905456524e-17
+445 443 1.66666666666667e-01
+445 386 4.16666666666667e-02
+445 379 -2.22222222222222e-01
+445 289 -9.72222222222222e-02
+445 442 -1.94444444444445e-01
+445 385 -6.94444444444444e-02
+445 378 -2.01932654625425e-18
+445 288 -8.33333333333334e-02
+445 441 -3.69306365002875e-18
+445 384 -4.16666666666667e-02
+445 377 0.00000000000000e+00
+445 278 -7.69783542464708e-18
+445 440 -6.14607106527720e-18
+445 383 -4.16666666666667e-02
+445 376 1.11111111111111e-01
+445 277 -9.72222222222222e-02
+445 439 -2.77777777777778e-02
+445 382 -6.94444444444444e-02
+445 375 -5.09575021068187e-18
+445 276 8.33333333333333e-02
+445 438 3.14418630020796e-18
+445 381 4.16666666666667e-02
+445 353 1.38777878078145e-17
+445 446 -1.38777878078145e-17
+445 374 -1.11130722679764e-18
+445 275 8.89045781438114e-18
+445 425 -2.89007641603167e-18
+445 458 -7.04202016523544e-18
+445 437 -1.66666666666667e-01
+445 359 -4.16666666666667e-02
+445 352 1.11111111111111e-01
+445 287 -1.17229359899995e-17
+445 373 -2.22222222222222e-01
+445 274 -9.72222222222223e-02
+445 424 -2.77777777777778e-02
+445 457 2.22222222222222e-01
+445 436 -1.94444444444444e-01
+445 358 -6.94444444444444e-02
+445 351 -5.84113920426566e-18
+445 444 4.16333634234434e-17
+445 372 5.20417042793042e-18
+445 273 -8.33333333333334e-02
+445 423 6.22908029410812e-18
+445 456 6.93889390390723e-18
+445 435 -2.94089839286693e-18
+445 357 -4.16666666666667e-02
+446 446 1.11111111111111e+00
+446 362 -6.94444444444444e-02
+446 286 -1.17093834628434e-17
+446 361 4.16666666666667e-02
+446 285 4.87890977618477e-18
+446 360 -4.16666666666667e-02
+446 380 1.11111111111111e-01
+446 290 -1.38888888888889e-02
+446 443 -1.94444444444445e-01
+446 386 -6.94444444444445e-02
+446 379 6.69494841509799e-18
+446 289 1.99493199737333e-17
+446 442 1.66666666666667e-01
+446 385 4.16666666666667e-02
+446 378 -6.93889390390723e-18
+446 288 1.04083408558608e-17
+446 441 -1.00830802041152e-17
+446 384 4.16666666666667e-02
+446 377 1.11111111111111e-01
+446 278 -1.38888888888889e-02
+446 440 -1.94444444444444e-01
+446 383 -6.94444444444445e-02
+446 376 0.00000000000000e+00
+446 277 -7.60296773455460e-18
+446 439 -6.51876556206910e-18
+446 382 -4.16666666666667e-02
+446 375 4.19992816566572e-17
+446 276 6.83047368665868e-18
+446 438 1.66666666666667e-01
+446 381 4.16666666666667e-02
+446 353 1.11111111111111e-01
+446 287 -1.38888888888889e-02
+446 374 1.11111111111111e-01
+446 275 -1.38888888888889e-02
+446 425 -1.94444444444444e-01
+446 458 -4.44444444444445e-01
+446 437 -1.94444444444444e-01
+446 359 -6.94444444444444e-02
+446 352 6.93889390390723e-18
+446 445 -1.38777878078145e-17
+446 373 -1.98544522836408e-18
+446 274 1.07742590890747e-17
+446 424 -3.40168431617327e-18
+446 457 -1.21193474093145e-17
+446 436 -1.66666666666667e-01
+446 358 -4.16666666666667e-02
+446 351 2.62749620238284e-17
+446 444 -5.55111512312578e-17
+446 372 -6.93889390390723e-18
+446 273 6.93889390390723e-18
+446 423 -1.66666666666667e-01
+446 456 -3.00256239142704e-17
+446 435 -9.98821251402271e-18
+446 357 -4.16666666666667e-02
+447 447 2.22222222222222e+00
+447 308 7.81980816905170e-18
+447 281 -4.16666666666667e-02
+447 307 1.47722546001150e-18
+447 280 -4.16666666666667e-02
+447 306 -2.77777777777777e-02
+447 279 -6.94444444444445e-02
+447 305 -1.66666666666667e-01
+447 269 -4.16666666666667e-02
+447 304 -1.77639749698172e-17
+447 268 4.16666666666667e-02
+447 303 -1.94444444444445e-01
+447 267 -6.94444444444445e-02
+447 401 1.40268656065312e-17
+447 302 7.81980816905170e-18
+447 400 2.08166817117217e-17
+447 301 3.28140563766316e-18
+447 399 2.22222222222222e-01
+447 300 -2.77777777777777e-02
+447 398 2.77555756156289e-17
+447 314 -2.24497612340280e-17
+447 299 8.20266706121064e-18
+447 257 4.16666666666667e-02
+447 397 1.53753420585601e-17
+447 313 -1.66666666666667e-01
+447 298 1.04354459101730e-18
+447 256 -4.16666666666667e-02
+447 396 2.22222222222222e-01
+447 312 -1.94444444444445e-01
+447 297 -2.77777777777778e-02
+447 255 -6.94444444444445e-02
+447 395 -1.27093693845482e-16
+447 311 -2.62580213648833e-17
+447 296 1.66666666666667e-01
+447 245 4.16666666666667e-02
+447 394 -6.44473488247907e-17
+447 310 1.66666666666667e-01
+447 295 -1.89565973595512e-17
+447 244 4.16666666666667e-02
+447 393 -4.44444444444445e-01
+447 309 -1.94444444444444e-01
+447 294 -1.94444444444445e-01
+447 243 -6.94444444444444e-02
+447 449 1.11022302462516e-16
+447 392 2.77555756156289e-17
+447 389 2.26871422174960e-17
+447 293 1.16060454432784e-17
+447 448 2.77555756156289e-17
+447 391 1.39823963768004e-17
+447 388 6.93889390390723e-18
+447 292 3.44742409532500e-18
+447 390 2.22222222222222e-01
+447 387 2.22222222222222e-01
+447 291 -2.77777777777777e-02
+447 58 4.16666666666667e-02
+447 57 -6.94444444444445e-02
+447 158 1.66666666666667e-01
+447 44 4.16666666666667e-02
+447 157 -8.67361737988404e-19
+447 43 -4.16666666666667e-02
+447 156 -1.94444444444445e-01
+447 42 -6.94444444444445e-02
+447 167 -6.61363325216158e-18
+447 29 -4.16666666666667e-02
+447 166 1.66666666666667e-01
+447 28 4.16666666666667e-02
+447 165 -1.94444444444444e-01
+447 27 -6.94444444444445e-02
+447 224 -2.37643563681667e-17
+447 164 -1.73472347597681e-18
+447 149 -1.66666666666667e-01
+447 14 -4.16666666666667e-02
+447 223 -2.03287907341032e-19
+447 163 -1.66666666666667e-01
+447 148 2.03287907341032e-19
+447 13 -4.16666666666667e-02
+447 222 -4.44444444444445e-01
+447 59 4.16666666666667e-02
+447 162 -1.94444444444444e-01
+447 147 -1.94444444444445e-01
+447 12 -6.94444444444445e-02
+448 448 2.22222222222222e+00
+448 308 -1.66666666666667e-01
+448 281 -4.16666666666667e-02
+448 307 -1.94444444444444e-01
+448 280 -6.94444444444445e-02
+448 306 3.67951112287268e-18
+448 279 -4.16666666666667e-02
+448 305 -4.46149193977785e-17
+448 269 4.16666666666667e-02
+448 304 -2.77777777777778e-02
+448 268 -6.94444444444444e-02
+448 303 -1.72659195968317e-17
+448 267 4.16666666666667e-02
+448 401 2.69017664047966e-17
+448 302 1.66666666666667e-01
+448 400 2.22222222222222e-01
+448 301 -1.94444444444444e-01
+448 399 1.38777878078145e-17
+448 300 1.13841228110978e-18
+448 398 -1.03307102862450e-16
+448 314 -1.19939865331209e-18
+448 299 1.66666666666667e-01
+448 257 4.16666666666667e-02
+448 397 -4.44444444444444e-01
+448 313 -1.94444444444444e-01
+448 298 -1.94444444444444e-01
+448 256 -6.94444444444444e-02
+448 396 1.73995390442610e-17
+448 312 -1.66666666666667e-01
+448 297 3.26954717640160e-18
+448 255 -4.16666666666667e-02
+448 395 -7.63278329429795e-17
+448 311 8.02445132910834e-17
+448 296 2.21075599233372e-18
+448 245 -4.16666666666666e-02
+448 394 2.22222222222222e-01
+448 310 -1.94444444444444e-01
+448 295 -2.77777777777777e-02
+448 244 -6.94444444444444e-02
+448 393 -6.26618033719786e-17
+448 309 1.66666666666667e-01
+448 390 1.87346747273706e-17
+448 294 -1.74014448683923e-17
+448 243 4.16666666666667e-02
+448 449 2.63677968348475e-16
+448 392 -1.12812930113011e-16
+448 389 4.19222016584571e-17
+448 293 -1.66666666666667e-01
+448 391 -4.44444444444444e-01
+448 388 2.22222222222222e-01
+448 292 -1.94444444444444e-01
+448 447 2.77555756156289e-17
+448 387 2.77555756156289e-17
+448 291 1.46367293285543e-18
+448 58 -6.94444444444444e-02
+448 57 4.16666666666667e-02
+448 158 -2.38253427403690e-17
+448 44 4.16666666666667e-02
+448 157 -2.77777777777778e-02
+448 43 -6.94444444444444e-02
+448 156 -3.37119113007212e-19
+448 42 -4.16666666666667e-02
+448 167 3.10911913619163e-17
+448 29 4.16666666666667e-02
+448 166 -1.94444444444444e-01
+448 28 -6.94444444444444e-02
+448 165 1.66666666666667e-01
+448 27 4.16666666666667e-02
+448 224 -6.93889390390723e-17
+448 164 1.29833210155139e-17
+448 149 -1.76843538727753e-17
+448 14 -4.16666666666667e-02
+448 223 2.22222222222222e-01
+448 59 -4.16666666666667e-02
+448 163 -1.94444444444444e-01
+448 148 -2.77777777777778e-02
+448 13 -6.94444444444444e-02
+448 222 3.04910685187867e-18
+448 162 -1.66666666666667e-01
+448 147 6.25110315073674e-19
+448 12 -4.16666666666667e-02
+449 449 2.22222222222222e+00
+449 308 -1.94444444444444e-01
+449 281 -6.94444444444445e-02
+449 307 -1.66666666666667e-01
+449 280 -4.16666666666667e-02
+449 306 8.16539761153146e-18
+449 279 -4.16666666666667e-02
+449 305 -1.94444444444444e-01
+449 269 -6.94444444444444e-02
+449 304 -4.64495927615313e-17
+449 268 4.16666666666667e-02
+449 303 -1.66666666666667e-01
+449 267 -4.16666666666667e-02
+449 401 -4.44444444444444e-01
+449 302 -1.94444444444444e-01
+449 400 4.60572047487158e-17
+449 301 1.66666666666667e-01
+449 399 2.96954928230781e-17
+449 300 8.17725607279302e-18
+449 398 2.22222222222222e-01
+449 314 -2.77777777777778e-02
+449 299 -1.94444444444444e-01
+449 257 -6.94444444444444e-02
+449 397 -1.03055110560642e-16
+449 313 -4.81114714040443e-18
+449 298 1.66666666666667e-01
+449 256 4.16666666666667e-02
+449 396 3.46944695195361e-17
+449 312 -2.16840434497101e-17
+449 297 1.12892551210053e-17
+449 255 4.16666666666667e-02
+449 395 2.22222222222222e-01
+449 311 -2.77777777777778e-02
+449 296 -1.94444444444444e-01
+449 245 -6.94444444444444e-02
+449 394 -8.32667268468867e-17
+449 310 8.01784447211976e-17
+449 295 3.68628738645072e-18
+449 244 -4.16666666666666e-02
+449 393 -1.26231626063414e-16
+449 309 -2.60615097211203e-17
+449 294 1.66666666666667e-01
+449 243 4.16666666666667e-02
+449 392 2.22222222222222e-01
+449 389 -4.44444444444444e-01
+449 293 -1.94444444444444e-01
+449 448 2.63677968348475e-16
+449 391 -1.13988188327327e-16
+449 388 3.32019974664741e-17
+449 292 -1.66666666666667e-01
+449 447 9.71445146547012e-17
+449 390 2.08166817117217e-17
+449 387 1.13417711637351e-17
+449 291 1.14925430283463e-17
+449 58 -4.16666666666666e-02
+449 57 4.16666666666667e-02
+449 158 -1.94444444444444e-01
+449 44 -6.94444444444445e-02
+449 157 -2.09810061034890e-17
+449 43 4.16666666666667e-02
+449 156 1.66666666666667e-01
+449 42 4.16666666666667e-02
+449 167 -2.77777777777778e-02
+449 29 -6.94444444444444e-02
+449 166 3.18213337624496e-17
+449 28 4.16666666666667e-02
+449 165 -6.48827237596794e-18
+449 27 -4.16666666666667e-02
+449 224 2.22222222222222e-01
+449 59 -6.94444444444445e-02
+449 164 -2.77777777777778e-02
+449 149 -1.94444444444444e-01
+449 14 -6.94444444444444e-02
+449 223 -6.24500451351651e-17
+449 163 1.50449992091309e-17
+449 148 -1.88922228555599e-17
+449 13 -4.16666666666667e-02
+449 222 -2.62563272989888e-17
+449 162 -3.11199904821230e-18
+449 147 -1.66666666666667e-01
+449 12 -4.16666666666667e-02
+450 450 2.22222222222222e+00
+450 280 4.16666666666667e-02
+450 279 -6.94444444444444e-02
+450 332 4.05220561966457e-18
+450 284 -4.16666666666667e-02
+450 331 -6.77626357803440e-19
+450 283 -4.16666666666667e-02
+450 330 -2.77777777777778e-02
+450 282 -6.94444444444444e-02
+450 329 -1.66666666666667e-01
+450 272 -4.16666666666667e-02
+450 328 8.05528332838840e-18
+450 271 4.16666666666667e-02
+450 327 -1.94444444444444e-01
+450 270 -6.94444444444444e-02
+450 305 1.66666666666667e-01
+450 416 4.08507049801804e-17
+450 326 4.06575814682064e-18
+450 269 4.16666666666667e-02
+450 304 -1.57615890825080e-17
+450 415 -2.08166817117217e-17
+450 325 1.93801138331784e-18
+450 268 -4.16666666666667e-02
+450 303 -1.94444444444444e-01
+450 414 2.22222222222222e-01
+450 324 -2.77777777777778e-02
+450 267 -6.94444444444444e-02
+450 314 -2.68475562961723e-17
+450 257 -4.16666666666667e-02
+450 313 1.66666666666667e-01
+450 256 4.16666666666667e-02
+450 312 -1.94444444444444e-01
+450 255 -6.94444444444444e-02
+450 413 6.93889390390723e-18
+450 338 1.85601859402362e-17
+450 323 1.74997006902738e-18
+450 260 4.16666666666667e-02
+450 412 3.45945196317601e-17
+450 337 -1.66666666666667e-01
+450 322 1.73472347597681e-18
+450 259 -4.16666666666667e-02
+450 411 2.22222222222222e-01
+450 336 -1.94444444444444e-01
+450 321 -2.77777777777779e-02
+450 258 -6.94444444444444e-02
+450 410 -2.58256110453100e-17
+450 335 1.40183952770587e-17
+450 320 1.66666666666667e-01
+450 248 4.16666666666667e-02
+450 409 3.30971771392513e-17
+450 334 1.66666666666667e-01
+450 319 7.18622752450548e-18
+450 247 4.16666666666667e-02
+450 408 -4.44444444444445e-01
+450 333 -1.94444444444445e-01
+450 318 -1.94444444444444e-01
+450 246 -6.94444444444445e-02
+450 395 -1.39887491239048e-16
+450 452 1.38777878078145e-16
+450 407 1.38777878078145e-17
+450 311 -2.39879730662418e-17
+450 296 -1.66666666666667e-01
+450 404 3.68563093591659e-17
+450 317 1.94139951510686e-18
+450 245 -4.16666666666667e-02
+450 394 -1.78227590563566e-16
+450 451 1.52655665885959e-16
+450 406 3.94255720464250e-17
+450 310 -1.66666666666667e-01
+450 295 -1.53008031592017e-17
+450 403 -2.08166817117217e-17
+450 316 2.08878324792910e-18
+450 244 -4.16666666666667e-02
+450 393 -4.44444444444444e-01
+450 281 4.16666666666667e-02
+450 405 2.22222222222222e-01
+450 309 -1.94444444444444e-01
+450 294 -1.94444444444444e-01
+450 402 2.22222222222222e-01
+450 315 -2.77777777777778e-02
+450 243 -6.94444444444444e-02
+451 451 2.22222222222222e+00
+451 280 -6.94444444444444e-02
+451 279 4.16666666666667e-02
+451 332 -1.66666666666667e-01
+451 284 -4.16666666666667e-02
+451 331 -1.94444444444445e-01
+451 283 -6.94444444444444e-02
+451 330 1.11300129269215e-18
+451 282 -4.16666666666667e-02
+451 329 4.35036121709809e-18
+451 272 4.16666666666667e-02
+451 328 -2.77777777777778e-02
+451 271 -6.94444444444444e-02
+451 327 8.66006485272797e-18
+451 270 4.16666666666667e-02
+451 305 5.53349683782289e-17
+451 416 -3.03458023683326e-17
+451 326 1.66666666666667e-01
+451 269 4.16666666666667e-02
+451 304 -2.77777777777776e-02
+451 415 2.22222222222222e-01
+451 325 -1.94444444444445e-01
+451 268 -6.94444444444445e-02
+451 303 -1.70490791623346e-17
+451 414 -1.38777878078145e-17
+451 324 1.93801138331784e-18
+451 267 -4.16666666666667e-02
+451 314 3.71847463844638e-17
+451 257 4.16666666666667e-02
+451 313 -1.94444444444444e-01
+451 256 -6.94444444444444e-02
+451 312 1.66666666666667e-01
+451 255 4.16666666666667e-02
+451 413 4.79865340443242e-17
+451 338 1.53346844770919e-17
+451 323 1.66666666666667e-01
+451 260 4.16666666666667e-02
+451 412 -4.44444444444445e-01
+451 337 -1.94444444444444e-01
+451 322 -1.94444444444445e-01
+451 259 -6.94444444444444e-02
+451 411 4.37350639238181e-17
+451 336 -1.66666666666667e-01
+451 321 1.05879118406788e-18
+451 258 -4.16666666666667e-02
+451 410 -5.55111512312578e-17
+451 335 1.16822784085313e-17
+451 320 -1.96223652560931e-17
+451 248 -4.16666666666667e-02
+451 409 2.22222222222222e-01
+451 334 -1.94444444444444e-01
+451 319 -2.77777777777778e-02
+451 247 -6.94444444444445e-02
+451 408 2.84332019734324e-17
+451 333 1.66666666666667e-01
+451 318 8.56519716263549e-18
+451 246 4.16666666666667e-02
+451 395 2.08166817117217e-17
+451 452 -8.32667268468867e-17
+451 407 3.89381045852802e-17
+451 311 -5.69070615283329e-17
+451 296 -4.83164533772798e-17
+451 404 -3.20697261742319e-17
+451 317 -1.66666666666667e-01
+451 245 -4.16666666666668e-02
+451 394 2.22222222222223e-01
+451 281 -4.16666666666667e-02
+451 406 -4.44444444444445e-01
+451 310 -1.94444444444445e-01
+451 295 -2.77777777777777e-02
+451 403 2.22222222222222e-01
+451 316 -1.94444444444445e-01
+451 244 -6.94444444444445e-02
+451 393 -1.82368311126219e-16
+451 450 1.80411241501588e-16
+451 405 3.49079218222442e-17
+451 309 -1.66666666666667e-01
+451 294 -1.56006528225297e-17
+451 402 -6.93889390390723e-18
+451 315 -1.42301535138722e-18
+451 243 -4.16666666666667e-02
+452 452 2.22222222222222e+00
+452 280 -4.16666666666667e-02
+452 279 4.16666666666667e-02
+452 332 -1.94444444444445e-01
+452 284 -6.94444444444444e-02
+452 331 -1.66666666666667e-01
+452 283 -4.16666666666667e-02
+452 330 1.83297929785831e-18
+452 282 -4.16666666666667e-02
+452 329 -1.94444444444444e-01
+452 272 -6.94444444444444e-02
+452 328 -4.54009659728305e-19
+452 271 4.16666666666667e-02
+452 327 -1.66666666666667e-01
+452 270 -4.16666666666667e-02
+452 305 -1.94444444444444e-01
+452 416 -4.44444444444445e-01
+452 326 -1.94444444444445e-01
+452 269 -6.94444444444445e-02
+452 304 5.32055275488316e-17
+452 415 -3.55933832348098e-17
+452 325 1.66666666666667e-01
+452 268 4.16666666666667e-02
+452 303 1.66666666666667e-01
+452 414 3.34018972420261e-17
+452 324 1.76521666207796e-18
+452 267 4.16666666666667e-02
+452 314 -2.77777777777776e-02
+452 257 -6.94444444444445e-02
+452 313 3.41930260147616e-17
+452 256 4.16666666666667e-02
+452 312 -2.73218947466347e-17
+452 255 -4.16666666666667e-02
+452 413 2.22222222222222e-01
+452 338 -2.77777777777778e-02
+452 323 -1.94444444444445e-01
+452 260 -6.94444444444445e-02
+452 412 4.49537325766802e-17
+452 337 1.43250212039647e-17
+452 322 1.66666666666667e-01
+452 259 4.16666666666667e-02
+452 411 6.93889390390723e-18
+452 336 1.89735380184963e-17
+452 321 3.63207727782644e-18
+452 258 4.16666666666667e-02
+452 410 2.22222222222222e-01
+452 335 -2.77777777777778e-02
+452 320 -1.94444444444444e-01
+452 248 -6.94444444444445e-02
+452 409 -4.85722573273506e-17
+452 334 1.27156586041816e-17
+452 319 -1.67509235649010e-17
+452 247 -4.16666666666667e-02
+452 408 -2.12300337899818e-17
+452 333 1.34305544116642e-17
+452 318 1.66666666666667e-01
+452 246 4.16666666666667e-02
+452 395 2.22222222222223e-01
+452 281 -6.94444444444444e-02
+452 407 2.22222222222222e-01
+452 311 -2.77777777777778e-02
+452 296 -1.94444444444445e-01
+452 404 -4.44444444444445e-01
+452 317 -1.94444444444445e-01
+452 245 -6.94444444444445e-02
+452 394 2.77555756156289e-17
+452 451 -8.32667268468867e-17
+452 406 3.94753352320762e-17
+452 310 -5.59634668250916e-17
+452 295 -4.71356894488073e-17
+452 403 -2.76742604526925e-17
+452 316 -1.66666666666667e-01
+452 244 -4.16666666666668e-02
+452 393 -1.39848951239948e-16
+452 450 1.11022302462516e-16
+452 405 6.93889390390723e-18
+452 309 -2.39896671321363e-17
+452 294 -1.66666666666667e-01
+452 402 3.35187877887472e-17
+452 315 3.51010453342182e-18
+452 243 -4.16666666666667e-02
+453 453 2.22222222222222e+00
+453 283 4.16666666666667e-02
+453 282 -6.94444444444444e-02
+453 356 3.21194893598831e-18
+453 287 -4.16666666666667e-02
+453 355 -5.67850887839283e-18
+453 286 -4.16666666666667e-02
+453 354 -2.77777777777778e-02
+453 285 -6.94444444444444e-02
+453 353 -1.66666666666667e-01
+453 275 -4.16666666666667e-02
+453 352 1.71168417981149e-17
+453 274 4.16666666666667e-02
+453 351 -1.94444444444444e-01
+453 273 -6.94444444444445e-02
+453 329 1.66666666666667e-01
+453 431 -1.60021464395282e-17
+453 350 8.21283145657770e-18
+453 272 4.16666666666667e-02
+453 328 5.66495635123676e-18
+453 430 -1.38777878078145e-17
+453 349 -3.98783111567325e-18
+453 271 -4.16666666666667e-02
+453 327 -1.94444444444444e-01
+453 429 2.22222222222222e-01
+453 348 -2.77777777777778e-02
+453 270 -6.94444444444444e-02
+453 338 -3.40168431617327e-17
+453 260 -4.16666666666667e-02
+453 337 1.66666666666667e-01
+453 259 4.16666666666667e-02
+453 336 -1.94444444444445e-01
+453 258 -6.94444444444444e-02
+453 428 3.46944695195361e-17
+453 362 1.05438661274215e-17
+453 347 3.60158409172529e-18
+453 263 4.16666666666667e-02
+453 427 -5.80014280961855e-17
+453 361 -1.66666666666667e-01
+453 346 -5.55653613398821e-18
+453 262 -4.16666666666667e-02
+453 426 2.22222222222222e-01
+453 360 -1.94444444444444e-01
+453 345 -2.77777777777778e-02
+453 261 -6.94444444444444e-02
+453 425 1.94398720076072e-16
+453 359 6.19181084442894e-18
+453 344 1.66666666666667e-01
+453 251 4.16666666666667e-02
+453 424 1.71466150062109e-16
+453 358 1.66666666666667e-01
+453 343 1.69796224606597e-17
+453 250 4.16666666666667e-02
+453 423 -4.44444444444444e-01
+453 357 -1.94444444444444e-01
+453 342 -1.94444444444444e-01
+453 249 -6.94444444444444e-02
+453 410 -1.49874009687176e-16
+453 455 0.00000000000000e+00
+453 422 3.46944695195361e-17
+453 335 -3.27564581362183e-17
+453 320 -1.66666666666667e-01
+453 419 -1.40872167040231e-17
+453 341 2.80706718720075e-18
+453 248 -4.16666666666667e-02
+453 409 4.71119725262842e-17
+453 454 -2.22044604925031e-16
+453 421 -5.30642848048770e-17
+453 334 -1.66666666666667e-01
+453 319 5.66495635123676e-18
+453 418 -1.38777878078145e-17
+453 340 -4.87721571029026e-18
+453 247 -4.16666666666667e-02
+453 408 -4.44444444444445e-01
+453 284 4.16666666666667e-02
+453 420 2.22222222222222e-01
+453 333 -1.94444444444445e-01
+453 318 -1.94444444444445e-01
+453 417 2.22222222222222e-01
+453 339 -2.77777777777778e-02
+453 246 -6.94444444444444e-02
+454 454 2.22222222222222e+00
+454 283 -6.94444444444444e-02
+454 282 4.16666666666667e-02
+454 356 -1.66666666666667e-01
+454 287 -4.16666666666667e-02
+454 355 -1.94444444444445e-01
+454 286 -6.94444444444444e-02
+454 354 -5.20417042793042e-18
+454 285 -4.16666666666667e-02
+454 353 3.73914224235938e-17
+454 275 4.16666666666667e-02
+454 352 -2.77777777777777e-02
+454 274 -6.94444444444445e-02
+454 351 1.54634334850745e-17
+454 273 4.16666666666667e-02
+454 329 -1.03541307472366e-17
+454 431 -9.61382395133631e-18
+454 350 1.66666666666667e-01
+454 272 4.16666666666666e-02
+454 328 -2.77777777777777e-02
+454 430 2.22222222222222e-01
+454 349 -1.94444444444445e-01
+454 271 -6.94444444444444e-02
+454 327 5.90381964236247e-18
+454 429 -6.93889390390723e-18
+454 348 -4.79759461324836e-18
+454 270 -4.16666666666667e-02
+454 338 3.64630743134031e-17
+454 260 4.16666666666667e-02
+454 337 -1.94444444444445e-01
+454 259 -6.94444444444444e-02
+454 336 1.66666666666667e-01
+454 258 4.16666666666667e-02
+454 428 1.44865927386535e-17
+454 362 8.02106319731932e-17
+454 347 1.66666666666667e-01
+454 263 4.16666666666667e-02
+454 427 -4.44444444444445e-01
+454 361 -1.94444444444444e-01
+454 346 -1.94444444444445e-01
+454 262 -6.94444444444444e-02
+454 426 -5.50819172852367e-17
+454 360 -1.66666666666667e-01
+454 345 -3.98613704977874e-18
+454 261 -4.16666666666667e-02
+454 425 -6.93889390390723e-17
+454 359 -2.40963932834903e-17
+454 344 -6.03544856236579e-17
+454 251 -4.16666666666667e-02
+454 424 2.22222222222223e-01
+454 358 -1.94444444444445e-01
+454 343 -2.77777777777778e-02
+454 250 -6.94444444444445e-02
+454 423 1.65024040981766e-16
+454 357 1.66666666666667e-01
+454 342 1.68051336735253e-17
+454 249 4.16666666666667e-02
+454 410 5.55111512312578e-17
+454 455 1.38777878078145e-17
+454 422 1.08911496357958e-17
+454 335 -6.97684097994422e-17
+454 320 1.48959214104141e-17
+454 419 -1.51629485470360e-17
+454 341 -1.66666666666667e-01
+454 248 -4.16666666666667e-02
+454 409 2.22222222222222e-01
+454 284 -4.16666666666667e-02
+454 421 -4.44444444444445e-01
+454 334 -1.94444444444444e-01
+454 319 -2.77777777777778e-02
+454 418 2.22222222222222e-01
+454 340 -1.94444444444445e-01
+454 247 -6.94444444444444e-02
+454 408 4.98027844414743e-17
+454 453 -2.22044604925031e-16
+454 420 -6.09829840705206e-17
+454 333 -1.66666666666667e-01
+454 318 6.23077436000263e-18
+454 417 -6.93889390390723e-18
+454 339 -4.81114714040443e-18
+454 246 -4.16666666666667e-02
+455 455 2.22222222222222e+00
+455 283 -4.16666666666667e-02
+455 282 4.16666666666667e-02
+455 356 -1.94444444444444e-01
+455 287 -6.94444444444445e-02
+455 355 -1.66666666666667e-01
+455 286 -4.16666666666667e-02
+455 354 4.64851681453160e-18
+455 285 -4.16666666666667e-02
+455 353 -1.94444444444444e-01
+455 275 -6.94444444444445e-02
+455 352 3.50282005007543e-17
+455 274 4.16666666666667e-02
+455 351 -1.66666666666667e-01
+455 273 -4.16666666666667e-02
+455 329 -1.94444444444444e-01
+455 431 -4.44444444444445e-01
+455 350 -1.94444444444445e-01
+455 272 -6.94444444444444e-02
+455 328 -9.42747670294036e-18
+455 430 -1.51595604152470e-17
+455 349 1.66666666666667e-01
+455 271 4.16666666666666e-02
+455 327 1.66666666666667e-01
+455 429 -1.42091894484277e-17
+455 348 2.72236389247532e-18
+455 270 4.16666666666667e-02
+455 338 -2.77777777777778e-02
+455 260 -6.94444444444445e-02
+455 337 3.40710532703570e-17
+455 259 4.16666666666667e-02
+455 336 -3.49434972060289e-17
+455 258 -4.16666666666667e-02
+455 428 2.22222222222222e-01
+455 362 -2.77777777777777e-02
+455 347 -1.94444444444445e-01
+455 263 -6.94444444444445e-02
+455 427 2.17196188334948e-17
+455 361 8.07595093230140e-17
+455 346 1.66666666666667e-01
+455 262 4.16666666666667e-02
+455 426 3.46944695195361e-17
+455 360 8.70072243419617e-18
+455 345 5.71916645986104e-18
+455 261 4.16666666666667e-02
+455 425 2.22222222222223e-01
+455 359 -2.77777777777778e-02
+455 344 -1.94444444444445e-01
+455 251 -6.94444444444445e-02
+455 424 -6.93889390390723e-17
+455 358 -2.06997911650006e-17
+455 343 -5.98615124483559e-17
+455 250 -4.16666666666667e-02
+455 423 1.98439490750948e-16
+455 357 5.36680075380325e-18
+455 342 1.66666666666667e-01
+455 249 4.16666666666667e-02
+455 410 2.22222222222222e-01
+455 284 -6.94444444444444e-02
+455 422 2.22222222222222e-01
+455 335 -2.77777777777778e-02
+455 320 -1.94444444444445e-01
+455 419 -4.44444444444445e-01
+455 341 -1.94444444444445e-01
+455 248 -6.94444444444445e-02
+455 409 6.93889390390723e-17
+455 454 1.38777878078145e-17
+455 421 4.04775869669149e-18
+455 334 -7.17724897526459e-17
+455 319 1.91361683443692e-17
+455 418 -1.49128620693592e-17
+455 340 -1.66666666666667e-01
+455 247 -4.16666666666667e-02
+455 408 -1.48726491801883e-16
+455 453 0.00000000000000e+00
+455 420 3.46944695195361e-17
+455 333 -3.23939280347935e-17
+455 318 -1.66666666666667e-01
+455 417 -1.68830607046727e-17
+455 339 6.57297567069337e-18
+455 246 -4.16666666666667e-02
+456 456 2.22222222222222e+00
+456 286 4.16666666666667e-02
+456 285 -6.94444444444444e-02
+456 380 -9.89334482393023e-18
+456 290 -4.16666666666667e-02
+456 379 -7.72494047895922e-19
+456 289 -4.16666666666667e-02
+456 378 -2.77777777777778e-02
+456 288 -6.94444444444444e-02
+456 377 -1.66666666666667e-01
+456 278 -4.16666666666667e-02
+456 376 3.03237795117040e-18
+456 277 4.16666666666667e-02
+456 375 -1.94444444444444e-01
+456 276 -6.94444444444444e-02
+456 353 1.66666666666667e-01
+456 446 -3.01221856702574e-17
+456 374 -1.09639944692597e-17
+456 275 4.16666666666667e-02
+456 352 5.96311194867027e-18
+456 445 -6.93889390390723e-18
+456 373 -2.81214938488428e-18
+456 274 -4.16666666666667e-02
+456 351 -1.94444444444444e-01
+456 444 2.22222222222222e-01
+456 372 -2.77777777777778e-02
+456 273 -6.94444444444444e-02
+456 362 1.21159592775255e-17
+456 263 -4.16666666666667e-02
+456 361 1.66666666666667e-01
+456 262 4.16666666666667e-02
+456 360 -1.94444444444444e-01
+456 261 -6.94444444444444e-02
+456 443 -4.85722573273506e-17
+456 386 1.87566975839992e-17
+456 371 -1.08352454612770e-17
+456 266 4.16666666666667e-02
+456 442 9.80694746331029e-18
+456 385 -1.66666666666667e-01
+456 370 -2.50721752387273e-18
+456 265 -4.16666666666667e-02
+456 441 2.22222222222222e-01
+456 384 -1.94444444444444e-01
+456 369 -2.77777777777778e-02
+456 264 -6.94444444444444e-02
+456 440 8.12673055748930e-17
+456 383 1.43080805450196e-17
+456 368 1.66666666666667e-01
+456 254 4.16666666666667e-02
+456 439 -8.24247760973160e-18
+456 382 1.66666666666667e-01
+456 367 2.04304346877737e-18
+456 253 4.16666666666667e-02
+456 438 -4.44444444444445e-01
+456 381 -1.94444444444444e-01
+456 366 -1.94444444444445e-01
+456 252 -6.94444444444444e-02
+456 425 5.64682984616552e-17
+456 458 -1.66533453693773e-16
+456 437 -4.85722573273506e-17
+456 359 1.52736981048895e-17
+456 344 -1.66666666666667e-01
+456 434 -2.77634106703910e-17
+456 365 -9.69175098248370e-18
+456 251 -4.16666666666667e-02
+456 424 -9.29872769495771e-18
+456 457 5.55111512312578e-17
+456 436 7.09707730680697e-18
+456 358 -1.66666666666667e-01
+456 343 7.03376159399971e-18
+456 433 0.00000000000000e+00
+456 364 -2.10233577508517e-18
+456 250 -4.16666666666667e-02
+456 423 -4.44444444444445e-01
+456 287 4.16666666666667e-02
+456 435 2.22222222222222e-01
+456 357 -1.94444444444444e-01
+456 342 -1.94444444444444e-01
+456 432 2.22222222222222e-01
+456 363 -2.77777777777778e-02
+456 249 -6.94444444444444e-02
+457 457 2.22222222222222e+00
+457 286 -6.94444444444444e-02
+457 285 4.16666666666667e-02
+457 380 -1.66666666666667e-01
+457 290 -4.16666666666667e-02
+457 379 -1.94444444444444e-01
+457 289 -6.94444444444444e-02
+457 378 -3.26954717640160e-18
+457 288 -4.16666666666667e-02
+457 377 -7.92822838630025e-18
+457 278 4.16666666666667e-02
+457 376 -2.77777777777778e-02
+457 277 -6.94444444444444e-02
+457 375 3.67273485929465e-18
+457 276 4.16666666666667e-02
+457 353 2.98155597433514e-18
+457 446 -1.58598449043895e-17
+457 374 1.66666666666667e-01
+457 275 4.16666666666667e-02
+457 352 -2.77777777777778e-02
+457 445 2.22222222222222e-01
+457 373 -1.94444444444444e-01
+457 274 -6.94444444444444e-02
+457 351 4.49266275223681e-18
+457 444 0.00000000000000e+00
+457 372 -2.49366499671666e-18
+457 273 -4.16666666666667e-02
+457 362 -2.44148776716580e-17
+457 263 4.16666666666667e-02
+457 361 -1.94444444444444e-01
+457 262 -6.94444444444444e-02
+457 360 1.66666666666667e-01
+457 261 4.16666666666667e-02
+457 443 1.05510659074732e-17
+457 386 3.70034813337514e-17
+457 371 1.66666666666667e-01
+457 266 4.16666666666667e-02
+457 442 -4.44444444444444e-01
+457 385 -1.94444444444444e-01
+457 370 -1.94444444444444e-01
+457 265 -6.94444444444444e-02
+457 441 1.83848501201546e-18
+457 384 -1.66666666666667e-01
+457 369 -3.70492211129031e-18
+457 264 -4.16666666666667e-02
+457 440 -6.93889390390723e-18
+457 383 -1.67102659834328e-17
+457 368 -6.15962359243327e-18
+457 254 -4.16666666666667e-02
+457 439 2.22222222222222e-01
+457 382 -1.94444444444444e-01
+457 367 -2.77777777777778e-02
+457 253 -6.94444444444444e-02
+457 438 -1.10317571050400e-17
+457 381 1.66666666666667e-01
+457 366 3.36102673470506e-18
+457 252 4.16666666666667e-02
+457 425 2.08166817117217e-17
+457 458 0.00000000000000e+00
+457 437 1.33831205666179e-19
+457 359 1.80655186990397e-17
+457 344 -2.90362894318774e-18
+457 434 -7.15213444837850e-18
+457 365 -1.66666666666667e-01
+457 251 -4.16666666666667e-02
+457 424 2.22222222222222e-01
+457 287 -4.16666666666667e-02
+457 436 -4.44444444444445e-01
+457 358 -1.94444444444444e-01
+457 343 -2.77777777777778e-02
+457 433 2.22222222222222e-01
+457 364 -1.94444444444444e-01
+457 250 -6.94444444444444e-02
+457 423 -1.10683912800088e-17
+457 456 5.55111512312578e-17
+457 435 9.91536768055884e-18
+457 357 -1.66666666666667e-01
+457 342 6.09355502254744e-18
+457 432 6.93889390390723e-18
+457 363 -3.37457926186113e-18
+457 249 -4.16666666666667e-02
+458 458 2.22222222222222e+00
+458 286 -4.16666666666667e-02
+458 285 4.16666666666667e-02
+458 380 -1.94444444444444e-01
+458 290 -6.94444444444444e-02
+458 379 -1.66666666666667e-01
+458 289 -4.16666666666666e-02
+458 378 -1.00051531729678e-17
+458 288 -4.16666666666667e-02
+458 377 -1.94444444444444e-01
+458 278 -6.94444444444444e-02
+458 376 -8.39748463907913e-18
+458 277 4.16666666666667e-02
+458 375 -1.66666666666667e-01
+458 276 -4.16666666666667e-02
+458 353 -1.94444444444444e-01
+458 446 -4.44444444444445e-01
+458 374 -1.94444444444444e-01
+458 275 -6.94444444444444e-02
+458 352 7.62329652528870e-19
+458 445 -1.04439162396455e-17
+458 373 1.66666666666667e-01
+458 274 4.16666666666667e-02
+458 351 1.66666666666667e-01
+458 444 -2.78178325372521e-17
+458 372 -1.10774968841917e-17
+458 273 4.16666666666667e-02
+458 362 -2.77777777777778e-02
+458 263 -6.94444444444444e-02
+458 361 -2.51670429288198e-17
+458 262 4.16666666666667e-02
+458 360 1.14044516018319e-17
+458 261 -4.16666666666667e-02
+458 443 2.22222222222222e-01
+458 386 -2.77777777777778e-02
+458 371 -1.94444444444445e-01
+458 266 -6.94444444444445e-02
+458 442 1.21142652116310e-17
+458 385 3.78386558197441e-17
+458 370 1.66666666666667e-01
+458 265 4.16666666666667e-02
+458 441 -3.46944695195361e-17
+458 384 2.02068179896986e-17
+458 369 -1.00830802041152e-17
+458 264 4.16666666666667e-02
+458 440 2.22222222222222e-01
+458 383 -2.77777777777778e-02
+458 368 -1.94444444444444e-01
+458 254 -6.94444444444445e-02
+458 439 -6.93889390390723e-18
+458 382 -1.83975556143634e-17
+458 367 -6.51876556206910e-18
+458 253 -4.16666666666667e-02
+458 438 8.37952754059734e-17
+458 381 1.49077798716757e-17
+458 366 1.66666666666667e-01
+458 252 4.16666666666667e-02
+458 425 2.22222222222222e-01
+458 287 -6.94444444444444e-02
+458 437 2.22222222222222e-01
+458 359 -2.77777777777778e-02
+458 344 -1.94444444444444e-01
+458 434 -4.44444444444445e-01
+458 365 -1.94444444444444e-01
+458 251 -6.94444444444444e-02
+458 424 1.38777878078145e-17
+458 457 0.00000000000000e+00
+458 436 1.69935985042894e-18
+458 358 2.00136944777246e-17
+458 343 -3.40168431617327e-18
+458 433 -1.30002616744590e-17
+458 364 -1.66666666666667e-01
+458 250 -4.16666666666667e-02
+458 423 5.77665882115592e-17
+458 456 -1.66533453693773e-16
+458 435 -4.16333634234434e-17
+458 357 1.49298027283043e-17
+458 342 -1.66666666666667e-01
+458 432 -3.00256239142704e-17
+458 363 -9.98821251402271e-18
+458 249 -4.16666666666667e-02
diff --git a/external/hypre/src/test/TEST_ij/data/beam_hex_dof459_np2/b.IJ.00000 b/external/hypre/src/test/TEST_ij/data/beam_hex_dof459_np2/b.IJ.00000
new file mode 100644
index 00000000..d736e2f8
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/data/beam_hex_dof459_np2/b.IJ.00000
@@ -0,0 +1,244 @@
+0 242
+0 0.00000000000000e+00
+1 0.00000000000000e+00
+2 0.00000000000000e+00
+3 0.00000000000000e+00
+4 0.00000000000000e+00
+5 0.00000000000000e+00
+6 0.00000000000000e+00
+7 0.00000000000000e+00
+8 0.00000000000000e+00
+9 0.00000000000000e+00
+10 0.00000000000000e+00
+11 0.00000000000000e+00
+12 0.00000000000000e+00
+13 0.00000000000000e+00
+14 0.00000000000000e+00
+15 0.00000000000000e+00
+16 0.00000000000000e+00
+17 0.00000000000000e+00
+18 0.00000000000000e+00
+19 0.00000000000000e+00
+20 0.00000000000000e+00
+21 0.00000000000000e+00
+22 0.00000000000000e+00
+23 0.00000000000000e+00
+24 0.00000000000000e+00
+25 0.00000000000000e+00
+26 0.00000000000000e+00
+27 0.00000000000000e+00
+28 0.00000000000000e+00
+29 0.00000000000000e+00
+30 0.00000000000000e+00
+31 0.00000000000000e+00
+32 0.00000000000000e+00
+33 0.00000000000000e+00
+34 0.00000000000000e+00
+35 0.00000000000000e+00
+36 0.00000000000000e+00
+37 0.00000000000000e+00
+38 0.00000000000000e+00
+39 0.00000000000000e+00
+40 0.00000000000000e+00
+41 0.00000000000000e+00
+42 0.00000000000000e+00
+43 0.00000000000000e+00
+44 0.00000000000000e+00
+45 0.00000000000000e+00
+46 0.00000000000000e+00
+47 0.00000000000000e+00
+48 0.00000000000000e+00
+49 0.00000000000000e+00
+50 0.00000000000000e+00
+51 0.00000000000000e+00
+52 0.00000000000000e+00
+53 0.00000000000000e+00
+54 0.00000000000000e+00
+55 0.00000000000000e+00
+56 0.00000000000000e+00
+57 0.00000000000000e+00
+58 0.00000000000000e+00
+59 0.00000000000000e+00
+60 0.00000000000000e+00
+61 0.00000000000000e+00
+62 0.00000000000000e+00
+63 0.00000000000000e+00
+64 0.00000000000000e+00
+65 0.00000000000000e+00
+66 0.00000000000000e+00
+67 0.00000000000000e+00
+68 0.00000000000000e+00
+69 0.00000000000000e+00
+70 0.00000000000000e+00
+71 0.00000000000000e+00
+72 0.00000000000000e+00
+73 0.00000000000000e+00
+74 0.00000000000000e+00
+75 0.00000000000000e+00
+76 0.00000000000000e+00
+77 0.00000000000000e+00
+78 0.00000000000000e+00
+79 0.00000000000000e+00
+80 0.00000000000000e+00
+81 0.00000000000000e+00
+82 0.00000000000000e+00
+83 0.00000000000000e+00
+84 0.00000000000000e+00
+85 0.00000000000000e+00
+86 0.00000000000000e+00
+87 0.00000000000000e+00
+88 0.00000000000000e+00
+89 0.00000000000000e+00
+90 0.00000000000000e+00
+91 0.00000000000000e+00
+92 0.00000000000000e+00
+93 0.00000000000000e+00
+94 0.00000000000000e+00
+95 0.00000000000000e+00
+96 0.00000000000000e+00
+97 0.00000000000000e+00
+98 0.00000000000000e+00
+99 0.00000000000000e+00
+100 0.00000000000000e+00
+101 0.00000000000000e+00
+102 0.00000000000000e+00
+103 0.00000000000000e+00
+104 0.00000000000000e+00
+105 0.00000000000000e+00
+106 0.00000000000000e+00
+107 0.00000000000000e+00
+108 0.00000000000000e+00
+109 0.00000000000000e+00
+110 0.00000000000000e+00
+111 0.00000000000000e+00
+112 0.00000000000000e+00
+113 0.00000000000000e+00
+114 0.00000000000000e+00
+115 0.00000000000000e+00
+116 0.00000000000000e+00
+117 0.00000000000000e+00
+118 0.00000000000000e+00
+119 0.00000000000000e+00
+120 0.00000000000000e+00
+121 0.00000000000000e+00
+122 0.00000000000000e+00
+123 0.00000000000000e+00
+124 0.00000000000000e+00
+125 0.00000000000000e+00
+126 0.00000000000000e+00
+127 0.00000000000000e+00
+128 0.00000000000000e+00
+129 0.00000000000000e+00
+130 0.00000000000000e+00
+131 0.00000000000000e+00
+132 0.00000000000000e+00
+133 0.00000000000000e+00
+134 0.00000000000000e+00
+135 0.00000000000000e+00
+136 0.00000000000000e+00
+137 0.00000000000000e+00
+138 0.00000000000000e+00
+139 0.00000000000000e+00
+140 0.00000000000000e+00
+141 0.00000000000000e+00
+142 0.00000000000000e+00
+143 0.00000000000000e+00
+144 0.00000000000000e+00
+145 0.00000000000000e+00
+146 0.00000000000000e+00
+147 0.00000000000000e+00
+148 0.00000000000000e+00
+149 0.00000000000000e+00
+150 0.00000000000000e+00
+151 0.00000000000000e+00
+152 0.00000000000000e+00
+153 0.00000000000000e+00
+154 0.00000000000000e+00
+155 0.00000000000000e+00
+156 0.00000000000000e+00
+157 0.00000000000000e+00
+158 0.00000000000000e+00
+159 0.00000000000000e+00
+160 0.00000000000000e+00
+161 0.00000000000000e+00
+162 0.00000000000000e+00
+163 0.00000000000000e+00
+164 0.00000000000000e+00
+165 0.00000000000000e+00
+166 0.00000000000000e+00
+167 0.00000000000000e+00
+168 0.00000000000000e+00
+169 0.00000000000000e+00
+170 0.00000000000000e+00
+171 0.00000000000000e+00
+172 0.00000000000000e+00
+173 0.00000000000000e+00
+174 0.00000000000000e+00
+175 0.00000000000000e+00
+176 0.00000000000000e+00
+177 0.00000000000000e+00
+178 0.00000000000000e+00
+179 0.00000000000000e+00
+180 0.00000000000000e+00
+181 0.00000000000000e+00
+182 0.00000000000000e+00
+183 0.00000000000000e+00
+184 0.00000000000000e+00
+185 0.00000000000000e+00
+186 0.00000000000000e+00
+187 0.00000000000000e+00
+188 0.00000000000000e+00
+189 0.00000000000000e+00
+190 0.00000000000000e+00
+191 0.00000000000000e+00
+192 0.00000000000000e+00
+193 0.00000000000000e+00
+194 0.00000000000000e+00
+195 0.00000000000000e+00
+196 0.00000000000000e+00
+197 0.00000000000000e+00
+198 0.00000000000000e+00
+199 0.00000000000000e+00
+200 0.00000000000000e+00
+201 0.00000000000000e+00
+202 0.00000000000000e+00
+203 0.00000000000000e+00
+204 0.00000000000000e+00
+205 0.00000000000000e+00
+206 0.00000000000000e+00
+207 0.00000000000000e+00
+208 0.00000000000000e+00
+209 0.00000000000000e+00
+210 0.00000000000000e+00
+211 0.00000000000000e+00
+212 0.00000000000000e+00
+213 0.00000000000000e+00
+214 0.00000000000000e+00
+215 0.00000000000000e+00
+216 0.00000000000000e+00
+217 0.00000000000000e+00
+218 0.00000000000000e+00
+219 0.00000000000000e+00
+220 0.00000000000000e+00
+221 0.00000000000000e+00
+222 0.00000000000000e+00
+223 0.00000000000000e+00
+224 0.00000000000000e+00
+225 0.00000000000000e+00
+226 0.00000000000000e+00
+227 0.00000000000000e+00
+228 0.00000000000000e+00
+229 0.00000000000000e+00
+230 0.00000000000000e+00
+231 0.00000000000000e+00
+232 0.00000000000000e+00
+233 0.00000000000000e+00
+234 0.00000000000000e+00
+235 0.00000000000000e+00
+236 0.00000000000000e+00
+237 0.00000000000000e+00
+238 0.00000000000000e+00
+239 0.00000000000000e+00
+240 0.00000000000000e+00
+241 0.00000000000000e+00
+242 0.00000000000000e+00
diff --git a/external/hypre/src/test/TEST_ij/data/beam_hex_dof459_np2/b.IJ.00001 b/external/hypre/src/test/TEST_ij/data/beam_hex_dof459_np2/b.IJ.00001
new file mode 100644
index 00000000..3f05c33e
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/data/beam_hex_dof459_np2/b.IJ.00001
@@ -0,0 +1,217 @@
+243 458
+243 0.00000000000000e+00
+244 0.00000000000000e+00
+245 0.00000000000000e+00
+246 0.00000000000000e+00
+247 0.00000000000000e+00
+248 0.00000000000000e+00
+249 0.00000000000000e+00
+250 0.00000000000000e+00
+251 0.00000000000000e+00
+252 0.00000000000000e+00
+253 0.00000000000000e+00
+254 -6.25000000000000e-04
+255 0.00000000000000e+00
+256 0.00000000000000e+00
+257 0.00000000000000e+00
+258 0.00000000000000e+00
+259 0.00000000000000e+00
+260 0.00000000000000e+00
+261 0.00000000000000e+00
+262 0.00000000000000e+00
+263 0.00000000000000e+00
+264 0.00000000000000e+00
+265 0.00000000000000e+00
+266 -6.25000000000000e-04
+267 0.00000000000000e+00
+268 0.00000000000000e+00
+269 0.00000000000000e+00
+270 0.00000000000000e+00
+271 0.00000000000000e+00
+272 0.00000000000000e+00
+273 0.00000000000000e+00
+274 0.00000000000000e+00
+275 0.00000000000000e+00
+276 0.00000000000000e+00
+277 0.00000000000000e+00
+278 -6.25000000000000e-04
+279 0.00000000000000e+00
+280 0.00000000000000e+00
+281 0.00000000000000e+00
+282 0.00000000000000e+00
+283 0.00000000000000e+00
+284 0.00000000000000e+00
+285 0.00000000000000e+00
+286 0.00000000000000e+00
+287 0.00000000000000e+00
+288 0.00000000000000e+00
+289 0.00000000000000e+00
+290 -6.25000000000000e-04
+291 0.00000000000000e+00
+292 0.00000000000000e+00
+293 0.00000000000000e+00
+294 0.00000000000000e+00
+295 0.00000000000000e+00
+296 0.00000000000000e+00
+297 0.00000000000000e+00
+298 0.00000000000000e+00
+299 0.00000000000000e+00
+300 0.00000000000000e+00
+301 0.00000000000000e+00
+302 0.00000000000000e+00
+303 0.00000000000000e+00
+304 0.00000000000000e+00
+305 0.00000000000000e+00
+306 0.00000000000000e+00
+307 0.00000000000000e+00
+308 0.00000000000000e+00
+309 0.00000000000000e+00
+310 0.00000000000000e+00
+311 0.00000000000000e+00
+312 0.00000000000000e+00
+313 0.00000000000000e+00
+314 0.00000000000000e+00
+315 0.00000000000000e+00
+316 0.00000000000000e+00
+317 0.00000000000000e+00
+318 0.00000000000000e+00
+319 0.00000000000000e+00
+320 0.00000000000000e+00
+321 0.00000000000000e+00
+322 0.00000000000000e+00
+323 0.00000000000000e+00
+324 0.00000000000000e+00
+325 0.00000000000000e+00
+326 0.00000000000000e+00
+327 0.00000000000000e+00
+328 0.00000000000000e+00
+329 0.00000000000000e+00
+330 0.00000000000000e+00
+331 0.00000000000000e+00
+332 0.00000000000000e+00
+333 0.00000000000000e+00
+334 0.00000000000000e+00
+335 0.00000000000000e+00
+336 0.00000000000000e+00
+337 0.00000000000000e+00
+338 0.00000000000000e+00
+339 0.00000000000000e+00
+340 0.00000000000000e+00
+341 0.00000000000000e+00
+342 0.00000000000000e+00
+343 0.00000000000000e+00
+344 0.00000000000000e+00
+345 0.00000000000000e+00
+346 0.00000000000000e+00
+347 0.00000000000000e+00
+348 0.00000000000000e+00
+349 0.00000000000000e+00
+350 0.00000000000000e+00
+351 0.00000000000000e+00
+352 0.00000000000000e+00
+353 0.00000000000000e+00
+354 0.00000000000000e+00
+355 0.00000000000000e+00
+356 0.00000000000000e+00
+357 0.00000000000000e+00
+358 0.00000000000000e+00
+359 0.00000000000000e+00
+360 0.00000000000000e+00
+361 0.00000000000000e+00
+362 0.00000000000000e+00
+363 0.00000000000000e+00
+364 0.00000000000000e+00
+365 0.00000000000000e+00
+366 0.00000000000000e+00
+367 0.00000000000000e+00
+368 -1.25000000000000e-03
+369 0.00000000000000e+00
+370 0.00000000000000e+00
+371 0.00000000000000e+00
+372 0.00000000000000e+00
+373 0.00000000000000e+00
+374 0.00000000000000e+00
+375 0.00000000000000e+00
+376 0.00000000000000e+00
+377 -1.25000000000000e-03
+378 0.00000000000000e+00
+379 0.00000000000000e+00
+380 0.00000000000000e+00
+381 0.00000000000000e+00
+382 0.00000000000000e+00
+383 -1.25000000000000e-03
+384 0.00000000000000e+00
+385 0.00000000000000e+00
+386 -1.25000000000000e-03
+387 0.00000000000000e+00
+388 0.00000000000000e+00
+389 0.00000000000000e+00
+390 0.00000000000000e+00
+391 0.00000000000000e+00
+392 0.00000000000000e+00
+393 0.00000000000000e+00
+394 0.00000000000000e+00
+395 0.00000000000000e+00
+396 0.00000000000000e+00
+397 0.00000000000000e+00
+398 0.00000000000000e+00
+399 0.00000000000000e+00
+400 0.00000000000000e+00
+401 0.00000000000000e+00
+402 0.00000000000000e+00
+403 0.00000000000000e+00
+404 0.00000000000000e+00
+405 0.00000000000000e+00
+406 0.00000000000000e+00
+407 0.00000000000000e+00
+408 0.00000000000000e+00
+409 0.00000000000000e+00
+410 0.00000000000000e+00
+411 0.00000000000000e+00
+412 0.00000000000000e+00
+413 0.00000000000000e+00
+414 0.00000000000000e+00
+415 0.00000000000000e+00
+416 0.00000000000000e+00
+417 0.00000000000000e+00
+418 0.00000000000000e+00
+419 0.00000000000000e+00
+420 0.00000000000000e+00
+421 0.00000000000000e+00
+422 0.00000000000000e+00
+423 0.00000000000000e+00
+424 0.00000000000000e+00
+425 0.00000000000000e+00
+426 0.00000000000000e+00
+427 0.00000000000000e+00
+428 0.00000000000000e+00
+429 0.00000000000000e+00
+430 0.00000000000000e+00
+431 0.00000000000000e+00
+432 0.00000000000000e+00
+433 0.00000000000000e+00
+434 0.00000000000000e+00
+435 0.00000000000000e+00
+436 0.00000000000000e+00
+437 0.00000000000000e+00
+438 0.00000000000000e+00
+439 0.00000000000000e+00
+440 -2.50000000000000e-03
+441 0.00000000000000e+00
+442 0.00000000000000e+00
+443 0.00000000000000e+00
+444 0.00000000000000e+00
+445 0.00000000000000e+00
+446 0.00000000000000e+00
+447 0.00000000000000e+00
+448 0.00000000000000e+00
+449 0.00000000000000e+00
+450 0.00000000000000e+00
+451 0.00000000000000e+00
+452 0.00000000000000e+00
+453 0.00000000000000e+00
+454 0.00000000000000e+00
+455 0.00000000000000e+00
+456 0.00000000000000e+00
+457 0.00000000000000e+00
+458 0.00000000000000e+00
diff --git a/external/hypre/src/test/TEST_ij/data/beam_hex_dof459_np2/mfem.txt b/external/hypre/src/test/TEST_ij/data/beam_hex_dof459_np2/mfem.txt
new file mode 100644
index 00000000..72747178
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/data/beam_hex_dof459_np2/mfem.txt
@@ -0,0 +1,19 @@
+$ mpirun -np 2 ./ex2p -m ../beam-hex.mesh -sr 0 -sp 1
+
+Produced with mfem-4.4 (https://github.com/mfem/mfem/archive/refs/tags/v4.4.tar.gz)
+
+Options used:
+   --mesh ../beam-hex.mesh
+   --order 1
+   --serial_ref 0
+   --parallel_ref 1
+   --amg-for-systems
+   --no-static-condensation
+   --visualization
+   --by-vdim
+   --device cpu
+Device configuration: cpu
+Memory configuration: host-std
+Number of finite element unknowns: 459
+Assembling: r.h.s. ... matrix ... done.
+Size of linear system: 459
\ No newline at end of file
diff --git a/external/hypre/src/test/TEST_ij/data/beam_hex_dof459_np2/rbms.0.00000 b/external/hypre/src/test/TEST_ij/data/beam_hex_dof459_np2/rbms.0.00000
new file mode 100644
index 00000000..7d333f7d
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/data/beam_hex_dof459_np2/rbms.0.00000
@@ -0,0 +1,244 @@
+0 243
+0 0.00000000000000e+00
+1 0.00000000000000e+00
+2 0.00000000000000e+00
+3 0.00000000000000e+00
+4 -1.00000000000000e+00
+5 0.00000000000000e+00
+6 0.00000000000000e+00
+7 -2.00000000000000e+00
+8 0.00000000000000e+00
+9 0.00000000000000e+00
+10 -3.00000000000000e+00
+11 0.00000000000000e+00
+12 0.00000000000000e+00
+13 -4.00000000000000e+00
+14 0.00000000000000e+00
+15 1.00000000000000e+00
+16 0.00000000000000e+00
+17 0.00000000000000e+00
+18 1.00000000000000e+00
+19 -1.00000000000000e+00
+20 0.00000000000000e+00
+21 1.00000000000000e+00
+22 -2.00000000000000e+00
+23 0.00000000000000e+00
+24 1.00000000000000e+00
+25 -3.00000000000000e+00
+26 0.00000000000000e+00
+27 1.00000000000000e+00
+28 -4.00000000000000e+00
+29 0.00000000000000e+00
+30 0.00000000000000e+00
+31 0.00000000000000e+00
+32 0.00000000000000e+00
+33 0.00000000000000e+00
+34 -1.00000000000000e+00
+35 0.00000000000000e+00
+36 0.00000000000000e+00
+37 -2.00000000000000e+00
+38 0.00000000000000e+00
+39 0.00000000000000e+00
+40 -3.00000000000000e+00
+41 0.00000000000000e+00
+42 0.00000000000000e+00
+43 -4.00000000000000e+00
+44 0.00000000000000e+00
+45 1.00000000000000e+00
+46 0.00000000000000e+00
+47 0.00000000000000e+00
+48 1.00000000000000e+00
+49 -1.00000000000000e+00
+50 0.00000000000000e+00
+51 1.00000000000000e+00
+52 -2.00000000000000e+00
+53 0.00000000000000e+00
+54 1.00000000000000e+00
+55 -3.00000000000000e+00
+56 0.00000000000000e+00
+57 1.00000000000000e+00
+58 -4.00000000000000e+00
+59 0.00000000000000e+00
+60 0.00000000000000e+00
+61 -5.00000000000000e-01
+62 0.00000000000000e+00
+63 5.00000000000000e-01
+64 -1.00000000000000e+00
+65 0.00000000000000e+00
+66 1.00000000000000e+00
+67 -5.00000000000000e-01
+68 0.00000000000000e+00
+69 5.00000000000000e-01
+70 0.00000000000000e+00
+71 0.00000000000000e+00
+72 0.00000000000000e+00
+73 -5.00000000000000e-01
+74 0.00000000000000e+00
+75 5.00000000000000e-01
+76 -1.00000000000000e+00
+77 0.00000000000000e+00
+78 1.00000000000000e+00
+79 -5.00000000000000e-01
+80 0.00000000000000e+00
+81 5.00000000000000e-01
+82 0.00000000000000e+00
+83 0.00000000000000e+00
+84 0.00000000000000e+00
+85 0.00000000000000e+00
+86 0.00000000000000e+00
+87 0.00000000000000e+00
+88 -1.00000000000000e+00
+89 0.00000000000000e+00
+90 1.00000000000000e+00
+91 -1.00000000000000e+00
+92 0.00000000000000e+00
+93 1.00000000000000e+00
+94 0.00000000000000e+00
+95 0.00000000000000e+00
+96 0.00000000000000e+00
+97 -1.50000000000000e+00
+98 0.00000000000000e+00
+99 5.00000000000000e-01
+100 -2.00000000000000e+00
+101 0.00000000000000e+00
+102 1.00000000000000e+00
+103 -1.50000000000000e+00
+104 0.00000000000000e+00
+105 0.00000000000000e+00
+106 -1.50000000000000e+00
+107 0.00000000000000e+00
+108 5.00000000000000e-01
+109 -2.00000000000000e+00
+110 0.00000000000000e+00
+111 1.00000000000000e+00
+112 -1.50000000000000e+00
+113 0.00000000000000e+00
+114 0.00000000000000e+00
+115 -2.00000000000000e+00
+116 0.00000000000000e+00
+117 1.00000000000000e+00
+118 -2.00000000000000e+00
+119 0.00000000000000e+00
+120 0.00000000000000e+00
+121 -2.50000000000000e+00
+122 0.00000000000000e+00
+123 5.00000000000000e-01
+124 -3.00000000000000e+00
+125 0.00000000000000e+00
+126 1.00000000000000e+00
+127 -2.50000000000000e+00
+128 0.00000000000000e+00
+129 0.00000000000000e+00
+130 -2.50000000000000e+00
+131 0.00000000000000e+00
+132 5.00000000000000e-01
+133 -3.00000000000000e+00
+134 0.00000000000000e+00
+135 1.00000000000000e+00
+136 -2.50000000000000e+00
+137 0.00000000000000e+00
+138 0.00000000000000e+00
+139 -3.00000000000000e+00
+140 0.00000000000000e+00
+141 1.00000000000000e+00
+142 -3.00000000000000e+00
+143 0.00000000000000e+00
+144 0.00000000000000e+00
+145 -3.50000000000000e+00
+146 0.00000000000000e+00
+147 5.00000000000000e-01
+148 -4.00000000000000e+00
+149 0.00000000000000e+00
+150 1.00000000000000e+00
+151 -3.50000000000000e+00
+152 0.00000000000000e+00
+153 0.00000000000000e+00
+154 -3.50000000000000e+00
+155 0.00000000000000e+00
+156 5.00000000000000e-01
+157 -4.00000000000000e+00
+158 0.00000000000000e+00
+159 1.00000000000000e+00
+160 -3.50000000000000e+00
+161 0.00000000000000e+00
+162 0.00000000000000e+00
+163 -4.00000000000000e+00
+164 0.00000000000000e+00
+165 1.00000000000000e+00
+166 -4.00000000000000e+00
+167 0.00000000000000e+00
+168 5.00000000000000e-01
+169 -5.00000000000000e-01
+170 0.00000000000000e+00
+171 0.00000000000000e+00
+172 -5.00000000000000e-01
+173 0.00000000000000e+00
+174 5.00000000000000e-01
+175 -1.00000000000000e+00
+176 0.00000000000000e+00
+177 1.00000000000000e+00
+178 -5.00000000000000e-01
+179 0.00000000000000e+00
+180 5.00000000000000e-01
+181 0.00000000000000e+00
+182 0.00000000000000e+00
+183 5.00000000000000e-01
+184 -5.00000000000000e-01
+185 0.00000000000000e+00
+186 5.00000000000000e-01
+187 -1.50000000000000e+00
+188 0.00000000000000e+00
+189 0.00000000000000e+00
+190 -1.50000000000000e+00
+191 0.00000000000000e+00
+192 5.00000000000000e-01
+193 -2.00000000000000e+00
+194 0.00000000000000e+00
+195 1.00000000000000e+00
+196 -1.50000000000000e+00
+197 0.00000000000000e+00
+198 5.00000000000000e-01
+199 -1.50000000000000e+00
+200 0.00000000000000e+00
+201 5.00000000000000e-01
+202 -2.50000000000000e+00
+203 0.00000000000000e+00
+204 0.00000000000000e+00
+205 -2.50000000000000e+00
+206 0.00000000000000e+00
+207 5.00000000000000e-01
+208 -3.00000000000000e+00
+209 0.00000000000000e+00
+210 1.00000000000000e+00
+211 -2.50000000000000e+00
+212 0.00000000000000e+00
+213 5.00000000000000e-01
+214 -2.50000000000000e+00
+215 0.00000000000000e+00
+216 5.00000000000000e-01
+217 -3.50000000000000e+00
+218 0.00000000000000e+00
+219 0.00000000000000e+00
+220 -3.50000000000000e+00
+221 0.00000000000000e+00
+222 5.00000000000000e-01
+223 -4.00000000000000e+00
+224 0.00000000000000e+00
+225 1.00000000000000e+00
+226 -3.50000000000000e+00
+227 0.00000000000000e+00
+228 5.00000000000000e-01
+229 -3.50000000000000e+00
+230 0.00000000000000e+00
+231 5.00000000000000e-01
+232 -5.00000000000000e-01
+233 0.00000000000000e+00
+234 5.00000000000000e-01
+235 -1.50000000000000e+00
+236 0.00000000000000e+00
+237 5.00000000000000e-01
+238 -2.50000000000000e+00
+239 0.00000000000000e+00
+240 5.00000000000000e-01
+241 -3.50000000000000e+00
+242 0.00000000000000e+00
diff --git a/external/hypre/src/test/TEST_ij/data/beam_hex_dof459_np2/rbms.0.00001 b/external/hypre/src/test/TEST_ij/data/beam_hex_dof459_np2/rbms.0.00001
new file mode 100644
index 00000000..2526adb2
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/data/beam_hex_dof459_np2/rbms.0.00001
@@ -0,0 +1,217 @@
+243 459
+243 0.00000000000000e+00
+244 -5.00000000000000e+00
+245 0.00000000000000e+00
+246 0.00000000000000e+00
+247 -6.00000000000000e+00
+248 0.00000000000000e+00
+249 0.00000000000000e+00
+250 -7.00000000000000e+00
+251 0.00000000000000e+00
+252 0.00000000000000e+00
+253 -8.00000000000000e+00
+254 0.00000000000000e+00
+255 1.00000000000000e+00
+256 -5.00000000000000e+00
+257 0.00000000000000e+00
+258 1.00000000000000e+00
+259 -6.00000000000000e+00
+260 0.00000000000000e+00
+261 1.00000000000000e+00
+262 -7.00000000000000e+00
+263 0.00000000000000e+00
+264 1.00000000000000e+00
+265 -8.00000000000000e+00
+266 0.00000000000000e+00
+267 0.00000000000000e+00
+268 -5.00000000000000e+00
+269 0.00000000000000e+00
+270 0.00000000000000e+00
+271 -6.00000000000000e+00
+272 0.00000000000000e+00
+273 0.00000000000000e+00
+274 -7.00000000000000e+00
+275 0.00000000000000e+00
+276 0.00000000000000e+00
+277 -8.00000000000000e+00
+278 0.00000000000000e+00
+279 1.00000000000000e+00
+280 -5.00000000000000e+00
+281 0.00000000000000e+00
+282 1.00000000000000e+00
+283 -6.00000000000000e+00
+284 0.00000000000000e+00
+285 1.00000000000000e+00
+286 -7.00000000000000e+00
+287 0.00000000000000e+00
+288 1.00000000000000e+00
+289 -8.00000000000000e+00
+290 0.00000000000000e+00
+291 0.00000000000000e+00
+292 -4.50000000000000e+00
+293 0.00000000000000e+00
+294 5.00000000000000e-01
+295 -5.00000000000000e+00
+296 0.00000000000000e+00
+297 1.00000000000000e+00
+298 -4.50000000000000e+00
+299 0.00000000000000e+00
+300 0.00000000000000e+00
+301 -4.50000000000000e+00
+302 0.00000000000000e+00
+303 5.00000000000000e-01
+304 -5.00000000000000e+00
+305 0.00000000000000e+00
+306 1.00000000000000e+00
+307 -4.50000000000000e+00
+308 0.00000000000000e+00
+309 0.00000000000000e+00
+310 -5.00000000000000e+00
+311 0.00000000000000e+00
+312 1.00000000000000e+00
+313 -5.00000000000000e+00
+314 0.00000000000000e+00
+315 0.00000000000000e+00
+316 -5.50000000000000e+00
+317 0.00000000000000e+00
+318 5.00000000000000e-01
+319 -6.00000000000000e+00
+320 0.00000000000000e+00
+321 1.00000000000000e+00
+322 -5.50000000000000e+00
+323 0.00000000000000e+00
+324 0.00000000000000e+00
+325 -5.50000000000000e+00
+326 0.00000000000000e+00
+327 5.00000000000000e-01
+328 -6.00000000000000e+00
+329 0.00000000000000e+00
+330 1.00000000000000e+00
+331 -5.50000000000000e+00
+332 0.00000000000000e+00
+333 0.00000000000000e+00
+334 -6.00000000000000e+00
+335 0.00000000000000e+00
+336 1.00000000000000e+00
+337 -6.00000000000000e+00
+338 0.00000000000000e+00
+339 0.00000000000000e+00
+340 -6.50000000000000e+00
+341 0.00000000000000e+00
+342 5.00000000000000e-01
+343 -7.00000000000000e+00
+344 0.00000000000000e+00
+345 1.00000000000000e+00
+346 -6.50000000000000e+00
+347 0.00000000000000e+00
+348 0.00000000000000e+00
+349 -6.50000000000000e+00
+350 0.00000000000000e+00
+351 5.00000000000000e-01
+352 -7.00000000000000e+00
+353 0.00000000000000e+00
+354 1.00000000000000e+00
+355 -6.50000000000000e+00
+356 0.00000000000000e+00
+357 0.00000000000000e+00
+358 -7.00000000000000e+00
+359 0.00000000000000e+00
+360 1.00000000000000e+00
+361 -7.00000000000000e+00
+362 0.00000000000000e+00
+363 0.00000000000000e+00
+364 -7.50000000000000e+00
+365 0.00000000000000e+00
+366 5.00000000000000e-01
+367 -8.00000000000000e+00
+368 0.00000000000000e+00
+369 1.00000000000000e+00
+370 -7.50000000000000e+00
+371 0.00000000000000e+00
+372 0.00000000000000e+00
+373 -7.50000000000000e+00
+374 0.00000000000000e+00
+375 5.00000000000000e-01
+376 -8.00000000000000e+00
+377 0.00000000000000e+00
+378 1.00000000000000e+00
+379 -7.50000000000000e+00
+380 0.00000000000000e+00
+381 0.00000000000000e+00
+382 -8.00000000000000e+00
+383 0.00000000000000e+00
+384 1.00000000000000e+00
+385 -8.00000000000000e+00
+386 0.00000000000000e+00
+387 5.00000000000000e-01
+388 -4.50000000000000e+00
+389 0.00000000000000e+00
+390 0.00000000000000e+00
+391 -4.50000000000000e+00
+392 0.00000000000000e+00
+393 5.00000000000000e-01
+394 -5.00000000000000e+00
+395 0.00000000000000e+00
+396 1.00000000000000e+00
+397 -4.50000000000000e+00
+398 0.00000000000000e+00
+399 5.00000000000000e-01
+400 -4.50000000000000e+00
+401 0.00000000000000e+00
+402 5.00000000000000e-01
+403 -5.50000000000000e+00
+404 0.00000000000000e+00
+405 0.00000000000000e+00
+406 -5.50000000000000e+00
+407 0.00000000000000e+00
+408 5.00000000000000e-01
+409 -6.00000000000000e+00
+410 0.00000000000000e+00
+411 1.00000000000000e+00
+412 -5.50000000000000e+00
+413 0.00000000000000e+00
+414 5.00000000000000e-01
+415 -5.50000000000000e+00
+416 0.00000000000000e+00
+417 5.00000000000000e-01
+418 -6.50000000000000e+00
+419 0.00000000000000e+00
+420 0.00000000000000e+00
+421 -6.50000000000000e+00
+422 0.00000000000000e+00
+423 5.00000000000000e-01
+424 -7.00000000000000e+00
+425 0.00000000000000e+00
+426 1.00000000000000e+00
+427 -6.50000000000000e+00
+428 0.00000000000000e+00
+429 5.00000000000000e-01
+430 -6.50000000000000e+00
+431 0.00000000000000e+00
+432 5.00000000000000e-01
+433 -7.50000000000000e+00
+434 0.00000000000000e+00
+435 0.00000000000000e+00
+436 -7.50000000000000e+00
+437 0.00000000000000e+00
+438 5.00000000000000e-01
+439 -8.00000000000000e+00
+440 0.00000000000000e+00
+441 1.00000000000000e+00
+442 -7.50000000000000e+00
+443 0.00000000000000e+00
+444 5.00000000000000e-01
+445 -7.50000000000000e+00
+446 0.00000000000000e+00
+447 5.00000000000000e-01
+448 -4.50000000000000e+00
+449 0.00000000000000e+00
+450 5.00000000000000e-01
+451 -5.50000000000000e+00
+452 0.00000000000000e+00
+453 5.00000000000000e-01
+454 -6.50000000000000e+00
+455 0.00000000000000e+00
+456 5.00000000000000e-01
+457 -7.50000000000000e+00
+458 0.00000000000000e+00
diff --git a/external/hypre/src/test/TEST_ij/data/beam_hex_dof459_np2/rbms.1.00000 b/external/hypre/src/test/TEST_ij/data/beam_hex_dof459_np2/rbms.1.00000
new file mode 100644
index 00000000..6dfcc9d8
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/data/beam_hex_dof459_np2/rbms.1.00000
@@ -0,0 +1,244 @@
+0 243
+0 0.00000000000000e+00
+1 0.00000000000000e+00
+2 0.00000000000000e+00
+3 0.00000000000000e+00
+4 0.00000000000000e+00
+5 0.00000000000000e+00
+6 0.00000000000000e+00
+7 0.00000000000000e+00
+8 0.00000000000000e+00
+9 0.00000000000000e+00
+10 0.00000000000000e+00
+11 0.00000000000000e+00
+12 0.00000000000000e+00
+13 0.00000000000000e+00
+14 0.00000000000000e+00
+15 0.00000000000000e+00
+16 0.00000000000000e+00
+17 -1.00000000000000e+00
+18 0.00000000000000e+00
+19 0.00000000000000e+00
+20 -1.00000000000000e+00
+21 0.00000000000000e+00
+22 0.00000000000000e+00
+23 -1.00000000000000e+00
+24 0.00000000000000e+00
+25 0.00000000000000e+00
+26 -1.00000000000000e+00
+27 0.00000000000000e+00
+28 0.00000000000000e+00
+29 -1.00000000000000e+00
+30 0.00000000000000e+00
+31 1.00000000000000e+00
+32 0.00000000000000e+00
+33 0.00000000000000e+00
+34 1.00000000000000e+00
+35 0.00000000000000e+00
+36 0.00000000000000e+00
+37 1.00000000000000e+00
+38 0.00000000000000e+00
+39 0.00000000000000e+00
+40 1.00000000000000e+00
+41 0.00000000000000e+00
+42 0.00000000000000e+00
+43 1.00000000000000e+00
+44 0.00000000000000e+00
+45 0.00000000000000e+00
+46 1.00000000000000e+00
+47 -1.00000000000000e+00
+48 0.00000000000000e+00
+49 1.00000000000000e+00
+50 -1.00000000000000e+00
+51 0.00000000000000e+00
+52 1.00000000000000e+00
+53 -1.00000000000000e+00
+54 0.00000000000000e+00
+55 1.00000000000000e+00
+56 -1.00000000000000e+00
+57 0.00000000000000e+00
+58 1.00000000000000e+00
+59 -1.00000000000000e+00
+60 0.00000000000000e+00
+61 0.00000000000000e+00
+62 0.00000000000000e+00
+63 0.00000000000000e+00
+64 0.00000000000000e+00
+65 -5.00000000000000e-01
+66 0.00000000000000e+00
+67 0.00000000000000e+00
+68 -1.00000000000000e+00
+69 0.00000000000000e+00
+70 0.00000000000000e+00
+71 -5.00000000000000e-01
+72 0.00000000000000e+00
+73 1.00000000000000e+00
+74 0.00000000000000e+00
+75 0.00000000000000e+00
+76 1.00000000000000e+00
+77 -5.00000000000000e-01
+78 0.00000000000000e+00
+79 1.00000000000000e+00
+80 -1.00000000000000e+00
+81 0.00000000000000e+00
+82 1.00000000000000e+00
+83 -5.00000000000000e-01
+84 0.00000000000000e+00
+85 5.00000000000000e-01
+86 0.00000000000000e+00
+87 0.00000000000000e+00
+88 5.00000000000000e-01
+89 0.00000000000000e+00
+90 0.00000000000000e+00
+91 5.00000000000000e-01
+92 -1.00000000000000e+00
+93 0.00000000000000e+00
+94 5.00000000000000e-01
+95 -1.00000000000000e+00
+96 0.00000000000000e+00
+97 0.00000000000000e+00
+98 0.00000000000000e+00
+99 0.00000000000000e+00
+100 0.00000000000000e+00
+101 -5.00000000000000e-01
+102 0.00000000000000e+00
+103 0.00000000000000e+00
+104 -1.00000000000000e+00
+105 0.00000000000000e+00
+106 1.00000000000000e+00
+107 0.00000000000000e+00
+108 0.00000000000000e+00
+109 1.00000000000000e+00
+110 -5.00000000000000e-01
+111 0.00000000000000e+00
+112 1.00000000000000e+00
+113 -1.00000000000000e+00
+114 0.00000000000000e+00
+115 5.00000000000000e-01
+116 0.00000000000000e+00
+117 0.00000000000000e+00
+118 5.00000000000000e-01
+119 -1.00000000000000e+00
+120 0.00000000000000e+00
+121 0.00000000000000e+00
+122 0.00000000000000e+00
+123 0.00000000000000e+00
+124 0.00000000000000e+00
+125 -5.00000000000000e-01
+126 0.00000000000000e+00
+127 0.00000000000000e+00
+128 -1.00000000000000e+00
+129 0.00000000000000e+00
+130 1.00000000000000e+00
+131 0.00000000000000e+00
+132 0.00000000000000e+00
+133 1.00000000000000e+00
+134 -5.00000000000000e-01
+135 0.00000000000000e+00
+136 1.00000000000000e+00
+137 -1.00000000000000e+00
+138 0.00000000000000e+00
+139 5.00000000000000e-01
+140 0.00000000000000e+00
+141 0.00000000000000e+00
+142 5.00000000000000e-01
+143 -1.00000000000000e+00
+144 0.00000000000000e+00
+145 0.00000000000000e+00
+146 0.00000000000000e+00
+147 0.00000000000000e+00
+148 0.00000000000000e+00
+149 -5.00000000000000e-01
+150 0.00000000000000e+00
+151 0.00000000000000e+00
+152 -1.00000000000000e+00
+153 0.00000000000000e+00
+154 1.00000000000000e+00
+155 0.00000000000000e+00
+156 0.00000000000000e+00
+157 1.00000000000000e+00
+158 -5.00000000000000e-01
+159 0.00000000000000e+00
+160 1.00000000000000e+00
+161 -1.00000000000000e+00
+162 0.00000000000000e+00
+163 5.00000000000000e-01
+164 0.00000000000000e+00
+165 0.00000000000000e+00
+166 5.00000000000000e-01
+167 -1.00000000000000e+00
+168 0.00000000000000e+00
+169 0.00000000000000e+00
+170 -5.00000000000000e-01
+171 0.00000000000000e+00
+172 5.00000000000000e-01
+173 0.00000000000000e+00
+174 0.00000000000000e+00
+175 5.00000000000000e-01
+176 -5.00000000000000e-01
+177 0.00000000000000e+00
+178 5.00000000000000e-01
+179 -1.00000000000000e+00
+180 0.00000000000000e+00
+181 5.00000000000000e-01
+182 -5.00000000000000e-01
+183 0.00000000000000e+00
+184 1.00000000000000e+00
+185 -5.00000000000000e-01
+186 0.00000000000000e+00
+187 0.00000000000000e+00
+188 -5.00000000000000e-01
+189 0.00000000000000e+00
+190 5.00000000000000e-01
+191 0.00000000000000e+00
+192 0.00000000000000e+00
+193 5.00000000000000e-01
+194 -5.00000000000000e-01
+195 0.00000000000000e+00
+196 5.00000000000000e-01
+197 -1.00000000000000e+00
+198 0.00000000000000e+00
+199 1.00000000000000e+00
+200 -5.00000000000000e-01
+201 0.00000000000000e+00
+202 0.00000000000000e+00
+203 -5.00000000000000e-01
+204 0.00000000000000e+00
+205 5.00000000000000e-01
+206 0.00000000000000e+00
+207 0.00000000000000e+00
+208 5.00000000000000e-01
+209 -5.00000000000000e-01
+210 0.00000000000000e+00
+211 5.00000000000000e-01
+212 -1.00000000000000e+00
+213 0.00000000000000e+00
+214 1.00000000000000e+00
+215 -5.00000000000000e-01
+216 0.00000000000000e+00
+217 0.00000000000000e+00
+218 -5.00000000000000e-01
+219 0.00000000000000e+00
+220 5.00000000000000e-01
+221 0.00000000000000e+00
+222 0.00000000000000e+00
+223 5.00000000000000e-01
+224 -5.00000000000000e-01
+225 0.00000000000000e+00
+226 5.00000000000000e-01
+227 -1.00000000000000e+00
+228 0.00000000000000e+00
+229 1.00000000000000e+00
+230 -5.00000000000000e-01
+231 0.00000000000000e+00
+232 5.00000000000000e-01
+233 -5.00000000000000e-01
+234 0.00000000000000e+00
+235 5.00000000000000e-01
+236 -5.00000000000000e-01
+237 0.00000000000000e+00
+238 5.00000000000000e-01
+239 -5.00000000000000e-01
+240 0.00000000000000e+00
+241 5.00000000000000e-01
+242 -5.00000000000000e-01
diff --git a/external/hypre/src/test/TEST_ij/data/beam_hex_dof459_np2/rbms.1.00001 b/external/hypre/src/test/TEST_ij/data/beam_hex_dof459_np2/rbms.1.00001
new file mode 100644
index 00000000..adc00d4d
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/data/beam_hex_dof459_np2/rbms.1.00001
@@ -0,0 +1,217 @@
+243 459
+243 0.00000000000000e+00
+244 0.00000000000000e+00
+245 0.00000000000000e+00
+246 0.00000000000000e+00
+247 0.00000000000000e+00
+248 0.00000000000000e+00
+249 0.00000000000000e+00
+250 0.00000000000000e+00
+251 0.00000000000000e+00
+252 0.00000000000000e+00
+253 0.00000000000000e+00
+254 0.00000000000000e+00
+255 0.00000000000000e+00
+256 0.00000000000000e+00
+257 -1.00000000000000e+00
+258 0.00000000000000e+00
+259 0.00000000000000e+00
+260 -1.00000000000000e+00
+261 0.00000000000000e+00
+262 0.00000000000000e+00
+263 -1.00000000000000e+00
+264 0.00000000000000e+00
+265 0.00000000000000e+00
+266 -1.00000000000000e+00
+267 0.00000000000000e+00
+268 1.00000000000000e+00
+269 0.00000000000000e+00
+270 0.00000000000000e+00
+271 1.00000000000000e+00
+272 0.00000000000000e+00
+273 0.00000000000000e+00
+274 1.00000000000000e+00
+275 0.00000000000000e+00
+276 0.00000000000000e+00
+277 1.00000000000000e+00
+278 0.00000000000000e+00
+279 0.00000000000000e+00
+280 1.00000000000000e+00
+281 -1.00000000000000e+00
+282 0.00000000000000e+00
+283 1.00000000000000e+00
+284 -1.00000000000000e+00
+285 0.00000000000000e+00
+286 1.00000000000000e+00
+287 -1.00000000000000e+00
+288 0.00000000000000e+00
+289 1.00000000000000e+00
+290 -1.00000000000000e+00
+291 0.00000000000000e+00
+292 0.00000000000000e+00
+293 0.00000000000000e+00
+294 0.00000000000000e+00
+295 0.00000000000000e+00
+296 -5.00000000000000e-01
+297 0.00000000000000e+00
+298 0.00000000000000e+00
+299 -1.00000000000000e+00
+300 0.00000000000000e+00
+301 1.00000000000000e+00
+302 0.00000000000000e+00
+303 0.00000000000000e+00
+304 1.00000000000000e+00
+305 -5.00000000000000e-01
+306 0.00000000000000e+00
+307 1.00000000000000e+00
+308 -1.00000000000000e+00
+309 0.00000000000000e+00
+310 5.00000000000000e-01
+311 0.00000000000000e+00
+312 0.00000000000000e+00
+313 5.00000000000000e-01
+314 -1.00000000000000e+00
+315 0.00000000000000e+00
+316 0.00000000000000e+00
+317 0.00000000000000e+00
+318 0.00000000000000e+00
+319 0.00000000000000e+00
+320 -5.00000000000000e-01
+321 0.00000000000000e+00
+322 0.00000000000000e+00
+323 -1.00000000000000e+00
+324 0.00000000000000e+00
+325 1.00000000000000e+00
+326 0.00000000000000e+00
+327 0.00000000000000e+00
+328 1.00000000000000e+00
+329 -5.00000000000000e-01
+330 0.00000000000000e+00
+331 1.00000000000000e+00
+332 -1.00000000000000e+00
+333 0.00000000000000e+00
+334 5.00000000000000e-01
+335 0.00000000000000e+00
+336 0.00000000000000e+00
+337 5.00000000000000e-01
+338 -1.00000000000000e+00
+339 0.00000000000000e+00
+340 0.00000000000000e+00
+341 0.00000000000000e+00
+342 0.00000000000000e+00
+343 0.00000000000000e+00
+344 -5.00000000000000e-01
+345 0.00000000000000e+00
+346 0.00000000000000e+00
+347 -1.00000000000000e+00
+348 0.00000000000000e+00
+349 1.00000000000000e+00
+350 0.00000000000000e+00
+351 0.00000000000000e+00
+352 1.00000000000000e+00
+353 -5.00000000000000e-01
+354 0.00000000000000e+00
+355 1.00000000000000e+00
+356 -1.00000000000000e+00
+357 0.00000000000000e+00
+358 5.00000000000000e-01
+359 0.00000000000000e+00
+360 0.00000000000000e+00
+361 5.00000000000000e-01
+362 -1.00000000000000e+00
+363 0.00000000000000e+00
+364 0.00000000000000e+00
+365 0.00000000000000e+00
+366 0.00000000000000e+00
+367 0.00000000000000e+00
+368 -5.00000000000000e-01
+369 0.00000000000000e+00
+370 0.00000000000000e+00
+371 -1.00000000000000e+00
+372 0.00000000000000e+00
+373 1.00000000000000e+00
+374 0.00000000000000e+00
+375 0.00000000000000e+00
+376 1.00000000000000e+00
+377 -5.00000000000000e-01
+378 0.00000000000000e+00
+379 1.00000000000000e+00
+380 -1.00000000000000e+00
+381 0.00000000000000e+00
+382 5.00000000000000e-01
+383 0.00000000000000e+00
+384 0.00000000000000e+00
+385 5.00000000000000e-01
+386 -1.00000000000000e+00
+387 0.00000000000000e+00
+388 0.00000000000000e+00
+389 -5.00000000000000e-01
+390 0.00000000000000e+00
+391 5.00000000000000e-01
+392 0.00000000000000e+00
+393 0.00000000000000e+00
+394 5.00000000000000e-01
+395 -5.00000000000000e-01
+396 0.00000000000000e+00
+397 5.00000000000000e-01
+398 -1.00000000000000e+00
+399 0.00000000000000e+00
+400 1.00000000000000e+00
+401 -5.00000000000000e-01
+402 0.00000000000000e+00
+403 0.00000000000000e+00
+404 -5.00000000000000e-01
+405 0.00000000000000e+00
+406 5.00000000000000e-01
+407 0.00000000000000e+00
+408 0.00000000000000e+00
+409 5.00000000000000e-01
+410 -5.00000000000000e-01
+411 0.00000000000000e+00
+412 5.00000000000000e-01
+413 -1.00000000000000e+00
+414 0.00000000000000e+00
+415 1.00000000000000e+00
+416 -5.00000000000000e-01
+417 0.00000000000000e+00
+418 0.00000000000000e+00
+419 -5.00000000000000e-01
+420 0.00000000000000e+00
+421 5.00000000000000e-01
+422 0.00000000000000e+00
+423 0.00000000000000e+00
+424 5.00000000000000e-01
+425 -5.00000000000000e-01
+426 0.00000000000000e+00
+427 5.00000000000000e-01
+428 -1.00000000000000e+00
+429 0.00000000000000e+00
+430 1.00000000000000e+00
+431 -5.00000000000000e-01
+432 0.00000000000000e+00
+433 0.00000000000000e+00
+434 -5.00000000000000e-01
+435 0.00000000000000e+00
+436 5.00000000000000e-01
+437 0.00000000000000e+00
+438 0.00000000000000e+00
+439 5.00000000000000e-01
+440 -5.00000000000000e-01
+441 0.00000000000000e+00
+442 5.00000000000000e-01
+443 -1.00000000000000e+00
+444 0.00000000000000e+00
+445 1.00000000000000e+00
+446 -5.00000000000000e-01
+447 0.00000000000000e+00
+448 5.00000000000000e-01
+449 -5.00000000000000e-01
+450 0.00000000000000e+00
+451 5.00000000000000e-01
+452 -5.00000000000000e-01
+453 0.00000000000000e+00
+454 5.00000000000000e-01
+455 -5.00000000000000e-01
+456 0.00000000000000e+00
+457 5.00000000000000e-01
+458 -5.00000000000000e-01
diff --git a/external/hypre/src/test/TEST_ij/data/beam_hex_dof459_np2/rbms.2.00000 b/external/hypre/src/test/TEST_ij/data/beam_hex_dof459_np2/rbms.2.00000
new file mode 100644
index 00000000..88ed98dc
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/data/beam_hex_dof459_np2/rbms.2.00000
@@ -0,0 +1,244 @@
+0 243
+0 0.00000000000000e+00
+1 0.00000000000000e+00
+2 0.00000000000000e+00
+3 0.00000000000000e+00
+4 0.00000000000000e+00
+5 1.00000000000000e+00
+6 0.00000000000000e+00
+7 0.00000000000000e+00
+8 2.00000000000000e+00
+9 0.00000000000000e+00
+10 0.00000000000000e+00
+11 3.00000000000000e+00
+12 0.00000000000000e+00
+13 0.00000000000000e+00
+14 4.00000000000000e+00
+15 0.00000000000000e+00
+16 0.00000000000000e+00
+17 0.00000000000000e+00
+18 0.00000000000000e+00
+19 0.00000000000000e+00
+20 1.00000000000000e+00
+21 0.00000000000000e+00
+22 0.00000000000000e+00
+23 2.00000000000000e+00
+24 0.00000000000000e+00
+25 0.00000000000000e+00
+26 3.00000000000000e+00
+27 0.00000000000000e+00
+28 0.00000000000000e+00
+29 4.00000000000000e+00
+30 -1.00000000000000e+00
+31 0.00000000000000e+00
+32 0.00000000000000e+00
+33 -1.00000000000000e+00
+34 0.00000000000000e+00
+35 1.00000000000000e+00
+36 -1.00000000000000e+00
+37 0.00000000000000e+00
+38 2.00000000000000e+00
+39 -1.00000000000000e+00
+40 0.00000000000000e+00
+41 3.00000000000000e+00
+42 -1.00000000000000e+00
+43 0.00000000000000e+00
+44 4.00000000000000e+00
+45 -1.00000000000000e+00
+46 0.00000000000000e+00
+47 0.00000000000000e+00
+48 -1.00000000000000e+00
+49 0.00000000000000e+00
+50 1.00000000000000e+00
+51 -1.00000000000000e+00
+52 0.00000000000000e+00
+53 2.00000000000000e+00
+54 -1.00000000000000e+00
+55 0.00000000000000e+00
+56 3.00000000000000e+00
+57 -1.00000000000000e+00
+58 0.00000000000000e+00
+59 4.00000000000000e+00
+60 0.00000000000000e+00
+61 0.00000000000000e+00
+62 5.00000000000000e-01
+63 0.00000000000000e+00
+64 0.00000000000000e+00
+65 1.00000000000000e+00
+66 0.00000000000000e+00
+67 0.00000000000000e+00
+68 5.00000000000000e-01
+69 0.00000000000000e+00
+70 0.00000000000000e+00
+71 0.00000000000000e+00
+72 -1.00000000000000e+00
+73 0.00000000000000e+00
+74 5.00000000000000e-01
+75 -1.00000000000000e+00
+76 0.00000000000000e+00
+77 1.00000000000000e+00
+78 -1.00000000000000e+00
+79 0.00000000000000e+00
+80 5.00000000000000e-01
+81 -1.00000000000000e+00
+82 0.00000000000000e+00
+83 0.00000000000000e+00
+84 -5.00000000000000e-01
+85 0.00000000000000e+00
+86 0.00000000000000e+00
+87 -5.00000000000000e-01
+88 0.00000000000000e+00
+89 1.00000000000000e+00
+90 -5.00000000000000e-01
+91 0.00000000000000e+00
+92 1.00000000000000e+00
+93 -5.00000000000000e-01
+94 0.00000000000000e+00
+95 0.00000000000000e+00
+96 0.00000000000000e+00
+97 0.00000000000000e+00
+98 1.50000000000000e+00
+99 0.00000000000000e+00
+100 0.00000000000000e+00
+101 2.00000000000000e+00
+102 0.00000000000000e+00
+103 0.00000000000000e+00
+104 1.50000000000000e+00
+105 -1.00000000000000e+00
+106 0.00000000000000e+00
+107 1.50000000000000e+00
+108 -1.00000000000000e+00
+109 0.00000000000000e+00
+110 2.00000000000000e+00
+111 -1.00000000000000e+00
+112 0.00000000000000e+00
+113 1.50000000000000e+00
+114 -5.00000000000000e-01
+115 0.00000000000000e+00
+116 2.00000000000000e+00
+117 -5.00000000000000e-01
+118 0.00000000000000e+00
+119 2.00000000000000e+00
+120 0.00000000000000e+00
+121 0.00000000000000e+00
+122 2.50000000000000e+00
+123 0.00000000000000e+00
+124 0.00000000000000e+00
+125 3.00000000000000e+00
+126 0.00000000000000e+00
+127 0.00000000000000e+00
+128 2.50000000000000e+00
+129 -1.00000000000000e+00
+130 0.00000000000000e+00
+131 2.50000000000000e+00
+132 -1.00000000000000e+00
+133 0.00000000000000e+00
+134 3.00000000000000e+00
+135 -1.00000000000000e+00
+136 0.00000000000000e+00
+137 2.50000000000000e+00
+138 -5.00000000000000e-01
+139 0.00000000000000e+00
+140 3.00000000000000e+00
+141 -5.00000000000000e-01
+142 0.00000000000000e+00
+143 3.00000000000000e+00
+144 0.00000000000000e+00
+145 0.00000000000000e+00
+146 3.50000000000000e+00
+147 0.00000000000000e+00
+148 0.00000000000000e+00
+149 4.00000000000000e+00
+150 0.00000000000000e+00
+151 0.00000000000000e+00
+152 3.50000000000000e+00
+153 -1.00000000000000e+00
+154 0.00000000000000e+00
+155 3.50000000000000e+00
+156 -1.00000000000000e+00
+157 0.00000000000000e+00
+158 4.00000000000000e+00
+159 -1.00000000000000e+00
+160 0.00000000000000e+00
+161 3.50000000000000e+00
+162 -5.00000000000000e-01
+163 0.00000000000000e+00
+164 4.00000000000000e+00
+165 -5.00000000000000e-01
+166 0.00000000000000e+00
+167 4.00000000000000e+00
+168 0.00000000000000e+00
+169 0.00000000000000e+00
+170 5.00000000000000e-01
+171 -5.00000000000000e-01
+172 0.00000000000000e+00
+173 5.00000000000000e-01
+174 -5.00000000000000e-01
+175 0.00000000000000e+00
+176 1.00000000000000e+00
+177 -5.00000000000000e-01
+178 0.00000000000000e+00
+179 5.00000000000000e-01
+180 -5.00000000000000e-01
+181 0.00000000000000e+00
+182 0.00000000000000e+00
+183 -1.00000000000000e+00
+184 0.00000000000000e+00
+185 5.00000000000000e-01
+186 0.00000000000000e+00
+187 0.00000000000000e+00
+188 1.50000000000000e+00
+189 -5.00000000000000e-01
+190 0.00000000000000e+00
+191 1.50000000000000e+00
+192 -5.00000000000000e-01
+193 0.00000000000000e+00
+194 2.00000000000000e+00
+195 -5.00000000000000e-01
+196 0.00000000000000e+00
+197 1.50000000000000e+00
+198 -1.00000000000000e+00
+199 0.00000000000000e+00
+200 1.50000000000000e+00
+201 0.00000000000000e+00
+202 0.00000000000000e+00
+203 2.50000000000000e+00
+204 -5.00000000000000e-01
+205 0.00000000000000e+00
+206 2.50000000000000e+00
+207 -5.00000000000000e-01
+208 0.00000000000000e+00
+209 3.00000000000000e+00
+210 -5.00000000000000e-01
+211 0.00000000000000e+00
+212 2.50000000000000e+00
+213 -1.00000000000000e+00
+214 0.00000000000000e+00
+215 2.50000000000000e+00
+216 0.00000000000000e+00
+217 0.00000000000000e+00
+218 3.50000000000000e+00
+219 -5.00000000000000e-01
+220 0.00000000000000e+00
+221 3.50000000000000e+00
+222 -5.00000000000000e-01
+223 0.00000000000000e+00
+224 4.00000000000000e+00
+225 -5.00000000000000e-01
+226 0.00000000000000e+00
+227 3.50000000000000e+00
+228 -1.00000000000000e+00
+229 0.00000000000000e+00
+230 3.50000000000000e+00
+231 -5.00000000000000e-01
+232 0.00000000000000e+00
+233 5.00000000000000e-01
+234 -5.00000000000000e-01
+235 0.00000000000000e+00
+236 1.50000000000000e+00
+237 -5.00000000000000e-01
+238 0.00000000000000e+00
+239 2.50000000000000e+00
+240 -5.00000000000000e-01
+241 0.00000000000000e+00
+242 3.50000000000000e+00
diff --git a/external/hypre/src/test/TEST_ij/data/beam_hex_dof459_np2/rbms.2.00001 b/external/hypre/src/test/TEST_ij/data/beam_hex_dof459_np2/rbms.2.00001
new file mode 100644
index 00000000..4c70df8a
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/data/beam_hex_dof459_np2/rbms.2.00001
@@ -0,0 +1,217 @@
+243 459
+243 0.00000000000000e+00
+244 0.00000000000000e+00
+245 5.00000000000000e+00
+246 0.00000000000000e+00
+247 0.00000000000000e+00
+248 6.00000000000000e+00
+249 0.00000000000000e+00
+250 0.00000000000000e+00
+251 7.00000000000000e+00
+252 0.00000000000000e+00
+253 0.00000000000000e+00
+254 8.00000000000000e+00
+255 0.00000000000000e+00
+256 0.00000000000000e+00
+257 5.00000000000000e+00
+258 0.00000000000000e+00
+259 0.00000000000000e+00
+260 6.00000000000000e+00
+261 0.00000000000000e+00
+262 0.00000000000000e+00
+263 7.00000000000000e+00
+264 0.00000000000000e+00
+265 0.00000000000000e+00
+266 8.00000000000000e+00
+267 -1.00000000000000e+00
+268 0.00000000000000e+00
+269 5.00000000000000e+00
+270 -1.00000000000000e+00
+271 0.00000000000000e+00
+272 6.00000000000000e+00
+273 -1.00000000000000e+00
+274 0.00000000000000e+00
+275 7.00000000000000e+00
+276 -1.00000000000000e+00
+277 0.00000000000000e+00
+278 8.00000000000000e+00
+279 -1.00000000000000e+00
+280 0.00000000000000e+00
+281 5.00000000000000e+00
+282 -1.00000000000000e+00
+283 0.00000000000000e+00
+284 6.00000000000000e+00
+285 -1.00000000000000e+00
+286 0.00000000000000e+00
+287 7.00000000000000e+00
+288 -1.00000000000000e+00
+289 0.00000000000000e+00
+290 8.00000000000000e+00
+291 0.00000000000000e+00
+292 0.00000000000000e+00
+293 4.50000000000000e+00
+294 0.00000000000000e+00
+295 0.00000000000000e+00
+296 5.00000000000000e+00
+297 0.00000000000000e+00
+298 0.00000000000000e+00
+299 4.50000000000000e+00
+300 -1.00000000000000e+00
+301 0.00000000000000e+00
+302 4.50000000000000e+00
+303 -1.00000000000000e+00
+304 0.00000000000000e+00
+305 5.00000000000000e+00
+306 -1.00000000000000e+00
+307 0.00000000000000e+00
+308 4.50000000000000e+00
+309 -5.00000000000000e-01
+310 0.00000000000000e+00
+311 5.00000000000000e+00
+312 -5.00000000000000e-01
+313 0.00000000000000e+00
+314 5.00000000000000e+00
+315 0.00000000000000e+00
+316 0.00000000000000e+00
+317 5.50000000000000e+00
+318 0.00000000000000e+00
+319 0.00000000000000e+00
+320 6.00000000000000e+00
+321 0.00000000000000e+00
+322 0.00000000000000e+00
+323 5.50000000000000e+00
+324 -1.00000000000000e+00
+325 0.00000000000000e+00
+326 5.50000000000000e+00
+327 -1.00000000000000e+00
+328 0.00000000000000e+00
+329 6.00000000000000e+00
+330 -1.00000000000000e+00
+331 0.00000000000000e+00
+332 5.50000000000000e+00
+333 -5.00000000000000e-01
+334 0.00000000000000e+00
+335 6.00000000000000e+00
+336 -5.00000000000000e-01
+337 0.00000000000000e+00
+338 6.00000000000000e+00
+339 0.00000000000000e+00
+340 0.00000000000000e+00
+341 6.50000000000000e+00
+342 0.00000000000000e+00
+343 0.00000000000000e+00
+344 7.00000000000000e+00
+345 0.00000000000000e+00
+346 0.00000000000000e+00
+347 6.50000000000000e+00
+348 -1.00000000000000e+00
+349 0.00000000000000e+00
+350 6.50000000000000e+00
+351 -1.00000000000000e+00
+352 0.00000000000000e+00
+353 7.00000000000000e+00
+354 -1.00000000000000e+00
+355 0.00000000000000e+00
+356 6.50000000000000e+00
+357 -5.00000000000000e-01
+358 0.00000000000000e+00
+359 7.00000000000000e+00
+360 -5.00000000000000e-01
+361 0.00000000000000e+00
+362 7.00000000000000e+00
+363 0.00000000000000e+00
+364 0.00000000000000e+00
+365 7.50000000000000e+00
+366 0.00000000000000e+00
+367 0.00000000000000e+00
+368 8.00000000000000e+00
+369 0.00000000000000e+00
+370 0.00000000000000e+00
+371 7.50000000000000e+00
+372 -1.00000000000000e+00
+373 0.00000000000000e+00
+374 7.50000000000000e+00
+375 -1.00000000000000e+00
+376 0.00000000000000e+00
+377 8.00000000000000e+00
+378 -1.00000000000000e+00
+379 0.00000000000000e+00
+380 7.50000000000000e+00
+381 -5.00000000000000e-01
+382 0.00000000000000e+00
+383 8.00000000000000e+00
+384 -5.00000000000000e-01
+385 0.00000000000000e+00
+386 8.00000000000000e+00
+387 0.00000000000000e+00
+388 0.00000000000000e+00
+389 4.50000000000000e+00
+390 -5.00000000000000e-01
+391 0.00000000000000e+00
+392 4.50000000000000e+00
+393 -5.00000000000000e-01
+394 0.00000000000000e+00
+395 5.00000000000000e+00
+396 -5.00000000000000e-01
+397 0.00000000000000e+00
+398 4.50000000000000e+00
+399 -1.00000000000000e+00
+400 0.00000000000000e+00
+401 4.50000000000000e+00
+402 0.00000000000000e+00
+403 0.00000000000000e+00
+404 5.50000000000000e+00
+405 -5.00000000000000e-01
+406 0.00000000000000e+00
+407 5.50000000000000e+00
+408 -5.00000000000000e-01
+409 0.00000000000000e+00
+410 6.00000000000000e+00
+411 -5.00000000000000e-01
+412 0.00000000000000e+00
+413 5.50000000000000e+00
+414 -1.00000000000000e+00
+415 0.00000000000000e+00
+416 5.50000000000000e+00
+417 0.00000000000000e+00
+418 0.00000000000000e+00
+419 6.50000000000000e+00
+420 -5.00000000000000e-01
+421 0.00000000000000e+00
+422 6.50000000000000e+00
+423 -5.00000000000000e-01
+424 0.00000000000000e+00
+425 7.00000000000000e+00
+426 -5.00000000000000e-01
+427 0.00000000000000e+00
+428 6.50000000000000e+00
+429 -1.00000000000000e+00
+430 0.00000000000000e+00
+431 6.50000000000000e+00
+432 0.00000000000000e+00
+433 0.00000000000000e+00
+434 7.50000000000000e+00
+435 -5.00000000000000e-01
+436 0.00000000000000e+00
+437 7.50000000000000e+00
+438 -5.00000000000000e-01
+439 0.00000000000000e+00
+440 8.00000000000000e+00
+441 -5.00000000000000e-01
+442 0.00000000000000e+00
+443 7.50000000000000e+00
+444 -1.00000000000000e+00
+445 0.00000000000000e+00
+446 7.50000000000000e+00
+447 -5.00000000000000e-01
+448 0.00000000000000e+00
+449 4.50000000000000e+00
+450 -5.00000000000000e-01
+451 0.00000000000000e+00
+452 5.50000000000000e+00
+453 -5.00000000000000e-01
+454 0.00000000000000e+00
+455 6.50000000000000e+00
+456 -5.00000000000000e-01
+457 0.00000000000000e+00
+458 7.50000000000000e+00
diff --git a/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/A.IJ.00000 b/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/A.IJ.00000
new file mode 100644
index 00000000..7112b3f6
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/A.IJ.00000
@@ -0,0 +1,20224 @@
+0 674 0 674
+0 0 1.70833333333333e+01
+0 152 2.12500000000000e+00
+0 1 -4.16666666666667e+00
+0 139 2.12500000000000e+00
+0 138 -2.16666666666667e+00
+0 2 -4.16666666666667e+00
+0 146 2.12500000000000e+00
+0 145 -2.08333333333333e+00
+0 151 2.12500000000000e+00
+0 140 -2.08333333333333e+00
+0 144 -2.16666666666667e+00
+0 143 4.16666666666667e-02
+0 155 -8.33333333333333e-02
+0 136 4.16666666666667e-02
+0 142 -8.33333333333333e-02
+0 137 4.16666666666667e-02
+0 148 4.16666666666667e-02
+0 154 -8.33333333333333e-02
+0 135 -2.50000000000000e-01
+0 149 -8.33333333333333e-02
+0 1429 2.08333333333333e+00
+0 1430 2.08333333333333e+00
+0 1428 -1.25000000000000e+01
+1 1 1.29166666666667e+01
+1 139 -6.50000000000000e+00
+1 0 -4.16666666666667e+00
+1 138 2.12500000000000e+00
+1 146 2.12500000000000e+00
+1 152 -4.25000000000000e+00
+1 140 2.12500000000000e+00
+1 145 -2.16666666666667e+00
+1 144 -2.08333333333333e+00
+1 150 2.12500000000000e+00
+1 135 4.16666666666667e-02
+1 141 -8.33333333333333e-02
+1 136 -8.33333333333333e-02
+1 147 4.16666666666667e-02
+1 153 -8.33333333333333e-02
+1 149 4.16666666666667e-02
+1 155 -8.33333333333333e-02
+1 143 4.16666666666667e-02
+1 1428 2.08333333333333e+00
+1 1429 -4.16666666666667e+00
+2 2 1.29166666666667e+01
+2 139 2.12500000000000e+00
+2 138 -2.08333333333333e+00
+2 150 2.12500000000000e+00
+2 140 -2.16666666666667e+00
+2 146 -6.50000000000000e+00
+2 145 2.12500000000000e+00
+2 151 -4.25000000000000e+00
+2 0 -4.16666666666667e+00
+2 144 2.12500000000000e+00
+2 141 4.16666666666667e-02
+2 153 -8.33333333333333e-02
+2 137 -8.33333333333333e-02
+2 135 4.16666666666667e-02
+2 142 4.16666666666667e-02
+2 148 4.16666666666667e-02
+2 154 -8.33333333333333e-02
+2 147 -8.33333333333333e-02
+2 1430 -4.16666666666667e+00
+2 1428 2.08333333333333e+00
+3 3 7.50000000000000e-01
+3 179 -8.33333333333333e-02
+3 160 4.16666666666667e-02
+3 166 -8.33333333333333e-02
+3 161 4.16666666666667e-02
+3 172 4.16666666666667e-02
+3 178 -8.33333333333333e-02
+3 159 -2.50000000000000e-01
+3 173 -8.33333333333333e-02
+3 164 -4.16666666666667e-02
+3 176 8.33333333333333e-02
+3 4 -8.33333333333333e-02
+3 163 8.33333333333333e-02
+3 157 4.16666666666667e-02
+3 162 -1.25000000000000e-01
+3 5 -8.33333333333333e-02
+3 170 8.33333333333333e-02
+3 158 4.16666666666667e-02
+3 169 -4.16666666666667e-02
+3 175 8.33333333333333e-02
+3 167 4.16666666666667e-02
+3 168 -1.25000000000000e-01
+3 156 -2.50000000000000e-01
+4 4 6.66666666666667e-01
+4 159 4.16666666666667e-02
+4 165 -8.33333333333333e-02
+4 160 -8.33333333333333e-02
+4 171 4.16666666666667e-02
+4 177 -8.33333333333333e-02
+4 173 4.16666666666667e-02
+4 179 -8.33333333333333e-02
+4 164 8.33333333333333e-02
+4 163 -3.75000000000000e-01
+4 3 -8.33333333333333e-02
+4 162 8.33333333333333e-02
+4 156 4.16666666666667e-02
+4 170 8.33333333333333e-02
+4 176 -1.66666666666667e-01
+4 167 4.16666666666667e-02
+4 169 -1.25000000000000e-01
+4 157 -8.33333333333333e-02
+4 168 -4.16666666666667e-02
+4 174 8.33333333333333e-02
+5 5 6.66666666666667e-01
+5 165 4.16666666666667e-02
+5 177 -8.33333333333333e-02
+5 161 -8.33333333333333e-02
+5 159 4.16666666666667e-02
+5 172 4.16666666666667e-02
+5 178 -8.33333333333333e-02
+5 171 -8.33333333333333e-02
+5 164 -1.25000000000000e-01
+5 163 8.33333333333333e-02
+5 162 -4.16666666666667e-02
+5 174 8.33333333333333e-02
+5 166 4.16666666666667e-02
+5 170 -3.75000000000000e-01
+5 158 -8.33333333333333e-02
+5 169 8.33333333333333e-02
+5 175 -1.66666666666667e-01
+5 3 -8.33333333333333e-02
+5 168 8.33333333333333e-02
+5 156 4.16666666666667e-02
+6 6 7.50000000000000e-01
+6 190 8.33333333333333e-02
+6 183 -1.25000000000000e-01
+6 191 8.33333333333333e-02
+6 188 8.33333333333333e-02
+6 186 -1.25000000000000e-01
+6 184 8.33333333333333e-02
+6 7 -8.33333333333333e-02
+6 181 4.16666666666667e-02
+6 8 -8.33333333333333e-02
+6 182 4.16666666666667e-02
+6 187 -4.16666666666667e-02
+6 185 -4.16666666666667e-02
+6 180 -2.50000000000000e-01
+6 788 4.16666666666667e-02
+6 794 -8.33333333333333e-02
+6 784 4.16666666666667e-02
+6 787 -8.33333333333333e-02
+6 785 4.16666666666667e-02
+6 790 4.16666666666667e-02
+6 793 -8.33333333333333e-02
+6 783 -2.50000000000000e-01
+6 791 -8.33333333333333e-02
+7 7 6.66666666666667e-01
+7 183 8.33333333333333e-02
+7 185 8.33333333333333e-02
+7 184 -3.75000000000000e-01
+7 189 8.33333333333333e-02
+7 191 -1.66666666666667e-01
+7 188 8.33333333333333e-02
+7 187 -1.25000000000000e-01
+7 6 -8.33333333333333e-02
+7 180 4.16666666666667e-02
+7 181 -8.33333333333333e-02
+7 186 -4.16666666666667e-02
+7 783 4.16666666666667e-02
+7 786 -8.33333333333333e-02
+7 784 -8.33333333333333e-02
+7 789 4.16666666666667e-02
+7 792 -8.33333333333333e-02
+7 791 4.16666666666667e-02
+7 794 -8.33333333333333e-02
+7 788 4.16666666666667e-02
+8 8 6.66666666666667e-01
+8 185 -1.25000000000000e-01
+8 184 8.33333333333333e-02
+8 190 -1.66666666666667e-01
+8 187 8.33333333333333e-02
+8 189 8.33333333333333e-02
+8 188 -3.75000000000000e-01
+8 186 8.33333333333333e-02
+8 183 -4.16666666666667e-02
+8 182 -8.33333333333333e-02
+8 6 -8.33333333333333e-02
+8 180 4.16666666666667e-02
+8 786 4.16666666666667e-02
+8 792 -8.33333333333333e-02
+8 785 -8.33333333333333e-02
+8 783 4.16666666666667e-02
+8 787 4.16666666666667e-02
+8 790 4.16666666666667e-02
+8 793 -8.33333333333333e-02
+8 789 -8.33333333333333e-02
+9 9 1.27500000000000e+01
+9 200 2.12500000000000e+00
+9 194 -2.08333333333333e+00
+9 193 2.12500000000000e+00
+9 192 -2.16666666666667e+00
+9 11 -4.16666666666667e+00
+9 198 -4.20833333333333e+00
+9 196 4.16666666666667e-02
+9 10 -8.33333333333333e-02
+9 195 -1.25000000000000e-01
+9 203 -8.33333333333333e-02
+9 199 -4.16666666666667e-02
+9 202 4.16666666666667e-02
+9 197 4.16666666666667e-02
+9 1466 2.08333333333333e+00
+9 1465 2.08333333333333e+00
+9 1464 -6.25000000000000e+00
+9 1463 2.08333333333333e+00
+9 1462 -4.16666666666667e+00
+10 10 1.28333333333333e+01
+10 194 2.12500000000000e+00
+10 11 -4.25000000000000e+00
+10 200 2.12500000000000e+00
+10 193 -6.50000000000000e+00
+10 199 -4.20833333333333e+00
+10 192 2.12500000000000e+00
+10 203 4.16666666666667e-02
+10 196 -4.16666666666667e-02
+10 195 4.16666666666667e-02
+10 9 -8.33333333333333e-02
+10 197 -4.16666666666667e-02
+10 198 -4.16666666666667e-02
+10 201 4.16666666666667e-02
+10 1463 2.08333333333333e+00
+10 1465 -2.08333333333333e+00
+10 1464 2.08333333333333e+00
+10 1466 -2.08333333333333e+00
+10 1461 -4.16666666666667e+00
+11 11 1.69166666666667e+01
+11 9 -4.16666666666667e+00
+11 198 2.12500000000000e+00
+11 194 -2.16666666666667e+00
+11 200 -1.26250000000000e+01
+11 193 2.12500000000000e+00
+11 10 -4.25000000000000e+00
+11 199 2.12500000000000e+00
+11 192 -2.08333333333333e+00
+11 196 -4.16666666666667e-02
+11 202 4.16666666666667e-02
+11 195 4.16666666666667e-02
+11 197 -4.16666666666667e-02
+11 201 -8.33333333333333e-02
+11 1465 -2.08333333333333e+00
+11 1462 2.08333333333333e+00
+11 1464 2.08333333333333e+00
+11 1466 -2.08333333333333e+00
+11 1461 2.08333333333333e+00
+12 12 5.00000000000000e-01
+12 214 4.16666666666667e-02
+12 13 -8.33333333333333e-02
+12 213 -1.25000000000000e-01
+12 221 -8.33333333333333e-02
+12 217 -4.16666666666667e-02
+12 220 4.16666666666667e-02
+12 14 -8.33333333333333e-02
+12 212 4.16666666666667e-02
+12 218 8.33333333333333e-02
+12 211 4.16666666666667e-02
+12 210 -1.25000000000000e-01
+12 209 -4.16666666666667e-02
+12 206 4.16666666666667e-02
+12 208 8.33333333333333e-02
+12 205 -8.33333333333333e-02
+12 207 -1.25000000000000e-01
+12 215 4.16666666666667e-02
+12 216 -1.25000000000000e-01
+13 13 5.83333333333333e-01
+13 221 4.16666666666667e-02
+13 214 -4.16666666666667e-02
+13 213 4.16666666666667e-02
+13 12 -8.33333333333333e-02
+13 216 -4.16666666666667e-02
+13 219 4.16666666666667e-02
+13 212 -4.16666666666667e-02
+13 206 4.16666666666667e-02
+13 211 -4.16666666666667e-02
+13 210 4.16666666666667e-02
+13 209 8.33333333333333e-02
+13 14 -1.66666666666667e-01
+13 218 8.33333333333333e-02
+13 208 -3.75000000000000e-01
+13 215 -4.16666666666667e-02
+13 217 -1.25000000000000e-01
+13 207 8.33333333333333e-02
+13 204 -8.33333333333333e-02
+14 14 5.83333333333333e-01
+14 214 -4.16666666666667e-02
+14 220 4.16666666666667e-02
+14 213 4.16666666666667e-02
+14 219 -8.33333333333333e-02
+14 212 -4.16666666666667e-02
+14 211 -4.16666666666667e-02
+14 205 4.16666666666667e-02
+14 12 -8.33333333333333e-02
+14 210 4.16666666666667e-02
+14 216 8.33333333333333e-02
+14 209 -1.25000000000000e-01
+14 215 -4.16666666666667e-02
+14 218 -3.75000000000000e-01
+14 208 8.33333333333333e-02
+14 13 -1.66666666666667e-01
+14 217 8.33333333333333e-02
+14 207 -4.16666666666667e-02
+14 204 4.16666666666667e-02
+15 15 5.00000000000000e-01
+15 16 -8.33333333333333e-02
+15 226 8.33333333333333e-02
+15 233 8.33333333333333e-02
+15 232 -4.16666666666667e-02
+15 231 -1.25000000000000e-01
+15 225 -1.25000000000000e-01
+15 230 4.16666666666667e-02
+15 229 4.16666666666667e-02
+15 228 -1.25000000000000e-01
+15 227 -4.16666666666667e-02
+15 224 4.16666666666667e-02
+15 223 -8.33333333333333e-02
+15 17 -8.33333333333333e-02
+15 832 4.16666666666667e-02
+15 831 -1.25000000000000e-01
+15 836 -8.33333333333333e-02
+15 835 4.16666666666667e-02
+15 833 4.16666666666667e-02
+16 16 5.83333333333333e-01
+16 15 -8.33333333333333e-02
+16 225 8.33333333333333e-02
+16 233 8.33333333333333e-02
+16 17 -1.66666666666667e-01
+16 227 8.33333333333333e-02
+16 232 -1.25000000000000e-01
+16 226 -3.75000000000000e-01
+16 231 -4.16666666666667e-02
+16 224 4.16666666666667e-02
+16 229 -4.16666666666667e-02
+16 228 4.16666666666667e-02
+16 230 -4.16666666666667e-02
+16 222 -8.33333333333333e-02
+16 836 4.16666666666667e-02
+16 832 -4.16666666666667e-02
+16 831 4.16666666666667e-02
+16 833 -4.16666666666667e-02
+16 834 4.16666666666667e-02
+17 17 5.83333333333333e-01
+17 233 -3.75000000000000e-01
+17 227 -1.25000000000000e-01
+17 232 8.33333333333333e-02
+17 16 -1.66666666666667e-01
+17 226 8.33333333333333e-02
+17 231 8.33333333333333e-02
+17 229 -4.16666666666667e-02
+17 223 4.16666666666667e-02
+17 15 -8.33333333333333e-02
+17 228 4.16666666666667e-02
+17 230 -4.16666666666667e-02
+17 225 -4.16666666666667e-02
+17 222 4.16666666666667e-02
+17 832 -4.16666666666667e-02
+17 835 4.16666666666667e-02
+17 831 4.16666666666667e-02
+17 833 -4.16666666666667e-02
+17 834 -8.33333333333333e-02
+18 18 1.27500000000000e+01
+18 235 -2.08333333333333e+00
+18 234 -2.16666666666667e+00
+18 19 -4.16666666666667e+00
+18 241 2.12500000000000e+00
+18 236 2.12500000000000e+00
+18 240 -4.20833333333333e+00
+18 245 4.16666666666667e-02
+18 20 -8.33333333333333e-02
+18 239 4.16666666666667e-02
+18 238 4.16666666666667e-02
+18 244 -8.33333333333333e-02
+18 242 -4.16666666666667e-02
+18 237 -1.25000000000000e-01
+18 1498 2.08333333333333e+00
+18 1502 2.08333333333333e+00
+18 1499 -4.16666666666667e+00
+18 1501 2.08333333333333e+00
+18 1500 -6.25000000000000e+00
+19 19 1.69166666666667e+01
+19 20 -4.25000000000000e+00
+19 242 2.12500000000000e+00
+19 235 -2.16666666666667e+00
+19 234 -2.08333333333333e+00
+19 236 2.12500000000000e+00
+19 241 -1.26250000000000e+01
+19 18 -4.16666666666667e+00
+19 240 2.12500000000000e+00
+19 239 -4.16666666666667e-02
+19 245 4.16666666666667e-02
+19 238 -4.16666666666667e-02
+19 237 4.16666666666667e-02
+19 243 -8.33333333333333e-02
+19 1497 2.08333333333333e+00
+19 1502 -2.08333333333333e+00
+19 1499 2.08333333333333e+00
+19 1501 -2.08333333333333e+00
+19 1500 2.08333333333333e+00
+20 20 1.28333333333333e+01
+20 235 2.12500000000000e+00
+20 19 -4.25000000000000e+00
+20 241 2.12500000000000e+00
+20 234 2.12500000000000e+00
+20 236 -6.50000000000000e+00
+20 242 -4.20833333333333e+00
+20 240 -4.16666666666667e-02
+20 243 4.16666666666667e-02
+20 239 -4.16666666666667e-02
+20 238 -4.16666666666667e-02
+20 244 4.16666666666667e-02
+20 18 -8.33333333333333e-02
+20 237 4.16666666666667e-02
+20 1502 -2.08333333333333e+00
+20 1501 -2.08333333333333e+00
+20 1498 2.08333333333333e+00
+20 1500 2.08333333333333e+00
+20 1497 -4.16666666666667e+00
+21 21 5.00000000000000e-01
+21 263 4.16666666666667e-02
+21 23 -8.33333333333333e-02
+21 257 4.16666666666667e-02
+21 256 4.16666666666667e-02
+21 262 -8.33333333333333e-02
+21 255 -1.25000000000000e-01
+21 251 8.33333333333333e-02
+21 250 -4.16666666666667e-02
+21 247 4.16666666666667e-02
+21 249 -1.25000000000000e-01
+21 254 4.16666666666667e-02
+21 248 -8.33333333333333e-02
+21 253 4.16666666666667e-02
+21 22 -8.33333333333333e-02
+21 259 8.33333333333333e-02
+21 252 -1.25000000000000e-01
+21 260 -4.16666666666667e-02
+21 258 -1.25000000000000e-01
+22 22 5.83333333333333e-01
+22 263 4.16666666666667e-02
+22 256 -4.16666666666667e-02
+22 255 4.16666666666667e-02
+22 261 -8.33333333333333e-02
+22 251 8.33333333333333e-02
+22 23 -1.66666666666667e-01
+22 260 8.33333333333333e-02
+22 250 -1.25000000000000e-01
+22 249 -4.16666666666667e-02
+22 246 4.16666666666667e-02
+22 254 -4.16666666666667e-02
+22 248 4.16666666666667e-02
+22 253 -4.16666666666667e-02
+22 257 -4.16666666666667e-02
+22 259 -3.75000000000000e-01
+22 252 4.16666666666667e-02
+22 21 -8.33333333333333e-02
+22 258 8.33333333333333e-02
+23 23 5.83333333333333e-01
+23 261 4.16666666666667e-02
+23 257 -4.16666666666667e-02
+23 256 -4.16666666666667e-02
+23 262 4.16666666666667e-02
+23 21 -8.33333333333333e-02
+23 255 4.16666666666667e-02
+23 251 -3.75000000000000e-01
+23 250 8.33333333333333e-02
+23 22 -1.66666666666667e-01
+23 259 8.33333333333333e-02
+23 249 8.33333333333333e-02
+23 254 -4.16666666666667e-02
+23 258 -4.16666666666667e-02
+23 260 -1.25000000000000e-01
+23 253 -4.16666666666667e-02
+23 247 4.16666666666667e-02
+23 252 4.16666666666667e-02
+23 246 -8.33333333333333e-02
+24 24 5.00000000000000e-01
+24 274 8.33333333333333e-02
+24 273 -1.25000000000000e-01
+24 26 -8.33333333333333e-02
+24 269 8.33333333333333e-02
+24 275 -4.16666666666667e-02
+24 267 -1.25000000000000e-01
+24 268 -4.16666666666667e-02
+24 265 4.16666666666667e-02
+24 272 4.16666666666667e-02
+24 266 -8.33333333333333e-02
+24 271 4.16666666666667e-02
+24 25 -8.33333333333333e-02
+24 270 -1.25000000000000e-01
+24 872 4.16666666666667e-02
+24 869 4.16666666666667e-02
+24 868 4.16666666666667e-02
+24 871 -8.33333333333333e-02
+24 867 -1.25000000000000e-01
+25 25 5.83333333333333e-01
+25 26 -1.66666666666667e-01
+25 269 8.33333333333333e-02
+25 274 -3.75000000000000e-01
+25 273 8.33333333333333e-02
+25 275 8.33333333333333e-02
+25 268 -1.25000000000000e-01
+25 267 -4.16666666666667e-02
+25 264 4.16666666666667e-02
+25 272 -4.16666666666667e-02
+25 266 4.16666666666667e-02
+25 271 -4.16666666666667e-02
+25 270 4.16666666666667e-02
+25 24 -8.33333333333333e-02
+25 869 -4.16666666666667e-02
+25 872 4.16666666666667e-02
+25 868 -4.16666666666667e-02
+25 867 4.16666666666667e-02
+25 870 -8.33333333333333e-02
+26 26 5.83333333333333e-01
+26 274 8.33333333333333e-02
+26 25 -1.66666666666667e-01
+26 268 8.33333333333333e-02
+26 273 -4.16666666666667e-02
+26 275 -1.25000000000000e-01
+26 269 -3.75000000000000e-01
+26 24 -8.33333333333333e-02
+26 267 8.33333333333333e-02
+26 272 -4.16666666666667e-02
+26 271 -4.16666666666667e-02
+26 265 4.16666666666667e-02
+26 270 4.16666666666667e-02
+26 264 -8.33333333333333e-02
+26 870 4.16666666666667e-02
+26 869 -4.16666666666667e-02
+26 868 -4.16666666666667e-02
+26 871 4.16666666666667e-02
+26 867 4.16666666666667e-02
+27 27 2.11666666666667e+01
+27 278 2.12500000000000e+00
+27 279 -4.20833333333333e+00
+27 277 2.12500000000000e+00
+27 283 2.12500000000000e+00
+27 282 -4.20833333333333e+00
+27 281 2.12500000000000e+00
+27 287 4.16666666666667e-02
+27 280 -4.16666666666667e-02
+27 284 -4.16666666666667e-02
+27 28 -8.33333333333333e-02
+27 286 4.16666666666667e-02
+27 29 -8.33333333333333e-02
+27 285 -2.50000000000000e-01
+27 1550 2.08333333333333e+00
+27 1544 -4.16666666666667e+00
+27 1543 2.08333333333333e+00
+27 1547 2.08333333333333e+00
+27 1549 2.08333333333333e+00
+27 1548 -1.25000000000000e+01
+27 1541 -4.16666666666667e+00
+27 1540 -4.16666666666667e+00
+27 1546 -4.16666666666667e+00
+28 28 2.10833333333333e+01
+28 281 2.12500000000000e+00
+28 280 -4.20833333333333e+00
+28 278 -4.25000000000000e+00
+28 284 2.12500000000000e+00
+28 276 2.12500000000000e+00
+28 283 -1.26250000000000e+01
+28 282 2.12500000000000e+00
+28 279 -4.16666666666667e-02
+28 286 -8.33333333333333e-02
+28 27 -8.33333333333333e-02
+28 285 4.16666666666667e-02
+28 1542 2.08333333333333e+00
+28 1549 -4.16666666666667e+00
+28 1548 2.08333333333333e+00
+28 1539 -4.16666666666667e+00
+28 1547 2.08333333333333e+00
+28 1541 -4.16666666666667e+00
+28 1544 2.08333333333333e+00
+28 1545 -4.16666666666667e+00
+29 29 2.10833333333333e+01
+29 279 2.12500000000000e+00
+29 281 -1.26250000000000e+01
+29 280 2.12500000000000e+00
+29 276 2.12500000000000e+00
+29 277 -4.25000000000000e+00
+29 283 2.12500000000000e+00
+29 284 -4.20833333333333e+00
+29 27 -8.33333333333333e-02
+29 285 4.16666666666667e-02
+29 287 -8.33333333333333e-02
+29 282 -4.16666666666667e-02
+29 1548 2.08333333333333e+00
+29 1542 -4.16666666666667e+00
+29 1550 -4.16666666666667e+00
+29 1545 2.08333333333333e+00
+29 1539 -4.16666666666667e+00
+29 1543 2.08333333333333e+00
+29 1546 2.08333333333333e+00
+29 1540 -4.16666666666667e+00
+30 30 7.50000000000000e-01
+30 311 4.16666666666667e-02
+30 298 -4.16666666666667e-02
+30 305 -4.16666666666667e-02
+30 31 -8.33333333333333e-02
+30 310 4.16666666666667e-02
+30 309 -2.50000000000000e-01
+30 299 8.33333333333333e-02
+30 308 4.16666666666667e-02
+30 296 -8.33333333333333e-02
+30 295 4.16666666666667e-02
+30 302 4.16666666666667e-02
+30 307 4.16666666666667e-02
+30 306 -2.50000000000000e-01
+30 293 8.33333333333333e-02
+30 290 -8.33333333333333e-02
+30 297 -1.25000000000000e-01
+30 292 8.33333333333333e-02
+30 289 -8.33333333333333e-02
+30 301 -8.33333333333333e-02
+30 304 8.33333333333333e-02
+30 303 -1.25000000000000e-01
+30 32 -8.33333333333333e-02
+31 31 6.66666666666667e-01
+31 310 -8.33333333333333e-02
+31 30 -8.33333333333333e-02
+31 309 4.16666666666667e-02
+31 296 4.16666666666667e-02
+31 294 4.16666666666667e-02
+31 307 -8.33333333333333e-02
+31 306 4.16666666666667e-02
+31 299 8.33333333333333e-02
+31 298 -1.25000000000000e-01
+31 293 -1.66666666666667e-01
+31 305 8.33333333333333e-02
+31 291 8.33333333333333e-02
+31 288 -8.33333333333333e-02
+31 302 4.16666666666667e-02
+31 290 -8.33333333333333e-02
+31 304 -3.75000000000000e-01
+31 297 -4.16666666666667e-02
+31 300 -8.33333333333333e-02
+31 303 8.33333333333333e-02
+32 32 6.66666666666667e-01
+32 309 4.16666666666667e-02
+32 311 -8.33333333333333e-02
+32 303 -4.16666666666667e-02
+32 295 4.16666666666667e-02
+32 297 8.33333333333333e-02
+32 306 4.16666666666667e-02
+32 294 -8.33333333333333e-02
+32 308 -8.33333333333333e-02
+32 300 4.16666666666667e-02
+32 299 -3.75000000000000e-01
+32 298 8.33333333333333e-02
+32 291 8.33333333333333e-02
+32 288 -8.33333333333333e-02
+32 292 -1.66666666666667e-01
+32 304 8.33333333333333e-02
+32 305 -1.25000000000000e-01
+32 30 -8.33333333333333e-02
+32 301 4.16666666666667e-02
+32 289 -8.33333333333333e-02
+33 33 7.50000000000000e-01
+33 323 8.33333333333333e-02
+33 322 -4.16666666666667e-02
+33 316 8.33333333333333e-02
+33 321 -1.25000000000000e-01
+33 329 -4.16666666666667e-02
+33 317 8.33333333333333e-02
+33 34 -8.33333333333333e-02
+33 328 8.33333333333333e-02
+33 35 -8.33333333333333e-02
+33 327 -1.25000000000000e-01
+33 332 4.16666666666667e-02
+33 320 -8.33333333333333e-02
+33 319 4.16666666666667e-02
+33 326 4.16666666666667e-02
+33 331 4.16666666666667e-02
+33 330 -2.50000000000000e-01
+33 314 -8.33333333333333e-02
+33 313 -8.33333333333333e-02
+33 325 -8.33333333333333e-02
+33 905 4.16666666666667e-02
+33 904 4.16666666666667e-02
+33 903 -2.50000000000000e-01
+34 34 6.66666666666667e-01
+34 322 -1.25000000000000e-01
+34 321 -4.16666666666667e-02
+34 315 8.33333333333333e-02
+34 329 8.33333333333333e-02
+34 317 -1.66666666666667e-01
+34 323 8.33333333333333e-02
+34 328 -3.75000000000000e-01
+34 33 -8.33333333333333e-02
+34 327 8.33333333333333e-02
+34 318 4.16666666666667e-02
+34 331 -8.33333333333333e-02
+34 330 4.16666666666667e-02
+34 312 -8.33333333333333e-02
+34 326 4.16666666666667e-02
+34 314 -8.33333333333333e-02
+34 320 4.16666666666667e-02
+34 324 -8.33333333333333e-02
+34 904 -8.33333333333333e-02
+34 903 4.16666666666667e-02
+35 35 6.66666666666667e-01
+35 322 8.33333333333333e-02
+35 33 -8.33333333333333e-02
+35 321 8.33333333333333e-02
+35 323 -3.75000000000000e-01
+35 329 -1.25000000000000e-01
+35 328 8.33333333333333e-02
+35 316 -1.66666666666667e-01
+35 327 -4.16666666666667e-02
+35 315 8.33333333333333e-02
+35 330 4.16666666666667e-02
+35 318 -8.33333333333333e-02
+35 332 -8.33333333333333e-02
+35 324 4.16666666666667e-02
+35 312 -8.33333333333333e-02
+35 319 4.16666666666667e-02
+35 325 4.16666666666667e-02
+35 313 -8.33333333333333e-02
+35 903 4.16666666666667e-02
+35 905 -8.33333333333333e-02
+36 36 7.50000000000000e-01
+36 157 4.16666666666667e-02
+36 343 -8.33333333333333e-02
+36 335 -4.16666666666667e-02
+36 37 -8.33333333333333e-02
+36 334 8.33333333333333e-02
+36 136 4.16666666666667e-02
+36 333 -1.25000000000000e-01
+36 350 -8.33333333333333e-02
+36 341 8.33333333333333e-02
+36 158 4.16666666666667e-02
+36 347 -8.33333333333333e-02
+36 346 4.16666666666667e-02
+36 349 -8.33333333333333e-02
+36 156 -2.50000000000000e-01
+36 38 -8.33333333333333e-02
+36 338 8.33333333333333e-02
+36 137 4.16666666666667e-02
+36 337 -4.16666666666667e-02
+36 340 8.33333333333333e-02
+36 344 4.16666666666667e-02
+36 336 -1.25000000000000e-01
+36 135 -2.50000000000000e-01
+37 37 6.66666666666667e-01
+37 156 4.16666666666667e-02
+37 342 -8.33333333333333e-02
+37 335 8.33333333333333e-02
+37 334 -3.75000000000000e-01
+37 36 -8.33333333333333e-02
+37 333 8.33333333333333e-02
+37 135 4.16666666666667e-02
+37 347 4.16666666666667e-02
+37 350 -8.33333333333333e-02
+37 157 -8.33333333333333e-02
+37 345 4.16666666666667e-02
+37 348 -8.33333333333333e-02
+37 338 8.33333333333333e-02
+37 341 -1.66666666666667e-01
+37 344 4.16666666666667e-02
+37 337 -1.25000000000000e-01
+37 136 -8.33333333333333e-02
+37 336 -4.16666666666667e-02
+37 339 8.33333333333333e-02
+38 38 6.66666666666667e-01
+38 342 4.16666666666667e-02
+38 335 -1.25000000000000e-01
+38 334 8.33333333333333e-02
+38 333 -4.16666666666667e-02
+38 346 4.16666666666667e-02
+38 349 -8.33333333333333e-02
+38 348 -8.33333333333333e-02
+38 339 8.33333333333333e-02
+38 158 -8.33333333333333e-02
+38 156 4.16666666666667e-02
+38 345 -8.33333333333333e-02
+38 343 4.16666666666667e-02
+38 338 -3.75000000000000e-01
+38 137 -8.33333333333333e-02
+38 337 8.33333333333333e-02
+38 340 -1.66666666666667e-01
+38 36 -8.33333333333333e-02
+38 336 8.33333333333333e-02
+38 135 4.16666666666667e-02
+39 39 2.98333333333333e+01
+39 41 -8.33333333333333e+00
+39 356 4.25000000000000e+00
+39 364 2.12500000000000e+00
+39 355 -2.12500000000000e+00
+39 140 -2.08333333333333e+00
+39 139 2.12500000000000e+00
+39 138 -2.16666666666667e+00
+39 354 -6.37500000000000e+00
+39 194 -2.08333333333333e+00
+39 365 2.12500000000000e+00
+39 40 -4.25000000000000e+00
+39 193 2.12500000000000e+00
+39 192 -2.16666666666667e+00
+39 361 -8.33333333333333e-02
+39 353 8.33333333333333e-02
+39 352 8.33333333333333e-02
+39 351 -3.75000000000000e-01
+39 368 -8.33333333333333e-02
+39 367 -8.33333333333333e-02
+39 359 -1.66666666666667e-01
+39 358 8.33333333333333e-02
+39 362 4.16666666666667e-02
+39 1688 2.08333333333333e+00
+39 1687 -4.16666666666667e+00
+39 1717 4.16666666666667e+00
+39 1718 4.16666666666667e+00
+39 1716 -1.87500000000000e+01
+40 40 2.57500000000000e+01
+40 363 2.12500000000000e+00
+40 354 -2.12500000000000e+00
+40 140 2.12500000000000e+00
+40 41 -4.25000000000000e+00
+40 356 4.25000000000000e+00
+40 139 -6.50000000000000e+00
+40 355 -6.37500000000000e+00
+40 138 2.12500000000000e+00
+40 194 2.12500000000000e+00
+40 365 -4.25000000000000e+00
+40 193 -6.50000000000000e+00
+40 39 -4.25000000000000e+00
+40 192 2.12500000000000e+00
+40 360 -8.33333333333333e-02
+40 353 -4.16666666666667e-02
+40 352 -1.25000000000000e-01
+40 351 8.33333333333333e-02
+40 368 -8.33333333333333e-02
+40 359 8.33333333333333e-02
+40 366 -8.33333333333333e-02
+40 362 4.16666666666667e-02
+40 357 8.33333333333333e-02
+40 1688 2.08333333333333e+00
+40 1686 -4.16666666666667e+00
+40 1718 -2.08333333333333e+00
+40 1717 -6.25000000000000e+00
+40 1716 4.16666666666667e+00
+41 41 2.98333333333333e+01
+41 39 -8.33333333333333e+00
+41 354 4.25000000000000e+00
+41 140 -2.16666666666667e+00
+41 356 -1.91250000000000e+01
+41 139 2.12500000000000e+00
+41 40 -4.25000000000000e+00
+41 355 4.25000000000000e+00
+41 138 -2.08333333333333e+00
+41 194 -2.16666666666667e+00
+41 193 2.12500000000000e+00
+41 364 -4.25000000000000e+00
+41 192 -2.08333333333333e+00
+41 363 2.12500000000000e+00
+41 361 4.16666666666667e-02
+41 353 -1.25000000000000e-01
+41 352 -4.16666666666667e-02
+41 351 8.33333333333333e-02
+41 366 -8.33333333333333e-02
+41 367 -8.33333333333333e-02
+41 358 8.33333333333333e-02
+41 360 4.16666666666667e-02
+41 357 -1.66666666666667e-01
+41 1687 2.08333333333333e+00
+41 1716 4.16666666666667e+00
+41 1686 2.08333333333333e+00
+41 1717 -2.08333333333333e+00
+41 1718 -6.25000000000000e+00
+42 42 1.25000000000000e+00
+42 382 8.33333333333333e-02
+42 383 8.33333333333333e-02
+42 379 8.33333333333333e-02
+42 378 -1.25000000000000e-01
+42 44 -1.66666666666667e-01
+42 353 8.33333333333333e-02
+42 352 8.33333333333333e-02
+42 351 -3.75000000000000e-01
+42 370 -8.33333333333333e-02
+42 43 -1.66666666666667e-01
+42 374 8.33333333333333e-02
+42 385 -8.33333333333333e-02
+42 376 8.33333333333333e-02
+42 371 1.66666666666667e-01
+42 377 -1.66666666666667e-01
+42 206 4.16666666666667e-02
+42 386 -8.33333333333333e-02
+42 373 8.33333333333333e-02
+42 205 -8.33333333333333e-02
+42 372 -3.75000000000000e-01
+42 335 -4.16666666666667e-02
+42 143 4.16666666666667e-02
+42 334 8.33333333333333e-02
+42 142 -8.33333333333333e-02
+42 333 -1.25000000000000e-01
+42 380 -4.16666666666667e-02
+42 369 -2.50000000000000e-01
+43 43 1.25000000000000e+00
+43 381 8.33333333333333e-02
+43 383 -1.66666666666667e-01
+43 206 4.16666666666667e-02
+43 379 -3.75000000000000e-01
+43 378 8.33333333333333e-02
+43 353 -4.16666666666667e-02
+43 143 4.16666666666667e-02
+43 352 -1.25000000000000e-01
+43 351 8.33333333333333e-02
+43 369 -8.33333333333333e-02
+43 374 -4.16666666666667e-02
+43 42 -1.66666666666667e-01
+43 384 -8.33333333333333e-02
+43 375 8.33333333333333e-02
+43 386 -8.33333333333333e-02
+43 377 8.33333333333333e-02
+43 373 -1.25000000000000e-01
+43 372 8.33333333333333e-02
+43 204 -8.33333333333333e-02
+43 335 8.33333333333333e-02
+43 44 -1.66666666666667e-01
+43 371 1.66666666666667e-01
+43 334 -3.75000000000000e-01
+43 380 8.33333333333333e-02
+43 370 -2.50000000000000e-01
+43 333 8.33333333333333e-02
+43 141 -8.33333333333333e-02
+44 44 1.25000000000000e+00
+44 379 8.33333333333333e-02
+44 382 -1.66666666666667e-01
+44 381 8.33333333333333e-02
+44 380 -1.25000000000000e-01
+44 205 4.16666666666667e-02
+44 353 -1.25000000000000e-01
+44 352 -4.16666666666667e-02
+44 142 4.16666666666667e-02
+44 42 -1.66666666666667e-01
+44 351 8.33333333333333e-02
+44 373 -4.16666666666667e-02
+44 372 8.33333333333333e-02
+44 385 -8.33333333333333e-02
+44 376 8.33333333333333e-02
+44 369 1.66666666666667e-01
+44 375 -1.66666666666667e-01
+44 374 -1.25000000000000e-01
+44 204 4.16666666666667e-02
+44 384 -8.33333333333333e-02
+44 335 -1.25000000000000e-01
+44 378 -4.16666666666667e-02
+44 371 -7.50000000000000e-01
+44 334 8.33333333333333e-02
+44 43 -1.66666666666667e-01
+44 370 1.66666666666667e-01
+44 333 -4.16666666666667e-02
+44 141 4.16666666666667e-02
+45 45 2.98333333333333e+01
+45 392 -2.12500000000000e+00
+45 46 -8.33333333333333e+00
+45 391 4.25000000000000e+00
+45 146 2.12500000000000e+00
+45 145 -2.08333333333333e+00
+45 144 -2.16666666666667e+00
+45 390 -6.37500000000000e+00
+45 47 -4.25000000000000e+00
+45 236 2.12500000000000e+00
+45 235 -2.08333333333333e+00
+45 400 2.12500000000000e+00
+45 401 2.12500000000000e+00
+45 234 -2.16666666666667e+00
+45 395 8.33333333333333e-02
+45 404 -8.33333333333333e-02
+45 397 4.16666666666667e-02
+45 403 -8.33333333333333e-02
+45 398 -8.33333333333333e-02
+45 389 8.33333333333333e-02
+45 388 8.33333333333333e-02
+45 394 -1.66666666666667e-01
+45 387 -3.75000000000000e-01
+45 1753 4.16666666666667e+00
+45 1691 -4.16666666666667e+00
+45 1690 2.08333333333333e+00
+45 1754 4.16666666666667e+00
+45 1752 -1.87500000000000e+01
+46 46 2.98333333333333e+01
+46 45 -8.33333333333333e+00
+46 390 4.25000000000000e+00
+46 146 2.12500000000000e+00
+46 47 -4.25000000000000e+00
+46 392 4.25000000000000e+00
+46 145 -2.16666666666667e+00
+46 391 -1.91250000000000e+01
+46 144 -2.08333333333333e+00
+46 236 2.12500000000000e+00
+46 401 -4.25000000000000e+00
+46 235 -2.16666666666667e+00
+46 234 -2.08333333333333e+00
+46 399 2.12500000000000e+00
+46 396 4.16666666666667e-02
+46 402 -8.33333333333333e-02
+46 398 4.16666666666667e-02
+46 404 -8.33333333333333e-02
+46 389 -4.16666666666667e-02
+46 395 8.33333333333333e-02
+46 388 -1.25000000000000e-01
+46 387 8.33333333333333e-02
+46 393 -1.66666666666667e-01
+46 1754 -2.08333333333333e+00
+46 1752 4.16666666666667e+00
+46 1689 2.08333333333333e+00
+46 1691 2.08333333333333e+00
+46 1753 -6.25000000000000e+00
+47 47 2.57500000000000e+01
+47 390 -2.12500000000000e+00
+47 146 -6.50000000000000e+00
+47 392 -6.37500000000000e+00
+47 145 2.12500000000000e+00
+47 46 -4.25000000000000e+00
+47 391 4.25000000000000e+00
+47 144 2.12500000000000e+00
+47 399 2.12500000000000e+00
+47 236 -6.50000000000000e+00
+47 235 2.12500000000000e+00
+47 400 -4.25000000000000e+00
+47 45 -4.25000000000000e+00
+47 234 2.12500000000000e+00
+47 393 8.33333333333333e-02
+47 402 -8.33333333333333e-02
+47 397 4.16666666666667e-02
+47 403 -8.33333333333333e-02
+47 396 -8.33333333333333e-02
+47 389 -1.25000000000000e-01
+47 388 -4.16666666666667e-02
+47 394 8.33333333333333e-02
+47 387 8.33333333333333e-02
+47 1690 2.08333333333333e+00
+47 1753 -2.08333333333333e+00
+47 1689 -4.16666666666667e+00
+47 1754 -6.25000000000000e+00
+47 1752 4.16666666666667e+00
+48 48 1.25000000000000e+00
+48 413 8.33333333333333e-02
+48 412 -1.66666666666667e-01
+48 410 8.33333333333333e-02
+48 247 4.16666666666667e-02
+48 408 -3.75000000000000e-01
+48 338 8.33333333333333e-02
+48 337 -4.16666666666667e-02
+48 148 4.16666666666667e-02
+48 336 -1.25000000000000e-01
+48 407 -8.33333333333333e-02
+48 50 -1.66666666666667e-01
+48 415 -4.16666666666667e-02
+48 422 -8.33333333333333e-02
+48 419 8.33333333333333e-02
+48 421 -8.33333333333333e-02
+48 418 8.33333333333333e-02
+48 416 8.33333333333333e-02
+48 248 -8.33333333333333e-02
+48 414 -1.25000000000000e-01
+48 389 8.33333333333333e-02
+48 149 -8.33333333333333e-02
+48 388 8.33333333333333e-02
+48 49 -1.66666666666667e-01
+48 406 1.66666666666667e-01
+48 387 -3.75000000000000e-01
+48 409 8.33333333333333e-02
+48 405 -2.50000000000000e-01
+49 49 1.25000000000000e+00
+49 413 8.33333333333333e-02
+49 408 8.33333333333333e-02
+49 411 -1.66666666666667e-01
+49 409 -1.25000000000000e-01
+49 246 4.16666666666667e-02
+49 338 8.33333333333333e-02
+49 50 -1.66666666666667e-01
+49 337 -1.25000000000000e-01
+49 336 -4.16666666666667e-02
+49 147 4.16666666666667e-02
+49 414 -4.16666666666667e-02
+49 416 8.33333333333333e-02
+49 407 1.66666666666667e-01
+49 419 -1.66666666666667e-01
+49 420 -8.33333333333333e-02
+49 417 8.33333333333333e-02
+49 248 4.16666666666667e-02
+49 422 -8.33333333333333e-02
+49 415 -1.25000000000000e-01
+49 389 -4.16666666666667e-02
+49 149 4.16666666666667e-02
+49 388 -1.25000000000000e-01
+49 410 -4.16666666666667e-02
+49 406 -7.50000000000000e-01
+49 387 8.33333333333333e-02
+49 48 -1.66666666666667e-01
+49 405 1.66666666666667e-01
+50 50 1.25000000000000e+00
+50 412 8.33333333333333e-02
+50 411 8.33333333333333e-02
+50 410 -1.25000000000000e-01
+50 408 8.33333333333333e-02
+50 338 -3.75000000000000e-01
+50 337 8.33333333333333e-02
+50 49 -1.66666666666667e-01
+50 336 8.33333333333333e-02
+50 405 -8.33333333333333e-02
+50 48 -1.66666666666667e-01
+50 415 8.33333333333333e-02
+50 420 -8.33333333333333e-02
+50 417 8.33333333333333e-02
+50 406 1.66666666666667e-01
+50 418 -1.66666666666667e-01
+50 416 -3.75000000000000e-01
+50 247 4.16666666666667e-02
+50 421 -8.33333333333333e-02
+50 414 8.33333333333333e-02
+50 246 -8.33333333333333e-02
+50 389 -1.25000000000000e-01
+50 409 -4.16666666666667e-02
+50 407 -2.50000000000000e-01
+50 388 -4.16666666666667e-02
+50 148 4.16666666666667e-02
+50 387 8.33333333333333e-02
+50 147 -8.33333333333333e-02
+51 51 6.37500000000000e+01
+51 355 -2.12500000000000e+00
+51 152 2.12500000000000e+00
+51 354 -6.37500000000000e+00
+51 428 -2.12500000000000e+00
+51 278 2.12500000000000e+00
+51 52 -8.50000000000000e+00
+51 427 4.25000000000000e+00
+51 426 -6.37500000000000e+00
+51 392 -2.12500000000000e+00
+51 391 4.25000000000000e+00
+51 151 2.12500000000000e+00
+51 390 -6.37500000000000e+00
+51 53 -8.50000000000000e+00
+51 434 4.25000000000000e+00
+51 433 -2.12500000000000e+00
+51 277 2.12500000000000e+00
+51 356 4.25000000000000e+00
+51 432 -6.37500000000000e+00
+51 430 -1.66666666666667e-01
+51 425 1.66666666666667e-01
+51 437 -1.66666666666667e-01
+51 439 -8.33333333333333e-02
+51 436 8.33333333333333e-02
+51 440 -8.33333333333333e-02
+51 424 1.66666666666667e-01
+51 431 8.33333333333333e-02
+51 423 -7.50000000000000e-01
+51 1720 4.16666666666667e+00
+51 1721 -8.33333333333333e+00
+51 1694 -4.16666666666667e+00
+51 1757 4.16666666666667e+00
+51 1786 8.33333333333333e+00
+51 1756 -8.33333333333333e+00
+51 1693 -4.16666666666667e+00
+51 1787 8.33333333333333e+00
+51 1785 -3.75000000000000e+01
+52 52 6.37500000000000e+01
+52 354 -2.12500000000000e+00
+52 356 4.25000000000000e+00
+52 355 -6.37500000000000e+00
+52 428 4.25000000000000e+00
+52 427 -1.91250000000000e+01
+52 51 -8.50000000000000e+00
+52 426 4.25000000000000e+00
+52 53 -8.50000000000000e+00
+52 390 4.25000000000000e+00
+52 152 -4.25000000000000e+00
+52 392 4.25000000000000e+00
+52 391 -1.91250000000000e+01
+52 150 2.12500000000000e+00
+52 434 4.25000000000000e+00
+52 278 -4.25000000000000e+00
+52 433 -6.37500000000000e+00
+52 432 -2.12500000000000e+00
+52 276 2.12500000000000e+00
+52 431 8.33333333333333e-02
+52 429 -1.66666666666667e-01
+52 425 -8.33333333333333e-02
+52 440 -8.33333333333333e-02
+52 437 8.33333333333333e-02
+52 438 -8.33333333333333e-02
+52 435 8.33333333333333e-02
+52 424 -2.50000000000000e-01
+52 423 1.66666666666667e-01
+52 1721 4.16666666666667e+00
+52 1787 -4.16666666666667e+00
+52 1694 -4.16666666666667e+00
+52 1757 4.16666666666667e+00
+52 1785 8.33333333333333e+00
+52 1755 -8.33333333333333e+00
+52 1692 -4.16666666666667e+00
+52 1719 4.16666666666667e+00
+52 1786 -1.25000000000000e+01
+53 53 6.37500000000000e+01
+53 356 -1.91250000000000e+01
+53 355 4.25000000000000e+00
+53 150 2.12500000000000e+00
+53 428 -6.37500000000000e+00
+53 427 4.25000000000000e+00
+53 426 -2.12500000000000e+00
+53 276 2.12500000000000e+00
+53 52 -8.50000000000000e+00
+53 390 -2.12500000000000e+00
+53 392 -6.37500000000000e+00
+53 151 -4.25000000000000e+00
+53 391 4.25000000000000e+00
+53 354 4.25000000000000e+00
+53 434 -1.91250000000000e+01
+53 433 4.25000000000000e+00
+53 277 -4.25000000000000e+00
+53 51 -8.50000000000000e+00
+53 432 4.25000000000000e+00
+53 430 8.33333333333333e-02
+53 424 -8.33333333333333e-02
+53 439 -8.33333333333333e-02
+53 436 8.33333333333333e-02
+53 423 1.66666666666667e-01
+53 435 -1.66666666666667e-01
+53 438 -8.33333333333333e-02
+53 429 8.33333333333333e-02
+53 425 -2.50000000000000e-01
+53 1720 4.16666666666667e+00
+53 1719 -8.33333333333333e+00
+53 1786 -4.16666666666667e+00
+53 1693 -4.16666666666667e+00
+53 1756 4.16666666666667e+00
+53 1692 -4.16666666666667e+00
+53 1755 4.16666666666667e+00
+53 1787 -1.25000000000000e+01
+53 1785 8.33333333333333e+00
+54 54 2.50000000000000e+00
+54 445 1.66666666666667e-01
+54 444 -2.50000000000000e-01
+54 359 -1.66666666666667e-01
+54 358 8.33333333333333e-02
+54 425 1.66666666666667e-01
+54 457 8.33333333333333e-02
+54 424 1.66666666666667e-01
+54 423 -7.50000000000000e-01
+54 458 8.33333333333333e-02
+54 370 -8.33333333333333e-02
+54 371 1.66666666666667e-01
+54 56 -3.33333333333333e-01
+54 155 -8.33333333333333e-02
+54 369 -2.50000000000000e-01
+54 449 8.33333333333333e-02
+54 290 -8.33333333333333e-02
+54 448 -1.66666666666667e-01
+54 341 8.33333333333333e-02
+54 442 1.66666666666667e-01
+54 55 -3.33333333333333e-01
+54 443 1.66666666666667e-01
+54 289 -8.33333333333333e-02
+54 441 -7.50000000000000e-01
+54 340 8.33333333333333e-02
+54 154 -8.33333333333333e-02
+54 407 -8.33333333333333e-02
+54 395 8.33333333333333e-02
+54 454 8.33333333333333e-02
+54 451 -8.33333333333333e-02
+54 394 -1.66666666666667e-01
+54 406 1.66666666666667e-01
+54 405 -2.50000000000000e-01
+54 452 1.66666666666667e-01
+54 455 -1.66666666666667e-01
+54 450 -2.50000000000000e-01
+54 446 -8.33333333333333e-02
+55 55 2.50000000000000e+00
+55 444 1.66666666666667e-01
+55 446 1.66666666666667e-01
+55 445 -7.50000000000000e-01
+55 357 8.33333333333333e-02
+55 425 -8.33333333333333e-02
+55 456 8.33333333333333e-02
+55 424 -2.50000000000000e-01
+55 423 1.66666666666667e-01
+55 458 -1.66666666666667e-01
+55 369 -8.33333333333333e-02
+55 449 8.33333333333333e-02
+55 371 1.66666666666667e-01
+55 370 -2.50000000000000e-01
+55 447 -1.66666666666667e-01
+55 443 -8.33333333333333e-02
+55 441 1.66666666666667e-01
+55 54 -3.33333333333333e-01
+55 442 -2.50000000000000e-01
+55 288 -8.33333333333333e-02
+55 341 -1.66666666666667e-01
+55 339 8.33333333333333e-02
+55 153 -8.33333333333333e-02
+55 407 1.66666666666667e-01
+55 56 -3.33333333333333e-01
+55 452 1.66666666666667e-01
+55 453 8.33333333333333e-02
+55 450 -8.33333333333333e-02
+55 395 8.33333333333333e-02
+55 155 -8.33333333333333e-02
+55 406 -7.50000000000000e-01
+55 393 -1.66666666666667e-01
+55 405 1.66666666666667e-01
+55 455 8.33333333333333e-02
+55 290 -8.33333333333333e-02
+55 451 -2.50000000000000e-01
+55 359 8.33333333333333e-02
+56 56 2.50000000000000e+00
+56 358 8.33333333333333e-02
+56 446 -2.50000000000000e-01
+56 445 1.66666666666667e-01
+56 357 -1.66666666666667e-01
+56 424 -8.33333333333333e-02
+56 423 1.66666666666667e-01
+56 425 -2.50000000000000e-01
+56 457 -1.66666666666667e-01
+56 456 8.33333333333333e-02
+56 448 8.33333333333333e-02
+56 369 1.66666666666667e-01
+56 54 -3.33333333333333e-01
+56 371 -7.50000000000000e-01
+56 370 1.66666666666667e-01
+56 153 -8.33333333333333e-02
+56 447 8.33333333333333e-02
+56 288 -8.33333333333333e-02
+56 442 -8.33333333333333e-02
+56 339 8.33333333333333e-02
+56 443 -2.50000000000000e-01
+56 441 1.66666666666667e-01
+56 340 -1.66666666666667e-01
+56 405 -8.33333333333333e-02
+56 393 8.33333333333333e-02
+56 406 1.66666666666667e-01
+56 55 -3.33333333333333e-01
+56 451 1.66666666666667e-01
+56 407 -2.50000000000000e-01
+56 394 8.33333333333333e-02
+56 154 -8.33333333333333e-02
+56 452 -7.50000000000000e-01
+56 444 -8.33333333333333e-02
+56 454 8.33333333333333e-02
+56 289 -8.33333333333333e-02
+56 450 1.66666666666667e-01
+56 453 -1.66666666666667e-01
+57 57 7.50000000000000e-01
+57 181 4.16666666666667e-02
+57 469 -8.33333333333333e-02
+57 461 -4.16666666666667e-02
+57 58 -8.33333333333333e-02
+57 460 8.33333333333333e-02
+57 160 4.16666666666667e-02
+57 459 -1.25000000000000e-01
+57 476 -8.33333333333333e-02
+57 467 8.33333333333333e-02
+57 182 4.16666666666667e-02
+57 473 -8.33333333333333e-02
+57 472 4.16666666666667e-02
+57 475 -8.33333333333333e-02
+57 180 -2.50000000000000e-01
+57 59 -8.33333333333333e-02
+57 464 8.33333333333333e-02
+57 161 4.16666666666667e-02
+57 463 -4.16666666666667e-02
+57 466 8.33333333333333e-02
+57 470 4.16666666666667e-02
+57 462 -1.25000000000000e-01
+57 159 -2.50000000000000e-01
+58 58 6.66666666666667e-01
+58 180 4.16666666666667e-02
+58 468 -8.33333333333333e-02
+58 461 8.33333333333333e-02
+58 460 -3.75000000000000e-01
+58 57 -8.33333333333333e-02
+58 459 8.33333333333333e-02
+58 159 4.16666666666667e-02
+58 473 4.16666666666667e-02
+58 476 -8.33333333333333e-02
+58 181 -8.33333333333333e-02
+58 471 4.16666666666667e-02
+58 474 -8.33333333333333e-02
+58 464 8.33333333333333e-02
+58 467 -1.66666666666667e-01
+58 470 4.16666666666667e-02
+58 463 -1.25000000000000e-01
+58 160 -8.33333333333333e-02
+58 462 -4.16666666666667e-02
+58 465 8.33333333333333e-02
+59 59 6.66666666666667e-01
+59 468 4.16666666666667e-02
+59 461 -1.25000000000000e-01
+59 460 8.33333333333333e-02
+59 459 -4.16666666666667e-02
+59 472 4.16666666666667e-02
+59 475 -8.33333333333333e-02
+59 474 -8.33333333333333e-02
+59 465 8.33333333333333e-02
+59 182 -8.33333333333333e-02
+59 180 4.16666666666667e-02
+59 471 -8.33333333333333e-02
+59 469 4.16666666666667e-02
+59 464 -3.75000000000000e-01
+59 161 -8.33333333333333e-02
+59 463 8.33333333333333e-02
+59 466 -1.66666666666667e-01
+59 57 -8.33333333333333e-02
+59 462 8.33333333333333e-02
+59 159 4.16666666666667e-02
+60 60 1.25000000000000e+00
+60 487 -8.33333333333333e-02
+60 479 8.33333333333333e-02
+60 478 8.33333333333333e-02
+60 477 -3.75000000000000e-01
+60 494 -8.33333333333333e-02
+60 493 -8.33333333333333e-02
+60 485 -1.66666666666667e-01
+60 484 8.33333333333333e-02
+60 374 8.33333333333333e-02
+60 62 -1.66666666666667e-01
+60 482 1.66666666666667e-01
+60 490 8.33333333333333e-02
+60 481 -8.33333333333333e-02
+60 164 -4.16666666666667e-02
+60 344 4.16666666666667e-02
+60 163 8.33333333333333e-02
+60 343 -8.33333333333333e-02
+60 162 -1.25000000000000e-01
+60 480 -2.50000000000000e-01
+60 209 -4.16666666666667e-02
+60 491 8.33333333333333e-02
+60 61 -1.66666666666667e-01
+60 208 8.33333333333333e-02
+60 373 8.33333333333333e-02
+60 488 4.16666666666667e-02
+60 207 -1.25000000000000e-01
+60 372 -3.75000000000000e-01
+61 61 1.25000000000000e+00
+61 486 -8.33333333333333e-02
+61 479 -4.16666666666667e-02
+61 478 -1.25000000000000e-01
+61 477 8.33333333333333e-02
+61 494 -8.33333333333333e-02
+61 485 8.33333333333333e-02
+61 492 -8.33333333333333e-02
+61 483 8.33333333333333e-02
+61 374 -4.16666666666667e-02
+61 344 4.16666666666667e-02
+61 489 8.33333333333333e-02
+61 480 -8.33333333333333e-02
+61 164 8.33333333333333e-02
+61 62 -1.66666666666667e-01
+61 482 1.66666666666667e-01
+61 163 -3.75000000000000e-01
+61 481 -2.50000000000000e-01
+61 162 8.33333333333333e-02
+61 342 -8.33333333333333e-02
+61 209 8.33333333333333e-02
+61 491 -1.66666666666667e-01
+61 488 4.16666666666667e-02
+61 208 -3.75000000000000e-01
+61 373 -1.25000000000000e-01
+61 60 -1.66666666666667e-01
+61 207 8.33333333333333e-02
+61 372 8.33333333333333e-02
+62 62 1.25000000000000e+00
+62 487 4.16666666666667e-02
+62 479 -1.25000000000000e-01
+62 478 -4.16666666666667e-02
+62 477 8.33333333333333e-02
+62 492 -8.33333333333333e-02
+62 493 -8.33333333333333e-02
+62 484 8.33333333333333e-02
+62 483 -1.66666666666667e-01
+62 373 -4.16666666666667e-02
+62 343 4.16666666666667e-02
+62 372 8.33333333333333e-02
+62 60 -1.66666666666667e-01
+62 480 1.66666666666667e-01
+62 164 -1.25000000000000e-01
+62 482 -7.50000000000000e-01
+62 163 8.33333333333333e-02
+62 61 -1.66666666666667e-01
+62 481 1.66666666666667e-01
+62 162 -4.16666666666667e-02
+62 342 4.16666666666667e-02
+62 486 4.16666666666667e-02
+62 209 -1.25000000000000e-01
+62 374 -1.25000000000000e-01
+62 208 8.33333333333333e-02
+62 490 -1.66666666666667e-01
+62 207 -4.16666666666667e-02
+62 489 8.33333333333333e-02
+63 63 1.25000000000000e+00
+63 508 8.33333333333333e-02
+63 509 8.33333333333333e-02
+63 505 8.33333333333333e-02
+63 504 -1.25000000000000e-01
+63 65 -1.66666666666667e-01
+63 479 8.33333333333333e-02
+63 478 8.33333333333333e-02
+63 477 -3.75000000000000e-01
+63 496 -8.33333333333333e-02
+63 64 -1.66666666666667e-01
+63 500 8.33333333333333e-02
+63 511 -8.33333333333333e-02
+63 502 8.33333333333333e-02
+63 497 1.66666666666667e-01
+63 503 -1.66666666666667e-01
+63 224 4.16666666666667e-02
+63 512 -8.33333333333333e-02
+63 499 8.33333333333333e-02
+63 223 -8.33333333333333e-02
+63 498 -3.75000000000000e-01
+63 461 -4.16666666666667e-02
+63 167 4.16666666666667e-02
+63 460 8.33333333333333e-02
+63 166 -8.33333333333333e-02
+63 459 -1.25000000000000e-01
+63 506 -4.16666666666667e-02
+63 495 -2.50000000000000e-01
+64 64 1.25000000000000e+00
+64 507 8.33333333333333e-02
+64 509 -1.66666666666667e-01
+64 224 4.16666666666667e-02
+64 505 -3.75000000000000e-01
+64 504 8.33333333333333e-02
+64 479 -4.16666666666667e-02
+64 167 4.16666666666667e-02
+64 478 -1.25000000000000e-01
+64 477 8.33333333333333e-02
+64 495 -8.33333333333333e-02
+64 500 -4.16666666666667e-02
+64 63 -1.66666666666667e-01
+64 510 -8.33333333333333e-02
+64 501 8.33333333333333e-02
+64 512 -8.33333333333333e-02
+64 503 8.33333333333333e-02
+64 499 -1.25000000000000e-01
+64 498 8.33333333333333e-02
+64 222 -8.33333333333333e-02
+64 461 8.33333333333333e-02
+64 65 -1.66666666666667e-01
+64 497 1.66666666666667e-01
+64 460 -3.75000000000000e-01
+64 506 8.33333333333333e-02
+64 496 -2.50000000000000e-01
+64 459 8.33333333333333e-02
+64 165 -8.33333333333333e-02
+65 65 1.25000000000000e+00
+65 505 8.33333333333333e-02
+65 508 -1.66666666666667e-01
+65 507 8.33333333333333e-02
+65 506 -1.25000000000000e-01
+65 223 4.16666666666667e-02
+65 479 -1.25000000000000e-01
+65 478 -4.16666666666667e-02
+65 166 4.16666666666667e-02
+65 63 -1.66666666666667e-01
+65 477 8.33333333333333e-02
+65 499 -4.16666666666667e-02
+65 498 8.33333333333333e-02
+65 511 -8.33333333333333e-02
+65 502 8.33333333333333e-02
+65 495 1.66666666666667e-01
+65 501 -1.66666666666667e-01
+65 500 -1.25000000000000e-01
+65 222 4.16666666666667e-02
+65 510 -8.33333333333333e-02
+65 461 -1.25000000000000e-01
+65 504 -4.16666666666667e-02
+65 497 -7.50000000000000e-01
+65 460 8.33333333333333e-02
+65 64 -1.66666666666667e-01
+65 496 1.66666666666667e-01
+65 459 -4.16666666666667e-02
+65 165 4.16666666666667e-02
+66 66 1.25000000000000e+00
+66 530 -8.33333333333333e-02
+66 523 4.16666666666667e-02
+66 529 -8.33333333333333e-02
+66 524 -8.33333333333333e-02
+66 515 8.33333333333333e-02
+66 514 8.33333333333333e-02
+66 520 -1.66666666666667e-01
+66 513 -3.75000000000000e-01
+66 527 8.33333333333333e-02
+66 518 -8.33333333333333e-02
+66 67 -1.66666666666667e-01
+66 517 1.66666666666667e-01
+66 409 8.33333333333333e-02
+66 170 8.33333333333333e-02
+66 347 -8.33333333333333e-02
+66 169 -4.16666666666667e-02
+66 346 4.16666666666667e-02
+66 168 -1.25000000000000e-01
+66 516 -2.50000000000000e-01
+66 68 -1.66666666666667e-01
+66 251 8.33333333333333e-02
+66 410 8.33333333333333e-02
+66 250 -4.16666666666667e-02
+66 526 8.33333333333333e-02
+66 521 8.33333333333333e-02
+66 249 -1.25000000000000e-01
+66 408 -3.75000000000000e-01
+67 67 1.25000000000000e+00
+67 528 -8.33333333333333e-02
+67 524 4.16666666666667e-02
+67 530 -8.33333333333333e-02
+67 515 -4.16666666666667e-02
+67 521 8.33333333333333e-02
+67 514 -1.25000000000000e-01
+67 513 8.33333333333333e-02
+67 519 -1.66666666666667e-01
+67 347 4.16666666666667e-02
+67 410 -4.16666666666667e-02
+67 66 -1.66666666666667e-01
+67 516 1.66666666666667e-01
+67 408 8.33333333333333e-02
+67 170 8.33333333333333e-02
+67 68 -1.66666666666667e-01
+67 518 1.66666666666667e-01
+67 169 -1.25000000000000e-01
+67 517 -7.50000000000000e-01
+67 168 -4.16666666666667e-02
+67 345 4.16666666666667e-02
+67 251 8.33333333333333e-02
+67 527 -1.66666666666667e-01
+67 522 4.16666666666667e-02
+67 250 -1.25000000000000e-01
+67 409 -1.25000000000000e-01
+67 249 -4.16666666666667e-02
+67 525 8.33333333333333e-02
+68 68 1.25000000000000e+00
+68 528 -8.33333333333333e-02
+68 523 4.16666666666667e-02
+68 529 -8.33333333333333e-02
+68 522 -8.33333333333333e-02
+68 515 -1.25000000000000e-01
+68 514 -4.16666666666667e-02
+68 520 8.33333333333333e-02
+68 513 8.33333333333333e-02
+68 525 8.33333333333333e-02
+68 516 -8.33333333333333e-02
+68 346 4.16666666666667e-02
+68 409 -4.16666666666667e-02
+68 170 -3.75000000000000e-01
+68 518 -2.50000000000000e-01
+68 169 8.33333333333333e-02
+68 67 -1.66666666666667e-01
+68 517 1.66666666666667e-01
+68 168 8.33333333333333e-02
+68 345 -8.33333333333333e-02
+68 519 8.33333333333333e-02
+68 251 -3.75000000000000e-01
+68 410 -1.25000000000000e-01
+68 250 8.33333333333333e-02
+68 526 -1.66666666666667e-01
+68 66 -1.66666666666667e-01
+68 249 8.33333333333333e-02
+68 408 8.33333333333333e-02
+69 69 1.25000000000000e+00
+69 539 8.33333333333333e-02
+69 538 -1.66666666666667e-01
+69 536 8.33333333333333e-02
+69 265 4.16666666666667e-02
+69 534 -3.75000000000000e-01
+69 464 8.33333333333333e-02
+69 463 -4.16666666666667e-02
+69 172 4.16666666666667e-02
+69 462 -1.25000000000000e-01
+69 533 -8.33333333333333e-02
+69 71 -1.66666666666667e-01
+69 541 -4.16666666666667e-02
+69 548 -8.33333333333333e-02
+69 545 8.33333333333333e-02
+69 547 -8.33333333333333e-02
+69 544 8.33333333333333e-02
+69 542 8.33333333333333e-02
+69 266 -8.33333333333333e-02
+69 540 -1.25000000000000e-01
+69 515 8.33333333333333e-02
+69 173 -8.33333333333333e-02
+69 514 8.33333333333333e-02
+69 70 -1.66666666666667e-01
+69 532 1.66666666666667e-01
+69 513 -3.75000000000000e-01
+69 535 8.33333333333333e-02
+69 531 -2.50000000000000e-01
+70 70 1.25000000000000e+00
+70 539 8.33333333333333e-02
+70 534 8.33333333333333e-02
+70 537 -1.66666666666667e-01
+70 535 -1.25000000000000e-01
+70 264 4.16666666666667e-02
+70 464 8.33333333333333e-02
+70 71 -1.66666666666667e-01
+70 463 -1.25000000000000e-01
+70 462 -4.16666666666667e-02
+70 171 4.16666666666667e-02
+70 540 -4.16666666666667e-02
+70 542 8.33333333333333e-02
+70 533 1.66666666666667e-01
+70 545 -1.66666666666667e-01
+70 546 -8.33333333333333e-02
+70 543 8.33333333333333e-02
+70 266 4.16666666666667e-02
+70 548 -8.33333333333333e-02
+70 541 -1.25000000000000e-01
+70 515 -4.16666666666667e-02
+70 173 4.16666666666667e-02
+70 514 -1.25000000000000e-01
+70 536 -4.16666666666667e-02
+70 532 -7.50000000000000e-01
+70 513 8.33333333333333e-02
+70 69 -1.66666666666667e-01
+70 531 1.66666666666667e-01
+71 71 1.25000000000000e+00
+71 538 8.33333333333333e-02
+71 537 8.33333333333333e-02
+71 536 -1.25000000000000e-01
+71 534 8.33333333333333e-02
+71 464 -3.75000000000000e-01
+71 463 8.33333333333333e-02
+71 70 -1.66666666666667e-01
+71 462 8.33333333333333e-02
+71 531 -8.33333333333333e-02
+71 69 -1.66666666666667e-01
+71 541 8.33333333333333e-02
+71 546 -8.33333333333333e-02
+71 543 8.33333333333333e-02
+71 532 1.66666666666667e-01
+71 544 -1.66666666666667e-01
+71 542 -3.75000000000000e-01
+71 265 4.16666666666667e-02
+71 547 -8.33333333333333e-02
+71 540 8.33333333333333e-02
+71 264 -8.33333333333333e-02
+71 515 -1.25000000000000e-01
+71 535 -4.16666666666667e-02
+71 533 -2.50000000000000e-01
+71 514 -4.16666666666667e-02
+71 172 4.16666666666667e-02
+71 513 8.33333333333333e-02
+71 171 -8.33333333333333e-02
+72 72 2.50000000000000e+00
+72 556 -1.66666666666667e-01
+72 551 1.66666666666667e-01
+72 563 -1.66666666666667e-01
+72 565 -8.33333333333333e-02
+72 562 8.33333333333333e-02
+72 566 -8.33333333333333e-02
+72 550 1.66666666666667e-01
+72 549 -7.50000000000000e-01
+72 482 1.66666666666667e-01
+72 376 8.33333333333333e-02
+72 481 -8.33333333333333e-02
+72 377 -1.66666666666667e-01
+72 176 8.33333333333333e-02
+72 480 -2.50000000000000e-01
+72 554 -8.33333333333333e-02
+72 293 8.33333333333333e-02
+72 73 -3.33333333333333e-01
+72 553 1.66666666666667e-01
+72 552 -2.50000000000000e-01
+72 518 -8.33333333333333e-02
+72 517 1.66666666666667e-01
+72 350 -8.33333333333333e-02
+72 413 8.33333333333333e-02
+72 442 1.66666666666667e-01
+72 412 -1.66666666666667e-01
+72 175 8.33333333333333e-02
+72 349 -8.33333333333333e-02
+72 516 -2.50000000000000e-01
+72 74 -3.33333333333333e-01
+72 560 1.66666666666667e-01
+72 443 1.66666666666667e-01
+72 559 -8.33333333333333e-02
+72 292 8.33333333333333e-02
+72 557 8.33333333333333e-02
+72 558 -2.50000000000000e-01
+72 441 -7.50000000000000e-01
+73 73 2.50000000000000e+00
+73 555 -1.66666666666667e-01
+73 551 -8.33333333333333e-02
+73 566 -8.33333333333333e-02
+73 563 8.33333333333333e-02
+73 564 -8.33333333333333e-02
+73 561 8.33333333333333e-02
+73 550 -2.50000000000000e-01
+73 549 1.66666666666667e-01
+73 375 8.33333333333333e-02
+73 480 -8.33333333333333e-02
+73 377 8.33333333333333e-02
+73 482 1.66666666666667e-01
+73 481 -2.50000000000000e-01
+73 554 1.66666666666667e-01
+73 553 -7.50000000000000e-01
+73 72 -3.33333333333333e-01
+73 552 1.66666666666667e-01
+73 443 -8.33333333333333e-02
+73 74 -3.33333333333333e-01
+73 350 -8.33333333333333e-02
+73 413 8.33333333333333e-02
+73 516 1.66666666666667e-01
+73 441 1.66666666666667e-01
+73 411 -1.66666666666667e-01
+73 176 -1.66666666666667e-01
+73 518 1.66666666666667e-01
+73 517 -7.50000000000000e-01
+73 174 8.33333333333333e-02
+73 348 -8.33333333333333e-02
+73 560 1.66666666666667e-01
+73 293 -1.66666666666667e-01
+73 557 8.33333333333333e-02
+73 559 -2.50000000000000e-01
+73 442 -2.50000000000000e-01
+73 558 -8.33333333333333e-02
+73 291 8.33333333333333e-02
+74 74 2.50000000000000e+00
+74 556 8.33333333333333e-02
+74 550 -8.33333333333333e-02
+74 565 -8.33333333333333e-02
+74 562 8.33333333333333e-02
+74 549 1.66666666666667e-01
+74 561 -1.66666666666667e-01
+74 564 -8.33333333333333e-02
+74 551 -2.50000000000000e-01
+74 480 1.66666666666667e-01
+74 376 8.33333333333333e-02
+74 375 -1.66666666666667e-01
+74 482 -7.50000000000000e-01
+74 481 1.66666666666667e-01
+74 174 8.33333333333333e-02
+74 554 -2.50000000000000e-01
+74 553 1.66666666666667e-01
+74 552 -8.33333333333333e-02
+74 291 8.33333333333333e-02
+74 442 -8.33333333333333e-02
+74 73 -3.33333333333333e-01
+74 516 -8.33333333333333e-02
+74 349 -8.33333333333333e-02
+74 412 8.33333333333333e-02
+74 348 -8.33333333333333e-02
+74 411 8.33333333333333e-02
+74 518 -2.50000000000000e-01
+74 175 -1.66666666666667e-01
+74 517 1.66666666666667e-01
+74 555 8.33333333333333e-02
+74 560 -7.50000000000000e-01
+74 443 -2.50000000000000e-01
+74 559 1.66666666666667e-01
+74 292 -1.66666666666667e-01
+74 72 -3.33333333333333e-01
+74 558 1.66666666666667e-01
+74 441 1.66666666666667e-01
+75 75 2.50000000000000e+00
+75 571 1.66666666666667e-01
+75 570 -2.50000000000000e-01
+75 485 -1.66666666666667e-01
+75 484 8.33333333333333e-02
+75 551 1.66666666666667e-01
+75 583 8.33333333333333e-02
+75 550 1.66666666666667e-01
+75 549 -7.50000000000000e-01
+75 584 8.33333333333333e-02
+75 496 -8.33333333333333e-02
+75 497 1.66666666666667e-01
+75 77 -3.33333333333333e-01
+75 179 -8.33333333333333e-02
+75 495 -2.50000000000000e-01
+75 575 8.33333333333333e-02
+75 314 -8.33333333333333e-02
+75 574 -1.66666666666667e-01
+75 467 8.33333333333333e-02
+75 568 1.66666666666667e-01
+75 76 -3.33333333333333e-01
+75 569 1.66666666666667e-01
+75 313 -8.33333333333333e-02
+75 567 -7.50000000000000e-01
+75 466 8.33333333333333e-02
+75 178 -8.33333333333333e-02
+75 533 -8.33333333333333e-02
+75 521 8.33333333333333e-02
+75 580 8.33333333333333e-02
+75 577 -8.33333333333333e-02
+75 520 -1.66666666666667e-01
+75 532 1.66666666666667e-01
+75 531 -2.50000000000000e-01
+75 578 1.66666666666667e-01
+75 581 -1.66666666666667e-01
+75 576 -2.50000000000000e-01
+75 572 -8.33333333333333e-02
+76 76 2.50000000000000e+00
+76 570 1.66666666666667e-01
+76 572 1.66666666666667e-01
+76 571 -7.50000000000000e-01
+76 483 8.33333333333333e-02
+76 551 -8.33333333333333e-02
+76 582 8.33333333333333e-02
+76 550 -2.50000000000000e-01
+76 549 1.66666666666667e-01
+76 584 -1.66666666666667e-01
+76 495 -8.33333333333333e-02
+76 575 8.33333333333333e-02
+76 497 1.66666666666667e-01
+76 496 -2.50000000000000e-01
+76 573 -1.66666666666667e-01
+76 569 -8.33333333333333e-02
+76 567 1.66666666666667e-01
+76 75 -3.33333333333333e-01
+76 568 -2.50000000000000e-01
+76 312 -8.33333333333333e-02
+76 467 -1.66666666666667e-01
+76 465 8.33333333333333e-02
+76 177 -8.33333333333333e-02
+76 533 1.66666666666667e-01
+76 77 -3.33333333333333e-01
+76 578 1.66666666666667e-01
+76 579 8.33333333333333e-02
+76 576 -8.33333333333333e-02
+76 521 8.33333333333333e-02
+76 179 -8.33333333333333e-02
+76 532 -7.50000000000000e-01
+76 519 -1.66666666666667e-01
+76 531 1.66666666666667e-01
+76 581 8.33333333333333e-02
+76 314 -8.33333333333333e-02
+76 577 -2.50000000000000e-01
+76 485 8.33333333333333e-02
+77 77 2.50000000000000e+00
+77 484 8.33333333333333e-02
+77 572 -2.50000000000000e-01
+77 571 1.66666666666667e-01
+77 483 -1.66666666666667e-01
+77 550 -8.33333333333333e-02
+77 549 1.66666666666667e-01
+77 551 -2.50000000000000e-01
+77 583 -1.66666666666667e-01
+77 582 8.33333333333333e-02
+77 574 8.33333333333333e-02
+77 495 1.66666666666667e-01
+77 75 -3.33333333333333e-01
+77 497 -7.50000000000000e-01
+77 496 1.66666666666667e-01
+77 177 -8.33333333333333e-02
+77 573 8.33333333333333e-02
+77 312 -8.33333333333333e-02
+77 568 -8.33333333333333e-02
+77 465 8.33333333333333e-02
+77 569 -2.50000000000000e-01
+77 567 1.66666666666667e-01
+77 466 -1.66666666666667e-01
+77 531 -8.33333333333333e-02
+77 519 8.33333333333333e-02
+77 532 1.66666666666667e-01
+77 76 -3.33333333333333e-01
+77 577 1.66666666666667e-01
+77 533 -2.50000000000000e-01
+77 520 8.33333333333333e-02
+77 178 -8.33333333333333e-02
+77 578 -7.50000000000000e-01
+77 570 -8.33333333333333e-02
+77 580 8.33333333333333e-02
+77 313 -8.33333333333333e-02
+77 576 1.66666666666667e-01
+77 579 -1.66666666666667e-01
+78 78 1.25000000000000e+00
+78 226 8.33333333333333e-02
+78 79 -1.66666666666667e-01
+78 184 8.33333333333333e-02
+78 590 8.33333333333333e-02
+78 589 8.33333333333333e-02
+78 225 -1.25000000000000e-01
+78 587 1.66666666666667e-01
+78 586 -8.33333333333333e-02
+78 585 -2.50000000000000e-01
+78 183 -1.25000000000000e-01
+78 80 -1.66666666666667e-01
+78 185 -4.16666666666667e-02
+78 470 4.16666666666667e-02
+78 469 -8.33333333333333e-02
+78 227 -4.16666666666667e-02
+78 499 8.33333333333333e-02
+78 500 8.33333333333333e-02
+78 498 -3.75000000000000e-01
+78 976 -8.33333333333333e-02
+78 971 8.33333333333333e-02
+78 970 8.33333333333333e-02
+78 969 -3.75000000000000e-01
+78 980 -8.33333333333333e-02
+78 979 -8.33333333333333e-02
+78 974 -1.66666666666667e-01
+78 973 8.33333333333333e-02
+78 977 4.16666666666667e-02
+79 79 1.25000000000000e+00
+79 225 8.33333333333333e-02
+79 78 -1.66666666666667e-01
+79 183 8.33333333333333e-02
+79 590 -1.66666666666667e-01
+79 227 8.33333333333333e-02
+79 226 -3.75000000000000e-01
+79 588 8.33333333333333e-02
+79 587 1.66666666666667e-01
+79 80 -1.66666666666667e-01
+79 185 8.33333333333333e-02
+79 586 -2.50000000000000e-01
+79 184 -3.75000000000000e-01
+79 585 -8.33333333333333e-02
+79 470 4.16666666666667e-02
+79 468 -8.33333333333333e-02
+79 500 -4.16666666666667e-02
+79 499 -1.25000000000000e-01
+79 498 8.33333333333333e-02
+79 975 -8.33333333333333e-02
+79 971 -4.16666666666667e-02
+79 970 -1.25000000000000e-01
+79 969 8.33333333333333e-02
+79 980 -8.33333333333333e-02
+79 974 8.33333333333333e-02
+79 978 -8.33333333333333e-02
+79 977 4.16666666666667e-02
+79 972 8.33333333333333e-02
+80 80 1.25000000000000e+00
+80 588 8.33333333333333e-02
+80 227 -1.25000000000000e-01
+80 589 -1.66666666666667e-01
+80 226 8.33333333333333e-02
+80 587 -7.50000000000000e-01
+80 185 -1.25000000000000e-01
+80 586 1.66666666666667e-01
+80 79 -1.66666666666667e-01
+80 184 8.33333333333333e-02
+80 585 1.66666666666667e-01
+80 469 4.16666666666667e-02
+80 498 8.33333333333333e-02
+80 78 -1.66666666666667e-01
+80 183 -4.16666666666667e-02
+80 468 4.16666666666667e-02
+80 499 -4.16666666666667e-02
+80 500 -1.25000000000000e-01
+80 225 -4.16666666666667e-02
+80 976 4.16666666666667e-02
+80 971 -1.25000000000000e-01
+80 970 -4.16666666666667e-02
+80 969 8.33333333333333e-02
+80 978 -8.33333333333333e-02
+80 979 -8.33333333333333e-02
+80 973 8.33333333333333e-02
+80 975 4.16666666666667e-02
+80 972 -1.66666666666667e-01
+81 81 1.25000000000000e+00
+81 596 8.33333333333333e-02
+81 593 -8.33333333333333e-02
+81 592 1.66666666666667e-01
+81 591 -2.50000000000000e-01
+81 269 8.33333333333333e-02
+81 267 -1.25000000000000e-01
+81 83 -1.66666666666667e-01
+81 188 8.33333333333333e-02
+81 595 8.33333333333333e-02
+81 186 -1.25000000000000e-01
+81 82 -1.66666666666667e-01
+81 535 8.33333333333333e-02
+81 473 -8.33333333333333e-02
+81 187 -4.16666666666667e-02
+81 472 4.16666666666667e-02
+81 536 8.33333333333333e-02
+81 268 -4.16666666666667e-02
+81 534 -3.75000000000000e-01
+81 1004 8.33333333333333e-02
+81 1010 -8.33333333333333e-02
+81 1006 4.16666666666667e-02
+81 1009 -8.33333333333333e-02
+81 1007 -8.33333333333333e-02
+81 1001 8.33333333333333e-02
+81 1000 8.33333333333333e-02
+81 1003 -1.66666666666667e-01
+81 999 -3.75000000000000e-01
+82 82 1.25000000000000e+00
+82 596 -1.66666666666667e-01
+82 269 8.33333333333333e-02
+82 593 1.66666666666667e-01
+82 83 -1.66666666666667e-01
+82 188 8.33333333333333e-02
+82 592 -7.50000000000000e-01
+82 591 1.66666666666667e-01
+82 268 -1.25000000000000e-01
+82 594 8.33333333333333e-02
+82 187 -1.25000000000000e-01
+82 536 -4.16666666666667e-02
+82 81 -1.66666666666667e-01
+82 534 8.33333333333333e-02
+82 186 -4.16666666666667e-02
+82 471 4.16666666666667e-02
+82 473 4.16666666666667e-02
+82 535 -1.25000000000000e-01
+82 267 -4.16666666666667e-02
+82 1005 4.16666666666667e-02
+82 1008 -8.33333333333333e-02
+82 1007 4.16666666666667e-02
+82 1010 -8.33333333333333e-02
+82 1001 -4.16666666666667e-02
+82 1004 8.33333333333333e-02
+82 1000 -1.25000000000000e-01
+82 999 8.33333333333333e-02
+82 1002 -1.66666666666667e-01
+83 83 1.25000000000000e+00
+83 268 8.33333333333333e-02
+83 594 8.33333333333333e-02
+83 593 -2.50000000000000e-01
+83 592 1.66666666666667e-01
+83 82 -1.66666666666667e-01
+83 187 8.33333333333333e-02
+83 591 -8.33333333333333e-02
+83 269 -3.75000000000000e-01
+83 267 8.33333333333333e-02
+83 595 -1.66666666666667e-01
+83 188 -3.75000000000000e-01
+83 81 -1.66666666666667e-01
+83 186 8.33333333333333e-02
+83 472 4.16666666666667e-02
+83 535 -4.16666666666667e-02
+83 471 -8.33333333333333e-02
+83 536 -1.25000000000000e-01
+83 534 8.33333333333333e-02
+83 1002 8.33333333333333e-02
+83 1008 -8.33333333333333e-02
+83 1006 4.16666666666667e-02
+83 1009 -8.33333333333333e-02
+83 1005 -8.33333333333333e-02
+83 1001 -1.25000000000000e-01
+83 1000 -4.16666666666667e-02
+83 1003 8.33333333333333e-02
+83 999 8.33333333333333e-02
+84 84 2.50000000000000e+00
+84 599 -8.33333333333333e-02
+84 598 1.66666666666667e-01
+84 316 8.33333333333333e-02
+84 597 -2.50000000000000e-01
+84 86 -3.33333333333333e-01
+84 587 1.66666666666667e-01
+84 586 -8.33333333333333e-02
+84 190 8.33333333333333e-02
+84 585 -2.50000000000000e-01
+84 601 -8.33333333333333e-02
+84 602 1.66666666666667e-01
+84 317 8.33333333333333e-02
+84 600 -2.50000000000000e-01
+84 593 -8.33333333333333e-02
+84 191 8.33333333333333e-02
+84 85 -3.33333333333333e-01
+84 592 1.66666666666667e-01
+84 591 -2.50000000000000e-01
+84 502 8.33333333333333e-02
+84 503 -1.66666666666667e-01
+84 476 -8.33333333333333e-02
+84 539 8.33333333333333e-02
+84 568 1.66666666666667e-01
+84 538 -1.66666666666667e-01
+84 475 -8.33333333333333e-02
+84 569 1.66666666666667e-01
+84 567 -7.50000000000000e-01
+84 1033 -1.66666666666667e-01
+84 1031 1.66666666666667e-01
+84 1037 -1.66666666666667e-01
+84 1039 -8.33333333333333e-02
+84 1036 8.33333333333333e-02
+84 1040 -8.33333333333333e-02
+84 1030 1.66666666666667e-01
+84 1034 8.33333333333333e-02
+84 1029 -7.50000000000000e-01
+85 85 2.50000000000000e+00
+85 599 1.66666666666667e-01
+85 598 -7.50000000000000e-01
+85 315 8.33333333333333e-02
+85 587 1.66666666666667e-01
+85 586 -2.50000000000000e-01
+85 585 -8.33333333333333e-02
+85 189 8.33333333333333e-02
+85 86 -3.33333333333333e-01
+85 600 -8.33333333333333e-02
+85 317 -1.66666666666667e-01
+85 602 1.66666666666667e-01
+85 601 -2.50000000000000e-01
+85 593 1.66666666666667e-01
+85 191 -1.66666666666667e-01
+85 597 1.66666666666667e-01
+85 592 -7.50000000000000e-01
+85 84 -3.33333333333333e-01
+85 591 1.66666666666667e-01
+85 503 8.33333333333333e-02
+85 569 -8.33333333333333e-02
+85 476 -8.33333333333333e-02
+85 539 8.33333333333333e-02
+85 567 1.66666666666667e-01
+85 537 -1.66666666666667e-01
+85 474 -8.33333333333333e-02
+85 501 8.33333333333333e-02
+85 568 -2.50000000000000e-01
+85 1034 8.33333333333333e-02
+85 1032 -1.66666666666667e-01
+85 1031 -8.33333333333333e-02
+85 1040 -8.33333333333333e-02
+85 1037 8.33333333333333e-02
+85 1038 -8.33333333333333e-02
+85 1035 8.33333333333333e-02
+85 1030 -2.50000000000000e-01
+85 1029 1.66666666666667e-01
+86 86 2.50000000000000e+00
+86 597 -8.33333333333333e-02
+86 599 -2.50000000000000e-01
+86 598 1.66666666666667e-01
+86 587 -7.50000000000000e-01
+86 586 1.66666666666667e-01
+86 84 -3.33333333333333e-01
+86 585 1.66666666666667e-01
+86 85 -3.33333333333333e-01
+86 600 1.66666666666667e-01
+86 602 -7.50000000000000e-01
+86 316 -1.66666666666667e-01
+86 601 1.66666666666667e-01
+86 315 8.33333333333333e-02
+86 593 -2.50000000000000e-01
+86 592 1.66666666666667e-01
+86 190 -1.66666666666667e-01
+86 591 -8.33333333333333e-02
+86 189 8.33333333333333e-02
+86 502 8.33333333333333e-02
+86 501 -1.66666666666667e-01
+86 568 -8.33333333333333e-02
+86 475 -8.33333333333333e-02
+86 538 8.33333333333333e-02
+86 474 -8.33333333333333e-02
+86 537 8.33333333333333e-02
+86 569 -2.50000000000000e-01
+86 567 1.66666666666667e-01
+86 1033 8.33333333333333e-02
+86 1030 -8.33333333333333e-02
+86 1039 -8.33333333333333e-02
+86 1036 8.33333333333333e-02
+86 1029 1.66666666666667e-01
+86 1035 -1.66666666666667e-01
+86 1038 -8.33333333333333e-02
+86 1032 8.33333333333333e-02
+86 1031 -2.50000000000000e-01
+87 87 5.00000000000000e-01
+87 380 -4.16666666666667e-02
+87 607 4.16666666666667e-02
+87 604 -4.16666666666667e-02
+87 212 4.16666666666667e-02
+87 608 -8.33333333333333e-02
+87 211 4.16666666666667e-02
+87 88 -8.33333333333333e-02
+87 379 8.33333333333333e-02
+87 210 -1.25000000000000e-01
+87 378 -1.25000000000000e-01
+87 89 -8.33333333333333e-02
+87 197 4.16666666666667e-02
+87 605 8.33333333333333e-02
+87 196 4.16666666666667e-02
+87 361 -8.33333333333333e-02
+87 362 4.16666666666667e-02
+87 195 -1.25000000000000e-01
+87 603 -1.25000000000000e-01
+88 88 5.83333333333333e-01
+88 380 8.33333333333333e-02
+88 605 8.33333333333333e-02
+88 606 4.16666666666667e-02
+88 603 -4.16666666666667e-02
+88 212 -4.16666666666667e-02
+88 608 4.16666666666667e-02
+88 211 -4.16666666666667e-02
+88 379 -3.75000000000000e-01
+88 210 4.16666666666667e-02
+88 87 -8.33333333333333e-02
+88 378 8.33333333333333e-02
+88 197 -4.16666666666667e-02
+88 362 4.16666666666667e-02
+88 89 -1.66666666666667e-01
+88 196 -4.16666666666667e-02
+88 604 -1.25000000000000e-01
+88 195 4.16666666666667e-02
+88 360 -8.33333333333333e-02
+89 89 5.83333333333333e-01
+89 378 -4.16666666666667e-02
+89 88 -1.66666666666667e-01
+89 379 8.33333333333333e-02
+89 604 8.33333333333333e-02
+89 212 -4.16666666666667e-02
+89 380 -1.25000000000000e-01
+89 211 -4.16666666666667e-02
+89 607 4.16666666666667e-02
+89 210 4.16666666666667e-02
+89 606 -8.33333333333333e-02
+89 360 4.16666666666667e-02
+89 197 -4.16666666666667e-02
+89 605 -3.75000000000000e-01
+89 196 -4.16666666666667e-02
+89 361 4.16666666666667e-02
+89 87 -8.33333333333333e-02
+89 195 4.16666666666667e-02
+89 603 8.33333333333333e-02
+90 90 3.39166666666667e+01
+90 200 2.12500000000000e+00
+90 92 -4.25000000000000e+00
+90 281 2.12500000000000e+00
+90 364 2.12500000000000e+00
+90 365 2.12500000000000e+00
+90 198 -4.20833333333333e+00
+90 428 -2.12500000000000e+00
+90 427 4.25000000000000e+00
+90 426 -6.37500000000000e+00
+90 279 -4.20833333333333e+00
+90 610 8.33333333333333e-02
+90 91 -1.66666666666667e-01
+90 614 -8.33333333333333e-02
+90 280 -4.16666666666667e-02
+90 613 4.16666666666667e-02
+90 611 8.33333333333333e-02
+90 199 -4.16666666666667e-02
+90 609 -3.75000000000000e-01
+90 1826 -4.16666666666667e+00
+90 1835 4.16666666666667e+00
+90 1834 4.16666666666667e+00
+90 1833 -1.87500000000000e+01
+90 1729 -4.16666666666667e+00
+90 1730 -4.16666666666667e+00
+90 1793 4.16666666666667e+00
+90 1792 -8.33333333333333e+00
+90 1825 2.08333333333333e+00
+91 91 3.39166666666667e+01
+91 363 2.12500000000000e+00
+91 365 -4.25000000000000e+00
+91 200 2.12500000000000e+00
+91 199 -4.20833333333333e+00
+91 428 4.25000000000000e+00
+91 92 -4.25000000000000e+00
+91 281 2.12500000000000e+00
+91 427 -1.91250000000000e+01
+91 280 -4.20833333333333e+00
+91 426 4.25000000000000e+00
+91 614 4.16666666666667e-02
+91 609 8.33333333333333e-02
+91 90 -1.66666666666667e-01
+91 279 -4.16666666666667e-02
+91 612 4.16666666666667e-02
+91 611 -4.16666666666667e-02
+91 610 -1.25000000000000e-01
+91 198 -4.16666666666667e-02
+91 1826 2.08333333333333e+00
+91 1835 -2.08333333333333e+00
+91 1834 -6.25000000000000e+00
+91 1833 4.16666666666667e+00
+91 1728 -4.16666666666667e+00
+91 1730 -4.16666666666667e+00
+91 1793 4.16666666666667e+00
+91 1824 2.08333333333333e+00
+91 1791 -8.33333333333333e+00
+92 92 3.80000000000000e+01
+92 198 2.12500000000000e+00
+92 90 -4.25000000000000e+00
+92 279 2.12500000000000e+00
+92 200 -1.26250000000000e+01
+92 364 -4.25000000000000e+00
+92 199 2.12500000000000e+00
+92 363 2.12500000000000e+00
+92 428 -6.37500000000000e+00
+92 281 -1.26250000000000e+01
+92 427 4.25000000000000e+00
+92 91 -4.25000000000000e+00
+92 280 2.12500000000000e+00
+92 426 -2.12500000000000e+00
+92 613 4.16666666666667e-02
+92 612 -8.33333333333333e-02
+92 610 -4.16666666666667e-02
+92 611 -1.25000000000000e-01
+92 609 8.33333333333333e-02
+92 1824 -4.16666666666667e+00
+92 1835 -6.25000000000000e+00
+92 1834 -2.08333333333333e+00
+92 1833 4.16666666666667e+00
+92 1729 -4.16666666666667e+00
+92 1792 4.16666666666667e+00
+92 1728 -4.16666666666667e+00
+92 1825 2.08333333333333e+00
+92 1791 4.16666666666667e+00
+93 93 1.25000000000000e+00
+93 382 8.33333333333333e-02
+93 383 8.33333333333333e-02
+93 605 8.33333333333333e-02
+93 603 -1.25000000000000e-01
+93 617 8.33333333333333e-02
+93 616 8.33333333333333e-02
+93 94 -1.66666666666667e-01
+93 615 -3.75000000000000e-01
+93 446 -8.33333333333333e-02
+93 95 -1.66666666666667e-01
+93 368 -8.33333333333333e-02
+93 431 8.33333333333333e-02
+93 610 8.33333333333333e-02
+93 445 1.66666666666667e-01
+93 430 -1.66666666666667e-01
+93 611 8.33333333333333e-02
+93 203 -8.33333333333333e-02
+93 202 4.16666666666667e-02
+93 367 -8.33333333333333e-02
+93 609 -3.75000000000000e-01
+93 620 8.33333333333333e-02
+93 296 -8.33333333333333e-02
+93 619 -4.16666666666667e-02
+93 295 4.16666666666667e-02
+93 618 -1.25000000000000e-01
+93 604 -4.16666666666667e-02
+93 444 -2.50000000000000e-01
+94 94 1.25000000000000e+00
+94 603 -4.16666666666667e-02
+94 381 8.33333333333333e-02
+94 383 -1.66666666666667e-01
+94 203 4.16666666666667e-02
+94 604 -1.25000000000000e-01
+94 617 -4.16666666666667e-02
+94 296 4.16666666666667e-02
+94 616 -1.25000000000000e-01
+94 615 8.33333333333333e-02
+94 93 -1.66666666666667e-01
+94 611 -4.16666666666667e-02
+94 609 8.33333333333333e-02
+94 368 -8.33333333333333e-02
+94 431 8.33333333333333e-02
+94 444 1.66666666666667e-01
+94 429 -1.66666666666667e-01
+94 610 -1.25000000000000e-01
+94 201 4.16666666666667e-02
+94 366 -8.33333333333333e-02
+94 620 8.33333333333333e-02
+94 95 -1.66666666666667e-01
+94 446 1.66666666666667e-01
+94 619 -1.25000000000000e-01
+94 605 8.33333333333333e-02
+94 445 -7.50000000000000e-01
+94 618 -4.16666666666667e-02
+94 294 4.16666666666667e-02
+95 95 1.25000000000000e+00
+95 382 -1.66666666666667e-01
+95 381 8.33333333333333e-02
+95 605 -3.75000000000000e-01
+95 202 4.16666666666667e-02
+95 603 8.33333333333333e-02
+95 617 -1.25000000000000e-01
+95 616 -4.16666666666667e-02
+95 295 4.16666666666667e-02
+95 615 8.33333333333333e-02
+95 444 -8.33333333333333e-02
+95 610 -4.16666666666667e-02
+95 93 -1.66666666666667e-01
+95 366 -8.33333333333333e-02
+95 429 8.33333333333333e-02
+95 367 -8.33333333333333e-02
+95 430 8.33333333333333e-02
+95 611 -1.25000000000000e-01
+95 609 8.33333333333333e-02
+95 201 -8.33333333333333e-02
+95 620 -3.75000000000000e-01
+95 604 8.33333333333333e-02
+95 446 -2.50000000000000e-01
+95 619 8.33333333333333e-02
+95 94 -1.66666666666667e-01
+95 445 1.66666666666667e-01
+95 618 8.33333333333333e-02
+95 294 -8.33333333333333e-02
+96 96 5.00000000000000e-01
+96 506 -4.16666666666667e-02
+96 625 4.16666666666667e-02
+96 622 -4.16666666666667e-02
+96 230 4.16666666666667e-02
+96 626 -8.33333333333333e-02
+96 229 4.16666666666667e-02
+96 97 -8.33333333333333e-02
+96 505 8.33333333333333e-02
+96 228 -1.25000000000000e-01
+96 504 -1.25000000000000e-01
+96 98 -8.33333333333333e-02
+96 215 4.16666666666667e-02
+96 623 8.33333333333333e-02
+96 214 4.16666666666667e-02
+96 487 -8.33333333333333e-02
+96 488 4.16666666666667e-02
+96 213 -1.25000000000000e-01
+96 621 -1.25000000000000e-01
+97 97 5.83333333333333e-01
+97 506 8.33333333333333e-02
+97 623 8.33333333333333e-02
+97 624 4.16666666666667e-02
+97 621 -4.16666666666667e-02
+97 230 -4.16666666666667e-02
+97 626 4.16666666666667e-02
+97 229 -4.16666666666667e-02
+97 505 -3.75000000000000e-01
+97 228 4.16666666666667e-02
+97 96 -8.33333333333333e-02
+97 504 8.33333333333333e-02
+97 215 -4.16666666666667e-02
+97 488 4.16666666666667e-02
+97 98 -1.66666666666667e-01
+97 214 -4.16666666666667e-02
+97 622 -1.25000000000000e-01
+97 213 4.16666666666667e-02
+97 486 -8.33333333333333e-02
+98 98 5.83333333333333e-01
+98 504 -4.16666666666667e-02
+98 97 -1.66666666666667e-01
+98 505 8.33333333333333e-02
+98 622 8.33333333333333e-02
+98 230 -4.16666666666667e-02
+98 506 -1.25000000000000e-01
+98 229 -4.16666666666667e-02
+98 625 4.16666666666667e-02
+98 228 4.16666666666667e-02
+98 624 -8.33333333333333e-02
+98 486 4.16666666666667e-02
+98 215 -4.16666666666667e-02
+98 623 -3.75000000000000e-01
+98 214 -4.16666666666667e-02
+98 487 4.16666666666667e-02
+98 96 -8.33333333333333e-02
+98 213 4.16666666666667e-02
+98 621 8.33333333333333e-02
+99 99 1.25000000000000e+00
+99 100 -1.66666666666667e-01
+99 632 -8.33333333333333e-02
+99 298 -4.16666666666667e-02
+99 631 4.16666666666667e-02
+99 629 8.33333333333333e-02
+99 217 -4.16666666666667e-02
+99 627 -3.75000000000000e-01
+99 607 4.16666666666667e-02
+99 218 8.33333333333333e-02
+99 608 -8.33333333333333e-02
+99 101 -1.66666666666667e-01
+99 617 8.33333333333333e-02
+99 299 8.33333333333333e-02
+99 616 8.33333333333333e-02
+99 615 -3.75000000000000e-01
+99 385 -8.33333333333333e-02
+99 490 8.33333333333333e-02
+99 491 8.33333333333333e-02
+99 386 -8.33333333333333e-02
+99 216 -1.25000000000000e-01
+99 554 -8.33333333333333e-02
+99 449 8.33333333333333e-02
+99 553 1.66666666666667e-01
+99 448 -1.66666666666667e-01
+99 552 -2.50000000000000e-01
+99 628 8.33333333333333e-02
+99 297 -1.25000000000000e-01
+100 100 1.25000000000000e+00
+100 632 4.16666666666667e-02
+100 627 8.33333333333333e-02
+100 99 -1.66666666666667e-01
+100 297 -4.16666666666667e-02
+100 630 4.16666666666667e-02
+100 628 -1.25000000000000e-01
+100 216 -4.16666666666667e-02
+100 606 4.16666666666667e-02
+100 608 4.16666666666667e-02
+100 617 -4.16666666666667e-02
+100 616 -1.25000000000000e-01
+100 615 8.33333333333333e-02
+100 384 -8.33333333333333e-02
+100 489 8.33333333333333e-02
+100 386 -8.33333333333333e-02
+100 449 8.33333333333333e-02
+100 491 -1.66666666666667e-01
+100 218 8.33333333333333e-02
+100 217 -1.25000000000000e-01
+100 554 1.66666666666667e-01
+100 101 -1.66666666666667e-01
+100 299 8.33333333333333e-02
+100 553 -7.50000000000000e-01
+100 629 -4.16666666666667e-02
+100 298 -1.25000000000000e-01
+100 552 1.66666666666667e-01
+100 447 -1.66666666666667e-01
+101 101 1.25000000000000e+00
+101 631 4.16666666666667e-02
+101 630 -8.33333333333333e-02
+101 629 -1.25000000000000e-01
+101 627 8.33333333333333e-02
+101 607 4.16666666666667e-02
+101 216 8.33333333333333e-02
+101 606 -8.33333333333333e-02
+101 617 -1.25000000000000e-01
+101 616 -4.16666666666667e-02
+101 99 -1.66666666666667e-01
+101 615 8.33333333333333e-02
+101 297 8.33333333333333e-02
+101 385 -8.33333333333333e-02
+101 448 8.33333333333333e-02
+101 218 -3.75000000000000e-01
+101 490 -1.66666666666667e-01
+101 217 8.33333333333333e-02
+101 489 8.33333333333333e-02
+101 384 -8.33333333333333e-02
+101 554 -2.50000000000000e-01
+101 628 -4.16666666666667e-02
+101 299 -3.75000000000000e-01
+101 553 1.66666666666667e-01
+101 100 -1.66666666666667e-01
+101 298 8.33333333333333e-02
+101 552 -8.33333333333333e-02
+101 447 8.33333333333333e-02
+102 102 1.25000000000000e+00
+102 508 8.33333333333333e-02
+102 509 8.33333333333333e-02
+102 623 8.33333333333333e-02
+102 621 -1.25000000000000e-01
+102 635 8.33333333333333e-02
+102 634 8.33333333333333e-02
+102 103 -1.66666666666667e-01
+102 633 -3.75000000000000e-01
+102 572 -8.33333333333333e-02
+102 104 -1.66666666666667e-01
+102 494 -8.33333333333333e-02
+102 557 8.33333333333333e-02
+102 628 8.33333333333333e-02
+102 571 1.66666666666667e-01
+102 556 -1.66666666666667e-01
+102 629 8.33333333333333e-02
+102 221 -8.33333333333333e-02
+102 220 4.16666666666667e-02
+102 493 -8.33333333333333e-02
+102 627 -3.75000000000000e-01
+102 638 8.33333333333333e-02
+102 320 -8.33333333333333e-02
+102 637 -4.16666666666667e-02
+102 319 4.16666666666667e-02
+102 636 -1.25000000000000e-01
+102 622 -4.16666666666667e-02
+102 570 -2.50000000000000e-01
+103 103 1.25000000000000e+00
+103 621 -4.16666666666667e-02
+103 507 8.33333333333333e-02
+103 509 -1.66666666666667e-01
+103 221 4.16666666666667e-02
+103 622 -1.25000000000000e-01
+103 635 -4.16666666666667e-02
+103 320 4.16666666666667e-02
+103 634 -1.25000000000000e-01
+103 633 8.33333333333333e-02
+103 102 -1.66666666666667e-01
+103 629 -4.16666666666667e-02
+103 627 8.33333333333333e-02
+103 494 -8.33333333333333e-02
+103 557 8.33333333333333e-02
+103 570 1.66666666666667e-01
+103 555 -1.66666666666667e-01
+103 628 -1.25000000000000e-01
+103 219 4.16666666666667e-02
+103 492 -8.33333333333333e-02
+103 638 8.33333333333333e-02
+103 104 -1.66666666666667e-01
+103 572 1.66666666666667e-01
+103 637 -1.25000000000000e-01
+103 623 8.33333333333333e-02
+103 571 -7.50000000000000e-01
+103 636 -4.16666666666667e-02
+103 318 4.16666666666667e-02
+104 104 1.25000000000000e+00
+104 508 -1.66666666666667e-01
+104 507 8.33333333333333e-02
+104 623 -3.75000000000000e-01
+104 220 4.16666666666667e-02
+104 621 8.33333333333333e-02
+104 635 -1.25000000000000e-01
+104 634 -4.16666666666667e-02
+104 319 4.16666666666667e-02
+104 633 8.33333333333333e-02
+104 570 -8.33333333333333e-02
+104 628 -4.16666666666667e-02
+104 102 -1.66666666666667e-01
+104 492 -8.33333333333333e-02
+104 555 8.33333333333333e-02
+104 493 -8.33333333333333e-02
+104 556 8.33333333333333e-02
+104 629 -1.25000000000000e-01
+104 627 8.33333333333333e-02
+104 219 -8.33333333333333e-02
+104 638 -3.75000000000000e-01
+104 622 8.33333333333333e-02
+104 572 -2.50000000000000e-01
+104 637 8.33333333333333e-02
+104 103 -1.66666666666667e-01
+104 571 1.66666666666667e-01
+104 636 8.33333333333333e-02
+104 318 -8.33333333333333e-02
+105 105 1.25000000000000e+00
+105 599 -8.33333333333333e-02
+105 106 -1.66666666666667e-01
+105 598 1.66666666666667e-01
+105 323 8.33333333333333e-02
+105 322 -4.16666666666667e-02
+105 321 -1.25000000000000e-01
+105 597 -2.50000000000000e-01
+105 107 -1.66666666666667e-01
+105 233 8.33333333333333e-02
+105 232 -4.16666666666667e-02
+105 589 8.33333333333333e-02
+105 590 8.33333333333333e-02
+105 231 -1.25000000000000e-01
+105 626 -8.33333333333333e-02
+105 635 8.33333333333333e-02
+105 634 8.33333333333333e-02
+105 633 -3.75000000000000e-01
+105 511 -8.33333333333333e-02
+105 512 -8.33333333333333e-02
+105 575 8.33333333333333e-02
+105 574 -1.66666666666667e-01
+105 625 4.16666666666667e-02
+105 1210 8.33333333333333e-02
+105 1214 -8.33333333333333e-02
+105 1213 4.16666666666667e-02
+105 1211 8.33333333333333e-02
+105 1209 -3.75000000000000e-01
+106 106 1.25000000000000e+00
+106 105 -1.66666666666667e-01
+106 597 1.66666666666667e-01
+106 323 8.33333333333333e-02
+106 107 -1.66666666666667e-01
+106 599 1.66666666666667e-01
+106 322 -1.25000000000000e-01
+106 598 -7.50000000000000e-01
+106 321 -4.16666666666667e-02
+106 233 8.33333333333333e-02
+106 590 -1.66666666666667e-01
+106 232 -1.25000000000000e-01
+106 231 -4.16666666666667e-02
+106 588 8.33333333333333e-02
+106 626 4.16666666666667e-02
+106 635 -4.16666666666667e-02
+106 634 -1.25000000000000e-01
+106 633 8.33333333333333e-02
+106 510 -8.33333333333333e-02
+106 512 -8.33333333333333e-02
+106 575 8.33333333333333e-02
+106 624 4.16666666666667e-02
+106 573 -1.66666666666667e-01
+106 1214 4.16666666666667e-02
+106 1209 8.33333333333333e-02
+106 1212 4.16666666666667e-02
+106 1211 -4.16666666666667e-02
+106 1210 -1.25000000000000e-01
+107 107 1.25000000000000e+00
+107 588 8.33333333333333e-02
+107 597 -8.33333333333333e-02
+107 323 -3.75000000000000e-01
+107 599 -2.50000000000000e-01
+107 322 8.33333333333333e-02
+107 106 -1.66666666666667e-01
+107 598 1.66666666666667e-01
+107 321 8.33333333333333e-02
+107 233 -3.75000000000000e-01
+107 232 8.33333333333333e-02
+107 589 -1.66666666666667e-01
+107 105 -1.66666666666667e-01
+107 231 8.33333333333333e-02
+107 624 -8.33333333333333e-02
+107 635 -1.25000000000000e-01
+107 634 -4.16666666666667e-02
+107 633 8.33333333333333e-02
+107 511 -8.33333333333333e-02
+107 574 8.33333333333333e-02
+107 510 -8.33333333333333e-02
+107 625 4.16666666666667e-02
+107 573 8.33333333333333e-02
+107 1213 4.16666666666667e-02
+107 1212 -8.33333333333333e-02
+107 1210 -4.16666666666667e-02
+107 1211 -1.25000000000000e-01
+107 1209 8.33333333333333e-02
+108 108 5.00000000000000e-01
+108 397 4.16666666666667e-02
+108 644 4.16666666666667e-02
+108 641 -4.16666666666667e-02
+108 239 4.16666666666667e-02
+108 398 -8.33333333333333e-02
+108 238 4.16666666666667e-02
+108 109 -8.33333333333333e-02
+108 640 8.33333333333333e-02
+108 237 -1.25000000000000e-01
+108 639 -1.25000000000000e-01
+108 110 -8.33333333333333e-02
+108 254 4.16666666666667e-02
+108 416 8.33333333333333e-02
+108 253 4.16666666666667e-02
+108 643 -8.33333333333333e-02
+108 415 -4.16666666666667e-02
+108 252 -1.25000000000000e-01
+108 414 -1.25000000000000e-01
+109 109 5.83333333333333e-01
+109 396 4.16666666666667e-02
+109 416 8.33333333333333e-02
+109 110 -1.66666666666667e-01
+109 641 8.33333333333333e-02
+109 239 -4.16666666666667e-02
+109 398 4.16666666666667e-02
+109 238 -4.16666666666667e-02
+109 640 -3.75000000000000e-01
+109 237 4.16666666666667e-02
+109 108 -8.33333333333333e-02
+109 639 8.33333333333333e-02
+109 254 -4.16666666666667e-02
+109 644 4.16666666666667e-02
+109 414 -4.16666666666667e-02
+109 253 -4.16666666666667e-02
+109 415 -1.25000000000000e-01
+109 252 4.16666666666667e-02
+109 642 -8.33333333333333e-02
+110 110 5.83333333333333e-01
+110 109 -1.66666666666667e-01
+110 640 8.33333333333333e-02
+110 642 4.16666666666667e-02
+110 639 -4.16666666666667e-02
+110 239 -4.16666666666667e-02
+110 641 -1.25000000000000e-01
+110 238 -4.16666666666667e-02
+110 397 4.16666666666667e-02
+110 237 4.16666666666667e-02
+110 396 -8.33333333333333e-02
+110 415 8.33333333333333e-02
+110 254 -4.16666666666667e-02
+110 416 -3.75000000000000e-01
+110 253 -4.16666666666667e-02
+110 643 4.16666666666667e-02
+110 108 -8.33333333333333e-02
+110 252 4.16666666666667e-02
+110 414 8.33333333333333e-02
+111 111 3.39166666666667e+01
+111 400 2.12500000000000e+00
+111 434 4.25000000000000e+00
+111 433 -2.12500000000000e+00
+111 432 -6.37500000000000e+00
+111 241 2.12500000000000e+00
+111 240 -4.20833333333333e+00
+111 112 -4.25000000000000e+00
+111 283 2.12500000000000e+00
+111 401 2.12500000000000e+00
+111 282 -4.20833333333333e+00
+111 113 -1.66666666666667e-01
+111 647 8.33333333333333e-02
+111 284 -4.16666666666667e-02
+111 650 4.16666666666667e-02
+111 649 -8.33333333333333e-02
+111 242 -4.16666666666667e-02
+111 646 8.33333333333333e-02
+111 645 -3.75000000000000e-01
+111 1766 -4.16666666666667e+00
+111 1862 2.08333333333333e+00
+111 1765 -4.16666666666667e+00
+111 1798 4.16666666666667e+00
+111 1861 -4.16666666666667e+00
+111 1871 4.16666666666667e+00
+111 1799 -8.33333333333333e+00
+111 1870 4.16666666666667e+00
+111 1869 -1.87500000000000e+01
+112 112 3.80000000000000e+01
+112 242 2.12500000000000e+00
+112 399 2.12500000000000e+00
+112 434 4.25000000000000e+00
+112 113 -4.25000000000000e+00
+112 284 2.12500000000000e+00
+112 433 -6.37500000000000e+00
+112 432 -2.12500000000000e+00
+112 241 -1.26250000000000e+01
+112 240 2.12500000000000e+00
+112 401 -4.25000000000000e+00
+112 283 -1.26250000000000e+01
+112 111 -4.25000000000000e+00
+112 282 2.12500000000000e+00
+112 650 4.16666666666667e-02
+112 647 -4.16666666666667e-02
+112 648 -8.33333333333333e-02
+112 646 -1.25000000000000e-01
+112 645 8.33333333333333e-02
+112 1764 -4.16666666666667e+00
+112 1797 4.16666666666667e+00
+112 1862 2.08333333333333e+00
+112 1766 -4.16666666666667e+00
+112 1860 -4.16666666666667e+00
+112 1871 -2.08333333333333e+00
+112 1799 4.16666666666667e+00
+112 1870 -6.25000000000000e+00
+112 1869 4.16666666666667e+00
+113 113 3.39166666666667e+01
+113 400 -4.25000000000000e+00
+113 241 2.12500000000000e+00
+113 434 -1.91250000000000e+01
+113 433 4.25000000000000e+00
+113 112 -4.25000000000000e+00
+113 283 2.12500000000000e+00
+113 432 4.25000000000000e+00
+113 242 -4.20833333333333e+00
+113 399 2.12500000000000e+00
+113 284 -4.20833333333333e+00
+113 646 -4.16666666666667e-02
+113 111 -1.66666666666667e-01
+113 645 8.33333333333333e-02
+113 282 -4.16666666666667e-02
+113 648 4.16666666666667e-02
+113 649 4.16666666666667e-02
+113 647 -1.25000000000000e-01
+113 240 -4.16666666666667e-02
+113 1764 -4.16666666666667e+00
+113 1860 2.08333333333333e+00
+113 1861 2.08333333333333e+00
+113 1765 -4.16666666666667e+00
+113 1871 -6.25000000000000e+00
+113 1870 -2.08333333333333e+00
+113 1798 4.16666666666667e+00
+113 1869 4.16666666666667e+00
+113 1797 -8.33333333333333e+00
+114 114 1.25000000000000e+00
+114 437 -1.66666666666667e-01
+114 436 8.33333333333333e-02
+114 245 4.16666666666667e-02
+114 646 8.33333333333333e-02
+114 645 -3.75000000000000e-01
+114 656 -4.16666666666667e-02
+114 302 4.16666666666667e-02
+114 655 8.33333333333333e-02
+114 654 -1.25000000000000e-01
+114 404 -8.33333333333333e-02
+114 403 -8.33333333333333e-02
+114 419 8.33333333333333e-02
+114 641 -4.16666666666667e-02
+114 115 -1.66666666666667e-01
+114 418 8.33333333333333e-02
+114 451 -8.33333333333333e-02
+114 244 -8.33333333333333e-02
+114 640 8.33333333333333e-02
+114 639 -1.25000000000000e-01
+114 116 -1.66666666666667e-01
+114 653 8.33333333333333e-02
+114 452 1.66666666666667e-01
+114 652 8.33333333333333e-02
+114 301 -8.33333333333333e-02
+114 647 8.33333333333333e-02
+114 651 -3.75000000000000e-01
+114 450 -2.50000000000000e-01
+115 115 1.25000000000000e+00
+115 437 8.33333333333333e-02
+115 435 8.33333333333333e-02
+115 646 -1.25000000000000e-01
+115 645 8.33333333333333e-02
+115 656 8.33333333333333e-02
+115 116 -1.66666666666667e-01
+115 655 -3.75000000000000e-01
+115 654 8.33333333333333e-02
+115 402 -8.33333333333333e-02
+115 641 8.33333333333333e-02
+115 114 -1.66666666666667e-01
+115 419 -1.66666666666667e-01
+115 452 1.66666666666667e-01
+115 417 8.33333333333333e-02
+115 450 -8.33333333333333e-02
+115 245 4.16666666666667e-02
+115 404 -8.33333333333333e-02
+115 640 -3.75000000000000e-01
+115 243 -8.33333333333333e-02
+115 639 8.33333333333333e-02
+115 653 -4.16666666666667e-02
+115 302 4.16666666666667e-02
+115 647 -4.16666666666667e-02
+115 652 -1.25000000000000e-01
+115 451 -2.50000000000000e-01
+115 651 8.33333333333333e-02
+115 300 -8.33333333333333e-02
+116 116 1.25000000000000e+00
+116 436 8.33333333333333e-02
+116 645 8.33333333333333e-02
+116 435 -1.66666666666667e-01
+116 647 -1.25000000000000e-01
+116 243 4.16666666666667e-02
+116 656 -1.25000000000000e-01
+116 655 8.33333333333333e-02
+116 115 -1.66666666666667e-01
+116 654 -4.16666666666667e-02
+116 300 4.16666666666667e-02
+116 402 -8.33333333333333e-02
+116 640 8.33333333333333e-02
+116 417 8.33333333333333e-02
+116 639 -4.16666666666667e-02
+116 418 -1.66666666666667e-01
+116 451 1.66666666666667e-01
+116 641 -1.25000000000000e-01
+116 244 4.16666666666667e-02
+116 403 -8.33333333333333e-02
+116 646 -4.16666666666667e-02
+116 653 -1.25000000000000e-01
+116 452 -7.50000000000000e-01
+116 652 -4.16666666666667e-02
+116 301 4.16666666666667e-02
+116 114 -1.66666666666667e-01
+116 651 8.33333333333333e-02
+116 450 1.66666666666667e-01
+117 117 5.00000000000000e-01
+117 523 4.16666666666667e-02
+117 662 4.16666666666667e-02
+117 659 -4.16666666666667e-02
+117 257 4.16666666666667e-02
+117 524 -8.33333333333333e-02
+117 256 4.16666666666667e-02
+117 118 -8.33333333333333e-02
+117 658 8.33333333333333e-02
+117 255 -1.25000000000000e-01
+117 657 -1.25000000000000e-01
+117 119 -8.33333333333333e-02
+117 272 4.16666666666667e-02
+117 542 8.33333333333333e-02
+117 271 4.16666666666667e-02
+117 661 -8.33333333333333e-02
+117 541 -4.16666666666667e-02
+117 270 -1.25000000000000e-01
+117 540 -1.25000000000000e-01
+118 118 5.83333333333333e-01
+118 522 4.16666666666667e-02
+118 542 8.33333333333333e-02
+118 119 -1.66666666666667e-01
+118 659 8.33333333333333e-02
+118 257 -4.16666666666667e-02
+118 524 4.16666666666667e-02
+118 256 -4.16666666666667e-02
+118 658 -3.75000000000000e-01
+118 255 4.16666666666667e-02
+118 117 -8.33333333333333e-02
+118 657 8.33333333333333e-02
+118 272 -4.16666666666667e-02
+118 662 4.16666666666667e-02
+118 540 -4.16666666666667e-02
+118 271 -4.16666666666667e-02
+118 541 -1.25000000000000e-01
+118 270 4.16666666666667e-02
+118 660 -8.33333333333333e-02
+119 119 5.83333333333333e-01
+119 118 -1.66666666666667e-01
+119 658 8.33333333333333e-02
+119 660 4.16666666666667e-02
+119 657 -4.16666666666667e-02
+119 257 -4.16666666666667e-02
+119 659 -1.25000000000000e-01
+119 256 -4.16666666666667e-02
+119 523 4.16666666666667e-02
+119 255 4.16666666666667e-02
+119 522 -8.33333333333333e-02
+119 541 8.33333333333333e-02
+119 272 -4.16666666666667e-02
+119 542 -3.75000000000000e-01
+119 271 -4.16666666666667e-02
+119 661 4.16666666666667e-02
+119 117 -8.33333333333333e-02
+119 270 4.16666666666667e-02
+119 540 8.33333333333333e-02
+120 120 1.25000000000000e+00
+120 665 8.33333333333333e-02
+120 305 -4.16666666666667e-02
+120 668 4.16666666666667e-02
+120 667 -8.33333333333333e-02
+120 260 -4.16666666666667e-02
+120 664 8.33333333333333e-02
+120 663 -3.75000000000000e-01
+120 527 8.33333333333333e-02
+120 526 8.33333333333333e-02
+120 560 1.66666666666667e-01
+120 559 -8.33333333333333e-02
+120 558 -2.50000000000000e-01
+120 422 -8.33333333333333e-02
+120 644 4.16666666666667e-02
+120 421 -8.33333333333333e-02
+120 454 8.33333333333333e-02
+120 643 -8.33333333333333e-02
+120 259 8.33333333333333e-02
+120 258 -1.25000000000000e-01
+120 653 8.33333333333333e-02
+120 455 -1.66666666666667e-01
+120 652 8.33333333333333e-02
+120 121 -1.66666666666667e-01
+120 304 8.33333333333333e-02
+120 651 -3.75000000000000e-01
+120 122 -1.66666666666667e-01
+120 303 -1.25000000000000e-01
+121 121 1.25000000000000e+00
+121 665 -4.16666666666667e-02
+121 666 -8.33333333333333e-02
+121 664 -1.25000000000000e-01
+121 663 8.33333333333333e-02
+121 527 -1.66666666666667e-01
+121 260 8.33333333333333e-02
+121 525 8.33333333333333e-02
+121 560 1.66666666666667e-01
+121 122 -1.66666666666667e-01
+121 305 8.33333333333333e-02
+121 559 -2.50000000000000e-01
+121 558 -8.33333333333333e-02
+121 420 -8.33333333333333e-02
+121 453 8.33333333333333e-02
+121 644 4.16666666666667e-02
+121 422 -8.33333333333333e-02
+121 259 -3.75000000000000e-01
+121 642 -8.33333333333333e-02
+121 258 8.33333333333333e-02
+121 653 -4.16666666666667e-02
+121 455 8.33333333333333e-02
+121 652 -1.25000000000000e-01
+121 668 4.16666666666667e-02
+121 304 -3.75000000000000e-01
+121 651 8.33333333333333e-02
+121 120 -1.66666666666667e-01
+121 303 8.33333333333333e-02
+122 122 1.25000000000000e+00
+122 664 -4.16666666666667e-02
+122 120 -1.66666666666667e-01
+122 663 8.33333333333333e-02
+122 303 -4.16666666666667e-02
+122 666 4.16666666666667e-02
+122 665 -1.25000000000000e-01
+122 258 -4.16666666666667e-02
+122 525 8.33333333333333e-02
+122 526 -1.66666666666667e-01
+122 259 8.33333333333333e-02
+122 560 -7.50000000000000e-01
+122 559 1.66666666666667e-01
+122 121 -1.66666666666667e-01
+122 304 8.33333333333333e-02
+122 558 1.66666666666667e-01
+122 420 -8.33333333333333e-02
+122 642 4.16666666666667e-02
+122 260 -1.25000000000000e-01
+122 643 4.16666666666667e-02
+122 421 -8.33333333333333e-02
+122 653 -1.25000000000000e-01
+122 667 4.16666666666667e-02
+122 305 -1.25000000000000e-01
+122 652 -4.16666666666667e-02
+122 454 8.33333333333333e-02
+122 651 8.33333333333333e-02
+122 453 -1.66666666666667e-01
+123 123 1.25000000000000e+00
+123 563 -1.66666666666667e-01
+123 562 8.33333333333333e-02
+123 263 4.16666666666667e-02
+123 664 8.33333333333333e-02
+123 663 -3.75000000000000e-01
+123 674 -4.16666666666667e-02
+123 326 4.16666666666667e-02
+123 673 8.33333333333333e-02
+123 672 -1.25000000000000e-01
+123 530 -8.33333333333333e-02
+123 529 -8.33333333333333e-02
+123 545 8.33333333333333e-02
+123 659 -4.16666666666667e-02
+123 124 -1.66666666666667e-01
+123 544 8.33333333333333e-02
+123 577 -8.33333333333333e-02
+123 262 -8.33333333333333e-02
+123 658 8.33333333333333e-02
+123 657 -1.25000000000000e-01
+123 125 -1.66666666666667e-01
+123 671 8.33333333333333e-02
+123 578 1.66666666666667e-01
+123 670 8.33333333333333e-02
+123 325 -8.33333333333333e-02
+123 665 8.33333333333333e-02
+123 669 -3.75000000000000e-01
+123 576 -2.50000000000000e-01
+124 124 1.25000000000000e+00
+124 563 8.33333333333333e-02
+124 561 8.33333333333333e-02
+124 664 -1.25000000000000e-01
+124 663 8.33333333333333e-02
+124 674 8.33333333333333e-02
+124 125 -1.66666666666667e-01
+124 673 -3.75000000000000e-01
+124 672 8.33333333333333e-02
+124 528 -8.33333333333333e-02
+124 659 8.33333333333333e-02
+124 123 -1.66666666666667e-01
+124 545 -1.66666666666667e-01
+124 578 1.66666666666667e-01
+124 543 8.33333333333333e-02
+124 576 -8.33333333333333e-02
+124 263 4.16666666666667e-02
+124 530 -8.33333333333333e-02
+124 658 -3.75000000000000e-01
+124 261 -8.33333333333333e-02
+124 657 8.33333333333333e-02
+124 671 -4.16666666666667e-02
+124 326 4.16666666666667e-02
+124 665 -4.16666666666667e-02
+124 670 -1.25000000000000e-01
+124 577 -2.50000000000000e-01
+124 669 8.33333333333333e-02
+124 324 -8.33333333333333e-02
+125 125 1.25000000000000e+00
+125 562 8.33333333333333e-02
+125 663 8.33333333333333e-02
+125 561 -1.66666666666667e-01
+125 665 -1.25000000000000e-01
+125 261 4.16666666666667e-02
+125 674 -1.25000000000000e-01
+125 673 8.33333333333333e-02
+125 124 -1.66666666666667e-01
+125 672 -4.16666666666667e-02
+125 324 4.16666666666667e-02
+125 528 -8.33333333333333e-02
+125 658 8.33333333333333e-02
+125 543 8.33333333333333e-02
+125 657 -4.16666666666667e-02
+125 544 -1.66666666666667e-01
+125 577 1.66666666666667e-01
+125 659 -1.25000000000000e-01
+125 262 4.16666666666667e-02
+125 529 -8.33333333333333e-02
+125 664 -4.16666666666667e-02
+125 671 -1.25000000000000e-01
+125 578 -7.50000000000000e-01
+125 670 -4.16666666666667e-02
+125 325 4.16666666666667e-02
+125 123 -1.66666666666667e-01
+125 669 8.33333333333333e-02
+125 576 1.66666666666667e-01
+126 126 1.25000000000000e+00
+126 601 -8.33333333333333e-02
+126 128 -1.66666666666667e-01
+126 602 1.66666666666667e-01
+126 329 -4.16666666666667e-02
+126 328 8.33333333333333e-02
+126 327 -1.25000000000000e-01
+126 600 -2.50000000000000e-01
+126 275 -4.16666666666667e-02
+126 596 8.33333333333333e-02
+126 127 -1.66666666666667e-01
+126 274 8.33333333333333e-02
+126 595 8.33333333333333e-02
+126 273 -1.25000000000000e-01
+126 548 -8.33333333333333e-02
+126 662 4.16666666666667e-02
+126 547 -8.33333333333333e-02
+126 580 8.33333333333333e-02
+126 661 -8.33333333333333e-02
+126 671 8.33333333333333e-02
+126 581 -1.66666666666667e-01
+126 670 8.33333333333333e-02
+126 669 -3.75000000000000e-01
+126 1247 8.33333333333333e-02
+126 1250 4.16666666666667e-02
+126 1249 -8.33333333333333e-02
+126 1246 8.33333333333333e-02
+126 1245 -3.75000000000000e-01
+127 127 1.25000000000000e+00
+127 600 -8.33333333333333e-02
+127 329 8.33333333333333e-02
+127 128 -1.66666666666667e-01
+127 602 1.66666666666667e-01
+127 328 -3.75000000000000e-01
+127 601 -2.50000000000000e-01
+127 327 8.33333333333333e-02
+127 275 8.33333333333333e-02
+127 596 -1.66666666666667e-01
+127 594 8.33333333333333e-02
+127 274 -3.75000000000000e-01
+127 126 -1.66666666666667e-01
+127 273 8.33333333333333e-02
+127 546 -8.33333333333333e-02
+127 579 8.33333333333333e-02
+127 662 4.16666666666667e-02
+127 548 -8.33333333333333e-02
+127 660 -8.33333333333333e-02
+127 671 -4.16666666666667e-02
+127 581 8.33333333333333e-02
+127 670 -1.25000000000000e-01
+127 669 8.33333333333333e-02
+127 1250 4.16666666666667e-02
+127 1247 -4.16666666666667e-02
+127 1248 -8.33333333333333e-02
+127 1246 -1.25000000000000e-01
+127 1245 8.33333333333333e-02
+128 128 1.25000000000000e+00
+128 126 -1.66666666666667e-01
+128 600 1.66666666666667e-01
+128 329 -1.25000000000000e-01
+128 602 -7.50000000000000e-01
+128 328 8.33333333333333e-02
+128 127 -1.66666666666667e-01
+128 601 1.66666666666667e-01
+128 327 -4.16666666666667e-02
+128 275 -1.25000000000000e-01
+128 274 8.33333333333333e-02
+128 595 -1.66666666666667e-01
+128 273 -4.16666666666667e-02
+128 594 8.33333333333333e-02
+128 546 -8.33333333333333e-02
+128 660 4.16666666666667e-02
+128 661 4.16666666666667e-02
+128 547 -8.33333333333333e-02
+128 671 -1.25000000000000e-01
+128 670 -4.16666666666667e-02
+128 580 8.33333333333333e-02
+128 669 8.33333333333333e-02
+128 579 -1.66666666666667e-01
+128 1246 -4.16666666666667e-02
+128 1245 8.33333333333333e-02
+128 1248 4.16666666666667e-02
+128 1249 4.16666666666667e-02
+128 1247 -1.25000000000000e-01
+129 129 7.50000000000000e-01
+129 614 -8.33333333333333e-02
+129 613 4.16666666666667e-02
+129 131 -8.33333333333333e-02
+129 620 8.33333333333333e-02
+129 308 4.16666666666667e-02
+129 619 -4.16666666666667e-02
+129 618 -1.25000000000000e-01
+129 439 -8.33333333333333e-02
+129 457 8.33333333333333e-02
+129 650 4.16666666666667e-02
+129 440 -8.33333333333333e-02
+129 286 4.16666666666667e-02
+129 649 -8.33333333333333e-02
+129 285 -2.50000000000000e-01
+129 656 -4.16666666666667e-02
+129 458 8.33333333333333e-02
+129 130 -8.33333333333333e-02
+129 655 8.33333333333333e-02
+129 307 4.16666666666667e-02
+129 287 4.16666666666667e-02
+129 654 -1.25000000000000e-01
+129 306 -2.50000000000000e-01
+130 130 6.66666666666667e-01
+130 612 4.16666666666667e-02
+130 620 8.33333333333333e-02
+130 619 -1.25000000000000e-01
+130 618 -4.16666666666667e-02
+130 650 4.16666666666667e-02
+130 440 -8.33333333333333e-02
+130 438 -8.33333333333333e-02
+130 456 8.33333333333333e-02
+130 286 -8.33333333333333e-02
+130 285 4.16666666666667e-02
+130 648 -8.33333333333333e-02
+130 656 8.33333333333333e-02
+130 458 -1.66666666666667e-01
+130 614 4.16666666666667e-02
+130 655 -3.75000000000000e-01
+130 307 -8.33333333333333e-02
+130 129 -8.33333333333333e-02
+130 654 8.33333333333333e-02
+130 306 4.16666666666667e-02
+131 131 6.66666666666667e-01
+131 285 4.16666666666667e-02
+131 612 -8.33333333333333e-02
+131 620 -3.75000000000000e-01
+131 619 8.33333333333333e-02
+131 129 -8.33333333333333e-02
+131 618 8.33333333333333e-02
+131 306 4.16666666666667e-02
+131 649 4.16666666666667e-02
+131 439 -8.33333333333333e-02
+131 287 -8.33333333333333e-02
+131 648 4.16666666666667e-02
+131 438 -8.33333333333333e-02
+131 613 4.16666666666667e-02
+131 656 -1.25000000000000e-01
+131 308 -8.33333333333333e-02
+131 655 8.33333333333333e-02
+131 457 -1.66666666666667e-01
+131 654 -4.16666666666667e-02
+131 456 8.33333333333333e-02
+132 132 7.50000000000000e-01
+132 632 -8.33333333333333e-02
+132 631 4.16666666666667e-02
+132 134 -8.33333333333333e-02
+132 638 8.33333333333333e-02
+132 332 4.16666666666667e-02
+132 637 -4.16666666666667e-02
+132 636 -1.25000000000000e-01
+132 565 -8.33333333333333e-02
+132 583 8.33333333333333e-02
+132 668 4.16666666666667e-02
+132 566 -8.33333333333333e-02
+132 310 4.16666666666667e-02
+132 667 -8.33333333333333e-02
+132 309 -2.50000000000000e-01
+132 674 -4.16666666666667e-02
+132 584 8.33333333333333e-02
+132 133 -8.33333333333333e-02
+132 673 8.33333333333333e-02
+132 331 4.16666666666667e-02
+132 311 4.16666666666667e-02
+132 672 -1.25000000000000e-01
+132 330 -2.50000000000000e-01
+133 133 6.66666666666667e-01
+133 630 4.16666666666667e-02
+133 638 8.33333333333333e-02
+133 637 -1.25000000000000e-01
+133 636 -4.16666666666667e-02
+133 668 4.16666666666667e-02
+133 566 -8.33333333333333e-02
+133 564 -8.33333333333333e-02
+133 582 8.33333333333333e-02
+133 310 -8.33333333333333e-02
+133 309 4.16666666666667e-02
+133 666 -8.33333333333333e-02
+133 674 8.33333333333333e-02
+133 584 -1.66666666666667e-01
+133 632 4.16666666666667e-02
+133 673 -3.75000000000000e-01
+133 331 -8.33333333333333e-02
+133 132 -8.33333333333333e-02
+133 672 8.33333333333333e-02
+133 330 4.16666666666667e-02
+134 134 6.66666666666667e-01
+134 309 4.16666666666667e-02
+134 630 -8.33333333333333e-02
+134 638 -3.75000000000000e-01
+134 637 8.33333333333333e-02
+134 132 -8.33333333333333e-02
+134 636 8.33333333333333e-02
+134 330 4.16666666666667e-02
+134 667 4.16666666666667e-02
+134 565 -8.33333333333333e-02
+134 311 -8.33333333333333e-02
+134 666 4.16666666666667e-02
+134 564 -8.33333333333333e-02
+134 631 4.16666666666667e-02
+134 674 -1.25000000000000e-01
+134 332 -8.33333333333333e-02
+134 673 8.33333333333333e-02
+134 583 -1.66666666666667e-01
+134 672 -4.16666666666667e-02
+134 582 8.33333333333333e-02
+135 135 7.50000000000000e-01
+135 37 4.16666666666667e-02
+135 334 -8.33333333333333e-02
+135 143 -4.16666666666667e-02
+135 136 -8.33333333333333e-02
+135 142 8.33333333333333e-02
+135 1 4.16666666666667e-02
+135 141 -1.25000000000000e-01
+135 341 -8.33333333333333e-02
+135 155 8.33333333333333e-02
+135 38 4.16666666666667e-02
+135 338 -8.33333333333333e-02
+135 337 4.16666666666667e-02
+135 340 -8.33333333333333e-02
+135 36 -2.50000000000000e-01
+135 137 -8.33333333333333e-02
+135 149 8.33333333333333e-02
+135 2 4.16666666666667e-02
+135 148 -4.16666666666667e-02
+135 154 8.33333333333333e-02
+135 335 4.16666666666667e-02
+135 147 -1.25000000000000e-01
+135 0 -2.50000000000000e-01
+136 136 6.66666666666667e-01
+136 36 4.16666666666667e-02
+136 333 -8.33333333333333e-02
+136 143 8.33333333333333e-02
+136 142 -3.75000000000000e-01
+136 135 -8.33333333333333e-02
+136 141 8.33333333333333e-02
+136 0 4.16666666666667e-02
+136 338 4.16666666666667e-02
+136 341 -8.33333333333333e-02
+136 37 -8.33333333333333e-02
+136 336 4.16666666666667e-02
+136 339 -8.33333333333333e-02
+136 149 8.33333333333333e-02
+136 155 -1.66666666666667e-01
+136 335 4.16666666666667e-02
+136 148 -1.25000000000000e-01
+136 1 -8.33333333333333e-02
+136 147 -4.16666666666667e-02
+136 153 8.33333333333333e-02
+137 137 6.66666666666667e-01
+137 333 4.16666666666667e-02
+137 143 -1.25000000000000e-01
+137 142 8.33333333333333e-02
+137 141 -4.16666666666667e-02
+137 337 4.16666666666667e-02
+137 340 -8.33333333333333e-02
+137 339 -8.33333333333333e-02
+137 153 8.33333333333333e-02
+137 38 -8.33333333333333e-02
+137 36 4.16666666666667e-02
+137 336 -8.33333333333333e-02
+137 334 4.16666666666667e-02
+137 149 -3.75000000000000e-01
+137 2 -8.33333333333333e-02
+137 148 8.33333333333333e-02
+137 154 -1.66666666666667e-01
+137 135 -8.33333333333333e-02
+137 147 8.33333333333333e-02
+137 0 4.16666666666667e-02
+138 138 2.98333333333333e+01
+138 140 -8.33333333333333e+00
+138 152 4.25000000000000e+00
+138 355 2.12500000000000e+00
+138 151 -2.12500000000000e+00
+138 2 -2.08333333333333e+00
+138 1 2.12500000000000e+00
+138 0 -2.16666666666667e+00
+138 150 -6.37500000000000e+00
+138 41 -2.08333333333333e+00
+138 356 2.12500000000000e+00
+138 139 -4.25000000000000e+00
+138 40 2.12500000000000e+00
+138 39 -2.16666666666667e+00
+138 352 -8.33333333333333e-02
+138 143 8.33333333333333e-02
+138 142 8.33333333333333e-02
+138 141 -3.75000000000000e-01
+138 359 -8.33333333333333e-02
+138 358 -8.33333333333333e-02
+138 155 -1.66666666666667e-01
+138 154 8.33333333333333e-02
+138 353 4.16666666666667e-02
+138 1430 2.08333333333333e+00
+138 1429 -4.16666666666667e+00
+138 1687 4.16666666666667e+00
+138 1688 4.16666666666667e+00
+138 1686 -1.87500000000000e+01
+139 139 2.57500000000000e+01
+139 354 2.12500000000000e+00
+139 150 -2.12500000000000e+00
+139 2 2.12500000000000e+00
+139 140 -4.25000000000000e+00
+139 152 4.25000000000000e+00
+139 1 -6.50000000000000e+00
+139 151 -6.37500000000000e+00
+139 0 2.12500000000000e+00
+139 41 2.12500000000000e+00
+139 356 -4.25000000000000e+00
+139 40 -6.50000000000000e+00
+139 138 -4.25000000000000e+00
+139 39 2.12500000000000e+00
+139 351 -8.33333333333333e-02
+139 143 -4.16666666666667e-02
+139 142 -1.25000000000000e-01
+139 141 8.33333333333333e-02
+139 359 -8.33333333333333e-02
+139 155 8.33333333333333e-02
+139 357 -8.33333333333333e-02
+139 353 4.16666666666667e-02
+139 153 8.33333333333333e-02
+139 1430 2.08333333333333e+00
+139 1428 -4.16666666666667e+00
+139 1688 -2.08333333333333e+00
+139 1687 -6.25000000000000e+00
+139 1686 4.16666666666667e+00
+140 140 2.98333333333333e+01
+140 138 -8.33333333333333e+00
+140 150 4.25000000000000e+00
+140 2 -2.16666666666667e+00
+140 152 -1.91250000000000e+01
+140 1 2.12500000000000e+00
+140 139 -4.25000000000000e+00
+140 151 4.25000000000000e+00
+140 0 -2.08333333333333e+00
+140 41 -2.16666666666667e+00
+140 40 2.12500000000000e+00
+140 355 -4.25000000000000e+00
+140 39 -2.08333333333333e+00
+140 354 2.12500000000000e+00
+140 352 4.16666666666667e-02
+140 143 -1.25000000000000e-01
+140 142 -4.16666666666667e-02
+140 141 8.33333333333333e-02
+140 357 -8.33333333333333e-02
+140 358 -8.33333333333333e-02
+140 154 8.33333333333333e-02
+140 351 4.16666666666667e-02
+140 153 -1.66666666666667e-01
+140 1429 2.08333333333333e+00
+140 1686 4.16666666666667e+00
+140 1428 2.08333333333333e+00
+140 1687 -2.08333333333333e+00
+140 1688 -6.25000000000000e+00
+141 141 1.25000000000000e+00
+141 358 8.33333333333333e-02
+141 359 8.33333333333333e-02
+141 352 8.33333333333333e-02
+141 351 -1.25000000000000e-01
+141 143 -1.66666666666667e-01
+141 140 8.33333333333333e-02
+141 139 8.33333333333333e-02
+141 138 -3.75000000000000e-01
+141 154 -8.33333333333333e-02
+141 142 -1.66666666666667e-01
+141 335 8.33333333333333e-02
+141 370 -8.33333333333333e-02
+141 340 8.33333333333333e-02
+141 155 1.66666666666667e-01
+141 341 -1.66666666666667e-01
+141 44 4.16666666666667e-02
+141 371 -8.33333333333333e-02
+141 334 8.33333333333333e-02
+141 43 -8.33333333333333e-02
+141 333 -3.75000000000000e-01
+141 137 -4.16666666666667e-02
+141 2 4.16666666666667e-02
+141 136 8.33333333333333e-02
+141 1 -8.33333333333333e-02
+141 135 -1.25000000000000e-01
+141 353 -4.16666666666667e-02
+141 153 -2.50000000000000e-01
+142 142 1.25000000000000e+00
+142 357 8.33333333333333e-02
+142 359 -1.66666666666667e-01
+142 44 4.16666666666667e-02
+142 352 -3.75000000000000e-01
+142 351 8.33333333333333e-02
+142 140 -4.16666666666667e-02
+142 2 4.16666666666667e-02
+142 139 -1.25000000000000e-01
+142 138 8.33333333333333e-02
+142 153 -8.33333333333333e-02
+142 335 -4.16666666666667e-02
+142 141 -1.66666666666667e-01
+142 369 -8.33333333333333e-02
+142 339 8.33333333333333e-02
+142 371 -8.33333333333333e-02
+142 341 8.33333333333333e-02
+142 334 -1.25000000000000e-01
+142 333 8.33333333333333e-02
+142 42 -8.33333333333333e-02
+142 137 8.33333333333333e-02
+142 143 -1.66666666666667e-01
+142 155 1.66666666666667e-01
+142 136 -3.75000000000000e-01
+142 353 8.33333333333333e-02
+142 154 -2.50000000000000e-01
+142 135 8.33333333333333e-02
+142 0 -8.33333333333333e-02
+143 143 1.25000000000000e+00
+143 352 8.33333333333333e-02
+143 358 -1.66666666666667e-01
+143 357 8.33333333333333e-02
+143 353 -1.25000000000000e-01
+143 43 4.16666666666667e-02
+143 140 -1.25000000000000e-01
+143 139 -4.16666666666667e-02
+143 1 4.16666666666667e-02
+143 141 -1.66666666666667e-01
+143 138 8.33333333333333e-02
+143 334 -4.16666666666667e-02
+143 333 8.33333333333333e-02
+143 370 -8.33333333333333e-02
+143 340 8.33333333333333e-02
+143 153 1.66666666666667e-01
+143 339 -1.66666666666667e-01
+143 335 -1.25000000000000e-01
+143 42 4.16666666666667e-02
+143 369 -8.33333333333333e-02
+143 137 -1.25000000000000e-01
+143 351 -4.16666666666667e-02
+143 155 -7.50000000000000e-01
+143 136 8.33333333333333e-02
+143 142 -1.66666666666667e-01
+143 154 1.66666666666667e-01
+143 135 -4.16666666666667e-02
+143 0 4.16666666666667e-02
+144 144 2.98333333333333e+01
+144 152 -2.12500000000000e+00
+144 145 -8.33333333333333e+00
+144 151 4.25000000000000e+00
+144 2 2.12500000000000e+00
+144 1 -2.08333333333333e+00
+144 0 -2.16666666666667e+00
+144 150 -6.37500000000000e+00
+144 146 -4.25000000000000e+00
+144 47 2.12500000000000e+00
+144 46 -2.08333333333333e+00
+144 391 2.12500000000000e+00
+144 392 2.12500000000000e+00
+144 45 -2.16666666666667e+00
+144 155 8.33333333333333e-02
+144 395 -8.33333333333333e-02
+144 388 4.16666666666667e-02
+144 394 -8.33333333333333e-02
+144 389 -8.33333333333333e-02
+144 149 8.33333333333333e-02
+144 148 8.33333333333333e-02
+144 154 -1.66666666666667e-01
+144 147 -3.75000000000000e-01
+144 1690 4.16666666666667e+00
+144 1430 -4.16666666666667e+00
+144 1429 2.08333333333333e+00
+144 1691 4.16666666666667e+00
+144 1689 -1.87500000000000e+01
+145 145 2.98333333333333e+01
+145 144 -8.33333333333333e+00
+145 150 4.25000000000000e+00
+145 2 2.12500000000000e+00
+145 146 -4.25000000000000e+00
+145 152 4.25000000000000e+00
+145 1 -2.16666666666667e+00
+145 151 -1.91250000000000e+01
+145 0 -2.08333333333333e+00
+145 47 2.12500000000000e+00
+145 392 -4.25000000000000e+00
+145 46 -2.16666666666667e+00
+145 45 -2.08333333333333e+00
+145 390 2.12500000000000e+00
+145 387 4.16666666666667e-02
+145 393 -8.33333333333333e-02
+145 389 4.16666666666667e-02
+145 395 -8.33333333333333e-02
+145 149 -4.16666666666667e-02
+145 155 8.33333333333333e-02
+145 148 -1.25000000000000e-01
+145 147 8.33333333333333e-02
+145 153 -1.66666666666667e-01
+145 1691 -2.08333333333333e+00
+145 1689 4.16666666666667e+00
+145 1428 2.08333333333333e+00
+145 1430 2.08333333333333e+00
+145 1690 -6.25000000000000e+00
+146 146 2.57500000000000e+01
+146 150 -2.12500000000000e+00
+146 2 -6.50000000000000e+00
+146 152 -6.37500000000000e+00
+146 1 2.12500000000000e+00
+146 145 -4.25000000000000e+00
+146 151 4.25000000000000e+00
+146 0 2.12500000000000e+00
+146 390 2.12500000000000e+00
+146 47 -6.50000000000000e+00
+146 46 2.12500000000000e+00
+146 391 -4.25000000000000e+00
+146 144 -4.25000000000000e+00
+146 45 2.12500000000000e+00
+146 153 8.33333333333333e-02
+146 393 -8.33333333333333e-02
+146 388 4.16666666666667e-02
+146 394 -8.33333333333333e-02
+146 387 -8.33333333333333e-02
+146 149 -1.25000000000000e-01
+146 148 -4.16666666666667e-02
+146 154 8.33333333333333e-02
+146 147 8.33333333333333e-02
+146 1429 2.08333333333333e+00
+146 1690 -2.08333333333333e+00
+146 1428 -4.16666666666667e+00
+146 1691 -6.25000000000000e+00
+146 1689 4.16666666666667e+00
+147 147 1.25000000000000e+00
+147 341 8.33333333333333e-02
+147 340 -1.66666666666667e-01
+147 338 8.33333333333333e-02
+147 49 4.16666666666667e-02
+147 336 -3.75000000000000e-01
+147 137 8.33333333333333e-02
+147 136 -4.16666666666667e-02
+147 1 4.16666666666667e-02
+147 135 -1.25000000000000e-01
+147 155 -8.33333333333333e-02
+147 149 -1.66666666666667e-01
+147 388 -4.16666666666667e-02
+147 407 -8.33333333333333e-02
+147 395 8.33333333333333e-02
+147 406 -8.33333333333333e-02
+147 394 8.33333333333333e-02
+147 389 8.33333333333333e-02
+147 50 -8.33333333333333e-02
+147 387 -1.25000000000000e-01
+147 146 8.33333333333333e-02
+147 2 -8.33333333333333e-02
+147 145 8.33333333333333e-02
+147 148 -1.66666666666667e-01
+147 154 1.66666666666667e-01
+147 144 -3.75000000000000e-01
+147 337 8.33333333333333e-02
+147 153 -2.50000000000000e-01
+148 148 1.25000000000000e+00
+148 341 8.33333333333333e-02
+148 336 8.33333333333333e-02
+148 339 -1.66666666666667e-01
+148 337 -1.25000000000000e-01
+148 48 4.16666666666667e-02
+148 137 8.33333333333333e-02
+148 149 -1.66666666666667e-01
+148 136 -1.25000000000000e-01
+148 135 -4.16666666666667e-02
+148 0 4.16666666666667e-02
+148 387 -4.16666666666667e-02
+148 389 8.33333333333333e-02
+148 155 1.66666666666667e-01
+148 395 -1.66666666666667e-01
+148 405 -8.33333333333333e-02
+148 393 8.33333333333333e-02
+148 50 4.16666666666667e-02
+148 407 -8.33333333333333e-02
+148 388 -1.25000000000000e-01
+148 146 -4.16666666666667e-02
+148 2 4.16666666666667e-02
+148 145 -1.25000000000000e-01
+148 338 -4.16666666666667e-02
+148 154 -7.50000000000000e-01
+148 144 8.33333333333333e-02
+148 147 -1.66666666666667e-01
+148 153 1.66666666666667e-01
+149 149 1.25000000000000e+00
+149 340 8.33333333333333e-02
+149 339 8.33333333333333e-02
+149 338 -1.25000000000000e-01
+149 336 8.33333333333333e-02
+149 137 -3.75000000000000e-01
+149 136 8.33333333333333e-02
+149 148 -1.66666666666667e-01
+149 135 8.33333333333333e-02
+149 153 -8.33333333333333e-02
+149 147 -1.66666666666667e-01
+149 388 8.33333333333333e-02
+149 405 -8.33333333333333e-02
+149 393 8.33333333333333e-02
+149 154 1.66666666666667e-01
+149 394 -1.66666666666667e-01
+149 389 -3.75000000000000e-01
+149 49 4.16666666666667e-02
+149 406 -8.33333333333333e-02
+149 387 8.33333333333333e-02
+149 48 -8.33333333333333e-02
+149 146 -1.25000000000000e-01
+149 337 -4.16666666666667e-02
+149 155 -2.50000000000000e-01
+149 145 -4.16666666666667e-02
+149 1 4.16666666666667e-02
+149 144 8.33333333333333e-02
+149 0 -8.33333333333333e-02
+150 150 6.37500000000000e+01
+150 139 -2.12500000000000e+00
+150 2 2.12500000000000e+00
+150 138 -6.37500000000000e+00
+150 356 -2.12500000000000e+00
+150 53 2.12500000000000e+00
+150 151 -8.50000000000000e+00
+150 355 4.25000000000000e+00
+150 354 -6.37500000000000e+00
+150 146 -2.12500000000000e+00
+150 145 4.25000000000000e+00
+150 1 2.12500000000000e+00
+150 144 -6.37500000000000e+00
+150 152 -8.50000000000000e+00
+150 392 4.25000000000000e+00
+150 391 -2.12500000000000e+00
+150 52 2.12500000000000e+00
+150 140 4.25000000000000e+00
+150 390 -6.37500000000000e+00
+150 358 -1.66666666666667e-01
+150 155 1.66666666666667e-01
+150 395 -1.66666666666667e-01
+150 424 -8.33333333333333e-02
+150 394 8.33333333333333e-02
+150 425 -8.33333333333333e-02
+150 154 1.66666666666667e-01
+150 359 8.33333333333333e-02
+150 153 -7.50000000000000e-01
+150 1687 4.16666666666667e+00
+150 1688 -8.33333333333333e+00
+150 1430 -4.16666666666667e+00
+150 1691 4.16666666666667e+00
+150 1693 8.33333333333333e+00
+150 1690 -8.33333333333333e+00
+150 1429 -4.16666666666667e+00
+150 1694 8.33333333333333e+00
+150 1692 -3.75000000000000e+01
+151 151 6.37500000000000e+01
+151 138 -2.12500000000000e+00
+151 140 4.25000000000000e+00
+151 139 -6.37500000000000e+00
+151 356 4.25000000000000e+00
+151 355 -1.91250000000000e+01
+151 150 -8.50000000000000e+00
+151 354 4.25000000000000e+00
+151 152 -8.50000000000000e+00
+151 144 4.25000000000000e+00
+151 2 -4.25000000000000e+00
+151 146 4.25000000000000e+00
+151 145 -1.91250000000000e+01
+151 0 2.12500000000000e+00
+151 392 4.25000000000000e+00
+151 53 -4.25000000000000e+00
+151 391 -6.37500000000000e+00
+151 390 -2.12500000000000e+00
+151 51 2.12500000000000e+00
+151 359 8.33333333333333e-02
+151 357 -1.66666666666667e-01
+151 155 -8.33333333333333e-02
+151 425 -8.33333333333333e-02
+151 395 8.33333333333333e-02
+151 423 -8.33333333333333e-02
+151 393 8.33333333333333e-02
+151 154 -2.50000000000000e-01
+151 153 1.66666666666667e-01
+151 1688 4.16666666666667e+00
+151 1694 -4.16666666666667e+00
+151 1430 -4.16666666666667e+00
+151 1691 4.16666666666667e+00
+151 1692 8.33333333333333e+00
+151 1689 -8.33333333333333e+00
+151 1428 -4.16666666666667e+00
+151 1686 4.16666666666667e+00
+151 1693 -1.25000000000000e+01
+152 152 6.37500000000000e+01
+152 140 -1.91250000000000e+01
+152 139 4.25000000000000e+00
+152 0 2.12500000000000e+00
+152 356 -6.37500000000000e+00
+152 355 4.25000000000000e+00
+152 354 -2.12500000000000e+00
+152 51 2.12500000000000e+00
+152 151 -8.50000000000000e+00
+152 144 -2.12500000000000e+00
+152 146 -6.37500000000000e+00
+152 1 -4.25000000000000e+00
+152 145 4.25000000000000e+00
+152 138 4.25000000000000e+00
+152 392 -1.91250000000000e+01
+152 391 4.25000000000000e+00
+152 52 -4.25000000000000e+00
+152 150 -8.50000000000000e+00
+152 390 4.25000000000000e+00
+152 358 8.33333333333333e-02
+152 154 -8.33333333333333e-02
+152 424 -8.33333333333333e-02
+152 394 8.33333333333333e-02
+152 153 1.66666666666667e-01
+152 393 -1.66666666666667e-01
+152 423 -8.33333333333333e-02
+152 357 8.33333333333333e-02
+152 155 -2.50000000000000e-01
+152 1687 4.16666666666667e+00
+152 1686 -8.33333333333333e+00
+152 1693 -4.16666666666667e+00
+152 1429 -4.16666666666667e+00
+152 1690 4.16666666666667e+00
+152 1428 -4.16666666666667e+00
+152 1689 4.16666666666667e+00
+152 1694 -1.25000000000000e+01
+152 1692 8.33333333333333e+00
+153 153 2.50000000000000e+00
+153 358 1.66666666666667e-01
+153 357 -2.50000000000000e-01
+153 140 -1.66666666666667e-01
+153 139 8.33333333333333e-02
+153 152 1.66666666666667e-01
+153 424 8.33333333333333e-02
+153 151 1.66666666666667e-01
+153 150 -7.50000000000000e-01
+153 425 8.33333333333333e-02
+153 142 -8.33333333333333e-02
+153 143 1.66666666666667e-01
+153 155 -3.33333333333333e-01
+153 2 -8.33333333333333e-02
+153 141 -2.50000000000000e-01
+153 371 8.33333333333333e-02
+153 56 -8.33333333333333e-02
+153 370 -1.66666666666667e-01
+153 137 8.33333333333333e-02
+153 340 1.66666666666667e-01
+153 154 -3.33333333333333e-01
+153 341 1.66666666666667e-01
+153 55 -8.33333333333333e-02
+153 339 -7.50000000000000e-01
+153 136 8.33333333333333e-02
+153 1 -8.33333333333333e-02
+153 149 -8.33333333333333e-02
+153 146 8.33333333333333e-02
+153 406 8.33333333333333e-02
+153 394 -8.33333333333333e-02
+153 145 -1.66666666666667e-01
+153 148 1.66666666666667e-01
+153 147 -2.50000000000000e-01
+153 395 1.66666666666667e-01
+153 407 -1.66666666666667e-01
+153 393 -2.50000000000000e-01
+153 359 -8.33333333333333e-02
+154 154 2.50000000000000e+00
+154 357 1.66666666666667e-01
+154 359 1.66666666666667e-01
+154 358 -7.50000000000000e-01
+154 138 8.33333333333333e-02
+154 152 -8.33333333333333e-02
+154 423 8.33333333333333e-02
+154 151 -2.50000000000000e-01
+154 150 1.66666666666667e-01
+154 425 -1.66666666666667e-01
+154 141 -8.33333333333333e-02
+154 371 8.33333333333333e-02
+154 143 1.66666666666667e-01
+154 142 -2.50000000000000e-01
+154 369 -1.66666666666667e-01
+154 341 -8.33333333333333e-02
+154 339 1.66666666666667e-01
+154 153 -3.33333333333333e-01
+154 340 -2.50000000000000e-01
+154 54 -8.33333333333333e-02
+154 137 -1.66666666666667e-01
+154 135 8.33333333333333e-02
+154 0 -8.33333333333333e-02
+154 149 1.66666666666667e-01
+154 155 -3.33333333333333e-01
+154 395 1.66666666666667e-01
+154 405 8.33333333333333e-02
+154 393 -8.33333333333333e-02
+154 146 8.33333333333333e-02
+154 2 -8.33333333333333e-02
+154 148 -7.50000000000000e-01
+154 144 -1.66666666666667e-01
+154 147 1.66666666666667e-01
+154 407 8.33333333333333e-02
+154 56 -8.33333333333333e-02
+154 394 -2.50000000000000e-01
+154 140 8.33333333333333e-02
+155 155 2.50000000000000e+00
+155 139 8.33333333333333e-02
+155 359 -2.50000000000000e-01
+155 358 1.66666666666667e-01
+155 138 -1.66666666666667e-01
+155 151 -8.33333333333333e-02
+155 150 1.66666666666667e-01
+155 152 -2.50000000000000e-01
+155 424 -1.66666666666667e-01
+155 423 8.33333333333333e-02
+155 370 8.33333333333333e-02
+155 141 1.66666666666667e-01
+155 153 -3.33333333333333e-01
+155 143 -7.50000000000000e-01
+155 142 1.66666666666667e-01
+155 0 -8.33333333333333e-02
+155 369 8.33333333333333e-02
+155 54 -8.33333333333333e-02
+155 340 -8.33333333333333e-02
+155 135 8.33333333333333e-02
+155 341 -2.50000000000000e-01
+155 339 1.66666666666667e-01
+155 136 -1.66666666666667e-01
+155 147 -8.33333333333333e-02
+155 144 8.33333333333333e-02
+155 148 1.66666666666667e-01
+155 154 -3.33333333333333e-01
+155 394 1.66666666666667e-01
+155 149 -2.50000000000000e-01
+155 145 8.33333333333333e-02
+155 1 -8.33333333333333e-02
+155 395 -7.50000000000000e-01
+155 357 -8.33333333333333e-02
+155 406 8.33333333333333e-02
+155 55 -8.33333333333333e-02
+155 393 1.66666666666667e-01
+155 405 -1.66666666666667e-01
+156 156 7.50000000000000e-01
+156 4 4.16666666666667e-02
+156 163 -8.33333333333333e-02
+156 344 -4.16666666666667e-02
+156 157 -8.33333333333333e-02
+156 343 8.33333333333333e-02
+156 37 4.16666666666667e-02
+156 342 -1.25000000000000e-01
+156 176 -8.33333333333333e-02
+156 350 8.33333333333333e-02
+156 5 4.16666666666667e-02
+156 170 -8.33333333333333e-02
+156 169 4.16666666666667e-02
+156 175 -8.33333333333333e-02
+156 3 -2.50000000000000e-01
+156 158 -8.33333333333333e-02
+156 347 8.33333333333333e-02
+156 38 4.16666666666667e-02
+156 346 -4.16666666666667e-02
+156 349 8.33333333333333e-02
+156 164 4.16666666666667e-02
+156 345 -1.25000000000000e-01
+156 36 -2.50000000000000e-01
+157 157 6.66666666666667e-01
+157 3 4.16666666666667e-02
+157 162 -8.33333333333333e-02
+157 344 8.33333333333333e-02
+157 343 -3.75000000000000e-01
+157 156 -8.33333333333333e-02
+157 342 8.33333333333333e-02
+157 36 4.16666666666667e-02
+157 170 4.16666666666667e-02
+157 176 -8.33333333333333e-02
+157 4 -8.33333333333333e-02
+157 168 4.16666666666667e-02
+157 174 -8.33333333333333e-02
+157 347 8.33333333333333e-02
+157 350 -1.66666666666667e-01
+157 164 4.16666666666667e-02
+157 346 -1.25000000000000e-01
+157 37 -8.33333333333333e-02
+157 345 -4.16666666666667e-02
+157 348 8.33333333333333e-02
+158 158 6.66666666666667e-01
+158 162 4.16666666666667e-02
+158 344 -1.25000000000000e-01
+158 343 8.33333333333333e-02
+158 342 -4.16666666666667e-02
+158 169 4.16666666666667e-02
+158 175 -8.33333333333333e-02
+158 174 -8.33333333333333e-02
+158 348 8.33333333333333e-02
+158 5 -8.33333333333333e-02
+158 3 4.16666666666667e-02
+158 168 -8.33333333333333e-02
+158 163 4.16666666666667e-02
+158 347 -3.75000000000000e-01
+158 38 -8.33333333333333e-02
+158 346 8.33333333333333e-02
+158 349 -1.66666666666667e-01
+158 156 -8.33333333333333e-02
+158 345 8.33333333333333e-02
+158 36 4.16666666666667e-02
+159 159 7.50000000000000e-01
+159 58 4.16666666666667e-02
+159 460 -8.33333333333333e-02
+159 167 -4.16666666666667e-02
+159 160 -8.33333333333333e-02
+159 166 8.33333333333333e-02
+159 4 4.16666666666667e-02
+159 165 -1.25000000000000e-01
+159 467 -8.33333333333333e-02
+159 179 8.33333333333333e-02
+159 59 4.16666666666667e-02
+159 464 -8.33333333333333e-02
+159 463 4.16666666666667e-02
+159 466 -8.33333333333333e-02
+159 57 -2.50000000000000e-01
+159 161 -8.33333333333333e-02
+159 173 8.33333333333333e-02
+159 5 4.16666666666667e-02
+159 172 -4.16666666666667e-02
+159 178 8.33333333333333e-02
+159 461 4.16666666666667e-02
+159 171 -1.25000000000000e-01
+159 3 -2.50000000000000e-01
+160 160 6.66666666666667e-01
+160 57 4.16666666666667e-02
+160 459 -8.33333333333333e-02
+160 167 8.33333333333333e-02
+160 166 -3.75000000000000e-01
+160 159 -8.33333333333333e-02
+160 165 8.33333333333333e-02
+160 3 4.16666666666667e-02
+160 464 4.16666666666667e-02
+160 467 -8.33333333333333e-02
+160 58 -8.33333333333333e-02
+160 462 4.16666666666667e-02
+160 465 -8.33333333333333e-02
+160 173 8.33333333333333e-02
+160 179 -1.66666666666667e-01
+160 461 4.16666666666667e-02
+160 172 -1.25000000000000e-01
+160 4 -8.33333333333333e-02
+160 171 -4.16666666666667e-02
+160 177 8.33333333333333e-02
+161 161 6.66666666666667e-01
+161 459 4.16666666666667e-02
+161 167 -1.25000000000000e-01
+161 166 8.33333333333333e-02
+161 165 -4.16666666666667e-02
+161 463 4.16666666666667e-02
+161 466 -8.33333333333333e-02
+161 465 -8.33333333333333e-02
+161 177 8.33333333333333e-02
+161 59 -8.33333333333333e-02
+161 57 4.16666666666667e-02
+161 462 -8.33333333333333e-02
+161 460 4.16666666666667e-02
+161 173 -3.75000000000000e-01
+161 5 -8.33333333333333e-02
+161 172 8.33333333333333e-02
+161 178 -1.66666666666667e-01
+161 159 -8.33333333333333e-02
+161 171 8.33333333333333e-02
+161 3 4.16666666666667e-02
+162 162 1.25000000000000e+00
+162 478 -8.33333333333333e-02
+162 167 8.33333333333333e-02
+162 166 8.33333333333333e-02
+162 165 -3.75000000000000e-01
+162 485 -8.33333333333333e-02
+162 484 -8.33333333333333e-02
+162 179 -1.66666666666667e-01
+162 178 8.33333333333333e-02
+162 344 8.33333333333333e-02
+162 164 -1.66666666666667e-01
+162 176 1.66666666666667e-01
+162 481 8.33333333333333e-02
+162 175 -8.33333333333333e-02
+162 5 -4.16666666666667e-02
+162 158 4.16666666666667e-02
+162 4 8.33333333333333e-02
+162 157 -8.33333333333333e-02
+162 3 -1.25000000000000e-01
+162 174 -2.50000000000000e-01
+162 62 -4.16666666666667e-02
+162 482 8.33333333333333e-02
+162 163 -1.66666666666667e-01
+162 61 8.33333333333333e-02
+162 343 8.33333333333333e-02
+162 479 4.16666666666667e-02
+162 60 -1.25000000000000e-01
+162 342 -3.75000000000000e-01
+163 163 1.25000000000000e+00
+163 477 -8.33333333333333e-02
+163 167 -4.16666666666667e-02
+163 166 -1.25000000000000e-01
+163 165 8.33333333333333e-02
+163 485 -8.33333333333333e-02
+163 179 8.33333333333333e-02
+163 483 -8.33333333333333e-02
+163 177 8.33333333333333e-02
+163 344 -4.16666666666667e-02
+163 158 4.16666666666667e-02
+163 480 8.33333333333333e-02
+163 174 -8.33333333333333e-02
+163 5 8.33333333333333e-02
+163 164 -1.66666666666667e-01
+163 176 1.66666666666667e-01
+163 4 -3.75000000000000e-01
+163 175 -2.50000000000000e-01
+163 3 8.33333333333333e-02
+163 156 -8.33333333333333e-02
+163 62 8.33333333333333e-02
+163 482 -1.66666666666667e-01
+163 479 4.16666666666667e-02
+163 61 -3.75000000000000e-01
+163 343 -1.25000000000000e-01
+163 162 -1.66666666666667e-01
+163 60 8.33333333333333e-02
+163 342 8.33333333333333e-02
+164 164 1.25000000000000e+00
+164 478 4.16666666666667e-02
+164 167 -1.25000000000000e-01
+164 166 -4.16666666666667e-02
+164 165 8.33333333333333e-02
+164 483 -8.33333333333333e-02
+164 484 -8.33333333333333e-02
+164 178 8.33333333333333e-02
+164 177 -1.66666666666667e-01
+164 343 -4.16666666666667e-02
+164 157 4.16666666666667e-02
+164 342 8.33333333333333e-02
+164 162 -1.66666666666667e-01
+164 174 1.66666666666667e-01
+164 5 -1.25000000000000e-01
+164 176 -7.50000000000000e-01
+164 4 8.33333333333333e-02
+164 163 -1.66666666666667e-01
+164 175 1.66666666666667e-01
+164 3 -4.16666666666667e-02
+164 156 4.16666666666667e-02
+164 477 4.16666666666667e-02
+164 62 -1.25000000000000e-01
+164 344 -1.25000000000000e-01
+164 61 8.33333333333333e-02
+164 481 -1.66666666666667e-01
+164 60 -4.16666666666667e-02
+164 480 8.33333333333333e-02
+165 165 1.25000000000000e+00
+165 484 8.33333333333333e-02
+165 485 8.33333333333333e-02
+165 478 8.33333333333333e-02
+165 477 -1.25000000000000e-01
+165 167 -1.66666666666667e-01
+165 164 8.33333333333333e-02
+165 163 8.33333333333333e-02
+165 162 -3.75000000000000e-01
+165 178 -8.33333333333333e-02
+165 166 -1.66666666666667e-01
+165 461 8.33333333333333e-02
+165 496 -8.33333333333333e-02
+165 466 8.33333333333333e-02
+165 179 1.66666666666667e-01
+165 467 -1.66666666666667e-01
+165 65 4.16666666666667e-02
+165 497 -8.33333333333333e-02
+165 460 8.33333333333333e-02
+165 64 -8.33333333333333e-02
+165 459 -3.75000000000000e-01
+165 161 -4.16666666666667e-02
+165 5 4.16666666666667e-02
+165 160 8.33333333333333e-02
+165 4 -8.33333333333333e-02
+165 159 -1.25000000000000e-01
+165 479 -4.16666666666667e-02
+165 177 -2.50000000000000e-01
+166 166 1.25000000000000e+00
+166 483 8.33333333333333e-02
+166 485 -1.66666666666667e-01
+166 65 4.16666666666667e-02
+166 478 -3.75000000000000e-01
+166 477 8.33333333333333e-02
+166 164 -4.16666666666667e-02
+166 5 4.16666666666667e-02
+166 163 -1.25000000000000e-01
+166 162 8.33333333333333e-02
+166 177 -8.33333333333333e-02
+166 461 -4.16666666666667e-02
+166 165 -1.66666666666667e-01
+166 495 -8.33333333333333e-02
+166 465 8.33333333333333e-02
+166 497 -8.33333333333333e-02
+166 467 8.33333333333333e-02
+166 460 -1.25000000000000e-01
+166 459 8.33333333333333e-02
+166 63 -8.33333333333333e-02
+166 161 8.33333333333333e-02
+166 167 -1.66666666666667e-01
+166 179 1.66666666666667e-01
+166 160 -3.75000000000000e-01
+166 479 8.33333333333333e-02
+166 178 -2.50000000000000e-01
+166 159 8.33333333333333e-02
+166 3 -8.33333333333333e-02
+167 167 1.25000000000000e+00
+167 478 8.33333333333333e-02
+167 484 -1.66666666666667e-01
+167 483 8.33333333333333e-02
+167 479 -1.25000000000000e-01
+167 64 4.16666666666667e-02
+167 164 -1.25000000000000e-01
+167 163 -4.16666666666667e-02
+167 4 4.16666666666667e-02
+167 165 -1.66666666666667e-01
+167 162 8.33333333333333e-02
+167 460 -4.16666666666667e-02
+167 459 8.33333333333333e-02
+167 496 -8.33333333333333e-02
+167 466 8.33333333333333e-02
+167 177 1.66666666666667e-01
+167 465 -1.66666666666667e-01
+167 461 -1.25000000000000e-01
+167 63 4.16666666666667e-02
+167 495 -8.33333333333333e-02
+167 161 -1.25000000000000e-01
+167 477 -4.16666666666667e-02
+167 179 -7.50000000000000e-01
+167 160 8.33333333333333e-02
+167 166 -1.66666666666667e-01
+167 178 1.66666666666667e-01
+167 159 -4.16666666666667e-02
+167 3 4.16666666666667e-02
+168 168 1.25000000000000e+00
+168 521 -8.33333333333333e-02
+168 514 4.16666666666667e-02
+168 520 -8.33333333333333e-02
+168 515 -8.33333333333333e-02
+168 173 8.33333333333333e-02
+168 172 8.33333333333333e-02
+168 178 -1.66666666666667e-01
+168 171 -3.75000000000000e-01
+168 518 8.33333333333333e-02
+168 176 -8.33333333333333e-02
+168 169 -1.66666666666667e-01
+168 175 1.66666666666667e-01
+168 346 8.33333333333333e-02
+168 5 8.33333333333333e-02
+168 158 -8.33333333333333e-02
+168 4 -4.16666666666667e-02
+168 157 4.16666666666667e-02
+168 3 -1.25000000000000e-01
+168 174 -2.50000000000000e-01
+168 170 -1.66666666666667e-01
+168 68 8.33333333333333e-02
+168 347 8.33333333333333e-02
+168 67 -4.16666666666667e-02
+168 517 8.33333333333333e-02
+168 179 8.33333333333333e-02
+168 66 -1.25000000000000e-01
+168 345 -3.75000000000000e-01
+169 169 1.25000000000000e+00
+169 519 -8.33333333333333e-02
+169 515 4.16666666666667e-02
+169 521 -8.33333333333333e-02
+169 173 -4.16666666666667e-02
+169 179 8.33333333333333e-02
+169 172 -1.25000000000000e-01
+169 171 8.33333333333333e-02
+169 177 -1.66666666666667e-01
+169 158 4.16666666666667e-02
+169 347 -4.16666666666667e-02
+169 168 -1.66666666666667e-01
+169 174 1.66666666666667e-01
+169 345 8.33333333333333e-02
+169 5 8.33333333333333e-02
+169 170 -1.66666666666667e-01
+169 176 1.66666666666667e-01
+169 4 -1.25000000000000e-01
+169 175 -7.50000000000000e-01
+169 3 -4.16666666666667e-02
+169 156 4.16666666666667e-02
+169 68 8.33333333333333e-02
+169 518 -1.66666666666667e-01
+169 513 4.16666666666667e-02
+169 67 -1.25000000000000e-01
+169 346 -1.25000000000000e-01
+169 66 -4.16666666666667e-02
+169 516 8.33333333333333e-02
+170 170 1.25000000000000e+00
+170 519 -8.33333333333333e-02
+170 514 4.16666666666667e-02
+170 520 -8.33333333333333e-02
+170 513 -8.33333333333333e-02
+170 173 -1.25000000000000e-01
+170 172 -4.16666666666667e-02
+170 178 8.33333333333333e-02
+170 171 8.33333333333333e-02
+170 516 8.33333333333333e-02
+170 174 -8.33333333333333e-02
+170 157 4.16666666666667e-02
+170 346 -4.16666666666667e-02
+170 5 -3.75000000000000e-01
+170 176 -2.50000000000000e-01
+170 4 8.33333333333333e-02
+170 169 -1.66666666666667e-01
+170 175 1.66666666666667e-01
+170 3 8.33333333333333e-02
+170 156 -8.33333333333333e-02
+170 177 8.33333333333333e-02
+170 68 -3.75000000000000e-01
+170 347 -1.25000000000000e-01
+170 67 8.33333333333333e-02
+170 517 -1.66666666666667e-01
+170 168 -1.66666666666667e-01
+170 66 8.33333333333333e-02
+170 345 8.33333333333333e-02
+171 171 1.25000000000000e+00
+171 467 8.33333333333333e-02
+171 466 -1.66666666666667e-01
+171 464 8.33333333333333e-02
+171 70 4.16666666666667e-02
+171 462 -3.75000000000000e-01
+171 161 8.33333333333333e-02
+171 160 -4.16666666666667e-02
+171 4 4.16666666666667e-02
+171 159 -1.25000000000000e-01
+171 179 -8.33333333333333e-02
+171 173 -1.66666666666667e-01
+171 514 -4.16666666666667e-02
+171 533 -8.33333333333333e-02
+171 521 8.33333333333333e-02
+171 532 -8.33333333333333e-02
+171 520 8.33333333333333e-02
+171 515 8.33333333333333e-02
+171 71 -8.33333333333333e-02
+171 513 -1.25000000000000e-01
+171 170 8.33333333333333e-02
+171 5 -8.33333333333333e-02
+171 169 8.33333333333333e-02
+171 172 -1.66666666666667e-01
+171 178 1.66666666666667e-01
+171 168 -3.75000000000000e-01
+171 463 8.33333333333333e-02
+171 177 -2.50000000000000e-01
+172 172 1.25000000000000e+00
+172 467 8.33333333333333e-02
+172 462 8.33333333333333e-02
+172 465 -1.66666666666667e-01
+172 463 -1.25000000000000e-01
+172 69 4.16666666666667e-02
+172 161 8.33333333333333e-02
+172 173 -1.66666666666667e-01
+172 160 -1.25000000000000e-01
+172 159 -4.16666666666667e-02
+172 3 4.16666666666667e-02
+172 513 -4.16666666666667e-02
+172 515 8.33333333333333e-02
+172 179 1.66666666666667e-01
+172 521 -1.66666666666667e-01
+172 531 -8.33333333333333e-02
+172 519 8.33333333333333e-02
+172 71 4.16666666666667e-02
+172 533 -8.33333333333333e-02
+172 514 -1.25000000000000e-01
+172 170 -4.16666666666667e-02
+172 5 4.16666666666667e-02
+172 169 -1.25000000000000e-01
+172 464 -4.16666666666667e-02
+172 178 -7.50000000000000e-01
+172 168 8.33333333333333e-02
+172 171 -1.66666666666667e-01
+172 177 1.66666666666667e-01
+173 173 1.25000000000000e+00
+173 466 8.33333333333333e-02
+173 465 8.33333333333333e-02
+173 464 -1.25000000000000e-01
+173 462 8.33333333333333e-02
+173 161 -3.75000000000000e-01
+173 160 8.33333333333333e-02
+173 172 -1.66666666666667e-01
+173 159 8.33333333333333e-02
+173 177 -8.33333333333333e-02
+173 171 -1.66666666666667e-01
+173 514 8.33333333333333e-02
+173 531 -8.33333333333333e-02
+173 519 8.33333333333333e-02
+173 178 1.66666666666667e-01
+173 520 -1.66666666666667e-01
+173 515 -3.75000000000000e-01
+173 70 4.16666666666667e-02
+173 532 -8.33333333333333e-02
+173 513 8.33333333333333e-02
+173 69 -8.33333333333333e-02
+173 170 -1.25000000000000e-01
+173 463 -4.16666666666667e-02
+173 179 -2.50000000000000e-01
+173 169 -4.16666666666667e-02
+173 4 4.16666666666667e-02
+173 168 8.33333333333333e-02
+173 3 -8.33333333333333e-02
+174 174 2.50000000000000e+00
+174 484 -1.66666666666667e-01
+174 179 1.66666666666667e-01
+174 521 -1.66666666666667e-01
+174 550 -8.33333333333333e-02
+174 520 8.33333333333333e-02
+174 551 -8.33333333333333e-02
+174 178 1.66666666666667e-01
+174 177 -7.50000000000000e-01
+174 164 1.66666666666667e-01
+174 343 8.33333333333333e-02
+174 163 -8.33333333333333e-02
+174 344 -1.66666666666667e-01
+174 5 8.33333333333333e-02
+174 162 -2.50000000000000e-01
+174 482 -8.33333333333333e-02
+174 74 8.33333333333333e-02
+174 175 -3.33333333333333e-01
+174 481 1.66666666666667e-01
+174 480 -2.50000000000000e-01
+174 170 -8.33333333333333e-02
+174 169 1.66666666666667e-01
+174 158 -8.33333333333333e-02
+174 347 8.33333333333333e-02
+174 349 1.66666666666667e-01
+174 346 -1.66666666666667e-01
+174 4 8.33333333333333e-02
+174 157 -8.33333333333333e-02
+174 168 -2.50000000000000e-01
+174 176 -3.33333333333333e-01
+174 518 1.66666666666667e-01
+174 350 1.66666666666667e-01
+174 517 -8.33333333333333e-02
+174 73 8.33333333333333e-02
+174 485 8.33333333333333e-02
+174 516 -2.50000000000000e-01
+174 348 -7.50000000000000e-01
+175 175 2.50000000000000e+00
+175 483 -1.66666666666667e-01
+175 179 -8.33333333333333e-02
+175 551 -8.33333333333333e-02
+175 521 8.33333333333333e-02
+175 549 -8.33333333333333e-02
+175 519 8.33333333333333e-02
+175 178 -2.50000000000000e-01
+175 177 1.66666666666667e-01
+175 342 8.33333333333333e-02
+175 162 -8.33333333333333e-02
+175 344 8.33333333333333e-02
+175 164 1.66666666666667e-01
+175 163 -2.50000000000000e-01
+175 482 1.66666666666667e-01
+175 481 -7.50000000000000e-01
+175 174 -3.33333333333333e-01
+175 480 1.66666666666667e-01
+175 350 -8.33333333333333e-02
+175 176 -3.33333333333333e-01
+175 158 -8.33333333333333e-02
+175 347 8.33333333333333e-02
+175 168 1.66666666666667e-01
+175 348 1.66666666666667e-01
+175 345 -1.66666666666667e-01
+175 5 -1.66666666666667e-01
+175 170 1.66666666666667e-01
+175 169 -7.50000000000000e-01
+175 3 8.33333333333333e-02
+175 156 -8.33333333333333e-02
+175 518 1.66666666666667e-01
+175 74 -1.66666666666667e-01
+175 485 8.33333333333333e-02
+175 517 -2.50000000000000e-01
+175 349 -2.50000000000000e-01
+175 516 -8.33333333333333e-02
+175 72 8.33333333333333e-02
+176 176 2.50000000000000e+00
+176 484 8.33333333333333e-02
+176 178 -8.33333333333333e-02
+176 550 -8.33333333333333e-02
+176 520 8.33333333333333e-02
+176 177 1.66666666666667e-01
+176 519 -1.66666666666667e-01
+176 549 -8.33333333333333e-02
+176 179 -2.50000000000000e-01
+176 162 1.66666666666667e-01
+176 343 8.33333333333333e-02
+176 342 -1.66666666666667e-01
+176 164 -7.50000000000000e-01
+176 163 1.66666666666667e-01
+176 3 8.33333333333333e-02
+176 482 -2.50000000000000e-01
+176 481 1.66666666666667e-01
+176 480 -8.33333333333333e-02
+176 72 8.33333333333333e-02
+176 349 -8.33333333333333e-02
+176 175 -3.33333333333333e-01
+176 168 -8.33333333333333e-02
+176 157 -8.33333333333333e-02
+176 346 8.33333333333333e-02
+176 156 -8.33333333333333e-02
+176 345 8.33333333333333e-02
+176 170 -2.50000000000000e-01
+176 4 -1.66666666666667e-01
+176 169 1.66666666666667e-01
+176 483 8.33333333333333e-02
+176 518 -7.50000000000000e-01
+176 350 -2.50000000000000e-01
+176 517 1.66666666666667e-01
+176 73 -1.66666666666667e-01
+176 174 -3.33333333333333e-01
+176 516 1.66666666666667e-01
+176 348 1.66666666666667e-01
+177 177 2.50000000000000e+00
+177 484 1.66666666666667e-01
+177 483 -2.50000000000000e-01
+177 164 -1.66666666666667e-01
+177 163 8.33333333333333e-02
+177 176 1.66666666666667e-01
+177 550 8.33333333333333e-02
+177 175 1.66666666666667e-01
+177 174 -7.50000000000000e-01
+177 551 8.33333333333333e-02
+177 166 -8.33333333333333e-02
+177 167 1.66666666666667e-01
+177 179 -3.33333333333333e-01
+177 5 -8.33333333333333e-02
+177 165 -2.50000000000000e-01
+177 497 8.33333333333333e-02
+177 77 -8.33333333333333e-02
+177 496 -1.66666666666667e-01
+177 161 8.33333333333333e-02
+177 466 1.66666666666667e-01
+177 178 -3.33333333333333e-01
+177 467 1.66666666666667e-01
+177 76 -8.33333333333333e-02
+177 465 -7.50000000000000e-01
+177 160 8.33333333333333e-02
+177 4 -8.33333333333333e-02
+177 173 -8.33333333333333e-02
+177 170 8.33333333333333e-02
+177 532 8.33333333333333e-02
+177 520 -8.33333333333333e-02
+177 169 -1.66666666666667e-01
+177 172 1.66666666666667e-01
+177 171 -2.50000000000000e-01
+177 521 1.66666666666667e-01
+177 533 -1.66666666666667e-01
+177 519 -2.50000000000000e-01
+177 485 -8.33333333333333e-02
+178 178 2.50000000000000e+00
+178 483 1.66666666666667e-01
+178 485 1.66666666666667e-01
+178 484 -7.50000000000000e-01
+178 162 8.33333333333333e-02
+178 176 -8.33333333333333e-02
+178 549 8.33333333333333e-02
+178 175 -2.50000000000000e-01
+178 174 1.66666666666667e-01
+178 551 -1.66666666666667e-01
+178 165 -8.33333333333333e-02
+178 497 8.33333333333333e-02
+178 167 1.66666666666667e-01
+178 166 -2.50000000000000e-01
+178 495 -1.66666666666667e-01
+178 467 -8.33333333333333e-02
+178 465 1.66666666666667e-01
+178 177 -3.33333333333333e-01
+178 466 -2.50000000000000e-01
+178 75 -8.33333333333333e-02
+178 161 -1.66666666666667e-01
+178 159 8.33333333333333e-02
+178 3 -8.33333333333333e-02
+178 173 1.66666666666667e-01
+178 179 -3.33333333333333e-01
+178 521 1.66666666666667e-01
+178 531 8.33333333333333e-02
+178 519 -8.33333333333333e-02
+178 170 8.33333333333333e-02
+178 5 -8.33333333333333e-02
+178 172 -7.50000000000000e-01
+178 168 -1.66666666666667e-01
+178 171 1.66666666666667e-01
+178 533 8.33333333333333e-02
+178 77 -8.33333333333333e-02
+178 520 -2.50000000000000e-01
+178 164 8.33333333333333e-02
+179 179 2.50000000000000e+00
+179 163 8.33333333333333e-02
+179 485 -2.50000000000000e-01
+179 484 1.66666666666667e-01
+179 162 -1.66666666666667e-01
+179 175 -8.33333333333333e-02
+179 174 1.66666666666667e-01
+179 176 -2.50000000000000e-01
+179 550 -1.66666666666667e-01
+179 549 8.33333333333333e-02
+179 496 8.33333333333333e-02
+179 165 1.66666666666667e-01
+179 177 -3.33333333333333e-01
+179 167 -7.50000000000000e-01
+179 166 1.66666666666667e-01
+179 3 -8.33333333333333e-02
+179 495 8.33333333333333e-02
+179 75 -8.33333333333333e-02
+179 466 -8.33333333333333e-02
+179 159 8.33333333333333e-02
+179 467 -2.50000000000000e-01
+179 465 1.66666666666667e-01
+179 160 -1.66666666666667e-01
+179 171 -8.33333333333333e-02
+179 168 8.33333333333333e-02
+179 172 1.66666666666667e-01
+179 178 -3.33333333333333e-01
+179 520 1.66666666666667e-01
+179 173 -2.50000000000000e-01
+179 169 8.33333333333333e-02
+179 4 -8.33333333333333e-02
+179 521 -7.50000000000000e-01
+179 483 -8.33333333333333e-02
+179 532 8.33333333333333e-02
+179 76 -8.33333333333333e-02
+179 519 1.66666666666667e-01
+179 531 -1.66666666666667e-01
+180 180 7.50000000000000e-01
+180 7 4.16666666666667e-02
+180 184 -8.33333333333333e-02
+180 470 -4.16666666666667e-02
+180 181 -8.33333333333333e-02
+180 469 8.33333333333333e-02
+180 58 4.16666666666667e-02
+180 468 -1.25000000000000e-01
+180 191 -8.33333333333333e-02
+180 476 8.33333333333333e-02
+180 8 4.16666666666667e-02
+180 188 -8.33333333333333e-02
+180 187 4.16666666666667e-02
+180 190 -8.33333333333333e-02
+180 6 -2.50000000000000e-01
+180 182 -8.33333333333333e-02
+180 473 8.33333333333333e-02
+180 59 4.16666666666667e-02
+180 472 -4.16666666666667e-02
+180 475 8.33333333333333e-02
+180 185 4.16666666666667e-02
+180 471 -1.25000000000000e-01
+180 57 -2.50000000000000e-01
+181 181 6.66666666666667e-01
+181 6 4.16666666666667e-02
+181 183 -8.33333333333333e-02
+181 470 8.33333333333333e-02
+181 469 -3.75000000000000e-01
+181 180 -8.33333333333333e-02
+181 468 8.33333333333333e-02
+181 57 4.16666666666667e-02
+181 188 4.16666666666667e-02
+181 191 -8.33333333333333e-02
+181 7 -8.33333333333333e-02
+181 186 4.16666666666667e-02
+181 189 -8.33333333333333e-02
+181 473 8.33333333333333e-02
+181 476 -1.66666666666667e-01
+181 185 4.16666666666667e-02
+181 472 -1.25000000000000e-01
+181 58 -8.33333333333333e-02
+181 471 -4.16666666666667e-02
+181 474 8.33333333333333e-02
+182 182 6.66666666666667e-01
+182 183 4.16666666666667e-02
+182 470 -1.25000000000000e-01
+182 469 8.33333333333333e-02
+182 468 -4.16666666666667e-02
+182 187 4.16666666666667e-02
+182 190 -8.33333333333333e-02
+182 189 -8.33333333333333e-02
+182 474 8.33333333333333e-02
+182 8 -8.33333333333333e-02
+182 6 4.16666666666667e-02
+182 186 -8.33333333333333e-02
+182 184 4.16666666666667e-02
+182 473 -3.75000000000000e-01
+182 59 -8.33333333333333e-02
+182 472 8.33333333333333e-02
+182 475 -1.66666666666667e-01
+182 180 -8.33333333333333e-02
+182 471 8.33333333333333e-02
+182 57 4.16666666666667e-02
+183 183 1.25000000000000e+00
+183 79 8.33333333333333e-02
+183 184 -1.66666666666667e-01
+183 7 8.33333333333333e-02
+183 587 8.33333333333333e-02
+183 586 8.33333333333333e-02
+183 78 -1.25000000000000e-01
+183 191 1.66666666666667e-01
+183 190 -8.33333333333333e-02
+183 189 -2.50000000000000e-01
+183 6 -1.25000000000000e-01
+183 185 -1.66666666666667e-01
+183 8 -4.16666666666667e-02
+183 182 4.16666666666667e-02
+183 181 -8.33333333333333e-02
+183 80 -4.16666666666667e-02
+183 469 8.33333333333333e-02
+183 470 8.33333333333333e-02
+183 468 -3.75000000000000e-01
+183 970 -8.33333333333333e-02
+183 788 8.33333333333333e-02
+183 787 8.33333333333333e-02
+183 786 -3.75000000000000e-01
+183 974 -8.33333333333333e-02
+183 973 -8.33333333333333e-02
+183 794 -1.66666666666667e-01
+183 793 8.33333333333333e-02
+183 971 4.16666666666667e-02
+184 184 1.25000000000000e+00
+184 78 8.33333333333333e-02
+184 183 -1.66666666666667e-01
+184 6 8.33333333333333e-02
+184 587 -1.66666666666667e-01
+184 80 8.33333333333333e-02
+184 79 -3.75000000000000e-01
+184 585 8.33333333333333e-02
+184 191 1.66666666666667e-01
+184 185 -1.66666666666667e-01
+184 8 8.33333333333333e-02
+184 190 -2.50000000000000e-01
+184 7 -3.75000000000000e-01
+184 189 -8.33333333333333e-02
+184 182 4.16666666666667e-02
+184 180 -8.33333333333333e-02
+184 470 -4.16666666666667e-02
+184 469 -1.25000000000000e-01
+184 468 8.33333333333333e-02
+184 969 -8.33333333333333e-02
+184 788 -4.16666666666667e-02
+184 787 -1.25000000000000e-01
+184 786 8.33333333333333e-02
+184 974 -8.33333333333333e-02
+184 794 8.33333333333333e-02
+184 972 -8.33333333333333e-02
+184 971 4.16666666666667e-02
+184 792 8.33333333333333e-02
+185 185 1.25000000000000e+00
+185 585 8.33333333333333e-02
+185 80 -1.25000000000000e-01
+185 586 -1.66666666666667e-01
+185 79 8.33333333333333e-02
+185 191 -7.50000000000000e-01
+185 8 -1.25000000000000e-01
+185 190 1.66666666666667e-01
+185 184 -1.66666666666667e-01
+185 7 8.33333333333333e-02
+185 189 1.66666666666667e-01
+185 181 4.16666666666667e-02
+185 468 8.33333333333333e-02
+185 183 -1.66666666666667e-01
+185 6 -4.16666666666667e-02
+185 180 4.16666666666667e-02
+185 469 -4.16666666666667e-02
+185 470 -1.25000000000000e-01
+185 78 -4.16666666666667e-02
+185 970 4.16666666666667e-02
+185 788 -1.25000000000000e-01
+185 787 -4.16666666666667e-02
+185 786 8.33333333333333e-02
+185 972 -8.33333333333333e-02
+185 973 -8.33333333333333e-02
+185 793 8.33333333333333e-02
+185 969 4.16666666666667e-02
+185 792 -1.66666666666667e-01
+186 186 1.25000000000000e+00
+186 593 8.33333333333333e-02
+186 191 -8.33333333333333e-02
+186 190 1.66666666666667e-01
+186 189 -2.50000000000000e-01
+186 83 8.33333333333333e-02
+186 81 -1.25000000000000e-01
+186 188 -1.66666666666667e-01
+186 8 8.33333333333333e-02
+186 592 8.33333333333333e-02
+186 6 -1.25000000000000e-01
+186 187 -1.66666666666667e-01
+186 472 8.33333333333333e-02
+186 182 -8.33333333333333e-02
+186 7 -4.16666666666667e-02
+186 181 4.16666666666667e-02
+186 473 8.33333333333333e-02
+186 82 -4.16666666666667e-02
+186 471 -3.75000000000000e-01
+186 794 8.33333333333333e-02
+186 1004 -8.33333333333333e-02
+186 1000 4.16666666666667e-02
+186 1003 -8.33333333333333e-02
+186 1001 -8.33333333333333e-02
+186 791 8.33333333333333e-02
+186 790 8.33333333333333e-02
+186 793 -1.66666666666667e-01
+186 789 -3.75000000000000e-01
+187 187 1.25000000000000e+00
+187 593 -1.66666666666667e-01
+187 83 8.33333333333333e-02
+187 191 1.66666666666667e-01
+187 188 -1.66666666666667e-01
+187 8 8.33333333333333e-02
+187 190 -7.50000000000000e-01
+187 189 1.66666666666667e-01
+187 82 -1.25000000000000e-01
+187 591 8.33333333333333e-02
+187 7 -1.25000000000000e-01
+187 473 -4.16666666666667e-02
+187 186 -1.66666666666667e-01
+187 471 8.33333333333333e-02
+187 6 -4.16666666666667e-02
+187 180 4.16666666666667e-02
+187 182 4.16666666666667e-02
+187 472 -1.25000000000000e-01
+187 81 -4.16666666666667e-02
+187 999 4.16666666666667e-02
+187 1002 -8.33333333333333e-02
+187 1001 4.16666666666667e-02
+187 1004 -8.33333333333333e-02
+187 791 -4.16666666666667e-02
+187 794 8.33333333333333e-02
+187 790 -1.25000000000000e-01
+187 789 8.33333333333333e-02
+187 792 -1.66666666666667e-01
+188 188 1.25000000000000e+00
+188 82 8.33333333333333e-02
+188 591 8.33333333333333e-02
+188 191 -2.50000000000000e-01
+188 190 1.66666666666667e-01
+188 187 -1.66666666666667e-01
+188 7 8.33333333333333e-02
+188 189 -8.33333333333333e-02
+188 83 -3.75000000000000e-01
+188 81 8.33333333333333e-02
+188 592 -1.66666666666667e-01
+188 8 -3.75000000000000e-01
+188 186 -1.66666666666667e-01
+188 6 8.33333333333333e-02
+188 181 4.16666666666667e-02
+188 472 -4.16666666666667e-02
+188 180 -8.33333333333333e-02
+188 473 -1.25000000000000e-01
+188 471 8.33333333333333e-02
+188 792 8.33333333333333e-02
+188 1002 -8.33333333333333e-02
+188 1000 4.16666666666667e-02
+188 1003 -8.33333333333333e-02
+188 999 -8.33333333333333e-02
+188 791 -1.25000000000000e-01
+188 790 -4.16666666666667e-02
+188 793 8.33333333333333e-02
+188 789 8.33333333333333e-02
+189 189 2.50000000000000e+00
+189 587 -8.33333333333333e-02
+189 586 1.66666666666667e-01
+189 85 8.33333333333333e-02
+189 585 -2.50000000000000e-01
+189 191 -3.33333333333333e-01
+189 185 1.66666666666667e-01
+189 184 -8.33333333333333e-02
+189 7 8.33333333333333e-02
+189 183 -2.50000000000000e-01
+189 592 -8.33333333333333e-02
+189 593 1.66666666666667e-01
+189 86 8.33333333333333e-02
+189 591 -2.50000000000000e-01
+189 188 -8.33333333333333e-02
+189 8 8.33333333333333e-02
+189 190 -3.33333333333333e-01
+189 187 1.66666666666667e-01
+189 186 -2.50000000000000e-01
+189 469 8.33333333333333e-02
+189 470 -1.66666666666667e-01
+189 182 -8.33333333333333e-02
+189 473 8.33333333333333e-02
+189 475 1.66666666666667e-01
+189 472 -1.66666666666667e-01
+189 181 -8.33333333333333e-02
+189 476 1.66666666666667e-01
+189 474 -7.50000000000000e-01
+189 973 -1.66666666666667e-01
+189 794 1.66666666666667e-01
+189 1004 -1.66666666666667e-01
+189 1030 -8.33333333333333e-02
+189 1003 8.33333333333333e-02
+189 1031 -8.33333333333333e-02
+189 793 1.66666666666667e-01
+189 974 8.33333333333333e-02
+189 792 -7.50000000000000e-01
+190 190 2.50000000000000e+00
+190 587 1.66666666666667e-01
+190 586 -7.50000000000000e-01
+190 84 8.33333333333333e-02
+190 185 1.66666666666667e-01
+190 184 -2.50000000000000e-01
+190 183 -8.33333333333333e-02
+190 6 8.33333333333333e-02
+190 191 -3.33333333333333e-01
+190 591 -8.33333333333333e-02
+190 86 -1.66666666666667e-01
+190 593 1.66666666666667e-01
+190 592 -2.50000000000000e-01
+190 188 1.66666666666667e-01
+190 8 -1.66666666666667e-01
+190 585 1.66666666666667e-01
+190 187 -7.50000000000000e-01
+190 189 -3.33333333333333e-01
+190 186 1.66666666666667e-01
+190 470 8.33333333333333e-02
+190 476 -8.33333333333333e-02
+190 182 -8.33333333333333e-02
+190 473 8.33333333333333e-02
+190 474 1.66666666666667e-01
+190 471 -1.66666666666667e-01
+190 180 -8.33333333333333e-02
+190 468 8.33333333333333e-02
+190 475 -2.50000000000000e-01
+190 974 8.33333333333333e-02
+190 972 -1.66666666666667e-01
+190 794 -8.33333333333333e-02
+190 1031 -8.33333333333333e-02
+190 1004 8.33333333333333e-02
+190 1029 -8.33333333333333e-02
+190 1002 8.33333333333333e-02
+190 793 -2.50000000000000e-01
+190 792 1.66666666666667e-01
+191 191 2.50000000000000e+00
+191 585 -8.33333333333333e-02
+191 587 -2.50000000000000e-01
+191 586 1.66666666666667e-01
+191 185 -7.50000000000000e-01
+191 184 1.66666666666667e-01
+191 189 -3.33333333333333e-01
+191 183 1.66666666666667e-01
+191 190 -3.33333333333333e-01
+191 591 1.66666666666667e-01
+191 593 -7.50000000000000e-01
+191 85 -1.66666666666667e-01
+191 592 1.66666666666667e-01
+191 84 8.33333333333333e-02
+191 188 -2.50000000000000e-01
+191 187 1.66666666666667e-01
+191 7 -1.66666666666667e-01
+191 186 -8.33333333333333e-02
+191 6 8.33333333333333e-02
+191 469 8.33333333333333e-02
+191 468 -1.66666666666667e-01
+191 475 -8.33333333333333e-02
+191 181 -8.33333333333333e-02
+191 472 8.33333333333333e-02
+191 180 -8.33333333333333e-02
+191 471 8.33333333333333e-02
+191 476 -2.50000000000000e-01
+191 474 1.66666666666667e-01
+191 973 8.33333333333333e-02
+191 793 -8.33333333333333e-02
+191 1030 -8.33333333333333e-02
+191 1003 8.33333333333333e-02
+191 792 1.66666666666667e-01
+191 1002 -1.66666666666667e-01
+191 1029 -8.33333333333333e-02
+191 972 8.33333333333333e-02
+191 794 -2.50000000000000e-01
+192 192 2.98333333333333e+01
+192 194 -8.33333333333333e+00
+192 365 4.25000000000000e+00
+192 199 2.12500000000000e+00
+192 364 -2.12500000000000e+00
+192 41 -2.08333333333333e+00
+192 40 2.12500000000000e+00
+192 39 -2.16666666666667e+00
+192 363 -6.37500000000000e+00
+192 11 -2.08333333333333e+00
+192 200 2.12500000000000e+00
+192 193 -4.25000000000000e+00
+192 10 2.12500000000000e+00
+192 9 -2.16666666666667e+00
+192 196 -8.33333333333333e-02
+192 362 8.33333333333333e-02
+192 361 8.33333333333333e-02
+192 360 -3.75000000000000e-01
+192 203 -8.33333333333333e-02
+192 202 -8.33333333333333e-02
+192 368 -1.66666666666667e-01
+192 367 8.33333333333333e-02
+192 197 4.16666666666667e-02
+192 1718 2.08333333333333e+00
+192 1717 -4.16666666666667e+00
+192 1462 4.16666666666667e+00
+192 1463 4.16666666666667e+00
+192 1461 -1.87500000000000e+01
+193 193 2.57500000000000e+01
+193 198 2.12500000000000e+00
+193 363 -2.12500000000000e+00
+193 41 2.12500000000000e+00
+193 194 -4.25000000000000e+00
+193 365 4.25000000000000e+00
+193 40 -6.50000000000000e+00
+193 364 -6.37500000000000e+00
+193 39 2.12500000000000e+00
+193 11 2.12500000000000e+00
+193 200 -4.25000000000000e+00
+193 10 -6.50000000000000e+00
+193 192 -4.25000000000000e+00
+193 9 2.12500000000000e+00
+193 195 -8.33333333333333e-02
+193 362 -4.16666666666667e-02
+193 361 -1.25000000000000e-01
+193 360 8.33333333333333e-02
+193 203 -8.33333333333333e-02
+193 368 8.33333333333333e-02
+193 201 -8.33333333333333e-02
+193 197 4.16666666666667e-02
+193 366 8.33333333333333e-02
+193 1718 2.08333333333333e+00
+193 1716 -4.16666666666667e+00
+193 1463 -2.08333333333333e+00
+193 1462 -6.25000000000000e+00
+193 1461 4.16666666666667e+00
+194 194 2.98333333333333e+01
+194 192 -8.33333333333333e+00
+194 363 4.25000000000000e+00
+194 41 -2.16666666666667e+00
+194 365 -1.91250000000000e+01
+194 40 2.12500000000000e+00
+194 193 -4.25000000000000e+00
+194 364 4.25000000000000e+00
+194 39 -2.08333333333333e+00
+194 11 -2.16666666666667e+00
+194 10 2.12500000000000e+00
+194 199 -4.25000000000000e+00
+194 9 -2.08333333333333e+00
+194 198 2.12500000000000e+00
+194 196 4.16666666666667e-02
+194 362 -1.25000000000000e-01
+194 361 -4.16666666666667e-02
+194 360 8.33333333333333e-02
+194 201 -8.33333333333333e-02
+194 202 -8.33333333333333e-02
+194 367 8.33333333333333e-02
+194 195 4.16666666666667e-02
+194 366 -1.66666666666667e-01
+194 1717 2.08333333333333e+00
+194 1461 4.16666666666667e+00
+194 1716 2.08333333333333e+00
+194 1462 -2.08333333333333e+00
+194 1463 -6.25000000000000e+00
+195 195 5.00000000000000e-01
+195 362 -4.16666666666667e-02
+195 604 4.16666666666667e-02
+195 202 -4.16666666666667e-02
+195 89 4.16666666666667e-02
+195 605 -8.33333333333333e-02
+195 88 4.16666666666667e-02
+195 196 -8.33333333333333e-02
+195 361 8.33333333333333e-02
+195 87 -1.25000000000000e-01
+195 360 -1.25000000000000e-01
+195 197 -8.33333333333333e-02
+195 11 4.16666666666667e-02
+195 203 8.33333333333333e-02
+195 10 4.16666666666667e-02
+195 193 -8.33333333333333e-02
+195 194 4.16666666666667e-02
+195 9 -1.25000000000000e-01
+195 201 -1.25000000000000e-01
+196 196 5.83333333333333e-01
+196 362 8.33333333333333e-02
+196 203 8.33333333333333e-02
+196 603 4.16666666666667e-02
+196 201 -4.16666666666667e-02
+196 89 -4.16666666666667e-02
+196 605 4.16666666666667e-02
+196 88 -4.16666666666667e-02
+196 361 -3.75000000000000e-01
+196 87 4.16666666666667e-02
+196 195 -8.33333333333333e-02
+196 360 8.33333333333333e-02
+196 11 -4.16666666666667e-02
+196 194 4.16666666666667e-02
+196 197 -1.66666666666667e-01
+196 10 -4.16666666666667e-02
+196 202 -1.25000000000000e-01
+196 9 4.16666666666667e-02
+196 192 -8.33333333333333e-02
+197 197 5.83333333333333e-01
+197 360 -4.16666666666667e-02
+197 196 -1.66666666666667e-01
+197 361 8.33333333333333e-02
+197 202 8.33333333333333e-02
+197 89 -4.16666666666667e-02
+197 362 -1.25000000000000e-01
+197 88 -4.16666666666667e-02
+197 604 4.16666666666667e-02
+197 87 4.16666666666667e-02
+197 603 -8.33333333333333e-02
+197 192 4.16666666666667e-02
+197 11 -4.16666666666667e-02
+197 203 -3.75000000000000e-01
+197 10 -4.16666666666667e-02
+197 193 4.16666666666667e-02
+197 195 -8.33333333333333e-02
+197 9 4.16666666666667e-02
+197 201 8.33333333333333e-02
+198 198 3.39166666666667e+01
+198 11 2.12500000000000e+00
+198 200 -4.25000000000000e+00
+198 92 2.12500000000000e+00
+198 193 2.12500000000000e+00
+198 194 2.12500000000000e+00
+198 9 -4.20833333333333e+00
+198 365 -2.12500000000000e+00
+198 364 4.25000000000000e+00
+198 363 -6.37500000000000e+00
+198 90 -4.20833333333333e+00
+198 202 8.33333333333333e-02
+198 199 -1.66666666666667e-01
+198 611 -8.33333333333333e-02
+198 91 -4.16666666666667e-02
+198 610 4.16666666666667e-02
+198 203 8.33333333333333e-02
+198 10 -4.16666666666667e-02
+198 201 -3.75000000000000e-01
+198 1466 -4.16666666666667e+00
+198 1826 4.16666666666667e+00
+198 1825 4.16666666666667e+00
+198 1824 -1.87500000000000e+01
+198 1462 -4.16666666666667e+00
+198 1463 -4.16666666666667e+00
+198 1730 4.16666666666667e+00
+198 1729 -8.33333333333333e+00
+198 1465 2.08333333333333e+00
+199 199 3.39166666666667e+01
+199 192 2.12500000000000e+00
+199 194 -4.25000000000000e+00
+199 11 2.12500000000000e+00
+199 10 -4.20833333333333e+00
+199 365 4.25000000000000e+00
+199 200 -4.25000000000000e+00
+199 92 2.12500000000000e+00
+199 364 -1.91250000000000e+01
+199 91 -4.20833333333333e+00
+199 363 4.25000000000000e+00
+199 611 4.16666666666667e-02
+199 201 8.33333333333333e-02
+199 198 -1.66666666666667e-01
+199 90 -4.16666666666667e-02
+199 609 4.16666666666667e-02
+199 203 -4.16666666666667e-02
+199 202 -1.25000000000000e-01
+199 9 -4.16666666666667e-02
+199 1466 2.08333333333333e+00
+199 1826 -2.08333333333333e+00
+199 1825 -6.25000000000000e+00
+199 1824 4.16666666666667e+00
+199 1461 -4.16666666666667e+00
+199 1463 -4.16666666666667e+00
+199 1730 4.16666666666667e+00
+199 1464 2.08333333333333e+00
+199 1728 -8.33333333333333e+00
+200 200 3.80000000000000e+01
+200 9 2.12500000000000e+00
+200 198 -4.25000000000000e+00
+200 90 2.12500000000000e+00
+200 11 -1.26250000000000e+01
+200 193 -4.25000000000000e+00
+200 10 2.12500000000000e+00
+200 192 2.12500000000000e+00
+200 365 -6.37500000000000e+00
+200 92 -1.26250000000000e+01
+200 364 4.25000000000000e+00
+200 199 -4.25000000000000e+00
+200 91 2.12500000000000e+00
+200 363 -2.12500000000000e+00
+200 610 4.16666666666667e-02
+200 609 -8.33333333333333e-02
+200 202 -4.16666666666667e-02
+200 203 -1.25000000000000e-01
+200 201 8.33333333333333e-02
+200 1464 -4.16666666666667e+00
+200 1826 -6.25000000000000e+00
+200 1825 -2.08333333333333e+00
+200 1824 4.16666666666667e+00
+200 1462 -4.16666666666667e+00
+200 1729 4.16666666666667e+00
+200 1461 -4.16666666666667e+00
+200 1465 2.08333333333333e+00
+200 1728 4.16666666666667e+00
+201 201 1.25000000000000e+00
+201 361 8.33333333333333e-02
+201 362 8.33333333333333e-02
+201 197 8.33333333333333e-02
+201 195 -1.25000000000000e-01
+201 605 8.33333333333333e-02
+201 604 8.33333333333333e-02
+201 202 -1.66666666666667e-01
+201 603 -3.75000000000000e-01
+201 368 -8.33333333333333e-02
+201 203 -1.66666666666667e-01
+201 194 -8.33333333333333e-02
+201 365 8.33333333333333e-02
+201 199 8.33333333333333e-02
+201 367 1.66666666666667e-01
+201 364 -1.66666666666667e-01
+201 200 8.33333333333333e-02
+201 11 -8.33333333333333e-02
+201 10 4.16666666666667e-02
+201 193 -8.33333333333333e-02
+201 198 -3.75000000000000e-01
+201 611 8.33333333333333e-02
+201 95 -8.33333333333333e-02
+201 610 -4.16666666666667e-02
+201 94 4.16666666666667e-02
+201 609 -1.25000000000000e-01
+201 196 -4.16666666666667e-02
+201 366 -2.50000000000000e-01
+202 202 1.25000000000000e+00
+202 195 -4.16666666666667e-02
+202 360 8.33333333333333e-02
+202 362 -1.66666666666667e-01
+202 11 4.16666666666667e-02
+202 196 -1.25000000000000e-01
+202 605 -4.16666666666667e-02
+202 95 4.16666666666667e-02
+202 604 -1.25000000000000e-01
+202 603 8.33333333333333e-02
+202 201 -1.66666666666667e-01
+202 200 -4.16666666666667e-02
+202 198 8.33333333333333e-02
+202 194 -8.33333333333333e-02
+202 365 8.33333333333333e-02
+202 366 1.66666666666667e-01
+202 363 -1.66666666666667e-01
+202 199 -1.25000000000000e-01
+202 9 4.16666666666667e-02
+202 192 -8.33333333333333e-02
+202 611 8.33333333333333e-02
+202 203 -1.66666666666667e-01
+202 368 1.66666666666667e-01
+202 610 -1.25000000000000e-01
+202 197 8.33333333333333e-02
+202 367 -7.50000000000000e-01
+202 609 -4.16666666666667e-02
+202 93 4.16666666666667e-02
+203 203 1.25000000000000e+00
+203 361 -1.66666666666667e-01
+203 360 8.33333333333333e-02
+203 197 -3.75000000000000e-01
+203 10 4.16666666666667e-02
+203 195 8.33333333333333e-02
+203 605 -1.25000000000000e-01
+203 604 -4.16666666666667e-02
+203 94 4.16666666666667e-02
+203 603 8.33333333333333e-02
+203 366 -8.33333333333333e-02
+203 199 -4.16666666666667e-02
+203 201 -1.66666666666667e-01
+203 192 -8.33333333333333e-02
+203 363 8.33333333333333e-02
+203 193 -8.33333333333333e-02
+203 364 8.33333333333333e-02
+203 200 -1.25000000000000e-01
+203 198 8.33333333333333e-02
+203 9 -8.33333333333333e-02
+203 611 -3.75000000000000e-01
+203 196 8.33333333333333e-02
+203 368 -2.50000000000000e-01
+203 610 8.33333333333333e-02
+203 202 -1.66666666666667e-01
+203 367 1.66666666666667e-01
+203 609 8.33333333333333e-02
+203 93 -8.33333333333333e-02
+204 204 1.25000000000000e+00
+204 607 8.33333333333333e-02
+204 608 8.33333333333333e-02
+204 211 8.33333333333333e-02
+204 210 -1.25000000000000e-01
+204 206 -1.66666666666667e-01
+204 380 8.33333333333333e-02
+204 379 8.33333333333333e-02
+204 378 -3.75000000000000e-01
+204 385 -8.33333333333333e-02
+204 205 -1.66666666666667e-01
+204 209 8.33333333333333e-02
+204 217 -8.33333333333333e-02
+204 490 8.33333333333333e-02
+204 386 1.66666666666667e-01
+204 491 -1.66666666666667e-01
+204 14 4.16666666666667e-02
+204 218 -8.33333333333333e-02
+204 208 8.33333333333333e-02
+204 13 -8.33333333333333e-02
+204 207 -3.75000000000000e-01
+204 374 -4.16666666666667e-02
+204 44 4.16666666666667e-02
+204 373 8.33333333333333e-02
+204 43 -8.33333333333333e-02
+204 372 -1.25000000000000e-01
+204 212 -4.16666666666667e-02
+204 384 -2.50000000000000e-01
+205 205 1.25000000000000e+00
+205 606 8.33333333333333e-02
+205 608 -1.66666666666667e-01
+205 14 4.16666666666667e-02
+205 211 -3.75000000000000e-01
+205 210 8.33333333333333e-02
+205 380 -4.16666666666667e-02
+205 44 4.16666666666667e-02
+205 379 -1.25000000000000e-01
+205 378 8.33333333333333e-02
+205 384 -8.33333333333333e-02
+205 209 -4.16666666666667e-02
+205 204 -1.66666666666667e-01
+205 216 -8.33333333333333e-02
+205 489 8.33333333333333e-02
+205 218 -8.33333333333333e-02
+205 491 8.33333333333333e-02
+205 208 -1.25000000000000e-01
+205 207 8.33333333333333e-02
+205 12 -8.33333333333333e-02
+205 374 8.33333333333333e-02
+205 206 -1.66666666666667e-01
+205 386 1.66666666666667e-01
+205 373 -3.75000000000000e-01
+205 212 8.33333333333333e-02
+205 385 -2.50000000000000e-01
+205 372 8.33333333333333e-02
+205 42 -8.33333333333333e-02
+206 206 1.25000000000000e+00
+206 211 8.33333333333333e-02
+206 607 -1.66666666666667e-01
+206 606 8.33333333333333e-02
+206 212 -1.25000000000000e-01
+206 13 4.16666666666667e-02
+206 380 -1.25000000000000e-01
+206 379 -4.16666666666667e-02
+206 43 4.16666666666667e-02
+206 204 -1.66666666666667e-01
+206 378 8.33333333333333e-02
+206 208 -4.16666666666667e-02
+206 207 8.33333333333333e-02
+206 217 -8.33333333333333e-02
+206 490 8.33333333333333e-02
+206 384 1.66666666666667e-01
+206 489 -1.66666666666667e-01
+206 209 -1.25000000000000e-01
+206 12 4.16666666666667e-02
+206 216 -8.33333333333333e-02
+206 374 -1.25000000000000e-01
+206 210 -4.16666666666667e-02
+206 386 -7.50000000000000e-01
+206 373 8.33333333333333e-02
+206 205 -1.66666666666667e-01
+206 385 1.66666666666667e-01
+206 372 -4.16666666666667e-02
+206 42 4.16666666666667e-02
+207 207 1.25000000000000e+00
+207 214 -8.33333333333333e-02
+207 488 8.33333333333333e-02
+207 487 8.33333333333333e-02
+207 486 -3.75000000000000e-01
+207 221 -8.33333333333333e-02
+207 220 -8.33333333333333e-02
+207 494 -1.66666666666667e-01
+207 493 8.33333333333333e-02
+207 206 8.33333333333333e-02
+207 209 -1.66666666666667e-01
+207 491 1.66666666666667e-01
+207 217 8.33333333333333e-02
+207 490 -8.33333333333333e-02
+207 62 -4.16666666666667e-02
+207 374 4.16666666666667e-02
+207 61 8.33333333333333e-02
+207 373 -8.33333333333333e-02
+207 60 -1.25000000000000e-01
+207 489 -2.50000000000000e-01
+207 14 -4.16666666666667e-02
+207 218 8.33333333333333e-02
+207 208 -1.66666666666667e-01
+207 13 8.33333333333333e-02
+207 205 8.33333333333333e-02
+207 215 4.16666666666667e-02
+207 12 -1.25000000000000e-01
+207 204 -3.75000000000000e-01
+208 208 1.25000000000000e+00
+208 213 -8.33333333333333e-02
+208 488 -4.16666666666667e-02
+208 487 -1.25000000000000e-01
+208 486 8.33333333333333e-02
+208 221 -8.33333333333333e-02
+208 494 8.33333333333333e-02
+208 219 -8.33333333333333e-02
+208 492 8.33333333333333e-02
+208 206 -4.16666666666667e-02
+208 374 4.16666666666667e-02
+208 216 8.33333333333333e-02
+208 489 -8.33333333333333e-02
+208 62 8.33333333333333e-02
+208 209 -1.66666666666667e-01
+208 491 1.66666666666667e-01
+208 61 -3.75000000000000e-01
+208 490 -2.50000000000000e-01
+208 60 8.33333333333333e-02
+208 372 -8.33333333333333e-02
+208 14 8.33333333333333e-02
+208 218 -1.66666666666667e-01
+208 215 4.16666666666667e-02
+208 13 -3.75000000000000e-01
+208 205 -1.25000000000000e-01
+208 207 -1.66666666666667e-01
+208 12 8.33333333333333e-02
+208 204 8.33333333333333e-02
+209 209 1.25000000000000e+00
+209 214 4.16666666666667e-02
+209 488 -1.25000000000000e-01
+209 487 -4.16666666666667e-02
+209 486 8.33333333333333e-02
+209 219 -8.33333333333333e-02
+209 220 -8.33333333333333e-02
+209 493 8.33333333333333e-02
+209 492 -1.66666666666667e-01
+209 205 -4.16666666666667e-02
+209 373 4.16666666666667e-02
+209 204 8.33333333333333e-02
+209 207 -1.66666666666667e-01
+209 489 1.66666666666667e-01
+209 62 -1.25000000000000e-01
+209 491 -7.50000000000000e-01
+209 61 8.33333333333333e-02
+209 208 -1.66666666666667e-01
+209 490 1.66666666666667e-01
+209 60 -4.16666666666667e-02
+209 372 4.16666666666667e-02
+209 213 4.16666666666667e-02
+209 14 -1.25000000000000e-01
+209 206 -1.25000000000000e-01
+209 13 8.33333333333333e-02
+209 217 -1.66666666666667e-01
+209 12 -4.16666666666667e-02
+209 216 8.33333333333333e-02
+210 210 5.00000000000000e-01
+210 206 -4.16666666666667e-02
+210 217 4.16666666666667e-02
+210 607 -4.16666666666667e-02
+210 14 4.16666666666667e-02
+210 218 -8.33333333333333e-02
+210 13 4.16666666666667e-02
+210 211 -8.33333333333333e-02
+210 205 8.33333333333333e-02
+210 12 -1.25000000000000e-01
+210 204 -1.25000000000000e-01
+210 212 -8.33333333333333e-02
+210 89 4.16666666666667e-02
+210 608 8.33333333333333e-02
+210 88 4.16666666666667e-02
+210 379 -8.33333333333333e-02
+210 380 4.16666666666667e-02
+210 87 -1.25000000000000e-01
+210 606 -1.25000000000000e-01
+211 211 5.83333333333333e-01
+211 206 8.33333333333333e-02
+211 608 8.33333333333333e-02
+211 216 4.16666666666667e-02
+211 606 -4.16666666666667e-02
+211 14 -4.16666666666667e-02
+211 218 4.16666666666667e-02
+211 13 -4.16666666666667e-02
+211 205 -3.75000000000000e-01
+211 12 4.16666666666667e-02
+211 210 -8.33333333333333e-02
+211 204 8.33333333333333e-02
+211 89 -4.16666666666667e-02
+211 380 4.16666666666667e-02
+211 212 -1.66666666666667e-01
+211 88 -4.16666666666667e-02
+211 607 -1.25000000000000e-01
+211 87 4.16666666666667e-02
+211 378 -8.33333333333333e-02
+212 212 5.83333333333333e-01
+212 204 -4.16666666666667e-02
+212 211 -1.66666666666667e-01
+212 205 8.33333333333333e-02
+212 607 8.33333333333333e-02
+212 14 -4.16666666666667e-02
+212 206 -1.25000000000000e-01
+212 13 -4.16666666666667e-02
+212 217 4.16666666666667e-02
+212 12 4.16666666666667e-02
+212 216 -8.33333333333333e-02
+212 378 4.16666666666667e-02
+212 89 -4.16666666666667e-02
+212 608 -3.75000000000000e-01
+212 88 -4.16666666666667e-02
+212 379 4.16666666666667e-02
+212 210 -8.33333333333333e-02
+212 87 4.16666666666667e-02
+212 606 8.33333333333333e-02
+213 213 5.00000000000000e-01
+213 488 -4.16666666666667e-02
+213 622 4.16666666666667e-02
+213 220 -4.16666666666667e-02
+213 98 4.16666666666667e-02
+213 623 -8.33333333333333e-02
+213 97 4.16666666666667e-02
+213 214 -8.33333333333333e-02
+213 487 8.33333333333333e-02
+213 96 -1.25000000000000e-01
+213 486 -1.25000000000000e-01
+213 215 -8.33333333333333e-02
+213 14 4.16666666666667e-02
+213 221 8.33333333333333e-02
+213 13 4.16666666666667e-02
+213 208 -8.33333333333333e-02
+213 209 4.16666666666667e-02
+213 12 -1.25000000000000e-01
+213 219 -1.25000000000000e-01
+214 214 5.83333333333333e-01
+214 488 8.33333333333333e-02
+214 221 8.33333333333333e-02
+214 621 4.16666666666667e-02
+214 219 -4.16666666666667e-02
+214 98 -4.16666666666667e-02
+214 623 4.16666666666667e-02
+214 97 -4.16666666666667e-02
+214 487 -3.75000000000000e-01
+214 96 4.16666666666667e-02
+214 213 -8.33333333333333e-02
+214 486 8.33333333333333e-02
+214 14 -4.16666666666667e-02
+214 209 4.16666666666667e-02
+214 215 -1.66666666666667e-01
+214 13 -4.16666666666667e-02
+214 220 -1.25000000000000e-01
+214 12 4.16666666666667e-02
+214 207 -8.33333333333333e-02
+215 215 5.83333333333333e-01
+215 486 -4.16666666666667e-02
+215 214 -1.66666666666667e-01
+215 487 8.33333333333333e-02
+215 220 8.33333333333333e-02
+215 98 -4.16666666666667e-02
+215 488 -1.25000000000000e-01
+215 97 -4.16666666666667e-02
+215 622 4.16666666666667e-02
+215 96 4.16666666666667e-02
+215 621 -8.33333333333333e-02
+215 207 4.16666666666667e-02
+215 14 -4.16666666666667e-02
+215 221 -3.75000000000000e-01
+215 13 -4.16666666666667e-02
+215 208 4.16666666666667e-02
+215 213 -8.33333333333333e-02
+215 12 4.16666666666667e-02
+215 219 8.33333333333333e-02
+216 216 1.25000000000000e+00
+216 217 -1.66666666666667e-01
+216 629 -8.33333333333333e-02
+216 100 -4.16666666666667e-02
+216 628 4.16666666666667e-02
+216 221 8.33333333333333e-02
+216 13 -4.16666666666667e-02
+216 219 -3.75000000000000e-01
+216 211 4.16666666666667e-02
+216 14 8.33333333333333e-02
+216 212 -8.33333333333333e-02
+216 218 -1.66666666666667e-01
+216 608 8.33333333333333e-02
+216 101 8.33333333333333e-02
+216 607 8.33333333333333e-02
+216 606 -3.75000000000000e-01
+216 205 -8.33333333333333e-02
+216 208 8.33333333333333e-02
+216 209 8.33333333333333e-02
+216 206 -8.33333333333333e-02
+216 12 -1.25000000000000e-01
+216 491 -8.33333333333333e-02
+216 386 8.33333333333333e-02
+216 490 1.66666666666667e-01
+216 385 -1.66666666666667e-01
+216 489 -2.50000000000000e-01
+216 220 8.33333333333333e-02
+216 99 -1.25000000000000e-01
+217 217 1.25000000000000e+00
+217 629 4.16666666666667e-02
+217 219 8.33333333333333e-02
+217 216 -1.66666666666667e-01
+217 99 -4.16666666666667e-02
+217 627 4.16666666666667e-02
+217 220 -1.25000000000000e-01
+217 12 -4.16666666666667e-02
+217 210 4.16666666666667e-02
+217 212 4.16666666666667e-02
+217 608 -4.16666666666667e-02
+217 607 -1.25000000000000e-01
+217 606 8.33333333333333e-02
+217 204 -8.33333333333333e-02
+217 207 8.33333333333333e-02
+217 206 -8.33333333333333e-02
+217 386 8.33333333333333e-02
+217 209 -1.66666666666667e-01
+217 14 8.33333333333333e-02
+217 13 -1.25000000000000e-01
+217 491 1.66666666666667e-01
+217 218 -1.66666666666667e-01
+217 101 8.33333333333333e-02
+217 490 -7.50000000000000e-01
+217 221 -4.16666666666667e-02
+217 100 -1.25000000000000e-01
+217 489 1.66666666666667e-01
+217 384 -1.66666666666667e-01
+218 218 1.25000000000000e+00
+218 628 4.16666666666667e-02
+218 627 -8.33333333333333e-02
+218 221 -1.25000000000000e-01
+218 219 8.33333333333333e-02
+218 211 4.16666666666667e-02
+218 12 8.33333333333333e-02
+218 210 -8.33333333333333e-02
+218 608 -1.25000000000000e-01
+218 607 -4.16666666666667e-02
+218 216 -1.66666666666667e-01
+218 606 8.33333333333333e-02
+218 99 8.33333333333333e-02
+218 205 -8.33333333333333e-02
+218 385 8.33333333333333e-02
+218 14 -3.75000000000000e-01
+218 208 -1.66666666666667e-01
+218 13 8.33333333333333e-02
+218 207 8.33333333333333e-02
+218 204 -8.33333333333333e-02
+218 491 -2.50000000000000e-01
+218 220 -4.16666666666667e-02
+218 101 -3.75000000000000e-01
+218 490 1.66666666666667e-01
+218 217 -1.66666666666667e-01
+218 100 8.33333333333333e-02
+218 489 -8.33333333333333e-02
+218 384 8.33333333333333e-02
+219 219 1.25000000000000e+00
+219 487 8.33333333333333e-02
+219 488 8.33333333333333e-02
+219 215 8.33333333333333e-02
+219 213 -1.25000000000000e-01
+219 623 8.33333333333333e-02
+219 622 8.33333333333333e-02
+219 220 -1.66666666666667e-01
+219 621 -3.75000000000000e-01
+219 494 -8.33333333333333e-02
+219 221 -1.66666666666667e-01
+219 209 -8.33333333333333e-02
+219 491 8.33333333333333e-02
+219 217 8.33333333333333e-02
+219 493 1.66666666666667e-01
+219 490 -1.66666666666667e-01
+219 218 8.33333333333333e-02
+219 14 -8.33333333333333e-02
+219 13 4.16666666666667e-02
+219 208 -8.33333333333333e-02
+219 216 -3.75000000000000e-01
+219 629 8.33333333333333e-02
+219 104 -8.33333333333333e-02
+219 628 -4.16666666666667e-02
+219 103 4.16666666666667e-02
+219 627 -1.25000000000000e-01
+219 214 -4.16666666666667e-02
+219 492 -2.50000000000000e-01
+220 220 1.25000000000000e+00
+220 213 -4.16666666666667e-02
+220 486 8.33333333333333e-02
+220 488 -1.66666666666667e-01
+220 14 4.16666666666667e-02
+220 214 -1.25000000000000e-01
+220 623 -4.16666666666667e-02
+220 104 4.16666666666667e-02
+220 622 -1.25000000000000e-01
+220 621 8.33333333333333e-02
+220 219 -1.66666666666667e-01
+220 218 -4.16666666666667e-02
+220 216 8.33333333333333e-02
+220 209 -8.33333333333333e-02
+220 491 8.33333333333333e-02
+220 492 1.66666666666667e-01
+220 489 -1.66666666666667e-01
+220 217 -1.25000000000000e-01
+220 12 4.16666666666667e-02
+220 207 -8.33333333333333e-02
+220 629 8.33333333333333e-02
+220 221 -1.66666666666667e-01
+220 494 1.66666666666667e-01
+220 628 -1.25000000000000e-01
+220 215 8.33333333333333e-02
+220 493 -7.50000000000000e-01
+220 627 -4.16666666666667e-02
+220 102 4.16666666666667e-02
+221 221 1.25000000000000e+00
+221 487 -1.66666666666667e-01
+221 486 8.33333333333333e-02
+221 215 -3.75000000000000e-01
+221 13 4.16666666666667e-02
+221 213 8.33333333333333e-02
+221 623 -1.25000000000000e-01
+221 622 -4.16666666666667e-02
+221 103 4.16666666666667e-02
+221 621 8.33333333333333e-02
+221 492 -8.33333333333333e-02
+221 217 -4.16666666666667e-02
+221 219 -1.66666666666667e-01
+221 207 -8.33333333333333e-02
+221 489 8.33333333333333e-02
+221 208 -8.33333333333333e-02
+221 490 8.33333333333333e-02
+221 218 -1.25000000000000e-01
+221 216 8.33333333333333e-02
+221 12 -8.33333333333333e-02
+221 629 -3.75000000000000e-01
+221 214 8.33333333333333e-02
+221 494 -2.50000000000000e-01
+221 628 8.33333333333333e-02
+221 220 -1.66666666666667e-01
+221 493 1.66666666666667e-01
+221 627 8.33333333333333e-02
+221 102 -8.33333333333333e-02
+222 222 1.25000000000000e+00
+222 625 8.33333333333333e-02
+222 626 8.33333333333333e-02
+222 229 8.33333333333333e-02
+222 228 -1.25000000000000e-01
+222 224 -1.66666666666667e-01
+222 506 8.33333333333333e-02
+222 505 8.33333333333333e-02
+222 504 -3.75000000000000e-01
+222 511 -8.33333333333333e-02
+222 223 -1.66666666666667e-01
+222 227 8.33333333333333e-02
+222 232 -8.33333333333333e-02
+222 589 8.33333333333333e-02
+222 512 1.66666666666667e-01
+222 590 -1.66666666666667e-01
+222 17 4.16666666666667e-02
+222 233 -8.33333333333333e-02
+222 226 8.33333333333333e-02
+222 16 -8.33333333333333e-02
+222 225 -3.75000000000000e-01
+222 500 -4.16666666666667e-02
+222 65 4.16666666666667e-02
+222 499 8.33333333333333e-02
+222 64 -8.33333333333333e-02
+222 498 -1.25000000000000e-01
+222 230 -4.16666666666667e-02
+222 510 -2.50000000000000e-01
+223 223 1.25000000000000e+00
+223 624 8.33333333333333e-02
+223 626 -1.66666666666667e-01
+223 17 4.16666666666667e-02
+223 229 -3.75000000000000e-01
+223 228 8.33333333333333e-02
+223 506 -4.16666666666667e-02
+223 65 4.16666666666667e-02
+223 505 -1.25000000000000e-01
+223 504 8.33333333333333e-02
+223 510 -8.33333333333333e-02
+223 227 -4.16666666666667e-02
+223 222 -1.66666666666667e-01
+223 231 -8.33333333333333e-02
+223 588 8.33333333333333e-02
+223 233 -8.33333333333333e-02
+223 590 8.33333333333333e-02
+223 226 -1.25000000000000e-01
+223 225 8.33333333333333e-02
+223 15 -8.33333333333333e-02
+223 500 8.33333333333333e-02
+223 224 -1.66666666666667e-01
+223 512 1.66666666666667e-01
+223 499 -3.75000000000000e-01
+223 230 8.33333333333333e-02
+223 511 -2.50000000000000e-01
+223 498 8.33333333333333e-02
+223 63 -8.33333333333333e-02
+224 224 1.25000000000000e+00
+224 229 8.33333333333333e-02
+224 625 -1.66666666666667e-01
+224 624 8.33333333333333e-02
+224 230 -1.25000000000000e-01
+224 16 4.16666666666667e-02
+224 506 -1.25000000000000e-01
+224 505 -4.16666666666667e-02
+224 64 4.16666666666667e-02
+224 222 -1.66666666666667e-01
+224 504 8.33333333333333e-02
+224 226 -4.16666666666667e-02
+224 225 8.33333333333333e-02
+224 232 -8.33333333333333e-02
+224 589 8.33333333333333e-02
+224 510 1.66666666666667e-01
+224 588 -1.66666666666667e-01
+224 227 -1.25000000000000e-01
+224 15 4.16666666666667e-02
+224 231 -8.33333333333333e-02
+224 500 -1.25000000000000e-01
+224 228 -4.16666666666667e-02
+224 512 -7.50000000000000e-01
+224 499 8.33333333333333e-02
+224 223 -1.66666666666667e-01
+224 511 1.66666666666667e-01
+224 498 -4.16666666666667e-02
+224 63 4.16666666666667e-02
+225 225 1.25000000000000e+00
+225 16 8.33333333333333e-02
+225 226 -1.66666666666667e-01
+225 79 8.33333333333333e-02
+225 233 8.33333333333333e-02
+225 232 8.33333333333333e-02
+225 15 -1.25000000000000e-01
+225 590 1.66666666666667e-01
+225 589 -8.33333333333333e-02
+225 588 -2.50000000000000e-01
+225 78 -1.25000000000000e-01
+225 227 -1.66666666666667e-01
+225 80 -4.16666666666667e-02
+225 500 4.16666666666667e-02
+225 499 -8.33333333333333e-02
+225 17 -4.16666666666667e-02
+225 223 8.33333333333333e-02
+225 224 8.33333333333333e-02
+225 222 -3.75000000000000e-01
+225 832 -8.33333333333333e-02
+225 977 8.33333333333333e-02
+225 976 8.33333333333333e-02
+225 975 -3.75000000000000e-01
+225 836 -8.33333333333333e-02
+225 835 -8.33333333333333e-02
+225 980 -1.66666666666667e-01
+225 979 8.33333333333333e-02
+225 833 4.16666666666667e-02
+226 226 1.25000000000000e+00
+226 15 8.33333333333333e-02
+226 225 -1.66666666666667e-01
+226 78 8.33333333333333e-02
+226 233 -1.66666666666667e-01
+226 17 8.33333333333333e-02
+226 16 -3.75000000000000e-01
+226 231 8.33333333333333e-02
+226 590 1.66666666666667e-01
+226 227 -1.66666666666667e-01
+226 80 8.33333333333333e-02
+226 589 -2.50000000000000e-01
+226 79 -3.75000000000000e-01
+226 588 -8.33333333333333e-02
+226 500 4.16666666666667e-02
+226 498 -8.33333333333333e-02
+226 224 -4.16666666666667e-02
+226 223 -1.25000000000000e-01
+226 222 8.33333333333333e-02
+226 831 -8.33333333333333e-02
+226 977 -4.16666666666667e-02
+226 976 -1.25000000000000e-01
+226 975 8.33333333333333e-02
+226 836 -8.33333333333333e-02
+226 980 8.33333333333333e-02
+226 834 -8.33333333333333e-02
+226 833 4.16666666666667e-02
+226 978 8.33333333333333e-02
+227 227 1.25000000000000e+00
+227 231 8.33333333333333e-02
+227 17 -1.25000000000000e-01
+227 232 -1.66666666666667e-01
+227 16 8.33333333333333e-02
+227 590 -7.50000000000000e-01
+227 80 -1.25000000000000e-01
+227 589 1.66666666666667e-01
+227 226 -1.66666666666667e-01
+227 79 8.33333333333333e-02
+227 588 1.66666666666667e-01
+227 499 4.16666666666667e-02
+227 222 8.33333333333333e-02
+227 225 -1.66666666666667e-01
+227 78 -4.16666666666667e-02
+227 498 4.16666666666667e-02
+227 223 -4.16666666666667e-02
+227 224 -1.25000000000000e-01
+227 15 -4.16666666666667e-02
+227 832 4.16666666666667e-02
+227 977 -1.25000000000000e-01
+227 976 -4.16666666666667e-02
+227 975 8.33333333333333e-02
+227 834 -8.33333333333333e-02
+227 835 -8.33333333333333e-02
+227 979 8.33333333333333e-02
+227 831 4.16666666666667e-02
+227 978 -1.66666666666667e-01
+228 228 5.00000000000000e-01
+228 224 -4.16666666666667e-02
+228 232 4.16666666666667e-02
+228 625 -4.16666666666667e-02
+228 17 4.16666666666667e-02
+228 233 -8.33333333333333e-02
+228 16 4.16666666666667e-02
+228 229 -8.33333333333333e-02
+228 223 8.33333333333333e-02
+228 15 -1.25000000000000e-01
+228 222 -1.25000000000000e-01
+228 230 -8.33333333333333e-02
+228 98 4.16666666666667e-02
+228 626 8.33333333333333e-02
+228 97 4.16666666666667e-02
+228 505 -8.33333333333333e-02
+228 506 4.16666666666667e-02
+228 96 -1.25000000000000e-01
+228 624 -1.25000000000000e-01
+229 229 5.83333333333333e-01
+229 224 8.33333333333333e-02
+229 626 8.33333333333333e-02
+229 231 4.16666666666667e-02
+229 624 -4.16666666666667e-02
+229 17 -4.16666666666667e-02
+229 233 4.16666666666667e-02
+229 16 -4.16666666666667e-02
+229 223 -3.75000000000000e-01
+229 15 4.16666666666667e-02
+229 228 -8.33333333333333e-02
+229 222 8.33333333333333e-02
+229 98 -4.16666666666667e-02
+229 506 4.16666666666667e-02
+229 230 -1.66666666666667e-01
+229 97 -4.16666666666667e-02
+229 625 -1.25000000000000e-01
+229 96 4.16666666666667e-02
+229 504 -8.33333333333333e-02
+230 230 5.83333333333333e-01
+230 222 -4.16666666666667e-02
+230 229 -1.66666666666667e-01
+230 223 8.33333333333333e-02
+230 625 8.33333333333333e-02
+230 17 -4.16666666666667e-02
+230 224 -1.25000000000000e-01
+230 16 -4.16666666666667e-02
+230 232 4.16666666666667e-02
+230 15 4.16666666666667e-02
+230 231 -8.33333333333333e-02
+230 504 4.16666666666667e-02
+230 98 -4.16666666666667e-02
+230 626 -3.75000000000000e-01
+230 97 -4.16666666666667e-02
+230 505 4.16666666666667e-02
+230 228 -8.33333333333333e-02
+230 96 4.16666666666667e-02
+230 624 8.33333333333333e-02
+231 231 1.25000000000000e+00
+231 590 -8.33333333333333e-02
+231 232 -1.66666666666667e-01
+231 589 1.66666666666667e-01
+231 107 8.33333333333333e-02
+231 106 -4.16666666666667e-02
+231 105 -1.25000000000000e-01
+231 588 -2.50000000000000e-01
+231 233 -1.66666666666667e-01
+231 17 8.33333333333333e-02
+231 16 -4.16666666666667e-02
+231 226 8.33333333333333e-02
+231 227 8.33333333333333e-02
+231 15 -1.25000000000000e-01
+231 230 -8.33333333333333e-02
+231 626 8.33333333333333e-02
+231 625 8.33333333333333e-02
+231 624 -3.75000000000000e-01
+231 223 -8.33333333333333e-02
+231 224 -8.33333333333333e-02
+231 512 8.33333333333333e-02
+231 511 -1.66666666666667e-01
+231 229 4.16666666666667e-02
+231 835 8.33333333333333e-02
+231 1211 -8.33333333333333e-02
+231 1210 4.16666666666667e-02
+231 836 8.33333333333333e-02
+231 834 -3.75000000000000e-01
+232 232 1.25000000000000e+00
+232 231 -1.66666666666667e-01
+232 588 1.66666666666667e-01
+232 107 8.33333333333333e-02
+232 233 -1.66666666666667e-01
+232 590 1.66666666666667e-01
+232 106 -1.25000000000000e-01
+232 589 -7.50000000000000e-01
+232 105 -4.16666666666667e-02
+232 17 8.33333333333333e-02
+232 227 -1.66666666666667e-01
+232 16 -1.25000000000000e-01
+232 15 -4.16666666666667e-02
+232 225 8.33333333333333e-02
+232 230 4.16666666666667e-02
+232 626 -4.16666666666667e-02
+232 625 -1.25000000000000e-01
+232 624 8.33333333333333e-02
+232 222 -8.33333333333333e-02
+232 224 -8.33333333333333e-02
+232 512 8.33333333333333e-02
+232 228 4.16666666666667e-02
+232 510 -1.66666666666667e-01
+232 1211 4.16666666666667e-02
+232 834 8.33333333333333e-02
+232 1209 4.16666666666667e-02
+232 836 -4.16666666666667e-02
+232 835 -1.25000000000000e-01
+233 233 1.25000000000000e+00
+233 225 8.33333333333333e-02
+233 588 -8.33333333333333e-02
+233 107 -3.75000000000000e-01
+233 590 -2.50000000000000e-01
+233 106 8.33333333333333e-02
+233 232 -1.66666666666667e-01
+233 589 1.66666666666667e-01
+233 105 8.33333333333333e-02
+233 17 -3.75000000000000e-01
+233 16 8.33333333333333e-02
+233 226 -1.66666666666667e-01
+233 231 -1.66666666666667e-01
+233 15 8.33333333333333e-02
+233 228 -8.33333333333333e-02
+233 626 -1.25000000000000e-01
+233 625 -4.16666666666667e-02
+233 624 8.33333333333333e-02
+233 223 -8.33333333333333e-02
+233 511 8.33333333333333e-02
+233 222 -8.33333333333333e-02
+233 229 4.16666666666667e-02
+233 510 8.33333333333333e-02
+233 1210 4.16666666666667e-02
+233 1209 -8.33333333333333e-02
+233 835 -4.16666666666667e-02
+233 836 -1.25000000000000e-01
+233 834 8.33333333333333e-02
+234 234 2.98333333333333e+01
+234 401 -2.12500000000000e+00
+234 235 -8.33333333333333e+00
+234 400 4.25000000000000e+00
+234 47 2.12500000000000e+00
+234 46 -2.08333333333333e+00
+234 45 -2.16666666666667e+00
+234 399 -6.37500000000000e+00
+234 236 -4.25000000000000e+00
+234 20 2.12500000000000e+00
+234 19 -2.08333333333333e+00
+234 241 2.12500000000000e+00
+234 242 2.12500000000000e+00
+234 18 -2.16666666666667e+00
+234 404 8.33333333333333e-02
+234 245 -8.33333333333333e-02
+234 238 4.16666666666667e-02
+234 244 -8.33333333333333e-02
+234 239 -8.33333333333333e-02
+234 398 8.33333333333333e-02
+234 397 8.33333333333333e-02
+234 403 -1.66666666666667e-01
+234 396 -3.75000000000000e-01
+234 1498 4.16666666666667e+00
+234 1754 -4.16666666666667e+00
+234 1753 2.08333333333333e+00
+234 1499 4.16666666666667e+00
+234 1497 -1.87500000000000e+01
+235 235 2.98333333333333e+01
+235 234 -8.33333333333333e+00
+235 399 4.25000000000000e+00
+235 47 2.12500000000000e+00
+235 236 -4.25000000000000e+00
+235 401 4.25000000000000e+00
+235 46 -2.16666666666667e+00
+235 400 -1.91250000000000e+01
+235 45 -2.08333333333333e+00
+235 20 2.12500000000000e+00
+235 242 -4.25000000000000e+00
+235 19 -2.16666666666667e+00
+235 18 -2.08333333333333e+00
+235 240 2.12500000000000e+00
+235 237 4.16666666666667e-02
+235 243 -8.33333333333333e-02
+235 239 4.16666666666667e-02
+235 245 -8.33333333333333e-02
+235 398 -4.16666666666667e-02
+235 404 8.33333333333333e-02
+235 397 -1.25000000000000e-01
+235 396 8.33333333333333e-02
+235 402 -1.66666666666667e-01
+235 1499 -2.08333333333333e+00
+235 1497 4.16666666666667e+00
+235 1752 2.08333333333333e+00
+235 1754 2.08333333333333e+00
+235 1498 -6.25000000000000e+00
+236 236 2.57500000000000e+01
+236 399 -2.12500000000000e+00
+236 47 -6.50000000000000e+00
+236 401 -6.37500000000000e+00
+236 46 2.12500000000000e+00
+236 235 -4.25000000000000e+00
+236 400 4.25000000000000e+00
+236 45 2.12500000000000e+00
+236 240 2.12500000000000e+00
+236 20 -6.50000000000000e+00
+236 19 2.12500000000000e+00
+236 241 -4.25000000000000e+00
+236 234 -4.25000000000000e+00
+236 18 2.12500000000000e+00
+236 402 8.33333333333333e-02
+236 243 -8.33333333333333e-02
+236 238 4.16666666666667e-02
+236 244 -8.33333333333333e-02
+236 237 -8.33333333333333e-02
+236 398 -1.25000000000000e-01
+236 397 -4.16666666666667e-02
+236 403 8.33333333333333e-02
+236 396 8.33333333333333e-02
+236 1753 2.08333333333333e+00
+236 1498 -2.08333333333333e+00
+236 1752 -4.16666666666667e+00
+236 1499 -6.25000000000000e+00
+236 1497 4.16666666666667e+00
+237 237 5.00000000000000e-01
+237 235 4.16666666666667e-02
+237 641 4.16666666666667e-02
+237 245 -4.16666666666667e-02
+237 20 4.16666666666667e-02
+237 236 -8.33333333333333e-02
+237 19 4.16666666666667e-02
+237 238 -8.33333333333333e-02
+237 244 8.33333333333333e-02
+237 18 -1.25000000000000e-01
+237 243 -1.25000000000000e-01
+237 239 -8.33333333333333e-02
+237 110 4.16666666666667e-02
+237 398 8.33333333333333e-02
+237 109 4.16666666666667e-02
+237 640 -8.33333333333333e-02
+237 397 -4.16666666666667e-02
+237 108 -1.25000000000000e-01
+237 396 -1.25000000000000e-01
+238 238 5.83333333333333e-01
+238 234 4.16666666666667e-02
+238 398 8.33333333333333e-02
+238 239 -1.66666666666667e-01
+238 245 8.33333333333333e-02
+238 20 -4.16666666666667e-02
+238 236 4.16666666666667e-02
+238 19 -4.16666666666667e-02
+238 244 -3.75000000000000e-01
+238 18 4.16666666666667e-02
+238 237 -8.33333333333333e-02
+238 243 8.33333333333333e-02
+238 110 -4.16666666666667e-02
+238 641 4.16666666666667e-02
+238 396 -4.16666666666667e-02
+238 109 -4.16666666666667e-02
+238 397 -1.25000000000000e-01
+238 108 4.16666666666667e-02
+238 639 -8.33333333333333e-02
+239 239 5.83333333333333e-01
+239 238 -1.66666666666667e-01
+239 244 8.33333333333333e-02
+239 639 4.16666666666667e-02
+239 243 -4.16666666666667e-02
+239 20 -4.16666666666667e-02
+239 245 -1.25000000000000e-01
+239 19 -4.16666666666667e-02
+239 235 4.16666666666667e-02
+239 18 4.16666666666667e-02
+239 234 -8.33333333333333e-02
+239 397 8.33333333333333e-02
+239 110 -4.16666666666667e-02
+239 398 -3.75000000000000e-01
+239 109 -4.16666666666667e-02
+239 640 4.16666666666667e-02
+239 237 -8.33333333333333e-02
+239 108 4.16666666666667e-02
+239 396 8.33333333333333e-02
+240 240 3.39166666666667e+01
+240 235 2.12500000000000e+00
+240 401 4.25000000000000e+00
+240 400 -2.12500000000000e+00
+240 399 -6.37500000000000e+00
+240 19 2.12500000000000e+00
+240 18 -4.20833333333333e+00
+240 241 -4.25000000000000e+00
+240 112 2.12500000000000e+00
+240 236 2.12500000000000e+00
+240 111 -4.20833333333333e+00
+240 242 -1.66666666666667e-01
+240 245 8.33333333333333e-02
+240 113 -4.16666666666667e-02
+240 647 4.16666666666667e-02
+240 646 -8.33333333333333e-02
+240 20 -4.16666666666667e-02
+240 244 8.33333333333333e-02
+240 243 -3.75000000000000e-01
+240 1499 -4.16666666666667e+00
+240 1502 2.08333333333333e+00
+240 1498 -4.16666666666667e+00
+240 1765 4.16666666666667e+00
+240 1501 -4.16666666666667e+00
+240 1862 4.16666666666667e+00
+240 1766 -8.33333333333333e+00
+240 1861 4.16666666666667e+00
+240 1860 -1.87500000000000e+01
+241 241 3.80000000000000e+01
+241 20 2.12500000000000e+00
+241 234 2.12500000000000e+00
+241 401 4.25000000000000e+00
+241 242 -4.25000000000000e+00
+241 113 2.12500000000000e+00
+241 400 -6.37500000000000e+00
+241 399 -2.12500000000000e+00
+241 19 -1.26250000000000e+01
+241 18 2.12500000000000e+00
+241 236 -4.25000000000000e+00
+241 112 -1.26250000000000e+01
+241 240 -4.25000000000000e+00
+241 111 2.12500000000000e+00
+241 647 4.16666666666667e-02
+241 245 -4.16666666666667e-02
+241 645 -8.33333333333333e-02
+241 244 -1.25000000000000e-01
+241 243 8.33333333333333e-02
+241 1497 -4.16666666666667e+00
+241 1764 4.16666666666667e+00
+241 1502 2.08333333333333e+00
+241 1499 -4.16666666666667e+00
+241 1500 -4.16666666666667e+00
+241 1862 -2.08333333333333e+00
+241 1766 4.16666666666667e+00
+241 1861 -6.25000000000000e+00
+241 1860 4.16666666666667e+00
+242 242 3.39166666666667e+01
+242 235 -4.25000000000000e+00
+242 19 2.12500000000000e+00
+242 401 -1.91250000000000e+01
+242 400 4.25000000000000e+00
+242 241 -4.25000000000000e+00
+242 112 2.12500000000000e+00
+242 399 4.25000000000000e+00
+242 20 -4.20833333333333e+00
+242 234 2.12500000000000e+00
+242 113 -4.20833333333333e+00
+242 244 -4.16666666666667e-02
+242 240 -1.66666666666667e-01
+242 243 8.33333333333333e-02
+242 111 -4.16666666666667e-02
+242 645 4.16666666666667e-02
+242 646 4.16666666666667e-02
+242 245 -1.25000000000000e-01
+242 18 -4.16666666666667e-02
+242 1497 -4.16666666666667e+00
+242 1500 2.08333333333333e+00
+242 1501 2.08333333333333e+00
+242 1498 -4.16666666666667e+00
+242 1862 -6.25000000000000e+00
+242 1861 -2.08333333333333e+00
+242 1765 4.16666666666667e+00
+242 1860 4.16666666666667e+00
+242 1764 -8.33333333333333e+00
+243 243 1.25000000000000e+00
+243 401 -1.66666666666667e-01
+243 400 8.33333333333333e-02
+243 20 4.16666666666667e-02
+243 241 8.33333333333333e-02
+243 240 -3.75000000000000e-01
+243 647 -4.16666666666667e-02
+243 116 4.16666666666667e-02
+243 646 8.33333333333333e-02
+243 645 -1.25000000000000e-01
+243 236 -8.33333333333333e-02
+243 235 -8.33333333333333e-02
+243 398 8.33333333333333e-02
+243 239 -4.16666666666667e-02
+243 244 -1.66666666666667e-01
+243 397 8.33333333333333e-02
+243 403 -8.33333333333333e-02
+243 19 -8.33333333333333e-02
+243 238 8.33333333333333e-02
+243 237 -1.25000000000000e-01
+243 245 -1.66666666666667e-01
+243 641 8.33333333333333e-02
+243 404 1.66666666666667e-01
+243 640 8.33333333333333e-02
+243 115 -8.33333333333333e-02
+243 242 8.33333333333333e-02
+243 639 -3.75000000000000e-01
+243 402 -2.50000000000000e-01
+244 244 1.25000000000000e+00
+244 401 8.33333333333333e-02
+244 399 8.33333333333333e-02
+244 241 -1.25000000000000e-01
+244 240 8.33333333333333e-02
+244 647 8.33333333333333e-02
+244 245 -1.66666666666667e-01
+244 646 -3.75000000000000e-01
+244 645 8.33333333333333e-02
+244 234 -8.33333333333333e-02
+244 239 8.33333333333333e-02
+244 243 -1.66666666666667e-01
+244 398 -1.66666666666667e-01
+244 404 1.66666666666667e-01
+244 396 8.33333333333333e-02
+244 402 -8.33333333333333e-02
+244 20 4.16666666666667e-02
+244 236 -8.33333333333333e-02
+244 238 -3.75000000000000e-01
+244 18 -8.33333333333333e-02
+244 237 8.33333333333333e-02
+244 641 -4.16666666666667e-02
+244 116 4.16666666666667e-02
+244 242 -4.16666666666667e-02
+244 640 -1.25000000000000e-01
+244 403 -2.50000000000000e-01
+244 639 8.33333333333333e-02
+244 114 -8.33333333333333e-02
+245 245 1.25000000000000e+00
+245 400 8.33333333333333e-02
+245 240 8.33333333333333e-02
+245 399 -1.66666666666667e-01
+245 242 -1.25000000000000e-01
+245 18 4.16666666666667e-02
+245 647 -1.25000000000000e-01
+245 646 8.33333333333333e-02
+245 244 -1.66666666666667e-01
+245 645 -4.16666666666667e-02
+245 114 4.16666666666667e-02
+245 234 -8.33333333333333e-02
+245 238 8.33333333333333e-02
+245 396 8.33333333333333e-02
+245 237 -4.16666666666667e-02
+245 397 -1.66666666666667e-01
+245 403 1.66666666666667e-01
+245 239 -1.25000000000000e-01
+245 19 4.16666666666667e-02
+245 235 -8.33333333333333e-02
+245 241 -4.16666666666667e-02
+245 641 -1.25000000000000e-01
+245 404 -7.50000000000000e-01
+245 640 -4.16666666666667e-02
+245 115 4.16666666666667e-02
+245 243 -1.66666666666667e-01
+245 639 8.33333333333333e-02
+245 402 1.66666666666667e-01
+246 246 1.25000000000000e+00
+246 527 8.33333333333333e-02
+246 526 -1.66666666666667e-01
+246 251 8.33333333333333e-02
+246 22 4.16666666666667e-02
+246 249 -3.75000000000000e-01
+246 410 8.33333333333333e-02
+246 409 -4.16666666666667e-02
+246 49 4.16666666666667e-02
+246 408 -1.25000000000000e-01
+246 422 -8.33333333333333e-02
+246 248 -1.66666666666667e-01
+246 253 -4.16666666666667e-02
+246 260 -8.33333333333333e-02
+246 644 8.33333333333333e-02
+246 259 -8.33333333333333e-02
+246 643 8.33333333333333e-02
+246 254 8.33333333333333e-02
+246 23 -8.33333333333333e-02
+246 252 -1.25000000000000e-01
+246 416 8.33333333333333e-02
+246 50 -8.33333333333333e-02
+246 415 8.33333333333333e-02
+246 247 -1.66666666666667e-01
+246 421 1.66666666666667e-01
+246 414 -3.75000000000000e-01
+246 250 8.33333333333333e-02
+246 420 -2.50000000000000e-01
+247 247 1.25000000000000e+00
+247 527 8.33333333333333e-02
+247 249 8.33333333333333e-02
+247 525 -1.66666666666667e-01
+247 250 -1.25000000000000e-01
+247 21 4.16666666666667e-02
+247 410 8.33333333333333e-02
+247 248 -1.66666666666667e-01
+247 409 -1.25000000000000e-01
+247 408 -4.16666666666667e-02
+247 48 4.16666666666667e-02
+247 252 -4.16666666666667e-02
+247 254 8.33333333333333e-02
+247 422 1.66666666666667e-01
+247 644 -1.66666666666667e-01
+247 258 -8.33333333333333e-02
+247 642 8.33333333333333e-02
+247 23 4.16666666666667e-02
+247 260 -8.33333333333333e-02
+247 253 -1.25000000000000e-01
+247 416 -4.16666666666667e-02
+247 50 4.16666666666667e-02
+247 415 -1.25000000000000e-01
+247 251 -4.16666666666667e-02
+247 421 -7.50000000000000e-01
+247 414 8.33333333333333e-02
+247 246 -1.66666666666667e-01
+247 420 1.66666666666667e-01
+248 248 1.25000000000000e+00
+248 526 8.33333333333333e-02
+248 525 8.33333333333333e-02
+248 251 -1.25000000000000e-01
+248 249 8.33333333333333e-02
+248 410 -3.75000000000000e-01
+248 409 8.33333333333333e-02
+248 247 -1.66666666666667e-01
+248 408 8.33333333333333e-02
+248 420 -8.33333333333333e-02
+248 246 -1.66666666666667e-01
+248 253 8.33333333333333e-02
+248 258 -8.33333333333333e-02
+248 642 8.33333333333333e-02
+248 421 1.66666666666667e-01
+248 643 -1.66666666666667e-01
+248 254 -3.75000000000000e-01
+248 22 4.16666666666667e-02
+248 259 -8.33333333333333e-02
+248 252 8.33333333333333e-02
+248 21 -8.33333333333333e-02
+248 416 -1.25000000000000e-01
+248 250 -4.16666666666667e-02
+248 422 -2.50000000000000e-01
+248 415 -4.16666666666667e-02
+248 49 4.16666666666667e-02
+248 414 8.33333333333333e-02
+248 48 -8.33333333333333e-02
+249 249 1.25000000000000e+00
+249 263 -8.33333333333333e-02
+249 256 4.16666666666667e-02
+249 262 -8.33333333333333e-02
+249 257 -8.33333333333333e-02
+249 524 8.33333333333333e-02
+249 523 8.33333333333333e-02
+249 529 -1.66666666666667e-01
+249 522 -3.75000000000000e-01
+249 260 8.33333333333333e-02
+249 527 -8.33333333333333e-02
+249 250 -1.66666666666667e-01
+249 526 1.66666666666667e-01
+249 247 8.33333333333333e-02
+249 68 8.33333333333333e-02
+249 410 -8.33333333333333e-02
+249 67 -4.16666666666667e-02
+249 409 4.16666666666667e-02
+249 66 -1.25000000000000e-01
+249 525 -2.50000000000000e-01
+249 251 -1.66666666666667e-01
+249 23 8.33333333333333e-02
+249 248 8.33333333333333e-02
+249 22 -4.16666666666667e-02
+249 259 8.33333333333333e-02
+249 530 8.33333333333333e-02
+249 21 -1.25000000000000e-01
+249 246 -3.75000000000000e-01
+250 250 1.25000000000000e+00
+250 261 -8.33333333333333e-02
+250 257 4.16666666666667e-02
+250 263 -8.33333333333333e-02
+250 524 -4.16666666666667e-02
+250 530 8.33333333333333e-02
+250 523 -1.25000000000000e-01
+250 522 8.33333333333333e-02
+250 528 -1.66666666666667e-01
+250 410 4.16666666666667e-02
+250 248 -4.16666666666667e-02
+250 249 -1.66666666666667e-01
+250 525 1.66666666666667e-01
+250 246 8.33333333333333e-02
+250 68 8.33333333333333e-02
+250 251 -1.66666666666667e-01
+250 527 1.66666666666667e-01
+250 67 -1.25000000000000e-01
+250 526 -7.50000000000000e-01
+250 66 -4.16666666666667e-02
+250 408 4.16666666666667e-02
+250 23 8.33333333333333e-02
+250 260 -1.66666666666667e-01
+250 255 4.16666666666667e-02
+250 22 -1.25000000000000e-01
+250 247 -1.25000000000000e-01
+250 21 -4.16666666666667e-02
+250 258 8.33333333333333e-02
+251 251 1.25000000000000e+00
+251 261 -8.33333333333333e-02
+251 256 4.16666666666667e-02
+251 262 -8.33333333333333e-02
+251 255 -8.33333333333333e-02
+251 524 -1.25000000000000e-01
+251 523 -4.16666666666667e-02
+251 529 8.33333333333333e-02
+251 522 8.33333333333333e-02
+251 258 8.33333333333333e-02
+251 525 -8.33333333333333e-02
+251 409 4.16666666666667e-02
+251 247 -4.16666666666667e-02
+251 68 -3.75000000000000e-01
+251 527 -2.50000000000000e-01
+251 67 8.33333333333333e-02
+251 250 -1.66666666666667e-01
+251 526 1.66666666666667e-01
+251 66 8.33333333333333e-02
+251 408 -8.33333333333333e-02
+251 528 8.33333333333333e-02
+251 23 -3.75000000000000e-01
+251 248 -1.25000000000000e-01
+251 22 8.33333333333333e-02
+251 259 -1.66666666666667e-01
+251 249 -1.66666666666667e-01
+251 21 8.33333333333333e-02
+251 246 8.33333333333333e-02
+252 252 5.00000000000000e-01
+252 415 4.16666666666667e-02
+252 260 4.16666666666667e-02
+252 644 -4.16666666666667e-02
+252 110 4.16666666666667e-02
+252 416 -8.33333333333333e-02
+252 109 4.16666666666667e-02
+252 253 -8.33333333333333e-02
+252 643 8.33333333333333e-02
+252 108 -1.25000000000000e-01
+252 642 -1.25000000000000e-01
+252 254 -8.33333333333333e-02
+252 23 4.16666666666667e-02
+252 248 8.33333333333333e-02
+252 22 4.16666666666667e-02
+252 259 -8.33333333333333e-02
+252 247 -4.16666666666667e-02
+252 21 -1.25000000000000e-01
+252 246 -1.25000000000000e-01
+253 253 5.83333333333333e-01
+253 414 4.16666666666667e-02
+253 248 8.33333333333333e-02
+253 254 -1.66666666666667e-01
+253 644 8.33333333333333e-02
+253 110 -4.16666666666667e-02
+253 416 4.16666666666667e-02
+253 109 -4.16666666666667e-02
+253 643 -3.75000000000000e-01
+253 108 4.16666666666667e-02
+253 252 -8.33333333333333e-02
+253 642 8.33333333333333e-02
+253 23 -4.16666666666667e-02
+253 260 4.16666666666667e-02
+253 246 -4.16666666666667e-02
+253 22 -4.16666666666667e-02
+253 247 -1.25000000000000e-01
+253 21 4.16666666666667e-02
+253 258 -8.33333333333333e-02
+254 254 5.83333333333333e-01
+254 253 -1.66666666666667e-01
+254 643 8.33333333333333e-02
+254 258 4.16666666666667e-02
+254 642 -4.16666666666667e-02
+254 110 -4.16666666666667e-02
+254 644 -1.25000000000000e-01
+254 109 -4.16666666666667e-02
+254 415 4.16666666666667e-02
+254 108 4.16666666666667e-02
+254 414 -8.33333333333333e-02
+254 247 8.33333333333333e-02
+254 23 -4.16666666666667e-02
+254 248 -3.75000000000000e-01
+254 22 -4.16666666666667e-02
+254 259 4.16666666666667e-02
+254 252 -8.33333333333333e-02
+254 21 4.16666666666667e-02
+254 246 8.33333333333333e-02
+255 255 5.00000000000000e-01
+255 250 4.16666666666667e-02
+255 659 4.16666666666667e-02
+255 263 -4.16666666666667e-02
+255 23 4.16666666666667e-02
+255 251 -8.33333333333333e-02
+255 22 4.16666666666667e-02
+255 256 -8.33333333333333e-02
+255 262 8.33333333333333e-02
+255 21 -1.25000000000000e-01
+255 261 -1.25000000000000e-01
+255 257 -8.33333333333333e-02
+255 119 4.16666666666667e-02
+255 524 8.33333333333333e-02
+255 118 4.16666666666667e-02
+255 658 -8.33333333333333e-02
+255 523 -4.16666666666667e-02
+255 117 -1.25000000000000e-01
+255 522 -1.25000000000000e-01
+256 256 5.83333333333333e-01
+256 249 4.16666666666667e-02
+256 524 8.33333333333333e-02
+256 257 -1.66666666666667e-01
+256 263 8.33333333333333e-02
+256 23 -4.16666666666667e-02
+256 251 4.16666666666667e-02
+256 22 -4.16666666666667e-02
+256 262 -3.75000000000000e-01
+256 21 4.16666666666667e-02
+256 255 -8.33333333333333e-02
+256 261 8.33333333333333e-02
+256 119 -4.16666666666667e-02
+256 659 4.16666666666667e-02
+256 522 -4.16666666666667e-02
+256 118 -4.16666666666667e-02
+256 523 -1.25000000000000e-01
+256 117 4.16666666666667e-02
+256 657 -8.33333333333333e-02
+257 257 5.83333333333333e-01
+257 256 -1.66666666666667e-01
+257 262 8.33333333333333e-02
+257 657 4.16666666666667e-02
+257 261 -4.16666666666667e-02
+257 23 -4.16666666666667e-02
+257 263 -1.25000000000000e-01
+257 22 -4.16666666666667e-02
+257 250 4.16666666666667e-02
+257 21 4.16666666666667e-02
+257 249 -8.33333333333333e-02
+257 523 8.33333333333333e-02
+257 119 -4.16666666666667e-02
+257 524 -3.75000000000000e-01
+257 118 -4.16666666666667e-02
+257 658 4.16666666666667e-02
+257 255 -8.33333333333333e-02
+257 117 4.16666666666667e-02
+257 522 8.33333333333333e-02
+258 258 1.25000000000000e+00
+258 263 8.33333333333333e-02
+258 122 -4.16666666666667e-02
+258 665 4.16666666666667e-02
+258 664 -8.33333333333333e-02
+258 23 -4.16666666666667e-02
+258 262 8.33333333333333e-02
+258 261 -3.75000000000000e-01
+258 251 8.33333333333333e-02
+258 250 8.33333333333333e-02
+258 527 1.66666666666667e-01
+258 526 -8.33333333333333e-02
+258 525 -2.50000000000000e-01
+258 248 -8.33333333333333e-02
+258 254 4.16666666666667e-02
+258 247 -8.33333333333333e-02
+258 421 8.33333333333333e-02
+258 253 -8.33333333333333e-02
+258 22 8.33333333333333e-02
+258 21 -1.25000000000000e-01
+258 644 8.33333333333333e-02
+258 422 -1.66666666666667e-01
+258 643 8.33333333333333e-02
+258 259 -1.66666666666667e-01
+258 121 8.33333333333333e-02
+258 642 -3.75000000000000e-01
+258 260 -1.66666666666667e-01
+258 120 -1.25000000000000e-01
+259 259 1.25000000000000e+00
+259 263 -4.16666666666667e-02
+259 663 -8.33333333333333e-02
+259 262 -1.25000000000000e-01
+259 261 8.33333333333333e-02
+259 251 -1.66666666666667e-01
+259 23 8.33333333333333e-02
+259 249 8.33333333333333e-02
+259 527 1.66666666666667e-01
+259 260 -1.66666666666667e-01
+259 122 8.33333333333333e-02
+259 526 -2.50000000000000e-01
+259 525 -8.33333333333333e-02
+259 246 -8.33333333333333e-02
+259 420 8.33333333333333e-02
+259 254 4.16666666666667e-02
+259 248 -8.33333333333333e-02
+259 22 -3.75000000000000e-01
+259 252 -8.33333333333333e-02
+259 21 8.33333333333333e-02
+259 644 -4.16666666666667e-02
+259 422 8.33333333333333e-02
+259 643 -1.25000000000000e-01
+259 665 4.16666666666667e-02
+259 121 -3.75000000000000e-01
+259 642 8.33333333333333e-02
+259 258 -1.66666666666667e-01
+259 120 8.33333333333333e-02
+260 260 1.25000000000000e+00
+260 262 -4.16666666666667e-02
+260 258 -1.66666666666667e-01
+260 261 8.33333333333333e-02
+260 120 -4.16666666666667e-02
+260 663 4.16666666666667e-02
+260 263 -1.25000000000000e-01
+260 21 -4.16666666666667e-02
+260 249 8.33333333333333e-02
+260 250 -1.66666666666667e-01
+260 22 8.33333333333333e-02
+260 527 -7.50000000000000e-01
+260 526 1.66666666666667e-01
+260 259 -1.66666666666667e-01
+260 121 8.33333333333333e-02
+260 525 1.66666666666667e-01
+260 246 -8.33333333333333e-02
+260 252 4.16666666666667e-02
+260 23 -1.25000000000000e-01
+260 253 4.16666666666667e-02
+260 247 -8.33333333333333e-02
+260 644 -1.25000000000000e-01
+260 664 4.16666666666667e-02
+260 122 -1.25000000000000e-01
+260 643 -4.16666666666667e-02
+260 421 8.33333333333333e-02
+260 642 8.33333333333333e-02
+260 420 -1.66666666666667e-01
+261 261 1.25000000000000e+00
+261 527 -1.66666666666667e-01
+261 526 8.33333333333333e-02
+261 23 4.16666666666667e-02
+261 259 8.33333333333333e-02
+261 258 -3.75000000000000e-01
+261 665 -4.16666666666667e-02
+261 125 4.16666666666667e-02
+261 664 8.33333333333333e-02
+261 663 -1.25000000000000e-01
+261 251 -8.33333333333333e-02
+261 250 -8.33333333333333e-02
+261 524 8.33333333333333e-02
+261 257 -4.16666666666667e-02
+261 262 -1.66666666666667e-01
+261 523 8.33333333333333e-02
+261 529 -8.33333333333333e-02
+261 22 -8.33333333333333e-02
+261 256 8.33333333333333e-02
+261 255 -1.25000000000000e-01
+261 263 -1.66666666666667e-01
+261 659 8.33333333333333e-02
+261 530 1.66666666666667e-01
+261 658 8.33333333333333e-02
+261 124 -8.33333333333333e-02
+261 260 8.33333333333333e-02
+261 657 -3.75000000000000e-01
+261 528 -2.50000000000000e-01
+262 262 1.25000000000000e+00
+262 527 8.33333333333333e-02
+262 525 8.33333333333333e-02
+262 259 -1.25000000000000e-01
+262 258 8.33333333333333e-02
+262 665 8.33333333333333e-02
+262 263 -1.66666666666667e-01
+262 664 -3.75000000000000e-01
+262 663 8.33333333333333e-02
+262 249 -8.33333333333333e-02
+262 257 8.33333333333333e-02
+262 261 -1.66666666666667e-01
+262 524 -1.66666666666667e-01
+262 530 1.66666666666667e-01
+262 522 8.33333333333333e-02
+262 528 -8.33333333333333e-02
+262 23 4.16666666666667e-02
+262 251 -8.33333333333333e-02
+262 256 -3.75000000000000e-01
+262 21 -8.33333333333333e-02
+262 255 8.33333333333333e-02
+262 659 -4.16666666666667e-02
+262 125 4.16666666666667e-02
+262 260 -4.16666666666667e-02
+262 658 -1.25000000000000e-01
+262 529 -2.50000000000000e-01
+262 657 8.33333333333333e-02
+262 123 -8.33333333333333e-02
+263 263 1.25000000000000e+00
+263 526 8.33333333333333e-02
+263 258 8.33333333333333e-02
+263 525 -1.66666666666667e-01
+263 260 -1.25000000000000e-01
+263 21 4.16666666666667e-02
+263 665 -1.25000000000000e-01
+263 664 8.33333333333333e-02
+263 262 -1.66666666666667e-01
+263 663 -4.16666666666667e-02
+263 123 4.16666666666667e-02
+263 249 -8.33333333333333e-02
+263 256 8.33333333333333e-02
+263 522 8.33333333333333e-02
+263 255 -4.16666666666667e-02
+263 523 -1.66666666666667e-01
+263 529 1.66666666666667e-01
+263 257 -1.25000000000000e-01
+263 22 4.16666666666667e-02
+263 250 -8.33333333333333e-02
+263 259 -4.16666666666667e-02
+263 659 -1.25000000000000e-01
+263 530 -7.50000000000000e-01
+263 658 -4.16666666666667e-02
+263 124 4.16666666666667e-02
+263 261 -1.66666666666667e-01
+263 657 8.33333333333333e-02
+263 528 1.66666666666667e-01
+264 264 1.25000000000000e+00
+264 596 8.33333333333333e-02
+264 595 -1.66666666666667e-01
+264 269 8.33333333333333e-02
+264 25 4.16666666666667e-02
+264 267 -3.75000000000000e-01
+264 536 8.33333333333333e-02
+264 535 -4.16666666666667e-02
+264 70 4.16666666666667e-02
+264 534 -1.25000000000000e-01
+264 548 -8.33333333333333e-02
+264 266 -1.66666666666667e-01
+264 271 -4.16666666666667e-02
+264 275 -8.33333333333333e-02
+264 662 8.33333333333333e-02
+264 274 -8.33333333333333e-02
+264 661 8.33333333333333e-02
+264 272 8.33333333333333e-02
+264 26 -8.33333333333333e-02
+264 270 -1.25000000000000e-01
+264 542 8.33333333333333e-02
+264 71 -8.33333333333333e-02
+264 541 8.33333333333333e-02
+264 265 -1.66666666666667e-01
+264 547 1.66666666666667e-01
+264 540 -3.75000000000000e-01
+264 268 8.33333333333333e-02
+264 546 -2.50000000000000e-01
+265 265 1.25000000000000e+00
+265 596 8.33333333333333e-02
+265 267 8.33333333333333e-02
+265 594 -1.66666666666667e-01
+265 268 -1.25000000000000e-01
+265 24 4.16666666666667e-02
+265 536 8.33333333333333e-02
+265 266 -1.66666666666667e-01
+265 535 -1.25000000000000e-01
+265 534 -4.16666666666667e-02
+265 69 4.16666666666667e-02
+265 270 -4.16666666666667e-02
+265 272 8.33333333333333e-02
+265 548 1.66666666666667e-01
+265 662 -1.66666666666667e-01
+265 273 -8.33333333333333e-02
+265 660 8.33333333333333e-02
+265 26 4.16666666666667e-02
+265 275 -8.33333333333333e-02
+265 271 -1.25000000000000e-01
+265 542 -4.16666666666667e-02
+265 71 4.16666666666667e-02
+265 541 -1.25000000000000e-01
+265 269 -4.16666666666667e-02
+265 547 -7.50000000000000e-01
+265 540 8.33333333333333e-02
+265 264 -1.66666666666667e-01
+265 546 1.66666666666667e-01
+266 266 1.25000000000000e+00
+266 595 8.33333333333333e-02
+266 594 8.33333333333333e-02
+266 269 -1.25000000000000e-01
+266 267 8.33333333333333e-02
+266 536 -3.75000000000000e-01
+266 535 8.33333333333333e-02
+266 265 -1.66666666666667e-01
+266 534 8.33333333333333e-02
+266 546 -8.33333333333333e-02
+266 264 -1.66666666666667e-01
+266 271 8.33333333333333e-02
+266 273 -8.33333333333333e-02
+266 660 8.33333333333333e-02
+266 547 1.66666666666667e-01
+266 661 -1.66666666666667e-01
+266 272 -3.75000000000000e-01
+266 25 4.16666666666667e-02
+266 274 -8.33333333333333e-02
+266 270 8.33333333333333e-02
+266 24 -8.33333333333333e-02
+266 542 -1.25000000000000e-01
+266 268 -4.16666666666667e-02
+266 548 -2.50000000000000e-01
+266 541 -4.16666666666667e-02
+266 70 4.16666666666667e-02
+266 540 8.33333333333333e-02
+266 69 -8.33333333333333e-02
+267 267 1.25000000000000e+00
+267 275 8.33333333333333e-02
+267 596 -8.33333333333333e-02
+267 595 1.66666666666667e-01
+267 594 -2.50000000000000e-01
+267 26 8.33333333333333e-02
+267 24 -1.25000000000000e-01
+267 269 -1.66666666666667e-01
+267 83 8.33333333333333e-02
+267 274 8.33333333333333e-02
+267 81 -1.25000000000000e-01
+267 268 -1.66666666666667e-01
+267 265 8.33333333333333e-02
+267 536 -8.33333333333333e-02
+267 82 -4.16666666666667e-02
+267 535 4.16666666666667e-02
+267 266 8.33333333333333e-02
+267 25 -4.16666666666667e-02
+267 264 -3.75000000000000e-01
+267 1010 8.33333333333333e-02
+267 872 -8.33333333333333e-02
+267 868 4.16666666666667e-02
+267 871 -8.33333333333333e-02
+267 869 -8.33333333333333e-02
+267 1007 8.33333333333333e-02
+267 1006 8.33333333333333e-02
+267 1009 -1.66666666666667e-01
+267 1005 -3.75000000000000e-01
+268 268 1.25000000000000e+00
+268 275 -1.66666666666667e-01
+268 26 8.33333333333333e-02
+268 596 1.66666666666667e-01
+268 269 -1.66666666666667e-01
+268 83 8.33333333333333e-02
+268 595 -7.50000000000000e-01
+268 594 1.66666666666667e-01
+268 25 -1.25000000000000e-01
+268 273 8.33333333333333e-02
+268 82 -1.25000000000000e-01
+268 266 -4.16666666666667e-02
+268 267 -1.66666666666667e-01
+268 264 8.33333333333333e-02
+268 81 -4.16666666666667e-02
+268 534 4.16666666666667e-02
+268 536 4.16666666666667e-02
+268 265 -1.25000000000000e-01
+268 24 -4.16666666666667e-02
+268 867 4.16666666666667e-02
+268 870 -8.33333333333333e-02
+268 869 4.16666666666667e-02
+268 872 -8.33333333333333e-02
+268 1007 -4.16666666666667e-02
+268 1010 8.33333333333333e-02
+268 1006 -1.25000000000000e-01
+268 1005 8.33333333333333e-02
+268 1008 -1.66666666666667e-01
+269 269 1.25000000000000e+00
+269 25 8.33333333333333e-02
+269 273 8.33333333333333e-02
+269 596 -2.50000000000000e-01
+269 595 1.66666666666667e-01
+269 268 -1.66666666666667e-01
+269 82 8.33333333333333e-02
+269 594 -8.33333333333333e-02
+269 26 -3.75000000000000e-01
+269 24 8.33333333333333e-02
+269 274 -1.66666666666667e-01
+269 83 -3.75000000000000e-01
+269 267 -1.66666666666667e-01
+269 81 8.33333333333333e-02
+269 535 4.16666666666667e-02
+269 265 -4.16666666666667e-02
+269 534 -8.33333333333333e-02
+269 266 -1.25000000000000e-01
+269 264 8.33333333333333e-02
+269 1008 8.33333333333333e-02
+269 870 -8.33333333333333e-02
+269 868 4.16666666666667e-02
+269 871 -8.33333333333333e-02
+269 867 -8.33333333333333e-02
+269 1007 -1.25000000000000e-01
+269 1006 -4.16666666666667e-02
+269 1009 8.33333333333333e-02
+269 1005 8.33333333333333e-02
+270 270 5.00000000000000e-01
+270 541 4.16666666666667e-02
+270 275 4.16666666666667e-02
+270 662 -4.16666666666667e-02
+270 119 4.16666666666667e-02
+270 542 -8.33333333333333e-02
+270 118 4.16666666666667e-02
+270 271 -8.33333333333333e-02
+270 661 8.33333333333333e-02
+270 117 -1.25000000000000e-01
+270 660 -1.25000000000000e-01
+270 272 -8.33333333333333e-02
+270 26 4.16666666666667e-02
+270 266 8.33333333333333e-02
+270 25 4.16666666666667e-02
+270 274 -8.33333333333333e-02
+270 265 -4.16666666666667e-02
+270 24 -1.25000000000000e-01
+270 264 -1.25000000000000e-01
+271 271 5.83333333333333e-01
+271 540 4.16666666666667e-02
+271 266 8.33333333333333e-02
+271 272 -1.66666666666667e-01
+271 662 8.33333333333333e-02
+271 119 -4.16666666666667e-02
+271 542 4.16666666666667e-02
+271 118 -4.16666666666667e-02
+271 661 -3.75000000000000e-01
+271 117 4.16666666666667e-02
+271 270 -8.33333333333333e-02
+271 660 8.33333333333333e-02
+271 26 -4.16666666666667e-02
+271 275 4.16666666666667e-02
+271 264 -4.16666666666667e-02
+271 25 -4.16666666666667e-02
+271 265 -1.25000000000000e-01
+271 24 4.16666666666667e-02
+271 273 -8.33333333333333e-02
+272 272 5.83333333333333e-01
+272 271 -1.66666666666667e-01
+272 661 8.33333333333333e-02
+272 273 4.16666666666667e-02
+272 660 -4.16666666666667e-02
+272 119 -4.16666666666667e-02
+272 662 -1.25000000000000e-01
+272 118 -4.16666666666667e-02
+272 541 4.16666666666667e-02
+272 117 4.16666666666667e-02
+272 540 -8.33333333333333e-02
+272 265 8.33333333333333e-02
+272 26 -4.16666666666667e-02
+272 266 -3.75000000000000e-01
+272 25 -4.16666666666667e-02
+272 274 4.16666666666667e-02
+272 270 -8.33333333333333e-02
+272 24 4.16666666666667e-02
+272 264 8.33333333333333e-02
+273 273 1.25000000000000e+00
+273 595 -8.33333333333333e-02
+273 275 -1.66666666666667e-01
+273 596 1.66666666666667e-01
+273 128 -4.16666666666667e-02
+273 127 8.33333333333333e-02
+273 126 -1.25000000000000e-01
+273 594 -2.50000000000000e-01
+273 26 -4.16666666666667e-02
+273 269 8.33333333333333e-02
+273 274 -1.66666666666667e-01
+273 25 8.33333333333333e-02
+273 268 8.33333333333333e-02
+273 24 -1.25000000000000e-01
+273 266 -8.33333333333333e-02
+273 272 4.16666666666667e-02
+273 265 -8.33333333333333e-02
+273 547 8.33333333333333e-02
+273 271 -8.33333333333333e-02
+273 662 8.33333333333333e-02
+273 548 -1.66666666666667e-01
+273 661 8.33333333333333e-02
+273 660 -3.75000000000000e-01
+273 872 8.33333333333333e-02
+273 1247 4.16666666666667e-02
+273 1246 -8.33333333333333e-02
+273 871 8.33333333333333e-02
+273 870 -3.75000000000000e-01
+274 274 1.25000000000000e+00
+274 594 -8.33333333333333e-02
+274 128 8.33333333333333e-02
+274 275 -1.66666666666667e-01
+274 596 1.66666666666667e-01
+274 127 -3.75000000000000e-01
+274 595 -2.50000000000000e-01
+274 126 8.33333333333333e-02
+274 26 8.33333333333333e-02
+274 269 -1.66666666666667e-01
+274 267 8.33333333333333e-02
+274 25 -3.75000000000000e-01
+274 273 -1.66666666666667e-01
+274 24 8.33333333333333e-02
+274 264 -8.33333333333333e-02
+274 546 8.33333333333333e-02
+274 272 4.16666666666667e-02
+274 266 -8.33333333333333e-02
+274 270 -8.33333333333333e-02
+274 662 -4.16666666666667e-02
+274 548 8.33333333333333e-02
+274 661 -1.25000000000000e-01
+274 660 8.33333333333333e-02
+274 1247 4.16666666666667e-02
+274 872 -4.16666666666667e-02
+274 1245 -8.33333333333333e-02
+274 871 -1.25000000000000e-01
+274 870 8.33333333333333e-02
+275 275 1.25000000000000e+00
+275 273 -1.66666666666667e-01
+275 594 1.66666666666667e-01
+275 128 -1.25000000000000e-01
+275 596 -7.50000000000000e-01
+275 127 8.33333333333333e-02
+275 274 -1.66666666666667e-01
+275 595 1.66666666666667e-01
+275 126 -4.16666666666667e-02
+275 26 -1.25000000000000e-01
+275 25 8.33333333333333e-02
+275 268 -1.66666666666667e-01
+275 24 -4.16666666666667e-02
+275 267 8.33333333333333e-02
+275 264 -8.33333333333333e-02
+275 270 4.16666666666667e-02
+275 271 4.16666666666667e-02
+275 265 -8.33333333333333e-02
+275 662 -1.25000000000000e-01
+275 661 -4.16666666666667e-02
+275 547 8.33333333333333e-02
+275 660 8.33333333333333e-02
+275 546 -1.66666666666667e-01
+275 871 -4.16666666666667e-02
+275 870 8.33333333333333e-02
+275 1245 4.16666666666667e-02
+275 1246 4.16666666666667e-02
+275 872 -1.25000000000000e-01
+276 276 6.37500000000000e+01
+276 427 -2.12500000000000e+00
+276 53 2.12500000000000e+00
+276 426 -6.37500000000000e+00
+276 281 -2.12500000000000e+00
+276 29 2.12500000000000e+00
+276 277 -8.50000000000000e+00
+276 280 4.25000000000000e+00
+276 279 -6.37500000000000e+00
+276 434 -2.12500000000000e+00
+276 433 4.25000000000000e+00
+276 52 2.12500000000000e+00
+276 432 -6.37500000000000e+00
+276 278 -8.50000000000000e+00
+276 284 4.25000000000000e+00
+276 283 -2.12500000000000e+00
+276 28 2.12500000000000e+00
+276 428 4.25000000000000e+00
+276 282 -6.37500000000000e+00
+276 613 -1.66666666666667e-01
+276 440 1.66666666666667e-01
+276 650 -1.66666666666667e-01
+276 286 -8.33333333333333e-02
+276 649 8.33333333333333e-02
+276 287 -8.33333333333333e-02
+276 439 1.66666666666667e-01
+276 614 8.33333333333333e-02
+276 438 -7.50000000000000e-01
+276 1792 4.16666666666667e+00
+276 1793 -8.33333333333333e+00
+276 1787 -4.16666666666667e+00
+276 1799 4.16666666666667e+00
+276 1540 8.33333333333333e+00
+276 1798 -8.33333333333333e+00
+276 1786 -4.16666666666667e+00
+276 1541 8.33333333333333e+00
+276 1539 -3.75000000000000e+01
+277 277 6.37500000000000e+01
+277 426 -2.12500000000000e+00
+277 428 4.25000000000000e+00
+277 427 -6.37500000000000e+00
+277 281 4.25000000000000e+00
+277 280 -1.91250000000000e+01
+277 276 -8.50000000000000e+00
+277 279 4.25000000000000e+00
+277 278 -8.50000000000000e+00
+277 432 4.25000000000000e+00
+277 53 -4.25000000000000e+00
+277 434 4.25000000000000e+00
+277 433 -1.91250000000000e+01
+277 51 2.12500000000000e+00
+277 284 4.25000000000000e+00
+277 29 -4.25000000000000e+00
+277 283 -6.37500000000000e+00
+277 282 -2.12500000000000e+00
+277 27 2.12500000000000e+00
+277 614 8.33333333333333e-02
+277 612 -1.66666666666667e-01
+277 440 -8.33333333333333e-02
+277 287 -8.33333333333333e-02
+277 650 8.33333333333333e-02
+277 285 -8.33333333333333e-02
+277 648 8.33333333333333e-02
+277 439 -2.50000000000000e-01
+277 438 1.66666666666667e-01
+277 1793 4.16666666666667e+00
+277 1541 -4.16666666666667e+00
+277 1787 -4.16666666666667e+00
+277 1799 4.16666666666667e+00
+277 1539 8.33333333333333e+00
+277 1797 -8.33333333333333e+00
+277 1785 -4.16666666666667e+00
+277 1791 4.16666666666667e+00
+277 1540 -1.25000000000000e+01
+278 278 6.37500000000000e+01
+278 428 -1.91250000000000e+01
+278 427 4.25000000000000e+00
+278 51 2.12500000000000e+00
+278 281 -6.37500000000000e+00
+278 280 4.25000000000000e+00
+278 279 -2.12500000000000e+00
+278 27 2.12500000000000e+00
+278 277 -8.50000000000000e+00
+278 432 -2.12500000000000e+00
+278 434 -6.37500000000000e+00
+278 52 -4.25000000000000e+00
+278 433 4.25000000000000e+00
+278 426 4.25000000000000e+00
+278 284 -1.91250000000000e+01
+278 283 4.25000000000000e+00
+278 28 -4.25000000000000e+00
+278 276 -8.50000000000000e+00
+278 282 4.25000000000000e+00
+278 613 8.33333333333333e-02
+278 439 -8.33333333333333e-02
+278 286 -8.33333333333333e-02
+278 649 8.33333333333333e-02
+278 438 1.66666666666667e-01
+278 648 -1.66666666666667e-01
+278 285 -8.33333333333333e-02
+278 612 8.33333333333333e-02
+278 440 -2.50000000000000e-01
+278 1792 4.16666666666667e+00
+278 1791 -8.33333333333333e+00
+278 1540 -4.16666666666667e+00
+278 1786 -4.16666666666667e+00
+278 1798 4.16666666666667e+00
+278 1785 -4.16666666666667e+00
+278 1797 4.16666666666667e+00
+278 1541 -1.25000000000000e+01
+278 1539 8.33333333333333e+00
+279 279 3.39166666666667e+01
+279 92 2.12500000000000e+00
+279 281 -4.25000000000000e+00
+279 29 2.12500000000000e+00
+279 427 2.12500000000000e+00
+279 428 2.12500000000000e+00
+279 90 -4.20833333333333e+00
+279 278 -2.12500000000000e+00
+279 277 4.25000000000000e+00
+279 276 -6.37500000000000e+00
+279 27 -4.20833333333333e+00
+279 613 8.33333333333333e-02
+279 280 -1.66666666666667e-01
+279 287 -8.33333333333333e-02
+279 28 -4.16666666666667e-02
+279 286 4.16666666666667e-02
+279 614 8.33333333333333e-02
+279 91 -4.16666666666667e-02
+279 612 -3.75000000000000e-01
+279 1835 -4.16666666666667e+00
+279 1544 4.16666666666667e+00
+279 1543 4.16666666666667e+00
+279 1542 -1.87500000000000e+01
+279 1792 -4.16666666666667e+00
+279 1793 -4.16666666666667e+00
+279 1541 4.16666666666667e+00
+279 1540 -8.33333333333333e+00
+279 1834 2.08333333333333e+00
+280 280 3.39166666666667e+01
+280 426 2.12500000000000e+00
+280 428 -4.25000000000000e+00
+280 92 2.12500000000000e+00
+280 91 -4.20833333333333e+00
+280 278 4.25000000000000e+00
+280 281 -4.25000000000000e+00
+280 29 2.12500000000000e+00
+280 277 -1.91250000000000e+01
+280 28 -4.20833333333333e+00
+280 276 4.25000000000000e+00
+280 287 4.16666666666667e-02
+280 612 8.33333333333333e-02
+280 279 -1.66666666666667e-01
+280 27 -4.16666666666667e-02
+280 285 4.16666666666667e-02
+280 614 -4.16666666666667e-02
+280 613 -1.25000000000000e-01
+280 90 -4.16666666666667e-02
+280 1835 2.08333333333333e+00
+280 1544 -2.08333333333333e+00
+280 1543 -6.25000000000000e+00
+280 1542 4.16666666666667e+00
+280 1791 -4.16666666666667e+00
+280 1793 -4.16666666666667e+00
+280 1541 4.16666666666667e+00
+280 1833 2.08333333333333e+00
+280 1539 -8.33333333333333e+00
+281 281 3.80000000000000e+01
+281 90 2.12500000000000e+00
+281 279 -4.25000000000000e+00
+281 27 2.12500000000000e+00
+281 92 -1.26250000000000e+01
+281 427 -4.25000000000000e+00
+281 91 2.12500000000000e+00
+281 426 2.12500000000000e+00
+281 278 -6.37500000000000e+00
+281 29 -1.26250000000000e+01
+281 277 4.25000000000000e+00
+281 280 -4.25000000000000e+00
+281 28 2.12500000000000e+00
+281 276 -2.12500000000000e+00
+281 286 4.16666666666667e-02
+281 285 -8.33333333333333e-02
+281 613 -4.16666666666667e-02
+281 614 -1.25000000000000e-01
+281 612 8.33333333333333e-02
+281 1833 -4.16666666666667e+00
+281 1544 -6.25000000000000e+00
+281 1543 -2.08333333333333e+00
+281 1542 4.16666666666667e+00
+281 1792 -4.16666666666667e+00
+281 1540 4.16666666666667e+00
+281 1791 -4.16666666666667e+00
+281 1834 2.08333333333333e+00
+281 1539 4.16666666666667e+00
+282 282 3.39166666666667e+01
+282 433 2.12500000000000e+00
+282 278 4.25000000000000e+00
+282 277 -2.12500000000000e+00
+282 276 -6.37500000000000e+00
+282 112 2.12500000000000e+00
+282 111 -4.20833333333333e+00
+282 283 -4.25000000000000e+00
+282 28 2.12500000000000e+00
+282 434 2.12500000000000e+00
+282 27 -4.20833333333333e+00
+282 284 -1.66666666666667e-01
+282 650 8.33333333333333e-02
+282 29 -4.16666666666667e-02
+282 287 4.16666666666667e-02
+282 286 -8.33333333333333e-02
+282 113 -4.16666666666667e-02
+282 649 8.33333333333333e-02
+282 648 -3.75000000000000e-01
+282 1799 -4.16666666666667e+00
+282 1871 2.08333333333333e+00
+282 1798 -4.16666666666667e+00
+282 1540 4.16666666666667e+00
+282 1870 -4.16666666666667e+00
+282 1547 4.16666666666667e+00
+282 1541 -8.33333333333333e+00
+282 1546 4.16666666666667e+00
+282 1545 -1.87500000000000e+01
+283 283 3.80000000000000e+01
+283 113 2.12500000000000e+00
+283 432 2.12500000000000e+00
+283 278 4.25000000000000e+00
+283 284 -4.25000000000000e+00
+283 29 2.12500000000000e+00
+283 277 -6.37500000000000e+00
+283 276 -2.12500000000000e+00
+283 112 -1.26250000000000e+01
+283 111 2.12500000000000e+00
+283 434 -4.25000000000000e+00
+283 28 -1.26250000000000e+01
+283 282 -4.25000000000000e+00
+283 27 2.12500000000000e+00
+283 287 4.16666666666667e-02
+283 650 -4.16666666666667e-02
+283 285 -8.33333333333333e-02
+283 649 -1.25000000000000e-01
+283 648 8.33333333333333e-02
+283 1797 -4.16666666666667e+00
+283 1539 4.16666666666667e+00
+283 1871 2.08333333333333e+00
+283 1799 -4.16666666666667e+00
+283 1869 -4.16666666666667e+00
+283 1547 -2.08333333333333e+00
+283 1541 4.16666666666667e+00
+283 1546 -6.25000000000000e+00
+283 1545 4.16666666666667e+00
+284 284 3.39166666666667e+01
+284 433 -4.25000000000000e+00
+284 112 2.12500000000000e+00
+284 278 -1.91250000000000e+01
+284 277 4.25000000000000e+00
+284 283 -4.25000000000000e+00
+284 28 2.12500000000000e+00
+284 276 4.25000000000000e+00
+284 113 -4.20833333333333e+00
+284 432 2.12500000000000e+00
+284 29 -4.20833333333333e+00
+284 649 -4.16666666666667e-02
+284 282 -1.66666666666667e-01
+284 648 8.33333333333333e-02
+284 27 -4.16666666666667e-02
+284 285 4.16666666666667e-02
+284 286 4.16666666666667e-02
+284 650 -1.25000000000000e-01
+284 111 -4.16666666666667e-02
+284 1797 -4.16666666666667e+00
+284 1869 2.08333333333333e+00
+284 1870 2.08333333333333e+00
+284 1798 -4.16666666666667e+00
+284 1547 -6.25000000000000e+00
+284 1546 -2.08333333333333e+00
+284 1540 4.16666666666667e+00
+284 1545 4.16666666666667e+00
+284 1539 -8.33333333333333e+00
+285 285 7.50000000000000e-01
+285 281 -8.33333333333333e-02
+285 280 4.16666666666667e-02
+285 287 -8.33333333333333e-02
+285 614 8.33333333333333e-02
+285 131 4.16666666666667e-02
+285 613 -4.16666666666667e-02
+285 612 -1.25000000000000e-01
+285 277 -8.33333333333333e-02
+285 439 8.33333333333333e-02
+285 284 4.16666666666667e-02
+285 278 -8.33333333333333e-02
+285 28 4.16666666666667e-02
+285 283 -8.33333333333333e-02
+285 27 -2.50000000000000e-01
+285 650 -4.16666666666667e-02
+285 440 8.33333333333333e-02
+285 286 -8.33333333333333e-02
+285 649 8.33333333333333e-02
+285 130 4.16666666666667e-02
+285 29 4.16666666666667e-02
+285 648 -1.25000000000000e-01
+285 129 -2.50000000000000e-01
+286 286 6.66666666666667e-01
+286 279 4.16666666666667e-02
+286 614 8.33333333333333e-02
+286 613 -1.25000000000000e-01
+286 612 -4.16666666666667e-02
+286 284 4.16666666666667e-02
+286 278 -8.33333333333333e-02
+286 276 -8.33333333333333e-02
+286 438 8.33333333333333e-02
+286 28 -8.33333333333333e-02
+286 27 4.16666666666667e-02
+286 282 -8.33333333333333e-02
+286 650 8.33333333333333e-02
+286 440 -1.66666666666667e-01
+286 281 4.16666666666667e-02
+286 649 -3.75000000000000e-01
+286 130 -8.33333333333333e-02
+286 285 -8.33333333333333e-02
+286 648 8.33333333333333e-02
+286 129 4.16666666666667e-02
+287 287 6.66666666666667e-01
+287 27 4.16666666666667e-02
+287 279 -8.33333333333333e-02
+287 614 -3.75000000000000e-01
+287 613 8.33333333333333e-02
+287 285 -8.33333333333333e-02
+287 612 8.33333333333333e-02
+287 129 4.16666666666667e-02
+287 283 4.16666666666667e-02
+287 277 -8.33333333333333e-02
+287 29 -8.33333333333333e-02
+287 282 4.16666666666667e-02
+287 276 -8.33333333333333e-02
+287 280 4.16666666666667e-02
+287 650 -1.25000000000000e-01
+287 131 -8.33333333333333e-02
+287 649 8.33333333333333e-02
+287 439 -1.66666666666667e-01
+287 648 -4.16666666666667e-02
+287 438 8.33333333333333e-02
+288 288 2.50000000000000e+00
+288 295 1.66666666666667e-01
+288 294 -2.50000000000000e-01
+288 446 -1.66666666666667e-01
+288 445 8.33333333333333e-02
+288 458 1.66666666666667e-01
+288 307 8.33333333333333e-02
+288 457 1.66666666666667e-01
+288 456 -7.50000000000000e-01
+288 308 8.33333333333333e-02
+288 448 -8.33333333333333e-02
+288 449 1.66666666666667e-01
+288 290 -3.33333333333333e-01
+288 56 -8.33333333333333e-02
+288 447 -2.50000000000000e-01
+288 299 8.33333333333333e-02
+288 32 -8.33333333333333e-02
+288 298 -1.66666666666667e-01
+288 443 8.33333333333333e-02
+288 292 1.66666666666667e-01
+288 289 -3.33333333333333e-01
+288 293 1.66666666666667e-01
+288 31 -8.33333333333333e-02
+288 291 -7.50000000000000e-01
+288 442 8.33333333333333e-02
+288 55 -8.33333333333333e-02
+288 455 -8.33333333333333e-02
+288 452 8.33333333333333e-02
+288 304 8.33333333333333e-02
+288 301 -8.33333333333333e-02
+288 451 -1.66666666666667e-01
+288 454 1.66666666666667e-01
+288 453 -2.50000000000000e-01
+288 302 1.66666666666667e-01
+288 305 -1.66666666666667e-01
+288 300 -2.50000000000000e-01
+288 296 -8.33333333333333e-02
+289 289 2.50000000000000e+00
+289 294 1.66666666666667e-01
+289 296 1.66666666666667e-01
+289 295 -7.50000000000000e-01
+289 444 8.33333333333333e-02
+289 458 -8.33333333333333e-02
+289 306 8.33333333333333e-02
+289 457 -2.50000000000000e-01
+289 456 1.66666666666667e-01
+289 308 -1.66666666666667e-01
+289 447 -8.33333333333333e-02
+289 299 8.33333333333333e-02
+289 449 1.66666666666667e-01
+289 448 -2.50000000000000e-01
+289 297 -1.66666666666667e-01
+289 293 -8.33333333333333e-02
+289 291 1.66666666666667e-01
+289 288 -3.33333333333333e-01
+289 292 -2.50000000000000e-01
+289 30 -8.33333333333333e-02
+289 443 -1.66666666666667e-01
+289 441 8.33333333333333e-02
+289 54 -8.33333333333333e-02
+289 455 1.66666666666667e-01
+289 290 -3.33333333333333e-01
+289 302 1.66666666666667e-01
+289 303 8.33333333333333e-02
+289 300 -8.33333333333333e-02
+289 452 8.33333333333333e-02
+289 56 -8.33333333333333e-02
+289 454 -7.50000000000000e-01
+289 450 -1.66666666666667e-01
+289 453 1.66666666666667e-01
+289 305 8.33333333333333e-02
+289 32 -8.33333333333333e-02
+289 301 -2.50000000000000e-01
+289 446 8.33333333333333e-02
+290 290 2.50000000000000e+00
+290 445 8.33333333333333e-02
+290 296 -2.50000000000000e-01
+290 295 1.66666666666667e-01
+290 444 -1.66666666666667e-01
+290 457 -8.33333333333333e-02
+290 456 1.66666666666667e-01
+290 458 -2.50000000000000e-01
+290 307 -1.66666666666667e-01
+290 306 8.33333333333333e-02
+290 298 8.33333333333333e-02
+290 447 1.66666666666667e-01
+290 288 -3.33333333333333e-01
+290 449 -7.50000000000000e-01
+290 448 1.66666666666667e-01
+290 54 -8.33333333333333e-02
+290 297 8.33333333333333e-02
+290 30 -8.33333333333333e-02
+290 292 -8.33333333333333e-02
+290 441 8.33333333333333e-02
+290 293 -2.50000000000000e-01
+290 291 1.66666666666667e-01
+290 442 -1.66666666666667e-01
+290 453 -8.33333333333333e-02
+290 450 8.33333333333333e-02
+290 454 1.66666666666667e-01
+290 289 -3.33333333333333e-01
+290 301 1.66666666666667e-01
+290 455 -2.50000000000000e-01
+290 451 8.33333333333333e-02
+290 55 -8.33333333333333e-02
+290 302 -7.50000000000000e-01
+290 294 -8.33333333333333e-02
+290 304 8.33333333333333e-02
+290 31 -8.33333333333333e-02
+290 300 1.66666666666667e-01
+290 303 -1.66666666666667e-01
+291 291 2.50000000000000e+00
+291 631 -1.66666666666667e-01
+291 566 1.66666666666667e-01
+291 668 -1.66666666666667e-01
+291 310 -8.33333333333333e-02
+291 667 8.33333333333333e-02
+291 311 -8.33333333333333e-02
+291 565 1.66666666666667e-01
+291 564 -7.50000000000000e-01
+291 554 1.66666666666667e-01
+291 448 8.33333333333333e-02
+291 553 -8.33333333333333e-02
+291 449 -1.66666666666667e-01
+291 74 8.33333333333333e-02
+291 552 -2.50000000000000e-01
+291 299 -8.33333333333333e-02
+291 32 8.33333333333333e-02
+291 292 -3.33333333333333e-01
+291 298 1.66666666666667e-01
+291 297 -2.50000000000000e-01
+291 560 -8.33333333333333e-02
+291 559 1.66666666666667e-01
+291 443 -8.33333333333333e-02
+291 455 8.33333333333333e-02
+291 289 1.66666666666667e-01
+291 454 -1.66666666666667e-01
+291 73 8.33333333333333e-02
+291 442 -8.33333333333333e-02
+291 558 -2.50000000000000e-01
+291 293 -3.33333333333333e-01
+291 305 1.66666666666667e-01
+291 290 1.66666666666667e-01
+291 304 -8.33333333333333e-02
+291 31 8.33333333333333e-02
+291 632 8.33333333333333e-02
+291 303 -2.50000000000000e-01
+291 288 -7.50000000000000e-01
+292 292 2.50000000000000e+00
+292 630 -1.66666666666667e-01
+292 566 -8.33333333333333e-02
+292 311 -8.33333333333333e-02
+292 668 8.33333333333333e-02
+292 309 -8.33333333333333e-02
+292 666 8.33333333333333e-02
+292 565 -2.50000000000000e-01
+292 564 1.66666666666667e-01
+292 447 8.33333333333333e-02
+292 552 -8.33333333333333e-02
+292 449 8.33333333333333e-02
+292 554 1.66666666666667e-01
+292 553 -2.50000000000000e-01
+292 299 1.66666666666667e-01
+292 298 -7.50000000000000e-01
+292 291 -3.33333333333333e-01
+292 297 1.66666666666667e-01
+292 290 -8.33333333333333e-02
+292 293 -3.33333333333333e-01
+292 443 -8.33333333333333e-02
+292 455 8.33333333333333e-02
+292 558 1.66666666666667e-01
+292 288 1.66666666666667e-01
+292 453 -1.66666666666667e-01
+292 74 -1.66666666666667e-01
+292 560 1.66666666666667e-01
+292 559 -7.50000000000000e-01
+292 72 8.33333333333333e-02
+292 441 -8.33333333333333e-02
+292 305 1.66666666666667e-01
+292 32 -1.66666666666667e-01
+292 632 8.33333333333333e-02
+292 304 -2.50000000000000e-01
+292 289 -2.50000000000000e-01
+292 303 -8.33333333333333e-02
+292 30 8.33333333333333e-02
+293 293 2.50000000000000e+00
+293 631 8.33333333333333e-02
+293 565 -8.33333333333333e-02
+293 310 -8.33333333333333e-02
+293 667 8.33333333333333e-02
+293 564 1.66666666666667e-01
+293 666 -1.66666666666667e-01
+293 309 -8.33333333333333e-02
+293 566 -2.50000000000000e-01
+293 552 1.66666666666667e-01
+293 448 8.33333333333333e-02
+293 447 -1.66666666666667e-01
+293 554 -7.50000000000000e-01
+293 553 1.66666666666667e-01
+293 72 8.33333333333333e-02
+293 299 -2.50000000000000e-01
+293 298 1.66666666666667e-01
+293 297 -8.33333333333333e-02
+293 30 8.33333333333333e-02
+293 289 -8.33333333333333e-02
+293 292 -3.33333333333333e-01
+293 558 -8.33333333333333e-02
+293 442 -8.33333333333333e-02
+293 454 8.33333333333333e-02
+293 441 -8.33333333333333e-02
+293 453 8.33333333333333e-02
+293 560 -2.50000000000000e-01
+293 73 -1.66666666666667e-01
+293 559 1.66666666666667e-01
+293 630 8.33333333333333e-02
+293 305 -7.50000000000000e-01
+293 290 -2.50000000000000e-01
+293 304 1.66666666666667e-01
+293 31 -1.66666666666667e-01
+293 291 -3.33333333333333e-01
+293 303 1.66666666666667e-01
+293 288 1.66666666666667e-01
+294 294 1.25000000000000e+00
+294 448 8.33333333333333e-02
+294 449 8.33333333333333e-02
+294 617 8.33333333333333e-02
+294 615 -1.25000000000000e-01
+294 299 8.33333333333333e-02
+294 298 8.33333333333333e-02
+294 295 -1.66666666666667e-01
+294 297 -3.75000000000000e-01
+294 290 -8.33333333333333e-02
+294 296 -1.66666666666667e-01
+294 446 -8.33333333333333e-02
+294 458 8.33333333333333e-02
+294 619 8.33333333333333e-02
+294 289 1.66666666666667e-01
+294 457 -1.66666666666667e-01
+294 620 8.33333333333333e-02
+294 95 -8.33333333333333e-02
+294 94 4.16666666666667e-02
+294 445 -8.33333333333333e-02
+294 618 -3.75000000000000e-01
+294 308 8.33333333333333e-02
+294 32 -8.33333333333333e-02
+294 307 -4.16666666666667e-02
+294 31 4.16666666666667e-02
+294 306 -1.25000000000000e-01
+294 616 -4.16666666666667e-02
+294 288 -2.50000000000000e-01
+295 295 1.25000000000000e+00
+295 615 -4.16666666666667e-02
+295 447 8.33333333333333e-02
+295 449 -1.66666666666667e-01
+295 95 4.16666666666667e-02
+295 616 -1.25000000000000e-01
+295 299 -4.16666666666667e-02
+295 32 4.16666666666667e-02
+295 298 -1.25000000000000e-01
+295 297 8.33333333333333e-02
+295 294 -1.66666666666667e-01
+295 620 -4.16666666666667e-02
+295 618 8.33333333333333e-02
+295 446 -8.33333333333333e-02
+295 458 8.33333333333333e-02
+295 288 1.66666666666667e-01
+295 456 -1.66666666666667e-01
+295 619 -1.25000000000000e-01
+295 93 4.16666666666667e-02
+295 444 -8.33333333333333e-02
+295 308 8.33333333333333e-02
+295 296 -1.66666666666667e-01
+295 290 1.66666666666667e-01
+295 307 -1.25000000000000e-01
+295 617 8.33333333333333e-02
+295 289 -7.50000000000000e-01
+295 306 -4.16666666666667e-02
+295 30 4.16666666666667e-02
+296 296 1.25000000000000e+00
+296 448 -1.66666666666667e-01
+296 447 8.33333333333333e-02
+296 617 -3.75000000000000e-01
+296 94 4.16666666666667e-02
+296 615 8.33333333333333e-02
+296 299 -1.25000000000000e-01
+296 298 -4.16666666666667e-02
+296 31 4.16666666666667e-02
+296 297 8.33333333333333e-02
+296 288 -8.33333333333333e-02
+296 619 -4.16666666666667e-02
+296 294 -1.66666666666667e-01
+296 444 -8.33333333333333e-02
+296 456 8.33333333333333e-02
+296 445 -8.33333333333333e-02
+296 457 8.33333333333333e-02
+296 620 -1.25000000000000e-01
+296 618 8.33333333333333e-02
+296 93 -8.33333333333333e-02
+296 308 -3.75000000000000e-01
+296 616 8.33333333333333e-02
+296 290 -2.50000000000000e-01
+296 307 8.33333333333333e-02
+296 295 -1.66666666666667e-01
+296 289 1.66666666666667e-01
+296 306 8.33333333333333e-02
+296 30 -8.33333333333333e-02
+297 297 1.25000000000000e+00
+297 298 -1.66666666666667e-01
+297 311 -8.33333333333333e-02
+297 31 -4.16666666666667e-02
+297 310 4.16666666666667e-02
+297 632 8.33333333333333e-02
+297 100 -4.16666666666667e-02
+297 630 -3.75000000000000e-01
+297 616 4.16666666666667e-02
+297 101 8.33333333333333e-02
+297 617 -8.33333333333333e-02
+297 299 -1.66666666666667e-01
+297 296 8.33333333333333e-02
+297 32 8.33333333333333e-02
+297 295 8.33333333333333e-02
+297 294 -3.75000000000000e-01
+297 448 -8.33333333333333e-02
+297 553 8.33333333333333e-02
+297 554 8.33333333333333e-02
+297 449 -8.33333333333333e-02
+297 99 -1.25000000000000e-01
+297 293 -8.33333333333333e-02
+297 290 8.33333333333333e-02
+297 292 1.66666666666667e-01
+297 289 -1.66666666666667e-01
+297 291 -2.50000000000000e-01
+297 631 8.33333333333333e-02
+297 30 -1.25000000000000e-01
+298 298 1.25000000000000e+00
+298 311 4.16666666666667e-02
+298 630 8.33333333333333e-02
+298 297 -1.66666666666667e-01
+298 30 -4.16666666666667e-02
+298 309 4.16666666666667e-02
+298 631 -1.25000000000000e-01
+298 99 -4.16666666666667e-02
+298 615 4.16666666666667e-02
+298 617 4.16666666666667e-02
+298 296 -4.16666666666667e-02
+298 295 -1.25000000000000e-01
+298 294 8.33333333333333e-02
+298 447 -8.33333333333333e-02
+298 552 8.33333333333333e-02
+298 449 -8.33333333333333e-02
+298 290 8.33333333333333e-02
+298 554 -1.66666666666667e-01
+298 101 8.33333333333333e-02
+298 100 -1.25000000000000e-01
+298 293 1.66666666666667e-01
+298 299 -1.66666666666667e-01
+298 32 8.33333333333333e-02
+298 292 -7.50000000000000e-01
+298 632 -4.16666666666667e-02
+298 31 -1.25000000000000e-01
+298 291 1.66666666666667e-01
+298 288 -1.66666666666667e-01
+299 299 1.25000000000000e+00
+299 310 4.16666666666667e-02
+299 309 -8.33333333333333e-02
+299 632 -1.25000000000000e-01
+299 630 8.33333333333333e-02
+299 616 4.16666666666667e-02
+299 99 8.33333333333333e-02
+299 615 -8.33333333333333e-02
+299 296 -1.25000000000000e-01
+299 295 -4.16666666666667e-02
+299 297 -1.66666666666667e-01
+299 294 8.33333333333333e-02
+299 30 8.33333333333333e-02
+299 448 -8.33333333333333e-02
+299 289 8.33333333333333e-02
+299 101 -3.75000000000000e-01
+299 553 -1.66666666666667e-01
+299 100 8.33333333333333e-02
+299 552 8.33333333333333e-02
+299 447 -8.33333333333333e-02
+299 293 -2.50000000000000e-01
+299 631 -4.16666666666667e-02
+299 32 -3.75000000000000e-01
+299 292 1.66666666666667e-01
+299 298 -1.66666666666667e-01
+299 31 8.33333333333333e-02
+299 291 -8.33333333333333e-02
+299 288 8.33333333333333e-02
+300 300 1.25000000000000e+00
+300 458 -1.66666666666667e-01
+300 457 8.33333333333333e-02
+300 116 4.16666666666667e-02
+300 655 8.33333333333333e-02
+300 654 -3.75000000000000e-01
+300 308 -4.16666666666667e-02
+300 32 4.16666666666667e-02
+300 307 8.33333333333333e-02
+300 306 -1.25000000000000e-01
+300 452 -8.33333333333333e-02
+300 451 -8.33333333333333e-02
+300 455 8.33333333333333e-02
+300 653 -4.16666666666667e-02
+300 301 -1.66666666666667e-01
+300 454 8.33333333333333e-02
+300 289 -8.33333333333333e-02
+300 115 -8.33333333333333e-02
+300 652 8.33333333333333e-02
+300 651 -1.25000000000000e-01
+300 302 -1.66666666666667e-01
+300 305 8.33333333333333e-02
+300 290 1.66666666666667e-01
+300 304 8.33333333333333e-02
+300 31 -8.33333333333333e-02
+300 656 8.33333333333333e-02
+300 303 -3.75000000000000e-01
+300 288 -2.50000000000000e-01
+301 301 1.25000000000000e+00
+301 458 8.33333333333333e-02
+301 456 8.33333333333333e-02
+301 655 -1.25000000000000e-01
+301 654 8.33333333333333e-02
+301 308 8.33333333333333e-02
+301 302 -1.66666666666667e-01
+301 307 -3.75000000000000e-01
+301 306 8.33333333333333e-02
+301 450 -8.33333333333333e-02
+301 653 8.33333333333333e-02
+301 300 -1.66666666666667e-01
+301 455 -1.66666666666667e-01
+301 290 1.66666666666667e-01
+301 453 8.33333333333333e-02
+301 288 -8.33333333333333e-02
+301 116 4.16666666666667e-02
+301 452 -8.33333333333333e-02
+301 652 -3.75000000000000e-01
+301 114 -8.33333333333333e-02
+301 651 8.33333333333333e-02
+301 305 -4.16666666666667e-02
+301 32 4.16666666666667e-02
+301 656 -4.16666666666667e-02
+301 304 -1.25000000000000e-01
+301 289 -2.50000000000000e-01
+301 303 8.33333333333333e-02
+301 30 -8.33333333333333e-02
+302 302 1.25000000000000e+00
+302 457 8.33333333333333e-02
+302 654 8.33333333333333e-02
+302 456 -1.66666666666667e-01
+302 656 -1.25000000000000e-01
+302 114 4.16666666666667e-02
+302 308 -1.25000000000000e-01
+302 307 8.33333333333333e-02
+302 301 -1.66666666666667e-01
+302 306 -4.16666666666667e-02
+302 30 4.16666666666667e-02
+302 450 -8.33333333333333e-02
+302 652 8.33333333333333e-02
+302 453 8.33333333333333e-02
+302 651 -4.16666666666667e-02
+302 454 -1.66666666666667e-01
+302 289 1.66666666666667e-01
+302 653 -1.25000000000000e-01
+302 115 4.16666666666667e-02
+302 451 -8.33333333333333e-02
+302 655 -4.16666666666667e-02
+302 305 -1.25000000000000e-01
+302 290 -7.50000000000000e-01
+302 304 -4.16666666666667e-02
+302 31 4.16666666666667e-02
+302 300 -1.66666666666667e-01
+302 303 8.33333333333333e-02
+302 288 1.66666666666667e-01
+303 303 1.25000000000000e+00
+303 668 8.33333333333333e-02
+303 32 -4.16666666666667e-02
+303 311 4.16666666666667e-02
+303 310 -8.33333333333333e-02
+303 122 -4.16666666666667e-02
+303 667 8.33333333333333e-02
+303 666 -3.75000000000000e-01
+303 560 8.33333333333333e-02
+303 559 8.33333333333333e-02
+303 293 1.66666666666667e-01
+303 292 -8.33333333333333e-02
+303 291 -2.50000000000000e-01
+303 455 -8.33333333333333e-02
+303 653 4.16666666666667e-02
+303 454 -8.33333333333333e-02
+303 289 8.33333333333333e-02
+303 652 -8.33333333333333e-02
+303 121 8.33333333333333e-02
+303 120 -1.25000000000000e-01
+303 302 8.33333333333333e-02
+303 290 -1.66666666666667e-01
+303 301 8.33333333333333e-02
+303 304 -1.66666666666667e-01
+303 31 8.33333333333333e-02
+303 300 -3.75000000000000e-01
+303 305 -1.66666666666667e-01
+303 30 -1.25000000000000e-01
+304 304 1.25000000000000e+00
+304 668 -4.16666666666667e-02
+304 309 -8.33333333333333e-02
+304 667 -1.25000000000000e-01
+304 666 8.33333333333333e-02
+304 560 -1.66666666666667e-01
+304 122 8.33333333333333e-02
+304 558 8.33333333333333e-02
+304 293 1.66666666666667e-01
+304 305 -1.66666666666667e-01
+304 32 8.33333333333333e-02
+304 292 -2.50000000000000e-01
+304 291 -8.33333333333333e-02
+304 453 -8.33333333333333e-02
+304 288 8.33333333333333e-02
+304 653 4.16666666666667e-02
+304 455 -8.33333333333333e-02
+304 121 -3.75000000000000e-01
+304 651 -8.33333333333333e-02
+304 120 8.33333333333333e-02
+304 302 -4.16666666666667e-02
+304 290 8.33333333333333e-02
+304 301 -1.25000000000000e-01
+304 311 4.16666666666667e-02
+304 31 -3.75000000000000e-01
+304 300 8.33333333333333e-02
+304 303 -1.66666666666667e-01
+304 30 8.33333333333333e-02
+305 305 1.25000000000000e+00
+305 667 -4.16666666666667e-02
+305 303 -1.66666666666667e-01
+305 666 8.33333333333333e-02
+305 30 -4.16666666666667e-02
+305 309 4.16666666666667e-02
+305 668 -1.25000000000000e-01
+305 120 -4.16666666666667e-02
+305 558 8.33333333333333e-02
+305 559 -1.66666666666667e-01
+305 121 8.33333333333333e-02
+305 293 -7.50000000000000e-01
+305 292 1.66666666666667e-01
+305 304 -1.66666666666667e-01
+305 31 8.33333333333333e-02
+305 291 1.66666666666667e-01
+305 453 -8.33333333333333e-02
+305 651 4.16666666666667e-02
+305 122 -1.25000000000000e-01
+305 652 4.16666666666667e-02
+305 454 -8.33333333333333e-02
+305 302 -1.25000000000000e-01
+305 310 4.16666666666667e-02
+305 32 -1.25000000000000e-01
+305 301 -4.16666666666667e-02
+305 289 8.33333333333333e-02
+305 300 8.33333333333333e-02
+305 288 -1.66666666666667e-01
+306 306 7.50000000000000e-01
+306 620 -8.33333333333333e-02
+306 619 4.16666666666667e-02
+306 308 -8.33333333333333e-02
+306 296 8.33333333333333e-02
+306 32 4.16666666666667e-02
+306 295 -4.16666666666667e-02
+306 294 -1.25000000000000e-01
+306 457 -8.33333333333333e-02
+306 289 8.33333333333333e-02
+306 656 4.16666666666667e-02
+306 458 -8.33333333333333e-02
+306 130 4.16666666666667e-02
+306 655 -8.33333333333333e-02
+306 129 -2.50000000000000e-01
+306 302 -4.16666666666667e-02
+306 290 8.33333333333333e-02
+306 307 -8.33333333333333e-02
+306 301 8.33333333333333e-02
+306 31 4.16666666666667e-02
+306 131 4.16666666666667e-02
+306 300 -1.25000000000000e-01
+306 30 -2.50000000000000e-01
+307 307 6.66666666666667e-01
+307 618 4.16666666666667e-02
+307 296 8.33333333333333e-02
+307 295 -1.25000000000000e-01
+307 294 -4.16666666666667e-02
+307 656 4.16666666666667e-02
+307 458 -8.33333333333333e-02
+307 456 -8.33333333333333e-02
+307 288 8.33333333333333e-02
+307 130 -8.33333333333333e-02
+307 129 4.16666666666667e-02
+307 654 -8.33333333333333e-02
+307 302 8.33333333333333e-02
+307 290 -1.66666666666667e-01
+307 620 4.16666666666667e-02
+307 301 -3.75000000000000e-01
+307 31 -8.33333333333333e-02
+307 306 -8.33333333333333e-02
+307 300 8.33333333333333e-02
+307 30 4.16666666666667e-02
+308 308 6.66666666666667e-01
+308 129 4.16666666666667e-02
+308 618 -8.33333333333333e-02
+308 296 -3.75000000000000e-01
+308 295 8.33333333333333e-02
+308 306 -8.33333333333333e-02
+308 294 8.33333333333333e-02
+308 30 4.16666666666667e-02
+308 655 4.16666666666667e-02
+308 457 -8.33333333333333e-02
+308 131 -8.33333333333333e-02
+308 654 4.16666666666667e-02
+308 456 -8.33333333333333e-02
+308 619 4.16666666666667e-02
+308 302 -1.25000000000000e-01
+308 32 -8.33333333333333e-02
+308 301 8.33333333333333e-02
+308 289 -1.66666666666667e-01
+308 300 -4.16666666666667e-02
+308 288 8.33333333333333e-02
+309 309 7.50000000000000e-01
+309 299 -8.33333333333333e-02
+309 298 4.16666666666667e-02
+309 311 -8.33333333333333e-02
+309 632 8.33333333333333e-02
+309 134 4.16666666666667e-02
+309 631 -4.16666666666667e-02
+309 630 -1.25000000000000e-01
+309 292 -8.33333333333333e-02
+309 565 8.33333333333333e-02
+309 305 4.16666666666667e-02
+309 293 -8.33333333333333e-02
+309 31 4.16666666666667e-02
+309 304 -8.33333333333333e-02
+309 30 -2.50000000000000e-01
+309 668 -4.16666666666667e-02
+309 566 8.33333333333333e-02
+309 310 -8.33333333333333e-02
+309 667 8.33333333333333e-02
+309 133 4.16666666666667e-02
+309 32 4.16666666666667e-02
+309 666 -1.25000000000000e-01
+309 132 -2.50000000000000e-01
+310 310 6.66666666666667e-01
+310 297 4.16666666666667e-02
+310 632 8.33333333333333e-02
+310 631 -1.25000000000000e-01
+310 630 -4.16666666666667e-02
+310 305 4.16666666666667e-02
+310 293 -8.33333333333333e-02
+310 291 -8.33333333333333e-02
+310 564 8.33333333333333e-02
+310 31 -8.33333333333333e-02
+310 30 4.16666666666667e-02
+310 303 -8.33333333333333e-02
+310 668 8.33333333333333e-02
+310 566 -1.66666666666667e-01
+310 299 4.16666666666667e-02
+310 667 -3.75000000000000e-01
+310 133 -8.33333333333333e-02
+310 309 -8.33333333333333e-02
+310 666 8.33333333333333e-02
+310 132 4.16666666666667e-02
+311 311 6.66666666666667e-01
+311 30 4.16666666666667e-02
+311 297 -8.33333333333333e-02
+311 632 -3.75000000000000e-01
+311 631 8.33333333333333e-02
+311 309 -8.33333333333333e-02
+311 630 8.33333333333333e-02
+311 132 4.16666666666667e-02
+311 304 4.16666666666667e-02
+311 292 -8.33333333333333e-02
+311 32 -8.33333333333333e-02
+311 303 4.16666666666667e-02
+311 291 -8.33333333333333e-02
+311 298 4.16666666666667e-02
+311 668 -1.25000000000000e-01
+311 134 -8.33333333333333e-02
+311 667 8.33333333333333e-02
+311 565 -1.66666666666667e-01
+311 666 -4.16666666666667e-02
+311 564 8.33333333333333e-02
+312 312 2.50000000000000e+00
+312 319 1.66666666666667e-01
+312 318 -2.50000000000000e-01
+312 572 -1.66666666666667e-01
+312 571 8.33333333333333e-02
+312 584 1.66666666666667e-01
+312 331 8.33333333333333e-02
+312 583 1.66666666666667e-01
+312 582 -7.50000000000000e-01
+312 332 8.33333333333333e-02
+312 574 -8.33333333333333e-02
+312 575 1.66666666666667e-01
+312 314 -3.33333333333333e-01
+312 77 -8.33333333333333e-02
+312 573 -2.50000000000000e-01
+312 323 8.33333333333333e-02
+312 35 -8.33333333333333e-02
+312 322 -1.66666666666667e-01
+312 569 8.33333333333333e-02
+312 316 1.66666666666667e-01
+312 313 -3.33333333333333e-01
+312 317 1.66666666666667e-01
+312 34 -8.33333333333333e-02
+312 315 -7.50000000000000e-01
+312 568 8.33333333333333e-02
+312 76 -8.33333333333333e-02
+312 581 -8.33333333333333e-02
+312 578 8.33333333333333e-02
+312 328 8.33333333333333e-02
+312 325 -8.33333333333333e-02
+312 577 -1.66666666666667e-01
+312 580 1.66666666666667e-01
+312 579 -2.50000000000000e-01
+312 326 1.66666666666667e-01
+312 329 -1.66666666666667e-01
+312 324 -2.50000000000000e-01
+312 320 -8.33333333333333e-02
+313 313 2.50000000000000e+00
+313 318 1.66666666666667e-01
+313 320 1.66666666666667e-01
+313 319 -7.50000000000000e-01
+313 570 8.33333333333333e-02
+313 584 -8.33333333333333e-02
+313 330 8.33333333333333e-02
+313 583 -2.50000000000000e-01
+313 582 1.66666666666667e-01
+313 332 -1.66666666666667e-01
+313 573 -8.33333333333333e-02
+313 323 8.33333333333333e-02
+313 575 1.66666666666667e-01
+313 574 -2.50000000000000e-01
+313 321 -1.66666666666667e-01
+313 317 -8.33333333333333e-02
+313 315 1.66666666666667e-01
+313 312 -3.33333333333333e-01
+313 316 -2.50000000000000e-01
+313 33 -8.33333333333333e-02
+313 569 -1.66666666666667e-01
+313 567 8.33333333333333e-02
+313 75 -8.33333333333333e-02
+313 581 1.66666666666667e-01
+313 314 -3.33333333333333e-01
+313 326 1.66666666666667e-01
+313 327 8.33333333333333e-02
+313 324 -8.33333333333333e-02
+313 578 8.33333333333333e-02
+313 77 -8.33333333333333e-02
+313 580 -7.50000000000000e-01
+313 576 -1.66666666666667e-01
+313 579 1.66666666666667e-01
+313 329 8.33333333333333e-02
+313 35 -8.33333333333333e-02
+313 325 -2.50000000000000e-01
+313 572 8.33333333333333e-02
+314 314 2.50000000000000e+00
+314 571 8.33333333333333e-02
+314 320 -2.50000000000000e-01
+314 319 1.66666666666667e-01
+314 570 -1.66666666666667e-01
+314 583 -8.33333333333333e-02
+314 582 1.66666666666667e-01
+314 584 -2.50000000000000e-01
+314 331 -1.66666666666667e-01
+314 330 8.33333333333333e-02
+314 322 8.33333333333333e-02
+314 573 1.66666666666667e-01
+314 312 -3.33333333333333e-01
+314 575 -7.50000000000000e-01
+314 574 1.66666666666667e-01
+314 75 -8.33333333333333e-02
+314 321 8.33333333333333e-02
+314 33 -8.33333333333333e-02
+314 316 -8.33333333333333e-02
+314 567 8.33333333333333e-02
+314 317 -2.50000000000000e-01
+314 315 1.66666666666667e-01
+314 568 -1.66666666666667e-01
+314 579 -8.33333333333333e-02
+314 576 8.33333333333333e-02
+314 580 1.66666666666667e-01
+314 313 -3.33333333333333e-01
+314 325 1.66666666666667e-01
+314 581 -2.50000000000000e-01
+314 577 8.33333333333333e-02
+314 76 -8.33333333333333e-02
+314 326 -7.50000000000000e-01
+314 318 -8.33333333333333e-02
+314 328 8.33333333333333e-02
+314 34 -8.33333333333333e-02
+314 324 1.66666666666667e-01
+314 327 -1.66666666666667e-01
+315 315 2.50000000000000e+00
+315 323 -8.33333333333333e-02
+315 322 1.66666666666667e-01
+315 34 8.33333333333333e-02
+315 321 -2.50000000000000e-01
+315 317 -3.33333333333333e-01
+315 599 1.66666666666667e-01
+315 598 -8.33333333333333e-02
+315 85 8.33333333333333e-02
+315 597 -2.50000000000000e-01
+315 328 -8.33333333333333e-02
+315 329 1.66666666666667e-01
+315 35 8.33333333333333e-02
+315 327 -2.50000000000000e-01
+315 602 -8.33333333333333e-02
+315 86 8.33333333333333e-02
+315 316 -3.33333333333333e-01
+315 601 1.66666666666667e-01
+315 600 -2.50000000000000e-01
+315 574 8.33333333333333e-02
+315 575 -1.66666666666667e-01
+315 569 -8.33333333333333e-02
+315 581 8.33333333333333e-02
+315 313 1.66666666666667e-01
+315 580 -1.66666666666667e-01
+315 568 -8.33333333333333e-02
+315 314 1.66666666666667e-01
+315 312 -7.50000000000000e-01
+315 1213 -1.66666666666667e-01
+315 1040 1.66666666666667e-01
+315 1250 -1.66666666666667e-01
+315 904 -8.33333333333333e-02
+315 1249 8.33333333333333e-02
+315 905 -8.33333333333333e-02
+315 1039 1.66666666666667e-01
+315 1214 8.33333333333333e-02
+315 1038 -7.50000000000000e-01
+316 316 2.50000000000000e+00
+316 323 1.66666666666667e-01
+316 322 -7.50000000000000e-01
+316 33 8.33333333333333e-02
+316 599 1.66666666666667e-01
+316 598 -2.50000000000000e-01
+316 597 -8.33333333333333e-02
+316 84 8.33333333333333e-02
+316 317 -3.33333333333333e-01
+316 327 -8.33333333333333e-02
+316 35 -1.66666666666667e-01
+316 329 1.66666666666667e-01
+316 328 -2.50000000000000e-01
+316 602 1.66666666666667e-01
+316 86 -1.66666666666667e-01
+316 321 1.66666666666667e-01
+316 601 -7.50000000000000e-01
+316 315 -3.33333333333333e-01
+316 600 1.66666666666667e-01
+316 575 8.33333333333333e-02
+316 314 -8.33333333333333e-02
+316 569 -8.33333333333333e-02
+316 581 8.33333333333333e-02
+316 312 1.66666666666667e-01
+316 579 -1.66666666666667e-01
+316 567 -8.33333333333333e-02
+316 573 8.33333333333333e-02
+316 313 -2.50000000000000e-01
+316 1214 8.33333333333333e-02
+316 1212 -1.66666666666667e-01
+316 1040 -8.33333333333333e-02
+316 905 -8.33333333333333e-02
+316 1250 8.33333333333333e-02
+316 903 -8.33333333333333e-02
+316 1248 8.33333333333333e-02
+316 1039 -2.50000000000000e-01
+316 1038 1.66666666666667e-01
+317 317 2.50000000000000e+00
+317 321 -8.33333333333333e-02
+317 323 -2.50000000000000e-01
+317 322 1.66666666666667e-01
+317 599 -7.50000000000000e-01
+317 598 1.66666666666667e-01
+317 315 -3.33333333333333e-01
+317 597 1.66666666666667e-01
+317 316 -3.33333333333333e-01
+317 327 1.66666666666667e-01
+317 329 -7.50000000000000e-01
+317 34 -1.66666666666667e-01
+317 328 1.66666666666667e-01
+317 33 8.33333333333333e-02
+317 602 -2.50000000000000e-01
+317 601 1.66666666666667e-01
+317 85 -1.66666666666667e-01
+317 600 -8.33333333333333e-02
+317 84 8.33333333333333e-02
+317 574 8.33333333333333e-02
+317 573 -1.66666666666667e-01
+317 313 -8.33333333333333e-02
+317 568 -8.33333333333333e-02
+317 580 8.33333333333333e-02
+317 567 -8.33333333333333e-02
+317 579 8.33333333333333e-02
+317 314 -2.50000000000000e-01
+317 312 1.66666666666667e-01
+317 1213 8.33333333333333e-02
+317 1039 -8.33333333333333e-02
+317 904 -8.33333333333333e-02
+317 1249 8.33333333333333e-02
+317 1038 1.66666666666667e-01
+317 1248 -1.66666666666667e-01
+317 903 -8.33333333333333e-02
+317 1212 8.33333333333333e-02
+317 1040 -2.50000000000000e-01
+318 318 1.25000000000000e+00
+318 574 8.33333333333333e-02
+318 575 8.33333333333333e-02
+318 635 8.33333333333333e-02
+318 633 -1.25000000000000e-01
+318 323 8.33333333333333e-02
+318 322 8.33333333333333e-02
+318 319 -1.66666666666667e-01
+318 321 -3.75000000000000e-01
+318 314 -8.33333333333333e-02
+318 320 -1.66666666666667e-01
+318 572 -8.33333333333333e-02
+318 584 8.33333333333333e-02
+318 637 8.33333333333333e-02
+318 313 1.66666666666667e-01
+318 583 -1.66666666666667e-01
+318 638 8.33333333333333e-02
+318 104 -8.33333333333333e-02
+318 103 4.16666666666667e-02
+318 571 -8.33333333333333e-02
+318 636 -3.75000000000000e-01
+318 332 8.33333333333333e-02
+318 35 -8.33333333333333e-02
+318 331 -4.16666666666667e-02
+318 34 4.16666666666667e-02
+318 330 -1.25000000000000e-01
+318 634 -4.16666666666667e-02
+318 312 -2.50000000000000e-01
+319 319 1.25000000000000e+00
+319 633 -4.16666666666667e-02
+319 573 8.33333333333333e-02
+319 575 -1.66666666666667e-01
+319 104 4.16666666666667e-02
+319 634 -1.25000000000000e-01
+319 323 -4.16666666666667e-02
+319 35 4.16666666666667e-02
+319 322 -1.25000000000000e-01
+319 321 8.33333333333333e-02
+319 318 -1.66666666666667e-01
+319 638 -4.16666666666667e-02
+319 636 8.33333333333333e-02
+319 572 -8.33333333333333e-02
+319 584 8.33333333333333e-02
+319 312 1.66666666666667e-01
+319 582 -1.66666666666667e-01
+319 637 -1.25000000000000e-01
+319 102 4.16666666666667e-02
+319 570 -8.33333333333333e-02
+319 332 8.33333333333333e-02
+319 320 -1.66666666666667e-01
+319 314 1.66666666666667e-01
+319 331 -1.25000000000000e-01
+319 635 8.33333333333333e-02
+319 313 -7.50000000000000e-01
+319 330 -4.16666666666667e-02
+319 33 4.16666666666667e-02
+320 320 1.25000000000000e+00
+320 574 -1.66666666666667e-01
+320 573 8.33333333333333e-02
+320 635 -3.75000000000000e-01
+320 103 4.16666666666667e-02
+320 633 8.33333333333333e-02
+320 323 -1.25000000000000e-01
+320 322 -4.16666666666667e-02
+320 34 4.16666666666667e-02
+320 321 8.33333333333333e-02
+320 312 -8.33333333333333e-02
+320 637 -4.16666666666667e-02
+320 318 -1.66666666666667e-01
+320 570 -8.33333333333333e-02
+320 582 8.33333333333333e-02
+320 571 -8.33333333333333e-02
+320 583 8.33333333333333e-02
+320 638 -1.25000000000000e-01
+320 636 8.33333333333333e-02
+320 102 -8.33333333333333e-02
+320 332 -3.75000000000000e-01
+320 634 8.33333333333333e-02
+320 314 -2.50000000000000e-01
+320 331 8.33333333333333e-02
+320 319 -1.66666666666667e-01
+320 313 1.66666666666667e-01
+320 330 8.33333333333333e-02
+320 33 -8.33333333333333e-02
+321 321 1.25000000000000e+00
+321 317 -8.33333333333333e-02
+321 322 -1.66666666666667e-01
+321 316 1.66666666666667e-01
+321 35 8.33333333333333e-02
+321 34 -4.16666666666667e-02
+321 33 -1.25000000000000e-01
+321 315 -2.50000000000000e-01
+321 323 -1.66666666666667e-01
+321 107 8.33333333333333e-02
+321 106 -4.16666666666667e-02
+321 598 8.33333333333333e-02
+321 599 8.33333333333333e-02
+321 105 -1.25000000000000e-01
+321 635 -8.33333333333333e-02
+321 320 8.33333333333333e-02
+321 319 8.33333333333333e-02
+321 318 -3.75000000000000e-01
+321 574 -8.33333333333333e-02
+321 575 -8.33333333333333e-02
+321 314 8.33333333333333e-02
+321 313 -1.66666666666667e-01
+321 634 4.16666666666667e-02
+321 1213 8.33333333333333e-02
+321 905 -8.33333333333333e-02
+321 904 4.16666666666667e-02
+321 1214 8.33333333333333e-02
+321 1212 -3.75000000000000e-01
+322 322 1.25000000000000e+00
+322 321 -1.66666666666667e-01
+322 315 1.66666666666667e-01
+322 35 8.33333333333333e-02
+322 323 -1.66666666666667e-01
+322 317 1.66666666666667e-01
+322 34 -1.25000000000000e-01
+322 316 -7.50000000000000e-01
+322 33 -4.16666666666667e-02
+322 107 8.33333333333333e-02
+322 599 -1.66666666666667e-01
+322 106 -1.25000000000000e-01
+322 105 -4.16666666666667e-02
+322 597 8.33333333333333e-02
+322 635 4.16666666666667e-02
+322 320 -4.16666666666667e-02
+322 319 -1.25000000000000e-01
+322 318 8.33333333333333e-02
+322 573 -8.33333333333333e-02
+322 575 -8.33333333333333e-02
+322 314 8.33333333333333e-02
+322 633 4.16666666666667e-02
+322 312 -1.66666666666667e-01
+322 905 4.16666666666667e-02
+322 1212 8.33333333333333e-02
+322 903 4.16666666666667e-02
+322 1214 -4.16666666666667e-02
+322 1213 -1.25000000000000e-01
+323 323 1.25000000000000e+00
+323 597 8.33333333333333e-02
+323 315 -8.33333333333333e-02
+323 35 -3.75000000000000e-01
+323 317 -2.50000000000000e-01
+323 34 8.33333333333333e-02
+323 322 -1.66666666666667e-01
+323 316 1.66666666666667e-01
+323 33 8.33333333333333e-02
+323 107 -3.75000000000000e-01
+323 106 8.33333333333333e-02
+323 598 -1.66666666666667e-01
+323 321 -1.66666666666667e-01
+323 105 8.33333333333333e-02
+323 633 -8.33333333333333e-02
+323 320 -1.25000000000000e-01
+323 319 -4.16666666666667e-02
+323 318 8.33333333333333e-02
+323 574 -8.33333333333333e-02
+323 313 8.33333333333333e-02
+323 573 -8.33333333333333e-02
+323 634 4.16666666666667e-02
+323 312 8.33333333333333e-02
+323 904 4.16666666666667e-02
+323 903 -8.33333333333333e-02
+323 1213 -4.16666666666667e-02
+323 1214 -1.25000000000000e-01
+323 1212 8.33333333333333e-02
+324 324 1.25000000000000e+00
+324 584 -1.66666666666667e-01
+324 583 8.33333333333333e-02
+324 125 4.16666666666667e-02
+324 673 8.33333333333333e-02
+324 672 -3.75000000000000e-01
+324 332 -4.16666666666667e-02
+324 35 4.16666666666667e-02
+324 331 8.33333333333333e-02
+324 330 -1.25000000000000e-01
+324 578 -8.33333333333333e-02
+324 577 -8.33333333333333e-02
+324 581 8.33333333333333e-02
+324 671 -4.16666666666667e-02
+324 325 -1.66666666666667e-01
+324 580 8.33333333333333e-02
+324 313 -8.33333333333333e-02
+324 124 -8.33333333333333e-02
+324 670 8.33333333333333e-02
+324 669 -1.25000000000000e-01
+324 326 -1.66666666666667e-01
+324 329 8.33333333333333e-02
+324 314 1.66666666666667e-01
+324 328 8.33333333333333e-02
+324 34 -8.33333333333333e-02
+324 674 8.33333333333333e-02
+324 327 -3.75000000000000e-01
+324 312 -2.50000000000000e-01
+325 325 1.25000000000000e+00
+325 584 8.33333333333333e-02
+325 582 8.33333333333333e-02
+325 673 -1.25000000000000e-01
+325 672 8.33333333333333e-02
+325 332 8.33333333333333e-02
+325 326 -1.66666666666667e-01
+325 331 -3.75000000000000e-01
+325 330 8.33333333333333e-02
+325 576 -8.33333333333333e-02
+325 671 8.33333333333333e-02
+325 324 -1.66666666666667e-01
+325 581 -1.66666666666667e-01
+325 314 1.66666666666667e-01
+325 579 8.33333333333333e-02
+325 312 -8.33333333333333e-02
+325 125 4.16666666666667e-02
+325 578 -8.33333333333333e-02
+325 670 -3.75000000000000e-01
+325 123 -8.33333333333333e-02
+325 669 8.33333333333333e-02
+325 329 -4.16666666666667e-02
+325 35 4.16666666666667e-02
+325 674 -4.16666666666667e-02
+325 328 -1.25000000000000e-01
+325 313 -2.50000000000000e-01
+325 327 8.33333333333333e-02
+325 33 -8.33333333333333e-02
+326 326 1.25000000000000e+00
+326 583 8.33333333333333e-02
+326 672 8.33333333333333e-02
+326 582 -1.66666666666667e-01
+326 674 -1.25000000000000e-01
+326 123 4.16666666666667e-02
+326 332 -1.25000000000000e-01
+326 331 8.33333333333333e-02
+326 325 -1.66666666666667e-01
+326 330 -4.16666666666667e-02
+326 33 4.16666666666667e-02
+326 576 -8.33333333333333e-02
+326 670 8.33333333333333e-02
+326 579 8.33333333333333e-02
+326 669 -4.16666666666667e-02
+326 580 -1.66666666666667e-01
+326 313 1.66666666666667e-01
+326 671 -1.25000000000000e-01
+326 124 4.16666666666667e-02
+326 577 -8.33333333333333e-02
+326 673 -4.16666666666667e-02
+326 329 -1.25000000000000e-01
+326 314 -7.50000000000000e-01
+326 328 -4.16666666666667e-02
+326 34 4.16666666666667e-02
+326 324 -1.66666666666667e-01
+326 327 8.33333333333333e-02
+326 312 1.66666666666667e-01
+327 327 1.25000000000000e+00
+327 316 -8.33333333333333e-02
+327 329 -1.66666666666667e-01
+327 317 1.66666666666667e-01
+327 35 -4.16666666666667e-02
+327 34 8.33333333333333e-02
+327 33 -1.25000000000000e-01
+327 315 -2.50000000000000e-01
+327 128 -4.16666666666667e-02
+327 602 8.33333333333333e-02
+327 328 -1.66666666666667e-01
+327 127 8.33333333333333e-02
+327 601 8.33333333333333e-02
+327 126 -1.25000000000000e-01
+327 581 -8.33333333333333e-02
+327 671 4.16666666666667e-02
+327 580 -8.33333333333333e-02
+327 313 8.33333333333333e-02
+327 670 -8.33333333333333e-02
+327 326 8.33333333333333e-02
+327 314 -1.66666666666667e-01
+327 325 8.33333333333333e-02
+327 324 -3.75000000000000e-01
+327 1250 8.33333333333333e-02
+327 905 4.16666666666667e-02
+327 904 -8.33333333333333e-02
+327 1249 8.33333333333333e-02
+327 1248 -3.75000000000000e-01
+328 328 1.25000000000000e+00
+328 315 -8.33333333333333e-02
+328 35 8.33333333333333e-02
+328 329 -1.66666666666667e-01
+328 317 1.66666666666667e-01
+328 34 -3.75000000000000e-01
+328 316 -2.50000000000000e-01
+328 33 8.33333333333333e-02
+328 128 8.33333333333333e-02
+328 602 -1.66666666666667e-01
+328 600 8.33333333333333e-02
+328 127 -3.75000000000000e-01
+328 327 -1.66666666666667e-01
+328 126 8.33333333333333e-02
+328 579 -8.33333333333333e-02
+328 312 8.33333333333333e-02
+328 671 4.16666666666667e-02
+328 581 -8.33333333333333e-02
+328 669 -8.33333333333333e-02
+328 326 -4.16666666666667e-02
+328 314 8.33333333333333e-02
+328 325 -1.25000000000000e-01
+328 324 8.33333333333333e-02
+328 905 4.16666666666667e-02
+328 1250 -4.16666666666667e-02
+328 903 -8.33333333333333e-02
+328 1249 -1.25000000000000e-01
+328 1248 8.33333333333333e-02
+329 329 1.25000000000000e+00
+329 327 -1.66666666666667e-01
+329 315 1.66666666666667e-01
+329 35 -1.25000000000000e-01
+329 317 -7.50000000000000e-01
+329 34 8.33333333333333e-02
+329 328 -1.66666666666667e-01
+329 316 1.66666666666667e-01
+329 33 -4.16666666666667e-02
+329 128 -1.25000000000000e-01
+329 127 8.33333333333333e-02
+329 601 -1.66666666666667e-01
+329 126 -4.16666666666667e-02
+329 600 8.33333333333333e-02
+329 579 -8.33333333333333e-02
+329 669 4.16666666666667e-02
+329 670 4.16666666666667e-02
+329 580 -8.33333333333333e-02
+329 326 -1.25000000000000e-01
+329 325 -4.16666666666667e-02
+329 313 8.33333333333333e-02
+329 324 8.33333333333333e-02
+329 312 -1.66666666666667e-01
+329 1249 -4.16666666666667e-02
+329 1248 8.33333333333333e-02
+329 903 4.16666666666667e-02
+329 904 4.16666666666667e-02
+329 1250 -1.25000000000000e-01
+330 330 7.50000000000000e-01
+330 638 -8.33333333333333e-02
+330 637 4.16666666666667e-02
+330 332 -8.33333333333333e-02
+330 320 8.33333333333333e-02
+330 35 4.16666666666667e-02
+330 319 -4.16666666666667e-02
+330 318 -1.25000000000000e-01
+330 583 -8.33333333333333e-02
+330 313 8.33333333333333e-02
+330 674 4.16666666666667e-02
+330 584 -8.33333333333333e-02
+330 133 4.16666666666667e-02
+330 673 -8.33333333333333e-02
+330 132 -2.50000000000000e-01
+330 326 -4.16666666666667e-02
+330 314 8.33333333333333e-02
+330 331 -8.33333333333333e-02
+330 325 8.33333333333333e-02
+330 34 4.16666666666667e-02
+330 134 4.16666666666667e-02
+330 324 -1.25000000000000e-01
+330 33 -2.50000000000000e-01
+331 331 6.66666666666667e-01
+331 636 4.16666666666667e-02
+331 320 8.33333333333333e-02
+331 319 -1.25000000000000e-01
+331 318 -4.16666666666667e-02
+331 674 4.16666666666667e-02
+331 584 -8.33333333333333e-02
+331 582 -8.33333333333333e-02
+331 312 8.33333333333333e-02
+331 133 -8.33333333333333e-02
+331 132 4.16666666666667e-02
+331 672 -8.33333333333333e-02
+331 326 8.33333333333333e-02
+331 314 -1.66666666666667e-01
+331 638 4.16666666666667e-02
+331 325 -3.75000000000000e-01
+331 34 -8.33333333333333e-02
+331 330 -8.33333333333333e-02
+331 324 8.33333333333333e-02
+331 33 4.16666666666667e-02
+332 332 6.66666666666667e-01
+332 132 4.16666666666667e-02
+332 636 -8.33333333333333e-02
+332 320 -3.75000000000000e-01
+332 319 8.33333333333333e-02
+332 330 -8.33333333333333e-02
+332 318 8.33333333333333e-02
+332 33 4.16666666666667e-02
+332 673 4.16666666666667e-02
+332 583 -8.33333333333333e-02
+332 134 -8.33333333333333e-02
+332 672 4.16666666666667e-02
+332 582 -8.33333333333333e-02
+332 637 4.16666666666667e-02
+332 326 -1.25000000000000e-01
+332 35 -8.33333333333333e-02
+332 325 8.33333333333333e-02
+332 313 -1.66666666666667e-01
+332 324 -4.16666666666667e-02
+332 312 8.33333333333333e-02
+333 333 1.25000000000000e+00
+333 377 -8.33333333333333e-02
+333 349 8.33333333333333e-02
+333 376 -8.33333333333333e-02
+333 373 -8.33333333333333e-02
+333 344 8.33333333333333e-02
+333 350 -1.66666666666667e-01
+333 343 8.33333333333333e-02
+333 342 -3.75000000000000e-01
+333 143 8.33333333333333e-02
+333 335 -1.66666666666667e-01
+333 341 1.66666666666667e-01
+333 370 8.33333333333333e-02
+333 340 -8.33333333333333e-02
+333 38 -4.16666666666667e-02
+333 137 4.16666666666667e-02
+333 37 8.33333333333333e-02
+333 136 -8.33333333333333e-02
+333 36 -1.25000000000000e-01
+333 339 -2.50000000000000e-01
+333 44 -4.16666666666667e-02
+333 371 8.33333333333333e-02
+333 334 -1.66666666666667e-01
+333 43 8.33333333333333e-02
+333 142 8.33333333333333e-02
+333 374 4.16666666666667e-02
+333 42 -1.25000000000000e-01
+333 141 -3.75000000000000e-01
+334 334 1.25000000000000e+00
+334 375 -8.33333333333333e-02
+334 374 4.16666666666667e-02
+334 377 -8.33333333333333e-02
+334 372 -8.33333333333333e-02
+334 344 -4.16666666666667e-02
+334 350 8.33333333333333e-02
+334 343 -1.25000000000000e-01
+334 342 8.33333333333333e-02
+334 143 -4.16666666666667e-02
+334 137 4.16666666666667e-02
+334 369 8.33333333333333e-02
+334 339 -8.33333333333333e-02
+334 38 8.33333333333333e-02
+334 335 -1.66666666666667e-01
+334 341 1.66666666666667e-01
+334 37 -3.75000000000000e-01
+334 340 -2.50000000000000e-01
+334 36 8.33333333333333e-02
+334 135 -8.33333333333333e-02
+334 44 8.33333333333333e-02
+334 371 -1.66666666666667e-01
+334 348 8.33333333333333e-02
+334 43 -3.75000000000000e-01
+334 142 -1.25000000000000e-01
+334 333 -1.66666666666667e-01
+334 42 8.33333333333333e-02
+334 141 8.33333333333333e-02
+335 335 1.25000000000000e+00
+335 375 -8.33333333333333e-02
+335 373 4.16666666666667e-02
+335 376 -8.33333333333333e-02
+335 344 -1.25000000000000e-01
+335 343 -4.16666666666667e-02
+335 349 8.33333333333333e-02
+335 342 8.33333333333333e-02
+335 348 -1.66666666666667e-01
+335 142 -4.16666666666667e-02
+335 136 4.16666666666667e-02
+335 141 8.33333333333333e-02
+335 333 -1.66666666666667e-01
+335 339 1.66666666666667e-01
+335 38 -1.25000000000000e-01
+335 341 -7.50000000000000e-01
+335 37 8.33333333333333e-02
+335 334 -1.66666666666667e-01
+335 340 1.66666666666667e-01
+335 36 -4.16666666666667e-02
+335 135 4.16666666666667e-02
+335 372 4.16666666666667e-02
+335 44 -1.25000000000000e-01
+335 143 -1.25000000000000e-01
+335 43 8.33333333333333e-02
+335 370 -1.66666666666667e-01
+335 42 -4.16666666666667e-02
+335 369 8.33333333333333e-02
+336 336 1.25000000000000e+00
+336 347 8.33333333333333e-02
+336 346 8.33333333333333e-02
+336 345 -3.75000000000000e-01
+336 410 -8.33333333333333e-02
+336 412 -8.33333333333333e-02
+336 350 8.33333333333333e-02
+336 349 -1.66666666666667e-01
+336 413 -8.33333333333333e-02
+336 407 8.33333333333333e-02
+336 341 -8.33333333333333e-02
+336 337 -1.66666666666667e-01
+336 340 1.66666666666667e-01
+336 148 8.33333333333333e-02
+336 38 8.33333333333333e-02
+336 137 -8.33333333333333e-02
+336 37 -4.16666666666667e-02
+336 136 4.16666666666667e-02
+336 36 -1.25000000000000e-01
+336 339 -2.50000000000000e-01
+336 338 -1.66666666666667e-01
+336 50 8.33333333333333e-02
+336 149 8.33333333333333e-02
+336 49 -4.16666666666667e-02
+336 406 8.33333333333333e-02
+336 409 4.16666666666667e-02
+336 48 -1.25000000000000e-01
+336 147 -3.75000000000000e-01
+337 337 1.25000000000000e+00
+337 347 -4.16666666666667e-02
+337 346 -1.25000000000000e-01
+337 345 8.33333333333333e-02
+337 410 4.16666666666667e-02
+337 350 8.33333333333333e-02
+337 413 -8.33333333333333e-02
+337 411 -8.33333333333333e-02
+337 348 -1.66666666666667e-01
+337 137 4.16666666666667e-02
+337 149 -4.16666666666667e-02
+337 336 -1.66666666666667e-01
+337 339 1.66666666666667e-01
+337 147 8.33333333333333e-02
+337 38 8.33333333333333e-02
+337 338 -1.66666666666667e-01
+337 341 1.66666666666667e-01
+337 37 -1.25000000000000e-01
+337 340 -7.50000000000000e-01
+337 36 -4.16666666666667e-02
+337 135 4.16666666666667e-02
+337 50 8.33333333333333e-02
+337 407 -1.66666666666667e-01
+337 408 4.16666666666667e-02
+337 49 -1.25000000000000e-01
+337 148 -1.25000000000000e-01
+337 48 -4.16666666666667e-02
+337 405 8.33333333333333e-02
+338 338 1.25000000000000e+00
+338 346 -4.16666666666667e-02
+338 345 8.33333333333333e-02
+338 409 4.16666666666667e-02
+338 408 -8.33333333333333e-02
+338 349 8.33333333333333e-02
+338 412 -8.33333333333333e-02
+338 348 8.33333333333333e-02
+338 411 -8.33333333333333e-02
+338 405 8.33333333333333e-02
+338 339 -8.33333333333333e-02
+338 136 4.16666666666667e-02
+338 148 -4.16666666666667e-02
+338 38 -3.75000000000000e-01
+338 341 -2.50000000000000e-01
+338 37 8.33333333333333e-02
+338 337 -1.66666666666667e-01
+338 340 1.66666666666667e-01
+338 36 8.33333333333333e-02
+338 135 -8.33333333333333e-02
+338 347 -1.25000000000000e-01
+338 50 -3.75000000000000e-01
+338 149 -1.25000000000000e-01
+338 49 8.33333333333333e-02
+338 406 -1.66666666666667e-01
+338 336 -1.66666666666667e-01
+338 48 8.33333333333333e-02
+338 147 8.33333333333333e-02
+339 339 2.50000000000000e+00
+339 376 -1.66666666666667e-01
+339 335 1.66666666666667e-01
+339 142 8.33333333333333e-02
+339 334 -8.33333333333333e-02
+339 143 -1.66666666666667e-01
+339 333 -2.50000000000000e-01
+339 371 -8.33333333333333e-02
+339 370 1.66666666666667e-01
+339 369 -2.50000000000000e-01
+339 442 -8.33333333333333e-02
+339 350 1.66666666666667e-01
+339 413 -1.66666666666667e-01
+339 412 8.33333333333333e-02
+339 38 8.33333333333333e-02
+339 349 1.66666666666667e-01
+339 340 -3.33333333333333e-01
+339 348 -7.50000000000000e-01
+339 443 -8.33333333333333e-02
+339 56 8.33333333333333e-02
+339 338 -8.33333333333333e-02
+339 337 1.66666666666667e-01
+339 137 -8.33333333333333e-02
+339 149 8.33333333333333e-02
+339 154 1.66666666666667e-01
+339 148 -1.66666666666667e-01
+339 37 8.33333333333333e-02
+339 136 -8.33333333333333e-02
+339 336 -2.50000000000000e-01
+339 341 -3.33333333333333e-01
+339 407 1.66666666666667e-01
+339 155 1.66666666666667e-01
+339 406 -8.33333333333333e-02
+339 55 8.33333333333333e-02
+339 377 8.33333333333333e-02
+339 405 -2.50000000000000e-01
+339 153 -7.50000000000000e-01
+340 340 2.50000000000000e+00
+340 375 -1.66666666666667e-01
+340 141 8.33333333333333e-02
+340 333 -8.33333333333333e-02
+340 143 8.33333333333333e-02
+340 335 1.66666666666667e-01
+340 334 -2.50000000000000e-01
+340 371 1.66666666666667e-01
+340 370 -7.50000000000000e-01
+340 369 1.66666666666667e-01
+340 443 -8.33333333333333e-02
+340 441 -8.33333333333333e-02
+340 350 -8.33333333333333e-02
+340 413 8.33333333333333e-02
+340 411 8.33333333333333e-02
+340 349 -2.50000000000000e-01
+340 348 1.66666666666667e-01
+340 339 -3.33333333333333e-01
+340 155 -8.33333333333333e-02
+340 341 -3.33333333333333e-01
+340 137 -8.33333333333333e-02
+340 149 8.33333333333333e-02
+340 336 1.66666666666667e-01
+340 153 1.66666666666667e-01
+340 147 -1.66666666666667e-01
+340 38 -1.66666666666667e-01
+340 338 1.66666666666667e-01
+340 337 -7.50000000000000e-01
+340 36 8.33333333333333e-02
+340 135 -8.33333333333333e-02
+340 407 1.66666666666667e-01
+340 56 -1.66666666666667e-01
+340 377 8.33333333333333e-02
+340 406 -2.50000000000000e-01
+340 154 -2.50000000000000e-01
+340 405 -8.33333333333333e-02
+340 54 8.33333333333333e-02
+341 341 2.50000000000000e+00
+341 375 8.33333333333333e-02
+341 333 1.66666666666667e-01
+341 142 8.33333333333333e-02
+341 141 -1.66666666666667e-01
+341 335 -7.50000000000000e-01
+341 334 1.66666666666667e-01
+341 371 -2.50000000000000e-01
+341 370 1.66666666666667e-01
+341 369 -8.33333333333333e-02
+341 442 -8.33333333333333e-02
+341 349 -8.33333333333333e-02
+341 412 8.33333333333333e-02
+341 348 1.66666666666667e-01
+341 411 -1.66666666666667e-01
+341 350 -2.50000000000000e-01
+341 36 8.33333333333333e-02
+341 441 -8.33333333333333e-02
+341 54 8.33333333333333e-02
+341 154 -8.33333333333333e-02
+341 340 -3.33333333333333e-01
+341 336 -8.33333333333333e-02
+341 136 -8.33333333333333e-02
+341 148 8.33333333333333e-02
+341 135 -8.33333333333333e-02
+341 147 8.33333333333333e-02
+341 338 -2.50000000000000e-01
+341 37 -1.66666666666667e-01
+341 337 1.66666666666667e-01
+341 376 8.33333333333333e-02
+341 407 -7.50000000000000e-01
+341 155 -2.50000000000000e-01
+341 406 1.66666666666667e-01
+341 55 -1.66666666666667e-01
+341 339 -3.33333333333333e-01
+341 405 1.66666666666667e-01
+341 153 1.66666666666667e-01
+342 342 1.25000000000000e+00
+342 376 8.33333333333333e-02
+342 377 8.33333333333333e-02
+342 335 8.33333333333333e-02
+342 344 -1.66666666666667e-01
+342 334 8.33333333333333e-02
+342 333 -3.75000000000000e-01
+342 373 8.33333333333333e-02
+342 372 -1.25000000000000e-01
+342 349 -8.33333333333333e-02
+342 343 -1.66666666666667e-01
+342 164 8.33333333333333e-02
+342 481 -8.33333333333333e-02
+342 175 8.33333333333333e-02
+342 350 1.66666666666667e-01
+342 176 -1.66666666666667e-01
+342 62 4.16666666666667e-02
+342 482 -8.33333333333333e-02
+342 163 8.33333333333333e-02
+342 61 -8.33333333333333e-02
+342 162 -3.75000000000000e-01
+342 158 -4.16666666666667e-02
+342 38 4.16666666666667e-02
+342 157 8.33333333333333e-02
+342 37 -8.33333333333333e-02
+342 156 -1.25000000000000e-01
+342 374 -4.16666666666667e-02
+342 348 -2.50000000000000e-01
+343 343 1.25000000000000e+00
+343 375 8.33333333333333e-02
+343 377 -1.66666666666667e-01
+343 335 -4.16666666666667e-02
+343 38 4.16666666666667e-02
+343 334 -1.25000000000000e-01
+343 333 8.33333333333333e-02
+343 62 4.16666666666667e-02
+343 373 -3.75000000000000e-01
+343 372 8.33333333333333e-02
+343 348 -8.33333333333333e-02
+343 164 -4.16666666666667e-02
+343 342 -1.66666666666667e-01
+343 480 -8.33333333333333e-02
+343 174 8.33333333333333e-02
+343 482 -8.33333333333333e-02
+343 176 8.33333333333333e-02
+343 163 -1.25000000000000e-01
+343 162 8.33333333333333e-02
+343 60 -8.33333333333333e-02
+343 158 8.33333333333333e-02
+343 344 -1.66666666666667e-01
+343 350 1.66666666666667e-01
+343 157 -3.75000000000000e-01
+343 374 8.33333333333333e-02
+343 349 -2.50000000000000e-01
+343 156 8.33333333333333e-02
+343 36 -8.33333333333333e-02
+344 344 1.25000000000000e+00
+344 372 -4.16666666666667e-02
+344 376 -1.66666666666667e-01
+344 375 8.33333333333333e-02
+344 335 -1.25000000000000e-01
+344 334 -4.16666666666667e-02
+344 37 4.16666666666667e-02
+344 333 8.33333333333333e-02
+344 342 -1.66666666666667e-01
+344 374 -1.25000000000000e-01
+344 61 4.16666666666667e-02
+344 163 -4.16666666666667e-02
+344 162 8.33333333333333e-02
+344 481 -8.33333333333333e-02
+344 175 8.33333333333333e-02
+344 348 1.66666666666667e-01
+344 174 -1.66666666666667e-01
+344 164 -1.25000000000000e-01
+344 60 4.16666666666667e-02
+344 480 -8.33333333333333e-02
+344 158 -1.25000000000000e-01
+344 373 8.33333333333333e-02
+344 350 -7.50000000000000e-01
+344 157 8.33333333333333e-02
+344 343 -1.66666666666667e-01
+344 349 1.66666666666667e-01
+344 156 -4.16666666666667e-02
+344 36 4.16666666666667e-02
+345 345 1.25000000000000e+00
+345 409 -4.16666666666667e-02
+345 412 8.33333333333333e-02
+345 410 8.33333333333333e-02
+345 408 -1.25000000000000e-01
+345 338 8.33333333333333e-02
+345 346 -1.66666666666667e-01
+345 337 8.33333333333333e-02
+345 336 -3.75000000000000e-01
+345 518 -8.33333333333333e-02
+345 347 -1.66666666666667e-01
+345 169 8.33333333333333e-02
+345 176 8.33333333333333e-02
+345 350 -8.33333333333333e-02
+345 175 -1.66666666666667e-01
+345 349 1.66666666666667e-01
+345 170 8.33333333333333e-02
+345 68 -8.33333333333333e-02
+345 67 4.16666666666667e-02
+345 517 -8.33333333333333e-02
+345 168 -3.75000000000000e-01
+345 158 8.33333333333333e-02
+345 38 -8.33333333333333e-02
+345 157 -4.16666666666667e-02
+345 37 4.16666666666667e-02
+345 156 -1.25000000000000e-01
+345 413 8.33333333333333e-02
+345 348 -2.50000000000000e-01
+346 346 1.25000000000000e+00
+346 413 -1.66666666666667e-01
+346 408 -4.16666666666667e-02
+346 411 8.33333333333333e-02
+346 68 4.16666666666667e-02
+346 409 -1.25000000000000e-01
+346 38 4.16666666666667e-02
+346 338 -4.16666666666667e-02
+346 337 -1.25000000000000e-01
+346 345 -1.66666666666667e-01
+346 336 8.33333333333333e-02
+346 518 -8.33333333333333e-02
+346 170 -4.16666666666667e-02
+346 176 8.33333333333333e-02
+346 168 8.33333333333333e-02
+346 174 -1.66666666666667e-01
+346 348 1.66666666666667e-01
+346 169 -1.25000000000000e-01
+346 66 4.16666666666667e-02
+346 516 -8.33333333333333e-02
+346 158 8.33333333333333e-02
+346 347 -1.66666666666667e-01
+346 350 1.66666666666667e-01
+346 157 -1.25000000000000e-01
+346 410 8.33333333333333e-02
+346 349 -7.50000000000000e-01
+346 156 -4.16666666666667e-02
+346 36 4.16666666666667e-02
+347 347 1.25000000000000e+00
+347 409 8.33333333333333e-02
+347 412 -1.66666666666667e-01
+347 410 -3.75000000000000e-01
+347 67 4.16666666666667e-02
+347 408 8.33333333333333e-02
+347 338 -1.25000000000000e-01
+347 37 4.16666666666667e-02
+347 337 -4.16666666666667e-02
+347 336 8.33333333333333e-02
+347 517 -8.33333333333333e-02
+347 516 -8.33333333333333e-02
+347 169 -4.16666666666667e-02
+347 175 8.33333333333333e-02
+347 345 -1.66666666666667e-01
+347 174 8.33333333333333e-02
+347 348 -8.33333333333333e-02
+347 170 -1.25000000000000e-01
+347 168 8.33333333333333e-02
+347 66 -8.33333333333333e-02
+347 158 -3.75000000000000e-01
+347 411 8.33333333333333e-02
+347 350 -2.50000000000000e-01
+347 157 8.33333333333333e-02
+347 346 -1.66666666666667e-01
+347 349 1.66666666666667e-01
+347 156 8.33333333333333e-02
+347 36 -8.33333333333333e-02
+348 348 2.50000000000000e+00
+348 377 -8.33333333333333e-02
+348 335 -1.66666666666667e-01
+348 376 1.66666666666667e-01
+348 375 -2.50000000000000e-01
+348 343 -8.33333333333333e-02
+348 344 1.66666666666667e-01
+348 342 -2.50000000000000e-01
+348 482 8.33333333333333e-02
+348 481 -1.66666666666667e-01
+348 442 8.33333333333333e-02
+348 412 -8.33333333333333e-02
+348 350 -3.33333333333333e-01
+348 341 1.66666666666667e-01
+348 413 1.66666666666667e-01
+348 38 -8.33333333333333e-02
+348 338 8.33333333333333e-02
+348 340 1.66666666666667e-01
+348 337 -1.66666666666667e-01
+348 339 -7.50000000000000e-01
+348 74 -8.33333333333333e-02
+348 443 8.33333333333333e-02
+348 411 -2.50000000000000e-01
+348 158 8.33333333333333e-02
+348 347 -8.33333333333333e-02
+348 175 1.66666666666667e-01
+348 349 -3.33333333333333e-01
+348 346 1.66666666666667e-01
+348 176 1.66666666666667e-01
+348 518 -1.66666666666667e-01
+348 517 8.33333333333333e-02
+348 73 -8.33333333333333e-02
+348 174 -7.50000000000000e-01
+348 157 8.33333333333333e-02
+348 37 -8.33333333333333e-02
+348 345 -2.50000000000000e-01
+348 334 8.33333333333333e-02
+349 349 2.50000000000000e+00
+349 377 1.66666666666667e-01
+349 335 8.33333333333333e-02
+349 376 -7.50000000000000e-01
+349 375 1.66666666666667e-01
+349 342 -8.33333333333333e-02
+349 482 8.33333333333333e-02
+349 344 1.66666666666667e-01
+349 343 -2.50000000000000e-01
+349 480 -1.66666666666667e-01
+349 350 -3.33333333333333e-01
+349 74 -8.33333333333333e-02
+349 38 -8.33333333333333e-02
+349 441 8.33333333333333e-02
+349 411 -8.33333333333333e-02
+349 341 -8.33333333333333e-02
+349 338 8.33333333333333e-02
+349 340 -2.50000000000000e-01
+349 339 1.66666666666667e-01
+349 336 -1.66666666666667e-01
+349 443 -1.66666666666667e-01
+349 413 1.66666666666667e-01
+349 412 -2.50000000000000e-01
+349 176 -8.33333333333333e-02
+349 518 8.33333333333333e-02
+349 174 1.66666666666667e-01
+349 348 -3.33333333333333e-01
+349 345 1.66666666666667e-01
+349 175 -2.50000000000000e-01
+349 516 8.33333333333333e-02
+349 72 -8.33333333333333e-02
+349 158 -1.66666666666667e-01
+349 347 1.66666666666667e-01
+349 346 -7.50000000000000e-01
+349 333 8.33333333333333e-02
+349 156 8.33333333333333e-02
+349 36 -8.33333333333333e-02
+350 350 2.50000000000000e+00
+350 375 -8.33333333333333e-02
+350 334 8.33333333333333e-02
+350 333 -1.66666666666667e-01
+350 377 -2.50000000000000e-01
+350 481 8.33333333333333e-02
+350 342 1.66666666666667e-01
+350 344 -7.50000000000000e-01
+350 343 1.66666666666667e-01
+350 480 8.33333333333333e-02
+350 349 -3.33333333333333e-01
+350 73 -8.33333333333333e-02
+350 37 -8.33333333333333e-02
+350 340 -8.33333333333333e-02
+350 337 8.33333333333333e-02
+350 348 -3.33333333333333e-01
+350 339 1.66666666666667e-01
+350 411 1.66666666666667e-01
+350 341 -2.50000000000000e-01
+350 36 -8.33333333333333e-02
+350 336 8.33333333333333e-02
+350 413 -7.50000000000000e-01
+350 442 -1.66666666666667e-01
+350 412 1.66666666666667e-01
+350 72 -8.33333333333333e-02
+350 441 8.33333333333333e-02
+350 175 -8.33333333333333e-02
+350 517 8.33333333333333e-02
+350 156 8.33333333333333e-02
+350 345 -8.33333333333333e-02
+350 176 -2.50000000000000e-01
+350 174 1.66666666666667e-01
+350 516 -1.66666666666667e-01
+350 347 -2.50000000000000e-01
+350 376 1.66666666666667e-01
+350 157 -1.66666666666667e-01
+350 346 1.66666666666667e-01
+351 351 1.25000000000000e+00
+351 382 -8.33333333333333e-02
+351 362 -4.16666666666667e-02
+351 368 8.33333333333333e-02
+351 361 8.33333333333333e-02
+351 360 -1.25000000000000e-01
+351 380 4.16666666666667e-02
+351 383 -8.33333333333333e-02
+351 379 -8.33333333333333e-02
+351 140 4.16666666666667e-02
+351 143 -4.16666666666667e-02
+351 370 8.33333333333333e-02
+351 358 -8.33333333333333e-02
+351 44 8.33333333333333e-02
+351 371 -1.66666666666667e-01
+351 43 8.33333333333333e-02
+351 352 -1.66666666666667e-01
+351 142 8.33333333333333e-02
+351 42 -3.75000000000000e-01
+351 141 -1.25000000000000e-01
+351 353 -1.66666666666667e-01
+351 41 8.33333333333333e-02
+351 359 1.66666666666667e-01
+351 40 8.33333333333333e-02
+351 139 -8.33333333333333e-02
+351 367 8.33333333333333e-02
+351 39 -3.75000000000000e-01
+351 357 -2.50000000000000e-01
+352 352 1.25000000000000e+00
+352 383 -8.33333333333333e-02
+352 366 8.33333333333333e-02
+352 381 -8.33333333333333e-02
+352 362 8.33333333333333e-02
+352 368 -1.66666666666667e-01
+352 361 -3.75000000000000e-01
+352 360 8.33333333333333e-02
+352 378 -8.33333333333333e-02
+352 353 -1.66666666666667e-01
+352 143 8.33333333333333e-02
+352 359 1.66666666666667e-01
+352 369 8.33333333333333e-02
+352 357 -8.33333333333333e-02
+352 44 -4.16666666666667e-02
+352 371 8.33333333333333e-02
+352 43 -1.25000000000000e-01
+352 142 -3.75000000000000e-01
+352 42 8.33333333333333e-02
+352 351 -1.66666666666667e-01
+352 141 8.33333333333333e-02
+352 41 -4.16666666666667e-02
+352 140 4.16666666666667e-02
+352 380 4.16666666666667e-02
+352 40 -1.25000000000000e-01
+352 358 -2.50000000000000e-01
+352 39 8.33333333333333e-02
+352 138 -8.33333333333333e-02
+353 353 1.25000000000000e+00
+353 382 -8.33333333333333e-02
+353 362 -1.25000000000000e-01
+353 361 8.33333333333333e-02
+353 367 -1.66666666666667e-01
+353 360 -4.16666666666667e-02
+353 366 8.33333333333333e-02
+353 378 4.16666666666667e-02
+353 381 -8.33333333333333e-02
+353 138 4.16666666666667e-02
+353 141 -4.16666666666667e-02
+353 352 -1.66666666666667e-01
+353 142 8.33333333333333e-02
+353 358 1.66666666666667e-01
+353 44 -1.25000000000000e-01
+353 143 -1.25000000000000e-01
+353 43 -4.16666666666667e-02
+353 370 8.33333333333333e-02
+353 42 8.33333333333333e-02
+353 369 -1.66666666666667e-01
+353 379 4.16666666666667e-02
+353 41 -1.25000000000000e-01
+353 359 -7.50000000000000e-01
+353 40 -4.16666666666667e-02
+353 139 4.16666666666667e-02
+353 351 -1.66666666666667e-01
+353 39 8.33333333333333e-02
+353 357 1.66666666666667e-01
+354 354 6.37500000000000e+01
+354 428 2.12500000000000e+00
+354 364 4.25000000000000e+00
+354 355 -8.50000000000000e+00
+354 41 4.25000000000000e+00
+354 40 -2.12500000000000e+00
+354 363 -6.37500000000000e+00
+354 356 -8.50000000000000e+00
+354 53 4.25000000000000e+00
+354 427 2.12500000000000e+00
+354 52 -2.12500000000000e+00
+354 139 2.12500000000000e+00
+354 140 2.12500000000000e+00
+354 39 -6.37500000000000e+00
+354 152 -2.12500000000000e+00
+354 151 4.25000000000000e+00
+354 150 -6.37500000000000e+00
+354 365 -2.12500000000000e+00
+354 51 -6.37500000000000e+00
+354 368 8.33333333333333e-02
+354 431 -8.33333333333333e-02
+354 430 -8.33333333333333e-02
+354 367 -1.66666666666667e-01
+354 358 1.66666666666667e-01
+354 425 -1.66666666666667e-01
+354 424 8.33333333333333e-02
+354 359 1.66666666666667e-01
+354 357 -7.50000000000000e-01
+354 1720 8.33333333333333e+00
+354 1718 -8.33333333333333e+00
+354 1717 4.16666666666667e+00
+354 1721 8.33333333333333e+00
+354 1719 -3.75000000000000e+01
+354 1687 -4.16666666666667e+00
+354 1688 -4.16666666666667e+00
+354 1694 4.16666666666667e+00
+354 1693 -8.33333333333333e+00
+355 355 6.37500000000000e+01
+355 363 4.25000000000000e+00
+355 354 -8.50000000000000e+00
+355 365 4.25000000000000e+00
+355 364 -1.91250000000000e+01
+355 39 -2.12500000000000e+00
+355 428 -4.25000000000000e+00
+355 426 2.12500000000000e+00
+355 51 -2.12500000000000e+00
+355 138 2.12500000000000e+00
+355 140 -4.25000000000000e+00
+355 41 4.25000000000000e+00
+355 40 -6.37500000000000e+00
+355 152 4.25000000000000e+00
+355 356 -8.50000000000000e+00
+355 53 4.25000000000000e+00
+355 151 -1.91250000000000e+01
+355 52 -6.37500000000000e+00
+355 150 4.25000000000000e+00
+355 429 -8.33333333333333e-02
+355 368 8.33333333333333e-02
+355 366 -1.66666666666667e-01
+355 431 -8.33333333333333e-02
+355 359 -8.33333333333333e-02
+355 425 8.33333333333333e-02
+355 357 1.66666666666667e-01
+355 423 8.33333333333333e-02
+355 358 -2.50000000000000e-01
+355 1721 -4.16666666666667e+00
+355 1719 8.33333333333333e+00
+355 1716 4.16666666666667e+00
+355 1720 -1.25000000000000e+01
+355 1686 -4.16666666666667e+00
+355 1688 -4.16666666666667e+00
+355 1694 4.16666666666667e+00
+355 1718 4.16666666666667e+00
+355 1692 -8.33333333333333e+00
+356 356 6.37500000000000e+01
+356 363 -2.12500000000000e+00
+356 426 2.12500000000000e+00
+356 365 -6.37500000000000e+00
+356 364 4.25000000000000e+00
+356 39 4.25000000000000e+00
+356 427 -4.25000000000000e+00
+356 354 -8.50000000000000e+00
+356 51 4.25000000000000e+00
+356 41 -1.91250000000000e+01
+356 139 -4.25000000000000e+00
+356 40 4.25000000000000e+00
+356 138 2.12500000000000e+00
+356 152 -6.37500000000000e+00
+356 53 -1.91250000000000e+01
+356 151 4.25000000000000e+00
+356 355 -8.50000000000000e+00
+356 52 4.25000000000000e+00
+356 150 -2.12500000000000e+00
+356 366 8.33333333333333e-02
+356 429 -8.33333333333333e-02
+356 367 8.33333333333333e-02
+356 430 -8.33333333333333e-02
+356 358 -8.33333333333333e-02
+356 424 8.33333333333333e-02
+356 423 -1.66666666666667e-01
+356 359 -2.50000000000000e-01
+356 357 1.66666666666667e-01
+356 1720 -4.16666666666667e+00
+356 1716 -8.33333333333333e+00
+356 1721 -1.25000000000000e+01
+356 1719 8.33333333333333e+00
+356 1687 -4.16666666666667e+00
+356 1693 4.16666666666667e+00
+356 1686 -4.16666666666667e+00
+356 1717 4.16666666666667e+00
+356 1692 4.16666666666667e+00
+357 357 2.50000000000000e+00
+357 382 -1.66666666666667e-01
+357 352 -8.33333333333333e-02
+357 142 8.33333333333333e-02
+357 143 8.33333333333333e-02
+357 353 1.66666666666667e-01
+357 351 -2.50000000000000e-01
+357 371 1.66666666666667e-01
+357 370 1.66666666666667e-01
+357 369 -7.50000000000000e-01
+357 446 -8.33333333333333e-02
+357 445 -8.33333333333333e-02
+357 368 -8.33333333333333e-02
+357 431 8.33333333333333e-02
+357 430 8.33333333333333e-02
+357 367 1.66666666666667e-01
+357 358 -3.33333333333333e-01
+357 366 -2.50000000000000e-01
+357 155 -8.33333333333333e-02
+357 359 -3.33333333333333e-01
+357 140 -8.33333333333333e-02
+357 152 8.33333333333333e-02
+357 355 1.66666666666667e-01
+357 154 1.66666666666667e-01
+357 151 -1.66666666666667e-01
+357 356 1.66666666666667e-01
+357 41 -1.66666666666667e-01
+357 40 8.33333333333333e-02
+357 139 -8.33333333333333e-02
+357 354 -7.50000000000000e-01
+357 425 1.66666666666667e-01
+357 56 -1.66666666666667e-01
+357 424 -8.33333333333333e-02
+357 55 8.33333333333333e-02
+357 423 -2.50000000000000e-01
+357 383 8.33333333333333e-02
+357 153 -2.50000000000000e-01
+358 358 2.50000000000000e+00
+358 381 -1.66666666666667e-01
+358 353 1.66666666666667e-01
+358 351 -8.33333333333333e-02
+358 141 8.33333333333333e-02
+358 143 -1.66666666666667e-01
+358 352 -2.50000000000000e-01
+358 371 -8.33333333333333e-02
+358 370 -2.50000000000000e-01
+358 369 1.66666666666667e-01
+358 444 -8.33333333333333e-02
+358 368 1.66666666666667e-01
+358 431 -1.66666666666667e-01
+358 429 8.33333333333333e-02
+358 41 8.33333333333333e-02
+358 367 -7.50000000000000e-01
+358 366 1.66666666666667e-01
+358 357 -3.33333333333333e-01
+358 446 -8.33333333333333e-02
+358 56 8.33333333333333e-02
+358 356 -8.33333333333333e-02
+358 354 1.66666666666667e-01
+358 140 -8.33333333333333e-02
+358 152 8.33333333333333e-02
+358 153 1.66666666666667e-01
+358 150 -1.66666666666667e-01
+358 355 -2.50000000000000e-01
+358 39 8.33333333333333e-02
+358 138 -8.33333333333333e-02
+358 425 1.66666666666667e-01
+358 359 -3.33333333333333e-01
+358 155 1.66666666666667e-01
+358 424 -2.50000000000000e-01
+358 383 8.33333333333333e-02
+358 154 -7.50000000000000e-01
+358 423 -8.33333333333333e-02
+358 54 8.33333333333333e-02
+359 359 2.50000000000000e+00
+359 382 8.33333333333333e-02
+359 352 1.66666666666667e-01
+359 142 -1.66666666666667e-01
+359 141 8.33333333333333e-02
+359 353 -7.50000000000000e-01
+359 351 1.66666666666667e-01
+359 371 -2.50000000000000e-01
+359 370 -8.33333333333333e-02
+359 369 1.66666666666667e-01
+359 444 -8.33333333333333e-02
+359 367 1.66666666666667e-01
+359 366 -8.33333333333333e-02
+359 429 8.33333333333333e-02
+359 430 -1.66666666666667e-01
+359 368 -2.50000000000000e-01
+359 40 8.33333333333333e-02
+359 445 -8.33333333333333e-02
+359 55 8.33333333333333e-02
+359 153 -8.33333333333333e-02
+359 355 -8.33333333333333e-02
+359 357 -3.33333333333333e-01
+359 138 -8.33333333333333e-02
+359 150 8.33333333333333e-02
+359 139 -8.33333333333333e-02
+359 151 8.33333333333333e-02
+359 356 -2.50000000000000e-01
+359 354 1.66666666666667e-01
+359 39 -1.66666666666667e-01
+359 425 -7.50000000000000e-01
+359 381 8.33333333333333e-02
+359 155 -2.50000000000000e-01
+359 424 1.66666666666667e-01
+359 358 -3.33333333333333e-01
+359 154 1.66666666666667e-01
+359 423 1.66666666666667e-01
+359 54 -1.66666666666667e-01
+360 360 1.25000000000000e+00
+360 382 8.33333333333333e-02
+360 383 -1.66666666666667e-01
+360 41 4.16666666666667e-02
+360 353 -4.16666666666667e-02
+360 352 8.33333333333333e-02
+360 351 -1.25000000000000e-01
+360 89 4.16666666666667e-02
+360 379 8.33333333333333e-02
+360 378 -3.75000000000000e-01
+360 367 -8.33333333333333e-02
+360 197 -4.16666666666667e-02
+360 361 -1.66666666666667e-01
+360 604 -8.33333333333333e-02
+360 202 8.33333333333333e-02
+360 605 -8.33333333333333e-02
+360 203 8.33333333333333e-02
+360 88 -8.33333333333333e-02
+360 196 8.33333333333333e-02
+360 195 -1.25000000000000e-01
+360 362 -1.66666666666667e-01
+360 194 8.33333333333333e-02
+360 368 1.66666666666667e-01
+360 193 8.33333333333333e-02
+360 40 -8.33333333333333e-02
+360 380 8.33333333333333e-02
+360 192 -3.75000000000000e-01
+360 366 -2.50000000000000e-01
+361 361 1.25000000000000e+00
+361 381 8.33333333333333e-02
+361 383 8.33333333333333e-02
+361 353 8.33333333333333e-02
+361 362 -1.66666666666667e-01
+361 352 -3.75000000000000e-01
+361 351 8.33333333333333e-02
+361 379 -1.25000000000000e-01
+361 378 8.33333333333333e-02
+361 366 -8.33333333333333e-02
+361 360 -1.66666666666667e-01
+361 197 8.33333333333333e-02
+361 603 -8.33333333333333e-02
+361 201 8.33333333333333e-02
+361 368 1.66666666666667e-01
+361 203 -1.66666666666667e-01
+361 89 4.16666666666667e-02
+361 605 -8.33333333333333e-02
+361 196 -3.75000000000000e-01
+361 87 -8.33333333333333e-02
+361 195 8.33333333333333e-02
+361 194 -4.16666666666667e-02
+361 41 4.16666666666667e-02
+361 380 -4.16666666666667e-02
+361 193 -1.25000000000000e-01
+361 367 -2.50000000000000e-01
+361 192 8.33333333333333e-02
+361 39 -8.33333333333333e-02
+362 362 1.25000000000000e+00
+362 378 8.33333333333333e-02
+362 382 8.33333333333333e-02
+362 381 -1.66666666666667e-01
+362 353 -1.25000000000000e-01
+362 352 8.33333333333333e-02
+362 361 -1.66666666666667e-01
+362 39 4.16666666666667e-02
+362 351 -4.16666666666667e-02
+362 380 -1.25000000000000e-01
+362 87 4.16666666666667e-02
+362 195 -4.16666666666667e-02
+362 196 8.33333333333333e-02
+362 367 1.66666666666667e-01
+362 202 -1.66666666666667e-01
+362 603 -8.33333333333333e-02
+362 201 8.33333333333333e-02
+362 197 -1.25000000000000e-01
+362 88 4.16666666666667e-02
+362 604 -8.33333333333333e-02
+362 379 -4.16666666666667e-02
+362 194 -1.25000000000000e-01
+362 368 -7.50000000000000e-01
+362 193 -4.16666666666667e-02
+362 40 4.16666666666667e-02
+362 360 -1.66666666666667e-01
+362 192 8.33333333333333e-02
+362 366 1.66666666666667e-01
+363 363 6.37500000000000e+01
+363 355 4.25000000000000e+00
+363 40 2.12500000000000e+00
+363 354 -6.37500000000000e+00
+363 365 -8.50000000000000e+00
+363 428 4.25000000000000e+00
+363 91 2.12500000000000e+00
+363 427 -2.12500000000000e+00
+363 426 -6.37500000000000e+00
+363 194 4.25000000000000e+00
+363 193 -2.12500000000000e+00
+363 41 2.12500000000000e+00
+363 192 -6.37500000000000e+00
+363 200 -2.12500000000000e+00
+363 92 2.12500000000000e+00
+363 364 -8.50000000000000e+00
+363 199 4.25000000000000e+00
+363 356 -2.12500000000000e+00
+363 198 -6.37500000000000e+00
+363 431 -1.66666666666667e-01
+363 430 8.33333333333333e-02
+363 611 -8.33333333333333e-02
+363 203 8.33333333333333e-02
+363 202 -1.66666666666667e-01
+363 367 1.66666666666667e-01
+363 610 -8.33333333333333e-02
+363 368 1.66666666666667e-01
+363 366 -7.50000000000000e-01
+363 1721 4.16666666666667e+00
+363 1720 -8.33333333333333e+00
+363 1717 -4.16666666666667e+00
+363 1462 4.16666666666667e+00
+363 1463 -8.33333333333333e+00
+363 1730 8.33333333333333e+00
+363 1718 -4.16666666666667e+00
+363 1729 8.33333333333333e+00
+363 1728 -3.75000000000000e+01
+364 364 6.37500000000000e+01
+364 354 4.25000000000000e+00
+364 356 4.25000000000000e+00
+364 355 -1.91250000000000e+01
+364 39 2.12500000000000e+00
+364 428 4.25000000000000e+00
+364 427 -6.37500000000000e+00
+364 90 2.12500000000000e+00
+364 426 -2.12500000000000e+00
+364 365 -8.50000000000000e+00
+364 192 -2.12500000000000e+00
+364 41 -4.25000000000000e+00
+364 194 4.25000000000000e+00
+364 193 -6.37500000000000e+00
+364 200 4.25000000000000e+00
+364 92 -4.25000000000000e+00
+364 199 -1.91250000000000e+01
+364 363 -8.50000000000000e+00
+364 198 4.25000000000000e+00
+364 429 8.33333333333333e-02
+364 611 -8.33333333333333e-02
+364 203 8.33333333333333e-02
+364 368 -8.33333333333333e-02
+364 201 -1.66666666666667e-01
+364 366 1.66666666666667e-01
+364 609 -8.33333333333333e-02
+364 431 8.33333333333333e-02
+364 367 -2.50000000000000e-01
+364 1719 -8.33333333333333e+00
+364 1716 -4.16666666666667e+00
+364 1718 -4.16666666666667e+00
+364 1461 4.16666666666667e+00
+364 1463 4.16666666666667e+00
+364 1730 -4.16666666666667e+00
+364 1721 4.16666666666667e+00
+364 1729 -1.25000000000000e+01
+364 1728 8.33333333333333e+00
+365 365 6.37500000000000e+01
+365 354 -2.12500000000000e+00
+365 356 -6.37500000000000e+00
+365 355 4.25000000000000e+00
+365 428 -1.91250000000000e+01
+365 427 4.25000000000000e+00
+365 363 -8.50000000000000e+00
+365 426 4.25000000000000e+00
+365 364 -8.50000000000000e+00
+365 192 4.25000000000000e+00
+365 194 -1.91250000000000e+01
+365 40 -4.25000000000000e+00
+365 193 4.25000000000000e+00
+365 39 2.12500000000000e+00
+365 200 -6.37500000000000e+00
+365 199 4.25000000000000e+00
+365 91 -4.25000000000000e+00
+365 198 -2.12500000000000e+00
+365 90 2.12500000000000e+00
+365 429 -1.66666666666667e-01
+365 609 -8.33333333333333e-02
+365 610 -8.33333333333333e-02
+365 201 8.33333333333333e-02
+365 202 8.33333333333333e-02
+365 367 -8.33333333333333e-02
+365 430 8.33333333333333e-02
+365 368 -2.50000000000000e-01
+365 366 1.66666666666667e-01
+365 1719 4.16666666666667e+00
+365 1717 -4.16666666666667e+00
+365 1462 4.16666666666667e+00
+365 1729 -4.16666666666667e+00
+365 1461 -8.33333333333333e+00
+365 1728 8.33333333333333e+00
+365 1716 -4.16666666666667e+00
+365 1720 4.16666666666667e+00
+365 1730 -1.25000000000000e+01
+366 366 2.50000000000000e+00
+366 383 1.66666666666667e-01
+366 353 8.33333333333333e-02
+366 382 1.66666666666667e-01
+366 381 -7.50000000000000e-01
+366 361 -8.33333333333333e-02
+366 605 8.33333333333333e-02
+366 362 1.66666666666667e-01
+366 360 -2.50000000000000e-01
+366 604 -1.66666666666667e-01
+366 368 -3.33333333333333e-01
+366 95 -8.33333333333333e-02
+366 41 -8.33333333333333e-02
+366 445 8.33333333333333e-02
+366 430 -8.33333333333333e-02
+366 359 -8.33333333333333e-02
+366 356 8.33333333333333e-02
+366 446 -1.66666666666667e-01
+366 431 1.66666666666667e-01
+366 429 -2.50000000000000e-01
+366 358 1.66666666666667e-01
+366 355 -1.66666666666667e-01
+366 357 -2.50000000000000e-01
+366 203 -8.33333333333333e-02
+366 611 8.33333333333333e-02
+366 202 1.66666666666667e-01
+366 367 -3.33333333333333e-01
+366 364 1.66666666666667e-01
+366 610 8.33333333333333e-02
+366 94 -8.33333333333333e-02
+366 201 -2.50000000000000e-01
+366 365 1.66666666666667e-01
+366 194 -1.66666666666667e-01
+366 193 8.33333333333333e-02
+366 40 -8.33333333333333e-02
+366 363 -7.50000000000000e-01
+366 352 8.33333333333333e-02
+367 367 2.50000000000000e+00
+367 383 -8.33333333333333e-02
+367 353 -1.66666666666667e-01
+367 382 -2.50000000000000e-01
+367 381 1.66666666666667e-01
+367 360 -8.33333333333333e-02
+367 362 1.66666666666667e-01
+367 361 -2.50000000000000e-01
+367 605 8.33333333333333e-02
+367 603 -1.66666666666667e-01
+367 444 8.33333333333333e-02
+367 429 -8.33333333333333e-02
+367 359 1.66666666666667e-01
+367 368 -3.33333333333333e-01
+367 431 1.66666666666667e-01
+367 95 -8.33333333333333e-02
+367 446 8.33333333333333e-02
+367 430 -2.50000000000000e-01
+367 41 -8.33333333333333e-02
+367 356 8.33333333333333e-02
+367 358 -7.50000000000000e-01
+367 357 1.66666666666667e-01
+367 354 -1.66666666666667e-01
+367 194 8.33333333333333e-02
+367 365 -8.33333333333333e-02
+367 201 1.66666666666667e-01
+367 366 -3.33333333333333e-01
+367 363 1.66666666666667e-01
+367 611 -1.66666666666667e-01
+367 203 1.66666666666667e-01
+367 202 -7.50000000000000e-01
+367 609 8.33333333333333e-02
+367 93 -8.33333333333333e-02
+367 364 -2.50000000000000e-01
+367 351 8.33333333333333e-02
+367 192 8.33333333333333e-02
+367 39 -8.33333333333333e-02
+368 368 2.50000000000000e+00
+368 381 1.66666666666667e-01
+368 352 -1.66666666666667e-01
+368 351 8.33333333333333e-02
+368 383 -2.50000000000000e-01
+368 361 1.66666666666667e-01
+368 603 8.33333333333333e-02
+368 362 -7.50000000000000e-01
+368 360 1.66666666666667e-01
+368 604 8.33333333333333e-02
+368 366 -3.33333333333333e-01
+368 93 -8.33333333333333e-02
+368 39 -8.33333333333333e-02
+368 358 1.66666666666667e-01
+368 367 -3.33333333333333e-01
+368 430 1.66666666666667e-01
+368 357 -8.33333333333333e-02
+368 354 8.33333333333333e-02
+368 431 -7.50000000000000e-01
+368 94 -8.33333333333333e-02
+368 445 8.33333333333333e-02
+368 444 -1.66666666666667e-01
+368 429 1.66666666666667e-01
+368 359 -2.50000000000000e-01
+368 40 -8.33333333333333e-02
+368 355 8.33333333333333e-02
+368 201 -8.33333333333333e-02
+368 609 8.33333333333333e-02
+368 193 8.33333333333333e-02
+368 364 -8.33333333333333e-02
+368 203 -2.50000000000000e-01
+368 610 -1.66666666666667e-01
+368 202 1.66666666666667e-01
+368 365 -2.50000000000000e-01
+368 382 -8.33333333333333e-02
+368 363 1.66666666666667e-01
+368 192 -1.66666666666667e-01
+369 369 2.50000000000000e+00
+369 383 -8.33333333333333e-02
+369 382 1.66666666666667e-01
+369 381 -2.50000000000000e-01
+369 446 8.33333333333333e-02
+369 352 8.33333333333333e-02
+369 353 -1.66666666666667e-01
+369 359 1.66666666666667e-01
+369 358 1.66666666666667e-01
+369 357 -7.50000000000000e-01
+369 370 -3.33333333333333e-01
+369 43 -8.33333333333333e-02
+369 55 -8.33333333333333e-02
+369 448 -8.33333333333333e-02
+369 442 8.33333333333333e-02
+369 449 -8.33333333333333e-02
+369 386 8.33333333333333e-02
+369 44 1.66666666666667e-01
+369 371 -3.33333333333333e-01
+369 377 1.66666666666667e-01
+369 385 -1.66666666666667e-01
+369 376 1.66666666666667e-01
+369 375 -7.50000000000000e-01
+369 56 1.66666666666667e-01
+369 443 -1.66666666666667e-01
+369 142 -8.33333333333333e-02
+369 334 8.33333333333333e-02
+369 335 8.33333333333333e-02
+369 143 -8.33333333333333e-02
+369 42 -2.50000000000000e-01
+369 341 -8.33333333333333e-02
+369 155 8.33333333333333e-02
+369 340 1.66666666666667e-01
+369 154 -1.66666666666667e-01
+369 339 -2.50000000000000e-01
+369 445 8.33333333333333e-02
+369 54 -2.50000000000000e-01
+370 370 2.50000000000000e+00
+370 383 1.66666666666667e-01
+370 382 -7.50000000000000e-01
+370 381 1.66666666666667e-01
+370 446 -1.66666666666667e-01
+370 351 8.33333333333333e-02
+370 353 8.33333333333333e-02
+370 359 -8.33333333333333e-02
+370 358 -2.50000000000000e-01
+370 357 1.66666666666667e-01
+370 369 -3.33333333333333e-01
+370 42 -8.33333333333333e-02
+370 54 -8.33333333333333e-02
+370 447 -8.33333333333333e-02
+370 441 8.33333333333333e-02
+370 386 8.33333333333333e-02
+370 377 -8.33333333333333e-02
+370 376 -2.50000000000000e-01
+370 384 -1.66666666666667e-01
+370 375 1.66666666666667e-01
+370 449 -8.33333333333333e-02
+370 443 8.33333333333333e-02
+370 141 -8.33333333333333e-02
+370 333 8.33333333333333e-02
+370 143 -8.33333333333333e-02
+370 155 8.33333333333333e-02
+370 335 -1.66666666666667e-01
+370 44 1.66666666666667e-01
+370 43 -2.50000000000000e-01
+370 341 1.66666666666667e-01
+370 371 -3.33333333333333e-01
+370 56 1.66666666666667e-01
+370 340 -7.50000000000000e-01
+370 444 8.33333333333333e-02
+370 55 -2.50000000000000e-01
+370 339 1.66666666666667e-01
+370 153 -1.66666666666667e-01
+371 371 2.50000000000000e+00
+371 382 1.66666666666667e-01
+371 381 -8.33333333333333e-02
+371 445 -1.66666666666667e-01
+371 444 8.33333333333333e-02
+371 352 8.33333333333333e-02
+371 351 -1.66666666666667e-01
+371 359 -2.50000000000000e-01
+371 358 -8.33333333333333e-02
+371 357 1.66666666666667e-01
+371 447 -8.33333333333333e-02
+371 384 8.33333333333333e-02
+371 377 -2.50000000000000e-01
+371 385 8.33333333333333e-02
+371 376 -8.33333333333333e-02
+371 42 1.66666666666667e-01
+371 369 -3.33333333333333e-01
+371 375 1.66666666666667e-01
+371 448 -8.33333333333333e-02
+371 442 8.33333333333333e-02
+371 54 1.66666666666667e-01
+371 441 -1.66666666666667e-01
+371 142 -8.33333333333333e-02
+371 154 8.33333333333333e-02
+371 44 -7.50000000000000e-01
+371 334 -1.66666666666667e-01
+371 43 1.66666666666667e-01
+371 333 8.33333333333333e-02
+371 141 -8.33333333333333e-02
+371 341 -2.50000000000000e-01
+371 383 -2.50000000000000e-01
+371 56 -7.50000000000000e-01
+371 340 1.66666666666667e-01
+371 370 -3.33333333333333e-01
+371 55 1.66666666666667e-01
+371 339 -8.33333333333333e-02
+371 153 8.33333333333333e-02
+372 372 1.25000000000000e+00
+372 335 4.16666666666667e-02
+372 334 -8.33333333333333e-02
+372 343 8.33333333333333e-02
+372 342 -1.25000000000000e-01
+372 44 8.33333333333333e-02
+372 374 -1.66666666666667e-01
+372 377 1.66666666666667e-01
+372 376 -8.33333333333333e-02
+372 375 -2.50000000000000e-01
+372 62 8.33333333333333e-02
+372 482 -1.66666666666667e-01
+372 481 8.33333333333333e-02
+372 385 8.33333333333333e-02
+372 490 -8.33333333333333e-02
+372 209 4.16666666666667e-02
+372 491 -8.33333333333333e-02
+372 61 8.33333333333333e-02
+372 208 -8.33333333333333e-02
+372 60 -3.75000000000000e-01
+372 206 -4.16666666666667e-02
+372 386 8.33333333333333e-02
+372 373 -1.66666666666667e-01
+372 205 8.33333333333333e-02
+372 43 8.33333333333333e-02
+372 344 -4.16666666666667e-02
+372 204 -1.25000000000000e-01
+372 42 -3.75000000000000e-01
+373 373 1.25000000000000e+00
+373 374 -1.66666666666667e-01
+373 44 -4.16666666666667e-02
+373 335 4.16666666666667e-02
+373 333 -8.33333333333333e-02
+373 62 -4.16666666666667e-02
+373 343 -3.75000000000000e-01
+373 342 8.33333333333333e-02
+373 482 8.33333333333333e-02
+373 377 1.66666666666667e-01
+373 376 -2.50000000000000e-01
+373 375 -8.33333333333333e-02
+373 480 8.33333333333333e-02
+373 384 8.33333333333333e-02
+373 489 -8.33333333333333e-02
+373 209 4.16666666666667e-02
+373 491 -8.33333333333333e-02
+373 61 -1.25000000000000e-01
+373 60 8.33333333333333e-02
+373 207 -8.33333333333333e-02
+373 206 8.33333333333333e-02
+373 386 -1.66666666666667e-01
+373 344 8.33333333333333e-02
+373 205 -3.75000000000000e-01
+373 43 -1.25000000000000e-01
+373 372 -1.66666666666667e-01
+373 204 8.33333333333333e-02
+373 42 8.33333333333333e-02
+374 374 1.25000000000000e+00
+374 373 -1.66666666666667e-01
+374 342 -4.16666666666667e-02
+374 333 4.16666666666667e-02
+374 43 -4.16666666666667e-02
+374 334 4.16666666666667e-02
+374 344 -1.25000000000000e-01
+374 61 -4.16666666666667e-02
+374 481 8.33333333333333e-02
+374 377 -7.50000000000000e-01
+374 376 1.66666666666667e-01
+374 42 8.33333333333333e-02
+374 372 -1.66666666666667e-01
+374 375 1.66666666666667e-01
+374 60 8.33333333333333e-02
+374 480 -1.66666666666667e-01
+374 208 4.16666666666667e-02
+374 490 -8.33333333333333e-02
+374 62 -1.25000000000000e-01
+374 207 4.16666666666667e-02
+374 489 -8.33333333333333e-02
+374 343 8.33333333333333e-02
+374 206 -1.25000000000000e-01
+374 44 -1.25000000000000e-01
+374 205 8.33333333333333e-02
+374 385 -1.66666666666667e-01
+374 204 -4.16666666666667e-02
+374 384 8.33333333333333e-02
+375 375 2.50000000000000e+00
+375 340 -1.66666666666667e-01
+375 335 -8.33333333333333e-02
+375 343 8.33333333333333e-02
+375 334 -8.33333333333333e-02
+375 344 8.33333333333333e-02
+375 350 -8.33333333333333e-02
+375 349 1.66666666666667e-01
+375 348 -2.50000000000000e-01
+375 491 8.33333333333333e-02
+375 490 -1.66666666666667e-01
+375 481 1.66666666666667e-01
+375 374 1.66666666666667e-01
+375 43 8.33333333333333e-02
+375 373 -8.33333333333333e-02
+375 372 -2.50000000000000e-01
+375 482 1.66666666666667e-01
+375 73 8.33333333333333e-02
+375 480 -7.50000000000000e-01
+375 377 -3.33333333333333e-01
+375 442 -8.33333333333333e-02
+375 386 -8.33333333333333e-02
+375 448 8.33333333333333e-02
+375 553 -8.33333333333333e-02
+375 449 8.33333333333333e-02
+375 554 -8.33333333333333e-02
+375 44 -1.66666666666667e-01
+375 371 1.66666666666667e-01
+375 385 1.66666666666667e-01
+375 370 1.66666666666667e-01
+375 376 -3.33333333333333e-01
+375 384 -2.50000000000000e-01
+375 369 -7.50000000000000e-01
+375 443 1.66666666666667e-01
+375 74 -1.66666666666667e-01
+375 341 8.33333333333333e-02
+375 441 -2.50000000000000e-01
+376 376 2.50000000000000e+00
+376 339 -1.66666666666667e-01
+376 342 8.33333333333333e-02
+376 333 -8.33333333333333e-02
+376 344 -1.66666666666667e-01
+376 350 1.66666666666667e-01
+376 335 -8.33333333333333e-02
+376 349 -7.50000000000000e-01
+376 348 1.66666666666667e-01
+376 491 8.33333333333333e-02
+376 482 -8.33333333333333e-02
+376 489 -1.66666666666667e-01
+376 480 1.66666666666667e-01
+376 374 1.66666666666667e-01
+376 377 -3.33333333333333e-01
+376 373 -2.50000000000000e-01
+376 42 8.33333333333333e-02
+376 372 -8.33333333333333e-02
+376 481 -2.50000000000000e-01
+376 72 8.33333333333333e-02
+376 441 -8.33333333333333e-02
+376 386 1.66666666666667e-01
+376 447 8.33333333333333e-02
+376 552 -8.33333333333333e-02
+376 449 -1.66666666666667e-01
+376 443 1.66666666666667e-01
+376 44 8.33333333333333e-02
+376 371 -8.33333333333333e-02
+376 385 -7.50000000000000e-01
+376 370 -2.50000000000000e-01
+376 384 1.66666666666667e-01
+376 369 1.66666666666667e-01
+376 375 -3.33333333333333e-01
+376 554 -8.33333333333333e-02
+376 74 8.33333333333333e-02
+376 341 8.33333333333333e-02
+376 442 -2.50000000000000e-01
+377 377 2.50000000000000e+00
+377 339 8.33333333333333e-02
+377 333 -8.33333333333333e-02
+377 343 -1.66666666666667e-01
+377 349 1.66666666666667e-01
+377 342 8.33333333333333e-02
+377 348 -8.33333333333333e-02
+377 334 -8.33333333333333e-02
+377 350 -2.50000000000000e-01
+377 490 8.33333333333333e-02
+377 481 -8.33333333333333e-02
+377 489 8.33333333333333e-02
+377 374 -7.50000000000000e-01
+377 373 1.66666666666667e-01
+377 376 -3.33333333333333e-01
+377 372 1.66666666666667e-01
+377 482 -2.50000000000000e-01
+377 480 1.66666666666667e-01
+377 375 -3.33333333333333e-01
+377 384 -8.33333333333333e-02
+377 385 1.66666666666667e-01
+377 448 -1.66666666666667e-01
+377 442 1.66666666666667e-01
+377 447 8.33333333333333e-02
+377 552 -8.33333333333333e-02
+377 386 -2.50000000000000e-01
+377 371 -2.50000000000000e-01
+377 43 8.33333333333333e-02
+377 370 -8.33333333333333e-02
+377 42 -1.66666666666667e-01
+377 369 1.66666666666667e-01
+377 340 8.33333333333333e-02
+377 443 -7.50000000000000e-01
+377 553 -8.33333333333333e-02
+377 73 8.33333333333333e-02
+377 441 1.66666666666667e-01
+377 72 -1.66666666666667e-01
+378 378 1.25000000000000e+00
+378 362 8.33333333333333e-02
+378 353 4.16666666666667e-02
+378 44 -4.16666666666667e-02
+378 352 -8.33333333333333e-02
+378 89 -4.16666666666667e-02
+378 361 8.33333333333333e-02
+378 360 -3.75000000000000e-01
+378 605 8.33333333333333e-02
+378 604 8.33333333333333e-02
+378 383 1.66666666666667e-01
+378 382 -8.33333333333333e-02
+378 381 -2.50000000000000e-01
+378 385 8.33333333333333e-02
+378 607 -8.33333333333333e-02
+378 212 4.16666666666667e-02
+378 608 -8.33333333333333e-02
+378 211 -8.33333333333333e-02
+378 88 8.33333333333333e-02
+378 87 -1.25000000000000e-01
+378 206 8.33333333333333e-02
+378 386 -1.66666666666667e-01
+378 205 8.33333333333333e-02
+378 379 -1.66666666666667e-01
+378 43 8.33333333333333e-02
+378 204 -3.75000000000000e-01
+378 380 -1.66666666666667e-01
+378 42 -1.25000000000000e-01
+379 379 1.25000000000000e+00
+379 353 4.16666666666667e-02
+379 351 -8.33333333333333e-02
+379 361 -1.25000000000000e-01
+379 360 8.33333333333333e-02
+379 89 8.33333333333333e-02
+379 605 -1.66666666666667e-01
+379 603 8.33333333333333e-02
+379 380 -1.66666666666667e-01
+379 44 8.33333333333333e-02
+379 383 1.66666666666667e-01
+379 382 -2.50000000000000e-01
+379 381 -8.33333333333333e-02
+379 384 8.33333333333333e-02
+379 606 -8.33333333333333e-02
+379 212 4.16666666666667e-02
+379 608 -8.33333333333333e-02
+379 88 -3.75000000000000e-01
+379 210 -8.33333333333333e-02
+379 87 8.33333333333333e-02
+379 206 -4.16666666666667e-02
+379 386 8.33333333333333e-02
+379 205 -1.25000000000000e-01
+379 362 -4.16666666666667e-02
+379 43 -3.75000000000000e-01
+379 204 8.33333333333333e-02
+379 378 -1.66666666666667e-01
+379 42 8.33333333333333e-02
+380 380 1.25000000000000e+00
+380 352 4.16666666666667e-02
+380 378 -1.66666666666667e-01
+380 360 8.33333333333333e-02
+380 351 4.16666666666667e-02
+380 42 -4.16666666666667e-02
+380 362 -1.25000000000000e-01
+380 87 -4.16666666666667e-02
+380 603 8.33333333333333e-02
+380 88 8.33333333333333e-02
+380 604 -1.66666666666667e-01
+380 383 -7.50000000000000e-01
+380 379 -1.66666666666667e-01
+380 43 8.33333333333333e-02
+380 382 1.66666666666667e-01
+380 381 1.66666666666667e-01
+380 210 4.16666666666667e-02
+380 606 -8.33333333333333e-02
+380 89 -1.25000000000000e-01
+380 211 4.16666666666667e-02
+380 607 -8.33333333333333e-02
+380 206 -1.25000000000000e-01
+380 361 -4.16666666666667e-02
+380 44 -1.25000000000000e-01
+380 205 -4.16666666666667e-02
+380 385 8.33333333333333e-02
+380 204 8.33333333333333e-02
+380 384 -1.66666666666667e-01
+381 381 2.50000000000000e+00
+381 358 -1.66666666666667e-01
+381 352 -8.33333333333333e-02
+381 361 8.33333333333333e-02
+381 368 1.66666666666667e-01
+381 362 -1.66666666666667e-01
+381 353 -8.33333333333333e-02
+381 367 1.66666666666667e-01
+381 366 -7.50000000000000e-01
+381 608 8.33333333333333e-02
+381 605 -8.33333333333333e-02
+381 604 1.66666666666667e-01
+381 607 -1.66666666666667e-01
+381 380 1.66666666666667e-01
+381 383 -3.33333333333333e-01
+381 379 -8.33333333333333e-02
+381 43 8.33333333333333e-02
+381 378 -2.50000000000000e-01
+381 94 8.33333333333333e-02
+381 603 -2.50000000000000e-01
+381 445 -8.33333333333333e-02
+381 386 1.66666666666667e-01
+381 448 8.33333333333333e-02
+381 616 -8.33333333333333e-02
+381 449 -1.66666666666667e-01
+381 446 1.66666666666667e-01
+381 44 8.33333333333333e-02
+381 371 -8.33333333333333e-02
+381 385 1.66666666666667e-01
+381 370 1.66666666666667e-01
+381 382 -3.33333333333333e-01
+381 384 -7.50000000000000e-01
+381 369 -2.50000000000000e-01
+381 617 -8.33333333333333e-02
+381 95 8.33333333333333e-02
+381 359 8.33333333333333e-02
+381 444 -2.50000000000000e-01
+382 382 2.50000000000000e+00
+382 357 -1.66666666666667e-01
+382 353 -8.33333333333333e-02
+382 351 -8.33333333333333e-02
+382 360 8.33333333333333e-02
+382 368 -8.33333333333333e-02
+382 362 8.33333333333333e-02
+382 367 -2.50000000000000e-01
+382 366 1.66666666666667e-01
+382 608 8.33333333333333e-02
+382 603 1.66666666666667e-01
+382 606 -1.66666666666667e-01
+382 380 1.66666666666667e-01
+382 379 -2.50000000000000e-01
+382 378 -8.33333333333333e-02
+382 42 8.33333333333333e-02
+382 605 1.66666666666667e-01
+382 604 -7.50000000000000e-01
+382 93 8.33333333333333e-02
+382 383 -3.33333333333333e-01
+382 444 -8.33333333333333e-02
+382 386 -8.33333333333333e-02
+382 447 8.33333333333333e-02
+382 615 -8.33333333333333e-02
+382 617 -8.33333333333333e-02
+382 449 8.33333333333333e-02
+382 44 -1.66666666666667e-01
+382 371 1.66666666666667e-01
+382 385 -2.50000000000000e-01
+382 370 -7.50000000000000e-01
+382 384 1.66666666666667e-01
+382 369 1.66666666666667e-01
+382 381 -3.33333333333333e-01
+382 446 1.66666666666667e-01
+382 95 -1.66666666666667e-01
+382 359 8.33333333333333e-02
+382 445 -2.50000000000000e-01
+383 383 2.50000000000000e+00
+383 358 8.33333333333333e-02
+383 352 -8.33333333333333e-02
+383 367 -8.33333333333333e-02
+383 361 8.33333333333333e-02
+383 366 1.66666666666667e-01
+383 360 -1.66666666666667e-01
+383 351 -8.33333333333333e-02
+383 368 -2.50000000000000e-01
+383 606 8.33333333333333e-02
+383 603 -8.33333333333333e-02
+383 607 8.33333333333333e-02
+383 380 -7.50000000000000e-01
+383 379 1.66666666666667e-01
+383 378 1.66666666666667e-01
+383 381 -3.33333333333333e-01
+383 605 -2.50000000000000e-01
+383 604 1.66666666666667e-01
+383 382 -3.33333333333333e-01
+383 385 -8.33333333333333e-02
+383 384 1.66666666666667e-01
+383 616 -8.33333333333333e-02
+383 448 8.33333333333333e-02
+383 447 -1.66666666666667e-01
+383 444 1.66666666666667e-01
+383 386 -2.50000000000000e-01
+383 371 -2.50000000000000e-01
+383 43 -1.66666666666667e-01
+383 370 1.66666666666667e-01
+383 42 8.33333333333333e-02
+383 369 -8.33333333333333e-02
+383 357 8.33333333333333e-02
+383 446 -7.50000000000000e-01
+383 445 1.66666666666667e-01
+383 94 -1.66666666666667e-01
+383 615 -8.33333333333333e-02
+383 93 8.33333333333333e-02
+384 384 2.50000000000000e+00
+384 616 8.33333333333333e-02
+384 617 8.33333333333333e-02
+384 382 1.66666666666667e-01
+384 381 -7.50000000000000e-01
+384 379 8.33333333333333e-02
+384 608 -8.33333333333333e-02
+384 380 -1.66666666666667e-01
+384 607 1.66666666666667e-01
+384 606 -2.50000000000000e-01
+384 385 -3.33333333333333e-01
+384 43 -8.33333333333333e-02
+384 100 -8.33333333333333e-02
+384 371 8.33333333333333e-02
+384 377 -8.33333333333333e-02
+384 448 -8.33333333333333e-02
+384 553 8.33333333333333e-02
+384 370 -1.66666666666667e-01
+384 376 1.66666666666667e-01
+384 375 -2.50000000000000e-01
+384 449 1.66666666666667e-01
+384 554 -1.66666666666667e-01
+384 447 -2.50000000000000e-01
+384 205 -8.33333333333333e-02
+384 373 8.33333333333333e-02
+384 206 1.66666666666667e-01
+384 386 -3.33333333333333e-01
+384 491 1.66666666666667e-01
+384 374 8.33333333333333e-02
+384 44 -8.33333333333333e-02
+384 204 -2.50000000000000e-01
+384 218 8.33333333333333e-02
+384 101 -8.33333333333333e-02
+384 490 1.66666666666667e-01
+384 217 -1.66666666666667e-01
+384 489 -7.50000000000000e-01
+384 383 1.66666666666667e-01
+385 385 2.50000000000000e+00
+385 615 8.33333333333333e-02
+385 617 -1.66666666666667e-01
+385 382 -2.50000000000000e-01
+385 381 1.66666666666667e-01
+385 378 8.33333333333333e-02
+385 608 1.66666666666667e-01
+385 380 8.33333333333333e-02
+385 607 -7.50000000000000e-01
+385 606 1.66666666666667e-01
+385 384 -3.33333333333333e-01
+385 42 -8.33333333333333e-02
+385 99 -8.33333333333333e-02
+385 449 1.66666666666667e-01
+385 386 -3.33333333333333e-01
+385 377 1.66666666666667e-01
+385 447 -8.33333333333333e-02
+385 552 8.33333333333333e-02
+385 44 -8.33333333333333e-02
+385 371 8.33333333333333e-02
+385 376 -7.50000000000000e-01
+385 369 -1.66666666666667e-01
+385 375 1.66666666666667e-01
+385 101 -8.33333333333333e-02
+385 554 8.33333333333333e-02
+385 448 -2.50000000000000e-01
+385 204 -8.33333333333333e-02
+385 372 8.33333333333333e-02
+385 218 8.33333333333333e-02
+385 491 -8.33333333333333e-02
+385 374 -1.66666666666667e-01
+385 206 1.66666666666667e-01
+385 205 -2.50000000000000e-01
+385 490 -2.50000000000000e-01
+385 383 -8.33333333333333e-02
+385 489 1.66666666666667e-01
+385 216 -1.66666666666667e-01
+386 386 2.50000000000000e+00
+386 381 1.66666666666667e-01
+386 616 -1.66666666666667e-01
+386 615 8.33333333333333e-02
+386 383 -2.50000000000000e-01
+386 607 1.66666666666667e-01
+386 606 -8.33333333333333e-02
+386 379 8.33333333333333e-02
+386 378 -1.66666666666667e-01
+386 608 -2.50000000000000e-01
+386 369 8.33333333333333e-02
+386 375 -8.33333333333333e-02
+386 448 1.66666666666667e-01
+386 385 -3.33333333333333e-01
+386 376 1.66666666666667e-01
+386 377 -2.50000000000000e-01
+386 43 -8.33333333333333e-02
+386 370 8.33333333333333e-02
+386 449 -7.50000000000000e-01
+386 100 -8.33333333333333e-02
+386 553 8.33333333333333e-02
+386 447 1.66666666666667e-01
+386 552 -1.66666666666667e-01
+386 217 8.33333333333333e-02
+386 490 -8.33333333333333e-02
+386 204 1.66666666666667e-01
+386 384 -3.33333333333333e-01
+386 489 1.66666666666667e-01
+386 206 -7.50000000000000e-01
+386 373 -1.66666666666667e-01
+386 205 1.66666666666667e-01
+386 372 8.33333333333333e-02
+386 42 -8.33333333333333e-02
+386 491 -2.50000000000000e-01
+386 382 -8.33333333333333e-02
+386 216 8.33333333333333e-02
+386 99 -8.33333333333333e-02
+387 387 1.25000000000000e+00
+387 419 -8.33333333333333e-02
+387 416 -8.33333333333333e-02
+387 415 4.16666666666667e-02
+387 418 -8.33333333333333e-02
+387 398 8.33333333333333e-02
+387 397 -4.16666666666667e-02
+387 403 8.33333333333333e-02
+387 396 -1.25000000000000e-01
+387 148 -4.16666666666667e-02
+387 145 4.16666666666667e-02
+387 407 8.33333333333333e-02
+387 395 -8.33333333333333e-02
+387 47 8.33333333333333e-02
+387 146 -8.33333333333333e-02
+387 46 8.33333333333333e-02
+387 388 -1.66666666666667e-01
+387 394 1.66666666666667e-01
+387 45 -3.75000000000000e-01
+387 393 -2.50000000000000e-01
+387 389 -1.66666666666667e-01
+387 50 8.33333333333333e-02
+387 149 8.33333333333333e-02
+387 49 8.33333333333333e-02
+387 406 -1.66666666666667e-01
+387 404 8.33333333333333e-02
+387 48 -3.75000000000000e-01
+387 147 -1.25000000000000e-01
+388 388 1.25000000000000e+00
+388 419 -8.33333333333333e-02
+388 414 4.16666666666667e-02
+388 417 -8.33333333333333e-02
+388 398 8.33333333333333e-02
+388 404 -1.66666666666667e-01
+388 397 -1.25000000000000e-01
+388 396 -4.16666666666667e-02
+388 402 8.33333333333333e-02
+388 147 -4.16666666666667e-02
+388 144 4.16666666666667e-02
+388 149 8.33333333333333e-02
+388 389 -1.66666666666667e-01
+388 395 1.66666666666667e-01
+388 47 -4.16666666666667e-02
+388 146 4.16666666666667e-02
+388 46 -1.25000000000000e-01
+388 394 -7.50000000000000e-01
+388 45 8.33333333333333e-02
+388 387 -1.66666666666667e-01
+388 393 1.66666666666667e-01
+388 50 -4.16666666666667e-02
+388 407 8.33333333333333e-02
+388 416 4.16666666666667e-02
+388 49 -1.25000000000000e-01
+388 148 -1.25000000000000e-01
+388 48 8.33333333333333e-02
+388 405 -1.66666666666667e-01
+389 389 1.25000000000000e+00
+389 418 -8.33333333333333e-02
+389 402 8.33333333333333e-02
+389 417 -8.33333333333333e-02
+389 414 -8.33333333333333e-02
+389 398 -3.75000000000000e-01
+389 397 8.33333333333333e-02
+389 403 -1.66666666666667e-01
+389 396 8.33333333333333e-02
+389 148 8.33333333333333e-02
+389 388 -1.66666666666667e-01
+389 394 1.66666666666667e-01
+389 405 8.33333333333333e-02
+389 393 -8.33333333333333e-02
+389 47 -1.25000000000000e-01
+389 395 -2.50000000000000e-01
+389 46 -4.16666666666667e-02
+389 145 4.16666666666667e-02
+389 45 8.33333333333333e-02
+389 144 -8.33333333333333e-02
+389 415 4.16666666666667e-02
+389 50 -1.25000000000000e-01
+389 149 -3.75000000000000e-01
+389 49 -4.16666666666667e-02
+389 406 8.33333333333333e-02
+389 387 -1.66666666666667e-01
+389 48 8.33333333333333e-02
+389 147 8.33333333333333e-02
+390 390 6.37500000000000e+01
+390 401 4.25000000000000e+00
+390 400 -2.12500000000000e+00
+390 433 2.12500000000000e+00
+390 434 2.12500000000000e+00
+390 53 -2.12500000000000e+00
+390 47 -2.12500000000000e+00
+390 399 -6.37500000000000e+00
+390 46 4.25000000000000e+00
+390 391 -8.50000000000000e+00
+390 52 4.25000000000000e+00
+390 146 2.12500000000000e+00
+390 145 2.12500000000000e+00
+390 45 -6.37500000000000e+00
+390 152 4.25000000000000e+00
+390 151 -2.12500000000000e+00
+390 150 -6.37500000000000e+00
+390 392 -8.50000000000000e+00
+390 51 -6.37500000000000e+00
+390 437 -8.33333333333333e-02
+390 404 -1.66666666666667e-01
+390 403 8.33333333333333e-02
+390 436 -8.33333333333333e-02
+390 395 1.66666666666667e-01
+390 425 8.33333333333333e-02
+390 424 -1.66666666666667e-01
+390 394 1.66666666666667e-01
+390 393 -7.50000000000000e-01
+390 1754 4.16666666666667e+00
+390 1753 -8.33333333333333e+00
+390 1757 8.33333333333333e+00
+390 1756 8.33333333333333e+00
+390 1755 -3.75000000000000e+01
+390 1691 -4.16666666666667e+00
+390 1690 -4.16666666666667e+00
+390 1694 -8.33333333333333e+00
+390 1693 4.16666666666667e+00
+391 391 6.37500000000000e+01
+391 432 2.12500000000000e+00
+391 434 -4.25000000000000e+00
+391 401 4.25000000000000e+00
+391 400 -6.37500000000000e+00
+391 45 4.25000000000000e+00
+391 390 -8.50000000000000e+00
+391 51 4.25000000000000e+00
+391 146 -4.25000000000000e+00
+391 47 4.25000000000000e+00
+391 46 -1.91250000000000e+01
+391 144 2.12500000000000e+00
+391 152 4.25000000000000e+00
+391 392 -8.50000000000000e+00
+391 53 4.25000000000000e+00
+391 151 -6.37500000000000e+00
+391 399 -2.12500000000000e+00
+391 52 -1.91250000000000e+01
+391 150 -2.12500000000000e+00
+391 437 -8.33333333333333e-02
+391 402 8.33333333333333e-02
+391 435 -8.33333333333333e-02
+391 425 8.33333333333333e-02
+391 395 -8.33333333333333e-02
+391 423 -1.66666666666667e-01
+391 404 8.33333333333333e-02
+391 394 -2.50000000000000e-01
+391 393 1.66666666666667e-01
+391 1754 4.16666666666667e+00
+391 1752 -8.33333333333333e+00
+391 1757 -4.16666666666667e+00
+391 1756 -1.25000000000000e+01
+391 1755 8.33333333333333e+00
+391 1694 4.16666666666667e+00
+391 1691 -4.16666666666667e+00
+391 1689 -4.16666666666667e+00
+391 1692 4.16666666666667e+00
+392 392 6.37500000000000e+01
+392 399 4.25000000000000e+00
+392 433 -4.25000000000000e+00
+392 432 2.12500000000000e+00
+392 51 -2.12500000000000e+00
+392 401 -1.91250000000000e+01
+392 400 4.25000000000000e+00
+392 45 -2.12500000000000e+00
+392 144 2.12500000000000e+00
+392 47 -6.37500000000000e+00
+392 145 -4.25000000000000e+00
+392 46 4.25000000000000e+00
+392 152 -1.91250000000000e+01
+392 390 -8.50000000000000e+00
+392 53 -6.37500000000000e+00
+392 151 4.25000000000000e+00
+392 391 -8.50000000000000e+00
+392 52 4.25000000000000e+00
+392 150 4.25000000000000e+00
+392 435 -8.33333333333333e-02
+392 403 8.33333333333333e-02
+392 436 -8.33333333333333e-02
+392 402 -1.66666666666667e-01
+392 424 8.33333333333333e-02
+392 394 -8.33333333333333e-02
+392 393 1.66666666666667e-01
+392 423 8.33333333333333e-02
+392 395 -2.50000000000000e-01
+392 1752 4.16666666666667e+00
+392 1753 4.16666666666667e+00
+392 1757 -1.25000000000000e+01
+392 1756 -4.16666666666667e+00
+392 1755 8.33333333333333e+00
+392 1693 4.16666666666667e+00
+392 1690 -4.16666666666667e+00
+392 1689 -4.16666666666667e+00
+392 1692 -8.33333333333333e+00
+393 393 2.50000000000000e+00
+393 437 8.33333333333333e-02
+393 392 1.66666666666667e-01
+393 152 -1.66666666666667e-01
+393 151 8.33333333333333e-02
+393 391 1.66666666666667e-01
+393 390 -7.50000000000000e-01
+393 425 -8.33333333333333e-02
+393 424 1.66666666666667e-01
+393 423 -2.50000000000000e-01
+393 403 -8.33333333333333e-02
+393 451 -8.33333333333333e-02
+393 418 8.33333333333333e-02
+393 404 1.66666666666667e-01
+393 419 -1.66666666666667e-01
+393 56 8.33333333333333e-02
+393 452 -8.33333333333333e-02
+393 47 8.33333333333333e-02
+393 402 -2.50000000000000e-01
+393 146 -8.33333333333333e-02
+393 145 -8.33333333333333e-02
+393 149 8.33333333333333e-02
+393 389 -8.33333333333333e-02
+393 394 -3.33333333333333e-01
+393 148 8.33333333333333e-02
+393 154 -8.33333333333333e-02
+393 46 -1.66666666666667e-01
+393 388 1.66666666666667e-01
+393 387 -2.50000000000000e-01
+393 395 -3.33333333333333e-01
+393 407 1.66666666666667e-01
+393 155 1.66666666666667e-01
+393 406 1.66666666666667e-01
+393 55 -1.66666666666667e-01
+393 436 8.33333333333333e-02
+393 405 -7.50000000000000e-01
+393 153 -2.50000000000000e-01
+394 394 2.50000000000000e+00
+394 437 -1.66666666666667e-01
+394 392 -8.33333333333333e-02
+394 152 8.33333333333333e-02
+394 150 8.33333333333333e-02
+394 391 -2.50000000000000e-01
+394 390 1.66666666666667e-01
+394 425 1.66666666666667e-01
+394 424 -7.50000000000000e-01
+394 423 1.66666666666667e-01
+394 402 -8.33333333333333e-02
+394 450 -8.33333333333333e-02
+394 417 8.33333333333333e-02
+394 452 -8.33333333333333e-02
+394 419 8.33333333333333e-02
+394 395 -3.33333333333333e-01
+394 404 1.66666666666667e-01
+394 403 -2.50000000000000e-01
+394 144 -8.33333333333333e-02
+394 389 1.66666666666667e-01
+394 393 -3.33333333333333e-01
+394 149 -1.66666666666667e-01
+394 155 1.66666666666667e-01
+394 147 8.33333333333333e-02
+394 153 -8.33333333333333e-02
+394 47 8.33333333333333e-02
+394 146 -8.33333333333333e-02
+394 388 -7.50000000000000e-01
+394 45 -1.66666666666667e-01
+394 387 1.66666666666667e-01
+394 407 -8.33333333333333e-02
+394 56 8.33333333333333e-02
+394 435 8.33333333333333e-02
+394 406 -2.50000000000000e-01
+394 154 -2.50000000000000e-01
+394 405 1.66666666666667e-01
+394 54 -1.66666666666667e-01
+395 395 2.50000000000000e+00
+395 435 8.33333333333333e-02
+395 391 -8.33333333333333e-02
+395 151 8.33333333333333e-02
+395 390 1.66666666666667e-01
+395 150 -1.66666666666667e-01
+395 392 -2.50000000000000e-01
+395 425 -2.50000000000000e-01
+395 424 1.66666666666667e-01
+395 423 -8.33333333333333e-02
+395 451 -8.33333333333333e-02
+395 418 8.33333333333333e-02
+395 402 1.66666666666667e-01
+395 417 -1.66666666666667e-01
+395 54 8.33333333333333e-02
+395 450 -8.33333333333333e-02
+395 404 -7.50000000000000e-01
+395 394 -3.33333333333333e-01
+395 403 1.66666666666667e-01
+395 45 8.33333333333333e-02
+395 144 -8.33333333333333e-02
+395 388 1.66666666666667e-01
+395 147 8.33333333333333e-02
+395 387 -8.33333333333333e-02
+395 148 -1.66666666666667e-01
+395 154 1.66666666666667e-01
+395 389 -2.50000000000000e-01
+395 46 8.33333333333333e-02
+395 145 -8.33333333333333e-02
+395 436 -1.66666666666667e-01
+395 407 -2.50000000000000e-01
+395 155 -7.50000000000000e-01
+395 406 -8.33333333333333e-02
+395 55 8.33333333333333e-02
+395 393 -3.33333333333333e-01
+395 405 1.66666666666667e-01
+395 153 1.66666666666667e-01
+396 396 1.25000000000000e+00
+396 419 8.33333333333333e-02
+396 418 -1.66666666666667e-01
+396 389 8.33333333333333e-02
+396 388 -4.16666666666667e-02
+396 46 4.16666666666667e-02
+396 387 -1.25000000000000e-01
+396 416 8.33333333333333e-02
+396 109 4.16666666666667e-02
+396 414 -3.75000000000000e-01
+396 404 -8.33333333333333e-02
+396 398 -1.66666666666667e-01
+396 238 -4.16666666666667e-02
+396 641 -8.33333333333333e-02
+396 245 8.33333333333333e-02
+396 640 -8.33333333333333e-02
+396 244 8.33333333333333e-02
+396 239 8.33333333333333e-02
+396 110 -8.33333333333333e-02
+396 237 -1.25000000000000e-01
+396 236 8.33333333333333e-02
+396 47 -8.33333333333333e-02
+396 235 8.33333333333333e-02
+396 397 -1.66666666666667e-01
+396 403 1.66666666666667e-01
+396 234 -3.75000000000000e-01
+396 415 8.33333333333333e-02
+396 402 -2.50000000000000e-01
+397 397 1.25000000000000e+00
+397 414 8.33333333333333e-02
+397 419 8.33333333333333e-02
+397 417 -1.66666666666667e-01
+397 389 8.33333333333333e-02
+397 398 -1.66666666666667e-01
+397 388 -1.25000000000000e-01
+397 387 -4.16666666666667e-02
+397 45 4.16666666666667e-02
+397 415 -1.25000000000000e-01
+397 108 4.16666666666667e-02
+397 237 -4.16666666666667e-02
+397 239 8.33333333333333e-02
+397 404 1.66666666666667e-01
+397 245 -1.66666666666667e-01
+397 639 -8.33333333333333e-02
+397 243 8.33333333333333e-02
+397 110 4.16666666666667e-02
+397 641 -8.33333333333333e-02
+397 238 -1.25000000000000e-01
+397 236 -4.16666666666667e-02
+397 47 4.16666666666667e-02
+397 235 -1.25000000000000e-01
+397 416 -4.16666666666667e-02
+397 403 -7.50000000000000e-01
+397 234 8.33333333333333e-02
+397 396 -1.66666666666667e-01
+397 402 1.66666666666667e-01
+398 398 1.25000000000000e+00
+398 417 8.33333333333333e-02
+398 418 8.33333333333333e-02
+398 389 -3.75000000000000e-01
+398 388 8.33333333333333e-02
+398 397 -1.66666666666667e-01
+398 387 8.33333333333333e-02
+398 416 -1.25000000000000e-01
+398 414 8.33333333333333e-02
+398 402 -8.33333333333333e-02
+398 396 -1.66666666666667e-01
+398 238 8.33333333333333e-02
+398 639 -8.33333333333333e-02
+398 243 8.33333333333333e-02
+398 403 1.66666666666667e-01
+398 244 -1.66666666666667e-01
+398 239 -3.75000000000000e-01
+398 109 4.16666666666667e-02
+398 640 -8.33333333333333e-02
+398 237 8.33333333333333e-02
+398 108 -8.33333333333333e-02
+398 236 -1.25000000000000e-01
+398 415 -4.16666666666667e-02
+398 404 -2.50000000000000e-01
+398 235 -4.16666666666667e-02
+398 46 4.16666666666667e-02
+398 234 8.33333333333333e-02
+398 45 -8.33333333333333e-02
+399 399 6.37500000000000e+01
+399 391 -2.12500000000000e+00
+399 113 2.12500000000000e+00
+399 434 -2.12500000000000e+00
+399 433 4.25000000000000e+00
+399 400 -8.50000000000000e+00
+399 432 -6.37500000000000e+00
+399 47 2.12500000000000e+00
+399 390 -6.37500000000000e+00
+399 236 -2.12500000000000e+00
+399 235 4.25000000000000e+00
+399 46 2.12500000000000e+00
+399 234 -6.37500000000000e+00
+399 401 -8.50000000000000e+00
+399 242 4.25000000000000e+00
+399 241 -2.12500000000000e+00
+399 112 2.12500000000000e+00
+399 392 4.25000000000000e+00
+399 240 -6.37500000000000e+00
+399 437 8.33333333333333e-02
+399 436 -1.66666666666667e-01
+399 404 1.66666666666667e-01
+399 245 -1.66666666666667e-01
+399 646 -8.33333333333333e-02
+399 244 8.33333333333333e-02
+399 647 -8.33333333333333e-02
+399 403 1.66666666666667e-01
+399 402 -7.50000000000000e-01
+399 1757 -8.33333333333333e+00
+399 1756 4.16666666666667e+00
+399 1754 -4.16666666666667e+00
+399 1499 4.16666666666667e+00
+399 1765 8.33333333333333e+00
+399 1498 -8.33333333333333e+00
+399 1753 -4.16666666666667e+00
+399 1766 8.33333333333333e+00
+399 1764 -3.75000000000000e+01
+400 400 6.37500000000000e+01
+400 434 4.25000000000000e+00
+400 433 -1.91250000000000e+01
+400 432 4.25000000000000e+00
+400 399 -8.50000000000000e+00
+400 392 4.25000000000000e+00
+400 391 -6.37500000000000e+00
+400 401 -8.50000000000000e+00
+400 234 4.25000000000000e+00
+400 47 -4.25000000000000e+00
+400 236 4.25000000000000e+00
+400 235 -1.91250000000000e+01
+400 45 2.12500000000000e+00
+400 242 4.25000000000000e+00
+400 113 -4.25000000000000e+00
+400 390 -2.12500000000000e+00
+400 241 -6.37500000000000e+00
+400 240 -2.12500000000000e+00
+400 111 2.12500000000000e+00
+400 437 8.33333333333333e-02
+400 435 -1.66666666666667e-01
+400 404 -8.33333333333333e-02
+400 647 -8.33333333333333e-02
+400 245 8.33333333333333e-02
+400 645 -8.33333333333333e-02
+400 243 8.33333333333333e-02
+400 403 -2.50000000000000e-01
+400 402 1.66666666666667e-01
+400 1757 4.16666666666667e+00
+400 1755 4.16666666666667e+00
+400 1766 -4.16666666666667e+00
+400 1754 -4.16666666666667e+00
+400 1499 4.16666666666667e+00
+400 1764 8.33333333333333e+00
+400 1497 -8.33333333333333e+00
+400 1752 -4.16666666666667e+00
+400 1765 -1.25000000000000e+01
+401 401 6.37500000000000e+01
+401 434 -6.37500000000000e+00
+401 433 4.25000000000000e+00
+401 111 2.12500000000000e+00
+401 432 -2.12500000000000e+00
+401 392 -1.91250000000000e+01
+401 391 4.25000000000000e+00
+401 45 2.12500000000000e+00
+401 400 -8.50000000000000e+00
+401 234 -2.12500000000000e+00
+401 236 -6.37500000000000e+00
+401 46 -4.25000000000000e+00
+401 235 4.25000000000000e+00
+401 390 4.25000000000000e+00
+401 242 -1.91250000000000e+01
+401 241 4.25000000000000e+00
+401 112 -4.25000000000000e+00
+401 399 -8.50000000000000e+00
+401 240 4.25000000000000e+00
+401 436 8.33333333333333e-02
+401 435 8.33333333333333e-02
+401 403 -8.33333333333333e-02
+401 646 -8.33333333333333e-02
+401 244 8.33333333333333e-02
+401 402 1.66666666666667e-01
+401 243 -1.66666666666667e-01
+401 645 -8.33333333333333e-02
+401 404 -2.50000000000000e-01
+401 1756 4.16666666666667e+00
+401 1755 -8.33333333333333e+00
+401 1765 -4.16666666666667e+00
+401 1753 -4.16666666666667e+00
+401 1498 4.16666666666667e+00
+401 1752 -4.16666666666667e+00
+401 1497 4.16666666666667e+00
+401 1766 -1.25000000000000e+01
+401 1764 8.33333333333333e+00
+402 402 2.50000000000000e+00
+402 436 1.66666666666667e-01
+402 392 -1.66666666666667e-01
+402 391 8.33333333333333e-02
+402 435 -2.50000000000000e-01
+402 401 1.66666666666667e-01
+402 646 8.33333333333333e-02
+402 400 1.66666666666667e-01
+402 399 -7.50000000000000e-01
+402 647 8.33333333333333e-02
+402 394 -8.33333333333333e-02
+402 395 1.66666666666667e-01
+402 404 -3.33333333333333e-01
+402 47 -8.33333333333333e-02
+402 393 -2.50000000000000e-01
+402 452 8.33333333333333e-02
+402 116 -8.33333333333333e-02
+402 451 -1.66666666666667e-01
+402 389 8.33333333333333e-02
+402 403 -3.33333333333333e-01
+402 418 1.66666666666667e-01
+402 388 8.33333333333333e-02
+402 46 -8.33333333333333e-02
+402 419 1.66666666666667e-01
+402 115 -8.33333333333333e-02
+402 417 -7.50000000000000e-01
+402 398 -8.33333333333333e-02
+402 236 8.33333333333333e-02
+402 640 8.33333333333333e-02
+402 244 -8.33333333333333e-02
+402 235 -1.66666666666667e-01
+402 397 1.66666666666667e-01
+402 396 -2.50000000000000e-01
+402 245 1.66666666666667e-01
+402 641 -1.66666666666667e-01
+402 243 -2.50000000000000e-01
+402 437 -8.33333333333333e-02
+403 403 2.50000000000000e+00
+403 435 1.66666666666667e-01
+403 390 8.33333333333333e-02
+403 437 1.66666666666667e-01
+403 436 -7.50000000000000e-01
+403 401 -8.33333333333333e-02
+403 645 8.33333333333333e-02
+403 400 -2.50000000000000e-01
+403 399 1.66666666666667e-01
+403 647 -1.66666666666667e-01
+403 393 -8.33333333333333e-02
+403 452 8.33333333333333e-02
+403 395 1.66666666666667e-01
+403 394 -2.50000000000000e-01
+403 450 -1.66666666666667e-01
+403 419 -8.33333333333333e-02
+403 402 -3.33333333333333e-01
+403 417 1.66666666666667e-01
+403 389 -1.66666666666667e-01
+403 387 8.33333333333333e-02
+403 45 -8.33333333333333e-02
+403 418 -2.50000000000000e-01
+403 114 -8.33333333333333e-02
+403 398 1.66666666666667e-01
+403 404 -3.33333333333333e-01
+403 245 1.66666666666667e-01
+403 639 8.33333333333333e-02
+403 243 -8.33333333333333e-02
+403 236 8.33333333333333e-02
+403 47 -8.33333333333333e-02
+403 397 -7.50000000000000e-01
+403 234 -1.66666666666667e-01
+403 396 1.66666666666667e-01
+403 641 8.33333333333333e-02
+403 116 -8.33333333333333e-02
+403 244 -2.50000000000000e-01
+403 392 8.33333333333333e-02
+404 404 2.50000000000000e+00
+404 435 -8.33333333333333e-02
+404 390 -1.66666666666667e-01
+404 437 -2.50000000000000e-01
+404 436 1.66666666666667e-01
+404 400 -8.33333333333333e-02
+404 399 1.66666666666667e-01
+404 401 -2.50000000000000e-01
+404 646 -1.66666666666667e-01
+404 645 8.33333333333333e-02
+404 451 8.33333333333333e-02
+404 393 1.66666666666667e-01
+404 402 -3.33333333333333e-01
+404 395 -7.50000000000000e-01
+404 394 1.66666666666667e-01
+404 45 -8.33333333333333e-02
+404 450 8.33333333333333e-02
+404 114 -8.33333333333333e-02
+404 387 8.33333333333333e-02
+404 418 -8.33333333333333e-02
+404 388 -1.66666666666667e-01
+404 419 -2.50000000000000e-01
+404 417 1.66666666666667e-01
+404 396 -8.33333333333333e-02
+404 234 8.33333333333333e-02
+404 397 1.66666666666667e-01
+404 403 -3.33333333333333e-01
+404 244 1.66666666666667e-01
+404 398 -2.50000000000000e-01
+404 235 8.33333333333333e-02
+404 46 -8.33333333333333e-02
+404 245 -7.50000000000000e-01
+404 391 8.33333333333333e-02
+404 640 8.33333333333333e-02
+404 115 -8.33333333333333e-02
+404 243 1.66666666666667e-01
+404 639 -1.66666666666667e-01
+405 405 2.50000000000000e+00
+405 443 8.33333333333333e-02
+405 442 -1.66666666666667e-01
+405 412 1.66666666666667e-01
+405 411 -7.50000000000000e-01
+405 338 8.33333333333333e-02
+405 337 8.33333333333333e-02
+405 341 1.66666666666667e-01
+405 340 -8.33333333333333e-02
+405 339 -2.50000000000000e-01
+405 407 -3.33333333333333e-01
+405 50 -8.33333333333333e-02
+405 56 -8.33333333333333e-02
+405 455 -8.33333333333333e-02
+405 452 8.33333333333333e-02
+405 422 -1.66666666666667e-01
+405 419 1.66666666666667e-01
+405 421 8.33333333333333e-02
+405 418 -8.33333333333333e-02
+405 417 -2.50000000000000e-01
+405 454 -8.33333333333333e-02
+405 451 8.33333333333333e-02
+405 149 -8.33333333333333e-02
+405 389 8.33333333333333e-02
+405 148 -8.33333333333333e-02
+405 154 8.33333333333333e-02
+405 388 -1.66666666666667e-01
+405 49 1.66666666666667e-01
+405 48 -2.50000000000000e-01
+405 395 1.66666666666667e-01
+405 155 -1.66666666666667e-01
+405 394 1.66666666666667e-01
+405 406 -3.33333333333333e-01
+405 55 1.66666666666667e-01
+405 393 -7.50000000000000e-01
+405 413 1.66666666666667e-01
+405 54 -2.50000000000000e-01
+406 406 2.50000000000000e+00
+406 413 -8.33333333333333e-02
+406 441 -1.66666666666667e-01
+406 412 -2.50000000000000e-01
+406 411 1.66666666666667e-01
+406 338 -1.66666666666667e-01
+406 336 8.33333333333333e-02
+406 341 1.66666666666667e-01
+406 340 -2.50000000000000e-01
+406 339 -8.33333333333333e-02
+406 455 -8.33333333333333e-02
+406 422 8.33333333333333e-02
+406 50 1.66666666666667e-01
+406 407 -3.33333333333333e-01
+406 419 1.66666666666667e-01
+406 418 -2.50000000000000e-01
+406 420 8.33333333333333e-02
+406 417 -8.33333333333333e-02
+406 56 1.66666666666667e-01
+406 452 -1.66666666666667e-01
+406 453 -8.33333333333333e-02
+406 450 8.33333333333333e-02
+406 147 -8.33333333333333e-02
+406 153 8.33333333333333e-02
+406 389 8.33333333333333e-02
+406 149 -8.33333333333333e-02
+406 49 -7.50000000000000e-01
+406 387 -1.66666666666667e-01
+406 48 1.66666666666667e-01
+406 395 -8.33333333333333e-02
+406 155 8.33333333333333e-02
+406 394 -2.50000000000000e-01
+406 443 8.33333333333333e-02
+406 55 -7.50000000000000e-01
+406 393 1.66666666666667e-01
+406 405 -3.33333333333333e-01
+406 54 1.66666666666667e-01
+407 407 2.50000000000000e+00
+407 412 -8.33333333333333e-02
+407 411 1.66666666666667e-01
+407 441 8.33333333333333e-02
+407 413 -2.50000000000000e-01
+407 336 8.33333333333333e-02
+407 337 -1.66666666666667e-01
+407 341 -7.50000000000000e-01
+407 340 1.66666666666667e-01
+407 339 1.66666666666667e-01
+407 405 -3.33333333333333e-01
+407 48 -8.33333333333333e-02
+407 54 -8.33333333333333e-02
+407 453 -8.33333333333333e-02
+407 450 8.33333333333333e-02
+407 454 -8.33333333333333e-02
+407 421 8.33333333333333e-02
+407 419 -7.50000000000000e-01
+407 49 1.66666666666667e-01
+407 406 -3.33333333333333e-01
+407 418 1.66666666666667e-01
+407 420 -1.66666666666667e-01
+407 417 1.66666666666667e-01
+407 55 1.66666666666667e-01
+407 451 -1.66666666666667e-01
+407 147 -8.33333333333333e-02
+407 387 8.33333333333333e-02
+407 50 -2.50000000000000e-01
+407 388 8.33333333333333e-02
+407 148 -8.33333333333333e-02
+407 395 -2.50000000000000e-01
+407 442 8.33333333333333e-02
+407 56 -2.50000000000000e-01
+407 394 -8.33333333333333e-02
+407 154 8.33333333333333e-02
+407 393 1.66666666666667e-01
+407 153 -1.66666666666667e-01
+408 408 1.25000000000000e+00
+408 413 -8.33333333333333e-02
+408 346 -4.16666666666667e-02
+408 337 4.16666666666667e-02
+408 347 8.33333333333333e-02
+408 67 8.33333333333333e-02
+408 517 -1.66666666666667e-01
+408 345 -1.25000000000000e-01
+408 338 -8.33333333333333e-02
+408 409 -1.66666666666667e-01
+408 412 1.66666666666667e-01
+408 49 8.33333333333333e-02
+408 411 -2.50000000000000e-01
+408 527 -8.33333333333333e-02
+408 422 8.33333333333333e-02
+408 68 8.33333333333333e-02
+408 251 -8.33333333333333e-02
+408 250 4.16666666666667e-02
+408 526 -8.33333333333333e-02
+408 66 -3.75000000000000e-01
+408 410 -1.66666666666667e-01
+408 248 8.33333333333333e-02
+408 50 8.33333333333333e-02
+408 247 -4.16666666666667e-02
+408 421 8.33333333333333e-02
+408 518 8.33333333333333e-02
+408 246 -1.25000000000000e-01
+408 48 -3.75000000000000e-01
+409 409 1.25000000000000e+00
+409 347 8.33333333333333e-02
+409 413 1.66666666666667e-01
+409 345 -4.16666666666667e-02
+409 336 4.16666666666667e-02
+409 68 -4.16666666666667e-02
+409 518 8.33333333333333e-02
+409 346 -1.25000000000000e-01
+409 66 8.33333333333333e-02
+409 516 -1.66666666666667e-01
+409 338 4.16666666666667e-02
+409 50 -4.16666666666667e-02
+409 412 -7.50000000000000e-01
+409 408 -1.66666666666667e-01
+409 411 1.66666666666667e-01
+409 48 8.33333333333333e-02
+409 251 4.16666666666667e-02
+409 527 -8.33333333333333e-02
+409 67 -1.25000000000000e-01
+409 249 4.16666666666667e-02
+409 525 -8.33333333333333e-02
+409 248 8.33333333333333e-02
+409 422 -1.66666666666667e-01
+409 410 -1.66666666666667e-01
+409 247 -1.25000000000000e-01
+409 49 -1.25000000000000e-01
+409 246 -4.16666666666667e-02
+409 420 8.33333333333333e-02
+410 410 1.25000000000000e+00
+410 411 -8.33333333333333e-02
+410 409 -1.66666666666667e-01
+410 346 8.33333333333333e-02
+410 412 1.66666666666667e-01
+410 347 -3.75000000000000e-01
+410 67 -4.16666666666667e-02
+410 517 8.33333333333333e-02
+410 345 8.33333333333333e-02
+410 413 -2.50000000000000e-01
+410 337 4.16666666666667e-02
+410 49 -4.16666666666667e-02
+410 336 -8.33333333333333e-02
+410 250 4.16666666666667e-02
+410 526 -8.33333333333333e-02
+410 525 -8.33333333333333e-02
+410 420 8.33333333333333e-02
+410 68 -1.25000000000000e-01
+410 66 8.33333333333333e-02
+410 249 -8.33333333333333e-02
+410 516 8.33333333333333e-02
+410 248 -3.75000000000000e-01
+410 50 -1.25000000000000e-01
+410 247 8.33333333333333e-02
+410 421 -1.66666666666667e-01
+410 408 -1.66666666666667e-01
+410 246 8.33333333333333e-02
+410 48 8.33333333333333e-02
+411 411 2.50000000000000e+00
+411 454 8.33333333333333e-02
+411 559 -8.33333333333333e-02
+411 422 1.66666666666667e-01
+411 527 -1.66666666666667e-01
+411 421 -8.33333333333333e-02
+411 526 8.33333333333333e-02
+411 560 -8.33333333333333e-02
+411 420 -2.50000000000000e-01
+411 347 8.33333333333333e-02
+411 410 -8.33333333333333e-02
+411 346 8.33333333333333e-02
+411 518 1.66666666666667e-01
+411 413 -3.33333333333333e-01
+411 517 1.66666666666667e-01
+411 516 -7.50000000000000e-01
+411 409 1.66666666666667e-01
+411 408 -2.50000000000000e-01
+411 412 -3.33333333333333e-01
+411 349 -8.33333333333333e-02
+411 350 1.66666666666667e-01
+411 341 -1.66666666666667e-01
+411 407 1.66666666666667e-01
+411 337 -8.33333333333333e-02
+411 340 8.33333333333333e-02
+411 74 8.33333333333333e-02
+411 443 -8.33333333333333e-02
+411 73 -1.66666666666667e-01
+411 442 1.66666666666667e-01
+411 348 -2.50000000000000e-01
+411 441 -2.50000000000000e-01
+411 338 -8.33333333333333e-02
+411 50 8.33333333333333e-02
+411 406 1.66666666666667e-01
+411 49 -1.66666666666667e-01
+411 455 8.33333333333333e-02
+411 405 -7.50000000000000e-01
+412 412 2.50000000000000e+00
+412 453 8.33333333333333e-02
+412 558 -8.33333333333333e-02
+412 560 -8.33333333333333e-02
+412 527 8.33333333333333e-02
+412 420 -8.33333333333333e-02
+412 525 8.33333333333333e-02
+412 422 1.66666666666667e-01
+412 421 -2.50000000000000e-01
+412 410 1.66666666666667e-01
+412 347 -1.66666666666667e-01
+412 345 8.33333333333333e-02
+412 518 -8.33333333333333e-02
+412 74 8.33333333333333e-02
+412 517 -2.50000000000000e-01
+412 516 1.66666666666667e-01
+412 50 8.33333333333333e-02
+412 409 -7.50000000000000e-01
+412 408 1.66666666666667e-01
+412 407 -8.33333333333333e-02
+412 411 -3.33333333333333e-01
+412 348 -8.33333333333333e-02
+412 341 8.33333333333333e-02
+412 338 -8.33333333333333e-02
+412 336 -8.33333333333333e-02
+412 339 8.33333333333333e-02
+412 350 1.66666666666667e-01
+412 443 1.66666666666667e-01
+412 413 -3.33333333333333e-01
+412 349 -2.50000000000000e-01
+412 442 -7.50000000000000e-01
+412 72 -1.66666666666667e-01
+412 441 1.66666666666667e-01
+412 455 -1.66666666666667e-01
+412 406 -2.50000000000000e-01
+412 405 1.66666666666667e-01
+412 48 -1.66666666666667e-01
+413 413 2.50000000000000e+00
+413 454 -1.66666666666667e-01
+413 559 -8.33333333333333e-02
+413 526 8.33333333333333e-02
+413 420 1.66666666666667e-01
+413 525 -1.66666666666667e-01
+413 558 -8.33333333333333e-02
+413 422 -7.50000000000000e-01
+413 421 1.66666666666667e-01
+413 345 8.33333333333333e-02
+413 408 -8.33333333333333e-02
+413 409 1.66666666666667e-01
+413 346 -1.66666666666667e-01
+413 518 -2.50000000000000e-01
+413 517 -8.33333333333333e-02
+413 73 8.33333333333333e-02
+413 516 1.66666666666667e-01
+413 411 -3.33333333333333e-01
+413 410 -2.50000000000000e-01
+413 49 8.33333333333333e-02
+413 406 -8.33333333333333e-02
+413 340 8.33333333333333e-02
+413 337 -8.33333333333333e-02
+413 348 1.66666666666667e-01
+413 339 -1.66666666666667e-01
+413 405 1.66666666666667e-01
+413 350 -7.50000000000000e-01
+413 443 -2.50000000000000e-01
+413 349 1.66666666666667e-01
+413 442 1.66666666666667e-01
+413 412 -3.33333333333333e-01
+413 72 8.33333333333333e-02
+413 441 -8.33333333333333e-02
+413 453 8.33333333333333e-02
+413 407 -2.50000000000000e-01
+413 336 -8.33333333333333e-02
+413 48 8.33333333333333e-02
+414 414 1.25000000000000e+00
+414 415 -1.66666666666667e-01
+414 389 -8.33333333333333e-02
+414 49 -4.16666666666667e-02
+414 388 4.16666666666667e-02
+414 398 8.33333333333333e-02
+414 109 -4.16666666666667e-02
+414 396 -3.75000000000000e-01
+414 640 8.33333333333333e-02
+414 419 -8.33333333333333e-02
+414 418 1.66666666666667e-01
+414 417 -2.50000000000000e-01
+414 641 8.33333333333333e-02
+414 422 8.33333333333333e-02
+414 644 -8.33333333333333e-02
+414 253 4.16666666666667e-02
+414 643 -8.33333333333333e-02
+414 110 8.33333333333333e-02
+414 254 -8.33333333333333e-02
+414 108 -1.25000000000000e-01
+414 416 -1.66666666666667e-01
+414 248 8.33333333333333e-02
+414 50 8.33333333333333e-02
+414 247 8.33333333333333e-02
+414 421 -1.66666666666667e-01
+414 397 8.33333333333333e-02
+414 246 -3.75000000000000e-01
+414 48 -1.25000000000000e-01
+415 415 1.25000000000000e+00
+415 389 4.16666666666667e-02
+415 396 8.33333333333333e-02
+415 414 -1.66666666666667e-01
+415 48 -4.16666666666667e-02
+415 387 4.16666666666667e-02
+415 397 -1.25000000000000e-01
+415 108 -4.16666666666667e-02
+415 639 8.33333333333333e-02
+415 50 8.33333333333333e-02
+415 416 -1.66666666666667e-01
+415 419 1.66666666666667e-01
+415 418 -7.50000000000000e-01
+415 417 1.66666666666667e-01
+415 110 8.33333333333333e-02
+415 641 -1.66666666666667e-01
+415 252 4.16666666666667e-02
+415 642 -8.33333333333333e-02
+415 254 4.16666666666667e-02
+415 644 -8.33333333333333e-02
+415 109 -1.25000000000000e-01
+415 248 -4.16666666666667e-02
+415 422 8.33333333333333e-02
+415 398 -4.16666666666667e-02
+415 247 -1.25000000000000e-01
+415 49 -1.25000000000000e-01
+415 246 8.33333333333333e-02
+415 420 -1.66666666666667e-01
+416 416 1.25000000000000e+00
+416 388 4.16666666666667e-02
+416 387 -8.33333333333333e-02
+416 398 -1.25000000000000e-01
+416 396 8.33333333333333e-02
+416 419 -2.50000000000000e-01
+416 49 8.33333333333333e-02
+416 415 -1.66666666666667e-01
+416 418 1.66666666666667e-01
+416 417 -8.33333333333333e-02
+416 109 8.33333333333333e-02
+416 640 -1.66666666666667e-01
+416 639 8.33333333333333e-02
+416 420 8.33333333333333e-02
+416 642 -8.33333333333333e-02
+416 110 -3.75000000000000e-01
+416 253 4.16666666666667e-02
+416 643 -8.33333333333333e-02
+416 108 8.33333333333333e-02
+416 252 -8.33333333333333e-02
+416 397 -4.16666666666667e-02
+416 248 -1.25000000000000e-01
+416 50 -3.75000000000000e-01
+416 247 -4.16666666666667e-02
+416 421 8.33333333333333e-02
+416 414 -1.66666666666667e-01
+416 246 8.33333333333333e-02
+416 48 8.33333333333333e-02
+417 417 2.50000000000000e+00
+417 395 -1.66666666666667e-01
+417 398 8.33333333333333e-02
+417 389 -8.33333333333333e-02
+417 397 -1.66666666666667e-01
+417 403 1.66666666666667e-01
+417 388 -8.33333333333333e-02
+417 404 1.66666666666667e-01
+417 402 -7.50000000000000e-01
+417 643 8.33333333333333e-02
+417 640 -8.33333333333333e-02
+417 644 -1.66666666666667e-01
+417 641 1.66666666666667e-01
+417 50 8.33333333333333e-02
+417 416 -8.33333333333333e-02
+417 415 1.66666666666667e-01
+417 418 -3.33333333333333e-01
+417 414 -2.50000000000000e-01
+417 116 8.33333333333333e-02
+417 639 -2.50000000000000e-01
+417 452 -8.33333333333333e-02
+417 455 8.33333333333333e-02
+417 653 -8.33333333333333e-02
+417 421 1.66666666666667e-01
+417 454 -1.66666666666667e-01
+417 451 1.66666666666667e-01
+417 422 1.66666666666667e-01
+417 407 1.66666666666667e-01
+417 419 -3.33333333333333e-01
+417 49 8.33333333333333e-02
+417 406 -8.33333333333333e-02
+417 420 -7.50000000000000e-01
+417 405 -2.50000000000000e-01
+417 652 -8.33333333333333e-02
+417 115 8.33333333333333e-02
+417 394 8.33333333333333e-02
+417 450 -2.50000000000000e-01
+418 418 2.50000000000000e+00
+418 395 8.33333333333333e-02
+418 389 -8.33333333333333e-02
+418 398 8.33333333333333e-02
+418 404 -8.33333333333333e-02
+418 396 -1.66666666666667e-01
+418 402 1.66666666666667e-01
+418 387 -8.33333333333333e-02
+418 403 -2.50000000000000e-01
+418 642 8.33333333333333e-02
+418 639 -8.33333333333333e-02
+418 644 8.33333333333333e-02
+418 416 1.66666666666667e-01
+418 415 -7.50000000000000e-01
+418 414 1.66666666666667e-01
+418 417 -3.33333333333333e-01
+418 641 1.66666666666667e-01
+418 640 -2.50000000000000e-01
+418 419 -3.33333333333333e-01
+418 422 -8.33333333333333e-02
+418 420 1.66666666666667e-01
+418 455 8.33333333333333e-02
+418 653 -8.33333333333333e-02
+418 453 -1.66666666666667e-01
+418 450 1.66666666666667e-01
+418 50 -1.66666666666667e-01
+418 407 1.66666666666667e-01
+418 421 -2.50000000000000e-01
+418 406 -2.50000000000000e-01
+418 48 8.33333333333333e-02
+418 405 -8.33333333333333e-02
+418 452 1.66666666666667e-01
+418 116 -1.66666666666667e-01
+418 393 8.33333333333333e-02
+418 451 -7.50000000000000e-01
+418 651 -8.33333333333333e-02
+418 114 8.33333333333333e-02
+419 419 2.50000000000000e+00
+419 393 -1.66666666666667e-01
+419 388 -8.33333333333333e-02
+419 396 8.33333333333333e-02
+419 387 -8.33333333333333e-02
+419 397 8.33333333333333e-02
+419 403 -8.33333333333333e-02
+419 404 -2.50000000000000e-01
+419 402 1.66666666666667e-01
+419 643 8.33333333333333e-02
+419 642 -1.66666666666667e-01
+419 639 1.66666666666667e-01
+419 416 -2.50000000000000e-01
+419 415 1.66666666666667e-01
+419 48 8.33333333333333e-02
+419 414 -8.33333333333333e-02
+419 641 -7.50000000000000e-01
+419 640 1.66666666666667e-01
+419 114 8.33333333333333e-02
+419 418 -3.33333333333333e-01
+419 450 -8.33333333333333e-02
+419 421 -8.33333333333333e-02
+419 453 8.33333333333333e-02
+419 651 -8.33333333333333e-02
+419 454 8.33333333333333e-02
+419 652 -8.33333333333333e-02
+419 422 -2.50000000000000e-01
+419 407 -7.50000000000000e-01
+419 49 -1.66666666666667e-01
+419 406 1.66666666666667e-01
+419 420 1.66666666666667e-01
+419 405 1.66666666666667e-01
+419 417 -3.33333333333333e-01
+419 394 8.33333333333333e-02
+419 452 -2.50000000000000e-01
+419 451 1.66666666666667e-01
+419 115 -1.66666666666667e-01
+420 420 2.50000000000000e+00
+420 412 -8.33333333333333e-02
+420 560 8.33333333333333e-02
+420 559 -1.66666666666667e-01
+420 411 -2.50000000000000e-01
+420 410 8.33333333333333e-02
+420 526 1.66666666666667e-01
+420 527 1.66666666666667e-01
+420 525 -7.50000000000000e-01
+420 409 8.33333333333333e-02
+420 422 -3.33333333333333e-01
+420 50 -8.33333333333333e-02
+420 122 -8.33333333333333e-02
+420 455 -8.33333333333333e-02
+420 653 8.33333333333333e-02
+420 454 1.66666666666667e-01
+420 421 -3.33333333333333e-01
+420 418 1.66666666666667e-01
+420 407 -1.66666666666667e-01
+420 419 1.66666666666667e-01
+420 49 -8.33333333333333e-02
+420 406 8.33333333333333e-02
+420 417 -7.50000000000000e-01
+420 121 -8.33333333333333e-02
+420 652 8.33333333333333e-02
+420 453 -2.50000000000000e-01
+420 248 -8.33333333333333e-02
+420 416 8.33333333333333e-02
+420 259 8.33333333333333e-02
+420 643 -8.33333333333333e-02
+420 415 -1.66666666666667e-01
+420 247 1.66666666666667e-01
+420 246 -2.50000000000000e-01
+420 644 1.66666666666667e-01
+420 260 -1.66666666666667e-01
+420 642 -2.50000000000000e-01
+420 413 1.66666666666667e-01
+421 421 2.50000000000000e+00
+421 411 -8.33333333333333e-02
+421 558 -1.66666666666667e-01
+421 413 1.66666666666667e-01
+421 412 -2.50000000000000e-01
+421 527 -8.33333333333333e-02
+421 525 1.66666666666667e-01
+421 526 -2.50000000000000e-01
+421 410 -1.66666666666667e-01
+421 408 8.33333333333333e-02
+421 407 8.33333333333333e-02
+421 419 -8.33333333333333e-02
+421 453 1.66666666666667e-01
+421 420 -3.33333333333333e-01
+421 417 1.66666666666667e-01
+421 418 -2.50000000000000e-01
+421 48 -8.33333333333333e-02
+421 405 8.33333333333333e-02
+421 455 1.66666666666667e-01
+421 653 -1.66666666666667e-01
+421 454 -7.50000000000000e-01
+421 120 -8.33333333333333e-02
+421 651 8.33333333333333e-02
+421 248 1.66666666666667e-01
+421 422 -3.33333333333333e-01
+421 644 1.66666666666667e-01
+421 258 8.33333333333333e-02
+421 642 -8.33333333333333e-02
+421 416 8.33333333333333e-02
+421 50 -8.33333333333333e-02
+421 247 -7.50000000000000e-01
+421 414 -1.66666666666667e-01
+421 246 1.66666666666667e-01
+421 260 8.33333333333333e-02
+421 122 -8.33333333333333e-02
+421 643 -2.50000000000000e-01
+421 560 8.33333333333333e-02
+422 422 2.50000000000000e+00
+422 411 1.66666666666667e-01
+422 558 8.33333333333333e-02
+422 413 -7.50000000000000e-01
+422 412 1.66666666666667e-01
+422 526 -8.33333333333333e-02
+422 408 8.33333333333333e-02
+422 527 -2.50000000000000e-01
+422 525 1.66666666666667e-01
+422 409 -1.66666666666667e-01
+422 420 -3.33333333333333e-01
+422 48 -8.33333333333333e-02
+422 120 -8.33333333333333e-02
+422 406 8.33333333333333e-02
+422 418 -8.33333333333333e-02
+422 453 -8.33333333333333e-02
+422 651 8.33333333333333e-02
+422 419 -2.50000000000000e-01
+422 405 -1.66666666666667e-01
+422 417 1.66666666666667e-01
+422 455 -2.50000000000000e-01
+422 454 1.66666666666667e-01
+422 652 -1.66666666666667e-01
+422 246 -8.33333333333333e-02
+422 414 8.33333333333333e-02
+422 247 1.66666666666667e-01
+422 421 -3.33333333333333e-01
+422 643 1.66666666666667e-01
+422 248 -2.50000000000000e-01
+422 415 8.33333333333333e-02
+422 49 -8.33333333333333e-02
+422 644 -7.50000000000000e-01
+422 559 8.33333333333333e-02
+422 259 8.33333333333333e-02
+422 121 -8.33333333333333e-02
+422 642 1.66666666666667e-01
+422 258 -1.66666666666667e-01
+423 423 2.50000000000000e+00
+423 431 -8.33333333333333e-02
+423 445 -1.66666666666667e-01
+423 430 1.66666666666667e-01
+423 429 -2.50000000000000e-01
+423 356 -1.66666666666667e-01
+423 355 8.33333333333333e-02
+423 359 1.66666666666667e-01
+423 358 -8.33333333333333e-02
+423 357 -2.50000000000000e-01
+423 458 -8.33333333333333e-02
+423 440 8.33333333333333e-02
+423 53 1.66666666666667e-01
+423 425 -3.33333333333333e-01
+423 437 1.66666666666667e-01
+423 439 8.33333333333333e-02
+423 436 -8.33333333333333e-02
+423 435 -2.50000000000000e-01
+423 56 1.66666666666667e-01
+423 452 -1.66666666666667e-01
+423 457 -8.33333333333333e-02
+423 451 8.33333333333333e-02
+423 151 -8.33333333333333e-02
+423 154 8.33333333333333e-02
+423 392 8.33333333333333e-02
+423 152 -8.33333333333333e-02
+423 52 1.66666666666667e-01
+423 391 -1.66666666666667e-01
+423 51 -7.50000000000000e-01
+423 395 -8.33333333333333e-02
+423 155 8.33333333333333e-02
+423 424 -3.33333333333333e-01
+423 394 1.66666666666667e-01
+423 55 1.66666666666667e-01
+423 446 8.33333333333333e-02
+423 393 -2.50000000000000e-01
+423 54 -7.50000000000000e-01
+424 424 2.50000000000000e+00
+424 446 8.33333333333333e-02
+424 444 -1.66666666666667e-01
+424 430 -7.50000000000000e-01
+424 429 1.66666666666667e-01
+424 356 8.33333333333333e-02
+424 354 8.33333333333333e-02
+424 359 1.66666666666667e-01
+424 358 -2.50000000000000e-01
+424 357 -8.33333333333333e-02
+424 425 -3.33333333333333e-01
+424 56 -8.33333333333333e-02
+424 53 -8.33333333333333e-02
+424 452 8.33333333333333e-02
+424 458 -8.33333333333333e-02
+424 440 -1.66666666666667e-01
+424 437 1.66666666666667e-01
+424 436 -2.50000000000000e-01
+424 438 8.33333333333333e-02
+424 435 -8.33333333333333e-02
+424 456 -8.33333333333333e-02
+424 450 8.33333333333333e-02
+424 392 8.33333333333333e-02
+424 152 -8.33333333333333e-02
+424 150 -8.33333333333333e-02
+424 153 8.33333333333333e-02
+424 52 -2.50000000000000e-01
+424 51 1.66666666666667e-01
+424 390 -1.66666666666667e-01
+424 395 1.66666666666667e-01
+424 155 -1.66666666666667e-01
+424 431 1.66666666666667e-01
+424 394 -7.50000000000000e-01
+424 55 -2.50000000000000e-01
+424 423 -3.33333333333333e-01
+424 393 1.66666666666667e-01
+424 54 1.66666666666667e-01
+425 425 2.50000000000000e+00
+425 429 -8.33333333333333e-02
+425 430 1.66666666666667e-01
+425 445 8.33333333333333e-02
+425 431 -2.50000000000000e-01
+425 355 8.33333333333333e-02
+425 354 -1.66666666666667e-01
+425 359 -7.50000000000000e-01
+425 358 1.66666666666667e-01
+425 357 1.66666666666667e-01
+425 424 -3.33333333333333e-01
+425 55 -8.33333333333333e-02
+425 52 -8.33333333333333e-02
+425 451 8.33333333333333e-02
+425 457 -8.33333333333333e-02
+425 456 -8.33333333333333e-02
+425 438 8.33333333333333e-02
+425 437 -7.50000000000000e-01
+425 439 -1.66666666666667e-01
+425 436 1.66666666666667e-01
+425 51 1.66666666666667e-01
+425 423 -3.33333333333333e-01
+425 435 1.66666666666667e-01
+425 54 1.66666666666667e-01
+425 450 -1.66666666666667e-01
+425 391 8.33333333333333e-02
+425 151 -8.33333333333333e-02
+425 53 -2.50000000000000e-01
+425 390 8.33333333333333e-02
+425 150 -8.33333333333333e-02
+425 444 8.33333333333333e-02
+425 395 -2.50000000000000e-01
+425 56 -2.50000000000000e-01
+425 394 1.66666666666667e-01
+425 154 -1.66666666666667e-01
+425 393 -8.33333333333333e-02
+425 153 8.33333333333333e-02
+426 426 6.37500000000000e+01
+426 365 4.25000000000000e+00
+426 364 -2.12500000000000e+00
+426 363 -6.37500000000000e+00
+426 355 2.12500000000000e+00
+426 428 -8.50000000000000e+00
+426 278 4.25000000000000e+00
+426 280 2.12500000000000e+00
+426 277 -2.12500000000000e+00
+426 53 -2.12500000000000e+00
+426 52 4.25000000000000e+00
+426 51 -6.37500000000000e+00
+426 276 -6.37500000000000e+00
+426 92 -2.12500000000000e+00
+426 281 2.12500000000000e+00
+426 427 -8.50000000000000e+00
+426 91 4.25000000000000e+00
+426 356 2.12500000000000e+00
+426 90 -6.37500000000000e+00
+426 431 1.66666666666667e-01
+426 611 8.33333333333333e-02
+426 610 -1.66666666666667e-01
+426 430 1.66666666666667e-01
+426 429 -7.50000000000000e-01
+426 614 -8.33333333333333e-02
+426 613 -8.33333333333333e-02
+426 440 -1.66666666666667e-01
+426 439 8.33333333333333e-02
+426 1729 4.16666666666667e+00
+426 1720 -4.16666666666667e+00
+426 1721 -4.16666666666667e+00
+426 1730 -8.33333333333333e+00
+426 1793 8.33333333333333e+00
+426 1787 4.16666666666667e+00
+426 1786 -8.33333333333333e+00
+426 1792 8.33333333333333e+00
+426 1791 -3.75000000000000e+01
+427 427 6.37500000000000e+01
+427 364 -6.37500000000000e+00
+427 363 -2.12500000000000e+00
+427 356 -4.25000000000000e+00
+427 354 2.12500000000000e+00
+427 279 2.12500000000000e+00
+427 276 -2.12500000000000e+00
+427 53 4.25000000000000e+00
+427 428 -8.50000000000000e+00
+427 278 4.25000000000000e+00
+427 52 -1.91250000000000e+01
+427 277 -6.37500000000000e+00
+427 51 4.25000000000000e+00
+427 92 4.25000000000000e+00
+427 281 -4.25000000000000e+00
+427 365 4.25000000000000e+00
+427 91 -1.91250000000000e+01
+427 426 -8.50000000000000e+00
+427 90 4.25000000000000e+00
+427 431 -8.33333333333333e-02
+427 609 -1.66666666666667e-01
+427 430 -2.50000000000000e-01
+427 429 1.66666666666667e-01
+427 614 -8.33333333333333e-02
+427 440 8.33333333333333e-02
+427 612 -8.33333333333333e-02
+427 611 8.33333333333333e-02
+427 438 8.33333333333333e-02
+427 1728 4.16666666666667e+00
+427 1719 -4.16666666666667e+00
+427 1730 4.16666666666667e+00
+427 1721 -4.16666666666667e+00
+427 1793 -4.16666666666667e+00
+427 1787 4.16666666666667e+00
+427 1785 -8.33333333333333e+00
+427 1792 -1.25000000000000e+01
+427 1791 8.33333333333333e+00
+428 428 6.37500000000000e+01
+428 365 -1.91250000000000e+01
+428 364 4.25000000000000e+00
+428 363 4.25000000000000e+00
+428 355 -4.25000000000000e+00
+428 426 -8.50000000000000e+00
+428 276 4.25000000000000e+00
+428 53 -6.37500000000000e+00
+428 278 -1.91250000000000e+01
+428 52 4.25000000000000e+00
+428 427 -8.50000000000000e+00
+428 277 4.25000000000000e+00
+428 51 -2.12500000000000e+00
+428 354 2.12500000000000e+00
+428 92 -6.37500000000000e+00
+428 91 4.25000000000000e+00
+428 280 -4.25000000000000e+00
+428 90 -2.12500000000000e+00
+428 279 2.12500000000000e+00
+428 430 -8.33333333333333e-02
+428 429 1.66666666666667e-01
+428 609 8.33333333333333e-02
+428 431 -2.50000000000000e-01
+428 612 -8.33333333333333e-02
+428 613 -8.33333333333333e-02
+428 439 8.33333333333333e-02
+428 610 8.33333333333333e-02
+428 438 -1.66666666666667e-01
+428 1719 -4.16666666666667e+00
+428 1729 4.16666666666667e+00
+428 1728 -8.33333333333333e+00
+428 1720 -4.16666666666667e+00
+428 1792 -4.16666666666667e+00
+428 1786 4.16666666666667e+00
+428 1791 8.33333333333333e+00
+428 1785 4.16666666666667e+00
+428 1793 -1.25000000000000e+01
+429 429 2.50000000000000e+00
+429 457 8.33333333333333e-02
+429 619 -8.33333333333333e-02
+429 614 8.33333333333333e-02
+429 620 -8.33333333333333e-02
+429 613 8.33333333333333e-02
+429 439 -8.33333333333333e-02
+429 440 1.66666666666667e-01
+429 438 -2.50000000000000e-01
+429 365 -1.66666666666667e-01
+429 428 1.66666666666667e-01
+429 364 8.33333333333333e-02
+429 95 8.33333333333333e-02
+429 611 -8.33333333333333e-02
+429 610 1.66666666666667e-01
+429 609 -2.50000000000000e-01
+429 53 8.33333333333333e-02
+429 427 1.66666666666667e-01
+429 426 -7.50000000000000e-01
+429 425 -8.33333333333333e-02
+429 430 -3.33333333333333e-01
+429 367 -8.33333333333333e-02
+429 359 8.33333333333333e-02
+429 356 -8.33333333333333e-02
+429 358 8.33333333333333e-02
+429 355 -8.33333333333333e-02
+429 368 1.66666666666667e-01
+429 446 1.66666666666667e-01
+429 431 -3.33333333333333e-01
+429 94 -1.66666666666667e-01
+429 445 1.66666666666667e-01
+429 366 -2.50000000000000e-01
+429 444 -7.50000000000000e-01
+429 424 1.66666666666667e-01
+429 52 -1.66666666666667e-01
+429 458 -1.66666666666667e-01
+429 423 -2.50000000000000e-01
+430 430 2.50000000000000e+00
+430 456 8.33333333333333e-02
+430 618 -8.33333333333333e-02
+430 614 -1.66666666666667e-01
+430 440 1.66666666666667e-01
+430 612 8.33333333333333e-02
+430 438 -8.33333333333333e-02
+430 620 -8.33333333333333e-02
+430 439 -2.50000000000000e-01
+430 365 8.33333333333333e-02
+430 428 -8.33333333333333e-02
+430 363 8.33333333333333e-02
+430 611 1.66666666666667e-01
+430 431 -3.33333333333333e-01
+430 610 -7.50000000000000e-01
+430 609 1.66666666666667e-01
+430 427 -2.50000000000000e-01
+430 426 1.66666666666667e-01
+430 429 -3.33333333333333e-01
+430 366 -8.33333333333333e-02
+430 368 1.66666666666667e-01
+430 359 -1.66666666666667e-01
+430 425 1.66666666666667e-01
+430 357 8.33333333333333e-02
+430 354 -8.33333333333333e-02
+430 95 8.33333333333333e-02
+430 446 -8.33333333333333e-02
+430 367 -2.50000000000000e-01
+430 445 -2.50000000000000e-01
+430 93 -1.66666666666667e-01
+430 444 1.66666666666667e-01
+430 356 -8.33333333333333e-02
+430 53 8.33333333333333e-02
+430 458 8.33333333333333e-02
+430 424 -7.50000000000000e-01
+430 423 1.66666666666667e-01
+430 51 -1.66666666666667e-01
+431 431 2.50000000000000e+00
+431 456 -1.66666666666667e-01
+431 612 8.33333333333333e-02
+431 618 -8.33333333333333e-02
+431 613 -1.66666666666667e-01
+431 439 1.66666666666667e-01
+431 619 -8.33333333333333e-02
+431 440 -7.50000000000000e-01
+431 438 1.66666666666667e-01
+431 364 8.33333333333333e-02
+431 427 -8.33333333333333e-02
+431 363 -1.66666666666667e-01
+431 426 1.66666666666667e-01
+431 611 -2.50000000000000e-01
+431 610 1.66666666666667e-01
+431 430 -3.33333333333333e-01
+431 93 8.33333333333333e-02
+431 609 -8.33333333333333e-02
+431 428 -2.50000000000000e-01
+431 51 8.33333333333333e-02
+431 423 -8.33333333333333e-02
+431 367 1.66666666666667e-01
+431 357 8.33333333333333e-02
+431 354 -8.33333333333333e-02
+431 358 -1.66666666666667e-01
+431 424 1.66666666666667e-01
+431 368 -7.50000000000000e-01
+431 446 -2.50000000000000e-01
+431 94 8.33333333333333e-02
+431 445 -8.33333333333333e-02
+431 366 1.66666666666667e-01
+431 444 1.66666666666667e-01
+431 429 -3.33333333333333e-01
+431 457 8.33333333333333e-02
+431 425 -2.50000000000000e-01
+431 355 -8.33333333333333e-02
+431 52 8.33333333333333e-02
+432 432 6.37500000000000e+01
+432 401 -2.12500000000000e+00
+432 400 4.25000000000000e+00
+432 399 -6.37500000000000e+00
+432 392 2.12500000000000e+00
+432 284 2.12500000000000e+00
+432 278 -2.12500000000000e+00
+432 433 -8.50000000000000e+00
+432 277 4.25000000000000e+00
+432 53 4.25000000000000e+00
+432 52 -2.12500000000000e+00
+432 51 -6.37500000000000e+00
+432 276 -6.37500000000000e+00
+432 434 -8.50000000000000e+00
+432 113 4.25000000000000e+00
+432 112 -2.12500000000000e+00
+432 283 2.12500000000000e+00
+432 391 2.12500000000000e+00
+432 111 -6.37500000000000e+00
+432 646 8.33333333333333e-02
+432 647 -1.66666666666667e-01
+432 437 1.66666666666667e-01
+432 436 1.66666666666667e-01
+432 435 -7.50000000000000e-01
+432 649 -8.33333333333333e-02
+432 650 -8.33333333333333e-02
+432 440 8.33333333333333e-02
+432 439 -1.66666666666667e-01
+432 1756 -4.16666666666667e+00
+432 1766 4.16666666666667e+00
+432 1765 -8.33333333333333e+00
+432 1757 -4.16666666666667e+00
+432 1798 8.33333333333333e+00
+432 1787 -8.33333333333333e+00
+432 1786 4.16666666666667e+00
+432 1799 8.33333333333333e+00
+432 1797 -3.75000000000000e+01
+433 433 6.37500000000000e+01
+433 401 4.25000000000000e+00
+433 400 -1.91250000000000e+01
+433 399 4.25000000000000e+00
+433 392 -4.25000000000000e+00
+433 432 -8.50000000000000e+00
+433 276 4.25000000000000e+00
+433 53 4.25000000000000e+00
+433 434 -8.50000000000000e+00
+433 278 4.25000000000000e+00
+433 52 -6.37500000000000e+00
+433 277 -1.91250000000000e+01
+433 51 -2.12500000000000e+00
+433 113 4.25000000000000e+00
+433 284 -4.25000000000000e+00
+433 390 2.12500000000000e+00
+433 112 -6.37500000000000e+00
+433 111 -2.12500000000000e+00
+433 282 2.12500000000000e+00
+433 645 8.33333333333333e-02
+433 647 8.33333333333333e-02
+433 437 -8.33333333333333e-02
+433 436 -2.50000000000000e-01
+433 435 1.66666666666667e-01
+433 440 8.33333333333333e-02
+433 650 -8.33333333333333e-02
+433 648 -8.33333333333333e-02
+433 438 -1.66666666666667e-01
+433 1755 -4.16666666666667e+00
+433 1766 4.16666666666667e+00
+433 1757 -4.16666666666667e+00
+433 1764 -8.33333333333333e+00
+433 1787 4.16666666666667e+00
+433 1799 -4.16666666666667e+00
+433 1797 8.33333333333333e+00
+433 1785 4.16666666666667e+00
+433 1798 -1.25000000000000e+01
+434 434 6.37500000000000e+01
+434 401 -6.37500000000000e+00
+434 400 4.25000000000000e+00
+434 399 -2.12500000000000e+00
+434 391 -4.25000000000000e+00
+434 390 2.12500000000000e+00
+434 282 2.12500000000000e+00
+434 276 -2.12500000000000e+00
+434 53 -1.91250000000000e+01
+434 278 -6.37500000000000e+00
+434 52 4.25000000000000e+00
+434 433 -8.50000000000000e+00
+434 277 4.25000000000000e+00
+434 51 4.25000000000000e+00
+434 113 -1.91250000000000e+01
+434 112 4.25000000000000e+00
+434 283 -4.25000000000000e+00
+434 432 -8.50000000000000e+00
+434 111 4.25000000000000e+00
+434 646 8.33333333333333e-02
+434 645 -1.66666666666667e-01
+434 437 -2.50000000000000e-01
+434 436 -8.33333333333333e-02
+434 435 1.66666666666667e-01
+434 439 8.33333333333333e-02
+434 649 -8.33333333333333e-02
+434 648 -8.33333333333333e-02
+434 438 8.33333333333333e-02
+434 1756 -4.16666666666667e+00
+434 1764 4.16666666666667e+00
+434 1755 -4.16666666666667e+00
+434 1786 4.16666666666667e+00
+434 1798 -4.16666666666667e+00
+434 1785 -8.33333333333333e+00
+434 1765 4.16666666666667e+00
+434 1799 -1.25000000000000e+01
+434 1797 8.33333333333333e+00
+435 435 2.50000000000000e+00
+435 395 8.33333333333333e-02
+435 392 -8.33333333333333e-02
+435 404 -8.33333333333333e-02
+435 401 8.33333333333333e-02
+435 403 1.66666666666667e-01
+435 400 -1.66666666666667e-01
+435 391 -8.33333333333333e-02
+435 402 -2.50000000000000e-01
+435 649 8.33333333333333e-02
+435 646 -8.33333333333333e-02
+435 650 8.33333333333333e-02
+435 434 1.66666666666667e-01
+435 433 1.66666666666667e-01
+435 436 -3.33333333333333e-01
+435 432 -7.50000000000000e-01
+435 647 1.66666666666667e-01
+435 645 -2.50000000000000e-01
+435 437 -3.33333333333333e-01
+435 440 -8.33333333333333e-02
+435 439 1.66666666666667e-01
+435 656 -8.33333333333333e-02
+435 458 8.33333333333333e-02
+435 457 -1.66666666666667e-01
+435 451 1.66666666666667e-01
+435 53 -1.66666666666667e-01
+435 425 1.66666666666667e-01
+435 52 8.33333333333333e-02
+435 424 -8.33333333333333e-02
+435 438 -2.50000000000000e-01
+435 423 -2.50000000000000e-01
+435 452 1.66666666666667e-01
+435 116 -1.66666666666667e-01
+435 655 -8.33333333333333e-02
+435 115 8.33333333333333e-02
+435 394 8.33333333333333e-02
+435 450 -7.50000000000000e-01
+436 436 2.50000000000000e+00
+436 395 -1.66666666666667e-01
+436 392 -8.33333333333333e-02
+436 401 8.33333333333333e-02
+436 402 1.66666666666667e-01
+436 399 -1.66666666666667e-01
+436 390 -8.33333333333333e-02
+436 404 1.66666666666667e-01
+436 403 -7.50000000000000e-01
+436 648 8.33333333333333e-02
+436 645 -8.33333333333333e-02
+436 647 1.66666666666667e-01
+436 650 -1.66666666666667e-01
+436 434 -8.33333333333333e-02
+436 53 8.33333333333333e-02
+436 433 -2.50000000000000e-01
+436 432 1.66666666666667e-01
+436 435 -3.33333333333333e-01
+436 116 8.33333333333333e-02
+436 646 -2.50000000000000e-01
+436 452 -8.33333333333333e-02
+436 458 8.33333333333333e-02
+436 656 -8.33333333333333e-02
+436 438 1.66666666666667e-01
+436 456 -1.66666666666667e-01
+436 450 1.66666666666667e-01
+436 440 1.66666666666667e-01
+436 425 1.66666666666667e-01
+436 437 -3.33333333333333e-01
+436 439 -7.50000000000000e-01
+436 424 -2.50000000000000e-01
+436 51 8.33333333333333e-02
+436 423 -8.33333333333333e-02
+436 393 8.33333333333333e-02
+436 451 -2.50000000000000e-01
+436 654 -8.33333333333333e-02
+436 114 8.33333333333333e-02
+437 437 2.50000000000000e+00
+437 393 8.33333333333333e-02
+437 390 -8.33333333333333e-02
+437 391 -8.33333333333333e-02
+437 400 8.33333333333333e-02
+437 402 -8.33333333333333e-02
+437 399 8.33333333333333e-02
+437 404 -2.50000000000000e-01
+437 403 1.66666666666667e-01
+437 646 1.66666666666667e-01
+437 649 -1.66666666666667e-01
+437 648 8.33333333333333e-02
+437 434 -2.50000000000000e-01
+437 433 -8.33333333333333e-02
+437 52 8.33333333333333e-02
+437 432 1.66666666666667e-01
+437 647 -7.50000000000000e-01
+437 115 8.33333333333333e-02
+437 645 1.66666666666667e-01
+437 451 -8.33333333333333e-02
+437 435 -3.33333333333333e-01
+437 438 -8.33333333333333e-02
+437 457 8.33333333333333e-02
+437 655 -8.33333333333333e-02
+437 654 -8.33333333333333e-02
+437 456 8.33333333333333e-02
+437 440 -2.50000000000000e-01
+437 425 -7.50000000000000e-01
+437 439 1.66666666666667e-01
+437 424 1.66666666666667e-01
+437 436 -3.33333333333333e-01
+437 51 -1.66666666666667e-01
+437 423 1.66666666666667e-01
+437 394 -1.66666666666667e-01
+437 452 -2.50000000000000e-01
+437 450 1.66666666666667e-01
+437 114 -1.66666666666667e-01
+438 438 2.50000000000000e+00
+438 430 -8.33333333333333e-02
+438 619 -1.66666666666667e-01
+438 431 1.66666666666667e-01
+438 429 -2.50000000000000e-01
+438 614 -8.33333333333333e-02
+438 613 1.66666666666667e-01
+438 612 -2.50000000000000e-01
+438 428 -1.66666666666667e-01
+438 427 8.33333333333333e-02
+438 425 8.33333333333333e-02
+438 437 -8.33333333333333e-02
+438 439 -3.33333333333333e-01
+438 457 1.66666666666667e-01
+438 436 1.66666666666667e-01
+438 458 1.66666666666667e-01
+438 656 -1.66666666666667e-01
+438 130 -8.33333333333333e-02
+438 655 8.33333333333333e-02
+438 456 -7.50000000000000e-01
+438 52 -8.33333333333333e-02
+438 424 8.33333333333333e-02
+438 435 -2.50000000000000e-01
+438 278 1.66666666666667e-01
+438 440 -3.33333333333333e-01
+438 650 1.66666666666667e-01
+438 286 8.33333333333333e-02
+438 649 -8.33333333333333e-02
+438 434 8.33333333333333e-02
+438 53 -8.33333333333333e-02
+438 277 1.66666666666667e-01
+438 433 -1.66666666666667e-01
+438 276 -7.50000000000000e-01
+438 287 8.33333333333333e-02
+438 131 -8.33333333333333e-02
+438 648 -2.50000000000000e-01
+438 620 8.33333333333333e-02
+439 439 2.50000000000000e+00
+439 429 -8.33333333333333e-02
+439 620 8.33333333333333e-02
+439 618 -1.66666666666667e-01
+439 430 -2.50000000000000e-01
+439 428 8.33333333333333e-02
+439 612 1.66666666666667e-01
+439 614 1.66666666666667e-01
+439 613 -7.50000000000000e-01
+439 426 8.33333333333333e-02
+439 440 -3.33333333333333e-01
+439 53 -8.33333333333333e-02
+439 131 -8.33333333333333e-02
+439 458 -8.33333333333333e-02
+439 656 8.33333333333333e-02
+439 438 -3.33333333333333e-01
+439 456 1.66666666666667e-01
+439 435 1.66666666666667e-01
+439 457 -2.50000000000000e-01
+439 129 -8.33333333333333e-02
+439 654 8.33333333333333e-02
+439 425 -1.66666666666667e-01
+439 437 1.66666666666667e-01
+439 436 -7.50000000000000e-01
+439 51 -8.33333333333333e-02
+439 423 8.33333333333333e-02
+439 278 -8.33333333333333e-02
+439 434 8.33333333333333e-02
+439 285 8.33333333333333e-02
+439 648 -8.33333333333333e-02
+439 277 -2.50000000000000e-01
+439 276 1.66666666666667e-01
+439 432 -1.66666666666667e-01
+439 287 -1.66666666666667e-01
+439 650 1.66666666666667e-01
+439 649 -2.50000000000000e-01
+439 431 1.66666666666667e-01
+440 440 2.50000000000000e+00
+440 430 1.66666666666667e-01
+440 619 8.33333333333333e-02
+440 431 -7.50000000000000e-01
+440 429 1.66666666666667e-01
+440 612 -8.33333333333333e-02
+440 427 8.33333333333333e-02
+440 614 -2.50000000000000e-01
+440 613 1.66666666666667e-01
+440 426 -1.66666666666667e-01
+440 439 -3.33333333333333e-01
+440 52 -8.33333333333333e-02
+440 130 -8.33333333333333e-02
+440 423 8.33333333333333e-02
+440 435 -8.33333333333333e-02
+440 457 -8.33333333333333e-02
+440 655 8.33333333333333e-02
+440 458 -2.50000000000000e-01
+440 456 1.66666666666667e-01
+440 654 -1.66666666666667e-01
+440 437 -2.50000000000000e-01
+440 424 -1.66666666666667e-01
+440 436 1.66666666666667e-01
+440 277 -8.33333333333333e-02
+440 433 8.33333333333333e-02
+440 276 1.66666666666667e-01
+440 438 -3.33333333333333e-01
+440 648 1.66666666666667e-01
+440 278 -2.50000000000000e-01
+440 432 8.33333333333333e-02
+440 51 -8.33333333333333e-02
+440 650 -7.50000000000000e-01
+440 618 8.33333333333333e-02
+440 286 -1.66666666666667e-01
+440 649 1.66666666666667e-01
+440 285 8.33333333333333e-02
+440 129 -8.33333333333333e-02
+441 441 2.50000000000000e+00
+441 376 -8.33333333333333e-02
+441 371 -1.66666666666667e-01
+441 377 1.66666666666667e-01
+441 375 -2.50000000000000e-01
+441 554 8.33333333333333e-02
+441 553 -1.66666666666667e-01
+441 449 -8.33333333333333e-02
+441 448 1.66666666666667e-01
+441 447 -2.50000000000000e-01
+441 340 -8.33333333333333e-02
+441 349 8.33333333333333e-02
+441 350 8.33333333333333e-02
+441 413 -8.33333333333333e-02
+441 73 1.66666666666667e-01
+441 442 -3.33333333333333e-01
+441 412 1.66666666666667e-01
+441 411 -2.50000000000000e-01
+441 341 -8.33333333333333e-02
+441 407 8.33333333333333e-02
+441 55 1.66666666666667e-01
+441 406 -1.66666666666667e-01
+441 293 -8.33333333333333e-02
+441 290 8.33333333333333e-02
+441 74 1.66666666666667e-01
+441 560 -1.66666666666667e-01
+441 559 8.33333333333333e-02
+441 292 -8.33333333333333e-02
+441 72 -7.50000000000000e-01
+441 443 -3.33333333333333e-01
+441 455 1.66666666666667e-01
+441 56 1.66666666666667e-01
+441 454 -8.33333333333333e-02
+441 289 8.33333333333333e-02
+441 370 8.33333333333333e-02
+441 453 -2.50000000000000e-01
+441 54 -7.50000000000000e-01
+442 442 2.50000000000000e+00
+442 375 -8.33333333333333e-02
+442 377 1.66666666666667e-01
+442 371 8.33333333333333e-02
+442 376 -2.50000000000000e-01
+442 554 8.33333333333333e-02
+442 552 -1.66666666666667e-01
+442 449 1.66666666666667e-01
+442 448 -7.50000000000000e-01
+442 447 1.66666666666667e-01
+442 443 -3.33333333333333e-01
+442 56 -8.33333333333333e-02
+442 74 -8.33333333333333e-02
+442 407 8.33333333333333e-02
+442 341 -8.33333333333333e-02
+442 339 -8.33333333333333e-02
+442 348 8.33333333333333e-02
+442 350 -1.66666666666667e-01
+442 413 1.66666666666667e-01
+442 412 -7.50000000000000e-01
+442 72 1.66666666666667e-01
+442 441 -3.33333333333333e-01
+442 411 1.66666666666667e-01
+442 54 1.66666666666667e-01
+442 405 -1.66666666666667e-01
+442 560 8.33333333333333e-02
+442 293 -8.33333333333333e-02
+442 73 -2.50000000000000e-01
+442 558 8.33333333333333e-02
+442 291 -8.33333333333333e-02
+442 455 1.66666666666667e-01
+442 290 -1.66666666666667e-01
+442 369 8.33333333333333e-02
+442 454 -2.50000000000000e-01
+442 55 -2.50000000000000e-01
+442 453 -8.33333333333333e-02
+442 288 8.33333333333333e-02
+443 443 2.50000000000000e+00
+443 370 8.33333333333333e-02
+443 369 -1.66666666666667e-01
+443 377 -7.50000000000000e-01
+443 375 1.66666666666667e-01
+443 553 8.33333333333333e-02
+443 552 8.33333333333333e-02
+443 449 -2.50000000000000e-01
+443 448 1.66666666666667e-01
+443 447 -8.33333333333333e-02
+443 442 -3.33333333333333e-01
+443 55 -8.33333333333333e-02
+443 73 -8.33333333333333e-02
+443 406 8.33333333333333e-02
+443 340 -8.33333333333333e-02
+443 413 -2.50000000000000e-01
+443 349 -1.66666666666667e-01
+443 412 1.66666666666667e-01
+443 348 8.33333333333333e-02
+443 411 -8.33333333333333e-02
+443 339 -8.33333333333333e-02
+443 405 8.33333333333333e-02
+443 559 8.33333333333333e-02
+443 292 -8.33333333333333e-02
+443 291 -8.33333333333333e-02
+443 288 8.33333333333333e-02
+443 74 -2.50000000000000e-01
+443 72 1.66666666666667e-01
+443 558 -1.66666666666667e-01
+443 376 1.66666666666667e-01
+443 455 -7.50000000000000e-01
+443 56 -2.50000000000000e-01
+443 454 1.66666666666667e-01
+443 289 -1.66666666666667e-01
+443 441 -3.33333333333333e-01
+443 453 1.66666666666667e-01
+443 54 1.66666666666667e-01
+444 444 2.50000000000000e+00
+444 382 -8.33333333333333e-02
+444 383 1.66666666666667e-01
+444 371 8.33333333333333e-02
+444 381 -2.50000000000000e-01
+444 617 8.33333333333333e-02
+444 616 -1.66666666666667e-01
+444 449 1.66666666666667e-01
+444 448 1.66666666666667e-01
+444 447 -7.50000000000000e-01
+444 446 -3.33333333333333e-01
+444 95 -8.33333333333333e-02
+444 56 -8.33333333333333e-02
+444 359 -8.33333333333333e-02
+444 425 8.33333333333333e-02
+444 358 -8.33333333333333e-02
+444 367 8.33333333333333e-02
+444 368 -1.66666666666667e-01
+444 431 1.66666666666667e-01
+444 94 1.66666666666667e-01
+444 445 -3.33333333333333e-01
+444 430 1.66666666666667e-01
+444 429 -7.50000000000000e-01
+444 55 1.66666666666667e-01
+444 424 -1.66666666666667e-01
+444 296 -8.33333333333333e-02
+444 620 8.33333333333333e-02
+444 619 8.33333333333333e-02
+444 295 -8.33333333333333e-02
+444 93 -2.50000000000000e-01
+444 458 1.66666666666667e-01
+444 290 -1.66666666666667e-01
+444 457 -8.33333333333333e-02
+444 289 8.33333333333333e-02
+444 456 -2.50000000000000e-01
+444 370 8.33333333333333e-02
+444 54 -2.50000000000000e-01
+445 445 2.50000000000000e+00
+445 381 -8.33333333333333e-02
+445 371 -1.66666666666667e-01
+445 383 1.66666666666667e-01
+445 382 -2.50000000000000e-01
+445 617 8.33333333333333e-02
+445 615 -1.66666666666667e-01
+445 449 -8.33333333333333e-02
+445 448 -2.50000000000000e-01
+445 447 1.66666666666667e-01
+445 357 -8.33333333333333e-02
+445 366 8.33333333333333e-02
+445 368 8.33333333333333e-02
+445 431 -8.33333333333333e-02
+445 430 -2.50000000000000e-01
+445 93 1.66666666666667e-01
+445 444 -3.33333333333333e-01
+445 429 1.66666666666667e-01
+445 359 -8.33333333333333e-02
+445 425 8.33333333333333e-02
+445 54 1.66666666666667e-01
+445 423 -1.66666666666667e-01
+445 296 -8.33333333333333e-02
+445 290 8.33333333333333e-02
+445 620 -1.66666666666667e-01
+445 95 1.66666666666667e-01
+445 94 -7.50000000000000e-01
+445 618 8.33333333333333e-02
+445 294 -8.33333333333333e-02
+445 458 1.66666666666667e-01
+445 446 -3.33333333333333e-01
+445 56 1.66666666666667e-01
+445 457 -2.50000000000000e-01
+445 369 8.33333333333333e-02
+445 55 -7.50000000000000e-01
+445 456 -8.33333333333333e-02
+445 288 8.33333333333333e-02
+446 446 2.50000000000000e+00
+446 370 -1.66666666666667e-01
+446 369 8.33333333333333e-02
+446 383 -7.50000000000000e-01
+446 382 1.66666666666667e-01
+446 615 8.33333333333333e-02
+446 616 8.33333333333333e-02
+446 449 -2.50000000000000e-01
+446 448 -8.33333333333333e-02
+446 447 1.66666666666667e-01
+446 444 -3.33333333333333e-01
+446 93 -8.33333333333333e-02
+446 54 -8.33333333333333e-02
+446 357 -8.33333333333333e-02
+446 423 8.33333333333333e-02
+446 431 -2.50000000000000e-01
+446 367 8.33333333333333e-02
+446 430 -8.33333333333333e-02
+446 366 -1.66666666666667e-01
+446 429 1.66666666666667e-01
+446 358 -8.33333333333333e-02
+446 424 8.33333333333333e-02
+446 294 -8.33333333333333e-02
+446 618 8.33333333333333e-02
+446 295 -8.33333333333333e-02
+446 289 8.33333333333333e-02
+446 95 -2.50000000000000e-01
+446 619 -1.66666666666667e-01
+446 94 1.66666666666667e-01
+446 458 -7.50000000000000e-01
+446 381 1.66666666666667e-01
+446 56 -2.50000000000000e-01
+446 457 1.66666666666667e-01
+446 445 -3.33333333333333e-01
+446 55 1.66666666666667e-01
+446 456 1.66666666666667e-01
+446 288 -1.66666666666667e-01
+447 447 2.50000000000000e+00
+447 383 -1.66666666666667e-01
+447 617 -8.33333333333333e-02
+447 295 8.33333333333333e-02
+447 296 8.33333333333333e-02
+447 616 1.66666666666667e-01
+447 615 -2.50000000000000e-01
+447 446 1.66666666666667e-01
+447 445 1.66666666666667e-01
+447 444 -7.50000000000000e-01
+447 370 -8.33333333333333e-02
+447 371 -8.33333333333333e-02
+447 385 -8.33333333333333e-02
+447 376 8.33333333333333e-02
+447 377 8.33333333333333e-02
+447 386 1.66666666666667e-01
+447 449 -3.33333333333333e-01
+447 384 -2.50000000000000e-01
+447 289 -8.33333333333333e-02
+447 448 -3.33333333333333e-01
+447 554 1.66666666666667e-01
+447 298 -8.33333333333333e-02
+447 292 8.33333333333333e-02
+447 290 1.66666666666667e-01
+447 293 -1.66666666666667e-01
+447 101 8.33333333333333e-02
+447 299 -8.33333333333333e-02
+447 553 1.66666666666667e-01
+447 100 -1.66666666666667e-01
+447 552 -7.50000000000000e-01
+447 443 -8.33333333333333e-02
+447 56 8.33333333333333e-02
+447 442 1.66666666666667e-01
+447 55 -1.66666666666667e-01
+447 441 -2.50000000000000e-01
+447 382 8.33333333333333e-02
+447 288 -2.50000000000000e-01
+448 448 2.50000000000000e+00
+448 383 8.33333333333333e-02
+448 617 1.66666666666667e-01
+448 294 8.33333333333333e-02
+448 296 -1.66666666666667e-01
+448 616 -7.50000000000000e-01
+448 615 1.66666666666667e-01
+448 446 -8.33333333333333e-02
+448 445 -2.50000000000000e-01
+448 444 1.66666666666667e-01
+448 369 -8.33333333333333e-02
+448 386 1.66666666666667e-01
+448 384 -8.33333333333333e-02
+448 375 8.33333333333333e-02
+448 377 -1.66666666666667e-01
+448 101 8.33333333333333e-02
+448 385 -2.50000000000000e-01
+448 371 -8.33333333333333e-02
+448 56 8.33333333333333e-02
+448 288 -8.33333333333333e-02
+448 554 -8.33333333333333e-02
+448 447 -3.33333333333333e-01
+448 297 -8.33333333333333e-02
+448 291 8.33333333333333e-02
+448 299 -8.33333333333333e-02
+448 293 8.33333333333333e-02
+448 553 -2.50000000000000e-01
+448 552 1.66666666666667e-01
+448 99 -1.66666666666667e-01
+448 443 1.66666666666667e-01
+448 449 -3.33333333333333e-01
+448 290 1.66666666666667e-01
+448 442 -7.50000000000000e-01
+448 381 8.33333333333333e-02
+448 289 -2.50000000000000e-01
+448 441 1.66666666666667e-01
+448 54 -1.66666666666667e-01
+449 449 2.50000000000000e+00
+449 381 -1.66666666666667e-01
+449 615 -8.33333333333333e-02
+449 616 1.66666666666667e-01
+449 295 -1.66666666666667e-01
+449 294 8.33333333333333e-02
+449 617 -2.50000000000000e-01
+449 446 -2.50000000000000e-01
+449 445 -8.33333333333333e-02
+449 444 1.66666666666667e-01
+449 369 -8.33333333333333e-02
+449 385 1.66666666666667e-01
+449 376 -1.66666666666667e-01
+449 375 8.33333333333333e-02
+449 386 -7.50000000000000e-01
+449 100 8.33333333333333e-02
+449 384 1.66666666666667e-01
+449 447 -3.33333333333333e-01
+449 370 -8.33333333333333e-02
+449 55 8.33333333333333e-02
+449 553 -8.33333333333333e-02
+449 552 1.66666666666667e-01
+449 298 -8.33333333333333e-02
+449 292 8.33333333333333e-02
+449 288 1.66666666666667e-01
+449 291 -1.66666666666667e-01
+449 554 -2.50000000000000e-01
+449 99 8.33333333333333e-02
+449 297 -8.33333333333333e-02
+449 443 -2.50000000000000e-01
+449 382 8.33333333333333e-02
+449 290 -7.50000000000000e-01
+449 442 1.66666666666667e-01
+449 448 -3.33333333333333e-01
+449 289 1.66666666666667e-01
+449 441 -8.33333333333333e-02
+449 54 8.33333333333333e-02
+450 450 2.50000000000000e+00
+450 425 -1.66666666666667e-01
+450 424 8.33333333333333e-02
+450 437 1.66666666666667e-01
+450 435 -7.50000000000000e-01
+450 655 8.33333333333333e-02
+450 656 8.33333333333333e-02
+450 458 -8.33333333333333e-02
+450 457 1.66666666666667e-01
+450 456 -2.50000000000000e-01
+450 394 -8.33333333333333e-02
+450 395 -8.33333333333333e-02
+450 404 8.33333333333333e-02
+450 403 -1.66666666666667e-01
+450 407 8.33333333333333e-02
+450 419 -8.33333333333333e-02
+450 451 -3.33333333333333e-01
+450 418 1.66666666666667e-01
+450 406 8.33333333333333e-02
+450 55 -8.33333333333333e-02
+450 115 -8.33333333333333e-02
+450 417 -2.50000000000000e-01
+450 290 8.33333333333333e-02
+450 302 -8.33333333333333e-02
+450 652 8.33333333333333e-02
+450 301 -8.33333333333333e-02
+450 116 1.66666666666667e-01
+450 653 -1.66666666666667e-01
+450 114 -2.50000000000000e-01
+450 452 -3.33333333333333e-01
+450 455 1.66666666666667e-01
+450 56 1.66666666666667e-01
+450 454 1.66666666666667e-01
+450 289 -1.66666666666667e-01
+450 436 1.66666666666667e-01
+450 453 -7.50000000000000e-01
+450 54 -2.50000000000000e-01
+451 451 2.50000000000000e+00
+451 437 -8.33333333333333e-02
+451 435 1.66666666666667e-01
+451 423 8.33333333333333e-02
+451 436 -2.50000000000000e-01
+451 654 8.33333333333333e-02
+451 656 -1.66666666666667e-01
+451 458 1.66666666666667e-01
+451 457 -7.50000000000000e-01
+451 456 1.66666666666667e-01
+451 393 -8.33333333333333e-02
+451 395 -8.33333333333333e-02
+451 404 8.33333333333333e-02
+451 402 -1.66666666666667e-01
+451 450 -3.33333333333333e-01
+451 417 1.66666666666667e-01
+451 407 -1.66666666666667e-01
+451 56 1.66666666666667e-01
+451 405 8.33333333333333e-02
+451 54 -8.33333333333333e-02
+451 419 1.66666666666667e-01
+451 452 -3.33333333333333e-01
+451 116 1.66666666666667e-01
+451 418 -7.50000000000000e-01
+451 114 -8.33333333333333e-02
+451 651 8.33333333333333e-02
+451 300 -8.33333333333333e-02
+451 653 8.33333333333333e-02
+451 302 -8.33333333333333e-02
+451 115 -2.50000000000000e-01
+451 455 -8.33333333333333e-02
+451 290 8.33333333333333e-02
+451 425 8.33333333333333e-02
+451 454 -2.50000000000000e-01
+451 55 -2.50000000000000e-01
+451 453 1.66666666666667e-01
+451 288 -1.66666666666667e-01
+452 452 2.50000000000000e+00
+452 436 -8.33333333333333e-02
+452 423 -1.66666666666667e-01
+452 437 -2.50000000000000e-01
+452 435 1.66666666666667e-01
+452 655 -1.66666666666667e-01
+452 654 8.33333333333333e-02
+452 458 -2.50000000000000e-01
+452 457 1.66666666666667e-01
+452 456 -8.33333333333333e-02
+452 394 -8.33333333333333e-02
+452 403 8.33333333333333e-02
+452 393 -8.33333333333333e-02
+452 402 8.33333333333333e-02
+452 405 8.33333333333333e-02
+452 417 -8.33333333333333e-02
+452 406 -1.66666666666667e-01
+452 55 1.66666666666667e-01
+452 419 -2.50000000000000e-01
+452 418 1.66666666666667e-01
+452 451 -3.33333333333333e-01
+452 115 1.66666666666667e-01
+452 288 8.33333333333333e-02
+452 300 -8.33333333333333e-02
+452 116 -7.50000000000000e-01
+452 652 8.33333333333333e-02
+452 301 -8.33333333333333e-02
+452 114 1.66666666666667e-01
+452 651 -1.66666666666667e-01
+452 424 8.33333333333333e-02
+452 455 -2.50000000000000e-01
+452 56 -7.50000000000000e-01
+452 454 -8.33333333333333e-02
+452 289 8.33333333333333e-02
+452 450 -3.33333333333333e-01
+452 453 1.66666666666667e-01
+452 54 1.66666666666667e-01
+453 453 2.50000000000000e+00
+453 412 8.33333333333333e-02
+453 559 1.66666666666667e-01
+453 293 8.33333333333333e-02
+453 292 -1.66666666666667e-01
+453 560 1.66666666666667e-01
+453 558 -7.50000000000000e-01
+453 443 1.66666666666667e-01
+453 442 -8.33333333333333e-02
+453 441 -2.50000000000000e-01
+453 407 -8.33333333333333e-02
+453 422 -8.33333333333333e-02
+453 419 8.33333333333333e-02
+453 421 1.66666666666667e-01
+453 418 -1.66666666666667e-01
+453 121 8.33333333333333e-02
+453 420 -2.50000000000000e-01
+453 406 -8.33333333333333e-02
+453 55 8.33333333333333e-02
+453 290 -8.33333333333333e-02
+453 455 -3.33333333333333e-01
+453 652 -8.33333333333333e-02
+453 305 -8.33333333333333e-02
+453 302 8.33333333333333e-02
+453 304 -8.33333333333333e-02
+453 301 8.33333333333333e-02
+453 653 1.66666666666667e-01
+453 122 -1.66666666666667e-01
+453 651 -2.50000000000000e-01
+453 452 1.66666666666667e-01
+453 56 -1.66666666666667e-01
+453 451 1.66666666666667e-01
+453 454 -3.33333333333333e-01
+453 289 1.66666666666667e-01
+453 450 -7.50000000000000e-01
+453 413 8.33333333333333e-02
+453 288 -2.50000000000000e-01
+454 454 2.50000000000000e+00
+454 411 8.33333333333333e-02
+454 560 -8.33333333333333e-02
+454 293 8.33333333333333e-02
+454 558 1.66666666666667e-01
+454 291 -1.66666666666667e-01
+454 559 -2.50000000000000e-01
+454 443 1.66666666666667e-01
+454 442 -2.50000000000000e-01
+454 441 -8.33333333333333e-02
+454 407 -8.33333333333333e-02
+454 420 1.66666666666667e-01
+454 419 8.33333333333333e-02
+454 417 -1.66666666666667e-01
+454 422 1.66666666666667e-01
+454 455 -3.33333333333333e-01
+454 421 -7.50000000000000e-01
+454 120 8.33333333333333e-02
+454 405 -8.33333333333333e-02
+454 54 8.33333333333333e-02
+454 651 -8.33333333333333e-02
+454 653 1.66666666666667e-01
+454 290 1.66666666666667e-01
+454 302 -1.66666666666667e-01
+454 303 -8.33333333333333e-02
+454 300 8.33333333333333e-02
+454 122 8.33333333333333e-02
+454 305 -8.33333333333333e-02
+454 652 -2.50000000000000e-01
+454 452 -8.33333333333333e-02
+454 56 8.33333333333333e-02
+454 451 -2.50000000000000e-01
+454 413 -1.66666666666667e-01
+454 289 -7.50000000000000e-01
+454 450 1.66666666666667e-01
+454 453 -3.33333333333333e-01
+454 288 1.66666666666667e-01
+455 455 2.50000000000000e+00
+455 412 -1.66666666666667e-01
+455 559 -8.33333333333333e-02
+455 292 8.33333333333333e-02
+455 291 8.33333333333333e-02
+455 560 -2.50000000000000e-01
+455 558 1.66666666666667e-01
+455 443 -7.50000000000000e-01
+455 442 1.66666666666667e-01
+455 441 1.66666666666667e-01
+455 405 -8.33333333333333e-02
+455 406 -8.33333333333333e-02
+455 420 -8.33333333333333e-02
+455 417 8.33333333333333e-02
+455 418 8.33333333333333e-02
+455 422 -2.50000000000000e-01
+455 421 1.66666666666667e-01
+455 454 -3.33333333333333e-01
+455 288 -8.33333333333333e-02
+455 453 -3.33333333333333e-01
+455 652 1.66666666666667e-01
+455 303 -8.33333333333333e-02
+455 300 8.33333333333333e-02
+455 289 1.66666666666667e-01
+455 301 -1.66666666666667e-01
+455 653 -7.50000000000000e-01
+455 121 8.33333333333333e-02
+455 304 -8.33333333333333e-02
+455 651 1.66666666666667e-01
+455 120 -1.66666666666667e-01
+455 452 -2.50000000000000e-01
+455 411 8.33333333333333e-02
+455 290 -2.50000000000000e-01
+455 451 -8.33333333333333e-02
+455 55 8.33333333333333e-02
+455 450 1.66666666666667e-01
+455 54 -1.66666666666667e-01
+456 456 2.50000000000000e+00
+456 430 8.33333333333333e-02
+456 296 8.33333333333333e-02
+456 620 -8.33333333333333e-02
+456 619 1.66666666666667e-01
+456 295 -1.66666666666667e-01
+456 618 -2.50000000000000e-01
+456 446 1.66666666666667e-01
+456 445 -8.33333333333333e-02
+456 444 -2.50000000000000e-01
+456 425 -8.33333333333333e-02
+456 439 1.66666666666667e-01
+456 437 8.33333333333333e-02
+456 436 -1.66666666666667e-01
+456 440 1.66666666666667e-01
+456 458 -3.33333333333333e-01
+456 130 8.33333333333333e-02
+456 438 -7.50000000000000e-01
+456 424 -8.33333333333333e-02
+456 55 8.33333333333333e-02
+456 655 -8.33333333333333e-02
+456 656 1.66666666666667e-01
+456 290 1.66666666666667e-01
+456 302 -1.66666666666667e-01
+456 307 -8.33333333333333e-02
+456 301 8.33333333333333e-02
+456 131 8.33333333333333e-02
+456 308 -8.33333333333333e-02
+456 654 -2.50000000000000e-01
+456 452 -8.33333333333333e-02
+456 56 8.33333333333333e-02
+456 457 -3.33333333333333e-01
+456 451 1.66666666666667e-01
+456 289 1.66666666666667e-01
+456 431 -1.66666666666667e-01
+456 450 -2.50000000000000e-01
+456 288 -7.50000000000000e-01
+457 457 2.50000000000000e+00
+457 429 8.33333333333333e-02
+457 618 1.66666666666667e-01
+457 296 8.33333333333333e-02
+457 294 -1.66666666666667e-01
+457 620 1.66666666666667e-01
+457 619 -7.50000000000000e-01
+457 446 1.66666666666667e-01
+457 445 -2.50000000000000e-01
+457 444 -8.33333333333333e-02
+457 425 -8.33333333333333e-02
+457 440 -8.33333333333333e-02
+457 437 8.33333333333333e-02
+457 438 1.66666666666667e-01
+457 435 -1.66666666666667e-01
+457 439 -2.50000000000000e-01
+457 129 8.33333333333333e-02
+457 423 -8.33333333333333e-02
+457 54 8.33333333333333e-02
+457 290 -8.33333333333333e-02
+457 458 -3.33333333333333e-01
+457 654 -8.33333333333333e-02
+457 308 -8.33333333333333e-02
+457 302 8.33333333333333e-02
+457 306 -8.33333333333333e-02
+457 300 8.33333333333333e-02
+457 131 -1.66666666666667e-01
+457 656 1.66666666666667e-01
+457 655 -2.50000000000000e-01
+457 452 1.66666666666667e-01
+457 56 -1.66666666666667e-01
+457 431 8.33333333333333e-02
+457 451 -7.50000000000000e-01
+457 289 -2.50000000000000e-01
+457 456 -3.33333333333333e-01
+457 450 1.66666666666667e-01
+457 288 1.66666666666667e-01
+458 458 2.50000000000000e+00
+458 429 -1.66666666666667e-01
+458 294 8.33333333333333e-02
+458 618 -8.33333333333333e-02
+458 295 8.33333333333333e-02
+458 620 -2.50000000000000e-01
+458 619 1.66666666666667e-01
+458 446 -7.50000000000000e-01
+458 445 1.66666666666667e-01
+458 444 1.66666666666667e-01
+458 424 -8.33333333333333e-02
+458 423 -8.33333333333333e-02
+458 439 -8.33333333333333e-02
+458 436 8.33333333333333e-02
+458 435 8.33333333333333e-02
+458 440 -2.50000000000000e-01
+458 438 1.66666666666667e-01
+458 456 -3.33333333333333e-01
+458 289 -8.33333333333333e-02
+458 457 -3.33333333333333e-01
+458 307 -8.33333333333333e-02
+458 301 8.33333333333333e-02
+458 654 1.66666666666667e-01
+458 288 1.66666666666667e-01
+458 300 -1.66666666666667e-01
+458 656 -7.50000000000000e-01
+458 130 -1.66666666666667e-01
+458 655 1.66666666666667e-01
+458 129 8.33333333333333e-02
+458 306 -8.33333333333333e-02
+458 430 8.33333333333333e-02
+458 452 -2.50000000000000e-01
+458 290 -2.50000000000000e-01
+458 451 1.66666666666667e-01
+458 55 -1.66666666666667e-01
+458 450 -8.33333333333333e-02
+458 54 8.33333333333333e-02
+459 459 1.25000000000000e+00
+459 503 -8.33333333333333e-02
+459 475 8.33333333333333e-02
+459 502 -8.33333333333333e-02
+459 499 -8.33333333333333e-02
+459 470 8.33333333333333e-02
+459 476 -1.66666666666667e-01
+459 469 8.33333333333333e-02
+459 468 -3.75000000000000e-01
+459 167 8.33333333333333e-02
+459 461 -1.66666666666667e-01
+459 467 1.66666666666667e-01
+459 496 8.33333333333333e-02
+459 466 -8.33333333333333e-02
+459 59 -4.16666666666667e-02
+459 161 4.16666666666667e-02
+459 58 8.33333333333333e-02
+459 160 -8.33333333333333e-02
+459 57 -1.25000000000000e-01
+459 465 -2.50000000000000e-01
+459 65 -4.16666666666667e-02
+459 497 8.33333333333333e-02
+459 460 -1.66666666666667e-01
+459 64 8.33333333333333e-02
+459 166 8.33333333333333e-02
+459 500 4.16666666666667e-02
+459 63 -1.25000000000000e-01
+459 165 -3.75000000000000e-01
+460 460 1.25000000000000e+00
+460 501 -8.33333333333333e-02
+460 500 4.16666666666667e-02
+460 503 -8.33333333333333e-02
+460 498 -8.33333333333333e-02
+460 470 -4.16666666666667e-02
+460 476 8.33333333333333e-02
+460 469 -1.25000000000000e-01
+460 468 8.33333333333333e-02
+460 167 -4.16666666666667e-02
+460 161 4.16666666666667e-02
+460 495 8.33333333333333e-02
+460 465 -8.33333333333333e-02
+460 59 8.33333333333333e-02
+460 461 -1.66666666666667e-01
+460 467 1.66666666666667e-01
+460 58 -3.75000000000000e-01
+460 466 -2.50000000000000e-01
+460 57 8.33333333333333e-02
+460 159 -8.33333333333333e-02
+460 65 8.33333333333333e-02
+460 497 -1.66666666666667e-01
+460 474 8.33333333333333e-02
+460 64 -3.75000000000000e-01
+460 166 -1.25000000000000e-01
+460 459 -1.66666666666667e-01
+460 63 8.33333333333333e-02
+460 165 8.33333333333333e-02
+461 461 1.25000000000000e+00
+461 501 -8.33333333333333e-02
+461 499 4.16666666666667e-02
+461 502 -8.33333333333333e-02
+461 470 -1.25000000000000e-01
+461 469 -4.16666666666667e-02
+461 475 8.33333333333333e-02
+461 468 8.33333333333333e-02
+461 474 -1.66666666666667e-01
+461 166 -4.16666666666667e-02
+461 160 4.16666666666667e-02
+461 165 8.33333333333333e-02
+461 459 -1.66666666666667e-01
+461 465 1.66666666666667e-01
+461 59 -1.25000000000000e-01
+461 467 -7.50000000000000e-01
+461 58 8.33333333333333e-02
+461 460 -1.66666666666667e-01
+461 466 1.66666666666667e-01
+461 57 -4.16666666666667e-02
+461 159 4.16666666666667e-02
+461 498 4.16666666666667e-02
+461 65 -1.25000000000000e-01
+461 167 -1.25000000000000e-01
+461 64 8.33333333333333e-02
+461 496 -1.66666666666667e-01
+461 63 -4.16666666666667e-02
+461 495 8.33333333333333e-02
+462 462 1.25000000000000e+00
+462 473 8.33333333333333e-02
+462 472 8.33333333333333e-02
+462 471 -3.75000000000000e-01
+462 536 -8.33333333333333e-02
+462 538 -8.33333333333333e-02
+462 476 8.33333333333333e-02
+462 475 -1.66666666666667e-01
+462 539 -8.33333333333333e-02
+462 533 8.33333333333333e-02
+462 467 -8.33333333333333e-02
+462 463 -1.66666666666667e-01
+462 466 1.66666666666667e-01
+462 172 8.33333333333333e-02
+462 59 8.33333333333333e-02
+462 161 -8.33333333333333e-02
+462 58 -4.16666666666667e-02
+462 160 4.16666666666667e-02
+462 57 -1.25000000000000e-01
+462 465 -2.50000000000000e-01
+462 464 -1.66666666666667e-01
+462 71 8.33333333333333e-02
+462 173 8.33333333333333e-02
+462 70 -4.16666666666667e-02
+462 532 8.33333333333333e-02
+462 535 4.16666666666667e-02
+462 69 -1.25000000000000e-01
+462 171 -3.75000000000000e-01
+463 463 1.25000000000000e+00
+463 473 -4.16666666666667e-02
+463 472 -1.25000000000000e-01
+463 471 8.33333333333333e-02
+463 536 4.16666666666667e-02
+463 476 8.33333333333333e-02
+463 539 -8.33333333333333e-02
+463 537 -8.33333333333333e-02
+463 474 -1.66666666666667e-01
+463 161 4.16666666666667e-02
+463 173 -4.16666666666667e-02
+463 462 -1.66666666666667e-01
+463 465 1.66666666666667e-01
+463 171 8.33333333333333e-02
+463 59 8.33333333333333e-02
+463 464 -1.66666666666667e-01
+463 467 1.66666666666667e-01
+463 58 -1.25000000000000e-01
+463 466 -7.50000000000000e-01
+463 57 -4.16666666666667e-02
+463 159 4.16666666666667e-02
+463 71 8.33333333333333e-02
+463 533 -1.66666666666667e-01
+463 534 4.16666666666667e-02
+463 70 -1.25000000000000e-01
+463 172 -1.25000000000000e-01
+463 69 -4.16666666666667e-02
+463 531 8.33333333333333e-02
+464 464 1.25000000000000e+00
+464 472 -4.16666666666667e-02
+464 471 8.33333333333333e-02
+464 535 4.16666666666667e-02
+464 534 -8.33333333333333e-02
+464 475 8.33333333333333e-02
+464 538 -8.33333333333333e-02
+464 474 8.33333333333333e-02
+464 537 -8.33333333333333e-02
+464 531 8.33333333333333e-02
+464 465 -8.33333333333333e-02
+464 160 4.16666666666667e-02
+464 172 -4.16666666666667e-02
+464 59 -3.75000000000000e-01
+464 467 -2.50000000000000e-01
+464 58 8.33333333333333e-02
+464 463 -1.66666666666667e-01
+464 466 1.66666666666667e-01
+464 57 8.33333333333333e-02
+464 159 -8.33333333333333e-02
+464 473 -1.25000000000000e-01
+464 71 -3.75000000000000e-01
+464 173 -1.25000000000000e-01
+464 70 8.33333333333333e-02
+464 532 -1.66666666666667e-01
+464 462 -1.66666666666667e-01
+464 69 8.33333333333333e-02
+464 171 8.33333333333333e-02
+465 465 2.50000000000000e+00
+465 502 -1.66666666666667e-01
+465 461 1.66666666666667e-01
+465 166 8.33333333333333e-02
+465 460 -8.33333333333333e-02
+465 167 -1.66666666666667e-01
+465 459 -2.50000000000000e-01
+465 497 -8.33333333333333e-02
+465 496 1.66666666666667e-01
+465 495 -2.50000000000000e-01
+465 568 -8.33333333333333e-02
+465 476 1.66666666666667e-01
+465 539 -1.66666666666667e-01
+465 538 8.33333333333333e-02
+465 59 8.33333333333333e-02
+465 475 1.66666666666667e-01
+465 466 -3.33333333333333e-01
+465 474 -7.50000000000000e-01
+465 569 -8.33333333333333e-02
+465 77 8.33333333333333e-02
+465 464 -8.33333333333333e-02
+465 463 1.66666666666667e-01
+465 161 -8.33333333333333e-02
+465 173 8.33333333333333e-02
+465 178 1.66666666666667e-01
+465 172 -1.66666666666667e-01
+465 58 8.33333333333333e-02
+465 160 -8.33333333333333e-02
+465 462 -2.50000000000000e-01
+465 467 -3.33333333333333e-01
+465 533 1.66666666666667e-01
+465 179 1.66666666666667e-01
+465 532 -8.33333333333333e-02
+465 76 8.33333333333333e-02
+465 503 8.33333333333333e-02
+465 531 -2.50000000000000e-01
+465 177 -7.50000000000000e-01
+466 466 2.50000000000000e+00
+466 501 -1.66666666666667e-01
+466 165 8.33333333333333e-02
+466 459 -8.33333333333333e-02
+466 167 8.33333333333333e-02
+466 461 1.66666666666667e-01
+466 460 -2.50000000000000e-01
+466 497 1.66666666666667e-01
+466 496 -7.50000000000000e-01
+466 495 1.66666666666667e-01
+466 569 -8.33333333333333e-02
+466 567 -8.33333333333333e-02
+466 476 -8.33333333333333e-02
+466 539 8.33333333333333e-02
+466 537 8.33333333333333e-02
+466 475 -2.50000000000000e-01
+466 474 1.66666666666667e-01
+466 465 -3.33333333333333e-01
+466 179 -8.33333333333333e-02
+466 467 -3.33333333333333e-01
+466 161 -8.33333333333333e-02
+466 173 8.33333333333333e-02
+466 462 1.66666666666667e-01
+466 177 1.66666666666667e-01
+466 171 -1.66666666666667e-01
+466 59 -1.66666666666667e-01
+466 464 1.66666666666667e-01
+466 463 -7.50000000000000e-01
+466 57 8.33333333333333e-02
+466 159 -8.33333333333333e-02
+466 533 1.66666666666667e-01
+466 77 -1.66666666666667e-01
+466 503 8.33333333333333e-02
+466 532 -2.50000000000000e-01
+466 178 -2.50000000000000e-01
+466 531 -8.33333333333333e-02
+466 75 8.33333333333333e-02
+467 467 2.50000000000000e+00
+467 501 8.33333333333333e-02
+467 459 1.66666666666667e-01
+467 166 8.33333333333333e-02
+467 165 -1.66666666666667e-01
+467 461 -7.50000000000000e-01
+467 460 1.66666666666667e-01
+467 497 -2.50000000000000e-01
+467 496 1.66666666666667e-01
+467 495 -8.33333333333333e-02
+467 568 -8.33333333333333e-02
+467 475 -8.33333333333333e-02
+467 538 8.33333333333333e-02
+467 474 1.66666666666667e-01
+467 537 -1.66666666666667e-01
+467 476 -2.50000000000000e-01
+467 57 8.33333333333333e-02
+467 567 -8.33333333333333e-02
+467 75 8.33333333333333e-02
+467 178 -8.33333333333333e-02
+467 466 -3.33333333333333e-01
+467 462 -8.33333333333333e-02
+467 160 -8.33333333333333e-02
+467 172 8.33333333333333e-02
+467 159 -8.33333333333333e-02
+467 171 8.33333333333333e-02
+467 464 -2.50000000000000e-01
+467 58 -1.66666666666667e-01
+467 463 1.66666666666667e-01
+467 502 8.33333333333333e-02
+467 533 -7.50000000000000e-01
+467 179 -2.50000000000000e-01
+467 532 1.66666666666667e-01
+467 76 -1.66666666666667e-01
+467 465 -3.33333333333333e-01
+467 531 1.66666666666667e-01
+467 177 1.66666666666667e-01
+468 468 1.25000000000000e+00
+468 502 8.33333333333333e-02
+468 503 8.33333333333333e-02
+468 461 8.33333333333333e-02
+468 470 -1.66666666666667e-01
+468 460 8.33333333333333e-02
+468 459 -3.75000000000000e-01
+468 499 8.33333333333333e-02
+468 498 -1.25000000000000e-01
+468 475 -8.33333333333333e-02
+468 469 -1.66666666666667e-01
+468 185 8.33333333333333e-02
+468 586 -8.33333333333333e-02
+468 190 8.33333333333333e-02
+468 476 1.66666666666667e-01
+468 191 -1.66666666666667e-01
+468 80 4.16666666666667e-02
+468 587 -8.33333333333333e-02
+468 184 8.33333333333333e-02
+468 79 -8.33333333333333e-02
+468 183 -3.75000000000000e-01
+468 182 -4.16666666666667e-02
+468 59 4.16666666666667e-02
+468 181 8.33333333333333e-02
+468 58 -8.33333333333333e-02
+468 180 -1.25000000000000e-01
+468 500 -4.16666666666667e-02
+468 474 -2.50000000000000e-01
+469 469 1.25000000000000e+00
+469 501 8.33333333333333e-02
+469 503 -1.66666666666667e-01
+469 461 -4.16666666666667e-02
+469 59 4.16666666666667e-02
+469 460 -1.25000000000000e-01
+469 459 8.33333333333333e-02
+469 80 4.16666666666667e-02
+469 499 -3.75000000000000e-01
+469 498 8.33333333333333e-02
+469 474 -8.33333333333333e-02
+469 185 -4.16666666666667e-02
+469 468 -1.66666666666667e-01
+469 585 -8.33333333333333e-02
+469 189 8.33333333333333e-02
+469 587 -8.33333333333333e-02
+469 191 8.33333333333333e-02
+469 184 -1.25000000000000e-01
+469 183 8.33333333333333e-02
+469 78 -8.33333333333333e-02
+469 182 8.33333333333333e-02
+469 470 -1.66666666666667e-01
+469 476 1.66666666666667e-01
+469 181 -3.75000000000000e-01
+469 500 8.33333333333333e-02
+469 475 -2.50000000000000e-01
+469 180 8.33333333333333e-02
+469 57 -8.33333333333333e-02
+470 470 1.25000000000000e+00
+470 498 -4.16666666666667e-02
+470 502 -1.66666666666667e-01
+470 501 8.33333333333333e-02
+470 461 -1.25000000000000e-01
+470 460 -4.16666666666667e-02
+470 58 4.16666666666667e-02
+470 459 8.33333333333333e-02
+470 468 -1.66666666666667e-01
+470 500 -1.25000000000000e-01
+470 79 4.16666666666667e-02
+470 184 -4.16666666666667e-02
+470 183 8.33333333333333e-02
+470 586 -8.33333333333333e-02
+470 190 8.33333333333333e-02
+470 474 1.66666666666667e-01
+470 189 -1.66666666666667e-01
+470 185 -1.25000000000000e-01
+470 78 4.16666666666667e-02
+470 585 -8.33333333333333e-02
+470 182 -1.25000000000000e-01
+470 499 8.33333333333333e-02
+470 476 -7.50000000000000e-01
+470 181 8.33333333333333e-02
+470 469 -1.66666666666667e-01
+470 475 1.66666666666667e-01
+470 180 -4.16666666666667e-02
+470 57 4.16666666666667e-02
+471 471 1.25000000000000e+00
+471 535 -4.16666666666667e-02
+471 538 8.33333333333333e-02
+471 536 8.33333333333333e-02
+471 534 -1.25000000000000e-01
+471 464 8.33333333333333e-02
+471 472 -1.66666666666667e-01
+471 463 8.33333333333333e-02
+471 462 -3.75000000000000e-01
+471 593 -8.33333333333333e-02
+471 473 -1.66666666666667e-01
+471 187 8.33333333333333e-02
+471 191 8.33333333333333e-02
+471 476 -8.33333333333333e-02
+471 190 -1.66666666666667e-01
+471 475 1.66666666666667e-01
+471 188 8.33333333333333e-02
+471 83 -8.33333333333333e-02
+471 82 4.16666666666667e-02
+471 592 -8.33333333333333e-02
+471 186 -3.75000000000000e-01
+471 182 8.33333333333333e-02
+471 59 -8.33333333333333e-02
+471 181 -4.16666666666667e-02
+471 58 4.16666666666667e-02
+471 180 -1.25000000000000e-01
+471 539 8.33333333333333e-02
+471 474 -2.50000000000000e-01
+472 472 1.25000000000000e+00
+472 539 -1.66666666666667e-01
+472 534 -4.16666666666667e-02
+472 537 8.33333333333333e-02
+472 83 4.16666666666667e-02
+472 535 -1.25000000000000e-01
+472 59 4.16666666666667e-02
+472 464 -4.16666666666667e-02
+472 463 -1.25000000000000e-01
+472 471 -1.66666666666667e-01
+472 462 8.33333333333333e-02
+472 593 -8.33333333333333e-02
+472 188 -4.16666666666667e-02
+472 191 8.33333333333333e-02
+472 186 8.33333333333333e-02
+472 189 -1.66666666666667e-01
+472 474 1.66666666666667e-01
+472 187 -1.25000000000000e-01
+472 81 4.16666666666667e-02
+472 591 -8.33333333333333e-02
+472 182 8.33333333333333e-02
+472 473 -1.66666666666667e-01
+472 476 1.66666666666667e-01
+472 181 -1.25000000000000e-01
+472 536 8.33333333333333e-02
+472 475 -7.50000000000000e-01
+472 180 -4.16666666666667e-02
+472 57 4.16666666666667e-02
+473 473 1.25000000000000e+00
+473 535 8.33333333333333e-02
+473 538 -1.66666666666667e-01
+473 536 -3.75000000000000e-01
+473 82 4.16666666666667e-02
+473 534 8.33333333333333e-02
+473 464 -1.25000000000000e-01
+473 58 4.16666666666667e-02
+473 463 -4.16666666666667e-02
+473 462 8.33333333333333e-02
+473 592 -8.33333333333333e-02
+473 591 -8.33333333333333e-02
+473 187 -4.16666666666667e-02
+473 190 8.33333333333333e-02
+473 471 -1.66666666666667e-01
+473 189 8.33333333333333e-02
+473 474 -8.33333333333333e-02
+473 188 -1.25000000000000e-01
+473 186 8.33333333333333e-02
+473 81 -8.33333333333333e-02
+473 182 -3.75000000000000e-01
+473 537 8.33333333333333e-02
+473 476 -2.50000000000000e-01
+473 181 8.33333333333333e-02
+473 472 -1.66666666666667e-01
+473 475 1.66666666666667e-01
+473 180 8.33333333333333e-02
+473 57 -8.33333333333333e-02
+474 474 2.50000000000000e+00
+474 503 -8.33333333333333e-02
+474 461 -1.66666666666667e-01
+474 502 1.66666666666667e-01
+474 501 -2.50000000000000e-01
+474 469 -8.33333333333333e-02
+474 470 1.66666666666667e-01
+474 468 -2.50000000000000e-01
+474 587 8.33333333333333e-02
+474 586 -1.66666666666667e-01
+474 568 8.33333333333333e-02
+474 538 -8.33333333333333e-02
+474 476 -3.33333333333333e-01
+474 467 1.66666666666667e-01
+474 539 1.66666666666667e-01
+474 59 -8.33333333333333e-02
+474 464 8.33333333333333e-02
+474 466 1.66666666666667e-01
+474 463 -1.66666666666667e-01
+474 465 -7.50000000000000e-01
+474 86 -8.33333333333333e-02
+474 569 8.33333333333333e-02
+474 537 -2.50000000000000e-01
+474 182 8.33333333333333e-02
+474 473 -8.33333333333333e-02
+474 190 1.66666666666667e-01
+474 475 -3.33333333333333e-01
+474 472 1.66666666666667e-01
+474 191 1.66666666666667e-01
+474 593 -1.66666666666667e-01
+474 592 8.33333333333333e-02
+474 85 -8.33333333333333e-02
+474 189 -7.50000000000000e-01
+474 181 8.33333333333333e-02
+474 58 -8.33333333333333e-02
+474 471 -2.50000000000000e-01
+474 460 8.33333333333333e-02
+475 475 2.50000000000000e+00
+475 503 1.66666666666667e-01
+475 461 8.33333333333333e-02
+475 502 -7.50000000000000e-01
+475 501 1.66666666666667e-01
+475 468 -8.33333333333333e-02
+475 587 8.33333333333333e-02
+475 470 1.66666666666667e-01
+475 469 -2.50000000000000e-01
+475 585 -1.66666666666667e-01
+475 476 -3.33333333333333e-01
+475 86 -8.33333333333333e-02
+475 59 -8.33333333333333e-02
+475 567 8.33333333333333e-02
+475 537 -8.33333333333333e-02
+475 467 -8.33333333333333e-02
+475 464 8.33333333333333e-02
+475 466 -2.50000000000000e-01
+475 465 1.66666666666667e-01
+475 462 -1.66666666666667e-01
+475 569 -1.66666666666667e-01
+475 539 1.66666666666667e-01
+475 538 -2.50000000000000e-01
+475 191 -8.33333333333333e-02
+475 593 8.33333333333333e-02
+475 189 1.66666666666667e-01
+475 474 -3.33333333333333e-01
+475 471 1.66666666666667e-01
+475 190 -2.50000000000000e-01
+475 591 8.33333333333333e-02
+475 84 -8.33333333333333e-02
+475 182 -1.66666666666667e-01
+475 473 1.66666666666667e-01
+475 472 -7.50000000000000e-01
+475 459 8.33333333333333e-02
+475 180 8.33333333333333e-02
+475 57 -8.33333333333333e-02
+476 476 2.50000000000000e+00
+476 501 -8.33333333333333e-02
+476 460 8.33333333333333e-02
+476 459 -1.66666666666667e-01
+476 503 -2.50000000000000e-01
+476 586 8.33333333333333e-02
+476 468 1.66666666666667e-01
+476 470 -7.50000000000000e-01
+476 469 1.66666666666667e-01
+476 585 8.33333333333333e-02
+476 475 -3.33333333333333e-01
+476 85 -8.33333333333333e-02
+476 58 -8.33333333333333e-02
+476 466 -8.33333333333333e-02
+476 463 8.33333333333333e-02
+476 474 -3.33333333333333e-01
+476 465 1.66666666666667e-01
+476 537 1.66666666666667e-01
+476 467 -2.50000000000000e-01
+476 57 -8.33333333333333e-02
+476 462 8.33333333333333e-02
+476 539 -7.50000000000000e-01
+476 568 -1.66666666666667e-01
+476 538 1.66666666666667e-01
+476 84 -8.33333333333333e-02
+476 567 8.33333333333333e-02
+476 190 -8.33333333333333e-02
+476 592 8.33333333333333e-02
+476 180 8.33333333333333e-02
+476 471 -8.33333333333333e-02
+476 191 -2.50000000000000e-01
+476 189 1.66666666666667e-01
+476 591 -1.66666666666667e-01
+476 473 -2.50000000000000e-01
+476 502 1.66666666666667e-01
+476 181 -1.66666666666667e-01
+476 472 1.66666666666667e-01
+477 477 1.25000000000000e+00
+477 508 -8.33333333333333e-02
+477 488 -4.16666666666667e-02
+477 494 8.33333333333333e-02
+477 487 8.33333333333333e-02
+477 486 -1.25000000000000e-01
+477 506 4.16666666666667e-02
+477 509 -8.33333333333333e-02
+477 505 -8.33333333333333e-02
+477 164 4.16666666666667e-02
+477 167 -4.16666666666667e-02
+477 496 8.33333333333333e-02
+477 484 -8.33333333333333e-02
+477 65 8.33333333333333e-02
+477 497 -1.66666666666667e-01
+477 64 8.33333333333333e-02
+477 478 -1.66666666666667e-01
+477 166 8.33333333333333e-02
+477 63 -3.75000000000000e-01
+477 165 -1.25000000000000e-01
+477 479 -1.66666666666667e-01
+477 62 8.33333333333333e-02
+477 485 1.66666666666667e-01
+477 61 8.33333333333333e-02
+477 163 -8.33333333333333e-02
+477 493 8.33333333333333e-02
+477 60 -3.75000000000000e-01
+477 483 -2.50000000000000e-01
+478 478 1.25000000000000e+00
+478 509 -8.33333333333333e-02
+478 492 8.33333333333333e-02
+478 507 -8.33333333333333e-02
+478 488 8.33333333333333e-02
+478 494 -1.66666666666667e-01
+478 487 -3.75000000000000e-01
+478 486 8.33333333333333e-02
+478 504 -8.33333333333333e-02
+478 479 -1.66666666666667e-01
+478 167 8.33333333333333e-02
+478 485 1.66666666666667e-01
+478 495 8.33333333333333e-02
+478 483 -8.33333333333333e-02
+478 65 -4.16666666666667e-02
+478 497 8.33333333333333e-02
+478 64 -1.25000000000000e-01
+478 166 -3.75000000000000e-01
+478 63 8.33333333333333e-02
+478 477 -1.66666666666667e-01
+478 165 8.33333333333333e-02
+478 62 -4.16666666666667e-02
+478 164 4.16666666666667e-02
+478 506 4.16666666666667e-02
+478 61 -1.25000000000000e-01
+478 484 -2.50000000000000e-01
+478 60 8.33333333333333e-02
+478 162 -8.33333333333333e-02
+479 479 1.25000000000000e+00
+479 508 -8.33333333333333e-02
+479 488 -1.25000000000000e-01
+479 487 8.33333333333333e-02
+479 493 -1.66666666666667e-01
+479 486 -4.16666666666667e-02
+479 492 8.33333333333333e-02
+479 504 4.16666666666667e-02
+479 507 -8.33333333333333e-02
+479 162 4.16666666666667e-02
+479 165 -4.16666666666667e-02
+479 478 -1.66666666666667e-01
+479 166 8.33333333333333e-02
+479 484 1.66666666666667e-01
+479 65 -1.25000000000000e-01
+479 167 -1.25000000000000e-01
+479 64 -4.16666666666667e-02
+479 496 8.33333333333333e-02
+479 63 8.33333333333333e-02
+479 495 -1.66666666666667e-01
+479 505 4.16666666666667e-02
+479 62 -1.25000000000000e-01
+479 485 -7.50000000000000e-01
+479 61 -4.16666666666667e-02
+479 163 4.16666666666667e-02
+479 477 -1.66666666666667e-01
+479 60 8.33333333333333e-02
+479 483 1.66666666666667e-01
+480 480 2.50000000000000e+00
+480 557 -8.33333333333333e-02
+480 556 -8.33333333333333e-02
+480 493 -1.66666666666667e-01
+480 484 1.66666666666667e-01
+480 551 -1.66666666666667e-01
+480 550 8.33333333333333e-02
+480 485 1.66666666666667e-01
+480 483 -7.50000000000000e-01
+480 491 -8.33333333333333e-02
+480 554 8.33333333333333e-02
+480 490 1.66666666666667e-01
+480 481 -3.33333333333333e-01
+480 376 1.66666666666667e-01
+480 374 -1.66666666666667e-01
+480 62 1.66666666666667e-01
+480 373 8.33333333333333e-02
+480 61 -8.33333333333333e-02
+480 489 -2.50000000000000e-01
+480 377 1.66666666666667e-01
+480 482 -3.33333333333333e-01
+480 74 1.66666666666667e-01
+480 553 8.33333333333333e-02
+480 73 -8.33333333333333e-02
+480 375 -7.50000000000000e-01
+480 343 -8.33333333333333e-02
+480 163 8.33333333333333e-02
+480 164 8.33333333333333e-02
+480 344 -8.33333333333333e-02
+480 60 -2.50000000000000e-01
+480 176 -8.33333333333333e-02
+480 350 8.33333333333333e-02
+480 175 1.66666666666667e-01
+480 349 -1.66666666666667e-01
+480 174 -2.50000000000000e-01
+480 494 8.33333333333333e-02
+480 72 -2.50000000000000e-01
+481 481 2.50000000000000e+00
+481 494 8.33333333333333e-02
+481 492 -1.66666666666667e-01
+481 557 -8.33333333333333e-02
+481 485 -8.33333333333333e-02
+481 551 8.33333333333333e-02
+481 483 1.66666666666667e-01
+481 549 8.33333333333333e-02
+481 484 -2.50000000000000e-01
+481 374 8.33333333333333e-02
+481 377 -8.33333333333333e-02
+481 489 1.66666666666667e-01
+481 480 -3.33333333333333e-01
+481 375 1.66666666666667e-01
+481 491 1.66666666666667e-01
+481 490 -7.50000000000000e-01
+481 372 8.33333333333333e-02
+481 60 -8.33333333333333e-02
+481 554 -1.66666666666667e-01
+481 376 -2.50000000000000e-01
+481 552 8.33333333333333e-02
+481 72 -8.33333333333333e-02
+481 342 -8.33333333333333e-02
+481 162 8.33333333333333e-02
+481 344 -8.33333333333333e-02
+481 350 8.33333333333333e-02
+481 164 -1.66666666666667e-01
+481 62 1.66666666666667e-01
+481 61 -2.50000000000000e-01
+481 176 1.66666666666667e-01
+481 482 -3.33333333333333e-01
+481 74 1.66666666666667e-01
+481 175 -7.50000000000000e-01
+481 555 -8.33333333333333e-02
+481 73 -2.50000000000000e-01
+481 174 1.66666666666667e-01
+481 348 -1.66666666666667e-01
+482 482 2.50000000000000e+00
+482 555 -8.33333333333333e-02
+482 493 8.33333333333333e-02
+482 556 -8.33333333333333e-02
+482 484 -8.33333333333333e-02
+482 550 8.33333333333333e-02
+482 549 -1.66666666666667e-01
+482 485 -2.50000000000000e-01
+482 483 1.66666666666667e-01
+482 373 8.33333333333333e-02
+482 376 -8.33333333333333e-02
+482 489 -8.33333333333333e-02
+482 552 8.33333333333333e-02
+482 491 -2.50000000000000e-01
+482 490 1.66666666666667e-01
+482 372 -1.66666666666667e-01
+482 60 1.66666666666667e-01
+482 377 -2.50000000000000e-01
+482 553 -1.66666666666667e-01
+482 375 1.66666666666667e-01
+482 480 -3.33333333333333e-01
+482 72 1.66666666666667e-01
+482 343 -8.33333333333333e-02
+482 349 8.33333333333333e-02
+482 62 -7.50000000000000e-01
+482 163 -1.66666666666667e-01
+482 61 1.66666666666667e-01
+482 162 8.33333333333333e-02
+482 342 -8.33333333333333e-02
+482 176 -2.50000000000000e-01
+482 492 8.33333333333333e-02
+482 74 -7.50000000000000e-01
+482 175 1.66666666666667e-01
+482 481 -3.33333333333333e-01
+482 73 1.66666666666667e-01
+482 174 -8.33333333333333e-02
+482 348 8.33333333333333e-02
+483 483 2.50000000000000e+00
+483 508 -1.66666666666667e-01
+483 478 -8.33333333333333e-02
+483 166 8.33333333333333e-02
+483 167 8.33333333333333e-02
+483 479 1.66666666666667e-01
+483 477 -2.50000000000000e-01
+483 497 1.66666666666667e-01
+483 496 1.66666666666667e-01
+483 495 -7.50000000000000e-01
+483 572 -8.33333333333333e-02
+483 571 -8.33333333333333e-02
+483 494 -8.33333333333333e-02
+483 557 8.33333333333333e-02
+483 556 8.33333333333333e-02
+483 493 1.66666666666667e-01
+483 484 -3.33333333333333e-01
+483 492 -2.50000000000000e-01
+483 179 -8.33333333333333e-02
+483 485 -3.33333333333333e-01
+483 164 -8.33333333333333e-02
+483 176 8.33333333333333e-02
+483 481 1.66666666666667e-01
+483 178 1.66666666666667e-01
+483 175 -1.66666666666667e-01
+483 482 1.66666666666667e-01
+483 62 -1.66666666666667e-01
+483 61 8.33333333333333e-02
+483 163 -8.33333333333333e-02
+483 480 -7.50000000000000e-01
+483 551 1.66666666666667e-01
+483 77 -1.66666666666667e-01
+483 550 -8.33333333333333e-02
+483 76 8.33333333333333e-02
+483 549 -2.50000000000000e-01
+483 509 8.33333333333333e-02
+483 177 -2.50000000000000e-01
+484 484 2.50000000000000e+00
+484 507 -1.66666666666667e-01
+484 479 1.66666666666667e-01
+484 477 -8.33333333333333e-02
+484 165 8.33333333333333e-02
+484 167 -1.66666666666667e-01
+484 478 -2.50000000000000e-01
+484 497 -8.33333333333333e-02
+484 496 -2.50000000000000e-01
+484 495 1.66666666666667e-01
+484 570 -8.33333333333333e-02
+484 494 1.66666666666667e-01
+484 557 -1.66666666666667e-01
+484 555 8.33333333333333e-02
+484 62 8.33333333333333e-02
+484 493 -7.50000000000000e-01
+484 492 1.66666666666667e-01
+484 483 -3.33333333333333e-01
+484 572 -8.33333333333333e-02
+484 77 8.33333333333333e-02
+484 482 -8.33333333333333e-02
+484 480 1.66666666666667e-01
+484 164 -8.33333333333333e-02
+484 176 8.33333333333333e-02
+484 177 1.66666666666667e-01
+484 174 -1.66666666666667e-01
+484 481 -2.50000000000000e-01
+484 60 8.33333333333333e-02
+484 162 -8.33333333333333e-02
+484 551 1.66666666666667e-01
+484 485 -3.33333333333333e-01
+484 179 1.66666666666667e-01
+484 550 -2.50000000000000e-01
+484 509 8.33333333333333e-02
+484 178 -7.50000000000000e-01
+484 549 -8.33333333333333e-02
+484 75 8.33333333333333e-02
+485 485 2.50000000000000e+00
+485 508 8.33333333333333e-02
+485 478 1.66666666666667e-01
+485 166 -1.66666666666667e-01
+485 165 8.33333333333333e-02
+485 479 -7.50000000000000e-01
+485 477 1.66666666666667e-01
+485 497 -2.50000000000000e-01
+485 496 -8.33333333333333e-02
+485 495 1.66666666666667e-01
+485 570 -8.33333333333333e-02
+485 493 1.66666666666667e-01
+485 492 -8.33333333333333e-02
+485 555 8.33333333333333e-02
+485 556 -1.66666666666667e-01
+485 494 -2.50000000000000e-01
+485 61 8.33333333333333e-02
+485 571 -8.33333333333333e-02
+485 76 8.33333333333333e-02
+485 177 -8.33333333333333e-02
+485 481 -8.33333333333333e-02
+485 483 -3.33333333333333e-01
+485 162 -8.33333333333333e-02
+485 174 8.33333333333333e-02
+485 163 -8.33333333333333e-02
+485 175 8.33333333333333e-02
+485 482 -2.50000000000000e-01
+485 480 1.66666666666667e-01
+485 60 -1.66666666666667e-01
+485 551 -7.50000000000000e-01
+485 507 8.33333333333333e-02
+485 179 -2.50000000000000e-01
+485 550 1.66666666666667e-01
+485 484 -3.33333333333333e-01
+485 178 1.66666666666667e-01
+485 549 1.66666666666667e-01
+485 75 -1.66666666666667e-01
+486 486 1.25000000000000e+00
+486 508 8.33333333333333e-02
+486 509 -1.66666666666667e-01
+486 62 4.16666666666667e-02
+486 479 -4.16666666666667e-02
+486 478 8.33333333333333e-02
+486 477 -1.25000000000000e-01
+486 98 4.16666666666667e-02
+486 505 8.33333333333333e-02
+486 504 -3.75000000000000e-01
+486 493 -8.33333333333333e-02
+486 215 -4.16666666666667e-02
+486 487 -1.66666666666667e-01
+486 622 -8.33333333333333e-02
+486 220 8.33333333333333e-02
+486 623 -8.33333333333333e-02
+486 221 8.33333333333333e-02
+486 97 -8.33333333333333e-02
+486 214 8.33333333333333e-02
+486 213 -1.25000000000000e-01
+486 488 -1.66666666666667e-01
+486 209 8.33333333333333e-02
+486 494 1.66666666666667e-01
+486 208 8.33333333333333e-02
+486 61 -8.33333333333333e-02
+486 506 8.33333333333333e-02
+486 207 -3.75000000000000e-01
+486 492 -2.50000000000000e-01
+487 487 1.25000000000000e+00
+487 507 8.33333333333333e-02
+487 509 8.33333333333333e-02
+487 479 8.33333333333333e-02
+487 488 -1.66666666666667e-01
+487 478 -3.75000000000000e-01
+487 477 8.33333333333333e-02
+487 505 -1.25000000000000e-01
+487 504 8.33333333333333e-02
+487 492 -8.33333333333333e-02
+487 486 -1.66666666666667e-01
+487 215 8.33333333333333e-02
+487 621 -8.33333333333333e-02
+487 219 8.33333333333333e-02
+487 494 1.66666666666667e-01
+487 221 -1.66666666666667e-01
+487 98 4.16666666666667e-02
+487 623 -8.33333333333333e-02
+487 214 -3.75000000000000e-01
+487 96 -8.33333333333333e-02
+487 213 8.33333333333333e-02
+487 209 -4.16666666666667e-02
+487 62 4.16666666666667e-02
+487 506 -4.16666666666667e-02
+487 208 -1.25000000000000e-01
+487 493 -2.50000000000000e-01
+487 207 8.33333333333333e-02
+487 60 -8.33333333333333e-02
+488 488 1.25000000000000e+00
+488 504 8.33333333333333e-02
+488 508 8.33333333333333e-02
+488 507 -1.66666666666667e-01
+488 479 -1.25000000000000e-01
+488 478 8.33333333333333e-02
+488 487 -1.66666666666667e-01
+488 60 4.16666666666667e-02
+488 477 -4.16666666666667e-02
+488 506 -1.25000000000000e-01
+488 96 4.16666666666667e-02
+488 213 -4.16666666666667e-02
+488 214 8.33333333333333e-02
+488 493 1.66666666666667e-01
+488 220 -1.66666666666667e-01
+488 621 -8.33333333333333e-02
+488 219 8.33333333333333e-02
+488 215 -1.25000000000000e-01
+488 97 4.16666666666667e-02
+488 622 -8.33333333333333e-02
+488 505 -4.16666666666667e-02
+488 209 -1.25000000000000e-01
+488 494 -7.50000000000000e-01
+488 208 -4.16666666666667e-02
+488 61 4.16666666666667e-02
+488 486 -1.66666666666667e-01
+488 207 8.33333333333333e-02
+488 492 1.66666666666667e-01
+489 489 2.50000000000000e+00
+489 556 8.33333333333333e-02
+489 629 -8.33333333333333e-02
+489 221 8.33333333333333e-02
+489 220 -1.66666666666667e-01
+489 493 1.66666666666667e-01
+489 628 -8.33333333333333e-02
+489 494 1.66666666666667e-01
+489 492 -7.50000000000000e-01
+489 482 -8.33333333333333e-02
+489 377 8.33333333333333e-02
+489 481 1.66666666666667e-01
+489 376 -1.66666666666667e-01
+489 61 8.33333333333333e-02
+489 480 -2.50000000000000e-01
+489 491 -3.33333333333333e-01
+489 554 1.66666666666667e-01
+489 100 8.33333333333333e-02
+489 553 -8.33333333333333e-02
+489 552 -2.50000000000000e-01
+489 373 -8.33333333333333e-02
+489 209 1.66666666666667e-01
+489 205 8.33333333333333e-02
+489 208 -8.33333333333333e-02
+489 206 -1.66666666666667e-01
+489 386 1.66666666666667e-01
+489 62 8.33333333333333e-02
+489 374 -8.33333333333333e-02
+489 207 -2.50000000000000e-01
+489 218 -8.33333333333333e-02
+489 101 8.33333333333333e-02
+489 490 -3.33333333333333e-01
+489 217 1.66666666666667e-01
+489 385 1.66666666666667e-01
+489 557 -1.66666666666667e-01
+489 216 -2.50000000000000e-01
+489 384 -7.50000000000000e-01
+490 490 2.50000000000000e+00
+490 555 8.33333333333333e-02
+490 629 -8.33333333333333e-02
+490 221 8.33333333333333e-02
+490 494 -8.33333333333333e-02
+490 219 -1.66666666666667e-01
+490 492 1.66666666666667e-01
+490 627 -8.33333333333333e-02
+490 493 -2.50000000000000e-01
+490 377 8.33333333333333e-02
+490 480 1.66666666666667e-01
+490 375 -1.66666666666667e-01
+490 482 1.66666666666667e-01
+490 481 -7.50000000000000e-01
+490 60 8.33333333333333e-02
+490 554 1.66666666666667e-01
+490 553 -2.50000000000000e-01
+490 99 8.33333333333333e-02
+490 552 -8.33333333333333e-02
+490 372 -8.33333333333333e-02
+490 374 -8.33333333333333e-02
+490 491 -3.33333333333333e-01
+490 204 8.33333333333333e-02
+490 207 -8.33333333333333e-02
+490 206 8.33333333333333e-02
+490 386 -8.33333333333333e-02
+490 62 -1.66666666666667e-01
+490 209 1.66666666666667e-01
+490 208 -2.50000000000000e-01
+490 218 1.66666666666667e-01
+490 101 -1.66666666666667e-01
+490 557 8.33333333333333e-02
+490 217 -7.50000000000000e-01
+490 385 -2.50000000000000e-01
+490 489 -3.33333333333333e-01
+490 216 1.66666666666667e-01
+490 384 1.66666666666667e-01
+491 491 2.50000000000000e+00
+491 555 -1.66666666666667e-01
+491 627 -8.33333333333333e-02
+491 628 -8.33333333333333e-02
+491 219 8.33333333333333e-02
+491 220 8.33333333333333e-02
+491 493 -8.33333333333333e-02
+491 494 -2.50000000000000e-01
+491 492 1.66666666666667e-01
+491 376 8.33333333333333e-02
+491 480 -8.33333333333333e-02
+491 375 8.33333333333333e-02
+491 482 -2.50000000000000e-01
+491 481 1.66666666666667e-01
+491 554 -7.50000000000000e-01
+491 553 1.66666666666667e-01
+491 489 -3.33333333333333e-01
+491 552 1.66666666666667e-01
+491 373 -8.33333333333333e-02
+491 490 -3.33333333333333e-01
+491 207 1.66666666666667e-01
+491 205 8.33333333333333e-02
+491 385 -8.33333333333333e-02
+491 204 -1.66666666666667e-01
+491 384 1.66666666666667e-01
+491 209 -7.50000000000000e-01
+491 61 -1.66666666666667e-01
+491 208 1.66666666666667e-01
+491 60 8.33333333333333e-02
+491 372 -8.33333333333333e-02
+491 556 8.33333333333333e-02
+491 218 -2.50000000000000e-01
+491 386 -2.50000000000000e-01
+491 217 1.66666666666667e-01
+491 100 -1.66666666666667e-01
+491 216 -8.33333333333333e-02
+491 99 8.33333333333333e-02
+492 492 2.50000000000000e+00
+492 509 1.66666666666667e-01
+492 479 8.33333333333333e-02
+492 508 1.66666666666667e-01
+492 507 -7.50000000000000e-01
+492 487 -8.33333333333333e-02
+492 623 8.33333333333333e-02
+492 488 1.66666666666667e-01
+492 486 -2.50000000000000e-01
+492 622 -1.66666666666667e-01
+492 494 -3.33333333333333e-01
+492 104 -8.33333333333333e-02
+492 62 -8.33333333333333e-02
+492 571 8.33333333333333e-02
+492 556 -8.33333333333333e-02
+492 485 -8.33333333333333e-02
+492 482 8.33333333333333e-02
+492 572 -1.66666666666667e-01
+492 557 1.66666666666667e-01
+492 555 -2.50000000000000e-01
+492 484 1.66666666666667e-01
+492 481 -1.66666666666667e-01
+492 483 -2.50000000000000e-01
+492 221 -8.33333333333333e-02
+492 629 8.33333333333333e-02
+492 220 1.66666666666667e-01
+492 493 -3.33333333333333e-01
+492 490 1.66666666666667e-01
+492 628 8.33333333333333e-02
+492 103 -8.33333333333333e-02
+492 219 -2.50000000000000e-01
+492 491 1.66666666666667e-01
+492 209 -1.66666666666667e-01
+492 208 8.33333333333333e-02
+492 61 -8.33333333333333e-02
+492 489 -7.50000000000000e-01
+492 478 8.33333333333333e-02
+493 493 2.50000000000000e+00
+493 509 -8.33333333333333e-02
+493 479 -1.66666666666667e-01
+493 508 -2.50000000000000e-01
+493 507 1.66666666666667e-01
+493 486 -8.33333333333333e-02
+493 488 1.66666666666667e-01
+493 487 -2.50000000000000e-01
+493 623 8.33333333333333e-02
+493 621 -1.66666666666667e-01
+493 570 8.33333333333333e-02
+493 555 -8.33333333333333e-02
+493 485 1.66666666666667e-01
+493 494 -3.33333333333333e-01
+493 557 1.66666666666667e-01
+493 104 -8.33333333333333e-02
+493 572 8.33333333333333e-02
+493 556 -2.50000000000000e-01
+493 62 -8.33333333333333e-02
+493 482 8.33333333333333e-02
+493 484 -7.50000000000000e-01
+493 483 1.66666666666667e-01
+493 480 -1.66666666666667e-01
+493 209 8.33333333333333e-02
+493 491 -8.33333333333333e-02
+493 219 1.66666666666667e-01
+493 492 -3.33333333333333e-01
+493 489 1.66666666666667e-01
+493 629 -1.66666666666667e-01
+493 221 1.66666666666667e-01
+493 220 -7.50000000000000e-01
+493 627 8.33333333333333e-02
+493 102 -8.33333333333333e-02
+493 490 -2.50000000000000e-01
+493 477 8.33333333333333e-02
+493 207 8.33333333333333e-02
+493 60 -8.33333333333333e-02
+494 494 2.50000000000000e+00
+494 507 1.66666666666667e-01
+494 478 -1.66666666666667e-01
+494 477 8.33333333333333e-02
+494 509 -2.50000000000000e-01
+494 487 1.66666666666667e-01
+494 621 8.33333333333333e-02
+494 488 -7.50000000000000e-01
+494 486 1.66666666666667e-01
+494 622 8.33333333333333e-02
+494 492 -3.33333333333333e-01
+494 102 -8.33333333333333e-02
+494 60 -8.33333333333333e-02
+494 484 1.66666666666667e-01
+494 493 -3.33333333333333e-01
+494 556 1.66666666666667e-01
+494 483 -8.33333333333333e-02
+494 480 8.33333333333333e-02
+494 557 -7.50000000000000e-01
+494 103 -8.33333333333333e-02
+494 571 8.33333333333333e-02
+494 570 -1.66666666666667e-01
+494 555 1.66666666666667e-01
+494 485 -2.50000000000000e-01
+494 61 -8.33333333333333e-02
+494 481 8.33333333333333e-02
+494 219 -8.33333333333333e-02
+494 627 8.33333333333333e-02
+494 208 8.33333333333333e-02
+494 490 -8.33333333333333e-02
+494 221 -2.50000000000000e-01
+494 628 -1.66666666666667e-01
+494 220 1.66666666666667e-01
+494 491 -2.50000000000000e-01
+494 508 -8.33333333333333e-02
+494 489 1.66666666666667e-01
+494 207 -1.66666666666667e-01
+495 495 2.50000000000000e+00
+495 509 -8.33333333333333e-02
+495 508 1.66666666666667e-01
+495 507 -2.50000000000000e-01
+495 572 8.33333333333333e-02
+495 478 8.33333333333333e-02
+495 479 -1.66666666666667e-01
+495 485 1.66666666666667e-01
+495 484 1.66666666666667e-01
+495 483 -7.50000000000000e-01
+495 496 -3.33333333333333e-01
+495 64 -8.33333333333333e-02
+495 76 -8.33333333333333e-02
+495 574 -8.33333333333333e-02
+495 568 8.33333333333333e-02
+495 575 -8.33333333333333e-02
+495 512 8.33333333333333e-02
+495 65 1.66666666666667e-01
+495 497 -3.33333333333333e-01
+495 503 1.66666666666667e-01
+495 511 -1.66666666666667e-01
+495 502 1.66666666666667e-01
+495 501 -7.50000000000000e-01
+495 77 1.66666666666667e-01
+495 569 -1.66666666666667e-01
+495 166 -8.33333333333333e-02
+495 460 8.33333333333333e-02
+495 461 8.33333333333333e-02
+495 167 -8.33333333333333e-02
+495 63 -2.50000000000000e-01
+495 467 -8.33333333333333e-02
+495 179 8.33333333333333e-02
+495 466 1.66666666666667e-01
+495 178 -1.66666666666667e-01
+495 465 -2.50000000000000e-01
+495 571 8.33333333333333e-02
+495 75 -2.50000000000000e-01
+496 496 2.50000000000000e+00
+496 509 1.66666666666667e-01
+496 508 -7.50000000000000e-01
+496 507 1.66666666666667e-01
+496 572 -1.66666666666667e-01
+496 477 8.33333333333333e-02
+496 479 8.33333333333333e-02
+496 485 -8.33333333333333e-02
+496 484 -2.50000000000000e-01
+496 483 1.66666666666667e-01
+496 495 -3.33333333333333e-01
+496 63 -8.33333333333333e-02
+496 75 -8.33333333333333e-02
+496 573 -8.33333333333333e-02
+496 567 8.33333333333333e-02
+496 512 8.33333333333333e-02
+496 503 -8.33333333333333e-02
+496 502 -2.50000000000000e-01
+496 510 -1.66666666666667e-01
+496 501 1.66666666666667e-01
+496 575 -8.33333333333333e-02
+496 569 8.33333333333333e-02
+496 165 -8.33333333333333e-02
+496 459 8.33333333333333e-02
+496 167 -8.33333333333333e-02
+496 179 8.33333333333333e-02
+496 461 -1.66666666666667e-01
+496 65 1.66666666666667e-01
+496 64 -2.50000000000000e-01
+496 467 1.66666666666667e-01
+496 497 -3.33333333333333e-01
+496 77 1.66666666666667e-01
+496 466 -7.50000000000000e-01
+496 570 8.33333333333333e-02
+496 76 -2.50000000000000e-01
+496 465 1.66666666666667e-01
+496 177 -1.66666666666667e-01
+497 497 2.50000000000000e+00
+497 508 1.66666666666667e-01
+497 507 -8.33333333333333e-02
+497 571 -1.66666666666667e-01
+497 570 8.33333333333333e-02
+497 478 8.33333333333333e-02
+497 477 -1.66666666666667e-01
+497 485 -2.50000000000000e-01
+497 484 -8.33333333333333e-02
+497 483 1.66666666666667e-01
+497 573 -8.33333333333333e-02
+497 510 8.33333333333333e-02
+497 503 -2.50000000000000e-01
+497 511 8.33333333333333e-02
+497 502 -8.33333333333333e-02
+497 63 1.66666666666667e-01
+497 495 -3.33333333333333e-01
+497 501 1.66666666666667e-01
+497 574 -8.33333333333333e-02
+497 568 8.33333333333333e-02
+497 75 1.66666666666667e-01
+497 567 -1.66666666666667e-01
+497 166 -8.33333333333333e-02
+497 178 8.33333333333333e-02
+497 65 -7.50000000000000e-01
+497 460 -1.66666666666667e-01
+497 64 1.66666666666667e-01
+497 459 8.33333333333333e-02
+497 165 -8.33333333333333e-02
+497 467 -2.50000000000000e-01
+497 509 -2.50000000000000e-01
+497 77 -7.50000000000000e-01
+497 466 1.66666666666667e-01
+497 496 -3.33333333333333e-01
+497 76 1.66666666666667e-01
+497 465 -8.33333333333333e-02
+497 177 8.33333333333333e-02
+498 498 1.25000000000000e+00
+498 461 4.16666666666667e-02
+498 460 -8.33333333333333e-02
+498 469 8.33333333333333e-02
+498 468 -1.25000000000000e-01
+498 65 8.33333333333333e-02
+498 500 -1.66666666666667e-01
+498 503 1.66666666666667e-01
+498 502 -8.33333333333333e-02
+498 501 -2.50000000000000e-01
+498 80 8.33333333333333e-02
+498 587 -1.66666666666667e-01
+498 586 8.33333333333333e-02
+498 511 8.33333333333333e-02
+498 589 -8.33333333333333e-02
+498 227 4.16666666666667e-02
+498 590 -8.33333333333333e-02
+498 79 8.33333333333333e-02
+498 226 -8.33333333333333e-02
+498 78 -3.75000000000000e-01
+498 224 -4.16666666666667e-02
+498 512 8.33333333333333e-02
+498 499 -1.66666666666667e-01
+498 223 8.33333333333333e-02
+498 64 8.33333333333333e-02
+498 470 -4.16666666666667e-02
+498 222 -1.25000000000000e-01
+498 63 -3.75000000000000e-01
+499 499 1.25000000000000e+00
+499 500 -1.66666666666667e-01
+499 65 -4.16666666666667e-02
+499 461 4.16666666666667e-02
+499 459 -8.33333333333333e-02
+499 80 -4.16666666666667e-02
+499 469 -3.75000000000000e-01
+499 468 8.33333333333333e-02
+499 587 8.33333333333333e-02
+499 503 1.66666666666667e-01
+499 502 -2.50000000000000e-01
+499 501 -8.33333333333333e-02
+499 585 8.33333333333333e-02
+499 510 8.33333333333333e-02
+499 588 -8.33333333333333e-02
+499 227 4.16666666666667e-02
+499 590 -8.33333333333333e-02
+499 79 -1.25000000000000e-01
+499 78 8.33333333333333e-02
+499 225 -8.33333333333333e-02
+499 224 8.33333333333333e-02
+499 512 -1.66666666666667e-01
+499 470 8.33333333333333e-02
+499 223 -3.75000000000000e-01
+499 64 -1.25000000000000e-01
+499 498 -1.66666666666667e-01
+499 222 8.33333333333333e-02
+499 63 8.33333333333333e-02
+500 500 1.25000000000000e+00
+500 499 -1.66666666666667e-01
+500 468 -4.16666666666667e-02
+500 459 4.16666666666667e-02
+500 64 -4.16666666666667e-02
+500 460 4.16666666666667e-02
+500 470 -1.25000000000000e-01
+500 79 -4.16666666666667e-02
+500 586 8.33333333333333e-02
+500 503 -7.50000000000000e-01
+500 502 1.66666666666667e-01
+500 63 8.33333333333333e-02
+500 498 -1.66666666666667e-01
+500 501 1.66666666666667e-01
+500 78 8.33333333333333e-02
+500 585 -1.66666666666667e-01
+500 226 4.16666666666667e-02
+500 589 -8.33333333333333e-02
+500 80 -1.25000000000000e-01
+500 225 4.16666666666667e-02
+500 588 -8.33333333333333e-02
+500 469 8.33333333333333e-02
+500 224 -1.25000000000000e-01
+500 65 -1.25000000000000e-01
+500 223 8.33333333333333e-02
+500 511 -1.66666666666667e-01
+500 222 -4.16666666666667e-02
+500 510 8.33333333333333e-02
+501 501 2.50000000000000e+00
+501 466 -1.66666666666667e-01
+501 461 -8.33333333333333e-02
+501 469 8.33333333333333e-02
+501 460 -8.33333333333333e-02
+501 470 8.33333333333333e-02
+501 476 -8.33333333333333e-02
+501 475 1.66666666666667e-01
+501 474 -2.50000000000000e-01
+501 590 8.33333333333333e-02
+501 589 -1.66666666666667e-01
+501 586 1.66666666666667e-01
+501 500 1.66666666666667e-01
+501 64 8.33333333333333e-02
+501 499 -8.33333333333333e-02
+501 498 -2.50000000000000e-01
+501 587 1.66666666666667e-01
+501 85 8.33333333333333e-02
+501 585 -7.50000000000000e-01
+501 503 -3.33333333333333e-01
+501 568 -8.33333333333333e-02
+501 512 -8.33333333333333e-02
+501 574 8.33333333333333e-02
+501 598 -8.33333333333333e-02
+501 575 8.33333333333333e-02
+501 599 -8.33333333333333e-02
+501 65 -1.66666666666667e-01
+501 497 1.66666666666667e-01
+501 511 1.66666666666667e-01
+501 496 1.66666666666667e-01
+501 502 -3.33333333333333e-01
+501 510 -2.50000000000000e-01
+501 495 -7.50000000000000e-01
+501 569 1.66666666666667e-01
+501 86 -1.66666666666667e-01
+501 467 8.33333333333333e-02
+501 567 -2.50000000000000e-01
+502 502 2.50000000000000e+00
+502 465 -1.66666666666667e-01
+502 468 8.33333333333333e-02
+502 459 -8.33333333333333e-02
+502 470 -1.66666666666667e-01
+502 476 1.66666666666667e-01
+502 461 -8.33333333333333e-02
+502 475 -7.50000000000000e-01
+502 474 1.66666666666667e-01
+502 590 8.33333333333333e-02
+502 587 -8.33333333333333e-02
+502 588 -1.66666666666667e-01
+502 585 1.66666666666667e-01
+502 500 1.66666666666667e-01
+502 503 -3.33333333333333e-01
+502 499 -2.50000000000000e-01
+502 63 8.33333333333333e-02
+502 498 -8.33333333333333e-02
+502 586 -2.50000000000000e-01
+502 84 8.33333333333333e-02
+502 567 -8.33333333333333e-02
+502 512 1.66666666666667e-01
+502 573 8.33333333333333e-02
+502 597 -8.33333333333333e-02
+502 575 -1.66666666666667e-01
+502 569 1.66666666666667e-01
+502 65 8.33333333333333e-02
+502 497 -8.33333333333333e-02
+502 511 -7.50000000000000e-01
+502 496 -2.50000000000000e-01
+502 510 1.66666666666667e-01
+502 495 1.66666666666667e-01
+502 501 -3.33333333333333e-01
+502 599 -8.33333333333333e-02
+502 86 8.33333333333333e-02
+502 467 8.33333333333333e-02
+502 568 -2.50000000000000e-01
+503 503 2.50000000000000e+00
+503 465 8.33333333333333e-02
+503 459 -8.33333333333333e-02
+503 469 -1.66666666666667e-01
+503 475 1.66666666666667e-01
+503 468 8.33333333333333e-02
+503 474 -8.33333333333333e-02
+503 460 -8.33333333333333e-02
+503 476 -2.50000000000000e-01
+503 589 8.33333333333333e-02
+503 586 -8.33333333333333e-02
+503 588 8.33333333333333e-02
+503 500 -7.50000000000000e-01
+503 499 1.66666666666667e-01
+503 502 -3.33333333333333e-01
+503 498 1.66666666666667e-01
+503 587 -2.50000000000000e-01
+503 585 1.66666666666667e-01
+503 501 -3.33333333333333e-01
+503 510 -8.33333333333333e-02
+503 511 1.66666666666667e-01
+503 574 -1.66666666666667e-01
+503 568 1.66666666666667e-01
+503 573 8.33333333333333e-02
+503 597 -8.33333333333333e-02
+503 512 -2.50000000000000e-01
+503 497 -2.50000000000000e-01
+503 64 8.33333333333333e-02
+503 496 -8.33333333333333e-02
+503 63 -1.66666666666667e-01
+503 495 1.66666666666667e-01
+503 466 8.33333333333333e-02
+503 569 -7.50000000000000e-01
+503 598 -8.33333333333333e-02
+503 85 8.33333333333333e-02
+503 567 1.66666666666667e-01
+503 84 -1.66666666666667e-01
+504 504 1.25000000000000e+00
+504 488 8.33333333333333e-02
+504 479 4.16666666666667e-02
+504 65 -4.16666666666667e-02
+504 478 -8.33333333333333e-02
+504 98 -4.16666666666667e-02
+504 487 8.33333333333333e-02
+504 486 -3.75000000000000e-01
+504 623 8.33333333333333e-02
+504 622 8.33333333333333e-02
+504 509 1.66666666666667e-01
+504 508 -8.33333333333333e-02
+504 507 -2.50000000000000e-01
+504 511 8.33333333333333e-02
+504 625 -8.33333333333333e-02
+504 230 4.16666666666667e-02
+504 626 -8.33333333333333e-02
+504 229 -8.33333333333333e-02
+504 97 8.33333333333333e-02
+504 96 -1.25000000000000e-01
+504 224 8.33333333333333e-02
+504 512 -1.66666666666667e-01
+504 223 8.33333333333333e-02
+504 505 -1.66666666666667e-01
+504 64 8.33333333333333e-02
+504 222 -3.75000000000000e-01
+504 506 -1.66666666666667e-01
+504 63 -1.25000000000000e-01
+505 505 1.25000000000000e+00
+505 479 4.16666666666667e-02
+505 477 -8.33333333333333e-02
+505 487 -1.25000000000000e-01
+505 486 8.33333333333333e-02
+505 98 8.33333333333333e-02
+505 623 -1.66666666666667e-01
+505 621 8.33333333333333e-02
+505 506 -1.66666666666667e-01
+505 65 8.33333333333333e-02
+505 509 1.66666666666667e-01
+505 508 -2.50000000000000e-01
+505 507 -8.33333333333333e-02
+505 510 8.33333333333333e-02
+505 624 -8.33333333333333e-02
+505 230 4.16666666666667e-02
+505 626 -8.33333333333333e-02
+505 97 -3.75000000000000e-01
+505 228 -8.33333333333333e-02
+505 96 8.33333333333333e-02
+505 224 -4.16666666666667e-02
+505 512 8.33333333333333e-02
+505 223 -1.25000000000000e-01
+505 488 -4.16666666666667e-02
+505 64 -3.75000000000000e-01
+505 222 8.33333333333333e-02
+505 504 -1.66666666666667e-01
+505 63 8.33333333333333e-02
+506 506 1.25000000000000e+00
+506 478 4.16666666666667e-02
+506 504 -1.66666666666667e-01
+506 486 8.33333333333333e-02
+506 477 4.16666666666667e-02
+506 63 -4.16666666666667e-02
+506 488 -1.25000000000000e-01
+506 96 -4.16666666666667e-02
+506 621 8.33333333333333e-02
+506 97 8.33333333333333e-02
+506 622 -1.66666666666667e-01
+506 509 -7.50000000000000e-01
+506 505 -1.66666666666667e-01
+506 64 8.33333333333333e-02
+506 508 1.66666666666667e-01
+506 507 1.66666666666667e-01
+506 228 4.16666666666667e-02
+506 624 -8.33333333333333e-02
+506 98 -1.25000000000000e-01
+506 229 4.16666666666667e-02
+506 625 -8.33333333333333e-02
+506 224 -1.25000000000000e-01
+506 487 -4.16666666666667e-02
+506 65 -1.25000000000000e-01
+506 223 -4.16666666666667e-02
+506 511 8.33333333333333e-02
+506 222 8.33333333333333e-02
+506 510 -1.66666666666667e-01
+507 507 2.50000000000000e+00
+507 484 -1.66666666666667e-01
+507 478 -8.33333333333333e-02
+507 487 8.33333333333333e-02
+507 494 1.66666666666667e-01
+507 488 -1.66666666666667e-01
+507 479 -8.33333333333333e-02
+507 493 1.66666666666667e-01
+507 492 -7.50000000000000e-01
+507 626 8.33333333333333e-02
+507 623 -8.33333333333333e-02
+507 622 1.66666666666667e-01
+507 625 -1.66666666666667e-01
+507 506 1.66666666666667e-01
+507 509 -3.33333333333333e-01
+507 505 -8.33333333333333e-02
+507 64 8.33333333333333e-02
+507 504 -2.50000000000000e-01
+507 103 8.33333333333333e-02
+507 621 -2.50000000000000e-01
+507 571 -8.33333333333333e-02
+507 512 1.66666666666667e-01
+507 574 8.33333333333333e-02
+507 634 -8.33333333333333e-02
+507 575 -1.66666666666667e-01
+507 572 1.66666666666667e-01
+507 65 8.33333333333333e-02
+507 497 -8.33333333333333e-02
+507 511 1.66666666666667e-01
+507 496 1.66666666666667e-01
+507 508 -3.33333333333333e-01
+507 510 -7.50000000000000e-01
+507 495 -2.50000000000000e-01
+507 635 -8.33333333333333e-02
+507 104 8.33333333333333e-02
+507 485 8.33333333333333e-02
+507 570 -2.50000000000000e-01
+508 508 2.50000000000000e+00
+508 483 -1.66666666666667e-01
+508 479 -8.33333333333333e-02
+508 477 -8.33333333333333e-02
+508 486 8.33333333333333e-02
+508 494 -8.33333333333333e-02
+508 488 8.33333333333333e-02
+508 493 -2.50000000000000e-01
+508 492 1.66666666666667e-01
+508 626 8.33333333333333e-02
+508 621 1.66666666666667e-01
+508 624 -1.66666666666667e-01
+508 506 1.66666666666667e-01
+508 505 -2.50000000000000e-01
+508 504 -8.33333333333333e-02
+508 63 8.33333333333333e-02
+508 623 1.66666666666667e-01
+508 622 -7.50000000000000e-01
+508 102 8.33333333333333e-02
+508 509 -3.33333333333333e-01
+508 570 -8.33333333333333e-02
+508 512 -8.33333333333333e-02
+508 573 8.33333333333333e-02
+508 633 -8.33333333333333e-02
+508 635 -8.33333333333333e-02
+508 575 8.33333333333333e-02
+508 65 -1.66666666666667e-01
+508 497 1.66666666666667e-01
+508 511 -2.50000000000000e-01
+508 496 -7.50000000000000e-01
+508 510 1.66666666666667e-01
+508 495 1.66666666666667e-01
+508 507 -3.33333333333333e-01
+508 572 1.66666666666667e-01
+508 104 -1.66666666666667e-01
+508 485 8.33333333333333e-02
+508 571 -2.50000000000000e-01
+509 509 2.50000000000000e+00
+509 484 8.33333333333333e-02
+509 478 -8.33333333333333e-02
+509 493 -8.33333333333333e-02
+509 487 8.33333333333333e-02
+509 492 1.66666666666667e-01
+509 486 -1.66666666666667e-01
+509 477 -8.33333333333333e-02
+509 494 -2.50000000000000e-01
+509 624 8.33333333333333e-02
+509 621 -8.33333333333333e-02
+509 625 8.33333333333333e-02
+509 506 -7.50000000000000e-01
+509 505 1.66666666666667e-01
+509 504 1.66666666666667e-01
+509 507 -3.33333333333333e-01
+509 623 -2.50000000000000e-01
+509 622 1.66666666666667e-01
+509 508 -3.33333333333333e-01
+509 511 -8.33333333333333e-02
+509 510 1.66666666666667e-01
+509 634 -8.33333333333333e-02
+509 574 8.33333333333333e-02
+509 573 -1.66666666666667e-01
+509 570 1.66666666666667e-01
+509 512 -2.50000000000000e-01
+509 497 -2.50000000000000e-01
+509 64 -1.66666666666667e-01
+509 496 1.66666666666667e-01
+509 63 8.33333333333333e-02
+509 495 -8.33333333333333e-02
+509 483 8.33333333333333e-02
+509 572 -7.50000000000000e-01
+509 571 1.66666666666667e-01
+509 103 -1.66666666666667e-01
+509 633 -8.33333333333333e-02
+509 102 8.33333333333333e-02
+510 510 2.50000000000000e+00
+510 634 8.33333333333333e-02
+510 635 8.33333333333333e-02
+510 508 1.66666666666667e-01
+510 507 -7.50000000000000e-01
+510 505 8.33333333333333e-02
+510 626 -8.33333333333333e-02
+510 506 -1.66666666666667e-01
+510 625 1.66666666666667e-01
+510 624 -2.50000000000000e-01
+510 511 -3.33333333333333e-01
+510 64 -8.33333333333333e-02
+510 106 -8.33333333333333e-02
+510 497 8.33333333333333e-02
+510 503 -8.33333333333333e-02
+510 574 -8.33333333333333e-02
+510 598 8.33333333333333e-02
+510 496 -1.66666666666667e-01
+510 502 1.66666666666667e-01
+510 501 -2.50000000000000e-01
+510 575 1.66666666666667e-01
+510 599 -1.66666666666667e-01
+510 573 -2.50000000000000e-01
+510 223 -8.33333333333333e-02
+510 499 8.33333333333333e-02
+510 224 1.66666666666667e-01
+510 512 -3.33333333333333e-01
+510 590 1.66666666666667e-01
+510 500 8.33333333333333e-02
+510 65 -8.33333333333333e-02
+510 222 -2.50000000000000e-01
+510 233 8.33333333333333e-02
+510 107 -8.33333333333333e-02
+510 589 1.66666666666667e-01
+510 232 -1.66666666666667e-01
+510 588 -7.50000000000000e-01
+510 509 1.66666666666667e-01
+511 511 2.50000000000000e+00
+511 633 8.33333333333333e-02
+511 635 -1.66666666666667e-01
+511 508 -2.50000000000000e-01
+511 507 1.66666666666667e-01
+511 504 8.33333333333333e-02
+511 626 1.66666666666667e-01
+511 506 8.33333333333333e-02
+511 625 -7.50000000000000e-01
+511 624 1.66666666666667e-01
+511 510 -3.33333333333333e-01
+511 63 -8.33333333333333e-02
+511 105 -8.33333333333333e-02
+511 575 1.66666666666667e-01
+511 512 -3.33333333333333e-01
+511 503 1.66666666666667e-01
+511 573 -8.33333333333333e-02
+511 597 8.33333333333333e-02
+511 65 -8.33333333333333e-02
+511 497 8.33333333333333e-02
+511 502 -7.50000000000000e-01
+511 495 -1.66666666666667e-01
+511 501 1.66666666666667e-01
+511 107 -8.33333333333333e-02
+511 599 8.33333333333333e-02
+511 574 -2.50000000000000e-01
+511 222 -8.33333333333333e-02
+511 498 8.33333333333333e-02
+511 233 8.33333333333333e-02
+511 590 -8.33333333333333e-02
+511 500 -1.66666666666667e-01
+511 224 1.66666666666667e-01
+511 223 -2.50000000000000e-01
+511 589 -2.50000000000000e-01
+511 509 -8.33333333333333e-02
+511 588 1.66666666666667e-01
+511 231 -1.66666666666667e-01
+512 512 2.50000000000000e+00
+512 507 1.66666666666667e-01
+512 634 -1.66666666666667e-01
+512 633 8.33333333333333e-02
+512 509 -2.50000000000000e-01
+512 625 1.66666666666667e-01
+512 624 -8.33333333333333e-02
+512 505 8.33333333333333e-02
+512 504 -1.66666666666667e-01
+512 626 -2.50000000000000e-01
+512 495 8.33333333333333e-02
+512 501 -8.33333333333333e-02
+512 574 1.66666666666667e-01
+512 511 -3.33333333333333e-01
+512 502 1.66666666666667e-01
+512 503 -2.50000000000000e-01
+512 64 -8.33333333333333e-02
+512 496 8.33333333333333e-02
+512 575 -7.50000000000000e-01
+512 106 -8.33333333333333e-02
+512 598 8.33333333333333e-02
+512 573 1.66666666666667e-01
+512 597 -1.66666666666667e-01
+512 232 8.33333333333333e-02
+512 589 -8.33333333333333e-02
+512 222 1.66666666666667e-01
+512 510 -3.33333333333333e-01
+512 588 1.66666666666667e-01
+512 224 -7.50000000000000e-01
+512 499 -1.66666666666667e-01
+512 223 1.66666666666667e-01
+512 498 8.33333333333333e-02
+512 63 -8.33333333333333e-02
+512 590 -2.50000000000000e-01
+512 508 -8.33333333333333e-02
+512 231 8.33333333333333e-02
+512 105 -8.33333333333333e-02
+513 513 1.25000000000000e+00
+513 545 -8.33333333333333e-02
+513 542 -8.33333333333333e-02
+513 541 4.16666666666667e-02
+513 544 -8.33333333333333e-02
+513 524 8.33333333333333e-02
+513 523 -4.16666666666667e-02
+513 529 8.33333333333333e-02
+513 522 -1.25000000000000e-01
+513 172 -4.16666666666667e-02
+513 169 4.16666666666667e-02
+513 533 8.33333333333333e-02
+513 521 -8.33333333333333e-02
+513 68 8.33333333333333e-02
+513 170 -8.33333333333333e-02
+513 67 8.33333333333333e-02
+513 514 -1.66666666666667e-01
+513 520 1.66666666666667e-01
+513 66 -3.75000000000000e-01
+513 519 -2.50000000000000e-01
+513 515 -1.66666666666667e-01
+513 71 8.33333333333333e-02
+513 173 8.33333333333333e-02
+513 70 8.33333333333333e-02
+513 532 -1.66666666666667e-01
+513 530 8.33333333333333e-02
+513 69 -3.75000000000000e-01
+513 171 -1.25000000000000e-01
+514 514 1.25000000000000e+00
+514 545 -8.33333333333333e-02
+514 540 4.16666666666667e-02
+514 543 -8.33333333333333e-02
+514 524 8.33333333333333e-02
+514 530 -1.66666666666667e-01
+514 523 -1.25000000000000e-01
+514 522 -4.16666666666667e-02
+514 528 8.33333333333333e-02
+514 171 -4.16666666666667e-02
+514 168 4.16666666666667e-02
+514 173 8.33333333333333e-02
+514 515 -1.66666666666667e-01
+514 521 1.66666666666667e-01
+514 68 -4.16666666666667e-02
+514 170 4.16666666666667e-02
+514 67 -1.25000000000000e-01
+514 520 -7.50000000000000e-01
+514 66 8.33333333333333e-02
+514 513 -1.66666666666667e-01
+514 519 1.66666666666667e-01
+514 71 -4.16666666666667e-02
+514 533 8.33333333333333e-02
+514 542 4.16666666666667e-02
+514 70 -1.25000000000000e-01
+514 172 -1.25000000000000e-01
+514 69 8.33333333333333e-02
+514 531 -1.66666666666667e-01
+515 515 1.25000000000000e+00
+515 544 -8.33333333333333e-02
+515 528 8.33333333333333e-02
+515 543 -8.33333333333333e-02
+515 540 -8.33333333333333e-02
+515 524 -3.75000000000000e-01
+515 523 8.33333333333333e-02
+515 529 -1.66666666666667e-01
+515 522 8.33333333333333e-02
+515 172 8.33333333333333e-02
+515 514 -1.66666666666667e-01
+515 520 1.66666666666667e-01
+515 531 8.33333333333333e-02
+515 519 -8.33333333333333e-02
+515 68 -1.25000000000000e-01
+515 521 -2.50000000000000e-01
+515 67 -4.16666666666667e-02
+515 169 4.16666666666667e-02
+515 66 8.33333333333333e-02
+515 168 -8.33333333333333e-02
+515 541 4.16666666666667e-02
+515 71 -1.25000000000000e-01
+515 173 -3.75000000000000e-01
+515 70 -4.16666666666667e-02
+515 532 8.33333333333333e-02
+515 513 -1.66666666666667e-01
+515 69 8.33333333333333e-02
+515 171 8.33333333333333e-02
+516 516 2.50000000000000e+00
+516 530 -1.66666666666667e-01
+516 529 8.33333333333333e-02
+516 562 -8.33333333333333e-02
+516 521 1.66666666666667e-01
+516 551 8.33333333333333e-02
+516 550 -1.66666666666667e-01
+516 520 1.66666666666667e-01
+516 519 -7.50000000000000e-01
+516 518 -3.33333333333333e-01
+516 527 1.66666666666667e-01
+516 526 -8.33333333333333e-02
+516 559 8.33333333333333e-02
+516 560 8.33333333333333e-02
+516 74 -8.33333333333333e-02
+516 68 -8.33333333333333e-02
+516 525 -2.50000000000000e-01
+516 410 8.33333333333333e-02
+516 67 1.66666666666667e-01
+516 409 -1.66666666666667e-01
+516 413 1.66666666666667e-01
+516 517 -3.33333333333333e-01
+516 73 1.66666666666667e-01
+516 412 1.66666666666667e-01
+516 411 -7.50000000000000e-01
+516 170 8.33333333333333e-02
+516 347 -8.33333333333333e-02
+516 169 8.33333333333333e-02
+516 346 -8.33333333333333e-02
+516 66 -2.50000000000000e-01
+516 176 1.66666666666667e-01
+516 350 -1.66666666666667e-01
+516 175 -8.33333333333333e-02
+516 349 8.33333333333333e-02
+516 174 -2.50000000000000e-01
+516 563 -8.33333333333333e-02
+516 72 -2.50000000000000e-01
+517 517 2.50000000000000e+00
+517 563 -8.33333333333333e-02
+517 528 8.33333333333333e-02
+517 561 -8.33333333333333e-02
+517 551 8.33333333333333e-02
+517 521 -8.33333333333333e-02
+517 549 -1.66666666666667e-01
+517 520 -2.50000000000000e-01
+517 519 1.66666666666667e-01
+517 525 -8.33333333333333e-02
+517 558 8.33333333333333e-02
+517 560 -1.66666666666667e-01
+517 527 1.66666666666667e-01
+517 526 -2.50000000000000e-01
+517 410 8.33333333333333e-02
+517 66 1.66666666666667e-01
+517 408 -1.66666666666667e-01
+517 413 -8.33333333333333e-02
+517 412 -2.50000000000000e-01
+517 516 -3.33333333333333e-01
+517 72 1.66666666666667e-01
+517 411 1.66666666666667e-01
+517 350 8.33333333333333e-02
+517 347 -8.33333333333333e-02
+517 170 -1.66666666666667e-01
+517 68 1.66666666666667e-01
+517 67 -7.50000000000000e-01
+517 168 8.33333333333333e-02
+517 345 -8.33333333333333e-02
+517 176 1.66666666666667e-01
+517 518 -3.33333333333333e-01
+517 74 1.66666666666667e-01
+517 175 -2.50000000000000e-01
+517 530 8.33333333333333e-02
+517 73 -7.50000000000000e-01
+517 174 -8.33333333333333e-02
+517 348 8.33333333333333e-02
+518 518 2.50000000000000e+00
+518 529 8.33333333333333e-02
+518 562 -8.33333333333333e-02
+518 528 -1.66666666666667e-01
+518 550 8.33333333333333e-02
+518 520 -8.33333333333333e-02
+518 519 1.66666666666667e-01
+518 549 8.33333333333333e-02
+518 521 -2.50000000000000e-01
+518 516 -3.33333333333333e-01
+518 525 1.66666666666667e-01
+518 559 -1.66666666666667e-01
+518 558 8.33333333333333e-02
+518 72 -8.33333333333333e-02
+518 527 -7.50000000000000e-01
+518 526 1.66666666666667e-01
+518 66 -8.33333333333333e-02
+518 408 8.33333333333333e-02
+518 409 8.33333333333333e-02
+518 413 -2.50000000000000e-01
+518 412 -8.33333333333333e-02
+518 411 1.66666666666667e-01
+518 349 8.33333333333333e-02
+518 346 -8.33333333333333e-02
+518 168 8.33333333333333e-02
+518 345 -8.33333333333333e-02
+518 68 -2.50000000000000e-01
+518 169 -1.66666666666667e-01
+518 67 1.66666666666667e-01
+518 176 -7.50000000000000e-01
+518 561 -8.33333333333333e-02
+518 74 -2.50000000000000e-01
+518 175 1.66666666666667e-01
+518 517 -3.33333333333333e-01
+518 73 1.66666666666667e-01
+518 174 1.66666666666667e-01
+518 348 -1.66666666666667e-01
+519 519 2.50000000000000e+00
+519 563 8.33333333333333e-02
+519 518 1.66666666666667e-01
+519 176 -1.66666666666667e-01
+519 175 8.33333333333333e-02
+519 517 1.66666666666667e-01
+519 516 -7.50000000000000e-01
+519 551 -8.33333333333333e-02
+519 550 1.66666666666667e-01
+519 549 -2.50000000000000e-01
+519 529 -8.33333333333333e-02
+519 577 -8.33333333333333e-02
+519 544 8.33333333333333e-02
+519 530 1.66666666666667e-01
+519 545 -1.66666666666667e-01
+519 77 8.33333333333333e-02
+519 578 -8.33333333333333e-02
+519 68 8.33333333333333e-02
+519 528 -2.50000000000000e-01
+519 170 -8.33333333333333e-02
+519 169 -8.33333333333333e-02
+519 173 8.33333333333333e-02
+519 515 -8.33333333333333e-02
+519 520 -3.33333333333333e-01
+519 172 8.33333333333333e-02
+519 178 -8.33333333333333e-02
+519 67 -1.66666666666667e-01
+519 514 1.66666666666667e-01
+519 513 -2.50000000000000e-01
+519 521 -3.33333333333333e-01
+519 533 1.66666666666667e-01
+519 179 1.66666666666667e-01
+519 532 1.66666666666667e-01
+519 76 -1.66666666666667e-01
+519 562 8.33333333333333e-02
+519 531 -7.50000000000000e-01
+519 177 -2.50000000000000e-01
+520 520 2.50000000000000e+00
+520 563 -1.66666666666667e-01
+520 518 -8.33333333333333e-02
+520 176 8.33333333333333e-02
+520 174 8.33333333333333e-02
+520 517 -2.50000000000000e-01
+520 516 1.66666666666667e-01
+520 551 1.66666666666667e-01
+520 550 -7.50000000000000e-01
+520 549 1.66666666666667e-01
+520 528 -8.33333333333333e-02
+520 576 -8.33333333333333e-02
+520 543 8.33333333333333e-02
+520 578 -8.33333333333333e-02
+520 545 8.33333333333333e-02
+520 521 -3.33333333333333e-01
+520 530 1.66666666666667e-01
+520 529 -2.50000000000000e-01
+520 168 -8.33333333333333e-02
+520 515 1.66666666666667e-01
+520 519 -3.33333333333333e-01
+520 173 -1.66666666666667e-01
+520 179 1.66666666666667e-01
+520 171 8.33333333333333e-02
+520 177 -8.33333333333333e-02
+520 68 8.33333333333333e-02
+520 170 -8.33333333333333e-02
+520 514 -7.50000000000000e-01
+520 66 -1.66666666666667e-01
+520 513 1.66666666666667e-01
+520 533 -8.33333333333333e-02
+520 77 8.33333333333333e-02
+520 561 8.33333333333333e-02
+520 532 -2.50000000000000e-01
+520 178 -2.50000000000000e-01
+520 531 1.66666666666667e-01
+520 75 -1.66666666666667e-01
+521 521 2.50000000000000e+00
+521 561 8.33333333333333e-02
+521 517 -8.33333333333333e-02
+521 175 8.33333333333333e-02
+521 516 1.66666666666667e-01
+521 174 -1.66666666666667e-01
+521 518 -2.50000000000000e-01
+521 551 -2.50000000000000e-01
+521 550 1.66666666666667e-01
+521 549 -8.33333333333333e-02
+521 577 -8.33333333333333e-02
+521 544 8.33333333333333e-02
+521 528 1.66666666666667e-01
+521 543 -1.66666666666667e-01
+521 75 8.33333333333333e-02
+521 576 -8.33333333333333e-02
+521 530 -7.50000000000000e-01
+521 520 -3.33333333333333e-01
+521 529 1.66666666666667e-01
+521 66 8.33333333333333e-02
+521 168 -8.33333333333333e-02
+521 514 1.66666666666667e-01
+521 171 8.33333333333333e-02
+521 513 -8.33333333333333e-02
+521 172 -1.66666666666667e-01
+521 178 1.66666666666667e-01
+521 515 -2.50000000000000e-01
+521 67 8.33333333333333e-02
+521 169 -8.33333333333333e-02
+521 562 -1.66666666666667e-01
+521 533 -2.50000000000000e-01
+521 179 -7.50000000000000e-01
+521 532 -8.33333333333333e-02
+521 76 8.33333333333333e-02
+521 519 -3.33333333333333e-01
+521 531 1.66666666666667e-01
+521 177 1.66666666666667e-01
+522 522 1.25000000000000e+00
+522 545 8.33333333333333e-02
+522 544 -1.66666666666667e-01
+522 515 8.33333333333333e-02
+522 514 -4.16666666666667e-02
+522 67 4.16666666666667e-02
+522 513 -1.25000000000000e-01
+522 542 8.33333333333333e-02
+522 118 4.16666666666667e-02
+522 540 -3.75000000000000e-01
+522 530 -8.33333333333333e-02
+522 524 -1.66666666666667e-01
+522 256 -4.16666666666667e-02
+522 659 -8.33333333333333e-02
+522 263 8.33333333333333e-02
+522 658 -8.33333333333333e-02
+522 262 8.33333333333333e-02
+522 257 8.33333333333333e-02
+522 119 -8.33333333333333e-02
+522 255 -1.25000000000000e-01
+522 251 8.33333333333333e-02
+522 68 -8.33333333333333e-02
+522 250 8.33333333333333e-02
+522 523 -1.66666666666667e-01
+522 529 1.66666666666667e-01
+522 249 -3.75000000000000e-01
+522 541 8.33333333333333e-02
+522 528 -2.50000000000000e-01
+523 523 1.25000000000000e+00
+523 540 8.33333333333333e-02
+523 545 8.33333333333333e-02
+523 543 -1.66666666666667e-01
+523 515 8.33333333333333e-02
+523 524 -1.66666666666667e-01
+523 514 -1.25000000000000e-01
+523 513 -4.16666666666667e-02
+523 66 4.16666666666667e-02
+523 541 -1.25000000000000e-01
+523 117 4.16666666666667e-02
+523 255 -4.16666666666667e-02
+523 257 8.33333333333333e-02
+523 530 1.66666666666667e-01
+523 263 -1.66666666666667e-01
+523 657 -8.33333333333333e-02
+523 261 8.33333333333333e-02
+523 119 4.16666666666667e-02
+523 659 -8.33333333333333e-02
+523 256 -1.25000000000000e-01
+523 251 -4.16666666666667e-02
+523 68 4.16666666666667e-02
+523 250 -1.25000000000000e-01
+523 542 -4.16666666666667e-02
+523 529 -7.50000000000000e-01
+523 249 8.33333333333333e-02
+523 522 -1.66666666666667e-01
+523 528 1.66666666666667e-01
+524 524 1.25000000000000e+00
+524 543 8.33333333333333e-02
+524 544 8.33333333333333e-02
+524 515 -3.75000000000000e-01
+524 514 8.33333333333333e-02
+524 523 -1.66666666666667e-01
+524 513 8.33333333333333e-02
+524 542 -1.25000000000000e-01
+524 540 8.33333333333333e-02
+524 528 -8.33333333333333e-02
+524 522 -1.66666666666667e-01
+524 256 8.33333333333333e-02
+524 657 -8.33333333333333e-02
+524 261 8.33333333333333e-02
+524 529 1.66666666666667e-01
+524 262 -1.66666666666667e-01
+524 257 -3.75000000000000e-01
+524 118 4.16666666666667e-02
+524 658 -8.33333333333333e-02
+524 255 8.33333333333333e-02
+524 117 -8.33333333333333e-02
+524 251 -1.25000000000000e-01
+524 541 -4.16666666666667e-02
+524 530 -2.50000000000000e-01
+524 250 -4.16666666666667e-02
+524 67 4.16666666666667e-02
+524 249 8.33333333333333e-02
+524 66 -8.33333333333333e-02
+525 525 2.50000000000000e+00
+525 562 -1.66666666666667e-01
+525 530 1.66666666666667e-01
+525 263 -1.66666666666667e-01
+525 664 -8.33333333333333e-02
+525 262 8.33333333333333e-02
+525 665 -8.33333333333333e-02
+525 529 1.66666666666667e-01
+525 528 -7.50000000000000e-01
+525 518 1.66666666666667e-01
+525 517 -8.33333333333333e-02
+525 413 -1.66666666666667e-01
+525 412 8.33333333333333e-02
+525 122 8.33333333333333e-02
+525 560 -8.33333333333333e-02
+525 559 1.66666666666667e-01
+525 526 -3.33333333333333e-01
+525 558 -2.50000000000000e-01
+525 68 8.33333333333333e-02
+525 516 -2.50000000000000e-01
+525 251 -8.33333333333333e-02
+525 250 1.66666666666667e-01
+525 410 -8.33333333333333e-02
+525 248 8.33333333333333e-02
+525 421 1.66666666666667e-01
+525 247 -1.66666666666667e-01
+525 67 8.33333333333333e-02
+525 409 -8.33333333333333e-02
+525 249 -2.50000000000000e-01
+525 527 -3.33333333333333e-01
+525 260 1.66666666666667e-01
+525 422 1.66666666666667e-01
+525 259 -8.33333333333333e-02
+525 121 8.33333333333333e-02
+525 563 8.33333333333333e-02
+525 258 -2.50000000000000e-01
+525 420 -7.50000000000000e-01
+526 526 2.50000000000000e+00
+526 561 -1.66666666666667e-01
+526 530 -8.33333333333333e-02
+526 665 -8.33333333333333e-02
+526 263 8.33333333333333e-02
+526 663 -8.33333333333333e-02
+526 261 8.33333333333333e-02
+526 529 -2.50000000000000e-01
+526 528 1.66666666666667e-01
+526 516 -8.33333333333333e-02
+526 413 8.33333333333333e-02
+526 411 8.33333333333333e-02
+526 560 1.66666666666667e-01
+526 559 -7.50000000000000e-01
+526 558 1.66666666666667e-01
+526 525 -3.33333333333333e-01
+526 518 1.66666666666667e-01
+526 517 -2.50000000000000e-01
+526 422 -8.33333333333333e-02
+526 527 -3.33333333333333e-01
+526 410 -8.33333333333333e-02
+526 248 8.33333333333333e-02
+526 249 1.66666666666667e-01
+526 420 1.66666666666667e-01
+526 246 -1.66666666666667e-01
+526 68 -1.66666666666667e-01
+526 251 1.66666666666667e-01
+526 250 -7.50000000000000e-01
+526 66 8.33333333333333e-02
+526 408 -8.33333333333333e-02
+526 260 1.66666666666667e-01
+526 122 -1.66666666666667e-01
+526 563 8.33333333333333e-02
+526 259 -2.50000000000000e-01
+526 421 -2.50000000000000e-01
+526 258 -8.33333333333333e-02
+526 120 8.33333333333333e-02
+527 527 2.50000000000000e+00
+527 561 8.33333333333333e-02
+527 529 -8.33333333333333e-02
+527 664 -8.33333333333333e-02
+527 262 8.33333333333333e-02
+527 528 1.66666666666667e-01
+527 261 -1.66666666666667e-01
+527 663 -8.33333333333333e-02
+527 530 -2.50000000000000e-01
+527 516 1.66666666666667e-01
+527 412 8.33333333333333e-02
+527 411 -1.66666666666667e-01
+527 560 -2.50000000000000e-01
+527 559 1.66666666666667e-01
+527 120 8.33333333333333e-02
+527 558 -8.33333333333333e-02
+527 518 -7.50000000000000e-01
+527 517 1.66666666666667e-01
+527 66 8.33333333333333e-02
+527 421 -8.33333333333333e-02
+527 526 -3.33333333333333e-01
+527 249 -8.33333333333333e-02
+527 409 -8.33333333333333e-02
+527 247 8.33333333333333e-02
+527 408 -8.33333333333333e-02
+527 246 8.33333333333333e-02
+527 251 -2.50000000000000e-01
+527 67 -1.66666666666667e-01
+527 250 1.66666666666667e-01
+527 562 8.33333333333333e-02
+527 260 -7.50000000000000e-01
+527 422 -2.50000000000000e-01
+527 259 1.66666666666667e-01
+527 121 -1.66666666666667e-01
+527 525 -3.33333333333333e-01
+527 258 1.66666666666667e-01
+527 420 1.66666666666667e-01
+528 528 2.50000000000000e+00
+528 562 1.66666666666667e-01
+528 518 -1.66666666666667e-01
+528 517 8.33333333333333e-02
+528 561 -2.50000000000000e-01
+528 527 1.66666666666667e-01
+528 664 8.33333333333333e-02
+528 526 1.66666666666667e-01
+528 525 -7.50000000000000e-01
+528 665 8.33333333333333e-02
+528 520 -8.33333333333333e-02
+528 521 1.66666666666667e-01
+528 530 -3.33333333333333e-01
+528 68 -8.33333333333333e-02
+528 519 -2.50000000000000e-01
+528 578 8.33333333333333e-02
+528 125 -8.33333333333333e-02
+528 577 -1.66666666666667e-01
+528 515 8.33333333333333e-02
+528 529 -3.33333333333333e-01
+528 544 1.66666666666667e-01
+528 514 8.33333333333333e-02
+528 67 -8.33333333333333e-02
+528 545 1.66666666666667e-01
+528 124 -8.33333333333333e-02
+528 543 -7.50000000000000e-01
+528 524 -8.33333333333333e-02
+528 251 8.33333333333333e-02
+528 658 8.33333333333333e-02
+528 262 -8.33333333333333e-02
+528 250 -1.66666666666667e-01
+528 523 1.66666666666667e-01
+528 522 -2.50000000000000e-01
+528 263 1.66666666666667e-01
+528 659 -1.66666666666667e-01
+528 261 -2.50000000000000e-01
+528 563 -8.33333333333333e-02
+529 529 2.50000000000000e+00
+529 561 1.66666666666667e-01
+529 516 8.33333333333333e-02
+529 563 1.66666666666667e-01
+529 562 -7.50000000000000e-01
+529 527 -8.33333333333333e-02
+529 663 8.33333333333333e-02
+529 526 -2.50000000000000e-01
+529 525 1.66666666666667e-01
+529 665 -1.66666666666667e-01
+529 519 -8.33333333333333e-02
+529 578 8.33333333333333e-02
+529 521 1.66666666666667e-01
+529 520 -2.50000000000000e-01
+529 576 -1.66666666666667e-01
+529 545 -8.33333333333333e-02
+529 528 -3.33333333333333e-01
+529 543 1.66666666666667e-01
+529 515 -1.66666666666667e-01
+529 513 8.33333333333333e-02
+529 66 -8.33333333333333e-02
+529 544 -2.50000000000000e-01
+529 123 -8.33333333333333e-02
+529 524 1.66666666666667e-01
+529 530 -3.33333333333333e-01
+529 263 1.66666666666667e-01
+529 657 8.33333333333333e-02
+529 261 -8.33333333333333e-02
+529 251 8.33333333333333e-02
+529 68 -8.33333333333333e-02
+529 523 -7.50000000000000e-01
+529 249 -1.66666666666667e-01
+529 522 1.66666666666667e-01
+529 659 8.33333333333333e-02
+529 125 -8.33333333333333e-02
+529 262 -2.50000000000000e-01
+529 518 8.33333333333333e-02
+530 530 2.50000000000000e+00
+530 561 -8.33333333333333e-02
+530 516 -1.66666666666667e-01
+530 563 -2.50000000000000e-01
+530 562 1.66666666666667e-01
+530 526 -8.33333333333333e-02
+530 525 1.66666666666667e-01
+530 527 -2.50000000000000e-01
+530 664 -1.66666666666667e-01
+530 663 8.33333333333333e-02
+530 577 8.33333333333333e-02
+530 519 1.66666666666667e-01
+530 528 -3.33333333333333e-01
+530 521 -7.50000000000000e-01
+530 520 1.66666666666667e-01
+530 66 -8.33333333333333e-02
+530 576 8.33333333333333e-02
+530 123 -8.33333333333333e-02
+530 513 8.33333333333333e-02
+530 544 -8.33333333333333e-02
+530 514 -1.66666666666667e-01
+530 545 -2.50000000000000e-01
+530 543 1.66666666666667e-01
+530 522 -8.33333333333333e-02
+530 249 8.33333333333333e-02
+530 523 1.66666666666667e-01
+530 529 -3.33333333333333e-01
+530 262 1.66666666666667e-01
+530 524 -2.50000000000000e-01
+530 250 8.33333333333333e-02
+530 67 -8.33333333333333e-02
+530 263 -7.50000000000000e-01
+530 517 8.33333333333333e-02
+530 658 8.33333333333333e-02
+530 124 -8.33333333333333e-02
+530 261 1.66666666666667e-01
+530 657 -1.66666666666667e-01
+531 531 2.50000000000000e+00
+531 569 8.33333333333333e-02
+531 568 -1.66666666666667e-01
+531 538 1.66666666666667e-01
+531 537 -7.50000000000000e-01
+531 464 8.33333333333333e-02
+531 463 8.33333333333333e-02
+531 467 1.66666666666667e-01
+531 466 -8.33333333333333e-02
+531 465 -2.50000000000000e-01
+531 533 -3.33333333333333e-01
+531 71 -8.33333333333333e-02
+531 77 -8.33333333333333e-02
+531 581 -8.33333333333333e-02
+531 578 8.33333333333333e-02
+531 548 -1.66666666666667e-01
+531 545 1.66666666666667e-01
+531 547 8.33333333333333e-02
+531 544 -8.33333333333333e-02
+531 543 -2.50000000000000e-01
+531 580 -8.33333333333333e-02
+531 577 8.33333333333333e-02
+531 173 -8.33333333333333e-02
+531 515 8.33333333333333e-02
+531 172 -8.33333333333333e-02
+531 178 8.33333333333333e-02
+531 514 -1.66666666666667e-01
+531 70 1.66666666666667e-01
+531 69 -2.50000000000000e-01
+531 521 1.66666666666667e-01
+531 179 -1.66666666666667e-01
+531 520 1.66666666666667e-01
+531 532 -3.33333333333333e-01
+531 76 1.66666666666667e-01
+531 519 -7.50000000000000e-01
+531 539 1.66666666666667e-01
+531 75 -2.50000000000000e-01
+532 532 2.50000000000000e+00
+532 539 -8.33333333333333e-02
+532 567 -1.66666666666667e-01
+532 538 -2.50000000000000e-01
+532 537 1.66666666666667e-01
+532 464 -1.66666666666667e-01
+532 462 8.33333333333333e-02
+532 467 1.66666666666667e-01
+532 466 -2.50000000000000e-01
+532 465 -8.33333333333333e-02
+532 581 -8.33333333333333e-02
+532 548 8.33333333333333e-02
+532 71 1.66666666666667e-01
+532 533 -3.33333333333333e-01
+532 545 1.66666666666667e-01
+532 544 -2.50000000000000e-01
+532 546 8.33333333333333e-02
+532 543 -8.33333333333333e-02
+532 77 1.66666666666667e-01
+532 578 -1.66666666666667e-01
+532 579 -8.33333333333333e-02
+532 576 8.33333333333333e-02
+532 171 -8.33333333333333e-02
+532 177 8.33333333333333e-02
+532 515 8.33333333333333e-02
+532 173 -8.33333333333333e-02
+532 70 -7.50000000000000e-01
+532 513 -1.66666666666667e-01
+532 69 1.66666666666667e-01
+532 521 -8.33333333333333e-02
+532 179 8.33333333333333e-02
+532 520 -2.50000000000000e-01
+532 569 8.33333333333333e-02
+532 76 -7.50000000000000e-01
+532 519 1.66666666666667e-01
+532 531 -3.33333333333333e-01
+532 75 1.66666666666667e-01
+533 533 2.50000000000000e+00
+533 538 -8.33333333333333e-02
+533 537 1.66666666666667e-01
+533 567 8.33333333333333e-02
+533 539 -2.50000000000000e-01
+533 462 8.33333333333333e-02
+533 463 -1.66666666666667e-01
+533 467 -7.50000000000000e-01
+533 466 1.66666666666667e-01
+533 465 1.66666666666667e-01
+533 531 -3.33333333333333e-01
+533 69 -8.33333333333333e-02
+533 75 -8.33333333333333e-02
+533 579 -8.33333333333333e-02
+533 576 8.33333333333333e-02
+533 580 -8.33333333333333e-02
+533 547 8.33333333333333e-02
+533 545 -7.50000000000000e-01
+533 70 1.66666666666667e-01
+533 532 -3.33333333333333e-01
+533 544 1.66666666666667e-01
+533 546 -1.66666666666667e-01
+533 543 1.66666666666667e-01
+533 76 1.66666666666667e-01
+533 577 -1.66666666666667e-01
+533 171 -8.33333333333333e-02
+533 513 8.33333333333333e-02
+533 71 -2.50000000000000e-01
+533 514 8.33333333333333e-02
+533 172 -8.33333333333333e-02
+533 521 -2.50000000000000e-01
+533 568 8.33333333333333e-02
+533 77 -2.50000000000000e-01
+533 520 -8.33333333333333e-02
+533 178 8.33333333333333e-02
+533 519 1.66666666666667e-01
+533 177 -1.66666666666667e-01
+534 534 1.25000000000000e+00
+534 539 -8.33333333333333e-02
+534 472 -4.16666666666667e-02
+534 463 4.16666666666667e-02
+534 473 8.33333333333333e-02
+534 82 8.33333333333333e-02
+534 592 -1.66666666666667e-01
+534 471 -1.25000000000000e-01
+534 464 -8.33333333333333e-02
+534 535 -1.66666666666667e-01
+534 538 1.66666666666667e-01
+534 70 8.33333333333333e-02
+534 537 -2.50000000000000e-01
+534 596 -8.33333333333333e-02
+534 548 8.33333333333333e-02
+534 83 8.33333333333333e-02
+534 269 -8.33333333333333e-02
+534 268 4.16666666666667e-02
+534 595 -8.33333333333333e-02
+534 81 -3.75000000000000e-01
+534 536 -1.66666666666667e-01
+534 266 8.33333333333333e-02
+534 71 8.33333333333333e-02
+534 265 -4.16666666666667e-02
+534 547 8.33333333333333e-02
+534 593 8.33333333333333e-02
+534 264 -1.25000000000000e-01
+534 69 -3.75000000000000e-01
+535 535 1.25000000000000e+00
+535 473 8.33333333333333e-02
+535 539 1.66666666666667e-01
+535 471 -4.16666666666667e-02
+535 462 4.16666666666667e-02
+535 83 -4.16666666666667e-02
+535 593 8.33333333333333e-02
+535 472 -1.25000000000000e-01
+535 81 8.33333333333333e-02
+535 591 -1.66666666666667e-01
+535 464 4.16666666666667e-02
+535 71 -4.16666666666667e-02
+535 538 -7.50000000000000e-01
+535 534 -1.66666666666667e-01
+535 537 1.66666666666667e-01
+535 69 8.33333333333333e-02
+535 269 4.16666666666667e-02
+535 596 -8.33333333333333e-02
+535 82 -1.25000000000000e-01
+535 267 4.16666666666667e-02
+535 594 -8.33333333333333e-02
+535 266 8.33333333333333e-02
+535 548 -1.66666666666667e-01
+535 536 -1.66666666666667e-01
+535 265 -1.25000000000000e-01
+535 70 -1.25000000000000e-01
+535 264 -4.16666666666667e-02
+535 546 8.33333333333333e-02
+536 536 1.25000000000000e+00
+536 537 -8.33333333333333e-02
+536 535 -1.66666666666667e-01
+536 472 8.33333333333333e-02
+536 538 1.66666666666667e-01
+536 473 -3.75000000000000e-01
+536 82 -4.16666666666667e-02
+536 592 8.33333333333333e-02
+536 471 8.33333333333333e-02
+536 539 -2.50000000000000e-01
+536 463 4.16666666666667e-02
+536 70 -4.16666666666667e-02
+536 462 -8.33333333333333e-02
+536 268 4.16666666666667e-02
+536 595 -8.33333333333333e-02
+536 594 -8.33333333333333e-02
+536 546 8.33333333333333e-02
+536 83 -1.25000000000000e-01
+536 81 8.33333333333333e-02
+536 267 -8.33333333333333e-02
+536 591 8.33333333333333e-02
+536 266 -3.75000000000000e-01
+536 71 -1.25000000000000e-01
+536 265 8.33333333333333e-02
+536 547 -1.66666666666667e-01
+536 534 -1.66666666666667e-01
+536 264 8.33333333333333e-02
+536 69 8.33333333333333e-02
+537 537 2.50000000000000e+00
+537 580 8.33333333333333e-02
+537 601 -8.33333333333333e-02
+537 548 1.66666666666667e-01
+537 596 -1.66666666666667e-01
+537 547 -8.33333333333333e-02
+537 595 8.33333333333333e-02
+537 602 -8.33333333333333e-02
+537 546 -2.50000000000000e-01
+537 473 8.33333333333333e-02
+537 536 -8.33333333333333e-02
+537 472 8.33333333333333e-02
+537 593 1.66666666666667e-01
+537 539 -3.33333333333333e-01
+537 592 1.66666666666667e-01
+537 591 -7.50000000000000e-01
+537 535 1.66666666666667e-01
+537 534 -2.50000000000000e-01
+537 538 -3.33333333333333e-01
+537 475 -8.33333333333333e-02
+537 476 1.66666666666667e-01
+537 467 -1.66666666666667e-01
+537 533 1.66666666666667e-01
+537 463 -8.33333333333333e-02
+537 466 8.33333333333333e-02
+537 86 8.33333333333333e-02
+537 569 -8.33333333333333e-02
+537 85 -1.66666666666667e-01
+537 568 1.66666666666667e-01
+537 474 -2.50000000000000e-01
+537 567 -2.50000000000000e-01
+537 464 -8.33333333333333e-02
+537 71 8.33333333333333e-02
+537 532 1.66666666666667e-01
+537 70 -1.66666666666667e-01
+537 581 8.33333333333333e-02
+537 531 -7.50000000000000e-01
+538 538 2.50000000000000e+00
+538 579 8.33333333333333e-02
+538 600 -8.33333333333333e-02
+538 602 -8.33333333333333e-02
+538 596 8.33333333333333e-02
+538 546 -8.33333333333333e-02
+538 594 8.33333333333333e-02
+538 548 1.66666666666667e-01
+538 547 -2.50000000000000e-01
+538 536 1.66666666666667e-01
+538 473 -1.66666666666667e-01
+538 471 8.33333333333333e-02
+538 593 -8.33333333333333e-02
+538 86 8.33333333333333e-02
+538 592 -2.50000000000000e-01
+538 591 1.66666666666667e-01
+538 71 8.33333333333333e-02
+538 535 -7.50000000000000e-01
+538 534 1.66666666666667e-01
+538 533 -8.33333333333333e-02
+538 537 -3.33333333333333e-01
+538 474 -8.33333333333333e-02
+538 467 8.33333333333333e-02
+538 464 -8.33333333333333e-02
+538 462 -8.33333333333333e-02
+538 465 8.33333333333333e-02
+538 476 1.66666666666667e-01
+538 569 1.66666666666667e-01
+538 539 -3.33333333333333e-01
+538 475 -2.50000000000000e-01
+538 568 -7.50000000000000e-01
+538 84 -1.66666666666667e-01
+538 567 1.66666666666667e-01
+538 581 -1.66666666666667e-01
+538 532 -2.50000000000000e-01
+538 531 1.66666666666667e-01
+538 69 -1.66666666666667e-01
+539 539 2.50000000000000e+00
+539 580 -1.66666666666667e-01
+539 601 -8.33333333333333e-02
+539 595 8.33333333333333e-02
+539 546 1.66666666666667e-01
+539 594 -1.66666666666667e-01
+539 600 -8.33333333333333e-02
+539 548 -7.50000000000000e-01
+539 547 1.66666666666667e-01
+539 471 8.33333333333333e-02
+539 534 -8.33333333333333e-02
+539 535 1.66666666666667e-01
+539 472 -1.66666666666667e-01
+539 593 -2.50000000000000e-01
+539 592 -8.33333333333333e-02
+539 85 8.33333333333333e-02
+539 591 1.66666666666667e-01
+539 537 -3.33333333333333e-01
+539 536 -2.50000000000000e-01
+539 70 8.33333333333333e-02
+539 532 -8.33333333333333e-02
+539 466 8.33333333333333e-02
+539 463 -8.33333333333333e-02
+539 474 1.66666666666667e-01
+539 465 -1.66666666666667e-01
+539 531 1.66666666666667e-01
+539 476 -7.50000000000000e-01
+539 569 -2.50000000000000e-01
+539 475 1.66666666666667e-01
+539 568 1.66666666666667e-01
+539 538 -3.33333333333333e-01
+539 84 8.33333333333333e-02
+539 567 -8.33333333333333e-02
+539 579 8.33333333333333e-02
+539 533 -2.50000000000000e-01
+539 462 -8.33333333333333e-02
+539 69 8.33333333333333e-02
+540 540 1.25000000000000e+00
+540 541 -1.66666666666667e-01
+540 515 -8.33333333333333e-02
+540 70 -4.16666666666667e-02
+540 514 4.16666666666667e-02
+540 524 8.33333333333333e-02
+540 118 -4.16666666666667e-02
+540 522 -3.75000000000000e-01
+540 658 8.33333333333333e-02
+540 545 -8.33333333333333e-02
+540 544 1.66666666666667e-01
+540 543 -2.50000000000000e-01
+540 659 8.33333333333333e-02
+540 548 8.33333333333333e-02
+540 662 -8.33333333333333e-02
+540 271 4.16666666666667e-02
+540 661 -8.33333333333333e-02
+540 119 8.33333333333333e-02
+540 272 -8.33333333333333e-02
+540 117 -1.25000000000000e-01
+540 542 -1.66666666666667e-01
+540 266 8.33333333333333e-02
+540 71 8.33333333333333e-02
+540 265 8.33333333333333e-02
+540 547 -1.66666666666667e-01
+540 523 8.33333333333333e-02
+540 264 -3.75000000000000e-01
+540 69 -1.25000000000000e-01
+541 541 1.25000000000000e+00
+541 515 4.16666666666667e-02
+541 522 8.33333333333333e-02
+541 540 -1.66666666666667e-01
+541 69 -4.16666666666667e-02
+541 513 4.16666666666667e-02
+541 523 -1.25000000000000e-01
+541 117 -4.16666666666667e-02
+541 657 8.33333333333333e-02
+541 71 8.33333333333333e-02
+541 542 -1.66666666666667e-01
+541 545 1.66666666666667e-01
+541 544 -7.50000000000000e-01
+541 543 1.66666666666667e-01
+541 119 8.33333333333333e-02
+541 659 -1.66666666666667e-01
+541 270 4.16666666666667e-02
+541 660 -8.33333333333333e-02
+541 272 4.16666666666667e-02
+541 662 -8.33333333333333e-02
+541 118 -1.25000000000000e-01
+541 266 -4.16666666666667e-02
+541 548 8.33333333333333e-02
+541 524 -4.16666666666667e-02
+541 265 -1.25000000000000e-01
+541 70 -1.25000000000000e-01
+541 264 8.33333333333333e-02
+541 546 -1.66666666666667e-01
+542 542 1.25000000000000e+00
+542 514 4.16666666666667e-02
+542 513 -8.33333333333333e-02
+542 524 -1.25000000000000e-01
+542 522 8.33333333333333e-02
+542 545 -2.50000000000000e-01
+542 70 8.33333333333333e-02
+542 541 -1.66666666666667e-01
+542 544 1.66666666666667e-01
+542 543 -8.33333333333333e-02
+542 118 8.33333333333333e-02
+542 658 -1.66666666666667e-01
+542 657 8.33333333333333e-02
+542 546 8.33333333333333e-02
+542 660 -8.33333333333333e-02
+542 119 -3.75000000000000e-01
+542 271 4.16666666666667e-02
+542 661 -8.33333333333333e-02
+542 117 8.33333333333333e-02
+542 270 -8.33333333333333e-02
+542 523 -4.16666666666667e-02
+542 266 -1.25000000000000e-01
+542 71 -3.75000000000000e-01
+542 265 -4.16666666666667e-02
+542 547 8.33333333333333e-02
+542 540 -1.66666666666667e-01
+542 264 8.33333333333333e-02
+542 69 8.33333333333333e-02
+543 543 2.50000000000000e+00
+543 521 -1.66666666666667e-01
+543 524 8.33333333333333e-02
+543 515 -8.33333333333333e-02
+543 523 -1.66666666666667e-01
+543 529 1.66666666666667e-01
+543 514 -8.33333333333333e-02
+543 530 1.66666666666667e-01
+543 528 -7.50000000000000e-01
+543 661 8.33333333333333e-02
+543 658 -8.33333333333333e-02
+543 662 -1.66666666666667e-01
+543 659 1.66666666666667e-01
+543 71 8.33333333333333e-02
+543 542 -8.33333333333333e-02
+543 541 1.66666666666667e-01
+543 544 -3.33333333333333e-01
+543 540 -2.50000000000000e-01
+543 125 8.33333333333333e-02
+543 657 -2.50000000000000e-01
+543 578 -8.33333333333333e-02
+543 581 8.33333333333333e-02
+543 671 -8.33333333333333e-02
+543 547 1.66666666666667e-01
+543 580 -1.66666666666667e-01
+543 577 1.66666666666667e-01
+543 548 1.66666666666667e-01
+543 533 1.66666666666667e-01
+543 545 -3.33333333333333e-01
+543 70 8.33333333333333e-02
+543 532 -8.33333333333333e-02
+543 546 -7.50000000000000e-01
+543 531 -2.50000000000000e-01
+543 670 -8.33333333333333e-02
+543 124 8.33333333333333e-02
+543 520 8.33333333333333e-02
+543 576 -2.50000000000000e-01
+544 544 2.50000000000000e+00
+544 521 8.33333333333333e-02
+544 515 -8.33333333333333e-02
+544 524 8.33333333333333e-02
+544 530 -8.33333333333333e-02
+544 522 -1.66666666666667e-01
+544 528 1.66666666666667e-01
+544 513 -8.33333333333333e-02
+544 529 -2.50000000000000e-01
+544 660 8.33333333333333e-02
+544 657 -8.33333333333333e-02
+544 662 8.33333333333333e-02
+544 542 1.66666666666667e-01
+544 541 -7.50000000000000e-01
+544 540 1.66666666666667e-01
+544 543 -3.33333333333333e-01
+544 659 1.66666666666667e-01
+544 658 -2.50000000000000e-01
+544 545 -3.33333333333333e-01
+544 548 -8.33333333333333e-02
+544 546 1.66666666666667e-01
+544 581 8.33333333333333e-02
+544 671 -8.33333333333333e-02
+544 579 -1.66666666666667e-01
+544 576 1.66666666666667e-01
+544 71 -1.66666666666667e-01
+544 533 1.66666666666667e-01
+544 547 -2.50000000000000e-01
+544 532 -2.50000000000000e-01
+544 69 8.33333333333333e-02
+544 531 -8.33333333333333e-02
+544 578 1.66666666666667e-01
+544 125 -1.66666666666667e-01
+544 519 8.33333333333333e-02
+544 577 -7.50000000000000e-01
+544 669 -8.33333333333333e-02
+544 123 8.33333333333333e-02
+545 545 2.50000000000000e+00
+545 519 -1.66666666666667e-01
+545 514 -8.33333333333333e-02
+545 522 8.33333333333333e-02
+545 513 -8.33333333333333e-02
+545 523 8.33333333333333e-02
+545 529 -8.33333333333333e-02
+545 530 -2.50000000000000e-01
+545 528 1.66666666666667e-01
+545 661 8.33333333333333e-02
+545 660 -1.66666666666667e-01
+545 657 1.66666666666667e-01
+545 542 -2.50000000000000e-01
+545 541 1.66666666666667e-01
+545 69 8.33333333333333e-02
+545 540 -8.33333333333333e-02
+545 659 -7.50000000000000e-01
+545 658 1.66666666666667e-01
+545 123 8.33333333333333e-02
+545 544 -3.33333333333333e-01
+545 576 -8.33333333333333e-02
+545 547 -8.33333333333333e-02
+545 579 8.33333333333333e-02
+545 669 -8.33333333333333e-02
+545 580 8.33333333333333e-02
+545 670 -8.33333333333333e-02
+545 548 -2.50000000000000e-01
+545 533 -7.50000000000000e-01
+545 70 -1.66666666666667e-01
+545 532 1.66666666666667e-01
+545 546 1.66666666666667e-01
+545 531 1.66666666666667e-01
+545 543 -3.33333333333333e-01
+545 520 8.33333333333333e-02
+545 578 -2.50000000000000e-01
+545 577 1.66666666666667e-01
+545 124 -1.66666666666667e-01
+546 546 2.50000000000000e+00
+546 538 -8.33333333333333e-02
+546 602 8.33333333333333e-02
+546 601 -1.66666666666667e-01
+546 537 -2.50000000000000e-01
+546 536 8.33333333333333e-02
+546 595 1.66666666666667e-01
+546 596 1.66666666666667e-01
+546 594 -7.50000000000000e-01
+546 535 8.33333333333333e-02
+546 548 -3.33333333333333e-01
+546 71 -8.33333333333333e-02
+546 128 -8.33333333333333e-02
+546 581 -8.33333333333333e-02
+546 671 8.33333333333333e-02
+546 580 1.66666666666667e-01
+546 547 -3.33333333333333e-01
+546 544 1.66666666666667e-01
+546 533 -1.66666666666667e-01
+546 545 1.66666666666667e-01
+546 70 -8.33333333333333e-02
+546 532 8.33333333333333e-02
+546 543 -7.50000000000000e-01
+546 127 -8.33333333333333e-02
+546 670 8.33333333333333e-02
+546 579 -2.50000000000000e-01
+546 266 -8.33333333333333e-02
+546 542 8.33333333333333e-02
+546 274 8.33333333333333e-02
+546 661 -8.33333333333333e-02
+546 541 -1.66666666666667e-01
+546 265 1.66666666666667e-01
+546 264 -2.50000000000000e-01
+546 662 1.66666666666667e-01
+546 275 -1.66666666666667e-01
+546 660 -2.50000000000000e-01
+546 539 1.66666666666667e-01
+547 547 2.50000000000000e+00
+547 537 -8.33333333333333e-02
+547 600 -1.66666666666667e-01
+547 539 1.66666666666667e-01
+547 538 -2.50000000000000e-01
+547 596 -8.33333333333333e-02
+547 594 1.66666666666667e-01
+547 595 -2.50000000000000e-01
+547 536 -1.66666666666667e-01
+547 534 8.33333333333333e-02
+547 533 8.33333333333333e-02
+547 545 -8.33333333333333e-02
+547 579 1.66666666666667e-01
+547 546 -3.33333333333333e-01
+547 543 1.66666666666667e-01
+547 544 -2.50000000000000e-01
+547 69 -8.33333333333333e-02
+547 531 8.33333333333333e-02
+547 581 1.66666666666667e-01
+547 671 -1.66666666666667e-01
+547 580 -7.50000000000000e-01
+547 126 -8.33333333333333e-02
+547 669 8.33333333333333e-02
+547 266 1.66666666666667e-01
+547 548 -3.33333333333333e-01
+547 662 1.66666666666667e-01
+547 273 8.33333333333333e-02
+547 660 -8.33333333333333e-02
+547 542 8.33333333333333e-02
+547 71 -8.33333333333333e-02
+547 265 -7.50000000000000e-01
+547 540 -1.66666666666667e-01
+547 264 1.66666666666667e-01
+547 275 8.33333333333333e-02
+547 128 -8.33333333333333e-02
+547 661 -2.50000000000000e-01
+547 602 8.33333333333333e-02
+548 548 2.50000000000000e+00
+548 537 1.66666666666667e-01
+548 600 8.33333333333333e-02
+548 539 -7.50000000000000e-01
+548 538 1.66666666666667e-01
+548 595 -8.33333333333333e-02
+548 534 8.33333333333333e-02
+548 596 -2.50000000000000e-01
+548 594 1.66666666666667e-01
+548 535 -1.66666666666667e-01
+548 546 -3.33333333333333e-01
+548 69 -8.33333333333333e-02
+548 126 -8.33333333333333e-02
+548 532 8.33333333333333e-02
+548 544 -8.33333333333333e-02
+548 579 -8.33333333333333e-02
+548 669 8.33333333333333e-02
+548 545 -2.50000000000000e-01
+548 531 -1.66666666666667e-01
+548 543 1.66666666666667e-01
+548 581 -2.50000000000000e-01
+548 580 1.66666666666667e-01
+548 670 -1.66666666666667e-01
+548 264 -8.33333333333333e-02
+548 540 8.33333333333333e-02
+548 265 1.66666666666667e-01
+548 547 -3.33333333333333e-01
+548 661 1.66666666666667e-01
+548 266 -2.50000000000000e-01
+548 541 8.33333333333333e-02
+548 70 -8.33333333333333e-02
+548 662 -7.50000000000000e-01
+548 601 8.33333333333333e-02
+548 274 8.33333333333333e-02
+548 127 -8.33333333333333e-02
+548 660 1.66666666666667e-01
+548 273 -1.66666666666667e-01
+549 549 2.50000000000000e+00
+549 557 -8.33333333333333e-02
+549 571 -1.66666666666667e-01
+549 556 1.66666666666667e-01
+549 555 -2.50000000000000e-01
+549 482 -1.66666666666667e-01
+549 481 8.33333333333333e-02
+549 485 1.66666666666667e-01
+549 484 -8.33333333333333e-02
+549 483 -2.50000000000000e-01
+549 584 -8.33333333333333e-02
+549 566 8.33333333333333e-02
+549 74 1.66666666666667e-01
+549 551 -3.33333333333333e-01
+549 563 1.66666666666667e-01
+549 565 8.33333333333333e-02
+549 562 -8.33333333333333e-02
+549 561 -2.50000000000000e-01
+549 77 1.66666666666667e-01
+549 578 -1.66666666666667e-01
+549 583 -8.33333333333333e-02
+549 577 8.33333333333333e-02
+549 175 -8.33333333333333e-02
+549 178 8.33333333333333e-02
+549 518 8.33333333333333e-02
+549 176 -8.33333333333333e-02
+549 73 1.66666666666667e-01
+549 517 -1.66666666666667e-01
+549 72 -7.50000000000000e-01
+549 521 -8.33333333333333e-02
+549 179 8.33333333333333e-02
+549 550 -3.33333333333333e-01
+549 520 1.66666666666667e-01
+549 76 1.66666666666667e-01
+549 572 8.33333333333333e-02
+549 519 -2.50000000000000e-01
+549 75 -7.50000000000000e-01
+550 550 2.50000000000000e+00
+550 572 8.33333333333333e-02
+550 570 -1.66666666666667e-01
+550 556 -7.50000000000000e-01
+550 555 1.66666666666667e-01
+550 482 8.33333333333333e-02
+550 480 8.33333333333333e-02
+550 485 1.66666666666667e-01
+550 484 -2.50000000000000e-01
+550 483 -8.33333333333333e-02
+550 551 -3.33333333333333e-01
+550 77 -8.33333333333333e-02
+550 74 -8.33333333333333e-02
+550 578 8.33333333333333e-02
+550 584 -8.33333333333333e-02
+550 566 -1.66666666666667e-01
+550 563 1.66666666666667e-01
+550 562 -2.50000000000000e-01
+550 564 8.33333333333333e-02
+550 561 -8.33333333333333e-02
+550 582 -8.33333333333333e-02
+550 576 8.33333333333333e-02
+550 518 8.33333333333333e-02
+550 176 -8.33333333333333e-02
+550 174 -8.33333333333333e-02
+550 177 8.33333333333333e-02
+550 73 -2.50000000000000e-01
+550 72 1.66666666666667e-01
+550 516 -1.66666666666667e-01
+550 521 1.66666666666667e-01
+550 179 -1.66666666666667e-01
+550 557 1.66666666666667e-01
+550 520 -7.50000000000000e-01
+550 76 -2.50000000000000e-01
+550 549 -3.33333333333333e-01
+550 519 1.66666666666667e-01
+550 75 1.66666666666667e-01
+551 551 2.50000000000000e+00
+551 555 -8.33333333333333e-02
+551 556 1.66666666666667e-01
+551 571 8.33333333333333e-02
+551 557 -2.50000000000000e-01
+551 481 8.33333333333333e-02
+551 480 -1.66666666666667e-01
+551 485 -7.50000000000000e-01
+551 484 1.66666666666667e-01
+551 483 1.66666666666667e-01
+551 550 -3.33333333333333e-01
+551 76 -8.33333333333333e-02
+551 73 -8.33333333333333e-02
+551 577 8.33333333333333e-02
+551 583 -8.33333333333333e-02
+551 582 -8.33333333333333e-02
+551 564 8.33333333333333e-02
+551 563 -7.50000000000000e-01
+551 565 -1.66666666666667e-01
+551 562 1.66666666666667e-01
+551 72 1.66666666666667e-01
+551 549 -3.33333333333333e-01
+551 561 1.66666666666667e-01
+551 75 1.66666666666667e-01
+551 576 -1.66666666666667e-01
+551 517 8.33333333333333e-02
+551 175 -8.33333333333333e-02
+551 74 -2.50000000000000e-01
+551 516 8.33333333333333e-02
+551 174 -8.33333333333333e-02
+551 570 8.33333333333333e-02
+551 521 -2.50000000000000e-01
+551 77 -2.50000000000000e-01
+551 520 1.66666666666667e-01
+551 178 -1.66666666666667e-01
+551 519 -8.33333333333333e-02
+551 177 8.33333333333333e-02
+552 552 2.50000000000000e+00
+552 629 8.33333333333333e-02
+552 628 -1.66666666666667e-01
+552 556 1.66666666666667e-01
+552 555 -7.50000000000000e-01
+552 632 -8.33333333333333e-02
+552 631 -8.33333333333333e-02
+552 566 -1.66666666666667e-01
+552 565 8.33333333333333e-02
+552 482 8.33333333333333e-02
+552 491 1.66666666666667e-01
+552 490 -8.33333333333333e-02
+552 489 -2.50000000000000e-01
+552 481 8.33333333333333e-02
+552 385 8.33333333333333e-02
+552 376 -8.33333333333333e-02
+552 377 -8.33333333333333e-02
+552 386 -1.66666666666667e-01
+552 449 1.66666666666667e-01
+552 554 -3.33333333333333e-01
+552 293 1.66666666666667e-01
+552 298 8.33333333333333e-02
+552 292 -8.33333333333333e-02
+552 74 -8.33333333333333e-02
+552 443 8.33333333333333e-02
+552 73 1.66666666666667e-01
+552 442 -1.66666666666667e-01
+552 72 -2.50000000000000e-01
+552 291 -2.50000000000000e-01
+552 101 -8.33333333333333e-02
+552 299 8.33333333333333e-02
+552 553 -3.33333333333333e-01
+552 100 1.66666666666667e-01
+552 448 1.66666666666667e-01
+552 557 1.66666666666667e-01
+552 99 -2.50000000000000e-01
+552 447 -7.50000000000000e-01
+553 553 2.50000000000000e+00
+553 557 -8.33333333333333e-02
+553 627 -1.66666666666667e-01
+553 556 -2.50000000000000e-01
+553 555 1.66666666666667e-01
+553 632 -8.33333333333333e-02
+553 566 8.33333333333333e-02
+553 630 -8.33333333333333e-02
+553 564 8.33333333333333e-02
+553 491 1.66666666666667e-01
+553 490 -2.50000000000000e-01
+553 489 -8.33333333333333e-02
+553 482 -1.66666666666667e-01
+553 480 8.33333333333333e-02
+553 384 8.33333333333333e-02
+553 375 -8.33333333333333e-02
+553 386 8.33333333333333e-02
+553 377 -8.33333333333333e-02
+553 449 -8.33333333333333e-02
+553 443 8.33333333333333e-02
+553 297 8.33333333333333e-02
+553 291 -8.33333333333333e-02
+553 74 1.66666666666667e-01
+553 554 -3.33333333333333e-01
+553 293 1.66666666666667e-01
+553 73 -7.50000000000000e-01
+553 292 -2.50000000000000e-01
+553 72 1.66666666666667e-01
+553 441 -1.66666666666667e-01
+553 101 1.66666666666667e-01
+553 299 -1.66666666666667e-01
+553 629 8.33333333333333e-02
+553 100 -7.50000000000000e-01
+553 448 -2.50000000000000e-01
+553 552 -3.33333333333333e-01
+553 99 1.66666666666667e-01
+553 447 1.66666666666667e-01
+554 554 2.50000000000000e+00
+554 556 -8.33333333333333e-02
+554 555 1.66666666666667e-01
+554 627 8.33333333333333e-02
+554 557 -2.50000000000000e-01
+554 630 -8.33333333333333e-02
+554 631 -8.33333333333333e-02
+554 565 8.33333333333333e-02
+554 564 -1.66666666666667e-01
+554 480 8.33333333333333e-02
+554 491 -7.50000000000000e-01
+554 490 1.66666666666667e-01
+554 489 1.66666666666667e-01
+554 481 -1.66666666666667e-01
+554 375 -8.33333333333333e-02
+554 385 8.33333333333333e-02
+554 384 -1.66666666666667e-01
+554 376 -8.33333333333333e-02
+554 448 -8.33333333333333e-02
+554 442 8.33333333333333e-02
+554 447 1.66666666666667e-01
+554 552 -3.33333333333333e-01
+554 291 1.66666666666667e-01
+554 74 -2.50000000000000e-01
+554 293 -7.50000000000000e-01
+554 73 1.66666666666667e-01
+554 553 -3.33333333333333e-01
+554 292 1.66666666666667e-01
+554 72 -8.33333333333333e-02
+554 441 8.33333333333333e-02
+554 628 8.33333333333333e-02
+554 101 -2.50000000000000e-01
+554 449 -2.50000000000000e-01
+554 100 1.66666666666667e-01
+554 298 -1.66666666666667e-01
+554 99 -8.33333333333333e-02
+554 297 8.33333333333333e-02
+555 555 2.50000000000000e+00
+555 583 8.33333333333333e-02
+555 637 -8.33333333333333e-02
+555 632 8.33333333333333e-02
+555 638 -8.33333333333333e-02
+555 631 8.33333333333333e-02
+555 565 -8.33333333333333e-02
+555 566 1.66666666666667e-01
+555 564 -2.50000000000000e-01
+555 491 -1.66666666666667e-01
+555 554 1.66666666666667e-01
+555 490 8.33333333333333e-02
+555 104 8.33333333333333e-02
+555 629 -8.33333333333333e-02
+555 628 1.66666666666667e-01
+555 627 -2.50000000000000e-01
+555 74 8.33333333333333e-02
+555 553 1.66666666666667e-01
+555 552 -7.50000000000000e-01
+555 551 -8.33333333333333e-02
+555 556 -3.33333333333333e-01
+555 493 -8.33333333333333e-02
+555 485 8.33333333333333e-02
+555 482 -8.33333333333333e-02
+555 484 8.33333333333333e-02
+555 481 -8.33333333333333e-02
+555 494 1.66666666666667e-01
+555 572 1.66666666666667e-01
+555 557 -3.33333333333333e-01
+555 103 -1.66666666666667e-01
+555 571 1.66666666666667e-01
+555 492 -2.50000000000000e-01
+555 570 -7.50000000000000e-01
+555 550 1.66666666666667e-01
+555 73 -1.66666666666667e-01
+555 584 -1.66666666666667e-01
+555 549 -2.50000000000000e-01
+556 556 2.50000000000000e+00
+556 582 8.33333333333333e-02
+556 636 -8.33333333333333e-02
+556 632 -1.66666666666667e-01
+556 566 1.66666666666667e-01
+556 630 8.33333333333333e-02
+556 564 -8.33333333333333e-02
+556 638 -8.33333333333333e-02
+556 565 -2.50000000000000e-01
+556 491 8.33333333333333e-02
+556 554 -8.33333333333333e-02
+556 489 8.33333333333333e-02
+556 629 1.66666666666667e-01
+556 557 -3.33333333333333e-01
+556 628 -7.50000000000000e-01
+556 627 1.66666666666667e-01
+556 553 -2.50000000000000e-01
+556 552 1.66666666666667e-01
+556 555 -3.33333333333333e-01
+556 492 -8.33333333333333e-02
+556 494 1.66666666666667e-01
+556 485 -1.66666666666667e-01
+556 551 1.66666666666667e-01
+556 483 8.33333333333333e-02
+556 480 -8.33333333333333e-02
+556 104 8.33333333333333e-02
+556 572 -8.33333333333333e-02
+556 493 -2.50000000000000e-01
+556 571 -2.50000000000000e-01
+556 102 -1.66666666666667e-01
+556 570 1.66666666666667e-01
+556 482 -8.33333333333333e-02
+556 74 8.33333333333333e-02
+556 584 8.33333333333333e-02
+556 550 -7.50000000000000e-01
+556 549 1.66666666666667e-01
+556 72 -1.66666666666667e-01
+557 557 2.50000000000000e+00
+557 582 -1.66666666666667e-01
+557 630 8.33333333333333e-02
+557 636 -8.33333333333333e-02
+557 631 -1.66666666666667e-01
+557 565 1.66666666666667e-01
+557 637 -8.33333333333333e-02
+557 566 -7.50000000000000e-01
+557 564 1.66666666666667e-01
+557 490 8.33333333333333e-02
+557 553 -8.33333333333333e-02
+557 489 -1.66666666666667e-01
+557 552 1.66666666666667e-01
+557 629 -2.50000000000000e-01
+557 628 1.66666666666667e-01
+557 556 -3.33333333333333e-01
+557 102 8.33333333333333e-02
+557 627 -8.33333333333333e-02
+557 554 -2.50000000000000e-01
+557 72 8.33333333333333e-02
+557 549 -8.33333333333333e-02
+557 493 1.66666666666667e-01
+557 483 8.33333333333333e-02
+557 480 -8.33333333333333e-02
+557 484 -1.66666666666667e-01
+557 550 1.66666666666667e-01
+557 494 -7.50000000000000e-01
+557 572 -2.50000000000000e-01
+557 103 8.33333333333333e-02
+557 571 -8.33333333333333e-02
+557 492 1.66666666666667e-01
+557 570 1.66666666666667e-01
+557 555 -3.33333333333333e-01
+557 583 8.33333333333333e-02
+557 551 -2.50000000000000e-01
+557 481 -8.33333333333333e-02
+557 73 8.33333333333333e-02
+558 558 2.50000000000000e+00
+558 665 -1.66666666666667e-01
+558 563 1.66666666666667e-01
+558 562 1.66666666666667e-01
+558 561 -7.50000000000000e-01
+558 667 -8.33333333333333e-02
+558 668 -8.33333333333333e-02
+558 566 8.33333333333333e-02
+558 565 -1.66666666666667e-01
+558 517 8.33333333333333e-02
+558 412 -8.33333333333333e-02
+558 527 -8.33333333333333e-02
+558 422 8.33333333333333e-02
+558 526 1.66666666666667e-01
+558 421 -1.66666666666667e-01
+558 525 -2.50000000000000e-01
+558 518 8.33333333333333e-02
+558 413 -8.33333333333333e-02
+558 305 8.33333333333333e-02
+558 293 -8.33333333333333e-02
+558 559 -3.33333333333333e-01
+558 292 1.66666666666667e-01
+558 454 1.66666666666667e-01
+558 74 1.66666666666667e-01
+558 443 -1.66666666666667e-01
+558 73 -8.33333333333333e-02
+558 442 8.33333333333333e-02
+558 72 -2.50000000000000e-01
+558 291 -2.50000000000000e-01
+558 560 -3.33333333333333e-01
+558 122 1.66666666666667e-01
+558 455 1.66666666666667e-01
+558 121 -8.33333333333333e-02
+558 304 8.33333333333333e-02
+558 664 8.33333333333333e-02
+558 120 -2.50000000000000e-01
+558 453 -7.50000000000000e-01
+559 559 2.50000000000000e+00
+559 665 8.33333333333333e-02
+559 563 -8.33333333333333e-02
+559 562 -2.50000000000000e-01
+559 561 1.66666666666667e-01
+559 566 8.33333333333333e-02
+559 668 -8.33333333333333e-02
+559 666 -8.33333333333333e-02
+559 564 -1.66666666666667e-01
+559 516 8.33333333333333e-02
+559 411 -8.33333333333333e-02
+559 422 8.33333333333333e-02
+559 413 -8.33333333333333e-02
+559 527 1.66666666666667e-01
+559 526 -7.50000000000000e-01
+559 525 1.66666666666667e-01
+559 420 -1.66666666666667e-01
+559 518 -1.66666666666667e-01
+559 443 8.33333333333333e-02
+559 455 -8.33333333333333e-02
+559 558 -3.33333333333333e-01
+559 291 1.66666666666667e-01
+559 453 1.66666666666667e-01
+559 74 1.66666666666667e-01
+559 560 -3.33333333333333e-01
+559 293 1.66666666666667e-01
+559 73 -2.50000000000000e-01
+559 292 -7.50000000000000e-01
+559 72 -8.33333333333333e-02
+559 441 8.33333333333333e-02
+559 122 1.66666666666667e-01
+559 305 -1.66666666666667e-01
+559 663 8.33333333333333e-02
+559 121 -2.50000000000000e-01
+559 454 -2.50000000000000e-01
+559 120 -8.33333333333333e-02
+559 303 8.33333333333333e-02
+560 560 2.50000000000000e+00
+560 663 -1.66666666666667e-01
+560 563 -2.50000000000000e-01
+560 562 -8.33333333333333e-02
+560 561 1.66666666666667e-01
+560 565 8.33333333333333e-02
+560 667 -8.33333333333333e-02
+560 666 -8.33333333333333e-02
+560 564 8.33333333333333e-02
+560 421 8.33333333333333e-02
+560 412 -8.33333333333333e-02
+560 527 -2.50000000000000e-01
+560 526 1.66666666666667e-01
+560 525 -8.33333333333333e-02
+560 420 8.33333333333333e-02
+560 517 -1.66666666666667e-01
+560 516 8.33333333333333e-02
+560 411 -8.33333333333333e-02
+560 303 8.33333333333333e-02
+560 291 -8.33333333333333e-02
+560 442 8.33333333333333e-02
+560 454 -8.33333333333333e-02
+560 74 -7.50000000000000e-01
+560 293 -2.50000000000000e-01
+560 73 1.66666666666667e-01
+560 559 -3.33333333333333e-01
+560 292 1.66666666666667e-01
+560 72 1.66666666666667e-01
+560 441 -1.66666666666667e-01
+560 664 8.33333333333333e-02
+560 122 -7.50000000000000e-01
+560 455 -2.50000000000000e-01
+560 121 1.66666666666667e-01
+560 304 -1.66666666666667e-01
+560 558 -3.33333333333333e-01
+560 120 1.66666666666667e-01
+560 453 1.66666666666667e-01
+561 561 2.50000000000000e+00
+561 521 8.33333333333333e-02
+561 518 -8.33333333333333e-02
+561 530 -8.33333333333333e-02
+561 527 8.33333333333333e-02
+561 529 1.66666666666667e-01
+561 526 -1.66666666666667e-01
+561 517 -8.33333333333333e-02
+561 528 -2.50000000000000e-01
+561 667 8.33333333333333e-02
+561 664 -8.33333333333333e-02
+561 668 8.33333333333333e-02
+561 560 1.66666666666667e-01
+561 559 1.66666666666667e-01
+561 562 -3.33333333333333e-01
+561 558 -7.50000000000000e-01
+561 665 1.66666666666667e-01
+561 663 -2.50000000000000e-01
+561 563 -3.33333333333333e-01
+561 566 -8.33333333333333e-02
+561 565 1.66666666666667e-01
+561 674 -8.33333333333333e-02
+561 584 8.33333333333333e-02
+561 583 -1.66666666666667e-01
+561 577 1.66666666666667e-01
+561 74 -1.66666666666667e-01
+561 551 1.66666666666667e-01
+561 73 8.33333333333333e-02
+561 550 -8.33333333333333e-02
+561 564 -2.50000000000000e-01
+561 549 -2.50000000000000e-01
+561 578 1.66666666666667e-01
+561 125 -1.66666666666667e-01
+561 673 -8.33333333333333e-02
+561 124 8.33333333333333e-02
+561 520 8.33333333333333e-02
+561 576 -7.50000000000000e-01
+562 562 2.50000000000000e+00
+562 521 -1.66666666666667e-01
+562 518 -8.33333333333333e-02
+562 527 8.33333333333333e-02
+562 528 1.66666666666667e-01
+562 525 -1.66666666666667e-01
+562 516 -8.33333333333333e-02
+562 530 1.66666666666667e-01
+562 529 -7.50000000000000e-01
+562 666 8.33333333333333e-02
+562 663 -8.33333333333333e-02
+562 665 1.66666666666667e-01
+562 668 -1.66666666666667e-01
+562 560 -8.33333333333333e-02
+562 74 8.33333333333333e-02
+562 559 -2.50000000000000e-01
+562 558 1.66666666666667e-01
+562 561 -3.33333333333333e-01
+562 125 8.33333333333333e-02
+562 664 -2.50000000000000e-01
+562 578 -8.33333333333333e-02
+562 584 8.33333333333333e-02
+562 674 -8.33333333333333e-02
+562 564 1.66666666666667e-01
+562 582 -1.66666666666667e-01
+562 576 1.66666666666667e-01
+562 566 1.66666666666667e-01
+562 551 1.66666666666667e-01
+562 563 -3.33333333333333e-01
+562 565 -7.50000000000000e-01
+562 550 -2.50000000000000e-01
+562 72 8.33333333333333e-02
+562 549 -8.33333333333333e-02
+562 519 8.33333333333333e-02
+562 577 -2.50000000000000e-01
+562 672 -8.33333333333333e-02
+562 123 8.33333333333333e-02
+563 563 2.50000000000000e+00
+563 519 8.33333333333333e-02
+563 516 -8.33333333333333e-02
+563 517 -8.33333333333333e-02
+563 526 8.33333333333333e-02
+563 528 -8.33333333333333e-02
+563 525 8.33333333333333e-02
+563 530 -2.50000000000000e-01
+563 529 1.66666666666667e-01
+563 664 1.66666666666667e-01
+563 667 -1.66666666666667e-01
+563 666 8.33333333333333e-02
+563 560 -2.50000000000000e-01
+563 559 -8.33333333333333e-02
+563 73 8.33333333333333e-02
+563 558 1.66666666666667e-01
+563 665 -7.50000000000000e-01
+563 124 8.33333333333333e-02
+563 663 1.66666666666667e-01
+563 577 -8.33333333333333e-02
+563 561 -3.33333333333333e-01
+563 564 -8.33333333333333e-02
+563 583 8.33333333333333e-02
+563 673 -8.33333333333333e-02
+563 672 -8.33333333333333e-02
+563 582 8.33333333333333e-02
+563 566 -2.50000000000000e-01
+563 551 -7.50000000000000e-01
+563 565 1.66666666666667e-01
+563 550 1.66666666666667e-01
+563 562 -3.33333333333333e-01
+563 72 -1.66666666666667e-01
+563 549 1.66666666666667e-01
+563 520 -1.66666666666667e-01
+563 578 -2.50000000000000e-01
+563 576 1.66666666666667e-01
+563 123 -1.66666666666667e-01
+564 564 2.50000000000000e+00
+564 556 -8.33333333333333e-02
+564 637 -1.66666666666667e-01
+564 557 1.66666666666667e-01
+564 555 -2.50000000000000e-01
+564 632 -8.33333333333333e-02
+564 631 1.66666666666667e-01
+564 630 -2.50000000000000e-01
+564 554 -1.66666666666667e-01
+564 553 8.33333333333333e-02
+564 551 8.33333333333333e-02
+564 563 -8.33333333333333e-02
+564 565 -3.33333333333333e-01
+564 583 1.66666666666667e-01
+564 562 1.66666666666667e-01
+564 584 1.66666666666667e-01
+564 674 -1.66666666666667e-01
+564 133 -8.33333333333333e-02
+564 673 8.33333333333333e-02
+564 582 -7.50000000000000e-01
+564 73 -8.33333333333333e-02
+564 550 8.33333333333333e-02
+564 561 -2.50000000000000e-01
+564 293 1.66666666666667e-01
+564 566 -3.33333333333333e-01
+564 668 1.66666666666667e-01
+564 310 8.33333333333333e-02
+564 667 -8.33333333333333e-02
+564 560 8.33333333333333e-02
+564 74 -8.33333333333333e-02
+564 292 1.66666666666667e-01
+564 559 -1.66666666666667e-01
+564 291 -7.50000000000000e-01
+564 311 8.33333333333333e-02
+564 134 -8.33333333333333e-02
+564 666 -2.50000000000000e-01
+564 638 8.33333333333333e-02
+565 565 2.50000000000000e+00
+565 555 -8.33333333333333e-02
+565 638 8.33333333333333e-02
+565 636 -1.66666666666667e-01
+565 556 -2.50000000000000e-01
+565 554 8.33333333333333e-02
+565 630 1.66666666666667e-01
+565 632 1.66666666666667e-01
+565 631 -7.50000000000000e-01
+565 552 8.33333333333333e-02
+565 566 -3.33333333333333e-01
+565 74 -8.33333333333333e-02
+565 134 -8.33333333333333e-02
+565 584 -8.33333333333333e-02
+565 674 8.33333333333333e-02
+565 564 -3.33333333333333e-01
+565 582 1.66666666666667e-01
+565 561 1.66666666666667e-01
+565 583 -2.50000000000000e-01
+565 132 -8.33333333333333e-02
+565 672 8.33333333333333e-02
+565 551 -1.66666666666667e-01
+565 563 1.66666666666667e-01
+565 562 -7.50000000000000e-01
+565 72 -8.33333333333333e-02
+565 549 8.33333333333333e-02
+565 293 -8.33333333333333e-02
+565 560 8.33333333333333e-02
+565 309 8.33333333333333e-02
+565 666 -8.33333333333333e-02
+565 292 -2.50000000000000e-01
+565 291 1.66666666666667e-01
+565 558 -1.66666666666667e-01
+565 311 -1.66666666666667e-01
+565 668 1.66666666666667e-01
+565 667 -2.50000000000000e-01
+565 557 1.66666666666667e-01
+566 566 2.50000000000000e+00
+566 556 1.66666666666667e-01
+566 637 8.33333333333333e-02
+566 557 -7.50000000000000e-01
+566 555 1.66666666666667e-01
+566 630 -8.33333333333333e-02
+566 553 8.33333333333333e-02
+566 632 -2.50000000000000e-01
+566 631 1.66666666666667e-01
+566 552 -1.66666666666667e-01
+566 565 -3.33333333333333e-01
+566 73 -8.33333333333333e-02
+566 133 -8.33333333333333e-02
+566 549 8.33333333333333e-02
+566 561 -8.33333333333333e-02
+566 583 -8.33333333333333e-02
+566 673 8.33333333333333e-02
+566 584 -2.50000000000000e-01
+566 582 1.66666666666667e-01
+566 672 -1.66666666666667e-01
+566 563 -2.50000000000000e-01
+566 550 -1.66666666666667e-01
+566 562 1.66666666666667e-01
+566 292 -8.33333333333333e-02
+566 559 8.33333333333333e-02
+566 291 1.66666666666667e-01
+566 564 -3.33333333333333e-01
+566 666 1.66666666666667e-01
+566 293 -2.50000000000000e-01
+566 558 8.33333333333333e-02
+566 72 -8.33333333333333e-02
+566 668 -7.50000000000000e-01
+566 636 8.33333333333333e-02
+566 310 -1.66666666666667e-01
+566 667 1.66666666666667e-01
+566 309 8.33333333333333e-02
+566 132 -8.33333333333333e-02
+567 567 2.50000000000000e+00
+567 502 -8.33333333333333e-02
+567 497 -1.66666666666667e-01
+567 503 1.66666666666667e-01
+567 501 -2.50000000000000e-01
+567 599 8.33333333333333e-02
+567 598 -1.66666666666667e-01
+567 575 -8.33333333333333e-02
+567 574 1.66666666666667e-01
+567 573 -2.50000000000000e-01
+567 466 -8.33333333333333e-02
+567 475 8.33333333333333e-02
+567 476 8.33333333333333e-02
+567 539 -8.33333333333333e-02
+567 85 1.66666666666667e-01
+567 568 -3.33333333333333e-01
+567 538 1.66666666666667e-01
+567 537 -2.50000000000000e-01
+567 467 -8.33333333333333e-02
+567 533 8.33333333333333e-02
+567 76 1.66666666666667e-01
+567 532 -1.66666666666667e-01
+567 317 -8.33333333333333e-02
+567 314 8.33333333333333e-02
+567 86 1.66666666666667e-01
+567 602 -1.66666666666667e-01
+567 601 8.33333333333333e-02
+567 316 -8.33333333333333e-02
+567 84 -7.50000000000000e-01
+567 569 -3.33333333333333e-01
+567 581 1.66666666666667e-01
+567 77 1.66666666666667e-01
+567 580 -8.33333333333333e-02
+567 313 8.33333333333333e-02
+567 496 8.33333333333333e-02
+567 579 -2.50000000000000e-01
+567 75 -7.50000000000000e-01
+568 568 2.50000000000000e+00
+568 501 -8.33333333333333e-02
+568 503 1.66666666666667e-01
+568 497 8.33333333333333e-02
+568 502 -2.50000000000000e-01
+568 599 8.33333333333333e-02
+568 597 -1.66666666666667e-01
+568 575 1.66666666666667e-01
+568 574 -7.50000000000000e-01
+568 573 1.66666666666667e-01
+568 569 -3.33333333333333e-01
+568 77 -8.33333333333333e-02
+568 86 -8.33333333333333e-02
+568 533 8.33333333333333e-02
+568 467 -8.33333333333333e-02
+568 465 -8.33333333333333e-02
+568 474 8.33333333333333e-02
+568 476 -1.66666666666667e-01
+568 539 1.66666666666667e-01
+568 538 -7.50000000000000e-01
+568 84 1.66666666666667e-01
+568 567 -3.33333333333333e-01
+568 537 1.66666666666667e-01
+568 75 1.66666666666667e-01
+568 531 -1.66666666666667e-01
+568 602 8.33333333333333e-02
+568 317 -8.33333333333333e-02
+568 85 -2.50000000000000e-01
+568 600 8.33333333333333e-02
+568 315 -8.33333333333333e-02
+568 581 1.66666666666667e-01
+568 314 -1.66666666666667e-01
+568 495 8.33333333333333e-02
+568 580 -2.50000000000000e-01
+568 76 -2.50000000000000e-01
+568 579 -8.33333333333333e-02
+568 312 8.33333333333333e-02
+569 569 2.50000000000000e+00
+569 496 8.33333333333333e-02
+569 495 -1.66666666666667e-01
+569 503 -7.50000000000000e-01
+569 501 1.66666666666667e-01
+569 598 8.33333333333333e-02
+569 597 8.33333333333333e-02
+569 575 -2.50000000000000e-01
+569 574 1.66666666666667e-01
+569 573 -8.33333333333333e-02
+569 568 -3.33333333333333e-01
+569 76 -8.33333333333333e-02
+569 85 -8.33333333333333e-02
+569 532 8.33333333333333e-02
+569 466 -8.33333333333333e-02
+569 539 -2.50000000000000e-01
+569 475 -1.66666666666667e-01
+569 538 1.66666666666667e-01
+569 474 8.33333333333333e-02
+569 537 -8.33333333333333e-02
+569 465 -8.33333333333333e-02
+569 531 8.33333333333333e-02
+569 601 8.33333333333333e-02
+569 316 -8.33333333333333e-02
+569 315 -8.33333333333333e-02
+569 312 8.33333333333333e-02
+569 86 -2.50000000000000e-01
+569 84 1.66666666666667e-01
+569 600 -1.66666666666667e-01
+569 502 1.66666666666667e-01
+569 581 -7.50000000000000e-01
+569 77 -2.50000000000000e-01
+569 580 1.66666666666667e-01
+569 313 -1.66666666666667e-01
+569 567 -3.33333333333333e-01
+569 579 1.66666666666667e-01
+569 75 1.66666666666667e-01
+570 570 2.50000000000000e+00
+570 508 -8.33333333333333e-02
+570 509 1.66666666666667e-01
+570 497 8.33333333333333e-02
+570 507 -2.50000000000000e-01
+570 635 8.33333333333333e-02
+570 634 -1.66666666666667e-01
+570 575 1.66666666666667e-01
+570 574 1.66666666666667e-01
+570 573 -7.50000000000000e-01
+570 572 -3.33333333333333e-01
+570 104 -8.33333333333333e-02
+570 77 -8.33333333333333e-02
+570 485 -8.33333333333333e-02
+570 551 8.33333333333333e-02
+570 484 -8.33333333333333e-02
+570 493 8.33333333333333e-02
+570 494 -1.66666666666667e-01
+570 557 1.66666666666667e-01
+570 103 1.66666666666667e-01
+570 571 -3.33333333333333e-01
+570 556 1.66666666666667e-01
+570 555 -7.50000000000000e-01
+570 76 1.66666666666667e-01
+570 550 -1.66666666666667e-01
+570 320 -8.33333333333333e-02
+570 638 8.33333333333333e-02
+570 637 8.33333333333333e-02
+570 319 -8.33333333333333e-02
+570 102 -2.50000000000000e-01
+570 584 1.66666666666667e-01
+570 314 -1.66666666666667e-01
+570 583 -8.33333333333333e-02
+570 313 8.33333333333333e-02
+570 582 -2.50000000000000e-01
+570 496 8.33333333333333e-02
+570 75 -2.50000000000000e-01
+571 571 2.50000000000000e+00
+571 507 -8.33333333333333e-02
+571 497 -1.66666666666667e-01
+571 509 1.66666666666667e-01
+571 508 -2.50000000000000e-01
+571 635 8.33333333333333e-02
+571 633 -1.66666666666667e-01
+571 575 -8.33333333333333e-02
+571 574 -2.50000000000000e-01
+571 573 1.66666666666667e-01
+571 483 -8.33333333333333e-02
+571 492 8.33333333333333e-02
+571 494 8.33333333333333e-02
+571 557 -8.33333333333333e-02
+571 556 -2.50000000000000e-01
+571 102 1.66666666666667e-01
+571 570 -3.33333333333333e-01
+571 555 1.66666666666667e-01
+571 485 -8.33333333333333e-02
+571 551 8.33333333333333e-02
+571 75 1.66666666666667e-01
+571 549 -1.66666666666667e-01
+571 320 -8.33333333333333e-02
+571 314 8.33333333333333e-02
+571 638 -1.66666666666667e-01
+571 104 1.66666666666667e-01
+571 103 -7.50000000000000e-01
+571 636 8.33333333333333e-02
+571 318 -8.33333333333333e-02
+571 584 1.66666666666667e-01
+571 572 -3.33333333333333e-01
+571 77 1.66666666666667e-01
+571 583 -2.50000000000000e-01
+571 495 8.33333333333333e-02
+571 76 -7.50000000000000e-01
+571 582 -8.33333333333333e-02
+571 312 8.33333333333333e-02
+572 572 2.50000000000000e+00
+572 496 -1.66666666666667e-01
+572 495 8.33333333333333e-02
+572 509 -7.50000000000000e-01
+572 508 1.66666666666667e-01
+572 633 8.33333333333333e-02
+572 634 8.33333333333333e-02
+572 575 -2.50000000000000e-01
+572 574 -8.33333333333333e-02
+572 573 1.66666666666667e-01
+572 570 -3.33333333333333e-01
+572 102 -8.33333333333333e-02
+572 75 -8.33333333333333e-02
+572 483 -8.33333333333333e-02
+572 549 8.33333333333333e-02
+572 557 -2.50000000000000e-01
+572 493 8.33333333333333e-02
+572 556 -8.33333333333333e-02
+572 492 -1.66666666666667e-01
+572 555 1.66666666666667e-01
+572 484 -8.33333333333333e-02
+572 550 8.33333333333333e-02
+572 318 -8.33333333333333e-02
+572 636 8.33333333333333e-02
+572 319 -8.33333333333333e-02
+572 313 8.33333333333333e-02
+572 104 -2.50000000000000e-01
+572 637 -1.66666666666667e-01
+572 103 1.66666666666667e-01
+572 584 -7.50000000000000e-01
+572 507 1.66666666666667e-01
+572 77 -2.50000000000000e-01
+572 583 1.66666666666667e-01
+572 571 -3.33333333333333e-01
+572 76 1.66666666666667e-01
+572 582 1.66666666666667e-01
+572 312 -1.66666666666667e-01
+573 573 2.50000000000000e+00
+573 509 -1.66666666666667e-01
+573 635 -8.33333333333333e-02
+573 319 8.33333333333333e-02
+573 320 8.33333333333333e-02
+573 634 1.66666666666667e-01
+573 633 -2.50000000000000e-01
+573 572 1.66666666666667e-01
+573 571 1.66666666666667e-01
+573 570 -7.50000000000000e-01
+573 496 -8.33333333333333e-02
+573 497 -8.33333333333333e-02
+573 511 -8.33333333333333e-02
+573 502 8.33333333333333e-02
+573 503 8.33333333333333e-02
+573 512 1.66666666666667e-01
+573 575 -3.33333333333333e-01
+573 510 -2.50000000000000e-01
+573 313 -8.33333333333333e-02
+573 574 -3.33333333333333e-01
+573 599 1.66666666666667e-01
+573 322 -8.33333333333333e-02
+573 316 8.33333333333333e-02
+573 314 1.66666666666667e-01
+573 317 -1.66666666666667e-01
+573 107 8.33333333333333e-02
+573 323 -8.33333333333333e-02
+573 598 1.66666666666667e-01
+573 106 -1.66666666666667e-01
+573 597 -7.50000000000000e-01
+573 569 -8.33333333333333e-02
+573 77 8.33333333333333e-02
+573 568 1.66666666666667e-01
+573 76 -1.66666666666667e-01
+573 567 -2.50000000000000e-01
+573 508 8.33333333333333e-02
+573 312 -2.50000000000000e-01
+574 574 2.50000000000000e+00
+574 509 8.33333333333333e-02
+574 635 1.66666666666667e-01
+574 318 8.33333333333333e-02
+574 320 -1.66666666666667e-01
+574 634 -7.50000000000000e-01
+574 633 1.66666666666667e-01
+574 572 -8.33333333333333e-02
+574 571 -2.50000000000000e-01
+574 570 1.66666666666667e-01
+574 495 -8.33333333333333e-02
+574 512 1.66666666666667e-01
+574 510 -8.33333333333333e-02
+574 501 8.33333333333333e-02
+574 503 -1.66666666666667e-01
+574 107 8.33333333333333e-02
+574 511 -2.50000000000000e-01
+574 497 -8.33333333333333e-02
+574 77 8.33333333333333e-02
+574 312 -8.33333333333333e-02
+574 599 -8.33333333333333e-02
+574 573 -3.33333333333333e-01
+574 321 -8.33333333333333e-02
+574 315 8.33333333333333e-02
+574 323 -8.33333333333333e-02
+574 317 8.33333333333333e-02
+574 598 -2.50000000000000e-01
+574 597 1.66666666666667e-01
+574 105 -1.66666666666667e-01
+574 569 1.66666666666667e-01
+574 575 -3.33333333333333e-01
+574 314 1.66666666666667e-01
+574 568 -7.50000000000000e-01
+574 507 8.33333333333333e-02
+574 313 -2.50000000000000e-01
+574 567 1.66666666666667e-01
+574 75 -1.66666666666667e-01
+575 575 2.50000000000000e+00
+575 507 -1.66666666666667e-01
+575 633 -8.33333333333333e-02
+575 634 1.66666666666667e-01
+575 319 -1.66666666666667e-01
+575 318 8.33333333333333e-02
+575 635 -2.50000000000000e-01
+575 572 -2.50000000000000e-01
+575 571 -8.33333333333333e-02
+575 570 1.66666666666667e-01
+575 495 -8.33333333333333e-02
+575 511 1.66666666666667e-01
+575 502 -1.66666666666667e-01
+575 501 8.33333333333333e-02
+575 512 -7.50000000000000e-01
+575 106 8.33333333333333e-02
+575 510 1.66666666666667e-01
+575 573 -3.33333333333333e-01
+575 496 -8.33333333333333e-02
+575 76 8.33333333333333e-02
+575 598 -8.33333333333333e-02
+575 597 1.66666666666667e-01
+575 322 -8.33333333333333e-02
+575 316 8.33333333333333e-02
+575 312 1.66666666666667e-01
+575 315 -1.66666666666667e-01
+575 599 -2.50000000000000e-01
+575 105 8.33333333333333e-02
+575 321 -8.33333333333333e-02
+575 569 -2.50000000000000e-01
+575 508 8.33333333333333e-02
+575 314 -7.50000000000000e-01
+575 568 1.66666666666667e-01
+575 574 -3.33333333333333e-01
+575 313 1.66666666666667e-01
+575 567 -8.33333333333333e-02
+575 75 8.33333333333333e-02
+576 576 2.50000000000000e+00
+576 551 -1.66666666666667e-01
+576 550 8.33333333333333e-02
+576 563 1.66666666666667e-01
+576 561 -7.50000000000000e-01
+576 673 8.33333333333333e-02
+576 674 8.33333333333333e-02
+576 584 -8.33333333333333e-02
+576 583 1.66666666666667e-01
+576 582 -2.50000000000000e-01
+576 520 -8.33333333333333e-02
+576 521 -8.33333333333333e-02
+576 530 8.33333333333333e-02
+576 529 -1.66666666666667e-01
+576 533 8.33333333333333e-02
+576 545 -8.33333333333333e-02
+576 577 -3.33333333333333e-01
+576 544 1.66666666666667e-01
+576 532 8.33333333333333e-02
+576 76 -8.33333333333333e-02
+576 124 -8.33333333333333e-02
+576 543 -2.50000000000000e-01
+576 314 8.33333333333333e-02
+576 326 -8.33333333333333e-02
+576 670 8.33333333333333e-02
+576 325 -8.33333333333333e-02
+576 125 1.66666666666667e-01
+576 671 -1.66666666666667e-01
+576 123 -2.50000000000000e-01
+576 578 -3.33333333333333e-01
+576 581 1.66666666666667e-01
+576 77 1.66666666666667e-01
+576 580 1.66666666666667e-01
+576 313 -1.66666666666667e-01
+576 562 1.66666666666667e-01
+576 579 -7.50000000000000e-01
+576 75 -2.50000000000000e-01
+577 577 2.50000000000000e+00
+577 563 -8.33333333333333e-02
+577 561 1.66666666666667e-01
+577 549 8.33333333333333e-02
+577 562 -2.50000000000000e-01
+577 672 8.33333333333333e-02
+577 674 -1.66666666666667e-01
+577 584 1.66666666666667e-01
+577 583 -7.50000000000000e-01
+577 582 1.66666666666667e-01
+577 519 -8.33333333333333e-02
+577 521 -8.33333333333333e-02
+577 530 8.33333333333333e-02
+577 528 -1.66666666666667e-01
+577 576 -3.33333333333333e-01
+577 543 1.66666666666667e-01
+577 533 -1.66666666666667e-01
+577 77 1.66666666666667e-01
+577 531 8.33333333333333e-02
+577 75 -8.33333333333333e-02
+577 545 1.66666666666667e-01
+577 578 -3.33333333333333e-01
+577 125 1.66666666666667e-01
+577 544 -7.50000000000000e-01
+577 123 -8.33333333333333e-02
+577 669 8.33333333333333e-02
+577 324 -8.33333333333333e-02
+577 671 8.33333333333333e-02
+577 326 -8.33333333333333e-02
+577 124 -2.50000000000000e-01
+577 581 -8.33333333333333e-02
+577 314 8.33333333333333e-02
+577 551 8.33333333333333e-02
+577 580 -2.50000000000000e-01
+577 76 -2.50000000000000e-01
+577 579 1.66666666666667e-01
+577 312 -1.66666666666667e-01
+578 578 2.50000000000000e+00
+578 562 -8.33333333333333e-02
+578 549 -1.66666666666667e-01
+578 563 -2.50000000000000e-01
+578 561 1.66666666666667e-01
+578 673 -1.66666666666667e-01
+578 672 8.33333333333333e-02
+578 584 -2.50000000000000e-01
+578 583 1.66666666666667e-01
+578 582 -8.33333333333333e-02
+578 520 -8.33333333333333e-02
+578 529 8.33333333333333e-02
+578 519 -8.33333333333333e-02
+578 528 8.33333333333333e-02
+578 531 8.33333333333333e-02
+578 543 -8.33333333333333e-02
+578 532 -1.66666666666667e-01
+578 76 1.66666666666667e-01
+578 545 -2.50000000000000e-01
+578 544 1.66666666666667e-01
+578 577 -3.33333333333333e-01
+578 124 1.66666666666667e-01
+578 312 8.33333333333333e-02
+578 324 -8.33333333333333e-02
+578 125 -7.50000000000000e-01
+578 670 8.33333333333333e-02
+578 325 -8.33333333333333e-02
+578 123 1.66666666666667e-01
+578 669 -1.66666666666667e-01
+578 550 8.33333333333333e-02
+578 581 -2.50000000000000e-01
+578 77 -7.50000000000000e-01
+578 580 -8.33333333333333e-02
+578 313 8.33333333333333e-02
+578 576 -3.33333333333333e-01
+578 579 1.66666666666667e-01
+578 75 1.66666666666667e-01
+579 579 2.50000000000000e+00
+579 538 8.33333333333333e-02
+579 601 1.66666666666667e-01
+579 317 8.33333333333333e-02
+579 316 -1.66666666666667e-01
+579 602 1.66666666666667e-01
+579 600 -7.50000000000000e-01
+579 569 1.66666666666667e-01
+579 568 -8.33333333333333e-02
+579 567 -2.50000000000000e-01
+579 533 -8.33333333333333e-02
+579 548 -8.33333333333333e-02
+579 545 8.33333333333333e-02
+579 547 1.66666666666667e-01
+579 544 -1.66666666666667e-01
+579 127 8.33333333333333e-02
+579 546 -2.50000000000000e-01
+579 532 -8.33333333333333e-02
+579 76 8.33333333333333e-02
+579 314 -8.33333333333333e-02
+579 581 -3.33333333333333e-01
+579 670 -8.33333333333333e-02
+579 329 -8.33333333333333e-02
+579 326 8.33333333333333e-02
+579 328 -8.33333333333333e-02
+579 325 8.33333333333333e-02
+579 671 1.66666666666667e-01
+579 128 -1.66666666666667e-01
+579 669 -2.50000000000000e-01
+579 578 1.66666666666667e-01
+579 77 -1.66666666666667e-01
+579 577 1.66666666666667e-01
+579 580 -3.33333333333333e-01
+579 313 1.66666666666667e-01
+579 576 -7.50000000000000e-01
+579 539 8.33333333333333e-02
+579 312 -2.50000000000000e-01
+580 580 2.50000000000000e+00
+580 537 8.33333333333333e-02
+580 602 -8.33333333333333e-02
+580 317 8.33333333333333e-02
+580 600 1.66666666666667e-01
+580 315 -1.66666666666667e-01
+580 601 -2.50000000000000e-01
+580 569 1.66666666666667e-01
+580 568 -2.50000000000000e-01
+580 567 -8.33333333333333e-02
+580 533 -8.33333333333333e-02
+580 546 1.66666666666667e-01
+580 545 8.33333333333333e-02
+580 543 -1.66666666666667e-01
+580 548 1.66666666666667e-01
+580 581 -3.33333333333333e-01
+580 547 -7.50000000000000e-01
+580 126 8.33333333333333e-02
+580 531 -8.33333333333333e-02
+580 75 8.33333333333333e-02
+580 669 -8.33333333333333e-02
+580 671 1.66666666666667e-01
+580 314 1.66666666666667e-01
+580 326 -1.66666666666667e-01
+580 327 -8.33333333333333e-02
+580 324 8.33333333333333e-02
+580 128 8.33333333333333e-02
+580 329 -8.33333333333333e-02
+580 670 -2.50000000000000e-01
+580 578 -8.33333333333333e-02
+580 77 8.33333333333333e-02
+580 577 -2.50000000000000e-01
+580 539 -1.66666666666667e-01
+580 313 -7.50000000000000e-01
+580 576 1.66666666666667e-01
+580 579 -3.33333333333333e-01
+580 312 1.66666666666667e-01
+581 581 2.50000000000000e+00
+581 538 -1.66666666666667e-01
+581 601 -8.33333333333333e-02
+581 316 8.33333333333333e-02
+581 315 8.33333333333333e-02
+581 602 -2.50000000000000e-01
+581 600 1.66666666666667e-01
+581 569 -7.50000000000000e-01
+581 568 1.66666666666667e-01
+581 567 1.66666666666667e-01
+581 531 -8.33333333333333e-02
+581 532 -8.33333333333333e-02
+581 546 -8.33333333333333e-02
+581 543 8.33333333333333e-02
+581 544 8.33333333333333e-02
+581 548 -2.50000000000000e-01
+581 547 1.66666666666667e-01
+581 580 -3.33333333333333e-01
+581 312 -8.33333333333333e-02
+581 579 -3.33333333333333e-01
+581 670 1.66666666666667e-01
+581 327 -8.33333333333333e-02
+581 324 8.33333333333333e-02
+581 313 1.66666666666667e-01
+581 325 -1.66666666666667e-01
+581 671 -7.50000000000000e-01
+581 127 8.33333333333333e-02
+581 328 -8.33333333333333e-02
+581 669 1.66666666666667e-01
+581 126 -1.66666666666667e-01
+581 578 -2.50000000000000e-01
+581 537 8.33333333333333e-02
+581 314 -2.50000000000000e-01
+581 577 -8.33333333333333e-02
+581 76 8.33333333333333e-02
+581 576 1.66666666666667e-01
+581 75 -1.66666666666667e-01
+582 582 2.50000000000000e+00
+582 556 8.33333333333333e-02
+582 320 8.33333333333333e-02
+582 638 -8.33333333333333e-02
+582 637 1.66666666666667e-01
+582 319 -1.66666666666667e-01
+582 636 -2.50000000000000e-01
+582 572 1.66666666666667e-01
+582 571 -8.33333333333333e-02
+582 570 -2.50000000000000e-01
+582 551 -8.33333333333333e-02
+582 565 1.66666666666667e-01
+582 563 8.33333333333333e-02
+582 562 -1.66666666666667e-01
+582 566 1.66666666666667e-01
+582 584 -3.33333333333333e-01
+582 133 8.33333333333333e-02
+582 564 -7.50000000000000e-01
+582 550 -8.33333333333333e-02
+582 76 8.33333333333333e-02
+582 673 -8.33333333333333e-02
+582 674 1.66666666666667e-01
+582 314 1.66666666666667e-01
+582 326 -1.66666666666667e-01
+582 331 -8.33333333333333e-02
+582 325 8.33333333333333e-02
+582 134 8.33333333333333e-02
+582 332 -8.33333333333333e-02
+582 672 -2.50000000000000e-01
+582 578 -8.33333333333333e-02
+582 77 8.33333333333333e-02
+582 583 -3.33333333333333e-01
+582 577 1.66666666666667e-01
+582 313 1.66666666666667e-01
+582 557 -1.66666666666667e-01
+582 576 -2.50000000000000e-01
+582 312 -7.50000000000000e-01
+583 583 2.50000000000000e+00
+583 555 8.33333333333333e-02
+583 636 1.66666666666667e-01
+583 320 8.33333333333333e-02
+583 318 -1.66666666666667e-01
+583 638 1.66666666666667e-01
+583 637 -7.50000000000000e-01
+583 572 1.66666666666667e-01
+583 571 -2.50000000000000e-01
+583 570 -8.33333333333333e-02
+583 551 -8.33333333333333e-02
+583 566 -8.33333333333333e-02
+583 563 8.33333333333333e-02
+583 564 1.66666666666667e-01
+583 561 -1.66666666666667e-01
+583 565 -2.50000000000000e-01
+583 132 8.33333333333333e-02
+583 549 -8.33333333333333e-02
+583 75 8.33333333333333e-02
+583 314 -8.33333333333333e-02
+583 584 -3.33333333333333e-01
+583 672 -8.33333333333333e-02
+583 332 -8.33333333333333e-02
+583 326 8.33333333333333e-02
+583 330 -8.33333333333333e-02
+583 324 8.33333333333333e-02
+583 134 -1.66666666666667e-01
+583 674 1.66666666666667e-01
+583 673 -2.50000000000000e-01
+583 578 1.66666666666667e-01
+583 77 -1.66666666666667e-01
+583 557 8.33333333333333e-02
+583 577 -7.50000000000000e-01
+583 313 -2.50000000000000e-01
+583 582 -3.33333333333333e-01
+583 576 1.66666666666667e-01
+583 312 1.66666666666667e-01
+584 584 2.50000000000000e+00
+584 555 -1.66666666666667e-01
+584 318 8.33333333333333e-02
+584 636 -8.33333333333333e-02
+584 319 8.33333333333333e-02
+584 638 -2.50000000000000e-01
+584 637 1.66666666666667e-01
+584 572 -7.50000000000000e-01
+584 571 1.66666666666667e-01
+584 570 1.66666666666667e-01
+584 550 -8.33333333333333e-02
+584 549 -8.33333333333333e-02
+584 565 -8.33333333333333e-02
+584 562 8.33333333333333e-02
+584 561 8.33333333333333e-02
+584 566 -2.50000000000000e-01
+584 564 1.66666666666667e-01
+584 582 -3.33333333333333e-01
+584 313 -8.33333333333333e-02
+584 583 -3.33333333333333e-01
+584 331 -8.33333333333333e-02
+584 325 8.33333333333333e-02
+584 672 1.66666666666667e-01
+584 312 1.66666666666667e-01
+584 324 -1.66666666666667e-01
+584 674 -7.50000000000000e-01
+584 133 -1.66666666666667e-01
+584 673 1.66666666666667e-01
+584 132 8.33333333333333e-02
+584 330 -8.33333333333333e-02
+584 556 8.33333333333333e-02
+584 578 -2.50000000000000e-01
+584 314 -2.50000000000000e-01
+584 577 1.66666666666667e-01
+584 76 -1.66666666666667e-01
+584 576 -8.33333333333333e-02
+584 75 8.33333333333333e-02
+585 585 2.50000000000000e+00
+585 590 -8.33333333333333e-02
+585 589 1.66666666666667e-01
+585 588 -2.50000000000000e-01
+585 599 8.33333333333333e-02
+585 185 8.33333333333333e-02
+585 191 -8.33333333333333e-02
+585 586 -3.33333333333333e-01
+585 190 1.66666666666667e-01
+585 86 1.66666666666667e-01
+585 85 -8.33333333333333e-02
+585 84 -2.50000000000000e-01
+585 189 -2.50000000000000e-01
+585 587 -3.33333333333333e-01
+585 80 1.66666666666667e-01
+585 79 -8.33333333333333e-02
+585 184 8.33333333333333e-02
+585 598 8.33333333333333e-02
+585 78 -2.50000000000000e-01
+585 502 1.66666666666667e-01
+585 500 -1.66666666666667e-01
+585 499 8.33333333333333e-02
+585 503 1.66666666666667e-01
+585 501 -7.50000000000000e-01
+585 469 -8.33333333333333e-02
+585 470 -8.33333333333333e-02
+585 476 8.33333333333333e-02
+585 475 -1.66666666666667e-01
+585 980 8.33333333333333e-02
+585 1034 -8.33333333333333e-02
+585 1033 -8.33333333333333e-02
+585 979 -1.66666666666667e-01
+585 973 1.66666666666667e-01
+585 1031 -1.66666666666667e-01
+585 1030 8.33333333333333e-02
+585 974 1.66666666666667e-01
+585 972 -7.50000000000000e-01
+586 586 2.50000000000000e+00
+586 590 1.66666666666667e-01
+586 589 -7.50000000000000e-01
+586 588 1.66666666666667e-01
+586 599 -1.66666666666667e-01
+586 585 -3.33333333333333e-01
+586 189 1.66666666666667e-01
+586 86 1.66666666666667e-01
+586 587 -3.33333333333333e-01
+586 191 1.66666666666667e-01
+586 85 -2.50000000000000e-01
+586 190 -7.50000000000000e-01
+586 84 -8.33333333333333e-02
+586 80 1.66666666666667e-01
+586 185 -1.66666666666667e-01
+586 597 8.33333333333333e-02
+586 79 -2.50000000000000e-01
+586 78 -8.33333333333333e-02
+586 183 8.33333333333333e-02
+586 503 -8.33333333333333e-02
+586 501 1.66666666666667e-01
+586 498 8.33333333333333e-02
+586 502 -2.50000000000000e-01
+586 468 -8.33333333333333e-02
+586 470 -8.33333333333333e-02
+586 476 8.33333333333333e-02
+586 500 8.33333333333333e-02
+586 474 -1.66666666666667e-01
+586 1032 -8.33333333333333e-02
+586 980 8.33333333333333e-02
+586 978 -1.66666666666667e-01
+586 1034 -8.33333333333333e-02
+586 974 -8.33333333333333e-02
+586 1031 8.33333333333333e-02
+586 972 1.66666666666667e-01
+586 1029 8.33333333333333e-02
+586 973 -2.50000000000000e-01
+587 587 2.50000000000000e+00
+587 589 1.66666666666667e-01
+587 588 -8.33333333333333e-02
+587 598 -1.66666666666667e-01
+587 597 8.33333333333333e-02
+587 183 8.33333333333333e-02
+587 189 -8.33333333333333e-02
+587 86 -7.50000000000000e-01
+587 191 -2.50000000000000e-01
+587 85 1.66666666666667e-01
+587 586 -3.33333333333333e-01
+587 190 1.66666666666667e-01
+587 84 1.66666666666667e-01
+587 590 -2.50000000000000e-01
+587 80 -7.50000000000000e-01
+587 79 1.66666666666667e-01
+587 184 -1.66666666666667e-01
+587 585 -3.33333333333333e-01
+587 78 1.66666666666667e-01
+587 502 -8.33333333333333e-02
+587 498 -1.66666666666667e-01
+587 503 -2.50000000000000e-01
+587 501 1.66666666666667e-01
+587 469 -8.33333333333333e-02
+587 475 8.33333333333333e-02
+587 468 -8.33333333333333e-02
+587 499 8.33333333333333e-02
+587 474 8.33333333333333e-02
+587 978 8.33333333333333e-02
+587 1032 -8.33333333333333e-02
+587 979 8.33333333333333e-02
+587 1033 -8.33333333333333e-02
+587 973 -8.33333333333333e-02
+587 1030 8.33333333333333e-02
+587 1029 -1.66666666666667e-01
+587 974 -2.50000000000000e-01
+587 972 1.66666666666667e-01
+588 588 2.50000000000000e+00
+588 598 -8.33333333333333e-02
+588 107 8.33333333333333e-02
+588 597 -2.50000000000000e-01
+588 80 8.33333333333333e-02
+588 587 -8.33333333333333e-02
+588 589 -3.33333333333333e-01
+588 586 1.66666666666667e-01
+588 585 -2.50000000000000e-01
+588 233 -8.33333333333333e-02
+588 232 1.66666666666667e-01
+588 106 8.33333333333333e-02
+588 231 -2.50000000000000e-01
+588 590 -3.33333333333333e-01
+588 227 1.66666666666667e-01
+588 226 -8.33333333333333e-02
+588 79 8.33333333333333e-02
+588 599 1.66666666666667e-01
+588 225 -2.50000000000000e-01
+588 503 8.33333333333333e-02
+588 502 -1.66666666666667e-01
+588 499 -8.33333333333333e-02
+588 223 8.33333333333333e-02
+588 224 -1.66666666666667e-01
+588 512 1.66666666666667e-01
+588 500 -8.33333333333333e-02
+588 511 1.66666666666667e-01
+588 510 -7.50000000000000e-01
+588 1034 -1.66666666666667e-01
+588 1033 8.33333333333333e-02
+588 1211 -8.33333333333333e-02
+588 836 8.33333333333333e-02
+588 835 -1.66666666666667e-01
+588 979 1.66666666666667e-01
+588 1210 -8.33333333333333e-02
+588 980 1.66666666666667e-01
+588 978 -7.50000000000000e-01
+589 589 2.50000000000000e+00
+589 597 -8.33333333333333e-02
+589 599 1.66666666666667e-01
+589 598 -2.50000000000000e-01
+589 587 1.66666666666667e-01
+589 586 -7.50000000000000e-01
+589 588 -3.33333333333333e-01
+589 585 1.66666666666667e-01
+589 590 -3.33333333333333e-01
+589 231 1.66666666666667e-01
+589 107 -1.66666666666667e-01
+589 233 1.66666666666667e-01
+589 232 -7.50000000000000e-01
+589 105 8.33333333333333e-02
+589 227 1.66666666666667e-01
+589 80 -1.66666666666667e-01
+589 226 -2.50000000000000e-01
+589 225 -8.33333333333333e-02
+589 78 8.33333333333333e-02
+589 501 -1.66666666666667e-01
+589 498 -8.33333333333333e-02
+589 500 -8.33333333333333e-02
+589 222 8.33333333333333e-02
+589 224 8.33333333333333e-02
+589 512 -8.33333333333333e-02
+589 503 8.33333333333333e-02
+589 511 -2.50000000000000e-01
+589 510 1.66666666666667e-01
+589 1032 8.33333333333333e-02
+589 1211 -8.33333333333333e-02
+589 836 8.33333333333333e-02
+589 980 -8.33333333333333e-02
+589 834 -1.66666666666667e-01
+589 978 1.66666666666667e-01
+589 1209 -8.33333333333333e-02
+589 1034 8.33333333333333e-02
+589 979 -2.50000000000000e-01
+590 590 2.50000000000000e+00
+590 597 1.66666666666667e-01
+590 599 -7.50000000000000e-01
+590 598 1.66666666666667e-01
+590 105 8.33333333333333e-02
+590 587 -2.50000000000000e-01
+590 586 1.66666666666667e-01
+590 78 8.33333333333333e-02
+590 585 -8.33333333333333e-02
+590 589 -3.33333333333333e-01
+590 231 -8.33333333333333e-02
+590 233 -2.50000000000000e-01
+590 106 -1.66666666666667e-01
+590 232 1.66666666666667e-01
+590 227 -7.50000000000000e-01
+590 226 1.66666666666667e-01
+590 79 -1.66666666666667e-01
+590 588 -3.33333333333333e-01
+590 225 1.66666666666667e-01
+590 501 8.33333333333333e-02
+590 499 -8.33333333333333e-02
+590 223 8.33333333333333e-02
+590 511 -8.33333333333333e-02
+590 222 -1.66666666666667e-01
+590 510 1.66666666666667e-01
+590 498 -8.33333333333333e-02
+590 502 8.33333333333333e-02
+590 512 -2.50000000000000e-01
+590 1032 -1.66666666666667e-01
+590 1209 -8.33333333333333e-02
+590 1210 -8.33333333333333e-02
+590 834 8.33333333333333e-02
+590 835 8.33333333333333e-02
+590 979 -8.33333333333333e-02
+590 1033 8.33333333333333e-02
+590 980 -2.50000000000000e-01
+590 978 1.66666666666667e-01
+591 591 2.50000000000000e+00
+591 596 1.66666666666667e-01
+591 595 -8.33333333333333e-02
+591 594 -2.50000000000000e-01
+591 601 8.33333333333333e-02
+591 187 8.33333333333333e-02
+591 190 -8.33333333333333e-02
+591 593 -3.33333333333333e-01
+591 191 1.66666666666667e-01
+591 86 -8.33333333333333e-02
+591 85 1.66666666666667e-01
+591 84 -2.50000000000000e-01
+591 189 -2.50000000000000e-01
+591 83 -8.33333333333333e-02
+591 188 8.33333333333333e-02
+591 592 -3.33333333333333e-01
+591 82 1.66666666666667e-01
+591 602 8.33333333333333e-02
+591 81 -2.50000000000000e-01
+591 536 8.33333333333333e-02
+591 535 -1.66666666666667e-01
+591 539 1.66666666666667e-01
+591 538 1.66666666666667e-01
+591 537 -7.50000000000000e-01
+591 473 -8.33333333333333e-02
+591 472 -8.33333333333333e-02
+591 476 -1.66666666666667e-01
+591 475 8.33333333333333e-02
+591 1037 -8.33333333333333e-02
+591 1010 -1.66666666666667e-01
+591 1009 8.33333333333333e-02
+591 1036 -8.33333333333333e-02
+591 1004 1.66666666666667e-01
+591 1031 8.33333333333333e-02
+591 1030 -1.66666666666667e-01
+591 1003 1.66666666666667e-01
+591 1002 -7.50000000000000e-01
+592 592 2.50000000000000e+00
+592 596 1.66666666666667e-01
+592 595 -2.50000000000000e-01
+592 594 -8.33333333333333e-02
+592 602 -1.66666666666667e-01
+592 600 8.33333333333333e-02
+592 186 8.33333333333333e-02
+592 189 -8.33333333333333e-02
+592 86 1.66666666666667e-01
+592 593 -3.33333333333333e-01
+592 191 1.66666666666667e-01
+592 85 -7.50000000000000e-01
+592 190 -2.50000000000000e-01
+592 84 1.66666666666667e-01
+592 83 1.66666666666667e-01
+592 188 -1.66666666666667e-01
+592 82 -7.50000000000000e-01
+592 591 -3.33333333333333e-01
+592 81 1.66666666666667e-01
+592 536 8.33333333333333e-02
+592 534 -1.66666666666667e-01
+592 539 -8.33333333333333e-02
+592 538 -2.50000000000000e-01
+592 537 1.66666666666667e-01
+592 476 8.33333333333333e-02
+592 473 -8.33333333333333e-02
+592 471 -8.33333333333333e-02
+592 474 8.33333333333333e-02
+592 1037 -8.33333333333333e-02
+592 1008 8.33333333333333e-02
+592 1035 -8.33333333333333e-02
+592 1031 8.33333333333333e-02
+592 1004 -8.33333333333333e-02
+592 1029 -1.66666666666667e-01
+592 1010 8.33333333333333e-02
+592 1003 -2.50000000000000e-01
+592 1002 1.66666666666667e-01
+593 593 2.50000000000000e+00
+593 596 -7.50000000000000e-01
+593 595 1.66666666666667e-01
+593 594 1.66666666666667e-01
+593 601 -1.66666666666667e-01
+593 591 -3.33333333333333e-01
+593 189 1.66666666666667e-01
+593 86 -2.50000000000000e-01
+593 191 -7.50000000000000e-01
+593 85 1.66666666666667e-01
+593 592 -3.33333333333333e-01
+593 190 1.66666666666667e-01
+593 84 -8.33333333333333e-02
+593 600 8.33333333333333e-02
+593 83 -2.50000000000000e-01
+593 82 1.66666666666667e-01
+593 187 -1.66666666666667e-01
+593 81 -8.33333333333333e-02
+593 186 8.33333333333333e-02
+593 534 8.33333333333333e-02
+593 535 8.33333333333333e-02
+593 539 -2.50000000000000e-01
+593 538 -8.33333333333333e-02
+593 537 1.66666666666667e-01
+593 475 8.33333333333333e-02
+593 472 -8.33333333333333e-02
+593 471 -8.33333333333333e-02
+593 474 -1.66666666666667e-01
+593 1035 -8.33333333333333e-02
+593 1009 8.33333333333333e-02
+593 1036 -8.33333333333333e-02
+593 1008 -1.66666666666667e-01
+593 1030 8.33333333333333e-02
+593 1003 -8.33333333333333e-02
+593 1002 1.66666666666667e-01
+593 1029 8.33333333333333e-02
+593 1004 -2.50000000000000e-01
+594 594 2.50000000000000e+00
+594 601 1.66666666666667e-01
+594 593 1.66666666666667e-01
+594 596 -3.33333333333333e-01
+594 82 8.33333333333333e-02
+594 592 -8.33333333333333e-02
+594 591 -2.50000000000000e-01
+594 127 8.33333333333333e-02
+594 600 -2.50000000000000e-01
+594 274 -8.33333333333333e-02
+594 275 1.66666666666667e-01
+594 128 8.33333333333333e-02
+594 273 -2.50000000000000e-01
+594 269 -8.33333333333333e-02
+594 83 8.33333333333333e-02
+594 595 -3.33333333333333e-01
+594 268 1.66666666666667e-01
+594 602 -8.33333333333333e-02
+594 267 -2.50000000000000e-01
+594 539 -1.66666666666667e-01
+594 538 8.33333333333333e-02
+594 536 -8.33333333333333e-02
+594 266 8.33333333333333e-02
+594 547 1.66666666666667e-01
+594 265 -1.66666666666667e-01
+594 535 -8.33333333333333e-02
+594 548 1.66666666666667e-01
+594 546 -7.50000000000000e-01
+594 1037 8.33333333333333e-02
+594 1036 -1.66666666666667e-01
+594 1010 1.66666666666667e-01
+594 872 -1.66666666666667e-01
+594 1246 -8.33333333333333e-02
+594 871 8.33333333333333e-02
+594 1247 -8.33333333333333e-02
+594 1009 1.66666666666667e-01
+594 1008 -7.50000000000000e-01
+595 595 2.50000000000000e+00
+595 593 1.66666666666667e-01
+595 592 -2.50000000000000e-01
+595 81 8.33333333333333e-02
+595 591 -8.33333333333333e-02
+595 602 1.66666666666667e-01
+595 601 -7.50000000000000e-01
+595 126 8.33333333333333e-02
+595 596 -3.33333333333333e-01
+595 273 -8.33333333333333e-02
+595 128 -1.66666666666667e-01
+595 275 1.66666666666667e-01
+595 274 -2.50000000000000e-01
+595 269 1.66666666666667e-01
+595 83 -1.66666666666667e-01
+595 600 1.66666666666667e-01
+595 268 -7.50000000000000e-01
+595 594 -3.33333333333333e-01
+595 267 1.66666666666667e-01
+595 539 8.33333333333333e-02
+595 537 8.33333333333333e-02
+595 548 -8.33333333333333e-02
+595 536 -8.33333333333333e-02
+595 266 8.33333333333333e-02
+595 546 1.66666666666667e-01
+595 264 -1.66666666666667e-01
+595 534 -8.33333333333333e-02
+595 547 -2.50000000000000e-01
+595 1037 8.33333333333333e-02
+595 1035 -1.66666666666667e-01
+595 1010 -8.33333333333333e-02
+595 1247 -8.33333333333333e-02
+595 872 8.33333333333333e-02
+595 1245 -8.33333333333333e-02
+595 870 8.33333333333333e-02
+595 1009 -2.50000000000000e-01
+595 1008 1.66666666666667e-01
+596 596 2.50000000000000e+00
+596 593 -7.50000000000000e-01
+596 592 1.66666666666667e-01
+596 591 1.66666666666667e-01
+596 594 -3.33333333333333e-01
+596 602 -2.50000000000000e-01
+596 601 1.66666666666667e-01
+596 595 -3.33333333333333e-01
+596 273 1.66666666666667e-01
+596 275 -7.50000000000000e-01
+596 127 -1.66666666666667e-01
+596 274 1.66666666666667e-01
+596 126 8.33333333333333e-02
+596 600 -8.33333333333333e-02
+596 269 -2.50000000000000e-01
+596 268 1.66666666666667e-01
+596 82 -1.66666666666667e-01
+596 267 -8.33333333333333e-02
+596 81 8.33333333333333e-02
+596 538 8.33333333333333e-02
+596 537 -1.66666666666667e-01
+596 547 -8.33333333333333e-02
+596 535 -8.33333333333333e-02
+596 265 8.33333333333333e-02
+596 534 -8.33333333333333e-02
+596 264 8.33333333333333e-02
+596 548 -2.50000000000000e-01
+596 546 1.66666666666667e-01
+596 1036 8.33333333333333e-02
+596 1035 8.33333333333333e-02
+596 1009 -8.33333333333333e-02
+596 1246 -8.33333333333333e-02
+596 871 8.33333333333333e-02
+596 1008 1.66666666666667e-01
+596 870 -1.66666666666667e-01
+596 1245 -8.33333333333333e-02
+596 1010 -2.50000000000000e-01
+597 597 2.50000000000000e+00
+597 599 -3.33333333333333e-01
+597 589 -8.33333333333333e-02
+597 586 8.33333333333333e-02
+597 107 -8.33333333333333e-02
+597 106 1.66666666666667e-01
+597 588 -2.50000000000000e-01
+597 587 8.33333333333333e-02
+597 86 -8.33333333333333e-02
+597 598 -3.33333333333333e-01
+597 85 1.66666666666667e-01
+597 323 8.33333333333333e-02
+597 322 8.33333333333333e-02
+597 105 -2.50000000000000e-01
+597 317 1.66666666666667e-01
+597 316 -8.33333333333333e-02
+597 315 -2.50000000000000e-01
+597 590 1.66666666666667e-01
+597 84 -2.50000000000000e-01
+597 511 8.33333333333333e-02
+597 502 -8.33333333333333e-02
+597 503 -8.33333333333333e-02
+597 512 -1.66666666666667e-01
+597 575 1.66666666666667e-01
+597 569 8.33333333333333e-02
+597 568 -1.66666666666667e-01
+597 574 1.66666666666667e-01
+597 573 -7.50000000000000e-01
+597 1034 1.66666666666667e-01
+597 1211 8.33333333333333e-02
+597 1210 -1.66666666666667e-01
+597 1033 1.66666666666667e-01
+597 1032 -7.50000000000000e-01
+597 1214 -8.33333333333333e-02
+597 1213 -8.33333333333333e-02
+597 1040 -1.66666666666667e-01
+597 1039 8.33333333333333e-02
+598 598 2.50000000000000e+00
+598 588 -8.33333333333333e-02
+598 585 8.33333333333333e-02
+598 590 1.66666666666667e-01
+598 589 -2.50000000000000e-01
+598 105 1.66666666666667e-01
+598 587 -1.66666666666667e-01
+598 597 -3.33333333333333e-01
+598 84 1.66666666666667e-01
+598 323 -1.66666666666667e-01
+598 107 1.66666666666667e-01
+598 106 -7.50000000000000e-01
+598 321 8.33333333333333e-02
+598 317 1.66666666666667e-01
+598 599 -3.33333333333333e-01
+598 86 1.66666666666667e-01
+598 316 -2.50000000000000e-01
+598 85 -7.50000000000000e-01
+598 315 -8.33333333333333e-02
+598 510 8.33333333333333e-02
+598 501 -8.33333333333333e-02
+598 512 8.33333333333333e-02
+598 503 -8.33333333333333e-02
+598 575 -8.33333333333333e-02
+598 569 8.33333333333333e-02
+598 567 -1.66666666666667e-01
+598 574 -2.50000000000000e-01
+598 573 1.66666666666667e-01
+598 1034 -8.33333333333333e-02
+598 1209 -1.66666666666667e-01
+598 1033 -2.50000000000000e-01
+598 1032 1.66666666666667e-01
+598 1214 -8.33333333333333e-02
+598 1040 8.33333333333333e-02
+598 1212 -8.33333333333333e-02
+598 1211 8.33333333333333e-02
+598 1038 8.33333333333333e-02
+599 599 2.50000000000000e+00
+599 588 1.66666666666667e-01
+599 597 -3.33333333333333e-01
+599 590 -7.50000000000000e-01
+599 589 1.66666666666667e-01
+599 105 -8.33333333333333e-02
+599 586 -1.66666666666667e-01
+599 585 8.33333333333333e-02
+599 84 -8.33333333333333e-02
+599 321 8.33333333333333e-02
+599 107 -2.50000000000000e-01
+599 322 -1.66666666666667e-01
+599 106 1.66666666666667e-01
+599 317 -7.50000000000000e-01
+599 86 -2.50000000000000e-01
+599 316 1.66666666666667e-01
+599 598 -3.33333333333333e-01
+599 85 1.66666666666667e-01
+599 315 1.66666666666667e-01
+599 501 -8.33333333333333e-02
+599 511 8.33333333333333e-02
+599 510 -1.66666666666667e-01
+599 502 -8.33333333333333e-02
+599 574 -8.33333333333333e-02
+599 568 8.33333333333333e-02
+599 573 1.66666666666667e-01
+599 567 8.33333333333333e-02
+599 575 -2.50000000000000e-01
+599 1033 -8.33333333333333e-02
+599 1032 1.66666666666667e-01
+599 1209 8.33333333333333e-02
+599 1034 -2.50000000000000e-01
+599 1212 -8.33333333333333e-02
+599 1213 -8.33333333333333e-02
+599 1039 8.33333333333333e-02
+599 1210 8.33333333333333e-02
+599 1038 -1.66666666666667e-01
+600 600 2.50000000000000e+00
+600 593 8.33333333333333e-02
+600 601 -3.33333333333333e-01
+600 595 1.66666666666667e-01
+600 592 8.33333333333333e-02
+600 85 -8.33333333333333e-02
+600 127 -8.33333333333333e-02
+600 594 -2.50000000000000e-01
+600 128 1.66666666666667e-01
+600 602 -3.33333333333333e-01
+600 86 1.66666666666667e-01
+600 328 8.33333333333333e-02
+600 329 8.33333333333333e-02
+600 126 -2.50000000000000e-01
+600 317 -8.33333333333333e-02
+600 316 1.66666666666667e-01
+600 315 -2.50000000000000e-01
+600 596 -8.33333333333333e-02
+600 84 -2.50000000000000e-01
+600 538 -8.33333333333333e-02
+600 548 8.33333333333333e-02
+600 547 -1.66666666666667e-01
+600 539 -8.33333333333333e-02
+600 580 1.66666666666667e-01
+600 569 -1.66666666666667e-01
+600 568 8.33333333333333e-02
+600 581 1.66666666666667e-01
+600 579 -7.50000000000000e-01
+600 1246 8.33333333333333e-02
+600 1247 -1.66666666666667e-01
+600 1037 1.66666666666667e-01
+600 1036 1.66666666666667e-01
+600 1035 -7.50000000000000e-01
+600 1249 -8.33333333333333e-02
+600 1250 -8.33333333333333e-02
+600 1040 8.33333333333333e-02
+600 1039 -1.66666666666667e-01
+601 601 2.50000000000000e+00
+601 594 1.66666666666667e-01
+601 593 -1.66666666666667e-01
+601 591 8.33333333333333e-02
+601 84 -8.33333333333333e-02
+601 596 1.66666666666667e-01
+601 595 -7.50000000000000e-01
+601 126 -8.33333333333333e-02
+601 327 8.33333333333333e-02
+601 329 -1.66666666666667e-01
+601 128 1.66666666666667e-01
+601 127 -2.50000000000000e-01
+601 317 1.66666666666667e-01
+601 602 -3.33333333333333e-01
+601 86 1.66666666666667e-01
+601 316 -7.50000000000000e-01
+601 600 -3.33333333333333e-01
+601 85 -2.50000000000000e-01
+601 315 1.66666666666667e-01
+601 537 -8.33333333333333e-02
+601 548 8.33333333333333e-02
+601 539 -8.33333333333333e-02
+601 546 -1.66666666666667e-01
+601 569 8.33333333333333e-02
+601 581 -8.33333333333333e-02
+601 579 1.66666666666667e-01
+601 567 8.33333333333333e-02
+601 580 -2.50000000000000e-01
+601 1245 8.33333333333333e-02
+601 1247 8.33333333333333e-02
+601 1037 -8.33333333333333e-02
+601 1036 -2.50000000000000e-01
+601 1035 1.66666666666667e-01
+601 1040 8.33333333333333e-02
+601 1250 -8.33333333333333e-02
+601 1248 -8.33333333333333e-02
+601 1038 -1.66666666666667e-01
+602 602 2.50000000000000e+00
+602 591 8.33333333333333e-02
+602 592 -1.66666666666667e-01
+602 596 -2.50000000000000e-01
+602 595 1.66666666666667e-01
+602 126 1.66666666666667e-01
+602 600 -3.33333333333333e-01
+602 84 1.66666666666667e-01
+602 128 -7.50000000000000e-01
+602 328 -1.66666666666667e-01
+602 127 1.66666666666667e-01
+602 327 8.33333333333333e-02
+602 317 -2.50000000000000e-01
+602 594 -8.33333333333333e-02
+602 86 -7.50000000000000e-01
+602 316 1.66666666666667e-01
+602 601 -3.33333333333333e-01
+602 85 1.66666666666667e-01
+602 315 -8.33333333333333e-02
+602 538 -8.33333333333333e-02
+602 546 8.33333333333333e-02
+602 537 -8.33333333333333e-02
+602 568 8.33333333333333e-02
+602 580 -8.33333333333333e-02
+602 567 -1.66666666666667e-01
+602 547 8.33333333333333e-02
+602 581 -2.50000000000000e-01
+602 579 1.66666666666667e-01
+602 1246 8.33333333333333e-02
+602 1245 -1.66666666666667e-01
+602 1037 -2.50000000000000e-01
+602 1036 -8.33333333333333e-02
+602 1035 1.66666666666667e-01
+602 1039 8.33333333333333e-02
+602 1249 -8.33333333333333e-02
+602 1248 -8.33333333333333e-02
+602 1038 8.33333333333333e-02
+603 603 1.25000000000000e+00
+603 383 -8.33333333333333e-02
+603 604 -1.66666666666667e-01
+603 607 8.33333333333333e-02
+603 382 1.66666666666667e-01
+603 608 8.33333333333333e-02
+603 88 -4.16666666666667e-02
+603 379 8.33333333333333e-02
+603 606 -3.75000000000000e-01
+603 617 -8.33333333333333e-02
+603 616 4.16666666666667e-02
+603 94 -4.16666666666667e-02
+603 381 -2.50000000000000e-01
+603 196 4.16666666666667e-02
+603 361 -8.33333333333333e-02
+603 362 -8.33333333333333e-02
+603 368 8.33333333333333e-02
+603 89 8.33333333333333e-02
+603 197 -8.33333333333333e-02
+603 87 -1.25000000000000e-01
+603 605 -1.66666666666667e-01
+603 203 8.33333333333333e-02
+603 95 8.33333333333333e-02
+603 202 8.33333333333333e-02
+603 367 -1.66666666666667e-01
+603 380 8.33333333333333e-02
+603 201 -3.75000000000000e-01
+603 93 -1.25000000000000e-01
+604 604 1.25000000000000e+00
+604 617 4.16666666666667e-02
+604 603 -1.66666666666667e-01
+604 606 8.33333333333333e-02
+604 381 1.66666666666667e-01
+604 89 8.33333333333333e-02
+604 380 -1.66666666666667e-01
+604 607 -1.25000000000000e-01
+604 87 -4.16666666666667e-02
+604 378 8.33333333333333e-02
+604 605 -1.66666666666667e-01
+604 383 1.66666666666667e-01
+604 95 8.33333333333333e-02
+604 382 -7.50000000000000e-01
+604 615 4.16666666666667e-02
+604 93 -4.16666666666667e-02
+604 195 4.16666666666667e-02
+604 360 -8.33333333333333e-02
+604 197 4.16666666666667e-02
+604 362 -8.33333333333333e-02
+604 88 -1.25000000000000e-01
+604 203 -4.16666666666667e-02
+604 368 8.33333333333333e-02
+604 608 -4.16666666666667e-02
+604 202 -1.25000000000000e-01
+604 94 -1.25000000000000e-01
+604 201 8.33333333333333e-02
+604 366 -1.66666666666667e-01
+605 605 1.25000000000000e+00
+605 381 -8.33333333333333e-02
+605 607 -4.16666666666667e-02
+605 616 4.16666666666667e-02
+605 608 -1.25000000000000e-01
+605 88 8.33333333333333e-02
+605 379 -1.66666666666667e-01
+605 606 8.33333333333333e-02
+605 383 -2.50000000000000e-01
+605 604 -1.66666666666667e-01
+605 382 1.66666666666667e-01
+605 94 8.33333333333333e-02
+605 615 -8.33333333333333e-02
+605 360 -8.33333333333333e-02
+605 366 8.33333333333333e-02
+605 89 -3.75000000000000e-01
+605 196 4.16666666666667e-02
+605 361 -8.33333333333333e-02
+605 87 8.33333333333333e-02
+605 195 -8.33333333333333e-02
+605 378 8.33333333333333e-02
+605 203 -1.25000000000000e-01
+605 95 -3.75000000000000e-01
+605 202 -4.16666666666667e-02
+605 367 8.33333333333333e-02
+605 603 -1.66666666666667e-01
+605 201 8.33333333333333e-02
+605 93 8.33333333333333e-02
+606 606 1.25000000000000e+00
+606 604 8.33333333333333e-02
+606 382 -1.66666666666667e-01
+606 605 8.33333333333333e-02
+606 88 4.16666666666667e-02
+606 603 -3.75000000000000e-01
+606 617 8.33333333333333e-02
+606 100 4.16666666666667e-02
+606 616 -4.16666666666667e-02
+606 615 -1.25000000000000e-01
+606 379 -8.33333333333333e-02
+606 380 -8.33333333333333e-02
+606 608 -1.66666666666667e-01
+606 211 -4.16666666666667e-02
+606 205 8.33333333333333e-02
+606 206 8.33333333333333e-02
+606 386 -8.33333333333333e-02
+606 212 8.33333333333333e-02
+606 89 -8.33333333333333e-02
+606 210 -1.25000000000000e-01
+606 218 8.33333333333333e-02
+606 101 -8.33333333333333e-02
+606 217 8.33333333333333e-02
+606 607 -1.66666666666667e-01
+606 385 1.66666666666667e-01
+606 216 -3.75000000000000e-01
+606 383 8.33333333333333e-02
+606 384 -2.50000000000000e-01
+607 607 1.25000000000000e+00
+607 383 8.33333333333333e-02
+607 603 8.33333333333333e-02
+607 381 -1.66666666666667e-01
+607 604 -1.25000000000000e-01
+607 87 4.16666666666667e-02
+607 608 -1.66666666666667e-01
+607 617 8.33333333333333e-02
+607 616 -1.25000000000000e-01
+607 99 4.16666666666667e-02
+607 615 -4.16666666666667e-02
+607 378 -8.33333333333333e-02
+607 212 8.33333333333333e-02
+607 210 -4.16666666666667e-02
+607 204 8.33333333333333e-02
+607 206 -1.66666666666667e-01
+607 386 1.66666666666667e-01
+607 89 4.16666666666667e-02
+607 380 -8.33333333333333e-02
+607 211 -1.25000000000000e-01
+607 218 -4.16666666666667e-02
+607 101 4.16666666666667e-02
+607 217 -1.25000000000000e-01
+607 605 -4.16666666666667e-02
+607 385 -7.50000000000000e-01
+607 216 8.33333333333333e-02
+607 606 -1.66666666666667e-01
+607 384 1.66666666666667e-01
+608 608 1.25000000000000e+00
+608 604 -4.16666666666667e-02
+608 382 8.33333333333333e-02
+608 605 -1.25000000000000e-01
+608 603 8.33333333333333e-02
+608 617 -3.75000000000000e-01
+608 607 -1.66666666666667e-01
+608 616 8.33333333333333e-02
+608 615 8.33333333333333e-02
+608 378 -8.33333333333333e-02
+608 211 8.33333333333333e-02
+608 606 -1.66666666666667e-01
+608 205 -1.66666666666667e-01
+608 385 1.66666666666667e-01
+608 204 8.33333333333333e-02
+608 384 -8.33333333333333e-02
+608 212 -3.75000000000000e-01
+608 88 4.16666666666667e-02
+608 379 -8.33333333333333e-02
+608 210 8.33333333333333e-02
+608 87 -8.33333333333333e-02
+608 218 -1.25000000000000e-01
+608 381 8.33333333333333e-02
+608 386 -2.50000000000000e-01
+608 217 -4.16666666666667e-02
+608 100 4.16666666666667e-02
+608 216 8.33333333333333e-02
+608 99 -8.33333333333333e-02
+609 609 1.25000000000000e+00
+609 619 4.16666666666667e-02
+609 620 -8.33333333333333e-02
+609 614 8.33333333333333e-02
+609 612 -1.25000000000000e-01
+609 431 -8.33333333333333e-02
+609 94 8.33333333333333e-02
+609 610 -1.66666666666667e-01
+609 430 1.66666666666667e-01
+609 429 -2.50000000000000e-01
+609 428 8.33333333333333e-02
+609 91 8.33333333333333e-02
+609 427 -1.66666666666667e-01
+609 368 8.33333333333333e-02
+609 365 -8.33333333333333e-02
+609 92 8.33333333333333e-02
+609 200 -8.33333333333333e-02
+609 199 4.16666666666667e-02
+609 364 -8.33333333333333e-02
+609 90 -3.75000000000000e-01
+609 611 -1.66666666666667e-01
+609 203 8.33333333333333e-02
+609 95 8.33333333333333e-02
+609 202 -4.16666666666667e-02
+609 367 8.33333333333333e-02
+609 613 -4.16666666666667e-02
+609 201 -1.25000000000000e-01
+609 93 -3.75000000000000e-01
+610 610 1.25000000000000e+00
+610 611 -1.66666666666667e-01
+610 612 -4.16666666666667e-02
+610 618 4.16666666666667e-02
+610 95 -4.16666666666667e-02
+610 620 4.16666666666667e-02
+610 92 -4.16666666666667e-02
+610 613 -1.25000000000000e-01
+610 428 8.33333333333333e-02
+610 431 1.66666666666667e-01
+610 430 -7.50000000000000e-01
+610 93 8.33333333333333e-02
+610 609 -1.66666666666667e-01
+610 429 1.66666666666667e-01
+610 90 8.33333333333333e-02
+610 426 -1.66666666666667e-01
+610 200 4.16666666666667e-02
+610 365 -8.33333333333333e-02
+610 91 -1.25000000000000e-01
+610 198 4.16666666666667e-02
+610 363 -8.33333333333333e-02
+610 203 8.33333333333333e-02
+610 368 -1.66666666666667e-01
+610 614 8.33333333333333e-02
+610 202 -1.25000000000000e-01
+610 94 -1.25000000000000e-01
+610 201 -4.16666666666667e-02
+610 366 8.33333333333333e-02
+611 611 1.25000000000000e+00
+611 610 -1.66666666666667e-01
+611 94 -4.16666666666667e-02
+611 619 4.16666666666667e-02
+611 618 -8.33333333333333e-02
+611 614 -3.75000000000000e-01
+611 91 -4.16666666666667e-02
+611 612 8.33333333333333e-02
+611 427 8.33333333333333e-02
+611 431 -2.50000000000000e-01
+611 430 1.66666666666667e-01
+611 429 -8.33333333333333e-02
+611 426 8.33333333333333e-02
+611 366 8.33333333333333e-02
+611 363 -8.33333333333333e-02
+611 199 4.16666666666667e-02
+611 364 -8.33333333333333e-02
+611 92 -1.25000000000000e-01
+611 90 8.33333333333333e-02
+611 198 -8.33333333333333e-02
+611 613 8.33333333333333e-02
+611 203 -3.75000000000000e-01
+611 95 -1.25000000000000e-01
+611 202 8.33333333333333e-02
+611 367 -1.66666666666667e-01
+611 609 -1.66666666666667e-01
+611 201 8.33333333333333e-02
+611 93 8.33333333333333e-02
+612 612 1.25000000000000e+00
+612 431 8.33333333333333e-02
+612 430 8.33333333333333e-02
+612 620 8.33333333333333e-02
+612 619 8.33333333333333e-02
+612 613 -1.66666666666667e-01
+612 618 -3.75000000000000e-01
+612 611 8.33333333333333e-02
+612 609 -1.25000000000000e-01
+612 440 -8.33333333333333e-02
+612 614 -1.66666666666667e-01
+612 428 -8.33333333333333e-02
+612 278 8.33333333333333e-02
+612 280 8.33333333333333e-02
+612 439 1.66666666666667e-01
+612 277 -1.66666666666667e-01
+612 281 8.33333333333333e-02
+612 92 -8.33333333333333e-02
+612 91 4.16666666666667e-02
+612 427 -8.33333333333333e-02
+612 279 -3.75000000000000e-01
+612 287 8.33333333333333e-02
+612 131 -8.33333333333333e-02
+612 286 -4.16666666666667e-02
+612 130 4.16666666666667e-02
+612 285 -1.25000000000000e-01
+612 610 -4.16666666666667e-02
+612 438 -2.50000000000000e-01
+613 613 1.25000000000000e+00
+613 609 -4.16666666666667e-02
+613 431 -1.66666666666667e-01
+613 429 8.33333333333333e-02
+613 620 -4.16666666666667e-02
+613 131 4.16666666666667e-02
+613 619 -1.25000000000000e-01
+613 618 8.33333333333333e-02
+613 612 -1.66666666666667e-01
+613 92 4.16666666666667e-02
+613 610 -1.25000000000000e-01
+613 281 -4.16666666666667e-02
+613 279 8.33333333333333e-02
+613 428 -8.33333333333333e-02
+613 278 8.33333333333333e-02
+613 438 1.66666666666667e-01
+613 276 -1.66666666666667e-01
+613 280 -1.25000000000000e-01
+613 90 4.16666666666667e-02
+613 426 -8.33333333333333e-02
+613 287 8.33333333333333e-02
+613 614 -1.66666666666667e-01
+613 440 1.66666666666667e-01
+613 286 -1.25000000000000e-01
+613 611 8.33333333333333e-02
+613 439 -7.50000000000000e-01
+613 285 -4.16666666666667e-02
+613 129 4.16666666666667e-02
+614 614 1.25000000000000e+00
+614 429 8.33333333333333e-02
+614 430 -1.66666666666667e-01
+614 620 -1.25000000000000e-01
+614 619 -4.16666666666667e-02
+614 130 4.16666666666667e-02
+614 618 8.33333333333333e-02
+614 611 -3.75000000000000e-01
+614 91 4.16666666666667e-02
+614 609 8.33333333333333e-02
+614 438 -8.33333333333333e-02
+614 280 -4.16666666666667e-02
+614 612 -1.66666666666667e-01
+614 426 -8.33333333333333e-02
+614 276 8.33333333333333e-02
+614 427 -8.33333333333333e-02
+614 277 8.33333333333333e-02
+614 281 -1.25000000000000e-01
+614 279 8.33333333333333e-02
+614 90 -8.33333333333333e-02
+614 287 -3.75000000000000e-01
+614 610 8.33333333333333e-02
+614 440 -2.50000000000000e-01
+614 286 8.33333333333333e-02
+614 613 -1.66666666666667e-01
+614 439 1.66666666666667e-01
+614 285 8.33333333333333e-02
+614 129 -8.33333333333333e-02
+615 615 1.25000000000000e+00
+615 607 -4.16666666666667e-02
+615 606 -1.25000000000000e-01
+615 605 -8.33333333333333e-02
+615 604 4.16666666666667e-02
+615 385 8.33333333333333e-02
+615 382 -8.33333333333333e-02
+615 386 8.33333333333333e-02
+615 383 -8.33333333333333e-02
+615 446 8.33333333333333e-02
+615 449 -8.33333333333333e-02
+615 298 4.16666666666667e-02
+615 295 -4.16666666666667e-02
+615 101 8.33333333333333e-02
+615 299 -8.33333333333333e-02
+615 100 8.33333333333333e-02
+615 616 -1.66666666666667e-01
+615 448 1.66666666666667e-01
+615 99 -3.75000000000000e-01
+615 447 -2.50000000000000e-01
+615 617 -1.66666666666667e-01
+615 95 8.33333333333333e-02
+615 296 8.33333333333333e-02
+615 94 8.33333333333333e-02
+615 445 -1.66666666666667e-01
+615 608 8.33333333333333e-02
+615 93 -3.75000000000000e-01
+615 294 -1.25000000000000e-01
+616 616 1.25000000000000e+00
+616 608 8.33333333333333e-02
+616 607 -1.25000000000000e-01
+616 606 -4.16666666666667e-02
+616 603 4.16666666666667e-02
+616 384 8.33333333333333e-02
+616 381 -8.33333333333333e-02
+616 383 -8.33333333333333e-02
+616 386 -1.66666666666667e-01
+616 617 -1.66666666666667e-01
+616 449 1.66666666666667e-01
+616 296 8.33333333333333e-02
+616 297 4.16666666666667e-02
+616 294 -4.16666666666667e-02
+616 101 -4.16666666666667e-02
+616 299 4.16666666666667e-02
+616 100 -1.25000000000000e-01
+616 448 -7.50000000000000e-01
+616 99 8.33333333333333e-02
+616 615 -1.66666666666667e-01
+616 447 1.66666666666667e-01
+616 95 -4.16666666666667e-02
+616 446 8.33333333333333e-02
+616 605 4.16666666666667e-02
+616 94 -1.25000000000000e-01
+616 295 -1.25000000000000e-01
+616 93 8.33333333333333e-02
+616 444 -1.66666666666667e-01
+617 617 1.25000000000000e+00
+617 608 -3.75000000000000e-01
+617 607 8.33333333333333e-02
+617 606 8.33333333333333e-02
+617 603 -8.33333333333333e-02
+617 382 -8.33333333333333e-02
+617 385 -1.66666666666667e-01
+617 384 8.33333333333333e-02
+617 381 -8.33333333333333e-02
+617 444 8.33333333333333e-02
+617 447 -8.33333333333333e-02
+617 616 -1.66666666666667e-01
+617 448 1.66666666666667e-01
+617 295 8.33333333333333e-02
+617 101 -1.25000000000000e-01
+617 449 -2.50000000000000e-01
+617 100 -4.16666666666667e-02
+617 298 4.16666666666667e-02
+617 99 8.33333333333333e-02
+617 297 -8.33333333333333e-02
+617 604 4.16666666666667e-02
+617 95 -1.25000000000000e-01
+617 296 -3.75000000000000e-01
+617 94 -4.16666666666667e-02
+617 445 8.33333333333333e-02
+617 615 -1.66666666666667e-01
+617 93 8.33333333333333e-02
+617 294 8.33333333333333e-02
+618 618 1.25000000000000e+00
+618 430 -8.33333333333333e-02
+618 440 8.33333333333333e-02
+618 431 -8.33333333333333e-02
+618 611 -8.33333333333333e-02
+618 614 8.33333333333333e-02
+618 613 8.33333333333333e-02
+618 439 -1.66666666666667e-01
+618 612 -3.75000000000000e-01
+618 446 8.33333333333333e-02
+618 458 -8.33333333333333e-02
+618 295 8.33333333333333e-02
+618 619 -1.66666666666667e-01
+618 457 1.66666666666667e-01
+618 131 8.33333333333333e-02
+618 308 -8.33333333333333e-02
+618 130 -4.16666666666667e-02
+618 307 4.16666666666667e-02
+618 129 -1.25000000000000e-01
+618 456 -2.50000000000000e-01
+618 620 -1.66666666666667e-01
+618 95 8.33333333333333e-02
+618 296 8.33333333333333e-02
+618 94 -4.16666666666667e-02
+618 445 8.33333333333333e-02
+618 610 4.16666666666667e-02
+618 93 -1.25000000000000e-01
+618 294 -3.75000000000000e-01
+619 619 1.25000000000000e+00
+619 429 -8.33333333333333e-02
+619 611 4.16666666666667e-02
+619 431 -8.33333333333333e-02
+619 614 -4.16666666666667e-02
+619 440 8.33333333333333e-02
+619 613 -1.25000000000000e-01
+619 612 8.33333333333333e-02
+619 438 -1.66666666666667e-01
+619 296 -4.16666666666667e-02
+619 308 4.16666666666667e-02
+619 294 8.33333333333333e-02
+619 618 -1.66666666666667e-01
+619 456 1.66666666666667e-01
+619 131 8.33333333333333e-02
+619 620 -1.66666666666667e-01
+619 458 1.66666666666667e-01
+619 130 -1.25000000000000e-01
+619 457 -7.50000000000000e-01
+619 129 -4.16666666666667e-02
+619 306 4.16666666666667e-02
+619 95 8.33333333333333e-02
+619 446 -1.66666666666667e-01
+619 609 4.16666666666667e-02
+619 94 -1.25000000000000e-01
+619 295 -1.25000000000000e-01
+619 93 -4.16666666666667e-02
+619 444 8.33333333333333e-02
+620 620 1.25000000000000e+00
+620 429 -8.33333333333333e-02
+620 610 4.16666666666667e-02
+620 430 -8.33333333333333e-02
+620 609 -8.33333333333333e-02
+620 614 -1.25000000000000e-01
+620 613 -4.16666666666667e-02
+620 439 8.33333333333333e-02
+620 612 8.33333333333333e-02
+620 295 -4.16666666666667e-02
+620 307 4.16666666666667e-02
+620 444 8.33333333333333e-02
+620 456 -8.33333333333333e-02
+620 131 -3.75000000000000e-01
+620 458 -2.50000000000000e-01
+620 130 8.33333333333333e-02
+620 619 -1.66666666666667e-01
+620 457 1.66666666666667e-01
+620 129 8.33333333333333e-02
+620 306 -8.33333333333333e-02
+620 438 8.33333333333333e-02
+620 95 -3.75000000000000e-01
+620 296 -1.25000000000000e-01
+620 94 8.33333333333333e-02
+620 445 -1.66666666666667e-01
+620 618 -1.66666666666667e-01
+620 93 8.33333333333333e-02
+620 294 8.33333333333333e-02
+621 621 1.25000000000000e+00
+621 509 -8.33333333333333e-02
+621 622 -1.66666666666667e-01
+621 625 8.33333333333333e-02
+621 508 1.66666666666667e-01
+621 626 8.33333333333333e-02
+621 97 -4.16666666666667e-02
+621 505 8.33333333333333e-02
+621 624 -3.75000000000000e-01
+621 635 -8.33333333333333e-02
+621 634 4.16666666666667e-02
+621 103 -4.16666666666667e-02
+621 507 -2.50000000000000e-01
+621 214 4.16666666666667e-02
+621 487 -8.33333333333333e-02
+621 488 -8.33333333333333e-02
+621 494 8.33333333333333e-02
+621 98 8.33333333333333e-02
+621 215 -8.33333333333333e-02
+621 96 -1.25000000000000e-01
+621 623 -1.66666666666667e-01
+621 221 8.33333333333333e-02
+621 104 8.33333333333333e-02
+621 220 8.33333333333333e-02
+621 493 -1.66666666666667e-01
+621 506 8.33333333333333e-02
+621 219 -3.75000000000000e-01
+621 102 -1.25000000000000e-01
+622 622 1.25000000000000e+00
+622 635 4.16666666666667e-02
+622 621 -1.66666666666667e-01
+622 624 8.33333333333333e-02
+622 507 1.66666666666667e-01
+622 98 8.33333333333333e-02
+622 506 -1.66666666666667e-01
+622 625 -1.25000000000000e-01
+622 96 -4.16666666666667e-02
+622 504 8.33333333333333e-02
+622 623 -1.66666666666667e-01
+622 509 1.66666666666667e-01
+622 104 8.33333333333333e-02
+622 508 -7.50000000000000e-01
+622 633 4.16666666666667e-02
+622 102 -4.16666666666667e-02
+622 213 4.16666666666667e-02
+622 486 -8.33333333333333e-02
+622 215 4.16666666666667e-02
+622 488 -8.33333333333333e-02
+622 97 -1.25000000000000e-01
+622 221 -4.16666666666667e-02
+622 494 8.33333333333333e-02
+622 626 -4.16666666666667e-02
+622 220 -1.25000000000000e-01
+622 103 -1.25000000000000e-01
+622 219 8.33333333333333e-02
+622 492 -1.66666666666667e-01
+623 623 1.25000000000000e+00
+623 507 -8.33333333333333e-02
+623 625 -4.16666666666667e-02
+623 634 4.16666666666667e-02
+623 626 -1.25000000000000e-01
+623 97 8.33333333333333e-02
+623 505 -1.66666666666667e-01
+623 624 8.33333333333333e-02
+623 509 -2.50000000000000e-01
+623 622 -1.66666666666667e-01
+623 508 1.66666666666667e-01
+623 103 8.33333333333333e-02
+623 633 -8.33333333333333e-02
+623 486 -8.33333333333333e-02
+623 492 8.33333333333333e-02
+623 98 -3.75000000000000e-01
+623 214 4.16666666666667e-02
+623 487 -8.33333333333333e-02
+623 96 8.33333333333333e-02
+623 213 -8.33333333333333e-02
+623 504 8.33333333333333e-02
+623 221 -1.25000000000000e-01
+623 104 -3.75000000000000e-01
+623 220 -4.16666666666667e-02
+623 493 8.33333333333333e-02
+623 621 -1.66666666666667e-01
+623 219 8.33333333333333e-02
+623 102 8.33333333333333e-02
+624 624 1.25000000000000e+00
+624 622 8.33333333333333e-02
+624 508 -1.66666666666667e-01
+624 623 8.33333333333333e-02
+624 97 4.16666666666667e-02
+624 621 -3.75000000000000e-01
+624 635 8.33333333333333e-02
+624 106 4.16666666666667e-02
+624 634 -4.16666666666667e-02
+624 633 -1.25000000000000e-01
+624 505 -8.33333333333333e-02
+624 506 -8.33333333333333e-02
+624 626 -1.66666666666667e-01
+624 229 -4.16666666666667e-02
+624 223 8.33333333333333e-02
+624 224 8.33333333333333e-02
+624 512 -8.33333333333333e-02
+624 230 8.33333333333333e-02
+624 98 -8.33333333333333e-02
+624 228 -1.25000000000000e-01
+624 233 8.33333333333333e-02
+624 107 -8.33333333333333e-02
+624 232 8.33333333333333e-02
+624 625 -1.66666666666667e-01
+624 511 1.66666666666667e-01
+624 231 -3.75000000000000e-01
+624 509 8.33333333333333e-02
+624 510 -2.50000000000000e-01
+625 625 1.25000000000000e+00
+625 509 8.33333333333333e-02
+625 621 8.33333333333333e-02
+625 507 -1.66666666666667e-01
+625 622 -1.25000000000000e-01
+625 96 4.16666666666667e-02
+625 626 -1.66666666666667e-01
+625 635 8.33333333333333e-02
+625 634 -1.25000000000000e-01
+625 105 4.16666666666667e-02
+625 633 -4.16666666666667e-02
+625 504 -8.33333333333333e-02
+625 230 8.33333333333333e-02
+625 228 -4.16666666666667e-02
+625 222 8.33333333333333e-02
+625 224 -1.66666666666667e-01
+625 512 1.66666666666667e-01
+625 98 4.16666666666667e-02
+625 506 -8.33333333333333e-02
+625 229 -1.25000000000000e-01
+625 233 -4.16666666666667e-02
+625 107 4.16666666666667e-02
+625 232 -1.25000000000000e-01
+625 623 -4.16666666666667e-02
+625 511 -7.50000000000000e-01
+625 231 8.33333333333333e-02
+625 624 -1.66666666666667e-01
+625 510 1.66666666666667e-01
+626 626 1.25000000000000e+00
+626 622 -4.16666666666667e-02
+626 508 8.33333333333333e-02
+626 623 -1.25000000000000e-01
+626 621 8.33333333333333e-02
+626 635 -3.75000000000000e-01
+626 625 -1.66666666666667e-01
+626 634 8.33333333333333e-02
+626 633 8.33333333333333e-02
+626 504 -8.33333333333333e-02
+626 229 8.33333333333333e-02
+626 624 -1.66666666666667e-01
+626 223 -1.66666666666667e-01
+626 511 1.66666666666667e-01
+626 222 8.33333333333333e-02
+626 510 -8.33333333333333e-02
+626 230 -3.75000000000000e-01
+626 97 4.16666666666667e-02
+626 505 -8.33333333333333e-02
+626 228 8.33333333333333e-02
+626 96 -8.33333333333333e-02
+626 233 -1.25000000000000e-01
+626 507 8.33333333333333e-02
+626 512 -2.50000000000000e-01
+626 232 -4.16666666666667e-02
+626 106 4.16666666666667e-02
+626 231 8.33333333333333e-02
+626 105 -8.33333333333333e-02
+627 627 1.25000000000000e+00
+627 637 4.16666666666667e-02
+627 638 -8.33333333333333e-02
+627 632 8.33333333333333e-02
+627 630 -1.25000000000000e-01
+627 557 -8.33333333333333e-02
+627 103 8.33333333333333e-02
+627 628 -1.66666666666667e-01
+627 556 1.66666666666667e-01
+627 555 -2.50000000000000e-01
+627 554 8.33333333333333e-02
+627 100 8.33333333333333e-02
+627 553 -1.66666666666667e-01
+627 494 8.33333333333333e-02
+627 491 -8.33333333333333e-02
+627 101 8.33333333333333e-02
+627 218 -8.33333333333333e-02
+627 217 4.16666666666667e-02
+627 490 -8.33333333333333e-02
+627 99 -3.75000000000000e-01
+627 629 -1.66666666666667e-01
+627 221 8.33333333333333e-02
+627 104 8.33333333333333e-02
+627 220 -4.16666666666667e-02
+627 493 8.33333333333333e-02
+627 631 -4.16666666666667e-02
+627 219 -1.25000000000000e-01
+627 102 -3.75000000000000e-01
+628 628 1.25000000000000e+00
+628 629 -1.66666666666667e-01
+628 630 -4.16666666666667e-02
+628 636 4.16666666666667e-02
+628 104 -4.16666666666667e-02
+628 638 4.16666666666667e-02
+628 101 -4.16666666666667e-02
+628 631 -1.25000000000000e-01
+628 554 8.33333333333333e-02
+628 557 1.66666666666667e-01
+628 556 -7.50000000000000e-01
+628 102 8.33333333333333e-02
+628 627 -1.66666666666667e-01
+628 555 1.66666666666667e-01
+628 99 8.33333333333333e-02
+628 552 -1.66666666666667e-01
+628 218 4.16666666666667e-02
+628 491 -8.33333333333333e-02
+628 100 -1.25000000000000e-01
+628 216 4.16666666666667e-02
+628 489 -8.33333333333333e-02
+628 221 8.33333333333333e-02
+628 494 -1.66666666666667e-01
+628 632 8.33333333333333e-02
+628 220 -1.25000000000000e-01
+628 103 -1.25000000000000e-01
+628 219 -4.16666666666667e-02
+628 492 8.33333333333333e-02
+629 629 1.25000000000000e+00
+629 628 -1.66666666666667e-01
+629 103 -4.16666666666667e-02
+629 637 4.16666666666667e-02
+629 636 -8.33333333333333e-02
+629 632 -3.75000000000000e-01
+629 100 -4.16666666666667e-02
+629 630 8.33333333333333e-02
+629 553 8.33333333333333e-02
+629 557 -2.50000000000000e-01
+629 556 1.66666666666667e-01
+629 555 -8.33333333333333e-02
+629 552 8.33333333333333e-02
+629 492 8.33333333333333e-02
+629 489 -8.33333333333333e-02
+629 217 4.16666666666667e-02
+629 490 -8.33333333333333e-02
+629 101 -1.25000000000000e-01
+629 99 8.33333333333333e-02
+629 216 -8.33333333333333e-02
+629 631 8.33333333333333e-02
+629 221 -3.75000000000000e-01
+629 104 -1.25000000000000e-01
+629 220 8.33333333333333e-02
+629 493 -1.66666666666667e-01
+629 627 -1.66666666666667e-01
+629 219 8.33333333333333e-02
+629 102 8.33333333333333e-02
+630 630 1.25000000000000e+00
+630 557 8.33333333333333e-02
+630 556 8.33333333333333e-02
+630 638 8.33333333333333e-02
+630 637 8.33333333333333e-02
+630 631 -1.66666666666667e-01
+630 636 -3.75000000000000e-01
+630 629 8.33333333333333e-02
+630 627 -1.25000000000000e-01
+630 566 -8.33333333333333e-02
+630 632 -1.66666666666667e-01
+630 554 -8.33333333333333e-02
+630 293 8.33333333333333e-02
+630 298 8.33333333333333e-02
+630 565 1.66666666666667e-01
+630 292 -1.66666666666667e-01
+630 299 8.33333333333333e-02
+630 101 -8.33333333333333e-02
+630 100 4.16666666666667e-02
+630 553 -8.33333333333333e-02
+630 297 -3.75000000000000e-01
+630 311 8.33333333333333e-02
+630 134 -8.33333333333333e-02
+630 310 -4.16666666666667e-02
+630 133 4.16666666666667e-02
+630 309 -1.25000000000000e-01
+630 628 -4.16666666666667e-02
+630 564 -2.50000000000000e-01
+631 631 1.25000000000000e+00
+631 627 -4.16666666666667e-02
+631 557 -1.66666666666667e-01
+631 555 8.33333333333333e-02
+631 638 -4.16666666666667e-02
+631 134 4.16666666666667e-02
+631 637 -1.25000000000000e-01
+631 636 8.33333333333333e-02
+631 630 -1.66666666666667e-01
+631 101 4.16666666666667e-02
+631 628 -1.25000000000000e-01
+631 299 -4.16666666666667e-02
+631 297 8.33333333333333e-02
+631 554 -8.33333333333333e-02
+631 293 8.33333333333333e-02
+631 564 1.66666666666667e-01
+631 291 -1.66666666666667e-01
+631 298 -1.25000000000000e-01
+631 99 4.16666666666667e-02
+631 552 -8.33333333333333e-02
+631 311 8.33333333333333e-02
+631 632 -1.66666666666667e-01
+631 566 1.66666666666667e-01
+631 310 -1.25000000000000e-01
+631 629 8.33333333333333e-02
+631 565 -7.50000000000000e-01
+631 309 -4.16666666666667e-02
+631 132 4.16666666666667e-02
+632 632 1.25000000000000e+00
+632 555 8.33333333333333e-02
+632 556 -1.66666666666667e-01
+632 638 -1.25000000000000e-01
+632 637 -4.16666666666667e-02
+632 133 4.16666666666667e-02
+632 636 8.33333333333333e-02
+632 629 -3.75000000000000e-01
+632 100 4.16666666666667e-02
+632 627 8.33333333333333e-02
+632 564 -8.33333333333333e-02
+632 298 -4.16666666666667e-02
+632 630 -1.66666666666667e-01
+632 552 -8.33333333333333e-02
+632 291 8.33333333333333e-02
+632 553 -8.33333333333333e-02
+632 292 8.33333333333333e-02
+632 299 -1.25000000000000e-01
+632 297 8.33333333333333e-02
+632 99 -8.33333333333333e-02
+632 311 -3.75000000000000e-01
+632 628 8.33333333333333e-02
+632 566 -2.50000000000000e-01
+632 310 8.33333333333333e-02
+632 631 -1.66666666666667e-01
+632 565 1.66666666666667e-01
+632 309 8.33333333333333e-02
+632 132 -8.33333333333333e-02
+633 633 1.25000000000000e+00
+633 625 -4.16666666666667e-02
+633 624 -1.25000000000000e-01
+633 623 -8.33333333333333e-02
+633 622 4.16666666666667e-02
+633 511 8.33333333333333e-02
+633 508 -8.33333333333333e-02
+633 512 8.33333333333333e-02
+633 509 -8.33333333333333e-02
+633 572 8.33333333333333e-02
+633 575 -8.33333333333333e-02
+633 322 4.16666666666667e-02
+633 319 -4.16666666666667e-02
+633 107 8.33333333333333e-02
+633 323 -8.33333333333333e-02
+633 106 8.33333333333333e-02
+633 634 -1.66666666666667e-01
+633 574 1.66666666666667e-01
+633 105 -3.75000000000000e-01
+633 573 -2.50000000000000e-01
+633 635 -1.66666666666667e-01
+633 104 8.33333333333333e-02
+633 320 8.33333333333333e-02
+633 103 8.33333333333333e-02
+633 571 -1.66666666666667e-01
+633 626 8.33333333333333e-02
+633 102 -3.75000000000000e-01
+633 318 -1.25000000000000e-01
+634 634 1.25000000000000e+00
+634 626 8.33333333333333e-02
+634 625 -1.25000000000000e-01
+634 624 -4.16666666666667e-02
+634 621 4.16666666666667e-02
+634 510 8.33333333333333e-02
+634 507 -8.33333333333333e-02
+634 509 -8.33333333333333e-02
+634 512 -1.66666666666667e-01
+634 635 -1.66666666666667e-01
+634 575 1.66666666666667e-01
+634 320 8.33333333333333e-02
+634 321 4.16666666666667e-02
+634 318 -4.16666666666667e-02
+634 107 -4.16666666666667e-02
+634 323 4.16666666666667e-02
+634 106 -1.25000000000000e-01
+634 574 -7.50000000000000e-01
+634 105 8.33333333333333e-02
+634 633 -1.66666666666667e-01
+634 573 1.66666666666667e-01
+634 104 -4.16666666666667e-02
+634 572 8.33333333333333e-02
+634 623 4.16666666666667e-02
+634 103 -1.25000000000000e-01
+634 319 -1.25000000000000e-01
+634 102 8.33333333333333e-02
+634 570 -1.66666666666667e-01
+635 635 1.25000000000000e+00
+635 626 -3.75000000000000e-01
+635 625 8.33333333333333e-02
+635 624 8.33333333333333e-02
+635 621 -8.33333333333333e-02
+635 508 -8.33333333333333e-02
+635 511 -1.66666666666667e-01
+635 510 8.33333333333333e-02
+635 507 -8.33333333333333e-02
+635 570 8.33333333333333e-02
+635 573 -8.33333333333333e-02
+635 634 -1.66666666666667e-01
+635 574 1.66666666666667e-01
+635 319 8.33333333333333e-02
+635 107 -1.25000000000000e-01
+635 575 -2.50000000000000e-01
+635 106 -4.16666666666667e-02
+635 322 4.16666666666667e-02
+635 105 8.33333333333333e-02
+635 321 -8.33333333333333e-02
+635 622 4.16666666666667e-02
+635 104 -1.25000000000000e-01
+635 320 -3.75000000000000e-01
+635 103 -4.16666666666667e-02
+635 571 8.33333333333333e-02
+635 633 -1.66666666666667e-01
+635 102 8.33333333333333e-02
+635 318 8.33333333333333e-02
+636 636 1.25000000000000e+00
+636 556 -8.33333333333333e-02
+636 566 8.33333333333333e-02
+636 557 -8.33333333333333e-02
+636 629 -8.33333333333333e-02
+636 632 8.33333333333333e-02
+636 631 8.33333333333333e-02
+636 565 -1.66666666666667e-01
+636 630 -3.75000000000000e-01
+636 572 8.33333333333333e-02
+636 584 -8.33333333333333e-02
+636 319 8.33333333333333e-02
+636 637 -1.66666666666667e-01
+636 583 1.66666666666667e-01
+636 134 8.33333333333333e-02
+636 332 -8.33333333333333e-02
+636 133 -4.16666666666667e-02
+636 331 4.16666666666667e-02
+636 132 -1.25000000000000e-01
+636 582 -2.50000000000000e-01
+636 638 -1.66666666666667e-01
+636 104 8.33333333333333e-02
+636 320 8.33333333333333e-02
+636 103 -4.16666666666667e-02
+636 571 8.33333333333333e-02
+636 628 4.16666666666667e-02
+636 102 -1.25000000000000e-01
+636 318 -3.75000000000000e-01
+637 637 1.25000000000000e+00
+637 555 -8.33333333333333e-02
+637 629 4.16666666666667e-02
+637 557 -8.33333333333333e-02
+637 632 -4.16666666666667e-02
+637 566 8.33333333333333e-02
+637 631 -1.25000000000000e-01
+637 630 8.33333333333333e-02
+637 564 -1.66666666666667e-01
+637 320 -4.16666666666667e-02
+637 332 4.16666666666667e-02
+637 318 8.33333333333333e-02
+637 636 -1.66666666666667e-01
+637 582 1.66666666666667e-01
+637 134 8.33333333333333e-02
+637 638 -1.66666666666667e-01
+637 584 1.66666666666667e-01
+637 133 -1.25000000000000e-01
+637 583 -7.50000000000000e-01
+637 132 -4.16666666666667e-02
+637 330 4.16666666666667e-02
+637 104 8.33333333333333e-02
+637 572 -1.66666666666667e-01
+637 627 4.16666666666667e-02
+637 103 -1.25000000000000e-01
+637 319 -1.25000000000000e-01
+637 102 -4.16666666666667e-02
+637 570 8.33333333333333e-02
+638 638 1.25000000000000e+00
+638 555 -8.33333333333333e-02
+638 628 4.16666666666667e-02
+638 556 -8.33333333333333e-02
+638 627 -8.33333333333333e-02
+638 632 -1.25000000000000e-01
+638 631 -4.16666666666667e-02
+638 565 8.33333333333333e-02
+638 630 8.33333333333333e-02
+638 319 -4.16666666666667e-02
+638 331 4.16666666666667e-02
+638 570 8.33333333333333e-02
+638 582 -8.33333333333333e-02
+638 134 -3.75000000000000e-01
+638 584 -2.50000000000000e-01
+638 133 8.33333333333333e-02
+638 637 -1.66666666666667e-01
+638 583 1.66666666666667e-01
+638 132 8.33333333333333e-02
+638 330 -8.33333333333333e-02
+638 564 8.33333333333333e-02
+638 104 -3.75000000000000e-01
+638 320 -1.25000000000000e-01
+638 103 8.33333333333333e-02
+638 571 -1.66666666666667e-01
+638 636 -1.66666666666667e-01
+638 102 8.33333333333333e-02
+638 318 8.33333333333333e-02
+639 639 1.25000000000000e+00
+639 418 -8.33333333333333e-02
+639 644 8.33333333333333e-02
+639 641 -1.66666666666667e-01
+639 419 1.66666666666667e-01
+639 416 8.33333333333333e-02
+639 110 -4.16666666666667e-02
+639 643 8.33333333333333e-02
+639 642 -3.75000000000000e-01
+639 653 4.16666666666667e-02
+639 116 -4.16666666666667e-02
+639 652 -8.33333333333333e-02
+639 417 -2.50000000000000e-01
+639 398 -8.33333333333333e-02
+639 239 4.16666666666667e-02
+639 397 -8.33333333333333e-02
+639 403 8.33333333333333e-02
+639 238 -8.33333333333333e-02
+639 109 8.33333333333333e-02
+639 108 -1.25000000000000e-01
+639 245 8.33333333333333e-02
+639 404 -1.66666666666667e-01
+639 244 8.33333333333333e-02
+639 640 -1.66666666666667e-01
+639 115 8.33333333333333e-02
+639 243 -3.75000000000000e-01
+639 415 8.33333333333333e-02
+639 114 -1.25000000000000e-01
+640 640 1.25000000000000e+00
+640 417 -8.33333333333333e-02
+640 644 -4.16666666666667e-02
+640 653 4.16666666666667e-02
+640 416 -1.66666666666667e-01
+640 110 8.33333333333333e-02
+640 643 -1.25000000000000e-01
+640 642 8.33333333333333e-02
+640 419 1.66666666666667e-01
+640 641 -1.66666666666667e-01
+640 116 8.33333333333333e-02
+640 418 -2.50000000000000e-01
+640 651 -8.33333333333333e-02
+640 396 -8.33333333333333e-02
+640 402 8.33333333333333e-02
+640 239 4.16666666666667e-02
+640 398 -8.33333333333333e-02
+640 109 -3.75000000000000e-01
+640 237 -8.33333333333333e-02
+640 108 8.33333333333333e-02
+640 245 -4.16666666666667e-02
+640 404 8.33333333333333e-02
+640 244 -1.25000000000000e-01
+640 414 8.33333333333333e-02
+640 115 -3.75000000000000e-01
+640 243 8.33333333333333e-02
+640 639 -1.66666666666667e-01
+640 114 8.33333333333333e-02
+641 641 1.25000000000000e+00
+641 652 4.16666666666667e-02
+641 642 8.33333333333333e-02
+641 639 -1.66666666666667e-01
+641 417 1.66666666666667e-01
+641 644 -1.25000000000000e-01
+641 415 -1.66666666666667e-01
+641 109 8.33333333333333e-02
+641 414 8.33333333333333e-02
+641 108 -4.16666666666667e-02
+641 419 -7.50000000000000e-01
+641 418 1.66666666666667e-01
+641 640 -1.66666666666667e-01
+641 115 8.33333333333333e-02
+641 651 4.16666666666667e-02
+641 114 -4.16666666666667e-02
+641 396 -8.33333333333333e-02
+641 237 4.16666666666667e-02
+641 110 -1.25000000000000e-01
+641 238 4.16666666666667e-02
+641 397 -8.33333333333333e-02
+641 245 -1.25000000000000e-01
+641 643 -4.16666666666667e-02
+641 116 -1.25000000000000e-01
+641 244 -4.16666666666667e-02
+641 403 8.33333333333333e-02
+641 243 8.33333333333333e-02
+641 402 -1.66666666666667e-01
+642 642 1.25000000000000e+00
+642 641 8.33333333333333e-02
+642 419 -1.66666666666667e-01
+642 110 4.16666666666667e-02
+642 640 8.33333333333333e-02
+642 639 -3.75000000000000e-01
+642 122 4.16666666666667e-02
+642 653 -4.16666666666667e-02
+642 652 8.33333333333333e-02
+642 651 -1.25000000000000e-01
+642 416 -8.33333333333333e-02
+642 415 -8.33333333333333e-02
+642 248 8.33333333333333e-02
+642 254 -4.16666666666667e-02
+642 643 -1.66666666666667e-01
+642 247 8.33333333333333e-02
+642 421 -8.33333333333333e-02
+642 109 -8.33333333333333e-02
+642 253 8.33333333333333e-02
+642 252 -1.25000000000000e-01
+642 644 -1.66666666666667e-01
+642 260 8.33333333333333e-02
+642 422 1.66666666666667e-01
+642 259 8.33333333333333e-02
+642 121 -8.33333333333333e-02
+642 418 8.33333333333333e-02
+642 258 -3.75000000000000e-01
+642 420 -2.50000000000000e-01
+643 643 1.25000000000000e+00
+643 641 -4.16666666666667e-02
+643 419 8.33333333333333e-02
+643 640 -1.25000000000000e-01
+643 639 8.33333333333333e-02
+643 644 -1.66666666666667e-01
+643 653 8.33333333333333e-02
+643 652 -3.75000000000000e-01
+643 651 8.33333333333333e-02
+643 414 -8.33333333333333e-02
+643 254 8.33333333333333e-02
+643 642 -1.66666666666667e-01
+643 248 -1.66666666666667e-01
+643 422 1.66666666666667e-01
+643 246 8.33333333333333e-02
+643 420 -8.33333333333333e-02
+643 110 4.16666666666667e-02
+643 416 -8.33333333333333e-02
+643 253 -3.75000000000000e-01
+643 108 -8.33333333333333e-02
+643 252 8.33333333333333e-02
+643 260 -4.16666666666667e-02
+643 122 4.16666666666667e-02
+643 417 8.33333333333333e-02
+643 259 -1.25000000000000e-01
+643 421 -2.50000000000000e-01
+643 258 8.33333333333333e-02
+643 120 -8.33333333333333e-02
+644 644 1.25000000000000e+00
+644 418 8.33333333333333e-02
+644 639 8.33333333333333e-02
+644 417 -1.66666666666667e-01
+644 641 -1.25000000000000e-01
+644 108 4.16666666666667e-02
+644 653 -1.25000000000000e-01
+644 643 -1.66666666666667e-01
+644 652 8.33333333333333e-02
+644 120 4.16666666666667e-02
+644 651 -4.16666666666667e-02
+644 414 -8.33333333333333e-02
+644 253 8.33333333333333e-02
+644 246 8.33333333333333e-02
+644 252 -4.16666666666667e-02
+644 247 -1.66666666666667e-01
+644 421 1.66666666666667e-01
+644 254 -1.25000000000000e-01
+644 109 4.16666666666667e-02
+644 415 -8.33333333333333e-02
+644 640 -4.16666666666667e-02
+644 260 -1.25000000000000e-01
+644 422 -7.50000000000000e-01
+644 259 -4.16666666666667e-02
+644 121 4.16666666666667e-02
+644 642 -1.66666666666667e-01
+644 258 8.33333333333333e-02
+644 420 1.66666666666667e-01
+645 645 1.25000000000000e+00
+645 436 -8.33333333333333e-02
+645 650 -4.16666666666667e-02
+645 656 4.16666666666667e-02
+645 113 8.33333333333333e-02
+645 434 -1.66666666666667e-01
+645 649 8.33333333333333e-02
+645 648 -1.25000000000000e-01
+645 647 -1.66666666666667e-01
+645 437 1.66666666666667e-01
+645 116 8.33333333333333e-02
+645 655 -8.33333333333333e-02
+645 435 -2.50000000000000e-01
+645 400 -8.33333333333333e-02
+645 403 8.33333333333333e-02
+645 242 4.16666666666667e-02
+645 401 -8.33333333333333e-02
+645 112 8.33333333333333e-02
+645 241 -8.33333333333333e-02
+645 111 -3.75000000000000e-01
+645 245 -4.16666666666667e-02
+645 404 8.33333333333333e-02
+645 646 -1.66666666666667e-01
+645 244 8.33333333333333e-02
+645 115 8.33333333333333e-02
+645 433 8.33333333333333e-02
+645 243 -1.25000000000000e-01
+645 114 -3.75000000000000e-01
+646 646 1.25000000000000e+00
+646 435 -8.33333333333333e-02
+646 647 -1.66666666666667e-01
+646 650 8.33333333333333e-02
+646 437 1.66666666666667e-01
+646 113 -4.16666666666667e-02
+646 434 8.33333333333333e-02
+646 649 -3.75000000000000e-01
+646 648 8.33333333333333e-02
+646 656 4.16666666666667e-02
+646 116 -4.16666666666667e-02
+646 436 -2.50000000000000e-01
+646 654 -8.33333333333333e-02
+646 242 4.16666666666667e-02
+646 401 -8.33333333333333e-02
+646 399 -8.33333333333333e-02
+646 402 8.33333333333333e-02
+646 112 -1.25000000000000e-01
+646 111 8.33333333333333e-02
+646 240 -8.33333333333333e-02
+646 245 8.33333333333333e-02
+646 404 -1.66666666666667e-01
+646 432 8.33333333333333e-02
+646 244 -3.75000000000000e-01
+646 115 -1.25000000000000e-01
+646 645 -1.66666666666667e-01
+646 243 8.33333333333333e-02
+646 114 8.33333333333333e-02
+647 647 1.25000000000000e+00
+647 649 8.33333333333333e-02
+647 436 1.66666666666667e-01
+647 648 -4.16666666666667e-02
+647 654 4.16666666666667e-02
+647 650 -1.25000000000000e-01
+647 112 -4.16666666666667e-02
+647 433 8.33333333333333e-02
+647 111 8.33333333333333e-02
+647 432 -1.66666666666667e-01
+647 437 -7.50000000000000e-01
+647 655 4.16666666666667e-02
+647 115 -4.16666666666667e-02
+647 645 -1.66666666666667e-01
+647 435 1.66666666666667e-01
+647 114 8.33333333333333e-02
+647 241 4.16666666666667e-02
+647 400 -8.33333333333333e-02
+647 113 -1.25000000000000e-01
+647 240 4.16666666666667e-02
+647 399 -8.33333333333333e-02
+647 646 -1.66666666666667e-01
+647 245 -1.25000000000000e-01
+647 116 -1.25000000000000e-01
+647 244 8.33333333333333e-02
+647 403 -1.66666666666667e-01
+647 243 -4.16666666666667e-02
+647 402 8.33333333333333e-02
+648 648 1.25000000000000e+00
+648 647 -4.16666666666667e-02
+648 437 8.33333333333333e-02
+648 646 8.33333333333333e-02
+648 645 -1.25000000000000e-01
+648 650 -1.66666666666667e-01
+648 656 8.33333333333333e-02
+648 655 8.33333333333333e-02
+648 654 -3.75000000000000e-01
+648 433 -8.33333333333333e-02
+648 284 8.33333333333333e-02
+648 649 -1.66666666666667e-01
+648 278 -1.66666666666667e-01
+648 440 1.66666666666667e-01
+648 277 8.33333333333333e-02
+648 439 -8.33333333333333e-02
+648 113 4.16666666666667e-02
+648 434 -8.33333333333333e-02
+648 283 8.33333333333333e-02
+648 112 -8.33333333333333e-02
+648 282 -3.75000000000000e-01
+648 287 -4.16666666666667e-02
+648 131 4.16666666666667e-02
+648 286 8.33333333333333e-02
+648 130 -8.33333333333333e-02
+648 285 -1.25000000000000e-01
+648 436 8.33333333333333e-02
+648 438 -2.50000000000000e-01
+649 649 1.25000000000000e+00
+649 647 8.33333333333333e-02
+649 437 -1.66666666666667e-01
+649 113 4.16666666666667e-02
+649 646 -3.75000000000000e-01
+649 645 8.33333333333333e-02
+649 131 4.16666666666667e-02
+649 656 -4.16666666666667e-02
+649 655 -1.25000000000000e-01
+649 654 8.33333333333333e-02
+649 434 -8.33333333333333e-02
+649 432 -8.33333333333333e-02
+649 284 -4.16666666666667e-02
+649 278 8.33333333333333e-02
+649 648 -1.66666666666667e-01
+649 276 8.33333333333333e-02
+649 438 -8.33333333333333e-02
+649 283 -1.25000000000000e-01
+649 282 8.33333333333333e-02
+649 111 -8.33333333333333e-02
+649 287 8.33333333333333e-02
+649 650 -1.66666666666667e-01
+649 440 1.66666666666667e-01
+649 286 -3.75000000000000e-01
+649 435 8.33333333333333e-02
+649 439 -2.50000000000000e-01
+649 285 8.33333333333333e-02
+649 129 -8.33333333333333e-02
+650 650 1.25000000000000e+00
+650 436 -1.66666666666667e-01
+650 645 -4.16666666666667e-02
+650 435 8.33333333333333e-02
+650 647 -1.25000000000000e-01
+650 112 4.16666666666667e-02
+650 656 -1.25000000000000e-01
+650 130 4.16666666666667e-02
+650 655 -4.16666666666667e-02
+650 648 -1.66666666666667e-01
+650 654 8.33333333333333e-02
+650 433 -8.33333333333333e-02
+650 283 -4.16666666666667e-02
+650 277 8.33333333333333e-02
+650 282 8.33333333333333e-02
+650 276 -1.66666666666667e-01
+650 438 1.66666666666667e-01
+650 284 -1.25000000000000e-01
+650 111 4.16666666666667e-02
+650 432 -8.33333333333333e-02
+650 287 -1.25000000000000e-01
+650 646 8.33333333333333e-02
+650 440 -7.50000000000000e-01
+650 286 8.33333333333333e-02
+650 649 -1.66666666666667e-01
+650 439 1.66666666666667e-01
+650 285 -4.16666666666667e-02
+650 129 4.16666666666667e-02
+651 651 1.25000000000000e+00
+651 643 8.33333333333333e-02
+651 642 -1.25000000000000e-01
+651 641 4.16666666666667e-02
+651 640 -8.33333333333333e-02
+651 422 8.33333333333333e-02
+651 419 -8.33333333333333e-02
+651 421 8.33333333333333e-02
+651 418 -8.33333333333333e-02
+651 454 -8.33333333333333e-02
+651 451 8.33333333333333e-02
+651 305 4.16666666666667e-02
+651 302 -4.16666666666667e-02
+651 116 8.33333333333333e-02
+651 452 -1.66666666666667e-01
+651 115 8.33333333333333e-02
+651 652 -1.66666666666667e-01
+651 301 8.33333333333333e-02
+651 114 -3.75000000000000e-01
+651 300 -1.25000000000000e-01
+651 653 -1.66666666666667e-01
+651 122 8.33333333333333e-02
+651 455 1.66666666666667e-01
+651 121 8.33333333333333e-02
+651 304 -8.33333333333333e-02
+651 644 -4.16666666666667e-02
+651 120 -3.75000000000000e-01
+651 453 -2.50000000000000e-01
+652 652 1.25000000000000e+00
+652 644 8.33333333333333e-02
+652 643 -3.75000000000000e-01
+652 642 8.33333333333333e-02
+652 639 -8.33333333333333e-02
+652 419 -8.33333333333333e-02
+652 422 -1.66666666666667e-01
+652 420 8.33333333333333e-02
+652 417 -8.33333333333333e-02
+652 453 -8.33333333333333e-02
+652 450 8.33333333333333e-02
+652 455 1.66666666666667e-01
+652 653 -1.66666666666667e-01
+652 302 8.33333333333333e-02
+652 116 -4.16666666666667e-02
+652 452 8.33333333333333e-02
+652 115 -1.25000000000000e-01
+652 301 -3.75000000000000e-01
+652 114 8.33333333333333e-02
+652 651 -1.66666666666667e-01
+652 300 8.33333333333333e-02
+652 122 -4.16666666666667e-02
+652 305 4.16666666666667e-02
+652 641 4.16666666666667e-02
+652 121 -1.25000000000000e-01
+652 454 -2.50000000000000e-01
+652 120 8.33333333333333e-02
+652 303 -8.33333333333333e-02
+653 653 1.25000000000000e+00
+653 644 -1.25000000000000e-01
+653 643 8.33333333333333e-02
+653 642 -4.16666666666667e-02
+653 639 4.16666666666667e-02
+653 420 8.33333333333333e-02
+653 417 -8.33333333333333e-02
+653 418 -8.33333333333333e-02
+653 421 -1.66666666666667e-01
+653 454 1.66666666666667e-01
+653 652 -1.66666666666667e-01
+653 301 8.33333333333333e-02
+653 303 4.16666666666667e-02
+653 300 -4.16666666666667e-02
+653 116 -1.25000000000000e-01
+653 302 -1.25000000000000e-01
+653 115 -4.16666666666667e-02
+653 451 8.33333333333333e-02
+653 114 8.33333333333333e-02
+653 450 -1.66666666666667e-01
+653 640 4.16666666666667e-02
+653 122 -1.25000000000000e-01
+653 455 -7.50000000000000e-01
+653 121 -4.16666666666667e-02
+653 304 4.16666666666667e-02
+653 651 -1.66666666666667e-01
+653 120 8.33333333333333e-02
+653 453 1.66666666666667e-01
+654 654 1.25000000000000e+00
+654 650 8.33333333333333e-02
+654 649 8.33333333333333e-02
+654 648 -3.75000000000000e-01
+654 646 -8.33333333333333e-02
+654 437 -8.33333333333333e-02
+654 440 -1.66666666666667e-01
+654 439 8.33333333333333e-02
+654 436 -8.33333333333333e-02
+654 451 8.33333333333333e-02
+654 457 -8.33333333333333e-02
+654 656 -1.66666666666667e-01
+654 458 1.66666666666667e-01
+654 302 8.33333333333333e-02
+654 131 -4.16666666666667e-02
+654 308 4.16666666666667e-02
+654 130 8.33333333333333e-02
+654 307 -8.33333333333333e-02
+654 129 -1.25000000000000e-01
+654 456 -2.50000000000000e-01
+654 116 -4.16666666666667e-02
+654 452 8.33333333333333e-02
+654 655 -1.66666666666667e-01
+654 115 8.33333333333333e-02
+654 301 8.33333333333333e-02
+654 647 4.16666666666667e-02
+654 114 -1.25000000000000e-01
+654 300 -3.75000000000000e-01
+655 655 1.25000000000000e+00
+655 649 -1.25000000000000e-01
+655 648 8.33333333333333e-02
+655 647 4.16666666666667e-02
+655 645 -8.33333333333333e-02
+655 440 8.33333333333333e-02
+655 437 -8.33333333333333e-02
+655 438 8.33333333333333e-02
+655 435 -8.33333333333333e-02
+655 450 8.33333333333333e-02
+655 456 -8.33333333333333e-02
+655 308 4.16666666666667e-02
+655 302 -4.16666666666667e-02
+655 131 8.33333333333333e-02
+655 656 -1.66666666666667e-01
+655 458 1.66666666666667e-01
+655 130 -3.75000000000000e-01
+655 457 -2.50000000000000e-01
+655 129 8.33333333333333e-02
+655 306 -8.33333333333333e-02
+655 116 8.33333333333333e-02
+655 452 -1.66666666666667e-01
+655 650 -4.16666666666667e-02
+655 115 -3.75000000000000e-01
+655 301 -1.25000000000000e-01
+655 654 -1.66666666666667e-01
+655 114 8.33333333333333e-02
+655 300 8.33333333333333e-02
+656 656 1.25000000000000e+00
+656 650 -1.25000000000000e-01
+656 649 -4.16666666666667e-02
+656 648 8.33333333333333e-02
+656 646 4.16666666666667e-02
+656 439 8.33333333333333e-02
+656 436 -8.33333333333333e-02
+656 435 -8.33333333333333e-02
+656 438 -1.66666666666667e-01
+656 307 4.16666666666667e-02
+656 301 -4.16666666666667e-02
+656 654 -1.66666666666667e-01
+656 456 1.66666666666667e-01
+656 300 8.33333333333333e-02
+656 131 -1.25000000000000e-01
+656 458 -7.50000000000000e-01
+656 130 8.33333333333333e-02
+656 655 -1.66666666666667e-01
+656 457 1.66666666666667e-01
+656 129 -4.16666666666667e-02
+656 306 4.16666666666667e-02
+656 645 4.16666666666667e-02
+656 116 -1.25000000000000e-01
+656 302 -1.25000000000000e-01
+656 115 8.33333333333333e-02
+656 451 -1.66666666666667e-01
+656 114 -4.16666666666667e-02
+656 450 8.33333333333333e-02
+657 657 1.25000000000000e+00
+657 544 -8.33333333333333e-02
+657 662 8.33333333333333e-02
+657 659 -1.66666666666667e-01
+657 545 1.66666666666667e-01
+657 542 8.33333333333333e-02
+657 119 -4.16666666666667e-02
+657 661 8.33333333333333e-02
+657 660 -3.75000000000000e-01
+657 671 4.16666666666667e-02
+657 125 -4.16666666666667e-02
+657 670 -8.33333333333333e-02
+657 543 -2.50000000000000e-01
+657 524 -8.33333333333333e-02
+657 257 4.16666666666667e-02
+657 523 -8.33333333333333e-02
+657 529 8.33333333333333e-02
+657 256 -8.33333333333333e-02
+657 118 8.33333333333333e-02
+657 117 -1.25000000000000e-01
+657 263 8.33333333333333e-02
+657 530 -1.66666666666667e-01
+657 262 8.33333333333333e-02
+657 658 -1.66666666666667e-01
+657 124 8.33333333333333e-02
+657 261 -3.75000000000000e-01
+657 541 8.33333333333333e-02
+657 123 -1.25000000000000e-01
+658 658 1.25000000000000e+00
+658 543 -8.33333333333333e-02
+658 662 -4.16666666666667e-02
+658 671 4.16666666666667e-02
+658 542 -1.66666666666667e-01
+658 119 8.33333333333333e-02
+658 661 -1.25000000000000e-01
+658 660 8.33333333333333e-02
+658 545 1.66666666666667e-01
+658 659 -1.66666666666667e-01
+658 125 8.33333333333333e-02
+658 544 -2.50000000000000e-01
+658 669 -8.33333333333333e-02
+658 522 -8.33333333333333e-02
+658 528 8.33333333333333e-02
+658 257 4.16666666666667e-02
+658 524 -8.33333333333333e-02
+658 118 -3.75000000000000e-01
+658 255 -8.33333333333333e-02
+658 117 8.33333333333333e-02
+658 263 -4.16666666666667e-02
+658 530 8.33333333333333e-02
+658 262 -1.25000000000000e-01
+658 540 8.33333333333333e-02
+658 124 -3.75000000000000e-01
+658 261 8.33333333333333e-02
+658 657 -1.66666666666667e-01
+658 123 8.33333333333333e-02
+659 659 1.25000000000000e+00
+659 670 4.16666666666667e-02
+659 660 8.33333333333333e-02
+659 657 -1.66666666666667e-01
+659 543 1.66666666666667e-01
+659 662 -1.25000000000000e-01
+659 541 -1.66666666666667e-01
+659 118 8.33333333333333e-02
+659 540 8.33333333333333e-02
+659 117 -4.16666666666667e-02
+659 545 -7.50000000000000e-01
+659 544 1.66666666666667e-01
+659 658 -1.66666666666667e-01
+659 124 8.33333333333333e-02
+659 669 4.16666666666667e-02
+659 123 -4.16666666666667e-02
+659 522 -8.33333333333333e-02
+659 255 4.16666666666667e-02
+659 119 -1.25000000000000e-01
+659 256 4.16666666666667e-02
+659 523 -8.33333333333333e-02
+659 263 -1.25000000000000e-01
+659 661 -4.16666666666667e-02
+659 125 -1.25000000000000e-01
+659 262 -4.16666666666667e-02
+659 529 8.33333333333333e-02
+659 261 8.33333333333333e-02
+659 528 -1.66666666666667e-01
+660 660 1.25000000000000e+00
+660 659 8.33333333333333e-02
+660 545 -1.66666666666667e-01
+660 119 4.16666666666667e-02
+660 658 8.33333333333333e-02
+660 657 -3.75000000000000e-01
+660 128 4.16666666666667e-02
+660 671 -4.16666666666667e-02
+660 670 8.33333333333333e-02
+660 669 -1.25000000000000e-01
+660 542 -8.33333333333333e-02
+660 541 -8.33333333333333e-02
+660 266 8.33333333333333e-02
+660 272 -4.16666666666667e-02
+660 661 -1.66666666666667e-01
+660 265 8.33333333333333e-02
+660 547 -8.33333333333333e-02
+660 118 -8.33333333333333e-02
+660 271 8.33333333333333e-02
+660 270 -1.25000000000000e-01
+660 662 -1.66666666666667e-01
+660 275 8.33333333333333e-02
+660 548 1.66666666666667e-01
+660 274 8.33333333333333e-02
+660 127 -8.33333333333333e-02
+660 544 8.33333333333333e-02
+660 273 -3.75000000000000e-01
+660 546 -2.50000000000000e-01
+661 661 1.25000000000000e+00
+661 659 -4.16666666666667e-02
+661 545 8.33333333333333e-02
+661 658 -1.25000000000000e-01
+661 657 8.33333333333333e-02
+661 662 -1.66666666666667e-01
+661 671 8.33333333333333e-02
+661 670 -3.75000000000000e-01
+661 669 8.33333333333333e-02
+661 540 -8.33333333333333e-02
+661 272 8.33333333333333e-02
+661 660 -1.66666666666667e-01
+661 266 -1.66666666666667e-01
+661 548 1.66666666666667e-01
+661 264 8.33333333333333e-02
+661 546 -8.33333333333333e-02
+661 119 4.16666666666667e-02
+661 542 -8.33333333333333e-02
+661 271 -3.75000000000000e-01
+661 117 -8.33333333333333e-02
+661 270 8.33333333333333e-02
+661 275 -4.16666666666667e-02
+661 128 4.16666666666667e-02
+661 543 8.33333333333333e-02
+661 274 -1.25000000000000e-01
+661 547 -2.50000000000000e-01
+661 273 8.33333333333333e-02
+661 126 -8.33333333333333e-02
+662 662 1.25000000000000e+00
+662 544 8.33333333333333e-02
+662 657 8.33333333333333e-02
+662 543 -1.66666666666667e-01
+662 659 -1.25000000000000e-01
+662 117 4.16666666666667e-02
+662 671 -1.25000000000000e-01
+662 661 -1.66666666666667e-01
+662 670 8.33333333333333e-02
+662 126 4.16666666666667e-02
+662 669 -4.16666666666667e-02
+662 540 -8.33333333333333e-02
+662 271 8.33333333333333e-02
+662 264 8.33333333333333e-02
+662 270 -4.16666666666667e-02
+662 265 -1.66666666666667e-01
+662 547 1.66666666666667e-01
+662 272 -1.25000000000000e-01
+662 118 4.16666666666667e-02
+662 541 -8.33333333333333e-02
+662 658 -4.16666666666667e-02
+662 275 -1.25000000000000e-01
+662 548 -7.50000000000000e-01
+662 274 -4.16666666666667e-02
+662 127 4.16666666666667e-02
+662 660 -1.66666666666667e-01
+662 273 8.33333333333333e-02
+662 546 1.66666666666667e-01
+663 663 1.25000000000000e+00
+663 562 -8.33333333333333e-02
+663 668 -4.16666666666667e-02
+663 674 4.16666666666667e-02
+663 122 8.33333333333333e-02
+663 560 -1.66666666666667e-01
+663 667 8.33333333333333e-02
+663 666 -1.25000000000000e-01
+663 665 -1.66666666666667e-01
+663 563 1.66666666666667e-01
+663 125 8.33333333333333e-02
+663 673 -8.33333333333333e-02
+663 561 -2.50000000000000e-01
+663 526 -8.33333333333333e-02
+663 529 8.33333333333333e-02
+663 260 4.16666666666667e-02
+663 527 -8.33333333333333e-02
+663 121 8.33333333333333e-02
+663 259 -8.33333333333333e-02
+663 120 -3.75000000000000e-01
+663 263 -4.16666666666667e-02
+663 530 8.33333333333333e-02
+663 664 -1.66666666666667e-01
+663 262 8.33333333333333e-02
+663 124 8.33333333333333e-02
+663 559 8.33333333333333e-02
+663 261 -1.25000000000000e-01
+663 123 -3.75000000000000e-01
+664 664 1.25000000000000e+00
+664 561 -8.33333333333333e-02
+664 665 -1.66666666666667e-01
+664 668 8.33333333333333e-02
+664 563 1.66666666666667e-01
+664 122 -4.16666666666667e-02
+664 560 8.33333333333333e-02
+664 667 -3.75000000000000e-01
+664 666 8.33333333333333e-02
+664 674 4.16666666666667e-02
+664 125 -4.16666666666667e-02
+664 562 -2.50000000000000e-01
+664 672 -8.33333333333333e-02
+664 260 4.16666666666667e-02
+664 527 -8.33333333333333e-02
+664 525 -8.33333333333333e-02
+664 528 8.33333333333333e-02
+664 121 -1.25000000000000e-01
+664 120 8.33333333333333e-02
+664 258 -8.33333333333333e-02
+664 263 8.33333333333333e-02
+664 530 -1.66666666666667e-01
+664 558 8.33333333333333e-02
+664 262 -3.75000000000000e-01
+664 124 -1.25000000000000e-01
+664 663 -1.66666666666667e-01
+664 261 8.33333333333333e-02
+664 123 8.33333333333333e-02
+665 665 1.25000000000000e+00
+665 667 8.33333333333333e-02
+665 562 1.66666666666667e-01
+665 666 -4.16666666666667e-02
+665 672 4.16666666666667e-02
+665 668 -1.25000000000000e-01
+665 121 -4.16666666666667e-02
+665 559 8.33333333333333e-02
+665 120 8.33333333333333e-02
+665 558 -1.66666666666667e-01
+665 563 -7.50000000000000e-01
+665 673 4.16666666666667e-02
+665 124 -4.16666666666667e-02
+665 663 -1.66666666666667e-01
+665 561 1.66666666666667e-01
+665 123 8.33333333333333e-02
+665 259 4.16666666666667e-02
+665 526 -8.33333333333333e-02
+665 122 -1.25000000000000e-01
+665 258 4.16666666666667e-02
+665 525 -8.33333333333333e-02
+665 664 -1.66666666666667e-01
+665 263 -1.25000000000000e-01
+665 125 -1.25000000000000e-01
+665 262 8.33333333333333e-02
+665 529 -1.66666666666667e-01
+665 261 -4.16666666666667e-02
+665 528 8.33333333333333e-02
+666 666 1.25000000000000e+00
+666 665 -4.16666666666667e-02
+666 563 8.33333333333333e-02
+666 664 8.33333333333333e-02
+666 663 -1.25000000000000e-01
+666 668 -1.66666666666667e-01
+666 674 8.33333333333333e-02
+666 673 8.33333333333333e-02
+666 672 -3.75000000000000e-01
+666 559 -8.33333333333333e-02
+666 305 8.33333333333333e-02
+666 667 -1.66666666666667e-01
+666 293 -1.66666666666667e-01
+666 566 1.66666666666667e-01
+666 292 8.33333333333333e-02
+666 565 -8.33333333333333e-02
+666 122 4.16666666666667e-02
+666 560 -8.33333333333333e-02
+666 304 8.33333333333333e-02
+666 121 -8.33333333333333e-02
+666 303 -3.75000000000000e-01
+666 311 -4.16666666666667e-02
+666 134 4.16666666666667e-02
+666 310 8.33333333333333e-02
+666 133 -8.33333333333333e-02
+666 309 -1.25000000000000e-01
+666 562 8.33333333333333e-02
+666 564 -2.50000000000000e-01
+667 667 1.25000000000000e+00
+667 665 8.33333333333333e-02
+667 563 -1.66666666666667e-01
+667 122 4.16666666666667e-02
+667 664 -3.75000000000000e-01
+667 663 8.33333333333333e-02
+667 134 4.16666666666667e-02
+667 674 -4.16666666666667e-02
+667 673 -1.25000000000000e-01
+667 672 8.33333333333333e-02
+667 560 -8.33333333333333e-02
+667 558 -8.33333333333333e-02
+667 305 -4.16666666666667e-02
+667 293 8.33333333333333e-02
+667 666 -1.66666666666667e-01
+667 291 8.33333333333333e-02
+667 564 -8.33333333333333e-02
+667 304 -1.25000000000000e-01
+667 303 8.33333333333333e-02
+667 120 -8.33333333333333e-02
+667 311 8.33333333333333e-02
+667 668 -1.66666666666667e-01
+667 566 1.66666666666667e-01
+667 310 -3.75000000000000e-01
+667 561 8.33333333333333e-02
+667 565 -2.50000000000000e-01
+667 309 8.33333333333333e-02
+667 132 -8.33333333333333e-02
+668 668 1.25000000000000e+00
+668 562 -1.66666666666667e-01
+668 663 -4.16666666666667e-02
+668 561 8.33333333333333e-02
+668 665 -1.25000000000000e-01
+668 121 4.16666666666667e-02
+668 674 -1.25000000000000e-01
+668 133 4.16666666666667e-02
+668 673 -4.16666666666667e-02
+668 666 -1.66666666666667e-01
+668 672 8.33333333333333e-02
+668 559 -8.33333333333333e-02
+668 304 -4.16666666666667e-02
+668 292 8.33333333333333e-02
+668 303 8.33333333333333e-02
+668 291 -1.66666666666667e-01
+668 564 1.66666666666667e-01
+668 305 -1.25000000000000e-01
+668 120 4.16666666666667e-02
+668 558 -8.33333333333333e-02
+668 311 -1.25000000000000e-01
+668 664 8.33333333333333e-02
+668 566 -7.50000000000000e-01
+668 310 8.33333333333333e-02
+668 667 -1.66666666666667e-01
+668 565 1.66666666666667e-01
+668 309 -4.16666666666667e-02
+668 132 4.16666666666667e-02
+669 669 1.25000000000000e+00
+669 661 8.33333333333333e-02
+669 660 -1.25000000000000e-01
+669 659 4.16666666666667e-02
+669 658 -8.33333333333333e-02
+669 548 8.33333333333333e-02
+669 545 -8.33333333333333e-02
+669 547 8.33333333333333e-02
+669 544 -8.33333333333333e-02
+669 580 -8.33333333333333e-02
+669 577 8.33333333333333e-02
+669 329 4.16666666666667e-02
+669 326 -4.16666666666667e-02
+669 125 8.33333333333333e-02
+669 578 -1.66666666666667e-01
+669 124 8.33333333333333e-02
+669 670 -1.66666666666667e-01
+669 325 8.33333333333333e-02
+669 123 -3.75000000000000e-01
+669 324 -1.25000000000000e-01
+669 671 -1.66666666666667e-01
+669 128 8.33333333333333e-02
+669 581 1.66666666666667e-01
+669 127 8.33333333333333e-02
+669 328 -8.33333333333333e-02
+669 662 -4.16666666666667e-02
+669 126 -3.75000000000000e-01
+669 579 -2.50000000000000e-01
+670 670 1.25000000000000e+00
+670 662 8.33333333333333e-02
+670 661 -3.75000000000000e-01
+670 660 8.33333333333333e-02
+670 657 -8.33333333333333e-02
+670 545 -8.33333333333333e-02
+670 548 -1.66666666666667e-01
+670 546 8.33333333333333e-02
+670 543 -8.33333333333333e-02
+670 579 -8.33333333333333e-02
+670 576 8.33333333333333e-02
+670 581 1.66666666666667e-01
+670 671 -1.66666666666667e-01
+670 326 8.33333333333333e-02
+670 125 -4.16666666666667e-02
+670 578 8.33333333333333e-02
+670 124 -1.25000000000000e-01
+670 325 -3.75000000000000e-01
+670 123 8.33333333333333e-02
+670 669 -1.66666666666667e-01
+670 324 8.33333333333333e-02
+670 128 -4.16666666666667e-02
+670 329 4.16666666666667e-02
+670 659 4.16666666666667e-02
+670 127 -1.25000000000000e-01
+670 580 -2.50000000000000e-01
+670 126 8.33333333333333e-02
+670 327 -8.33333333333333e-02
+671 671 1.25000000000000e+00
+671 662 -1.25000000000000e-01
+671 661 8.33333333333333e-02
+671 660 -4.16666666666667e-02
+671 657 4.16666666666667e-02
+671 546 8.33333333333333e-02
+671 543 -8.33333333333333e-02
+671 544 -8.33333333333333e-02
+671 547 -1.66666666666667e-01
+671 580 1.66666666666667e-01
+671 670 -1.66666666666667e-01
+671 325 8.33333333333333e-02
+671 327 4.16666666666667e-02
+671 324 -4.16666666666667e-02
+671 125 -1.25000000000000e-01
+671 326 -1.25000000000000e-01
+671 124 -4.16666666666667e-02
+671 577 8.33333333333333e-02
+671 123 8.33333333333333e-02
+671 576 -1.66666666666667e-01
+671 658 4.16666666666667e-02
+671 128 -1.25000000000000e-01
+671 581 -7.50000000000000e-01
+671 127 -4.16666666666667e-02
+671 328 4.16666666666667e-02
+671 669 -1.66666666666667e-01
+671 126 8.33333333333333e-02
+671 579 1.66666666666667e-01
+672 672 1.25000000000000e+00
+672 668 8.33333333333333e-02
+672 667 8.33333333333333e-02
+672 666 -3.75000000000000e-01
+672 664 -8.33333333333333e-02
+672 563 -8.33333333333333e-02
+672 566 -1.66666666666667e-01
+672 565 8.33333333333333e-02
+672 562 -8.33333333333333e-02
+672 577 8.33333333333333e-02
+672 583 -8.33333333333333e-02
+672 674 -1.66666666666667e-01
+672 584 1.66666666666667e-01
+672 326 8.33333333333333e-02
+672 134 -4.16666666666667e-02
+672 332 4.16666666666667e-02
+672 133 8.33333333333333e-02
+672 331 -8.33333333333333e-02
+672 132 -1.25000000000000e-01
+672 582 -2.50000000000000e-01
+672 125 -4.16666666666667e-02
+672 578 8.33333333333333e-02
+672 673 -1.66666666666667e-01
+672 124 8.33333333333333e-02
+672 325 8.33333333333333e-02
+672 665 4.16666666666667e-02
+672 123 -1.25000000000000e-01
+672 324 -3.75000000000000e-01
+673 673 1.25000000000000e+00
+673 667 -1.25000000000000e-01
+673 666 8.33333333333333e-02
+673 665 4.16666666666667e-02
+673 663 -8.33333333333333e-02
+673 566 8.33333333333333e-02
+673 563 -8.33333333333333e-02
+673 564 8.33333333333333e-02
+673 561 -8.33333333333333e-02
+673 576 8.33333333333333e-02
+673 582 -8.33333333333333e-02
+673 332 4.16666666666667e-02
+673 326 -4.16666666666667e-02
+673 134 8.33333333333333e-02
+673 674 -1.66666666666667e-01
+673 584 1.66666666666667e-01
+673 133 -3.75000000000000e-01
+673 583 -2.50000000000000e-01
+673 132 8.33333333333333e-02
+673 330 -8.33333333333333e-02
+673 125 8.33333333333333e-02
+673 578 -1.66666666666667e-01
+673 668 -4.16666666666667e-02
+673 124 -3.75000000000000e-01
+673 325 -1.25000000000000e-01
+673 672 -1.66666666666667e-01
+673 123 8.33333333333333e-02
+673 324 8.33333333333333e-02
+674 674 1.25000000000000e+00
+674 668 -1.25000000000000e-01
+674 667 -4.16666666666667e-02
+674 666 8.33333333333333e-02
+674 664 4.16666666666667e-02
+674 565 8.33333333333333e-02
+674 562 -8.33333333333333e-02
+674 561 -8.33333333333333e-02
+674 564 -1.66666666666667e-01
+674 331 4.16666666666667e-02
+674 325 -4.16666666666667e-02
+674 672 -1.66666666666667e-01
+674 582 1.66666666666667e-01
+674 324 8.33333333333333e-02
+674 134 -1.25000000000000e-01
+674 584 -7.50000000000000e-01
+674 133 8.33333333333333e-02
+674 673 -1.66666666666667e-01
+674 583 1.66666666666667e-01
+674 132 -4.16666666666667e-02
+674 330 4.16666666666667e-02
+674 663 4.16666666666667e-02
+674 125 -1.25000000000000e-01
+674 326 -1.25000000000000e-01
+674 124 8.33333333333333e-02
+674 577 -1.66666666666667e-01
+674 123 -4.16666666666667e-02
+674 576 8.33333333333333e-02
diff --git a/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/A.IJ.00001 b/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/A.IJ.00001
new file mode 100644
index 00000000..60a6775b
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/A.IJ.00001
@@ -0,0 +1,17368 @@
+675 1274 675 1274
+675 675 7.50000000000000e-01
+675 818 -8.33333333333333e-02
+675 799 4.16666666666667e-02
+675 805 -8.33333333333333e-02
+675 800 4.16666666666667e-02
+675 811 4.16666666666667e-02
+675 817 -8.33333333333333e-02
+675 798 -2.50000000000000e-01
+675 812 -8.33333333333333e-02
+675 803 -4.16666666666667e-02
+675 815 8.33333333333333e-02
+675 676 -8.33333333333333e-02
+675 802 8.33333333333333e-02
+675 796 4.16666666666667e-02
+675 801 -1.25000000000000e-01
+675 677 -8.33333333333333e-02
+675 809 8.33333333333333e-02
+675 797 4.16666666666667e-02
+675 808 -4.16666666666667e-02
+675 814 8.33333333333333e-02
+675 806 4.16666666666667e-02
+675 807 -1.25000000000000e-01
+675 795 -2.50000000000000e-01
+676 676 6.66666666666667e-01
+676 798 4.16666666666667e-02
+676 804 -8.33333333333333e-02
+676 799 -8.33333333333333e-02
+676 810 4.16666666666667e-02
+676 816 -8.33333333333333e-02
+676 812 4.16666666666667e-02
+676 818 -8.33333333333333e-02
+676 803 8.33333333333333e-02
+676 802 -3.75000000000000e-01
+676 675 -8.33333333333333e-02
+676 801 8.33333333333333e-02
+676 795 4.16666666666667e-02
+676 809 8.33333333333333e-02
+676 815 -1.66666666666667e-01
+676 806 4.16666666666667e-02
+676 808 -1.25000000000000e-01
+676 796 -8.33333333333333e-02
+676 807 -4.16666666666667e-02
+676 813 8.33333333333333e-02
+677 677 6.66666666666667e-01
+677 804 4.16666666666667e-02
+677 816 -8.33333333333333e-02
+677 800 -8.33333333333333e-02
+677 798 4.16666666666667e-02
+677 811 4.16666666666667e-02
+677 817 -8.33333333333333e-02
+677 810 -8.33333333333333e-02
+677 803 -1.25000000000000e-01
+677 802 8.33333333333333e-02
+677 801 -4.16666666666667e-02
+677 813 8.33333333333333e-02
+677 805 4.16666666666667e-02
+677 809 -3.75000000000000e-01
+677 797 -8.33333333333333e-02
+677 808 8.33333333333333e-02
+677 814 -1.66666666666667e-01
+677 675 -8.33333333333333e-02
+677 807 8.33333333333333e-02
+677 795 4.16666666666667e-02
+678 678 3.33333333333333e-01
+678 830 4.16666666666667e-02
+678 679 -8.33333333333333e-02
+678 823 4.16666666666667e-02
+678 820 4.16666666666667e-02
+678 822 -4.16666666666667e-02
+678 680 -8.33333333333333e-02
+678 827 4.16666666666667e-02
+678 821 4.16666666666667e-02
+678 826 -4.16666666666667e-02
+678 829 4.16666666666667e-02
+678 824 -4.16666666666667e-02
+678 825 -4.16666666666667e-02
+678 819 -2.50000000000000e-01
+679 679 2.50000000000000e-01
+679 823 -1.25000000000000e-01
+679 678 -8.33333333333333e-02
+679 822 4.16666666666667e-02
+679 819 4.16666666666667e-02
+679 827 4.16666666666667e-02
+679 830 -8.33333333333333e-02
+679 824 4.16666666666667e-02
+679 826 -4.16666666666667e-02
+679 820 -8.33333333333333e-02
+679 825 -4.16666666666667e-02
+679 828 4.16666666666667e-02
+680 680 2.50000000000000e-01
+680 823 4.16666666666667e-02
+680 822 -4.16666666666667e-02
+680 828 4.16666666666667e-02
+680 824 -4.16666666666667e-02
+680 827 -1.25000000000000e-01
+680 821 -8.33333333333333e-02
+680 826 4.16666666666667e-02
+680 829 -8.33333333333333e-02
+680 678 -8.33333333333333e-02
+680 825 4.16666666666667e-02
+680 819 4.16666666666667e-02
+681 681 5.00000000000000e-01
+681 847 4.16666666666667e-02
+681 682 -8.33333333333333e-02
+681 846 -1.25000000000000e-01
+681 854 -8.33333333333333e-02
+681 850 -4.16666666666667e-02
+681 853 4.16666666666667e-02
+681 683 -8.33333333333333e-02
+681 845 4.16666666666667e-02
+681 851 8.33333333333333e-02
+681 844 4.16666666666667e-02
+681 843 -1.25000000000000e-01
+681 842 -4.16666666666667e-02
+681 839 4.16666666666667e-02
+681 841 8.33333333333333e-02
+681 838 -8.33333333333333e-02
+681 840 -1.25000000000000e-01
+681 848 4.16666666666667e-02
+681 849 -1.25000000000000e-01
+682 682 5.83333333333333e-01
+682 854 4.16666666666667e-02
+682 847 -4.16666666666667e-02
+682 846 4.16666666666667e-02
+682 681 -8.33333333333333e-02
+682 849 -4.16666666666667e-02
+682 852 4.16666666666667e-02
+682 845 -4.16666666666667e-02
+682 839 4.16666666666667e-02
+682 844 -4.16666666666667e-02
+682 843 4.16666666666667e-02
+682 842 8.33333333333333e-02
+682 683 -1.66666666666667e-01
+682 851 8.33333333333333e-02
+682 841 -3.75000000000000e-01
+682 848 -4.16666666666667e-02
+682 850 -1.25000000000000e-01
+682 840 8.33333333333333e-02
+682 837 -8.33333333333333e-02
+683 683 5.83333333333333e-01
+683 847 -4.16666666666667e-02
+683 853 4.16666666666667e-02
+683 846 4.16666666666667e-02
+683 852 -8.33333333333333e-02
+683 845 -4.16666666666667e-02
+683 844 -4.16666666666667e-02
+683 838 4.16666666666667e-02
+683 681 -8.33333333333333e-02
+683 843 4.16666666666667e-02
+683 849 8.33333333333333e-02
+683 842 -1.25000000000000e-01
+683 848 -4.16666666666667e-02
+683 851 -3.75000000000000e-01
+683 841 8.33333333333333e-02
+683 682 -1.66666666666667e-01
+683 850 8.33333333333333e-02
+683 840 -4.16666666666667e-02
+683 837 4.16666666666667e-02
+684 684 2.50000000000000e-01
+684 863 4.16666666666667e-02
+684 866 4.16666666666667e-02
+684 862 4.16666666666667e-02
+684 861 -1.25000000000000e-01
+684 860 -4.16666666666667e-02
+684 857 4.16666666666667e-02
+684 859 4.16666666666667e-02
+684 856 -8.33333333333333e-02
+684 858 -4.16666666666667e-02
+684 686 -8.33333333333333e-02
+684 864 -8.33333333333333e-02
+685 685 2.50000000000000e-01
+685 857 4.16666666666667e-02
+685 862 -4.16666666666667e-02
+685 861 4.16666666666667e-02
+685 860 4.16666666666667e-02
+685 686 -8.33333333333333e-02
+685 866 4.16666666666667e-02
+685 859 -1.25000000000000e-01
+685 863 -4.16666666666667e-02
+685 865 -8.33333333333333e-02
+685 858 4.16666666666667e-02
+685 855 -8.33333333333333e-02
+686 686 3.33333333333333e-01
+686 862 -4.16666666666667e-02
+686 856 4.16666666666667e-02
+686 684 -8.33333333333333e-02
+686 861 4.16666666666667e-02
+686 864 4.16666666666667e-02
+686 860 -4.16666666666667e-02
+686 863 -4.16666666666667e-02
+686 866 -2.50000000000000e-01
+686 859 4.16666666666667e-02
+686 685 -8.33333333333333e-02
+686 865 4.16666666666667e-02
+686 858 -4.16666666666667e-02
+686 855 4.16666666666667e-02
+687 687 5.00000000000000e-01
+687 890 4.16666666666667e-02
+687 689 -8.33333333333333e-02
+687 884 4.16666666666667e-02
+687 883 4.16666666666667e-02
+687 889 -8.33333333333333e-02
+687 882 -1.25000000000000e-01
+687 878 8.33333333333333e-02
+687 877 -4.16666666666667e-02
+687 874 4.16666666666667e-02
+687 876 -1.25000000000000e-01
+687 881 4.16666666666667e-02
+687 875 -8.33333333333333e-02
+687 880 4.16666666666667e-02
+687 688 -8.33333333333333e-02
+687 886 8.33333333333333e-02
+687 879 -1.25000000000000e-01
+687 887 -4.16666666666667e-02
+687 885 -1.25000000000000e-01
+688 688 5.83333333333333e-01
+688 890 4.16666666666667e-02
+688 883 -4.16666666666667e-02
+688 882 4.16666666666667e-02
+688 888 -8.33333333333333e-02
+688 878 8.33333333333333e-02
+688 689 -1.66666666666667e-01
+688 887 8.33333333333333e-02
+688 877 -1.25000000000000e-01
+688 876 -4.16666666666667e-02
+688 873 4.16666666666667e-02
+688 881 -4.16666666666667e-02
+688 875 4.16666666666667e-02
+688 880 -4.16666666666667e-02
+688 884 -4.16666666666667e-02
+688 886 -3.75000000000000e-01
+688 879 4.16666666666667e-02
+688 687 -8.33333333333333e-02
+688 885 8.33333333333333e-02
+689 689 5.83333333333333e-01
+689 888 4.16666666666667e-02
+689 884 -4.16666666666667e-02
+689 883 -4.16666666666667e-02
+689 889 4.16666666666667e-02
+689 687 -8.33333333333333e-02
+689 882 4.16666666666667e-02
+689 878 -3.75000000000000e-01
+689 877 8.33333333333333e-02
+689 688 -1.66666666666667e-01
+689 886 8.33333333333333e-02
+689 876 8.33333333333333e-02
+689 881 -4.16666666666667e-02
+689 885 -4.16666666666667e-02
+689 887 -1.25000000000000e-01
+689 880 -4.16666666666667e-02
+689 874 4.16666666666667e-02
+689 879 4.16666666666667e-02
+689 873 -8.33333333333333e-02
+690 690 2.50000000000000e-01
+690 895 -4.16666666666667e-02
+690 892 4.16666666666667e-02
+690 894 -4.16666666666667e-02
+690 899 4.16666666666667e-02
+690 893 -8.33333333333333e-02
+690 898 4.16666666666667e-02
+690 691 -8.33333333333333e-02
+690 901 4.16666666666667e-02
+690 897 -1.25000000000000e-01
+690 896 4.16666666666667e-02
+690 900 -8.33333333333333e-02
+691 691 3.33333333333333e-01
+691 692 -8.33333333333333e-02
+691 902 4.16666666666667e-02
+691 895 -4.16666666666667e-02
+691 894 -4.16666666666667e-02
+691 891 4.16666666666667e-02
+691 899 -4.16666666666667e-02
+691 893 4.16666666666667e-02
+691 898 -4.16666666666667e-02
+691 896 4.16666666666667e-02
+691 901 -2.50000000000000e-01
+691 897 4.16666666666667e-02
+691 690 -8.33333333333333e-02
+691 900 4.16666666666667e-02
+692 692 2.50000000000000e-01
+692 895 4.16666666666667e-02
+692 691 -8.33333333333333e-02
+692 901 4.16666666666667e-02
+692 894 4.16666666666667e-02
+692 899 -4.16666666666667e-02
+692 896 -1.25000000000000e-01
+692 902 -8.33333333333333e-02
+692 898 -4.16666666666667e-02
+692 892 4.16666666666667e-02
+692 897 4.16666666666667e-02
+692 891 -8.33333333333333e-02
+693 693 7.50000000000000e-01
+693 929 4.16666666666667e-02
+693 916 -4.16666666666667e-02
+693 923 -4.16666666666667e-02
+693 694 -8.33333333333333e-02
+693 928 4.16666666666667e-02
+693 927 -2.50000000000000e-01
+693 917 8.33333333333333e-02
+693 926 4.16666666666667e-02
+693 914 -8.33333333333333e-02
+693 913 4.16666666666667e-02
+693 920 4.16666666666667e-02
+693 925 4.16666666666667e-02
+693 924 -2.50000000000000e-01
+693 911 8.33333333333333e-02
+693 908 -8.33333333333333e-02
+693 915 -1.25000000000000e-01
+693 910 8.33333333333333e-02
+693 907 -8.33333333333333e-02
+693 919 -8.33333333333333e-02
+693 922 8.33333333333333e-02
+693 921 -1.25000000000000e-01
+693 695 -8.33333333333333e-02
+694 694 6.66666666666667e-01
+694 928 -8.33333333333333e-02
+694 693 -8.33333333333333e-02
+694 927 4.16666666666667e-02
+694 914 4.16666666666667e-02
+694 912 4.16666666666667e-02
+694 925 -8.33333333333333e-02
+694 924 4.16666666666667e-02
+694 917 8.33333333333333e-02
+694 916 -1.25000000000000e-01
+694 911 -1.66666666666667e-01
+694 923 8.33333333333333e-02
+694 909 8.33333333333333e-02
+694 906 -8.33333333333333e-02
+694 920 4.16666666666667e-02
+694 908 -8.33333333333333e-02
+694 922 -3.75000000000000e-01
+694 915 -4.16666666666667e-02
+694 918 -8.33333333333333e-02
+694 921 8.33333333333333e-02
+695 695 6.66666666666667e-01
+695 927 4.16666666666667e-02
+695 929 -8.33333333333333e-02
+695 921 -4.16666666666667e-02
+695 913 4.16666666666667e-02
+695 915 8.33333333333333e-02
+695 924 4.16666666666667e-02
+695 912 -8.33333333333333e-02
+695 926 -8.33333333333333e-02
+695 918 4.16666666666667e-02
+695 917 -3.75000000000000e-01
+695 916 8.33333333333333e-02
+695 909 8.33333333333333e-02
+695 906 -8.33333333333333e-02
+695 910 -1.66666666666667e-01
+695 922 8.33333333333333e-02
+695 923 -1.25000000000000e-01
+695 693 -8.33333333333333e-02
+695 919 4.16666666666667e-02
+695 907 -8.33333333333333e-02
+696 696 4.16666666666667e-01
+696 950 4.16666666666667e-02
+696 938 -8.33333333333333e-02
+696 937 4.16666666666667e-02
+696 944 4.16666666666667e-02
+696 949 4.16666666666667e-02
+696 948 -2.50000000000000e-01
+696 935 4.16666666666667e-02
+696 932 -8.33333333333333e-02
+696 939 -8.33333333333333e-02
+696 934 4.16666666666667e-02
+696 931 -8.33333333333333e-02
+696 943 -8.33333333333333e-02
+696 946 4.16666666666667e-02
+696 945 -8.33333333333333e-02
+696 941 4.16666666666667e-02
+697 697 4.16666666666667e-01
+697 936 4.16666666666667e-02
+697 949 -8.33333333333333e-02
+697 948 4.16666666666667e-02
+697 941 4.16666666666667e-02
+697 940 -8.33333333333333e-02
+697 935 -8.33333333333333e-02
+697 947 4.16666666666667e-02
+697 933 4.16666666666667e-02
+697 930 -8.33333333333333e-02
+697 944 4.16666666666667e-02
+697 932 -8.33333333333333e-02
+697 946 -2.50000000000000e-01
+697 938 4.16666666666667e-02
+697 942 -8.33333333333333e-02
+697 945 4.16666666666667e-02
+698 698 4.16666666666667e-01
+698 939 4.16666666666667e-02
+698 948 4.16666666666667e-02
+698 936 -8.33333333333333e-02
+698 950 -8.33333333333333e-02
+698 942 4.16666666666667e-02
+698 941 -2.50000000000000e-01
+698 940 4.16666666666667e-02
+698 933 4.16666666666667e-02
+698 930 -8.33333333333333e-02
+698 934 -8.33333333333333e-02
+698 946 4.16666666666667e-02
+698 947 -8.33333333333333e-02
+698 937 4.16666666666667e-02
+698 943 4.16666666666667e-02
+698 931 -8.33333333333333e-02
+699 699 7.50000000000000e-01
+699 796 4.16666666666667e-02
+699 961 -8.33333333333333e-02
+699 953 -4.16666666666667e-02
+699 700 -8.33333333333333e-02
+699 952 8.33333333333333e-02
+699 784 4.16666666666667e-02
+699 951 -1.25000000000000e-01
+699 968 -8.33333333333333e-02
+699 959 8.33333333333333e-02
+699 797 4.16666666666667e-02
+699 965 -8.33333333333333e-02
+699 964 4.16666666666667e-02
+699 967 -8.33333333333333e-02
+699 795 -2.50000000000000e-01
+699 701 -8.33333333333333e-02
+699 956 8.33333333333333e-02
+699 785 4.16666666666667e-02
+699 955 -4.16666666666667e-02
+699 958 8.33333333333333e-02
+699 962 4.16666666666667e-02
+699 954 -1.25000000000000e-01
+699 783 -2.50000000000000e-01
+700 700 6.66666666666667e-01
+700 795 4.16666666666667e-02
+700 960 -8.33333333333333e-02
+700 953 8.33333333333333e-02
+700 952 -3.75000000000000e-01
+700 699 -8.33333333333333e-02
+700 951 8.33333333333333e-02
+700 783 4.16666666666667e-02
+700 965 4.16666666666667e-02
+700 968 -8.33333333333333e-02
+700 796 -8.33333333333333e-02
+700 963 4.16666666666667e-02
+700 966 -8.33333333333333e-02
+700 956 8.33333333333333e-02
+700 959 -1.66666666666667e-01
+700 962 4.16666666666667e-02
+700 955 -1.25000000000000e-01
+700 784 -8.33333333333333e-02
+700 954 -4.16666666666667e-02
+700 957 8.33333333333333e-02
+701 701 6.66666666666667e-01
+701 960 4.16666666666667e-02
+701 953 -1.25000000000000e-01
+701 952 8.33333333333333e-02
+701 951 -4.16666666666667e-02
+701 964 4.16666666666667e-02
+701 967 -8.33333333333333e-02
+701 966 -8.33333333333333e-02
+701 957 8.33333333333333e-02
+701 797 -8.33333333333333e-02
+701 795 4.16666666666667e-02
+701 963 -8.33333333333333e-02
+701 961 4.16666666666667e-02
+701 956 -3.75000000000000e-01
+701 785 -8.33333333333333e-02
+701 955 8.33333333333333e-02
+701 958 -1.66666666666667e-01
+701 699 -8.33333333333333e-02
+701 954 8.33333333333333e-02
+701 783 4.16666666666667e-02
+702 702 1.25000000000000e+00
+702 994 8.33333333333333e-02
+702 995 8.33333333333333e-02
+702 991 8.33333333333333e-02
+702 990 -1.25000000000000e-01
+702 704 -1.66666666666667e-01
+702 971 8.33333333333333e-02
+702 970 8.33333333333333e-02
+702 969 -3.75000000000000e-01
+702 982 -8.33333333333333e-02
+702 703 -1.66666666666667e-01
+702 986 8.33333333333333e-02
+702 997 -8.33333333333333e-02
+702 988 8.33333333333333e-02
+702 983 1.66666666666667e-01
+702 989 -1.66666666666667e-01
+702 839 4.16666666666667e-02
+702 998 -8.33333333333333e-02
+702 985 8.33333333333333e-02
+702 838 -8.33333333333333e-02
+702 984 -3.75000000000000e-01
+702 953 -4.16666666666667e-02
+702 788 4.16666666666667e-02
+702 952 8.33333333333333e-02
+702 787 -8.33333333333333e-02
+702 951 -1.25000000000000e-01
+702 992 -4.16666666666667e-02
+702 981 -2.50000000000000e-01
+703 703 1.25000000000000e+00
+703 993 8.33333333333333e-02
+703 995 -1.66666666666667e-01
+703 839 4.16666666666667e-02
+703 991 -3.75000000000000e-01
+703 990 8.33333333333333e-02
+703 971 -4.16666666666667e-02
+703 788 4.16666666666667e-02
+703 970 -1.25000000000000e-01
+703 969 8.33333333333333e-02
+703 981 -8.33333333333333e-02
+703 986 -4.16666666666667e-02
+703 702 -1.66666666666667e-01
+703 996 -8.33333333333333e-02
+703 987 8.33333333333333e-02
+703 998 -8.33333333333333e-02
+703 989 8.33333333333333e-02
+703 985 -1.25000000000000e-01
+703 984 8.33333333333333e-02
+703 837 -8.33333333333333e-02
+703 953 8.33333333333333e-02
+703 704 -1.66666666666667e-01
+703 983 1.66666666666667e-01
+703 952 -3.75000000000000e-01
+703 992 8.33333333333333e-02
+703 982 -2.50000000000000e-01
+703 951 8.33333333333333e-02
+703 786 -8.33333333333333e-02
+704 704 1.25000000000000e+00
+704 991 8.33333333333333e-02
+704 994 -1.66666666666667e-01
+704 993 8.33333333333333e-02
+704 992 -1.25000000000000e-01
+704 838 4.16666666666667e-02
+704 971 -1.25000000000000e-01
+704 970 -4.16666666666667e-02
+704 787 4.16666666666667e-02
+704 702 -1.66666666666667e-01
+704 969 8.33333333333333e-02
+704 985 -4.16666666666667e-02
+704 984 8.33333333333333e-02
+704 997 -8.33333333333333e-02
+704 988 8.33333333333333e-02
+704 981 1.66666666666667e-01
+704 987 -1.66666666666667e-01
+704 986 -1.25000000000000e-01
+704 837 4.16666666666667e-02
+704 996 -8.33333333333333e-02
+704 953 -1.25000000000000e-01
+704 990 -4.16666666666667e-02
+704 983 -7.50000000000000e-01
+704 952 8.33333333333333e-02
+704 703 -1.66666666666667e-01
+704 982 1.66666666666667e-01
+704 951 -4.16666666666667e-02
+704 786 4.16666666666667e-02
+705 705 1.25000000000000e+00
+705 1019 8.33333333333333e-02
+705 1018 -1.66666666666667e-01
+705 1016 8.33333333333333e-02
+705 874 4.16666666666667e-02
+705 1014 -3.75000000000000e-01
+705 956 8.33333333333333e-02
+705 955 -4.16666666666667e-02
+705 790 4.16666666666667e-02
+705 954 -1.25000000000000e-01
+705 1013 -8.33333333333333e-02
+705 707 -1.66666666666667e-01
+705 1021 -4.16666666666667e-02
+705 1028 -8.33333333333333e-02
+705 1025 8.33333333333333e-02
+705 1027 -8.33333333333333e-02
+705 1024 8.33333333333333e-02
+705 1022 8.33333333333333e-02
+705 875 -8.33333333333333e-02
+705 1020 -1.25000000000000e-01
+705 1001 8.33333333333333e-02
+705 791 -8.33333333333333e-02
+705 1000 8.33333333333333e-02
+705 706 -1.66666666666667e-01
+705 1012 1.66666666666667e-01
+705 999 -3.75000000000000e-01
+705 1015 8.33333333333333e-02
+705 1011 -2.50000000000000e-01
+706 706 1.25000000000000e+00
+706 1019 8.33333333333333e-02
+706 1014 8.33333333333333e-02
+706 1017 -1.66666666666667e-01
+706 1015 -1.25000000000000e-01
+706 873 4.16666666666667e-02
+706 956 8.33333333333333e-02
+706 707 -1.66666666666667e-01
+706 955 -1.25000000000000e-01
+706 954 -4.16666666666667e-02
+706 789 4.16666666666667e-02
+706 1020 -4.16666666666667e-02
+706 1022 8.33333333333333e-02
+706 1013 1.66666666666667e-01
+706 1025 -1.66666666666667e-01
+706 1026 -8.33333333333333e-02
+706 1023 8.33333333333333e-02
+706 875 4.16666666666667e-02
+706 1028 -8.33333333333333e-02
+706 1021 -1.25000000000000e-01
+706 1001 -4.16666666666667e-02
+706 791 4.16666666666667e-02
+706 1000 -1.25000000000000e-01
+706 1016 -4.16666666666667e-02
+706 1012 -7.50000000000000e-01
+706 999 8.33333333333333e-02
+706 705 -1.66666666666667e-01
+706 1011 1.66666666666667e-01
+707 707 1.25000000000000e+00
+707 1018 8.33333333333333e-02
+707 1017 8.33333333333333e-02
+707 1016 -1.25000000000000e-01
+707 1014 8.33333333333333e-02
+707 956 -3.75000000000000e-01
+707 955 8.33333333333333e-02
+707 706 -1.66666666666667e-01
+707 954 8.33333333333333e-02
+707 1011 -8.33333333333333e-02
+707 705 -1.66666666666667e-01
+707 1021 8.33333333333333e-02
+707 1026 -8.33333333333333e-02
+707 1023 8.33333333333333e-02
+707 1012 1.66666666666667e-01
+707 1024 -1.66666666666667e-01
+707 1022 -3.75000000000000e-01
+707 874 4.16666666666667e-02
+707 1027 -8.33333333333333e-02
+707 1020 8.33333333333333e-02
+707 873 -8.33333333333333e-02
+707 1001 -1.25000000000000e-01
+707 1015 -4.16666666666667e-02
+707 1013 -2.50000000000000e-01
+707 1000 -4.16666666666667e-02
+707 790 4.16666666666667e-02
+707 999 8.33333333333333e-02
+707 789 -8.33333333333333e-02
+708 708 2.50000000000000e+00
+708 1045 1.66666666666667e-01
+708 1044 -2.50000000000000e-01
+708 974 -1.66666666666667e-01
+708 973 8.33333333333333e-02
+708 1031 1.66666666666667e-01
+708 1057 8.33333333333333e-02
+708 1030 1.66666666666667e-01
+708 1029 -7.50000000000000e-01
+708 1058 8.33333333333333e-02
+708 982 -8.33333333333333e-02
+708 983 1.66666666666667e-01
+708 710 -3.33333333333333e-01
+708 794 -8.33333333333333e-02
+708 981 -2.50000000000000e-01
+708 1049 8.33333333333333e-02
+708 908 -8.33333333333333e-02
+708 1048 -1.66666666666667e-01
+708 959 8.33333333333333e-02
+708 1042 1.66666666666667e-01
+708 709 -3.33333333333333e-01
+708 1043 1.66666666666667e-01
+708 907 -8.33333333333333e-02
+708 1041 -7.50000000000000e-01
+708 958 8.33333333333333e-02
+708 793 -8.33333333333333e-02
+708 1013 -8.33333333333333e-02
+708 1004 8.33333333333333e-02
+708 1054 8.33333333333333e-02
+708 1051 -8.33333333333333e-02
+708 1003 -1.66666666666667e-01
+708 1012 1.66666666666667e-01
+708 1011 -2.50000000000000e-01
+708 1052 1.66666666666667e-01
+708 1055 -1.66666666666667e-01
+708 1050 -2.50000000000000e-01
+708 1046 -8.33333333333333e-02
+709 709 2.50000000000000e+00
+709 1044 1.66666666666667e-01
+709 1046 1.66666666666667e-01
+709 1045 -7.50000000000000e-01
+709 972 8.33333333333333e-02
+709 1031 -8.33333333333333e-02
+709 1056 8.33333333333333e-02
+709 1030 -2.50000000000000e-01
+709 1029 1.66666666666667e-01
+709 1058 -1.66666666666667e-01
+709 981 -8.33333333333333e-02
+709 1049 8.33333333333333e-02
+709 983 1.66666666666667e-01
+709 982 -2.50000000000000e-01
+709 1047 -1.66666666666667e-01
+709 1043 -8.33333333333333e-02
+709 1041 1.66666666666667e-01
+709 708 -3.33333333333333e-01
+709 1042 -2.50000000000000e-01
+709 906 -8.33333333333333e-02
+709 959 -1.66666666666667e-01
+709 957 8.33333333333333e-02
+709 792 -8.33333333333333e-02
+709 1013 1.66666666666667e-01
+709 710 -3.33333333333333e-01
+709 1052 1.66666666666667e-01
+709 1053 8.33333333333333e-02
+709 1050 -8.33333333333333e-02
+709 1004 8.33333333333333e-02
+709 794 -8.33333333333333e-02
+709 1012 -7.50000000000000e-01
+709 1002 -1.66666666666667e-01
+709 1011 1.66666666666667e-01
+709 1055 8.33333333333333e-02
+709 908 -8.33333333333333e-02
+709 1051 -2.50000000000000e-01
+709 974 8.33333333333333e-02
+710 710 2.50000000000000e+00
+710 973 8.33333333333333e-02
+710 1046 -2.50000000000000e-01
+710 1045 1.66666666666667e-01
+710 972 -1.66666666666667e-01
+710 1030 -8.33333333333333e-02
+710 1029 1.66666666666667e-01
+710 1031 -2.50000000000000e-01
+710 1057 -1.66666666666667e-01
+710 1056 8.33333333333333e-02
+710 1048 8.33333333333333e-02
+710 981 1.66666666666667e-01
+710 708 -3.33333333333333e-01
+710 983 -7.50000000000000e-01
+710 982 1.66666666666667e-01
+710 792 -8.33333333333333e-02
+710 1047 8.33333333333333e-02
+710 906 -8.33333333333333e-02
+710 1042 -8.33333333333333e-02
+710 957 8.33333333333333e-02
+710 1043 -2.50000000000000e-01
+710 1041 1.66666666666667e-01
+710 958 -1.66666666666667e-01
+710 1011 -8.33333333333333e-02
+710 1002 8.33333333333333e-02
+710 1012 1.66666666666667e-01
+710 709 -3.33333333333333e-01
+710 1051 1.66666666666667e-01
+710 1013 -2.50000000000000e-01
+710 1003 8.33333333333333e-02
+710 793 -8.33333333333333e-02
+710 1052 -7.50000000000000e-01
+710 1044 -8.33333333333333e-02
+710 1054 8.33333333333333e-02
+710 907 -8.33333333333333e-02
+710 1050 1.66666666666667e-01
+710 1053 -1.66666666666667e-01
+711 711 7.50000000000000e-01
+711 820 4.16666666666667e-02
+711 1069 -8.33333333333333e-02
+711 1061 -4.16666666666667e-02
+711 712 -8.33333333333333e-02
+711 1060 8.33333333333333e-02
+711 799 4.16666666666667e-02
+711 1059 -1.25000000000000e-01
+711 1076 -8.33333333333333e-02
+711 1067 8.33333333333333e-02
+711 821 4.16666666666667e-02
+711 1073 -8.33333333333333e-02
+711 1072 4.16666666666667e-02
+711 1075 -8.33333333333333e-02
+711 819 -2.50000000000000e-01
+711 713 -8.33333333333333e-02
+711 1064 8.33333333333333e-02
+711 800 4.16666666666667e-02
+711 1063 -4.16666666666667e-02
+711 1066 8.33333333333333e-02
+711 1070 4.16666666666667e-02
+711 1062 -1.25000000000000e-01
+711 798 -2.50000000000000e-01
+712 712 6.66666666666667e-01
+712 819 4.16666666666667e-02
+712 1068 -8.33333333333333e-02
+712 1061 8.33333333333333e-02
+712 1060 -3.75000000000000e-01
+712 711 -8.33333333333333e-02
+712 1059 8.33333333333333e-02
+712 798 4.16666666666667e-02
+712 1073 4.16666666666667e-02
+712 1076 -8.33333333333333e-02
+712 820 -8.33333333333333e-02
+712 1071 4.16666666666667e-02
+712 1074 -8.33333333333333e-02
+712 1064 8.33333333333333e-02
+712 1067 -1.66666666666667e-01
+712 1070 4.16666666666667e-02
+712 1063 -1.25000000000000e-01
+712 799 -8.33333333333333e-02
+712 1062 -4.16666666666667e-02
+712 1065 8.33333333333333e-02
+713 713 6.66666666666667e-01
+713 1068 4.16666666666667e-02
+713 1061 -1.25000000000000e-01
+713 1060 8.33333333333333e-02
+713 1059 -4.16666666666667e-02
+713 1072 4.16666666666667e-02
+713 1075 -8.33333333333333e-02
+713 1074 -8.33333333333333e-02
+713 1065 8.33333333333333e-02
+713 821 -8.33333333333333e-02
+713 819 4.16666666666667e-02
+713 1071 -8.33333333333333e-02
+713 1069 4.16666666666667e-02
+713 1064 -3.75000000000000e-01
+713 800 -8.33333333333333e-02
+713 1063 8.33333333333333e-02
+713 1066 -1.66666666666667e-01
+713 711 -8.33333333333333e-02
+713 1062 8.33333333333333e-02
+713 798 4.16666666666667e-02
+714 714 1.25000000000000e+00
+714 1087 -8.33333333333333e-02
+714 1079 8.33333333333333e-02
+714 1078 8.33333333333333e-02
+714 1077 -3.75000000000000e-01
+714 1094 -8.33333333333333e-02
+714 1093 -8.33333333333333e-02
+714 1085 -1.66666666666667e-01
+714 1084 8.33333333333333e-02
+714 986 8.33333333333333e-02
+714 716 -1.66666666666667e-01
+714 1082 1.66666666666667e-01
+714 1090 8.33333333333333e-02
+714 1081 -8.33333333333333e-02
+714 803 -4.16666666666667e-02
+714 962 4.16666666666667e-02
+714 802 8.33333333333333e-02
+714 961 -8.33333333333333e-02
+714 801 -1.25000000000000e-01
+714 1080 -2.50000000000000e-01
+714 842 -4.16666666666667e-02
+714 1091 8.33333333333333e-02
+714 715 -1.66666666666667e-01
+714 841 8.33333333333333e-02
+714 985 8.33333333333333e-02
+714 1088 4.16666666666667e-02
+714 840 -1.25000000000000e-01
+714 984 -3.75000000000000e-01
+715 715 1.25000000000000e+00
+715 1086 -8.33333333333333e-02
+715 1079 -4.16666666666667e-02
+715 1078 -1.25000000000000e-01
+715 1077 8.33333333333333e-02
+715 1094 -8.33333333333333e-02
+715 1085 8.33333333333333e-02
+715 1092 -8.33333333333333e-02
+715 1083 8.33333333333333e-02
+715 986 -4.16666666666667e-02
+715 962 4.16666666666667e-02
+715 1089 8.33333333333333e-02
+715 1080 -8.33333333333333e-02
+715 803 8.33333333333333e-02
+715 716 -1.66666666666667e-01
+715 1082 1.66666666666667e-01
+715 802 -3.75000000000000e-01
+715 1081 -2.50000000000000e-01
+715 801 8.33333333333333e-02
+715 960 -8.33333333333333e-02
+715 842 8.33333333333333e-02
+715 1091 -1.66666666666667e-01
+715 1088 4.16666666666667e-02
+715 841 -3.75000000000000e-01
+715 985 -1.25000000000000e-01
+715 714 -1.66666666666667e-01
+715 840 8.33333333333333e-02
+715 984 8.33333333333333e-02
+716 716 1.25000000000000e+00
+716 1087 4.16666666666667e-02
+716 1079 -1.25000000000000e-01
+716 1078 -4.16666666666667e-02
+716 1077 8.33333333333333e-02
+716 1092 -8.33333333333333e-02
+716 1093 -8.33333333333333e-02
+716 1084 8.33333333333333e-02
+716 1083 -1.66666666666667e-01
+716 985 -4.16666666666667e-02
+716 961 4.16666666666667e-02
+716 984 8.33333333333333e-02
+716 714 -1.66666666666667e-01
+716 1080 1.66666666666667e-01
+716 803 -1.25000000000000e-01
+716 1082 -7.50000000000000e-01
+716 802 8.33333333333333e-02
+716 715 -1.66666666666667e-01
+716 1081 1.66666666666667e-01
+716 801 -4.16666666666667e-02
+716 960 4.16666666666667e-02
+716 1086 4.16666666666667e-02
+716 842 -1.25000000000000e-01
+716 986 -1.25000000000000e-01
+716 841 8.33333333333333e-02
+716 1090 -1.66666666666667e-01
+716 840 -4.16666666666667e-02
+716 1089 8.33333333333333e-02
+717 717 1.25000000000000e+00
+717 1108 8.33333333333333e-02
+717 1109 8.33333333333333e-02
+717 1105 8.33333333333333e-02
+717 1104 -1.25000000000000e-01
+717 719 -1.66666666666667e-01
+717 1079 8.33333333333333e-02
+717 1078 8.33333333333333e-02
+717 1077 -3.75000000000000e-01
+717 1096 -8.33333333333333e-02
+717 718 -1.66666666666667e-01
+717 1100 8.33333333333333e-02
+717 1111 -8.33333333333333e-02
+717 1102 8.33333333333333e-02
+717 1097 1.66666666666667e-01
+717 1103 -1.66666666666667e-01
+717 857 4.16666666666667e-02
+717 1112 -8.33333333333333e-02
+717 1099 8.33333333333333e-02
+717 856 -8.33333333333333e-02
+717 1098 -3.75000000000000e-01
+717 1061 -4.16666666666667e-02
+717 806 4.16666666666667e-02
+717 1060 8.33333333333333e-02
+717 805 -8.33333333333333e-02
+717 1059 -1.25000000000000e-01
+717 1106 -4.16666666666667e-02
+717 1095 -2.50000000000000e-01
+718 718 1.25000000000000e+00
+718 1107 8.33333333333333e-02
+718 1109 -1.66666666666667e-01
+718 857 4.16666666666667e-02
+718 1105 -3.75000000000000e-01
+718 1104 8.33333333333333e-02
+718 1079 -4.16666666666667e-02
+718 806 4.16666666666667e-02
+718 1078 -1.25000000000000e-01
+718 1077 8.33333333333333e-02
+718 1095 -8.33333333333333e-02
+718 1100 -4.16666666666667e-02
+718 717 -1.66666666666667e-01
+718 1110 -8.33333333333333e-02
+718 1101 8.33333333333333e-02
+718 1112 -8.33333333333333e-02
+718 1103 8.33333333333333e-02
+718 1099 -1.25000000000000e-01
+718 1098 8.33333333333333e-02
+718 855 -8.33333333333333e-02
+718 1061 8.33333333333333e-02
+718 719 -1.66666666666667e-01
+718 1097 1.66666666666667e-01
+718 1060 -3.75000000000000e-01
+718 1106 8.33333333333333e-02
+718 1096 -2.50000000000000e-01
+718 1059 8.33333333333333e-02
+718 804 -8.33333333333333e-02
+719 719 1.25000000000000e+00
+719 1105 8.33333333333333e-02
+719 1108 -1.66666666666667e-01
+719 1107 8.33333333333333e-02
+719 1106 -1.25000000000000e-01
+719 856 4.16666666666667e-02
+719 1079 -1.25000000000000e-01
+719 1078 -4.16666666666667e-02
+719 805 4.16666666666667e-02
+719 717 -1.66666666666667e-01
+719 1077 8.33333333333333e-02
+719 1099 -4.16666666666667e-02
+719 1098 8.33333333333333e-02
+719 1111 -8.33333333333333e-02
+719 1102 8.33333333333333e-02
+719 1095 1.66666666666667e-01
+719 1101 -1.66666666666667e-01
+719 1100 -1.25000000000000e-01
+719 855 4.16666666666667e-02
+719 1110 -8.33333333333333e-02
+719 1061 -1.25000000000000e-01
+719 1104 -4.16666666666667e-02
+719 1097 -7.50000000000000e-01
+719 1060 8.33333333333333e-02
+719 718 -1.66666666666667e-01
+719 1096 1.66666666666667e-01
+719 1059 -4.16666666666667e-02
+719 804 4.16666666666667e-02
+720 720 1.25000000000000e+00
+720 1130 -8.33333333333333e-02
+720 1123 4.16666666666667e-02
+720 1129 -8.33333333333333e-02
+720 1124 -8.33333333333333e-02
+720 1115 8.33333333333333e-02
+720 1114 8.33333333333333e-02
+720 1120 -1.66666666666667e-01
+720 1113 -3.75000000000000e-01
+720 1127 8.33333333333333e-02
+720 1118 -8.33333333333333e-02
+720 721 -1.66666666666667e-01
+720 1117 1.66666666666667e-01
+720 1015 8.33333333333333e-02
+720 809 8.33333333333333e-02
+720 965 -8.33333333333333e-02
+720 808 -4.16666666666667e-02
+720 964 4.16666666666667e-02
+720 807 -1.25000000000000e-01
+720 1116 -2.50000000000000e-01
+720 722 -1.66666666666667e-01
+720 878 8.33333333333333e-02
+720 1016 8.33333333333333e-02
+720 877 -4.16666666666667e-02
+720 1126 8.33333333333333e-02
+720 1121 8.33333333333333e-02
+720 876 -1.25000000000000e-01
+720 1014 -3.75000000000000e-01
+721 721 1.25000000000000e+00
+721 1128 -8.33333333333333e-02
+721 1124 4.16666666666667e-02
+721 1130 -8.33333333333333e-02
+721 1115 -4.16666666666667e-02
+721 1121 8.33333333333333e-02
+721 1114 -1.25000000000000e-01
+721 1113 8.33333333333333e-02
+721 1119 -1.66666666666667e-01
+721 965 4.16666666666667e-02
+721 1016 -4.16666666666667e-02
+721 720 -1.66666666666667e-01
+721 1116 1.66666666666667e-01
+721 1014 8.33333333333333e-02
+721 809 8.33333333333333e-02
+721 722 -1.66666666666667e-01
+721 1118 1.66666666666667e-01
+721 808 -1.25000000000000e-01
+721 1117 -7.50000000000000e-01
+721 807 -4.16666666666667e-02
+721 963 4.16666666666667e-02
+721 878 8.33333333333333e-02
+721 1127 -1.66666666666667e-01
+721 1122 4.16666666666667e-02
+721 877 -1.25000000000000e-01
+721 1015 -1.25000000000000e-01
+721 876 -4.16666666666667e-02
+721 1125 8.33333333333333e-02
+722 722 1.25000000000000e+00
+722 1128 -8.33333333333333e-02
+722 1123 4.16666666666667e-02
+722 1129 -8.33333333333333e-02
+722 1122 -8.33333333333333e-02
+722 1115 -1.25000000000000e-01
+722 1114 -4.16666666666667e-02
+722 1120 8.33333333333333e-02
+722 1113 8.33333333333333e-02
+722 1125 8.33333333333333e-02
+722 1116 -8.33333333333333e-02
+722 964 4.16666666666667e-02
+722 1015 -4.16666666666667e-02
+722 809 -3.75000000000000e-01
+722 1118 -2.50000000000000e-01
+722 808 8.33333333333333e-02
+722 721 -1.66666666666667e-01
+722 1117 1.66666666666667e-01
+722 807 8.33333333333333e-02
+722 963 -8.33333333333333e-02
+722 1119 8.33333333333333e-02
+722 878 -3.75000000000000e-01
+722 1016 -1.25000000000000e-01
+722 877 8.33333333333333e-02
+722 1126 -1.66666666666667e-01
+722 720 -1.66666666666667e-01
+722 876 8.33333333333333e-02
+722 1014 8.33333333333333e-02
+723 723 1.25000000000000e+00
+723 1139 8.33333333333333e-02
+723 1138 -1.66666666666667e-01
+723 1136 8.33333333333333e-02
+723 892 4.16666666666667e-02
+723 1134 -3.75000000000000e-01
+723 1064 8.33333333333333e-02
+723 1063 -4.16666666666667e-02
+723 811 4.16666666666667e-02
+723 1062 -1.25000000000000e-01
+723 1133 -8.33333333333333e-02
+723 725 -1.66666666666667e-01
+723 1141 -4.16666666666667e-02
+723 1148 -8.33333333333333e-02
+723 1145 8.33333333333333e-02
+723 1147 -8.33333333333333e-02
+723 1144 8.33333333333333e-02
+723 1142 8.33333333333333e-02
+723 893 -8.33333333333333e-02
+723 1140 -1.25000000000000e-01
+723 1115 8.33333333333333e-02
+723 812 -8.33333333333333e-02
+723 1114 8.33333333333333e-02
+723 724 -1.66666666666667e-01
+723 1132 1.66666666666667e-01
+723 1113 -3.75000000000000e-01
+723 1135 8.33333333333333e-02
+723 1131 -2.50000000000000e-01
+724 724 1.25000000000000e+00
+724 1139 8.33333333333333e-02
+724 1134 8.33333333333333e-02
+724 1137 -1.66666666666667e-01
+724 1135 -1.25000000000000e-01
+724 891 4.16666666666667e-02
+724 1064 8.33333333333333e-02
+724 725 -1.66666666666667e-01
+724 1063 -1.25000000000000e-01
+724 1062 -4.16666666666667e-02
+724 810 4.16666666666667e-02
+724 1140 -4.16666666666667e-02
+724 1142 8.33333333333333e-02
+724 1133 1.66666666666667e-01
+724 1145 -1.66666666666667e-01
+724 1146 -8.33333333333333e-02
+724 1143 8.33333333333333e-02
+724 893 4.16666666666667e-02
+724 1148 -8.33333333333333e-02
+724 1141 -1.25000000000000e-01
+724 1115 -4.16666666666667e-02
+724 812 4.16666666666667e-02
+724 1114 -1.25000000000000e-01
+724 1136 -4.16666666666667e-02
+724 1132 -7.50000000000000e-01
+724 1113 8.33333333333333e-02
+724 723 -1.66666666666667e-01
+724 1131 1.66666666666667e-01
+725 725 1.25000000000000e+00
+725 1138 8.33333333333333e-02
+725 1137 8.33333333333333e-02
+725 1136 -1.25000000000000e-01
+725 1134 8.33333333333333e-02
+725 1064 -3.75000000000000e-01
+725 1063 8.33333333333333e-02
+725 724 -1.66666666666667e-01
+725 1062 8.33333333333333e-02
+725 1131 -8.33333333333333e-02
+725 723 -1.66666666666667e-01
+725 1141 8.33333333333333e-02
+725 1146 -8.33333333333333e-02
+725 1143 8.33333333333333e-02
+725 1132 1.66666666666667e-01
+725 1144 -1.66666666666667e-01
+725 1142 -3.75000000000000e-01
+725 892 4.16666666666667e-02
+725 1147 -8.33333333333333e-02
+725 1140 8.33333333333333e-02
+725 891 -8.33333333333333e-02
+725 1115 -1.25000000000000e-01
+725 1135 -4.16666666666667e-02
+725 1133 -2.50000000000000e-01
+725 1114 -4.16666666666667e-02
+725 811 4.16666666666667e-02
+725 1113 8.33333333333333e-02
+725 810 -8.33333333333333e-02
+726 726 2.50000000000000e+00
+726 1156 -1.66666666666667e-01
+726 1151 1.66666666666667e-01
+726 1163 -1.66666666666667e-01
+726 1165 -8.33333333333333e-02
+726 1162 8.33333333333333e-02
+726 1166 -8.33333333333333e-02
+726 1150 1.66666666666667e-01
+726 1149 -7.50000000000000e-01
+726 1082 1.66666666666667e-01
+726 988 8.33333333333333e-02
+726 1081 -8.33333333333333e-02
+726 989 -1.66666666666667e-01
+726 815 8.33333333333333e-02
+726 1080 -2.50000000000000e-01
+726 1154 -8.33333333333333e-02
+726 911 8.33333333333333e-02
+726 727 -3.33333333333333e-01
+726 1153 1.66666666666667e-01
+726 1152 -2.50000000000000e-01
+726 1118 -8.33333333333333e-02
+726 1117 1.66666666666667e-01
+726 968 -8.33333333333333e-02
+726 1019 8.33333333333333e-02
+726 1042 1.66666666666667e-01
+726 1018 -1.66666666666667e-01
+726 814 8.33333333333333e-02
+726 967 -8.33333333333333e-02
+726 1116 -2.50000000000000e-01
+726 728 -3.33333333333333e-01
+726 1160 1.66666666666667e-01
+726 1043 1.66666666666667e-01
+726 1159 -8.33333333333333e-02
+726 910 8.33333333333333e-02
+726 1157 8.33333333333333e-02
+726 1158 -2.50000000000000e-01
+726 1041 -7.50000000000000e-01
+727 727 2.50000000000000e+00
+727 1155 -1.66666666666667e-01
+727 1151 -8.33333333333333e-02
+727 1166 -8.33333333333333e-02
+727 1163 8.33333333333333e-02
+727 1164 -8.33333333333333e-02
+727 1161 8.33333333333333e-02
+727 1150 -2.50000000000000e-01
+727 1149 1.66666666666667e-01
+727 987 8.33333333333333e-02
+727 1080 -8.33333333333333e-02
+727 989 8.33333333333333e-02
+727 1082 1.66666666666667e-01
+727 1081 -2.50000000000000e-01
+727 1154 1.66666666666667e-01
+727 1153 -7.50000000000000e-01
+727 726 -3.33333333333333e-01
+727 1152 1.66666666666667e-01
+727 1043 -8.33333333333333e-02
+727 728 -3.33333333333333e-01
+727 968 -8.33333333333333e-02
+727 1019 8.33333333333333e-02
+727 1116 1.66666666666667e-01
+727 1041 1.66666666666667e-01
+727 1017 -1.66666666666667e-01
+727 815 -1.66666666666667e-01
+727 1118 1.66666666666667e-01
+727 1117 -7.50000000000000e-01
+727 813 8.33333333333333e-02
+727 966 -8.33333333333333e-02
+727 1160 1.66666666666667e-01
+727 911 -1.66666666666667e-01
+727 1157 8.33333333333333e-02
+727 1159 -2.50000000000000e-01
+727 1042 -2.50000000000000e-01
+727 1158 -8.33333333333333e-02
+727 909 8.33333333333333e-02
+728 728 2.50000000000000e+00
+728 1156 8.33333333333333e-02
+728 1150 -8.33333333333333e-02
+728 1165 -8.33333333333333e-02
+728 1162 8.33333333333333e-02
+728 1149 1.66666666666667e-01
+728 1161 -1.66666666666667e-01
+728 1164 -8.33333333333333e-02
+728 1151 -2.50000000000000e-01
+728 1080 1.66666666666667e-01
+728 988 8.33333333333333e-02
+728 987 -1.66666666666667e-01
+728 1082 -7.50000000000000e-01
+728 1081 1.66666666666667e-01
+728 813 8.33333333333333e-02
+728 1154 -2.50000000000000e-01
+728 1153 1.66666666666667e-01
+728 1152 -8.33333333333333e-02
+728 909 8.33333333333333e-02
+728 1042 -8.33333333333333e-02
+728 727 -3.33333333333333e-01
+728 1116 -8.33333333333333e-02
+728 967 -8.33333333333333e-02
+728 1018 8.33333333333333e-02
+728 966 -8.33333333333333e-02
+728 1017 8.33333333333333e-02
+728 1118 -2.50000000000000e-01
+728 814 -1.66666666666667e-01
+728 1117 1.66666666666667e-01
+728 1155 8.33333333333333e-02
+728 1160 -7.50000000000000e-01
+728 1043 -2.50000000000000e-01
+728 1159 1.66666666666667e-01
+728 910 -1.66666666666667e-01
+728 726 -3.33333333333333e-01
+728 1158 1.66666666666667e-01
+728 1041 1.66666666666667e-01
+729 729 2.50000000000000e+00
+729 1171 1.66666666666667e-01
+729 1170 -2.50000000000000e-01
+729 1085 -1.66666666666667e-01
+729 1084 8.33333333333333e-02
+729 1151 1.66666666666667e-01
+729 1183 8.33333333333333e-02
+729 1150 1.66666666666667e-01
+729 1149 -7.50000000000000e-01
+729 1184 8.33333333333333e-02
+729 1096 -8.33333333333333e-02
+729 1097 1.66666666666667e-01
+729 731 -3.33333333333333e-01
+729 818 -8.33333333333333e-02
+729 1095 -2.50000000000000e-01
+729 1175 8.33333333333333e-02
+729 932 -8.33333333333333e-02
+729 1174 -1.66666666666667e-01
+729 1067 8.33333333333333e-02
+729 1168 1.66666666666667e-01
+729 730 -3.33333333333333e-01
+729 1169 1.66666666666667e-01
+729 931 -8.33333333333333e-02
+729 1167 -7.50000000000000e-01
+729 1066 8.33333333333333e-02
+729 817 -8.33333333333333e-02
+729 1133 -8.33333333333333e-02
+729 1121 8.33333333333333e-02
+729 1180 8.33333333333333e-02
+729 1177 -8.33333333333333e-02
+729 1120 -1.66666666666667e-01
+729 1132 1.66666666666667e-01
+729 1131 -2.50000000000000e-01
+729 1178 1.66666666666667e-01
+729 1181 -1.66666666666667e-01
+729 1176 -2.50000000000000e-01
+729 1172 -8.33333333333333e-02
+730 730 2.50000000000000e+00
+730 1170 1.66666666666667e-01
+730 1172 1.66666666666667e-01
+730 1171 -7.50000000000000e-01
+730 1083 8.33333333333333e-02
+730 1151 -8.33333333333333e-02
+730 1182 8.33333333333333e-02
+730 1150 -2.50000000000000e-01
+730 1149 1.66666666666667e-01
+730 1184 -1.66666666666667e-01
+730 1095 -8.33333333333333e-02
+730 1175 8.33333333333333e-02
+730 1097 1.66666666666667e-01
+730 1096 -2.50000000000000e-01
+730 1173 -1.66666666666667e-01
+730 1169 -8.33333333333333e-02
+730 1167 1.66666666666667e-01
+730 729 -3.33333333333333e-01
+730 1168 -2.50000000000000e-01
+730 930 -8.33333333333333e-02
+730 1067 -1.66666666666667e-01
+730 1065 8.33333333333333e-02
+730 816 -8.33333333333333e-02
+730 1133 1.66666666666667e-01
+730 731 -3.33333333333333e-01
+730 1178 1.66666666666667e-01
+730 1179 8.33333333333333e-02
+730 1176 -8.33333333333333e-02
+730 1121 8.33333333333333e-02
+730 818 -8.33333333333333e-02
+730 1132 -7.50000000000000e-01
+730 1119 -1.66666666666667e-01
+730 1131 1.66666666666667e-01
+730 1181 8.33333333333333e-02
+730 932 -8.33333333333333e-02
+730 1177 -2.50000000000000e-01
+730 1085 8.33333333333333e-02
+731 731 2.50000000000000e+00
+731 1084 8.33333333333333e-02
+731 1172 -2.50000000000000e-01
+731 1171 1.66666666666667e-01
+731 1083 -1.66666666666667e-01
+731 1150 -8.33333333333333e-02
+731 1149 1.66666666666667e-01
+731 1151 -2.50000000000000e-01
+731 1183 -1.66666666666667e-01
+731 1182 8.33333333333333e-02
+731 1174 8.33333333333333e-02
+731 1095 1.66666666666667e-01
+731 729 -3.33333333333333e-01
+731 1097 -7.50000000000000e-01
+731 1096 1.66666666666667e-01
+731 816 -8.33333333333333e-02
+731 1173 8.33333333333333e-02
+731 930 -8.33333333333333e-02
+731 1168 -8.33333333333333e-02
+731 1065 8.33333333333333e-02
+731 1169 -2.50000000000000e-01
+731 1167 1.66666666666667e-01
+731 1066 -1.66666666666667e-01
+731 1131 -8.33333333333333e-02
+731 1119 8.33333333333333e-02
+731 1132 1.66666666666667e-01
+731 730 -3.33333333333333e-01
+731 1177 1.66666666666667e-01
+731 1133 -2.50000000000000e-01
+731 1120 8.33333333333333e-02
+731 817 -8.33333333333333e-02
+731 1178 -7.50000000000000e-01
+731 1170 -8.33333333333333e-02
+731 1180 8.33333333333333e-02
+731 931 -8.33333333333333e-02
+731 1176 1.66666666666667e-01
+731 1179 -1.66666666666667e-01
+732 732 5.83333333333333e-01
+732 734 -1.66666666666667e-01
+732 1187 8.33333333333333e-02
+732 1189 4.16666666666667e-02
+732 1186 -4.16666666666667e-02
+732 824 -4.16666666666667e-02
+732 1070 4.16666666666667e-02
+732 823 4.16666666666667e-02
+732 1069 -8.33333333333333e-02
+732 822 -4.16666666666667e-02
+732 1185 -1.25000000000000e-01
+732 860 -4.16666666666667e-02
+732 1190 4.16666666666667e-02
+732 733 -8.33333333333333e-02
+732 859 4.16666666666667e-02
+732 1099 8.33333333333333e-02
+732 1100 8.33333333333333e-02
+732 858 -4.16666666666667e-02
+732 1098 -3.75000000000000e-01
+733 733 5.00000000000000e-01
+733 1070 4.16666666666667e-02
+733 1188 4.16666666666667e-02
+733 1185 -4.16666666666667e-02
+733 824 4.16666666666667e-02
+733 734 -8.33333333333333e-02
+733 1187 8.33333333333333e-02
+733 823 -1.25000000000000e-01
+733 1186 -1.25000000000000e-01
+733 822 4.16666666666667e-02
+733 1068 -8.33333333333333e-02
+733 860 4.16666666666667e-02
+733 1190 -8.33333333333333e-02
+733 1100 -4.16666666666667e-02
+733 859 -1.25000000000000e-01
+733 1099 -1.25000000000000e-01
+733 732 -8.33333333333333e-02
+733 858 4.16666666666667e-02
+733 1098 8.33333333333333e-02
+734 734 5.83333333333333e-01
+734 1069 4.16666666666667e-02
+734 1098 8.33333333333333e-02
+734 732 -1.66666666666667e-01
+734 1185 8.33333333333333e-02
+734 824 -4.16666666666667e-02
+734 1187 -3.75000000000000e-01
+734 823 4.16666666666667e-02
+734 733 -8.33333333333333e-02
+734 1186 8.33333333333333e-02
+734 822 -4.16666666666667e-02
+734 1068 4.16666666666667e-02
+734 1099 -4.16666666666667e-02
+734 860 -4.16666666666667e-02
+734 1100 -1.25000000000000e-01
+734 859 4.16666666666667e-02
+734 1189 -8.33333333333333e-02
+734 858 -4.16666666666667e-02
+734 1188 4.16666666666667e-02
+735 735 5.83333333333333e-01
+735 1193 -4.16666666666667e-02
+735 736 -1.66666666666667e-01
+735 1192 8.33333333333333e-02
+735 1135 8.33333333333333e-02
+735 827 4.16666666666667e-02
+735 1073 -8.33333333333333e-02
+735 826 -4.16666666666667e-02
+735 1072 4.16666666666667e-02
+735 825 -4.16666666666667e-02
+735 1191 -1.25000000000000e-01
+735 737 -8.33333333333333e-02
+735 896 4.16666666666667e-02
+735 1136 8.33333333333333e-02
+735 895 -4.16666666666667e-02
+735 1195 4.16666666666667e-02
+735 1196 4.16666666666667e-02
+735 894 -4.16666666666667e-02
+735 1134 -3.75000000000000e-01
+736 736 5.83333333333333e-01
+736 1136 -4.16666666666667e-02
+736 735 -1.66666666666667e-01
+736 1191 8.33333333333333e-02
+736 1134 8.33333333333333e-02
+736 827 4.16666666666667e-02
+736 737 -8.33333333333333e-02
+736 1193 8.33333333333333e-02
+736 826 -4.16666666666667e-02
+736 1192 -3.75000000000000e-01
+736 825 -4.16666666666667e-02
+736 1071 4.16666666666667e-02
+736 896 4.16666666666667e-02
+736 1196 -8.33333333333333e-02
+736 1073 4.16666666666667e-02
+736 895 -4.16666666666667e-02
+736 1135 -1.25000000000000e-01
+736 894 -4.16666666666667e-02
+736 1194 4.16666666666667e-02
+737 737 5.00000000000000e-01
+737 1191 -4.16666666666667e-02
+737 1072 4.16666666666667e-02
+737 1135 -4.16666666666667e-02
+737 827 -1.25000000000000e-01
+737 1193 -1.25000000000000e-01
+737 826 4.16666666666667e-02
+737 736 -8.33333333333333e-02
+737 1192 8.33333333333333e-02
+737 825 4.16666666666667e-02
+737 1071 -8.33333333333333e-02
+737 1194 4.16666666666667e-02
+737 896 -1.25000000000000e-01
+737 1136 -1.25000000000000e-01
+737 895 4.16666666666667e-02
+737 1195 -8.33333333333333e-02
+737 735 -8.33333333333333e-02
+737 894 4.16666666666667e-02
+737 1134 8.33333333333333e-02
+738 738 1.25000000000000e+00
+738 1102 8.33333333333333e-02
+738 1186 -4.16666666666667e-02
+738 1103 -1.66666666666667e-01
+738 830 4.16666666666667e-02
+738 1185 -1.25000000000000e-01
+738 1199 -4.16666666666667e-02
+738 935 4.16666666666667e-02
+738 739 -1.66666666666667e-01
+738 1198 8.33333333333333e-02
+738 1197 -1.25000000000000e-01
+738 1193 -4.16666666666667e-02
+738 1192 8.33333333333333e-02
+738 1076 -8.33333333333333e-02
+738 1139 8.33333333333333e-02
+738 1168 1.66666666666667e-01
+738 1138 -1.66666666666667e-01
+738 829 4.16666666666667e-02
+738 1075 -8.33333333333333e-02
+738 1191 -1.25000000000000e-01
+738 740 -1.66666666666667e-01
+738 1202 8.33333333333333e-02
+738 1169 1.66666666666667e-01
+738 1201 -4.16666666666667e-02
+738 934 4.16666666666667e-02
+738 1187 8.33333333333333e-02
+738 1200 -1.25000000000000e-01
+738 1167 -7.50000000000000e-01
+739 739 1.25000000000000e+00
+739 1185 -4.16666666666667e-02
+739 1103 8.33333333333333e-02
+739 1187 8.33333333333333e-02
+739 1186 -1.25000000000000e-01
+739 1199 8.33333333333333e-02
+739 1198 -3.75000000000000e-01
+739 738 -1.66666666666667e-01
+739 1197 8.33333333333333e-02
+739 1169 -8.33333333333333e-02
+739 740 -1.66666666666667e-01
+739 1076 -8.33333333333333e-02
+739 1139 8.33333333333333e-02
+739 1191 8.33333333333333e-02
+739 1167 1.66666666666667e-01
+739 1137 -1.66666666666667e-01
+739 830 -8.33333333333333e-02
+739 1193 8.33333333333333e-02
+739 1192 -3.75000000000000e-01
+739 828 4.16666666666667e-02
+739 1074 -8.33333333333333e-02
+739 1202 8.33333333333333e-02
+739 935 -8.33333333333333e-02
+739 1101 8.33333333333333e-02
+739 1201 -1.25000000000000e-01
+739 1168 -2.50000000000000e-01
+739 1200 -4.16666666666667e-02
+739 933 4.16666666666667e-02
+740 740 1.25000000000000e+00
+740 1102 8.33333333333333e-02
+740 1101 -1.66666666666667e-01
+740 1187 -3.75000000000000e-01
+740 1186 8.33333333333333e-02
+740 828 4.16666666666667e-02
+740 1199 -1.25000000000000e-01
+740 1198 8.33333333333333e-02
+740 1197 -4.16666666666667e-02
+740 933 4.16666666666667e-02
+740 1168 -8.33333333333333e-02
+740 739 -1.66666666666667e-01
+740 1191 -4.16666666666667e-02
+740 1075 -8.33333333333333e-02
+740 1138 8.33333333333333e-02
+740 1074 -8.33333333333333e-02
+740 1137 8.33333333333333e-02
+740 1193 -1.25000000000000e-01
+740 829 -8.33333333333333e-02
+740 1192 8.33333333333333e-02
+740 1185 8.33333333333333e-02
+740 1202 -3.75000000000000e-01
+740 1169 -2.50000000000000e-01
+740 1201 8.33333333333333e-02
+740 934 -8.33333333333333e-02
+740 738 -1.66666666666667e-01
+740 1200 8.33333333333333e-02
+740 1167 1.66666666666667e-01
+741 741 5.00000000000000e-01
+741 992 -4.16666666666667e-02
+741 1207 4.16666666666667e-02
+741 1204 -4.16666666666667e-02
+741 845 4.16666666666667e-02
+741 1208 -8.33333333333333e-02
+741 844 4.16666666666667e-02
+741 742 -8.33333333333333e-02
+741 991 8.33333333333333e-02
+741 843 -1.25000000000000e-01
+741 990 -1.25000000000000e-01
+741 743 -8.33333333333333e-02
+741 833 4.16666666666667e-02
+741 1205 8.33333333333333e-02
+741 832 4.16666666666667e-02
+741 976 -8.33333333333333e-02
+741 977 4.16666666666667e-02
+741 831 -1.25000000000000e-01
+741 1203 -1.25000000000000e-01
+742 742 5.83333333333333e-01
+742 992 8.33333333333333e-02
+742 1205 8.33333333333333e-02
+742 1206 4.16666666666667e-02
+742 1203 -4.16666666666667e-02
+742 845 -4.16666666666667e-02
+742 1208 4.16666666666667e-02
+742 844 -4.16666666666667e-02
+742 991 -3.75000000000000e-01
+742 843 4.16666666666667e-02
+742 741 -8.33333333333333e-02
+742 990 8.33333333333333e-02
+742 833 -4.16666666666667e-02
+742 977 4.16666666666667e-02
+742 743 -1.66666666666667e-01
+742 832 -4.16666666666667e-02
+742 1204 -1.25000000000000e-01
+742 831 4.16666666666667e-02
+742 975 -8.33333333333333e-02
+743 743 5.83333333333333e-01
+743 990 -4.16666666666667e-02
+743 742 -1.66666666666667e-01
+743 991 8.33333333333333e-02
+743 1204 8.33333333333333e-02
+743 845 -4.16666666666667e-02
+743 992 -1.25000000000000e-01
+743 844 -4.16666666666667e-02
+743 1207 4.16666666666667e-02
+743 843 4.16666666666667e-02
+743 1206 -8.33333333333333e-02
+743 975 4.16666666666667e-02
+743 833 -4.16666666666667e-02
+743 1205 -3.75000000000000e-01
+743 832 -4.16666666666667e-02
+743 976 4.16666666666667e-02
+743 741 -8.33333333333333e-02
+743 831 4.16666666666667e-02
+743 1203 8.33333333333333e-02
+744 744 1.25000000000000e+00
+744 994 8.33333333333333e-02
+744 995 8.33333333333333e-02
+744 1205 8.33333333333333e-02
+744 1203 -1.25000000000000e-01
+744 1217 8.33333333333333e-02
+744 1216 8.33333333333333e-02
+744 745 -1.66666666666667e-01
+744 1215 -3.75000000000000e-01
+744 1046 -8.33333333333333e-02
+744 746 -1.66666666666667e-01
+744 980 -8.33333333333333e-02
+744 1034 8.33333333333333e-02
+744 1210 8.33333333333333e-02
+744 1045 1.66666666666667e-01
+744 1033 -1.66666666666667e-01
+744 1211 8.33333333333333e-02
+744 836 -8.33333333333333e-02
+744 835 4.16666666666667e-02
+744 979 -8.33333333333333e-02
+744 1209 -3.75000000000000e-01
+744 1220 8.33333333333333e-02
+744 914 -8.33333333333333e-02
+744 1219 -4.16666666666667e-02
+744 913 4.16666666666667e-02
+744 1218 -1.25000000000000e-01
+744 1204 -4.16666666666667e-02
+744 1044 -2.50000000000000e-01
+745 745 1.25000000000000e+00
+745 1203 -4.16666666666667e-02
+745 993 8.33333333333333e-02
+745 995 -1.66666666666667e-01
+745 836 4.16666666666667e-02
+745 1204 -1.25000000000000e-01
+745 1217 -4.16666666666667e-02
+745 914 4.16666666666667e-02
+745 1216 -1.25000000000000e-01
+745 1215 8.33333333333333e-02
+745 744 -1.66666666666667e-01
+745 1211 -4.16666666666667e-02
+745 1209 8.33333333333333e-02
+745 980 -8.33333333333333e-02
+745 1034 8.33333333333333e-02
+745 1044 1.66666666666667e-01
+745 1032 -1.66666666666667e-01
+745 1210 -1.25000000000000e-01
+745 834 4.16666666666667e-02
+745 978 -8.33333333333333e-02
+745 1220 8.33333333333333e-02
+745 746 -1.66666666666667e-01
+745 1046 1.66666666666667e-01
+745 1219 -1.25000000000000e-01
+745 1205 8.33333333333333e-02
+745 1045 -7.50000000000000e-01
+745 1218 -4.16666666666667e-02
+745 912 4.16666666666667e-02
+746 746 1.25000000000000e+00
+746 994 -1.66666666666667e-01
+746 993 8.33333333333333e-02
+746 1205 -3.75000000000000e-01
+746 835 4.16666666666667e-02
+746 1203 8.33333333333333e-02
+746 1217 -1.25000000000000e-01
+746 1216 -4.16666666666667e-02
+746 913 4.16666666666667e-02
+746 1215 8.33333333333333e-02
+746 1044 -8.33333333333333e-02
+746 1210 -4.16666666666667e-02
+746 744 -1.66666666666667e-01
+746 978 -8.33333333333333e-02
+746 1032 8.33333333333333e-02
+746 979 -8.33333333333333e-02
+746 1033 8.33333333333333e-02
+746 1211 -1.25000000000000e-01
+746 1209 8.33333333333333e-02
+746 834 -8.33333333333333e-02
+746 1220 -3.75000000000000e-01
+746 1204 8.33333333333333e-02
+746 1046 -2.50000000000000e-01
+746 1219 8.33333333333333e-02
+746 745 -1.66666666666667e-01
+746 1045 1.66666666666667e-01
+746 1218 8.33333333333333e-02
+746 912 -8.33333333333333e-02
+747 747 5.00000000000000e-01
+747 1106 -4.16666666666667e-02
+747 1225 4.16666666666667e-02
+747 1222 -4.16666666666667e-02
+747 863 4.16666666666667e-02
+747 1226 -8.33333333333333e-02
+747 862 4.16666666666667e-02
+747 748 -8.33333333333333e-02
+747 1105 8.33333333333333e-02
+747 861 -1.25000000000000e-01
+747 1104 -1.25000000000000e-01
+747 749 -8.33333333333333e-02
+747 848 4.16666666666667e-02
+747 1223 8.33333333333333e-02
+747 847 4.16666666666667e-02
+747 1087 -8.33333333333333e-02
+747 1088 4.16666666666667e-02
+747 846 -1.25000000000000e-01
+747 1221 -1.25000000000000e-01
+748 748 5.83333333333333e-01
+748 1106 8.33333333333333e-02
+748 1223 8.33333333333333e-02
+748 1224 4.16666666666667e-02
+748 1221 -4.16666666666667e-02
+748 863 -4.16666666666667e-02
+748 1226 4.16666666666667e-02
+748 862 -4.16666666666667e-02
+748 1105 -3.75000000000000e-01
+748 861 4.16666666666667e-02
+748 747 -8.33333333333333e-02
+748 1104 8.33333333333333e-02
+748 848 -4.16666666666667e-02
+748 1088 4.16666666666667e-02
+748 749 -1.66666666666667e-01
+748 847 -4.16666666666667e-02
+748 1222 -1.25000000000000e-01
+748 846 4.16666666666667e-02
+748 1086 -8.33333333333333e-02
+749 749 5.83333333333333e-01
+749 1104 -4.16666666666667e-02
+749 748 -1.66666666666667e-01
+749 1105 8.33333333333333e-02
+749 1222 8.33333333333333e-02
+749 863 -4.16666666666667e-02
+749 1106 -1.25000000000000e-01
+749 862 -4.16666666666667e-02
+749 1225 4.16666666666667e-02
+749 861 4.16666666666667e-02
+749 1224 -8.33333333333333e-02
+749 1086 4.16666666666667e-02
+749 848 -4.16666666666667e-02
+749 1223 -3.75000000000000e-01
+749 847 -4.16666666666667e-02
+749 1087 4.16666666666667e-02
+749 747 -8.33333333333333e-02
+749 846 4.16666666666667e-02
+749 1221 8.33333333333333e-02
+750 750 1.25000000000000e+00
+750 751 -1.66666666666667e-01
+750 1232 -8.33333333333333e-02
+750 916 -4.16666666666667e-02
+750 1231 4.16666666666667e-02
+750 1229 8.33333333333333e-02
+750 850 -4.16666666666667e-02
+750 1227 -3.75000000000000e-01
+750 1207 4.16666666666667e-02
+750 851 8.33333333333333e-02
+750 1208 -8.33333333333333e-02
+750 752 -1.66666666666667e-01
+750 1217 8.33333333333333e-02
+750 917 8.33333333333333e-02
+750 1216 8.33333333333333e-02
+750 1215 -3.75000000000000e-01
+750 997 -8.33333333333333e-02
+750 1090 8.33333333333333e-02
+750 1091 8.33333333333333e-02
+750 998 -8.33333333333333e-02
+750 849 -1.25000000000000e-01
+750 1154 -8.33333333333333e-02
+750 1049 8.33333333333333e-02
+750 1153 1.66666666666667e-01
+750 1048 -1.66666666666667e-01
+750 1152 -2.50000000000000e-01
+750 1228 8.33333333333333e-02
+750 915 -1.25000000000000e-01
+751 751 1.25000000000000e+00
+751 1232 4.16666666666667e-02
+751 1227 8.33333333333333e-02
+751 750 -1.66666666666667e-01
+751 915 -4.16666666666667e-02
+751 1230 4.16666666666667e-02
+751 1228 -1.25000000000000e-01
+751 849 -4.16666666666667e-02
+751 1206 4.16666666666667e-02
+751 1208 4.16666666666667e-02
+751 1217 -4.16666666666667e-02
+751 1216 -1.25000000000000e-01
+751 1215 8.33333333333333e-02
+751 996 -8.33333333333333e-02
+751 1089 8.33333333333333e-02
+751 998 -8.33333333333333e-02
+751 1049 8.33333333333333e-02
+751 1091 -1.66666666666667e-01
+751 851 8.33333333333333e-02
+751 850 -1.25000000000000e-01
+751 1154 1.66666666666667e-01
+751 752 -1.66666666666667e-01
+751 917 8.33333333333333e-02
+751 1153 -7.50000000000000e-01
+751 1229 -4.16666666666667e-02
+751 916 -1.25000000000000e-01
+751 1152 1.66666666666667e-01
+751 1047 -1.66666666666667e-01
+752 752 1.25000000000000e+00
+752 1231 4.16666666666667e-02
+752 1230 -8.33333333333333e-02
+752 1229 -1.25000000000000e-01
+752 1227 8.33333333333333e-02
+752 1207 4.16666666666667e-02
+752 849 8.33333333333333e-02
+752 1206 -8.33333333333333e-02
+752 1217 -1.25000000000000e-01
+752 1216 -4.16666666666667e-02
+752 750 -1.66666666666667e-01
+752 1215 8.33333333333333e-02
+752 915 8.33333333333333e-02
+752 997 -8.33333333333333e-02
+752 1048 8.33333333333333e-02
+752 851 -3.75000000000000e-01
+752 1090 -1.66666666666667e-01
+752 850 8.33333333333333e-02
+752 1089 8.33333333333333e-02
+752 996 -8.33333333333333e-02
+752 1154 -2.50000000000000e-01
+752 1228 -4.16666666666667e-02
+752 917 -3.75000000000000e-01
+752 1153 1.66666666666667e-01
+752 751 -1.66666666666667e-01
+752 916 8.33333333333333e-02
+752 1152 -8.33333333333333e-02
+752 1047 8.33333333333333e-02
+753 753 1.25000000000000e+00
+753 1108 8.33333333333333e-02
+753 1109 8.33333333333333e-02
+753 1223 8.33333333333333e-02
+753 1221 -1.25000000000000e-01
+753 1235 8.33333333333333e-02
+753 1234 8.33333333333333e-02
+753 754 -1.66666666666667e-01
+753 1233 -3.75000000000000e-01
+753 1172 -8.33333333333333e-02
+753 755 -1.66666666666667e-01
+753 1094 -8.33333333333333e-02
+753 1157 8.33333333333333e-02
+753 1228 8.33333333333333e-02
+753 1171 1.66666666666667e-01
+753 1156 -1.66666666666667e-01
+753 1229 8.33333333333333e-02
+753 854 -8.33333333333333e-02
+753 853 4.16666666666667e-02
+753 1093 -8.33333333333333e-02
+753 1227 -3.75000000000000e-01
+753 1238 8.33333333333333e-02
+753 938 -8.33333333333333e-02
+753 1237 -4.16666666666667e-02
+753 937 4.16666666666667e-02
+753 1236 -1.25000000000000e-01
+753 1222 -4.16666666666667e-02
+753 1170 -2.50000000000000e-01
+754 754 1.25000000000000e+00
+754 1221 -4.16666666666667e-02
+754 1107 8.33333333333333e-02
+754 1109 -1.66666666666667e-01
+754 854 4.16666666666667e-02
+754 1222 -1.25000000000000e-01
+754 1235 -4.16666666666667e-02
+754 938 4.16666666666667e-02
+754 1234 -1.25000000000000e-01
+754 1233 8.33333333333333e-02
+754 753 -1.66666666666667e-01
+754 1229 -4.16666666666667e-02
+754 1227 8.33333333333333e-02
+754 1094 -8.33333333333333e-02
+754 1157 8.33333333333333e-02
+754 1170 1.66666666666667e-01
+754 1155 -1.66666666666667e-01
+754 1228 -1.25000000000000e-01
+754 852 4.16666666666667e-02
+754 1092 -8.33333333333333e-02
+754 1238 8.33333333333333e-02
+754 755 -1.66666666666667e-01
+754 1172 1.66666666666667e-01
+754 1237 -1.25000000000000e-01
+754 1223 8.33333333333333e-02
+754 1171 -7.50000000000000e-01
+754 1236 -4.16666666666667e-02
+754 936 4.16666666666667e-02
+755 755 1.25000000000000e+00
+755 1108 -1.66666666666667e-01
+755 1107 8.33333333333333e-02
+755 1223 -3.75000000000000e-01
+755 853 4.16666666666667e-02
+755 1221 8.33333333333333e-02
+755 1235 -1.25000000000000e-01
+755 1234 -4.16666666666667e-02
+755 937 4.16666666666667e-02
+755 1233 8.33333333333333e-02
+755 1170 -8.33333333333333e-02
+755 1228 -4.16666666666667e-02
+755 753 -1.66666666666667e-01
+755 1092 -8.33333333333333e-02
+755 1155 8.33333333333333e-02
+755 1093 -8.33333333333333e-02
+755 1156 8.33333333333333e-02
+755 1229 -1.25000000000000e-01
+755 1227 8.33333333333333e-02
+755 852 -8.33333333333333e-02
+755 1238 -3.75000000000000e-01
+755 1222 8.33333333333333e-02
+755 1172 -2.50000000000000e-01
+755 1237 8.33333333333333e-02
+755 754 -1.66666666666667e-01
+755 1171 1.66666666666667e-01
+755 1236 8.33333333333333e-02
+755 936 -8.33333333333333e-02
+756 756 6.66666666666667e-01
+756 866 4.16666666666667e-02
+756 1226 -8.33333333333333e-02
+756 758 -8.33333333333333e-02
+756 1235 8.33333333333333e-02
+756 941 4.16666666666667e-02
+756 1234 8.33333333333333e-02
+756 1233 -3.75000000000000e-01
+756 1111 -8.33333333333333e-02
+756 1189 4.16666666666667e-02
+756 1190 4.16666666666667e-02
+756 1112 -8.33333333333333e-02
+756 864 -8.33333333333333e-02
+756 1199 -4.16666666666667e-02
+756 1175 8.33333333333333e-02
+756 1198 8.33333333333333e-02
+756 1174 -1.66666666666667e-01
+756 1197 -1.25000000000000e-01
+756 1225 4.16666666666667e-02
+756 939 -8.33333333333333e-02
+757 757 6.66666666666667e-01
+757 1226 4.16666666666667e-02
+757 1235 -4.16666666666667e-02
+757 1234 -1.25000000000000e-01
+757 1233 8.33333333333333e-02
+757 1110 -8.33333333333333e-02
+757 1188 4.16666666666667e-02
+757 1112 -8.33333333333333e-02
+757 1175 8.33333333333333e-02
+757 1190 -8.33333333333333e-02
+757 866 4.16666666666667e-02
+757 865 -8.33333333333333e-02
+757 1199 8.33333333333333e-02
+757 758 -8.33333333333333e-02
+757 941 4.16666666666667e-02
+757 1198 -3.75000000000000e-01
+757 1224 4.16666666666667e-02
+757 940 -8.33333333333333e-02
+757 1197 8.33333333333333e-02
+757 1173 -1.66666666666667e-01
+758 758 7.50000000000000e-01
+758 864 4.16666666666667e-02
+758 1224 -8.33333333333333e-02
+758 1235 -1.25000000000000e-01
+758 1234 -4.16666666666667e-02
+758 756 -8.33333333333333e-02
+758 1233 8.33333333333333e-02
+758 939 4.16666666666667e-02
+758 1111 -8.33333333333333e-02
+758 1174 8.33333333333333e-02
+758 866 -2.50000000000000e-01
+758 1189 -8.33333333333333e-02
+758 865 4.16666666666667e-02
+758 1188 4.16666666666667e-02
+758 1110 -8.33333333333333e-02
+758 1199 -1.25000000000000e-01
+758 1225 4.16666666666667e-02
+758 941 -2.50000000000000e-01
+758 1198 8.33333333333333e-02
+758 757 -8.33333333333333e-02
+758 940 4.16666666666667e-02
+758 1197 -4.16666666666667e-02
+758 1173 8.33333333333333e-02
+759 759 5.00000000000000e-01
+759 1006 4.16666666666667e-02
+759 1244 4.16666666666667e-02
+759 1241 -4.16666666666667e-02
+759 869 4.16666666666667e-02
+759 1007 -8.33333333333333e-02
+759 868 4.16666666666667e-02
+759 760 -8.33333333333333e-02
+759 1240 8.33333333333333e-02
+759 867 -1.25000000000000e-01
+759 1239 -1.25000000000000e-01
+759 761 -8.33333333333333e-02
+759 881 4.16666666666667e-02
+759 1022 8.33333333333333e-02
+759 880 4.16666666666667e-02
+759 1243 -8.33333333333333e-02
+759 1021 -4.16666666666667e-02
+759 879 -1.25000000000000e-01
+759 1020 -1.25000000000000e-01
+760 760 5.83333333333333e-01
+760 1005 4.16666666666667e-02
+760 1022 8.33333333333333e-02
+760 761 -1.66666666666667e-01
+760 1241 8.33333333333333e-02
+760 869 -4.16666666666667e-02
+760 1007 4.16666666666667e-02
+760 868 -4.16666666666667e-02
+760 1240 -3.75000000000000e-01
+760 867 4.16666666666667e-02
+760 759 -8.33333333333333e-02
+760 1239 8.33333333333333e-02
+760 881 -4.16666666666667e-02
+760 1244 4.16666666666667e-02
+760 1020 -4.16666666666667e-02
+760 880 -4.16666666666667e-02
+760 1021 -1.25000000000000e-01
+760 879 4.16666666666667e-02
+760 1242 -8.33333333333333e-02
+761 761 5.83333333333333e-01
+761 760 -1.66666666666667e-01
+761 1240 8.33333333333333e-02
+761 1242 4.16666666666667e-02
+761 1239 -4.16666666666667e-02
+761 869 -4.16666666666667e-02
+761 1241 -1.25000000000000e-01
+761 868 -4.16666666666667e-02
+761 1006 4.16666666666667e-02
+761 867 4.16666666666667e-02
+761 1005 -8.33333333333333e-02
+761 1021 8.33333333333333e-02
+761 881 -4.16666666666667e-02
+761 1022 -3.75000000000000e-01
+761 880 -4.16666666666667e-02
+761 1243 4.16666666666667e-02
+761 759 -8.33333333333333e-02
+761 879 4.16666666666667e-02
+761 1020 8.33333333333333e-02
+762 762 1.25000000000000e+00
+762 1037 -1.66666666666667e-01
+762 1036 8.33333333333333e-02
+762 872 4.16666666666667e-02
+762 1246 8.33333333333333e-02
+762 1245 -3.75000000000000e-01
+762 1256 -4.16666666666667e-02
+762 920 4.16666666666667e-02
+762 1255 8.33333333333333e-02
+762 1254 -1.25000000000000e-01
+762 1010 -8.33333333333333e-02
+762 1009 -8.33333333333333e-02
+762 1025 8.33333333333333e-02
+762 1241 -4.16666666666667e-02
+762 763 -1.66666666666667e-01
+762 1024 8.33333333333333e-02
+762 1051 -8.33333333333333e-02
+762 871 -8.33333333333333e-02
+762 1240 8.33333333333333e-02
+762 1239 -1.25000000000000e-01
+762 764 -1.66666666666667e-01
+762 1253 8.33333333333333e-02
+762 1052 1.66666666666667e-01
+762 1252 8.33333333333333e-02
+762 919 -8.33333333333333e-02
+762 1247 8.33333333333333e-02
+762 1251 -3.75000000000000e-01
+762 1050 -2.50000000000000e-01
+763 763 1.25000000000000e+00
+763 1037 8.33333333333333e-02
+763 1035 8.33333333333333e-02
+763 1246 -1.25000000000000e-01
+763 1245 8.33333333333333e-02
+763 1256 8.33333333333333e-02
+763 764 -1.66666666666667e-01
+763 1255 -3.75000000000000e-01
+763 1254 8.33333333333333e-02
+763 1008 -8.33333333333333e-02
+763 1241 8.33333333333333e-02
+763 762 -1.66666666666667e-01
+763 1025 -1.66666666666667e-01
+763 1052 1.66666666666667e-01
+763 1023 8.33333333333333e-02
+763 1050 -8.33333333333333e-02
+763 872 4.16666666666667e-02
+763 1010 -8.33333333333333e-02
+763 1240 -3.75000000000000e-01
+763 870 -8.33333333333333e-02
+763 1239 8.33333333333333e-02
+763 1253 -4.16666666666667e-02
+763 920 4.16666666666667e-02
+763 1247 -4.16666666666667e-02
+763 1252 -1.25000000000000e-01
+763 1051 -2.50000000000000e-01
+763 1251 8.33333333333333e-02
+763 918 -8.33333333333333e-02
+764 764 1.25000000000000e+00
+764 1036 8.33333333333333e-02
+764 1245 8.33333333333333e-02
+764 1035 -1.66666666666667e-01
+764 1247 -1.25000000000000e-01
+764 870 4.16666666666667e-02
+764 1256 -1.25000000000000e-01
+764 1255 8.33333333333333e-02
+764 763 -1.66666666666667e-01
+764 1254 -4.16666666666667e-02
+764 918 4.16666666666667e-02
+764 1008 -8.33333333333333e-02
+764 1240 8.33333333333333e-02
+764 1023 8.33333333333333e-02
+764 1239 -4.16666666666667e-02
+764 1024 -1.66666666666667e-01
+764 1051 1.66666666666667e-01
+764 1241 -1.25000000000000e-01
+764 871 4.16666666666667e-02
+764 1009 -8.33333333333333e-02
+764 1246 -4.16666666666667e-02
+764 1253 -1.25000000000000e-01
+764 1052 -7.50000000000000e-01
+764 1252 -4.16666666666667e-02
+764 919 4.16666666666667e-02
+764 762 -1.66666666666667e-01
+764 1251 8.33333333333333e-02
+764 1050 1.66666666666667e-01
+765 765 5.00000000000000e-01
+765 1123 4.16666666666667e-02
+765 1262 4.16666666666667e-02
+765 1259 -4.16666666666667e-02
+765 884 4.16666666666667e-02
+765 1124 -8.33333333333333e-02
+765 883 4.16666666666667e-02
+765 766 -8.33333333333333e-02
+765 1258 8.33333333333333e-02
+765 882 -1.25000000000000e-01
+765 1257 -1.25000000000000e-01
+765 767 -8.33333333333333e-02
+765 899 4.16666666666667e-02
+765 1142 8.33333333333333e-02
+765 898 4.16666666666667e-02
+765 1261 -8.33333333333333e-02
+765 1141 -4.16666666666667e-02
+765 897 -1.25000000000000e-01
+765 1140 -1.25000000000000e-01
+766 766 5.83333333333333e-01
+766 1122 4.16666666666667e-02
+766 1142 8.33333333333333e-02
+766 767 -1.66666666666667e-01
+766 1259 8.33333333333333e-02
+766 884 -4.16666666666667e-02
+766 1124 4.16666666666667e-02
+766 883 -4.16666666666667e-02
+766 1258 -3.75000000000000e-01
+766 882 4.16666666666667e-02
+766 765 -8.33333333333333e-02
+766 1257 8.33333333333333e-02
+766 899 -4.16666666666667e-02
+766 1262 4.16666666666667e-02
+766 1140 -4.16666666666667e-02
+766 898 -4.16666666666667e-02
+766 1141 -1.25000000000000e-01
+766 897 4.16666666666667e-02
+766 1260 -8.33333333333333e-02
+767 767 5.83333333333333e-01
+767 766 -1.66666666666667e-01
+767 1258 8.33333333333333e-02
+767 1260 4.16666666666667e-02
+767 1257 -4.16666666666667e-02
+767 884 -4.16666666666667e-02
+767 1259 -1.25000000000000e-01
+767 883 -4.16666666666667e-02
+767 1123 4.16666666666667e-02
+767 882 4.16666666666667e-02
+767 1122 -8.33333333333333e-02
+767 1141 8.33333333333333e-02
+767 899 -4.16666666666667e-02
+767 1142 -3.75000000000000e-01
+767 898 -4.16666666666667e-02
+767 1261 4.16666666666667e-02
+767 765 -8.33333333333333e-02
+767 897 4.16666666666667e-02
+767 1140 8.33333333333333e-02
+768 768 1.25000000000000e+00
+768 1265 8.33333333333333e-02
+768 923 -4.16666666666667e-02
+768 1268 4.16666666666667e-02
+768 1267 -8.33333333333333e-02
+768 887 -4.16666666666667e-02
+768 1264 8.33333333333333e-02
+768 1263 -3.75000000000000e-01
+768 1127 8.33333333333333e-02
+768 1126 8.33333333333333e-02
+768 1160 1.66666666666667e-01
+768 1159 -8.33333333333333e-02
+768 1158 -2.50000000000000e-01
+768 1028 -8.33333333333333e-02
+768 1244 4.16666666666667e-02
+768 1027 -8.33333333333333e-02
+768 1054 8.33333333333333e-02
+768 1243 -8.33333333333333e-02
+768 886 8.33333333333333e-02
+768 885 -1.25000000000000e-01
+768 1253 8.33333333333333e-02
+768 1055 -1.66666666666667e-01
+768 1252 8.33333333333333e-02
+768 769 -1.66666666666667e-01
+768 922 8.33333333333333e-02
+768 1251 -3.75000000000000e-01
+768 770 -1.66666666666667e-01
+768 921 -1.25000000000000e-01
+769 769 1.25000000000000e+00
+769 1265 -4.16666666666667e-02
+769 1266 -8.33333333333333e-02
+769 1264 -1.25000000000000e-01
+769 1263 8.33333333333333e-02
+769 1127 -1.66666666666667e-01
+769 887 8.33333333333333e-02
+769 1125 8.33333333333333e-02
+769 1160 1.66666666666667e-01
+769 770 -1.66666666666667e-01
+769 923 8.33333333333333e-02
+769 1159 -2.50000000000000e-01
+769 1158 -8.33333333333333e-02
+769 1026 -8.33333333333333e-02
+769 1053 8.33333333333333e-02
+769 1244 4.16666666666667e-02
+769 1028 -8.33333333333333e-02
+769 886 -3.75000000000000e-01
+769 1242 -8.33333333333333e-02
+769 885 8.33333333333333e-02
+769 1253 -4.16666666666667e-02
+769 1055 8.33333333333333e-02
+769 1252 -1.25000000000000e-01
+769 1268 4.16666666666667e-02
+769 922 -3.75000000000000e-01
+769 1251 8.33333333333333e-02
+769 768 -1.66666666666667e-01
+769 921 8.33333333333333e-02
+770 770 1.25000000000000e+00
+770 1264 -4.16666666666667e-02
+770 768 -1.66666666666667e-01
+770 1263 8.33333333333333e-02
+770 921 -4.16666666666667e-02
+770 1266 4.16666666666667e-02
+770 1265 -1.25000000000000e-01
+770 885 -4.16666666666667e-02
+770 1125 8.33333333333333e-02
+770 1126 -1.66666666666667e-01
+770 886 8.33333333333333e-02
+770 1160 -7.50000000000000e-01
+770 1159 1.66666666666667e-01
+770 769 -1.66666666666667e-01
+770 922 8.33333333333333e-02
+770 1158 1.66666666666667e-01
+770 1026 -8.33333333333333e-02
+770 1242 4.16666666666667e-02
+770 887 -1.25000000000000e-01
+770 1243 4.16666666666667e-02
+770 1027 -8.33333333333333e-02
+770 1253 -1.25000000000000e-01
+770 1267 4.16666666666667e-02
+770 923 -1.25000000000000e-01
+770 1252 -4.16666666666667e-02
+770 1054 8.33333333333333e-02
+770 1251 8.33333333333333e-02
+770 1053 -1.66666666666667e-01
+771 771 1.25000000000000e+00
+771 1163 -1.66666666666667e-01
+771 1162 8.33333333333333e-02
+771 890 4.16666666666667e-02
+771 1264 8.33333333333333e-02
+771 1263 -3.75000000000000e-01
+771 1274 -4.16666666666667e-02
+771 944 4.16666666666667e-02
+771 1273 8.33333333333333e-02
+771 1272 -1.25000000000000e-01
+771 1130 -8.33333333333333e-02
+771 1129 -8.33333333333333e-02
+771 1145 8.33333333333333e-02
+771 1259 -4.16666666666667e-02
+771 772 -1.66666666666667e-01
+771 1144 8.33333333333333e-02
+771 1177 -8.33333333333333e-02
+771 889 -8.33333333333333e-02
+771 1258 8.33333333333333e-02
+771 1257 -1.25000000000000e-01
+771 773 -1.66666666666667e-01
+771 1271 8.33333333333333e-02
+771 1178 1.66666666666667e-01
+771 1270 8.33333333333333e-02
+771 943 -8.33333333333333e-02
+771 1265 8.33333333333333e-02
+771 1269 -3.75000000000000e-01
+771 1176 -2.50000000000000e-01
+772 772 1.25000000000000e+00
+772 1163 8.33333333333333e-02
+772 1161 8.33333333333333e-02
+772 1264 -1.25000000000000e-01
+772 1263 8.33333333333333e-02
+772 1274 8.33333333333333e-02
+772 773 -1.66666666666667e-01
+772 1273 -3.75000000000000e-01
+772 1272 8.33333333333333e-02
+772 1128 -8.33333333333333e-02
+772 1259 8.33333333333333e-02
+772 771 -1.66666666666667e-01
+772 1145 -1.66666666666667e-01
+772 1178 1.66666666666667e-01
+772 1143 8.33333333333333e-02
+772 1176 -8.33333333333333e-02
+772 890 4.16666666666667e-02
+772 1130 -8.33333333333333e-02
+772 1258 -3.75000000000000e-01
+772 888 -8.33333333333333e-02
+772 1257 8.33333333333333e-02
+772 1271 -4.16666666666667e-02
+772 944 4.16666666666667e-02
+772 1265 -4.16666666666667e-02
+772 1270 -1.25000000000000e-01
+772 1177 -2.50000000000000e-01
+772 1269 8.33333333333333e-02
+772 942 -8.33333333333333e-02
+773 773 1.25000000000000e+00
+773 1162 8.33333333333333e-02
+773 1263 8.33333333333333e-02
+773 1161 -1.66666666666667e-01
+773 1265 -1.25000000000000e-01
+773 888 4.16666666666667e-02
+773 1274 -1.25000000000000e-01
+773 1273 8.33333333333333e-02
+773 772 -1.66666666666667e-01
+773 1272 -4.16666666666667e-02
+773 942 4.16666666666667e-02
+773 1128 -8.33333333333333e-02
+773 1258 8.33333333333333e-02
+773 1143 8.33333333333333e-02
+773 1257 -4.16666666666667e-02
+773 1144 -1.66666666666667e-01
+773 1177 1.66666666666667e-01
+773 1259 -1.25000000000000e-01
+773 889 4.16666666666667e-02
+773 1129 -8.33333333333333e-02
+773 1264 -4.16666666666667e-02
+773 1271 -1.25000000000000e-01
+773 1178 -7.50000000000000e-01
+773 1270 -4.16666666666667e-02
+773 943 4.16666666666667e-02
+773 771 -1.66666666666667e-01
+773 1269 8.33333333333333e-02
+773 1176 1.66666666666667e-01
+774 774 6.66666666666667e-01
+774 1195 4.16666666666667e-02
+774 1202 8.33333333333333e-02
+774 1201 -4.16666666666667e-02
+774 1200 -1.25000000000000e-01
+774 1148 -8.33333333333333e-02
+774 1262 4.16666666666667e-02
+774 1147 -8.33333333333333e-02
+774 1180 8.33333333333333e-02
+774 1261 -8.33333333333333e-02
+774 901 4.16666666666667e-02
+774 900 -8.33333333333333e-02
+774 1271 8.33333333333333e-02
+774 1181 -1.66666666666667e-01
+774 1270 8.33333333333333e-02
+774 775 -8.33333333333333e-02
+774 946 4.16666666666667e-02
+774 1269 -3.75000000000000e-01
+774 1196 4.16666666666667e-02
+774 945 -8.33333333333333e-02
+775 775 7.50000000000000e-01
+775 902 4.16666666666667e-02
+775 1194 4.16666666666667e-02
+775 1202 8.33333333333333e-02
+775 776 -8.33333333333333e-02
+775 947 4.16666666666667e-02
+775 1201 -1.25000000000000e-01
+775 1200 -4.16666666666667e-02
+775 1146 -8.33333333333333e-02
+775 1179 8.33333333333333e-02
+775 1262 4.16666666666667e-02
+775 1148 -8.33333333333333e-02
+775 901 -2.50000000000000e-01
+775 1260 -8.33333333333333e-02
+775 900 4.16666666666667e-02
+775 1271 -4.16666666666667e-02
+775 1181 8.33333333333333e-02
+775 1270 -1.25000000000000e-01
+775 1196 -8.33333333333333e-02
+775 946 -2.50000000000000e-01
+775 1269 8.33333333333333e-02
+775 774 -8.33333333333333e-02
+775 945 4.16666666666667e-02
+776 776 6.66666666666667e-01
+776 1195 -8.33333333333333e-02
+776 901 4.16666666666667e-02
+776 1202 -3.75000000000000e-01
+776 1201 8.33333333333333e-02
+776 775 -8.33333333333333e-02
+776 946 4.16666666666667e-02
+776 1200 8.33333333333333e-02
+776 1146 -8.33333333333333e-02
+776 1260 4.16666666666667e-02
+776 902 -8.33333333333333e-02
+776 1261 4.16666666666667e-02
+776 1147 -8.33333333333333e-02
+776 1271 -1.25000000000000e-01
+776 1194 4.16666666666667e-02
+776 947 -8.33333333333333e-02
+776 1270 -4.16666666666667e-02
+776 1180 8.33333333333333e-02
+776 1269 8.33333333333333e-02
+776 1179 -1.66666666666667e-01
+777 777 7.50000000000000e-01
+777 1214 -8.33333333333333e-02
+777 1213 4.16666666666667e-02
+777 779 -8.33333333333333e-02
+777 1220 8.33333333333333e-02
+777 926 4.16666666666667e-02
+777 1219 -4.16666666666667e-02
+777 1218 -1.25000000000000e-01
+777 1039 -8.33333333333333e-02
+777 1057 8.33333333333333e-02
+777 1250 4.16666666666667e-02
+777 1040 -8.33333333333333e-02
+777 904 4.16666666666667e-02
+777 1249 -8.33333333333333e-02
+777 903 -2.50000000000000e-01
+777 1256 -4.16666666666667e-02
+777 1058 8.33333333333333e-02
+777 778 -8.33333333333333e-02
+777 1255 8.33333333333333e-02
+777 925 4.16666666666667e-02
+777 905 4.16666666666667e-02
+777 1254 -1.25000000000000e-01
+777 924 -2.50000000000000e-01
+778 778 6.66666666666667e-01
+778 1212 4.16666666666667e-02
+778 1220 8.33333333333333e-02
+778 1219 -1.25000000000000e-01
+778 1218 -4.16666666666667e-02
+778 1250 4.16666666666667e-02
+778 1040 -8.33333333333333e-02
+778 1038 -8.33333333333333e-02
+778 1056 8.33333333333333e-02
+778 904 -8.33333333333333e-02
+778 903 4.16666666666667e-02
+778 1248 -8.33333333333333e-02
+778 1256 8.33333333333333e-02
+778 1058 -1.66666666666667e-01
+778 1214 4.16666666666667e-02
+778 1255 -3.75000000000000e-01
+778 925 -8.33333333333333e-02
+778 777 -8.33333333333333e-02
+778 1254 8.33333333333333e-02
+778 924 4.16666666666667e-02
+779 779 6.66666666666667e-01
+779 903 4.16666666666667e-02
+779 1212 -8.33333333333333e-02
+779 1220 -3.75000000000000e-01
+779 1219 8.33333333333333e-02
+779 777 -8.33333333333333e-02
+779 1218 8.33333333333333e-02
+779 924 4.16666666666667e-02
+779 1249 4.16666666666667e-02
+779 1039 -8.33333333333333e-02
+779 905 -8.33333333333333e-02
+779 1248 4.16666666666667e-02
+779 1038 -8.33333333333333e-02
+779 1213 4.16666666666667e-02
+779 1256 -1.25000000000000e-01
+779 926 -8.33333333333333e-02
+779 1255 8.33333333333333e-02
+779 1057 -1.66666666666667e-01
+779 1254 -4.16666666666667e-02
+779 1056 8.33333333333333e-02
+780 780 7.50000000000000e-01
+780 1232 -8.33333333333333e-02
+780 1231 4.16666666666667e-02
+780 782 -8.33333333333333e-02
+780 1238 8.33333333333333e-02
+780 950 4.16666666666667e-02
+780 1237 -4.16666666666667e-02
+780 1236 -1.25000000000000e-01
+780 1165 -8.33333333333333e-02
+780 1183 8.33333333333333e-02
+780 1268 4.16666666666667e-02
+780 1166 -8.33333333333333e-02
+780 928 4.16666666666667e-02
+780 1267 -8.33333333333333e-02
+780 927 -2.50000000000000e-01
+780 1274 -4.16666666666667e-02
+780 1184 8.33333333333333e-02
+780 781 -8.33333333333333e-02
+780 1273 8.33333333333333e-02
+780 949 4.16666666666667e-02
+780 929 4.16666666666667e-02
+780 1272 -1.25000000000000e-01
+780 948 -2.50000000000000e-01
+781 781 6.66666666666667e-01
+781 1230 4.16666666666667e-02
+781 1238 8.33333333333333e-02
+781 1237 -1.25000000000000e-01
+781 1236 -4.16666666666667e-02
+781 1268 4.16666666666667e-02
+781 1166 -8.33333333333333e-02
+781 1164 -8.33333333333333e-02
+781 1182 8.33333333333333e-02
+781 928 -8.33333333333333e-02
+781 927 4.16666666666667e-02
+781 1266 -8.33333333333333e-02
+781 1274 8.33333333333333e-02
+781 1184 -1.66666666666667e-01
+781 1232 4.16666666666667e-02
+781 1273 -3.75000000000000e-01
+781 949 -8.33333333333333e-02
+781 780 -8.33333333333333e-02
+781 1272 8.33333333333333e-02
+781 948 4.16666666666667e-02
+782 782 6.66666666666667e-01
+782 927 4.16666666666667e-02
+782 1230 -8.33333333333333e-02
+782 1238 -3.75000000000000e-01
+782 1237 8.33333333333333e-02
+782 780 -8.33333333333333e-02
+782 1236 8.33333333333333e-02
+782 948 4.16666666666667e-02
+782 1267 4.16666666666667e-02
+782 1165 -8.33333333333333e-02
+782 929 -8.33333333333333e-02
+782 1266 4.16666666666667e-02
+782 1164 -8.33333333333333e-02
+782 1231 4.16666666666667e-02
+782 1274 -1.25000000000000e-01
+782 950 -8.33333333333333e-02
+782 1273 8.33333333333333e-02
+782 1183 -1.66666666666667e-01
+782 1272 -4.16666666666667e-02
+782 1182 8.33333333333333e-02
+783 783 7.50000000000000e-01
+783 700 4.16666666666667e-02
+783 952 -8.33333333333333e-02
+783 788 -4.16666666666667e-02
+783 784 -8.33333333333333e-02
+783 787 8.33333333333333e-02
+783 786 -1.25000000000000e-01
+783 959 -8.33333333333333e-02
+783 794 8.33333333333333e-02
+783 701 4.16666666666667e-02
+783 956 -8.33333333333333e-02
+783 955 4.16666666666667e-02
+783 958 -8.33333333333333e-02
+783 699 -2.50000000000000e-01
+783 785 -8.33333333333333e-02
+783 791 8.33333333333333e-02
+783 790 -4.16666666666667e-02
+783 793 8.33333333333333e-02
+783 953 4.16666666666667e-02
+783 789 -1.25000000000000e-01
+783 7 4.16666666666667e-02
+783 8 4.16666666666667e-02
+783 6 -2.50000000000000e-01
+784 784 6.66666666666667e-01
+784 699 4.16666666666667e-02
+784 951 -8.33333333333333e-02
+784 788 8.33333333333333e-02
+784 787 -3.75000000000000e-01
+784 783 -8.33333333333333e-02
+784 786 8.33333333333333e-02
+784 956 4.16666666666667e-02
+784 959 -8.33333333333333e-02
+784 700 -8.33333333333333e-02
+784 954 4.16666666666667e-02
+784 957 -8.33333333333333e-02
+784 791 8.33333333333333e-02
+784 794 -1.66666666666667e-01
+784 953 4.16666666666667e-02
+784 790 -1.25000000000000e-01
+784 789 -4.16666666666667e-02
+784 792 8.33333333333333e-02
+784 6 4.16666666666667e-02
+784 7 -8.33333333333333e-02
+785 785 6.66666666666667e-01
+785 951 4.16666666666667e-02
+785 788 -1.25000000000000e-01
+785 787 8.33333333333333e-02
+785 786 -4.16666666666667e-02
+785 955 4.16666666666667e-02
+785 958 -8.33333333333333e-02
+785 957 -8.33333333333333e-02
+785 792 8.33333333333333e-02
+785 701 -8.33333333333333e-02
+785 699 4.16666666666667e-02
+785 954 -8.33333333333333e-02
+785 952 4.16666666666667e-02
+785 791 -3.75000000000000e-01
+785 790 8.33333333333333e-02
+785 793 -1.66666666666667e-01
+785 783 -8.33333333333333e-02
+785 789 8.33333333333333e-02
+785 8 -8.33333333333333e-02
+785 6 4.16666666666667e-02
+786 786 1.25000000000000e+00
+786 973 8.33333333333333e-02
+786 974 8.33333333333333e-02
+786 970 8.33333333333333e-02
+786 969 -1.25000000000000e-01
+786 788 -1.66666666666667e-01
+786 793 -8.33333333333333e-02
+786 787 -1.66666666666667e-01
+786 953 8.33333333333333e-02
+786 982 -8.33333333333333e-02
+786 958 8.33333333333333e-02
+786 794 1.66666666666667e-01
+786 959 -1.66666666666667e-01
+786 704 4.16666666666667e-02
+786 983 -8.33333333333333e-02
+786 952 8.33333333333333e-02
+786 703 -8.33333333333333e-02
+786 951 -3.75000000000000e-01
+786 785 -4.16666666666667e-02
+786 784 8.33333333333333e-02
+786 783 -1.25000000000000e-01
+786 971 -4.16666666666667e-02
+786 792 -2.50000000000000e-01
+786 185 8.33333333333333e-02
+786 184 8.33333333333333e-02
+786 183 -3.75000000000000e-01
+786 8 4.16666666666667e-02
+786 7 -8.33333333333333e-02
+787 787 1.25000000000000e+00
+787 972 8.33333333333333e-02
+787 974 -1.66666666666667e-01
+787 704 4.16666666666667e-02
+787 970 -3.75000000000000e-01
+787 969 8.33333333333333e-02
+787 792 -8.33333333333333e-02
+787 953 -4.16666666666667e-02
+787 786 -1.66666666666667e-01
+787 981 -8.33333333333333e-02
+787 957 8.33333333333333e-02
+787 983 -8.33333333333333e-02
+787 959 8.33333333333333e-02
+787 952 -1.25000000000000e-01
+787 951 8.33333333333333e-02
+787 702 -8.33333333333333e-02
+787 785 8.33333333333333e-02
+787 788 -1.66666666666667e-01
+787 794 1.66666666666667e-01
+787 784 -3.75000000000000e-01
+787 971 8.33333333333333e-02
+787 793 -2.50000000000000e-01
+787 783 8.33333333333333e-02
+787 185 -4.16666666666667e-02
+787 8 4.16666666666667e-02
+787 184 -1.25000000000000e-01
+787 183 8.33333333333333e-02
+787 6 -8.33333333333333e-02
+788 788 1.25000000000000e+00
+788 970 8.33333333333333e-02
+788 973 -1.66666666666667e-01
+788 972 8.33333333333333e-02
+788 971 -1.25000000000000e-01
+788 703 4.16666666666667e-02
+788 786 -1.66666666666667e-01
+788 952 -4.16666666666667e-02
+788 951 8.33333333333333e-02
+788 982 -8.33333333333333e-02
+788 958 8.33333333333333e-02
+788 792 1.66666666666667e-01
+788 957 -1.66666666666667e-01
+788 953 -1.25000000000000e-01
+788 702 4.16666666666667e-02
+788 981 -8.33333333333333e-02
+788 785 -1.25000000000000e-01
+788 969 -4.16666666666667e-02
+788 794 -7.50000000000000e-01
+788 784 8.33333333333333e-02
+788 787 -1.66666666666667e-01
+788 793 1.66666666666667e-01
+788 783 -4.16666666666667e-02
+788 185 -1.25000000000000e-01
+788 184 -4.16666666666667e-02
+788 7 4.16666666666667e-02
+788 183 8.33333333333333e-02
+788 6 4.16666666666667e-02
+789 789 1.25000000000000e+00
+789 959 8.33333333333333e-02
+789 958 -1.66666666666667e-01
+789 956 8.33333333333333e-02
+789 706 4.16666666666667e-02
+789 954 -3.75000000000000e-01
+789 785 8.33333333333333e-02
+789 784 -4.16666666666667e-02
+789 783 -1.25000000000000e-01
+789 794 -8.33333333333333e-02
+789 791 -1.66666666666667e-01
+789 1000 -4.16666666666667e-02
+789 1013 -8.33333333333333e-02
+789 1004 8.33333333333333e-02
+789 1012 -8.33333333333333e-02
+789 1003 8.33333333333333e-02
+789 1001 8.33333333333333e-02
+789 707 -8.33333333333333e-02
+789 999 -1.25000000000000e-01
+789 790 -1.66666666666667e-01
+789 793 1.66666666666667e-01
+789 955 8.33333333333333e-02
+789 792 -2.50000000000000e-01
+789 7 4.16666666666667e-02
+789 188 8.33333333333333e-02
+789 8 -8.33333333333333e-02
+789 187 8.33333333333333e-02
+789 186 -3.75000000000000e-01
+790 790 1.25000000000000e+00
+790 959 8.33333333333333e-02
+790 954 8.33333333333333e-02
+790 957 -1.66666666666667e-01
+790 955 -1.25000000000000e-01
+790 705 4.16666666666667e-02
+790 785 8.33333333333333e-02
+790 791 -1.66666666666667e-01
+790 784 -1.25000000000000e-01
+790 783 -4.16666666666667e-02
+790 999 -4.16666666666667e-02
+790 1001 8.33333333333333e-02
+790 794 1.66666666666667e-01
+790 1004 -1.66666666666667e-01
+790 1011 -8.33333333333333e-02
+790 1002 8.33333333333333e-02
+790 707 4.16666666666667e-02
+790 1013 -8.33333333333333e-02
+790 1000 -1.25000000000000e-01
+790 956 -4.16666666666667e-02
+790 793 -7.50000000000000e-01
+790 789 -1.66666666666667e-01
+790 792 1.66666666666667e-01
+790 6 4.16666666666667e-02
+790 188 -4.16666666666667e-02
+790 8 4.16666666666667e-02
+790 187 -1.25000000000000e-01
+790 186 8.33333333333333e-02
+791 791 1.25000000000000e+00
+791 958 8.33333333333333e-02
+791 957 8.33333333333333e-02
+791 956 -1.25000000000000e-01
+791 954 8.33333333333333e-02
+791 785 -3.75000000000000e-01
+791 784 8.33333333333333e-02
+791 790 -1.66666666666667e-01
+791 783 8.33333333333333e-02
+791 792 -8.33333333333333e-02
+791 789 -1.66666666666667e-01
+791 1000 8.33333333333333e-02
+791 1011 -8.33333333333333e-02
+791 1002 8.33333333333333e-02
+791 793 1.66666666666667e-01
+791 1003 -1.66666666666667e-01
+791 1001 -3.75000000000000e-01
+791 706 4.16666666666667e-02
+791 1012 -8.33333333333333e-02
+791 999 8.33333333333333e-02
+791 705 -8.33333333333333e-02
+791 955 -4.16666666666667e-02
+791 794 -2.50000000000000e-01
+791 188 -1.25000000000000e-01
+791 187 -4.16666666666667e-02
+791 7 4.16666666666667e-02
+791 186 8.33333333333333e-02
+791 6 -8.33333333333333e-02
+792 792 2.50000000000000e+00
+792 973 1.66666666666667e-01
+792 972 -2.50000000000000e-01
+792 1030 8.33333333333333e-02
+792 1031 8.33333333333333e-02
+792 787 -8.33333333333333e-02
+792 788 1.66666666666667e-01
+792 794 -3.33333333333333e-01
+792 786 -2.50000000000000e-01
+792 983 8.33333333333333e-02
+792 710 -8.33333333333333e-02
+792 982 -1.66666666666667e-01
+792 785 8.33333333333333e-02
+792 958 1.66666666666667e-01
+792 793 -3.33333333333333e-01
+792 959 1.66666666666667e-01
+792 709 -8.33333333333333e-02
+792 957 -7.50000000000000e-01
+792 784 8.33333333333333e-02
+792 791 -8.33333333333333e-02
+792 1012 8.33333333333333e-02
+792 1003 -8.33333333333333e-02
+792 790 1.66666666666667e-01
+792 789 -2.50000000000000e-01
+792 1004 1.66666666666667e-01
+792 1013 -1.66666666666667e-01
+792 1002 -2.50000000000000e-01
+792 974 -8.33333333333333e-02
+792 185 -1.66666666666667e-01
+792 184 8.33333333333333e-02
+792 191 1.66666666666667e-01
+792 190 1.66666666666667e-01
+792 189 -7.50000000000000e-01
+792 8 -8.33333333333333e-02
+792 7 -8.33333333333333e-02
+792 188 8.33333333333333e-02
+792 187 -1.66666666666667e-01
+793 793 2.50000000000000e+00
+793 972 1.66666666666667e-01
+793 974 1.66666666666667e-01
+793 973 -7.50000000000000e-01
+793 1029 8.33333333333333e-02
+793 1031 -1.66666666666667e-01
+793 786 -8.33333333333333e-02
+793 983 8.33333333333333e-02
+793 788 1.66666666666667e-01
+793 787 -2.50000000000000e-01
+793 981 -1.66666666666667e-01
+793 959 -8.33333333333333e-02
+793 957 1.66666666666667e-01
+793 792 -3.33333333333333e-01
+793 958 -2.50000000000000e-01
+793 708 -8.33333333333333e-02
+793 785 -1.66666666666667e-01
+793 783 8.33333333333333e-02
+793 791 1.66666666666667e-01
+793 794 -3.33333333333333e-01
+793 1004 1.66666666666667e-01
+793 1011 8.33333333333333e-02
+793 1002 -8.33333333333333e-02
+793 790 -7.50000000000000e-01
+793 789 1.66666666666667e-01
+793 1013 8.33333333333333e-02
+793 710 -8.33333333333333e-02
+793 1003 -2.50000000000000e-01
+793 183 8.33333333333333e-02
+793 191 -8.33333333333333e-02
+793 190 -2.50000000000000e-01
+793 189 1.66666666666667e-01
+793 6 -8.33333333333333e-02
+793 188 8.33333333333333e-02
+793 8 -8.33333333333333e-02
+793 186 -1.66666666666667e-01
+793 185 8.33333333333333e-02
+794 794 2.50000000000000e+00
+794 974 -2.50000000000000e-01
+794 973 1.66666666666667e-01
+794 1030 -1.66666666666667e-01
+794 1029 8.33333333333333e-02
+794 982 8.33333333333333e-02
+794 786 1.66666666666667e-01
+794 792 -3.33333333333333e-01
+794 788 -7.50000000000000e-01
+794 787 1.66666666666667e-01
+794 981 8.33333333333333e-02
+794 708 -8.33333333333333e-02
+794 958 -8.33333333333333e-02
+794 783 8.33333333333333e-02
+794 959 -2.50000000000000e-01
+794 957 1.66666666666667e-01
+794 784 -1.66666666666667e-01
+794 789 -8.33333333333333e-02
+794 790 1.66666666666667e-01
+794 793 -3.33333333333333e-01
+794 1003 1.66666666666667e-01
+794 791 -2.50000000000000e-01
+794 1004 -7.50000000000000e-01
+794 972 -8.33333333333333e-02
+794 1012 8.33333333333333e-02
+794 709 -8.33333333333333e-02
+794 1002 1.66666666666667e-01
+794 1011 -1.66666666666667e-01
+794 184 8.33333333333333e-02
+794 183 -1.66666666666667e-01
+794 190 -8.33333333333333e-02
+794 189 1.66666666666667e-01
+794 191 -2.50000000000000e-01
+794 6 -8.33333333333333e-02
+794 186 8.33333333333333e-02
+794 187 8.33333333333333e-02
+794 7 -8.33333333333333e-02
+795 795 7.50000000000000e-01
+795 676 4.16666666666667e-02
+795 802 -8.33333333333333e-02
+795 962 -4.16666666666667e-02
+795 796 -8.33333333333333e-02
+795 961 8.33333333333333e-02
+795 700 4.16666666666667e-02
+795 960 -1.25000000000000e-01
+795 815 -8.33333333333333e-02
+795 968 8.33333333333333e-02
+795 677 4.16666666666667e-02
+795 809 -8.33333333333333e-02
+795 808 4.16666666666667e-02
+795 814 -8.33333333333333e-02
+795 675 -2.50000000000000e-01
+795 797 -8.33333333333333e-02
+795 965 8.33333333333333e-02
+795 701 4.16666666666667e-02
+795 964 -4.16666666666667e-02
+795 967 8.33333333333333e-02
+795 803 4.16666666666667e-02
+795 963 -1.25000000000000e-01
+795 699 -2.50000000000000e-01
+796 796 6.66666666666667e-01
+796 675 4.16666666666667e-02
+796 801 -8.33333333333333e-02
+796 962 8.33333333333333e-02
+796 961 -3.75000000000000e-01
+796 795 -8.33333333333333e-02
+796 960 8.33333333333333e-02
+796 699 4.16666666666667e-02
+796 809 4.16666666666667e-02
+796 815 -8.33333333333333e-02
+796 676 -8.33333333333333e-02
+796 807 4.16666666666667e-02
+796 813 -8.33333333333333e-02
+796 965 8.33333333333333e-02
+796 968 -1.66666666666667e-01
+796 803 4.16666666666667e-02
+796 964 -1.25000000000000e-01
+796 700 -8.33333333333333e-02
+796 963 -4.16666666666667e-02
+796 966 8.33333333333333e-02
+797 797 6.66666666666667e-01
+797 801 4.16666666666667e-02
+797 962 -1.25000000000000e-01
+797 961 8.33333333333333e-02
+797 960 -4.16666666666667e-02
+797 808 4.16666666666667e-02
+797 814 -8.33333333333333e-02
+797 813 -8.33333333333333e-02
+797 966 8.33333333333333e-02
+797 677 -8.33333333333333e-02
+797 675 4.16666666666667e-02
+797 807 -8.33333333333333e-02
+797 802 4.16666666666667e-02
+797 965 -3.75000000000000e-01
+797 701 -8.33333333333333e-02
+797 964 8.33333333333333e-02
+797 967 -1.66666666666667e-01
+797 795 -8.33333333333333e-02
+797 963 8.33333333333333e-02
+797 699 4.16666666666667e-02
+798 798 7.50000000000000e-01
+798 712 4.16666666666667e-02
+798 1060 -8.33333333333333e-02
+798 806 -4.16666666666667e-02
+798 799 -8.33333333333333e-02
+798 805 8.33333333333333e-02
+798 676 4.16666666666667e-02
+798 804 -1.25000000000000e-01
+798 1067 -8.33333333333333e-02
+798 818 8.33333333333333e-02
+798 713 4.16666666666667e-02
+798 1064 -8.33333333333333e-02
+798 1063 4.16666666666667e-02
+798 1066 -8.33333333333333e-02
+798 711 -2.50000000000000e-01
+798 800 -8.33333333333333e-02
+798 812 8.33333333333333e-02
+798 677 4.16666666666667e-02
+798 811 -4.16666666666667e-02
+798 817 8.33333333333333e-02
+798 1061 4.16666666666667e-02
+798 810 -1.25000000000000e-01
+798 675 -2.50000000000000e-01
+799 799 6.66666666666667e-01
+799 711 4.16666666666667e-02
+799 1059 -8.33333333333333e-02
+799 806 8.33333333333333e-02
+799 805 -3.75000000000000e-01
+799 798 -8.33333333333333e-02
+799 804 8.33333333333333e-02
+799 675 4.16666666666667e-02
+799 1064 4.16666666666667e-02
+799 1067 -8.33333333333333e-02
+799 712 -8.33333333333333e-02
+799 1062 4.16666666666667e-02
+799 1065 -8.33333333333333e-02
+799 812 8.33333333333333e-02
+799 818 -1.66666666666667e-01
+799 1061 4.16666666666667e-02
+799 811 -1.25000000000000e-01
+799 676 -8.33333333333333e-02
+799 810 -4.16666666666667e-02
+799 816 8.33333333333333e-02
+800 800 6.66666666666667e-01
+800 1059 4.16666666666667e-02
+800 806 -1.25000000000000e-01
+800 805 8.33333333333333e-02
+800 804 -4.16666666666667e-02
+800 1063 4.16666666666667e-02
+800 1066 -8.33333333333333e-02
+800 1065 -8.33333333333333e-02
+800 816 8.33333333333333e-02
+800 713 -8.33333333333333e-02
+800 711 4.16666666666667e-02
+800 1062 -8.33333333333333e-02
+800 1060 4.16666666666667e-02
+800 812 -3.75000000000000e-01
+800 677 -8.33333333333333e-02
+800 811 8.33333333333333e-02
+800 817 -1.66666666666667e-01
+800 798 -8.33333333333333e-02
+800 810 8.33333333333333e-02
+800 675 4.16666666666667e-02
+801 801 1.25000000000000e+00
+801 1078 -8.33333333333333e-02
+801 806 8.33333333333333e-02
+801 805 8.33333333333333e-02
+801 804 -3.75000000000000e-01
+801 1085 -8.33333333333333e-02
+801 1084 -8.33333333333333e-02
+801 818 -1.66666666666667e-01
+801 817 8.33333333333333e-02
+801 962 8.33333333333333e-02
+801 803 -1.66666666666667e-01
+801 815 1.66666666666667e-01
+801 1081 8.33333333333333e-02
+801 814 -8.33333333333333e-02
+801 677 -4.16666666666667e-02
+801 797 4.16666666666667e-02
+801 676 8.33333333333333e-02
+801 796 -8.33333333333333e-02
+801 675 -1.25000000000000e-01
+801 813 -2.50000000000000e-01
+801 716 -4.16666666666667e-02
+801 1082 8.33333333333333e-02
+801 802 -1.66666666666667e-01
+801 715 8.33333333333333e-02
+801 961 8.33333333333333e-02
+801 1079 4.16666666666667e-02
+801 714 -1.25000000000000e-01
+801 960 -3.75000000000000e-01
+802 802 1.25000000000000e+00
+802 1077 -8.33333333333333e-02
+802 806 -4.16666666666667e-02
+802 805 -1.25000000000000e-01
+802 804 8.33333333333333e-02
+802 1085 -8.33333333333333e-02
+802 818 8.33333333333333e-02
+802 1083 -8.33333333333333e-02
+802 816 8.33333333333333e-02
+802 962 -4.16666666666667e-02
+802 797 4.16666666666667e-02
+802 1080 8.33333333333333e-02
+802 813 -8.33333333333333e-02
+802 677 8.33333333333333e-02
+802 803 -1.66666666666667e-01
+802 815 1.66666666666667e-01
+802 676 -3.75000000000000e-01
+802 814 -2.50000000000000e-01
+802 675 8.33333333333333e-02
+802 795 -8.33333333333333e-02
+802 716 8.33333333333333e-02
+802 1082 -1.66666666666667e-01
+802 1079 4.16666666666667e-02
+802 715 -3.75000000000000e-01
+802 961 -1.25000000000000e-01
+802 801 -1.66666666666667e-01
+802 714 8.33333333333333e-02
+802 960 8.33333333333333e-02
+803 803 1.25000000000000e+00
+803 1078 4.16666666666667e-02
+803 806 -1.25000000000000e-01
+803 805 -4.16666666666667e-02
+803 804 8.33333333333333e-02
+803 1083 -8.33333333333333e-02
+803 1084 -8.33333333333333e-02
+803 817 8.33333333333333e-02
+803 816 -1.66666666666667e-01
+803 961 -4.16666666666667e-02
+803 796 4.16666666666667e-02
+803 960 8.33333333333333e-02
+803 801 -1.66666666666667e-01
+803 813 1.66666666666667e-01
+803 677 -1.25000000000000e-01
+803 815 -7.50000000000000e-01
+803 676 8.33333333333333e-02
+803 802 -1.66666666666667e-01
+803 814 1.66666666666667e-01
+803 675 -4.16666666666667e-02
+803 795 4.16666666666667e-02
+803 1077 4.16666666666667e-02
+803 716 -1.25000000000000e-01
+803 962 -1.25000000000000e-01
+803 715 8.33333333333333e-02
+803 1081 -1.66666666666667e-01
+803 714 -4.16666666666667e-02
+803 1080 8.33333333333333e-02
+804 804 1.25000000000000e+00
+804 1084 8.33333333333333e-02
+804 1085 8.33333333333333e-02
+804 1078 8.33333333333333e-02
+804 1077 -1.25000000000000e-01
+804 806 -1.66666666666667e-01
+804 803 8.33333333333333e-02
+804 802 8.33333333333333e-02
+804 801 -3.75000000000000e-01
+804 817 -8.33333333333333e-02
+804 805 -1.66666666666667e-01
+804 1061 8.33333333333333e-02
+804 1096 -8.33333333333333e-02
+804 1066 8.33333333333333e-02
+804 818 1.66666666666667e-01
+804 1067 -1.66666666666667e-01
+804 719 4.16666666666667e-02
+804 1097 -8.33333333333333e-02
+804 1060 8.33333333333333e-02
+804 718 -8.33333333333333e-02
+804 1059 -3.75000000000000e-01
+804 800 -4.16666666666667e-02
+804 677 4.16666666666667e-02
+804 799 8.33333333333333e-02
+804 676 -8.33333333333333e-02
+804 798 -1.25000000000000e-01
+804 1079 -4.16666666666667e-02
+804 816 -2.50000000000000e-01
+805 805 1.25000000000000e+00
+805 1083 8.33333333333333e-02
+805 1085 -1.66666666666667e-01
+805 719 4.16666666666667e-02
+805 1078 -3.75000000000000e-01
+805 1077 8.33333333333333e-02
+805 803 -4.16666666666667e-02
+805 677 4.16666666666667e-02
+805 802 -1.25000000000000e-01
+805 801 8.33333333333333e-02
+805 816 -8.33333333333333e-02
+805 1061 -4.16666666666667e-02
+805 804 -1.66666666666667e-01
+805 1095 -8.33333333333333e-02
+805 1065 8.33333333333333e-02
+805 1097 -8.33333333333333e-02
+805 1067 8.33333333333333e-02
+805 1060 -1.25000000000000e-01
+805 1059 8.33333333333333e-02
+805 717 -8.33333333333333e-02
+805 800 8.33333333333333e-02
+805 806 -1.66666666666667e-01
+805 818 1.66666666666667e-01
+805 799 -3.75000000000000e-01
+805 1079 8.33333333333333e-02
+805 817 -2.50000000000000e-01
+805 798 8.33333333333333e-02
+805 675 -8.33333333333333e-02
+806 806 1.25000000000000e+00
+806 1078 8.33333333333333e-02
+806 1084 -1.66666666666667e-01
+806 1083 8.33333333333333e-02
+806 1079 -1.25000000000000e-01
+806 718 4.16666666666667e-02
+806 803 -1.25000000000000e-01
+806 802 -4.16666666666667e-02
+806 676 4.16666666666667e-02
+806 804 -1.66666666666667e-01
+806 801 8.33333333333333e-02
+806 1060 -4.16666666666667e-02
+806 1059 8.33333333333333e-02
+806 1096 -8.33333333333333e-02
+806 1066 8.33333333333333e-02
+806 816 1.66666666666667e-01
+806 1065 -1.66666666666667e-01
+806 1061 -1.25000000000000e-01
+806 717 4.16666666666667e-02
+806 1095 -8.33333333333333e-02
+806 800 -1.25000000000000e-01
+806 1077 -4.16666666666667e-02
+806 818 -7.50000000000000e-01
+806 799 8.33333333333333e-02
+806 805 -1.66666666666667e-01
+806 817 1.66666666666667e-01
+806 798 -4.16666666666667e-02
+806 675 4.16666666666667e-02
+807 807 1.25000000000000e+00
+807 1121 -8.33333333333333e-02
+807 1114 4.16666666666667e-02
+807 1120 -8.33333333333333e-02
+807 1115 -8.33333333333333e-02
+807 812 8.33333333333333e-02
+807 811 8.33333333333333e-02
+807 817 -1.66666666666667e-01
+807 810 -3.75000000000000e-01
+807 1118 8.33333333333333e-02
+807 815 -8.33333333333333e-02
+807 808 -1.66666666666667e-01
+807 814 1.66666666666667e-01
+807 964 8.33333333333333e-02
+807 677 8.33333333333333e-02
+807 797 -8.33333333333333e-02
+807 676 -4.16666666666667e-02
+807 796 4.16666666666667e-02
+807 675 -1.25000000000000e-01
+807 813 -2.50000000000000e-01
+807 809 -1.66666666666667e-01
+807 722 8.33333333333333e-02
+807 965 8.33333333333333e-02
+807 721 -4.16666666666667e-02
+807 1117 8.33333333333333e-02
+807 818 8.33333333333333e-02
+807 720 -1.25000000000000e-01
+807 963 -3.75000000000000e-01
+808 808 1.25000000000000e+00
+808 1119 -8.33333333333333e-02
+808 1115 4.16666666666667e-02
+808 1121 -8.33333333333333e-02
+808 812 -4.16666666666667e-02
+808 818 8.33333333333333e-02
+808 811 -1.25000000000000e-01
+808 810 8.33333333333333e-02
+808 816 -1.66666666666667e-01
+808 797 4.16666666666667e-02
+808 965 -4.16666666666667e-02
+808 807 -1.66666666666667e-01
+808 813 1.66666666666667e-01
+808 963 8.33333333333333e-02
+808 677 8.33333333333333e-02
+808 809 -1.66666666666667e-01
+808 815 1.66666666666667e-01
+808 676 -1.25000000000000e-01
+808 814 -7.50000000000000e-01
+808 675 -4.16666666666667e-02
+808 795 4.16666666666667e-02
+808 722 8.33333333333333e-02
+808 1118 -1.66666666666667e-01
+808 1113 4.16666666666667e-02
+808 721 -1.25000000000000e-01
+808 964 -1.25000000000000e-01
+808 720 -4.16666666666667e-02
+808 1116 8.33333333333333e-02
+809 809 1.25000000000000e+00
+809 1119 -8.33333333333333e-02
+809 1114 4.16666666666667e-02
+809 1120 -8.33333333333333e-02
+809 1113 -8.33333333333333e-02
+809 812 -1.25000000000000e-01
+809 811 -4.16666666666667e-02
+809 817 8.33333333333333e-02
+809 810 8.33333333333333e-02
+809 1116 8.33333333333333e-02
+809 813 -8.33333333333333e-02
+809 796 4.16666666666667e-02
+809 964 -4.16666666666667e-02
+809 677 -3.75000000000000e-01
+809 815 -2.50000000000000e-01
+809 676 8.33333333333333e-02
+809 808 -1.66666666666667e-01
+809 814 1.66666666666667e-01
+809 675 8.33333333333333e-02
+809 795 -8.33333333333333e-02
+809 816 8.33333333333333e-02
+809 722 -3.75000000000000e-01
+809 965 -1.25000000000000e-01
+809 721 8.33333333333333e-02
+809 1117 -1.66666666666667e-01
+809 807 -1.66666666666667e-01
+809 720 8.33333333333333e-02
+809 963 8.33333333333333e-02
+810 810 1.25000000000000e+00
+810 1067 8.33333333333333e-02
+810 1066 -1.66666666666667e-01
+810 1064 8.33333333333333e-02
+810 724 4.16666666666667e-02
+810 1062 -3.75000000000000e-01
+810 800 8.33333333333333e-02
+810 799 -4.16666666666667e-02
+810 676 4.16666666666667e-02
+810 798 -1.25000000000000e-01
+810 818 -8.33333333333333e-02
+810 812 -1.66666666666667e-01
+810 1114 -4.16666666666667e-02
+810 1133 -8.33333333333333e-02
+810 1121 8.33333333333333e-02
+810 1132 -8.33333333333333e-02
+810 1120 8.33333333333333e-02
+810 1115 8.33333333333333e-02
+810 725 -8.33333333333333e-02
+810 1113 -1.25000000000000e-01
+810 809 8.33333333333333e-02
+810 677 -8.33333333333333e-02
+810 808 8.33333333333333e-02
+810 811 -1.66666666666667e-01
+810 817 1.66666666666667e-01
+810 807 -3.75000000000000e-01
+810 1063 8.33333333333333e-02
+810 816 -2.50000000000000e-01
+811 811 1.25000000000000e+00
+811 1067 8.33333333333333e-02
+811 1062 8.33333333333333e-02
+811 1065 -1.66666666666667e-01
+811 1063 -1.25000000000000e-01
+811 723 4.16666666666667e-02
+811 800 8.33333333333333e-02
+811 812 -1.66666666666667e-01
+811 799 -1.25000000000000e-01
+811 798 -4.16666666666667e-02
+811 675 4.16666666666667e-02
+811 1113 -4.16666666666667e-02
+811 1115 8.33333333333333e-02
+811 818 1.66666666666667e-01
+811 1121 -1.66666666666667e-01
+811 1131 -8.33333333333333e-02
+811 1119 8.33333333333333e-02
+811 725 4.16666666666667e-02
+811 1133 -8.33333333333333e-02
+811 1114 -1.25000000000000e-01
+811 809 -4.16666666666667e-02
+811 677 4.16666666666667e-02
+811 808 -1.25000000000000e-01
+811 1064 -4.16666666666667e-02
+811 817 -7.50000000000000e-01
+811 807 8.33333333333333e-02
+811 810 -1.66666666666667e-01
+811 816 1.66666666666667e-01
+812 812 1.25000000000000e+00
+812 1066 8.33333333333333e-02
+812 1065 8.33333333333333e-02
+812 1064 -1.25000000000000e-01
+812 1062 8.33333333333333e-02
+812 800 -3.75000000000000e-01
+812 799 8.33333333333333e-02
+812 811 -1.66666666666667e-01
+812 798 8.33333333333333e-02
+812 816 -8.33333333333333e-02
+812 810 -1.66666666666667e-01
+812 1114 8.33333333333333e-02
+812 1131 -8.33333333333333e-02
+812 1119 8.33333333333333e-02
+812 817 1.66666666666667e-01
+812 1120 -1.66666666666667e-01
+812 1115 -3.75000000000000e-01
+812 724 4.16666666666667e-02
+812 1132 -8.33333333333333e-02
+812 1113 8.33333333333333e-02
+812 723 -8.33333333333333e-02
+812 809 -1.25000000000000e-01
+812 1063 -4.16666666666667e-02
+812 818 -2.50000000000000e-01
+812 808 -4.16666666666667e-02
+812 676 4.16666666666667e-02
+812 807 8.33333333333333e-02
+812 675 -8.33333333333333e-02
+813 813 2.50000000000000e+00
+813 1084 -1.66666666666667e-01
+813 818 1.66666666666667e-01
+813 1121 -1.66666666666667e-01
+813 1150 -8.33333333333333e-02
+813 1120 8.33333333333333e-02
+813 1151 -8.33333333333333e-02
+813 817 1.66666666666667e-01
+813 816 -7.50000000000000e-01
+813 803 1.66666666666667e-01
+813 961 8.33333333333333e-02
+813 802 -8.33333333333333e-02
+813 962 -1.66666666666667e-01
+813 677 8.33333333333333e-02
+813 801 -2.50000000000000e-01
+813 1082 -8.33333333333333e-02
+813 728 8.33333333333333e-02
+813 814 -3.33333333333333e-01
+813 1081 1.66666666666667e-01
+813 1080 -2.50000000000000e-01
+813 809 -8.33333333333333e-02
+813 808 1.66666666666667e-01
+813 797 -8.33333333333333e-02
+813 965 8.33333333333333e-02
+813 967 1.66666666666667e-01
+813 964 -1.66666666666667e-01
+813 676 8.33333333333333e-02
+813 796 -8.33333333333333e-02
+813 807 -2.50000000000000e-01
+813 815 -3.33333333333333e-01
+813 1118 1.66666666666667e-01
+813 968 1.66666666666667e-01
+813 1117 -8.33333333333333e-02
+813 727 8.33333333333333e-02
+813 1085 8.33333333333333e-02
+813 1116 -2.50000000000000e-01
+813 966 -7.50000000000000e-01
+814 814 2.50000000000000e+00
+814 1083 -1.66666666666667e-01
+814 818 -8.33333333333333e-02
+814 1151 -8.33333333333333e-02
+814 1121 8.33333333333333e-02
+814 1149 -8.33333333333333e-02
+814 1119 8.33333333333333e-02
+814 817 -2.50000000000000e-01
+814 816 1.66666666666667e-01
+814 960 8.33333333333333e-02
+814 801 -8.33333333333333e-02
+814 962 8.33333333333333e-02
+814 803 1.66666666666667e-01
+814 802 -2.50000000000000e-01
+814 1082 1.66666666666667e-01
+814 1081 -7.50000000000000e-01
+814 813 -3.33333333333333e-01
+814 1080 1.66666666666667e-01
+814 968 -8.33333333333333e-02
+814 815 -3.33333333333333e-01
+814 797 -8.33333333333333e-02
+814 965 8.33333333333333e-02
+814 807 1.66666666666667e-01
+814 966 1.66666666666667e-01
+814 963 -1.66666666666667e-01
+814 677 -1.66666666666667e-01
+814 809 1.66666666666667e-01
+814 808 -7.50000000000000e-01
+814 675 8.33333333333333e-02
+814 795 -8.33333333333333e-02
+814 1118 1.66666666666667e-01
+814 728 -1.66666666666667e-01
+814 1085 8.33333333333333e-02
+814 1117 -2.50000000000000e-01
+814 967 -2.50000000000000e-01
+814 1116 -8.33333333333333e-02
+814 726 8.33333333333333e-02
+815 815 2.50000000000000e+00
+815 1084 8.33333333333333e-02
+815 817 -8.33333333333333e-02
+815 1150 -8.33333333333333e-02
+815 1120 8.33333333333333e-02
+815 816 1.66666666666667e-01
+815 1119 -1.66666666666667e-01
+815 1149 -8.33333333333333e-02
+815 818 -2.50000000000000e-01
+815 801 1.66666666666667e-01
+815 961 8.33333333333333e-02
+815 960 -1.66666666666667e-01
+815 803 -7.50000000000000e-01
+815 802 1.66666666666667e-01
+815 675 8.33333333333333e-02
+815 1082 -2.50000000000000e-01
+815 1081 1.66666666666667e-01
+815 1080 -8.33333333333333e-02
+815 726 8.33333333333333e-02
+815 967 -8.33333333333333e-02
+815 814 -3.33333333333333e-01
+815 807 -8.33333333333333e-02
+815 796 -8.33333333333333e-02
+815 964 8.33333333333333e-02
+815 795 -8.33333333333333e-02
+815 963 8.33333333333333e-02
+815 809 -2.50000000000000e-01
+815 676 -1.66666666666667e-01
+815 808 1.66666666666667e-01
+815 1083 8.33333333333333e-02
+815 1118 -7.50000000000000e-01
+815 968 -2.50000000000000e-01
+815 1117 1.66666666666667e-01
+815 727 -1.66666666666667e-01
+815 813 -3.33333333333333e-01
+815 1116 1.66666666666667e-01
+815 966 1.66666666666667e-01
+816 816 2.50000000000000e+00
+816 1084 1.66666666666667e-01
+816 1083 -2.50000000000000e-01
+816 803 -1.66666666666667e-01
+816 802 8.33333333333333e-02
+816 815 1.66666666666667e-01
+816 1150 8.33333333333333e-02
+816 814 1.66666666666667e-01
+816 813 -7.50000000000000e-01
+816 1151 8.33333333333333e-02
+816 805 -8.33333333333333e-02
+816 806 1.66666666666667e-01
+816 818 -3.33333333333333e-01
+816 677 -8.33333333333333e-02
+816 804 -2.50000000000000e-01
+816 1097 8.33333333333333e-02
+816 731 -8.33333333333333e-02
+816 1096 -1.66666666666667e-01
+816 800 8.33333333333333e-02
+816 1066 1.66666666666667e-01
+816 817 -3.33333333333333e-01
+816 1067 1.66666666666667e-01
+816 730 -8.33333333333333e-02
+816 1065 -7.50000000000000e-01
+816 799 8.33333333333333e-02
+816 676 -8.33333333333333e-02
+816 812 -8.33333333333333e-02
+816 809 8.33333333333333e-02
+816 1132 8.33333333333333e-02
+816 1120 -8.33333333333333e-02
+816 808 -1.66666666666667e-01
+816 811 1.66666666666667e-01
+816 810 -2.50000000000000e-01
+816 1121 1.66666666666667e-01
+816 1133 -1.66666666666667e-01
+816 1119 -2.50000000000000e-01
+816 1085 -8.33333333333333e-02
+817 817 2.50000000000000e+00
+817 1083 1.66666666666667e-01
+817 1085 1.66666666666667e-01
+817 1084 -7.50000000000000e-01
+817 801 8.33333333333333e-02
+817 815 -8.33333333333333e-02
+817 1149 8.33333333333333e-02
+817 814 -2.50000000000000e-01
+817 813 1.66666666666667e-01
+817 1151 -1.66666666666667e-01
+817 804 -8.33333333333333e-02
+817 1097 8.33333333333333e-02
+817 806 1.66666666666667e-01
+817 805 -2.50000000000000e-01
+817 1095 -1.66666666666667e-01
+817 1067 -8.33333333333333e-02
+817 1065 1.66666666666667e-01
+817 816 -3.33333333333333e-01
+817 1066 -2.50000000000000e-01
+817 729 -8.33333333333333e-02
+817 800 -1.66666666666667e-01
+817 798 8.33333333333333e-02
+817 675 -8.33333333333333e-02
+817 812 1.66666666666667e-01
+817 818 -3.33333333333333e-01
+817 1121 1.66666666666667e-01
+817 1131 8.33333333333333e-02
+817 1119 -8.33333333333333e-02
+817 809 8.33333333333333e-02
+817 677 -8.33333333333333e-02
+817 811 -7.50000000000000e-01
+817 807 -1.66666666666667e-01
+817 810 1.66666666666667e-01
+817 1133 8.33333333333333e-02
+817 731 -8.33333333333333e-02
+817 1120 -2.50000000000000e-01
+817 803 8.33333333333333e-02
+818 818 2.50000000000000e+00
+818 802 8.33333333333333e-02
+818 1085 -2.50000000000000e-01
+818 1084 1.66666666666667e-01
+818 801 -1.66666666666667e-01
+818 814 -8.33333333333333e-02
+818 813 1.66666666666667e-01
+818 815 -2.50000000000000e-01
+818 1150 -1.66666666666667e-01
+818 1149 8.33333333333333e-02
+818 1096 8.33333333333333e-02
+818 804 1.66666666666667e-01
+818 816 -3.33333333333333e-01
+818 806 -7.50000000000000e-01
+818 805 1.66666666666667e-01
+818 675 -8.33333333333333e-02
+818 1095 8.33333333333333e-02
+818 729 -8.33333333333333e-02
+818 1066 -8.33333333333333e-02
+818 798 8.33333333333333e-02
+818 1067 -2.50000000000000e-01
+818 1065 1.66666666666667e-01
+818 799 -1.66666666666667e-01
+818 810 -8.33333333333333e-02
+818 807 8.33333333333333e-02
+818 811 1.66666666666667e-01
+818 817 -3.33333333333333e-01
+818 1120 1.66666666666667e-01
+818 812 -2.50000000000000e-01
+818 808 8.33333333333333e-02
+818 676 -8.33333333333333e-02
+818 1121 -7.50000000000000e-01
+818 1083 -8.33333333333333e-02
+818 1132 8.33333333333333e-02
+818 730 -8.33333333333333e-02
+818 1119 1.66666666666667e-01
+818 1131 -1.66666666666667e-01
+819 819 7.50000000000000e-01
+819 679 4.16666666666667e-02
+819 823 -8.33333333333333e-02
+819 1070 -4.16666666666667e-02
+819 820 -8.33333333333333e-02
+819 1069 8.33333333333333e-02
+819 712 4.16666666666667e-02
+819 1068 -1.25000000000000e-01
+819 830 -8.33333333333333e-02
+819 1076 8.33333333333333e-02
+819 680 4.16666666666667e-02
+819 827 -8.33333333333333e-02
+819 826 4.16666666666667e-02
+819 829 -8.33333333333333e-02
+819 678 -2.50000000000000e-01
+819 821 -8.33333333333333e-02
+819 1073 8.33333333333333e-02
+819 713 4.16666666666667e-02
+819 1072 -4.16666666666667e-02
+819 1075 8.33333333333333e-02
+819 824 4.16666666666667e-02
+819 1071 -1.25000000000000e-01
+819 711 -2.50000000000000e-01
+820 820 6.66666666666667e-01
+820 678 4.16666666666667e-02
+820 822 -8.33333333333333e-02
+820 1070 8.33333333333333e-02
+820 1069 -3.75000000000000e-01
+820 819 -8.33333333333333e-02
+820 1068 8.33333333333333e-02
+820 711 4.16666666666667e-02
+820 827 4.16666666666667e-02
+820 830 -8.33333333333333e-02
+820 679 -8.33333333333333e-02
+820 825 4.16666666666667e-02
+820 828 -8.33333333333333e-02
+820 1073 8.33333333333333e-02
+820 1076 -1.66666666666667e-01
+820 824 4.16666666666667e-02
+820 1072 -1.25000000000000e-01
+820 712 -8.33333333333333e-02
+820 1071 -4.16666666666667e-02
+820 1074 8.33333333333333e-02
+821 821 6.66666666666667e-01
+821 822 4.16666666666667e-02
+821 1070 -1.25000000000000e-01
+821 1069 8.33333333333333e-02
+821 1068 -4.16666666666667e-02
+821 826 4.16666666666667e-02
+821 829 -8.33333333333333e-02
+821 828 -8.33333333333333e-02
+821 1074 8.33333333333333e-02
+821 680 -8.33333333333333e-02
+821 678 4.16666666666667e-02
+821 825 -8.33333333333333e-02
+821 823 4.16666666666667e-02
+821 1073 -3.75000000000000e-01
+821 713 -8.33333333333333e-02
+821 1072 8.33333333333333e-02
+821 1075 -1.66666666666667e-01
+821 819 -8.33333333333333e-02
+821 1071 8.33333333333333e-02
+821 711 4.16666666666667e-02
+822 822 5.83333333333333e-01
+822 824 -1.66666666666667e-01
+822 830 8.33333333333333e-02
+822 1186 4.16666666666667e-02
+822 829 -4.16666666666667e-02
+822 680 -4.16666666666667e-02
+822 821 4.16666666666667e-02
+822 679 4.16666666666667e-02
+822 820 -8.33333333333333e-02
+822 678 -4.16666666666667e-02
+822 828 -1.25000000000000e-01
+822 734 -4.16666666666667e-02
+822 1187 4.16666666666667e-02
+822 823 -8.33333333333333e-02
+822 733 4.16666666666667e-02
+822 1069 8.33333333333333e-02
+822 1070 8.33333333333333e-02
+822 732 -4.16666666666667e-02
+822 1068 -3.75000000000000e-01
+823 823 5.00000000000000e-01
+823 821 4.16666666666667e-02
+823 1185 4.16666666666667e-02
+823 828 -4.16666666666667e-02
+823 680 4.16666666666667e-02
+823 824 -8.33333333333333e-02
+823 830 8.33333333333333e-02
+823 679 -1.25000000000000e-01
+823 829 -1.25000000000000e-01
+823 678 4.16666666666667e-02
+823 819 -8.33333333333333e-02
+823 734 4.16666666666667e-02
+823 1187 -8.33333333333333e-02
+823 1070 -4.16666666666667e-02
+823 733 -1.25000000000000e-01
+823 1069 -1.25000000000000e-01
+823 822 -8.33333333333333e-02
+823 732 4.16666666666667e-02
+823 1068 8.33333333333333e-02
+824 824 5.83333333333333e-01
+824 820 4.16666666666667e-02
+824 1068 8.33333333333333e-02
+824 822 -1.66666666666667e-01
+824 828 8.33333333333333e-02
+824 680 -4.16666666666667e-02
+824 830 -3.75000000000000e-01
+824 679 4.16666666666667e-02
+824 823 -8.33333333333333e-02
+824 829 8.33333333333333e-02
+824 678 -4.16666666666667e-02
+824 819 4.16666666666667e-02
+824 1069 -4.16666666666667e-02
+824 734 -4.16666666666667e-02
+824 1070 -1.25000000000000e-01
+824 733 4.16666666666667e-02
+824 1186 -8.33333333333333e-02
+824 732 -4.16666666666667e-02
+824 1185 4.16666666666667e-02
+825 825 5.83333333333333e-01
+825 830 -4.16666666666667e-02
+825 826 -1.66666666666667e-01
+825 829 8.33333333333333e-02
+825 1072 8.33333333333333e-02
+825 680 4.16666666666667e-02
+825 821 -8.33333333333333e-02
+825 679 -4.16666666666667e-02
+825 820 4.16666666666667e-02
+825 678 -4.16666666666667e-02
+825 828 -1.25000000000000e-01
+825 827 -8.33333333333333e-02
+825 737 4.16666666666667e-02
+825 1073 8.33333333333333e-02
+825 736 -4.16666666666667e-02
+825 1192 4.16666666666667e-02
+825 1193 4.16666666666667e-02
+825 735 -4.16666666666667e-02
+825 1071 -3.75000000000000e-01
+826 826 5.83333333333333e-01
+826 1073 -4.16666666666667e-02
+826 825 -1.66666666666667e-01
+826 828 8.33333333333333e-02
+826 1071 8.33333333333333e-02
+826 680 4.16666666666667e-02
+826 827 -8.33333333333333e-02
+826 830 8.33333333333333e-02
+826 679 -4.16666666666667e-02
+826 829 -3.75000000000000e-01
+826 678 -4.16666666666667e-02
+826 819 4.16666666666667e-02
+826 737 4.16666666666667e-02
+826 1193 -8.33333333333333e-02
+826 821 4.16666666666667e-02
+826 736 -4.16666666666667e-02
+826 1072 -1.25000000000000e-01
+826 735 -4.16666666666667e-02
+826 1191 4.16666666666667e-02
+827 827 5.00000000000000e-01
+827 828 -4.16666666666667e-02
+827 820 4.16666666666667e-02
+827 1072 -4.16666666666667e-02
+827 680 -1.25000000000000e-01
+827 830 -1.25000000000000e-01
+827 679 4.16666666666667e-02
+827 826 -8.33333333333333e-02
+827 829 8.33333333333333e-02
+827 678 4.16666666666667e-02
+827 819 -8.33333333333333e-02
+827 1191 4.16666666666667e-02
+827 737 -1.25000000000000e-01
+827 1073 -1.25000000000000e-01
+827 736 4.16666666666667e-02
+827 1192 -8.33333333333333e-02
+827 825 -8.33333333333333e-02
+827 735 4.16666666666667e-02
+827 1071 8.33333333333333e-02
+828 828 1.25000000000000e+00
+828 1069 8.33333333333333e-02
+828 823 -4.16666666666667e-02
+828 1070 -1.66666666666667e-01
+828 680 4.16666666666667e-02
+828 822 -1.25000000000000e-01
+828 1187 -4.16666666666667e-02
+828 740 4.16666666666667e-02
+828 829 -1.66666666666667e-01
+828 1186 8.33333333333333e-02
+828 1185 -1.25000000000000e-01
+828 827 -4.16666666666667e-02
+828 826 8.33333333333333e-02
+828 821 -8.33333333333333e-02
+828 1073 8.33333333333333e-02
+828 1075 1.66666666666667e-01
+828 1072 -1.66666666666667e-01
+828 679 4.16666666666667e-02
+828 820 -8.33333333333333e-02
+828 825 -1.25000000000000e-01
+828 830 -1.66666666666667e-01
+828 1193 8.33333333333333e-02
+828 1076 1.66666666666667e-01
+828 1192 -4.16666666666667e-02
+828 739 4.16666666666667e-02
+828 824 8.33333333333333e-02
+828 1191 -1.25000000000000e-01
+828 1074 -7.50000000000000e-01
+829 829 1.25000000000000e+00
+829 822 -4.16666666666667e-02
+829 1070 8.33333333333333e-02
+829 824 8.33333333333333e-02
+829 823 -1.25000000000000e-01
+829 1187 8.33333333333333e-02
+829 1186 -3.75000000000000e-01
+829 828 -1.66666666666667e-01
+829 1185 8.33333333333333e-02
+829 1076 -8.33333333333333e-02
+829 830 -1.66666666666667e-01
+829 821 -8.33333333333333e-02
+829 1073 8.33333333333333e-02
+829 825 8.33333333333333e-02
+829 1074 1.66666666666667e-01
+829 1071 -1.66666666666667e-01
+829 680 -8.33333333333333e-02
+829 827 8.33333333333333e-02
+829 826 -3.75000000000000e-01
+829 678 4.16666666666667e-02
+829 819 -8.33333333333333e-02
+829 1193 8.33333333333333e-02
+829 740 -8.33333333333333e-02
+829 1068 8.33333333333333e-02
+829 1192 -1.25000000000000e-01
+829 1075 -2.50000000000000e-01
+829 1191 -4.16666666666667e-02
+829 738 4.16666666666667e-02
+830 830 1.25000000000000e+00
+830 1069 8.33333333333333e-02
+830 1068 -1.66666666666667e-01
+830 824 -3.75000000000000e-01
+830 823 8.33333333333333e-02
+830 678 4.16666666666667e-02
+830 1187 -1.25000000000000e-01
+830 1186 8.33333333333333e-02
+830 1185 -4.16666666666667e-02
+830 738 4.16666666666667e-02
+830 1075 -8.33333333333333e-02
+830 829 -1.66666666666667e-01
+830 825 -4.16666666666667e-02
+830 820 -8.33333333333333e-02
+830 1072 8.33333333333333e-02
+830 819 -8.33333333333333e-02
+830 1071 8.33333333333333e-02
+830 827 -1.25000000000000e-01
+830 679 -8.33333333333333e-02
+830 826 8.33333333333333e-02
+830 822 8.33333333333333e-02
+830 1193 -3.75000000000000e-01
+830 1076 -2.50000000000000e-01
+830 1192 8.33333333333333e-02
+830 739 -8.33333333333333e-02
+830 828 -1.66666666666667e-01
+830 1191 8.33333333333333e-02
+830 1074 1.66666666666667e-01
+831 831 5.00000000000000e-01
+831 977 -4.16666666666667e-02
+831 1204 4.16666666666667e-02
+831 835 -4.16666666666667e-02
+831 743 4.16666666666667e-02
+831 1205 -8.33333333333333e-02
+831 742 4.16666666666667e-02
+831 832 -8.33333333333333e-02
+831 976 8.33333333333333e-02
+831 741 -1.25000000000000e-01
+831 975 -1.25000000000000e-01
+831 833 -8.33333333333333e-02
+831 836 8.33333333333333e-02
+831 834 -1.25000000000000e-01
+831 17 4.16666666666667e-02
+831 16 4.16666666666667e-02
+831 226 -8.33333333333333e-02
+831 227 4.16666666666667e-02
+831 15 -1.25000000000000e-01
+832 832 5.83333333333333e-01
+832 977 8.33333333333333e-02
+832 836 8.33333333333333e-02
+832 1203 4.16666666666667e-02
+832 834 -4.16666666666667e-02
+832 743 -4.16666666666667e-02
+832 1205 4.16666666666667e-02
+832 742 -4.16666666666667e-02
+832 976 -3.75000000000000e-01
+832 741 4.16666666666667e-02
+832 831 -8.33333333333333e-02
+832 975 8.33333333333333e-02
+832 833 -1.66666666666667e-01
+832 835 -1.25000000000000e-01
+832 17 -4.16666666666667e-02
+832 227 4.16666666666667e-02
+832 16 -4.16666666666667e-02
+832 15 4.16666666666667e-02
+832 225 -8.33333333333333e-02
+833 833 5.83333333333333e-01
+833 975 -4.16666666666667e-02
+833 832 -1.66666666666667e-01
+833 976 8.33333333333333e-02
+833 835 8.33333333333333e-02
+833 743 -4.16666666666667e-02
+833 977 -1.25000000000000e-01
+833 742 -4.16666666666667e-02
+833 1204 4.16666666666667e-02
+833 741 4.16666666666667e-02
+833 1203 -8.33333333333333e-02
+833 836 -3.75000000000000e-01
+833 831 -8.33333333333333e-02
+833 834 8.33333333333333e-02
+833 225 4.16666666666667e-02
+833 17 -4.16666666666667e-02
+833 16 -4.16666666666667e-02
+833 226 4.16666666666667e-02
+833 15 4.16666666666667e-02
+834 834 1.25000000000000e+00
+834 976 8.33333333333333e-02
+834 977 8.33333333333333e-02
+834 833 8.33333333333333e-02
+834 831 -1.25000000000000e-01
+834 1205 8.33333333333333e-02
+834 1204 8.33333333333333e-02
+834 835 -1.66666666666667e-01
+834 1203 -3.75000000000000e-01
+834 980 -8.33333333333333e-02
+834 836 -1.66666666666667e-01
+834 979 1.66666666666667e-01
+834 1211 8.33333333333333e-02
+834 746 -8.33333333333333e-02
+834 1210 -4.16666666666667e-02
+834 745 4.16666666666667e-02
+834 1209 -1.25000000000000e-01
+834 832 -4.16666666666667e-02
+834 978 -2.50000000000000e-01
+834 227 -8.33333333333333e-02
+834 590 8.33333333333333e-02
+834 232 8.33333333333333e-02
+834 589 -1.66666666666667e-01
+834 233 8.33333333333333e-02
+834 17 -8.33333333333333e-02
+834 16 4.16666666666667e-02
+834 226 -8.33333333333333e-02
+834 231 -3.75000000000000e-01
+835 835 1.25000000000000e+00
+835 831 -4.16666666666667e-02
+835 975 8.33333333333333e-02
+835 977 -1.66666666666667e-01
+835 832 -1.25000000000000e-01
+835 1205 -4.16666666666667e-02
+835 746 4.16666666666667e-02
+835 1204 -1.25000000000000e-01
+835 1203 8.33333333333333e-02
+835 834 -1.66666666666667e-01
+835 978 1.66666666666667e-01
+835 1211 8.33333333333333e-02
+835 836 -1.66666666666667e-01
+835 980 1.66666666666667e-01
+835 1210 -1.25000000000000e-01
+835 833 8.33333333333333e-02
+835 979 -7.50000000000000e-01
+835 1209 -4.16666666666667e-02
+835 744 4.16666666666667e-02
+835 17 4.16666666666667e-02
+835 233 -4.16666666666667e-02
+835 231 8.33333333333333e-02
+835 227 -8.33333333333333e-02
+835 590 8.33333333333333e-02
+835 588 -1.66666666666667e-01
+835 232 -1.25000000000000e-01
+835 15 4.16666666666667e-02
+835 225 -8.33333333333333e-02
+836 836 1.25000000000000e+00
+836 976 -1.66666666666667e-01
+836 975 8.33333333333333e-02
+836 833 -3.75000000000000e-01
+836 831 8.33333333333333e-02
+836 1205 -1.25000000000000e-01
+836 1204 -4.16666666666667e-02
+836 745 4.16666666666667e-02
+836 1203 8.33333333333333e-02
+836 978 -8.33333333333333e-02
+836 834 -1.66666666666667e-01
+836 1211 -3.75000000000000e-01
+836 832 8.33333333333333e-02
+836 980 -2.50000000000000e-01
+836 1210 8.33333333333333e-02
+836 835 -1.66666666666667e-01
+836 979 1.66666666666667e-01
+836 1209 8.33333333333333e-02
+836 744 -8.33333333333333e-02
+836 16 4.16666666666667e-02
+836 232 -4.16666666666667e-02
+836 225 -8.33333333333333e-02
+836 588 8.33333333333333e-02
+836 226 -8.33333333333333e-02
+836 589 8.33333333333333e-02
+836 233 -1.25000000000000e-01
+836 231 8.33333333333333e-02
+836 15 -8.33333333333333e-02
+837 837 1.25000000000000e+00
+837 1207 8.33333333333333e-02
+837 1208 8.33333333333333e-02
+837 844 8.33333333333333e-02
+837 843 -1.25000000000000e-01
+837 839 -1.66666666666667e-01
+837 992 8.33333333333333e-02
+837 991 8.33333333333333e-02
+837 990 -3.75000000000000e-01
+837 997 -8.33333333333333e-02
+837 838 -1.66666666666667e-01
+837 842 8.33333333333333e-02
+837 850 -8.33333333333333e-02
+837 1090 8.33333333333333e-02
+837 998 1.66666666666667e-01
+837 1091 -1.66666666666667e-01
+837 683 4.16666666666667e-02
+837 851 -8.33333333333333e-02
+837 841 8.33333333333333e-02
+837 682 -8.33333333333333e-02
+837 840 -3.75000000000000e-01
+837 986 -4.16666666666667e-02
+837 704 4.16666666666667e-02
+837 985 8.33333333333333e-02
+837 703 -8.33333333333333e-02
+837 984 -1.25000000000000e-01
+837 845 -4.16666666666667e-02
+837 996 -2.50000000000000e-01
+838 838 1.25000000000000e+00
+838 1206 8.33333333333333e-02
+838 1208 -1.66666666666667e-01
+838 683 4.16666666666667e-02
+838 844 -3.75000000000000e-01
+838 843 8.33333333333333e-02
+838 992 -4.16666666666667e-02
+838 704 4.16666666666667e-02
+838 991 -1.25000000000000e-01
+838 990 8.33333333333333e-02
+838 996 -8.33333333333333e-02
+838 842 -4.16666666666667e-02
+838 837 -1.66666666666667e-01
+838 849 -8.33333333333333e-02
+838 1089 8.33333333333333e-02
+838 851 -8.33333333333333e-02
+838 1091 8.33333333333333e-02
+838 841 -1.25000000000000e-01
+838 840 8.33333333333333e-02
+838 681 -8.33333333333333e-02
+838 986 8.33333333333333e-02
+838 839 -1.66666666666667e-01
+838 998 1.66666666666667e-01
+838 985 -3.75000000000000e-01
+838 845 8.33333333333333e-02
+838 997 -2.50000000000000e-01
+838 984 8.33333333333333e-02
+838 702 -8.33333333333333e-02
+839 839 1.25000000000000e+00
+839 844 8.33333333333333e-02
+839 1207 -1.66666666666667e-01
+839 1206 8.33333333333333e-02
+839 845 -1.25000000000000e-01
+839 682 4.16666666666667e-02
+839 992 -1.25000000000000e-01
+839 991 -4.16666666666667e-02
+839 703 4.16666666666667e-02
+839 837 -1.66666666666667e-01
+839 990 8.33333333333333e-02
+839 841 -4.16666666666667e-02
+839 840 8.33333333333333e-02
+839 850 -8.33333333333333e-02
+839 1090 8.33333333333333e-02
+839 996 1.66666666666667e-01
+839 1089 -1.66666666666667e-01
+839 842 -1.25000000000000e-01
+839 681 4.16666666666667e-02
+839 849 -8.33333333333333e-02
+839 986 -1.25000000000000e-01
+839 843 -4.16666666666667e-02
+839 998 -7.50000000000000e-01
+839 985 8.33333333333333e-02
+839 838 -1.66666666666667e-01
+839 997 1.66666666666667e-01
+839 984 -4.16666666666667e-02
+839 702 4.16666666666667e-02
+840 840 1.25000000000000e+00
+840 847 -8.33333333333333e-02
+840 1088 8.33333333333333e-02
+840 1087 8.33333333333333e-02
+840 1086 -3.75000000000000e-01
+840 854 -8.33333333333333e-02
+840 853 -8.33333333333333e-02
+840 1094 -1.66666666666667e-01
+840 1093 8.33333333333333e-02
+840 839 8.33333333333333e-02
+840 842 -1.66666666666667e-01
+840 1091 1.66666666666667e-01
+840 850 8.33333333333333e-02
+840 1090 -8.33333333333333e-02
+840 716 -4.16666666666667e-02
+840 986 4.16666666666667e-02
+840 715 8.33333333333333e-02
+840 985 -8.33333333333333e-02
+840 714 -1.25000000000000e-01
+840 1089 -2.50000000000000e-01
+840 683 -4.16666666666667e-02
+840 851 8.33333333333333e-02
+840 841 -1.66666666666667e-01
+840 682 8.33333333333333e-02
+840 838 8.33333333333333e-02
+840 848 4.16666666666667e-02
+840 681 -1.25000000000000e-01
+840 837 -3.75000000000000e-01
+841 841 1.25000000000000e+00
+841 846 -8.33333333333333e-02
+841 1088 -4.16666666666667e-02
+841 1087 -1.25000000000000e-01
+841 1086 8.33333333333333e-02
+841 854 -8.33333333333333e-02
+841 1094 8.33333333333333e-02
+841 852 -8.33333333333333e-02
+841 1092 8.33333333333333e-02
+841 839 -4.16666666666667e-02
+841 986 4.16666666666667e-02
+841 849 8.33333333333333e-02
+841 1089 -8.33333333333333e-02
+841 716 8.33333333333333e-02
+841 842 -1.66666666666667e-01
+841 1091 1.66666666666667e-01
+841 715 -3.75000000000000e-01
+841 1090 -2.50000000000000e-01
+841 714 8.33333333333333e-02
+841 984 -8.33333333333333e-02
+841 683 8.33333333333333e-02
+841 851 -1.66666666666667e-01
+841 848 4.16666666666667e-02
+841 682 -3.75000000000000e-01
+841 838 -1.25000000000000e-01
+841 840 -1.66666666666667e-01
+841 681 8.33333333333333e-02
+841 837 8.33333333333333e-02
+842 842 1.25000000000000e+00
+842 847 4.16666666666667e-02
+842 1088 -1.25000000000000e-01
+842 1087 -4.16666666666667e-02
+842 1086 8.33333333333333e-02
+842 852 -8.33333333333333e-02
+842 853 -8.33333333333333e-02
+842 1093 8.33333333333333e-02
+842 1092 -1.66666666666667e-01
+842 838 -4.16666666666667e-02
+842 985 4.16666666666667e-02
+842 837 8.33333333333333e-02
+842 840 -1.66666666666667e-01
+842 1089 1.66666666666667e-01
+842 716 -1.25000000000000e-01
+842 1091 -7.50000000000000e-01
+842 715 8.33333333333333e-02
+842 841 -1.66666666666667e-01
+842 1090 1.66666666666667e-01
+842 714 -4.16666666666667e-02
+842 984 4.16666666666667e-02
+842 846 4.16666666666667e-02
+842 683 -1.25000000000000e-01
+842 839 -1.25000000000000e-01
+842 682 8.33333333333333e-02
+842 850 -1.66666666666667e-01
+842 681 -4.16666666666667e-02
+842 849 8.33333333333333e-02
+843 843 5.00000000000000e-01
+843 839 -4.16666666666667e-02
+843 850 4.16666666666667e-02
+843 1207 -4.16666666666667e-02
+843 683 4.16666666666667e-02
+843 851 -8.33333333333333e-02
+843 682 4.16666666666667e-02
+843 844 -8.33333333333333e-02
+843 838 8.33333333333333e-02
+843 681 -1.25000000000000e-01
+843 837 -1.25000000000000e-01
+843 845 -8.33333333333333e-02
+843 743 4.16666666666667e-02
+843 1208 8.33333333333333e-02
+843 742 4.16666666666667e-02
+843 991 -8.33333333333333e-02
+843 992 4.16666666666667e-02
+843 741 -1.25000000000000e-01
+843 1206 -1.25000000000000e-01
+844 844 5.83333333333333e-01
+844 839 8.33333333333333e-02
+844 1208 8.33333333333333e-02
+844 849 4.16666666666667e-02
+844 1206 -4.16666666666667e-02
+844 683 -4.16666666666667e-02
+844 851 4.16666666666667e-02
+844 682 -4.16666666666667e-02
+844 838 -3.75000000000000e-01
+844 681 4.16666666666667e-02
+844 843 -8.33333333333333e-02
+844 837 8.33333333333333e-02
+844 743 -4.16666666666667e-02
+844 992 4.16666666666667e-02
+844 845 -1.66666666666667e-01
+844 742 -4.16666666666667e-02
+844 1207 -1.25000000000000e-01
+844 741 4.16666666666667e-02
+844 990 -8.33333333333333e-02
+845 845 5.83333333333333e-01
+845 837 -4.16666666666667e-02
+845 844 -1.66666666666667e-01
+845 838 8.33333333333333e-02
+845 1207 8.33333333333333e-02
+845 683 -4.16666666666667e-02
+845 839 -1.25000000000000e-01
+845 682 -4.16666666666667e-02
+845 850 4.16666666666667e-02
+845 681 4.16666666666667e-02
+845 849 -8.33333333333333e-02
+845 990 4.16666666666667e-02
+845 743 -4.16666666666667e-02
+845 1208 -3.75000000000000e-01
+845 742 -4.16666666666667e-02
+845 991 4.16666666666667e-02
+845 843 -8.33333333333333e-02
+845 741 4.16666666666667e-02
+845 1206 8.33333333333333e-02
+846 846 5.00000000000000e-01
+846 1088 -4.16666666666667e-02
+846 1222 4.16666666666667e-02
+846 853 -4.16666666666667e-02
+846 749 4.16666666666667e-02
+846 1223 -8.33333333333333e-02
+846 748 4.16666666666667e-02
+846 847 -8.33333333333333e-02
+846 1087 8.33333333333333e-02
+846 747 -1.25000000000000e-01
+846 1086 -1.25000000000000e-01
+846 848 -8.33333333333333e-02
+846 683 4.16666666666667e-02
+846 854 8.33333333333333e-02
+846 682 4.16666666666667e-02
+846 841 -8.33333333333333e-02
+846 842 4.16666666666667e-02
+846 681 -1.25000000000000e-01
+846 852 -1.25000000000000e-01
+847 847 5.83333333333333e-01
+847 1088 8.33333333333333e-02
+847 854 8.33333333333333e-02
+847 1221 4.16666666666667e-02
+847 852 -4.16666666666667e-02
+847 749 -4.16666666666667e-02
+847 1223 4.16666666666667e-02
+847 748 -4.16666666666667e-02
+847 1087 -3.75000000000000e-01
+847 747 4.16666666666667e-02
+847 846 -8.33333333333333e-02
+847 1086 8.33333333333333e-02
+847 683 -4.16666666666667e-02
+847 842 4.16666666666667e-02
+847 848 -1.66666666666667e-01
+847 682 -4.16666666666667e-02
+847 853 -1.25000000000000e-01
+847 681 4.16666666666667e-02
+847 840 -8.33333333333333e-02
+848 848 5.83333333333333e-01
+848 1086 -4.16666666666667e-02
+848 847 -1.66666666666667e-01
+848 1087 8.33333333333333e-02
+848 853 8.33333333333333e-02
+848 749 -4.16666666666667e-02
+848 1088 -1.25000000000000e-01
+848 748 -4.16666666666667e-02
+848 1222 4.16666666666667e-02
+848 747 4.16666666666667e-02
+848 1221 -8.33333333333333e-02
+848 840 4.16666666666667e-02
+848 683 -4.16666666666667e-02
+848 854 -3.75000000000000e-01
+848 682 -4.16666666666667e-02
+848 841 4.16666666666667e-02
+848 846 -8.33333333333333e-02
+848 681 4.16666666666667e-02
+848 852 8.33333333333333e-02
+849 849 1.25000000000000e+00
+849 850 -1.66666666666667e-01
+849 1229 -8.33333333333333e-02
+849 751 -4.16666666666667e-02
+849 1228 4.16666666666667e-02
+849 854 8.33333333333333e-02
+849 682 -4.16666666666667e-02
+849 852 -3.75000000000000e-01
+849 844 4.16666666666667e-02
+849 683 8.33333333333333e-02
+849 845 -8.33333333333333e-02
+849 851 -1.66666666666667e-01
+849 1208 8.33333333333333e-02
+849 752 8.33333333333333e-02
+849 1207 8.33333333333333e-02
+849 1206 -3.75000000000000e-01
+849 838 -8.33333333333333e-02
+849 841 8.33333333333333e-02
+849 842 8.33333333333333e-02
+849 839 -8.33333333333333e-02
+849 681 -1.25000000000000e-01
+849 1091 -8.33333333333333e-02
+849 998 8.33333333333333e-02
+849 1090 1.66666666666667e-01
+849 997 -1.66666666666667e-01
+849 1089 -2.50000000000000e-01
+849 853 8.33333333333333e-02
+849 750 -1.25000000000000e-01
+850 850 1.25000000000000e+00
+850 1229 4.16666666666667e-02
+850 852 8.33333333333333e-02
+850 849 -1.66666666666667e-01
+850 750 -4.16666666666667e-02
+850 1227 4.16666666666667e-02
+850 853 -1.25000000000000e-01
+850 681 -4.16666666666667e-02
+850 843 4.16666666666667e-02
+850 845 4.16666666666667e-02
+850 1208 -4.16666666666667e-02
+850 1207 -1.25000000000000e-01
+850 1206 8.33333333333333e-02
+850 837 -8.33333333333333e-02
+850 840 8.33333333333333e-02
+850 839 -8.33333333333333e-02
+850 998 8.33333333333333e-02
+850 842 -1.66666666666667e-01
+850 683 8.33333333333333e-02
+850 682 -1.25000000000000e-01
+850 1091 1.66666666666667e-01
+850 851 -1.66666666666667e-01
+850 752 8.33333333333333e-02
+850 1090 -7.50000000000000e-01
+850 854 -4.16666666666667e-02
+850 751 -1.25000000000000e-01
+850 1089 1.66666666666667e-01
+850 996 -1.66666666666667e-01
+851 851 1.25000000000000e+00
+851 1228 4.16666666666667e-02
+851 1227 -8.33333333333333e-02
+851 854 -1.25000000000000e-01
+851 852 8.33333333333333e-02
+851 844 4.16666666666667e-02
+851 681 8.33333333333333e-02
+851 843 -8.33333333333333e-02
+851 1208 -1.25000000000000e-01
+851 1207 -4.16666666666667e-02
+851 849 -1.66666666666667e-01
+851 1206 8.33333333333333e-02
+851 750 8.33333333333333e-02
+851 838 -8.33333333333333e-02
+851 997 8.33333333333333e-02
+851 683 -3.75000000000000e-01
+851 841 -1.66666666666667e-01
+851 682 8.33333333333333e-02
+851 840 8.33333333333333e-02
+851 837 -8.33333333333333e-02
+851 1091 -2.50000000000000e-01
+851 853 -4.16666666666667e-02
+851 752 -3.75000000000000e-01
+851 1090 1.66666666666667e-01
+851 850 -1.66666666666667e-01
+851 751 8.33333333333333e-02
+851 1089 -8.33333333333333e-02
+851 996 8.33333333333333e-02
+852 852 1.25000000000000e+00
+852 1087 8.33333333333333e-02
+852 1088 8.33333333333333e-02
+852 848 8.33333333333333e-02
+852 846 -1.25000000000000e-01
+852 1223 8.33333333333333e-02
+852 1222 8.33333333333333e-02
+852 853 -1.66666666666667e-01
+852 1221 -3.75000000000000e-01
+852 1094 -8.33333333333333e-02
+852 854 -1.66666666666667e-01
+852 842 -8.33333333333333e-02
+852 1091 8.33333333333333e-02
+852 850 8.33333333333333e-02
+852 1093 1.66666666666667e-01
+852 1090 -1.66666666666667e-01
+852 851 8.33333333333333e-02
+852 683 -8.33333333333333e-02
+852 682 4.16666666666667e-02
+852 841 -8.33333333333333e-02
+852 849 -3.75000000000000e-01
+852 1229 8.33333333333333e-02
+852 755 -8.33333333333333e-02
+852 1228 -4.16666666666667e-02
+852 754 4.16666666666667e-02
+852 1227 -1.25000000000000e-01
+852 847 -4.16666666666667e-02
+852 1092 -2.50000000000000e-01
+853 853 1.25000000000000e+00
+853 846 -4.16666666666667e-02
+853 1086 8.33333333333333e-02
+853 1088 -1.66666666666667e-01
+853 683 4.16666666666667e-02
+853 847 -1.25000000000000e-01
+853 1223 -4.16666666666667e-02
+853 755 4.16666666666667e-02
+853 1222 -1.25000000000000e-01
+853 1221 8.33333333333333e-02
+853 852 -1.66666666666667e-01
+853 851 -4.16666666666667e-02
+853 849 8.33333333333333e-02
+853 842 -8.33333333333333e-02
+853 1091 8.33333333333333e-02
+853 1092 1.66666666666667e-01
+853 1089 -1.66666666666667e-01
+853 850 -1.25000000000000e-01
+853 681 4.16666666666667e-02
+853 840 -8.33333333333333e-02
+853 1229 8.33333333333333e-02
+853 854 -1.66666666666667e-01
+853 1094 1.66666666666667e-01
+853 1228 -1.25000000000000e-01
+853 848 8.33333333333333e-02
+853 1093 -7.50000000000000e-01
+853 1227 -4.16666666666667e-02
+853 753 4.16666666666667e-02
+854 854 1.25000000000000e+00
+854 1087 -1.66666666666667e-01
+854 1086 8.33333333333333e-02
+854 848 -3.75000000000000e-01
+854 682 4.16666666666667e-02
+854 846 8.33333333333333e-02
+854 1223 -1.25000000000000e-01
+854 1222 -4.16666666666667e-02
+854 754 4.16666666666667e-02
+854 1221 8.33333333333333e-02
+854 1092 -8.33333333333333e-02
+854 850 -4.16666666666667e-02
+854 852 -1.66666666666667e-01
+854 840 -8.33333333333333e-02
+854 1089 8.33333333333333e-02
+854 841 -8.33333333333333e-02
+854 1090 8.33333333333333e-02
+854 851 -1.25000000000000e-01
+854 849 8.33333333333333e-02
+854 681 -8.33333333333333e-02
+854 1229 -3.75000000000000e-01
+854 847 8.33333333333333e-02
+854 1094 -2.50000000000000e-01
+854 1228 8.33333333333333e-02
+854 853 -1.66666666666667e-01
+854 1093 1.66666666666667e-01
+854 1227 8.33333333333333e-02
+854 753 -8.33333333333333e-02
+855 855 1.25000000000000e+00
+855 1225 8.33333333333333e-02
+855 1226 8.33333333333333e-02
+855 862 8.33333333333333e-02
+855 861 -1.25000000000000e-01
+855 857 -1.66666666666667e-01
+855 1106 8.33333333333333e-02
+855 1105 8.33333333333333e-02
+855 1104 -3.75000000000000e-01
+855 1111 -8.33333333333333e-02
+855 856 -1.66666666666667e-01
+855 860 8.33333333333333e-02
+855 865 -8.33333333333333e-02
+855 1189 8.33333333333333e-02
+855 1112 1.66666666666667e-01
+855 1190 -1.66666666666667e-01
+855 686 4.16666666666667e-02
+855 866 -8.33333333333333e-02
+855 859 8.33333333333333e-02
+855 685 -8.33333333333333e-02
+855 858 -3.75000000000000e-01
+855 1100 -4.16666666666667e-02
+855 719 4.16666666666667e-02
+855 1099 8.33333333333333e-02
+855 718 -8.33333333333333e-02
+855 1098 -1.25000000000000e-01
+855 863 -4.16666666666667e-02
+855 1110 -2.50000000000000e-01
+856 856 1.25000000000000e+00
+856 1224 8.33333333333333e-02
+856 1226 -1.66666666666667e-01
+856 686 4.16666666666667e-02
+856 862 -3.75000000000000e-01
+856 861 8.33333333333333e-02
+856 1106 -4.16666666666667e-02
+856 719 4.16666666666667e-02
+856 1105 -1.25000000000000e-01
+856 1104 8.33333333333333e-02
+856 1110 -8.33333333333333e-02
+856 860 -4.16666666666667e-02
+856 855 -1.66666666666667e-01
+856 864 -8.33333333333333e-02
+856 1188 8.33333333333333e-02
+856 866 -8.33333333333333e-02
+856 1190 8.33333333333333e-02
+856 859 -1.25000000000000e-01
+856 858 8.33333333333333e-02
+856 684 -8.33333333333333e-02
+856 1100 8.33333333333333e-02
+856 857 -1.66666666666667e-01
+856 1112 1.66666666666667e-01
+856 1099 -3.75000000000000e-01
+856 863 8.33333333333333e-02
+856 1111 -2.50000000000000e-01
+856 1098 8.33333333333333e-02
+856 717 -8.33333333333333e-02
+857 857 1.25000000000000e+00
+857 862 8.33333333333333e-02
+857 1225 -1.66666666666667e-01
+857 1224 8.33333333333333e-02
+857 863 -1.25000000000000e-01
+857 685 4.16666666666667e-02
+857 1106 -1.25000000000000e-01
+857 1105 -4.16666666666667e-02
+857 718 4.16666666666667e-02
+857 855 -1.66666666666667e-01
+857 1104 8.33333333333333e-02
+857 859 -4.16666666666667e-02
+857 858 8.33333333333333e-02
+857 865 -8.33333333333333e-02
+857 1189 8.33333333333333e-02
+857 1110 1.66666666666667e-01
+857 1188 -1.66666666666667e-01
+857 860 -1.25000000000000e-01
+857 684 4.16666666666667e-02
+857 864 -8.33333333333333e-02
+857 1100 -1.25000000000000e-01
+857 861 -4.16666666666667e-02
+857 1112 -7.50000000000000e-01
+857 1099 8.33333333333333e-02
+857 856 -1.66666666666667e-01
+857 1111 1.66666666666667e-01
+857 1098 -4.16666666666667e-02
+857 717 4.16666666666667e-02
+858 858 5.83333333333333e-01
+858 860 -1.66666666666667e-01
+858 1190 8.33333333333333e-02
+858 865 4.16666666666667e-02
+858 1189 -4.16666666666667e-02
+858 734 -4.16666666666667e-02
+858 1100 4.16666666666667e-02
+858 733 4.16666666666667e-02
+858 1099 -8.33333333333333e-02
+858 732 -4.16666666666667e-02
+858 1188 -1.25000000000000e-01
+858 686 -4.16666666666667e-02
+858 866 4.16666666666667e-02
+858 859 -8.33333333333333e-02
+858 685 4.16666666666667e-02
+858 856 8.33333333333333e-02
+858 857 8.33333333333333e-02
+858 684 -4.16666666666667e-02
+858 855 -3.75000000000000e-01
+859 859 5.00000000000000e-01
+859 1100 4.16666666666667e-02
+859 864 4.16666666666667e-02
+859 1188 -4.16666666666667e-02
+859 734 4.16666666666667e-02
+859 860 -8.33333333333333e-02
+859 1190 8.33333333333333e-02
+859 733 -1.25000000000000e-01
+859 1189 -1.25000000000000e-01
+859 732 4.16666666666667e-02
+859 1098 -8.33333333333333e-02
+859 686 4.16666666666667e-02
+859 866 -8.33333333333333e-02
+859 857 -4.16666666666667e-02
+859 685 -1.25000000000000e-01
+859 856 -1.25000000000000e-01
+859 858 -8.33333333333333e-02
+859 684 4.16666666666667e-02
+859 855 8.33333333333333e-02
+860 860 5.83333333333333e-01
+860 1099 4.16666666666667e-02
+860 855 8.33333333333333e-02
+860 858 -1.66666666666667e-01
+860 1188 8.33333333333333e-02
+860 734 -4.16666666666667e-02
+860 1190 -3.75000000000000e-01
+860 733 4.16666666666667e-02
+860 859 -8.33333333333333e-02
+860 1189 8.33333333333333e-02
+860 732 -4.16666666666667e-02
+860 1098 4.16666666666667e-02
+860 856 -4.16666666666667e-02
+860 686 -4.16666666666667e-02
+860 857 -1.25000000000000e-01
+860 685 4.16666666666667e-02
+860 865 -8.33333333333333e-02
+860 684 -4.16666666666667e-02
+860 864 4.16666666666667e-02
+861 861 5.00000000000000e-01
+861 857 -4.16666666666667e-02
+861 865 4.16666666666667e-02
+861 1225 -4.16666666666667e-02
+861 686 4.16666666666667e-02
+861 866 -8.33333333333333e-02
+861 685 4.16666666666667e-02
+861 862 -8.33333333333333e-02
+861 856 8.33333333333333e-02
+861 684 -1.25000000000000e-01
+861 855 -1.25000000000000e-01
+861 863 -8.33333333333333e-02
+861 749 4.16666666666667e-02
+861 1226 8.33333333333333e-02
+861 748 4.16666666666667e-02
+861 1105 -8.33333333333333e-02
+861 1106 4.16666666666667e-02
+861 747 -1.25000000000000e-01
+861 1224 -1.25000000000000e-01
+862 862 5.83333333333333e-01
+862 857 8.33333333333333e-02
+862 1226 8.33333333333333e-02
+862 864 4.16666666666667e-02
+862 1224 -4.16666666666667e-02
+862 686 -4.16666666666667e-02
+862 866 4.16666666666667e-02
+862 685 -4.16666666666667e-02
+862 856 -3.75000000000000e-01
+862 684 4.16666666666667e-02
+862 861 -8.33333333333333e-02
+862 855 8.33333333333333e-02
+862 749 -4.16666666666667e-02
+862 1106 4.16666666666667e-02
+862 863 -1.66666666666667e-01
+862 748 -4.16666666666667e-02
+862 1225 -1.25000000000000e-01
+862 747 4.16666666666667e-02
+862 1104 -8.33333333333333e-02
+863 863 5.83333333333333e-01
+863 855 -4.16666666666667e-02
+863 862 -1.66666666666667e-01
+863 856 8.33333333333333e-02
+863 1225 8.33333333333333e-02
+863 686 -4.16666666666667e-02
+863 857 -1.25000000000000e-01
+863 685 -4.16666666666667e-02
+863 865 4.16666666666667e-02
+863 684 4.16666666666667e-02
+863 864 -8.33333333333333e-02
+863 1104 4.16666666666667e-02
+863 749 -4.16666666666667e-02
+863 1226 -3.75000000000000e-01
+863 748 -4.16666666666667e-02
+863 1105 4.16666666666667e-02
+863 861 -8.33333333333333e-02
+863 747 4.16666666666667e-02
+863 1224 8.33333333333333e-02
+864 864 6.66666666666667e-01
+864 686 4.16666666666667e-02
+864 863 -8.33333333333333e-02
+864 866 -8.33333333333333e-02
+864 1226 8.33333333333333e-02
+864 758 4.16666666666667e-02
+864 1225 8.33333333333333e-02
+864 1224 -3.75000000000000e-01
+864 856 -8.33333333333333e-02
+864 859 4.16666666666667e-02
+864 860 4.16666666666667e-02
+864 857 -8.33333333333333e-02
+864 684 -8.33333333333333e-02
+864 1190 -4.16666666666667e-02
+864 1112 8.33333333333333e-02
+864 1189 8.33333333333333e-02
+864 1111 -1.66666666666667e-01
+864 1188 -1.25000000000000e-01
+864 862 4.16666666666667e-02
+864 756 -8.33333333333333e-02
+865 865 6.66666666666667e-01
+865 863 4.16666666666667e-02
+865 1226 -4.16666666666667e-02
+865 1225 -1.25000000000000e-01
+865 1224 8.33333333333333e-02
+865 855 -8.33333333333333e-02
+865 858 4.16666666666667e-02
+865 857 -8.33333333333333e-02
+865 1112 8.33333333333333e-02
+865 860 -8.33333333333333e-02
+865 686 4.16666666666667e-02
+865 685 -8.33333333333333e-02
+865 1190 8.33333333333333e-02
+865 866 -8.33333333333333e-02
+865 758 4.16666666666667e-02
+865 1189 -3.75000000000000e-01
+865 861 4.16666666666667e-02
+865 757 -8.33333333333333e-02
+865 1188 8.33333333333333e-02
+865 1110 -1.66666666666667e-01
+866 866 7.50000000000000e-01
+866 684 4.16666666666667e-02
+866 861 -8.33333333333333e-02
+866 1226 -1.25000000000000e-01
+866 1225 -4.16666666666667e-02
+866 864 -8.33333333333333e-02
+866 1224 8.33333333333333e-02
+866 756 4.16666666666667e-02
+866 856 -8.33333333333333e-02
+866 1111 8.33333333333333e-02
+866 686 -2.50000000000000e-01
+866 859 -8.33333333333333e-02
+866 685 4.16666666666667e-02
+866 858 4.16666666666667e-02
+866 855 -8.33333333333333e-02
+866 1190 -1.25000000000000e-01
+866 862 4.16666666666667e-02
+866 758 -2.50000000000000e-01
+866 1189 8.33333333333333e-02
+866 865 -8.33333333333333e-02
+866 757 4.16666666666667e-02
+866 1188 -4.16666666666667e-02
+866 1110 8.33333333333333e-02
+867 867 5.00000000000000e-01
+867 1241 4.16666666666667e-02
+867 872 -4.16666666666667e-02
+867 868 -8.33333333333333e-02
+867 871 8.33333333333333e-02
+867 870 -1.25000000000000e-01
+867 869 -8.33333333333333e-02
+867 761 4.16666666666667e-02
+867 1007 8.33333333333333e-02
+867 760 4.16666666666667e-02
+867 1240 -8.33333333333333e-02
+867 1006 -4.16666666666667e-02
+867 759 -1.25000000000000e-01
+867 1005 -1.25000000000000e-01
+867 268 4.16666666666667e-02
+867 26 4.16666666666667e-02
+867 269 -8.33333333333333e-02
+867 25 4.16666666666667e-02
+867 24 -1.25000000000000e-01
+868 868 5.83333333333333e-01
+868 1007 8.33333333333333e-02
+868 869 -1.66666666666667e-01
+868 872 8.33333333333333e-02
+868 871 -3.75000000000000e-01
+868 867 -8.33333333333333e-02
+868 870 8.33333333333333e-02
+868 761 -4.16666666666667e-02
+868 1241 4.16666666666667e-02
+868 1005 -4.16666666666667e-02
+868 760 -4.16666666666667e-02
+868 1006 -1.25000000000000e-01
+868 759 4.16666666666667e-02
+868 1239 -8.33333333333333e-02
+868 267 4.16666666666667e-02
+868 26 -4.16666666666667e-02
+868 269 4.16666666666667e-02
+868 25 -4.16666666666667e-02
+868 24 4.16666666666667e-02
+869 869 5.83333333333333e-01
+869 868 -1.66666666666667e-01
+869 871 8.33333333333333e-02
+869 1239 4.16666666666667e-02
+869 870 -4.16666666666667e-02
+869 872 -1.25000000000000e-01
+869 1006 8.33333333333333e-02
+869 761 -4.16666666666667e-02
+869 1007 -3.75000000000000e-01
+869 760 -4.16666666666667e-02
+869 1240 4.16666666666667e-02
+869 867 -8.33333333333333e-02
+869 759 4.16666666666667e-02
+869 1005 8.33333333333333e-02
+869 26 -4.16666666666667e-02
+869 25 -4.16666666666667e-02
+869 268 4.16666666666667e-02
+869 24 4.16666666666667e-02
+869 267 -8.33333333333333e-02
+870 870 1.25000000000000e+00
+870 1247 -4.16666666666667e-02
+870 764 4.16666666666667e-02
+870 1246 8.33333333333333e-02
+870 1245 -1.25000000000000e-01
+870 1007 8.33333333333333e-02
+870 869 -4.16666666666667e-02
+870 871 -1.66666666666667e-01
+870 1006 8.33333333333333e-02
+870 1009 -8.33333333333333e-02
+870 868 8.33333333333333e-02
+870 867 -1.25000000000000e-01
+870 872 -1.66666666666667e-01
+870 1241 8.33333333333333e-02
+870 1010 1.66666666666667e-01
+870 1240 8.33333333333333e-02
+870 763 -8.33333333333333e-02
+870 1239 -3.75000000000000e-01
+870 1008 -2.50000000000000e-01
+870 596 -1.66666666666667e-01
+870 595 8.33333333333333e-02
+870 26 4.16666666666667e-02
+870 274 8.33333333333333e-02
+870 273 -3.75000000000000e-01
+870 269 -8.33333333333333e-02
+870 268 -8.33333333333333e-02
+870 25 -8.33333333333333e-02
+870 275 8.33333333333333e-02
+871 871 1.25000000000000e+00
+871 1247 8.33333333333333e-02
+871 872 -1.66666666666667e-01
+871 1246 -3.75000000000000e-01
+871 1245 8.33333333333333e-02
+871 869 8.33333333333333e-02
+871 870 -1.66666666666667e-01
+871 1007 -1.66666666666667e-01
+871 1010 1.66666666666667e-01
+871 1005 8.33333333333333e-02
+871 1008 -8.33333333333333e-02
+871 868 -3.75000000000000e-01
+871 867 8.33333333333333e-02
+871 1241 -4.16666666666667e-02
+871 764 4.16666666666667e-02
+871 1240 -1.25000000000000e-01
+871 1009 -2.50000000000000e-01
+871 1239 8.33333333333333e-02
+871 762 -8.33333333333333e-02
+871 596 8.33333333333333e-02
+871 594 8.33333333333333e-02
+871 274 -1.25000000000000e-01
+871 273 8.33333333333333e-02
+871 267 -8.33333333333333e-02
+871 26 4.16666666666667e-02
+871 269 -8.33333333333333e-02
+871 24 -8.33333333333333e-02
+871 275 -4.16666666666667e-02
+872 872 1.25000000000000e+00
+872 1247 -1.25000000000000e-01
+872 1246 8.33333333333333e-02
+872 871 -1.66666666666667e-01
+872 1245 -4.16666666666667e-02
+872 762 4.16666666666667e-02
+872 868 8.33333333333333e-02
+872 1005 8.33333333333333e-02
+872 867 -4.16666666666667e-02
+872 1006 -1.66666666666667e-01
+872 1009 1.66666666666667e-01
+872 869 -1.25000000000000e-01
+872 1241 -1.25000000000000e-01
+872 1010 -7.50000000000000e-01
+872 1240 -4.16666666666667e-02
+872 763 4.16666666666667e-02
+872 870 -1.66666666666667e-01
+872 1239 8.33333333333333e-02
+872 1008 1.66666666666667e-01
+872 595 8.33333333333333e-02
+872 273 8.33333333333333e-02
+872 594 -1.66666666666667e-01
+872 275 -1.25000000000000e-01
+872 24 4.16666666666667e-02
+872 267 -8.33333333333333e-02
+872 25 4.16666666666667e-02
+872 268 -8.33333333333333e-02
+872 274 -4.16666666666667e-02
+873 873 1.25000000000000e+00
+873 1127 8.33333333333333e-02
+873 1126 -1.66666666666667e-01
+873 878 8.33333333333333e-02
+873 688 4.16666666666667e-02
+873 876 -3.75000000000000e-01
+873 1016 8.33333333333333e-02
+873 1015 -4.16666666666667e-02
+873 706 4.16666666666667e-02
+873 1014 -1.25000000000000e-01
+873 1028 -8.33333333333333e-02
+873 875 -1.66666666666667e-01
+873 880 -4.16666666666667e-02
+873 887 -8.33333333333333e-02
+873 1244 8.33333333333333e-02
+873 886 -8.33333333333333e-02
+873 1243 8.33333333333333e-02
+873 881 8.33333333333333e-02
+873 689 -8.33333333333333e-02
+873 879 -1.25000000000000e-01
+873 1022 8.33333333333333e-02
+873 707 -8.33333333333333e-02
+873 1021 8.33333333333333e-02
+873 874 -1.66666666666667e-01
+873 1027 1.66666666666667e-01
+873 1020 -3.75000000000000e-01
+873 877 8.33333333333333e-02
+873 1026 -2.50000000000000e-01
+874 874 1.25000000000000e+00
+874 1127 8.33333333333333e-02
+874 876 8.33333333333333e-02
+874 1125 -1.66666666666667e-01
+874 877 -1.25000000000000e-01
+874 687 4.16666666666667e-02
+874 1016 8.33333333333333e-02
+874 875 -1.66666666666667e-01
+874 1015 -1.25000000000000e-01
+874 1014 -4.16666666666667e-02
+874 705 4.16666666666667e-02
+874 879 -4.16666666666667e-02
+874 881 8.33333333333333e-02
+874 1028 1.66666666666667e-01
+874 1244 -1.66666666666667e-01
+874 885 -8.33333333333333e-02
+874 1242 8.33333333333333e-02
+874 689 4.16666666666667e-02
+874 887 -8.33333333333333e-02
+874 880 -1.25000000000000e-01
+874 1022 -4.16666666666667e-02
+874 707 4.16666666666667e-02
+874 1021 -1.25000000000000e-01
+874 878 -4.16666666666667e-02
+874 1027 -7.50000000000000e-01
+874 1020 8.33333333333333e-02
+874 873 -1.66666666666667e-01
+874 1026 1.66666666666667e-01
+875 875 1.25000000000000e+00
+875 1126 8.33333333333333e-02
+875 1125 8.33333333333333e-02
+875 878 -1.25000000000000e-01
+875 876 8.33333333333333e-02
+875 1016 -3.75000000000000e-01
+875 1015 8.33333333333333e-02
+875 874 -1.66666666666667e-01
+875 1014 8.33333333333333e-02
+875 1026 -8.33333333333333e-02
+875 873 -1.66666666666667e-01
+875 880 8.33333333333333e-02
+875 885 -8.33333333333333e-02
+875 1242 8.33333333333333e-02
+875 1027 1.66666666666667e-01
+875 1243 -1.66666666666667e-01
+875 881 -3.75000000000000e-01
+875 688 4.16666666666667e-02
+875 886 -8.33333333333333e-02
+875 879 8.33333333333333e-02
+875 687 -8.33333333333333e-02
+875 1022 -1.25000000000000e-01
+875 877 -4.16666666666667e-02
+875 1028 -2.50000000000000e-01
+875 1021 -4.16666666666667e-02
+875 706 4.16666666666667e-02
+875 1020 8.33333333333333e-02
+875 705 -8.33333333333333e-02
+876 876 1.25000000000000e+00
+876 890 -8.33333333333333e-02
+876 883 4.16666666666667e-02
+876 889 -8.33333333333333e-02
+876 884 -8.33333333333333e-02
+876 1124 8.33333333333333e-02
+876 1123 8.33333333333333e-02
+876 1129 -1.66666666666667e-01
+876 1122 -3.75000000000000e-01
+876 887 8.33333333333333e-02
+876 1127 -8.33333333333333e-02
+876 877 -1.66666666666667e-01
+876 1126 1.66666666666667e-01
+876 874 8.33333333333333e-02
+876 722 8.33333333333333e-02
+876 1016 -8.33333333333333e-02
+876 721 -4.16666666666667e-02
+876 1015 4.16666666666667e-02
+876 720 -1.25000000000000e-01
+876 1125 -2.50000000000000e-01
+876 878 -1.66666666666667e-01
+876 689 8.33333333333333e-02
+876 875 8.33333333333333e-02
+876 688 -4.16666666666667e-02
+876 886 8.33333333333333e-02
+876 1130 8.33333333333333e-02
+876 687 -1.25000000000000e-01
+876 873 -3.75000000000000e-01
+877 877 1.25000000000000e+00
+877 888 -8.33333333333333e-02
+877 884 4.16666666666667e-02
+877 890 -8.33333333333333e-02
+877 1124 -4.16666666666667e-02
+877 1130 8.33333333333333e-02
+877 1123 -1.25000000000000e-01
+877 1122 8.33333333333333e-02
+877 1128 -1.66666666666667e-01
+877 1016 4.16666666666667e-02
+877 875 -4.16666666666667e-02
+877 876 -1.66666666666667e-01
+877 1125 1.66666666666667e-01
+877 873 8.33333333333333e-02
+877 722 8.33333333333333e-02
+877 878 -1.66666666666667e-01
+877 1127 1.66666666666667e-01
+877 721 -1.25000000000000e-01
+877 1126 -7.50000000000000e-01
+877 720 -4.16666666666667e-02
+877 1014 4.16666666666667e-02
+877 689 8.33333333333333e-02
+877 887 -1.66666666666667e-01
+877 882 4.16666666666667e-02
+877 688 -1.25000000000000e-01
+877 874 -1.25000000000000e-01
+877 687 -4.16666666666667e-02
+877 885 8.33333333333333e-02
+878 878 1.25000000000000e+00
+878 888 -8.33333333333333e-02
+878 883 4.16666666666667e-02
+878 889 -8.33333333333333e-02
+878 882 -8.33333333333333e-02
+878 1124 -1.25000000000000e-01
+878 1123 -4.16666666666667e-02
+878 1129 8.33333333333333e-02
+878 1122 8.33333333333333e-02
+878 885 8.33333333333333e-02
+878 1125 -8.33333333333333e-02
+878 1015 4.16666666666667e-02
+878 874 -4.16666666666667e-02
+878 722 -3.75000000000000e-01
+878 1127 -2.50000000000000e-01
+878 721 8.33333333333333e-02
+878 877 -1.66666666666667e-01
+878 1126 1.66666666666667e-01
+878 720 8.33333333333333e-02
+878 1014 -8.33333333333333e-02
+878 1128 8.33333333333333e-02
+878 689 -3.75000000000000e-01
+878 875 -1.25000000000000e-01
+878 688 8.33333333333333e-02
+878 886 -1.66666666666667e-01
+878 876 -1.66666666666667e-01
+878 687 8.33333333333333e-02
+878 873 8.33333333333333e-02
+879 879 5.00000000000000e-01
+879 1021 4.16666666666667e-02
+879 887 4.16666666666667e-02
+879 1244 -4.16666666666667e-02
+879 761 4.16666666666667e-02
+879 1022 -8.33333333333333e-02
+879 760 4.16666666666667e-02
+879 880 -8.33333333333333e-02
+879 1243 8.33333333333333e-02
+879 759 -1.25000000000000e-01
+879 1242 -1.25000000000000e-01
+879 881 -8.33333333333333e-02
+879 689 4.16666666666667e-02
+879 875 8.33333333333333e-02
+879 688 4.16666666666667e-02
+879 886 -8.33333333333333e-02
+879 874 -4.16666666666667e-02
+879 687 -1.25000000000000e-01
+879 873 -1.25000000000000e-01
+880 880 5.83333333333333e-01
+880 1020 4.16666666666667e-02
+880 875 8.33333333333333e-02
+880 881 -1.66666666666667e-01
+880 1244 8.33333333333333e-02
+880 761 -4.16666666666667e-02
+880 1022 4.16666666666667e-02
+880 760 -4.16666666666667e-02
+880 1243 -3.75000000000000e-01
+880 759 4.16666666666667e-02
+880 879 -8.33333333333333e-02
+880 1242 8.33333333333333e-02
+880 689 -4.16666666666667e-02
+880 887 4.16666666666667e-02
+880 873 -4.16666666666667e-02
+880 688 -4.16666666666667e-02
+880 874 -1.25000000000000e-01
+880 687 4.16666666666667e-02
+880 885 -8.33333333333333e-02
+881 881 5.83333333333333e-01
+881 880 -1.66666666666667e-01
+881 1243 8.33333333333333e-02
+881 885 4.16666666666667e-02
+881 1242 -4.16666666666667e-02
+881 761 -4.16666666666667e-02
+881 1244 -1.25000000000000e-01
+881 760 -4.16666666666667e-02
+881 1021 4.16666666666667e-02
+881 759 4.16666666666667e-02
+881 1020 -8.33333333333333e-02
+881 874 8.33333333333333e-02
+881 689 -4.16666666666667e-02
+881 875 -3.75000000000000e-01
+881 688 -4.16666666666667e-02
+881 886 4.16666666666667e-02
+881 879 -8.33333333333333e-02
+881 687 4.16666666666667e-02
+881 873 8.33333333333333e-02
+882 882 5.00000000000000e-01
+882 877 4.16666666666667e-02
+882 1259 4.16666666666667e-02
+882 890 -4.16666666666667e-02
+882 689 4.16666666666667e-02
+882 878 -8.33333333333333e-02
+882 688 4.16666666666667e-02
+882 883 -8.33333333333333e-02
+882 889 8.33333333333333e-02
+882 687 -1.25000000000000e-01
+882 888 -1.25000000000000e-01
+882 884 -8.33333333333333e-02
+882 767 4.16666666666667e-02
+882 1124 8.33333333333333e-02
+882 766 4.16666666666667e-02
+882 1258 -8.33333333333333e-02
+882 1123 -4.16666666666667e-02
+882 765 -1.25000000000000e-01
+882 1122 -1.25000000000000e-01
+883 883 5.83333333333333e-01
+883 876 4.16666666666667e-02
+883 1124 8.33333333333333e-02
+883 884 -1.66666666666667e-01
+883 890 8.33333333333333e-02
+883 689 -4.16666666666667e-02
+883 878 4.16666666666667e-02
+883 688 -4.16666666666667e-02
+883 889 -3.75000000000000e-01
+883 687 4.16666666666667e-02
+883 882 -8.33333333333333e-02
+883 888 8.33333333333333e-02
+883 767 -4.16666666666667e-02
+883 1259 4.16666666666667e-02
+883 1122 -4.16666666666667e-02
+883 766 -4.16666666666667e-02
+883 1123 -1.25000000000000e-01
+883 765 4.16666666666667e-02
+883 1257 -8.33333333333333e-02
+884 884 5.83333333333333e-01
+884 883 -1.66666666666667e-01
+884 889 8.33333333333333e-02
+884 1257 4.16666666666667e-02
+884 888 -4.16666666666667e-02
+884 689 -4.16666666666667e-02
+884 890 -1.25000000000000e-01
+884 688 -4.16666666666667e-02
+884 877 4.16666666666667e-02
+884 687 4.16666666666667e-02
+884 876 -8.33333333333333e-02
+884 1123 8.33333333333333e-02
+884 767 -4.16666666666667e-02
+884 1124 -3.75000000000000e-01
+884 766 -4.16666666666667e-02
+884 1258 4.16666666666667e-02
+884 882 -8.33333333333333e-02
+884 765 4.16666666666667e-02
+884 1122 8.33333333333333e-02
+885 885 1.25000000000000e+00
+885 890 8.33333333333333e-02
+885 770 -4.16666666666667e-02
+885 1265 4.16666666666667e-02
+885 1264 -8.33333333333333e-02
+885 689 -4.16666666666667e-02
+885 889 8.33333333333333e-02
+885 888 -3.75000000000000e-01
+885 878 8.33333333333333e-02
+885 877 8.33333333333333e-02
+885 1127 1.66666666666667e-01
+885 1126 -8.33333333333333e-02
+885 1125 -2.50000000000000e-01
+885 875 -8.33333333333333e-02
+885 881 4.16666666666667e-02
+885 874 -8.33333333333333e-02
+885 1027 8.33333333333333e-02
+885 880 -8.33333333333333e-02
+885 688 8.33333333333333e-02
+885 687 -1.25000000000000e-01
+885 1244 8.33333333333333e-02
+885 1028 -1.66666666666667e-01
+885 1243 8.33333333333333e-02
+885 886 -1.66666666666667e-01
+885 769 8.33333333333333e-02
+885 1242 -3.75000000000000e-01
+885 887 -1.66666666666667e-01
+885 768 -1.25000000000000e-01
+886 886 1.25000000000000e+00
+886 890 -4.16666666666667e-02
+886 1263 -8.33333333333333e-02
+886 889 -1.25000000000000e-01
+886 888 8.33333333333333e-02
+886 878 -1.66666666666667e-01
+886 689 8.33333333333333e-02
+886 876 8.33333333333333e-02
+886 1127 1.66666666666667e-01
+886 887 -1.66666666666667e-01
+886 770 8.33333333333333e-02
+886 1126 -2.50000000000000e-01
+886 1125 -8.33333333333333e-02
+886 873 -8.33333333333333e-02
+886 1026 8.33333333333333e-02
+886 881 4.16666666666667e-02
+886 875 -8.33333333333333e-02
+886 688 -3.75000000000000e-01
+886 879 -8.33333333333333e-02
+886 687 8.33333333333333e-02
+886 1244 -4.16666666666667e-02
+886 1028 8.33333333333333e-02
+886 1243 -1.25000000000000e-01
+886 1265 4.16666666666667e-02
+886 769 -3.75000000000000e-01
+886 1242 8.33333333333333e-02
+886 885 -1.66666666666667e-01
+886 768 8.33333333333333e-02
+887 887 1.25000000000000e+00
+887 889 -4.16666666666667e-02
+887 885 -1.66666666666667e-01
+887 888 8.33333333333333e-02
+887 768 -4.16666666666667e-02
+887 1263 4.16666666666667e-02
+887 890 -1.25000000000000e-01
+887 687 -4.16666666666667e-02
+887 876 8.33333333333333e-02
+887 877 -1.66666666666667e-01
+887 688 8.33333333333333e-02
+887 1127 -7.50000000000000e-01
+887 1126 1.66666666666667e-01
+887 886 -1.66666666666667e-01
+887 769 8.33333333333333e-02
+887 1125 1.66666666666667e-01
+887 873 -8.33333333333333e-02
+887 879 4.16666666666667e-02
+887 689 -1.25000000000000e-01
+887 880 4.16666666666667e-02
+887 874 -8.33333333333333e-02
+887 1244 -1.25000000000000e-01
+887 1264 4.16666666666667e-02
+887 770 -1.25000000000000e-01
+887 1243 -4.16666666666667e-02
+887 1027 8.33333333333333e-02
+887 1242 8.33333333333333e-02
+887 1026 -1.66666666666667e-01
+888 888 1.25000000000000e+00
+888 1127 -1.66666666666667e-01
+888 1126 8.33333333333333e-02
+888 689 4.16666666666667e-02
+888 886 8.33333333333333e-02
+888 885 -3.75000000000000e-01
+888 1265 -4.16666666666667e-02
+888 773 4.16666666666667e-02
+888 1264 8.33333333333333e-02
+888 1263 -1.25000000000000e-01
+888 878 -8.33333333333333e-02
+888 877 -8.33333333333333e-02
+888 1124 8.33333333333333e-02
+888 884 -4.16666666666667e-02
+888 889 -1.66666666666667e-01
+888 1123 8.33333333333333e-02
+888 1129 -8.33333333333333e-02
+888 688 -8.33333333333333e-02
+888 883 8.33333333333333e-02
+888 882 -1.25000000000000e-01
+888 890 -1.66666666666667e-01
+888 1259 8.33333333333333e-02
+888 1130 1.66666666666667e-01
+888 1258 8.33333333333333e-02
+888 772 -8.33333333333333e-02
+888 887 8.33333333333333e-02
+888 1257 -3.75000000000000e-01
+888 1128 -2.50000000000000e-01
+889 889 1.25000000000000e+00
+889 1127 8.33333333333333e-02
+889 1125 8.33333333333333e-02
+889 886 -1.25000000000000e-01
+889 885 8.33333333333333e-02
+889 1265 8.33333333333333e-02
+889 890 -1.66666666666667e-01
+889 1264 -3.75000000000000e-01
+889 1263 8.33333333333333e-02
+889 876 -8.33333333333333e-02
+889 884 8.33333333333333e-02
+889 888 -1.66666666666667e-01
+889 1124 -1.66666666666667e-01
+889 1130 1.66666666666667e-01
+889 1122 8.33333333333333e-02
+889 1128 -8.33333333333333e-02
+889 689 4.16666666666667e-02
+889 878 -8.33333333333333e-02
+889 883 -3.75000000000000e-01
+889 687 -8.33333333333333e-02
+889 882 8.33333333333333e-02
+889 1259 -4.16666666666667e-02
+889 773 4.16666666666667e-02
+889 887 -4.16666666666667e-02
+889 1258 -1.25000000000000e-01
+889 1129 -2.50000000000000e-01
+889 1257 8.33333333333333e-02
+889 771 -8.33333333333333e-02
+890 890 1.25000000000000e+00
+890 1126 8.33333333333333e-02
+890 885 8.33333333333333e-02
+890 1125 -1.66666666666667e-01
+890 887 -1.25000000000000e-01
+890 687 4.16666666666667e-02
+890 1265 -1.25000000000000e-01
+890 1264 8.33333333333333e-02
+890 889 -1.66666666666667e-01
+890 1263 -4.16666666666667e-02
+890 771 4.16666666666667e-02
+890 876 -8.33333333333333e-02
+890 883 8.33333333333333e-02
+890 1122 8.33333333333333e-02
+890 882 -4.16666666666667e-02
+890 1123 -1.66666666666667e-01
+890 1129 1.66666666666667e-01
+890 884 -1.25000000000000e-01
+890 688 4.16666666666667e-02
+890 877 -8.33333333333333e-02
+890 886 -4.16666666666667e-02
+890 1259 -1.25000000000000e-01
+890 1130 -7.50000000000000e-01
+890 1258 -4.16666666666667e-02
+890 772 4.16666666666667e-02
+890 888 -1.66666666666667e-01
+890 1257 8.33333333333333e-02
+890 1128 1.66666666666667e-01
+891 891 1.25000000000000e+00
+891 1196 8.33333333333333e-02
+891 1195 -1.66666666666667e-01
+891 896 8.33333333333333e-02
+891 691 4.16666666666667e-02
+891 894 -3.75000000000000e-01
+891 1136 8.33333333333333e-02
+891 1135 -4.16666666666667e-02
+891 724 4.16666666666667e-02
+891 1134 -1.25000000000000e-01
+891 1148 -8.33333333333333e-02
+891 893 -1.66666666666667e-01
+891 898 -4.16666666666667e-02
+891 902 -8.33333333333333e-02
+891 1262 8.33333333333333e-02
+891 901 -8.33333333333333e-02
+891 1261 8.33333333333333e-02
+891 899 8.33333333333333e-02
+891 692 -8.33333333333333e-02
+891 897 -1.25000000000000e-01
+891 1142 8.33333333333333e-02
+891 725 -8.33333333333333e-02
+891 1141 8.33333333333333e-02
+891 892 -1.66666666666667e-01
+891 1147 1.66666666666667e-01
+891 1140 -3.75000000000000e-01
+891 895 8.33333333333333e-02
+891 1146 -2.50000000000000e-01
+892 892 1.25000000000000e+00
+892 1196 8.33333333333333e-02
+892 894 8.33333333333333e-02
+892 1194 -1.66666666666667e-01
+892 895 -1.25000000000000e-01
+892 690 4.16666666666667e-02
+892 1136 8.33333333333333e-02
+892 893 -1.66666666666667e-01
+892 1135 -1.25000000000000e-01
+892 1134 -4.16666666666667e-02
+892 723 4.16666666666667e-02
+892 897 -4.16666666666667e-02
+892 899 8.33333333333333e-02
+892 1148 1.66666666666667e-01
+892 1262 -1.66666666666667e-01
+892 900 -8.33333333333333e-02
+892 1260 8.33333333333333e-02
+892 692 4.16666666666667e-02
+892 902 -8.33333333333333e-02
+892 898 -1.25000000000000e-01
+892 1142 -4.16666666666667e-02
+892 725 4.16666666666667e-02
+892 1141 -1.25000000000000e-01
+892 896 -4.16666666666667e-02
+892 1147 -7.50000000000000e-01
+892 1140 8.33333333333333e-02
+892 891 -1.66666666666667e-01
+892 1146 1.66666666666667e-01
+893 893 1.25000000000000e+00
+893 1195 8.33333333333333e-02
+893 1194 8.33333333333333e-02
+893 896 -1.25000000000000e-01
+893 894 8.33333333333333e-02
+893 1136 -3.75000000000000e-01
+893 1135 8.33333333333333e-02
+893 892 -1.66666666666667e-01
+893 1134 8.33333333333333e-02
+893 1146 -8.33333333333333e-02
+893 891 -1.66666666666667e-01
+893 898 8.33333333333333e-02
+893 900 -8.33333333333333e-02
+893 1260 8.33333333333333e-02
+893 1147 1.66666666666667e-01
+893 1261 -1.66666666666667e-01
+893 899 -3.75000000000000e-01
+893 691 4.16666666666667e-02
+893 901 -8.33333333333333e-02
+893 897 8.33333333333333e-02
+893 690 -8.33333333333333e-02
+893 1142 -1.25000000000000e-01
+893 895 -4.16666666666667e-02
+893 1148 -2.50000000000000e-01
+893 1141 -4.16666666666667e-02
+893 724 4.16666666666667e-02
+893 1140 8.33333333333333e-02
+893 723 -8.33333333333333e-02
+894 894 5.83333333333333e-01
+894 1196 -4.16666666666667e-02
+894 895 -1.66666666666667e-01
+894 1195 8.33333333333333e-02
+894 892 8.33333333333333e-02
+894 737 4.16666666666667e-02
+894 1136 -8.33333333333333e-02
+894 736 -4.16666666666667e-02
+894 1135 4.16666666666667e-02
+894 735 -4.16666666666667e-02
+894 1194 -1.25000000000000e-01
+894 896 -8.33333333333333e-02
+894 692 4.16666666666667e-02
+894 893 8.33333333333333e-02
+894 691 -4.16666666666667e-02
+894 901 4.16666666666667e-02
+894 902 4.16666666666667e-02
+894 690 -4.16666666666667e-02
+894 891 -3.75000000000000e-01
+895 895 5.83333333333333e-01
+895 893 -4.16666666666667e-02
+895 894 -1.66666666666667e-01
+895 1194 8.33333333333333e-02
+895 891 8.33333333333333e-02
+895 737 4.16666666666667e-02
+895 896 -8.33333333333333e-02
+895 1196 8.33333333333333e-02
+895 736 -4.16666666666667e-02
+895 1195 -3.75000000000000e-01
+895 735 -4.16666666666667e-02
+895 1134 4.16666666666667e-02
+895 692 4.16666666666667e-02
+895 902 -8.33333333333333e-02
+895 1136 4.16666666666667e-02
+895 691 -4.16666666666667e-02
+895 892 -1.25000000000000e-01
+895 690 -4.16666666666667e-02
+895 900 4.16666666666667e-02
+896 896 5.00000000000000e-01
+896 1194 -4.16666666666667e-02
+896 1135 4.16666666666667e-02
+896 892 -4.16666666666667e-02
+896 737 -1.25000000000000e-01
+896 1196 -1.25000000000000e-01
+896 736 4.16666666666667e-02
+896 895 -8.33333333333333e-02
+896 1195 8.33333333333333e-02
+896 735 4.16666666666667e-02
+896 1134 -8.33333333333333e-02
+896 900 4.16666666666667e-02
+896 692 -1.25000000000000e-01
+896 893 -1.25000000000000e-01
+896 691 4.16666666666667e-02
+896 901 -8.33333333333333e-02
+896 894 -8.33333333333333e-02
+896 690 4.16666666666667e-02
+896 891 8.33333333333333e-02
+897 897 5.00000000000000e-01
+897 1141 4.16666666666667e-02
+897 902 4.16666666666667e-02
+897 1262 -4.16666666666667e-02
+897 767 4.16666666666667e-02
+897 1142 -8.33333333333333e-02
+897 766 4.16666666666667e-02
+897 898 -8.33333333333333e-02
+897 1261 8.33333333333333e-02
+897 765 -1.25000000000000e-01
+897 1260 -1.25000000000000e-01
+897 899 -8.33333333333333e-02
+897 692 4.16666666666667e-02
+897 893 8.33333333333333e-02
+897 691 4.16666666666667e-02
+897 901 -8.33333333333333e-02
+897 892 -4.16666666666667e-02
+897 690 -1.25000000000000e-01
+897 891 -1.25000000000000e-01
+898 898 5.83333333333333e-01
+898 1140 4.16666666666667e-02
+898 893 8.33333333333333e-02
+898 899 -1.66666666666667e-01
+898 1262 8.33333333333333e-02
+898 767 -4.16666666666667e-02
+898 1142 4.16666666666667e-02
+898 766 -4.16666666666667e-02
+898 1261 -3.75000000000000e-01
+898 765 4.16666666666667e-02
+898 897 -8.33333333333333e-02
+898 1260 8.33333333333333e-02
+898 692 -4.16666666666667e-02
+898 902 4.16666666666667e-02
+898 891 -4.16666666666667e-02
+898 691 -4.16666666666667e-02
+898 892 -1.25000000000000e-01
+898 690 4.16666666666667e-02
+898 900 -8.33333333333333e-02
+899 899 5.83333333333333e-01
+899 898 -1.66666666666667e-01
+899 1261 8.33333333333333e-02
+899 900 4.16666666666667e-02
+899 1260 -4.16666666666667e-02
+899 767 -4.16666666666667e-02
+899 1262 -1.25000000000000e-01
+899 766 -4.16666666666667e-02
+899 1141 4.16666666666667e-02
+899 765 4.16666666666667e-02
+899 1140 -8.33333333333333e-02
+899 892 8.33333333333333e-02
+899 692 -4.16666666666667e-02
+899 893 -3.75000000000000e-01
+899 691 -4.16666666666667e-02
+899 901 4.16666666666667e-02
+899 897 -8.33333333333333e-02
+899 690 4.16666666666667e-02
+899 891 8.33333333333333e-02
+900 900 6.66666666666667e-01
+900 895 4.16666666666667e-02
+900 1196 8.33333333333333e-02
+900 1195 -4.16666666666667e-02
+900 1194 -1.25000000000000e-01
+900 893 -8.33333333333333e-02
+900 899 4.16666666666667e-02
+900 892 -8.33333333333333e-02
+900 1147 8.33333333333333e-02
+900 898 -8.33333333333333e-02
+900 691 4.16666666666667e-02
+900 690 -8.33333333333333e-02
+900 1262 8.33333333333333e-02
+900 1148 -1.66666666666667e-01
+900 1261 8.33333333333333e-02
+900 901 -8.33333333333333e-02
+900 775 4.16666666666667e-02
+900 1260 -3.75000000000000e-01
+900 896 4.16666666666667e-02
+900 774 -8.33333333333333e-02
+901 901 7.50000000000000e-01
+901 692 4.16666666666667e-02
+901 894 4.16666666666667e-02
+901 1196 8.33333333333333e-02
+901 902 -8.33333333333333e-02
+901 776 4.16666666666667e-02
+901 1195 -1.25000000000000e-01
+901 1194 -4.16666666666667e-02
+901 891 -8.33333333333333e-02
+901 1146 8.33333333333333e-02
+901 899 4.16666666666667e-02
+901 893 -8.33333333333333e-02
+901 691 -2.50000000000000e-01
+901 897 -8.33333333333333e-02
+901 690 4.16666666666667e-02
+901 1262 -4.16666666666667e-02
+901 1148 8.33333333333333e-02
+901 1261 -1.25000000000000e-01
+901 896 -8.33333333333333e-02
+901 775 -2.50000000000000e-01
+901 1260 8.33333333333333e-02
+901 900 -8.33333333333333e-02
+901 774 4.16666666666667e-02
+902 902 6.66666666666667e-01
+902 895 -8.33333333333333e-02
+902 691 4.16666666666667e-02
+902 1196 -3.75000000000000e-01
+902 1195 8.33333333333333e-02
+902 901 -8.33333333333333e-02
+902 775 4.16666666666667e-02
+902 1194 8.33333333333333e-02
+902 891 -8.33333333333333e-02
+902 897 4.16666666666667e-02
+902 692 -8.33333333333333e-02
+902 898 4.16666666666667e-02
+902 892 -8.33333333333333e-02
+902 1262 -1.25000000000000e-01
+902 894 4.16666666666667e-02
+902 776 -8.33333333333333e-02
+902 1261 -4.16666666666667e-02
+902 1147 8.33333333333333e-02
+902 1260 8.33333333333333e-02
+902 1146 -1.66666666666667e-01
+903 903 7.50000000000000e-01
+903 905 -8.33333333333333e-02
+903 1214 8.33333333333333e-02
+903 779 4.16666666666667e-02
+903 1213 -4.16666666666667e-02
+903 1212 -1.25000000000000e-01
+903 1039 8.33333333333333e-02
+903 1250 -4.16666666666667e-02
+903 1040 8.33333333333333e-02
+903 904 -8.33333333333333e-02
+903 1249 8.33333333333333e-02
+903 778 4.16666666666667e-02
+903 1248 -1.25000000000000e-01
+903 777 -2.50000000000000e-01
+903 323 -8.33333333333333e-02
+903 322 4.16666666666667e-02
+903 316 -8.33333333333333e-02
+903 329 4.16666666666667e-02
+903 317 -8.33333333333333e-02
+903 34 4.16666666666667e-02
+903 328 -8.33333333333333e-02
+903 33 -2.50000000000000e-01
+903 35 4.16666666666667e-02
+904 904 6.66666666666667e-01
+904 1214 8.33333333333333e-02
+904 1213 -1.25000000000000e-01
+904 1212 -4.16666666666667e-02
+904 1038 8.33333333333333e-02
+904 1250 8.33333333333333e-02
+904 1040 -1.66666666666667e-01
+904 1249 -3.75000000000000e-01
+904 778 -8.33333333333333e-02
+904 903 -8.33333333333333e-02
+904 1248 8.33333333333333e-02
+904 777 4.16666666666667e-02
+904 321 4.16666666666667e-02
+904 329 4.16666666666667e-02
+904 317 -8.33333333333333e-02
+904 315 -8.33333333333333e-02
+904 34 -8.33333333333333e-02
+904 33 4.16666666666667e-02
+904 327 -8.33333333333333e-02
+904 323 4.16666666666667e-02
+905 905 6.66666666666667e-01
+905 1214 -3.75000000000000e-01
+905 1213 8.33333333333333e-02
+905 903 -8.33333333333333e-02
+905 1212 8.33333333333333e-02
+905 777 4.16666666666667e-02
+905 1250 -1.25000000000000e-01
+905 779 -8.33333333333333e-02
+905 1249 8.33333333333333e-02
+905 1039 -1.66666666666667e-01
+905 1248 -4.16666666666667e-02
+905 1038 8.33333333333333e-02
+905 33 4.16666666666667e-02
+905 321 -8.33333333333333e-02
+905 328 4.16666666666667e-02
+905 316 -8.33333333333333e-02
+905 35 -8.33333333333333e-02
+905 327 4.16666666666667e-02
+905 315 -8.33333333333333e-02
+905 322 4.16666666666667e-02
+906 906 2.50000000000000e+00
+906 913 1.66666666666667e-01
+906 912 -2.50000000000000e-01
+906 1046 -1.66666666666667e-01
+906 1045 8.33333333333333e-02
+906 1058 1.66666666666667e-01
+906 925 8.33333333333333e-02
+906 1057 1.66666666666667e-01
+906 1056 -7.50000000000000e-01
+906 926 8.33333333333333e-02
+906 1048 -8.33333333333333e-02
+906 1049 1.66666666666667e-01
+906 908 -3.33333333333333e-01
+906 710 -8.33333333333333e-02
+906 1047 -2.50000000000000e-01
+906 917 8.33333333333333e-02
+906 695 -8.33333333333333e-02
+906 916 -1.66666666666667e-01
+906 1043 8.33333333333333e-02
+906 910 1.66666666666667e-01
+906 907 -3.33333333333333e-01
+906 911 1.66666666666667e-01
+906 694 -8.33333333333333e-02
+906 909 -7.50000000000000e-01
+906 1042 8.33333333333333e-02
+906 709 -8.33333333333333e-02
+906 1055 -8.33333333333333e-02
+906 1052 8.33333333333333e-02
+906 922 8.33333333333333e-02
+906 919 -8.33333333333333e-02
+906 1051 -1.66666666666667e-01
+906 1054 1.66666666666667e-01
+906 1053 -2.50000000000000e-01
+906 920 1.66666666666667e-01
+906 923 -1.66666666666667e-01
+906 918 -2.50000000000000e-01
+906 914 -8.33333333333333e-02
+907 907 2.50000000000000e+00
+907 912 1.66666666666667e-01
+907 914 1.66666666666667e-01
+907 913 -7.50000000000000e-01
+907 1044 8.33333333333333e-02
+907 1058 -8.33333333333333e-02
+907 924 8.33333333333333e-02
+907 1057 -2.50000000000000e-01
+907 1056 1.66666666666667e-01
+907 926 -1.66666666666667e-01
+907 1047 -8.33333333333333e-02
+907 917 8.33333333333333e-02
+907 1049 1.66666666666667e-01
+907 1048 -2.50000000000000e-01
+907 915 -1.66666666666667e-01
+907 911 -8.33333333333333e-02
+907 909 1.66666666666667e-01
+907 906 -3.33333333333333e-01
+907 910 -2.50000000000000e-01
+907 693 -8.33333333333333e-02
+907 1043 -1.66666666666667e-01
+907 1041 8.33333333333333e-02
+907 708 -8.33333333333333e-02
+907 1055 1.66666666666667e-01
+907 908 -3.33333333333333e-01
+907 920 1.66666666666667e-01
+907 921 8.33333333333333e-02
+907 918 -8.33333333333333e-02
+907 1052 8.33333333333333e-02
+907 710 -8.33333333333333e-02
+907 1054 -7.50000000000000e-01
+907 1050 -1.66666666666667e-01
+907 1053 1.66666666666667e-01
+907 923 8.33333333333333e-02
+907 695 -8.33333333333333e-02
+907 919 -2.50000000000000e-01
+907 1046 8.33333333333333e-02
+908 908 2.50000000000000e+00
+908 1045 8.33333333333333e-02
+908 914 -2.50000000000000e-01
+908 913 1.66666666666667e-01
+908 1044 -1.66666666666667e-01
+908 1057 -8.33333333333333e-02
+908 1056 1.66666666666667e-01
+908 1058 -2.50000000000000e-01
+908 925 -1.66666666666667e-01
+908 924 8.33333333333333e-02
+908 916 8.33333333333333e-02
+908 1047 1.66666666666667e-01
+908 906 -3.33333333333333e-01
+908 1049 -7.50000000000000e-01
+908 1048 1.66666666666667e-01
+908 708 -8.33333333333333e-02
+908 915 8.33333333333333e-02
+908 693 -8.33333333333333e-02
+908 910 -8.33333333333333e-02
+908 1041 8.33333333333333e-02
+908 911 -2.50000000000000e-01
+908 909 1.66666666666667e-01
+908 1042 -1.66666666666667e-01
+908 1053 -8.33333333333333e-02
+908 1050 8.33333333333333e-02
+908 1054 1.66666666666667e-01
+908 907 -3.33333333333333e-01
+908 919 1.66666666666667e-01
+908 1055 -2.50000000000000e-01
+908 1051 8.33333333333333e-02
+908 709 -8.33333333333333e-02
+908 920 -7.50000000000000e-01
+908 912 -8.33333333333333e-02
+908 922 8.33333333333333e-02
+908 694 -8.33333333333333e-02
+908 918 1.66666666666667e-01
+908 921 -1.66666666666667e-01
+909 909 2.50000000000000e+00
+909 1231 -1.66666666666667e-01
+909 1166 1.66666666666667e-01
+909 1268 -1.66666666666667e-01
+909 928 -8.33333333333333e-02
+909 1267 8.33333333333333e-02
+909 929 -8.33333333333333e-02
+909 1165 1.66666666666667e-01
+909 1164 -7.50000000000000e-01
+909 1154 1.66666666666667e-01
+909 1048 8.33333333333333e-02
+909 1153 -8.33333333333333e-02
+909 1049 -1.66666666666667e-01
+909 728 8.33333333333333e-02
+909 1152 -2.50000000000000e-01
+909 917 -8.33333333333333e-02
+909 695 8.33333333333333e-02
+909 910 -3.33333333333333e-01
+909 916 1.66666666666667e-01
+909 915 -2.50000000000000e-01
+909 1160 -8.33333333333333e-02
+909 1159 1.66666666666667e-01
+909 1043 -8.33333333333333e-02
+909 1055 8.33333333333333e-02
+909 907 1.66666666666667e-01
+909 1054 -1.66666666666667e-01
+909 727 8.33333333333333e-02
+909 1042 -8.33333333333333e-02
+909 1158 -2.50000000000000e-01
+909 911 -3.33333333333333e-01
+909 923 1.66666666666667e-01
+909 908 1.66666666666667e-01
+909 922 -8.33333333333333e-02
+909 694 8.33333333333333e-02
+909 1232 8.33333333333333e-02
+909 921 -2.50000000000000e-01
+909 906 -7.50000000000000e-01
+910 910 2.50000000000000e+00
+910 1230 -1.66666666666667e-01
+910 1166 -8.33333333333333e-02
+910 929 -8.33333333333333e-02
+910 1268 8.33333333333333e-02
+910 927 -8.33333333333333e-02
+910 1266 8.33333333333333e-02
+910 1165 -2.50000000000000e-01
+910 1164 1.66666666666667e-01
+910 1047 8.33333333333333e-02
+910 1152 -8.33333333333333e-02
+910 1049 8.33333333333333e-02
+910 1154 1.66666666666667e-01
+910 1153 -2.50000000000000e-01
+910 917 1.66666666666667e-01
+910 916 -7.50000000000000e-01
+910 909 -3.33333333333333e-01
+910 915 1.66666666666667e-01
+910 908 -8.33333333333333e-02
+910 911 -3.33333333333333e-01
+910 1043 -8.33333333333333e-02
+910 1055 8.33333333333333e-02
+910 1158 1.66666666666667e-01
+910 906 1.66666666666667e-01
+910 1053 -1.66666666666667e-01
+910 728 -1.66666666666667e-01
+910 1160 1.66666666666667e-01
+910 1159 -7.50000000000000e-01
+910 726 8.33333333333333e-02
+910 1041 -8.33333333333333e-02
+910 923 1.66666666666667e-01
+910 695 -1.66666666666667e-01
+910 1232 8.33333333333333e-02
+910 922 -2.50000000000000e-01
+910 907 -2.50000000000000e-01
+910 921 -8.33333333333333e-02
+910 693 8.33333333333333e-02
+911 911 2.50000000000000e+00
+911 1231 8.33333333333333e-02
+911 1165 -8.33333333333333e-02
+911 928 -8.33333333333333e-02
+911 1267 8.33333333333333e-02
+911 1164 1.66666666666667e-01
+911 1266 -1.66666666666667e-01
+911 927 -8.33333333333333e-02
+911 1166 -2.50000000000000e-01
+911 1152 1.66666666666667e-01
+911 1048 8.33333333333333e-02
+911 1047 -1.66666666666667e-01
+911 1154 -7.50000000000000e-01
+911 1153 1.66666666666667e-01
+911 726 8.33333333333333e-02
+911 917 -2.50000000000000e-01
+911 916 1.66666666666667e-01
+911 915 -8.33333333333333e-02
+911 693 8.33333333333333e-02
+911 907 -8.33333333333333e-02
+911 910 -3.33333333333333e-01
+911 1158 -8.33333333333333e-02
+911 1042 -8.33333333333333e-02
+911 1054 8.33333333333333e-02
+911 1041 -8.33333333333333e-02
+911 1053 8.33333333333333e-02
+911 1160 -2.50000000000000e-01
+911 727 -1.66666666666667e-01
+911 1159 1.66666666666667e-01
+911 1230 8.33333333333333e-02
+911 923 -7.50000000000000e-01
+911 908 -2.50000000000000e-01
+911 922 1.66666666666667e-01
+911 694 -1.66666666666667e-01
+911 909 -3.33333333333333e-01
+911 921 1.66666666666667e-01
+911 906 1.66666666666667e-01
+912 912 1.25000000000000e+00
+912 1048 8.33333333333333e-02
+912 1049 8.33333333333333e-02
+912 1217 8.33333333333333e-02
+912 1215 -1.25000000000000e-01
+912 917 8.33333333333333e-02
+912 916 8.33333333333333e-02
+912 913 -1.66666666666667e-01
+912 915 -3.75000000000000e-01
+912 908 -8.33333333333333e-02
+912 914 -1.66666666666667e-01
+912 1046 -8.33333333333333e-02
+912 1058 8.33333333333333e-02
+912 1219 8.33333333333333e-02
+912 907 1.66666666666667e-01
+912 1057 -1.66666666666667e-01
+912 1220 8.33333333333333e-02
+912 746 -8.33333333333333e-02
+912 745 4.16666666666667e-02
+912 1045 -8.33333333333333e-02
+912 1218 -3.75000000000000e-01
+912 926 8.33333333333333e-02
+912 695 -8.33333333333333e-02
+912 925 -4.16666666666667e-02
+912 694 4.16666666666667e-02
+912 924 -1.25000000000000e-01
+912 1216 -4.16666666666667e-02
+912 906 -2.50000000000000e-01
+913 913 1.25000000000000e+00
+913 1215 -4.16666666666667e-02
+913 1047 8.33333333333333e-02
+913 1049 -1.66666666666667e-01
+913 746 4.16666666666667e-02
+913 1216 -1.25000000000000e-01
+913 917 -4.16666666666667e-02
+913 695 4.16666666666667e-02
+913 916 -1.25000000000000e-01
+913 915 8.33333333333333e-02
+913 912 -1.66666666666667e-01
+913 1220 -4.16666666666667e-02
+913 1218 8.33333333333333e-02
+913 1046 -8.33333333333333e-02
+913 1058 8.33333333333333e-02
+913 906 1.66666666666667e-01
+913 1056 -1.66666666666667e-01
+913 1219 -1.25000000000000e-01
+913 744 4.16666666666667e-02
+913 1044 -8.33333333333333e-02
+913 926 8.33333333333333e-02
+913 914 -1.66666666666667e-01
+913 908 1.66666666666667e-01
+913 925 -1.25000000000000e-01
+913 1217 8.33333333333333e-02
+913 907 -7.50000000000000e-01
+913 924 -4.16666666666667e-02
+913 693 4.16666666666667e-02
+914 914 1.25000000000000e+00
+914 1048 -1.66666666666667e-01
+914 1047 8.33333333333333e-02
+914 1217 -3.75000000000000e-01
+914 745 4.16666666666667e-02
+914 1215 8.33333333333333e-02
+914 917 -1.25000000000000e-01
+914 916 -4.16666666666667e-02
+914 694 4.16666666666667e-02
+914 915 8.33333333333333e-02
+914 906 -8.33333333333333e-02
+914 1219 -4.16666666666667e-02
+914 912 -1.66666666666667e-01
+914 1044 -8.33333333333333e-02
+914 1056 8.33333333333333e-02
+914 1045 -8.33333333333333e-02
+914 1057 8.33333333333333e-02
+914 1220 -1.25000000000000e-01
+914 1218 8.33333333333333e-02
+914 744 -8.33333333333333e-02
+914 926 -3.75000000000000e-01
+914 1216 8.33333333333333e-02
+914 908 -2.50000000000000e-01
+914 925 8.33333333333333e-02
+914 913 -1.66666666666667e-01
+914 907 1.66666666666667e-01
+914 924 8.33333333333333e-02
+914 693 -8.33333333333333e-02
+915 915 1.25000000000000e+00
+915 916 -1.66666666666667e-01
+915 929 -8.33333333333333e-02
+915 694 -4.16666666666667e-02
+915 928 4.16666666666667e-02
+915 1232 8.33333333333333e-02
+915 751 -4.16666666666667e-02
+915 1230 -3.75000000000000e-01
+915 1216 4.16666666666667e-02
+915 752 8.33333333333333e-02
+915 1217 -8.33333333333333e-02
+915 917 -1.66666666666667e-01
+915 914 8.33333333333333e-02
+915 695 8.33333333333333e-02
+915 913 8.33333333333333e-02
+915 912 -3.75000000000000e-01
+915 1048 -8.33333333333333e-02
+915 1153 8.33333333333333e-02
+915 1154 8.33333333333333e-02
+915 1049 -8.33333333333333e-02
+915 750 -1.25000000000000e-01
+915 911 -8.33333333333333e-02
+915 908 8.33333333333333e-02
+915 910 1.66666666666667e-01
+915 907 -1.66666666666667e-01
+915 909 -2.50000000000000e-01
+915 1231 8.33333333333333e-02
+915 693 -1.25000000000000e-01
+916 916 1.25000000000000e+00
+916 929 4.16666666666667e-02
+916 1230 8.33333333333333e-02
+916 915 -1.66666666666667e-01
+916 693 -4.16666666666667e-02
+916 927 4.16666666666667e-02
+916 1231 -1.25000000000000e-01
+916 750 -4.16666666666667e-02
+916 1215 4.16666666666667e-02
+916 1217 4.16666666666667e-02
+916 914 -4.16666666666667e-02
+916 913 -1.25000000000000e-01
+916 912 8.33333333333333e-02
+916 1047 -8.33333333333333e-02
+916 1152 8.33333333333333e-02
+916 1049 -8.33333333333333e-02
+916 908 8.33333333333333e-02
+916 1154 -1.66666666666667e-01
+916 752 8.33333333333333e-02
+916 751 -1.25000000000000e-01
+916 911 1.66666666666667e-01
+916 917 -1.66666666666667e-01
+916 695 8.33333333333333e-02
+916 910 -7.50000000000000e-01
+916 1232 -4.16666666666667e-02
+916 694 -1.25000000000000e-01
+916 909 1.66666666666667e-01
+916 906 -1.66666666666667e-01
+917 917 1.25000000000000e+00
+917 928 4.16666666666667e-02
+917 927 -8.33333333333333e-02
+917 1232 -1.25000000000000e-01
+917 1230 8.33333333333333e-02
+917 1216 4.16666666666667e-02
+917 750 8.33333333333333e-02
+917 1215 -8.33333333333333e-02
+917 914 -1.25000000000000e-01
+917 913 -4.16666666666667e-02
+917 915 -1.66666666666667e-01
+917 912 8.33333333333333e-02
+917 693 8.33333333333333e-02
+917 1048 -8.33333333333333e-02
+917 907 8.33333333333333e-02
+917 752 -3.75000000000000e-01
+917 1153 -1.66666666666667e-01
+917 751 8.33333333333333e-02
+917 1152 8.33333333333333e-02
+917 1047 -8.33333333333333e-02
+917 911 -2.50000000000000e-01
+917 1231 -4.16666666666667e-02
+917 695 -3.75000000000000e-01
+917 910 1.66666666666667e-01
+917 916 -1.66666666666667e-01
+917 694 8.33333333333333e-02
+917 909 -8.33333333333333e-02
+917 906 8.33333333333333e-02
+918 918 1.25000000000000e+00
+918 1058 -1.66666666666667e-01
+918 1057 8.33333333333333e-02
+918 764 4.16666666666667e-02
+918 1255 8.33333333333333e-02
+918 1254 -3.75000000000000e-01
+918 926 -4.16666666666667e-02
+918 695 4.16666666666667e-02
+918 925 8.33333333333333e-02
+918 924 -1.25000000000000e-01
+918 1052 -8.33333333333333e-02
+918 1051 -8.33333333333333e-02
+918 1055 8.33333333333333e-02
+918 1253 -4.16666666666667e-02
+918 919 -1.66666666666667e-01
+918 1054 8.33333333333333e-02
+918 907 -8.33333333333333e-02
+918 763 -8.33333333333333e-02
+918 1252 8.33333333333333e-02
+918 1251 -1.25000000000000e-01
+918 920 -1.66666666666667e-01
+918 923 8.33333333333333e-02
+918 908 1.66666666666667e-01
+918 922 8.33333333333333e-02
+918 694 -8.33333333333333e-02
+918 1256 8.33333333333333e-02
+918 921 -3.75000000000000e-01
+918 906 -2.50000000000000e-01
+919 919 1.25000000000000e+00
+919 1058 8.33333333333333e-02
+919 1056 8.33333333333333e-02
+919 1255 -1.25000000000000e-01
+919 1254 8.33333333333333e-02
+919 926 8.33333333333333e-02
+919 920 -1.66666666666667e-01
+919 925 -3.75000000000000e-01
+919 924 8.33333333333333e-02
+919 1050 -8.33333333333333e-02
+919 1253 8.33333333333333e-02
+919 918 -1.66666666666667e-01
+919 1055 -1.66666666666667e-01
+919 908 1.66666666666667e-01
+919 1053 8.33333333333333e-02
+919 906 -8.33333333333333e-02
+919 764 4.16666666666667e-02
+919 1052 -8.33333333333333e-02
+919 1252 -3.75000000000000e-01
+919 762 -8.33333333333333e-02
+919 1251 8.33333333333333e-02
+919 923 -4.16666666666667e-02
+919 695 4.16666666666667e-02
+919 1256 -4.16666666666667e-02
+919 922 -1.25000000000000e-01
+919 907 -2.50000000000000e-01
+919 921 8.33333333333333e-02
+919 693 -8.33333333333333e-02
+920 920 1.25000000000000e+00
+920 1057 8.33333333333333e-02
+920 1254 8.33333333333333e-02
+920 1056 -1.66666666666667e-01
+920 1256 -1.25000000000000e-01
+920 762 4.16666666666667e-02
+920 926 -1.25000000000000e-01
+920 925 8.33333333333333e-02
+920 919 -1.66666666666667e-01
+920 924 -4.16666666666667e-02
+920 693 4.16666666666667e-02
+920 1050 -8.33333333333333e-02
+920 1252 8.33333333333333e-02
+920 1053 8.33333333333333e-02
+920 1251 -4.16666666666667e-02
+920 1054 -1.66666666666667e-01
+920 907 1.66666666666667e-01
+920 1253 -1.25000000000000e-01
+920 763 4.16666666666667e-02
+920 1051 -8.33333333333333e-02
+920 1255 -4.16666666666667e-02
+920 923 -1.25000000000000e-01
+920 908 -7.50000000000000e-01
+920 922 -4.16666666666667e-02
+920 694 4.16666666666667e-02
+920 918 -1.66666666666667e-01
+920 921 8.33333333333333e-02
+920 906 1.66666666666667e-01
+921 921 1.25000000000000e+00
+921 1268 8.33333333333333e-02
+921 695 -4.16666666666667e-02
+921 929 4.16666666666667e-02
+921 928 -8.33333333333333e-02
+921 770 -4.16666666666667e-02
+921 1267 8.33333333333333e-02
+921 1266 -3.75000000000000e-01
+921 1160 8.33333333333333e-02
+921 1159 8.33333333333333e-02
+921 911 1.66666666666667e-01
+921 910 -8.33333333333333e-02
+921 909 -2.50000000000000e-01
+921 1055 -8.33333333333333e-02
+921 1253 4.16666666666667e-02
+921 1054 -8.33333333333333e-02
+921 907 8.33333333333333e-02
+921 1252 -8.33333333333333e-02
+921 769 8.33333333333333e-02
+921 768 -1.25000000000000e-01
+921 920 8.33333333333333e-02
+921 908 -1.66666666666667e-01
+921 919 8.33333333333333e-02
+921 922 -1.66666666666667e-01
+921 694 8.33333333333333e-02
+921 918 -3.75000000000000e-01
+921 923 -1.66666666666667e-01
+921 693 -1.25000000000000e-01
+922 922 1.25000000000000e+00
+922 1268 -4.16666666666667e-02
+922 927 -8.33333333333333e-02
+922 1267 -1.25000000000000e-01
+922 1266 8.33333333333333e-02
+922 1160 -1.66666666666667e-01
+922 770 8.33333333333333e-02
+922 1158 8.33333333333333e-02
+922 911 1.66666666666667e-01
+922 923 -1.66666666666667e-01
+922 695 8.33333333333333e-02
+922 910 -2.50000000000000e-01
+922 909 -8.33333333333333e-02
+922 1053 -8.33333333333333e-02
+922 906 8.33333333333333e-02
+922 1253 4.16666666666667e-02
+922 1055 -8.33333333333333e-02
+922 769 -3.75000000000000e-01
+922 1251 -8.33333333333333e-02
+922 768 8.33333333333333e-02
+922 920 -4.16666666666667e-02
+922 908 8.33333333333333e-02
+922 919 -1.25000000000000e-01
+922 929 4.16666666666667e-02
+922 694 -3.75000000000000e-01
+922 918 8.33333333333333e-02
+922 921 -1.66666666666667e-01
+922 693 8.33333333333333e-02
+923 923 1.25000000000000e+00
+923 1267 -4.16666666666667e-02
+923 921 -1.66666666666667e-01
+923 1266 8.33333333333333e-02
+923 693 -4.16666666666667e-02
+923 927 4.16666666666667e-02
+923 1268 -1.25000000000000e-01
+923 768 -4.16666666666667e-02
+923 1158 8.33333333333333e-02
+923 1159 -1.66666666666667e-01
+923 769 8.33333333333333e-02
+923 911 -7.50000000000000e-01
+923 910 1.66666666666667e-01
+923 922 -1.66666666666667e-01
+923 694 8.33333333333333e-02
+923 909 1.66666666666667e-01
+923 1053 -8.33333333333333e-02
+923 1251 4.16666666666667e-02
+923 770 -1.25000000000000e-01
+923 1252 4.16666666666667e-02
+923 1054 -8.33333333333333e-02
+923 920 -1.25000000000000e-01
+923 928 4.16666666666667e-02
+923 695 -1.25000000000000e-01
+923 919 -4.16666666666667e-02
+923 907 8.33333333333333e-02
+923 918 8.33333333333333e-02
+923 906 -1.66666666666667e-01
+924 924 7.50000000000000e-01
+924 1220 -8.33333333333333e-02
+924 1219 4.16666666666667e-02
+924 926 -8.33333333333333e-02
+924 914 8.33333333333333e-02
+924 695 4.16666666666667e-02
+924 913 -4.16666666666667e-02
+924 912 -1.25000000000000e-01
+924 1057 -8.33333333333333e-02
+924 907 8.33333333333333e-02
+924 1256 4.16666666666667e-02
+924 1058 -8.33333333333333e-02
+924 778 4.16666666666667e-02
+924 1255 -8.33333333333333e-02
+924 777 -2.50000000000000e-01
+924 920 -4.16666666666667e-02
+924 908 8.33333333333333e-02
+924 925 -8.33333333333333e-02
+924 919 8.33333333333333e-02
+924 694 4.16666666666667e-02
+924 779 4.16666666666667e-02
+924 918 -1.25000000000000e-01
+924 693 -2.50000000000000e-01
+925 925 6.66666666666667e-01
+925 1218 4.16666666666667e-02
+925 914 8.33333333333333e-02
+925 913 -1.25000000000000e-01
+925 912 -4.16666666666667e-02
+925 1256 4.16666666666667e-02
+925 1058 -8.33333333333333e-02
+925 1056 -8.33333333333333e-02
+925 906 8.33333333333333e-02
+925 778 -8.33333333333333e-02
+925 777 4.16666666666667e-02
+925 1254 -8.33333333333333e-02
+925 920 8.33333333333333e-02
+925 908 -1.66666666666667e-01
+925 1220 4.16666666666667e-02
+925 919 -3.75000000000000e-01
+925 694 -8.33333333333333e-02
+925 924 -8.33333333333333e-02
+925 918 8.33333333333333e-02
+925 693 4.16666666666667e-02
+926 926 6.66666666666667e-01
+926 777 4.16666666666667e-02
+926 1218 -8.33333333333333e-02
+926 914 -3.75000000000000e-01
+926 913 8.33333333333333e-02
+926 924 -8.33333333333333e-02
+926 912 8.33333333333333e-02
+926 693 4.16666666666667e-02
+926 1255 4.16666666666667e-02
+926 1057 -8.33333333333333e-02
+926 779 -8.33333333333333e-02
+926 1254 4.16666666666667e-02
+926 1056 -8.33333333333333e-02
+926 1219 4.16666666666667e-02
+926 920 -1.25000000000000e-01
+926 695 -8.33333333333333e-02
+926 919 8.33333333333333e-02
+926 907 -1.66666666666667e-01
+926 918 -4.16666666666667e-02
+926 906 8.33333333333333e-02
+927 927 7.50000000000000e-01
+927 917 -8.33333333333333e-02
+927 916 4.16666666666667e-02
+927 929 -8.33333333333333e-02
+927 1232 8.33333333333333e-02
+927 782 4.16666666666667e-02
+927 1231 -4.16666666666667e-02
+927 1230 -1.25000000000000e-01
+927 910 -8.33333333333333e-02
+927 1165 8.33333333333333e-02
+927 923 4.16666666666667e-02
+927 911 -8.33333333333333e-02
+927 694 4.16666666666667e-02
+927 922 -8.33333333333333e-02
+927 693 -2.50000000000000e-01
+927 1268 -4.16666666666667e-02
+927 1166 8.33333333333333e-02
+927 928 -8.33333333333333e-02
+927 1267 8.33333333333333e-02
+927 781 4.16666666666667e-02
+927 695 4.16666666666667e-02
+927 1266 -1.25000000000000e-01
+927 780 -2.50000000000000e-01
+928 928 6.66666666666667e-01
+928 915 4.16666666666667e-02
+928 1232 8.33333333333333e-02
+928 1231 -1.25000000000000e-01
+928 1230 -4.16666666666667e-02
+928 923 4.16666666666667e-02
+928 911 -8.33333333333333e-02
+928 909 -8.33333333333333e-02
+928 1164 8.33333333333333e-02
+928 694 -8.33333333333333e-02
+928 693 4.16666666666667e-02
+928 921 -8.33333333333333e-02
+928 1268 8.33333333333333e-02
+928 1166 -1.66666666666667e-01
+928 917 4.16666666666667e-02
+928 1267 -3.75000000000000e-01
+928 781 -8.33333333333333e-02
+928 927 -8.33333333333333e-02
+928 1266 8.33333333333333e-02
+928 780 4.16666666666667e-02
+929 929 6.66666666666667e-01
+929 693 4.16666666666667e-02
+929 915 -8.33333333333333e-02
+929 1232 -3.75000000000000e-01
+929 1231 8.33333333333333e-02
+929 927 -8.33333333333333e-02
+929 1230 8.33333333333333e-02
+929 780 4.16666666666667e-02
+929 922 4.16666666666667e-02
+929 910 -8.33333333333333e-02
+929 695 -8.33333333333333e-02
+929 921 4.16666666666667e-02
+929 909 -8.33333333333333e-02
+929 916 4.16666666666667e-02
+929 1268 -1.25000000000000e-01
+929 782 -8.33333333333333e-02
+929 1267 8.33333333333333e-02
+929 1165 -1.66666666666667e-01
+929 1266 -4.16666666666667e-02
+929 1164 8.33333333333333e-02
+930 930 2.50000000000000e+00
+930 937 1.66666666666667e-01
+930 936 -2.50000000000000e-01
+930 1172 -1.66666666666667e-01
+930 1171 8.33333333333333e-02
+930 1184 1.66666666666667e-01
+930 949 8.33333333333333e-02
+930 1183 1.66666666666667e-01
+930 1182 -7.50000000000000e-01
+930 950 8.33333333333333e-02
+930 1174 -8.33333333333333e-02
+930 1175 1.66666666666667e-01
+930 932 -3.33333333333333e-01
+930 731 -8.33333333333333e-02
+930 1173 -2.50000000000000e-01
+930 941 8.33333333333333e-02
+930 698 -8.33333333333333e-02
+930 940 -1.66666666666667e-01
+930 1169 8.33333333333333e-02
+930 934 1.66666666666667e-01
+930 931 -3.33333333333333e-01
+930 935 1.66666666666667e-01
+930 697 -8.33333333333333e-02
+930 933 -7.50000000000000e-01
+930 1168 8.33333333333333e-02
+930 730 -8.33333333333333e-02
+930 1181 -8.33333333333333e-02
+930 1178 8.33333333333333e-02
+930 946 8.33333333333333e-02
+930 943 -8.33333333333333e-02
+930 1177 -1.66666666666667e-01
+930 1180 1.66666666666667e-01
+930 1179 -2.50000000000000e-01
+930 944 1.66666666666667e-01
+930 947 -1.66666666666667e-01
+930 942 -2.50000000000000e-01
+930 938 -8.33333333333333e-02
+931 931 2.50000000000000e+00
+931 936 1.66666666666667e-01
+931 938 1.66666666666667e-01
+931 937 -7.50000000000000e-01
+931 1170 8.33333333333333e-02
+931 1184 -8.33333333333333e-02
+931 948 8.33333333333333e-02
+931 1183 -2.50000000000000e-01
+931 1182 1.66666666666667e-01
+931 950 -1.66666666666667e-01
+931 1173 -8.33333333333333e-02
+931 941 8.33333333333333e-02
+931 1175 1.66666666666667e-01
+931 1174 -2.50000000000000e-01
+931 939 -1.66666666666667e-01
+931 935 -8.33333333333333e-02
+931 933 1.66666666666667e-01
+931 930 -3.33333333333333e-01
+931 934 -2.50000000000000e-01
+931 696 -8.33333333333333e-02
+931 1169 -1.66666666666667e-01
+931 1167 8.33333333333333e-02
+931 729 -8.33333333333333e-02
+931 1181 1.66666666666667e-01
+931 932 -3.33333333333333e-01
+931 944 1.66666666666667e-01
+931 945 8.33333333333333e-02
+931 942 -8.33333333333333e-02
+931 1178 8.33333333333333e-02
+931 731 -8.33333333333333e-02
+931 1180 -7.50000000000000e-01
+931 1176 -1.66666666666667e-01
+931 1179 1.66666666666667e-01
+931 947 8.33333333333333e-02
+931 698 -8.33333333333333e-02
+931 943 -2.50000000000000e-01
+931 1172 8.33333333333333e-02
+932 932 2.50000000000000e+00
+932 1171 8.33333333333333e-02
+932 938 -2.50000000000000e-01
+932 937 1.66666666666667e-01
+932 1170 -1.66666666666667e-01
+932 1183 -8.33333333333333e-02
+932 1182 1.66666666666667e-01
+932 1184 -2.50000000000000e-01
+932 949 -1.66666666666667e-01
+932 948 8.33333333333333e-02
+932 940 8.33333333333333e-02
+932 1173 1.66666666666667e-01
+932 930 -3.33333333333333e-01
+932 1175 -7.50000000000000e-01
+932 1174 1.66666666666667e-01
+932 729 -8.33333333333333e-02
+932 939 8.33333333333333e-02
+932 696 -8.33333333333333e-02
+932 934 -8.33333333333333e-02
+932 1167 8.33333333333333e-02
+932 935 -2.50000000000000e-01
+932 933 1.66666666666667e-01
+932 1168 -1.66666666666667e-01
+932 1179 -8.33333333333333e-02
+932 1176 8.33333333333333e-02
+932 1180 1.66666666666667e-01
+932 931 -3.33333333333333e-01
+932 943 1.66666666666667e-01
+932 1181 -2.50000000000000e-01
+932 1177 8.33333333333333e-02
+932 730 -8.33333333333333e-02
+932 944 -7.50000000000000e-01
+932 936 -8.33333333333333e-02
+932 946 8.33333333333333e-02
+932 697 -8.33333333333333e-02
+932 942 1.66666666666667e-01
+932 945 -1.66666666666667e-01
+933 933 1.25000000000000e+00
+933 1174 8.33333333333333e-02
+933 1198 -4.16666666666667e-02
+933 1175 -1.66666666666667e-01
+933 740 4.16666666666667e-02
+933 1197 -1.25000000000000e-01
+933 941 -4.16666666666667e-02
+933 698 4.16666666666667e-02
+933 934 -1.66666666666667e-01
+933 940 8.33333333333333e-02
+933 939 -1.25000000000000e-01
+933 1202 -4.16666666666667e-02
+933 1201 8.33333333333333e-02
+933 1169 -8.33333333333333e-02
+933 1181 8.33333333333333e-02
+933 931 1.66666666666667e-01
+933 1180 -1.66666666666667e-01
+933 739 4.16666666666667e-02
+933 1168 -8.33333333333333e-02
+933 1200 -1.25000000000000e-01
+933 935 -1.66666666666667e-01
+933 947 8.33333333333333e-02
+933 932 1.66666666666667e-01
+933 946 -4.16666666666667e-02
+933 697 4.16666666666667e-02
+933 1199 8.33333333333333e-02
+933 945 -1.25000000000000e-01
+933 930 -7.50000000000000e-01
+934 934 1.25000000000000e+00
+934 1197 -4.16666666666667e-02
+934 1175 8.33333333333333e-02
+934 1199 8.33333333333333e-02
+934 1198 -1.25000000000000e-01
+934 941 8.33333333333333e-02
+934 940 -3.75000000000000e-01
+934 933 -1.66666666666667e-01
+934 939 8.33333333333333e-02
+934 932 -8.33333333333333e-02
+934 935 -1.66666666666667e-01
+934 1169 -8.33333333333333e-02
+934 1181 8.33333333333333e-02
+934 1200 8.33333333333333e-02
+934 930 1.66666666666667e-01
+934 1179 -1.66666666666667e-01
+934 740 -8.33333333333333e-02
+934 1202 8.33333333333333e-02
+934 1201 -3.75000000000000e-01
+934 738 4.16666666666667e-02
+934 1167 -8.33333333333333e-02
+934 947 8.33333333333333e-02
+934 698 -8.33333333333333e-02
+934 1173 8.33333333333333e-02
+934 946 -1.25000000000000e-01
+934 931 -2.50000000000000e-01
+934 945 -4.16666666666667e-02
+934 696 4.16666666666667e-02
+935 935 1.25000000000000e+00
+935 1174 8.33333333333333e-02
+935 1173 -1.66666666666667e-01
+935 1199 -3.75000000000000e-01
+935 1198 8.33333333333333e-02
+935 738 4.16666666666667e-02
+935 941 -1.25000000000000e-01
+935 940 8.33333333333333e-02
+935 939 -4.16666666666667e-02
+935 696 4.16666666666667e-02
+935 931 -8.33333333333333e-02
+935 934 -1.66666666666667e-01
+935 1200 -4.16666666666667e-02
+935 1168 -8.33333333333333e-02
+935 1180 8.33333333333333e-02
+935 1167 -8.33333333333333e-02
+935 1179 8.33333333333333e-02
+935 1202 -1.25000000000000e-01
+935 739 -8.33333333333333e-02
+935 1201 8.33333333333333e-02
+935 1197 8.33333333333333e-02
+935 947 -3.75000000000000e-01
+935 932 -2.50000000000000e-01
+935 946 8.33333333333333e-02
+935 697 -8.33333333333333e-02
+935 933 -1.66666666666667e-01
+935 945 8.33333333333333e-02
+935 930 1.66666666666667e-01
+936 936 1.25000000000000e+00
+936 1174 8.33333333333333e-02
+936 1175 8.33333333333333e-02
+936 1235 8.33333333333333e-02
+936 1233 -1.25000000000000e-01
+936 941 8.33333333333333e-02
+936 940 8.33333333333333e-02
+936 937 -1.66666666666667e-01
+936 939 -3.75000000000000e-01
+936 932 -8.33333333333333e-02
+936 938 -1.66666666666667e-01
+936 1172 -8.33333333333333e-02
+936 1184 8.33333333333333e-02
+936 1237 8.33333333333333e-02
+936 931 1.66666666666667e-01
+936 1183 -1.66666666666667e-01
+936 1238 8.33333333333333e-02
+936 755 -8.33333333333333e-02
+936 754 4.16666666666667e-02
+936 1171 -8.33333333333333e-02
+936 1236 -3.75000000000000e-01
+936 950 8.33333333333333e-02
+936 698 -8.33333333333333e-02
+936 949 -4.16666666666667e-02
+936 697 4.16666666666667e-02
+936 948 -1.25000000000000e-01
+936 1234 -4.16666666666667e-02
+936 930 -2.50000000000000e-01
+937 937 1.25000000000000e+00
+937 1233 -4.16666666666667e-02
+937 1173 8.33333333333333e-02
+937 1175 -1.66666666666667e-01
+937 755 4.16666666666667e-02
+937 1234 -1.25000000000000e-01
+937 941 -4.16666666666667e-02
+937 698 4.16666666666667e-02
+937 940 -1.25000000000000e-01
+937 939 8.33333333333333e-02
+937 936 -1.66666666666667e-01
+937 1238 -4.16666666666667e-02
+937 1236 8.33333333333333e-02
+937 1172 -8.33333333333333e-02
+937 1184 8.33333333333333e-02
+937 930 1.66666666666667e-01
+937 1182 -1.66666666666667e-01
+937 1237 -1.25000000000000e-01
+937 753 4.16666666666667e-02
+937 1170 -8.33333333333333e-02
+937 950 8.33333333333333e-02
+937 938 -1.66666666666667e-01
+937 932 1.66666666666667e-01
+937 949 -1.25000000000000e-01
+937 1235 8.33333333333333e-02
+937 931 -7.50000000000000e-01
+937 948 -4.16666666666667e-02
+937 696 4.16666666666667e-02
+938 938 1.25000000000000e+00
+938 1174 -1.66666666666667e-01
+938 1173 8.33333333333333e-02
+938 1235 -3.75000000000000e-01
+938 754 4.16666666666667e-02
+938 1233 8.33333333333333e-02
+938 941 -1.25000000000000e-01
+938 940 -4.16666666666667e-02
+938 697 4.16666666666667e-02
+938 939 8.33333333333333e-02
+938 930 -8.33333333333333e-02
+938 1237 -4.16666666666667e-02
+938 936 -1.66666666666667e-01
+938 1170 -8.33333333333333e-02
+938 1182 8.33333333333333e-02
+938 1171 -8.33333333333333e-02
+938 1183 8.33333333333333e-02
+938 1238 -1.25000000000000e-01
+938 1236 8.33333333333333e-02
+938 753 -8.33333333333333e-02
+938 950 -3.75000000000000e-01
+938 1234 8.33333333333333e-02
+938 932 -2.50000000000000e-01
+938 949 8.33333333333333e-02
+938 937 -1.66666666666667e-01
+938 931 1.66666666666667e-01
+938 948 8.33333333333333e-02
+938 696 -8.33333333333333e-02
+939 939 6.66666666666667e-01
+939 758 4.16666666666667e-02
+939 1235 -8.33333333333333e-02
+939 941 -8.33333333333333e-02
+939 938 8.33333333333333e-02
+939 698 4.16666666666667e-02
+939 937 8.33333333333333e-02
+939 936 -3.75000000000000e-01
+939 1174 -8.33333333333333e-02
+939 1198 4.16666666666667e-02
+939 1199 4.16666666666667e-02
+939 1175 -8.33333333333333e-02
+939 756 -8.33333333333333e-02
+939 935 -4.16666666666667e-02
+939 932 8.33333333333333e-02
+939 934 8.33333333333333e-02
+939 931 -1.66666666666667e-01
+939 933 -1.25000000000000e-01
+939 1234 4.16666666666667e-02
+939 696 -8.33333333333333e-02
+940 940 6.66666666666667e-01
+940 1235 4.16666666666667e-02
+940 938 -4.16666666666667e-02
+940 937 -1.25000000000000e-01
+940 936 8.33333333333333e-02
+940 1173 -8.33333333333333e-02
+940 1197 4.16666666666667e-02
+940 1175 -8.33333333333333e-02
+940 932 8.33333333333333e-02
+940 1199 -8.33333333333333e-02
+940 758 4.16666666666667e-02
+940 757 -8.33333333333333e-02
+940 935 8.33333333333333e-02
+940 941 -8.33333333333333e-02
+940 698 4.16666666666667e-02
+940 934 -3.75000000000000e-01
+940 1233 4.16666666666667e-02
+940 697 -8.33333333333333e-02
+940 933 8.33333333333333e-02
+940 930 -1.66666666666667e-01
+941 941 7.50000000000000e-01
+941 756 4.16666666666667e-02
+941 1233 -8.33333333333333e-02
+941 938 -1.25000000000000e-01
+941 937 -4.16666666666667e-02
+941 939 -8.33333333333333e-02
+941 936 8.33333333333333e-02
+941 696 4.16666666666667e-02
+941 1174 -8.33333333333333e-02
+941 931 8.33333333333333e-02
+941 758 -2.50000000000000e-01
+941 1198 -8.33333333333333e-02
+941 757 4.16666666666667e-02
+941 1197 4.16666666666667e-02
+941 1173 -8.33333333333333e-02
+941 935 -1.25000000000000e-01
+941 1234 4.16666666666667e-02
+941 698 -2.50000000000000e-01
+941 934 8.33333333333333e-02
+941 940 -8.33333333333333e-02
+941 697 4.16666666666667e-02
+941 933 -4.16666666666667e-02
+941 930 8.33333333333333e-02
+942 942 1.25000000000000e+00
+942 1184 -1.66666666666667e-01
+942 1183 8.33333333333333e-02
+942 773 4.16666666666667e-02
+942 1273 8.33333333333333e-02
+942 1272 -3.75000000000000e-01
+942 950 -4.16666666666667e-02
+942 698 4.16666666666667e-02
+942 949 8.33333333333333e-02
+942 948 -1.25000000000000e-01
+942 1178 -8.33333333333333e-02
+942 1177 -8.33333333333333e-02
+942 1181 8.33333333333333e-02
+942 1271 -4.16666666666667e-02
+942 943 -1.66666666666667e-01
+942 1180 8.33333333333333e-02
+942 931 -8.33333333333333e-02
+942 772 -8.33333333333333e-02
+942 1270 8.33333333333333e-02
+942 1269 -1.25000000000000e-01
+942 944 -1.66666666666667e-01
+942 947 8.33333333333333e-02
+942 932 1.66666666666667e-01
+942 946 8.33333333333333e-02
+942 697 -8.33333333333333e-02
+942 1274 8.33333333333333e-02
+942 945 -3.75000000000000e-01
+942 930 -2.50000000000000e-01
+943 943 1.25000000000000e+00
+943 1184 8.33333333333333e-02
+943 1182 8.33333333333333e-02
+943 1273 -1.25000000000000e-01
+943 1272 8.33333333333333e-02
+943 950 8.33333333333333e-02
+943 944 -1.66666666666667e-01
+943 949 -3.75000000000000e-01
+943 948 8.33333333333333e-02
+943 1176 -8.33333333333333e-02
+943 1271 8.33333333333333e-02
+943 942 -1.66666666666667e-01
+943 1181 -1.66666666666667e-01
+943 932 1.66666666666667e-01
+943 1179 8.33333333333333e-02
+943 930 -8.33333333333333e-02
+943 773 4.16666666666667e-02
+943 1178 -8.33333333333333e-02
+943 1270 -3.75000000000000e-01
+943 771 -8.33333333333333e-02
+943 1269 8.33333333333333e-02
+943 947 -4.16666666666667e-02
+943 698 4.16666666666667e-02
+943 1274 -4.16666666666667e-02
+943 946 -1.25000000000000e-01
+943 931 -2.50000000000000e-01
+943 945 8.33333333333333e-02
+943 696 -8.33333333333333e-02
+944 944 1.25000000000000e+00
+944 1183 8.33333333333333e-02
+944 1272 8.33333333333333e-02
+944 1182 -1.66666666666667e-01
+944 1274 -1.25000000000000e-01
+944 771 4.16666666666667e-02
+944 950 -1.25000000000000e-01
+944 949 8.33333333333333e-02
+944 943 -1.66666666666667e-01
+944 948 -4.16666666666667e-02
+944 696 4.16666666666667e-02
+944 1176 -8.33333333333333e-02
+944 1270 8.33333333333333e-02
+944 1179 8.33333333333333e-02
+944 1269 -4.16666666666667e-02
+944 1180 -1.66666666666667e-01
+944 931 1.66666666666667e-01
+944 1271 -1.25000000000000e-01
+944 772 4.16666666666667e-02
+944 1177 -8.33333333333333e-02
+944 1273 -4.16666666666667e-02
+944 947 -1.25000000000000e-01
+944 932 -7.50000000000000e-01
+944 946 -4.16666666666667e-02
+944 697 4.16666666666667e-02
+944 942 -1.66666666666667e-01
+944 945 8.33333333333333e-02
+944 930 1.66666666666667e-01
+945 945 6.66666666666667e-01
+945 1201 4.16666666666667e-02
+945 935 8.33333333333333e-02
+945 934 -4.16666666666667e-02
+945 933 -1.25000000000000e-01
+945 1181 -8.33333333333333e-02
+945 1271 4.16666666666667e-02
+945 1180 -8.33333333333333e-02
+945 931 8.33333333333333e-02
+945 1270 -8.33333333333333e-02
+945 775 4.16666666666667e-02
+945 774 -8.33333333333333e-02
+945 944 8.33333333333333e-02
+945 932 -1.66666666666667e-01
+945 943 8.33333333333333e-02
+945 946 -8.33333333333333e-02
+945 697 4.16666666666667e-02
+945 942 -3.75000000000000e-01
+945 1202 4.16666666666667e-02
+945 696 -8.33333333333333e-02
+946 946 7.50000000000000e-01
+946 776 4.16666666666667e-02
+946 1200 4.16666666666667e-02
+946 935 8.33333333333333e-02
+946 947 -8.33333333333333e-02
+946 698 4.16666666666667e-02
+946 934 -1.25000000000000e-01
+946 933 -4.16666666666667e-02
+946 1179 -8.33333333333333e-02
+946 930 8.33333333333333e-02
+946 1271 4.16666666666667e-02
+946 1181 -8.33333333333333e-02
+946 775 -2.50000000000000e-01
+946 1269 -8.33333333333333e-02
+946 774 4.16666666666667e-02
+946 944 -4.16666666666667e-02
+946 932 8.33333333333333e-02
+946 943 -1.25000000000000e-01
+946 1202 -8.33333333333333e-02
+946 697 -2.50000000000000e-01
+946 942 8.33333333333333e-02
+946 945 -8.33333333333333e-02
+946 696 4.16666666666667e-02
+947 947 6.66666666666667e-01
+947 1201 -8.33333333333333e-02
+947 775 4.16666666666667e-02
+947 935 -3.75000000000000e-01
+947 934 8.33333333333333e-02
+947 946 -8.33333333333333e-02
+947 697 4.16666666666667e-02
+947 933 8.33333333333333e-02
+947 1179 -8.33333333333333e-02
+947 1269 4.16666666666667e-02
+947 776 -8.33333333333333e-02
+947 1270 4.16666666666667e-02
+947 1180 -8.33333333333333e-02
+947 944 -1.25000000000000e-01
+947 1200 4.16666666666667e-02
+947 698 -8.33333333333333e-02
+947 943 -4.16666666666667e-02
+947 931 8.33333333333333e-02
+947 942 8.33333333333333e-02
+947 930 -1.66666666666667e-01
+948 948 7.50000000000000e-01
+948 1238 -8.33333333333333e-02
+948 1237 4.16666666666667e-02
+948 950 -8.33333333333333e-02
+948 938 8.33333333333333e-02
+948 698 4.16666666666667e-02
+948 937 -4.16666666666667e-02
+948 936 -1.25000000000000e-01
+948 1183 -8.33333333333333e-02
+948 931 8.33333333333333e-02
+948 1274 4.16666666666667e-02
+948 1184 -8.33333333333333e-02
+948 781 4.16666666666667e-02
+948 1273 -8.33333333333333e-02
+948 780 -2.50000000000000e-01
+948 944 -4.16666666666667e-02
+948 932 8.33333333333333e-02
+948 949 -8.33333333333333e-02
+948 943 8.33333333333333e-02
+948 697 4.16666666666667e-02
+948 782 4.16666666666667e-02
+948 942 -1.25000000000000e-01
+948 696 -2.50000000000000e-01
+949 949 6.66666666666667e-01
+949 1236 4.16666666666667e-02
+949 938 8.33333333333333e-02
+949 937 -1.25000000000000e-01
+949 936 -4.16666666666667e-02
+949 1274 4.16666666666667e-02
+949 1184 -8.33333333333333e-02
+949 1182 -8.33333333333333e-02
+949 930 8.33333333333333e-02
+949 781 -8.33333333333333e-02
+949 780 4.16666666666667e-02
+949 1272 -8.33333333333333e-02
+949 944 8.33333333333333e-02
+949 932 -1.66666666666667e-01
+949 1238 4.16666666666667e-02
+949 943 -3.75000000000000e-01
+949 697 -8.33333333333333e-02
+949 948 -8.33333333333333e-02
+949 942 8.33333333333333e-02
+949 696 4.16666666666667e-02
+950 950 6.66666666666667e-01
+950 780 4.16666666666667e-02
+950 1236 -8.33333333333333e-02
+950 938 -3.75000000000000e-01
+950 937 8.33333333333333e-02
+950 948 -8.33333333333333e-02
+950 936 8.33333333333333e-02
+950 696 4.16666666666667e-02
+950 1273 4.16666666666667e-02
+950 1183 -8.33333333333333e-02
+950 782 -8.33333333333333e-02
+950 1272 4.16666666666667e-02
+950 1182 -8.33333333333333e-02
+950 1237 4.16666666666667e-02
+950 944 -1.25000000000000e-01
+950 698 -8.33333333333333e-02
+950 943 8.33333333333333e-02
+950 931 -1.66666666666667e-01
+950 942 -4.16666666666667e-02
+950 930 8.33333333333333e-02
+951 951 1.25000000000000e+00
+951 989 -8.33333333333333e-02
+951 967 8.33333333333333e-02
+951 988 -8.33333333333333e-02
+951 985 -8.33333333333333e-02
+951 962 8.33333333333333e-02
+951 968 -1.66666666666667e-01
+951 961 8.33333333333333e-02
+951 960 -3.75000000000000e-01
+951 788 8.33333333333333e-02
+951 953 -1.66666666666667e-01
+951 959 1.66666666666667e-01
+951 982 8.33333333333333e-02
+951 958 -8.33333333333333e-02
+951 701 -4.16666666666667e-02
+951 785 4.16666666666667e-02
+951 700 8.33333333333333e-02
+951 784 -8.33333333333333e-02
+951 699 -1.25000000000000e-01
+951 957 -2.50000000000000e-01
+951 704 -4.16666666666667e-02
+951 983 8.33333333333333e-02
+951 952 -1.66666666666667e-01
+951 703 8.33333333333333e-02
+951 787 8.33333333333333e-02
+951 986 4.16666666666667e-02
+951 702 -1.25000000000000e-01
+951 786 -3.75000000000000e-01
+952 952 1.25000000000000e+00
+952 987 -8.33333333333333e-02
+952 986 4.16666666666667e-02
+952 989 -8.33333333333333e-02
+952 984 -8.33333333333333e-02
+952 962 -4.16666666666667e-02
+952 968 8.33333333333333e-02
+952 961 -1.25000000000000e-01
+952 960 8.33333333333333e-02
+952 788 -4.16666666666667e-02
+952 785 4.16666666666667e-02
+952 981 8.33333333333333e-02
+952 957 -8.33333333333333e-02
+952 701 8.33333333333333e-02
+952 953 -1.66666666666667e-01
+952 959 1.66666666666667e-01
+952 700 -3.75000000000000e-01
+952 958 -2.50000000000000e-01
+952 699 8.33333333333333e-02
+952 783 -8.33333333333333e-02
+952 704 8.33333333333333e-02
+952 983 -1.66666666666667e-01
+952 966 8.33333333333333e-02
+952 703 -3.75000000000000e-01
+952 787 -1.25000000000000e-01
+952 951 -1.66666666666667e-01
+952 702 8.33333333333333e-02
+952 786 8.33333333333333e-02
+953 953 1.25000000000000e+00
+953 987 -8.33333333333333e-02
+953 985 4.16666666666667e-02
+953 988 -8.33333333333333e-02
+953 962 -1.25000000000000e-01
+953 961 -4.16666666666667e-02
+953 967 8.33333333333333e-02
+953 960 8.33333333333333e-02
+953 966 -1.66666666666667e-01
+953 787 -4.16666666666667e-02
+953 784 4.16666666666667e-02
+953 786 8.33333333333333e-02
+953 951 -1.66666666666667e-01
+953 957 1.66666666666667e-01
+953 701 -1.25000000000000e-01
+953 959 -7.50000000000000e-01
+953 700 8.33333333333333e-02
+953 952 -1.66666666666667e-01
+953 958 1.66666666666667e-01
+953 699 -4.16666666666667e-02
+953 783 4.16666666666667e-02
+953 984 4.16666666666667e-02
+953 704 -1.25000000000000e-01
+953 788 -1.25000000000000e-01
+953 703 8.33333333333333e-02
+953 982 -1.66666666666667e-01
+953 702 -4.16666666666667e-02
+953 981 8.33333333333333e-02
+954 954 1.25000000000000e+00
+954 965 8.33333333333333e-02
+954 964 8.33333333333333e-02
+954 963 -3.75000000000000e-01
+954 1016 -8.33333333333333e-02
+954 1018 -8.33333333333333e-02
+954 968 8.33333333333333e-02
+954 967 -1.66666666666667e-01
+954 1019 -8.33333333333333e-02
+954 1013 8.33333333333333e-02
+954 959 -8.33333333333333e-02
+954 955 -1.66666666666667e-01
+954 958 1.66666666666667e-01
+954 790 8.33333333333333e-02
+954 701 8.33333333333333e-02
+954 785 -8.33333333333333e-02
+954 700 -4.16666666666667e-02
+954 784 4.16666666666667e-02
+954 699 -1.25000000000000e-01
+954 957 -2.50000000000000e-01
+954 956 -1.66666666666667e-01
+954 707 8.33333333333333e-02
+954 791 8.33333333333333e-02
+954 706 -4.16666666666667e-02
+954 1012 8.33333333333333e-02
+954 1015 4.16666666666667e-02
+954 705 -1.25000000000000e-01
+954 789 -3.75000000000000e-01
+955 955 1.25000000000000e+00
+955 965 -4.16666666666667e-02
+955 964 -1.25000000000000e-01
+955 963 8.33333333333333e-02
+955 1016 4.16666666666667e-02
+955 968 8.33333333333333e-02
+955 1019 -8.33333333333333e-02
+955 1017 -8.33333333333333e-02
+955 966 -1.66666666666667e-01
+955 785 4.16666666666667e-02
+955 791 -4.16666666666667e-02
+955 954 -1.66666666666667e-01
+955 957 1.66666666666667e-01
+955 789 8.33333333333333e-02
+955 701 8.33333333333333e-02
+955 956 -1.66666666666667e-01
+955 959 1.66666666666667e-01
+955 700 -1.25000000000000e-01
+955 958 -7.50000000000000e-01
+955 699 -4.16666666666667e-02
+955 783 4.16666666666667e-02
+955 707 8.33333333333333e-02
+955 1013 -1.66666666666667e-01
+955 1014 4.16666666666667e-02
+955 706 -1.25000000000000e-01
+955 790 -1.25000000000000e-01
+955 705 -4.16666666666667e-02
+955 1011 8.33333333333333e-02
+956 956 1.25000000000000e+00
+956 964 -4.16666666666667e-02
+956 963 8.33333333333333e-02
+956 1015 4.16666666666667e-02
+956 1014 -8.33333333333333e-02
+956 967 8.33333333333333e-02
+956 1018 -8.33333333333333e-02
+956 966 8.33333333333333e-02
+956 1017 -8.33333333333333e-02
+956 1011 8.33333333333333e-02
+956 957 -8.33333333333333e-02
+956 784 4.16666666666667e-02
+956 790 -4.16666666666667e-02
+956 701 -3.75000000000000e-01
+956 959 -2.50000000000000e-01
+956 700 8.33333333333333e-02
+956 955 -1.66666666666667e-01
+956 958 1.66666666666667e-01
+956 699 8.33333333333333e-02
+956 783 -8.33333333333333e-02
+956 965 -1.25000000000000e-01
+956 707 -3.75000000000000e-01
+956 791 -1.25000000000000e-01
+956 706 8.33333333333333e-02
+956 1012 -1.66666666666667e-01
+956 954 -1.66666666666667e-01
+956 705 8.33333333333333e-02
+956 789 8.33333333333333e-02
+957 957 2.50000000000000e+00
+957 988 -1.66666666666667e-01
+957 953 1.66666666666667e-01
+957 787 8.33333333333333e-02
+957 952 -8.33333333333333e-02
+957 788 -1.66666666666667e-01
+957 951 -2.50000000000000e-01
+957 983 -8.33333333333333e-02
+957 982 1.66666666666667e-01
+957 981 -2.50000000000000e-01
+957 1042 -8.33333333333333e-02
+957 968 1.66666666666667e-01
+957 1019 -1.66666666666667e-01
+957 1018 8.33333333333333e-02
+957 701 8.33333333333333e-02
+957 967 1.66666666666667e-01
+957 958 -3.33333333333333e-01
+957 966 -7.50000000000000e-01
+957 1043 -8.33333333333333e-02
+957 710 8.33333333333333e-02
+957 956 -8.33333333333333e-02
+957 955 1.66666666666667e-01
+957 785 -8.33333333333333e-02
+957 791 8.33333333333333e-02
+957 793 1.66666666666667e-01
+957 790 -1.66666666666667e-01
+957 700 8.33333333333333e-02
+957 784 -8.33333333333333e-02
+957 954 -2.50000000000000e-01
+957 959 -3.33333333333333e-01
+957 1013 1.66666666666667e-01
+957 794 1.66666666666667e-01
+957 1012 -8.33333333333333e-02
+957 709 8.33333333333333e-02
+957 989 8.33333333333333e-02
+957 1011 -2.50000000000000e-01
+957 792 -7.50000000000000e-01
+958 958 2.50000000000000e+00
+958 987 -1.66666666666667e-01
+958 786 8.33333333333333e-02
+958 951 -8.33333333333333e-02
+958 788 8.33333333333333e-02
+958 953 1.66666666666667e-01
+958 952 -2.50000000000000e-01
+958 983 1.66666666666667e-01
+958 982 -7.50000000000000e-01
+958 981 1.66666666666667e-01
+958 1043 -8.33333333333333e-02
+958 1041 -8.33333333333333e-02
+958 968 -8.33333333333333e-02
+958 1019 8.33333333333333e-02
+958 1017 8.33333333333333e-02
+958 967 -2.50000000000000e-01
+958 966 1.66666666666667e-01
+958 957 -3.33333333333333e-01
+958 794 -8.33333333333333e-02
+958 959 -3.33333333333333e-01
+958 785 -8.33333333333333e-02
+958 791 8.33333333333333e-02
+958 954 1.66666666666667e-01
+958 792 1.66666666666667e-01
+958 789 -1.66666666666667e-01
+958 701 -1.66666666666667e-01
+958 956 1.66666666666667e-01
+958 955 -7.50000000000000e-01
+958 699 8.33333333333333e-02
+958 783 -8.33333333333333e-02
+958 1013 1.66666666666667e-01
+958 710 -1.66666666666667e-01
+958 989 8.33333333333333e-02
+958 1012 -2.50000000000000e-01
+958 793 -2.50000000000000e-01
+958 1011 -8.33333333333333e-02
+958 708 8.33333333333333e-02
+959 959 2.50000000000000e+00
+959 987 8.33333333333333e-02
+959 951 1.66666666666667e-01
+959 787 8.33333333333333e-02
+959 786 -1.66666666666667e-01
+959 953 -7.50000000000000e-01
+959 952 1.66666666666667e-01
+959 983 -2.50000000000000e-01
+959 982 1.66666666666667e-01
+959 981 -8.33333333333333e-02
+959 1042 -8.33333333333333e-02
+959 967 -8.33333333333333e-02
+959 1018 8.33333333333333e-02
+959 966 1.66666666666667e-01
+959 1017 -1.66666666666667e-01
+959 968 -2.50000000000000e-01
+959 699 8.33333333333333e-02
+959 1041 -8.33333333333333e-02
+959 708 8.33333333333333e-02
+959 793 -8.33333333333333e-02
+959 958 -3.33333333333333e-01
+959 954 -8.33333333333333e-02
+959 784 -8.33333333333333e-02
+959 790 8.33333333333333e-02
+959 783 -8.33333333333333e-02
+959 789 8.33333333333333e-02
+959 956 -2.50000000000000e-01
+959 700 -1.66666666666667e-01
+959 955 1.66666666666667e-01
+959 988 8.33333333333333e-02
+959 1013 -7.50000000000000e-01
+959 794 -2.50000000000000e-01
+959 1012 1.66666666666667e-01
+959 709 -1.66666666666667e-01
+959 957 -3.33333333333333e-01
+959 1011 1.66666666666667e-01
+959 792 1.66666666666667e-01
+960 960 1.25000000000000e+00
+960 988 8.33333333333333e-02
+960 989 8.33333333333333e-02
+960 953 8.33333333333333e-02
+960 962 -1.66666666666667e-01
+960 952 8.33333333333333e-02
+960 951 -3.75000000000000e-01
+960 985 8.33333333333333e-02
+960 984 -1.25000000000000e-01
+960 967 -8.33333333333333e-02
+960 961 -1.66666666666667e-01
+960 803 8.33333333333333e-02
+960 1081 -8.33333333333333e-02
+960 814 8.33333333333333e-02
+960 968 1.66666666666667e-01
+960 815 -1.66666666666667e-01
+960 716 4.16666666666667e-02
+960 1082 -8.33333333333333e-02
+960 802 8.33333333333333e-02
+960 715 -8.33333333333333e-02
+960 801 -3.75000000000000e-01
+960 797 -4.16666666666667e-02
+960 701 4.16666666666667e-02
+960 796 8.33333333333333e-02
+960 700 -8.33333333333333e-02
+960 795 -1.25000000000000e-01
+960 986 -4.16666666666667e-02
+960 966 -2.50000000000000e-01
+961 961 1.25000000000000e+00
+961 987 8.33333333333333e-02
+961 989 -1.66666666666667e-01
+961 953 -4.16666666666667e-02
+961 701 4.16666666666667e-02
+961 952 -1.25000000000000e-01
+961 951 8.33333333333333e-02
+961 716 4.16666666666667e-02
+961 985 -3.75000000000000e-01
+961 984 8.33333333333333e-02
+961 966 -8.33333333333333e-02
+961 803 -4.16666666666667e-02
+961 960 -1.66666666666667e-01
+961 1080 -8.33333333333333e-02
+961 813 8.33333333333333e-02
+961 1082 -8.33333333333333e-02
+961 815 8.33333333333333e-02
+961 802 -1.25000000000000e-01
+961 801 8.33333333333333e-02
+961 714 -8.33333333333333e-02
+961 797 8.33333333333333e-02
+961 962 -1.66666666666667e-01
+961 968 1.66666666666667e-01
+961 796 -3.75000000000000e-01
+961 986 8.33333333333333e-02
+961 967 -2.50000000000000e-01
+961 795 8.33333333333333e-02
+961 699 -8.33333333333333e-02
+962 962 1.25000000000000e+00
+962 984 -4.16666666666667e-02
+962 988 -1.66666666666667e-01
+962 987 8.33333333333333e-02
+962 953 -1.25000000000000e-01
+962 952 -4.16666666666667e-02
+962 700 4.16666666666667e-02
+962 951 8.33333333333333e-02
+962 960 -1.66666666666667e-01
+962 986 -1.25000000000000e-01
+962 715 4.16666666666667e-02
+962 802 -4.16666666666667e-02
+962 801 8.33333333333333e-02
+962 1081 -8.33333333333333e-02
+962 814 8.33333333333333e-02
+962 966 1.66666666666667e-01
+962 813 -1.66666666666667e-01
+962 803 -1.25000000000000e-01
+962 714 4.16666666666667e-02
+962 1080 -8.33333333333333e-02
+962 797 -1.25000000000000e-01
+962 985 8.33333333333333e-02
+962 968 -7.50000000000000e-01
+962 796 8.33333333333333e-02
+962 961 -1.66666666666667e-01
+962 967 1.66666666666667e-01
+962 795 -4.16666666666667e-02
+962 699 4.16666666666667e-02
+963 963 1.25000000000000e+00
+963 1015 -4.16666666666667e-02
+963 1018 8.33333333333333e-02
+963 1016 8.33333333333333e-02
+963 1014 -1.25000000000000e-01
+963 956 8.33333333333333e-02
+963 964 -1.66666666666667e-01
+963 955 8.33333333333333e-02
+963 954 -3.75000000000000e-01
+963 1118 -8.33333333333333e-02
+963 965 -1.66666666666667e-01
+963 808 8.33333333333333e-02
+963 815 8.33333333333333e-02
+963 968 -8.33333333333333e-02
+963 814 -1.66666666666667e-01
+963 967 1.66666666666667e-01
+963 809 8.33333333333333e-02
+963 722 -8.33333333333333e-02
+963 721 4.16666666666667e-02
+963 1117 -8.33333333333333e-02
+963 807 -3.75000000000000e-01
+963 797 8.33333333333333e-02
+963 701 -8.33333333333333e-02
+963 796 -4.16666666666667e-02
+963 700 4.16666666666667e-02
+963 795 -1.25000000000000e-01
+963 1019 8.33333333333333e-02
+963 966 -2.50000000000000e-01
+964 964 1.25000000000000e+00
+964 1019 -1.66666666666667e-01
+964 1014 -4.16666666666667e-02
+964 1017 8.33333333333333e-02
+964 722 4.16666666666667e-02
+964 1015 -1.25000000000000e-01
+964 701 4.16666666666667e-02
+964 956 -4.16666666666667e-02
+964 955 -1.25000000000000e-01
+964 963 -1.66666666666667e-01
+964 954 8.33333333333333e-02
+964 1118 -8.33333333333333e-02
+964 809 -4.16666666666667e-02
+964 815 8.33333333333333e-02
+964 807 8.33333333333333e-02
+964 813 -1.66666666666667e-01
+964 966 1.66666666666667e-01
+964 808 -1.25000000000000e-01
+964 720 4.16666666666667e-02
+964 1116 -8.33333333333333e-02
+964 797 8.33333333333333e-02
+964 965 -1.66666666666667e-01
+964 968 1.66666666666667e-01
+964 796 -1.25000000000000e-01
+964 1016 8.33333333333333e-02
+964 967 -7.50000000000000e-01
+964 795 -4.16666666666667e-02
+964 699 4.16666666666667e-02
+965 965 1.25000000000000e+00
+965 1015 8.33333333333333e-02
+965 1018 -1.66666666666667e-01
+965 1016 -3.75000000000000e-01
+965 721 4.16666666666667e-02
+965 1014 8.33333333333333e-02
+965 956 -1.25000000000000e-01
+965 700 4.16666666666667e-02
+965 955 -4.16666666666667e-02
+965 954 8.33333333333333e-02
+965 1117 -8.33333333333333e-02
+965 1116 -8.33333333333333e-02
+965 808 -4.16666666666667e-02
+965 814 8.33333333333333e-02
+965 963 -1.66666666666667e-01
+965 813 8.33333333333333e-02
+965 966 -8.33333333333333e-02
+965 809 -1.25000000000000e-01
+965 807 8.33333333333333e-02
+965 720 -8.33333333333333e-02
+965 797 -3.75000000000000e-01
+965 1017 8.33333333333333e-02
+965 968 -2.50000000000000e-01
+965 796 8.33333333333333e-02
+965 964 -1.66666666666667e-01
+965 967 1.66666666666667e-01
+965 795 8.33333333333333e-02
+965 699 -8.33333333333333e-02
+966 966 2.50000000000000e+00
+966 989 -8.33333333333333e-02
+966 953 -1.66666666666667e-01
+966 988 1.66666666666667e-01
+966 987 -2.50000000000000e-01
+966 961 -8.33333333333333e-02
+966 962 1.66666666666667e-01
+966 960 -2.50000000000000e-01
+966 1082 8.33333333333333e-02
+966 1081 -1.66666666666667e-01
+966 1042 8.33333333333333e-02
+966 1018 -8.33333333333333e-02
+966 968 -3.33333333333333e-01
+966 959 1.66666666666667e-01
+966 1019 1.66666666666667e-01
+966 701 -8.33333333333333e-02
+966 956 8.33333333333333e-02
+966 958 1.66666666666667e-01
+966 955 -1.66666666666667e-01
+966 957 -7.50000000000000e-01
+966 728 -8.33333333333333e-02
+966 1043 8.33333333333333e-02
+966 1017 -2.50000000000000e-01
+966 797 8.33333333333333e-02
+966 965 -8.33333333333333e-02
+966 814 1.66666666666667e-01
+966 967 -3.33333333333333e-01
+966 964 1.66666666666667e-01
+966 815 1.66666666666667e-01
+966 1118 -1.66666666666667e-01
+966 1117 8.33333333333333e-02
+966 727 -8.33333333333333e-02
+966 813 -7.50000000000000e-01
+966 796 8.33333333333333e-02
+966 700 -8.33333333333333e-02
+966 963 -2.50000000000000e-01
+966 952 8.33333333333333e-02
+967 967 2.50000000000000e+00
+967 989 1.66666666666667e-01
+967 953 8.33333333333333e-02
+967 988 -7.50000000000000e-01
+967 987 1.66666666666667e-01
+967 960 -8.33333333333333e-02
+967 1082 8.33333333333333e-02
+967 962 1.66666666666667e-01
+967 961 -2.50000000000000e-01
+967 1080 -1.66666666666667e-01
+967 968 -3.33333333333333e-01
+967 728 -8.33333333333333e-02
+967 701 -8.33333333333333e-02
+967 1041 8.33333333333333e-02
+967 1017 -8.33333333333333e-02
+967 959 -8.33333333333333e-02
+967 956 8.33333333333333e-02
+967 958 -2.50000000000000e-01
+967 957 1.66666666666667e-01
+967 954 -1.66666666666667e-01
+967 1043 -1.66666666666667e-01
+967 1019 1.66666666666667e-01
+967 1018 -2.50000000000000e-01
+967 815 -8.33333333333333e-02
+967 1118 8.33333333333333e-02
+967 813 1.66666666666667e-01
+967 966 -3.33333333333333e-01
+967 963 1.66666666666667e-01
+967 814 -2.50000000000000e-01
+967 1116 8.33333333333333e-02
+967 726 -8.33333333333333e-02
+967 797 -1.66666666666667e-01
+967 965 1.66666666666667e-01
+967 964 -7.50000000000000e-01
+967 951 8.33333333333333e-02
+967 795 8.33333333333333e-02
+967 699 -8.33333333333333e-02
+968 968 2.50000000000000e+00
+968 987 -8.33333333333333e-02
+968 952 8.33333333333333e-02
+968 951 -1.66666666666667e-01
+968 989 -2.50000000000000e-01
+968 1081 8.33333333333333e-02
+968 960 1.66666666666667e-01
+968 962 -7.50000000000000e-01
+968 961 1.66666666666667e-01
+968 1080 8.33333333333333e-02
+968 967 -3.33333333333333e-01
+968 727 -8.33333333333333e-02
+968 700 -8.33333333333333e-02
+968 958 -8.33333333333333e-02
+968 955 8.33333333333333e-02
+968 966 -3.33333333333333e-01
+968 957 1.66666666666667e-01
+968 1017 1.66666666666667e-01
+968 959 -2.50000000000000e-01
+968 699 -8.33333333333333e-02
+968 954 8.33333333333333e-02
+968 1019 -7.50000000000000e-01
+968 1042 -1.66666666666667e-01
+968 1018 1.66666666666667e-01
+968 726 -8.33333333333333e-02
+968 1041 8.33333333333333e-02
+968 814 -8.33333333333333e-02
+968 1117 8.33333333333333e-02
+968 795 8.33333333333333e-02
+968 963 -8.33333333333333e-02
+968 815 -2.50000000000000e-01
+968 813 1.66666666666667e-01
+968 1116 -1.66666666666667e-01
+968 965 -2.50000000000000e-01
+968 988 1.66666666666667e-01
+968 796 -1.66666666666667e-01
+968 964 1.66666666666667e-01
+969 969 1.25000000000000e+00
+969 994 -8.33333333333333e-02
+969 977 -4.16666666666667e-02
+969 980 8.33333333333333e-02
+969 976 8.33333333333333e-02
+969 975 -1.25000000000000e-01
+969 992 4.16666666666667e-02
+969 995 -8.33333333333333e-02
+969 991 -8.33333333333333e-02
+969 788 -4.16666666666667e-02
+969 982 8.33333333333333e-02
+969 973 -8.33333333333333e-02
+969 704 8.33333333333333e-02
+969 983 -1.66666666666667e-01
+969 703 8.33333333333333e-02
+969 970 -1.66666666666667e-01
+969 787 8.33333333333333e-02
+969 702 -3.75000000000000e-01
+969 786 -1.25000000000000e-01
+969 971 -1.66666666666667e-01
+969 974 1.66666666666667e-01
+969 979 8.33333333333333e-02
+969 972 -2.50000000000000e-01
+969 185 4.16666666666667e-02
+969 80 8.33333333333333e-02
+969 79 8.33333333333333e-02
+969 184 -8.33333333333333e-02
+969 78 -3.75000000000000e-01
+970 970 1.25000000000000e+00
+970 995 -8.33333333333333e-02
+970 978 8.33333333333333e-02
+970 993 -8.33333333333333e-02
+970 977 8.33333333333333e-02
+970 980 -1.66666666666667e-01
+970 976 -3.75000000000000e-01
+970 975 8.33333333333333e-02
+970 990 -8.33333333333333e-02
+970 971 -1.66666666666667e-01
+970 788 8.33333333333333e-02
+970 974 1.66666666666667e-01
+970 981 8.33333333333333e-02
+970 972 -8.33333333333333e-02
+970 704 -4.16666666666667e-02
+970 983 8.33333333333333e-02
+970 703 -1.25000000000000e-01
+970 787 -3.75000000000000e-01
+970 702 8.33333333333333e-02
+970 969 -1.66666666666667e-01
+970 786 8.33333333333333e-02
+970 992 4.16666666666667e-02
+970 973 -2.50000000000000e-01
+970 80 -4.16666666666667e-02
+970 185 4.16666666666667e-02
+970 79 -1.25000000000000e-01
+970 78 8.33333333333333e-02
+970 183 -8.33333333333333e-02
+971 971 1.25000000000000e+00
+971 994 -8.33333333333333e-02
+971 977 -1.25000000000000e-01
+971 976 8.33333333333333e-02
+971 979 -1.66666666666667e-01
+971 975 -4.16666666666667e-02
+971 978 8.33333333333333e-02
+971 990 4.16666666666667e-02
+971 993 -8.33333333333333e-02
+971 786 -4.16666666666667e-02
+971 970 -1.66666666666667e-01
+971 787 8.33333333333333e-02
+971 973 1.66666666666667e-01
+971 704 -1.25000000000000e-01
+971 788 -1.25000000000000e-01
+971 703 -4.16666666666667e-02
+971 982 8.33333333333333e-02
+971 702 8.33333333333333e-02
+971 981 -1.66666666666667e-01
+971 991 4.16666666666667e-02
+971 974 -7.50000000000000e-01
+971 969 -1.66666666666667e-01
+971 972 1.66666666666667e-01
+971 183 4.16666666666667e-02
+971 80 -1.25000000000000e-01
+971 79 -4.16666666666667e-02
+971 184 4.16666666666667e-02
+971 78 8.33333333333333e-02
+972 972 2.50000000000000e+00
+972 994 -1.66666666666667e-01
+972 970 -8.33333333333333e-02
+972 787 8.33333333333333e-02
+972 788 8.33333333333333e-02
+972 971 1.66666666666667e-01
+972 969 -2.50000000000000e-01
+972 983 1.66666666666667e-01
+972 982 1.66666666666667e-01
+972 981 -7.50000000000000e-01
+972 1046 -8.33333333333333e-02
+972 1045 -8.33333333333333e-02
+972 980 -8.33333333333333e-02
+972 1034 8.33333333333333e-02
+972 1033 8.33333333333333e-02
+972 979 1.66666666666667e-01
+972 973 -3.33333333333333e-01
+972 978 -2.50000000000000e-01
+972 794 -8.33333333333333e-02
+972 974 -3.33333333333333e-01
+972 793 1.66666666666667e-01
+972 1031 1.66666666666667e-01
+972 710 -1.66666666666667e-01
+972 1030 -8.33333333333333e-02
+972 709 8.33333333333333e-02
+972 1029 -2.50000000000000e-01
+972 995 8.33333333333333e-02
+972 792 -2.50000000000000e-01
+972 185 -8.33333333333333e-02
+972 191 8.33333333333333e-02
+972 586 1.66666666666667e-01
+972 190 -1.66666666666667e-01
+972 587 1.66666666666667e-01
+972 80 -1.66666666666667e-01
+972 79 8.33333333333333e-02
+972 184 -8.33333333333333e-02
+972 585 -7.50000000000000e-01
+973 973 2.50000000000000e+00
+973 993 -1.66666666666667e-01
+973 971 1.66666666666667e-01
+973 969 -8.33333333333333e-02
+973 786 8.33333333333333e-02
+973 788 -1.66666666666667e-01
+973 970 -2.50000000000000e-01
+973 983 -8.33333333333333e-02
+973 982 -2.50000000000000e-01
+973 981 1.66666666666667e-01
+973 1044 -8.33333333333333e-02
+973 980 1.66666666666667e-01
+973 1034 -1.66666666666667e-01
+973 1032 8.33333333333333e-02
+973 979 -7.50000000000000e-01
+973 978 1.66666666666667e-01
+973 972 -3.33333333333333e-01
+973 1046 -8.33333333333333e-02
+973 710 8.33333333333333e-02
+973 792 1.66666666666667e-01
+973 1031 1.66666666666667e-01
+973 974 -3.33333333333333e-01
+973 794 1.66666666666667e-01
+973 1030 -2.50000000000000e-01
+973 995 8.33333333333333e-02
+973 793 -7.50000000000000e-01
+973 1029 -8.33333333333333e-02
+973 708 8.33333333333333e-02
+973 80 8.33333333333333e-02
+973 587 -8.33333333333333e-02
+973 585 1.66666666666667e-01
+973 185 -8.33333333333333e-02
+973 191 8.33333333333333e-02
+973 189 -1.66666666666667e-01
+973 586 -2.50000000000000e-01
+973 78 8.33333333333333e-02
+973 183 -8.33333333333333e-02
+974 974 2.50000000000000e+00
+974 994 8.33333333333333e-02
+974 970 1.66666666666667e-01
+974 787 -1.66666666666667e-01
+974 786 8.33333333333333e-02
+974 971 -7.50000000000000e-01
+974 969 1.66666666666667e-01
+974 983 -2.50000000000000e-01
+974 982 -8.33333333333333e-02
+974 981 1.66666666666667e-01
+974 1044 -8.33333333333333e-02
+974 979 1.66666666666667e-01
+974 978 -8.33333333333333e-02
+974 1032 8.33333333333333e-02
+974 1033 -1.66666666666667e-01
+974 980 -2.50000000000000e-01
+974 1045 -8.33333333333333e-02
+974 709 8.33333333333333e-02
+974 792 -8.33333333333333e-02
+974 972 -3.33333333333333e-01
+974 1031 -7.50000000000000e-01
+974 993 8.33333333333333e-02
+974 794 -2.50000000000000e-01
+974 1030 1.66666666666667e-01
+974 973 -3.33333333333333e-01
+974 793 1.66666666666667e-01
+974 1029 1.66666666666667e-01
+974 708 -1.66666666666667e-01
+974 79 8.33333333333333e-02
+974 586 -8.33333333333333e-02
+974 183 -8.33333333333333e-02
+974 189 8.33333333333333e-02
+974 184 -8.33333333333333e-02
+974 190 8.33333333333333e-02
+974 587 -2.50000000000000e-01
+974 585 1.66666666666667e-01
+974 78 -1.66666666666667e-01
+975 975 1.25000000000000e+00
+975 994 8.33333333333333e-02
+975 995 -1.66666666666667e-01
+975 971 -4.16666666666667e-02
+975 970 8.33333333333333e-02
+975 969 -1.25000000000000e-01
+975 743 4.16666666666667e-02
+975 991 8.33333333333333e-02
+975 990 -3.75000000000000e-01
+975 979 -8.33333333333333e-02
+975 833 -4.16666666666667e-02
+975 976 -1.66666666666667e-01
+975 1204 -8.33333333333333e-02
+975 835 8.33333333333333e-02
+975 1205 -8.33333333333333e-02
+975 836 8.33333333333333e-02
+975 742 -8.33333333333333e-02
+975 832 8.33333333333333e-02
+975 831 -1.25000000000000e-01
+975 977 -1.66666666666667e-01
+975 980 1.66666666666667e-01
+975 992 8.33333333333333e-02
+975 978 -2.50000000000000e-01
+975 80 4.16666666666667e-02
+975 227 8.33333333333333e-02
+975 226 8.33333333333333e-02
+975 79 -8.33333333333333e-02
+975 225 -3.75000000000000e-01
+976 976 1.25000000000000e+00
+976 993 8.33333333333333e-02
+976 995 8.33333333333333e-02
+976 971 8.33333333333333e-02
+976 977 -1.66666666666667e-01
+976 970 -3.75000000000000e-01
+976 969 8.33333333333333e-02
+976 991 -1.25000000000000e-01
+976 990 8.33333333333333e-02
+976 978 -8.33333333333333e-02
+976 975 -1.66666666666667e-01
+976 833 8.33333333333333e-02
+976 1203 -8.33333333333333e-02
+976 834 8.33333333333333e-02
+976 980 1.66666666666667e-01
+976 836 -1.66666666666667e-01
+976 743 4.16666666666667e-02
+976 1205 -8.33333333333333e-02
+976 832 -3.75000000000000e-01
+976 741 -8.33333333333333e-02
+976 831 8.33333333333333e-02
+976 992 -4.16666666666667e-02
+976 979 -2.50000000000000e-01
+976 227 -4.16666666666667e-02
+976 80 4.16666666666667e-02
+976 226 -1.25000000000000e-01
+976 225 8.33333333333333e-02
+976 78 -8.33333333333333e-02
+977 977 1.25000000000000e+00
+977 990 8.33333333333333e-02
+977 994 8.33333333333333e-02
+977 993 -1.66666666666667e-01
+977 971 -1.25000000000000e-01
+977 970 8.33333333333333e-02
+977 976 -1.66666666666667e-01
+977 969 -4.16666666666667e-02
+977 992 -1.25000000000000e-01
+977 741 4.16666666666667e-02
+977 831 -4.16666666666667e-02
+977 832 8.33333333333333e-02
+977 979 1.66666666666667e-01
+977 835 -1.66666666666667e-01
+977 1203 -8.33333333333333e-02
+977 834 8.33333333333333e-02
+977 833 -1.25000000000000e-01
+977 742 4.16666666666667e-02
+977 1204 -8.33333333333333e-02
+977 991 -4.16666666666667e-02
+977 980 -7.50000000000000e-01
+977 975 -1.66666666666667e-01
+977 978 1.66666666666667e-01
+977 78 4.16666666666667e-02
+977 227 -1.25000000000000e-01
+977 226 -4.16666666666667e-02
+977 79 4.16666666666667e-02
+977 225 8.33333333333333e-02
+978 978 2.50000000000000e+00
+978 995 1.66666666666667e-01
+978 971 8.33333333333333e-02
+978 994 1.66666666666667e-01
+978 993 -7.50000000000000e-01
+978 976 -8.33333333333333e-02
+978 1205 8.33333333333333e-02
+978 977 1.66666666666667e-01
+978 975 -2.50000000000000e-01
+978 1204 -1.66666666666667e-01
+978 980 -3.33333333333333e-01
+978 746 -8.33333333333333e-02
+978 1045 8.33333333333333e-02
+978 1033 -8.33333333333333e-02
+978 974 -8.33333333333333e-02
+978 1046 -1.66666666666667e-01
+978 1034 1.66666666666667e-01
+978 1032 -2.50000000000000e-01
+978 973 1.66666666666667e-01
+978 972 -2.50000000000000e-01
+978 836 -8.33333333333333e-02
+978 1211 8.33333333333333e-02
+978 835 1.66666666666667e-01
+978 979 -3.33333333333333e-01
+978 1210 8.33333333333333e-02
+978 745 -8.33333333333333e-02
+978 834 -2.50000000000000e-01
+978 970 8.33333333333333e-02
+978 80 -8.33333333333333e-02
+978 587 8.33333333333333e-02
+978 586 -1.66666666666667e-01
+978 589 1.66666666666667e-01
+978 590 1.66666666666667e-01
+978 227 -1.66666666666667e-01
+978 226 8.33333333333333e-02
+978 79 -8.33333333333333e-02
+978 588 -7.50000000000000e-01
+979 979 2.50000000000000e+00
+979 995 -8.33333333333333e-02
+979 971 -1.66666666666667e-01
+979 994 -2.50000000000000e-01
+979 993 1.66666666666667e-01
+979 975 -8.33333333333333e-02
+979 977 1.66666666666667e-01
+979 976 -2.50000000000000e-01
+979 1205 8.33333333333333e-02
+979 1203 -1.66666666666667e-01
+979 1044 8.33333333333333e-02
+979 1032 -8.33333333333333e-02
+979 974 1.66666666666667e-01
+979 980 -3.33333333333333e-01
+979 1034 1.66666666666667e-01
+979 746 -8.33333333333333e-02
+979 1046 8.33333333333333e-02
+979 1033 -2.50000000000000e-01
+979 973 -7.50000000000000e-01
+979 972 1.66666666666667e-01
+979 834 1.66666666666667e-01
+979 978 -3.33333333333333e-01
+979 1211 -1.66666666666667e-01
+979 836 1.66666666666667e-01
+979 835 -7.50000000000000e-01
+979 1209 8.33333333333333e-02
+979 744 -8.33333333333333e-02
+979 969 8.33333333333333e-02
+979 80 -8.33333333333333e-02
+979 587 8.33333333333333e-02
+979 585 -1.66666666666667e-01
+979 227 8.33333333333333e-02
+979 590 -8.33333333333333e-02
+979 588 1.66666666666667e-01
+979 589 -2.50000000000000e-01
+979 225 8.33333333333333e-02
+979 78 -8.33333333333333e-02
+980 980 2.50000000000000e+00
+980 993 1.66666666666667e-01
+980 970 -1.66666666666667e-01
+980 969 8.33333333333333e-02
+980 995 -2.50000000000000e-01
+980 976 1.66666666666667e-01
+980 1203 8.33333333333333e-02
+980 977 -7.50000000000000e-01
+980 975 1.66666666666667e-01
+980 1204 8.33333333333333e-02
+980 978 -3.33333333333333e-01
+980 744 -8.33333333333333e-02
+980 973 1.66666666666667e-01
+980 979 -3.33333333333333e-01
+980 1033 1.66666666666667e-01
+980 972 -8.33333333333333e-02
+980 1034 -7.50000000000000e-01
+980 745 -8.33333333333333e-02
+980 1045 8.33333333333333e-02
+980 1044 -1.66666666666667e-01
+980 1032 1.66666666666667e-01
+980 974 -2.50000000000000e-01
+980 834 -8.33333333333333e-02
+980 1209 8.33333333333333e-02
+980 836 -2.50000000000000e-01
+980 1210 -1.66666666666667e-01
+980 835 1.66666666666667e-01
+980 994 -8.33333333333333e-02
+980 78 -8.33333333333333e-02
+980 585 8.33333333333333e-02
+980 79 -8.33333333333333e-02
+980 586 8.33333333333333e-02
+980 226 8.33333333333333e-02
+980 589 -8.33333333333333e-02
+980 590 -2.50000000000000e-01
+980 588 1.66666666666667e-01
+980 225 -1.66666666666667e-01
+981 981 2.50000000000000e+00
+981 995 -8.33333333333333e-02
+981 994 1.66666666666667e-01
+981 993 -2.50000000000000e-01
+981 1046 8.33333333333333e-02
+981 970 8.33333333333333e-02
+981 971 -1.66666666666667e-01
+981 974 1.66666666666667e-01
+981 973 1.66666666666667e-01
+981 972 -7.50000000000000e-01
+981 982 -3.33333333333333e-01
+981 703 -8.33333333333333e-02
+981 709 -8.33333333333333e-02
+981 1048 -8.33333333333333e-02
+981 1042 8.33333333333333e-02
+981 1049 -8.33333333333333e-02
+981 998 8.33333333333333e-02
+981 704 1.66666666666667e-01
+981 983 -3.33333333333333e-01
+981 989 1.66666666666667e-01
+981 997 -1.66666666666667e-01
+981 988 1.66666666666667e-01
+981 987 -7.50000000000000e-01
+981 710 1.66666666666667e-01
+981 1043 -1.66666666666667e-01
+981 787 -8.33333333333333e-02
+981 952 8.33333333333333e-02
+981 953 8.33333333333333e-02
+981 788 -8.33333333333333e-02
+981 702 -2.50000000000000e-01
+981 959 -8.33333333333333e-02
+981 794 8.33333333333333e-02
+981 958 1.66666666666667e-01
+981 793 -1.66666666666667e-01
+981 957 -2.50000000000000e-01
+981 1045 8.33333333333333e-02
+981 708 -2.50000000000000e-01
+982 982 2.50000000000000e+00
+982 995 1.66666666666667e-01
+982 994 -7.50000000000000e-01
+982 993 1.66666666666667e-01
+982 1046 -1.66666666666667e-01
+982 969 8.33333333333333e-02
+982 971 8.33333333333333e-02
+982 974 -8.33333333333333e-02
+982 973 -2.50000000000000e-01
+982 972 1.66666666666667e-01
+982 981 -3.33333333333333e-01
+982 702 -8.33333333333333e-02
+982 708 -8.33333333333333e-02
+982 1047 -8.33333333333333e-02
+982 1041 8.33333333333333e-02
+982 998 8.33333333333333e-02
+982 989 -8.33333333333333e-02
+982 988 -2.50000000000000e-01
+982 996 -1.66666666666667e-01
+982 987 1.66666666666667e-01
+982 1049 -8.33333333333333e-02
+982 1043 8.33333333333333e-02
+982 786 -8.33333333333333e-02
+982 951 8.33333333333333e-02
+982 788 -8.33333333333333e-02
+982 794 8.33333333333333e-02
+982 953 -1.66666666666667e-01
+982 704 1.66666666666667e-01
+982 703 -2.50000000000000e-01
+982 959 1.66666666666667e-01
+982 983 -3.33333333333333e-01
+982 710 1.66666666666667e-01
+982 958 -7.50000000000000e-01
+982 1044 8.33333333333333e-02
+982 709 -2.50000000000000e-01
+982 957 1.66666666666667e-01
+982 792 -1.66666666666667e-01
+983 983 2.50000000000000e+00
+983 994 1.66666666666667e-01
+983 993 -8.33333333333333e-02
+983 1045 -1.66666666666667e-01
+983 1044 8.33333333333333e-02
+983 970 8.33333333333333e-02
+983 969 -1.66666666666667e-01
+983 974 -2.50000000000000e-01
+983 973 -8.33333333333333e-02
+983 972 1.66666666666667e-01
+983 1047 -8.33333333333333e-02
+983 996 8.33333333333333e-02
+983 989 -2.50000000000000e-01
+983 997 8.33333333333333e-02
+983 988 -8.33333333333333e-02
+983 702 1.66666666666667e-01
+983 981 -3.33333333333333e-01
+983 987 1.66666666666667e-01
+983 1048 -8.33333333333333e-02
+983 1042 8.33333333333333e-02
+983 708 1.66666666666667e-01
+983 1041 -1.66666666666667e-01
+983 787 -8.33333333333333e-02
+983 793 8.33333333333333e-02
+983 704 -7.50000000000000e-01
+983 952 -1.66666666666667e-01
+983 703 1.66666666666667e-01
+983 951 8.33333333333333e-02
+983 786 -8.33333333333333e-02
+983 959 -2.50000000000000e-01
+983 995 -2.50000000000000e-01
+983 710 -7.50000000000000e-01
+983 958 1.66666666666667e-01
+983 982 -3.33333333333333e-01
+983 709 1.66666666666667e-01
+983 957 -8.33333333333333e-02
+983 792 8.33333333333333e-02
+984 984 1.25000000000000e+00
+984 953 4.16666666666667e-02
+984 952 -8.33333333333333e-02
+984 961 8.33333333333333e-02
+984 960 -1.25000000000000e-01
+984 704 8.33333333333333e-02
+984 986 -1.66666666666667e-01
+984 989 1.66666666666667e-01
+984 988 -8.33333333333333e-02
+984 987 -2.50000000000000e-01
+984 716 8.33333333333333e-02
+984 1082 -1.66666666666667e-01
+984 1081 8.33333333333333e-02
+984 997 8.33333333333333e-02
+984 1090 -8.33333333333333e-02
+984 842 4.16666666666667e-02
+984 1091 -8.33333333333333e-02
+984 715 8.33333333333333e-02
+984 841 -8.33333333333333e-02
+984 714 -3.75000000000000e-01
+984 839 -4.16666666666667e-02
+984 998 8.33333333333333e-02
+984 985 -1.66666666666667e-01
+984 838 8.33333333333333e-02
+984 703 8.33333333333333e-02
+984 962 -4.16666666666667e-02
+984 837 -1.25000000000000e-01
+984 702 -3.75000000000000e-01
+985 985 1.25000000000000e+00
+985 986 -1.66666666666667e-01
+985 704 -4.16666666666667e-02
+985 953 4.16666666666667e-02
+985 951 -8.33333333333333e-02
+985 716 -4.16666666666667e-02
+985 961 -3.75000000000000e-01
+985 960 8.33333333333333e-02
+985 1082 8.33333333333333e-02
+985 989 1.66666666666667e-01
+985 988 -2.50000000000000e-01
+985 987 -8.33333333333333e-02
+985 1080 8.33333333333333e-02
+985 996 8.33333333333333e-02
+985 1089 -8.33333333333333e-02
+985 842 4.16666666666667e-02
+985 1091 -8.33333333333333e-02
+985 715 -1.25000000000000e-01
+985 714 8.33333333333333e-02
+985 840 -8.33333333333333e-02
+985 839 8.33333333333333e-02
+985 998 -1.66666666666667e-01
+985 962 8.33333333333333e-02
+985 838 -3.75000000000000e-01
+985 703 -1.25000000000000e-01
+985 984 -1.66666666666667e-01
+985 837 8.33333333333333e-02
+985 702 8.33333333333333e-02
+986 986 1.25000000000000e+00
+986 985 -1.66666666666667e-01
+986 960 -4.16666666666667e-02
+986 951 4.16666666666667e-02
+986 703 -4.16666666666667e-02
+986 952 4.16666666666667e-02
+986 962 -1.25000000000000e-01
+986 715 -4.16666666666667e-02
+986 1081 8.33333333333333e-02
+986 989 -7.50000000000000e-01
+986 988 1.66666666666667e-01
+986 702 8.33333333333333e-02
+986 984 -1.66666666666667e-01
+986 987 1.66666666666667e-01
+986 714 8.33333333333333e-02
+986 1080 -1.66666666666667e-01
+986 841 4.16666666666667e-02
+986 1090 -8.33333333333333e-02
+986 716 -1.25000000000000e-01
+986 840 4.16666666666667e-02
+986 1089 -8.33333333333333e-02
+986 961 8.33333333333333e-02
+986 839 -1.25000000000000e-01
+986 704 -1.25000000000000e-01
+986 838 8.33333333333333e-02
+986 997 -1.66666666666667e-01
+986 837 -4.16666666666667e-02
+986 996 8.33333333333333e-02
+987 987 2.50000000000000e+00
+987 958 -1.66666666666667e-01
+987 953 -8.33333333333333e-02
+987 961 8.33333333333333e-02
+987 952 -8.33333333333333e-02
+987 962 8.33333333333333e-02
+987 968 -8.33333333333333e-02
+987 967 1.66666666666667e-01
+987 966 -2.50000000000000e-01
+987 1091 8.33333333333333e-02
+987 1090 -1.66666666666667e-01
+987 1081 1.66666666666667e-01
+987 986 1.66666666666667e-01
+987 703 8.33333333333333e-02
+987 985 -8.33333333333333e-02
+987 984 -2.50000000000000e-01
+987 1082 1.66666666666667e-01
+987 727 8.33333333333333e-02
+987 1080 -7.50000000000000e-01
+987 989 -3.33333333333333e-01
+987 1042 -8.33333333333333e-02
+987 998 -8.33333333333333e-02
+987 1048 8.33333333333333e-02
+987 1153 -8.33333333333333e-02
+987 1049 8.33333333333333e-02
+987 1154 -8.33333333333333e-02
+987 704 -1.66666666666667e-01
+987 983 1.66666666666667e-01
+987 997 1.66666666666667e-01
+987 982 1.66666666666667e-01
+987 988 -3.33333333333333e-01
+987 996 -2.50000000000000e-01
+987 981 -7.50000000000000e-01
+987 1043 1.66666666666667e-01
+987 728 -1.66666666666667e-01
+987 959 8.33333333333333e-02
+987 1041 -2.50000000000000e-01
+988 988 2.50000000000000e+00
+988 957 -1.66666666666667e-01
+988 960 8.33333333333333e-02
+988 951 -8.33333333333333e-02
+988 962 -1.66666666666667e-01
+988 968 1.66666666666667e-01
+988 953 -8.33333333333333e-02
+988 967 -7.50000000000000e-01
+988 966 1.66666666666667e-01
+988 1091 8.33333333333333e-02
+988 1082 -8.33333333333333e-02
+988 1089 -1.66666666666667e-01
+988 1080 1.66666666666667e-01
+988 986 1.66666666666667e-01
+988 989 -3.33333333333333e-01
+988 985 -2.50000000000000e-01
+988 702 8.33333333333333e-02
+988 984 -8.33333333333333e-02
+988 1081 -2.50000000000000e-01
+988 726 8.33333333333333e-02
+988 1041 -8.33333333333333e-02
+988 998 1.66666666666667e-01
+988 1047 8.33333333333333e-02
+988 1152 -8.33333333333333e-02
+988 1049 -1.66666666666667e-01
+988 1043 1.66666666666667e-01
+988 704 8.33333333333333e-02
+988 983 -8.33333333333333e-02
+988 997 -7.50000000000000e-01
+988 982 -2.50000000000000e-01
+988 996 1.66666666666667e-01
+988 981 1.66666666666667e-01
+988 987 -3.33333333333333e-01
+988 1154 -8.33333333333333e-02
+988 728 8.33333333333333e-02
+988 959 8.33333333333333e-02
+988 1042 -2.50000000000000e-01
+989 989 2.50000000000000e+00
+989 957 8.33333333333333e-02
+989 951 -8.33333333333333e-02
+989 961 -1.66666666666667e-01
+989 967 1.66666666666667e-01
+989 960 8.33333333333333e-02
+989 966 -8.33333333333333e-02
+989 952 -8.33333333333333e-02
+989 968 -2.50000000000000e-01
+989 1090 8.33333333333333e-02
+989 1081 -8.33333333333333e-02
+989 1089 8.33333333333333e-02
+989 986 -7.50000000000000e-01
+989 985 1.66666666666667e-01
+989 988 -3.33333333333333e-01
+989 984 1.66666666666667e-01
+989 1082 -2.50000000000000e-01
+989 1080 1.66666666666667e-01
+989 987 -3.33333333333333e-01
+989 996 -8.33333333333333e-02
+989 997 1.66666666666667e-01
+989 1048 -1.66666666666667e-01
+989 1042 1.66666666666667e-01
+989 1047 8.33333333333333e-02
+989 1152 -8.33333333333333e-02
+989 998 -2.50000000000000e-01
+989 983 -2.50000000000000e-01
+989 703 8.33333333333333e-02
+989 982 -8.33333333333333e-02
+989 702 -1.66666666666667e-01
+989 981 1.66666666666667e-01
+989 958 8.33333333333333e-02
+989 1043 -7.50000000000000e-01
+989 1153 -8.33333333333333e-02
+989 727 8.33333333333333e-02
+989 1041 1.66666666666667e-01
+989 726 -1.66666666666667e-01
+990 990 1.25000000000000e+00
+990 977 8.33333333333333e-02
+990 971 4.16666666666667e-02
+990 704 -4.16666666666667e-02
+990 970 -8.33333333333333e-02
+990 743 -4.16666666666667e-02
+990 976 8.33333333333333e-02
+990 975 -3.75000000000000e-01
+990 1205 8.33333333333333e-02
+990 1204 8.33333333333333e-02
+990 995 1.66666666666667e-01
+990 994 -8.33333333333333e-02
+990 993 -2.50000000000000e-01
+990 997 8.33333333333333e-02
+990 1207 -8.33333333333333e-02
+990 845 4.16666666666667e-02
+990 1208 -8.33333333333333e-02
+990 844 -8.33333333333333e-02
+990 742 8.33333333333333e-02
+990 741 -1.25000000000000e-01
+990 839 8.33333333333333e-02
+990 998 -1.66666666666667e-01
+990 838 8.33333333333333e-02
+990 991 -1.66666666666667e-01
+990 703 8.33333333333333e-02
+990 837 -3.75000000000000e-01
+990 992 -1.66666666666667e-01
+990 702 -1.25000000000000e-01
+991 991 1.25000000000000e+00
+991 971 4.16666666666667e-02
+991 969 -8.33333333333333e-02
+991 976 -1.25000000000000e-01
+991 975 8.33333333333333e-02
+991 743 8.33333333333333e-02
+991 1205 -1.66666666666667e-01
+991 1203 8.33333333333333e-02
+991 992 -1.66666666666667e-01
+991 704 8.33333333333333e-02
+991 995 1.66666666666667e-01
+991 994 -2.50000000000000e-01
+991 993 -8.33333333333333e-02
+991 996 8.33333333333333e-02
+991 1206 -8.33333333333333e-02
+991 845 4.16666666666667e-02
+991 1208 -8.33333333333333e-02
+991 742 -3.75000000000000e-01
+991 843 -8.33333333333333e-02
+991 741 8.33333333333333e-02
+991 839 -4.16666666666667e-02
+991 998 8.33333333333333e-02
+991 838 -1.25000000000000e-01
+991 977 -4.16666666666667e-02
+991 703 -3.75000000000000e-01
+991 837 8.33333333333333e-02
+991 990 -1.66666666666667e-01
+991 702 8.33333333333333e-02
+992 992 1.25000000000000e+00
+992 970 4.16666666666667e-02
+992 990 -1.66666666666667e-01
+992 975 8.33333333333333e-02
+992 969 4.16666666666667e-02
+992 702 -4.16666666666667e-02
+992 977 -1.25000000000000e-01
+992 741 -4.16666666666667e-02
+992 1203 8.33333333333333e-02
+992 742 8.33333333333333e-02
+992 1204 -1.66666666666667e-01
+992 995 -7.50000000000000e-01
+992 991 -1.66666666666667e-01
+992 703 8.33333333333333e-02
+992 994 1.66666666666667e-01
+992 993 1.66666666666667e-01
+992 843 4.16666666666667e-02
+992 1206 -8.33333333333333e-02
+992 743 -1.25000000000000e-01
+992 844 4.16666666666667e-02
+992 1207 -8.33333333333333e-02
+992 839 -1.25000000000000e-01
+992 976 -4.16666666666667e-02
+992 704 -1.25000000000000e-01
+992 838 -4.16666666666667e-02
+992 997 8.33333333333333e-02
+992 837 8.33333333333333e-02
+992 996 -1.66666666666667e-01
+993 993 2.50000000000000e+00
+993 973 -1.66666666666667e-01
+993 970 -8.33333333333333e-02
+993 976 8.33333333333333e-02
+993 980 1.66666666666667e-01
+993 977 -1.66666666666667e-01
+993 971 -8.33333333333333e-02
+993 979 1.66666666666667e-01
+993 978 -7.50000000000000e-01
+993 1208 8.33333333333333e-02
+993 1205 -8.33333333333333e-02
+993 1204 1.66666666666667e-01
+993 1207 -1.66666666666667e-01
+993 992 1.66666666666667e-01
+993 995 -3.33333333333333e-01
+993 991 -8.33333333333333e-02
+993 703 8.33333333333333e-02
+993 990 -2.50000000000000e-01
+993 745 8.33333333333333e-02
+993 1203 -2.50000000000000e-01
+993 1045 -8.33333333333333e-02
+993 998 1.66666666666667e-01
+993 1048 8.33333333333333e-02
+993 1216 -8.33333333333333e-02
+993 1049 -1.66666666666667e-01
+993 1046 1.66666666666667e-01
+993 704 8.33333333333333e-02
+993 983 -8.33333333333333e-02
+993 997 1.66666666666667e-01
+993 982 1.66666666666667e-01
+993 994 -3.33333333333333e-01
+993 996 -7.50000000000000e-01
+993 981 -2.50000000000000e-01
+993 1217 -8.33333333333333e-02
+993 746 8.33333333333333e-02
+993 974 8.33333333333333e-02
+993 1044 -2.50000000000000e-01
+994 994 2.50000000000000e+00
+994 972 -1.66666666666667e-01
+994 971 -8.33333333333333e-02
+994 969 -8.33333333333333e-02
+994 975 8.33333333333333e-02
+994 980 -8.33333333333333e-02
+994 977 8.33333333333333e-02
+994 979 -2.50000000000000e-01
+994 978 1.66666666666667e-01
+994 1208 8.33333333333333e-02
+994 1203 1.66666666666667e-01
+994 1206 -1.66666666666667e-01
+994 992 1.66666666666667e-01
+994 991 -2.50000000000000e-01
+994 990 -8.33333333333333e-02
+994 702 8.33333333333333e-02
+994 1205 1.66666666666667e-01
+994 1204 -7.50000000000000e-01
+994 744 8.33333333333333e-02
+994 995 -3.33333333333333e-01
+994 1044 -8.33333333333333e-02
+994 998 -8.33333333333333e-02
+994 1047 8.33333333333333e-02
+994 1215 -8.33333333333333e-02
+994 1217 -8.33333333333333e-02
+994 1049 8.33333333333333e-02
+994 704 -1.66666666666667e-01
+994 983 1.66666666666667e-01
+994 997 -2.50000000000000e-01
+994 982 -7.50000000000000e-01
+994 996 1.66666666666667e-01
+994 981 1.66666666666667e-01
+994 993 -3.33333333333333e-01
+994 1046 1.66666666666667e-01
+994 746 -1.66666666666667e-01
+994 974 8.33333333333333e-02
+994 1045 -2.50000000000000e-01
+995 995 2.50000000000000e+00
+995 973 8.33333333333333e-02
+995 970 -8.33333333333333e-02
+995 979 -8.33333333333333e-02
+995 976 8.33333333333333e-02
+995 978 1.66666666666667e-01
+995 975 -1.66666666666667e-01
+995 969 -8.33333333333333e-02
+995 980 -2.50000000000000e-01
+995 1206 8.33333333333333e-02
+995 1203 -8.33333333333333e-02
+995 1207 8.33333333333333e-02
+995 992 -7.50000000000000e-01
+995 991 1.66666666666667e-01
+995 990 1.66666666666667e-01
+995 993 -3.33333333333333e-01
+995 1205 -2.50000000000000e-01
+995 1204 1.66666666666667e-01
+995 994 -3.33333333333333e-01
+995 997 -8.33333333333333e-02
+995 996 1.66666666666667e-01
+995 1216 -8.33333333333333e-02
+995 1048 8.33333333333333e-02
+995 1047 -1.66666666666667e-01
+995 1044 1.66666666666667e-01
+995 998 -2.50000000000000e-01
+995 983 -2.50000000000000e-01
+995 703 -1.66666666666667e-01
+995 982 1.66666666666667e-01
+995 702 8.33333333333333e-02
+995 981 -8.33333333333333e-02
+995 972 8.33333333333333e-02
+995 1046 -7.50000000000000e-01
+995 1045 1.66666666666667e-01
+995 745 -1.66666666666667e-01
+995 1215 -8.33333333333333e-02
+995 744 8.33333333333333e-02
+996 996 2.50000000000000e+00
+996 1216 8.33333333333333e-02
+996 1217 8.33333333333333e-02
+996 994 1.66666666666667e-01
+996 993 -7.50000000000000e-01
+996 991 8.33333333333333e-02
+996 1208 -8.33333333333333e-02
+996 992 -1.66666666666667e-01
+996 1207 1.66666666666667e-01
+996 1206 -2.50000000000000e-01
+996 997 -3.33333333333333e-01
+996 703 -8.33333333333333e-02
+996 751 -8.33333333333333e-02
+996 983 8.33333333333333e-02
+996 989 -8.33333333333333e-02
+996 1048 -8.33333333333333e-02
+996 1153 8.33333333333333e-02
+996 982 -1.66666666666667e-01
+996 988 1.66666666666667e-01
+996 987 -2.50000000000000e-01
+996 1049 1.66666666666667e-01
+996 1154 -1.66666666666667e-01
+996 1047 -2.50000000000000e-01
+996 838 -8.33333333333333e-02
+996 985 8.33333333333333e-02
+996 839 1.66666666666667e-01
+996 998 -3.33333333333333e-01
+996 1091 1.66666666666667e-01
+996 986 8.33333333333333e-02
+996 704 -8.33333333333333e-02
+996 837 -2.50000000000000e-01
+996 851 8.33333333333333e-02
+996 752 -8.33333333333333e-02
+996 1090 1.66666666666667e-01
+996 850 -1.66666666666667e-01
+996 1089 -7.50000000000000e-01
+996 995 1.66666666666667e-01
+997 997 2.50000000000000e+00
+997 1215 8.33333333333333e-02
+997 1217 -1.66666666666667e-01
+997 994 -2.50000000000000e-01
+997 993 1.66666666666667e-01
+997 990 8.33333333333333e-02
+997 1208 1.66666666666667e-01
+997 992 8.33333333333333e-02
+997 1207 -7.50000000000000e-01
+997 1206 1.66666666666667e-01
+997 996 -3.33333333333333e-01
+997 702 -8.33333333333333e-02
+997 750 -8.33333333333333e-02
+997 1049 1.66666666666667e-01
+997 998 -3.33333333333333e-01
+997 989 1.66666666666667e-01
+997 1047 -8.33333333333333e-02
+997 1152 8.33333333333333e-02
+997 704 -8.33333333333333e-02
+997 983 8.33333333333333e-02
+997 988 -7.50000000000000e-01
+997 981 -1.66666666666667e-01
+997 987 1.66666666666667e-01
+997 752 -8.33333333333333e-02
+997 1154 8.33333333333333e-02
+997 1048 -2.50000000000000e-01
+997 837 -8.33333333333333e-02
+997 984 8.33333333333333e-02
+997 851 8.33333333333333e-02
+997 1091 -8.33333333333333e-02
+997 986 -1.66666666666667e-01
+997 839 1.66666666666667e-01
+997 838 -2.50000000000000e-01
+997 1090 -2.50000000000000e-01
+997 995 -8.33333333333333e-02
+997 1089 1.66666666666667e-01
+997 849 -1.66666666666667e-01
+998 998 2.50000000000000e+00
+998 993 1.66666666666667e-01
+998 1216 -1.66666666666667e-01
+998 1215 8.33333333333333e-02
+998 995 -2.50000000000000e-01
+998 1207 1.66666666666667e-01
+998 1206 -8.33333333333333e-02
+998 991 8.33333333333333e-02
+998 990 -1.66666666666667e-01
+998 1208 -2.50000000000000e-01
+998 981 8.33333333333333e-02
+998 987 -8.33333333333333e-02
+998 1048 1.66666666666667e-01
+998 997 -3.33333333333333e-01
+998 988 1.66666666666667e-01
+998 989 -2.50000000000000e-01
+998 703 -8.33333333333333e-02
+998 982 8.33333333333333e-02
+998 1049 -7.50000000000000e-01
+998 751 -8.33333333333333e-02
+998 1153 8.33333333333333e-02
+998 1047 1.66666666666667e-01
+998 1152 -1.66666666666667e-01
+998 850 8.33333333333333e-02
+998 1090 -8.33333333333333e-02
+998 837 1.66666666666667e-01
+998 996 -3.33333333333333e-01
+998 1089 1.66666666666667e-01
+998 839 -7.50000000000000e-01
+998 985 -1.66666666666667e-01
+998 838 1.66666666666667e-01
+998 984 8.33333333333333e-02
+998 702 -8.33333333333333e-02
+998 1091 -2.50000000000000e-01
+998 994 -8.33333333333333e-02
+998 849 8.33333333333333e-02
+998 750 -8.33333333333333e-02
+999 999 1.25000000000000e+00
+999 1025 -8.33333333333333e-02
+999 1022 -8.33333333333333e-02
+999 1021 4.16666666666667e-02
+999 1024 -8.33333333333333e-02
+999 1007 8.33333333333333e-02
+999 1006 -4.16666666666667e-02
+999 1009 8.33333333333333e-02
+999 1005 -1.25000000000000e-01
+999 790 -4.16666666666667e-02
+999 1013 8.33333333333333e-02
+999 1004 -8.33333333333333e-02
+999 1000 -1.66666666666667e-01
+999 1003 1.66666666666667e-01
+999 1002 -2.50000000000000e-01
+999 1001 -1.66666666666667e-01
+999 707 8.33333333333333e-02
+999 791 8.33333333333333e-02
+999 706 8.33333333333333e-02
+999 1012 -1.66666666666667e-01
+999 1010 8.33333333333333e-02
+999 705 -3.75000000000000e-01
+999 789 -1.25000000000000e-01
+999 187 4.16666666666667e-02
+999 83 8.33333333333333e-02
+999 188 -8.33333333333333e-02
+999 82 8.33333333333333e-02
+999 81 -3.75000000000000e-01
+1000 1000 1.25000000000000e+00
+1000 1025 -8.33333333333333e-02
+1000 1020 4.16666666666667e-02
+1000 1023 -8.33333333333333e-02
+1000 1007 8.33333333333333e-02
+1000 1010 -1.66666666666667e-01
+1000 1006 -1.25000000000000e-01
+1000 1005 -4.16666666666667e-02
+1000 1008 8.33333333333333e-02
+1000 789 -4.16666666666667e-02
+1000 791 8.33333333333333e-02
+1000 1001 -1.66666666666667e-01
+1000 1004 1.66666666666667e-01
+1000 1003 -7.50000000000000e-01
+1000 999 -1.66666666666667e-01
+1000 1002 1.66666666666667e-01
+1000 707 -4.16666666666667e-02
+1000 1013 8.33333333333333e-02
+1000 1022 4.16666666666667e-02
+1000 706 -1.25000000000000e-01
+1000 790 -1.25000000000000e-01
+1000 705 8.33333333333333e-02
+1000 1011 -1.66666666666667e-01
+1000 186 4.16666666666667e-02
+1000 83 -4.16666666666667e-02
+1000 188 4.16666666666667e-02
+1000 82 -1.25000000000000e-01
+1000 81 8.33333333333333e-02
+1001 1001 1.25000000000000e+00
+1001 1024 -8.33333333333333e-02
+1001 1008 8.33333333333333e-02
+1001 1023 -8.33333333333333e-02
+1001 1020 -8.33333333333333e-02
+1001 1007 -3.75000000000000e-01
+1001 1006 8.33333333333333e-02
+1001 1009 -1.66666666666667e-01
+1001 1005 8.33333333333333e-02
+1001 790 8.33333333333333e-02
+1001 1000 -1.66666666666667e-01
+1001 1003 1.66666666666667e-01
+1001 1011 8.33333333333333e-02
+1001 1002 -8.33333333333333e-02
+1001 1004 -2.50000000000000e-01
+1001 1021 4.16666666666667e-02
+1001 707 -1.25000000000000e-01
+1001 791 -3.75000000000000e-01
+1001 706 -4.16666666666667e-02
+1001 1012 8.33333333333333e-02
+1001 999 -1.66666666666667e-01
+1001 705 8.33333333333333e-02
+1001 789 8.33333333333333e-02
+1001 83 -1.25000000000000e-01
+1001 82 -4.16666666666667e-02
+1001 187 4.16666666666667e-02
+1001 81 8.33333333333333e-02
+1001 186 -8.33333333333333e-02
+1002 1002 2.50000000000000e+00
+1002 1037 8.33333333333333e-02
+1002 1031 -8.33333333333333e-02
+1002 1030 1.66666666666667e-01
+1002 1029 -2.50000000000000e-01
+1002 1009 -8.33333333333333e-02
+1002 1051 -8.33333333333333e-02
+1002 1024 8.33333333333333e-02
+1002 1010 1.66666666666667e-01
+1002 1025 -1.66666666666667e-01
+1002 710 8.33333333333333e-02
+1002 1052 -8.33333333333333e-02
+1002 1008 -2.50000000000000e-01
+1002 791 8.33333333333333e-02
+1002 1001 -8.33333333333333e-02
+1002 1003 -3.33333333333333e-01
+1002 790 8.33333333333333e-02
+1002 793 -8.33333333333333e-02
+1002 1000 1.66666666666667e-01
+1002 999 -2.50000000000000e-01
+1002 1004 -3.33333333333333e-01
+1002 1013 1.66666666666667e-01
+1002 794 1.66666666666667e-01
+1002 1012 1.66666666666667e-01
+1002 709 -1.66666666666667e-01
+1002 1036 8.33333333333333e-02
+1002 1011 -7.50000000000000e-01
+1002 792 -2.50000000000000e-01
+1002 593 1.66666666666667e-01
+1002 191 -1.66666666666667e-01
+1002 190 8.33333333333333e-02
+1002 592 1.66666666666667e-01
+1002 591 -7.50000000000000e-01
+1002 83 8.33333333333333e-02
+1002 188 -8.33333333333333e-02
+1002 187 -8.33333333333333e-02
+1002 82 -1.66666666666667e-01
+1003 1003 2.50000000000000e+00
+1003 1037 -1.66666666666667e-01
+1003 1031 1.66666666666667e-01
+1003 1030 -7.50000000000000e-01
+1003 1029 1.66666666666667e-01
+1003 1008 -8.33333333333333e-02
+1003 1050 -8.33333333333333e-02
+1003 1023 8.33333333333333e-02
+1003 1052 -8.33333333333333e-02
+1003 1025 8.33333333333333e-02
+1003 1004 -3.33333333333333e-01
+1003 1010 1.66666666666667e-01
+1003 1009 -2.50000000000000e-01
+1003 1001 1.66666666666667e-01
+1003 1002 -3.33333333333333e-01
+1003 791 -1.66666666666667e-01
+1003 794 1.66666666666667e-01
+1003 789 8.33333333333333e-02
+1003 792 -8.33333333333333e-02
+1003 1000 -7.50000000000000e-01
+1003 999 1.66666666666667e-01
+1003 1013 -8.33333333333333e-02
+1003 710 8.33333333333333e-02
+1003 1035 8.33333333333333e-02
+1003 1012 -2.50000000000000e-01
+1003 793 -2.50000000000000e-01
+1003 1011 1.66666666666667e-01
+1003 708 -1.66666666666667e-01
+1003 593 -8.33333333333333e-02
+1003 191 8.33333333333333e-02
+1003 189 8.33333333333333e-02
+1003 592 -2.50000000000000e-01
+1003 591 1.66666666666667e-01
+1003 186 -8.33333333333333e-02
+1003 83 8.33333333333333e-02
+1003 188 -8.33333333333333e-02
+1003 81 -1.66666666666667e-01
+1004 1004 2.50000000000000e+00
+1004 1035 8.33333333333333e-02
+1004 1031 -2.50000000000000e-01
+1004 1030 1.66666666666667e-01
+1004 1029 -8.33333333333333e-02
+1004 1051 -8.33333333333333e-02
+1004 1024 8.33333333333333e-02
+1004 1008 1.66666666666667e-01
+1004 1023 -1.66666666666667e-01
+1004 708 8.33333333333333e-02
+1004 1050 -8.33333333333333e-02
+1004 1010 -7.50000000000000e-01
+1004 1003 -3.33333333333333e-01
+1004 1009 1.66666666666667e-01
+1004 1000 1.66666666666667e-01
+1004 789 8.33333333333333e-02
+1004 999 -8.33333333333333e-02
+1004 790 -1.66666666666667e-01
+1004 793 1.66666666666667e-01
+1004 1001 -2.50000000000000e-01
+1004 1036 -1.66666666666667e-01
+1004 1013 -2.50000000000000e-01
+1004 794 -7.50000000000000e-01
+1004 1012 -8.33333333333333e-02
+1004 709 8.33333333333333e-02
+1004 1002 -3.33333333333333e-01
+1004 1011 1.66666666666667e-01
+1004 792 1.66666666666667e-01
+1004 592 -8.33333333333333e-02
+1004 190 8.33333333333333e-02
+1004 591 1.66666666666667e-01
+1004 189 -1.66666666666667e-01
+1004 593 -2.50000000000000e-01
+1004 81 8.33333333333333e-02
+1004 186 -8.33333333333333e-02
+1004 82 8.33333333333333e-02
+1004 187 -8.33333333333333e-02
+1005 1005 1.25000000000000e+00
+1005 1025 8.33333333333333e-02
+1005 1024 -1.66666666666667e-01
+1005 1001 8.33333333333333e-02
+1005 1000 -4.16666666666667e-02
+1005 999 -1.25000000000000e-01
+1005 1022 8.33333333333333e-02
+1005 760 4.16666666666667e-02
+1005 1020 -3.75000000000000e-01
+1005 1010 -8.33333333333333e-02
+1005 1007 -1.66666666666667e-01
+1005 868 -4.16666666666667e-02
+1005 1241 -8.33333333333333e-02
+1005 872 8.33333333333333e-02
+1005 1240 -8.33333333333333e-02
+1005 871 8.33333333333333e-02
+1005 869 8.33333333333333e-02
+1005 761 -8.33333333333333e-02
+1005 867 -1.25000000000000e-01
+1005 1006 -1.66666666666667e-01
+1005 1009 1.66666666666667e-01
+1005 1021 8.33333333333333e-02
+1005 1008 -2.50000000000000e-01
+1005 82 4.16666666666667e-02
+1005 269 8.33333333333333e-02
+1005 83 -8.33333333333333e-02
+1005 268 8.33333333333333e-02
+1005 267 -3.75000000000000e-01
+1006 1006 1.25000000000000e+00
+1006 1020 8.33333333333333e-02
+1006 1025 8.33333333333333e-02
+1006 1023 -1.66666666666667e-01
+1006 1001 8.33333333333333e-02
+1006 1007 -1.66666666666667e-01
+1006 1000 -1.25000000000000e-01
+1006 999 -4.16666666666667e-02
+1006 1021 -1.25000000000000e-01
+1006 759 4.16666666666667e-02
+1006 867 -4.16666666666667e-02
+1006 869 8.33333333333333e-02
+1006 1010 1.66666666666667e-01
+1006 872 -1.66666666666667e-01
+1006 1239 -8.33333333333333e-02
+1006 870 8.33333333333333e-02
+1006 761 4.16666666666667e-02
+1006 1241 -8.33333333333333e-02
+1006 868 -1.25000000000000e-01
+1006 1022 -4.16666666666667e-02
+1006 1009 -7.50000000000000e-01
+1006 1005 -1.66666666666667e-01
+1006 1008 1.66666666666667e-01
+1006 81 4.16666666666667e-02
+1006 269 -4.16666666666667e-02
+1006 83 4.16666666666667e-02
+1006 268 -1.25000000000000e-01
+1006 267 8.33333333333333e-02
+1007 1007 1.25000000000000e+00
+1007 1023 8.33333333333333e-02
+1007 1024 8.33333333333333e-02
+1007 1001 -3.75000000000000e-01
+1007 1000 8.33333333333333e-02
+1007 1006 -1.66666666666667e-01
+1007 999 8.33333333333333e-02
+1007 1022 -1.25000000000000e-01
+1007 1020 8.33333333333333e-02
+1007 1008 -8.33333333333333e-02
+1007 1005 -1.66666666666667e-01
+1007 868 8.33333333333333e-02
+1007 1239 -8.33333333333333e-02
+1007 870 8.33333333333333e-02
+1007 1009 1.66666666666667e-01
+1007 871 -1.66666666666667e-01
+1007 869 -3.75000000000000e-01
+1007 760 4.16666666666667e-02
+1007 1240 -8.33333333333333e-02
+1007 867 8.33333333333333e-02
+1007 759 -8.33333333333333e-02
+1007 1021 -4.16666666666667e-02
+1007 1010 -2.50000000000000e-01
+1007 269 -1.25000000000000e-01
+1007 268 -4.16666666666667e-02
+1007 82 4.16666666666667e-02
+1007 267 8.33333333333333e-02
+1007 81 -8.33333333333333e-02
+1008 1008 2.50000000000000e+00
+1008 1036 1.66666666666667e-01
+1008 1035 -2.50000000000000e-01
+1008 1246 8.33333333333333e-02
+1008 1247 8.33333333333333e-02
+1008 1003 -8.33333333333333e-02
+1008 1004 1.66666666666667e-01
+1008 1010 -3.33333333333333e-01
+1008 1002 -2.50000000000000e-01
+1008 1052 8.33333333333333e-02
+1008 764 -8.33333333333333e-02
+1008 1051 -1.66666666666667e-01
+1008 1001 8.33333333333333e-02
+1008 1009 -3.33333333333333e-01
+1008 1024 1.66666666666667e-01
+1008 1000 8.33333333333333e-02
+1008 1025 1.66666666666667e-01
+1008 763 -8.33333333333333e-02
+1008 1023 -7.50000000000000e-01
+1008 1007 -8.33333333333333e-02
+1008 1240 8.33333333333333e-02
+1008 871 -8.33333333333333e-02
+1008 1006 1.66666666666667e-01
+1008 1005 -2.50000000000000e-01
+1008 872 1.66666666666667e-01
+1008 1241 -1.66666666666667e-01
+1008 870 -2.50000000000000e-01
+1008 1037 -8.33333333333333e-02
+1008 593 -1.66666666666667e-01
+1008 592 8.33333333333333e-02
+1008 596 1.66666666666667e-01
+1008 595 1.66666666666667e-01
+1008 594 -7.50000000000000e-01
+1008 83 -8.33333333333333e-02
+1008 82 -8.33333333333333e-02
+1008 269 8.33333333333333e-02
+1008 268 -1.66666666666667e-01
+1009 1009 2.50000000000000e+00
+1009 1035 1.66666666666667e-01
+1009 1037 1.66666666666667e-01
+1009 1036 -7.50000000000000e-01
+1009 1245 8.33333333333333e-02
+1009 1247 -1.66666666666667e-01
+1009 1002 -8.33333333333333e-02
+1009 1052 8.33333333333333e-02
+1009 1004 1.66666666666667e-01
+1009 1003 -2.50000000000000e-01
+1009 1050 -1.66666666666667e-01
+1009 1025 -8.33333333333333e-02
+1009 1008 -3.33333333333333e-01
+1009 1023 1.66666666666667e-01
+1009 1001 -1.66666666666667e-01
+1009 999 8.33333333333333e-02
+1009 1024 -2.50000000000000e-01
+1009 762 -8.33333333333333e-02
+1009 1007 1.66666666666667e-01
+1009 1010 -3.33333333333333e-01
+1009 872 1.66666666666667e-01
+1009 1239 8.33333333333333e-02
+1009 870 -8.33333333333333e-02
+1009 1006 -7.50000000000000e-01
+1009 1005 1.66666666666667e-01
+1009 1241 8.33333333333333e-02
+1009 764 -8.33333333333333e-02
+1009 871 -2.50000000000000e-01
+1009 591 8.33333333333333e-02
+1009 596 -8.33333333333333e-02
+1009 595 -2.50000000000000e-01
+1009 594 1.66666666666667e-01
+1009 81 -8.33333333333333e-02
+1009 269 8.33333333333333e-02
+1009 83 -8.33333333333333e-02
+1009 267 -1.66666666666667e-01
+1009 593 8.33333333333333e-02
+1010 1010 2.50000000000000e+00
+1010 1035 -8.33333333333333e-02
+1010 1037 -2.50000000000000e-01
+1010 1036 1.66666666666667e-01
+1010 1246 -1.66666666666667e-01
+1010 1245 8.33333333333333e-02
+1010 1051 8.33333333333333e-02
+1010 1002 1.66666666666667e-01
+1010 1008 -3.33333333333333e-01
+1010 1004 -7.50000000000000e-01
+1010 1003 1.66666666666667e-01
+1010 1050 8.33333333333333e-02
+1010 762 -8.33333333333333e-02
+1010 999 8.33333333333333e-02
+1010 1024 -8.33333333333333e-02
+1010 1000 -1.66666666666667e-01
+1010 1025 -2.50000000000000e-01
+1010 1023 1.66666666666667e-01
+1010 1005 -8.33333333333333e-02
+1010 1006 1.66666666666667e-01
+1010 1009 -3.33333333333333e-01
+1010 871 1.66666666666667e-01
+1010 1007 -2.50000000000000e-01
+1010 872 -7.50000000000000e-01
+1010 1240 8.33333333333333e-02
+1010 763 -8.33333333333333e-02
+1010 870 1.66666666666667e-01
+1010 1239 -1.66666666666667e-01
+1010 591 -1.66666666666667e-01
+1010 595 -8.33333333333333e-02
+1010 594 1.66666666666667e-01
+1010 596 -2.50000000000000e-01
+1010 81 -8.33333333333333e-02
+1010 267 8.33333333333333e-02
+1010 268 8.33333333333333e-02
+1010 82 -8.33333333333333e-02
+1010 592 8.33333333333333e-02
+1011 1011 2.50000000000000e+00
+1011 1043 8.33333333333333e-02
+1011 1042 -1.66666666666667e-01
+1011 1018 1.66666666666667e-01
+1011 1017 -7.50000000000000e-01
+1011 956 8.33333333333333e-02
+1011 955 8.33333333333333e-02
+1011 959 1.66666666666667e-01
+1011 958 -8.33333333333333e-02
+1011 957 -2.50000000000000e-01
+1011 1013 -3.33333333333333e-01
+1011 707 -8.33333333333333e-02
+1011 710 -8.33333333333333e-02
+1011 1055 -8.33333333333333e-02
+1011 1052 8.33333333333333e-02
+1011 1028 -1.66666666666667e-01
+1011 1025 1.66666666666667e-01
+1011 1027 8.33333333333333e-02
+1011 1024 -8.33333333333333e-02
+1011 1023 -2.50000000000000e-01
+1011 1054 -8.33333333333333e-02
+1011 1051 8.33333333333333e-02
+1011 791 -8.33333333333333e-02
+1011 1001 8.33333333333333e-02
+1011 790 -8.33333333333333e-02
+1011 793 8.33333333333333e-02
+1011 1000 -1.66666666666667e-01
+1011 706 1.66666666666667e-01
+1011 705 -2.50000000000000e-01
+1011 1004 1.66666666666667e-01
+1011 794 -1.66666666666667e-01
+1011 1003 1.66666666666667e-01
+1011 1012 -3.33333333333333e-01
+1011 709 1.66666666666667e-01
+1011 1002 -7.50000000000000e-01
+1011 1019 1.66666666666667e-01
+1011 708 -2.50000000000000e-01
+1012 1012 2.50000000000000e+00
+1012 1019 -8.33333333333333e-02
+1012 1041 -1.66666666666667e-01
+1012 1018 -2.50000000000000e-01
+1012 1017 1.66666666666667e-01
+1012 956 -1.66666666666667e-01
+1012 954 8.33333333333333e-02
+1012 959 1.66666666666667e-01
+1012 958 -2.50000000000000e-01
+1012 957 -8.33333333333333e-02
+1012 1055 -8.33333333333333e-02
+1012 1028 8.33333333333333e-02
+1012 707 1.66666666666667e-01
+1012 1013 -3.33333333333333e-01
+1012 1025 1.66666666666667e-01
+1012 1024 -2.50000000000000e-01
+1012 1026 8.33333333333333e-02
+1012 1023 -8.33333333333333e-02
+1012 710 1.66666666666667e-01
+1012 1052 -1.66666666666667e-01
+1012 1053 -8.33333333333333e-02
+1012 1050 8.33333333333333e-02
+1012 789 -8.33333333333333e-02
+1012 792 8.33333333333333e-02
+1012 1001 8.33333333333333e-02
+1012 791 -8.33333333333333e-02
+1012 706 -7.50000000000000e-01
+1012 999 -1.66666666666667e-01
+1012 705 1.66666666666667e-01
+1012 1004 -8.33333333333333e-02
+1012 794 8.33333333333333e-02
+1012 1003 -2.50000000000000e-01
+1012 1043 8.33333333333333e-02
+1012 709 -7.50000000000000e-01
+1012 1002 1.66666666666667e-01
+1012 1011 -3.33333333333333e-01
+1012 708 1.66666666666667e-01
+1013 1013 2.50000000000000e+00
+1013 1018 -8.33333333333333e-02
+1013 1017 1.66666666666667e-01
+1013 1041 8.33333333333333e-02
+1013 1019 -2.50000000000000e-01
+1013 954 8.33333333333333e-02
+1013 955 -1.66666666666667e-01
+1013 959 -7.50000000000000e-01
+1013 958 1.66666666666667e-01
+1013 957 1.66666666666667e-01
+1013 1011 -3.33333333333333e-01
+1013 705 -8.33333333333333e-02
+1013 708 -8.33333333333333e-02
+1013 1053 -8.33333333333333e-02
+1013 1050 8.33333333333333e-02
+1013 1054 -8.33333333333333e-02
+1013 1027 8.33333333333333e-02
+1013 1025 -7.50000000000000e-01
+1013 706 1.66666666666667e-01
+1013 1012 -3.33333333333333e-01
+1013 1024 1.66666666666667e-01
+1013 1026 -1.66666666666667e-01
+1013 1023 1.66666666666667e-01
+1013 709 1.66666666666667e-01
+1013 1051 -1.66666666666667e-01
+1013 789 -8.33333333333333e-02
+1013 999 8.33333333333333e-02
+1013 707 -2.50000000000000e-01
+1013 1000 8.33333333333333e-02
+1013 790 -8.33333333333333e-02
+1013 1004 -2.50000000000000e-01
+1013 1042 8.33333333333333e-02
+1013 710 -2.50000000000000e-01
+1013 1003 -8.33333333333333e-02
+1013 793 8.33333333333333e-02
+1013 1002 1.66666666666667e-01
+1013 792 -1.66666666666667e-01
+1014 1014 1.25000000000000e+00
+1014 1019 -8.33333333333333e-02
+1014 964 -4.16666666666667e-02
+1014 955 4.16666666666667e-02
+1014 965 8.33333333333333e-02
+1014 721 8.33333333333333e-02
+1014 1117 -1.66666666666667e-01
+1014 963 -1.25000000000000e-01
+1014 956 -8.33333333333333e-02
+1014 1015 -1.66666666666667e-01
+1014 1018 1.66666666666667e-01
+1014 706 8.33333333333333e-02
+1014 1017 -2.50000000000000e-01
+1014 1127 -8.33333333333333e-02
+1014 1028 8.33333333333333e-02
+1014 722 8.33333333333333e-02
+1014 878 -8.33333333333333e-02
+1014 877 4.16666666666667e-02
+1014 1126 -8.33333333333333e-02
+1014 720 -3.75000000000000e-01
+1014 1016 -1.66666666666667e-01
+1014 875 8.33333333333333e-02
+1014 707 8.33333333333333e-02
+1014 874 -4.16666666666667e-02
+1014 1027 8.33333333333333e-02
+1014 1118 8.33333333333333e-02
+1014 873 -1.25000000000000e-01
+1014 705 -3.75000000000000e-01
+1015 1015 1.25000000000000e+00
+1015 965 8.33333333333333e-02
+1015 1019 1.66666666666667e-01
+1015 963 -4.16666666666667e-02
+1015 954 4.16666666666667e-02
+1015 722 -4.16666666666667e-02
+1015 1118 8.33333333333333e-02
+1015 964 -1.25000000000000e-01
+1015 720 8.33333333333333e-02
+1015 1116 -1.66666666666667e-01
+1015 956 4.16666666666667e-02
+1015 707 -4.16666666666667e-02
+1015 1018 -7.50000000000000e-01
+1015 1014 -1.66666666666667e-01
+1015 1017 1.66666666666667e-01
+1015 705 8.33333333333333e-02
+1015 878 4.16666666666667e-02
+1015 1127 -8.33333333333333e-02
+1015 721 -1.25000000000000e-01
+1015 876 4.16666666666667e-02
+1015 1125 -8.33333333333333e-02
+1015 875 8.33333333333333e-02
+1015 1028 -1.66666666666667e-01
+1015 1016 -1.66666666666667e-01
+1015 874 -1.25000000000000e-01
+1015 706 -1.25000000000000e-01
+1015 873 -4.16666666666667e-02
+1015 1026 8.33333333333333e-02
+1016 1016 1.25000000000000e+00
+1016 1017 -8.33333333333333e-02
+1016 1015 -1.66666666666667e-01
+1016 964 8.33333333333333e-02
+1016 1018 1.66666666666667e-01
+1016 965 -3.75000000000000e-01
+1016 721 -4.16666666666667e-02
+1016 1117 8.33333333333333e-02
+1016 963 8.33333333333333e-02
+1016 1019 -2.50000000000000e-01
+1016 955 4.16666666666667e-02
+1016 706 -4.16666666666667e-02
+1016 954 -8.33333333333333e-02
+1016 877 4.16666666666667e-02
+1016 1126 -8.33333333333333e-02
+1016 1125 -8.33333333333333e-02
+1016 1026 8.33333333333333e-02
+1016 722 -1.25000000000000e-01
+1016 720 8.33333333333333e-02
+1016 876 -8.33333333333333e-02
+1016 1116 8.33333333333333e-02
+1016 875 -3.75000000000000e-01
+1016 707 -1.25000000000000e-01
+1016 874 8.33333333333333e-02
+1016 1027 -1.66666666666667e-01
+1016 1014 -1.66666666666667e-01
+1016 873 8.33333333333333e-02
+1016 705 8.33333333333333e-02
+1017 1017 2.50000000000000e+00
+1017 1054 8.33333333333333e-02
+1017 1159 -8.33333333333333e-02
+1017 1028 1.66666666666667e-01
+1017 1127 -1.66666666666667e-01
+1017 1027 -8.33333333333333e-02
+1017 1126 8.33333333333333e-02
+1017 1160 -8.33333333333333e-02
+1017 1026 -2.50000000000000e-01
+1017 965 8.33333333333333e-02
+1017 1016 -8.33333333333333e-02
+1017 964 8.33333333333333e-02
+1017 1118 1.66666666666667e-01
+1017 1019 -3.33333333333333e-01
+1017 1117 1.66666666666667e-01
+1017 1116 -7.50000000000000e-01
+1017 1015 1.66666666666667e-01
+1017 1014 -2.50000000000000e-01
+1017 1018 -3.33333333333333e-01
+1017 967 -8.33333333333333e-02
+1017 968 1.66666666666667e-01
+1017 959 -1.66666666666667e-01
+1017 1013 1.66666666666667e-01
+1017 955 -8.33333333333333e-02
+1017 958 8.33333333333333e-02
+1017 728 8.33333333333333e-02
+1017 1043 -8.33333333333333e-02
+1017 727 -1.66666666666667e-01
+1017 1042 1.66666666666667e-01
+1017 966 -2.50000000000000e-01
+1017 1041 -2.50000000000000e-01
+1017 956 -8.33333333333333e-02
+1017 707 8.33333333333333e-02
+1017 1012 1.66666666666667e-01
+1017 706 -1.66666666666667e-01
+1017 1055 8.33333333333333e-02
+1017 1011 -7.50000000000000e-01
+1018 1018 2.50000000000000e+00
+1018 1053 8.33333333333333e-02
+1018 1158 -8.33333333333333e-02
+1018 1160 -8.33333333333333e-02
+1018 1127 8.33333333333333e-02
+1018 1026 -8.33333333333333e-02
+1018 1125 8.33333333333333e-02
+1018 1028 1.66666666666667e-01
+1018 1027 -2.50000000000000e-01
+1018 1016 1.66666666666667e-01
+1018 965 -1.66666666666667e-01
+1018 963 8.33333333333333e-02
+1018 1118 -8.33333333333333e-02
+1018 728 8.33333333333333e-02
+1018 1117 -2.50000000000000e-01
+1018 1116 1.66666666666667e-01
+1018 707 8.33333333333333e-02
+1018 1015 -7.50000000000000e-01
+1018 1014 1.66666666666667e-01
+1018 1013 -8.33333333333333e-02
+1018 1017 -3.33333333333333e-01
+1018 966 -8.33333333333333e-02
+1018 959 8.33333333333333e-02
+1018 956 -8.33333333333333e-02
+1018 954 -8.33333333333333e-02
+1018 957 8.33333333333333e-02
+1018 968 1.66666666666667e-01
+1018 1043 1.66666666666667e-01
+1018 1019 -3.33333333333333e-01
+1018 967 -2.50000000000000e-01
+1018 1042 -7.50000000000000e-01
+1018 726 -1.66666666666667e-01
+1018 1041 1.66666666666667e-01
+1018 1055 -1.66666666666667e-01
+1018 1012 -2.50000000000000e-01
+1018 1011 1.66666666666667e-01
+1018 705 -1.66666666666667e-01
+1019 1019 2.50000000000000e+00
+1019 1054 -1.66666666666667e-01
+1019 1159 -8.33333333333333e-02
+1019 1126 8.33333333333333e-02
+1019 1026 1.66666666666667e-01
+1019 1125 -1.66666666666667e-01
+1019 1158 -8.33333333333333e-02
+1019 1028 -7.50000000000000e-01
+1019 1027 1.66666666666667e-01
+1019 963 8.33333333333333e-02
+1019 1014 -8.33333333333333e-02
+1019 1015 1.66666666666667e-01
+1019 964 -1.66666666666667e-01
+1019 1118 -2.50000000000000e-01
+1019 1117 -8.33333333333333e-02
+1019 727 8.33333333333333e-02
+1019 1116 1.66666666666667e-01
+1019 1017 -3.33333333333333e-01
+1019 1016 -2.50000000000000e-01
+1019 706 8.33333333333333e-02
+1019 1012 -8.33333333333333e-02
+1019 958 8.33333333333333e-02
+1019 955 -8.33333333333333e-02
+1019 966 1.66666666666667e-01
+1019 957 -1.66666666666667e-01
+1019 1011 1.66666666666667e-01
+1019 968 -7.50000000000000e-01
+1019 1043 -2.50000000000000e-01
+1019 967 1.66666666666667e-01
+1019 1042 1.66666666666667e-01
+1019 1018 -3.33333333333333e-01
+1019 726 8.33333333333333e-02
+1019 1041 -8.33333333333333e-02
+1019 1053 8.33333333333333e-02
+1019 1013 -2.50000000000000e-01
+1019 954 -8.33333333333333e-02
+1019 705 8.33333333333333e-02
+1020 1020 1.25000000000000e+00
+1020 1021 -1.66666666666667e-01
+1020 1001 -8.33333333333333e-02
+1020 706 -4.16666666666667e-02
+1020 1000 4.16666666666667e-02
+1020 1007 8.33333333333333e-02
+1020 760 -4.16666666666667e-02
+1020 1005 -3.75000000000000e-01
+1020 1240 8.33333333333333e-02
+1020 1025 -8.33333333333333e-02
+1020 1024 1.66666666666667e-01
+1020 1023 -2.50000000000000e-01
+1020 1241 8.33333333333333e-02
+1020 1028 8.33333333333333e-02
+1020 1244 -8.33333333333333e-02
+1020 880 4.16666666666667e-02
+1020 1243 -8.33333333333333e-02
+1020 761 8.33333333333333e-02
+1020 881 -8.33333333333333e-02
+1020 759 -1.25000000000000e-01
+1020 1022 -1.66666666666667e-01
+1020 875 8.33333333333333e-02
+1020 707 8.33333333333333e-02
+1020 874 8.33333333333333e-02
+1020 1027 -1.66666666666667e-01
+1020 1006 8.33333333333333e-02
+1020 873 -3.75000000000000e-01
+1020 705 -1.25000000000000e-01
+1021 1021 1.25000000000000e+00
+1021 1001 4.16666666666667e-02
+1021 1005 8.33333333333333e-02
+1021 1020 -1.66666666666667e-01
+1021 705 -4.16666666666667e-02
+1021 999 4.16666666666667e-02
+1021 1006 -1.25000000000000e-01
+1021 759 -4.16666666666667e-02
+1021 1239 8.33333333333333e-02
+1021 707 8.33333333333333e-02
+1021 1022 -1.66666666666667e-01
+1021 1025 1.66666666666667e-01
+1021 1024 -7.50000000000000e-01
+1021 1023 1.66666666666667e-01
+1021 761 8.33333333333333e-02
+1021 1241 -1.66666666666667e-01
+1021 879 4.16666666666667e-02
+1021 1242 -8.33333333333333e-02
+1021 881 4.16666666666667e-02
+1021 1244 -8.33333333333333e-02
+1021 760 -1.25000000000000e-01
+1021 875 -4.16666666666667e-02
+1021 1028 8.33333333333333e-02
+1021 1007 -4.16666666666667e-02
+1021 874 -1.25000000000000e-01
+1021 706 -1.25000000000000e-01
+1021 873 8.33333333333333e-02
+1021 1026 -1.66666666666667e-01
+1022 1022 1.25000000000000e+00
+1022 1000 4.16666666666667e-02
+1022 999 -8.33333333333333e-02
+1022 1007 -1.25000000000000e-01
+1022 1005 8.33333333333333e-02
+1022 1025 -2.50000000000000e-01
+1022 706 8.33333333333333e-02
+1022 1021 -1.66666666666667e-01
+1022 1024 1.66666666666667e-01
+1022 1023 -8.33333333333333e-02
+1022 760 8.33333333333333e-02
+1022 1240 -1.66666666666667e-01
+1022 1239 8.33333333333333e-02
+1022 1026 8.33333333333333e-02
+1022 1242 -8.33333333333333e-02
+1022 761 -3.75000000000000e-01
+1022 880 4.16666666666667e-02
+1022 1243 -8.33333333333333e-02
+1022 759 8.33333333333333e-02
+1022 879 -8.33333333333333e-02
+1022 1006 -4.16666666666667e-02
+1022 875 -1.25000000000000e-01
+1022 707 -3.75000000000000e-01
+1022 874 -4.16666666666667e-02
+1022 1027 8.33333333333333e-02
+1022 1020 -1.66666666666667e-01
+1022 873 8.33333333333333e-02
+1022 705 8.33333333333333e-02
+1023 1023 2.50000000000000e+00
+1023 1004 -1.66666666666667e-01
+1023 1007 8.33333333333333e-02
+1023 1001 -8.33333333333333e-02
+1023 1006 -1.66666666666667e-01
+1023 1009 1.66666666666667e-01
+1023 1000 -8.33333333333333e-02
+1023 1010 1.66666666666667e-01
+1023 1008 -7.50000000000000e-01
+1023 1243 8.33333333333333e-02
+1023 1240 -8.33333333333333e-02
+1023 1244 -1.66666666666667e-01
+1023 1241 1.66666666666667e-01
+1023 707 8.33333333333333e-02
+1023 1022 -8.33333333333333e-02
+1023 1021 1.66666666666667e-01
+1023 1024 -3.33333333333333e-01
+1023 1020 -2.50000000000000e-01
+1023 764 8.33333333333333e-02
+1023 1239 -2.50000000000000e-01
+1023 1052 -8.33333333333333e-02
+1023 1055 8.33333333333333e-02
+1023 1253 -8.33333333333333e-02
+1023 1027 1.66666666666667e-01
+1023 1054 -1.66666666666667e-01
+1023 1051 1.66666666666667e-01
+1023 1028 1.66666666666667e-01
+1023 1013 1.66666666666667e-01
+1023 1025 -3.33333333333333e-01
+1023 706 8.33333333333333e-02
+1023 1012 -8.33333333333333e-02
+1023 1026 -7.50000000000000e-01
+1023 1011 -2.50000000000000e-01
+1023 1252 -8.33333333333333e-02
+1023 763 8.33333333333333e-02
+1023 1003 8.33333333333333e-02
+1023 1050 -2.50000000000000e-01
+1024 1024 2.50000000000000e+00
+1024 1004 8.33333333333333e-02
+1024 1001 -8.33333333333333e-02
+1024 1007 8.33333333333333e-02
+1024 1010 -8.33333333333333e-02
+1024 1005 -1.66666666666667e-01
+1024 1008 1.66666666666667e-01
+1024 999 -8.33333333333333e-02
+1024 1009 -2.50000000000000e-01
+1024 1242 8.33333333333333e-02
+1024 1239 -8.33333333333333e-02
+1024 1244 8.33333333333333e-02
+1024 1022 1.66666666666667e-01
+1024 1021 -7.50000000000000e-01
+1024 1020 1.66666666666667e-01
+1024 1023 -3.33333333333333e-01
+1024 1241 1.66666666666667e-01
+1024 1240 -2.50000000000000e-01
+1024 1025 -3.33333333333333e-01
+1024 1028 -8.33333333333333e-02
+1024 1026 1.66666666666667e-01
+1024 1055 8.33333333333333e-02
+1024 1253 -8.33333333333333e-02
+1024 1053 -1.66666666666667e-01
+1024 1050 1.66666666666667e-01
+1024 707 -1.66666666666667e-01
+1024 1013 1.66666666666667e-01
+1024 1027 -2.50000000000000e-01
+1024 1012 -2.50000000000000e-01
+1024 705 8.33333333333333e-02
+1024 1011 -8.33333333333333e-02
+1024 1052 1.66666666666667e-01
+1024 764 -1.66666666666667e-01
+1024 1002 8.33333333333333e-02
+1024 1051 -7.50000000000000e-01
+1024 1251 -8.33333333333333e-02
+1024 762 8.33333333333333e-02
+1025 1025 2.50000000000000e+00
+1025 1002 -1.66666666666667e-01
+1025 1000 -8.33333333333333e-02
+1025 1005 8.33333333333333e-02
+1025 999 -8.33333333333333e-02
+1025 1006 8.33333333333333e-02
+1025 1009 -8.33333333333333e-02
+1025 1010 -2.50000000000000e-01
+1025 1008 1.66666666666667e-01
+1025 1243 8.33333333333333e-02
+1025 1242 -1.66666666666667e-01
+1025 1239 1.66666666666667e-01
+1025 1022 -2.50000000000000e-01
+1025 1021 1.66666666666667e-01
+1025 705 8.33333333333333e-02
+1025 1020 -8.33333333333333e-02
+1025 1241 -7.50000000000000e-01
+1025 1240 1.66666666666667e-01
+1025 762 8.33333333333333e-02
+1025 1024 -3.33333333333333e-01
+1025 1050 -8.33333333333333e-02
+1025 1027 -8.33333333333333e-02
+1025 1053 8.33333333333333e-02
+1025 1251 -8.33333333333333e-02
+1025 1054 8.33333333333333e-02
+1025 1252 -8.33333333333333e-02
+1025 1028 -2.50000000000000e-01
+1025 1013 -7.50000000000000e-01
+1025 706 -1.66666666666667e-01
+1025 1012 1.66666666666667e-01
+1025 1026 1.66666666666667e-01
+1025 1011 1.66666666666667e-01
+1025 1023 -3.33333333333333e-01
+1025 1003 8.33333333333333e-02
+1025 1052 -2.50000000000000e-01
+1025 1051 1.66666666666667e-01
+1025 763 -1.66666666666667e-01
+1026 1026 2.50000000000000e+00
+1026 1018 -8.33333333333333e-02
+1026 1160 8.33333333333333e-02
+1026 1159 -1.66666666666667e-01
+1026 1017 -2.50000000000000e-01
+1026 1016 8.33333333333333e-02
+1026 1126 1.66666666666667e-01
+1026 1127 1.66666666666667e-01
+1026 1125 -7.50000000000000e-01
+1026 1015 8.33333333333333e-02
+1026 1028 -3.33333333333333e-01
+1026 707 -8.33333333333333e-02
+1026 770 -8.33333333333333e-02
+1026 1055 -8.33333333333333e-02
+1026 1253 8.33333333333333e-02
+1026 1054 1.66666666666667e-01
+1026 1027 -3.33333333333333e-01
+1026 1024 1.66666666666667e-01
+1026 1013 -1.66666666666667e-01
+1026 1025 1.66666666666667e-01
+1026 706 -8.33333333333333e-02
+1026 1012 8.33333333333333e-02
+1026 1023 -7.50000000000000e-01
+1026 769 -8.33333333333333e-02
+1026 1252 8.33333333333333e-02
+1026 1053 -2.50000000000000e-01
+1026 875 -8.33333333333333e-02
+1026 1022 8.33333333333333e-02
+1026 886 8.33333333333333e-02
+1026 1243 -8.33333333333333e-02
+1026 1021 -1.66666666666667e-01
+1026 874 1.66666666666667e-01
+1026 873 -2.50000000000000e-01
+1026 1244 1.66666666666667e-01
+1026 887 -1.66666666666667e-01
+1026 1242 -2.50000000000000e-01
+1026 1019 1.66666666666667e-01
+1027 1027 2.50000000000000e+00
+1027 1017 -8.33333333333333e-02
+1027 1158 -1.66666666666667e-01
+1027 1019 1.66666666666667e-01
+1027 1018 -2.50000000000000e-01
+1027 1127 -8.33333333333333e-02
+1027 1125 1.66666666666667e-01
+1027 1126 -2.50000000000000e-01
+1027 1016 -1.66666666666667e-01
+1027 1014 8.33333333333333e-02
+1027 1013 8.33333333333333e-02
+1027 1025 -8.33333333333333e-02
+1027 1053 1.66666666666667e-01
+1027 1026 -3.33333333333333e-01
+1027 1023 1.66666666666667e-01
+1027 1024 -2.50000000000000e-01
+1027 705 -8.33333333333333e-02
+1027 1011 8.33333333333333e-02
+1027 1055 1.66666666666667e-01
+1027 1253 -1.66666666666667e-01
+1027 1054 -7.50000000000000e-01
+1027 768 -8.33333333333333e-02
+1027 1251 8.33333333333333e-02
+1027 875 1.66666666666667e-01
+1027 1028 -3.33333333333333e-01
+1027 1244 1.66666666666667e-01
+1027 885 8.33333333333333e-02
+1027 1242 -8.33333333333333e-02
+1027 1022 8.33333333333333e-02
+1027 707 -8.33333333333333e-02
+1027 874 -7.50000000000000e-01
+1027 1020 -1.66666666666667e-01
+1027 873 1.66666666666667e-01
+1027 887 8.33333333333333e-02
+1027 770 -8.33333333333333e-02
+1027 1243 -2.50000000000000e-01
+1027 1160 8.33333333333333e-02
+1028 1028 2.50000000000000e+00
+1028 1017 1.66666666666667e-01
+1028 1158 8.33333333333333e-02
+1028 1019 -7.50000000000000e-01
+1028 1018 1.66666666666667e-01
+1028 1126 -8.33333333333333e-02
+1028 1014 8.33333333333333e-02
+1028 1127 -2.50000000000000e-01
+1028 1125 1.66666666666667e-01
+1028 1015 -1.66666666666667e-01
+1028 1026 -3.33333333333333e-01
+1028 705 -8.33333333333333e-02
+1028 768 -8.33333333333333e-02
+1028 1012 8.33333333333333e-02
+1028 1024 -8.33333333333333e-02
+1028 1053 -8.33333333333333e-02
+1028 1251 8.33333333333333e-02
+1028 1025 -2.50000000000000e-01
+1028 1011 -1.66666666666667e-01
+1028 1023 1.66666666666667e-01
+1028 1055 -2.50000000000000e-01
+1028 1054 1.66666666666667e-01
+1028 1252 -1.66666666666667e-01
+1028 873 -8.33333333333333e-02
+1028 1020 8.33333333333333e-02
+1028 874 1.66666666666667e-01
+1028 1027 -3.33333333333333e-01
+1028 1243 1.66666666666667e-01
+1028 875 -2.50000000000000e-01
+1028 1021 8.33333333333333e-02
+1028 706 -8.33333333333333e-02
+1028 1244 -7.50000000000000e-01
+1028 1159 8.33333333333333e-02
+1028 886 8.33333333333333e-02
+1028 769 -8.33333333333333e-02
+1028 1242 1.66666666666667e-01
+1028 885 -1.66666666666667e-01
+1029 1029 2.50000000000000e+00
+1029 1034 -8.33333333333333e-02
+1029 1045 -1.66666666666667e-01
+1029 1033 1.66666666666667e-01
+1029 1032 -2.50000000000000e-01
+1029 974 1.66666666666667e-01
+1029 973 -8.33333333333333e-02
+1029 972 -2.50000000000000e-01
+1029 1058 -8.33333333333333e-02
+1029 1040 8.33333333333333e-02
+1029 1031 -3.33333333333333e-01
+1029 1037 1.66666666666667e-01
+1029 1039 8.33333333333333e-02
+1029 1036 -8.33333333333333e-02
+1029 1035 -2.50000000000000e-01
+1029 710 1.66666666666667e-01
+1029 1052 -1.66666666666667e-01
+1029 1057 -8.33333333333333e-02
+1029 1051 8.33333333333333e-02
+1029 793 8.33333333333333e-02
+1029 1004 -8.33333333333333e-02
+1029 794 8.33333333333333e-02
+1029 1030 -3.33333333333333e-01
+1029 1003 1.66666666666667e-01
+1029 709 1.66666666666667e-01
+1029 1046 8.33333333333333e-02
+1029 1002 -2.50000000000000e-01
+1029 708 -7.50000000000000e-01
+1029 587 -1.66666666666667e-01
+1029 586 8.33333333333333e-02
+1029 86 1.66666666666667e-01
+1029 190 -8.33333333333333e-02
+1029 593 8.33333333333333e-02
+1029 191 -8.33333333333333e-02
+1029 85 1.66666666666667e-01
+1029 592 -1.66666666666667e-01
+1029 84 -7.50000000000000e-01
+1030 1030 2.50000000000000e+00
+1030 1046 8.33333333333333e-02
+1030 1044 -1.66666666666667e-01
+1030 1033 -7.50000000000000e-01
+1030 1032 1.66666666666667e-01
+1030 974 1.66666666666667e-01
+1030 973 -2.50000000000000e-01
+1030 972 -8.33333333333333e-02
+1030 1031 -3.33333333333333e-01
+1030 710 -8.33333333333333e-02
+1030 1052 8.33333333333333e-02
+1030 1058 -8.33333333333333e-02
+1030 1040 -1.66666666666667e-01
+1030 1037 1.66666666666667e-01
+1030 1036 -2.50000000000000e-01
+1030 1038 8.33333333333333e-02
+1030 1035 -8.33333333333333e-02
+1030 1056 -8.33333333333333e-02
+1030 1050 8.33333333333333e-02
+1030 792 8.33333333333333e-02
+1030 1004 1.66666666666667e-01
+1030 794 -1.66666666666667e-01
+1030 1034 1.66666666666667e-01
+1030 1003 -7.50000000000000e-01
+1030 709 -2.50000000000000e-01
+1030 1029 -3.33333333333333e-01
+1030 1002 1.66666666666667e-01
+1030 708 1.66666666666667e-01
+1030 587 8.33333333333333e-02
+1030 585 8.33333333333333e-02
+1030 86 -8.33333333333333e-02
+1030 593 8.33333333333333e-02
+1030 191 -8.33333333333333e-02
+1030 189 -8.33333333333333e-02
+1030 85 -2.50000000000000e-01
+1030 84 1.66666666666667e-01
+1030 591 -1.66666666666667e-01
+1031 1031 2.50000000000000e+00
+1031 1032 -8.33333333333333e-02
+1031 1033 1.66666666666667e-01
+1031 1045 8.33333333333333e-02
+1031 1034 -2.50000000000000e-01
+1031 974 -7.50000000000000e-01
+1031 973 1.66666666666667e-01
+1031 972 1.66666666666667e-01
+1031 1030 -3.33333333333333e-01
+1031 709 -8.33333333333333e-02
+1031 1051 8.33333333333333e-02
+1031 1057 -8.33333333333333e-02
+1031 1056 -8.33333333333333e-02
+1031 1038 8.33333333333333e-02
+1031 1037 -7.50000000000000e-01
+1031 1039 -1.66666666666667e-01
+1031 1036 1.66666666666667e-01
+1031 1029 -3.33333333333333e-01
+1031 1035 1.66666666666667e-01
+1031 708 1.66666666666667e-01
+1031 1050 -1.66666666666667e-01
+1031 1044 8.33333333333333e-02
+1031 1004 -2.50000000000000e-01
+1031 710 -2.50000000000000e-01
+1031 1003 1.66666666666667e-01
+1031 793 -1.66666666666667e-01
+1031 1002 -8.33333333333333e-02
+1031 792 8.33333333333333e-02
+1031 586 8.33333333333333e-02
+1031 585 -1.66666666666667e-01
+1031 85 -8.33333333333333e-02
+1031 84 1.66666666666667e-01
+1031 592 8.33333333333333e-02
+1031 190 -8.33333333333333e-02
+1031 86 -2.50000000000000e-01
+1031 591 8.33333333333333e-02
+1031 189 -8.33333333333333e-02
+1032 1032 2.50000000000000e+00
+1032 1057 8.33333333333333e-02
+1032 1219 -8.33333333333333e-02
+1032 1214 8.33333333333333e-02
+1032 1220 -8.33333333333333e-02
+1032 1213 8.33333333333333e-02
+1032 1039 -8.33333333333333e-02
+1032 1040 1.66666666666667e-01
+1032 1038 -2.50000000000000e-01
+1032 746 8.33333333333333e-02
+1032 1211 -8.33333333333333e-02
+1032 1210 1.66666666666667e-01
+1032 1209 -2.50000000000000e-01
+1032 1031 -8.33333333333333e-02
+1032 1033 -3.33333333333333e-01
+1032 979 -8.33333333333333e-02
+1032 974 8.33333333333333e-02
+1032 973 8.33333333333333e-02
+1032 980 1.66666666666667e-01
+1032 1046 1.66666666666667e-01
+1032 1034 -3.33333333333333e-01
+1032 745 -1.66666666666667e-01
+1032 1045 1.66666666666667e-01
+1032 978 -2.50000000000000e-01
+1032 1044 -7.50000000000000e-01
+1032 1030 1.66666666666667e-01
+1032 1058 -1.66666666666667e-01
+1032 1029 -2.50000000000000e-01
+1032 590 -1.66666666666667e-01
+1032 599 1.66666666666667e-01
+1032 589 8.33333333333333e-02
+1032 86 8.33333333333333e-02
+1032 598 1.66666666666667e-01
+1032 597 -7.50000000000000e-01
+1032 587 -8.33333333333333e-02
+1032 586 -8.33333333333333e-02
+1032 85 -1.66666666666667e-01
+1033 1033 2.50000000000000e+00
+1033 1056 8.33333333333333e-02
+1033 1218 -8.33333333333333e-02
+1033 1214 -1.66666666666667e-01
+1033 1040 1.66666666666667e-01
+1033 1212 8.33333333333333e-02
+1033 1038 -8.33333333333333e-02
+1033 1220 -8.33333333333333e-02
+1033 1039 -2.50000000000000e-01
+1033 1211 1.66666666666667e-01
+1033 1034 -3.33333333333333e-01
+1033 1210 -7.50000000000000e-01
+1033 1209 1.66666666666667e-01
+1033 1032 -3.33333333333333e-01
+1033 978 -8.33333333333333e-02
+1033 980 1.66666666666667e-01
+1033 974 -1.66666666666667e-01
+1033 1031 1.66666666666667e-01
+1033 972 8.33333333333333e-02
+1033 746 8.33333333333333e-02
+1033 1046 -8.33333333333333e-02
+1033 979 -2.50000000000000e-01
+1033 1045 -2.50000000000000e-01
+1033 744 -1.66666666666667e-01
+1033 1044 1.66666666666667e-01
+1033 1058 8.33333333333333e-02
+1033 1030 -7.50000000000000e-01
+1033 1029 1.66666666666667e-01
+1033 590 8.33333333333333e-02
+1033 599 -8.33333333333333e-02
+1033 588 8.33333333333333e-02
+1033 598 -2.50000000000000e-01
+1033 597 1.66666666666667e-01
+1033 585 -8.33333333333333e-02
+1033 587 -8.33333333333333e-02
+1033 86 8.33333333333333e-02
+1033 84 -1.66666666666667e-01
+1034 1034 2.50000000000000e+00
+1034 1056 -1.66666666666667e-01
+1034 1212 8.33333333333333e-02
+1034 1218 -8.33333333333333e-02
+1034 1213 -1.66666666666667e-01
+1034 1039 1.66666666666667e-01
+1034 1219 -8.33333333333333e-02
+1034 1040 -7.50000000000000e-01
+1034 1038 1.66666666666667e-01
+1034 1211 -2.50000000000000e-01
+1034 1210 1.66666666666667e-01
+1034 1033 -3.33333333333333e-01
+1034 744 8.33333333333333e-02
+1034 1209 -8.33333333333333e-02
+1034 1029 -8.33333333333333e-02
+1034 979 1.66666666666667e-01
+1034 972 8.33333333333333e-02
+1034 973 -1.66666666666667e-01
+1034 1030 1.66666666666667e-01
+1034 980 -7.50000000000000e-01
+1034 1046 -2.50000000000000e-01
+1034 745 8.33333333333333e-02
+1034 1045 -8.33333333333333e-02
+1034 978 1.66666666666667e-01
+1034 1044 1.66666666666667e-01
+1034 1032 -3.33333333333333e-01
+1034 1057 8.33333333333333e-02
+1034 1031 -2.50000000000000e-01
+1034 589 8.33333333333333e-02
+1034 598 -8.33333333333333e-02
+1034 588 -1.66666666666667e-01
+1034 597 1.66666666666667e-01
+1034 599 -2.50000000000000e-01
+1034 84 8.33333333333333e-02
+1034 585 -8.33333333333333e-02
+1034 586 -8.33333333333333e-02
+1034 85 8.33333333333333e-02
+1035 1035 2.50000000000000e+00
+1035 1004 8.33333333333333e-02
+1035 1010 -8.33333333333333e-02
+1035 1009 1.66666666666667e-01
+1035 1008 -2.50000000000000e-01
+1035 1249 8.33333333333333e-02
+1035 1246 -8.33333333333333e-02
+1035 1250 8.33333333333333e-02
+1035 1036 -3.33333333333333e-01
+1035 1247 1.66666666666667e-01
+1035 1245 -2.50000000000000e-01
+1035 1037 -3.33333333333333e-01
+1035 1040 -8.33333333333333e-02
+1035 1039 1.66666666666667e-01
+1035 1256 -8.33333333333333e-02
+1035 1058 8.33333333333333e-02
+1035 1057 -1.66666666666667e-01
+1035 1051 1.66666666666667e-01
+1035 1031 1.66666666666667e-01
+1035 1030 -8.33333333333333e-02
+1035 1038 -2.50000000000000e-01
+1035 1029 -2.50000000000000e-01
+1035 1052 1.66666666666667e-01
+1035 764 -1.66666666666667e-01
+1035 1255 -8.33333333333333e-02
+1035 763 8.33333333333333e-02
+1035 1003 8.33333333333333e-02
+1035 1050 -7.50000000000000e-01
+1035 593 -8.33333333333333e-02
+1035 596 8.33333333333333e-02
+1035 595 -1.66666666666667e-01
+1035 592 -8.33333333333333e-02
+1035 602 1.66666666666667e-01
+1035 601 1.66666666666667e-01
+1035 600 -7.50000000000000e-01
+1035 86 -1.66666666666667e-01
+1035 85 8.33333333333333e-02
+1036 1036 2.50000000000000e+00
+1036 1004 -1.66666666666667e-01
+1036 1008 1.66666666666667e-01
+1036 1010 1.66666666666667e-01
+1036 1009 -7.50000000000000e-01
+1036 1248 8.33333333333333e-02
+1036 1245 -8.33333333333333e-02
+1036 1247 1.66666666666667e-01
+1036 1250 -1.66666666666667e-01
+1036 1035 -3.33333333333333e-01
+1036 764 8.33333333333333e-02
+1036 1246 -2.50000000000000e-01
+1036 1052 -8.33333333333333e-02
+1036 1058 8.33333333333333e-02
+1036 1256 -8.33333333333333e-02
+1036 1038 1.66666666666667e-01
+1036 1056 -1.66666666666667e-01
+1036 1050 1.66666666666667e-01
+1036 1040 1.66666666666667e-01
+1036 1031 1.66666666666667e-01
+1036 1037 -3.33333333333333e-01
+1036 1039 -7.50000000000000e-01
+1036 1030 -2.50000000000000e-01
+1036 1029 -8.33333333333333e-02
+1036 1002 8.33333333333333e-02
+1036 1051 -2.50000000000000e-01
+1036 1254 -8.33333333333333e-02
+1036 762 8.33333333333333e-02
+1036 593 -8.33333333333333e-02
+1036 596 8.33333333333333e-02
+1036 594 -1.66666666666667e-01
+1036 591 -8.33333333333333e-02
+1036 602 -8.33333333333333e-02
+1036 86 8.33333333333333e-02
+1036 601 -2.50000000000000e-01
+1036 600 1.66666666666667e-01
+1036 84 8.33333333333333e-02
+1037 1037 2.50000000000000e+00
+1037 1002 8.33333333333333e-02
+1037 1008 -8.33333333333333e-02
+1037 1010 -2.50000000000000e-01
+1037 1009 1.66666666666667e-01
+1037 1246 1.66666666666667e-01
+1037 1249 -1.66666666666667e-01
+1037 1248 8.33333333333333e-02
+1037 1247 -7.50000000000000e-01
+1037 763 8.33333333333333e-02
+1037 1245 1.66666666666667e-01
+1037 1051 -8.33333333333333e-02
+1037 1035 -3.33333333333333e-01
+1037 1038 -8.33333333333333e-02
+1037 1057 8.33333333333333e-02
+1037 1255 -8.33333333333333e-02
+1037 1254 -8.33333333333333e-02
+1037 1056 8.33333333333333e-02
+1037 1040 -2.50000000000000e-01
+1037 1031 -7.50000000000000e-01
+1037 1039 1.66666666666667e-01
+1037 1030 1.66666666666667e-01
+1037 1036 -3.33333333333333e-01
+1037 1029 1.66666666666667e-01
+1037 1003 -1.66666666666667e-01
+1037 1052 -2.50000000000000e-01
+1037 1050 1.66666666666667e-01
+1037 762 -1.66666666666667e-01
+1037 591 -8.33333333333333e-02
+1037 592 -8.33333333333333e-02
+1037 595 8.33333333333333e-02
+1037 594 8.33333333333333e-02
+1037 602 -2.50000000000000e-01
+1037 601 -8.33333333333333e-02
+1037 85 8.33333333333333e-02
+1037 600 1.66666666666667e-01
+1037 84 -1.66666666666667e-01
+1038 1038 2.50000000000000e+00
+1038 1033 -8.33333333333333e-02
+1038 1219 -1.66666666666667e-01
+1038 1034 1.66666666666667e-01
+1038 1032 -2.50000000000000e-01
+1038 1214 -8.33333333333333e-02
+1038 1213 1.66666666666667e-01
+1038 1212 -2.50000000000000e-01
+1038 1031 8.33333333333333e-02
+1038 1037 -8.33333333333333e-02
+1038 1039 -3.33333333333333e-01
+1038 1057 1.66666666666667e-01
+1038 1036 1.66666666666667e-01
+1038 1058 1.66666666666667e-01
+1038 1256 -1.66666666666667e-01
+1038 778 -8.33333333333333e-02
+1038 1255 8.33333333333333e-02
+1038 1056 -7.50000000000000e-01
+1038 1030 8.33333333333333e-02
+1038 1035 -2.50000000000000e-01
+1038 1040 -3.33333333333333e-01
+1038 1250 1.66666666666667e-01
+1038 904 8.33333333333333e-02
+1038 1249 -8.33333333333333e-02
+1038 905 8.33333333333333e-02
+1038 779 -8.33333333333333e-02
+1038 1248 -2.50000000000000e-01
+1038 1220 8.33333333333333e-02
+1038 599 -1.66666666666667e-01
+1038 598 8.33333333333333e-02
+1038 85 -8.33333333333333e-02
+1038 317 1.66666666666667e-01
+1038 602 8.33333333333333e-02
+1038 86 -8.33333333333333e-02
+1038 316 1.66666666666667e-01
+1038 601 -1.66666666666667e-01
+1038 315 -7.50000000000000e-01
+1039 1039 2.50000000000000e+00
+1039 1032 -8.33333333333333e-02
+1039 1220 8.33333333333333e-02
+1039 1218 -1.66666666666667e-01
+1039 1033 -2.50000000000000e-01
+1039 1212 1.66666666666667e-01
+1039 1214 1.66666666666667e-01
+1039 1213 -7.50000000000000e-01
+1039 1040 -3.33333333333333e-01
+1039 779 -8.33333333333333e-02
+1039 1058 -8.33333333333333e-02
+1039 1256 8.33333333333333e-02
+1039 1038 -3.33333333333333e-01
+1039 1056 1.66666666666667e-01
+1039 1035 1.66666666666667e-01
+1039 1057 -2.50000000000000e-01
+1039 777 -8.33333333333333e-02
+1039 1254 8.33333333333333e-02
+1039 1031 -1.66666666666667e-01
+1039 1037 1.66666666666667e-01
+1039 1036 -7.50000000000000e-01
+1039 1029 8.33333333333333e-02
+1039 903 8.33333333333333e-02
+1039 1248 -8.33333333333333e-02
+1039 905 -1.66666666666667e-01
+1039 1250 1.66666666666667e-01
+1039 1249 -2.50000000000000e-01
+1039 1034 1.66666666666667e-01
+1039 599 8.33333333333333e-02
+1039 597 8.33333333333333e-02
+1039 86 -8.33333333333333e-02
+1039 84 -8.33333333333333e-02
+1039 317 -8.33333333333333e-02
+1039 602 8.33333333333333e-02
+1039 316 -2.50000000000000e-01
+1039 315 1.66666666666667e-01
+1039 600 -1.66666666666667e-01
+1040 1040 2.50000000000000e+00
+1040 1033 1.66666666666667e-01
+1040 1219 8.33333333333333e-02
+1040 1034 -7.50000000000000e-01
+1040 1032 1.66666666666667e-01
+1040 1212 -8.33333333333333e-02
+1040 1214 -2.50000000000000e-01
+1040 1213 1.66666666666667e-01
+1040 1039 -3.33333333333333e-01
+1040 778 -8.33333333333333e-02
+1040 1029 8.33333333333333e-02
+1040 1035 -8.33333333333333e-02
+1040 1057 -8.33333333333333e-02
+1040 1255 8.33333333333333e-02
+1040 1058 -2.50000000000000e-01
+1040 1056 1.66666666666667e-01
+1040 1254 -1.66666666666667e-01
+1040 1037 -2.50000000000000e-01
+1040 1030 -1.66666666666667e-01
+1040 1036 1.66666666666667e-01
+1040 1038 -3.33333333333333e-01
+1040 1248 1.66666666666667e-01
+1040 1250 -7.50000000000000e-01
+1040 1218 8.33333333333333e-02
+1040 904 -1.66666666666667e-01
+1040 1249 1.66666666666667e-01
+1040 903 8.33333333333333e-02
+1040 777 -8.33333333333333e-02
+1040 598 8.33333333333333e-02
+1040 597 -1.66666666666667e-01
+1040 85 -8.33333333333333e-02
+1040 316 -8.33333333333333e-02
+1040 601 8.33333333333333e-02
+1040 315 1.66666666666667e-01
+1040 317 -2.50000000000000e-01
+1040 600 8.33333333333333e-02
+1040 84 -8.33333333333333e-02
+1041 1041 2.50000000000000e+00
+1041 988 -8.33333333333333e-02
+1041 983 -1.66666666666667e-01
+1041 989 1.66666666666667e-01
+1041 987 -2.50000000000000e-01
+1041 1154 8.33333333333333e-02
+1041 1153 -1.66666666666667e-01
+1041 1049 -8.33333333333333e-02
+1041 1048 1.66666666666667e-01
+1041 1047 -2.50000000000000e-01
+1041 958 -8.33333333333333e-02
+1041 967 8.33333333333333e-02
+1041 968 8.33333333333333e-02
+1041 1019 -8.33333333333333e-02
+1041 727 1.66666666666667e-01
+1041 1042 -3.33333333333333e-01
+1041 1018 1.66666666666667e-01
+1041 1017 -2.50000000000000e-01
+1041 959 -8.33333333333333e-02
+1041 1013 8.33333333333333e-02
+1041 709 1.66666666666667e-01
+1041 1012 -1.66666666666667e-01
+1041 911 -8.33333333333333e-02
+1041 908 8.33333333333333e-02
+1041 728 1.66666666666667e-01
+1041 1160 -1.66666666666667e-01
+1041 1159 8.33333333333333e-02
+1041 910 -8.33333333333333e-02
+1041 726 -7.50000000000000e-01
+1041 1043 -3.33333333333333e-01
+1041 1055 1.66666666666667e-01
+1041 710 1.66666666666667e-01
+1041 1054 -8.33333333333333e-02
+1041 907 8.33333333333333e-02
+1041 982 8.33333333333333e-02
+1041 1053 -2.50000000000000e-01
+1041 708 -7.50000000000000e-01
+1042 1042 2.50000000000000e+00
+1042 987 -8.33333333333333e-02
+1042 989 1.66666666666667e-01
+1042 983 8.33333333333333e-02
+1042 988 -2.50000000000000e-01
+1042 1154 8.33333333333333e-02
+1042 1152 -1.66666666666667e-01
+1042 1049 1.66666666666667e-01
+1042 1048 -7.50000000000000e-01
+1042 1047 1.66666666666667e-01
+1042 1043 -3.33333333333333e-01
+1042 710 -8.33333333333333e-02
+1042 728 -8.33333333333333e-02
+1042 1013 8.33333333333333e-02
+1042 959 -8.33333333333333e-02
+1042 957 -8.33333333333333e-02
+1042 966 8.33333333333333e-02
+1042 968 -1.66666666666667e-01
+1042 1019 1.66666666666667e-01
+1042 1018 -7.50000000000000e-01
+1042 726 1.66666666666667e-01
+1042 1041 -3.33333333333333e-01
+1042 1017 1.66666666666667e-01
+1042 708 1.66666666666667e-01
+1042 1011 -1.66666666666667e-01
+1042 1160 8.33333333333333e-02
+1042 911 -8.33333333333333e-02
+1042 727 -2.50000000000000e-01
+1042 1158 8.33333333333333e-02
+1042 909 -8.33333333333333e-02
+1042 1055 1.66666666666667e-01
+1042 908 -1.66666666666667e-01
+1042 981 8.33333333333333e-02
+1042 1054 -2.50000000000000e-01
+1042 709 -2.50000000000000e-01
+1042 1053 -8.33333333333333e-02
+1042 906 8.33333333333333e-02
+1043 1043 2.50000000000000e+00
+1043 982 8.33333333333333e-02
+1043 981 -1.66666666666667e-01
+1043 989 -7.50000000000000e-01
+1043 987 1.66666666666667e-01
+1043 1153 8.33333333333333e-02
+1043 1152 8.33333333333333e-02
+1043 1049 -2.50000000000000e-01
+1043 1048 1.66666666666667e-01
+1043 1047 -8.33333333333333e-02
+1043 1042 -3.33333333333333e-01
+1043 709 -8.33333333333333e-02
+1043 727 -8.33333333333333e-02
+1043 1012 8.33333333333333e-02
+1043 958 -8.33333333333333e-02
+1043 1019 -2.50000000000000e-01
+1043 967 -1.66666666666667e-01
+1043 1018 1.66666666666667e-01
+1043 966 8.33333333333333e-02
+1043 1017 -8.33333333333333e-02
+1043 957 -8.33333333333333e-02
+1043 1011 8.33333333333333e-02
+1043 1159 8.33333333333333e-02
+1043 910 -8.33333333333333e-02
+1043 909 -8.33333333333333e-02
+1043 906 8.33333333333333e-02
+1043 728 -2.50000000000000e-01
+1043 726 1.66666666666667e-01
+1043 1158 -1.66666666666667e-01
+1043 988 1.66666666666667e-01
+1043 1055 -7.50000000000000e-01
+1043 710 -2.50000000000000e-01
+1043 1054 1.66666666666667e-01
+1043 907 -1.66666666666667e-01
+1043 1041 -3.33333333333333e-01
+1043 1053 1.66666666666667e-01
+1043 708 1.66666666666667e-01
+1044 1044 2.50000000000000e+00
+1044 994 -8.33333333333333e-02
+1044 995 1.66666666666667e-01
+1044 983 8.33333333333333e-02
+1044 993 -2.50000000000000e-01
+1044 1217 8.33333333333333e-02
+1044 1216 -1.66666666666667e-01
+1044 1049 1.66666666666667e-01
+1044 1048 1.66666666666667e-01
+1044 1047 -7.50000000000000e-01
+1044 1046 -3.33333333333333e-01
+1044 746 -8.33333333333333e-02
+1044 710 -8.33333333333333e-02
+1044 974 -8.33333333333333e-02
+1044 1031 8.33333333333333e-02
+1044 973 -8.33333333333333e-02
+1044 979 8.33333333333333e-02
+1044 980 -1.66666666666667e-01
+1044 1034 1.66666666666667e-01
+1044 745 1.66666666666667e-01
+1044 1045 -3.33333333333333e-01
+1044 1033 1.66666666666667e-01
+1044 1032 -7.50000000000000e-01
+1044 709 1.66666666666667e-01
+1044 1030 -1.66666666666667e-01
+1044 914 -8.33333333333333e-02
+1044 1220 8.33333333333333e-02
+1044 1219 8.33333333333333e-02
+1044 913 -8.33333333333333e-02
+1044 744 -2.50000000000000e-01
+1044 1058 1.66666666666667e-01
+1044 908 -1.66666666666667e-01
+1044 1057 -8.33333333333333e-02
+1044 907 8.33333333333333e-02
+1044 1056 -2.50000000000000e-01
+1044 982 8.33333333333333e-02
+1044 708 -2.50000000000000e-01
+1045 1045 2.50000000000000e+00
+1045 993 -8.33333333333333e-02
+1045 983 -1.66666666666667e-01
+1045 995 1.66666666666667e-01
+1045 994 -2.50000000000000e-01
+1045 1217 8.33333333333333e-02
+1045 1215 -1.66666666666667e-01
+1045 1049 -8.33333333333333e-02
+1045 1048 -2.50000000000000e-01
+1045 1047 1.66666666666667e-01
+1045 972 -8.33333333333333e-02
+1045 978 8.33333333333333e-02
+1045 980 8.33333333333333e-02
+1045 1034 -8.33333333333333e-02
+1045 1033 -2.50000000000000e-01
+1045 744 1.66666666666667e-01
+1045 1044 -3.33333333333333e-01
+1045 1032 1.66666666666667e-01
+1045 974 -8.33333333333333e-02
+1045 1031 8.33333333333333e-02
+1045 708 1.66666666666667e-01
+1045 1029 -1.66666666666667e-01
+1045 914 -8.33333333333333e-02
+1045 908 8.33333333333333e-02
+1045 1220 -1.66666666666667e-01
+1045 746 1.66666666666667e-01
+1045 745 -7.50000000000000e-01
+1045 1218 8.33333333333333e-02
+1045 912 -8.33333333333333e-02
+1045 1058 1.66666666666667e-01
+1045 1046 -3.33333333333333e-01
+1045 710 1.66666666666667e-01
+1045 1057 -2.50000000000000e-01
+1045 981 8.33333333333333e-02
+1045 709 -7.50000000000000e-01
+1045 1056 -8.33333333333333e-02
+1045 906 8.33333333333333e-02
+1046 1046 2.50000000000000e+00
+1046 982 -1.66666666666667e-01
+1046 981 8.33333333333333e-02
+1046 995 -7.50000000000000e-01
+1046 994 1.66666666666667e-01
+1046 1215 8.33333333333333e-02
+1046 1216 8.33333333333333e-02
+1046 1049 -2.50000000000000e-01
+1046 1048 -8.33333333333333e-02
+1046 1047 1.66666666666667e-01
+1046 1044 -3.33333333333333e-01
+1046 744 -8.33333333333333e-02
+1046 708 -8.33333333333333e-02
+1046 972 -8.33333333333333e-02
+1046 1029 8.33333333333333e-02
+1046 1034 -2.50000000000000e-01
+1046 979 8.33333333333333e-02
+1046 1033 -8.33333333333333e-02
+1046 978 -1.66666666666667e-01
+1046 1032 1.66666666666667e-01
+1046 973 -8.33333333333333e-02
+1046 1030 8.33333333333333e-02
+1046 912 -8.33333333333333e-02
+1046 1218 8.33333333333333e-02
+1046 913 -8.33333333333333e-02
+1046 907 8.33333333333333e-02
+1046 746 -2.50000000000000e-01
+1046 1219 -1.66666666666667e-01
+1046 745 1.66666666666667e-01
+1046 1058 -7.50000000000000e-01
+1046 993 1.66666666666667e-01
+1046 710 -2.50000000000000e-01
+1046 1057 1.66666666666667e-01
+1046 1045 -3.33333333333333e-01
+1046 709 1.66666666666667e-01
+1046 1056 1.66666666666667e-01
+1046 906 -1.66666666666667e-01
+1047 1047 2.50000000000000e+00
+1047 995 -1.66666666666667e-01
+1047 1217 -8.33333333333333e-02
+1047 913 8.33333333333333e-02
+1047 914 8.33333333333333e-02
+1047 1216 1.66666666666667e-01
+1047 1215 -2.50000000000000e-01
+1047 1046 1.66666666666667e-01
+1047 1045 1.66666666666667e-01
+1047 1044 -7.50000000000000e-01
+1047 982 -8.33333333333333e-02
+1047 983 -8.33333333333333e-02
+1047 997 -8.33333333333333e-02
+1047 988 8.33333333333333e-02
+1047 989 8.33333333333333e-02
+1047 998 1.66666666666667e-01
+1047 1049 -3.33333333333333e-01
+1047 996 -2.50000000000000e-01
+1047 907 -8.33333333333333e-02
+1047 1048 -3.33333333333333e-01
+1047 1154 1.66666666666667e-01
+1047 916 -8.33333333333333e-02
+1047 910 8.33333333333333e-02
+1047 908 1.66666666666667e-01
+1047 911 -1.66666666666667e-01
+1047 752 8.33333333333333e-02
+1047 917 -8.33333333333333e-02
+1047 1153 1.66666666666667e-01
+1047 751 -1.66666666666667e-01
+1047 1152 -7.50000000000000e-01
+1047 1043 -8.33333333333333e-02
+1047 710 8.33333333333333e-02
+1047 1042 1.66666666666667e-01
+1047 709 -1.66666666666667e-01
+1047 1041 -2.50000000000000e-01
+1047 994 8.33333333333333e-02
+1047 906 -2.50000000000000e-01
+1048 1048 2.50000000000000e+00
+1048 995 8.33333333333333e-02
+1048 1217 1.66666666666667e-01
+1048 912 8.33333333333333e-02
+1048 914 -1.66666666666667e-01
+1048 1216 -7.50000000000000e-01
+1048 1215 1.66666666666667e-01
+1048 1046 -8.33333333333333e-02
+1048 1045 -2.50000000000000e-01
+1048 1044 1.66666666666667e-01
+1048 981 -8.33333333333333e-02
+1048 998 1.66666666666667e-01
+1048 996 -8.33333333333333e-02
+1048 987 8.33333333333333e-02
+1048 989 -1.66666666666667e-01
+1048 752 8.33333333333333e-02
+1048 997 -2.50000000000000e-01
+1048 983 -8.33333333333333e-02
+1048 710 8.33333333333333e-02
+1048 906 -8.33333333333333e-02
+1048 1154 -8.33333333333333e-02
+1048 1047 -3.33333333333333e-01
+1048 915 -8.33333333333333e-02
+1048 909 8.33333333333333e-02
+1048 917 -8.33333333333333e-02
+1048 911 8.33333333333333e-02
+1048 1153 -2.50000000000000e-01
+1048 1152 1.66666666666667e-01
+1048 750 -1.66666666666667e-01
+1048 1043 1.66666666666667e-01
+1048 1049 -3.33333333333333e-01
+1048 908 1.66666666666667e-01
+1048 1042 -7.50000000000000e-01
+1048 993 8.33333333333333e-02
+1048 907 -2.50000000000000e-01
+1048 1041 1.66666666666667e-01
+1048 708 -1.66666666666667e-01
+1049 1049 2.50000000000000e+00
+1049 993 -1.66666666666667e-01
+1049 1215 -8.33333333333333e-02
+1049 1216 1.66666666666667e-01
+1049 913 -1.66666666666667e-01
+1049 912 8.33333333333333e-02
+1049 1217 -2.50000000000000e-01
+1049 1046 -2.50000000000000e-01
+1049 1045 -8.33333333333333e-02
+1049 1044 1.66666666666667e-01
+1049 981 -8.33333333333333e-02
+1049 997 1.66666666666667e-01
+1049 988 -1.66666666666667e-01
+1049 987 8.33333333333333e-02
+1049 998 -7.50000000000000e-01
+1049 751 8.33333333333333e-02
+1049 996 1.66666666666667e-01
+1049 1047 -3.33333333333333e-01
+1049 982 -8.33333333333333e-02
+1049 709 8.33333333333333e-02
+1049 1153 -8.33333333333333e-02
+1049 1152 1.66666666666667e-01
+1049 916 -8.33333333333333e-02
+1049 910 8.33333333333333e-02
+1049 906 1.66666666666667e-01
+1049 909 -1.66666666666667e-01
+1049 1154 -2.50000000000000e-01
+1049 750 8.33333333333333e-02
+1049 915 -8.33333333333333e-02
+1049 1043 -2.50000000000000e-01
+1049 994 8.33333333333333e-02
+1049 908 -7.50000000000000e-01
+1049 1042 1.66666666666667e-01
+1049 1048 -3.33333333333333e-01
+1049 907 1.66666666666667e-01
+1049 1041 -8.33333333333333e-02
+1049 708 8.33333333333333e-02
+1050 1050 2.50000000000000e+00
+1050 1031 -1.66666666666667e-01
+1050 1030 8.33333333333333e-02
+1050 1037 1.66666666666667e-01
+1050 1035 -7.50000000000000e-01
+1050 1255 8.33333333333333e-02
+1050 1256 8.33333333333333e-02
+1050 1058 -8.33333333333333e-02
+1050 1057 1.66666666666667e-01
+1050 1056 -2.50000000000000e-01
+1050 1003 -8.33333333333333e-02
+1050 1004 -8.33333333333333e-02
+1050 1010 8.33333333333333e-02
+1050 1009 -1.66666666666667e-01
+1050 1013 8.33333333333333e-02
+1050 1025 -8.33333333333333e-02
+1050 1051 -3.33333333333333e-01
+1050 1024 1.66666666666667e-01
+1050 1012 8.33333333333333e-02
+1050 709 -8.33333333333333e-02
+1050 763 -8.33333333333333e-02
+1050 1023 -2.50000000000000e-01
+1050 908 8.33333333333333e-02
+1050 920 -8.33333333333333e-02
+1050 1252 8.33333333333333e-02
+1050 919 -8.33333333333333e-02
+1050 764 1.66666666666667e-01
+1050 1253 -1.66666666666667e-01
+1050 762 -2.50000000000000e-01
+1050 1052 -3.33333333333333e-01
+1050 1055 1.66666666666667e-01
+1050 710 1.66666666666667e-01
+1050 1054 1.66666666666667e-01
+1050 907 -1.66666666666667e-01
+1050 1036 1.66666666666667e-01
+1050 1053 -7.50000000000000e-01
+1050 708 -2.50000000000000e-01
+1051 1051 2.50000000000000e+00
+1051 1037 -8.33333333333333e-02
+1051 1035 1.66666666666667e-01
+1051 1029 8.33333333333333e-02
+1051 1036 -2.50000000000000e-01
+1051 1254 8.33333333333333e-02
+1051 1256 -1.66666666666667e-01
+1051 1058 1.66666666666667e-01
+1051 1057 -7.50000000000000e-01
+1051 1056 1.66666666666667e-01
+1051 1002 -8.33333333333333e-02
+1051 1004 -8.33333333333333e-02
+1051 1010 8.33333333333333e-02
+1051 1008 -1.66666666666667e-01
+1051 1050 -3.33333333333333e-01
+1051 1023 1.66666666666667e-01
+1051 1013 -1.66666666666667e-01
+1051 710 1.66666666666667e-01
+1051 1011 8.33333333333333e-02
+1051 708 -8.33333333333333e-02
+1051 1025 1.66666666666667e-01
+1051 1052 -3.33333333333333e-01
+1051 764 1.66666666666667e-01
+1051 1024 -7.50000000000000e-01
+1051 762 -8.33333333333333e-02
+1051 1251 8.33333333333333e-02
+1051 918 -8.33333333333333e-02
+1051 1253 8.33333333333333e-02
+1051 920 -8.33333333333333e-02
+1051 763 -2.50000000000000e-01
+1051 1055 -8.33333333333333e-02
+1051 908 8.33333333333333e-02
+1051 1031 8.33333333333333e-02
+1051 1054 -2.50000000000000e-01
+1051 709 -2.50000000000000e-01
+1051 1053 1.66666666666667e-01
+1051 906 -1.66666666666667e-01
+1052 1052 2.50000000000000e+00
+1052 1036 -8.33333333333333e-02
+1052 1029 -1.66666666666667e-01
+1052 1037 -2.50000000000000e-01
+1052 1035 1.66666666666667e-01
+1052 1255 -1.66666666666667e-01
+1052 1254 8.33333333333333e-02
+1052 1058 -2.50000000000000e-01
+1052 1057 1.66666666666667e-01
+1052 1056 -8.33333333333333e-02
+1052 1003 -8.33333333333333e-02
+1052 1009 8.33333333333333e-02
+1052 1002 -8.33333333333333e-02
+1052 1008 8.33333333333333e-02
+1052 1011 8.33333333333333e-02
+1052 1023 -8.33333333333333e-02
+1052 1012 -1.66666666666667e-01
+1052 709 1.66666666666667e-01
+1052 1025 -2.50000000000000e-01
+1052 1024 1.66666666666667e-01
+1052 1051 -3.33333333333333e-01
+1052 763 1.66666666666667e-01
+1052 906 8.33333333333333e-02
+1052 918 -8.33333333333333e-02
+1052 764 -7.50000000000000e-01
+1052 1252 8.33333333333333e-02
+1052 919 -8.33333333333333e-02
+1052 762 1.66666666666667e-01
+1052 1251 -1.66666666666667e-01
+1052 1030 8.33333333333333e-02
+1052 1055 -2.50000000000000e-01
+1052 710 -7.50000000000000e-01
+1052 1054 -8.33333333333333e-02
+1052 907 8.33333333333333e-02
+1052 1050 -3.33333333333333e-01
+1052 1053 1.66666666666667e-01
+1052 708 1.66666666666667e-01
+1053 1053 2.50000000000000e+00
+1053 1018 8.33333333333333e-02
+1053 1159 1.66666666666667e-01
+1053 911 8.33333333333333e-02
+1053 910 -1.66666666666667e-01
+1053 1160 1.66666666666667e-01
+1053 1158 -7.50000000000000e-01
+1053 1043 1.66666666666667e-01
+1053 1042 -8.33333333333333e-02
+1053 1041 -2.50000000000000e-01
+1053 1013 -8.33333333333333e-02
+1053 1028 -8.33333333333333e-02
+1053 1025 8.33333333333333e-02
+1053 1027 1.66666666666667e-01
+1053 1024 -1.66666666666667e-01
+1053 769 8.33333333333333e-02
+1053 1026 -2.50000000000000e-01
+1053 1012 -8.33333333333333e-02
+1053 709 8.33333333333333e-02
+1053 908 -8.33333333333333e-02
+1053 1055 -3.33333333333333e-01
+1053 1252 -8.33333333333333e-02
+1053 923 -8.33333333333333e-02
+1053 920 8.33333333333333e-02
+1053 922 -8.33333333333333e-02
+1053 919 8.33333333333333e-02
+1053 1253 1.66666666666667e-01
+1053 770 -1.66666666666667e-01
+1053 1251 -2.50000000000000e-01
+1053 1052 1.66666666666667e-01
+1053 710 -1.66666666666667e-01
+1053 1051 1.66666666666667e-01
+1053 1054 -3.33333333333333e-01
+1053 907 1.66666666666667e-01
+1053 1050 -7.50000000000000e-01
+1053 1019 8.33333333333333e-02
+1053 906 -2.50000000000000e-01
+1054 1054 2.50000000000000e+00
+1054 1017 8.33333333333333e-02
+1054 1160 -8.33333333333333e-02
+1054 911 8.33333333333333e-02
+1054 1158 1.66666666666667e-01
+1054 909 -1.66666666666667e-01
+1054 1159 -2.50000000000000e-01
+1054 1043 1.66666666666667e-01
+1054 1042 -2.50000000000000e-01
+1054 1041 -8.33333333333333e-02
+1054 1013 -8.33333333333333e-02
+1054 1026 1.66666666666667e-01
+1054 1025 8.33333333333333e-02
+1054 1023 -1.66666666666667e-01
+1054 1028 1.66666666666667e-01
+1054 1055 -3.33333333333333e-01
+1054 1027 -7.50000000000000e-01
+1054 768 8.33333333333333e-02
+1054 1011 -8.33333333333333e-02
+1054 708 8.33333333333333e-02
+1054 1251 -8.33333333333333e-02
+1054 1253 1.66666666666667e-01
+1054 908 1.66666666666667e-01
+1054 920 -1.66666666666667e-01
+1054 921 -8.33333333333333e-02
+1054 918 8.33333333333333e-02
+1054 770 8.33333333333333e-02
+1054 923 -8.33333333333333e-02
+1054 1252 -2.50000000000000e-01
+1054 1052 -8.33333333333333e-02
+1054 710 8.33333333333333e-02
+1054 1051 -2.50000000000000e-01
+1054 1019 -1.66666666666667e-01
+1054 907 -7.50000000000000e-01
+1054 1050 1.66666666666667e-01
+1054 1053 -3.33333333333333e-01
+1054 906 1.66666666666667e-01
+1055 1055 2.50000000000000e+00
+1055 1018 -1.66666666666667e-01
+1055 1159 -8.33333333333333e-02
+1055 910 8.33333333333333e-02
+1055 909 8.33333333333333e-02
+1055 1160 -2.50000000000000e-01
+1055 1158 1.66666666666667e-01
+1055 1043 -7.50000000000000e-01
+1055 1042 1.66666666666667e-01
+1055 1041 1.66666666666667e-01
+1055 1011 -8.33333333333333e-02
+1055 1012 -8.33333333333333e-02
+1055 1026 -8.33333333333333e-02
+1055 1023 8.33333333333333e-02
+1055 1024 8.33333333333333e-02
+1055 1028 -2.50000000000000e-01
+1055 1027 1.66666666666667e-01
+1055 1054 -3.33333333333333e-01
+1055 906 -8.33333333333333e-02
+1055 1053 -3.33333333333333e-01
+1055 1252 1.66666666666667e-01
+1055 921 -8.33333333333333e-02
+1055 918 8.33333333333333e-02
+1055 907 1.66666666666667e-01
+1055 919 -1.66666666666667e-01
+1055 1253 -7.50000000000000e-01
+1055 769 8.33333333333333e-02
+1055 922 -8.33333333333333e-02
+1055 1251 1.66666666666667e-01
+1055 768 -1.66666666666667e-01
+1055 1052 -2.50000000000000e-01
+1055 1017 8.33333333333333e-02
+1055 908 -2.50000000000000e-01
+1055 1051 -8.33333333333333e-02
+1055 709 8.33333333333333e-02
+1055 1050 1.66666666666667e-01
+1055 708 -1.66666666666667e-01
+1056 1056 2.50000000000000e+00
+1056 1033 8.33333333333333e-02
+1056 914 8.33333333333333e-02
+1056 1220 -8.33333333333333e-02
+1056 1219 1.66666666666667e-01
+1056 913 -1.66666666666667e-01
+1056 1218 -2.50000000000000e-01
+1056 1046 1.66666666666667e-01
+1056 1045 -8.33333333333333e-02
+1056 1044 -2.50000000000000e-01
+1056 1031 -8.33333333333333e-02
+1056 1039 1.66666666666667e-01
+1056 1037 8.33333333333333e-02
+1056 1036 -1.66666666666667e-01
+1056 1040 1.66666666666667e-01
+1056 1058 -3.33333333333333e-01
+1056 778 8.33333333333333e-02
+1056 1038 -7.50000000000000e-01
+1056 1030 -8.33333333333333e-02
+1056 709 8.33333333333333e-02
+1056 1255 -8.33333333333333e-02
+1056 1256 1.66666666666667e-01
+1056 908 1.66666666666667e-01
+1056 920 -1.66666666666667e-01
+1056 925 -8.33333333333333e-02
+1056 919 8.33333333333333e-02
+1056 779 8.33333333333333e-02
+1056 926 -8.33333333333333e-02
+1056 1254 -2.50000000000000e-01
+1056 1052 -8.33333333333333e-02
+1056 710 8.33333333333333e-02
+1056 1057 -3.33333333333333e-01
+1056 1051 1.66666666666667e-01
+1056 907 1.66666666666667e-01
+1056 1034 -1.66666666666667e-01
+1056 1050 -2.50000000000000e-01
+1056 906 -7.50000000000000e-01
+1057 1057 2.50000000000000e+00
+1057 1032 8.33333333333333e-02
+1057 1218 1.66666666666667e-01
+1057 914 8.33333333333333e-02
+1057 912 -1.66666666666667e-01
+1057 1220 1.66666666666667e-01
+1057 1219 -7.50000000000000e-01
+1057 1046 1.66666666666667e-01
+1057 1045 -2.50000000000000e-01
+1057 1044 -8.33333333333333e-02
+1057 1031 -8.33333333333333e-02
+1057 1040 -8.33333333333333e-02
+1057 1037 8.33333333333333e-02
+1057 1038 1.66666666666667e-01
+1057 1035 -1.66666666666667e-01
+1057 1039 -2.50000000000000e-01
+1057 777 8.33333333333333e-02
+1057 1029 -8.33333333333333e-02
+1057 708 8.33333333333333e-02
+1057 908 -8.33333333333333e-02
+1057 1058 -3.33333333333333e-01
+1057 1254 -8.33333333333333e-02
+1057 926 -8.33333333333333e-02
+1057 920 8.33333333333333e-02
+1057 924 -8.33333333333333e-02
+1057 918 8.33333333333333e-02
+1057 779 -1.66666666666667e-01
+1057 1256 1.66666666666667e-01
+1057 1255 -2.50000000000000e-01
+1057 1052 1.66666666666667e-01
+1057 710 -1.66666666666667e-01
+1057 1034 8.33333333333333e-02
+1057 1051 -7.50000000000000e-01
+1057 907 -2.50000000000000e-01
+1057 1056 -3.33333333333333e-01
+1057 1050 1.66666666666667e-01
+1057 906 1.66666666666667e-01
+1058 1058 2.50000000000000e+00
+1058 1032 -1.66666666666667e-01
+1058 912 8.33333333333333e-02
+1058 1218 -8.33333333333333e-02
+1058 913 8.33333333333333e-02
+1058 1220 -2.50000000000000e-01
+1058 1219 1.66666666666667e-01
+1058 1046 -7.50000000000000e-01
+1058 1045 1.66666666666667e-01
+1058 1044 1.66666666666667e-01
+1058 1030 -8.33333333333333e-02
+1058 1029 -8.33333333333333e-02
+1058 1039 -8.33333333333333e-02
+1058 1036 8.33333333333333e-02
+1058 1035 8.33333333333333e-02
+1058 1040 -2.50000000000000e-01
+1058 1038 1.66666666666667e-01
+1058 1056 -3.33333333333333e-01
+1058 907 -8.33333333333333e-02
+1058 1057 -3.33333333333333e-01
+1058 925 -8.33333333333333e-02
+1058 919 8.33333333333333e-02
+1058 1254 1.66666666666667e-01
+1058 906 1.66666666666667e-01
+1058 918 -1.66666666666667e-01
+1058 1256 -7.50000000000000e-01
+1058 778 -1.66666666666667e-01
+1058 1255 1.66666666666667e-01
+1058 777 8.33333333333333e-02
+1058 924 -8.33333333333333e-02
+1058 1033 8.33333333333333e-02
+1058 1052 -2.50000000000000e-01
+1058 908 -2.50000000000000e-01
+1058 1051 1.66666666666667e-01
+1058 709 -1.66666666666667e-01
+1058 1050 -8.33333333333333e-02
+1058 708 8.33333333333333e-02
+1059 1059 1.25000000000000e+00
+1059 1103 -8.33333333333333e-02
+1059 1075 8.33333333333333e-02
+1059 1102 -8.33333333333333e-02
+1059 1099 -8.33333333333333e-02
+1059 1070 8.33333333333333e-02
+1059 1076 -1.66666666666667e-01
+1059 1069 8.33333333333333e-02
+1059 1068 -3.75000000000000e-01
+1059 806 8.33333333333333e-02
+1059 1061 -1.66666666666667e-01
+1059 1067 1.66666666666667e-01
+1059 1096 8.33333333333333e-02
+1059 1066 -8.33333333333333e-02
+1059 713 -4.16666666666667e-02
+1059 800 4.16666666666667e-02
+1059 712 8.33333333333333e-02
+1059 799 -8.33333333333333e-02
+1059 711 -1.25000000000000e-01
+1059 1065 -2.50000000000000e-01
+1059 719 -4.16666666666667e-02
+1059 1097 8.33333333333333e-02
+1059 1060 -1.66666666666667e-01
+1059 718 8.33333333333333e-02
+1059 805 8.33333333333333e-02
+1059 1100 4.16666666666667e-02
+1059 717 -1.25000000000000e-01
+1059 804 -3.75000000000000e-01
+1060 1060 1.25000000000000e+00
+1060 1101 -8.33333333333333e-02
+1060 1100 4.16666666666667e-02
+1060 1103 -8.33333333333333e-02
+1060 1098 -8.33333333333333e-02
+1060 1070 -4.16666666666667e-02
+1060 1076 8.33333333333333e-02
+1060 1069 -1.25000000000000e-01
+1060 1068 8.33333333333333e-02
+1060 806 -4.16666666666667e-02
+1060 800 4.16666666666667e-02
+1060 1095 8.33333333333333e-02
+1060 1065 -8.33333333333333e-02
+1060 713 8.33333333333333e-02
+1060 1061 -1.66666666666667e-01
+1060 1067 1.66666666666667e-01
+1060 712 -3.75000000000000e-01
+1060 1066 -2.50000000000000e-01
+1060 711 8.33333333333333e-02
+1060 798 -8.33333333333333e-02
+1060 719 8.33333333333333e-02
+1060 1097 -1.66666666666667e-01
+1060 1074 8.33333333333333e-02
+1060 718 -3.75000000000000e-01
+1060 805 -1.25000000000000e-01
+1060 1059 -1.66666666666667e-01
+1060 717 8.33333333333333e-02
+1060 804 8.33333333333333e-02
+1061 1061 1.25000000000000e+00
+1061 1101 -8.33333333333333e-02
+1061 1099 4.16666666666667e-02
+1061 1102 -8.33333333333333e-02
+1061 1070 -1.25000000000000e-01
+1061 1069 -4.16666666666667e-02
+1061 1075 8.33333333333333e-02
+1061 1068 8.33333333333333e-02
+1061 1074 -1.66666666666667e-01
+1061 805 -4.16666666666667e-02
+1061 799 4.16666666666667e-02
+1061 804 8.33333333333333e-02
+1061 1059 -1.66666666666667e-01
+1061 1065 1.66666666666667e-01
+1061 713 -1.25000000000000e-01
+1061 1067 -7.50000000000000e-01
+1061 712 8.33333333333333e-02
+1061 1060 -1.66666666666667e-01
+1061 1066 1.66666666666667e-01
+1061 711 -4.16666666666667e-02
+1061 798 4.16666666666667e-02
+1061 1098 4.16666666666667e-02
+1061 719 -1.25000000000000e-01
+1061 806 -1.25000000000000e-01
+1061 718 8.33333333333333e-02
+1061 1096 -1.66666666666667e-01
+1061 717 -4.16666666666667e-02
+1061 1095 8.33333333333333e-02
+1062 1062 1.25000000000000e+00
+1062 1073 8.33333333333333e-02
+1062 1072 8.33333333333333e-02
+1062 1071 -3.75000000000000e-01
+1062 1136 -8.33333333333333e-02
+1062 1138 -8.33333333333333e-02
+1062 1076 8.33333333333333e-02
+1062 1075 -1.66666666666667e-01
+1062 1139 -8.33333333333333e-02
+1062 1133 8.33333333333333e-02
+1062 1067 -8.33333333333333e-02
+1062 1063 -1.66666666666667e-01
+1062 1066 1.66666666666667e-01
+1062 811 8.33333333333333e-02
+1062 713 8.33333333333333e-02
+1062 800 -8.33333333333333e-02
+1062 712 -4.16666666666667e-02
+1062 799 4.16666666666667e-02
+1062 711 -1.25000000000000e-01
+1062 1065 -2.50000000000000e-01
+1062 1064 -1.66666666666667e-01
+1062 725 8.33333333333333e-02
+1062 812 8.33333333333333e-02
+1062 724 -4.16666666666667e-02
+1062 1132 8.33333333333333e-02
+1062 1135 4.16666666666667e-02
+1062 723 -1.25000000000000e-01
+1062 810 -3.75000000000000e-01
+1063 1063 1.25000000000000e+00
+1063 1073 -4.16666666666667e-02
+1063 1072 -1.25000000000000e-01
+1063 1071 8.33333333333333e-02
+1063 1136 4.16666666666667e-02
+1063 1076 8.33333333333333e-02
+1063 1139 -8.33333333333333e-02
+1063 1137 -8.33333333333333e-02
+1063 1074 -1.66666666666667e-01
+1063 800 4.16666666666667e-02
+1063 812 -4.16666666666667e-02
+1063 1062 -1.66666666666667e-01
+1063 1065 1.66666666666667e-01
+1063 810 8.33333333333333e-02
+1063 713 8.33333333333333e-02
+1063 1064 -1.66666666666667e-01
+1063 1067 1.66666666666667e-01
+1063 712 -1.25000000000000e-01
+1063 1066 -7.50000000000000e-01
+1063 711 -4.16666666666667e-02
+1063 798 4.16666666666667e-02
+1063 725 8.33333333333333e-02
+1063 1133 -1.66666666666667e-01
+1063 1134 4.16666666666667e-02
+1063 724 -1.25000000000000e-01
+1063 811 -1.25000000000000e-01
+1063 723 -4.16666666666667e-02
+1063 1131 8.33333333333333e-02
+1064 1064 1.25000000000000e+00
+1064 1072 -4.16666666666667e-02
+1064 1071 8.33333333333333e-02
+1064 1135 4.16666666666667e-02
+1064 1134 -8.33333333333333e-02
+1064 1075 8.33333333333333e-02
+1064 1138 -8.33333333333333e-02
+1064 1074 8.33333333333333e-02
+1064 1137 -8.33333333333333e-02
+1064 1131 8.33333333333333e-02
+1064 1065 -8.33333333333333e-02
+1064 799 4.16666666666667e-02
+1064 811 -4.16666666666667e-02
+1064 713 -3.75000000000000e-01
+1064 1067 -2.50000000000000e-01
+1064 712 8.33333333333333e-02
+1064 1063 -1.66666666666667e-01
+1064 1066 1.66666666666667e-01
+1064 711 8.33333333333333e-02
+1064 798 -8.33333333333333e-02
+1064 1073 -1.25000000000000e-01
+1064 725 -3.75000000000000e-01
+1064 812 -1.25000000000000e-01
+1064 724 8.33333333333333e-02
+1064 1132 -1.66666666666667e-01
+1064 1062 -1.66666666666667e-01
+1064 723 8.33333333333333e-02
+1064 810 8.33333333333333e-02
+1065 1065 2.50000000000000e+00
+1065 1102 -1.66666666666667e-01
+1065 1061 1.66666666666667e-01
+1065 805 8.33333333333333e-02
+1065 1060 -8.33333333333333e-02
+1065 806 -1.66666666666667e-01
+1065 1059 -2.50000000000000e-01
+1065 1097 -8.33333333333333e-02
+1065 1096 1.66666666666667e-01
+1065 1095 -2.50000000000000e-01
+1065 1168 -8.33333333333333e-02
+1065 1076 1.66666666666667e-01
+1065 1139 -1.66666666666667e-01
+1065 1138 8.33333333333333e-02
+1065 713 8.33333333333333e-02
+1065 1075 1.66666666666667e-01
+1065 1066 -3.33333333333333e-01
+1065 1074 -7.50000000000000e-01
+1065 1169 -8.33333333333333e-02
+1065 731 8.33333333333333e-02
+1065 1064 -8.33333333333333e-02
+1065 1063 1.66666666666667e-01
+1065 800 -8.33333333333333e-02
+1065 812 8.33333333333333e-02
+1065 817 1.66666666666667e-01
+1065 811 -1.66666666666667e-01
+1065 712 8.33333333333333e-02
+1065 799 -8.33333333333333e-02
+1065 1062 -2.50000000000000e-01
+1065 1067 -3.33333333333333e-01
+1065 1133 1.66666666666667e-01
+1065 818 1.66666666666667e-01
+1065 1132 -8.33333333333333e-02
+1065 730 8.33333333333333e-02
+1065 1103 8.33333333333333e-02
+1065 1131 -2.50000000000000e-01
+1065 816 -7.50000000000000e-01
+1066 1066 2.50000000000000e+00
+1066 1101 -1.66666666666667e-01
+1066 804 8.33333333333333e-02
+1066 1059 -8.33333333333333e-02
+1066 806 8.33333333333333e-02
+1066 1061 1.66666666666667e-01
+1066 1060 -2.50000000000000e-01
+1066 1097 1.66666666666667e-01
+1066 1096 -7.50000000000000e-01
+1066 1095 1.66666666666667e-01
+1066 1169 -8.33333333333333e-02
+1066 1167 -8.33333333333333e-02
+1066 1076 -8.33333333333333e-02
+1066 1139 8.33333333333333e-02
+1066 1137 8.33333333333333e-02
+1066 1075 -2.50000000000000e-01
+1066 1074 1.66666666666667e-01
+1066 1065 -3.33333333333333e-01
+1066 818 -8.33333333333333e-02
+1066 1067 -3.33333333333333e-01
+1066 800 -8.33333333333333e-02
+1066 812 8.33333333333333e-02
+1066 1062 1.66666666666667e-01
+1066 816 1.66666666666667e-01
+1066 810 -1.66666666666667e-01
+1066 713 -1.66666666666667e-01
+1066 1064 1.66666666666667e-01
+1066 1063 -7.50000000000000e-01
+1066 711 8.33333333333333e-02
+1066 798 -8.33333333333333e-02
+1066 1133 1.66666666666667e-01
+1066 731 -1.66666666666667e-01
+1066 1103 8.33333333333333e-02
+1066 1132 -2.50000000000000e-01
+1066 817 -2.50000000000000e-01
+1066 1131 -8.33333333333333e-02
+1066 729 8.33333333333333e-02
+1067 1067 2.50000000000000e+00
+1067 1101 8.33333333333333e-02
+1067 1059 1.66666666666667e-01
+1067 805 8.33333333333333e-02
+1067 804 -1.66666666666667e-01
+1067 1061 -7.50000000000000e-01
+1067 1060 1.66666666666667e-01
+1067 1097 -2.50000000000000e-01
+1067 1096 1.66666666666667e-01
+1067 1095 -8.33333333333333e-02
+1067 1168 -8.33333333333333e-02
+1067 1075 -8.33333333333333e-02
+1067 1138 8.33333333333333e-02
+1067 1074 1.66666666666667e-01
+1067 1137 -1.66666666666667e-01
+1067 1076 -2.50000000000000e-01
+1067 711 8.33333333333333e-02
+1067 1167 -8.33333333333333e-02
+1067 729 8.33333333333333e-02
+1067 817 -8.33333333333333e-02
+1067 1066 -3.33333333333333e-01
+1067 1062 -8.33333333333333e-02
+1067 799 -8.33333333333333e-02
+1067 811 8.33333333333333e-02
+1067 798 -8.33333333333333e-02
+1067 810 8.33333333333333e-02
+1067 1064 -2.50000000000000e-01
+1067 712 -1.66666666666667e-01
+1067 1063 1.66666666666667e-01
+1067 1102 8.33333333333333e-02
+1067 1133 -7.50000000000000e-01
+1067 818 -2.50000000000000e-01
+1067 1132 1.66666666666667e-01
+1067 730 -1.66666666666667e-01
+1067 1065 -3.33333333333333e-01
+1067 1131 1.66666666666667e-01
+1067 816 1.66666666666667e-01
+1068 1068 1.25000000000000e+00
+1068 1102 8.33333333333333e-02
+1068 1103 8.33333333333333e-02
+1068 1061 8.33333333333333e-02
+1068 1070 -1.66666666666667e-01
+1068 1060 8.33333333333333e-02
+1068 1059 -3.75000000000000e-01
+1068 1099 8.33333333333333e-02
+1068 1098 -1.25000000000000e-01
+1068 1075 -8.33333333333333e-02
+1068 1069 -1.66666666666667e-01
+1068 824 8.33333333333333e-02
+1068 1186 -8.33333333333333e-02
+1068 829 8.33333333333333e-02
+1068 1076 1.66666666666667e-01
+1068 830 -1.66666666666667e-01
+1068 734 4.16666666666667e-02
+1068 1187 -8.33333333333333e-02
+1068 823 8.33333333333333e-02
+1068 733 -8.33333333333333e-02
+1068 822 -3.75000000000000e-01
+1068 821 -4.16666666666667e-02
+1068 713 4.16666666666667e-02
+1068 820 8.33333333333333e-02
+1068 712 -8.33333333333333e-02
+1068 819 -1.25000000000000e-01
+1068 1100 -4.16666666666667e-02
+1068 1074 -2.50000000000000e-01
+1069 1069 1.25000000000000e+00
+1069 1101 8.33333333333333e-02
+1069 1103 -1.66666666666667e-01
+1069 1061 -4.16666666666667e-02
+1069 713 4.16666666666667e-02
+1069 1060 -1.25000000000000e-01
+1069 1059 8.33333333333333e-02
+1069 734 4.16666666666667e-02
+1069 1099 -3.75000000000000e-01
+1069 1098 8.33333333333333e-02
+1069 1074 -8.33333333333333e-02
+1069 824 -4.16666666666667e-02
+1069 1068 -1.66666666666667e-01
+1069 1185 -8.33333333333333e-02
+1069 828 8.33333333333333e-02
+1069 1187 -8.33333333333333e-02
+1069 830 8.33333333333333e-02
+1069 823 -1.25000000000000e-01
+1069 822 8.33333333333333e-02
+1069 732 -8.33333333333333e-02
+1069 821 8.33333333333333e-02
+1069 1070 -1.66666666666667e-01
+1069 1076 1.66666666666667e-01
+1069 820 -3.75000000000000e-01
+1069 1100 8.33333333333333e-02
+1069 1075 -2.50000000000000e-01
+1069 819 8.33333333333333e-02
+1069 711 -8.33333333333333e-02
+1070 1070 1.25000000000000e+00
+1070 1098 -4.16666666666667e-02
+1070 1102 -1.66666666666667e-01
+1070 1101 8.33333333333333e-02
+1070 1061 -1.25000000000000e-01
+1070 1060 -4.16666666666667e-02
+1070 712 4.16666666666667e-02
+1070 1059 8.33333333333333e-02
+1070 1068 -1.66666666666667e-01
+1070 1100 -1.25000000000000e-01
+1070 733 4.16666666666667e-02
+1070 823 -4.16666666666667e-02
+1070 822 8.33333333333333e-02
+1070 1186 -8.33333333333333e-02
+1070 829 8.33333333333333e-02
+1070 1074 1.66666666666667e-01
+1070 828 -1.66666666666667e-01
+1070 824 -1.25000000000000e-01
+1070 732 4.16666666666667e-02
+1070 1185 -8.33333333333333e-02
+1070 821 -1.25000000000000e-01
+1070 1099 8.33333333333333e-02
+1070 1076 -7.50000000000000e-01
+1070 820 8.33333333333333e-02
+1070 1069 -1.66666666666667e-01
+1070 1075 1.66666666666667e-01
+1070 819 -4.16666666666667e-02
+1070 711 4.16666666666667e-02
+1071 1071 1.25000000000000e+00
+1071 1135 -4.16666666666667e-02
+1071 1138 8.33333333333333e-02
+1071 1136 8.33333333333333e-02
+1071 1134 -1.25000000000000e-01
+1071 1064 8.33333333333333e-02
+1071 1072 -1.66666666666667e-01
+1071 1063 8.33333333333333e-02
+1071 1062 -3.75000000000000e-01
+1071 1193 -8.33333333333333e-02
+1071 1073 -1.66666666666667e-01
+1071 826 8.33333333333333e-02
+1071 830 8.33333333333333e-02
+1071 1076 -8.33333333333333e-02
+1071 829 -1.66666666666667e-01
+1071 1075 1.66666666666667e-01
+1071 827 8.33333333333333e-02
+1071 737 -8.33333333333333e-02
+1071 736 4.16666666666667e-02
+1071 1192 -8.33333333333333e-02
+1071 825 -3.75000000000000e-01
+1071 821 8.33333333333333e-02
+1071 713 -8.33333333333333e-02
+1071 820 -4.16666666666667e-02
+1071 712 4.16666666666667e-02
+1071 819 -1.25000000000000e-01
+1071 1139 8.33333333333333e-02
+1071 1074 -2.50000000000000e-01
+1072 1072 1.25000000000000e+00
+1072 1139 -1.66666666666667e-01
+1072 1134 -4.16666666666667e-02
+1072 1137 8.33333333333333e-02
+1072 737 4.16666666666667e-02
+1072 1135 -1.25000000000000e-01
+1072 713 4.16666666666667e-02
+1072 1064 -4.16666666666667e-02
+1072 1063 -1.25000000000000e-01
+1072 1071 -1.66666666666667e-01
+1072 1062 8.33333333333333e-02
+1072 1193 -8.33333333333333e-02
+1072 827 -4.16666666666667e-02
+1072 830 8.33333333333333e-02
+1072 825 8.33333333333333e-02
+1072 828 -1.66666666666667e-01
+1072 1074 1.66666666666667e-01
+1072 826 -1.25000000000000e-01
+1072 735 4.16666666666667e-02
+1072 1191 -8.33333333333333e-02
+1072 821 8.33333333333333e-02
+1072 1073 -1.66666666666667e-01
+1072 1076 1.66666666666667e-01
+1072 820 -1.25000000000000e-01
+1072 1136 8.33333333333333e-02
+1072 1075 -7.50000000000000e-01
+1072 819 -4.16666666666667e-02
+1072 711 4.16666666666667e-02
+1073 1073 1.25000000000000e+00
+1073 1135 8.33333333333333e-02
+1073 1138 -1.66666666666667e-01
+1073 1136 -3.75000000000000e-01
+1073 736 4.16666666666667e-02
+1073 1134 8.33333333333333e-02
+1073 1064 -1.25000000000000e-01
+1073 712 4.16666666666667e-02
+1073 1063 -4.16666666666667e-02
+1073 1062 8.33333333333333e-02
+1073 1192 -8.33333333333333e-02
+1073 1191 -8.33333333333333e-02
+1073 826 -4.16666666666667e-02
+1073 829 8.33333333333333e-02
+1073 1071 -1.66666666666667e-01
+1073 828 8.33333333333333e-02
+1073 1074 -8.33333333333333e-02
+1073 827 -1.25000000000000e-01
+1073 825 8.33333333333333e-02
+1073 735 -8.33333333333333e-02
+1073 821 -3.75000000000000e-01
+1073 1137 8.33333333333333e-02
+1073 1076 -2.50000000000000e-01
+1073 820 8.33333333333333e-02
+1073 1072 -1.66666666666667e-01
+1073 1075 1.66666666666667e-01
+1073 819 8.33333333333333e-02
+1073 711 -8.33333333333333e-02
+1074 1074 2.50000000000000e+00
+1074 1103 -8.33333333333333e-02
+1074 1061 -1.66666666666667e-01
+1074 1102 1.66666666666667e-01
+1074 1101 -2.50000000000000e-01
+1074 1069 -8.33333333333333e-02
+1074 1070 1.66666666666667e-01
+1074 1068 -2.50000000000000e-01
+1074 1187 8.33333333333333e-02
+1074 1186 -1.66666666666667e-01
+1074 1168 8.33333333333333e-02
+1074 1138 -8.33333333333333e-02
+1074 1076 -3.33333333333333e-01
+1074 1067 1.66666666666667e-01
+1074 1139 1.66666666666667e-01
+1074 713 -8.33333333333333e-02
+1074 1064 8.33333333333333e-02
+1074 1066 1.66666666666667e-01
+1074 1063 -1.66666666666667e-01
+1074 1065 -7.50000000000000e-01
+1074 740 -8.33333333333333e-02
+1074 1169 8.33333333333333e-02
+1074 1137 -2.50000000000000e-01
+1074 821 8.33333333333333e-02
+1074 1073 -8.33333333333333e-02
+1074 829 1.66666666666667e-01
+1074 1075 -3.33333333333333e-01
+1074 1072 1.66666666666667e-01
+1074 830 1.66666666666667e-01
+1074 1193 -1.66666666666667e-01
+1074 1192 8.33333333333333e-02
+1074 739 -8.33333333333333e-02
+1074 828 -7.50000000000000e-01
+1074 820 8.33333333333333e-02
+1074 712 -8.33333333333333e-02
+1074 1071 -2.50000000000000e-01
+1074 1060 8.33333333333333e-02
+1075 1075 2.50000000000000e+00
+1075 1103 1.66666666666667e-01
+1075 1061 8.33333333333333e-02
+1075 1102 -7.50000000000000e-01
+1075 1101 1.66666666666667e-01
+1075 1068 -8.33333333333333e-02
+1075 1187 8.33333333333333e-02
+1075 1070 1.66666666666667e-01
+1075 1069 -2.50000000000000e-01
+1075 1185 -1.66666666666667e-01
+1075 1076 -3.33333333333333e-01
+1075 740 -8.33333333333333e-02
+1075 713 -8.33333333333333e-02
+1075 1167 8.33333333333333e-02
+1075 1137 -8.33333333333333e-02
+1075 1067 -8.33333333333333e-02
+1075 1064 8.33333333333333e-02
+1075 1066 -2.50000000000000e-01
+1075 1065 1.66666666666667e-01
+1075 1062 -1.66666666666667e-01
+1075 1169 -1.66666666666667e-01
+1075 1139 1.66666666666667e-01
+1075 1138 -2.50000000000000e-01
+1075 830 -8.33333333333333e-02
+1075 1193 8.33333333333333e-02
+1075 828 1.66666666666667e-01
+1075 1074 -3.33333333333333e-01
+1075 1071 1.66666666666667e-01
+1075 829 -2.50000000000000e-01
+1075 1191 8.33333333333333e-02
+1075 738 -8.33333333333333e-02
+1075 821 -1.66666666666667e-01
+1075 1073 1.66666666666667e-01
+1075 1072 -7.50000000000000e-01
+1075 1059 8.33333333333333e-02
+1075 819 8.33333333333333e-02
+1075 711 -8.33333333333333e-02
+1076 1076 2.50000000000000e+00
+1076 1101 -8.33333333333333e-02
+1076 1060 8.33333333333333e-02
+1076 1059 -1.66666666666667e-01
+1076 1103 -2.50000000000000e-01
+1076 1186 8.33333333333333e-02
+1076 1068 1.66666666666667e-01
+1076 1070 -7.50000000000000e-01
+1076 1069 1.66666666666667e-01
+1076 1185 8.33333333333333e-02
+1076 1075 -3.33333333333333e-01
+1076 739 -8.33333333333333e-02
+1076 712 -8.33333333333333e-02
+1076 1066 -8.33333333333333e-02
+1076 1063 8.33333333333333e-02
+1076 1074 -3.33333333333333e-01
+1076 1065 1.66666666666667e-01
+1076 1137 1.66666666666667e-01
+1076 1067 -2.50000000000000e-01
+1076 711 -8.33333333333333e-02
+1076 1062 8.33333333333333e-02
+1076 1139 -7.50000000000000e-01
+1076 1168 -1.66666666666667e-01
+1076 1138 1.66666666666667e-01
+1076 738 -8.33333333333333e-02
+1076 1167 8.33333333333333e-02
+1076 829 -8.33333333333333e-02
+1076 1192 8.33333333333333e-02
+1076 819 8.33333333333333e-02
+1076 1071 -8.33333333333333e-02
+1076 830 -2.50000000000000e-01
+1076 828 1.66666666666667e-01
+1076 1191 -1.66666666666667e-01
+1076 1073 -2.50000000000000e-01
+1076 1102 1.66666666666667e-01
+1076 820 -1.66666666666667e-01
+1076 1072 1.66666666666667e-01
+1077 1077 1.25000000000000e+00
+1077 1108 -8.33333333333333e-02
+1077 1088 -4.16666666666667e-02
+1077 1094 8.33333333333333e-02
+1077 1087 8.33333333333333e-02
+1077 1086 -1.25000000000000e-01
+1077 1106 4.16666666666667e-02
+1077 1109 -8.33333333333333e-02
+1077 1105 -8.33333333333333e-02
+1077 803 4.16666666666667e-02
+1077 806 -4.16666666666667e-02
+1077 1096 8.33333333333333e-02
+1077 1084 -8.33333333333333e-02
+1077 719 8.33333333333333e-02
+1077 1097 -1.66666666666667e-01
+1077 718 8.33333333333333e-02
+1077 1078 -1.66666666666667e-01
+1077 805 8.33333333333333e-02
+1077 717 -3.75000000000000e-01
+1077 804 -1.25000000000000e-01
+1077 1079 -1.66666666666667e-01
+1077 716 8.33333333333333e-02
+1077 1085 1.66666666666667e-01
+1077 715 8.33333333333333e-02
+1077 802 -8.33333333333333e-02
+1077 1093 8.33333333333333e-02
+1077 714 -3.75000000000000e-01
+1077 1083 -2.50000000000000e-01
+1078 1078 1.25000000000000e+00
+1078 1109 -8.33333333333333e-02
+1078 1092 8.33333333333333e-02
+1078 1107 -8.33333333333333e-02
+1078 1088 8.33333333333333e-02
+1078 1094 -1.66666666666667e-01
+1078 1087 -3.75000000000000e-01
+1078 1086 8.33333333333333e-02
+1078 1104 -8.33333333333333e-02
+1078 1079 -1.66666666666667e-01
+1078 806 8.33333333333333e-02
+1078 1085 1.66666666666667e-01
+1078 1095 8.33333333333333e-02
+1078 1083 -8.33333333333333e-02
+1078 719 -4.16666666666667e-02
+1078 1097 8.33333333333333e-02
+1078 718 -1.25000000000000e-01
+1078 805 -3.75000000000000e-01
+1078 717 8.33333333333333e-02
+1078 1077 -1.66666666666667e-01
+1078 804 8.33333333333333e-02
+1078 716 -4.16666666666667e-02
+1078 803 4.16666666666667e-02
+1078 1106 4.16666666666667e-02
+1078 715 -1.25000000000000e-01
+1078 1084 -2.50000000000000e-01
+1078 714 8.33333333333333e-02
+1078 801 -8.33333333333333e-02
+1079 1079 1.25000000000000e+00
+1079 1108 -8.33333333333333e-02
+1079 1088 -1.25000000000000e-01
+1079 1087 8.33333333333333e-02
+1079 1093 -1.66666666666667e-01
+1079 1086 -4.16666666666667e-02
+1079 1092 8.33333333333333e-02
+1079 1104 4.16666666666667e-02
+1079 1107 -8.33333333333333e-02
+1079 801 4.16666666666667e-02
+1079 804 -4.16666666666667e-02
+1079 1078 -1.66666666666667e-01
+1079 805 8.33333333333333e-02
+1079 1084 1.66666666666667e-01
+1079 719 -1.25000000000000e-01
+1079 806 -1.25000000000000e-01
+1079 718 -4.16666666666667e-02
+1079 1096 8.33333333333333e-02
+1079 717 8.33333333333333e-02
+1079 1095 -1.66666666666667e-01
+1079 1105 4.16666666666667e-02
+1079 716 -1.25000000000000e-01
+1079 1085 -7.50000000000000e-01
+1079 715 -4.16666666666667e-02
+1079 802 4.16666666666667e-02
+1079 1077 -1.66666666666667e-01
+1079 714 8.33333333333333e-02
+1079 1083 1.66666666666667e-01
+1080 1080 2.50000000000000e+00
+1080 1157 -8.33333333333333e-02
+1080 1156 -8.33333333333333e-02
+1080 1093 -1.66666666666667e-01
+1080 1084 1.66666666666667e-01
+1080 1151 -1.66666666666667e-01
+1080 1150 8.33333333333333e-02
+1080 1085 1.66666666666667e-01
+1080 1083 -7.50000000000000e-01
+1080 1091 -8.33333333333333e-02
+1080 1154 8.33333333333333e-02
+1080 1090 1.66666666666667e-01
+1080 1081 -3.33333333333333e-01
+1080 988 1.66666666666667e-01
+1080 986 -1.66666666666667e-01
+1080 716 1.66666666666667e-01
+1080 985 8.33333333333333e-02
+1080 715 -8.33333333333333e-02
+1080 1089 -2.50000000000000e-01
+1080 989 1.66666666666667e-01
+1080 1082 -3.33333333333333e-01
+1080 728 1.66666666666667e-01
+1080 1153 8.33333333333333e-02
+1080 727 -8.33333333333333e-02
+1080 987 -7.50000000000000e-01
+1080 961 -8.33333333333333e-02
+1080 802 8.33333333333333e-02
+1080 803 8.33333333333333e-02
+1080 962 -8.33333333333333e-02
+1080 714 -2.50000000000000e-01
+1080 815 -8.33333333333333e-02
+1080 968 8.33333333333333e-02
+1080 814 1.66666666666667e-01
+1080 967 -1.66666666666667e-01
+1080 813 -2.50000000000000e-01
+1080 1094 8.33333333333333e-02
+1080 726 -2.50000000000000e-01
+1081 1081 2.50000000000000e+00
+1081 1094 8.33333333333333e-02
+1081 1092 -1.66666666666667e-01
+1081 1157 -8.33333333333333e-02
+1081 1085 -8.33333333333333e-02
+1081 1151 8.33333333333333e-02
+1081 1083 1.66666666666667e-01
+1081 1149 8.33333333333333e-02
+1081 1084 -2.50000000000000e-01
+1081 986 8.33333333333333e-02
+1081 989 -8.33333333333333e-02
+1081 1089 1.66666666666667e-01
+1081 1080 -3.33333333333333e-01
+1081 987 1.66666666666667e-01
+1081 1091 1.66666666666667e-01
+1081 1090 -7.50000000000000e-01
+1081 984 8.33333333333333e-02
+1081 714 -8.33333333333333e-02
+1081 1154 -1.66666666666667e-01
+1081 988 -2.50000000000000e-01
+1081 1152 8.33333333333333e-02
+1081 726 -8.33333333333333e-02
+1081 960 -8.33333333333333e-02
+1081 801 8.33333333333333e-02
+1081 962 -8.33333333333333e-02
+1081 968 8.33333333333333e-02
+1081 803 -1.66666666666667e-01
+1081 716 1.66666666666667e-01
+1081 715 -2.50000000000000e-01
+1081 815 1.66666666666667e-01
+1081 1082 -3.33333333333333e-01
+1081 728 1.66666666666667e-01
+1081 814 -7.50000000000000e-01
+1081 1155 -8.33333333333333e-02
+1081 727 -2.50000000000000e-01
+1081 813 1.66666666666667e-01
+1081 966 -1.66666666666667e-01
+1082 1082 2.50000000000000e+00
+1082 1155 -8.33333333333333e-02
+1082 1093 8.33333333333333e-02
+1082 1156 -8.33333333333333e-02
+1082 1084 -8.33333333333333e-02
+1082 1150 8.33333333333333e-02
+1082 1149 -1.66666666666667e-01
+1082 1085 -2.50000000000000e-01
+1082 1083 1.66666666666667e-01
+1082 985 8.33333333333333e-02
+1082 988 -8.33333333333333e-02
+1082 1089 -8.33333333333333e-02
+1082 1152 8.33333333333333e-02
+1082 1091 -2.50000000000000e-01
+1082 1090 1.66666666666667e-01
+1082 984 -1.66666666666667e-01
+1082 714 1.66666666666667e-01
+1082 989 -2.50000000000000e-01
+1082 1153 -1.66666666666667e-01
+1082 987 1.66666666666667e-01
+1082 1080 -3.33333333333333e-01
+1082 726 1.66666666666667e-01
+1082 961 -8.33333333333333e-02
+1082 967 8.33333333333333e-02
+1082 716 -7.50000000000000e-01
+1082 802 -1.66666666666667e-01
+1082 715 1.66666666666667e-01
+1082 801 8.33333333333333e-02
+1082 960 -8.33333333333333e-02
+1082 815 -2.50000000000000e-01
+1082 1092 8.33333333333333e-02
+1082 728 -7.50000000000000e-01
+1082 814 1.66666666666667e-01
+1082 1081 -3.33333333333333e-01
+1082 727 1.66666666666667e-01
+1082 813 -8.33333333333333e-02
+1082 966 8.33333333333333e-02
+1083 1083 2.50000000000000e+00
+1083 1108 -1.66666666666667e-01
+1083 1078 -8.33333333333333e-02
+1083 805 8.33333333333333e-02
+1083 806 8.33333333333333e-02
+1083 1079 1.66666666666667e-01
+1083 1077 -2.50000000000000e-01
+1083 1097 1.66666666666667e-01
+1083 1096 1.66666666666667e-01
+1083 1095 -7.50000000000000e-01
+1083 1172 -8.33333333333333e-02
+1083 1171 -8.33333333333333e-02
+1083 1094 -8.33333333333333e-02
+1083 1157 8.33333333333333e-02
+1083 1156 8.33333333333333e-02
+1083 1093 1.66666666666667e-01
+1083 1084 -3.33333333333333e-01
+1083 1092 -2.50000000000000e-01
+1083 818 -8.33333333333333e-02
+1083 1085 -3.33333333333333e-01
+1083 803 -8.33333333333333e-02
+1083 815 8.33333333333333e-02
+1083 1081 1.66666666666667e-01
+1083 817 1.66666666666667e-01
+1083 814 -1.66666666666667e-01
+1083 1082 1.66666666666667e-01
+1083 716 -1.66666666666667e-01
+1083 715 8.33333333333333e-02
+1083 802 -8.33333333333333e-02
+1083 1080 -7.50000000000000e-01
+1083 1151 1.66666666666667e-01
+1083 731 -1.66666666666667e-01
+1083 1150 -8.33333333333333e-02
+1083 730 8.33333333333333e-02
+1083 1149 -2.50000000000000e-01
+1083 1109 8.33333333333333e-02
+1083 816 -2.50000000000000e-01
+1084 1084 2.50000000000000e+00
+1084 1107 -1.66666666666667e-01
+1084 1079 1.66666666666667e-01
+1084 1077 -8.33333333333333e-02
+1084 804 8.33333333333333e-02
+1084 806 -1.66666666666667e-01
+1084 1078 -2.50000000000000e-01
+1084 1097 -8.33333333333333e-02
+1084 1096 -2.50000000000000e-01
+1084 1095 1.66666666666667e-01
+1084 1170 -8.33333333333333e-02
+1084 1094 1.66666666666667e-01
+1084 1157 -1.66666666666667e-01
+1084 1155 8.33333333333333e-02
+1084 716 8.33333333333333e-02
+1084 1093 -7.50000000000000e-01
+1084 1092 1.66666666666667e-01
+1084 1083 -3.33333333333333e-01
+1084 1172 -8.33333333333333e-02
+1084 731 8.33333333333333e-02
+1084 1082 -8.33333333333333e-02
+1084 1080 1.66666666666667e-01
+1084 803 -8.33333333333333e-02
+1084 815 8.33333333333333e-02
+1084 816 1.66666666666667e-01
+1084 813 -1.66666666666667e-01
+1084 1081 -2.50000000000000e-01
+1084 714 8.33333333333333e-02
+1084 801 -8.33333333333333e-02
+1084 1151 1.66666666666667e-01
+1084 1085 -3.33333333333333e-01
+1084 818 1.66666666666667e-01
+1084 1150 -2.50000000000000e-01
+1084 1109 8.33333333333333e-02
+1084 817 -7.50000000000000e-01
+1084 1149 -8.33333333333333e-02
+1084 729 8.33333333333333e-02
+1085 1085 2.50000000000000e+00
+1085 1108 8.33333333333333e-02
+1085 1078 1.66666666666667e-01
+1085 805 -1.66666666666667e-01
+1085 804 8.33333333333333e-02
+1085 1079 -7.50000000000000e-01
+1085 1077 1.66666666666667e-01
+1085 1097 -2.50000000000000e-01
+1085 1096 -8.33333333333333e-02
+1085 1095 1.66666666666667e-01
+1085 1170 -8.33333333333333e-02
+1085 1093 1.66666666666667e-01
+1085 1092 -8.33333333333333e-02
+1085 1155 8.33333333333333e-02
+1085 1156 -1.66666666666667e-01
+1085 1094 -2.50000000000000e-01
+1085 715 8.33333333333333e-02
+1085 1171 -8.33333333333333e-02
+1085 730 8.33333333333333e-02
+1085 816 -8.33333333333333e-02
+1085 1081 -8.33333333333333e-02
+1085 1083 -3.33333333333333e-01
+1085 801 -8.33333333333333e-02
+1085 813 8.33333333333333e-02
+1085 802 -8.33333333333333e-02
+1085 814 8.33333333333333e-02
+1085 1082 -2.50000000000000e-01
+1085 1080 1.66666666666667e-01
+1085 714 -1.66666666666667e-01
+1085 1151 -7.50000000000000e-01
+1085 1107 8.33333333333333e-02
+1085 818 -2.50000000000000e-01
+1085 1150 1.66666666666667e-01
+1085 1084 -3.33333333333333e-01
+1085 817 1.66666666666667e-01
+1085 1149 1.66666666666667e-01
+1085 729 -1.66666666666667e-01
+1086 1086 1.25000000000000e+00
+1086 1108 8.33333333333333e-02
+1086 1109 -1.66666666666667e-01
+1086 716 4.16666666666667e-02
+1086 1079 -4.16666666666667e-02
+1086 1078 8.33333333333333e-02
+1086 1077 -1.25000000000000e-01
+1086 749 4.16666666666667e-02
+1086 1105 8.33333333333333e-02
+1086 1104 -3.75000000000000e-01
+1086 1093 -8.33333333333333e-02
+1086 848 -4.16666666666667e-02
+1086 1087 -1.66666666666667e-01
+1086 1222 -8.33333333333333e-02
+1086 853 8.33333333333333e-02
+1086 1223 -8.33333333333333e-02
+1086 854 8.33333333333333e-02
+1086 748 -8.33333333333333e-02
+1086 847 8.33333333333333e-02
+1086 846 -1.25000000000000e-01
+1086 1088 -1.66666666666667e-01
+1086 842 8.33333333333333e-02
+1086 1094 1.66666666666667e-01
+1086 841 8.33333333333333e-02
+1086 715 -8.33333333333333e-02
+1086 1106 8.33333333333333e-02
+1086 840 -3.75000000000000e-01
+1086 1092 -2.50000000000000e-01
+1087 1087 1.25000000000000e+00
+1087 1107 8.33333333333333e-02
+1087 1109 8.33333333333333e-02
+1087 1079 8.33333333333333e-02
+1087 1088 -1.66666666666667e-01
+1087 1078 -3.75000000000000e-01
+1087 1077 8.33333333333333e-02
+1087 1105 -1.25000000000000e-01
+1087 1104 8.33333333333333e-02
+1087 1092 -8.33333333333333e-02
+1087 1086 -1.66666666666667e-01
+1087 848 8.33333333333333e-02
+1087 1221 -8.33333333333333e-02
+1087 852 8.33333333333333e-02
+1087 1094 1.66666666666667e-01
+1087 854 -1.66666666666667e-01
+1087 749 4.16666666666667e-02
+1087 1223 -8.33333333333333e-02
+1087 847 -3.75000000000000e-01
+1087 747 -8.33333333333333e-02
+1087 846 8.33333333333333e-02
+1087 842 -4.16666666666667e-02
+1087 716 4.16666666666667e-02
+1087 1106 -4.16666666666667e-02
+1087 841 -1.25000000000000e-01
+1087 1093 -2.50000000000000e-01
+1087 840 8.33333333333333e-02
+1087 714 -8.33333333333333e-02
+1088 1088 1.25000000000000e+00
+1088 1104 8.33333333333333e-02
+1088 1108 8.33333333333333e-02
+1088 1107 -1.66666666666667e-01
+1088 1079 -1.25000000000000e-01
+1088 1078 8.33333333333333e-02
+1088 1087 -1.66666666666667e-01
+1088 714 4.16666666666667e-02
+1088 1077 -4.16666666666667e-02
+1088 1106 -1.25000000000000e-01
+1088 747 4.16666666666667e-02
+1088 846 -4.16666666666667e-02
+1088 847 8.33333333333333e-02
+1088 1093 1.66666666666667e-01
+1088 853 -1.66666666666667e-01
+1088 1221 -8.33333333333333e-02
+1088 852 8.33333333333333e-02
+1088 848 -1.25000000000000e-01
+1088 748 4.16666666666667e-02
+1088 1222 -8.33333333333333e-02
+1088 1105 -4.16666666666667e-02
+1088 842 -1.25000000000000e-01
+1088 1094 -7.50000000000000e-01
+1088 841 -4.16666666666667e-02
+1088 715 4.16666666666667e-02
+1088 1086 -1.66666666666667e-01
+1088 840 8.33333333333333e-02
+1088 1092 1.66666666666667e-01
+1089 1089 2.50000000000000e+00
+1089 1156 8.33333333333333e-02
+1089 1229 -8.33333333333333e-02
+1089 854 8.33333333333333e-02
+1089 853 -1.66666666666667e-01
+1089 1093 1.66666666666667e-01
+1089 1228 -8.33333333333333e-02
+1089 1094 1.66666666666667e-01
+1089 1092 -7.50000000000000e-01
+1089 1082 -8.33333333333333e-02
+1089 989 8.33333333333333e-02
+1089 1081 1.66666666666667e-01
+1089 988 -1.66666666666667e-01
+1089 715 8.33333333333333e-02
+1089 1080 -2.50000000000000e-01
+1089 1091 -3.33333333333333e-01
+1089 1154 1.66666666666667e-01
+1089 751 8.33333333333333e-02
+1089 1153 -8.33333333333333e-02
+1089 1152 -2.50000000000000e-01
+1089 985 -8.33333333333333e-02
+1089 842 1.66666666666667e-01
+1089 838 8.33333333333333e-02
+1089 841 -8.33333333333333e-02
+1089 839 -1.66666666666667e-01
+1089 998 1.66666666666667e-01
+1089 716 8.33333333333333e-02
+1089 986 -8.33333333333333e-02
+1089 840 -2.50000000000000e-01
+1089 851 -8.33333333333333e-02
+1089 752 8.33333333333333e-02
+1089 1090 -3.33333333333333e-01
+1089 850 1.66666666666667e-01
+1089 997 1.66666666666667e-01
+1089 1157 -1.66666666666667e-01
+1089 849 -2.50000000000000e-01
+1089 996 -7.50000000000000e-01
+1090 1090 2.50000000000000e+00
+1090 1155 8.33333333333333e-02
+1090 1229 -8.33333333333333e-02
+1090 854 8.33333333333333e-02
+1090 1094 -8.33333333333333e-02
+1090 852 -1.66666666666667e-01
+1090 1092 1.66666666666667e-01
+1090 1227 -8.33333333333333e-02
+1090 1093 -2.50000000000000e-01
+1090 989 8.33333333333333e-02
+1090 1080 1.66666666666667e-01
+1090 987 -1.66666666666667e-01
+1090 1082 1.66666666666667e-01
+1090 1081 -7.50000000000000e-01
+1090 714 8.33333333333333e-02
+1090 1154 1.66666666666667e-01
+1090 1153 -2.50000000000000e-01
+1090 750 8.33333333333333e-02
+1090 1152 -8.33333333333333e-02
+1090 984 -8.33333333333333e-02
+1090 986 -8.33333333333333e-02
+1090 1091 -3.33333333333333e-01
+1090 837 8.33333333333333e-02
+1090 840 -8.33333333333333e-02
+1090 839 8.33333333333333e-02
+1090 998 -8.33333333333333e-02
+1090 716 -1.66666666666667e-01
+1090 842 1.66666666666667e-01
+1090 841 -2.50000000000000e-01
+1090 851 1.66666666666667e-01
+1090 752 -1.66666666666667e-01
+1090 1157 8.33333333333333e-02
+1090 850 -7.50000000000000e-01
+1090 997 -2.50000000000000e-01
+1090 1089 -3.33333333333333e-01
+1090 849 1.66666666666667e-01
+1090 996 1.66666666666667e-01
+1091 1091 2.50000000000000e+00
+1091 1155 -1.66666666666667e-01
+1091 1227 -8.33333333333333e-02
+1091 1228 -8.33333333333333e-02
+1091 852 8.33333333333333e-02
+1091 853 8.33333333333333e-02
+1091 1093 -8.33333333333333e-02
+1091 1094 -2.50000000000000e-01
+1091 1092 1.66666666666667e-01
+1091 988 8.33333333333333e-02
+1091 1080 -8.33333333333333e-02
+1091 987 8.33333333333333e-02
+1091 1082 -2.50000000000000e-01
+1091 1081 1.66666666666667e-01
+1091 1154 -7.50000000000000e-01
+1091 1153 1.66666666666667e-01
+1091 1089 -3.33333333333333e-01
+1091 1152 1.66666666666667e-01
+1091 985 -8.33333333333333e-02
+1091 1090 -3.33333333333333e-01
+1091 840 1.66666666666667e-01
+1091 838 8.33333333333333e-02
+1091 997 -8.33333333333333e-02
+1091 837 -1.66666666666667e-01
+1091 996 1.66666666666667e-01
+1091 842 -7.50000000000000e-01
+1091 715 -1.66666666666667e-01
+1091 841 1.66666666666667e-01
+1091 714 8.33333333333333e-02
+1091 984 -8.33333333333333e-02
+1091 1156 8.33333333333333e-02
+1091 851 -2.50000000000000e-01
+1091 998 -2.50000000000000e-01
+1091 850 1.66666666666667e-01
+1091 751 -1.66666666666667e-01
+1091 849 -8.33333333333333e-02
+1091 750 8.33333333333333e-02
+1092 1092 2.50000000000000e+00
+1092 1109 1.66666666666667e-01
+1092 1079 8.33333333333333e-02
+1092 1108 1.66666666666667e-01
+1092 1107 -7.50000000000000e-01
+1092 1087 -8.33333333333333e-02
+1092 1223 8.33333333333333e-02
+1092 1088 1.66666666666667e-01
+1092 1086 -2.50000000000000e-01
+1092 1222 -1.66666666666667e-01
+1092 1094 -3.33333333333333e-01
+1092 755 -8.33333333333333e-02
+1092 716 -8.33333333333333e-02
+1092 1171 8.33333333333333e-02
+1092 1156 -8.33333333333333e-02
+1092 1085 -8.33333333333333e-02
+1092 1082 8.33333333333333e-02
+1092 1172 -1.66666666666667e-01
+1092 1157 1.66666666666667e-01
+1092 1155 -2.50000000000000e-01
+1092 1084 1.66666666666667e-01
+1092 1081 -1.66666666666667e-01
+1092 1083 -2.50000000000000e-01
+1092 854 -8.33333333333333e-02
+1092 1229 8.33333333333333e-02
+1092 853 1.66666666666667e-01
+1092 1093 -3.33333333333333e-01
+1092 1090 1.66666666666667e-01
+1092 1228 8.33333333333333e-02
+1092 754 -8.33333333333333e-02
+1092 852 -2.50000000000000e-01
+1092 1091 1.66666666666667e-01
+1092 842 -1.66666666666667e-01
+1092 841 8.33333333333333e-02
+1092 715 -8.33333333333333e-02
+1092 1089 -7.50000000000000e-01
+1092 1078 8.33333333333333e-02
+1093 1093 2.50000000000000e+00
+1093 1109 -8.33333333333333e-02
+1093 1079 -1.66666666666667e-01
+1093 1108 -2.50000000000000e-01
+1093 1107 1.66666666666667e-01
+1093 1086 -8.33333333333333e-02
+1093 1088 1.66666666666667e-01
+1093 1087 -2.50000000000000e-01
+1093 1223 8.33333333333333e-02
+1093 1221 -1.66666666666667e-01
+1093 1170 8.33333333333333e-02
+1093 1155 -8.33333333333333e-02
+1093 1085 1.66666666666667e-01
+1093 1094 -3.33333333333333e-01
+1093 1157 1.66666666666667e-01
+1093 755 -8.33333333333333e-02
+1093 1172 8.33333333333333e-02
+1093 1156 -2.50000000000000e-01
+1093 716 -8.33333333333333e-02
+1093 1082 8.33333333333333e-02
+1093 1084 -7.50000000000000e-01
+1093 1083 1.66666666666667e-01
+1093 1080 -1.66666666666667e-01
+1093 842 8.33333333333333e-02
+1093 1091 -8.33333333333333e-02
+1093 852 1.66666666666667e-01
+1093 1092 -3.33333333333333e-01
+1093 1089 1.66666666666667e-01
+1093 1229 -1.66666666666667e-01
+1093 854 1.66666666666667e-01
+1093 853 -7.50000000000000e-01
+1093 1227 8.33333333333333e-02
+1093 753 -8.33333333333333e-02
+1093 1090 -2.50000000000000e-01
+1093 1077 8.33333333333333e-02
+1093 840 8.33333333333333e-02
+1093 714 -8.33333333333333e-02
+1094 1094 2.50000000000000e+00
+1094 1107 1.66666666666667e-01
+1094 1078 -1.66666666666667e-01
+1094 1077 8.33333333333333e-02
+1094 1109 -2.50000000000000e-01
+1094 1087 1.66666666666667e-01
+1094 1221 8.33333333333333e-02
+1094 1088 -7.50000000000000e-01
+1094 1086 1.66666666666667e-01
+1094 1222 8.33333333333333e-02
+1094 1092 -3.33333333333333e-01
+1094 753 -8.33333333333333e-02
+1094 714 -8.33333333333333e-02
+1094 1084 1.66666666666667e-01
+1094 1093 -3.33333333333333e-01
+1094 1156 1.66666666666667e-01
+1094 1083 -8.33333333333333e-02
+1094 1080 8.33333333333333e-02
+1094 1157 -7.50000000000000e-01
+1094 754 -8.33333333333333e-02
+1094 1171 8.33333333333333e-02
+1094 1170 -1.66666666666667e-01
+1094 1155 1.66666666666667e-01
+1094 1085 -2.50000000000000e-01
+1094 715 -8.33333333333333e-02
+1094 1081 8.33333333333333e-02
+1094 852 -8.33333333333333e-02
+1094 1227 8.33333333333333e-02
+1094 841 8.33333333333333e-02
+1094 1090 -8.33333333333333e-02
+1094 854 -2.50000000000000e-01
+1094 1228 -1.66666666666667e-01
+1094 853 1.66666666666667e-01
+1094 1091 -2.50000000000000e-01
+1094 1108 -8.33333333333333e-02
+1094 1089 1.66666666666667e-01
+1094 840 -1.66666666666667e-01
+1095 1095 2.50000000000000e+00
+1095 1109 -8.33333333333333e-02
+1095 1108 1.66666666666667e-01
+1095 1107 -2.50000000000000e-01
+1095 1172 8.33333333333333e-02
+1095 1078 8.33333333333333e-02
+1095 1079 -1.66666666666667e-01
+1095 1085 1.66666666666667e-01
+1095 1084 1.66666666666667e-01
+1095 1083 -7.50000000000000e-01
+1095 1096 -3.33333333333333e-01
+1095 718 -8.33333333333333e-02
+1095 730 -8.33333333333333e-02
+1095 1174 -8.33333333333333e-02
+1095 1168 8.33333333333333e-02
+1095 1175 -8.33333333333333e-02
+1095 1112 8.33333333333333e-02
+1095 719 1.66666666666667e-01
+1095 1097 -3.33333333333333e-01
+1095 1103 1.66666666666667e-01
+1095 1111 -1.66666666666667e-01
+1095 1102 1.66666666666667e-01
+1095 1101 -7.50000000000000e-01
+1095 731 1.66666666666667e-01
+1095 1169 -1.66666666666667e-01
+1095 805 -8.33333333333333e-02
+1095 1060 8.33333333333333e-02
+1095 1061 8.33333333333333e-02
+1095 806 -8.33333333333333e-02
+1095 717 -2.50000000000000e-01
+1095 1067 -8.33333333333333e-02
+1095 818 8.33333333333333e-02
+1095 1066 1.66666666666667e-01
+1095 817 -1.66666666666667e-01
+1095 1065 -2.50000000000000e-01
+1095 1171 8.33333333333333e-02
+1095 729 -2.50000000000000e-01
+1096 1096 2.50000000000000e+00
+1096 1109 1.66666666666667e-01
+1096 1108 -7.50000000000000e-01
+1096 1107 1.66666666666667e-01
+1096 1172 -1.66666666666667e-01
+1096 1077 8.33333333333333e-02
+1096 1079 8.33333333333333e-02
+1096 1085 -8.33333333333333e-02
+1096 1084 -2.50000000000000e-01
+1096 1083 1.66666666666667e-01
+1096 1095 -3.33333333333333e-01
+1096 717 -8.33333333333333e-02
+1096 729 -8.33333333333333e-02
+1096 1173 -8.33333333333333e-02
+1096 1167 8.33333333333333e-02
+1096 1112 8.33333333333333e-02
+1096 1103 -8.33333333333333e-02
+1096 1102 -2.50000000000000e-01
+1096 1110 -1.66666666666667e-01
+1096 1101 1.66666666666667e-01
+1096 1175 -8.33333333333333e-02
+1096 1169 8.33333333333333e-02
+1096 804 -8.33333333333333e-02
+1096 1059 8.33333333333333e-02
+1096 806 -8.33333333333333e-02
+1096 818 8.33333333333333e-02
+1096 1061 -1.66666666666667e-01
+1096 719 1.66666666666667e-01
+1096 718 -2.50000000000000e-01
+1096 1067 1.66666666666667e-01
+1096 1097 -3.33333333333333e-01
+1096 731 1.66666666666667e-01
+1096 1066 -7.50000000000000e-01
+1096 1170 8.33333333333333e-02
+1096 730 -2.50000000000000e-01
+1096 1065 1.66666666666667e-01
+1096 816 -1.66666666666667e-01
+1097 1097 2.50000000000000e+00
+1097 1108 1.66666666666667e-01
+1097 1107 -8.33333333333333e-02
+1097 1171 -1.66666666666667e-01
+1097 1170 8.33333333333333e-02
+1097 1078 8.33333333333333e-02
+1097 1077 -1.66666666666667e-01
+1097 1085 -2.50000000000000e-01
+1097 1084 -8.33333333333333e-02
+1097 1083 1.66666666666667e-01
+1097 1173 -8.33333333333333e-02
+1097 1110 8.33333333333333e-02
+1097 1103 -2.50000000000000e-01
+1097 1111 8.33333333333333e-02
+1097 1102 -8.33333333333333e-02
+1097 717 1.66666666666667e-01
+1097 1095 -3.33333333333333e-01
+1097 1101 1.66666666666667e-01
+1097 1174 -8.33333333333333e-02
+1097 1168 8.33333333333333e-02
+1097 729 1.66666666666667e-01
+1097 1167 -1.66666666666667e-01
+1097 805 -8.33333333333333e-02
+1097 817 8.33333333333333e-02
+1097 719 -7.50000000000000e-01
+1097 1060 -1.66666666666667e-01
+1097 718 1.66666666666667e-01
+1097 1059 8.33333333333333e-02
+1097 804 -8.33333333333333e-02
+1097 1067 -2.50000000000000e-01
+1097 1109 -2.50000000000000e-01
+1097 731 -7.50000000000000e-01
+1097 1066 1.66666666666667e-01
+1097 1096 -3.33333333333333e-01
+1097 730 1.66666666666667e-01
+1097 1065 -8.33333333333333e-02
+1097 816 8.33333333333333e-02
+1098 1098 1.25000000000000e+00
+1098 1061 4.16666666666667e-02
+1098 1060 -8.33333333333333e-02
+1098 1069 8.33333333333333e-02
+1098 1068 -1.25000000000000e-01
+1098 719 8.33333333333333e-02
+1098 1100 -1.66666666666667e-01
+1098 1103 1.66666666666667e-01
+1098 1102 -8.33333333333333e-02
+1098 1101 -2.50000000000000e-01
+1098 734 8.33333333333333e-02
+1098 1187 -1.66666666666667e-01
+1098 1186 8.33333333333333e-02
+1098 1111 8.33333333333333e-02
+1098 1189 -8.33333333333333e-02
+1098 860 4.16666666666667e-02
+1098 1190 -8.33333333333333e-02
+1098 733 8.33333333333333e-02
+1098 859 -8.33333333333333e-02
+1098 732 -3.75000000000000e-01
+1098 857 -4.16666666666667e-02
+1098 1112 8.33333333333333e-02
+1098 1099 -1.66666666666667e-01
+1098 856 8.33333333333333e-02
+1098 718 8.33333333333333e-02
+1098 1070 -4.16666666666667e-02
+1098 855 -1.25000000000000e-01
+1098 717 -3.75000000000000e-01
+1099 1099 1.25000000000000e+00
+1099 1100 -1.66666666666667e-01
+1099 719 -4.16666666666667e-02
+1099 1061 4.16666666666667e-02
+1099 1059 -8.33333333333333e-02
+1099 734 -4.16666666666667e-02
+1099 1069 -3.75000000000000e-01
+1099 1068 8.33333333333333e-02
+1099 1187 8.33333333333333e-02
+1099 1103 1.66666666666667e-01
+1099 1102 -2.50000000000000e-01
+1099 1101 -8.33333333333333e-02
+1099 1185 8.33333333333333e-02
+1099 1110 8.33333333333333e-02
+1099 1188 -8.33333333333333e-02
+1099 860 4.16666666666667e-02
+1099 1190 -8.33333333333333e-02
+1099 733 -1.25000000000000e-01
+1099 732 8.33333333333333e-02
+1099 858 -8.33333333333333e-02
+1099 857 8.33333333333333e-02
+1099 1112 -1.66666666666667e-01
+1099 1070 8.33333333333333e-02
+1099 856 -3.75000000000000e-01
+1099 718 -1.25000000000000e-01
+1099 1098 -1.66666666666667e-01
+1099 855 8.33333333333333e-02
+1099 717 8.33333333333333e-02
+1100 1100 1.25000000000000e+00
+1100 1099 -1.66666666666667e-01
+1100 1068 -4.16666666666667e-02
+1100 1059 4.16666666666667e-02
+1100 718 -4.16666666666667e-02
+1100 1060 4.16666666666667e-02
+1100 1070 -1.25000000000000e-01
+1100 733 -4.16666666666667e-02
+1100 1186 8.33333333333333e-02
+1100 1103 -7.50000000000000e-01
+1100 1102 1.66666666666667e-01
+1100 717 8.33333333333333e-02
+1100 1098 -1.66666666666667e-01
+1100 1101 1.66666666666667e-01
+1100 732 8.33333333333333e-02
+1100 1185 -1.66666666666667e-01
+1100 859 4.16666666666667e-02
+1100 1189 -8.33333333333333e-02
+1100 734 -1.25000000000000e-01
+1100 858 4.16666666666667e-02
+1100 1188 -8.33333333333333e-02
+1100 1069 8.33333333333333e-02
+1100 857 -1.25000000000000e-01
+1100 719 -1.25000000000000e-01
+1100 856 8.33333333333333e-02
+1100 1111 -1.66666666666667e-01
+1100 855 -4.16666666666667e-02
+1100 1110 8.33333333333333e-02
+1101 1101 2.50000000000000e+00
+1101 1066 -1.66666666666667e-01
+1101 1061 -8.33333333333333e-02
+1101 1069 8.33333333333333e-02
+1101 1060 -8.33333333333333e-02
+1101 1070 8.33333333333333e-02
+1101 1076 -8.33333333333333e-02
+1101 1075 1.66666666666667e-01
+1101 1074 -2.50000000000000e-01
+1101 1190 8.33333333333333e-02
+1101 1189 -1.66666666666667e-01
+1101 1186 1.66666666666667e-01
+1101 1100 1.66666666666667e-01
+1101 718 8.33333333333333e-02
+1101 1099 -8.33333333333333e-02
+1101 1098 -2.50000000000000e-01
+1101 1187 1.66666666666667e-01
+1101 739 8.33333333333333e-02
+1101 1185 -7.50000000000000e-01
+1101 1103 -3.33333333333333e-01
+1101 1168 -8.33333333333333e-02
+1101 1112 -8.33333333333333e-02
+1101 1174 8.33333333333333e-02
+1101 1198 -8.33333333333333e-02
+1101 1175 8.33333333333333e-02
+1101 1199 -8.33333333333333e-02
+1101 719 -1.66666666666667e-01
+1101 1097 1.66666666666667e-01
+1101 1111 1.66666666666667e-01
+1101 1096 1.66666666666667e-01
+1101 1102 -3.33333333333333e-01
+1101 1110 -2.50000000000000e-01
+1101 1095 -7.50000000000000e-01
+1101 1169 1.66666666666667e-01
+1101 740 -1.66666666666667e-01
+1101 1067 8.33333333333333e-02
+1101 1167 -2.50000000000000e-01
+1102 1102 2.50000000000000e+00
+1102 1065 -1.66666666666667e-01
+1102 1068 8.33333333333333e-02
+1102 1059 -8.33333333333333e-02
+1102 1070 -1.66666666666667e-01
+1102 1076 1.66666666666667e-01
+1102 1061 -8.33333333333333e-02
+1102 1075 -7.50000000000000e-01
+1102 1074 1.66666666666667e-01
+1102 1190 8.33333333333333e-02
+1102 1187 -8.33333333333333e-02
+1102 1188 -1.66666666666667e-01
+1102 1185 1.66666666666667e-01
+1102 1100 1.66666666666667e-01
+1102 1103 -3.33333333333333e-01
+1102 1099 -2.50000000000000e-01
+1102 717 8.33333333333333e-02
+1102 1098 -8.33333333333333e-02
+1102 1186 -2.50000000000000e-01
+1102 738 8.33333333333333e-02
+1102 1167 -8.33333333333333e-02
+1102 1112 1.66666666666667e-01
+1102 1173 8.33333333333333e-02
+1102 1197 -8.33333333333333e-02
+1102 1175 -1.66666666666667e-01
+1102 1169 1.66666666666667e-01
+1102 719 8.33333333333333e-02
+1102 1097 -8.33333333333333e-02
+1102 1111 -7.50000000000000e-01
+1102 1096 -2.50000000000000e-01
+1102 1110 1.66666666666667e-01
+1102 1095 1.66666666666667e-01
+1102 1101 -3.33333333333333e-01
+1102 1199 -8.33333333333333e-02
+1102 740 8.33333333333333e-02
+1102 1067 8.33333333333333e-02
+1102 1168 -2.50000000000000e-01
+1103 1103 2.50000000000000e+00
+1103 1065 8.33333333333333e-02
+1103 1059 -8.33333333333333e-02
+1103 1069 -1.66666666666667e-01
+1103 1075 1.66666666666667e-01
+1103 1068 8.33333333333333e-02
+1103 1074 -8.33333333333333e-02
+1103 1060 -8.33333333333333e-02
+1103 1076 -2.50000000000000e-01
+1103 1189 8.33333333333333e-02
+1103 1186 -8.33333333333333e-02
+1103 1188 8.33333333333333e-02
+1103 1100 -7.50000000000000e-01
+1103 1099 1.66666666666667e-01
+1103 1102 -3.33333333333333e-01
+1103 1098 1.66666666666667e-01
+1103 1187 -2.50000000000000e-01
+1103 1185 1.66666666666667e-01
+1103 1101 -3.33333333333333e-01
+1103 1110 -8.33333333333333e-02
+1103 1111 1.66666666666667e-01
+1103 1174 -1.66666666666667e-01
+1103 1168 1.66666666666667e-01
+1103 1173 8.33333333333333e-02
+1103 1197 -8.33333333333333e-02
+1103 1112 -2.50000000000000e-01
+1103 1097 -2.50000000000000e-01
+1103 718 8.33333333333333e-02
+1103 1096 -8.33333333333333e-02
+1103 717 -1.66666666666667e-01
+1103 1095 1.66666666666667e-01
+1103 1066 8.33333333333333e-02
+1103 1169 -7.50000000000000e-01
+1103 1198 -8.33333333333333e-02
+1103 739 8.33333333333333e-02
+1103 1167 1.66666666666667e-01
+1103 738 -1.66666666666667e-01
+1104 1104 1.25000000000000e+00
+1104 1088 8.33333333333333e-02
+1104 1079 4.16666666666667e-02
+1104 719 -4.16666666666667e-02
+1104 1078 -8.33333333333333e-02
+1104 749 -4.16666666666667e-02
+1104 1087 8.33333333333333e-02
+1104 1086 -3.75000000000000e-01
+1104 1223 8.33333333333333e-02
+1104 1222 8.33333333333333e-02
+1104 1109 1.66666666666667e-01
+1104 1108 -8.33333333333333e-02
+1104 1107 -2.50000000000000e-01
+1104 1111 8.33333333333333e-02
+1104 1225 -8.33333333333333e-02
+1104 863 4.16666666666667e-02
+1104 1226 -8.33333333333333e-02
+1104 862 -8.33333333333333e-02
+1104 748 8.33333333333333e-02
+1104 747 -1.25000000000000e-01
+1104 857 8.33333333333333e-02
+1104 1112 -1.66666666666667e-01
+1104 856 8.33333333333333e-02
+1104 1105 -1.66666666666667e-01
+1104 718 8.33333333333333e-02
+1104 855 -3.75000000000000e-01
+1104 1106 -1.66666666666667e-01
+1104 717 -1.25000000000000e-01
+1105 1105 1.25000000000000e+00
+1105 1079 4.16666666666667e-02
+1105 1077 -8.33333333333333e-02
+1105 1087 -1.25000000000000e-01
+1105 1086 8.33333333333333e-02
+1105 749 8.33333333333333e-02
+1105 1223 -1.66666666666667e-01
+1105 1221 8.33333333333333e-02
+1105 1106 -1.66666666666667e-01
+1105 719 8.33333333333333e-02
+1105 1109 1.66666666666667e-01
+1105 1108 -2.50000000000000e-01
+1105 1107 -8.33333333333333e-02
+1105 1110 8.33333333333333e-02
+1105 1224 -8.33333333333333e-02
+1105 863 4.16666666666667e-02
+1105 1226 -8.33333333333333e-02
+1105 748 -3.75000000000000e-01
+1105 861 -8.33333333333333e-02
+1105 747 8.33333333333333e-02
+1105 857 -4.16666666666667e-02
+1105 1112 8.33333333333333e-02
+1105 856 -1.25000000000000e-01
+1105 1088 -4.16666666666667e-02
+1105 718 -3.75000000000000e-01
+1105 855 8.33333333333333e-02
+1105 1104 -1.66666666666667e-01
+1105 717 8.33333333333333e-02
+1106 1106 1.25000000000000e+00
+1106 1078 4.16666666666667e-02
+1106 1104 -1.66666666666667e-01
+1106 1086 8.33333333333333e-02
+1106 1077 4.16666666666667e-02
+1106 717 -4.16666666666667e-02
+1106 1088 -1.25000000000000e-01
+1106 747 -4.16666666666667e-02
+1106 1221 8.33333333333333e-02
+1106 748 8.33333333333333e-02
+1106 1222 -1.66666666666667e-01
+1106 1109 -7.50000000000000e-01
+1106 1105 -1.66666666666667e-01
+1106 718 8.33333333333333e-02
+1106 1108 1.66666666666667e-01
+1106 1107 1.66666666666667e-01
+1106 861 4.16666666666667e-02
+1106 1224 -8.33333333333333e-02
+1106 749 -1.25000000000000e-01
+1106 862 4.16666666666667e-02
+1106 1225 -8.33333333333333e-02
+1106 857 -1.25000000000000e-01
+1106 1087 -4.16666666666667e-02
+1106 719 -1.25000000000000e-01
+1106 856 -4.16666666666667e-02
+1106 1111 8.33333333333333e-02
+1106 855 8.33333333333333e-02
+1106 1110 -1.66666666666667e-01
+1107 1107 2.50000000000000e+00
+1107 1084 -1.66666666666667e-01
+1107 1078 -8.33333333333333e-02
+1107 1087 8.33333333333333e-02
+1107 1094 1.66666666666667e-01
+1107 1088 -1.66666666666667e-01
+1107 1079 -8.33333333333333e-02
+1107 1093 1.66666666666667e-01
+1107 1092 -7.50000000000000e-01
+1107 1226 8.33333333333333e-02
+1107 1223 -8.33333333333333e-02
+1107 1222 1.66666666666667e-01
+1107 1225 -1.66666666666667e-01
+1107 1106 1.66666666666667e-01
+1107 1109 -3.33333333333333e-01
+1107 1105 -8.33333333333333e-02
+1107 718 8.33333333333333e-02
+1107 1104 -2.50000000000000e-01
+1107 754 8.33333333333333e-02
+1107 1221 -2.50000000000000e-01
+1107 1171 -8.33333333333333e-02
+1107 1112 1.66666666666667e-01
+1107 1174 8.33333333333333e-02
+1107 1234 -8.33333333333333e-02
+1107 1175 -1.66666666666667e-01
+1107 1172 1.66666666666667e-01
+1107 719 8.33333333333333e-02
+1107 1097 -8.33333333333333e-02
+1107 1111 1.66666666666667e-01
+1107 1096 1.66666666666667e-01
+1107 1108 -3.33333333333333e-01
+1107 1110 -7.50000000000000e-01
+1107 1095 -2.50000000000000e-01
+1107 1235 -8.33333333333333e-02
+1107 755 8.33333333333333e-02
+1107 1085 8.33333333333333e-02
+1107 1170 -2.50000000000000e-01
+1108 1108 2.50000000000000e+00
+1108 1083 -1.66666666666667e-01
+1108 1079 -8.33333333333333e-02
+1108 1077 -8.33333333333333e-02
+1108 1086 8.33333333333333e-02
+1108 1094 -8.33333333333333e-02
+1108 1088 8.33333333333333e-02
+1108 1093 -2.50000000000000e-01
+1108 1092 1.66666666666667e-01
+1108 1226 8.33333333333333e-02
+1108 1221 1.66666666666667e-01
+1108 1224 -1.66666666666667e-01
+1108 1106 1.66666666666667e-01
+1108 1105 -2.50000000000000e-01
+1108 1104 -8.33333333333333e-02
+1108 717 8.33333333333333e-02
+1108 1223 1.66666666666667e-01
+1108 1222 -7.50000000000000e-01
+1108 753 8.33333333333333e-02
+1108 1109 -3.33333333333333e-01
+1108 1170 -8.33333333333333e-02
+1108 1112 -8.33333333333333e-02
+1108 1173 8.33333333333333e-02
+1108 1233 -8.33333333333333e-02
+1108 1235 -8.33333333333333e-02
+1108 1175 8.33333333333333e-02
+1108 719 -1.66666666666667e-01
+1108 1097 1.66666666666667e-01
+1108 1111 -2.50000000000000e-01
+1108 1096 -7.50000000000000e-01
+1108 1110 1.66666666666667e-01
+1108 1095 1.66666666666667e-01
+1108 1107 -3.33333333333333e-01
+1108 1172 1.66666666666667e-01
+1108 755 -1.66666666666667e-01
+1108 1085 8.33333333333333e-02
+1108 1171 -2.50000000000000e-01
+1109 1109 2.50000000000000e+00
+1109 1084 8.33333333333333e-02
+1109 1078 -8.33333333333333e-02
+1109 1093 -8.33333333333333e-02
+1109 1087 8.33333333333333e-02
+1109 1092 1.66666666666667e-01
+1109 1086 -1.66666666666667e-01
+1109 1077 -8.33333333333333e-02
+1109 1094 -2.50000000000000e-01
+1109 1224 8.33333333333333e-02
+1109 1221 -8.33333333333333e-02
+1109 1225 8.33333333333333e-02
+1109 1106 -7.50000000000000e-01
+1109 1105 1.66666666666667e-01
+1109 1104 1.66666666666667e-01
+1109 1107 -3.33333333333333e-01
+1109 1223 -2.50000000000000e-01
+1109 1222 1.66666666666667e-01
+1109 1108 -3.33333333333333e-01
+1109 1111 -8.33333333333333e-02
+1109 1110 1.66666666666667e-01
+1109 1234 -8.33333333333333e-02
+1109 1174 8.33333333333333e-02
+1109 1173 -1.66666666666667e-01
+1109 1170 1.66666666666667e-01
+1109 1112 -2.50000000000000e-01
+1109 1097 -2.50000000000000e-01
+1109 718 -1.66666666666667e-01
+1109 1096 1.66666666666667e-01
+1109 717 8.33333333333333e-02
+1109 1095 -8.33333333333333e-02
+1109 1083 8.33333333333333e-02
+1109 1172 -7.50000000000000e-01
+1109 1171 1.66666666666667e-01
+1109 754 -1.66666666666667e-01
+1109 1233 -8.33333333333333e-02
+1109 753 8.33333333333333e-02
+1110 1110 2.50000000000000e+00
+1110 1234 8.33333333333333e-02
+1110 1235 8.33333333333333e-02
+1110 1108 1.66666666666667e-01
+1110 1107 -7.50000000000000e-01
+1110 1105 8.33333333333333e-02
+1110 1226 -8.33333333333333e-02
+1110 1106 -1.66666666666667e-01
+1110 1225 1.66666666666667e-01
+1110 1224 -2.50000000000000e-01
+1110 1111 -3.33333333333333e-01
+1110 718 -8.33333333333333e-02
+1110 757 -8.33333333333333e-02
+1110 1097 8.33333333333333e-02
+1110 1103 -8.33333333333333e-02
+1110 1174 -8.33333333333333e-02
+1110 1198 8.33333333333333e-02
+1110 1096 -1.66666666666667e-01
+1110 1102 1.66666666666667e-01
+1110 1101 -2.50000000000000e-01
+1110 1175 1.66666666666667e-01
+1110 1199 -1.66666666666667e-01
+1110 1173 -2.50000000000000e-01
+1110 856 -8.33333333333333e-02
+1110 1099 8.33333333333333e-02
+1110 857 1.66666666666667e-01
+1110 1112 -3.33333333333333e-01
+1110 1190 1.66666666666667e-01
+1110 1100 8.33333333333333e-02
+1110 719 -8.33333333333333e-02
+1110 855 -2.50000000000000e-01
+1110 866 8.33333333333333e-02
+1110 758 -8.33333333333333e-02
+1110 1189 1.66666666666667e-01
+1110 865 -1.66666666666667e-01
+1110 1188 -7.50000000000000e-01
+1110 1109 1.66666666666667e-01
+1111 1111 2.50000000000000e+00
+1111 1233 8.33333333333333e-02
+1111 1235 -1.66666666666667e-01
+1111 1108 -2.50000000000000e-01
+1111 1107 1.66666666666667e-01
+1111 1104 8.33333333333333e-02
+1111 1226 1.66666666666667e-01
+1111 1106 8.33333333333333e-02
+1111 1225 -7.50000000000000e-01
+1111 1224 1.66666666666667e-01
+1111 1110 -3.33333333333333e-01
+1111 717 -8.33333333333333e-02
+1111 756 -8.33333333333333e-02
+1111 1175 1.66666666666667e-01
+1111 1112 -3.33333333333333e-01
+1111 1103 1.66666666666667e-01
+1111 1173 -8.33333333333333e-02
+1111 1197 8.33333333333333e-02
+1111 719 -8.33333333333333e-02
+1111 1097 8.33333333333333e-02
+1111 1102 -7.50000000000000e-01
+1111 1095 -1.66666666666667e-01
+1111 1101 1.66666666666667e-01
+1111 758 -8.33333333333333e-02
+1111 1199 8.33333333333333e-02
+1111 1174 -2.50000000000000e-01
+1111 855 -8.33333333333333e-02
+1111 1098 8.33333333333333e-02
+1111 866 8.33333333333333e-02
+1111 1190 -8.33333333333333e-02
+1111 1100 -1.66666666666667e-01
+1111 857 1.66666666666667e-01
+1111 856 -2.50000000000000e-01
+1111 1189 -2.50000000000000e-01
+1111 1109 -8.33333333333333e-02
+1111 1188 1.66666666666667e-01
+1111 864 -1.66666666666667e-01
+1112 1112 2.50000000000000e+00
+1112 1107 1.66666666666667e-01
+1112 1234 -1.66666666666667e-01
+1112 1233 8.33333333333333e-02
+1112 1109 -2.50000000000000e-01
+1112 1225 1.66666666666667e-01
+1112 1224 -8.33333333333333e-02
+1112 1105 8.33333333333333e-02
+1112 1104 -1.66666666666667e-01
+1112 1226 -2.50000000000000e-01
+1112 1095 8.33333333333333e-02
+1112 1101 -8.33333333333333e-02
+1112 1174 1.66666666666667e-01
+1112 1111 -3.33333333333333e-01
+1112 1102 1.66666666666667e-01
+1112 1103 -2.50000000000000e-01
+1112 718 -8.33333333333333e-02
+1112 1096 8.33333333333333e-02
+1112 1175 -7.50000000000000e-01
+1112 757 -8.33333333333333e-02
+1112 1198 8.33333333333333e-02
+1112 1173 1.66666666666667e-01
+1112 1197 -1.66666666666667e-01
+1112 865 8.33333333333333e-02
+1112 1189 -8.33333333333333e-02
+1112 855 1.66666666666667e-01
+1112 1110 -3.33333333333333e-01
+1112 1188 1.66666666666667e-01
+1112 857 -7.50000000000000e-01
+1112 1099 -1.66666666666667e-01
+1112 856 1.66666666666667e-01
+1112 1098 8.33333333333333e-02
+1112 717 -8.33333333333333e-02
+1112 1190 -2.50000000000000e-01
+1112 1108 -8.33333333333333e-02
+1112 864 8.33333333333333e-02
+1112 756 -8.33333333333333e-02
+1113 1113 1.25000000000000e+00
+1113 1145 -8.33333333333333e-02
+1113 1142 -8.33333333333333e-02
+1113 1141 4.16666666666667e-02
+1113 1144 -8.33333333333333e-02
+1113 1124 8.33333333333333e-02
+1113 1123 -4.16666666666667e-02
+1113 1129 8.33333333333333e-02
+1113 1122 -1.25000000000000e-01
+1113 811 -4.16666666666667e-02
+1113 808 4.16666666666667e-02
+1113 1133 8.33333333333333e-02
+1113 1121 -8.33333333333333e-02
+1113 722 8.33333333333333e-02
+1113 809 -8.33333333333333e-02
+1113 721 8.33333333333333e-02
+1113 1114 -1.66666666666667e-01
+1113 1120 1.66666666666667e-01
+1113 720 -3.75000000000000e-01
+1113 1119 -2.50000000000000e-01
+1113 1115 -1.66666666666667e-01
+1113 725 8.33333333333333e-02
+1113 812 8.33333333333333e-02
+1113 724 8.33333333333333e-02
+1113 1132 -1.66666666666667e-01
+1113 1130 8.33333333333333e-02
+1113 723 -3.75000000000000e-01
+1113 810 -1.25000000000000e-01
+1114 1114 1.25000000000000e+00
+1114 1145 -8.33333333333333e-02
+1114 1140 4.16666666666667e-02
+1114 1143 -8.33333333333333e-02
+1114 1124 8.33333333333333e-02
+1114 1130 -1.66666666666667e-01
+1114 1123 -1.25000000000000e-01
+1114 1122 -4.16666666666667e-02
+1114 1128 8.33333333333333e-02
+1114 810 -4.16666666666667e-02
+1114 807 4.16666666666667e-02
+1114 812 8.33333333333333e-02
+1114 1115 -1.66666666666667e-01
+1114 1121 1.66666666666667e-01
+1114 722 -4.16666666666667e-02
+1114 809 4.16666666666667e-02
+1114 721 -1.25000000000000e-01
+1114 1120 -7.50000000000000e-01
+1114 720 8.33333333333333e-02
+1114 1113 -1.66666666666667e-01
+1114 1119 1.66666666666667e-01
+1114 725 -4.16666666666667e-02
+1114 1133 8.33333333333333e-02
+1114 1142 4.16666666666667e-02
+1114 724 -1.25000000000000e-01
+1114 811 -1.25000000000000e-01
+1114 723 8.33333333333333e-02
+1114 1131 -1.66666666666667e-01
+1115 1115 1.25000000000000e+00
+1115 1144 -8.33333333333333e-02
+1115 1128 8.33333333333333e-02
+1115 1143 -8.33333333333333e-02
+1115 1140 -8.33333333333333e-02
+1115 1124 -3.75000000000000e-01
+1115 1123 8.33333333333333e-02
+1115 1129 -1.66666666666667e-01
+1115 1122 8.33333333333333e-02
+1115 811 8.33333333333333e-02
+1115 1114 -1.66666666666667e-01
+1115 1120 1.66666666666667e-01
+1115 1131 8.33333333333333e-02
+1115 1119 -8.33333333333333e-02
+1115 722 -1.25000000000000e-01
+1115 1121 -2.50000000000000e-01
+1115 721 -4.16666666666667e-02
+1115 808 4.16666666666667e-02
+1115 720 8.33333333333333e-02
+1115 807 -8.33333333333333e-02
+1115 1141 4.16666666666667e-02
+1115 725 -1.25000000000000e-01
+1115 812 -3.75000000000000e-01
+1115 724 -4.16666666666667e-02
+1115 1132 8.33333333333333e-02
+1115 1113 -1.66666666666667e-01
+1115 723 8.33333333333333e-02
+1115 810 8.33333333333333e-02
+1116 1116 2.50000000000000e+00
+1116 1130 -1.66666666666667e-01
+1116 1129 8.33333333333333e-02
+1116 1162 -8.33333333333333e-02
+1116 1121 1.66666666666667e-01
+1116 1151 8.33333333333333e-02
+1116 1150 -1.66666666666667e-01
+1116 1120 1.66666666666667e-01
+1116 1119 -7.50000000000000e-01
+1116 1118 -3.33333333333333e-01
+1116 1127 1.66666666666667e-01
+1116 1126 -8.33333333333333e-02
+1116 1159 8.33333333333333e-02
+1116 1160 8.33333333333333e-02
+1116 728 -8.33333333333333e-02
+1116 722 -8.33333333333333e-02
+1116 1125 -2.50000000000000e-01
+1116 1016 8.33333333333333e-02
+1116 721 1.66666666666667e-01
+1116 1015 -1.66666666666667e-01
+1116 1019 1.66666666666667e-01
+1116 1117 -3.33333333333333e-01
+1116 727 1.66666666666667e-01
+1116 1018 1.66666666666667e-01
+1116 1017 -7.50000000000000e-01
+1116 809 8.33333333333333e-02
+1116 965 -8.33333333333333e-02
+1116 808 8.33333333333333e-02
+1116 964 -8.33333333333333e-02
+1116 720 -2.50000000000000e-01
+1116 815 1.66666666666667e-01
+1116 968 -1.66666666666667e-01
+1116 814 -8.33333333333333e-02
+1116 967 8.33333333333333e-02
+1116 813 -2.50000000000000e-01
+1116 1163 -8.33333333333333e-02
+1116 726 -2.50000000000000e-01
+1117 1117 2.50000000000000e+00
+1117 1163 -8.33333333333333e-02
+1117 1128 8.33333333333333e-02
+1117 1161 -8.33333333333333e-02
+1117 1151 8.33333333333333e-02
+1117 1121 -8.33333333333333e-02
+1117 1149 -1.66666666666667e-01
+1117 1120 -2.50000000000000e-01
+1117 1119 1.66666666666667e-01
+1117 1125 -8.33333333333333e-02
+1117 1158 8.33333333333333e-02
+1117 1160 -1.66666666666667e-01
+1117 1127 1.66666666666667e-01
+1117 1126 -2.50000000000000e-01
+1117 1016 8.33333333333333e-02
+1117 720 1.66666666666667e-01
+1117 1014 -1.66666666666667e-01
+1117 1019 -8.33333333333333e-02
+1117 1018 -2.50000000000000e-01
+1117 1116 -3.33333333333333e-01
+1117 726 1.66666666666667e-01
+1117 1017 1.66666666666667e-01
+1117 968 8.33333333333333e-02
+1117 965 -8.33333333333333e-02
+1117 809 -1.66666666666667e-01
+1117 722 1.66666666666667e-01
+1117 721 -7.50000000000000e-01
+1117 807 8.33333333333333e-02
+1117 963 -8.33333333333333e-02
+1117 815 1.66666666666667e-01
+1117 1118 -3.33333333333333e-01
+1117 728 1.66666666666667e-01
+1117 814 -2.50000000000000e-01
+1117 1130 8.33333333333333e-02
+1117 727 -7.50000000000000e-01
+1117 813 -8.33333333333333e-02
+1117 966 8.33333333333333e-02
+1118 1118 2.50000000000000e+00
+1118 1129 8.33333333333333e-02
+1118 1162 -8.33333333333333e-02
+1118 1128 -1.66666666666667e-01
+1118 1150 8.33333333333333e-02
+1118 1120 -8.33333333333333e-02
+1118 1119 1.66666666666667e-01
+1118 1149 8.33333333333333e-02
+1118 1121 -2.50000000000000e-01
+1118 1116 -3.33333333333333e-01
+1118 1125 1.66666666666667e-01
+1118 1159 -1.66666666666667e-01
+1118 1158 8.33333333333333e-02
+1118 726 -8.33333333333333e-02
+1118 1127 -7.50000000000000e-01
+1118 1126 1.66666666666667e-01
+1118 720 -8.33333333333333e-02
+1118 1014 8.33333333333333e-02
+1118 1015 8.33333333333333e-02
+1118 1019 -2.50000000000000e-01
+1118 1018 -8.33333333333333e-02
+1118 1017 1.66666666666667e-01
+1118 967 8.33333333333333e-02
+1118 964 -8.33333333333333e-02
+1118 807 8.33333333333333e-02
+1118 963 -8.33333333333333e-02
+1118 722 -2.50000000000000e-01
+1118 808 -1.66666666666667e-01
+1118 721 1.66666666666667e-01
+1118 815 -7.50000000000000e-01
+1118 1161 -8.33333333333333e-02
+1118 728 -2.50000000000000e-01
+1118 814 1.66666666666667e-01
+1118 1117 -3.33333333333333e-01
+1118 727 1.66666666666667e-01
+1118 813 1.66666666666667e-01
+1118 966 -1.66666666666667e-01
+1119 1119 2.50000000000000e+00
+1119 1163 8.33333333333333e-02
+1119 1118 1.66666666666667e-01
+1119 815 -1.66666666666667e-01
+1119 814 8.33333333333333e-02
+1119 1117 1.66666666666667e-01
+1119 1116 -7.50000000000000e-01
+1119 1151 -8.33333333333333e-02
+1119 1150 1.66666666666667e-01
+1119 1149 -2.50000000000000e-01
+1119 1129 -8.33333333333333e-02
+1119 1177 -8.33333333333333e-02
+1119 1144 8.33333333333333e-02
+1119 1130 1.66666666666667e-01
+1119 1145 -1.66666666666667e-01
+1119 731 8.33333333333333e-02
+1119 1178 -8.33333333333333e-02
+1119 722 8.33333333333333e-02
+1119 1128 -2.50000000000000e-01
+1119 809 -8.33333333333333e-02
+1119 808 -8.33333333333333e-02
+1119 812 8.33333333333333e-02
+1119 1115 -8.33333333333333e-02
+1119 1120 -3.33333333333333e-01
+1119 811 8.33333333333333e-02
+1119 817 -8.33333333333333e-02
+1119 721 -1.66666666666667e-01
+1119 1114 1.66666666666667e-01
+1119 1113 -2.50000000000000e-01
+1119 1121 -3.33333333333333e-01
+1119 1133 1.66666666666667e-01
+1119 818 1.66666666666667e-01
+1119 1132 1.66666666666667e-01
+1119 730 -1.66666666666667e-01
+1119 1162 8.33333333333333e-02
+1119 1131 -7.50000000000000e-01
+1119 816 -2.50000000000000e-01
+1120 1120 2.50000000000000e+00
+1120 1163 -1.66666666666667e-01
+1120 1118 -8.33333333333333e-02
+1120 815 8.33333333333333e-02
+1120 813 8.33333333333333e-02
+1120 1117 -2.50000000000000e-01
+1120 1116 1.66666666666667e-01
+1120 1151 1.66666666666667e-01
+1120 1150 -7.50000000000000e-01
+1120 1149 1.66666666666667e-01
+1120 1128 -8.33333333333333e-02
+1120 1176 -8.33333333333333e-02
+1120 1143 8.33333333333333e-02
+1120 1178 -8.33333333333333e-02
+1120 1145 8.33333333333333e-02
+1120 1121 -3.33333333333333e-01
+1120 1130 1.66666666666667e-01
+1120 1129 -2.50000000000000e-01
+1120 807 -8.33333333333333e-02
+1120 1115 1.66666666666667e-01
+1120 1119 -3.33333333333333e-01
+1120 812 -1.66666666666667e-01
+1120 818 1.66666666666667e-01
+1120 810 8.33333333333333e-02
+1120 816 -8.33333333333333e-02
+1120 722 8.33333333333333e-02
+1120 809 -8.33333333333333e-02
+1120 1114 -7.50000000000000e-01
+1120 720 -1.66666666666667e-01
+1120 1113 1.66666666666667e-01
+1120 1133 -8.33333333333333e-02
+1120 731 8.33333333333333e-02
+1120 1161 8.33333333333333e-02
+1120 1132 -2.50000000000000e-01
+1120 817 -2.50000000000000e-01
+1120 1131 1.66666666666667e-01
+1120 729 -1.66666666666667e-01
+1121 1121 2.50000000000000e+00
+1121 1161 8.33333333333333e-02
+1121 1117 -8.33333333333333e-02
+1121 814 8.33333333333333e-02
+1121 1116 1.66666666666667e-01
+1121 813 -1.66666666666667e-01
+1121 1118 -2.50000000000000e-01
+1121 1151 -2.50000000000000e-01
+1121 1150 1.66666666666667e-01
+1121 1149 -8.33333333333333e-02
+1121 1177 -8.33333333333333e-02
+1121 1144 8.33333333333333e-02
+1121 1128 1.66666666666667e-01
+1121 1143 -1.66666666666667e-01
+1121 729 8.33333333333333e-02
+1121 1176 -8.33333333333333e-02
+1121 1130 -7.50000000000000e-01
+1121 1120 -3.33333333333333e-01
+1121 1129 1.66666666666667e-01
+1121 720 8.33333333333333e-02
+1121 807 -8.33333333333333e-02
+1121 1114 1.66666666666667e-01
+1121 810 8.33333333333333e-02
+1121 1113 -8.33333333333333e-02
+1121 811 -1.66666666666667e-01
+1121 817 1.66666666666667e-01
+1121 1115 -2.50000000000000e-01
+1121 721 8.33333333333333e-02
+1121 808 -8.33333333333333e-02
+1121 1162 -1.66666666666667e-01
+1121 1133 -2.50000000000000e-01
+1121 818 -7.50000000000000e-01
+1121 1132 -8.33333333333333e-02
+1121 730 8.33333333333333e-02
+1121 1119 -3.33333333333333e-01
+1121 1131 1.66666666666667e-01
+1121 816 1.66666666666667e-01
+1122 1122 1.25000000000000e+00
+1122 1145 8.33333333333333e-02
+1122 1144 -1.66666666666667e-01
+1122 1115 8.33333333333333e-02
+1122 1114 -4.16666666666667e-02
+1122 721 4.16666666666667e-02
+1122 1113 -1.25000000000000e-01
+1122 1142 8.33333333333333e-02
+1122 766 4.16666666666667e-02
+1122 1140 -3.75000000000000e-01
+1122 1130 -8.33333333333333e-02
+1122 1124 -1.66666666666667e-01
+1122 883 -4.16666666666667e-02
+1122 1259 -8.33333333333333e-02
+1122 890 8.33333333333333e-02
+1122 1258 -8.33333333333333e-02
+1122 889 8.33333333333333e-02
+1122 884 8.33333333333333e-02
+1122 767 -8.33333333333333e-02
+1122 882 -1.25000000000000e-01
+1122 878 8.33333333333333e-02
+1122 722 -8.33333333333333e-02
+1122 877 8.33333333333333e-02
+1122 1123 -1.66666666666667e-01
+1122 1129 1.66666666666667e-01
+1122 876 -3.75000000000000e-01
+1122 1141 8.33333333333333e-02
+1122 1128 -2.50000000000000e-01
+1123 1123 1.25000000000000e+00
+1123 1140 8.33333333333333e-02
+1123 1145 8.33333333333333e-02
+1123 1143 -1.66666666666667e-01
+1123 1115 8.33333333333333e-02
+1123 1124 -1.66666666666667e-01
+1123 1114 -1.25000000000000e-01
+1123 1113 -4.16666666666667e-02
+1123 720 4.16666666666667e-02
+1123 1141 -1.25000000000000e-01
+1123 765 4.16666666666667e-02
+1123 882 -4.16666666666667e-02
+1123 884 8.33333333333333e-02
+1123 1130 1.66666666666667e-01
+1123 890 -1.66666666666667e-01
+1123 1257 -8.33333333333333e-02
+1123 888 8.33333333333333e-02
+1123 767 4.16666666666667e-02
+1123 1259 -8.33333333333333e-02
+1123 883 -1.25000000000000e-01
+1123 878 -4.16666666666667e-02
+1123 722 4.16666666666667e-02
+1123 877 -1.25000000000000e-01
+1123 1142 -4.16666666666667e-02
+1123 1129 -7.50000000000000e-01
+1123 876 8.33333333333333e-02
+1123 1122 -1.66666666666667e-01
+1123 1128 1.66666666666667e-01
+1124 1124 1.25000000000000e+00
+1124 1143 8.33333333333333e-02
+1124 1144 8.33333333333333e-02
+1124 1115 -3.75000000000000e-01
+1124 1114 8.33333333333333e-02
+1124 1123 -1.66666666666667e-01
+1124 1113 8.33333333333333e-02
+1124 1142 -1.25000000000000e-01
+1124 1140 8.33333333333333e-02
+1124 1128 -8.33333333333333e-02
+1124 1122 -1.66666666666667e-01
+1124 883 8.33333333333333e-02
+1124 1257 -8.33333333333333e-02
+1124 888 8.33333333333333e-02
+1124 1129 1.66666666666667e-01
+1124 889 -1.66666666666667e-01
+1124 884 -3.75000000000000e-01
+1124 766 4.16666666666667e-02
+1124 1258 -8.33333333333333e-02
+1124 882 8.33333333333333e-02
+1124 765 -8.33333333333333e-02
+1124 878 -1.25000000000000e-01
+1124 1141 -4.16666666666667e-02
+1124 1130 -2.50000000000000e-01
+1124 877 -4.16666666666667e-02
+1124 721 4.16666666666667e-02
+1124 876 8.33333333333333e-02
+1124 720 -8.33333333333333e-02
+1125 1125 2.50000000000000e+00
+1125 1162 -1.66666666666667e-01
+1125 1130 1.66666666666667e-01
+1125 890 -1.66666666666667e-01
+1125 1264 -8.33333333333333e-02
+1125 889 8.33333333333333e-02
+1125 1265 -8.33333333333333e-02
+1125 1129 1.66666666666667e-01
+1125 1128 -7.50000000000000e-01
+1125 1118 1.66666666666667e-01
+1125 1117 -8.33333333333333e-02
+1125 1019 -1.66666666666667e-01
+1125 1018 8.33333333333333e-02
+1125 770 8.33333333333333e-02
+1125 1160 -8.33333333333333e-02
+1125 1159 1.66666666666667e-01
+1125 1126 -3.33333333333333e-01
+1125 1158 -2.50000000000000e-01
+1125 722 8.33333333333333e-02
+1125 1116 -2.50000000000000e-01
+1125 878 -8.33333333333333e-02
+1125 877 1.66666666666667e-01
+1125 1016 -8.33333333333333e-02
+1125 875 8.33333333333333e-02
+1125 1027 1.66666666666667e-01
+1125 874 -1.66666666666667e-01
+1125 721 8.33333333333333e-02
+1125 1015 -8.33333333333333e-02
+1125 876 -2.50000000000000e-01
+1125 1127 -3.33333333333333e-01
+1125 887 1.66666666666667e-01
+1125 1028 1.66666666666667e-01
+1125 886 -8.33333333333333e-02
+1125 769 8.33333333333333e-02
+1125 1163 8.33333333333333e-02
+1125 885 -2.50000000000000e-01
+1125 1026 -7.50000000000000e-01
+1126 1126 2.50000000000000e+00
+1126 1161 -1.66666666666667e-01
+1126 1130 -8.33333333333333e-02
+1126 1265 -8.33333333333333e-02
+1126 890 8.33333333333333e-02
+1126 1263 -8.33333333333333e-02
+1126 888 8.33333333333333e-02
+1126 1129 -2.50000000000000e-01
+1126 1128 1.66666666666667e-01
+1126 1116 -8.33333333333333e-02
+1126 1019 8.33333333333333e-02
+1126 1017 8.33333333333333e-02
+1126 1160 1.66666666666667e-01
+1126 1159 -7.50000000000000e-01
+1126 1158 1.66666666666667e-01
+1126 1125 -3.33333333333333e-01
+1126 1118 1.66666666666667e-01
+1126 1117 -2.50000000000000e-01
+1126 1028 -8.33333333333333e-02
+1126 1127 -3.33333333333333e-01
+1126 1016 -8.33333333333333e-02
+1126 875 8.33333333333333e-02
+1126 876 1.66666666666667e-01
+1126 1026 1.66666666666667e-01
+1126 873 -1.66666666666667e-01
+1126 722 -1.66666666666667e-01
+1126 878 1.66666666666667e-01
+1126 877 -7.50000000000000e-01
+1126 720 8.33333333333333e-02
+1126 1014 -8.33333333333333e-02
+1126 887 1.66666666666667e-01
+1126 770 -1.66666666666667e-01
+1126 1163 8.33333333333333e-02
+1126 886 -2.50000000000000e-01
+1126 1027 -2.50000000000000e-01
+1126 885 -8.33333333333333e-02
+1126 768 8.33333333333333e-02
+1127 1127 2.50000000000000e+00
+1127 1161 8.33333333333333e-02
+1127 1129 -8.33333333333333e-02
+1127 1264 -8.33333333333333e-02
+1127 889 8.33333333333333e-02
+1127 1128 1.66666666666667e-01
+1127 888 -1.66666666666667e-01
+1127 1263 -8.33333333333333e-02
+1127 1130 -2.50000000000000e-01
+1127 1116 1.66666666666667e-01
+1127 1018 8.33333333333333e-02
+1127 1017 -1.66666666666667e-01
+1127 1160 -2.50000000000000e-01
+1127 1159 1.66666666666667e-01
+1127 768 8.33333333333333e-02
+1127 1158 -8.33333333333333e-02
+1127 1118 -7.50000000000000e-01
+1127 1117 1.66666666666667e-01
+1127 720 8.33333333333333e-02
+1127 1027 -8.33333333333333e-02
+1127 1126 -3.33333333333333e-01
+1127 876 -8.33333333333333e-02
+1127 1015 -8.33333333333333e-02
+1127 874 8.33333333333333e-02
+1127 1014 -8.33333333333333e-02
+1127 873 8.33333333333333e-02
+1127 878 -2.50000000000000e-01
+1127 721 -1.66666666666667e-01
+1127 877 1.66666666666667e-01
+1127 1162 8.33333333333333e-02
+1127 887 -7.50000000000000e-01
+1127 1028 -2.50000000000000e-01
+1127 886 1.66666666666667e-01
+1127 769 -1.66666666666667e-01
+1127 1125 -3.33333333333333e-01
+1127 885 1.66666666666667e-01
+1127 1026 1.66666666666667e-01
+1128 1128 2.50000000000000e+00
+1128 1162 1.66666666666667e-01
+1128 1118 -1.66666666666667e-01
+1128 1117 8.33333333333333e-02
+1128 1161 -2.50000000000000e-01
+1128 1127 1.66666666666667e-01
+1128 1264 8.33333333333333e-02
+1128 1126 1.66666666666667e-01
+1128 1125 -7.50000000000000e-01
+1128 1265 8.33333333333333e-02
+1128 1120 -8.33333333333333e-02
+1128 1121 1.66666666666667e-01
+1128 1130 -3.33333333333333e-01
+1128 722 -8.33333333333333e-02
+1128 1119 -2.50000000000000e-01
+1128 1178 8.33333333333333e-02
+1128 773 -8.33333333333333e-02
+1128 1177 -1.66666666666667e-01
+1128 1115 8.33333333333333e-02
+1128 1129 -3.33333333333333e-01
+1128 1144 1.66666666666667e-01
+1128 1114 8.33333333333333e-02
+1128 721 -8.33333333333333e-02
+1128 1145 1.66666666666667e-01
+1128 772 -8.33333333333333e-02
+1128 1143 -7.50000000000000e-01
+1128 1124 -8.33333333333333e-02
+1128 878 8.33333333333333e-02
+1128 1258 8.33333333333333e-02
+1128 889 -8.33333333333333e-02
+1128 877 -1.66666666666667e-01
+1128 1123 1.66666666666667e-01
+1128 1122 -2.50000000000000e-01
+1128 890 1.66666666666667e-01
+1128 1259 -1.66666666666667e-01
+1128 888 -2.50000000000000e-01
+1128 1163 -8.33333333333333e-02
+1129 1129 2.50000000000000e+00
+1129 1161 1.66666666666667e-01
+1129 1116 8.33333333333333e-02
+1129 1163 1.66666666666667e-01
+1129 1162 -7.50000000000000e-01
+1129 1127 -8.33333333333333e-02
+1129 1263 8.33333333333333e-02
+1129 1126 -2.50000000000000e-01
+1129 1125 1.66666666666667e-01
+1129 1265 -1.66666666666667e-01
+1129 1119 -8.33333333333333e-02
+1129 1178 8.33333333333333e-02
+1129 1121 1.66666666666667e-01
+1129 1120 -2.50000000000000e-01
+1129 1176 -1.66666666666667e-01
+1129 1145 -8.33333333333333e-02
+1129 1128 -3.33333333333333e-01
+1129 1143 1.66666666666667e-01
+1129 1115 -1.66666666666667e-01
+1129 1113 8.33333333333333e-02
+1129 720 -8.33333333333333e-02
+1129 1144 -2.50000000000000e-01
+1129 771 -8.33333333333333e-02
+1129 1124 1.66666666666667e-01
+1129 1130 -3.33333333333333e-01
+1129 890 1.66666666666667e-01
+1129 1257 8.33333333333333e-02
+1129 888 -8.33333333333333e-02
+1129 878 8.33333333333333e-02
+1129 722 -8.33333333333333e-02
+1129 1123 -7.50000000000000e-01
+1129 876 -1.66666666666667e-01
+1129 1122 1.66666666666667e-01
+1129 1259 8.33333333333333e-02
+1129 773 -8.33333333333333e-02
+1129 889 -2.50000000000000e-01
+1129 1118 8.33333333333333e-02
+1130 1130 2.50000000000000e+00
+1130 1161 -8.33333333333333e-02
+1130 1116 -1.66666666666667e-01
+1130 1163 -2.50000000000000e-01
+1130 1162 1.66666666666667e-01
+1130 1126 -8.33333333333333e-02
+1130 1125 1.66666666666667e-01
+1130 1127 -2.50000000000000e-01
+1130 1264 -1.66666666666667e-01
+1130 1263 8.33333333333333e-02
+1130 1177 8.33333333333333e-02
+1130 1119 1.66666666666667e-01
+1130 1128 -3.33333333333333e-01
+1130 1121 -7.50000000000000e-01
+1130 1120 1.66666666666667e-01
+1130 720 -8.33333333333333e-02
+1130 1176 8.33333333333333e-02
+1130 771 -8.33333333333333e-02
+1130 1113 8.33333333333333e-02
+1130 1144 -8.33333333333333e-02
+1130 1114 -1.66666666666667e-01
+1130 1145 -2.50000000000000e-01
+1130 1143 1.66666666666667e-01
+1130 1122 -8.33333333333333e-02
+1130 876 8.33333333333333e-02
+1130 1123 1.66666666666667e-01
+1130 1129 -3.33333333333333e-01
+1130 889 1.66666666666667e-01
+1130 1124 -2.50000000000000e-01
+1130 877 8.33333333333333e-02
+1130 721 -8.33333333333333e-02
+1130 890 -7.50000000000000e-01
+1130 1117 8.33333333333333e-02
+1130 1258 8.33333333333333e-02
+1130 772 -8.33333333333333e-02
+1130 888 1.66666666666667e-01
+1130 1257 -1.66666666666667e-01
+1131 1131 2.50000000000000e+00
+1131 1169 8.33333333333333e-02
+1131 1168 -1.66666666666667e-01
+1131 1138 1.66666666666667e-01
+1131 1137 -7.50000000000000e-01
+1131 1064 8.33333333333333e-02
+1131 1063 8.33333333333333e-02
+1131 1067 1.66666666666667e-01
+1131 1066 -8.33333333333333e-02
+1131 1065 -2.50000000000000e-01
+1131 1133 -3.33333333333333e-01
+1131 725 -8.33333333333333e-02
+1131 731 -8.33333333333333e-02
+1131 1181 -8.33333333333333e-02
+1131 1178 8.33333333333333e-02
+1131 1148 -1.66666666666667e-01
+1131 1145 1.66666666666667e-01
+1131 1147 8.33333333333333e-02
+1131 1144 -8.33333333333333e-02
+1131 1143 -2.50000000000000e-01
+1131 1180 -8.33333333333333e-02
+1131 1177 8.33333333333333e-02
+1131 812 -8.33333333333333e-02
+1131 1115 8.33333333333333e-02
+1131 811 -8.33333333333333e-02
+1131 817 8.33333333333333e-02
+1131 1114 -1.66666666666667e-01
+1131 724 1.66666666666667e-01
+1131 723 -2.50000000000000e-01
+1131 1121 1.66666666666667e-01
+1131 818 -1.66666666666667e-01
+1131 1120 1.66666666666667e-01
+1131 1132 -3.33333333333333e-01
+1131 730 1.66666666666667e-01
+1131 1119 -7.50000000000000e-01
+1131 1139 1.66666666666667e-01
+1131 729 -2.50000000000000e-01
+1132 1132 2.50000000000000e+00
+1132 1139 -8.33333333333333e-02
+1132 1167 -1.66666666666667e-01
+1132 1138 -2.50000000000000e-01
+1132 1137 1.66666666666667e-01
+1132 1064 -1.66666666666667e-01
+1132 1062 8.33333333333333e-02
+1132 1067 1.66666666666667e-01
+1132 1066 -2.50000000000000e-01
+1132 1065 -8.33333333333333e-02
+1132 1181 -8.33333333333333e-02
+1132 1148 8.33333333333333e-02
+1132 725 1.66666666666667e-01
+1132 1133 -3.33333333333333e-01
+1132 1145 1.66666666666667e-01
+1132 1144 -2.50000000000000e-01
+1132 1146 8.33333333333333e-02
+1132 1143 -8.33333333333333e-02
+1132 731 1.66666666666667e-01
+1132 1178 -1.66666666666667e-01
+1132 1179 -8.33333333333333e-02
+1132 1176 8.33333333333333e-02
+1132 810 -8.33333333333333e-02
+1132 816 8.33333333333333e-02
+1132 1115 8.33333333333333e-02
+1132 812 -8.33333333333333e-02
+1132 724 -7.50000000000000e-01
+1132 1113 -1.66666666666667e-01
+1132 723 1.66666666666667e-01
+1132 1121 -8.33333333333333e-02
+1132 818 8.33333333333333e-02
+1132 1120 -2.50000000000000e-01
+1132 1169 8.33333333333333e-02
+1132 730 -7.50000000000000e-01
+1132 1119 1.66666666666667e-01
+1132 1131 -3.33333333333333e-01
+1132 729 1.66666666666667e-01
+1133 1133 2.50000000000000e+00
+1133 1138 -8.33333333333333e-02
+1133 1137 1.66666666666667e-01
+1133 1167 8.33333333333333e-02
+1133 1139 -2.50000000000000e-01
+1133 1062 8.33333333333333e-02
+1133 1063 -1.66666666666667e-01
+1133 1067 -7.50000000000000e-01
+1133 1066 1.66666666666667e-01
+1133 1065 1.66666666666667e-01
+1133 1131 -3.33333333333333e-01
+1133 723 -8.33333333333333e-02
+1133 729 -8.33333333333333e-02
+1133 1179 -8.33333333333333e-02
+1133 1176 8.33333333333333e-02
+1133 1180 -8.33333333333333e-02
+1133 1147 8.33333333333333e-02
+1133 1145 -7.50000000000000e-01
+1133 724 1.66666666666667e-01
+1133 1132 -3.33333333333333e-01
+1133 1144 1.66666666666667e-01
+1133 1146 -1.66666666666667e-01
+1133 1143 1.66666666666667e-01
+1133 730 1.66666666666667e-01
+1133 1177 -1.66666666666667e-01
+1133 810 -8.33333333333333e-02
+1133 1113 8.33333333333333e-02
+1133 725 -2.50000000000000e-01
+1133 1114 8.33333333333333e-02
+1133 811 -8.33333333333333e-02
+1133 1121 -2.50000000000000e-01
+1133 1168 8.33333333333333e-02
+1133 731 -2.50000000000000e-01
+1133 1120 -8.33333333333333e-02
+1133 817 8.33333333333333e-02
+1133 1119 1.66666666666667e-01
+1133 816 -1.66666666666667e-01
+1134 1134 1.25000000000000e+00
+1134 1139 -8.33333333333333e-02
+1134 1072 -4.16666666666667e-02
+1134 1063 4.16666666666667e-02
+1134 1073 8.33333333333333e-02
+1134 736 8.33333333333333e-02
+1134 1192 -1.66666666666667e-01
+1134 1071 -1.25000000000000e-01
+1134 1064 -8.33333333333333e-02
+1134 1135 -1.66666666666667e-01
+1134 1138 1.66666666666667e-01
+1134 724 8.33333333333333e-02
+1134 1137 -2.50000000000000e-01
+1134 1196 -8.33333333333333e-02
+1134 1148 8.33333333333333e-02
+1134 737 8.33333333333333e-02
+1134 896 -8.33333333333333e-02
+1134 895 4.16666666666667e-02
+1134 1195 -8.33333333333333e-02
+1134 735 -3.75000000000000e-01
+1134 1136 -1.66666666666667e-01
+1134 893 8.33333333333333e-02
+1134 725 8.33333333333333e-02
+1134 892 -4.16666666666667e-02
+1134 1147 8.33333333333333e-02
+1134 1193 8.33333333333333e-02
+1134 891 -1.25000000000000e-01
+1134 723 -3.75000000000000e-01
+1135 1135 1.25000000000000e+00
+1135 1073 8.33333333333333e-02
+1135 1139 1.66666666666667e-01
+1135 1071 -4.16666666666667e-02
+1135 1062 4.16666666666667e-02
+1135 737 -4.16666666666667e-02
+1135 1193 8.33333333333333e-02
+1135 1072 -1.25000000000000e-01
+1135 735 8.33333333333333e-02
+1135 1191 -1.66666666666667e-01
+1135 1064 4.16666666666667e-02
+1135 725 -4.16666666666667e-02
+1135 1138 -7.50000000000000e-01
+1135 1134 -1.66666666666667e-01
+1135 1137 1.66666666666667e-01
+1135 723 8.33333333333333e-02
+1135 896 4.16666666666667e-02
+1135 1196 -8.33333333333333e-02
+1135 736 -1.25000000000000e-01
+1135 894 4.16666666666667e-02
+1135 1194 -8.33333333333333e-02
+1135 893 8.33333333333333e-02
+1135 1148 -1.66666666666667e-01
+1135 1136 -1.66666666666667e-01
+1135 892 -1.25000000000000e-01
+1135 724 -1.25000000000000e-01
+1135 891 -4.16666666666667e-02
+1135 1146 8.33333333333333e-02
+1136 1136 1.25000000000000e+00
+1136 1137 -8.33333333333333e-02
+1136 1135 -1.66666666666667e-01
+1136 1072 8.33333333333333e-02
+1136 1138 1.66666666666667e-01
+1136 1073 -3.75000000000000e-01
+1136 736 -4.16666666666667e-02
+1136 1192 8.33333333333333e-02
+1136 1071 8.33333333333333e-02
+1136 1139 -2.50000000000000e-01
+1136 1063 4.16666666666667e-02
+1136 724 -4.16666666666667e-02
+1136 1062 -8.33333333333333e-02
+1136 895 4.16666666666667e-02
+1136 1195 -8.33333333333333e-02
+1136 1194 -8.33333333333333e-02
+1136 1146 8.33333333333333e-02
+1136 737 -1.25000000000000e-01
+1136 735 8.33333333333333e-02
+1136 894 -8.33333333333333e-02
+1136 1191 8.33333333333333e-02
+1136 893 -3.75000000000000e-01
+1136 725 -1.25000000000000e-01
+1136 892 8.33333333333333e-02
+1136 1147 -1.66666666666667e-01
+1136 1134 -1.66666666666667e-01
+1136 891 8.33333333333333e-02
+1136 723 8.33333333333333e-02
+1137 1137 2.50000000000000e+00
+1137 1180 8.33333333333333e-02
+1137 1201 -8.33333333333333e-02
+1137 1148 1.66666666666667e-01
+1137 1196 -1.66666666666667e-01
+1137 1147 -8.33333333333333e-02
+1137 1195 8.33333333333333e-02
+1137 1202 -8.33333333333333e-02
+1137 1146 -2.50000000000000e-01
+1137 1073 8.33333333333333e-02
+1137 1136 -8.33333333333333e-02
+1137 1072 8.33333333333333e-02
+1137 1193 1.66666666666667e-01
+1137 1139 -3.33333333333333e-01
+1137 1192 1.66666666666667e-01
+1137 1191 -7.50000000000000e-01
+1137 1135 1.66666666666667e-01
+1137 1134 -2.50000000000000e-01
+1137 1138 -3.33333333333333e-01
+1137 1075 -8.33333333333333e-02
+1137 1076 1.66666666666667e-01
+1137 1067 -1.66666666666667e-01
+1137 1133 1.66666666666667e-01
+1137 1063 -8.33333333333333e-02
+1137 1066 8.33333333333333e-02
+1137 740 8.33333333333333e-02
+1137 1169 -8.33333333333333e-02
+1137 739 -1.66666666666667e-01
+1137 1168 1.66666666666667e-01
+1137 1074 -2.50000000000000e-01
+1137 1167 -2.50000000000000e-01
+1137 1064 -8.33333333333333e-02
+1137 725 8.33333333333333e-02
+1137 1132 1.66666666666667e-01
+1137 724 -1.66666666666667e-01
+1137 1181 8.33333333333333e-02
+1137 1131 -7.50000000000000e-01
+1138 1138 2.50000000000000e+00
+1138 1179 8.33333333333333e-02
+1138 1200 -8.33333333333333e-02
+1138 1202 -8.33333333333333e-02
+1138 1196 8.33333333333333e-02
+1138 1146 -8.33333333333333e-02
+1138 1194 8.33333333333333e-02
+1138 1148 1.66666666666667e-01
+1138 1147 -2.50000000000000e-01
+1138 1136 1.66666666666667e-01
+1138 1073 -1.66666666666667e-01
+1138 1071 8.33333333333333e-02
+1138 1193 -8.33333333333333e-02
+1138 740 8.33333333333333e-02
+1138 1192 -2.50000000000000e-01
+1138 1191 1.66666666666667e-01
+1138 725 8.33333333333333e-02
+1138 1135 -7.50000000000000e-01
+1138 1134 1.66666666666667e-01
+1138 1133 -8.33333333333333e-02
+1138 1137 -3.33333333333333e-01
+1138 1074 -8.33333333333333e-02
+1138 1067 8.33333333333333e-02
+1138 1064 -8.33333333333333e-02
+1138 1062 -8.33333333333333e-02
+1138 1065 8.33333333333333e-02
+1138 1076 1.66666666666667e-01
+1138 1169 1.66666666666667e-01
+1138 1139 -3.33333333333333e-01
+1138 1075 -2.50000000000000e-01
+1138 1168 -7.50000000000000e-01
+1138 738 -1.66666666666667e-01
+1138 1167 1.66666666666667e-01
+1138 1181 -1.66666666666667e-01
+1138 1132 -2.50000000000000e-01
+1138 1131 1.66666666666667e-01
+1138 723 -1.66666666666667e-01
+1139 1139 2.50000000000000e+00
+1139 1180 -1.66666666666667e-01
+1139 1201 -8.33333333333333e-02
+1139 1195 8.33333333333333e-02
+1139 1146 1.66666666666667e-01
+1139 1194 -1.66666666666667e-01
+1139 1200 -8.33333333333333e-02
+1139 1148 -7.50000000000000e-01
+1139 1147 1.66666666666667e-01
+1139 1071 8.33333333333333e-02
+1139 1134 -8.33333333333333e-02
+1139 1135 1.66666666666667e-01
+1139 1072 -1.66666666666667e-01
+1139 1193 -2.50000000000000e-01
+1139 1192 -8.33333333333333e-02
+1139 739 8.33333333333333e-02
+1139 1191 1.66666666666667e-01
+1139 1137 -3.33333333333333e-01
+1139 1136 -2.50000000000000e-01
+1139 724 8.33333333333333e-02
+1139 1132 -8.33333333333333e-02
+1139 1066 8.33333333333333e-02
+1139 1063 -8.33333333333333e-02
+1139 1074 1.66666666666667e-01
+1139 1065 -1.66666666666667e-01
+1139 1131 1.66666666666667e-01
+1139 1076 -7.50000000000000e-01
+1139 1169 -2.50000000000000e-01
+1139 1075 1.66666666666667e-01
+1139 1168 1.66666666666667e-01
+1139 1138 -3.33333333333333e-01
+1139 738 8.33333333333333e-02
+1139 1167 -8.33333333333333e-02
+1139 1179 8.33333333333333e-02
+1139 1133 -2.50000000000000e-01
+1139 1062 -8.33333333333333e-02
+1139 723 8.33333333333333e-02
+1140 1140 1.25000000000000e+00
+1140 1141 -1.66666666666667e-01
+1140 1115 -8.33333333333333e-02
+1140 724 -4.16666666666667e-02
+1140 1114 4.16666666666667e-02
+1140 1124 8.33333333333333e-02
+1140 766 -4.16666666666667e-02
+1140 1122 -3.75000000000000e-01
+1140 1258 8.33333333333333e-02
+1140 1145 -8.33333333333333e-02
+1140 1144 1.66666666666667e-01
+1140 1143 -2.50000000000000e-01
+1140 1259 8.33333333333333e-02
+1140 1148 8.33333333333333e-02
+1140 1262 -8.33333333333333e-02
+1140 898 4.16666666666667e-02
+1140 1261 -8.33333333333333e-02
+1140 767 8.33333333333333e-02
+1140 899 -8.33333333333333e-02
+1140 765 -1.25000000000000e-01
+1140 1142 -1.66666666666667e-01
+1140 893 8.33333333333333e-02
+1140 725 8.33333333333333e-02
+1140 892 8.33333333333333e-02
+1140 1147 -1.66666666666667e-01
+1140 1123 8.33333333333333e-02
+1140 891 -3.75000000000000e-01
+1140 723 -1.25000000000000e-01
+1141 1141 1.25000000000000e+00
+1141 1115 4.16666666666667e-02
+1141 1122 8.33333333333333e-02
+1141 1140 -1.66666666666667e-01
+1141 723 -4.16666666666667e-02
+1141 1113 4.16666666666667e-02
+1141 1123 -1.25000000000000e-01
+1141 765 -4.16666666666667e-02
+1141 1257 8.33333333333333e-02
+1141 725 8.33333333333333e-02
+1141 1142 -1.66666666666667e-01
+1141 1145 1.66666666666667e-01
+1141 1144 -7.50000000000000e-01
+1141 1143 1.66666666666667e-01
+1141 767 8.33333333333333e-02
+1141 1259 -1.66666666666667e-01
+1141 897 4.16666666666667e-02
+1141 1260 -8.33333333333333e-02
+1141 899 4.16666666666667e-02
+1141 1262 -8.33333333333333e-02
+1141 766 -1.25000000000000e-01
+1141 893 -4.16666666666667e-02
+1141 1148 8.33333333333333e-02
+1141 1124 -4.16666666666667e-02
+1141 892 -1.25000000000000e-01
+1141 724 -1.25000000000000e-01
+1141 891 8.33333333333333e-02
+1141 1146 -1.66666666666667e-01
+1142 1142 1.25000000000000e+00
+1142 1114 4.16666666666667e-02
+1142 1113 -8.33333333333333e-02
+1142 1124 -1.25000000000000e-01
+1142 1122 8.33333333333333e-02
+1142 1145 -2.50000000000000e-01
+1142 724 8.33333333333333e-02
+1142 1141 -1.66666666666667e-01
+1142 1144 1.66666666666667e-01
+1142 1143 -8.33333333333333e-02
+1142 766 8.33333333333333e-02
+1142 1258 -1.66666666666667e-01
+1142 1257 8.33333333333333e-02
+1142 1146 8.33333333333333e-02
+1142 1260 -8.33333333333333e-02
+1142 767 -3.75000000000000e-01
+1142 898 4.16666666666667e-02
+1142 1261 -8.33333333333333e-02
+1142 765 8.33333333333333e-02
+1142 897 -8.33333333333333e-02
+1142 1123 -4.16666666666667e-02
+1142 893 -1.25000000000000e-01
+1142 725 -3.75000000000000e-01
+1142 892 -4.16666666666667e-02
+1142 1147 8.33333333333333e-02
+1142 1140 -1.66666666666667e-01
+1142 891 8.33333333333333e-02
+1142 723 8.33333333333333e-02
+1143 1143 2.50000000000000e+00
+1143 1121 -1.66666666666667e-01
+1143 1124 8.33333333333333e-02
+1143 1115 -8.33333333333333e-02
+1143 1123 -1.66666666666667e-01
+1143 1129 1.66666666666667e-01
+1143 1114 -8.33333333333333e-02
+1143 1130 1.66666666666667e-01
+1143 1128 -7.50000000000000e-01
+1143 1261 8.33333333333333e-02
+1143 1258 -8.33333333333333e-02
+1143 1262 -1.66666666666667e-01
+1143 1259 1.66666666666667e-01
+1143 725 8.33333333333333e-02
+1143 1142 -8.33333333333333e-02
+1143 1141 1.66666666666667e-01
+1143 1144 -3.33333333333333e-01
+1143 1140 -2.50000000000000e-01
+1143 773 8.33333333333333e-02
+1143 1257 -2.50000000000000e-01
+1143 1178 -8.33333333333333e-02
+1143 1181 8.33333333333333e-02
+1143 1271 -8.33333333333333e-02
+1143 1147 1.66666666666667e-01
+1143 1180 -1.66666666666667e-01
+1143 1177 1.66666666666667e-01
+1143 1148 1.66666666666667e-01
+1143 1133 1.66666666666667e-01
+1143 1145 -3.33333333333333e-01
+1143 724 8.33333333333333e-02
+1143 1132 -8.33333333333333e-02
+1143 1146 -7.50000000000000e-01
+1143 1131 -2.50000000000000e-01
+1143 1270 -8.33333333333333e-02
+1143 772 8.33333333333333e-02
+1143 1120 8.33333333333333e-02
+1143 1176 -2.50000000000000e-01
+1144 1144 2.50000000000000e+00
+1144 1121 8.33333333333333e-02
+1144 1115 -8.33333333333333e-02
+1144 1124 8.33333333333333e-02
+1144 1130 -8.33333333333333e-02
+1144 1122 -1.66666666666667e-01
+1144 1128 1.66666666666667e-01
+1144 1113 -8.33333333333333e-02
+1144 1129 -2.50000000000000e-01
+1144 1260 8.33333333333333e-02
+1144 1257 -8.33333333333333e-02
+1144 1262 8.33333333333333e-02
+1144 1142 1.66666666666667e-01
+1144 1141 -7.50000000000000e-01
+1144 1140 1.66666666666667e-01
+1144 1143 -3.33333333333333e-01
+1144 1259 1.66666666666667e-01
+1144 1258 -2.50000000000000e-01
+1144 1145 -3.33333333333333e-01
+1144 1148 -8.33333333333333e-02
+1144 1146 1.66666666666667e-01
+1144 1181 8.33333333333333e-02
+1144 1271 -8.33333333333333e-02
+1144 1179 -1.66666666666667e-01
+1144 1176 1.66666666666667e-01
+1144 725 -1.66666666666667e-01
+1144 1133 1.66666666666667e-01
+1144 1147 -2.50000000000000e-01
+1144 1132 -2.50000000000000e-01
+1144 723 8.33333333333333e-02
+1144 1131 -8.33333333333333e-02
+1144 1178 1.66666666666667e-01
+1144 773 -1.66666666666667e-01
+1144 1119 8.33333333333333e-02
+1144 1177 -7.50000000000000e-01
+1144 1269 -8.33333333333333e-02
+1144 771 8.33333333333333e-02
+1145 1145 2.50000000000000e+00
+1145 1119 -1.66666666666667e-01
+1145 1114 -8.33333333333333e-02
+1145 1122 8.33333333333333e-02
+1145 1113 -8.33333333333333e-02
+1145 1123 8.33333333333333e-02
+1145 1129 -8.33333333333333e-02
+1145 1130 -2.50000000000000e-01
+1145 1128 1.66666666666667e-01
+1145 1261 8.33333333333333e-02
+1145 1260 -1.66666666666667e-01
+1145 1257 1.66666666666667e-01
+1145 1142 -2.50000000000000e-01
+1145 1141 1.66666666666667e-01
+1145 723 8.33333333333333e-02
+1145 1140 -8.33333333333333e-02
+1145 1259 -7.50000000000000e-01
+1145 1258 1.66666666666667e-01
+1145 771 8.33333333333333e-02
+1145 1144 -3.33333333333333e-01
+1145 1176 -8.33333333333333e-02
+1145 1147 -8.33333333333333e-02
+1145 1179 8.33333333333333e-02
+1145 1269 -8.33333333333333e-02
+1145 1180 8.33333333333333e-02
+1145 1270 -8.33333333333333e-02
+1145 1148 -2.50000000000000e-01
+1145 1133 -7.50000000000000e-01
+1145 724 -1.66666666666667e-01
+1145 1132 1.66666666666667e-01
+1145 1146 1.66666666666667e-01
+1145 1131 1.66666666666667e-01
+1145 1143 -3.33333333333333e-01
+1145 1120 8.33333333333333e-02
+1145 1178 -2.50000000000000e-01
+1145 1177 1.66666666666667e-01
+1145 772 -1.66666666666667e-01
+1146 1146 2.50000000000000e+00
+1146 1138 -8.33333333333333e-02
+1146 1202 8.33333333333333e-02
+1146 1201 -1.66666666666667e-01
+1146 1137 -2.50000000000000e-01
+1146 1136 8.33333333333333e-02
+1146 1195 1.66666666666667e-01
+1146 1196 1.66666666666667e-01
+1146 1194 -7.50000000000000e-01
+1146 1135 8.33333333333333e-02
+1146 1148 -3.33333333333333e-01
+1146 725 -8.33333333333333e-02
+1146 776 -8.33333333333333e-02
+1146 1181 -8.33333333333333e-02
+1146 1271 8.33333333333333e-02
+1146 1180 1.66666666666667e-01
+1146 1147 -3.33333333333333e-01
+1146 1144 1.66666666666667e-01
+1146 1133 -1.66666666666667e-01
+1146 1145 1.66666666666667e-01
+1146 724 -8.33333333333333e-02
+1146 1132 8.33333333333333e-02
+1146 1143 -7.50000000000000e-01
+1146 775 -8.33333333333333e-02
+1146 1270 8.33333333333333e-02
+1146 1179 -2.50000000000000e-01
+1146 893 -8.33333333333333e-02
+1146 1142 8.33333333333333e-02
+1146 901 8.33333333333333e-02
+1146 1261 -8.33333333333333e-02
+1146 1141 -1.66666666666667e-01
+1146 892 1.66666666666667e-01
+1146 891 -2.50000000000000e-01
+1146 1262 1.66666666666667e-01
+1146 902 -1.66666666666667e-01
+1146 1260 -2.50000000000000e-01
+1146 1139 1.66666666666667e-01
+1147 1147 2.50000000000000e+00
+1147 1137 -8.33333333333333e-02
+1147 1200 -1.66666666666667e-01
+1147 1139 1.66666666666667e-01
+1147 1138 -2.50000000000000e-01
+1147 1196 -8.33333333333333e-02
+1147 1194 1.66666666666667e-01
+1147 1195 -2.50000000000000e-01
+1147 1136 -1.66666666666667e-01
+1147 1134 8.33333333333333e-02
+1147 1133 8.33333333333333e-02
+1147 1145 -8.33333333333333e-02
+1147 1179 1.66666666666667e-01
+1147 1146 -3.33333333333333e-01
+1147 1143 1.66666666666667e-01
+1147 1144 -2.50000000000000e-01
+1147 723 -8.33333333333333e-02
+1147 1131 8.33333333333333e-02
+1147 1181 1.66666666666667e-01
+1147 1271 -1.66666666666667e-01
+1147 1180 -7.50000000000000e-01
+1147 774 -8.33333333333333e-02
+1147 1269 8.33333333333333e-02
+1147 893 1.66666666666667e-01
+1147 1148 -3.33333333333333e-01
+1147 1262 1.66666666666667e-01
+1147 900 8.33333333333333e-02
+1147 1260 -8.33333333333333e-02
+1147 1142 8.33333333333333e-02
+1147 725 -8.33333333333333e-02
+1147 892 -7.50000000000000e-01
+1147 1140 -1.66666666666667e-01
+1147 891 1.66666666666667e-01
+1147 902 8.33333333333333e-02
+1147 776 -8.33333333333333e-02
+1147 1261 -2.50000000000000e-01
+1147 1202 8.33333333333333e-02
+1148 1148 2.50000000000000e+00
+1148 1137 1.66666666666667e-01
+1148 1200 8.33333333333333e-02
+1148 1139 -7.50000000000000e-01
+1148 1138 1.66666666666667e-01
+1148 1195 -8.33333333333333e-02
+1148 1134 8.33333333333333e-02
+1148 1196 -2.50000000000000e-01
+1148 1194 1.66666666666667e-01
+1148 1135 -1.66666666666667e-01
+1148 1146 -3.33333333333333e-01
+1148 723 -8.33333333333333e-02
+1148 774 -8.33333333333333e-02
+1148 1132 8.33333333333333e-02
+1148 1144 -8.33333333333333e-02
+1148 1179 -8.33333333333333e-02
+1148 1269 8.33333333333333e-02
+1148 1145 -2.50000000000000e-01
+1148 1131 -1.66666666666667e-01
+1148 1143 1.66666666666667e-01
+1148 1181 -2.50000000000000e-01
+1148 1180 1.66666666666667e-01
+1148 1270 -1.66666666666667e-01
+1148 891 -8.33333333333333e-02
+1148 1140 8.33333333333333e-02
+1148 892 1.66666666666667e-01
+1148 1147 -3.33333333333333e-01
+1148 1261 1.66666666666667e-01
+1148 893 -2.50000000000000e-01
+1148 1141 8.33333333333333e-02
+1148 724 -8.33333333333333e-02
+1148 1262 -7.50000000000000e-01
+1148 1201 8.33333333333333e-02
+1148 901 8.33333333333333e-02
+1148 775 -8.33333333333333e-02
+1148 1260 1.66666666666667e-01
+1148 900 -1.66666666666667e-01
+1149 1149 2.50000000000000e+00
+1149 1157 -8.33333333333333e-02
+1149 1171 -1.66666666666667e-01
+1149 1156 1.66666666666667e-01
+1149 1155 -2.50000000000000e-01
+1149 1082 -1.66666666666667e-01
+1149 1081 8.33333333333333e-02
+1149 1085 1.66666666666667e-01
+1149 1084 -8.33333333333333e-02
+1149 1083 -2.50000000000000e-01
+1149 1184 -8.33333333333333e-02
+1149 1166 8.33333333333333e-02
+1149 728 1.66666666666667e-01
+1149 1151 -3.33333333333333e-01
+1149 1163 1.66666666666667e-01
+1149 1165 8.33333333333333e-02
+1149 1162 -8.33333333333333e-02
+1149 1161 -2.50000000000000e-01
+1149 731 1.66666666666667e-01
+1149 1178 -1.66666666666667e-01
+1149 1183 -8.33333333333333e-02
+1149 1177 8.33333333333333e-02
+1149 814 -8.33333333333333e-02
+1149 817 8.33333333333333e-02
+1149 1118 8.33333333333333e-02
+1149 815 -8.33333333333333e-02
+1149 727 1.66666666666667e-01
+1149 1117 -1.66666666666667e-01
+1149 726 -7.50000000000000e-01
+1149 1121 -8.33333333333333e-02
+1149 818 8.33333333333333e-02
+1149 1150 -3.33333333333333e-01
+1149 1120 1.66666666666667e-01
+1149 730 1.66666666666667e-01
+1149 1172 8.33333333333333e-02
+1149 1119 -2.50000000000000e-01
+1149 729 -7.50000000000000e-01
+1150 1150 2.50000000000000e+00
+1150 1172 8.33333333333333e-02
+1150 1170 -1.66666666666667e-01
+1150 1156 -7.50000000000000e-01
+1150 1155 1.66666666666667e-01
+1150 1082 8.33333333333333e-02
+1150 1080 8.33333333333333e-02
+1150 1085 1.66666666666667e-01
+1150 1084 -2.50000000000000e-01
+1150 1083 -8.33333333333333e-02
+1150 1151 -3.33333333333333e-01
+1150 731 -8.33333333333333e-02
+1150 728 -8.33333333333333e-02
+1150 1178 8.33333333333333e-02
+1150 1184 -8.33333333333333e-02
+1150 1166 -1.66666666666667e-01
+1150 1163 1.66666666666667e-01
+1150 1162 -2.50000000000000e-01
+1150 1164 8.33333333333333e-02
+1150 1161 -8.33333333333333e-02
+1150 1182 -8.33333333333333e-02
+1150 1176 8.33333333333333e-02
+1150 1118 8.33333333333333e-02
+1150 815 -8.33333333333333e-02
+1150 813 -8.33333333333333e-02
+1150 816 8.33333333333333e-02
+1150 727 -2.50000000000000e-01
+1150 726 1.66666666666667e-01
+1150 1116 -1.66666666666667e-01
+1150 1121 1.66666666666667e-01
+1150 818 -1.66666666666667e-01
+1150 1157 1.66666666666667e-01
+1150 1120 -7.50000000000000e-01
+1150 730 -2.50000000000000e-01
+1150 1149 -3.33333333333333e-01
+1150 1119 1.66666666666667e-01
+1150 729 1.66666666666667e-01
+1151 1151 2.50000000000000e+00
+1151 1155 -8.33333333333333e-02
+1151 1156 1.66666666666667e-01
+1151 1171 8.33333333333333e-02
+1151 1157 -2.50000000000000e-01
+1151 1081 8.33333333333333e-02
+1151 1080 -1.66666666666667e-01
+1151 1085 -7.50000000000000e-01
+1151 1084 1.66666666666667e-01
+1151 1083 1.66666666666667e-01
+1151 1150 -3.33333333333333e-01
+1151 730 -8.33333333333333e-02
+1151 727 -8.33333333333333e-02
+1151 1177 8.33333333333333e-02
+1151 1183 -8.33333333333333e-02
+1151 1182 -8.33333333333333e-02
+1151 1164 8.33333333333333e-02
+1151 1163 -7.50000000000000e-01
+1151 1165 -1.66666666666667e-01
+1151 1162 1.66666666666667e-01
+1151 726 1.66666666666667e-01
+1151 1149 -3.33333333333333e-01
+1151 1161 1.66666666666667e-01
+1151 729 1.66666666666667e-01
+1151 1176 -1.66666666666667e-01
+1151 1117 8.33333333333333e-02
+1151 814 -8.33333333333333e-02
+1151 728 -2.50000000000000e-01
+1151 1116 8.33333333333333e-02
+1151 813 -8.33333333333333e-02
+1151 1170 8.33333333333333e-02
+1151 1121 -2.50000000000000e-01
+1151 731 -2.50000000000000e-01
+1151 1120 1.66666666666667e-01
+1151 817 -1.66666666666667e-01
+1151 1119 -8.33333333333333e-02
+1151 816 8.33333333333333e-02
+1152 1152 2.50000000000000e+00
+1152 1229 8.33333333333333e-02
+1152 1228 -1.66666666666667e-01
+1152 1156 1.66666666666667e-01
+1152 1155 -7.50000000000000e-01
+1152 1232 -8.33333333333333e-02
+1152 1231 -8.33333333333333e-02
+1152 1166 -1.66666666666667e-01
+1152 1165 8.33333333333333e-02
+1152 1082 8.33333333333333e-02
+1152 1091 1.66666666666667e-01
+1152 1090 -8.33333333333333e-02
+1152 1089 -2.50000000000000e-01
+1152 1081 8.33333333333333e-02
+1152 997 8.33333333333333e-02
+1152 988 -8.33333333333333e-02
+1152 989 -8.33333333333333e-02
+1152 998 -1.66666666666667e-01
+1152 1049 1.66666666666667e-01
+1152 1154 -3.33333333333333e-01
+1152 911 1.66666666666667e-01
+1152 916 8.33333333333333e-02
+1152 910 -8.33333333333333e-02
+1152 728 -8.33333333333333e-02
+1152 1043 8.33333333333333e-02
+1152 727 1.66666666666667e-01
+1152 1042 -1.66666666666667e-01
+1152 726 -2.50000000000000e-01
+1152 909 -2.50000000000000e-01
+1152 752 -8.33333333333333e-02
+1152 917 8.33333333333333e-02
+1152 1153 -3.33333333333333e-01
+1152 751 1.66666666666667e-01
+1152 1048 1.66666666666667e-01
+1152 1157 1.66666666666667e-01
+1152 750 -2.50000000000000e-01
+1152 1047 -7.50000000000000e-01
+1153 1153 2.50000000000000e+00
+1153 1157 -8.33333333333333e-02
+1153 1227 -1.66666666666667e-01
+1153 1156 -2.50000000000000e-01
+1153 1155 1.66666666666667e-01
+1153 1232 -8.33333333333333e-02
+1153 1166 8.33333333333333e-02
+1153 1230 -8.33333333333333e-02
+1153 1164 8.33333333333333e-02
+1153 1091 1.66666666666667e-01
+1153 1090 -2.50000000000000e-01
+1153 1089 -8.33333333333333e-02
+1153 1082 -1.66666666666667e-01
+1153 1080 8.33333333333333e-02
+1153 996 8.33333333333333e-02
+1153 987 -8.33333333333333e-02
+1153 998 8.33333333333333e-02
+1153 989 -8.33333333333333e-02
+1153 1049 -8.33333333333333e-02
+1153 1043 8.33333333333333e-02
+1153 915 8.33333333333333e-02
+1153 909 -8.33333333333333e-02
+1153 728 1.66666666666667e-01
+1153 1154 -3.33333333333333e-01
+1153 911 1.66666666666667e-01
+1153 727 -7.50000000000000e-01
+1153 910 -2.50000000000000e-01
+1153 726 1.66666666666667e-01
+1153 1041 -1.66666666666667e-01
+1153 752 1.66666666666667e-01
+1153 917 -1.66666666666667e-01
+1153 1229 8.33333333333333e-02
+1153 751 -7.50000000000000e-01
+1153 1048 -2.50000000000000e-01
+1153 1152 -3.33333333333333e-01
+1153 750 1.66666666666667e-01
+1153 1047 1.66666666666667e-01
+1154 1154 2.50000000000000e+00
+1154 1156 -8.33333333333333e-02
+1154 1155 1.66666666666667e-01
+1154 1227 8.33333333333333e-02
+1154 1157 -2.50000000000000e-01
+1154 1230 -8.33333333333333e-02
+1154 1231 -8.33333333333333e-02
+1154 1165 8.33333333333333e-02
+1154 1164 -1.66666666666667e-01
+1154 1080 8.33333333333333e-02
+1154 1091 -7.50000000000000e-01
+1154 1090 1.66666666666667e-01
+1154 1089 1.66666666666667e-01
+1154 1081 -1.66666666666667e-01
+1154 987 -8.33333333333333e-02
+1154 997 8.33333333333333e-02
+1154 996 -1.66666666666667e-01
+1154 988 -8.33333333333333e-02
+1154 1048 -8.33333333333333e-02
+1154 1042 8.33333333333333e-02
+1154 1047 1.66666666666667e-01
+1154 1152 -3.33333333333333e-01
+1154 909 1.66666666666667e-01
+1154 728 -2.50000000000000e-01
+1154 911 -7.50000000000000e-01
+1154 727 1.66666666666667e-01
+1154 1153 -3.33333333333333e-01
+1154 910 1.66666666666667e-01
+1154 726 -8.33333333333333e-02
+1154 1041 8.33333333333333e-02
+1154 1228 8.33333333333333e-02
+1154 752 -2.50000000000000e-01
+1154 1049 -2.50000000000000e-01
+1154 751 1.66666666666667e-01
+1154 916 -1.66666666666667e-01
+1154 750 -8.33333333333333e-02
+1154 915 8.33333333333333e-02
+1155 1155 2.50000000000000e+00
+1155 1183 8.33333333333333e-02
+1155 1237 -8.33333333333333e-02
+1155 1232 8.33333333333333e-02
+1155 1238 -8.33333333333333e-02
+1155 1231 8.33333333333333e-02
+1155 1165 -8.33333333333333e-02
+1155 1166 1.66666666666667e-01
+1155 1164 -2.50000000000000e-01
+1155 1091 -1.66666666666667e-01
+1155 1154 1.66666666666667e-01
+1155 1090 8.33333333333333e-02
+1155 755 8.33333333333333e-02
+1155 1229 -8.33333333333333e-02
+1155 1228 1.66666666666667e-01
+1155 1227 -2.50000000000000e-01
+1155 728 8.33333333333333e-02
+1155 1153 1.66666666666667e-01
+1155 1152 -7.50000000000000e-01
+1155 1151 -8.33333333333333e-02
+1155 1156 -3.33333333333333e-01
+1155 1093 -8.33333333333333e-02
+1155 1085 8.33333333333333e-02
+1155 1082 -8.33333333333333e-02
+1155 1084 8.33333333333333e-02
+1155 1081 -8.33333333333333e-02
+1155 1094 1.66666666666667e-01
+1155 1172 1.66666666666667e-01
+1155 1157 -3.33333333333333e-01
+1155 754 -1.66666666666667e-01
+1155 1171 1.66666666666667e-01
+1155 1092 -2.50000000000000e-01
+1155 1170 -7.50000000000000e-01
+1155 1150 1.66666666666667e-01
+1155 727 -1.66666666666667e-01
+1155 1184 -1.66666666666667e-01
+1155 1149 -2.50000000000000e-01
+1156 1156 2.50000000000000e+00
+1156 1182 8.33333333333333e-02
+1156 1236 -8.33333333333333e-02
+1156 1232 -1.66666666666667e-01
+1156 1166 1.66666666666667e-01
+1156 1230 8.33333333333333e-02
+1156 1164 -8.33333333333333e-02
+1156 1238 -8.33333333333333e-02
+1156 1165 -2.50000000000000e-01
+1156 1091 8.33333333333333e-02
+1156 1154 -8.33333333333333e-02
+1156 1089 8.33333333333333e-02
+1156 1229 1.66666666666667e-01
+1156 1157 -3.33333333333333e-01
+1156 1228 -7.50000000000000e-01
+1156 1227 1.66666666666667e-01
+1156 1153 -2.50000000000000e-01
+1156 1152 1.66666666666667e-01
+1156 1155 -3.33333333333333e-01
+1156 1092 -8.33333333333333e-02
+1156 1094 1.66666666666667e-01
+1156 1085 -1.66666666666667e-01
+1156 1151 1.66666666666667e-01
+1156 1083 8.33333333333333e-02
+1156 1080 -8.33333333333333e-02
+1156 755 8.33333333333333e-02
+1156 1172 -8.33333333333333e-02
+1156 1093 -2.50000000000000e-01
+1156 1171 -2.50000000000000e-01
+1156 753 -1.66666666666667e-01
+1156 1170 1.66666666666667e-01
+1156 1082 -8.33333333333333e-02
+1156 728 8.33333333333333e-02
+1156 1184 8.33333333333333e-02
+1156 1150 -7.50000000000000e-01
+1156 1149 1.66666666666667e-01
+1156 726 -1.66666666666667e-01
+1157 1157 2.50000000000000e+00
+1157 1182 -1.66666666666667e-01
+1157 1230 8.33333333333333e-02
+1157 1236 -8.33333333333333e-02
+1157 1231 -1.66666666666667e-01
+1157 1165 1.66666666666667e-01
+1157 1237 -8.33333333333333e-02
+1157 1166 -7.50000000000000e-01
+1157 1164 1.66666666666667e-01
+1157 1090 8.33333333333333e-02
+1157 1153 -8.33333333333333e-02
+1157 1089 -1.66666666666667e-01
+1157 1152 1.66666666666667e-01
+1157 1229 -2.50000000000000e-01
+1157 1228 1.66666666666667e-01
+1157 1156 -3.33333333333333e-01
+1157 753 8.33333333333333e-02
+1157 1227 -8.33333333333333e-02
+1157 1154 -2.50000000000000e-01
+1157 726 8.33333333333333e-02
+1157 1149 -8.33333333333333e-02
+1157 1093 1.66666666666667e-01
+1157 1083 8.33333333333333e-02
+1157 1080 -8.33333333333333e-02
+1157 1084 -1.66666666666667e-01
+1157 1150 1.66666666666667e-01
+1157 1094 -7.50000000000000e-01
+1157 1172 -2.50000000000000e-01
+1157 754 8.33333333333333e-02
+1157 1171 -8.33333333333333e-02
+1157 1092 1.66666666666667e-01
+1157 1170 1.66666666666667e-01
+1157 1155 -3.33333333333333e-01
+1157 1183 8.33333333333333e-02
+1157 1151 -2.50000000000000e-01
+1157 1081 -8.33333333333333e-02
+1157 727 8.33333333333333e-02
+1158 1158 2.50000000000000e+00
+1158 1265 -1.66666666666667e-01
+1158 1163 1.66666666666667e-01
+1158 1162 1.66666666666667e-01
+1158 1161 -7.50000000000000e-01
+1158 1267 -8.33333333333333e-02
+1158 1268 -8.33333333333333e-02
+1158 1166 8.33333333333333e-02
+1158 1165 -1.66666666666667e-01
+1158 1117 8.33333333333333e-02
+1158 1018 -8.33333333333333e-02
+1158 1127 -8.33333333333333e-02
+1158 1028 8.33333333333333e-02
+1158 1126 1.66666666666667e-01
+1158 1027 -1.66666666666667e-01
+1158 1125 -2.50000000000000e-01
+1158 1118 8.33333333333333e-02
+1158 1019 -8.33333333333333e-02
+1158 923 8.33333333333333e-02
+1158 911 -8.33333333333333e-02
+1158 1159 -3.33333333333333e-01
+1158 910 1.66666666666667e-01
+1158 1054 1.66666666666667e-01
+1158 728 1.66666666666667e-01
+1158 1043 -1.66666666666667e-01
+1158 727 -8.33333333333333e-02
+1158 1042 8.33333333333333e-02
+1158 726 -2.50000000000000e-01
+1158 909 -2.50000000000000e-01
+1158 1160 -3.33333333333333e-01
+1158 770 1.66666666666667e-01
+1158 1055 1.66666666666667e-01
+1158 769 -8.33333333333333e-02
+1158 922 8.33333333333333e-02
+1158 1264 8.33333333333333e-02
+1158 768 -2.50000000000000e-01
+1158 1053 -7.50000000000000e-01
+1159 1159 2.50000000000000e+00
+1159 1265 8.33333333333333e-02
+1159 1163 -8.33333333333333e-02
+1159 1162 -2.50000000000000e-01
+1159 1161 1.66666666666667e-01
+1159 1166 8.33333333333333e-02
+1159 1268 -8.33333333333333e-02
+1159 1266 -8.33333333333333e-02
+1159 1164 -1.66666666666667e-01
+1159 1116 8.33333333333333e-02
+1159 1017 -8.33333333333333e-02
+1159 1028 8.33333333333333e-02
+1159 1019 -8.33333333333333e-02
+1159 1127 1.66666666666667e-01
+1159 1126 -7.50000000000000e-01
+1159 1125 1.66666666666667e-01
+1159 1026 -1.66666666666667e-01
+1159 1118 -1.66666666666667e-01
+1159 1043 8.33333333333333e-02
+1159 1055 -8.33333333333333e-02
+1159 1158 -3.33333333333333e-01
+1159 909 1.66666666666667e-01
+1159 1053 1.66666666666667e-01
+1159 728 1.66666666666667e-01
+1159 1160 -3.33333333333333e-01
+1159 911 1.66666666666667e-01
+1159 727 -2.50000000000000e-01
+1159 910 -7.50000000000000e-01
+1159 726 -8.33333333333333e-02
+1159 1041 8.33333333333333e-02
+1159 770 1.66666666666667e-01
+1159 923 -1.66666666666667e-01
+1159 1263 8.33333333333333e-02
+1159 769 -2.50000000000000e-01
+1159 1054 -2.50000000000000e-01
+1159 768 -8.33333333333333e-02
+1159 921 8.33333333333333e-02
+1160 1160 2.50000000000000e+00
+1160 1263 -1.66666666666667e-01
+1160 1163 -2.50000000000000e-01
+1160 1162 -8.33333333333333e-02
+1160 1161 1.66666666666667e-01
+1160 1165 8.33333333333333e-02
+1160 1267 -8.33333333333333e-02
+1160 1266 -8.33333333333333e-02
+1160 1164 8.33333333333333e-02
+1160 1027 8.33333333333333e-02
+1160 1018 -8.33333333333333e-02
+1160 1127 -2.50000000000000e-01
+1160 1126 1.66666666666667e-01
+1160 1125 -8.33333333333333e-02
+1160 1026 8.33333333333333e-02
+1160 1117 -1.66666666666667e-01
+1160 1116 8.33333333333333e-02
+1160 1017 -8.33333333333333e-02
+1160 921 8.33333333333333e-02
+1160 909 -8.33333333333333e-02
+1160 1042 8.33333333333333e-02
+1160 1054 -8.33333333333333e-02
+1160 728 -7.50000000000000e-01
+1160 911 -2.50000000000000e-01
+1160 727 1.66666666666667e-01
+1160 1159 -3.33333333333333e-01
+1160 910 1.66666666666667e-01
+1160 726 1.66666666666667e-01
+1160 1041 -1.66666666666667e-01
+1160 1264 8.33333333333333e-02
+1160 770 -7.50000000000000e-01
+1160 1055 -2.50000000000000e-01
+1160 769 1.66666666666667e-01
+1160 922 -1.66666666666667e-01
+1160 1158 -3.33333333333333e-01
+1160 768 1.66666666666667e-01
+1160 1053 1.66666666666667e-01
+1161 1161 2.50000000000000e+00
+1161 1121 8.33333333333333e-02
+1161 1118 -8.33333333333333e-02
+1161 1130 -8.33333333333333e-02
+1161 1127 8.33333333333333e-02
+1161 1129 1.66666666666667e-01
+1161 1126 -1.66666666666667e-01
+1161 1117 -8.33333333333333e-02
+1161 1128 -2.50000000000000e-01
+1161 1267 8.33333333333333e-02
+1161 1264 -8.33333333333333e-02
+1161 1268 8.33333333333333e-02
+1161 1160 1.66666666666667e-01
+1161 1159 1.66666666666667e-01
+1161 1162 -3.33333333333333e-01
+1161 1158 -7.50000000000000e-01
+1161 1265 1.66666666666667e-01
+1161 1263 -2.50000000000000e-01
+1161 1163 -3.33333333333333e-01
+1161 1166 -8.33333333333333e-02
+1161 1165 1.66666666666667e-01
+1161 1274 -8.33333333333333e-02
+1161 1184 8.33333333333333e-02
+1161 1183 -1.66666666666667e-01
+1161 1177 1.66666666666667e-01
+1161 728 -1.66666666666667e-01
+1161 1151 1.66666666666667e-01
+1161 727 8.33333333333333e-02
+1161 1150 -8.33333333333333e-02
+1161 1164 -2.50000000000000e-01
+1161 1149 -2.50000000000000e-01
+1161 1178 1.66666666666667e-01
+1161 773 -1.66666666666667e-01
+1161 1273 -8.33333333333333e-02
+1161 772 8.33333333333333e-02
+1161 1120 8.33333333333333e-02
+1161 1176 -7.50000000000000e-01
+1162 1162 2.50000000000000e+00
+1162 1121 -1.66666666666667e-01
+1162 1118 -8.33333333333333e-02
+1162 1127 8.33333333333333e-02
+1162 1128 1.66666666666667e-01
+1162 1125 -1.66666666666667e-01
+1162 1116 -8.33333333333333e-02
+1162 1130 1.66666666666667e-01
+1162 1129 -7.50000000000000e-01
+1162 1266 8.33333333333333e-02
+1162 1263 -8.33333333333333e-02
+1162 1265 1.66666666666667e-01
+1162 1268 -1.66666666666667e-01
+1162 1160 -8.33333333333333e-02
+1162 728 8.33333333333333e-02
+1162 1159 -2.50000000000000e-01
+1162 1158 1.66666666666667e-01
+1162 1161 -3.33333333333333e-01
+1162 773 8.33333333333333e-02
+1162 1264 -2.50000000000000e-01
+1162 1178 -8.33333333333333e-02
+1162 1184 8.33333333333333e-02
+1162 1274 -8.33333333333333e-02
+1162 1164 1.66666666666667e-01
+1162 1182 -1.66666666666667e-01
+1162 1176 1.66666666666667e-01
+1162 1166 1.66666666666667e-01
+1162 1151 1.66666666666667e-01
+1162 1163 -3.33333333333333e-01
+1162 1165 -7.50000000000000e-01
+1162 1150 -2.50000000000000e-01
+1162 726 8.33333333333333e-02
+1162 1149 -8.33333333333333e-02
+1162 1119 8.33333333333333e-02
+1162 1177 -2.50000000000000e-01
+1162 1272 -8.33333333333333e-02
+1162 771 8.33333333333333e-02
+1163 1163 2.50000000000000e+00
+1163 1119 8.33333333333333e-02
+1163 1116 -8.33333333333333e-02
+1163 1117 -8.33333333333333e-02
+1163 1126 8.33333333333333e-02
+1163 1128 -8.33333333333333e-02
+1163 1125 8.33333333333333e-02
+1163 1130 -2.50000000000000e-01
+1163 1129 1.66666666666667e-01
+1163 1264 1.66666666666667e-01
+1163 1267 -1.66666666666667e-01
+1163 1266 8.33333333333333e-02
+1163 1160 -2.50000000000000e-01
+1163 1159 -8.33333333333333e-02
+1163 727 8.33333333333333e-02
+1163 1158 1.66666666666667e-01
+1163 1265 -7.50000000000000e-01
+1163 772 8.33333333333333e-02
+1163 1263 1.66666666666667e-01
+1163 1177 -8.33333333333333e-02
+1163 1161 -3.33333333333333e-01
+1163 1164 -8.33333333333333e-02
+1163 1183 8.33333333333333e-02
+1163 1273 -8.33333333333333e-02
+1163 1272 -8.33333333333333e-02
+1163 1182 8.33333333333333e-02
+1163 1166 -2.50000000000000e-01
+1163 1151 -7.50000000000000e-01
+1163 1165 1.66666666666667e-01
+1163 1150 1.66666666666667e-01
+1163 1162 -3.33333333333333e-01
+1163 726 -1.66666666666667e-01
+1163 1149 1.66666666666667e-01
+1163 1120 -1.66666666666667e-01
+1163 1178 -2.50000000000000e-01
+1163 1176 1.66666666666667e-01
+1163 771 -1.66666666666667e-01
+1164 1164 2.50000000000000e+00
+1164 1156 -8.33333333333333e-02
+1164 1237 -1.66666666666667e-01
+1164 1157 1.66666666666667e-01
+1164 1155 -2.50000000000000e-01
+1164 1232 -8.33333333333333e-02
+1164 1231 1.66666666666667e-01
+1164 1230 -2.50000000000000e-01
+1164 1154 -1.66666666666667e-01
+1164 1153 8.33333333333333e-02
+1164 1151 8.33333333333333e-02
+1164 1163 -8.33333333333333e-02
+1164 1165 -3.33333333333333e-01
+1164 1183 1.66666666666667e-01
+1164 1162 1.66666666666667e-01
+1164 1184 1.66666666666667e-01
+1164 1274 -1.66666666666667e-01
+1164 781 -8.33333333333333e-02
+1164 1273 8.33333333333333e-02
+1164 1182 -7.50000000000000e-01
+1164 727 -8.33333333333333e-02
+1164 1150 8.33333333333333e-02
+1164 1161 -2.50000000000000e-01
+1164 911 1.66666666666667e-01
+1164 1166 -3.33333333333333e-01
+1164 1268 1.66666666666667e-01
+1164 928 8.33333333333333e-02
+1164 1267 -8.33333333333333e-02
+1164 1160 8.33333333333333e-02
+1164 728 -8.33333333333333e-02
+1164 910 1.66666666666667e-01
+1164 1159 -1.66666666666667e-01
+1164 909 -7.50000000000000e-01
+1164 929 8.33333333333333e-02
+1164 782 -8.33333333333333e-02
+1164 1266 -2.50000000000000e-01
+1164 1238 8.33333333333333e-02
+1165 1165 2.50000000000000e+00
+1165 1155 -8.33333333333333e-02
+1165 1238 8.33333333333333e-02
+1165 1236 -1.66666666666667e-01
+1165 1156 -2.50000000000000e-01
+1165 1154 8.33333333333333e-02
+1165 1230 1.66666666666667e-01
+1165 1232 1.66666666666667e-01
+1165 1231 -7.50000000000000e-01
+1165 1152 8.33333333333333e-02
+1165 1166 -3.33333333333333e-01
+1165 728 -8.33333333333333e-02
+1165 782 -8.33333333333333e-02
+1165 1184 -8.33333333333333e-02
+1165 1274 8.33333333333333e-02
+1165 1164 -3.33333333333333e-01
+1165 1182 1.66666666666667e-01
+1165 1161 1.66666666666667e-01
+1165 1183 -2.50000000000000e-01
+1165 780 -8.33333333333333e-02
+1165 1272 8.33333333333333e-02
+1165 1151 -1.66666666666667e-01
+1165 1163 1.66666666666667e-01
+1165 1162 -7.50000000000000e-01
+1165 726 -8.33333333333333e-02
+1165 1149 8.33333333333333e-02
+1165 911 -8.33333333333333e-02
+1165 1160 8.33333333333333e-02
+1165 927 8.33333333333333e-02
+1165 1266 -8.33333333333333e-02
+1165 910 -2.50000000000000e-01
+1165 909 1.66666666666667e-01
+1165 1158 -1.66666666666667e-01
+1165 929 -1.66666666666667e-01
+1165 1268 1.66666666666667e-01
+1165 1267 -2.50000000000000e-01
+1165 1157 1.66666666666667e-01
+1166 1166 2.50000000000000e+00
+1166 1156 1.66666666666667e-01
+1166 1237 8.33333333333333e-02
+1166 1157 -7.50000000000000e-01
+1166 1155 1.66666666666667e-01
+1166 1230 -8.33333333333333e-02
+1166 1153 8.33333333333333e-02
+1166 1232 -2.50000000000000e-01
+1166 1231 1.66666666666667e-01
+1166 1152 -1.66666666666667e-01
+1166 1165 -3.33333333333333e-01
+1166 727 -8.33333333333333e-02
+1166 781 -8.33333333333333e-02
+1166 1149 8.33333333333333e-02
+1166 1161 -8.33333333333333e-02
+1166 1183 -8.33333333333333e-02
+1166 1273 8.33333333333333e-02
+1166 1184 -2.50000000000000e-01
+1166 1182 1.66666666666667e-01
+1166 1272 -1.66666666666667e-01
+1166 1163 -2.50000000000000e-01
+1166 1150 -1.66666666666667e-01
+1166 1162 1.66666666666667e-01
+1166 910 -8.33333333333333e-02
+1166 1159 8.33333333333333e-02
+1166 909 1.66666666666667e-01
+1166 1164 -3.33333333333333e-01
+1166 1266 1.66666666666667e-01
+1166 911 -2.50000000000000e-01
+1166 1158 8.33333333333333e-02
+1166 726 -8.33333333333333e-02
+1166 1268 -7.50000000000000e-01
+1166 1236 8.33333333333333e-02
+1166 928 -1.66666666666667e-01
+1166 1267 1.66666666666667e-01
+1166 927 8.33333333333333e-02
+1166 780 -8.33333333333333e-02
+1167 1167 2.50000000000000e+00
+1167 1102 -8.33333333333333e-02
+1167 1097 -1.66666666666667e-01
+1167 1103 1.66666666666667e-01
+1167 1101 -2.50000000000000e-01
+1167 1199 8.33333333333333e-02
+1167 1198 -1.66666666666667e-01
+1167 1175 -8.33333333333333e-02
+1167 1174 1.66666666666667e-01
+1167 1173 -2.50000000000000e-01
+1167 1066 -8.33333333333333e-02
+1167 1075 8.33333333333333e-02
+1167 1076 8.33333333333333e-02
+1167 1139 -8.33333333333333e-02
+1167 739 1.66666666666667e-01
+1167 1168 -3.33333333333333e-01
+1167 1138 1.66666666666667e-01
+1167 1137 -2.50000000000000e-01
+1167 1067 -8.33333333333333e-02
+1167 1133 8.33333333333333e-02
+1167 730 1.66666666666667e-01
+1167 1132 -1.66666666666667e-01
+1167 935 -8.33333333333333e-02
+1167 932 8.33333333333333e-02
+1167 740 1.66666666666667e-01
+1167 1202 -1.66666666666667e-01
+1167 1201 8.33333333333333e-02
+1167 934 -8.33333333333333e-02
+1167 738 -7.50000000000000e-01
+1167 1169 -3.33333333333333e-01
+1167 1181 1.66666666666667e-01
+1167 731 1.66666666666667e-01
+1167 1180 -8.33333333333333e-02
+1167 931 8.33333333333333e-02
+1167 1096 8.33333333333333e-02
+1167 1179 -2.50000000000000e-01
+1167 729 -7.50000000000000e-01
+1168 1168 2.50000000000000e+00
+1168 1101 -8.33333333333333e-02
+1168 1103 1.66666666666667e-01
+1168 1097 8.33333333333333e-02
+1168 1102 -2.50000000000000e-01
+1168 1199 8.33333333333333e-02
+1168 1197 -1.66666666666667e-01
+1168 1175 1.66666666666667e-01
+1168 1174 -7.50000000000000e-01
+1168 1173 1.66666666666667e-01
+1168 1169 -3.33333333333333e-01
+1168 731 -8.33333333333333e-02
+1168 740 -8.33333333333333e-02
+1168 1133 8.33333333333333e-02
+1168 1067 -8.33333333333333e-02
+1168 1065 -8.33333333333333e-02
+1168 1074 8.33333333333333e-02
+1168 1076 -1.66666666666667e-01
+1168 1139 1.66666666666667e-01
+1168 1138 -7.50000000000000e-01
+1168 738 1.66666666666667e-01
+1168 1167 -3.33333333333333e-01
+1168 1137 1.66666666666667e-01
+1168 729 1.66666666666667e-01
+1168 1131 -1.66666666666667e-01
+1168 1202 8.33333333333333e-02
+1168 935 -8.33333333333333e-02
+1168 739 -2.50000000000000e-01
+1168 1200 8.33333333333333e-02
+1168 933 -8.33333333333333e-02
+1168 1181 1.66666666666667e-01
+1168 932 -1.66666666666667e-01
+1168 1095 8.33333333333333e-02
+1168 1180 -2.50000000000000e-01
+1168 730 -2.50000000000000e-01
+1168 1179 -8.33333333333333e-02
+1168 930 8.33333333333333e-02
+1169 1169 2.50000000000000e+00
+1169 1096 8.33333333333333e-02
+1169 1095 -1.66666666666667e-01
+1169 1103 -7.50000000000000e-01
+1169 1101 1.66666666666667e-01
+1169 1198 8.33333333333333e-02
+1169 1197 8.33333333333333e-02
+1169 1175 -2.50000000000000e-01
+1169 1174 1.66666666666667e-01
+1169 1173 -8.33333333333333e-02
+1169 1168 -3.33333333333333e-01
+1169 730 -8.33333333333333e-02
+1169 739 -8.33333333333333e-02
+1169 1132 8.33333333333333e-02
+1169 1066 -8.33333333333333e-02
+1169 1139 -2.50000000000000e-01
+1169 1075 -1.66666666666667e-01
+1169 1138 1.66666666666667e-01
+1169 1074 8.33333333333333e-02
+1169 1137 -8.33333333333333e-02
+1169 1065 -8.33333333333333e-02
+1169 1131 8.33333333333333e-02
+1169 1201 8.33333333333333e-02
+1169 934 -8.33333333333333e-02
+1169 933 -8.33333333333333e-02
+1169 930 8.33333333333333e-02
+1169 740 -2.50000000000000e-01
+1169 738 1.66666666666667e-01
+1169 1200 -1.66666666666667e-01
+1169 1102 1.66666666666667e-01
+1169 1181 -7.50000000000000e-01
+1169 731 -2.50000000000000e-01
+1169 1180 1.66666666666667e-01
+1169 931 -1.66666666666667e-01
+1169 1167 -3.33333333333333e-01
+1169 1179 1.66666666666667e-01
+1169 729 1.66666666666667e-01
+1170 1170 2.50000000000000e+00
+1170 1108 -8.33333333333333e-02
+1170 1109 1.66666666666667e-01
+1170 1097 8.33333333333333e-02
+1170 1107 -2.50000000000000e-01
+1170 1235 8.33333333333333e-02
+1170 1234 -1.66666666666667e-01
+1170 1175 1.66666666666667e-01
+1170 1174 1.66666666666667e-01
+1170 1173 -7.50000000000000e-01
+1170 1172 -3.33333333333333e-01
+1170 755 -8.33333333333333e-02
+1170 731 -8.33333333333333e-02
+1170 1085 -8.33333333333333e-02
+1170 1151 8.33333333333333e-02
+1170 1084 -8.33333333333333e-02
+1170 1093 8.33333333333333e-02
+1170 1094 -1.66666666666667e-01
+1170 1157 1.66666666666667e-01
+1170 754 1.66666666666667e-01
+1170 1171 -3.33333333333333e-01
+1170 1156 1.66666666666667e-01
+1170 1155 -7.50000000000000e-01
+1170 730 1.66666666666667e-01
+1170 1150 -1.66666666666667e-01
+1170 938 -8.33333333333333e-02
+1170 1238 8.33333333333333e-02
+1170 1237 8.33333333333333e-02
+1170 937 -8.33333333333333e-02
+1170 753 -2.50000000000000e-01
+1170 1184 1.66666666666667e-01
+1170 932 -1.66666666666667e-01
+1170 1183 -8.33333333333333e-02
+1170 931 8.33333333333333e-02
+1170 1182 -2.50000000000000e-01
+1170 1096 8.33333333333333e-02
+1170 729 -2.50000000000000e-01
+1171 1171 2.50000000000000e+00
+1171 1107 -8.33333333333333e-02
+1171 1097 -1.66666666666667e-01
+1171 1109 1.66666666666667e-01
+1171 1108 -2.50000000000000e-01
+1171 1235 8.33333333333333e-02
+1171 1233 -1.66666666666667e-01
+1171 1175 -8.33333333333333e-02
+1171 1174 -2.50000000000000e-01
+1171 1173 1.66666666666667e-01
+1171 1083 -8.33333333333333e-02
+1171 1092 8.33333333333333e-02
+1171 1094 8.33333333333333e-02
+1171 1157 -8.33333333333333e-02
+1171 1156 -2.50000000000000e-01
+1171 753 1.66666666666667e-01
+1171 1170 -3.33333333333333e-01
+1171 1155 1.66666666666667e-01
+1171 1085 -8.33333333333333e-02
+1171 1151 8.33333333333333e-02
+1171 729 1.66666666666667e-01
+1171 1149 -1.66666666666667e-01
+1171 938 -8.33333333333333e-02
+1171 932 8.33333333333333e-02
+1171 1238 -1.66666666666667e-01
+1171 755 1.66666666666667e-01
+1171 754 -7.50000000000000e-01
+1171 1236 8.33333333333333e-02
+1171 936 -8.33333333333333e-02
+1171 1184 1.66666666666667e-01
+1171 1172 -3.33333333333333e-01
+1171 731 1.66666666666667e-01
+1171 1183 -2.50000000000000e-01
+1171 1095 8.33333333333333e-02
+1171 730 -7.50000000000000e-01
+1171 1182 -8.33333333333333e-02
+1171 930 8.33333333333333e-02
+1172 1172 2.50000000000000e+00
+1172 1096 -1.66666666666667e-01
+1172 1095 8.33333333333333e-02
+1172 1109 -7.50000000000000e-01
+1172 1108 1.66666666666667e-01
+1172 1233 8.33333333333333e-02
+1172 1234 8.33333333333333e-02
+1172 1175 -2.50000000000000e-01
+1172 1174 -8.33333333333333e-02
+1172 1173 1.66666666666667e-01
+1172 1170 -3.33333333333333e-01
+1172 753 -8.33333333333333e-02
+1172 729 -8.33333333333333e-02
+1172 1083 -8.33333333333333e-02
+1172 1149 8.33333333333333e-02
+1172 1157 -2.50000000000000e-01
+1172 1093 8.33333333333333e-02
+1172 1156 -8.33333333333333e-02
+1172 1092 -1.66666666666667e-01
+1172 1155 1.66666666666667e-01
+1172 1084 -8.33333333333333e-02
+1172 1150 8.33333333333333e-02
+1172 936 -8.33333333333333e-02
+1172 1236 8.33333333333333e-02
+1172 937 -8.33333333333333e-02
+1172 931 8.33333333333333e-02
+1172 755 -2.50000000000000e-01
+1172 1237 -1.66666666666667e-01
+1172 754 1.66666666666667e-01
+1172 1184 -7.50000000000000e-01
+1172 1107 1.66666666666667e-01
+1172 731 -2.50000000000000e-01
+1172 1183 1.66666666666667e-01
+1172 1171 -3.33333333333333e-01
+1172 730 1.66666666666667e-01
+1172 1182 1.66666666666667e-01
+1172 930 -1.66666666666667e-01
+1173 1173 2.50000000000000e+00
+1173 1109 -1.66666666666667e-01
+1173 1235 -8.33333333333333e-02
+1173 937 8.33333333333333e-02
+1173 938 8.33333333333333e-02
+1173 1234 1.66666666666667e-01
+1173 1233 -2.50000000000000e-01
+1173 1172 1.66666666666667e-01
+1173 1171 1.66666666666667e-01
+1173 1170 -7.50000000000000e-01
+1173 1096 -8.33333333333333e-02
+1173 1097 -8.33333333333333e-02
+1173 1111 -8.33333333333333e-02
+1173 1102 8.33333333333333e-02
+1173 1103 8.33333333333333e-02
+1173 1112 1.66666666666667e-01
+1173 1175 -3.33333333333333e-01
+1173 1110 -2.50000000000000e-01
+1173 931 -8.33333333333333e-02
+1173 1174 -3.33333333333333e-01
+1173 1199 1.66666666666667e-01
+1173 940 -8.33333333333333e-02
+1173 934 8.33333333333333e-02
+1173 932 1.66666666666667e-01
+1173 935 -1.66666666666667e-01
+1173 758 8.33333333333333e-02
+1173 941 -8.33333333333333e-02
+1173 1198 1.66666666666667e-01
+1173 757 -1.66666666666667e-01
+1173 1197 -7.50000000000000e-01
+1173 1169 -8.33333333333333e-02
+1173 731 8.33333333333333e-02
+1173 1168 1.66666666666667e-01
+1173 730 -1.66666666666667e-01
+1173 1167 -2.50000000000000e-01
+1173 1108 8.33333333333333e-02
+1173 930 -2.50000000000000e-01
+1174 1174 2.50000000000000e+00
+1174 1109 8.33333333333333e-02
+1174 1235 1.66666666666667e-01
+1174 936 8.33333333333333e-02
+1174 938 -1.66666666666667e-01
+1174 1234 -7.50000000000000e-01
+1174 1233 1.66666666666667e-01
+1174 1172 -8.33333333333333e-02
+1174 1171 -2.50000000000000e-01
+1174 1170 1.66666666666667e-01
+1174 1095 -8.33333333333333e-02
+1174 1112 1.66666666666667e-01
+1174 1110 -8.33333333333333e-02
+1174 1101 8.33333333333333e-02
+1174 1103 -1.66666666666667e-01
+1174 758 8.33333333333333e-02
+1174 1111 -2.50000000000000e-01
+1174 1097 -8.33333333333333e-02
+1174 731 8.33333333333333e-02
+1174 930 -8.33333333333333e-02
+1174 1199 -8.33333333333333e-02
+1174 1173 -3.33333333333333e-01
+1174 939 -8.33333333333333e-02
+1174 933 8.33333333333333e-02
+1174 941 -8.33333333333333e-02
+1174 935 8.33333333333333e-02
+1174 1198 -2.50000000000000e-01
+1174 1197 1.66666666666667e-01
+1174 756 -1.66666666666667e-01
+1174 1169 1.66666666666667e-01
+1174 1175 -3.33333333333333e-01
+1174 932 1.66666666666667e-01
+1174 1168 -7.50000000000000e-01
+1174 1107 8.33333333333333e-02
+1174 931 -2.50000000000000e-01
+1174 1167 1.66666666666667e-01
+1174 729 -1.66666666666667e-01
+1175 1175 2.50000000000000e+00
+1175 1107 -1.66666666666667e-01
+1175 1233 -8.33333333333333e-02
+1175 1234 1.66666666666667e-01
+1175 937 -1.66666666666667e-01
+1175 936 8.33333333333333e-02
+1175 1235 -2.50000000000000e-01
+1175 1172 -2.50000000000000e-01
+1175 1171 -8.33333333333333e-02
+1175 1170 1.66666666666667e-01
+1175 1095 -8.33333333333333e-02
+1175 1111 1.66666666666667e-01
+1175 1102 -1.66666666666667e-01
+1175 1101 8.33333333333333e-02
+1175 1112 -7.50000000000000e-01
+1175 757 8.33333333333333e-02
+1175 1110 1.66666666666667e-01
+1175 1173 -3.33333333333333e-01
+1175 1096 -8.33333333333333e-02
+1175 730 8.33333333333333e-02
+1175 1198 -8.33333333333333e-02
+1175 1197 1.66666666666667e-01
+1175 940 -8.33333333333333e-02
+1175 934 8.33333333333333e-02
+1175 930 1.66666666666667e-01
+1175 933 -1.66666666666667e-01
+1175 1199 -2.50000000000000e-01
+1175 756 8.33333333333333e-02
+1175 939 -8.33333333333333e-02
+1175 1169 -2.50000000000000e-01
+1175 1108 8.33333333333333e-02
+1175 932 -7.50000000000000e-01
+1175 1168 1.66666666666667e-01
+1175 1174 -3.33333333333333e-01
+1175 931 1.66666666666667e-01
+1175 1167 -8.33333333333333e-02
+1175 729 8.33333333333333e-02
+1176 1176 2.50000000000000e+00
+1176 1151 -1.66666666666667e-01
+1176 1150 8.33333333333333e-02
+1176 1163 1.66666666666667e-01
+1176 1161 -7.50000000000000e-01
+1176 1273 8.33333333333333e-02
+1176 1274 8.33333333333333e-02
+1176 1184 -8.33333333333333e-02
+1176 1183 1.66666666666667e-01
+1176 1182 -2.50000000000000e-01
+1176 1120 -8.33333333333333e-02
+1176 1121 -8.33333333333333e-02
+1176 1130 8.33333333333333e-02
+1176 1129 -1.66666666666667e-01
+1176 1133 8.33333333333333e-02
+1176 1145 -8.33333333333333e-02
+1176 1177 -3.33333333333333e-01
+1176 1144 1.66666666666667e-01
+1176 1132 8.33333333333333e-02
+1176 730 -8.33333333333333e-02
+1176 772 -8.33333333333333e-02
+1176 1143 -2.50000000000000e-01
+1176 932 8.33333333333333e-02
+1176 944 -8.33333333333333e-02
+1176 1270 8.33333333333333e-02
+1176 943 -8.33333333333333e-02
+1176 773 1.66666666666667e-01
+1176 1271 -1.66666666666667e-01
+1176 771 -2.50000000000000e-01
+1176 1178 -3.33333333333333e-01
+1176 1181 1.66666666666667e-01
+1176 731 1.66666666666667e-01
+1176 1180 1.66666666666667e-01
+1176 931 -1.66666666666667e-01
+1176 1162 1.66666666666667e-01
+1176 1179 -7.50000000000000e-01
+1176 729 -2.50000000000000e-01
+1177 1177 2.50000000000000e+00
+1177 1163 -8.33333333333333e-02
+1177 1161 1.66666666666667e-01
+1177 1149 8.33333333333333e-02
+1177 1162 -2.50000000000000e-01
+1177 1272 8.33333333333333e-02
+1177 1274 -1.66666666666667e-01
+1177 1184 1.66666666666667e-01
+1177 1183 -7.50000000000000e-01
+1177 1182 1.66666666666667e-01
+1177 1119 -8.33333333333333e-02
+1177 1121 -8.33333333333333e-02
+1177 1130 8.33333333333333e-02
+1177 1128 -1.66666666666667e-01
+1177 1176 -3.33333333333333e-01
+1177 1143 1.66666666666667e-01
+1177 1133 -1.66666666666667e-01
+1177 731 1.66666666666667e-01
+1177 1131 8.33333333333333e-02
+1177 729 -8.33333333333333e-02
+1177 1145 1.66666666666667e-01
+1177 1178 -3.33333333333333e-01
+1177 773 1.66666666666667e-01
+1177 1144 -7.50000000000000e-01
+1177 771 -8.33333333333333e-02
+1177 1269 8.33333333333333e-02
+1177 942 -8.33333333333333e-02
+1177 1271 8.33333333333333e-02
+1177 944 -8.33333333333333e-02
+1177 772 -2.50000000000000e-01
+1177 1181 -8.33333333333333e-02
+1177 932 8.33333333333333e-02
+1177 1151 8.33333333333333e-02
+1177 1180 -2.50000000000000e-01
+1177 730 -2.50000000000000e-01
+1177 1179 1.66666666666667e-01
+1177 930 -1.66666666666667e-01
+1178 1178 2.50000000000000e+00
+1178 1162 -8.33333333333333e-02
+1178 1149 -1.66666666666667e-01
+1178 1163 -2.50000000000000e-01
+1178 1161 1.66666666666667e-01
+1178 1273 -1.66666666666667e-01
+1178 1272 8.33333333333333e-02
+1178 1184 -2.50000000000000e-01
+1178 1183 1.66666666666667e-01
+1178 1182 -8.33333333333333e-02
+1178 1120 -8.33333333333333e-02
+1178 1129 8.33333333333333e-02
+1178 1119 -8.33333333333333e-02
+1178 1128 8.33333333333333e-02
+1178 1131 8.33333333333333e-02
+1178 1143 -8.33333333333333e-02
+1178 1132 -1.66666666666667e-01
+1178 730 1.66666666666667e-01
+1178 1145 -2.50000000000000e-01
+1178 1144 1.66666666666667e-01
+1178 1177 -3.33333333333333e-01
+1178 772 1.66666666666667e-01
+1178 930 8.33333333333333e-02
+1178 942 -8.33333333333333e-02
+1178 773 -7.50000000000000e-01
+1178 1270 8.33333333333333e-02
+1178 943 -8.33333333333333e-02
+1178 771 1.66666666666667e-01
+1178 1269 -1.66666666666667e-01
+1178 1150 8.33333333333333e-02
+1178 1181 -2.50000000000000e-01
+1178 731 -7.50000000000000e-01
+1178 1180 -8.33333333333333e-02
+1178 931 8.33333333333333e-02
+1178 1176 -3.33333333333333e-01
+1178 1179 1.66666666666667e-01
+1178 729 1.66666666666667e-01
+1179 1179 2.50000000000000e+00
+1179 1138 8.33333333333333e-02
+1179 1201 1.66666666666667e-01
+1179 935 8.33333333333333e-02
+1179 934 -1.66666666666667e-01
+1179 1202 1.66666666666667e-01
+1179 1200 -7.50000000000000e-01
+1179 1169 1.66666666666667e-01
+1179 1168 -8.33333333333333e-02
+1179 1167 -2.50000000000000e-01
+1179 1133 -8.33333333333333e-02
+1179 1148 -8.33333333333333e-02
+1179 1145 8.33333333333333e-02
+1179 1147 1.66666666666667e-01
+1179 1144 -1.66666666666667e-01
+1179 775 8.33333333333333e-02
+1179 1146 -2.50000000000000e-01
+1179 1132 -8.33333333333333e-02
+1179 730 8.33333333333333e-02
+1179 932 -8.33333333333333e-02
+1179 1181 -3.33333333333333e-01
+1179 1270 -8.33333333333333e-02
+1179 947 -8.33333333333333e-02
+1179 944 8.33333333333333e-02
+1179 946 -8.33333333333333e-02
+1179 943 8.33333333333333e-02
+1179 1271 1.66666666666667e-01
+1179 776 -1.66666666666667e-01
+1179 1269 -2.50000000000000e-01
+1179 1178 1.66666666666667e-01
+1179 731 -1.66666666666667e-01
+1179 1177 1.66666666666667e-01
+1179 1180 -3.33333333333333e-01
+1179 931 1.66666666666667e-01
+1179 1176 -7.50000000000000e-01
+1179 1139 8.33333333333333e-02
+1179 930 -2.50000000000000e-01
+1180 1180 2.50000000000000e+00
+1180 1137 8.33333333333333e-02
+1180 1202 -8.33333333333333e-02
+1180 935 8.33333333333333e-02
+1180 1200 1.66666666666667e-01
+1180 933 -1.66666666666667e-01
+1180 1201 -2.50000000000000e-01
+1180 1169 1.66666666666667e-01
+1180 1168 -2.50000000000000e-01
+1180 1167 -8.33333333333333e-02
+1180 1133 -8.33333333333333e-02
+1180 1146 1.66666666666667e-01
+1180 1145 8.33333333333333e-02
+1180 1143 -1.66666666666667e-01
+1180 1148 1.66666666666667e-01
+1180 1181 -3.33333333333333e-01
+1180 1147 -7.50000000000000e-01
+1180 774 8.33333333333333e-02
+1180 1131 -8.33333333333333e-02
+1180 729 8.33333333333333e-02
+1180 1269 -8.33333333333333e-02
+1180 1271 1.66666666666667e-01
+1180 932 1.66666666666667e-01
+1180 944 -1.66666666666667e-01
+1180 945 -8.33333333333333e-02
+1180 942 8.33333333333333e-02
+1180 776 8.33333333333333e-02
+1180 947 -8.33333333333333e-02
+1180 1270 -2.50000000000000e-01
+1180 1178 -8.33333333333333e-02
+1180 731 8.33333333333333e-02
+1180 1177 -2.50000000000000e-01
+1180 1139 -1.66666666666667e-01
+1180 931 -7.50000000000000e-01
+1180 1176 1.66666666666667e-01
+1180 1179 -3.33333333333333e-01
+1180 930 1.66666666666667e-01
+1181 1181 2.50000000000000e+00
+1181 1138 -1.66666666666667e-01
+1181 1201 -8.33333333333333e-02
+1181 934 8.33333333333333e-02
+1181 933 8.33333333333333e-02
+1181 1202 -2.50000000000000e-01
+1181 1200 1.66666666666667e-01
+1181 1169 -7.50000000000000e-01
+1181 1168 1.66666666666667e-01
+1181 1167 1.66666666666667e-01
+1181 1131 -8.33333333333333e-02
+1181 1132 -8.33333333333333e-02
+1181 1146 -8.33333333333333e-02
+1181 1143 8.33333333333333e-02
+1181 1144 8.33333333333333e-02
+1181 1148 -2.50000000000000e-01
+1181 1147 1.66666666666667e-01
+1181 1180 -3.33333333333333e-01
+1181 930 -8.33333333333333e-02
+1181 1179 -3.33333333333333e-01
+1181 1270 1.66666666666667e-01
+1181 945 -8.33333333333333e-02
+1181 942 8.33333333333333e-02
+1181 931 1.66666666666667e-01
+1181 943 -1.66666666666667e-01
+1181 1271 -7.50000000000000e-01
+1181 775 8.33333333333333e-02
+1181 946 -8.33333333333333e-02
+1181 1269 1.66666666666667e-01
+1181 774 -1.66666666666667e-01
+1181 1178 -2.50000000000000e-01
+1181 1137 8.33333333333333e-02
+1181 932 -2.50000000000000e-01
+1181 1177 -8.33333333333333e-02
+1181 730 8.33333333333333e-02
+1181 1176 1.66666666666667e-01
+1181 729 -1.66666666666667e-01
+1182 1182 2.50000000000000e+00
+1182 1156 8.33333333333333e-02
+1182 938 8.33333333333333e-02
+1182 1238 -8.33333333333333e-02
+1182 1237 1.66666666666667e-01
+1182 937 -1.66666666666667e-01
+1182 1236 -2.50000000000000e-01
+1182 1172 1.66666666666667e-01
+1182 1171 -8.33333333333333e-02
+1182 1170 -2.50000000000000e-01
+1182 1151 -8.33333333333333e-02
+1182 1165 1.66666666666667e-01
+1182 1163 8.33333333333333e-02
+1182 1162 -1.66666666666667e-01
+1182 1166 1.66666666666667e-01
+1182 1184 -3.33333333333333e-01
+1182 781 8.33333333333333e-02
+1182 1164 -7.50000000000000e-01
+1182 1150 -8.33333333333333e-02
+1182 730 8.33333333333333e-02
+1182 1273 -8.33333333333333e-02
+1182 1274 1.66666666666667e-01
+1182 932 1.66666666666667e-01
+1182 944 -1.66666666666667e-01
+1182 949 -8.33333333333333e-02
+1182 943 8.33333333333333e-02
+1182 782 8.33333333333333e-02
+1182 950 -8.33333333333333e-02
+1182 1272 -2.50000000000000e-01
+1182 1178 -8.33333333333333e-02
+1182 731 8.33333333333333e-02
+1182 1183 -3.33333333333333e-01
+1182 1177 1.66666666666667e-01
+1182 931 1.66666666666667e-01
+1182 1157 -1.66666666666667e-01
+1182 1176 -2.50000000000000e-01
+1182 930 -7.50000000000000e-01
+1183 1183 2.50000000000000e+00
+1183 1155 8.33333333333333e-02
+1183 1236 1.66666666666667e-01
+1183 938 8.33333333333333e-02
+1183 936 -1.66666666666667e-01
+1183 1238 1.66666666666667e-01
+1183 1237 -7.50000000000000e-01
+1183 1172 1.66666666666667e-01
+1183 1171 -2.50000000000000e-01
+1183 1170 -8.33333333333333e-02
+1183 1151 -8.33333333333333e-02
+1183 1166 -8.33333333333333e-02
+1183 1163 8.33333333333333e-02
+1183 1164 1.66666666666667e-01
+1183 1161 -1.66666666666667e-01
+1183 1165 -2.50000000000000e-01
+1183 780 8.33333333333333e-02
+1183 1149 -8.33333333333333e-02
+1183 729 8.33333333333333e-02
+1183 932 -8.33333333333333e-02
+1183 1184 -3.33333333333333e-01
+1183 1272 -8.33333333333333e-02
+1183 950 -8.33333333333333e-02
+1183 944 8.33333333333333e-02
+1183 948 -8.33333333333333e-02
+1183 942 8.33333333333333e-02
+1183 782 -1.66666666666667e-01
+1183 1274 1.66666666666667e-01
+1183 1273 -2.50000000000000e-01
+1183 1178 1.66666666666667e-01
+1183 731 -1.66666666666667e-01
+1183 1157 8.33333333333333e-02
+1183 1177 -7.50000000000000e-01
+1183 931 -2.50000000000000e-01
+1183 1182 -3.33333333333333e-01
+1183 1176 1.66666666666667e-01
+1183 930 1.66666666666667e-01
+1184 1184 2.50000000000000e+00
+1184 1155 -1.66666666666667e-01
+1184 936 8.33333333333333e-02
+1184 1236 -8.33333333333333e-02
+1184 937 8.33333333333333e-02
+1184 1238 -2.50000000000000e-01
+1184 1237 1.66666666666667e-01
+1184 1172 -7.50000000000000e-01
+1184 1171 1.66666666666667e-01
+1184 1170 1.66666666666667e-01
+1184 1150 -8.33333333333333e-02
+1184 1149 -8.33333333333333e-02
+1184 1165 -8.33333333333333e-02
+1184 1162 8.33333333333333e-02
+1184 1161 8.33333333333333e-02
+1184 1166 -2.50000000000000e-01
+1184 1164 1.66666666666667e-01
+1184 1182 -3.33333333333333e-01
+1184 931 -8.33333333333333e-02
+1184 1183 -3.33333333333333e-01
+1184 949 -8.33333333333333e-02
+1184 943 8.33333333333333e-02
+1184 1272 1.66666666666667e-01
+1184 930 1.66666666666667e-01
+1184 942 -1.66666666666667e-01
+1184 1274 -7.50000000000000e-01
+1184 781 -1.66666666666667e-01
+1184 1273 1.66666666666667e-01
+1184 780 8.33333333333333e-02
+1184 948 -8.33333333333333e-02
+1184 1156 8.33333333333333e-02
+1184 1178 -2.50000000000000e-01
+1184 932 -2.50000000000000e-01
+1184 1177 1.66666666666667e-01
+1184 730 -1.66666666666667e-01
+1184 1176 -8.33333333333333e-02
+1184 729 8.33333333333333e-02
+1185 1185 1.25000000000000e+00
+1185 1199 4.16666666666667e-02
+1185 1189 8.33333333333333e-02
+1185 1186 -1.66666666666667e-01
+1185 1102 1.66666666666667e-01
+1185 1100 -1.66666666666667e-01
+1185 734 8.33333333333333e-02
+1185 1099 8.33333333333333e-02
+1185 733 -4.16666666666667e-02
+1185 1188 -1.25000000000000e-01
+1185 1103 1.66666666666667e-01
+1185 1187 -1.66666666666667e-01
+1185 740 8.33333333333333e-02
+1185 1198 4.16666666666667e-02
+1185 739 -4.16666666666667e-02
+1185 1101 -7.50000000000000e-01
+1185 1069 -8.33333333333333e-02
+1185 823 4.16666666666667e-02
+1185 824 4.16666666666667e-02
+1185 1070 -8.33333333333333e-02
+1185 732 -1.25000000000000e-01
+1185 830 -4.16666666666667e-02
+1185 1076 8.33333333333333e-02
+1185 829 8.33333333333333e-02
+1185 1075 -1.66666666666667e-01
+1185 828 -1.25000000000000e-01
+1185 1190 -4.16666666666667e-02
+1185 738 -1.25000000000000e-01
+1186 1186 1.25000000000000e+00
+1186 1103 -8.33333333333333e-02
+1186 1188 8.33333333333333e-02
+1186 1185 -1.66666666666667e-01
+1186 1101 1.66666666666667e-01
+1186 1190 8.33333333333333e-02
+1186 1189 -3.75000000000000e-01
+1186 1098 8.33333333333333e-02
+1186 732 -4.16666666666667e-02
+1186 1199 -8.33333333333333e-02
+1186 1102 -2.50000000000000e-01
+1186 1197 4.16666666666667e-02
+1186 738 -4.16666666666667e-02
+1186 1068 -8.33333333333333e-02
+1186 822 4.16666666666667e-02
+1186 1070 -8.33333333333333e-02
+1186 1076 8.33333333333333e-02
+1186 824 -8.33333333333333e-02
+1186 734 8.33333333333333e-02
+1186 733 -1.25000000000000e-01
+1186 830 8.33333333333333e-02
+1186 1187 -1.66666666666667e-01
+1186 740 8.33333333333333e-02
+1186 829 -3.75000000000000e-01
+1186 1100 8.33333333333333e-02
+1186 739 -1.25000000000000e-01
+1186 828 8.33333333333333e-02
+1186 1074 -1.66666666666667e-01
+1187 1187 1.25000000000000e+00
+1187 1102 -8.33333333333333e-02
+1187 1188 -4.16666666666667e-02
+1187 1197 4.16666666666667e-02
+1187 1190 -1.25000000000000e-01
+1187 1189 8.33333333333333e-02
+1187 1098 -1.66666666666667e-01
+1187 732 8.33333333333333e-02
+1187 1103 -2.50000000000000e-01
+1187 1198 -8.33333333333333e-02
+1187 1101 1.66666666666667e-01
+1187 1185 -1.66666666666667e-01
+1187 738 8.33333333333333e-02
+1187 1069 -8.33333333333333e-02
+1187 1075 8.33333333333333e-02
+1187 734 -3.75000000000000e-01
+1187 823 -8.33333333333333e-02
+1187 733 8.33333333333333e-02
+1187 822 4.16666666666667e-02
+1187 1068 -8.33333333333333e-02
+1187 830 -1.25000000000000e-01
+1187 1099 8.33333333333333e-02
+1187 740 -3.75000000000000e-01
+1187 829 8.33333333333333e-02
+1187 1186 -1.66666666666667e-01
+1187 739 8.33333333333333e-02
+1187 828 -4.16666666666667e-02
+1187 1074 8.33333333333333e-02
+1188 1188 1.25000000000000e+00
+1188 1103 8.33333333333333e-02
+1188 1186 8.33333333333333e-02
+1188 1102 -1.66666666666667e-01
+1188 733 4.16666666666667e-02
+1188 1185 -1.25000000000000e-01
+1188 1190 -1.66666666666667e-01
+1188 1199 8.33333333333333e-02
+1188 757 4.16666666666667e-02
+1188 1198 -4.16666666666667e-02
+1188 1197 -1.25000000000000e-01
+1188 1099 -8.33333333333333e-02
+1188 860 8.33333333333333e-02
+1188 856 8.33333333333333e-02
+1188 859 -4.16666666666667e-02
+1188 857 -1.66666666666667e-01
+1188 1112 1.66666666666667e-01
+1188 734 4.16666666666667e-02
+1188 1100 -8.33333333333333e-02
+1188 858 -1.25000000000000e-01
+1188 866 -4.16666666666667e-02
+1188 758 4.16666666666667e-02
+1188 1189 -1.66666666666667e-01
+1188 865 8.33333333333333e-02
+1188 1111 1.66666666666667e-01
+1188 1187 -4.16666666666667e-02
+1188 864 -1.25000000000000e-01
+1188 1110 -7.50000000000000e-01
+1189 1189 1.25000000000000e+00
+1189 1185 8.33333333333333e-02
+1189 1101 -1.66666666666667e-01
+1189 1187 8.33333333333333e-02
+1189 1186 -3.75000000000000e-01
+1189 732 4.16666666666667e-02
+1189 1199 8.33333333333333e-02
+1189 1198 -1.25000000000000e-01
+1189 756 4.16666666666667e-02
+1189 1197 -4.16666666666667e-02
+1189 1098 -8.33333333333333e-02
+1189 1100 -8.33333333333333e-02
+1189 1190 -1.66666666666667e-01
+1189 855 8.33333333333333e-02
+1189 858 -4.16666666666667e-02
+1189 857 8.33333333333333e-02
+1189 1112 -8.33333333333333e-02
+1189 734 -8.33333333333333e-02
+1189 860 8.33333333333333e-02
+1189 859 -1.25000000000000e-01
+1189 866 8.33333333333333e-02
+1189 758 -8.33333333333333e-02
+1189 1103 8.33333333333333e-02
+1189 865 -3.75000000000000e-01
+1189 1111 -2.50000000000000e-01
+1189 1188 -1.66666666666667e-01
+1189 864 8.33333333333333e-02
+1189 1110 1.66666666666667e-01
+1190 1190 1.25000000000000e+00
+1190 1185 -4.16666666666667e-02
+1190 1101 8.33333333333333e-02
+1190 1187 -1.25000000000000e-01
+1190 1186 8.33333333333333e-02
+1190 1199 -3.75000000000000e-01
+1190 1198 8.33333333333333e-02
+1190 1188 -1.66666666666667e-01
+1190 1197 8.33333333333333e-02
+1190 1099 -8.33333333333333e-02
+1190 1189 -1.66666666666667e-01
+1190 858 8.33333333333333e-02
+1190 856 8.33333333333333e-02
+1190 1111 -8.33333333333333e-02
+1190 855 -1.66666666666667e-01
+1190 1110 1.66666666666667e-01
+1190 860 -3.75000000000000e-01
+1190 733 -8.33333333333333e-02
+1190 859 8.33333333333333e-02
+1190 732 4.16666666666667e-02
+1190 1098 -8.33333333333333e-02
+1190 1102 8.33333333333333e-02
+1190 866 -1.25000000000000e-01
+1190 1112 -2.50000000000000e-01
+1190 865 8.33333333333333e-02
+1190 757 -8.33333333333333e-02
+1190 864 -4.16666666666667e-02
+1190 756 4.16666666666667e-02
+1191 1191 1.25000000000000e+00
+1191 1196 8.33333333333333e-02
+1191 1195 -4.16666666666667e-02
+1191 1201 4.16666666666667e-02
+1191 1202 4.16666666666667e-02
+1191 740 -4.16666666666667e-02
+1191 737 -4.16666666666667e-02
+1191 1194 -1.25000000000000e-01
+1191 1136 8.33333333333333e-02
+1191 736 8.33333333333333e-02
+1191 1135 -1.66666666666667e-01
+1191 1139 1.66666666666667e-01
+1191 1192 -1.66666666666667e-01
+1191 739 8.33333333333333e-02
+1191 1138 1.66666666666667e-01
+1191 1137 -7.50000000000000e-01
+1191 827 4.16666666666667e-02
+1191 1073 -8.33333333333333e-02
+1191 826 4.16666666666667e-02
+1191 1072 -8.33333333333333e-02
+1191 735 -1.25000000000000e-01
+1191 830 8.33333333333333e-02
+1191 1076 -1.66666666666667e-01
+1191 829 -4.16666666666667e-02
+1191 1075 8.33333333333333e-02
+1191 828 -1.25000000000000e-01
+1191 1193 -1.66666666666667e-01
+1191 738 -1.25000000000000e-01
+1192 1192 1.25000000000000e+00
+1192 1200 4.16666666666667e-02
+1192 1202 -8.33333333333333e-02
+1192 1196 8.33333333333333e-02
+1192 1195 -1.25000000000000e-01
+1192 1136 8.33333333333333e-02
+1192 735 8.33333333333333e-02
+1192 1134 -1.66666666666667e-01
+1192 1139 -8.33333333333333e-02
+1192 1138 -2.50000000000000e-01
+1192 1191 -1.66666666666667e-01
+1192 738 8.33333333333333e-02
+1192 1137 1.66666666666667e-01
+1192 1076 8.33333333333333e-02
+1192 1073 -8.33333333333333e-02
+1192 827 -8.33333333333333e-02
+1192 737 8.33333333333333e-02
+1192 736 -3.75000000000000e-01
+1192 825 4.16666666666667e-02
+1192 1071 -8.33333333333333e-02
+1192 830 8.33333333333333e-02
+1192 1193 -1.66666666666667e-01
+1192 740 8.33333333333333e-02
+1192 829 -1.25000000000000e-01
+1192 1194 -4.16666666666667e-02
+1192 739 -3.75000000000000e-01
+1192 828 -4.16666666666667e-02
+1192 1074 8.33333333333333e-02
+1193 1193 1.25000000000000e+00
+1193 1194 8.33333333333333e-02
+1193 1201 -8.33333333333333e-02
+1193 1200 4.16666666666667e-02
+1193 738 -4.16666666666667e-02
+1193 1196 -3.75000000000000e-01
+1193 1195 8.33333333333333e-02
+1193 735 -4.16666666666667e-02
+1193 1134 8.33333333333333e-02
+1193 1135 8.33333333333333e-02
+1193 1139 -2.50000000000000e-01
+1193 1138 -8.33333333333333e-02
+1193 1137 1.66666666666667e-01
+1193 1075 8.33333333333333e-02
+1193 1072 -8.33333333333333e-02
+1193 825 4.16666666666667e-02
+1193 1071 -8.33333333333333e-02
+1193 737 -1.25000000000000e-01
+1193 826 -8.33333333333333e-02
+1193 736 8.33333333333333e-02
+1193 830 -3.75000000000000e-01
+1193 1191 -1.66666666666667e-01
+1193 740 -1.25000000000000e-01
+1193 829 8.33333333333333e-02
+1193 1192 -1.66666666666667e-01
+1193 739 8.33333333333333e-02
+1193 828 8.33333333333333e-02
+1193 1074 -1.66666666666667e-01
+1194 1194 1.25000000000000e+00
+1194 1192 -4.16666666666667e-02
+1194 1139 -1.66666666666667e-01
+1194 1138 8.33333333333333e-02
+1194 776 4.16666666666667e-02
+1194 1202 -4.16666666666667e-02
+1194 1201 8.33333333333333e-02
+1194 1195 -1.66666666666667e-01
+1194 1200 -1.25000000000000e-01
+1194 737 4.16666666666667e-02
+1194 1191 -1.25000000000000e-01
+1194 896 -4.16666666666667e-02
+1194 895 8.33333333333333e-02
+1194 1136 -8.33333333333333e-02
+1194 893 8.33333333333333e-02
+1194 1147 1.66666666666667e-01
+1194 892 -1.66666666666667e-01
+1194 736 4.16666666666667e-02
+1194 1135 -8.33333333333333e-02
+1194 894 -1.25000000000000e-01
+1194 1196 -1.66666666666667e-01
+1194 902 8.33333333333333e-02
+1194 1148 1.66666666666667e-01
+1194 901 -4.16666666666667e-02
+1194 775 4.16666666666667e-02
+1194 1193 8.33333333333333e-02
+1194 900 -1.25000000000000e-01
+1194 1146 -7.50000000000000e-01
+1195 1195 1.25000000000000e+00
+1195 1139 8.33333333333333e-02
+1195 1137 8.33333333333333e-02
+1195 1202 8.33333333333333e-02
+1195 1201 -3.75000000000000e-01
+1195 1200 8.33333333333333e-02
+1195 1194 -1.66666666666667e-01
+1195 1193 8.33333333333333e-02
+1195 1192 -1.25000000000000e-01
+1195 1148 -8.33333333333333e-02
+1195 1196 -1.66666666666667e-01
+1195 1136 -8.33333333333333e-02
+1195 893 8.33333333333333e-02
+1195 894 8.33333333333333e-02
+1195 1146 1.66666666666667e-01
+1195 891 -1.66666666666667e-01
+1195 737 -8.33333333333333e-02
+1195 896 8.33333333333333e-02
+1195 895 -3.75000000000000e-01
+1195 735 4.16666666666667e-02
+1195 1134 -8.33333333333333e-02
+1195 902 8.33333333333333e-02
+1195 776 -8.33333333333333e-02
+1195 1191 -4.16666666666667e-02
+1195 901 -1.25000000000000e-01
+1195 1147 -2.50000000000000e-01
+1195 900 -4.16666666666667e-02
+1195 774 4.16666666666667e-02
+1196 1196 1.25000000000000e+00
+1196 1138 8.33333333333333e-02
+1196 1137 -1.66666666666667e-01
+1196 1202 -1.25000000000000e-01
+1196 1201 8.33333333333333e-02
+1196 774 4.16666666666667e-02
+1196 1200 -4.16666666666667e-02
+1196 1193 -3.75000000000000e-01
+1196 1192 8.33333333333333e-02
+1196 735 4.16666666666667e-02
+1196 1147 -8.33333333333333e-02
+1196 1195 -1.66666666666667e-01
+1196 894 -4.16666666666667e-02
+1196 1135 -8.33333333333333e-02
+1196 892 8.33333333333333e-02
+1196 1134 -8.33333333333333e-02
+1196 891 8.33333333333333e-02
+1196 896 -1.25000000000000e-01
+1196 736 -8.33333333333333e-02
+1196 895 8.33333333333333e-02
+1196 1191 8.33333333333333e-02
+1196 902 -3.75000000000000e-01
+1196 1148 -2.50000000000000e-01
+1196 901 8.33333333333333e-02
+1196 775 -8.33333333333333e-02
+1196 1194 -1.66666666666667e-01
+1196 900 8.33333333333333e-02
+1196 1146 1.66666666666667e-01
+1197 1197 1.25000000000000e+00
+1197 1190 8.33333333333333e-02
+1197 1189 -4.16666666666667e-02
+1197 1188 -1.25000000000000e-01
+1197 1186 4.16666666666667e-02
+1197 1111 8.33333333333333e-02
+1197 1102 -8.33333333333333e-02
+1197 1103 -8.33333333333333e-02
+1197 1112 -1.66666666666667e-01
+1197 1175 1.66666666666667e-01
+1197 1199 -1.66666666666667e-01
+1197 935 8.33333333333333e-02
+1197 940 4.16666666666667e-02
+1197 934 -4.16666666666667e-02
+1197 740 -4.16666666666667e-02
+1197 1169 8.33333333333333e-02
+1197 739 8.33333333333333e-02
+1197 1168 -1.66666666666667e-01
+1197 738 -1.25000000000000e-01
+1197 933 -1.25000000000000e-01
+1197 758 -4.16666666666667e-02
+1197 941 4.16666666666667e-02
+1197 1198 -1.66666666666667e-01
+1197 757 8.33333333333333e-02
+1197 1174 1.66666666666667e-01
+1197 1187 4.16666666666667e-02
+1197 756 -1.25000000000000e-01
+1197 1173 -7.50000000000000e-01
+1198 1198 1.25000000000000e+00
+1198 1189 -1.25000000000000e-01
+1198 1188 -4.16666666666667e-02
+1198 1187 -8.33333333333333e-02
+1198 1185 4.16666666666667e-02
+1198 1110 8.33333333333333e-02
+1198 1101 -8.33333333333333e-02
+1198 1112 8.33333333333333e-02
+1198 1103 -8.33333333333333e-02
+1198 1175 -8.33333333333333e-02
+1198 1169 8.33333333333333e-02
+1198 939 4.16666666666667e-02
+1198 933 -4.16666666666667e-02
+1198 740 8.33333333333333e-02
+1198 1199 -1.66666666666667e-01
+1198 935 8.33333333333333e-02
+1198 739 -3.75000000000000e-01
+1198 934 -1.25000000000000e-01
+1198 738 8.33333333333333e-02
+1198 1167 -1.66666666666667e-01
+1198 758 8.33333333333333e-02
+1198 941 -8.33333333333333e-02
+1198 1190 8.33333333333333e-02
+1198 757 -3.75000000000000e-01
+1198 1174 -2.50000000000000e-01
+1198 1197 -1.66666666666667e-01
+1198 756 8.33333333333333e-02
+1198 1173 1.66666666666667e-01
+1199 1199 1.25000000000000e+00
+1199 1190 -3.75000000000000e-01
+1199 1189 8.33333333333333e-02
+1199 1188 8.33333333333333e-02
+1199 1186 -8.33333333333333e-02
+1199 1101 -8.33333333333333e-02
+1199 1111 8.33333333333333e-02
+1199 1110 -1.66666666666667e-01
+1199 1102 -8.33333333333333e-02
+1199 1174 -8.33333333333333e-02
+1199 1168 8.33333333333333e-02
+1199 1173 1.66666666666667e-01
+1199 1197 -1.66666666666667e-01
+1199 933 8.33333333333333e-02
+1199 740 -1.25000000000000e-01
+1199 935 -3.75000000000000e-01
+1199 739 8.33333333333333e-02
+1199 1198 -1.66666666666667e-01
+1199 934 8.33333333333333e-02
+1199 738 -4.16666666666667e-02
+1199 1167 8.33333333333333e-02
+1199 1185 4.16666666666667e-02
+1199 758 -1.25000000000000e-01
+1199 1175 -2.50000000000000e-01
+1199 757 8.33333333333333e-02
+1199 940 -8.33333333333333e-02
+1199 756 -4.16666666666667e-02
+1199 939 4.16666666666667e-02
+1200 1200 1.25000000000000e+00
+1200 1138 -8.33333333333333e-02
+1200 1196 -4.16666666666667e-02
+1200 1148 8.33333333333333e-02
+1200 1195 8.33333333333333e-02
+1200 1147 -1.66666666666667e-01
+1200 1194 -1.25000000000000e-01
+1200 1193 4.16666666666667e-02
+1200 1139 -8.33333333333333e-02
+1200 947 4.16666666666667e-02
+1200 935 -4.16666666666667e-02
+1200 1201 -1.66666666666667e-01
+1200 934 8.33333333333333e-02
+1200 1180 1.66666666666667e-01
+1200 740 8.33333333333333e-02
+1200 1169 -1.66666666666667e-01
+1200 739 -4.16666666666667e-02
+1200 1168 8.33333333333333e-02
+1200 738 -1.25000000000000e-01
+1200 933 -1.25000000000000e-01
+1200 1202 -1.66666666666667e-01
+1200 776 8.33333333333333e-02
+1200 1181 1.66666666666667e-01
+1200 775 -4.16666666666667e-02
+1200 946 4.16666666666667e-02
+1200 1192 4.16666666666667e-02
+1200 774 -1.25000000000000e-01
+1200 1179 -7.50000000000000e-01
+1201 1201 1.25000000000000e+00
+1201 1137 -8.33333333333333e-02
+1201 1148 8.33333333333333e-02
+1201 1139 -8.33333333333333e-02
+1201 1196 8.33333333333333e-02
+1201 1195 -3.75000000000000e-01
+1201 1194 8.33333333333333e-02
+1201 1146 -1.66666666666667e-01
+1201 1193 -8.33333333333333e-02
+1201 1169 8.33333333333333e-02
+1201 1181 -8.33333333333333e-02
+1201 1200 -1.66666666666667e-01
+1201 933 8.33333333333333e-02
+1201 1179 1.66666666666667e-01
+1201 740 8.33333333333333e-02
+1201 1202 -1.66666666666667e-01
+1201 935 8.33333333333333e-02
+1201 739 -1.25000000000000e-01
+1201 934 -3.75000000000000e-01
+1201 738 -4.16666666666667e-02
+1201 1167 8.33333333333333e-02
+1201 776 8.33333333333333e-02
+1201 947 -8.33333333333333e-02
+1201 1191 4.16666666666667e-02
+1201 775 -1.25000000000000e-01
+1201 1180 -2.50000000000000e-01
+1201 774 -4.16666666666667e-02
+1201 945 4.16666666666667e-02
+1202 1202 1.25000000000000e+00
+1202 1138 -8.33333333333333e-02
+1202 1196 -1.25000000000000e-01
+1202 1195 8.33333333333333e-02
+1202 1194 -4.16666666666667e-02
+1202 1146 8.33333333333333e-02
+1202 1192 -8.33333333333333e-02
+1202 1191 4.16666666666667e-02
+1202 1137 -8.33333333333333e-02
+1202 945 4.16666666666667e-02
+1202 933 -4.16666666666667e-02
+1202 1168 8.33333333333333e-02
+1202 1180 -8.33333333333333e-02
+1202 740 -3.75000000000000e-01
+1202 935 -1.25000000000000e-01
+1202 739 8.33333333333333e-02
+1202 1201 -1.66666666666667e-01
+1202 934 8.33333333333333e-02
+1202 738 8.33333333333333e-02
+1202 1167 -1.66666666666667e-01
+1202 1147 8.33333333333333e-02
+1202 776 -3.75000000000000e-01
+1202 1181 -2.50000000000000e-01
+1202 775 8.33333333333333e-02
+1202 946 -8.33333333333333e-02
+1202 1200 -1.66666666666667e-01
+1202 774 8.33333333333333e-02
+1202 1179 1.66666666666667e-01
+1203 1203 1.25000000000000e+00
+1203 995 -8.33333333333333e-02
+1203 1204 -1.66666666666667e-01
+1203 1207 8.33333333333333e-02
+1203 994 1.66666666666667e-01
+1203 1208 8.33333333333333e-02
+1203 742 -4.16666666666667e-02
+1203 991 8.33333333333333e-02
+1203 1206 -3.75000000000000e-01
+1203 1217 -8.33333333333333e-02
+1203 1216 4.16666666666667e-02
+1203 745 -4.16666666666667e-02
+1203 993 -2.50000000000000e-01
+1203 832 4.16666666666667e-02
+1203 976 -8.33333333333333e-02
+1203 977 -8.33333333333333e-02
+1203 980 8.33333333333333e-02
+1203 743 8.33333333333333e-02
+1203 833 -8.33333333333333e-02
+1203 741 -1.25000000000000e-01
+1203 1205 -1.66666666666667e-01
+1203 836 8.33333333333333e-02
+1203 746 8.33333333333333e-02
+1203 835 8.33333333333333e-02
+1203 979 -1.66666666666667e-01
+1203 992 8.33333333333333e-02
+1203 834 -3.75000000000000e-01
+1203 744 -1.25000000000000e-01
+1204 1204 1.25000000000000e+00
+1204 1217 4.16666666666667e-02
+1204 1203 -1.66666666666667e-01
+1204 1206 8.33333333333333e-02
+1204 993 1.66666666666667e-01
+1204 743 8.33333333333333e-02
+1204 992 -1.66666666666667e-01
+1204 1207 -1.25000000000000e-01
+1204 741 -4.16666666666667e-02
+1204 990 8.33333333333333e-02
+1204 1205 -1.66666666666667e-01
+1204 995 1.66666666666667e-01
+1204 746 8.33333333333333e-02
+1204 994 -7.50000000000000e-01
+1204 1215 4.16666666666667e-02
+1204 744 -4.16666666666667e-02
+1204 831 4.16666666666667e-02
+1204 975 -8.33333333333333e-02
+1204 833 4.16666666666667e-02
+1204 977 -8.33333333333333e-02
+1204 742 -1.25000000000000e-01
+1204 836 -4.16666666666667e-02
+1204 980 8.33333333333333e-02
+1204 1208 -4.16666666666667e-02
+1204 835 -1.25000000000000e-01
+1204 745 -1.25000000000000e-01
+1204 834 8.33333333333333e-02
+1204 978 -1.66666666666667e-01
+1205 1205 1.25000000000000e+00
+1205 993 -8.33333333333333e-02
+1205 1207 -4.16666666666667e-02
+1205 1216 4.16666666666667e-02
+1205 1208 -1.25000000000000e-01
+1205 742 8.33333333333333e-02
+1205 991 -1.66666666666667e-01
+1205 1206 8.33333333333333e-02
+1205 995 -2.50000000000000e-01
+1205 1204 -1.66666666666667e-01
+1205 994 1.66666666666667e-01
+1205 745 8.33333333333333e-02
+1205 1215 -8.33333333333333e-02
+1205 975 -8.33333333333333e-02
+1205 978 8.33333333333333e-02
+1205 743 -3.75000000000000e-01
+1205 832 4.16666666666667e-02
+1205 976 -8.33333333333333e-02
+1205 741 8.33333333333333e-02
+1205 831 -8.33333333333333e-02
+1205 990 8.33333333333333e-02
+1205 836 -1.25000000000000e-01
+1205 746 -3.75000000000000e-01
+1205 835 -4.16666666666667e-02
+1205 979 8.33333333333333e-02
+1205 1203 -1.66666666666667e-01
+1205 834 8.33333333333333e-02
+1205 744 8.33333333333333e-02
+1206 1206 1.25000000000000e+00
+1206 1204 8.33333333333333e-02
+1206 994 -1.66666666666667e-01
+1206 1205 8.33333333333333e-02
+1206 742 4.16666666666667e-02
+1206 1203 -3.75000000000000e-01
+1206 1217 8.33333333333333e-02
+1206 751 4.16666666666667e-02
+1206 1216 -4.16666666666667e-02
+1206 1215 -1.25000000000000e-01
+1206 991 -8.33333333333333e-02
+1206 992 -8.33333333333333e-02
+1206 1208 -1.66666666666667e-01
+1206 844 -4.16666666666667e-02
+1206 838 8.33333333333333e-02
+1206 839 8.33333333333333e-02
+1206 998 -8.33333333333333e-02
+1206 845 8.33333333333333e-02
+1206 743 -8.33333333333333e-02
+1206 843 -1.25000000000000e-01
+1206 851 8.33333333333333e-02
+1206 752 -8.33333333333333e-02
+1206 850 8.33333333333333e-02
+1206 1207 -1.66666666666667e-01
+1206 997 1.66666666666667e-01
+1206 849 -3.75000000000000e-01
+1206 995 8.33333333333333e-02
+1206 996 -2.50000000000000e-01
+1207 1207 1.25000000000000e+00
+1207 995 8.33333333333333e-02
+1207 1203 8.33333333333333e-02
+1207 993 -1.66666666666667e-01
+1207 1204 -1.25000000000000e-01
+1207 741 4.16666666666667e-02
+1207 1208 -1.66666666666667e-01
+1207 1217 8.33333333333333e-02
+1207 1216 -1.25000000000000e-01
+1207 750 4.16666666666667e-02
+1207 1215 -4.16666666666667e-02
+1207 990 -8.33333333333333e-02
+1207 845 8.33333333333333e-02
+1207 843 -4.16666666666667e-02
+1207 837 8.33333333333333e-02
+1207 839 -1.66666666666667e-01
+1207 998 1.66666666666667e-01
+1207 743 4.16666666666667e-02
+1207 992 -8.33333333333333e-02
+1207 844 -1.25000000000000e-01
+1207 851 -4.16666666666667e-02
+1207 752 4.16666666666667e-02
+1207 850 -1.25000000000000e-01
+1207 1205 -4.16666666666667e-02
+1207 997 -7.50000000000000e-01
+1207 849 8.33333333333333e-02
+1207 1206 -1.66666666666667e-01
+1207 996 1.66666666666667e-01
+1208 1208 1.25000000000000e+00
+1208 1204 -4.16666666666667e-02
+1208 994 8.33333333333333e-02
+1208 1205 -1.25000000000000e-01
+1208 1203 8.33333333333333e-02
+1208 1217 -3.75000000000000e-01
+1208 1207 -1.66666666666667e-01
+1208 1216 8.33333333333333e-02
+1208 1215 8.33333333333333e-02
+1208 990 -8.33333333333333e-02
+1208 844 8.33333333333333e-02
+1208 1206 -1.66666666666667e-01
+1208 838 -1.66666666666667e-01
+1208 997 1.66666666666667e-01
+1208 837 8.33333333333333e-02
+1208 996 -8.33333333333333e-02
+1208 845 -3.75000000000000e-01
+1208 742 4.16666666666667e-02
+1208 991 -8.33333333333333e-02
+1208 843 8.33333333333333e-02
+1208 741 -8.33333333333333e-02
+1208 851 -1.25000000000000e-01
+1208 993 8.33333333333333e-02
+1208 998 -2.50000000000000e-01
+1208 850 -4.16666666666667e-02
+1208 751 4.16666666666667e-02
+1208 849 8.33333333333333e-02
+1208 750 -8.33333333333333e-02
+1209 1209 1.25000000000000e+00
+1209 1219 4.16666666666667e-02
+1209 1220 -8.33333333333333e-02
+1209 1214 8.33333333333333e-02
+1209 1212 -1.25000000000000e-01
+1209 1034 -8.33333333333333e-02
+1209 745 8.33333333333333e-02
+1209 1210 -1.66666666666667e-01
+1209 1033 1.66666666666667e-01
+1209 1032 -2.50000000000000e-01
+1209 980 8.33333333333333e-02
+1209 1211 -1.66666666666667e-01
+1209 836 8.33333333333333e-02
+1209 746 8.33333333333333e-02
+1209 835 -4.16666666666667e-02
+1209 979 8.33333333333333e-02
+1209 1213 -4.16666666666667e-02
+1209 834 -1.25000000000000e-01
+1209 744 -3.75000000000000e-01
+1209 599 8.33333333333333e-02
+1209 106 8.33333333333333e-02
+1209 598 -1.66666666666667e-01
+1209 590 -8.33333333333333e-02
+1209 107 8.33333333333333e-02
+1209 233 -8.33333333333333e-02
+1209 232 4.16666666666667e-02
+1209 589 -8.33333333333333e-02
+1209 105 -3.75000000000000e-01
+1210 1210 1.25000000000000e+00
+1210 1211 -1.66666666666667e-01
+1210 1212 -4.16666666666667e-02
+1210 1218 4.16666666666667e-02
+1210 746 -4.16666666666667e-02
+1210 1220 4.16666666666667e-02
+1210 1213 -1.25000000000000e-01
+1210 1034 1.66666666666667e-01
+1210 1033 -7.50000000000000e-01
+1210 744 8.33333333333333e-02
+1210 1209 -1.66666666666667e-01
+1210 1032 1.66666666666667e-01
+1210 836 8.33333333333333e-02
+1210 980 -1.66666666666667e-01
+1210 1214 8.33333333333333e-02
+1210 835 -1.25000000000000e-01
+1210 745 -1.25000000000000e-01
+1210 834 -4.16666666666667e-02
+1210 978 8.33333333333333e-02
+1210 107 -4.16666666666667e-02
+1210 599 8.33333333333333e-02
+1210 105 8.33333333333333e-02
+1210 597 -1.66666666666667e-01
+1210 233 4.16666666666667e-02
+1210 590 -8.33333333333333e-02
+1210 106 -1.25000000000000e-01
+1210 231 4.16666666666667e-02
+1210 588 -8.33333333333333e-02
+1211 1211 1.25000000000000e+00
+1211 1210 -1.66666666666667e-01
+1211 745 -4.16666666666667e-02
+1211 1219 4.16666666666667e-02
+1211 1218 -8.33333333333333e-02
+1211 1214 -3.75000000000000e-01
+1211 1212 8.33333333333333e-02
+1211 1034 -2.50000000000000e-01
+1211 1033 1.66666666666667e-01
+1211 1032 -8.33333333333333e-02
+1211 978 8.33333333333333e-02
+1211 1213 8.33333333333333e-02
+1211 836 -3.75000000000000e-01
+1211 746 -1.25000000000000e-01
+1211 835 8.33333333333333e-02
+1211 979 -1.66666666666667e-01
+1211 1209 -1.66666666666667e-01
+1211 834 8.33333333333333e-02
+1211 744 8.33333333333333e-02
+1211 106 -4.16666666666667e-02
+1211 598 8.33333333333333e-02
+1211 597 8.33333333333333e-02
+1211 588 -8.33333333333333e-02
+1211 232 4.16666666666667e-02
+1211 589 -8.33333333333333e-02
+1211 107 -1.25000000000000e-01
+1211 105 8.33333333333333e-02
+1211 231 -8.33333333333333e-02
+1212 1212 1.25000000000000e+00
+1212 1034 8.33333333333333e-02
+1212 1033 8.33333333333333e-02
+1212 1220 8.33333333333333e-02
+1212 1219 8.33333333333333e-02
+1212 1213 -1.66666666666667e-01
+1212 1218 -3.75000000000000e-01
+1212 1211 8.33333333333333e-02
+1212 1209 -1.25000000000000e-01
+1212 1040 -8.33333333333333e-02
+1212 1214 -1.66666666666667e-01
+1212 1039 1.66666666666667e-01
+1212 905 8.33333333333333e-02
+1212 779 -8.33333333333333e-02
+1212 904 -4.16666666666667e-02
+1212 778 4.16666666666667e-02
+1212 903 -1.25000000000000e-01
+1212 1210 -4.16666666666667e-02
+1212 1038 -2.50000000000000e-01
+1212 599 -8.33333333333333e-02
+1212 317 8.33333333333333e-02
+1212 322 8.33333333333333e-02
+1212 316 -1.66666666666667e-01
+1212 323 8.33333333333333e-02
+1212 107 -8.33333333333333e-02
+1212 106 4.16666666666667e-02
+1212 598 -8.33333333333333e-02
+1212 321 -3.75000000000000e-01
+1213 1213 1.25000000000000e+00
+1213 1209 -4.16666666666667e-02
+1213 1034 -1.66666666666667e-01
+1213 1032 8.33333333333333e-02
+1213 1220 -4.16666666666667e-02
+1213 779 4.16666666666667e-02
+1213 1219 -1.25000000000000e-01
+1213 1218 8.33333333333333e-02
+1213 1212 -1.66666666666667e-01
+1213 1210 -1.25000000000000e-01
+1213 1038 1.66666666666667e-01
+1213 905 8.33333333333333e-02
+1213 1214 -1.66666666666667e-01
+1213 1040 1.66666666666667e-01
+1213 904 -1.25000000000000e-01
+1213 1211 8.33333333333333e-02
+1213 1039 -7.50000000000000e-01
+1213 903 -4.16666666666667e-02
+1213 777 4.16666666666667e-02
+1213 107 4.16666666666667e-02
+1213 323 -4.16666666666667e-02
+1213 321 8.33333333333333e-02
+1213 599 -8.33333333333333e-02
+1213 317 8.33333333333333e-02
+1213 315 -1.66666666666667e-01
+1213 322 -1.25000000000000e-01
+1213 105 4.16666666666667e-02
+1213 597 -8.33333333333333e-02
+1214 1214 1.25000000000000e+00
+1214 1032 8.33333333333333e-02
+1214 1033 -1.66666666666667e-01
+1214 1220 -1.25000000000000e-01
+1214 1219 -4.16666666666667e-02
+1214 778 4.16666666666667e-02
+1214 1218 8.33333333333333e-02
+1214 1211 -3.75000000000000e-01
+1214 1209 8.33333333333333e-02
+1214 1038 -8.33333333333333e-02
+1214 1212 -1.66666666666667e-01
+1214 905 -3.75000000000000e-01
+1214 1210 8.33333333333333e-02
+1214 1040 -2.50000000000000e-01
+1214 904 8.33333333333333e-02
+1214 1213 -1.66666666666667e-01
+1214 1039 1.66666666666667e-01
+1214 903 8.33333333333333e-02
+1214 777 -8.33333333333333e-02
+1214 106 4.16666666666667e-02
+1214 322 -4.16666666666667e-02
+1214 597 -8.33333333333333e-02
+1214 315 8.33333333333333e-02
+1214 598 -8.33333333333333e-02
+1214 316 8.33333333333333e-02
+1214 323 -1.25000000000000e-01
+1214 321 8.33333333333333e-02
+1214 105 -8.33333333333333e-02
+1215 1215 1.25000000000000e+00
+1215 1207 -4.16666666666667e-02
+1215 1206 -1.25000000000000e-01
+1215 1205 -8.33333333333333e-02
+1215 1204 4.16666666666667e-02
+1215 997 8.33333333333333e-02
+1215 994 -8.33333333333333e-02
+1215 998 8.33333333333333e-02
+1215 995 -8.33333333333333e-02
+1215 1046 8.33333333333333e-02
+1215 1049 -8.33333333333333e-02
+1215 916 4.16666666666667e-02
+1215 913 -4.16666666666667e-02
+1215 752 8.33333333333333e-02
+1215 917 -8.33333333333333e-02
+1215 751 8.33333333333333e-02
+1215 1216 -1.66666666666667e-01
+1215 1048 1.66666666666667e-01
+1215 750 -3.75000000000000e-01
+1215 1047 -2.50000000000000e-01
+1215 1217 -1.66666666666667e-01
+1215 746 8.33333333333333e-02
+1215 914 8.33333333333333e-02
+1215 745 8.33333333333333e-02
+1215 1045 -1.66666666666667e-01
+1215 1208 8.33333333333333e-02
+1215 744 -3.75000000000000e-01
+1215 912 -1.25000000000000e-01
+1216 1216 1.25000000000000e+00
+1216 1208 8.33333333333333e-02
+1216 1207 -1.25000000000000e-01
+1216 1206 -4.16666666666667e-02
+1216 1203 4.16666666666667e-02
+1216 996 8.33333333333333e-02
+1216 993 -8.33333333333333e-02
+1216 995 -8.33333333333333e-02
+1216 998 -1.66666666666667e-01
+1216 1217 -1.66666666666667e-01
+1216 1049 1.66666666666667e-01
+1216 914 8.33333333333333e-02
+1216 915 4.16666666666667e-02
+1216 912 -4.16666666666667e-02
+1216 752 -4.16666666666667e-02
+1216 917 4.16666666666667e-02
+1216 751 -1.25000000000000e-01
+1216 1048 -7.50000000000000e-01
+1216 750 8.33333333333333e-02
+1216 1215 -1.66666666666667e-01
+1216 1047 1.66666666666667e-01
+1216 746 -4.16666666666667e-02
+1216 1046 8.33333333333333e-02
+1216 1205 4.16666666666667e-02
+1216 745 -1.25000000000000e-01
+1216 913 -1.25000000000000e-01
+1216 744 8.33333333333333e-02
+1216 1044 -1.66666666666667e-01
+1217 1217 1.25000000000000e+00
+1217 1208 -3.75000000000000e-01
+1217 1207 8.33333333333333e-02
+1217 1206 8.33333333333333e-02
+1217 1203 -8.33333333333333e-02
+1217 994 -8.33333333333333e-02
+1217 997 -1.66666666666667e-01
+1217 996 8.33333333333333e-02
+1217 993 -8.33333333333333e-02
+1217 1044 8.33333333333333e-02
+1217 1047 -8.33333333333333e-02
+1217 1216 -1.66666666666667e-01
+1217 1048 1.66666666666667e-01
+1217 913 8.33333333333333e-02
+1217 752 -1.25000000000000e-01
+1217 1049 -2.50000000000000e-01
+1217 751 -4.16666666666667e-02
+1217 916 4.16666666666667e-02
+1217 750 8.33333333333333e-02
+1217 915 -8.33333333333333e-02
+1217 1204 4.16666666666667e-02
+1217 746 -1.25000000000000e-01
+1217 914 -3.75000000000000e-01
+1217 745 -4.16666666666667e-02
+1217 1045 8.33333333333333e-02
+1217 1215 -1.66666666666667e-01
+1217 744 8.33333333333333e-02
+1217 912 8.33333333333333e-02
+1218 1218 1.25000000000000e+00
+1218 1033 -8.33333333333333e-02
+1218 1040 8.33333333333333e-02
+1218 1034 -8.33333333333333e-02
+1218 1211 -8.33333333333333e-02
+1218 1214 8.33333333333333e-02
+1218 1213 8.33333333333333e-02
+1218 1039 -1.66666666666667e-01
+1218 1212 -3.75000000000000e-01
+1218 1046 8.33333333333333e-02
+1218 1058 -8.33333333333333e-02
+1218 913 8.33333333333333e-02
+1218 1219 -1.66666666666667e-01
+1218 1057 1.66666666666667e-01
+1218 779 8.33333333333333e-02
+1218 926 -8.33333333333333e-02
+1218 778 -4.16666666666667e-02
+1218 925 4.16666666666667e-02
+1218 777 -1.25000000000000e-01
+1218 1056 -2.50000000000000e-01
+1218 1220 -1.66666666666667e-01
+1218 746 8.33333333333333e-02
+1218 914 8.33333333333333e-02
+1218 745 -4.16666666666667e-02
+1218 1045 8.33333333333333e-02
+1218 1210 4.16666666666667e-02
+1218 744 -1.25000000000000e-01
+1218 912 -3.75000000000000e-01
+1219 1219 1.25000000000000e+00
+1219 1032 -8.33333333333333e-02
+1219 1211 4.16666666666667e-02
+1219 1034 -8.33333333333333e-02
+1219 1214 -4.16666666666667e-02
+1219 1040 8.33333333333333e-02
+1219 1213 -1.25000000000000e-01
+1219 1212 8.33333333333333e-02
+1219 1038 -1.66666666666667e-01
+1219 914 -4.16666666666667e-02
+1219 926 4.16666666666667e-02
+1219 912 8.33333333333333e-02
+1219 1218 -1.66666666666667e-01
+1219 1056 1.66666666666667e-01
+1219 779 8.33333333333333e-02
+1219 1220 -1.66666666666667e-01
+1219 1058 1.66666666666667e-01
+1219 778 -1.25000000000000e-01
+1219 1057 -7.50000000000000e-01
+1219 777 -4.16666666666667e-02
+1219 924 4.16666666666667e-02
+1219 746 8.33333333333333e-02
+1219 1046 -1.66666666666667e-01
+1219 1209 4.16666666666667e-02
+1219 745 -1.25000000000000e-01
+1219 913 -1.25000000000000e-01
+1219 744 -4.16666666666667e-02
+1219 1044 8.33333333333333e-02
+1220 1220 1.25000000000000e+00
+1220 1032 -8.33333333333333e-02
+1220 1210 4.16666666666667e-02
+1220 1033 -8.33333333333333e-02
+1220 1209 -8.33333333333333e-02
+1220 1214 -1.25000000000000e-01
+1220 1213 -4.16666666666667e-02
+1220 1039 8.33333333333333e-02
+1220 1212 8.33333333333333e-02
+1220 913 -4.16666666666667e-02
+1220 925 4.16666666666667e-02
+1220 1044 8.33333333333333e-02
+1220 1056 -8.33333333333333e-02
+1220 779 -3.75000000000000e-01
+1220 1058 -2.50000000000000e-01
+1220 778 8.33333333333333e-02
+1220 1219 -1.66666666666667e-01
+1220 1057 1.66666666666667e-01
+1220 777 8.33333333333333e-02
+1220 924 -8.33333333333333e-02
+1220 1038 8.33333333333333e-02
+1220 746 -3.75000000000000e-01
+1220 914 -1.25000000000000e-01
+1220 745 8.33333333333333e-02
+1220 1045 -1.66666666666667e-01
+1220 1218 -1.66666666666667e-01
+1220 744 8.33333333333333e-02
+1220 912 8.33333333333333e-02
+1221 1221 1.25000000000000e+00
+1221 1109 -8.33333333333333e-02
+1221 1222 -1.66666666666667e-01
+1221 1225 8.33333333333333e-02
+1221 1108 1.66666666666667e-01
+1221 1226 8.33333333333333e-02
+1221 748 -4.16666666666667e-02
+1221 1105 8.33333333333333e-02
+1221 1224 -3.75000000000000e-01
+1221 1235 -8.33333333333333e-02
+1221 1234 4.16666666666667e-02
+1221 754 -4.16666666666667e-02
+1221 1107 -2.50000000000000e-01
+1221 847 4.16666666666667e-02
+1221 1087 -8.33333333333333e-02
+1221 1088 -8.33333333333333e-02
+1221 1094 8.33333333333333e-02
+1221 749 8.33333333333333e-02
+1221 848 -8.33333333333333e-02
+1221 747 -1.25000000000000e-01
+1221 1223 -1.66666666666667e-01
+1221 854 8.33333333333333e-02
+1221 755 8.33333333333333e-02
+1221 853 8.33333333333333e-02
+1221 1093 -1.66666666666667e-01
+1221 1106 8.33333333333333e-02
+1221 852 -3.75000000000000e-01
+1221 753 -1.25000000000000e-01
+1222 1222 1.25000000000000e+00
+1222 1235 4.16666666666667e-02
+1222 1221 -1.66666666666667e-01
+1222 1224 8.33333333333333e-02
+1222 1107 1.66666666666667e-01
+1222 749 8.33333333333333e-02
+1222 1106 -1.66666666666667e-01
+1222 1225 -1.25000000000000e-01
+1222 747 -4.16666666666667e-02
+1222 1104 8.33333333333333e-02
+1222 1223 -1.66666666666667e-01
+1222 1109 1.66666666666667e-01
+1222 755 8.33333333333333e-02
+1222 1108 -7.50000000000000e-01
+1222 1233 4.16666666666667e-02
+1222 753 -4.16666666666667e-02
+1222 846 4.16666666666667e-02
+1222 1086 -8.33333333333333e-02
+1222 848 4.16666666666667e-02
+1222 1088 -8.33333333333333e-02
+1222 748 -1.25000000000000e-01
+1222 854 -4.16666666666667e-02
+1222 1094 8.33333333333333e-02
+1222 1226 -4.16666666666667e-02
+1222 853 -1.25000000000000e-01
+1222 754 -1.25000000000000e-01
+1222 852 8.33333333333333e-02
+1222 1092 -1.66666666666667e-01
+1223 1223 1.25000000000000e+00
+1223 1107 -8.33333333333333e-02
+1223 1225 -4.16666666666667e-02
+1223 1234 4.16666666666667e-02
+1223 1226 -1.25000000000000e-01
+1223 748 8.33333333333333e-02
+1223 1105 -1.66666666666667e-01
+1223 1224 8.33333333333333e-02
+1223 1109 -2.50000000000000e-01
+1223 1222 -1.66666666666667e-01
+1223 1108 1.66666666666667e-01
+1223 754 8.33333333333333e-02
+1223 1233 -8.33333333333333e-02
+1223 1086 -8.33333333333333e-02
+1223 1092 8.33333333333333e-02
+1223 749 -3.75000000000000e-01
+1223 847 4.16666666666667e-02
+1223 1087 -8.33333333333333e-02
+1223 747 8.33333333333333e-02
+1223 846 -8.33333333333333e-02
+1223 1104 8.33333333333333e-02
+1223 854 -1.25000000000000e-01
+1223 755 -3.75000000000000e-01
+1223 853 -4.16666666666667e-02
+1223 1093 8.33333333333333e-02
+1223 1221 -1.66666666666667e-01
+1223 852 8.33333333333333e-02
+1223 753 8.33333333333333e-02
+1224 1224 1.25000000000000e+00
+1224 1222 8.33333333333333e-02
+1224 1108 -1.66666666666667e-01
+1224 1223 8.33333333333333e-02
+1224 748 4.16666666666667e-02
+1224 1221 -3.75000000000000e-01
+1224 1235 8.33333333333333e-02
+1224 757 4.16666666666667e-02
+1224 1234 -4.16666666666667e-02
+1224 1233 -1.25000000000000e-01
+1224 1105 -8.33333333333333e-02
+1224 1106 -8.33333333333333e-02
+1224 1226 -1.66666666666667e-01
+1224 862 -4.16666666666667e-02
+1224 856 8.33333333333333e-02
+1224 857 8.33333333333333e-02
+1224 1112 -8.33333333333333e-02
+1224 863 8.33333333333333e-02
+1224 749 -8.33333333333333e-02
+1224 861 -1.25000000000000e-01
+1224 866 8.33333333333333e-02
+1224 758 -8.33333333333333e-02
+1224 865 8.33333333333333e-02
+1224 1225 -1.66666666666667e-01
+1224 1111 1.66666666666667e-01
+1224 864 -3.75000000000000e-01
+1224 1109 8.33333333333333e-02
+1224 1110 -2.50000000000000e-01
+1225 1225 1.25000000000000e+00
+1225 1109 8.33333333333333e-02
+1225 1221 8.33333333333333e-02
+1225 1107 -1.66666666666667e-01
+1225 1222 -1.25000000000000e-01
+1225 747 4.16666666666667e-02
+1225 1226 -1.66666666666667e-01
+1225 1235 8.33333333333333e-02
+1225 1234 -1.25000000000000e-01
+1225 756 4.16666666666667e-02
+1225 1233 -4.16666666666667e-02
+1225 1104 -8.33333333333333e-02
+1225 863 8.33333333333333e-02
+1225 861 -4.16666666666667e-02
+1225 855 8.33333333333333e-02
+1225 857 -1.66666666666667e-01
+1225 1112 1.66666666666667e-01
+1225 749 4.16666666666667e-02
+1225 1106 -8.33333333333333e-02
+1225 862 -1.25000000000000e-01
+1225 866 -4.16666666666667e-02
+1225 758 4.16666666666667e-02
+1225 865 -1.25000000000000e-01
+1225 1223 -4.16666666666667e-02
+1225 1111 -7.50000000000000e-01
+1225 864 8.33333333333333e-02
+1225 1224 -1.66666666666667e-01
+1225 1110 1.66666666666667e-01
+1226 1226 1.25000000000000e+00
+1226 1222 -4.16666666666667e-02
+1226 1108 8.33333333333333e-02
+1226 1223 -1.25000000000000e-01
+1226 1221 8.33333333333333e-02
+1226 1235 -3.75000000000000e-01
+1226 1225 -1.66666666666667e-01
+1226 1234 8.33333333333333e-02
+1226 1233 8.33333333333333e-02
+1226 1104 -8.33333333333333e-02
+1226 862 8.33333333333333e-02
+1226 1224 -1.66666666666667e-01
+1226 856 -1.66666666666667e-01
+1226 1111 1.66666666666667e-01
+1226 855 8.33333333333333e-02
+1226 1110 -8.33333333333333e-02
+1226 863 -3.75000000000000e-01
+1226 748 4.16666666666667e-02
+1226 1105 -8.33333333333333e-02
+1226 861 8.33333333333333e-02
+1226 747 -8.33333333333333e-02
+1226 866 -1.25000000000000e-01
+1226 1107 8.33333333333333e-02
+1226 1112 -2.50000000000000e-01
+1226 865 -4.16666666666667e-02
+1226 757 4.16666666666667e-02
+1226 864 8.33333333333333e-02
+1226 756 -8.33333333333333e-02
+1227 1227 1.25000000000000e+00
+1227 1237 4.16666666666667e-02
+1227 1238 -8.33333333333333e-02
+1227 1232 8.33333333333333e-02
+1227 1230 -1.25000000000000e-01
+1227 1157 -8.33333333333333e-02
+1227 754 8.33333333333333e-02
+1227 1228 -1.66666666666667e-01
+1227 1156 1.66666666666667e-01
+1227 1155 -2.50000000000000e-01
+1227 1154 8.33333333333333e-02
+1227 751 8.33333333333333e-02
+1227 1153 -1.66666666666667e-01
+1227 1094 8.33333333333333e-02
+1227 1091 -8.33333333333333e-02
+1227 752 8.33333333333333e-02
+1227 851 -8.33333333333333e-02
+1227 850 4.16666666666667e-02
+1227 1090 -8.33333333333333e-02
+1227 750 -3.75000000000000e-01
+1227 1229 -1.66666666666667e-01
+1227 854 8.33333333333333e-02
+1227 755 8.33333333333333e-02
+1227 853 -4.16666666666667e-02
+1227 1093 8.33333333333333e-02
+1227 1231 -4.16666666666667e-02
+1227 852 -1.25000000000000e-01
+1227 753 -3.75000000000000e-01
+1228 1228 1.25000000000000e+00
+1228 1229 -1.66666666666667e-01
+1228 1230 -4.16666666666667e-02
+1228 1236 4.16666666666667e-02
+1228 755 -4.16666666666667e-02
+1228 1238 4.16666666666667e-02
+1228 752 -4.16666666666667e-02
+1228 1231 -1.25000000000000e-01
+1228 1154 8.33333333333333e-02
+1228 1157 1.66666666666667e-01
+1228 1156 -7.50000000000000e-01
+1228 753 8.33333333333333e-02
+1228 1227 -1.66666666666667e-01
+1228 1155 1.66666666666667e-01
+1228 750 8.33333333333333e-02
+1228 1152 -1.66666666666667e-01
+1228 851 4.16666666666667e-02
+1228 1091 -8.33333333333333e-02
+1228 751 -1.25000000000000e-01
+1228 849 4.16666666666667e-02
+1228 1089 -8.33333333333333e-02
+1228 854 8.33333333333333e-02
+1228 1094 -1.66666666666667e-01
+1228 1232 8.33333333333333e-02
+1228 853 -1.25000000000000e-01
+1228 754 -1.25000000000000e-01
+1228 852 -4.16666666666667e-02
+1228 1092 8.33333333333333e-02
+1229 1229 1.25000000000000e+00
+1229 1228 -1.66666666666667e-01
+1229 754 -4.16666666666667e-02
+1229 1237 4.16666666666667e-02
+1229 1236 -8.33333333333333e-02
+1229 1232 -3.75000000000000e-01
+1229 751 -4.16666666666667e-02
+1229 1230 8.33333333333333e-02
+1229 1153 8.33333333333333e-02
+1229 1157 -2.50000000000000e-01
+1229 1156 1.66666666666667e-01
+1229 1155 -8.33333333333333e-02
+1229 1152 8.33333333333333e-02
+1229 1092 8.33333333333333e-02
+1229 1089 -8.33333333333333e-02
+1229 850 4.16666666666667e-02
+1229 1090 -8.33333333333333e-02
+1229 752 -1.25000000000000e-01
+1229 750 8.33333333333333e-02
+1229 849 -8.33333333333333e-02
+1229 1231 8.33333333333333e-02
+1229 854 -3.75000000000000e-01
+1229 755 -1.25000000000000e-01
+1229 853 8.33333333333333e-02
+1229 1093 -1.66666666666667e-01
+1229 1227 -1.66666666666667e-01
+1229 852 8.33333333333333e-02
+1229 753 8.33333333333333e-02
+1230 1230 1.25000000000000e+00
+1230 1157 8.33333333333333e-02
+1230 1156 8.33333333333333e-02
+1230 1238 8.33333333333333e-02
+1230 1237 8.33333333333333e-02
+1230 1231 -1.66666666666667e-01
+1230 1236 -3.75000000000000e-01
+1230 1229 8.33333333333333e-02
+1230 1227 -1.25000000000000e-01
+1230 1166 -8.33333333333333e-02
+1230 1232 -1.66666666666667e-01
+1230 1154 -8.33333333333333e-02
+1230 911 8.33333333333333e-02
+1230 916 8.33333333333333e-02
+1230 1165 1.66666666666667e-01
+1230 910 -1.66666666666667e-01
+1230 917 8.33333333333333e-02
+1230 752 -8.33333333333333e-02
+1230 751 4.16666666666667e-02
+1230 1153 -8.33333333333333e-02
+1230 915 -3.75000000000000e-01
+1230 929 8.33333333333333e-02
+1230 782 -8.33333333333333e-02
+1230 928 -4.16666666666667e-02
+1230 781 4.16666666666667e-02
+1230 927 -1.25000000000000e-01
+1230 1228 -4.16666666666667e-02
+1230 1164 -2.50000000000000e-01
+1231 1231 1.25000000000000e+00
+1231 1227 -4.16666666666667e-02
+1231 1157 -1.66666666666667e-01
+1231 1155 8.33333333333333e-02
+1231 1238 -4.16666666666667e-02
+1231 782 4.16666666666667e-02
+1231 1237 -1.25000000000000e-01
+1231 1236 8.33333333333333e-02
+1231 1230 -1.66666666666667e-01
+1231 752 4.16666666666667e-02
+1231 1228 -1.25000000000000e-01
+1231 917 -4.16666666666667e-02
+1231 915 8.33333333333333e-02
+1231 1154 -8.33333333333333e-02
+1231 911 8.33333333333333e-02
+1231 1164 1.66666666666667e-01
+1231 909 -1.66666666666667e-01
+1231 916 -1.25000000000000e-01
+1231 750 4.16666666666667e-02
+1231 1152 -8.33333333333333e-02
+1231 929 8.33333333333333e-02
+1231 1232 -1.66666666666667e-01
+1231 1166 1.66666666666667e-01
+1231 928 -1.25000000000000e-01
+1231 1229 8.33333333333333e-02
+1231 1165 -7.50000000000000e-01
+1231 927 -4.16666666666667e-02
+1231 780 4.16666666666667e-02
+1232 1232 1.25000000000000e+00
+1232 1155 8.33333333333333e-02
+1232 1156 -1.66666666666667e-01
+1232 1238 -1.25000000000000e-01
+1232 1237 -4.16666666666667e-02
+1232 781 4.16666666666667e-02
+1232 1236 8.33333333333333e-02
+1232 1229 -3.75000000000000e-01
+1232 751 4.16666666666667e-02
+1232 1227 8.33333333333333e-02
+1232 1164 -8.33333333333333e-02
+1232 916 -4.16666666666667e-02
+1232 1230 -1.66666666666667e-01
+1232 1152 -8.33333333333333e-02
+1232 909 8.33333333333333e-02
+1232 1153 -8.33333333333333e-02
+1232 910 8.33333333333333e-02
+1232 917 -1.25000000000000e-01
+1232 915 8.33333333333333e-02
+1232 750 -8.33333333333333e-02
+1232 929 -3.75000000000000e-01
+1232 1228 8.33333333333333e-02
+1232 1166 -2.50000000000000e-01
+1232 928 8.33333333333333e-02
+1232 1231 -1.66666666666667e-01
+1232 1165 1.66666666666667e-01
+1232 927 8.33333333333333e-02
+1232 780 -8.33333333333333e-02
+1233 1233 1.25000000000000e+00
+1233 1225 -4.16666666666667e-02
+1233 1224 -1.25000000000000e-01
+1233 1223 -8.33333333333333e-02
+1233 1222 4.16666666666667e-02
+1233 1111 8.33333333333333e-02
+1233 1108 -8.33333333333333e-02
+1233 1112 8.33333333333333e-02
+1233 1109 -8.33333333333333e-02
+1233 1172 8.33333333333333e-02
+1233 1175 -8.33333333333333e-02
+1233 940 4.16666666666667e-02
+1233 937 -4.16666666666667e-02
+1233 758 8.33333333333333e-02
+1233 941 -8.33333333333333e-02
+1233 757 8.33333333333333e-02
+1233 1234 -1.66666666666667e-01
+1233 1174 1.66666666666667e-01
+1233 756 -3.75000000000000e-01
+1233 1173 -2.50000000000000e-01
+1233 1235 -1.66666666666667e-01
+1233 755 8.33333333333333e-02
+1233 938 8.33333333333333e-02
+1233 754 8.33333333333333e-02
+1233 1171 -1.66666666666667e-01
+1233 1226 8.33333333333333e-02
+1233 753 -3.75000000000000e-01
+1233 936 -1.25000000000000e-01
+1234 1234 1.25000000000000e+00
+1234 1226 8.33333333333333e-02
+1234 1225 -1.25000000000000e-01
+1234 1224 -4.16666666666667e-02
+1234 1221 4.16666666666667e-02
+1234 1110 8.33333333333333e-02
+1234 1107 -8.33333333333333e-02
+1234 1109 -8.33333333333333e-02
+1234 1112 -1.66666666666667e-01
+1234 1235 -1.66666666666667e-01
+1234 1175 1.66666666666667e-01
+1234 938 8.33333333333333e-02
+1234 939 4.16666666666667e-02
+1234 936 -4.16666666666667e-02
+1234 758 -4.16666666666667e-02
+1234 941 4.16666666666667e-02
+1234 757 -1.25000000000000e-01
+1234 1174 -7.50000000000000e-01
+1234 756 8.33333333333333e-02
+1234 1233 -1.66666666666667e-01
+1234 1173 1.66666666666667e-01
+1234 755 -4.16666666666667e-02
+1234 1172 8.33333333333333e-02
+1234 1223 4.16666666666667e-02
+1234 754 -1.25000000000000e-01
+1234 937 -1.25000000000000e-01
+1234 753 8.33333333333333e-02
+1234 1170 -1.66666666666667e-01
+1235 1235 1.25000000000000e+00
+1235 1226 -3.75000000000000e-01
+1235 1225 8.33333333333333e-02
+1235 1224 8.33333333333333e-02
+1235 1221 -8.33333333333333e-02
+1235 1108 -8.33333333333333e-02
+1235 1111 -1.66666666666667e-01
+1235 1110 8.33333333333333e-02
+1235 1107 -8.33333333333333e-02
+1235 1170 8.33333333333333e-02
+1235 1173 -8.33333333333333e-02
+1235 1234 -1.66666666666667e-01
+1235 1174 1.66666666666667e-01
+1235 937 8.33333333333333e-02
+1235 758 -1.25000000000000e-01
+1235 1175 -2.50000000000000e-01
+1235 757 -4.16666666666667e-02
+1235 940 4.16666666666667e-02
+1235 756 8.33333333333333e-02
+1235 939 -8.33333333333333e-02
+1235 1222 4.16666666666667e-02
+1235 755 -1.25000000000000e-01
+1235 938 -3.75000000000000e-01
+1235 754 -4.16666666666667e-02
+1235 1171 8.33333333333333e-02
+1235 1233 -1.66666666666667e-01
+1235 753 8.33333333333333e-02
+1235 936 8.33333333333333e-02
+1236 1236 1.25000000000000e+00
+1236 1156 -8.33333333333333e-02
+1236 1166 8.33333333333333e-02
+1236 1157 -8.33333333333333e-02
+1236 1229 -8.33333333333333e-02
+1236 1232 8.33333333333333e-02
+1236 1231 8.33333333333333e-02
+1236 1165 -1.66666666666667e-01
+1236 1230 -3.75000000000000e-01
+1236 1172 8.33333333333333e-02
+1236 1184 -8.33333333333333e-02
+1236 937 8.33333333333333e-02
+1236 1237 -1.66666666666667e-01
+1236 1183 1.66666666666667e-01
+1236 782 8.33333333333333e-02
+1236 950 -8.33333333333333e-02
+1236 781 -4.16666666666667e-02
+1236 949 4.16666666666667e-02
+1236 780 -1.25000000000000e-01
+1236 1182 -2.50000000000000e-01
+1236 1238 -1.66666666666667e-01
+1236 755 8.33333333333333e-02
+1236 938 8.33333333333333e-02
+1236 754 -4.16666666666667e-02
+1236 1171 8.33333333333333e-02
+1236 1228 4.16666666666667e-02
+1236 753 -1.25000000000000e-01
+1236 936 -3.75000000000000e-01
+1237 1237 1.25000000000000e+00
+1237 1155 -8.33333333333333e-02
+1237 1229 4.16666666666667e-02
+1237 1157 -8.33333333333333e-02
+1237 1232 -4.16666666666667e-02
+1237 1166 8.33333333333333e-02
+1237 1231 -1.25000000000000e-01
+1237 1230 8.33333333333333e-02
+1237 1164 -1.66666666666667e-01
+1237 938 -4.16666666666667e-02
+1237 950 4.16666666666667e-02
+1237 936 8.33333333333333e-02
+1237 1236 -1.66666666666667e-01
+1237 1182 1.66666666666667e-01
+1237 782 8.33333333333333e-02
+1237 1238 -1.66666666666667e-01
+1237 1184 1.66666666666667e-01
+1237 781 -1.25000000000000e-01
+1237 1183 -7.50000000000000e-01
+1237 780 -4.16666666666667e-02
+1237 948 4.16666666666667e-02
+1237 755 8.33333333333333e-02
+1237 1172 -1.66666666666667e-01
+1237 1227 4.16666666666667e-02
+1237 754 -1.25000000000000e-01
+1237 937 -1.25000000000000e-01
+1237 753 -4.16666666666667e-02
+1237 1170 8.33333333333333e-02
+1238 1238 1.25000000000000e+00
+1238 1155 -8.33333333333333e-02
+1238 1228 4.16666666666667e-02
+1238 1156 -8.33333333333333e-02
+1238 1227 -8.33333333333333e-02
+1238 1232 -1.25000000000000e-01
+1238 1231 -4.16666666666667e-02
+1238 1165 8.33333333333333e-02
+1238 1230 8.33333333333333e-02
+1238 937 -4.16666666666667e-02
+1238 949 4.16666666666667e-02
+1238 1170 8.33333333333333e-02
+1238 1182 -8.33333333333333e-02
+1238 782 -3.75000000000000e-01
+1238 1184 -2.50000000000000e-01
+1238 781 8.33333333333333e-02
+1238 1237 -1.66666666666667e-01
+1238 1183 1.66666666666667e-01
+1238 780 8.33333333333333e-02
+1238 948 -8.33333333333333e-02
+1238 1164 8.33333333333333e-02
+1238 755 -3.75000000000000e-01
+1238 938 -1.25000000000000e-01
+1238 754 8.33333333333333e-02
+1238 1171 -1.66666666666667e-01
+1238 1236 -1.66666666666667e-01
+1238 753 8.33333333333333e-02
+1238 936 8.33333333333333e-02
+1239 1239 1.25000000000000e+00
+1239 1024 -8.33333333333333e-02
+1239 1244 8.33333333333333e-02
+1239 1241 -1.66666666666667e-01
+1239 1025 1.66666666666667e-01
+1239 1022 8.33333333333333e-02
+1239 761 -4.16666666666667e-02
+1239 1243 8.33333333333333e-02
+1239 1242 -3.75000000000000e-01
+1239 1253 4.16666666666667e-02
+1239 764 -4.16666666666667e-02
+1239 1252 -8.33333333333333e-02
+1239 1023 -2.50000000000000e-01
+1239 1007 -8.33333333333333e-02
+1239 869 4.16666666666667e-02
+1239 1006 -8.33333333333333e-02
+1239 1009 8.33333333333333e-02
+1239 868 -8.33333333333333e-02
+1239 760 8.33333333333333e-02
+1239 759 -1.25000000000000e-01
+1239 872 8.33333333333333e-02
+1239 1010 -1.66666666666667e-01
+1239 871 8.33333333333333e-02
+1239 1240 -1.66666666666667e-01
+1239 763 8.33333333333333e-02
+1239 870 -3.75000000000000e-01
+1239 1021 8.33333333333333e-02
+1239 762 -1.25000000000000e-01
+1240 1240 1.25000000000000e+00
+1240 1023 -8.33333333333333e-02
+1240 1244 -4.16666666666667e-02
+1240 1253 4.16666666666667e-02
+1240 1022 -1.66666666666667e-01
+1240 761 8.33333333333333e-02
+1240 1243 -1.25000000000000e-01
+1240 1242 8.33333333333333e-02
+1240 1025 1.66666666666667e-01
+1240 1241 -1.66666666666667e-01
+1240 764 8.33333333333333e-02
+1240 1024 -2.50000000000000e-01
+1240 1251 -8.33333333333333e-02
+1240 1005 -8.33333333333333e-02
+1240 1008 8.33333333333333e-02
+1240 869 4.16666666666667e-02
+1240 1007 -8.33333333333333e-02
+1240 760 -3.75000000000000e-01
+1240 867 -8.33333333333333e-02
+1240 759 8.33333333333333e-02
+1240 872 -4.16666666666667e-02
+1240 1010 8.33333333333333e-02
+1240 871 -1.25000000000000e-01
+1240 1020 8.33333333333333e-02
+1240 763 -3.75000000000000e-01
+1240 870 8.33333333333333e-02
+1240 1239 -1.66666666666667e-01
+1240 762 8.33333333333333e-02
+1241 1241 1.25000000000000e+00
+1241 1252 4.16666666666667e-02
+1241 1242 8.33333333333333e-02
+1241 1239 -1.66666666666667e-01
+1241 1023 1.66666666666667e-01
+1241 1244 -1.25000000000000e-01
+1241 1021 -1.66666666666667e-01
+1241 760 8.33333333333333e-02
+1241 1020 8.33333333333333e-02
+1241 759 -4.16666666666667e-02
+1241 1025 -7.50000000000000e-01
+1241 1024 1.66666666666667e-01
+1241 1240 -1.66666666666667e-01
+1241 763 8.33333333333333e-02
+1241 1251 4.16666666666667e-02
+1241 762 -4.16666666666667e-02
+1241 1005 -8.33333333333333e-02
+1241 867 4.16666666666667e-02
+1241 761 -1.25000000000000e-01
+1241 868 4.16666666666667e-02
+1241 1006 -8.33333333333333e-02
+1241 872 -1.25000000000000e-01
+1241 1243 -4.16666666666667e-02
+1241 764 -1.25000000000000e-01
+1241 871 -4.16666666666667e-02
+1241 1009 8.33333333333333e-02
+1241 870 8.33333333333333e-02
+1241 1008 -1.66666666666667e-01
+1242 1242 1.25000000000000e+00
+1242 1241 8.33333333333333e-02
+1242 1025 -1.66666666666667e-01
+1242 761 4.16666666666667e-02
+1242 1240 8.33333333333333e-02
+1242 1239 -3.75000000000000e-01
+1242 770 4.16666666666667e-02
+1242 1253 -4.16666666666667e-02
+1242 1252 8.33333333333333e-02
+1242 1251 -1.25000000000000e-01
+1242 1022 -8.33333333333333e-02
+1242 1021 -8.33333333333333e-02
+1242 875 8.33333333333333e-02
+1242 881 -4.16666666666667e-02
+1242 1243 -1.66666666666667e-01
+1242 874 8.33333333333333e-02
+1242 1027 -8.33333333333333e-02
+1242 760 -8.33333333333333e-02
+1242 880 8.33333333333333e-02
+1242 879 -1.25000000000000e-01
+1242 1244 -1.66666666666667e-01
+1242 887 8.33333333333333e-02
+1242 1028 1.66666666666667e-01
+1242 886 8.33333333333333e-02
+1242 769 -8.33333333333333e-02
+1242 1024 8.33333333333333e-02
+1242 885 -3.75000000000000e-01
+1242 1026 -2.50000000000000e-01
+1243 1243 1.25000000000000e+00
+1243 1241 -4.16666666666667e-02
+1243 1025 8.33333333333333e-02
+1243 1240 -1.25000000000000e-01
+1243 1239 8.33333333333333e-02
+1243 1244 -1.66666666666667e-01
+1243 1253 8.33333333333333e-02
+1243 1252 -3.75000000000000e-01
+1243 1251 8.33333333333333e-02
+1243 1020 -8.33333333333333e-02
+1243 881 8.33333333333333e-02
+1243 1242 -1.66666666666667e-01
+1243 875 -1.66666666666667e-01
+1243 1028 1.66666666666667e-01
+1243 873 8.33333333333333e-02
+1243 1026 -8.33333333333333e-02
+1243 761 4.16666666666667e-02
+1243 1022 -8.33333333333333e-02
+1243 880 -3.75000000000000e-01
+1243 759 -8.33333333333333e-02
+1243 879 8.33333333333333e-02
+1243 887 -4.16666666666667e-02
+1243 770 4.16666666666667e-02
+1243 1023 8.33333333333333e-02
+1243 886 -1.25000000000000e-01
+1243 1027 -2.50000000000000e-01
+1243 885 8.33333333333333e-02
+1243 768 -8.33333333333333e-02
+1244 1244 1.25000000000000e+00
+1244 1024 8.33333333333333e-02
+1244 1239 8.33333333333333e-02
+1244 1023 -1.66666666666667e-01
+1244 1241 -1.25000000000000e-01
+1244 759 4.16666666666667e-02
+1244 1253 -1.25000000000000e-01
+1244 1243 -1.66666666666667e-01
+1244 1252 8.33333333333333e-02
+1244 768 4.16666666666667e-02
+1244 1251 -4.16666666666667e-02
+1244 1020 -8.33333333333333e-02
+1244 880 8.33333333333333e-02
+1244 873 8.33333333333333e-02
+1244 879 -4.16666666666667e-02
+1244 874 -1.66666666666667e-01
+1244 1027 1.66666666666667e-01
+1244 881 -1.25000000000000e-01
+1244 760 4.16666666666667e-02
+1244 1021 -8.33333333333333e-02
+1244 1240 -4.16666666666667e-02
+1244 887 -1.25000000000000e-01
+1244 1028 -7.50000000000000e-01
+1244 886 -4.16666666666667e-02
+1244 769 4.16666666666667e-02
+1244 1242 -1.66666666666667e-01
+1244 885 8.33333333333333e-02
+1244 1026 1.66666666666667e-01
+1245 1245 1.25000000000000e+00
+1245 1036 -8.33333333333333e-02
+1245 1250 -4.16666666666667e-02
+1245 1256 4.16666666666667e-02
+1245 1249 8.33333333333333e-02
+1245 1248 -1.25000000000000e-01
+1245 1247 -1.66666666666667e-01
+1245 1037 1.66666666666667e-01
+1245 764 8.33333333333333e-02
+1245 1255 -8.33333333333333e-02
+1245 1035 -2.50000000000000e-01
+1245 1009 8.33333333333333e-02
+1245 872 -4.16666666666667e-02
+1245 1010 8.33333333333333e-02
+1245 1246 -1.66666666666667e-01
+1245 871 8.33333333333333e-02
+1245 763 8.33333333333333e-02
+1245 870 -1.25000000000000e-01
+1245 762 -3.75000000000000e-01
+1245 128 8.33333333333333e-02
+1245 602 -1.66666666666667e-01
+1245 595 -8.33333333333333e-02
+1245 275 4.16666666666667e-02
+1245 596 -8.33333333333333e-02
+1245 127 8.33333333333333e-02
+1245 274 -8.33333333333333e-02
+1245 126 -3.75000000000000e-01
+1245 601 8.33333333333333e-02
+1246 1246 1.25000000000000e+00
+1246 1035 -8.33333333333333e-02
+1246 1247 -1.66666666666667e-01
+1246 1250 8.33333333333333e-02
+1246 1037 1.66666666666667e-01
+1246 1249 -3.75000000000000e-01
+1246 1248 8.33333333333333e-02
+1246 1256 4.16666666666667e-02
+1246 764 -4.16666666666667e-02
+1246 1036 -2.50000000000000e-01
+1246 1254 -8.33333333333333e-02
+1246 1008 8.33333333333333e-02
+1246 872 8.33333333333333e-02
+1246 1010 -1.66666666666667e-01
+1246 871 -3.75000000000000e-01
+1246 763 -1.25000000000000e-01
+1246 1245 -1.66666666666667e-01
+1246 870 8.33333333333333e-02
+1246 762 8.33333333333333e-02
+1246 128 -4.16666666666667e-02
+1246 602 8.33333333333333e-02
+1246 275 4.16666666666667e-02
+1246 596 -8.33333333333333e-02
+1246 594 -8.33333333333333e-02
+1246 127 -1.25000000000000e-01
+1246 126 8.33333333333333e-02
+1246 273 -8.33333333333333e-02
+1246 600 8.33333333333333e-02
+1247 1247 1.25000000000000e+00
+1247 1249 8.33333333333333e-02
+1247 1036 1.66666666666667e-01
+1247 1248 -4.16666666666667e-02
+1247 1254 4.16666666666667e-02
+1247 1250 -1.25000000000000e-01
+1247 1037 -7.50000000000000e-01
+1247 1255 4.16666666666667e-02
+1247 763 -4.16666666666667e-02
+1247 1245 -1.66666666666667e-01
+1247 1035 1.66666666666667e-01
+1247 762 8.33333333333333e-02
+1247 1246 -1.66666666666667e-01
+1247 872 -1.25000000000000e-01
+1247 764 -1.25000000000000e-01
+1247 871 8.33333333333333e-02
+1247 1009 -1.66666666666667e-01
+1247 870 -4.16666666666667e-02
+1247 1008 8.33333333333333e-02
+1247 127 -4.16666666666667e-02
+1247 601 8.33333333333333e-02
+1247 126 8.33333333333333e-02
+1247 600 -1.66666666666667e-01
+1247 274 4.16666666666667e-02
+1247 595 -8.33333333333333e-02
+1247 128 -1.25000000000000e-01
+1247 273 4.16666666666667e-02
+1247 594 -8.33333333333333e-02
+1248 1248 1.25000000000000e+00
+1248 1247 -4.16666666666667e-02
+1248 1037 8.33333333333333e-02
+1248 1246 8.33333333333333e-02
+1248 1245 -1.25000000000000e-01
+1248 1250 -1.66666666666667e-01
+1248 1256 8.33333333333333e-02
+1248 1255 8.33333333333333e-02
+1248 1254 -3.75000000000000e-01
+1248 1249 -1.66666666666667e-01
+1248 1040 1.66666666666667e-01
+1248 1039 -8.33333333333333e-02
+1248 905 -4.16666666666667e-02
+1248 779 4.16666666666667e-02
+1248 904 8.33333333333333e-02
+1248 778 -8.33333333333333e-02
+1248 903 -1.25000000000000e-01
+1248 1036 8.33333333333333e-02
+1248 1038 -2.50000000000000e-01
+1248 601 -8.33333333333333e-02
+1248 329 8.33333333333333e-02
+1248 317 -1.66666666666667e-01
+1248 316 8.33333333333333e-02
+1248 128 4.16666666666667e-02
+1248 602 -8.33333333333333e-02
+1248 328 8.33333333333333e-02
+1248 127 -8.33333333333333e-02
+1248 327 -3.75000000000000e-01
+1249 1249 1.25000000000000e+00
+1249 1247 8.33333333333333e-02
+1249 1037 -1.66666666666667e-01
+1249 1246 -3.75000000000000e-01
+1249 1245 8.33333333333333e-02
+1249 779 4.16666666666667e-02
+1249 1256 -4.16666666666667e-02
+1249 1255 -1.25000000000000e-01
+1249 1254 8.33333333333333e-02
+1249 1248 -1.66666666666667e-01
+1249 1038 -8.33333333333333e-02
+1249 905 8.33333333333333e-02
+1249 1250 -1.66666666666667e-01
+1249 1040 1.66666666666667e-01
+1249 904 -3.75000000000000e-01
+1249 1035 8.33333333333333e-02
+1249 1039 -2.50000000000000e-01
+1249 903 8.33333333333333e-02
+1249 777 -8.33333333333333e-02
+1249 128 4.16666666666667e-02
+1249 602 -8.33333333333333e-02
+1249 600 -8.33333333333333e-02
+1249 329 -4.16666666666667e-02
+1249 317 8.33333333333333e-02
+1249 315 8.33333333333333e-02
+1249 328 -1.25000000000000e-01
+1249 327 8.33333333333333e-02
+1249 126 -8.33333333333333e-02
+1250 1250 1.25000000000000e+00
+1250 1036 -1.66666666666667e-01
+1250 1245 -4.16666666666667e-02
+1250 1035 8.33333333333333e-02
+1250 1247 -1.25000000000000e-01
+1250 1256 -1.25000000000000e-01
+1250 778 4.16666666666667e-02
+1250 1255 -4.16666666666667e-02
+1250 1248 -1.66666666666667e-01
+1250 1254 8.33333333333333e-02
+1250 1038 1.66666666666667e-01
+1250 905 -1.25000000000000e-01
+1250 1246 8.33333333333333e-02
+1250 1040 -7.50000000000000e-01
+1250 904 8.33333333333333e-02
+1250 1249 -1.66666666666667e-01
+1250 1039 1.66666666666667e-01
+1250 903 -4.16666666666667e-02
+1250 777 4.16666666666667e-02
+1250 127 4.16666666666667e-02
+1250 601 -8.33333333333333e-02
+1250 328 -4.16666666666667e-02
+1250 316 8.33333333333333e-02
+1250 327 8.33333333333333e-02
+1250 315 -1.66666666666667e-01
+1250 329 -1.25000000000000e-01
+1250 126 4.16666666666667e-02
+1250 600 -8.33333333333333e-02
+1251 1251 1.25000000000000e+00
+1251 1243 8.33333333333333e-02
+1251 1242 -1.25000000000000e-01
+1251 1241 4.16666666666667e-02
+1251 1240 -8.33333333333333e-02
+1251 1028 8.33333333333333e-02
+1251 1025 -8.33333333333333e-02
+1251 1027 8.33333333333333e-02
+1251 1024 -8.33333333333333e-02
+1251 1054 -8.33333333333333e-02
+1251 1051 8.33333333333333e-02
+1251 923 4.16666666666667e-02
+1251 920 -4.16666666666667e-02
+1251 764 8.33333333333333e-02
+1251 1052 -1.66666666666667e-01
+1251 763 8.33333333333333e-02
+1251 1252 -1.66666666666667e-01
+1251 919 8.33333333333333e-02
+1251 762 -3.75000000000000e-01
+1251 918 -1.25000000000000e-01
+1251 1253 -1.66666666666667e-01
+1251 770 8.33333333333333e-02
+1251 1055 1.66666666666667e-01
+1251 769 8.33333333333333e-02
+1251 922 -8.33333333333333e-02
+1251 1244 -4.16666666666667e-02
+1251 768 -3.75000000000000e-01
+1251 1053 -2.50000000000000e-01
+1252 1252 1.25000000000000e+00
+1252 1244 8.33333333333333e-02
+1252 1243 -3.75000000000000e-01
+1252 1242 8.33333333333333e-02
+1252 1239 -8.33333333333333e-02
+1252 1025 -8.33333333333333e-02
+1252 1028 -1.66666666666667e-01
+1252 1026 8.33333333333333e-02
+1252 1023 -8.33333333333333e-02
+1252 1053 -8.33333333333333e-02
+1252 1050 8.33333333333333e-02
+1252 1055 1.66666666666667e-01
+1252 1253 -1.66666666666667e-01
+1252 920 8.33333333333333e-02
+1252 764 -4.16666666666667e-02
+1252 1052 8.33333333333333e-02
+1252 763 -1.25000000000000e-01
+1252 919 -3.75000000000000e-01
+1252 762 8.33333333333333e-02
+1252 1251 -1.66666666666667e-01
+1252 918 8.33333333333333e-02
+1252 770 -4.16666666666667e-02
+1252 923 4.16666666666667e-02
+1252 1241 4.16666666666667e-02
+1252 769 -1.25000000000000e-01
+1252 1054 -2.50000000000000e-01
+1252 768 8.33333333333333e-02
+1252 921 -8.33333333333333e-02
+1253 1253 1.25000000000000e+00
+1253 1244 -1.25000000000000e-01
+1253 1243 8.33333333333333e-02
+1253 1242 -4.16666666666667e-02
+1253 1239 4.16666666666667e-02
+1253 1026 8.33333333333333e-02
+1253 1023 -8.33333333333333e-02
+1253 1024 -8.33333333333333e-02
+1253 1027 -1.66666666666667e-01
+1253 1054 1.66666666666667e-01
+1253 1252 -1.66666666666667e-01
+1253 919 8.33333333333333e-02
+1253 921 4.16666666666667e-02
+1253 918 -4.16666666666667e-02
+1253 764 -1.25000000000000e-01
+1253 920 -1.25000000000000e-01
+1253 763 -4.16666666666667e-02
+1253 1051 8.33333333333333e-02
+1253 762 8.33333333333333e-02
+1253 1050 -1.66666666666667e-01
+1253 1240 4.16666666666667e-02
+1253 770 -1.25000000000000e-01
+1253 1055 -7.50000000000000e-01
+1253 769 -4.16666666666667e-02
+1253 922 4.16666666666667e-02
+1253 1251 -1.66666666666667e-01
+1253 768 8.33333333333333e-02
+1253 1053 1.66666666666667e-01
+1254 1254 1.25000000000000e+00
+1254 1250 8.33333333333333e-02
+1254 1249 8.33333333333333e-02
+1254 1248 -3.75000000000000e-01
+1254 1246 -8.33333333333333e-02
+1254 1037 -8.33333333333333e-02
+1254 1040 -1.66666666666667e-01
+1254 1039 8.33333333333333e-02
+1254 1036 -8.33333333333333e-02
+1254 1051 8.33333333333333e-02
+1254 1057 -8.33333333333333e-02
+1254 1256 -1.66666666666667e-01
+1254 1058 1.66666666666667e-01
+1254 920 8.33333333333333e-02
+1254 779 -4.16666666666667e-02
+1254 926 4.16666666666667e-02
+1254 778 8.33333333333333e-02
+1254 925 -8.33333333333333e-02
+1254 777 -1.25000000000000e-01
+1254 1056 -2.50000000000000e-01
+1254 764 -4.16666666666667e-02
+1254 1052 8.33333333333333e-02
+1254 1255 -1.66666666666667e-01
+1254 763 8.33333333333333e-02
+1254 919 8.33333333333333e-02
+1254 1247 4.16666666666667e-02
+1254 762 -1.25000000000000e-01
+1254 918 -3.75000000000000e-01
+1255 1255 1.25000000000000e+00
+1255 1249 -1.25000000000000e-01
+1255 1248 8.33333333333333e-02
+1255 1247 4.16666666666667e-02
+1255 1245 -8.33333333333333e-02
+1255 1040 8.33333333333333e-02
+1255 1037 -8.33333333333333e-02
+1255 1038 8.33333333333333e-02
+1255 1035 -8.33333333333333e-02
+1255 1050 8.33333333333333e-02
+1255 1056 -8.33333333333333e-02
+1255 926 4.16666666666667e-02
+1255 920 -4.16666666666667e-02
+1255 779 8.33333333333333e-02
+1255 1256 -1.66666666666667e-01
+1255 1058 1.66666666666667e-01
+1255 778 -3.75000000000000e-01
+1255 1057 -2.50000000000000e-01
+1255 777 8.33333333333333e-02
+1255 924 -8.33333333333333e-02
+1255 764 8.33333333333333e-02
+1255 1052 -1.66666666666667e-01
+1255 1250 -4.16666666666667e-02
+1255 763 -3.75000000000000e-01
+1255 919 -1.25000000000000e-01
+1255 1254 -1.66666666666667e-01
+1255 762 8.33333333333333e-02
+1255 918 8.33333333333333e-02
+1256 1256 1.25000000000000e+00
+1256 1250 -1.25000000000000e-01
+1256 1249 -4.16666666666667e-02
+1256 1248 8.33333333333333e-02
+1256 1246 4.16666666666667e-02
+1256 1039 8.33333333333333e-02
+1256 1036 -8.33333333333333e-02
+1256 1035 -8.33333333333333e-02
+1256 1038 -1.66666666666667e-01
+1256 925 4.16666666666667e-02
+1256 919 -4.16666666666667e-02
+1256 1254 -1.66666666666667e-01
+1256 1056 1.66666666666667e-01
+1256 918 8.33333333333333e-02
+1256 779 -1.25000000000000e-01
+1256 1058 -7.50000000000000e-01
+1256 778 8.33333333333333e-02
+1256 1255 -1.66666666666667e-01
+1256 1057 1.66666666666667e-01
+1256 777 -4.16666666666667e-02
+1256 924 4.16666666666667e-02
+1256 1245 4.16666666666667e-02
+1256 764 -1.25000000000000e-01
+1256 920 -1.25000000000000e-01
+1256 763 8.33333333333333e-02
+1256 1051 -1.66666666666667e-01
+1256 762 -4.16666666666667e-02
+1256 1050 8.33333333333333e-02
+1257 1257 1.25000000000000e+00
+1257 1144 -8.33333333333333e-02
+1257 1262 8.33333333333333e-02
+1257 1259 -1.66666666666667e-01
+1257 1145 1.66666666666667e-01
+1257 1142 8.33333333333333e-02
+1257 767 -4.16666666666667e-02
+1257 1261 8.33333333333333e-02
+1257 1260 -3.75000000000000e-01
+1257 1271 4.16666666666667e-02
+1257 773 -4.16666666666667e-02
+1257 1270 -8.33333333333333e-02
+1257 1143 -2.50000000000000e-01
+1257 1124 -8.33333333333333e-02
+1257 884 4.16666666666667e-02
+1257 1123 -8.33333333333333e-02
+1257 1129 8.33333333333333e-02
+1257 883 -8.33333333333333e-02
+1257 766 8.33333333333333e-02
+1257 765 -1.25000000000000e-01
+1257 890 8.33333333333333e-02
+1257 1130 -1.66666666666667e-01
+1257 889 8.33333333333333e-02
+1257 1258 -1.66666666666667e-01
+1257 772 8.33333333333333e-02
+1257 888 -3.75000000000000e-01
+1257 1141 8.33333333333333e-02
+1257 771 -1.25000000000000e-01
+1258 1258 1.25000000000000e+00
+1258 1143 -8.33333333333333e-02
+1258 1262 -4.16666666666667e-02
+1258 1271 4.16666666666667e-02
+1258 1142 -1.66666666666667e-01
+1258 767 8.33333333333333e-02
+1258 1261 -1.25000000000000e-01
+1258 1260 8.33333333333333e-02
+1258 1145 1.66666666666667e-01
+1258 1259 -1.66666666666667e-01
+1258 773 8.33333333333333e-02
+1258 1144 -2.50000000000000e-01
+1258 1269 -8.33333333333333e-02
+1258 1122 -8.33333333333333e-02
+1258 1128 8.33333333333333e-02
+1258 884 4.16666666666667e-02
+1258 1124 -8.33333333333333e-02
+1258 766 -3.75000000000000e-01
+1258 882 -8.33333333333333e-02
+1258 765 8.33333333333333e-02
+1258 890 -4.16666666666667e-02
+1258 1130 8.33333333333333e-02
+1258 889 -1.25000000000000e-01
+1258 1140 8.33333333333333e-02
+1258 772 -3.75000000000000e-01
+1258 888 8.33333333333333e-02
+1258 1257 -1.66666666666667e-01
+1258 771 8.33333333333333e-02
+1259 1259 1.25000000000000e+00
+1259 1270 4.16666666666667e-02
+1259 1260 8.33333333333333e-02
+1259 1257 -1.66666666666667e-01
+1259 1143 1.66666666666667e-01
+1259 1262 -1.25000000000000e-01
+1259 1141 -1.66666666666667e-01
+1259 766 8.33333333333333e-02
+1259 1140 8.33333333333333e-02
+1259 765 -4.16666666666667e-02
+1259 1145 -7.50000000000000e-01
+1259 1144 1.66666666666667e-01
+1259 1258 -1.66666666666667e-01
+1259 772 8.33333333333333e-02
+1259 1269 4.16666666666667e-02
+1259 771 -4.16666666666667e-02
+1259 1122 -8.33333333333333e-02
+1259 882 4.16666666666667e-02
+1259 767 -1.25000000000000e-01
+1259 883 4.16666666666667e-02
+1259 1123 -8.33333333333333e-02
+1259 890 -1.25000000000000e-01
+1259 1261 -4.16666666666667e-02
+1259 773 -1.25000000000000e-01
+1259 889 -4.16666666666667e-02
+1259 1129 8.33333333333333e-02
+1259 888 8.33333333333333e-02
+1259 1128 -1.66666666666667e-01
+1260 1260 1.25000000000000e+00
+1260 1259 8.33333333333333e-02
+1260 1145 -1.66666666666667e-01
+1260 767 4.16666666666667e-02
+1260 1258 8.33333333333333e-02
+1260 1257 -3.75000000000000e-01
+1260 776 4.16666666666667e-02
+1260 1271 -4.16666666666667e-02
+1260 1270 8.33333333333333e-02
+1260 1269 -1.25000000000000e-01
+1260 1142 -8.33333333333333e-02
+1260 1141 -8.33333333333333e-02
+1260 893 8.33333333333333e-02
+1260 899 -4.16666666666667e-02
+1260 1261 -1.66666666666667e-01
+1260 892 8.33333333333333e-02
+1260 1147 -8.33333333333333e-02
+1260 766 -8.33333333333333e-02
+1260 898 8.33333333333333e-02
+1260 897 -1.25000000000000e-01
+1260 1262 -1.66666666666667e-01
+1260 902 8.33333333333333e-02
+1260 1148 1.66666666666667e-01
+1260 901 8.33333333333333e-02
+1260 775 -8.33333333333333e-02
+1260 1144 8.33333333333333e-02
+1260 900 -3.75000000000000e-01
+1260 1146 -2.50000000000000e-01
+1261 1261 1.25000000000000e+00
+1261 1259 -4.16666666666667e-02
+1261 1145 8.33333333333333e-02
+1261 1258 -1.25000000000000e-01
+1261 1257 8.33333333333333e-02
+1261 1262 -1.66666666666667e-01
+1261 1271 8.33333333333333e-02
+1261 1270 -3.75000000000000e-01
+1261 1269 8.33333333333333e-02
+1261 1140 -8.33333333333333e-02
+1261 899 8.33333333333333e-02
+1261 1260 -1.66666666666667e-01
+1261 893 -1.66666666666667e-01
+1261 1148 1.66666666666667e-01
+1261 891 8.33333333333333e-02
+1261 1146 -8.33333333333333e-02
+1261 767 4.16666666666667e-02
+1261 1142 -8.33333333333333e-02
+1261 898 -3.75000000000000e-01
+1261 765 -8.33333333333333e-02
+1261 897 8.33333333333333e-02
+1261 902 -4.16666666666667e-02
+1261 776 4.16666666666667e-02
+1261 1143 8.33333333333333e-02
+1261 901 -1.25000000000000e-01
+1261 1147 -2.50000000000000e-01
+1261 900 8.33333333333333e-02
+1261 774 -8.33333333333333e-02
+1262 1262 1.25000000000000e+00
+1262 1144 8.33333333333333e-02
+1262 1257 8.33333333333333e-02
+1262 1143 -1.66666666666667e-01
+1262 1259 -1.25000000000000e-01
+1262 765 4.16666666666667e-02
+1262 1271 -1.25000000000000e-01
+1262 1261 -1.66666666666667e-01
+1262 1270 8.33333333333333e-02
+1262 774 4.16666666666667e-02
+1262 1269 -4.16666666666667e-02
+1262 1140 -8.33333333333333e-02
+1262 898 8.33333333333333e-02
+1262 891 8.33333333333333e-02
+1262 897 -4.16666666666667e-02
+1262 892 -1.66666666666667e-01
+1262 1147 1.66666666666667e-01
+1262 899 -1.25000000000000e-01
+1262 766 4.16666666666667e-02
+1262 1141 -8.33333333333333e-02
+1262 1258 -4.16666666666667e-02
+1262 902 -1.25000000000000e-01
+1262 1148 -7.50000000000000e-01
+1262 901 -4.16666666666667e-02
+1262 775 4.16666666666667e-02
+1262 1260 -1.66666666666667e-01
+1262 900 8.33333333333333e-02
+1262 1146 1.66666666666667e-01
+1263 1263 1.25000000000000e+00
+1263 1162 -8.33333333333333e-02
+1263 1268 -4.16666666666667e-02
+1263 1274 4.16666666666667e-02
+1263 770 8.33333333333333e-02
+1263 1160 -1.66666666666667e-01
+1263 1267 8.33333333333333e-02
+1263 1266 -1.25000000000000e-01
+1263 1265 -1.66666666666667e-01
+1263 1163 1.66666666666667e-01
+1263 773 8.33333333333333e-02
+1263 1273 -8.33333333333333e-02
+1263 1161 -2.50000000000000e-01
+1263 1126 -8.33333333333333e-02
+1263 1129 8.33333333333333e-02
+1263 887 4.16666666666667e-02
+1263 1127 -8.33333333333333e-02
+1263 769 8.33333333333333e-02
+1263 886 -8.33333333333333e-02
+1263 768 -3.75000000000000e-01
+1263 890 -4.16666666666667e-02
+1263 1130 8.33333333333333e-02
+1263 1264 -1.66666666666667e-01
+1263 889 8.33333333333333e-02
+1263 772 8.33333333333333e-02
+1263 1159 8.33333333333333e-02
+1263 888 -1.25000000000000e-01
+1263 771 -3.75000000000000e-01
+1264 1264 1.25000000000000e+00
+1264 1161 -8.33333333333333e-02
+1264 1265 -1.66666666666667e-01
+1264 1268 8.33333333333333e-02
+1264 1163 1.66666666666667e-01
+1264 770 -4.16666666666667e-02
+1264 1160 8.33333333333333e-02
+1264 1267 -3.75000000000000e-01
+1264 1266 8.33333333333333e-02
+1264 1274 4.16666666666667e-02
+1264 773 -4.16666666666667e-02
+1264 1162 -2.50000000000000e-01
+1264 1272 -8.33333333333333e-02
+1264 887 4.16666666666667e-02
+1264 1127 -8.33333333333333e-02
+1264 1125 -8.33333333333333e-02
+1264 1128 8.33333333333333e-02
+1264 769 -1.25000000000000e-01
+1264 768 8.33333333333333e-02
+1264 885 -8.33333333333333e-02
+1264 890 8.33333333333333e-02
+1264 1130 -1.66666666666667e-01
+1264 1158 8.33333333333333e-02
+1264 889 -3.75000000000000e-01
+1264 772 -1.25000000000000e-01
+1264 1263 -1.66666666666667e-01
+1264 888 8.33333333333333e-02
+1264 771 8.33333333333333e-02
+1265 1265 1.25000000000000e+00
+1265 1267 8.33333333333333e-02
+1265 1162 1.66666666666667e-01
+1265 1266 -4.16666666666667e-02
+1265 1272 4.16666666666667e-02
+1265 1268 -1.25000000000000e-01
+1265 769 -4.16666666666667e-02
+1265 1159 8.33333333333333e-02
+1265 768 8.33333333333333e-02
+1265 1158 -1.66666666666667e-01
+1265 1163 -7.50000000000000e-01
+1265 1273 4.16666666666667e-02
+1265 772 -4.16666666666667e-02
+1265 1263 -1.66666666666667e-01
+1265 1161 1.66666666666667e-01
+1265 771 8.33333333333333e-02
+1265 886 4.16666666666667e-02
+1265 1126 -8.33333333333333e-02
+1265 770 -1.25000000000000e-01
+1265 885 4.16666666666667e-02
+1265 1125 -8.33333333333333e-02
+1265 1264 -1.66666666666667e-01
+1265 890 -1.25000000000000e-01
+1265 773 -1.25000000000000e-01
+1265 889 8.33333333333333e-02
+1265 1129 -1.66666666666667e-01
+1265 888 -4.16666666666667e-02
+1265 1128 8.33333333333333e-02
+1266 1266 1.25000000000000e+00
+1266 1265 -4.16666666666667e-02
+1266 1163 8.33333333333333e-02
+1266 1264 8.33333333333333e-02
+1266 1263 -1.25000000000000e-01
+1266 1268 -1.66666666666667e-01
+1266 1274 8.33333333333333e-02
+1266 1273 8.33333333333333e-02
+1266 1272 -3.75000000000000e-01
+1266 1159 -8.33333333333333e-02
+1266 923 8.33333333333333e-02
+1266 1267 -1.66666666666667e-01
+1266 911 -1.66666666666667e-01
+1266 1166 1.66666666666667e-01
+1266 910 8.33333333333333e-02
+1266 1165 -8.33333333333333e-02
+1266 770 4.16666666666667e-02
+1266 1160 -8.33333333333333e-02
+1266 922 8.33333333333333e-02
+1266 769 -8.33333333333333e-02
+1266 921 -3.75000000000000e-01
+1266 929 -4.16666666666667e-02
+1266 782 4.16666666666667e-02
+1266 928 8.33333333333333e-02
+1266 781 -8.33333333333333e-02
+1266 927 -1.25000000000000e-01
+1266 1162 8.33333333333333e-02
+1266 1164 -2.50000000000000e-01
+1267 1267 1.25000000000000e+00
+1267 1265 8.33333333333333e-02
+1267 1163 -1.66666666666667e-01
+1267 770 4.16666666666667e-02
+1267 1264 -3.75000000000000e-01
+1267 1263 8.33333333333333e-02
+1267 782 4.16666666666667e-02
+1267 1274 -4.16666666666667e-02
+1267 1273 -1.25000000000000e-01
+1267 1272 8.33333333333333e-02
+1267 1160 -8.33333333333333e-02
+1267 1158 -8.33333333333333e-02
+1267 923 -4.16666666666667e-02
+1267 911 8.33333333333333e-02
+1267 1266 -1.66666666666667e-01
+1267 909 8.33333333333333e-02
+1267 1164 -8.33333333333333e-02
+1267 922 -1.25000000000000e-01
+1267 921 8.33333333333333e-02
+1267 768 -8.33333333333333e-02
+1267 929 8.33333333333333e-02
+1267 1268 -1.66666666666667e-01
+1267 1166 1.66666666666667e-01
+1267 928 -3.75000000000000e-01
+1267 1161 8.33333333333333e-02
+1267 1165 -2.50000000000000e-01
+1267 927 8.33333333333333e-02
+1267 780 -8.33333333333333e-02
+1268 1268 1.25000000000000e+00
+1268 1162 -1.66666666666667e-01
+1268 1263 -4.16666666666667e-02
+1268 1161 8.33333333333333e-02
+1268 1265 -1.25000000000000e-01
+1268 769 4.16666666666667e-02
+1268 1274 -1.25000000000000e-01
+1268 781 4.16666666666667e-02
+1268 1273 -4.16666666666667e-02
+1268 1266 -1.66666666666667e-01
+1268 1272 8.33333333333333e-02
+1268 1159 -8.33333333333333e-02
+1268 922 -4.16666666666667e-02
+1268 910 8.33333333333333e-02
+1268 921 8.33333333333333e-02
+1268 909 -1.66666666666667e-01
+1268 1164 1.66666666666667e-01
+1268 923 -1.25000000000000e-01
+1268 768 4.16666666666667e-02
+1268 1158 -8.33333333333333e-02
+1268 929 -1.25000000000000e-01
+1268 1264 8.33333333333333e-02
+1268 1166 -7.50000000000000e-01
+1268 928 8.33333333333333e-02
+1268 1267 -1.66666666666667e-01
+1268 1165 1.66666666666667e-01
+1268 927 -4.16666666666667e-02
+1268 780 4.16666666666667e-02
+1269 1269 1.25000000000000e+00
+1269 1261 8.33333333333333e-02
+1269 1260 -1.25000000000000e-01
+1269 1259 4.16666666666667e-02
+1269 1258 -8.33333333333333e-02
+1269 1148 8.33333333333333e-02
+1269 1145 -8.33333333333333e-02
+1269 1147 8.33333333333333e-02
+1269 1144 -8.33333333333333e-02
+1269 1180 -8.33333333333333e-02
+1269 1177 8.33333333333333e-02
+1269 947 4.16666666666667e-02
+1269 944 -4.16666666666667e-02
+1269 773 8.33333333333333e-02
+1269 1178 -1.66666666666667e-01
+1269 772 8.33333333333333e-02
+1269 1270 -1.66666666666667e-01
+1269 943 8.33333333333333e-02
+1269 771 -3.75000000000000e-01
+1269 942 -1.25000000000000e-01
+1269 1271 -1.66666666666667e-01
+1269 776 8.33333333333333e-02
+1269 1181 1.66666666666667e-01
+1269 775 8.33333333333333e-02
+1269 946 -8.33333333333333e-02
+1269 1262 -4.16666666666667e-02
+1269 774 -3.75000000000000e-01
+1269 1179 -2.50000000000000e-01
+1270 1270 1.25000000000000e+00
+1270 1262 8.33333333333333e-02
+1270 1261 -3.75000000000000e-01
+1270 1260 8.33333333333333e-02
+1270 1257 -8.33333333333333e-02
+1270 1145 -8.33333333333333e-02
+1270 1148 -1.66666666666667e-01
+1270 1146 8.33333333333333e-02
+1270 1143 -8.33333333333333e-02
+1270 1179 -8.33333333333333e-02
+1270 1176 8.33333333333333e-02
+1270 1181 1.66666666666667e-01
+1270 1271 -1.66666666666667e-01
+1270 944 8.33333333333333e-02
+1270 773 -4.16666666666667e-02
+1270 1178 8.33333333333333e-02
+1270 772 -1.25000000000000e-01
+1270 943 -3.75000000000000e-01
+1270 771 8.33333333333333e-02
+1270 1269 -1.66666666666667e-01
+1270 942 8.33333333333333e-02
+1270 776 -4.16666666666667e-02
+1270 947 4.16666666666667e-02
+1270 1259 4.16666666666667e-02
+1270 775 -1.25000000000000e-01
+1270 1180 -2.50000000000000e-01
+1270 774 8.33333333333333e-02
+1270 945 -8.33333333333333e-02
+1271 1271 1.25000000000000e+00
+1271 1262 -1.25000000000000e-01
+1271 1261 8.33333333333333e-02
+1271 1260 -4.16666666666667e-02
+1271 1257 4.16666666666667e-02
+1271 1146 8.33333333333333e-02
+1271 1143 -8.33333333333333e-02
+1271 1144 -8.33333333333333e-02
+1271 1147 -1.66666666666667e-01
+1271 1180 1.66666666666667e-01
+1271 1270 -1.66666666666667e-01
+1271 943 8.33333333333333e-02
+1271 945 4.16666666666667e-02
+1271 942 -4.16666666666667e-02
+1271 773 -1.25000000000000e-01
+1271 944 -1.25000000000000e-01
+1271 772 -4.16666666666667e-02
+1271 1177 8.33333333333333e-02
+1271 771 8.33333333333333e-02
+1271 1176 -1.66666666666667e-01
+1271 1258 4.16666666666667e-02
+1271 776 -1.25000000000000e-01
+1271 1181 -7.50000000000000e-01
+1271 775 -4.16666666666667e-02
+1271 946 4.16666666666667e-02
+1271 1269 -1.66666666666667e-01
+1271 774 8.33333333333333e-02
+1271 1179 1.66666666666667e-01
+1272 1272 1.25000000000000e+00
+1272 1268 8.33333333333333e-02
+1272 1267 8.33333333333333e-02
+1272 1266 -3.75000000000000e-01
+1272 1264 -8.33333333333333e-02
+1272 1163 -8.33333333333333e-02
+1272 1166 -1.66666666666667e-01
+1272 1165 8.33333333333333e-02
+1272 1162 -8.33333333333333e-02
+1272 1177 8.33333333333333e-02
+1272 1183 -8.33333333333333e-02
+1272 1274 -1.66666666666667e-01
+1272 1184 1.66666666666667e-01
+1272 944 8.33333333333333e-02
+1272 782 -4.16666666666667e-02
+1272 950 4.16666666666667e-02
+1272 781 8.33333333333333e-02
+1272 949 -8.33333333333333e-02
+1272 780 -1.25000000000000e-01
+1272 1182 -2.50000000000000e-01
+1272 773 -4.16666666666667e-02
+1272 1178 8.33333333333333e-02
+1272 1273 -1.66666666666667e-01
+1272 772 8.33333333333333e-02
+1272 943 8.33333333333333e-02
+1272 1265 4.16666666666667e-02
+1272 771 -1.25000000000000e-01
+1272 942 -3.75000000000000e-01
+1273 1273 1.25000000000000e+00
+1273 1267 -1.25000000000000e-01
+1273 1266 8.33333333333333e-02
+1273 1265 4.16666666666667e-02
+1273 1263 -8.33333333333333e-02
+1273 1166 8.33333333333333e-02
+1273 1163 -8.33333333333333e-02
+1273 1164 8.33333333333333e-02
+1273 1161 -8.33333333333333e-02
+1273 1176 8.33333333333333e-02
+1273 1182 -8.33333333333333e-02
+1273 950 4.16666666666667e-02
+1273 944 -4.16666666666667e-02
+1273 782 8.33333333333333e-02
+1273 1274 -1.66666666666667e-01
+1273 1184 1.66666666666667e-01
+1273 781 -3.75000000000000e-01
+1273 1183 -2.50000000000000e-01
+1273 780 8.33333333333333e-02
+1273 948 -8.33333333333333e-02
+1273 773 8.33333333333333e-02
+1273 1178 -1.66666666666667e-01
+1273 1268 -4.16666666666667e-02
+1273 772 -3.75000000000000e-01
+1273 943 -1.25000000000000e-01
+1273 1272 -1.66666666666667e-01
+1273 771 8.33333333333333e-02
+1273 942 8.33333333333333e-02
+1274 1274 1.25000000000000e+00
+1274 1268 -1.25000000000000e-01
+1274 1267 -4.16666666666667e-02
+1274 1266 8.33333333333333e-02
+1274 1264 4.16666666666667e-02
+1274 1165 8.33333333333333e-02
+1274 1162 -8.33333333333333e-02
+1274 1161 -8.33333333333333e-02
+1274 1164 -1.66666666666667e-01
+1274 949 4.16666666666667e-02
+1274 943 -4.16666666666667e-02
+1274 1272 -1.66666666666667e-01
+1274 1182 1.66666666666667e-01
+1274 942 8.33333333333333e-02
+1274 782 -1.25000000000000e-01
+1274 1184 -7.50000000000000e-01
+1274 781 8.33333333333333e-02
+1274 1273 -1.66666666666667e-01
+1274 1183 1.66666666666667e-01
+1274 780 -4.16666666666667e-02
+1274 948 4.16666666666667e-02
+1274 1263 4.16666666666667e-02
+1274 773 -1.25000000000000e-01
+1274 944 -1.25000000000000e-01
+1274 772 8.33333333333333e-02
+1274 1177 -1.66666666666667e-01
+1274 771 -4.16666666666667e-02
+1274 1176 8.33333333333333e-02
diff --git a/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/A.IJ.00002 b/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/A.IJ.00002
new file mode 100644
index 00000000..286eb339
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/A.IJ.00002
@@ -0,0 +1,17977 @@
+1275 1874 1275 1874
+1275 1275 3.75000000000000e+01
+1275 1400 4.16666666666667e+00
+1275 1276 -4.16666666666667e+00
+1275 1387 4.16666666666667e+00
+1275 1386 -6.25000000000000e+00
+1275 1277 -4.16666666666667e+00
+1275 1394 4.16666666666667e+00
+1275 1393 -2.08333333333333e+00
+1275 1399 4.16666666666667e+00
+1275 1388 -2.08333333333333e+00
+1275 1392 -6.25000000000000e+00
+1275 1391 2.08333333333333e+00
+1275 1403 -4.16666666666667e+00
+1275 1384 2.08333333333333e+00
+1275 1390 -4.16666666666667e+00
+1275 1385 2.08333333333333e+00
+1275 1396 2.08333333333333e+00
+1275 1402 -4.16666666666667e+00
+1275 1383 -1.25000000000000e+01
+1275 1397 -4.16666666666667e+00
+1275 2029 2.08333333333333e+00
+1275 2030 2.08333333333333e+00
+1275 2028 -1.25000000000000e+01
+1276 1276 3.33333333333333e+01
+1276 1387 -1.87500000000000e+01
+1276 1275 -4.16666666666667e+00
+1276 1386 4.16666666666667e+00
+1276 1394 4.16666666666667e+00
+1276 1400 -8.33333333333333e+00
+1276 1388 4.16666666666667e+00
+1276 1393 -6.25000000000000e+00
+1276 1392 -2.08333333333333e+00
+1276 1398 4.16666666666667e+00
+1276 1383 2.08333333333333e+00
+1276 1389 -4.16666666666667e+00
+1276 1384 -4.16666666666667e+00
+1276 1395 2.08333333333333e+00
+1276 1401 -4.16666666666667e+00
+1276 1397 2.08333333333333e+00
+1276 1403 -4.16666666666667e+00
+1276 1391 2.08333333333333e+00
+1276 2028 2.08333333333333e+00
+1276 2029 -4.16666666666667e+00
+1277 1277 3.33333333333333e+01
+1277 1387 4.16666666666667e+00
+1277 1386 -2.08333333333333e+00
+1277 1398 4.16666666666667e+00
+1277 1388 -6.25000000000000e+00
+1277 1394 -1.87500000000000e+01
+1277 1393 4.16666666666667e+00
+1277 1399 -8.33333333333333e+00
+1277 1275 -4.16666666666667e+00
+1277 1392 4.16666666666667e+00
+1277 1389 2.08333333333333e+00
+1277 1401 -4.16666666666667e+00
+1277 1385 -4.16666666666667e+00
+1277 1383 2.08333333333333e+00
+1277 1390 2.08333333333333e+00
+1277 1396 2.08333333333333e+00
+1277 1402 -4.16666666666667e+00
+1277 1395 -4.16666666666667e+00
+1277 2030 -4.16666666666667e+00
+1277 2028 2.08333333333333e+00
+1278 1278 3.75000000000000e+01
+1278 1427 -4.16666666666667e+00
+1278 1408 2.08333333333333e+00
+1278 1414 -4.16666666666667e+00
+1278 1409 2.08333333333333e+00
+1278 1420 2.08333333333333e+00
+1278 1426 -4.16666666666667e+00
+1278 1407 -1.25000000000000e+01
+1278 1421 -4.16666666666667e+00
+1278 1412 -2.08333333333333e+00
+1278 1424 4.16666666666667e+00
+1278 1279 -4.16666666666667e+00
+1278 1411 4.16666666666667e+00
+1278 1405 2.08333333333333e+00
+1278 1410 -6.25000000000000e+00
+1278 1280 -4.16666666666667e+00
+1278 1418 4.16666666666667e+00
+1278 1406 2.08333333333333e+00
+1278 1417 -2.08333333333333e+00
+1278 1423 4.16666666666667e+00
+1278 1415 2.08333333333333e+00
+1278 1416 -6.25000000000000e+00
+1278 1404 -1.25000000000000e+01
+1279 1279 3.33333333333333e+01
+1279 1407 2.08333333333333e+00
+1279 1413 -4.16666666666667e+00
+1279 1408 -4.16666666666667e+00
+1279 1419 2.08333333333333e+00
+1279 1425 -4.16666666666667e+00
+1279 1421 2.08333333333333e+00
+1279 1427 -4.16666666666667e+00
+1279 1412 4.16666666666667e+00
+1279 1411 -1.87500000000000e+01
+1279 1278 -4.16666666666667e+00
+1279 1410 4.16666666666667e+00
+1279 1404 2.08333333333333e+00
+1279 1418 4.16666666666667e+00
+1279 1424 -8.33333333333333e+00
+1279 1415 2.08333333333333e+00
+1279 1417 -6.25000000000000e+00
+1279 1405 -4.16666666666667e+00
+1279 1416 -2.08333333333333e+00
+1279 1422 4.16666666666667e+00
+1280 1280 3.33333333333333e+01
+1280 1413 2.08333333333333e+00
+1280 1425 -4.16666666666667e+00
+1280 1409 -4.16666666666667e+00
+1280 1407 2.08333333333333e+00
+1280 1420 2.08333333333333e+00
+1280 1426 -4.16666666666667e+00
+1280 1419 -4.16666666666667e+00
+1280 1412 -6.25000000000000e+00
+1280 1411 4.16666666666667e+00
+1280 1410 -2.08333333333333e+00
+1280 1422 4.16666666666667e+00
+1280 1414 2.08333333333333e+00
+1280 1418 -1.87500000000000e+01
+1280 1406 -4.16666666666667e+00
+1280 1417 4.16666666666667e+00
+1280 1423 -8.33333333333333e+00
+1280 1278 -4.16666666666667e+00
+1280 1416 4.16666666666667e+00
+1280 1404 2.08333333333333e+00
+1281 1281 2.50000000000000e+01
+1281 1439 4.16666666666667e+00
+1281 1433 -2.08333333333333e+00
+1281 1432 4.16666666666667e+00
+1281 1431 -6.25000000000000e+00
+1281 1283 -4.16666666666667e+00
+1281 1437 -6.25000000000000e+00
+1281 1435 2.08333333333333e+00
+1281 1282 -4.16666666666667e+00
+1281 1434 -6.25000000000000e+00
+1281 1442 -4.16666666666667e+00
+1281 1438 -2.08333333333333e+00
+1281 1441 2.08333333333333e+00
+1281 1436 2.08333333333333e+00
+1281 2066 2.08333333333333e+00
+1281 2065 2.08333333333333e+00
+1281 2064 -6.25000000000000e+00
+1281 2063 2.08333333333333e+00
+1281 2062 -4.16666666666667e+00
+1282 1282 2.91666666666667e+01
+1282 1433 4.16666666666667e+00
+1282 1283 -8.33333333333333e+00
+1282 1439 4.16666666666667e+00
+1282 1432 -1.87500000000000e+01
+1282 1438 -6.25000000000000e+00
+1282 1431 4.16666666666667e+00
+1282 1442 2.08333333333333e+00
+1282 1435 -2.08333333333333e+00
+1282 1434 2.08333333333333e+00
+1282 1281 -4.16666666666667e+00
+1282 1436 -2.08333333333333e+00
+1282 1437 -2.08333333333333e+00
+1282 1440 2.08333333333333e+00
+1282 2063 2.08333333333333e+00
+1282 2065 -2.08333333333333e+00
+1282 2064 2.08333333333333e+00
+1282 2066 -2.08333333333333e+00
+1282 2061 -4.16666666666667e+00
+1283 1283 2.91666666666667e+01
+1283 1281 -4.16666666666667e+00
+1283 1437 4.16666666666667e+00
+1283 1433 -6.25000000000000e+00
+1283 1439 -1.87500000000000e+01
+1283 1432 4.16666666666667e+00
+1283 1282 -8.33333333333333e+00
+1283 1438 4.16666666666667e+00
+1283 1431 -2.08333333333333e+00
+1283 1435 -2.08333333333333e+00
+1283 1441 2.08333333333333e+00
+1283 1434 2.08333333333333e+00
+1283 1436 -2.08333333333333e+00
+1283 1440 -4.16666666666667e+00
+1283 2065 -2.08333333333333e+00
+1283 2062 2.08333333333333e+00
+1283 2064 2.08333333333333e+00
+1283 2066 -2.08333333333333e+00
+1283 2061 2.08333333333333e+00
+1284 1284 2.50000000000000e+01
+1284 1453 2.08333333333333e+00
+1284 1285 -4.16666666666667e+00
+1284 1452 -6.25000000000000e+00
+1284 1460 -4.16666666666667e+00
+1284 1456 -2.08333333333333e+00
+1284 1459 2.08333333333333e+00
+1284 1286 -4.16666666666667e+00
+1284 1451 2.08333333333333e+00
+1284 1457 4.16666666666667e+00
+1284 1450 2.08333333333333e+00
+1284 1449 -6.25000000000000e+00
+1284 1448 -2.08333333333333e+00
+1284 1445 2.08333333333333e+00
+1284 1447 4.16666666666667e+00
+1284 1444 -4.16666666666667e+00
+1284 1446 -6.25000000000000e+00
+1284 1454 2.08333333333333e+00
+1284 1455 -6.25000000000000e+00
+1285 1285 2.91666666666667e+01
+1285 1460 2.08333333333333e+00
+1285 1453 -2.08333333333333e+00
+1285 1452 2.08333333333333e+00
+1285 1284 -4.16666666666667e+00
+1285 1455 -2.08333333333333e+00
+1285 1458 2.08333333333333e+00
+1285 1451 -2.08333333333333e+00
+1285 1445 2.08333333333333e+00
+1285 1450 -2.08333333333333e+00
+1285 1449 2.08333333333333e+00
+1285 1448 4.16666666666667e+00
+1285 1286 -8.33333333333333e+00
+1285 1457 4.16666666666667e+00
+1285 1447 -1.87500000000000e+01
+1285 1454 -2.08333333333333e+00
+1285 1456 -6.25000000000000e+00
+1285 1446 4.16666666666667e+00
+1285 1443 -4.16666666666667e+00
+1286 1286 2.91666666666667e+01
+1286 1453 -2.08333333333333e+00
+1286 1459 2.08333333333333e+00
+1286 1452 2.08333333333333e+00
+1286 1458 -4.16666666666667e+00
+1286 1451 -2.08333333333333e+00
+1286 1450 -2.08333333333333e+00
+1286 1444 2.08333333333333e+00
+1286 1284 -4.16666666666667e+00
+1286 1449 2.08333333333333e+00
+1286 1455 4.16666666666667e+00
+1286 1448 -6.25000000000000e+00
+1286 1454 -2.08333333333333e+00
+1286 1457 -1.87500000000000e+01
+1286 1447 4.16666666666667e+00
+1286 1285 -8.33333333333333e+00
+1286 1456 4.16666666666667e+00
+1286 1446 -2.08333333333333e+00
+1286 1443 2.08333333333333e+00
+1287 1287 2.50000000000000e+01
+1287 1468 -2.08333333333333e+00
+1287 1467 -6.25000000000000e+00
+1287 1288 -4.16666666666667e+00
+1287 1474 4.16666666666667e+00
+1287 1469 4.16666666666667e+00
+1287 1473 -6.25000000000000e+00
+1287 1478 2.08333333333333e+00
+1287 1289 -4.16666666666667e+00
+1287 1472 2.08333333333333e+00
+1287 1471 2.08333333333333e+00
+1287 1477 -4.16666666666667e+00
+1287 1475 -2.08333333333333e+00
+1287 1470 -6.25000000000000e+00
+1287 2098 2.08333333333333e+00
+1287 2102 2.08333333333333e+00
+1287 2099 -4.16666666666667e+00
+1287 2101 2.08333333333333e+00
+1287 2100 -6.25000000000000e+00
+1288 1288 2.91666666666667e+01
+1288 1289 -8.33333333333333e+00
+1288 1475 4.16666666666667e+00
+1288 1468 -6.25000000000000e+00
+1288 1467 -2.08333333333333e+00
+1288 1469 4.16666666666667e+00
+1288 1474 -1.87500000000000e+01
+1288 1287 -4.16666666666667e+00
+1288 1473 4.16666666666667e+00
+1288 1472 -2.08333333333333e+00
+1288 1478 2.08333333333333e+00
+1288 1471 -2.08333333333333e+00
+1288 1470 2.08333333333333e+00
+1288 1476 -4.16666666666667e+00
+1288 2097 2.08333333333333e+00
+1288 2102 -2.08333333333333e+00
+1288 2099 2.08333333333333e+00
+1288 2101 -2.08333333333333e+00
+1288 2100 2.08333333333333e+00
+1289 1289 2.91666666666667e+01
+1289 1468 4.16666666666667e+00
+1289 1288 -8.33333333333333e+00
+1289 1474 4.16666666666667e+00
+1289 1467 4.16666666666667e+00
+1289 1469 -1.87500000000000e+01
+1289 1475 -6.25000000000000e+00
+1289 1473 -2.08333333333333e+00
+1289 1476 2.08333333333333e+00
+1289 1472 -2.08333333333333e+00
+1289 1471 -2.08333333333333e+00
+1289 1477 2.08333333333333e+00
+1289 1287 -4.16666666666667e+00
+1289 1470 2.08333333333333e+00
+1289 2102 -2.08333333333333e+00
+1289 2101 -2.08333333333333e+00
+1289 2098 2.08333333333333e+00
+1289 2100 2.08333333333333e+00
+1289 2097 -4.16666666666667e+00
+1290 1290 2.50000000000000e+01
+1290 1496 2.08333333333333e+00
+1290 1292 -4.16666666666667e+00
+1290 1490 2.08333333333333e+00
+1290 1489 2.08333333333333e+00
+1290 1495 -4.16666666666667e+00
+1290 1488 -6.25000000000000e+00
+1290 1484 4.16666666666667e+00
+1290 1483 -2.08333333333333e+00
+1290 1480 2.08333333333333e+00
+1290 1482 -6.25000000000000e+00
+1290 1487 2.08333333333333e+00
+1290 1481 -4.16666666666667e+00
+1290 1486 2.08333333333333e+00
+1290 1291 -4.16666666666667e+00
+1290 1492 4.16666666666667e+00
+1290 1485 -6.25000000000000e+00
+1290 1493 -2.08333333333333e+00
+1290 1491 -6.25000000000000e+00
+1291 1291 2.91666666666667e+01
+1291 1496 2.08333333333333e+00
+1291 1489 -2.08333333333333e+00
+1291 1488 2.08333333333333e+00
+1291 1494 -4.16666666666667e+00
+1291 1484 4.16666666666667e+00
+1291 1292 -8.33333333333333e+00
+1291 1493 4.16666666666667e+00
+1291 1483 -6.25000000000000e+00
+1291 1482 -2.08333333333333e+00
+1291 1479 2.08333333333333e+00
+1291 1487 -2.08333333333333e+00
+1291 1481 2.08333333333333e+00
+1291 1486 -2.08333333333333e+00
+1291 1490 -2.08333333333333e+00
+1291 1492 -1.87500000000000e+01
+1291 1485 2.08333333333333e+00
+1291 1290 -4.16666666666667e+00
+1291 1491 4.16666666666667e+00
+1292 1292 2.91666666666667e+01
+1292 1494 2.08333333333333e+00
+1292 1490 -2.08333333333333e+00
+1292 1489 -2.08333333333333e+00
+1292 1495 2.08333333333333e+00
+1292 1290 -4.16666666666667e+00
+1292 1488 2.08333333333333e+00
+1292 1484 -1.87500000000000e+01
+1292 1483 4.16666666666667e+00
+1292 1291 -8.33333333333333e+00
+1292 1492 4.16666666666667e+00
+1292 1482 4.16666666666667e+00
+1292 1487 -2.08333333333333e+00
+1292 1491 -2.08333333333333e+00
+1292 1493 -6.25000000000000e+00
+1292 1486 -2.08333333333333e+00
+1292 1480 2.08333333333333e+00
+1292 1485 2.08333333333333e+00
+1292 1479 -4.16666666666667e+00
+1293 1293 3.75000000000000e+01
+1293 1505 4.16666666666667e+00
+1293 1506 -6.25000000000000e+00
+1293 1504 4.16666666666667e+00
+1293 1510 4.16666666666667e+00
+1293 1509 -6.25000000000000e+00
+1293 1508 4.16666666666667e+00
+1293 1514 2.08333333333333e+00
+1293 1507 -2.08333333333333e+00
+1293 1511 -2.08333333333333e+00
+1293 1294 -4.16666666666667e+00
+1293 1513 2.08333333333333e+00
+1293 1295 -4.16666666666667e+00
+1293 1512 -1.25000000000000e+01
+1293 2150 2.08333333333333e+00
+1293 2144 -4.16666666666667e+00
+1293 2143 2.08333333333333e+00
+1293 2147 2.08333333333333e+00
+1293 2149 2.08333333333333e+00
+1293 2148 -1.25000000000000e+01
+1293 2141 -4.16666666666667e+00
+1293 2140 -4.16666666666667e+00
+1293 2146 -4.16666666666667e+00
+1294 1294 3.33333333333333e+01
+1294 1508 4.16666666666667e+00
+1294 1507 -6.25000000000000e+00
+1294 1505 -8.33333333333333e+00
+1294 1511 4.16666666666667e+00
+1294 1503 4.16666666666667e+00
+1294 1510 -1.87500000000000e+01
+1294 1509 4.16666666666667e+00
+1294 1506 -2.08333333333333e+00
+1294 1513 -4.16666666666667e+00
+1294 1293 -4.16666666666667e+00
+1294 1512 2.08333333333333e+00
+1294 2142 2.08333333333333e+00
+1294 2149 -4.16666666666667e+00
+1294 2148 2.08333333333333e+00
+1294 2139 -4.16666666666667e+00
+1294 2147 2.08333333333333e+00
+1294 2141 -4.16666666666667e+00
+1294 2144 2.08333333333333e+00
+1294 2145 -4.16666666666667e+00
+1295 1295 3.33333333333333e+01
+1295 1506 4.16666666666667e+00
+1295 1508 -1.87500000000000e+01
+1295 1507 4.16666666666667e+00
+1295 1503 4.16666666666667e+00
+1295 1504 -8.33333333333333e+00
+1295 1510 4.16666666666667e+00
+1295 1511 -6.25000000000000e+00
+1295 1293 -4.16666666666667e+00
+1295 1512 2.08333333333333e+00
+1295 1514 -4.16666666666667e+00
+1295 1509 -2.08333333333333e+00
+1295 2148 2.08333333333333e+00
+1295 2142 -4.16666666666667e+00
+1295 2150 -4.16666666666667e+00
+1295 2145 2.08333333333333e+00
+1295 2139 -4.16666666666667e+00
+1295 2143 2.08333333333333e+00
+1295 2146 2.08333333333333e+00
+1295 2140 -4.16666666666667e+00
+1296 1296 3.75000000000000e+01
+1296 1538 2.08333333333333e+00
+1296 1525 -2.08333333333333e+00
+1296 1532 -2.08333333333333e+00
+1296 1297 -4.16666666666667e+00
+1296 1537 2.08333333333333e+00
+1296 1536 -1.25000000000000e+01
+1296 1526 4.16666666666667e+00
+1296 1535 2.08333333333333e+00
+1296 1523 -4.16666666666667e+00
+1296 1522 2.08333333333333e+00
+1296 1529 2.08333333333333e+00
+1296 1534 2.08333333333333e+00
+1296 1533 -1.25000000000000e+01
+1296 1520 4.16666666666667e+00
+1296 1517 -4.16666666666667e+00
+1296 1524 -6.25000000000000e+00
+1296 1519 4.16666666666667e+00
+1296 1516 -4.16666666666667e+00
+1296 1528 -4.16666666666667e+00
+1296 1531 4.16666666666667e+00
+1296 1530 -6.25000000000000e+00
+1296 1298 -4.16666666666667e+00
+1297 1297 3.33333333333333e+01
+1297 1537 -4.16666666666667e+00
+1297 1296 -4.16666666666667e+00
+1297 1536 2.08333333333333e+00
+1297 1523 2.08333333333333e+00
+1297 1521 2.08333333333333e+00
+1297 1534 -4.16666666666667e+00
+1297 1533 2.08333333333333e+00
+1297 1526 4.16666666666667e+00
+1297 1525 -6.25000000000000e+00
+1297 1520 -8.33333333333333e+00
+1297 1532 4.16666666666667e+00
+1297 1518 4.16666666666667e+00
+1297 1515 -4.16666666666667e+00
+1297 1529 2.08333333333333e+00
+1297 1517 -4.16666666666667e+00
+1297 1531 -1.87500000000000e+01
+1297 1524 -2.08333333333333e+00
+1297 1527 -4.16666666666667e+00
+1297 1530 4.16666666666667e+00
+1298 1298 3.33333333333333e+01
+1298 1536 2.08333333333333e+00
+1298 1538 -4.16666666666667e+00
+1298 1530 -2.08333333333333e+00
+1298 1522 2.08333333333333e+00
+1298 1524 4.16666666666667e+00
+1298 1533 2.08333333333333e+00
+1298 1521 -4.16666666666667e+00
+1298 1535 -4.16666666666667e+00
+1298 1527 2.08333333333333e+00
+1298 1526 -1.87500000000000e+01
+1298 1525 4.16666666666667e+00
+1298 1518 4.16666666666667e+00
+1298 1515 -4.16666666666667e+00
+1298 1519 -8.33333333333333e+00
+1298 1531 4.16666666666667e+00
+1298 1532 -6.25000000000000e+00
+1298 1296 -4.16666666666667e+00
+1298 1528 2.08333333333333e+00
+1298 1516 -4.16666666666667e+00
+1299 1299 3.75000000000000e+01
+1299 1405 2.08333333333333e+00
+1299 1561 -4.16666666666667e+00
+1299 1553 -2.08333333333333e+00
+1299 1300 -4.16666666666667e+00
+1299 1552 4.16666666666667e+00
+1299 1384 2.08333333333333e+00
+1299 1551 -6.25000000000000e+00
+1299 1568 -4.16666666666667e+00
+1299 1559 4.16666666666667e+00
+1299 1406 2.08333333333333e+00
+1299 1565 -4.16666666666667e+00
+1299 1564 2.08333333333333e+00
+1299 1567 -4.16666666666667e+00
+1299 1404 -1.25000000000000e+01
+1299 1301 -4.16666666666667e+00
+1299 1556 4.16666666666667e+00
+1299 1385 2.08333333333333e+00
+1299 1555 -2.08333333333333e+00
+1299 1558 4.16666666666667e+00
+1299 1562 2.08333333333333e+00
+1299 1554 -6.25000000000000e+00
+1299 1383 -1.25000000000000e+01
+1300 1300 3.33333333333333e+01
+1300 1404 2.08333333333333e+00
+1300 1560 -4.16666666666667e+00
+1300 1553 4.16666666666667e+00
+1300 1552 -1.87500000000000e+01
+1300 1299 -4.16666666666667e+00
+1300 1551 4.16666666666667e+00
+1300 1383 2.08333333333333e+00
+1300 1565 2.08333333333333e+00
+1300 1568 -4.16666666666667e+00
+1300 1405 -4.16666666666667e+00
+1300 1563 2.08333333333333e+00
+1300 1566 -4.16666666666667e+00
+1300 1556 4.16666666666667e+00
+1300 1559 -8.33333333333333e+00
+1300 1562 2.08333333333333e+00
+1300 1555 -6.25000000000000e+00
+1300 1384 -4.16666666666667e+00
+1300 1554 -2.08333333333333e+00
+1300 1557 4.16666666666667e+00
+1301 1301 3.33333333333333e+01
+1301 1560 2.08333333333333e+00
+1301 1553 -6.25000000000000e+00
+1301 1552 4.16666666666667e+00
+1301 1551 -2.08333333333333e+00
+1301 1564 2.08333333333333e+00
+1301 1567 -4.16666666666667e+00
+1301 1566 -4.16666666666667e+00
+1301 1557 4.16666666666667e+00
+1301 1406 -4.16666666666667e+00
+1301 1404 2.08333333333333e+00
+1301 1563 -4.16666666666667e+00
+1301 1561 2.08333333333333e+00
+1301 1556 -1.87500000000000e+01
+1301 1385 -4.16666666666667e+00
+1301 1555 4.16666666666667e+00
+1301 1558 -8.33333333333333e+00
+1301 1299 -4.16666666666667e+00
+1301 1554 4.16666666666667e+00
+1301 1383 2.08333333333333e+00
+1302 1302 6.25000000000000e+01
+1302 1304 -8.33333333333333e+00
+1302 1574 8.33333333333333e+00
+1302 1582 4.16666666666667e+00
+1302 1573 -4.16666666666667e+00
+1302 1388 -2.08333333333333e+00
+1302 1387 4.16666666666667e+00
+1302 1386 -6.25000000000000e+00
+1302 1572 -1.25000000000000e+01
+1302 1433 -2.08333333333333e+00
+1302 1583 4.16666666666667e+00
+1302 1303 -8.33333333333333e+00
+1302 1432 4.16666666666667e+00
+1302 1431 -6.25000000000000e+00
+1302 1579 -4.16666666666667e+00
+1302 1571 4.16666666666667e+00
+1302 1570 4.16666666666667e+00
+1302 1569 -1.87500000000000e+01
+1302 1586 -4.16666666666667e+00
+1302 1585 -4.16666666666667e+00
+1302 1577 -8.33333333333333e+00
+1302 1576 4.16666666666667e+00
+1302 1580 2.08333333333333e+00
+1302 2288 2.08333333333333e+00
+1302 2287 -4.16666666666667e+00
+1302 2317 4.16666666666667e+00
+1302 2318 4.16666666666667e+00
+1302 2316 -1.87500000000000e+01
+1303 1303 6.25000000000000e+01
+1303 1581 4.16666666666667e+00
+1303 1572 -4.16666666666667e+00
+1303 1388 4.16666666666667e+00
+1303 1304 -8.33333333333333e+00
+1303 1574 8.33333333333333e+00
+1303 1387 -1.87500000000000e+01
+1303 1573 -1.25000000000000e+01
+1303 1386 4.16666666666667e+00
+1303 1433 4.16666666666667e+00
+1303 1583 -8.33333333333333e+00
+1303 1432 -1.87500000000000e+01
+1303 1302 -8.33333333333333e+00
+1303 1431 4.16666666666667e+00
+1303 1578 -4.16666666666667e+00
+1303 1571 -2.08333333333333e+00
+1303 1570 -6.25000000000000e+00
+1303 1569 4.16666666666667e+00
+1303 1586 -4.16666666666667e+00
+1303 1577 4.16666666666667e+00
+1303 1584 -4.16666666666667e+00
+1303 1580 2.08333333333333e+00
+1303 1575 4.16666666666667e+00
+1303 2288 2.08333333333333e+00
+1303 2286 -4.16666666666667e+00
+1303 2318 -2.08333333333333e+00
+1303 2317 -6.25000000000000e+00
+1303 2316 4.16666666666667e+00
+1304 1304 6.25000000000000e+01
+1304 1302 -8.33333333333333e+00
+1304 1572 8.33333333333333e+00
+1304 1388 -6.25000000000000e+00
+1304 1574 -3.75000000000000e+01
+1304 1387 4.16666666666667e+00
+1304 1303 -8.33333333333333e+00
+1304 1573 8.33333333333333e+00
+1304 1386 -2.08333333333333e+00
+1304 1433 -6.25000000000000e+00
+1304 1432 4.16666666666667e+00
+1304 1582 -8.33333333333333e+00
+1304 1431 -2.08333333333333e+00
+1304 1581 4.16666666666667e+00
+1304 1579 2.08333333333333e+00
+1304 1571 -6.25000000000000e+00
+1304 1570 -2.08333333333333e+00
+1304 1569 4.16666666666667e+00
+1304 1584 -4.16666666666667e+00
+1304 1585 -4.16666666666667e+00
+1304 1576 4.16666666666667e+00
+1304 1578 2.08333333333333e+00
+1304 1575 -8.33333333333333e+00
+1304 2287 2.08333333333333e+00
+1304 2316 4.16666666666667e+00
+1304 2286 2.08333333333333e+00
+1304 2317 -2.08333333333333e+00
+1304 2318 -6.25000000000000e+00
+1305 1305 6.25000000000000e+01
+1305 1600 4.16666666666667e+00
+1305 1601 4.16666666666667e+00
+1305 1597 4.16666666666667e+00
+1305 1596 -6.25000000000000e+00
+1305 1307 -8.33333333333333e+00
+1305 1571 4.16666666666667e+00
+1305 1570 4.16666666666667e+00
+1305 1569 -1.87500000000000e+01
+1305 1588 -4.16666666666667e+00
+1305 1306 -8.33333333333333e+00
+1305 1592 4.16666666666667e+00
+1305 1603 -4.16666666666667e+00
+1305 1594 4.16666666666667e+00
+1305 1589 8.33333333333333e+00
+1305 1595 -8.33333333333333e+00
+1305 1445 2.08333333333333e+00
+1305 1604 -4.16666666666667e+00
+1305 1591 4.16666666666667e+00
+1305 1444 -4.16666666666667e+00
+1305 1590 -1.87500000000000e+01
+1305 1553 -2.08333333333333e+00
+1305 1391 2.08333333333333e+00
+1305 1552 4.16666666666667e+00
+1305 1390 -4.16666666666667e+00
+1305 1551 -6.25000000000000e+00
+1305 1598 -2.08333333333333e+00
+1305 1587 -1.25000000000000e+01
+1306 1306 6.25000000000000e+01
+1306 1599 4.16666666666667e+00
+1306 1601 -8.33333333333333e+00
+1306 1445 2.08333333333333e+00
+1306 1597 -1.87500000000000e+01
+1306 1596 4.16666666666667e+00
+1306 1571 -2.08333333333333e+00
+1306 1391 2.08333333333333e+00
+1306 1570 -6.25000000000000e+00
+1306 1569 4.16666666666667e+00
+1306 1587 -4.16666666666667e+00
+1306 1592 -2.08333333333333e+00
+1306 1305 -8.33333333333333e+00
+1306 1602 -4.16666666666667e+00
+1306 1593 4.16666666666667e+00
+1306 1604 -4.16666666666667e+00
+1306 1595 4.16666666666667e+00
+1306 1591 -6.25000000000000e+00
+1306 1590 4.16666666666667e+00
+1306 1443 -4.16666666666667e+00
+1306 1553 4.16666666666667e+00
+1306 1307 -8.33333333333333e+00
+1306 1589 8.33333333333333e+00
+1306 1552 -1.87500000000000e+01
+1306 1598 4.16666666666667e+00
+1306 1588 -1.25000000000000e+01
+1306 1551 4.16666666666667e+00
+1306 1389 -4.16666666666667e+00
+1307 1307 6.25000000000000e+01
+1307 1597 4.16666666666667e+00
+1307 1600 -8.33333333333333e+00
+1307 1599 4.16666666666667e+00
+1307 1598 -6.25000000000000e+00
+1307 1444 2.08333333333333e+00
+1307 1571 -6.25000000000000e+00
+1307 1570 -2.08333333333333e+00
+1307 1390 2.08333333333333e+00
+1307 1305 -8.33333333333333e+00
+1307 1569 4.16666666666667e+00
+1307 1591 -2.08333333333333e+00
+1307 1590 4.16666666666667e+00
+1307 1603 -4.16666666666667e+00
+1307 1594 4.16666666666667e+00
+1307 1587 8.33333333333333e+00
+1307 1593 -8.33333333333333e+00
+1307 1592 -6.25000000000000e+00
+1307 1443 2.08333333333333e+00
+1307 1602 -4.16666666666667e+00
+1307 1553 -6.25000000000000e+00
+1307 1596 -2.08333333333333e+00
+1307 1589 -3.75000000000000e+01
+1307 1552 4.16666666666667e+00
+1307 1306 -8.33333333333333e+00
+1307 1588 8.33333333333333e+00
+1307 1551 -2.08333333333333e+00
+1307 1389 2.08333333333333e+00
+1308 1308 6.25000000000000e+01
+1308 1610 -4.16666666666667e+00
+1308 1309 -8.33333333333333e+00
+1308 1609 8.33333333333333e+00
+1308 1394 4.16666666666667e+00
+1308 1393 -2.08333333333333e+00
+1308 1392 -6.25000000000000e+00
+1308 1608 -1.25000000000000e+01
+1308 1310 -8.33333333333333e+00
+1308 1469 4.16666666666667e+00
+1308 1468 -2.08333333333333e+00
+1308 1618 4.16666666666667e+00
+1308 1619 4.16666666666667e+00
+1308 1467 -6.25000000000000e+00
+1308 1613 4.16666666666667e+00
+1308 1622 -4.16666666666667e+00
+1308 1615 2.08333333333333e+00
+1308 1621 -4.16666666666667e+00
+1308 1616 -4.16666666666667e+00
+1308 1607 4.16666666666667e+00
+1308 1606 4.16666666666667e+00
+1308 1612 -8.33333333333333e+00
+1308 1605 -1.87500000000000e+01
+1308 2353 4.16666666666667e+00
+1308 2291 -4.16666666666667e+00
+1308 2290 2.08333333333333e+00
+1308 2354 4.16666666666667e+00
+1308 2352 -1.87500000000000e+01
+1309 1309 6.25000000000000e+01
+1309 1308 -8.33333333333333e+00
+1309 1608 8.33333333333333e+00
+1309 1394 4.16666666666667e+00
+1309 1310 -8.33333333333333e+00
+1309 1610 8.33333333333333e+00
+1309 1393 -6.25000000000000e+00
+1309 1609 -3.75000000000000e+01
+1309 1392 -2.08333333333333e+00
+1309 1469 4.16666666666667e+00
+1309 1619 -8.33333333333333e+00
+1309 1468 -6.25000000000000e+00
+1309 1467 -2.08333333333333e+00
+1309 1617 4.16666666666667e+00
+1309 1614 2.08333333333333e+00
+1309 1620 -4.16666666666667e+00
+1309 1616 2.08333333333333e+00
+1309 1622 -4.16666666666667e+00
+1309 1607 -2.08333333333333e+00
+1309 1613 4.16666666666667e+00
+1309 1606 -6.25000000000000e+00
+1309 1605 4.16666666666667e+00
+1309 1611 -8.33333333333333e+00
+1309 2354 -2.08333333333333e+00
+1309 2352 4.16666666666667e+00
+1309 2289 2.08333333333333e+00
+1309 2291 2.08333333333333e+00
+1309 2353 -6.25000000000000e+00
+1310 1310 6.25000000000000e+01
+1310 1608 -4.16666666666667e+00
+1310 1394 -1.87500000000000e+01
+1310 1610 -1.25000000000000e+01
+1310 1393 4.16666666666667e+00
+1310 1309 -8.33333333333333e+00
+1310 1609 8.33333333333333e+00
+1310 1392 4.16666666666667e+00
+1310 1617 4.16666666666667e+00
+1310 1469 -1.87500000000000e+01
+1310 1468 4.16666666666667e+00
+1310 1618 -8.33333333333333e+00
+1310 1308 -8.33333333333333e+00
+1310 1467 4.16666666666667e+00
+1310 1611 4.16666666666667e+00
+1310 1620 -4.16666666666667e+00
+1310 1615 2.08333333333333e+00
+1310 1621 -4.16666666666667e+00
+1310 1614 -4.16666666666667e+00
+1310 1607 -6.25000000000000e+00
+1310 1606 -2.08333333333333e+00
+1310 1612 4.16666666666667e+00
+1310 1605 4.16666666666667e+00
+1310 2290 2.08333333333333e+00
+1310 2353 -2.08333333333333e+00
+1310 2289 -4.16666666666667e+00
+1310 2354 -6.25000000000000e+00
+1310 2352 4.16666666666667e+00
+1311 1311 6.25000000000000e+01
+1311 1631 4.16666666666667e+00
+1311 1630 -8.33333333333333e+00
+1311 1628 4.16666666666667e+00
+1311 1480 2.08333333333333e+00
+1311 1626 -1.87500000000000e+01
+1311 1556 4.16666666666667e+00
+1311 1555 -2.08333333333333e+00
+1311 1396 2.08333333333333e+00
+1311 1554 -6.25000000000000e+00
+1311 1625 -4.16666666666667e+00
+1311 1313 -8.33333333333333e+00
+1311 1633 -2.08333333333333e+00
+1311 1640 -4.16666666666667e+00
+1311 1637 4.16666666666667e+00
+1311 1639 -4.16666666666667e+00
+1311 1636 4.16666666666667e+00
+1311 1634 4.16666666666667e+00
+1311 1481 -4.16666666666667e+00
+1311 1632 -6.25000000000000e+00
+1311 1607 4.16666666666667e+00
+1311 1397 -4.16666666666667e+00
+1311 1606 4.16666666666667e+00
+1311 1312 -8.33333333333333e+00
+1311 1624 8.33333333333333e+00
+1311 1605 -1.87500000000000e+01
+1311 1627 4.16666666666667e+00
+1311 1623 -1.25000000000000e+01
+1312 1312 6.25000000000000e+01
+1312 1631 4.16666666666667e+00
+1312 1626 4.16666666666667e+00
+1312 1629 -8.33333333333333e+00
+1312 1627 -6.25000000000000e+00
+1312 1479 2.08333333333333e+00
+1312 1556 4.16666666666667e+00
+1312 1313 -8.33333333333333e+00
+1312 1555 -6.25000000000000e+00
+1312 1554 -2.08333333333333e+00
+1312 1395 2.08333333333333e+00
+1312 1632 -2.08333333333333e+00
+1312 1634 4.16666666666667e+00
+1312 1625 8.33333333333333e+00
+1312 1637 -8.33333333333333e+00
+1312 1638 -4.16666666666667e+00
+1312 1635 4.16666666666667e+00
+1312 1481 2.08333333333333e+00
+1312 1640 -4.16666666666667e+00
+1312 1633 -6.25000000000000e+00
+1312 1607 -2.08333333333333e+00
+1312 1397 2.08333333333333e+00
+1312 1606 -6.25000000000000e+00
+1312 1628 -2.08333333333333e+00
+1312 1624 -3.75000000000000e+01
+1312 1605 4.16666666666667e+00
+1312 1311 -8.33333333333333e+00
+1312 1623 8.33333333333333e+00
+1313 1313 6.25000000000000e+01
+1313 1630 4.16666666666667e+00
+1313 1629 4.16666666666667e+00
+1313 1628 -6.25000000000000e+00
+1313 1626 4.16666666666667e+00
+1313 1556 -1.87500000000000e+01
+1313 1555 4.16666666666667e+00
+1313 1312 -8.33333333333333e+00
+1313 1554 4.16666666666667e+00
+1313 1623 -4.16666666666667e+00
+1313 1311 -8.33333333333333e+00
+1313 1633 4.16666666666667e+00
+1313 1638 -4.16666666666667e+00
+1313 1635 4.16666666666667e+00
+1313 1624 8.33333333333333e+00
+1313 1636 -8.33333333333333e+00
+1313 1634 -1.87500000000000e+01
+1313 1480 2.08333333333333e+00
+1313 1639 -4.16666666666667e+00
+1313 1632 4.16666666666667e+00
+1313 1479 -4.16666666666667e+00
+1313 1607 -6.25000000000000e+00
+1313 1627 -2.08333333333333e+00
+1313 1625 -1.25000000000000e+01
+1313 1606 -2.08333333333333e+00
+1313 1396 2.08333333333333e+00
+1313 1605 4.16666666666667e+00
+1313 1395 -4.16666666666667e+00
+1314 1314 1.25000000000000e+02
+1314 1573 -4.16666666666667e+00
+1314 1400 4.16666666666667e+00
+1314 1572 -1.25000000000000e+01
+1314 1646 -4.16666666666667e+00
+1314 1505 4.16666666666667e+00
+1314 1315 -1.66666666666667e+01
+1314 1645 8.33333333333333e+00
+1314 1644 -1.25000000000000e+01
+1314 1610 -4.16666666666667e+00
+1314 1609 8.33333333333333e+00
+1314 1399 4.16666666666667e+00
+1314 1608 -1.25000000000000e+01
+1314 1316 -1.66666666666667e+01
+1314 1652 8.33333333333333e+00
+1314 1651 -4.16666666666667e+00
+1314 1504 4.16666666666667e+00
+1314 1574 8.33333333333333e+00
+1314 1650 -1.25000000000000e+01
+1314 1648 -8.33333333333333e+00
+1314 1643 8.33333333333333e+00
+1314 1655 -8.33333333333333e+00
+1314 1657 -4.16666666666667e+00
+1314 1654 4.16666666666667e+00
+1314 1658 -4.16666666666667e+00
+1314 1642 8.33333333333333e+00
+1314 1649 4.16666666666667e+00
+1314 1641 -3.75000000000000e+01
+1314 2320 4.16666666666667e+00
+1314 2321 -8.33333333333333e+00
+1314 2294 -4.16666666666667e+00
+1314 2357 4.16666666666667e+00
+1314 2386 8.33333333333333e+00
+1314 2356 -8.33333333333333e+00
+1314 2293 -4.16666666666667e+00
+1314 2387 8.33333333333333e+00
+1314 2385 -3.75000000000000e+01
+1315 1315 1.25000000000000e+02
+1315 1572 -4.16666666666667e+00
+1315 1574 8.33333333333333e+00
+1315 1573 -1.25000000000000e+01
+1315 1646 8.33333333333333e+00
+1315 1645 -3.75000000000000e+01
+1315 1314 -1.66666666666667e+01
+1315 1644 8.33333333333333e+00
+1315 1316 -1.66666666666667e+01
+1315 1608 8.33333333333333e+00
+1315 1400 -8.33333333333333e+00
+1315 1610 8.33333333333333e+00
+1315 1609 -3.75000000000000e+01
+1315 1398 4.16666666666667e+00
+1315 1652 8.33333333333333e+00
+1315 1505 -8.33333333333333e+00
+1315 1651 -1.25000000000000e+01
+1315 1650 -4.16666666666667e+00
+1315 1503 4.16666666666667e+00
+1315 1649 4.16666666666667e+00
+1315 1647 -8.33333333333333e+00
+1315 1643 -4.16666666666667e+00
+1315 1658 -4.16666666666667e+00
+1315 1655 4.16666666666667e+00
+1315 1656 -4.16666666666667e+00
+1315 1653 4.16666666666667e+00
+1315 1642 -1.25000000000000e+01
+1315 1641 8.33333333333333e+00
+1315 2321 4.16666666666667e+00
+1315 2387 -4.16666666666667e+00
+1315 2294 -4.16666666666667e+00
+1315 2357 4.16666666666667e+00
+1315 2385 8.33333333333333e+00
+1315 2355 -8.33333333333333e+00
+1315 2292 -4.16666666666667e+00
+1315 2319 4.16666666666667e+00
+1315 2386 -1.25000000000000e+01
+1316 1316 1.25000000000000e+02
+1316 1574 -3.75000000000000e+01
+1316 1573 8.33333333333333e+00
+1316 1398 4.16666666666667e+00
+1316 1646 -1.25000000000000e+01
+1316 1645 8.33333333333333e+00
+1316 1644 -4.16666666666667e+00
+1316 1503 4.16666666666667e+00
+1316 1315 -1.66666666666667e+01
+1316 1608 -4.16666666666667e+00
+1316 1610 -1.25000000000000e+01
+1316 1399 -8.33333333333333e+00
+1316 1609 8.33333333333333e+00
+1316 1572 8.33333333333333e+00
+1316 1652 -3.75000000000000e+01
+1316 1651 8.33333333333333e+00
+1316 1504 -8.33333333333333e+00
+1316 1314 -1.66666666666667e+01
+1316 1650 8.33333333333333e+00
+1316 1648 4.16666666666667e+00
+1316 1642 -4.16666666666667e+00
+1316 1657 -4.16666666666667e+00
+1316 1654 4.16666666666667e+00
+1316 1641 8.33333333333333e+00
+1316 1653 -8.33333333333333e+00
+1316 1656 -4.16666666666667e+00
+1316 1647 4.16666666666667e+00
+1316 1643 -1.25000000000000e+01
+1316 2320 4.16666666666667e+00
+1316 2319 -8.33333333333333e+00
+1316 2386 -4.16666666666667e+00
+1316 2293 -4.16666666666667e+00
+1316 2356 4.16666666666667e+00
+1316 2292 -4.16666666666667e+00
+1316 2355 4.16666666666667e+00
+1316 2387 -1.25000000000000e+01
+1316 2385 8.33333333333333e+00
+1317 1317 1.25000000000000e+02
+1317 1663 8.33333333333333e+00
+1317 1662 -1.25000000000000e+01
+1317 1577 -8.33333333333333e+00
+1317 1576 4.16666666666667e+00
+1317 1643 8.33333333333333e+00
+1317 1675 4.16666666666667e+00
+1317 1642 8.33333333333333e+00
+1317 1641 -3.75000000000000e+01
+1317 1676 4.16666666666667e+00
+1317 1588 -4.16666666666667e+00
+1317 1589 8.33333333333333e+00
+1317 1319 -1.66666666666667e+01
+1317 1403 -4.16666666666667e+00
+1317 1587 -1.25000000000000e+01
+1317 1667 4.16666666666667e+00
+1317 1517 -4.16666666666667e+00
+1317 1666 -8.33333333333333e+00
+1317 1559 4.16666666666667e+00
+1317 1660 8.33333333333333e+00
+1317 1318 -1.66666666666667e+01
+1317 1661 8.33333333333333e+00
+1317 1516 -4.16666666666667e+00
+1317 1659 -3.75000000000000e+01
+1317 1558 4.16666666666667e+00
+1317 1402 -4.16666666666667e+00
+1317 1625 -4.16666666666667e+00
+1317 1613 4.16666666666667e+00
+1317 1672 4.16666666666667e+00
+1317 1669 -4.16666666666667e+00
+1317 1612 -8.33333333333333e+00
+1317 1624 8.33333333333333e+00
+1317 1623 -1.25000000000000e+01
+1317 1670 8.33333333333333e+00
+1317 1673 -8.33333333333333e+00
+1317 1668 -1.25000000000000e+01
+1317 1664 -4.16666666666667e+00
+1318 1318 1.25000000000000e+02
+1318 1662 8.33333333333333e+00
+1318 1664 8.33333333333333e+00
+1318 1663 -3.75000000000000e+01
+1318 1575 4.16666666666667e+00
+1318 1643 -4.16666666666667e+00
+1318 1674 4.16666666666667e+00
+1318 1642 -1.25000000000000e+01
+1318 1641 8.33333333333333e+00
+1318 1676 -8.33333333333333e+00
+1318 1587 -4.16666666666667e+00
+1318 1667 4.16666666666667e+00
+1318 1589 8.33333333333333e+00
+1318 1588 -1.25000000000000e+01
+1318 1665 -8.33333333333333e+00
+1318 1661 -4.16666666666667e+00
+1318 1659 8.33333333333333e+00
+1318 1317 -1.66666666666667e+01
+1318 1660 -1.25000000000000e+01
+1318 1515 -4.16666666666667e+00
+1318 1559 -8.33333333333333e+00
+1318 1557 4.16666666666667e+00
+1318 1401 -4.16666666666667e+00
+1318 1625 8.33333333333333e+00
+1318 1319 -1.66666666666667e+01
+1318 1670 8.33333333333333e+00
+1318 1671 4.16666666666667e+00
+1318 1668 -4.16666666666667e+00
+1318 1613 4.16666666666667e+00
+1318 1403 -4.16666666666667e+00
+1318 1624 -3.75000000000000e+01
+1318 1611 -8.33333333333333e+00
+1318 1623 8.33333333333333e+00
+1318 1673 4.16666666666667e+00
+1318 1517 -4.16666666666667e+00
+1318 1669 -1.25000000000000e+01
+1318 1577 4.16666666666667e+00
+1319 1319 1.25000000000000e+02
+1319 1576 4.16666666666667e+00
+1319 1664 -1.25000000000000e+01
+1319 1663 8.33333333333333e+00
+1319 1575 -8.33333333333333e+00
+1319 1642 -4.16666666666667e+00
+1319 1641 8.33333333333333e+00
+1319 1643 -1.25000000000000e+01
+1319 1675 -8.33333333333333e+00
+1319 1674 4.16666666666667e+00
+1319 1666 4.16666666666667e+00
+1319 1587 8.33333333333333e+00
+1319 1317 -1.66666666666667e+01
+1319 1589 -3.75000000000000e+01
+1319 1588 8.33333333333333e+00
+1319 1401 -4.16666666666667e+00
+1319 1665 4.16666666666667e+00
+1319 1515 -4.16666666666667e+00
+1319 1660 -4.16666666666667e+00
+1319 1557 4.16666666666667e+00
+1319 1661 -1.25000000000000e+01
+1319 1659 8.33333333333333e+00
+1319 1558 -8.33333333333333e+00
+1319 1623 -4.16666666666667e+00
+1319 1611 4.16666666666667e+00
+1319 1624 8.33333333333333e+00
+1319 1318 -1.66666666666667e+01
+1319 1669 8.33333333333333e+00
+1319 1625 -1.25000000000000e+01
+1319 1612 4.16666666666667e+00
+1319 1402 -4.16666666666667e+00
+1319 1670 -3.75000000000000e+01
+1319 1662 -4.16666666666667e+00
+1319 1672 4.16666666666667e+00
+1319 1516 -4.16666666666667e+00
+1319 1668 8.33333333333333e+00
+1319 1671 -8.33333333333333e+00
+1320 1320 3.75000000000000e+01
+1320 1429 2.08333333333333e+00
+1320 1687 -4.16666666666667e+00
+1320 1679 -2.08333333333333e+00
+1320 1321 -4.16666666666667e+00
+1320 1678 4.16666666666667e+00
+1320 1408 2.08333333333333e+00
+1320 1677 -6.25000000000000e+00
+1320 1694 -4.16666666666667e+00
+1320 1685 4.16666666666667e+00
+1320 1430 2.08333333333333e+00
+1320 1691 -4.16666666666667e+00
+1320 1690 2.08333333333333e+00
+1320 1693 -4.16666666666667e+00
+1320 1428 -1.25000000000000e+01
+1320 1322 -4.16666666666667e+00
+1320 1682 4.16666666666667e+00
+1320 1409 2.08333333333333e+00
+1320 1681 -2.08333333333333e+00
+1320 1684 4.16666666666667e+00
+1320 1688 2.08333333333333e+00
+1320 1680 -6.25000000000000e+00
+1320 1407 -1.25000000000000e+01
+1321 1321 3.33333333333333e+01
+1321 1428 2.08333333333333e+00
+1321 1686 -4.16666666666667e+00
+1321 1679 4.16666666666667e+00
+1321 1678 -1.87500000000000e+01
+1321 1320 -4.16666666666667e+00
+1321 1677 4.16666666666667e+00
+1321 1407 2.08333333333333e+00
+1321 1691 2.08333333333333e+00
+1321 1694 -4.16666666666667e+00
+1321 1429 -4.16666666666667e+00
+1321 1689 2.08333333333333e+00
+1321 1692 -4.16666666666667e+00
+1321 1682 4.16666666666667e+00
+1321 1685 -8.33333333333333e+00
+1321 1688 2.08333333333333e+00
+1321 1681 -6.25000000000000e+00
+1321 1408 -4.16666666666667e+00
+1321 1680 -2.08333333333333e+00
+1321 1683 4.16666666666667e+00
+1322 1322 3.33333333333333e+01
+1322 1686 2.08333333333333e+00
+1322 1679 -6.25000000000000e+00
+1322 1678 4.16666666666667e+00
+1322 1677 -2.08333333333333e+00
+1322 1690 2.08333333333333e+00
+1322 1693 -4.16666666666667e+00
+1322 1692 -4.16666666666667e+00
+1322 1683 4.16666666666667e+00
+1322 1430 -4.16666666666667e+00
+1322 1428 2.08333333333333e+00
+1322 1689 -4.16666666666667e+00
+1322 1687 2.08333333333333e+00
+1322 1682 -1.87500000000000e+01
+1322 1409 -4.16666666666667e+00
+1322 1681 4.16666666666667e+00
+1322 1684 -8.33333333333333e+00
+1322 1320 -4.16666666666667e+00
+1322 1680 4.16666666666667e+00
+1322 1407 2.08333333333333e+00
+1323 1323 6.25000000000000e+01
+1323 1705 -4.16666666666667e+00
+1323 1697 4.16666666666667e+00
+1323 1696 4.16666666666667e+00
+1323 1695 -1.87500000000000e+01
+1323 1712 -4.16666666666667e+00
+1323 1711 -4.16666666666667e+00
+1323 1703 -8.33333333333333e+00
+1323 1702 4.16666666666667e+00
+1323 1592 4.16666666666667e+00
+1323 1325 -8.33333333333333e+00
+1323 1700 8.33333333333333e+00
+1323 1708 4.16666666666667e+00
+1323 1699 -4.16666666666667e+00
+1323 1412 -2.08333333333333e+00
+1323 1562 2.08333333333333e+00
+1323 1411 4.16666666666667e+00
+1323 1561 -4.16666666666667e+00
+1323 1410 -6.25000000000000e+00
+1323 1698 -1.25000000000000e+01
+1323 1448 -2.08333333333333e+00
+1323 1709 4.16666666666667e+00
+1323 1324 -8.33333333333333e+00
+1323 1447 4.16666666666667e+00
+1323 1591 4.16666666666667e+00
+1323 1706 2.08333333333333e+00
+1323 1446 -6.25000000000000e+00
+1323 1590 -1.87500000000000e+01
+1324 1324 6.25000000000000e+01
+1324 1704 -4.16666666666667e+00
+1324 1697 -2.08333333333333e+00
+1324 1696 -6.25000000000000e+00
+1324 1695 4.16666666666667e+00
+1324 1712 -4.16666666666667e+00
+1324 1703 4.16666666666667e+00
+1324 1710 -4.16666666666667e+00
+1324 1701 4.16666666666667e+00
+1324 1592 -2.08333333333333e+00
+1324 1562 2.08333333333333e+00
+1324 1707 4.16666666666667e+00
+1324 1698 -4.16666666666667e+00
+1324 1412 4.16666666666667e+00
+1324 1325 -8.33333333333333e+00
+1324 1700 8.33333333333333e+00
+1324 1411 -1.87500000000000e+01
+1324 1699 -1.25000000000000e+01
+1324 1410 4.16666666666667e+00
+1324 1560 -4.16666666666667e+00
+1324 1448 4.16666666666667e+00
+1324 1709 -8.33333333333333e+00
+1324 1706 2.08333333333333e+00
+1324 1447 -1.87500000000000e+01
+1324 1591 -6.25000000000000e+00
+1324 1323 -8.33333333333333e+00
+1324 1446 4.16666666666667e+00
+1324 1590 4.16666666666667e+00
+1325 1325 6.25000000000000e+01
+1325 1705 2.08333333333333e+00
+1325 1697 -6.25000000000000e+00
+1325 1696 -2.08333333333333e+00
+1325 1695 4.16666666666667e+00
+1325 1710 -4.16666666666667e+00
+1325 1711 -4.16666666666667e+00
+1325 1702 4.16666666666667e+00
+1325 1701 -8.33333333333333e+00
+1325 1591 -2.08333333333333e+00
+1325 1561 2.08333333333333e+00
+1325 1590 4.16666666666667e+00
+1325 1323 -8.33333333333333e+00
+1325 1698 8.33333333333333e+00
+1325 1412 -6.25000000000000e+00
+1325 1700 -3.75000000000000e+01
+1325 1411 4.16666666666667e+00
+1325 1324 -8.33333333333333e+00
+1325 1699 8.33333333333333e+00
+1325 1410 -2.08333333333333e+00
+1325 1560 2.08333333333333e+00
+1325 1704 2.08333333333333e+00
+1325 1448 -6.25000000000000e+00
+1325 1592 -6.25000000000000e+00
+1325 1447 4.16666666666667e+00
+1325 1708 -8.33333333333333e+00
+1325 1446 -2.08333333333333e+00
+1325 1707 4.16666666666667e+00
+1326 1326 6.25000000000000e+01
+1326 1726 4.16666666666667e+00
+1326 1727 4.16666666666667e+00
+1326 1723 4.16666666666667e+00
+1326 1722 -6.25000000000000e+00
+1326 1328 -8.33333333333333e+00
+1326 1697 4.16666666666667e+00
+1326 1696 4.16666666666667e+00
+1326 1695 -1.87500000000000e+01
+1326 1714 -4.16666666666667e+00
+1326 1327 -8.33333333333333e+00
+1326 1718 4.16666666666667e+00
+1326 1729 -4.16666666666667e+00
+1326 1720 4.16666666666667e+00
+1326 1715 8.33333333333333e+00
+1326 1721 -8.33333333333333e+00
+1326 1463 2.08333333333333e+00
+1326 1730 -4.16666666666667e+00
+1326 1717 4.16666666666667e+00
+1326 1462 -4.16666666666667e+00
+1326 1716 -1.87500000000000e+01
+1326 1679 -2.08333333333333e+00
+1326 1415 2.08333333333333e+00
+1326 1678 4.16666666666667e+00
+1326 1414 -4.16666666666667e+00
+1326 1677 -6.25000000000000e+00
+1326 1724 -2.08333333333333e+00
+1326 1713 -1.25000000000000e+01
+1327 1327 6.25000000000000e+01
+1327 1725 4.16666666666667e+00
+1327 1727 -8.33333333333333e+00
+1327 1463 2.08333333333333e+00
+1327 1723 -1.87500000000000e+01
+1327 1722 4.16666666666667e+00
+1327 1697 -2.08333333333333e+00
+1327 1415 2.08333333333333e+00
+1327 1696 -6.25000000000000e+00
+1327 1695 4.16666666666667e+00
+1327 1713 -4.16666666666667e+00
+1327 1718 -2.08333333333333e+00
+1327 1326 -8.33333333333333e+00
+1327 1728 -4.16666666666667e+00
+1327 1719 4.16666666666667e+00
+1327 1730 -4.16666666666667e+00
+1327 1721 4.16666666666667e+00
+1327 1717 -6.25000000000000e+00
+1327 1716 4.16666666666667e+00
+1327 1461 -4.16666666666667e+00
+1327 1679 4.16666666666667e+00
+1327 1328 -8.33333333333333e+00
+1327 1715 8.33333333333333e+00
+1327 1678 -1.87500000000000e+01
+1327 1724 4.16666666666667e+00
+1327 1714 -1.25000000000000e+01
+1327 1677 4.16666666666667e+00
+1327 1413 -4.16666666666667e+00
+1328 1328 6.25000000000000e+01
+1328 1723 4.16666666666667e+00
+1328 1726 -8.33333333333333e+00
+1328 1725 4.16666666666667e+00
+1328 1724 -6.25000000000000e+00
+1328 1462 2.08333333333333e+00
+1328 1697 -6.25000000000000e+00
+1328 1696 -2.08333333333333e+00
+1328 1414 2.08333333333333e+00
+1328 1326 -8.33333333333333e+00
+1328 1695 4.16666666666667e+00
+1328 1717 -2.08333333333333e+00
+1328 1716 4.16666666666667e+00
+1328 1729 -4.16666666666667e+00
+1328 1720 4.16666666666667e+00
+1328 1713 8.33333333333333e+00
+1328 1719 -8.33333333333333e+00
+1328 1718 -6.25000000000000e+00
+1328 1461 2.08333333333333e+00
+1328 1728 -4.16666666666667e+00
+1328 1679 -6.25000000000000e+00
+1328 1722 -2.08333333333333e+00
+1328 1715 -3.75000000000000e+01
+1328 1678 4.16666666666667e+00
+1328 1327 -8.33333333333333e+00
+1328 1714 8.33333333333333e+00
+1328 1677 -2.08333333333333e+00
+1328 1413 2.08333333333333e+00
+1329 1329 6.25000000000000e+01
+1329 1748 -4.16666666666667e+00
+1329 1741 2.08333333333333e+00
+1329 1747 -4.16666666666667e+00
+1329 1742 -4.16666666666667e+00
+1329 1733 4.16666666666667e+00
+1329 1732 4.16666666666667e+00
+1329 1738 -8.33333333333333e+00
+1329 1731 -1.87500000000000e+01
+1329 1745 4.16666666666667e+00
+1329 1736 -4.16666666666667e+00
+1329 1330 -8.33333333333333e+00
+1329 1735 8.33333333333333e+00
+1329 1627 4.16666666666667e+00
+1329 1418 4.16666666666667e+00
+1329 1565 -4.16666666666667e+00
+1329 1417 -2.08333333333333e+00
+1329 1564 2.08333333333333e+00
+1329 1416 -6.25000000000000e+00
+1329 1734 -1.25000000000000e+01
+1329 1331 -8.33333333333333e+00
+1329 1484 4.16666666666667e+00
+1329 1628 4.16666666666667e+00
+1329 1483 -2.08333333333333e+00
+1329 1744 4.16666666666667e+00
+1329 1739 4.16666666666667e+00
+1329 1482 -6.25000000000000e+00
+1329 1626 -1.87500000000000e+01
+1330 1330 6.25000000000000e+01
+1330 1746 -4.16666666666667e+00
+1330 1742 2.08333333333333e+00
+1330 1748 -4.16666666666667e+00
+1330 1733 -2.08333333333333e+00
+1330 1739 4.16666666666667e+00
+1330 1732 -6.25000000000000e+00
+1330 1731 4.16666666666667e+00
+1330 1737 -8.33333333333333e+00
+1330 1565 2.08333333333333e+00
+1330 1628 -2.08333333333333e+00
+1330 1329 -8.33333333333333e+00
+1330 1734 8.33333333333333e+00
+1330 1626 4.16666666666667e+00
+1330 1418 4.16666666666667e+00
+1330 1331 -8.33333333333333e+00
+1330 1736 8.33333333333333e+00
+1330 1417 -6.25000000000000e+00
+1330 1735 -3.75000000000000e+01
+1330 1416 -2.08333333333333e+00
+1330 1563 2.08333333333333e+00
+1330 1484 4.16666666666667e+00
+1330 1745 -8.33333333333333e+00
+1330 1740 2.08333333333333e+00
+1330 1483 -6.25000000000000e+00
+1330 1627 -6.25000000000000e+00
+1330 1482 -2.08333333333333e+00
+1330 1743 4.16666666666667e+00
+1331 1331 6.25000000000000e+01
+1331 1746 -4.16666666666667e+00
+1331 1741 2.08333333333333e+00
+1331 1747 -4.16666666666667e+00
+1331 1740 -4.16666666666667e+00
+1331 1733 -6.25000000000000e+00
+1331 1732 -2.08333333333333e+00
+1331 1738 4.16666666666667e+00
+1331 1731 4.16666666666667e+00
+1331 1743 4.16666666666667e+00
+1331 1734 -4.16666666666667e+00
+1331 1564 2.08333333333333e+00
+1331 1627 -2.08333333333333e+00
+1331 1418 -1.87500000000000e+01
+1331 1736 -1.25000000000000e+01
+1331 1417 4.16666666666667e+00
+1331 1330 -8.33333333333333e+00
+1331 1735 8.33333333333333e+00
+1331 1416 4.16666666666667e+00
+1331 1563 -4.16666666666667e+00
+1331 1737 4.16666666666667e+00
+1331 1484 -1.87500000000000e+01
+1331 1628 -6.25000000000000e+00
+1331 1483 4.16666666666667e+00
+1331 1744 -8.33333333333333e+00
+1331 1329 -8.33333333333333e+00
+1331 1482 4.16666666666667e+00
+1331 1626 4.16666666666667e+00
+1332 1332 6.25000000000000e+01
+1332 1757 4.16666666666667e+00
+1332 1756 -8.33333333333333e+00
+1332 1754 4.16666666666667e+00
+1332 1498 2.08333333333333e+00
+1332 1752 -1.87500000000000e+01
+1332 1682 4.16666666666667e+00
+1332 1681 -2.08333333333333e+00
+1332 1420 2.08333333333333e+00
+1332 1680 -6.25000000000000e+00
+1332 1751 -4.16666666666667e+00
+1332 1334 -8.33333333333333e+00
+1332 1759 -2.08333333333333e+00
+1332 1766 -4.16666666666667e+00
+1332 1763 4.16666666666667e+00
+1332 1765 -4.16666666666667e+00
+1332 1762 4.16666666666667e+00
+1332 1760 4.16666666666667e+00
+1332 1499 -4.16666666666667e+00
+1332 1758 -6.25000000000000e+00
+1332 1733 4.16666666666667e+00
+1332 1421 -4.16666666666667e+00
+1332 1732 4.16666666666667e+00
+1332 1333 -8.33333333333333e+00
+1332 1750 8.33333333333333e+00
+1332 1731 -1.87500000000000e+01
+1332 1753 4.16666666666667e+00
+1332 1749 -1.25000000000000e+01
+1333 1333 6.25000000000000e+01
+1333 1757 4.16666666666667e+00
+1333 1752 4.16666666666667e+00
+1333 1755 -8.33333333333333e+00
+1333 1753 -6.25000000000000e+00
+1333 1497 2.08333333333333e+00
+1333 1682 4.16666666666667e+00
+1333 1334 -8.33333333333333e+00
+1333 1681 -6.25000000000000e+00
+1333 1680 -2.08333333333333e+00
+1333 1419 2.08333333333333e+00
+1333 1758 -2.08333333333333e+00
+1333 1760 4.16666666666667e+00
+1333 1751 8.33333333333333e+00
+1333 1763 -8.33333333333333e+00
+1333 1764 -4.16666666666667e+00
+1333 1761 4.16666666666667e+00
+1333 1499 2.08333333333333e+00
+1333 1766 -4.16666666666667e+00
+1333 1759 -6.25000000000000e+00
+1333 1733 -2.08333333333333e+00
+1333 1421 2.08333333333333e+00
+1333 1732 -6.25000000000000e+00
+1333 1754 -2.08333333333333e+00
+1333 1750 -3.75000000000000e+01
+1333 1731 4.16666666666667e+00
+1333 1332 -8.33333333333333e+00
+1333 1749 8.33333333333333e+00
+1334 1334 6.25000000000000e+01
+1334 1756 4.16666666666667e+00
+1334 1755 4.16666666666667e+00
+1334 1754 -6.25000000000000e+00
+1334 1752 4.16666666666667e+00
+1334 1682 -1.87500000000000e+01
+1334 1681 4.16666666666667e+00
+1334 1333 -8.33333333333333e+00
+1334 1680 4.16666666666667e+00
+1334 1749 -4.16666666666667e+00
+1334 1332 -8.33333333333333e+00
+1334 1759 4.16666666666667e+00
+1334 1764 -4.16666666666667e+00
+1334 1761 4.16666666666667e+00
+1334 1750 8.33333333333333e+00
+1334 1762 -8.33333333333333e+00
+1334 1760 -1.87500000000000e+01
+1334 1498 2.08333333333333e+00
+1334 1765 -4.16666666666667e+00
+1334 1758 4.16666666666667e+00
+1334 1497 -4.16666666666667e+00
+1334 1733 -6.25000000000000e+00
+1334 1753 -2.08333333333333e+00
+1334 1751 -1.25000000000000e+01
+1334 1732 -2.08333333333333e+00
+1334 1420 2.08333333333333e+00
+1334 1731 4.16666666666667e+00
+1334 1419 -4.16666666666667e+00
+1335 1335 1.25000000000000e+02
+1335 1774 -8.33333333333333e+00
+1335 1769 8.33333333333333e+00
+1335 1781 -8.33333333333333e+00
+1335 1783 -4.16666666666667e+00
+1335 1780 4.16666666666667e+00
+1335 1784 -4.16666666666667e+00
+1335 1768 8.33333333333333e+00
+1335 1767 -3.75000000000000e+01
+1335 1700 8.33333333333333e+00
+1335 1594 4.16666666666667e+00
+1335 1699 -4.16666666666667e+00
+1335 1595 -8.33333333333333e+00
+1335 1424 4.16666666666667e+00
+1335 1698 -1.25000000000000e+01
+1335 1772 -4.16666666666667e+00
+1335 1520 4.16666666666667e+00
+1335 1336 -1.66666666666667e+01
+1335 1771 8.33333333333333e+00
+1335 1770 -1.25000000000000e+01
+1335 1736 -4.16666666666667e+00
+1335 1735 8.33333333333333e+00
+1335 1568 -4.16666666666667e+00
+1335 1631 4.16666666666667e+00
+1335 1660 8.33333333333333e+00
+1335 1630 -8.33333333333333e+00
+1335 1423 4.16666666666667e+00
+1335 1567 -4.16666666666667e+00
+1335 1734 -1.25000000000000e+01
+1335 1337 -1.66666666666667e+01
+1335 1778 8.33333333333333e+00
+1335 1661 8.33333333333333e+00
+1335 1777 -4.16666666666667e+00
+1335 1519 4.16666666666667e+00
+1335 1775 4.16666666666667e+00
+1335 1776 -1.25000000000000e+01
+1335 1659 -3.75000000000000e+01
+1336 1336 1.25000000000000e+02
+1336 1773 -8.33333333333333e+00
+1336 1769 -4.16666666666667e+00
+1336 1784 -4.16666666666667e+00
+1336 1781 4.16666666666667e+00
+1336 1782 -4.16666666666667e+00
+1336 1779 4.16666666666667e+00
+1336 1768 -1.25000000000000e+01
+1336 1767 8.33333333333333e+00
+1336 1593 4.16666666666667e+00
+1336 1698 -4.16666666666667e+00
+1336 1595 4.16666666666667e+00
+1336 1700 8.33333333333333e+00
+1336 1699 -1.25000000000000e+01
+1336 1772 8.33333333333333e+00
+1336 1771 -3.75000000000000e+01
+1336 1335 -1.66666666666667e+01
+1336 1770 8.33333333333333e+00
+1336 1661 -4.16666666666667e+00
+1336 1337 -1.66666666666667e+01
+1336 1568 -4.16666666666667e+00
+1336 1631 4.16666666666667e+00
+1336 1734 8.33333333333333e+00
+1336 1659 8.33333333333333e+00
+1336 1629 -8.33333333333333e+00
+1336 1424 -8.33333333333333e+00
+1336 1736 8.33333333333333e+00
+1336 1735 -3.75000000000000e+01
+1336 1422 4.16666666666667e+00
+1336 1566 -4.16666666666667e+00
+1336 1778 8.33333333333333e+00
+1336 1520 -8.33333333333333e+00
+1336 1775 4.16666666666667e+00
+1336 1777 -1.25000000000000e+01
+1336 1660 -1.25000000000000e+01
+1336 1776 -4.16666666666667e+00
+1336 1518 4.16666666666667e+00
+1337 1337 1.25000000000000e+02
+1337 1774 4.16666666666667e+00
+1337 1768 -4.16666666666667e+00
+1337 1783 -4.16666666666667e+00
+1337 1780 4.16666666666667e+00
+1337 1767 8.33333333333333e+00
+1337 1779 -8.33333333333333e+00
+1337 1782 -4.16666666666667e+00
+1337 1769 -1.25000000000000e+01
+1337 1698 8.33333333333333e+00
+1337 1594 4.16666666666667e+00
+1337 1593 -8.33333333333333e+00
+1337 1700 -3.75000000000000e+01
+1337 1699 8.33333333333333e+00
+1337 1422 4.16666666666667e+00
+1337 1772 -1.25000000000000e+01
+1337 1771 8.33333333333333e+00
+1337 1770 -4.16666666666667e+00
+1337 1518 4.16666666666667e+00
+1337 1660 -4.16666666666667e+00
+1337 1336 -1.66666666666667e+01
+1337 1734 -4.16666666666667e+00
+1337 1567 -4.16666666666667e+00
+1337 1630 4.16666666666667e+00
+1337 1566 -4.16666666666667e+00
+1337 1629 4.16666666666667e+00
+1337 1736 -1.25000000000000e+01
+1337 1423 -8.33333333333333e+00
+1337 1735 8.33333333333333e+00
+1337 1773 4.16666666666667e+00
+1337 1778 -3.75000000000000e+01
+1337 1661 -1.25000000000000e+01
+1337 1777 8.33333333333333e+00
+1337 1519 -8.33333333333333e+00
+1337 1335 -1.66666666666667e+01
+1337 1776 8.33333333333333e+00
+1337 1659 8.33333333333333e+00
+1338 1338 1.25000000000000e+02
+1338 1789 8.33333333333333e+00
+1338 1788 -1.25000000000000e+01
+1338 1703 -8.33333333333333e+00
+1338 1702 4.16666666666667e+00
+1338 1769 8.33333333333333e+00
+1338 1801 4.16666666666667e+00
+1338 1768 8.33333333333333e+00
+1338 1767 -3.75000000000000e+01
+1338 1802 4.16666666666667e+00
+1338 1714 -4.16666666666667e+00
+1338 1715 8.33333333333333e+00
+1338 1340 -1.66666666666667e+01
+1338 1427 -4.16666666666667e+00
+1338 1713 -1.25000000000000e+01
+1338 1793 4.16666666666667e+00
+1338 1541 -4.16666666666667e+00
+1338 1792 -8.33333333333333e+00
+1338 1685 4.16666666666667e+00
+1338 1786 8.33333333333333e+00
+1338 1339 -1.66666666666667e+01
+1338 1787 8.33333333333333e+00
+1338 1540 -4.16666666666667e+00
+1338 1785 -3.75000000000000e+01
+1338 1684 4.16666666666667e+00
+1338 1426 -4.16666666666667e+00
+1338 1751 -4.16666666666667e+00
+1338 1739 4.16666666666667e+00
+1338 1798 4.16666666666667e+00
+1338 1795 -4.16666666666667e+00
+1338 1738 -8.33333333333333e+00
+1338 1750 8.33333333333333e+00
+1338 1749 -1.25000000000000e+01
+1338 1796 8.33333333333333e+00
+1338 1799 -8.33333333333333e+00
+1338 1794 -1.25000000000000e+01
+1338 1790 -4.16666666666667e+00
+1339 1339 1.25000000000000e+02
+1339 1788 8.33333333333333e+00
+1339 1790 8.33333333333333e+00
+1339 1789 -3.75000000000000e+01
+1339 1701 4.16666666666667e+00
+1339 1769 -4.16666666666667e+00
+1339 1800 4.16666666666667e+00
+1339 1768 -1.25000000000000e+01
+1339 1767 8.33333333333333e+00
+1339 1802 -8.33333333333333e+00
+1339 1713 -4.16666666666667e+00
+1339 1793 4.16666666666667e+00
+1339 1715 8.33333333333333e+00
+1339 1714 -1.25000000000000e+01
+1339 1791 -8.33333333333333e+00
+1339 1787 -4.16666666666667e+00
+1339 1785 8.33333333333333e+00
+1339 1338 -1.66666666666667e+01
+1339 1786 -1.25000000000000e+01
+1339 1539 -4.16666666666667e+00
+1339 1685 -8.33333333333333e+00
+1339 1683 4.16666666666667e+00
+1339 1425 -4.16666666666667e+00
+1339 1751 8.33333333333333e+00
+1339 1340 -1.66666666666667e+01
+1339 1796 8.33333333333333e+00
+1339 1797 4.16666666666667e+00
+1339 1794 -4.16666666666667e+00
+1339 1739 4.16666666666667e+00
+1339 1427 -4.16666666666667e+00
+1339 1750 -3.75000000000000e+01
+1339 1737 -8.33333333333333e+00
+1339 1749 8.33333333333333e+00
+1339 1799 4.16666666666667e+00
+1339 1541 -4.16666666666667e+00
+1339 1795 -1.25000000000000e+01
+1339 1703 4.16666666666667e+00
+1340 1340 1.25000000000000e+02
+1340 1702 4.16666666666667e+00
+1340 1790 -1.25000000000000e+01
+1340 1789 8.33333333333333e+00
+1340 1701 -8.33333333333333e+00
+1340 1768 -4.16666666666667e+00
+1340 1767 8.33333333333333e+00
+1340 1769 -1.25000000000000e+01
+1340 1801 -8.33333333333333e+00
+1340 1800 4.16666666666667e+00
+1340 1792 4.16666666666667e+00
+1340 1713 8.33333333333333e+00
+1340 1338 -1.66666666666667e+01
+1340 1715 -3.75000000000000e+01
+1340 1714 8.33333333333333e+00
+1340 1425 -4.16666666666667e+00
+1340 1791 4.16666666666667e+00
+1340 1539 -4.16666666666667e+00
+1340 1786 -4.16666666666667e+00
+1340 1683 4.16666666666667e+00
+1340 1787 -1.25000000000000e+01
+1340 1785 8.33333333333333e+00
+1340 1684 -8.33333333333333e+00
+1340 1749 -4.16666666666667e+00
+1340 1737 4.16666666666667e+00
+1340 1750 8.33333333333333e+00
+1340 1339 -1.66666666666667e+01
+1340 1795 8.33333333333333e+00
+1340 1751 -1.25000000000000e+01
+1340 1738 4.16666666666667e+00
+1340 1426 -4.16666666666667e+00
+1340 1796 -3.75000000000000e+01
+1340 1788 -4.16666666666667e+00
+1340 1798 4.16666666666667e+00
+1340 1540 -4.16666666666667e+00
+1340 1794 8.33333333333333e+00
+1340 1797 -8.33333333333333e+00
+1341 1341 2.50000000000000e+01
+1341 1598 -2.08333333333333e+00
+1341 1807 2.08333333333333e+00
+1341 1804 -2.08333333333333e+00
+1341 1451 2.08333333333333e+00
+1341 1808 -4.16666666666667e+00
+1341 1450 2.08333333333333e+00
+1341 1342 -4.16666666666667e+00
+1341 1597 4.16666666666667e+00
+1341 1449 -6.25000000000000e+00
+1341 1596 -6.25000000000000e+00
+1341 1343 -4.16666666666667e+00
+1341 1436 2.08333333333333e+00
+1341 1805 4.16666666666667e+00
+1341 1435 2.08333333333333e+00
+1341 1579 -4.16666666666667e+00
+1341 1580 2.08333333333333e+00
+1341 1434 -6.25000000000000e+00
+1341 1803 -6.25000000000000e+00
+1342 1342 2.91666666666667e+01
+1342 1598 4.16666666666667e+00
+1342 1805 4.16666666666667e+00
+1342 1806 2.08333333333333e+00
+1342 1803 -2.08333333333333e+00
+1342 1451 -2.08333333333333e+00
+1342 1808 2.08333333333333e+00
+1342 1450 -2.08333333333333e+00
+1342 1597 -1.87500000000000e+01
+1342 1449 2.08333333333333e+00
+1342 1341 -4.16666666666667e+00
+1342 1596 4.16666666666667e+00
+1342 1436 -2.08333333333333e+00
+1342 1580 2.08333333333333e+00
+1342 1343 -8.33333333333333e+00
+1342 1435 -2.08333333333333e+00
+1342 1804 -6.25000000000000e+00
+1342 1434 2.08333333333333e+00
+1342 1578 -4.16666666666667e+00
+1343 1343 2.91666666666667e+01
+1343 1596 -2.08333333333333e+00
+1343 1342 -8.33333333333333e+00
+1343 1597 4.16666666666667e+00
+1343 1804 4.16666666666667e+00
+1343 1451 -2.08333333333333e+00
+1343 1598 -6.25000000000000e+00
+1343 1450 -2.08333333333333e+00
+1343 1807 2.08333333333333e+00
+1343 1449 2.08333333333333e+00
+1343 1806 -4.16666666666667e+00
+1343 1578 2.08333333333333e+00
+1343 1436 -2.08333333333333e+00
+1343 1805 -1.87500000000000e+01
+1343 1435 -2.08333333333333e+00
+1343 1579 2.08333333333333e+00
+1343 1341 -4.16666666666667e+00
+1343 1434 2.08333333333333e+00
+1343 1803 4.16666666666667e+00
+1344 1344 6.25000000000000e+01
+1344 1439 4.16666666666667e+00
+1344 1346 -8.33333333333333e+00
+1344 1508 4.16666666666667e+00
+1344 1582 4.16666666666667e+00
+1344 1583 4.16666666666667e+00
+1344 1437 -6.25000000000000e+00
+1344 1646 -4.16666666666667e+00
+1344 1645 8.33333333333333e+00
+1344 1644 -1.25000000000000e+01
+1344 1506 -6.25000000000000e+00
+1344 1810 4.16666666666667e+00
+1344 1345 -8.33333333333333e+00
+1344 1814 -4.16666666666667e+00
+1344 1507 -2.08333333333333e+00
+1344 1813 2.08333333333333e+00
+1344 1811 4.16666666666667e+00
+1344 1438 -2.08333333333333e+00
+1344 1809 -1.87500000000000e+01
+1344 2426 -4.16666666666667e+00
+1344 2435 4.16666666666667e+00
+1344 2434 4.16666666666667e+00
+1344 2433 -1.87500000000000e+01
+1344 2329 -4.16666666666667e+00
+1344 2330 -4.16666666666667e+00
+1344 2393 4.16666666666667e+00
+1344 2392 -8.33333333333333e+00
+1344 2425 2.08333333333333e+00
+1345 1345 6.25000000000000e+01
+1345 1581 4.16666666666667e+00
+1345 1583 -8.33333333333333e+00
+1345 1439 4.16666666666667e+00
+1345 1438 -6.25000000000000e+00
+1345 1646 8.33333333333333e+00
+1345 1346 -8.33333333333333e+00
+1345 1508 4.16666666666667e+00
+1345 1645 -3.75000000000000e+01
+1345 1507 -6.25000000000000e+00
+1345 1644 8.33333333333333e+00
+1345 1814 2.08333333333333e+00
+1345 1809 4.16666666666667e+00
+1345 1344 -8.33333333333333e+00
+1345 1506 -2.08333333333333e+00
+1345 1812 2.08333333333333e+00
+1345 1811 -2.08333333333333e+00
+1345 1810 -6.25000000000000e+00
+1345 1437 -2.08333333333333e+00
+1345 2426 2.08333333333333e+00
+1345 2435 -2.08333333333333e+00
+1345 2434 -6.25000000000000e+00
+1345 2433 4.16666666666667e+00
+1345 2328 -4.16666666666667e+00
+1345 2330 -4.16666666666667e+00
+1345 2393 4.16666666666667e+00
+1345 2424 2.08333333333333e+00
+1345 2391 -8.33333333333333e+00
+1346 1346 6.25000000000000e+01
+1346 1437 4.16666666666667e+00
+1346 1344 -8.33333333333333e+00
+1346 1506 4.16666666666667e+00
+1346 1439 -1.87500000000000e+01
+1346 1582 -8.33333333333333e+00
+1346 1438 4.16666666666667e+00
+1346 1581 4.16666666666667e+00
+1346 1646 -1.25000000000000e+01
+1346 1508 -1.87500000000000e+01
+1346 1645 8.33333333333333e+00
+1346 1345 -8.33333333333333e+00
+1346 1507 4.16666666666667e+00
+1346 1644 -4.16666666666667e+00
+1346 1813 2.08333333333333e+00
+1346 1812 -4.16666666666667e+00
+1346 1810 -2.08333333333333e+00
+1346 1811 -6.25000000000000e+00
+1346 1809 4.16666666666667e+00
+1346 2424 -4.16666666666667e+00
+1346 2435 -6.25000000000000e+00
+1346 2434 -2.08333333333333e+00
+1346 2433 4.16666666666667e+00
+1346 2329 -4.16666666666667e+00
+1346 2392 4.16666666666667e+00
+1346 2328 -4.16666666666667e+00
+1346 2425 2.08333333333333e+00
+1346 2391 4.16666666666667e+00
+1347 1347 6.25000000000000e+01
+1347 1600 4.16666666666667e+00
+1347 1601 4.16666666666667e+00
+1347 1805 4.16666666666667e+00
+1347 1803 -6.25000000000000e+00
+1347 1817 4.16666666666667e+00
+1347 1816 4.16666666666667e+00
+1347 1348 -8.33333333333333e+00
+1347 1815 -1.87500000000000e+01
+1347 1664 -4.16666666666667e+00
+1347 1349 -8.33333333333333e+00
+1347 1586 -4.16666666666667e+00
+1347 1649 4.16666666666667e+00
+1347 1810 4.16666666666667e+00
+1347 1663 8.33333333333333e+00
+1347 1648 -8.33333333333333e+00
+1347 1811 4.16666666666667e+00
+1347 1442 -4.16666666666667e+00
+1347 1441 2.08333333333333e+00
+1347 1585 -4.16666666666667e+00
+1347 1809 -1.87500000000000e+01
+1347 1820 4.16666666666667e+00
+1347 1523 -4.16666666666667e+00
+1347 1819 -2.08333333333333e+00
+1347 1522 2.08333333333333e+00
+1347 1818 -6.25000000000000e+00
+1347 1804 -2.08333333333333e+00
+1347 1662 -1.25000000000000e+01
+1348 1348 6.25000000000000e+01
+1348 1803 -2.08333333333333e+00
+1348 1599 4.16666666666667e+00
+1348 1601 -8.33333333333333e+00
+1348 1442 2.08333333333333e+00
+1348 1804 -6.25000000000000e+00
+1348 1817 -2.08333333333333e+00
+1348 1523 2.08333333333333e+00
+1348 1816 -6.25000000000000e+00
+1348 1815 4.16666666666667e+00
+1348 1347 -8.33333333333333e+00
+1348 1811 -2.08333333333333e+00
+1348 1809 4.16666666666667e+00
+1348 1586 -4.16666666666667e+00
+1348 1649 4.16666666666667e+00
+1348 1662 8.33333333333333e+00
+1348 1647 -8.33333333333333e+00
+1348 1810 -6.25000000000000e+00
+1348 1440 2.08333333333333e+00
+1348 1584 -4.16666666666667e+00
+1348 1820 4.16666666666667e+00
+1348 1349 -8.33333333333333e+00
+1348 1664 8.33333333333333e+00
+1348 1819 -6.25000000000000e+00
+1348 1805 4.16666666666667e+00
+1348 1663 -3.75000000000000e+01
+1348 1818 -2.08333333333333e+00
+1348 1521 2.08333333333333e+00
+1349 1349 6.25000000000000e+01
+1349 1600 -8.33333333333333e+00
+1349 1599 4.16666666666667e+00
+1349 1805 -1.87500000000000e+01
+1349 1441 2.08333333333333e+00
+1349 1803 4.16666666666667e+00
+1349 1817 -6.25000000000000e+00
+1349 1816 -2.08333333333333e+00
+1349 1522 2.08333333333333e+00
+1349 1815 4.16666666666667e+00
+1349 1662 -4.16666666666667e+00
+1349 1810 -2.08333333333333e+00
+1349 1347 -8.33333333333333e+00
+1349 1584 -4.16666666666667e+00
+1349 1647 4.16666666666667e+00
+1349 1585 -4.16666666666667e+00
+1349 1648 4.16666666666667e+00
+1349 1811 -6.25000000000000e+00
+1349 1809 4.16666666666667e+00
+1349 1440 -4.16666666666667e+00
+1349 1820 -1.87500000000000e+01
+1349 1804 4.16666666666667e+00
+1349 1664 -1.25000000000000e+01
+1349 1819 4.16666666666667e+00
+1349 1348 -8.33333333333333e+00
+1349 1663 8.33333333333333e+00
+1349 1818 4.16666666666667e+00
+1349 1521 -4.16666666666667e+00
+1350 1350 2.50000000000000e+01
+1350 1724 -2.08333333333333e+00
+1350 1825 2.08333333333333e+00
+1350 1822 -2.08333333333333e+00
+1350 1466 2.08333333333333e+00
+1350 1826 -4.16666666666667e+00
+1350 1465 2.08333333333333e+00
+1350 1351 -4.16666666666667e+00
+1350 1723 4.16666666666667e+00
+1350 1464 -6.25000000000000e+00
+1350 1722 -6.25000000000000e+00
+1350 1352 -4.16666666666667e+00
+1350 1454 2.08333333333333e+00
+1350 1823 4.16666666666667e+00
+1350 1453 2.08333333333333e+00
+1350 1705 -4.16666666666667e+00
+1350 1706 2.08333333333333e+00
+1350 1452 -6.25000000000000e+00
+1350 1821 -6.25000000000000e+00
+1351 1351 2.91666666666667e+01
+1351 1724 4.16666666666667e+00
+1351 1823 4.16666666666667e+00
+1351 1824 2.08333333333333e+00
+1351 1821 -2.08333333333333e+00
+1351 1466 -2.08333333333333e+00
+1351 1826 2.08333333333333e+00
+1351 1465 -2.08333333333333e+00
+1351 1723 -1.87500000000000e+01
+1351 1464 2.08333333333333e+00
+1351 1350 -4.16666666666667e+00
+1351 1722 4.16666666666667e+00
+1351 1454 -2.08333333333333e+00
+1351 1706 2.08333333333333e+00
+1351 1352 -8.33333333333333e+00
+1351 1453 -2.08333333333333e+00
+1351 1822 -6.25000000000000e+00
+1351 1452 2.08333333333333e+00
+1351 1704 -4.16666666666667e+00
+1352 1352 2.91666666666667e+01
+1352 1722 -2.08333333333333e+00
+1352 1351 -8.33333333333333e+00
+1352 1723 4.16666666666667e+00
+1352 1822 4.16666666666667e+00
+1352 1466 -2.08333333333333e+00
+1352 1724 -6.25000000000000e+00
+1352 1465 -2.08333333333333e+00
+1352 1825 2.08333333333333e+00
+1352 1464 2.08333333333333e+00
+1352 1824 -4.16666666666667e+00
+1352 1704 2.08333333333333e+00
+1352 1454 -2.08333333333333e+00
+1352 1823 -1.87500000000000e+01
+1352 1453 -2.08333333333333e+00
+1352 1705 2.08333333333333e+00
+1352 1350 -4.16666666666667e+00
+1352 1452 2.08333333333333e+00
+1352 1821 4.16666666666667e+00
+1353 1353 6.25000000000000e+01
+1353 1354 -8.33333333333333e+00
+1353 1832 -4.16666666666667e+00
+1353 1525 -2.08333333333333e+00
+1353 1831 2.08333333333333e+00
+1353 1829 4.16666666666667e+00
+1353 1456 -2.08333333333333e+00
+1353 1827 -1.87500000000000e+01
+1353 1807 2.08333333333333e+00
+1353 1457 4.16666666666667e+00
+1353 1808 -4.16666666666667e+00
+1353 1355 -8.33333333333333e+00
+1353 1817 4.16666666666667e+00
+1353 1526 4.16666666666667e+00
+1353 1816 4.16666666666667e+00
+1353 1815 -1.87500000000000e+01
+1353 1603 -4.16666666666667e+00
+1353 1708 4.16666666666667e+00
+1353 1709 4.16666666666667e+00
+1353 1604 -4.16666666666667e+00
+1353 1455 -6.25000000000000e+00
+1353 1772 -4.16666666666667e+00
+1353 1667 4.16666666666667e+00
+1353 1771 8.33333333333333e+00
+1353 1666 -8.33333333333333e+00
+1353 1770 -1.25000000000000e+01
+1353 1828 4.16666666666667e+00
+1353 1524 -6.25000000000000e+00
+1354 1354 6.25000000000000e+01
+1354 1832 2.08333333333333e+00
+1354 1827 4.16666666666667e+00
+1354 1353 -8.33333333333333e+00
+1354 1524 -2.08333333333333e+00
+1354 1830 2.08333333333333e+00
+1354 1828 -6.25000000000000e+00
+1354 1455 -2.08333333333333e+00
+1354 1806 2.08333333333333e+00
+1354 1808 2.08333333333333e+00
+1354 1817 -2.08333333333333e+00
+1354 1816 -6.25000000000000e+00
+1354 1815 4.16666666666667e+00
+1354 1602 -4.16666666666667e+00
+1354 1707 4.16666666666667e+00
+1354 1604 -4.16666666666667e+00
+1354 1667 4.16666666666667e+00
+1354 1709 -8.33333333333333e+00
+1354 1457 4.16666666666667e+00
+1354 1456 -6.25000000000000e+00
+1354 1772 8.33333333333333e+00
+1354 1355 -8.33333333333333e+00
+1354 1526 4.16666666666667e+00
+1354 1771 -3.75000000000000e+01
+1354 1829 -2.08333333333333e+00
+1354 1525 -6.25000000000000e+00
+1354 1770 8.33333333333333e+00
+1354 1665 -8.33333333333333e+00
+1355 1355 6.25000000000000e+01
+1355 1831 2.08333333333333e+00
+1355 1830 -4.16666666666667e+00
+1355 1829 -6.25000000000000e+00
+1355 1827 4.16666666666667e+00
+1355 1807 2.08333333333333e+00
+1355 1455 4.16666666666667e+00
+1355 1806 -4.16666666666667e+00
+1355 1817 -6.25000000000000e+00
+1355 1816 -2.08333333333333e+00
+1355 1353 -8.33333333333333e+00
+1355 1815 4.16666666666667e+00
+1355 1524 4.16666666666667e+00
+1355 1603 -4.16666666666667e+00
+1355 1666 4.16666666666667e+00
+1355 1457 -1.87500000000000e+01
+1355 1708 -8.33333333333333e+00
+1355 1456 4.16666666666667e+00
+1355 1707 4.16666666666667e+00
+1355 1602 -4.16666666666667e+00
+1355 1772 -1.25000000000000e+01
+1355 1828 -2.08333333333333e+00
+1355 1526 -1.87500000000000e+01
+1355 1771 8.33333333333333e+00
+1355 1354 -8.33333333333333e+00
+1355 1525 4.16666666666667e+00
+1355 1770 -4.16666666666667e+00
+1355 1665 4.16666666666667e+00
+1356 1356 6.25000000000000e+01
+1356 1726 4.16666666666667e+00
+1356 1727 4.16666666666667e+00
+1356 1823 4.16666666666667e+00
+1356 1821 -6.25000000000000e+00
+1356 1835 4.16666666666667e+00
+1356 1834 4.16666666666667e+00
+1356 1357 -8.33333333333333e+00
+1356 1833 -1.87500000000000e+01
+1356 1790 -4.16666666666667e+00
+1356 1358 -8.33333333333333e+00
+1356 1712 -4.16666666666667e+00
+1356 1775 4.16666666666667e+00
+1356 1828 4.16666666666667e+00
+1356 1789 8.33333333333333e+00
+1356 1774 -8.33333333333333e+00
+1356 1829 4.16666666666667e+00
+1356 1460 -4.16666666666667e+00
+1356 1459 2.08333333333333e+00
+1356 1711 -4.16666666666667e+00
+1356 1827 -1.87500000000000e+01
+1356 1838 4.16666666666667e+00
+1356 1544 -4.16666666666667e+00
+1356 1837 -2.08333333333333e+00
+1356 1543 2.08333333333333e+00
+1356 1836 -6.25000000000000e+00
+1356 1822 -2.08333333333333e+00
+1356 1788 -1.25000000000000e+01
+1357 1357 6.25000000000000e+01
+1357 1821 -2.08333333333333e+00
+1357 1725 4.16666666666667e+00
+1357 1727 -8.33333333333333e+00
+1357 1460 2.08333333333333e+00
+1357 1822 -6.25000000000000e+00
+1357 1835 -2.08333333333333e+00
+1357 1544 2.08333333333333e+00
+1357 1834 -6.25000000000000e+00
+1357 1833 4.16666666666667e+00
+1357 1356 -8.33333333333333e+00
+1357 1829 -2.08333333333333e+00
+1357 1827 4.16666666666667e+00
+1357 1712 -4.16666666666667e+00
+1357 1775 4.16666666666667e+00
+1357 1788 8.33333333333333e+00
+1357 1773 -8.33333333333333e+00
+1357 1828 -6.25000000000000e+00
+1357 1458 2.08333333333333e+00
+1357 1710 -4.16666666666667e+00
+1357 1838 4.16666666666667e+00
+1357 1358 -8.33333333333333e+00
+1357 1790 8.33333333333333e+00
+1357 1837 -6.25000000000000e+00
+1357 1823 4.16666666666667e+00
+1357 1789 -3.75000000000000e+01
+1357 1836 -2.08333333333333e+00
+1357 1542 2.08333333333333e+00
+1358 1358 6.25000000000000e+01
+1358 1726 -8.33333333333333e+00
+1358 1725 4.16666666666667e+00
+1358 1823 -1.87500000000000e+01
+1358 1459 2.08333333333333e+00
+1358 1821 4.16666666666667e+00
+1358 1835 -6.25000000000000e+00
+1358 1834 -2.08333333333333e+00
+1358 1543 2.08333333333333e+00
+1358 1833 4.16666666666667e+00
+1358 1788 -4.16666666666667e+00
+1358 1828 -2.08333333333333e+00
+1358 1356 -8.33333333333333e+00
+1358 1710 -4.16666666666667e+00
+1358 1773 4.16666666666667e+00
+1358 1711 -4.16666666666667e+00
+1358 1774 4.16666666666667e+00
+1358 1829 -6.25000000000000e+00
+1358 1827 4.16666666666667e+00
+1358 1458 -4.16666666666667e+00
+1358 1838 -1.87500000000000e+01
+1358 1822 4.16666666666667e+00
+1358 1790 -1.25000000000000e+01
+1358 1837 4.16666666666667e+00
+1358 1357 -8.33333333333333e+00
+1358 1789 8.33333333333333e+00
+1358 1836 4.16666666666667e+00
+1358 1542 -4.16666666666667e+00
+1359 1359 2.50000000000000e+01
+1359 1615 2.08333333333333e+00
+1359 1844 2.08333333333333e+00
+1359 1841 -2.08333333333333e+00
+1359 1472 2.08333333333333e+00
+1359 1616 -4.16666666666667e+00
+1359 1471 2.08333333333333e+00
+1359 1360 -4.16666666666667e+00
+1359 1840 4.16666666666667e+00
+1359 1470 -6.25000000000000e+00
+1359 1839 -6.25000000000000e+00
+1359 1361 -4.16666666666667e+00
+1359 1487 2.08333333333333e+00
+1359 1634 4.16666666666667e+00
+1359 1486 2.08333333333333e+00
+1359 1843 -4.16666666666667e+00
+1359 1633 -2.08333333333333e+00
+1359 1485 -6.25000000000000e+00
+1359 1632 -6.25000000000000e+00
+1360 1360 2.91666666666667e+01
+1360 1614 2.08333333333333e+00
+1360 1634 4.16666666666667e+00
+1360 1361 -8.33333333333333e+00
+1360 1841 4.16666666666667e+00
+1360 1472 -2.08333333333333e+00
+1360 1616 2.08333333333333e+00
+1360 1471 -2.08333333333333e+00
+1360 1840 -1.87500000000000e+01
+1360 1470 2.08333333333333e+00
+1360 1359 -4.16666666666667e+00
+1360 1839 4.16666666666667e+00
+1360 1487 -2.08333333333333e+00
+1360 1844 2.08333333333333e+00
+1360 1632 -2.08333333333333e+00
+1360 1486 -2.08333333333333e+00
+1360 1633 -6.25000000000000e+00
+1360 1485 2.08333333333333e+00
+1360 1842 -4.16666666666667e+00
+1361 1361 2.91666666666667e+01
+1361 1360 -8.33333333333333e+00
+1361 1840 4.16666666666667e+00
+1361 1842 2.08333333333333e+00
+1361 1839 -2.08333333333333e+00
+1361 1472 -2.08333333333333e+00
+1361 1841 -6.25000000000000e+00
+1361 1471 -2.08333333333333e+00
+1361 1615 2.08333333333333e+00
+1361 1470 2.08333333333333e+00
+1361 1614 -4.16666666666667e+00
+1361 1633 4.16666666666667e+00
+1361 1487 -2.08333333333333e+00
+1361 1634 -1.87500000000000e+01
+1361 1486 -2.08333333333333e+00
+1361 1843 2.08333333333333e+00
+1361 1359 -4.16666666666667e+00
+1361 1485 2.08333333333333e+00
+1361 1632 4.16666666666667e+00
+1362 1362 6.25000000000000e+01
+1362 1618 4.16666666666667e+00
+1362 1652 8.33333333333333e+00
+1362 1651 -4.16666666666667e+00
+1362 1650 -1.25000000000000e+01
+1362 1474 4.16666666666667e+00
+1362 1473 -6.25000000000000e+00
+1362 1363 -8.33333333333333e+00
+1362 1510 4.16666666666667e+00
+1362 1619 4.16666666666667e+00
+1362 1509 -6.25000000000000e+00
+1362 1364 -8.33333333333333e+00
+1362 1847 4.16666666666667e+00
+1362 1511 -2.08333333333333e+00
+1362 1850 2.08333333333333e+00
+1362 1849 -4.16666666666667e+00
+1362 1475 -2.08333333333333e+00
+1362 1846 4.16666666666667e+00
+1362 1845 -1.87500000000000e+01
+1362 2366 -4.16666666666667e+00
+1362 2462 2.08333333333333e+00
+1362 2365 -4.16666666666667e+00
+1362 2398 4.16666666666667e+00
+1362 2461 -4.16666666666667e+00
+1362 2471 4.16666666666667e+00
+1362 2399 -8.33333333333333e+00
+1362 2470 4.16666666666667e+00
+1362 2469 -1.87500000000000e+01
+1363 1363 6.25000000000000e+01
+1363 1475 4.16666666666667e+00
+1363 1617 4.16666666666667e+00
+1363 1652 8.33333333333333e+00
+1363 1364 -8.33333333333333e+00
+1363 1511 4.16666666666667e+00
+1363 1651 -1.25000000000000e+01
+1363 1650 -4.16666666666667e+00
+1363 1474 -1.87500000000000e+01
+1363 1473 4.16666666666667e+00
+1363 1619 -8.33333333333333e+00
+1363 1510 -1.87500000000000e+01
+1363 1362 -8.33333333333333e+00
+1363 1509 4.16666666666667e+00
+1363 1850 2.08333333333333e+00
+1363 1847 -2.08333333333333e+00
+1363 1848 -4.16666666666667e+00
+1363 1846 -6.25000000000000e+00
+1363 1845 4.16666666666667e+00
+1363 2364 -4.16666666666667e+00
+1363 2397 4.16666666666667e+00
+1363 2462 2.08333333333333e+00
+1363 2366 -4.16666666666667e+00
+1363 2460 -4.16666666666667e+00
+1363 2471 -2.08333333333333e+00
+1363 2399 4.16666666666667e+00
+1363 2470 -6.25000000000000e+00
+1363 2469 4.16666666666667e+00
+1364 1364 6.25000000000000e+01
+1364 1618 -8.33333333333333e+00
+1364 1474 4.16666666666667e+00
+1364 1652 -3.75000000000000e+01
+1364 1651 8.33333333333333e+00
+1364 1363 -8.33333333333333e+00
+1364 1510 4.16666666666667e+00
+1364 1650 8.33333333333333e+00
+1364 1475 -6.25000000000000e+00
+1364 1617 4.16666666666667e+00
+1364 1511 -6.25000000000000e+00
+1364 1846 -2.08333333333333e+00
+1364 1362 -8.33333333333333e+00
+1364 1845 4.16666666666667e+00
+1364 1509 -2.08333333333333e+00
+1364 1848 2.08333333333333e+00
+1364 1849 2.08333333333333e+00
+1364 1847 -6.25000000000000e+00
+1364 1473 -2.08333333333333e+00
+1364 2364 -4.16666666666667e+00
+1364 2460 2.08333333333333e+00
+1364 2461 2.08333333333333e+00
+1364 2365 -4.16666666666667e+00
+1364 2471 -6.25000000000000e+00
+1364 2470 -2.08333333333333e+00
+1364 2398 4.16666666666667e+00
+1364 2469 4.16666666666667e+00
+1364 2397 -8.33333333333333e+00
+1365 1365 6.25000000000000e+01
+1365 1655 -8.33333333333333e+00
+1365 1654 4.16666666666667e+00
+1365 1478 2.08333333333333e+00
+1365 1846 4.16666666666667e+00
+1365 1845 -1.87500000000000e+01
+1365 1856 -2.08333333333333e+00
+1365 1529 2.08333333333333e+00
+1365 1855 4.16666666666667e+00
+1365 1854 -6.25000000000000e+00
+1365 1622 -4.16666666666667e+00
+1365 1621 -4.16666666666667e+00
+1365 1637 4.16666666666667e+00
+1365 1841 -2.08333333333333e+00
+1365 1366 -8.33333333333333e+00
+1365 1636 4.16666666666667e+00
+1365 1669 -4.16666666666667e+00
+1365 1477 -4.16666666666667e+00
+1365 1840 4.16666666666667e+00
+1365 1839 -6.25000000000000e+00
+1365 1367 -8.33333333333333e+00
+1365 1853 4.16666666666667e+00
+1365 1670 8.33333333333333e+00
+1365 1852 4.16666666666667e+00
+1365 1528 -4.16666666666667e+00
+1365 1847 4.16666666666667e+00
+1365 1851 -1.87500000000000e+01
+1365 1668 -1.25000000000000e+01
+1366 1366 6.25000000000000e+01
+1366 1655 4.16666666666667e+00
+1366 1653 4.16666666666667e+00
+1366 1846 -6.25000000000000e+00
+1366 1845 4.16666666666667e+00
+1366 1856 4.16666666666667e+00
+1366 1367 -8.33333333333333e+00
+1366 1855 -1.87500000000000e+01
+1366 1854 4.16666666666667e+00
+1366 1620 -4.16666666666667e+00
+1366 1841 4.16666666666667e+00
+1366 1365 -8.33333333333333e+00
+1366 1637 -8.33333333333333e+00
+1366 1670 8.33333333333333e+00
+1366 1635 4.16666666666667e+00
+1366 1668 -4.16666666666667e+00
+1366 1478 2.08333333333333e+00
+1366 1622 -4.16666666666667e+00
+1366 1840 -1.87500000000000e+01
+1366 1476 -4.16666666666667e+00
+1366 1839 4.16666666666667e+00
+1366 1853 -2.08333333333333e+00
+1366 1529 2.08333333333333e+00
+1366 1847 -2.08333333333333e+00
+1366 1852 -6.25000000000000e+00
+1366 1669 -1.25000000000000e+01
+1366 1851 4.16666666666667e+00
+1366 1527 -4.16666666666667e+00
+1367 1367 6.25000000000000e+01
+1367 1654 4.16666666666667e+00
+1367 1845 4.16666666666667e+00
+1367 1653 -8.33333333333333e+00
+1367 1847 -6.25000000000000e+00
+1367 1476 2.08333333333333e+00
+1367 1856 -6.25000000000000e+00
+1367 1855 4.16666666666667e+00
+1367 1366 -8.33333333333333e+00
+1367 1854 -2.08333333333333e+00
+1367 1527 2.08333333333333e+00
+1367 1620 -4.16666666666667e+00
+1367 1840 4.16666666666667e+00
+1367 1635 4.16666666666667e+00
+1367 1839 -2.08333333333333e+00
+1367 1636 -8.33333333333333e+00
+1367 1669 8.33333333333333e+00
+1367 1841 -6.25000000000000e+00
+1367 1477 2.08333333333333e+00
+1367 1621 -4.16666666666667e+00
+1367 1846 -2.08333333333333e+00
+1367 1853 -6.25000000000000e+00
+1367 1670 -3.75000000000000e+01
+1367 1852 -2.08333333333333e+00
+1367 1528 2.08333333333333e+00
+1367 1365 -8.33333333333333e+00
+1367 1851 4.16666666666667e+00
+1367 1668 8.33333333333333e+00
+1368 1368 2.50000000000000e+01
+1368 1741 2.08333333333333e+00
+1368 1862 2.08333333333333e+00
+1368 1859 -2.08333333333333e+00
+1368 1490 2.08333333333333e+00
+1368 1742 -4.16666666666667e+00
+1368 1489 2.08333333333333e+00
+1368 1369 -4.16666666666667e+00
+1368 1858 4.16666666666667e+00
+1368 1488 -6.25000000000000e+00
+1368 1857 -6.25000000000000e+00
+1368 1370 -4.16666666666667e+00
+1368 1502 2.08333333333333e+00
+1368 1760 4.16666666666667e+00
+1368 1501 2.08333333333333e+00
+1368 1861 -4.16666666666667e+00
+1368 1759 -2.08333333333333e+00
+1368 1500 -6.25000000000000e+00
+1368 1758 -6.25000000000000e+00
+1369 1369 2.91666666666667e+01
+1369 1740 2.08333333333333e+00
+1369 1760 4.16666666666667e+00
+1369 1370 -8.33333333333333e+00
+1369 1859 4.16666666666667e+00
+1369 1490 -2.08333333333333e+00
+1369 1742 2.08333333333333e+00
+1369 1489 -2.08333333333333e+00
+1369 1858 -1.87500000000000e+01
+1369 1488 2.08333333333333e+00
+1369 1368 -4.16666666666667e+00
+1369 1857 4.16666666666667e+00
+1369 1502 -2.08333333333333e+00
+1369 1862 2.08333333333333e+00
+1369 1758 -2.08333333333333e+00
+1369 1501 -2.08333333333333e+00
+1369 1759 -6.25000000000000e+00
+1369 1500 2.08333333333333e+00
+1369 1860 -4.16666666666667e+00
+1370 1370 2.91666666666667e+01
+1370 1369 -8.33333333333333e+00
+1370 1858 4.16666666666667e+00
+1370 1860 2.08333333333333e+00
+1370 1857 -2.08333333333333e+00
+1370 1490 -2.08333333333333e+00
+1370 1859 -6.25000000000000e+00
+1370 1489 -2.08333333333333e+00
+1370 1741 2.08333333333333e+00
+1370 1488 2.08333333333333e+00
+1370 1740 -4.16666666666667e+00
+1370 1759 4.16666666666667e+00
+1370 1502 -2.08333333333333e+00
+1370 1760 -1.87500000000000e+01
+1370 1501 -2.08333333333333e+00
+1370 1861 2.08333333333333e+00
+1370 1368 -4.16666666666667e+00
+1370 1500 2.08333333333333e+00
+1370 1758 4.16666666666667e+00
+1371 1371 6.25000000000000e+01
+1371 1865 4.16666666666667e+00
+1371 1532 -2.08333333333333e+00
+1371 1868 2.08333333333333e+00
+1371 1867 -4.16666666666667e+00
+1371 1493 -2.08333333333333e+00
+1371 1864 4.16666666666667e+00
+1371 1863 -1.87500000000000e+01
+1371 1745 4.16666666666667e+00
+1371 1744 4.16666666666667e+00
+1371 1778 8.33333333333333e+00
+1371 1777 -4.16666666666667e+00
+1371 1776 -1.25000000000000e+01
+1371 1640 -4.16666666666667e+00
+1371 1844 2.08333333333333e+00
+1371 1639 -4.16666666666667e+00
+1371 1672 4.16666666666667e+00
+1371 1843 -4.16666666666667e+00
+1371 1492 4.16666666666667e+00
+1371 1491 -6.25000000000000e+00
+1371 1853 4.16666666666667e+00
+1371 1673 -8.33333333333333e+00
+1371 1852 4.16666666666667e+00
+1371 1372 -8.33333333333333e+00
+1371 1531 4.16666666666667e+00
+1371 1851 -1.87500000000000e+01
+1371 1373 -8.33333333333333e+00
+1371 1530 -6.25000000000000e+00
+1372 1372 6.25000000000000e+01
+1372 1865 -2.08333333333333e+00
+1372 1866 -4.16666666666667e+00
+1372 1864 -6.25000000000000e+00
+1372 1863 4.16666666666667e+00
+1372 1745 -8.33333333333333e+00
+1372 1493 4.16666666666667e+00
+1372 1743 4.16666666666667e+00
+1372 1778 8.33333333333333e+00
+1372 1373 -8.33333333333333e+00
+1372 1532 4.16666666666667e+00
+1372 1777 -1.25000000000000e+01
+1372 1776 -4.16666666666667e+00
+1372 1638 -4.16666666666667e+00
+1372 1671 4.16666666666667e+00
+1372 1844 2.08333333333333e+00
+1372 1640 -4.16666666666667e+00
+1372 1492 -1.87500000000000e+01
+1372 1842 -4.16666666666667e+00
+1372 1491 4.16666666666667e+00
+1372 1853 -2.08333333333333e+00
+1372 1673 4.16666666666667e+00
+1372 1852 -6.25000000000000e+00
+1372 1868 2.08333333333333e+00
+1372 1531 -1.87500000000000e+01
+1372 1851 4.16666666666667e+00
+1372 1371 -8.33333333333333e+00
+1372 1530 4.16666666666667e+00
+1373 1373 6.25000000000000e+01
+1373 1864 -2.08333333333333e+00
+1373 1371 -8.33333333333333e+00
+1373 1863 4.16666666666667e+00
+1373 1530 -2.08333333333333e+00
+1373 1866 2.08333333333333e+00
+1373 1865 -6.25000000000000e+00
+1373 1491 -2.08333333333333e+00
+1373 1743 4.16666666666667e+00
+1373 1744 -8.33333333333333e+00
+1373 1492 4.16666666666667e+00
+1373 1778 -3.75000000000000e+01
+1373 1777 8.33333333333333e+00
+1373 1372 -8.33333333333333e+00
+1373 1531 4.16666666666667e+00
+1373 1776 8.33333333333333e+00
+1373 1638 -4.16666666666667e+00
+1373 1842 2.08333333333333e+00
+1373 1493 -6.25000000000000e+00
+1373 1843 2.08333333333333e+00
+1373 1639 -4.16666666666667e+00
+1373 1853 -6.25000000000000e+00
+1373 1867 2.08333333333333e+00
+1373 1532 -6.25000000000000e+00
+1373 1852 -2.08333333333333e+00
+1373 1672 4.16666666666667e+00
+1373 1851 4.16666666666667e+00
+1373 1671 -8.33333333333333e+00
+1374 1374 6.25000000000000e+01
+1374 1781 -8.33333333333333e+00
+1374 1780 4.16666666666667e+00
+1374 1496 2.08333333333333e+00
+1374 1864 4.16666666666667e+00
+1374 1863 -1.87500000000000e+01
+1374 1874 -2.08333333333333e+00
+1374 1547 2.08333333333333e+00
+1374 1873 4.16666666666667e+00
+1374 1872 -6.25000000000000e+00
+1374 1748 -4.16666666666667e+00
+1374 1747 -4.16666666666667e+00
+1374 1763 4.16666666666667e+00
+1374 1859 -2.08333333333333e+00
+1374 1375 -8.33333333333333e+00
+1374 1762 4.16666666666667e+00
+1374 1795 -4.16666666666667e+00
+1374 1495 -4.16666666666667e+00
+1374 1858 4.16666666666667e+00
+1374 1857 -6.25000000000000e+00
+1374 1376 -8.33333333333333e+00
+1374 1871 4.16666666666667e+00
+1374 1796 8.33333333333333e+00
+1374 1870 4.16666666666667e+00
+1374 1546 -4.16666666666667e+00
+1374 1865 4.16666666666667e+00
+1374 1869 -1.87500000000000e+01
+1374 1794 -1.25000000000000e+01
+1375 1375 6.25000000000000e+01
+1375 1781 4.16666666666667e+00
+1375 1779 4.16666666666667e+00
+1375 1864 -6.25000000000000e+00
+1375 1863 4.16666666666667e+00
+1375 1874 4.16666666666667e+00
+1375 1376 -8.33333333333333e+00
+1375 1873 -1.87500000000000e+01
+1375 1872 4.16666666666667e+00
+1375 1746 -4.16666666666667e+00
+1375 1859 4.16666666666667e+00
+1375 1374 -8.33333333333333e+00
+1375 1763 -8.33333333333333e+00
+1375 1796 8.33333333333333e+00
+1375 1761 4.16666666666667e+00
+1375 1794 -4.16666666666667e+00
+1375 1496 2.08333333333333e+00
+1375 1748 -4.16666666666667e+00
+1375 1858 -1.87500000000000e+01
+1375 1494 -4.16666666666667e+00
+1375 1857 4.16666666666667e+00
+1375 1871 -2.08333333333333e+00
+1375 1547 2.08333333333333e+00
+1375 1865 -2.08333333333333e+00
+1375 1870 -6.25000000000000e+00
+1375 1795 -1.25000000000000e+01
+1375 1869 4.16666666666667e+00
+1375 1545 -4.16666666666667e+00
+1376 1376 6.25000000000000e+01
+1376 1780 4.16666666666667e+00
+1376 1863 4.16666666666667e+00
+1376 1779 -8.33333333333333e+00
+1376 1865 -6.25000000000000e+00
+1376 1494 2.08333333333333e+00
+1376 1874 -6.25000000000000e+00
+1376 1873 4.16666666666667e+00
+1376 1375 -8.33333333333333e+00
+1376 1872 -2.08333333333333e+00
+1376 1545 2.08333333333333e+00
+1376 1746 -4.16666666666667e+00
+1376 1858 4.16666666666667e+00
+1376 1761 4.16666666666667e+00
+1376 1857 -2.08333333333333e+00
+1376 1762 -8.33333333333333e+00
+1376 1795 8.33333333333333e+00
+1376 1859 -6.25000000000000e+00
+1376 1495 2.08333333333333e+00
+1376 1747 -4.16666666666667e+00
+1376 1864 -2.08333333333333e+00
+1376 1871 -6.25000000000000e+00
+1376 1796 -3.75000000000000e+01
+1376 1870 -2.08333333333333e+00
+1376 1546 2.08333333333333e+00
+1376 1374 -8.33333333333333e+00
+1376 1869 4.16666666666667e+00
+1376 1794 8.33333333333333e+00
+1377 1377 3.75000000000000e+01
+1377 1814 -4.16666666666667e+00
+1377 1813 2.08333333333333e+00
+1377 1379 -4.16666666666667e+00
+1377 1820 4.16666666666667e+00
+1377 1535 2.08333333333333e+00
+1377 1819 -2.08333333333333e+00
+1377 1818 -6.25000000000000e+00
+1377 1657 -4.16666666666667e+00
+1377 1675 4.16666666666667e+00
+1377 1850 2.08333333333333e+00
+1377 1658 -4.16666666666667e+00
+1377 1513 2.08333333333333e+00
+1377 1849 -4.16666666666667e+00
+1377 1512 -1.25000000000000e+01
+1377 1856 -2.08333333333333e+00
+1377 1676 4.16666666666667e+00
+1377 1378 -4.16666666666667e+00
+1377 1855 4.16666666666667e+00
+1377 1534 2.08333333333333e+00
+1377 1514 2.08333333333333e+00
+1377 1854 -6.25000000000000e+00
+1377 1533 -1.25000000000000e+01
+1378 1378 3.33333333333333e+01
+1378 1812 2.08333333333333e+00
+1378 1820 4.16666666666667e+00
+1378 1819 -6.25000000000000e+00
+1378 1818 -2.08333333333333e+00
+1378 1850 2.08333333333333e+00
+1378 1658 -4.16666666666667e+00
+1378 1656 -4.16666666666667e+00
+1378 1674 4.16666666666667e+00
+1378 1513 -4.16666666666667e+00
+1378 1512 2.08333333333333e+00
+1378 1848 -4.16666666666667e+00
+1378 1856 4.16666666666667e+00
+1378 1676 -8.33333333333333e+00
+1378 1814 2.08333333333333e+00
+1378 1855 -1.87500000000000e+01
+1378 1534 -4.16666666666667e+00
+1378 1377 -4.16666666666667e+00
+1378 1854 4.16666666666667e+00
+1378 1533 2.08333333333333e+00
+1379 1379 3.33333333333333e+01
+1379 1512 2.08333333333333e+00
+1379 1812 -4.16666666666667e+00
+1379 1820 -1.87500000000000e+01
+1379 1819 4.16666666666667e+00
+1379 1377 -4.16666666666667e+00
+1379 1818 4.16666666666667e+00
+1379 1533 2.08333333333333e+00
+1379 1849 2.08333333333333e+00
+1379 1657 -4.16666666666667e+00
+1379 1514 -4.16666666666667e+00
+1379 1848 2.08333333333333e+00
+1379 1656 -4.16666666666667e+00
+1379 1813 2.08333333333333e+00
+1379 1856 -6.25000000000000e+00
+1379 1535 -4.16666666666667e+00
+1379 1855 4.16666666666667e+00
+1379 1675 -8.33333333333333e+00
+1379 1854 -2.08333333333333e+00
+1379 1674 4.16666666666667e+00
+1380 1380 3.75000000000000e+01
+1380 1832 -4.16666666666667e+00
+1380 1831 2.08333333333333e+00
+1380 1382 -4.16666666666667e+00
+1380 1838 4.16666666666667e+00
+1380 1550 2.08333333333333e+00
+1380 1837 -2.08333333333333e+00
+1380 1836 -6.25000000000000e+00
+1380 1783 -4.16666666666667e+00
+1380 1801 4.16666666666667e+00
+1380 1868 2.08333333333333e+00
+1380 1784 -4.16666666666667e+00
+1380 1537 2.08333333333333e+00
+1380 1867 -4.16666666666667e+00
+1380 1536 -1.25000000000000e+01
+1380 1874 -2.08333333333333e+00
+1380 1802 4.16666666666667e+00
+1380 1381 -4.16666666666667e+00
+1380 1873 4.16666666666667e+00
+1380 1549 2.08333333333333e+00
+1380 1538 2.08333333333333e+00
+1380 1872 -6.25000000000000e+00
+1380 1548 -1.25000000000000e+01
+1381 1381 3.33333333333333e+01
+1381 1830 2.08333333333333e+00
+1381 1838 4.16666666666667e+00
+1381 1837 -6.25000000000000e+00
+1381 1836 -2.08333333333333e+00
+1381 1868 2.08333333333333e+00
+1381 1784 -4.16666666666667e+00
+1381 1782 -4.16666666666667e+00
+1381 1800 4.16666666666667e+00
+1381 1537 -4.16666666666667e+00
+1381 1536 2.08333333333333e+00
+1381 1866 -4.16666666666667e+00
+1381 1874 4.16666666666667e+00
+1381 1802 -8.33333333333333e+00
+1381 1832 2.08333333333333e+00
+1381 1873 -1.87500000000000e+01
+1381 1549 -4.16666666666667e+00
+1381 1380 -4.16666666666667e+00
+1381 1872 4.16666666666667e+00
+1381 1548 2.08333333333333e+00
+1382 1382 3.33333333333333e+01
+1382 1536 2.08333333333333e+00
+1382 1830 -4.16666666666667e+00
+1382 1838 -1.87500000000000e+01
+1382 1837 4.16666666666667e+00
+1382 1380 -4.16666666666667e+00
+1382 1836 4.16666666666667e+00
+1382 1548 2.08333333333333e+00
+1382 1867 2.08333333333333e+00
+1382 1783 -4.16666666666667e+00
+1382 1538 -4.16666666666667e+00
+1382 1866 2.08333333333333e+00
+1382 1782 -4.16666666666667e+00
+1382 1831 2.08333333333333e+00
+1382 1874 -6.25000000000000e+00
+1382 1550 -4.16666666666667e+00
+1382 1873 4.16666666666667e+00
+1382 1801 -8.33333333333333e+00
+1382 1872 -2.08333333333333e+00
+1382 1800 4.16666666666667e+00
+1383 1383 3.75000000000000e+01
+1383 1300 2.08333333333333e+00
+1383 1552 -4.16666666666667e+00
+1383 1391 -2.08333333333333e+00
+1383 1384 -4.16666666666667e+00
+1383 1390 4.16666666666667e+00
+1383 1276 2.08333333333333e+00
+1383 1389 -6.25000000000000e+00
+1383 1559 -4.16666666666667e+00
+1383 1403 4.16666666666667e+00
+1383 1301 2.08333333333333e+00
+1383 1556 -4.16666666666667e+00
+1383 1555 2.08333333333333e+00
+1383 1558 -4.16666666666667e+00
+1383 1299 -1.25000000000000e+01
+1383 1385 -4.16666666666667e+00
+1383 1397 4.16666666666667e+00
+1383 1277 2.08333333333333e+00
+1383 1396 -2.08333333333333e+00
+1383 1402 4.16666666666667e+00
+1383 1553 2.08333333333333e+00
+1383 1395 -6.25000000000000e+00
+1383 1275 -1.25000000000000e+01
+1384 1384 3.33333333333333e+01
+1384 1299 2.08333333333333e+00
+1384 1551 -4.16666666666667e+00
+1384 1391 4.16666666666667e+00
+1384 1390 -1.87500000000000e+01
+1384 1383 -4.16666666666667e+00
+1384 1389 4.16666666666667e+00
+1384 1275 2.08333333333333e+00
+1384 1556 2.08333333333333e+00
+1384 1559 -4.16666666666667e+00
+1384 1300 -4.16666666666667e+00
+1384 1554 2.08333333333333e+00
+1384 1557 -4.16666666666667e+00
+1384 1397 4.16666666666667e+00
+1384 1403 -8.33333333333333e+00
+1384 1553 2.08333333333333e+00
+1384 1396 -6.25000000000000e+00
+1384 1276 -4.16666666666667e+00
+1384 1395 -2.08333333333333e+00
+1384 1401 4.16666666666667e+00
+1385 1385 3.33333333333333e+01
+1385 1551 2.08333333333333e+00
+1385 1391 -6.25000000000000e+00
+1385 1390 4.16666666666667e+00
+1385 1389 -2.08333333333333e+00
+1385 1555 2.08333333333333e+00
+1385 1558 -4.16666666666667e+00
+1385 1557 -4.16666666666667e+00
+1385 1401 4.16666666666667e+00
+1385 1301 -4.16666666666667e+00
+1385 1299 2.08333333333333e+00
+1385 1554 -4.16666666666667e+00
+1385 1552 2.08333333333333e+00
+1385 1397 -1.87500000000000e+01
+1385 1277 -4.16666666666667e+00
+1385 1396 4.16666666666667e+00
+1385 1402 -8.33333333333333e+00
+1385 1383 -4.16666666666667e+00
+1385 1395 4.16666666666667e+00
+1385 1275 2.08333333333333e+00
+1386 1386 6.25000000000000e+01
+1386 1388 -8.33333333333333e+00
+1386 1400 8.33333333333333e+00
+1386 1573 4.16666666666667e+00
+1386 1399 -4.16666666666667e+00
+1386 1277 -2.08333333333333e+00
+1386 1276 4.16666666666667e+00
+1386 1275 -6.25000000000000e+00
+1386 1398 -1.25000000000000e+01
+1386 1304 -2.08333333333333e+00
+1386 1574 4.16666666666667e+00
+1386 1387 -8.33333333333333e+00
+1386 1303 4.16666666666667e+00
+1386 1302 -6.25000000000000e+00
+1386 1570 -4.16666666666667e+00
+1386 1391 4.16666666666667e+00
+1386 1390 4.16666666666667e+00
+1386 1389 -1.87500000000000e+01
+1386 1577 -4.16666666666667e+00
+1386 1576 -4.16666666666667e+00
+1386 1403 -8.33333333333333e+00
+1386 1402 4.16666666666667e+00
+1386 1571 2.08333333333333e+00
+1386 2030 2.08333333333333e+00
+1386 2029 -4.16666666666667e+00
+1386 2287 4.16666666666667e+00
+1386 2288 4.16666666666667e+00
+1386 2286 -1.87500000000000e+01
+1387 1387 6.25000000000000e+01
+1387 1572 4.16666666666667e+00
+1387 1398 -4.16666666666667e+00
+1387 1277 4.16666666666667e+00
+1387 1388 -8.33333333333333e+00
+1387 1400 8.33333333333333e+00
+1387 1276 -1.87500000000000e+01
+1387 1399 -1.25000000000000e+01
+1387 1275 4.16666666666667e+00
+1387 1304 4.16666666666667e+00
+1387 1574 -8.33333333333333e+00
+1387 1303 -1.87500000000000e+01
+1387 1386 -8.33333333333333e+00
+1387 1302 4.16666666666667e+00
+1387 1569 -4.16666666666667e+00
+1387 1391 -2.08333333333333e+00
+1387 1390 -6.25000000000000e+00
+1387 1389 4.16666666666667e+00
+1387 1577 -4.16666666666667e+00
+1387 1403 4.16666666666667e+00
+1387 1575 -4.16666666666667e+00
+1387 1571 2.08333333333333e+00
+1387 1401 4.16666666666667e+00
+1387 2030 2.08333333333333e+00
+1387 2028 -4.16666666666667e+00
+1387 2288 -2.08333333333333e+00
+1387 2287 -6.25000000000000e+00
+1387 2286 4.16666666666667e+00
+1388 1388 6.25000000000000e+01
+1388 1386 -8.33333333333333e+00
+1388 1398 8.33333333333333e+00
+1388 1277 -6.25000000000000e+00
+1388 1400 -3.75000000000000e+01
+1388 1276 4.16666666666667e+00
+1388 1387 -8.33333333333333e+00
+1388 1399 8.33333333333333e+00
+1388 1275 -2.08333333333333e+00
+1388 1304 -6.25000000000000e+00
+1388 1303 4.16666666666667e+00
+1388 1573 -8.33333333333333e+00
+1388 1302 -2.08333333333333e+00
+1388 1572 4.16666666666667e+00
+1388 1570 2.08333333333333e+00
+1388 1391 -6.25000000000000e+00
+1388 1390 -2.08333333333333e+00
+1388 1389 4.16666666666667e+00
+1388 1575 -4.16666666666667e+00
+1388 1576 -4.16666666666667e+00
+1388 1402 4.16666666666667e+00
+1388 1569 2.08333333333333e+00
+1388 1401 -8.33333333333333e+00
+1388 2029 2.08333333333333e+00
+1388 2286 4.16666666666667e+00
+1388 2028 2.08333333333333e+00
+1388 2287 -2.08333333333333e+00
+1388 2288 -6.25000000000000e+00
+1389 1389 6.25000000000000e+01
+1389 1576 4.16666666666667e+00
+1389 1577 4.16666666666667e+00
+1389 1570 4.16666666666667e+00
+1389 1569 -6.25000000000000e+00
+1389 1391 -8.33333333333333e+00
+1389 1388 4.16666666666667e+00
+1389 1387 4.16666666666667e+00
+1389 1386 -1.87500000000000e+01
+1389 1402 -4.16666666666667e+00
+1389 1390 -8.33333333333333e+00
+1389 1553 4.16666666666667e+00
+1389 1588 -4.16666666666667e+00
+1389 1558 4.16666666666667e+00
+1389 1403 8.33333333333333e+00
+1389 1559 -8.33333333333333e+00
+1389 1307 2.08333333333333e+00
+1389 1589 -4.16666666666667e+00
+1389 1552 4.16666666666667e+00
+1389 1306 -4.16666666666667e+00
+1389 1551 -1.87500000000000e+01
+1389 1385 -2.08333333333333e+00
+1389 1277 2.08333333333333e+00
+1389 1384 4.16666666666667e+00
+1389 1276 -4.16666666666667e+00
+1389 1383 -6.25000000000000e+00
+1389 1571 -2.08333333333333e+00
+1389 1401 -1.25000000000000e+01
+1390 1390 6.25000000000000e+01
+1390 1575 4.16666666666667e+00
+1390 1577 -8.33333333333333e+00
+1390 1307 2.08333333333333e+00
+1390 1570 -1.87500000000000e+01
+1390 1569 4.16666666666667e+00
+1390 1388 -2.08333333333333e+00
+1390 1277 2.08333333333333e+00
+1390 1387 -6.25000000000000e+00
+1390 1386 4.16666666666667e+00
+1390 1401 -4.16666666666667e+00
+1390 1553 -2.08333333333333e+00
+1390 1389 -8.33333333333333e+00
+1390 1587 -4.16666666666667e+00
+1390 1557 4.16666666666667e+00
+1390 1589 -4.16666666666667e+00
+1390 1559 4.16666666666667e+00
+1390 1552 -6.25000000000000e+00
+1390 1551 4.16666666666667e+00
+1390 1305 -4.16666666666667e+00
+1390 1385 4.16666666666667e+00
+1390 1391 -8.33333333333333e+00
+1390 1403 8.33333333333333e+00
+1390 1384 -1.87500000000000e+01
+1390 1571 4.16666666666667e+00
+1390 1402 -1.25000000000000e+01
+1390 1383 4.16666666666667e+00
+1390 1275 -4.16666666666667e+00
+1391 1391 6.25000000000000e+01
+1391 1570 4.16666666666667e+00
+1391 1576 -8.33333333333333e+00
+1391 1575 4.16666666666667e+00
+1391 1571 -6.25000000000000e+00
+1391 1306 2.08333333333333e+00
+1391 1388 -6.25000000000000e+00
+1391 1387 -2.08333333333333e+00
+1391 1276 2.08333333333333e+00
+1391 1389 -8.33333333333333e+00
+1391 1386 4.16666666666667e+00
+1391 1552 -2.08333333333333e+00
+1391 1551 4.16666666666667e+00
+1391 1588 -4.16666666666667e+00
+1391 1558 4.16666666666667e+00
+1391 1401 8.33333333333333e+00
+1391 1557 -8.33333333333333e+00
+1391 1553 -6.25000000000000e+00
+1391 1305 2.08333333333333e+00
+1391 1587 -4.16666666666667e+00
+1391 1385 -6.25000000000000e+00
+1391 1569 -2.08333333333333e+00
+1391 1403 -3.75000000000000e+01
+1391 1384 4.16666666666667e+00
+1391 1390 -8.33333333333333e+00
+1391 1402 8.33333333333333e+00
+1391 1383 -2.08333333333333e+00
+1391 1275 2.08333333333333e+00
+1392 1392 6.25000000000000e+01
+1392 1400 -4.16666666666667e+00
+1392 1393 -8.33333333333333e+00
+1392 1399 8.33333333333333e+00
+1392 1277 4.16666666666667e+00
+1392 1276 -2.08333333333333e+00
+1392 1275 -6.25000000000000e+00
+1392 1398 -1.25000000000000e+01
+1392 1394 -8.33333333333333e+00
+1392 1310 4.16666666666667e+00
+1392 1309 -2.08333333333333e+00
+1392 1609 4.16666666666667e+00
+1392 1610 4.16666666666667e+00
+1392 1308 -6.25000000000000e+00
+1392 1403 4.16666666666667e+00
+1392 1613 -4.16666666666667e+00
+1392 1606 2.08333333333333e+00
+1392 1612 -4.16666666666667e+00
+1392 1607 -4.16666666666667e+00
+1392 1397 4.16666666666667e+00
+1392 1396 4.16666666666667e+00
+1392 1402 -8.33333333333333e+00
+1392 1395 -1.87500000000000e+01
+1392 2290 4.16666666666667e+00
+1392 2030 -4.16666666666667e+00
+1392 2029 2.08333333333333e+00
+1392 2291 4.16666666666667e+00
+1392 2289 -1.87500000000000e+01
+1393 1393 6.25000000000000e+01
+1393 1392 -8.33333333333333e+00
+1393 1398 8.33333333333333e+00
+1393 1277 4.16666666666667e+00
+1393 1394 -8.33333333333333e+00
+1393 1400 8.33333333333333e+00
+1393 1276 -6.25000000000000e+00
+1393 1399 -3.75000000000000e+01
+1393 1275 -2.08333333333333e+00
+1393 1310 4.16666666666667e+00
+1393 1610 -8.33333333333333e+00
+1393 1309 -6.25000000000000e+00
+1393 1308 -2.08333333333333e+00
+1393 1608 4.16666666666667e+00
+1393 1605 2.08333333333333e+00
+1393 1611 -4.16666666666667e+00
+1393 1607 2.08333333333333e+00
+1393 1613 -4.16666666666667e+00
+1393 1397 -2.08333333333333e+00
+1393 1403 4.16666666666667e+00
+1393 1396 -6.25000000000000e+00
+1393 1395 4.16666666666667e+00
+1393 1401 -8.33333333333333e+00
+1393 2291 -2.08333333333333e+00
+1393 2289 4.16666666666667e+00
+1393 2028 2.08333333333333e+00
+1393 2030 2.08333333333333e+00
+1393 2290 -6.25000000000000e+00
+1394 1394 6.25000000000000e+01
+1394 1398 -4.16666666666667e+00
+1394 1277 -1.87500000000000e+01
+1394 1400 -1.25000000000000e+01
+1394 1276 4.16666666666667e+00
+1394 1393 -8.33333333333333e+00
+1394 1399 8.33333333333333e+00
+1394 1275 4.16666666666667e+00
+1394 1608 4.16666666666667e+00
+1394 1310 -1.87500000000000e+01
+1394 1309 4.16666666666667e+00
+1394 1609 -8.33333333333333e+00
+1394 1392 -8.33333333333333e+00
+1394 1308 4.16666666666667e+00
+1394 1401 4.16666666666667e+00
+1394 1611 -4.16666666666667e+00
+1394 1606 2.08333333333333e+00
+1394 1612 -4.16666666666667e+00
+1394 1605 -4.16666666666667e+00
+1394 1397 -6.25000000000000e+00
+1394 1396 -2.08333333333333e+00
+1394 1402 4.16666666666667e+00
+1394 1395 4.16666666666667e+00
+1394 2029 2.08333333333333e+00
+1394 2290 -2.08333333333333e+00
+1394 2028 -4.16666666666667e+00
+1394 2291 -6.25000000000000e+00
+1394 2289 4.16666666666667e+00
+1395 1395 6.25000000000000e+01
+1395 1559 4.16666666666667e+00
+1395 1558 -8.33333333333333e+00
+1395 1556 4.16666666666667e+00
+1395 1312 2.08333333333333e+00
+1395 1554 -1.87500000000000e+01
+1395 1385 4.16666666666667e+00
+1395 1384 -2.08333333333333e+00
+1395 1276 2.08333333333333e+00
+1395 1383 -6.25000000000000e+00
+1395 1403 -4.16666666666667e+00
+1395 1397 -8.33333333333333e+00
+1395 1606 -2.08333333333333e+00
+1395 1625 -4.16666666666667e+00
+1395 1613 4.16666666666667e+00
+1395 1624 -4.16666666666667e+00
+1395 1612 4.16666666666667e+00
+1395 1607 4.16666666666667e+00
+1395 1313 -4.16666666666667e+00
+1395 1605 -6.25000000000000e+00
+1395 1394 4.16666666666667e+00
+1395 1277 -4.16666666666667e+00
+1395 1393 4.16666666666667e+00
+1395 1396 -8.33333333333333e+00
+1395 1402 8.33333333333333e+00
+1395 1392 -1.87500000000000e+01
+1395 1555 4.16666666666667e+00
+1395 1401 -1.25000000000000e+01
+1396 1396 6.25000000000000e+01
+1396 1559 4.16666666666667e+00
+1396 1554 4.16666666666667e+00
+1396 1557 -8.33333333333333e+00
+1396 1555 -6.25000000000000e+00
+1396 1311 2.08333333333333e+00
+1396 1385 4.16666666666667e+00
+1396 1397 -8.33333333333333e+00
+1396 1384 -6.25000000000000e+00
+1396 1383 -2.08333333333333e+00
+1396 1275 2.08333333333333e+00
+1396 1605 -2.08333333333333e+00
+1396 1607 4.16666666666667e+00
+1396 1403 8.33333333333333e+00
+1396 1613 -8.33333333333333e+00
+1396 1623 -4.16666666666667e+00
+1396 1611 4.16666666666667e+00
+1396 1313 2.08333333333333e+00
+1396 1625 -4.16666666666667e+00
+1396 1606 -6.25000000000000e+00
+1396 1394 -2.08333333333333e+00
+1396 1277 2.08333333333333e+00
+1396 1393 -6.25000000000000e+00
+1396 1556 -2.08333333333333e+00
+1396 1402 -3.75000000000000e+01
+1396 1392 4.16666666666667e+00
+1396 1395 -8.33333333333333e+00
+1396 1401 8.33333333333333e+00
+1397 1397 6.25000000000000e+01
+1397 1558 4.16666666666667e+00
+1397 1557 4.16666666666667e+00
+1397 1556 -6.25000000000000e+00
+1397 1554 4.16666666666667e+00
+1397 1385 -1.87500000000000e+01
+1397 1384 4.16666666666667e+00
+1397 1396 -8.33333333333333e+00
+1397 1383 4.16666666666667e+00
+1397 1401 -4.16666666666667e+00
+1397 1395 -8.33333333333333e+00
+1397 1606 4.16666666666667e+00
+1397 1623 -4.16666666666667e+00
+1397 1611 4.16666666666667e+00
+1397 1402 8.33333333333333e+00
+1397 1612 -8.33333333333333e+00
+1397 1607 -1.87500000000000e+01
+1397 1312 2.08333333333333e+00
+1397 1624 -4.16666666666667e+00
+1397 1605 4.16666666666667e+00
+1397 1311 -4.16666666666667e+00
+1397 1394 -6.25000000000000e+00
+1397 1555 -2.08333333333333e+00
+1397 1403 -1.25000000000000e+01
+1397 1393 -2.08333333333333e+00
+1397 1276 2.08333333333333e+00
+1397 1392 4.16666666666667e+00
+1397 1275 -4.16666666666667e+00
+1398 1398 1.25000000000000e+02
+1398 1387 -4.16666666666667e+00
+1398 1277 4.16666666666667e+00
+1398 1386 -1.25000000000000e+01
+1398 1574 -4.16666666666667e+00
+1398 1316 4.16666666666667e+00
+1398 1399 -1.66666666666667e+01
+1398 1573 8.33333333333333e+00
+1398 1572 -1.25000000000000e+01
+1398 1394 -4.16666666666667e+00
+1398 1393 8.33333333333333e+00
+1398 1276 4.16666666666667e+00
+1398 1392 -1.25000000000000e+01
+1398 1400 -1.66666666666667e+01
+1398 1610 8.33333333333333e+00
+1398 1609 -4.16666666666667e+00
+1398 1315 4.16666666666667e+00
+1398 1388 8.33333333333333e+00
+1398 1608 -1.25000000000000e+01
+1398 1576 -8.33333333333333e+00
+1398 1403 8.33333333333333e+00
+1398 1613 -8.33333333333333e+00
+1398 1642 -4.16666666666667e+00
+1398 1612 4.16666666666667e+00
+1398 1643 -4.16666666666667e+00
+1398 1402 8.33333333333333e+00
+1398 1577 4.16666666666667e+00
+1398 1401 -3.75000000000000e+01
+1398 2287 4.16666666666667e+00
+1398 2288 -8.33333333333333e+00
+1398 2030 -4.16666666666667e+00
+1398 2291 4.16666666666667e+00
+1398 2293 8.33333333333333e+00
+1398 2290 -8.33333333333333e+00
+1398 2029 -4.16666666666667e+00
+1398 2294 8.33333333333333e+00
+1398 2292 -3.75000000000000e+01
+1399 1399 1.25000000000000e+02
+1399 1386 -4.16666666666667e+00
+1399 1388 8.33333333333333e+00
+1399 1387 -1.25000000000000e+01
+1399 1574 8.33333333333333e+00
+1399 1573 -3.75000000000000e+01
+1399 1398 -1.66666666666667e+01
+1399 1572 8.33333333333333e+00
+1399 1400 -1.66666666666667e+01
+1399 1392 8.33333333333333e+00
+1399 1277 -8.33333333333333e+00
+1399 1394 8.33333333333333e+00
+1399 1393 -3.75000000000000e+01
+1399 1275 4.16666666666667e+00
+1399 1610 8.33333333333333e+00
+1399 1316 -8.33333333333333e+00
+1399 1609 -1.25000000000000e+01
+1399 1608 -4.16666666666667e+00
+1399 1314 4.16666666666667e+00
+1399 1577 4.16666666666667e+00
+1399 1575 -8.33333333333333e+00
+1399 1403 -4.16666666666667e+00
+1399 1643 -4.16666666666667e+00
+1399 1613 4.16666666666667e+00
+1399 1641 -4.16666666666667e+00
+1399 1611 4.16666666666667e+00
+1399 1402 -1.25000000000000e+01
+1399 1401 8.33333333333333e+00
+1399 2288 4.16666666666667e+00
+1399 2294 -4.16666666666667e+00
+1399 2030 -4.16666666666667e+00
+1399 2291 4.16666666666667e+00
+1399 2292 8.33333333333333e+00
+1399 2289 -8.33333333333333e+00
+1399 2028 -4.16666666666667e+00
+1399 2286 4.16666666666667e+00
+1399 2293 -1.25000000000000e+01
+1400 1400 1.25000000000000e+02
+1400 1388 -3.75000000000000e+01
+1400 1387 8.33333333333333e+00
+1400 1275 4.16666666666667e+00
+1400 1574 -1.25000000000000e+01
+1400 1573 8.33333333333333e+00
+1400 1572 -4.16666666666667e+00
+1400 1314 4.16666666666667e+00
+1400 1399 -1.66666666666667e+01
+1400 1392 -4.16666666666667e+00
+1400 1394 -1.25000000000000e+01
+1400 1276 -8.33333333333333e+00
+1400 1393 8.33333333333333e+00
+1400 1386 8.33333333333333e+00
+1400 1610 -3.75000000000000e+01
+1400 1609 8.33333333333333e+00
+1400 1315 -8.33333333333333e+00
+1400 1398 -1.66666666666667e+01
+1400 1608 8.33333333333333e+00
+1400 1576 4.16666666666667e+00
+1400 1402 -4.16666666666667e+00
+1400 1642 -4.16666666666667e+00
+1400 1612 4.16666666666667e+00
+1400 1401 8.33333333333333e+00
+1400 1611 -8.33333333333333e+00
+1400 1641 -4.16666666666667e+00
+1400 1575 4.16666666666667e+00
+1400 1403 -1.25000000000000e+01
+1400 2287 4.16666666666667e+00
+1400 2286 -8.33333333333333e+00
+1400 2293 -4.16666666666667e+00
+1400 2029 -4.16666666666667e+00
+1400 2290 4.16666666666667e+00
+1400 2028 -4.16666666666667e+00
+1400 2289 4.16666666666667e+00
+1400 2294 -1.25000000000000e+01
+1400 2292 8.33333333333333e+00
+1401 1401 1.25000000000000e+02
+1401 1576 8.33333333333333e+00
+1401 1575 -1.25000000000000e+01
+1401 1388 -8.33333333333333e+00
+1401 1387 4.16666666666667e+00
+1401 1400 8.33333333333333e+00
+1401 1642 4.16666666666667e+00
+1401 1399 8.33333333333333e+00
+1401 1398 -3.75000000000000e+01
+1401 1643 4.16666666666667e+00
+1401 1390 -4.16666666666667e+00
+1401 1391 8.33333333333333e+00
+1401 1403 -1.66666666666667e+01
+1401 1277 -4.16666666666667e+00
+1401 1389 -1.25000000000000e+01
+1401 1589 4.16666666666667e+00
+1401 1319 -4.16666666666667e+00
+1401 1588 -8.33333333333333e+00
+1401 1385 4.16666666666667e+00
+1401 1558 8.33333333333333e+00
+1401 1402 -1.66666666666667e+01
+1401 1559 8.33333333333333e+00
+1401 1318 -4.16666666666667e+00
+1401 1557 -3.75000000000000e+01
+1401 1384 4.16666666666667e+00
+1401 1276 -4.16666666666667e+00
+1401 1397 -4.16666666666667e+00
+1401 1394 4.16666666666667e+00
+1401 1624 4.16666666666667e+00
+1401 1612 -4.16666666666667e+00
+1401 1393 -8.33333333333333e+00
+1401 1396 8.33333333333333e+00
+1401 1395 -1.25000000000000e+01
+1401 1613 8.33333333333333e+00
+1401 1625 -8.33333333333333e+00
+1401 1611 -1.25000000000000e+01
+1401 1577 -4.16666666666667e+00
+1402 1402 1.25000000000000e+02
+1402 1575 8.33333333333333e+00
+1402 1577 8.33333333333333e+00
+1402 1576 -3.75000000000000e+01
+1402 1386 4.16666666666667e+00
+1402 1400 -4.16666666666667e+00
+1402 1641 4.16666666666667e+00
+1402 1399 -1.25000000000000e+01
+1402 1398 8.33333333333333e+00
+1402 1643 -8.33333333333333e+00
+1402 1389 -4.16666666666667e+00
+1402 1589 4.16666666666667e+00
+1402 1391 8.33333333333333e+00
+1402 1390 -1.25000000000000e+01
+1402 1587 -8.33333333333333e+00
+1402 1559 -4.16666666666667e+00
+1402 1557 8.33333333333333e+00
+1402 1401 -1.66666666666667e+01
+1402 1558 -1.25000000000000e+01
+1402 1317 -4.16666666666667e+00
+1402 1385 -8.33333333333333e+00
+1402 1383 4.16666666666667e+00
+1402 1275 -4.16666666666667e+00
+1402 1397 8.33333333333333e+00
+1402 1403 -1.66666666666667e+01
+1402 1613 8.33333333333333e+00
+1402 1623 4.16666666666667e+00
+1402 1611 -4.16666666666667e+00
+1402 1394 4.16666666666667e+00
+1402 1277 -4.16666666666667e+00
+1402 1396 -3.75000000000000e+01
+1402 1392 -8.33333333333333e+00
+1402 1395 8.33333333333333e+00
+1402 1625 4.16666666666667e+00
+1402 1319 -4.16666666666667e+00
+1402 1612 -1.25000000000000e+01
+1402 1388 4.16666666666667e+00
+1403 1403 1.25000000000000e+02
+1403 1387 4.16666666666667e+00
+1403 1577 -1.25000000000000e+01
+1403 1576 8.33333333333333e+00
+1403 1386 -8.33333333333333e+00
+1403 1399 -4.16666666666667e+00
+1403 1398 8.33333333333333e+00
+1403 1400 -1.25000000000000e+01
+1403 1642 -8.33333333333333e+00
+1403 1641 4.16666666666667e+00
+1403 1588 4.16666666666667e+00
+1403 1389 8.33333333333333e+00
+1403 1401 -1.66666666666667e+01
+1403 1391 -3.75000000000000e+01
+1403 1390 8.33333333333333e+00
+1403 1275 -4.16666666666667e+00
+1403 1587 4.16666666666667e+00
+1403 1317 -4.16666666666667e+00
+1403 1558 -4.16666666666667e+00
+1403 1383 4.16666666666667e+00
+1403 1559 -1.25000000000000e+01
+1403 1557 8.33333333333333e+00
+1403 1384 -8.33333333333333e+00
+1403 1395 -4.16666666666667e+00
+1403 1392 4.16666666666667e+00
+1403 1396 8.33333333333333e+00
+1403 1402 -1.66666666666667e+01
+1403 1612 8.33333333333333e+00
+1403 1397 -1.25000000000000e+01
+1403 1393 4.16666666666667e+00
+1403 1276 -4.16666666666667e+00
+1403 1613 -3.75000000000000e+01
+1403 1575 -4.16666666666667e+00
+1403 1624 4.16666666666667e+00
+1403 1318 -4.16666666666667e+00
+1403 1611 8.33333333333333e+00
+1403 1623 -8.33333333333333e+00
+1404 1404 3.75000000000000e+01
+1404 1279 2.08333333333333e+00
+1404 1411 -4.16666666666667e+00
+1404 1562 -2.08333333333333e+00
+1404 1405 -4.16666666666667e+00
+1404 1561 4.16666666666667e+00
+1404 1300 2.08333333333333e+00
+1404 1560 -6.25000000000000e+00
+1404 1424 -4.16666666666667e+00
+1404 1568 4.16666666666667e+00
+1404 1280 2.08333333333333e+00
+1404 1418 -4.16666666666667e+00
+1404 1417 2.08333333333333e+00
+1404 1423 -4.16666666666667e+00
+1404 1278 -1.25000000000000e+01
+1404 1406 -4.16666666666667e+00
+1404 1565 4.16666666666667e+00
+1404 1301 2.08333333333333e+00
+1404 1564 -2.08333333333333e+00
+1404 1567 4.16666666666667e+00
+1404 1412 2.08333333333333e+00
+1404 1563 -6.25000000000000e+00
+1404 1299 -1.25000000000000e+01
+1405 1405 3.33333333333333e+01
+1405 1278 2.08333333333333e+00
+1405 1410 -4.16666666666667e+00
+1405 1562 4.16666666666667e+00
+1405 1561 -1.87500000000000e+01
+1405 1404 -4.16666666666667e+00
+1405 1560 4.16666666666667e+00
+1405 1299 2.08333333333333e+00
+1405 1418 2.08333333333333e+00
+1405 1424 -4.16666666666667e+00
+1405 1279 -4.16666666666667e+00
+1405 1416 2.08333333333333e+00
+1405 1422 -4.16666666666667e+00
+1405 1565 4.16666666666667e+00
+1405 1568 -8.33333333333333e+00
+1405 1412 2.08333333333333e+00
+1405 1564 -6.25000000000000e+00
+1405 1300 -4.16666666666667e+00
+1405 1563 -2.08333333333333e+00
+1405 1566 4.16666666666667e+00
+1406 1406 3.33333333333333e+01
+1406 1410 2.08333333333333e+00
+1406 1562 -6.25000000000000e+00
+1406 1561 4.16666666666667e+00
+1406 1560 -2.08333333333333e+00
+1406 1417 2.08333333333333e+00
+1406 1423 -4.16666666666667e+00
+1406 1422 -4.16666666666667e+00
+1406 1566 4.16666666666667e+00
+1406 1280 -4.16666666666667e+00
+1406 1278 2.08333333333333e+00
+1406 1416 -4.16666666666667e+00
+1406 1411 2.08333333333333e+00
+1406 1565 -1.87500000000000e+01
+1406 1301 -4.16666666666667e+00
+1406 1564 4.16666666666667e+00
+1406 1567 -8.33333333333333e+00
+1406 1404 -4.16666666666667e+00
+1406 1563 4.16666666666667e+00
+1406 1299 2.08333333333333e+00
+1407 1407 3.75000000000000e+01
+1407 1321 2.08333333333333e+00
+1407 1678 -4.16666666666667e+00
+1407 1415 -2.08333333333333e+00
+1407 1408 -4.16666666666667e+00
+1407 1414 4.16666666666667e+00
+1407 1279 2.08333333333333e+00
+1407 1413 -6.25000000000000e+00
+1407 1685 -4.16666666666667e+00
+1407 1427 4.16666666666667e+00
+1407 1322 2.08333333333333e+00
+1407 1682 -4.16666666666667e+00
+1407 1681 2.08333333333333e+00
+1407 1684 -4.16666666666667e+00
+1407 1320 -1.25000000000000e+01
+1407 1409 -4.16666666666667e+00
+1407 1421 4.16666666666667e+00
+1407 1280 2.08333333333333e+00
+1407 1420 -2.08333333333333e+00
+1407 1426 4.16666666666667e+00
+1407 1679 2.08333333333333e+00
+1407 1419 -6.25000000000000e+00
+1407 1278 -1.25000000000000e+01
+1408 1408 3.33333333333333e+01
+1408 1320 2.08333333333333e+00
+1408 1677 -4.16666666666667e+00
+1408 1415 4.16666666666667e+00
+1408 1414 -1.87500000000000e+01
+1408 1407 -4.16666666666667e+00
+1408 1413 4.16666666666667e+00
+1408 1278 2.08333333333333e+00
+1408 1682 2.08333333333333e+00
+1408 1685 -4.16666666666667e+00
+1408 1321 -4.16666666666667e+00
+1408 1680 2.08333333333333e+00
+1408 1683 -4.16666666666667e+00
+1408 1421 4.16666666666667e+00
+1408 1427 -8.33333333333333e+00
+1408 1679 2.08333333333333e+00
+1408 1420 -6.25000000000000e+00
+1408 1279 -4.16666666666667e+00
+1408 1419 -2.08333333333333e+00
+1408 1425 4.16666666666667e+00
+1409 1409 3.33333333333333e+01
+1409 1677 2.08333333333333e+00
+1409 1415 -6.25000000000000e+00
+1409 1414 4.16666666666667e+00
+1409 1413 -2.08333333333333e+00
+1409 1681 2.08333333333333e+00
+1409 1684 -4.16666666666667e+00
+1409 1683 -4.16666666666667e+00
+1409 1425 4.16666666666667e+00
+1409 1322 -4.16666666666667e+00
+1409 1320 2.08333333333333e+00
+1409 1680 -4.16666666666667e+00
+1409 1678 2.08333333333333e+00
+1409 1421 -1.87500000000000e+01
+1409 1280 -4.16666666666667e+00
+1409 1420 4.16666666666667e+00
+1409 1426 -8.33333333333333e+00
+1409 1407 -4.16666666666667e+00
+1409 1419 4.16666666666667e+00
+1409 1278 2.08333333333333e+00
+1410 1410 6.25000000000000e+01
+1410 1696 -4.16666666666667e+00
+1410 1415 4.16666666666667e+00
+1410 1414 4.16666666666667e+00
+1410 1413 -1.87500000000000e+01
+1410 1703 -4.16666666666667e+00
+1410 1702 -4.16666666666667e+00
+1410 1427 -8.33333333333333e+00
+1410 1426 4.16666666666667e+00
+1410 1562 4.16666666666667e+00
+1410 1412 -8.33333333333333e+00
+1410 1424 8.33333333333333e+00
+1410 1699 4.16666666666667e+00
+1410 1423 -4.16666666666667e+00
+1410 1280 -2.08333333333333e+00
+1410 1406 2.08333333333333e+00
+1410 1279 4.16666666666667e+00
+1410 1405 -4.16666666666667e+00
+1410 1278 -6.25000000000000e+00
+1410 1422 -1.25000000000000e+01
+1410 1325 -2.08333333333333e+00
+1410 1700 4.16666666666667e+00
+1410 1411 -8.33333333333333e+00
+1410 1324 4.16666666666667e+00
+1410 1561 4.16666666666667e+00
+1410 1697 2.08333333333333e+00
+1410 1323 -6.25000000000000e+00
+1410 1560 -1.87500000000000e+01
+1411 1411 6.25000000000000e+01
+1411 1695 -4.16666666666667e+00
+1411 1415 -2.08333333333333e+00
+1411 1414 -6.25000000000000e+00
+1411 1413 4.16666666666667e+00
+1411 1703 -4.16666666666667e+00
+1411 1427 4.16666666666667e+00
+1411 1701 -4.16666666666667e+00
+1411 1425 4.16666666666667e+00
+1411 1562 -2.08333333333333e+00
+1411 1406 2.08333333333333e+00
+1411 1698 4.16666666666667e+00
+1411 1422 -4.16666666666667e+00
+1411 1280 4.16666666666667e+00
+1411 1412 -8.33333333333333e+00
+1411 1424 8.33333333333333e+00
+1411 1279 -1.87500000000000e+01
+1411 1423 -1.25000000000000e+01
+1411 1278 4.16666666666667e+00
+1411 1404 -4.16666666666667e+00
+1411 1325 4.16666666666667e+00
+1411 1700 -8.33333333333333e+00
+1411 1697 2.08333333333333e+00
+1411 1324 -1.87500000000000e+01
+1411 1561 -6.25000000000000e+00
+1411 1410 -8.33333333333333e+00
+1411 1323 4.16666666666667e+00
+1411 1560 4.16666666666667e+00
+1412 1412 6.25000000000000e+01
+1412 1696 2.08333333333333e+00
+1412 1415 -6.25000000000000e+00
+1412 1414 -2.08333333333333e+00
+1412 1413 4.16666666666667e+00
+1412 1701 -4.16666666666667e+00
+1412 1702 -4.16666666666667e+00
+1412 1426 4.16666666666667e+00
+1412 1425 -8.33333333333333e+00
+1412 1561 -2.08333333333333e+00
+1412 1405 2.08333333333333e+00
+1412 1560 4.16666666666667e+00
+1412 1410 -8.33333333333333e+00
+1412 1422 8.33333333333333e+00
+1412 1280 -6.25000000000000e+00
+1412 1424 -3.75000000000000e+01
+1412 1279 4.16666666666667e+00
+1412 1411 -8.33333333333333e+00
+1412 1423 8.33333333333333e+00
+1412 1278 -2.08333333333333e+00
+1412 1404 2.08333333333333e+00
+1412 1695 2.08333333333333e+00
+1412 1325 -6.25000000000000e+00
+1412 1562 -6.25000000000000e+00
+1412 1324 4.16666666666667e+00
+1412 1699 -8.33333333333333e+00
+1412 1323 -2.08333333333333e+00
+1412 1698 4.16666666666667e+00
+1413 1413 6.25000000000000e+01
+1413 1702 4.16666666666667e+00
+1413 1703 4.16666666666667e+00
+1413 1696 4.16666666666667e+00
+1413 1695 -6.25000000000000e+00
+1413 1415 -8.33333333333333e+00
+1413 1412 4.16666666666667e+00
+1413 1411 4.16666666666667e+00
+1413 1410 -1.87500000000000e+01
+1413 1426 -4.16666666666667e+00
+1413 1414 -8.33333333333333e+00
+1413 1679 4.16666666666667e+00
+1413 1714 -4.16666666666667e+00
+1413 1684 4.16666666666667e+00
+1413 1427 8.33333333333333e+00
+1413 1685 -8.33333333333333e+00
+1413 1328 2.08333333333333e+00
+1413 1715 -4.16666666666667e+00
+1413 1678 4.16666666666667e+00
+1413 1327 -4.16666666666667e+00
+1413 1677 -1.87500000000000e+01
+1413 1409 -2.08333333333333e+00
+1413 1280 2.08333333333333e+00
+1413 1408 4.16666666666667e+00
+1413 1279 -4.16666666666667e+00
+1413 1407 -6.25000000000000e+00
+1413 1697 -2.08333333333333e+00
+1413 1425 -1.25000000000000e+01
+1414 1414 6.25000000000000e+01
+1414 1701 4.16666666666667e+00
+1414 1703 -8.33333333333333e+00
+1414 1328 2.08333333333333e+00
+1414 1696 -1.87500000000000e+01
+1414 1695 4.16666666666667e+00
+1414 1412 -2.08333333333333e+00
+1414 1280 2.08333333333333e+00
+1414 1411 -6.25000000000000e+00
+1414 1410 4.16666666666667e+00
+1414 1425 -4.16666666666667e+00
+1414 1679 -2.08333333333333e+00
+1414 1413 -8.33333333333333e+00
+1414 1713 -4.16666666666667e+00
+1414 1683 4.16666666666667e+00
+1414 1715 -4.16666666666667e+00
+1414 1685 4.16666666666667e+00
+1414 1678 -6.25000000000000e+00
+1414 1677 4.16666666666667e+00
+1414 1326 -4.16666666666667e+00
+1414 1409 4.16666666666667e+00
+1414 1415 -8.33333333333333e+00
+1414 1427 8.33333333333333e+00
+1414 1408 -1.87500000000000e+01
+1414 1697 4.16666666666667e+00
+1414 1426 -1.25000000000000e+01
+1414 1407 4.16666666666667e+00
+1414 1278 -4.16666666666667e+00
+1415 1415 6.25000000000000e+01
+1415 1696 4.16666666666667e+00
+1415 1702 -8.33333333333333e+00
+1415 1701 4.16666666666667e+00
+1415 1697 -6.25000000000000e+00
+1415 1327 2.08333333333333e+00
+1415 1412 -6.25000000000000e+00
+1415 1411 -2.08333333333333e+00
+1415 1279 2.08333333333333e+00
+1415 1413 -8.33333333333333e+00
+1415 1410 4.16666666666667e+00
+1415 1678 -2.08333333333333e+00
+1415 1677 4.16666666666667e+00
+1415 1714 -4.16666666666667e+00
+1415 1684 4.16666666666667e+00
+1415 1425 8.33333333333333e+00
+1415 1683 -8.33333333333333e+00
+1415 1679 -6.25000000000000e+00
+1415 1326 2.08333333333333e+00
+1415 1713 -4.16666666666667e+00
+1415 1409 -6.25000000000000e+00
+1415 1695 -2.08333333333333e+00
+1415 1427 -3.75000000000000e+01
+1415 1408 4.16666666666667e+00
+1415 1414 -8.33333333333333e+00
+1415 1426 8.33333333333333e+00
+1415 1407 -2.08333333333333e+00
+1415 1278 2.08333333333333e+00
+1416 1416 6.25000000000000e+01
+1416 1739 -4.16666666666667e+00
+1416 1732 2.08333333333333e+00
+1416 1738 -4.16666666666667e+00
+1416 1733 -4.16666666666667e+00
+1416 1421 4.16666666666667e+00
+1416 1420 4.16666666666667e+00
+1416 1426 -8.33333333333333e+00
+1416 1419 -1.87500000000000e+01
+1416 1736 4.16666666666667e+00
+1416 1424 -4.16666666666667e+00
+1416 1417 -8.33333333333333e+00
+1416 1423 8.33333333333333e+00
+1416 1564 4.16666666666667e+00
+1416 1280 4.16666666666667e+00
+1416 1406 -4.16666666666667e+00
+1416 1279 -2.08333333333333e+00
+1416 1405 2.08333333333333e+00
+1416 1278 -6.25000000000000e+00
+1416 1422 -1.25000000000000e+01
+1416 1418 -8.33333333333333e+00
+1416 1331 4.16666666666667e+00
+1416 1565 4.16666666666667e+00
+1416 1330 -2.08333333333333e+00
+1416 1735 4.16666666666667e+00
+1416 1427 4.16666666666667e+00
+1416 1329 -6.25000000000000e+00
+1416 1563 -1.87500000000000e+01
+1417 1417 6.25000000000000e+01
+1417 1737 -4.16666666666667e+00
+1417 1733 2.08333333333333e+00
+1417 1739 -4.16666666666667e+00
+1417 1421 -2.08333333333333e+00
+1417 1427 4.16666666666667e+00
+1417 1420 -6.25000000000000e+00
+1417 1419 4.16666666666667e+00
+1417 1425 -8.33333333333333e+00
+1417 1406 2.08333333333333e+00
+1417 1565 -2.08333333333333e+00
+1417 1416 -8.33333333333333e+00
+1417 1422 8.33333333333333e+00
+1417 1563 4.16666666666667e+00
+1417 1280 4.16666666666667e+00
+1417 1418 -8.33333333333333e+00
+1417 1424 8.33333333333333e+00
+1417 1279 -6.25000000000000e+00
+1417 1423 -3.75000000000000e+01
+1417 1278 -2.08333333333333e+00
+1417 1404 2.08333333333333e+00
+1417 1331 4.16666666666667e+00
+1417 1736 -8.33333333333333e+00
+1417 1731 2.08333333333333e+00
+1417 1330 -6.25000000000000e+00
+1417 1564 -6.25000000000000e+00
+1417 1329 -2.08333333333333e+00
+1417 1734 4.16666666666667e+00
+1418 1418 6.25000000000000e+01
+1418 1737 -4.16666666666667e+00
+1418 1732 2.08333333333333e+00
+1418 1738 -4.16666666666667e+00
+1418 1731 -4.16666666666667e+00
+1418 1421 -6.25000000000000e+00
+1418 1420 -2.08333333333333e+00
+1418 1426 4.16666666666667e+00
+1418 1419 4.16666666666667e+00
+1418 1734 4.16666666666667e+00
+1418 1422 -4.16666666666667e+00
+1418 1405 2.08333333333333e+00
+1418 1564 -2.08333333333333e+00
+1418 1280 -1.87500000000000e+01
+1418 1424 -1.25000000000000e+01
+1418 1279 4.16666666666667e+00
+1418 1417 -8.33333333333333e+00
+1418 1423 8.33333333333333e+00
+1418 1278 4.16666666666667e+00
+1418 1404 -4.16666666666667e+00
+1418 1425 4.16666666666667e+00
+1418 1331 -1.87500000000000e+01
+1418 1565 -6.25000000000000e+00
+1418 1330 4.16666666666667e+00
+1418 1735 -8.33333333333333e+00
+1418 1416 -8.33333333333333e+00
+1418 1329 4.16666666666667e+00
+1418 1563 4.16666666666667e+00
+1419 1419 6.25000000000000e+01
+1419 1685 4.16666666666667e+00
+1419 1684 -8.33333333333333e+00
+1419 1682 4.16666666666667e+00
+1419 1333 2.08333333333333e+00
+1419 1680 -1.87500000000000e+01
+1419 1409 4.16666666666667e+00
+1419 1408 -2.08333333333333e+00
+1419 1279 2.08333333333333e+00
+1419 1407 -6.25000000000000e+00
+1419 1427 -4.16666666666667e+00
+1419 1421 -8.33333333333333e+00
+1419 1732 -2.08333333333333e+00
+1419 1751 -4.16666666666667e+00
+1419 1739 4.16666666666667e+00
+1419 1750 -4.16666666666667e+00
+1419 1738 4.16666666666667e+00
+1419 1733 4.16666666666667e+00
+1419 1334 -4.16666666666667e+00
+1419 1731 -6.25000000000000e+00
+1419 1418 4.16666666666667e+00
+1419 1280 -4.16666666666667e+00
+1419 1417 4.16666666666667e+00
+1419 1420 -8.33333333333333e+00
+1419 1426 8.33333333333333e+00
+1419 1416 -1.87500000000000e+01
+1419 1681 4.16666666666667e+00
+1419 1425 -1.25000000000000e+01
+1420 1420 6.25000000000000e+01
+1420 1685 4.16666666666667e+00
+1420 1680 4.16666666666667e+00
+1420 1683 -8.33333333333333e+00
+1420 1681 -6.25000000000000e+00
+1420 1332 2.08333333333333e+00
+1420 1409 4.16666666666667e+00
+1420 1421 -8.33333333333333e+00
+1420 1408 -6.25000000000000e+00
+1420 1407 -2.08333333333333e+00
+1420 1278 2.08333333333333e+00
+1420 1731 -2.08333333333333e+00
+1420 1733 4.16666666666667e+00
+1420 1427 8.33333333333333e+00
+1420 1739 -8.33333333333333e+00
+1420 1749 -4.16666666666667e+00
+1420 1737 4.16666666666667e+00
+1420 1334 2.08333333333333e+00
+1420 1751 -4.16666666666667e+00
+1420 1732 -6.25000000000000e+00
+1420 1418 -2.08333333333333e+00
+1420 1280 2.08333333333333e+00
+1420 1417 -6.25000000000000e+00
+1420 1682 -2.08333333333333e+00
+1420 1426 -3.75000000000000e+01
+1420 1416 4.16666666666667e+00
+1420 1419 -8.33333333333333e+00
+1420 1425 8.33333333333333e+00
+1421 1421 6.25000000000000e+01
+1421 1684 4.16666666666667e+00
+1421 1683 4.16666666666667e+00
+1421 1682 -6.25000000000000e+00
+1421 1680 4.16666666666667e+00
+1421 1409 -1.87500000000000e+01
+1421 1408 4.16666666666667e+00
+1421 1420 -8.33333333333333e+00
+1421 1407 4.16666666666667e+00
+1421 1425 -4.16666666666667e+00
+1421 1419 -8.33333333333333e+00
+1421 1732 4.16666666666667e+00
+1421 1749 -4.16666666666667e+00
+1421 1737 4.16666666666667e+00
+1421 1426 8.33333333333333e+00
+1421 1738 -8.33333333333333e+00
+1421 1733 -1.87500000000000e+01
+1421 1333 2.08333333333333e+00
+1421 1750 -4.16666666666667e+00
+1421 1731 4.16666666666667e+00
+1421 1332 -4.16666666666667e+00
+1421 1418 -6.25000000000000e+00
+1421 1681 -2.08333333333333e+00
+1421 1427 -1.25000000000000e+01
+1421 1417 -2.08333333333333e+00
+1421 1279 2.08333333333333e+00
+1421 1416 4.16666666666667e+00
+1421 1278 -4.16666666666667e+00
+1422 1422 1.25000000000000e+02
+1422 1702 -8.33333333333333e+00
+1422 1427 8.33333333333333e+00
+1422 1739 -8.33333333333333e+00
+1422 1768 -4.16666666666667e+00
+1422 1738 4.16666666666667e+00
+1422 1769 -4.16666666666667e+00
+1422 1426 8.33333333333333e+00
+1422 1425 -3.75000000000000e+01
+1422 1412 8.33333333333333e+00
+1422 1561 4.16666666666667e+00
+1422 1411 -4.16666666666667e+00
+1422 1562 -8.33333333333333e+00
+1422 1280 4.16666666666667e+00
+1422 1410 -1.25000000000000e+01
+1422 1700 -4.16666666666667e+00
+1422 1337 4.16666666666667e+00
+1422 1423 -1.66666666666667e+01
+1422 1699 8.33333333333333e+00
+1422 1698 -1.25000000000000e+01
+1422 1418 -4.16666666666667e+00
+1422 1417 8.33333333333333e+00
+1422 1406 -4.16666666666667e+00
+1422 1565 4.16666666666667e+00
+1422 1567 8.33333333333333e+00
+1422 1564 -8.33333333333333e+00
+1422 1279 4.16666666666667e+00
+1422 1405 -4.16666666666667e+00
+1422 1416 -1.25000000000000e+01
+1422 1424 -1.66666666666667e+01
+1422 1736 8.33333333333333e+00
+1422 1568 8.33333333333333e+00
+1422 1735 -4.16666666666667e+00
+1422 1336 4.16666666666667e+00
+1422 1703 4.16666666666667e+00
+1422 1734 -1.25000000000000e+01
+1422 1566 -3.75000000000000e+01
+1423 1423 1.25000000000000e+02
+1423 1701 -8.33333333333333e+00
+1423 1427 -4.16666666666667e+00
+1423 1769 -4.16666666666667e+00
+1423 1739 4.16666666666667e+00
+1423 1767 -4.16666666666667e+00
+1423 1737 4.16666666666667e+00
+1423 1426 -1.25000000000000e+01
+1423 1425 8.33333333333333e+00
+1423 1560 4.16666666666667e+00
+1423 1410 -4.16666666666667e+00
+1423 1562 4.16666666666667e+00
+1423 1412 8.33333333333333e+00
+1423 1411 -1.25000000000000e+01
+1423 1700 8.33333333333333e+00
+1423 1699 -3.75000000000000e+01
+1423 1422 -1.66666666666667e+01
+1423 1698 8.33333333333333e+00
+1423 1568 -4.16666666666667e+00
+1423 1424 -1.66666666666667e+01
+1423 1406 -4.16666666666667e+00
+1423 1565 4.16666666666667e+00
+1423 1416 8.33333333333333e+00
+1423 1566 8.33333333333333e+00
+1423 1563 -8.33333333333333e+00
+1423 1280 -8.33333333333333e+00
+1423 1418 8.33333333333333e+00
+1423 1417 -3.75000000000000e+01
+1423 1278 4.16666666666667e+00
+1423 1404 -4.16666666666667e+00
+1423 1736 8.33333333333333e+00
+1423 1337 -8.33333333333333e+00
+1423 1703 4.16666666666667e+00
+1423 1735 -1.25000000000000e+01
+1423 1567 -1.25000000000000e+01
+1423 1734 -4.16666666666667e+00
+1423 1335 4.16666666666667e+00
+1424 1424 1.25000000000000e+02
+1424 1702 4.16666666666667e+00
+1424 1426 -4.16666666666667e+00
+1424 1768 -4.16666666666667e+00
+1424 1738 4.16666666666667e+00
+1424 1425 8.33333333333333e+00
+1424 1737 -8.33333333333333e+00
+1424 1767 -4.16666666666667e+00
+1424 1427 -1.25000000000000e+01
+1424 1410 8.33333333333333e+00
+1424 1561 4.16666666666667e+00
+1424 1560 -8.33333333333333e+00
+1424 1412 -3.75000000000000e+01
+1424 1411 8.33333333333333e+00
+1424 1278 4.16666666666667e+00
+1424 1700 -1.25000000000000e+01
+1424 1699 8.33333333333333e+00
+1424 1698 -4.16666666666667e+00
+1424 1335 4.16666666666667e+00
+1424 1567 -4.16666666666667e+00
+1424 1423 -1.66666666666667e+01
+1424 1416 -4.16666666666667e+00
+1424 1405 -4.16666666666667e+00
+1424 1564 4.16666666666667e+00
+1424 1404 -4.16666666666667e+00
+1424 1563 4.16666666666667e+00
+1424 1418 -1.25000000000000e+01
+1424 1279 -8.33333333333333e+00
+1424 1417 8.33333333333333e+00
+1424 1701 4.16666666666667e+00
+1424 1736 -3.75000000000000e+01
+1424 1568 -1.25000000000000e+01
+1424 1735 8.33333333333333e+00
+1424 1336 -8.33333333333333e+00
+1424 1422 -1.66666666666667e+01
+1424 1734 8.33333333333333e+00
+1424 1566 8.33333333333333e+00
+1425 1425 1.25000000000000e+02
+1425 1702 8.33333333333333e+00
+1425 1701 -1.25000000000000e+01
+1425 1412 -8.33333333333333e+00
+1425 1411 4.16666666666667e+00
+1425 1424 8.33333333333333e+00
+1425 1768 4.16666666666667e+00
+1425 1423 8.33333333333333e+00
+1425 1422 -3.75000000000000e+01
+1425 1769 4.16666666666667e+00
+1425 1414 -4.16666666666667e+00
+1425 1415 8.33333333333333e+00
+1425 1427 -1.66666666666667e+01
+1425 1280 -4.16666666666667e+00
+1425 1413 -1.25000000000000e+01
+1425 1715 4.16666666666667e+00
+1425 1340 -4.16666666666667e+00
+1425 1714 -8.33333333333333e+00
+1425 1409 4.16666666666667e+00
+1425 1684 8.33333333333333e+00
+1425 1426 -1.66666666666667e+01
+1425 1685 8.33333333333333e+00
+1425 1339 -4.16666666666667e+00
+1425 1683 -3.75000000000000e+01
+1425 1408 4.16666666666667e+00
+1425 1279 -4.16666666666667e+00
+1425 1421 -4.16666666666667e+00
+1425 1418 4.16666666666667e+00
+1425 1750 4.16666666666667e+00
+1425 1738 -4.16666666666667e+00
+1425 1417 -8.33333333333333e+00
+1425 1420 8.33333333333333e+00
+1425 1419 -1.25000000000000e+01
+1425 1739 8.33333333333333e+00
+1425 1751 -8.33333333333333e+00
+1425 1737 -1.25000000000000e+01
+1425 1703 -4.16666666666667e+00
+1426 1426 1.25000000000000e+02
+1426 1701 8.33333333333333e+00
+1426 1703 8.33333333333333e+00
+1426 1702 -3.75000000000000e+01
+1426 1410 4.16666666666667e+00
+1426 1424 -4.16666666666667e+00
+1426 1767 4.16666666666667e+00
+1426 1423 -1.25000000000000e+01
+1426 1422 8.33333333333333e+00
+1426 1769 -8.33333333333333e+00
+1426 1413 -4.16666666666667e+00
+1426 1715 4.16666666666667e+00
+1426 1415 8.33333333333333e+00
+1426 1414 -1.25000000000000e+01
+1426 1713 -8.33333333333333e+00
+1426 1685 -4.16666666666667e+00
+1426 1683 8.33333333333333e+00
+1426 1425 -1.66666666666667e+01
+1426 1684 -1.25000000000000e+01
+1426 1338 -4.16666666666667e+00
+1426 1409 -8.33333333333333e+00
+1426 1407 4.16666666666667e+00
+1426 1278 -4.16666666666667e+00
+1426 1421 8.33333333333333e+00
+1426 1427 -1.66666666666667e+01
+1426 1739 8.33333333333333e+00
+1426 1749 4.16666666666667e+00
+1426 1737 -4.16666666666667e+00
+1426 1418 4.16666666666667e+00
+1426 1280 -4.16666666666667e+00
+1426 1420 -3.75000000000000e+01
+1426 1416 -8.33333333333333e+00
+1426 1419 8.33333333333333e+00
+1426 1751 4.16666666666667e+00
+1426 1340 -4.16666666666667e+00
+1426 1738 -1.25000000000000e+01
+1426 1412 4.16666666666667e+00
+1427 1427 1.25000000000000e+02
+1427 1411 4.16666666666667e+00
+1427 1703 -1.25000000000000e+01
+1427 1702 8.33333333333333e+00
+1427 1410 -8.33333333333333e+00
+1427 1423 -4.16666666666667e+00
+1427 1422 8.33333333333333e+00
+1427 1424 -1.25000000000000e+01
+1427 1768 -8.33333333333333e+00
+1427 1767 4.16666666666667e+00
+1427 1714 4.16666666666667e+00
+1427 1413 8.33333333333333e+00
+1427 1425 -1.66666666666667e+01
+1427 1415 -3.75000000000000e+01
+1427 1414 8.33333333333333e+00
+1427 1278 -4.16666666666667e+00
+1427 1713 4.16666666666667e+00
+1427 1338 -4.16666666666667e+00
+1427 1684 -4.16666666666667e+00
+1427 1407 4.16666666666667e+00
+1427 1685 -1.25000000000000e+01
+1427 1683 8.33333333333333e+00
+1427 1408 -8.33333333333333e+00
+1427 1419 -4.16666666666667e+00
+1427 1416 4.16666666666667e+00
+1427 1420 8.33333333333333e+00
+1427 1426 -1.66666666666667e+01
+1427 1738 8.33333333333333e+00
+1427 1421 -1.25000000000000e+01
+1427 1417 4.16666666666667e+00
+1427 1279 -4.16666666666667e+00
+1427 1739 -3.75000000000000e+01
+1427 1701 -4.16666666666667e+00
+1427 1750 4.16666666666667e+00
+1427 1339 -4.16666666666667e+00
+1427 1737 8.33333333333333e+00
+1427 1749 -8.33333333333333e+00
+1428 1428 3.75000000000000e+01
+1428 1688 -2.08333333333333e+00
+1428 1429 -4.16666666666667e+00
+1428 1687 4.16666666666667e+00
+1428 1321 2.08333333333333e+00
+1428 1686 -6.25000000000000e+00
+1428 1694 4.16666666666667e+00
+1428 1430 -4.16666666666667e+00
+1428 1691 4.16666666666667e+00
+1428 1322 2.08333333333333e+00
+1428 1690 -2.08333333333333e+00
+1428 1693 4.16666666666667e+00
+1428 1689 -6.25000000000000e+00
+1428 1320 -1.25000000000000e+01
+1428 1 2.08333333333333e+00
+1428 139 -4.16666666666667e+00
+1428 152 -4.16666666666667e+00
+1428 2 2.08333333333333e+00
+1428 146 -4.16666666666667e+00
+1428 145 2.08333333333333e+00
+1428 151 -4.16666666666667e+00
+1428 0 -1.25000000000000e+01
+1428 140 2.08333333333333e+00
+1429 1429 3.33333333333333e+01
+1429 1688 4.16666666666667e+00
+1429 1687 -1.87500000000000e+01
+1429 1428 -4.16666666666667e+00
+1429 1686 4.16666666666667e+00
+1429 1320 2.08333333333333e+00
+1429 1691 4.16666666666667e+00
+1429 1694 -8.33333333333333e+00
+1429 1690 -6.25000000000000e+00
+1429 1321 -4.16666666666667e+00
+1429 1689 -2.08333333333333e+00
+1429 1692 4.16666666666667e+00
+1429 0 2.08333333333333e+00
+1429 138 -4.16666666666667e+00
+1429 146 2.08333333333333e+00
+1429 152 -4.16666666666667e+00
+1429 1 -4.16666666666667e+00
+1429 144 2.08333333333333e+00
+1429 150 -4.16666666666667e+00
+1429 140 2.08333333333333e+00
+1430 1430 3.33333333333333e+01
+1430 1688 -6.25000000000000e+00
+1430 1687 4.16666666666667e+00
+1430 1686 -2.08333333333333e+00
+1430 1692 4.16666666666667e+00
+1430 1691 -1.87500000000000e+01
+1430 1322 -4.16666666666667e+00
+1430 1690 4.16666666666667e+00
+1430 1693 -8.33333333333333e+00
+1430 1428 -4.16666666666667e+00
+1430 1689 4.16666666666667e+00
+1430 1320 2.08333333333333e+00
+1430 138 2.08333333333333e+00
+1430 145 2.08333333333333e+00
+1430 151 -4.16666666666667e+00
+1430 150 -4.16666666666667e+00
+1430 2 -4.16666666666667e+00
+1430 0 2.08333333333333e+00
+1430 144 -4.16666666666667e+00
+1430 139 2.08333333333333e+00
+1431 1431 6.25000000000000e+01
+1431 1433 -8.33333333333333e+00
+1431 1583 8.33333333333333e+00
+1431 1438 4.16666666666667e+00
+1431 1582 -4.16666666666667e+00
+1431 1304 -2.08333333333333e+00
+1431 1303 4.16666666666667e+00
+1431 1302 -6.25000000000000e+00
+1431 1581 -1.25000000000000e+01
+1431 1283 -2.08333333333333e+00
+1431 1439 4.16666666666667e+00
+1431 1432 -8.33333333333333e+00
+1431 1282 4.16666666666667e+00
+1431 1281 -6.25000000000000e+00
+1431 1435 -4.16666666666667e+00
+1431 1580 4.16666666666667e+00
+1431 1579 4.16666666666667e+00
+1431 1578 -1.87500000000000e+01
+1431 1442 -4.16666666666667e+00
+1431 1441 -4.16666666666667e+00
+1431 1586 -8.33333333333333e+00
+1431 1585 4.16666666666667e+00
+1431 1436 2.08333333333333e+00
+1431 2318 2.08333333333333e+00
+1431 2317 -4.16666666666667e+00
+1431 2062 4.16666666666667e+00
+1431 2063 4.16666666666667e+00
+1431 2061 -1.87500000000000e+01
+1432 1432 6.25000000000000e+01
+1432 1437 4.16666666666667e+00
+1432 1581 -4.16666666666667e+00
+1432 1304 4.16666666666667e+00
+1432 1433 -8.33333333333333e+00
+1432 1583 8.33333333333333e+00
+1432 1303 -1.87500000000000e+01
+1432 1582 -1.25000000000000e+01
+1432 1302 4.16666666666667e+00
+1432 1283 4.16666666666667e+00
+1432 1439 -8.33333333333333e+00
+1432 1282 -1.87500000000000e+01
+1432 1431 -8.33333333333333e+00
+1432 1281 4.16666666666667e+00
+1432 1434 -4.16666666666667e+00
+1432 1580 -2.08333333333333e+00
+1432 1579 -6.25000000000000e+00
+1432 1578 4.16666666666667e+00
+1432 1442 -4.16666666666667e+00
+1432 1586 4.16666666666667e+00
+1432 1440 -4.16666666666667e+00
+1432 1436 2.08333333333333e+00
+1432 1584 4.16666666666667e+00
+1432 2318 2.08333333333333e+00
+1432 2316 -4.16666666666667e+00
+1432 2063 -2.08333333333333e+00
+1432 2062 -6.25000000000000e+00
+1432 2061 4.16666666666667e+00
+1433 1433 6.25000000000000e+01
+1433 1431 -8.33333333333333e+00
+1433 1581 8.33333333333333e+00
+1433 1304 -6.25000000000000e+00
+1433 1583 -3.75000000000000e+01
+1433 1303 4.16666666666667e+00
+1433 1432 -8.33333333333333e+00
+1433 1582 8.33333333333333e+00
+1433 1302 -2.08333333333333e+00
+1433 1283 -6.25000000000000e+00
+1433 1282 4.16666666666667e+00
+1433 1438 -8.33333333333333e+00
+1433 1281 -2.08333333333333e+00
+1433 1437 4.16666666666667e+00
+1433 1435 2.08333333333333e+00
+1433 1580 -6.25000000000000e+00
+1433 1579 -2.08333333333333e+00
+1433 1578 4.16666666666667e+00
+1433 1440 -4.16666666666667e+00
+1433 1441 -4.16666666666667e+00
+1433 1585 4.16666666666667e+00
+1433 1434 2.08333333333333e+00
+1433 1584 -8.33333333333333e+00
+1433 2317 2.08333333333333e+00
+1433 2061 4.16666666666667e+00
+1433 2316 2.08333333333333e+00
+1433 2062 -2.08333333333333e+00
+1433 2063 -6.25000000000000e+00
+1434 1434 2.50000000000000e+01
+1434 1580 -2.08333333333333e+00
+1434 1804 2.08333333333333e+00
+1434 1441 -2.08333333333333e+00
+1434 1343 2.08333333333333e+00
+1434 1805 -4.16666666666667e+00
+1434 1342 2.08333333333333e+00
+1434 1435 -4.16666666666667e+00
+1434 1579 4.16666666666667e+00
+1434 1341 -6.25000000000000e+00
+1434 1578 -6.25000000000000e+00
+1434 1436 -4.16666666666667e+00
+1434 1283 2.08333333333333e+00
+1434 1442 4.16666666666667e+00
+1434 1282 2.08333333333333e+00
+1434 1432 -4.16666666666667e+00
+1434 1433 2.08333333333333e+00
+1434 1281 -6.25000000000000e+00
+1434 1440 -6.25000000000000e+00
+1435 1435 2.91666666666667e+01
+1435 1580 4.16666666666667e+00
+1435 1442 4.16666666666667e+00
+1435 1803 2.08333333333333e+00
+1435 1440 -2.08333333333333e+00
+1435 1343 -2.08333333333333e+00
+1435 1805 2.08333333333333e+00
+1435 1342 -2.08333333333333e+00
+1435 1579 -1.87500000000000e+01
+1435 1341 2.08333333333333e+00
+1435 1434 -4.16666666666667e+00
+1435 1578 4.16666666666667e+00
+1435 1283 -2.08333333333333e+00
+1435 1433 2.08333333333333e+00
+1435 1436 -8.33333333333333e+00
+1435 1282 -2.08333333333333e+00
+1435 1441 -6.25000000000000e+00
+1435 1281 2.08333333333333e+00
+1435 1431 -4.16666666666667e+00
+1436 1436 2.91666666666667e+01
+1436 1578 -2.08333333333333e+00
+1436 1435 -8.33333333333333e+00
+1436 1579 4.16666666666667e+00
+1436 1441 4.16666666666667e+00
+1436 1343 -2.08333333333333e+00
+1436 1580 -6.25000000000000e+00
+1436 1342 -2.08333333333333e+00
+1436 1804 2.08333333333333e+00
+1436 1341 2.08333333333333e+00
+1436 1803 -4.16666666666667e+00
+1436 1431 2.08333333333333e+00
+1436 1283 -2.08333333333333e+00
+1436 1442 -1.87500000000000e+01
+1436 1282 -2.08333333333333e+00
+1436 1432 2.08333333333333e+00
+1436 1434 -4.16666666666667e+00
+1436 1281 2.08333333333333e+00
+1436 1440 4.16666666666667e+00
+1437 1437 6.25000000000000e+01
+1437 1283 4.16666666666667e+00
+1437 1439 -8.33333333333333e+00
+1437 1346 4.16666666666667e+00
+1437 1432 4.16666666666667e+00
+1437 1433 4.16666666666667e+00
+1437 1281 -6.25000000000000e+00
+1437 1583 -4.16666666666667e+00
+1437 1582 8.33333333333333e+00
+1437 1581 -1.25000000000000e+01
+1437 1344 -6.25000000000000e+00
+1437 1441 4.16666666666667e+00
+1437 1438 -8.33333333333333e+00
+1437 1811 -4.16666666666667e+00
+1437 1345 -2.08333333333333e+00
+1437 1810 2.08333333333333e+00
+1437 1442 4.16666666666667e+00
+1437 1282 -2.08333333333333e+00
+1437 1440 -1.87500000000000e+01
+1437 2066 -4.16666666666667e+00
+1437 2426 4.16666666666667e+00
+1437 2425 4.16666666666667e+00
+1437 2424 -1.87500000000000e+01
+1437 2062 -4.16666666666667e+00
+1437 2063 -4.16666666666667e+00
+1437 2330 4.16666666666667e+00
+1437 2329 -8.33333333333333e+00
+1437 2065 2.08333333333333e+00
+1438 1438 6.25000000000000e+01
+1438 1431 4.16666666666667e+00
+1438 1433 -8.33333333333333e+00
+1438 1283 4.16666666666667e+00
+1438 1282 -6.25000000000000e+00
+1438 1583 8.33333333333333e+00
+1438 1439 -8.33333333333333e+00
+1438 1346 4.16666666666667e+00
+1438 1582 -3.75000000000000e+01
+1438 1345 -6.25000000000000e+00
+1438 1581 8.33333333333333e+00
+1438 1811 2.08333333333333e+00
+1438 1440 4.16666666666667e+00
+1438 1437 -8.33333333333333e+00
+1438 1344 -2.08333333333333e+00
+1438 1809 2.08333333333333e+00
+1438 1442 -2.08333333333333e+00
+1438 1441 -6.25000000000000e+00
+1438 1281 -2.08333333333333e+00
+1438 2066 2.08333333333333e+00
+1438 2426 -2.08333333333333e+00
+1438 2425 -6.25000000000000e+00
+1438 2424 4.16666666666667e+00
+1438 2061 -4.16666666666667e+00
+1438 2063 -4.16666666666667e+00
+1438 2330 4.16666666666667e+00
+1438 2064 2.08333333333333e+00
+1438 2328 -8.33333333333333e+00
+1439 1439 6.25000000000000e+01
+1439 1281 4.16666666666667e+00
+1439 1437 -8.33333333333333e+00
+1439 1344 4.16666666666667e+00
+1439 1283 -1.87500000000000e+01
+1439 1432 -8.33333333333333e+00
+1439 1282 4.16666666666667e+00
+1439 1431 4.16666666666667e+00
+1439 1583 -1.25000000000000e+01
+1439 1346 -1.87500000000000e+01
+1439 1582 8.33333333333333e+00
+1439 1438 -8.33333333333333e+00
+1439 1345 4.16666666666667e+00
+1439 1581 -4.16666666666667e+00
+1439 1810 2.08333333333333e+00
+1439 1809 -4.16666666666667e+00
+1439 1441 -2.08333333333333e+00
+1439 1442 -6.25000000000000e+00
+1439 1440 4.16666666666667e+00
+1439 2064 -4.16666666666667e+00
+1439 2426 -6.25000000000000e+00
+1439 2425 -2.08333333333333e+00
+1439 2424 4.16666666666667e+00
+1439 2062 -4.16666666666667e+00
+1439 2329 4.16666666666667e+00
+1439 2061 -4.16666666666667e+00
+1439 2065 2.08333333333333e+00
+1439 2328 4.16666666666667e+00
+1440 1440 6.25000000000000e+01
+1440 1579 4.16666666666667e+00
+1440 1580 4.16666666666667e+00
+1440 1436 4.16666666666667e+00
+1440 1434 -6.25000000000000e+00
+1440 1805 4.16666666666667e+00
+1440 1804 4.16666666666667e+00
+1440 1441 -8.33333333333333e+00
+1440 1803 -1.87500000000000e+01
+1440 1586 -4.16666666666667e+00
+1440 1442 -8.33333333333333e+00
+1440 1433 -4.16666666666667e+00
+1440 1583 4.16666666666667e+00
+1440 1438 4.16666666666667e+00
+1440 1585 8.33333333333333e+00
+1440 1582 -8.33333333333333e+00
+1440 1439 4.16666666666667e+00
+1440 1283 -4.16666666666667e+00
+1440 1282 2.08333333333333e+00
+1440 1432 -4.16666666666667e+00
+1440 1437 -1.87500000000000e+01
+1440 1811 4.16666666666667e+00
+1440 1349 -4.16666666666667e+00
+1440 1810 -2.08333333333333e+00
+1440 1348 2.08333333333333e+00
+1440 1809 -6.25000000000000e+00
+1440 1435 -2.08333333333333e+00
+1440 1584 -1.25000000000000e+01
+1441 1441 6.25000000000000e+01
+1441 1434 -2.08333333333333e+00
+1441 1578 4.16666666666667e+00
+1441 1580 -8.33333333333333e+00
+1441 1283 2.08333333333333e+00
+1441 1435 -6.25000000000000e+00
+1441 1805 -2.08333333333333e+00
+1441 1349 2.08333333333333e+00
+1441 1804 -6.25000000000000e+00
+1441 1803 4.16666666666667e+00
+1441 1440 -8.33333333333333e+00
+1441 1439 -2.08333333333333e+00
+1441 1437 4.16666666666667e+00
+1441 1433 -4.16666666666667e+00
+1441 1583 4.16666666666667e+00
+1441 1584 8.33333333333333e+00
+1441 1581 -8.33333333333333e+00
+1441 1438 -6.25000000000000e+00
+1441 1281 2.08333333333333e+00
+1441 1431 -4.16666666666667e+00
+1441 1811 4.16666666666667e+00
+1441 1442 -8.33333333333333e+00
+1441 1586 8.33333333333333e+00
+1441 1810 -6.25000000000000e+00
+1441 1436 4.16666666666667e+00
+1441 1585 -3.75000000000000e+01
+1441 1809 -2.08333333333333e+00
+1441 1347 2.08333333333333e+00
+1442 1442 6.25000000000000e+01
+1442 1579 -8.33333333333333e+00
+1442 1578 4.16666666666667e+00
+1442 1436 -1.87500000000000e+01
+1442 1282 2.08333333333333e+00
+1442 1434 4.16666666666667e+00
+1442 1805 -6.25000000000000e+00
+1442 1804 -2.08333333333333e+00
+1442 1348 2.08333333333333e+00
+1442 1803 4.16666666666667e+00
+1442 1584 -4.16666666666667e+00
+1442 1438 -2.08333333333333e+00
+1442 1440 -8.33333333333333e+00
+1442 1431 -4.16666666666667e+00
+1442 1581 4.16666666666667e+00
+1442 1432 -4.16666666666667e+00
+1442 1582 4.16666666666667e+00
+1442 1439 -6.25000000000000e+00
+1442 1437 4.16666666666667e+00
+1442 1281 -4.16666666666667e+00
+1442 1811 -1.87500000000000e+01
+1442 1435 4.16666666666667e+00
+1442 1586 -1.25000000000000e+01
+1442 1810 4.16666666666667e+00
+1442 1441 -8.33333333333333e+00
+1442 1585 8.33333333333333e+00
+1442 1809 4.16666666666667e+00
+1442 1347 -4.16666666666667e+00
+1443 1443 6.25000000000000e+01
+1443 1807 4.16666666666667e+00
+1443 1808 4.16666666666667e+00
+1443 1450 4.16666666666667e+00
+1443 1449 -6.25000000000000e+00
+1443 1445 -8.33333333333333e+00
+1443 1598 4.16666666666667e+00
+1443 1597 4.16666666666667e+00
+1443 1596 -1.87500000000000e+01
+1443 1603 -4.16666666666667e+00
+1443 1444 -8.33333333333333e+00
+1443 1448 4.16666666666667e+00
+1443 1456 -4.16666666666667e+00
+1443 1708 4.16666666666667e+00
+1443 1604 8.33333333333333e+00
+1443 1709 -8.33333333333333e+00
+1443 1286 2.08333333333333e+00
+1443 1457 -4.16666666666667e+00
+1443 1447 4.16666666666667e+00
+1443 1285 -4.16666666666667e+00
+1443 1446 -1.87500000000000e+01
+1443 1592 -2.08333333333333e+00
+1443 1307 2.08333333333333e+00
+1443 1591 4.16666666666667e+00
+1443 1306 -4.16666666666667e+00
+1443 1590 -6.25000000000000e+00
+1443 1451 -2.08333333333333e+00
+1443 1602 -1.25000000000000e+01
+1444 1444 6.25000000000000e+01
+1444 1806 4.16666666666667e+00
+1444 1808 -8.33333333333333e+00
+1444 1286 2.08333333333333e+00
+1444 1450 -1.87500000000000e+01
+1444 1449 4.16666666666667e+00
+1444 1598 -2.08333333333333e+00
+1444 1307 2.08333333333333e+00
+1444 1597 -6.25000000000000e+00
+1444 1596 4.16666666666667e+00
+1444 1602 -4.16666666666667e+00
+1444 1448 -2.08333333333333e+00
+1444 1443 -8.33333333333333e+00
+1444 1455 -4.16666666666667e+00
+1444 1707 4.16666666666667e+00
+1444 1457 -4.16666666666667e+00
+1444 1709 4.16666666666667e+00
+1444 1447 -6.25000000000000e+00
+1444 1446 4.16666666666667e+00
+1444 1284 -4.16666666666667e+00
+1444 1592 4.16666666666667e+00
+1444 1445 -8.33333333333333e+00
+1444 1604 8.33333333333333e+00
+1444 1591 -1.87500000000000e+01
+1444 1451 4.16666666666667e+00
+1444 1603 -1.25000000000000e+01
+1444 1590 4.16666666666667e+00
+1444 1305 -4.16666666666667e+00
+1445 1445 6.25000000000000e+01
+1445 1450 4.16666666666667e+00
+1445 1807 -8.33333333333333e+00
+1445 1806 4.16666666666667e+00
+1445 1451 -6.25000000000000e+00
+1445 1285 2.08333333333333e+00
+1445 1598 -6.25000000000000e+00
+1445 1597 -2.08333333333333e+00
+1445 1306 2.08333333333333e+00
+1445 1443 -8.33333333333333e+00
+1445 1596 4.16666666666667e+00
+1445 1447 -2.08333333333333e+00
+1445 1446 4.16666666666667e+00
+1445 1456 -4.16666666666667e+00
+1445 1708 4.16666666666667e+00
+1445 1602 8.33333333333333e+00
+1445 1707 -8.33333333333333e+00
+1445 1448 -6.25000000000000e+00
+1445 1284 2.08333333333333e+00
+1445 1455 -4.16666666666667e+00
+1445 1592 -6.25000000000000e+00
+1445 1449 -2.08333333333333e+00
+1445 1604 -3.75000000000000e+01
+1445 1591 4.16666666666667e+00
+1445 1444 -8.33333333333333e+00
+1445 1603 8.33333333333333e+00
+1445 1590 -2.08333333333333e+00
+1445 1305 2.08333333333333e+00
+1446 1446 6.25000000000000e+01
+1446 1453 -4.16666666666667e+00
+1446 1706 4.16666666666667e+00
+1446 1705 4.16666666666667e+00
+1446 1704 -1.87500000000000e+01
+1446 1460 -4.16666666666667e+00
+1446 1459 -4.16666666666667e+00
+1446 1712 -8.33333333333333e+00
+1446 1711 4.16666666666667e+00
+1446 1445 4.16666666666667e+00
+1446 1448 -8.33333333333333e+00
+1446 1709 8.33333333333333e+00
+1446 1456 4.16666666666667e+00
+1446 1708 -4.16666666666667e+00
+1446 1325 -2.08333333333333e+00
+1446 1592 2.08333333333333e+00
+1446 1324 4.16666666666667e+00
+1446 1591 -4.16666666666667e+00
+1446 1323 -6.25000000000000e+00
+1446 1707 -1.25000000000000e+01
+1446 1286 -2.08333333333333e+00
+1446 1457 4.16666666666667e+00
+1446 1447 -8.33333333333333e+00
+1446 1285 4.16666666666667e+00
+1446 1444 4.16666666666667e+00
+1446 1454 2.08333333333333e+00
+1446 1284 -6.25000000000000e+00
+1446 1443 -1.87500000000000e+01
+1447 1447 6.25000000000000e+01
+1447 1452 -4.16666666666667e+00
+1447 1706 -2.08333333333333e+00
+1447 1705 -6.25000000000000e+00
+1447 1704 4.16666666666667e+00
+1447 1460 -4.16666666666667e+00
+1447 1712 4.16666666666667e+00
+1447 1458 -4.16666666666667e+00
+1447 1710 4.16666666666667e+00
+1447 1445 -2.08333333333333e+00
+1447 1592 2.08333333333333e+00
+1447 1455 4.16666666666667e+00
+1447 1707 -4.16666666666667e+00
+1447 1325 4.16666666666667e+00
+1447 1448 -8.33333333333333e+00
+1447 1709 8.33333333333333e+00
+1447 1324 -1.87500000000000e+01
+1447 1708 -1.25000000000000e+01
+1447 1323 4.16666666666667e+00
+1447 1590 -4.16666666666667e+00
+1447 1286 4.16666666666667e+00
+1447 1457 -8.33333333333333e+00
+1447 1454 2.08333333333333e+00
+1447 1285 -1.87500000000000e+01
+1447 1444 -6.25000000000000e+00
+1447 1446 -8.33333333333333e+00
+1447 1284 4.16666666666667e+00
+1447 1443 4.16666666666667e+00
+1448 1448 6.25000000000000e+01
+1448 1453 2.08333333333333e+00
+1448 1706 -6.25000000000000e+00
+1448 1705 -2.08333333333333e+00
+1448 1704 4.16666666666667e+00
+1448 1458 -4.16666666666667e+00
+1448 1459 -4.16666666666667e+00
+1448 1711 4.16666666666667e+00
+1448 1710 -8.33333333333333e+00
+1448 1444 -2.08333333333333e+00
+1448 1591 2.08333333333333e+00
+1448 1443 4.16666666666667e+00
+1448 1446 -8.33333333333333e+00
+1448 1707 8.33333333333333e+00
+1448 1325 -6.25000000000000e+00
+1448 1709 -3.75000000000000e+01
+1448 1324 4.16666666666667e+00
+1448 1447 -8.33333333333333e+00
+1448 1708 8.33333333333333e+00
+1448 1323 -2.08333333333333e+00
+1448 1590 2.08333333333333e+00
+1448 1452 2.08333333333333e+00
+1448 1286 -6.25000000000000e+00
+1448 1445 -6.25000000000000e+00
+1448 1285 4.16666666666667e+00
+1448 1456 -8.33333333333333e+00
+1448 1284 -2.08333333333333e+00
+1448 1455 4.16666666666667e+00
+1449 1449 2.50000000000000e+01
+1449 1445 -2.08333333333333e+00
+1449 1456 2.08333333333333e+00
+1449 1807 -2.08333333333333e+00
+1449 1286 2.08333333333333e+00
+1449 1457 -4.16666666666667e+00
+1449 1285 2.08333333333333e+00
+1449 1450 -4.16666666666667e+00
+1449 1444 4.16666666666667e+00
+1449 1284 -6.25000000000000e+00
+1449 1443 -6.25000000000000e+00
+1449 1451 -4.16666666666667e+00
+1449 1343 2.08333333333333e+00
+1449 1808 4.16666666666667e+00
+1449 1342 2.08333333333333e+00
+1449 1597 -4.16666666666667e+00
+1449 1598 2.08333333333333e+00
+1449 1341 -6.25000000000000e+00
+1449 1806 -6.25000000000000e+00
+1450 1450 2.91666666666667e+01
+1450 1445 4.16666666666667e+00
+1450 1808 4.16666666666667e+00
+1450 1455 2.08333333333333e+00
+1450 1806 -2.08333333333333e+00
+1450 1286 -2.08333333333333e+00
+1450 1457 2.08333333333333e+00
+1450 1285 -2.08333333333333e+00
+1450 1444 -1.87500000000000e+01
+1450 1284 2.08333333333333e+00
+1450 1449 -4.16666666666667e+00
+1450 1443 4.16666666666667e+00
+1450 1343 -2.08333333333333e+00
+1450 1598 2.08333333333333e+00
+1450 1451 -8.33333333333333e+00
+1450 1342 -2.08333333333333e+00
+1450 1807 -6.25000000000000e+00
+1450 1341 2.08333333333333e+00
+1450 1596 -4.16666666666667e+00
+1451 1451 2.91666666666667e+01
+1451 1443 -2.08333333333333e+00
+1451 1450 -8.33333333333333e+00
+1451 1444 4.16666666666667e+00
+1451 1807 4.16666666666667e+00
+1451 1286 -2.08333333333333e+00
+1451 1445 -6.25000000000000e+00
+1451 1285 -2.08333333333333e+00
+1451 1456 2.08333333333333e+00
+1451 1284 2.08333333333333e+00
+1451 1455 -4.16666666666667e+00
+1451 1596 2.08333333333333e+00
+1451 1343 -2.08333333333333e+00
+1451 1808 -1.87500000000000e+01
+1451 1342 -2.08333333333333e+00
+1451 1597 2.08333333333333e+00
+1451 1449 -4.16666666666667e+00
+1451 1341 2.08333333333333e+00
+1451 1806 4.16666666666667e+00
+1452 1452 2.50000000000000e+01
+1452 1706 -2.08333333333333e+00
+1452 1822 2.08333333333333e+00
+1452 1459 -2.08333333333333e+00
+1452 1352 2.08333333333333e+00
+1452 1823 -4.16666666666667e+00
+1452 1351 2.08333333333333e+00
+1452 1453 -4.16666666666667e+00
+1452 1705 4.16666666666667e+00
+1452 1350 -6.25000000000000e+00
+1452 1704 -6.25000000000000e+00
+1452 1454 -4.16666666666667e+00
+1452 1286 2.08333333333333e+00
+1452 1460 4.16666666666667e+00
+1452 1285 2.08333333333333e+00
+1452 1447 -4.16666666666667e+00
+1452 1448 2.08333333333333e+00
+1452 1284 -6.25000000000000e+00
+1452 1458 -6.25000000000000e+00
+1453 1453 2.91666666666667e+01
+1453 1706 4.16666666666667e+00
+1453 1460 4.16666666666667e+00
+1453 1821 2.08333333333333e+00
+1453 1458 -2.08333333333333e+00
+1453 1352 -2.08333333333333e+00
+1453 1823 2.08333333333333e+00
+1453 1351 -2.08333333333333e+00
+1453 1705 -1.87500000000000e+01
+1453 1350 2.08333333333333e+00
+1453 1452 -4.16666666666667e+00
+1453 1704 4.16666666666667e+00
+1453 1286 -2.08333333333333e+00
+1453 1448 2.08333333333333e+00
+1453 1454 -8.33333333333333e+00
+1453 1285 -2.08333333333333e+00
+1453 1459 -6.25000000000000e+00
+1453 1284 2.08333333333333e+00
+1453 1446 -4.16666666666667e+00
+1454 1454 2.91666666666667e+01
+1454 1704 -2.08333333333333e+00
+1454 1453 -8.33333333333333e+00
+1454 1705 4.16666666666667e+00
+1454 1459 4.16666666666667e+00
+1454 1352 -2.08333333333333e+00
+1454 1706 -6.25000000000000e+00
+1454 1351 -2.08333333333333e+00
+1454 1822 2.08333333333333e+00
+1454 1350 2.08333333333333e+00
+1454 1821 -4.16666666666667e+00
+1454 1446 2.08333333333333e+00
+1454 1286 -2.08333333333333e+00
+1454 1460 -1.87500000000000e+01
+1454 1285 -2.08333333333333e+00
+1454 1447 2.08333333333333e+00
+1454 1452 -4.16666666666667e+00
+1454 1284 2.08333333333333e+00
+1454 1458 4.16666666666667e+00
+1455 1455 6.25000000000000e+01
+1455 1456 -8.33333333333333e+00
+1455 1829 -4.16666666666667e+00
+1455 1354 -2.08333333333333e+00
+1455 1828 2.08333333333333e+00
+1455 1460 4.16666666666667e+00
+1455 1285 -2.08333333333333e+00
+1455 1458 -1.87500000000000e+01
+1455 1450 2.08333333333333e+00
+1455 1286 4.16666666666667e+00
+1455 1451 -4.16666666666667e+00
+1455 1457 -8.33333333333333e+00
+1455 1808 4.16666666666667e+00
+1455 1355 4.16666666666667e+00
+1455 1807 4.16666666666667e+00
+1455 1806 -1.87500000000000e+01
+1455 1444 -4.16666666666667e+00
+1455 1447 4.16666666666667e+00
+1455 1448 4.16666666666667e+00
+1455 1445 -4.16666666666667e+00
+1455 1284 -6.25000000000000e+00
+1455 1709 -4.16666666666667e+00
+1455 1604 4.16666666666667e+00
+1455 1708 8.33333333333333e+00
+1455 1603 -8.33333333333333e+00
+1455 1707 -1.25000000000000e+01
+1455 1459 4.16666666666667e+00
+1455 1353 -6.25000000000000e+00
+1456 1456 6.25000000000000e+01
+1456 1829 2.08333333333333e+00
+1456 1458 4.16666666666667e+00
+1456 1455 -8.33333333333333e+00
+1456 1353 -2.08333333333333e+00
+1456 1827 2.08333333333333e+00
+1456 1459 -6.25000000000000e+00
+1456 1284 -2.08333333333333e+00
+1456 1449 2.08333333333333e+00
+1456 1451 2.08333333333333e+00
+1456 1808 -2.08333333333333e+00
+1456 1807 -6.25000000000000e+00
+1456 1806 4.16666666666667e+00
+1456 1443 -4.16666666666667e+00
+1456 1446 4.16666666666667e+00
+1456 1445 -4.16666666666667e+00
+1456 1604 4.16666666666667e+00
+1456 1448 -8.33333333333333e+00
+1456 1286 4.16666666666667e+00
+1456 1285 -6.25000000000000e+00
+1456 1709 8.33333333333333e+00
+1456 1457 -8.33333333333333e+00
+1456 1355 4.16666666666667e+00
+1456 1708 -3.75000000000000e+01
+1456 1460 -2.08333333333333e+00
+1456 1354 -6.25000000000000e+00
+1456 1707 8.33333333333333e+00
+1456 1602 -8.33333333333333e+00
+1457 1457 6.25000000000000e+01
+1457 1828 2.08333333333333e+00
+1457 1827 -4.16666666666667e+00
+1457 1460 -6.25000000000000e+00
+1457 1458 4.16666666666667e+00
+1457 1450 2.08333333333333e+00
+1457 1284 4.16666666666667e+00
+1457 1449 -4.16666666666667e+00
+1457 1808 -6.25000000000000e+00
+1457 1807 -2.08333333333333e+00
+1457 1455 -8.33333333333333e+00
+1457 1806 4.16666666666667e+00
+1457 1353 4.16666666666667e+00
+1457 1444 -4.16666666666667e+00
+1457 1603 4.16666666666667e+00
+1457 1286 -1.87500000000000e+01
+1457 1447 -8.33333333333333e+00
+1457 1285 4.16666666666667e+00
+1457 1446 4.16666666666667e+00
+1457 1443 -4.16666666666667e+00
+1457 1709 -1.25000000000000e+01
+1457 1459 -2.08333333333333e+00
+1457 1355 -1.87500000000000e+01
+1457 1708 8.33333333333333e+00
+1457 1456 -8.33333333333333e+00
+1457 1354 4.16666666666667e+00
+1457 1707 -4.16666666666667e+00
+1457 1602 4.16666666666667e+00
+1458 1458 6.25000000000000e+01
+1458 1705 4.16666666666667e+00
+1458 1706 4.16666666666667e+00
+1458 1454 4.16666666666667e+00
+1458 1452 -6.25000000000000e+00
+1458 1823 4.16666666666667e+00
+1458 1822 4.16666666666667e+00
+1458 1459 -8.33333333333333e+00
+1458 1821 -1.87500000000000e+01
+1458 1712 -4.16666666666667e+00
+1458 1460 -8.33333333333333e+00
+1458 1448 -4.16666666666667e+00
+1458 1709 4.16666666666667e+00
+1458 1456 4.16666666666667e+00
+1458 1711 8.33333333333333e+00
+1458 1708 -8.33333333333333e+00
+1458 1457 4.16666666666667e+00
+1458 1286 -4.16666666666667e+00
+1458 1285 2.08333333333333e+00
+1458 1447 -4.16666666666667e+00
+1458 1455 -1.87500000000000e+01
+1458 1829 4.16666666666667e+00
+1458 1358 -4.16666666666667e+00
+1458 1828 -2.08333333333333e+00
+1458 1357 2.08333333333333e+00
+1458 1827 -6.25000000000000e+00
+1458 1453 -2.08333333333333e+00
+1458 1710 -1.25000000000000e+01
+1459 1459 6.25000000000000e+01
+1459 1452 -2.08333333333333e+00
+1459 1704 4.16666666666667e+00
+1459 1706 -8.33333333333333e+00
+1459 1286 2.08333333333333e+00
+1459 1453 -6.25000000000000e+00
+1459 1823 -2.08333333333333e+00
+1459 1358 2.08333333333333e+00
+1459 1822 -6.25000000000000e+00
+1459 1821 4.16666666666667e+00
+1459 1458 -8.33333333333333e+00
+1459 1457 -2.08333333333333e+00
+1459 1455 4.16666666666667e+00
+1459 1448 -4.16666666666667e+00
+1459 1709 4.16666666666667e+00
+1459 1710 8.33333333333333e+00
+1459 1707 -8.33333333333333e+00
+1459 1456 -6.25000000000000e+00
+1459 1284 2.08333333333333e+00
+1459 1446 -4.16666666666667e+00
+1459 1829 4.16666666666667e+00
+1459 1460 -8.33333333333333e+00
+1459 1712 8.33333333333333e+00
+1459 1828 -6.25000000000000e+00
+1459 1454 4.16666666666667e+00
+1459 1711 -3.75000000000000e+01
+1459 1827 -2.08333333333333e+00
+1459 1356 2.08333333333333e+00
+1460 1460 6.25000000000000e+01
+1460 1705 -8.33333333333333e+00
+1460 1704 4.16666666666667e+00
+1460 1454 -1.87500000000000e+01
+1460 1285 2.08333333333333e+00
+1460 1452 4.16666666666667e+00
+1460 1823 -6.25000000000000e+00
+1460 1822 -2.08333333333333e+00
+1460 1357 2.08333333333333e+00
+1460 1821 4.16666666666667e+00
+1460 1710 -4.16666666666667e+00
+1460 1456 -2.08333333333333e+00
+1460 1458 -8.33333333333333e+00
+1460 1446 -4.16666666666667e+00
+1460 1707 4.16666666666667e+00
+1460 1447 -4.16666666666667e+00
+1460 1708 4.16666666666667e+00
+1460 1457 -6.25000000000000e+00
+1460 1455 4.16666666666667e+00
+1460 1284 -4.16666666666667e+00
+1460 1829 -1.87500000000000e+01
+1460 1453 4.16666666666667e+00
+1460 1712 -1.25000000000000e+01
+1460 1828 4.16666666666667e+00
+1460 1459 -8.33333333333333e+00
+1460 1711 8.33333333333333e+00
+1460 1827 4.16666666666667e+00
+1460 1356 -4.16666666666667e+00
+1461 1461 6.25000000000000e+01
+1461 1825 4.16666666666667e+00
+1461 1826 4.16666666666667e+00
+1461 1465 4.16666666666667e+00
+1461 1464 -6.25000000000000e+00
+1461 1463 -8.33333333333333e+00
+1461 1724 4.16666666666667e+00
+1461 1723 4.16666666666667e+00
+1461 1722 -1.87500000000000e+01
+1461 1729 -4.16666666666667e+00
+1461 1462 -8.33333333333333e+00
+1461 1730 8.33333333333333e+00
+1461 1718 -2.08333333333333e+00
+1461 1328 2.08333333333333e+00
+1461 1717 4.16666666666667e+00
+1461 1327 -4.16666666666667e+00
+1461 1716 -6.25000000000000e+00
+1461 1466 -2.08333333333333e+00
+1461 1728 -1.25000000000000e+01
+1461 194 4.16666666666667e+00
+1461 199 -4.16666666666667e+00
+1461 364 4.16666666666667e+00
+1461 365 -8.33333333333333e+00
+1461 11 2.08333333333333e+00
+1461 200 -4.16666666666667e+00
+1461 193 4.16666666666667e+00
+1461 10 -4.16666666666667e+00
+1461 192 -1.87500000000000e+01
+1462 1462 6.25000000000000e+01
+1462 1824 4.16666666666667e+00
+1462 1826 -8.33333333333333e+00
+1462 1465 -1.87500000000000e+01
+1462 1464 4.16666666666667e+00
+1462 1724 -2.08333333333333e+00
+1462 1328 2.08333333333333e+00
+1462 1723 -6.25000000000000e+00
+1462 1722 4.16666666666667e+00
+1462 1728 -4.16666666666667e+00
+1462 1461 -8.33333333333333e+00
+1462 1718 4.16666666666667e+00
+1462 1463 -8.33333333333333e+00
+1462 1730 8.33333333333333e+00
+1462 1717 -1.87500000000000e+01
+1462 1466 4.16666666666667e+00
+1462 1729 -1.25000000000000e+01
+1462 1716 4.16666666666667e+00
+1462 1326 -4.16666666666667e+00
+1462 11 2.08333333333333e+00
+1462 194 -2.08333333333333e+00
+1462 198 -4.16666666666667e+00
+1462 363 4.16666666666667e+00
+1462 200 -4.16666666666667e+00
+1462 365 4.16666666666667e+00
+1462 193 -6.25000000000000e+00
+1462 192 4.16666666666667e+00
+1462 9 -4.16666666666667e+00
+1463 1463 6.25000000000000e+01
+1463 1465 4.16666666666667e+00
+1463 1825 -8.33333333333333e+00
+1463 1824 4.16666666666667e+00
+1463 1466 -6.25000000000000e+00
+1463 1724 -6.25000000000000e+00
+1463 1723 -2.08333333333333e+00
+1463 1327 2.08333333333333e+00
+1463 1461 -8.33333333333333e+00
+1463 1722 4.16666666666667e+00
+1463 1728 8.33333333333333e+00
+1463 1718 -6.25000000000000e+00
+1463 1464 -2.08333333333333e+00
+1463 1730 -3.75000000000000e+01
+1463 1717 4.16666666666667e+00
+1463 1462 -8.33333333333333e+00
+1463 1729 8.33333333333333e+00
+1463 1716 -2.08333333333333e+00
+1463 1326 2.08333333333333e+00
+1463 10 2.08333333333333e+00
+1463 193 -2.08333333333333e+00
+1463 192 4.16666666666667e+00
+1463 199 -4.16666666666667e+00
+1463 364 4.16666666666667e+00
+1463 363 -8.33333333333333e+00
+1463 194 -6.25000000000000e+00
+1463 9 2.08333333333333e+00
+1463 198 -4.16666666666667e+00
+1464 1464 2.50000000000000e+01
+1464 1463 -2.08333333333333e+00
+1464 1825 -2.08333333333333e+00
+1464 1465 -4.16666666666667e+00
+1464 1462 4.16666666666667e+00
+1464 1461 -6.25000000000000e+00
+1464 1466 -4.16666666666667e+00
+1464 1352 2.08333333333333e+00
+1464 1826 4.16666666666667e+00
+1464 1351 2.08333333333333e+00
+1464 1723 -4.16666666666667e+00
+1464 1724 2.08333333333333e+00
+1464 1350 -6.25000000000000e+00
+1464 1824 -6.25000000000000e+00
+1464 199 2.08333333333333e+00
+1464 11 2.08333333333333e+00
+1464 200 -4.16666666666667e+00
+1464 10 2.08333333333333e+00
+1464 9 -6.25000000000000e+00
+1465 1465 2.91666666666667e+01
+1465 1463 4.16666666666667e+00
+1465 1826 4.16666666666667e+00
+1465 1824 -2.08333333333333e+00
+1465 1462 -1.87500000000000e+01
+1465 1464 -4.16666666666667e+00
+1465 1461 4.16666666666667e+00
+1465 1352 -2.08333333333333e+00
+1465 1724 2.08333333333333e+00
+1465 1466 -8.33333333333333e+00
+1465 1351 -2.08333333333333e+00
+1465 1825 -6.25000000000000e+00
+1465 1350 2.08333333333333e+00
+1465 1722 -4.16666666666667e+00
+1465 198 2.08333333333333e+00
+1465 11 -2.08333333333333e+00
+1465 200 2.08333333333333e+00
+1465 10 -2.08333333333333e+00
+1465 9 2.08333333333333e+00
+1466 1466 2.91666666666667e+01
+1466 1461 -2.08333333333333e+00
+1466 1465 -8.33333333333333e+00
+1466 1462 4.16666666666667e+00
+1466 1825 4.16666666666667e+00
+1466 1463 -6.25000000000000e+00
+1466 1722 2.08333333333333e+00
+1466 1352 -2.08333333333333e+00
+1466 1826 -1.87500000000000e+01
+1466 1351 -2.08333333333333e+00
+1466 1723 2.08333333333333e+00
+1466 1464 -4.16666666666667e+00
+1466 1350 2.08333333333333e+00
+1466 1824 4.16666666666667e+00
+1466 11 -2.08333333333333e+00
+1466 10 -2.08333333333333e+00
+1466 199 2.08333333333333e+00
+1466 9 2.08333333333333e+00
+1466 198 -4.16666666666667e+00
+1467 1467 6.25000000000000e+01
+1467 1619 -4.16666666666667e+00
+1467 1468 -8.33333333333333e+00
+1467 1618 8.33333333333333e+00
+1467 1310 4.16666666666667e+00
+1467 1309 -2.08333333333333e+00
+1467 1308 -6.25000000000000e+00
+1467 1617 -1.25000000000000e+01
+1467 1469 -8.33333333333333e+00
+1467 1289 4.16666666666667e+00
+1467 1288 -2.08333333333333e+00
+1467 1474 4.16666666666667e+00
+1467 1475 4.16666666666667e+00
+1467 1287 -6.25000000000000e+00
+1467 1622 4.16666666666667e+00
+1467 1478 -4.16666666666667e+00
+1467 1471 2.08333333333333e+00
+1467 1477 -4.16666666666667e+00
+1467 1472 -4.16666666666667e+00
+1467 1616 4.16666666666667e+00
+1467 1615 4.16666666666667e+00
+1467 1621 -8.33333333333333e+00
+1467 1614 -1.87500000000000e+01
+1467 2098 4.16666666666667e+00
+1467 2354 -4.16666666666667e+00
+1467 2353 2.08333333333333e+00
+1467 2099 4.16666666666667e+00
+1467 2097 -1.87500000000000e+01
+1468 1468 6.25000000000000e+01
+1468 1467 -8.33333333333333e+00
+1468 1617 8.33333333333333e+00
+1468 1310 4.16666666666667e+00
+1468 1469 -8.33333333333333e+00
+1468 1619 8.33333333333333e+00
+1468 1309 -6.25000000000000e+00
+1468 1618 -3.75000000000000e+01
+1468 1308 -2.08333333333333e+00
+1468 1289 4.16666666666667e+00
+1468 1475 -8.33333333333333e+00
+1468 1288 -6.25000000000000e+00
+1468 1287 -2.08333333333333e+00
+1468 1473 4.16666666666667e+00
+1468 1470 2.08333333333333e+00
+1468 1476 -4.16666666666667e+00
+1468 1472 2.08333333333333e+00
+1468 1478 -4.16666666666667e+00
+1468 1616 -2.08333333333333e+00
+1468 1622 4.16666666666667e+00
+1468 1615 -6.25000000000000e+00
+1468 1614 4.16666666666667e+00
+1468 1620 -8.33333333333333e+00
+1468 2099 -2.08333333333333e+00
+1468 2097 4.16666666666667e+00
+1468 2352 2.08333333333333e+00
+1468 2354 2.08333333333333e+00
+1468 2098 -6.25000000000000e+00
+1469 1469 6.25000000000000e+01
+1469 1617 -4.16666666666667e+00
+1469 1310 -1.87500000000000e+01
+1469 1619 -1.25000000000000e+01
+1469 1309 4.16666666666667e+00
+1469 1468 -8.33333333333333e+00
+1469 1618 8.33333333333333e+00
+1469 1308 4.16666666666667e+00
+1469 1473 4.16666666666667e+00
+1469 1289 -1.87500000000000e+01
+1469 1288 4.16666666666667e+00
+1469 1474 -8.33333333333333e+00
+1469 1467 -8.33333333333333e+00
+1469 1287 4.16666666666667e+00
+1469 1620 4.16666666666667e+00
+1469 1476 -4.16666666666667e+00
+1469 1471 2.08333333333333e+00
+1469 1477 -4.16666666666667e+00
+1469 1470 -4.16666666666667e+00
+1469 1616 -6.25000000000000e+00
+1469 1615 -2.08333333333333e+00
+1469 1621 4.16666666666667e+00
+1469 1614 4.16666666666667e+00
+1469 2353 2.08333333333333e+00
+1469 2098 -2.08333333333333e+00
+1469 2352 -4.16666666666667e+00
+1469 2099 -6.25000000000000e+00
+1469 2097 4.16666666666667e+00
+1470 1470 2.50000000000000e+01
+1470 1468 2.08333333333333e+00
+1470 1841 2.08333333333333e+00
+1470 1478 -2.08333333333333e+00
+1470 1289 2.08333333333333e+00
+1470 1469 -4.16666666666667e+00
+1470 1288 2.08333333333333e+00
+1470 1471 -4.16666666666667e+00
+1470 1477 4.16666666666667e+00
+1470 1287 -6.25000000000000e+00
+1470 1476 -6.25000000000000e+00
+1470 1472 -4.16666666666667e+00
+1470 1361 2.08333333333333e+00
+1470 1616 4.16666666666667e+00
+1470 1360 2.08333333333333e+00
+1470 1840 -4.16666666666667e+00
+1470 1615 -2.08333333333333e+00
+1470 1359 -6.25000000000000e+00
+1470 1614 -6.25000000000000e+00
+1471 1471 2.91666666666667e+01
+1471 1467 2.08333333333333e+00
+1471 1616 4.16666666666667e+00
+1471 1472 -8.33333333333333e+00
+1471 1478 4.16666666666667e+00
+1471 1289 -2.08333333333333e+00
+1471 1469 2.08333333333333e+00
+1471 1288 -2.08333333333333e+00
+1471 1477 -1.87500000000000e+01
+1471 1287 2.08333333333333e+00
+1471 1470 -4.16666666666667e+00
+1471 1476 4.16666666666667e+00
+1471 1361 -2.08333333333333e+00
+1471 1841 2.08333333333333e+00
+1471 1614 -2.08333333333333e+00
+1471 1360 -2.08333333333333e+00
+1471 1615 -6.25000000000000e+00
+1471 1359 2.08333333333333e+00
+1471 1839 -4.16666666666667e+00
+1472 1472 2.91666666666667e+01
+1472 1471 -8.33333333333333e+00
+1472 1477 4.16666666666667e+00
+1472 1839 2.08333333333333e+00
+1472 1476 -2.08333333333333e+00
+1472 1289 -2.08333333333333e+00
+1472 1478 -6.25000000000000e+00
+1472 1288 -2.08333333333333e+00
+1472 1468 2.08333333333333e+00
+1472 1287 2.08333333333333e+00
+1472 1467 -4.16666666666667e+00
+1472 1615 4.16666666666667e+00
+1472 1361 -2.08333333333333e+00
+1472 1616 -1.87500000000000e+01
+1472 1360 -2.08333333333333e+00
+1472 1840 2.08333333333333e+00
+1472 1470 -4.16666666666667e+00
+1472 1359 2.08333333333333e+00
+1472 1614 4.16666666666667e+00
+1473 1473 6.25000000000000e+01
+1473 1468 4.16666666666667e+00
+1473 1619 8.33333333333333e+00
+1473 1618 -4.16666666666667e+00
+1473 1617 -1.25000000000000e+01
+1473 1288 4.16666666666667e+00
+1473 1287 -6.25000000000000e+00
+1473 1474 -8.33333333333333e+00
+1473 1363 4.16666666666667e+00
+1473 1469 4.16666666666667e+00
+1473 1362 -6.25000000000000e+00
+1473 1475 -8.33333333333333e+00
+1473 1478 4.16666666666667e+00
+1473 1364 -2.08333333333333e+00
+1473 1847 2.08333333333333e+00
+1473 1846 -4.16666666666667e+00
+1473 1289 -2.08333333333333e+00
+1473 1477 4.16666666666667e+00
+1473 1476 -1.87500000000000e+01
+1473 2099 -4.16666666666667e+00
+1473 2102 2.08333333333333e+00
+1473 2098 -4.16666666666667e+00
+1473 2365 4.16666666666667e+00
+1473 2101 -4.16666666666667e+00
+1473 2462 4.16666666666667e+00
+1473 2366 -8.33333333333333e+00
+1473 2461 4.16666666666667e+00
+1473 2460 -1.87500000000000e+01
+1474 1474 6.25000000000000e+01
+1474 1289 4.16666666666667e+00
+1474 1467 4.16666666666667e+00
+1474 1619 8.33333333333333e+00
+1474 1475 -8.33333333333333e+00
+1474 1364 4.16666666666667e+00
+1474 1618 -1.25000000000000e+01
+1474 1617 -4.16666666666667e+00
+1474 1288 -1.87500000000000e+01
+1474 1287 4.16666666666667e+00
+1474 1469 -8.33333333333333e+00
+1474 1363 -1.87500000000000e+01
+1474 1473 -8.33333333333333e+00
+1474 1362 4.16666666666667e+00
+1474 1847 2.08333333333333e+00
+1474 1478 -2.08333333333333e+00
+1474 1845 -4.16666666666667e+00
+1474 1477 -6.25000000000000e+00
+1474 1476 4.16666666666667e+00
+1474 2097 -4.16666666666667e+00
+1474 2364 4.16666666666667e+00
+1474 2102 2.08333333333333e+00
+1474 2099 -4.16666666666667e+00
+1474 2100 -4.16666666666667e+00
+1474 2462 -2.08333333333333e+00
+1474 2366 4.16666666666667e+00
+1474 2461 -6.25000000000000e+00
+1474 2460 4.16666666666667e+00
+1475 1475 6.25000000000000e+01
+1475 1468 -8.33333333333333e+00
+1475 1288 4.16666666666667e+00
+1475 1619 -3.75000000000000e+01
+1475 1618 8.33333333333333e+00
+1475 1474 -8.33333333333333e+00
+1475 1363 4.16666666666667e+00
+1475 1617 8.33333333333333e+00
+1475 1289 -6.25000000000000e+00
+1475 1467 4.16666666666667e+00
+1475 1364 -6.25000000000000e+00
+1475 1477 -2.08333333333333e+00
+1475 1473 -8.33333333333333e+00
+1475 1476 4.16666666666667e+00
+1475 1362 -2.08333333333333e+00
+1475 1845 2.08333333333333e+00
+1475 1846 2.08333333333333e+00
+1475 1478 -6.25000000000000e+00
+1475 1287 -2.08333333333333e+00
+1475 2097 -4.16666666666667e+00
+1475 2100 2.08333333333333e+00
+1475 2101 2.08333333333333e+00
+1475 2098 -4.16666666666667e+00
+1475 2462 -6.25000000000000e+00
+1475 2461 -2.08333333333333e+00
+1475 2365 4.16666666666667e+00
+1475 2460 4.16666666666667e+00
+1475 2364 -8.33333333333333e+00
+1476 1476 6.25000000000000e+01
+1476 1619 -8.33333333333333e+00
+1476 1618 4.16666666666667e+00
+1476 1289 2.08333333333333e+00
+1476 1474 4.16666666666667e+00
+1476 1473 -1.87500000000000e+01
+1476 1847 -2.08333333333333e+00
+1476 1367 2.08333333333333e+00
+1476 1846 4.16666666666667e+00
+1476 1845 -6.25000000000000e+00
+1476 1469 -4.16666666666667e+00
+1476 1468 -4.16666666666667e+00
+1476 1616 4.16666666666667e+00
+1476 1472 -2.08333333333333e+00
+1476 1477 -8.33333333333333e+00
+1476 1615 4.16666666666667e+00
+1476 1621 -4.16666666666667e+00
+1476 1288 -4.16666666666667e+00
+1476 1471 4.16666666666667e+00
+1476 1470 -6.25000000000000e+00
+1476 1478 -8.33333333333333e+00
+1476 1841 4.16666666666667e+00
+1476 1622 8.33333333333333e+00
+1476 1840 4.16666666666667e+00
+1476 1366 -4.16666666666667e+00
+1476 1475 4.16666666666667e+00
+1476 1839 -1.87500000000000e+01
+1476 1620 -1.25000000000000e+01
+1477 1477 6.25000000000000e+01
+1477 1619 4.16666666666667e+00
+1477 1617 4.16666666666667e+00
+1477 1474 -6.25000000000000e+00
+1477 1473 4.16666666666667e+00
+1477 1847 4.16666666666667e+00
+1477 1478 -8.33333333333333e+00
+1477 1846 -1.87500000000000e+01
+1477 1845 4.16666666666667e+00
+1477 1467 -4.16666666666667e+00
+1477 1472 4.16666666666667e+00
+1477 1476 -8.33333333333333e+00
+1477 1616 -8.33333333333333e+00
+1477 1622 8.33333333333333e+00
+1477 1614 4.16666666666667e+00
+1477 1620 -4.16666666666667e+00
+1477 1289 2.08333333333333e+00
+1477 1469 -4.16666666666667e+00
+1477 1471 -1.87500000000000e+01
+1477 1287 -4.16666666666667e+00
+1477 1470 4.16666666666667e+00
+1477 1841 -2.08333333333333e+00
+1477 1367 2.08333333333333e+00
+1477 1475 -2.08333333333333e+00
+1477 1840 -6.25000000000000e+00
+1477 1621 -1.25000000000000e+01
+1477 1839 4.16666666666667e+00
+1477 1365 -4.16666666666667e+00
+1478 1478 6.25000000000000e+01
+1478 1618 4.16666666666667e+00
+1478 1473 4.16666666666667e+00
+1478 1617 -8.33333333333333e+00
+1478 1475 -6.25000000000000e+00
+1478 1287 2.08333333333333e+00
+1478 1847 -6.25000000000000e+00
+1478 1846 4.16666666666667e+00
+1478 1477 -8.33333333333333e+00
+1478 1845 -2.08333333333333e+00
+1478 1365 2.08333333333333e+00
+1478 1467 -4.16666666666667e+00
+1478 1471 4.16666666666667e+00
+1478 1614 4.16666666666667e+00
+1478 1470 -2.08333333333333e+00
+1478 1615 -8.33333333333333e+00
+1478 1621 8.33333333333333e+00
+1478 1472 -6.25000000000000e+00
+1478 1288 2.08333333333333e+00
+1478 1468 -4.16666666666667e+00
+1478 1474 -2.08333333333333e+00
+1478 1841 -6.25000000000000e+00
+1478 1622 -3.75000000000000e+01
+1478 1840 -2.08333333333333e+00
+1478 1366 2.08333333333333e+00
+1478 1476 -8.33333333333333e+00
+1478 1839 4.16666666666667e+00
+1478 1620 8.33333333333333e+00
+1479 1479 6.25000000000000e+01
+1479 1745 4.16666666666667e+00
+1479 1744 -8.33333333333333e+00
+1479 1484 4.16666666666667e+00
+1479 1291 2.08333333333333e+00
+1479 1482 -1.87500000000000e+01
+1479 1628 4.16666666666667e+00
+1479 1627 -2.08333333333333e+00
+1479 1312 2.08333333333333e+00
+1479 1626 -6.25000000000000e+00
+1479 1640 -4.16666666666667e+00
+1479 1481 -8.33333333333333e+00
+1479 1486 -2.08333333333333e+00
+1479 1493 -4.16666666666667e+00
+1479 1844 4.16666666666667e+00
+1479 1492 -4.16666666666667e+00
+1479 1843 4.16666666666667e+00
+1479 1487 4.16666666666667e+00
+1479 1292 -4.16666666666667e+00
+1479 1485 -6.25000000000000e+00
+1479 1634 4.16666666666667e+00
+1479 1313 -4.16666666666667e+00
+1479 1633 4.16666666666667e+00
+1479 1480 -8.33333333333333e+00
+1479 1639 8.33333333333333e+00
+1479 1632 -1.87500000000000e+01
+1479 1483 4.16666666666667e+00
+1479 1638 -1.25000000000000e+01
+1480 1480 6.25000000000000e+01
+1480 1745 4.16666666666667e+00
+1480 1482 4.16666666666667e+00
+1480 1743 -8.33333333333333e+00
+1480 1483 -6.25000000000000e+00
+1480 1290 2.08333333333333e+00
+1480 1628 4.16666666666667e+00
+1480 1481 -8.33333333333333e+00
+1480 1627 -6.25000000000000e+00
+1480 1626 -2.08333333333333e+00
+1480 1311 2.08333333333333e+00
+1480 1485 -2.08333333333333e+00
+1480 1487 4.16666666666667e+00
+1480 1640 8.33333333333333e+00
+1480 1844 -8.33333333333333e+00
+1480 1491 -4.16666666666667e+00
+1480 1842 4.16666666666667e+00
+1480 1292 2.08333333333333e+00
+1480 1493 -4.16666666666667e+00
+1480 1486 -6.25000000000000e+00
+1480 1634 -2.08333333333333e+00
+1480 1313 2.08333333333333e+00
+1480 1633 -6.25000000000000e+00
+1480 1484 -2.08333333333333e+00
+1480 1639 -3.75000000000000e+01
+1480 1632 4.16666666666667e+00
+1480 1479 -8.33333333333333e+00
+1480 1638 8.33333333333333e+00
+1481 1481 6.25000000000000e+01
+1481 1744 4.16666666666667e+00
+1481 1743 4.16666666666667e+00
+1481 1484 -6.25000000000000e+00
+1481 1482 4.16666666666667e+00
+1481 1628 -1.87500000000000e+01
+1481 1627 4.16666666666667e+00
+1481 1480 -8.33333333333333e+00
+1481 1626 4.16666666666667e+00
+1481 1638 -4.16666666666667e+00
+1481 1479 -8.33333333333333e+00
+1481 1486 4.16666666666667e+00
+1481 1491 -4.16666666666667e+00
+1481 1842 4.16666666666667e+00
+1481 1639 8.33333333333333e+00
+1481 1843 -8.33333333333333e+00
+1481 1487 -1.87500000000000e+01
+1481 1291 2.08333333333333e+00
+1481 1492 -4.16666666666667e+00
+1481 1485 4.16666666666667e+00
+1481 1290 -4.16666666666667e+00
+1481 1634 -6.25000000000000e+00
+1481 1483 -2.08333333333333e+00
+1481 1640 -1.25000000000000e+01
+1481 1633 -2.08333333333333e+00
+1481 1312 2.08333333333333e+00
+1481 1632 4.16666666666667e+00
+1481 1311 -4.16666666666667e+00
+1482 1482 6.25000000000000e+01
+1482 1496 -4.16666666666667e+00
+1482 1489 2.08333333333333e+00
+1482 1495 -4.16666666666667e+00
+1482 1490 -4.16666666666667e+00
+1482 1742 4.16666666666667e+00
+1482 1741 4.16666666666667e+00
+1482 1747 -8.33333333333333e+00
+1482 1740 -1.87500000000000e+01
+1482 1493 4.16666666666667e+00
+1482 1745 -4.16666666666667e+00
+1482 1483 -8.33333333333333e+00
+1482 1744 8.33333333333333e+00
+1482 1480 4.16666666666667e+00
+1482 1331 4.16666666666667e+00
+1482 1628 -4.16666666666667e+00
+1482 1330 -2.08333333333333e+00
+1482 1627 2.08333333333333e+00
+1482 1329 -6.25000000000000e+00
+1482 1743 -1.25000000000000e+01
+1482 1484 -8.33333333333333e+00
+1482 1292 4.16666666666667e+00
+1482 1481 4.16666666666667e+00
+1482 1291 -2.08333333333333e+00
+1482 1492 4.16666666666667e+00
+1482 1748 4.16666666666667e+00
+1482 1290 -6.25000000000000e+00
+1482 1479 -1.87500000000000e+01
+1483 1483 6.25000000000000e+01
+1483 1494 -4.16666666666667e+00
+1483 1490 2.08333333333333e+00
+1483 1496 -4.16666666666667e+00
+1483 1742 -2.08333333333333e+00
+1483 1748 4.16666666666667e+00
+1483 1741 -6.25000000000000e+00
+1483 1740 4.16666666666667e+00
+1483 1746 -8.33333333333333e+00
+1483 1628 2.08333333333333e+00
+1483 1481 -2.08333333333333e+00
+1483 1482 -8.33333333333333e+00
+1483 1743 8.33333333333333e+00
+1483 1479 4.16666666666667e+00
+1483 1331 4.16666666666667e+00
+1483 1484 -8.33333333333333e+00
+1483 1745 8.33333333333333e+00
+1483 1330 -6.25000000000000e+00
+1483 1744 -3.75000000000000e+01
+1483 1329 -2.08333333333333e+00
+1483 1626 2.08333333333333e+00
+1483 1292 4.16666666666667e+00
+1483 1493 -8.33333333333333e+00
+1483 1488 2.08333333333333e+00
+1483 1291 -6.25000000000000e+00
+1483 1480 -6.25000000000000e+00
+1483 1290 -2.08333333333333e+00
+1483 1491 4.16666666666667e+00
+1484 1484 6.25000000000000e+01
+1484 1494 -4.16666666666667e+00
+1484 1489 2.08333333333333e+00
+1484 1495 -4.16666666666667e+00
+1484 1488 -4.16666666666667e+00
+1484 1742 -6.25000000000000e+00
+1484 1741 -2.08333333333333e+00
+1484 1747 4.16666666666667e+00
+1484 1740 4.16666666666667e+00
+1484 1491 4.16666666666667e+00
+1484 1743 -4.16666666666667e+00
+1484 1627 2.08333333333333e+00
+1484 1480 -2.08333333333333e+00
+1484 1331 -1.87500000000000e+01
+1484 1745 -1.25000000000000e+01
+1484 1330 4.16666666666667e+00
+1484 1483 -8.33333333333333e+00
+1484 1744 8.33333333333333e+00
+1484 1329 4.16666666666667e+00
+1484 1626 -4.16666666666667e+00
+1484 1746 4.16666666666667e+00
+1484 1292 -1.87500000000000e+01
+1484 1481 -6.25000000000000e+00
+1484 1291 4.16666666666667e+00
+1484 1492 -8.33333333333333e+00
+1484 1482 -8.33333333333333e+00
+1484 1290 4.16666666666667e+00
+1484 1479 4.16666666666667e+00
+1485 1485 2.50000000000000e+01
+1485 1633 2.08333333333333e+00
+1485 1493 2.08333333333333e+00
+1485 1844 -2.08333333333333e+00
+1485 1361 2.08333333333333e+00
+1485 1634 -4.16666666666667e+00
+1485 1360 2.08333333333333e+00
+1485 1486 -4.16666666666667e+00
+1485 1843 4.16666666666667e+00
+1485 1359 -6.25000000000000e+00
+1485 1842 -6.25000000000000e+00
+1485 1487 -4.16666666666667e+00
+1485 1292 2.08333333333333e+00
+1485 1481 4.16666666666667e+00
+1485 1291 2.08333333333333e+00
+1485 1492 -4.16666666666667e+00
+1485 1480 -2.08333333333333e+00
+1485 1290 -6.25000000000000e+00
+1485 1479 -6.25000000000000e+00
+1486 1486 2.91666666666667e+01
+1486 1632 2.08333333333333e+00
+1486 1481 4.16666666666667e+00
+1486 1487 -8.33333333333333e+00
+1486 1844 4.16666666666667e+00
+1486 1361 -2.08333333333333e+00
+1486 1634 2.08333333333333e+00
+1486 1360 -2.08333333333333e+00
+1486 1843 -1.87500000000000e+01
+1486 1359 2.08333333333333e+00
+1486 1485 -4.16666666666667e+00
+1486 1842 4.16666666666667e+00
+1486 1292 -2.08333333333333e+00
+1486 1493 2.08333333333333e+00
+1486 1479 -2.08333333333333e+00
+1486 1291 -2.08333333333333e+00
+1486 1480 -6.25000000000000e+00
+1486 1290 2.08333333333333e+00
+1486 1491 -4.16666666666667e+00
+1487 1487 2.91666666666667e+01
+1487 1486 -8.33333333333333e+00
+1487 1843 4.16666666666667e+00
+1487 1491 2.08333333333333e+00
+1487 1842 -2.08333333333333e+00
+1487 1361 -2.08333333333333e+00
+1487 1844 -6.25000000000000e+00
+1487 1360 -2.08333333333333e+00
+1487 1633 2.08333333333333e+00
+1487 1359 2.08333333333333e+00
+1487 1632 -4.16666666666667e+00
+1487 1480 4.16666666666667e+00
+1487 1292 -2.08333333333333e+00
+1487 1481 -1.87500000000000e+01
+1487 1291 -2.08333333333333e+00
+1487 1492 2.08333333333333e+00
+1487 1485 -4.16666666666667e+00
+1487 1290 2.08333333333333e+00
+1487 1479 4.16666666666667e+00
+1488 1488 2.50000000000000e+01
+1488 1483 2.08333333333333e+00
+1488 1859 2.08333333333333e+00
+1488 1496 -2.08333333333333e+00
+1488 1292 2.08333333333333e+00
+1488 1484 -4.16666666666667e+00
+1488 1291 2.08333333333333e+00
+1488 1489 -4.16666666666667e+00
+1488 1495 4.16666666666667e+00
+1488 1290 -6.25000000000000e+00
+1488 1494 -6.25000000000000e+00
+1488 1490 -4.16666666666667e+00
+1488 1370 2.08333333333333e+00
+1488 1742 4.16666666666667e+00
+1488 1369 2.08333333333333e+00
+1488 1858 -4.16666666666667e+00
+1488 1741 -2.08333333333333e+00
+1488 1368 -6.25000000000000e+00
+1488 1740 -6.25000000000000e+00
+1489 1489 2.91666666666667e+01
+1489 1482 2.08333333333333e+00
+1489 1742 4.16666666666667e+00
+1489 1490 -8.33333333333333e+00
+1489 1496 4.16666666666667e+00
+1489 1292 -2.08333333333333e+00
+1489 1484 2.08333333333333e+00
+1489 1291 -2.08333333333333e+00
+1489 1495 -1.87500000000000e+01
+1489 1290 2.08333333333333e+00
+1489 1488 -4.16666666666667e+00
+1489 1494 4.16666666666667e+00
+1489 1370 -2.08333333333333e+00
+1489 1859 2.08333333333333e+00
+1489 1740 -2.08333333333333e+00
+1489 1369 -2.08333333333333e+00
+1489 1741 -6.25000000000000e+00
+1489 1368 2.08333333333333e+00
+1489 1857 -4.16666666666667e+00
+1490 1490 2.91666666666667e+01
+1490 1489 -8.33333333333333e+00
+1490 1495 4.16666666666667e+00
+1490 1857 2.08333333333333e+00
+1490 1494 -2.08333333333333e+00
+1490 1292 -2.08333333333333e+00
+1490 1496 -6.25000000000000e+00
+1490 1291 -2.08333333333333e+00
+1490 1483 2.08333333333333e+00
+1490 1290 2.08333333333333e+00
+1490 1482 -4.16666666666667e+00
+1490 1741 4.16666666666667e+00
+1490 1370 -2.08333333333333e+00
+1490 1742 -1.87500000000000e+01
+1490 1369 -2.08333333333333e+00
+1490 1858 2.08333333333333e+00
+1490 1488 -4.16666666666667e+00
+1490 1368 2.08333333333333e+00
+1490 1740 4.16666666666667e+00
+1491 1491 6.25000000000000e+01
+1491 1496 4.16666666666667e+00
+1491 1373 -2.08333333333333e+00
+1491 1865 2.08333333333333e+00
+1491 1864 -4.16666666666667e+00
+1491 1292 -2.08333333333333e+00
+1491 1495 4.16666666666667e+00
+1491 1494 -1.87500000000000e+01
+1491 1484 4.16666666666667e+00
+1491 1483 4.16666666666667e+00
+1491 1745 8.33333333333333e+00
+1491 1744 -4.16666666666667e+00
+1491 1743 -1.25000000000000e+01
+1491 1481 -4.16666666666667e+00
+1491 1487 2.08333333333333e+00
+1491 1480 -4.16666666666667e+00
+1491 1639 4.16666666666667e+00
+1491 1486 -4.16666666666667e+00
+1491 1291 4.16666666666667e+00
+1491 1290 -6.25000000000000e+00
+1491 1844 4.16666666666667e+00
+1491 1640 -8.33333333333333e+00
+1491 1843 4.16666666666667e+00
+1491 1492 -8.33333333333333e+00
+1491 1372 4.16666666666667e+00
+1491 1842 -1.87500000000000e+01
+1491 1493 -8.33333333333333e+00
+1491 1371 -6.25000000000000e+00
+1492 1492 6.25000000000000e+01
+1492 1496 -2.08333333333333e+00
+1492 1863 -4.16666666666667e+00
+1492 1495 -6.25000000000000e+00
+1492 1494 4.16666666666667e+00
+1492 1484 -8.33333333333333e+00
+1492 1292 4.16666666666667e+00
+1492 1482 4.16666666666667e+00
+1492 1745 8.33333333333333e+00
+1492 1493 -8.33333333333333e+00
+1492 1373 4.16666666666667e+00
+1492 1744 -1.25000000000000e+01
+1492 1743 -4.16666666666667e+00
+1492 1479 -4.16666666666667e+00
+1492 1638 4.16666666666667e+00
+1492 1487 2.08333333333333e+00
+1492 1481 -4.16666666666667e+00
+1492 1291 -1.87500000000000e+01
+1492 1485 -4.16666666666667e+00
+1492 1290 4.16666666666667e+00
+1492 1844 -2.08333333333333e+00
+1492 1640 4.16666666666667e+00
+1492 1843 -6.25000000000000e+00
+1492 1865 2.08333333333333e+00
+1492 1372 -1.87500000000000e+01
+1492 1842 4.16666666666667e+00
+1492 1491 -8.33333333333333e+00
+1492 1371 4.16666666666667e+00
+1493 1493 6.25000000000000e+01
+1493 1495 -2.08333333333333e+00
+1493 1491 -8.33333333333333e+00
+1493 1494 4.16666666666667e+00
+1493 1371 -2.08333333333333e+00
+1493 1863 2.08333333333333e+00
+1493 1496 -6.25000000000000e+00
+1493 1290 -2.08333333333333e+00
+1493 1482 4.16666666666667e+00
+1493 1483 -8.33333333333333e+00
+1493 1291 4.16666666666667e+00
+1493 1745 -3.75000000000000e+01
+1493 1744 8.33333333333333e+00
+1493 1492 -8.33333333333333e+00
+1493 1372 4.16666666666667e+00
+1493 1743 8.33333333333333e+00
+1493 1479 -4.16666666666667e+00
+1493 1485 2.08333333333333e+00
+1493 1292 -6.25000000000000e+00
+1493 1486 2.08333333333333e+00
+1493 1480 -4.16666666666667e+00
+1493 1844 -6.25000000000000e+00
+1493 1864 2.08333333333333e+00
+1493 1373 -6.25000000000000e+00
+1493 1843 -2.08333333333333e+00
+1493 1639 4.16666666666667e+00
+1493 1842 4.16666666666667e+00
+1493 1638 -8.33333333333333e+00
+1494 1494 6.25000000000000e+01
+1494 1745 -8.33333333333333e+00
+1494 1744 4.16666666666667e+00
+1494 1292 2.08333333333333e+00
+1494 1492 4.16666666666667e+00
+1494 1491 -1.87500000000000e+01
+1494 1865 -2.08333333333333e+00
+1494 1376 2.08333333333333e+00
+1494 1864 4.16666666666667e+00
+1494 1863 -6.25000000000000e+00
+1494 1484 -4.16666666666667e+00
+1494 1483 -4.16666666666667e+00
+1494 1742 4.16666666666667e+00
+1494 1490 -2.08333333333333e+00
+1494 1495 -8.33333333333333e+00
+1494 1741 4.16666666666667e+00
+1494 1747 -4.16666666666667e+00
+1494 1291 -4.16666666666667e+00
+1494 1489 4.16666666666667e+00
+1494 1488 -6.25000000000000e+00
+1494 1496 -8.33333333333333e+00
+1494 1859 4.16666666666667e+00
+1494 1748 8.33333333333333e+00
+1494 1858 4.16666666666667e+00
+1494 1375 -4.16666666666667e+00
+1494 1493 4.16666666666667e+00
+1494 1857 -1.87500000000000e+01
+1494 1746 -1.25000000000000e+01
+1495 1495 6.25000000000000e+01
+1495 1745 4.16666666666667e+00
+1495 1743 4.16666666666667e+00
+1495 1492 -6.25000000000000e+00
+1495 1491 4.16666666666667e+00
+1495 1865 4.16666666666667e+00
+1495 1496 -8.33333333333333e+00
+1495 1864 -1.87500000000000e+01
+1495 1863 4.16666666666667e+00
+1495 1482 -4.16666666666667e+00
+1495 1490 4.16666666666667e+00
+1495 1494 -8.33333333333333e+00
+1495 1742 -8.33333333333333e+00
+1495 1748 8.33333333333333e+00
+1495 1740 4.16666666666667e+00
+1495 1746 -4.16666666666667e+00
+1495 1292 2.08333333333333e+00
+1495 1484 -4.16666666666667e+00
+1495 1489 -1.87500000000000e+01
+1495 1290 -4.16666666666667e+00
+1495 1488 4.16666666666667e+00
+1495 1859 -2.08333333333333e+00
+1495 1376 2.08333333333333e+00
+1495 1493 -2.08333333333333e+00
+1495 1858 -6.25000000000000e+00
+1495 1747 -1.25000000000000e+01
+1495 1857 4.16666666666667e+00
+1495 1374 -4.16666666666667e+00
+1496 1496 6.25000000000000e+01
+1496 1744 4.16666666666667e+00
+1496 1491 4.16666666666667e+00
+1496 1743 -8.33333333333333e+00
+1496 1493 -6.25000000000000e+00
+1496 1290 2.08333333333333e+00
+1496 1865 -6.25000000000000e+00
+1496 1864 4.16666666666667e+00
+1496 1495 -8.33333333333333e+00
+1496 1863 -2.08333333333333e+00
+1496 1374 2.08333333333333e+00
+1496 1482 -4.16666666666667e+00
+1496 1489 4.16666666666667e+00
+1496 1740 4.16666666666667e+00
+1496 1488 -2.08333333333333e+00
+1496 1741 -8.33333333333333e+00
+1496 1747 8.33333333333333e+00
+1496 1490 -6.25000000000000e+00
+1496 1291 2.08333333333333e+00
+1496 1483 -4.16666666666667e+00
+1496 1492 -2.08333333333333e+00
+1496 1859 -6.25000000000000e+00
+1496 1748 -3.75000000000000e+01
+1496 1858 -2.08333333333333e+00
+1496 1375 2.08333333333333e+00
+1496 1494 -8.33333333333333e+00
+1496 1857 4.16666666666667e+00
+1496 1746 8.33333333333333e+00
+1497 1497 6.25000000000000e+01
+1497 1754 4.16666666666667e+00
+1497 1753 -2.08333333333333e+00
+1497 1333 2.08333333333333e+00
+1497 1752 -6.25000000000000e+00
+1497 1766 -4.16666666666667e+00
+1497 1499 -8.33333333333333e+00
+1497 1501 -2.08333333333333e+00
+1497 1862 4.16666666666667e+00
+1497 1861 4.16666666666667e+00
+1497 1502 4.16666666666667e+00
+1497 1500 -6.25000000000000e+00
+1497 1760 4.16666666666667e+00
+1497 1334 -4.16666666666667e+00
+1497 1759 4.16666666666667e+00
+1497 1498 -8.33333333333333e+00
+1497 1765 8.33333333333333e+00
+1497 1758 -1.87500000000000e+01
+1497 1764 -1.25000000000000e+01
+1497 401 4.16666666666667e+00
+1497 400 -8.33333333333333e+00
+1497 236 4.16666666666667e+00
+1497 19 2.08333333333333e+00
+1497 234 -1.87500000000000e+01
+1497 242 -4.16666666666667e+00
+1497 241 -4.16666666666667e+00
+1497 20 -4.16666666666667e+00
+1497 235 4.16666666666667e+00
+1498 1498 6.25000000000000e+01
+1498 1754 4.16666666666667e+00
+1498 1499 -8.33333333333333e+00
+1498 1753 -6.25000000000000e+00
+1498 1752 -2.08333333333333e+00
+1498 1332 2.08333333333333e+00
+1498 1500 -2.08333333333333e+00
+1498 1502 4.16666666666667e+00
+1498 1766 8.33333333333333e+00
+1498 1862 -8.33333333333333e+00
+1498 1860 4.16666666666667e+00
+1498 1501 -6.25000000000000e+00
+1498 1760 -2.08333333333333e+00
+1498 1334 2.08333333333333e+00
+1498 1759 -6.25000000000000e+00
+1498 1765 -3.75000000000000e+01
+1498 1758 4.16666666666667e+00
+1498 1497 -8.33333333333333e+00
+1498 1764 8.33333333333333e+00
+1498 401 4.16666666666667e+00
+1498 234 4.16666666666667e+00
+1498 399 -8.33333333333333e+00
+1498 235 -6.25000000000000e+00
+1498 18 2.08333333333333e+00
+1498 240 -4.16666666666667e+00
+1498 20 2.08333333333333e+00
+1498 242 -4.16666666666667e+00
+1498 236 -2.08333333333333e+00
+1499 1499 6.25000000000000e+01
+1499 1754 -1.87500000000000e+01
+1499 1753 4.16666666666667e+00
+1499 1498 -8.33333333333333e+00
+1499 1752 4.16666666666667e+00
+1499 1764 -4.16666666666667e+00
+1499 1497 -8.33333333333333e+00
+1499 1501 4.16666666666667e+00
+1499 1860 4.16666666666667e+00
+1499 1765 8.33333333333333e+00
+1499 1861 -8.33333333333333e+00
+1499 1502 -1.87500000000000e+01
+1499 1500 4.16666666666667e+00
+1499 1760 -6.25000000000000e+00
+1499 1766 -1.25000000000000e+01
+1499 1759 -2.08333333333333e+00
+1499 1333 2.08333333333333e+00
+1499 1758 4.16666666666667e+00
+1499 1332 -4.16666666666667e+00
+1499 400 4.16666666666667e+00
+1499 399 4.16666666666667e+00
+1499 236 -6.25000000000000e+00
+1499 234 4.16666666666667e+00
+1499 240 -4.16666666666667e+00
+1499 19 2.08333333333333e+00
+1499 241 -4.16666666666667e+00
+1499 18 -4.16666666666667e+00
+1499 235 -2.08333333333333e+00
+1500 1500 2.50000000000000e+01
+1500 1759 2.08333333333333e+00
+1500 1862 -2.08333333333333e+00
+1500 1370 2.08333333333333e+00
+1500 1760 -4.16666666666667e+00
+1500 1369 2.08333333333333e+00
+1500 1501 -4.16666666666667e+00
+1500 1861 4.16666666666667e+00
+1500 1368 -6.25000000000000e+00
+1500 1860 -6.25000000000000e+00
+1500 1502 -4.16666666666667e+00
+1500 1499 4.16666666666667e+00
+1500 1498 -2.08333333333333e+00
+1500 1497 -6.25000000000000e+00
+1500 242 2.08333333333333e+00
+1500 20 2.08333333333333e+00
+1500 19 2.08333333333333e+00
+1500 241 -4.16666666666667e+00
+1500 18 -6.25000000000000e+00
+1501 1501 2.91666666666667e+01
+1501 1758 2.08333333333333e+00
+1501 1499 4.16666666666667e+00
+1501 1502 -8.33333333333333e+00
+1501 1862 4.16666666666667e+00
+1501 1370 -2.08333333333333e+00
+1501 1760 2.08333333333333e+00
+1501 1369 -2.08333333333333e+00
+1501 1861 -1.87500000000000e+01
+1501 1368 2.08333333333333e+00
+1501 1500 -4.16666666666667e+00
+1501 1860 4.16666666666667e+00
+1501 1497 -2.08333333333333e+00
+1501 1498 -6.25000000000000e+00
+1501 20 -2.08333333333333e+00
+1501 242 2.08333333333333e+00
+1501 19 -2.08333333333333e+00
+1501 18 2.08333333333333e+00
+1501 240 -4.16666666666667e+00
+1502 1502 2.91666666666667e+01
+1502 1501 -8.33333333333333e+00
+1502 1861 4.16666666666667e+00
+1502 1860 -2.08333333333333e+00
+1502 1370 -2.08333333333333e+00
+1502 1862 -6.25000000000000e+00
+1502 1369 -2.08333333333333e+00
+1502 1759 2.08333333333333e+00
+1502 1368 2.08333333333333e+00
+1502 1758 -4.16666666666667e+00
+1502 1498 4.16666666666667e+00
+1502 1499 -1.87500000000000e+01
+1502 1500 -4.16666666666667e+00
+1502 1497 4.16666666666667e+00
+1502 240 2.08333333333333e+00
+1502 20 -2.08333333333333e+00
+1502 19 -2.08333333333333e+00
+1502 241 2.08333333333333e+00
+1502 18 2.08333333333333e+00
+1503 1503 1.25000000000000e+02
+1503 1645 -4.16666666666667e+00
+1503 1316 4.16666666666667e+00
+1503 1644 -1.25000000000000e+01
+1503 1508 -4.16666666666667e+00
+1503 1295 4.16666666666667e+00
+1503 1504 -1.66666666666667e+01
+1503 1507 8.33333333333333e+00
+1503 1506 -1.25000000000000e+01
+1503 1652 -4.16666666666667e+00
+1503 1651 8.33333333333333e+00
+1503 1315 4.16666666666667e+00
+1503 1650 -1.25000000000000e+01
+1503 1505 -1.66666666666667e+01
+1503 1511 8.33333333333333e+00
+1503 1510 -4.16666666666667e+00
+1503 1294 4.16666666666667e+00
+1503 1646 8.33333333333333e+00
+1503 1509 -1.25000000000000e+01
+1503 1813 -8.33333333333333e+00
+1503 1658 8.33333333333333e+00
+1503 1850 -8.33333333333333e+00
+1503 1513 -4.16666666666667e+00
+1503 1849 4.16666666666667e+00
+1503 1514 -4.16666666666667e+00
+1503 1657 8.33333333333333e+00
+1503 1814 4.16666666666667e+00
+1503 1656 -3.75000000000000e+01
+1503 2392 4.16666666666667e+00
+1503 2393 -8.33333333333333e+00
+1503 2387 -4.16666666666667e+00
+1503 2399 4.16666666666667e+00
+1503 2140 8.33333333333333e+00
+1503 2398 -8.33333333333333e+00
+1503 2386 -4.16666666666667e+00
+1503 2141 8.33333333333333e+00
+1503 2139 -3.75000000000000e+01
+1504 1504 1.25000000000000e+02
+1504 1644 -4.16666666666667e+00
+1504 1646 8.33333333333333e+00
+1504 1645 -1.25000000000000e+01
+1504 1508 8.33333333333333e+00
+1504 1507 -3.75000000000000e+01
+1504 1503 -1.66666666666667e+01
+1504 1506 8.33333333333333e+00
+1504 1505 -1.66666666666667e+01
+1504 1650 8.33333333333333e+00
+1504 1316 -8.33333333333333e+00
+1504 1652 8.33333333333333e+00
+1504 1651 -3.75000000000000e+01
+1504 1314 4.16666666666667e+00
+1504 1511 8.33333333333333e+00
+1504 1295 -8.33333333333333e+00
+1504 1510 -1.25000000000000e+01
+1504 1509 -4.16666666666667e+00
+1504 1293 4.16666666666667e+00
+1504 1814 4.16666666666667e+00
+1504 1812 -8.33333333333333e+00
+1504 1658 -4.16666666666667e+00
+1504 1514 -4.16666666666667e+00
+1504 1850 4.16666666666667e+00
+1504 1512 -4.16666666666667e+00
+1504 1848 4.16666666666667e+00
+1504 1657 -1.25000000000000e+01
+1504 1656 8.33333333333333e+00
+1504 2393 4.16666666666667e+00
+1504 2141 -4.16666666666667e+00
+1504 2387 -4.16666666666667e+00
+1504 2399 4.16666666666667e+00
+1504 2139 8.33333333333333e+00
+1504 2397 -8.33333333333333e+00
+1504 2385 -4.16666666666667e+00
+1504 2391 4.16666666666667e+00
+1504 2140 -1.25000000000000e+01
+1505 1505 1.25000000000000e+02
+1505 1646 -3.75000000000000e+01
+1505 1645 8.33333333333333e+00
+1505 1314 4.16666666666667e+00
+1505 1508 -1.25000000000000e+01
+1505 1507 8.33333333333333e+00
+1505 1506 -4.16666666666667e+00
+1505 1293 4.16666666666667e+00
+1505 1504 -1.66666666666667e+01
+1505 1650 -4.16666666666667e+00
+1505 1652 -1.25000000000000e+01
+1505 1315 -8.33333333333333e+00
+1505 1651 8.33333333333333e+00
+1505 1644 8.33333333333333e+00
+1505 1511 -3.75000000000000e+01
+1505 1510 8.33333333333333e+00
+1505 1294 -8.33333333333333e+00
+1505 1503 -1.66666666666667e+01
+1505 1509 8.33333333333333e+00
+1505 1813 4.16666666666667e+00
+1505 1657 -4.16666666666667e+00
+1505 1513 -4.16666666666667e+00
+1505 1849 4.16666666666667e+00
+1505 1656 8.33333333333333e+00
+1505 1848 -8.33333333333333e+00
+1505 1512 -4.16666666666667e+00
+1505 1812 4.16666666666667e+00
+1505 1658 -1.25000000000000e+01
+1505 2392 4.16666666666667e+00
+1505 2391 -8.33333333333333e+00
+1505 2140 -4.16666666666667e+00
+1505 2386 -4.16666666666667e+00
+1505 2398 4.16666666666667e+00
+1505 2385 -4.16666666666667e+00
+1505 2397 4.16666666666667e+00
+1505 2141 -1.25000000000000e+01
+1505 2139 8.33333333333333e+00
+1506 1506 6.25000000000000e+01
+1506 1346 4.16666666666667e+00
+1506 1508 -8.33333333333333e+00
+1506 1295 4.16666666666667e+00
+1506 1645 4.16666666666667e+00
+1506 1646 4.16666666666667e+00
+1506 1344 -6.25000000000000e+00
+1506 1505 -4.16666666666667e+00
+1506 1504 8.33333333333333e+00
+1506 1503 -1.25000000000000e+01
+1506 1293 -6.25000000000000e+00
+1506 1813 4.16666666666667e+00
+1506 1507 -8.33333333333333e+00
+1506 1514 -4.16666666666667e+00
+1506 1294 -2.08333333333333e+00
+1506 1513 2.08333333333333e+00
+1506 1814 4.16666666666667e+00
+1506 1345 -2.08333333333333e+00
+1506 1812 -1.87500000000000e+01
+1506 2435 -4.16666666666667e+00
+1506 2144 4.16666666666667e+00
+1506 2143 4.16666666666667e+00
+1506 2142 -1.87500000000000e+01
+1506 2392 -4.16666666666667e+00
+1506 2393 -4.16666666666667e+00
+1506 2141 4.16666666666667e+00
+1506 2140 -8.33333333333333e+00
+1506 2434 2.08333333333333e+00
+1507 1507 6.25000000000000e+01
+1507 1644 4.16666666666667e+00
+1507 1646 -8.33333333333333e+00
+1507 1346 4.16666666666667e+00
+1507 1345 -6.25000000000000e+00
+1507 1505 8.33333333333333e+00
+1507 1508 -8.33333333333333e+00
+1507 1295 4.16666666666667e+00
+1507 1504 -3.75000000000000e+01
+1507 1294 -6.25000000000000e+00
+1507 1503 8.33333333333333e+00
+1507 1514 2.08333333333333e+00
+1507 1812 4.16666666666667e+00
+1507 1506 -8.33333333333333e+00
+1507 1293 -2.08333333333333e+00
+1507 1512 2.08333333333333e+00
+1507 1814 -2.08333333333333e+00
+1507 1813 -6.25000000000000e+00
+1507 1344 -2.08333333333333e+00
+1507 2435 2.08333333333333e+00
+1507 2144 -2.08333333333333e+00
+1507 2143 -6.25000000000000e+00
+1507 2142 4.16666666666667e+00
+1507 2391 -4.16666666666667e+00
+1507 2393 -4.16666666666667e+00
+1507 2141 4.16666666666667e+00
+1507 2433 2.08333333333333e+00
+1507 2139 -8.33333333333333e+00
+1508 1508 6.25000000000000e+01
+1508 1344 4.16666666666667e+00
+1508 1506 -8.33333333333333e+00
+1508 1293 4.16666666666667e+00
+1508 1346 -1.87500000000000e+01
+1508 1645 -8.33333333333333e+00
+1508 1345 4.16666666666667e+00
+1508 1644 4.16666666666667e+00
+1508 1505 -1.25000000000000e+01
+1508 1295 -1.87500000000000e+01
+1508 1504 8.33333333333333e+00
+1508 1507 -8.33333333333333e+00
+1508 1294 4.16666666666667e+00
+1508 1503 -4.16666666666667e+00
+1508 1513 2.08333333333333e+00
+1508 1512 -4.16666666666667e+00
+1508 1813 -2.08333333333333e+00
+1508 1814 -6.25000000000000e+00
+1508 1812 4.16666666666667e+00
+1508 2433 -4.16666666666667e+00
+1508 2144 -6.25000000000000e+00
+1508 2143 -2.08333333333333e+00
+1508 2142 4.16666666666667e+00
+1508 2392 -4.16666666666667e+00
+1508 2140 4.16666666666667e+00
+1508 2391 -4.16666666666667e+00
+1508 2434 2.08333333333333e+00
+1508 2139 4.16666666666667e+00
+1509 1509 6.25000000000000e+01
+1509 1651 4.16666666666667e+00
+1509 1505 8.33333333333333e+00
+1509 1504 -4.16666666666667e+00
+1509 1503 -1.25000000000000e+01
+1509 1363 4.16666666666667e+00
+1509 1362 -6.25000000000000e+00
+1509 1510 -8.33333333333333e+00
+1509 1294 4.16666666666667e+00
+1509 1652 4.16666666666667e+00
+1509 1293 -6.25000000000000e+00
+1509 1511 -8.33333333333333e+00
+1509 1850 4.16666666666667e+00
+1509 1295 -2.08333333333333e+00
+1509 1514 2.08333333333333e+00
+1509 1513 -4.16666666666667e+00
+1509 1364 -2.08333333333333e+00
+1509 1849 4.16666666666667e+00
+1509 1848 -1.87500000000000e+01
+1509 2399 -4.16666666666667e+00
+1509 2471 2.08333333333333e+00
+1509 2398 -4.16666666666667e+00
+1509 2140 4.16666666666667e+00
+1509 2470 -4.16666666666667e+00
+1509 2147 4.16666666666667e+00
+1509 2141 -8.33333333333333e+00
+1509 2146 4.16666666666667e+00
+1509 2145 -1.87500000000000e+01
+1510 1510 6.25000000000000e+01
+1510 1364 4.16666666666667e+00
+1510 1650 4.16666666666667e+00
+1510 1505 8.33333333333333e+00
+1510 1511 -8.33333333333333e+00
+1510 1295 4.16666666666667e+00
+1510 1504 -1.25000000000000e+01
+1510 1503 -4.16666666666667e+00
+1510 1363 -1.87500000000000e+01
+1510 1362 4.16666666666667e+00
+1510 1652 -8.33333333333333e+00
+1510 1294 -1.87500000000000e+01
+1510 1509 -8.33333333333333e+00
+1510 1293 4.16666666666667e+00
+1510 1514 2.08333333333333e+00
+1510 1850 -2.08333333333333e+00
+1510 1512 -4.16666666666667e+00
+1510 1849 -6.25000000000000e+00
+1510 1848 4.16666666666667e+00
+1510 2397 -4.16666666666667e+00
+1510 2139 4.16666666666667e+00
+1510 2471 2.08333333333333e+00
+1510 2399 -4.16666666666667e+00
+1510 2469 -4.16666666666667e+00
+1510 2147 -2.08333333333333e+00
+1510 2141 4.16666666666667e+00
+1510 2146 -6.25000000000000e+00
+1510 2145 4.16666666666667e+00
+1511 1511 6.25000000000000e+01
+1511 1651 -8.33333333333333e+00
+1511 1363 4.16666666666667e+00
+1511 1505 -3.75000000000000e+01
+1511 1504 8.33333333333333e+00
+1511 1510 -8.33333333333333e+00
+1511 1294 4.16666666666667e+00
+1511 1503 8.33333333333333e+00
+1511 1364 -6.25000000000000e+00
+1511 1650 4.16666666666667e+00
+1511 1295 -6.25000000000000e+00
+1511 1849 -2.08333333333333e+00
+1511 1509 -8.33333333333333e+00
+1511 1848 4.16666666666667e+00
+1511 1293 -2.08333333333333e+00
+1511 1512 2.08333333333333e+00
+1511 1513 2.08333333333333e+00
+1511 1850 -6.25000000000000e+00
+1511 1362 -2.08333333333333e+00
+1511 2397 -4.16666666666667e+00
+1511 2469 2.08333333333333e+00
+1511 2470 2.08333333333333e+00
+1511 2398 -4.16666666666667e+00
+1511 2147 -6.25000000000000e+00
+1511 2146 -2.08333333333333e+00
+1511 2140 4.16666666666667e+00
+1511 2145 4.16666666666667e+00
+1511 2139 -8.33333333333333e+00
+1512 1512 3.75000000000000e+01
+1512 1508 -4.16666666666667e+00
+1512 1507 2.08333333333333e+00
+1512 1514 -4.16666666666667e+00
+1512 1814 4.16666666666667e+00
+1512 1379 2.08333333333333e+00
+1512 1813 -2.08333333333333e+00
+1512 1812 -6.25000000000000e+00
+1512 1504 -4.16666666666667e+00
+1512 1657 4.16666666666667e+00
+1512 1511 2.08333333333333e+00
+1512 1505 -4.16666666666667e+00
+1512 1294 2.08333333333333e+00
+1512 1510 -4.16666666666667e+00
+1512 1293 -1.25000000000000e+01
+1512 1850 -2.08333333333333e+00
+1512 1658 4.16666666666667e+00
+1512 1513 -4.16666666666667e+00
+1512 1849 4.16666666666667e+00
+1512 1378 2.08333333333333e+00
+1512 1295 2.08333333333333e+00
+1512 1848 -6.25000000000000e+00
+1512 1377 -1.25000000000000e+01
+1513 1513 3.33333333333333e+01
+1513 1506 2.08333333333333e+00
+1513 1814 4.16666666666667e+00
+1513 1813 -6.25000000000000e+00
+1513 1812 -2.08333333333333e+00
+1513 1511 2.08333333333333e+00
+1513 1505 -4.16666666666667e+00
+1513 1503 -4.16666666666667e+00
+1513 1656 4.16666666666667e+00
+1513 1294 -4.16666666666667e+00
+1513 1293 2.08333333333333e+00
+1513 1509 -4.16666666666667e+00
+1513 1850 4.16666666666667e+00
+1513 1658 -8.33333333333333e+00
+1513 1508 2.08333333333333e+00
+1513 1849 -1.87500000000000e+01
+1513 1378 -4.16666666666667e+00
+1513 1512 -4.16666666666667e+00
+1513 1848 4.16666666666667e+00
+1513 1377 2.08333333333333e+00
+1514 1514 3.33333333333333e+01
+1514 1293 2.08333333333333e+00
+1514 1506 -4.16666666666667e+00
+1514 1814 -1.87500000000000e+01
+1514 1813 4.16666666666667e+00
+1514 1512 -4.16666666666667e+00
+1514 1812 4.16666666666667e+00
+1514 1377 2.08333333333333e+00
+1514 1510 2.08333333333333e+00
+1514 1504 -4.16666666666667e+00
+1514 1295 -4.16666666666667e+00
+1514 1509 2.08333333333333e+00
+1514 1503 -4.16666666666667e+00
+1514 1507 2.08333333333333e+00
+1514 1850 -6.25000000000000e+00
+1514 1379 -4.16666666666667e+00
+1514 1849 4.16666666666667e+00
+1514 1657 -8.33333333333333e+00
+1514 1848 -2.08333333333333e+00
+1514 1656 4.16666666666667e+00
+1515 1515 1.25000000000000e+02
+1515 1522 8.33333333333333e+00
+1515 1521 -1.25000000000000e+01
+1515 1664 -8.33333333333333e+00
+1515 1663 4.16666666666667e+00
+1515 1676 8.33333333333333e+00
+1515 1534 4.16666666666667e+00
+1515 1675 8.33333333333333e+00
+1515 1674 -3.75000000000000e+01
+1515 1535 4.16666666666667e+00
+1515 1666 -4.16666666666667e+00
+1515 1667 8.33333333333333e+00
+1515 1517 -1.66666666666667e+01
+1515 1319 -4.16666666666667e+00
+1515 1665 -1.25000000000000e+01
+1515 1526 4.16666666666667e+00
+1515 1298 -4.16666666666667e+00
+1515 1525 -8.33333333333333e+00
+1515 1661 4.16666666666667e+00
+1515 1519 8.33333333333333e+00
+1515 1516 -1.66666666666667e+01
+1515 1520 8.33333333333333e+00
+1515 1297 -4.16666666666667e+00
+1515 1518 -3.75000000000000e+01
+1515 1660 4.16666666666667e+00
+1515 1318 -4.16666666666667e+00
+1515 1673 -4.16666666666667e+00
+1515 1670 4.16666666666667e+00
+1515 1531 4.16666666666667e+00
+1515 1528 -4.16666666666667e+00
+1515 1669 -8.33333333333333e+00
+1515 1672 8.33333333333333e+00
+1515 1671 -1.25000000000000e+01
+1515 1529 8.33333333333333e+00
+1515 1532 -8.33333333333333e+00
+1515 1527 -1.25000000000000e+01
+1515 1523 -4.16666666666667e+00
+1516 1516 1.25000000000000e+02
+1516 1521 8.33333333333333e+00
+1516 1523 8.33333333333333e+00
+1516 1522 -3.75000000000000e+01
+1516 1662 4.16666666666667e+00
+1516 1676 -4.16666666666667e+00
+1516 1533 4.16666666666667e+00
+1516 1675 -1.25000000000000e+01
+1516 1674 8.33333333333333e+00
+1516 1535 -8.33333333333333e+00
+1516 1665 -4.16666666666667e+00
+1516 1526 4.16666666666667e+00
+1516 1667 8.33333333333333e+00
+1516 1666 -1.25000000000000e+01
+1516 1524 -8.33333333333333e+00
+1516 1520 -4.16666666666667e+00
+1516 1518 8.33333333333333e+00
+1516 1515 -1.66666666666667e+01
+1516 1519 -1.25000000000000e+01
+1516 1296 -4.16666666666667e+00
+1516 1661 -8.33333333333333e+00
+1516 1659 4.16666666666667e+00
+1516 1317 -4.16666666666667e+00
+1516 1673 8.33333333333333e+00
+1516 1517 -1.66666666666667e+01
+1516 1529 8.33333333333333e+00
+1516 1530 4.16666666666667e+00
+1516 1527 -4.16666666666667e+00
+1516 1670 4.16666666666667e+00
+1516 1319 -4.16666666666667e+00
+1516 1672 -3.75000000000000e+01
+1516 1668 -8.33333333333333e+00
+1516 1671 8.33333333333333e+00
+1516 1532 4.16666666666667e+00
+1516 1298 -4.16666666666667e+00
+1516 1528 -1.25000000000000e+01
+1516 1664 4.16666666666667e+00
+1517 1517 1.25000000000000e+02
+1517 1663 4.16666666666667e+00
+1517 1523 -1.25000000000000e+01
+1517 1522 8.33333333333333e+00
+1517 1662 -8.33333333333333e+00
+1517 1675 -4.16666666666667e+00
+1517 1674 8.33333333333333e+00
+1517 1676 -1.25000000000000e+01
+1517 1534 -8.33333333333333e+00
+1517 1533 4.16666666666667e+00
+1517 1525 4.16666666666667e+00
+1517 1665 8.33333333333333e+00
+1517 1515 -1.66666666666667e+01
+1517 1667 -3.75000000000000e+01
+1517 1666 8.33333333333333e+00
+1517 1317 -4.16666666666667e+00
+1517 1524 4.16666666666667e+00
+1517 1296 -4.16666666666667e+00
+1517 1519 -4.16666666666667e+00
+1517 1659 4.16666666666667e+00
+1517 1520 -1.25000000000000e+01
+1517 1518 8.33333333333333e+00
+1517 1660 -8.33333333333333e+00
+1517 1671 -4.16666666666667e+00
+1517 1668 4.16666666666667e+00
+1517 1672 8.33333333333333e+00
+1517 1516 -1.66666666666667e+01
+1517 1528 8.33333333333333e+00
+1517 1673 -1.25000000000000e+01
+1517 1669 4.16666666666667e+00
+1517 1318 -4.16666666666667e+00
+1517 1529 -3.75000000000000e+01
+1517 1521 -4.16666666666667e+00
+1517 1531 4.16666666666667e+00
+1517 1297 -4.16666666666667e+00
+1517 1527 8.33333333333333e+00
+1517 1530 -8.33333333333333e+00
+1518 1518 1.25000000000000e+02
+1518 1831 -8.33333333333333e+00
+1518 1784 8.33333333333333e+00
+1518 1868 -8.33333333333333e+00
+1518 1537 -4.16666666666667e+00
+1518 1867 4.16666666666667e+00
+1518 1538 -4.16666666666667e+00
+1518 1783 8.33333333333333e+00
+1518 1782 -3.75000000000000e+01
+1518 1772 8.33333333333333e+00
+1518 1666 4.16666666666667e+00
+1518 1771 -4.16666666666667e+00
+1518 1667 -8.33333333333333e+00
+1518 1337 4.16666666666667e+00
+1518 1770 -1.25000000000000e+01
+1518 1526 -4.16666666666667e+00
+1518 1298 4.16666666666667e+00
+1518 1519 -1.66666666666667e+01
+1518 1525 8.33333333333333e+00
+1518 1524 -1.25000000000000e+01
+1518 1778 -4.16666666666667e+00
+1518 1777 8.33333333333333e+00
+1518 1661 -4.16666666666667e+00
+1518 1673 4.16666666666667e+00
+1518 1516 8.33333333333333e+00
+1518 1672 -8.33333333333333e+00
+1518 1336 4.16666666666667e+00
+1518 1660 -4.16666666666667e+00
+1518 1776 -1.25000000000000e+01
+1518 1520 -1.66666666666667e+01
+1518 1532 8.33333333333333e+00
+1518 1517 8.33333333333333e+00
+1518 1531 -4.16666666666667e+00
+1518 1297 4.16666666666667e+00
+1518 1832 4.16666666666667e+00
+1518 1530 -1.25000000000000e+01
+1518 1515 -3.75000000000000e+01
+1519 1519 1.25000000000000e+02
+1519 1830 -8.33333333333333e+00
+1519 1784 -4.16666666666667e+00
+1519 1538 -4.16666666666667e+00
+1519 1868 4.16666666666667e+00
+1519 1536 -4.16666666666667e+00
+1519 1866 4.16666666666667e+00
+1519 1783 -1.25000000000000e+01
+1519 1782 8.33333333333333e+00
+1519 1665 4.16666666666667e+00
+1519 1770 -4.16666666666667e+00
+1519 1667 4.16666666666667e+00
+1519 1772 8.33333333333333e+00
+1519 1771 -1.25000000000000e+01
+1519 1526 8.33333333333333e+00
+1519 1525 -3.75000000000000e+01
+1519 1518 -1.66666666666667e+01
+1519 1524 8.33333333333333e+00
+1519 1517 -4.16666666666667e+00
+1519 1520 -1.66666666666667e+01
+1519 1661 -4.16666666666667e+00
+1519 1673 4.16666666666667e+00
+1519 1776 8.33333333333333e+00
+1519 1515 8.33333333333333e+00
+1519 1671 -8.33333333333333e+00
+1519 1337 -8.33333333333333e+00
+1519 1778 8.33333333333333e+00
+1519 1777 -3.75000000000000e+01
+1519 1335 4.16666666666667e+00
+1519 1659 -4.16666666666667e+00
+1519 1532 8.33333333333333e+00
+1519 1298 -8.33333333333333e+00
+1519 1832 4.16666666666667e+00
+1519 1531 -1.25000000000000e+01
+1519 1516 -1.25000000000000e+01
+1519 1530 -4.16666666666667e+00
+1519 1296 4.16666666666667e+00
+1520 1520 1.25000000000000e+02
+1520 1831 4.16666666666667e+00
+1520 1783 -4.16666666666667e+00
+1520 1537 -4.16666666666667e+00
+1520 1867 4.16666666666667e+00
+1520 1782 8.33333333333333e+00
+1520 1866 -8.33333333333333e+00
+1520 1536 -4.16666666666667e+00
+1520 1784 -1.25000000000000e+01
+1520 1770 8.33333333333333e+00
+1520 1666 4.16666666666667e+00
+1520 1665 -8.33333333333333e+00
+1520 1772 -3.75000000000000e+01
+1520 1771 8.33333333333333e+00
+1520 1335 4.16666666666667e+00
+1520 1526 -1.25000000000000e+01
+1520 1525 8.33333333333333e+00
+1520 1524 -4.16666666666667e+00
+1520 1296 4.16666666666667e+00
+1520 1516 -4.16666666666667e+00
+1520 1519 -1.66666666666667e+01
+1520 1776 -4.16666666666667e+00
+1520 1660 -4.16666666666667e+00
+1520 1672 4.16666666666667e+00
+1520 1659 -4.16666666666667e+00
+1520 1671 4.16666666666667e+00
+1520 1778 -1.25000000000000e+01
+1520 1336 -8.33333333333333e+00
+1520 1777 8.33333333333333e+00
+1520 1830 4.16666666666667e+00
+1520 1532 -3.75000000000000e+01
+1520 1517 -1.25000000000000e+01
+1520 1531 8.33333333333333e+00
+1520 1297 -8.33333333333333e+00
+1520 1518 -1.66666666666667e+01
+1520 1530 8.33333333333333e+00
+1520 1515 8.33333333333333e+00
+1521 1521 6.25000000000000e+01
+1521 1666 4.16666666666667e+00
+1521 1667 4.16666666666667e+00
+1521 1817 4.16666666666667e+00
+1521 1815 -6.25000000000000e+00
+1521 1526 4.16666666666667e+00
+1521 1525 4.16666666666667e+00
+1521 1522 -8.33333333333333e+00
+1521 1524 -1.87500000000000e+01
+1521 1517 -4.16666666666667e+00
+1521 1523 -8.33333333333333e+00
+1521 1664 -4.16666666666667e+00
+1521 1676 4.16666666666667e+00
+1521 1819 4.16666666666667e+00
+1521 1516 8.33333333333333e+00
+1521 1675 -8.33333333333333e+00
+1521 1820 4.16666666666667e+00
+1521 1349 -4.16666666666667e+00
+1521 1348 2.08333333333333e+00
+1521 1663 -4.16666666666667e+00
+1521 1818 -1.87500000000000e+01
+1521 1535 4.16666666666667e+00
+1521 1298 -4.16666666666667e+00
+1521 1534 -2.08333333333333e+00
+1521 1297 2.08333333333333e+00
+1521 1533 -6.25000000000000e+00
+1521 1816 -2.08333333333333e+00
+1521 1515 -1.25000000000000e+01
+1522 1522 6.25000000000000e+01
+1522 1815 -2.08333333333333e+00
+1522 1665 4.16666666666667e+00
+1522 1667 -8.33333333333333e+00
+1522 1349 2.08333333333333e+00
+1522 1816 -6.25000000000000e+00
+1522 1526 -2.08333333333333e+00
+1522 1298 2.08333333333333e+00
+1522 1525 -6.25000000000000e+00
+1522 1524 4.16666666666667e+00
+1522 1521 -8.33333333333333e+00
+1522 1820 -2.08333333333333e+00
+1522 1818 4.16666666666667e+00
+1522 1664 -4.16666666666667e+00
+1522 1676 4.16666666666667e+00
+1522 1515 8.33333333333333e+00
+1522 1674 -8.33333333333333e+00
+1522 1819 -6.25000000000000e+00
+1522 1347 2.08333333333333e+00
+1522 1662 -4.16666666666667e+00
+1522 1535 4.16666666666667e+00
+1522 1523 -8.33333333333333e+00
+1522 1517 8.33333333333333e+00
+1522 1534 -6.25000000000000e+00
+1522 1817 4.16666666666667e+00
+1522 1516 -3.75000000000000e+01
+1522 1533 -2.08333333333333e+00
+1522 1296 2.08333333333333e+00
+1523 1523 6.25000000000000e+01
+1523 1666 -8.33333333333333e+00
+1523 1665 4.16666666666667e+00
+1523 1817 -1.87500000000000e+01
+1523 1348 2.08333333333333e+00
+1523 1815 4.16666666666667e+00
+1523 1526 -6.25000000000000e+00
+1523 1525 -2.08333333333333e+00
+1523 1297 2.08333333333333e+00
+1523 1524 4.16666666666667e+00
+1523 1515 -4.16666666666667e+00
+1523 1819 -2.08333333333333e+00
+1523 1521 -8.33333333333333e+00
+1523 1662 -4.16666666666667e+00
+1523 1674 4.16666666666667e+00
+1523 1663 -4.16666666666667e+00
+1523 1675 4.16666666666667e+00
+1523 1820 -6.25000000000000e+00
+1523 1818 4.16666666666667e+00
+1523 1347 -4.16666666666667e+00
+1523 1535 -1.87500000000000e+01
+1523 1816 4.16666666666667e+00
+1523 1517 -1.25000000000000e+01
+1523 1534 4.16666666666667e+00
+1523 1522 -8.33333333333333e+00
+1523 1516 8.33333333333333e+00
+1523 1533 4.16666666666667e+00
+1523 1296 -4.16666666666667e+00
+1524 1524 6.25000000000000e+01
+1524 1525 -8.33333333333333e+00
+1524 1538 -4.16666666666667e+00
+1524 1297 -2.08333333333333e+00
+1524 1537 2.08333333333333e+00
+1524 1832 4.16666666666667e+00
+1524 1354 -2.08333333333333e+00
+1524 1830 -1.87500000000000e+01
+1524 1816 2.08333333333333e+00
+1524 1355 4.16666666666667e+00
+1524 1817 -4.16666666666667e+00
+1524 1526 -8.33333333333333e+00
+1524 1523 4.16666666666667e+00
+1524 1298 4.16666666666667e+00
+1524 1522 4.16666666666667e+00
+1524 1521 -1.87500000000000e+01
+1524 1666 -4.16666666666667e+00
+1524 1771 4.16666666666667e+00
+1524 1772 4.16666666666667e+00
+1524 1667 -4.16666666666667e+00
+1524 1353 -6.25000000000000e+00
+1524 1520 -4.16666666666667e+00
+1524 1517 4.16666666666667e+00
+1524 1519 8.33333333333333e+00
+1524 1516 -8.33333333333333e+00
+1524 1518 -1.25000000000000e+01
+1524 1831 4.16666666666667e+00
+1524 1296 -6.25000000000000e+00
+1525 1525 6.25000000000000e+01
+1525 1538 2.08333333333333e+00
+1525 1830 4.16666666666667e+00
+1525 1524 -8.33333333333333e+00
+1525 1296 -2.08333333333333e+00
+1525 1536 2.08333333333333e+00
+1525 1831 -6.25000000000000e+00
+1525 1353 -2.08333333333333e+00
+1525 1815 2.08333333333333e+00
+1525 1817 2.08333333333333e+00
+1525 1523 -2.08333333333333e+00
+1525 1522 -6.25000000000000e+00
+1525 1521 4.16666666666667e+00
+1525 1665 -4.16666666666667e+00
+1525 1770 4.16666666666667e+00
+1525 1667 -4.16666666666667e+00
+1525 1517 4.16666666666667e+00
+1525 1772 -8.33333333333333e+00
+1525 1355 4.16666666666667e+00
+1525 1354 -6.25000000000000e+00
+1525 1520 8.33333333333333e+00
+1525 1526 -8.33333333333333e+00
+1525 1298 4.16666666666667e+00
+1525 1519 -3.75000000000000e+01
+1525 1832 -2.08333333333333e+00
+1525 1297 -6.25000000000000e+00
+1525 1518 8.33333333333333e+00
+1525 1515 -8.33333333333333e+00
+1526 1526 6.25000000000000e+01
+1526 1537 2.08333333333333e+00
+1526 1536 -4.16666666666667e+00
+1526 1832 -6.25000000000000e+00
+1526 1830 4.16666666666667e+00
+1526 1816 2.08333333333333e+00
+1526 1353 4.16666666666667e+00
+1526 1815 -4.16666666666667e+00
+1526 1523 -6.25000000000000e+00
+1526 1522 -2.08333333333333e+00
+1526 1524 -8.33333333333333e+00
+1526 1521 4.16666666666667e+00
+1526 1296 4.16666666666667e+00
+1526 1666 -4.16666666666667e+00
+1526 1516 4.16666666666667e+00
+1526 1355 -1.87500000000000e+01
+1526 1771 -8.33333333333333e+00
+1526 1354 4.16666666666667e+00
+1526 1770 4.16666666666667e+00
+1526 1665 -4.16666666666667e+00
+1526 1520 -1.25000000000000e+01
+1526 1831 -2.08333333333333e+00
+1526 1298 -1.87500000000000e+01
+1526 1519 8.33333333333333e+00
+1526 1525 -8.33333333333333e+00
+1526 1297 4.16666666666667e+00
+1526 1518 -4.16666666666667e+00
+1526 1515 4.16666666666667e+00
+1527 1527 6.25000000000000e+01
+1527 1676 -8.33333333333333e+00
+1527 1675 4.16666666666667e+00
+1527 1367 2.08333333333333e+00
+1527 1855 4.16666666666667e+00
+1527 1854 -1.87500000000000e+01
+1527 1535 -2.08333333333333e+00
+1527 1298 2.08333333333333e+00
+1527 1534 4.16666666666667e+00
+1527 1533 -6.25000000000000e+00
+1527 1670 -4.16666666666667e+00
+1527 1669 -4.16666666666667e+00
+1527 1673 4.16666666666667e+00
+1527 1853 -2.08333333333333e+00
+1527 1528 -8.33333333333333e+00
+1527 1672 4.16666666666667e+00
+1527 1516 -4.16666666666667e+00
+1527 1366 -4.16666666666667e+00
+1527 1852 4.16666666666667e+00
+1527 1851 -6.25000000000000e+00
+1527 1529 -8.33333333333333e+00
+1527 1532 4.16666666666667e+00
+1527 1517 8.33333333333333e+00
+1527 1531 4.16666666666667e+00
+1527 1297 -4.16666666666667e+00
+1527 1856 4.16666666666667e+00
+1527 1530 -1.87500000000000e+01
+1527 1515 -1.25000000000000e+01
+1528 1528 6.25000000000000e+01
+1528 1676 4.16666666666667e+00
+1528 1674 4.16666666666667e+00
+1528 1855 -6.25000000000000e+00
+1528 1854 4.16666666666667e+00
+1528 1535 4.16666666666667e+00
+1528 1529 -8.33333333333333e+00
+1528 1534 -1.87500000000000e+01
+1528 1533 4.16666666666667e+00
+1528 1668 -4.16666666666667e+00
+1528 1853 4.16666666666667e+00
+1528 1527 -8.33333333333333e+00
+1528 1673 -8.33333333333333e+00
+1528 1517 8.33333333333333e+00
+1528 1671 4.16666666666667e+00
+1528 1515 -4.16666666666667e+00
+1528 1367 2.08333333333333e+00
+1528 1670 -4.16666666666667e+00
+1528 1852 -1.87500000000000e+01
+1528 1365 -4.16666666666667e+00
+1528 1851 4.16666666666667e+00
+1528 1532 -2.08333333333333e+00
+1528 1298 2.08333333333333e+00
+1528 1856 -2.08333333333333e+00
+1528 1531 -6.25000000000000e+00
+1528 1516 -1.25000000000000e+01
+1528 1530 4.16666666666667e+00
+1528 1296 -4.16666666666667e+00
+1529 1529 6.25000000000000e+01
+1529 1675 4.16666666666667e+00
+1529 1854 4.16666666666667e+00
+1529 1674 -8.33333333333333e+00
+1529 1856 -6.25000000000000e+00
+1529 1365 2.08333333333333e+00
+1529 1535 -6.25000000000000e+00
+1529 1534 4.16666666666667e+00
+1529 1528 -8.33333333333333e+00
+1529 1533 -2.08333333333333e+00
+1529 1296 2.08333333333333e+00
+1529 1668 -4.16666666666667e+00
+1529 1852 4.16666666666667e+00
+1529 1671 4.16666666666667e+00
+1529 1851 -2.08333333333333e+00
+1529 1672 -8.33333333333333e+00
+1529 1516 8.33333333333333e+00
+1529 1853 -6.25000000000000e+00
+1529 1366 2.08333333333333e+00
+1529 1669 -4.16666666666667e+00
+1529 1855 -2.08333333333333e+00
+1529 1532 -6.25000000000000e+00
+1529 1517 -3.75000000000000e+01
+1529 1531 -2.08333333333333e+00
+1529 1297 2.08333333333333e+00
+1529 1527 -8.33333333333333e+00
+1529 1530 4.16666666666667e+00
+1529 1515 8.33333333333333e+00
+1530 1530 6.25000000000000e+01
+1530 1868 4.16666666666667e+00
+1530 1298 -2.08333333333333e+00
+1530 1538 2.08333333333333e+00
+1530 1537 -4.16666666666667e+00
+1530 1373 -2.08333333333333e+00
+1530 1867 4.16666666666667e+00
+1530 1866 -1.87500000000000e+01
+1530 1778 4.16666666666667e+00
+1530 1777 4.16666666666667e+00
+1530 1520 8.33333333333333e+00
+1530 1519 -4.16666666666667e+00
+1530 1518 -1.25000000000000e+01
+1530 1673 -4.16666666666667e+00
+1530 1853 2.08333333333333e+00
+1530 1672 -4.16666666666667e+00
+1530 1516 4.16666666666667e+00
+1530 1852 -4.16666666666667e+00
+1530 1372 4.16666666666667e+00
+1530 1371 -6.25000000000000e+00
+1530 1529 4.16666666666667e+00
+1530 1517 -8.33333333333333e+00
+1530 1528 4.16666666666667e+00
+1530 1531 -8.33333333333333e+00
+1530 1297 4.16666666666667e+00
+1530 1527 -1.87500000000000e+01
+1530 1532 -8.33333333333333e+00
+1530 1296 -6.25000000000000e+00
+1531 1531 6.25000000000000e+01
+1531 1868 -2.08333333333333e+00
+1531 1536 -4.16666666666667e+00
+1531 1867 -6.25000000000000e+00
+1531 1866 4.16666666666667e+00
+1531 1778 -8.33333333333333e+00
+1531 1373 4.16666666666667e+00
+1531 1776 4.16666666666667e+00
+1531 1520 8.33333333333333e+00
+1531 1532 -8.33333333333333e+00
+1531 1298 4.16666666666667e+00
+1531 1519 -1.25000000000000e+01
+1531 1518 -4.16666666666667e+00
+1531 1671 -4.16666666666667e+00
+1531 1515 4.16666666666667e+00
+1531 1853 2.08333333333333e+00
+1531 1673 -4.16666666666667e+00
+1531 1372 -1.87500000000000e+01
+1531 1851 -4.16666666666667e+00
+1531 1371 4.16666666666667e+00
+1531 1529 -2.08333333333333e+00
+1531 1517 4.16666666666667e+00
+1531 1528 -6.25000000000000e+00
+1531 1538 2.08333333333333e+00
+1531 1297 -1.87500000000000e+01
+1531 1527 4.16666666666667e+00
+1531 1530 -8.33333333333333e+00
+1531 1296 4.16666666666667e+00
+1532 1532 6.25000000000000e+01
+1532 1867 -2.08333333333333e+00
+1532 1530 -8.33333333333333e+00
+1532 1866 4.16666666666667e+00
+1532 1296 -2.08333333333333e+00
+1532 1536 2.08333333333333e+00
+1532 1868 -6.25000000000000e+00
+1532 1371 -2.08333333333333e+00
+1532 1776 4.16666666666667e+00
+1532 1777 -8.33333333333333e+00
+1532 1372 4.16666666666667e+00
+1532 1520 -3.75000000000000e+01
+1532 1519 8.33333333333333e+00
+1532 1531 -8.33333333333333e+00
+1532 1297 4.16666666666667e+00
+1532 1518 8.33333333333333e+00
+1532 1671 -4.16666666666667e+00
+1532 1851 2.08333333333333e+00
+1532 1373 -6.25000000000000e+00
+1532 1852 2.08333333333333e+00
+1532 1672 -4.16666666666667e+00
+1532 1529 -6.25000000000000e+00
+1532 1537 2.08333333333333e+00
+1532 1298 -6.25000000000000e+00
+1532 1528 -2.08333333333333e+00
+1532 1516 4.16666666666667e+00
+1532 1527 4.16666666666667e+00
+1532 1515 -8.33333333333333e+00
+1533 1533 3.75000000000000e+01
+1533 1820 -4.16666666666667e+00
+1533 1819 2.08333333333333e+00
+1533 1535 -4.16666666666667e+00
+1533 1523 4.16666666666667e+00
+1533 1298 2.08333333333333e+00
+1533 1522 -2.08333333333333e+00
+1533 1521 -6.25000000000000e+00
+1533 1675 -4.16666666666667e+00
+1533 1516 4.16666666666667e+00
+1533 1856 2.08333333333333e+00
+1533 1676 -4.16666666666667e+00
+1533 1378 2.08333333333333e+00
+1533 1855 -4.16666666666667e+00
+1533 1377 -1.25000000000000e+01
+1533 1529 -2.08333333333333e+00
+1533 1517 4.16666666666667e+00
+1533 1534 -4.16666666666667e+00
+1533 1528 4.16666666666667e+00
+1533 1297 2.08333333333333e+00
+1533 1379 2.08333333333333e+00
+1533 1527 -6.25000000000000e+00
+1533 1296 -1.25000000000000e+01
+1534 1534 3.33333333333333e+01
+1534 1818 2.08333333333333e+00
+1534 1523 4.16666666666667e+00
+1534 1522 -6.25000000000000e+00
+1534 1521 -2.08333333333333e+00
+1534 1856 2.08333333333333e+00
+1534 1676 -4.16666666666667e+00
+1534 1674 -4.16666666666667e+00
+1534 1515 4.16666666666667e+00
+1534 1378 -4.16666666666667e+00
+1534 1377 2.08333333333333e+00
+1534 1854 -4.16666666666667e+00
+1534 1529 4.16666666666667e+00
+1534 1517 -8.33333333333333e+00
+1534 1820 2.08333333333333e+00
+1534 1528 -1.87500000000000e+01
+1534 1297 -4.16666666666667e+00
+1534 1533 -4.16666666666667e+00
+1534 1527 4.16666666666667e+00
+1534 1296 2.08333333333333e+00
+1535 1535 3.33333333333333e+01
+1535 1377 2.08333333333333e+00
+1535 1818 -4.16666666666667e+00
+1535 1523 -1.87500000000000e+01
+1535 1522 4.16666666666667e+00
+1535 1533 -4.16666666666667e+00
+1535 1521 4.16666666666667e+00
+1535 1296 2.08333333333333e+00
+1535 1855 2.08333333333333e+00
+1535 1675 -4.16666666666667e+00
+1535 1379 -4.16666666666667e+00
+1535 1854 2.08333333333333e+00
+1535 1674 -4.16666666666667e+00
+1535 1819 2.08333333333333e+00
+1535 1529 -6.25000000000000e+00
+1535 1298 -4.16666666666667e+00
+1535 1528 4.16666666666667e+00
+1535 1516 -8.33333333333333e+00
+1535 1527 -2.08333333333333e+00
+1535 1515 4.16666666666667e+00
+1536 1536 3.75000000000000e+01
+1536 1526 -4.16666666666667e+00
+1536 1525 2.08333333333333e+00
+1536 1538 -4.16666666666667e+00
+1536 1832 4.16666666666667e+00
+1536 1382 2.08333333333333e+00
+1536 1831 -2.08333333333333e+00
+1536 1830 -6.25000000000000e+00
+1536 1519 -4.16666666666667e+00
+1536 1783 4.16666666666667e+00
+1536 1532 2.08333333333333e+00
+1536 1520 -4.16666666666667e+00
+1536 1297 2.08333333333333e+00
+1536 1531 -4.16666666666667e+00
+1536 1296 -1.25000000000000e+01
+1536 1868 -2.08333333333333e+00
+1536 1784 4.16666666666667e+00
+1536 1537 -4.16666666666667e+00
+1536 1867 4.16666666666667e+00
+1536 1381 2.08333333333333e+00
+1536 1298 2.08333333333333e+00
+1536 1866 -6.25000000000000e+00
+1536 1380 -1.25000000000000e+01
+1537 1537 3.33333333333333e+01
+1537 1524 2.08333333333333e+00
+1537 1832 4.16666666666667e+00
+1537 1831 -6.25000000000000e+00
+1537 1830 -2.08333333333333e+00
+1537 1532 2.08333333333333e+00
+1537 1520 -4.16666666666667e+00
+1537 1518 -4.16666666666667e+00
+1537 1782 4.16666666666667e+00
+1537 1297 -4.16666666666667e+00
+1537 1296 2.08333333333333e+00
+1537 1530 -4.16666666666667e+00
+1537 1868 4.16666666666667e+00
+1537 1784 -8.33333333333333e+00
+1537 1526 2.08333333333333e+00
+1537 1867 -1.87500000000000e+01
+1537 1381 -4.16666666666667e+00
+1537 1536 -4.16666666666667e+00
+1537 1866 4.16666666666667e+00
+1537 1380 2.08333333333333e+00
+1538 1538 3.33333333333333e+01
+1538 1296 2.08333333333333e+00
+1538 1524 -4.16666666666667e+00
+1538 1832 -1.87500000000000e+01
+1538 1831 4.16666666666667e+00
+1538 1536 -4.16666666666667e+00
+1538 1830 4.16666666666667e+00
+1538 1380 2.08333333333333e+00
+1538 1531 2.08333333333333e+00
+1538 1519 -4.16666666666667e+00
+1538 1298 -4.16666666666667e+00
+1538 1530 2.08333333333333e+00
+1538 1518 -4.16666666666667e+00
+1538 1525 2.08333333333333e+00
+1538 1868 -6.25000000000000e+00
+1538 1382 -4.16666666666667e+00
+1538 1867 4.16666666666667e+00
+1538 1783 -8.33333333333333e+00
+1538 1866 -2.08333333333333e+00
+1538 1782 4.16666666666667e+00
+1539 1539 1.25000000000000e+02
+1539 1543 8.33333333333333e+00
+1539 1542 -1.25000000000000e+01
+1539 1790 -8.33333333333333e+00
+1539 1789 4.16666666666667e+00
+1539 1802 8.33333333333333e+00
+1539 1549 4.16666666666667e+00
+1539 1801 8.33333333333333e+00
+1539 1800 -3.75000000000000e+01
+1539 1550 4.16666666666667e+00
+1539 1792 -4.16666666666667e+00
+1539 1793 8.33333333333333e+00
+1539 1541 -1.66666666666667e+01
+1539 1340 -4.16666666666667e+00
+1539 1791 -1.25000000000000e+01
+1539 1787 4.16666666666667e+00
+1539 1540 -1.66666666666667e+01
+1539 1786 4.16666666666667e+00
+1539 1339 -4.16666666666667e+00
+1539 1799 -4.16666666666667e+00
+1539 1796 4.16666666666667e+00
+1539 1546 -4.16666666666667e+00
+1539 1795 -8.33333333333333e+00
+1539 1798 8.33333333333333e+00
+1539 1797 -1.25000000000000e+01
+1539 1547 8.33333333333333e+00
+1539 1545 -1.25000000000000e+01
+1539 1544 -4.16666666666667e+00
+1539 281 4.16666666666667e+00
+1539 29 -4.16666666666667e+00
+1539 280 -8.33333333333333e+00
+1539 277 8.33333333333333e+00
+1539 278 8.33333333333333e+00
+1539 28 -4.16666666666667e+00
+1539 276 -3.75000000000000e+01
+1539 283 4.16666666666667e+00
+1539 284 -8.33333333333333e+00
+1540 1540 1.25000000000000e+02
+1540 1542 8.33333333333333e+00
+1540 1544 8.33333333333333e+00
+1540 1543 -3.75000000000000e+01
+1540 1788 4.16666666666667e+00
+1540 1802 -4.16666666666667e+00
+1540 1548 4.16666666666667e+00
+1540 1801 -1.25000000000000e+01
+1540 1800 8.33333333333333e+00
+1540 1550 -8.33333333333333e+00
+1540 1791 -4.16666666666667e+00
+1540 1793 8.33333333333333e+00
+1540 1792 -1.25000000000000e+01
+1540 1539 -1.66666666666667e+01
+1540 1787 -8.33333333333333e+00
+1540 1785 4.16666666666667e+00
+1540 1338 -4.16666666666667e+00
+1540 1799 8.33333333333333e+00
+1540 1541 -1.66666666666667e+01
+1540 1547 8.33333333333333e+00
+1540 1545 -4.16666666666667e+00
+1540 1796 4.16666666666667e+00
+1540 1340 -4.16666666666667e+00
+1540 1798 -3.75000000000000e+01
+1540 1794 -8.33333333333333e+00
+1540 1797 8.33333333333333e+00
+1540 1546 -1.25000000000000e+01
+1540 1790 4.16666666666667e+00
+1540 281 4.16666666666667e+00
+1540 279 -8.33333333333333e+00
+1540 278 -4.16666666666667e+00
+1540 276 8.33333333333333e+00
+1540 277 -1.25000000000000e+01
+1540 27 -4.16666666666667e+00
+1540 282 4.16666666666667e+00
+1540 284 4.16666666666667e+00
+1540 29 -4.16666666666667e+00
+1541 1541 1.25000000000000e+02
+1541 1789 4.16666666666667e+00
+1541 1544 -1.25000000000000e+01
+1541 1543 8.33333333333333e+00
+1541 1788 -8.33333333333333e+00
+1541 1801 -4.16666666666667e+00
+1541 1800 8.33333333333333e+00
+1541 1802 -1.25000000000000e+01
+1541 1549 -8.33333333333333e+00
+1541 1548 4.16666666666667e+00
+1541 1791 8.33333333333333e+00
+1541 1539 -1.66666666666667e+01
+1541 1793 -3.75000000000000e+01
+1541 1792 8.33333333333333e+00
+1541 1338 -4.16666666666667e+00
+1541 1785 4.16666666666667e+00
+1541 1786 -8.33333333333333e+00
+1541 1797 -4.16666666666667e+00
+1541 1794 4.16666666666667e+00
+1541 1798 8.33333333333333e+00
+1541 1540 -1.66666666666667e+01
+1541 1546 8.33333333333333e+00
+1541 1799 -1.25000000000000e+01
+1541 1795 4.16666666666667e+00
+1541 1339 -4.16666666666667e+00
+1541 1547 -3.75000000000000e+01
+1541 1542 -4.16666666666667e+00
+1541 1545 8.33333333333333e+00
+1541 280 4.16666666666667e+00
+1541 279 4.16666666666667e+00
+1541 27 -4.16666666666667e+00
+1541 277 -4.16666666666667e+00
+1541 278 -1.25000000000000e+01
+1541 276 8.33333333333333e+00
+1541 283 4.16666666666667e+00
+1541 28 -4.16666666666667e+00
+1541 282 -8.33333333333333e+00
+1542 1542 6.25000000000000e+01
+1542 1792 4.16666666666667e+00
+1542 1793 4.16666666666667e+00
+1542 1835 4.16666666666667e+00
+1542 1833 -6.25000000000000e+00
+1542 1543 -8.33333333333333e+00
+1542 1541 -4.16666666666667e+00
+1542 1544 -8.33333333333333e+00
+1542 1790 -4.16666666666667e+00
+1542 1802 4.16666666666667e+00
+1542 1837 4.16666666666667e+00
+1542 1540 8.33333333333333e+00
+1542 1801 -8.33333333333333e+00
+1542 1838 4.16666666666667e+00
+1542 1358 -4.16666666666667e+00
+1542 1357 2.08333333333333e+00
+1542 1789 -4.16666666666667e+00
+1542 1836 -1.87500000000000e+01
+1542 1550 4.16666666666667e+00
+1542 1549 -2.08333333333333e+00
+1542 1548 -6.25000000000000e+00
+1542 1834 -2.08333333333333e+00
+1542 1539 -1.25000000000000e+01
+1542 281 4.16666666666667e+00
+1542 280 4.16666666666667e+00
+1542 279 -1.87500000000000e+01
+1542 29 -4.16666666666667e+00
+1542 28 2.08333333333333e+00
+1543 1543 6.25000000000000e+01
+1543 1833 -2.08333333333333e+00
+1543 1791 4.16666666666667e+00
+1543 1793 -8.33333333333333e+00
+1543 1358 2.08333333333333e+00
+1543 1834 -6.25000000000000e+00
+1543 1542 -8.33333333333333e+00
+1543 1838 -2.08333333333333e+00
+1543 1836 4.16666666666667e+00
+1543 1790 -4.16666666666667e+00
+1543 1802 4.16666666666667e+00
+1543 1539 8.33333333333333e+00
+1543 1800 -8.33333333333333e+00
+1543 1837 -6.25000000000000e+00
+1543 1356 2.08333333333333e+00
+1543 1788 -4.16666666666667e+00
+1543 1550 4.16666666666667e+00
+1543 1544 -8.33333333333333e+00
+1543 1541 8.33333333333333e+00
+1543 1549 -6.25000000000000e+00
+1543 1835 4.16666666666667e+00
+1543 1540 -3.75000000000000e+01
+1543 1548 -2.08333333333333e+00
+1543 281 -2.08333333333333e+00
+1543 29 2.08333333333333e+00
+1543 280 -6.25000000000000e+00
+1543 279 4.16666666666667e+00
+1543 27 2.08333333333333e+00
+1544 1544 6.25000000000000e+01
+1544 1792 -8.33333333333333e+00
+1544 1791 4.16666666666667e+00
+1544 1835 -1.87500000000000e+01
+1544 1357 2.08333333333333e+00
+1544 1833 4.16666666666667e+00
+1544 1539 -4.16666666666667e+00
+1544 1837 -2.08333333333333e+00
+1544 1542 -8.33333333333333e+00
+1544 1788 -4.16666666666667e+00
+1544 1800 4.16666666666667e+00
+1544 1789 -4.16666666666667e+00
+1544 1801 4.16666666666667e+00
+1544 1838 -6.25000000000000e+00
+1544 1836 4.16666666666667e+00
+1544 1356 -4.16666666666667e+00
+1544 1550 -1.87500000000000e+01
+1544 1834 4.16666666666667e+00
+1544 1541 -1.25000000000000e+01
+1544 1549 4.16666666666667e+00
+1544 1543 -8.33333333333333e+00
+1544 1540 8.33333333333333e+00
+1544 1548 4.16666666666667e+00
+1544 281 -6.25000000000000e+00
+1544 280 -2.08333333333333e+00
+1544 28 2.08333333333333e+00
+1544 279 4.16666666666667e+00
+1544 27 -4.16666666666667e+00
+1545 1545 6.25000000000000e+01
+1545 1802 -8.33333333333333e+00
+1545 1801 4.16666666666667e+00
+1545 1376 2.08333333333333e+00
+1545 1873 4.16666666666667e+00
+1545 1872 -1.87500000000000e+01
+1545 1550 -2.08333333333333e+00
+1545 1549 4.16666666666667e+00
+1545 1548 -6.25000000000000e+00
+1545 1796 -4.16666666666667e+00
+1545 1795 -4.16666666666667e+00
+1545 1799 4.16666666666667e+00
+1545 1871 -2.08333333333333e+00
+1545 1546 -8.33333333333333e+00
+1545 1798 4.16666666666667e+00
+1545 1540 -4.16666666666667e+00
+1545 1375 -4.16666666666667e+00
+1545 1870 4.16666666666667e+00
+1545 1869 -6.25000000000000e+00
+1545 1547 -8.33333333333333e+00
+1545 1541 8.33333333333333e+00
+1545 1874 4.16666666666667e+00
+1545 1539 -1.25000000000000e+01
+1545 29 2.08333333333333e+00
+1545 284 4.16666666666667e+00
+1545 283 4.16666666666667e+00
+1545 28 -4.16666666666667e+00
+1545 282 -1.87500000000000e+01
+1546 1546 6.25000000000000e+01
+1546 1802 4.16666666666667e+00
+1546 1800 4.16666666666667e+00
+1546 1873 -6.25000000000000e+00
+1546 1872 4.16666666666667e+00
+1546 1550 4.16666666666667e+00
+1546 1547 -8.33333333333333e+00
+1546 1549 -1.87500000000000e+01
+1546 1548 4.16666666666667e+00
+1546 1794 -4.16666666666667e+00
+1546 1871 4.16666666666667e+00
+1546 1545 -8.33333333333333e+00
+1546 1799 -8.33333333333333e+00
+1546 1541 8.33333333333333e+00
+1546 1797 4.16666666666667e+00
+1546 1539 -4.16666666666667e+00
+1546 1376 2.08333333333333e+00
+1546 1796 -4.16666666666667e+00
+1546 1870 -1.87500000000000e+01
+1546 1374 -4.16666666666667e+00
+1546 1869 4.16666666666667e+00
+1546 1874 -2.08333333333333e+00
+1546 1540 -1.25000000000000e+01
+1546 284 -2.08333333333333e+00
+1546 29 2.08333333333333e+00
+1546 283 -6.25000000000000e+00
+1546 282 4.16666666666667e+00
+1546 27 -4.16666666666667e+00
+1547 1547 6.25000000000000e+01
+1547 1801 4.16666666666667e+00
+1547 1872 4.16666666666667e+00
+1547 1800 -8.33333333333333e+00
+1547 1874 -6.25000000000000e+00
+1547 1374 2.08333333333333e+00
+1547 1550 -6.25000000000000e+00
+1547 1549 4.16666666666667e+00
+1547 1546 -8.33333333333333e+00
+1547 1548 -2.08333333333333e+00
+1547 1794 -4.16666666666667e+00
+1547 1870 4.16666666666667e+00
+1547 1797 4.16666666666667e+00
+1547 1869 -2.08333333333333e+00
+1547 1798 -8.33333333333333e+00
+1547 1540 8.33333333333333e+00
+1547 1871 -6.25000000000000e+00
+1547 1375 2.08333333333333e+00
+1547 1795 -4.16666666666667e+00
+1547 1873 -2.08333333333333e+00
+1547 1541 -3.75000000000000e+01
+1547 1545 -8.33333333333333e+00
+1547 1539 8.33333333333333e+00
+1547 27 2.08333333333333e+00
+1547 284 -6.25000000000000e+00
+1547 283 -2.08333333333333e+00
+1547 28 2.08333333333333e+00
+1547 282 4.16666666666667e+00
+1548 1548 3.75000000000000e+01
+1548 1838 -4.16666666666667e+00
+1548 1837 2.08333333333333e+00
+1548 1550 -4.16666666666667e+00
+1548 1544 4.16666666666667e+00
+1548 1543 -2.08333333333333e+00
+1548 1542 -6.25000000000000e+00
+1548 1801 -4.16666666666667e+00
+1548 1540 4.16666666666667e+00
+1548 1874 2.08333333333333e+00
+1548 1802 -4.16666666666667e+00
+1548 1381 2.08333333333333e+00
+1548 1873 -4.16666666666667e+00
+1548 1380 -1.25000000000000e+01
+1548 1547 -2.08333333333333e+00
+1548 1541 4.16666666666667e+00
+1548 1549 -4.16666666666667e+00
+1548 1546 4.16666666666667e+00
+1548 1382 2.08333333333333e+00
+1548 1545 -6.25000000000000e+00
+1548 29 2.08333333333333e+00
+1548 28 2.08333333333333e+00
+1548 27 -1.25000000000000e+01
+1549 1549 3.33333333333333e+01
+1549 1836 2.08333333333333e+00
+1549 1544 4.16666666666667e+00
+1549 1543 -6.25000000000000e+00
+1549 1542 -2.08333333333333e+00
+1549 1874 2.08333333333333e+00
+1549 1802 -4.16666666666667e+00
+1549 1800 -4.16666666666667e+00
+1549 1539 4.16666666666667e+00
+1549 1381 -4.16666666666667e+00
+1549 1380 2.08333333333333e+00
+1549 1872 -4.16666666666667e+00
+1549 1547 4.16666666666667e+00
+1549 1541 -8.33333333333333e+00
+1549 1838 2.08333333333333e+00
+1549 1546 -1.87500000000000e+01
+1549 1548 -4.16666666666667e+00
+1549 1545 4.16666666666667e+00
+1549 28 -4.16666666666667e+00
+1549 27 2.08333333333333e+00
+1550 1550 3.33333333333333e+01
+1550 1380 2.08333333333333e+00
+1550 1836 -4.16666666666667e+00
+1550 1544 -1.87500000000000e+01
+1550 1543 4.16666666666667e+00
+1550 1548 -4.16666666666667e+00
+1550 1542 4.16666666666667e+00
+1550 1873 2.08333333333333e+00
+1550 1801 -4.16666666666667e+00
+1550 1382 -4.16666666666667e+00
+1550 1872 2.08333333333333e+00
+1550 1800 -4.16666666666667e+00
+1550 1837 2.08333333333333e+00
+1550 1547 -6.25000000000000e+00
+1550 1546 4.16666666666667e+00
+1550 1540 -8.33333333333333e+00
+1550 1545 -2.08333333333333e+00
+1550 1539 4.16666666666667e+00
+1550 27 2.08333333333333e+00
+1550 29 -4.16666666666667e+00
+1551 1551 6.25000000000000e+01
+1551 1595 -4.16666666666667e+00
+1551 1567 4.16666666666667e+00
+1551 1594 -4.16666666666667e+00
+1551 1591 -4.16666666666667e+00
+1551 1562 4.16666666666667e+00
+1551 1568 -8.33333333333333e+00
+1551 1561 4.16666666666667e+00
+1551 1560 -1.87500000000000e+01
+1551 1391 4.16666666666667e+00
+1551 1553 -8.33333333333333e+00
+1551 1559 8.33333333333333e+00
+1551 1588 4.16666666666667e+00
+1551 1558 -4.16666666666667e+00
+1551 1301 -2.08333333333333e+00
+1551 1385 2.08333333333333e+00
+1551 1300 4.16666666666667e+00
+1551 1384 -4.16666666666667e+00
+1551 1299 -6.25000000000000e+00
+1551 1557 -1.25000000000000e+01
+1551 1307 -2.08333333333333e+00
+1551 1589 4.16666666666667e+00
+1551 1552 -8.33333333333333e+00
+1551 1306 4.16666666666667e+00
+1551 1390 4.16666666666667e+00
+1551 1592 2.08333333333333e+00
+1551 1305 -6.25000000000000e+00
+1551 1389 -1.87500000000000e+01
+1552 1552 6.25000000000000e+01
+1552 1593 -4.16666666666667e+00
+1552 1592 2.08333333333333e+00
+1552 1595 -4.16666666666667e+00
+1552 1590 -4.16666666666667e+00
+1552 1562 -2.08333333333333e+00
+1552 1568 4.16666666666667e+00
+1552 1561 -6.25000000000000e+00
+1552 1560 4.16666666666667e+00
+1552 1391 -2.08333333333333e+00
+1552 1385 2.08333333333333e+00
+1552 1587 4.16666666666667e+00
+1552 1557 -4.16666666666667e+00
+1552 1301 4.16666666666667e+00
+1552 1553 -8.33333333333333e+00
+1552 1559 8.33333333333333e+00
+1552 1300 -1.87500000000000e+01
+1552 1558 -1.25000000000000e+01
+1552 1299 4.16666666666667e+00
+1552 1383 -4.16666666666667e+00
+1552 1307 4.16666666666667e+00
+1552 1589 -8.33333333333333e+00
+1552 1566 4.16666666666667e+00
+1552 1306 -1.87500000000000e+01
+1552 1390 -6.25000000000000e+00
+1552 1551 -8.33333333333333e+00
+1552 1305 4.16666666666667e+00
+1552 1389 4.16666666666667e+00
+1553 1553 6.25000000000000e+01
+1553 1593 -4.16666666666667e+00
+1553 1591 2.08333333333333e+00
+1553 1594 -4.16666666666667e+00
+1553 1562 -6.25000000000000e+00
+1553 1561 -2.08333333333333e+00
+1553 1567 4.16666666666667e+00
+1553 1560 4.16666666666667e+00
+1553 1566 -8.33333333333333e+00
+1553 1390 -2.08333333333333e+00
+1553 1384 2.08333333333333e+00
+1553 1389 4.16666666666667e+00
+1553 1551 -8.33333333333333e+00
+1553 1557 8.33333333333333e+00
+1553 1301 -6.25000000000000e+00
+1553 1559 -3.75000000000000e+01
+1553 1300 4.16666666666667e+00
+1553 1552 -8.33333333333333e+00
+1553 1558 8.33333333333333e+00
+1553 1299 -2.08333333333333e+00
+1553 1383 2.08333333333333e+00
+1553 1590 2.08333333333333e+00
+1553 1307 -6.25000000000000e+00
+1553 1391 -6.25000000000000e+00
+1553 1306 4.16666666666667e+00
+1553 1588 -8.33333333333333e+00
+1553 1305 -2.08333333333333e+00
+1553 1587 4.16666666666667e+00
+1554 1554 6.25000000000000e+01
+1554 1565 4.16666666666667e+00
+1554 1564 4.16666666666667e+00
+1554 1563 -1.87500000000000e+01
+1554 1628 -4.16666666666667e+00
+1554 1630 -4.16666666666667e+00
+1554 1568 4.16666666666667e+00
+1554 1567 -8.33333333333333e+00
+1554 1631 -4.16666666666667e+00
+1554 1625 4.16666666666667e+00
+1554 1559 -4.16666666666667e+00
+1554 1555 -8.33333333333333e+00
+1554 1558 8.33333333333333e+00
+1554 1396 4.16666666666667e+00
+1554 1301 4.16666666666667e+00
+1554 1385 -4.16666666666667e+00
+1554 1300 -2.08333333333333e+00
+1554 1384 2.08333333333333e+00
+1554 1299 -6.25000000000000e+00
+1554 1557 -1.25000000000000e+01
+1554 1556 -8.33333333333333e+00
+1554 1313 4.16666666666667e+00
+1554 1397 4.16666666666667e+00
+1554 1312 -2.08333333333333e+00
+1554 1624 4.16666666666667e+00
+1554 1627 2.08333333333333e+00
+1554 1311 -6.25000000000000e+00
+1554 1395 -1.87500000000000e+01
+1555 1555 6.25000000000000e+01
+1555 1565 -2.08333333333333e+00
+1555 1564 -6.25000000000000e+00
+1555 1563 4.16666666666667e+00
+1555 1628 2.08333333333333e+00
+1555 1568 4.16666666666667e+00
+1555 1631 -4.16666666666667e+00
+1555 1629 -4.16666666666667e+00
+1555 1566 -8.33333333333333e+00
+1555 1385 2.08333333333333e+00
+1555 1397 -2.08333333333333e+00
+1555 1554 -8.33333333333333e+00
+1555 1557 8.33333333333333e+00
+1555 1395 4.16666666666667e+00
+1555 1301 4.16666666666667e+00
+1555 1556 -8.33333333333333e+00
+1555 1559 8.33333333333333e+00
+1555 1300 -6.25000000000000e+00
+1555 1558 -3.75000000000000e+01
+1555 1299 -2.08333333333333e+00
+1555 1383 2.08333333333333e+00
+1555 1313 4.16666666666667e+00
+1555 1625 -8.33333333333333e+00
+1555 1626 2.08333333333333e+00
+1555 1312 -6.25000000000000e+00
+1555 1396 -6.25000000000000e+00
+1555 1311 -2.08333333333333e+00
+1555 1623 4.16666666666667e+00
+1556 1556 6.25000000000000e+01
+1556 1564 -2.08333333333333e+00
+1556 1563 4.16666666666667e+00
+1556 1627 2.08333333333333e+00
+1556 1626 -4.16666666666667e+00
+1556 1567 4.16666666666667e+00
+1556 1630 -4.16666666666667e+00
+1556 1566 4.16666666666667e+00
+1556 1629 -4.16666666666667e+00
+1556 1623 4.16666666666667e+00
+1556 1557 -4.16666666666667e+00
+1556 1384 2.08333333333333e+00
+1556 1396 -2.08333333333333e+00
+1556 1301 -1.87500000000000e+01
+1556 1559 -1.25000000000000e+01
+1556 1300 4.16666666666667e+00
+1556 1555 -8.33333333333333e+00
+1556 1558 8.33333333333333e+00
+1556 1299 4.16666666666667e+00
+1556 1383 -4.16666666666667e+00
+1556 1565 -6.25000000000000e+00
+1556 1313 -1.87500000000000e+01
+1556 1397 -6.25000000000000e+00
+1556 1312 4.16666666666667e+00
+1556 1624 -8.33333333333333e+00
+1556 1554 -8.33333333333333e+00
+1556 1311 4.16666666666667e+00
+1556 1395 4.16666666666667e+00
+1557 1557 1.25000000000000e+02
+1557 1594 -8.33333333333333e+00
+1557 1553 8.33333333333333e+00
+1557 1390 4.16666666666667e+00
+1557 1552 -4.16666666666667e+00
+1557 1391 -8.33333333333333e+00
+1557 1551 -1.25000000000000e+01
+1557 1589 -4.16666666666667e+00
+1557 1588 8.33333333333333e+00
+1557 1587 -1.25000000000000e+01
+1557 1660 -4.16666666666667e+00
+1557 1568 8.33333333333333e+00
+1557 1631 -8.33333333333333e+00
+1557 1630 4.16666666666667e+00
+1557 1301 4.16666666666667e+00
+1557 1567 8.33333333333333e+00
+1557 1558 -1.66666666666667e+01
+1557 1566 -3.75000000000000e+01
+1557 1661 -4.16666666666667e+00
+1557 1319 4.16666666666667e+00
+1557 1556 -4.16666666666667e+00
+1557 1555 8.33333333333333e+00
+1557 1385 -4.16666666666667e+00
+1557 1397 4.16666666666667e+00
+1557 1402 8.33333333333333e+00
+1557 1396 -8.33333333333333e+00
+1557 1300 4.16666666666667e+00
+1557 1384 -4.16666666666667e+00
+1557 1554 -1.25000000000000e+01
+1557 1559 -1.66666666666667e+01
+1557 1625 8.33333333333333e+00
+1557 1403 8.33333333333333e+00
+1557 1624 -4.16666666666667e+00
+1557 1318 4.16666666666667e+00
+1557 1595 4.16666666666667e+00
+1557 1623 -1.25000000000000e+01
+1557 1401 -3.75000000000000e+01
+1558 1558 1.25000000000000e+02
+1558 1593 -8.33333333333333e+00
+1558 1389 4.16666666666667e+00
+1558 1551 -4.16666666666667e+00
+1558 1391 4.16666666666667e+00
+1558 1553 8.33333333333333e+00
+1558 1552 -1.25000000000000e+01
+1558 1589 8.33333333333333e+00
+1558 1588 -3.75000000000000e+01
+1558 1587 8.33333333333333e+00
+1558 1661 -4.16666666666667e+00
+1558 1659 -4.16666666666667e+00
+1558 1568 -4.16666666666667e+00
+1558 1631 4.16666666666667e+00
+1558 1629 4.16666666666667e+00
+1558 1567 -1.25000000000000e+01
+1558 1566 8.33333333333333e+00
+1558 1557 -1.66666666666667e+01
+1558 1403 -4.16666666666667e+00
+1558 1559 -1.66666666666667e+01
+1558 1385 -4.16666666666667e+00
+1558 1397 4.16666666666667e+00
+1558 1554 8.33333333333333e+00
+1558 1401 8.33333333333333e+00
+1558 1395 -8.33333333333333e+00
+1558 1301 -8.33333333333333e+00
+1558 1556 8.33333333333333e+00
+1558 1555 -3.75000000000000e+01
+1558 1299 4.16666666666667e+00
+1558 1383 -4.16666666666667e+00
+1558 1625 8.33333333333333e+00
+1558 1319 -8.33333333333333e+00
+1558 1595 4.16666666666667e+00
+1558 1624 -1.25000000000000e+01
+1558 1402 -1.25000000000000e+01
+1558 1623 -4.16666666666667e+00
+1558 1317 4.16666666666667e+00
+1559 1559 1.25000000000000e+02
+1559 1593 4.16666666666667e+00
+1559 1551 8.33333333333333e+00
+1559 1390 4.16666666666667e+00
+1559 1389 -8.33333333333333e+00
+1559 1553 -3.75000000000000e+01
+1559 1552 8.33333333333333e+00
+1559 1589 -1.25000000000000e+01
+1559 1588 8.33333333333333e+00
+1559 1587 -4.16666666666667e+00
+1559 1660 -4.16666666666667e+00
+1559 1567 -4.16666666666667e+00
+1559 1630 4.16666666666667e+00
+1559 1566 8.33333333333333e+00
+1559 1629 -8.33333333333333e+00
+1559 1568 -1.25000000000000e+01
+1559 1299 4.16666666666667e+00
+1559 1659 -4.16666666666667e+00
+1559 1317 4.16666666666667e+00
+1559 1402 -4.16666666666667e+00
+1559 1558 -1.66666666666667e+01
+1559 1554 -4.16666666666667e+00
+1559 1384 -4.16666666666667e+00
+1559 1396 4.16666666666667e+00
+1559 1383 -4.16666666666667e+00
+1559 1395 4.16666666666667e+00
+1559 1556 -1.25000000000000e+01
+1559 1300 -8.33333333333333e+00
+1559 1555 8.33333333333333e+00
+1559 1594 4.16666666666667e+00
+1559 1625 -3.75000000000000e+01
+1559 1403 -1.25000000000000e+01
+1559 1624 8.33333333333333e+00
+1559 1318 -8.33333333333333e+00
+1559 1557 -1.66666666666667e+01
+1559 1623 8.33333333333333e+00
+1559 1401 8.33333333333333e+00
+1560 1560 6.25000000000000e+01
+1560 1594 4.16666666666667e+00
+1560 1595 4.16666666666667e+00
+1560 1553 4.16666666666667e+00
+1560 1562 -8.33333333333333e+00
+1560 1552 4.16666666666667e+00
+1560 1551 -1.87500000000000e+01
+1560 1591 4.16666666666667e+00
+1560 1590 -6.25000000000000e+00
+1560 1567 -4.16666666666667e+00
+1560 1561 -8.33333333333333e+00
+1560 1412 4.16666666666667e+00
+1560 1699 -4.16666666666667e+00
+1560 1423 4.16666666666667e+00
+1560 1568 8.33333333333333e+00
+1560 1424 -8.33333333333333e+00
+1560 1325 2.08333333333333e+00
+1560 1700 -4.16666666666667e+00
+1560 1411 4.16666666666667e+00
+1560 1324 -4.16666666666667e+00
+1560 1410 -1.87500000000000e+01
+1560 1406 -2.08333333333333e+00
+1560 1301 2.08333333333333e+00
+1560 1405 4.16666666666667e+00
+1560 1300 -4.16666666666667e+00
+1560 1404 -6.25000000000000e+00
+1560 1592 -2.08333333333333e+00
+1560 1566 -1.25000000000000e+01
+1561 1561 6.25000000000000e+01
+1561 1593 4.16666666666667e+00
+1561 1595 -8.33333333333333e+00
+1561 1553 -2.08333333333333e+00
+1561 1301 2.08333333333333e+00
+1561 1552 -6.25000000000000e+00
+1561 1551 4.16666666666667e+00
+1561 1325 2.08333333333333e+00
+1561 1591 -1.87500000000000e+01
+1561 1590 4.16666666666667e+00
+1561 1566 -4.16666666666667e+00
+1561 1412 -2.08333333333333e+00
+1561 1560 -8.33333333333333e+00
+1561 1698 -4.16666666666667e+00
+1561 1422 4.16666666666667e+00
+1561 1700 -4.16666666666667e+00
+1561 1424 4.16666666666667e+00
+1561 1411 -6.25000000000000e+00
+1561 1410 4.16666666666667e+00
+1561 1323 -4.16666666666667e+00
+1561 1406 4.16666666666667e+00
+1561 1562 -8.33333333333333e+00
+1561 1568 8.33333333333333e+00
+1561 1405 -1.87500000000000e+01
+1561 1592 4.16666666666667e+00
+1561 1567 -1.25000000000000e+01
+1561 1404 4.16666666666667e+00
+1561 1299 -4.16666666666667e+00
+1562 1562 6.25000000000000e+01
+1562 1590 -2.08333333333333e+00
+1562 1594 -8.33333333333333e+00
+1562 1593 4.16666666666667e+00
+1562 1553 -6.25000000000000e+00
+1562 1552 -2.08333333333333e+00
+1562 1300 2.08333333333333e+00
+1562 1551 4.16666666666667e+00
+1562 1560 -8.33333333333333e+00
+1562 1592 -6.25000000000000e+00
+1562 1324 2.08333333333333e+00
+1562 1411 -2.08333333333333e+00
+1562 1410 4.16666666666667e+00
+1562 1699 -4.16666666666667e+00
+1562 1423 4.16666666666667e+00
+1562 1566 8.33333333333333e+00
+1562 1422 -8.33333333333333e+00
+1562 1412 -6.25000000000000e+00
+1562 1323 2.08333333333333e+00
+1562 1698 -4.16666666666667e+00
+1562 1406 -6.25000000000000e+00
+1562 1591 4.16666666666667e+00
+1562 1568 -3.75000000000000e+01
+1562 1405 4.16666666666667e+00
+1562 1561 -8.33333333333333e+00
+1562 1567 8.33333333333333e+00
+1562 1404 -2.08333333333333e+00
+1562 1299 2.08333333333333e+00
+1563 1563 6.25000000000000e+01
+1563 1627 -2.08333333333333e+00
+1563 1630 4.16666666666667e+00
+1563 1628 4.16666666666667e+00
+1563 1626 -6.25000000000000e+00
+1563 1556 4.16666666666667e+00
+1563 1564 -8.33333333333333e+00
+1563 1555 4.16666666666667e+00
+1563 1554 -1.87500000000000e+01
+1563 1736 -4.16666666666667e+00
+1563 1565 -8.33333333333333e+00
+1563 1417 4.16666666666667e+00
+1563 1424 4.16666666666667e+00
+1563 1568 -4.16666666666667e+00
+1563 1423 -8.33333333333333e+00
+1563 1567 8.33333333333333e+00
+1563 1418 4.16666666666667e+00
+1563 1331 -4.16666666666667e+00
+1563 1330 2.08333333333333e+00
+1563 1735 -4.16666666666667e+00
+1563 1416 -1.87500000000000e+01
+1563 1406 4.16666666666667e+00
+1563 1301 -4.16666666666667e+00
+1563 1405 -2.08333333333333e+00
+1563 1300 2.08333333333333e+00
+1563 1404 -6.25000000000000e+00
+1563 1631 4.16666666666667e+00
+1563 1566 -1.25000000000000e+01
+1564 1564 6.25000000000000e+01
+1564 1631 -8.33333333333333e+00
+1564 1626 -2.08333333333333e+00
+1564 1629 4.16666666666667e+00
+1564 1331 2.08333333333333e+00
+1564 1627 -6.25000000000000e+00
+1564 1301 2.08333333333333e+00
+1564 1556 -2.08333333333333e+00
+1564 1555 -6.25000000000000e+00
+1564 1563 -8.33333333333333e+00
+1564 1554 4.16666666666667e+00
+1564 1736 -4.16666666666667e+00
+1564 1418 -2.08333333333333e+00
+1564 1424 4.16666666666667e+00
+1564 1416 4.16666666666667e+00
+1564 1422 -8.33333333333333e+00
+1564 1566 8.33333333333333e+00
+1564 1417 -6.25000000000000e+00
+1564 1329 2.08333333333333e+00
+1564 1734 -4.16666666666667e+00
+1564 1406 4.16666666666667e+00
+1564 1565 -8.33333333333333e+00
+1564 1568 8.33333333333333e+00
+1564 1405 -6.25000000000000e+00
+1564 1628 4.16666666666667e+00
+1564 1567 -3.75000000000000e+01
+1564 1404 -2.08333333333333e+00
+1564 1299 2.08333333333333e+00
+1565 1565 6.25000000000000e+01
+1565 1627 4.16666666666667e+00
+1565 1630 -8.33333333333333e+00
+1565 1628 -1.87500000000000e+01
+1565 1330 2.08333333333333e+00
+1565 1626 4.16666666666667e+00
+1565 1556 -6.25000000000000e+00
+1565 1300 2.08333333333333e+00
+1565 1555 -2.08333333333333e+00
+1565 1554 4.16666666666667e+00
+1565 1735 -4.16666666666667e+00
+1565 1734 -4.16666666666667e+00
+1565 1417 -2.08333333333333e+00
+1565 1423 4.16666666666667e+00
+1565 1563 -8.33333333333333e+00
+1565 1422 4.16666666666667e+00
+1565 1566 -4.16666666666667e+00
+1565 1418 -6.25000000000000e+00
+1565 1416 4.16666666666667e+00
+1565 1329 -4.16666666666667e+00
+1565 1406 -1.87500000000000e+01
+1565 1629 4.16666666666667e+00
+1565 1568 -1.25000000000000e+01
+1565 1405 4.16666666666667e+00
+1565 1564 -8.33333333333333e+00
+1565 1567 8.33333333333333e+00
+1565 1404 4.16666666666667e+00
+1565 1299 -4.16666666666667e+00
+1566 1566 1.25000000000000e+02
+1566 1595 -4.16666666666667e+00
+1566 1553 -8.33333333333333e+00
+1566 1594 8.33333333333333e+00
+1566 1593 -1.25000000000000e+01
+1566 1561 -4.16666666666667e+00
+1566 1562 8.33333333333333e+00
+1566 1560 -1.25000000000000e+01
+1566 1700 4.16666666666667e+00
+1566 1699 -8.33333333333333e+00
+1566 1660 4.16666666666667e+00
+1566 1630 -4.16666666666667e+00
+1566 1568 -1.66666666666667e+01
+1566 1559 8.33333333333333e+00
+1566 1631 8.33333333333333e+00
+1566 1301 -4.16666666666667e+00
+1566 1556 4.16666666666667e+00
+1566 1558 8.33333333333333e+00
+1566 1555 -8.33333333333333e+00
+1566 1557 -3.75000000000000e+01
+1566 1337 -4.16666666666667e+00
+1566 1661 4.16666666666667e+00
+1566 1629 -1.25000000000000e+01
+1566 1406 4.16666666666667e+00
+1566 1565 -4.16666666666667e+00
+1566 1423 8.33333333333333e+00
+1566 1567 -1.66666666666667e+01
+1566 1564 8.33333333333333e+00
+1566 1424 8.33333333333333e+00
+1566 1736 -8.33333333333333e+00
+1566 1735 4.16666666666667e+00
+1566 1336 -4.16666666666667e+00
+1566 1422 -3.75000000000000e+01
+1566 1405 4.16666666666667e+00
+1566 1300 -4.16666666666667e+00
+1566 1563 -1.25000000000000e+01
+1566 1552 4.16666666666667e+00
+1567 1567 1.25000000000000e+02
+1567 1595 8.33333333333333e+00
+1567 1553 4.16666666666667e+00
+1567 1594 -3.75000000000000e+01
+1567 1593 8.33333333333333e+00
+1567 1560 -4.16666666666667e+00
+1567 1700 4.16666666666667e+00
+1567 1562 8.33333333333333e+00
+1567 1561 -1.25000000000000e+01
+1567 1698 -8.33333333333333e+00
+1567 1568 -1.66666666666667e+01
+1567 1337 -4.16666666666667e+00
+1567 1301 -4.16666666666667e+00
+1567 1659 4.16666666666667e+00
+1567 1629 -4.16666666666667e+00
+1567 1559 -4.16666666666667e+00
+1567 1556 4.16666666666667e+00
+1567 1558 -1.25000000000000e+01
+1567 1557 8.33333333333333e+00
+1567 1554 -8.33333333333333e+00
+1567 1661 -8.33333333333333e+00
+1567 1631 8.33333333333333e+00
+1567 1630 -1.25000000000000e+01
+1567 1424 -4.16666666666667e+00
+1567 1736 4.16666666666667e+00
+1567 1422 8.33333333333333e+00
+1567 1566 -1.66666666666667e+01
+1567 1563 8.33333333333333e+00
+1567 1423 -1.25000000000000e+01
+1567 1734 4.16666666666667e+00
+1567 1335 -4.16666666666667e+00
+1567 1406 -8.33333333333333e+00
+1567 1565 8.33333333333333e+00
+1567 1564 -3.75000000000000e+01
+1567 1551 4.16666666666667e+00
+1567 1404 4.16666666666667e+00
+1567 1299 -4.16666666666667e+00
+1568 1568 1.25000000000000e+02
+1568 1593 -4.16666666666667e+00
+1568 1552 4.16666666666667e+00
+1568 1551 -8.33333333333333e+00
+1568 1595 -1.25000000000000e+01
+1568 1699 4.16666666666667e+00
+1568 1560 8.33333333333333e+00
+1568 1562 -3.75000000000000e+01
+1568 1561 8.33333333333333e+00
+1568 1698 4.16666666666667e+00
+1568 1567 -1.66666666666667e+01
+1568 1336 -4.16666666666667e+00
+1568 1300 -4.16666666666667e+00
+1568 1558 -4.16666666666667e+00
+1568 1555 4.16666666666667e+00
+1568 1566 -1.66666666666667e+01
+1568 1557 8.33333333333333e+00
+1568 1629 8.33333333333333e+00
+1568 1559 -1.25000000000000e+01
+1568 1299 -4.16666666666667e+00
+1568 1554 4.16666666666667e+00
+1568 1631 -3.75000000000000e+01
+1568 1660 -8.33333333333333e+00
+1568 1630 8.33333333333333e+00
+1568 1335 -4.16666666666667e+00
+1568 1659 4.16666666666667e+00
+1568 1423 -4.16666666666667e+00
+1568 1735 4.16666666666667e+00
+1568 1404 4.16666666666667e+00
+1568 1563 -4.16666666666667e+00
+1568 1424 -1.25000000000000e+01
+1568 1422 8.33333333333333e+00
+1568 1734 -8.33333333333333e+00
+1568 1565 -1.25000000000000e+01
+1568 1594 8.33333333333333e+00
+1568 1405 -8.33333333333333e+00
+1568 1564 8.33333333333333e+00
+1569 1569 6.25000000000000e+01
+1569 1600 -4.16666666666667e+00
+1569 1580 -2.08333333333333e+00
+1569 1586 4.16666666666667e+00
+1569 1579 4.16666666666667e+00
+1569 1578 -6.25000000000000e+00
+1569 1598 2.08333333333333e+00
+1569 1601 -4.16666666666667e+00
+1569 1597 -4.16666666666667e+00
+1569 1388 2.08333333333333e+00
+1569 1391 -2.08333333333333e+00
+1569 1588 4.16666666666667e+00
+1569 1576 -4.16666666666667e+00
+1569 1307 4.16666666666667e+00
+1569 1589 -8.33333333333333e+00
+1569 1306 4.16666666666667e+00
+1569 1570 -8.33333333333333e+00
+1569 1390 4.16666666666667e+00
+1569 1305 -1.87500000000000e+01
+1569 1389 -6.25000000000000e+00
+1569 1571 -8.33333333333333e+00
+1569 1304 4.16666666666667e+00
+1569 1577 8.33333333333333e+00
+1569 1303 4.16666666666667e+00
+1569 1387 -4.16666666666667e+00
+1569 1585 4.16666666666667e+00
+1569 1302 -1.87500000000000e+01
+1569 1575 -1.25000000000000e+01
+1570 1570 6.25000000000000e+01
+1570 1601 -4.16666666666667e+00
+1570 1584 4.16666666666667e+00
+1570 1599 -4.16666666666667e+00
+1570 1580 4.16666666666667e+00
+1570 1586 -8.33333333333333e+00
+1570 1579 -1.87500000000000e+01
+1570 1578 4.16666666666667e+00
+1570 1596 -4.16666666666667e+00
+1570 1571 -8.33333333333333e+00
+1570 1391 4.16666666666667e+00
+1570 1577 8.33333333333333e+00
+1570 1587 4.16666666666667e+00
+1570 1575 -4.16666666666667e+00
+1570 1307 -2.08333333333333e+00
+1570 1589 4.16666666666667e+00
+1570 1306 -6.25000000000000e+00
+1570 1390 -1.87500000000000e+01
+1570 1305 4.16666666666667e+00
+1570 1569 -8.33333333333333e+00
+1570 1389 4.16666666666667e+00
+1570 1304 -2.08333333333333e+00
+1570 1388 2.08333333333333e+00
+1570 1598 2.08333333333333e+00
+1570 1303 -6.25000000000000e+00
+1570 1576 -1.25000000000000e+01
+1570 1302 4.16666666666667e+00
+1570 1386 -4.16666666666667e+00
+1571 1571 6.25000000000000e+01
+1571 1600 -4.16666666666667e+00
+1571 1580 -6.25000000000000e+00
+1571 1579 4.16666666666667e+00
+1571 1585 -8.33333333333333e+00
+1571 1578 -2.08333333333333e+00
+1571 1584 4.16666666666667e+00
+1571 1596 2.08333333333333e+00
+1571 1599 -4.16666666666667e+00
+1571 1386 2.08333333333333e+00
+1571 1389 -2.08333333333333e+00
+1571 1570 -8.33333333333333e+00
+1571 1390 4.16666666666667e+00
+1571 1576 8.33333333333333e+00
+1571 1307 -6.25000000000000e+00
+1571 1391 -6.25000000000000e+00
+1571 1306 -2.08333333333333e+00
+1571 1588 4.16666666666667e+00
+1571 1305 4.16666666666667e+00
+1571 1587 -8.33333333333333e+00
+1571 1597 2.08333333333333e+00
+1571 1304 -6.25000000000000e+00
+1571 1577 -3.75000000000000e+01
+1571 1303 -2.08333333333333e+00
+1571 1387 2.08333333333333e+00
+1571 1569 -8.33333333333333e+00
+1571 1302 4.16666666666667e+00
+1571 1575 8.33333333333333e+00
+1572 1572 1.25000000000000e+02
+1572 1646 4.16666666666667e+00
+1572 1582 8.33333333333333e+00
+1572 1573 -1.66666666666667e+01
+1572 1304 8.33333333333333e+00
+1572 1303 -4.16666666666667e+00
+1572 1581 -1.25000000000000e+01
+1572 1574 -1.66666666666667e+01
+1572 1316 8.33333333333333e+00
+1572 1645 4.16666666666667e+00
+1572 1315 -4.16666666666667e+00
+1572 1387 4.16666666666667e+00
+1572 1388 4.16666666666667e+00
+1572 1302 -1.25000000000000e+01
+1572 1400 -4.16666666666667e+00
+1572 1399 8.33333333333333e+00
+1572 1398 -1.25000000000000e+01
+1572 1583 -4.16666666666667e+00
+1572 1314 -1.25000000000000e+01
+1572 1586 4.16666666666667e+00
+1572 1649 -4.16666666666667e+00
+1572 1648 -4.16666666666667e+00
+1572 1585 -8.33333333333333e+00
+1572 1576 8.33333333333333e+00
+1572 1643 -8.33333333333333e+00
+1572 1642 4.16666666666667e+00
+1572 1577 8.33333333333333e+00
+1572 1575 -3.75000000000000e+01
+1572 2320 8.33333333333333e+00
+1572 2318 -8.33333333333333e+00
+1572 2317 4.16666666666667e+00
+1572 2321 8.33333333333333e+00
+1572 2319 -3.75000000000000e+01
+1572 2287 -4.16666666666667e+00
+1572 2288 -4.16666666666667e+00
+1572 2294 4.16666666666667e+00
+1572 2293 -8.33333333333333e+00
+1573 1573 1.25000000000000e+02
+1573 1581 8.33333333333333e+00
+1573 1572 -1.66666666666667e+01
+1573 1583 8.33333333333333e+00
+1573 1582 -3.75000000000000e+01
+1573 1302 -4.16666666666667e+00
+1573 1646 -8.33333333333333e+00
+1573 1644 4.16666666666667e+00
+1573 1314 -4.16666666666667e+00
+1573 1386 4.16666666666667e+00
+1573 1388 -8.33333333333333e+00
+1573 1304 8.33333333333333e+00
+1573 1303 -1.25000000000000e+01
+1573 1400 8.33333333333333e+00
+1573 1574 -1.66666666666667e+01
+1573 1316 8.33333333333333e+00
+1573 1399 -3.75000000000000e+01
+1573 1315 -1.25000000000000e+01
+1573 1398 8.33333333333333e+00
+1573 1647 -4.16666666666667e+00
+1573 1586 4.16666666666667e+00
+1573 1584 -8.33333333333333e+00
+1573 1649 -4.16666666666667e+00
+1573 1577 -4.16666666666667e+00
+1573 1643 4.16666666666667e+00
+1573 1575 8.33333333333333e+00
+1573 1641 4.16666666666667e+00
+1573 1576 -1.25000000000000e+01
+1573 2321 -4.16666666666667e+00
+1573 2319 8.33333333333333e+00
+1573 2316 4.16666666666667e+00
+1573 2320 -1.25000000000000e+01
+1573 2286 -4.16666666666667e+00
+1573 2288 -4.16666666666667e+00
+1573 2294 4.16666666666667e+00
+1573 2318 4.16666666666667e+00
+1573 2292 -8.33333333333333e+00
+1574 1574 1.25000000000000e+02
+1574 1581 -4.16666666666667e+00
+1574 1644 4.16666666666667e+00
+1574 1583 -1.25000000000000e+01
+1574 1582 8.33333333333333e+00
+1574 1302 8.33333333333333e+00
+1574 1645 -8.33333333333333e+00
+1574 1572 -1.66666666666667e+01
+1574 1314 8.33333333333333e+00
+1574 1304 -3.75000000000000e+01
+1574 1387 -8.33333333333333e+00
+1574 1303 8.33333333333333e+00
+1574 1386 4.16666666666667e+00
+1574 1400 -1.25000000000000e+01
+1574 1316 -3.75000000000000e+01
+1574 1399 8.33333333333333e+00
+1574 1573 -1.66666666666667e+01
+1574 1315 8.33333333333333e+00
+1574 1398 -4.16666666666667e+00
+1574 1584 4.16666666666667e+00
+1574 1647 -4.16666666666667e+00
+1574 1585 4.16666666666667e+00
+1574 1648 -4.16666666666667e+00
+1574 1576 -4.16666666666667e+00
+1574 1642 4.16666666666667e+00
+1574 1641 -8.33333333333333e+00
+1574 1577 -1.25000000000000e+01
+1574 1575 8.33333333333333e+00
+1574 2320 -4.16666666666667e+00
+1574 2316 -8.33333333333333e+00
+1574 2321 -1.25000000000000e+01
+1574 2319 8.33333333333333e+00
+1574 2287 -4.16666666666667e+00
+1574 2293 4.16666666666667e+00
+1574 2286 -4.16666666666667e+00
+1574 2317 4.16666666666667e+00
+1574 2292 4.16666666666667e+00
+1575 1575 1.25000000000000e+02
+1575 1600 -8.33333333333333e+00
+1575 1570 -4.16666666666667e+00
+1575 1390 4.16666666666667e+00
+1575 1391 4.16666666666667e+00
+1575 1571 8.33333333333333e+00
+1575 1569 -1.25000000000000e+01
+1575 1589 8.33333333333333e+00
+1575 1588 8.33333333333333e+00
+1575 1587 -3.75000000000000e+01
+1575 1664 -4.16666666666667e+00
+1575 1663 -4.16666666666667e+00
+1575 1586 -4.16666666666667e+00
+1575 1649 4.16666666666667e+00
+1575 1648 4.16666666666667e+00
+1575 1585 8.33333333333333e+00
+1575 1576 -1.66666666666667e+01
+1575 1584 -1.25000000000000e+01
+1575 1403 -4.16666666666667e+00
+1575 1577 -1.66666666666667e+01
+1575 1388 -4.16666666666667e+00
+1575 1400 4.16666666666667e+00
+1575 1573 8.33333333333333e+00
+1575 1402 8.33333333333333e+00
+1575 1399 -8.33333333333333e+00
+1575 1574 8.33333333333333e+00
+1575 1304 -8.33333333333333e+00
+1575 1303 4.16666666666667e+00
+1575 1387 -4.16666666666667e+00
+1575 1572 -3.75000000000000e+01
+1575 1643 8.33333333333333e+00
+1575 1319 -8.33333333333333e+00
+1575 1642 -4.16666666666667e+00
+1575 1318 4.16666666666667e+00
+1575 1641 -1.25000000000000e+01
+1575 1601 4.16666666666667e+00
+1575 1401 -1.25000000000000e+01
+1576 1576 1.25000000000000e+02
+1576 1599 -8.33333333333333e+00
+1576 1571 8.33333333333333e+00
+1576 1569 -4.16666666666667e+00
+1576 1389 4.16666666666667e+00
+1576 1391 -8.33333333333333e+00
+1576 1570 -1.25000000000000e+01
+1576 1589 -4.16666666666667e+00
+1576 1588 -1.25000000000000e+01
+1576 1587 8.33333333333333e+00
+1576 1662 -4.16666666666667e+00
+1576 1586 8.33333333333333e+00
+1576 1649 -8.33333333333333e+00
+1576 1647 4.16666666666667e+00
+1576 1304 4.16666666666667e+00
+1576 1585 -3.75000000000000e+01
+1576 1584 8.33333333333333e+00
+1576 1575 -1.66666666666667e+01
+1576 1664 -4.16666666666667e+00
+1576 1319 4.16666666666667e+00
+1576 1574 -4.16666666666667e+00
+1576 1572 8.33333333333333e+00
+1576 1388 -4.16666666666667e+00
+1576 1400 4.16666666666667e+00
+1576 1401 8.33333333333333e+00
+1576 1398 -8.33333333333333e+00
+1576 1573 -1.25000000000000e+01
+1576 1302 4.16666666666667e+00
+1576 1386 -4.16666666666667e+00
+1576 1643 8.33333333333333e+00
+1576 1577 -1.66666666666667e+01
+1576 1403 8.33333333333333e+00
+1576 1642 -1.25000000000000e+01
+1576 1601 4.16666666666667e+00
+1576 1402 -3.75000000000000e+01
+1576 1641 -4.16666666666667e+00
+1576 1317 4.16666666666667e+00
+1577 1577 1.25000000000000e+02
+1577 1600 4.16666666666667e+00
+1577 1570 8.33333333333333e+00
+1577 1390 -8.33333333333333e+00
+1577 1389 4.16666666666667e+00
+1577 1571 -3.75000000000000e+01
+1577 1569 8.33333333333333e+00
+1577 1589 -1.25000000000000e+01
+1577 1588 -4.16666666666667e+00
+1577 1587 8.33333333333333e+00
+1577 1662 -4.16666666666667e+00
+1577 1585 8.33333333333333e+00
+1577 1584 -4.16666666666667e+00
+1577 1647 4.16666666666667e+00
+1577 1648 -8.33333333333333e+00
+1577 1586 -1.25000000000000e+01
+1577 1303 4.16666666666667e+00
+1577 1663 -4.16666666666667e+00
+1577 1318 4.16666666666667e+00
+1577 1401 -4.16666666666667e+00
+1577 1573 -4.16666666666667e+00
+1577 1575 -1.66666666666667e+01
+1577 1386 -4.16666666666667e+00
+1577 1398 4.16666666666667e+00
+1577 1387 -4.16666666666667e+00
+1577 1399 4.16666666666667e+00
+1577 1574 -1.25000000000000e+01
+1577 1572 8.33333333333333e+00
+1577 1302 -8.33333333333333e+00
+1577 1643 -3.75000000000000e+01
+1577 1599 4.16666666666667e+00
+1577 1403 -1.25000000000000e+01
+1577 1642 8.33333333333333e+00
+1577 1576 -1.66666666666667e+01
+1577 1402 8.33333333333333e+00
+1577 1641 8.33333333333333e+00
+1577 1317 -8.33333333333333e+00
+1578 1578 6.25000000000000e+01
+1578 1600 4.16666666666667e+00
+1578 1601 -8.33333333333333e+00
+1578 1304 2.08333333333333e+00
+1578 1571 -2.08333333333333e+00
+1578 1570 4.16666666666667e+00
+1578 1569 -6.25000000000000e+00
+1578 1343 2.08333333333333e+00
+1578 1597 4.16666666666667e+00
+1578 1596 -1.87500000000000e+01
+1578 1585 -4.16666666666667e+00
+1578 1436 -2.08333333333333e+00
+1578 1579 -8.33333333333333e+00
+1578 1804 -4.16666666666667e+00
+1578 1441 4.16666666666667e+00
+1578 1805 -4.16666666666667e+00
+1578 1442 4.16666666666667e+00
+1578 1342 -4.16666666666667e+00
+1578 1435 4.16666666666667e+00
+1578 1434 -6.25000000000000e+00
+1578 1580 -8.33333333333333e+00
+1578 1433 4.16666666666667e+00
+1578 1586 8.33333333333333e+00
+1578 1432 4.16666666666667e+00
+1578 1303 -4.16666666666667e+00
+1578 1598 4.16666666666667e+00
+1578 1431 -1.87500000000000e+01
+1578 1584 -1.25000000000000e+01
+1579 1579 6.25000000000000e+01
+1579 1599 4.16666666666667e+00
+1579 1601 4.16666666666667e+00
+1579 1571 4.16666666666667e+00
+1579 1580 -8.33333333333333e+00
+1579 1570 -1.87500000000000e+01
+1579 1569 4.16666666666667e+00
+1579 1597 -6.25000000000000e+00
+1579 1596 4.16666666666667e+00
+1579 1584 -4.16666666666667e+00
+1579 1578 -8.33333333333333e+00
+1579 1436 4.16666666666667e+00
+1579 1803 -4.16666666666667e+00
+1579 1440 4.16666666666667e+00
+1579 1586 8.33333333333333e+00
+1579 1442 -8.33333333333333e+00
+1579 1343 2.08333333333333e+00
+1579 1805 -4.16666666666667e+00
+1579 1435 -1.87500000000000e+01
+1579 1341 -4.16666666666667e+00
+1579 1434 4.16666666666667e+00
+1579 1433 -2.08333333333333e+00
+1579 1304 2.08333333333333e+00
+1579 1598 -2.08333333333333e+00
+1579 1432 -6.25000000000000e+00
+1579 1585 -1.25000000000000e+01
+1579 1431 4.16666666666667e+00
+1579 1302 -4.16666666666667e+00
+1580 1580 6.25000000000000e+01
+1580 1596 4.16666666666667e+00
+1580 1600 4.16666666666667e+00
+1580 1599 -8.33333333333333e+00
+1580 1571 -6.25000000000000e+00
+1580 1570 4.16666666666667e+00
+1580 1579 -8.33333333333333e+00
+1580 1302 2.08333333333333e+00
+1580 1569 -2.08333333333333e+00
+1580 1598 -6.25000000000000e+00
+1580 1341 2.08333333333333e+00
+1580 1434 -2.08333333333333e+00
+1580 1435 4.16666666666667e+00
+1580 1585 8.33333333333333e+00
+1580 1441 -8.33333333333333e+00
+1580 1803 -4.16666666666667e+00
+1580 1440 4.16666666666667e+00
+1580 1436 -6.25000000000000e+00
+1580 1342 2.08333333333333e+00
+1580 1804 -4.16666666666667e+00
+1580 1597 -2.08333333333333e+00
+1580 1433 -6.25000000000000e+00
+1580 1586 -3.75000000000000e+01
+1580 1432 -2.08333333333333e+00
+1580 1303 2.08333333333333e+00
+1580 1578 -8.33333333333333e+00
+1580 1431 4.16666666666667e+00
+1580 1584 8.33333333333333e+00
+1581 1581 1.25000000000000e+02
+1581 1573 8.33333333333333e+00
+1581 1303 4.16666666666667e+00
+1581 1572 -1.25000000000000e+01
+1581 1583 -1.66666666666667e+01
+1581 1646 8.33333333333333e+00
+1581 1345 4.16666666666667e+00
+1581 1645 -4.16666666666667e+00
+1581 1644 -1.25000000000000e+01
+1581 1433 8.33333333333333e+00
+1581 1432 -4.16666666666667e+00
+1581 1304 4.16666666666667e+00
+1581 1431 -1.25000000000000e+01
+1581 1439 -4.16666666666667e+00
+1581 1346 4.16666666666667e+00
+1581 1582 -1.66666666666667e+01
+1581 1438 8.33333333333333e+00
+1581 1574 -4.16666666666667e+00
+1581 1437 -1.25000000000000e+01
+1581 1649 -8.33333333333333e+00
+1581 1648 4.16666666666667e+00
+1581 1811 -4.16666666666667e+00
+1581 1442 4.16666666666667e+00
+1581 1441 -8.33333333333333e+00
+1581 1585 8.33333333333333e+00
+1581 1810 -4.16666666666667e+00
+1581 1586 8.33333333333333e+00
+1581 1584 -3.75000000000000e+01
+1581 2321 4.16666666666667e+00
+1581 2320 -8.33333333333333e+00
+1581 2317 -4.16666666666667e+00
+1581 2062 4.16666666666667e+00
+1581 2063 -8.33333333333333e+00
+1581 2330 8.33333333333333e+00
+1581 2318 -4.16666666666667e+00
+1581 2329 8.33333333333333e+00
+1581 2328 -3.75000000000000e+01
+1582 1582 1.25000000000000e+02
+1582 1572 8.33333333333333e+00
+1582 1574 8.33333333333333e+00
+1582 1573 -3.75000000000000e+01
+1582 1302 4.16666666666667e+00
+1582 1646 8.33333333333333e+00
+1582 1645 -1.25000000000000e+01
+1582 1344 4.16666666666667e+00
+1582 1644 -4.16666666666667e+00
+1582 1583 -1.66666666666667e+01
+1582 1431 -4.16666666666667e+00
+1582 1304 -8.33333333333333e+00
+1582 1433 8.33333333333333e+00
+1582 1432 -1.25000000000000e+01
+1582 1439 8.33333333333333e+00
+1582 1346 -8.33333333333333e+00
+1582 1438 -3.75000000000000e+01
+1582 1581 -1.66666666666667e+01
+1582 1437 8.33333333333333e+00
+1582 1647 4.16666666666667e+00
+1582 1811 -4.16666666666667e+00
+1582 1442 4.16666666666667e+00
+1582 1586 -4.16666666666667e+00
+1582 1440 -8.33333333333333e+00
+1582 1584 8.33333333333333e+00
+1582 1809 -4.16666666666667e+00
+1582 1649 4.16666666666667e+00
+1582 1585 -1.25000000000000e+01
+1582 2319 -8.33333333333333e+00
+1582 2316 -4.16666666666667e+00
+1582 2318 -4.16666666666667e+00
+1582 2061 4.16666666666667e+00
+1582 2063 4.16666666666667e+00
+1582 2330 -4.16666666666667e+00
+1582 2321 4.16666666666667e+00
+1582 2329 -1.25000000000000e+01
+1582 2328 8.33333333333333e+00
+1583 1583 1.25000000000000e+02
+1583 1572 -4.16666666666667e+00
+1583 1574 -1.25000000000000e+01
+1583 1573 8.33333333333333e+00
+1583 1646 -3.75000000000000e+01
+1583 1645 8.33333333333333e+00
+1583 1581 -1.66666666666667e+01
+1583 1644 8.33333333333333e+00
+1583 1582 -1.66666666666667e+01
+1583 1431 8.33333333333333e+00
+1583 1433 -3.75000000000000e+01
+1583 1303 -8.33333333333333e+00
+1583 1432 8.33333333333333e+00
+1583 1302 4.16666666666667e+00
+1583 1439 -1.25000000000000e+01
+1583 1438 8.33333333333333e+00
+1583 1345 -8.33333333333333e+00
+1583 1437 -4.16666666666667e+00
+1583 1344 4.16666666666667e+00
+1583 1647 -8.33333333333333e+00
+1583 1809 -4.16666666666667e+00
+1583 1810 -4.16666666666667e+00
+1583 1440 4.16666666666667e+00
+1583 1441 4.16666666666667e+00
+1583 1585 -4.16666666666667e+00
+1583 1648 4.16666666666667e+00
+1583 1586 -1.25000000000000e+01
+1583 1584 8.33333333333333e+00
+1583 2319 4.16666666666667e+00
+1583 2317 -4.16666666666667e+00
+1583 2062 4.16666666666667e+00
+1583 2329 -4.16666666666667e+00
+1583 2061 -8.33333333333333e+00
+1583 2328 8.33333333333333e+00
+1583 2316 -4.16666666666667e+00
+1583 2320 4.16666666666667e+00
+1583 2330 -1.25000000000000e+01
+1584 1584 1.25000000000000e+02
+1584 1601 8.33333333333333e+00
+1584 1571 4.16666666666667e+00
+1584 1600 8.33333333333333e+00
+1584 1599 -3.75000000000000e+01
+1584 1579 -4.16666666666667e+00
+1584 1805 4.16666666666667e+00
+1584 1580 8.33333333333333e+00
+1584 1578 -1.25000000000000e+01
+1584 1804 -8.33333333333333e+00
+1584 1586 -1.66666666666667e+01
+1584 1349 -4.16666666666667e+00
+1584 1304 -4.16666666666667e+00
+1584 1663 4.16666666666667e+00
+1584 1648 -4.16666666666667e+00
+1584 1577 -4.16666666666667e+00
+1584 1574 4.16666666666667e+00
+1584 1664 -8.33333333333333e+00
+1584 1649 8.33333333333333e+00
+1584 1647 -1.25000000000000e+01
+1584 1576 8.33333333333333e+00
+1584 1573 -8.33333333333333e+00
+1584 1575 -1.25000000000000e+01
+1584 1442 -4.16666666666667e+00
+1584 1811 4.16666666666667e+00
+1584 1441 8.33333333333333e+00
+1584 1585 -1.66666666666667e+01
+1584 1582 8.33333333333333e+00
+1584 1810 4.16666666666667e+00
+1584 1348 -4.16666666666667e+00
+1584 1440 -1.25000000000000e+01
+1584 1583 8.33333333333333e+00
+1584 1433 -8.33333333333333e+00
+1584 1432 4.16666666666667e+00
+1584 1303 -4.16666666666667e+00
+1584 1581 -3.75000000000000e+01
+1584 1570 4.16666666666667e+00
+1585 1585 1.25000000000000e+02
+1585 1601 -4.16666666666667e+00
+1585 1571 -8.33333333333333e+00
+1585 1600 -1.25000000000000e+01
+1585 1599 8.33333333333333e+00
+1585 1578 -4.16666666666667e+00
+1585 1580 8.33333333333333e+00
+1585 1579 -1.25000000000000e+01
+1585 1805 4.16666666666667e+00
+1585 1803 -8.33333333333333e+00
+1585 1662 4.16666666666667e+00
+1585 1647 -4.16666666666667e+00
+1585 1577 8.33333333333333e+00
+1585 1586 -1.66666666666667e+01
+1585 1649 8.33333333333333e+00
+1585 1349 -4.16666666666667e+00
+1585 1664 4.16666666666667e+00
+1585 1648 -1.25000000000000e+01
+1585 1304 -4.16666666666667e+00
+1585 1574 4.16666666666667e+00
+1585 1576 -3.75000000000000e+01
+1585 1575 8.33333333333333e+00
+1585 1572 -8.33333333333333e+00
+1585 1433 4.16666666666667e+00
+1585 1583 -4.16666666666667e+00
+1585 1440 8.33333333333333e+00
+1585 1584 -1.66666666666667e+01
+1585 1581 8.33333333333333e+00
+1585 1811 -8.33333333333333e+00
+1585 1442 8.33333333333333e+00
+1585 1441 -3.75000000000000e+01
+1585 1809 4.16666666666667e+00
+1585 1347 -4.16666666666667e+00
+1585 1582 -1.25000000000000e+01
+1585 1569 4.16666666666667e+00
+1585 1431 4.16666666666667e+00
+1585 1302 -4.16666666666667e+00
+1586 1586 1.25000000000000e+02
+1586 1599 8.33333333333333e+00
+1586 1570 -8.33333333333333e+00
+1586 1569 4.16666666666667e+00
+1586 1601 -1.25000000000000e+01
+1586 1579 8.33333333333333e+00
+1586 1803 4.16666666666667e+00
+1586 1580 -3.75000000000000e+01
+1586 1578 8.33333333333333e+00
+1586 1804 4.16666666666667e+00
+1586 1584 -1.66666666666667e+01
+1586 1347 -4.16666666666667e+00
+1586 1302 -4.16666666666667e+00
+1586 1576 8.33333333333333e+00
+1586 1585 -1.66666666666667e+01
+1586 1648 8.33333333333333e+00
+1586 1575 -4.16666666666667e+00
+1586 1572 4.16666666666667e+00
+1586 1649 -3.75000000000000e+01
+1586 1348 -4.16666666666667e+00
+1586 1663 4.16666666666667e+00
+1586 1662 -8.33333333333333e+00
+1586 1647 8.33333333333333e+00
+1586 1577 -1.25000000000000e+01
+1586 1303 -4.16666666666667e+00
+1586 1573 4.16666666666667e+00
+1586 1440 -4.16666666666667e+00
+1586 1809 4.16666666666667e+00
+1586 1432 4.16666666666667e+00
+1586 1582 -4.16666666666667e+00
+1586 1442 -1.25000000000000e+01
+1586 1810 -8.33333333333333e+00
+1586 1441 8.33333333333333e+00
+1586 1583 -1.25000000000000e+01
+1586 1600 -4.16666666666667e+00
+1586 1581 8.33333333333333e+00
+1586 1431 -8.33333333333333e+00
+1587 1587 1.25000000000000e+02
+1587 1601 -4.16666666666667e+00
+1587 1600 8.33333333333333e+00
+1587 1599 -1.25000000000000e+01
+1587 1664 4.16666666666667e+00
+1587 1570 4.16666666666667e+00
+1587 1571 -8.33333333333333e+00
+1587 1577 8.33333333333333e+00
+1587 1576 8.33333333333333e+00
+1587 1575 -3.75000000000000e+01
+1587 1588 -1.66666666666667e+01
+1587 1306 -4.16666666666667e+00
+1587 1318 -4.16666666666667e+00
+1587 1666 -4.16666666666667e+00
+1587 1660 4.16666666666667e+00
+1587 1667 -4.16666666666667e+00
+1587 1604 4.16666666666667e+00
+1587 1307 8.33333333333333e+00
+1587 1589 -1.66666666666667e+01
+1587 1595 8.33333333333333e+00
+1587 1603 -8.33333333333333e+00
+1587 1594 8.33333333333333e+00
+1587 1593 -3.75000000000000e+01
+1587 1319 8.33333333333333e+00
+1587 1661 -8.33333333333333e+00
+1587 1390 -4.16666666666667e+00
+1587 1552 4.16666666666667e+00
+1587 1553 4.16666666666667e+00
+1587 1391 -4.16666666666667e+00
+1587 1305 -1.25000000000000e+01
+1587 1559 -4.16666666666667e+00
+1587 1403 4.16666666666667e+00
+1587 1558 8.33333333333333e+00
+1587 1402 -8.33333333333333e+00
+1587 1557 -1.25000000000000e+01
+1587 1663 4.16666666666667e+00
+1587 1317 -1.25000000000000e+01
+1588 1588 1.25000000000000e+02
+1588 1601 8.33333333333333e+00
+1588 1600 -3.75000000000000e+01
+1588 1599 8.33333333333333e+00
+1588 1664 -8.33333333333333e+00
+1588 1569 4.16666666666667e+00
+1588 1571 4.16666666666667e+00
+1588 1577 -4.16666666666667e+00
+1588 1576 -1.25000000000000e+01
+1588 1575 8.33333333333333e+00
+1588 1587 -1.66666666666667e+01
+1588 1305 -4.16666666666667e+00
+1588 1317 -4.16666666666667e+00
+1588 1665 -4.16666666666667e+00
+1588 1659 4.16666666666667e+00
+1588 1604 4.16666666666667e+00
+1588 1595 -4.16666666666667e+00
+1588 1594 -1.25000000000000e+01
+1588 1602 -8.33333333333333e+00
+1588 1593 8.33333333333333e+00
+1588 1667 -4.16666666666667e+00
+1588 1661 4.16666666666667e+00
+1588 1389 -4.16666666666667e+00
+1588 1551 4.16666666666667e+00
+1588 1391 -4.16666666666667e+00
+1588 1403 4.16666666666667e+00
+1588 1553 -8.33333333333333e+00
+1588 1307 8.33333333333333e+00
+1588 1306 -1.25000000000000e+01
+1588 1559 8.33333333333333e+00
+1588 1589 -1.66666666666667e+01
+1588 1319 8.33333333333333e+00
+1588 1558 -3.75000000000000e+01
+1588 1662 4.16666666666667e+00
+1588 1318 -1.25000000000000e+01
+1588 1557 8.33333333333333e+00
+1588 1401 -8.33333333333333e+00
+1589 1589 1.25000000000000e+02
+1589 1600 8.33333333333333e+00
+1589 1599 -4.16666666666667e+00
+1589 1663 -8.33333333333333e+00
+1589 1662 4.16666666666667e+00
+1589 1570 4.16666666666667e+00
+1589 1569 -8.33333333333333e+00
+1589 1577 -1.25000000000000e+01
+1589 1576 -4.16666666666667e+00
+1589 1575 8.33333333333333e+00
+1589 1665 -4.16666666666667e+00
+1589 1602 4.16666666666667e+00
+1589 1595 -1.25000000000000e+01
+1589 1603 4.16666666666667e+00
+1589 1594 -4.16666666666667e+00
+1589 1305 8.33333333333333e+00
+1589 1587 -1.66666666666667e+01
+1589 1593 8.33333333333333e+00
+1589 1666 -4.16666666666667e+00
+1589 1660 4.16666666666667e+00
+1589 1317 8.33333333333333e+00
+1589 1659 -8.33333333333333e+00
+1589 1390 -4.16666666666667e+00
+1589 1402 4.16666666666667e+00
+1589 1307 -3.75000000000000e+01
+1589 1552 -8.33333333333333e+00
+1589 1306 8.33333333333333e+00
+1589 1551 4.16666666666667e+00
+1589 1389 -4.16666666666667e+00
+1589 1559 -1.25000000000000e+01
+1589 1601 -1.25000000000000e+01
+1589 1319 -3.75000000000000e+01
+1589 1558 8.33333333333333e+00
+1589 1588 -1.66666666666667e+01
+1589 1318 8.33333333333333e+00
+1589 1557 -4.16666666666667e+00
+1589 1401 4.16666666666667e+00
+1590 1590 6.25000000000000e+01
+1590 1553 2.08333333333333e+00
+1590 1552 -4.16666666666667e+00
+1590 1561 4.16666666666667e+00
+1590 1560 -6.25000000000000e+00
+1590 1307 4.16666666666667e+00
+1590 1592 -8.33333333333333e+00
+1590 1595 8.33333333333333e+00
+1590 1594 -4.16666666666667e+00
+1590 1593 -1.25000000000000e+01
+1590 1325 4.16666666666667e+00
+1590 1700 -8.33333333333333e+00
+1590 1699 4.16666666666667e+00
+1590 1603 4.16666666666667e+00
+1590 1708 -4.16666666666667e+00
+1590 1448 2.08333333333333e+00
+1590 1709 -4.16666666666667e+00
+1590 1324 4.16666666666667e+00
+1590 1447 -4.16666666666667e+00
+1590 1323 -1.87500000000000e+01
+1590 1445 -2.08333333333333e+00
+1590 1604 4.16666666666667e+00
+1590 1591 -8.33333333333333e+00
+1590 1444 4.16666666666667e+00
+1590 1306 4.16666666666667e+00
+1590 1562 -2.08333333333333e+00
+1590 1443 -6.25000000000000e+00
+1590 1305 -1.87500000000000e+01
+1591 1591 6.25000000000000e+01
+1591 1592 -8.33333333333333e+00
+1591 1307 -2.08333333333333e+00
+1591 1553 2.08333333333333e+00
+1591 1551 -4.16666666666667e+00
+1591 1325 -2.08333333333333e+00
+1591 1561 -1.87500000000000e+01
+1591 1560 4.16666666666667e+00
+1591 1700 4.16666666666667e+00
+1591 1595 8.33333333333333e+00
+1591 1594 -1.25000000000000e+01
+1591 1593 -4.16666666666667e+00
+1591 1698 4.16666666666667e+00
+1591 1602 4.16666666666667e+00
+1591 1707 -4.16666666666667e+00
+1591 1448 2.08333333333333e+00
+1591 1709 -4.16666666666667e+00
+1591 1324 -6.25000000000000e+00
+1591 1323 4.16666666666667e+00
+1591 1446 -4.16666666666667e+00
+1591 1445 4.16666666666667e+00
+1591 1604 -8.33333333333333e+00
+1591 1562 4.16666666666667e+00
+1591 1444 -1.87500000000000e+01
+1591 1306 -6.25000000000000e+00
+1591 1590 -8.33333333333333e+00
+1591 1443 4.16666666666667e+00
+1591 1305 4.16666666666667e+00
+1592 1592 6.25000000000000e+01
+1592 1591 -8.33333333333333e+00
+1592 1560 -2.08333333333333e+00
+1592 1551 2.08333333333333e+00
+1592 1306 -2.08333333333333e+00
+1592 1552 2.08333333333333e+00
+1592 1562 -6.25000000000000e+00
+1592 1324 -2.08333333333333e+00
+1592 1699 4.16666666666667e+00
+1592 1595 -3.75000000000000e+01
+1592 1594 8.33333333333333e+00
+1592 1305 4.16666666666667e+00
+1592 1590 -8.33333333333333e+00
+1592 1593 8.33333333333333e+00
+1592 1323 4.16666666666667e+00
+1592 1698 -8.33333333333333e+00
+1592 1447 2.08333333333333e+00
+1592 1708 -4.16666666666667e+00
+1592 1325 -6.25000000000000e+00
+1592 1446 2.08333333333333e+00
+1592 1707 -4.16666666666667e+00
+1592 1561 4.16666666666667e+00
+1592 1445 -6.25000000000000e+00
+1592 1307 -6.25000000000000e+00
+1592 1444 4.16666666666667e+00
+1592 1603 -8.33333333333333e+00
+1592 1443 -2.08333333333333e+00
+1592 1602 4.16666666666667e+00
+1593 1593 1.25000000000000e+02
+1593 1558 -8.33333333333333e+00
+1593 1553 -4.16666666666667e+00
+1593 1561 4.16666666666667e+00
+1593 1552 -4.16666666666667e+00
+1593 1562 4.16666666666667e+00
+1593 1568 -4.16666666666667e+00
+1593 1567 8.33333333333333e+00
+1593 1566 -1.25000000000000e+01
+1593 1709 4.16666666666667e+00
+1593 1708 -8.33333333333333e+00
+1593 1699 8.33333333333333e+00
+1593 1592 8.33333333333333e+00
+1593 1306 4.16666666666667e+00
+1593 1591 -4.16666666666667e+00
+1593 1590 -1.25000000000000e+01
+1593 1700 8.33333333333333e+00
+1593 1336 4.16666666666667e+00
+1593 1698 -3.75000000000000e+01
+1593 1595 -1.66666666666667e+01
+1593 1660 -4.16666666666667e+00
+1593 1604 -4.16666666666667e+00
+1593 1666 4.16666666666667e+00
+1593 1771 -4.16666666666667e+00
+1593 1667 4.16666666666667e+00
+1593 1772 -4.16666666666667e+00
+1593 1307 -8.33333333333333e+00
+1593 1589 8.33333333333333e+00
+1593 1603 8.33333333333333e+00
+1593 1588 8.33333333333333e+00
+1593 1594 -1.66666666666667e+01
+1593 1602 -1.25000000000000e+01
+1593 1587 -3.75000000000000e+01
+1593 1661 8.33333333333333e+00
+1593 1337 -8.33333333333333e+00
+1593 1559 4.16666666666667e+00
+1593 1659 -1.25000000000000e+01
+1594 1594 1.25000000000000e+02
+1594 1557 -8.33333333333333e+00
+1594 1560 4.16666666666667e+00
+1594 1551 -4.16666666666667e+00
+1594 1562 -8.33333333333333e+00
+1594 1568 8.33333333333333e+00
+1594 1553 -4.16666666666667e+00
+1594 1567 -3.75000000000000e+01
+1594 1566 8.33333333333333e+00
+1594 1709 4.16666666666667e+00
+1594 1700 -4.16666666666667e+00
+1594 1707 -8.33333333333333e+00
+1594 1698 8.33333333333333e+00
+1594 1592 8.33333333333333e+00
+1594 1595 -1.66666666666667e+01
+1594 1591 -1.25000000000000e+01
+1594 1305 4.16666666666667e+00
+1594 1590 -4.16666666666667e+00
+1594 1699 -1.25000000000000e+01
+1594 1335 4.16666666666667e+00
+1594 1659 -4.16666666666667e+00
+1594 1604 8.33333333333333e+00
+1594 1665 4.16666666666667e+00
+1594 1770 -4.16666666666667e+00
+1594 1667 -8.33333333333333e+00
+1594 1661 8.33333333333333e+00
+1594 1307 4.16666666666667e+00
+1594 1589 -4.16666666666667e+00
+1594 1603 -3.75000000000000e+01
+1594 1588 -1.25000000000000e+01
+1594 1602 8.33333333333333e+00
+1594 1587 8.33333333333333e+00
+1594 1593 -1.66666666666667e+01
+1594 1772 -4.16666666666667e+00
+1594 1337 4.16666666666667e+00
+1594 1559 4.16666666666667e+00
+1594 1660 -1.25000000000000e+01
+1595 1595 1.25000000000000e+02
+1595 1557 4.16666666666667e+00
+1595 1551 -4.16666666666667e+00
+1595 1561 -8.33333333333333e+00
+1595 1567 8.33333333333333e+00
+1595 1560 4.16666666666667e+00
+1595 1566 -4.16666666666667e+00
+1595 1552 -4.16666666666667e+00
+1595 1568 -1.25000000000000e+01
+1595 1708 4.16666666666667e+00
+1595 1699 -4.16666666666667e+00
+1595 1707 4.16666666666667e+00
+1595 1592 -3.75000000000000e+01
+1595 1591 8.33333333333333e+00
+1595 1594 -1.66666666666667e+01
+1595 1590 8.33333333333333e+00
+1595 1700 -1.25000000000000e+01
+1595 1698 8.33333333333333e+00
+1595 1593 -1.66666666666667e+01
+1595 1602 -4.16666666666667e+00
+1595 1603 8.33333333333333e+00
+1595 1666 -8.33333333333333e+00
+1595 1660 8.33333333333333e+00
+1595 1665 4.16666666666667e+00
+1595 1770 -4.16666666666667e+00
+1595 1604 -1.25000000000000e+01
+1595 1589 -1.25000000000000e+01
+1595 1306 4.16666666666667e+00
+1595 1588 -4.16666666666667e+00
+1595 1305 -8.33333333333333e+00
+1595 1587 8.33333333333333e+00
+1595 1558 4.16666666666667e+00
+1595 1661 -3.75000000000000e+01
+1595 1771 -4.16666666666667e+00
+1595 1336 4.16666666666667e+00
+1595 1659 8.33333333333333e+00
+1595 1335 -8.33333333333333e+00
+1596 1596 6.25000000000000e+01
+1596 1580 4.16666666666667e+00
+1596 1571 2.08333333333333e+00
+1596 1307 -2.08333333333333e+00
+1596 1570 -4.16666666666667e+00
+1596 1343 -2.08333333333333e+00
+1596 1579 4.16666666666667e+00
+1596 1578 -1.87500000000000e+01
+1596 1805 4.16666666666667e+00
+1596 1804 4.16666666666667e+00
+1596 1601 8.33333333333333e+00
+1596 1600 -4.16666666666667e+00
+1596 1599 -1.25000000000000e+01
+1596 1603 4.16666666666667e+00
+1596 1807 -4.16666666666667e+00
+1596 1451 2.08333333333333e+00
+1596 1808 -4.16666666666667e+00
+1596 1450 -4.16666666666667e+00
+1596 1342 4.16666666666667e+00
+1596 1341 -6.25000000000000e+00
+1596 1445 4.16666666666667e+00
+1596 1604 -8.33333333333333e+00
+1596 1444 4.16666666666667e+00
+1596 1597 -8.33333333333333e+00
+1596 1306 4.16666666666667e+00
+1596 1443 -1.87500000000000e+01
+1596 1598 -8.33333333333333e+00
+1596 1305 -6.25000000000000e+00
+1597 1597 6.25000000000000e+01
+1597 1571 2.08333333333333e+00
+1597 1569 -4.16666666666667e+00
+1597 1579 -6.25000000000000e+00
+1597 1578 4.16666666666667e+00
+1597 1343 4.16666666666667e+00
+1597 1805 -8.33333333333333e+00
+1597 1803 4.16666666666667e+00
+1597 1598 -8.33333333333333e+00
+1597 1307 4.16666666666667e+00
+1597 1601 8.33333333333333e+00
+1597 1600 -1.25000000000000e+01
+1597 1599 -4.16666666666667e+00
+1597 1602 4.16666666666667e+00
+1597 1806 -4.16666666666667e+00
+1597 1451 2.08333333333333e+00
+1597 1808 -4.16666666666667e+00
+1597 1342 -1.87500000000000e+01
+1597 1449 -4.16666666666667e+00
+1597 1341 4.16666666666667e+00
+1597 1445 -2.08333333333333e+00
+1597 1604 4.16666666666667e+00
+1597 1444 -6.25000000000000e+00
+1597 1580 -2.08333333333333e+00
+1597 1306 -1.87500000000000e+01
+1597 1443 4.16666666666667e+00
+1597 1596 -8.33333333333333e+00
+1597 1305 4.16666666666667e+00
+1598 1598 6.25000000000000e+01
+1598 1570 2.08333333333333e+00
+1598 1596 -8.33333333333333e+00
+1598 1578 4.16666666666667e+00
+1598 1569 2.08333333333333e+00
+1598 1305 -2.08333333333333e+00
+1598 1580 -6.25000000000000e+00
+1598 1341 -2.08333333333333e+00
+1598 1803 4.16666666666667e+00
+1598 1342 4.16666666666667e+00
+1598 1804 -8.33333333333333e+00
+1598 1601 -3.75000000000000e+01
+1598 1597 -8.33333333333333e+00
+1598 1306 4.16666666666667e+00
+1598 1600 8.33333333333333e+00
+1598 1599 8.33333333333333e+00
+1598 1449 2.08333333333333e+00
+1598 1806 -4.16666666666667e+00
+1598 1343 -6.25000000000000e+00
+1598 1450 2.08333333333333e+00
+1598 1807 -4.16666666666667e+00
+1598 1445 -6.25000000000000e+00
+1598 1579 -2.08333333333333e+00
+1598 1307 -6.25000000000000e+00
+1598 1444 -2.08333333333333e+00
+1598 1603 4.16666666666667e+00
+1598 1443 4.16666666666667e+00
+1598 1602 -8.33333333333333e+00
+1599 1599 1.25000000000000e+02
+1599 1576 -8.33333333333333e+00
+1599 1570 -4.16666666666667e+00
+1599 1579 4.16666666666667e+00
+1599 1586 8.33333333333333e+00
+1599 1580 -8.33333333333333e+00
+1599 1571 -4.16666666666667e+00
+1599 1585 8.33333333333333e+00
+1599 1584 -3.75000000000000e+01
+1599 1808 4.16666666666667e+00
+1599 1805 -4.16666666666667e+00
+1599 1804 8.33333333333333e+00
+1599 1807 -8.33333333333333e+00
+1599 1598 8.33333333333333e+00
+1599 1601 -1.66666666666667e+01
+1599 1597 -4.16666666666667e+00
+1599 1306 4.16666666666667e+00
+1599 1596 -1.25000000000000e+01
+1599 1348 4.16666666666667e+00
+1599 1803 -1.25000000000000e+01
+1599 1663 -4.16666666666667e+00
+1599 1604 8.33333333333333e+00
+1599 1666 4.16666666666667e+00
+1599 1816 -4.16666666666667e+00
+1599 1667 -8.33333333333333e+00
+1599 1664 8.33333333333333e+00
+1599 1307 4.16666666666667e+00
+1599 1589 -4.16666666666667e+00
+1599 1603 8.33333333333333e+00
+1599 1588 8.33333333333333e+00
+1599 1600 -1.66666666666667e+01
+1599 1602 -3.75000000000000e+01
+1599 1587 -1.25000000000000e+01
+1599 1817 -4.16666666666667e+00
+1599 1349 4.16666666666667e+00
+1599 1577 4.16666666666667e+00
+1599 1662 -1.25000000000000e+01
+1600 1600 1.25000000000000e+02
+1600 1575 -8.33333333333333e+00
+1600 1571 -4.16666666666667e+00
+1600 1569 -4.16666666666667e+00
+1600 1578 4.16666666666667e+00
+1600 1586 -4.16666666666667e+00
+1600 1580 4.16666666666667e+00
+1600 1585 -1.25000000000000e+01
+1600 1584 8.33333333333333e+00
+1600 1808 4.16666666666667e+00
+1600 1803 8.33333333333333e+00
+1600 1806 -8.33333333333333e+00
+1600 1598 8.33333333333333e+00
+1600 1597 -1.25000000000000e+01
+1600 1596 -4.16666666666667e+00
+1600 1305 4.16666666666667e+00
+1600 1805 8.33333333333333e+00
+1600 1804 -3.75000000000000e+01
+1600 1347 4.16666666666667e+00
+1600 1601 -1.66666666666667e+01
+1600 1662 -4.16666666666667e+00
+1600 1604 -4.16666666666667e+00
+1600 1665 4.16666666666667e+00
+1600 1815 -4.16666666666667e+00
+1600 1817 -4.16666666666667e+00
+1600 1667 4.16666666666667e+00
+1600 1307 -8.33333333333333e+00
+1600 1589 8.33333333333333e+00
+1600 1603 -1.25000000000000e+01
+1600 1588 -3.75000000000000e+01
+1600 1602 8.33333333333333e+00
+1600 1587 8.33333333333333e+00
+1600 1599 -1.66666666666667e+01
+1600 1664 8.33333333333333e+00
+1600 1349 -8.33333333333333e+00
+1600 1577 4.16666666666667e+00
+1600 1663 -1.25000000000000e+01
+1601 1601 1.25000000000000e+02
+1601 1576 4.16666666666667e+00
+1601 1570 -4.16666666666667e+00
+1601 1585 -4.16666666666667e+00
+1601 1579 4.16666666666667e+00
+1601 1584 8.33333333333333e+00
+1601 1578 -8.33333333333333e+00
+1601 1569 -4.16666666666667e+00
+1601 1586 -1.25000000000000e+01
+1601 1806 4.16666666666667e+00
+1601 1803 -4.16666666666667e+00
+1601 1807 4.16666666666667e+00
+1601 1598 -3.75000000000000e+01
+1601 1597 8.33333333333333e+00
+1601 1596 8.33333333333333e+00
+1601 1599 -1.66666666666667e+01
+1601 1805 -1.25000000000000e+01
+1601 1804 8.33333333333333e+00
+1601 1600 -1.66666666666667e+01
+1601 1603 -4.16666666666667e+00
+1601 1602 8.33333333333333e+00
+1601 1816 -4.16666666666667e+00
+1601 1666 4.16666666666667e+00
+1601 1665 -8.33333333333333e+00
+1601 1662 8.33333333333333e+00
+1601 1604 -1.25000000000000e+01
+1601 1589 -1.25000000000000e+01
+1601 1306 -8.33333333333333e+00
+1601 1588 8.33333333333333e+00
+1601 1305 4.16666666666667e+00
+1601 1587 -4.16666666666667e+00
+1601 1575 4.16666666666667e+00
+1601 1664 -3.75000000000000e+01
+1601 1663 8.33333333333333e+00
+1601 1348 -8.33333333333333e+00
+1601 1815 -4.16666666666667e+00
+1601 1347 4.16666666666667e+00
+1602 1602 1.25000000000000e+02
+1602 1816 4.16666666666667e+00
+1602 1817 4.16666666666667e+00
+1602 1600 8.33333333333333e+00
+1602 1599 -3.75000000000000e+01
+1602 1597 4.16666666666667e+00
+1602 1808 -4.16666666666667e+00
+1602 1598 -8.33333333333333e+00
+1602 1807 8.33333333333333e+00
+1602 1806 -1.25000000000000e+01
+1602 1603 -1.66666666666667e+01
+1602 1306 -4.16666666666667e+00
+1602 1354 -4.16666666666667e+00
+1602 1589 4.16666666666667e+00
+1602 1595 -4.16666666666667e+00
+1602 1666 -4.16666666666667e+00
+1602 1771 4.16666666666667e+00
+1602 1588 -8.33333333333333e+00
+1602 1594 8.33333333333333e+00
+1602 1593 -1.25000000000000e+01
+1602 1667 8.33333333333333e+00
+1602 1772 -8.33333333333333e+00
+1602 1665 -1.25000000000000e+01
+1602 1444 -4.16666666666667e+00
+1602 1591 4.16666666666667e+00
+1602 1445 8.33333333333333e+00
+1602 1604 -1.66666666666667e+01
+1602 1709 8.33333333333333e+00
+1602 1592 4.16666666666667e+00
+1602 1307 -4.16666666666667e+00
+1602 1443 -1.25000000000000e+01
+1602 1457 4.16666666666667e+00
+1602 1355 -4.16666666666667e+00
+1602 1708 8.33333333333333e+00
+1602 1456 -8.33333333333333e+00
+1602 1707 -3.75000000000000e+01
+1602 1601 8.33333333333333e+00
+1603 1603 1.25000000000000e+02
+1603 1815 4.16666666666667e+00
+1603 1817 -8.33333333333333e+00
+1603 1600 -1.25000000000000e+01
+1603 1599 8.33333333333333e+00
+1603 1596 4.16666666666667e+00
+1603 1808 8.33333333333333e+00
+1603 1598 4.16666666666667e+00
+1603 1807 -3.75000000000000e+01
+1603 1806 8.33333333333333e+00
+1603 1602 -1.66666666666667e+01
+1603 1305 -4.16666666666667e+00
+1603 1353 -4.16666666666667e+00
+1603 1667 8.33333333333333e+00
+1603 1604 -1.66666666666667e+01
+1603 1595 8.33333333333333e+00
+1603 1665 -4.16666666666667e+00
+1603 1770 4.16666666666667e+00
+1603 1307 -4.16666666666667e+00
+1603 1589 4.16666666666667e+00
+1603 1594 -3.75000000000000e+01
+1603 1587 -8.33333333333333e+00
+1603 1593 8.33333333333333e+00
+1603 1355 -4.16666666666667e+00
+1603 1772 4.16666666666667e+00
+1603 1666 -1.25000000000000e+01
+1603 1443 -4.16666666666667e+00
+1603 1590 4.16666666666667e+00
+1603 1457 4.16666666666667e+00
+1603 1709 -4.16666666666667e+00
+1603 1592 -8.33333333333333e+00
+1603 1445 8.33333333333333e+00
+1603 1444 -1.25000000000000e+01
+1603 1708 -1.25000000000000e+01
+1603 1601 -4.16666666666667e+00
+1603 1707 8.33333333333333e+00
+1603 1455 -8.33333333333333e+00
+1604 1604 1.25000000000000e+02
+1604 1599 8.33333333333333e+00
+1604 1816 -8.33333333333333e+00
+1604 1815 4.16666666666667e+00
+1604 1601 -1.25000000000000e+01
+1604 1807 8.33333333333333e+00
+1604 1806 -4.16666666666667e+00
+1604 1597 4.16666666666667e+00
+1604 1596 -8.33333333333333e+00
+1604 1808 -1.25000000000000e+01
+1604 1587 4.16666666666667e+00
+1604 1593 -4.16666666666667e+00
+1604 1666 8.33333333333333e+00
+1604 1603 -1.66666666666667e+01
+1604 1594 8.33333333333333e+00
+1604 1595 -1.25000000000000e+01
+1604 1306 -4.16666666666667e+00
+1604 1588 4.16666666666667e+00
+1604 1667 -3.75000000000000e+01
+1604 1354 -4.16666666666667e+00
+1604 1771 4.16666666666667e+00
+1604 1665 8.33333333333333e+00
+1604 1770 -8.33333333333333e+00
+1604 1456 4.16666666666667e+00
+1604 1708 -4.16666666666667e+00
+1604 1443 8.33333333333333e+00
+1604 1602 -1.66666666666667e+01
+1604 1707 8.33333333333333e+00
+1604 1445 -3.75000000000000e+01
+1604 1591 -8.33333333333333e+00
+1604 1444 8.33333333333333e+00
+1604 1590 4.16666666666667e+00
+1604 1305 -4.16666666666667e+00
+1604 1709 -1.25000000000000e+01
+1604 1600 -4.16666666666667e+00
+1604 1455 4.16666666666667e+00
+1604 1353 -4.16666666666667e+00
+1605 1605 6.25000000000000e+01
+1605 1637 -4.16666666666667e+00
+1605 1634 -4.16666666666667e+00
+1605 1633 2.08333333333333e+00
+1605 1636 -4.16666666666667e+00
+1605 1616 4.16666666666667e+00
+1605 1615 -2.08333333333333e+00
+1605 1621 4.16666666666667e+00
+1605 1614 -6.25000000000000e+00
+1605 1396 -2.08333333333333e+00
+1605 1393 2.08333333333333e+00
+1605 1625 4.16666666666667e+00
+1605 1613 -4.16666666666667e+00
+1605 1310 4.16666666666667e+00
+1605 1394 -4.16666666666667e+00
+1605 1309 4.16666666666667e+00
+1605 1606 -8.33333333333333e+00
+1605 1612 8.33333333333333e+00
+1605 1308 -1.87500000000000e+01
+1605 1611 -1.25000000000000e+01
+1605 1607 -8.33333333333333e+00
+1605 1313 4.16666666666667e+00
+1605 1397 4.16666666666667e+00
+1605 1312 4.16666666666667e+00
+1605 1624 -8.33333333333333e+00
+1605 1622 4.16666666666667e+00
+1605 1311 -1.87500000000000e+01
+1605 1395 -6.25000000000000e+00
+1606 1606 6.25000000000000e+01
+1606 1637 -4.16666666666667e+00
+1606 1632 2.08333333333333e+00
+1606 1635 -4.16666666666667e+00
+1606 1616 4.16666666666667e+00
+1606 1622 -8.33333333333333e+00
+1606 1615 -6.25000000000000e+00
+1606 1614 -2.08333333333333e+00
+1606 1620 4.16666666666667e+00
+1606 1395 -2.08333333333333e+00
+1606 1392 2.08333333333333e+00
+1606 1397 4.16666666666667e+00
+1606 1607 -8.33333333333333e+00
+1606 1613 8.33333333333333e+00
+1606 1310 -2.08333333333333e+00
+1606 1394 2.08333333333333e+00
+1606 1309 -6.25000000000000e+00
+1606 1612 -3.75000000000000e+01
+1606 1308 4.16666666666667e+00
+1606 1605 -8.33333333333333e+00
+1606 1611 8.33333333333333e+00
+1606 1313 -2.08333333333333e+00
+1606 1625 4.16666666666667e+00
+1606 1634 2.08333333333333e+00
+1606 1312 -6.25000000000000e+00
+1606 1396 -6.25000000000000e+00
+1606 1311 4.16666666666667e+00
+1606 1623 -8.33333333333333e+00
+1607 1607 6.25000000000000e+01
+1607 1636 -4.16666666666667e+00
+1607 1620 4.16666666666667e+00
+1607 1635 -4.16666666666667e+00
+1607 1632 -4.16666666666667e+00
+1607 1616 -1.87500000000000e+01
+1607 1615 4.16666666666667e+00
+1607 1621 -8.33333333333333e+00
+1607 1614 4.16666666666667e+00
+1607 1396 4.16666666666667e+00
+1607 1606 -8.33333333333333e+00
+1607 1612 8.33333333333333e+00
+1607 1623 4.16666666666667e+00
+1607 1611 -4.16666666666667e+00
+1607 1310 -6.25000000000000e+00
+1607 1613 -1.25000000000000e+01
+1607 1309 -2.08333333333333e+00
+1607 1393 2.08333333333333e+00
+1607 1308 4.16666666666667e+00
+1607 1392 -4.16666666666667e+00
+1607 1633 2.08333333333333e+00
+1607 1313 -6.25000000000000e+00
+1607 1397 -1.87500000000000e+01
+1607 1312 -2.08333333333333e+00
+1607 1624 4.16666666666667e+00
+1607 1605 -8.33333333333333e+00
+1607 1311 4.16666666666667e+00
+1607 1395 4.16666666666667e+00
+1608 1608 1.25000000000000e+02
+1608 1619 8.33333333333333e+00
+1608 1618 -4.16666666666667e+00
+1608 1651 4.16666666666667e+00
+1608 1652 4.16666666666667e+00
+1608 1316 -4.16666666666667e+00
+1608 1310 -4.16666666666667e+00
+1608 1617 -1.25000000000000e+01
+1608 1309 8.33333333333333e+00
+1608 1609 -1.66666666666667e+01
+1608 1315 8.33333333333333e+00
+1608 1394 4.16666666666667e+00
+1608 1393 4.16666666666667e+00
+1608 1308 -1.25000000000000e+01
+1608 1400 8.33333333333333e+00
+1608 1399 -4.16666666666667e+00
+1608 1398 -1.25000000000000e+01
+1608 1610 -1.66666666666667e+01
+1608 1314 -1.25000000000000e+01
+1608 1655 -4.16666666666667e+00
+1608 1622 -8.33333333333333e+00
+1608 1621 4.16666666666667e+00
+1608 1654 -4.16666666666667e+00
+1608 1613 8.33333333333333e+00
+1608 1643 4.16666666666667e+00
+1608 1642 -8.33333333333333e+00
+1608 1612 8.33333333333333e+00
+1608 1611 -3.75000000000000e+01
+1608 2354 4.16666666666667e+00
+1608 2353 -8.33333333333333e+00
+1608 2357 8.33333333333333e+00
+1608 2356 8.33333333333333e+00
+1608 2355 -3.75000000000000e+01
+1608 2291 -4.16666666666667e+00
+1608 2290 -4.16666666666667e+00
+1608 2294 -8.33333333333333e+00
+1608 2293 4.16666666666667e+00
+1609 1609 1.25000000000000e+02
+1609 1650 4.16666666666667e+00
+1609 1652 -8.33333333333333e+00
+1609 1619 8.33333333333333e+00
+1609 1618 -1.25000000000000e+01
+1609 1308 8.33333333333333e+00
+1609 1608 -1.66666666666667e+01
+1609 1314 8.33333333333333e+00
+1609 1394 -8.33333333333333e+00
+1609 1310 8.33333333333333e+00
+1609 1309 -3.75000000000000e+01
+1609 1392 4.16666666666667e+00
+1609 1400 8.33333333333333e+00
+1609 1610 -1.66666666666667e+01
+1609 1316 8.33333333333333e+00
+1609 1399 -1.25000000000000e+01
+1609 1617 -4.16666666666667e+00
+1609 1315 -3.75000000000000e+01
+1609 1398 -4.16666666666667e+00
+1609 1655 -4.16666666666667e+00
+1609 1620 4.16666666666667e+00
+1609 1653 -4.16666666666667e+00
+1609 1643 4.16666666666667e+00
+1609 1613 -4.16666666666667e+00
+1609 1641 -8.33333333333333e+00
+1609 1622 4.16666666666667e+00
+1609 1612 -1.25000000000000e+01
+1609 1611 8.33333333333333e+00
+1609 2354 4.16666666666667e+00
+1609 2352 -8.33333333333333e+00
+1609 2357 -4.16666666666667e+00
+1609 2356 -1.25000000000000e+01
+1609 2355 8.33333333333333e+00
+1609 2294 4.16666666666667e+00
+1609 2291 -4.16666666666667e+00
+1609 2289 -4.16666666666667e+00
+1609 2292 4.16666666666667e+00
+1610 1610 1.25000000000000e+02
+1610 1617 8.33333333333333e+00
+1610 1651 -8.33333333333333e+00
+1610 1650 4.16666666666667e+00
+1610 1314 -4.16666666666667e+00
+1610 1619 -3.75000000000000e+01
+1610 1618 8.33333333333333e+00
+1610 1308 -4.16666666666667e+00
+1610 1392 4.16666666666667e+00
+1610 1310 -1.25000000000000e+01
+1610 1393 -8.33333333333333e+00
+1610 1309 8.33333333333333e+00
+1610 1400 -3.75000000000000e+01
+1610 1608 -1.66666666666667e+01
+1610 1316 -1.25000000000000e+01
+1610 1399 8.33333333333333e+00
+1610 1609 -1.66666666666667e+01
+1610 1315 8.33333333333333e+00
+1610 1398 8.33333333333333e+00
+1610 1653 -4.16666666666667e+00
+1610 1621 4.16666666666667e+00
+1610 1654 -4.16666666666667e+00
+1610 1620 -8.33333333333333e+00
+1610 1642 4.16666666666667e+00
+1610 1612 -4.16666666666667e+00
+1610 1611 8.33333333333333e+00
+1610 1641 4.16666666666667e+00
+1610 1613 -1.25000000000000e+01
+1610 2352 4.16666666666667e+00
+1610 2353 4.16666666666667e+00
+1610 2357 -1.25000000000000e+01
+1610 2356 -4.16666666666667e+00
+1610 2355 8.33333333333333e+00
+1610 2293 4.16666666666667e+00
+1610 2290 -4.16666666666667e+00
+1610 2289 -4.16666666666667e+00
+1610 2292 -8.33333333333333e+00
+1611 1611 1.25000000000000e+02
+1611 1655 4.16666666666667e+00
+1611 1610 8.33333333333333e+00
+1611 1400 -8.33333333333333e+00
+1611 1399 4.16666666666667e+00
+1611 1609 8.33333333333333e+00
+1611 1608 -3.75000000000000e+01
+1611 1643 -4.16666666666667e+00
+1611 1642 8.33333333333333e+00
+1611 1641 -1.25000000000000e+01
+1611 1621 -4.16666666666667e+00
+1611 1669 -4.16666666666667e+00
+1611 1636 4.16666666666667e+00
+1611 1622 8.33333333333333e+00
+1611 1637 -8.33333333333333e+00
+1611 1319 4.16666666666667e+00
+1611 1670 -4.16666666666667e+00
+1611 1310 4.16666666666667e+00
+1611 1620 -1.25000000000000e+01
+1611 1394 -4.16666666666667e+00
+1611 1393 -4.16666666666667e+00
+1611 1397 4.16666666666667e+00
+1611 1607 -4.16666666666667e+00
+1611 1612 -1.66666666666667e+01
+1611 1396 4.16666666666667e+00
+1611 1402 -4.16666666666667e+00
+1611 1309 -8.33333333333333e+00
+1611 1606 8.33333333333333e+00
+1611 1605 -1.25000000000000e+01
+1611 1613 -1.66666666666667e+01
+1611 1625 8.33333333333333e+00
+1611 1403 8.33333333333333e+00
+1611 1624 8.33333333333333e+00
+1611 1318 -8.33333333333333e+00
+1611 1654 4.16666666666667e+00
+1611 1623 -3.75000000000000e+01
+1611 1401 -1.25000000000000e+01
+1612 1612 1.25000000000000e+02
+1612 1655 -8.33333333333333e+00
+1612 1610 -4.16666666666667e+00
+1612 1400 4.16666666666667e+00
+1612 1398 4.16666666666667e+00
+1612 1609 -1.25000000000000e+01
+1612 1608 8.33333333333333e+00
+1612 1643 8.33333333333333e+00
+1612 1642 -3.75000000000000e+01
+1612 1641 8.33333333333333e+00
+1612 1620 -4.16666666666667e+00
+1612 1668 -4.16666666666667e+00
+1612 1635 4.16666666666667e+00
+1612 1670 -4.16666666666667e+00
+1612 1637 4.16666666666667e+00
+1612 1613 -1.66666666666667e+01
+1612 1622 8.33333333333333e+00
+1612 1621 -1.25000000000000e+01
+1612 1392 -4.16666666666667e+00
+1612 1607 8.33333333333333e+00
+1612 1611 -1.66666666666667e+01
+1612 1397 -8.33333333333333e+00
+1612 1403 8.33333333333333e+00
+1612 1395 4.16666666666667e+00
+1612 1401 -4.16666666666667e+00
+1612 1310 4.16666666666667e+00
+1612 1394 -4.16666666666667e+00
+1612 1606 -3.75000000000000e+01
+1612 1308 -8.33333333333333e+00
+1612 1605 8.33333333333333e+00
+1612 1625 -4.16666666666667e+00
+1612 1319 4.16666666666667e+00
+1612 1653 4.16666666666667e+00
+1612 1624 -1.25000000000000e+01
+1612 1402 -1.25000000000000e+01
+1612 1623 8.33333333333333e+00
+1612 1317 -8.33333333333333e+00
+1613 1613 1.25000000000000e+02
+1613 1653 4.16666666666667e+00
+1613 1609 -4.16666666666667e+00
+1613 1399 4.16666666666667e+00
+1613 1608 8.33333333333333e+00
+1613 1398 -8.33333333333333e+00
+1613 1610 -1.25000000000000e+01
+1613 1643 -1.25000000000000e+01
+1613 1642 8.33333333333333e+00
+1613 1641 -4.16666666666667e+00
+1613 1669 -4.16666666666667e+00
+1613 1636 4.16666666666667e+00
+1613 1620 8.33333333333333e+00
+1613 1635 -8.33333333333333e+00
+1613 1317 4.16666666666667e+00
+1613 1668 -4.16666666666667e+00
+1613 1622 -3.75000000000000e+01
+1613 1612 -1.66666666666667e+01
+1613 1621 8.33333333333333e+00
+1613 1308 4.16666666666667e+00
+1613 1392 -4.16666666666667e+00
+1613 1606 8.33333333333333e+00
+1613 1395 4.16666666666667e+00
+1613 1605 -4.16666666666667e+00
+1613 1396 -8.33333333333333e+00
+1613 1402 8.33333333333333e+00
+1613 1607 -1.25000000000000e+01
+1613 1309 4.16666666666667e+00
+1613 1393 -4.16666666666667e+00
+1613 1654 -8.33333333333333e+00
+1613 1625 -1.25000000000000e+01
+1613 1403 -3.75000000000000e+01
+1613 1624 -4.16666666666667e+00
+1613 1318 4.16666666666667e+00
+1613 1611 -1.66666666666667e+01
+1613 1623 8.33333333333333e+00
+1613 1401 8.33333333333333e+00
+1614 1614 6.25000000000000e+01
+1614 1637 4.16666666666667e+00
+1614 1636 -8.33333333333333e+00
+1614 1607 4.16666666666667e+00
+1614 1606 -2.08333333333333e+00
+1614 1309 2.08333333333333e+00
+1614 1605 -6.25000000000000e+00
+1614 1634 4.16666666666667e+00
+1614 1360 2.08333333333333e+00
+1614 1632 -1.87500000000000e+01
+1614 1622 -4.16666666666667e+00
+1614 1616 -8.33333333333333e+00
+1614 1471 -2.08333333333333e+00
+1614 1841 -4.16666666666667e+00
+1614 1478 4.16666666666667e+00
+1614 1840 -4.16666666666667e+00
+1614 1477 4.16666666666667e+00
+1614 1472 4.16666666666667e+00
+1614 1361 -4.16666666666667e+00
+1614 1470 -6.25000000000000e+00
+1614 1469 4.16666666666667e+00
+1614 1310 -4.16666666666667e+00
+1614 1468 4.16666666666667e+00
+1614 1615 -8.33333333333333e+00
+1614 1621 8.33333333333333e+00
+1614 1467 -1.87500000000000e+01
+1614 1633 4.16666666666667e+00
+1614 1620 -1.25000000000000e+01
+1615 1615 6.25000000000000e+01
+1615 1632 4.16666666666667e+00
+1615 1637 4.16666666666667e+00
+1615 1635 -8.33333333333333e+00
+1615 1607 4.16666666666667e+00
+1615 1616 -8.33333333333333e+00
+1615 1606 -6.25000000000000e+00
+1615 1605 -2.08333333333333e+00
+1615 1308 2.08333333333333e+00
+1615 1633 -6.25000000000000e+00
+1615 1359 2.08333333333333e+00
+1615 1470 -2.08333333333333e+00
+1615 1472 4.16666666666667e+00
+1615 1622 8.33333333333333e+00
+1615 1478 -8.33333333333333e+00
+1615 1839 -4.16666666666667e+00
+1615 1476 4.16666666666667e+00
+1615 1361 2.08333333333333e+00
+1615 1841 -4.16666666666667e+00
+1615 1471 -6.25000000000000e+00
+1615 1469 -2.08333333333333e+00
+1615 1310 2.08333333333333e+00
+1615 1468 -6.25000000000000e+00
+1615 1634 -2.08333333333333e+00
+1615 1621 -3.75000000000000e+01
+1615 1467 4.16666666666667e+00
+1615 1614 -8.33333333333333e+00
+1615 1620 8.33333333333333e+00
+1616 1616 6.25000000000000e+01
+1616 1635 4.16666666666667e+00
+1616 1636 4.16666666666667e+00
+1616 1607 -1.87500000000000e+01
+1616 1606 4.16666666666667e+00
+1616 1615 -8.33333333333333e+00
+1616 1605 4.16666666666667e+00
+1616 1634 -6.25000000000000e+00
+1616 1632 4.16666666666667e+00
+1616 1620 -4.16666666666667e+00
+1616 1614 -8.33333333333333e+00
+1616 1471 4.16666666666667e+00
+1616 1839 -4.16666666666667e+00
+1616 1476 4.16666666666667e+00
+1616 1621 8.33333333333333e+00
+1616 1477 -8.33333333333333e+00
+1616 1472 -1.87500000000000e+01
+1616 1360 2.08333333333333e+00
+1616 1840 -4.16666666666667e+00
+1616 1470 4.16666666666667e+00
+1616 1359 -4.16666666666667e+00
+1616 1469 -6.25000000000000e+00
+1616 1633 -2.08333333333333e+00
+1616 1622 -1.25000000000000e+01
+1616 1468 -2.08333333333333e+00
+1616 1309 2.08333333333333e+00
+1616 1467 4.16666666666667e+00
+1616 1308 -4.16666666666667e+00
+1617 1617 1.25000000000000e+02
+1617 1609 -4.16666666666667e+00
+1617 1364 4.16666666666667e+00
+1617 1652 -4.16666666666667e+00
+1617 1651 8.33333333333333e+00
+1617 1618 -1.66666666666667e+01
+1617 1650 -1.25000000000000e+01
+1617 1310 4.16666666666667e+00
+1617 1608 -1.25000000000000e+01
+1617 1469 -4.16666666666667e+00
+1617 1468 8.33333333333333e+00
+1617 1309 4.16666666666667e+00
+1617 1467 -1.25000000000000e+01
+1617 1619 -1.66666666666667e+01
+1617 1475 8.33333333333333e+00
+1617 1474 -4.16666666666667e+00
+1617 1363 4.16666666666667e+00
+1617 1610 8.33333333333333e+00
+1617 1473 -1.25000000000000e+01
+1617 1655 4.16666666666667e+00
+1617 1654 -8.33333333333333e+00
+1617 1622 8.33333333333333e+00
+1617 1478 -8.33333333333333e+00
+1617 1846 -4.16666666666667e+00
+1617 1477 4.16666666666667e+00
+1617 1847 -4.16666666666667e+00
+1617 1621 8.33333333333333e+00
+1617 1620 -3.75000000000000e+01
+1617 2357 -8.33333333333333e+00
+1617 2356 4.16666666666667e+00
+1617 2354 -4.16666666666667e+00
+1617 2099 4.16666666666667e+00
+1617 2365 8.33333333333333e+00
+1617 2098 -8.33333333333333e+00
+1617 2353 -4.16666666666667e+00
+1617 2366 8.33333333333333e+00
+1617 2364 -3.75000000000000e+01
+1618 1618 1.25000000000000e+02
+1618 1652 8.33333333333333e+00
+1618 1651 -3.75000000000000e+01
+1618 1650 8.33333333333333e+00
+1618 1617 -1.66666666666667e+01
+1618 1610 8.33333333333333e+00
+1618 1609 -1.25000000000000e+01
+1618 1619 -1.66666666666667e+01
+1618 1467 8.33333333333333e+00
+1618 1310 -8.33333333333333e+00
+1618 1469 8.33333333333333e+00
+1618 1468 -3.75000000000000e+01
+1618 1308 4.16666666666667e+00
+1618 1475 8.33333333333333e+00
+1618 1364 -8.33333333333333e+00
+1618 1608 -4.16666666666667e+00
+1618 1474 -1.25000000000000e+01
+1618 1473 -4.16666666666667e+00
+1618 1362 4.16666666666667e+00
+1618 1655 4.16666666666667e+00
+1618 1653 -8.33333333333333e+00
+1618 1622 -4.16666666666667e+00
+1618 1847 -4.16666666666667e+00
+1618 1478 4.16666666666667e+00
+1618 1845 -4.16666666666667e+00
+1618 1476 4.16666666666667e+00
+1618 1621 -1.25000000000000e+01
+1618 1620 8.33333333333333e+00
+1618 2357 4.16666666666667e+00
+1618 2355 4.16666666666667e+00
+1618 2366 -4.16666666666667e+00
+1618 2354 -4.16666666666667e+00
+1618 2099 4.16666666666667e+00
+1618 2364 8.33333333333333e+00
+1618 2097 -8.33333333333333e+00
+1618 2352 -4.16666666666667e+00
+1618 2365 -1.25000000000000e+01
+1619 1619 1.25000000000000e+02
+1619 1652 -1.25000000000000e+01
+1619 1651 8.33333333333333e+00
+1619 1362 4.16666666666667e+00
+1619 1650 -4.16666666666667e+00
+1619 1610 -3.75000000000000e+01
+1619 1609 8.33333333333333e+00
+1619 1308 4.16666666666667e+00
+1619 1618 -1.66666666666667e+01
+1619 1467 -4.16666666666667e+00
+1619 1469 -1.25000000000000e+01
+1619 1309 -8.33333333333333e+00
+1619 1468 8.33333333333333e+00
+1619 1608 8.33333333333333e+00
+1619 1475 -3.75000000000000e+01
+1619 1474 8.33333333333333e+00
+1619 1363 -8.33333333333333e+00
+1619 1617 -1.66666666666667e+01
+1619 1473 8.33333333333333e+00
+1619 1654 4.16666666666667e+00
+1619 1653 4.16666666666667e+00
+1619 1621 -4.16666666666667e+00
+1619 1846 -4.16666666666667e+00
+1619 1477 4.16666666666667e+00
+1619 1620 8.33333333333333e+00
+1619 1476 -8.33333333333333e+00
+1619 1845 -4.16666666666667e+00
+1619 1622 -1.25000000000000e+01
+1619 2356 4.16666666666667e+00
+1619 2355 -8.33333333333333e+00
+1619 2365 -4.16666666666667e+00
+1619 2353 -4.16666666666667e+00
+1619 2098 4.16666666666667e+00
+1619 2352 -4.16666666666667e+00
+1619 2097 4.16666666666667e+00
+1619 2366 -1.25000000000000e+01
+1619 2364 8.33333333333333e+00
+1620 1620 1.25000000000000e+02
+1620 1654 8.33333333333333e+00
+1620 1610 -8.33333333333333e+00
+1620 1609 4.16666666666667e+00
+1620 1653 -1.25000000000000e+01
+1620 1619 8.33333333333333e+00
+1620 1846 4.16666666666667e+00
+1620 1618 8.33333333333333e+00
+1620 1617 -3.75000000000000e+01
+1620 1847 4.16666666666667e+00
+1620 1612 -4.16666666666667e+00
+1620 1613 8.33333333333333e+00
+1620 1622 -1.66666666666667e+01
+1620 1310 -4.16666666666667e+00
+1620 1611 -1.25000000000000e+01
+1620 1670 4.16666666666667e+00
+1620 1367 -4.16666666666667e+00
+1620 1669 -8.33333333333333e+00
+1620 1607 4.16666666666667e+00
+1620 1621 -1.66666666666667e+01
+1620 1636 8.33333333333333e+00
+1620 1606 4.16666666666667e+00
+1620 1309 -4.16666666666667e+00
+1620 1637 8.33333333333333e+00
+1620 1366 -4.16666666666667e+00
+1620 1635 -3.75000000000000e+01
+1620 1616 -4.16666666666667e+00
+1620 1469 4.16666666666667e+00
+1620 1840 4.16666666666667e+00
+1620 1477 -4.16666666666667e+00
+1620 1468 -8.33333333333333e+00
+1620 1615 8.33333333333333e+00
+1620 1614 -1.25000000000000e+01
+1620 1478 8.33333333333333e+00
+1620 1841 -8.33333333333333e+00
+1620 1476 -1.25000000000000e+01
+1620 1655 -4.16666666666667e+00
+1621 1621 1.25000000000000e+02
+1621 1653 8.33333333333333e+00
+1621 1608 4.16666666666667e+00
+1621 1655 8.33333333333333e+00
+1621 1654 -3.75000000000000e+01
+1621 1619 -4.16666666666667e+00
+1621 1845 4.16666666666667e+00
+1621 1618 -1.25000000000000e+01
+1621 1617 8.33333333333333e+00
+1621 1847 -8.33333333333333e+00
+1621 1611 -4.16666666666667e+00
+1621 1670 4.16666666666667e+00
+1621 1613 8.33333333333333e+00
+1621 1612 -1.25000000000000e+01
+1621 1668 -8.33333333333333e+00
+1621 1637 -4.16666666666667e+00
+1621 1620 -1.66666666666667e+01
+1621 1635 8.33333333333333e+00
+1621 1607 -8.33333333333333e+00
+1621 1605 4.16666666666667e+00
+1621 1308 -4.16666666666667e+00
+1621 1636 -1.25000000000000e+01
+1621 1365 -4.16666666666667e+00
+1621 1616 8.33333333333333e+00
+1621 1622 -1.66666666666667e+01
+1621 1478 8.33333333333333e+00
+1621 1839 4.16666666666667e+00
+1621 1476 -4.16666666666667e+00
+1621 1469 4.16666666666667e+00
+1621 1310 -4.16666666666667e+00
+1621 1615 -3.75000000000000e+01
+1621 1467 -8.33333333333333e+00
+1621 1614 8.33333333333333e+00
+1621 1841 4.16666666666667e+00
+1621 1367 -4.16666666666667e+00
+1621 1477 -1.25000000000000e+01
+1621 1610 4.16666666666667e+00
+1622 1622 1.25000000000000e+02
+1622 1653 -4.16666666666667e+00
+1622 1608 -8.33333333333333e+00
+1622 1655 -1.25000000000000e+01
+1622 1654 8.33333333333333e+00
+1622 1618 -4.16666666666667e+00
+1622 1617 8.33333333333333e+00
+1622 1619 -1.25000000000000e+01
+1622 1846 -8.33333333333333e+00
+1622 1845 4.16666666666667e+00
+1622 1669 4.16666666666667e+00
+1622 1611 8.33333333333333e+00
+1622 1620 -1.66666666666667e+01
+1622 1613 -3.75000000000000e+01
+1622 1612 8.33333333333333e+00
+1622 1308 -4.16666666666667e+00
+1622 1668 4.16666666666667e+00
+1622 1365 -4.16666666666667e+00
+1622 1605 4.16666666666667e+00
+1622 1636 -4.16666666666667e+00
+1622 1606 -8.33333333333333e+00
+1622 1637 -1.25000000000000e+01
+1622 1635 8.33333333333333e+00
+1622 1614 -4.16666666666667e+00
+1622 1467 4.16666666666667e+00
+1622 1615 8.33333333333333e+00
+1622 1621 -1.66666666666667e+01
+1622 1477 8.33333333333333e+00
+1622 1616 -1.25000000000000e+01
+1622 1468 4.16666666666667e+00
+1622 1309 -4.16666666666667e+00
+1622 1478 -3.75000000000000e+01
+1622 1609 4.16666666666667e+00
+1622 1840 4.16666666666667e+00
+1622 1366 -4.16666666666667e+00
+1622 1476 8.33333333333333e+00
+1622 1839 -8.33333333333333e+00
+1623 1623 1.25000000000000e+02
+1623 1661 4.16666666666667e+00
+1623 1660 -8.33333333333333e+00
+1623 1630 8.33333333333333e+00
+1623 1629 -3.75000000000000e+01
+1623 1556 4.16666666666667e+00
+1623 1555 4.16666666666667e+00
+1623 1559 8.33333333333333e+00
+1623 1558 -4.16666666666667e+00
+1623 1557 -1.25000000000000e+01
+1623 1625 -1.66666666666667e+01
+1623 1313 -4.16666666666667e+00
+1623 1319 -4.16666666666667e+00
+1623 1673 -4.16666666666667e+00
+1623 1670 4.16666666666667e+00
+1623 1640 -8.33333333333333e+00
+1623 1637 8.33333333333333e+00
+1623 1639 4.16666666666667e+00
+1623 1636 -4.16666666666667e+00
+1623 1635 -1.25000000000000e+01
+1623 1672 -4.16666666666667e+00
+1623 1669 4.16666666666667e+00
+1623 1397 -4.16666666666667e+00
+1623 1607 4.16666666666667e+00
+1623 1396 -4.16666666666667e+00
+1623 1402 4.16666666666667e+00
+1623 1606 -8.33333333333333e+00
+1623 1312 8.33333333333333e+00
+1623 1311 -1.25000000000000e+01
+1623 1613 8.33333333333333e+00
+1623 1403 -8.33333333333333e+00
+1623 1612 8.33333333333333e+00
+1623 1624 -1.66666666666667e+01
+1623 1318 8.33333333333333e+00
+1623 1611 -3.75000000000000e+01
+1623 1631 8.33333333333333e+00
+1623 1317 -1.25000000000000e+01
+1624 1624 1.25000000000000e+02
+1624 1631 -4.16666666666667e+00
+1624 1659 -8.33333333333333e+00
+1624 1630 -1.25000000000000e+01
+1624 1629 8.33333333333333e+00
+1624 1556 -8.33333333333333e+00
+1624 1554 4.16666666666667e+00
+1624 1559 8.33333333333333e+00
+1624 1558 -1.25000000000000e+01
+1624 1557 -4.16666666666667e+00
+1624 1673 -4.16666666666667e+00
+1624 1640 4.16666666666667e+00
+1624 1313 8.33333333333333e+00
+1624 1625 -1.66666666666667e+01
+1624 1637 8.33333333333333e+00
+1624 1636 -1.25000000000000e+01
+1624 1638 4.16666666666667e+00
+1624 1635 -4.16666666666667e+00
+1624 1319 8.33333333333333e+00
+1624 1670 -8.33333333333333e+00
+1624 1671 -4.16666666666667e+00
+1624 1668 4.16666666666667e+00
+1624 1395 -4.16666666666667e+00
+1624 1401 4.16666666666667e+00
+1624 1607 4.16666666666667e+00
+1624 1397 -4.16666666666667e+00
+1624 1312 -3.75000000000000e+01
+1624 1605 -8.33333333333333e+00
+1624 1311 8.33333333333333e+00
+1624 1613 -4.16666666666667e+00
+1624 1403 4.16666666666667e+00
+1624 1612 -1.25000000000000e+01
+1624 1661 4.16666666666667e+00
+1624 1318 -3.75000000000000e+01
+1624 1611 8.33333333333333e+00
+1624 1623 -1.66666666666667e+01
+1624 1317 8.33333333333333e+00
+1625 1625 1.25000000000000e+02
+1625 1630 -4.16666666666667e+00
+1625 1629 8.33333333333333e+00
+1625 1659 4.16666666666667e+00
+1625 1631 -1.25000000000000e+01
+1625 1554 4.16666666666667e+00
+1625 1555 -8.33333333333333e+00
+1625 1559 -3.75000000000000e+01
+1625 1558 8.33333333333333e+00
+1625 1557 8.33333333333333e+00
+1625 1623 -1.66666666666667e+01
+1625 1311 -4.16666666666667e+00
+1625 1317 -4.16666666666667e+00
+1625 1671 -4.16666666666667e+00
+1625 1668 4.16666666666667e+00
+1625 1672 -4.16666666666667e+00
+1625 1639 4.16666666666667e+00
+1625 1637 -3.75000000000000e+01
+1625 1312 8.33333333333333e+00
+1625 1624 -1.66666666666667e+01
+1625 1636 8.33333333333333e+00
+1625 1638 -8.33333333333333e+00
+1625 1635 8.33333333333333e+00
+1625 1318 8.33333333333333e+00
+1625 1669 -8.33333333333333e+00
+1625 1395 -4.16666666666667e+00
+1625 1605 4.16666666666667e+00
+1625 1313 -1.25000000000000e+01
+1625 1606 4.16666666666667e+00
+1625 1396 -4.16666666666667e+00
+1625 1613 -1.25000000000000e+01
+1625 1660 4.16666666666667e+00
+1625 1319 -1.25000000000000e+01
+1625 1612 -4.16666666666667e+00
+1625 1402 4.16666666666667e+00
+1625 1611 8.33333333333333e+00
+1625 1401 -8.33333333333333e+00
+1626 1626 6.25000000000000e+01
+1626 1631 -4.16666666666667e+00
+1626 1564 -2.08333333333333e+00
+1626 1555 2.08333333333333e+00
+1626 1565 4.16666666666667e+00
+1626 1330 4.16666666666667e+00
+1626 1735 -8.33333333333333e+00
+1626 1563 -6.25000000000000e+00
+1626 1556 -4.16666666666667e+00
+1626 1627 -8.33333333333333e+00
+1626 1630 8.33333333333333e+00
+1626 1312 4.16666666666667e+00
+1626 1629 -1.25000000000000e+01
+1626 1745 -4.16666666666667e+00
+1626 1640 4.16666666666667e+00
+1626 1331 4.16666666666667e+00
+1626 1484 -4.16666666666667e+00
+1626 1483 2.08333333333333e+00
+1626 1744 -4.16666666666667e+00
+1626 1329 -1.87500000000000e+01
+1626 1628 -8.33333333333333e+00
+1626 1481 4.16666666666667e+00
+1626 1313 4.16666666666667e+00
+1626 1480 -2.08333333333333e+00
+1626 1639 4.16666666666667e+00
+1626 1736 4.16666666666667e+00
+1626 1479 -6.25000000000000e+00
+1626 1311 -1.87500000000000e+01
+1627 1627 6.25000000000000e+01
+1627 1565 4.16666666666667e+00
+1627 1631 8.33333333333333e+00
+1627 1563 -2.08333333333333e+00
+1627 1554 2.08333333333333e+00
+1627 1331 -2.08333333333333e+00
+1627 1736 4.16666666666667e+00
+1627 1564 -6.25000000000000e+00
+1627 1329 4.16666666666667e+00
+1627 1734 -8.33333333333333e+00
+1627 1556 2.08333333333333e+00
+1627 1313 -2.08333333333333e+00
+1627 1630 -3.75000000000000e+01
+1627 1626 -8.33333333333333e+00
+1627 1629 8.33333333333333e+00
+1627 1311 4.16666666666667e+00
+1627 1484 2.08333333333333e+00
+1627 1745 -4.16666666666667e+00
+1627 1330 -6.25000000000000e+00
+1627 1482 2.08333333333333e+00
+1627 1743 -4.16666666666667e+00
+1627 1481 4.16666666666667e+00
+1627 1640 -8.33333333333333e+00
+1627 1628 -8.33333333333333e+00
+1627 1480 -6.25000000000000e+00
+1627 1312 -6.25000000000000e+00
+1627 1479 -2.08333333333333e+00
+1627 1638 4.16666666666667e+00
+1628 1628 6.25000000000000e+01
+1628 1629 -4.16666666666667e+00
+1628 1627 -8.33333333333333e+00
+1628 1564 4.16666666666667e+00
+1628 1630 8.33333333333333e+00
+1628 1565 -1.87500000000000e+01
+1628 1330 -2.08333333333333e+00
+1628 1735 4.16666666666667e+00
+1628 1563 4.16666666666667e+00
+1628 1631 -1.25000000000000e+01
+1628 1555 2.08333333333333e+00
+1628 1312 -2.08333333333333e+00
+1628 1554 -4.16666666666667e+00
+1628 1483 2.08333333333333e+00
+1628 1744 -4.16666666666667e+00
+1628 1743 -4.16666666666667e+00
+1628 1638 4.16666666666667e+00
+1628 1331 -6.25000000000000e+00
+1628 1329 4.16666666666667e+00
+1628 1482 -4.16666666666667e+00
+1628 1734 4.16666666666667e+00
+1628 1481 -1.87500000000000e+01
+1628 1313 -6.25000000000000e+00
+1628 1480 4.16666666666667e+00
+1628 1639 -8.33333333333333e+00
+1628 1626 -8.33333333333333e+00
+1628 1479 4.16666666666667e+00
+1628 1311 4.16666666666667e+00
+1629 1629 1.25000000000000e+02
+1629 1672 4.16666666666667e+00
+1629 1777 -4.16666666666667e+00
+1629 1640 8.33333333333333e+00
+1629 1745 -8.33333333333333e+00
+1629 1639 -4.16666666666667e+00
+1629 1744 4.16666666666667e+00
+1629 1778 -4.16666666666667e+00
+1629 1638 -1.25000000000000e+01
+1629 1565 4.16666666666667e+00
+1629 1628 -4.16666666666667e+00
+1629 1564 4.16666666666667e+00
+1629 1736 8.33333333333333e+00
+1629 1631 -1.66666666666667e+01
+1629 1735 8.33333333333333e+00
+1629 1734 -3.75000000000000e+01
+1629 1627 8.33333333333333e+00
+1629 1626 -1.25000000000000e+01
+1629 1630 -1.66666666666667e+01
+1629 1567 -4.16666666666667e+00
+1629 1568 8.33333333333333e+00
+1629 1559 -8.33333333333333e+00
+1629 1625 8.33333333333333e+00
+1629 1555 -4.16666666666667e+00
+1629 1558 4.16666666666667e+00
+1629 1337 4.16666666666667e+00
+1629 1661 -4.16666666666667e+00
+1629 1336 -8.33333333333333e+00
+1629 1660 8.33333333333333e+00
+1629 1566 -1.25000000000000e+01
+1629 1659 -1.25000000000000e+01
+1629 1556 -4.16666666666667e+00
+1629 1313 4.16666666666667e+00
+1629 1624 8.33333333333333e+00
+1629 1312 -8.33333333333333e+00
+1629 1673 4.16666666666667e+00
+1629 1623 -3.75000000000000e+01
+1630 1630 1.25000000000000e+02
+1630 1671 4.16666666666667e+00
+1630 1776 -4.16666666666667e+00
+1630 1778 -4.16666666666667e+00
+1630 1745 4.16666666666667e+00
+1630 1638 -4.16666666666667e+00
+1630 1743 4.16666666666667e+00
+1630 1640 8.33333333333333e+00
+1630 1639 -1.25000000000000e+01
+1630 1628 8.33333333333333e+00
+1630 1565 -8.33333333333333e+00
+1630 1563 4.16666666666667e+00
+1630 1736 -4.16666666666667e+00
+1630 1337 4.16666666666667e+00
+1630 1735 -1.25000000000000e+01
+1630 1734 8.33333333333333e+00
+1630 1313 4.16666666666667e+00
+1630 1627 -3.75000000000000e+01
+1630 1626 8.33333333333333e+00
+1630 1625 -4.16666666666667e+00
+1630 1629 -1.66666666666667e+01
+1630 1566 -4.16666666666667e+00
+1630 1559 4.16666666666667e+00
+1630 1556 -4.16666666666667e+00
+1630 1554 -4.16666666666667e+00
+1630 1557 4.16666666666667e+00
+1630 1568 8.33333333333333e+00
+1630 1661 8.33333333333333e+00
+1630 1631 -1.66666666666667e+01
+1630 1567 -1.25000000000000e+01
+1630 1660 -3.75000000000000e+01
+1630 1335 -8.33333333333333e+00
+1630 1659 8.33333333333333e+00
+1630 1673 -8.33333333333333e+00
+1630 1624 -1.25000000000000e+01
+1630 1623 8.33333333333333e+00
+1630 1311 -8.33333333333333e+00
+1631 1631 1.25000000000000e+02
+1631 1672 -8.33333333333333e+00
+1631 1777 -4.16666666666667e+00
+1631 1744 4.16666666666667e+00
+1631 1638 8.33333333333333e+00
+1631 1743 -8.33333333333333e+00
+1631 1776 -4.16666666666667e+00
+1631 1640 -3.75000000000000e+01
+1631 1639 8.33333333333333e+00
+1631 1563 4.16666666666667e+00
+1631 1626 -4.16666666666667e+00
+1631 1627 8.33333333333333e+00
+1631 1564 -8.33333333333333e+00
+1631 1736 -1.25000000000000e+01
+1631 1735 -4.16666666666667e+00
+1631 1336 4.16666666666667e+00
+1631 1734 8.33333333333333e+00
+1631 1629 -1.66666666666667e+01
+1631 1628 -1.25000000000000e+01
+1631 1312 4.16666666666667e+00
+1631 1624 -4.16666666666667e+00
+1631 1558 4.16666666666667e+00
+1631 1555 -4.16666666666667e+00
+1631 1566 8.33333333333333e+00
+1631 1557 -8.33333333333333e+00
+1631 1623 8.33333333333333e+00
+1631 1568 -3.75000000000000e+01
+1631 1661 -1.25000000000000e+01
+1631 1567 8.33333333333333e+00
+1631 1660 8.33333333333333e+00
+1631 1630 -1.66666666666667e+01
+1631 1335 4.16666666666667e+00
+1631 1659 -4.16666666666667e+00
+1631 1671 4.16666666666667e+00
+1631 1625 -1.25000000000000e+01
+1631 1554 -4.16666666666667e+00
+1631 1311 4.16666666666667e+00
+1632 1632 6.25000000000000e+01
+1632 1633 -8.33333333333333e+00
+1632 1607 -4.16666666666667e+00
+1632 1312 -2.08333333333333e+00
+1632 1606 2.08333333333333e+00
+1632 1616 4.16666666666667e+00
+1632 1360 -2.08333333333333e+00
+1632 1614 -1.87500000000000e+01
+1632 1840 4.16666666666667e+00
+1632 1637 -4.16666666666667e+00
+1632 1636 8.33333333333333e+00
+1632 1635 -1.25000000000000e+01
+1632 1841 4.16666666666667e+00
+1632 1640 4.16666666666667e+00
+1632 1844 -4.16666666666667e+00
+1632 1486 2.08333333333333e+00
+1632 1843 -4.16666666666667e+00
+1632 1361 4.16666666666667e+00
+1632 1487 -4.16666666666667e+00
+1632 1359 -6.25000000000000e+00
+1632 1634 -8.33333333333333e+00
+1632 1481 4.16666666666667e+00
+1632 1313 4.16666666666667e+00
+1632 1480 4.16666666666667e+00
+1632 1639 -8.33333333333333e+00
+1632 1615 4.16666666666667e+00
+1632 1479 -1.87500000000000e+01
+1632 1311 -6.25000000000000e+00
+1633 1633 6.25000000000000e+01
+1633 1607 2.08333333333333e+00
+1633 1614 4.16666666666667e+00
+1633 1632 -8.33333333333333e+00
+1633 1311 -2.08333333333333e+00
+1633 1605 2.08333333333333e+00
+1633 1615 -6.25000000000000e+00
+1633 1359 -2.08333333333333e+00
+1633 1839 4.16666666666667e+00
+1633 1313 4.16666666666667e+00
+1633 1634 -8.33333333333333e+00
+1633 1637 8.33333333333333e+00
+1633 1636 -3.75000000000000e+01
+1633 1635 8.33333333333333e+00
+1633 1361 4.16666666666667e+00
+1633 1841 -8.33333333333333e+00
+1633 1485 2.08333333333333e+00
+1633 1842 -4.16666666666667e+00
+1633 1487 2.08333333333333e+00
+1633 1844 -4.16666666666667e+00
+1633 1360 -6.25000000000000e+00
+1633 1481 -2.08333333333333e+00
+1633 1640 4.16666666666667e+00
+1633 1616 -2.08333333333333e+00
+1633 1480 -6.25000000000000e+00
+1633 1312 -6.25000000000000e+00
+1633 1479 4.16666666666667e+00
+1633 1638 -8.33333333333333e+00
+1634 1634 6.25000000000000e+01
+1634 1606 2.08333333333333e+00
+1634 1605 -4.16666666666667e+00
+1634 1616 -6.25000000000000e+00
+1634 1614 4.16666666666667e+00
+1634 1637 -1.25000000000000e+01
+1634 1312 4.16666666666667e+00
+1634 1633 -8.33333333333333e+00
+1634 1636 8.33333333333333e+00
+1634 1635 -4.16666666666667e+00
+1634 1360 4.16666666666667e+00
+1634 1840 -8.33333333333333e+00
+1634 1839 4.16666666666667e+00
+1634 1638 4.16666666666667e+00
+1634 1842 -4.16666666666667e+00
+1634 1361 -1.87500000000000e+01
+1634 1486 2.08333333333333e+00
+1634 1843 -4.16666666666667e+00
+1634 1359 4.16666666666667e+00
+1634 1485 -4.16666666666667e+00
+1634 1615 -2.08333333333333e+00
+1634 1481 -6.25000000000000e+00
+1634 1313 -1.87500000000000e+01
+1634 1480 -2.08333333333333e+00
+1634 1639 4.16666666666667e+00
+1634 1632 -8.33333333333333e+00
+1634 1479 4.16666666666667e+00
+1634 1311 4.16666666666667e+00
+1635 1635 1.25000000000000e+02
+1635 1613 -8.33333333333333e+00
+1635 1616 4.16666666666667e+00
+1635 1607 -4.16666666666667e+00
+1635 1615 -8.33333333333333e+00
+1635 1621 8.33333333333333e+00
+1635 1606 -4.16666666666667e+00
+1635 1622 8.33333333333333e+00
+1635 1620 -3.75000000000000e+01
+1635 1843 4.16666666666667e+00
+1635 1840 -4.16666666666667e+00
+1635 1844 -8.33333333333333e+00
+1635 1841 8.33333333333333e+00
+1635 1313 4.16666666666667e+00
+1635 1634 -4.16666666666667e+00
+1635 1633 8.33333333333333e+00
+1635 1636 -1.66666666666667e+01
+1635 1632 -1.25000000000000e+01
+1635 1367 4.16666666666667e+00
+1635 1839 -1.25000000000000e+01
+1635 1670 -4.16666666666667e+00
+1635 1673 4.16666666666667e+00
+1635 1853 -4.16666666666667e+00
+1635 1639 8.33333333333333e+00
+1635 1672 -8.33333333333333e+00
+1635 1669 8.33333333333333e+00
+1635 1640 8.33333333333333e+00
+1635 1625 8.33333333333333e+00
+1635 1637 -1.66666666666667e+01
+1635 1312 4.16666666666667e+00
+1635 1624 -4.16666666666667e+00
+1635 1638 -3.75000000000000e+01
+1635 1623 -1.25000000000000e+01
+1635 1852 -4.16666666666667e+00
+1635 1366 4.16666666666667e+00
+1635 1612 4.16666666666667e+00
+1635 1668 -1.25000000000000e+01
+1636 1636 1.25000000000000e+02
+1636 1613 4.16666666666667e+00
+1636 1607 -4.16666666666667e+00
+1636 1616 4.16666666666667e+00
+1636 1622 -4.16666666666667e+00
+1636 1614 -8.33333333333333e+00
+1636 1620 8.33333333333333e+00
+1636 1605 -4.16666666666667e+00
+1636 1621 -1.25000000000000e+01
+1636 1842 4.16666666666667e+00
+1636 1839 -4.16666666666667e+00
+1636 1844 4.16666666666667e+00
+1636 1634 8.33333333333333e+00
+1636 1633 -3.75000000000000e+01
+1636 1632 8.33333333333333e+00
+1636 1635 -1.66666666666667e+01
+1636 1841 8.33333333333333e+00
+1636 1840 -1.25000000000000e+01
+1636 1637 -1.66666666666667e+01
+1636 1640 -4.16666666666667e+00
+1636 1638 8.33333333333333e+00
+1636 1673 4.16666666666667e+00
+1636 1853 -4.16666666666667e+00
+1636 1671 -8.33333333333333e+00
+1636 1668 8.33333333333333e+00
+1636 1313 -8.33333333333333e+00
+1636 1625 8.33333333333333e+00
+1636 1639 -1.25000000000000e+01
+1636 1624 -1.25000000000000e+01
+1636 1311 4.16666666666667e+00
+1636 1623 -4.16666666666667e+00
+1636 1670 8.33333333333333e+00
+1636 1367 -8.33333333333333e+00
+1636 1611 4.16666666666667e+00
+1636 1669 -3.75000000000000e+01
+1636 1851 -4.16666666666667e+00
+1636 1365 4.16666666666667e+00
+1637 1637 1.25000000000000e+02
+1637 1611 -8.33333333333333e+00
+1637 1606 -4.16666666666667e+00
+1637 1614 4.16666666666667e+00
+1637 1605 -4.16666666666667e+00
+1637 1615 4.16666666666667e+00
+1637 1621 -4.16666666666667e+00
+1637 1622 -1.25000000000000e+01
+1637 1620 8.33333333333333e+00
+1637 1843 4.16666666666667e+00
+1637 1842 -8.33333333333333e+00
+1637 1839 8.33333333333333e+00
+1637 1634 -1.25000000000000e+01
+1637 1633 8.33333333333333e+00
+1637 1311 4.16666666666667e+00
+1637 1632 -4.16666666666667e+00
+1637 1841 -3.75000000000000e+01
+1637 1840 8.33333333333333e+00
+1637 1365 4.16666666666667e+00
+1637 1636 -1.66666666666667e+01
+1637 1668 -4.16666666666667e+00
+1637 1639 -4.16666666666667e+00
+1637 1671 4.16666666666667e+00
+1637 1851 -4.16666666666667e+00
+1637 1672 4.16666666666667e+00
+1637 1852 -4.16666666666667e+00
+1637 1640 -1.25000000000000e+01
+1637 1625 -3.75000000000000e+01
+1637 1312 -8.33333333333333e+00
+1637 1624 8.33333333333333e+00
+1637 1638 8.33333333333333e+00
+1637 1623 8.33333333333333e+00
+1637 1635 -1.66666666666667e+01
+1637 1612 4.16666666666667e+00
+1637 1670 -1.25000000000000e+01
+1637 1669 8.33333333333333e+00
+1637 1366 -8.33333333333333e+00
+1638 1638 1.25000000000000e+02
+1638 1630 -4.16666666666667e+00
+1638 1778 4.16666666666667e+00
+1638 1777 -8.33333333333333e+00
+1638 1629 -1.25000000000000e+01
+1638 1628 4.16666666666667e+00
+1638 1744 8.33333333333333e+00
+1638 1745 8.33333333333333e+00
+1638 1743 -3.75000000000000e+01
+1638 1627 4.16666666666667e+00
+1638 1640 -1.66666666666667e+01
+1638 1313 -4.16666666666667e+00
+1638 1373 -4.16666666666667e+00
+1638 1673 -4.16666666666667e+00
+1638 1853 4.16666666666667e+00
+1638 1672 8.33333333333333e+00
+1638 1639 -1.66666666666667e+01
+1638 1636 8.33333333333333e+00
+1638 1625 -8.33333333333333e+00
+1638 1637 8.33333333333333e+00
+1638 1312 -4.16666666666667e+00
+1638 1624 4.16666666666667e+00
+1638 1635 -3.75000000000000e+01
+1638 1372 -4.16666666666667e+00
+1638 1852 4.16666666666667e+00
+1638 1671 -1.25000000000000e+01
+1638 1481 -4.16666666666667e+00
+1638 1634 4.16666666666667e+00
+1638 1492 4.16666666666667e+00
+1638 1843 -4.16666666666667e+00
+1638 1633 -8.33333333333333e+00
+1638 1480 8.33333333333333e+00
+1638 1479 -1.25000000000000e+01
+1638 1844 8.33333333333333e+00
+1638 1493 -8.33333333333333e+00
+1638 1842 -1.25000000000000e+01
+1638 1631 8.33333333333333e+00
+1639 1639 1.25000000000000e+02
+1639 1629 -4.16666666666667e+00
+1639 1776 -8.33333333333333e+00
+1639 1631 8.33333333333333e+00
+1639 1630 -1.25000000000000e+01
+1639 1745 -4.16666666666667e+00
+1639 1743 8.33333333333333e+00
+1639 1744 -1.25000000000000e+01
+1639 1628 -8.33333333333333e+00
+1639 1626 4.16666666666667e+00
+1639 1625 4.16666666666667e+00
+1639 1637 -4.16666666666667e+00
+1639 1671 8.33333333333333e+00
+1639 1638 -1.66666666666667e+01
+1639 1635 8.33333333333333e+00
+1639 1636 -1.25000000000000e+01
+1639 1311 -4.16666666666667e+00
+1639 1623 4.16666666666667e+00
+1639 1673 8.33333333333333e+00
+1639 1853 -8.33333333333333e+00
+1639 1672 -3.75000000000000e+01
+1639 1371 -4.16666666666667e+00
+1639 1851 4.16666666666667e+00
+1639 1481 8.33333333333333e+00
+1639 1640 -1.66666666666667e+01
+1639 1844 8.33333333333333e+00
+1639 1491 4.16666666666667e+00
+1639 1842 -4.16666666666667e+00
+1639 1634 4.16666666666667e+00
+1639 1313 -4.16666666666667e+00
+1639 1480 -3.75000000000000e+01
+1639 1632 -8.33333333333333e+00
+1639 1479 8.33333333333333e+00
+1639 1493 4.16666666666667e+00
+1639 1373 -4.16666666666667e+00
+1639 1843 -1.25000000000000e+01
+1639 1778 4.16666666666667e+00
+1640 1640 1.25000000000000e+02
+1640 1629 8.33333333333333e+00
+1640 1776 4.16666666666667e+00
+1640 1631 -3.75000000000000e+01
+1640 1630 8.33333333333333e+00
+1640 1744 -4.16666666666667e+00
+1640 1626 4.16666666666667e+00
+1640 1745 -1.25000000000000e+01
+1640 1743 8.33333333333333e+00
+1640 1627 -8.33333333333333e+00
+1640 1638 -1.66666666666667e+01
+1640 1311 -4.16666666666667e+00
+1640 1371 -4.16666666666667e+00
+1640 1624 4.16666666666667e+00
+1640 1636 -4.16666666666667e+00
+1640 1671 -4.16666666666667e+00
+1640 1851 4.16666666666667e+00
+1640 1637 -1.25000000000000e+01
+1640 1623 -8.33333333333333e+00
+1640 1635 8.33333333333333e+00
+1640 1673 -1.25000000000000e+01
+1640 1672 8.33333333333333e+00
+1640 1852 -8.33333333333333e+00
+1640 1479 -4.16666666666667e+00
+1640 1632 4.16666666666667e+00
+1640 1480 8.33333333333333e+00
+1640 1639 -1.66666666666667e+01
+1640 1843 8.33333333333333e+00
+1640 1481 -1.25000000000000e+01
+1640 1633 4.16666666666667e+00
+1640 1312 -4.16666666666667e+00
+1640 1844 -3.75000000000000e+01
+1640 1777 4.16666666666667e+00
+1640 1492 4.16666666666667e+00
+1640 1372 -4.16666666666667e+00
+1640 1842 8.33333333333333e+00
+1640 1491 -8.33333333333333e+00
+1641 1641 1.25000000000000e+02
+1641 1649 -4.16666666666667e+00
+1641 1663 -8.33333333333333e+00
+1641 1648 8.33333333333333e+00
+1641 1647 -1.25000000000000e+01
+1641 1574 -8.33333333333333e+00
+1641 1573 4.16666666666667e+00
+1641 1577 8.33333333333333e+00
+1641 1576 -4.16666666666667e+00
+1641 1575 -1.25000000000000e+01
+1641 1676 -4.16666666666667e+00
+1641 1658 4.16666666666667e+00
+1641 1316 8.33333333333333e+00
+1641 1643 -1.66666666666667e+01
+1641 1655 8.33333333333333e+00
+1641 1657 4.16666666666667e+00
+1641 1654 -4.16666666666667e+00
+1641 1653 -1.25000000000000e+01
+1641 1319 8.33333333333333e+00
+1641 1670 -8.33333333333333e+00
+1641 1675 -4.16666666666667e+00
+1641 1669 4.16666666666667e+00
+1641 1399 -4.16666666666667e+00
+1641 1402 4.16666666666667e+00
+1641 1610 4.16666666666667e+00
+1641 1400 -4.16666666666667e+00
+1641 1315 8.33333333333333e+00
+1641 1609 -8.33333333333333e+00
+1641 1314 -3.75000000000000e+01
+1641 1613 -4.16666666666667e+00
+1641 1403 4.16666666666667e+00
+1641 1642 -1.66666666666667e+01
+1641 1612 8.33333333333333e+00
+1641 1318 8.33333333333333e+00
+1641 1664 4.16666666666667e+00
+1641 1611 -1.25000000000000e+01
+1641 1317 -3.75000000000000e+01
+1642 1642 1.25000000000000e+02
+1642 1664 4.16666666666667e+00
+1642 1662 -8.33333333333333e+00
+1642 1648 -3.75000000000000e+01
+1642 1647 8.33333333333333e+00
+1642 1574 4.16666666666667e+00
+1642 1572 4.16666666666667e+00
+1642 1577 8.33333333333333e+00
+1642 1576 -1.25000000000000e+01
+1642 1575 -4.16666666666667e+00
+1642 1643 -1.66666666666667e+01
+1642 1319 -4.16666666666667e+00
+1642 1316 -4.16666666666667e+00
+1642 1670 4.16666666666667e+00
+1642 1676 -4.16666666666667e+00
+1642 1658 -8.33333333333333e+00
+1642 1655 8.33333333333333e+00
+1642 1654 -1.25000000000000e+01
+1642 1656 4.16666666666667e+00
+1642 1653 -4.16666666666667e+00
+1642 1674 -4.16666666666667e+00
+1642 1668 4.16666666666667e+00
+1642 1610 4.16666666666667e+00
+1642 1400 -4.16666666666667e+00
+1642 1398 -4.16666666666667e+00
+1642 1401 4.16666666666667e+00
+1642 1315 -1.25000000000000e+01
+1642 1314 8.33333333333333e+00
+1642 1608 -8.33333333333333e+00
+1642 1613 8.33333333333333e+00
+1642 1403 -8.33333333333333e+00
+1642 1649 8.33333333333333e+00
+1642 1612 -3.75000000000000e+01
+1642 1318 -1.25000000000000e+01
+1642 1641 -1.66666666666667e+01
+1642 1611 8.33333333333333e+00
+1642 1317 8.33333333333333e+00
+1643 1643 1.25000000000000e+02
+1643 1647 -4.16666666666667e+00
+1643 1648 8.33333333333333e+00
+1643 1663 4.16666666666667e+00
+1643 1649 -1.25000000000000e+01
+1643 1573 4.16666666666667e+00
+1643 1572 -8.33333333333333e+00
+1643 1577 -3.75000000000000e+01
+1643 1576 8.33333333333333e+00
+1643 1575 8.33333333333333e+00
+1643 1642 -1.66666666666667e+01
+1643 1318 -4.16666666666667e+00
+1643 1315 -4.16666666666667e+00
+1643 1669 4.16666666666667e+00
+1643 1675 -4.16666666666667e+00
+1643 1674 -4.16666666666667e+00
+1643 1656 4.16666666666667e+00
+1643 1655 -3.75000000000000e+01
+1643 1657 -8.33333333333333e+00
+1643 1654 8.33333333333333e+00
+1643 1314 8.33333333333333e+00
+1643 1641 -1.66666666666667e+01
+1643 1653 8.33333333333333e+00
+1643 1317 8.33333333333333e+00
+1643 1668 -8.33333333333333e+00
+1643 1609 4.16666666666667e+00
+1643 1399 -4.16666666666667e+00
+1643 1316 -1.25000000000000e+01
+1643 1608 4.16666666666667e+00
+1643 1398 -4.16666666666667e+00
+1643 1662 4.16666666666667e+00
+1643 1613 -1.25000000000000e+01
+1643 1319 -1.25000000000000e+01
+1643 1612 8.33333333333333e+00
+1643 1402 -8.33333333333333e+00
+1643 1611 -4.16666666666667e+00
+1643 1401 4.16666666666667e+00
+1644 1644 1.25000000000000e+02
+1644 1583 8.33333333333333e+00
+1644 1582 -4.16666666666667e+00
+1644 1581 -1.25000000000000e+01
+1644 1573 4.16666666666667e+00
+1644 1646 -1.66666666666667e+01
+1644 1505 8.33333333333333e+00
+1644 1507 4.16666666666667e+00
+1644 1504 -4.16666666666667e+00
+1644 1316 -4.16666666666667e+00
+1644 1315 8.33333333333333e+00
+1644 1314 -1.25000000000000e+01
+1644 1503 -1.25000000000000e+01
+1644 1346 -4.16666666666667e+00
+1644 1508 4.16666666666667e+00
+1644 1645 -1.66666666666667e+01
+1644 1345 8.33333333333333e+00
+1644 1574 4.16666666666667e+00
+1644 1344 -1.25000000000000e+01
+1644 1649 8.33333333333333e+00
+1644 1811 4.16666666666667e+00
+1644 1810 -8.33333333333333e+00
+1644 1648 8.33333333333333e+00
+1644 1647 -3.75000000000000e+01
+1644 1814 -4.16666666666667e+00
+1644 1813 -4.16666666666667e+00
+1644 1658 -8.33333333333333e+00
+1644 1657 4.16666666666667e+00
+1644 2329 4.16666666666667e+00
+1644 2320 -4.16666666666667e+00
+1644 2321 -4.16666666666667e+00
+1644 2330 -8.33333333333333e+00
+1644 2393 8.33333333333333e+00
+1644 2387 4.16666666666667e+00
+1644 2386 -8.33333333333333e+00
+1644 2392 8.33333333333333e+00
+1644 2391 -3.75000000000000e+01
+1645 1645 1.25000000000000e+02
+1645 1582 -1.25000000000000e+01
+1645 1581 -4.16666666666667e+00
+1645 1574 -8.33333333333333e+00
+1645 1572 4.16666666666667e+00
+1645 1506 4.16666666666667e+00
+1645 1503 -4.16666666666667e+00
+1645 1316 8.33333333333333e+00
+1645 1646 -1.66666666666667e+01
+1645 1505 8.33333333333333e+00
+1645 1315 -3.75000000000000e+01
+1645 1504 -1.25000000000000e+01
+1645 1314 8.33333333333333e+00
+1645 1346 8.33333333333333e+00
+1645 1508 -8.33333333333333e+00
+1645 1583 8.33333333333333e+00
+1645 1345 -3.75000000000000e+01
+1645 1644 -1.66666666666667e+01
+1645 1344 8.33333333333333e+00
+1645 1649 -4.16666666666667e+00
+1645 1809 -8.33333333333333e+00
+1645 1648 -1.25000000000000e+01
+1645 1647 8.33333333333333e+00
+1645 1814 -4.16666666666667e+00
+1645 1658 4.16666666666667e+00
+1645 1812 -4.16666666666667e+00
+1645 1811 4.16666666666667e+00
+1645 1656 4.16666666666667e+00
+1645 2328 4.16666666666667e+00
+1645 2319 -4.16666666666667e+00
+1645 2330 4.16666666666667e+00
+1645 2321 -4.16666666666667e+00
+1645 2393 -4.16666666666667e+00
+1645 2387 4.16666666666667e+00
+1645 2385 -8.33333333333333e+00
+1645 2392 -1.25000000000000e+01
+1645 2391 8.33333333333333e+00
+1646 1646 1.25000000000000e+02
+1646 1583 -3.75000000000000e+01
+1646 1582 8.33333333333333e+00
+1646 1581 8.33333333333333e+00
+1646 1573 -8.33333333333333e+00
+1646 1644 -1.66666666666667e+01
+1646 1503 8.33333333333333e+00
+1646 1316 -1.25000000000000e+01
+1646 1505 -3.75000000000000e+01
+1646 1315 8.33333333333333e+00
+1646 1645 -1.66666666666667e+01
+1646 1504 8.33333333333333e+00
+1646 1314 -4.16666666666667e+00
+1646 1572 4.16666666666667e+00
+1646 1346 -1.25000000000000e+01
+1646 1345 8.33333333333333e+00
+1646 1507 -8.33333333333333e+00
+1646 1344 -4.16666666666667e+00
+1646 1506 4.16666666666667e+00
+1646 1648 -4.16666666666667e+00
+1646 1647 8.33333333333333e+00
+1646 1809 4.16666666666667e+00
+1646 1649 -1.25000000000000e+01
+1646 1812 -4.16666666666667e+00
+1646 1813 -4.16666666666667e+00
+1646 1657 4.16666666666667e+00
+1646 1810 4.16666666666667e+00
+1646 1656 -8.33333333333333e+00
+1646 2319 -4.16666666666667e+00
+1646 2329 4.16666666666667e+00
+1646 2328 -8.33333333333333e+00
+1646 2320 -4.16666666666667e+00
+1646 2392 -4.16666666666667e+00
+1646 2386 4.16666666666667e+00
+1646 2391 8.33333333333333e+00
+1646 2385 4.16666666666667e+00
+1646 2393 -1.25000000000000e+01
+1647 1647 1.25000000000000e+02
+1647 1675 4.16666666666667e+00
+1647 1819 -4.16666666666667e+00
+1647 1814 4.16666666666667e+00
+1647 1820 -4.16666666666667e+00
+1647 1813 4.16666666666667e+00
+1647 1657 -4.16666666666667e+00
+1647 1658 8.33333333333333e+00
+1647 1656 -1.25000000000000e+01
+1647 1583 -8.33333333333333e+00
+1647 1646 8.33333333333333e+00
+1647 1582 4.16666666666667e+00
+1647 1349 4.16666666666667e+00
+1647 1811 -4.16666666666667e+00
+1647 1810 8.33333333333333e+00
+1647 1809 -1.25000000000000e+01
+1647 1316 4.16666666666667e+00
+1647 1645 8.33333333333333e+00
+1647 1644 -3.75000000000000e+01
+1647 1643 -4.16666666666667e+00
+1647 1648 -1.66666666666667e+01
+1647 1585 -4.16666666666667e+00
+1647 1577 4.16666666666667e+00
+1647 1574 -4.16666666666667e+00
+1647 1576 4.16666666666667e+00
+1647 1573 -4.16666666666667e+00
+1647 1586 8.33333333333333e+00
+1647 1664 8.33333333333333e+00
+1647 1649 -1.66666666666667e+01
+1647 1348 -8.33333333333333e+00
+1647 1663 8.33333333333333e+00
+1647 1584 -1.25000000000000e+01
+1647 1662 -3.75000000000000e+01
+1647 1642 8.33333333333333e+00
+1647 1315 -8.33333333333333e+00
+1647 1676 -8.33333333333333e+00
+1647 1641 -1.25000000000000e+01
+1648 1648 1.25000000000000e+02
+1648 1674 4.16666666666667e+00
+1648 1818 -4.16666666666667e+00
+1648 1814 -8.33333333333333e+00
+1648 1658 8.33333333333333e+00
+1648 1812 4.16666666666667e+00
+1648 1656 -4.16666666666667e+00
+1648 1820 -4.16666666666667e+00
+1648 1657 -1.25000000000000e+01
+1648 1583 4.16666666666667e+00
+1648 1646 -4.16666666666667e+00
+1648 1581 4.16666666666667e+00
+1648 1811 8.33333333333333e+00
+1648 1649 -1.66666666666667e+01
+1648 1810 -3.75000000000000e+01
+1648 1809 8.33333333333333e+00
+1648 1645 -1.25000000000000e+01
+1648 1644 8.33333333333333e+00
+1648 1647 -1.66666666666667e+01
+1648 1584 -4.16666666666667e+00
+1648 1586 8.33333333333333e+00
+1648 1577 -8.33333333333333e+00
+1648 1643 8.33333333333333e+00
+1648 1575 4.16666666666667e+00
+1648 1572 -4.16666666666667e+00
+1648 1349 4.16666666666667e+00
+1648 1664 -4.16666666666667e+00
+1648 1585 -1.25000000000000e+01
+1648 1663 -1.25000000000000e+01
+1648 1347 -8.33333333333333e+00
+1648 1662 8.33333333333333e+00
+1648 1574 -4.16666666666667e+00
+1648 1316 4.16666666666667e+00
+1648 1676 4.16666666666667e+00
+1648 1642 -3.75000000000000e+01
+1648 1641 8.33333333333333e+00
+1648 1314 -8.33333333333333e+00
+1649 1649 1.25000000000000e+02
+1649 1674 -8.33333333333333e+00
+1649 1812 4.16666666666667e+00
+1649 1818 -4.16666666666667e+00
+1649 1813 -8.33333333333333e+00
+1649 1657 8.33333333333333e+00
+1649 1819 -4.16666666666667e+00
+1649 1658 -3.75000000000000e+01
+1649 1656 8.33333333333333e+00
+1649 1582 4.16666666666667e+00
+1649 1645 -4.16666666666667e+00
+1649 1581 -8.33333333333333e+00
+1649 1644 8.33333333333333e+00
+1649 1811 -1.25000000000000e+01
+1649 1810 8.33333333333333e+00
+1649 1648 -1.66666666666667e+01
+1649 1347 4.16666666666667e+00
+1649 1809 -4.16666666666667e+00
+1649 1646 -1.25000000000000e+01
+1649 1314 4.16666666666667e+00
+1649 1641 -4.16666666666667e+00
+1649 1585 8.33333333333333e+00
+1649 1575 4.16666666666667e+00
+1649 1572 -4.16666666666667e+00
+1649 1576 -8.33333333333333e+00
+1649 1642 8.33333333333333e+00
+1649 1586 -3.75000000000000e+01
+1649 1664 -1.25000000000000e+01
+1649 1348 4.16666666666667e+00
+1649 1663 -4.16666666666667e+00
+1649 1584 8.33333333333333e+00
+1649 1662 8.33333333333333e+00
+1649 1647 -1.66666666666667e+01
+1649 1675 4.16666666666667e+00
+1649 1643 -1.25000000000000e+01
+1649 1573 -4.16666666666667e+00
+1649 1315 4.16666666666667e+00
+1650 1650 1.25000000000000e+02
+1650 1619 -4.16666666666667e+00
+1650 1618 8.33333333333333e+00
+1650 1617 -1.25000000000000e+01
+1650 1610 4.16666666666667e+00
+1650 1511 4.16666666666667e+00
+1650 1505 -4.16666666666667e+00
+1650 1651 -1.66666666666667e+01
+1650 1504 8.33333333333333e+00
+1650 1316 8.33333333333333e+00
+1650 1315 -4.16666666666667e+00
+1650 1314 -1.25000000000000e+01
+1650 1503 -1.25000000000000e+01
+1650 1652 -1.66666666666667e+01
+1650 1364 8.33333333333333e+00
+1650 1363 -4.16666666666667e+00
+1650 1510 4.16666666666667e+00
+1650 1609 4.16666666666667e+00
+1650 1362 -1.25000000000000e+01
+1650 1846 4.16666666666667e+00
+1650 1847 -8.33333333333333e+00
+1650 1655 8.33333333333333e+00
+1650 1654 8.33333333333333e+00
+1650 1653 -3.75000000000000e+01
+1650 1849 -4.16666666666667e+00
+1650 1850 -4.16666666666667e+00
+1650 1658 4.16666666666667e+00
+1650 1657 -8.33333333333333e+00
+1650 2356 -4.16666666666667e+00
+1650 2366 4.16666666666667e+00
+1650 2365 -8.33333333333333e+00
+1650 2357 -4.16666666666667e+00
+1650 2398 8.33333333333333e+00
+1650 2387 -8.33333333333333e+00
+1650 2386 4.16666666666667e+00
+1650 2399 8.33333333333333e+00
+1650 2397 -3.75000000000000e+01
+1651 1651 1.25000000000000e+02
+1651 1619 8.33333333333333e+00
+1651 1618 -3.75000000000000e+01
+1651 1617 8.33333333333333e+00
+1651 1610 -8.33333333333333e+00
+1651 1650 -1.66666666666667e+01
+1651 1503 8.33333333333333e+00
+1651 1316 8.33333333333333e+00
+1651 1652 -1.66666666666667e+01
+1651 1505 8.33333333333333e+00
+1651 1315 -1.25000000000000e+01
+1651 1504 -3.75000000000000e+01
+1651 1314 -4.16666666666667e+00
+1651 1364 8.33333333333333e+00
+1651 1511 -8.33333333333333e+00
+1651 1608 4.16666666666667e+00
+1651 1363 -1.25000000000000e+01
+1651 1362 -4.16666666666667e+00
+1651 1509 4.16666666666667e+00
+1651 1845 4.16666666666667e+00
+1651 1847 4.16666666666667e+00
+1651 1655 -4.16666666666667e+00
+1651 1654 -1.25000000000000e+01
+1651 1653 8.33333333333333e+00
+1651 1658 4.16666666666667e+00
+1651 1850 -4.16666666666667e+00
+1651 1848 -4.16666666666667e+00
+1651 1656 -8.33333333333333e+00
+1651 2355 -4.16666666666667e+00
+1651 2366 4.16666666666667e+00
+1651 2357 -4.16666666666667e+00
+1651 2364 -8.33333333333333e+00
+1651 2387 4.16666666666667e+00
+1651 2399 -4.16666666666667e+00
+1651 2397 8.33333333333333e+00
+1651 2385 4.16666666666667e+00
+1651 2398 -1.25000000000000e+01
+1652 1652 1.25000000000000e+02
+1652 1619 -1.25000000000000e+01
+1652 1618 8.33333333333333e+00
+1652 1617 -4.16666666666667e+00
+1652 1609 -8.33333333333333e+00
+1652 1608 4.16666666666667e+00
+1652 1509 4.16666666666667e+00
+1652 1503 -4.16666666666667e+00
+1652 1316 -3.75000000000000e+01
+1652 1505 -1.25000000000000e+01
+1652 1315 8.33333333333333e+00
+1652 1651 -1.66666666666667e+01
+1652 1504 8.33333333333333e+00
+1652 1314 8.33333333333333e+00
+1652 1364 -3.75000000000000e+01
+1652 1363 8.33333333333333e+00
+1652 1510 -8.33333333333333e+00
+1652 1650 -1.66666666666667e+01
+1652 1362 8.33333333333333e+00
+1652 1846 4.16666666666667e+00
+1652 1845 -8.33333333333333e+00
+1652 1655 -1.25000000000000e+01
+1652 1654 -4.16666666666667e+00
+1652 1653 8.33333333333333e+00
+1652 1657 4.16666666666667e+00
+1652 1849 -4.16666666666667e+00
+1652 1848 -4.16666666666667e+00
+1652 1656 4.16666666666667e+00
+1652 2356 -4.16666666666667e+00
+1652 2364 4.16666666666667e+00
+1652 2355 -4.16666666666667e+00
+1652 2386 4.16666666666667e+00
+1652 2398 -4.16666666666667e+00
+1652 2385 -8.33333333333333e+00
+1652 2365 4.16666666666667e+00
+1652 2399 -1.25000000000000e+01
+1652 2397 8.33333333333333e+00
+1653 1653 1.25000000000000e+02
+1653 1613 4.16666666666667e+00
+1653 1610 -4.16666666666667e+00
+1653 1622 -4.16666666666667e+00
+1653 1619 4.16666666666667e+00
+1653 1621 8.33333333333333e+00
+1653 1618 -8.33333333333333e+00
+1653 1609 -4.16666666666667e+00
+1653 1620 -1.25000000000000e+01
+1653 1849 4.16666666666667e+00
+1653 1846 -4.16666666666667e+00
+1653 1850 4.16666666666667e+00
+1653 1652 8.33333333333333e+00
+1653 1651 8.33333333333333e+00
+1653 1654 -1.66666666666667e+01
+1653 1650 -3.75000000000000e+01
+1653 1847 8.33333333333333e+00
+1653 1845 -1.25000000000000e+01
+1653 1655 -1.66666666666667e+01
+1653 1658 -4.16666666666667e+00
+1653 1657 8.33333333333333e+00
+1653 1856 -4.16666666666667e+00
+1653 1676 4.16666666666667e+00
+1653 1675 -8.33333333333333e+00
+1653 1669 8.33333333333333e+00
+1653 1316 -8.33333333333333e+00
+1653 1643 8.33333333333333e+00
+1653 1315 4.16666666666667e+00
+1653 1642 -4.16666666666667e+00
+1653 1656 -1.25000000000000e+01
+1653 1641 -1.25000000000000e+01
+1653 1670 8.33333333333333e+00
+1653 1367 -8.33333333333333e+00
+1653 1855 -4.16666666666667e+00
+1653 1366 4.16666666666667e+00
+1653 1612 4.16666666666667e+00
+1653 1668 -3.75000000000000e+01
+1654 1654 1.25000000000000e+02
+1654 1613 -8.33333333333333e+00
+1654 1610 -4.16666666666667e+00
+1654 1619 4.16666666666667e+00
+1654 1620 8.33333333333333e+00
+1654 1617 -8.33333333333333e+00
+1654 1608 -4.16666666666667e+00
+1654 1622 8.33333333333333e+00
+1654 1621 -3.75000000000000e+01
+1654 1848 4.16666666666667e+00
+1654 1845 -4.16666666666667e+00
+1654 1847 8.33333333333333e+00
+1654 1850 -8.33333333333333e+00
+1654 1652 -4.16666666666667e+00
+1654 1316 4.16666666666667e+00
+1654 1651 -1.25000000000000e+01
+1654 1650 8.33333333333333e+00
+1654 1653 -1.66666666666667e+01
+1654 1367 4.16666666666667e+00
+1654 1846 -1.25000000000000e+01
+1654 1670 -4.16666666666667e+00
+1654 1676 4.16666666666667e+00
+1654 1856 -4.16666666666667e+00
+1654 1656 8.33333333333333e+00
+1654 1674 -8.33333333333333e+00
+1654 1668 8.33333333333333e+00
+1654 1658 8.33333333333333e+00
+1654 1643 8.33333333333333e+00
+1654 1655 -1.66666666666667e+01
+1654 1657 -3.75000000000000e+01
+1654 1642 -1.25000000000000e+01
+1654 1314 4.16666666666667e+00
+1654 1641 -4.16666666666667e+00
+1654 1611 4.16666666666667e+00
+1654 1669 -1.25000000000000e+01
+1654 1854 -4.16666666666667e+00
+1654 1365 4.16666666666667e+00
+1655 1655 1.25000000000000e+02
+1655 1611 4.16666666666667e+00
+1655 1608 -4.16666666666667e+00
+1655 1609 -4.16666666666667e+00
+1655 1618 4.16666666666667e+00
+1655 1620 -4.16666666666667e+00
+1655 1617 4.16666666666667e+00
+1655 1622 -1.25000000000000e+01
+1655 1621 8.33333333333333e+00
+1655 1846 8.33333333333333e+00
+1655 1849 -8.33333333333333e+00
+1655 1848 4.16666666666667e+00
+1655 1652 -1.25000000000000e+01
+1655 1651 -4.16666666666667e+00
+1655 1315 4.16666666666667e+00
+1655 1650 8.33333333333333e+00
+1655 1847 -3.75000000000000e+01
+1655 1366 4.16666666666667e+00
+1655 1845 8.33333333333333e+00
+1655 1669 -4.16666666666667e+00
+1655 1653 -1.66666666666667e+01
+1655 1656 -4.16666666666667e+00
+1655 1675 4.16666666666667e+00
+1655 1855 -4.16666666666667e+00
+1655 1854 -4.16666666666667e+00
+1655 1674 4.16666666666667e+00
+1655 1658 -1.25000000000000e+01
+1655 1643 -3.75000000000000e+01
+1655 1657 8.33333333333333e+00
+1655 1642 8.33333333333333e+00
+1655 1654 -1.66666666666667e+01
+1655 1314 -8.33333333333333e+00
+1655 1641 8.33333333333333e+00
+1655 1612 -8.33333333333333e+00
+1655 1670 -1.25000000000000e+01
+1655 1668 8.33333333333333e+00
+1655 1365 -8.33333333333333e+00
+1656 1656 1.25000000000000e+02
+1656 1648 -4.16666666666667e+00
+1656 1819 -8.33333333333333e+00
+1656 1649 8.33333333333333e+00
+1656 1647 -1.25000000000000e+01
+1656 1814 -4.16666666666667e+00
+1656 1813 8.33333333333333e+00
+1656 1812 -1.25000000000000e+01
+1656 1646 -8.33333333333333e+00
+1656 1645 4.16666666666667e+00
+1656 1643 4.16666666666667e+00
+1656 1655 -4.16666666666667e+00
+1656 1657 -1.66666666666667e+01
+1656 1675 8.33333333333333e+00
+1656 1654 8.33333333333333e+00
+1656 1676 8.33333333333333e+00
+1656 1856 -8.33333333333333e+00
+1656 1378 -4.16666666666667e+00
+1656 1855 4.16666666666667e+00
+1656 1674 -3.75000000000000e+01
+1656 1315 -4.16666666666667e+00
+1656 1642 4.16666666666667e+00
+1656 1653 -1.25000000000000e+01
+1656 1505 8.33333333333333e+00
+1656 1658 -1.66666666666667e+01
+1656 1850 8.33333333333333e+00
+1656 1513 4.16666666666667e+00
+1656 1849 -4.16666666666667e+00
+1656 1652 4.16666666666667e+00
+1656 1316 -4.16666666666667e+00
+1656 1504 8.33333333333333e+00
+1656 1651 -8.33333333333333e+00
+1656 1503 -3.75000000000000e+01
+1656 1514 4.16666666666667e+00
+1656 1379 -4.16666666666667e+00
+1656 1848 -1.25000000000000e+01
+1656 1820 4.16666666666667e+00
+1657 1657 1.25000000000000e+02
+1657 1647 -4.16666666666667e+00
+1657 1820 4.16666666666667e+00
+1657 1818 -8.33333333333333e+00
+1657 1648 -1.25000000000000e+01
+1657 1646 4.16666666666667e+00
+1657 1812 8.33333333333333e+00
+1657 1814 8.33333333333333e+00
+1657 1813 -3.75000000000000e+01
+1657 1644 4.16666666666667e+00
+1657 1658 -1.66666666666667e+01
+1657 1316 -4.16666666666667e+00
+1657 1379 -4.16666666666667e+00
+1657 1676 -4.16666666666667e+00
+1657 1856 4.16666666666667e+00
+1657 1656 -1.66666666666667e+01
+1657 1674 8.33333333333333e+00
+1657 1653 8.33333333333333e+00
+1657 1675 -1.25000000000000e+01
+1657 1377 -4.16666666666667e+00
+1657 1854 4.16666666666667e+00
+1657 1643 -8.33333333333333e+00
+1657 1655 8.33333333333333e+00
+1657 1654 -3.75000000000000e+01
+1657 1314 -4.16666666666667e+00
+1657 1641 4.16666666666667e+00
+1657 1505 -4.16666666666667e+00
+1657 1652 4.16666666666667e+00
+1657 1512 4.16666666666667e+00
+1657 1848 -4.16666666666667e+00
+1657 1504 -1.25000000000000e+01
+1657 1503 8.33333333333333e+00
+1657 1650 -8.33333333333333e+00
+1657 1514 -8.33333333333333e+00
+1657 1850 8.33333333333333e+00
+1657 1849 -1.25000000000000e+01
+1657 1649 8.33333333333333e+00
+1658 1658 1.25000000000000e+02
+1658 1648 8.33333333333333e+00
+1658 1819 4.16666666666667e+00
+1658 1649 -3.75000000000000e+01
+1658 1647 8.33333333333333e+00
+1658 1812 -4.16666666666667e+00
+1658 1645 4.16666666666667e+00
+1658 1814 -1.25000000000000e+01
+1658 1813 8.33333333333333e+00
+1658 1644 -8.33333333333333e+00
+1658 1657 -1.66666666666667e+01
+1658 1315 -4.16666666666667e+00
+1658 1378 -4.16666666666667e+00
+1658 1641 4.16666666666667e+00
+1658 1653 -4.16666666666667e+00
+1658 1675 -4.16666666666667e+00
+1658 1855 4.16666666666667e+00
+1658 1676 -1.25000000000000e+01
+1658 1674 8.33333333333333e+00
+1658 1854 -8.33333333333333e+00
+1658 1655 -1.25000000000000e+01
+1658 1642 -8.33333333333333e+00
+1658 1654 8.33333333333333e+00
+1658 1504 -4.16666666666667e+00
+1658 1651 4.16666666666667e+00
+1658 1503 8.33333333333333e+00
+1658 1656 -1.66666666666667e+01
+1658 1848 8.33333333333333e+00
+1658 1505 -1.25000000000000e+01
+1658 1650 4.16666666666667e+00
+1658 1314 -4.16666666666667e+00
+1658 1850 -3.75000000000000e+01
+1658 1818 4.16666666666667e+00
+1658 1513 -8.33333333333333e+00
+1658 1849 8.33333333333333e+00
+1658 1512 4.16666666666667e+00
+1658 1377 -4.16666666666667e+00
+1659 1659 1.25000000000000e+02
+1659 1594 -4.16666666666667e+00
+1659 1589 -8.33333333333333e+00
+1659 1595 8.33333333333333e+00
+1659 1593 -1.25000000000000e+01
+1659 1772 4.16666666666667e+00
+1659 1771 -8.33333333333333e+00
+1659 1667 -4.16666666666667e+00
+1659 1666 8.33333333333333e+00
+1659 1665 -1.25000000000000e+01
+1659 1558 -4.16666666666667e+00
+1659 1567 4.16666666666667e+00
+1659 1568 4.16666666666667e+00
+1659 1631 -4.16666666666667e+00
+1659 1336 8.33333333333333e+00
+1659 1660 -1.66666666666667e+01
+1659 1630 8.33333333333333e+00
+1659 1629 -1.25000000000000e+01
+1659 1559 -4.16666666666667e+00
+1659 1625 4.16666666666667e+00
+1659 1318 8.33333333333333e+00
+1659 1624 -8.33333333333333e+00
+1659 1520 -4.16666666666667e+00
+1659 1517 4.16666666666667e+00
+1659 1337 8.33333333333333e+00
+1659 1778 -8.33333333333333e+00
+1659 1777 4.16666666666667e+00
+1659 1519 -4.16666666666667e+00
+1659 1335 -3.75000000000000e+01
+1659 1661 -1.66666666666667e+01
+1659 1673 8.33333333333333e+00
+1659 1319 8.33333333333333e+00
+1659 1672 -4.16666666666667e+00
+1659 1516 4.16666666666667e+00
+1659 1588 4.16666666666667e+00
+1659 1671 -1.25000000000000e+01
+1659 1317 -3.75000000000000e+01
+1660 1660 1.25000000000000e+02
+1660 1593 -4.16666666666667e+00
+1660 1595 8.33333333333333e+00
+1660 1589 4.16666666666667e+00
+1660 1594 -1.25000000000000e+01
+1660 1772 4.16666666666667e+00
+1660 1770 -8.33333333333333e+00
+1660 1667 8.33333333333333e+00
+1660 1666 -3.75000000000000e+01
+1660 1665 8.33333333333333e+00
+1660 1661 -1.66666666666667e+01
+1660 1319 -4.16666666666667e+00
+1660 1337 -4.16666666666667e+00
+1660 1625 4.16666666666667e+00
+1660 1559 -4.16666666666667e+00
+1660 1557 -4.16666666666667e+00
+1660 1566 4.16666666666667e+00
+1660 1568 -8.33333333333333e+00
+1660 1631 8.33333333333333e+00
+1660 1630 -3.75000000000000e+01
+1660 1335 8.33333333333333e+00
+1660 1659 -1.66666666666667e+01
+1660 1629 8.33333333333333e+00
+1660 1317 8.33333333333333e+00
+1660 1623 -8.33333333333333e+00
+1660 1778 4.16666666666667e+00
+1660 1520 -4.16666666666667e+00
+1660 1336 -1.25000000000000e+01
+1660 1776 4.16666666666667e+00
+1660 1518 -4.16666666666667e+00
+1660 1673 8.33333333333333e+00
+1660 1517 -8.33333333333333e+00
+1660 1587 4.16666666666667e+00
+1660 1672 -1.25000000000000e+01
+1660 1318 -1.25000000000000e+01
+1660 1671 -4.16666666666667e+00
+1660 1515 4.16666666666667e+00
+1661 1661 1.25000000000000e+02
+1661 1588 4.16666666666667e+00
+1661 1587 -8.33333333333333e+00
+1661 1595 -3.75000000000000e+01
+1661 1593 8.33333333333333e+00
+1661 1771 4.16666666666667e+00
+1661 1770 4.16666666666667e+00
+1661 1667 -1.25000000000000e+01
+1661 1666 8.33333333333333e+00
+1661 1665 -4.16666666666667e+00
+1661 1660 -1.66666666666667e+01
+1661 1318 -4.16666666666667e+00
+1661 1336 -4.16666666666667e+00
+1661 1624 4.16666666666667e+00
+1661 1558 -4.16666666666667e+00
+1661 1631 -1.25000000000000e+01
+1661 1567 -8.33333333333333e+00
+1661 1630 8.33333333333333e+00
+1661 1566 4.16666666666667e+00
+1661 1629 -4.16666666666667e+00
+1661 1557 -4.16666666666667e+00
+1661 1623 4.16666666666667e+00
+1661 1777 4.16666666666667e+00
+1661 1519 -4.16666666666667e+00
+1661 1518 -4.16666666666667e+00
+1661 1515 4.16666666666667e+00
+1661 1337 -1.25000000000000e+01
+1661 1335 8.33333333333333e+00
+1661 1776 -8.33333333333333e+00
+1661 1594 8.33333333333333e+00
+1661 1673 -3.75000000000000e+01
+1661 1319 -1.25000000000000e+01
+1661 1672 8.33333333333333e+00
+1661 1516 -8.33333333333333e+00
+1661 1659 -1.66666666666667e+01
+1661 1671 8.33333333333333e+00
+1661 1317 8.33333333333333e+00
+1662 1662 1.25000000000000e+02
+1662 1600 -4.16666666666667e+00
+1662 1601 8.33333333333333e+00
+1662 1589 4.16666666666667e+00
+1662 1599 -1.25000000000000e+01
+1662 1817 4.16666666666667e+00
+1662 1816 -8.33333333333333e+00
+1662 1667 8.33333333333333e+00
+1662 1666 8.33333333333333e+00
+1662 1665 -3.75000000000000e+01
+1662 1664 -1.66666666666667e+01
+1662 1349 -4.16666666666667e+00
+1662 1319 -4.16666666666667e+00
+1662 1577 -4.16666666666667e+00
+1662 1643 4.16666666666667e+00
+1662 1576 -4.16666666666667e+00
+1662 1585 4.16666666666667e+00
+1662 1586 -8.33333333333333e+00
+1662 1649 8.33333333333333e+00
+1662 1348 8.33333333333333e+00
+1662 1663 -1.66666666666667e+01
+1662 1648 8.33333333333333e+00
+1662 1647 -3.75000000000000e+01
+1662 1318 8.33333333333333e+00
+1662 1642 -8.33333333333333e+00
+1662 1523 -4.16666666666667e+00
+1662 1820 4.16666666666667e+00
+1662 1819 4.16666666666667e+00
+1662 1522 -4.16666666666667e+00
+1662 1347 -1.25000000000000e+01
+1662 1676 8.33333333333333e+00
+1662 1517 -8.33333333333333e+00
+1662 1675 -4.16666666666667e+00
+1662 1516 4.16666666666667e+00
+1662 1674 -1.25000000000000e+01
+1662 1588 4.16666666666667e+00
+1662 1317 -1.25000000000000e+01
+1663 1663 1.25000000000000e+02
+1663 1599 -4.16666666666667e+00
+1663 1589 -8.33333333333333e+00
+1663 1601 8.33333333333333e+00
+1663 1600 -1.25000000000000e+01
+1663 1817 4.16666666666667e+00
+1663 1815 -8.33333333333333e+00
+1663 1667 -4.16666666666667e+00
+1663 1666 -1.25000000000000e+01
+1663 1665 8.33333333333333e+00
+1663 1575 -4.16666666666667e+00
+1663 1584 4.16666666666667e+00
+1663 1586 4.16666666666667e+00
+1663 1649 -4.16666666666667e+00
+1663 1648 -1.25000000000000e+01
+1663 1347 8.33333333333333e+00
+1663 1662 -1.66666666666667e+01
+1663 1647 8.33333333333333e+00
+1663 1577 -4.16666666666667e+00
+1663 1643 4.16666666666667e+00
+1663 1317 8.33333333333333e+00
+1663 1641 -8.33333333333333e+00
+1663 1523 -4.16666666666667e+00
+1663 1517 4.16666666666667e+00
+1663 1820 -8.33333333333333e+00
+1663 1349 8.33333333333333e+00
+1663 1348 -3.75000000000000e+01
+1663 1818 4.16666666666667e+00
+1663 1521 -4.16666666666667e+00
+1663 1676 8.33333333333333e+00
+1663 1664 -1.66666666666667e+01
+1663 1319 8.33333333333333e+00
+1663 1675 -1.25000000000000e+01
+1663 1587 4.16666666666667e+00
+1663 1318 -3.75000000000000e+01
+1663 1674 -4.16666666666667e+00
+1663 1515 4.16666666666667e+00
+1664 1664 1.25000000000000e+02
+1664 1588 -8.33333333333333e+00
+1664 1587 4.16666666666667e+00
+1664 1601 -3.75000000000000e+01
+1664 1600 8.33333333333333e+00
+1664 1815 4.16666666666667e+00
+1664 1816 4.16666666666667e+00
+1664 1667 -1.25000000000000e+01
+1664 1666 -4.16666666666667e+00
+1664 1665 8.33333333333333e+00
+1664 1662 -1.66666666666667e+01
+1664 1347 -4.16666666666667e+00
+1664 1317 -4.16666666666667e+00
+1664 1575 -4.16666666666667e+00
+1664 1641 4.16666666666667e+00
+1664 1649 -1.25000000000000e+01
+1664 1585 4.16666666666667e+00
+1664 1648 -4.16666666666667e+00
+1664 1584 -8.33333333333333e+00
+1664 1647 8.33333333333333e+00
+1664 1576 -4.16666666666667e+00
+1664 1642 4.16666666666667e+00
+1664 1521 -4.16666666666667e+00
+1664 1818 4.16666666666667e+00
+1664 1522 -4.16666666666667e+00
+1664 1516 4.16666666666667e+00
+1664 1349 -1.25000000000000e+01
+1664 1819 -8.33333333333333e+00
+1664 1348 8.33333333333333e+00
+1664 1676 -3.75000000000000e+01
+1664 1599 8.33333333333333e+00
+1664 1319 -1.25000000000000e+01
+1664 1675 8.33333333333333e+00
+1664 1663 -1.66666666666667e+01
+1664 1318 8.33333333333333e+00
+1664 1674 8.33333333333333e+00
+1664 1515 -8.33333333333333e+00
+1665 1665 1.25000000000000e+02
+1665 1601 -8.33333333333333e+00
+1665 1817 -4.16666666666667e+00
+1665 1522 4.16666666666667e+00
+1665 1523 4.16666666666667e+00
+1665 1816 8.33333333333333e+00
+1665 1815 -1.25000000000000e+01
+1665 1664 8.33333333333333e+00
+1665 1663 8.33333333333333e+00
+1665 1662 -3.75000000000000e+01
+1665 1588 -4.16666666666667e+00
+1665 1589 -4.16666666666667e+00
+1665 1603 -4.16666666666667e+00
+1665 1594 4.16666666666667e+00
+1665 1595 4.16666666666667e+00
+1665 1604 8.33333333333333e+00
+1665 1667 -1.66666666666667e+01
+1665 1602 -1.25000000000000e+01
+1665 1516 -4.16666666666667e+00
+1665 1666 -1.66666666666667e+01
+1665 1772 8.33333333333333e+00
+1665 1525 -4.16666666666667e+00
+1665 1519 4.16666666666667e+00
+1665 1517 8.33333333333333e+00
+1665 1520 -8.33333333333333e+00
+1665 1355 4.16666666666667e+00
+1665 1526 -4.16666666666667e+00
+1665 1771 8.33333333333333e+00
+1665 1354 -8.33333333333333e+00
+1665 1770 -3.75000000000000e+01
+1665 1661 -4.16666666666667e+00
+1665 1319 4.16666666666667e+00
+1665 1660 8.33333333333333e+00
+1665 1318 -8.33333333333333e+00
+1665 1659 -1.25000000000000e+01
+1665 1600 4.16666666666667e+00
+1665 1515 -1.25000000000000e+01
+1666 1666 1.25000000000000e+02
+1666 1601 4.16666666666667e+00
+1666 1817 8.33333333333333e+00
+1666 1521 4.16666666666667e+00
+1666 1523 -8.33333333333333e+00
+1666 1816 -3.75000000000000e+01
+1666 1815 8.33333333333333e+00
+1666 1664 -4.16666666666667e+00
+1666 1663 -1.25000000000000e+01
+1666 1662 8.33333333333333e+00
+1666 1587 -4.16666666666667e+00
+1666 1604 8.33333333333333e+00
+1666 1602 -4.16666666666667e+00
+1666 1593 4.16666666666667e+00
+1666 1595 -8.33333333333333e+00
+1666 1355 4.16666666666667e+00
+1666 1603 -1.25000000000000e+01
+1666 1589 -4.16666666666667e+00
+1666 1319 4.16666666666667e+00
+1666 1515 -4.16666666666667e+00
+1666 1772 -4.16666666666667e+00
+1666 1665 -1.66666666666667e+01
+1666 1524 -4.16666666666667e+00
+1666 1518 4.16666666666667e+00
+1666 1526 -4.16666666666667e+00
+1666 1520 4.16666666666667e+00
+1666 1771 -1.25000000000000e+01
+1666 1770 8.33333333333333e+00
+1666 1353 -8.33333333333333e+00
+1666 1661 8.33333333333333e+00
+1666 1667 -1.66666666666667e+01
+1666 1517 8.33333333333333e+00
+1666 1660 -3.75000000000000e+01
+1666 1599 4.16666666666667e+00
+1666 1516 -1.25000000000000e+01
+1666 1659 8.33333333333333e+00
+1666 1317 -8.33333333333333e+00
+1667 1667 1.25000000000000e+02
+1667 1599 -8.33333333333333e+00
+1667 1815 -4.16666666666667e+00
+1667 1816 8.33333333333333e+00
+1667 1522 -8.33333333333333e+00
+1667 1521 4.16666666666667e+00
+1667 1817 -1.25000000000000e+01
+1667 1664 -1.25000000000000e+01
+1667 1663 -4.16666666666667e+00
+1667 1662 8.33333333333333e+00
+1667 1587 -4.16666666666667e+00
+1667 1603 8.33333333333333e+00
+1667 1594 -8.33333333333333e+00
+1667 1593 4.16666666666667e+00
+1667 1604 -3.75000000000000e+01
+1667 1354 4.16666666666667e+00
+1667 1602 8.33333333333333e+00
+1667 1665 -1.66666666666667e+01
+1667 1588 -4.16666666666667e+00
+1667 1318 4.16666666666667e+00
+1667 1771 -4.16666666666667e+00
+1667 1770 8.33333333333333e+00
+1667 1525 -4.16666666666667e+00
+1667 1519 4.16666666666667e+00
+1667 1515 8.33333333333333e+00
+1667 1518 -8.33333333333333e+00
+1667 1772 -1.25000000000000e+01
+1667 1353 4.16666666666667e+00
+1667 1524 -4.16666666666667e+00
+1667 1661 -1.25000000000000e+01
+1667 1600 4.16666666666667e+00
+1667 1517 -3.75000000000000e+01
+1667 1660 8.33333333333333e+00
+1667 1666 -1.66666666666667e+01
+1667 1516 8.33333333333333e+00
+1667 1659 -4.16666666666667e+00
+1667 1317 4.16666666666667e+00
+1668 1668 1.25000000000000e+02
+1668 1643 -8.33333333333333e+00
+1668 1642 4.16666666666667e+00
+1668 1655 8.33333333333333e+00
+1668 1653 -3.75000000000000e+01
+1668 1855 4.16666666666667e+00
+1668 1856 4.16666666666667e+00
+1668 1676 -4.16666666666667e+00
+1668 1675 8.33333333333333e+00
+1668 1674 -1.25000000000000e+01
+1668 1612 -4.16666666666667e+00
+1668 1613 -4.16666666666667e+00
+1668 1622 4.16666666666667e+00
+1668 1621 -8.33333333333333e+00
+1668 1625 4.16666666666667e+00
+1668 1637 -4.16666666666667e+00
+1668 1669 -1.66666666666667e+01
+1668 1636 8.33333333333333e+00
+1668 1624 4.16666666666667e+00
+1668 1318 -4.16666666666667e+00
+1668 1366 -4.16666666666667e+00
+1668 1635 -1.25000000000000e+01
+1668 1517 4.16666666666667e+00
+1668 1529 -4.16666666666667e+00
+1668 1852 4.16666666666667e+00
+1668 1528 -4.16666666666667e+00
+1668 1367 8.33333333333333e+00
+1668 1853 -8.33333333333333e+00
+1668 1365 -1.25000000000000e+01
+1668 1670 -1.66666666666667e+01
+1668 1673 8.33333333333333e+00
+1668 1319 8.33333333333333e+00
+1668 1672 8.33333333333333e+00
+1668 1516 -8.33333333333333e+00
+1668 1654 8.33333333333333e+00
+1668 1671 -3.75000000000000e+01
+1668 1317 -1.25000000000000e+01
+1669 1669 1.25000000000000e+02
+1669 1655 -4.16666666666667e+00
+1669 1653 8.33333333333333e+00
+1669 1641 4.16666666666667e+00
+1669 1654 -1.25000000000000e+01
+1669 1854 4.16666666666667e+00
+1669 1856 -8.33333333333333e+00
+1669 1676 8.33333333333333e+00
+1669 1675 -3.75000000000000e+01
+1669 1674 8.33333333333333e+00
+1669 1611 -4.16666666666667e+00
+1669 1613 -4.16666666666667e+00
+1669 1622 4.16666666666667e+00
+1669 1620 -8.33333333333333e+00
+1669 1668 -1.66666666666667e+01
+1669 1635 8.33333333333333e+00
+1669 1625 -8.33333333333333e+00
+1669 1319 8.33333333333333e+00
+1669 1623 4.16666666666667e+00
+1669 1317 -4.16666666666667e+00
+1669 1637 8.33333333333333e+00
+1669 1670 -1.66666666666667e+01
+1669 1367 8.33333333333333e+00
+1669 1636 -3.75000000000000e+01
+1669 1365 -4.16666666666667e+00
+1669 1851 4.16666666666667e+00
+1669 1527 -4.16666666666667e+00
+1669 1853 4.16666666666667e+00
+1669 1529 -4.16666666666667e+00
+1669 1366 -1.25000000000000e+01
+1669 1673 -4.16666666666667e+00
+1669 1517 4.16666666666667e+00
+1669 1643 4.16666666666667e+00
+1669 1672 -1.25000000000000e+01
+1669 1318 -1.25000000000000e+01
+1669 1671 8.33333333333333e+00
+1669 1515 -8.33333333333333e+00
+1670 1670 1.25000000000000e+02
+1670 1654 -4.16666666666667e+00
+1670 1641 -8.33333333333333e+00
+1670 1655 -1.25000000000000e+01
+1670 1653 8.33333333333333e+00
+1670 1855 -8.33333333333333e+00
+1670 1854 4.16666666666667e+00
+1670 1676 -1.25000000000000e+01
+1670 1675 8.33333333333333e+00
+1670 1674 -4.16666666666667e+00
+1670 1612 -4.16666666666667e+00
+1670 1621 4.16666666666667e+00
+1670 1611 -4.16666666666667e+00
+1670 1620 4.16666666666667e+00
+1670 1623 4.16666666666667e+00
+1670 1635 -4.16666666666667e+00
+1670 1624 -8.33333333333333e+00
+1670 1318 8.33333333333333e+00
+1670 1637 -1.25000000000000e+01
+1670 1636 8.33333333333333e+00
+1670 1669 -1.66666666666667e+01
+1670 1366 8.33333333333333e+00
+1670 1515 4.16666666666667e+00
+1670 1527 -4.16666666666667e+00
+1670 1367 -3.75000000000000e+01
+1670 1852 4.16666666666667e+00
+1670 1528 -4.16666666666667e+00
+1670 1365 8.33333333333333e+00
+1670 1851 -8.33333333333333e+00
+1670 1642 4.16666666666667e+00
+1670 1673 -1.25000000000000e+01
+1670 1319 -3.75000000000000e+01
+1670 1672 -4.16666666666667e+00
+1670 1516 4.16666666666667e+00
+1670 1668 -1.66666666666667e+01
+1670 1671 8.33333333333333e+00
+1670 1317 8.33333333333333e+00
+1671 1671 1.25000000000000e+02
+1671 1630 4.16666666666667e+00
+1671 1777 8.33333333333333e+00
+1671 1520 4.16666666666667e+00
+1671 1519 -8.33333333333333e+00
+1671 1778 8.33333333333333e+00
+1671 1776 -3.75000000000000e+01
+1671 1661 8.33333333333333e+00
+1671 1660 -4.16666666666667e+00
+1671 1659 -1.25000000000000e+01
+1671 1625 -4.16666666666667e+00
+1671 1640 -4.16666666666667e+00
+1671 1637 4.16666666666667e+00
+1671 1639 8.33333333333333e+00
+1671 1636 -8.33333333333333e+00
+1671 1372 4.16666666666667e+00
+1671 1638 -1.25000000000000e+01
+1671 1624 -4.16666666666667e+00
+1671 1318 4.16666666666667e+00
+1671 1517 -4.16666666666667e+00
+1671 1673 -1.66666666666667e+01
+1671 1852 -4.16666666666667e+00
+1671 1532 -4.16666666666667e+00
+1671 1529 4.16666666666667e+00
+1671 1531 -4.16666666666667e+00
+1671 1528 4.16666666666667e+00
+1671 1853 8.33333333333333e+00
+1671 1373 -8.33333333333333e+00
+1671 1851 -1.25000000000000e+01
+1671 1670 8.33333333333333e+00
+1671 1319 -8.33333333333333e+00
+1671 1669 8.33333333333333e+00
+1671 1672 -1.66666666666667e+01
+1671 1516 8.33333333333333e+00
+1671 1668 -3.75000000000000e+01
+1671 1631 4.16666666666667e+00
+1671 1515 -1.25000000000000e+01
+1672 1672 1.25000000000000e+02
+1672 1629 4.16666666666667e+00
+1672 1778 -4.16666666666667e+00
+1672 1520 4.16666666666667e+00
+1672 1776 8.33333333333333e+00
+1672 1518 -8.33333333333333e+00
+1672 1777 -1.25000000000000e+01
+1672 1661 8.33333333333333e+00
+1672 1660 -1.25000000000000e+01
+1672 1659 -4.16666666666667e+00
+1672 1625 -4.16666666666667e+00
+1672 1638 8.33333333333333e+00
+1672 1637 4.16666666666667e+00
+1672 1635 -8.33333333333333e+00
+1672 1640 8.33333333333333e+00
+1672 1673 -1.66666666666667e+01
+1672 1639 -3.75000000000000e+01
+1672 1371 4.16666666666667e+00
+1672 1623 -4.16666666666667e+00
+1672 1317 4.16666666666667e+00
+1672 1851 -4.16666666666667e+00
+1672 1853 8.33333333333333e+00
+1672 1517 8.33333333333333e+00
+1672 1529 -8.33333333333333e+00
+1672 1530 -4.16666666666667e+00
+1672 1527 4.16666666666667e+00
+1672 1373 4.16666666666667e+00
+1672 1532 -4.16666666666667e+00
+1672 1852 -1.25000000000000e+01
+1672 1670 -4.16666666666667e+00
+1672 1319 4.16666666666667e+00
+1672 1669 -1.25000000000000e+01
+1672 1631 -8.33333333333333e+00
+1672 1516 -3.75000000000000e+01
+1672 1668 8.33333333333333e+00
+1672 1671 -1.66666666666667e+01
+1672 1515 8.33333333333333e+00
+1673 1673 1.25000000000000e+02
+1673 1630 -8.33333333333333e+00
+1673 1777 -4.16666666666667e+00
+1673 1519 4.16666666666667e+00
+1673 1518 4.16666666666667e+00
+1673 1778 -1.25000000000000e+01
+1673 1776 8.33333333333333e+00
+1673 1661 -3.75000000000000e+01
+1673 1660 8.33333333333333e+00
+1673 1659 8.33333333333333e+00
+1673 1623 -4.16666666666667e+00
+1673 1624 -4.16666666666667e+00
+1673 1638 -4.16666666666667e+00
+1673 1635 4.16666666666667e+00
+1673 1636 4.16666666666667e+00
+1673 1640 -1.25000000000000e+01
+1673 1639 8.33333333333333e+00
+1673 1672 -1.66666666666667e+01
+1673 1515 -4.16666666666667e+00
+1673 1671 -1.66666666666667e+01
+1673 1852 8.33333333333333e+00
+1673 1530 -4.16666666666667e+00
+1673 1527 4.16666666666667e+00
+1673 1516 8.33333333333333e+00
+1673 1528 -8.33333333333333e+00
+1673 1853 -3.75000000000000e+01
+1673 1372 4.16666666666667e+00
+1673 1531 -4.16666666666667e+00
+1673 1851 8.33333333333333e+00
+1673 1371 -8.33333333333333e+00
+1673 1670 -1.25000000000000e+01
+1673 1629 4.16666666666667e+00
+1673 1517 -1.25000000000000e+01
+1673 1669 -4.16666666666667e+00
+1673 1318 4.16666666666667e+00
+1673 1668 8.33333333333333e+00
+1673 1317 -8.33333333333333e+00
+1674 1674 1.25000000000000e+02
+1674 1648 4.16666666666667e+00
+1674 1523 4.16666666666667e+00
+1674 1820 -4.16666666666667e+00
+1674 1819 8.33333333333333e+00
+1674 1522 -8.33333333333333e+00
+1674 1818 -1.25000000000000e+01
+1674 1664 8.33333333333333e+00
+1674 1663 -4.16666666666667e+00
+1674 1662 -1.25000000000000e+01
+1674 1643 -4.16666666666667e+00
+1674 1657 8.33333333333333e+00
+1674 1655 4.16666666666667e+00
+1674 1654 -8.33333333333333e+00
+1674 1658 8.33333333333333e+00
+1674 1676 -1.66666666666667e+01
+1674 1378 4.16666666666667e+00
+1674 1656 -3.75000000000000e+01
+1674 1642 -4.16666666666667e+00
+1674 1318 4.16666666666667e+00
+1674 1855 -4.16666666666667e+00
+1674 1856 8.33333333333333e+00
+1674 1517 8.33333333333333e+00
+1674 1529 -8.33333333333333e+00
+1674 1534 -4.16666666666667e+00
+1674 1528 4.16666666666667e+00
+1674 1379 4.16666666666667e+00
+1674 1535 -4.16666666666667e+00
+1674 1854 -1.25000000000000e+01
+1674 1670 -4.16666666666667e+00
+1674 1319 4.16666666666667e+00
+1674 1675 -1.66666666666667e+01
+1674 1669 8.33333333333333e+00
+1674 1516 8.33333333333333e+00
+1674 1649 -8.33333333333333e+00
+1674 1668 -1.25000000000000e+01
+1674 1515 -3.75000000000000e+01
+1675 1675 1.25000000000000e+02
+1675 1647 4.16666666666667e+00
+1675 1818 8.33333333333333e+00
+1675 1523 4.16666666666667e+00
+1675 1521 -8.33333333333333e+00
+1675 1820 8.33333333333333e+00
+1675 1819 -3.75000000000000e+01
+1675 1664 8.33333333333333e+00
+1675 1663 -1.25000000000000e+01
+1675 1662 -4.16666666666667e+00
+1675 1643 -4.16666666666667e+00
+1675 1658 -4.16666666666667e+00
+1675 1655 4.16666666666667e+00
+1675 1656 8.33333333333333e+00
+1675 1653 -8.33333333333333e+00
+1675 1657 -1.25000000000000e+01
+1675 1377 4.16666666666667e+00
+1675 1641 -4.16666666666667e+00
+1675 1317 4.16666666666667e+00
+1675 1517 -4.16666666666667e+00
+1675 1676 -1.66666666666667e+01
+1675 1854 -4.16666666666667e+00
+1675 1535 -4.16666666666667e+00
+1675 1529 4.16666666666667e+00
+1675 1533 -4.16666666666667e+00
+1675 1527 4.16666666666667e+00
+1675 1379 -8.33333333333333e+00
+1675 1856 8.33333333333333e+00
+1675 1855 -1.25000000000000e+01
+1675 1670 8.33333333333333e+00
+1675 1319 -8.33333333333333e+00
+1675 1649 4.16666666666667e+00
+1675 1669 -3.75000000000000e+01
+1675 1516 -1.25000000000000e+01
+1675 1674 -1.66666666666667e+01
+1675 1668 8.33333333333333e+00
+1675 1515 8.33333333333333e+00
+1676 1676 1.25000000000000e+02
+1676 1647 -8.33333333333333e+00
+1676 1521 4.16666666666667e+00
+1676 1818 -4.16666666666667e+00
+1676 1522 4.16666666666667e+00
+1676 1820 -1.25000000000000e+01
+1676 1819 8.33333333333333e+00
+1676 1664 -3.75000000000000e+01
+1676 1663 8.33333333333333e+00
+1676 1662 8.33333333333333e+00
+1676 1642 -4.16666666666667e+00
+1676 1641 -4.16666666666667e+00
+1676 1657 -4.16666666666667e+00
+1676 1654 4.16666666666667e+00
+1676 1653 4.16666666666667e+00
+1676 1658 -1.25000000000000e+01
+1676 1656 8.33333333333333e+00
+1676 1674 -1.66666666666667e+01
+1676 1516 -4.16666666666667e+00
+1676 1675 -1.66666666666667e+01
+1676 1534 -4.16666666666667e+00
+1676 1528 4.16666666666667e+00
+1676 1854 8.33333333333333e+00
+1676 1515 8.33333333333333e+00
+1676 1527 -8.33333333333333e+00
+1676 1856 -3.75000000000000e+01
+1676 1378 -8.33333333333333e+00
+1676 1855 8.33333333333333e+00
+1676 1377 4.16666666666667e+00
+1676 1533 -4.16666666666667e+00
+1676 1648 4.16666666666667e+00
+1676 1670 -1.25000000000000e+01
+1676 1517 -1.25000000000000e+01
+1676 1669 8.33333333333333e+00
+1676 1318 -8.33333333333333e+00
+1676 1668 -4.16666666666667e+00
+1676 1317 4.16666666666667e+00
+1677 1677 6.25000000000000e+01
+1677 1721 -4.16666666666667e+00
+1677 1693 4.16666666666667e+00
+1677 1720 -4.16666666666667e+00
+1677 1717 -4.16666666666667e+00
+1677 1688 4.16666666666667e+00
+1677 1694 -8.33333333333333e+00
+1677 1687 4.16666666666667e+00
+1677 1686 -1.87500000000000e+01
+1677 1415 4.16666666666667e+00
+1677 1679 -8.33333333333333e+00
+1677 1685 8.33333333333333e+00
+1677 1714 4.16666666666667e+00
+1677 1684 -4.16666666666667e+00
+1677 1322 -2.08333333333333e+00
+1677 1409 2.08333333333333e+00
+1677 1321 4.16666666666667e+00
+1677 1408 -4.16666666666667e+00
+1677 1320 -6.25000000000000e+00
+1677 1683 -1.25000000000000e+01
+1677 1328 -2.08333333333333e+00
+1677 1715 4.16666666666667e+00
+1677 1678 -8.33333333333333e+00
+1677 1327 4.16666666666667e+00
+1677 1414 4.16666666666667e+00
+1677 1718 2.08333333333333e+00
+1677 1326 -6.25000000000000e+00
+1677 1413 -1.87500000000000e+01
+1678 1678 6.25000000000000e+01
+1678 1719 -4.16666666666667e+00
+1678 1718 2.08333333333333e+00
+1678 1721 -4.16666666666667e+00
+1678 1716 -4.16666666666667e+00
+1678 1688 -2.08333333333333e+00
+1678 1694 4.16666666666667e+00
+1678 1687 -6.25000000000000e+00
+1678 1686 4.16666666666667e+00
+1678 1415 -2.08333333333333e+00
+1678 1409 2.08333333333333e+00
+1678 1713 4.16666666666667e+00
+1678 1683 -4.16666666666667e+00
+1678 1322 4.16666666666667e+00
+1678 1679 -8.33333333333333e+00
+1678 1685 8.33333333333333e+00
+1678 1321 -1.87500000000000e+01
+1678 1684 -1.25000000000000e+01
+1678 1320 4.16666666666667e+00
+1678 1407 -4.16666666666667e+00
+1678 1328 4.16666666666667e+00
+1678 1715 -8.33333333333333e+00
+1678 1692 4.16666666666667e+00
+1678 1327 -1.87500000000000e+01
+1678 1414 -6.25000000000000e+00
+1678 1677 -8.33333333333333e+00
+1678 1326 4.16666666666667e+00
+1678 1413 4.16666666666667e+00
+1679 1679 6.25000000000000e+01
+1679 1719 -4.16666666666667e+00
+1679 1717 2.08333333333333e+00
+1679 1720 -4.16666666666667e+00
+1679 1688 -6.25000000000000e+00
+1679 1687 -2.08333333333333e+00
+1679 1693 4.16666666666667e+00
+1679 1686 4.16666666666667e+00
+1679 1692 -8.33333333333333e+00
+1679 1414 -2.08333333333333e+00
+1679 1408 2.08333333333333e+00
+1679 1413 4.16666666666667e+00
+1679 1677 -8.33333333333333e+00
+1679 1683 8.33333333333333e+00
+1679 1322 -6.25000000000000e+00
+1679 1685 -3.75000000000000e+01
+1679 1321 4.16666666666667e+00
+1679 1678 -8.33333333333333e+00
+1679 1684 8.33333333333333e+00
+1679 1320 -2.08333333333333e+00
+1679 1407 2.08333333333333e+00
+1679 1716 2.08333333333333e+00
+1679 1328 -6.25000000000000e+00
+1679 1415 -6.25000000000000e+00
+1679 1327 4.16666666666667e+00
+1679 1714 -8.33333333333333e+00
+1679 1326 -2.08333333333333e+00
+1679 1713 4.16666666666667e+00
+1680 1680 6.25000000000000e+01
+1680 1691 4.16666666666667e+00
+1680 1690 4.16666666666667e+00
+1680 1689 -1.87500000000000e+01
+1680 1754 -4.16666666666667e+00
+1680 1756 -4.16666666666667e+00
+1680 1694 4.16666666666667e+00
+1680 1693 -8.33333333333333e+00
+1680 1757 -4.16666666666667e+00
+1680 1751 4.16666666666667e+00
+1680 1685 -4.16666666666667e+00
+1680 1681 -8.33333333333333e+00
+1680 1684 8.33333333333333e+00
+1680 1420 4.16666666666667e+00
+1680 1322 4.16666666666667e+00
+1680 1409 -4.16666666666667e+00
+1680 1321 -2.08333333333333e+00
+1680 1408 2.08333333333333e+00
+1680 1320 -6.25000000000000e+00
+1680 1683 -1.25000000000000e+01
+1680 1682 -8.33333333333333e+00
+1680 1334 4.16666666666667e+00
+1680 1421 4.16666666666667e+00
+1680 1333 -2.08333333333333e+00
+1680 1750 4.16666666666667e+00
+1680 1753 2.08333333333333e+00
+1680 1332 -6.25000000000000e+00
+1680 1419 -1.87500000000000e+01
+1681 1681 6.25000000000000e+01
+1681 1691 -2.08333333333333e+00
+1681 1690 -6.25000000000000e+00
+1681 1689 4.16666666666667e+00
+1681 1754 2.08333333333333e+00
+1681 1694 4.16666666666667e+00
+1681 1757 -4.16666666666667e+00
+1681 1755 -4.16666666666667e+00
+1681 1692 -8.33333333333333e+00
+1681 1409 2.08333333333333e+00
+1681 1421 -2.08333333333333e+00
+1681 1680 -8.33333333333333e+00
+1681 1683 8.33333333333333e+00
+1681 1419 4.16666666666667e+00
+1681 1322 4.16666666666667e+00
+1681 1682 -8.33333333333333e+00
+1681 1685 8.33333333333333e+00
+1681 1321 -6.25000000000000e+00
+1681 1684 -3.75000000000000e+01
+1681 1320 -2.08333333333333e+00
+1681 1407 2.08333333333333e+00
+1681 1334 4.16666666666667e+00
+1681 1751 -8.33333333333333e+00
+1681 1752 2.08333333333333e+00
+1681 1333 -6.25000000000000e+00
+1681 1420 -6.25000000000000e+00
+1681 1332 -2.08333333333333e+00
+1681 1749 4.16666666666667e+00
+1682 1682 6.25000000000000e+01
+1682 1690 -2.08333333333333e+00
+1682 1689 4.16666666666667e+00
+1682 1753 2.08333333333333e+00
+1682 1752 -4.16666666666667e+00
+1682 1693 4.16666666666667e+00
+1682 1756 -4.16666666666667e+00
+1682 1692 4.16666666666667e+00
+1682 1755 -4.16666666666667e+00
+1682 1749 4.16666666666667e+00
+1682 1683 -4.16666666666667e+00
+1682 1408 2.08333333333333e+00
+1682 1420 -2.08333333333333e+00
+1682 1322 -1.87500000000000e+01
+1682 1685 -1.25000000000000e+01
+1682 1321 4.16666666666667e+00
+1682 1681 -8.33333333333333e+00
+1682 1684 8.33333333333333e+00
+1682 1320 4.16666666666667e+00
+1682 1407 -4.16666666666667e+00
+1682 1691 -6.25000000000000e+00
+1682 1334 -1.87500000000000e+01
+1682 1421 -6.25000000000000e+00
+1682 1333 4.16666666666667e+00
+1682 1750 -8.33333333333333e+00
+1682 1680 -8.33333333333333e+00
+1682 1332 4.16666666666667e+00
+1682 1419 4.16666666666667e+00
+1683 1683 1.25000000000000e+02
+1683 1720 -8.33333333333333e+00
+1683 1679 8.33333333333333e+00
+1683 1414 4.16666666666667e+00
+1683 1678 -4.16666666666667e+00
+1683 1415 -8.33333333333333e+00
+1683 1677 -1.25000000000000e+01
+1683 1715 -4.16666666666667e+00
+1683 1714 8.33333333333333e+00
+1683 1713 -1.25000000000000e+01
+1683 1786 -4.16666666666667e+00
+1683 1694 8.33333333333333e+00
+1683 1757 -8.33333333333333e+00
+1683 1756 4.16666666666667e+00
+1683 1322 4.16666666666667e+00
+1683 1693 8.33333333333333e+00
+1683 1684 -1.66666666666667e+01
+1683 1692 -3.75000000000000e+01
+1683 1787 -4.16666666666667e+00
+1683 1340 4.16666666666667e+00
+1683 1682 -4.16666666666667e+00
+1683 1681 8.33333333333333e+00
+1683 1409 -4.16666666666667e+00
+1683 1421 4.16666666666667e+00
+1683 1426 8.33333333333333e+00
+1683 1420 -8.33333333333333e+00
+1683 1321 4.16666666666667e+00
+1683 1408 -4.16666666666667e+00
+1683 1680 -1.25000000000000e+01
+1683 1685 -1.66666666666667e+01
+1683 1751 8.33333333333333e+00
+1683 1427 8.33333333333333e+00
+1683 1750 -4.16666666666667e+00
+1683 1339 4.16666666666667e+00
+1683 1721 4.16666666666667e+00
+1683 1749 -1.25000000000000e+01
+1683 1425 -3.75000000000000e+01
+1684 1684 1.25000000000000e+02
+1684 1719 -8.33333333333333e+00
+1684 1413 4.16666666666667e+00
+1684 1677 -4.16666666666667e+00
+1684 1415 4.16666666666667e+00
+1684 1679 8.33333333333333e+00
+1684 1678 -1.25000000000000e+01
+1684 1715 8.33333333333333e+00
+1684 1714 -3.75000000000000e+01
+1684 1713 8.33333333333333e+00
+1684 1787 -4.16666666666667e+00
+1684 1785 -4.16666666666667e+00
+1684 1694 -4.16666666666667e+00
+1684 1757 4.16666666666667e+00
+1684 1755 4.16666666666667e+00
+1684 1693 -1.25000000000000e+01
+1684 1692 8.33333333333333e+00
+1684 1683 -1.66666666666667e+01
+1684 1427 -4.16666666666667e+00
+1684 1685 -1.66666666666667e+01
+1684 1409 -4.16666666666667e+00
+1684 1421 4.16666666666667e+00
+1684 1680 8.33333333333333e+00
+1684 1425 8.33333333333333e+00
+1684 1419 -8.33333333333333e+00
+1684 1322 -8.33333333333333e+00
+1684 1682 8.33333333333333e+00
+1684 1681 -3.75000000000000e+01
+1684 1320 4.16666666666667e+00
+1684 1407 -4.16666666666667e+00
+1684 1751 8.33333333333333e+00
+1684 1340 -8.33333333333333e+00
+1684 1721 4.16666666666667e+00
+1684 1750 -1.25000000000000e+01
+1684 1426 -1.25000000000000e+01
+1684 1749 -4.16666666666667e+00
+1684 1338 4.16666666666667e+00
+1685 1685 1.25000000000000e+02
+1685 1719 4.16666666666667e+00
+1685 1677 8.33333333333333e+00
+1685 1414 4.16666666666667e+00
+1685 1413 -8.33333333333333e+00
+1685 1679 -3.75000000000000e+01
+1685 1678 8.33333333333333e+00
+1685 1715 -1.25000000000000e+01
+1685 1714 8.33333333333333e+00
+1685 1713 -4.16666666666667e+00
+1685 1786 -4.16666666666667e+00
+1685 1693 -4.16666666666667e+00
+1685 1756 4.16666666666667e+00
+1685 1692 8.33333333333333e+00
+1685 1755 -8.33333333333333e+00
+1685 1694 -1.25000000000000e+01
+1685 1320 4.16666666666667e+00
+1685 1785 -4.16666666666667e+00
+1685 1338 4.16666666666667e+00
+1685 1426 -4.16666666666667e+00
+1685 1684 -1.66666666666667e+01
+1685 1680 -4.16666666666667e+00
+1685 1408 -4.16666666666667e+00
+1685 1420 4.16666666666667e+00
+1685 1407 -4.16666666666667e+00
+1685 1419 4.16666666666667e+00
+1685 1682 -1.25000000000000e+01
+1685 1321 -8.33333333333333e+00
+1685 1681 8.33333333333333e+00
+1685 1720 4.16666666666667e+00
+1685 1751 -3.75000000000000e+01
+1685 1427 -1.25000000000000e+01
+1685 1750 8.33333333333333e+00
+1685 1339 -8.33333333333333e+00
+1685 1683 -1.66666666666667e+01
+1685 1749 8.33333333333333e+00
+1685 1425 8.33333333333333e+00
+1686 1686 6.25000000000000e+01
+1686 1720 4.16666666666667e+00
+1686 1721 4.16666666666667e+00
+1686 1679 4.16666666666667e+00
+1686 1688 -8.33333333333333e+00
+1686 1678 4.16666666666667e+00
+1686 1677 -1.87500000000000e+01
+1686 1717 4.16666666666667e+00
+1686 1716 -6.25000000000000e+00
+1686 1693 -4.16666666666667e+00
+1686 1687 -8.33333333333333e+00
+1686 1694 8.33333333333333e+00
+1686 1430 -2.08333333333333e+00
+1686 1322 2.08333333333333e+00
+1686 1429 4.16666666666667e+00
+1686 1321 -4.16666666666667e+00
+1686 1428 -6.25000000000000e+00
+1686 1718 -2.08333333333333e+00
+1686 1692 -1.25000000000000e+01
+1686 140 4.16666666666667e+00
+1686 355 -4.16666666666667e+00
+1686 151 4.16666666666667e+00
+1686 152 -8.33333333333333e+00
+1686 41 2.08333333333333e+00
+1686 356 -4.16666666666667e+00
+1686 139 4.16666666666667e+00
+1686 40 -4.16666666666667e+00
+1686 138 -1.87500000000000e+01
+1687 1687 6.25000000000000e+01
+1687 1719 4.16666666666667e+00
+1687 1721 -8.33333333333333e+00
+1687 1679 -2.08333333333333e+00
+1687 1322 2.08333333333333e+00
+1687 1678 -6.25000000000000e+00
+1687 1677 4.16666666666667e+00
+1687 1717 -1.87500000000000e+01
+1687 1716 4.16666666666667e+00
+1687 1692 -4.16666666666667e+00
+1687 1686 -8.33333333333333e+00
+1687 1430 4.16666666666667e+00
+1687 1688 -8.33333333333333e+00
+1687 1694 8.33333333333333e+00
+1687 1429 -1.87500000000000e+01
+1687 1718 4.16666666666667e+00
+1687 1693 -1.25000000000000e+01
+1687 1428 4.16666666666667e+00
+1687 1320 -4.16666666666667e+00
+1687 41 2.08333333333333e+00
+1687 140 -2.08333333333333e+00
+1687 354 -4.16666666666667e+00
+1687 150 4.16666666666667e+00
+1687 356 -4.16666666666667e+00
+1687 152 4.16666666666667e+00
+1687 139 -6.25000000000000e+00
+1687 138 4.16666666666667e+00
+1687 39 -4.16666666666667e+00
+1688 1688 6.25000000000000e+01
+1688 1716 -2.08333333333333e+00
+1688 1720 -8.33333333333333e+00
+1688 1719 4.16666666666667e+00
+1688 1679 -6.25000000000000e+00
+1688 1678 -2.08333333333333e+00
+1688 1321 2.08333333333333e+00
+1688 1677 4.16666666666667e+00
+1688 1686 -8.33333333333333e+00
+1688 1718 -6.25000000000000e+00
+1688 1692 8.33333333333333e+00
+1688 1430 -6.25000000000000e+00
+1688 1717 4.16666666666667e+00
+1688 1694 -3.75000000000000e+01
+1688 1429 4.16666666666667e+00
+1688 1687 -8.33333333333333e+00
+1688 1693 8.33333333333333e+00
+1688 1428 -2.08333333333333e+00
+1688 1320 2.08333333333333e+00
+1688 40 2.08333333333333e+00
+1688 139 -2.08333333333333e+00
+1688 138 4.16666666666667e+00
+1688 355 -4.16666666666667e+00
+1688 151 4.16666666666667e+00
+1688 150 -8.33333333333333e+00
+1688 140 -6.25000000000000e+00
+1688 39 2.08333333333333e+00
+1688 354 -4.16666666666667e+00
+1689 1689 6.25000000000000e+01
+1689 1753 -2.08333333333333e+00
+1689 1756 4.16666666666667e+00
+1689 1754 4.16666666666667e+00
+1689 1752 -6.25000000000000e+00
+1689 1682 4.16666666666667e+00
+1689 1690 -8.33333333333333e+00
+1689 1681 4.16666666666667e+00
+1689 1680 -1.87500000000000e+01
+1689 1691 -8.33333333333333e+00
+1689 1694 -4.16666666666667e+00
+1689 1693 8.33333333333333e+00
+1689 1430 4.16666666666667e+00
+1689 1322 -4.16666666666667e+00
+1689 1429 -2.08333333333333e+00
+1689 1321 2.08333333333333e+00
+1689 1428 -6.25000000000000e+00
+1689 1757 4.16666666666667e+00
+1689 1692 -1.25000000000000e+01
+1689 392 -4.16666666666667e+00
+1689 145 4.16666666666667e+00
+1689 152 4.16666666666667e+00
+1689 151 -8.33333333333333e+00
+1689 146 4.16666666666667e+00
+1689 47 -4.16666666666667e+00
+1689 46 2.08333333333333e+00
+1689 391 -4.16666666666667e+00
+1689 144 -1.87500000000000e+01
+1690 1690 6.25000000000000e+01
+1690 1757 -8.33333333333333e+00
+1690 1752 -2.08333333333333e+00
+1690 1755 4.16666666666667e+00
+1690 1753 -6.25000000000000e+00
+1690 1322 2.08333333333333e+00
+1690 1682 -2.08333333333333e+00
+1690 1681 -6.25000000000000e+00
+1690 1689 -8.33333333333333e+00
+1690 1680 4.16666666666667e+00
+1690 1692 8.33333333333333e+00
+1690 1430 4.16666666666667e+00
+1690 1691 -8.33333333333333e+00
+1690 1694 8.33333333333333e+00
+1690 1429 -6.25000000000000e+00
+1690 1754 4.16666666666667e+00
+1690 1693 -3.75000000000000e+01
+1690 1428 -2.08333333333333e+00
+1690 1320 2.08333333333333e+00
+1690 47 2.08333333333333e+00
+1690 392 -4.16666666666667e+00
+1690 146 -2.08333333333333e+00
+1690 152 4.16666666666667e+00
+1690 144 4.16666666666667e+00
+1690 150 -8.33333333333333e+00
+1690 145 -6.25000000000000e+00
+1690 45 2.08333333333333e+00
+1690 390 -4.16666666666667e+00
+1691 1691 6.25000000000000e+01
+1691 1753 4.16666666666667e+00
+1691 1756 -8.33333333333333e+00
+1691 1754 -1.87500000000000e+01
+1691 1752 4.16666666666667e+00
+1691 1682 -6.25000000000000e+00
+1691 1321 2.08333333333333e+00
+1691 1681 -2.08333333333333e+00
+1691 1680 4.16666666666667e+00
+1691 1689 -8.33333333333333e+00
+1691 1692 -4.16666666666667e+00
+1691 1430 -1.87500000000000e+01
+1691 1755 4.16666666666667e+00
+1691 1694 -1.25000000000000e+01
+1691 1429 4.16666666666667e+00
+1691 1690 -8.33333333333333e+00
+1691 1693 8.33333333333333e+00
+1691 1428 4.16666666666667e+00
+1691 1320 -4.16666666666667e+00
+1691 46 2.08333333333333e+00
+1691 391 -4.16666666666667e+00
+1691 390 -4.16666666666667e+00
+1691 145 -2.08333333333333e+00
+1691 151 4.16666666666667e+00
+1691 150 4.16666666666667e+00
+1691 146 -6.25000000000000e+00
+1691 144 4.16666666666667e+00
+1691 45 -4.16666666666667e+00
+1692 1692 1.25000000000000e+02
+1692 1721 -4.16666666666667e+00
+1692 1679 -8.33333333333333e+00
+1692 1720 8.33333333333333e+00
+1692 1719 -1.25000000000000e+01
+1692 1687 -4.16666666666667e+00
+1692 1688 8.33333333333333e+00
+1692 1686 -1.25000000000000e+01
+1692 1786 4.16666666666667e+00
+1692 1756 -4.16666666666667e+00
+1692 1694 -1.66666666666667e+01
+1692 1685 8.33333333333333e+00
+1692 1757 8.33333333333333e+00
+1692 1322 -4.16666666666667e+00
+1692 1682 4.16666666666667e+00
+1692 1684 8.33333333333333e+00
+1692 1681 -8.33333333333333e+00
+1692 1683 -3.75000000000000e+01
+1692 1787 4.16666666666667e+00
+1692 1755 -1.25000000000000e+01
+1692 1430 4.16666666666667e+00
+1692 1691 -4.16666666666667e+00
+1692 1693 -1.66666666666667e+01
+1692 1690 8.33333333333333e+00
+1692 1429 4.16666666666667e+00
+1692 1321 -4.16666666666667e+00
+1692 1689 -1.25000000000000e+01
+1692 1678 4.16666666666667e+00
+1692 356 4.16666666666667e+00
+1692 355 -8.33333333333333e+00
+1692 53 -4.16666666666667e+00
+1692 151 8.33333333333333e+00
+1692 152 8.33333333333333e+00
+1692 392 -8.33333333333333e+00
+1692 391 4.16666666666667e+00
+1692 52 -4.16666666666667e+00
+1692 150 -3.75000000000000e+01
+1693 1693 1.25000000000000e+02
+1693 1721 8.33333333333333e+00
+1693 1679 4.16666666666667e+00
+1693 1720 -3.75000000000000e+01
+1693 1719 8.33333333333333e+00
+1693 1686 -4.16666666666667e+00
+1693 1688 8.33333333333333e+00
+1693 1687 -1.25000000000000e+01
+1693 1694 -1.66666666666667e+01
+1693 1322 -4.16666666666667e+00
+1693 1785 4.16666666666667e+00
+1693 1755 -4.16666666666667e+00
+1693 1685 -4.16666666666667e+00
+1693 1682 4.16666666666667e+00
+1693 1684 -1.25000000000000e+01
+1693 1683 8.33333333333333e+00
+1693 1680 -8.33333333333333e+00
+1693 1787 -8.33333333333333e+00
+1693 1757 8.33333333333333e+00
+1693 1756 -1.25000000000000e+01
+1693 1692 -1.66666666666667e+01
+1693 1689 8.33333333333333e+00
+1693 1430 -8.33333333333333e+00
+1693 1691 8.33333333333333e+00
+1693 1690 -3.75000000000000e+01
+1693 1677 4.16666666666667e+00
+1693 1428 4.16666666666667e+00
+1693 1320 -4.16666666666667e+00
+1693 356 4.16666666666667e+00
+1693 354 -8.33333333333333e+00
+1693 53 -4.16666666666667e+00
+1693 152 -4.16666666666667e+00
+1693 392 4.16666666666667e+00
+1693 150 8.33333333333333e+00
+1693 151 -1.25000000000000e+01
+1693 390 4.16666666666667e+00
+1693 51 -4.16666666666667e+00
+1694 1694 1.25000000000000e+02
+1694 1719 -4.16666666666667e+00
+1694 1678 4.16666666666667e+00
+1694 1677 -8.33333333333333e+00
+1694 1721 -1.25000000000000e+01
+1694 1686 8.33333333333333e+00
+1694 1688 -3.75000000000000e+01
+1694 1687 8.33333333333333e+00
+1694 1693 -1.66666666666667e+01
+1694 1321 -4.16666666666667e+00
+1694 1684 -4.16666666666667e+00
+1694 1681 4.16666666666667e+00
+1694 1692 -1.66666666666667e+01
+1694 1683 8.33333333333333e+00
+1694 1755 8.33333333333333e+00
+1694 1685 -1.25000000000000e+01
+1694 1320 -4.16666666666667e+00
+1694 1680 4.16666666666667e+00
+1694 1757 -3.75000000000000e+01
+1694 1786 -8.33333333333333e+00
+1694 1756 8.33333333333333e+00
+1694 1785 4.16666666666667e+00
+1694 1428 4.16666666666667e+00
+1694 1689 -4.16666666666667e+00
+1694 1691 -1.25000000000000e+01
+1694 1720 8.33333333333333e+00
+1694 1429 -8.33333333333333e+00
+1694 1690 8.33333333333333e+00
+1694 355 4.16666666666667e+00
+1694 354 4.16666666666667e+00
+1694 52 -4.16666666666667e+00
+1694 51 -4.16666666666667e+00
+1694 151 -4.16666666666667e+00
+1694 391 4.16666666666667e+00
+1694 152 -1.25000000000000e+01
+1694 150 8.33333333333333e+00
+1694 390 -8.33333333333333e+00
+1695 1695 6.25000000000000e+01
+1695 1726 -4.16666666666667e+00
+1695 1706 -2.08333333333333e+00
+1695 1712 4.16666666666667e+00
+1695 1705 4.16666666666667e+00
+1695 1704 -6.25000000000000e+00
+1695 1724 2.08333333333333e+00
+1695 1727 -4.16666666666667e+00
+1695 1723 -4.16666666666667e+00
+1695 1412 2.08333333333333e+00
+1695 1415 -2.08333333333333e+00
+1695 1714 4.16666666666667e+00
+1695 1702 -4.16666666666667e+00
+1695 1328 4.16666666666667e+00
+1695 1715 -8.33333333333333e+00
+1695 1327 4.16666666666667e+00
+1695 1696 -8.33333333333333e+00
+1695 1414 4.16666666666667e+00
+1695 1326 -1.87500000000000e+01
+1695 1413 -6.25000000000000e+00
+1695 1697 -8.33333333333333e+00
+1695 1325 4.16666666666667e+00
+1695 1703 8.33333333333333e+00
+1695 1324 4.16666666666667e+00
+1695 1411 -4.16666666666667e+00
+1695 1711 4.16666666666667e+00
+1695 1323 -1.87500000000000e+01
+1695 1701 -1.25000000000000e+01
+1696 1696 6.25000000000000e+01
+1696 1727 -4.16666666666667e+00
+1696 1710 4.16666666666667e+00
+1696 1725 -4.16666666666667e+00
+1696 1706 4.16666666666667e+00
+1696 1712 -8.33333333333333e+00
+1696 1705 -1.87500000000000e+01
+1696 1704 4.16666666666667e+00
+1696 1722 -4.16666666666667e+00
+1696 1697 -8.33333333333333e+00
+1696 1415 4.16666666666667e+00
+1696 1703 8.33333333333333e+00
+1696 1713 4.16666666666667e+00
+1696 1701 -4.16666666666667e+00
+1696 1328 -2.08333333333333e+00
+1696 1715 4.16666666666667e+00
+1696 1327 -6.25000000000000e+00
+1696 1414 -1.87500000000000e+01
+1696 1326 4.16666666666667e+00
+1696 1695 -8.33333333333333e+00
+1696 1413 4.16666666666667e+00
+1696 1325 -2.08333333333333e+00
+1696 1412 2.08333333333333e+00
+1696 1724 2.08333333333333e+00
+1696 1324 -6.25000000000000e+00
+1696 1702 -1.25000000000000e+01
+1696 1323 4.16666666666667e+00
+1696 1410 -4.16666666666667e+00
+1697 1697 6.25000000000000e+01
+1697 1726 -4.16666666666667e+00
+1697 1706 -6.25000000000000e+00
+1697 1705 4.16666666666667e+00
+1697 1711 -8.33333333333333e+00
+1697 1704 -2.08333333333333e+00
+1697 1710 4.16666666666667e+00
+1697 1722 2.08333333333333e+00
+1697 1725 -4.16666666666667e+00
+1697 1410 2.08333333333333e+00
+1697 1413 -2.08333333333333e+00
+1697 1696 -8.33333333333333e+00
+1697 1414 4.16666666666667e+00
+1697 1702 8.33333333333333e+00
+1697 1328 -6.25000000000000e+00
+1697 1415 -6.25000000000000e+00
+1697 1327 -2.08333333333333e+00
+1697 1714 4.16666666666667e+00
+1697 1326 4.16666666666667e+00
+1697 1713 -8.33333333333333e+00
+1697 1723 2.08333333333333e+00
+1697 1325 -6.25000000000000e+00
+1697 1703 -3.75000000000000e+01
+1697 1324 -2.08333333333333e+00
+1697 1411 2.08333333333333e+00
+1697 1695 -8.33333333333333e+00
+1697 1323 4.16666666666667e+00
+1697 1701 8.33333333333333e+00
+1698 1698 1.25000000000000e+02
+1698 1775 -4.16666666666667e+00
+1698 1774 -4.16666666666667e+00
+1698 1711 -8.33333333333333e+00
+1698 1702 8.33333333333333e+00
+1698 1769 -8.33333333333333e+00
+1698 1768 4.16666666666667e+00
+1698 1703 8.33333333333333e+00
+1698 1701 -3.75000000000000e+01
+1698 1709 -4.16666666666667e+00
+1698 1772 4.16666666666667e+00
+1698 1708 8.33333333333333e+00
+1698 1699 -1.66666666666667e+01
+1698 1594 8.33333333333333e+00
+1698 1592 -8.33333333333333e+00
+1698 1325 8.33333333333333e+00
+1698 1591 4.16666666666667e+00
+1698 1324 -4.16666666666667e+00
+1698 1707 -1.25000000000000e+01
+1698 1595 8.33333333333333e+00
+1698 1700 -1.66666666666667e+01
+1698 1337 8.33333333333333e+00
+1698 1771 4.16666666666667e+00
+1698 1336 -4.16666666666667e+00
+1698 1593 -3.75000000000000e+01
+1698 1561 -4.16666666666667e+00
+1698 1411 4.16666666666667e+00
+1698 1412 4.16666666666667e+00
+1698 1562 -4.16666666666667e+00
+1698 1323 -1.25000000000000e+01
+1698 1424 -4.16666666666667e+00
+1698 1568 4.16666666666667e+00
+1698 1423 8.33333333333333e+00
+1698 1567 -8.33333333333333e+00
+1698 1422 -1.25000000000000e+01
+1698 1712 4.16666666666667e+00
+1698 1335 -1.25000000000000e+01
+1699 1699 1.25000000000000e+02
+1699 1712 4.16666666666667e+00
+1699 1710 -8.33333333333333e+00
+1699 1775 -4.16666666666667e+00
+1699 1703 -4.16666666666667e+00
+1699 1769 4.16666666666667e+00
+1699 1701 8.33333333333333e+00
+1699 1767 4.16666666666667e+00
+1699 1702 -1.25000000000000e+01
+1699 1592 4.16666666666667e+00
+1699 1595 -4.16666666666667e+00
+1699 1707 8.33333333333333e+00
+1699 1698 -1.66666666666667e+01
+1699 1593 8.33333333333333e+00
+1699 1709 8.33333333333333e+00
+1699 1708 -3.75000000000000e+01
+1699 1590 4.16666666666667e+00
+1699 1323 -4.16666666666667e+00
+1699 1772 -8.33333333333333e+00
+1699 1594 -1.25000000000000e+01
+1699 1770 4.16666666666667e+00
+1699 1335 -4.16666666666667e+00
+1699 1560 -4.16666666666667e+00
+1699 1410 4.16666666666667e+00
+1699 1562 -4.16666666666667e+00
+1699 1568 4.16666666666667e+00
+1699 1412 -8.33333333333333e+00
+1699 1325 8.33333333333333e+00
+1699 1324 -1.25000000000000e+01
+1699 1424 8.33333333333333e+00
+1699 1700 -1.66666666666667e+01
+1699 1337 8.33333333333333e+00
+1699 1423 -3.75000000000000e+01
+1699 1773 -4.16666666666667e+00
+1699 1336 -1.25000000000000e+01
+1699 1422 8.33333333333333e+00
+1699 1566 -8.33333333333333e+00
+1700 1700 1.25000000000000e+02
+1700 1773 -4.16666666666667e+00
+1700 1711 4.16666666666667e+00
+1700 1774 -4.16666666666667e+00
+1700 1702 -4.16666666666667e+00
+1700 1768 4.16666666666667e+00
+1700 1767 -8.33333333333333e+00
+1700 1703 -1.25000000000000e+01
+1700 1701 8.33333333333333e+00
+1700 1591 4.16666666666667e+00
+1700 1594 -4.16666666666667e+00
+1700 1707 -4.16666666666667e+00
+1700 1770 4.16666666666667e+00
+1700 1709 -1.25000000000000e+01
+1700 1708 8.33333333333333e+00
+1700 1590 -8.33333333333333e+00
+1700 1323 8.33333333333333e+00
+1700 1595 -1.25000000000000e+01
+1700 1771 -8.33333333333333e+00
+1700 1593 8.33333333333333e+00
+1700 1698 -1.66666666666667e+01
+1700 1335 8.33333333333333e+00
+1700 1561 -4.16666666666667e+00
+1700 1567 4.16666666666667e+00
+1700 1325 -3.75000000000000e+01
+1700 1411 -8.33333333333333e+00
+1700 1324 8.33333333333333e+00
+1700 1410 4.16666666666667e+00
+1700 1560 -4.16666666666667e+00
+1700 1424 -1.25000000000000e+01
+1700 1710 4.16666666666667e+00
+1700 1337 -3.75000000000000e+01
+1700 1423 8.33333333333333e+00
+1700 1699 -1.66666666666667e+01
+1700 1336 8.33333333333333e+00
+1700 1422 -4.16666666666667e+00
+1700 1566 4.16666666666667e+00
+1701 1701 1.25000000000000e+02
+1701 1726 -8.33333333333333e+00
+1701 1696 -4.16666666666667e+00
+1701 1414 4.16666666666667e+00
+1701 1415 4.16666666666667e+00
+1701 1697 8.33333333333333e+00
+1701 1695 -1.25000000000000e+01
+1701 1715 8.33333333333333e+00
+1701 1714 8.33333333333333e+00
+1701 1713 -3.75000000000000e+01
+1701 1790 -4.16666666666667e+00
+1701 1789 -4.16666666666667e+00
+1701 1712 -4.16666666666667e+00
+1701 1775 4.16666666666667e+00
+1701 1774 4.16666666666667e+00
+1701 1711 8.33333333333333e+00
+1701 1702 -1.66666666666667e+01
+1701 1710 -1.25000000000000e+01
+1701 1427 -4.16666666666667e+00
+1701 1703 -1.66666666666667e+01
+1701 1412 -4.16666666666667e+00
+1701 1424 4.16666666666667e+00
+1701 1699 8.33333333333333e+00
+1701 1426 8.33333333333333e+00
+1701 1423 -8.33333333333333e+00
+1701 1700 8.33333333333333e+00
+1701 1325 -8.33333333333333e+00
+1701 1324 4.16666666666667e+00
+1701 1411 -4.16666666666667e+00
+1701 1698 -3.75000000000000e+01
+1701 1769 8.33333333333333e+00
+1701 1340 -8.33333333333333e+00
+1701 1768 -4.16666666666667e+00
+1701 1339 4.16666666666667e+00
+1701 1767 -1.25000000000000e+01
+1701 1727 4.16666666666667e+00
+1701 1425 -1.25000000000000e+01
+1702 1702 1.25000000000000e+02
+1702 1725 -8.33333333333333e+00
+1702 1697 8.33333333333333e+00
+1702 1695 -4.16666666666667e+00
+1702 1413 4.16666666666667e+00
+1702 1415 -8.33333333333333e+00
+1702 1696 -1.25000000000000e+01
+1702 1715 -4.16666666666667e+00
+1702 1714 -1.25000000000000e+01
+1702 1713 8.33333333333333e+00
+1702 1788 -4.16666666666667e+00
+1702 1712 8.33333333333333e+00
+1702 1775 -8.33333333333333e+00
+1702 1773 4.16666666666667e+00
+1702 1325 4.16666666666667e+00
+1702 1711 -3.75000000000000e+01
+1702 1710 8.33333333333333e+00
+1702 1701 -1.66666666666667e+01
+1702 1790 -4.16666666666667e+00
+1702 1340 4.16666666666667e+00
+1702 1700 -4.16666666666667e+00
+1702 1698 8.33333333333333e+00
+1702 1412 -4.16666666666667e+00
+1702 1424 4.16666666666667e+00
+1702 1425 8.33333333333333e+00
+1702 1422 -8.33333333333333e+00
+1702 1699 -1.25000000000000e+01
+1702 1323 4.16666666666667e+00
+1702 1410 -4.16666666666667e+00
+1702 1769 8.33333333333333e+00
+1702 1703 -1.66666666666667e+01
+1702 1427 8.33333333333333e+00
+1702 1768 -1.25000000000000e+01
+1702 1727 4.16666666666667e+00
+1702 1426 -3.75000000000000e+01
+1702 1767 -4.16666666666667e+00
+1702 1338 4.16666666666667e+00
+1703 1703 1.25000000000000e+02
+1703 1726 4.16666666666667e+00
+1703 1696 8.33333333333333e+00
+1703 1414 -8.33333333333333e+00
+1703 1413 4.16666666666667e+00
+1703 1697 -3.75000000000000e+01
+1703 1695 8.33333333333333e+00
+1703 1715 -1.25000000000000e+01
+1703 1714 -4.16666666666667e+00
+1703 1713 8.33333333333333e+00
+1703 1788 -4.16666666666667e+00
+1703 1711 8.33333333333333e+00
+1703 1710 -4.16666666666667e+00
+1703 1773 4.16666666666667e+00
+1703 1774 -8.33333333333333e+00
+1703 1712 -1.25000000000000e+01
+1703 1324 4.16666666666667e+00
+1703 1789 -4.16666666666667e+00
+1703 1339 4.16666666666667e+00
+1703 1425 -4.16666666666667e+00
+1703 1699 -4.16666666666667e+00
+1703 1701 -1.66666666666667e+01
+1703 1410 -4.16666666666667e+00
+1703 1422 4.16666666666667e+00
+1703 1411 -4.16666666666667e+00
+1703 1423 4.16666666666667e+00
+1703 1700 -1.25000000000000e+01
+1703 1698 8.33333333333333e+00
+1703 1323 -8.33333333333333e+00
+1703 1769 -3.75000000000000e+01
+1703 1725 4.16666666666667e+00
+1703 1427 -1.25000000000000e+01
+1703 1768 8.33333333333333e+00
+1703 1702 -1.66666666666667e+01
+1703 1426 8.33333333333333e+00
+1703 1767 8.33333333333333e+00
+1703 1338 -8.33333333333333e+00
+1704 1704 6.25000000000000e+01
+1704 1726 4.16666666666667e+00
+1704 1727 -8.33333333333333e+00
+1704 1325 2.08333333333333e+00
+1704 1697 -2.08333333333333e+00
+1704 1696 4.16666666666667e+00
+1704 1695 -6.25000000000000e+00
+1704 1352 2.08333333333333e+00
+1704 1723 4.16666666666667e+00
+1704 1722 -1.87500000000000e+01
+1704 1711 -4.16666666666667e+00
+1704 1454 -2.08333333333333e+00
+1704 1705 -8.33333333333333e+00
+1704 1822 -4.16666666666667e+00
+1704 1459 4.16666666666667e+00
+1704 1823 -4.16666666666667e+00
+1704 1460 4.16666666666667e+00
+1704 1351 -4.16666666666667e+00
+1704 1453 4.16666666666667e+00
+1704 1452 -6.25000000000000e+00
+1704 1706 -8.33333333333333e+00
+1704 1448 4.16666666666667e+00
+1704 1712 8.33333333333333e+00
+1704 1447 4.16666666666667e+00
+1704 1324 -4.16666666666667e+00
+1704 1724 4.16666666666667e+00
+1704 1446 -1.87500000000000e+01
+1704 1710 -1.25000000000000e+01
+1705 1705 6.25000000000000e+01
+1705 1725 4.16666666666667e+00
+1705 1727 4.16666666666667e+00
+1705 1697 4.16666666666667e+00
+1705 1706 -8.33333333333333e+00
+1705 1696 -1.87500000000000e+01
+1705 1695 4.16666666666667e+00
+1705 1723 -6.25000000000000e+00
+1705 1722 4.16666666666667e+00
+1705 1710 -4.16666666666667e+00
+1705 1704 -8.33333333333333e+00
+1705 1454 4.16666666666667e+00
+1705 1821 -4.16666666666667e+00
+1705 1458 4.16666666666667e+00
+1705 1712 8.33333333333333e+00
+1705 1460 -8.33333333333333e+00
+1705 1352 2.08333333333333e+00
+1705 1823 -4.16666666666667e+00
+1705 1453 -1.87500000000000e+01
+1705 1350 -4.16666666666667e+00
+1705 1452 4.16666666666667e+00
+1705 1448 -2.08333333333333e+00
+1705 1325 2.08333333333333e+00
+1705 1724 -2.08333333333333e+00
+1705 1447 -6.25000000000000e+00
+1705 1711 -1.25000000000000e+01
+1705 1446 4.16666666666667e+00
+1705 1323 -4.16666666666667e+00
+1706 1706 6.25000000000000e+01
+1706 1722 4.16666666666667e+00
+1706 1726 4.16666666666667e+00
+1706 1725 -8.33333333333333e+00
+1706 1697 -6.25000000000000e+00
+1706 1696 4.16666666666667e+00
+1706 1705 -8.33333333333333e+00
+1706 1323 2.08333333333333e+00
+1706 1695 -2.08333333333333e+00
+1706 1724 -6.25000000000000e+00
+1706 1350 2.08333333333333e+00
+1706 1452 -2.08333333333333e+00
+1706 1453 4.16666666666667e+00
+1706 1711 8.33333333333333e+00
+1706 1459 -8.33333333333333e+00
+1706 1821 -4.16666666666667e+00
+1706 1458 4.16666666666667e+00
+1706 1454 -6.25000000000000e+00
+1706 1351 2.08333333333333e+00
+1706 1822 -4.16666666666667e+00
+1706 1723 -2.08333333333333e+00
+1706 1448 -6.25000000000000e+00
+1706 1712 -3.75000000000000e+01
+1706 1447 -2.08333333333333e+00
+1706 1324 2.08333333333333e+00
+1706 1704 -8.33333333333333e+00
+1706 1446 4.16666666666667e+00
+1706 1710 8.33333333333333e+00
+1707 1707 1.25000000000000e+02
+1707 1774 4.16666666666667e+00
+1707 1829 -4.16666666666667e+00
+1707 1460 4.16666666666667e+00
+1707 1459 -8.33333333333333e+00
+1707 1711 8.33333333333333e+00
+1707 1828 -4.16666666666667e+00
+1707 1712 8.33333333333333e+00
+1707 1710 -3.75000000000000e+01
+1707 1700 -4.16666666666667e+00
+1707 1595 4.16666666666667e+00
+1707 1699 8.33333333333333e+00
+1707 1594 -8.33333333333333e+00
+1707 1324 4.16666666666667e+00
+1707 1698 -1.25000000000000e+01
+1707 1709 -1.66666666666667e+01
+1707 1772 8.33333333333333e+00
+1707 1354 4.16666666666667e+00
+1707 1771 -4.16666666666667e+00
+1707 1770 -1.25000000000000e+01
+1707 1591 -4.16666666666667e+00
+1707 1448 8.33333333333333e+00
+1707 1444 4.16666666666667e+00
+1707 1447 -4.16666666666667e+00
+1707 1445 -8.33333333333333e+00
+1707 1604 8.33333333333333e+00
+1707 1325 4.16666666666667e+00
+1707 1592 -4.16666666666667e+00
+1707 1446 -1.25000000000000e+01
+1707 1457 -4.16666666666667e+00
+1707 1355 4.16666666666667e+00
+1707 1708 -1.66666666666667e+01
+1707 1456 8.33333333333333e+00
+1707 1603 8.33333333333333e+00
+1707 1775 -8.33333333333333e+00
+1707 1455 -1.25000000000000e+01
+1707 1602 -3.75000000000000e+01
+1708 1708 1.25000000000000e+02
+1708 1773 4.16666666666667e+00
+1708 1829 -4.16666666666667e+00
+1708 1460 4.16666666666667e+00
+1708 1712 -4.16666666666667e+00
+1708 1458 -8.33333333333333e+00
+1708 1710 8.33333333333333e+00
+1708 1827 -4.16666666666667e+00
+1708 1711 -1.25000000000000e+01
+1708 1595 4.16666666666667e+00
+1708 1698 8.33333333333333e+00
+1708 1593 -8.33333333333333e+00
+1708 1700 8.33333333333333e+00
+1708 1699 -3.75000000000000e+01
+1708 1323 4.16666666666667e+00
+1708 1772 8.33333333333333e+00
+1708 1771 -1.25000000000000e+01
+1708 1353 4.16666666666667e+00
+1708 1770 -4.16666666666667e+00
+1708 1590 -4.16666666666667e+00
+1708 1592 -4.16666666666667e+00
+1708 1709 -1.66666666666667e+01
+1708 1443 4.16666666666667e+00
+1708 1446 -4.16666666666667e+00
+1708 1445 4.16666666666667e+00
+1708 1604 -4.16666666666667e+00
+1708 1325 -8.33333333333333e+00
+1708 1448 8.33333333333333e+00
+1708 1447 -1.25000000000000e+01
+1708 1457 8.33333333333333e+00
+1708 1355 -8.33333333333333e+00
+1708 1775 4.16666666666667e+00
+1708 1456 -3.75000000000000e+01
+1708 1603 -1.25000000000000e+01
+1708 1707 -1.66666666666667e+01
+1708 1455 8.33333333333333e+00
+1708 1602 8.33333333333333e+00
+1709 1709 1.25000000000000e+02
+1709 1773 -8.33333333333333e+00
+1709 1827 -4.16666666666667e+00
+1709 1828 -4.16666666666667e+00
+1709 1458 4.16666666666667e+00
+1709 1459 4.16666666666667e+00
+1709 1711 -4.16666666666667e+00
+1709 1712 -1.25000000000000e+01
+1709 1710 8.33333333333333e+00
+1709 1594 4.16666666666667e+00
+1709 1698 -4.16666666666667e+00
+1709 1593 4.16666666666667e+00
+1709 1700 -1.25000000000000e+01
+1709 1699 8.33333333333333e+00
+1709 1772 -3.75000000000000e+01
+1709 1771 8.33333333333333e+00
+1709 1707 -1.66666666666667e+01
+1709 1770 8.33333333333333e+00
+1709 1591 -4.16666666666667e+00
+1709 1708 -1.66666666666667e+01
+1709 1446 8.33333333333333e+00
+1709 1444 4.16666666666667e+00
+1709 1603 -4.16666666666667e+00
+1709 1443 -8.33333333333333e+00
+1709 1602 8.33333333333333e+00
+1709 1448 -3.75000000000000e+01
+1709 1324 -8.33333333333333e+00
+1709 1447 8.33333333333333e+00
+1709 1323 4.16666666666667e+00
+1709 1590 -4.16666666666667e+00
+1709 1774 4.16666666666667e+00
+1709 1457 -1.25000000000000e+01
+1709 1604 -1.25000000000000e+01
+1709 1456 8.33333333333333e+00
+1709 1354 -8.33333333333333e+00
+1709 1455 -4.16666666666667e+00
+1709 1353 4.16666666666667e+00
+1710 1710 1.25000000000000e+02
+1710 1727 8.33333333333333e+00
+1710 1697 4.16666666666667e+00
+1710 1726 8.33333333333333e+00
+1710 1725 -3.75000000000000e+01
+1710 1705 -4.16666666666667e+00
+1710 1823 4.16666666666667e+00
+1710 1706 8.33333333333333e+00
+1710 1704 -1.25000000000000e+01
+1710 1822 -8.33333333333333e+00
+1710 1712 -1.66666666666667e+01
+1710 1358 -4.16666666666667e+00
+1710 1325 -4.16666666666667e+00
+1710 1789 4.16666666666667e+00
+1710 1774 -4.16666666666667e+00
+1710 1703 -4.16666666666667e+00
+1710 1700 4.16666666666667e+00
+1710 1790 -8.33333333333333e+00
+1710 1775 8.33333333333333e+00
+1710 1773 -1.25000000000000e+01
+1710 1702 8.33333333333333e+00
+1710 1699 -8.33333333333333e+00
+1710 1701 -1.25000000000000e+01
+1710 1460 -4.16666666666667e+00
+1710 1829 4.16666666666667e+00
+1710 1459 8.33333333333333e+00
+1710 1711 -1.66666666666667e+01
+1710 1708 8.33333333333333e+00
+1710 1828 4.16666666666667e+00
+1710 1357 -4.16666666666667e+00
+1710 1458 -1.25000000000000e+01
+1710 1709 8.33333333333333e+00
+1710 1448 -8.33333333333333e+00
+1710 1447 4.16666666666667e+00
+1710 1324 -4.16666666666667e+00
+1710 1707 -3.75000000000000e+01
+1710 1696 4.16666666666667e+00
+1711 1711 1.25000000000000e+02
+1711 1727 -4.16666666666667e+00
+1711 1697 -8.33333333333333e+00
+1711 1726 -1.25000000000000e+01
+1711 1725 8.33333333333333e+00
+1711 1704 -4.16666666666667e+00
+1711 1706 8.33333333333333e+00
+1711 1705 -1.25000000000000e+01
+1711 1823 4.16666666666667e+00
+1711 1821 -8.33333333333333e+00
+1711 1788 4.16666666666667e+00
+1711 1773 -4.16666666666667e+00
+1711 1703 8.33333333333333e+00
+1711 1712 -1.66666666666667e+01
+1711 1775 8.33333333333333e+00
+1711 1358 -4.16666666666667e+00
+1711 1790 4.16666666666667e+00
+1711 1774 -1.25000000000000e+01
+1711 1325 -4.16666666666667e+00
+1711 1700 4.16666666666667e+00
+1711 1702 -3.75000000000000e+01
+1711 1701 8.33333333333333e+00
+1711 1698 -8.33333333333333e+00
+1711 1448 4.16666666666667e+00
+1711 1709 -4.16666666666667e+00
+1711 1458 8.33333333333333e+00
+1711 1710 -1.66666666666667e+01
+1711 1707 8.33333333333333e+00
+1711 1829 -8.33333333333333e+00
+1711 1460 8.33333333333333e+00
+1711 1459 -3.75000000000000e+01
+1711 1827 4.16666666666667e+00
+1711 1356 -4.16666666666667e+00
+1711 1708 -1.25000000000000e+01
+1711 1695 4.16666666666667e+00
+1711 1446 4.16666666666667e+00
+1711 1323 -4.16666666666667e+00
+1712 1712 1.25000000000000e+02
+1712 1725 8.33333333333333e+00
+1712 1696 -8.33333333333333e+00
+1712 1695 4.16666666666667e+00
+1712 1727 -1.25000000000000e+01
+1712 1705 8.33333333333333e+00
+1712 1821 4.16666666666667e+00
+1712 1706 -3.75000000000000e+01
+1712 1704 8.33333333333333e+00
+1712 1822 4.16666666666667e+00
+1712 1710 -1.66666666666667e+01
+1712 1356 -4.16666666666667e+00
+1712 1323 -4.16666666666667e+00
+1712 1702 8.33333333333333e+00
+1712 1711 -1.66666666666667e+01
+1712 1774 8.33333333333333e+00
+1712 1701 -4.16666666666667e+00
+1712 1698 4.16666666666667e+00
+1712 1775 -3.75000000000000e+01
+1712 1357 -4.16666666666667e+00
+1712 1789 4.16666666666667e+00
+1712 1788 -8.33333333333333e+00
+1712 1773 8.33333333333333e+00
+1712 1703 -1.25000000000000e+01
+1712 1324 -4.16666666666667e+00
+1712 1699 4.16666666666667e+00
+1712 1458 -4.16666666666667e+00
+1712 1827 4.16666666666667e+00
+1712 1447 4.16666666666667e+00
+1712 1708 -4.16666666666667e+00
+1712 1460 -1.25000000000000e+01
+1712 1828 -8.33333333333333e+00
+1712 1459 8.33333333333333e+00
+1712 1709 -1.25000000000000e+01
+1712 1726 -4.16666666666667e+00
+1712 1707 8.33333333333333e+00
+1712 1446 -8.33333333333333e+00
+1713 1713 1.25000000000000e+02
+1713 1727 -4.16666666666667e+00
+1713 1726 8.33333333333333e+00
+1713 1725 -1.25000000000000e+01
+1713 1790 4.16666666666667e+00
+1713 1696 4.16666666666667e+00
+1713 1697 -8.33333333333333e+00
+1713 1703 8.33333333333333e+00
+1713 1702 8.33333333333333e+00
+1713 1701 -3.75000000000000e+01
+1713 1714 -1.66666666666667e+01
+1713 1327 -4.16666666666667e+00
+1713 1339 -4.16666666666667e+00
+1713 1792 -4.16666666666667e+00
+1713 1786 4.16666666666667e+00
+1713 1793 -4.16666666666667e+00
+1713 1730 4.16666666666667e+00
+1713 1328 8.33333333333333e+00
+1713 1715 -1.66666666666667e+01
+1713 1721 8.33333333333333e+00
+1713 1729 -8.33333333333333e+00
+1713 1720 8.33333333333333e+00
+1713 1719 -3.75000000000000e+01
+1713 1340 8.33333333333333e+00
+1713 1787 -8.33333333333333e+00
+1713 1414 -4.16666666666667e+00
+1713 1678 4.16666666666667e+00
+1713 1679 4.16666666666667e+00
+1713 1415 -4.16666666666667e+00
+1713 1326 -1.25000000000000e+01
+1713 1685 -4.16666666666667e+00
+1713 1427 4.16666666666667e+00
+1713 1684 8.33333333333333e+00
+1713 1426 -8.33333333333333e+00
+1713 1683 -1.25000000000000e+01
+1713 1789 4.16666666666667e+00
+1713 1338 -1.25000000000000e+01
+1714 1714 1.25000000000000e+02
+1714 1727 8.33333333333333e+00
+1714 1726 -3.75000000000000e+01
+1714 1725 8.33333333333333e+00
+1714 1790 -8.33333333333333e+00
+1714 1695 4.16666666666667e+00
+1714 1697 4.16666666666667e+00
+1714 1703 -4.16666666666667e+00
+1714 1702 -1.25000000000000e+01
+1714 1701 8.33333333333333e+00
+1714 1713 -1.66666666666667e+01
+1714 1326 -4.16666666666667e+00
+1714 1338 -4.16666666666667e+00
+1714 1791 -4.16666666666667e+00
+1714 1785 4.16666666666667e+00
+1714 1730 4.16666666666667e+00
+1714 1721 -4.16666666666667e+00
+1714 1720 -1.25000000000000e+01
+1714 1728 -8.33333333333333e+00
+1714 1719 8.33333333333333e+00
+1714 1793 -4.16666666666667e+00
+1714 1787 4.16666666666667e+00
+1714 1413 -4.16666666666667e+00
+1714 1677 4.16666666666667e+00
+1714 1415 -4.16666666666667e+00
+1714 1427 4.16666666666667e+00
+1714 1679 -8.33333333333333e+00
+1714 1328 8.33333333333333e+00
+1714 1327 -1.25000000000000e+01
+1714 1685 8.33333333333333e+00
+1714 1715 -1.66666666666667e+01
+1714 1340 8.33333333333333e+00
+1714 1684 -3.75000000000000e+01
+1714 1788 4.16666666666667e+00
+1714 1339 -1.25000000000000e+01
+1714 1683 8.33333333333333e+00
+1714 1425 -8.33333333333333e+00
+1715 1715 1.25000000000000e+02
+1715 1726 8.33333333333333e+00
+1715 1725 -4.16666666666667e+00
+1715 1789 -8.33333333333333e+00
+1715 1788 4.16666666666667e+00
+1715 1696 4.16666666666667e+00
+1715 1695 -8.33333333333333e+00
+1715 1703 -1.25000000000000e+01
+1715 1702 -4.16666666666667e+00
+1715 1701 8.33333333333333e+00
+1715 1791 -4.16666666666667e+00
+1715 1728 4.16666666666667e+00
+1715 1721 -1.25000000000000e+01
+1715 1729 4.16666666666667e+00
+1715 1720 -4.16666666666667e+00
+1715 1326 8.33333333333333e+00
+1715 1713 -1.66666666666667e+01
+1715 1719 8.33333333333333e+00
+1715 1792 -4.16666666666667e+00
+1715 1786 4.16666666666667e+00
+1715 1338 8.33333333333333e+00
+1715 1785 -8.33333333333333e+00
+1715 1414 -4.16666666666667e+00
+1715 1426 4.16666666666667e+00
+1715 1328 -3.75000000000000e+01
+1715 1678 -8.33333333333333e+00
+1715 1327 8.33333333333333e+00
+1715 1677 4.16666666666667e+00
+1715 1413 -4.16666666666667e+00
+1715 1685 -1.25000000000000e+01
+1715 1727 -1.25000000000000e+01
+1715 1340 -3.75000000000000e+01
+1715 1684 8.33333333333333e+00
+1715 1714 -1.66666666666667e+01
+1715 1339 8.33333333333333e+00
+1715 1683 -4.16666666666667e+00
+1715 1425 4.16666666666667e+00
+1716 1716 6.25000000000000e+01
+1716 1679 2.08333333333333e+00
+1716 1678 -4.16666666666667e+00
+1716 1687 4.16666666666667e+00
+1716 1686 -6.25000000000000e+00
+1716 1328 4.16666666666667e+00
+1716 1718 -8.33333333333333e+00
+1716 1721 8.33333333333333e+00
+1716 1720 -4.16666666666667e+00
+1716 1719 -1.25000000000000e+01
+1716 1729 4.16666666666667e+00
+1716 1463 -2.08333333333333e+00
+1716 1730 4.16666666666667e+00
+1716 1717 -8.33333333333333e+00
+1716 1462 4.16666666666667e+00
+1716 1327 4.16666666666667e+00
+1716 1688 -2.08333333333333e+00
+1716 1461 -6.25000000000000e+00
+1716 1326 -1.87500000000000e+01
+1716 41 4.16666666666667e+00
+1716 356 -8.33333333333333e+00
+1716 355 4.16666666666667e+00
+1716 364 -4.16666666666667e+00
+1716 194 2.08333333333333e+00
+1716 365 -4.16666666666667e+00
+1716 40 4.16666666666667e+00
+1716 193 -4.16666666666667e+00
+1716 39 -1.87500000000000e+01
+1717 1717 6.25000000000000e+01
+1717 1718 -8.33333333333333e+00
+1717 1328 -2.08333333333333e+00
+1717 1679 2.08333333333333e+00
+1717 1677 -4.16666666666667e+00
+1717 1687 -1.87500000000000e+01
+1717 1686 4.16666666666667e+00
+1717 1721 8.33333333333333e+00
+1717 1720 -1.25000000000000e+01
+1717 1719 -4.16666666666667e+00
+1717 1728 4.16666666666667e+00
+1717 1463 4.16666666666667e+00
+1717 1730 -8.33333333333333e+00
+1717 1688 4.16666666666667e+00
+1717 1462 -1.87500000000000e+01
+1717 1327 -6.25000000000000e+00
+1717 1716 -8.33333333333333e+00
+1717 1461 4.16666666666667e+00
+1717 1326 4.16666666666667e+00
+1717 41 -2.08333333333333e+00
+1717 356 4.16666666666667e+00
+1717 354 4.16666666666667e+00
+1717 363 -4.16666666666667e+00
+1717 194 2.08333333333333e+00
+1717 365 -4.16666666666667e+00
+1717 40 -6.25000000000000e+00
+1717 39 4.16666666666667e+00
+1717 192 -4.16666666666667e+00
+1718 1718 6.25000000000000e+01
+1718 1717 -8.33333333333333e+00
+1718 1686 -2.08333333333333e+00
+1718 1677 2.08333333333333e+00
+1718 1327 -2.08333333333333e+00
+1718 1678 2.08333333333333e+00
+1718 1688 -6.25000000000000e+00
+1718 1721 -3.75000000000000e+01
+1718 1720 8.33333333333333e+00
+1718 1326 4.16666666666667e+00
+1718 1716 -8.33333333333333e+00
+1718 1719 8.33333333333333e+00
+1718 1687 4.16666666666667e+00
+1718 1463 -6.25000000000000e+00
+1718 1328 -6.25000000000000e+00
+1718 1462 4.16666666666667e+00
+1718 1729 -8.33333333333333e+00
+1718 1461 -2.08333333333333e+00
+1718 1728 4.16666666666667e+00
+1718 40 -2.08333333333333e+00
+1718 355 4.16666666666667e+00
+1718 39 4.16666666666667e+00
+1718 354 -8.33333333333333e+00
+1718 193 2.08333333333333e+00
+1718 364 -4.16666666666667e+00
+1718 41 -6.25000000000000e+00
+1718 192 2.08333333333333e+00
+1718 363 -4.16666666666667e+00
+1719 1719 1.25000000000000e+02
+1719 1684 -8.33333333333333e+00
+1719 1679 -4.16666666666667e+00
+1719 1687 4.16666666666667e+00
+1719 1678 -4.16666666666667e+00
+1719 1688 4.16666666666667e+00
+1719 1694 -4.16666666666667e+00
+1719 1693 8.33333333333333e+00
+1719 1692 -1.25000000000000e+01
+1719 1718 8.33333333333333e+00
+1719 1327 4.16666666666667e+00
+1719 1717 -4.16666666666667e+00
+1719 1716 -1.25000000000000e+01
+1719 1721 -1.66666666666667e+01
+1719 1786 -4.16666666666667e+00
+1719 1730 -4.16666666666667e+00
+1719 1792 4.16666666666667e+00
+1719 1793 4.16666666666667e+00
+1719 1328 -8.33333333333333e+00
+1719 1715 8.33333333333333e+00
+1719 1729 8.33333333333333e+00
+1719 1714 8.33333333333333e+00
+1719 1720 -1.66666666666667e+01
+1719 1728 -1.25000000000000e+01
+1719 1713 -3.75000000000000e+01
+1719 1787 8.33333333333333e+00
+1719 1685 4.16666666666667e+00
+1719 1785 -1.25000000000000e+01
+1719 365 4.16666666666667e+00
+1719 364 -8.33333333333333e+00
+1719 355 8.33333333333333e+00
+1719 356 8.33333333333333e+00
+1719 52 4.16666666666667e+00
+1719 354 -3.75000000000000e+01
+1719 427 -4.16666666666667e+00
+1719 428 -4.16666666666667e+00
+1719 53 -8.33333333333333e+00
+1720 1720 1.25000000000000e+02
+1720 1683 -8.33333333333333e+00
+1720 1686 4.16666666666667e+00
+1720 1677 -4.16666666666667e+00
+1720 1688 -8.33333333333333e+00
+1720 1694 8.33333333333333e+00
+1720 1679 -4.16666666666667e+00
+1720 1693 -3.75000000000000e+01
+1720 1692 8.33333333333333e+00
+1720 1718 8.33333333333333e+00
+1720 1721 -1.66666666666667e+01
+1720 1717 -1.25000000000000e+01
+1720 1326 4.16666666666667e+00
+1720 1716 -4.16666666666667e+00
+1720 1785 -4.16666666666667e+00
+1720 1730 8.33333333333333e+00
+1720 1791 4.16666666666667e+00
+1720 1793 -8.33333333333333e+00
+1720 1787 8.33333333333333e+00
+1720 1328 4.16666666666667e+00
+1720 1715 -4.16666666666667e+00
+1720 1729 -3.75000000000000e+01
+1720 1714 -1.25000000000000e+01
+1720 1728 8.33333333333333e+00
+1720 1713 8.33333333333333e+00
+1720 1719 -1.66666666666667e+01
+1720 1685 4.16666666666667e+00
+1720 1786 -1.25000000000000e+01
+1720 365 4.16666666666667e+00
+1720 356 -4.16666666666667e+00
+1720 363 -8.33333333333333e+00
+1720 354 8.33333333333333e+00
+1720 355 -1.25000000000000e+01
+1720 51 4.16666666666667e+00
+1720 426 -4.16666666666667e+00
+1720 428 -4.16666666666667e+00
+1720 53 4.16666666666667e+00
+1721 1721 1.25000000000000e+02
+1721 1683 4.16666666666667e+00
+1721 1677 -4.16666666666667e+00
+1721 1687 -8.33333333333333e+00
+1721 1693 8.33333333333333e+00
+1721 1686 4.16666666666667e+00
+1721 1692 -4.16666666666667e+00
+1721 1678 -4.16666666666667e+00
+1721 1694 -1.25000000000000e+01
+1721 1718 -3.75000000000000e+01
+1721 1717 8.33333333333333e+00
+1721 1720 -1.66666666666667e+01
+1721 1716 8.33333333333333e+00
+1721 1719 -1.66666666666667e+01
+1721 1728 -4.16666666666667e+00
+1721 1729 8.33333333333333e+00
+1721 1792 -8.33333333333333e+00
+1721 1786 8.33333333333333e+00
+1721 1791 4.16666666666667e+00
+1721 1730 -1.25000000000000e+01
+1721 1715 -1.25000000000000e+01
+1721 1327 4.16666666666667e+00
+1721 1714 -4.16666666666667e+00
+1721 1326 -8.33333333333333e+00
+1721 1713 8.33333333333333e+00
+1721 1684 4.16666666666667e+00
+1721 1787 -3.75000000000000e+01
+1721 1785 8.33333333333333e+00
+1721 364 4.16666666666667e+00
+1721 355 -4.16666666666667e+00
+1721 363 4.16666666666667e+00
+1721 356 -1.25000000000000e+01
+1721 354 8.33333333333333e+00
+1721 426 -4.16666666666667e+00
+1721 427 -4.16666666666667e+00
+1721 52 4.16666666666667e+00
+1721 51 -8.33333333333333e+00
+1722 1722 6.25000000000000e+01
+1722 1706 4.16666666666667e+00
+1722 1697 2.08333333333333e+00
+1722 1328 -2.08333333333333e+00
+1722 1696 -4.16666666666667e+00
+1722 1352 -2.08333333333333e+00
+1722 1705 4.16666666666667e+00
+1722 1704 -1.87500000000000e+01
+1722 1823 4.16666666666667e+00
+1722 1822 4.16666666666667e+00
+1722 1727 8.33333333333333e+00
+1722 1726 -4.16666666666667e+00
+1722 1725 -1.25000000000000e+01
+1722 1729 4.16666666666667e+00
+1722 1825 -4.16666666666667e+00
+1722 1466 2.08333333333333e+00
+1722 1826 -4.16666666666667e+00
+1722 1465 -4.16666666666667e+00
+1722 1351 4.16666666666667e+00
+1722 1350 -6.25000000000000e+00
+1722 1463 4.16666666666667e+00
+1722 1730 -8.33333333333333e+00
+1722 1462 4.16666666666667e+00
+1722 1723 -8.33333333333333e+00
+1722 1327 4.16666666666667e+00
+1722 1461 -1.87500000000000e+01
+1722 1724 -8.33333333333333e+00
+1722 1326 -6.25000000000000e+00
+1723 1723 6.25000000000000e+01
+1723 1697 2.08333333333333e+00
+1723 1695 -4.16666666666667e+00
+1723 1705 -6.25000000000000e+00
+1723 1704 4.16666666666667e+00
+1723 1352 4.16666666666667e+00
+1723 1823 -8.33333333333333e+00
+1723 1821 4.16666666666667e+00
+1723 1724 -8.33333333333333e+00
+1723 1328 4.16666666666667e+00
+1723 1727 8.33333333333333e+00
+1723 1726 -1.25000000000000e+01
+1723 1725 -4.16666666666667e+00
+1723 1728 4.16666666666667e+00
+1723 1824 -4.16666666666667e+00
+1723 1466 2.08333333333333e+00
+1723 1826 -4.16666666666667e+00
+1723 1351 -1.87500000000000e+01
+1723 1464 -4.16666666666667e+00
+1723 1350 4.16666666666667e+00
+1723 1463 -2.08333333333333e+00
+1723 1730 4.16666666666667e+00
+1723 1462 -6.25000000000000e+00
+1723 1706 -2.08333333333333e+00
+1723 1327 -1.87500000000000e+01
+1723 1461 4.16666666666667e+00
+1723 1722 -8.33333333333333e+00
+1723 1326 4.16666666666667e+00
+1724 1724 6.25000000000000e+01
+1724 1696 2.08333333333333e+00
+1724 1722 -8.33333333333333e+00
+1724 1704 4.16666666666667e+00
+1724 1695 2.08333333333333e+00
+1724 1326 -2.08333333333333e+00
+1724 1706 -6.25000000000000e+00
+1724 1350 -2.08333333333333e+00
+1724 1821 4.16666666666667e+00
+1724 1351 4.16666666666667e+00
+1724 1822 -8.33333333333333e+00
+1724 1727 -3.75000000000000e+01
+1724 1723 -8.33333333333333e+00
+1724 1327 4.16666666666667e+00
+1724 1726 8.33333333333333e+00
+1724 1725 8.33333333333333e+00
+1724 1464 2.08333333333333e+00
+1724 1824 -4.16666666666667e+00
+1724 1352 -6.25000000000000e+00
+1724 1465 2.08333333333333e+00
+1724 1825 -4.16666666666667e+00
+1724 1463 -6.25000000000000e+00
+1724 1705 -2.08333333333333e+00
+1724 1328 -6.25000000000000e+00
+1724 1462 -2.08333333333333e+00
+1724 1729 4.16666666666667e+00
+1724 1461 4.16666666666667e+00
+1724 1728 -8.33333333333333e+00
+1725 1725 1.25000000000000e+02
+1725 1702 -8.33333333333333e+00
+1725 1696 -4.16666666666667e+00
+1725 1705 4.16666666666667e+00
+1725 1712 8.33333333333333e+00
+1725 1706 -8.33333333333333e+00
+1725 1697 -4.16666666666667e+00
+1725 1711 8.33333333333333e+00
+1725 1710 -3.75000000000000e+01
+1725 1826 4.16666666666667e+00
+1725 1823 -4.16666666666667e+00
+1725 1822 8.33333333333333e+00
+1725 1825 -8.33333333333333e+00
+1725 1724 8.33333333333333e+00
+1725 1727 -1.66666666666667e+01
+1725 1723 -4.16666666666667e+00
+1725 1327 4.16666666666667e+00
+1725 1722 -1.25000000000000e+01
+1725 1357 4.16666666666667e+00
+1725 1821 -1.25000000000000e+01
+1725 1789 -4.16666666666667e+00
+1725 1730 8.33333333333333e+00
+1725 1792 4.16666666666667e+00
+1725 1834 -4.16666666666667e+00
+1725 1793 -8.33333333333333e+00
+1725 1790 8.33333333333333e+00
+1725 1328 4.16666666666667e+00
+1725 1715 -4.16666666666667e+00
+1725 1729 8.33333333333333e+00
+1725 1714 8.33333333333333e+00
+1725 1726 -1.66666666666667e+01
+1725 1728 -3.75000000000000e+01
+1725 1713 -1.25000000000000e+01
+1725 1835 -4.16666666666667e+00
+1725 1358 4.16666666666667e+00
+1725 1703 4.16666666666667e+00
+1725 1788 -1.25000000000000e+01
+1726 1726 1.25000000000000e+02
+1726 1701 -8.33333333333333e+00
+1726 1697 -4.16666666666667e+00
+1726 1695 -4.16666666666667e+00
+1726 1704 4.16666666666667e+00
+1726 1712 -4.16666666666667e+00
+1726 1706 4.16666666666667e+00
+1726 1711 -1.25000000000000e+01
+1726 1710 8.33333333333333e+00
+1726 1826 4.16666666666667e+00
+1726 1821 8.33333333333333e+00
+1726 1824 -8.33333333333333e+00
+1726 1724 8.33333333333333e+00
+1726 1723 -1.25000000000000e+01
+1726 1722 -4.16666666666667e+00
+1726 1326 4.16666666666667e+00
+1726 1823 8.33333333333333e+00
+1726 1822 -3.75000000000000e+01
+1726 1356 4.16666666666667e+00
+1726 1727 -1.66666666666667e+01
+1726 1788 -4.16666666666667e+00
+1726 1730 -4.16666666666667e+00
+1726 1791 4.16666666666667e+00
+1726 1833 -4.16666666666667e+00
+1726 1835 -4.16666666666667e+00
+1726 1793 4.16666666666667e+00
+1726 1328 -8.33333333333333e+00
+1726 1715 8.33333333333333e+00
+1726 1729 -1.25000000000000e+01
+1726 1714 -3.75000000000000e+01
+1726 1728 8.33333333333333e+00
+1726 1713 8.33333333333333e+00
+1726 1725 -1.66666666666667e+01
+1726 1790 8.33333333333333e+00
+1726 1358 -8.33333333333333e+00
+1726 1703 4.16666666666667e+00
+1726 1789 -1.25000000000000e+01
+1727 1727 1.25000000000000e+02
+1727 1702 4.16666666666667e+00
+1727 1696 -4.16666666666667e+00
+1727 1711 -4.16666666666667e+00
+1727 1705 4.16666666666667e+00
+1727 1710 8.33333333333333e+00
+1727 1704 -8.33333333333333e+00
+1727 1695 -4.16666666666667e+00
+1727 1712 -1.25000000000000e+01
+1727 1824 4.16666666666667e+00
+1727 1821 -4.16666666666667e+00
+1727 1825 4.16666666666667e+00
+1727 1724 -3.75000000000000e+01
+1727 1723 8.33333333333333e+00
+1727 1722 8.33333333333333e+00
+1727 1725 -1.66666666666667e+01
+1727 1823 -1.25000000000000e+01
+1727 1822 8.33333333333333e+00
+1727 1726 -1.66666666666667e+01
+1727 1729 -4.16666666666667e+00
+1727 1728 8.33333333333333e+00
+1727 1834 -4.16666666666667e+00
+1727 1792 4.16666666666667e+00
+1727 1791 -8.33333333333333e+00
+1727 1788 8.33333333333333e+00
+1727 1730 -1.25000000000000e+01
+1727 1715 -1.25000000000000e+01
+1727 1327 -8.33333333333333e+00
+1727 1714 8.33333333333333e+00
+1727 1326 4.16666666666667e+00
+1727 1713 -4.16666666666667e+00
+1727 1701 4.16666666666667e+00
+1727 1790 -3.75000000000000e+01
+1727 1789 8.33333333333333e+00
+1727 1357 -8.33333333333333e+00
+1727 1833 -4.16666666666667e+00
+1727 1356 4.16666666666667e+00
+1728 1728 1.25000000000000e+02
+1728 1834 4.16666666666667e+00
+1728 1835 4.16666666666667e+00
+1728 1726 8.33333333333333e+00
+1728 1725 -3.75000000000000e+01
+1728 1723 4.16666666666667e+00
+1728 1826 -4.16666666666667e+00
+1728 1724 -8.33333333333333e+00
+1728 1825 8.33333333333333e+00
+1728 1824 -1.25000000000000e+01
+1728 1729 -1.66666666666667e+01
+1728 1327 -4.16666666666667e+00
+1728 1715 4.16666666666667e+00
+1728 1721 -4.16666666666667e+00
+1728 1792 -4.16666666666667e+00
+1728 1714 -8.33333333333333e+00
+1728 1720 8.33333333333333e+00
+1728 1719 -1.25000000000000e+01
+1728 1793 8.33333333333333e+00
+1728 1791 -1.25000000000000e+01
+1728 1462 -4.16666666666667e+00
+1728 1717 4.16666666666667e+00
+1728 1463 8.33333333333333e+00
+1728 1730 -1.66666666666667e+01
+1728 1718 4.16666666666667e+00
+1728 1328 -4.16666666666667e+00
+1728 1461 -1.25000000000000e+01
+1728 1727 8.33333333333333e+00
+1728 91 -4.16666666666667e+00
+1728 427 4.16666666666667e+00
+1728 428 -8.33333333333333e+00
+1728 365 8.33333333333333e+00
+1728 200 4.16666666666667e+00
+1728 92 -4.16666666666667e+00
+1728 364 8.33333333333333e+00
+1728 199 -8.33333333333333e+00
+1728 363 -3.75000000000000e+01
+1729 1729 1.25000000000000e+02
+1729 1833 4.16666666666667e+00
+1729 1835 -8.33333333333333e+00
+1729 1726 -1.25000000000000e+01
+1729 1725 8.33333333333333e+00
+1729 1722 4.16666666666667e+00
+1729 1826 8.33333333333333e+00
+1729 1724 4.16666666666667e+00
+1729 1825 -3.75000000000000e+01
+1729 1824 8.33333333333333e+00
+1729 1728 -1.66666666666667e+01
+1729 1326 -4.16666666666667e+00
+1729 1793 8.33333333333333e+00
+1729 1730 -1.66666666666667e+01
+1729 1721 8.33333333333333e+00
+1729 1791 -4.16666666666667e+00
+1729 1328 -4.16666666666667e+00
+1729 1715 4.16666666666667e+00
+1729 1720 -3.75000000000000e+01
+1729 1713 -8.33333333333333e+00
+1729 1719 8.33333333333333e+00
+1729 1792 -1.25000000000000e+01
+1729 1461 -4.16666666666667e+00
+1729 1716 4.16666666666667e+00
+1729 1718 -8.33333333333333e+00
+1729 1463 8.33333333333333e+00
+1729 1462 -1.25000000000000e+01
+1729 1727 -4.16666666666667e+00
+1729 90 -4.16666666666667e+00
+1729 426 4.16666666666667e+00
+1729 92 -4.16666666666667e+00
+1729 428 4.16666666666667e+00
+1729 200 4.16666666666667e+00
+1729 365 -4.16666666666667e+00
+1729 364 -1.25000000000000e+01
+1729 363 8.33333333333333e+00
+1729 198 -8.33333333333333e+00
+1730 1730 1.25000000000000e+02
+1730 1725 8.33333333333333e+00
+1730 1834 -8.33333333333333e+00
+1730 1833 4.16666666666667e+00
+1730 1727 -1.25000000000000e+01
+1730 1825 8.33333333333333e+00
+1730 1824 -4.16666666666667e+00
+1730 1723 4.16666666666667e+00
+1730 1722 -8.33333333333333e+00
+1730 1826 -1.25000000000000e+01
+1730 1713 4.16666666666667e+00
+1730 1719 -4.16666666666667e+00
+1730 1792 8.33333333333333e+00
+1730 1729 -1.66666666666667e+01
+1730 1720 8.33333333333333e+00
+1730 1721 -1.25000000000000e+01
+1730 1327 -4.16666666666667e+00
+1730 1714 4.16666666666667e+00
+1730 1793 -3.75000000000000e+01
+1730 1791 8.33333333333333e+00
+1730 1461 8.33333333333333e+00
+1730 1728 -1.66666666666667e+01
+1730 1463 -3.75000000000000e+01
+1730 1717 -8.33333333333333e+00
+1730 1462 8.33333333333333e+00
+1730 1716 4.16666666666667e+00
+1730 1326 -4.16666666666667e+00
+1730 1726 -4.16666666666667e+00
+1730 91 -4.16666666666667e+00
+1730 427 4.16666666666667e+00
+1730 426 -8.33333333333333e+00
+1730 199 4.16666666666667e+00
+1730 364 -4.16666666666667e+00
+1730 363 8.33333333333333e+00
+1730 365 -1.25000000000000e+01
+1730 198 4.16666666666667e+00
+1730 90 -4.16666666666667e+00
+1731 1731 6.25000000000000e+01
+1731 1763 -4.16666666666667e+00
+1731 1760 -4.16666666666667e+00
+1731 1759 2.08333333333333e+00
+1731 1762 -4.16666666666667e+00
+1731 1742 4.16666666666667e+00
+1731 1741 -2.08333333333333e+00
+1731 1747 4.16666666666667e+00
+1731 1740 -6.25000000000000e+00
+1731 1420 -2.08333333333333e+00
+1731 1417 2.08333333333333e+00
+1731 1751 4.16666666666667e+00
+1731 1739 -4.16666666666667e+00
+1731 1331 4.16666666666667e+00
+1731 1418 -4.16666666666667e+00
+1731 1330 4.16666666666667e+00
+1731 1732 -8.33333333333333e+00
+1731 1738 8.33333333333333e+00
+1731 1329 -1.87500000000000e+01
+1731 1737 -1.25000000000000e+01
+1731 1733 -8.33333333333333e+00
+1731 1334 4.16666666666667e+00
+1731 1421 4.16666666666667e+00
+1731 1333 4.16666666666667e+00
+1731 1750 -8.33333333333333e+00
+1731 1748 4.16666666666667e+00
+1731 1332 -1.87500000000000e+01
+1731 1419 -6.25000000000000e+00
+1732 1732 6.25000000000000e+01
+1732 1763 -4.16666666666667e+00
+1732 1758 2.08333333333333e+00
+1732 1761 -4.16666666666667e+00
+1732 1742 4.16666666666667e+00
+1732 1748 -8.33333333333333e+00
+1732 1741 -6.25000000000000e+00
+1732 1740 -2.08333333333333e+00
+1732 1746 4.16666666666667e+00
+1732 1419 -2.08333333333333e+00
+1732 1416 2.08333333333333e+00
+1732 1421 4.16666666666667e+00
+1732 1733 -8.33333333333333e+00
+1732 1739 8.33333333333333e+00
+1732 1331 -2.08333333333333e+00
+1732 1418 2.08333333333333e+00
+1732 1330 -6.25000000000000e+00
+1732 1738 -3.75000000000000e+01
+1732 1329 4.16666666666667e+00
+1732 1731 -8.33333333333333e+00
+1732 1737 8.33333333333333e+00
+1732 1334 -2.08333333333333e+00
+1732 1751 4.16666666666667e+00
+1732 1760 2.08333333333333e+00
+1732 1333 -6.25000000000000e+00
+1732 1420 -6.25000000000000e+00
+1732 1332 4.16666666666667e+00
+1732 1749 -8.33333333333333e+00
+1733 1733 6.25000000000000e+01
+1733 1762 -4.16666666666667e+00
+1733 1746 4.16666666666667e+00
+1733 1761 -4.16666666666667e+00
+1733 1758 -4.16666666666667e+00
+1733 1742 -1.87500000000000e+01
+1733 1741 4.16666666666667e+00
+1733 1747 -8.33333333333333e+00
+1733 1740 4.16666666666667e+00
+1733 1420 4.16666666666667e+00
+1733 1732 -8.33333333333333e+00
+1733 1738 8.33333333333333e+00
+1733 1749 4.16666666666667e+00
+1733 1737 -4.16666666666667e+00
+1733 1331 -6.25000000000000e+00
+1733 1739 -1.25000000000000e+01
+1733 1330 -2.08333333333333e+00
+1733 1417 2.08333333333333e+00
+1733 1329 4.16666666666667e+00
+1733 1416 -4.16666666666667e+00
+1733 1759 2.08333333333333e+00
+1733 1334 -6.25000000000000e+00
+1733 1421 -1.87500000000000e+01
+1733 1333 -2.08333333333333e+00
+1733 1750 4.16666666666667e+00
+1733 1731 -8.33333333333333e+00
+1733 1332 4.16666666666667e+00
+1733 1419 4.16666666666667e+00
+1734 1734 1.25000000000000e+02
+1734 1748 -8.33333333333333e+00
+1734 1747 4.16666666666667e+00
+1734 1780 -4.16666666666667e+00
+1734 1739 8.33333333333333e+00
+1734 1769 4.16666666666667e+00
+1734 1768 -8.33333333333333e+00
+1734 1738 8.33333333333333e+00
+1734 1737 -3.75000000000000e+01
+1734 1736 -1.66666666666667e+01
+1734 1745 8.33333333333333e+00
+1734 1744 -4.16666666666667e+00
+1734 1777 4.16666666666667e+00
+1734 1778 4.16666666666667e+00
+1734 1337 -4.16666666666667e+00
+1734 1331 -4.16666666666667e+00
+1734 1743 -1.25000000000000e+01
+1734 1628 4.16666666666667e+00
+1734 1330 8.33333333333333e+00
+1734 1627 -8.33333333333333e+00
+1734 1631 8.33333333333333e+00
+1734 1735 -1.66666666666667e+01
+1734 1336 8.33333333333333e+00
+1734 1630 8.33333333333333e+00
+1734 1629 -3.75000000000000e+01
+1734 1418 4.16666666666667e+00
+1734 1565 -4.16666666666667e+00
+1734 1417 4.16666666666667e+00
+1734 1564 -4.16666666666667e+00
+1734 1329 -1.25000000000000e+01
+1734 1424 8.33333333333333e+00
+1734 1568 -8.33333333333333e+00
+1734 1423 -4.16666666666667e+00
+1734 1567 4.16666666666667e+00
+1734 1422 -1.25000000000000e+01
+1734 1781 -4.16666666666667e+00
+1734 1335 -1.25000000000000e+01
+1735 1735 1.25000000000000e+02
+1735 1781 -4.16666666666667e+00
+1735 1746 4.16666666666667e+00
+1735 1779 -4.16666666666667e+00
+1735 1769 4.16666666666667e+00
+1735 1739 -4.16666666666667e+00
+1735 1767 -8.33333333333333e+00
+1735 1738 -1.25000000000000e+01
+1735 1737 8.33333333333333e+00
+1735 1743 -4.16666666666667e+00
+1735 1776 4.16666666666667e+00
+1735 1778 -8.33333333333333e+00
+1735 1745 8.33333333333333e+00
+1735 1744 -1.25000000000000e+01
+1735 1628 4.16666666666667e+00
+1735 1329 8.33333333333333e+00
+1735 1626 -8.33333333333333e+00
+1735 1631 -4.16666666666667e+00
+1735 1630 -1.25000000000000e+01
+1735 1734 -1.66666666666667e+01
+1735 1335 8.33333333333333e+00
+1735 1629 8.33333333333333e+00
+1735 1568 4.16666666666667e+00
+1735 1565 -4.16666666666667e+00
+1735 1418 -8.33333333333333e+00
+1735 1331 8.33333333333333e+00
+1735 1330 -3.75000000000000e+01
+1735 1416 4.16666666666667e+00
+1735 1563 -4.16666666666667e+00
+1735 1424 8.33333333333333e+00
+1735 1736 -1.66666666666667e+01
+1735 1337 8.33333333333333e+00
+1735 1423 -1.25000000000000e+01
+1735 1748 4.16666666666667e+00
+1735 1336 -3.75000000000000e+01
+1735 1422 -4.16666666666667e+00
+1735 1566 4.16666666666667e+00
+1736 1736 1.25000000000000e+02
+1736 1747 4.16666666666667e+00
+1736 1780 -4.16666666666667e+00
+1736 1746 -8.33333333333333e+00
+1736 1768 4.16666666666667e+00
+1736 1738 -4.16666666666667e+00
+1736 1737 8.33333333333333e+00
+1736 1767 4.16666666666667e+00
+1736 1739 -1.25000000000000e+01
+1736 1734 -1.66666666666667e+01
+1736 1743 8.33333333333333e+00
+1736 1777 -8.33333333333333e+00
+1736 1776 4.16666666666667e+00
+1736 1335 -4.16666666666667e+00
+1736 1745 -3.75000000000000e+01
+1736 1744 8.33333333333333e+00
+1736 1329 -4.16666666666667e+00
+1736 1626 4.16666666666667e+00
+1736 1627 4.16666666666667e+00
+1736 1631 -1.25000000000000e+01
+1736 1630 -4.16666666666667e+00
+1736 1629 8.33333333333333e+00
+1736 1567 4.16666666666667e+00
+1736 1564 -4.16666666666667e+00
+1736 1416 4.16666666666667e+00
+1736 1563 -4.16666666666667e+00
+1736 1331 -1.25000000000000e+01
+1736 1417 -8.33333333333333e+00
+1736 1330 8.33333333333333e+00
+1736 1424 -3.75000000000000e+01
+1736 1779 -4.16666666666667e+00
+1736 1337 -1.25000000000000e+01
+1736 1423 8.33333333333333e+00
+1736 1735 -1.66666666666667e+01
+1736 1336 8.33333333333333e+00
+1736 1422 8.33333333333333e+00
+1736 1566 -8.33333333333333e+00
+1737 1737 1.25000000000000e+02
+1737 1781 4.16666666666667e+00
+1737 1736 8.33333333333333e+00
+1737 1424 -8.33333333333333e+00
+1737 1423 4.16666666666667e+00
+1737 1735 8.33333333333333e+00
+1737 1734 -3.75000000000000e+01
+1737 1769 -4.16666666666667e+00
+1737 1768 8.33333333333333e+00
+1737 1767 -1.25000000000000e+01
+1737 1747 -4.16666666666667e+00
+1737 1795 -4.16666666666667e+00
+1737 1762 4.16666666666667e+00
+1737 1748 8.33333333333333e+00
+1737 1763 -8.33333333333333e+00
+1737 1340 4.16666666666667e+00
+1737 1796 -4.16666666666667e+00
+1737 1331 4.16666666666667e+00
+1737 1746 -1.25000000000000e+01
+1737 1418 -4.16666666666667e+00
+1737 1417 -4.16666666666667e+00
+1737 1421 4.16666666666667e+00
+1737 1733 -4.16666666666667e+00
+1737 1738 -1.66666666666667e+01
+1737 1420 4.16666666666667e+00
+1737 1426 -4.16666666666667e+00
+1737 1330 -8.33333333333333e+00
+1737 1732 8.33333333333333e+00
+1737 1731 -1.25000000000000e+01
+1737 1739 -1.66666666666667e+01
+1737 1751 8.33333333333333e+00
+1737 1427 8.33333333333333e+00
+1737 1750 8.33333333333333e+00
+1737 1339 -8.33333333333333e+00
+1737 1780 4.16666666666667e+00
+1737 1749 -3.75000000000000e+01
+1737 1425 -1.25000000000000e+01
+1738 1738 1.25000000000000e+02
+1738 1781 -8.33333333333333e+00
+1738 1736 -4.16666666666667e+00
+1738 1424 4.16666666666667e+00
+1738 1422 4.16666666666667e+00
+1738 1735 -1.25000000000000e+01
+1738 1734 8.33333333333333e+00
+1738 1769 8.33333333333333e+00
+1738 1768 -3.75000000000000e+01
+1738 1767 8.33333333333333e+00
+1738 1746 -4.16666666666667e+00
+1738 1794 -4.16666666666667e+00
+1738 1761 4.16666666666667e+00
+1738 1796 -4.16666666666667e+00
+1738 1763 4.16666666666667e+00
+1738 1739 -1.66666666666667e+01
+1738 1748 8.33333333333333e+00
+1738 1747 -1.25000000000000e+01
+1738 1416 -4.16666666666667e+00
+1738 1733 8.33333333333333e+00
+1738 1737 -1.66666666666667e+01
+1738 1421 -8.33333333333333e+00
+1738 1427 8.33333333333333e+00
+1738 1419 4.16666666666667e+00
+1738 1425 -4.16666666666667e+00
+1738 1331 4.16666666666667e+00
+1738 1418 -4.16666666666667e+00
+1738 1732 -3.75000000000000e+01
+1738 1329 -8.33333333333333e+00
+1738 1731 8.33333333333333e+00
+1738 1751 -4.16666666666667e+00
+1738 1340 4.16666666666667e+00
+1738 1779 4.16666666666667e+00
+1738 1750 -1.25000000000000e+01
+1738 1426 -1.25000000000000e+01
+1738 1749 8.33333333333333e+00
+1738 1338 -8.33333333333333e+00
+1739 1739 1.25000000000000e+02
+1739 1779 4.16666666666667e+00
+1739 1735 -4.16666666666667e+00
+1739 1423 4.16666666666667e+00
+1739 1734 8.33333333333333e+00
+1739 1422 -8.33333333333333e+00
+1739 1736 -1.25000000000000e+01
+1739 1769 -1.25000000000000e+01
+1739 1768 8.33333333333333e+00
+1739 1767 -4.16666666666667e+00
+1739 1795 -4.16666666666667e+00
+1739 1762 4.16666666666667e+00
+1739 1746 8.33333333333333e+00
+1739 1761 -8.33333333333333e+00
+1739 1338 4.16666666666667e+00
+1739 1794 -4.16666666666667e+00
+1739 1748 -3.75000000000000e+01
+1739 1738 -1.66666666666667e+01
+1739 1747 8.33333333333333e+00
+1739 1329 4.16666666666667e+00
+1739 1416 -4.16666666666667e+00
+1739 1732 8.33333333333333e+00
+1739 1419 4.16666666666667e+00
+1739 1731 -4.16666666666667e+00
+1739 1420 -8.33333333333333e+00
+1739 1426 8.33333333333333e+00
+1739 1733 -1.25000000000000e+01
+1739 1330 4.16666666666667e+00
+1739 1417 -4.16666666666667e+00
+1739 1780 -8.33333333333333e+00
+1739 1751 -1.25000000000000e+01
+1739 1427 -3.75000000000000e+01
+1739 1750 -4.16666666666667e+00
+1739 1339 4.16666666666667e+00
+1739 1737 -1.66666666666667e+01
+1739 1749 8.33333333333333e+00
+1739 1425 8.33333333333333e+00
+1740 1740 6.25000000000000e+01
+1740 1763 4.16666666666667e+00
+1740 1762 -8.33333333333333e+00
+1740 1733 4.16666666666667e+00
+1740 1732 -2.08333333333333e+00
+1740 1330 2.08333333333333e+00
+1740 1731 -6.25000000000000e+00
+1740 1760 4.16666666666667e+00
+1740 1369 2.08333333333333e+00
+1740 1758 -1.87500000000000e+01
+1740 1748 -4.16666666666667e+00
+1740 1742 -8.33333333333333e+00
+1740 1489 -2.08333333333333e+00
+1740 1859 -4.16666666666667e+00
+1740 1496 4.16666666666667e+00
+1740 1858 -4.16666666666667e+00
+1740 1495 4.16666666666667e+00
+1740 1490 4.16666666666667e+00
+1740 1370 -4.16666666666667e+00
+1740 1488 -6.25000000000000e+00
+1740 1484 4.16666666666667e+00
+1740 1331 -4.16666666666667e+00
+1740 1483 4.16666666666667e+00
+1740 1741 -8.33333333333333e+00
+1740 1747 8.33333333333333e+00
+1740 1482 -1.87500000000000e+01
+1740 1759 4.16666666666667e+00
+1740 1746 -1.25000000000000e+01
+1741 1741 6.25000000000000e+01
+1741 1758 4.16666666666667e+00
+1741 1763 4.16666666666667e+00
+1741 1761 -8.33333333333333e+00
+1741 1733 4.16666666666667e+00
+1741 1742 -8.33333333333333e+00
+1741 1732 -6.25000000000000e+00
+1741 1731 -2.08333333333333e+00
+1741 1329 2.08333333333333e+00
+1741 1759 -6.25000000000000e+00
+1741 1368 2.08333333333333e+00
+1741 1488 -2.08333333333333e+00
+1741 1490 4.16666666666667e+00
+1741 1748 8.33333333333333e+00
+1741 1496 -8.33333333333333e+00
+1741 1857 -4.16666666666667e+00
+1741 1494 4.16666666666667e+00
+1741 1370 2.08333333333333e+00
+1741 1859 -4.16666666666667e+00
+1741 1489 -6.25000000000000e+00
+1741 1484 -2.08333333333333e+00
+1741 1331 2.08333333333333e+00
+1741 1483 -6.25000000000000e+00
+1741 1760 -2.08333333333333e+00
+1741 1747 -3.75000000000000e+01
+1741 1482 4.16666666666667e+00
+1741 1740 -8.33333333333333e+00
+1741 1746 8.33333333333333e+00
+1742 1742 6.25000000000000e+01
+1742 1761 4.16666666666667e+00
+1742 1762 4.16666666666667e+00
+1742 1733 -1.87500000000000e+01
+1742 1732 4.16666666666667e+00
+1742 1741 -8.33333333333333e+00
+1742 1731 4.16666666666667e+00
+1742 1760 -6.25000000000000e+00
+1742 1758 4.16666666666667e+00
+1742 1746 -4.16666666666667e+00
+1742 1740 -8.33333333333333e+00
+1742 1489 4.16666666666667e+00
+1742 1857 -4.16666666666667e+00
+1742 1494 4.16666666666667e+00
+1742 1747 8.33333333333333e+00
+1742 1495 -8.33333333333333e+00
+1742 1490 -1.87500000000000e+01
+1742 1369 2.08333333333333e+00
+1742 1858 -4.16666666666667e+00
+1742 1488 4.16666666666667e+00
+1742 1368 -4.16666666666667e+00
+1742 1484 -6.25000000000000e+00
+1742 1759 -2.08333333333333e+00
+1742 1748 -1.25000000000000e+01
+1742 1483 -2.08333333333333e+00
+1742 1330 2.08333333333333e+00
+1742 1482 4.16666666666667e+00
+1742 1329 -4.16666666666667e+00
+1743 1743 1.25000000000000e+02
+1743 1780 -8.33333333333333e+00
+1743 1748 8.33333333333333e+00
+1743 1496 -8.33333333333333e+00
+1743 1864 -4.16666666666667e+00
+1743 1495 4.16666666666667e+00
+1743 1865 -4.16666666666667e+00
+1743 1747 8.33333333333333e+00
+1743 1746 -3.75000000000000e+01
+1743 1736 8.33333333333333e+00
+1743 1735 -4.16666666666667e+00
+1743 1631 -8.33333333333333e+00
+1743 1630 4.16666666666667e+00
+1743 1373 4.16666666666667e+00
+1743 1778 -4.16666666666667e+00
+1743 1777 8.33333333333333e+00
+1743 1744 -1.66666666666667e+01
+1743 1776 -1.25000000000000e+01
+1743 1331 4.16666666666667e+00
+1743 1734 -1.25000000000000e+01
+1743 1484 -4.16666666666667e+00
+1743 1483 8.33333333333333e+00
+1743 1628 -4.16666666666667e+00
+1743 1481 4.16666666666667e+00
+1743 1639 8.33333333333333e+00
+1743 1480 -8.33333333333333e+00
+1743 1330 4.16666666666667e+00
+1743 1627 -4.16666666666667e+00
+1743 1482 -1.25000000000000e+01
+1743 1745 -1.66666666666667e+01
+1743 1493 8.33333333333333e+00
+1743 1640 8.33333333333333e+00
+1743 1492 -4.16666666666667e+00
+1743 1372 4.16666666666667e+00
+1743 1781 4.16666666666667e+00
+1743 1491 -1.25000000000000e+01
+1743 1638 -3.75000000000000e+01
+1744 1744 1.25000000000000e+02
+1744 1779 -8.33333333333333e+00
+1744 1748 -4.16666666666667e+00
+1744 1865 -4.16666666666667e+00
+1744 1496 4.16666666666667e+00
+1744 1863 -4.16666666666667e+00
+1744 1494 4.16666666666667e+00
+1744 1747 -1.25000000000000e+01
+1744 1746 8.33333333333333e+00
+1744 1734 -4.16666666666667e+00
+1744 1631 4.16666666666667e+00
+1744 1629 4.16666666666667e+00
+1744 1778 8.33333333333333e+00
+1744 1777 -3.75000000000000e+01
+1744 1776 8.33333333333333e+00
+1744 1743 -1.66666666666667e+01
+1744 1736 8.33333333333333e+00
+1744 1735 -1.25000000000000e+01
+1744 1640 -4.16666666666667e+00
+1744 1745 -1.66666666666667e+01
+1744 1628 -4.16666666666667e+00
+1744 1481 4.16666666666667e+00
+1744 1482 8.33333333333333e+00
+1744 1638 8.33333333333333e+00
+1744 1479 -8.33333333333333e+00
+1744 1331 -8.33333333333333e+00
+1744 1484 8.33333333333333e+00
+1744 1483 -3.75000000000000e+01
+1744 1329 4.16666666666667e+00
+1744 1626 -4.16666666666667e+00
+1744 1493 8.33333333333333e+00
+1744 1373 -8.33333333333333e+00
+1744 1781 4.16666666666667e+00
+1744 1492 -1.25000000000000e+01
+1744 1639 -1.25000000000000e+01
+1744 1491 -4.16666666666667e+00
+1744 1371 4.16666666666667e+00
+1745 1745 1.25000000000000e+02
+1745 1779 4.16666666666667e+00
+1745 1747 -4.16666666666667e+00
+1745 1864 -4.16666666666667e+00
+1745 1495 4.16666666666667e+00
+1745 1746 8.33333333333333e+00
+1745 1494 -8.33333333333333e+00
+1745 1863 -4.16666666666667e+00
+1745 1748 -1.25000000000000e+01
+1745 1734 8.33333333333333e+00
+1745 1630 4.16666666666667e+00
+1745 1629 -8.33333333333333e+00
+1745 1778 -1.25000000000000e+01
+1745 1777 8.33333333333333e+00
+1745 1371 4.16666666666667e+00
+1745 1776 -4.16666666666667e+00
+1745 1736 -3.75000000000000e+01
+1745 1735 8.33333333333333e+00
+1745 1329 4.16666666666667e+00
+1745 1639 -4.16666666666667e+00
+1745 1744 -1.66666666666667e+01
+1745 1482 -4.16666666666667e+00
+1745 1627 -4.16666666666667e+00
+1745 1480 4.16666666666667e+00
+1745 1626 -4.16666666666667e+00
+1745 1479 4.16666666666667e+00
+1745 1484 -1.25000000000000e+01
+1745 1330 -8.33333333333333e+00
+1745 1483 8.33333333333333e+00
+1745 1780 4.16666666666667e+00
+1745 1493 -3.75000000000000e+01
+1745 1640 -1.25000000000000e+01
+1745 1492 8.33333333333333e+00
+1745 1372 -8.33333333333333e+00
+1745 1743 -1.66666666666667e+01
+1745 1491 8.33333333333333e+00
+1745 1638 8.33333333333333e+00
+1746 1746 1.25000000000000e+02
+1746 1780 8.33333333333333e+00
+1746 1736 -8.33333333333333e+00
+1746 1735 4.16666666666667e+00
+1746 1779 -1.25000000000000e+01
+1746 1745 8.33333333333333e+00
+1746 1864 4.16666666666667e+00
+1746 1744 8.33333333333333e+00
+1746 1743 -3.75000000000000e+01
+1746 1865 4.16666666666667e+00
+1746 1738 -4.16666666666667e+00
+1746 1739 8.33333333333333e+00
+1746 1748 -1.66666666666667e+01
+1746 1331 -4.16666666666667e+00
+1746 1737 -1.25000000000000e+01
+1746 1796 4.16666666666667e+00
+1746 1376 -4.16666666666667e+00
+1746 1795 -8.33333333333333e+00
+1746 1733 4.16666666666667e+00
+1746 1747 -1.66666666666667e+01
+1746 1762 8.33333333333333e+00
+1746 1732 4.16666666666667e+00
+1746 1330 -4.16666666666667e+00
+1746 1763 8.33333333333333e+00
+1746 1375 -4.16666666666667e+00
+1746 1761 -3.75000000000000e+01
+1746 1742 -4.16666666666667e+00
+1746 1484 4.16666666666667e+00
+1746 1858 4.16666666666667e+00
+1746 1495 -4.16666666666667e+00
+1746 1483 -8.33333333333333e+00
+1746 1741 8.33333333333333e+00
+1746 1740 -1.25000000000000e+01
+1746 1496 8.33333333333333e+00
+1746 1859 -8.33333333333333e+00
+1746 1494 -1.25000000000000e+01
+1746 1781 -4.16666666666667e+00
+1747 1747 1.25000000000000e+02
+1747 1779 8.33333333333333e+00
+1747 1734 4.16666666666667e+00
+1747 1781 8.33333333333333e+00
+1747 1780 -3.75000000000000e+01
+1747 1745 -4.16666666666667e+00
+1747 1863 4.16666666666667e+00
+1747 1744 -1.25000000000000e+01
+1747 1743 8.33333333333333e+00
+1747 1865 -8.33333333333333e+00
+1747 1737 -4.16666666666667e+00
+1747 1796 4.16666666666667e+00
+1747 1739 8.33333333333333e+00
+1747 1738 -1.25000000000000e+01
+1747 1794 -8.33333333333333e+00
+1747 1763 -4.16666666666667e+00
+1747 1746 -1.66666666666667e+01
+1747 1761 8.33333333333333e+00
+1747 1733 -8.33333333333333e+00
+1747 1731 4.16666666666667e+00
+1747 1329 -4.16666666666667e+00
+1747 1762 -1.25000000000000e+01
+1747 1374 -4.16666666666667e+00
+1747 1742 8.33333333333333e+00
+1747 1748 -1.66666666666667e+01
+1747 1496 8.33333333333333e+00
+1747 1857 4.16666666666667e+00
+1747 1494 -4.16666666666667e+00
+1747 1484 4.16666666666667e+00
+1747 1331 -4.16666666666667e+00
+1747 1741 -3.75000000000000e+01
+1747 1482 -8.33333333333333e+00
+1747 1740 8.33333333333333e+00
+1747 1859 4.16666666666667e+00
+1747 1376 -4.16666666666667e+00
+1747 1495 -1.25000000000000e+01
+1747 1736 4.16666666666667e+00
+1748 1748 1.25000000000000e+02
+1748 1779 -4.16666666666667e+00
+1748 1734 -8.33333333333333e+00
+1748 1781 -1.25000000000000e+01
+1748 1780 8.33333333333333e+00
+1748 1744 -4.16666666666667e+00
+1748 1743 8.33333333333333e+00
+1748 1745 -1.25000000000000e+01
+1748 1864 -8.33333333333333e+00
+1748 1863 4.16666666666667e+00
+1748 1795 4.16666666666667e+00
+1748 1737 8.33333333333333e+00
+1748 1746 -1.66666666666667e+01
+1748 1739 -3.75000000000000e+01
+1748 1738 8.33333333333333e+00
+1748 1329 -4.16666666666667e+00
+1748 1794 4.16666666666667e+00
+1748 1374 -4.16666666666667e+00
+1748 1731 4.16666666666667e+00
+1748 1762 -4.16666666666667e+00
+1748 1732 -8.33333333333333e+00
+1748 1763 -1.25000000000000e+01
+1748 1761 8.33333333333333e+00
+1748 1740 -4.16666666666667e+00
+1748 1482 4.16666666666667e+00
+1748 1741 8.33333333333333e+00
+1748 1747 -1.66666666666667e+01
+1748 1495 8.33333333333333e+00
+1748 1742 -1.25000000000000e+01
+1748 1483 4.16666666666667e+00
+1748 1330 -4.16666666666667e+00
+1748 1496 -3.75000000000000e+01
+1748 1735 4.16666666666667e+00
+1748 1858 4.16666666666667e+00
+1748 1375 -4.16666666666667e+00
+1748 1494 8.33333333333333e+00
+1748 1857 -8.33333333333333e+00
+1749 1749 1.25000000000000e+02
+1749 1787 4.16666666666667e+00
+1749 1786 -8.33333333333333e+00
+1749 1756 8.33333333333333e+00
+1749 1755 -3.75000000000000e+01
+1749 1682 4.16666666666667e+00
+1749 1681 4.16666666666667e+00
+1749 1685 8.33333333333333e+00
+1749 1684 -4.16666666666667e+00
+1749 1683 -1.25000000000000e+01
+1749 1751 -1.66666666666667e+01
+1749 1334 -4.16666666666667e+00
+1749 1340 -4.16666666666667e+00
+1749 1799 -4.16666666666667e+00
+1749 1796 4.16666666666667e+00
+1749 1766 -8.33333333333333e+00
+1749 1763 8.33333333333333e+00
+1749 1765 4.16666666666667e+00
+1749 1762 -4.16666666666667e+00
+1749 1761 -1.25000000000000e+01
+1749 1798 -4.16666666666667e+00
+1749 1795 4.16666666666667e+00
+1749 1421 -4.16666666666667e+00
+1749 1733 4.16666666666667e+00
+1749 1420 -4.16666666666667e+00
+1749 1426 4.16666666666667e+00
+1749 1732 -8.33333333333333e+00
+1749 1333 8.33333333333333e+00
+1749 1332 -1.25000000000000e+01
+1749 1739 8.33333333333333e+00
+1749 1427 -8.33333333333333e+00
+1749 1738 8.33333333333333e+00
+1749 1750 -1.66666666666667e+01
+1749 1339 8.33333333333333e+00
+1749 1737 -3.75000000000000e+01
+1749 1757 8.33333333333333e+00
+1749 1338 -1.25000000000000e+01
+1750 1750 1.25000000000000e+02
+1750 1757 -4.16666666666667e+00
+1750 1785 -8.33333333333333e+00
+1750 1756 -1.25000000000000e+01
+1750 1755 8.33333333333333e+00
+1750 1682 -8.33333333333333e+00
+1750 1680 4.16666666666667e+00
+1750 1685 8.33333333333333e+00
+1750 1684 -1.25000000000000e+01
+1750 1683 -4.16666666666667e+00
+1750 1799 -4.16666666666667e+00
+1750 1766 4.16666666666667e+00
+1750 1334 8.33333333333333e+00
+1750 1751 -1.66666666666667e+01
+1750 1763 8.33333333333333e+00
+1750 1762 -1.25000000000000e+01
+1750 1764 4.16666666666667e+00
+1750 1761 -4.16666666666667e+00
+1750 1340 8.33333333333333e+00
+1750 1796 -8.33333333333333e+00
+1750 1797 -4.16666666666667e+00
+1750 1794 4.16666666666667e+00
+1750 1419 -4.16666666666667e+00
+1750 1425 4.16666666666667e+00
+1750 1733 4.16666666666667e+00
+1750 1421 -4.16666666666667e+00
+1750 1333 -3.75000000000000e+01
+1750 1731 -8.33333333333333e+00
+1750 1332 8.33333333333333e+00
+1750 1739 -4.16666666666667e+00
+1750 1427 4.16666666666667e+00
+1750 1738 -1.25000000000000e+01
+1750 1787 4.16666666666667e+00
+1750 1339 -3.75000000000000e+01
+1750 1737 8.33333333333333e+00
+1750 1749 -1.66666666666667e+01
+1750 1338 8.33333333333333e+00
+1751 1751 1.25000000000000e+02
+1751 1756 -4.16666666666667e+00
+1751 1755 8.33333333333333e+00
+1751 1785 4.16666666666667e+00
+1751 1757 -1.25000000000000e+01
+1751 1680 4.16666666666667e+00
+1751 1681 -8.33333333333333e+00
+1751 1685 -3.75000000000000e+01
+1751 1684 8.33333333333333e+00
+1751 1683 8.33333333333333e+00
+1751 1749 -1.66666666666667e+01
+1751 1332 -4.16666666666667e+00
+1751 1338 -4.16666666666667e+00
+1751 1797 -4.16666666666667e+00
+1751 1794 4.16666666666667e+00
+1751 1798 -4.16666666666667e+00
+1751 1765 4.16666666666667e+00
+1751 1763 -3.75000000000000e+01
+1751 1333 8.33333333333333e+00
+1751 1750 -1.66666666666667e+01
+1751 1762 8.33333333333333e+00
+1751 1764 -8.33333333333333e+00
+1751 1761 8.33333333333333e+00
+1751 1339 8.33333333333333e+00
+1751 1795 -8.33333333333333e+00
+1751 1419 -4.16666666666667e+00
+1751 1731 4.16666666666667e+00
+1751 1334 -1.25000000000000e+01
+1751 1732 4.16666666666667e+00
+1751 1420 -4.16666666666667e+00
+1751 1739 -1.25000000000000e+01
+1751 1786 4.16666666666667e+00
+1751 1340 -1.25000000000000e+01
+1751 1738 -4.16666666666667e+00
+1751 1426 4.16666666666667e+00
+1751 1737 8.33333333333333e+00
+1751 1425 -8.33333333333333e+00
+1752 1752 6.25000000000000e+01
+1752 1757 -4.16666666666667e+00
+1752 1690 -2.08333333333333e+00
+1752 1681 2.08333333333333e+00
+1752 1691 4.16666666666667e+00
+1752 1689 -6.25000000000000e+00
+1752 1682 -4.16666666666667e+00
+1752 1753 -8.33333333333333e+00
+1752 1756 8.33333333333333e+00
+1752 1333 4.16666666666667e+00
+1752 1755 -1.25000000000000e+01
+1752 1766 4.16666666666667e+00
+1752 1754 -8.33333333333333e+00
+1752 1499 4.16666666666667e+00
+1752 1334 4.16666666666667e+00
+1752 1498 -2.08333333333333e+00
+1752 1765 4.16666666666667e+00
+1752 1497 -6.25000000000000e+00
+1752 1332 -1.87500000000000e+01
+1752 46 4.16666666666667e+00
+1752 391 -8.33333333333333e+00
+1752 401 -4.16666666666667e+00
+1752 47 4.16666666666667e+00
+1752 236 -4.16666666666667e+00
+1752 235 2.08333333333333e+00
+1752 400 -4.16666666666667e+00
+1752 45 -1.87500000000000e+01
+1752 392 4.16666666666667e+00
+1753 1753 6.25000000000000e+01
+1753 1691 4.16666666666667e+00
+1753 1757 8.33333333333333e+00
+1753 1689 -2.08333333333333e+00
+1753 1680 2.08333333333333e+00
+1753 1690 -6.25000000000000e+00
+1753 1682 2.08333333333333e+00
+1753 1334 -2.08333333333333e+00
+1753 1756 -3.75000000000000e+01
+1753 1752 -8.33333333333333e+00
+1753 1755 8.33333333333333e+00
+1753 1332 4.16666666666667e+00
+1753 1499 4.16666666666667e+00
+1753 1766 -8.33333333333333e+00
+1753 1754 -8.33333333333333e+00
+1753 1498 -6.25000000000000e+00
+1753 1333 -6.25000000000000e+00
+1753 1497 -2.08333333333333e+00
+1753 1764 4.16666666666667e+00
+1753 47 -2.08333333333333e+00
+1753 392 4.16666666666667e+00
+1753 45 4.16666666666667e+00
+1753 390 -8.33333333333333e+00
+1753 236 2.08333333333333e+00
+1753 401 -4.16666666666667e+00
+1753 46 -6.25000000000000e+00
+1753 234 2.08333333333333e+00
+1753 399 -4.16666666666667e+00
+1754 1754 6.25000000000000e+01
+1754 1755 -4.16666666666667e+00
+1754 1753 -8.33333333333333e+00
+1754 1690 4.16666666666667e+00
+1754 1756 8.33333333333333e+00
+1754 1691 -1.87500000000000e+01
+1754 1689 4.16666666666667e+00
+1754 1757 -1.25000000000000e+01
+1754 1681 2.08333333333333e+00
+1754 1333 -2.08333333333333e+00
+1754 1680 -4.16666666666667e+00
+1754 1764 4.16666666666667e+00
+1754 1499 -1.87500000000000e+01
+1754 1334 -6.25000000000000e+00
+1754 1498 4.16666666666667e+00
+1754 1765 -8.33333333333333e+00
+1754 1752 -8.33333333333333e+00
+1754 1497 4.16666666666667e+00
+1754 1332 4.16666666666667e+00
+1754 46 -2.08333333333333e+00
+1754 391 4.16666666666667e+00
+1754 235 2.08333333333333e+00
+1754 400 -4.16666666666667e+00
+1754 399 -4.16666666666667e+00
+1754 47 -6.25000000000000e+00
+1754 45 4.16666666666667e+00
+1754 234 -4.16666666666667e+00
+1754 390 4.16666666666667e+00
+1755 1755 1.25000000000000e+02
+1755 1798 4.16666666666667e+00
+1755 1766 8.33333333333333e+00
+1755 1765 -4.16666666666667e+00
+1755 1764 -1.25000000000000e+01
+1755 1691 4.16666666666667e+00
+1755 1754 -4.16666666666667e+00
+1755 1690 4.16666666666667e+00
+1755 1757 -1.66666666666667e+01
+1755 1753 8.33333333333333e+00
+1755 1752 -1.25000000000000e+01
+1755 1756 -1.66666666666667e+01
+1755 1693 -4.16666666666667e+00
+1755 1694 8.33333333333333e+00
+1755 1685 -8.33333333333333e+00
+1755 1751 8.33333333333333e+00
+1755 1681 -4.16666666666667e+00
+1755 1684 4.16666666666667e+00
+1755 1787 -4.16666666666667e+00
+1755 1786 8.33333333333333e+00
+1755 1692 -1.25000000000000e+01
+1755 1785 -1.25000000000000e+01
+1755 1682 -4.16666666666667e+00
+1755 1334 4.16666666666667e+00
+1755 1750 8.33333333333333e+00
+1755 1333 -8.33333333333333e+00
+1755 1799 4.16666666666667e+00
+1755 1749 -3.75000000000000e+01
+1755 433 -4.16666666666667e+00
+1755 401 -8.33333333333333e+00
+1755 400 4.16666666666667e+00
+1755 434 -4.16666666666667e+00
+1755 392 8.33333333333333e+00
+1755 391 8.33333333333333e+00
+1755 390 -3.75000000000000e+01
+1755 53 4.16666666666667e+00
+1755 52 -8.33333333333333e+00
+1756 1756 1.25000000000000e+02
+1756 1797 4.16666666666667e+00
+1756 1764 -4.16666666666667e+00
+1756 1766 8.33333333333333e+00
+1756 1765 -1.25000000000000e+01
+1756 1754 8.33333333333333e+00
+1756 1691 -8.33333333333333e+00
+1756 1689 4.16666666666667e+00
+1756 1334 4.16666666666667e+00
+1756 1753 -3.75000000000000e+01
+1756 1752 8.33333333333333e+00
+1756 1751 -4.16666666666667e+00
+1756 1755 -1.66666666666667e+01
+1756 1692 -4.16666666666667e+00
+1756 1685 4.16666666666667e+00
+1756 1682 -4.16666666666667e+00
+1756 1680 -4.16666666666667e+00
+1756 1683 4.16666666666667e+00
+1756 1694 8.33333333333333e+00
+1756 1787 8.33333333333333e+00
+1756 1757 -1.66666666666667e+01
+1756 1693 -1.25000000000000e+01
+1756 1786 -3.75000000000000e+01
+1756 1785 8.33333333333333e+00
+1756 1799 -8.33333333333333e+00
+1756 1750 -1.25000000000000e+01
+1756 1749 8.33333333333333e+00
+1756 1332 -8.33333333333333e+00
+1756 432 -4.16666666666667e+00
+1756 434 -4.16666666666667e+00
+1756 401 4.16666666666667e+00
+1756 399 4.16666666666667e+00
+1756 392 -4.16666666666667e+00
+1756 53 4.16666666666667e+00
+1756 391 -1.25000000000000e+01
+1756 390 8.33333333333333e+00
+1756 51 -8.33333333333333e+00
+1757 1757 1.25000000000000e+02
+1757 1798 -8.33333333333333e+00
+1757 1764 8.33333333333333e+00
+1757 1766 -3.75000000000000e+01
+1757 1765 8.33333333333333e+00
+1757 1689 4.16666666666667e+00
+1757 1752 -4.16666666666667e+00
+1757 1753 8.33333333333333e+00
+1757 1690 -8.33333333333333e+00
+1757 1755 -1.66666666666667e+01
+1757 1754 -1.25000000000000e+01
+1757 1333 4.16666666666667e+00
+1757 1750 -4.16666666666667e+00
+1757 1684 4.16666666666667e+00
+1757 1681 -4.16666666666667e+00
+1757 1692 8.33333333333333e+00
+1757 1683 -8.33333333333333e+00
+1757 1749 8.33333333333333e+00
+1757 1694 -3.75000000000000e+01
+1757 1787 -1.25000000000000e+01
+1757 1693 8.33333333333333e+00
+1757 1786 8.33333333333333e+00
+1757 1756 -1.66666666666667e+01
+1757 1785 -4.16666666666667e+00
+1757 1797 4.16666666666667e+00
+1757 1751 -1.25000000000000e+01
+1757 1680 -4.16666666666667e+00
+1757 1332 4.16666666666667e+00
+1757 433 -4.16666666666667e+00
+1757 400 4.16666666666667e+00
+1757 399 -8.33333333333333e+00
+1757 432 -4.16666666666667e+00
+1757 392 -1.25000000000000e+01
+1757 391 -4.16666666666667e+00
+1757 52 4.16666666666667e+00
+1757 390 8.33333333333333e+00
+1757 51 4.16666666666667e+00
+1758 1758 6.25000000000000e+01
+1758 1759 -8.33333333333333e+00
+1758 1733 -4.16666666666667e+00
+1758 1333 -2.08333333333333e+00
+1758 1732 2.08333333333333e+00
+1758 1742 4.16666666666667e+00
+1758 1369 -2.08333333333333e+00
+1758 1740 -1.87500000000000e+01
+1758 1858 4.16666666666667e+00
+1758 1763 -4.16666666666667e+00
+1758 1762 8.33333333333333e+00
+1758 1761 -1.25000000000000e+01
+1758 1859 4.16666666666667e+00
+1758 1766 4.16666666666667e+00
+1758 1862 -4.16666666666667e+00
+1758 1501 2.08333333333333e+00
+1758 1861 -4.16666666666667e+00
+1758 1370 4.16666666666667e+00
+1758 1502 -4.16666666666667e+00
+1758 1368 -6.25000000000000e+00
+1758 1760 -8.33333333333333e+00
+1758 1499 4.16666666666667e+00
+1758 1334 4.16666666666667e+00
+1758 1498 4.16666666666667e+00
+1758 1765 -8.33333333333333e+00
+1758 1741 4.16666666666667e+00
+1758 1497 -1.87500000000000e+01
+1758 1332 -6.25000000000000e+00
+1759 1759 6.25000000000000e+01
+1759 1733 2.08333333333333e+00
+1759 1740 4.16666666666667e+00
+1759 1758 -8.33333333333333e+00
+1759 1332 -2.08333333333333e+00
+1759 1731 2.08333333333333e+00
+1759 1741 -6.25000000000000e+00
+1759 1368 -2.08333333333333e+00
+1759 1857 4.16666666666667e+00
+1759 1334 4.16666666666667e+00
+1759 1760 -8.33333333333333e+00
+1759 1763 8.33333333333333e+00
+1759 1762 -3.75000000000000e+01
+1759 1761 8.33333333333333e+00
+1759 1370 4.16666666666667e+00
+1759 1859 -8.33333333333333e+00
+1759 1500 2.08333333333333e+00
+1759 1860 -4.16666666666667e+00
+1759 1502 2.08333333333333e+00
+1759 1862 -4.16666666666667e+00
+1759 1369 -6.25000000000000e+00
+1759 1499 -2.08333333333333e+00
+1759 1766 4.16666666666667e+00
+1759 1742 -2.08333333333333e+00
+1759 1498 -6.25000000000000e+00
+1759 1333 -6.25000000000000e+00
+1759 1497 4.16666666666667e+00
+1759 1764 -8.33333333333333e+00
+1760 1760 6.25000000000000e+01
+1760 1732 2.08333333333333e+00
+1760 1731 -4.16666666666667e+00
+1760 1742 -6.25000000000000e+00
+1760 1740 4.16666666666667e+00
+1760 1763 -1.25000000000000e+01
+1760 1333 4.16666666666667e+00
+1760 1759 -8.33333333333333e+00
+1760 1762 8.33333333333333e+00
+1760 1761 -4.16666666666667e+00
+1760 1369 4.16666666666667e+00
+1760 1858 -8.33333333333333e+00
+1760 1857 4.16666666666667e+00
+1760 1764 4.16666666666667e+00
+1760 1860 -4.16666666666667e+00
+1760 1370 -1.87500000000000e+01
+1760 1501 2.08333333333333e+00
+1760 1861 -4.16666666666667e+00
+1760 1368 4.16666666666667e+00
+1760 1500 -4.16666666666667e+00
+1760 1741 -2.08333333333333e+00
+1760 1499 -6.25000000000000e+00
+1760 1334 -1.87500000000000e+01
+1760 1498 -2.08333333333333e+00
+1760 1765 4.16666666666667e+00
+1760 1758 -8.33333333333333e+00
+1760 1497 4.16666666666667e+00
+1760 1332 4.16666666666667e+00
+1761 1761 1.25000000000000e+02
+1761 1739 -8.33333333333333e+00
+1761 1742 4.16666666666667e+00
+1761 1733 -4.16666666666667e+00
+1761 1741 -8.33333333333333e+00
+1761 1747 8.33333333333333e+00
+1761 1732 -4.16666666666667e+00
+1761 1748 8.33333333333333e+00
+1761 1746 -3.75000000000000e+01
+1761 1861 4.16666666666667e+00
+1761 1858 -4.16666666666667e+00
+1761 1862 -8.33333333333333e+00
+1761 1859 8.33333333333333e+00
+1761 1334 4.16666666666667e+00
+1761 1760 -4.16666666666667e+00
+1761 1759 8.33333333333333e+00
+1761 1762 -1.66666666666667e+01
+1761 1758 -1.25000000000000e+01
+1761 1376 4.16666666666667e+00
+1761 1857 -1.25000000000000e+01
+1761 1796 -4.16666666666667e+00
+1761 1799 4.16666666666667e+00
+1761 1871 -4.16666666666667e+00
+1761 1765 8.33333333333333e+00
+1761 1798 -8.33333333333333e+00
+1761 1795 8.33333333333333e+00
+1761 1766 8.33333333333333e+00
+1761 1751 8.33333333333333e+00
+1761 1763 -1.66666666666667e+01
+1761 1333 4.16666666666667e+00
+1761 1750 -4.16666666666667e+00
+1761 1764 -3.75000000000000e+01
+1761 1749 -1.25000000000000e+01
+1761 1870 -4.16666666666667e+00
+1761 1375 4.16666666666667e+00
+1761 1738 4.16666666666667e+00
+1761 1794 -1.25000000000000e+01
+1762 1762 1.25000000000000e+02
+1762 1739 4.16666666666667e+00
+1762 1733 -4.16666666666667e+00
+1762 1742 4.16666666666667e+00
+1762 1748 -4.16666666666667e+00
+1762 1740 -8.33333333333333e+00
+1762 1746 8.33333333333333e+00
+1762 1731 -4.16666666666667e+00
+1762 1747 -1.25000000000000e+01
+1762 1860 4.16666666666667e+00
+1762 1857 -4.16666666666667e+00
+1762 1862 4.16666666666667e+00
+1762 1760 8.33333333333333e+00
+1762 1759 -3.75000000000000e+01
+1762 1758 8.33333333333333e+00
+1762 1761 -1.66666666666667e+01
+1762 1859 8.33333333333333e+00
+1762 1858 -1.25000000000000e+01
+1762 1763 -1.66666666666667e+01
+1762 1766 -4.16666666666667e+00
+1762 1764 8.33333333333333e+00
+1762 1799 4.16666666666667e+00
+1762 1871 -4.16666666666667e+00
+1762 1797 -8.33333333333333e+00
+1762 1794 8.33333333333333e+00
+1762 1334 -8.33333333333333e+00
+1762 1751 8.33333333333333e+00
+1762 1765 -1.25000000000000e+01
+1762 1750 -1.25000000000000e+01
+1762 1332 4.16666666666667e+00
+1762 1749 -4.16666666666667e+00
+1762 1796 8.33333333333333e+00
+1762 1376 -8.33333333333333e+00
+1762 1737 4.16666666666667e+00
+1762 1795 -3.75000000000000e+01
+1762 1869 -4.16666666666667e+00
+1762 1374 4.16666666666667e+00
+1763 1763 1.25000000000000e+02
+1763 1737 -8.33333333333333e+00
+1763 1732 -4.16666666666667e+00
+1763 1740 4.16666666666667e+00
+1763 1731 -4.16666666666667e+00
+1763 1741 4.16666666666667e+00
+1763 1747 -4.16666666666667e+00
+1763 1748 -1.25000000000000e+01
+1763 1746 8.33333333333333e+00
+1763 1861 4.16666666666667e+00
+1763 1860 -8.33333333333333e+00
+1763 1857 8.33333333333333e+00
+1763 1760 -1.25000000000000e+01
+1763 1759 8.33333333333333e+00
+1763 1332 4.16666666666667e+00
+1763 1758 -4.16666666666667e+00
+1763 1859 -3.75000000000000e+01
+1763 1858 8.33333333333333e+00
+1763 1374 4.16666666666667e+00
+1763 1762 -1.66666666666667e+01
+1763 1794 -4.16666666666667e+00
+1763 1765 -4.16666666666667e+00
+1763 1797 4.16666666666667e+00
+1763 1869 -4.16666666666667e+00
+1763 1798 4.16666666666667e+00
+1763 1870 -4.16666666666667e+00
+1763 1766 -1.25000000000000e+01
+1763 1751 -3.75000000000000e+01
+1763 1333 -8.33333333333333e+00
+1763 1750 8.33333333333333e+00
+1763 1764 8.33333333333333e+00
+1763 1749 8.33333333333333e+00
+1763 1761 -1.66666666666667e+01
+1763 1738 4.16666666666667e+00
+1763 1796 -1.25000000000000e+01
+1763 1795 8.33333333333333e+00
+1763 1375 -8.33333333333333e+00
+1764 1764 1.25000000000000e+02
+1764 1756 -4.16666666666667e+00
+1764 1755 -1.25000000000000e+01
+1764 1754 4.16666666666667e+00
+1764 1753 4.16666666666667e+00
+1764 1766 -1.66666666666667e+01
+1764 1334 -4.16666666666667e+00
+1764 1799 -4.16666666666667e+00
+1764 1871 4.16666666666667e+00
+1764 1798 8.33333333333333e+00
+1764 1765 -1.66666666666667e+01
+1764 1762 8.33333333333333e+00
+1764 1751 -8.33333333333333e+00
+1764 1763 8.33333333333333e+00
+1764 1333 -4.16666666666667e+00
+1764 1750 4.16666666666667e+00
+1764 1761 -3.75000000000000e+01
+1764 1870 4.16666666666667e+00
+1764 1797 -1.25000000000000e+01
+1764 1499 -4.16666666666667e+00
+1764 1760 4.16666666666667e+00
+1764 1861 -4.16666666666667e+00
+1764 1759 -8.33333333333333e+00
+1764 1498 8.33333333333333e+00
+1764 1497 -1.25000000000000e+01
+1764 1862 8.33333333333333e+00
+1764 1860 -1.25000000000000e+01
+1764 1757 8.33333333333333e+00
+1764 434 4.16666666666667e+00
+1764 433 -8.33333333333333e+00
+1764 400 8.33333333333333e+00
+1764 401 8.33333333333333e+00
+1764 399 -3.75000000000000e+01
+1764 113 -4.16666666666667e+00
+1764 112 -4.16666666666667e+00
+1764 241 4.16666666666667e+00
+1764 242 -8.33333333333333e+00
+1765 1765 1.25000000000000e+02
+1765 1755 -4.16666666666667e+00
+1765 1757 8.33333333333333e+00
+1765 1756 -1.25000000000000e+01
+1765 1754 -8.33333333333333e+00
+1765 1752 4.16666666666667e+00
+1765 1751 4.16666666666667e+00
+1765 1763 -4.16666666666667e+00
+1765 1797 8.33333333333333e+00
+1765 1764 -1.66666666666667e+01
+1765 1761 8.33333333333333e+00
+1765 1762 -1.25000000000000e+01
+1765 1332 -4.16666666666667e+00
+1765 1749 4.16666666666667e+00
+1765 1799 8.33333333333333e+00
+1765 1871 -8.33333333333333e+00
+1765 1798 -3.75000000000000e+01
+1765 1869 4.16666666666667e+00
+1765 1499 8.33333333333333e+00
+1765 1766 -1.66666666666667e+01
+1765 1862 8.33333333333333e+00
+1765 1860 -4.16666666666667e+00
+1765 1760 4.16666666666667e+00
+1765 1334 -4.16666666666667e+00
+1765 1498 -3.75000000000000e+01
+1765 1758 -8.33333333333333e+00
+1765 1497 8.33333333333333e+00
+1765 1861 -1.25000000000000e+01
+1765 432 -8.33333333333333e+00
+1765 401 -4.16666666666667e+00
+1765 399 8.33333333333333e+00
+1765 400 -1.25000000000000e+01
+1765 111 -4.16666666666667e+00
+1765 240 4.16666666666667e+00
+1765 242 4.16666666666667e+00
+1765 113 -4.16666666666667e+00
+1765 434 4.16666666666667e+00
+1766 1766 1.25000000000000e+02
+1766 1755 8.33333333333333e+00
+1766 1757 -3.75000000000000e+01
+1766 1756 8.33333333333333e+00
+1766 1752 4.16666666666667e+00
+1766 1753 -8.33333333333333e+00
+1766 1764 -1.66666666666667e+01
+1766 1332 -4.16666666666667e+00
+1766 1750 4.16666666666667e+00
+1766 1762 -4.16666666666667e+00
+1766 1797 -4.16666666666667e+00
+1766 1869 4.16666666666667e+00
+1766 1763 -1.25000000000000e+01
+1766 1749 -8.33333333333333e+00
+1766 1761 8.33333333333333e+00
+1766 1799 -1.25000000000000e+01
+1766 1798 8.33333333333333e+00
+1766 1870 -8.33333333333333e+00
+1766 1497 -4.16666666666667e+00
+1766 1758 4.16666666666667e+00
+1766 1498 8.33333333333333e+00
+1766 1765 -1.66666666666667e+01
+1766 1861 8.33333333333333e+00
+1766 1499 -1.25000000000000e+01
+1766 1759 4.16666666666667e+00
+1766 1333 -4.16666666666667e+00
+1766 1862 -3.75000000000000e+01
+1766 1860 8.33333333333333e+00
+1766 432 4.16666666666667e+00
+1766 400 -4.16666666666667e+00
+1766 401 -1.25000000000000e+01
+1766 399 8.33333333333333e+00
+1766 111 -4.16666666666667e+00
+1766 433 4.16666666666667e+00
+1766 241 4.16666666666667e+00
+1766 112 -4.16666666666667e+00
+1766 240 -8.33333333333333e+00
+1767 1767 1.25000000000000e+02
+1767 1775 -4.16666666666667e+00
+1767 1789 -8.33333333333333e+00
+1767 1774 8.33333333333333e+00
+1767 1773 -1.25000000000000e+01
+1767 1700 -8.33333333333333e+00
+1767 1699 4.16666666666667e+00
+1767 1703 8.33333333333333e+00
+1767 1702 -4.16666666666667e+00
+1767 1701 -1.25000000000000e+01
+1767 1802 -4.16666666666667e+00
+1767 1784 4.16666666666667e+00
+1767 1337 8.33333333333333e+00
+1767 1769 -1.66666666666667e+01
+1767 1781 8.33333333333333e+00
+1767 1783 4.16666666666667e+00
+1767 1780 -4.16666666666667e+00
+1767 1779 -1.25000000000000e+01
+1767 1340 8.33333333333333e+00
+1767 1796 -8.33333333333333e+00
+1767 1801 -4.16666666666667e+00
+1767 1795 4.16666666666667e+00
+1767 1423 -4.16666666666667e+00
+1767 1426 4.16666666666667e+00
+1767 1736 4.16666666666667e+00
+1767 1424 -4.16666666666667e+00
+1767 1336 8.33333333333333e+00
+1767 1735 -8.33333333333333e+00
+1767 1335 -3.75000000000000e+01
+1767 1739 -4.16666666666667e+00
+1767 1427 4.16666666666667e+00
+1767 1768 -1.66666666666667e+01
+1767 1738 8.33333333333333e+00
+1767 1339 8.33333333333333e+00
+1767 1790 4.16666666666667e+00
+1767 1737 -1.25000000000000e+01
+1767 1338 -3.75000000000000e+01
+1768 1768 1.25000000000000e+02
+1768 1790 4.16666666666667e+00
+1768 1788 -8.33333333333333e+00
+1768 1774 -3.75000000000000e+01
+1768 1773 8.33333333333333e+00
+1768 1700 4.16666666666667e+00
+1768 1698 4.16666666666667e+00
+1768 1703 8.33333333333333e+00
+1768 1702 -1.25000000000000e+01
+1768 1701 -4.16666666666667e+00
+1768 1769 -1.66666666666667e+01
+1768 1340 -4.16666666666667e+00
+1768 1337 -4.16666666666667e+00
+1768 1796 4.16666666666667e+00
+1768 1802 -4.16666666666667e+00
+1768 1784 -8.33333333333333e+00
+1768 1781 8.33333333333333e+00
+1768 1780 -1.25000000000000e+01
+1768 1782 4.16666666666667e+00
+1768 1779 -4.16666666666667e+00
+1768 1800 -4.16666666666667e+00
+1768 1794 4.16666666666667e+00
+1768 1736 4.16666666666667e+00
+1768 1424 -4.16666666666667e+00
+1768 1422 -4.16666666666667e+00
+1768 1425 4.16666666666667e+00
+1768 1336 -1.25000000000000e+01
+1768 1335 8.33333333333333e+00
+1768 1734 -8.33333333333333e+00
+1768 1739 8.33333333333333e+00
+1768 1427 -8.33333333333333e+00
+1768 1775 8.33333333333333e+00
+1768 1738 -3.75000000000000e+01
+1768 1339 -1.25000000000000e+01
+1768 1767 -1.66666666666667e+01
+1768 1737 8.33333333333333e+00
+1768 1338 8.33333333333333e+00
+1769 1769 1.25000000000000e+02
+1769 1773 -4.16666666666667e+00
+1769 1774 8.33333333333333e+00
+1769 1789 4.16666666666667e+00
+1769 1775 -1.25000000000000e+01
+1769 1699 4.16666666666667e+00
+1769 1698 -8.33333333333333e+00
+1769 1703 -3.75000000000000e+01
+1769 1702 8.33333333333333e+00
+1769 1701 8.33333333333333e+00
+1769 1768 -1.66666666666667e+01
+1769 1339 -4.16666666666667e+00
+1769 1336 -4.16666666666667e+00
+1769 1795 4.16666666666667e+00
+1769 1801 -4.16666666666667e+00
+1769 1800 -4.16666666666667e+00
+1769 1782 4.16666666666667e+00
+1769 1781 -3.75000000000000e+01
+1769 1783 -8.33333333333333e+00
+1769 1780 8.33333333333333e+00
+1769 1335 8.33333333333333e+00
+1769 1767 -1.66666666666667e+01
+1769 1779 8.33333333333333e+00
+1769 1338 8.33333333333333e+00
+1769 1794 -8.33333333333333e+00
+1769 1735 4.16666666666667e+00
+1769 1423 -4.16666666666667e+00
+1769 1337 -1.25000000000000e+01
+1769 1734 4.16666666666667e+00
+1769 1422 -4.16666666666667e+00
+1769 1788 4.16666666666667e+00
+1769 1739 -1.25000000000000e+01
+1769 1340 -1.25000000000000e+01
+1769 1738 8.33333333333333e+00
+1769 1426 -8.33333333333333e+00
+1769 1737 -4.16666666666667e+00
+1769 1425 4.16666666666667e+00
+1770 1770 1.25000000000000e+02
+1770 1829 4.16666666666667e+00
+1770 1828 -8.33333333333333e+00
+1770 1774 8.33333333333333e+00
+1770 1773 -3.75000000000000e+01
+1770 1832 -4.16666666666667e+00
+1770 1831 -4.16666666666667e+00
+1770 1784 -8.33333333333333e+00
+1770 1783 4.16666666666667e+00
+1770 1700 4.16666666666667e+00
+1770 1709 8.33333333333333e+00
+1770 1708 -4.16666666666667e+00
+1770 1707 -1.25000000000000e+01
+1770 1699 4.16666666666667e+00
+1770 1603 4.16666666666667e+00
+1770 1594 -4.16666666666667e+00
+1770 1595 -4.16666666666667e+00
+1770 1604 -8.33333333333333e+00
+1770 1667 8.33333333333333e+00
+1770 1772 -1.66666666666667e+01
+1770 1520 8.33333333333333e+00
+1770 1525 4.16666666666667e+00
+1770 1519 -4.16666666666667e+00
+1770 1337 -4.16666666666667e+00
+1770 1661 4.16666666666667e+00
+1770 1336 8.33333333333333e+00
+1770 1660 -8.33333333333333e+00
+1770 1335 -1.25000000000000e+01
+1770 1518 -1.25000000000000e+01
+1770 1355 -4.16666666666667e+00
+1770 1526 4.16666666666667e+00
+1770 1771 -1.66666666666667e+01
+1770 1354 8.33333333333333e+00
+1770 1666 8.33333333333333e+00
+1770 1775 8.33333333333333e+00
+1770 1353 -1.25000000000000e+01
+1770 1665 -3.75000000000000e+01
+1771 1771 1.25000000000000e+02
+1771 1775 -4.16666666666667e+00
+1771 1827 -8.33333333333333e+00
+1771 1774 -1.25000000000000e+01
+1771 1773 8.33333333333333e+00
+1771 1832 -4.16666666666667e+00
+1771 1784 4.16666666666667e+00
+1771 1830 -4.16666666666667e+00
+1771 1782 4.16666666666667e+00
+1771 1709 8.33333333333333e+00
+1771 1708 -1.25000000000000e+01
+1771 1707 -4.16666666666667e+00
+1771 1700 -8.33333333333333e+00
+1771 1698 4.16666666666667e+00
+1771 1602 4.16666666666667e+00
+1771 1593 -4.16666666666667e+00
+1771 1604 4.16666666666667e+00
+1771 1595 -4.16666666666667e+00
+1771 1667 -4.16666666666667e+00
+1771 1661 4.16666666666667e+00
+1771 1524 4.16666666666667e+00
+1771 1518 -4.16666666666667e+00
+1771 1337 8.33333333333333e+00
+1771 1772 -1.66666666666667e+01
+1771 1520 8.33333333333333e+00
+1771 1336 -3.75000000000000e+01
+1771 1519 -1.25000000000000e+01
+1771 1335 8.33333333333333e+00
+1771 1659 -8.33333333333333e+00
+1771 1355 8.33333333333333e+00
+1771 1526 -8.33333333333333e+00
+1771 1829 4.16666666666667e+00
+1771 1354 -3.75000000000000e+01
+1771 1666 -1.25000000000000e+01
+1771 1770 -1.66666666666667e+01
+1771 1353 8.33333333333333e+00
+1771 1665 8.33333333333333e+00
+1772 1772 1.25000000000000e+02
+1772 1774 -4.16666666666667e+00
+1772 1773 8.33333333333333e+00
+1772 1827 4.16666666666667e+00
+1772 1775 -1.25000000000000e+01
+1772 1830 -4.16666666666667e+00
+1772 1831 -4.16666666666667e+00
+1772 1783 4.16666666666667e+00
+1772 1782 -8.33333333333333e+00
+1772 1698 4.16666666666667e+00
+1772 1709 -3.75000000000000e+01
+1772 1708 8.33333333333333e+00
+1772 1707 8.33333333333333e+00
+1772 1699 -8.33333333333333e+00
+1772 1593 -4.16666666666667e+00
+1772 1603 4.16666666666667e+00
+1772 1602 -8.33333333333333e+00
+1772 1594 -4.16666666666667e+00
+1772 1666 -4.16666666666667e+00
+1772 1660 4.16666666666667e+00
+1772 1665 8.33333333333333e+00
+1772 1770 -1.66666666666667e+01
+1772 1518 8.33333333333333e+00
+1772 1337 -1.25000000000000e+01
+1772 1520 -3.75000000000000e+01
+1772 1336 8.33333333333333e+00
+1772 1771 -1.66666666666667e+01
+1772 1519 8.33333333333333e+00
+1772 1335 -4.16666666666667e+00
+1772 1659 4.16666666666667e+00
+1772 1828 4.16666666666667e+00
+1772 1355 -1.25000000000000e+01
+1772 1667 -1.25000000000000e+01
+1772 1354 8.33333333333333e+00
+1772 1525 -8.33333333333333e+00
+1772 1353 -4.16666666666667e+00
+1772 1524 4.16666666666667e+00
+1773 1773 1.25000000000000e+02
+1773 1801 4.16666666666667e+00
+1773 1837 -4.16666666666667e+00
+1773 1832 4.16666666666667e+00
+1773 1838 -4.16666666666667e+00
+1773 1831 4.16666666666667e+00
+1773 1783 -4.16666666666667e+00
+1773 1784 8.33333333333333e+00
+1773 1782 -1.25000000000000e+01
+1773 1709 -8.33333333333333e+00
+1773 1772 8.33333333333333e+00
+1773 1708 4.16666666666667e+00
+1773 1358 4.16666666666667e+00
+1773 1829 -4.16666666666667e+00
+1773 1828 8.33333333333333e+00
+1773 1827 -1.25000000000000e+01
+1773 1337 4.16666666666667e+00
+1773 1771 8.33333333333333e+00
+1773 1770 -3.75000000000000e+01
+1773 1769 -4.16666666666667e+00
+1773 1774 -1.66666666666667e+01
+1773 1711 -4.16666666666667e+00
+1773 1703 4.16666666666667e+00
+1773 1700 -4.16666666666667e+00
+1773 1702 4.16666666666667e+00
+1773 1699 -4.16666666666667e+00
+1773 1712 8.33333333333333e+00
+1773 1790 8.33333333333333e+00
+1773 1775 -1.66666666666667e+01
+1773 1357 -8.33333333333333e+00
+1773 1789 8.33333333333333e+00
+1773 1710 -1.25000000000000e+01
+1773 1788 -3.75000000000000e+01
+1773 1768 8.33333333333333e+00
+1773 1336 -8.33333333333333e+00
+1773 1802 -8.33333333333333e+00
+1773 1767 -1.25000000000000e+01
+1774 1774 1.25000000000000e+02
+1774 1800 4.16666666666667e+00
+1774 1836 -4.16666666666667e+00
+1774 1832 -8.33333333333333e+00
+1774 1784 8.33333333333333e+00
+1774 1830 4.16666666666667e+00
+1774 1782 -4.16666666666667e+00
+1774 1838 -4.16666666666667e+00
+1774 1783 -1.25000000000000e+01
+1774 1709 4.16666666666667e+00
+1774 1772 -4.16666666666667e+00
+1774 1707 4.16666666666667e+00
+1774 1829 8.33333333333333e+00
+1774 1775 -1.66666666666667e+01
+1774 1828 -3.75000000000000e+01
+1774 1827 8.33333333333333e+00
+1774 1771 -1.25000000000000e+01
+1774 1770 8.33333333333333e+00
+1774 1773 -1.66666666666667e+01
+1774 1710 -4.16666666666667e+00
+1774 1712 8.33333333333333e+00
+1774 1703 -8.33333333333333e+00
+1774 1769 8.33333333333333e+00
+1774 1701 4.16666666666667e+00
+1774 1698 -4.16666666666667e+00
+1774 1358 4.16666666666667e+00
+1774 1790 -4.16666666666667e+00
+1774 1711 -1.25000000000000e+01
+1774 1789 -1.25000000000000e+01
+1774 1356 -8.33333333333333e+00
+1774 1788 8.33333333333333e+00
+1774 1700 -4.16666666666667e+00
+1774 1337 4.16666666666667e+00
+1774 1802 4.16666666666667e+00
+1774 1768 -3.75000000000000e+01
+1774 1767 8.33333333333333e+00
+1774 1335 -8.33333333333333e+00
+1775 1775 1.25000000000000e+02
+1775 1800 -8.33333333333333e+00
+1775 1830 4.16666666666667e+00
+1775 1836 -4.16666666666667e+00
+1775 1831 -8.33333333333333e+00
+1775 1783 8.33333333333333e+00
+1775 1837 -4.16666666666667e+00
+1775 1784 -3.75000000000000e+01
+1775 1782 8.33333333333333e+00
+1775 1708 4.16666666666667e+00
+1775 1771 -4.16666666666667e+00
+1775 1707 -8.33333333333333e+00
+1775 1770 8.33333333333333e+00
+1775 1829 -1.25000000000000e+01
+1775 1828 8.33333333333333e+00
+1775 1774 -1.66666666666667e+01
+1775 1356 4.16666666666667e+00
+1775 1827 -4.16666666666667e+00
+1775 1772 -1.25000000000000e+01
+1775 1335 4.16666666666667e+00
+1775 1767 -4.16666666666667e+00
+1775 1711 8.33333333333333e+00
+1775 1701 4.16666666666667e+00
+1775 1698 -4.16666666666667e+00
+1775 1702 -8.33333333333333e+00
+1775 1768 8.33333333333333e+00
+1775 1712 -3.75000000000000e+01
+1775 1790 -1.25000000000000e+01
+1775 1357 4.16666666666667e+00
+1775 1789 -4.16666666666667e+00
+1775 1710 8.33333333333333e+00
+1775 1788 8.33333333333333e+00
+1775 1773 -1.66666666666667e+01
+1775 1801 4.16666666666667e+00
+1775 1769 -1.25000000000000e+01
+1775 1699 -4.16666666666667e+00
+1775 1336 4.16666666666667e+00
+1776 1776 1.25000000000000e+02
+1776 1865 -8.33333333333333e+00
+1776 1781 8.33333333333333e+00
+1776 1780 8.33333333333333e+00
+1776 1779 -3.75000000000000e+01
+1776 1867 -4.16666666666667e+00
+1776 1868 -4.16666666666667e+00
+1776 1784 4.16666666666667e+00
+1776 1783 -8.33333333333333e+00
+1776 1735 4.16666666666667e+00
+1776 1630 -4.16666666666667e+00
+1776 1745 -4.16666666666667e+00
+1776 1640 4.16666666666667e+00
+1776 1744 8.33333333333333e+00
+1776 1639 -8.33333333333333e+00
+1776 1743 -1.25000000000000e+01
+1776 1736 4.16666666666667e+00
+1776 1631 -4.16666666666667e+00
+1776 1532 4.16666666666667e+00
+1776 1520 -4.16666666666667e+00
+1776 1777 -1.66666666666667e+01
+1776 1519 8.33333333333333e+00
+1776 1672 8.33333333333333e+00
+1776 1337 8.33333333333333e+00
+1776 1661 -8.33333333333333e+00
+1776 1336 -4.16666666666667e+00
+1776 1660 4.16666666666667e+00
+1776 1335 -1.25000000000000e+01
+1776 1518 -1.25000000000000e+01
+1776 1778 -1.66666666666667e+01
+1776 1373 8.33333333333333e+00
+1776 1673 8.33333333333333e+00
+1776 1372 -4.16666666666667e+00
+1776 1531 4.16666666666667e+00
+1776 1864 4.16666666666667e+00
+1776 1371 -1.25000000000000e+01
+1776 1671 -3.75000000000000e+01
+1777 1777 1.25000000000000e+02
+1777 1865 4.16666666666667e+00
+1777 1781 -4.16666666666667e+00
+1777 1780 -1.25000000000000e+01
+1777 1779 8.33333333333333e+00
+1777 1784 4.16666666666667e+00
+1777 1868 -4.16666666666667e+00
+1777 1866 -4.16666666666667e+00
+1777 1782 -8.33333333333333e+00
+1777 1734 4.16666666666667e+00
+1777 1629 -4.16666666666667e+00
+1777 1640 4.16666666666667e+00
+1777 1631 -4.16666666666667e+00
+1777 1745 8.33333333333333e+00
+1777 1744 -3.75000000000000e+01
+1777 1743 8.33333333333333e+00
+1777 1638 -8.33333333333333e+00
+1777 1736 -8.33333333333333e+00
+1777 1661 4.16666666666667e+00
+1777 1673 -4.16666666666667e+00
+1777 1776 -1.66666666666667e+01
+1777 1518 8.33333333333333e+00
+1777 1671 8.33333333333333e+00
+1777 1337 8.33333333333333e+00
+1777 1778 -1.66666666666667e+01
+1777 1520 8.33333333333333e+00
+1777 1336 -1.25000000000000e+01
+1777 1519 -3.75000000000000e+01
+1777 1335 -4.16666666666667e+00
+1777 1659 4.16666666666667e+00
+1777 1373 8.33333333333333e+00
+1777 1532 -8.33333333333333e+00
+1777 1863 4.16666666666667e+00
+1777 1372 -1.25000000000000e+01
+1777 1672 -1.25000000000000e+01
+1777 1371 -4.16666666666667e+00
+1777 1530 4.16666666666667e+00
+1778 1778 1.25000000000000e+02
+1778 1863 -8.33333333333333e+00
+1778 1781 -1.25000000000000e+01
+1778 1780 -4.16666666666667e+00
+1778 1779 8.33333333333333e+00
+1778 1783 4.16666666666667e+00
+1778 1867 -4.16666666666667e+00
+1778 1866 -4.16666666666667e+00
+1778 1782 4.16666666666667e+00
+1778 1639 4.16666666666667e+00
+1778 1630 -4.16666666666667e+00
+1778 1745 -1.25000000000000e+01
+1778 1744 8.33333333333333e+00
+1778 1743 -4.16666666666667e+00
+1778 1638 4.16666666666667e+00
+1778 1735 -8.33333333333333e+00
+1778 1734 4.16666666666667e+00
+1778 1629 -4.16666666666667e+00
+1778 1530 4.16666666666667e+00
+1778 1518 -4.16666666666667e+00
+1778 1660 4.16666666666667e+00
+1778 1672 -4.16666666666667e+00
+1778 1337 -3.75000000000000e+01
+1778 1520 -1.25000000000000e+01
+1778 1336 8.33333333333333e+00
+1778 1777 -1.66666666666667e+01
+1778 1519 8.33333333333333e+00
+1778 1335 8.33333333333333e+00
+1778 1659 -8.33333333333333e+00
+1778 1864 4.16666666666667e+00
+1778 1373 -3.75000000000000e+01
+1778 1673 -1.25000000000000e+01
+1778 1372 8.33333333333333e+00
+1778 1531 -8.33333333333333e+00
+1778 1776 -1.66666666666667e+01
+1778 1371 8.33333333333333e+00
+1778 1671 8.33333333333333e+00
+1779 1779 1.25000000000000e+02
+1779 1739 4.16666666666667e+00
+1779 1736 -4.16666666666667e+00
+1779 1748 -4.16666666666667e+00
+1779 1745 4.16666666666667e+00
+1779 1747 8.33333333333333e+00
+1779 1744 -8.33333333333333e+00
+1779 1735 -4.16666666666667e+00
+1779 1746 -1.25000000000000e+01
+1779 1867 4.16666666666667e+00
+1779 1864 -4.16666666666667e+00
+1779 1868 4.16666666666667e+00
+1779 1778 8.33333333333333e+00
+1779 1777 8.33333333333333e+00
+1779 1780 -1.66666666666667e+01
+1779 1776 -3.75000000000000e+01
+1779 1865 8.33333333333333e+00
+1779 1863 -1.25000000000000e+01
+1779 1781 -1.66666666666667e+01
+1779 1784 -4.16666666666667e+00
+1779 1783 8.33333333333333e+00
+1779 1874 -4.16666666666667e+00
+1779 1802 4.16666666666667e+00
+1779 1801 -8.33333333333333e+00
+1779 1795 8.33333333333333e+00
+1779 1337 -8.33333333333333e+00
+1779 1769 8.33333333333333e+00
+1779 1336 4.16666666666667e+00
+1779 1768 -4.16666666666667e+00
+1779 1782 -1.25000000000000e+01
+1779 1767 -1.25000000000000e+01
+1779 1796 8.33333333333333e+00
+1779 1376 -8.33333333333333e+00
+1779 1873 -4.16666666666667e+00
+1779 1375 4.16666666666667e+00
+1779 1738 4.16666666666667e+00
+1779 1794 -3.75000000000000e+01
+1780 1780 1.25000000000000e+02
+1780 1739 -8.33333333333333e+00
+1780 1736 -4.16666666666667e+00
+1780 1745 4.16666666666667e+00
+1780 1746 8.33333333333333e+00
+1780 1743 -8.33333333333333e+00
+1780 1734 -4.16666666666667e+00
+1780 1748 8.33333333333333e+00
+1780 1747 -3.75000000000000e+01
+1780 1866 4.16666666666667e+00
+1780 1863 -4.16666666666667e+00
+1780 1865 8.33333333333333e+00
+1780 1868 -8.33333333333333e+00
+1780 1778 -4.16666666666667e+00
+1780 1337 4.16666666666667e+00
+1780 1777 -1.25000000000000e+01
+1780 1776 8.33333333333333e+00
+1780 1779 -1.66666666666667e+01
+1780 1376 4.16666666666667e+00
+1780 1864 -1.25000000000000e+01
+1780 1796 -4.16666666666667e+00
+1780 1802 4.16666666666667e+00
+1780 1874 -4.16666666666667e+00
+1780 1782 8.33333333333333e+00
+1780 1800 -8.33333333333333e+00
+1780 1794 8.33333333333333e+00
+1780 1784 8.33333333333333e+00
+1780 1769 8.33333333333333e+00
+1780 1781 -1.66666666666667e+01
+1780 1783 -3.75000000000000e+01
+1780 1768 -1.25000000000000e+01
+1780 1335 4.16666666666667e+00
+1780 1767 -4.16666666666667e+00
+1780 1737 4.16666666666667e+00
+1780 1795 -1.25000000000000e+01
+1780 1872 -4.16666666666667e+00
+1780 1374 4.16666666666667e+00
+1781 1781 1.25000000000000e+02
+1781 1737 4.16666666666667e+00
+1781 1734 -4.16666666666667e+00
+1781 1735 -4.16666666666667e+00
+1781 1744 4.16666666666667e+00
+1781 1746 -4.16666666666667e+00
+1781 1743 4.16666666666667e+00
+1781 1748 -1.25000000000000e+01
+1781 1747 8.33333333333333e+00
+1781 1864 8.33333333333333e+00
+1781 1867 -8.33333333333333e+00
+1781 1866 4.16666666666667e+00
+1781 1778 -1.25000000000000e+01
+1781 1777 -4.16666666666667e+00
+1781 1336 4.16666666666667e+00
+1781 1776 8.33333333333333e+00
+1781 1865 -3.75000000000000e+01
+1781 1375 4.16666666666667e+00
+1781 1863 8.33333333333333e+00
+1781 1795 -4.16666666666667e+00
+1781 1779 -1.66666666666667e+01
+1781 1782 -4.16666666666667e+00
+1781 1801 4.16666666666667e+00
+1781 1873 -4.16666666666667e+00
+1781 1872 -4.16666666666667e+00
+1781 1800 4.16666666666667e+00
+1781 1784 -1.25000000000000e+01
+1781 1769 -3.75000000000000e+01
+1781 1783 8.33333333333333e+00
+1781 1768 8.33333333333333e+00
+1781 1780 -1.66666666666667e+01
+1781 1335 -8.33333333333333e+00
+1781 1767 8.33333333333333e+00
+1781 1738 -8.33333333333333e+00
+1781 1796 -1.25000000000000e+01
+1781 1794 8.33333333333333e+00
+1781 1374 -8.33333333333333e+00
+1782 1782 1.25000000000000e+02
+1782 1774 -4.16666666666667e+00
+1782 1837 -8.33333333333333e+00
+1782 1775 8.33333333333333e+00
+1782 1773 -1.25000000000000e+01
+1782 1832 -4.16666666666667e+00
+1782 1831 8.33333333333333e+00
+1782 1830 -1.25000000000000e+01
+1782 1772 -8.33333333333333e+00
+1782 1771 4.16666666666667e+00
+1782 1769 4.16666666666667e+00
+1782 1781 -4.16666666666667e+00
+1782 1783 -1.66666666666667e+01
+1782 1801 8.33333333333333e+00
+1782 1780 8.33333333333333e+00
+1782 1802 8.33333333333333e+00
+1782 1874 -8.33333333333333e+00
+1782 1381 -4.16666666666667e+00
+1782 1873 4.16666666666667e+00
+1782 1800 -3.75000000000000e+01
+1782 1336 -4.16666666666667e+00
+1782 1768 4.16666666666667e+00
+1782 1779 -1.25000000000000e+01
+1782 1520 8.33333333333333e+00
+1782 1784 -1.66666666666667e+01
+1782 1868 8.33333333333333e+00
+1782 1537 4.16666666666667e+00
+1782 1867 -4.16666666666667e+00
+1782 1778 4.16666666666667e+00
+1782 1337 -4.16666666666667e+00
+1782 1519 8.33333333333333e+00
+1782 1777 -8.33333333333333e+00
+1782 1518 -3.75000000000000e+01
+1782 1538 4.16666666666667e+00
+1782 1382 -4.16666666666667e+00
+1782 1866 -1.25000000000000e+01
+1782 1838 4.16666666666667e+00
+1783 1783 1.25000000000000e+02
+1783 1773 -4.16666666666667e+00
+1783 1838 4.16666666666667e+00
+1783 1836 -8.33333333333333e+00
+1783 1774 -1.25000000000000e+01
+1783 1772 4.16666666666667e+00
+1783 1830 8.33333333333333e+00
+1783 1832 8.33333333333333e+00
+1783 1831 -3.75000000000000e+01
+1783 1770 4.16666666666667e+00
+1783 1784 -1.66666666666667e+01
+1783 1337 -4.16666666666667e+00
+1783 1382 -4.16666666666667e+00
+1783 1802 -4.16666666666667e+00
+1783 1874 4.16666666666667e+00
+1783 1782 -1.66666666666667e+01
+1783 1800 8.33333333333333e+00
+1783 1779 8.33333333333333e+00
+1783 1801 -1.25000000000000e+01
+1783 1380 -4.16666666666667e+00
+1783 1872 4.16666666666667e+00
+1783 1769 -8.33333333333333e+00
+1783 1781 8.33333333333333e+00
+1783 1780 -3.75000000000000e+01
+1783 1335 -4.16666666666667e+00
+1783 1767 4.16666666666667e+00
+1783 1520 -4.16666666666667e+00
+1783 1778 4.16666666666667e+00
+1783 1536 4.16666666666667e+00
+1783 1866 -4.16666666666667e+00
+1783 1519 -1.25000000000000e+01
+1783 1518 8.33333333333333e+00
+1783 1776 -8.33333333333333e+00
+1783 1538 -8.33333333333333e+00
+1783 1868 8.33333333333333e+00
+1783 1867 -1.25000000000000e+01
+1783 1775 8.33333333333333e+00
+1784 1784 1.25000000000000e+02
+1784 1774 8.33333333333333e+00
+1784 1837 4.16666666666667e+00
+1784 1775 -3.75000000000000e+01
+1784 1773 8.33333333333333e+00
+1784 1830 -4.16666666666667e+00
+1784 1771 4.16666666666667e+00
+1784 1832 -1.25000000000000e+01
+1784 1831 8.33333333333333e+00
+1784 1770 -8.33333333333333e+00
+1784 1783 -1.66666666666667e+01
+1784 1336 -4.16666666666667e+00
+1784 1381 -4.16666666666667e+00
+1784 1767 4.16666666666667e+00
+1784 1779 -4.16666666666667e+00
+1784 1801 -4.16666666666667e+00
+1784 1873 4.16666666666667e+00
+1784 1802 -1.25000000000000e+01
+1784 1800 8.33333333333333e+00
+1784 1872 -8.33333333333333e+00
+1784 1781 -1.25000000000000e+01
+1784 1768 -8.33333333333333e+00
+1784 1780 8.33333333333333e+00
+1784 1519 -4.16666666666667e+00
+1784 1777 4.16666666666667e+00
+1784 1518 8.33333333333333e+00
+1784 1782 -1.66666666666667e+01
+1784 1866 8.33333333333333e+00
+1784 1520 -1.25000000000000e+01
+1784 1776 4.16666666666667e+00
+1784 1335 -4.16666666666667e+00
+1784 1868 -3.75000000000000e+01
+1784 1836 4.16666666666667e+00
+1784 1537 -8.33333333333333e+00
+1784 1867 8.33333333333333e+00
+1784 1536 4.16666666666667e+00
+1784 1380 -4.16666666666667e+00
+1785 1785 1.25000000000000e+02
+1785 1720 -4.16666666666667e+00
+1785 1715 -8.33333333333333e+00
+1785 1721 8.33333333333333e+00
+1785 1719 -1.25000000000000e+01
+1785 1793 -4.16666666666667e+00
+1785 1792 8.33333333333333e+00
+1785 1791 -1.25000000000000e+01
+1785 1684 -4.16666666666667e+00
+1785 1693 4.16666666666667e+00
+1785 1694 4.16666666666667e+00
+1785 1757 -4.16666666666667e+00
+1785 1786 -1.66666666666667e+01
+1785 1756 8.33333333333333e+00
+1785 1755 -1.25000000000000e+01
+1785 1685 -4.16666666666667e+00
+1785 1751 4.16666666666667e+00
+1785 1339 8.33333333333333e+00
+1785 1750 -8.33333333333333e+00
+1785 1541 4.16666666666667e+00
+1785 1787 -1.66666666666667e+01
+1785 1799 8.33333333333333e+00
+1785 1340 8.33333333333333e+00
+1785 1798 -4.16666666666667e+00
+1785 1540 4.16666666666667e+00
+1785 1714 4.16666666666667e+00
+1785 1797 -1.25000000000000e+01
+1785 1338 -3.75000000000000e+01
+1785 428 4.16666666666667e+00
+1785 427 -8.33333333333333e+00
+1785 52 8.33333333333333e+00
+1785 278 -4.16666666666667e+00
+1785 53 8.33333333333333e+00
+1785 434 -8.33333333333333e+00
+1785 433 4.16666666666667e+00
+1785 277 -4.16666666666667e+00
+1785 51 -3.75000000000000e+01
+1786 1786 1.25000000000000e+02
+1786 1719 -4.16666666666667e+00
+1786 1721 8.33333333333333e+00
+1786 1715 4.16666666666667e+00
+1786 1720 -1.25000000000000e+01
+1786 1793 8.33333333333333e+00
+1786 1792 -3.75000000000000e+01
+1786 1791 8.33333333333333e+00
+1786 1787 -1.66666666666667e+01
+1786 1340 -4.16666666666667e+00
+1786 1751 4.16666666666667e+00
+1786 1685 -4.16666666666667e+00
+1786 1683 -4.16666666666667e+00
+1786 1692 4.16666666666667e+00
+1786 1694 -8.33333333333333e+00
+1786 1757 8.33333333333333e+00
+1786 1756 -3.75000000000000e+01
+1786 1785 -1.66666666666667e+01
+1786 1755 8.33333333333333e+00
+1786 1338 8.33333333333333e+00
+1786 1749 -8.33333333333333e+00
+1786 1799 8.33333333333333e+00
+1786 1541 -8.33333333333333e+00
+1786 1713 4.16666666666667e+00
+1786 1798 -1.25000000000000e+01
+1786 1339 -1.25000000000000e+01
+1786 1797 -4.16666666666667e+00
+1786 1539 4.16666666666667e+00
+1786 428 4.16666666666667e+00
+1786 426 -8.33333333333333e+00
+1786 53 -4.16666666666667e+00
+1786 51 8.33333333333333e+00
+1786 434 4.16666666666667e+00
+1786 278 -4.16666666666667e+00
+1786 52 -1.25000000000000e+01
+1786 432 4.16666666666667e+00
+1786 276 -4.16666666666667e+00
+1787 1787 1.25000000000000e+02
+1787 1714 4.16666666666667e+00
+1787 1713 -8.33333333333333e+00
+1787 1721 -3.75000000000000e+01
+1787 1719 8.33333333333333e+00
+1787 1793 -1.25000000000000e+01
+1787 1792 8.33333333333333e+00
+1787 1791 -4.16666666666667e+00
+1787 1786 -1.66666666666667e+01
+1787 1339 -4.16666666666667e+00
+1787 1750 4.16666666666667e+00
+1787 1684 -4.16666666666667e+00
+1787 1757 -1.25000000000000e+01
+1787 1693 -8.33333333333333e+00
+1787 1756 8.33333333333333e+00
+1787 1692 4.16666666666667e+00
+1787 1755 -4.16666666666667e+00
+1787 1683 -4.16666666666667e+00
+1787 1749 4.16666666666667e+00
+1787 1539 4.16666666666667e+00
+1787 1720 8.33333333333333e+00
+1787 1799 -3.75000000000000e+01
+1787 1340 -1.25000000000000e+01
+1787 1798 8.33333333333333e+00
+1787 1540 -8.33333333333333e+00
+1787 1785 -1.66666666666667e+01
+1787 1797 8.33333333333333e+00
+1787 1338 8.33333333333333e+00
+1787 427 4.16666666666667e+00
+1787 426 4.16666666666667e+00
+1787 52 -4.16666666666667e+00
+1787 433 4.16666666666667e+00
+1787 277 -4.16666666666667e+00
+1787 276 -4.16666666666667e+00
+1787 53 -1.25000000000000e+01
+1787 51 8.33333333333333e+00
+1787 432 -8.33333333333333e+00
+1788 1788 1.25000000000000e+02
+1788 1726 -4.16666666666667e+00
+1788 1727 8.33333333333333e+00
+1788 1715 4.16666666666667e+00
+1788 1725 -1.25000000000000e+01
+1788 1835 4.16666666666667e+00
+1788 1834 -8.33333333333333e+00
+1788 1793 8.33333333333333e+00
+1788 1792 8.33333333333333e+00
+1788 1791 -3.75000000000000e+01
+1788 1790 -1.66666666666667e+01
+1788 1358 -4.16666666666667e+00
+1788 1340 -4.16666666666667e+00
+1788 1703 -4.16666666666667e+00
+1788 1769 4.16666666666667e+00
+1788 1702 -4.16666666666667e+00
+1788 1711 4.16666666666667e+00
+1788 1712 -8.33333333333333e+00
+1788 1775 8.33333333333333e+00
+1788 1357 8.33333333333333e+00
+1788 1789 -1.66666666666667e+01
+1788 1774 8.33333333333333e+00
+1788 1773 -3.75000000000000e+01
+1788 1339 8.33333333333333e+00
+1788 1768 -8.33333333333333e+00
+1788 1544 -4.16666666666667e+00
+1788 1838 4.16666666666667e+00
+1788 1837 4.16666666666667e+00
+1788 1543 -4.16666666666667e+00
+1788 1356 -1.25000000000000e+01
+1788 1802 8.33333333333333e+00
+1788 1541 -8.33333333333333e+00
+1788 1801 -4.16666666666667e+00
+1788 1540 4.16666666666667e+00
+1788 1800 -1.25000000000000e+01
+1788 1714 4.16666666666667e+00
+1788 1338 -1.25000000000000e+01
+1789 1789 1.25000000000000e+02
+1789 1725 -4.16666666666667e+00
+1789 1715 -8.33333333333333e+00
+1789 1727 8.33333333333333e+00
+1789 1726 -1.25000000000000e+01
+1789 1835 4.16666666666667e+00
+1789 1833 -8.33333333333333e+00
+1789 1793 -4.16666666666667e+00
+1789 1792 -1.25000000000000e+01
+1789 1791 8.33333333333333e+00
+1789 1701 -4.16666666666667e+00
+1789 1710 4.16666666666667e+00
+1789 1712 4.16666666666667e+00
+1789 1775 -4.16666666666667e+00
+1789 1774 -1.25000000000000e+01
+1789 1356 8.33333333333333e+00
+1789 1788 -1.66666666666667e+01
+1789 1773 8.33333333333333e+00
+1789 1703 -4.16666666666667e+00
+1789 1769 4.16666666666667e+00
+1789 1338 8.33333333333333e+00
+1789 1767 -8.33333333333333e+00
+1789 1544 -4.16666666666667e+00
+1789 1541 4.16666666666667e+00
+1789 1838 -8.33333333333333e+00
+1789 1358 8.33333333333333e+00
+1789 1357 -3.75000000000000e+01
+1789 1836 4.16666666666667e+00
+1789 1542 -4.16666666666667e+00
+1789 1802 8.33333333333333e+00
+1789 1790 -1.66666666666667e+01
+1789 1340 8.33333333333333e+00
+1789 1801 -1.25000000000000e+01
+1789 1713 4.16666666666667e+00
+1789 1339 -3.75000000000000e+01
+1789 1800 -4.16666666666667e+00
+1789 1539 4.16666666666667e+00
+1790 1790 1.25000000000000e+02
+1790 1714 -8.33333333333333e+00
+1790 1713 4.16666666666667e+00
+1790 1727 -3.75000000000000e+01
+1790 1726 8.33333333333333e+00
+1790 1833 4.16666666666667e+00
+1790 1834 4.16666666666667e+00
+1790 1793 -1.25000000000000e+01
+1790 1792 -4.16666666666667e+00
+1790 1791 8.33333333333333e+00
+1790 1788 -1.66666666666667e+01
+1790 1356 -4.16666666666667e+00
+1790 1338 -4.16666666666667e+00
+1790 1701 -4.16666666666667e+00
+1790 1767 4.16666666666667e+00
+1790 1775 -1.25000000000000e+01
+1790 1711 4.16666666666667e+00
+1790 1774 -4.16666666666667e+00
+1790 1710 -8.33333333333333e+00
+1790 1773 8.33333333333333e+00
+1790 1702 -4.16666666666667e+00
+1790 1768 4.16666666666667e+00
+1790 1542 -4.16666666666667e+00
+1790 1836 4.16666666666667e+00
+1790 1543 -4.16666666666667e+00
+1790 1540 4.16666666666667e+00
+1790 1358 -1.25000000000000e+01
+1790 1837 -8.33333333333333e+00
+1790 1357 8.33333333333333e+00
+1790 1802 -3.75000000000000e+01
+1790 1725 8.33333333333333e+00
+1790 1340 -1.25000000000000e+01
+1790 1801 8.33333333333333e+00
+1790 1789 -1.66666666666667e+01
+1790 1339 8.33333333333333e+00
+1790 1800 8.33333333333333e+00
+1790 1539 -8.33333333333333e+00
+1791 1791 1.25000000000000e+02
+1791 1727 -8.33333333333333e+00
+1791 1835 -4.16666666666667e+00
+1791 1543 4.16666666666667e+00
+1791 1544 4.16666666666667e+00
+1791 1834 8.33333333333333e+00
+1791 1833 -1.25000000000000e+01
+1791 1790 8.33333333333333e+00
+1791 1789 8.33333333333333e+00
+1791 1788 -3.75000000000000e+01
+1791 1714 -4.16666666666667e+00
+1791 1715 -4.16666666666667e+00
+1791 1729 -4.16666666666667e+00
+1791 1720 4.16666666666667e+00
+1791 1721 4.16666666666667e+00
+1791 1730 8.33333333333333e+00
+1791 1793 -1.66666666666667e+01
+1791 1728 -1.25000000000000e+01
+1791 1540 -4.16666666666667e+00
+1791 1792 -1.66666666666667e+01
+1791 1541 8.33333333333333e+00
+1791 1787 -4.16666666666667e+00
+1791 1340 4.16666666666667e+00
+1791 1786 8.33333333333333e+00
+1791 1339 -8.33333333333333e+00
+1791 1785 -1.25000000000000e+01
+1791 1726 4.16666666666667e+00
+1791 1539 -1.25000000000000e+01
+1791 428 8.33333333333333e+00
+1791 280 -4.16666666666667e+00
+1791 277 4.16666666666667e+00
+1791 278 -8.33333333333333e+00
+1791 92 4.16666666666667e+00
+1791 281 -4.16666666666667e+00
+1791 427 8.33333333333333e+00
+1791 91 -8.33333333333333e+00
+1791 426 -3.75000000000000e+01
+1792 1792 1.25000000000000e+02
+1792 1727 4.16666666666667e+00
+1792 1835 8.33333333333333e+00
+1792 1542 4.16666666666667e+00
+1792 1544 -8.33333333333333e+00
+1792 1834 -3.75000000000000e+01
+1792 1833 8.33333333333333e+00
+1792 1790 -4.16666666666667e+00
+1792 1789 -1.25000000000000e+01
+1792 1788 8.33333333333333e+00
+1792 1713 -4.16666666666667e+00
+1792 1730 8.33333333333333e+00
+1792 1728 -4.16666666666667e+00
+1792 1719 4.16666666666667e+00
+1792 1721 -8.33333333333333e+00
+1792 1729 -1.25000000000000e+01
+1792 1715 -4.16666666666667e+00
+1792 1340 4.16666666666667e+00
+1792 1539 -4.16666666666667e+00
+1792 1791 -1.66666666666667e+01
+1792 1787 8.33333333333333e+00
+1792 1793 -1.66666666666667e+01
+1792 1541 8.33333333333333e+00
+1792 1786 -3.75000000000000e+01
+1792 1725 4.16666666666667e+00
+1792 1540 -1.25000000000000e+01
+1792 1785 8.33333333333333e+00
+1792 1338 -8.33333333333333e+00
+1792 92 4.16666666666667e+00
+1792 428 -4.16666666666667e+00
+1792 279 -4.16666666666667e+00
+1792 276 4.16666666666667e+00
+1792 281 -4.16666666666667e+00
+1792 278 4.16666666666667e+00
+1792 427 -1.25000000000000e+01
+1792 426 8.33333333333333e+00
+1792 90 -8.33333333333333e+00
+1793 1793 1.25000000000000e+02
+1793 1725 -8.33333333333333e+00
+1793 1833 -4.16666666666667e+00
+1793 1834 8.33333333333333e+00
+1793 1543 -8.33333333333333e+00
+1793 1542 4.16666666666667e+00
+1793 1835 -1.25000000000000e+01
+1793 1790 -1.25000000000000e+01
+1793 1789 -4.16666666666667e+00
+1793 1788 8.33333333333333e+00
+1793 1713 -4.16666666666667e+00
+1793 1729 8.33333333333333e+00
+1793 1720 -8.33333333333333e+00
+1793 1719 4.16666666666667e+00
+1793 1730 -3.75000000000000e+01
+1793 1728 8.33333333333333e+00
+1793 1791 -1.66666666666667e+01
+1793 1714 -4.16666666666667e+00
+1793 1339 4.16666666666667e+00
+1793 1539 8.33333333333333e+00
+1793 1787 -1.25000000000000e+01
+1793 1726 4.16666666666667e+00
+1793 1541 -3.75000000000000e+01
+1793 1786 8.33333333333333e+00
+1793 1792 -1.66666666666667e+01
+1793 1540 8.33333333333333e+00
+1793 1785 -4.16666666666667e+00
+1793 1338 4.16666666666667e+00
+1793 91 4.16666666666667e+00
+1793 427 -4.16666666666667e+00
+1793 426 8.33333333333333e+00
+1793 280 -4.16666666666667e+00
+1793 277 4.16666666666667e+00
+1793 276 -8.33333333333333e+00
+1793 428 -1.25000000000000e+01
+1793 90 4.16666666666667e+00
+1793 279 -4.16666666666667e+00
+1794 1794 1.25000000000000e+02
+1794 1769 -8.33333333333333e+00
+1794 1768 4.16666666666667e+00
+1794 1781 8.33333333333333e+00
+1794 1779 -3.75000000000000e+01
+1794 1873 4.16666666666667e+00
+1794 1874 4.16666666666667e+00
+1794 1802 -4.16666666666667e+00
+1794 1801 8.33333333333333e+00
+1794 1800 -1.25000000000000e+01
+1794 1738 -4.16666666666667e+00
+1794 1739 -4.16666666666667e+00
+1794 1748 4.16666666666667e+00
+1794 1747 -8.33333333333333e+00
+1794 1751 4.16666666666667e+00
+1794 1763 -4.16666666666667e+00
+1794 1795 -1.66666666666667e+01
+1794 1762 8.33333333333333e+00
+1794 1750 4.16666666666667e+00
+1794 1339 -4.16666666666667e+00
+1794 1375 -4.16666666666667e+00
+1794 1761 -1.25000000000000e+01
+1794 1541 4.16666666666667e+00
+1794 1547 -4.16666666666667e+00
+1794 1870 4.16666666666667e+00
+1794 1546 -4.16666666666667e+00
+1794 1376 8.33333333333333e+00
+1794 1871 -8.33333333333333e+00
+1794 1374 -1.25000000000000e+01
+1794 1796 -1.66666666666667e+01
+1794 1799 8.33333333333333e+00
+1794 1340 8.33333333333333e+00
+1794 1798 8.33333333333333e+00
+1794 1540 -8.33333333333333e+00
+1794 1780 8.33333333333333e+00
+1794 1797 -3.75000000000000e+01
+1794 1338 -1.25000000000000e+01
+1795 1795 1.25000000000000e+02
+1795 1781 -4.16666666666667e+00
+1795 1779 8.33333333333333e+00
+1795 1767 4.16666666666667e+00
+1795 1780 -1.25000000000000e+01
+1795 1872 4.16666666666667e+00
+1795 1874 -8.33333333333333e+00
+1795 1802 8.33333333333333e+00
+1795 1801 -3.75000000000000e+01
+1795 1800 8.33333333333333e+00
+1795 1737 -4.16666666666667e+00
+1795 1739 -4.16666666666667e+00
+1795 1748 4.16666666666667e+00
+1795 1746 -8.33333333333333e+00
+1795 1794 -1.66666666666667e+01
+1795 1761 8.33333333333333e+00
+1795 1751 -8.33333333333333e+00
+1795 1340 8.33333333333333e+00
+1795 1749 4.16666666666667e+00
+1795 1338 -4.16666666666667e+00
+1795 1763 8.33333333333333e+00
+1795 1796 -1.66666666666667e+01
+1795 1376 8.33333333333333e+00
+1795 1762 -3.75000000000000e+01
+1795 1374 -4.16666666666667e+00
+1795 1869 4.16666666666667e+00
+1795 1545 -4.16666666666667e+00
+1795 1871 4.16666666666667e+00
+1795 1547 -4.16666666666667e+00
+1795 1375 -1.25000000000000e+01
+1795 1799 -4.16666666666667e+00
+1795 1541 4.16666666666667e+00
+1795 1769 4.16666666666667e+00
+1795 1798 -1.25000000000000e+01
+1795 1339 -1.25000000000000e+01
+1795 1797 8.33333333333333e+00
+1795 1539 -8.33333333333333e+00
+1796 1796 1.25000000000000e+02
+1796 1780 -4.16666666666667e+00
+1796 1767 -8.33333333333333e+00
+1796 1781 -1.25000000000000e+01
+1796 1779 8.33333333333333e+00
+1796 1873 -8.33333333333333e+00
+1796 1872 4.16666666666667e+00
+1796 1802 -1.25000000000000e+01
+1796 1801 8.33333333333333e+00
+1796 1800 -4.16666666666667e+00
+1796 1738 -4.16666666666667e+00
+1796 1747 4.16666666666667e+00
+1796 1737 -4.16666666666667e+00
+1796 1746 4.16666666666667e+00
+1796 1749 4.16666666666667e+00
+1796 1761 -4.16666666666667e+00
+1796 1750 -8.33333333333333e+00
+1796 1339 8.33333333333333e+00
+1796 1763 -1.25000000000000e+01
+1796 1762 8.33333333333333e+00
+1796 1795 -1.66666666666667e+01
+1796 1375 8.33333333333333e+00
+1796 1539 4.16666666666667e+00
+1796 1545 -4.16666666666667e+00
+1796 1376 -3.75000000000000e+01
+1796 1870 4.16666666666667e+00
+1796 1546 -4.16666666666667e+00
+1796 1374 8.33333333333333e+00
+1796 1869 -8.33333333333333e+00
+1796 1768 4.16666666666667e+00
+1796 1799 -1.25000000000000e+01
+1796 1340 -3.75000000000000e+01
+1796 1798 -4.16666666666667e+00
+1796 1540 4.16666666666667e+00
+1796 1794 -1.66666666666667e+01
+1796 1797 8.33333333333333e+00
+1796 1338 8.33333333333333e+00
+1797 1797 1.25000000000000e+02
+1797 1756 4.16666666666667e+00
+1797 1787 8.33333333333333e+00
+1797 1786 -4.16666666666667e+00
+1797 1785 -1.25000000000000e+01
+1797 1751 -4.16666666666667e+00
+1797 1766 -4.16666666666667e+00
+1797 1763 4.16666666666667e+00
+1797 1765 8.33333333333333e+00
+1797 1762 -8.33333333333333e+00
+1797 1764 -1.25000000000000e+01
+1797 1750 -4.16666666666667e+00
+1797 1339 4.16666666666667e+00
+1797 1541 -4.16666666666667e+00
+1797 1799 -1.66666666666667e+01
+1797 1870 -4.16666666666667e+00
+1797 1547 4.16666666666667e+00
+1797 1546 4.16666666666667e+00
+1797 1871 8.33333333333333e+00
+1797 1869 -1.25000000000000e+01
+1797 1796 8.33333333333333e+00
+1797 1340 -8.33333333333333e+00
+1797 1795 8.33333333333333e+00
+1797 1798 -1.66666666666667e+01
+1797 1540 8.33333333333333e+00
+1797 1794 -3.75000000000000e+01
+1797 1757 4.16666666666667e+00
+1797 1539 -1.25000000000000e+01
+1797 433 8.33333333333333e+00
+1797 278 4.16666666666667e+00
+1797 277 -8.33333333333333e+00
+1797 434 8.33333333333333e+00
+1797 432 -3.75000000000000e+01
+1797 112 4.16666666666667e+00
+1797 284 -4.16666666666667e+00
+1797 283 -4.16666666666667e+00
+1797 113 -8.33333333333333e+00
+1798 1798 1.25000000000000e+02
+1798 1755 4.16666666666667e+00
+1798 1787 8.33333333333333e+00
+1798 1786 -1.25000000000000e+01
+1798 1785 -4.16666666666667e+00
+1798 1751 -4.16666666666667e+00
+1798 1764 8.33333333333333e+00
+1798 1763 4.16666666666667e+00
+1798 1761 -8.33333333333333e+00
+1798 1766 8.33333333333333e+00
+1798 1799 -1.66666666666667e+01
+1798 1765 -3.75000000000000e+01
+1798 1749 -4.16666666666667e+00
+1798 1338 4.16666666666667e+00
+1798 1869 -4.16666666666667e+00
+1798 1871 8.33333333333333e+00
+1798 1541 8.33333333333333e+00
+1798 1547 -8.33333333333333e+00
+1798 1545 4.16666666666667e+00
+1798 1870 -1.25000000000000e+01
+1798 1796 -4.16666666666667e+00
+1798 1340 4.16666666666667e+00
+1798 1795 -1.25000000000000e+01
+1798 1757 -8.33333333333333e+00
+1798 1540 -3.75000000000000e+01
+1798 1794 8.33333333333333e+00
+1798 1797 -1.66666666666667e+01
+1798 1539 8.33333333333333e+00
+1798 434 -4.16666666666667e+00
+1798 278 4.16666666666667e+00
+1798 432 8.33333333333333e+00
+1798 276 -8.33333333333333e+00
+1798 433 -1.25000000000000e+01
+1798 111 4.16666666666667e+00
+1798 282 -4.16666666666667e+00
+1798 113 4.16666666666667e+00
+1798 284 -4.16666666666667e+00
+1799 1799 1.25000000000000e+02
+1799 1756 -8.33333333333333e+00
+1799 1787 -3.75000000000000e+01
+1799 1786 8.33333333333333e+00
+1799 1785 8.33333333333333e+00
+1799 1749 -4.16666666666667e+00
+1799 1750 -4.16666666666667e+00
+1799 1764 -4.16666666666667e+00
+1799 1761 4.16666666666667e+00
+1799 1762 4.16666666666667e+00
+1799 1766 -1.25000000000000e+01
+1799 1765 8.33333333333333e+00
+1799 1798 -1.66666666666667e+01
+1799 1539 -4.16666666666667e+00
+1799 1797 -1.66666666666667e+01
+1799 1870 8.33333333333333e+00
+1799 1545 4.16666666666667e+00
+1799 1540 8.33333333333333e+00
+1799 1546 -8.33333333333333e+00
+1799 1871 -3.75000000000000e+01
+1799 1869 8.33333333333333e+00
+1799 1796 -1.25000000000000e+01
+1799 1755 4.16666666666667e+00
+1799 1541 -1.25000000000000e+01
+1799 1795 -4.16666666666667e+00
+1799 1339 4.16666666666667e+00
+1799 1794 8.33333333333333e+00
+1799 1338 -8.33333333333333e+00
+1799 433 -4.16666666666667e+00
+1799 277 4.16666666666667e+00
+1799 276 4.16666666666667e+00
+1799 434 -1.25000000000000e+01
+1799 432 8.33333333333333e+00
+1799 282 -4.16666666666667e+00
+1799 112 4.16666666666667e+00
+1799 283 -4.16666666666667e+00
+1799 111 -8.33333333333333e+00
+1800 1800 1.25000000000000e+02
+1800 1774 4.16666666666667e+00
+1800 1544 4.16666666666667e+00
+1800 1838 -4.16666666666667e+00
+1800 1837 8.33333333333333e+00
+1800 1543 -8.33333333333333e+00
+1800 1836 -1.25000000000000e+01
+1800 1790 8.33333333333333e+00
+1800 1789 -4.16666666666667e+00
+1800 1788 -1.25000000000000e+01
+1800 1769 -4.16666666666667e+00
+1800 1783 8.33333333333333e+00
+1800 1781 4.16666666666667e+00
+1800 1780 -8.33333333333333e+00
+1800 1784 8.33333333333333e+00
+1800 1802 -1.66666666666667e+01
+1800 1381 4.16666666666667e+00
+1800 1782 -3.75000000000000e+01
+1800 1768 -4.16666666666667e+00
+1800 1339 4.16666666666667e+00
+1800 1873 -4.16666666666667e+00
+1800 1874 8.33333333333333e+00
+1800 1541 8.33333333333333e+00
+1800 1547 -8.33333333333333e+00
+1800 1549 -4.16666666666667e+00
+1800 1546 4.16666666666667e+00
+1800 1382 4.16666666666667e+00
+1800 1550 -4.16666666666667e+00
+1800 1872 -1.25000000000000e+01
+1800 1796 -4.16666666666667e+00
+1800 1340 4.16666666666667e+00
+1800 1801 -1.66666666666667e+01
+1800 1795 8.33333333333333e+00
+1800 1540 8.33333333333333e+00
+1800 1775 -8.33333333333333e+00
+1800 1794 -1.25000000000000e+01
+1800 1539 -3.75000000000000e+01
+1801 1801 1.25000000000000e+02
+1801 1773 4.16666666666667e+00
+1801 1836 8.33333333333333e+00
+1801 1544 4.16666666666667e+00
+1801 1542 -8.33333333333333e+00
+1801 1838 8.33333333333333e+00
+1801 1837 -3.75000000000000e+01
+1801 1790 8.33333333333333e+00
+1801 1789 -1.25000000000000e+01
+1801 1788 -4.16666666666667e+00
+1801 1769 -4.16666666666667e+00
+1801 1784 -4.16666666666667e+00
+1801 1781 4.16666666666667e+00
+1801 1782 8.33333333333333e+00
+1801 1779 -8.33333333333333e+00
+1801 1783 -1.25000000000000e+01
+1801 1380 4.16666666666667e+00
+1801 1767 -4.16666666666667e+00
+1801 1338 4.16666666666667e+00
+1801 1541 -4.16666666666667e+00
+1801 1802 -1.66666666666667e+01
+1801 1872 -4.16666666666667e+00
+1801 1550 -4.16666666666667e+00
+1801 1547 4.16666666666667e+00
+1801 1548 -4.16666666666667e+00
+1801 1545 4.16666666666667e+00
+1801 1382 -8.33333333333333e+00
+1801 1874 8.33333333333333e+00
+1801 1873 -1.25000000000000e+01
+1801 1796 8.33333333333333e+00
+1801 1340 -8.33333333333333e+00
+1801 1775 4.16666666666667e+00
+1801 1795 -3.75000000000000e+01
+1801 1540 -1.25000000000000e+01
+1801 1800 -1.66666666666667e+01
+1801 1794 8.33333333333333e+00
+1801 1539 8.33333333333333e+00
+1802 1802 1.25000000000000e+02
+1802 1773 -8.33333333333333e+00
+1802 1542 4.16666666666667e+00
+1802 1836 -4.16666666666667e+00
+1802 1543 4.16666666666667e+00
+1802 1838 -1.25000000000000e+01
+1802 1837 8.33333333333333e+00
+1802 1790 -3.75000000000000e+01
+1802 1789 8.33333333333333e+00
+1802 1788 8.33333333333333e+00
+1802 1768 -4.16666666666667e+00
+1802 1767 -4.16666666666667e+00
+1802 1783 -4.16666666666667e+00
+1802 1780 4.16666666666667e+00
+1802 1779 4.16666666666667e+00
+1802 1784 -1.25000000000000e+01
+1802 1782 8.33333333333333e+00
+1802 1800 -1.66666666666667e+01
+1802 1540 -4.16666666666667e+00
+1802 1801 -1.66666666666667e+01
+1802 1549 -4.16666666666667e+00
+1802 1546 4.16666666666667e+00
+1802 1872 8.33333333333333e+00
+1802 1539 8.33333333333333e+00
+1802 1545 -8.33333333333333e+00
+1802 1874 -3.75000000000000e+01
+1802 1381 -8.33333333333333e+00
+1802 1873 8.33333333333333e+00
+1802 1380 4.16666666666667e+00
+1802 1548 -4.16666666666667e+00
+1802 1774 4.16666666666667e+00
+1802 1796 -1.25000000000000e+01
+1802 1541 -1.25000000000000e+01
+1802 1795 8.33333333333333e+00
+1802 1339 -8.33333333333333e+00
+1802 1794 -4.16666666666667e+00
+1802 1338 4.16666666666667e+00
+1803 1803 6.25000000000000e+01
+1803 1601 -4.16666666666667e+00
+1803 1804 -8.33333333333333e+00
+1803 1807 4.16666666666667e+00
+1803 1600 8.33333333333333e+00
+1803 1808 4.16666666666667e+00
+1803 1342 -2.08333333333333e+00
+1803 1597 4.16666666666667e+00
+1803 1806 -1.87500000000000e+01
+1803 1817 -4.16666666666667e+00
+1803 1816 2.08333333333333e+00
+1803 1348 -2.08333333333333e+00
+1803 1599 -1.25000000000000e+01
+1803 1435 2.08333333333333e+00
+1803 1579 -4.16666666666667e+00
+1803 1580 -4.16666666666667e+00
+1803 1586 4.16666666666667e+00
+1803 1343 4.16666666666667e+00
+1803 1436 -4.16666666666667e+00
+1803 1341 -6.25000000000000e+00
+1803 1805 -8.33333333333333e+00
+1803 1442 4.16666666666667e+00
+1803 1349 4.16666666666667e+00
+1803 1441 4.16666666666667e+00
+1803 1585 -8.33333333333333e+00
+1803 1598 4.16666666666667e+00
+1803 1440 -1.87500000000000e+01
+1803 1347 -6.25000000000000e+00
+1804 1804 6.25000000000000e+01
+1804 1817 2.08333333333333e+00
+1804 1803 -8.33333333333333e+00
+1804 1806 4.16666666666667e+00
+1804 1599 8.33333333333333e+00
+1804 1343 4.16666666666667e+00
+1804 1598 -8.33333333333333e+00
+1804 1807 -6.25000000000000e+00
+1804 1341 -2.08333333333333e+00
+1804 1596 4.16666666666667e+00
+1804 1805 -8.33333333333333e+00
+1804 1601 8.33333333333333e+00
+1804 1349 4.16666666666667e+00
+1804 1600 -3.75000000000000e+01
+1804 1815 2.08333333333333e+00
+1804 1347 -2.08333333333333e+00
+1804 1434 2.08333333333333e+00
+1804 1578 -4.16666666666667e+00
+1804 1436 2.08333333333333e+00
+1804 1580 -4.16666666666667e+00
+1804 1342 -6.25000000000000e+00
+1804 1442 -2.08333333333333e+00
+1804 1586 4.16666666666667e+00
+1804 1808 -2.08333333333333e+00
+1804 1441 -6.25000000000000e+00
+1804 1348 -6.25000000000000e+00
+1804 1440 4.16666666666667e+00
+1804 1584 -8.33333333333333e+00
+1805 1805 6.25000000000000e+01
+1805 1599 -4.16666666666667e+00
+1805 1807 -2.08333333333333e+00
+1805 1816 2.08333333333333e+00
+1805 1808 -6.25000000000000e+00
+1805 1342 4.16666666666667e+00
+1805 1597 -8.33333333333333e+00
+1805 1806 4.16666666666667e+00
+1805 1601 -1.25000000000000e+01
+1805 1804 -8.33333333333333e+00
+1805 1600 8.33333333333333e+00
+1805 1348 4.16666666666667e+00
+1805 1815 -4.16666666666667e+00
+1805 1578 -4.16666666666667e+00
+1805 1584 4.16666666666667e+00
+1805 1343 -1.87500000000000e+01
+1805 1435 2.08333333333333e+00
+1805 1579 -4.16666666666667e+00
+1805 1341 4.16666666666667e+00
+1805 1434 -4.16666666666667e+00
+1805 1596 4.16666666666667e+00
+1805 1442 -6.25000000000000e+00
+1805 1349 -1.87500000000000e+01
+1805 1441 -2.08333333333333e+00
+1805 1585 4.16666666666667e+00
+1805 1803 -8.33333333333333e+00
+1805 1440 4.16666666666667e+00
+1805 1347 4.16666666666667e+00
+1806 1806 6.25000000000000e+01
+1806 1804 4.16666666666667e+00
+1806 1600 -8.33333333333333e+00
+1806 1805 4.16666666666667e+00
+1806 1342 2.08333333333333e+00
+1806 1803 -1.87500000000000e+01
+1806 1817 4.16666666666667e+00
+1806 1354 2.08333333333333e+00
+1806 1816 -2.08333333333333e+00
+1806 1815 -6.25000000000000e+00
+1806 1597 -4.16666666666667e+00
+1806 1598 -4.16666666666667e+00
+1806 1808 -8.33333333333333e+00
+1806 1450 -2.08333333333333e+00
+1806 1444 4.16666666666667e+00
+1806 1445 4.16666666666667e+00
+1806 1604 -4.16666666666667e+00
+1806 1451 4.16666666666667e+00
+1806 1343 -4.16666666666667e+00
+1806 1449 -6.25000000000000e+00
+1806 1457 4.16666666666667e+00
+1806 1355 -4.16666666666667e+00
+1806 1456 4.16666666666667e+00
+1806 1807 -8.33333333333333e+00
+1806 1603 8.33333333333333e+00
+1806 1455 -1.87500000000000e+01
+1806 1601 4.16666666666667e+00
+1806 1602 -1.25000000000000e+01
+1807 1807 6.25000000000000e+01
+1807 1601 4.16666666666667e+00
+1807 1803 4.16666666666667e+00
+1807 1599 -8.33333333333333e+00
+1807 1804 -6.25000000000000e+00
+1807 1341 2.08333333333333e+00
+1807 1808 -8.33333333333333e+00
+1807 1817 4.16666666666667e+00
+1807 1816 -6.25000000000000e+00
+1807 1353 2.08333333333333e+00
+1807 1815 -2.08333333333333e+00
+1807 1596 -4.16666666666667e+00
+1807 1451 4.16666666666667e+00
+1807 1449 -2.08333333333333e+00
+1807 1443 4.16666666666667e+00
+1807 1445 -8.33333333333333e+00
+1807 1604 8.33333333333333e+00
+1807 1343 2.08333333333333e+00
+1807 1598 -4.16666666666667e+00
+1807 1450 -6.25000000000000e+00
+1807 1457 -2.08333333333333e+00
+1807 1355 2.08333333333333e+00
+1807 1456 -6.25000000000000e+00
+1807 1805 -2.08333333333333e+00
+1807 1603 -3.75000000000000e+01
+1807 1455 4.16666666666667e+00
+1807 1806 -8.33333333333333e+00
+1807 1602 8.33333333333333e+00
+1808 1808 6.25000000000000e+01
+1808 1804 -2.08333333333333e+00
+1808 1600 4.16666666666667e+00
+1808 1805 -6.25000000000000e+00
+1808 1803 4.16666666666667e+00
+1808 1817 -1.87500000000000e+01
+1808 1807 -8.33333333333333e+00
+1808 1816 4.16666666666667e+00
+1808 1815 4.16666666666667e+00
+1808 1596 -4.16666666666667e+00
+1808 1450 4.16666666666667e+00
+1808 1806 -8.33333333333333e+00
+1808 1444 -8.33333333333333e+00
+1808 1603 8.33333333333333e+00
+1808 1443 4.16666666666667e+00
+1808 1602 -4.16666666666667e+00
+1808 1451 -1.87500000000000e+01
+1808 1342 2.08333333333333e+00
+1808 1597 -4.16666666666667e+00
+1808 1449 4.16666666666667e+00
+1808 1341 -4.16666666666667e+00
+1808 1457 -6.25000000000000e+00
+1808 1599 4.16666666666667e+00
+1808 1604 -1.25000000000000e+01
+1808 1456 -2.08333333333333e+00
+1808 1354 2.08333333333333e+00
+1808 1455 4.16666666666667e+00
+1808 1353 -4.16666666666667e+00
+1809 1809 6.25000000000000e+01
+1809 1819 2.08333333333333e+00
+1809 1820 -4.16666666666667e+00
+1809 1814 4.16666666666667e+00
+1809 1812 -6.25000000000000e+00
+1809 1649 -4.16666666666667e+00
+1809 1348 4.16666666666667e+00
+1809 1810 -8.33333333333333e+00
+1809 1648 8.33333333333333e+00
+1809 1647 -1.25000000000000e+01
+1809 1646 4.16666666666667e+00
+1809 1345 4.16666666666667e+00
+1809 1645 -8.33333333333333e+00
+1809 1586 4.16666666666667e+00
+1809 1583 -4.16666666666667e+00
+1809 1346 4.16666666666667e+00
+1809 1439 -4.16666666666667e+00
+1809 1438 2.08333333333333e+00
+1809 1582 -4.16666666666667e+00
+1809 1344 -1.87500000000000e+01
+1809 1811 -8.33333333333333e+00
+1809 1442 4.16666666666667e+00
+1809 1349 4.16666666666667e+00
+1809 1441 -2.08333333333333e+00
+1809 1585 4.16666666666667e+00
+1809 1813 -2.08333333333333e+00
+1809 1440 -6.25000000000000e+00
+1809 1347 -1.87500000000000e+01
+1810 1810 6.25000000000000e+01
+1810 1811 -8.33333333333333e+00
+1810 1812 -2.08333333333333e+00
+1810 1818 2.08333333333333e+00
+1810 1349 -2.08333333333333e+00
+1810 1820 2.08333333333333e+00
+1810 1346 -2.08333333333333e+00
+1810 1813 -6.25000000000000e+00
+1810 1646 4.16666666666667e+00
+1810 1649 8.33333333333333e+00
+1810 1648 -3.75000000000000e+01
+1810 1347 4.16666666666667e+00
+1810 1809 -8.33333333333333e+00
+1810 1647 8.33333333333333e+00
+1810 1344 4.16666666666667e+00
+1810 1644 -8.33333333333333e+00
+1810 1439 2.08333333333333e+00
+1810 1583 -4.16666666666667e+00
+1810 1345 -6.25000000000000e+00
+1810 1437 2.08333333333333e+00
+1810 1581 -4.16666666666667e+00
+1810 1442 4.16666666666667e+00
+1810 1586 -8.33333333333333e+00
+1810 1814 4.16666666666667e+00
+1810 1441 -6.25000000000000e+00
+1810 1348 -6.25000000000000e+00
+1810 1440 -2.08333333333333e+00
+1810 1584 4.16666666666667e+00
+1811 1811 6.25000000000000e+01
+1811 1810 -8.33333333333333e+00
+1811 1348 -2.08333333333333e+00
+1811 1819 2.08333333333333e+00
+1811 1818 -4.16666666666667e+00
+1811 1814 -1.87500000000000e+01
+1811 1345 -2.08333333333333e+00
+1811 1812 4.16666666666667e+00
+1811 1645 4.16666666666667e+00
+1811 1649 -1.25000000000000e+01
+1811 1648 8.33333333333333e+00
+1811 1647 -4.16666666666667e+00
+1811 1644 4.16666666666667e+00
+1811 1584 4.16666666666667e+00
+1811 1581 -4.16666666666667e+00
+1811 1438 2.08333333333333e+00
+1811 1582 -4.16666666666667e+00
+1811 1346 -6.25000000000000e+00
+1811 1344 4.16666666666667e+00
+1811 1437 -4.16666666666667e+00
+1811 1813 4.16666666666667e+00
+1811 1442 -1.87500000000000e+01
+1811 1349 -6.25000000000000e+00
+1811 1441 4.16666666666667e+00
+1811 1585 -8.33333333333333e+00
+1811 1809 -8.33333333333333e+00
+1811 1440 4.16666666666667e+00
+1811 1347 4.16666666666667e+00
+1812 1812 6.25000000000000e+01
+1812 1649 4.16666666666667e+00
+1812 1648 4.16666666666667e+00
+1812 1820 4.16666666666667e+00
+1812 1819 4.16666666666667e+00
+1812 1813 -8.33333333333333e+00
+1812 1818 -1.87500000000000e+01
+1812 1811 4.16666666666667e+00
+1812 1809 -6.25000000000000e+00
+1812 1658 -4.16666666666667e+00
+1812 1814 -8.33333333333333e+00
+1812 1646 -4.16666666666667e+00
+1812 1505 4.16666666666667e+00
+1812 1507 4.16666666666667e+00
+1812 1657 8.33333333333333e+00
+1812 1504 -8.33333333333333e+00
+1812 1508 4.16666666666667e+00
+1812 1346 -4.16666666666667e+00
+1812 1345 2.08333333333333e+00
+1812 1645 -4.16666666666667e+00
+1812 1506 -1.87500000000000e+01
+1812 1514 4.16666666666667e+00
+1812 1379 -4.16666666666667e+00
+1812 1513 -2.08333333333333e+00
+1812 1378 2.08333333333333e+00
+1812 1512 -6.25000000000000e+00
+1812 1810 -2.08333333333333e+00
+1812 1656 -1.25000000000000e+01
+1813 1813 6.25000000000000e+01
+1813 1809 -2.08333333333333e+00
+1813 1649 -8.33333333333333e+00
+1813 1647 4.16666666666667e+00
+1813 1820 -2.08333333333333e+00
+1813 1379 2.08333333333333e+00
+1813 1819 -6.25000000000000e+00
+1813 1818 4.16666666666667e+00
+1813 1812 -8.33333333333333e+00
+1813 1346 2.08333333333333e+00
+1813 1810 -6.25000000000000e+00
+1813 1508 -2.08333333333333e+00
+1813 1506 4.16666666666667e+00
+1813 1646 -4.16666666666667e+00
+1813 1505 4.16666666666667e+00
+1813 1656 8.33333333333333e+00
+1813 1503 -8.33333333333333e+00
+1813 1507 -6.25000000000000e+00
+1813 1344 2.08333333333333e+00
+1813 1644 -4.16666666666667e+00
+1813 1514 4.16666666666667e+00
+1813 1814 -8.33333333333333e+00
+1813 1658 8.33333333333333e+00
+1813 1513 -6.25000000000000e+00
+1813 1811 4.16666666666667e+00
+1813 1657 -3.75000000000000e+01
+1813 1512 -2.08333333333333e+00
+1813 1377 2.08333333333333e+00
+1814 1814 6.25000000000000e+01
+1814 1647 4.16666666666667e+00
+1814 1648 -8.33333333333333e+00
+1814 1820 -6.25000000000000e+00
+1814 1819 -2.08333333333333e+00
+1814 1378 2.08333333333333e+00
+1814 1818 4.16666666666667e+00
+1814 1811 -1.87500000000000e+01
+1814 1345 2.08333333333333e+00
+1814 1809 4.16666666666667e+00
+1814 1656 -4.16666666666667e+00
+1814 1507 -2.08333333333333e+00
+1814 1812 -8.33333333333333e+00
+1814 1644 -4.16666666666667e+00
+1814 1503 4.16666666666667e+00
+1814 1645 -4.16666666666667e+00
+1814 1504 4.16666666666667e+00
+1814 1508 -6.25000000000000e+00
+1814 1506 4.16666666666667e+00
+1814 1344 -4.16666666666667e+00
+1814 1514 -1.87500000000000e+01
+1814 1810 4.16666666666667e+00
+1814 1658 -1.25000000000000e+01
+1814 1513 4.16666666666667e+00
+1814 1813 -8.33333333333333e+00
+1814 1657 8.33333333333333e+00
+1814 1512 4.16666666666667e+00
+1814 1377 -4.16666666666667e+00
+1815 1815 6.25000000000000e+01
+1815 1807 -2.08333333333333e+00
+1815 1806 -6.25000000000000e+00
+1815 1805 -4.16666666666667e+00
+1815 1804 2.08333333333333e+00
+1815 1603 4.16666666666667e+00
+1815 1600 -4.16666666666667e+00
+1815 1604 4.16666666666667e+00
+1815 1601 -4.16666666666667e+00
+1815 1664 4.16666666666667e+00
+1815 1667 -4.16666666666667e+00
+1815 1525 2.08333333333333e+00
+1815 1522 -2.08333333333333e+00
+1815 1355 4.16666666666667e+00
+1815 1526 -4.16666666666667e+00
+1815 1354 4.16666666666667e+00
+1815 1816 -8.33333333333333e+00
+1815 1666 8.33333333333333e+00
+1815 1353 -1.87500000000000e+01
+1815 1665 -1.25000000000000e+01
+1815 1817 -8.33333333333333e+00
+1815 1349 4.16666666666667e+00
+1815 1523 4.16666666666667e+00
+1815 1348 4.16666666666667e+00
+1815 1663 -8.33333333333333e+00
+1815 1808 4.16666666666667e+00
+1815 1347 -1.87500000000000e+01
+1815 1521 -6.25000000000000e+00
+1816 1816 6.25000000000000e+01
+1816 1808 4.16666666666667e+00
+1816 1807 -6.25000000000000e+00
+1816 1806 -2.08333333333333e+00
+1816 1803 2.08333333333333e+00
+1816 1602 4.16666666666667e+00
+1816 1599 -4.16666666666667e+00
+1816 1601 -4.16666666666667e+00
+1816 1604 -8.33333333333333e+00
+1816 1817 -8.33333333333333e+00
+1816 1667 8.33333333333333e+00
+1816 1523 4.16666666666667e+00
+1816 1524 2.08333333333333e+00
+1816 1521 -2.08333333333333e+00
+1816 1355 -2.08333333333333e+00
+1816 1526 2.08333333333333e+00
+1816 1354 -6.25000000000000e+00
+1816 1666 -3.75000000000000e+01
+1816 1353 4.16666666666667e+00
+1816 1815 -8.33333333333333e+00
+1816 1665 8.33333333333333e+00
+1816 1349 -2.08333333333333e+00
+1816 1664 4.16666666666667e+00
+1816 1805 2.08333333333333e+00
+1816 1348 -6.25000000000000e+00
+1816 1522 -6.25000000000000e+00
+1816 1347 4.16666666666667e+00
+1816 1662 -8.33333333333333e+00
+1817 1817 6.25000000000000e+01
+1817 1808 -1.87500000000000e+01
+1817 1807 4.16666666666667e+00
+1817 1806 4.16666666666667e+00
+1817 1803 -4.16666666666667e+00
+1817 1600 -4.16666666666667e+00
+1817 1603 -8.33333333333333e+00
+1817 1602 4.16666666666667e+00
+1817 1599 -4.16666666666667e+00
+1817 1662 4.16666666666667e+00
+1817 1665 -4.16666666666667e+00
+1817 1816 -8.33333333333333e+00
+1817 1666 8.33333333333333e+00
+1817 1522 4.16666666666667e+00
+1817 1355 -6.25000000000000e+00
+1817 1667 -1.25000000000000e+01
+1817 1354 -2.08333333333333e+00
+1817 1525 2.08333333333333e+00
+1817 1353 4.16666666666667e+00
+1817 1524 -4.16666666666667e+00
+1817 1804 2.08333333333333e+00
+1817 1349 -6.25000000000000e+00
+1817 1523 -1.87500000000000e+01
+1817 1348 -2.08333333333333e+00
+1817 1663 4.16666666666667e+00
+1817 1815 -8.33333333333333e+00
+1817 1347 4.16666666666667e+00
+1817 1521 4.16666666666667e+00
+1818 1818 6.25000000000000e+01
+1818 1648 -4.16666666666667e+00
+1818 1658 4.16666666666667e+00
+1818 1649 -4.16666666666667e+00
+1818 1811 -4.16666666666667e+00
+1818 1814 4.16666666666667e+00
+1818 1813 4.16666666666667e+00
+1818 1657 -8.33333333333333e+00
+1818 1812 -1.87500000000000e+01
+1818 1664 4.16666666666667e+00
+1818 1676 -4.16666666666667e+00
+1818 1522 4.16666666666667e+00
+1818 1819 -8.33333333333333e+00
+1818 1675 8.33333333333333e+00
+1818 1379 4.16666666666667e+00
+1818 1535 -4.16666666666667e+00
+1818 1378 -2.08333333333333e+00
+1818 1534 2.08333333333333e+00
+1818 1377 -6.25000000000000e+00
+1818 1674 -1.25000000000000e+01
+1818 1820 -8.33333333333333e+00
+1818 1349 4.16666666666667e+00
+1818 1523 4.16666666666667e+00
+1818 1348 -2.08333333333333e+00
+1818 1663 4.16666666666667e+00
+1818 1810 2.08333333333333e+00
+1818 1347 -6.25000000000000e+00
+1818 1521 -1.87500000000000e+01
+1819 1819 6.25000000000000e+01
+1819 1647 -4.16666666666667e+00
+1819 1811 2.08333333333333e+00
+1819 1649 -4.16666666666667e+00
+1819 1814 -2.08333333333333e+00
+1819 1658 4.16666666666667e+00
+1819 1813 -6.25000000000000e+00
+1819 1812 4.16666666666667e+00
+1819 1656 -8.33333333333333e+00
+1819 1523 -2.08333333333333e+00
+1819 1535 2.08333333333333e+00
+1819 1521 4.16666666666667e+00
+1819 1818 -8.33333333333333e+00
+1819 1674 8.33333333333333e+00
+1819 1379 4.16666666666667e+00
+1819 1820 -8.33333333333333e+00
+1819 1676 8.33333333333333e+00
+1819 1378 -6.25000000000000e+00
+1819 1675 -3.75000000000000e+01
+1819 1377 -2.08333333333333e+00
+1819 1533 2.08333333333333e+00
+1819 1349 4.16666666666667e+00
+1819 1664 -8.33333333333333e+00
+1819 1809 2.08333333333333e+00
+1819 1348 -6.25000000000000e+00
+1819 1522 -6.25000000000000e+00
+1819 1347 -2.08333333333333e+00
+1819 1662 4.16666666666667e+00
+1820 1820 6.25000000000000e+01
+1820 1647 -4.16666666666667e+00
+1820 1810 2.08333333333333e+00
+1820 1648 -4.16666666666667e+00
+1820 1809 -4.16666666666667e+00
+1820 1814 -6.25000000000000e+00
+1820 1813 -2.08333333333333e+00
+1820 1657 4.16666666666667e+00
+1820 1812 4.16666666666667e+00
+1820 1522 -2.08333333333333e+00
+1820 1534 2.08333333333333e+00
+1820 1662 4.16666666666667e+00
+1820 1674 -4.16666666666667e+00
+1820 1379 -1.87500000000000e+01
+1820 1676 -1.25000000000000e+01
+1820 1378 4.16666666666667e+00
+1820 1819 -8.33333333333333e+00
+1820 1675 8.33333333333333e+00
+1820 1377 4.16666666666667e+00
+1820 1533 -4.16666666666667e+00
+1820 1656 4.16666666666667e+00
+1820 1349 -1.87500000000000e+01
+1820 1523 -6.25000000000000e+00
+1820 1348 4.16666666666667e+00
+1820 1663 -8.33333333333333e+00
+1820 1818 -8.33333333333333e+00
+1820 1347 4.16666666666667e+00
+1820 1521 4.16666666666667e+00
+1821 1821 6.25000000000000e+01
+1821 1727 -4.16666666666667e+00
+1821 1822 -8.33333333333333e+00
+1821 1825 4.16666666666667e+00
+1821 1726 8.33333333333333e+00
+1821 1826 4.16666666666667e+00
+1821 1351 -2.08333333333333e+00
+1821 1723 4.16666666666667e+00
+1821 1824 -1.87500000000000e+01
+1821 1835 -4.16666666666667e+00
+1821 1834 2.08333333333333e+00
+1821 1357 -2.08333333333333e+00
+1821 1725 -1.25000000000000e+01
+1821 1453 2.08333333333333e+00
+1821 1705 -4.16666666666667e+00
+1821 1706 -4.16666666666667e+00
+1821 1712 4.16666666666667e+00
+1821 1352 4.16666666666667e+00
+1821 1454 -4.16666666666667e+00
+1821 1350 -6.25000000000000e+00
+1821 1823 -8.33333333333333e+00
+1821 1460 4.16666666666667e+00
+1821 1358 4.16666666666667e+00
+1821 1459 4.16666666666667e+00
+1821 1711 -8.33333333333333e+00
+1821 1724 4.16666666666667e+00
+1821 1458 -1.87500000000000e+01
+1821 1356 -6.25000000000000e+00
+1822 1822 6.25000000000000e+01
+1822 1835 2.08333333333333e+00
+1822 1821 -8.33333333333333e+00
+1822 1824 4.16666666666667e+00
+1822 1725 8.33333333333333e+00
+1822 1352 4.16666666666667e+00
+1822 1724 -8.33333333333333e+00
+1822 1825 -6.25000000000000e+00
+1822 1350 -2.08333333333333e+00
+1822 1722 4.16666666666667e+00
+1822 1823 -8.33333333333333e+00
+1822 1727 8.33333333333333e+00
+1822 1358 4.16666666666667e+00
+1822 1726 -3.75000000000000e+01
+1822 1833 2.08333333333333e+00
+1822 1356 -2.08333333333333e+00
+1822 1452 2.08333333333333e+00
+1822 1704 -4.16666666666667e+00
+1822 1454 2.08333333333333e+00
+1822 1706 -4.16666666666667e+00
+1822 1351 -6.25000000000000e+00
+1822 1460 -2.08333333333333e+00
+1822 1712 4.16666666666667e+00
+1822 1826 -2.08333333333333e+00
+1822 1459 -6.25000000000000e+00
+1822 1357 -6.25000000000000e+00
+1822 1458 4.16666666666667e+00
+1822 1710 -8.33333333333333e+00
+1823 1823 6.25000000000000e+01
+1823 1725 -4.16666666666667e+00
+1823 1825 -2.08333333333333e+00
+1823 1834 2.08333333333333e+00
+1823 1826 -6.25000000000000e+00
+1823 1351 4.16666666666667e+00
+1823 1723 -8.33333333333333e+00
+1823 1824 4.16666666666667e+00
+1823 1727 -1.25000000000000e+01
+1823 1822 -8.33333333333333e+00
+1823 1726 8.33333333333333e+00
+1823 1357 4.16666666666667e+00
+1823 1833 -4.16666666666667e+00
+1823 1704 -4.16666666666667e+00
+1823 1710 4.16666666666667e+00
+1823 1352 -1.87500000000000e+01
+1823 1453 2.08333333333333e+00
+1823 1705 -4.16666666666667e+00
+1823 1350 4.16666666666667e+00
+1823 1452 -4.16666666666667e+00
+1823 1722 4.16666666666667e+00
+1823 1460 -6.25000000000000e+00
+1823 1358 -1.87500000000000e+01
+1823 1459 -2.08333333333333e+00
+1823 1711 4.16666666666667e+00
+1823 1821 -8.33333333333333e+00
+1823 1458 4.16666666666667e+00
+1823 1356 4.16666666666667e+00
+1824 1824 6.25000000000000e+01
+1824 1822 4.16666666666667e+00
+1824 1726 -8.33333333333333e+00
+1824 1823 4.16666666666667e+00
+1824 1351 2.08333333333333e+00
+1824 1821 -1.87500000000000e+01
+1824 1835 4.16666666666667e+00
+1824 1834 -2.08333333333333e+00
+1824 1833 -6.25000000000000e+00
+1824 1723 -4.16666666666667e+00
+1824 1724 -4.16666666666667e+00
+1824 1826 -8.33333333333333e+00
+1824 1465 -2.08333333333333e+00
+1824 1462 4.16666666666667e+00
+1824 1463 4.16666666666667e+00
+1824 1730 -4.16666666666667e+00
+1824 1466 4.16666666666667e+00
+1824 1352 -4.16666666666667e+00
+1824 1464 -6.25000000000000e+00
+1824 1825 -8.33333333333333e+00
+1824 1729 8.33333333333333e+00
+1824 1727 4.16666666666667e+00
+1824 1728 -1.25000000000000e+01
+1824 91 2.08333333333333e+00
+1824 200 4.16666666666667e+00
+1824 92 -4.16666666666667e+00
+1824 199 4.16666666666667e+00
+1824 198 -1.87500000000000e+01
+1825 1825 6.25000000000000e+01
+1825 1727 4.16666666666667e+00
+1825 1821 4.16666666666667e+00
+1825 1725 -8.33333333333333e+00
+1825 1822 -6.25000000000000e+00
+1825 1350 2.08333333333333e+00
+1825 1826 -8.33333333333333e+00
+1825 1835 4.16666666666667e+00
+1825 1834 -6.25000000000000e+00
+1825 1833 -2.08333333333333e+00
+1825 1722 -4.16666666666667e+00
+1825 1466 4.16666666666667e+00
+1825 1464 -2.08333333333333e+00
+1825 1461 4.16666666666667e+00
+1825 1463 -8.33333333333333e+00
+1825 1730 8.33333333333333e+00
+1825 1352 2.08333333333333e+00
+1825 1724 -4.16666666666667e+00
+1825 1465 -6.25000000000000e+00
+1825 1823 -2.08333333333333e+00
+1825 1729 -3.75000000000000e+01
+1825 1824 -8.33333333333333e+00
+1825 1728 8.33333333333333e+00
+1825 90 2.08333333333333e+00
+1825 200 -2.08333333333333e+00
+1825 92 2.08333333333333e+00
+1825 199 -6.25000000000000e+00
+1825 198 4.16666666666667e+00
+1826 1826 6.25000000000000e+01
+1826 1822 -2.08333333333333e+00
+1826 1726 4.16666666666667e+00
+1826 1823 -6.25000000000000e+00
+1826 1821 4.16666666666667e+00
+1826 1835 -1.87500000000000e+01
+1826 1825 -8.33333333333333e+00
+1826 1834 4.16666666666667e+00
+1826 1833 4.16666666666667e+00
+1826 1722 -4.16666666666667e+00
+1826 1465 4.16666666666667e+00
+1826 1824 -8.33333333333333e+00
+1826 1462 -8.33333333333333e+00
+1826 1729 8.33333333333333e+00
+1826 1461 4.16666666666667e+00
+1826 1728 -4.16666666666667e+00
+1826 1466 -1.87500000000000e+01
+1826 1351 2.08333333333333e+00
+1826 1723 -4.16666666666667e+00
+1826 1464 4.16666666666667e+00
+1826 1350 -4.16666666666667e+00
+1826 1725 4.16666666666667e+00
+1826 1730 -1.25000000000000e+01
+1826 200 -6.25000000000000e+00
+1826 199 -2.08333333333333e+00
+1826 91 2.08333333333333e+00
+1826 198 4.16666666666667e+00
+1826 90 -4.16666666666667e+00
+1827 1827 6.25000000000000e+01
+1827 1837 2.08333333333333e+00
+1827 1838 -4.16666666666667e+00
+1827 1832 4.16666666666667e+00
+1827 1830 -6.25000000000000e+00
+1827 1775 -4.16666666666667e+00
+1827 1357 4.16666666666667e+00
+1827 1828 -8.33333333333333e+00
+1827 1774 8.33333333333333e+00
+1827 1773 -1.25000000000000e+01
+1827 1772 4.16666666666667e+00
+1827 1354 4.16666666666667e+00
+1827 1771 -8.33333333333333e+00
+1827 1712 4.16666666666667e+00
+1827 1709 -4.16666666666667e+00
+1827 1355 4.16666666666667e+00
+1827 1457 -4.16666666666667e+00
+1827 1456 2.08333333333333e+00
+1827 1708 -4.16666666666667e+00
+1827 1353 -1.87500000000000e+01
+1827 1829 -8.33333333333333e+00
+1827 1460 4.16666666666667e+00
+1827 1358 4.16666666666667e+00
+1827 1459 -2.08333333333333e+00
+1827 1711 4.16666666666667e+00
+1827 1831 -2.08333333333333e+00
+1827 1458 -6.25000000000000e+00
+1827 1356 -1.87500000000000e+01
+1828 1828 6.25000000000000e+01
+1828 1829 -8.33333333333333e+00
+1828 1830 -2.08333333333333e+00
+1828 1836 2.08333333333333e+00
+1828 1358 -2.08333333333333e+00
+1828 1838 2.08333333333333e+00
+1828 1355 -2.08333333333333e+00
+1828 1831 -6.25000000000000e+00
+1828 1772 4.16666666666667e+00
+1828 1775 8.33333333333333e+00
+1828 1774 -3.75000000000000e+01
+1828 1356 4.16666666666667e+00
+1828 1827 -8.33333333333333e+00
+1828 1773 8.33333333333333e+00
+1828 1353 4.16666666666667e+00
+1828 1770 -8.33333333333333e+00
+1828 1457 2.08333333333333e+00
+1828 1709 -4.16666666666667e+00
+1828 1354 -6.25000000000000e+00
+1828 1455 2.08333333333333e+00
+1828 1707 -4.16666666666667e+00
+1828 1460 4.16666666666667e+00
+1828 1712 -8.33333333333333e+00
+1828 1832 4.16666666666667e+00
+1828 1459 -6.25000000000000e+00
+1828 1357 -6.25000000000000e+00
+1828 1458 -2.08333333333333e+00
+1828 1710 4.16666666666667e+00
+1829 1829 6.25000000000000e+01
+1829 1828 -8.33333333333333e+00
+1829 1357 -2.08333333333333e+00
+1829 1837 2.08333333333333e+00
+1829 1836 -4.16666666666667e+00
+1829 1832 -1.87500000000000e+01
+1829 1354 -2.08333333333333e+00
+1829 1830 4.16666666666667e+00
+1829 1771 4.16666666666667e+00
+1829 1775 -1.25000000000000e+01
+1829 1774 8.33333333333333e+00
+1829 1773 -4.16666666666667e+00
+1829 1770 4.16666666666667e+00
+1829 1710 4.16666666666667e+00
+1829 1707 -4.16666666666667e+00
+1829 1456 2.08333333333333e+00
+1829 1708 -4.16666666666667e+00
+1829 1355 -6.25000000000000e+00
+1829 1353 4.16666666666667e+00
+1829 1455 -4.16666666666667e+00
+1829 1831 4.16666666666667e+00
+1829 1460 -1.87500000000000e+01
+1829 1358 -6.25000000000000e+00
+1829 1459 4.16666666666667e+00
+1829 1711 -8.33333333333333e+00
+1829 1827 -8.33333333333333e+00
+1829 1458 4.16666666666667e+00
+1829 1356 4.16666666666667e+00
+1830 1830 6.25000000000000e+01
+1830 1775 4.16666666666667e+00
+1830 1774 4.16666666666667e+00
+1830 1838 4.16666666666667e+00
+1830 1837 4.16666666666667e+00
+1830 1831 -8.33333333333333e+00
+1830 1836 -1.87500000000000e+01
+1830 1829 4.16666666666667e+00
+1830 1827 -6.25000000000000e+00
+1830 1784 -4.16666666666667e+00
+1830 1832 -8.33333333333333e+00
+1830 1772 -4.16666666666667e+00
+1830 1520 4.16666666666667e+00
+1830 1525 4.16666666666667e+00
+1830 1783 8.33333333333333e+00
+1830 1519 -8.33333333333333e+00
+1830 1526 4.16666666666667e+00
+1830 1355 -4.16666666666667e+00
+1830 1354 2.08333333333333e+00
+1830 1771 -4.16666666666667e+00
+1830 1524 -1.87500000000000e+01
+1830 1538 4.16666666666667e+00
+1830 1382 -4.16666666666667e+00
+1830 1537 -2.08333333333333e+00
+1830 1381 2.08333333333333e+00
+1830 1536 -6.25000000000000e+00
+1830 1828 -2.08333333333333e+00
+1830 1782 -1.25000000000000e+01
+1831 1831 6.25000000000000e+01
+1831 1827 -2.08333333333333e+00
+1831 1775 -8.33333333333333e+00
+1831 1773 4.16666666666667e+00
+1831 1838 -2.08333333333333e+00
+1831 1382 2.08333333333333e+00
+1831 1837 -6.25000000000000e+00
+1831 1836 4.16666666666667e+00
+1831 1830 -8.33333333333333e+00
+1831 1355 2.08333333333333e+00
+1831 1828 -6.25000000000000e+00
+1831 1526 -2.08333333333333e+00
+1831 1524 4.16666666666667e+00
+1831 1772 -4.16666666666667e+00
+1831 1520 4.16666666666667e+00
+1831 1782 8.33333333333333e+00
+1831 1518 -8.33333333333333e+00
+1831 1525 -6.25000000000000e+00
+1831 1353 2.08333333333333e+00
+1831 1770 -4.16666666666667e+00
+1831 1538 4.16666666666667e+00
+1831 1832 -8.33333333333333e+00
+1831 1784 8.33333333333333e+00
+1831 1537 -6.25000000000000e+00
+1831 1829 4.16666666666667e+00
+1831 1783 -3.75000000000000e+01
+1831 1536 -2.08333333333333e+00
+1831 1380 2.08333333333333e+00
+1832 1832 6.25000000000000e+01
+1832 1773 4.16666666666667e+00
+1832 1774 -8.33333333333333e+00
+1832 1838 -6.25000000000000e+00
+1832 1837 -2.08333333333333e+00
+1832 1381 2.08333333333333e+00
+1832 1836 4.16666666666667e+00
+1832 1829 -1.87500000000000e+01
+1832 1354 2.08333333333333e+00
+1832 1827 4.16666666666667e+00
+1832 1782 -4.16666666666667e+00
+1832 1525 -2.08333333333333e+00
+1832 1830 -8.33333333333333e+00
+1832 1770 -4.16666666666667e+00
+1832 1518 4.16666666666667e+00
+1832 1771 -4.16666666666667e+00
+1832 1519 4.16666666666667e+00
+1832 1526 -6.25000000000000e+00
+1832 1524 4.16666666666667e+00
+1832 1353 -4.16666666666667e+00
+1832 1538 -1.87500000000000e+01
+1832 1828 4.16666666666667e+00
+1832 1784 -1.25000000000000e+01
+1832 1537 4.16666666666667e+00
+1832 1831 -8.33333333333333e+00
+1832 1783 8.33333333333333e+00
+1832 1536 4.16666666666667e+00
+1832 1380 -4.16666666666667e+00
+1833 1833 6.25000000000000e+01
+1833 1825 -2.08333333333333e+00
+1833 1824 -6.25000000000000e+00
+1833 1823 -4.16666666666667e+00
+1833 1822 2.08333333333333e+00
+1833 1729 4.16666666666667e+00
+1833 1726 -4.16666666666667e+00
+1833 1730 4.16666666666667e+00
+1833 1727 -4.16666666666667e+00
+1833 1790 4.16666666666667e+00
+1833 1793 -4.16666666666667e+00
+1833 1543 -2.08333333333333e+00
+1833 1834 -8.33333333333333e+00
+1833 1792 8.33333333333333e+00
+1833 1791 -1.25000000000000e+01
+1833 1835 -8.33333333333333e+00
+1833 1358 4.16666666666667e+00
+1833 1544 4.16666666666667e+00
+1833 1357 4.16666666666667e+00
+1833 1789 -8.33333333333333e+00
+1833 1826 4.16666666666667e+00
+1833 1356 -1.87500000000000e+01
+1833 1542 -6.25000000000000e+00
+1833 280 2.08333333333333e+00
+1833 92 4.16666666666667e+00
+1833 281 -4.16666666666667e+00
+1833 91 4.16666666666667e+00
+1833 90 -1.87500000000000e+01
+1834 1834 6.25000000000000e+01
+1834 1826 4.16666666666667e+00
+1834 1825 -6.25000000000000e+00
+1834 1824 -2.08333333333333e+00
+1834 1821 2.08333333333333e+00
+1834 1728 4.16666666666667e+00
+1834 1725 -4.16666666666667e+00
+1834 1727 -4.16666666666667e+00
+1834 1730 -8.33333333333333e+00
+1834 1835 -8.33333333333333e+00
+1834 1793 8.33333333333333e+00
+1834 1544 4.16666666666667e+00
+1834 1542 -2.08333333333333e+00
+1834 1792 -3.75000000000000e+01
+1834 1833 -8.33333333333333e+00
+1834 1791 8.33333333333333e+00
+1834 1358 -2.08333333333333e+00
+1834 1790 4.16666666666667e+00
+1834 1823 2.08333333333333e+00
+1834 1357 -6.25000000000000e+00
+1834 1543 -6.25000000000000e+00
+1834 1356 4.16666666666667e+00
+1834 1788 -8.33333333333333e+00
+1834 279 2.08333333333333e+00
+1834 92 -2.08333333333333e+00
+1834 281 2.08333333333333e+00
+1834 91 -6.25000000000000e+00
+1834 90 4.16666666666667e+00
+1835 1835 6.25000000000000e+01
+1835 1826 -1.87500000000000e+01
+1835 1825 4.16666666666667e+00
+1835 1824 4.16666666666667e+00
+1835 1821 -4.16666666666667e+00
+1835 1726 -4.16666666666667e+00
+1835 1729 -8.33333333333333e+00
+1835 1728 4.16666666666667e+00
+1835 1725 -4.16666666666667e+00
+1835 1788 4.16666666666667e+00
+1835 1791 -4.16666666666667e+00
+1835 1834 -8.33333333333333e+00
+1835 1792 8.33333333333333e+00
+1835 1543 4.16666666666667e+00
+1835 1793 -1.25000000000000e+01
+1835 1822 2.08333333333333e+00
+1835 1358 -6.25000000000000e+00
+1835 1544 -1.87500000000000e+01
+1835 1357 -2.08333333333333e+00
+1835 1789 4.16666666666667e+00
+1835 1833 -8.33333333333333e+00
+1835 1356 4.16666666666667e+00
+1835 1542 4.16666666666667e+00
+1835 92 -6.25000000000000e+00
+1835 91 -2.08333333333333e+00
+1835 280 2.08333333333333e+00
+1835 90 4.16666666666667e+00
+1835 279 -4.16666666666667e+00
+1836 1836 6.25000000000000e+01
+1836 1774 -4.16666666666667e+00
+1836 1784 4.16666666666667e+00
+1836 1775 -4.16666666666667e+00
+1836 1829 -4.16666666666667e+00
+1836 1832 4.16666666666667e+00
+1836 1831 4.16666666666667e+00
+1836 1783 -8.33333333333333e+00
+1836 1830 -1.87500000000000e+01
+1836 1790 4.16666666666667e+00
+1836 1802 -4.16666666666667e+00
+1836 1543 4.16666666666667e+00
+1836 1837 -8.33333333333333e+00
+1836 1801 8.33333333333333e+00
+1836 1382 4.16666666666667e+00
+1836 1550 -4.16666666666667e+00
+1836 1381 -2.08333333333333e+00
+1836 1549 2.08333333333333e+00
+1836 1380 -6.25000000000000e+00
+1836 1800 -1.25000000000000e+01
+1836 1838 -8.33333333333333e+00
+1836 1358 4.16666666666667e+00
+1836 1544 4.16666666666667e+00
+1836 1357 -2.08333333333333e+00
+1836 1789 4.16666666666667e+00
+1836 1828 2.08333333333333e+00
+1836 1356 -6.25000000000000e+00
+1836 1542 -1.87500000000000e+01
+1837 1837 6.25000000000000e+01
+1837 1773 -4.16666666666667e+00
+1837 1829 2.08333333333333e+00
+1837 1775 -4.16666666666667e+00
+1837 1832 -2.08333333333333e+00
+1837 1784 4.16666666666667e+00
+1837 1831 -6.25000000000000e+00
+1837 1830 4.16666666666667e+00
+1837 1782 -8.33333333333333e+00
+1837 1544 -2.08333333333333e+00
+1837 1550 2.08333333333333e+00
+1837 1542 4.16666666666667e+00
+1837 1836 -8.33333333333333e+00
+1837 1800 8.33333333333333e+00
+1837 1382 4.16666666666667e+00
+1837 1838 -8.33333333333333e+00
+1837 1802 8.33333333333333e+00
+1837 1381 -6.25000000000000e+00
+1837 1801 -3.75000000000000e+01
+1837 1380 -2.08333333333333e+00
+1837 1548 2.08333333333333e+00
+1837 1358 4.16666666666667e+00
+1837 1790 -8.33333333333333e+00
+1837 1827 2.08333333333333e+00
+1837 1357 -6.25000000000000e+00
+1837 1543 -6.25000000000000e+00
+1837 1356 -2.08333333333333e+00
+1837 1788 4.16666666666667e+00
+1838 1838 6.25000000000000e+01
+1838 1773 -4.16666666666667e+00
+1838 1828 2.08333333333333e+00
+1838 1774 -4.16666666666667e+00
+1838 1827 -4.16666666666667e+00
+1838 1832 -6.25000000000000e+00
+1838 1831 -2.08333333333333e+00
+1838 1783 4.16666666666667e+00
+1838 1830 4.16666666666667e+00
+1838 1543 -2.08333333333333e+00
+1838 1549 2.08333333333333e+00
+1838 1788 4.16666666666667e+00
+1838 1800 -4.16666666666667e+00
+1838 1382 -1.87500000000000e+01
+1838 1802 -1.25000000000000e+01
+1838 1381 4.16666666666667e+00
+1838 1837 -8.33333333333333e+00
+1838 1801 8.33333333333333e+00
+1838 1380 4.16666666666667e+00
+1838 1548 -4.16666666666667e+00
+1838 1782 4.16666666666667e+00
+1838 1358 -1.87500000000000e+01
+1838 1544 -6.25000000000000e+00
+1838 1357 4.16666666666667e+00
+1838 1789 -8.33333333333333e+00
+1838 1836 -8.33333333333333e+00
+1838 1356 4.16666666666667e+00
+1838 1542 4.16666666666667e+00
+1839 1839 6.25000000000000e+01
+1839 1636 -4.16666666666667e+00
+1839 1844 4.16666666666667e+00
+1839 1841 -8.33333333333333e+00
+1839 1637 8.33333333333333e+00
+1839 1634 4.16666666666667e+00
+1839 1361 -2.08333333333333e+00
+1839 1843 4.16666666666667e+00
+1839 1842 -1.87500000000000e+01
+1839 1853 2.08333333333333e+00
+1839 1367 -2.08333333333333e+00
+1839 1852 -4.16666666666667e+00
+1839 1635 -1.25000000000000e+01
+1839 1616 -4.16666666666667e+00
+1839 1472 2.08333333333333e+00
+1839 1615 -4.16666666666667e+00
+1839 1621 4.16666666666667e+00
+1839 1471 -4.16666666666667e+00
+1839 1360 4.16666666666667e+00
+1839 1359 -6.25000000000000e+00
+1839 1478 4.16666666666667e+00
+1839 1622 -8.33333333333333e+00
+1839 1477 4.16666666666667e+00
+1839 1840 -8.33333333333333e+00
+1839 1366 4.16666666666667e+00
+1839 1476 -1.87500000000000e+01
+1839 1633 4.16666666666667e+00
+1839 1365 -6.25000000000000e+00
+1840 1840 6.25000000000000e+01
+1840 1635 -4.16666666666667e+00
+1840 1844 -2.08333333333333e+00
+1840 1853 2.08333333333333e+00
+1840 1634 -8.33333333333333e+00
+1840 1361 4.16666666666667e+00
+1840 1843 -6.25000000000000e+00
+1840 1842 4.16666666666667e+00
+1840 1637 8.33333333333333e+00
+1840 1841 -8.33333333333333e+00
+1840 1367 4.16666666666667e+00
+1840 1636 -1.25000000000000e+01
+1840 1851 -4.16666666666667e+00
+1840 1614 -4.16666666666667e+00
+1840 1620 4.16666666666667e+00
+1840 1472 2.08333333333333e+00
+1840 1616 -4.16666666666667e+00
+1840 1360 -1.87500000000000e+01
+1840 1470 -4.16666666666667e+00
+1840 1359 4.16666666666667e+00
+1840 1478 -2.08333333333333e+00
+1840 1622 4.16666666666667e+00
+1840 1477 -6.25000000000000e+00
+1840 1632 4.16666666666667e+00
+1840 1366 -1.87500000000000e+01
+1840 1476 4.16666666666667e+00
+1840 1839 -8.33333333333333e+00
+1840 1365 4.16666666666667e+00
+1841 1841 6.25000000000000e+01
+1841 1852 2.08333333333333e+00
+1841 1842 4.16666666666667e+00
+1841 1839 -8.33333333333333e+00
+1841 1635 8.33333333333333e+00
+1841 1844 -6.25000000000000e+00
+1841 1633 -8.33333333333333e+00
+1841 1360 4.16666666666667e+00
+1841 1632 4.16666666666667e+00
+1841 1359 -2.08333333333333e+00
+1841 1637 -3.75000000000000e+01
+1841 1636 8.33333333333333e+00
+1841 1840 -8.33333333333333e+00
+1841 1366 4.16666666666667e+00
+1841 1851 2.08333333333333e+00
+1841 1365 -2.08333333333333e+00
+1841 1614 -4.16666666666667e+00
+1841 1470 2.08333333333333e+00
+1841 1361 -6.25000000000000e+00
+1841 1471 2.08333333333333e+00
+1841 1615 -4.16666666666667e+00
+1841 1478 -6.25000000000000e+00
+1841 1843 -2.08333333333333e+00
+1841 1367 -6.25000000000000e+00
+1841 1477 -2.08333333333333e+00
+1841 1621 4.16666666666667e+00
+1841 1476 4.16666666666667e+00
+1841 1620 -8.33333333333333e+00
+1842 1842 6.25000000000000e+01
+1842 1841 4.16666666666667e+00
+1842 1637 -8.33333333333333e+00
+1842 1361 2.08333333333333e+00
+1842 1840 4.16666666666667e+00
+1842 1839 -1.87500000000000e+01
+1842 1373 2.08333333333333e+00
+1842 1853 -2.08333333333333e+00
+1842 1852 4.16666666666667e+00
+1842 1851 -6.25000000000000e+00
+1842 1634 -4.16666666666667e+00
+1842 1633 -4.16666666666667e+00
+1842 1481 4.16666666666667e+00
+1842 1487 -2.08333333333333e+00
+1842 1843 -8.33333333333333e+00
+1842 1480 4.16666666666667e+00
+1842 1639 -4.16666666666667e+00
+1842 1360 -4.16666666666667e+00
+1842 1486 4.16666666666667e+00
+1842 1485 -6.25000000000000e+00
+1842 1844 -8.33333333333333e+00
+1842 1493 4.16666666666667e+00
+1842 1640 8.33333333333333e+00
+1842 1492 4.16666666666667e+00
+1842 1372 -4.16666666666667e+00
+1842 1636 4.16666666666667e+00
+1842 1491 -1.87500000000000e+01
+1842 1638 -1.25000000000000e+01
+1843 1843 6.25000000000000e+01
+1843 1841 -2.08333333333333e+00
+1843 1637 4.16666666666667e+00
+1843 1840 -6.25000000000000e+00
+1843 1839 4.16666666666667e+00
+1843 1844 -8.33333333333333e+00
+1843 1853 4.16666666666667e+00
+1843 1852 -1.87500000000000e+01
+1843 1851 4.16666666666667e+00
+1843 1632 -4.16666666666667e+00
+1843 1487 4.16666666666667e+00
+1843 1842 -8.33333333333333e+00
+1843 1481 -8.33333333333333e+00
+1843 1640 8.33333333333333e+00
+1843 1479 4.16666666666667e+00
+1843 1638 -4.16666666666667e+00
+1843 1361 2.08333333333333e+00
+1843 1634 -4.16666666666667e+00
+1843 1486 -1.87500000000000e+01
+1843 1359 -4.16666666666667e+00
+1843 1485 4.16666666666667e+00
+1843 1493 -2.08333333333333e+00
+1843 1373 2.08333333333333e+00
+1843 1635 4.16666666666667e+00
+1843 1492 -6.25000000000000e+00
+1843 1639 -1.25000000000000e+01
+1843 1491 4.16666666666667e+00
+1843 1371 -4.16666666666667e+00
+1844 1844 6.25000000000000e+01
+1844 1636 4.16666666666667e+00
+1844 1839 4.16666666666667e+00
+1844 1635 -8.33333333333333e+00
+1844 1841 -6.25000000000000e+00
+1844 1359 2.08333333333333e+00
+1844 1853 -6.25000000000000e+00
+1844 1843 -8.33333333333333e+00
+1844 1852 4.16666666666667e+00
+1844 1371 2.08333333333333e+00
+1844 1851 -2.08333333333333e+00
+1844 1632 -4.16666666666667e+00
+1844 1486 4.16666666666667e+00
+1844 1479 4.16666666666667e+00
+1844 1485 -2.08333333333333e+00
+1844 1480 -8.33333333333333e+00
+1844 1639 8.33333333333333e+00
+1844 1487 -6.25000000000000e+00
+1844 1360 2.08333333333333e+00
+1844 1633 -4.16666666666667e+00
+1844 1840 -2.08333333333333e+00
+1844 1493 -6.25000000000000e+00
+1844 1640 -3.75000000000000e+01
+1844 1492 -2.08333333333333e+00
+1844 1372 2.08333333333333e+00
+1844 1842 -8.33333333333333e+00
+1844 1491 4.16666666666667e+00
+1844 1638 8.33333333333333e+00
+1845 1845 6.25000000000000e+01
+1845 1654 -4.16666666666667e+00
+1845 1850 -2.08333333333333e+00
+1845 1856 2.08333333333333e+00
+1845 1364 4.16666666666667e+00
+1845 1652 -8.33333333333333e+00
+1845 1849 4.16666666666667e+00
+1845 1848 -6.25000000000000e+00
+1845 1847 -8.33333333333333e+00
+1845 1655 8.33333333333333e+00
+1845 1367 4.16666666666667e+00
+1845 1855 -4.16666666666667e+00
+1845 1653 -1.25000000000000e+01
+1845 1618 -4.16666666666667e+00
+1845 1621 4.16666666666667e+00
+1845 1475 2.08333333333333e+00
+1845 1619 -4.16666666666667e+00
+1845 1363 4.16666666666667e+00
+1845 1474 -4.16666666666667e+00
+1845 1362 -1.87500000000000e+01
+1845 1478 -2.08333333333333e+00
+1845 1622 4.16666666666667e+00
+1845 1846 -8.33333333333333e+00
+1845 1477 4.16666666666667e+00
+1845 1366 4.16666666666667e+00
+1845 1651 4.16666666666667e+00
+1845 1476 -6.25000000000000e+00
+1845 1365 -1.87500000000000e+01
+1846 1846 6.25000000000000e+01
+1846 1653 -4.16666666666667e+00
+1846 1847 -8.33333333333333e+00
+1846 1850 4.16666666666667e+00
+1846 1655 8.33333333333333e+00
+1846 1364 -2.08333333333333e+00
+1846 1652 4.16666666666667e+00
+1846 1849 -1.87500000000000e+01
+1846 1848 4.16666666666667e+00
+1846 1856 2.08333333333333e+00
+1846 1367 -2.08333333333333e+00
+1846 1654 -1.25000000000000e+01
+1846 1854 -4.16666666666667e+00
+1846 1475 2.08333333333333e+00
+1846 1619 -4.16666666666667e+00
+1846 1617 -4.16666666666667e+00
+1846 1620 4.16666666666667e+00
+1846 1363 -6.25000000000000e+00
+1846 1362 4.16666666666667e+00
+1846 1473 -4.16666666666667e+00
+1846 1478 4.16666666666667e+00
+1846 1622 -8.33333333333333e+00
+1846 1650 4.16666666666667e+00
+1846 1477 -1.87500000000000e+01
+1846 1366 -6.25000000000000e+00
+1846 1845 -8.33333333333333e+00
+1846 1476 4.16666666666667e+00
+1846 1365 4.16666666666667e+00
+1847 1847 6.25000000000000e+01
+1847 1849 4.16666666666667e+00
+1847 1654 8.33333333333333e+00
+1847 1848 -2.08333333333333e+00
+1847 1854 2.08333333333333e+00
+1847 1850 -6.25000000000000e+00
+1847 1363 -2.08333333333333e+00
+1847 1651 4.16666666666667e+00
+1847 1362 4.16666666666667e+00
+1847 1650 -8.33333333333333e+00
+1847 1655 -3.75000000000000e+01
+1847 1855 2.08333333333333e+00
+1847 1366 -2.08333333333333e+00
+1847 1845 -8.33333333333333e+00
+1847 1653 8.33333333333333e+00
+1847 1365 4.16666666666667e+00
+1847 1474 2.08333333333333e+00
+1847 1618 -4.16666666666667e+00
+1847 1364 -6.25000000000000e+00
+1847 1473 2.08333333333333e+00
+1847 1617 -4.16666666666667e+00
+1847 1846 -8.33333333333333e+00
+1847 1478 -6.25000000000000e+00
+1847 1367 -6.25000000000000e+00
+1847 1477 4.16666666666667e+00
+1847 1621 -8.33333333333333e+00
+1847 1476 -2.08333333333333e+00
+1847 1620 4.16666666666667e+00
+1848 1848 6.25000000000000e+01
+1848 1847 -2.08333333333333e+00
+1848 1655 4.16666666666667e+00
+1848 1846 4.16666666666667e+00
+1848 1845 -6.25000000000000e+00
+1848 1850 -8.33333333333333e+00
+1848 1856 4.16666666666667e+00
+1848 1855 4.16666666666667e+00
+1848 1854 -1.87500000000000e+01
+1848 1651 -4.16666666666667e+00
+1848 1511 4.16666666666667e+00
+1848 1849 -8.33333333333333e+00
+1848 1505 -8.33333333333333e+00
+1848 1658 8.33333333333333e+00
+1848 1504 4.16666666666667e+00
+1848 1657 -4.16666666666667e+00
+1848 1364 2.08333333333333e+00
+1848 1652 -4.16666666666667e+00
+1848 1510 4.16666666666667e+00
+1848 1363 -4.16666666666667e+00
+1848 1509 -1.87500000000000e+01
+1848 1514 -2.08333333333333e+00
+1848 1379 2.08333333333333e+00
+1848 1513 4.16666666666667e+00
+1848 1378 -4.16666666666667e+00
+1848 1512 -6.25000000000000e+00
+1848 1654 4.16666666666667e+00
+1848 1656 -1.25000000000000e+01
+1849 1849 6.25000000000000e+01
+1849 1847 4.16666666666667e+00
+1849 1655 -8.33333333333333e+00
+1849 1364 2.08333333333333e+00
+1849 1846 -1.87500000000000e+01
+1849 1845 4.16666666666667e+00
+1849 1379 2.08333333333333e+00
+1849 1856 -2.08333333333333e+00
+1849 1855 -6.25000000000000e+00
+1849 1854 4.16666666666667e+00
+1849 1652 -4.16666666666667e+00
+1849 1650 -4.16666666666667e+00
+1849 1511 -2.08333333333333e+00
+1849 1505 4.16666666666667e+00
+1849 1848 -8.33333333333333e+00
+1849 1503 4.16666666666667e+00
+1849 1656 -4.16666666666667e+00
+1849 1510 -6.25000000000000e+00
+1849 1509 4.16666666666667e+00
+1849 1362 -4.16666666666667e+00
+1849 1514 4.16666666666667e+00
+1849 1850 -8.33333333333333e+00
+1849 1658 8.33333333333333e+00
+1849 1513 -1.87500000000000e+01
+1849 1653 4.16666666666667e+00
+1849 1657 -1.25000000000000e+01
+1849 1512 4.16666666666667e+00
+1849 1377 -4.16666666666667e+00
+1850 1850 6.25000000000000e+01
+1850 1654 -8.33333333333333e+00
+1850 1845 -2.08333333333333e+00
+1850 1653 4.16666666666667e+00
+1850 1847 -6.25000000000000e+00
+1850 1363 2.08333333333333e+00
+1850 1856 -6.25000000000000e+00
+1850 1378 2.08333333333333e+00
+1850 1855 -2.08333333333333e+00
+1850 1848 -8.33333333333333e+00
+1850 1854 4.16666666666667e+00
+1850 1651 -4.16666666666667e+00
+1850 1510 -2.08333333333333e+00
+1850 1504 4.16666666666667e+00
+1850 1509 4.16666666666667e+00
+1850 1503 -8.33333333333333e+00
+1850 1656 8.33333333333333e+00
+1850 1511 -6.25000000000000e+00
+1850 1362 2.08333333333333e+00
+1850 1650 -4.16666666666667e+00
+1850 1514 -6.25000000000000e+00
+1850 1846 4.16666666666667e+00
+1850 1658 -3.75000000000000e+01
+1850 1513 4.16666666666667e+00
+1850 1849 -8.33333333333333e+00
+1850 1657 8.33333333333333e+00
+1850 1512 -2.08333333333333e+00
+1850 1377 2.08333333333333e+00
+1851 1851 6.25000000000000e+01
+1851 1843 4.16666666666667e+00
+1851 1842 -6.25000000000000e+00
+1851 1841 2.08333333333333e+00
+1851 1840 -4.16666666666667e+00
+1851 1640 4.16666666666667e+00
+1851 1637 -4.16666666666667e+00
+1851 1639 4.16666666666667e+00
+1851 1636 -4.16666666666667e+00
+1851 1672 -4.16666666666667e+00
+1851 1669 4.16666666666667e+00
+1851 1532 2.08333333333333e+00
+1851 1529 -2.08333333333333e+00
+1851 1367 4.16666666666667e+00
+1851 1670 -8.33333333333333e+00
+1851 1366 4.16666666666667e+00
+1851 1852 -8.33333333333333e+00
+1851 1528 4.16666666666667e+00
+1851 1365 -1.87500000000000e+01
+1851 1527 -6.25000000000000e+00
+1851 1853 -8.33333333333333e+00
+1851 1373 4.16666666666667e+00
+1851 1673 8.33333333333333e+00
+1851 1372 4.16666666666667e+00
+1851 1531 -4.16666666666667e+00
+1851 1844 -2.08333333333333e+00
+1851 1371 -1.87500000000000e+01
+1851 1671 -1.25000000000000e+01
+1852 1852 6.25000000000000e+01
+1852 1844 4.16666666666667e+00
+1852 1843 -1.87500000000000e+01
+1852 1842 4.16666666666667e+00
+1852 1839 -4.16666666666667e+00
+1852 1637 -4.16666666666667e+00
+1852 1640 -8.33333333333333e+00
+1852 1638 4.16666666666667e+00
+1852 1635 -4.16666666666667e+00
+1852 1671 -4.16666666666667e+00
+1852 1668 4.16666666666667e+00
+1852 1673 8.33333333333333e+00
+1852 1853 -8.33333333333333e+00
+1852 1529 4.16666666666667e+00
+1852 1367 -2.08333333333333e+00
+1852 1670 4.16666666666667e+00
+1852 1366 -6.25000000000000e+00
+1852 1528 -1.87500000000000e+01
+1852 1365 4.16666666666667e+00
+1852 1851 -8.33333333333333e+00
+1852 1527 4.16666666666667e+00
+1852 1373 -2.08333333333333e+00
+1852 1532 2.08333333333333e+00
+1852 1841 2.08333333333333e+00
+1852 1372 -6.25000000000000e+00
+1852 1672 -1.25000000000000e+01
+1852 1371 4.16666666666667e+00
+1852 1530 -4.16666666666667e+00
+1853 1853 6.25000000000000e+01
+1853 1844 -6.25000000000000e+00
+1853 1843 4.16666666666667e+00
+1853 1842 -2.08333333333333e+00
+1853 1839 2.08333333333333e+00
+1853 1638 4.16666666666667e+00
+1853 1635 -4.16666666666667e+00
+1853 1636 -4.16666666666667e+00
+1853 1639 -8.33333333333333e+00
+1853 1672 8.33333333333333e+00
+1853 1852 -8.33333333333333e+00
+1853 1528 4.16666666666667e+00
+1853 1530 2.08333333333333e+00
+1853 1527 -2.08333333333333e+00
+1853 1367 -6.25000000000000e+00
+1853 1529 -6.25000000000000e+00
+1853 1366 -2.08333333333333e+00
+1853 1669 4.16666666666667e+00
+1853 1365 4.16666666666667e+00
+1853 1668 -8.33333333333333e+00
+1853 1840 2.08333333333333e+00
+1853 1373 -6.25000000000000e+00
+1853 1673 -3.75000000000000e+01
+1853 1372 -2.08333333333333e+00
+1853 1531 2.08333333333333e+00
+1853 1851 -8.33333333333333e+00
+1853 1371 4.16666666666667e+00
+1853 1671 8.33333333333333e+00
+1854 1854 6.25000000000000e+01
+1854 1850 4.16666666666667e+00
+1854 1849 4.16666666666667e+00
+1854 1848 -1.87500000000000e+01
+1854 1846 -4.16666666666667e+00
+1854 1655 -4.16666666666667e+00
+1854 1658 -8.33333333333333e+00
+1854 1657 4.16666666666667e+00
+1854 1654 -4.16666666666667e+00
+1854 1669 4.16666666666667e+00
+1854 1675 -4.16666666666667e+00
+1854 1856 -8.33333333333333e+00
+1854 1676 8.33333333333333e+00
+1854 1529 4.16666666666667e+00
+1854 1379 -2.08333333333333e+00
+1854 1535 2.08333333333333e+00
+1854 1378 4.16666666666667e+00
+1854 1534 -4.16666666666667e+00
+1854 1377 -6.25000000000000e+00
+1854 1674 -1.25000000000000e+01
+1854 1367 -2.08333333333333e+00
+1854 1670 4.16666666666667e+00
+1854 1855 -8.33333333333333e+00
+1854 1366 4.16666666666667e+00
+1854 1528 4.16666666666667e+00
+1854 1847 2.08333333333333e+00
+1854 1365 -6.25000000000000e+00
+1854 1527 -1.87500000000000e+01
+1855 1855 6.25000000000000e+01
+1855 1849 -6.25000000000000e+00
+1855 1848 4.16666666666667e+00
+1855 1847 2.08333333333333e+00
+1855 1845 -4.16666666666667e+00
+1855 1658 4.16666666666667e+00
+1855 1655 -4.16666666666667e+00
+1855 1656 4.16666666666667e+00
+1855 1653 -4.16666666666667e+00
+1855 1668 4.16666666666667e+00
+1855 1674 -4.16666666666667e+00
+1855 1535 2.08333333333333e+00
+1855 1529 -2.08333333333333e+00
+1855 1379 4.16666666666667e+00
+1855 1856 -8.33333333333333e+00
+1855 1676 8.33333333333333e+00
+1855 1378 -1.87500000000000e+01
+1855 1675 -1.25000000000000e+01
+1855 1377 4.16666666666667e+00
+1855 1533 -4.16666666666667e+00
+1855 1367 4.16666666666667e+00
+1855 1670 -8.33333333333333e+00
+1855 1850 -2.08333333333333e+00
+1855 1366 -1.87500000000000e+01
+1855 1528 -6.25000000000000e+00
+1855 1854 -8.33333333333333e+00
+1855 1365 4.16666666666667e+00
+1855 1527 4.16666666666667e+00
+1856 1856 6.25000000000000e+01
+1856 1850 -6.25000000000000e+00
+1856 1849 -2.08333333333333e+00
+1856 1848 4.16666666666667e+00
+1856 1846 2.08333333333333e+00
+1856 1657 4.16666666666667e+00
+1856 1654 -4.16666666666667e+00
+1856 1653 -4.16666666666667e+00
+1856 1656 -8.33333333333333e+00
+1856 1534 2.08333333333333e+00
+1856 1528 -2.08333333333333e+00
+1856 1854 -8.33333333333333e+00
+1856 1674 8.33333333333333e+00
+1856 1527 4.16666666666667e+00
+1856 1379 -6.25000000000000e+00
+1856 1676 -3.75000000000000e+01
+1856 1378 4.16666666666667e+00
+1856 1855 -8.33333333333333e+00
+1856 1675 8.33333333333333e+00
+1856 1377 -2.08333333333333e+00
+1856 1533 2.08333333333333e+00
+1856 1845 2.08333333333333e+00
+1856 1367 -6.25000000000000e+00
+1856 1529 -6.25000000000000e+00
+1856 1366 4.16666666666667e+00
+1856 1669 -8.33333333333333e+00
+1856 1365 -2.08333333333333e+00
+1856 1668 4.16666666666667e+00
+1857 1857 6.25000000000000e+01
+1857 1762 -4.16666666666667e+00
+1857 1862 4.16666666666667e+00
+1857 1859 -8.33333333333333e+00
+1857 1763 8.33333333333333e+00
+1857 1760 4.16666666666667e+00
+1857 1370 -2.08333333333333e+00
+1857 1861 4.16666666666667e+00
+1857 1860 -1.87500000000000e+01
+1857 1871 2.08333333333333e+00
+1857 1376 -2.08333333333333e+00
+1857 1870 -4.16666666666667e+00
+1857 1761 -1.25000000000000e+01
+1857 1742 -4.16666666666667e+00
+1857 1490 2.08333333333333e+00
+1857 1741 -4.16666666666667e+00
+1857 1747 4.16666666666667e+00
+1857 1489 -4.16666666666667e+00
+1857 1369 4.16666666666667e+00
+1857 1368 -6.25000000000000e+00
+1857 1496 4.16666666666667e+00
+1857 1748 -8.33333333333333e+00
+1857 1495 4.16666666666667e+00
+1857 1858 -8.33333333333333e+00
+1857 1375 4.16666666666667e+00
+1857 1494 -1.87500000000000e+01
+1857 1759 4.16666666666667e+00
+1857 1374 -6.25000000000000e+00
+1858 1858 6.25000000000000e+01
+1858 1761 -4.16666666666667e+00
+1858 1862 -2.08333333333333e+00
+1858 1871 2.08333333333333e+00
+1858 1760 -8.33333333333333e+00
+1858 1370 4.16666666666667e+00
+1858 1861 -6.25000000000000e+00
+1858 1860 4.16666666666667e+00
+1858 1763 8.33333333333333e+00
+1858 1859 -8.33333333333333e+00
+1858 1376 4.16666666666667e+00
+1858 1762 -1.25000000000000e+01
+1858 1869 -4.16666666666667e+00
+1858 1740 -4.16666666666667e+00
+1858 1746 4.16666666666667e+00
+1858 1490 2.08333333333333e+00
+1858 1742 -4.16666666666667e+00
+1858 1369 -1.87500000000000e+01
+1858 1488 -4.16666666666667e+00
+1858 1368 4.16666666666667e+00
+1858 1496 -2.08333333333333e+00
+1858 1748 4.16666666666667e+00
+1858 1495 -6.25000000000000e+00
+1858 1758 4.16666666666667e+00
+1858 1375 -1.87500000000000e+01
+1858 1494 4.16666666666667e+00
+1858 1857 -8.33333333333333e+00
+1858 1374 4.16666666666667e+00
+1859 1859 6.25000000000000e+01
+1859 1870 2.08333333333333e+00
+1859 1860 4.16666666666667e+00
+1859 1857 -8.33333333333333e+00
+1859 1761 8.33333333333333e+00
+1859 1862 -6.25000000000000e+00
+1859 1759 -8.33333333333333e+00
+1859 1369 4.16666666666667e+00
+1859 1758 4.16666666666667e+00
+1859 1368 -2.08333333333333e+00
+1859 1763 -3.75000000000000e+01
+1859 1762 8.33333333333333e+00
+1859 1858 -8.33333333333333e+00
+1859 1375 4.16666666666667e+00
+1859 1869 2.08333333333333e+00
+1859 1374 -2.08333333333333e+00
+1859 1740 -4.16666666666667e+00
+1859 1488 2.08333333333333e+00
+1859 1370 -6.25000000000000e+00
+1859 1489 2.08333333333333e+00
+1859 1741 -4.16666666666667e+00
+1859 1496 -6.25000000000000e+00
+1859 1861 -2.08333333333333e+00
+1859 1376 -6.25000000000000e+00
+1859 1495 -2.08333333333333e+00
+1859 1747 4.16666666666667e+00
+1859 1494 4.16666666666667e+00
+1859 1746 -8.33333333333333e+00
+1860 1860 6.25000000000000e+01
+1860 1859 4.16666666666667e+00
+1860 1763 -8.33333333333333e+00
+1860 1370 2.08333333333333e+00
+1860 1858 4.16666666666667e+00
+1860 1857 -1.87500000000000e+01
+1860 1871 -2.08333333333333e+00
+1860 1870 4.16666666666667e+00
+1860 1869 -6.25000000000000e+00
+1860 1760 -4.16666666666667e+00
+1860 1759 -4.16666666666667e+00
+1860 1499 4.16666666666667e+00
+1860 1502 -2.08333333333333e+00
+1860 1861 -8.33333333333333e+00
+1860 1498 4.16666666666667e+00
+1860 1765 -4.16666666666667e+00
+1860 1369 -4.16666666666667e+00
+1860 1501 4.16666666666667e+00
+1860 1500 -6.25000000000000e+00
+1860 1862 -8.33333333333333e+00
+1860 1766 8.33333333333333e+00
+1860 1762 4.16666666666667e+00
+1860 1764 -1.25000000000000e+01
+1860 113 2.08333333333333e+00
+1860 242 4.16666666666667e+00
+1860 241 4.16666666666667e+00
+1860 112 -4.16666666666667e+00
+1860 240 -1.87500000000000e+01
+1861 1861 6.25000000000000e+01
+1861 1859 -2.08333333333333e+00
+1861 1763 4.16666666666667e+00
+1861 1858 -6.25000000000000e+00
+1861 1857 4.16666666666667e+00
+1861 1862 -8.33333333333333e+00
+1861 1871 4.16666666666667e+00
+1861 1870 -1.87500000000000e+01
+1861 1869 4.16666666666667e+00
+1861 1758 -4.16666666666667e+00
+1861 1502 4.16666666666667e+00
+1861 1860 -8.33333333333333e+00
+1861 1499 -8.33333333333333e+00
+1861 1766 8.33333333333333e+00
+1861 1497 4.16666666666667e+00
+1861 1764 -4.16666666666667e+00
+1861 1370 2.08333333333333e+00
+1861 1760 -4.16666666666667e+00
+1861 1501 -1.87500000000000e+01
+1861 1368 -4.16666666666667e+00
+1861 1500 4.16666666666667e+00
+1861 1761 4.16666666666667e+00
+1861 1765 -1.25000000000000e+01
+1861 242 -2.08333333333333e+00
+1861 113 2.08333333333333e+00
+1861 241 -6.25000000000000e+00
+1861 240 4.16666666666667e+00
+1861 111 -4.16666666666667e+00
+1862 1862 6.25000000000000e+01
+1862 1762 4.16666666666667e+00
+1862 1857 4.16666666666667e+00
+1862 1761 -8.33333333333333e+00
+1862 1859 -6.25000000000000e+00
+1862 1368 2.08333333333333e+00
+1862 1871 -6.25000000000000e+00
+1862 1861 -8.33333333333333e+00
+1862 1870 4.16666666666667e+00
+1862 1869 -2.08333333333333e+00
+1862 1758 -4.16666666666667e+00
+1862 1501 4.16666666666667e+00
+1862 1497 4.16666666666667e+00
+1862 1500 -2.08333333333333e+00
+1862 1498 -8.33333333333333e+00
+1862 1765 8.33333333333333e+00
+1862 1502 -6.25000000000000e+00
+1862 1369 2.08333333333333e+00
+1862 1759 -4.16666666666667e+00
+1862 1858 -2.08333333333333e+00
+1862 1766 -3.75000000000000e+01
+1862 1860 -8.33333333333333e+00
+1862 1764 8.33333333333333e+00
+1862 111 2.08333333333333e+00
+1862 242 -6.25000000000000e+00
+1862 241 -2.08333333333333e+00
+1862 112 2.08333333333333e+00
+1862 240 4.16666666666667e+00
+1863 1863 6.25000000000000e+01
+1863 1780 -4.16666666666667e+00
+1863 1868 -2.08333333333333e+00
+1863 1874 2.08333333333333e+00
+1863 1373 4.16666666666667e+00
+1863 1778 -8.33333333333333e+00
+1863 1867 4.16666666666667e+00
+1863 1866 -6.25000000000000e+00
+1863 1865 -8.33333333333333e+00
+1863 1781 8.33333333333333e+00
+1863 1376 4.16666666666667e+00
+1863 1873 -4.16666666666667e+00
+1863 1779 -1.25000000000000e+01
+1863 1744 -4.16666666666667e+00
+1863 1747 4.16666666666667e+00
+1863 1493 2.08333333333333e+00
+1863 1745 -4.16666666666667e+00
+1863 1372 4.16666666666667e+00
+1863 1492 -4.16666666666667e+00
+1863 1371 -1.87500000000000e+01
+1863 1496 -2.08333333333333e+00
+1863 1748 4.16666666666667e+00
+1863 1864 -8.33333333333333e+00
+1863 1495 4.16666666666667e+00
+1863 1375 4.16666666666667e+00
+1863 1777 4.16666666666667e+00
+1863 1494 -6.25000000000000e+00
+1863 1374 -1.87500000000000e+01
+1864 1864 6.25000000000000e+01
+1864 1779 -4.16666666666667e+00
+1864 1865 -8.33333333333333e+00
+1864 1868 4.16666666666667e+00
+1864 1781 8.33333333333333e+00
+1864 1373 -2.08333333333333e+00
+1864 1778 4.16666666666667e+00
+1864 1867 -1.87500000000000e+01
+1864 1866 4.16666666666667e+00
+1864 1874 2.08333333333333e+00
+1864 1376 -2.08333333333333e+00
+1864 1780 -1.25000000000000e+01
+1864 1872 -4.16666666666667e+00
+1864 1493 2.08333333333333e+00
+1864 1745 -4.16666666666667e+00
+1864 1743 -4.16666666666667e+00
+1864 1746 4.16666666666667e+00
+1864 1372 -6.25000000000000e+00
+1864 1371 4.16666666666667e+00
+1864 1491 -4.16666666666667e+00
+1864 1496 4.16666666666667e+00
+1864 1748 -8.33333333333333e+00
+1864 1776 4.16666666666667e+00
+1864 1495 -1.87500000000000e+01
+1864 1375 -6.25000000000000e+00
+1864 1863 -8.33333333333333e+00
+1864 1494 4.16666666666667e+00
+1864 1374 4.16666666666667e+00
+1865 1865 6.25000000000000e+01
+1865 1867 4.16666666666667e+00
+1865 1780 8.33333333333333e+00
+1865 1866 -2.08333333333333e+00
+1865 1872 2.08333333333333e+00
+1865 1868 -6.25000000000000e+00
+1865 1372 -2.08333333333333e+00
+1865 1777 4.16666666666667e+00
+1865 1371 4.16666666666667e+00
+1865 1776 -8.33333333333333e+00
+1865 1781 -3.75000000000000e+01
+1865 1873 2.08333333333333e+00
+1865 1375 -2.08333333333333e+00
+1865 1863 -8.33333333333333e+00
+1865 1779 8.33333333333333e+00
+1865 1374 4.16666666666667e+00
+1865 1492 2.08333333333333e+00
+1865 1744 -4.16666666666667e+00
+1865 1373 -6.25000000000000e+00
+1865 1491 2.08333333333333e+00
+1865 1743 -4.16666666666667e+00
+1865 1864 -8.33333333333333e+00
+1865 1496 -6.25000000000000e+00
+1865 1376 -6.25000000000000e+00
+1865 1495 4.16666666666667e+00
+1865 1747 -8.33333333333333e+00
+1865 1494 -2.08333333333333e+00
+1865 1746 4.16666666666667e+00
+1866 1866 6.25000000000000e+01
+1866 1865 -2.08333333333333e+00
+1866 1781 4.16666666666667e+00
+1866 1864 4.16666666666667e+00
+1866 1863 -6.25000000000000e+00
+1866 1868 -8.33333333333333e+00
+1866 1874 4.16666666666667e+00
+1866 1873 4.16666666666667e+00
+1866 1872 -1.87500000000000e+01
+1866 1777 -4.16666666666667e+00
+1866 1532 4.16666666666667e+00
+1866 1867 -8.33333333333333e+00
+1866 1520 -8.33333333333333e+00
+1866 1784 8.33333333333333e+00
+1866 1519 4.16666666666667e+00
+1866 1783 -4.16666666666667e+00
+1866 1373 2.08333333333333e+00
+1866 1778 -4.16666666666667e+00
+1866 1531 4.16666666666667e+00
+1866 1372 -4.16666666666667e+00
+1866 1530 -1.87500000000000e+01
+1866 1538 -2.08333333333333e+00
+1866 1382 2.08333333333333e+00
+1866 1537 4.16666666666667e+00
+1866 1381 -4.16666666666667e+00
+1866 1536 -6.25000000000000e+00
+1866 1780 4.16666666666667e+00
+1866 1782 -1.25000000000000e+01
+1867 1867 6.25000000000000e+01
+1867 1865 4.16666666666667e+00
+1867 1781 -8.33333333333333e+00
+1867 1373 2.08333333333333e+00
+1867 1864 -1.87500000000000e+01
+1867 1863 4.16666666666667e+00
+1867 1382 2.08333333333333e+00
+1867 1874 -2.08333333333333e+00
+1867 1873 -6.25000000000000e+00
+1867 1872 4.16666666666667e+00
+1867 1778 -4.16666666666667e+00
+1867 1776 -4.16666666666667e+00
+1867 1532 -2.08333333333333e+00
+1867 1520 4.16666666666667e+00
+1867 1866 -8.33333333333333e+00
+1867 1518 4.16666666666667e+00
+1867 1782 -4.16666666666667e+00
+1867 1531 -6.25000000000000e+00
+1867 1530 4.16666666666667e+00
+1867 1371 -4.16666666666667e+00
+1867 1538 4.16666666666667e+00
+1867 1868 -8.33333333333333e+00
+1867 1784 8.33333333333333e+00
+1867 1537 -1.87500000000000e+01
+1867 1779 4.16666666666667e+00
+1867 1783 -1.25000000000000e+01
+1867 1536 4.16666666666667e+00
+1867 1380 -4.16666666666667e+00
+1868 1868 6.25000000000000e+01
+1868 1780 -8.33333333333333e+00
+1868 1863 -2.08333333333333e+00
+1868 1779 4.16666666666667e+00
+1868 1865 -6.25000000000000e+00
+1868 1372 2.08333333333333e+00
+1868 1874 -6.25000000000000e+00
+1868 1381 2.08333333333333e+00
+1868 1873 -2.08333333333333e+00
+1868 1866 -8.33333333333333e+00
+1868 1872 4.16666666666667e+00
+1868 1777 -4.16666666666667e+00
+1868 1531 -2.08333333333333e+00
+1868 1519 4.16666666666667e+00
+1868 1530 4.16666666666667e+00
+1868 1518 -8.33333333333333e+00
+1868 1782 8.33333333333333e+00
+1868 1532 -6.25000000000000e+00
+1868 1371 2.08333333333333e+00
+1868 1776 -4.16666666666667e+00
+1868 1538 -6.25000000000000e+00
+1868 1864 4.16666666666667e+00
+1868 1784 -3.75000000000000e+01
+1868 1537 4.16666666666667e+00
+1868 1867 -8.33333333333333e+00
+1868 1783 8.33333333333333e+00
+1868 1536 -2.08333333333333e+00
+1868 1380 2.08333333333333e+00
+1869 1869 6.25000000000000e+01
+1869 1861 4.16666666666667e+00
+1869 1860 -6.25000000000000e+00
+1869 1859 2.08333333333333e+00
+1869 1858 -4.16666666666667e+00
+1869 1766 4.16666666666667e+00
+1869 1763 -4.16666666666667e+00
+1869 1765 4.16666666666667e+00
+1869 1762 -4.16666666666667e+00
+1869 1798 -4.16666666666667e+00
+1869 1795 4.16666666666667e+00
+1869 1547 -2.08333333333333e+00
+1869 1376 4.16666666666667e+00
+1869 1796 -8.33333333333333e+00
+1869 1375 4.16666666666667e+00
+1869 1870 -8.33333333333333e+00
+1869 1546 4.16666666666667e+00
+1869 1374 -1.87500000000000e+01
+1869 1545 -6.25000000000000e+00
+1869 1871 -8.33333333333333e+00
+1869 1799 8.33333333333333e+00
+1869 1862 -2.08333333333333e+00
+1869 1797 -1.25000000000000e+01
+1869 284 2.08333333333333e+00
+1869 113 4.16666666666667e+00
+1869 112 4.16666666666667e+00
+1869 283 -4.16666666666667e+00
+1869 111 -1.87500000000000e+01
+1870 1870 6.25000000000000e+01
+1870 1862 4.16666666666667e+00
+1870 1861 -1.87500000000000e+01
+1870 1860 4.16666666666667e+00
+1870 1857 -4.16666666666667e+00
+1870 1763 -4.16666666666667e+00
+1870 1766 -8.33333333333333e+00
+1870 1764 4.16666666666667e+00
+1870 1761 -4.16666666666667e+00
+1870 1797 -4.16666666666667e+00
+1870 1794 4.16666666666667e+00
+1870 1799 8.33333333333333e+00
+1870 1871 -8.33333333333333e+00
+1870 1547 4.16666666666667e+00
+1870 1376 -2.08333333333333e+00
+1870 1796 4.16666666666667e+00
+1870 1375 -6.25000000000000e+00
+1870 1546 -1.87500000000000e+01
+1870 1374 4.16666666666667e+00
+1870 1869 -8.33333333333333e+00
+1870 1545 4.16666666666667e+00
+1870 1859 2.08333333333333e+00
+1870 1798 -1.25000000000000e+01
+1870 113 -2.08333333333333e+00
+1870 284 2.08333333333333e+00
+1870 112 -6.25000000000000e+00
+1870 111 4.16666666666667e+00
+1870 282 -4.16666666666667e+00
+1871 1871 6.25000000000000e+01
+1871 1862 -6.25000000000000e+00
+1871 1861 4.16666666666667e+00
+1871 1860 -2.08333333333333e+00
+1871 1857 2.08333333333333e+00
+1871 1764 4.16666666666667e+00
+1871 1761 -4.16666666666667e+00
+1871 1762 -4.16666666666667e+00
+1871 1765 -8.33333333333333e+00
+1871 1798 8.33333333333333e+00
+1871 1870 -8.33333333333333e+00
+1871 1546 4.16666666666667e+00
+1871 1545 -2.08333333333333e+00
+1871 1376 -6.25000000000000e+00
+1871 1547 -6.25000000000000e+00
+1871 1375 -2.08333333333333e+00
+1871 1795 4.16666666666667e+00
+1871 1374 4.16666666666667e+00
+1871 1794 -8.33333333333333e+00
+1871 1858 2.08333333333333e+00
+1871 1799 -3.75000000000000e+01
+1871 1869 -8.33333333333333e+00
+1871 1797 8.33333333333333e+00
+1871 282 2.08333333333333e+00
+1871 113 -6.25000000000000e+00
+1871 112 -2.08333333333333e+00
+1871 283 2.08333333333333e+00
+1871 111 4.16666666666667e+00
+1872 1872 6.25000000000000e+01
+1872 1868 4.16666666666667e+00
+1872 1867 4.16666666666667e+00
+1872 1866 -1.87500000000000e+01
+1872 1864 -4.16666666666667e+00
+1872 1781 -4.16666666666667e+00
+1872 1784 -8.33333333333333e+00
+1872 1783 4.16666666666667e+00
+1872 1780 -4.16666666666667e+00
+1872 1795 4.16666666666667e+00
+1872 1801 -4.16666666666667e+00
+1872 1874 -8.33333333333333e+00
+1872 1802 8.33333333333333e+00
+1872 1547 4.16666666666667e+00
+1872 1382 -2.08333333333333e+00
+1872 1550 2.08333333333333e+00
+1872 1381 4.16666666666667e+00
+1872 1549 -4.16666666666667e+00
+1872 1380 -6.25000000000000e+00
+1872 1800 -1.25000000000000e+01
+1872 1376 -2.08333333333333e+00
+1872 1796 4.16666666666667e+00
+1872 1873 -8.33333333333333e+00
+1872 1375 4.16666666666667e+00
+1872 1546 4.16666666666667e+00
+1872 1865 2.08333333333333e+00
+1872 1374 -6.25000000000000e+00
+1872 1545 -1.87500000000000e+01
+1873 1873 6.25000000000000e+01
+1873 1867 -6.25000000000000e+00
+1873 1866 4.16666666666667e+00
+1873 1865 2.08333333333333e+00
+1873 1863 -4.16666666666667e+00
+1873 1784 4.16666666666667e+00
+1873 1781 -4.16666666666667e+00
+1873 1782 4.16666666666667e+00
+1873 1779 -4.16666666666667e+00
+1873 1794 4.16666666666667e+00
+1873 1800 -4.16666666666667e+00
+1873 1550 2.08333333333333e+00
+1873 1547 -2.08333333333333e+00
+1873 1382 4.16666666666667e+00
+1873 1874 -8.33333333333333e+00
+1873 1802 8.33333333333333e+00
+1873 1381 -1.87500000000000e+01
+1873 1801 -1.25000000000000e+01
+1873 1380 4.16666666666667e+00
+1873 1548 -4.16666666666667e+00
+1873 1376 4.16666666666667e+00
+1873 1796 -8.33333333333333e+00
+1873 1868 -2.08333333333333e+00
+1873 1375 -1.87500000000000e+01
+1873 1546 -6.25000000000000e+00
+1873 1872 -8.33333333333333e+00
+1873 1374 4.16666666666667e+00
+1873 1545 4.16666666666667e+00
+1874 1874 6.25000000000000e+01
+1874 1868 -6.25000000000000e+00
+1874 1867 -2.08333333333333e+00
+1874 1866 4.16666666666667e+00
+1874 1864 2.08333333333333e+00
+1874 1783 4.16666666666667e+00
+1874 1780 -4.16666666666667e+00
+1874 1779 -4.16666666666667e+00
+1874 1782 -8.33333333333333e+00
+1874 1549 2.08333333333333e+00
+1874 1546 -2.08333333333333e+00
+1874 1872 -8.33333333333333e+00
+1874 1800 8.33333333333333e+00
+1874 1545 4.16666666666667e+00
+1874 1382 -6.25000000000000e+00
+1874 1802 -3.75000000000000e+01
+1874 1381 4.16666666666667e+00
+1874 1873 -8.33333333333333e+00
+1874 1801 8.33333333333333e+00
+1874 1380 -2.08333333333333e+00
+1874 1548 2.08333333333333e+00
+1874 1863 2.08333333333333e+00
+1874 1376 -6.25000000000000e+00
+1874 1547 -6.25000000000000e+00
+1874 1375 4.16666666666667e+00
+1874 1795 -8.33333333333333e+00
+1874 1374 -2.08333333333333e+00
+1874 1794 4.16666666666667e+00
diff --git a/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/A.IJ.00003 b/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/A.IJ.00003
new file mode 100644
index 00000000..9eaaee24
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/A.IJ.00003
@@ -0,0 +1,17368 @@
+1875 2474 1875 2474
+1875 1875 1.00000000000000e+00
+1875 1999 0.00000000000000e+00
+1875 1986 0.00000000000000e+00
+1875 2000 0.00000000000000e+00
+1875 1991 0.00000000000000e+00
+1875 2003 0.00000000000000e+00
+1875 1984 0.00000000000000e+00
+1875 1990 0.00000000000000e+00
+1875 1985 0.00000000000000e+00
+1875 1996 0.00000000000000e+00
+1875 2002 0.00000000000000e+00
+1875 1983 0.00000000000000e+00
+1875 1994 0.00000000000000e+00
+1875 1997 0.00000000000000e+00
+1875 1992 0.00000000000000e+00
+1875 1987 0.00000000000000e+00
+1876 1876 1.00000000000000e+00
+1876 1986 0.00000000000000e+00
+1876 1988 0.00000000000000e+00
+1876 1987 0.00000000000000e+00
+1876 1998 0.00000000000000e+00
+1876 2000 0.00000000000000e+00
+1876 1994 0.00000000000000e+00
+1876 1983 0.00000000000000e+00
+1876 1989 0.00000000000000e+00
+1876 1984 0.00000000000000e+00
+1876 1995 0.00000000000000e+00
+1876 2001 0.00000000000000e+00
+1876 1997 0.00000000000000e+00
+1876 2003 0.00000000000000e+00
+1876 1993 0.00000000000000e+00
+1876 1991 0.00000000000000e+00
+1877 1877 1.00000000000000e+00
+1877 1988 0.00000000000000e+00
+1877 1987 0.00000000000000e+00
+1877 1999 0.00000000000000e+00
+1877 1993 0.00000000000000e+00
+1877 1998 0.00000000000000e+00
+1877 1989 0.00000000000000e+00
+1877 2001 0.00000000000000e+00
+1877 1985 0.00000000000000e+00
+1877 1983 0.00000000000000e+00
+1877 1994 0.00000000000000e+00
+1877 1990 0.00000000000000e+00
+1877 1996 0.00000000000000e+00
+1877 2002 0.00000000000000e+00
+1877 1992 0.00000000000000e+00
+1877 1995 0.00000000000000e+00
+1878 1878 3.75000000000000e+01
+1878 2027 -4.16666666666667e+00
+1878 2008 2.08333333333333e+00
+1878 2014 -4.16666666666667e+00
+1878 2009 2.08333333333333e+00
+1878 2020 2.08333333333333e+00
+1878 2026 -4.16666666666667e+00
+1878 2007 -1.25000000000000e+01
+1878 2021 -4.16666666666667e+00
+1878 2012 -2.08333333333333e+00
+1878 2024 4.16666666666667e+00
+1878 1879 -4.16666666666667e+00
+1878 2011 4.16666666666667e+00
+1878 2005 2.08333333333333e+00
+1878 2010 -6.25000000000000e+00
+1878 1880 -4.16666666666667e+00
+1878 2018 4.16666666666667e+00
+1878 2006 2.08333333333333e+00
+1878 2017 -2.08333333333333e+00
+1878 2023 4.16666666666667e+00
+1878 2015 2.08333333333333e+00
+1878 2016 -6.25000000000000e+00
+1878 2004 -1.25000000000000e+01
+1879 1879 3.33333333333333e+01
+1879 2007 2.08333333333333e+00
+1879 2013 -4.16666666666667e+00
+1879 2008 -4.16666666666667e+00
+1879 2019 2.08333333333333e+00
+1879 2025 -4.16666666666667e+00
+1879 2021 2.08333333333333e+00
+1879 2027 -4.16666666666667e+00
+1879 2012 4.16666666666667e+00
+1879 2011 -1.87500000000000e+01
+1879 1878 -4.16666666666667e+00
+1879 2010 4.16666666666667e+00
+1879 2004 2.08333333333333e+00
+1879 2018 4.16666666666667e+00
+1879 2024 -8.33333333333333e+00
+1879 2015 2.08333333333333e+00
+1879 2017 -6.25000000000000e+00
+1879 2005 -4.16666666666667e+00
+1879 2016 -2.08333333333333e+00
+1879 2022 4.16666666666667e+00
+1880 1880 3.33333333333333e+01
+1880 2013 2.08333333333333e+00
+1880 2025 -4.16666666666667e+00
+1880 2009 -4.16666666666667e+00
+1880 2007 2.08333333333333e+00
+1880 2020 2.08333333333333e+00
+1880 2026 -4.16666666666667e+00
+1880 2019 -4.16666666666667e+00
+1880 2012 -6.25000000000000e+00
+1880 2011 4.16666666666667e+00
+1880 2010 -2.08333333333333e+00
+1880 2022 4.16666666666667e+00
+1880 2014 2.08333333333333e+00
+1880 2018 -1.87500000000000e+01
+1880 2006 -4.16666666666667e+00
+1880 2017 4.16666666666667e+00
+1880 2023 -8.33333333333333e+00
+1880 1878 -4.16666666666667e+00
+1880 2016 4.16666666666667e+00
+1880 2004 2.08333333333333e+00
+1881 1881 1.00000000000000e+00
+1881 2035 0.00000000000000e+00
+1881 1882 0.00000000000000e+00
+1881 2032 0.00000000000000e+00
+1881 2034 0.00000000000000e+00
+1881 2039 0.00000000000000e+00
+1881 2042 0.00000000000000e+00
+1881 2038 0.00000000000000e+00
+1881 2041 0.00000000000000e+00
+1881 2037 0.00000000000000e+00
+1881 2036 0.00000000000000e+00
+1881 2031 0.00000000000000e+00
+1882 1882 1.00000000000000e+00
+1882 2042 0.00000000000000e+00
+1882 2035 0.00000000000000e+00
+1882 2034 0.00000000000000e+00
+1882 1881 0.00000000000000e+00
+1882 2031 0.00000000000000e+00
+1882 2039 0.00000000000000e+00
+1882 1883 0.00000000000000e+00
+1882 2033 0.00000000000000e+00
+1882 2038 0.00000000000000e+00
+1882 2036 0.00000000000000e+00
+1882 2032 0.00000000000000e+00
+1882 2037 0.00000000000000e+00
+1882 2040 0.00000000000000e+00
+1883 1883 1.00000000000000e+00
+1883 2035 0.00000000000000e+00
+1883 2041 0.00000000000000e+00
+1883 2034 0.00000000000000e+00
+1883 2039 0.00000000000000e+00
+1883 2036 0.00000000000000e+00
+1883 2033 0.00000000000000e+00
+1883 2038 0.00000000000000e+00
+1883 1882 0.00000000000000e+00
+1883 2032 0.00000000000000e+00
+1883 2037 0.00000000000000e+00
+1883 2040 0.00000000000000e+00
+1884 1884 2.50000000000000e+01
+1884 2053 2.08333333333333e+00
+1884 1885 -4.16666666666667e+00
+1884 2052 -6.25000000000000e+00
+1884 2060 -4.16666666666667e+00
+1884 2056 -2.08333333333333e+00
+1884 2059 2.08333333333333e+00
+1884 1886 -4.16666666666667e+00
+1884 2051 2.08333333333333e+00
+1884 2057 4.16666666666667e+00
+1884 2050 2.08333333333333e+00
+1884 2049 -6.25000000000000e+00
+1884 2048 -2.08333333333333e+00
+1884 2045 2.08333333333333e+00
+1884 2047 4.16666666666667e+00
+1884 2044 -4.16666666666667e+00
+1884 2046 -6.25000000000000e+00
+1884 2054 2.08333333333333e+00
+1884 2055 -6.25000000000000e+00
+1885 1885 2.91666666666667e+01
+1885 2060 2.08333333333333e+00
+1885 2053 -2.08333333333333e+00
+1885 2052 2.08333333333333e+00
+1885 1884 -4.16666666666667e+00
+1885 2055 -2.08333333333333e+00
+1885 2058 2.08333333333333e+00
+1885 2051 -2.08333333333333e+00
+1885 2045 2.08333333333333e+00
+1885 2050 -2.08333333333333e+00
+1885 2049 2.08333333333333e+00
+1885 2048 4.16666666666667e+00
+1885 1886 -8.33333333333333e+00
+1885 2057 4.16666666666667e+00
+1885 2047 -1.87500000000000e+01
+1885 2054 -2.08333333333333e+00
+1885 2056 -6.25000000000000e+00
+1885 2046 4.16666666666667e+00
+1885 2043 -4.16666666666667e+00
+1886 1886 2.91666666666667e+01
+1886 2053 -2.08333333333333e+00
+1886 2059 2.08333333333333e+00
+1886 2052 2.08333333333333e+00
+1886 2058 -4.16666666666667e+00
+1886 2051 -2.08333333333333e+00
+1886 2050 -2.08333333333333e+00
+1886 2044 2.08333333333333e+00
+1886 1884 -4.16666666666667e+00
+1886 2049 2.08333333333333e+00
+1886 2055 4.16666666666667e+00
+1886 2048 -6.25000000000000e+00
+1886 2054 -2.08333333333333e+00
+1886 2057 -1.87500000000000e+01
+1886 2047 4.16666666666667e+00
+1886 1885 -8.33333333333333e+00
+1886 2056 4.16666666666667e+00
+1886 2046 -2.08333333333333e+00
+1886 2043 2.08333333333333e+00
+1887 1887 1.00000000000000e+00
+1887 2078 0.00000000000000e+00
+1887 2074 0.00000000000000e+00
+1887 2073 0.00000000000000e+00
+1887 1889 0.00000000000000e+00
+1887 2072 0.00000000000000e+00
+1887 2069 0.00000000000000e+00
+1887 2071 0.00000000000000e+00
+1887 2077 0.00000000000000e+00
+1887 2075 0.00000000000000e+00
+1887 2070 0.00000000000000e+00
+1887 2067 0.00000000000000e+00
+1888 1888 1.00000000000000e+00
+1888 1889 0.00000000000000e+00
+1888 2069 0.00000000000000e+00
+1888 2074 0.00000000000000e+00
+1888 2073 0.00000000000000e+00
+1888 2072 0.00000000000000e+00
+1888 2078 0.00000000000000e+00
+1888 2075 0.00000000000000e+00
+1888 2071 0.00000000000000e+00
+1888 2068 0.00000000000000e+00
+1888 2070 0.00000000000000e+00
+1888 2076 0.00000000000000e+00
+1889 1889 1.00000000000000e+00
+1889 2074 0.00000000000000e+00
+1889 1888 0.00000000000000e+00
+1889 2068 0.00000000000000e+00
+1889 2073 0.00000000000000e+00
+1889 2076 0.00000000000000e+00
+1889 2075 0.00000000000000e+00
+1889 2072 0.00000000000000e+00
+1889 2069 0.00000000000000e+00
+1889 2071 0.00000000000000e+00
+1889 2077 0.00000000000000e+00
+1889 1887 0.00000000000000e+00
+1889 2070 0.00000000000000e+00
+1889 2067 0.00000000000000e+00
+1890 1890 2.50000000000000e+01
+1890 2096 2.08333333333333e+00
+1890 1892 -4.16666666666667e+00
+1890 2090 2.08333333333333e+00
+1890 2089 2.08333333333333e+00
+1890 2095 -4.16666666666667e+00
+1890 2088 -6.25000000000000e+00
+1890 2084 4.16666666666667e+00
+1890 2083 -2.08333333333333e+00
+1890 2080 2.08333333333333e+00
+1890 2082 -6.25000000000000e+00
+1890 2087 2.08333333333333e+00
+1890 2081 -4.16666666666667e+00
+1890 2086 2.08333333333333e+00
+1890 1891 -4.16666666666667e+00
+1890 2092 4.16666666666667e+00
+1890 2085 -6.25000000000000e+00
+1890 2093 -2.08333333333333e+00
+1890 2091 -6.25000000000000e+00
+1891 1891 2.91666666666667e+01
+1891 2096 2.08333333333333e+00
+1891 2089 -2.08333333333333e+00
+1891 2088 2.08333333333333e+00
+1891 2094 -4.16666666666667e+00
+1891 2084 4.16666666666667e+00
+1891 1892 -8.33333333333333e+00
+1891 2093 4.16666666666667e+00
+1891 2083 -6.25000000000000e+00
+1891 2082 -2.08333333333333e+00
+1891 2079 2.08333333333333e+00
+1891 2087 -2.08333333333333e+00
+1891 2081 2.08333333333333e+00
+1891 2086 -2.08333333333333e+00
+1891 2090 -2.08333333333333e+00
+1891 2092 -1.87500000000000e+01
+1891 2085 2.08333333333333e+00
+1891 1890 -4.16666666666667e+00
+1891 2091 4.16666666666667e+00
+1892 1892 2.91666666666667e+01
+1892 2094 2.08333333333333e+00
+1892 2090 -2.08333333333333e+00
+1892 2089 -2.08333333333333e+00
+1892 2095 2.08333333333333e+00
+1892 1890 -4.16666666666667e+00
+1892 2088 2.08333333333333e+00
+1892 2084 -1.87500000000000e+01
+1892 2083 4.16666666666667e+00
+1892 1891 -8.33333333333333e+00
+1892 2092 4.16666666666667e+00
+1892 2082 4.16666666666667e+00
+1892 2087 -2.08333333333333e+00
+1892 2091 -2.08333333333333e+00
+1892 2093 -6.25000000000000e+00
+1892 2086 -2.08333333333333e+00
+1892 2080 2.08333333333333e+00
+1892 2085 2.08333333333333e+00
+1892 2079 -4.16666666666667e+00
+1893 1893 1.00000000000000e+00
+1893 2108 0.00000000000000e+00
+1893 2114 0.00000000000000e+00
+1893 2107 0.00000000000000e+00
+1893 2104 0.00000000000000e+00
+1893 2106 0.00000000000000e+00
+1893 2111 0.00000000000000e+00
+1893 2105 0.00000000000000e+00
+1893 1894 0.00000000000000e+00
+1893 2110 0.00000000000000e+00
+1893 2113 0.00000000000000e+00
+1893 1895 0.00000000000000e+00
+1893 2109 0.00000000000000e+00
+1893 2112 0.00000000000000e+00
+1894 1894 1.00000000000000e+00
+1894 2107 0.00000000000000e+00
+1894 2106 0.00000000000000e+00
+1894 2103 0.00000000000000e+00
+1894 2111 0.00000000000000e+00
+1894 2105 0.00000000000000e+00
+1894 2108 0.00000000000000e+00
+1894 2110 0.00000000000000e+00
+1894 2113 0.00000000000000e+00
+1894 1893 0.00000000000000e+00
+1894 2109 0.00000000000000e+00
+1894 2112 0.00000000000000e+00
+1895 1895 1.00000000000000e+00
+1895 2107 0.00000000000000e+00
+1895 1893 0.00000000000000e+00
+1895 2106 0.00000000000000e+00
+1895 2112 0.00000000000000e+00
+1895 2108 0.00000000000000e+00
+1895 2111 0.00000000000000e+00
+1895 2114 0.00000000000000e+00
+1895 2110 0.00000000000000e+00
+1895 2104 0.00000000000000e+00
+1895 2109 0.00000000000000e+00
+1895 2103 0.00000000000000e+00
+1896 1896 3.75000000000000e+01
+1896 2138 2.08333333333333e+00
+1896 2125 -2.08333333333333e+00
+1896 2132 -2.08333333333333e+00
+1896 1897 -4.16666666666667e+00
+1896 2137 2.08333333333333e+00
+1896 2136 -1.25000000000000e+01
+1896 2126 4.16666666666667e+00
+1896 2135 2.08333333333333e+00
+1896 2123 -4.16666666666667e+00
+1896 2122 2.08333333333333e+00
+1896 2129 2.08333333333333e+00
+1896 2134 2.08333333333333e+00
+1896 2133 -1.25000000000000e+01
+1896 2120 4.16666666666667e+00
+1896 2117 -4.16666666666667e+00
+1896 2124 -6.25000000000000e+00
+1896 2119 4.16666666666667e+00
+1896 2116 -4.16666666666667e+00
+1896 2128 -4.16666666666667e+00
+1896 2131 4.16666666666667e+00
+1896 2130 -6.25000000000000e+00
+1896 1898 -4.16666666666667e+00
+1897 1897 3.33333333333333e+01
+1897 2137 -4.16666666666667e+00
+1897 1896 -4.16666666666667e+00
+1897 2136 2.08333333333333e+00
+1897 2123 2.08333333333333e+00
+1897 2121 2.08333333333333e+00
+1897 2134 -4.16666666666667e+00
+1897 2133 2.08333333333333e+00
+1897 2126 4.16666666666667e+00
+1897 2125 -6.25000000000000e+00
+1897 2120 -8.33333333333333e+00
+1897 2132 4.16666666666667e+00
+1897 2118 4.16666666666667e+00
+1897 2115 -4.16666666666667e+00
+1897 2129 2.08333333333333e+00
+1897 2117 -4.16666666666667e+00
+1897 2131 -1.87500000000000e+01
+1897 2124 -2.08333333333333e+00
+1897 2127 -4.16666666666667e+00
+1897 2130 4.16666666666667e+00
+1898 1898 3.33333333333333e+01
+1898 2136 2.08333333333333e+00
+1898 2138 -4.16666666666667e+00
+1898 2130 -2.08333333333333e+00
+1898 2122 2.08333333333333e+00
+1898 2124 4.16666666666667e+00
+1898 2133 2.08333333333333e+00
+1898 2121 -4.16666666666667e+00
+1898 2135 -4.16666666666667e+00
+1898 2127 2.08333333333333e+00
+1898 2126 -1.87500000000000e+01
+1898 2125 4.16666666666667e+00
+1898 2118 4.16666666666667e+00
+1898 2115 -4.16666666666667e+00
+1898 2119 -8.33333333333333e+00
+1898 2131 4.16666666666667e+00
+1898 2132 -6.25000000000000e+00
+1898 1896 -4.16666666666667e+00
+1898 2128 2.08333333333333e+00
+1898 2116 -4.16666666666667e+00
+1899 1899 3.75000000000000e+01
+1899 2005 2.08333333333333e+00
+1899 2161 -4.16666666666667e+00
+1899 2153 -2.08333333333333e+00
+1899 1900 -4.16666666666667e+00
+1899 2152 4.16666666666667e+00
+1899 1984 2.08333333333333e+00
+1899 2151 -6.25000000000000e+00
+1899 2168 -4.16666666666667e+00
+1899 2159 4.16666666666667e+00
+1899 2006 2.08333333333333e+00
+1899 2165 -4.16666666666667e+00
+1899 2164 2.08333333333333e+00
+1899 2167 -4.16666666666667e+00
+1899 2004 -1.25000000000000e+01
+1899 1901 -4.16666666666667e+00
+1899 2156 4.16666666666667e+00
+1899 1985 2.08333333333333e+00
+1899 2155 -2.08333333333333e+00
+1899 2158 4.16666666666667e+00
+1899 2162 2.08333333333333e+00
+1899 2154 -6.25000000000000e+00
+1899 1983 -1.25000000000000e+01
+1900 1900 3.33333333333333e+01
+1900 2004 2.08333333333333e+00
+1900 2160 -4.16666666666667e+00
+1900 2153 4.16666666666667e+00
+1900 2152 -1.87500000000000e+01
+1900 1899 -4.16666666666667e+00
+1900 2151 4.16666666666667e+00
+1900 1983 2.08333333333333e+00
+1900 2165 2.08333333333333e+00
+1900 2168 -4.16666666666667e+00
+1900 2005 -4.16666666666667e+00
+1900 2163 2.08333333333333e+00
+1900 2166 -4.16666666666667e+00
+1900 2156 4.16666666666667e+00
+1900 2159 -8.33333333333333e+00
+1900 2162 2.08333333333333e+00
+1900 2155 -6.25000000000000e+00
+1900 1984 -4.16666666666667e+00
+1900 2154 -2.08333333333333e+00
+1900 2157 4.16666666666667e+00
+1901 1901 3.33333333333333e+01
+1901 2160 2.08333333333333e+00
+1901 2153 -6.25000000000000e+00
+1901 2152 4.16666666666667e+00
+1901 2151 -2.08333333333333e+00
+1901 2164 2.08333333333333e+00
+1901 2167 -4.16666666666667e+00
+1901 2166 -4.16666666666667e+00
+1901 2157 4.16666666666667e+00
+1901 2006 -4.16666666666667e+00
+1901 2004 2.08333333333333e+00
+1901 2163 -4.16666666666667e+00
+1901 2161 2.08333333333333e+00
+1901 2156 -1.87500000000000e+01
+1901 1985 -4.16666666666667e+00
+1901 2155 4.16666666666667e+00
+1901 2158 -8.33333333333333e+00
+1901 1899 -4.16666666666667e+00
+1901 2154 4.16666666666667e+00
+1901 1983 2.08333333333333e+00
+1902 1902 1.00000000000000e+00
+1902 2179 0.00000000000000e+00
+1902 2032 0.00000000000000e+00
+1902 2171 0.00000000000000e+00
+1902 2170 0.00000000000000e+00
+1902 1903 0.00000000000000e+00
+1902 1987 0.00000000000000e+00
+1902 2169 0.00000000000000e+00
+1902 2186 0.00000000000000e+00
+1902 2183 0.00000000000000e+00
+1902 2182 0.00000000000000e+00
+1902 2185 0.00000000000000e+00
+1902 2031 0.00000000000000e+00
+1902 2174 0.00000000000000e+00
+1902 2177 0.00000000000000e+00
+1902 2173 0.00000000000000e+00
+1902 2176 0.00000000000000e+00
+1902 2172 0.00000000000000e+00
+1902 2180 0.00000000000000e+00
+1902 1986 0.00000000000000e+00
+1903 1903 1.00000000000000e+00
+1903 2178 0.00000000000000e+00
+1903 2031 0.00000000000000e+00
+1903 2171 0.00000000000000e+00
+1903 2170 0.00000000000000e+00
+1903 2169 0.00000000000000e+00
+1903 1902 0.00000000000000e+00
+1903 1986 0.00000000000000e+00
+1903 2186 0.00000000000000e+00
+1903 2177 0.00000000000000e+00
+1903 2183 0.00000000000000e+00
+1903 2033 0.00000000000000e+00
+1903 2032 0.00000000000000e+00
+1903 2181 0.00000000000000e+00
+1903 2184 0.00000000000000e+00
+1903 2174 0.00000000000000e+00
+1903 1904 0.00000000000000e+00
+1903 1988 0.00000000000000e+00
+1903 2173 0.00000000000000e+00
+1903 2180 0.00000000000000e+00
+1903 1987 0.00000000000000e+00
+1903 2172 0.00000000000000e+00
+1903 2175 0.00000000000000e+00
+1904 1904 1.00000000000000e+00
+1904 2179 0.00000000000000e+00
+1904 2171 0.00000000000000e+00
+1904 2170 0.00000000000000e+00
+1904 2169 0.00000000000000e+00
+1904 2184 0.00000000000000e+00
+1904 2181 0.00000000000000e+00
+1904 2185 0.00000000000000e+00
+1904 2176 0.00000000000000e+00
+1904 2033 0.00000000000000e+00
+1904 2182 0.00000000000000e+00
+1904 2032 0.00000000000000e+00
+1904 2174 0.00000000000000e+00
+1904 2178 0.00000000000000e+00
+1904 1988 0.00000000000000e+00
+1904 2173 0.00000000000000e+00
+1904 1903 0.00000000000000e+00
+1904 1987 0.00000000000000e+00
+1904 2172 0.00000000000000e+00
+1904 2175 0.00000000000000e+00
+1905 1905 6.25000000000000e+01
+1905 2200 4.16666666666667e+00
+1905 2201 4.16666666666667e+00
+1905 2197 4.16666666666667e+00
+1905 2196 -6.25000000000000e+00
+1905 1907 -8.33333333333333e+00
+1905 2171 4.16666666666667e+00
+1905 2170 4.16666666666667e+00
+1905 2169 -1.87500000000000e+01
+1905 2188 -4.16666666666667e+00
+1905 1906 -8.33333333333333e+00
+1905 2192 4.16666666666667e+00
+1905 2203 -4.16666666666667e+00
+1905 2194 4.16666666666667e+00
+1905 2189 8.33333333333333e+00
+1905 2195 -8.33333333333333e+00
+1905 2045 2.08333333333333e+00
+1905 2204 -4.16666666666667e+00
+1905 2191 4.16666666666667e+00
+1905 2044 -4.16666666666667e+00
+1905 2190 -1.87500000000000e+01
+1905 2153 -2.08333333333333e+00
+1905 1991 2.08333333333333e+00
+1905 2152 4.16666666666667e+00
+1905 1990 -4.16666666666667e+00
+1905 2151 -6.25000000000000e+00
+1905 2198 -2.08333333333333e+00
+1905 2187 -1.25000000000000e+01
+1906 1906 6.25000000000000e+01
+1906 2199 4.16666666666667e+00
+1906 2201 -8.33333333333333e+00
+1906 2045 2.08333333333333e+00
+1906 2197 -1.87500000000000e+01
+1906 2196 4.16666666666667e+00
+1906 2171 -2.08333333333333e+00
+1906 1991 2.08333333333333e+00
+1906 2170 -6.25000000000000e+00
+1906 2169 4.16666666666667e+00
+1906 2187 -4.16666666666667e+00
+1906 2192 -2.08333333333333e+00
+1906 1905 -8.33333333333333e+00
+1906 2202 -4.16666666666667e+00
+1906 2193 4.16666666666667e+00
+1906 2204 -4.16666666666667e+00
+1906 2195 4.16666666666667e+00
+1906 2191 -6.25000000000000e+00
+1906 2190 4.16666666666667e+00
+1906 2043 -4.16666666666667e+00
+1906 2153 4.16666666666667e+00
+1906 1907 -8.33333333333333e+00
+1906 2189 8.33333333333333e+00
+1906 2152 -1.87500000000000e+01
+1906 2198 4.16666666666667e+00
+1906 2188 -1.25000000000000e+01
+1906 2151 4.16666666666667e+00
+1906 1989 -4.16666666666667e+00
+1907 1907 6.25000000000000e+01
+1907 2197 4.16666666666667e+00
+1907 2200 -8.33333333333333e+00
+1907 2199 4.16666666666667e+00
+1907 2198 -6.25000000000000e+00
+1907 2044 2.08333333333333e+00
+1907 2171 -6.25000000000000e+00
+1907 2170 -2.08333333333333e+00
+1907 1990 2.08333333333333e+00
+1907 1905 -8.33333333333333e+00
+1907 2169 4.16666666666667e+00
+1907 2191 -2.08333333333333e+00
+1907 2190 4.16666666666667e+00
+1907 2203 -4.16666666666667e+00
+1907 2194 4.16666666666667e+00
+1907 2187 8.33333333333333e+00
+1907 2193 -8.33333333333333e+00
+1907 2192 -6.25000000000000e+00
+1907 2043 2.08333333333333e+00
+1907 2202 -4.16666666666667e+00
+1907 2153 -6.25000000000000e+00
+1907 2196 -2.08333333333333e+00
+1907 2189 -3.75000000000000e+01
+1907 2152 4.16666666666667e+00
+1907 1906 -8.33333333333333e+00
+1907 2188 8.33333333333333e+00
+1907 2151 -2.08333333333333e+00
+1907 1989 2.08333333333333e+00
+1908 1908 1.00000000000000e+00
+1908 2219 0.00000000000000e+00
+1908 2210 0.00000000000000e+00
+1908 2209 0.00000000000000e+00
+1908 2208 0.00000000000000e+00
+1908 2213 0.00000000000000e+00
+1908 2222 0.00000000000000e+00
+1908 2215 0.00000000000000e+00
+1908 2221 0.00000000000000e+00
+1908 2069 0.00000000000000e+00
+1908 2216 0.00000000000000e+00
+1908 2067 0.00000000000000e+00
+1908 1910 0.00000000000000e+00
+1908 2207 0.00000000000000e+00
+1908 1994 0.00000000000000e+00
+1908 2206 0.00000000000000e+00
+1908 2212 0.00000000000000e+00
+1908 2218 0.00000000000000e+00
+1908 2205 0.00000000000000e+00
+1908 1992 0.00000000000000e+00
+1909 1909 1.00000000000000e+00
+1909 2219 0.00000000000000e+00
+1909 2069 0.00000000000000e+00
+1909 2210 0.00000000000000e+00
+1909 1910 0.00000000000000e+00
+1909 1994 0.00000000000000e+00
+1909 2209 0.00000000000000e+00
+1909 2208 0.00000000000000e+00
+1909 2214 0.00000000000000e+00
+1909 2220 0.00000000000000e+00
+1909 2216 0.00000000000000e+00
+1909 2222 0.00000000000000e+00
+1909 2068 0.00000000000000e+00
+1909 2207 0.00000000000000e+00
+1909 2213 0.00000000000000e+00
+1909 2217 0.00000000000000e+00
+1909 2206 0.00000000000000e+00
+1909 1993 0.00000000000000e+00
+1909 2205 0.00000000000000e+00
+1909 2211 0.00000000000000e+00
+1910 1910 1.00000000000000e+00
+1910 2068 0.00000000000000e+00
+1910 2217 0.00000000000000e+00
+1910 2210 0.00000000000000e+00
+1910 2209 0.00000000000000e+00
+1910 1909 0.00000000000000e+00
+1910 1993 0.00000000000000e+00
+1910 2208 0.00000000000000e+00
+1910 2211 0.00000000000000e+00
+1910 2220 0.00000000000000e+00
+1910 2069 0.00000000000000e+00
+1910 2215 0.00000000000000e+00
+1910 2221 0.00000000000000e+00
+1910 2067 0.00000000000000e+00
+1910 2214 0.00000000000000e+00
+1910 2218 0.00000000000000e+00
+1910 2207 0.00000000000000e+00
+1910 1994 0.00000000000000e+00
+1910 2206 0.00000000000000e+00
+1910 2212 0.00000000000000e+00
+1910 1908 0.00000000000000e+00
+1910 2205 0.00000000000000e+00
+1910 1992 0.00000000000000e+00
+1911 1911 6.25000000000000e+01
+1911 2231 4.16666666666667e+00
+1911 2230 -8.33333333333333e+00
+1911 2228 4.16666666666667e+00
+1911 2080 2.08333333333333e+00
+1911 2226 -1.87500000000000e+01
+1911 2156 4.16666666666667e+00
+1911 2155 -2.08333333333333e+00
+1911 1996 2.08333333333333e+00
+1911 2154 -6.25000000000000e+00
+1911 2225 -4.16666666666667e+00
+1911 1913 -8.33333333333333e+00
+1911 2233 -2.08333333333333e+00
+1911 2240 -4.16666666666667e+00
+1911 2237 4.16666666666667e+00
+1911 2239 -4.16666666666667e+00
+1911 2236 4.16666666666667e+00
+1911 2234 4.16666666666667e+00
+1911 2081 -4.16666666666667e+00
+1911 2232 -6.25000000000000e+00
+1911 2207 4.16666666666667e+00
+1911 1997 -4.16666666666667e+00
+1911 2206 4.16666666666667e+00
+1911 1912 -8.33333333333333e+00
+1911 2224 8.33333333333333e+00
+1911 2205 -1.87500000000000e+01
+1911 2227 4.16666666666667e+00
+1911 2223 -1.25000000000000e+01
+1912 1912 6.25000000000000e+01
+1912 2231 4.16666666666667e+00
+1912 2226 4.16666666666667e+00
+1912 2229 -8.33333333333333e+00
+1912 2227 -6.25000000000000e+00
+1912 2079 2.08333333333333e+00
+1912 2156 4.16666666666667e+00
+1912 1913 -8.33333333333333e+00
+1912 2155 -6.25000000000000e+00
+1912 2154 -2.08333333333333e+00
+1912 1995 2.08333333333333e+00
+1912 2232 -2.08333333333333e+00
+1912 2234 4.16666666666667e+00
+1912 2225 8.33333333333333e+00
+1912 2237 -8.33333333333333e+00
+1912 2238 -4.16666666666667e+00
+1912 2235 4.16666666666667e+00
+1912 2081 2.08333333333333e+00
+1912 2240 -4.16666666666667e+00
+1912 2233 -6.25000000000000e+00
+1912 2207 -2.08333333333333e+00
+1912 1997 2.08333333333333e+00
+1912 2206 -6.25000000000000e+00
+1912 2228 -2.08333333333333e+00
+1912 2224 -3.75000000000000e+01
+1912 2205 4.16666666666667e+00
+1912 1911 -8.33333333333333e+00
+1912 2223 8.33333333333333e+00
+1913 1913 6.25000000000000e+01
+1913 2230 4.16666666666667e+00
+1913 2229 4.16666666666667e+00
+1913 2228 -6.25000000000000e+00
+1913 2226 4.16666666666667e+00
+1913 2156 -1.87500000000000e+01
+1913 2155 4.16666666666667e+00
+1913 1912 -8.33333333333333e+00
+1913 2154 4.16666666666667e+00
+1913 2223 -4.16666666666667e+00
+1913 1911 -8.33333333333333e+00
+1913 2233 4.16666666666667e+00
+1913 2238 -4.16666666666667e+00
+1913 2235 4.16666666666667e+00
+1913 2224 8.33333333333333e+00
+1913 2236 -8.33333333333333e+00
+1913 2234 -1.87500000000000e+01
+1913 2080 2.08333333333333e+00
+1913 2239 -4.16666666666667e+00
+1913 2232 4.16666666666667e+00
+1913 2079 -4.16666666666667e+00
+1913 2207 -6.25000000000000e+00
+1913 2227 -2.08333333333333e+00
+1913 2225 -1.25000000000000e+01
+1913 2206 -2.08333333333333e+00
+1913 1996 2.08333333333333e+00
+1913 2205 4.16666666666667e+00
+1913 1995 -4.16666666666667e+00
+1914 1914 1.00000000000000e+00
+1914 2246 0.00000000000000e+00
+1914 2245 0.00000000000000e+00
+1914 2248 0.00000000000000e+00
+1914 2104 0.00000000000000e+00
+1914 2244 0.00000000000000e+00
+1914 1916 0.00000000000000e+00
+1914 2174 0.00000000000000e+00
+1914 2173 0.00000000000000e+00
+1914 1999 0.00000000000000e+00
+1914 2172 0.00000000000000e+00
+1914 2251 0.00000000000000e+00
+1914 2252 0.00000000000000e+00
+1914 2243 0.00000000000000e+00
+1914 2255 0.00000000000000e+00
+1914 2257 0.00000000000000e+00
+1914 2254 0.00000000000000e+00
+1914 2105 0.00000000000000e+00
+1914 2258 0.00000000000000e+00
+1914 2250 0.00000000000000e+00
+1914 2210 0.00000000000000e+00
+1914 2000 0.00000000000000e+00
+1914 1915 0.00000000000000e+00
+1914 2209 0.00000000000000e+00
+1914 2242 0.00000000000000e+00
+1914 2249 0.00000000000000e+00
+1914 2208 0.00000000000000e+00
+1914 2241 0.00000000000000e+00
+1915 1915 1.00000000000000e+00
+1915 2249 0.00000000000000e+00
+1915 2247 0.00000000000000e+00
+1915 2246 0.00000000000000e+00
+1915 2245 0.00000000000000e+00
+1915 2103 0.00000000000000e+00
+1915 2174 0.00000000000000e+00
+1915 2173 0.00000000000000e+00
+1915 2172 0.00000000000000e+00
+1915 1998 0.00000000000000e+00
+1915 2243 0.00000000000000e+00
+1915 1916 0.00000000000000e+00
+1915 2250 0.00000000000000e+00
+1915 2258 0.00000000000000e+00
+1915 2255 0.00000000000000e+00
+1915 2256 0.00000000000000e+00
+1915 2253 0.00000000000000e+00
+1915 2105 0.00000000000000e+00
+1915 2252 0.00000000000000e+00
+1915 2251 0.00000000000000e+00
+1915 2210 0.00000000000000e+00
+1915 2000 0.00000000000000e+00
+1915 2244 0.00000000000000e+00
+1915 2209 0.00000000000000e+00
+1915 2242 0.00000000000000e+00
+1915 1914 0.00000000000000e+00
+1915 2208 0.00000000000000e+00
+1915 2241 0.00000000000000e+00
+1916 1916 1.00000000000000e+00
+1916 2244 0.00000000000000e+00
+1916 2248 0.00000000000000e+00
+1916 2246 0.00000000000000e+00
+1916 2245 0.00000000000000e+00
+1916 2174 0.00000000000000e+00
+1916 2173 0.00000000000000e+00
+1916 1914 0.00000000000000e+00
+1916 2172 0.00000000000000e+00
+1916 2242 0.00000000000000e+00
+1916 1915 0.00000000000000e+00
+1916 2257 0.00000000000000e+00
+1916 2254 0.00000000000000e+00
+1916 2250 0.00000000000000e+00
+1916 2241 0.00000000000000e+00
+1916 2253 0.00000000000000e+00
+1916 2252 0.00000000000000e+00
+1916 2104 0.00000000000000e+00
+1916 2251 0.00000000000000e+00
+1916 2103 0.00000000000000e+00
+1916 2256 0.00000000000000e+00
+1916 2247 0.00000000000000e+00
+1916 2210 0.00000000000000e+00
+1916 2243 0.00000000000000e+00
+1916 2209 0.00000000000000e+00
+1916 1999 0.00000000000000e+00
+1916 2208 0.00000000000000e+00
+1916 1998 0.00000000000000e+00
+1917 1917 1.25000000000000e+02
+1917 2263 8.33333333333333e+00
+1917 2262 -1.25000000000000e+01
+1917 2177 -8.33333333333333e+00
+1917 2176 4.16666666666667e+00
+1917 2243 8.33333333333333e+00
+1917 2275 4.16666666666667e+00
+1917 2242 8.33333333333333e+00
+1917 2241 -3.75000000000000e+01
+1917 2276 4.16666666666667e+00
+1917 2188 -4.16666666666667e+00
+1917 2189 8.33333333333333e+00
+1917 1919 -1.66666666666667e+01
+1917 2003 -4.16666666666667e+00
+1917 2187 -1.25000000000000e+01
+1917 2267 4.16666666666667e+00
+1917 2117 -4.16666666666667e+00
+1917 2266 -8.33333333333333e+00
+1917 2159 4.16666666666667e+00
+1917 2260 8.33333333333333e+00
+1917 1918 -1.66666666666667e+01
+1917 2261 8.33333333333333e+00
+1917 2116 -4.16666666666667e+00
+1917 2259 -3.75000000000000e+01
+1917 2158 4.16666666666667e+00
+1917 2002 -4.16666666666667e+00
+1917 2225 -4.16666666666667e+00
+1917 2213 4.16666666666667e+00
+1917 2272 4.16666666666667e+00
+1917 2269 -4.16666666666667e+00
+1917 2212 -8.33333333333333e+00
+1917 2224 8.33333333333333e+00
+1917 2223 -1.25000000000000e+01
+1917 2270 8.33333333333333e+00
+1917 2273 -8.33333333333333e+00
+1917 2268 -1.25000000000000e+01
+1917 2264 -4.16666666666667e+00
+1918 1918 1.25000000000000e+02
+1918 2262 8.33333333333333e+00
+1918 2264 8.33333333333333e+00
+1918 2263 -3.75000000000000e+01
+1918 2175 4.16666666666667e+00
+1918 2243 -4.16666666666667e+00
+1918 2274 4.16666666666667e+00
+1918 2242 -1.25000000000000e+01
+1918 2241 8.33333333333333e+00
+1918 2276 -8.33333333333333e+00
+1918 2187 -4.16666666666667e+00
+1918 2267 4.16666666666667e+00
+1918 2189 8.33333333333333e+00
+1918 2188 -1.25000000000000e+01
+1918 2265 -8.33333333333333e+00
+1918 2261 -4.16666666666667e+00
+1918 2259 8.33333333333333e+00
+1918 1917 -1.66666666666667e+01
+1918 2260 -1.25000000000000e+01
+1918 2115 -4.16666666666667e+00
+1918 2159 -8.33333333333333e+00
+1918 2157 4.16666666666667e+00
+1918 2001 -4.16666666666667e+00
+1918 2225 8.33333333333333e+00
+1918 1919 -1.66666666666667e+01
+1918 2270 8.33333333333333e+00
+1918 2271 4.16666666666667e+00
+1918 2268 -4.16666666666667e+00
+1918 2213 4.16666666666667e+00
+1918 2003 -4.16666666666667e+00
+1918 2224 -3.75000000000000e+01
+1918 2211 -8.33333333333333e+00
+1918 2223 8.33333333333333e+00
+1918 2273 4.16666666666667e+00
+1918 2117 -4.16666666666667e+00
+1918 2269 -1.25000000000000e+01
+1918 2177 4.16666666666667e+00
+1919 1919 1.25000000000000e+02
+1919 2176 4.16666666666667e+00
+1919 2264 -1.25000000000000e+01
+1919 2263 8.33333333333333e+00
+1919 2175 -8.33333333333333e+00
+1919 2242 -4.16666666666667e+00
+1919 2241 8.33333333333333e+00
+1919 2243 -1.25000000000000e+01
+1919 2275 -8.33333333333333e+00
+1919 2274 4.16666666666667e+00
+1919 2266 4.16666666666667e+00
+1919 2187 8.33333333333333e+00
+1919 1917 -1.66666666666667e+01
+1919 2189 -3.75000000000000e+01
+1919 2188 8.33333333333333e+00
+1919 2001 -4.16666666666667e+00
+1919 2265 4.16666666666667e+00
+1919 2115 -4.16666666666667e+00
+1919 2260 -4.16666666666667e+00
+1919 2157 4.16666666666667e+00
+1919 2261 -1.25000000000000e+01
+1919 2259 8.33333333333333e+00
+1919 2158 -8.33333333333333e+00
+1919 2223 -4.16666666666667e+00
+1919 2211 4.16666666666667e+00
+1919 2224 8.33333333333333e+00
+1919 1918 -1.66666666666667e+01
+1919 2269 8.33333333333333e+00
+1919 2225 -1.25000000000000e+01
+1919 2212 4.16666666666667e+00
+1919 2002 -4.16666666666667e+00
+1919 2270 -3.75000000000000e+01
+1919 2262 -4.16666666666667e+00
+1919 2272 4.16666666666667e+00
+1919 2116 -4.16666666666667e+00
+1919 2268 8.33333333333333e+00
+1919 2271 -8.33333333333333e+00
+1920 1920 3.75000000000000e+01
+1920 2029 2.08333333333333e+00
+1920 2287 -4.16666666666667e+00
+1920 2279 -2.08333333333333e+00
+1920 1921 -4.16666666666667e+00
+1920 2278 4.16666666666667e+00
+1920 2008 2.08333333333333e+00
+1920 2277 -6.25000000000000e+00
+1920 2294 -4.16666666666667e+00
+1920 2285 4.16666666666667e+00
+1920 2030 2.08333333333333e+00
+1920 2291 -4.16666666666667e+00
+1920 2290 2.08333333333333e+00
+1920 2293 -4.16666666666667e+00
+1920 2028 -1.25000000000000e+01
+1920 1922 -4.16666666666667e+00
+1920 2282 4.16666666666667e+00
+1920 2009 2.08333333333333e+00
+1920 2281 -2.08333333333333e+00
+1920 2284 4.16666666666667e+00
+1920 2288 2.08333333333333e+00
+1920 2280 -6.25000000000000e+00
+1920 2007 -1.25000000000000e+01
+1921 1921 3.33333333333333e+01
+1921 2028 2.08333333333333e+00
+1921 2286 -4.16666666666667e+00
+1921 2279 4.16666666666667e+00
+1921 2278 -1.87500000000000e+01
+1921 1920 -4.16666666666667e+00
+1921 2277 4.16666666666667e+00
+1921 2007 2.08333333333333e+00
+1921 2291 2.08333333333333e+00
+1921 2294 -4.16666666666667e+00
+1921 2029 -4.16666666666667e+00
+1921 2289 2.08333333333333e+00
+1921 2292 -4.16666666666667e+00
+1921 2282 4.16666666666667e+00
+1921 2285 -8.33333333333333e+00
+1921 2288 2.08333333333333e+00
+1921 2281 -6.25000000000000e+00
+1921 2008 -4.16666666666667e+00
+1921 2280 -2.08333333333333e+00
+1921 2283 4.16666666666667e+00
+1922 1922 3.33333333333333e+01
+1922 2286 2.08333333333333e+00
+1922 2279 -6.25000000000000e+00
+1922 2278 4.16666666666667e+00
+1922 2277 -2.08333333333333e+00
+1922 2290 2.08333333333333e+00
+1922 2293 -4.16666666666667e+00
+1922 2292 -4.16666666666667e+00
+1922 2283 4.16666666666667e+00
+1922 2030 -4.16666666666667e+00
+1922 2028 2.08333333333333e+00
+1922 2289 -4.16666666666667e+00
+1922 2287 2.08333333333333e+00
+1922 2282 -1.87500000000000e+01
+1922 2009 -4.16666666666667e+00
+1922 2281 4.16666666666667e+00
+1922 2284 -8.33333333333333e+00
+1922 1920 -4.16666666666667e+00
+1922 2280 4.16666666666667e+00
+1922 2007 2.08333333333333e+00
+1923 1923 6.25000000000000e+01
+1923 2305 -4.16666666666667e+00
+1923 2297 4.16666666666667e+00
+1923 2296 4.16666666666667e+00
+1923 2295 -1.87500000000000e+01
+1923 2312 -4.16666666666667e+00
+1923 2311 -4.16666666666667e+00
+1923 2303 -8.33333333333333e+00
+1923 2302 4.16666666666667e+00
+1923 2192 4.16666666666667e+00
+1923 1925 -8.33333333333333e+00
+1923 2300 8.33333333333333e+00
+1923 2308 4.16666666666667e+00
+1923 2299 -4.16666666666667e+00
+1923 2012 -2.08333333333333e+00
+1923 2162 2.08333333333333e+00
+1923 2011 4.16666666666667e+00
+1923 2161 -4.16666666666667e+00
+1923 2010 -6.25000000000000e+00
+1923 2298 -1.25000000000000e+01
+1923 2048 -2.08333333333333e+00
+1923 2309 4.16666666666667e+00
+1923 1924 -8.33333333333333e+00
+1923 2047 4.16666666666667e+00
+1923 2191 4.16666666666667e+00
+1923 2306 2.08333333333333e+00
+1923 2046 -6.25000000000000e+00
+1923 2190 -1.87500000000000e+01
+1924 1924 6.25000000000000e+01
+1924 2304 -4.16666666666667e+00
+1924 2297 -2.08333333333333e+00
+1924 2296 -6.25000000000000e+00
+1924 2295 4.16666666666667e+00
+1924 2312 -4.16666666666667e+00
+1924 2303 4.16666666666667e+00
+1924 2310 -4.16666666666667e+00
+1924 2301 4.16666666666667e+00
+1924 2192 -2.08333333333333e+00
+1924 2162 2.08333333333333e+00
+1924 2307 4.16666666666667e+00
+1924 2298 -4.16666666666667e+00
+1924 2012 4.16666666666667e+00
+1924 1925 -8.33333333333333e+00
+1924 2300 8.33333333333333e+00
+1924 2011 -1.87500000000000e+01
+1924 2299 -1.25000000000000e+01
+1924 2010 4.16666666666667e+00
+1924 2160 -4.16666666666667e+00
+1924 2048 4.16666666666667e+00
+1924 2309 -8.33333333333333e+00
+1924 2306 2.08333333333333e+00
+1924 2047 -1.87500000000000e+01
+1924 2191 -6.25000000000000e+00
+1924 1923 -8.33333333333333e+00
+1924 2046 4.16666666666667e+00
+1924 2190 4.16666666666667e+00
+1925 1925 6.25000000000000e+01
+1925 2305 2.08333333333333e+00
+1925 2297 -6.25000000000000e+00
+1925 2296 -2.08333333333333e+00
+1925 2295 4.16666666666667e+00
+1925 2310 -4.16666666666667e+00
+1925 2311 -4.16666666666667e+00
+1925 2302 4.16666666666667e+00
+1925 2301 -8.33333333333333e+00
+1925 2191 -2.08333333333333e+00
+1925 2161 2.08333333333333e+00
+1925 2190 4.16666666666667e+00
+1925 1923 -8.33333333333333e+00
+1925 2298 8.33333333333333e+00
+1925 2012 -6.25000000000000e+00
+1925 2300 -3.75000000000000e+01
+1925 2011 4.16666666666667e+00
+1925 1924 -8.33333333333333e+00
+1925 2299 8.33333333333333e+00
+1925 2010 -2.08333333333333e+00
+1925 2160 2.08333333333333e+00
+1925 2304 2.08333333333333e+00
+1925 2048 -6.25000000000000e+00
+1925 2192 -6.25000000000000e+00
+1925 2047 4.16666666666667e+00
+1925 2308 -8.33333333333333e+00
+1925 2046 -2.08333333333333e+00
+1925 2307 4.16666666666667e+00
+1926 1926 6.25000000000000e+01
+1926 2326 4.16666666666667e+00
+1926 2327 4.16666666666667e+00
+1926 2323 4.16666666666667e+00
+1926 2322 -6.25000000000000e+00
+1926 1928 -8.33333333333333e+00
+1926 2297 4.16666666666667e+00
+1926 2296 4.16666666666667e+00
+1926 2295 -1.87500000000000e+01
+1926 2314 -4.16666666666667e+00
+1926 1927 -8.33333333333333e+00
+1926 2318 4.16666666666667e+00
+1926 2329 -4.16666666666667e+00
+1926 2320 4.16666666666667e+00
+1926 2315 8.33333333333333e+00
+1926 2321 -8.33333333333333e+00
+1926 2063 2.08333333333333e+00
+1926 2330 -4.16666666666667e+00
+1926 2317 4.16666666666667e+00
+1926 2062 -4.16666666666667e+00
+1926 2316 -1.87500000000000e+01
+1926 2279 -2.08333333333333e+00
+1926 2015 2.08333333333333e+00
+1926 2278 4.16666666666667e+00
+1926 2014 -4.16666666666667e+00
+1926 2277 -6.25000000000000e+00
+1926 2324 -2.08333333333333e+00
+1926 2313 -1.25000000000000e+01
+1927 1927 6.25000000000000e+01
+1927 2325 4.16666666666667e+00
+1927 2327 -8.33333333333333e+00
+1927 2063 2.08333333333333e+00
+1927 2323 -1.87500000000000e+01
+1927 2322 4.16666666666667e+00
+1927 2297 -2.08333333333333e+00
+1927 2015 2.08333333333333e+00
+1927 2296 -6.25000000000000e+00
+1927 2295 4.16666666666667e+00
+1927 2313 -4.16666666666667e+00
+1927 2318 -2.08333333333333e+00
+1927 1926 -8.33333333333333e+00
+1927 2328 -4.16666666666667e+00
+1927 2319 4.16666666666667e+00
+1927 2330 -4.16666666666667e+00
+1927 2321 4.16666666666667e+00
+1927 2317 -6.25000000000000e+00
+1927 2316 4.16666666666667e+00
+1927 2061 -4.16666666666667e+00
+1927 2279 4.16666666666667e+00
+1927 1928 -8.33333333333333e+00
+1927 2315 8.33333333333333e+00
+1927 2278 -1.87500000000000e+01
+1927 2324 4.16666666666667e+00
+1927 2314 -1.25000000000000e+01
+1927 2277 4.16666666666667e+00
+1927 2013 -4.16666666666667e+00
+1928 1928 6.25000000000000e+01
+1928 2323 4.16666666666667e+00
+1928 2326 -8.33333333333333e+00
+1928 2325 4.16666666666667e+00
+1928 2324 -6.25000000000000e+00
+1928 2062 2.08333333333333e+00
+1928 2297 -6.25000000000000e+00
+1928 2296 -2.08333333333333e+00
+1928 2014 2.08333333333333e+00
+1928 1926 -8.33333333333333e+00
+1928 2295 4.16666666666667e+00
+1928 2317 -2.08333333333333e+00
+1928 2316 4.16666666666667e+00
+1928 2329 -4.16666666666667e+00
+1928 2320 4.16666666666667e+00
+1928 2313 8.33333333333333e+00
+1928 2319 -8.33333333333333e+00
+1928 2318 -6.25000000000000e+00
+1928 2061 2.08333333333333e+00
+1928 2328 -4.16666666666667e+00
+1928 2279 -6.25000000000000e+00
+1928 2322 -2.08333333333333e+00
+1928 2315 -3.75000000000000e+01
+1928 2278 4.16666666666667e+00
+1928 1927 -8.33333333333333e+00
+1928 2314 8.33333333333333e+00
+1928 2277 -2.08333333333333e+00
+1928 2013 2.08333333333333e+00
+1929 1929 6.25000000000000e+01
+1929 2348 -4.16666666666667e+00
+1929 2341 2.08333333333333e+00
+1929 2347 -4.16666666666667e+00
+1929 2342 -4.16666666666667e+00
+1929 2333 4.16666666666667e+00
+1929 2332 4.16666666666667e+00
+1929 2338 -8.33333333333333e+00
+1929 2331 -1.87500000000000e+01
+1929 2345 4.16666666666667e+00
+1929 2336 -4.16666666666667e+00
+1929 1930 -8.33333333333333e+00
+1929 2335 8.33333333333333e+00
+1929 2227 4.16666666666667e+00
+1929 2018 4.16666666666667e+00
+1929 2165 -4.16666666666667e+00
+1929 2017 -2.08333333333333e+00
+1929 2164 2.08333333333333e+00
+1929 2016 -6.25000000000000e+00
+1929 2334 -1.25000000000000e+01
+1929 1931 -8.33333333333333e+00
+1929 2084 4.16666666666667e+00
+1929 2228 4.16666666666667e+00
+1929 2083 -2.08333333333333e+00
+1929 2344 4.16666666666667e+00
+1929 2339 4.16666666666667e+00
+1929 2082 -6.25000000000000e+00
+1929 2226 -1.87500000000000e+01
+1930 1930 6.25000000000000e+01
+1930 2346 -4.16666666666667e+00
+1930 2342 2.08333333333333e+00
+1930 2348 -4.16666666666667e+00
+1930 2333 -2.08333333333333e+00
+1930 2339 4.16666666666667e+00
+1930 2332 -6.25000000000000e+00
+1930 2331 4.16666666666667e+00
+1930 2337 -8.33333333333333e+00
+1930 2165 2.08333333333333e+00
+1930 2228 -2.08333333333333e+00
+1930 1929 -8.33333333333333e+00
+1930 2334 8.33333333333333e+00
+1930 2226 4.16666666666667e+00
+1930 2018 4.16666666666667e+00
+1930 1931 -8.33333333333333e+00
+1930 2336 8.33333333333333e+00
+1930 2017 -6.25000000000000e+00
+1930 2335 -3.75000000000000e+01
+1930 2016 -2.08333333333333e+00
+1930 2163 2.08333333333333e+00
+1930 2084 4.16666666666667e+00
+1930 2345 -8.33333333333333e+00
+1930 2340 2.08333333333333e+00
+1930 2083 -6.25000000000000e+00
+1930 2227 -6.25000000000000e+00
+1930 2082 -2.08333333333333e+00
+1930 2343 4.16666666666667e+00
+1931 1931 6.25000000000000e+01
+1931 2346 -4.16666666666667e+00
+1931 2341 2.08333333333333e+00
+1931 2347 -4.16666666666667e+00
+1931 2340 -4.16666666666667e+00
+1931 2333 -6.25000000000000e+00
+1931 2332 -2.08333333333333e+00
+1931 2338 4.16666666666667e+00
+1931 2331 4.16666666666667e+00
+1931 2343 4.16666666666667e+00
+1931 2334 -4.16666666666667e+00
+1931 2164 2.08333333333333e+00
+1931 2227 -2.08333333333333e+00
+1931 2018 -1.87500000000000e+01
+1931 2336 -1.25000000000000e+01
+1931 2017 4.16666666666667e+00
+1931 1930 -8.33333333333333e+00
+1931 2335 8.33333333333333e+00
+1931 2016 4.16666666666667e+00
+1931 2163 -4.16666666666667e+00
+1931 2337 4.16666666666667e+00
+1931 2084 -1.87500000000000e+01
+1931 2228 -6.25000000000000e+00
+1931 2083 4.16666666666667e+00
+1931 2344 -8.33333333333333e+00
+1931 1929 -8.33333333333333e+00
+1931 2082 4.16666666666667e+00
+1931 2226 4.16666666666667e+00
+1932 1932 6.25000000000000e+01
+1932 2357 4.16666666666667e+00
+1932 2356 -8.33333333333333e+00
+1932 2354 4.16666666666667e+00
+1932 2098 2.08333333333333e+00
+1932 2352 -1.87500000000000e+01
+1932 2282 4.16666666666667e+00
+1932 2281 -2.08333333333333e+00
+1932 2020 2.08333333333333e+00
+1932 2280 -6.25000000000000e+00
+1932 2351 -4.16666666666667e+00
+1932 1934 -8.33333333333333e+00
+1932 2359 -2.08333333333333e+00
+1932 2366 -4.16666666666667e+00
+1932 2363 4.16666666666667e+00
+1932 2365 -4.16666666666667e+00
+1932 2362 4.16666666666667e+00
+1932 2360 4.16666666666667e+00
+1932 2099 -4.16666666666667e+00
+1932 2358 -6.25000000000000e+00
+1932 2333 4.16666666666667e+00
+1932 2021 -4.16666666666667e+00
+1932 2332 4.16666666666667e+00
+1932 1933 -8.33333333333333e+00
+1932 2350 8.33333333333333e+00
+1932 2331 -1.87500000000000e+01
+1932 2353 4.16666666666667e+00
+1932 2349 -1.25000000000000e+01
+1933 1933 6.25000000000000e+01
+1933 2357 4.16666666666667e+00
+1933 2352 4.16666666666667e+00
+1933 2355 -8.33333333333333e+00
+1933 2353 -6.25000000000000e+00
+1933 2097 2.08333333333333e+00
+1933 2282 4.16666666666667e+00
+1933 1934 -8.33333333333333e+00
+1933 2281 -6.25000000000000e+00
+1933 2280 -2.08333333333333e+00
+1933 2019 2.08333333333333e+00
+1933 2358 -2.08333333333333e+00
+1933 2360 4.16666666666667e+00
+1933 2351 8.33333333333333e+00
+1933 2363 -8.33333333333333e+00
+1933 2364 -4.16666666666667e+00
+1933 2361 4.16666666666667e+00
+1933 2099 2.08333333333333e+00
+1933 2366 -4.16666666666667e+00
+1933 2359 -6.25000000000000e+00
+1933 2333 -2.08333333333333e+00
+1933 2021 2.08333333333333e+00
+1933 2332 -6.25000000000000e+00
+1933 2354 -2.08333333333333e+00
+1933 2350 -3.75000000000000e+01
+1933 2331 4.16666666666667e+00
+1933 1932 -8.33333333333333e+00
+1933 2349 8.33333333333333e+00
+1934 1934 6.25000000000000e+01
+1934 2356 4.16666666666667e+00
+1934 2355 4.16666666666667e+00
+1934 2354 -6.25000000000000e+00
+1934 2352 4.16666666666667e+00
+1934 2282 -1.87500000000000e+01
+1934 2281 4.16666666666667e+00
+1934 1933 -8.33333333333333e+00
+1934 2280 4.16666666666667e+00
+1934 2349 -4.16666666666667e+00
+1934 1932 -8.33333333333333e+00
+1934 2359 4.16666666666667e+00
+1934 2364 -4.16666666666667e+00
+1934 2361 4.16666666666667e+00
+1934 2350 8.33333333333333e+00
+1934 2362 -8.33333333333333e+00
+1934 2360 -1.87500000000000e+01
+1934 2098 2.08333333333333e+00
+1934 2365 -4.16666666666667e+00
+1934 2358 4.16666666666667e+00
+1934 2097 -4.16666666666667e+00
+1934 2333 -6.25000000000000e+00
+1934 2353 -2.08333333333333e+00
+1934 2351 -1.25000000000000e+01
+1934 2332 -2.08333333333333e+00
+1934 2020 2.08333333333333e+00
+1934 2331 4.16666666666667e+00
+1934 2019 -4.16666666666667e+00
+1935 1935 1.25000000000000e+02
+1935 2374 -8.33333333333333e+00
+1935 2369 8.33333333333333e+00
+1935 2381 -8.33333333333333e+00
+1935 2383 -4.16666666666667e+00
+1935 2380 4.16666666666667e+00
+1935 2384 -4.16666666666667e+00
+1935 2368 8.33333333333333e+00
+1935 2367 -3.75000000000000e+01
+1935 2300 8.33333333333333e+00
+1935 2194 4.16666666666667e+00
+1935 2299 -4.16666666666667e+00
+1935 2195 -8.33333333333333e+00
+1935 2024 4.16666666666667e+00
+1935 2298 -1.25000000000000e+01
+1935 2372 -4.16666666666667e+00
+1935 2120 4.16666666666667e+00
+1935 1936 -1.66666666666667e+01
+1935 2371 8.33333333333333e+00
+1935 2370 -1.25000000000000e+01
+1935 2336 -4.16666666666667e+00
+1935 2335 8.33333333333333e+00
+1935 2168 -4.16666666666667e+00
+1935 2231 4.16666666666667e+00
+1935 2260 8.33333333333333e+00
+1935 2230 -8.33333333333333e+00
+1935 2023 4.16666666666667e+00
+1935 2167 -4.16666666666667e+00
+1935 2334 -1.25000000000000e+01
+1935 1937 -1.66666666666667e+01
+1935 2378 8.33333333333333e+00
+1935 2261 8.33333333333333e+00
+1935 2377 -4.16666666666667e+00
+1935 2119 4.16666666666667e+00
+1935 2375 4.16666666666667e+00
+1935 2376 -1.25000000000000e+01
+1935 2259 -3.75000000000000e+01
+1936 1936 1.25000000000000e+02
+1936 2373 -8.33333333333333e+00
+1936 2369 -4.16666666666667e+00
+1936 2384 -4.16666666666667e+00
+1936 2381 4.16666666666667e+00
+1936 2382 -4.16666666666667e+00
+1936 2379 4.16666666666667e+00
+1936 2368 -1.25000000000000e+01
+1936 2367 8.33333333333333e+00
+1936 2193 4.16666666666667e+00
+1936 2298 -4.16666666666667e+00
+1936 2195 4.16666666666667e+00
+1936 2300 8.33333333333333e+00
+1936 2299 -1.25000000000000e+01
+1936 2372 8.33333333333333e+00
+1936 2371 -3.75000000000000e+01
+1936 1935 -1.66666666666667e+01
+1936 2370 8.33333333333333e+00
+1936 2261 -4.16666666666667e+00
+1936 1937 -1.66666666666667e+01
+1936 2168 -4.16666666666667e+00
+1936 2231 4.16666666666667e+00
+1936 2334 8.33333333333333e+00
+1936 2259 8.33333333333333e+00
+1936 2229 -8.33333333333333e+00
+1936 2024 -8.33333333333333e+00
+1936 2336 8.33333333333333e+00
+1936 2335 -3.75000000000000e+01
+1936 2022 4.16666666666667e+00
+1936 2166 -4.16666666666667e+00
+1936 2378 8.33333333333333e+00
+1936 2120 -8.33333333333333e+00
+1936 2375 4.16666666666667e+00
+1936 2377 -1.25000000000000e+01
+1936 2260 -1.25000000000000e+01
+1936 2376 -4.16666666666667e+00
+1936 2118 4.16666666666667e+00
+1937 1937 1.25000000000000e+02
+1937 2374 4.16666666666667e+00
+1937 2368 -4.16666666666667e+00
+1937 2383 -4.16666666666667e+00
+1937 2380 4.16666666666667e+00
+1937 2367 8.33333333333333e+00
+1937 2379 -8.33333333333333e+00
+1937 2382 -4.16666666666667e+00
+1937 2369 -1.25000000000000e+01
+1937 2298 8.33333333333333e+00
+1937 2194 4.16666666666667e+00
+1937 2193 -8.33333333333333e+00
+1937 2300 -3.75000000000000e+01
+1937 2299 8.33333333333333e+00
+1937 2022 4.16666666666667e+00
+1937 2372 -1.25000000000000e+01
+1937 2371 8.33333333333333e+00
+1937 2370 -4.16666666666667e+00
+1937 2118 4.16666666666667e+00
+1937 2260 -4.16666666666667e+00
+1937 1936 -1.66666666666667e+01
+1937 2334 -4.16666666666667e+00
+1937 2167 -4.16666666666667e+00
+1937 2230 4.16666666666667e+00
+1937 2166 -4.16666666666667e+00
+1937 2229 4.16666666666667e+00
+1937 2336 -1.25000000000000e+01
+1937 2023 -8.33333333333333e+00
+1937 2335 8.33333333333333e+00
+1937 2373 4.16666666666667e+00
+1937 2378 -3.75000000000000e+01
+1937 2261 -1.25000000000000e+01
+1937 2377 8.33333333333333e+00
+1937 2119 -8.33333333333333e+00
+1937 1935 -1.66666666666667e+01
+1937 2376 8.33333333333333e+00
+1937 2259 8.33333333333333e+00
+1938 1938 1.25000000000000e+02
+1938 2389 8.33333333333333e+00
+1938 2388 -1.25000000000000e+01
+1938 2303 -8.33333333333333e+00
+1938 2302 4.16666666666667e+00
+1938 2369 8.33333333333333e+00
+1938 2401 4.16666666666667e+00
+1938 2368 8.33333333333333e+00
+1938 2367 -3.75000000000000e+01
+1938 2402 4.16666666666667e+00
+1938 2314 -4.16666666666667e+00
+1938 2315 8.33333333333333e+00
+1938 1940 -1.66666666666667e+01
+1938 2027 -4.16666666666667e+00
+1938 2313 -1.25000000000000e+01
+1938 2393 4.16666666666667e+00
+1938 2141 -4.16666666666667e+00
+1938 2392 -8.33333333333333e+00
+1938 2285 4.16666666666667e+00
+1938 2386 8.33333333333333e+00
+1938 1939 -1.66666666666667e+01
+1938 2387 8.33333333333333e+00
+1938 2140 -4.16666666666667e+00
+1938 2385 -3.75000000000000e+01
+1938 2284 4.16666666666667e+00
+1938 2026 -4.16666666666667e+00
+1938 2351 -4.16666666666667e+00
+1938 2339 4.16666666666667e+00
+1938 2398 4.16666666666667e+00
+1938 2395 -4.16666666666667e+00
+1938 2338 -8.33333333333333e+00
+1938 2350 8.33333333333333e+00
+1938 2349 -1.25000000000000e+01
+1938 2396 8.33333333333333e+00
+1938 2399 -8.33333333333333e+00
+1938 2394 -1.25000000000000e+01
+1938 2390 -4.16666666666667e+00
+1939 1939 1.25000000000000e+02
+1939 2388 8.33333333333333e+00
+1939 2390 8.33333333333333e+00
+1939 2389 -3.75000000000000e+01
+1939 2301 4.16666666666667e+00
+1939 2369 -4.16666666666667e+00
+1939 2400 4.16666666666667e+00
+1939 2368 -1.25000000000000e+01
+1939 2367 8.33333333333333e+00
+1939 2402 -8.33333333333333e+00
+1939 2313 -4.16666666666667e+00
+1939 2393 4.16666666666667e+00
+1939 2315 8.33333333333333e+00
+1939 2314 -1.25000000000000e+01
+1939 2391 -8.33333333333333e+00
+1939 2387 -4.16666666666667e+00
+1939 2385 8.33333333333333e+00
+1939 1938 -1.66666666666667e+01
+1939 2386 -1.25000000000000e+01
+1939 2139 -4.16666666666667e+00
+1939 2285 -8.33333333333333e+00
+1939 2283 4.16666666666667e+00
+1939 2025 -4.16666666666667e+00
+1939 2351 8.33333333333333e+00
+1939 1940 -1.66666666666667e+01
+1939 2396 8.33333333333333e+00
+1939 2397 4.16666666666667e+00
+1939 2394 -4.16666666666667e+00
+1939 2339 4.16666666666667e+00
+1939 2027 -4.16666666666667e+00
+1939 2350 -3.75000000000000e+01
+1939 2337 -8.33333333333333e+00
+1939 2349 8.33333333333333e+00
+1939 2399 4.16666666666667e+00
+1939 2141 -4.16666666666667e+00
+1939 2395 -1.25000000000000e+01
+1939 2303 4.16666666666667e+00
+1940 1940 1.25000000000000e+02
+1940 2302 4.16666666666667e+00
+1940 2390 -1.25000000000000e+01
+1940 2389 8.33333333333333e+00
+1940 2301 -8.33333333333333e+00
+1940 2368 -4.16666666666667e+00
+1940 2367 8.33333333333333e+00
+1940 2369 -1.25000000000000e+01
+1940 2401 -8.33333333333333e+00
+1940 2400 4.16666666666667e+00
+1940 2392 4.16666666666667e+00
+1940 2313 8.33333333333333e+00
+1940 1938 -1.66666666666667e+01
+1940 2315 -3.75000000000000e+01
+1940 2314 8.33333333333333e+00
+1940 2025 -4.16666666666667e+00
+1940 2391 4.16666666666667e+00
+1940 2139 -4.16666666666667e+00
+1940 2386 -4.16666666666667e+00
+1940 2283 4.16666666666667e+00
+1940 2387 -1.25000000000000e+01
+1940 2385 8.33333333333333e+00
+1940 2284 -8.33333333333333e+00
+1940 2349 -4.16666666666667e+00
+1940 2337 4.16666666666667e+00
+1940 2350 8.33333333333333e+00
+1940 1939 -1.66666666666667e+01
+1940 2395 8.33333333333333e+00
+1940 2351 -1.25000000000000e+01
+1940 2338 4.16666666666667e+00
+1940 2026 -4.16666666666667e+00
+1940 2396 -3.75000000000000e+01
+1940 2388 -4.16666666666667e+00
+1940 2398 4.16666666666667e+00
+1940 2140 -4.16666666666667e+00
+1940 2394 8.33333333333333e+00
+1940 2397 -8.33333333333333e+00
+1941 1941 2.50000000000000e+01
+1941 2198 -2.08333333333333e+00
+1941 2407 2.08333333333333e+00
+1941 2404 -2.08333333333333e+00
+1941 2051 2.08333333333333e+00
+1941 2408 -4.16666666666667e+00
+1941 2050 2.08333333333333e+00
+1941 1942 -4.16666666666667e+00
+1941 2197 4.16666666666667e+00
+1941 2049 -6.25000000000000e+00
+1941 2196 -6.25000000000000e+00
+1941 1943 -4.16666666666667e+00
+1941 2036 2.08333333333333e+00
+1941 2405 4.16666666666667e+00
+1941 2035 2.08333333333333e+00
+1941 2179 -4.16666666666667e+00
+1941 2180 2.08333333333333e+00
+1941 2034 -6.25000000000000e+00
+1941 2403 -6.25000000000000e+00
+1942 1942 2.91666666666667e+01
+1942 2198 4.16666666666667e+00
+1942 2405 4.16666666666667e+00
+1942 2406 2.08333333333333e+00
+1942 2403 -2.08333333333333e+00
+1942 2051 -2.08333333333333e+00
+1942 2408 2.08333333333333e+00
+1942 2050 -2.08333333333333e+00
+1942 2197 -1.87500000000000e+01
+1942 2049 2.08333333333333e+00
+1942 1941 -4.16666666666667e+00
+1942 2196 4.16666666666667e+00
+1942 2036 -2.08333333333333e+00
+1942 2180 2.08333333333333e+00
+1942 1943 -8.33333333333333e+00
+1942 2035 -2.08333333333333e+00
+1942 2404 -6.25000000000000e+00
+1942 2034 2.08333333333333e+00
+1942 2178 -4.16666666666667e+00
+1943 1943 2.91666666666667e+01
+1943 2196 -2.08333333333333e+00
+1943 1942 -8.33333333333333e+00
+1943 2197 4.16666666666667e+00
+1943 2404 4.16666666666667e+00
+1943 2051 -2.08333333333333e+00
+1943 2198 -6.25000000000000e+00
+1943 2050 -2.08333333333333e+00
+1943 2407 2.08333333333333e+00
+1943 2049 2.08333333333333e+00
+1943 2406 -4.16666666666667e+00
+1943 2178 2.08333333333333e+00
+1943 2036 -2.08333333333333e+00
+1943 2405 -1.87500000000000e+01
+1943 2035 -2.08333333333333e+00
+1943 2179 2.08333333333333e+00
+1943 1941 -4.16666666666667e+00
+1943 2034 2.08333333333333e+00
+1943 2403 4.16666666666667e+00
+1944 1944 1.00000000000000e+00
+1944 2246 0.00000000000000e+00
+1944 2410 0.00000000000000e+00
+1944 1945 0.00000000000000e+00
+1944 2245 0.00000000000000e+00
+1944 2108 0.00000000000000e+00
+1944 2414 0.00000000000000e+00
+1944 2107 0.00000000000000e+00
+1944 2413 0.00000000000000e+00
+1944 2106 0.00000000000000e+00
+1944 2244 0.00000000000000e+00
+1944 1946 0.00000000000000e+00
+1944 2039 0.00000000000000e+00
+1944 2411 0.00000000000000e+00
+1944 2038 0.00000000000000e+00
+1944 2182 0.00000000000000e+00
+1944 2183 0.00000000000000e+00
+1944 2037 0.00000000000000e+00
+1944 2409 0.00000000000000e+00
+1945 1945 1.00000000000000e+00
+1945 2414 0.00000000000000e+00
+1945 2409 0.00000000000000e+00
+1945 1944 0.00000000000000e+00
+1945 2244 0.00000000000000e+00
+1945 2108 0.00000000000000e+00
+1945 1946 0.00000000000000e+00
+1945 2246 0.00000000000000e+00
+1945 2107 0.00000000000000e+00
+1945 2245 0.00000000000000e+00
+1945 2106 0.00000000000000e+00
+1945 2412 0.00000000000000e+00
+1945 2039 0.00000000000000e+00
+1945 2183 0.00000000000000e+00
+1945 2411 0.00000000000000e+00
+1945 2038 0.00000000000000e+00
+1945 2410 0.00000000000000e+00
+1945 2037 0.00000000000000e+00
+1945 2181 0.00000000000000e+00
+1946 1946 1.00000000000000e+00
+1946 2413 0.00000000000000e+00
+1946 2181 0.00000000000000e+00
+1946 2244 0.00000000000000e+00
+1946 2108 0.00000000000000e+00
+1946 2246 0.00000000000000e+00
+1946 2107 0.00000000000000e+00
+1946 1945 0.00000000000000e+00
+1946 2245 0.00000000000000e+00
+1946 2106 0.00000000000000e+00
+1946 2412 0.00000000000000e+00
+1946 2410 0.00000000000000e+00
+1946 2039 0.00000000000000e+00
+1946 2411 0.00000000000000e+00
+1946 2038 0.00000000000000e+00
+1946 2182 0.00000000000000e+00
+1946 1944 0.00000000000000e+00
+1946 2037 0.00000000000000e+00
+1946 2409 0.00000000000000e+00
+1947 1947 6.25000000000000e+01
+1947 2200 4.16666666666667e+00
+1947 2201 4.16666666666667e+00
+1947 2405 4.16666666666667e+00
+1947 2403 -6.25000000000000e+00
+1947 2417 4.16666666666667e+00
+1947 2416 4.16666666666667e+00
+1947 1948 -8.33333333333333e+00
+1947 2415 -1.87500000000000e+01
+1947 2264 -4.16666666666667e+00
+1947 1949 -8.33333333333333e+00
+1947 2186 -4.16666666666667e+00
+1947 2249 4.16666666666667e+00
+1947 2410 4.16666666666667e+00
+1947 2263 8.33333333333333e+00
+1947 2248 -8.33333333333333e+00
+1947 2411 4.16666666666667e+00
+1947 2042 -4.16666666666667e+00
+1947 2041 2.08333333333333e+00
+1947 2185 -4.16666666666667e+00
+1947 2409 -1.87500000000000e+01
+1947 2420 4.16666666666667e+00
+1947 2123 -4.16666666666667e+00
+1947 2419 -2.08333333333333e+00
+1947 2122 2.08333333333333e+00
+1947 2418 -6.25000000000000e+00
+1947 2404 -2.08333333333333e+00
+1947 2262 -1.25000000000000e+01
+1948 1948 6.25000000000000e+01
+1948 2403 -2.08333333333333e+00
+1948 2199 4.16666666666667e+00
+1948 2201 -8.33333333333333e+00
+1948 2042 2.08333333333333e+00
+1948 2404 -6.25000000000000e+00
+1948 2417 -2.08333333333333e+00
+1948 2123 2.08333333333333e+00
+1948 2416 -6.25000000000000e+00
+1948 2415 4.16666666666667e+00
+1948 1947 -8.33333333333333e+00
+1948 2411 -2.08333333333333e+00
+1948 2409 4.16666666666667e+00
+1948 2186 -4.16666666666667e+00
+1948 2249 4.16666666666667e+00
+1948 2262 8.33333333333333e+00
+1948 2247 -8.33333333333333e+00
+1948 2410 -6.25000000000000e+00
+1948 2040 2.08333333333333e+00
+1948 2184 -4.16666666666667e+00
+1948 2420 4.16666666666667e+00
+1948 1949 -8.33333333333333e+00
+1948 2264 8.33333333333333e+00
+1948 2419 -6.25000000000000e+00
+1948 2405 4.16666666666667e+00
+1948 2263 -3.75000000000000e+01
+1948 2418 -2.08333333333333e+00
+1948 2121 2.08333333333333e+00
+1949 1949 6.25000000000000e+01
+1949 2200 -8.33333333333333e+00
+1949 2199 4.16666666666667e+00
+1949 2405 -1.87500000000000e+01
+1949 2041 2.08333333333333e+00
+1949 2403 4.16666666666667e+00
+1949 2417 -6.25000000000000e+00
+1949 2416 -2.08333333333333e+00
+1949 2122 2.08333333333333e+00
+1949 2415 4.16666666666667e+00
+1949 2262 -4.16666666666667e+00
+1949 2410 -2.08333333333333e+00
+1949 1947 -8.33333333333333e+00
+1949 2184 -4.16666666666667e+00
+1949 2247 4.16666666666667e+00
+1949 2185 -4.16666666666667e+00
+1949 2248 4.16666666666667e+00
+1949 2411 -6.25000000000000e+00
+1949 2409 4.16666666666667e+00
+1949 2040 -4.16666666666667e+00
+1949 2420 -1.87500000000000e+01
+1949 2404 4.16666666666667e+00
+1949 2264 -1.25000000000000e+01
+1949 2419 4.16666666666667e+00
+1949 1948 -8.33333333333333e+00
+1949 2263 8.33333333333333e+00
+1949 2418 4.16666666666667e+00
+1949 2121 -4.16666666666667e+00
+1950 1950 2.50000000000000e+01
+1950 2324 -2.08333333333333e+00
+1950 2425 2.08333333333333e+00
+1950 2422 -2.08333333333333e+00
+1950 2066 2.08333333333333e+00
+1950 2426 -4.16666666666667e+00
+1950 2065 2.08333333333333e+00
+1950 1951 -4.16666666666667e+00
+1950 2323 4.16666666666667e+00
+1950 2064 -6.25000000000000e+00
+1950 2322 -6.25000000000000e+00
+1950 1952 -4.16666666666667e+00
+1950 2054 2.08333333333333e+00
+1950 2423 4.16666666666667e+00
+1950 2053 2.08333333333333e+00
+1950 2305 -4.16666666666667e+00
+1950 2306 2.08333333333333e+00
+1950 2052 -6.25000000000000e+00
+1950 2421 -6.25000000000000e+00
+1951 1951 2.91666666666667e+01
+1951 2324 4.16666666666667e+00
+1951 2423 4.16666666666667e+00
+1951 2424 2.08333333333333e+00
+1951 2421 -2.08333333333333e+00
+1951 2066 -2.08333333333333e+00
+1951 2426 2.08333333333333e+00
+1951 2065 -2.08333333333333e+00
+1951 2323 -1.87500000000000e+01
+1951 2064 2.08333333333333e+00
+1951 1950 -4.16666666666667e+00
+1951 2322 4.16666666666667e+00
+1951 2054 -2.08333333333333e+00
+1951 2306 2.08333333333333e+00
+1951 1952 -8.33333333333333e+00
+1951 2053 -2.08333333333333e+00
+1951 2422 -6.25000000000000e+00
+1951 2052 2.08333333333333e+00
+1951 2304 -4.16666666666667e+00
+1952 1952 2.91666666666667e+01
+1952 2322 -2.08333333333333e+00
+1952 1951 -8.33333333333333e+00
+1952 2323 4.16666666666667e+00
+1952 2422 4.16666666666667e+00
+1952 2066 -2.08333333333333e+00
+1952 2324 -6.25000000000000e+00
+1952 2065 -2.08333333333333e+00
+1952 2425 2.08333333333333e+00
+1952 2064 2.08333333333333e+00
+1952 2424 -4.16666666666667e+00
+1952 2304 2.08333333333333e+00
+1952 2054 -2.08333333333333e+00
+1952 2423 -1.87500000000000e+01
+1952 2053 -2.08333333333333e+00
+1952 2305 2.08333333333333e+00
+1952 1950 -4.16666666666667e+00
+1952 2052 2.08333333333333e+00
+1952 2421 4.16666666666667e+00
+1953 1953 6.25000000000000e+01
+1953 1954 -8.33333333333333e+00
+1953 2432 -4.16666666666667e+00
+1953 2125 -2.08333333333333e+00
+1953 2431 2.08333333333333e+00
+1953 2429 4.16666666666667e+00
+1953 2056 -2.08333333333333e+00
+1953 2427 -1.87500000000000e+01
+1953 2407 2.08333333333333e+00
+1953 2057 4.16666666666667e+00
+1953 2408 -4.16666666666667e+00
+1953 1955 -8.33333333333333e+00
+1953 2417 4.16666666666667e+00
+1953 2126 4.16666666666667e+00
+1953 2416 4.16666666666667e+00
+1953 2415 -1.87500000000000e+01
+1953 2203 -4.16666666666667e+00
+1953 2308 4.16666666666667e+00
+1953 2309 4.16666666666667e+00
+1953 2204 -4.16666666666667e+00
+1953 2055 -6.25000000000000e+00
+1953 2372 -4.16666666666667e+00
+1953 2267 4.16666666666667e+00
+1953 2371 8.33333333333333e+00
+1953 2266 -8.33333333333333e+00
+1953 2370 -1.25000000000000e+01
+1953 2428 4.16666666666667e+00
+1953 2124 -6.25000000000000e+00
+1954 1954 6.25000000000000e+01
+1954 2432 2.08333333333333e+00
+1954 2427 4.16666666666667e+00
+1954 1953 -8.33333333333333e+00
+1954 2124 -2.08333333333333e+00
+1954 2430 2.08333333333333e+00
+1954 2428 -6.25000000000000e+00
+1954 2055 -2.08333333333333e+00
+1954 2406 2.08333333333333e+00
+1954 2408 2.08333333333333e+00
+1954 2417 -2.08333333333333e+00
+1954 2416 -6.25000000000000e+00
+1954 2415 4.16666666666667e+00
+1954 2202 -4.16666666666667e+00
+1954 2307 4.16666666666667e+00
+1954 2204 -4.16666666666667e+00
+1954 2267 4.16666666666667e+00
+1954 2309 -8.33333333333333e+00
+1954 2057 4.16666666666667e+00
+1954 2056 -6.25000000000000e+00
+1954 2372 8.33333333333333e+00
+1954 1955 -8.33333333333333e+00
+1954 2126 4.16666666666667e+00
+1954 2371 -3.75000000000000e+01
+1954 2429 -2.08333333333333e+00
+1954 2125 -6.25000000000000e+00
+1954 2370 8.33333333333333e+00
+1954 2265 -8.33333333333333e+00
+1955 1955 6.25000000000000e+01
+1955 2431 2.08333333333333e+00
+1955 2430 -4.16666666666667e+00
+1955 2429 -6.25000000000000e+00
+1955 2427 4.16666666666667e+00
+1955 2407 2.08333333333333e+00
+1955 2055 4.16666666666667e+00
+1955 2406 -4.16666666666667e+00
+1955 2417 -6.25000000000000e+00
+1955 2416 -2.08333333333333e+00
+1955 1953 -8.33333333333333e+00
+1955 2415 4.16666666666667e+00
+1955 2124 4.16666666666667e+00
+1955 2203 -4.16666666666667e+00
+1955 2266 4.16666666666667e+00
+1955 2057 -1.87500000000000e+01
+1955 2308 -8.33333333333333e+00
+1955 2056 4.16666666666667e+00
+1955 2307 4.16666666666667e+00
+1955 2202 -4.16666666666667e+00
+1955 2372 -1.25000000000000e+01
+1955 2428 -2.08333333333333e+00
+1955 2126 -1.87500000000000e+01
+1955 2371 8.33333333333333e+00
+1955 1954 -8.33333333333333e+00
+1955 2125 4.16666666666667e+00
+1955 2370 -4.16666666666667e+00
+1955 2265 4.16666666666667e+00
+1956 1956 6.25000000000000e+01
+1956 2326 4.16666666666667e+00
+1956 2327 4.16666666666667e+00
+1956 2423 4.16666666666667e+00
+1956 2421 -6.25000000000000e+00
+1956 2435 4.16666666666667e+00
+1956 2434 4.16666666666667e+00
+1956 1957 -8.33333333333333e+00
+1956 2433 -1.87500000000000e+01
+1956 2390 -4.16666666666667e+00
+1956 1958 -8.33333333333333e+00
+1956 2312 -4.16666666666667e+00
+1956 2375 4.16666666666667e+00
+1956 2428 4.16666666666667e+00
+1956 2389 8.33333333333333e+00
+1956 2374 -8.33333333333333e+00
+1956 2429 4.16666666666667e+00
+1956 2060 -4.16666666666667e+00
+1956 2059 2.08333333333333e+00
+1956 2311 -4.16666666666667e+00
+1956 2427 -1.87500000000000e+01
+1956 2438 4.16666666666667e+00
+1956 2144 -4.16666666666667e+00
+1956 2437 -2.08333333333333e+00
+1956 2143 2.08333333333333e+00
+1956 2436 -6.25000000000000e+00
+1956 2422 -2.08333333333333e+00
+1956 2388 -1.25000000000000e+01
+1957 1957 6.25000000000000e+01
+1957 2421 -2.08333333333333e+00
+1957 2325 4.16666666666667e+00
+1957 2327 -8.33333333333333e+00
+1957 2060 2.08333333333333e+00
+1957 2422 -6.25000000000000e+00
+1957 2435 -2.08333333333333e+00
+1957 2144 2.08333333333333e+00
+1957 2434 -6.25000000000000e+00
+1957 2433 4.16666666666667e+00
+1957 1956 -8.33333333333333e+00
+1957 2429 -2.08333333333333e+00
+1957 2427 4.16666666666667e+00
+1957 2312 -4.16666666666667e+00
+1957 2375 4.16666666666667e+00
+1957 2388 8.33333333333333e+00
+1957 2373 -8.33333333333333e+00
+1957 2428 -6.25000000000000e+00
+1957 2058 2.08333333333333e+00
+1957 2310 -4.16666666666667e+00
+1957 2438 4.16666666666667e+00
+1957 1958 -8.33333333333333e+00
+1957 2390 8.33333333333333e+00
+1957 2437 -6.25000000000000e+00
+1957 2423 4.16666666666667e+00
+1957 2389 -3.75000000000000e+01
+1957 2436 -2.08333333333333e+00
+1957 2142 2.08333333333333e+00
+1958 1958 6.25000000000000e+01
+1958 2326 -8.33333333333333e+00
+1958 2325 4.16666666666667e+00
+1958 2423 -1.87500000000000e+01
+1958 2059 2.08333333333333e+00
+1958 2421 4.16666666666667e+00
+1958 2435 -6.25000000000000e+00
+1958 2434 -2.08333333333333e+00
+1958 2143 2.08333333333333e+00
+1958 2433 4.16666666666667e+00
+1958 2388 -4.16666666666667e+00
+1958 2428 -2.08333333333333e+00
+1958 1956 -8.33333333333333e+00
+1958 2310 -4.16666666666667e+00
+1958 2373 4.16666666666667e+00
+1958 2311 -4.16666666666667e+00
+1958 2374 4.16666666666667e+00
+1958 2429 -6.25000000000000e+00
+1958 2427 4.16666666666667e+00
+1958 2058 -4.16666666666667e+00
+1958 2438 -1.87500000000000e+01
+1958 2422 4.16666666666667e+00
+1958 2390 -1.25000000000000e+01
+1958 2437 4.16666666666667e+00
+1958 1957 -8.33333333333333e+00
+1958 2389 8.33333333333333e+00
+1958 2436 4.16666666666667e+00
+1958 2142 -4.16666666666667e+00
+1959 1959 2.50000000000000e+01
+1959 2215 2.08333333333333e+00
+1959 2444 2.08333333333333e+00
+1959 2441 -2.08333333333333e+00
+1959 2072 2.08333333333333e+00
+1959 2216 -4.16666666666667e+00
+1959 2071 2.08333333333333e+00
+1959 1960 -4.16666666666667e+00
+1959 2440 4.16666666666667e+00
+1959 2070 -6.25000000000000e+00
+1959 2439 -6.25000000000000e+00
+1959 1961 -4.16666666666667e+00
+1959 2087 2.08333333333333e+00
+1959 2234 4.16666666666667e+00
+1959 2086 2.08333333333333e+00
+1959 2443 -4.16666666666667e+00
+1959 2233 -2.08333333333333e+00
+1959 2085 -6.25000000000000e+00
+1959 2232 -6.25000000000000e+00
+1960 1960 2.91666666666667e+01
+1960 2214 2.08333333333333e+00
+1960 2234 4.16666666666667e+00
+1960 1961 -8.33333333333333e+00
+1960 2441 4.16666666666667e+00
+1960 2072 -2.08333333333333e+00
+1960 2216 2.08333333333333e+00
+1960 2071 -2.08333333333333e+00
+1960 2440 -1.87500000000000e+01
+1960 2070 2.08333333333333e+00
+1960 1959 -4.16666666666667e+00
+1960 2439 4.16666666666667e+00
+1960 2087 -2.08333333333333e+00
+1960 2444 2.08333333333333e+00
+1960 2232 -2.08333333333333e+00
+1960 2086 -2.08333333333333e+00
+1960 2233 -6.25000000000000e+00
+1960 2085 2.08333333333333e+00
+1960 2442 -4.16666666666667e+00
+1961 1961 2.91666666666667e+01
+1961 1960 -8.33333333333333e+00
+1961 2440 4.16666666666667e+00
+1961 2442 2.08333333333333e+00
+1961 2439 -2.08333333333333e+00
+1961 2072 -2.08333333333333e+00
+1961 2441 -6.25000000000000e+00
+1961 2071 -2.08333333333333e+00
+1961 2215 2.08333333333333e+00
+1961 2070 2.08333333333333e+00
+1961 2214 -4.16666666666667e+00
+1961 2233 4.16666666666667e+00
+1961 2087 -2.08333333333333e+00
+1961 2234 -1.87500000000000e+01
+1961 2086 -2.08333333333333e+00
+1961 2443 2.08333333333333e+00
+1961 1959 -4.16666666666667e+00
+1961 2085 2.08333333333333e+00
+1961 2232 4.16666666666667e+00
+1962 1962 1.00000000000000e+00
+1962 2251 0.00000000000000e+00
+1962 1964 0.00000000000000e+00
+1962 2252 0.00000000000000e+00
+1962 2447 0.00000000000000e+00
+1962 2111 0.00000000000000e+00
+1962 2450 0.00000000000000e+00
+1962 2110 0.00000000000000e+00
+1962 2449 0.00000000000000e+00
+1962 2109 0.00000000000000e+00
+1962 2250 0.00000000000000e+00
+1962 2075 0.00000000000000e+00
+1962 2219 0.00000000000000e+00
+1962 1963 0.00000000000000e+00
+1962 2074 0.00000000000000e+00
+1962 2446 0.00000000000000e+00
+1962 2218 0.00000000000000e+00
+1962 2073 0.00000000000000e+00
+1962 2445 0.00000000000000e+00
+1963 1963 1.00000000000000e+00
+1963 2250 0.00000000000000e+00
+1963 2450 0.00000000000000e+00
+1963 2447 0.00000000000000e+00
+1963 2111 0.00000000000000e+00
+1963 1964 0.00000000000000e+00
+1963 2252 0.00000000000000e+00
+1963 2110 0.00000000000000e+00
+1963 2251 0.00000000000000e+00
+1963 2109 0.00000000000000e+00
+1963 2448 0.00000000000000e+00
+1963 2075 0.00000000000000e+00
+1963 2219 0.00000000000000e+00
+1963 2217 0.00000000000000e+00
+1963 2074 0.00000000000000e+00
+1963 2446 0.00000000000000e+00
+1963 1962 0.00000000000000e+00
+1963 2073 0.00000000000000e+00
+1963 2445 0.00000000000000e+00
+1964 1964 1.00000000000000e+00
+1964 2446 0.00000000000000e+00
+1964 1962 0.00000000000000e+00
+1964 2250 0.00000000000000e+00
+1964 2445 0.00000000000000e+00
+1964 2111 0.00000000000000e+00
+1964 2252 0.00000000000000e+00
+1964 2110 0.00000000000000e+00
+1964 1963 0.00000000000000e+00
+1964 2251 0.00000000000000e+00
+1964 2109 0.00000000000000e+00
+1964 2448 0.00000000000000e+00
+1964 2449 0.00000000000000e+00
+1964 2075 0.00000000000000e+00
+1964 2447 0.00000000000000e+00
+1964 2074 0.00000000000000e+00
+1964 2218 0.00000000000000e+00
+1964 2073 0.00000000000000e+00
+1964 2217 0.00000000000000e+00
+1965 1965 6.25000000000000e+01
+1965 2255 -8.33333333333333e+00
+1965 2254 4.16666666666667e+00
+1965 2078 2.08333333333333e+00
+1965 2446 4.16666666666667e+00
+1965 2445 -1.87500000000000e+01
+1965 2456 -2.08333333333333e+00
+1965 2129 2.08333333333333e+00
+1965 2455 4.16666666666667e+00
+1965 2454 -6.25000000000000e+00
+1965 2222 -4.16666666666667e+00
+1965 2221 -4.16666666666667e+00
+1965 2237 4.16666666666667e+00
+1965 2441 -2.08333333333333e+00
+1965 1966 -8.33333333333333e+00
+1965 2236 4.16666666666667e+00
+1965 2269 -4.16666666666667e+00
+1965 2077 -4.16666666666667e+00
+1965 2440 4.16666666666667e+00
+1965 2439 -6.25000000000000e+00
+1965 1967 -8.33333333333333e+00
+1965 2453 4.16666666666667e+00
+1965 2270 8.33333333333333e+00
+1965 2452 4.16666666666667e+00
+1965 2128 -4.16666666666667e+00
+1965 2447 4.16666666666667e+00
+1965 2451 -1.87500000000000e+01
+1965 2268 -1.25000000000000e+01
+1966 1966 6.25000000000000e+01
+1966 2255 4.16666666666667e+00
+1966 2253 4.16666666666667e+00
+1966 2446 -6.25000000000000e+00
+1966 2445 4.16666666666667e+00
+1966 2456 4.16666666666667e+00
+1966 1967 -8.33333333333333e+00
+1966 2455 -1.87500000000000e+01
+1966 2454 4.16666666666667e+00
+1966 2220 -4.16666666666667e+00
+1966 2441 4.16666666666667e+00
+1966 1965 -8.33333333333333e+00
+1966 2237 -8.33333333333333e+00
+1966 2270 8.33333333333333e+00
+1966 2235 4.16666666666667e+00
+1966 2268 -4.16666666666667e+00
+1966 2078 2.08333333333333e+00
+1966 2222 -4.16666666666667e+00
+1966 2440 -1.87500000000000e+01
+1966 2076 -4.16666666666667e+00
+1966 2439 4.16666666666667e+00
+1966 2453 -2.08333333333333e+00
+1966 2129 2.08333333333333e+00
+1966 2447 -2.08333333333333e+00
+1966 2452 -6.25000000000000e+00
+1966 2269 -1.25000000000000e+01
+1966 2451 4.16666666666667e+00
+1966 2127 -4.16666666666667e+00
+1967 1967 6.25000000000000e+01
+1967 2254 4.16666666666667e+00
+1967 2445 4.16666666666667e+00
+1967 2253 -8.33333333333333e+00
+1967 2447 -6.25000000000000e+00
+1967 2076 2.08333333333333e+00
+1967 2456 -6.25000000000000e+00
+1967 2455 4.16666666666667e+00
+1967 1966 -8.33333333333333e+00
+1967 2454 -2.08333333333333e+00
+1967 2127 2.08333333333333e+00
+1967 2220 -4.16666666666667e+00
+1967 2440 4.16666666666667e+00
+1967 2235 4.16666666666667e+00
+1967 2439 -2.08333333333333e+00
+1967 2236 -8.33333333333333e+00
+1967 2269 8.33333333333333e+00
+1967 2441 -6.25000000000000e+00
+1967 2077 2.08333333333333e+00
+1967 2221 -4.16666666666667e+00
+1967 2446 -2.08333333333333e+00
+1967 2453 -6.25000000000000e+00
+1967 2270 -3.75000000000000e+01
+1967 2452 -2.08333333333333e+00
+1967 2128 2.08333333333333e+00
+1967 1965 -8.33333333333333e+00
+1967 2451 4.16666666666667e+00
+1967 2268 8.33333333333333e+00
+1968 1968 2.50000000000000e+01
+1968 2341 2.08333333333333e+00
+1968 2462 2.08333333333333e+00
+1968 2459 -2.08333333333333e+00
+1968 2090 2.08333333333333e+00
+1968 2342 -4.16666666666667e+00
+1968 2089 2.08333333333333e+00
+1968 1969 -4.16666666666667e+00
+1968 2458 4.16666666666667e+00
+1968 2088 -6.25000000000000e+00
+1968 2457 -6.25000000000000e+00
+1968 1970 -4.16666666666667e+00
+1968 2102 2.08333333333333e+00
+1968 2360 4.16666666666667e+00
+1968 2101 2.08333333333333e+00
+1968 2461 -4.16666666666667e+00
+1968 2359 -2.08333333333333e+00
+1968 2100 -6.25000000000000e+00
+1968 2358 -6.25000000000000e+00
+1969 1969 2.91666666666667e+01
+1969 2340 2.08333333333333e+00
+1969 2360 4.16666666666667e+00
+1969 1970 -8.33333333333333e+00
+1969 2459 4.16666666666667e+00
+1969 2090 -2.08333333333333e+00
+1969 2342 2.08333333333333e+00
+1969 2089 -2.08333333333333e+00
+1969 2458 -1.87500000000000e+01
+1969 2088 2.08333333333333e+00
+1969 1968 -4.16666666666667e+00
+1969 2457 4.16666666666667e+00
+1969 2102 -2.08333333333333e+00
+1969 2462 2.08333333333333e+00
+1969 2358 -2.08333333333333e+00
+1969 2101 -2.08333333333333e+00
+1969 2359 -6.25000000000000e+00
+1969 2100 2.08333333333333e+00
+1969 2460 -4.16666666666667e+00
+1970 1970 2.91666666666667e+01
+1970 1969 -8.33333333333333e+00
+1970 2458 4.16666666666667e+00
+1970 2460 2.08333333333333e+00
+1970 2457 -2.08333333333333e+00
+1970 2090 -2.08333333333333e+00
+1970 2459 -6.25000000000000e+00
+1970 2089 -2.08333333333333e+00
+1970 2341 2.08333333333333e+00
+1970 2088 2.08333333333333e+00
+1970 2340 -4.16666666666667e+00
+1970 2359 4.16666666666667e+00
+1970 2102 -2.08333333333333e+00
+1970 2360 -1.87500000000000e+01
+1970 2101 -2.08333333333333e+00
+1970 2461 2.08333333333333e+00
+1970 1968 -4.16666666666667e+00
+1970 2100 2.08333333333333e+00
+1970 2358 4.16666666666667e+00
+1971 1971 6.25000000000000e+01
+1971 2465 4.16666666666667e+00
+1971 2132 -2.08333333333333e+00
+1971 2468 2.08333333333333e+00
+1971 2467 -4.16666666666667e+00
+1971 2093 -2.08333333333333e+00
+1971 2464 4.16666666666667e+00
+1971 2463 -1.87500000000000e+01
+1971 2345 4.16666666666667e+00
+1971 2344 4.16666666666667e+00
+1971 2378 8.33333333333333e+00
+1971 2377 -4.16666666666667e+00
+1971 2376 -1.25000000000000e+01
+1971 2240 -4.16666666666667e+00
+1971 2444 2.08333333333333e+00
+1971 2239 -4.16666666666667e+00
+1971 2272 4.16666666666667e+00
+1971 2443 -4.16666666666667e+00
+1971 2092 4.16666666666667e+00
+1971 2091 -6.25000000000000e+00
+1971 2453 4.16666666666667e+00
+1971 2273 -8.33333333333333e+00
+1971 2452 4.16666666666667e+00
+1971 1972 -8.33333333333333e+00
+1971 2131 4.16666666666667e+00
+1971 2451 -1.87500000000000e+01
+1971 1973 -8.33333333333333e+00
+1971 2130 -6.25000000000000e+00
+1972 1972 6.25000000000000e+01
+1972 2465 -2.08333333333333e+00
+1972 2466 -4.16666666666667e+00
+1972 2464 -6.25000000000000e+00
+1972 2463 4.16666666666667e+00
+1972 2345 -8.33333333333333e+00
+1972 2093 4.16666666666667e+00
+1972 2343 4.16666666666667e+00
+1972 2378 8.33333333333333e+00
+1972 1973 -8.33333333333333e+00
+1972 2132 4.16666666666667e+00
+1972 2377 -1.25000000000000e+01
+1972 2376 -4.16666666666667e+00
+1972 2238 -4.16666666666667e+00
+1972 2271 4.16666666666667e+00
+1972 2444 2.08333333333333e+00
+1972 2240 -4.16666666666667e+00
+1972 2092 -1.87500000000000e+01
+1972 2442 -4.16666666666667e+00
+1972 2091 4.16666666666667e+00
+1972 2453 -2.08333333333333e+00
+1972 2273 4.16666666666667e+00
+1972 2452 -6.25000000000000e+00
+1972 2468 2.08333333333333e+00
+1972 2131 -1.87500000000000e+01
+1972 2451 4.16666666666667e+00
+1972 1971 -8.33333333333333e+00
+1972 2130 4.16666666666667e+00
+1973 1973 6.25000000000000e+01
+1973 2464 -2.08333333333333e+00
+1973 1971 -8.33333333333333e+00
+1973 2463 4.16666666666667e+00
+1973 2130 -2.08333333333333e+00
+1973 2466 2.08333333333333e+00
+1973 2465 -6.25000000000000e+00
+1973 2091 -2.08333333333333e+00
+1973 2343 4.16666666666667e+00
+1973 2344 -8.33333333333333e+00
+1973 2092 4.16666666666667e+00
+1973 2378 -3.75000000000000e+01
+1973 2377 8.33333333333333e+00
+1973 1972 -8.33333333333333e+00
+1973 2131 4.16666666666667e+00
+1973 2376 8.33333333333333e+00
+1973 2238 -4.16666666666667e+00
+1973 2442 2.08333333333333e+00
+1973 2093 -6.25000000000000e+00
+1973 2443 2.08333333333333e+00
+1973 2239 -4.16666666666667e+00
+1973 2453 -6.25000000000000e+00
+1973 2467 2.08333333333333e+00
+1973 2132 -6.25000000000000e+00
+1973 2452 -2.08333333333333e+00
+1973 2272 4.16666666666667e+00
+1973 2451 4.16666666666667e+00
+1973 2271 -8.33333333333333e+00
+1974 1974 6.25000000000000e+01
+1974 2381 -8.33333333333333e+00
+1974 2380 4.16666666666667e+00
+1974 2096 2.08333333333333e+00
+1974 2464 4.16666666666667e+00
+1974 2463 -1.87500000000000e+01
+1974 2474 -2.08333333333333e+00
+1974 2147 2.08333333333333e+00
+1974 2473 4.16666666666667e+00
+1974 2472 -6.25000000000000e+00
+1974 2348 -4.16666666666667e+00
+1974 2347 -4.16666666666667e+00
+1974 2363 4.16666666666667e+00
+1974 2459 -2.08333333333333e+00
+1974 1975 -8.33333333333333e+00
+1974 2362 4.16666666666667e+00
+1974 2395 -4.16666666666667e+00
+1974 2095 -4.16666666666667e+00
+1974 2458 4.16666666666667e+00
+1974 2457 -6.25000000000000e+00
+1974 1976 -8.33333333333333e+00
+1974 2471 4.16666666666667e+00
+1974 2396 8.33333333333333e+00
+1974 2470 4.16666666666667e+00
+1974 2146 -4.16666666666667e+00
+1974 2465 4.16666666666667e+00
+1974 2469 -1.87500000000000e+01
+1974 2394 -1.25000000000000e+01
+1975 1975 6.25000000000000e+01
+1975 2381 4.16666666666667e+00
+1975 2379 4.16666666666667e+00
+1975 2464 -6.25000000000000e+00
+1975 2463 4.16666666666667e+00
+1975 2474 4.16666666666667e+00
+1975 1976 -8.33333333333333e+00
+1975 2473 -1.87500000000000e+01
+1975 2472 4.16666666666667e+00
+1975 2346 -4.16666666666667e+00
+1975 2459 4.16666666666667e+00
+1975 1974 -8.33333333333333e+00
+1975 2363 -8.33333333333333e+00
+1975 2396 8.33333333333333e+00
+1975 2361 4.16666666666667e+00
+1975 2394 -4.16666666666667e+00
+1975 2096 2.08333333333333e+00
+1975 2348 -4.16666666666667e+00
+1975 2458 -1.87500000000000e+01
+1975 2094 -4.16666666666667e+00
+1975 2457 4.16666666666667e+00
+1975 2471 -2.08333333333333e+00
+1975 2147 2.08333333333333e+00
+1975 2465 -2.08333333333333e+00
+1975 2470 -6.25000000000000e+00
+1975 2395 -1.25000000000000e+01
+1975 2469 4.16666666666667e+00
+1975 2145 -4.16666666666667e+00
+1976 1976 6.25000000000000e+01
+1976 2380 4.16666666666667e+00
+1976 2463 4.16666666666667e+00
+1976 2379 -8.33333333333333e+00
+1976 2465 -6.25000000000000e+00
+1976 2094 2.08333333333333e+00
+1976 2474 -6.25000000000000e+00
+1976 2473 4.16666666666667e+00
+1976 1975 -8.33333333333333e+00
+1976 2472 -2.08333333333333e+00
+1976 2145 2.08333333333333e+00
+1976 2346 -4.16666666666667e+00
+1976 2458 4.16666666666667e+00
+1976 2361 4.16666666666667e+00
+1976 2457 -2.08333333333333e+00
+1976 2362 -8.33333333333333e+00
+1976 2395 8.33333333333333e+00
+1976 2459 -6.25000000000000e+00
+1976 2095 2.08333333333333e+00
+1976 2347 -4.16666666666667e+00
+1976 2464 -2.08333333333333e+00
+1976 2471 -6.25000000000000e+00
+1976 2396 -3.75000000000000e+01
+1976 2470 -2.08333333333333e+00
+1976 2146 2.08333333333333e+00
+1976 1974 -8.33333333333333e+00
+1976 2469 4.16666666666667e+00
+1976 2394 8.33333333333333e+00
+1977 1977 3.75000000000000e+01
+1977 2414 -4.16666666666667e+00
+1977 2413 2.08333333333333e+00
+1977 1979 -4.16666666666667e+00
+1977 2420 4.16666666666667e+00
+1977 2135 2.08333333333333e+00
+1977 2419 -2.08333333333333e+00
+1977 2418 -6.25000000000000e+00
+1977 2257 -4.16666666666667e+00
+1977 2275 4.16666666666667e+00
+1977 2450 2.08333333333333e+00
+1977 2258 -4.16666666666667e+00
+1977 2113 2.08333333333333e+00
+1977 2449 -4.16666666666667e+00
+1977 2112 -1.25000000000000e+01
+1977 2456 -2.08333333333333e+00
+1977 2276 4.16666666666667e+00
+1977 1978 -4.16666666666667e+00
+1977 2455 4.16666666666667e+00
+1977 2134 2.08333333333333e+00
+1977 2114 2.08333333333333e+00
+1977 2454 -6.25000000000000e+00
+1977 2133 -1.25000000000000e+01
+1978 1978 3.33333333333333e+01
+1978 2412 2.08333333333333e+00
+1978 2420 4.16666666666667e+00
+1978 2419 -6.25000000000000e+00
+1978 2418 -2.08333333333333e+00
+1978 2450 2.08333333333333e+00
+1978 2258 -4.16666666666667e+00
+1978 2256 -4.16666666666667e+00
+1978 2274 4.16666666666667e+00
+1978 2113 -4.16666666666667e+00
+1978 2112 2.08333333333333e+00
+1978 2448 -4.16666666666667e+00
+1978 2456 4.16666666666667e+00
+1978 2276 -8.33333333333333e+00
+1978 2414 2.08333333333333e+00
+1978 2455 -1.87500000000000e+01
+1978 2134 -4.16666666666667e+00
+1978 1977 -4.16666666666667e+00
+1978 2454 4.16666666666667e+00
+1978 2133 2.08333333333333e+00
+1979 1979 3.33333333333333e+01
+1979 2112 2.08333333333333e+00
+1979 2412 -4.16666666666667e+00
+1979 2420 -1.87500000000000e+01
+1979 2419 4.16666666666667e+00
+1979 1977 -4.16666666666667e+00
+1979 2418 4.16666666666667e+00
+1979 2133 2.08333333333333e+00
+1979 2449 2.08333333333333e+00
+1979 2257 -4.16666666666667e+00
+1979 2114 -4.16666666666667e+00
+1979 2448 2.08333333333333e+00
+1979 2256 -4.16666666666667e+00
+1979 2413 2.08333333333333e+00
+1979 2456 -6.25000000000000e+00
+1979 2135 -4.16666666666667e+00
+1979 2455 4.16666666666667e+00
+1979 2275 -8.33333333333333e+00
+1979 2454 -2.08333333333333e+00
+1979 2274 4.16666666666667e+00
+1980 1980 3.75000000000000e+01
+1980 2432 -4.16666666666667e+00
+1980 2431 2.08333333333333e+00
+1980 1982 -4.16666666666667e+00
+1980 2438 4.16666666666667e+00
+1980 2150 2.08333333333333e+00
+1980 2437 -2.08333333333333e+00
+1980 2436 -6.25000000000000e+00
+1980 2383 -4.16666666666667e+00
+1980 2401 4.16666666666667e+00
+1980 2468 2.08333333333333e+00
+1980 2384 -4.16666666666667e+00
+1980 2137 2.08333333333333e+00
+1980 2467 -4.16666666666667e+00
+1980 2136 -1.25000000000000e+01
+1980 2474 -2.08333333333333e+00
+1980 2402 4.16666666666667e+00
+1980 1981 -4.16666666666667e+00
+1980 2473 4.16666666666667e+00
+1980 2149 2.08333333333333e+00
+1980 2138 2.08333333333333e+00
+1980 2472 -6.25000000000000e+00
+1980 2148 -1.25000000000000e+01
+1981 1981 3.33333333333333e+01
+1981 2430 2.08333333333333e+00
+1981 2438 4.16666666666667e+00
+1981 2437 -6.25000000000000e+00
+1981 2436 -2.08333333333333e+00
+1981 2468 2.08333333333333e+00
+1981 2384 -4.16666666666667e+00
+1981 2382 -4.16666666666667e+00
+1981 2400 4.16666666666667e+00
+1981 2137 -4.16666666666667e+00
+1981 2136 2.08333333333333e+00
+1981 2466 -4.16666666666667e+00
+1981 2474 4.16666666666667e+00
+1981 2402 -8.33333333333333e+00
+1981 2432 2.08333333333333e+00
+1981 2473 -1.87500000000000e+01
+1981 2149 -4.16666666666667e+00
+1981 1980 -4.16666666666667e+00
+1981 2472 4.16666666666667e+00
+1981 2148 2.08333333333333e+00
+1982 1982 3.33333333333333e+01
+1982 2136 2.08333333333333e+00
+1982 2430 -4.16666666666667e+00
+1982 2438 -1.87500000000000e+01
+1982 2437 4.16666666666667e+00
+1982 1980 -4.16666666666667e+00
+1982 2436 4.16666666666667e+00
+1982 2148 2.08333333333333e+00
+1982 2467 2.08333333333333e+00
+1982 2383 -4.16666666666667e+00
+1982 2138 -4.16666666666667e+00
+1982 2466 2.08333333333333e+00
+1982 2382 -4.16666666666667e+00
+1982 2431 2.08333333333333e+00
+1982 2474 -6.25000000000000e+00
+1982 2150 -4.16666666666667e+00
+1982 2473 4.16666666666667e+00
+1982 2401 -8.33333333333333e+00
+1982 2472 -2.08333333333333e+00
+1982 2400 4.16666666666667e+00
+1983 1983 3.75000000000000e+01
+1983 1900 2.08333333333333e+00
+1983 2152 -4.16666666666667e+00
+1983 1991 -2.08333333333333e+00
+1983 1984 -4.16666666666667e+00
+1983 1990 4.16666666666667e+00
+1983 1876 0.00000000000000e+00
+1983 1989 -6.25000000000000e+00
+1983 2159 -4.16666666666667e+00
+1983 2003 4.16666666666667e+00
+1983 1901 2.08333333333333e+00
+1983 2156 -4.16666666666667e+00
+1983 2155 2.08333333333333e+00
+1983 2158 -4.16666666666667e+00
+1983 1899 -1.25000000000000e+01
+1983 1985 -4.16666666666667e+00
+1983 1997 4.16666666666667e+00
+1983 1877 0.00000000000000e+00
+1983 1996 -2.08333333333333e+00
+1983 2002 4.16666666666667e+00
+1983 2153 2.08333333333333e+00
+1983 1995 -6.25000000000000e+00
+1983 1875 0.00000000000000e+00
+1984 1984 3.33333333333333e+01
+1984 1899 2.08333333333333e+00
+1984 2151 -4.16666666666667e+00
+1984 1991 4.16666666666667e+00
+1984 1990 -1.87500000000000e+01
+1984 1983 -4.16666666666667e+00
+1984 1989 4.16666666666667e+00
+1984 1875 0.00000000000000e+00
+1984 2156 2.08333333333333e+00
+1984 2159 -4.16666666666667e+00
+1984 1900 -4.16666666666667e+00
+1984 2154 2.08333333333333e+00
+1984 2157 -4.16666666666667e+00
+1984 1997 4.16666666666667e+00
+1984 2003 -8.33333333333333e+00
+1984 2153 2.08333333333333e+00
+1984 1996 -6.25000000000000e+00
+1984 1876 0.00000000000000e+00
+1984 1995 -2.08333333333333e+00
+1984 2001 4.16666666666667e+00
+1985 1985 3.33333333333333e+01
+1985 2151 2.08333333333333e+00
+1985 1991 -6.25000000000000e+00
+1985 1990 4.16666666666667e+00
+1985 1989 -2.08333333333333e+00
+1985 2155 2.08333333333333e+00
+1985 2158 -4.16666666666667e+00
+1985 2157 -4.16666666666667e+00
+1985 2001 4.16666666666667e+00
+1985 1901 -4.16666666666667e+00
+1985 1899 2.08333333333333e+00
+1985 2154 -4.16666666666667e+00
+1985 2152 2.08333333333333e+00
+1985 1997 -1.87500000000000e+01
+1985 1877 0.00000000000000e+00
+1985 1996 4.16666666666667e+00
+1985 2002 -8.33333333333333e+00
+1985 1983 -4.16666666666667e+00
+1985 1995 4.16666666666667e+00
+1985 1875 0.00000000000000e+00
+1986 1986 1.00000000000000e+00
+1986 2170 0.00000000000000e+00
+1986 1903 0.00000000000000e+00
+1986 1991 0.00000000000000e+00
+1986 1990 0.00000000000000e+00
+1986 1987 0.00000000000000e+00
+1986 1876 0.00000000000000e+00
+1986 1989 0.00000000000000e+00
+1986 2177 0.00000000000000e+00
+1986 2174 0.00000000000000e+00
+1986 2173 0.00000000000000e+00
+1986 2176 0.00000000000000e+00
+1986 1902 0.00000000000000e+00
+1986 2000 0.00000000000000e+00
+1986 2003 0.00000000000000e+00
+1986 1999 0.00000000000000e+00
+1986 2002 0.00000000000000e+00
+1986 1998 0.00000000000000e+00
+1986 2171 0.00000000000000e+00
+1986 1875 0.00000000000000e+00
+1987 1987 1.00000000000000e+00
+1987 2169 0.00000000000000e+00
+1987 1902 0.00000000000000e+00
+1987 1991 0.00000000000000e+00
+1987 1990 0.00000000000000e+00
+1987 1989 0.00000000000000e+00
+1987 1986 0.00000000000000e+00
+1987 1875 0.00000000000000e+00
+1987 2177 0.00000000000000e+00
+1987 2003 0.00000000000000e+00
+1987 2174 0.00000000000000e+00
+1987 1904 0.00000000000000e+00
+1987 1903 0.00000000000000e+00
+1987 2172 0.00000000000000e+00
+1987 2175 0.00000000000000e+00
+1987 2000 0.00000000000000e+00
+1987 1988 0.00000000000000e+00
+1987 1877 0.00000000000000e+00
+1987 1999 0.00000000000000e+00
+1987 2171 0.00000000000000e+00
+1987 1876 0.00000000000000e+00
+1987 1998 0.00000000000000e+00
+1987 2001 0.00000000000000e+00
+1988 1988 1.00000000000000e+00
+1988 2170 0.00000000000000e+00
+1988 1991 0.00000000000000e+00
+1988 1990 0.00000000000000e+00
+1988 1989 0.00000000000000e+00
+1988 2175 0.00000000000000e+00
+1988 2172 0.00000000000000e+00
+1988 2176 0.00000000000000e+00
+1988 2002 0.00000000000000e+00
+1988 1904 0.00000000000000e+00
+1988 2173 0.00000000000000e+00
+1988 1903 0.00000000000000e+00
+1988 2000 0.00000000000000e+00
+1988 2169 0.00000000000000e+00
+1988 1877 0.00000000000000e+00
+1988 1999 0.00000000000000e+00
+1988 1987 0.00000000000000e+00
+1988 1876 0.00000000000000e+00
+1988 1998 0.00000000000000e+00
+1988 2001 0.00000000000000e+00
+1989 1989 6.25000000000000e+01
+1989 2176 4.16666666666667e+00
+1989 2177 4.16666666666667e+00
+1989 2170 4.16666666666667e+00
+1989 2169 -6.25000000000000e+00
+1989 1991 -8.33333333333333e+00
+1989 1988 0.00000000000000e+00
+1989 1987 0.00000000000000e+00
+1989 1986 0.00000000000000e+00
+1989 2002 -4.16666666666667e+00
+1989 1990 -8.33333333333333e+00
+1989 2153 4.16666666666667e+00
+1989 2188 -4.16666666666667e+00
+1989 2158 4.16666666666667e+00
+1989 2003 8.33333333333333e+00
+1989 2159 -8.33333333333333e+00
+1989 1907 2.08333333333333e+00
+1989 2189 -4.16666666666667e+00
+1989 2152 4.16666666666667e+00
+1989 1906 -4.16666666666667e+00
+1989 2151 -1.87500000000000e+01
+1989 1985 -2.08333333333333e+00
+1989 1877 0.00000000000000e+00
+1989 1984 4.16666666666667e+00
+1989 1876 0.00000000000000e+00
+1989 1983 -6.25000000000000e+00
+1989 2171 -2.08333333333333e+00
+1989 2001 -1.25000000000000e+01
+1990 1990 6.25000000000000e+01
+1990 2175 4.16666666666667e+00
+1990 2177 -8.33333333333333e+00
+1990 1907 2.08333333333333e+00
+1990 2170 -1.87500000000000e+01
+1990 2169 4.16666666666667e+00
+1990 1988 0.00000000000000e+00
+1990 1877 0.00000000000000e+00
+1990 1987 0.00000000000000e+00
+1990 1986 0.00000000000000e+00
+1990 2001 -4.16666666666667e+00
+1990 2153 -2.08333333333333e+00
+1990 1989 -8.33333333333333e+00
+1990 2187 -4.16666666666667e+00
+1990 2157 4.16666666666667e+00
+1990 2189 -4.16666666666667e+00
+1990 2159 4.16666666666667e+00
+1990 2152 -6.25000000000000e+00
+1990 2151 4.16666666666667e+00
+1990 1905 -4.16666666666667e+00
+1990 1985 4.16666666666667e+00
+1990 1991 -8.33333333333333e+00
+1990 2003 8.33333333333333e+00
+1990 1984 -1.87500000000000e+01
+1990 2171 4.16666666666667e+00
+1990 2002 -1.25000000000000e+01
+1990 1983 4.16666666666667e+00
+1990 1875 0.00000000000000e+00
+1991 1991 6.25000000000000e+01
+1991 2170 4.16666666666667e+00
+1991 2176 -8.33333333333333e+00
+1991 2175 4.16666666666667e+00
+1991 2171 -6.25000000000000e+00
+1991 1906 2.08333333333333e+00
+1991 1988 0.00000000000000e+00
+1991 1987 0.00000000000000e+00
+1991 1876 0.00000000000000e+00
+1991 1989 -8.33333333333333e+00
+1991 1986 0.00000000000000e+00
+1991 2152 -2.08333333333333e+00
+1991 2151 4.16666666666667e+00
+1991 2188 -4.16666666666667e+00
+1991 2158 4.16666666666667e+00
+1991 2001 8.33333333333333e+00
+1991 2157 -8.33333333333333e+00
+1991 2153 -6.25000000000000e+00
+1991 1905 2.08333333333333e+00
+1991 2187 -4.16666666666667e+00
+1991 1985 -6.25000000000000e+00
+1991 2169 -2.08333333333333e+00
+1991 2003 -3.75000000000000e+01
+1991 1984 4.16666666666667e+00
+1991 1990 -8.33333333333333e+00
+1991 2002 8.33333333333333e+00
+1991 1983 -2.08333333333333e+00
+1991 1875 0.00000000000000e+00
+1992 1992 1.00000000000000e+00
+1992 2210 0.00000000000000e+00
+1992 2000 0.00000000000000e+00
+1992 1999 0.00000000000000e+00
+1992 1998 0.00000000000000e+00
+1992 2003 0.00000000000000e+00
+1992 2213 0.00000000000000e+00
+1992 2206 0.00000000000000e+00
+1992 2212 0.00000000000000e+00
+1992 1910 0.00000000000000e+00
+1992 2207 0.00000000000000e+00
+1992 1908 0.00000000000000e+00
+1992 1994 0.00000000000000e+00
+1992 1997 0.00000000000000e+00
+1992 1877 0.00000000000000e+00
+1992 1996 0.00000000000000e+00
+1992 2002 0.00000000000000e+00
+1992 2209 0.00000000000000e+00
+1992 1995 0.00000000000000e+00
+1992 1875 0.00000000000000e+00
+1993 1993 1.00000000000000e+00
+1993 2210 0.00000000000000e+00
+1993 1910 0.00000000000000e+00
+1993 2000 0.00000000000000e+00
+1993 1994 0.00000000000000e+00
+1993 1877 0.00000000000000e+00
+1993 1999 0.00000000000000e+00
+1993 1998 0.00000000000000e+00
+1993 2205 0.00000000000000e+00
+1993 2211 0.00000000000000e+00
+1993 2207 0.00000000000000e+00
+1993 2213 0.00000000000000e+00
+1993 1909 0.00000000000000e+00
+1993 1997 0.00000000000000e+00
+1993 2003 0.00000000000000e+00
+1993 2208 0.00000000000000e+00
+1993 1996 0.00000000000000e+00
+1993 1876 0.00000000000000e+00
+1993 1995 0.00000000000000e+00
+1993 2001 0.00000000000000e+00
+1994 1994 1.00000000000000e+00
+1994 1909 0.00000000000000e+00
+1994 2208 0.00000000000000e+00
+1994 2000 0.00000000000000e+00
+1994 1999 0.00000000000000e+00
+1994 1993 0.00000000000000e+00
+1994 1876 0.00000000000000e+00
+1994 1998 0.00000000000000e+00
+1994 2001 0.00000000000000e+00
+1994 2211 0.00000000000000e+00
+1994 1910 0.00000000000000e+00
+1994 2206 0.00000000000000e+00
+1994 2212 0.00000000000000e+00
+1994 1908 0.00000000000000e+00
+1994 2205 0.00000000000000e+00
+1994 2209 0.00000000000000e+00
+1994 1997 0.00000000000000e+00
+1994 1877 0.00000000000000e+00
+1994 1996 0.00000000000000e+00
+1994 2002 0.00000000000000e+00
+1994 1992 0.00000000000000e+00
+1994 1995 0.00000000000000e+00
+1994 1875 0.00000000000000e+00
+1995 1995 6.25000000000000e+01
+1995 2159 4.16666666666667e+00
+1995 2158 -8.33333333333333e+00
+1995 2156 4.16666666666667e+00
+1995 1912 2.08333333333333e+00
+1995 2154 -1.87500000000000e+01
+1995 1985 4.16666666666667e+00
+1995 1984 -2.08333333333333e+00
+1995 1876 0.00000000000000e+00
+1995 1983 -6.25000000000000e+00
+1995 2003 -4.16666666666667e+00
+1995 1997 -8.33333333333333e+00
+1995 2206 -2.08333333333333e+00
+1995 2225 -4.16666666666667e+00
+1995 2213 4.16666666666667e+00
+1995 2224 -4.16666666666667e+00
+1995 2212 4.16666666666667e+00
+1995 2207 4.16666666666667e+00
+1995 1913 -4.16666666666667e+00
+1995 2205 -6.25000000000000e+00
+1995 1994 0.00000000000000e+00
+1995 1877 0.00000000000000e+00
+1995 1993 0.00000000000000e+00
+1995 1996 -8.33333333333333e+00
+1995 2002 8.33333333333333e+00
+1995 1992 0.00000000000000e+00
+1995 2155 4.16666666666667e+00
+1995 2001 -1.25000000000000e+01
+1996 1996 6.25000000000000e+01
+1996 2159 4.16666666666667e+00
+1996 2154 4.16666666666667e+00
+1996 2157 -8.33333333333333e+00
+1996 2155 -6.25000000000000e+00
+1996 1911 2.08333333333333e+00
+1996 1985 4.16666666666667e+00
+1996 1997 -8.33333333333333e+00
+1996 1984 -6.25000000000000e+00
+1996 1983 -2.08333333333333e+00
+1996 1875 0.00000000000000e+00
+1996 2205 -2.08333333333333e+00
+1996 2207 4.16666666666667e+00
+1996 2003 8.33333333333333e+00
+1996 2213 -8.33333333333333e+00
+1996 2223 -4.16666666666667e+00
+1996 2211 4.16666666666667e+00
+1996 1913 2.08333333333333e+00
+1996 2225 -4.16666666666667e+00
+1996 2206 -6.25000000000000e+00
+1996 1994 0.00000000000000e+00
+1996 1877 0.00000000000000e+00
+1996 1993 0.00000000000000e+00
+1996 2156 -2.08333333333333e+00
+1996 2002 -3.75000000000000e+01
+1996 1992 0.00000000000000e+00
+1996 1995 -8.33333333333333e+00
+1996 2001 8.33333333333333e+00
+1997 1997 6.25000000000000e+01
+1997 2158 4.16666666666667e+00
+1997 2157 4.16666666666667e+00
+1997 2156 -6.25000000000000e+00
+1997 2154 4.16666666666667e+00
+1997 1985 -1.87500000000000e+01
+1997 1984 4.16666666666667e+00
+1997 1996 -8.33333333333333e+00
+1997 1983 4.16666666666667e+00
+1997 2001 -4.16666666666667e+00
+1997 1995 -8.33333333333333e+00
+1997 2206 4.16666666666667e+00
+1997 2223 -4.16666666666667e+00
+1997 2211 4.16666666666667e+00
+1997 2002 8.33333333333333e+00
+1997 2212 -8.33333333333333e+00
+1997 2207 -1.87500000000000e+01
+1997 1912 2.08333333333333e+00
+1997 2224 -4.16666666666667e+00
+1997 2205 4.16666666666667e+00
+1997 1911 -4.16666666666667e+00
+1997 1994 0.00000000000000e+00
+1997 2155 -2.08333333333333e+00
+1997 2003 -1.25000000000000e+01
+1997 1993 0.00000000000000e+00
+1997 1876 0.00000000000000e+00
+1997 1992 0.00000000000000e+00
+1997 1875 0.00000000000000e+00
+1998 1998 1.00000000000000e+00
+1998 2174 0.00000000000000e+00
+1998 2173 0.00000000000000e+00
+1998 2176 0.00000000000000e+00
+1998 1915 0.00000000000000e+00
+1998 2172 0.00000000000000e+00
+1998 2000 0.00000000000000e+00
+1998 1988 0.00000000000000e+00
+1998 1987 0.00000000000000e+00
+1998 1876 0.00000000000000e+00
+1998 1986 0.00000000000000e+00
+1998 2209 0.00000000000000e+00
+1998 2210 0.00000000000000e+00
+1998 2003 0.00000000000000e+00
+1998 2213 0.00000000000000e+00
+1998 2242 0.00000000000000e+00
+1998 2212 0.00000000000000e+00
+1998 1916 0.00000000000000e+00
+1998 2243 0.00000000000000e+00
+1998 2208 0.00000000000000e+00
+1998 1994 0.00000000000000e+00
+1998 1877 0.00000000000000e+00
+1998 1999 0.00000000000000e+00
+1998 1993 0.00000000000000e+00
+1998 2002 0.00000000000000e+00
+1998 2177 0.00000000000000e+00
+1998 1992 0.00000000000000e+00
+1998 2001 0.00000000000000e+00
+1999 1999 1.00000000000000e+00
+1999 2177 0.00000000000000e+00
+1999 2175 0.00000000000000e+00
+1999 2174 0.00000000000000e+00
+1999 2173 0.00000000000000e+00
+1999 1914 0.00000000000000e+00
+1999 1988 0.00000000000000e+00
+1999 1987 0.00000000000000e+00
+1999 1986 0.00000000000000e+00
+1999 1875 0.00000000000000e+00
+1999 2003 0.00000000000000e+00
+1999 2000 0.00000000000000e+00
+1999 2208 0.00000000000000e+00
+1999 2243 0.00000000000000e+00
+1999 2213 0.00000000000000e+00
+1999 2241 0.00000000000000e+00
+1999 2211 0.00000000000000e+00
+1999 1916 0.00000000000000e+00
+1999 2210 0.00000000000000e+00
+1999 2209 0.00000000000000e+00
+1999 1994 0.00000000000000e+00
+1999 1877 0.00000000000000e+00
+1999 2172 0.00000000000000e+00
+1999 1993 0.00000000000000e+00
+1999 2002 0.00000000000000e+00
+1999 1998 0.00000000000000e+00
+1999 1992 0.00000000000000e+00
+1999 2001 0.00000000000000e+00
+2000 2000 1.00000000000000e+00
+2000 2172 0.00000000000000e+00
+2000 2176 0.00000000000000e+00
+2000 2174 0.00000000000000e+00
+2000 2173 0.00000000000000e+00
+2000 1988 0.00000000000000e+00
+2000 1987 0.00000000000000e+00
+2000 1998 0.00000000000000e+00
+2000 1986 0.00000000000000e+00
+2000 2002 0.00000000000000e+00
+2000 1999 0.00000000000000e+00
+2000 2242 0.00000000000000e+00
+2000 2212 0.00000000000000e+00
+2000 2208 0.00000000000000e+00
+2000 2001 0.00000000000000e+00
+2000 2211 0.00000000000000e+00
+2000 2210 0.00000000000000e+00
+2000 1915 0.00000000000000e+00
+2000 2209 0.00000000000000e+00
+2000 1914 0.00000000000000e+00
+2000 2241 0.00000000000000e+00
+2000 2175 0.00000000000000e+00
+2000 1994 0.00000000000000e+00
+2000 2003 0.00000000000000e+00
+2000 1993 0.00000000000000e+00
+2000 1876 0.00000000000000e+00
+2000 1992 0.00000000000000e+00
+2000 1875 0.00000000000000e+00
+2001 2001 1.25000000000000e+02
+2001 2176 8.33333333333333e+00
+2001 2175 -1.25000000000000e+01
+2001 1988 0.00000000000000e+00
+2001 1987 0.00000000000000e+00
+2001 2000 0.00000000000000e+00
+2001 2242 4.16666666666667e+00
+2001 1999 0.00000000000000e+00
+2001 1998 0.00000000000000e+00
+2001 2243 4.16666666666667e+00
+2001 1990 -4.16666666666667e+00
+2001 1991 8.33333333333333e+00
+2001 2003 -1.66666666666667e+01
+2001 1877 0.00000000000000e+00
+2001 1989 -1.25000000000000e+01
+2001 2189 4.16666666666667e+00
+2001 1919 -4.16666666666667e+00
+2001 2188 -8.33333333333333e+00
+2001 1985 4.16666666666667e+00
+2001 2158 8.33333333333333e+00
+2001 2002 -1.66666666666667e+01
+2001 2159 8.33333333333333e+00
+2001 1918 -4.16666666666667e+00
+2001 2157 -3.75000000000000e+01
+2001 1984 4.16666666666667e+00
+2001 1876 0.00000000000000e+00
+2001 1997 -4.16666666666667e+00
+2001 1994 0.00000000000000e+00
+2001 2224 4.16666666666667e+00
+2001 2212 -4.16666666666667e+00
+2001 1993 0.00000000000000e+00
+2001 1996 8.33333333333333e+00
+2001 1995 -1.25000000000000e+01
+2001 2213 8.33333333333333e+00
+2001 2225 -8.33333333333333e+00
+2001 2211 -1.25000000000000e+01
+2001 2177 -4.16666666666667e+00
+2002 2002 1.25000000000000e+02
+2002 2175 8.33333333333333e+00
+2002 2177 8.33333333333333e+00
+2002 2176 -3.75000000000000e+01
+2002 1986 0.00000000000000e+00
+2002 2000 0.00000000000000e+00
+2002 2241 4.16666666666667e+00
+2002 1999 0.00000000000000e+00
+2002 1998 0.00000000000000e+00
+2002 2243 -8.33333333333333e+00
+2002 1989 -4.16666666666667e+00
+2002 2189 4.16666666666667e+00
+2002 1991 8.33333333333333e+00
+2002 1990 -1.25000000000000e+01
+2002 2187 -8.33333333333333e+00
+2002 2159 -4.16666666666667e+00
+2002 2157 8.33333333333333e+00
+2002 2001 -1.66666666666667e+01
+2002 2158 -1.25000000000000e+01
+2002 1917 -4.16666666666667e+00
+2002 1985 -8.33333333333333e+00
+2002 1983 4.16666666666667e+00
+2002 1875 0.00000000000000e+00
+2002 1997 8.33333333333333e+00
+2002 2003 -1.66666666666667e+01
+2002 2213 8.33333333333333e+00
+2002 2223 4.16666666666667e+00
+2002 2211 -4.16666666666667e+00
+2002 1994 0.00000000000000e+00
+2002 1877 0.00000000000000e+00
+2002 1996 -3.75000000000000e+01
+2002 1992 0.00000000000000e+00
+2002 1995 8.33333333333333e+00
+2002 2225 4.16666666666667e+00
+2002 1919 -4.16666666666667e+00
+2002 2212 -1.25000000000000e+01
+2002 1988 0.00000000000000e+00
+2003 2003 1.25000000000000e+02
+2003 1987 0.00000000000000e+00
+2003 2177 -1.25000000000000e+01
+2003 2176 8.33333333333333e+00
+2003 1986 0.00000000000000e+00
+2003 1999 0.00000000000000e+00
+2003 1998 0.00000000000000e+00
+2003 2000 0.00000000000000e+00
+2003 2242 -8.33333333333333e+00
+2003 2241 4.16666666666667e+00
+2003 2188 4.16666666666667e+00
+2003 1989 8.33333333333333e+00
+2003 2001 -1.66666666666667e+01
+2003 1991 -3.75000000000000e+01
+2003 1990 8.33333333333333e+00
+2003 1875 0.00000000000000e+00
+2003 2187 4.16666666666667e+00
+2003 1917 -4.16666666666667e+00
+2003 2158 -4.16666666666667e+00
+2003 1983 4.16666666666667e+00
+2003 2159 -1.25000000000000e+01
+2003 2157 8.33333333333333e+00
+2003 1984 -8.33333333333333e+00
+2003 1995 -4.16666666666667e+00
+2003 1992 0.00000000000000e+00
+2003 1996 8.33333333333333e+00
+2003 2002 -1.66666666666667e+01
+2003 2212 8.33333333333333e+00
+2003 1997 -1.25000000000000e+01
+2003 1993 0.00000000000000e+00
+2003 1876 0.00000000000000e+00
+2003 2213 -3.75000000000000e+01
+2003 2175 -4.16666666666667e+00
+2003 2224 4.16666666666667e+00
+2003 1918 -4.16666666666667e+00
+2003 2211 8.33333333333333e+00
+2003 2223 -8.33333333333333e+00
+2004 2004 3.75000000000000e+01
+2004 1879 2.08333333333333e+00
+2004 2011 -4.16666666666667e+00
+2004 2162 -2.08333333333333e+00
+2004 2005 -4.16666666666667e+00
+2004 2161 4.16666666666667e+00
+2004 1900 2.08333333333333e+00
+2004 2160 -6.25000000000000e+00
+2004 2024 -4.16666666666667e+00
+2004 2168 4.16666666666667e+00
+2004 1880 2.08333333333333e+00
+2004 2018 -4.16666666666667e+00
+2004 2017 2.08333333333333e+00
+2004 2023 -4.16666666666667e+00
+2004 1878 -1.25000000000000e+01
+2004 2006 -4.16666666666667e+00
+2004 2165 4.16666666666667e+00
+2004 1901 2.08333333333333e+00
+2004 2164 -2.08333333333333e+00
+2004 2167 4.16666666666667e+00
+2004 2012 2.08333333333333e+00
+2004 2163 -6.25000000000000e+00
+2004 1899 -1.25000000000000e+01
+2005 2005 3.33333333333333e+01
+2005 1878 2.08333333333333e+00
+2005 2010 -4.16666666666667e+00
+2005 2162 4.16666666666667e+00
+2005 2161 -1.87500000000000e+01
+2005 2004 -4.16666666666667e+00
+2005 2160 4.16666666666667e+00
+2005 1899 2.08333333333333e+00
+2005 2018 2.08333333333333e+00
+2005 2024 -4.16666666666667e+00
+2005 1879 -4.16666666666667e+00
+2005 2016 2.08333333333333e+00
+2005 2022 -4.16666666666667e+00
+2005 2165 4.16666666666667e+00
+2005 2168 -8.33333333333333e+00
+2005 2012 2.08333333333333e+00
+2005 2164 -6.25000000000000e+00
+2005 1900 -4.16666666666667e+00
+2005 2163 -2.08333333333333e+00
+2005 2166 4.16666666666667e+00
+2006 2006 3.33333333333333e+01
+2006 2010 2.08333333333333e+00
+2006 2162 -6.25000000000000e+00
+2006 2161 4.16666666666667e+00
+2006 2160 -2.08333333333333e+00
+2006 2017 2.08333333333333e+00
+2006 2023 -4.16666666666667e+00
+2006 2022 -4.16666666666667e+00
+2006 2166 4.16666666666667e+00
+2006 1880 -4.16666666666667e+00
+2006 1878 2.08333333333333e+00
+2006 2016 -4.16666666666667e+00
+2006 2011 2.08333333333333e+00
+2006 2165 -1.87500000000000e+01
+2006 1901 -4.16666666666667e+00
+2006 2164 4.16666666666667e+00
+2006 2167 -8.33333333333333e+00
+2006 2004 -4.16666666666667e+00
+2006 2163 4.16666666666667e+00
+2006 1899 2.08333333333333e+00
+2007 2007 3.75000000000000e+01
+2007 1921 2.08333333333333e+00
+2007 2278 -4.16666666666667e+00
+2007 2015 -2.08333333333333e+00
+2007 2008 -4.16666666666667e+00
+2007 2014 4.16666666666667e+00
+2007 1879 2.08333333333333e+00
+2007 2013 -6.25000000000000e+00
+2007 2285 -4.16666666666667e+00
+2007 2027 4.16666666666667e+00
+2007 1922 2.08333333333333e+00
+2007 2282 -4.16666666666667e+00
+2007 2281 2.08333333333333e+00
+2007 2284 -4.16666666666667e+00
+2007 1920 -1.25000000000000e+01
+2007 2009 -4.16666666666667e+00
+2007 2021 4.16666666666667e+00
+2007 1880 2.08333333333333e+00
+2007 2020 -2.08333333333333e+00
+2007 2026 4.16666666666667e+00
+2007 2279 2.08333333333333e+00
+2007 2019 -6.25000000000000e+00
+2007 1878 -1.25000000000000e+01
+2008 2008 3.33333333333333e+01
+2008 1920 2.08333333333333e+00
+2008 2277 -4.16666666666667e+00
+2008 2015 4.16666666666667e+00
+2008 2014 -1.87500000000000e+01
+2008 2007 -4.16666666666667e+00
+2008 2013 4.16666666666667e+00
+2008 1878 2.08333333333333e+00
+2008 2282 2.08333333333333e+00
+2008 2285 -4.16666666666667e+00
+2008 1921 -4.16666666666667e+00
+2008 2280 2.08333333333333e+00
+2008 2283 -4.16666666666667e+00
+2008 2021 4.16666666666667e+00
+2008 2027 -8.33333333333333e+00
+2008 2279 2.08333333333333e+00
+2008 2020 -6.25000000000000e+00
+2008 1879 -4.16666666666667e+00
+2008 2019 -2.08333333333333e+00
+2008 2025 4.16666666666667e+00
+2009 2009 3.33333333333333e+01
+2009 2277 2.08333333333333e+00
+2009 2015 -6.25000000000000e+00
+2009 2014 4.16666666666667e+00
+2009 2013 -2.08333333333333e+00
+2009 2281 2.08333333333333e+00
+2009 2284 -4.16666666666667e+00
+2009 2283 -4.16666666666667e+00
+2009 2025 4.16666666666667e+00
+2009 1922 -4.16666666666667e+00
+2009 1920 2.08333333333333e+00
+2009 2280 -4.16666666666667e+00
+2009 2278 2.08333333333333e+00
+2009 2021 -1.87500000000000e+01
+2009 1880 -4.16666666666667e+00
+2009 2020 4.16666666666667e+00
+2009 2026 -8.33333333333333e+00
+2009 2007 -4.16666666666667e+00
+2009 2019 4.16666666666667e+00
+2009 1878 2.08333333333333e+00
+2010 2010 6.25000000000000e+01
+2010 2296 -4.16666666666667e+00
+2010 2015 4.16666666666667e+00
+2010 2014 4.16666666666667e+00
+2010 2013 -1.87500000000000e+01
+2010 2303 -4.16666666666667e+00
+2010 2302 -4.16666666666667e+00
+2010 2027 -8.33333333333333e+00
+2010 2026 4.16666666666667e+00
+2010 2162 4.16666666666667e+00
+2010 2012 -8.33333333333333e+00
+2010 2024 8.33333333333333e+00
+2010 2299 4.16666666666667e+00
+2010 2023 -4.16666666666667e+00
+2010 1880 -2.08333333333333e+00
+2010 2006 2.08333333333333e+00
+2010 1879 4.16666666666667e+00
+2010 2005 -4.16666666666667e+00
+2010 1878 -6.25000000000000e+00
+2010 2022 -1.25000000000000e+01
+2010 1925 -2.08333333333333e+00
+2010 2300 4.16666666666667e+00
+2010 2011 -8.33333333333333e+00
+2010 1924 4.16666666666667e+00
+2010 2161 4.16666666666667e+00
+2010 2297 2.08333333333333e+00
+2010 1923 -6.25000000000000e+00
+2010 2160 -1.87500000000000e+01
+2011 2011 6.25000000000000e+01
+2011 2295 -4.16666666666667e+00
+2011 2015 -2.08333333333333e+00
+2011 2014 -6.25000000000000e+00
+2011 2013 4.16666666666667e+00
+2011 2303 -4.16666666666667e+00
+2011 2027 4.16666666666667e+00
+2011 2301 -4.16666666666667e+00
+2011 2025 4.16666666666667e+00
+2011 2162 -2.08333333333333e+00
+2011 2006 2.08333333333333e+00
+2011 2298 4.16666666666667e+00
+2011 2022 -4.16666666666667e+00
+2011 1880 4.16666666666667e+00
+2011 2012 -8.33333333333333e+00
+2011 2024 8.33333333333333e+00
+2011 1879 -1.87500000000000e+01
+2011 2023 -1.25000000000000e+01
+2011 1878 4.16666666666667e+00
+2011 2004 -4.16666666666667e+00
+2011 1925 4.16666666666667e+00
+2011 2300 -8.33333333333333e+00
+2011 2297 2.08333333333333e+00
+2011 1924 -1.87500000000000e+01
+2011 2161 -6.25000000000000e+00
+2011 2010 -8.33333333333333e+00
+2011 1923 4.16666666666667e+00
+2011 2160 4.16666666666667e+00
+2012 2012 6.25000000000000e+01
+2012 2296 2.08333333333333e+00
+2012 2015 -6.25000000000000e+00
+2012 2014 -2.08333333333333e+00
+2012 2013 4.16666666666667e+00
+2012 2301 -4.16666666666667e+00
+2012 2302 -4.16666666666667e+00
+2012 2026 4.16666666666667e+00
+2012 2025 -8.33333333333333e+00
+2012 2161 -2.08333333333333e+00
+2012 2005 2.08333333333333e+00
+2012 2160 4.16666666666667e+00
+2012 2010 -8.33333333333333e+00
+2012 2022 8.33333333333333e+00
+2012 1880 -6.25000000000000e+00
+2012 2024 -3.75000000000000e+01
+2012 1879 4.16666666666667e+00
+2012 2011 -8.33333333333333e+00
+2012 2023 8.33333333333333e+00
+2012 1878 -2.08333333333333e+00
+2012 2004 2.08333333333333e+00
+2012 2295 2.08333333333333e+00
+2012 1925 -6.25000000000000e+00
+2012 2162 -6.25000000000000e+00
+2012 1924 4.16666666666667e+00
+2012 2299 -8.33333333333333e+00
+2012 1923 -2.08333333333333e+00
+2012 2298 4.16666666666667e+00
+2013 2013 6.25000000000000e+01
+2013 2302 4.16666666666667e+00
+2013 2303 4.16666666666667e+00
+2013 2296 4.16666666666667e+00
+2013 2295 -6.25000000000000e+00
+2013 2015 -8.33333333333333e+00
+2013 2012 4.16666666666667e+00
+2013 2011 4.16666666666667e+00
+2013 2010 -1.87500000000000e+01
+2013 2026 -4.16666666666667e+00
+2013 2014 -8.33333333333333e+00
+2013 2279 4.16666666666667e+00
+2013 2314 -4.16666666666667e+00
+2013 2284 4.16666666666667e+00
+2013 2027 8.33333333333333e+00
+2013 2285 -8.33333333333333e+00
+2013 1928 2.08333333333333e+00
+2013 2315 -4.16666666666667e+00
+2013 2278 4.16666666666667e+00
+2013 1927 -4.16666666666667e+00
+2013 2277 -1.87500000000000e+01
+2013 2009 -2.08333333333333e+00
+2013 1880 2.08333333333333e+00
+2013 2008 4.16666666666667e+00
+2013 1879 -4.16666666666667e+00
+2013 2007 -6.25000000000000e+00
+2013 2297 -2.08333333333333e+00
+2013 2025 -1.25000000000000e+01
+2014 2014 6.25000000000000e+01
+2014 2301 4.16666666666667e+00
+2014 2303 -8.33333333333333e+00
+2014 1928 2.08333333333333e+00
+2014 2296 -1.87500000000000e+01
+2014 2295 4.16666666666667e+00
+2014 2012 -2.08333333333333e+00
+2014 1880 2.08333333333333e+00
+2014 2011 -6.25000000000000e+00
+2014 2010 4.16666666666667e+00
+2014 2025 -4.16666666666667e+00
+2014 2279 -2.08333333333333e+00
+2014 2013 -8.33333333333333e+00
+2014 2313 -4.16666666666667e+00
+2014 2283 4.16666666666667e+00
+2014 2315 -4.16666666666667e+00
+2014 2285 4.16666666666667e+00
+2014 2278 -6.25000000000000e+00
+2014 2277 4.16666666666667e+00
+2014 1926 -4.16666666666667e+00
+2014 2009 4.16666666666667e+00
+2014 2015 -8.33333333333333e+00
+2014 2027 8.33333333333333e+00
+2014 2008 -1.87500000000000e+01
+2014 2297 4.16666666666667e+00
+2014 2026 -1.25000000000000e+01
+2014 2007 4.16666666666667e+00
+2014 1878 -4.16666666666667e+00
+2015 2015 6.25000000000000e+01
+2015 2296 4.16666666666667e+00
+2015 2302 -8.33333333333333e+00
+2015 2301 4.16666666666667e+00
+2015 2297 -6.25000000000000e+00
+2015 1927 2.08333333333333e+00
+2015 2012 -6.25000000000000e+00
+2015 2011 -2.08333333333333e+00
+2015 1879 2.08333333333333e+00
+2015 2013 -8.33333333333333e+00
+2015 2010 4.16666666666667e+00
+2015 2278 -2.08333333333333e+00
+2015 2277 4.16666666666667e+00
+2015 2314 -4.16666666666667e+00
+2015 2284 4.16666666666667e+00
+2015 2025 8.33333333333333e+00
+2015 2283 -8.33333333333333e+00
+2015 2279 -6.25000000000000e+00
+2015 1926 2.08333333333333e+00
+2015 2313 -4.16666666666667e+00
+2015 2009 -6.25000000000000e+00
+2015 2295 -2.08333333333333e+00
+2015 2027 -3.75000000000000e+01
+2015 2008 4.16666666666667e+00
+2015 2014 -8.33333333333333e+00
+2015 2026 8.33333333333333e+00
+2015 2007 -2.08333333333333e+00
+2015 1878 2.08333333333333e+00
+2016 2016 6.25000000000000e+01
+2016 2339 -4.16666666666667e+00
+2016 2332 2.08333333333333e+00
+2016 2338 -4.16666666666667e+00
+2016 2333 -4.16666666666667e+00
+2016 2021 4.16666666666667e+00
+2016 2020 4.16666666666667e+00
+2016 2026 -8.33333333333333e+00
+2016 2019 -1.87500000000000e+01
+2016 2336 4.16666666666667e+00
+2016 2024 -4.16666666666667e+00
+2016 2017 -8.33333333333333e+00
+2016 2023 8.33333333333333e+00
+2016 2164 4.16666666666667e+00
+2016 1880 4.16666666666667e+00
+2016 2006 -4.16666666666667e+00
+2016 1879 -2.08333333333333e+00
+2016 2005 2.08333333333333e+00
+2016 1878 -6.25000000000000e+00
+2016 2022 -1.25000000000000e+01
+2016 2018 -8.33333333333333e+00
+2016 1931 4.16666666666667e+00
+2016 2165 4.16666666666667e+00
+2016 1930 -2.08333333333333e+00
+2016 2335 4.16666666666667e+00
+2016 2027 4.16666666666667e+00
+2016 1929 -6.25000000000000e+00
+2016 2163 -1.87500000000000e+01
+2017 2017 6.25000000000000e+01
+2017 2337 -4.16666666666667e+00
+2017 2333 2.08333333333333e+00
+2017 2339 -4.16666666666667e+00
+2017 2021 -2.08333333333333e+00
+2017 2027 4.16666666666667e+00
+2017 2020 -6.25000000000000e+00
+2017 2019 4.16666666666667e+00
+2017 2025 -8.33333333333333e+00
+2017 2006 2.08333333333333e+00
+2017 2165 -2.08333333333333e+00
+2017 2016 -8.33333333333333e+00
+2017 2022 8.33333333333333e+00
+2017 2163 4.16666666666667e+00
+2017 1880 4.16666666666667e+00
+2017 2018 -8.33333333333333e+00
+2017 2024 8.33333333333333e+00
+2017 1879 -6.25000000000000e+00
+2017 2023 -3.75000000000000e+01
+2017 1878 -2.08333333333333e+00
+2017 2004 2.08333333333333e+00
+2017 1931 4.16666666666667e+00
+2017 2336 -8.33333333333333e+00
+2017 2331 2.08333333333333e+00
+2017 1930 -6.25000000000000e+00
+2017 2164 -6.25000000000000e+00
+2017 1929 -2.08333333333333e+00
+2017 2334 4.16666666666667e+00
+2018 2018 6.25000000000000e+01
+2018 2337 -4.16666666666667e+00
+2018 2332 2.08333333333333e+00
+2018 2338 -4.16666666666667e+00
+2018 2331 -4.16666666666667e+00
+2018 2021 -6.25000000000000e+00
+2018 2020 -2.08333333333333e+00
+2018 2026 4.16666666666667e+00
+2018 2019 4.16666666666667e+00
+2018 2334 4.16666666666667e+00
+2018 2022 -4.16666666666667e+00
+2018 2005 2.08333333333333e+00
+2018 2164 -2.08333333333333e+00
+2018 1880 -1.87500000000000e+01
+2018 2024 -1.25000000000000e+01
+2018 1879 4.16666666666667e+00
+2018 2017 -8.33333333333333e+00
+2018 2023 8.33333333333333e+00
+2018 1878 4.16666666666667e+00
+2018 2004 -4.16666666666667e+00
+2018 2025 4.16666666666667e+00
+2018 1931 -1.87500000000000e+01
+2018 2165 -6.25000000000000e+00
+2018 1930 4.16666666666667e+00
+2018 2335 -8.33333333333333e+00
+2018 2016 -8.33333333333333e+00
+2018 1929 4.16666666666667e+00
+2018 2163 4.16666666666667e+00
+2019 2019 6.25000000000000e+01
+2019 2285 4.16666666666667e+00
+2019 2284 -8.33333333333333e+00
+2019 2282 4.16666666666667e+00
+2019 1933 2.08333333333333e+00
+2019 2280 -1.87500000000000e+01
+2019 2009 4.16666666666667e+00
+2019 2008 -2.08333333333333e+00
+2019 1879 2.08333333333333e+00
+2019 2007 -6.25000000000000e+00
+2019 2027 -4.16666666666667e+00
+2019 2021 -8.33333333333333e+00
+2019 2332 -2.08333333333333e+00
+2019 2351 -4.16666666666667e+00
+2019 2339 4.16666666666667e+00
+2019 2350 -4.16666666666667e+00
+2019 2338 4.16666666666667e+00
+2019 2333 4.16666666666667e+00
+2019 1934 -4.16666666666667e+00
+2019 2331 -6.25000000000000e+00
+2019 2018 4.16666666666667e+00
+2019 1880 -4.16666666666667e+00
+2019 2017 4.16666666666667e+00
+2019 2020 -8.33333333333333e+00
+2019 2026 8.33333333333333e+00
+2019 2016 -1.87500000000000e+01
+2019 2281 4.16666666666667e+00
+2019 2025 -1.25000000000000e+01
+2020 2020 6.25000000000000e+01
+2020 2285 4.16666666666667e+00
+2020 2280 4.16666666666667e+00
+2020 2283 -8.33333333333333e+00
+2020 2281 -6.25000000000000e+00
+2020 1932 2.08333333333333e+00
+2020 2009 4.16666666666667e+00
+2020 2021 -8.33333333333333e+00
+2020 2008 -6.25000000000000e+00
+2020 2007 -2.08333333333333e+00
+2020 1878 2.08333333333333e+00
+2020 2331 -2.08333333333333e+00
+2020 2333 4.16666666666667e+00
+2020 2027 8.33333333333333e+00
+2020 2339 -8.33333333333333e+00
+2020 2349 -4.16666666666667e+00
+2020 2337 4.16666666666667e+00
+2020 1934 2.08333333333333e+00
+2020 2351 -4.16666666666667e+00
+2020 2332 -6.25000000000000e+00
+2020 2018 -2.08333333333333e+00
+2020 1880 2.08333333333333e+00
+2020 2017 -6.25000000000000e+00
+2020 2282 -2.08333333333333e+00
+2020 2026 -3.75000000000000e+01
+2020 2016 4.16666666666667e+00
+2020 2019 -8.33333333333333e+00
+2020 2025 8.33333333333333e+00
+2021 2021 6.25000000000000e+01
+2021 2284 4.16666666666667e+00
+2021 2283 4.16666666666667e+00
+2021 2282 -6.25000000000000e+00
+2021 2280 4.16666666666667e+00
+2021 2009 -1.87500000000000e+01
+2021 2008 4.16666666666667e+00
+2021 2020 -8.33333333333333e+00
+2021 2007 4.16666666666667e+00
+2021 2025 -4.16666666666667e+00
+2021 2019 -8.33333333333333e+00
+2021 2332 4.16666666666667e+00
+2021 2349 -4.16666666666667e+00
+2021 2337 4.16666666666667e+00
+2021 2026 8.33333333333333e+00
+2021 2338 -8.33333333333333e+00
+2021 2333 -1.87500000000000e+01
+2021 1933 2.08333333333333e+00
+2021 2350 -4.16666666666667e+00
+2021 2331 4.16666666666667e+00
+2021 1932 -4.16666666666667e+00
+2021 2018 -6.25000000000000e+00
+2021 2281 -2.08333333333333e+00
+2021 2027 -1.25000000000000e+01
+2021 2017 -2.08333333333333e+00
+2021 1879 2.08333333333333e+00
+2021 2016 4.16666666666667e+00
+2021 1878 -4.16666666666667e+00
+2022 2022 1.25000000000000e+02
+2022 2302 -8.33333333333333e+00
+2022 2027 8.33333333333333e+00
+2022 2339 -8.33333333333333e+00
+2022 2368 -4.16666666666667e+00
+2022 2338 4.16666666666667e+00
+2022 2369 -4.16666666666667e+00
+2022 2026 8.33333333333333e+00
+2022 2025 -3.75000000000000e+01
+2022 2012 8.33333333333333e+00
+2022 2161 4.16666666666667e+00
+2022 2011 -4.16666666666667e+00
+2022 2162 -8.33333333333333e+00
+2022 1880 4.16666666666667e+00
+2022 2010 -1.25000000000000e+01
+2022 2300 -4.16666666666667e+00
+2022 1937 4.16666666666667e+00
+2022 2023 -1.66666666666667e+01
+2022 2299 8.33333333333333e+00
+2022 2298 -1.25000000000000e+01
+2022 2018 -4.16666666666667e+00
+2022 2017 8.33333333333333e+00
+2022 2006 -4.16666666666667e+00
+2022 2165 4.16666666666667e+00
+2022 2167 8.33333333333333e+00
+2022 2164 -8.33333333333333e+00
+2022 1879 4.16666666666667e+00
+2022 2005 -4.16666666666667e+00
+2022 2016 -1.25000000000000e+01
+2022 2024 -1.66666666666667e+01
+2022 2336 8.33333333333333e+00
+2022 2168 8.33333333333333e+00
+2022 2335 -4.16666666666667e+00
+2022 1936 4.16666666666667e+00
+2022 2303 4.16666666666667e+00
+2022 2334 -1.25000000000000e+01
+2022 2166 -3.75000000000000e+01
+2023 2023 1.25000000000000e+02
+2023 2301 -8.33333333333333e+00
+2023 2027 -4.16666666666667e+00
+2023 2369 -4.16666666666667e+00
+2023 2339 4.16666666666667e+00
+2023 2367 -4.16666666666667e+00
+2023 2337 4.16666666666667e+00
+2023 2026 -1.25000000000000e+01
+2023 2025 8.33333333333333e+00
+2023 2160 4.16666666666667e+00
+2023 2010 -4.16666666666667e+00
+2023 2162 4.16666666666667e+00
+2023 2012 8.33333333333333e+00
+2023 2011 -1.25000000000000e+01
+2023 2300 8.33333333333333e+00
+2023 2299 -3.75000000000000e+01
+2023 2022 -1.66666666666667e+01
+2023 2298 8.33333333333333e+00
+2023 2168 -4.16666666666667e+00
+2023 2024 -1.66666666666667e+01
+2023 2006 -4.16666666666667e+00
+2023 2165 4.16666666666667e+00
+2023 2016 8.33333333333333e+00
+2023 2166 8.33333333333333e+00
+2023 2163 -8.33333333333333e+00
+2023 1880 -8.33333333333333e+00
+2023 2018 8.33333333333333e+00
+2023 2017 -3.75000000000000e+01
+2023 1878 4.16666666666667e+00
+2023 2004 -4.16666666666667e+00
+2023 2336 8.33333333333333e+00
+2023 1937 -8.33333333333333e+00
+2023 2303 4.16666666666667e+00
+2023 2335 -1.25000000000000e+01
+2023 2167 -1.25000000000000e+01
+2023 2334 -4.16666666666667e+00
+2023 1935 4.16666666666667e+00
+2024 2024 1.25000000000000e+02
+2024 2302 4.16666666666667e+00
+2024 2026 -4.16666666666667e+00
+2024 2368 -4.16666666666667e+00
+2024 2338 4.16666666666667e+00
+2024 2025 8.33333333333333e+00
+2024 2337 -8.33333333333333e+00
+2024 2367 -4.16666666666667e+00
+2024 2027 -1.25000000000000e+01
+2024 2010 8.33333333333333e+00
+2024 2161 4.16666666666667e+00
+2024 2160 -8.33333333333333e+00
+2024 2012 -3.75000000000000e+01
+2024 2011 8.33333333333333e+00
+2024 1878 4.16666666666667e+00
+2024 2300 -1.25000000000000e+01
+2024 2299 8.33333333333333e+00
+2024 2298 -4.16666666666667e+00
+2024 1935 4.16666666666667e+00
+2024 2167 -4.16666666666667e+00
+2024 2023 -1.66666666666667e+01
+2024 2016 -4.16666666666667e+00
+2024 2005 -4.16666666666667e+00
+2024 2164 4.16666666666667e+00
+2024 2004 -4.16666666666667e+00
+2024 2163 4.16666666666667e+00
+2024 2018 -1.25000000000000e+01
+2024 1879 -8.33333333333333e+00
+2024 2017 8.33333333333333e+00
+2024 2301 4.16666666666667e+00
+2024 2336 -3.75000000000000e+01
+2024 2168 -1.25000000000000e+01
+2024 2335 8.33333333333333e+00
+2024 1936 -8.33333333333333e+00
+2024 2022 -1.66666666666667e+01
+2024 2334 8.33333333333333e+00
+2024 2166 8.33333333333333e+00
+2025 2025 1.25000000000000e+02
+2025 2302 8.33333333333333e+00
+2025 2301 -1.25000000000000e+01
+2025 2012 -8.33333333333333e+00
+2025 2011 4.16666666666667e+00
+2025 2024 8.33333333333333e+00
+2025 2368 4.16666666666667e+00
+2025 2023 8.33333333333333e+00
+2025 2022 -3.75000000000000e+01
+2025 2369 4.16666666666667e+00
+2025 2014 -4.16666666666667e+00
+2025 2015 8.33333333333333e+00
+2025 2027 -1.66666666666667e+01
+2025 1880 -4.16666666666667e+00
+2025 2013 -1.25000000000000e+01
+2025 2315 4.16666666666667e+00
+2025 1940 -4.16666666666667e+00
+2025 2314 -8.33333333333333e+00
+2025 2009 4.16666666666667e+00
+2025 2284 8.33333333333333e+00
+2025 2026 -1.66666666666667e+01
+2025 2285 8.33333333333333e+00
+2025 1939 -4.16666666666667e+00
+2025 2283 -3.75000000000000e+01
+2025 2008 4.16666666666667e+00
+2025 1879 -4.16666666666667e+00
+2025 2021 -4.16666666666667e+00
+2025 2018 4.16666666666667e+00
+2025 2350 4.16666666666667e+00
+2025 2338 -4.16666666666667e+00
+2025 2017 -8.33333333333333e+00
+2025 2020 8.33333333333333e+00
+2025 2019 -1.25000000000000e+01
+2025 2339 8.33333333333333e+00
+2025 2351 -8.33333333333333e+00
+2025 2337 -1.25000000000000e+01
+2025 2303 -4.16666666666667e+00
+2026 2026 1.25000000000000e+02
+2026 2301 8.33333333333333e+00
+2026 2303 8.33333333333333e+00
+2026 2302 -3.75000000000000e+01
+2026 2010 4.16666666666667e+00
+2026 2024 -4.16666666666667e+00
+2026 2367 4.16666666666667e+00
+2026 2023 -1.25000000000000e+01
+2026 2022 8.33333333333333e+00
+2026 2369 -8.33333333333333e+00
+2026 2013 -4.16666666666667e+00
+2026 2315 4.16666666666667e+00
+2026 2015 8.33333333333333e+00
+2026 2014 -1.25000000000000e+01
+2026 2313 -8.33333333333333e+00
+2026 2285 -4.16666666666667e+00
+2026 2283 8.33333333333333e+00
+2026 2025 -1.66666666666667e+01
+2026 2284 -1.25000000000000e+01
+2026 1938 -4.16666666666667e+00
+2026 2009 -8.33333333333333e+00
+2026 2007 4.16666666666667e+00
+2026 1878 -4.16666666666667e+00
+2026 2021 8.33333333333333e+00
+2026 2027 -1.66666666666667e+01
+2026 2339 8.33333333333333e+00
+2026 2349 4.16666666666667e+00
+2026 2337 -4.16666666666667e+00
+2026 2018 4.16666666666667e+00
+2026 1880 -4.16666666666667e+00
+2026 2020 -3.75000000000000e+01
+2026 2016 -8.33333333333333e+00
+2026 2019 8.33333333333333e+00
+2026 2351 4.16666666666667e+00
+2026 1940 -4.16666666666667e+00
+2026 2338 -1.25000000000000e+01
+2026 2012 4.16666666666667e+00
+2027 2027 1.25000000000000e+02
+2027 2011 4.16666666666667e+00
+2027 2303 -1.25000000000000e+01
+2027 2302 8.33333333333333e+00
+2027 2010 -8.33333333333333e+00
+2027 2023 -4.16666666666667e+00
+2027 2022 8.33333333333333e+00
+2027 2024 -1.25000000000000e+01
+2027 2368 -8.33333333333333e+00
+2027 2367 4.16666666666667e+00
+2027 2314 4.16666666666667e+00
+2027 2013 8.33333333333333e+00
+2027 2025 -1.66666666666667e+01
+2027 2015 -3.75000000000000e+01
+2027 2014 8.33333333333333e+00
+2027 1878 -4.16666666666667e+00
+2027 2313 4.16666666666667e+00
+2027 1938 -4.16666666666667e+00
+2027 2284 -4.16666666666667e+00
+2027 2007 4.16666666666667e+00
+2027 2285 -1.25000000000000e+01
+2027 2283 8.33333333333333e+00
+2027 2008 -8.33333333333333e+00
+2027 2019 -4.16666666666667e+00
+2027 2016 4.16666666666667e+00
+2027 2020 8.33333333333333e+00
+2027 2026 -1.66666666666667e+01
+2027 2338 8.33333333333333e+00
+2027 2021 -1.25000000000000e+01
+2027 2017 4.16666666666667e+00
+2027 1879 -4.16666666666667e+00
+2027 2339 -3.75000000000000e+01
+2027 2301 -4.16666666666667e+00
+2027 2350 4.16666666666667e+00
+2027 1939 -4.16666666666667e+00
+2027 2337 8.33333333333333e+00
+2027 2349 -8.33333333333333e+00
+2028 2028 3.75000000000000e+01
+2028 2288 -2.08333333333333e+00
+2028 2029 -4.16666666666667e+00
+2028 2287 4.16666666666667e+00
+2028 1921 2.08333333333333e+00
+2028 2286 -6.25000000000000e+00
+2028 2294 4.16666666666667e+00
+2028 2030 -4.16666666666667e+00
+2028 2291 4.16666666666667e+00
+2028 1922 2.08333333333333e+00
+2028 2290 -2.08333333333333e+00
+2028 2293 4.16666666666667e+00
+2028 2289 -6.25000000000000e+00
+2028 1920 -1.25000000000000e+01
+2028 1276 2.08333333333333e+00
+2028 1387 -4.16666666666667e+00
+2028 1400 -4.16666666666667e+00
+2028 1277 2.08333333333333e+00
+2028 1394 -4.16666666666667e+00
+2028 1393 2.08333333333333e+00
+2028 1399 -4.16666666666667e+00
+2028 1275 -1.25000000000000e+01
+2028 1388 2.08333333333333e+00
+2029 2029 3.33333333333333e+01
+2029 2288 4.16666666666667e+00
+2029 2287 -1.87500000000000e+01
+2029 2028 -4.16666666666667e+00
+2029 2286 4.16666666666667e+00
+2029 1920 2.08333333333333e+00
+2029 2291 4.16666666666667e+00
+2029 2294 -8.33333333333333e+00
+2029 2290 -6.25000000000000e+00
+2029 1921 -4.16666666666667e+00
+2029 2289 -2.08333333333333e+00
+2029 2292 4.16666666666667e+00
+2029 1275 2.08333333333333e+00
+2029 1386 -4.16666666666667e+00
+2029 1394 2.08333333333333e+00
+2029 1400 -4.16666666666667e+00
+2029 1276 -4.16666666666667e+00
+2029 1392 2.08333333333333e+00
+2029 1398 -4.16666666666667e+00
+2029 1388 2.08333333333333e+00
+2030 2030 3.33333333333333e+01
+2030 2288 -6.25000000000000e+00
+2030 2287 4.16666666666667e+00
+2030 2286 -2.08333333333333e+00
+2030 2292 4.16666666666667e+00
+2030 2291 -1.87500000000000e+01
+2030 1922 -4.16666666666667e+00
+2030 2290 4.16666666666667e+00
+2030 2293 -8.33333333333333e+00
+2030 2028 -4.16666666666667e+00
+2030 2289 4.16666666666667e+00
+2030 1920 2.08333333333333e+00
+2030 1386 2.08333333333333e+00
+2030 1393 2.08333333333333e+00
+2030 1399 -4.16666666666667e+00
+2030 1398 -4.16666666666667e+00
+2030 1277 -4.16666666666667e+00
+2030 1275 2.08333333333333e+00
+2030 1392 -4.16666666666667e+00
+2030 1387 2.08333333333333e+00
+2031 2031 1.00000000000000e+00
+2031 2035 0.00000000000000e+00
+2031 1882 0.00000000000000e+00
+2031 2180 0.00000000000000e+00
+2031 2179 0.00000000000000e+00
+2031 2032 0.00000000000000e+00
+2031 1903 0.00000000000000e+00
+2031 2178 0.00000000000000e+00
+2031 2042 0.00000000000000e+00
+2031 2039 0.00000000000000e+00
+2031 2038 0.00000000000000e+00
+2031 2041 0.00000000000000e+00
+2031 1881 0.00000000000000e+00
+2031 2183 0.00000000000000e+00
+2031 2186 0.00000000000000e+00
+2031 2182 0.00000000000000e+00
+2031 2185 0.00000000000000e+00
+2031 2181 0.00000000000000e+00
+2031 2036 0.00000000000000e+00
+2031 1902 0.00000000000000e+00
+2032 2032 1.00000000000000e+00
+2032 2034 0.00000000000000e+00
+2032 1881 0.00000000000000e+00
+2032 2180 0.00000000000000e+00
+2032 2179 0.00000000000000e+00
+2032 2178 0.00000000000000e+00
+2032 2031 0.00000000000000e+00
+2032 1902 0.00000000000000e+00
+2032 2042 0.00000000000000e+00
+2032 2186 0.00000000000000e+00
+2032 2039 0.00000000000000e+00
+2032 1883 0.00000000000000e+00
+2032 1882 0.00000000000000e+00
+2032 2037 0.00000000000000e+00
+2032 2040 0.00000000000000e+00
+2032 2183 0.00000000000000e+00
+2032 2033 0.00000000000000e+00
+2032 1904 0.00000000000000e+00
+2032 2182 0.00000000000000e+00
+2032 2036 0.00000000000000e+00
+2032 1903 0.00000000000000e+00
+2032 2181 0.00000000000000e+00
+2032 2184 0.00000000000000e+00
+2033 2033 1.00000000000000e+00
+2033 2035 0.00000000000000e+00
+2033 2180 0.00000000000000e+00
+2033 2179 0.00000000000000e+00
+2033 2178 0.00000000000000e+00
+2033 2040 0.00000000000000e+00
+2033 2037 0.00000000000000e+00
+2033 2041 0.00000000000000e+00
+2033 2185 0.00000000000000e+00
+2033 1883 0.00000000000000e+00
+2033 2038 0.00000000000000e+00
+2033 1882 0.00000000000000e+00
+2033 2183 0.00000000000000e+00
+2033 2034 0.00000000000000e+00
+2033 1904 0.00000000000000e+00
+2033 2182 0.00000000000000e+00
+2033 2032 0.00000000000000e+00
+2033 1903 0.00000000000000e+00
+2033 2181 0.00000000000000e+00
+2033 2184 0.00000000000000e+00
+2034 2034 2.50000000000000e+01
+2034 2180 -2.08333333333333e+00
+2034 2404 2.08333333333333e+00
+2034 2041 -2.08333333333333e+00
+2034 1943 2.08333333333333e+00
+2034 2405 -4.16666666666667e+00
+2034 1942 2.08333333333333e+00
+2034 2035 -4.16666666666667e+00
+2034 2179 4.16666666666667e+00
+2034 1941 -6.25000000000000e+00
+2034 2178 -6.25000000000000e+00
+2034 2036 -4.16666666666667e+00
+2034 1883 0.00000000000000e+00
+2034 2042 4.16666666666667e+00
+2034 1882 0.00000000000000e+00
+2034 2032 0.00000000000000e+00
+2034 2033 0.00000000000000e+00
+2034 1881 0.00000000000000e+00
+2034 2040 -6.25000000000000e+00
+2035 2035 2.91666666666667e+01
+2035 2180 4.16666666666667e+00
+2035 2042 4.16666666666667e+00
+2035 2403 2.08333333333333e+00
+2035 2040 -2.08333333333333e+00
+2035 1943 -2.08333333333333e+00
+2035 2405 2.08333333333333e+00
+2035 1942 -2.08333333333333e+00
+2035 2179 -1.87500000000000e+01
+2035 1941 2.08333333333333e+00
+2035 2034 -4.16666666666667e+00
+2035 2178 4.16666666666667e+00
+2035 1883 0.00000000000000e+00
+2035 2033 0.00000000000000e+00
+2035 2036 -8.33333333333333e+00
+2035 1882 0.00000000000000e+00
+2035 2041 -6.25000000000000e+00
+2035 1881 0.00000000000000e+00
+2035 2031 0.00000000000000e+00
+2036 2036 2.91666666666667e+01
+2036 2178 -2.08333333333333e+00
+2036 2035 -8.33333333333333e+00
+2036 2179 4.16666666666667e+00
+2036 2041 4.16666666666667e+00
+2036 1943 -2.08333333333333e+00
+2036 2180 -6.25000000000000e+00
+2036 1942 -2.08333333333333e+00
+2036 2404 2.08333333333333e+00
+2036 1941 2.08333333333333e+00
+2036 2403 -4.16666666666667e+00
+2036 2031 0.00000000000000e+00
+2036 1883 0.00000000000000e+00
+2036 2042 -1.87500000000000e+01
+2036 1882 0.00000000000000e+00
+2036 2032 0.00000000000000e+00
+2036 2034 -4.16666666666667e+00
+2036 1881 0.00000000000000e+00
+2036 2040 4.16666666666667e+00
+2037 2037 1.00000000000000e+00
+2037 2183 0.00000000000000e+00
+2037 2041 0.00000000000000e+00
+2037 2038 0.00000000000000e+00
+2037 2182 0.00000000000000e+00
+2037 1946 0.00000000000000e+00
+2037 2411 0.00000000000000e+00
+2037 1945 0.00000000000000e+00
+2037 2410 0.00000000000000e+00
+2037 1944 0.00000000000000e+00
+2037 2181 0.00000000000000e+00
+2037 2039 0.00000000000000e+00
+2037 1883 0.00000000000000e+00
+2037 2042 0.00000000000000e+00
+2037 1882 0.00000000000000e+00
+2037 2032 0.00000000000000e+00
+2037 2033 0.00000000000000e+00
+2037 1881 0.00000000000000e+00
+2037 2040 0.00000000000000e+00
+2038 2038 1.00000000000000e+00
+2038 2411 0.00000000000000e+00
+2038 2040 0.00000000000000e+00
+2038 2037 0.00000000000000e+00
+2038 2181 0.00000000000000e+00
+2038 1946 0.00000000000000e+00
+2038 2039 0.00000000000000e+00
+2038 2183 0.00000000000000e+00
+2038 1945 0.00000000000000e+00
+2038 2182 0.00000000000000e+00
+2038 1944 0.00000000000000e+00
+2038 2409 0.00000000000000e+00
+2038 1883 0.00000000000000e+00
+2038 2033 0.00000000000000e+00
+2038 2042 0.00000000000000e+00
+2038 1882 0.00000000000000e+00
+2038 2041 0.00000000000000e+00
+2038 1881 0.00000000000000e+00
+2038 2031 0.00000000000000e+00
+2039 2039 1.00000000000000e+00
+2039 2410 0.00000000000000e+00
+2039 2031 0.00000000000000e+00
+2039 2181 0.00000000000000e+00
+2039 1946 0.00000000000000e+00
+2039 2183 0.00000000000000e+00
+2039 1945 0.00000000000000e+00
+2039 2038 0.00000000000000e+00
+2039 2182 0.00000000000000e+00
+2039 1944 0.00000000000000e+00
+2039 2409 0.00000000000000e+00
+2039 2041 0.00000000000000e+00
+2039 1883 0.00000000000000e+00
+2039 2042 0.00000000000000e+00
+2039 1882 0.00000000000000e+00
+2039 2032 0.00000000000000e+00
+2039 2037 0.00000000000000e+00
+2039 1881 0.00000000000000e+00
+2039 2040 0.00000000000000e+00
+2040 2040 6.25000000000000e+01
+2040 2179 4.16666666666667e+00
+2040 2180 4.16666666666667e+00
+2040 2036 4.16666666666667e+00
+2040 2034 -6.25000000000000e+00
+2040 2405 4.16666666666667e+00
+2040 2404 4.16666666666667e+00
+2040 2041 -8.33333333333333e+00
+2040 2403 -1.87500000000000e+01
+2040 2186 -4.16666666666667e+00
+2040 2042 -8.33333333333333e+00
+2040 2033 0.00000000000000e+00
+2040 2183 0.00000000000000e+00
+2040 2038 0.00000000000000e+00
+2040 2185 8.33333333333333e+00
+2040 2182 0.00000000000000e+00
+2040 2039 0.00000000000000e+00
+2040 1883 0.00000000000000e+00
+2040 1882 0.00000000000000e+00
+2040 2032 0.00000000000000e+00
+2040 2037 0.00000000000000e+00
+2040 2411 4.16666666666667e+00
+2040 1949 -4.16666666666667e+00
+2040 2410 -2.08333333333333e+00
+2040 1948 2.08333333333333e+00
+2040 2409 -6.25000000000000e+00
+2040 2035 -2.08333333333333e+00
+2040 2184 -1.25000000000000e+01
+2041 2041 6.25000000000000e+01
+2041 2034 -2.08333333333333e+00
+2041 2178 4.16666666666667e+00
+2041 2180 -8.33333333333333e+00
+2041 1883 0.00000000000000e+00
+2041 2035 -6.25000000000000e+00
+2041 2405 -2.08333333333333e+00
+2041 1949 2.08333333333333e+00
+2041 2404 -6.25000000000000e+00
+2041 2403 4.16666666666667e+00
+2041 2040 -8.33333333333333e+00
+2041 2039 0.00000000000000e+00
+2041 2037 0.00000000000000e+00
+2041 2033 0.00000000000000e+00
+2041 2183 0.00000000000000e+00
+2041 2184 8.33333333333333e+00
+2041 2181 0.00000000000000e+00
+2041 2038 0.00000000000000e+00
+2041 1881 0.00000000000000e+00
+2041 2031 0.00000000000000e+00
+2041 2411 4.16666666666667e+00
+2041 2042 -8.33333333333333e+00
+2041 2186 8.33333333333333e+00
+2041 2410 -6.25000000000000e+00
+2041 2036 4.16666666666667e+00
+2041 2185 -3.75000000000000e+01
+2041 2409 -2.08333333333333e+00
+2041 1947 2.08333333333333e+00
+2042 2042 6.25000000000000e+01
+2042 2179 -8.33333333333333e+00
+2042 2178 4.16666666666667e+00
+2042 2036 -1.87500000000000e+01
+2042 1882 0.00000000000000e+00
+2042 2034 4.16666666666667e+00
+2042 2405 -6.25000000000000e+00
+2042 2404 -2.08333333333333e+00
+2042 1948 2.08333333333333e+00
+2042 2403 4.16666666666667e+00
+2042 2184 -4.16666666666667e+00
+2042 2038 0.00000000000000e+00
+2042 2040 -8.33333333333333e+00
+2042 2031 0.00000000000000e+00
+2042 2181 0.00000000000000e+00
+2042 2032 0.00000000000000e+00
+2042 2182 0.00000000000000e+00
+2042 2039 0.00000000000000e+00
+2042 2037 0.00000000000000e+00
+2042 1881 0.00000000000000e+00
+2042 2411 -1.87500000000000e+01
+2042 2035 4.16666666666667e+00
+2042 2186 -1.25000000000000e+01
+2042 2410 4.16666666666667e+00
+2042 2041 -8.33333333333333e+00
+2042 2185 8.33333333333333e+00
+2042 2409 4.16666666666667e+00
+2042 1947 -4.16666666666667e+00
+2043 2043 6.25000000000000e+01
+2043 2407 4.16666666666667e+00
+2043 2408 4.16666666666667e+00
+2043 2050 4.16666666666667e+00
+2043 2049 -6.25000000000000e+00
+2043 2045 -8.33333333333333e+00
+2043 2198 4.16666666666667e+00
+2043 2197 4.16666666666667e+00
+2043 2196 -1.87500000000000e+01
+2043 2203 -4.16666666666667e+00
+2043 2044 -8.33333333333333e+00
+2043 2048 4.16666666666667e+00
+2043 2056 -4.16666666666667e+00
+2043 2308 4.16666666666667e+00
+2043 2204 8.33333333333333e+00
+2043 2309 -8.33333333333333e+00
+2043 1886 2.08333333333333e+00
+2043 2057 -4.16666666666667e+00
+2043 2047 4.16666666666667e+00
+2043 1885 -4.16666666666667e+00
+2043 2046 -1.87500000000000e+01
+2043 2192 -2.08333333333333e+00
+2043 1907 2.08333333333333e+00
+2043 2191 4.16666666666667e+00
+2043 1906 -4.16666666666667e+00
+2043 2190 -6.25000000000000e+00
+2043 2051 -2.08333333333333e+00
+2043 2202 -1.25000000000000e+01
+2044 2044 6.25000000000000e+01
+2044 2406 4.16666666666667e+00
+2044 2408 -8.33333333333333e+00
+2044 1886 2.08333333333333e+00
+2044 2050 -1.87500000000000e+01
+2044 2049 4.16666666666667e+00
+2044 2198 -2.08333333333333e+00
+2044 1907 2.08333333333333e+00
+2044 2197 -6.25000000000000e+00
+2044 2196 4.16666666666667e+00
+2044 2202 -4.16666666666667e+00
+2044 2048 -2.08333333333333e+00
+2044 2043 -8.33333333333333e+00
+2044 2055 -4.16666666666667e+00
+2044 2307 4.16666666666667e+00
+2044 2057 -4.16666666666667e+00
+2044 2309 4.16666666666667e+00
+2044 2047 -6.25000000000000e+00
+2044 2046 4.16666666666667e+00
+2044 1884 -4.16666666666667e+00
+2044 2192 4.16666666666667e+00
+2044 2045 -8.33333333333333e+00
+2044 2204 8.33333333333333e+00
+2044 2191 -1.87500000000000e+01
+2044 2051 4.16666666666667e+00
+2044 2203 -1.25000000000000e+01
+2044 2190 4.16666666666667e+00
+2044 1905 -4.16666666666667e+00
+2045 2045 6.25000000000000e+01
+2045 2050 4.16666666666667e+00
+2045 2407 -8.33333333333333e+00
+2045 2406 4.16666666666667e+00
+2045 2051 -6.25000000000000e+00
+2045 1885 2.08333333333333e+00
+2045 2198 -6.25000000000000e+00
+2045 2197 -2.08333333333333e+00
+2045 1906 2.08333333333333e+00
+2045 2043 -8.33333333333333e+00
+2045 2196 4.16666666666667e+00
+2045 2047 -2.08333333333333e+00
+2045 2046 4.16666666666667e+00
+2045 2056 -4.16666666666667e+00
+2045 2308 4.16666666666667e+00
+2045 2202 8.33333333333333e+00
+2045 2307 -8.33333333333333e+00
+2045 2048 -6.25000000000000e+00
+2045 1884 2.08333333333333e+00
+2045 2055 -4.16666666666667e+00
+2045 2192 -6.25000000000000e+00
+2045 2049 -2.08333333333333e+00
+2045 2204 -3.75000000000000e+01
+2045 2191 4.16666666666667e+00
+2045 2044 -8.33333333333333e+00
+2045 2203 8.33333333333333e+00
+2045 2190 -2.08333333333333e+00
+2045 1905 2.08333333333333e+00
+2046 2046 6.25000000000000e+01
+2046 2053 -4.16666666666667e+00
+2046 2306 4.16666666666667e+00
+2046 2305 4.16666666666667e+00
+2046 2304 -1.87500000000000e+01
+2046 2060 -4.16666666666667e+00
+2046 2059 -4.16666666666667e+00
+2046 2312 -8.33333333333333e+00
+2046 2311 4.16666666666667e+00
+2046 2045 4.16666666666667e+00
+2046 2048 -8.33333333333333e+00
+2046 2309 8.33333333333333e+00
+2046 2056 4.16666666666667e+00
+2046 2308 -4.16666666666667e+00
+2046 1925 -2.08333333333333e+00
+2046 2192 2.08333333333333e+00
+2046 1924 4.16666666666667e+00
+2046 2191 -4.16666666666667e+00
+2046 1923 -6.25000000000000e+00
+2046 2307 -1.25000000000000e+01
+2046 1886 -2.08333333333333e+00
+2046 2057 4.16666666666667e+00
+2046 2047 -8.33333333333333e+00
+2046 1885 4.16666666666667e+00
+2046 2044 4.16666666666667e+00
+2046 2054 2.08333333333333e+00
+2046 1884 -6.25000000000000e+00
+2046 2043 -1.87500000000000e+01
+2047 2047 6.25000000000000e+01
+2047 2052 -4.16666666666667e+00
+2047 2306 -2.08333333333333e+00
+2047 2305 -6.25000000000000e+00
+2047 2304 4.16666666666667e+00
+2047 2060 -4.16666666666667e+00
+2047 2312 4.16666666666667e+00
+2047 2058 -4.16666666666667e+00
+2047 2310 4.16666666666667e+00
+2047 2045 -2.08333333333333e+00
+2047 2192 2.08333333333333e+00
+2047 2055 4.16666666666667e+00
+2047 2307 -4.16666666666667e+00
+2047 1925 4.16666666666667e+00
+2047 2048 -8.33333333333333e+00
+2047 2309 8.33333333333333e+00
+2047 1924 -1.87500000000000e+01
+2047 2308 -1.25000000000000e+01
+2047 1923 4.16666666666667e+00
+2047 2190 -4.16666666666667e+00
+2047 1886 4.16666666666667e+00
+2047 2057 -8.33333333333333e+00
+2047 2054 2.08333333333333e+00
+2047 1885 -1.87500000000000e+01
+2047 2044 -6.25000000000000e+00
+2047 2046 -8.33333333333333e+00
+2047 1884 4.16666666666667e+00
+2047 2043 4.16666666666667e+00
+2048 2048 6.25000000000000e+01
+2048 2053 2.08333333333333e+00
+2048 2306 -6.25000000000000e+00
+2048 2305 -2.08333333333333e+00
+2048 2304 4.16666666666667e+00
+2048 2058 -4.16666666666667e+00
+2048 2059 -4.16666666666667e+00
+2048 2311 4.16666666666667e+00
+2048 2310 -8.33333333333333e+00
+2048 2044 -2.08333333333333e+00
+2048 2191 2.08333333333333e+00
+2048 2043 4.16666666666667e+00
+2048 2046 -8.33333333333333e+00
+2048 2307 8.33333333333333e+00
+2048 1925 -6.25000000000000e+00
+2048 2309 -3.75000000000000e+01
+2048 1924 4.16666666666667e+00
+2048 2047 -8.33333333333333e+00
+2048 2308 8.33333333333333e+00
+2048 1923 -2.08333333333333e+00
+2048 2190 2.08333333333333e+00
+2048 2052 2.08333333333333e+00
+2048 1886 -6.25000000000000e+00
+2048 2045 -6.25000000000000e+00
+2048 1885 4.16666666666667e+00
+2048 2056 -8.33333333333333e+00
+2048 1884 -2.08333333333333e+00
+2048 2055 4.16666666666667e+00
+2049 2049 2.50000000000000e+01
+2049 2045 -2.08333333333333e+00
+2049 2056 2.08333333333333e+00
+2049 2407 -2.08333333333333e+00
+2049 1886 2.08333333333333e+00
+2049 2057 -4.16666666666667e+00
+2049 1885 2.08333333333333e+00
+2049 2050 -4.16666666666667e+00
+2049 2044 4.16666666666667e+00
+2049 1884 -6.25000000000000e+00
+2049 2043 -6.25000000000000e+00
+2049 2051 -4.16666666666667e+00
+2049 1943 2.08333333333333e+00
+2049 2408 4.16666666666667e+00
+2049 1942 2.08333333333333e+00
+2049 2197 -4.16666666666667e+00
+2049 2198 2.08333333333333e+00
+2049 1941 -6.25000000000000e+00
+2049 2406 -6.25000000000000e+00
+2050 2050 2.91666666666667e+01
+2050 2045 4.16666666666667e+00
+2050 2408 4.16666666666667e+00
+2050 2055 2.08333333333333e+00
+2050 2406 -2.08333333333333e+00
+2050 1886 -2.08333333333333e+00
+2050 2057 2.08333333333333e+00
+2050 1885 -2.08333333333333e+00
+2050 2044 -1.87500000000000e+01
+2050 1884 2.08333333333333e+00
+2050 2049 -4.16666666666667e+00
+2050 2043 4.16666666666667e+00
+2050 1943 -2.08333333333333e+00
+2050 2198 2.08333333333333e+00
+2050 2051 -8.33333333333333e+00
+2050 1942 -2.08333333333333e+00
+2050 2407 -6.25000000000000e+00
+2050 1941 2.08333333333333e+00
+2050 2196 -4.16666666666667e+00
+2051 2051 2.91666666666667e+01
+2051 2043 -2.08333333333333e+00
+2051 2050 -8.33333333333333e+00
+2051 2044 4.16666666666667e+00
+2051 2407 4.16666666666667e+00
+2051 1886 -2.08333333333333e+00
+2051 2045 -6.25000000000000e+00
+2051 1885 -2.08333333333333e+00
+2051 2056 2.08333333333333e+00
+2051 1884 2.08333333333333e+00
+2051 2055 -4.16666666666667e+00
+2051 2196 2.08333333333333e+00
+2051 1943 -2.08333333333333e+00
+2051 2408 -1.87500000000000e+01
+2051 1942 -2.08333333333333e+00
+2051 2197 2.08333333333333e+00
+2051 2049 -4.16666666666667e+00
+2051 1941 2.08333333333333e+00
+2051 2406 4.16666666666667e+00
+2052 2052 2.50000000000000e+01
+2052 2306 -2.08333333333333e+00
+2052 2422 2.08333333333333e+00
+2052 2059 -2.08333333333333e+00
+2052 1952 2.08333333333333e+00
+2052 2423 -4.16666666666667e+00
+2052 1951 2.08333333333333e+00
+2052 2053 -4.16666666666667e+00
+2052 2305 4.16666666666667e+00
+2052 1950 -6.25000000000000e+00
+2052 2304 -6.25000000000000e+00
+2052 2054 -4.16666666666667e+00
+2052 1886 2.08333333333333e+00
+2052 2060 4.16666666666667e+00
+2052 1885 2.08333333333333e+00
+2052 2047 -4.16666666666667e+00
+2052 2048 2.08333333333333e+00
+2052 1884 -6.25000000000000e+00
+2052 2058 -6.25000000000000e+00
+2053 2053 2.91666666666667e+01
+2053 2306 4.16666666666667e+00
+2053 2060 4.16666666666667e+00
+2053 2421 2.08333333333333e+00
+2053 2058 -2.08333333333333e+00
+2053 1952 -2.08333333333333e+00
+2053 2423 2.08333333333333e+00
+2053 1951 -2.08333333333333e+00
+2053 2305 -1.87500000000000e+01
+2053 1950 2.08333333333333e+00
+2053 2052 -4.16666666666667e+00
+2053 2304 4.16666666666667e+00
+2053 1886 -2.08333333333333e+00
+2053 2048 2.08333333333333e+00
+2053 2054 -8.33333333333333e+00
+2053 1885 -2.08333333333333e+00
+2053 2059 -6.25000000000000e+00
+2053 1884 2.08333333333333e+00
+2053 2046 -4.16666666666667e+00
+2054 2054 2.91666666666667e+01
+2054 2304 -2.08333333333333e+00
+2054 2053 -8.33333333333333e+00
+2054 2305 4.16666666666667e+00
+2054 2059 4.16666666666667e+00
+2054 1952 -2.08333333333333e+00
+2054 2306 -6.25000000000000e+00
+2054 1951 -2.08333333333333e+00
+2054 2422 2.08333333333333e+00
+2054 1950 2.08333333333333e+00
+2054 2421 -4.16666666666667e+00
+2054 2046 2.08333333333333e+00
+2054 1886 -2.08333333333333e+00
+2054 2060 -1.87500000000000e+01
+2054 1885 -2.08333333333333e+00
+2054 2047 2.08333333333333e+00
+2054 2052 -4.16666666666667e+00
+2054 1884 2.08333333333333e+00
+2054 2058 4.16666666666667e+00
+2055 2055 6.25000000000000e+01
+2055 2056 -8.33333333333333e+00
+2055 2429 -4.16666666666667e+00
+2055 1954 -2.08333333333333e+00
+2055 2428 2.08333333333333e+00
+2055 2060 4.16666666666667e+00
+2055 1885 -2.08333333333333e+00
+2055 2058 -1.87500000000000e+01
+2055 2050 2.08333333333333e+00
+2055 1886 4.16666666666667e+00
+2055 2051 -4.16666666666667e+00
+2055 2057 -8.33333333333333e+00
+2055 2408 4.16666666666667e+00
+2055 1955 4.16666666666667e+00
+2055 2407 4.16666666666667e+00
+2055 2406 -1.87500000000000e+01
+2055 2044 -4.16666666666667e+00
+2055 2047 4.16666666666667e+00
+2055 2048 4.16666666666667e+00
+2055 2045 -4.16666666666667e+00
+2055 1884 -6.25000000000000e+00
+2055 2309 -4.16666666666667e+00
+2055 2204 4.16666666666667e+00
+2055 2308 8.33333333333333e+00
+2055 2203 -8.33333333333333e+00
+2055 2307 -1.25000000000000e+01
+2055 2059 4.16666666666667e+00
+2055 1953 -6.25000000000000e+00
+2056 2056 6.25000000000000e+01
+2056 2429 2.08333333333333e+00
+2056 2058 4.16666666666667e+00
+2056 2055 -8.33333333333333e+00
+2056 1953 -2.08333333333333e+00
+2056 2427 2.08333333333333e+00
+2056 2059 -6.25000000000000e+00
+2056 1884 -2.08333333333333e+00
+2056 2049 2.08333333333333e+00
+2056 2051 2.08333333333333e+00
+2056 2408 -2.08333333333333e+00
+2056 2407 -6.25000000000000e+00
+2056 2406 4.16666666666667e+00
+2056 2043 -4.16666666666667e+00
+2056 2046 4.16666666666667e+00
+2056 2045 -4.16666666666667e+00
+2056 2204 4.16666666666667e+00
+2056 2048 -8.33333333333333e+00
+2056 1886 4.16666666666667e+00
+2056 1885 -6.25000000000000e+00
+2056 2309 8.33333333333333e+00
+2056 2057 -8.33333333333333e+00
+2056 1955 4.16666666666667e+00
+2056 2308 -3.75000000000000e+01
+2056 2060 -2.08333333333333e+00
+2056 1954 -6.25000000000000e+00
+2056 2307 8.33333333333333e+00
+2056 2202 -8.33333333333333e+00
+2057 2057 6.25000000000000e+01
+2057 2428 2.08333333333333e+00
+2057 2427 -4.16666666666667e+00
+2057 2060 -6.25000000000000e+00
+2057 2058 4.16666666666667e+00
+2057 2050 2.08333333333333e+00
+2057 1884 4.16666666666667e+00
+2057 2049 -4.16666666666667e+00
+2057 2408 -6.25000000000000e+00
+2057 2407 -2.08333333333333e+00
+2057 2055 -8.33333333333333e+00
+2057 2406 4.16666666666667e+00
+2057 1953 4.16666666666667e+00
+2057 2044 -4.16666666666667e+00
+2057 2203 4.16666666666667e+00
+2057 1886 -1.87500000000000e+01
+2057 2047 -8.33333333333333e+00
+2057 1885 4.16666666666667e+00
+2057 2046 4.16666666666667e+00
+2057 2043 -4.16666666666667e+00
+2057 2309 -1.25000000000000e+01
+2057 2059 -2.08333333333333e+00
+2057 1955 -1.87500000000000e+01
+2057 2308 8.33333333333333e+00
+2057 2056 -8.33333333333333e+00
+2057 1954 4.16666666666667e+00
+2057 2307 -4.16666666666667e+00
+2057 2202 4.16666666666667e+00
+2058 2058 6.25000000000000e+01
+2058 2305 4.16666666666667e+00
+2058 2306 4.16666666666667e+00
+2058 2054 4.16666666666667e+00
+2058 2052 -6.25000000000000e+00
+2058 2423 4.16666666666667e+00
+2058 2422 4.16666666666667e+00
+2058 2059 -8.33333333333333e+00
+2058 2421 -1.87500000000000e+01
+2058 2312 -4.16666666666667e+00
+2058 2060 -8.33333333333333e+00
+2058 2048 -4.16666666666667e+00
+2058 2309 4.16666666666667e+00
+2058 2056 4.16666666666667e+00
+2058 2311 8.33333333333333e+00
+2058 2308 -8.33333333333333e+00
+2058 2057 4.16666666666667e+00
+2058 1886 -4.16666666666667e+00
+2058 1885 2.08333333333333e+00
+2058 2047 -4.16666666666667e+00
+2058 2055 -1.87500000000000e+01
+2058 2429 4.16666666666667e+00
+2058 1958 -4.16666666666667e+00
+2058 2428 -2.08333333333333e+00
+2058 1957 2.08333333333333e+00
+2058 2427 -6.25000000000000e+00
+2058 2053 -2.08333333333333e+00
+2058 2310 -1.25000000000000e+01
+2059 2059 6.25000000000000e+01
+2059 2052 -2.08333333333333e+00
+2059 2304 4.16666666666667e+00
+2059 2306 -8.33333333333333e+00
+2059 1886 2.08333333333333e+00
+2059 2053 -6.25000000000000e+00
+2059 2423 -2.08333333333333e+00
+2059 1958 2.08333333333333e+00
+2059 2422 -6.25000000000000e+00
+2059 2421 4.16666666666667e+00
+2059 2058 -8.33333333333333e+00
+2059 2057 -2.08333333333333e+00
+2059 2055 4.16666666666667e+00
+2059 2048 -4.16666666666667e+00
+2059 2309 4.16666666666667e+00
+2059 2310 8.33333333333333e+00
+2059 2307 -8.33333333333333e+00
+2059 2056 -6.25000000000000e+00
+2059 1884 2.08333333333333e+00
+2059 2046 -4.16666666666667e+00
+2059 2429 4.16666666666667e+00
+2059 2060 -8.33333333333333e+00
+2059 2312 8.33333333333333e+00
+2059 2428 -6.25000000000000e+00
+2059 2054 4.16666666666667e+00
+2059 2311 -3.75000000000000e+01
+2059 2427 -2.08333333333333e+00
+2059 1956 2.08333333333333e+00
+2060 2060 6.25000000000000e+01
+2060 2305 -8.33333333333333e+00
+2060 2304 4.16666666666667e+00
+2060 2054 -1.87500000000000e+01
+2060 1885 2.08333333333333e+00
+2060 2052 4.16666666666667e+00
+2060 2423 -6.25000000000000e+00
+2060 2422 -2.08333333333333e+00
+2060 1957 2.08333333333333e+00
+2060 2421 4.16666666666667e+00
+2060 2310 -4.16666666666667e+00
+2060 2056 -2.08333333333333e+00
+2060 2058 -8.33333333333333e+00
+2060 2046 -4.16666666666667e+00
+2060 2307 4.16666666666667e+00
+2060 2047 -4.16666666666667e+00
+2060 2308 4.16666666666667e+00
+2060 2057 -6.25000000000000e+00
+2060 2055 4.16666666666667e+00
+2060 1884 -4.16666666666667e+00
+2060 2429 -1.87500000000000e+01
+2060 2053 4.16666666666667e+00
+2060 2312 -1.25000000000000e+01
+2060 2428 4.16666666666667e+00
+2060 2059 -8.33333333333333e+00
+2060 2311 8.33333333333333e+00
+2060 2427 4.16666666666667e+00
+2060 1956 -4.16666666666667e+00
+2061 2061 6.25000000000000e+01
+2061 2425 4.16666666666667e+00
+2061 2426 4.16666666666667e+00
+2061 2065 4.16666666666667e+00
+2061 2064 -6.25000000000000e+00
+2061 2063 -8.33333333333333e+00
+2061 2324 4.16666666666667e+00
+2061 2323 4.16666666666667e+00
+2061 2322 -1.87500000000000e+01
+2061 2329 -4.16666666666667e+00
+2061 2062 -8.33333333333333e+00
+2061 2330 8.33333333333333e+00
+2061 2318 -2.08333333333333e+00
+2061 1928 2.08333333333333e+00
+2061 2317 4.16666666666667e+00
+2061 1927 -4.16666666666667e+00
+2061 2316 -6.25000000000000e+00
+2061 2066 -2.08333333333333e+00
+2061 2328 -1.25000000000000e+01
+2061 1433 4.16666666666667e+00
+2061 1438 -4.16666666666667e+00
+2061 1582 4.16666666666667e+00
+2061 1583 -8.33333333333333e+00
+2061 1283 2.08333333333333e+00
+2061 1439 -4.16666666666667e+00
+2061 1432 4.16666666666667e+00
+2061 1282 -4.16666666666667e+00
+2061 1431 -1.87500000000000e+01
+2062 2062 6.25000000000000e+01
+2062 2424 4.16666666666667e+00
+2062 2426 -8.33333333333333e+00
+2062 2065 -1.87500000000000e+01
+2062 2064 4.16666666666667e+00
+2062 2324 -2.08333333333333e+00
+2062 1928 2.08333333333333e+00
+2062 2323 -6.25000000000000e+00
+2062 2322 4.16666666666667e+00
+2062 2328 -4.16666666666667e+00
+2062 2061 -8.33333333333333e+00
+2062 2318 4.16666666666667e+00
+2062 2063 -8.33333333333333e+00
+2062 2330 8.33333333333333e+00
+2062 2317 -1.87500000000000e+01
+2062 2066 4.16666666666667e+00
+2062 2329 -1.25000000000000e+01
+2062 2316 4.16666666666667e+00
+2062 1926 -4.16666666666667e+00
+2062 1283 2.08333333333333e+00
+2062 1433 -2.08333333333333e+00
+2062 1437 -4.16666666666667e+00
+2062 1581 4.16666666666667e+00
+2062 1439 -4.16666666666667e+00
+2062 1583 4.16666666666667e+00
+2062 1432 -6.25000000000000e+00
+2062 1431 4.16666666666667e+00
+2062 1281 -4.16666666666667e+00
+2063 2063 6.25000000000000e+01
+2063 2065 4.16666666666667e+00
+2063 2425 -8.33333333333333e+00
+2063 2424 4.16666666666667e+00
+2063 2066 -6.25000000000000e+00
+2063 2324 -6.25000000000000e+00
+2063 2323 -2.08333333333333e+00
+2063 1927 2.08333333333333e+00
+2063 2061 -8.33333333333333e+00
+2063 2322 4.16666666666667e+00
+2063 2328 8.33333333333333e+00
+2063 2318 -6.25000000000000e+00
+2063 2064 -2.08333333333333e+00
+2063 2330 -3.75000000000000e+01
+2063 2317 4.16666666666667e+00
+2063 2062 -8.33333333333333e+00
+2063 2329 8.33333333333333e+00
+2063 2316 -2.08333333333333e+00
+2063 1926 2.08333333333333e+00
+2063 1282 2.08333333333333e+00
+2063 1432 -2.08333333333333e+00
+2063 1431 4.16666666666667e+00
+2063 1438 -4.16666666666667e+00
+2063 1582 4.16666666666667e+00
+2063 1581 -8.33333333333333e+00
+2063 1433 -6.25000000000000e+00
+2063 1281 2.08333333333333e+00
+2063 1437 -4.16666666666667e+00
+2064 2064 2.50000000000000e+01
+2064 2063 -2.08333333333333e+00
+2064 2425 -2.08333333333333e+00
+2064 2065 -4.16666666666667e+00
+2064 2062 4.16666666666667e+00
+2064 2061 -6.25000000000000e+00
+2064 2066 -4.16666666666667e+00
+2064 1952 2.08333333333333e+00
+2064 2426 4.16666666666667e+00
+2064 1951 2.08333333333333e+00
+2064 2323 -4.16666666666667e+00
+2064 2324 2.08333333333333e+00
+2064 1950 -6.25000000000000e+00
+2064 2424 -6.25000000000000e+00
+2064 1438 2.08333333333333e+00
+2064 1283 2.08333333333333e+00
+2064 1439 -4.16666666666667e+00
+2064 1282 2.08333333333333e+00
+2064 1281 -6.25000000000000e+00
+2065 2065 2.91666666666667e+01
+2065 2063 4.16666666666667e+00
+2065 2426 4.16666666666667e+00
+2065 2424 -2.08333333333333e+00
+2065 2062 -1.87500000000000e+01
+2065 2064 -4.16666666666667e+00
+2065 2061 4.16666666666667e+00
+2065 1952 -2.08333333333333e+00
+2065 2324 2.08333333333333e+00
+2065 2066 -8.33333333333333e+00
+2065 1951 -2.08333333333333e+00
+2065 2425 -6.25000000000000e+00
+2065 1950 2.08333333333333e+00
+2065 2322 -4.16666666666667e+00
+2065 1437 2.08333333333333e+00
+2065 1283 -2.08333333333333e+00
+2065 1439 2.08333333333333e+00
+2065 1282 -2.08333333333333e+00
+2065 1281 2.08333333333333e+00
+2066 2066 2.91666666666667e+01
+2066 2061 -2.08333333333333e+00
+2066 2065 -8.33333333333333e+00
+2066 2062 4.16666666666667e+00
+2066 2425 4.16666666666667e+00
+2066 2063 -6.25000000000000e+00
+2066 2322 2.08333333333333e+00
+2066 1952 -2.08333333333333e+00
+2066 2426 -1.87500000000000e+01
+2066 1951 -2.08333333333333e+00
+2066 2323 2.08333333333333e+00
+2066 2064 -4.16666666666667e+00
+2066 1950 2.08333333333333e+00
+2066 2424 4.16666666666667e+00
+2066 1283 -2.08333333333333e+00
+2066 1282 -2.08333333333333e+00
+2066 1438 2.08333333333333e+00
+2066 1281 2.08333333333333e+00
+2066 1437 -4.16666666666667e+00
+2067 2067 1.00000000000000e+00
+2067 2075 0.00000000000000e+00
+2067 2219 0.00000000000000e+00
+2067 2218 0.00000000000000e+00
+2067 2217 0.00000000000000e+00
+2067 2222 0.00000000000000e+00
+2067 2078 0.00000000000000e+00
+2067 2071 0.00000000000000e+00
+2067 2077 0.00000000000000e+00
+2067 1889 0.00000000000000e+00
+2067 2072 0.00000000000000e+00
+2067 1887 0.00000000000000e+00
+2067 2069 0.00000000000000e+00
+2067 2216 0.00000000000000e+00
+2067 1910 0.00000000000000e+00
+2067 2215 0.00000000000000e+00
+2067 2221 0.00000000000000e+00
+2067 2074 0.00000000000000e+00
+2067 2214 0.00000000000000e+00
+2067 1908 0.00000000000000e+00
+2068 2068 1.00000000000000e+00
+2068 2075 0.00000000000000e+00
+2068 1889 0.00000000000000e+00
+2068 2219 0.00000000000000e+00
+2068 2069 0.00000000000000e+00
+2068 1910 0.00000000000000e+00
+2068 2218 0.00000000000000e+00
+2068 2217 0.00000000000000e+00
+2068 2070 0.00000000000000e+00
+2068 2076 0.00000000000000e+00
+2068 2072 0.00000000000000e+00
+2068 2078 0.00000000000000e+00
+2068 1888 0.00000000000000e+00
+2068 2216 0.00000000000000e+00
+2068 2222 0.00000000000000e+00
+2068 2073 0.00000000000000e+00
+2068 2215 0.00000000000000e+00
+2068 1909 0.00000000000000e+00
+2068 2214 0.00000000000000e+00
+2068 2220 0.00000000000000e+00
+2069 2069 1.00000000000000e+00
+2069 1888 0.00000000000000e+00
+2069 2073 0.00000000000000e+00
+2069 2219 0.00000000000000e+00
+2069 2218 0.00000000000000e+00
+2069 2068 0.00000000000000e+00
+2069 1909 0.00000000000000e+00
+2069 2217 0.00000000000000e+00
+2069 2220 0.00000000000000e+00
+2069 2076 0.00000000000000e+00
+2069 1889 0.00000000000000e+00
+2069 2071 0.00000000000000e+00
+2069 2077 0.00000000000000e+00
+2069 1887 0.00000000000000e+00
+2069 2070 0.00000000000000e+00
+2069 2074 0.00000000000000e+00
+2069 2216 0.00000000000000e+00
+2069 1910 0.00000000000000e+00
+2069 2215 0.00000000000000e+00
+2069 2221 0.00000000000000e+00
+2069 2067 0.00000000000000e+00
+2069 2214 0.00000000000000e+00
+2069 1908 0.00000000000000e+00
+2070 2070 2.50000000000000e+01
+2070 2068 0.00000000000000e+00
+2070 2441 2.08333333333333e+00
+2070 2078 -2.08333333333333e+00
+2070 1889 0.00000000000000e+00
+2070 2069 0.00000000000000e+00
+2070 1888 0.00000000000000e+00
+2070 2071 -4.16666666666667e+00
+2070 2077 4.16666666666667e+00
+2070 1887 0.00000000000000e+00
+2070 2076 -6.25000000000000e+00
+2070 2072 -4.16666666666667e+00
+2070 1961 2.08333333333333e+00
+2070 2216 4.16666666666667e+00
+2070 1960 2.08333333333333e+00
+2070 2440 -4.16666666666667e+00
+2070 2215 -2.08333333333333e+00
+2070 1959 -6.25000000000000e+00
+2070 2214 -6.25000000000000e+00
+2071 2071 2.91666666666667e+01
+2071 2067 0.00000000000000e+00
+2071 2216 4.16666666666667e+00
+2071 2072 -8.33333333333333e+00
+2071 2078 4.16666666666667e+00
+2071 1889 0.00000000000000e+00
+2071 2069 0.00000000000000e+00
+2071 1888 0.00000000000000e+00
+2071 2077 -1.87500000000000e+01
+2071 1887 0.00000000000000e+00
+2071 2070 -4.16666666666667e+00
+2071 2076 4.16666666666667e+00
+2071 1961 -2.08333333333333e+00
+2071 2441 2.08333333333333e+00
+2071 2214 -2.08333333333333e+00
+2071 1960 -2.08333333333333e+00
+2071 2215 -6.25000000000000e+00
+2071 1959 2.08333333333333e+00
+2071 2439 -4.16666666666667e+00
+2072 2072 2.91666666666667e+01
+2072 2071 -8.33333333333333e+00
+2072 2077 4.16666666666667e+00
+2072 2439 2.08333333333333e+00
+2072 2076 -2.08333333333333e+00
+2072 1889 0.00000000000000e+00
+2072 2078 -6.25000000000000e+00
+2072 1888 0.00000000000000e+00
+2072 2068 0.00000000000000e+00
+2072 1887 0.00000000000000e+00
+2072 2067 0.00000000000000e+00
+2072 2215 4.16666666666667e+00
+2072 1961 -2.08333333333333e+00
+2072 2216 -1.87500000000000e+01
+2072 1960 -2.08333333333333e+00
+2072 2440 2.08333333333333e+00
+2072 2070 -4.16666666666667e+00
+2072 1959 2.08333333333333e+00
+2072 2214 4.16666666666667e+00
+2073 2073 1.00000000000000e+00
+2073 2218 0.00000000000000e+00
+2073 2075 0.00000000000000e+00
+2073 2219 0.00000000000000e+00
+2073 2078 0.00000000000000e+00
+2073 1964 0.00000000000000e+00
+2073 2447 0.00000000000000e+00
+2073 1963 0.00000000000000e+00
+2073 2446 0.00000000000000e+00
+2073 1962 0.00000000000000e+00
+2073 2217 0.00000000000000e+00
+2073 1889 0.00000000000000e+00
+2073 2069 0.00000000000000e+00
+2073 2074 0.00000000000000e+00
+2073 1888 0.00000000000000e+00
+2073 2077 0.00000000000000e+00
+2073 2068 0.00000000000000e+00
+2073 1887 0.00000000000000e+00
+2073 2076 0.00000000000000e+00
+2074 2074 1.00000000000000e+00
+2074 2217 0.00000000000000e+00
+2074 2447 0.00000000000000e+00
+2074 2078 0.00000000000000e+00
+2074 1964 0.00000000000000e+00
+2074 2075 0.00000000000000e+00
+2074 2219 0.00000000000000e+00
+2074 1963 0.00000000000000e+00
+2074 2218 0.00000000000000e+00
+2074 1962 0.00000000000000e+00
+2074 2445 0.00000000000000e+00
+2074 1889 0.00000000000000e+00
+2074 2069 0.00000000000000e+00
+2074 2067 0.00000000000000e+00
+2074 1888 0.00000000000000e+00
+2074 2077 0.00000000000000e+00
+2074 2073 0.00000000000000e+00
+2074 1887 0.00000000000000e+00
+2074 2076 0.00000000000000e+00
+2075 2075 1.00000000000000e+00
+2075 2077 0.00000000000000e+00
+2075 2073 0.00000000000000e+00
+2075 2217 0.00000000000000e+00
+2075 2076 0.00000000000000e+00
+2075 1964 0.00000000000000e+00
+2075 2219 0.00000000000000e+00
+2075 1963 0.00000000000000e+00
+2075 2074 0.00000000000000e+00
+2075 2218 0.00000000000000e+00
+2075 1962 0.00000000000000e+00
+2075 2445 0.00000000000000e+00
+2075 2446 0.00000000000000e+00
+2075 1889 0.00000000000000e+00
+2075 2078 0.00000000000000e+00
+2075 1888 0.00000000000000e+00
+2075 2068 0.00000000000000e+00
+2075 1887 0.00000000000000e+00
+2075 2067 0.00000000000000e+00
+2076 2076 6.25000000000000e+01
+2076 2219 0.00000000000000e+00
+2076 2218 0.00000000000000e+00
+2076 1889 0.00000000000000e+00
+2076 2074 0.00000000000000e+00
+2076 2073 0.00000000000000e+00
+2076 2447 -2.08333333333333e+00
+2076 1967 2.08333333333333e+00
+2076 2446 4.16666666666667e+00
+2076 2445 -6.25000000000000e+00
+2076 2069 0.00000000000000e+00
+2076 2068 0.00000000000000e+00
+2076 2216 4.16666666666667e+00
+2076 2072 -2.08333333333333e+00
+2076 2077 -8.33333333333333e+00
+2076 2215 4.16666666666667e+00
+2076 2221 -4.16666666666667e+00
+2076 1888 0.00000000000000e+00
+2076 2071 4.16666666666667e+00
+2076 2070 -6.25000000000000e+00
+2076 2078 -8.33333333333333e+00
+2076 2441 4.16666666666667e+00
+2076 2222 8.33333333333333e+00
+2076 2440 4.16666666666667e+00
+2076 1966 -4.16666666666667e+00
+2076 2075 0.00000000000000e+00
+2076 2439 -1.87500000000000e+01
+2076 2220 -1.25000000000000e+01
+2077 2077 6.25000000000000e+01
+2077 2219 0.00000000000000e+00
+2077 2217 0.00000000000000e+00
+2077 2074 0.00000000000000e+00
+2077 2073 0.00000000000000e+00
+2077 2447 4.16666666666667e+00
+2077 2078 -8.33333333333333e+00
+2077 2446 -1.87500000000000e+01
+2077 2445 4.16666666666667e+00
+2077 2067 0.00000000000000e+00
+2077 2072 4.16666666666667e+00
+2077 2076 -8.33333333333333e+00
+2077 2216 -8.33333333333333e+00
+2077 2222 8.33333333333333e+00
+2077 2214 4.16666666666667e+00
+2077 2220 -4.16666666666667e+00
+2077 1889 0.00000000000000e+00
+2077 2069 0.00000000000000e+00
+2077 2071 -1.87500000000000e+01
+2077 1887 0.00000000000000e+00
+2077 2070 4.16666666666667e+00
+2077 2441 -2.08333333333333e+00
+2077 1967 2.08333333333333e+00
+2077 2075 0.00000000000000e+00
+2077 2440 -6.25000000000000e+00
+2077 2221 -1.25000000000000e+01
+2077 2439 4.16666666666667e+00
+2077 1965 -4.16666666666667e+00
+2078 2078 6.25000000000000e+01
+2078 2218 0.00000000000000e+00
+2078 2073 0.00000000000000e+00
+2078 2217 0.00000000000000e+00
+2078 2075 0.00000000000000e+00
+2078 1887 0.00000000000000e+00
+2078 2447 -6.25000000000000e+00
+2078 2446 4.16666666666667e+00
+2078 2077 -8.33333333333333e+00
+2078 2445 -2.08333333333333e+00
+2078 1965 2.08333333333333e+00
+2078 2067 0.00000000000000e+00
+2078 2071 4.16666666666667e+00
+2078 2214 4.16666666666667e+00
+2078 2070 -2.08333333333333e+00
+2078 2215 -8.33333333333333e+00
+2078 2221 8.33333333333333e+00
+2078 2072 -6.25000000000000e+00
+2078 1888 0.00000000000000e+00
+2078 2068 0.00000000000000e+00
+2078 2074 0.00000000000000e+00
+2078 2441 -6.25000000000000e+00
+2078 2222 -3.75000000000000e+01
+2078 2440 -2.08333333333333e+00
+2078 1966 2.08333333333333e+00
+2078 2076 -8.33333333333333e+00
+2078 2439 4.16666666666667e+00
+2078 2220 8.33333333333333e+00
+2079 2079 6.25000000000000e+01
+2079 2345 4.16666666666667e+00
+2079 2344 -8.33333333333333e+00
+2079 2084 4.16666666666667e+00
+2079 1891 2.08333333333333e+00
+2079 2082 -1.87500000000000e+01
+2079 2228 4.16666666666667e+00
+2079 2227 -2.08333333333333e+00
+2079 1912 2.08333333333333e+00
+2079 2226 -6.25000000000000e+00
+2079 2240 -4.16666666666667e+00
+2079 2081 -8.33333333333333e+00
+2079 2086 -2.08333333333333e+00
+2079 2093 -4.16666666666667e+00
+2079 2444 4.16666666666667e+00
+2079 2092 -4.16666666666667e+00
+2079 2443 4.16666666666667e+00
+2079 2087 4.16666666666667e+00
+2079 1892 -4.16666666666667e+00
+2079 2085 -6.25000000000000e+00
+2079 2234 4.16666666666667e+00
+2079 1913 -4.16666666666667e+00
+2079 2233 4.16666666666667e+00
+2079 2080 -8.33333333333333e+00
+2079 2239 8.33333333333333e+00
+2079 2232 -1.87500000000000e+01
+2079 2083 4.16666666666667e+00
+2079 2238 -1.25000000000000e+01
+2080 2080 6.25000000000000e+01
+2080 2345 4.16666666666667e+00
+2080 2082 4.16666666666667e+00
+2080 2343 -8.33333333333333e+00
+2080 2083 -6.25000000000000e+00
+2080 1890 2.08333333333333e+00
+2080 2228 4.16666666666667e+00
+2080 2081 -8.33333333333333e+00
+2080 2227 -6.25000000000000e+00
+2080 2226 -2.08333333333333e+00
+2080 1911 2.08333333333333e+00
+2080 2085 -2.08333333333333e+00
+2080 2087 4.16666666666667e+00
+2080 2240 8.33333333333333e+00
+2080 2444 -8.33333333333333e+00
+2080 2091 -4.16666666666667e+00
+2080 2442 4.16666666666667e+00
+2080 1892 2.08333333333333e+00
+2080 2093 -4.16666666666667e+00
+2080 2086 -6.25000000000000e+00
+2080 2234 -2.08333333333333e+00
+2080 1913 2.08333333333333e+00
+2080 2233 -6.25000000000000e+00
+2080 2084 -2.08333333333333e+00
+2080 2239 -3.75000000000000e+01
+2080 2232 4.16666666666667e+00
+2080 2079 -8.33333333333333e+00
+2080 2238 8.33333333333333e+00
+2081 2081 6.25000000000000e+01
+2081 2344 4.16666666666667e+00
+2081 2343 4.16666666666667e+00
+2081 2084 -6.25000000000000e+00
+2081 2082 4.16666666666667e+00
+2081 2228 -1.87500000000000e+01
+2081 2227 4.16666666666667e+00
+2081 2080 -8.33333333333333e+00
+2081 2226 4.16666666666667e+00
+2081 2238 -4.16666666666667e+00
+2081 2079 -8.33333333333333e+00
+2081 2086 4.16666666666667e+00
+2081 2091 -4.16666666666667e+00
+2081 2442 4.16666666666667e+00
+2081 2239 8.33333333333333e+00
+2081 2443 -8.33333333333333e+00
+2081 2087 -1.87500000000000e+01
+2081 1891 2.08333333333333e+00
+2081 2092 -4.16666666666667e+00
+2081 2085 4.16666666666667e+00
+2081 1890 -4.16666666666667e+00
+2081 2234 -6.25000000000000e+00
+2081 2083 -2.08333333333333e+00
+2081 2240 -1.25000000000000e+01
+2081 2233 -2.08333333333333e+00
+2081 1912 2.08333333333333e+00
+2081 2232 4.16666666666667e+00
+2081 1911 -4.16666666666667e+00
+2082 2082 6.25000000000000e+01
+2082 2096 -4.16666666666667e+00
+2082 2089 2.08333333333333e+00
+2082 2095 -4.16666666666667e+00
+2082 2090 -4.16666666666667e+00
+2082 2342 4.16666666666667e+00
+2082 2341 4.16666666666667e+00
+2082 2347 -8.33333333333333e+00
+2082 2340 -1.87500000000000e+01
+2082 2093 4.16666666666667e+00
+2082 2345 -4.16666666666667e+00
+2082 2083 -8.33333333333333e+00
+2082 2344 8.33333333333333e+00
+2082 2080 4.16666666666667e+00
+2082 1931 4.16666666666667e+00
+2082 2228 -4.16666666666667e+00
+2082 1930 -2.08333333333333e+00
+2082 2227 2.08333333333333e+00
+2082 1929 -6.25000000000000e+00
+2082 2343 -1.25000000000000e+01
+2082 2084 -8.33333333333333e+00
+2082 1892 4.16666666666667e+00
+2082 2081 4.16666666666667e+00
+2082 1891 -2.08333333333333e+00
+2082 2092 4.16666666666667e+00
+2082 2348 4.16666666666667e+00
+2082 1890 -6.25000000000000e+00
+2082 2079 -1.87500000000000e+01
+2083 2083 6.25000000000000e+01
+2083 2094 -4.16666666666667e+00
+2083 2090 2.08333333333333e+00
+2083 2096 -4.16666666666667e+00
+2083 2342 -2.08333333333333e+00
+2083 2348 4.16666666666667e+00
+2083 2341 -6.25000000000000e+00
+2083 2340 4.16666666666667e+00
+2083 2346 -8.33333333333333e+00
+2083 2228 2.08333333333333e+00
+2083 2081 -2.08333333333333e+00
+2083 2082 -8.33333333333333e+00
+2083 2343 8.33333333333333e+00
+2083 2079 4.16666666666667e+00
+2083 1931 4.16666666666667e+00
+2083 2084 -8.33333333333333e+00
+2083 2345 8.33333333333333e+00
+2083 1930 -6.25000000000000e+00
+2083 2344 -3.75000000000000e+01
+2083 1929 -2.08333333333333e+00
+2083 2226 2.08333333333333e+00
+2083 1892 4.16666666666667e+00
+2083 2093 -8.33333333333333e+00
+2083 2088 2.08333333333333e+00
+2083 1891 -6.25000000000000e+00
+2083 2080 -6.25000000000000e+00
+2083 1890 -2.08333333333333e+00
+2083 2091 4.16666666666667e+00
+2084 2084 6.25000000000000e+01
+2084 2094 -4.16666666666667e+00
+2084 2089 2.08333333333333e+00
+2084 2095 -4.16666666666667e+00
+2084 2088 -4.16666666666667e+00
+2084 2342 -6.25000000000000e+00
+2084 2341 -2.08333333333333e+00
+2084 2347 4.16666666666667e+00
+2084 2340 4.16666666666667e+00
+2084 2091 4.16666666666667e+00
+2084 2343 -4.16666666666667e+00
+2084 2227 2.08333333333333e+00
+2084 2080 -2.08333333333333e+00
+2084 1931 -1.87500000000000e+01
+2084 2345 -1.25000000000000e+01
+2084 1930 4.16666666666667e+00
+2084 2083 -8.33333333333333e+00
+2084 2344 8.33333333333333e+00
+2084 1929 4.16666666666667e+00
+2084 2226 -4.16666666666667e+00
+2084 2346 4.16666666666667e+00
+2084 1892 -1.87500000000000e+01
+2084 2081 -6.25000000000000e+00
+2084 1891 4.16666666666667e+00
+2084 2092 -8.33333333333333e+00
+2084 2082 -8.33333333333333e+00
+2084 1890 4.16666666666667e+00
+2084 2079 4.16666666666667e+00
+2085 2085 2.50000000000000e+01
+2085 2233 2.08333333333333e+00
+2085 2093 2.08333333333333e+00
+2085 2444 -2.08333333333333e+00
+2085 1961 2.08333333333333e+00
+2085 2234 -4.16666666666667e+00
+2085 1960 2.08333333333333e+00
+2085 2086 -4.16666666666667e+00
+2085 2443 4.16666666666667e+00
+2085 1959 -6.25000000000000e+00
+2085 2442 -6.25000000000000e+00
+2085 2087 -4.16666666666667e+00
+2085 1892 2.08333333333333e+00
+2085 2081 4.16666666666667e+00
+2085 1891 2.08333333333333e+00
+2085 2092 -4.16666666666667e+00
+2085 2080 -2.08333333333333e+00
+2085 1890 -6.25000000000000e+00
+2085 2079 -6.25000000000000e+00
+2086 2086 2.91666666666667e+01
+2086 2232 2.08333333333333e+00
+2086 2081 4.16666666666667e+00
+2086 2087 -8.33333333333333e+00
+2086 2444 4.16666666666667e+00
+2086 1961 -2.08333333333333e+00
+2086 2234 2.08333333333333e+00
+2086 1960 -2.08333333333333e+00
+2086 2443 -1.87500000000000e+01
+2086 1959 2.08333333333333e+00
+2086 2085 -4.16666666666667e+00
+2086 2442 4.16666666666667e+00
+2086 1892 -2.08333333333333e+00
+2086 2093 2.08333333333333e+00
+2086 2079 -2.08333333333333e+00
+2086 1891 -2.08333333333333e+00
+2086 2080 -6.25000000000000e+00
+2086 1890 2.08333333333333e+00
+2086 2091 -4.16666666666667e+00
+2087 2087 2.91666666666667e+01
+2087 2086 -8.33333333333333e+00
+2087 2443 4.16666666666667e+00
+2087 2091 2.08333333333333e+00
+2087 2442 -2.08333333333333e+00
+2087 1961 -2.08333333333333e+00
+2087 2444 -6.25000000000000e+00
+2087 1960 -2.08333333333333e+00
+2087 2233 2.08333333333333e+00
+2087 1959 2.08333333333333e+00
+2087 2232 -4.16666666666667e+00
+2087 2080 4.16666666666667e+00
+2087 1892 -2.08333333333333e+00
+2087 2081 -1.87500000000000e+01
+2087 1891 -2.08333333333333e+00
+2087 2092 2.08333333333333e+00
+2087 2085 -4.16666666666667e+00
+2087 1890 2.08333333333333e+00
+2087 2079 4.16666666666667e+00
+2088 2088 2.50000000000000e+01
+2088 2083 2.08333333333333e+00
+2088 2459 2.08333333333333e+00
+2088 2096 -2.08333333333333e+00
+2088 1892 2.08333333333333e+00
+2088 2084 -4.16666666666667e+00
+2088 1891 2.08333333333333e+00
+2088 2089 -4.16666666666667e+00
+2088 2095 4.16666666666667e+00
+2088 1890 -6.25000000000000e+00
+2088 2094 -6.25000000000000e+00
+2088 2090 -4.16666666666667e+00
+2088 1970 2.08333333333333e+00
+2088 2342 4.16666666666667e+00
+2088 1969 2.08333333333333e+00
+2088 2458 -4.16666666666667e+00
+2088 2341 -2.08333333333333e+00
+2088 1968 -6.25000000000000e+00
+2088 2340 -6.25000000000000e+00
+2089 2089 2.91666666666667e+01
+2089 2082 2.08333333333333e+00
+2089 2342 4.16666666666667e+00
+2089 2090 -8.33333333333333e+00
+2089 2096 4.16666666666667e+00
+2089 1892 -2.08333333333333e+00
+2089 2084 2.08333333333333e+00
+2089 1891 -2.08333333333333e+00
+2089 2095 -1.87500000000000e+01
+2089 1890 2.08333333333333e+00
+2089 2088 -4.16666666666667e+00
+2089 2094 4.16666666666667e+00
+2089 1970 -2.08333333333333e+00
+2089 2459 2.08333333333333e+00
+2089 2340 -2.08333333333333e+00
+2089 1969 -2.08333333333333e+00
+2089 2341 -6.25000000000000e+00
+2089 1968 2.08333333333333e+00
+2089 2457 -4.16666666666667e+00
+2090 2090 2.91666666666667e+01
+2090 2089 -8.33333333333333e+00
+2090 2095 4.16666666666667e+00
+2090 2457 2.08333333333333e+00
+2090 2094 -2.08333333333333e+00
+2090 1892 -2.08333333333333e+00
+2090 2096 -6.25000000000000e+00
+2090 1891 -2.08333333333333e+00
+2090 2083 2.08333333333333e+00
+2090 1890 2.08333333333333e+00
+2090 2082 -4.16666666666667e+00
+2090 2341 4.16666666666667e+00
+2090 1970 -2.08333333333333e+00
+2090 2342 -1.87500000000000e+01
+2090 1969 -2.08333333333333e+00
+2090 2458 2.08333333333333e+00
+2090 2088 -4.16666666666667e+00
+2090 1968 2.08333333333333e+00
+2090 2340 4.16666666666667e+00
+2091 2091 6.25000000000000e+01
+2091 2096 4.16666666666667e+00
+2091 1973 -2.08333333333333e+00
+2091 2465 2.08333333333333e+00
+2091 2464 -4.16666666666667e+00
+2091 1892 -2.08333333333333e+00
+2091 2095 4.16666666666667e+00
+2091 2094 -1.87500000000000e+01
+2091 2084 4.16666666666667e+00
+2091 2083 4.16666666666667e+00
+2091 2345 8.33333333333333e+00
+2091 2344 -4.16666666666667e+00
+2091 2343 -1.25000000000000e+01
+2091 2081 -4.16666666666667e+00
+2091 2087 2.08333333333333e+00
+2091 2080 -4.16666666666667e+00
+2091 2239 4.16666666666667e+00
+2091 2086 -4.16666666666667e+00
+2091 1891 4.16666666666667e+00
+2091 1890 -6.25000000000000e+00
+2091 2444 4.16666666666667e+00
+2091 2240 -8.33333333333333e+00
+2091 2443 4.16666666666667e+00
+2091 2092 -8.33333333333333e+00
+2091 1972 4.16666666666667e+00
+2091 2442 -1.87500000000000e+01
+2091 2093 -8.33333333333333e+00
+2091 1971 -6.25000000000000e+00
+2092 2092 6.25000000000000e+01
+2092 2096 -2.08333333333333e+00
+2092 2463 -4.16666666666667e+00
+2092 2095 -6.25000000000000e+00
+2092 2094 4.16666666666667e+00
+2092 2084 -8.33333333333333e+00
+2092 1892 4.16666666666667e+00
+2092 2082 4.16666666666667e+00
+2092 2345 8.33333333333333e+00
+2092 2093 -8.33333333333333e+00
+2092 1973 4.16666666666667e+00
+2092 2344 -1.25000000000000e+01
+2092 2343 -4.16666666666667e+00
+2092 2079 -4.16666666666667e+00
+2092 2238 4.16666666666667e+00
+2092 2087 2.08333333333333e+00
+2092 2081 -4.16666666666667e+00
+2092 1891 -1.87500000000000e+01
+2092 2085 -4.16666666666667e+00
+2092 1890 4.16666666666667e+00
+2092 2444 -2.08333333333333e+00
+2092 2240 4.16666666666667e+00
+2092 2443 -6.25000000000000e+00
+2092 2465 2.08333333333333e+00
+2092 1972 -1.87500000000000e+01
+2092 2442 4.16666666666667e+00
+2092 2091 -8.33333333333333e+00
+2092 1971 4.16666666666667e+00
+2093 2093 6.25000000000000e+01
+2093 2095 -2.08333333333333e+00
+2093 2091 -8.33333333333333e+00
+2093 2094 4.16666666666667e+00
+2093 1971 -2.08333333333333e+00
+2093 2463 2.08333333333333e+00
+2093 2096 -6.25000000000000e+00
+2093 1890 -2.08333333333333e+00
+2093 2082 4.16666666666667e+00
+2093 2083 -8.33333333333333e+00
+2093 1891 4.16666666666667e+00
+2093 2345 -3.75000000000000e+01
+2093 2344 8.33333333333333e+00
+2093 2092 -8.33333333333333e+00
+2093 1972 4.16666666666667e+00
+2093 2343 8.33333333333333e+00
+2093 2079 -4.16666666666667e+00
+2093 2085 2.08333333333333e+00
+2093 1892 -6.25000000000000e+00
+2093 2086 2.08333333333333e+00
+2093 2080 -4.16666666666667e+00
+2093 2444 -6.25000000000000e+00
+2093 2464 2.08333333333333e+00
+2093 1973 -6.25000000000000e+00
+2093 2443 -2.08333333333333e+00
+2093 2239 4.16666666666667e+00
+2093 2442 4.16666666666667e+00
+2093 2238 -8.33333333333333e+00
+2094 2094 6.25000000000000e+01
+2094 2345 -8.33333333333333e+00
+2094 2344 4.16666666666667e+00
+2094 1892 2.08333333333333e+00
+2094 2092 4.16666666666667e+00
+2094 2091 -1.87500000000000e+01
+2094 2465 -2.08333333333333e+00
+2094 1976 2.08333333333333e+00
+2094 2464 4.16666666666667e+00
+2094 2463 -6.25000000000000e+00
+2094 2084 -4.16666666666667e+00
+2094 2083 -4.16666666666667e+00
+2094 2342 4.16666666666667e+00
+2094 2090 -2.08333333333333e+00
+2094 2095 -8.33333333333333e+00
+2094 2341 4.16666666666667e+00
+2094 2347 -4.16666666666667e+00
+2094 1891 -4.16666666666667e+00
+2094 2089 4.16666666666667e+00
+2094 2088 -6.25000000000000e+00
+2094 2096 -8.33333333333333e+00
+2094 2459 4.16666666666667e+00
+2094 2348 8.33333333333333e+00
+2094 2458 4.16666666666667e+00
+2094 1975 -4.16666666666667e+00
+2094 2093 4.16666666666667e+00
+2094 2457 -1.87500000000000e+01
+2094 2346 -1.25000000000000e+01
+2095 2095 6.25000000000000e+01
+2095 2345 4.16666666666667e+00
+2095 2343 4.16666666666667e+00
+2095 2092 -6.25000000000000e+00
+2095 2091 4.16666666666667e+00
+2095 2465 4.16666666666667e+00
+2095 2096 -8.33333333333333e+00
+2095 2464 -1.87500000000000e+01
+2095 2463 4.16666666666667e+00
+2095 2082 -4.16666666666667e+00
+2095 2090 4.16666666666667e+00
+2095 2094 -8.33333333333333e+00
+2095 2342 -8.33333333333333e+00
+2095 2348 8.33333333333333e+00
+2095 2340 4.16666666666667e+00
+2095 2346 -4.16666666666667e+00
+2095 1892 2.08333333333333e+00
+2095 2084 -4.16666666666667e+00
+2095 2089 -1.87500000000000e+01
+2095 1890 -4.16666666666667e+00
+2095 2088 4.16666666666667e+00
+2095 2459 -2.08333333333333e+00
+2095 1976 2.08333333333333e+00
+2095 2093 -2.08333333333333e+00
+2095 2458 -6.25000000000000e+00
+2095 2347 -1.25000000000000e+01
+2095 2457 4.16666666666667e+00
+2095 1974 -4.16666666666667e+00
+2096 2096 6.25000000000000e+01
+2096 2344 4.16666666666667e+00
+2096 2091 4.16666666666667e+00
+2096 2343 -8.33333333333333e+00
+2096 2093 -6.25000000000000e+00
+2096 1890 2.08333333333333e+00
+2096 2465 -6.25000000000000e+00
+2096 2464 4.16666666666667e+00
+2096 2095 -8.33333333333333e+00
+2096 2463 -2.08333333333333e+00
+2096 1974 2.08333333333333e+00
+2096 2082 -4.16666666666667e+00
+2096 2089 4.16666666666667e+00
+2096 2340 4.16666666666667e+00
+2096 2088 -2.08333333333333e+00
+2096 2341 -8.33333333333333e+00
+2096 2347 8.33333333333333e+00
+2096 2090 -6.25000000000000e+00
+2096 1891 2.08333333333333e+00
+2096 2083 -4.16666666666667e+00
+2096 2092 -2.08333333333333e+00
+2096 2459 -6.25000000000000e+00
+2096 2348 -3.75000000000000e+01
+2096 2458 -2.08333333333333e+00
+2096 1975 2.08333333333333e+00
+2096 2094 -8.33333333333333e+00
+2096 2457 4.16666666666667e+00
+2096 2346 8.33333333333333e+00
+2097 2097 6.25000000000000e+01
+2097 2354 4.16666666666667e+00
+2097 2353 -2.08333333333333e+00
+2097 1933 2.08333333333333e+00
+2097 2352 -6.25000000000000e+00
+2097 2366 -4.16666666666667e+00
+2097 2099 -8.33333333333333e+00
+2097 2101 -2.08333333333333e+00
+2097 2462 4.16666666666667e+00
+2097 2461 4.16666666666667e+00
+2097 2102 4.16666666666667e+00
+2097 2100 -6.25000000000000e+00
+2097 2360 4.16666666666667e+00
+2097 1934 -4.16666666666667e+00
+2097 2359 4.16666666666667e+00
+2097 2098 -8.33333333333333e+00
+2097 2365 8.33333333333333e+00
+2097 2358 -1.87500000000000e+01
+2097 2364 -1.25000000000000e+01
+2097 1619 4.16666666666667e+00
+2097 1618 -8.33333333333333e+00
+2097 1469 4.16666666666667e+00
+2097 1288 2.08333333333333e+00
+2097 1467 -1.87500000000000e+01
+2097 1475 -4.16666666666667e+00
+2097 1474 -4.16666666666667e+00
+2097 1289 -4.16666666666667e+00
+2097 1468 4.16666666666667e+00
+2098 2098 6.25000000000000e+01
+2098 2354 4.16666666666667e+00
+2098 2099 -8.33333333333333e+00
+2098 2353 -6.25000000000000e+00
+2098 2352 -2.08333333333333e+00
+2098 1932 2.08333333333333e+00
+2098 2100 -2.08333333333333e+00
+2098 2102 4.16666666666667e+00
+2098 2366 8.33333333333333e+00
+2098 2462 -8.33333333333333e+00
+2098 2460 4.16666666666667e+00
+2098 2101 -6.25000000000000e+00
+2098 2360 -2.08333333333333e+00
+2098 1934 2.08333333333333e+00
+2098 2359 -6.25000000000000e+00
+2098 2365 -3.75000000000000e+01
+2098 2358 4.16666666666667e+00
+2098 2097 -8.33333333333333e+00
+2098 2364 8.33333333333333e+00
+2098 1619 4.16666666666667e+00
+2098 1467 4.16666666666667e+00
+2098 1617 -8.33333333333333e+00
+2098 1468 -6.25000000000000e+00
+2098 1287 2.08333333333333e+00
+2098 1473 -4.16666666666667e+00
+2098 1289 2.08333333333333e+00
+2098 1475 -4.16666666666667e+00
+2098 1469 -2.08333333333333e+00
+2099 2099 6.25000000000000e+01
+2099 2354 -1.87500000000000e+01
+2099 2353 4.16666666666667e+00
+2099 2098 -8.33333333333333e+00
+2099 2352 4.16666666666667e+00
+2099 2364 -4.16666666666667e+00
+2099 2097 -8.33333333333333e+00
+2099 2101 4.16666666666667e+00
+2099 2460 4.16666666666667e+00
+2099 2365 8.33333333333333e+00
+2099 2461 -8.33333333333333e+00
+2099 2102 -1.87500000000000e+01
+2099 2100 4.16666666666667e+00
+2099 2360 -6.25000000000000e+00
+2099 2366 -1.25000000000000e+01
+2099 2359 -2.08333333333333e+00
+2099 1933 2.08333333333333e+00
+2099 2358 4.16666666666667e+00
+2099 1932 -4.16666666666667e+00
+2099 1618 4.16666666666667e+00
+2099 1617 4.16666666666667e+00
+2099 1469 -6.25000000000000e+00
+2099 1467 4.16666666666667e+00
+2099 1473 -4.16666666666667e+00
+2099 1288 2.08333333333333e+00
+2099 1474 -4.16666666666667e+00
+2099 1287 -4.16666666666667e+00
+2099 1468 -2.08333333333333e+00
+2100 2100 2.50000000000000e+01
+2100 2359 2.08333333333333e+00
+2100 2462 -2.08333333333333e+00
+2100 1970 2.08333333333333e+00
+2100 2360 -4.16666666666667e+00
+2100 1969 2.08333333333333e+00
+2100 2101 -4.16666666666667e+00
+2100 2461 4.16666666666667e+00
+2100 1968 -6.25000000000000e+00
+2100 2460 -6.25000000000000e+00
+2100 2102 -4.16666666666667e+00
+2100 2099 4.16666666666667e+00
+2100 2098 -2.08333333333333e+00
+2100 2097 -6.25000000000000e+00
+2100 1475 2.08333333333333e+00
+2100 1289 2.08333333333333e+00
+2100 1288 2.08333333333333e+00
+2100 1474 -4.16666666666667e+00
+2100 1287 -6.25000000000000e+00
+2101 2101 2.91666666666667e+01
+2101 2358 2.08333333333333e+00
+2101 2099 4.16666666666667e+00
+2101 2102 -8.33333333333333e+00
+2101 2462 4.16666666666667e+00
+2101 1970 -2.08333333333333e+00
+2101 2360 2.08333333333333e+00
+2101 1969 -2.08333333333333e+00
+2101 2461 -1.87500000000000e+01
+2101 1968 2.08333333333333e+00
+2101 2100 -4.16666666666667e+00
+2101 2460 4.16666666666667e+00
+2101 2097 -2.08333333333333e+00
+2101 2098 -6.25000000000000e+00
+2101 1289 -2.08333333333333e+00
+2101 1475 2.08333333333333e+00
+2101 1288 -2.08333333333333e+00
+2101 1287 2.08333333333333e+00
+2101 1473 -4.16666666666667e+00
+2102 2102 2.91666666666667e+01
+2102 2101 -8.33333333333333e+00
+2102 2461 4.16666666666667e+00
+2102 2460 -2.08333333333333e+00
+2102 1970 -2.08333333333333e+00
+2102 2462 -6.25000000000000e+00
+2102 1969 -2.08333333333333e+00
+2102 2359 2.08333333333333e+00
+2102 1968 2.08333333333333e+00
+2102 2358 -4.16666666666667e+00
+2102 2098 4.16666666666667e+00
+2102 2099 -1.87500000000000e+01
+2102 2100 -4.16666666666667e+00
+2102 2097 4.16666666666667e+00
+2102 1473 2.08333333333333e+00
+2102 1289 -2.08333333333333e+00
+2102 1288 -2.08333333333333e+00
+2102 1474 2.08333333333333e+00
+2102 1287 2.08333333333333e+00
+2103 2103 1.00000000000000e+00
+2103 2108 0.00000000000000e+00
+2103 2107 0.00000000000000e+00
+2103 2413 0.00000000000000e+00
+2103 1894 0.00000000000000e+00
+2103 2106 0.00000000000000e+00
+2103 2105 0.00000000000000e+00
+2103 2246 0.00000000000000e+00
+2103 2245 0.00000000000000e+00
+2103 1915 0.00000000000000e+00
+2103 2244 0.00000000000000e+00
+2103 2110 0.00000000000000e+00
+2103 2111 0.00000000000000e+00
+2103 2258 0.00000000000000e+00
+2103 2450 0.00000000000000e+00
+2103 2113 0.00000000000000e+00
+2103 2449 0.00000000000000e+00
+2103 1895 0.00000000000000e+00
+2103 2114 0.00000000000000e+00
+2103 2109 0.00000000000000e+00
+2103 2252 0.00000000000000e+00
+2103 1916 0.00000000000000e+00
+2103 2104 0.00000000000000e+00
+2103 2251 0.00000000000000e+00
+2103 2257 0.00000000000000e+00
+2103 2414 0.00000000000000e+00
+2103 2250 0.00000000000000e+00
+2103 2256 0.00000000000000e+00
+2104 2104 1.00000000000000e+00
+2104 2414 0.00000000000000e+00
+2104 2412 0.00000000000000e+00
+2104 2108 0.00000000000000e+00
+2104 2107 0.00000000000000e+00
+2104 1893 0.00000000000000e+00
+2104 2246 0.00000000000000e+00
+2104 2245 0.00000000000000e+00
+2104 2244 0.00000000000000e+00
+2104 1914 0.00000000000000e+00
+2104 2258 0.00000000000000e+00
+2104 2105 0.00000000000000e+00
+2104 2109 0.00000000000000e+00
+2104 2114 0.00000000000000e+00
+2104 2450 0.00000000000000e+00
+2104 2112 0.00000000000000e+00
+2104 2448 0.00000000000000e+00
+2104 1895 0.00000000000000e+00
+2104 2111 0.00000000000000e+00
+2104 2110 0.00000000000000e+00
+2104 2252 0.00000000000000e+00
+2104 1916 0.00000000000000e+00
+2104 2106 0.00000000000000e+00
+2104 2251 0.00000000000000e+00
+2104 2257 0.00000000000000e+00
+2104 2103 0.00000000000000e+00
+2104 2250 0.00000000000000e+00
+2104 2256 0.00000000000000e+00
+2105 2105 1.00000000000000e+00
+2105 2106 0.00000000000000e+00
+2105 2413 0.00000000000000e+00
+2105 2108 0.00000000000000e+00
+2105 2107 0.00000000000000e+00
+2105 2246 0.00000000000000e+00
+2105 2245 0.00000000000000e+00
+2105 2103 0.00000000000000e+00
+2105 2244 0.00000000000000e+00
+2105 2257 0.00000000000000e+00
+2105 2104 0.00000000000000e+00
+2105 2113 0.00000000000000e+00
+2105 2449 0.00000000000000e+00
+2105 2109 0.00000000000000e+00
+2105 2256 0.00000000000000e+00
+2105 2448 0.00000000000000e+00
+2105 2111 0.00000000000000e+00
+2105 1894 0.00000000000000e+00
+2105 2110 0.00000000000000e+00
+2105 1893 0.00000000000000e+00
+2105 2112 0.00000000000000e+00
+2105 2412 0.00000000000000e+00
+2105 2252 0.00000000000000e+00
+2105 2258 0.00000000000000e+00
+2105 2251 0.00000000000000e+00
+2105 1915 0.00000000000000e+00
+2105 2250 0.00000000000000e+00
+2105 1914 0.00000000000000e+00
+2106 2106 1.00000000000000e+00
+2106 2105 0.00000000000000e+00
+2106 2413 0.00000000000000e+00
+2106 2107 0.00000000000000e+00
+2106 2104 0.00000000000000e+00
+2106 1895 0.00000000000000e+00
+2106 2114 0.00000000000000e+00
+2106 1894 0.00000000000000e+00
+2106 2113 0.00000000000000e+00
+2106 1893 0.00000000000000e+00
+2106 2103 0.00000000000000e+00
+2106 2108 0.00000000000000e+00
+2106 1946 0.00000000000000e+00
+2106 2414 0.00000000000000e+00
+2106 1945 0.00000000000000e+00
+2106 2245 0.00000000000000e+00
+2106 2246 0.00000000000000e+00
+2106 1944 0.00000000000000e+00
+2106 2412 0.00000000000000e+00
+2107 2107 1.00000000000000e+00
+2107 2114 0.00000000000000e+00
+2107 2412 0.00000000000000e+00
+2107 2106 0.00000000000000e+00
+2107 2103 0.00000000000000e+00
+2107 1895 0.00000000000000e+00
+2107 2108 0.00000000000000e+00
+2107 2105 0.00000000000000e+00
+2107 1894 0.00000000000000e+00
+2107 2104 0.00000000000000e+00
+2107 1893 0.00000000000000e+00
+2107 2112 0.00000000000000e+00
+2107 1946 0.00000000000000e+00
+2107 2246 0.00000000000000e+00
+2107 2414 0.00000000000000e+00
+2107 1945 0.00000000000000e+00
+2107 2413 0.00000000000000e+00
+2107 1944 0.00000000000000e+00
+2107 2244 0.00000000000000e+00
+2108 2108 1.00000000000000e+00
+2108 2113 0.00000000000000e+00
+2108 2244 0.00000000000000e+00
+2108 2103 0.00000000000000e+00
+2108 1895 0.00000000000000e+00
+2108 2105 0.00000000000000e+00
+2108 1894 0.00000000000000e+00
+2108 2107 0.00000000000000e+00
+2108 2104 0.00000000000000e+00
+2108 1893 0.00000000000000e+00
+2108 2112 0.00000000000000e+00
+2108 2413 0.00000000000000e+00
+2108 1946 0.00000000000000e+00
+2108 2414 0.00000000000000e+00
+2108 1945 0.00000000000000e+00
+2108 2245 0.00000000000000e+00
+2108 2106 0.00000000000000e+00
+2108 1944 0.00000000000000e+00
+2108 2412 0.00000000000000e+00
+2109 2109 1.00000000000000e+00
+2109 2104 0.00000000000000e+00
+2109 2111 0.00000000000000e+00
+2109 2105 0.00000000000000e+00
+2109 2450 0.00000000000000e+00
+2109 1895 0.00000000000000e+00
+2109 2114 0.00000000000000e+00
+2109 1894 0.00000000000000e+00
+2109 2113 0.00000000000000e+00
+2109 1893 0.00000000000000e+00
+2109 2103 0.00000000000000e+00
+2109 1964 0.00000000000000e+00
+2109 2252 0.00000000000000e+00
+2109 2110 0.00000000000000e+00
+2109 1963 0.00000000000000e+00
+2109 2449 0.00000000000000e+00
+2109 2251 0.00000000000000e+00
+2109 1962 0.00000000000000e+00
+2109 2448 0.00000000000000e+00
+2110 2110 1.00000000000000e+00
+2110 2103 0.00000000000000e+00
+2110 2114 0.00000000000000e+00
+2110 2450 0.00000000000000e+00
+2110 1895 0.00000000000000e+00
+2110 2111 0.00000000000000e+00
+2110 2105 0.00000000000000e+00
+2110 1894 0.00000000000000e+00
+2110 2104 0.00000000000000e+00
+2110 1893 0.00000000000000e+00
+2110 2112 0.00000000000000e+00
+2110 1964 0.00000000000000e+00
+2110 2252 0.00000000000000e+00
+2110 2250 0.00000000000000e+00
+2110 1963 0.00000000000000e+00
+2110 2449 0.00000000000000e+00
+2110 2109 0.00000000000000e+00
+2110 1962 0.00000000000000e+00
+2110 2448 0.00000000000000e+00
+2111 2111 1.00000000000000e+00
+2111 2449 0.00000000000000e+00
+2111 2109 0.00000000000000e+00
+2111 2103 0.00000000000000e+00
+2111 2448 0.00000000000000e+00
+2111 1895 0.00000000000000e+00
+2111 2105 0.00000000000000e+00
+2111 1894 0.00000000000000e+00
+2111 2110 0.00000000000000e+00
+2111 2104 0.00000000000000e+00
+2111 1893 0.00000000000000e+00
+2111 2112 0.00000000000000e+00
+2111 2113 0.00000000000000e+00
+2111 1964 0.00000000000000e+00
+2111 2450 0.00000000000000e+00
+2111 1963 0.00000000000000e+00
+2111 2251 0.00000000000000e+00
+2111 1962 0.00000000000000e+00
+2111 2250 0.00000000000000e+00
+2112 2112 3.75000000000000e+01
+2112 2108 0.00000000000000e+00
+2112 2107 0.00000000000000e+00
+2112 2114 -4.16666666666667e+00
+2112 2414 4.16666666666667e+00
+2112 1979 2.08333333333333e+00
+2112 2413 -2.08333333333333e+00
+2112 2412 -6.25000000000000e+00
+2112 2104 0.00000000000000e+00
+2112 2257 4.16666666666667e+00
+2112 2111 0.00000000000000e+00
+2112 2105 0.00000000000000e+00
+2112 1894 0.00000000000000e+00
+2112 2110 0.00000000000000e+00
+2112 1893 0.00000000000000e+00
+2112 2450 -2.08333333333333e+00
+2112 2258 4.16666666666667e+00
+2112 2113 -4.16666666666667e+00
+2112 2449 4.16666666666667e+00
+2112 1978 2.08333333333333e+00
+2112 1895 0.00000000000000e+00
+2112 2448 -6.25000000000000e+00
+2112 1977 -1.25000000000000e+01
+2113 2113 3.33333333333333e+01
+2113 2106 0.00000000000000e+00
+2113 2414 4.16666666666667e+00
+2113 2413 -6.25000000000000e+00
+2113 2412 -2.08333333333333e+00
+2113 2111 0.00000000000000e+00
+2113 2105 0.00000000000000e+00
+2113 2103 0.00000000000000e+00
+2113 2256 4.16666666666667e+00
+2113 1894 0.00000000000000e+00
+2113 1893 0.00000000000000e+00
+2113 2109 0.00000000000000e+00
+2113 2450 4.16666666666667e+00
+2113 2258 -8.33333333333333e+00
+2113 2108 0.00000000000000e+00
+2113 2449 -1.87500000000000e+01
+2113 1978 -4.16666666666667e+00
+2113 2112 -4.16666666666667e+00
+2113 2448 4.16666666666667e+00
+2113 1977 2.08333333333333e+00
+2114 2114 3.33333333333333e+01
+2114 1893 0.00000000000000e+00
+2114 2106 0.00000000000000e+00
+2114 2414 -1.87500000000000e+01
+2114 2413 4.16666666666667e+00
+2114 2112 -4.16666666666667e+00
+2114 2412 4.16666666666667e+00
+2114 1977 2.08333333333333e+00
+2114 2110 0.00000000000000e+00
+2114 2104 0.00000000000000e+00
+2114 1895 0.00000000000000e+00
+2114 2109 0.00000000000000e+00
+2114 2103 0.00000000000000e+00
+2114 2107 0.00000000000000e+00
+2114 2450 -6.25000000000000e+00
+2114 1979 -4.16666666666667e+00
+2114 2449 4.16666666666667e+00
+2114 2257 -8.33333333333333e+00
+2114 2448 -2.08333333333333e+00
+2114 2256 4.16666666666667e+00
+2115 2115 1.25000000000000e+02
+2115 2122 8.33333333333333e+00
+2115 2121 -1.25000000000000e+01
+2115 2264 -8.33333333333333e+00
+2115 2263 4.16666666666667e+00
+2115 2276 8.33333333333333e+00
+2115 2134 4.16666666666667e+00
+2115 2275 8.33333333333333e+00
+2115 2274 -3.75000000000000e+01
+2115 2135 4.16666666666667e+00
+2115 2266 -4.16666666666667e+00
+2115 2267 8.33333333333333e+00
+2115 2117 -1.66666666666667e+01
+2115 1919 -4.16666666666667e+00
+2115 2265 -1.25000000000000e+01
+2115 2126 4.16666666666667e+00
+2115 1898 -4.16666666666667e+00
+2115 2125 -8.33333333333333e+00
+2115 2261 4.16666666666667e+00
+2115 2119 8.33333333333333e+00
+2115 2116 -1.66666666666667e+01
+2115 2120 8.33333333333333e+00
+2115 1897 -4.16666666666667e+00
+2115 2118 -3.75000000000000e+01
+2115 2260 4.16666666666667e+00
+2115 1918 -4.16666666666667e+00
+2115 2273 -4.16666666666667e+00
+2115 2270 4.16666666666667e+00
+2115 2131 4.16666666666667e+00
+2115 2128 -4.16666666666667e+00
+2115 2269 -8.33333333333333e+00
+2115 2272 8.33333333333333e+00
+2115 2271 -1.25000000000000e+01
+2115 2129 8.33333333333333e+00
+2115 2132 -8.33333333333333e+00
+2115 2127 -1.25000000000000e+01
+2115 2123 -4.16666666666667e+00
+2116 2116 1.25000000000000e+02
+2116 2121 8.33333333333333e+00
+2116 2123 8.33333333333333e+00
+2116 2122 -3.75000000000000e+01
+2116 2262 4.16666666666667e+00
+2116 2276 -4.16666666666667e+00
+2116 2133 4.16666666666667e+00
+2116 2275 -1.25000000000000e+01
+2116 2274 8.33333333333333e+00
+2116 2135 -8.33333333333333e+00
+2116 2265 -4.16666666666667e+00
+2116 2126 4.16666666666667e+00
+2116 2267 8.33333333333333e+00
+2116 2266 -1.25000000000000e+01
+2116 2124 -8.33333333333333e+00
+2116 2120 -4.16666666666667e+00
+2116 2118 8.33333333333333e+00
+2116 2115 -1.66666666666667e+01
+2116 2119 -1.25000000000000e+01
+2116 1896 -4.16666666666667e+00
+2116 2261 -8.33333333333333e+00
+2116 2259 4.16666666666667e+00
+2116 1917 -4.16666666666667e+00
+2116 2273 8.33333333333333e+00
+2116 2117 -1.66666666666667e+01
+2116 2129 8.33333333333333e+00
+2116 2130 4.16666666666667e+00
+2116 2127 -4.16666666666667e+00
+2116 2270 4.16666666666667e+00
+2116 1919 -4.16666666666667e+00
+2116 2272 -3.75000000000000e+01
+2116 2268 -8.33333333333333e+00
+2116 2271 8.33333333333333e+00
+2116 2132 4.16666666666667e+00
+2116 1898 -4.16666666666667e+00
+2116 2128 -1.25000000000000e+01
+2116 2264 4.16666666666667e+00
+2117 2117 1.25000000000000e+02
+2117 2263 4.16666666666667e+00
+2117 2123 -1.25000000000000e+01
+2117 2122 8.33333333333333e+00
+2117 2262 -8.33333333333333e+00
+2117 2275 -4.16666666666667e+00
+2117 2274 8.33333333333333e+00
+2117 2276 -1.25000000000000e+01
+2117 2134 -8.33333333333333e+00
+2117 2133 4.16666666666667e+00
+2117 2125 4.16666666666667e+00
+2117 2265 8.33333333333333e+00
+2117 2115 -1.66666666666667e+01
+2117 2267 -3.75000000000000e+01
+2117 2266 8.33333333333333e+00
+2117 1917 -4.16666666666667e+00
+2117 2124 4.16666666666667e+00
+2117 1896 -4.16666666666667e+00
+2117 2119 -4.16666666666667e+00
+2117 2259 4.16666666666667e+00
+2117 2120 -1.25000000000000e+01
+2117 2118 8.33333333333333e+00
+2117 2260 -8.33333333333333e+00
+2117 2271 -4.16666666666667e+00
+2117 2268 4.16666666666667e+00
+2117 2272 8.33333333333333e+00
+2117 2116 -1.66666666666667e+01
+2117 2128 8.33333333333333e+00
+2117 2273 -1.25000000000000e+01
+2117 2269 4.16666666666667e+00
+2117 1918 -4.16666666666667e+00
+2117 2129 -3.75000000000000e+01
+2117 2121 -4.16666666666667e+00
+2117 2131 4.16666666666667e+00
+2117 1897 -4.16666666666667e+00
+2117 2127 8.33333333333333e+00
+2117 2130 -8.33333333333333e+00
+2118 2118 1.25000000000000e+02
+2118 2431 -8.33333333333333e+00
+2118 2384 8.33333333333333e+00
+2118 2468 -8.33333333333333e+00
+2118 2137 -4.16666666666667e+00
+2118 2467 4.16666666666667e+00
+2118 2138 -4.16666666666667e+00
+2118 2383 8.33333333333333e+00
+2118 2382 -3.75000000000000e+01
+2118 2372 8.33333333333333e+00
+2118 2266 4.16666666666667e+00
+2118 2371 -4.16666666666667e+00
+2118 2267 -8.33333333333333e+00
+2118 1937 4.16666666666667e+00
+2118 2370 -1.25000000000000e+01
+2118 2126 -4.16666666666667e+00
+2118 1898 4.16666666666667e+00
+2118 2119 -1.66666666666667e+01
+2118 2125 8.33333333333333e+00
+2118 2124 -1.25000000000000e+01
+2118 2378 -4.16666666666667e+00
+2118 2377 8.33333333333333e+00
+2118 2261 -4.16666666666667e+00
+2118 2273 4.16666666666667e+00
+2118 2116 8.33333333333333e+00
+2118 2272 -8.33333333333333e+00
+2118 1936 4.16666666666667e+00
+2118 2260 -4.16666666666667e+00
+2118 2376 -1.25000000000000e+01
+2118 2120 -1.66666666666667e+01
+2118 2132 8.33333333333333e+00
+2118 2117 8.33333333333333e+00
+2118 2131 -4.16666666666667e+00
+2118 1897 4.16666666666667e+00
+2118 2432 4.16666666666667e+00
+2118 2130 -1.25000000000000e+01
+2118 2115 -3.75000000000000e+01
+2119 2119 1.25000000000000e+02
+2119 2430 -8.33333333333333e+00
+2119 2384 -4.16666666666667e+00
+2119 2138 -4.16666666666667e+00
+2119 2468 4.16666666666667e+00
+2119 2136 -4.16666666666667e+00
+2119 2466 4.16666666666667e+00
+2119 2383 -1.25000000000000e+01
+2119 2382 8.33333333333333e+00
+2119 2265 4.16666666666667e+00
+2119 2370 -4.16666666666667e+00
+2119 2267 4.16666666666667e+00
+2119 2372 8.33333333333333e+00
+2119 2371 -1.25000000000000e+01
+2119 2126 8.33333333333333e+00
+2119 2125 -3.75000000000000e+01
+2119 2118 -1.66666666666667e+01
+2119 2124 8.33333333333333e+00
+2119 2117 -4.16666666666667e+00
+2119 2120 -1.66666666666667e+01
+2119 2261 -4.16666666666667e+00
+2119 2273 4.16666666666667e+00
+2119 2376 8.33333333333333e+00
+2119 2115 8.33333333333333e+00
+2119 2271 -8.33333333333333e+00
+2119 1937 -8.33333333333333e+00
+2119 2378 8.33333333333333e+00
+2119 2377 -3.75000000000000e+01
+2119 1935 4.16666666666667e+00
+2119 2259 -4.16666666666667e+00
+2119 2132 8.33333333333333e+00
+2119 1898 -8.33333333333333e+00
+2119 2432 4.16666666666667e+00
+2119 2131 -1.25000000000000e+01
+2119 2116 -1.25000000000000e+01
+2119 2130 -4.16666666666667e+00
+2119 1896 4.16666666666667e+00
+2120 2120 1.25000000000000e+02
+2120 2431 4.16666666666667e+00
+2120 2383 -4.16666666666667e+00
+2120 2137 -4.16666666666667e+00
+2120 2467 4.16666666666667e+00
+2120 2382 8.33333333333333e+00
+2120 2466 -8.33333333333333e+00
+2120 2136 -4.16666666666667e+00
+2120 2384 -1.25000000000000e+01
+2120 2370 8.33333333333333e+00
+2120 2266 4.16666666666667e+00
+2120 2265 -8.33333333333333e+00
+2120 2372 -3.75000000000000e+01
+2120 2371 8.33333333333333e+00
+2120 1935 4.16666666666667e+00
+2120 2126 -1.25000000000000e+01
+2120 2125 8.33333333333333e+00
+2120 2124 -4.16666666666667e+00
+2120 1896 4.16666666666667e+00
+2120 2116 -4.16666666666667e+00
+2120 2119 -1.66666666666667e+01
+2120 2376 -4.16666666666667e+00
+2120 2260 -4.16666666666667e+00
+2120 2272 4.16666666666667e+00
+2120 2259 -4.16666666666667e+00
+2120 2271 4.16666666666667e+00
+2120 2378 -1.25000000000000e+01
+2120 1936 -8.33333333333333e+00
+2120 2377 8.33333333333333e+00
+2120 2430 4.16666666666667e+00
+2120 2132 -3.75000000000000e+01
+2120 2117 -1.25000000000000e+01
+2120 2131 8.33333333333333e+00
+2120 1897 -8.33333333333333e+00
+2120 2118 -1.66666666666667e+01
+2120 2130 8.33333333333333e+00
+2120 2115 8.33333333333333e+00
+2121 2121 6.25000000000000e+01
+2121 2266 4.16666666666667e+00
+2121 2267 4.16666666666667e+00
+2121 2417 4.16666666666667e+00
+2121 2415 -6.25000000000000e+00
+2121 2126 4.16666666666667e+00
+2121 2125 4.16666666666667e+00
+2121 2122 -8.33333333333333e+00
+2121 2124 -1.87500000000000e+01
+2121 2117 -4.16666666666667e+00
+2121 2123 -8.33333333333333e+00
+2121 2264 -4.16666666666667e+00
+2121 2276 4.16666666666667e+00
+2121 2419 4.16666666666667e+00
+2121 2116 8.33333333333333e+00
+2121 2275 -8.33333333333333e+00
+2121 2420 4.16666666666667e+00
+2121 1949 -4.16666666666667e+00
+2121 1948 2.08333333333333e+00
+2121 2263 -4.16666666666667e+00
+2121 2418 -1.87500000000000e+01
+2121 2135 4.16666666666667e+00
+2121 1898 -4.16666666666667e+00
+2121 2134 -2.08333333333333e+00
+2121 1897 2.08333333333333e+00
+2121 2133 -6.25000000000000e+00
+2121 2416 -2.08333333333333e+00
+2121 2115 -1.25000000000000e+01
+2122 2122 6.25000000000000e+01
+2122 2415 -2.08333333333333e+00
+2122 2265 4.16666666666667e+00
+2122 2267 -8.33333333333333e+00
+2122 1949 2.08333333333333e+00
+2122 2416 -6.25000000000000e+00
+2122 2126 -2.08333333333333e+00
+2122 1898 2.08333333333333e+00
+2122 2125 -6.25000000000000e+00
+2122 2124 4.16666666666667e+00
+2122 2121 -8.33333333333333e+00
+2122 2420 -2.08333333333333e+00
+2122 2418 4.16666666666667e+00
+2122 2264 -4.16666666666667e+00
+2122 2276 4.16666666666667e+00
+2122 2115 8.33333333333333e+00
+2122 2274 -8.33333333333333e+00
+2122 2419 -6.25000000000000e+00
+2122 1947 2.08333333333333e+00
+2122 2262 -4.16666666666667e+00
+2122 2135 4.16666666666667e+00
+2122 2123 -8.33333333333333e+00
+2122 2117 8.33333333333333e+00
+2122 2134 -6.25000000000000e+00
+2122 2417 4.16666666666667e+00
+2122 2116 -3.75000000000000e+01
+2122 2133 -2.08333333333333e+00
+2122 1896 2.08333333333333e+00
+2123 2123 6.25000000000000e+01
+2123 2266 -8.33333333333333e+00
+2123 2265 4.16666666666667e+00
+2123 2417 -1.87500000000000e+01
+2123 1948 2.08333333333333e+00
+2123 2415 4.16666666666667e+00
+2123 2126 -6.25000000000000e+00
+2123 2125 -2.08333333333333e+00
+2123 1897 2.08333333333333e+00
+2123 2124 4.16666666666667e+00
+2123 2115 -4.16666666666667e+00
+2123 2419 -2.08333333333333e+00
+2123 2121 -8.33333333333333e+00
+2123 2262 -4.16666666666667e+00
+2123 2274 4.16666666666667e+00
+2123 2263 -4.16666666666667e+00
+2123 2275 4.16666666666667e+00
+2123 2420 -6.25000000000000e+00
+2123 2418 4.16666666666667e+00
+2123 1947 -4.16666666666667e+00
+2123 2135 -1.87500000000000e+01
+2123 2416 4.16666666666667e+00
+2123 2117 -1.25000000000000e+01
+2123 2134 4.16666666666667e+00
+2123 2122 -8.33333333333333e+00
+2123 2116 8.33333333333333e+00
+2123 2133 4.16666666666667e+00
+2123 1896 -4.16666666666667e+00
+2124 2124 6.25000000000000e+01
+2124 2125 -8.33333333333333e+00
+2124 2138 -4.16666666666667e+00
+2124 1897 -2.08333333333333e+00
+2124 2137 2.08333333333333e+00
+2124 2432 4.16666666666667e+00
+2124 1954 -2.08333333333333e+00
+2124 2430 -1.87500000000000e+01
+2124 2416 2.08333333333333e+00
+2124 1955 4.16666666666667e+00
+2124 2417 -4.16666666666667e+00
+2124 2126 -8.33333333333333e+00
+2124 2123 4.16666666666667e+00
+2124 1898 4.16666666666667e+00
+2124 2122 4.16666666666667e+00
+2124 2121 -1.87500000000000e+01
+2124 2266 -4.16666666666667e+00
+2124 2371 4.16666666666667e+00
+2124 2372 4.16666666666667e+00
+2124 2267 -4.16666666666667e+00
+2124 1953 -6.25000000000000e+00
+2124 2120 -4.16666666666667e+00
+2124 2117 4.16666666666667e+00
+2124 2119 8.33333333333333e+00
+2124 2116 -8.33333333333333e+00
+2124 2118 -1.25000000000000e+01
+2124 2431 4.16666666666667e+00
+2124 1896 -6.25000000000000e+00
+2125 2125 6.25000000000000e+01
+2125 2138 2.08333333333333e+00
+2125 2430 4.16666666666667e+00
+2125 2124 -8.33333333333333e+00
+2125 1896 -2.08333333333333e+00
+2125 2136 2.08333333333333e+00
+2125 2431 -6.25000000000000e+00
+2125 1953 -2.08333333333333e+00
+2125 2415 2.08333333333333e+00
+2125 2417 2.08333333333333e+00
+2125 2123 -2.08333333333333e+00
+2125 2122 -6.25000000000000e+00
+2125 2121 4.16666666666667e+00
+2125 2265 -4.16666666666667e+00
+2125 2370 4.16666666666667e+00
+2125 2267 -4.16666666666667e+00
+2125 2117 4.16666666666667e+00
+2125 2372 -8.33333333333333e+00
+2125 1955 4.16666666666667e+00
+2125 1954 -6.25000000000000e+00
+2125 2120 8.33333333333333e+00
+2125 2126 -8.33333333333333e+00
+2125 1898 4.16666666666667e+00
+2125 2119 -3.75000000000000e+01
+2125 2432 -2.08333333333333e+00
+2125 1897 -6.25000000000000e+00
+2125 2118 8.33333333333333e+00
+2125 2115 -8.33333333333333e+00
+2126 2126 6.25000000000000e+01
+2126 2137 2.08333333333333e+00
+2126 2136 -4.16666666666667e+00
+2126 2432 -6.25000000000000e+00
+2126 2430 4.16666666666667e+00
+2126 2416 2.08333333333333e+00
+2126 1953 4.16666666666667e+00
+2126 2415 -4.16666666666667e+00
+2126 2123 -6.25000000000000e+00
+2126 2122 -2.08333333333333e+00
+2126 2124 -8.33333333333333e+00
+2126 2121 4.16666666666667e+00
+2126 1896 4.16666666666667e+00
+2126 2266 -4.16666666666667e+00
+2126 2116 4.16666666666667e+00
+2126 1955 -1.87500000000000e+01
+2126 2371 -8.33333333333333e+00
+2126 1954 4.16666666666667e+00
+2126 2370 4.16666666666667e+00
+2126 2265 -4.16666666666667e+00
+2126 2120 -1.25000000000000e+01
+2126 2431 -2.08333333333333e+00
+2126 1898 -1.87500000000000e+01
+2126 2119 8.33333333333333e+00
+2126 2125 -8.33333333333333e+00
+2126 1897 4.16666666666667e+00
+2126 2118 -4.16666666666667e+00
+2126 2115 4.16666666666667e+00
+2127 2127 6.25000000000000e+01
+2127 2276 -8.33333333333333e+00
+2127 2275 4.16666666666667e+00
+2127 1967 2.08333333333333e+00
+2127 2455 4.16666666666667e+00
+2127 2454 -1.87500000000000e+01
+2127 2135 -2.08333333333333e+00
+2127 1898 2.08333333333333e+00
+2127 2134 4.16666666666667e+00
+2127 2133 -6.25000000000000e+00
+2127 2270 -4.16666666666667e+00
+2127 2269 -4.16666666666667e+00
+2127 2273 4.16666666666667e+00
+2127 2453 -2.08333333333333e+00
+2127 2128 -8.33333333333333e+00
+2127 2272 4.16666666666667e+00
+2127 2116 -4.16666666666667e+00
+2127 1966 -4.16666666666667e+00
+2127 2452 4.16666666666667e+00
+2127 2451 -6.25000000000000e+00
+2127 2129 -8.33333333333333e+00
+2127 2132 4.16666666666667e+00
+2127 2117 8.33333333333333e+00
+2127 2131 4.16666666666667e+00
+2127 1897 -4.16666666666667e+00
+2127 2456 4.16666666666667e+00
+2127 2130 -1.87500000000000e+01
+2127 2115 -1.25000000000000e+01
+2128 2128 6.25000000000000e+01
+2128 2276 4.16666666666667e+00
+2128 2274 4.16666666666667e+00
+2128 2455 -6.25000000000000e+00
+2128 2454 4.16666666666667e+00
+2128 2135 4.16666666666667e+00
+2128 2129 -8.33333333333333e+00
+2128 2134 -1.87500000000000e+01
+2128 2133 4.16666666666667e+00
+2128 2268 -4.16666666666667e+00
+2128 2453 4.16666666666667e+00
+2128 2127 -8.33333333333333e+00
+2128 2273 -8.33333333333333e+00
+2128 2117 8.33333333333333e+00
+2128 2271 4.16666666666667e+00
+2128 2115 -4.16666666666667e+00
+2128 1967 2.08333333333333e+00
+2128 2270 -4.16666666666667e+00
+2128 2452 -1.87500000000000e+01
+2128 1965 -4.16666666666667e+00
+2128 2451 4.16666666666667e+00
+2128 2132 -2.08333333333333e+00
+2128 1898 2.08333333333333e+00
+2128 2456 -2.08333333333333e+00
+2128 2131 -6.25000000000000e+00
+2128 2116 -1.25000000000000e+01
+2128 2130 4.16666666666667e+00
+2128 1896 -4.16666666666667e+00
+2129 2129 6.25000000000000e+01
+2129 2275 4.16666666666667e+00
+2129 2454 4.16666666666667e+00
+2129 2274 -8.33333333333333e+00
+2129 2456 -6.25000000000000e+00
+2129 1965 2.08333333333333e+00
+2129 2135 -6.25000000000000e+00
+2129 2134 4.16666666666667e+00
+2129 2128 -8.33333333333333e+00
+2129 2133 -2.08333333333333e+00
+2129 1896 2.08333333333333e+00
+2129 2268 -4.16666666666667e+00
+2129 2452 4.16666666666667e+00
+2129 2271 4.16666666666667e+00
+2129 2451 -2.08333333333333e+00
+2129 2272 -8.33333333333333e+00
+2129 2116 8.33333333333333e+00
+2129 2453 -6.25000000000000e+00
+2129 1966 2.08333333333333e+00
+2129 2269 -4.16666666666667e+00
+2129 2455 -2.08333333333333e+00
+2129 2132 -6.25000000000000e+00
+2129 2117 -3.75000000000000e+01
+2129 2131 -2.08333333333333e+00
+2129 1897 2.08333333333333e+00
+2129 2127 -8.33333333333333e+00
+2129 2130 4.16666666666667e+00
+2129 2115 8.33333333333333e+00
+2130 2130 6.25000000000000e+01
+2130 2468 4.16666666666667e+00
+2130 1898 -2.08333333333333e+00
+2130 2138 2.08333333333333e+00
+2130 2137 -4.16666666666667e+00
+2130 1973 -2.08333333333333e+00
+2130 2467 4.16666666666667e+00
+2130 2466 -1.87500000000000e+01
+2130 2378 4.16666666666667e+00
+2130 2377 4.16666666666667e+00
+2130 2120 8.33333333333333e+00
+2130 2119 -4.16666666666667e+00
+2130 2118 -1.25000000000000e+01
+2130 2273 -4.16666666666667e+00
+2130 2453 2.08333333333333e+00
+2130 2272 -4.16666666666667e+00
+2130 2116 4.16666666666667e+00
+2130 2452 -4.16666666666667e+00
+2130 1972 4.16666666666667e+00
+2130 1971 -6.25000000000000e+00
+2130 2129 4.16666666666667e+00
+2130 2117 -8.33333333333333e+00
+2130 2128 4.16666666666667e+00
+2130 2131 -8.33333333333333e+00
+2130 1897 4.16666666666667e+00
+2130 2127 -1.87500000000000e+01
+2130 2132 -8.33333333333333e+00
+2130 1896 -6.25000000000000e+00
+2131 2131 6.25000000000000e+01
+2131 2468 -2.08333333333333e+00
+2131 2136 -4.16666666666667e+00
+2131 2467 -6.25000000000000e+00
+2131 2466 4.16666666666667e+00
+2131 2378 -8.33333333333333e+00
+2131 1973 4.16666666666667e+00
+2131 2376 4.16666666666667e+00
+2131 2120 8.33333333333333e+00
+2131 2132 -8.33333333333333e+00
+2131 1898 4.16666666666667e+00
+2131 2119 -1.25000000000000e+01
+2131 2118 -4.16666666666667e+00
+2131 2271 -4.16666666666667e+00
+2131 2115 4.16666666666667e+00
+2131 2453 2.08333333333333e+00
+2131 2273 -4.16666666666667e+00
+2131 1972 -1.87500000000000e+01
+2131 2451 -4.16666666666667e+00
+2131 1971 4.16666666666667e+00
+2131 2129 -2.08333333333333e+00
+2131 2117 4.16666666666667e+00
+2131 2128 -6.25000000000000e+00
+2131 2138 2.08333333333333e+00
+2131 1897 -1.87500000000000e+01
+2131 2127 4.16666666666667e+00
+2131 2130 -8.33333333333333e+00
+2131 1896 4.16666666666667e+00
+2132 2132 6.25000000000000e+01
+2132 2467 -2.08333333333333e+00
+2132 2130 -8.33333333333333e+00
+2132 2466 4.16666666666667e+00
+2132 1896 -2.08333333333333e+00
+2132 2136 2.08333333333333e+00
+2132 2468 -6.25000000000000e+00
+2132 1971 -2.08333333333333e+00
+2132 2376 4.16666666666667e+00
+2132 2377 -8.33333333333333e+00
+2132 1972 4.16666666666667e+00
+2132 2120 -3.75000000000000e+01
+2132 2119 8.33333333333333e+00
+2132 2131 -8.33333333333333e+00
+2132 1897 4.16666666666667e+00
+2132 2118 8.33333333333333e+00
+2132 2271 -4.16666666666667e+00
+2132 2451 2.08333333333333e+00
+2132 1973 -6.25000000000000e+00
+2132 2452 2.08333333333333e+00
+2132 2272 -4.16666666666667e+00
+2132 2129 -6.25000000000000e+00
+2132 2137 2.08333333333333e+00
+2132 1898 -6.25000000000000e+00
+2132 2128 -2.08333333333333e+00
+2132 2116 4.16666666666667e+00
+2132 2127 4.16666666666667e+00
+2132 2115 -8.33333333333333e+00
+2133 2133 3.75000000000000e+01
+2133 2420 -4.16666666666667e+00
+2133 2419 2.08333333333333e+00
+2133 2135 -4.16666666666667e+00
+2133 2123 4.16666666666667e+00
+2133 1898 2.08333333333333e+00
+2133 2122 -2.08333333333333e+00
+2133 2121 -6.25000000000000e+00
+2133 2275 -4.16666666666667e+00
+2133 2116 4.16666666666667e+00
+2133 2456 2.08333333333333e+00
+2133 2276 -4.16666666666667e+00
+2133 1978 2.08333333333333e+00
+2133 2455 -4.16666666666667e+00
+2133 1977 -1.25000000000000e+01
+2133 2129 -2.08333333333333e+00
+2133 2117 4.16666666666667e+00
+2133 2134 -4.16666666666667e+00
+2133 2128 4.16666666666667e+00
+2133 1897 2.08333333333333e+00
+2133 1979 2.08333333333333e+00
+2133 2127 -6.25000000000000e+00
+2133 1896 -1.25000000000000e+01
+2134 2134 3.33333333333333e+01
+2134 2418 2.08333333333333e+00
+2134 2123 4.16666666666667e+00
+2134 2122 -6.25000000000000e+00
+2134 2121 -2.08333333333333e+00
+2134 2456 2.08333333333333e+00
+2134 2276 -4.16666666666667e+00
+2134 2274 -4.16666666666667e+00
+2134 2115 4.16666666666667e+00
+2134 1978 -4.16666666666667e+00
+2134 1977 2.08333333333333e+00
+2134 2454 -4.16666666666667e+00
+2134 2129 4.16666666666667e+00
+2134 2117 -8.33333333333333e+00
+2134 2420 2.08333333333333e+00
+2134 2128 -1.87500000000000e+01
+2134 1897 -4.16666666666667e+00
+2134 2133 -4.16666666666667e+00
+2134 2127 4.16666666666667e+00
+2134 1896 2.08333333333333e+00
+2135 2135 3.33333333333333e+01
+2135 1977 2.08333333333333e+00
+2135 2418 -4.16666666666667e+00
+2135 2123 -1.87500000000000e+01
+2135 2122 4.16666666666667e+00
+2135 2133 -4.16666666666667e+00
+2135 2121 4.16666666666667e+00
+2135 1896 2.08333333333333e+00
+2135 2455 2.08333333333333e+00
+2135 2275 -4.16666666666667e+00
+2135 1979 -4.16666666666667e+00
+2135 2454 2.08333333333333e+00
+2135 2274 -4.16666666666667e+00
+2135 2419 2.08333333333333e+00
+2135 2129 -6.25000000000000e+00
+2135 1898 -4.16666666666667e+00
+2135 2128 4.16666666666667e+00
+2135 2116 -8.33333333333333e+00
+2135 2127 -2.08333333333333e+00
+2135 2115 4.16666666666667e+00
+2136 2136 3.75000000000000e+01
+2136 2126 -4.16666666666667e+00
+2136 2125 2.08333333333333e+00
+2136 2138 -4.16666666666667e+00
+2136 2432 4.16666666666667e+00
+2136 1982 2.08333333333333e+00
+2136 2431 -2.08333333333333e+00
+2136 2430 -6.25000000000000e+00
+2136 2119 -4.16666666666667e+00
+2136 2383 4.16666666666667e+00
+2136 2132 2.08333333333333e+00
+2136 2120 -4.16666666666667e+00
+2136 1897 2.08333333333333e+00
+2136 2131 -4.16666666666667e+00
+2136 1896 -1.25000000000000e+01
+2136 2468 -2.08333333333333e+00
+2136 2384 4.16666666666667e+00
+2136 2137 -4.16666666666667e+00
+2136 2467 4.16666666666667e+00
+2136 1981 2.08333333333333e+00
+2136 1898 2.08333333333333e+00
+2136 2466 -6.25000000000000e+00
+2136 1980 -1.25000000000000e+01
+2137 2137 3.33333333333333e+01
+2137 2124 2.08333333333333e+00
+2137 2432 4.16666666666667e+00
+2137 2431 -6.25000000000000e+00
+2137 2430 -2.08333333333333e+00
+2137 2132 2.08333333333333e+00
+2137 2120 -4.16666666666667e+00
+2137 2118 -4.16666666666667e+00
+2137 2382 4.16666666666667e+00
+2137 1897 -4.16666666666667e+00
+2137 1896 2.08333333333333e+00
+2137 2130 -4.16666666666667e+00
+2137 2468 4.16666666666667e+00
+2137 2384 -8.33333333333333e+00
+2137 2126 2.08333333333333e+00
+2137 2467 -1.87500000000000e+01
+2137 1981 -4.16666666666667e+00
+2137 2136 -4.16666666666667e+00
+2137 2466 4.16666666666667e+00
+2137 1980 2.08333333333333e+00
+2138 2138 3.33333333333333e+01
+2138 1896 2.08333333333333e+00
+2138 2124 -4.16666666666667e+00
+2138 2432 -1.87500000000000e+01
+2138 2431 4.16666666666667e+00
+2138 2136 -4.16666666666667e+00
+2138 2430 4.16666666666667e+00
+2138 1980 2.08333333333333e+00
+2138 2131 2.08333333333333e+00
+2138 2119 -4.16666666666667e+00
+2138 1898 -4.16666666666667e+00
+2138 2130 2.08333333333333e+00
+2138 2118 -4.16666666666667e+00
+2138 2125 2.08333333333333e+00
+2138 2468 -6.25000000000000e+00
+2138 1982 -4.16666666666667e+00
+2138 2467 4.16666666666667e+00
+2138 2383 -8.33333333333333e+00
+2138 2466 -2.08333333333333e+00
+2138 2382 4.16666666666667e+00
+2139 2139 1.25000000000000e+02
+2139 2143 8.33333333333333e+00
+2139 2142 -1.25000000000000e+01
+2139 2390 -8.33333333333333e+00
+2139 2389 4.16666666666667e+00
+2139 2402 8.33333333333333e+00
+2139 2149 4.16666666666667e+00
+2139 2401 8.33333333333333e+00
+2139 2400 -3.75000000000000e+01
+2139 2150 4.16666666666667e+00
+2139 2392 -4.16666666666667e+00
+2139 2393 8.33333333333333e+00
+2139 2141 -1.66666666666667e+01
+2139 1940 -4.16666666666667e+00
+2139 2391 -1.25000000000000e+01
+2139 2387 4.16666666666667e+00
+2139 2140 -1.66666666666667e+01
+2139 2386 4.16666666666667e+00
+2139 1939 -4.16666666666667e+00
+2139 2399 -4.16666666666667e+00
+2139 2396 4.16666666666667e+00
+2139 2146 -4.16666666666667e+00
+2139 2395 -8.33333333333333e+00
+2139 2398 8.33333333333333e+00
+2139 2397 -1.25000000000000e+01
+2139 2147 8.33333333333333e+00
+2139 2145 -1.25000000000000e+01
+2139 2144 -4.16666666666667e+00
+2139 1508 4.16666666666667e+00
+2139 1295 -4.16666666666667e+00
+2139 1507 -8.33333333333333e+00
+2139 1504 8.33333333333333e+00
+2139 1505 8.33333333333333e+00
+2139 1294 -4.16666666666667e+00
+2139 1503 -3.75000000000000e+01
+2139 1510 4.16666666666667e+00
+2139 1511 -8.33333333333333e+00
+2140 2140 1.25000000000000e+02
+2140 2142 8.33333333333333e+00
+2140 2144 8.33333333333333e+00
+2140 2143 -3.75000000000000e+01
+2140 2388 4.16666666666667e+00
+2140 2402 -4.16666666666667e+00
+2140 2148 4.16666666666667e+00
+2140 2401 -1.25000000000000e+01
+2140 2400 8.33333333333333e+00
+2140 2150 -8.33333333333333e+00
+2140 2391 -4.16666666666667e+00
+2140 2393 8.33333333333333e+00
+2140 2392 -1.25000000000000e+01
+2140 2139 -1.66666666666667e+01
+2140 2387 -8.33333333333333e+00
+2140 2385 4.16666666666667e+00
+2140 1938 -4.16666666666667e+00
+2140 2399 8.33333333333333e+00
+2140 2141 -1.66666666666667e+01
+2140 2147 8.33333333333333e+00
+2140 2145 -4.16666666666667e+00
+2140 2396 4.16666666666667e+00
+2140 1940 -4.16666666666667e+00
+2140 2398 -3.75000000000000e+01
+2140 2394 -8.33333333333333e+00
+2140 2397 8.33333333333333e+00
+2140 2146 -1.25000000000000e+01
+2140 2390 4.16666666666667e+00
+2140 1508 4.16666666666667e+00
+2140 1506 -8.33333333333333e+00
+2140 1505 -4.16666666666667e+00
+2140 1503 8.33333333333333e+00
+2140 1504 -1.25000000000000e+01
+2140 1293 -4.16666666666667e+00
+2140 1509 4.16666666666667e+00
+2140 1511 4.16666666666667e+00
+2140 1295 -4.16666666666667e+00
+2141 2141 1.25000000000000e+02
+2141 2389 4.16666666666667e+00
+2141 2144 -1.25000000000000e+01
+2141 2143 8.33333333333333e+00
+2141 2388 -8.33333333333333e+00
+2141 2401 -4.16666666666667e+00
+2141 2400 8.33333333333333e+00
+2141 2402 -1.25000000000000e+01
+2141 2149 -8.33333333333333e+00
+2141 2148 4.16666666666667e+00
+2141 2391 8.33333333333333e+00
+2141 2139 -1.66666666666667e+01
+2141 2393 -3.75000000000000e+01
+2141 2392 8.33333333333333e+00
+2141 1938 -4.16666666666667e+00
+2141 2385 4.16666666666667e+00
+2141 2386 -8.33333333333333e+00
+2141 2397 -4.16666666666667e+00
+2141 2394 4.16666666666667e+00
+2141 2398 8.33333333333333e+00
+2141 2140 -1.66666666666667e+01
+2141 2146 8.33333333333333e+00
+2141 2399 -1.25000000000000e+01
+2141 2395 4.16666666666667e+00
+2141 1939 -4.16666666666667e+00
+2141 2147 -3.75000000000000e+01
+2141 2142 -4.16666666666667e+00
+2141 2145 8.33333333333333e+00
+2141 1507 4.16666666666667e+00
+2141 1506 4.16666666666667e+00
+2141 1293 -4.16666666666667e+00
+2141 1504 -4.16666666666667e+00
+2141 1505 -1.25000000000000e+01
+2141 1503 8.33333333333333e+00
+2141 1510 4.16666666666667e+00
+2141 1294 -4.16666666666667e+00
+2141 1509 -8.33333333333333e+00
+2142 2142 6.25000000000000e+01
+2142 2392 4.16666666666667e+00
+2142 2393 4.16666666666667e+00
+2142 2435 4.16666666666667e+00
+2142 2433 -6.25000000000000e+00
+2142 2143 -8.33333333333333e+00
+2142 2141 -4.16666666666667e+00
+2142 2144 -8.33333333333333e+00
+2142 2390 -4.16666666666667e+00
+2142 2402 4.16666666666667e+00
+2142 2437 4.16666666666667e+00
+2142 2140 8.33333333333333e+00
+2142 2401 -8.33333333333333e+00
+2142 2438 4.16666666666667e+00
+2142 1958 -4.16666666666667e+00
+2142 1957 2.08333333333333e+00
+2142 2389 -4.16666666666667e+00
+2142 2436 -1.87500000000000e+01
+2142 2150 4.16666666666667e+00
+2142 2149 -2.08333333333333e+00
+2142 2148 -6.25000000000000e+00
+2142 2434 -2.08333333333333e+00
+2142 2139 -1.25000000000000e+01
+2142 1508 4.16666666666667e+00
+2142 1507 4.16666666666667e+00
+2142 1506 -1.87500000000000e+01
+2142 1295 -4.16666666666667e+00
+2142 1294 2.08333333333333e+00
+2143 2143 6.25000000000000e+01
+2143 2433 -2.08333333333333e+00
+2143 2391 4.16666666666667e+00
+2143 2393 -8.33333333333333e+00
+2143 1958 2.08333333333333e+00
+2143 2434 -6.25000000000000e+00
+2143 2142 -8.33333333333333e+00
+2143 2438 -2.08333333333333e+00
+2143 2436 4.16666666666667e+00
+2143 2390 -4.16666666666667e+00
+2143 2402 4.16666666666667e+00
+2143 2139 8.33333333333333e+00
+2143 2400 -8.33333333333333e+00
+2143 2437 -6.25000000000000e+00
+2143 1956 2.08333333333333e+00
+2143 2388 -4.16666666666667e+00
+2143 2150 4.16666666666667e+00
+2143 2144 -8.33333333333333e+00
+2143 2141 8.33333333333333e+00
+2143 2149 -6.25000000000000e+00
+2143 2435 4.16666666666667e+00
+2143 2140 -3.75000000000000e+01
+2143 2148 -2.08333333333333e+00
+2143 1508 -2.08333333333333e+00
+2143 1295 2.08333333333333e+00
+2143 1507 -6.25000000000000e+00
+2143 1506 4.16666666666667e+00
+2143 1293 2.08333333333333e+00
+2144 2144 6.25000000000000e+01
+2144 2392 -8.33333333333333e+00
+2144 2391 4.16666666666667e+00
+2144 2435 -1.87500000000000e+01
+2144 1957 2.08333333333333e+00
+2144 2433 4.16666666666667e+00
+2144 2139 -4.16666666666667e+00
+2144 2437 -2.08333333333333e+00
+2144 2142 -8.33333333333333e+00
+2144 2388 -4.16666666666667e+00
+2144 2400 4.16666666666667e+00
+2144 2389 -4.16666666666667e+00
+2144 2401 4.16666666666667e+00
+2144 2438 -6.25000000000000e+00
+2144 2436 4.16666666666667e+00
+2144 1956 -4.16666666666667e+00
+2144 2150 -1.87500000000000e+01
+2144 2434 4.16666666666667e+00
+2144 2141 -1.25000000000000e+01
+2144 2149 4.16666666666667e+00
+2144 2143 -8.33333333333333e+00
+2144 2140 8.33333333333333e+00
+2144 2148 4.16666666666667e+00
+2144 1508 -6.25000000000000e+00
+2144 1507 -2.08333333333333e+00
+2144 1294 2.08333333333333e+00
+2144 1506 4.16666666666667e+00
+2144 1293 -4.16666666666667e+00
+2145 2145 6.25000000000000e+01
+2145 2402 -8.33333333333333e+00
+2145 2401 4.16666666666667e+00
+2145 1976 2.08333333333333e+00
+2145 2473 4.16666666666667e+00
+2145 2472 -1.87500000000000e+01
+2145 2150 -2.08333333333333e+00
+2145 2149 4.16666666666667e+00
+2145 2148 -6.25000000000000e+00
+2145 2396 -4.16666666666667e+00
+2145 2395 -4.16666666666667e+00
+2145 2399 4.16666666666667e+00
+2145 2471 -2.08333333333333e+00
+2145 2146 -8.33333333333333e+00
+2145 2398 4.16666666666667e+00
+2145 2140 -4.16666666666667e+00
+2145 1975 -4.16666666666667e+00
+2145 2470 4.16666666666667e+00
+2145 2469 -6.25000000000000e+00
+2145 2147 -8.33333333333333e+00
+2145 2141 8.33333333333333e+00
+2145 2474 4.16666666666667e+00
+2145 2139 -1.25000000000000e+01
+2145 1295 2.08333333333333e+00
+2145 1511 4.16666666666667e+00
+2145 1510 4.16666666666667e+00
+2145 1294 -4.16666666666667e+00
+2145 1509 -1.87500000000000e+01
+2146 2146 6.25000000000000e+01
+2146 2402 4.16666666666667e+00
+2146 2400 4.16666666666667e+00
+2146 2473 -6.25000000000000e+00
+2146 2472 4.16666666666667e+00
+2146 2150 4.16666666666667e+00
+2146 2147 -8.33333333333333e+00
+2146 2149 -1.87500000000000e+01
+2146 2148 4.16666666666667e+00
+2146 2394 -4.16666666666667e+00
+2146 2471 4.16666666666667e+00
+2146 2145 -8.33333333333333e+00
+2146 2399 -8.33333333333333e+00
+2146 2141 8.33333333333333e+00
+2146 2397 4.16666666666667e+00
+2146 2139 -4.16666666666667e+00
+2146 1976 2.08333333333333e+00
+2146 2396 -4.16666666666667e+00
+2146 2470 -1.87500000000000e+01
+2146 1974 -4.16666666666667e+00
+2146 2469 4.16666666666667e+00
+2146 2474 -2.08333333333333e+00
+2146 2140 -1.25000000000000e+01
+2146 1511 -2.08333333333333e+00
+2146 1295 2.08333333333333e+00
+2146 1510 -6.25000000000000e+00
+2146 1509 4.16666666666667e+00
+2146 1293 -4.16666666666667e+00
+2147 2147 6.25000000000000e+01
+2147 2401 4.16666666666667e+00
+2147 2472 4.16666666666667e+00
+2147 2400 -8.33333333333333e+00
+2147 2474 -6.25000000000000e+00
+2147 1974 2.08333333333333e+00
+2147 2150 -6.25000000000000e+00
+2147 2149 4.16666666666667e+00
+2147 2146 -8.33333333333333e+00
+2147 2148 -2.08333333333333e+00
+2147 2394 -4.16666666666667e+00
+2147 2470 4.16666666666667e+00
+2147 2397 4.16666666666667e+00
+2147 2469 -2.08333333333333e+00
+2147 2398 -8.33333333333333e+00
+2147 2140 8.33333333333333e+00
+2147 2471 -6.25000000000000e+00
+2147 1975 2.08333333333333e+00
+2147 2395 -4.16666666666667e+00
+2147 2473 -2.08333333333333e+00
+2147 2141 -3.75000000000000e+01
+2147 2145 -8.33333333333333e+00
+2147 2139 8.33333333333333e+00
+2147 1293 2.08333333333333e+00
+2147 1511 -6.25000000000000e+00
+2147 1510 -2.08333333333333e+00
+2147 1294 2.08333333333333e+00
+2147 1509 4.16666666666667e+00
+2148 2148 3.75000000000000e+01
+2148 2438 -4.16666666666667e+00
+2148 2437 2.08333333333333e+00
+2148 2150 -4.16666666666667e+00
+2148 2144 4.16666666666667e+00
+2148 2143 -2.08333333333333e+00
+2148 2142 -6.25000000000000e+00
+2148 2401 -4.16666666666667e+00
+2148 2140 4.16666666666667e+00
+2148 2474 2.08333333333333e+00
+2148 2402 -4.16666666666667e+00
+2148 1981 2.08333333333333e+00
+2148 2473 -4.16666666666667e+00
+2148 1980 -1.25000000000000e+01
+2148 2147 -2.08333333333333e+00
+2148 2141 4.16666666666667e+00
+2148 2149 -4.16666666666667e+00
+2148 2146 4.16666666666667e+00
+2148 1982 2.08333333333333e+00
+2148 2145 -6.25000000000000e+00
+2148 1295 2.08333333333333e+00
+2148 1294 2.08333333333333e+00
+2148 1293 -1.25000000000000e+01
+2149 2149 3.33333333333333e+01
+2149 2436 2.08333333333333e+00
+2149 2144 4.16666666666667e+00
+2149 2143 -6.25000000000000e+00
+2149 2142 -2.08333333333333e+00
+2149 2474 2.08333333333333e+00
+2149 2402 -4.16666666666667e+00
+2149 2400 -4.16666666666667e+00
+2149 2139 4.16666666666667e+00
+2149 1981 -4.16666666666667e+00
+2149 1980 2.08333333333333e+00
+2149 2472 -4.16666666666667e+00
+2149 2147 4.16666666666667e+00
+2149 2141 -8.33333333333333e+00
+2149 2438 2.08333333333333e+00
+2149 2146 -1.87500000000000e+01
+2149 2148 -4.16666666666667e+00
+2149 2145 4.16666666666667e+00
+2149 1294 -4.16666666666667e+00
+2149 1293 2.08333333333333e+00
+2150 2150 3.33333333333333e+01
+2150 1980 2.08333333333333e+00
+2150 2436 -4.16666666666667e+00
+2150 2144 -1.87500000000000e+01
+2150 2143 4.16666666666667e+00
+2150 2148 -4.16666666666667e+00
+2150 2142 4.16666666666667e+00
+2150 2473 2.08333333333333e+00
+2150 2401 -4.16666666666667e+00
+2150 1982 -4.16666666666667e+00
+2150 2472 2.08333333333333e+00
+2150 2400 -4.16666666666667e+00
+2150 2437 2.08333333333333e+00
+2150 2147 -6.25000000000000e+00
+2150 2146 4.16666666666667e+00
+2150 2140 -8.33333333333333e+00
+2150 2145 -2.08333333333333e+00
+2150 2139 4.16666666666667e+00
+2150 1293 2.08333333333333e+00
+2150 1295 -4.16666666666667e+00
+2151 2151 6.25000000000000e+01
+2151 2195 -4.16666666666667e+00
+2151 2167 4.16666666666667e+00
+2151 2194 -4.16666666666667e+00
+2151 2191 -4.16666666666667e+00
+2151 2162 4.16666666666667e+00
+2151 2168 -8.33333333333333e+00
+2151 2161 4.16666666666667e+00
+2151 2160 -1.87500000000000e+01
+2151 1991 4.16666666666667e+00
+2151 2153 -8.33333333333333e+00
+2151 2159 8.33333333333333e+00
+2151 2188 4.16666666666667e+00
+2151 2158 -4.16666666666667e+00
+2151 1901 -2.08333333333333e+00
+2151 1985 2.08333333333333e+00
+2151 1900 4.16666666666667e+00
+2151 1984 -4.16666666666667e+00
+2151 1899 -6.25000000000000e+00
+2151 2157 -1.25000000000000e+01
+2151 1907 -2.08333333333333e+00
+2151 2189 4.16666666666667e+00
+2151 2152 -8.33333333333333e+00
+2151 1906 4.16666666666667e+00
+2151 1990 4.16666666666667e+00
+2151 2192 2.08333333333333e+00
+2151 1905 -6.25000000000000e+00
+2151 1989 -1.87500000000000e+01
+2152 2152 6.25000000000000e+01
+2152 2193 -4.16666666666667e+00
+2152 2192 2.08333333333333e+00
+2152 2195 -4.16666666666667e+00
+2152 2190 -4.16666666666667e+00
+2152 2162 -2.08333333333333e+00
+2152 2168 4.16666666666667e+00
+2152 2161 -6.25000000000000e+00
+2152 2160 4.16666666666667e+00
+2152 1991 -2.08333333333333e+00
+2152 1985 2.08333333333333e+00
+2152 2187 4.16666666666667e+00
+2152 2157 -4.16666666666667e+00
+2152 1901 4.16666666666667e+00
+2152 2153 -8.33333333333333e+00
+2152 2159 8.33333333333333e+00
+2152 1900 -1.87500000000000e+01
+2152 2158 -1.25000000000000e+01
+2152 1899 4.16666666666667e+00
+2152 1983 -4.16666666666667e+00
+2152 1907 4.16666666666667e+00
+2152 2189 -8.33333333333333e+00
+2152 2166 4.16666666666667e+00
+2152 1906 -1.87500000000000e+01
+2152 1990 -6.25000000000000e+00
+2152 2151 -8.33333333333333e+00
+2152 1905 4.16666666666667e+00
+2152 1989 4.16666666666667e+00
+2153 2153 6.25000000000000e+01
+2153 2193 -4.16666666666667e+00
+2153 2191 2.08333333333333e+00
+2153 2194 -4.16666666666667e+00
+2153 2162 -6.25000000000000e+00
+2153 2161 -2.08333333333333e+00
+2153 2167 4.16666666666667e+00
+2153 2160 4.16666666666667e+00
+2153 2166 -8.33333333333333e+00
+2153 1990 -2.08333333333333e+00
+2153 1984 2.08333333333333e+00
+2153 1989 4.16666666666667e+00
+2153 2151 -8.33333333333333e+00
+2153 2157 8.33333333333333e+00
+2153 1901 -6.25000000000000e+00
+2153 2159 -3.75000000000000e+01
+2153 1900 4.16666666666667e+00
+2153 2152 -8.33333333333333e+00
+2153 2158 8.33333333333333e+00
+2153 1899 -2.08333333333333e+00
+2153 1983 2.08333333333333e+00
+2153 2190 2.08333333333333e+00
+2153 1907 -6.25000000000000e+00
+2153 1991 -6.25000000000000e+00
+2153 1906 4.16666666666667e+00
+2153 2188 -8.33333333333333e+00
+2153 1905 -2.08333333333333e+00
+2153 2187 4.16666666666667e+00
+2154 2154 6.25000000000000e+01
+2154 2165 4.16666666666667e+00
+2154 2164 4.16666666666667e+00
+2154 2163 -1.87500000000000e+01
+2154 2228 -4.16666666666667e+00
+2154 2230 -4.16666666666667e+00
+2154 2168 4.16666666666667e+00
+2154 2167 -8.33333333333333e+00
+2154 2231 -4.16666666666667e+00
+2154 2225 4.16666666666667e+00
+2154 2159 -4.16666666666667e+00
+2154 2155 -8.33333333333333e+00
+2154 2158 8.33333333333333e+00
+2154 1996 4.16666666666667e+00
+2154 1901 4.16666666666667e+00
+2154 1985 -4.16666666666667e+00
+2154 1900 -2.08333333333333e+00
+2154 1984 2.08333333333333e+00
+2154 1899 -6.25000000000000e+00
+2154 2157 -1.25000000000000e+01
+2154 2156 -8.33333333333333e+00
+2154 1913 4.16666666666667e+00
+2154 1997 4.16666666666667e+00
+2154 1912 -2.08333333333333e+00
+2154 2224 4.16666666666667e+00
+2154 2227 2.08333333333333e+00
+2154 1911 -6.25000000000000e+00
+2154 1995 -1.87500000000000e+01
+2155 2155 6.25000000000000e+01
+2155 2165 -2.08333333333333e+00
+2155 2164 -6.25000000000000e+00
+2155 2163 4.16666666666667e+00
+2155 2228 2.08333333333333e+00
+2155 2168 4.16666666666667e+00
+2155 2231 -4.16666666666667e+00
+2155 2229 -4.16666666666667e+00
+2155 2166 -8.33333333333333e+00
+2155 1985 2.08333333333333e+00
+2155 1997 -2.08333333333333e+00
+2155 2154 -8.33333333333333e+00
+2155 2157 8.33333333333333e+00
+2155 1995 4.16666666666667e+00
+2155 1901 4.16666666666667e+00
+2155 2156 -8.33333333333333e+00
+2155 2159 8.33333333333333e+00
+2155 1900 -6.25000000000000e+00
+2155 2158 -3.75000000000000e+01
+2155 1899 -2.08333333333333e+00
+2155 1983 2.08333333333333e+00
+2155 1913 4.16666666666667e+00
+2155 2225 -8.33333333333333e+00
+2155 2226 2.08333333333333e+00
+2155 1912 -6.25000000000000e+00
+2155 1996 -6.25000000000000e+00
+2155 1911 -2.08333333333333e+00
+2155 2223 4.16666666666667e+00
+2156 2156 6.25000000000000e+01
+2156 2164 -2.08333333333333e+00
+2156 2163 4.16666666666667e+00
+2156 2227 2.08333333333333e+00
+2156 2226 -4.16666666666667e+00
+2156 2167 4.16666666666667e+00
+2156 2230 -4.16666666666667e+00
+2156 2166 4.16666666666667e+00
+2156 2229 -4.16666666666667e+00
+2156 2223 4.16666666666667e+00
+2156 2157 -4.16666666666667e+00
+2156 1984 2.08333333333333e+00
+2156 1996 -2.08333333333333e+00
+2156 1901 -1.87500000000000e+01
+2156 2159 -1.25000000000000e+01
+2156 1900 4.16666666666667e+00
+2156 2155 -8.33333333333333e+00
+2156 2158 8.33333333333333e+00
+2156 1899 4.16666666666667e+00
+2156 1983 -4.16666666666667e+00
+2156 2165 -6.25000000000000e+00
+2156 1913 -1.87500000000000e+01
+2156 1997 -6.25000000000000e+00
+2156 1912 4.16666666666667e+00
+2156 2224 -8.33333333333333e+00
+2156 2154 -8.33333333333333e+00
+2156 1911 4.16666666666667e+00
+2156 1995 4.16666666666667e+00
+2157 2157 1.25000000000000e+02
+2157 2194 -8.33333333333333e+00
+2157 2153 8.33333333333333e+00
+2157 1990 4.16666666666667e+00
+2157 2152 -4.16666666666667e+00
+2157 1991 -8.33333333333333e+00
+2157 2151 -1.25000000000000e+01
+2157 2189 -4.16666666666667e+00
+2157 2188 8.33333333333333e+00
+2157 2187 -1.25000000000000e+01
+2157 2260 -4.16666666666667e+00
+2157 2168 8.33333333333333e+00
+2157 2231 -8.33333333333333e+00
+2157 2230 4.16666666666667e+00
+2157 1901 4.16666666666667e+00
+2157 2167 8.33333333333333e+00
+2157 2158 -1.66666666666667e+01
+2157 2166 -3.75000000000000e+01
+2157 2261 -4.16666666666667e+00
+2157 1919 4.16666666666667e+00
+2157 2156 -4.16666666666667e+00
+2157 2155 8.33333333333333e+00
+2157 1985 -4.16666666666667e+00
+2157 1997 4.16666666666667e+00
+2157 2002 8.33333333333333e+00
+2157 1996 -8.33333333333333e+00
+2157 1900 4.16666666666667e+00
+2157 1984 -4.16666666666667e+00
+2157 2154 -1.25000000000000e+01
+2157 2159 -1.66666666666667e+01
+2157 2225 8.33333333333333e+00
+2157 2003 8.33333333333333e+00
+2157 2224 -4.16666666666667e+00
+2157 1918 4.16666666666667e+00
+2157 2195 4.16666666666667e+00
+2157 2223 -1.25000000000000e+01
+2157 2001 -3.75000000000000e+01
+2158 2158 1.25000000000000e+02
+2158 2193 -8.33333333333333e+00
+2158 1989 4.16666666666667e+00
+2158 2151 -4.16666666666667e+00
+2158 1991 4.16666666666667e+00
+2158 2153 8.33333333333333e+00
+2158 2152 -1.25000000000000e+01
+2158 2189 8.33333333333333e+00
+2158 2188 -3.75000000000000e+01
+2158 2187 8.33333333333333e+00
+2158 2261 -4.16666666666667e+00
+2158 2259 -4.16666666666667e+00
+2158 2168 -4.16666666666667e+00
+2158 2231 4.16666666666667e+00
+2158 2229 4.16666666666667e+00
+2158 2167 -1.25000000000000e+01
+2158 2166 8.33333333333333e+00
+2158 2157 -1.66666666666667e+01
+2158 2003 -4.16666666666667e+00
+2158 2159 -1.66666666666667e+01
+2158 1985 -4.16666666666667e+00
+2158 1997 4.16666666666667e+00
+2158 2154 8.33333333333333e+00
+2158 2001 8.33333333333333e+00
+2158 1995 -8.33333333333333e+00
+2158 1901 -8.33333333333333e+00
+2158 2156 8.33333333333333e+00
+2158 2155 -3.75000000000000e+01
+2158 1899 4.16666666666667e+00
+2158 1983 -4.16666666666667e+00
+2158 2225 8.33333333333333e+00
+2158 1919 -8.33333333333333e+00
+2158 2195 4.16666666666667e+00
+2158 2224 -1.25000000000000e+01
+2158 2002 -1.25000000000000e+01
+2158 2223 -4.16666666666667e+00
+2158 1917 4.16666666666667e+00
+2159 2159 1.25000000000000e+02
+2159 2193 4.16666666666667e+00
+2159 2151 8.33333333333333e+00
+2159 1990 4.16666666666667e+00
+2159 1989 -8.33333333333333e+00
+2159 2153 -3.75000000000000e+01
+2159 2152 8.33333333333333e+00
+2159 2189 -1.25000000000000e+01
+2159 2188 8.33333333333333e+00
+2159 2187 -4.16666666666667e+00
+2159 2260 -4.16666666666667e+00
+2159 2167 -4.16666666666667e+00
+2159 2230 4.16666666666667e+00
+2159 2166 8.33333333333333e+00
+2159 2229 -8.33333333333333e+00
+2159 2168 -1.25000000000000e+01
+2159 1899 4.16666666666667e+00
+2159 2259 -4.16666666666667e+00
+2159 1917 4.16666666666667e+00
+2159 2002 -4.16666666666667e+00
+2159 2158 -1.66666666666667e+01
+2159 2154 -4.16666666666667e+00
+2159 1984 -4.16666666666667e+00
+2159 1996 4.16666666666667e+00
+2159 1983 -4.16666666666667e+00
+2159 1995 4.16666666666667e+00
+2159 2156 -1.25000000000000e+01
+2159 1900 -8.33333333333333e+00
+2159 2155 8.33333333333333e+00
+2159 2194 4.16666666666667e+00
+2159 2225 -3.75000000000000e+01
+2159 2003 -1.25000000000000e+01
+2159 2224 8.33333333333333e+00
+2159 1918 -8.33333333333333e+00
+2159 2157 -1.66666666666667e+01
+2159 2223 8.33333333333333e+00
+2159 2001 8.33333333333333e+00
+2160 2160 6.25000000000000e+01
+2160 2194 4.16666666666667e+00
+2160 2195 4.16666666666667e+00
+2160 2153 4.16666666666667e+00
+2160 2162 -8.33333333333333e+00
+2160 2152 4.16666666666667e+00
+2160 2151 -1.87500000000000e+01
+2160 2191 4.16666666666667e+00
+2160 2190 -6.25000000000000e+00
+2160 2167 -4.16666666666667e+00
+2160 2161 -8.33333333333333e+00
+2160 2012 4.16666666666667e+00
+2160 2299 -4.16666666666667e+00
+2160 2023 4.16666666666667e+00
+2160 2168 8.33333333333333e+00
+2160 2024 -8.33333333333333e+00
+2160 1925 2.08333333333333e+00
+2160 2300 -4.16666666666667e+00
+2160 2011 4.16666666666667e+00
+2160 1924 -4.16666666666667e+00
+2160 2010 -1.87500000000000e+01
+2160 2006 -2.08333333333333e+00
+2160 1901 2.08333333333333e+00
+2160 2005 4.16666666666667e+00
+2160 1900 -4.16666666666667e+00
+2160 2004 -6.25000000000000e+00
+2160 2192 -2.08333333333333e+00
+2160 2166 -1.25000000000000e+01
+2161 2161 6.25000000000000e+01
+2161 2193 4.16666666666667e+00
+2161 2195 -8.33333333333333e+00
+2161 2153 -2.08333333333333e+00
+2161 1901 2.08333333333333e+00
+2161 2152 -6.25000000000000e+00
+2161 2151 4.16666666666667e+00
+2161 1925 2.08333333333333e+00
+2161 2191 -1.87500000000000e+01
+2161 2190 4.16666666666667e+00
+2161 2166 -4.16666666666667e+00
+2161 2012 -2.08333333333333e+00
+2161 2160 -8.33333333333333e+00
+2161 2298 -4.16666666666667e+00
+2161 2022 4.16666666666667e+00
+2161 2300 -4.16666666666667e+00
+2161 2024 4.16666666666667e+00
+2161 2011 -6.25000000000000e+00
+2161 2010 4.16666666666667e+00
+2161 1923 -4.16666666666667e+00
+2161 2006 4.16666666666667e+00
+2161 2162 -8.33333333333333e+00
+2161 2168 8.33333333333333e+00
+2161 2005 -1.87500000000000e+01
+2161 2192 4.16666666666667e+00
+2161 2167 -1.25000000000000e+01
+2161 2004 4.16666666666667e+00
+2161 1899 -4.16666666666667e+00
+2162 2162 6.25000000000000e+01
+2162 2190 -2.08333333333333e+00
+2162 2194 -8.33333333333333e+00
+2162 2193 4.16666666666667e+00
+2162 2153 -6.25000000000000e+00
+2162 2152 -2.08333333333333e+00
+2162 1900 2.08333333333333e+00
+2162 2151 4.16666666666667e+00
+2162 2160 -8.33333333333333e+00
+2162 2192 -6.25000000000000e+00
+2162 1924 2.08333333333333e+00
+2162 2011 -2.08333333333333e+00
+2162 2010 4.16666666666667e+00
+2162 2299 -4.16666666666667e+00
+2162 2023 4.16666666666667e+00
+2162 2166 8.33333333333333e+00
+2162 2022 -8.33333333333333e+00
+2162 2012 -6.25000000000000e+00
+2162 1923 2.08333333333333e+00
+2162 2298 -4.16666666666667e+00
+2162 2006 -6.25000000000000e+00
+2162 2191 4.16666666666667e+00
+2162 2168 -3.75000000000000e+01
+2162 2005 4.16666666666667e+00
+2162 2161 -8.33333333333333e+00
+2162 2167 8.33333333333333e+00
+2162 2004 -2.08333333333333e+00
+2162 1899 2.08333333333333e+00
+2163 2163 6.25000000000000e+01
+2163 2227 -2.08333333333333e+00
+2163 2230 4.16666666666667e+00
+2163 2228 4.16666666666667e+00
+2163 2226 -6.25000000000000e+00
+2163 2156 4.16666666666667e+00
+2163 2164 -8.33333333333333e+00
+2163 2155 4.16666666666667e+00
+2163 2154 -1.87500000000000e+01
+2163 2336 -4.16666666666667e+00
+2163 2165 -8.33333333333333e+00
+2163 2017 4.16666666666667e+00
+2163 2024 4.16666666666667e+00
+2163 2168 -4.16666666666667e+00
+2163 2023 -8.33333333333333e+00
+2163 2167 8.33333333333333e+00
+2163 2018 4.16666666666667e+00
+2163 1931 -4.16666666666667e+00
+2163 1930 2.08333333333333e+00
+2163 2335 -4.16666666666667e+00
+2163 2016 -1.87500000000000e+01
+2163 2006 4.16666666666667e+00
+2163 1901 -4.16666666666667e+00
+2163 2005 -2.08333333333333e+00
+2163 1900 2.08333333333333e+00
+2163 2004 -6.25000000000000e+00
+2163 2231 4.16666666666667e+00
+2163 2166 -1.25000000000000e+01
+2164 2164 6.25000000000000e+01
+2164 2231 -8.33333333333333e+00
+2164 2226 -2.08333333333333e+00
+2164 2229 4.16666666666667e+00
+2164 1931 2.08333333333333e+00
+2164 2227 -6.25000000000000e+00
+2164 1901 2.08333333333333e+00
+2164 2156 -2.08333333333333e+00
+2164 2155 -6.25000000000000e+00
+2164 2163 -8.33333333333333e+00
+2164 2154 4.16666666666667e+00
+2164 2336 -4.16666666666667e+00
+2164 2018 -2.08333333333333e+00
+2164 2024 4.16666666666667e+00
+2164 2016 4.16666666666667e+00
+2164 2022 -8.33333333333333e+00
+2164 2166 8.33333333333333e+00
+2164 2017 -6.25000000000000e+00
+2164 1929 2.08333333333333e+00
+2164 2334 -4.16666666666667e+00
+2164 2006 4.16666666666667e+00
+2164 2165 -8.33333333333333e+00
+2164 2168 8.33333333333333e+00
+2164 2005 -6.25000000000000e+00
+2164 2228 4.16666666666667e+00
+2164 2167 -3.75000000000000e+01
+2164 2004 -2.08333333333333e+00
+2164 1899 2.08333333333333e+00
+2165 2165 6.25000000000000e+01
+2165 2227 4.16666666666667e+00
+2165 2230 -8.33333333333333e+00
+2165 2228 -1.87500000000000e+01
+2165 1930 2.08333333333333e+00
+2165 2226 4.16666666666667e+00
+2165 2156 -6.25000000000000e+00
+2165 1900 2.08333333333333e+00
+2165 2155 -2.08333333333333e+00
+2165 2154 4.16666666666667e+00
+2165 2335 -4.16666666666667e+00
+2165 2334 -4.16666666666667e+00
+2165 2017 -2.08333333333333e+00
+2165 2023 4.16666666666667e+00
+2165 2163 -8.33333333333333e+00
+2165 2022 4.16666666666667e+00
+2165 2166 -4.16666666666667e+00
+2165 2018 -6.25000000000000e+00
+2165 2016 4.16666666666667e+00
+2165 1929 -4.16666666666667e+00
+2165 2006 -1.87500000000000e+01
+2165 2229 4.16666666666667e+00
+2165 2168 -1.25000000000000e+01
+2165 2005 4.16666666666667e+00
+2165 2164 -8.33333333333333e+00
+2165 2167 8.33333333333333e+00
+2165 2004 4.16666666666667e+00
+2165 1899 -4.16666666666667e+00
+2166 2166 1.25000000000000e+02
+2166 2195 -4.16666666666667e+00
+2166 2153 -8.33333333333333e+00
+2166 2194 8.33333333333333e+00
+2166 2193 -1.25000000000000e+01
+2166 2161 -4.16666666666667e+00
+2166 2162 8.33333333333333e+00
+2166 2160 -1.25000000000000e+01
+2166 2300 4.16666666666667e+00
+2166 2299 -8.33333333333333e+00
+2166 2260 4.16666666666667e+00
+2166 2230 -4.16666666666667e+00
+2166 2168 -1.66666666666667e+01
+2166 2159 8.33333333333333e+00
+2166 2231 8.33333333333333e+00
+2166 1901 -4.16666666666667e+00
+2166 2156 4.16666666666667e+00
+2166 2158 8.33333333333333e+00
+2166 2155 -8.33333333333333e+00
+2166 2157 -3.75000000000000e+01
+2166 1937 -4.16666666666667e+00
+2166 2261 4.16666666666667e+00
+2166 2229 -1.25000000000000e+01
+2166 2006 4.16666666666667e+00
+2166 2165 -4.16666666666667e+00
+2166 2023 8.33333333333333e+00
+2166 2167 -1.66666666666667e+01
+2166 2164 8.33333333333333e+00
+2166 2024 8.33333333333333e+00
+2166 2336 -8.33333333333333e+00
+2166 2335 4.16666666666667e+00
+2166 1936 -4.16666666666667e+00
+2166 2022 -3.75000000000000e+01
+2166 2005 4.16666666666667e+00
+2166 1900 -4.16666666666667e+00
+2166 2163 -1.25000000000000e+01
+2166 2152 4.16666666666667e+00
+2167 2167 1.25000000000000e+02
+2167 2195 8.33333333333333e+00
+2167 2153 4.16666666666667e+00
+2167 2194 -3.75000000000000e+01
+2167 2193 8.33333333333333e+00
+2167 2160 -4.16666666666667e+00
+2167 2300 4.16666666666667e+00
+2167 2162 8.33333333333333e+00
+2167 2161 -1.25000000000000e+01
+2167 2298 -8.33333333333333e+00
+2167 2168 -1.66666666666667e+01
+2167 1937 -4.16666666666667e+00
+2167 1901 -4.16666666666667e+00
+2167 2259 4.16666666666667e+00
+2167 2229 -4.16666666666667e+00
+2167 2159 -4.16666666666667e+00
+2167 2156 4.16666666666667e+00
+2167 2158 -1.25000000000000e+01
+2167 2157 8.33333333333333e+00
+2167 2154 -8.33333333333333e+00
+2167 2261 -8.33333333333333e+00
+2167 2231 8.33333333333333e+00
+2167 2230 -1.25000000000000e+01
+2167 2024 -4.16666666666667e+00
+2167 2336 4.16666666666667e+00
+2167 2022 8.33333333333333e+00
+2167 2166 -1.66666666666667e+01
+2167 2163 8.33333333333333e+00
+2167 2023 -1.25000000000000e+01
+2167 2334 4.16666666666667e+00
+2167 1935 -4.16666666666667e+00
+2167 2006 -8.33333333333333e+00
+2167 2165 8.33333333333333e+00
+2167 2164 -3.75000000000000e+01
+2167 2151 4.16666666666667e+00
+2167 2004 4.16666666666667e+00
+2167 1899 -4.16666666666667e+00
+2168 2168 1.25000000000000e+02
+2168 2193 -4.16666666666667e+00
+2168 2152 4.16666666666667e+00
+2168 2151 -8.33333333333333e+00
+2168 2195 -1.25000000000000e+01
+2168 2299 4.16666666666667e+00
+2168 2160 8.33333333333333e+00
+2168 2162 -3.75000000000000e+01
+2168 2161 8.33333333333333e+00
+2168 2298 4.16666666666667e+00
+2168 2167 -1.66666666666667e+01
+2168 1936 -4.16666666666667e+00
+2168 1900 -4.16666666666667e+00
+2168 2158 -4.16666666666667e+00
+2168 2155 4.16666666666667e+00
+2168 2166 -1.66666666666667e+01
+2168 2157 8.33333333333333e+00
+2168 2229 8.33333333333333e+00
+2168 2159 -1.25000000000000e+01
+2168 1899 -4.16666666666667e+00
+2168 2154 4.16666666666667e+00
+2168 2231 -3.75000000000000e+01
+2168 2260 -8.33333333333333e+00
+2168 2230 8.33333333333333e+00
+2168 1935 -4.16666666666667e+00
+2168 2259 4.16666666666667e+00
+2168 2023 -4.16666666666667e+00
+2168 2335 4.16666666666667e+00
+2168 2004 4.16666666666667e+00
+2168 2163 -4.16666666666667e+00
+2168 2024 -1.25000000000000e+01
+2168 2022 8.33333333333333e+00
+2168 2334 -8.33333333333333e+00
+2168 2165 -1.25000000000000e+01
+2168 2194 8.33333333333333e+00
+2168 2005 -8.33333333333333e+00
+2168 2164 8.33333333333333e+00
+2169 2169 6.25000000000000e+01
+2169 2200 -4.16666666666667e+00
+2169 2180 -2.08333333333333e+00
+2169 2186 4.16666666666667e+00
+2169 2179 4.16666666666667e+00
+2169 2178 -6.25000000000000e+00
+2169 2198 2.08333333333333e+00
+2169 2201 -4.16666666666667e+00
+2169 2197 -4.16666666666667e+00
+2169 1988 0.00000000000000e+00
+2169 1991 -2.08333333333333e+00
+2169 2188 4.16666666666667e+00
+2169 2176 -4.16666666666667e+00
+2169 1907 4.16666666666667e+00
+2169 2189 -8.33333333333333e+00
+2169 1906 4.16666666666667e+00
+2169 2170 -8.33333333333333e+00
+2169 1990 4.16666666666667e+00
+2169 1905 -1.87500000000000e+01
+2169 1989 -6.25000000000000e+00
+2169 2171 -8.33333333333333e+00
+2169 1904 0.00000000000000e+00
+2169 2177 8.33333333333333e+00
+2169 1903 0.00000000000000e+00
+2169 1987 0.00000000000000e+00
+2169 2185 4.16666666666667e+00
+2169 1902 0.00000000000000e+00
+2169 2175 -1.25000000000000e+01
+2170 2170 6.25000000000000e+01
+2170 2201 -4.16666666666667e+00
+2170 2184 4.16666666666667e+00
+2170 2199 -4.16666666666667e+00
+2170 2180 4.16666666666667e+00
+2170 2186 -8.33333333333333e+00
+2170 2179 -1.87500000000000e+01
+2170 2178 4.16666666666667e+00
+2170 2196 -4.16666666666667e+00
+2170 2171 -8.33333333333333e+00
+2170 1991 4.16666666666667e+00
+2170 2177 8.33333333333333e+00
+2170 2187 4.16666666666667e+00
+2170 2175 -4.16666666666667e+00
+2170 1907 -2.08333333333333e+00
+2170 2189 4.16666666666667e+00
+2170 1906 -6.25000000000000e+00
+2170 1990 -1.87500000000000e+01
+2170 1905 4.16666666666667e+00
+2170 2169 -8.33333333333333e+00
+2170 1989 4.16666666666667e+00
+2170 1904 0.00000000000000e+00
+2170 1988 0.00000000000000e+00
+2170 2198 2.08333333333333e+00
+2170 1903 0.00000000000000e+00
+2170 2176 -1.25000000000000e+01
+2170 1902 0.00000000000000e+00
+2170 1986 0.00000000000000e+00
+2171 2171 6.25000000000000e+01
+2171 2200 -4.16666666666667e+00
+2171 2180 -6.25000000000000e+00
+2171 2179 4.16666666666667e+00
+2171 2185 -8.33333333333333e+00
+2171 2178 -2.08333333333333e+00
+2171 2184 4.16666666666667e+00
+2171 2196 2.08333333333333e+00
+2171 2199 -4.16666666666667e+00
+2171 1986 0.00000000000000e+00
+2171 1989 -2.08333333333333e+00
+2171 2170 -8.33333333333333e+00
+2171 1990 4.16666666666667e+00
+2171 2176 8.33333333333333e+00
+2171 1907 -6.25000000000000e+00
+2171 1991 -6.25000000000000e+00
+2171 1906 -2.08333333333333e+00
+2171 2188 4.16666666666667e+00
+2171 1905 4.16666666666667e+00
+2171 2187 -8.33333333333333e+00
+2171 2197 2.08333333333333e+00
+2171 1904 0.00000000000000e+00
+2171 2177 -3.75000000000000e+01
+2171 1903 0.00000000000000e+00
+2171 1987 0.00000000000000e+00
+2171 2169 -8.33333333333333e+00
+2171 1902 0.00000000000000e+00
+2171 2175 8.33333333333333e+00
+2172 2172 1.00000000000000e+00
+2172 2183 0.00000000000000e+00
+2172 2182 0.00000000000000e+00
+2172 2181 0.00000000000000e+00
+2172 2246 0.00000000000000e+00
+2172 2186 0.00000000000000e+00
+2172 2249 0.00000000000000e+00
+2172 2248 0.00000000000000e+00
+2172 2185 0.00000000000000e+00
+2172 1988 0.00000000000000e+00
+2172 2000 0.00000000000000e+00
+2172 2176 0.00000000000000e+00
+2172 2173 0.00000000000000e+00
+2172 1999 0.00000000000000e+00
+2172 1916 0.00000000000000e+00
+2172 2243 0.00000000000000e+00
+2172 1915 0.00000000000000e+00
+2172 2242 0.00000000000000e+00
+2172 1914 0.00000000000000e+00
+2172 1998 0.00000000000000e+00
+2172 2174 0.00000000000000e+00
+2172 1904 0.00000000000000e+00
+2172 2177 0.00000000000000e+00
+2172 1903 0.00000000000000e+00
+2172 1987 0.00000000000000e+00
+2172 2245 0.00000000000000e+00
+2172 1902 0.00000000000000e+00
+2172 2175 0.00000000000000e+00
+2173 2173 1.00000000000000e+00
+2173 2183 0.00000000000000e+00
+2173 2182 0.00000000000000e+00
+2173 2181 0.00000000000000e+00
+2173 2246 0.00000000000000e+00
+2173 2247 0.00000000000000e+00
+2173 2186 0.00000000000000e+00
+2173 2184 0.00000000000000e+00
+2173 2249 0.00000000000000e+00
+2173 2177 0.00000000000000e+00
+2173 2243 0.00000000000000e+00
+2173 2175 0.00000000000000e+00
+2173 2172 0.00000000000000e+00
+2173 1998 0.00000000000000e+00
+2173 1916 0.00000000000000e+00
+2173 2174 0.00000000000000e+00
+2173 2000 0.00000000000000e+00
+2173 1915 0.00000000000000e+00
+2173 1999 0.00000000000000e+00
+2173 1914 0.00000000000000e+00
+2173 2241 0.00000000000000e+00
+2173 1904 0.00000000000000e+00
+2173 1988 0.00000000000000e+00
+2173 2244 0.00000000000000e+00
+2173 1903 0.00000000000000e+00
+2173 2176 0.00000000000000e+00
+2173 1902 0.00000000000000e+00
+2173 1986 0.00000000000000e+00
+2174 2174 1.00000000000000e+00
+2174 2182 0.00000000000000e+00
+2174 2181 0.00000000000000e+00
+2174 2245 0.00000000000000e+00
+2174 2244 0.00000000000000e+00
+2174 2184 0.00000000000000e+00
+2174 2247 0.00000000000000e+00
+2174 2185 0.00000000000000e+00
+2174 2248 0.00000000000000e+00
+2174 2176 0.00000000000000e+00
+2174 2242 0.00000000000000e+00
+2174 1986 0.00000000000000e+00
+2174 1998 0.00000000000000e+00
+2174 1916 0.00000000000000e+00
+2174 2000 0.00000000000000e+00
+2174 1915 0.00000000000000e+00
+2174 2173 0.00000000000000e+00
+2174 1999 0.00000000000000e+00
+2174 1914 0.00000000000000e+00
+2174 2241 0.00000000000000e+00
+2174 2183 0.00000000000000e+00
+2174 1904 0.00000000000000e+00
+2174 2177 0.00000000000000e+00
+2174 1903 0.00000000000000e+00
+2174 1987 0.00000000000000e+00
+2174 2172 0.00000000000000e+00
+2174 1902 0.00000000000000e+00
+2174 2175 0.00000000000000e+00
+2175 2175 1.25000000000000e+02
+2175 2200 -8.33333333333333e+00
+2175 2170 -4.16666666666667e+00
+2175 1990 4.16666666666667e+00
+2175 1991 4.16666666666667e+00
+2175 2171 8.33333333333333e+00
+2175 2169 -1.25000000000000e+01
+2175 2189 8.33333333333333e+00
+2175 2188 8.33333333333333e+00
+2175 2187 -3.75000000000000e+01
+2175 2264 -4.16666666666667e+00
+2175 2263 -4.16666666666667e+00
+2175 2186 -4.16666666666667e+00
+2175 2249 4.16666666666667e+00
+2175 2248 4.16666666666667e+00
+2175 2185 8.33333333333333e+00
+2175 2176 -1.66666666666667e+01
+2175 2184 -1.25000000000000e+01
+2175 2003 -4.16666666666667e+00
+2175 2177 -1.66666666666667e+01
+2175 1988 0.00000000000000e+00
+2175 2000 0.00000000000000e+00
+2175 2173 0.00000000000000e+00
+2175 2002 8.33333333333333e+00
+2175 1999 0.00000000000000e+00
+2175 2174 0.00000000000000e+00
+2175 1904 0.00000000000000e+00
+2175 1903 0.00000000000000e+00
+2175 1987 0.00000000000000e+00
+2175 2172 0.00000000000000e+00
+2175 2243 8.33333333333333e+00
+2175 1919 -8.33333333333333e+00
+2175 2242 -4.16666666666667e+00
+2175 1918 4.16666666666667e+00
+2175 2241 -1.25000000000000e+01
+2175 2201 4.16666666666667e+00
+2175 2001 -1.25000000000000e+01
+2176 2176 1.25000000000000e+02
+2176 2199 -8.33333333333333e+00
+2176 2171 8.33333333333333e+00
+2176 2169 -4.16666666666667e+00
+2176 1989 4.16666666666667e+00
+2176 1991 -8.33333333333333e+00
+2176 2170 -1.25000000000000e+01
+2176 2189 -4.16666666666667e+00
+2176 2188 -1.25000000000000e+01
+2176 2187 8.33333333333333e+00
+2176 2262 -4.16666666666667e+00
+2176 2186 8.33333333333333e+00
+2176 2249 -8.33333333333333e+00
+2176 2247 4.16666666666667e+00
+2176 1904 0.00000000000000e+00
+2176 2185 -3.75000000000000e+01
+2176 2184 8.33333333333333e+00
+2176 2175 -1.66666666666667e+01
+2176 2264 -4.16666666666667e+00
+2176 1919 4.16666666666667e+00
+2176 2174 0.00000000000000e+00
+2176 2172 0.00000000000000e+00
+2176 1988 0.00000000000000e+00
+2176 2000 0.00000000000000e+00
+2176 2001 8.33333333333333e+00
+2176 1998 0.00000000000000e+00
+2176 2173 0.00000000000000e+00
+2176 1902 0.00000000000000e+00
+2176 1986 0.00000000000000e+00
+2176 2243 8.33333333333333e+00
+2176 2177 -1.66666666666667e+01
+2176 2003 8.33333333333333e+00
+2176 2242 -1.25000000000000e+01
+2176 2201 4.16666666666667e+00
+2176 2002 -3.75000000000000e+01
+2176 2241 -4.16666666666667e+00
+2176 1917 4.16666666666667e+00
+2177 2177 1.25000000000000e+02
+2177 2200 4.16666666666667e+00
+2177 2170 8.33333333333333e+00
+2177 1990 -8.33333333333333e+00
+2177 1989 4.16666666666667e+00
+2177 2171 -3.75000000000000e+01
+2177 2169 8.33333333333333e+00
+2177 2189 -1.25000000000000e+01
+2177 2188 -4.16666666666667e+00
+2177 2187 8.33333333333333e+00
+2177 2262 -4.16666666666667e+00
+2177 2185 8.33333333333333e+00
+2177 2184 -4.16666666666667e+00
+2177 2247 4.16666666666667e+00
+2177 2248 -8.33333333333333e+00
+2177 2186 -1.25000000000000e+01
+2177 1903 0.00000000000000e+00
+2177 2263 -4.16666666666667e+00
+2177 1918 4.16666666666667e+00
+2177 2001 -4.16666666666667e+00
+2177 2173 0.00000000000000e+00
+2177 2175 -1.66666666666667e+01
+2177 1986 0.00000000000000e+00
+2177 1998 0.00000000000000e+00
+2177 1987 0.00000000000000e+00
+2177 1999 0.00000000000000e+00
+2177 2174 0.00000000000000e+00
+2177 2172 0.00000000000000e+00
+2177 1902 0.00000000000000e+00
+2177 2243 -3.75000000000000e+01
+2177 2199 4.16666666666667e+00
+2177 2003 -1.25000000000000e+01
+2177 2242 8.33333333333333e+00
+2177 2176 -1.66666666666667e+01
+2177 2002 8.33333333333333e+00
+2177 2241 8.33333333333333e+00
+2177 1917 -8.33333333333333e+00
+2178 2178 6.25000000000000e+01
+2178 2200 4.16666666666667e+00
+2178 2201 -8.33333333333333e+00
+2178 1904 0.00000000000000e+00
+2178 2171 -2.08333333333333e+00
+2178 2170 4.16666666666667e+00
+2178 2169 -6.25000000000000e+00
+2178 1943 2.08333333333333e+00
+2178 2197 4.16666666666667e+00
+2178 2196 -1.87500000000000e+01
+2178 2185 -4.16666666666667e+00
+2178 2036 -2.08333333333333e+00
+2178 2179 -8.33333333333333e+00
+2178 2404 -4.16666666666667e+00
+2178 2041 4.16666666666667e+00
+2178 2405 -4.16666666666667e+00
+2178 2042 4.16666666666667e+00
+2178 1942 -4.16666666666667e+00
+2178 2035 4.16666666666667e+00
+2178 2034 -6.25000000000000e+00
+2178 2180 -8.33333333333333e+00
+2178 2033 0.00000000000000e+00
+2178 2186 8.33333333333333e+00
+2178 2032 0.00000000000000e+00
+2178 1903 0.00000000000000e+00
+2178 2198 4.16666666666667e+00
+2178 2031 0.00000000000000e+00
+2178 2184 -1.25000000000000e+01
+2179 2179 6.25000000000000e+01
+2179 2199 4.16666666666667e+00
+2179 2201 4.16666666666667e+00
+2179 2171 4.16666666666667e+00
+2179 2180 -8.33333333333333e+00
+2179 2170 -1.87500000000000e+01
+2179 2169 4.16666666666667e+00
+2179 2197 -6.25000000000000e+00
+2179 2196 4.16666666666667e+00
+2179 2184 -4.16666666666667e+00
+2179 2178 -8.33333333333333e+00
+2179 2036 4.16666666666667e+00
+2179 2403 -4.16666666666667e+00
+2179 2040 4.16666666666667e+00
+2179 2186 8.33333333333333e+00
+2179 2042 -8.33333333333333e+00
+2179 1943 2.08333333333333e+00
+2179 2405 -4.16666666666667e+00
+2179 2035 -1.87500000000000e+01
+2179 1941 -4.16666666666667e+00
+2179 2034 4.16666666666667e+00
+2179 2033 0.00000000000000e+00
+2179 1904 0.00000000000000e+00
+2179 2198 -2.08333333333333e+00
+2179 2032 0.00000000000000e+00
+2179 2185 -1.25000000000000e+01
+2179 2031 0.00000000000000e+00
+2179 1902 0.00000000000000e+00
+2180 2180 6.25000000000000e+01
+2180 2196 4.16666666666667e+00
+2180 2200 4.16666666666667e+00
+2180 2199 -8.33333333333333e+00
+2180 2171 -6.25000000000000e+00
+2180 2170 4.16666666666667e+00
+2180 2179 -8.33333333333333e+00
+2180 1902 0.00000000000000e+00
+2180 2169 -2.08333333333333e+00
+2180 2198 -6.25000000000000e+00
+2180 1941 2.08333333333333e+00
+2180 2034 -2.08333333333333e+00
+2180 2035 4.16666666666667e+00
+2180 2185 8.33333333333333e+00
+2180 2041 -8.33333333333333e+00
+2180 2403 -4.16666666666667e+00
+2180 2040 4.16666666666667e+00
+2180 2036 -6.25000000000000e+00
+2180 1942 2.08333333333333e+00
+2180 2404 -4.16666666666667e+00
+2180 2197 -2.08333333333333e+00
+2180 2033 0.00000000000000e+00
+2180 2186 -3.75000000000000e+01
+2180 2032 0.00000000000000e+00
+2180 1903 0.00000000000000e+00
+2180 2178 -8.33333333333333e+00
+2180 2031 0.00000000000000e+00
+2180 2184 8.33333333333333e+00
+2181 2181 1.00000000000000e+00
+2181 2249 0.00000000000000e+00
+2181 2245 0.00000000000000e+00
+2181 2248 0.00000000000000e+00
+2181 1946 0.00000000000000e+00
+2181 2244 0.00000000000000e+00
+2181 1904 0.00000000000000e+00
+2181 2174 0.00000000000000e+00
+2181 2182 0.00000000000000e+00
+2181 2173 0.00000000000000e+00
+2181 2172 0.00000000000000e+00
+2181 2411 0.00000000000000e+00
+2181 2042 0.00000000000000e+00
+2181 2039 0.00000000000000e+00
+2181 2038 0.00000000000000e+00
+2181 2041 0.00000000000000e+00
+2181 2185 0.00000000000000e+00
+2181 1945 0.00000000000000e+00
+2181 2410 0.00000000000000e+00
+2181 2037 0.00000000000000e+00
+2181 2183 0.00000000000000e+00
+2181 2033 0.00000000000000e+00
+2181 2186 0.00000000000000e+00
+2181 2032 0.00000000000000e+00
+2181 1903 0.00000000000000e+00
+2181 2246 0.00000000000000e+00
+2181 2031 0.00000000000000e+00
+2181 2184 0.00000000000000e+00
+2182 2182 1.00000000000000e+00
+2182 2244 0.00000000000000e+00
+2182 2247 0.00000000000000e+00
+2182 2246 0.00000000000000e+00
+2182 2245 0.00000000000000e+00
+2182 2174 0.00000000000000e+00
+2182 2173 0.00000000000000e+00
+2182 2181 0.00000000000000e+00
+2182 2172 0.00000000000000e+00
+2182 2411 0.00000000000000e+00
+2182 2183 0.00000000000000e+00
+2182 2037 0.00000000000000e+00
+2182 2042 0.00000000000000e+00
+2182 2186 0.00000000000000e+00
+2182 2040 0.00000000000000e+00
+2182 2184 0.00000000000000e+00
+2182 1946 0.00000000000000e+00
+2182 2039 0.00000000000000e+00
+2182 2038 0.00000000000000e+00
+2182 1944 0.00000000000000e+00
+2182 2409 0.00000000000000e+00
+2182 2033 0.00000000000000e+00
+2182 1904 0.00000000000000e+00
+2182 2249 0.00000000000000e+00
+2182 2032 0.00000000000000e+00
+2182 2185 0.00000000000000e+00
+2182 2031 0.00000000000000e+00
+2182 1902 0.00000000000000e+00
+2183 2183 1.00000000000000e+00
+2183 2244 0.00000000000000e+00
+2183 2247 0.00000000000000e+00
+2183 2246 0.00000000000000e+00
+2183 2245 0.00000000000000e+00
+2183 1944 0.00000000000000e+00
+2183 2174 0.00000000000000e+00
+2183 2173 0.00000000000000e+00
+2183 1902 0.00000000000000e+00
+2183 2172 0.00000000000000e+00
+2183 2409 0.00000000000000e+00
+2183 2410 0.00000000000000e+00
+2183 2182 0.00000000000000e+00
+2183 2040 0.00000000000000e+00
+2183 2037 0.00000000000000e+00
+2183 2041 0.00000000000000e+00
+2183 2185 0.00000000000000e+00
+2183 2039 0.00000000000000e+00
+2183 1945 0.00000000000000e+00
+2183 2038 0.00000000000000e+00
+2183 2248 0.00000000000000e+00
+2183 2033 0.00000000000000e+00
+2183 2186 0.00000000000000e+00
+2183 2032 0.00000000000000e+00
+2183 1903 0.00000000000000e+00
+2183 2181 0.00000000000000e+00
+2183 2031 0.00000000000000e+00
+2183 2184 0.00000000000000e+00
+2184 2184 1.25000000000000e+02
+2184 2201 8.33333333333333e+00
+2184 2171 4.16666666666667e+00
+2184 2200 8.33333333333333e+00
+2184 2199 -3.75000000000000e+01
+2184 2179 -4.16666666666667e+00
+2184 2405 4.16666666666667e+00
+2184 2180 8.33333333333333e+00
+2184 2178 -1.25000000000000e+01
+2184 2404 -8.33333333333333e+00
+2184 2186 -1.66666666666667e+01
+2184 1949 -4.16666666666667e+00
+2184 1904 0.00000000000000e+00
+2184 2263 4.16666666666667e+00
+2184 2248 -4.16666666666667e+00
+2184 2177 -4.16666666666667e+00
+2184 2174 0.00000000000000e+00
+2184 2264 -8.33333333333333e+00
+2184 2249 8.33333333333333e+00
+2184 2247 -1.25000000000000e+01
+2184 2176 8.33333333333333e+00
+2184 2173 0.00000000000000e+00
+2184 2175 -1.25000000000000e+01
+2184 2042 -4.16666666666667e+00
+2184 2411 4.16666666666667e+00
+2184 2041 8.33333333333333e+00
+2184 2185 -1.66666666666667e+01
+2184 2182 0.00000000000000e+00
+2184 2410 4.16666666666667e+00
+2184 1948 -4.16666666666667e+00
+2184 2040 -1.25000000000000e+01
+2184 2183 0.00000000000000e+00
+2184 2033 0.00000000000000e+00
+2184 2032 0.00000000000000e+00
+2184 1903 0.00000000000000e+00
+2184 2181 0.00000000000000e+00
+2184 2170 4.16666666666667e+00
+2185 2185 1.25000000000000e+02
+2185 2201 -4.16666666666667e+00
+2185 2171 -8.33333333333333e+00
+2185 2200 -1.25000000000000e+01
+2185 2199 8.33333333333333e+00
+2185 2178 -4.16666666666667e+00
+2185 2180 8.33333333333333e+00
+2185 2179 -1.25000000000000e+01
+2185 2405 4.16666666666667e+00
+2185 2403 -8.33333333333333e+00
+2185 2262 4.16666666666667e+00
+2185 2247 -4.16666666666667e+00
+2185 2177 8.33333333333333e+00
+2185 2186 -1.66666666666667e+01
+2185 2249 8.33333333333333e+00
+2185 1949 -4.16666666666667e+00
+2185 2264 4.16666666666667e+00
+2185 2248 -1.25000000000000e+01
+2185 1904 0.00000000000000e+00
+2185 2174 0.00000000000000e+00
+2185 2176 -3.75000000000000e+01
+2185 2175 8.33333333333333e+00
+2185 2172 0.00000000000000e+00
+2185 2033 0.00000000000000e+00
+2185 2183 0.00000000000000e+00
+2185 2040 8.33333333333333e+00
+2185 2184 -1.66666666666667e+01
+2185 2181 0.00000000000000e+00
+2185 2411 -8.33333333333333e+00
+2185 2042 8.33333333333333e+00
+2185 2041 -3.75000000000000e+01
+2185 2409 4.16666666666667e+00
+2185 1947 -4.16666666666667e+00
+2185 2182 0.00000000000000e+00
+2185 2169 4.16666666666667e+00
+2185 2031 0.00000000000000e+00
+2185 1902 0.00000000000000e+00
+2186 2186 1.25000000000000e+02
+2186 2199 8.33333333333333e+00
+2186 2170 -8.33333333333333e+00
+2186 2169 4.16666666666667e+00
+2186 2201 -1.25000000000000e+01
+2186 2179 8.33333333333333e+00
+2186 2403 4.16666666666667e+00
+2186 2180 -3.75000000000000e+01
+2186 2178 8.33333333333333e+00
+2186 2404 4.16666666666667e+00
+2186 2184 -1.66666666666667e+01
+2186 1947 -4.16666666666667e+00
+2186 1902 0.00000000000000e+00
+2186 2176 8.33333333333333e+00
+2186 2185 -1.66666666666667e+01
+2186 2248 8.33333333333333e+00
+2186 2175 -4.16666666666667e+00
+2186 2172 0.00000000000000e+00
+2186 2249 -3.75000000000000e+01
+2186 1948 -4.16666666666667e+00
+2186 2263 4.16666666666667e+00
+2186 2262 -8.33333333333333e+00
+2186 2247 8.33333333333333e+00
+2186 2177 -1.25000000000000e+01
+2186 1903 0.00000000000000e+00
+2186 2173 0.00000000000000e+00
+2186 2040 -4.16666666666667e+00
+2186 2409 4.16666666666667e+00
+2186 2032 0.00000000000000e+00
+2186 2182 0.00000000000000e+00
+2186 2042 -1.25000000000000e+01
+2186 2410 -8.33333333333333e+00
+2186 2041 8.33333333333333e+00
+2186 2183 0.00000000000000e+00
+2186 2200 -4.16666666666667e+00
+2186 2181 0.00000000000000e+00
+2186 2031 0.00000000000000e+00
+2187 2187 1.25000000000000e+02
+2187 2201 -4.16666666666667e+00
+2187 2200 8.33333333333333e+00
+2187 2199 -1.25000000000000e+01
+2187 2264 4.16666666666667e+00
+2187 2170 4.16666666666667e+00
+2187 2171 -8.33333333333333e+00
+2187 2177 8.33333333333333e+00
+2187 2176 8.33333333333333e+00
+2187 2175 -3.75000000000000e+01
+2187 2188 -1.66666666666667e+01
+2187 1906 -4.16666666666667e+00
+2187 1918 -4.16666666666667e+00
+2187 2266 -4.16666666666667e+00
+2187 2260 4.16666666666667e+00
+2187 2267 -4.16666666666667e+00
+2187 2204 4.16666666666667e+00
+2187 1907 8.33333333333333e+00
+2187 2189 -1.66666666666667e+01
+2187 2195 8.33333333333333e+00
+2187 2203 -8.33333333333333e+00
+2187 2194 8.33333333333333e+00
+2187 2193 -3.75000000000000e+01
+2187 1919 8.33333333333333e+00
+2187 2261 -8.33333333333333e+00
+2187 1990 -4.16666666666667e+00
+2187 2152 4.16666666666667e+00
+2187 2153 4.16666666666667e+00
+2187 1991 -4.16666666666667e+00
+2187 1905 -1.25000000000000e+01
+2187 2159 -4.16666666666667e+00
+2187 2003 4.16666666666667e+00
+2187 2158 8.33333333333333e+00
+2187 2002 -8.33333333333333e+00
+2187 2157 -1.25000000000000e+01
+2187 2263 4.16666666666667e+00
+2187 1917 -1.25000000000000e+01
+2188 2188 1.25000000000000e+02
+2188 2201 8.33333333333333e+00
+2188 2200 -3.75000000000000e+01
+2188 2199 8.33333333333333e+00
+2188 2264 -8.33333333333333e+00
+2188 2169 4.16666666666667e+00
+2188 2171 4.16666666666667e+00
+2188 2177 -4.16666666666667e+00
+2188 2176 -1.25000000000000e+01
+2188 2175 8.33333333333333e+00
+2188 2187 -1.66666666666667e+01
+2188 1905 -4.16666666666667e+00
+2188 1917 -4.16666666666667e+00
+2188 2265 -4.16666666666667e+00
+2188 2259 4.16666666666667e+00
+2188 2204 4.16666666666667e+00
+2188 2195 -4.16666666666667e+00
+2188 2194 -1.25000000000000e+01
+2188 2202 -8.33333333333333e+00
+2188 2193 8.33333333333333e+00
+2188 2267 -4.16666666666667e+00
+2188 2261 4.16666666666667e+00
+2188 1989 -4.16666666666667e+00
+2188 2151 4.16666666666667e+00
+2188 1991 -4.16666666666667e+00
+2188 2003 4.16666666666667e+00
+2188 2153 -8.33333333333333e+00
+2188 1907 8.33333333333333e+00
+2188 1906 -1.25000000000000e+01
+2188 2159 8.33333333333333e+00
+2188 2189 -1.66666666666667e+01
+2188 1919 8.33333333333333e+00
+2188 2158 -3.75000000000000e+01
+2188 2262 4.16666666666667e+00
+2188 1918 -1.25000000000000e+01
+2188 2157 8.33333333333333e+00
+2188 2001 -8.33333333333333e+00
+2189 2189 1.25000000000000e+02
+2189 2200 8.33333333333333e+00
+2189 2199 -4.16666666666667e+00
+2189 2263 -8.33333333333333e+00
+2189 2262 4.16666666666667e+00
+2189 2170 4.16666666666667e+00
+2189 2169 -8.33333333333333e+00
+2189 2177 -1.25000000000000e+01
+2189 2176 -4.16666666666667e+00
+2189 2175 8.33333333333333e+00
+2189 2265 -4.16666666666667e+00
+2189 2202 4.16666666666667e+00
+2189 2195 -1.25000000000000e+01
+2189 2203 4.16666666666667e+00
+2189 2194 -4.16666666666667e+00
+2189 1905 8.33333333333333e+00
+2189 2187 -1.66666666666667e+01
+2189 2193 8.33333333333333e+00
+2189 2266 -4.16666666666667e+00
+2189 2260 4.16666666666667e+00
+2189 1917 8.33333333333333e+00
+2189 2259 -8.33333333333333e+00
+2189 1990 -4.16666666666667e+00
+2189 2002 4.16666666666667e+00
+2189 1907 -3.75000000000000e+01
+2189 2152 -8.33333333333333e+00
+2189 1906 8.33333333333333e+00
+2189 2151 4.16666666666667e+00
+2189 1989 -4.16666666666667e+00
+2189 2159 -1.25000000000000e+01
+2189 2201 -1.25000000000000e+01
+2189 1919 -3.75000000000000e+01
+2189 2158 8.33333333333333e+00
+2189 2188 -1.66666666666667e+01
+2189 1918 8.33333333333333e+00
+2189 2157 -4.16666666666667e+00
+2189 2001 4.16666666666667e+00
+2190 2190 6.25000000000000e+01
+2190 2153 2.08333333333333e+00
+2190 2152 -4.16666666666667e+00
+2190 2161 4.16666666666667e+00
+2190 2160 -6.25000000000000e+00
+2190 1907 4.16666666666667e+00
+2190 2192 -8.33333333333333e+00
+2190 2195 8.33333333333333e+00
+2190 2194 -4.16666666666667e+00
+2190 2193 -1.25000000000000e+01
+2190 1925 4.16666666666667e+00
+2190 2300 -8.33333333333333e+00
+2190 2299 4.16666666666667e+00
+2190 2203 4.16666666666667e+00
+2190 2308 -4.16666666666667e+00
+2190 2048 2.08333333333333e+00
+2190 2309 -4.16666666666667e+00
+2190 1924 4.16666666666667e+00
+2190 2047 -4.16666666666667e+00
+2190 1923 -1.87500000000000e+01
+2190 2045 -2.08333333333333e+00
+2190 2204 4.16666666666667e+00
+2190 2191 -8.33333333333333e+00
+2190 2044 4.16666666666667e+00
+2190 1906 4.16666666666667e+00
+2190 2162 -2.08333333333333e+00
+2190 2043 -6.25000000000000e+00
+2190 1905 -1.87500000000000e+01
+2191 2191 6.25000000000000e+01
+2191 2192 -8.33333333333333e+00
+2191 1907 -2.08333333333333e+00
+2191 2153 2.08333333333333e+00
+2191 2151 -4.16666666666667e+00
+2191 1925 -2.08333333333333e+00
+2191 2161 -1.87500000000000e+01
+2191 2160 4.16666666666667e+00
+2191 2300 4.16666666666667e+00
+2191 2195 8.33333333333333e+00
+2191 2194 -1.25000000000000e+01
+2191 2193 -4.16666666666667e+00
+2191 2298 4.16666666666667e+00
+2191 2202 4.16666666666667e+00
+2191 2307 -4.16666666666667e+00
+2191 2048 2.08333333333333e+00
+2191 2309 -4.16666666666667e+00
+2191 1924 -6.25000000000000e+00
+2191 1923 4.16666666666667e+00
+2191 2046 -4.16666666666667e+00
+2191 2045 4.16666666666667e+00
+2191 2204 -8.33333333333333e+00
+2191 2162 4.16666666666667e+00
+2191 2044 -1.87500000000000e+01
+2191 1906 -6.25000000000000e+00
+2191 2190 -8.33333333333333e+00
+2191 2043 4.16666666666667e+00
+2191 1905 4.16666666666667e+00
+2192 2192 6.25000000000000e+01
+2192 2191 -8.33333333333333e+00
+2192 2160 -2.08333333333333e+00
+2192 2151 2.08333333333333e+00
+2192 1906 -2.08333333333333e+00
+2192 2152 2.08333333333333e+00
+2192 2162 -6.25000000000000e+00
+2192 1924 -2.08333333333333e+00
+2192 2299 4.16666666666667e+00
+2192 2195 -3.75000000000000e+01
+2192 2194 8.33333333333333e+00
+2192 1905 4.16666666666667e+00
+2192 2190 -8.33333333333333e+00
+2192 2193 8.33333333333333e+00
+2192 1923 4.16666666666667e+00
+2192 2298 -8.33333333333333e+00
+2192 2047 2.08333333333333e+00
+2192 2308 -4.16666666666667e+00
+2192 1925 -6.25000000000000e+00
+2192 2046 2.08333333333333e+00
+2192 2307 -4.16666666666667e+00
+2192 2161 4.16666666666667e+00
+2192 2045 -6.25000000000000e+00
+2192 1907 -6.25000000000000e+00
+2192 2044 4.16666666666667e+00
+2192 2203 -8.33333333333333e+00
+2192 2043 -2.08333333333333e+00
+2192 2202 4.16666666666667e+00
+2193 2193 1.25000000000000e+02
+2193 2158 -8.33333333333333e+00
+2193 2153 -4.16666666666667e+00
+2193 2161 4.16666666666667e+00
+2193 2152 -4.16666666666667e+00
+2193 2162 4.16666666666667e+00
+2193 2168 -4.16666666666667e+00
+2193 2167 8.33333333333333e+00
+2193 2166 -1.25000000000000e+01
+2193 2309 4.16666666666667e+00
+2193 2308 -8.33333333333333e+00
+2193 2299 8.33333333333333e+00
+2193 2192 8.33333333333333e+00
+2193 1906 4.16666666666667e+00
+2193 2191 -4.16666666666667e+00
+2193 2190 -1.25000000000000e+01
+2193 2300 8.33333333333333e+00
+2193 1936 4.16666666666667e+00
+2193 2298 -3.75000000000000e+01
+2193 2195 -1.66666666666667e+01
+2193 2260 -4.16666666666667e+00
+2193 2204 -4.16666666666667e+00
+2193 2266 4.16666666666667e+00
+2193 2371 -4.16666666666667e+00
+2193 2267 4.16666666666667e+00
+2193 2372 -4.16666666666667e+00
+2193 1907 -8.33333333333333e+00
+2193 2189 8.33333333333333e+00
+2193 2203 8.33333333333333e+00
+2193 2188 8.33333333333333e+00
+2193 2194 -1.66666666666667e+01
+2193 2202 -1.25000000000000e+01
+2193 2187 -3.75000000000000e+01
+2193 2261 8.33333333333333e+00
+2193 1937 -8.33333333333333e+00
+2193 2159 4.16666666666667e+00
+2193 2259 -1.25000000000000e+01
+2194 2194 1.25000000000000e+02
+2194 2157 -8.33333333333333e+00
+2194 2160 4.16666666666667e+00
+2194 2151 -4.16666666666667e+00
+2194 2162 -8.33333333333333e+00
+2194 2168 8.33333333333333e+00
+2194 2153 -4.16666666666667e+00
+2194 2167 -3.75000000000000e+01
+2194 2166 8.33333333333333e+00
+2194 2309 4.16666666666667e+00
+2194 2300 -4.16666666666667e+00
+2194 2307 -8.33333333333333e+00
+2194 2298 8.33333333333333e+00
+2194 2192 8.33333333333333e+00
+2194 2195 -1.66666666666667e+01
+2194 2191 -1.25000000000000e+01
+2194 1905 4.16666666666667e+00
+2194 2190 -4.16666666666667e+00
+2194 2299 -1.25000000000000e+01
+2194 1935 4.16666666666667e+00
+2194 2259 -4.16666666666667e+00
+2194 2204 8.33333333333333e+00
+2194 2265 4.16666666666667e+00
+2194 2370 -4.16666666666667e+00
+2194 2267 -8.33333333333333e+00
+2194 2261 8.33333333333333e+00
+2194 1907 4.16666666666667e+00
+2194 2189 -4.16666666666667e+00
+2194 2203 -3.75000000000000e+01
+2194 2188 -1.25000000000000e+01
+2194 2202 8.33333333333333e+00
+2194 2187 8.33333333333333e+00
+2194 2193 -1.66666666666667e+01
+2194 2372 -4.16666666666667e+00
+2194 1937 4.16666666666667e+00
+2194 2159 4.16666666666667e+00
+2194 2260 -1.25000000000000e+01
+2195 2195 1.25000000000000e+02
+2195 2157 4.16666666666667e+00
+2195 2151 -4.16666666666667e+00
+2195 2161 -8.33333333333333e+00
+2195 2167 8.33333333333333e+00
+2195 2160 4.16666666666667e+00
+2195 2166 -4.16666666666667e+00
+2195 2152 -4.16666666666667e+00
+2195 2168 -1.25000000000000e+01
+2195 2308 4.16666666666667e+00
+2195 2299 -4.16666666666667e+00
+2195 2307 4.16666666666667e+00
+2195 2192 -3.75000000000000e+01
+2195 2191 8.33333333333333e+00
+2195 2194 -1.66666666666667e+01
+2195 2190 8.33333333333333e+00
+2195 2300 -1.25000000000000e+01
+2195 2298 8.33333333333333e+00
+2195 2193 -1.66666666666667e+01
+2195 2202 -4.16666666666667e+00
+2195 2203 8.33333333333333e+00
+2195 2266 -8.33333333333333e+00
+2195 2260 8.33333333333333e+00
+2195 2265 4.16666666666667e+00
+2195 2370 -4.16666666666667e+00
+2195 2204 -1.25000000000000e+01
+2195 2189 -1.25000000000000e+01
+2195 1906 4.16666666666667e+00
+2195 2188 -4.16666666666667e+00
+2195 1905 -8.33333333333333e+00
+2195 2187 8.33333333333333e+00
+2195 2158 4.16666666666667e+00
+2195 2261 -3.75000000000000e+01
+2195 2371 -4.16666666666667e+00
+2195 1936 4.16666666666667e+00
+2195 2259 8.33333333333333e+00
+2195 1935 -8.33333333333333e+00
+2196 2196 6.25000000000000e+01
+2196 2180 4.16666666666667e+00
+2196 2171 2.08333333333333e+00
+2196 1907 -2.08333333333333e+00
+2196 2170 -4.16666666666667e+00
+2196 1943 -2.08333333333333e+00
+2196 2179 4.16666666666667e+00
+2196 2178 -1.87500000000000e+01
+2196 2405 4.16666666666667e+00
+2196 2404 4.16666666666667e+00
+2196 2201 8.33333333333333e+00
+2196 2200 -4.16666666666667e+00
+2196 2199 -1.25000000000000e+01
+2196 2203 4.16666666666667e+00
+2196 2407 -4.16666666666667e+00
+2196 2051 2.08333333333333e+00
+2196 2408 -4.16666666666667e+00
+2196 2050 -4.16666666666667e+00
+2196 1942 4.16666666666667e+00
+2196 1941 -6.25000000000000e+00
+2196 2045 4.16666666666667e+00
+2196 2204 -8.33333333333333e+00
+2196 2044 4.16666666666667e+00
+2196 2197 -8.33333333333333e+00
+2196 1906 4.16666666666667e+00
+2196 2043 -1.87500000000000e+01
+2196 2198 -8.33333333333333e+00
+2196 1905 -6.25000000000000e+00
+2197 2197 6.25000000000000e+01
+2197 2171 2.08333333333333e+00
+2197 2169 -4.16666666666667e+00
+2197 2179 -6.25000000000000e+00
+2197 2178 4.16666666666667e+00
+2197 1943 4.16666666666667e+00
+2197 2405 -8.33333333333333e+00
+2197 2403 4.16666666666667e+00
+2197 2198 -8.33333333333333e+00
+2197 1907 4.16666666666667e+00
+2197 2201 8.33333333333333e+00
+2197 2200 -1.25000000000000e+01
+2197 2199 -4.16666666666667e+00
+2197 2202 4.16666666666667e+00
+2197 2406 -4.16666666666667e+00
+2197 2051 2.08333333333333e+00
+2197 2408 -4.16666666666667e+00
+2197 1942 -1.87500000000000e+01
+2197 2049 -4.16666666666667e+00
+2197 1941 4.16666666666667e+00
+2197 2045 -2.08333333333333e+00
+2197 2204 4.16666666666667e+00
+2197 2044 -6.25000000000000e+00
+2197 2180 -2.08333333333333e+00
+2197 1906 -1.87500000000000e+01
+2197 2043 4.16666666666667e+00
+2197 2196 -8.33333333333333e+00
+2197 1905 4.16666666666667e+00
+2198 2198 6.25000000000000e+01
+2198 2170 2.08333333333333e+00
+2198 2196 -8.33333333333333e+00
+2198 2178 4.16666666666667e+00
+2198 2169 2.08333333333333e+00
+2198 1905 -2.08333333333333e+00
+2198 2180 -6.25000000000000e+00
+2198 1941 -2.08333333333333e+00
+2198 2403 4.16666666666667e+00
+2198 1942 4.16666666666667e+00
+2198 2404 -8.33333333333333e+00
+2198 2201 -3.75000000000000e+01
+2198 2197 -8.33333333333333e+00
+2198 1906 4.16666666666667e+00
+2198 2200 8.33333333333333e+00
+2198 2199 8.33333333333333e+00
+2198 2049 2.08333333333333e+00
+2198 2406 -4.16666666666667e+00
+2198 1943 -6.25000000000000e+00
+2198 2050 2.08333333333333e+00
+2198 2407 -4.16666666666667e+00
+2198 2045 -6.25000000000000e+00
+2198 2179 -2.08333333333333e+00
+2198 1907 -6.25000000000000e+00
+2198 2044 -2.08333333333333e+00
+2198 2203 4.16666666666667e+00
+2198 2043 4.16666666666667e+00
+2198 2202 -8.33333333333333e+00
+2199 2199 1.25000000000000e+02
+2199 2176 -8.33333333333333e+00
+2199 2170 -4.16666666666667e+00
+2199 2179 4.16666666666667e+00
+2199 2186 8.33333333333333e+00
+2199 2180 -8.33333333333333e+00
+2199 2171 -4.16666666666667e+00
+2199 2185 8.33333333333333e+00
+2199 2184 -3.75000000000000e+01
+2199 2408 4.16666666666667e+00
+2199 2405 -4.16666666666667e+00
+2199 2404 8.33333333333333e+00
+2199 2407 -8.33333333333333e+00
+2199 2198 8.33333333333333e+00
+2199 2201 -1.66666666666667e+01
+2199 2197 -4.16666666666667e+00
+2199 1906 4.16666666666667e+00
+2199 2196 -1.25000000000000e+01
+2199 1948 4.16666666666667e+00
+2199 2403 -1.25000000000000e+01
+2199 2263 -4.16666666666667e+00
+2199 2204 8.33333333333333e+00
+2199 2266 4.16666666666667e+00
+2199 2416 -4.16666666666667e+00
+2199 2267 -8.33333333333333e+00
+2199 2264 8.33333333333333e+00
+2199 1907 4.16666666666667e+00
+2199 2189 -4.16666666666667e+00
+2199 2203 8.33333333333333e+00
+2199 2188 8.33333333333333e+00
+2199 2200 -1.66666666666667e+01
+2199 2202 -3.75000000000000e+01
+2199 2187 -1.25000000000000e+01
+2199 2417 -4.16666666666667e+00
+2199 1949 4.16666666666667e+00
+2199 2177 4.16666666666667e+00
+2199 2262 -1.25000000000000e+01
+2200 2200 1.25000000000000e+02
+2200 2175 -8.33333333333333e+00
+2200 2171 -4.16666666666667e+00
+2200 2169 -4.16666666666667e+00
+2200 2178 4.16666666666667e+00
+2200 2186 -4.16666666666667e+00
+2200 2180 4.16666666666667e+00
+2200 2185 -1.25000000000000e+01
+2200 2184 8.33333333333333e+00
+2200 2408 4.16666666666667e+00
+2200 2403 8.33333333333333e+00
+2200 2406 -8.33333333333333e+00
+2200 2198 8.33333333333333e+00
+2200 2197 -1.25000000000000e+01
+2200 2196 -4.16666666666667e+00
+2200 1905 4.16666666666667e+00
+2200 2405 8.33333333333333e+00
+2200 2404 -3.75000000000000e+01
+2200 1947 4.16666666666667e+00
+2200 2201 -1.66666666666667e+01
+2200 2262 -4.16666666666667e+00
+2200 2204 -4.16666666666667e+00
+2200 2265 4.16666666666667e+00
+2200 2415 -4.16666666666667e+00
+2200 2417 -4.16666666666667e+00
+2200 2267 4.16666666666667e+00
+2200 1907 -8.33333333333333e+00
+2200 2189 8.33333333333333e+00
+2200 2203 -1.25000000000000e+01
+2200 2188 -3.75000000000000e+01
+2200 2202 8.33333333333333e+00
+2200 2187 8.33333333333333e+00
+2200 2199 -1.66666666666667e+01
+2200 2264 8.33333333333333e+00
+2200 1949 -8.33333333333333e+00
+2200 2177 4.16666666666667e+00
+2200 2263 -1.25000000000000e+01
+2201 2201 1.25000000000000e+02
+2201 2176 4.16666666666667e+00
+2201 2170 -4.16666666666667e+00
+2201 2185 -4.16666666666667e+00
+2201 2179 4.16666666666667e+00
+2201 2184 8.33333333333333e+00
+2201 2178 -8.33333333333333e+00
+2201 2169 -4.16666666666667e+00
+2201 2186 -1.25000000000000e+01
+2201 2406 4.16666666666667e+00
+2201 2403 -4.16666666666667e+00
+2201 2407 4.16666666666667e+00
+2201 2198 -3.75000000000000e+01
+2201 2197 8.33333333333333e+00
+2201 2196 8.33333333333333e+00
+2201 2199 -1.66666666666667e+01
+2201 2405 -1.25000000000000e+01
+2201 2404 8.33333333333333e+00
+2201 2200 -1.66666666666667e+01
+2201 2203 -4.16666666666667e+00
+2201 2202 8.33333333333333e+00
+2201 2416 -4.16666666666667e+00
+2201 2266 4.16666666666667e+00
+2201 2265 -8.33333333333333e+00
+2201 2262 8.33333333333333e+00
+2201 2204 -1.25000000000000e+01
+2201 2189 -1.25000000000000e+01
+2201 1906 -8.33333333333333e+00
+2201 2188 8.33333333333333e+00
+2201 1905 4.16666666666667e+00
+2201 2187 -4.16666666666667e+00
+2201 2175 4.16666666666667e+00
+2201 2264 -3.75000000000000e+01
+2201 2263 8.33333333333333e+00
+2201 1948 -8.33333333333333e+00
+2201 2415 -4.16666666666667e+00
+2201 1947 4.16666666666667e+00
+2202 2202 1.25000000000000e+02
+2202 2416 4.16666666666667e+00
+2202 2417 4.16666666666667e+00
+2202 2200 8.33333333333333e+00
+2202 2199 -3.75000000000000e+01
+2202 2197 4.16666666666667e+00
+2202 2408 -4.16666666666667e+00
+2202 2198 -8.33333333333333e+00
+2202 2407 8.33333333333333e+00
+2202 2406 -1.25000000000000e+01
+2202 2203 -1.66666666666667e+01
+2202 1906 -4.16666666666667e+00
+2202 1954 -4.16666666666667e+00
+2202 2189 4.16666666666667e+00
+2202 2195 -4.16666666666667e+00
+2202 2266 -4.16666666666667e+00
+2202 2371 4.16666666666667e+00
+2202 2188 -8.33333333333333e+00
+2202 2194 8.33333333333333e+00
+2202 2193 -1.25000000000000e+01
+2202 2267 8.33333333333333e+00
+2202 2372 -8.33333333333333e+00
+2202 2265 -1.25000000000000e+01
+2202 2044 -4.16666666666667e+00
+2202 2191 4.16666666666667e+00
+2202 2045 8.33333333333333e+00
+2202 2204 -1.66666666666667e+01
+2202 2309 8.33333333333333e+00
+2202 2192 4.16666666666667e+00
+2202 1907 -4.16666666666667e+00
+2202 2043 -1.25000000000000e+01
+2202 2057 4.16666666666667e+00
+2202 1955 -4.16666666666667e+00
+2202 2308 8.33333333333333e+00
+2202 2056 -8.33333333333333e+00
+2202 2307 -3.75000000000000e+01
+2202 2201 8.33333333333333e+00
+2203 2203 1.25000000000000e+02
+2203 2415 4.16666666666667e+00
+2203 2417 -8.33333333333333e+00
+2203 2200 -1.25000000000000e+01
+2203 2199 8.33333333333333e+00
+2203 2196 4.16666666666667e+00
+2203 2408 8.33333333333333e+00
+2203 2198 4.16666666666667e+00
+2203 2407 -3.75000000000000e+01
+2203 2406 8.33333333333333e+00
+2203 2202 -1.66666666666667e+01
+2203 1905 -4.16666666666667e+00
+2203 1953 -4.16666666666667e+00
+2203 2267 8.33333333333333e+00
+2203 2204 -1.66666666666667e+01
+2203 2195 8.33333333333333e+00
+2203 2265 -4.16666666666667e+00
+2203 2370 4.16666666666667e+00
+2203 1907 -4.16666666666667e+00
+2203 2189 4.16666666666667e+00
+2203 2194 -3.75000000000000e+01
+2203 2187 -8.33333333333333e+00
+2203 2193 8.33333333333333e+00
+2203 1955 -4.16666666666667e+00
+2203 2372 4.16666666666667e+00
+2203 2266 -1.25000000000000e+01
+2203 2043 -4.16666666666667e+00
+2203 2190 4.16666666666667e+00
+2203 2057 4.16666666666667e+00
+2203 2309 -4.16666666666667e+00
+2203 2192 -8.33333333333333e+00
+2203 2045 8.33333333333333e+00
+2203 2044 -1.25000000000000e+01
+2203 2308 -1.25000000000000e+01
+2203 2201 -4.16666666666667e+00
+2203 2307 8.33333333333333e+00
+2203 2055 -8.33333333333333e+00
+2204 2204 1.25000000000000e+02
+2204 2199 8.33333333333333e+00
+2204 2416 -8.33333333333333e+00
+2204 2415 4.16666666666667e+00
+2204 2201 -1.25000000000000e+01
+2204 2407 8.33333333333333e+00
+2204 2406 -4.16666666666667e+00
+2204 2197 4.16666666666667e+00
+2204 2196 -8.33333333333333e+00
+2204 2408 -1.25000000000000e+01
+2204 2187 4.16666666666667e+00
+2204 2193 -4.16666666666667e+00
+2204 2266 8.33333333333333e+00
+2204 2203 -1.66666666666667e+01
+2204 2194 8.33333333333333e+00
+2204 2195 -1.25000000000000e+01
+2204 1906 -4.16666666666667e+00
+2204 2188 4.16666666666667e+00
+2204 2267 -3.75000000000000e+01
+2204 1954 -4.16666666666667e+00
+2204 2371 4.16666666666667e+00
+2204 2265 8.33333333333333e+00
+2204 2370 -8.33333333333333e+00
+2204 2056 4.16666666666667e+00
+2204 2308 -4.16666666666667e+00
+2204 2043 8.33333333333333e+00
+2204 2202 -1.66666666666667e+01
+2204 2307 8.33333333333333e+00
+2204 2045 -3.75000000000000e+01
+2204 2191 -8.33333333333333e+00
+2204 2044 8.33333333333333e+00
+2204 2190 4.16666666666667e+00
+2204 1905 -4.16666666666667e+00
+2204 2309 -1.25000000000000e+01
+2204 2200 -4.16666666666667e+00
+2204 2055 4.16666666666667e+00
+2204 1953 -4.16666666666667e+00
+2205 2205 6.25000000000000e+01
+2205 2237 -4.16666666666667e+00
+2205 2234 -4.16666666666667e+00
+2205 2233 2.08333333333333e+00
+2205 2236 -4.16666666666667e+00
+2205 2216 4.16666666666667e+00
+2205 2215 -2.08333333333333e+00
+2205 2221 4.16666666666667e+00
+2205 2214 -6.25000000000000e+00
+2205 1996 -2.08333333333333e+00
+2205 1993 0.00000000000000e+00
+2205 2225 4.16666666666667e+00
+2205 2213 -4.16666666666667e+00
+2205 1910 0.00000000000000e+00
+2205 1994 0.00000000000000e+00
+2205 1909 0.00000000000000e+00
+2205 2206 -8.33333333333333e+00
+2205 2212 8.33333333333333e+00
+2205 1908 0.00000000000000e+00
+2205 2211 -1.25000000000000e+01
+2205 2207 -8.33333333333333e+00
+2205 1913 4.16666666666667e+00
+2205 1997 4.16666666666667e+00
+2205 1912 4.16666666666667e+00
+2205 2224 -8.33333333333333e+00
+2205 2222 4.16666666666667e+00
+2205 1911 -1.87500000000000e+01
+2205 1995 -6.25000000000000e+00
+2206 2206 6.25000000000000e+01
+2206 2237 -4.16666666666667e+00
+2206 2232 2.08333333333333e+00
+2206 2235 -4.16666666666667e+00
+2206 2216 4.16666666666667e+00
+2206 2222 -8.33333333333333e+00
+2206 2215 -6.25000000000000e+00
+2206 2214 -2.08333333333333e+00
+2206 2220 4.16666666666667e+00
+2206 1995 -2.08333333333333e+00
+2206 1992 0.00000000000000e+00
+2206 1997 4.16666666666667e+00
+2206 2207 -8.33333333333333e+00
+2206 2213 8.33333333333333e+00
+2206 1910 0.00000000000000e+00
+2206 1994 0.00000000000000e+00
+2206 1909 0.00000000000000e+00
+2206 2212 -3.75000000000000e+01
+2206 1908 0.00000000000000e+00
+2206 2205 -8.33333333333333e+00
+2206 2211 8.33333333333333e+00
+2206 1913 -2.08333333333333e+00
+2206 2225 4.16666666666667e+00
+2206 2234 2.08333333333333e+00
+2206 1912 -6.25000000000000e+00
+2206 1996 -6.25000000000000e+00
+2206 1911 4.16666666666667e+00
+2206 2223 -8.33333333333333e+00
+2207 2207 6.25000000000000e+01
+2207 2236 -4.16666666666667e+00
+2207 2220 4.16666666666667e+00
+2207 2235 -4.16666666666667e+00
+2207 2232 -4.16666666666667e+00
+2207 2216 -1.87500000000000e+01
+2207 2215 4.16666666666667e+00
+2207 2221 -8.33333333333333e+00
+2207 2214 4.16666666666667e+00
+2207 1996 4.16666666666667e+00
+2207 2206 -8.33333333333333e+00
+2207 2212 8.33333333333333e+00
+2207 2223 4.16666666666667e+00
+2207 2211 -4.16666666666667e+00
+2207 1910 0.00000000000000e+00
+2207 2213 -1.25000000000000e+01
+2207 1909 0.00000000000000e+00
+2207 1993 0.00000000000000e+00
+2207 1908 0.00000000000000e+00
+2207 1992 0.00000000000000e+00
+2207 2233 2.08333333333333e+00
+2207 1913 -6.25000000000000e+00
+2207 1997 -1.87500000000000e+01
+2207 1912 -2.08333333333333e+00
+2207 2224 4.16666666666667e+00
+2207 2205 -8.33333333333333e+00
+2207 1911 4.16666666666667e+00
+2207 1995 4.16666666666667e+00
+2208 2208 1.00000000000000e+00
+2208 2255 0.00000000000000e+00
+2208 2219 0.00000000000000e+00
+2208 2222 0.00000000000000e+00
+2208 2218 0.00000000000000e+00
+2208 2221 0.00000000000000e+00
+2208 2217 0.00000000000000e+00
+2208 2251 0.00000000000000e+00
+2208 2254 0.00000000000000e+00
+2208 1993 0.00000000000000e+00
+2208 1999 0.00000000000000e+00
+2208 2210 0.00000000000000e+00
+2208 2000 0.00000000000000e+00
+2208 2213 0.00000000000000e+00
+2208 1916 0.00000000000000e+00
+2208 2243 0.00000000000000e+00
+2208 1915 0.00000000000000e+00
+2208 2242 0.00000000000000e+00
+2208 1914 0.00000000000000e+00
+2208 1998 0.00000000000000e+00
+2208 1910 0.00000000000000e+00
+2208 1994 0.00000000000000e+00
+2208 2209 0.00000000000000e+00
+2208 1909 0.00000000000000e+00
+2208 2212 0.00000000000000e+00
+2208 2252 0.00000000000000e+00
+2208 1908 0.00000000000000e+00
+2208 2211 0.00000000000000e+00
+2209 2209 1.00000000000000e+00
+2209 2255 0.00000000000000e+00
+2209 2219 0.00000000000000e+00
+2209 2218 0.00000000000000e+00
+2209 2217 0.00000000000000e+00
+2209 2220 0.00000000000000e+00
+2209 2252 0.00000000000000e+00
+2209 2250 0.00000000000000e+00
+2209 2253 0.00000000000000e+00
+2209 1992 0.00000000000000e+00
+2209 1998 0.00000000000000e+00
+2209 2243 0.00000000000000e+00
+2209 2213 0.00000000000000e+00
+2209 1916 0.00000000000000e+00
+2209 2210 0.00000000000000e+00
+2209 2000 0.00000000000000e+00
+2209 1915 0.00000000000000e+00
+2209 1999 0.00000000000000e+00
+2209 1914 0.00000000000000e+00
+2209 2241 0.00000000000000e+00
+2209 1910 0.00000000000000e+00
+2209 1994 0.00000000000000e+00
+2209 2222 0.00000000000000e+00
+2209 1909 0.00000000000000e+00
+2209 2212 0.00000000000000e+00
+2209 2208 0.00000000000000e+00
+2209 1908 0.00000000000000e+00
+2209 2211 0.00000000000000e+00
+2210 2210 1.00000000000000e+00
+2210 2253 0.00000000000000e+00
+2210 2221 0.00000000000000e+00
+2210 2254 0.00000000000000e+00
+2210 2219 0.00000000000000e+00
+2210 2218 0.00000000000000e+00
+2210 2217 0.00000000000000e+00
+2210 2220 0.00000000000000e+00
+2210 2251 0.00000000000000e+00
+2210 2242 0.00000000000000e+00
+2210 2212 0.00000000000000e+00
+2210 2208 0.00000000000000e+00
+2210 1998 0.00000000000000e+00
+2210 2211 0.00000000000000e+00
+2210 1916 0.00000000000000e+00
+2210 2000 0.00000000000000e+00
+2210 1915 0.00000000000000e+00
+2210 2209 0.00000000000000e+00
+2210 1999 0.00000000000000e+00
+2210 1914 0.00000000000000e+00
+2210 2241 0.00000000000000e+00
+2210 2250 0.00000000000000e+00
+2210 1910 0.00000000000000e+00
+2210 2213 0.00000000000000e+00
+2210 1909 0.00000000000000e+00
+2210 1993 0.00000000000000e+00
+2210 1908 0.00000000000000e+00
+2210 1992 0.00000000000000e+00
+2211 2211 1.25000000000000e+02
+2211 2255 4.16666666666667e+00
+2211 2210 0.00000000000000e+00
+2211 2000 0.00000000000000e+00
+2211 1999 0.00000000000000e+00
+2211 2209 0.00000000000000e+00
+2211 2208 0.00000000000000e+00
+2211 2243 -4.16666666666667e+00
+2211 2242 8.33333333333333e+00
+2211 2241 -1.25000000000000e+01
+2211 2221 -4.16666666666667e+00
+2211 2269 -4.16666666666667e+00
+2211 2236 4.16666666666667e+00
+2211 2222 8.33333333333333e+00
+2211 2237 -8.33333333333333e+00
+2211 1919 4.16666666666667e+00
+2211 2270 -4.16666666666667e+00
+2211 1910 0.00000000000000e+00
+2211 2220 -1.25000000000000e+01
+2211 1994 0.00000000000000e+00
+2211 1993 0.00000000000000e+00
+2211 1997 4.16666666666667e+00
+2211 2207 -4.16666666666667e+00
+2211 2212 -1.66666666666667e+01
+2211 1996 4.16666666666667e+00
+2211 2002 -4.16666666666667e+00
+2211 1909 0.00000000000000e+00
+2211 2206 8.33333333333333e+00
+2211 2205 -1.25000000000000e+01
+2211 2213 -1.66666666666667e+01
+2211 2225 8.33333333333333e+00
+2211 2003 8.33333333333333e+00
+2211 2224 8.33333333333333e+00
+2211 1918 -8.33333333333333e+00
+2211 2254 4.16666666666667e+00
+2211 2223 -3.75000000000000e+01
+2211 2001 -1.25000000000000e+01
+2212 2212 1.25000000000000e+02
+2212 2255 -8.33333333333333e+00
+2212 2210 0.00000000000000e+00
+2212 2000 0.00000000000000e+00
+2212 1998 0.00000000000000e+00
+2212 2209 0.00000000000000e+00
+2212 2208 0.00000000000000e+00
+2212 2243 8.33333333333333e+00
+2212 2242 -3.75000000000000e+01
+2212 2241 8.33333333333333e+00
+2212 2220 -4.16666666666667e+00
+2212 2268 -4.16666666666667e+00
+2212 2235 4.16666666666667e+00
+2212 2270 -4.16666666666667e+00
+2212 2237 4.16666666666667e+00
+2212 2213 -1.66666666666667e+01
+2212 2222 8.33333333333333e+00
+2212 2221 -1.25000000000000e+01
+2212 1992 0.00000000000000e+00
+2212 2207 8.33333333333333e+00
+2212 2211 -1.66666666666667e+01
+2212 1997 -8.33333333333333e+00
+2212 2003 8.33333333333333e+00
+2212 1995 4.16666666666667e+00
+2212 2001 -4.16666666666667e+00
+2212 1910 0.00000000000000e+00
+2212 1994 0.00000000000000e+00
+2212 2206 -3.75000000000000e+01
+2212 1908 0.00000000000000e+00
+2212 2205 8.33333333333333e+00
+2212 2225 -4.16666666666667e+00
+2212 1919 4.16666666666667e+00
+2212 2253 4.16666666666667e+00
+2212 2224 -1.25000000000000e+01
+2212 2002 -1.25000000000000e+01
+2212 2223 8.33333333333333e+00
+2212 1917 -8.33333333333333e+00
+2213 2213 1.25000000000000e+02
+2213 2253 4.16666666666667e+00
+2213 2209 0.00000000000000e+00
+2213 1999 0.00000000000000e+00
+2213 2208 0.00000000000000e+00
+2213 1998 0.00000000000000e+00
+2213 2210 0.00000000000000e+00
+2213 2243 -1.25000000000000e+01
+2213 2242 8.33333333333333e+00
+2213 2241 -4.16666666666667e+00
+2213 2269 -4.16666666666667e+00
+2213 2236 4.16666666666667e+00
+2213 2220 8.33333333333333e+00
+2213 2235 -8.33333333333333e+00
+2213 1917 4.16666666666667e+00
+2213 2268 -4.16666666666667e+00
+2213 2222 -3.75000000000000e+01
+2213 2212 -1.66666666666667e+01
+2213 2221 8.33333333333333e+00
+2213 1908 0.00000000000000e+00
+2213 1992 0.00000000000000e+00
+2213 2206 8.33333333333333e+00
+2213 1995 4.16666666666667e+00
+2213 2205 -4.16666666666667e+00
+2213 1996 -8.33333333333333e+00
+2213 2002 8.33333333333333e+00
+2213 2207 -1.25000000000000e+01
+2213 1909 0.00000000000000e+00
+2213 1993 0.00000000000000e+00
+2213 2254 -8.33333333333333e+00
+2213 2225 -1.25000000000000e+01
+2213 2003 -3.75000000000000e+01
+2213 2224 -4.16666666666667e+00
+2213 1918 4.16666666666667e+00
+2213 2211 -1.66666666666667e+01
+2213 2223 8.33333333333333e+00
+2213 2001 8.33333333333333e+00
+2214 2214 6.25000000000000e+01
+2214 2237 4.16666666666667e+00
+2214 2236 -8.33333333333333e+00
+2214 2207 4.16666666666667e+00
+2214 2206 -2.08333333333333e+00
+2214 1909 0.00000000000000e+00
+2214 2205 -6.25000000000000e+00
+2214 2234 4.16666666666667e+00
+2214 1960 2.08333333333333e+00
+2214 2232 -1.87500000000000e+01
+2214 2222 -4.16666666666667e+00
+2214 2216 -8.33333333333333e+00
+2214 2071 -2.08333333333333e+00
+2214 2441 -4.16666666666667e+00
+2214 2078 4.16666666666667e+00
+2214 2440 -4.16666666666667e+00
+2214 2077 4.16666666666667e+00
+2214 2072 4.16666666666667e+00
+2214 1961 -4.16666666666667e+00
+2214 2070 -6.25000000000000e+00
+2214 2069 0.00000000000000e+00
+2214 1910 0.00000000000000e+00
+2214 2068 0.00000000000000e+00
+2214 2215 -8.33333333333333e+00
+2214 2221 8.33333333333333e+00
+2214 2067 0.00000000000000e+00
+2214 2233 4.16666666666667e+00
+2214 2220 -1.25000000000000e+01
+2215 2215 6.25000000000000e+01
+2215 2232 4.16666666666667e+00
+2215 2237 4.16666666666667e+00
+2215 2235 -8.33333333333333e+00
+2215 2207 4.16666666666667e+00
+2215 2216 -8.33333333333333e+00
+2215 2206 -6.25000000000000e+00
+2215 2205 -2.08333333333333e+00
+2215 1908 0.00000000000000e+00
+2215 2233 -6.25000000000000e+00
+2215 1959 2.08333333333333e+00
+2215 2070 -2.08333333333333e+00
+2215 2072 4.16666666666667e+00
+2215 2222 8.33333333333333e+00
+2215 2078 -8.33333333333333e+00
+2215 2439 -4.16666666666667e+00
+2215 2076 4.16666666666667e+00
+2215 1961 2.08333333333333e+00
+2215 2441 -4.16666666666667e+00
+2215 2071 -6.25000000000000e+00
+2215 2069 0.00000000000000e+00
+2215 1910 0.00000000000000e+00
+2215 2068 0.00000000000000e+00
+2215 2234 -2.08333333333333e+00
+2215 2221 -3.75000000000000e+01
+2215 2067 0.00000000000000e+00
+2215 2214 -8.33333333333333e+00
+2215 2220 8.33333333333333e+00
+2216 2216 6.25000000000000e+01
+2216 2235 4.16666666666667e+00
+2216 2236 4.16666666666667e+00
+2216 2207 -1.87500000000000e+01
+2216 2206 4.16666666666667e+00
+2216 2215 -8.33333333333333e+00
+2216 2205 4.16666666666667e+00
+2216 2234 -6.25000000000000e+00
+2216 2232 4.16666666666667e+00
+2216 2220 -4.16666666666667e+00
+2216 2214 -8.33333333333333e+00
+2216 2071 4.16666666666667e+00
+2216 2439 -4.16666666666667e+00
+2216 2076 4.16666666666667e+00
+2216 2221 8.33333333333333e+00
+2216 2077 -8.33333333333333e+00
+2216 2072 -1.87500000000000e+01
+2216 1960 2.08333333333333e+00
+2216 2440 -4.16666666666667e+00
+2216 2070 4.16666666666667e+00
+2216 1959 -4.16666666666667e+00
+2216 2069 0.00000000000000e+00
+2216 2233 -2.08333333333333e+00
+2216 2222 -1.25000000000000e+01
+2216 2068 0.00000000000000e+00
+2216 1909 0.00000000000000e+00
+2216 2067 0.00000000000000e+00
+2216 1908 0.00000000000000e+00
+2217 2217 1.00000000000000e+00
+2217 2251 0.00000000000000e+00
+2217 2255 0.00000000000000e+00
+2217 2254 0.00000000000000e+00
+2217 2210 0.00000000000000e+00
+2217 2219 0.00000000000000e+00
+2217 1909 0.00000000000000e+00
+2217 2209 0.00000000000000e+00
+2217 2208 0.00000000000000e+00
+2217 1963 0.00000000000000e+00
+2217 2250 0.00000000000000e+00
+2217 2074 0.00000000000000e+00
+2217 2075 0.00000000000000e+00
+2217 2222 0.00000000000000e+00
+2217 2078 0.00000000000000e+00
+2217 2446 0.00000000000000e+00
+2217 2077 0.00000000000000e+00
+2217 1964 0.00000000000000e+00
+2217 2447 0.00000000000000e+00
+2217 2073 0.00000000000000e+00
+2217 2069 0.00000000000000e+00
+2217 1910 0.00000000000000e+00
+2217 2218 0.00000000000000e+00
+2217 2068 0.00000000000000e+00
+2217 2221 0.00000000000000e+00
+2217 2252 0.00000000000000e+00
+2217 2067 0.00000000000000e+00
+2217 2220 0.00000000000000e+00
+2218 2218 1.00000000000000e+00
+2218 2255 0.00000000000000e+00
+2218 2253 0.00000000000000e+00
+2218 2210 0.00000000000000e+00
+2218 2209 0.00000000000000e+00
+2218 1908 0.00000000000000e+00
+2218 2208 0.00000000000000e+00
+2218 2252 0.00000000000000e+00
+2218 2251 0.00000000000000e+00
+2218 1962 0.00000000000000e+00
+2218 2222 0.00000000000000e+00
+2218 2219 0.00000000000000e+00
+2218 2073 0.00000000000000e+00
+2218 2447 0.00000000000000e+00
+2218 2078 0.00000000000000e+00
+2218 2445 0.00000000000000e+00
+2218 2076 0.00000000000000e+00
+2218 1964 0.00000000000000e+00
+2218 2075 0.00000000000000e+00
+2218 2074 0.00000000000000e+00
+2218 2069 0.00000000000000e+00
+2218 1910 0.00000000000000e+00
+2218 2250 0.00000000000000e+00
+2218 2068 0.00000000000000e+00
+2218 2221 0.00000000000000e+00
+2218 2217 0.00000000000000e+00
+2218 2067 0.00000000000000e+00
+2218 2220 0.00000000000000e+00
+2219 2219 1.00000000000000e+00
+2219 2254 0.00000000000000e+00
+2219 2253 0.00000000000000e+00
+2219 2210 0.00000000000000e+00
+2219 2209 0.00000000000000e+00
+2219 2208 0.00000000000000e+00
+2219 2217 0.00000000000000e+00
+2219 2252 0.00000000000000e+00
+2219 2251 0.00000000000000e+00
+2219 2221 0.00000000000000e+00
+2219 2218 0.00000000000000e+00
+2219 2446 0.00000000000000e+00
+2219 2077 0.00000000000000e+00
+2219 2073 0.00000000000000e+00
+2219 2220 0.00000000000000e+00
+2219 2076 0.00000000000000e+00
+2219 2075 0.00000000000000e+00
+2219 1963 0.00000000000000e+00
+2219 2074 0.00000000000000e+00
+2219 1962 0.00000000000000e+00
+2219 2445 0.00000000000000e+00
+2219 2250 0.00000000000000e+00
+2219 2069 0.00000000000000e+00
+2219 2222 0.00000000000000e+00
+2219 2068 0.00000000000000e+00
+2219 1909 0.00000000000000e+00
+2219 2067 0.00000000000000e+00
+2219 1908 0.00000000000000e+00
+2220 2220 1.25000000000000e+02
+2220 2254 8.33333333333333e+00
+2220 2210 0.00000000000000e+00
+2220 2209 0.00000000000000e+00
+2220 2253 -1.25000000000000e+01
+2220 2219 0.00000000000000e+00
+2220 2446 4.16666666666667e+00
+2220 2218 0.00000000000000e+00
+2220 2217 0.00000000000000e+00
+2220 2447 4.16666666666667e+00
+2220 2212 -4.16666666666667e+00
+2220 2213 8.33333333333333e+00
+2220 2222 -1.66666666666667e+01
+2220 1910 0.00000000000000e+00
+2220 2211 -1.25000000000000e+01
+2220 2270 4.16666666666667e+00
+2220 1967 -4.16666666666667e+00
+2220 2269 -8.33333333333333e+00
+2220 2207 4.16666666666667e+00
+2220 2221 -1.66666666666667e+01
+2220 2236 8.33333333333333e+00
+2220 2206 4.16666666666667e+00
+2220 1909 0.00000000000000e+00
+2220 2237 8.33333333333333e+00
+2220 1966 -4.16666666666667e+00
+2220 2235 -3.75000000000000e+01
+2220 2216 -4.16666666666667e+00
+2220 2069 0.00000000000000e+00
+2220 2440 4.16666666666667e+00
+2220 2077 -4.16666666666667e+00
+2220 2068 0.00000000000000e+00
+2220 2215 8.33333333333333e+00
+2220 2214 -1.25000000000000e+01
+2220 2078 8.33333333333333e+00
+2220 2441 -8.33333333333333e+00
+2220 2076 -1.25000000000000e+01
+2220 2255 -4.16666666666667e+00
+2221 2221 1.25000000000000e+02
+2221 2253 8.33333333333333e+00
+2221 2208 0.00000000000000e+00
+2221 2255 8.33333333333333e+00
+2221 2254 -3.75000000000000e+01
+2221 2219 0.00000000000000e+00
+2221 2445 4.16666666666667e+00
+2221 2218 0.00000000000000e+00
+2221 2217 0.00000000000000e+00
+2221 2447 -8.33333333333333e+00
+2221 2211 -4.16666666666667e+00
+2221 2270 4.16666666666667e+00
+2221 2213 8.33333333333333e+00
+2221 2212 -1.25000000000000e+01
+2221 2268 -8.33333333333333e+00
+2221 2237 -4.16666666666667e+00
+2221 2220 -1.66666666666667e+01
+2221 2235 8.33333333333333e+00
+2221 2207 -8.33333333333333e+00
+2221 2205 4.16666666666667e+00
+2221 1908 0.00000000000000e+00
+2221 2236 -1.25000000000000e+01
+2221 1965 -4.16666666666667e+00
+2221 2216 8.33333333333333e+00
+2221 2222 -1.66666666666667e+01
+2221 2078 8.33333333333333e+00
+2221 2439 4.16666666666667e+00
+2221 2076 -4.16666666666667e+00
+2221 2069 0.00000000000000e+00
+2221 1910 0.00000000000000e+00
+2221 2215 -3.75000000000000e+01
+2221 2067 0.00000000000000e+00
+2221 2214 8.33333333333333e+00
+2221 2441 4.16666666666667e+00
+2221 1967 -4.16666666666667e+00
+2221 2077 -1.25000000000000e+01
+2221 2210 0.00000000000000e+00
+2222 2222 1.25000000000000e+02
+2222 2253 -4.16666666666667e+00
+2222 2208 0.00000000000000e+00
+2222 2255 -1.25000000000000e+01
+2222 2254 8.33333333333333e+00
+2222 2218 0.00000000000000e+00
+2222 2217 0.00000000000000e+00
+2222 2219 0.00000000000000e+00
+2222 2446 -8.33333333333333e+00
+2222 2445 4.16666666666667e+00
+2222 2269 4.16666666666667e+00
+2222 2211 8.33333333333333e+00
+2222 2220 -1.66666666666667e+01
+2222 2213 -3.75000000000000e+01
+2222 2212 8.33333333333333e+00
+2222 1908 0.00000000000000e+00
+2222 2268 4.16666666666667e+00
+2222 1965 -4.16666666666667e+00
+2222 2205 4.16666666666667e+00
+2222 2236 -4.16666666666667e+00
+2222 2206 -8.33333333333333e+00
+2222 2237 -1.25000000000000e+01
+2222 2235 8.33333333333333e+00
+2222 2214 -4.16666666666667e+00
+2222 2067 0.00000000000000e+00
+2222 2215 8.33333333333333e+00
+2222 2221 -1.66666666666667e+01
+2222 2077 8.33333333333333e+00
+2222 2216 -1.25000000000000e+01
+2222 2068 0.00000000000000e+00
+2222 1909 0.00000000000000e+00
+2222 2078 -3.75000000000000e+01
+2222 2209 0.00000000000000e+00
+2222 2440 4.16666666666667e+00
+2222 1966 -4.16666666666667e+00
+2222 2076 8.33333333333333e+00
+2222 2439 -8.33333333333333e+00
+2223 2223 1.25000000000000e+02
+2223 2261 4.16666666666667e+00
+2223 2260 -8.33333333333333e+00
+2223 2230 8.33333333333333e+00
+2223 2229 -3.75000000000000e+01
+2223 2156 4.16666666666667e+00
+2223 2155 4.16666666666667e+00
+2223 2159 8.33333333333333e+00
+2223 2158 -4.16666666666667e+00
+2223 2157 -1.25000000000000e+01
+2223 2225 -1.66666666666667e+01
+2223 1913 -4.16666666666667e+00
+2223 1919 -4.16666666666667e+00
+2223 2273 -4.16666666666667e+00
+2223 2270 4.16666666666667e+00
+2223 2240 -8.33333333333333e+00
+2223 2237 8.33333333333333e+00
+2223 2239 4.16666666666667e+00
+2223 2236 -4.16666666666667e+00
+2223 2235 -1.25000000000000e+01
+2223 2272 -4.16666666666667e+00
+2223 2269 4.16666666666667e+00
+2223 1997 -4.16666666666667e+00
+2223 2207 4.16666666666667e+00
+2223 1996 -4.16666666666667e+00
+2223 2002 4.16666666666667e+00
+2223 2206 -8.33333333333333e+00
+2223 1912 8.33333333333333e+00
+2223 1911 -1.25000000000000e+01
+2223 2213 8.33333333333333e+00
+2223 2003 -8.33333333333333e+00
+2223 2212 8.33333333333333e+00
+2223 2224 -1.66666666666667e+01
+2223 1918 8.33333333333333e+00
+2223 2211 -3.75000000000000e+01
+2223 2231 8.33333333333333e+00
+2223 1917 -1.25000000000000e+01
+2224 2224 1.25000000000000e+02
+2224 2231 -4.16666666666667e+00
+2224 2259 -8.33333333333333e+00
+2224 2230 -1.25000000000000e+01
+2224 2229 8.33333333333333e+00
+2224 2156 -8.33333333333333e+00
+2224 2154 4.16666666666667e+00
+2224 2159 8.33333333333333e+00
+2224 2158 -1.25000000000000e+01
+2224 2157 -4.16666666666667e+00
+2224 2273 -4.16666666666667e+00
+2224 2240 4.16666666666667e+00
+2224 1913 8.33333333333333e+00
+2224 2225 -1.66666666666667e+01
+2224 2237 8.33333333333333e+00
+2224 2236 -1.25000000000000e+01
+2224 2238 4.16666666666667e+00
+2224 2235 -4.16666666666667e+00
+2224 1919 8.33333333333333e+00
+2224 2270 -8.33333333333333e+00
+2224 2271 -4.16666666666667e+00
+2224 2268 4.16666666666667e+00
+2224 1995 -4.16666666666667e+00
+2224 2001 4.16666666666667e+00
+2224 2207 4.16666666666667e+00
+2224 1997 -4.16666666666667e+00
+2224 1912 -3.75000000000000e+01
+2224 2205 -8.33333333333333e+00
+2224 1911 8.33333333333333e+00
+2224 2213 -4.16666666666667e+00
+2224 2003 4.16666666666667e+00
+2224 2212 -1.25000000000000e+01
+2224 2261 4.16666666666667e+00
+2224 1918 -3.75000000000000e+01
+2224 2211 8.33333333333333e+00
+2224 2223 -1.66666666666667e+01
+2224 1917 8.33333333333333e+00
+2225 2225 1.25000000000000e+02
+2225 2230 -4.16666666666667e+00
+2225 2229 8.33333333333333e+00
+2225 2259 4.16666666666667e+00
+2225 2231 -1.25000000000000e+01
+2225 2154 4.16666666666667e+00
+2225 2155 -8.33333333333333e+00
+2225 2159 -3.75000000000000e+01
+2225 2158 8.33333333333333e+00
+2225 2157 8.33333333333333e+00
+2225 2223 -1.66666666666667e+01
+2225 1911 -4.16666666666667e+00
+2225 1917 -4.16666666666667e+00
+2225 2271 -4.16666666666667e+00
+2225 2268 4.16666666666667e+00
+2225 2272 -4.16666666666667e+00
+2225 2239 4.16666666666667e+00
+2225 2237 -3.75000000000000e+01
+2225 1912 8.33333333333333e+00
+2225 2224 -1.66666666666667e+01
+2225 2236 8.33333333333333e+00
+2225 2238 -8.33333333333333e+00
+2225 2235 8.33333333333333e+00
+2225 1918 8.33333333333333e+00
+2225 2269 -8.33333333333333e+00
+2225 1995 -4.16666666666667e+00
+2225 2205 4.16666666666667e+00
+2225 1913 -1.25000000000000e+01
+2225 2206 4.16666666666667e+00
+2225 1996 -4.16666666666667e+00
+2225 2213 -1.25000000000000e+01
+2225 2260 4.16666666666667e+00
+2225 1919 -1.25000000000000e+01
+2225 2212 -4.16666666666667e+00
+2225 2002 4.16666666666667e+00
+2225 2211 8.33333333333333e+00
+2225 2001 -8.33333333333333e+00
+2226 2226 6.25000000000000e+01
+2226 2231 -4.16666666666667e+00
+2226 2164 -2.08333333333333e+00
+2226 2155 2.08333333333333e+00
+2226 2165 4.16666666666667e+00
+2226 1930 4.16666666666667e+00
+2226 2335 -8.33333333333333e+00
+2226 2163 -6.25000000000000e+00
+2226 2156 -4.16666666666667e+00
+2226 2227 -8.33333333333333e+00
+2226 2230 8.33333333333333e+00
+2226 1912 4.16666666666667e+00
+2226 2229 -1.25000000000000e+01
+2226 2345 -4.16666666666667e+00
+2226 2240 4.16666666666667e+00
+2226 1931 4.16666666666667e+00
+2226 2084 -4.16666666666667e+00
+2226 2083 2.08333333333333e+00
+2226 2344 -4.16666666666667e+00
+2226 1929 -1.87500000000000e+01
+2226 2228 -8.33333333333333e+00
+2226 2081 4.16666666666667e+00
+2226 1913 4.16666666666667e+00
+2226 2080 -2.08333333333333e+00
+2226 2239 4.16666666666667e+00
+2226 2336 4.16666666666667e+00
+2226 2079 -6.25000000000000e+00
+2226 1911 -1.87500000000000e+01
+2227 2227 6.25000000000000e+01
+2227 2165 4.16666666666667e+00
+2227 2231 8.33333333333333e+00
+2227 2163 -2.08333333333333e+00
+2227 2154 2.08333333333333e+00
+2227 1931 -2.08333333333333e+00
+2227 2336 4.16666666666667e+00
+2227 2164 -6.25000000000000e+00
+2227 1929 4.16666666666667e+00
+2227 2334 -8.33333333333333e+00
+2227 2156 2.08333333333333e+00
+2227 1913 -2.08333333333333e+00
+2227 2230 -3.75000000000000e+01
+2227 2226 -8.33333333333333e+00
+2227 2229 8.33333333333333e+00
+2227 1911 4.16666666666667e+00
+2227 2084 2.08333333333333e+00
+2227 2345 -4.16666666666667e+00
+2227 1930 -6.25000000000000e+00
+2227 2082 2.08333333333333e+00
+2227 2343 -4.16666666666667e+00
+2227 2081 4.16666666666667e+00
+2227 2240 -8.33333333333333e+00
+2227 2228 -8.33333333333333e+00
+2227 2080 -6.25000000000000e+00
+2227 1912 -6.25000000000000e+00
+2227 2079 -2.08333333333333e+00
+2227 2238 4.16666666666667e+00
+2228 2228 6.25000000000000e+01
+2228 2229 -4.16666666666667e+00
+2228 2227 -8.33333333333333e+00
+2228 2164 4.16666666666667e+00
+2228 2230 8.33333333333333e+00
+2228 2165 -1.87500000000000e+01
+2228 1930 -2.08333333333333e+00
+2228 2335 4.16666666666667e+00
+2228 2163 4.16666666666667e+00
+2228 2231 -1.25000000000000e+01
+2228 2155 2.08333333333333e+00
+2228 1912 -2.08333333333333e+00
+2228 2154 -4.16666666666667e+00
+2228 2083 2.08333333333333e+00
+2228 2344 -4.16666666666667e+00
+2228 2343 -4.16666666666667e+00
+2228 2238 4.16666666666667e+00
+2228 1931 -6.25000000000000e+00
+2228 1929 4.16666666666667e+00
+2228 2082 -4.16666666666667e+00
+2228 2334 4.16666666666667e+00
+2228 2081 -1.87500000000000e+01
+2228 1913 -6.25000000000000e+00
+2228 2080 4.16666666666667e+00
+2228 2239 -8.33333333333333e+00
+2228 2226 -8.33333333333333e+00
+2228 2079 4.16666666666667e+00
+2228 1911 4.16666666666667e+00
+2229 2229 1.25000000000000e+02
+2229 2272 4.16666666666667e+00
+2229 2377 -4.16666666666667e+00
+2229 2240 8.33333333333333e+00
+2229 2345 -8.33333333333333e+00
+2229 2239 -4.16666666666667e+00
+2229 2344 4.16666666666667e+00
+2229 2378 -4.16666666666667e+00
+2229 2238 -1.25000000000000e+01
+2229 2165 4.16666666666667e+00
+2229 2228 -4.16666666666667e+00
+2229 2164 4.16666666666667e+00
+2229 2336 8.33333333333333e+00
+2229 2231 -1.66666666666667e+01
+2229 2335 8.33333333333333e+00
+2229 2334 -3.75000000000000e+01
+2229 2227 8.33333333333333e+00
+2229 2226 -1.25000000000000e+01
+2229 2230 -1.66666666666667e+01
+2229 2167 -4.16666666666667e+00
+2229 2168 8.33333333333333e+00
+2229 2159 -8.33333333333333e+00
+2229 2225 8.33333333333333e+00
+2229 2155 -4.16666666666667e+00
+2229 2158 4.16666666666667e+00
+2229 1937 4.16666666666667e+00
+2229 2261 -4.16666666666667e+00
+2229 1936 -8.33333333333333e+00
+2229 2260 8.33333333333333e+00
+2229 2166 -1.25000000000000e+01
+2229 2259 -1.25000000000000e+01
+2229 2156 -4.16666666666667e+00
+2229 1913 4.16666666666667e+00
+2229 2224 8.33333333333333e+00
+2229 1912 -8.33333333333333e+00
+2229 2273 4.16666666666667e+00
+2229 2223 -3.75000000000000e+01
+2230 2230 1.25000000000000e+02
+2230 2271 4.16666666666667e+00
+2230 2376 -4.16666666666667e+00
+2230 2378 -4.16666666666667e+00
+2230 2345 4.16666666666667e+00
+2230 2238 -4.16666666666667e+00
+2230 2343 4.16666666666667e+00
+2230 2240 8.33333333333333e+00
+2230 2239 -1.25000000000000e+01
+2230 2228 8.33333333333333e+00
+2230 2165 -8.33333333333333e+00
+2230 2163 4.16666666666667e+00
+2230 2336 -4.16666666666667e+00
+2230 1937 4.16666666666667e+00
+2230 2335 -1.25000000000000e+01
+2230 2334 8.33333333333333e+00
+2230 1913 4.16666666666667e+00
+2230 2227 -3.75000000000000e+01
+2230 2226 8.33333333333333e+00
+2230 2225 -4.16666666666667e+00
+2230 2229 -1.66666666666667e+01
+2230 2166 -4.16666666666667e+00
+2230 2159 4.16666666666667e+00
+2230 2156 -4.16666666666667e+00
+2230 2154 -4.16666666666667e+00
+2230 2157 4.16666666666667e+00
+2230 2168 8.33333333333333e+00
+2230 2261 8.33333333333333e+00
+2230 2231 -1.66666666666667e+01
+2230 2167 -1.25000000000000e+01
+2230 2260 -3.75000000000000e+01
+2230 1935 -8.33333333333333e+00
+2230 2259 8.33333333333333e+00
+2230 2273 -8.33333333333333e+00
+2230 2224 -1.25000000000000e+01
+2230 2223 8.33333333333333e+00
+2230 1911 -8.33333333333333e+00
+2231 2231 1.25000000000000e+02
+2231 2272 -8.33333333333333e+00
+2231 2377 -4.16666666666667e+00
+2231 2344 4.16666666666667e+00
+2231 2238 8.33333333333333e+00
+2231 2343 -8.33333333333333e+00
+2231 2376 -4.16666666666667e+00
+2231 2240 -3.75000000000000e+01
+2231 2239 8.33333333333333e+00
+2231 2163 4.16666666666667e+00
+2231 2226 -4.16666666666667e+00
+2231 2227 8.33333333333333e+00
+2231 2164 -8.33333333333333e+00
+2231 2336 -1.25000000000000e+01
+2231 2335 -4.16666666666667e+00
+2231 1936 4.16666666666667e+00
+2231 2334 8.33333333333333e+00
+2231 2229 -1.66666666666667e+01
+2231 2228 -1.25000000000000e+01
+2231 1912 4.16666666666667e+00
+2231 2224 -4.16666666666667e+00
+2231 2158 4.16666666666667e+00
+2231 2155 -4.16666666666667e+00
+2231 2166 8.33333333333333e+00
+2231 2157 -8.33333333333333e+00
+2231 2223 8.33333333333333e+00
+2231 2168 -3.75000000000000e+01
+2231 2261 -1.25000000000000e+01
+2231 2167 8.33333333333333e+00
+2231 2260 8.33333333333333e+00
+2231 2230 -1.66666666666667e+01
+2231 1935 4.16666666666667e+00
+2231 2259 -4.16666666666667e+00
+2231 2271 4.16666666666667e+00
+2231 2225 -1.25000000000000e+01
+2231 2154 -4.16666666666667e+00
+2231 1911 4.16666666666667e+00
+2232 2232 6.25000000000000e+01
+2232 2233 -8.33333333333333e+00
+2232 2207 -4.16666666666667e+00
+2232 1912 -2.08333333333333e+00
+2232 2206 2.08333333333333e+00
+2232 2216 4.16666666666667e+00
+2232 1960 -2.08333333333333e+00
+2232 2214 -1.87500000000000e+01
+2232 2440 4.16666666666667e+00
+2232 2237 -4.16666666666667e+00
+2232 2236 8.33333333333333e+00
+2232 2235 -1.25000000000000e+01
+2232 2441 4.16666666666667e+00
+2232 2240 4.16666666666667e+00
+2232 2444 -4.16666666666667e+00
+2232 2086 2.08333333333333e+00
+2232 2443 -4.16666666666667e+00
+2232 1961 4.16666666666667e+00
+2232 2087 -4.16666666666667e+00
+2232 1959 -6.25000000000000e+00
+2232 2234 -8.33333333333333e+00
+2232 2081 4.16666666666667e+00
+2232 1913 4.16666666666667e+00
+2232 2080 4.16666666666667e+00
+2232 2239 -8.33333333333333e+00
+2232 2215 4.16666666666667e+00
+2232 2079 -1.87500000000000e+01
+2232 1911 -6.25000000000000e+00
+2233 2233 6.25000000000000e+01
+2233 2207 2.08333333333333e+00
+2233 2214 4.16666666666667e+00
+2233 2232 -8.33333333333333e+00
+2233 1911 -2.08333333333333e+00
+2233 2205 2.08333333333333e+00
+2233 2215 -6.25000000000000e+00
+2233 1959 -2.08333333333333e+00
+2233 2439 4.16666666666667e+00
+2233 1913 4.16666666666667e+00
+2233 2234 -8.33333333333333e+00
+2233 2237 8.33333333333333e+00
+2233 2236 -3.75000000000000e+01
+2233 2235 8.33333333333333e+00
+2233 1961 4.16666666666667e+00
+2233 2441 -8.33333333333333e+00
+2233 2085 2.08333333333333e+00
+2233 2442 -4.16666666666667e+00
+2233 2087 2.08333333333333e+00
+2233 2444 -4.16666666666667e+00
+2233 1960 -6.25000000000000e+00
+2233 2081 -2.08333333333333e+00
+2233 2240 4.16666666666667e+00
+2233 2216 -2.08333333333333e+00
+2233 2080 -6.25000000000000e+00
+2233 1912 -6.25000000000000e+00
+2233 2079 4.16666666666667e+00
+2233 2238 -8.33333333333333e+00
+2234 2234 6.25000000000000e+01
+2234 2206 2.08333333333333e+00
+2234 2205 -4.16666666666667e+00
+2234 2216 -6.25000000000000e+00
+2234 2214 4.16666666666667e+00
+2234 2237 -1.25000000000000e+01
+2234 1912 4.16666666666667e+00
+2234 2233 -8.33333333333333e+00
+2234 2236 8.33333333333333e+00
+2234 2235 -4.16666666666667e+00
+2234 1960 4.16666666666667e+00
+2234 2440 -8.33333333333333e+00
+2234 2439 4.16666666666667e+00
+2234 2238 4.16666666666667e+00
+2234 2442 -4.16666666666667e+00
+2234 1961 -1.87500000000000e+01
+2234 2086 2.08333333333333e+00
+2234 2443 -4.16666666666667e+00
+2234 1959 4.16666666666667e+00
+2234 2085 -4.16666666666667e+00
+2234 2215 -2.08333333333333e+00
+2234 2081 -6.25000000000000e+00
+2234 1913 -1.87500000000000e+01
+2234 2080 -2.08333333333333e+00
+2234 2239 4.16666666666667e+00
+2234 2232 -8.33333333333333e+00
+2234 2079 4.16666666666667e+00
+2234 1911 4.16666666666667e+00
+2235 2235 1.25000000000000e+02
+2235 2213 -8.33333333333333e+00
+2235 2216 4.16666666666667e+00
+2235 2207 -4.16666666666667e+00
+2235 2215 -8.33333333333333e+00
+2235 2221 8.33333333333333e+00
+2235 2206 -4.16666666666667e+00
+2235 2222 8.33333333333333e+00
+2235 2220 -3.75000000000000e+01
+2235 2443 4.16666666666667e+00
+2235 2440 -4.16666666666667e+00
+2235 2444 -8.33333333333333e+00
+2235 2441 8.33333333333333e+00
+2235 1913 4.16666666666667e+00
+2235 2234 -4.16666666666667e+00
+2235 2233 8.33333333333333e+00
+2235 2236 -1.66666666666667e+01
+2235 2232 -1.25000000000000e+01
+2235 1967 4.16666666666667e+00
+2235 2439 -1.25000000000000e+01
+2235 2270 -4.16666666666667e+00
+2235 2273 4.16666666666667e+00
+2235 2453 -4.16666666666667e+00
+2235 2239 8.33333333333333e+00
+2235 2272 -8.33333333333333e+00
+2235 2269 8.33333333333333e+00
+2235 2240 8.33333333333333e+00
+2235 2225 8.33333333333333e+00
+2235 2237 -1.66666666666667e+01
+2235 1912 4.16666666666667e+00
+2235 2224 -4.16666666666667e+00
+2235 2238 -3.75000000000000e+01
+2235 2223 -1.25000000000000e+01
+2235 2452 -4.16666666666667e+00
+2235 1966 4.16666666666667e+00
+2235 2212 4.16666666666667e+00
+2235 2268 -1.25000000000000e+01
+2236 2236 1.25000000000000e+02
+2236 2213 4.16666666666667e+00
+2236 2207 -4.16666666666667e+00
+2236 2216 4.16666666666667e+00
+2236 2222 -4.16666666666667e+00
+2236 2214 -8.33333333333333e+00
+2236 2220 8.33333333333333e+00
+2236 2205 -4.16666666666667e+00
+2236 2221 -1.25000000000000e+01
+2236 2442 4.16666666666667e+00
+2236 2439 -4.16666666666667e+00
+2236 2444 4.16666666666667e+00
+2236 2234 8.33333333333333e+00
+2236 2233 -3.75000000000000e+01
+2236 2232 8.33333333333333e+00
+2236 2235 -1.66666666666667e+01
+2236 2441 8.33333333333333e+00
+2236 2440 -1.25000000000000e+01
+2236 2237 -1.66666666666667e+01
+2236 2240 -4.16666666666667e+00
+2236 2238 8.33333333333333e+00
+2236 2273 4.16666666666667e+00
+2236 2453 -4.16666666666667e+00
+2236 2271 -8.33333333333333e+00
+2236 2268 8.33333333333333e+00
+2236 1913 -8.33333333333333e+00
+2236 2225 8.33333333333333e+00
+2236 2239 -1.25000000000000e+01
+2236 2224 -1.25000000000000e+01
+2236 1911 4.16666666666667e+00
+2236 2223 -4.16666666666667e+00
+2236 2270 8.33333333333333e+00
+2236 1967 -8.33333333333333e+00
+2236 2211 4.16666666666667e+00
+2236 2269 -3.75000000000000e+01
+2236 2451 -4.16666666666667e+00
+2236 1965 4.16666666666667e+00
+2237 2237 1.25000000000000e+02
+2237 2211 -8.33333333333333e+00
+2237 2206 -4.16666666666667e+00
+2237 2214 4.16666666666667e+00
+2237 2205 -4.16666666666667e+00
+2237 2215 4.16666666666667e+00
+2237 2221 -4.16666666666667e+00
+2237 2222 -1.25000000000000e+01
+2237 2220 8.33333333333333e+00
+2237 2443 4.16666666666667e+00
+2237 2442 -8.33333333333333e+00
+2237 2439 8.33333333333333e+00
+2237 2234 -1.25000000000000e+01
+2237 2233 8.33333333333333e+00
+2237 1911 4.16666666666667e+00
+2237 2232 -4.16666666666667e+00
+2237 2441 -3.75000000000000e+01
+2237 2440 8.33333333333333e+00
+2237 1965 4.16666666666667e+00
+2237 2236 -1.66666666666667e+01
+2237 2268 -4.16666666666667e+00
+2237 2239 -4.16666666666667e+00
+2237 2271 4.16666666666667e+00
+2237 2451 -4.16666666666667e+00
+2237 2272 4.16666666666667e+00
+2237 2452 -4.16666666666667e+00
+2237 2240 -1.25000000000000e+01
+2237 2225 -3.75000000000000e+01
+2237 1912 -8.33333333333333e+00
+2237 2224 8.33333333333333e+00
+2237 2238 8.33333333333333e+00
+2237 2223 8.33333333333333e+00
+2237 2235 -1.66666666666667e+01
+2237 2212 4.16666666666667e+00
+2237 2270 -1.25000000000000e+01
+2237 2269 8.33333333333333e+00
+2237 1966 -8.33333333333333e+00
+2238 2238 1.25000000000000e+02
+2238 2230 -4.16666666666667e+00
+2238 2378 4.16666666666667e+00
+2238 2377 -8.33333333333333e+00
+2238 2229 -1.25000000000000e+01
+2238 2228 4.16666666666667e+00
+2238 2344 8.33333333333333e+00
+2238 2345 8.33333333333333e+00
+2238 2343 -3.75000000000000e+01
+2238 2227 4.16666666666667e+00
+2238 2240 -1.66666666666667e+01
+2238 1913 -4.16666666666667e+00
+2238 1973 -4.16666666666667e+00
+2238 2273 -4.16666666666667e+00
+2238 2453 4.16666666666667e+00
+2238 2272 8.33333333333333e+00
+2238 2239 -1.66666666666667e+01
+2238 2236 8.33333333333333e+00
+2238 2225 -8.33333333333333e+00
+2238 2237 8.33333333333333e+00
+2238 1912 -4.16666666666667e+00
+2238 2224 4.16666666666667e+00
+2238 2235 -3.75000000000000e+01
+2238 1972 -4.16666666666667e+00
+2238 2452 4.16666666666667e+00
+2238 2271 -1.25000000000000e+01
+2238 2081 -4.16666666666667e+00
+2238 2234 4.16666666666667e+00
+2238 2092 4.16666666666667e+00
+2238 2443 -4.16666666666667e+00
+2238 2233 -8.33333333333333e+00
+2238 2080 8.33333333333333e+00
+2238 2079 -1.25000000000000e+01
+2238 2444 8.33333333333333e+00
+2238 2093 -8.33333333333333e+00
+2238 2442 -1.25000000000000e+01
+2238 2231 8.33333333333333e+00
+2239 2239 1.25000000000000e+02
+2239 2229 -4.16666666666667e+00
+2239 2376 -8.33333333333333e+00
+2239 2231 8.33333333333333e+00
+2239 2230 -1.25000000000000e+01
+2239 2345 -4.16666666666667e+00
+2239 2343 8.33333333333333e+00
+2239 2344 -1.25000000000000e+01
+2239 2228 -8.33333333333333e+00
+2239 2226 4.16666666666667e+00
+2239 2225 4.16666666666667e+00
+2239 2237 -4.16666666666667e+00
+2239 2271 8.33333333333333e+00
+2239 2238 -1.66666666666667e+01
+2239 2235 8.33333333333333e+00
+2239 2236 -1.25000000000000e+01
+2239 1911 -4.16666666666667e+00
+2239 2223 4.16666666666667e+00
+2239 2273 8.33333333333333e+00
+2239 2453 -8.33333333333333e+00
+2239 2272 -3.75000000000000e+01
+2239 1971 -4.16666666666667e+00
+2239 2451 4.16666666666667e+00
+2239 2081 8.33333333333333e+00
+2239 2240 -1.66666666666667e+01
+2239 2444 8.33333333333333e+00
+2239 2091 4.16666666666667e+00
+2239 2442 -4.16666666666667e+00
+2239 2234 4.16666666666667e+00
+2239 1913 -4.16666666666667e+00
+2239 2080 -3.75000000000000e+01
+2239 2232 -8.33333333333333e+00
+2239 2079 8.33333333333333e+00
+2239 2093 4.16666666666667e+00
+2239 1973 -4.16666666666667e+00
+2239 2443 -1.25000000000000e+01
+2239 2378 4.16666666666667e+00
+2240 2240 1.25000000000000e+02
+2240 2229 8.33333333333333e+00
+2240 2376 4.16666666666667e+00
+2240 2231 -3.75000000000000e+01
+2240 2230 8.33333333333333e+00
+2240 2344 -4.16666666666667e+00
+2240 2226 4.16666666666667e+00
+2240 2345 -1.25000000000000e+01
+2240 2343 8.33333333333333e+00
+2240 2227 -8.33333333333333e+00
+2240 2238 -1.66666666666667e+01
+2240 1911 -4.16666666666667e+00
+2240 1971 -4.16666666666667e+00
+2240 2224 4.16666666666667e+00
+2240 2236 -4.16666666666667e+00
+2240 2271 -4.16666666666667e+00
+2240 2451 4.16666666666667e+00
+2240 2237 -1.25000000000000e+01
+2240 2223 -8.33333333333333e+00
+2240 2235 8.33333333333333e+00
+2240 2273 -1.25000000000000e+01
+2240 2272 8.33333333333333e+00
+2240 2452 -8.33333333333333e+00
+2240 2079 -4.16666666666667e+00
+2240 2232 4.16666666666667e+00
+2240 2080 8.33333333333333e+00
+2240 2239 -1.66666666666667e+01
+2240 2443 8.33333333333333e+00
+2240 2081 -1.25000000000000e+01
+2240 2233 4.16666666666667e+00
+2240 1912 -4.16666666666667e+00
+2240 2444 -3.75000000000000e+01
+2240 2377 4.16666666666667e+00
+2240 2092 4.16666666666667e+00
+2240 1972 -4.16666666666667e+00
+2240 2442 8.33333333333333e+00
+2240 2091 -8.33333333333333e+00
+2241 2241 1.25000000000000e+02
+2241 2249 -4.16666666666667e+00
+2241 2263 -8.33333333333333e+00
+2241 2248 8.33333333333333e+00
+2241 2247 -1.25000000000000e+01
+2241 2174 0.00000000000000e+00
+2241 2173 0.00000000000000e+00
+2241 2177 8.33333333333333e+00
+2241 2176 -4.16666666666667e+00
+2241 2175 -1.25000000000000e+01
+2241 2276 -4.16666666666667e+00
+2241 2258 4.16666666666667e+00
+2241 1916 0.00000000000000e+00
+2241 2243 -1.66666666666667e+01
+2241 2255 8.33333333333333e+00
+2241 2257 4.16666666666667e+00
+2241 2254 -4.16666666666667e+00
+2241 2253 -1.25000000000000e+01
+2241 1919 8.33333333333333e+00
+2241 2270 -8.33333333333333e+00
+2241 2275 -4.16666666666667e+00
+2241 2269 4.16666666666667e+00
+2241 1999 0.00000000000000e+00
+2241 2002 4.16666666666667e+00
+2241 2210 0.00000000000000e+00
+2241 2000 0.00000000000000e+00
+2241 1915 0.00000000000000e+00
+2241 2209 0.00000000000000e+00
+2241 1914 0.00000000000000e+00
+2241 2213 -4.16666666666667e+00
+2241 2003 4.16666666666667e+00
+2241 2242 -1.66666666666667e+01
+2241 2212 8.33333333333333e+00
+2241 1918 8.33333333333333e+00
+2241 2264 4.16666666666667e+00
+2241 2211 -1.25000000000000e+01
+2241 1917 -3.75000000000000e+01
+2242 2242 1.25000000000000e+02
+2242 2264 4.16666666666667e+00
+2242 2262 -8.33333333333333e+00
+2242 2248 -3.75000000000000e+01
+2242 2247 8.33333333333333e+00
+2242 2174 0.00000000000000e+00
+2242 2172 0.00000000000000e+00
+2242 2177 8.33333333333333e+00
+2242 2176 -1.25000000000000e+01
+2242 2175 -4.16666666666667e+00
+2242 2243 -1.66666666666667e+01
+2242 1919 -4.16666666666667e+00
+2242 1916 0.00000000000000e+00
+2242 2270 4.16666666666667e+00
+2242 2276 -4.16666666666667e+00
+2242 2258 -8.33333333333333e+00
+2242 2255 8.33333333333333e+00
+2242 2254 -1.25000000000000e+01
+2242 2256 4.16666666666667e+00
+2242 2253 -4.16666666666667e+00
+2242 2274 -4.16666666666667e+00
+2242 2268 4.16666666666667e+00
+2242 2210 0.00000000000000e+00
+2242 2000 0.00000000000000e+00
+2242 1998 0.00000000000000e+00
+2242 2001 4.16666666666667e+00
+2242 1915 0.00000000000000e+00
+2242 1914 0.00000000000000e+00
+2242 2208 0.00000000000000e+00
+2242 2213 8.33333333333333e+00
+2242 2003 -8.33333333333333e+00
+2242 2249 8.33333333333333e+00
+2242 2212 -3.75000000000000e+01
+2242 1918 -1.25000000000000e+01
+2242 2241 -1.66666666666667e+01
+2242 2211 8.33333333333333e+00
+2242 1917 8.33333333333333e+00
+2243 2243 1.25000000000000e+02
+2243 2247 -4.16666666666667e+00
+2243 2248 8.33333333333333e+00
+2243 2263 4.16666666666667e+00
+2243 2249 -1.25000000000000e+01
+2243 2173 0.00000000000000e+00
+2243 2172 0.00000000000000e+00
+2243 2177 -3.75000000000000e+01
+2243 2176 8.33333333333333e+00
+2243 2175 8.33333333333333e+00
+2243 2242 -1.66666666666667e+01
+2243 1918 -4.16666666666667e+00
+2243 1915 0.00000000000000e+00
+2243 2269 4.16666666666667e+00
+2243 2275 -4.16666666666667e+00
+2243 2274 -4.16666666666667e+00
+2243 2256 4.16666666666667e+00
+2243 2255 -3.75000000000000e+01
+2243 2257 -8.33333333333333e+00
+2243 2254 8.33333333333333e+00
+2243 1914 0.00000000000000e+00
+2243 2241 -1.66666666666667e+01
+2243 2253 8.33333333333333e+00
+2243 1917 8.33333333333333e+00
+2243 2268 -8.33333333333333e+00
+2243 2209 0.00000000000000e+00
+2243 1999 0.00000000000000e+00
+2243 1916 0.00000000000000e+00
+2243 2208 0.00000000000000e+00
+2243 1998 0.00000000000000e+00
+2243 2262 4.16666666666667e+00
+2243 2213 -1.25000000000000e+01
+2243 1919 -1.25000000000000e+01
+2243 2212 8.33333333333333e+00
+2243 2002 -8.33333333333333e+00
+2243 2211 -4.16666666666667e+00
+2243 2001 4.16666666666667e+00
+2244 2244 1.00000000000000e+00
+2244 2246 0.00000000000000e+00
+2244 2249 0.00000000000000e+00
+2244 2182 0.00000000000000e+00
+2244 2173 0.00000000000000e+00
+2244 2411 0.00000000000000e+00
+2244 1946 0.00000000000000e+00
+2244 2410 0.00000000000000e+00
+2244 1945 0.00000000000000e+00
+2244 2181 0.00000000000000e+00
+2244 2174 0.00000000000000e+00
+2244 1916 0.00000000000000e+00
+2244 2248 0.00000000000000e+00
+2244 2245 0.00000000000000e+00
+2244 1915 0.00000000000000e+00
+2244 2247 0.00000000000000e+00
+2244 2414 0.00000000000000e+00
+2244 2108 0.00000000000000e+00
+2244 2107 0.00000000000000e+00
+2244 2413 0.00000000000000e+00
+2244 1944 0.00000000000000e+00
+2244 2105 0.00000000000000e+00
+2244 2258 0.00000000000000e+00
+2244 2104 0.00000000000000e+00
+2244 2257 0.00000000000000e+00
+2244 2103 0.00000000000000e+00
+2244 2183 0.00000000000000e+00
+2244 1914 0.00000000000000e+00
+2245 2245 1.00000000000000e+00
+2245 2249 0.00000000000000e+00
+2245 2181 0.00000000000000e+00
+2245 2172 0.00000000000000e+00
+2245 2183 0.00000000000000e+00
+2245 2182 0.00000000000000e+00
+2245 2409 0.00000000000000e+00
+2245 1944 0.00000000000000e+00
+2245 2174 0.00000000000000e+00
+2245 2248 0.00000000000000e+00
+2245 2247 0.00000000000000e+00
+2245 2244 0.00000000000000e+00
+2245 1914 0.00000000000000e+00
+2245 2414 0.00000000000000e+00
+2245 2258 0.00000000000000e+00
+2245 2108 0.00000000000000e+00
+2245 1946 0.00000000000000e+00
+2245 1945 0.00000000000000e+00
+2245 2106 0.00000000000000e+00
+2245 2412 0.00000000000000e+00
+2245 2105 0.00000000000000e+00
+2245 2246 0.00000000000000e+00
+2245 1916 0.00000000000000e+00
+2245 2104 0.00000000000000e+00
+2245 2411 0.00000000000000e+00
+2245 1915 0.00000000000000e+00
+2245 2103 0.00000000000000e+00
+2245 2256 0.00000000000000e+00
+2246 2246 1.00000000000000e+00
+2246 2248 0.00000000000000e+00
+2246 2181 0.00000000000000e+00
+2246 2244 0.00000000000000e+00
+2246 2247 0.00000000000000e+00
+2246 2183 0.00000000000000e+00
+2246 2182 0.00000000000000e+00
+2246 2409 0.00000000000000e+00
+2246 1944 0.00000000000000e+00
+2246 2249 0.00000000000000e+00
+2246 2173 0.00000000000000e+00
+2246 2172 0.00000000000000e+00
+2246 1914 0.00000000000000e+00
+2246 2412 0.00000000000000e+00
+2246 2106 0.00000000000000e+00
+2246 2413 0.00000000000000e+00
+2246 2257 0.00000000000000e+00
+2246 1946 0.00000000000000e+00
+2246 2107 0.00000000000000e+00
+2246 1945 0.00000000000000e+00
+2246 2105 0.00000000000000e+00
+2246 2410 0.00000000000000e+00
+2246 1916 0.00000000000000e+00
+2246 2104 0.00000000000000e+00
+2246 2245 0.00000000000000e+00
+2246 1915 0.00000000000000e+00
+2246 2103 0.00000000000000e+00
+2246 2256 0.00000000000000e+00
+2247 2247 1.25000000000000e+02
+2247 2275 4.16666666666667e+00
+2247 2419 -4.16666666666667e+00
+2247 2414 4.16666666666667e+00
+2247 2420 -4.16666666666667e+00
+2247 2413 4.16666666666667e+00
+2247 2257 -4.16666666666667e+00
+2247 2258 8.33333333333333e+00
+2247 2256 -1.25000000000000e+01
+2247 2183 0.00000000000000e+00
+2247 2246 0.00000000000000e+00
+2247 2182 0.00000000000000e+00
+2247 1949 4.16666666666667e+00
+2247 2411 -4.16666666666667e+00
+2247 2410 8.33333333333333e+00
+2247 2409 -1.25000000000000e+01
+2247 1916 0.00000000000000e+00
+2247 2245 0.00000000000000e+00
+2247 2244 0.00000000000000e+00
+2247 2243 -4.16666666666667e+00
+2247 2248 -1.66666666666667e+01
+2247 2185 -4.16666666666667e+00
+2247 2177 4.16666666666667e+00
+2247 2174 0.00000000000000e+00
+2247 2176 4.16666666666667e+00
+2247 2173 0.00000000000000e+00
+2247 2186 8.33333333333333e+00
+2247 2264 8.33333333333333e+00
+2247 2249 -1.66666666666667e+01
+2247 1948 -8.33333333333333e+00
+2247 2263 8.33333333333333e+00
+2247 2184 -1.25000000000000e+01
+2247 2262 -3.75000000000000e+01
+2247 2242 8.33333333333333e+00
+2247 1915 0.00000000000000e+00
+2247 2276 -8.33333333333333e+00
+2247 2241 -1.25000000000000e+01
+2248 2248 1.25000000000000e+02
+2248 2274 4.16666666666667e+00
+2248 2418 -4.16666666666667e+00
+2248 2414 -8.33333333333333e+00
+2248 2258 8.33333333333333e+00
+2248 2412 4.16666666666667e+00
+2248 2256 -4.16666666666667e+00
+2248 2420 -4.16666666666667e+00
+2248 2257 -1.25000000000000e+01
+2248 2183 0.00000000000000e+00
+2248 2246 0.00000000000000e+00
+2248 2181 0.00000000000000e+00
+2248 2411 8.33333333333333e+00
+2248 2249 -1.66666666666667e+01
+2248 2410 -3.75000000000000e+01
+2248 2409 8.33333333333333e+00
+2248 2245 0.00000000000000e+00
+2248 2244 0.00000000000000e+00
+2248 2247 -1.66666666666667e+01
+2248 2184 -4.16666666666667e+00
+2248 2186 8.33333333333333e+00
+2248 2177 -8.33333333333333e+00
+2248 2243 8.33333333333333e+00
+2248 2175 4.16666666666667e+00
+2248 2172 0.00000000000000e+00
+2248 1949 4.16666666666667e+00
+2248 2264 -4.16666666666667e+00
+2248 2185 -1.25000000000000e+01
+2248 2263 -1.25000000000000e+01
+2248 1947 -8.33333333333333e+00
+2248 2262 8.33333333333333e+00
+2248 2174 0.00000000000000e+00
+2248 1916 0.00000000000000e+00
+2248 2276 4.16666666666667e+00
+2248 2242 -3.75000000000000e+01
+2248 2241 8.33333333333333e+00
+2248 1914 0.00000000000000e+00
+2249 2249 1.25000000000000e+02
+2249 2274 -8.33333333333333e+00
+2249 2412 4.16666666666667e+00
+2249 2418 -4.16666666666667e+00
+2249 2413 -8.33333333333333e+00
+2249 2257 8.33333333333333e+00
+2249 2419 -4.16666666666667e+00
+2249 2258 -3.75000000000000e+01
+2249 2256 8.33333333333333e+00
+2249 2182 0.00000000000000e+00
+2249 2245 0.00000000000000e+00
+2249 2181 0.00000000000000e+00
+2249 2244 0.00000000000000e+00
+2249 2411 -1.25000000000000e+01
+2249 2410 8.33333333333333e+00
+2249 2248 -1.66666666666667e+01
+2249 1947 4.16666666666667e+00
+2249 2409 -4.16666666666667e+00
+2249 2246 0.00000000000000e+00
+2249 1914 0.00000000000000e+00
+2249 2241 -4.16666666666667e+00
+2249 2185 8.33333333333333e+00
+2249 2175 4.16666666666667e+00
+2249 2172 0.00000000000000e+00
+2249 2176 -8.33333333333333e+00
+2249 2242 8.33333333333333e+00
+2249 2186 -3.75000000000000e+01
+2249 2264 -1.25000000000000e+01
+2249 1948 4.16666666666667e+00
+2249 2263 -4.16666666666667e+00
+2249 2184 8.33333333333333e+00
+2249 2262 8.33333333333333e+00
+2249 2247 -1.66666666666667e+01
+2249 2275 4.16666666666667e+00
+2249 2243 -1.25000000000000e+01
+2249 2173 0.00000000000000e+00
+2249 1915 0.00000000000000e+00
+2250 2250 1.00000000000000e+00
+2250 2210 0.00000000000000e+00
+2250 2251 0.00000000000000e+00
+2250 2218 0.00000000000000e+00
+2250 2209 0.00000000000000e+00
+2250 1915 0.00000000000000e+00
+2250 1963 0.00000000000000e+00
+2250 2217 0.00000000000000e+00
+2250 2446 0.00000000000000e+00
+2250 1964 0.00000000000000e+00
+2250 2447 0.00000000000000e+00
+2250 2252 0.00000000000000e+00
+2250 1916 0.00000000000000e+00
+2250 2255 0.00000000000000e+00
+2250 2254 0.00000000000000e+00
+2250 2253 0.00000000000000e+00
+2250 2110 0.00000000000000e+00
+2250 2449 0.00000000000000e+00
+2250 2111 0.00000000000000e+00
+2250 2450 0.00000000000000e+00
+2250 1962 0.00000000000000e+00
+2250 2105 0.00000000000000e+00
+2250 2258 0.00000000000000e+00
+2250 2104 0.00000000000000e+00
+2250 2257 0.00000000000000e+00
+2250 2103 0.00000000000000e+00
+2250 2219 0.00000000000000e+00
+2250 1914 0.00000000000000e+00
+2251 2251 1.00000000000000e+00
+2251 2217 0.00000000000000e+00
+2251 2210 0.00000000000000e+00
+2251 2208 0.00000000000000e+00
+2251 1914 0.00000000000000e+00
+2251 2219 0.00000000000000e+00
+2251 2218 0.00000000000000e+00
+2251 1962 0.00000000000000e+00
+2251 2445 0.00000000000000e+00
+2251 2447 0.00000000000000e+00
+2251 2255 0.00000000000000e+00
+2251 2254 0.00000000000000e+00
+2251 2253 0.00000000000000e+00
+2251 2258 0.00000000000000e+00
+2251 2450 0.00000000000000e+00
+2251 2109 0.00000000000000e+00
+2251 2448 0.00000000000000e+00
+2251 2111 0.00000000000000e+00
+2251 1964 0.00000000000000e+00
+2251 1963 0.00000000000000e+00
+2251 2105 0.00000000000000e+00
+2251 2252 0.00000000000000e+00
+2251 1916 0.00000000000000e+00
+2251 2104 0.00000000000000e+00
+2251 2250 0.00000000000000e+00
+2251 1915 0.00000000000000e+00
+2251 2103 0.00000000000000e+00
+2251 2256 0.00000000000000e+00
+2252 2252 1.00000000000000e+00
+2252 2208 0.00000000000000e+00
+2252 2209 0.00000000000000e+00
+2252 2219 0.00000000000000e+00
+2252 2218 0.00000000000000e+00
+2252 2446 0.00000000000000e+00
+2252 1962 0.00000000000000e+00
+2252 2445 0.00000000000000e+00
+2252 2255 0.00000000000000e+00
+2252 2254 0.00000000000000e+00
+2252 2250 0.00000000000000e+00
+2252 1914 0.00000000000000e+00
+2252 2253 0.00000000000000e+00
+2252 2257 0.00000000000000e+00
+2252 2449 0.00000000000000e+00
+2252 1964 0.00000000000000e+00
+2252 2110 0.00000000000000e+00
+2252 1963 0.00000000000000e+00
+2252 2109 0.00000000000000e+00
+2252 2448 0.00000000000000e+00
+2252 2105 0.00000000000000e+00
+2252 2217 0.00000000000000e+00
+2252 1916 0.00000000000000e+00
+2252 2104 0.00000000000000e+00
+2252 2251 0.00000000000000e+00
+2252 1915 0.00000000000000e+00
+2252 2103 0.00000000000000e+00
+2252 2256 0.00000000000000e+00
+2253 2253 1.25000000000000e+02
+2253 2213 4.16666666666667e+00
+2253 2210 0.00000000000000e+00
+2253 2222 -4.16666666666667e+00
+2253 2219 0.00000000000000e+00
+2253 2221 8.33333333333333e+00
+2253 2218 0.00000000000000e+00
+2253 2209 0.00000000000000e+00
+2253 2220 -1.25000000000000e+01
+2253 2449 4.16666666666667e+00
+2253 2446 -4.16666666666667e+00
+2253 2450 4.16666666666667e+00
+2253 2252 0.00000000000000e+00
+2253 2251 0.00000000000000e+00
+2253 2254 -1.66666666666667e+01
+2253 2250 0.00000000000000e+00
+2253 2447 8.33333333333333e+00
+2253 2445 -1.25000000000000e+01
+2253 2255 -1.66666666666667e+01
+2253 2258 -4.16666666666667e+00
+2253 2257 8.33333333333333e+00
+2253 2456 -4.16666666666667e+00
+2253 2276 4.16666666666667e+00
+2253 2275 -8.33333333333333e+00
+2253 2269 8.33333333333333e+00
+2253 1916 0.00000000000000e+00
+2253 2243 8.33333333333333e+00
+2253 1915 0.00000000000000e+00
+2253 2242 -4.16666666666667e+00
+2253 2256 -1.25000000000000e+01
+2253 2241 -1.25000000000000e+01
+2253 2270 8.33333333333333e+00
+2253 1967 -8.33333333333333e+00
+2253 2455 -4.16666666666667e+00
+2253 1966 4.16666666666667e+00
+2253 2212 4.16666666666667e+00
+2253 2268 -3.75000000000000e+01
+2254 2254 1.25000000000000e+02
+2254 2213 -8.33333333333333e+00
+2254 2210 0.00000000000000e+00
+2254 2219 0.00000000000000e+00
+2254 2220 8.33333333333333e+00
+2254 2217 0.00000000000000e+00
+2254 2208 0.00000000000000e+00
+2254 2222 8.33333333333333e+00
+2254 2221 -3.75000000000000e+01
+2254 2448 4.16666666666667e+00
+2254 2445 -4.16666666666667e+00
+2254 2447 8.33333333333333e+00
+2254 2450 -8.33333333333333e+00
+2254 2252 0.00000000000000e+00
+2254 1916 0.00000000000000e+00
+2254 2251 0.00000000000000e+00
+2254 2250 0.00000000000000e+00
+2254 2253 -1.66666666666667e+01
+2254 1967 4.16666666666667e+00
+2254 2446 -1.25000000000000e+01
+2254 2270 -4.16666666666667e+00
+2254 2276 4.16666666666667e+00
+2254 2456 -4.16666666666667e+00
+2254 2256 8.33333333333333e+00
+2254 2274 -8.33333333333333e+00
+2254 2268 8.33333333333333e+00
+2254 2258 8.33333333333333e+00
+2254 2243 8.33333333333333e+00
+2254 2255 -1.66666666666667e+01
+2254 2257 -3.75000000000000e+01
+2254 2242 -1.25000000000000e+01
+2254 1914 0.00000000000000e+00
+2254 2241 -4.16666666666667e+00
+2254 2211 4.16666666666667e+00
+2254 2269 -1.25000000000000e+01
+2254 2454 -4.16666666666667e+00
+2254 1965 4.16666666666667e+00
+2255 2255 1.25000000000000e+02
+2255 2211 4.16666666666667e+00
+2255 2208 0.00000000000000e+00
+2255 2209 0.00000000000000e+00
+2255 2218 0.00000000000000e+00
+2255 2220 -4.16666666666667e+00
+2255 2217 0.00000000000000e+00
+2255 2222 -1.25000000000000e+01
+2255 2221 8.33333333333333e+00
+2255 2446 8.33333333333333e+00
+2255 2449 -8.33333333333333e+00
+2255 2448 4.16666666666667e+00
+2255 2252 0.00000000000000e+00
+2255 2251 0.00000000000000e+00
+2255 1915 0.00000000000000e+00
+2255 2250 0.00000000000000e+00
+2255 2447 -3.75000000000000e+01
+2255 1966 4.16666666666667e+00
+2255 2445 8.33333333333333e+00
+2255 2269 -4.16666666666667e+00
+2255 2253 -1.66666666666667e+01
+2255 2256 -4.16666666666667e+00
+2255 2275 4.16666666666667e+00
+2255 2455 -4.16666666666667e+00
+2255 2454 -4.16666666666667e+00
+2255 2274 4.16666666666667e+00
+2255 2258 -1.25000000000000e+01
+2255 2243 -3.75000000000000e+01
+2255 2257 8.33333333333333e+00
+2255 2242 8.33333333333333e+00
+2255 2254 -1.66666666666667e+01
+2255 1914 0.00000000000000e+00
+2255 2241 8.33333333333333e+00
+2255 2212 -8.33333333333333e+00
+2255 2270 -1.25000000000000e+01
+2255 2268 8.33333333333333e+00
+2255 1965 -8.33333333333333e+00
+2256 2256 1.25000000000000e+02
+2256 2248 -4.16666666666667e+00
+2256 2419 -8.33333333333333e+00
+2256 2249 8.33333333333333e+00
+2256 2247 -1.25000000000000e+01
+2256 2414 -4.16666666666667e+00
+2256 2413 8.33333333333333e+00
+2256 2412 -1.25000000000000e+01
+2256 2246 0.00000000000000e+00
+2256 2245 0.00000000000000e+00
+2256 2243 4.16666666666667e+00
+2256 2255 -4.16666666666667e+00
+2256 2257 -1.66666666666667e+01
+2256 2275 8.33333333333333e+00
+2256 2254 8.33333333333333e+00
+2256 2276 8.33333333333333e+00
+2256 2456 -8.33333333333333e+00
+2256 1978 -4.16666666666667e+00
+2256 2455 4.16666666666667e+00
+2256 2274 -3.75000000000000e+01
+2256 1915 0.00000000000000e+00
+2256 2242 4.16666666666667e+00
+2256 2253 -1.25000000000000e+01
+2256 2105 0.00000000000000e+00
+2256 2258 -1.66666666666667e+01
+2256 2450 8.33333333333333e+00
+2256 2113 4.16666666666667e+00
+2256 2449 -4.16666666666667e+00
+2256 2252 0.00000000000000e+00
+2256 1916 0.00000000000000e+00
+2256 2104 0.00000000000000e+00
+2256 2251 0.00000000000000e+00
+2256 2103 0.00000000000000e+00
+2256 2114 4.16666666666667e+00
+2256 1979 -4.16666666666667e+00
+2256 2448 -1.25000000000000e+01
+2256 2420 4.16666666666667e+00
+2257 2257 1.25000000000000e+02
+2257 2247 -4.16666666666667e+00
+2257 2420 4.16666666666667e+00
+2257 2418 -8.33333333333333e+00
+2257 2248 -1.25000000000000e+01
+2257 2246 0.00000000000000e+00
+2257 2412 8.33333333333333e+00
+2257 2414 8.33333333333333e+00
+2257 2413 -3.75000000000000e+01
+2257 2244 0.00000000000000e+00
+2257 2258 -1.66666666666667e+01
+2257 1916 0.00000000000000e+00
+2257 1979 -4.16666666666667e+00
+2257 2276 -4.16666666666667e+00
+2257 2456 4.16666666666667e+00
+2257 2256 -1.66666666666667e+01
+2257 2274 8.33333333333333e+00
+2257 2253 8.33333333333333e+00
+2257 2275 -1.25000000000000e+01
+2257 1977 -4.16666666666667e+00
+2257 2454 4.16666666666667e+00
+2257 2243 -8.33333333333333e+00
+2257 2255 8.33333333333333e+00
+2257 2254 -3.75000000000000e+01
+2257 1914 0.00000000000000e+00
+2257 2241 4.16666666666667e+00
+2257 2105 0.00000000000000e+00
+2257 2252 0.00000000000000e+00
+2257 2112 4.16666666666667e+00
+2257 2448 -4.16666666666667e+00
+2257 2104 0.00000000000000e+00
+2257 2103 0.00000000000000e+00
+2257 2250 0.00000000000000e+00
+2257 2114 -8.33333333333333e+00
+2257 2450 8.33333333333333e+00
+2257 2449 -1.25000000000000e+01
+2257 2249 8.33333333333333e+00
+2258 2258 1.25000000000000e+02
+2258 2248 8.33333333333333e+00
+2258 2419 4.16666666666667e+00
+2258 2249 -3.75000000000000e+01
+2258 2247 8.33333333333333e+00
+2258 2412 -4.16666666666667e+00
+2258 2245 0.00000000000000e+00
+2258 2414 -1.25000000000000e+01
+2258 2413 8.33333333333333e+00
+2258 2244 0.00000000000000e+00
+2258 2257 -1.66666666666667e+01
+2258 1915 0.00000000000000e+00
+2258 1978 -4.16666666666667e+00
+2258 2241 4.16666666666667e+00
+2258 2253 -4.16666666666667e+00
+2258 2275 -4.16666666666667e+00
+2258 2455 4.16666666666667e+00
+2258 2276 -1.25000000000000e+01
+2258 2274 8.33333333333333e+00
+2258 2454 -8.33333333333333e+00
+2258 2255 -1.25000000000000e+01
+2258 2242 -8.33333333333333e+00
+2258 2254 8.33333333333333e+00
+2258 2104 0.00000000000000e+00
+2258 2251 0.00000000000000e+00
+2258 2103 0.00000000000000e+00
+2258 2256 -1.66666666666667e+01
+2258 2448 8.33333333333333e+00
+2258 2105 0.00000000000000e+00
+2258 2250 0.00000000000000e+00
+2258 1914 0.00000000000000e+00
+2258 2450 -3.75000000000000e+01
+2258 2418 4.16666666666667e+00
+2258 2113 -8.33333333333333e+00
+2258 2449 8.33333333333333e+00
+2258 2112 4.16666666666667e+00
+2258 1977 -4.16666666666667e+00
+2259 2259 1.25000000000000e+02
+2259 2194 -4.16666666666667e+00
+2259 2189 -8.33333333333333e+00
+2259 2195 8.33333333333333e+00
+2259 2193 -1.25000000000000e+01
+2259 2372 4.16666666666667e+00
+2259 2371 -8.33333333333333e+00
+2259 2267 -4.16666666666667e+00
+2259 2266 8.33333333333333e+00
+2259 2265 -1.25000000000000e+01
+2259 2158 -4.16666666666667e+00
+2259 2167 4.16666666666667e+00
+2259 2168 4.16666666666667e+00
+2259 2231 -4.16666666666667e+00
+2259 1936 8.33333333333333e+00
+2259 2260 -1.66666666666667e+01
+2259 2230 8.33333333333333e+00
+2259 2229 -1.25000000000000e+01
+2259 2159 -4.16666666666667e+00
+2259 2225 4.16666666666667e+00
+2259 1918 8.33333333333333e+00
+2259 2224 -8.33333333333333e+00
+2259 2120 -4.16666666666667e+00
+2259 2117 4.16666666666667e+00
+2259 1937 8.33333333333333e+00
+2259 2378 -8.33333333333333e+00
+2259 2377 4.16666666666667e+00
+2259 2119 -4.16666666666667e+00
+2259 1935 -3.75000000000000e+01
+2259 2261 -1.66666666666667e+01
+2259 2273 8.33333333333333e+00
+2259 1919 8.33333333333333e+00
+2259 2272 -4.16666666666667e+00
+2259 2116 4.16666666666667e+00
+2259 2188 4.16666666666667e+00
+2259 2271 -1.25000000000000e+01
+2259 1917 -3.75000000000000e+01
+2260 2260 1.25000000000000e+02
+2260 2193 -4.16666666666667e+00
+2260 2195 8.33333333333333e+00
+2260 2189 4.16666666666667e+00
+2260 2194 -1.25000000000000e+01
+2260 2372 4.16666666666667e+00
+2260 2370 -8.33333333333333e+00
+2260 2267 8.33333333333333e+00
+2260 2266 -3.75000000000000e+01
+2260 2265 8.33333333333333e+00
+2260 2261 -1.66666666666667e+01
+2260 1919 -4.16666666666667e+00
+2260 1937 -4.16666666666667e+00
+2260 2225 4.16666666666667e+00
+2260 2159 -4.16666666666667e+00
+2260 2157 -4.16666666666667e+00
+2260 2166 4.16666666666667e+00
+2260 2168 -8.33333333333333e+00
+2260 2231 8.33333333333333e+00
+2260 2230 -3.75000000000000e+01
+2260 1935 8.33333333333333e+00
+2260 2259 -1.66666666666667e+01
+2260 2229 8.33333333333333e+00
+2260 1917 8.33333333333333e+00
+2260 2223 -8.33333333333333e+00
+2260 2378 4.16666666666667e+00
+2260 2120 -4.16666666666667e+00
+2260 1936 -1.25000000000000e+01
+2260 2376 4.16666666666667e+00
+2260 2118 -4.16666666666667e+00
+2260 2273 8.33333333333333e+00
+2260 2117 -8.33333333333333e+00
+2260 2187 4.16666666666667e+00
+2260 2272 -1.25000000000000e+01
+2260 1918 -1.25000000000000e+01
+2260 2271 -4.16666666666667e+00
+2260 2115 4.16666666666667e+00
+2261 2261 1.25000000000000e+02
+2261 2188 4.16666666666667e+00
+2261 2187 -8.33333333333333e+00
+2261 2195 -3.75000000000000e+01
+2261 2193 8.33333333333333e+00
+2261 2371 4.16666666666667e+00
+2261 2370 4.16666666666667e+00
+2261 2267 -1.25000000000000e+01
+2261 2266 8.33333333333333e+00
+2261 2265 -4.16666666666667e+00
+2261 2260 -1.66666666666667e+01
+2261 1918 -4.16666666666667e+00
+2261 1936 -4.16666666666667e+00
+2261 2224 4.16666666666667e+00
+2261 2158 -4.16666666666667e+00
+2261 2231 -1.25000000000000e+01
+2261 2167 -8.33333333333333e+00
+2261 2230 8.33333333333333e+00
+2261 2166 4.16666666666667e+00
+2261 2229 -4.16666666666667e+00
+2261 2157 -4.16666666666667e+00
+2261 2223 4.16666666666667e+00
+2261 2377 4.16666666666667e+00
+2261 2119 -4.16666666666667e+00
+2261 2118 -4.16666666666667e+00
+2261 2115 4.16666666666667e+00
+2261 1937 -1.25000000000000e+01
+2261 1935 8.33333333333333e+00
+2261 2376 -8.33333333333333e+00
+2261 2194 8.33333333333333e+00
+2261 2273 -3.75000000000000e+01
+2261 1919 -1.25000000000000e+01
+2261 2272 8.33333333333333e+00
+2261 2116 -8.33333333333333e+00
+2261 2259 -1.66666666666667e+01
+2261 2271 8.33333333333333e+00
+2261 1917 8.33333333333333e+00
+2262 2262 1.25000000000000e+02
+2262 2200 -4.16666666666667e+00
+2262 2201 8.33333333333333e+00
+2262 2189 4.16666666666667e+00
+2262 2199 -1.25000000000000e+01
+2262 2417 4.16666666666667e+00
+2262 2416 -8.33333333333333e+00
+2262 2267 8.33333333333333e+00
+2262 2266 8.33333333333333e+00
+2262 2265 -3.75000000000000e+01
+2262 2264 -1.66666666666667e+01
+2262 1949 -4.16666666666667e+00
+2262 1919 -4.16666666666667e+00
+2262 2177 -4.16666666666667e+00
+2262 2243 4.16666666666667e+00
+2262 2176 -4.16666666666667e+00
+2262 2185 4.16666666666667e+00
+2262 2186 -8.33333333333333e+00
+2262 2249 8.33333333333333e+00
+2262 1948 8.33333333333333e+00
+2262 2263 -1.66666666666667e+01
+2262 2248 8.33333333333333e+00
+2262 2247 -3.75000000000000e+01
+2262 1918 8.33333333333333e+00
+2262 2242 -8.33333333333333e+00
+2262 2123 -4.16666666666667e+00
+2262 2420 4.16666666666667e+00
+2262 2419 4.16666666666667e+00
+2262 2122 -4.16666666666667e+00
+2262 1947 -1.25000000000000e+01
+2262 2276 8.33333333333333e+00
+2262 2117 -8.33333333333333e+00
+2262 2275 -4.16666666666667e+00
+2262 2116 4.16666666666667e+00
+2262 2274 -1.25000000000000e+01
+2262 2188 4.16666666666667e+00
+2262 1917 -1.25000000000000e+01
+2263 2263 1.25000000000000e+02
+2263 2199 -4.16666666666667e+00
+2263 2189 -8.33333333333333e+00
+2263 2201 8.33333333333333e+00
+2263 2200 -1.25000000000000e+01
+2263 2417 4.16666666666667e+00
+2263 2415 -8.33333333333333e+00
+2263 2267 -4.16666666666667e+00
+2263 2266 -1.25000000000000e+01
+2263 2265 8.33333333333333e+00
+2263 2175 -4.16666666666667e+00
+2263 2184 4.16666666666667e+00
+2263 2186 4.16666666666667e+00
+2263 2249 -4.16666666666667e+00
+2263 2248 -1.25000000000000e+01
+2263 1947 8.33333333333333e+00
+2263 2262 -1.66666666666667e+01
+2263 2247 8.33333333333333e+00
+2263 2177 -4.16666666666667e+00
+2263 2243 4.16666666666667e+00
+2263 1917 8.33333333333333e+00
+2263 2241 -8.33333333333333e+00
+2263 2123 -4.16666666666667e+00
+2263 2117 4.16666666666667e+00
+2263 2420 -8.33333333333333e+00
+2263 1949 8.33333333333333e+00
+2263 1948 -3.75000000000000e+01
+2263 2418 4.16666666666667e+00
+2263 2121 -4.16666666666667e+00
+2263 2276 8.33333333333333e+00
+2263 2264 -1.66666666666667e+01
+2263 1919 8.33333333333333e+00
+2263 2275 -1.25000000000000e+01
+2263 2187 4.16666666666667e+00
+2263 1918 -3.75000000000000e+01
+2263 2274 -4.16666666666667e+00
+2263 2115 4.16666666666667e+00
+2264 2264 1.25000000000000e+02
+2264 2188 -8.33333333333333e+00
+2264 2187 4.16666666666667e+00
+2264 2201 -3.75000000000000e+01
+2264 2200 8.33333333333333e+00
+2264 2415 4.16666666666667e+00
+2264 2416 4.16666666666667e+00
+2264 2267 -1.25000000000000e+01
+2264 2266 -4.16666666666667e+00
+2264 2265 8.33333333333333e+00
+2264 2262 -1.66666666666667e+01
+2264 1947 -4.16666666666667e+00
+2264 1917 -4.16666666666667e+00
+2264 2175 -4.16666666666667e+00
+2264 2241 4.16666666666667e+00
+2264 2249 -1.25000000000000e+01
+2264 2185 4.16666666666667e+00
+2264 2248 -4.16666666666667e+00
+2264 2184 -8.33333333333333e+00
+2264 2247 8.33333333333333e+00
+2264 2176 -4.16666666666667e+00
+2264 2242 4.16666666666667e+00
+2264 2121 -4.16666666666667e+00
+2264 2418 4.16666666666667e+00
+2264 2122 -4.16666666666667e+00
+2264 2116 4.16666666666667e+00
+2264 1949 -1.25000000000000e+01
+2264 2419 -8.33333333333333e+00
+2264 1948 8.33333333333333e+00
+2264 2276 -3.75000000000000e+01
+2264 2199 8.33333333333333e+00
+2264 1919 -1.25000000000000e+01
+2264 2275 8.33333333333333e+00
+2264 2263 -1.66666666666667e+01
+2264 1918 8.33333333333333e+00
+2264 2274 8.33333333333333e+00
+2264 2115 -8.33333333333333e+00
+2265 2265 1.25000000000000e+02
+2265 2201 -8.33333333333333e+00
+2265 2417 -4.16666666666667e+00
+2265 2122 4.16666666666667e+00
+2265 2123 4.16666666666667e+00
+2265 2416 8.33333333333333e+00
+2265 2415 -1.25000000000000e+01
+2265 2264 8.33333333333333e+00
+2265 2263 8.33333333333333e+00
+2265 2262 -3.75000000000000e+01
+2265 2188 -4.16666666666667e+00
+2265 2189 -4.16666666666667e+00
+2265 2203 -4.16666666666667e+00
+2265 2194 4.16666666666667e+00
+2265 2195 4.16666666666667e+00
+2265 2204 8.33333333333333e+00
+2265 2267 -1.66666666666667e+01
+2265 2202 -1.25000000000000e+01
+2265 2116 -4.16666666666667e+00
+2265 2266 -1.66666666666667e+01
+2265 2372 8.33333333333333e+00
+2265 2125 -4.16666666666667e+00
+2265 2119 4.16666666666667e+00
+2265 2117 8.33333333333333e+00
+2265 2120 -8.33333333333333e+00
+2265 1955 4.16666666666667e+00
+2265 2126 -4.16666666666667e+00
+2265 2371 8.33333333333333e+00
+2265 1954 -8.33333333333333e+00
+2265 2370 -3.75000000000000e+01
+2265 2261 -4.16666666666667e+00
+2265 1919 4.16666666666667e+00
+2265 2260 8.33333333333333e+00
+2265 1918 -8.33333333333333e+00
+2265 2259 -1.25000000000000e+01
+2265 2200 4.16666666666667e+00
+2265 2115 -1.25000000000000e+01
+2266 2266 1.25000000000000e+02
+2266 2201 4.16666666666667e+00
+2266 2417 8.33333333333333e+00
+2266 2121 4.16666666666667e+00
+2266 2123 -8.33333333333333e+00
+2266 2416 -3.75000000000000e+01
+2266 2415 8.33333333333333e+00
+2266 2264 -4.16666666666667e+00
+2266 2263 -1.25000000000000e+01
+2266 2262 8.33333333333333e+00
+2266 2187 -4.16666666666667e+00
+2266 2204 8.33333333333333e+00
+2266 2202 -4.16666666666667e+00
+2266 2193 4.16666666666667e+00
+2266 2195 -8.33333333333333e+00
+2266 1955 4.16666666666667e+00
+2266 2203 -1.25000000000000e+01
+2266 2189 -4.16666666666667e+00
+2266 1919 4.16666666666667e+00
+2266 2115 -4.16666666666667e+00
+2266 2372 -4.16666666666667e+00
+2266 2265 -1.66666666666667e+01
+2266 2124 -4.16666666666667e+00
+2266 2118 4.16666666666667e+00
+2266 2126 -4.16666666666667e+00
+2266 2120 4.16666666666667e+00
+2266 2371 -1.25000000000000e+01
+2266 2370 8.33333333333333e+00
+2266 1953 -8.33333333333333e+00
+2266 2261 8.33333333333333e+00
+2266 2267 -1.66666666666667e+01
+2266 2117 8.33333333333333e+00
+2266 2260 -3.75000000000000e+01
+2266 2199 4.16666666666667e+00
+2266 2116 -1.25000000000000e+01
+2266 2259 8.33333333333333e+00
+2266 1917 -8.33333333333333e+00
+2267 2267 1.25000000000000e+02
+2267 2199 -8.33333333333333e+00
+2267 2415 -4.16666666666667e+00
+2267 2416 8.33333333333333e+00
+2267 2122 -8.33333333333333e+00
+2267 2121 4.16666666666667e+00
+2267 2417 -1.25000000000000e+01
+2267 2264 -1.25000000000000e+01
+2267 2263 -4.16666666666667e+00
+2267 2262 8.33333333333333e+00
+2267 2187 -4.16666666666667e+00
+2267 2203 8.33333333333333e+00
+2267 2194 -8.33333333333333e+00
+2267 2193 4.16666666666667e+00
+2267 2204 -3.75000000000000e+01
+2267 1954 4.16666666666667e+00
+2267 2202 8.33333333333333e+00
+2267 2265 -1.66666666666667e+01
+2267 2188 -4.16666666666667e+00
+2267 1918 4.16666666666667e+00
+2267 2371 -4.16666666666667e+00
+2267 2370 8.33333333333333e+00
+2267 2125 -4.16666666666667e+00
+2267 2119 4.16666666666667e+00
+2267 2115 8.33333333333333e+00
+2267 2118 -8.33333333333333e+00
+2267 2372 -1.25000000000000e+01
+2267 1953 4.16666666666667e+00
+2267 2124 -4.16666666666667e+00
+2267 2261 -1.25000000000000e+01
+2267 2200 4.16666666666667e+00
+2267 2117 -3.75000000000000e+01
+2267 2260 8.33333333333333e+00
+2267 2266 -1.66666666666667e+01
+2267 2116 8.33333333333333e+00
+2267 2259 -4.16666666666667e+00
+2267 1917 4.16666666666667e+00
+2268 2268 1.25000000000000e+02
+2268 2243 -8.33333333333333e+00
+2268 2242 4.16666666666667e+00
+2268 2255 8.33333333333333e+00
+2268 2253 -3.75000000000000e+01
+2268 2455 4.16666666666667e+00
+2268 2456 4.16666666666667e+00
+2268 2276 -4.16666666666667e+00
+2268 2275 8.33333333333333e+00
+2268 2274 -1.25000000000000e+01
+2268 2212 -4.16666666666667e+00
+2268 2213 -4.16666666666667e+00
+2268 2222 4.16666666666667e+00
+2268 2221 -8.33333333333333e+00
+2268 2225 4.16666666666667e+00
+2268 2237 -4.16666666666667e+00
+2268 2269 -1.66666666666667e+01
+2268 2236 8.33333333333333e+00
+2268 2224 4.16666666666667e+00
+2268 1918 -4.16666666666667e+00
+2268 1966 -4.16666666666667e+00
+2268 2235 -1.25000000000000e+01
+2268 2117 4.16666666666667e+00
+2268 2129 -4.16666666666667e+00
+2268 2452 4.16666666666667e+00
+2268 2128 -4.16666666666667e+00
+2268 1967 8.33333333333333e+00
+2268 2453 -8.33333333333333e+00
+2268 1965 -1.25000000000000e+01
+2268 2270 -1.66666666666667e+01
+2268 2273 8.33333333333333e+00
+2268 1919 8.33333333333333e+00
+2268 2272 8.33333333333333e+00
+2268 2116 -8.33333333333333e+00
+2268 2254 8.33333333333333e+00
+2268 2271 -3.75000000000000e+01
+2268 1917 -1.25000000000000e+01
+2269 2269 1.25000000000000e+02
+2269 2255 -4.16666666666667e+00
+2269 2253 8.33333333333333e+00
+2269 2241 4.16666666666667e+00
+2269 2254 -1.25000000000000e+01
+2269 2454 4.16666666666667e+00
+2269 2456 -8.33333333333333e+00
+2269 2276 8.33333333333333e+00
+2269 2275 -3.75000000000000e+01
+2269 2274 8.33333333333333e+00
+2269 2211 -4.16666666666667e+00
+2269 2213 -4.16666666666667e+00
+2269 2222 4.16666666666667e+00
+2269 2220 -8.33333333333333e+00
+2269 2268 -1.66666666666667e+01
+2269 2235 8.33333333333333e+00
+2269 2225 -8.33333333333333e+00
+2269 1919 8.33333333333333e+00
+2269 2223 4.16666666666667e+00
+2269 1917 -4.16666666666667e+00
+2269 2237 8.33333333333333e+00
+2269 2270 -1.66666666666667e+01
+2269 1967 8.33333333333333e+00
+2269 2236 -3.75000000000000e+01
+2269 1965 -4.16666666666667e+00
+2269 2451 4.16666666666667e+00
+2269 2127 -4.16666666666667e+00
+2269 2453 4.16666666666667e+00
+2269 2129 -4.16666666666667e+00
+2269 1966 -1.25000000000000e+01
+2269 2273 -4.16666666666667e+00
+2269 2117 4.16666666666667e+00
+2269 2243 4.16666666666667e+00
+2269 2272 -1.25000000000000e+01
+2269 1918 -1.25000000000000e+01
+2269 2271 8.33333333333333e+00
+2269 2115 -8.33333333333333e+00
+2270 2270 1.25000000000000e+02
+2270 2254 -4.16666666666667e+00
+2270 2241 -8.33333333333333e+00
+2270 2255 -1.25000000000000e+01
+2270 2253 8.33333333333333e+00
+2270 2455 -8.33333333333333e+00
+2270 2454 4.16666666666667e+00
+2270 2276 -1.25000000000000e+01
+2270 2275 8.33333333333333e+00
+2270 2274 -4.16666666666667e+00
+2270 2212 -4.16666666666667e+00
+2270 2221 4.16666666666667e+00
+2270 2211 -4.16666666666667e+00
+2270 2220 4.16666666666667e+00
+2270 2223 4.16666666666667e+00
+2270 2235 -4.16666666666667e+00
+2270 2224 -8.33333333333333e+00
+2270 1918 8.33333333333333e+00
+2270 2237 -1.25000000000000e+01
+2270 2236 8.33333333333333e+00
+2270 2269 -1.66666666666667e+01
+2270 1966 8.33333333333333e+00
+2270 2115 4.16666666666667e+00
+2270 2127 -4.16666666666667e+00
+2270 1967 -3.75000000000000e+01
+2270 2452 4.16666666666667e+00
+2270 2128 -4.16666666666667e+00
+2270 1965 8.33333333333333e+00
+2270 2451 -8.33333333333333e+00
+2270 2242 4.16666666666667e+00
+2270 2273 -1.25000000000000e+01
+2270 1919 -3.75000000000000e+01
+2270 2272 -4.16666666666667e+00
+2270 2116 4.16666666666667e+00
+2270 2268 -1.66666666666667e+01
+2270 2271 8.33333333333333e+00
+2270 1917 8.33333333333333e+00
+2271 2271 1.25000000000000e+02
+2271 2230 4.16666666666667e+00
+2271 2377 8.33333333333333e+00
+2271 2120 4.16666666666667e+00
+2271 2119 -8.33333333333333e+00
+2271 2378 8.33333333333333e+00
+2271 2376 -3.75000000000000e+01
+2271 2261 8.33333333333333e+00
+2271 2260 -4.16666666666667e+00
+2271 2259 -1.25000000000000e+01
+2271 2225 -4.16666666666667e+00
+2271 2240 -4.16666666666667e+00
+2271 2237 4.16666666666667e+00
+2271 2239 8.33333333333333e+00
+2271 2236 -8.33333333333333e+00
+2271 1972 4.16666666666667e+00
+2271 2238 -1.25000000000000e+01
+2271 2224 -4.16666666666667e+00
+2271 1918 4.16666666666667e+00
+2271 2117 -4.16666666666667e+00
+2271 2273 -1.66666666666667e+01
+2271 2452 -4.16666666666667e+00
+2271 2132 -4.16666666666667e+00
+2271 2129 4.16666666666667e+00
+2271 2131 -4.16666666666667e+00
+2271 2128 4.16666666666667e+00
+2271 2453 8.33333333333333e+00
+2271 1973 -8.33333333333333e+00
+2271 2451 -1.25000000000000e+01
+2271 2270 8.33333333333333e+00
+2271 1919 -8.33333333333333e+00
+2271 2269 8.33333333333333e+00
+2271 2272 -1.66666666666667e+01
+2271 2116 8.33333333333333e+00
+2271 2268 -3.75000000000000e+01
+2271 2231 4.16666666666667e+00
+2271 2115 -1.25000000000000e+01
+2272 2272 1.25000000000000e+02
+2272 2229 4.16666666666667e+00
+2272 2378 -4.16666666666667e+00
+2272 2120 4.16666666666667e+00
+2272 2376 8.33333333333333e+00
+2272 2118 -8.33333333333333e+00
+2272 2377 -1.25000000000000e+01
+2272 2261 8.33333333333333e+00
+2272 2260 -1.25000000000000e+01
+2272 2259 -4.16666666666667e+00
+2272 2225 -4.16666666666667e+00
+2272 2238 8.33333333333333e+00
+2272 2237 4.16666666666667e+00
+2272 2235 -8.33333333333333e+00
+2272 2240 8.33333333333333e+00
+2272 2273 -1.66666666666667e+01
+2272 2239 -3.75000000000000e+01
+2272 1971 4.16666666666667e+00
+2272 2223 -4.16666666666667e+00
+2272 1917 4.16666666666667e+00
+2272 2451 -4.16666666666667e+00
+2272 2453 8.33333333333333e+00
+2272 2117 8.33333333333333e+00
+2272 2129 -8.33333333333333e+00
+2272 2130 -4.16666666666667e+00
+2272 2127 4.16666666666667e+00
+2272 1973 4.16666666666667e+00
+2272 2132 -4.16666666666667e+00
+2272 2452 -1.25000000000000e+01
+2272 2270 -4.16666666666667e+00
+2272 1919 4.16666666666667e+00
+2272 2269 -1.25000000000000e+01
+2272 2231 -8.33333333333333e+00
+2272 2116 -3.75000000000000e+01
+2272 2268 8.33333333333333e+00
+2272 2271 -1.66666666666667e+01
+2272 2115 8.33333333333333e+00
+2273 2273 1.25000000000000e+02
+2273 2230 -8.33333333333333e+00
+2273 2377 -4.16666666666667e+00
+2273 2119 4.16666666666667e+00
+2273 2118 4.16666666666667e+00
+2273 2378 -1.25000000000000e+01
+2273 2376 8.33333333333333e+00
+2273 2261 -3.75000000000000e+01
+2273 2260 8.33333333333333e+00
+2273 2259 8.33333333333333e+00
+2273 2223 -4.16666666666667e+00
+2273 2224 -4.16666666666667e+00
+2273 2238 -4.16666666666667e+00
+2273 2235 4.16666666666667e+00
+2273 2236 4.16666666666667e+00
+2273 2240 -1.25000000000000e+01
+2273 2239 8.33333333333333e+00
+2273 2272 -1.66666666666667e+01
+2273 2115 -4.16666666666667e+00
+2273 2271 -1.66666666666667e+01
+2273 2452 8.33333333333333e+00
+2273 2130 -4.16666666666667e+00
+2273 2127 4.16666666666667e+00
+2273 2116 8.33333333333333e+00
+2273 2128 -8.33333333333333e+00
+2273 2453 -3.75000000000000e+01
+2273 1972 4.16666666666667e+00
+2273 2131 -4.16666666666667e+00
+2273 2451 8.33333333333333e+00
+2273 1971 -8.33333333333333e+00
+2273 2270 -1.25000000000000e+01
+2273 2229 4.16666666666667e+00
+2273 2117 -1.25000000000000e+01
+2273 2269 -4.16666666666667e+00
+2273 1918 4.16666666666667e+00
+2273 2268 8.33333333333333e+00
+2273 1917 -8.33333333333333e+00
+2274 2274 1.25000000000000e+02
+2274 2248 4.16666666666667e+00
+2274 2123 4.16666666666667e+00
+2274 2420 -4.16666666666667e+00
+2274 2419 8.33333333333333e+00
+2274 2122 -8.33333333333333e+00
+2274 2418 -1.25000000000000e+01
+2274 2264 8.33333333333333e+00
+2274 2263 -4.16666666666667e+00
+2274 2262 -1.25000000000000e+01
+2274 2243 -4.16666666666667e+00
+2274 2257 8.33333333333333e+00
+2274 2255 4.16666666666667e+00
+2274 2254 -8.33333333333333e+00
+2274 2258 8.33333333333333e+00
+2274 2276 -1.66666666666667e+01
+2274 1978 4.16666666666667e+00
+2274 2256 -3.75000000000000e+01
+2274 2242 -4.16666666666667e+00
+2274 1918 4.16666666666667e+00
+2274 2455 -4.16666666666667e+00
+2274 2456 8.33333333333333e+00
+2274 2117 8.33333333333333e+00
+2274 2129 -8.33333333333333e+00
+2274 2134 -4.16666666666667e+00
+2274 2128 4.16666666666667e+00
+2274 1979 4.16666666666667e+00
+2274 2135 -4.16666666666667e+00
+2274 2454 -1.25000000000000e+01
+2274 2270 -4.16666666666667e+00
+2274 1919 4.16666666666667e+00
+2274 2275 -1.66666666666667e+01
+2274 2269 8.33333333333333e+00
+2274 2116 8.33333333333333e+00
+2274 2249 -8.33333333333333e+00
+2274 2268 -1.25000000000000e+01
+2274 2115 -3.75000000000000e+01
+2275 2275 1.25000000000000e+02
+2275 2247 4.16666666666667e+00
+2275 2418 8.33333333333333e+00
+2275 2123 4.16666666666667e+00
+2275 2121 -8.33333333333333e+00
+2275 2420 8.33333333333333e+00
+2275 2419 -3.75000000000000e+01
+2275 2264 8.33333333333333e+00
+2275 2263 -1.25000000000000e+01
+2275 2262 -4.16666666666667e+00
+2275 2243 -4.16666666666667e+00
+2275 2258 -4.16666666666667e+00
+2275 2255 4.16666666666667e+00
+2275 2256 8.33333333333333e+00
+2275 2253 -8.33333333333333e+00
+2275 2257 -1.25000000000000e+01
+2275 1977 4.16666666666667e+00
+2275 2241 -4.16666666666667e+00
+2275 1917 4.16666666666667e+00
+2275 2117 -4.16666666666667e+00
+2275 2276 -1.66666666666667e+01
+2275 2454 -4.16666666666667e+00
+2275 2135 -4.16666666666667e+00
+2275 2129 4.16666666666667e+00
+2275 2133 -4.16666666666667e+00
+2275 2127 4.16666666666667e+00
+2275 1979 -8.33333333333333e+00
+2275 2456 8.33333333333333e+00
+2275 2455 -1.25000000000000e+01
+2275 2270 8.33333333333333e+00
+2275 1919 -8.33333333333333e+00
+2275 2249 4.16666666666667e+00
+2275 2269 -3.75000000000000e+01
+2275 2116 -1.25000000000000e+01
+2275 2274 -1.66666666666667e+01
+2275 2268 8.33333333333333e+00
+2275 2115 8.33333333333333e+00
+2276 2276 1.25000000000000e+02
+2276 2247 -8.33333333333333e+00
+2276 2121 4.16666666666667e+00
+2276 2418 -4.16666666666667e+00
+2276 2122 4.16666666666667e+00
+2276 2420 -1.25000000000000e+01
+2276 2419 8.33333333333333e+00
+2276 2264 -3.75000000000000e+01
+2276 2263 8.33333333333333e+00
+2276 2262 8.33333333333333e+00
+2276 2242 -4.16666666666667e+00
+2276 2241 -4.16666666666667e+00
+2276 2257 -4.16666666666667e+00
+2276 2254 4.16666666666667e+00
+2276 2253 4.16666666666667e+00
+2276 2258 -1.25000000000000e+01
+2276 2256 8.33333333333333e+00
+2276 2274 -1.66666666666667e+01
+2276 2116 -4.16666666666667e+00
+2276 2275 -1.66666666666667e+01
+2276 2134 -4.16666666666667e+00
+2276 2128 4.16666666666667e+00
+2276 2454 8.33333333333333e+00
+2276 2115 8.33333333333333e+00
+2276 2127 -8.33333333333333e+00
+2276 2456 -3.75000000000000e+01
+2276 1978 -8.33333333333333e+00
+2276 2455 8.33333333333333e+00
+2276 1977 4.16666666666667e+00
+2276 2133 -4.16666666666667e+00
+2276 2248 4.16666666666667e+00
+2276 2270 -1.25000000000000e+01
+2276 2117 -1.25000000000000e+01
+2276 2269 8.33333333333333e+00
+2276 1918 -8.33333333333333e+00
+2276 2268 -4.16666666666667e+00
+2276 1917 4.16666666666667e+00
+2277 2277 6.25000000000000e+01
+2277 2321 -4.16666666666667e+00
+2277 2293 4.16666666666667e+00
+2277 2320 -4.16666666666667e+00
+2277 2317 -4.16666666666667e+00
+2277 2288 4.16666666666667e+00
+2277 2294 -8.33333333333333e+00
+2277 2287 4.16666666666667e+00
+2277 2286 -1.87500000000000e+01
+2277 2015 4.16666666666667e+00
+2277 2279 -8.33333333333333e+00
+2277 2285 8.33333333333333e+00
+2277 2314 4.16666666666667e+00
+2277 2284 -4.16666666666667e+00
+2277 1922 -2.08333333333333e+00
+2277 2009 2.08333333333333e+00
+2277 1921 4.16666666666667e+00
+2277 2008 -4.16666666666667e+00
+2277 1920 -6.25000000000000e+00
+2277 2283 -1.25000000000000e+01
+2277 1928 -2.08333333333333e+00
+2277 2315 4.16666666666667e+00
+2277 2278 -8.33333333333333e+00
+2277 1927 4.16666666666667e+00
+2277 2014 4.16666666666667e+00
+2277 2318 2.08333333333333e+00
+2277 1926 -6.25000000000000e+00
+2277 2013 -1.87500000000000e+01
+2278 2278 6.25000000000000e+01
+2278 2319 -4.16666666666667e+00
+2278 2318 2.08333333333333e+00
+2278 2321 -4.16666666666667e+00
+2278 2316 -4.16666666666667e+00
+2278 2288 -2.08333333333333e+00
+2278 2294 4.16666666666667e+00
+2278 2287 -6.25000000000000e+00
+2278 2286 4.16666666666667e+00
+2278 2015 -2.08333333333333e+00
+2278 2009 2.08333333333333e+00
+2278 2313 4.16666666666667e+00
+2278 2283 -4.16666666666667e+00
+2278 1922 4.16666666666667e+00
+2278 2279 -8.33333333333333e+00
+2278 2285 8.33333333333333e+00
+2278 1921 -1.87500000000000e+01
+2278 2284 -1.25000000000000e+01
+2278 1920 4.16666666666667e+00
+2278 2007 -4.16666666666667e+00
+2278 1928 4.16666666666667e+00
+2278 2315 -8.33333333333333e+00
+2278 2292 4.16666666666667e+00
+2278 1927 -1.87500000000000e+01
+2278 2014 -6.25000000000000e+00
+2278 2277 -8.33333333333333e+00
+2278 1926 4.16666666666667e+00
+2278 2013 4.16666666666667e+00
+2279 2279 6.25000000000000e+01
+2279 2319 -4.16666666666667e+00
+2279 2317 2.08333333333333e+00
+2279 2320 -4.16666666666667e+00
+2279 2288 -6.25000000000000e+00
+2279 2287 -2.08333333333333e+00
+2279 2293 4.16666666666667e+00
+2279 2286 4.16666666666667e+00
+2279 2292 -8.33333333333333e+00
+2279 2014 -2.08333333333333e+00
+2279 2008 2.08333333333333e+00
+2279 2013 4.16666666666667e+00
+2279 2277 -8.33333333333333e+00
+2279 2283 8.33333333333333e+00
+2279 1922 -6.25000000000000e+00
+2279 2285 -3.75000000000000e+01
+2279 1921 4.16666666666667e+00
+2279 2278 -8.33333333333333e+00
+2279 2284 8.33333333333333e+00
+2279 1920 -2.08333333333333e+00
+2279 2007 2.08333333333333e+00
+2279 2316 2.08333333333333e+00
+2279 1928 -6.25000000000000e+00
+2279 2015 -6.25000000000000e+00
+2279 1927 4.16666666666667e+00
+2279 2314 -8.33333333333333e+00
+2279 1926 -2.08333333333333e+00
+2279 2313 4.16666666666667e+00
+2280 2280 6.25000000000000e+01
+2280 2291 4.16666666666667e+00
+2280 2290 4.16666666666667e+00
+2280 2289 -1.87500000000000e+01
+2280 2354 -4.16666666666667e+00
+2280 2356 -4.16666666666667e+00
+2280 2294 4.16666666666667e+00
+2280 2293 -8.33333333333333e+00
+2280 2357 -4.16666666666667e+00
+2280 2351 4.16666666666667e+00
+2280 2285 -4.16666666666667e+00
+2280 2281 -8.33333333333333e+00
+2280 2284 8.33333333333333e+00
+2280 2020 4.16666666666667e+00
+2280 1922 4.16666666666667e+00
+2280 2009 -4.16666666666667e+00
+2280 1921 -2.08333333333333e+00
+2280 2008 2.08333333333333e+00
+2280 1920 -6.25000000000000e+00
+2280 2283 -1.25000000000000e+01
+2280 2282 -8.33333333333333e+00
+2280 1934 4.16666666666667e+00
+2280 2021 4.16666666666667e+00
+2280 1933 -2.08333333333333e+00
+2280 2350 4.16666666666667e+00
+2280 2353 2.08333333333333e+00
+2280 1932 -6.25000000000000e+00
+2280 2019 -1.87500000000000e+01
+2281 2281 6.25000000000000e+01
+2281 2291 -2.08333333333333e+00
+2281 2290 -6.25000000000000e+00
+2281 2289 4.16666666666667e+00
+2281 2354 2.08333333333333e+00
+2281 2294 4.16666666666667e+00
+2281 2357 -4.16666666666667e+00
+2281 2355 -4.16666666666667e+00
+2281 2292 -8.33333333333333e+00
+2281 2009 2.08333333333333e+00
+2281 2021 -2.08333333333333e+00
+2281 2280 -8.33333333333333e+00
+2281 2283 8.33333333333333e+00
+2281 2019 4.16666666666667e+00
+2281 1922 4.16666666666667e+00
+2281 2282 -8.33333333333333e+00
+2281 2285 8.33333333333333e+00
+2281 1921 -6.25000000000000e+00
+2281 2284 -3.75000000000000e+01
+2281 1920 -2.08333333333333e+00
+2281 2007 2.08333333333333e+00
+2281 1934 4.16666666666667e+00
+2281 2351 -8.33333333333333e+00
+2281 2352 2.08333333333333e+00
+2281 1933 -6.25000000000000e+00
+2281 2020 -6.25000000000000e+00
+2281 1932 -2.08333333333333e+00
+2281 2349 4.16666666666667e+00
+2282 2282 6.25000000000000e+01
+2282 2290 -2.08333333333333e+00
+2282 2289 4.16666666666667e+00
+2282 2353 2.08333333333333e+00
+2282 2352 -4.16666666666667e+00
+2282 2293 4.16666666666667e+00
+2282 2356 -4.16666666666667e+00
+2282 2292 4.16666666666667e+00
+2282 2355 -4.16666666666667e+00
+2282 2349 4.16666666666667e+00
+2282 2283 -4.16666666666667e+00
+2282 2008 2.08333333333333e+00
+2282 2020 -2.08333333333333e+00
+2282 1922 -1.87500000000000e+01
+2282 2285 -1.25000000000000e+01
+2282 1921 4.16666666666667e+00
+2282 2281 -8.33333333333333e+00
+2282 2284 8.33333333333333e+00
+2282 1920 4.16666666666667e+00
+2282 2007 -4.16666666666667e+00
+2282 2291 -6.25000000000000e+00
+2282 1934 -1.87500000000000e+01
+2282 2021 -6.25000000000000e+00
+2282 1933 4.16666666666667e+00
+2282 2350 -8.33333333333333e+00
+2282 2280 -8.33333333333333e+00
+2282 1932 4.16666666666667e+00
+2282 2019 4.16666666666667e+00
+2283 2283 1.25000000000000e+02
+2283 2320 -8.33333333333333e+00
+2283 2279 8.33333333333333e+00
+2283 2014 4.16666666666667e+00
+2283 2278 -4.16666666666667e+00
+2283 2015 -8.33333333333333e+00
+2283 2277 -1.25000000000000e+01
+2283 2315 -4.16666666666667e+00
+2283 2314 8.33333333333333e+00
+2283 2313 -1.25000000000000e+01
+2283 2386 -4.16666666666667e+00
+2283 2294 8.33333333333333e+00
+2283 2357 -8.33333333333333e+00
+2283 2356 4.16666666666667e+00
+2283 1922 4.16666666666667e+00
+2283 2293 8.33333333333333e+00
+2283 2284 -1.66666666666667e+01
+2283 2292 -3.75000000000000e+01
+2283 2387 -4.16666666666667e+00
+2283 1940 4.16666666666667e+00
+2283 2282 -4.16666666666667e+00
+2283 2281 8.33333333333333e+00
+2283 2009 -4.16666666666667e+00
+2283 2021 4.16666666666667e+00
+2283 2026 8.33333333333333e+00
+2283 2020 -8.33333333333333e+00
+2283 1921 4.16666666666667e+00
+2283 2008 -4.16666666666667e+00
+2283 2280 -1.25000000000000e+01
+2283 2285 -1.66666666666667e+01
+2283 2351 8.33333333333333e+00
+2283 2027 8.33333333333333e+00
+2283 2350 -4.16666666666667e+00
+2283 1939 4.16666666666667e+00
+2283 2321 4.16666666666667e+00
+2283 2349 -1.25000000000000e+01
+2283 2025 -3.75000000000000e+01
+2284 2284 1.25000000000000e+02
+2284 2319 -8.33333333333333e+00
+2284 2013 4.16666666666667e+00
+2284 2277 -4.16666666666667e+00
+2284 2015 4.16666666666667e+00
+2284 2279 8.33333333333333e+00
+2284 2278 -1.25000000000000e+01
+2284 2315 8.33333333333333e+00
+2284 2314 -3.75000000000000e+01
+2284 2313 8.33333333333333e+00
+2284 2387 -4.16666666666667e+00
+2284 2385 -4.16666666666667e+00
+2284 2294 -4.16666666666667e+00
+2284 2357 4.16666666666667e+00
+2284 2355 4.16666666666667e+00
+2284 2293 -1.25000000000000e+01
+2284 2292 8.33333333333333e+00
+2284 2283 -1.66666666666667e+01
+2284 2027 -4.16666666666667e+00
+2284 2285 -1.66666666666667e+01
+2284 2009 -4.16666666666667e+00
+2284 2021 4.16666666666667e+00
+2284 2280 8.33333333333333e+00
+2284 2025 8.33333333333333e+00
+2284 2019 -8.33333333333333e+00
+2284 1922 -8.33333333333333e+00
+2284 2282 8.33333333333333e+00
+2284 2281 -3.75000000000000e+01
+2284 1920 4.16666666666667e+00
+2284 2007 -4.16666666666667e+00
+2284 2351 8.33333333333333e+00
+2284 1940 -8.33333333333333e+00
+2284 2321 4.16666666666667e+00
+2284 2350 -1.25000000000000e+01
+2284 2026 -1.25000000000000e+01
+2284 2349 -4.16666666666667e+00
+2284 1938 4.16666666666667e+00
+2285 2285 1.25000000000000e+02
+2285 2319 4.16666666666667e+00
+2285 2277 8.33333333333333e+00
+2285 2014 4.16666666666667e+00
+2285 2013 -8.33333333333333e+00
+2285 2279 -3.75000000000000e+01
+2285 2278 8.33333333333333e+00
+2285 2315 -1.25000000000000e+01
+2285 2314 8.33333333333333e+00
+2285 2313 -4.16666666666667e+00
+2285 2386 -4.16666666666667e+00
+2285 2293 -4.16666666666667e+00
+2285 2356 4.16666666666667e+00
+2285 2292 8.33333333333333e+00
+2285 2355 -8.33333333333333e+00
+2285 2294 -1.25000000000000e+01
+2285 1920 4.16666666666667e+00
+2285 2385 -4.16666666666667e+00
+2285 1938 4.16666666666667e+00
+2285 2026 -4.16666666666667e+00
+2285 2284 -1.66666666666667e+01
+2285 2280 -4.16666666666667e+00
+2285 2008 -4.16666666666667e+00
+2285 2020 4.16666666666667e+00
+2285 2007 -4.16666666666667e+00
+2285 2019 4.16666666666667e+00
+2285 2282 -1.25000000000000e+01
+2285 1921 -8.33333333333333e+00
+2285 2281 8.33333333333333e+00
+2285 2320 4.16666666666667e+00
+2285 2351 -3.75000000000000e+01
+2285 2027 -1.25000000000000e+01
+2285 2350 8.33333333333333e+00
+2285 1939 -8.33333333333333e+00
+2285 2283 -1.66666666666667e+01
+2285 2349 8.33333333333333e+00
+2285 2025 8.33333333333333e+00
+2286 2286 6.25000000000000e+01
+2286 2320 4.16666666666667e+00
+2286 2321 4.16666666666667e+00
+2286 2279 4.16666666666667e+00
+2286 2288 -8.33333333333333e+00
+2286 2278 4.16666666666667e+00
+2286 2277 -1.87500000000000e+01
+2286 2317 4.16666666666667e+00
+2286 2316 -6.25000000000000e+00
+2286 2293 -4.16666666666667e+00
+2286 2287 -8.33333333333333e+00
+2286 2294 8.33333333333333e+00
+2286 2030 -2.08333333333333e+00
+2286 1922 2.08333333333333e+00
+2286 2029 4.16666666666667e+00
+2286 1921 -4.16666666666667e+00
+2286 2028 -6.25000000000000e+00
+2286 2318 -2.08333333333333e+00
+2286 2292 -1.25000000000000e+01
+2286 1388 4.16666666666667e+00
+2286 1573 -4.16666666666667e+00
+2286 1399 4.16666666666667e+00
+2286 1400 -8.33333333333333e+00
+2286 1304 2.08333333333333e+00
+2286 1574 -4.16666666666667e+00
+2286 1387 4.16666666666667e+00
+2286 1303 -4.16666666666667e+00
+2286 1386 -1.87500000000000e+01
+2287 2287 6.25000000000000e+01
+2287 2319 4.16666666666667e+00
+2287 2321 -8.33333333333333e+00
+2287 2279 -2.08333333333333e+00
+2287 1922 2.08333333333333e+00
+2287 2278 -6.25000000000000e+00
+2287 2277 4.16666666666667e+00
+2287 2317 -1.87500000000000e+01
+2287 2316 4.16666666666667e+00
+2287 2292 -4.16666666666667e+00
+2287 2286 -8.33333333333333e+00
+2287 2030 4.16666666666667e+00
+2287 2288 -8.33333333333333e+00
+2287 2294 8.33333333333333e+00
+2287 2029 -1.87500000000000e+01
+2287 2318 4.16666666666667e+00
+2287 2293 -1.25000000000000e+01
+2287 2028 4.16666666666667e+00
+2287 1920 -4.16666666666667e+00
+2287 1304 2.08333333333333e+00
+2287 1388 -2.08333333333333e+00
+2287 1572 -4.16666666666667e+00
+2287 1398 4.16666666666667e+00
+2287 1574 -4.16666666666667e+00
+2287 1400 4.16666666666667e+00
+2287 1387 -6.25000000000000e+00
+2287 1386 4.16666666666667e+00
+2287 1302 -4.16666666666667e+00
+2288 2288 6.25000000000000e+01
+2288 2316 -2.08333333333333e+00
+2288 2320 -8.33333333333333e+00
+2288 2319 4.16666666666667e+00
+2288 2279 -6.25000000000000e+00
+2288 2278 -2.08333333333333e+00
+2288 1921 2.08333333333333e+00
+2288 2277 4.16666666666667e+00
+2288 2286 -8.33333333333333e+00
+2288 2318 -6.25000000000000e+00
+2288 2292 8.33333333333333e+00
+2288 2030 -6.25000000000000e+00
+2288 2317 4.16666666666667e+00
+2288 2294 -3.75000000000000e+01
+2288 2029 4.16666666666667e+00
+2288 2287 -8.33333333333333e+00
+2288 2293 8.33333333333333e+00
+2288 2028 -2.08333333333333e+00
+2288 1920 2.08333333333333e+00
+2288 1303 2.08333333333333e+00
+2288 1387 -2.08333333333333e+00
+2288 1386 4.16666666666667e+00
+2288 1573 -4.16666666666667e+00
+2288 1399 4.16666666666667e+00
+2288 1398 -8.33333333333333e+00
+2288 1388 -6.25000000000000e+00
+2288 1302 2.08333333333333e+00
+2288 1572 -4.16666666666667e+00
+2289 2289 6.25000000000000e+01
+2289 2353 -2.08333333333333e+00
+2289 2356 4.16666666666667e+00
+2289 2354 4.16666666666667e+00
+2289 2352 -6.25000000000000e+00
+2289 2282 4.16666666666667e+00
+2289 2290 -8.33333333333333e+00
+2289 2281 4.16666666666667e+00
+2289 2280 -1.87500000000000e+01
+2289 2291 -8.33333333333333e+00
+2289 2294 -4.16666666666667e+00
+2289 2293 8.33333333333333e+00
+2289 2030 4.16666666666667e+00
+2289 1922 -4.16666666666667e+00
+2289 2029 -2.08333333333333e+00
+2289 1921 2.08333333333333e+00
+2289 2028 -6.25000000000000e+00
+2289 2357 4.16666666666667e+00
+2289 2292 -1.25000000000000e+01
+2289 1610 -4.16666666666667e+00
+2289 1393 4.16666666666667e+00
+2289 1400 4.16666666666667e+00
+2289 1399 -8.33333333333333e+00
+2289 1394 4.16666666666667e+00
+2289 1310 -4.16666666666667e+00
+2289 1309 2.08333333333333e+00
+2289 1609 -4.16666666666667e+00
+2289 1392 -1.87500000000000e+01
+2290 2290 6.25000000000000e+01
+2290 2357 -8.33333333333333e+00
+2290 2352 -2.08333333333333e+00
+2290 2355 4.16666666666667e+00
+2290 2353 -6.25000000000000e+00
+2290 1922 2.08333333333333e+00
+2290 2282 -2.08333333333333e+00
+2290 2281 -6.25000000000000e+00
+2290 2289 -8.33333333333333e+00
+2290 2280 4.16666666666667e+00
+2290 2292 8.33333333333333e+00
+2290 2030 4.16666666666667e+00
+2290 2291 -8.33333333333333e+00
+2290 2294 8.33333333333333e+00
+2290 2029 -6.25000000000000e+00
+2290 2354 4.16666666666667e+00
+2290 2293 -3.75000000000000e+01
+2290 2028 -2.08333333333333e+00
+2290 1920 2.08333333333333e+00
+2290 1310 2.08333333333333e+00
+2290 1610 -4.16666666666667e+00
+2290 1394 -2.08333333333333e+00
+2290 1400 4.16666666666667e+00
+2290 1392 4.16666666666667e+00
+2290 1398 -8.33333333333333e+00
+2290 1393 -6.25000000000000e+00
+2290 1308 2.08333333333333e+00
+2290 1608 -4.16666666666667e+00
+2291 2291 6.25000000000000e+01
+2291 2353 4.16666666666667e+00
+2291 2356 -8.33333333333333e+00
+2291 2354 -1.87500000000000e+01
+2291 2352 4.16666666666667e+00
+2291 2282 -6.25000000000000e+00
+2291 1921 2.08333333333333e+00
+2291 2281 -2.08333333333333e+00
+2291 2280 4.16666666666667e+00
+2291 2289 -8.33333333333333e+00
+2291 2292 -4.16666666666667e+00
+2291 2030 -1.87500000000000e+01
+2291 2355 4.16666666666667e+00
+2291 2294 -1.25000000000000e+01
+2291 2029 4.16666666666667e+00
+2291 2290 -8.33333333333333e+00
+2291 2293 8.33333333333333e+00
+2291 2028 4.16666666666667e+00
+2291 1920 -4.16666666666667e+00
+2291 1309 2.08333333333333e+00
+2291 1609 -4.16666666666667e+00
+2291 1608 -4.16666666666667e+00
+2291 1393 -2.08333333333333e+00
+2291 1399 4.16666666666667e+00
+2291 1398 4.16666666666667e+00
+2291 1394 -6.25000000000000e+00
+2291 1392 4.16666666666667e+00
+2291 1308 -4.16666666666667e+00
+2292 2292 1.25000000000000e+02
+2292 2321 -4.16666666666667e+00
+2292 2279 -8.33333333333333e+00
+2292 2320 8.33333333333333e+00
+2292 2319 -1.25000000000000e+01
+2292 2287 -4.16666666666667e+00
+2292 2288 8.33333333333333e+00
+2292 2286 -1.25000000000000e+01
+2292 2386 4.16666666666667e+00
+2292 2356 -4.16666666666667e+00
+2292 2294 -1.66666666666667e+01
+2292 2285 8.33333333333333e+00
+2292 2357 8.33333333333333e+00
+2292 1922 -4.16666666666667e+00
+2292 2282 4.16666666666667e+00
+2292 2284 8.33333333333333e+00
+2292 2281 -8.33333333333333e+00
+2292 2283 -3.75000000000000e+01
+2292 2387 4.16666666666667e+00
+2292 2355 -1.25000000000000e+01
+2292 2030 4.16666666666667e+00
+2292 2291 -4.16666666666667e+00
+2292 2293 -1.66666666666667e+01
+2292 2290 8.33333333333333e+00
+2292 2029 4.16666666666667e+00
+2292 1921 -4.16666666666667e+00
+2292 2289 -1.25000000000000e+01
+2292 2278 4.16666666666667e+00
+2292 1574 4.16666666666667e+00
+2292 1573 -8.33333333333333e+00
+2292 1316 -4.16666666666667e+00
+2292 1399 8.33333333333333e+00
+2292 1400 8.33333333333333e+00
+2292 1610 -8.33333333333333e+00
+2292 1609 4.16666666666667e+00
+2292 1315 -4.16666666666667e+00
+2292 1398 -3.75000000000000e+01
+2293 2293 1.25000000000000e+02
+2293 2321 8.33333333333333e+00
+2293 2279 4.16666666666667e+00
+2293 2320 -3.75000000000000e+01
+2293 2319 8.33333333333333e+00
+2293 2286 -4.16666666666667e+00
+2293 2288 8.33333333333333e+00
+2293 2287 -1.25000000000000e+01
+2293 2294 -1.66666666666667e+01
+2293 1922 -4.16666666666667e+00
+2293 2385 4.16666666666667e+00
+2293 2355 -4.16666666666667e+00
+2293 2285 -4.16666666666667e+00
+2293 2282 4.16666666666667e+00
+2293 2284 -1.25000000000000e+01
+2293 2283 8.33333333333333e+00
+2293 2280 -8.33333333333333e+00
+2293 2387 -8.33333333333333e+00
+2293 2357 8.33333333333333e+00
+2293 2356 -1.25000000000000e+01
+2293 2292 -1.66666666666667e+01
+2293 2289 8.33333333333333e+00
+2293 2030 -8.33333333333333e+00
+2293 2291 8.33333333333333e+00
+2293 2290 -3.75000000000000e+01
+2293 2277 4.16666666666667e+00
+2293 2028 4.16666666666667e+00
+2293 1920 -4.16666666666667e+00
+2293 1574 4.16666666666667e+00
+2293 1572 -8.33333333333333e+00
+2293 1316 -4.16666666666667e+00
+2293 1400 -4.16666666666667e+00
+2293 1610 4.16666666666667e+00
+2293 1398 8.33333333333333e+00
+2293 1399 -1.25000000000000e+01
+2293 1608 4.16666666666667e+00
+2293 1314 -4.16666666666667e+00
+2294 2294 1.25000000000000e+02
+2294 2319 -4.16666666666667e+00
+2294 2278 4.16666666666667e+00
+2294 2277 -8.33333333333333e+00
+2294 2321 -1.25000000000000e+01
+2294 2286 8.33333333333333e+00
+2294 2288 -3.75000000000000e+01
+2294 2287 8.33333333333333e+00
+2294 2293 -1.66666666666667e+01
+2294 1921 -4.16666666666667e+00
+2294 2284 -4.16666666666667e+00
+2294 2281 4.16666666666667e+00
+2294 2292 -1.66666666666667e+01
+2294 2283 8.33333333333333e+00
+2294 2355 8.33333333333333e+00
+2294 2285 -1.25000000000000e+01
+2294 1920 -4.16666666666667e+00
+2294 2280 4.16666666666667e+00
+2294 2357 -3.75000000000000e+01
+2294 2386 -8.33333333333333e+00
+2294 2356 8.33333333333333e+00
+2294 2385 4.16666666666667e+00
+2294 2028 4.16666666666667e+00
+2294 2289 -4.16666666666667e+00
+2294 2291 -1.25000000000000e+01
+2294 2320 8.33333333333333e+00
+2294 2029 -8.33333333333333e+00
+2294 2290 8.33333333333333e+00
+2294 1573 4.16666666666667e+00
+2294 1572 4.16666666666667e+00
+2294 1315 -4.16666666666667e+00
+2294 1314 -4.16666666666667e+00
+2294 1399 -4.16666666666667e+00
+2294 1609 4.16666666666667e+00
+2294 1400 -1.25000000000000e+01
+2294 1398 8.33333333333333e+00
+2294 1608 -8.33333333333333e+00
+2295 2295 6.25000000000000e+01
+2295 2326 -4.16666666666667e+00
+2295 2306 -2.08333333333333e+00
+2295 2312 4.16666666666667e+00
+2295 2305 4.16666666666667e+00
+2295 2304 -6.25000000000000e+00
+2295 2324 2.08333333333333e+00
+2295 2327 -4.16666666666667e+00
+2295 2323 -4.16666666666667e+00
+2295 2012 2.08333333333333e+00
+2295 2015 -2.08333333333333e+00
+2295 2314 4.16666666666667e+00
+2295 2302 -4.16666666666667e+00
+2295 1928 4.16666666666667e+00
+2295 2315 -8.33333333333333e+00
+2295 1927 4.16666666666667e+00
+2295 2296 -8.33333333333333e+00
+2295 2014 4.16666666666667e+00
+2295 1926 -1.87500000000000e+01
+2295 2013 -6.25000000000000e+00
+2295 2297 -8.33333333333333e+00
+2295 1925 4.16666666666667e+00
+2295 2303 8.33333333333333e+00
+2295 1924 4.16666666666667e+00
+2295 2011 -4.16666666666667e+00
+2295 2311 4.16666666666667e+00
+2295 1923 -1.87500000000000e+01
+2295 2301 -1.25000000000000e+01
+2296 2296 6.25000000000000e+01
+2296 2327 -4.16666666666667e+00
+2296 2310 4.16666666666667e+00
+2296 2325 -4.16666666666667e+00
+2296 2306 4.16666666666667e+00
+2296 2312 -8.33333333333333e+00
+2296 2305 -1.87500000000000e+01
+2296 2304 4.16666666666667e+00
+2296 2322 -4.16666666666667e+00
+2296 2297 -8.33333333333333e+00
+2296 2015 4.16666666666667e+00
+2296 2303 8.33333333333333e+00
+2296 2313 4.16666666666667e+00
+2296 2301 -4.16666666666667e+00
+2296 1928 -2.08333333333333e+00
+2296 2315 4.16666666666667e+00
+2296 1927 -6.25000000000000e+00
+2296 2014 -1.87500000000000e+01
+2296 1926 4.16666666666667e+00
+2296 2295 -8.33333333333333e+00
+2296 2013 4.16666666666667e+00
+2296 1925 -2.08333333333333e+00
+2296 2012 2.08333333333333e+00
+2296 2324 2.08333333333333e+00
+2296 1924 -6.25000000000000e+00
+2296 2302 -1.25000000000000e+01
+2296 1923 4.16666666666667e+00
+2296 2010 -4.16666666666667e+00
+2297 2297 6.25000000000000e+01
+2297 2326 -4.16666666666667e+00
+2297 2306 -6.25000000000000e+00
+2297 2305 4.16666666666667e+00
+2297 2311 -8.33333333333333e+00
+2297 2304 -2.08333333333333e+00
+2297 2310 4.16666666666667e+00
+2297 2322 2.08333333333333e+00
+2297 2325 -4.16666666666667e+00
+2297 2010 2.08333333333333e+00
+2297 2013 -2.08333333333333e+00
+2297 2296 -8.33333333333333e+00
+2297 2014 4.16666666666667e+00
+2297 2302 8.33333333333333e+00
+2297 1928 -6.25000000000000e+00
+2297 2015 -6.25000000000000e+00
+2297 1927 -2.08333333333333e+00
+2297 2314 4.16666666666667e+00
+2297 1926 4.16666666666667e+00
+2297 2313 -8.33333333333333e+00
+2297 2323 2.08333333333333e+00
+2297 1925 -6.25000000000000e+00
+2297 2303 -3.75000000000000e+01
+2297 1924 -2.08333333333333e+00
+2297 2011 2.08333333333333e+00
+2297 2295 -8.33333333333333e+00
+2297 1923 4.16666666666667e+00
+2297 2301 8.33333333333333e+00
+2298 2298 1.25000000000000e+02
+2298 2375 -4.16666666666667e+00
+2298 2374 -4.16666666666667e+00
+2298 2311 -8.33333333333333e+00
+2298 2302 8.33333333333333e+00
+2298 2369 -8.33333333333333e+00
+2298 2368 4.16666666666667e+00
+2298 2303 8.33333333333333e+00
+2298 2301 -3.75000000000000e+01
+2298 2309 -4.16666666666667e+00
+2298 2372 4.16666666666667e+00
+2298 2308 8.33333333333333e+00
+2298 2299 -1.66666666666667e+01
+2298 2194 8.33333333333333e+00
+2298 2192 -8.33333333333333e+00
+2298 1925 8.33333333333333e+00
+2298 2191 4.16666666666667e+00
+2298 1924 -4.16666666666667e+00
+2298 2307 -1.25000000000000e+01
+2298 2195 8.33333333333333e+00
+2298 2300 -1.66666666666667e+01
+2298 1937 8.33333333333333e+00
+2298 2371 4.16666666666667e+00
+2298 1936 -4.16666666666667e+00
+2298 2193 -3.75000000000000e+01
+2298 2161 -4.16666666666667e+00
+2298 2011 4.16666666666667e+00
+2298 2012 4.16666666666667e+00
+2298 2162 -4.16666666666667e+00
+2298 1923 -1.25000000000000e+01
+2298 2024 -4.16666666666667e+00
+2298 2168 4.16666666666667e+00
+2298 2023 8.33333333333333e+00
+2298 2167 -8.33333333333333e+00
+2298 2022 -1.25000000000000e+01
+2298 2312 4.16666666666667e+00
+2298 1935 -1.25000000000000e+01
+2299 2299 1.25000000000000e+02
+2299 2312 4.16666666666667e+00
+2299 2310 -8.33333333333333e+00
+2299 2375 -4.16666666666667e+00
+2299 2303 -4.16666666666667e+00
+2299 2369 4.16666666666667e+00
+2299 2301 8.33333333333333e+00
+2299 2367 4.16666666666667e+00
+2299 2302 -1.25000000000000e+01
+2299 2192 4.16666666666667e+00
+2299 2195 -4.16666666666667e+00
+2299 2307 8.33333333333333e+00
+2299 2298 -1.66666666666667e+01
+2299 2193 8.33333333333333e+00
+2299 2309 8.33333333333333e+00
+2299 2308 -3.75000000000000e+01
+2299 2190 4.16666666666667e+00
+2299 1923 -4.16666666666667e+00
+2299 2372 -8.33333333333333e+00
+2299 2194 -1.25000000000000e+01
+2299 2370 4.16666666666667e+00
+2299 1935 -4.16666666666667e+00
+2299 2160 -4.16666666666667e+00
+2299 2010 4.16666666666667e+00
+2299 2162 -4.16666666666667e+00
+2299 2168 4.16666666666667e+00
+2299 2012 -8.33333333333333e+00
+2299 1925 8.33333333333333e+00
+2299 1924 -1.25000000000000e+01
+2299 2024 8.33333333333333e+00
+2299 2300 -1.66666666666667e+01
+2299 1937 8.33333333333333e+00
+2299 2023 -3.75000000000000e+01
+2299 2373 -4.16666666666667e+00
+2299 1936 -1.25000000000000e+01
+2299 2022 8.33333333333333e+00
+2299 2166 -8.33333333333333e+00
+2300 2300 1.25000000000000e+02
+2300 2373 -4.16666666666667e+00
+2300 2311 4.16666666666667e+00
+2300 2374 -4.16666666666667e+00
+2300 2302 -4.16666666666667e+00
+2300 2368 4.16666666666667e+00
+2300 2367 -8.33333333333333e+00
+2300 2303 -1.25000000000000e+01
+2300 2301 8.33333333333333e+00
+2300 2191 4.16666666666667e+00
+2300 2194 -4.16666666666667e+00
+2300 2307 -4.16666666666667e+00
+2300 2370 4.16666666666667e+00
+2300 2309 -1.25000000000000e+01
+2300 2308 8.33333333333333e+00
+2300 2190 -8.33333333333333e+00
+2300 1923 8.33333333333333e+00
+2300 2195 -1.25000000000000e+01
+2300 2371 -8.33333333333333e+00
+2300 2193 8.33333333333333e+00
+2300 2298 -1.66666666666667e+01
+2300 1935 8.33333333333333e+00
+2300 2161 -4.16666666666667e+00
+2300 2167 4.16666666666667e+00
+2300 1925 -3.75000000000000e+01
+2300 2011 -8.33333333333333e+00
+2300 1924 8.33333333333333e+00
+2300 2010 4.16666666666667e+00
+2300 2160 -4.16666666666667e+00
+2300 2024 -1.25000000000000e+01
+2300 2310 4.16666666666667e+00
+2300 1937 -3.75000000000000e+01
+2300 2023 8.33333333333333e+00
+2300 2299 -1.66666666666667e+01
+2300 1936 8.33333333333333e+00
+2300 2022 -4.16666666666667e+00
+2300 2166 4.16666666666667e+00
+2301 2301 1.25000000000000e+02
+2301 2326 -8.33333333333333e+00
+2301 2296 -4.16666666666667e+00
+2301 2014 4.16666666666667e+00
+2301 2015 4.16666666666667e+00
+2301 2297 8.33333333333333e+00
+2301 2295 -1.25000000000000e+01
+2301 2315 8.33333333333333e+00
+2301 2314 8.33333333333333e+00
+2301 2313 -3.75000000000000e+01
+2301 2390 -4.16666666666667e+00
+2301 2389 -4.16666666666667e+00
+2301 2312 -4.16666666666667e+00
+2301 2375 4.16666666666667e+00
+2301 2374 4.16666666666667e+00
+2301 2311 8.33333333333333e+00
+2301 2302 -1.66666666666667e+01
+2301 2310 -1.25000000000000e+01
+2301 2027 -4.16666666666667e+00
+2301 2303 -1.66666666666667e+01
+2301 2012 -4.16666666666667e+00
+2301 2024 4.16666666666667e+00
+2301 2299 8.33333333333333e+00
+2301 2026 8.33333333333333e+00
+2301 2023 -8.33333333333333e+00
+2301 2300 8.33333333333333e+00
+2301 1925 -8.33333333333333e+00
+2301 1924 4.16666666666667e+00
+2301 2011 -4.16666666666667e+00
+2301 2298 -3.75000000000000e+01
+2301 2369 8.33333333333333e+00
+2301 1940 -8.33333333333333e+00
+2301 2368 -4.16666666666667e+00
+2301 1939 4.16666666666667e+00
+2301 2367 -1.25000000000000e+01
+2301 2327 4.16666666666667e+00
+2301 2025 -1.25000000000000e+01
+2302 2302 1.25000000000000e+02
+2302 2325 -8.33333333333333e+00
+2302 2297 8.33333333333333e+00
+2302 2295 -4.16666666666667e+00
+2302 2013 4.16666666666667e+00
+2302 2015 -8.33333333333333e+00
+2302 2296 -1.25000000000000e+01
+2302 2315 -4.16666666666667e+00
+2302 2314 -1.25000000000000e+01
+2302 2313 8.33333333333333e+00
+2302 2388 -4.16666666666667e+00
+2302 2312 8.33333333333333e+00
+2302 2375 -8.33333333333333e+00
+2302 2373 4.16666666666667e+00
+2302 1925 4.16666666666667e+00
+2302 2311 -3.75000000000000e+01
+2302 2310 8.33333333333333e+00
+2302 2301 -1.66666666666667e+01
+2302 2390 -4.16666666666667e+00
+2302 1940 4.16666666666667e+00
+2302 2300 -4.16666666666667e+00
+2302 2298 8.33333333333333e+00
+2302 2012 -4.16666666666667e+00
+2302 2024 4.16666666666667e+00
+2302 2025 8.33333333333333e+00
+2302 2022 -8.33333333333333e+00
+2302 2299 -1.25000000000000e+01
+2302 1923 4.16666666666667e+00
+2302 2010 -4.16666666666667e+00
+2302 2369 8.33333333333333e+00
+2302 2303 -1.66666666666667e+01
+2302 2027 8.33333333333333e+00
+2302 2368 -1.25000000000000e+01
+2302 2327 4.16666666666667e+00
+2302 2026 -3.75000000000000e+01
+2302 2367 -4.16666666666667e+00
+2302 1938 4.16666666666667e+00
+2303 2303 1.25000000000000e+02
+2303 2326 4.16666666666667e+00
+2303 2296 8.33333333333333e+00
+2303 2014 -8.33333333333333e+00
+2303 2013 4.16666666666667e+00
+2303 2297 -3.75000000000000e+01
+2303 2295 8.33333333333333e+00
+2303 2315 -1.25000000000000e+01
+2303 2314 -4.16666666666667e+00
+2303 2313 8.33333333333333e+00
+2303 2388 -4.16666666666667e+00
+2303 2311 8.33333333333333e+00
+2303 2310 -4.16666666666667e+00
+2303 2373 4.16666666666667e+00
+2303 2374 -8.33333333333333e+00
+2303 2312 -1.25000000000000e+01
+2303 1924 4.16666666666667e+00
+2303 2389 -4.16666666666667e+00
+2303 1939 4.16666666666667e+00
+2303 2025 -4.16666666666667e+00
+2303 2299 -4.16666666666667e+00
+2303 2301 -1.66666666666667e+01
+2303 2010 -4.16666666666667e+00
+2303 2022 4.16666666666667e+00
+2303 2011 -4.16666666666667e+00
+2303 2023 4.16666666666667e+00
+2303 2300 -1.25000000000000e+01
+2303 2298 8.33333333333333e+00
+2303 1923 -8.33333333333333e+00
+2303 2369 -3.75000000000000e+01
+2303 2325 4.16666666666667e+00
+2303 2027 -1.25000000000000e+01
+2303 2368 8.33333333333333e+00
+2303 2302 -1.66666666666667e+01
+2303 2026 8.33333333333333e+00
+2303 2367 8.33333333333333e+00
+2303 1938 -8.33333333333333e+00
+2304 2304 6.25000000000000e+01
+2304 2326 4.16666666666667e+00
+2304 2327 -8.33333333333333e+00
+2304 1925 2.08333333333333e+00
+2304 2297 -2.08333333333333e+00
+2304 2296 4.16666666666667e+00
+2304 2295 -6.25000000000000e+00
+2304 1952 2.08333333333333e+00
+2304 2323 4.16666666666667e+00
+2304 2322 -1.87500000000000e+01
+2304 2311 -4.16666666666667e+00
+2304 2054 -2.08333333333333e+00
+2304 2305 -8.33333333333333e+00
+2304 2422 -4.16666666666667e+00
+2304 2059 4.16666666666667e+00
+2304 2423 -4.16666666666667e+00
+2304 2060 4.16666666666667e+00
+2304 1951 -4.16666666666667e+00
+2304 2053 4.16666666666667e+00
+2304 2052 -6.25000000000000e+00
+2304 2306 -8.33333333333333e+00
+2304 2048 4.16666666666667e+00
+2304 2312 8.33333333333333e+00
+2304 2047 4.16666666666667e+00
+2304 1924 -4.16666666666667e+00
+2304 2324 4.16666666666667e+00
+2304 2046 -1.87500000000000e+01
+2304 2310 -1.25000000000000e+01
+2305 2305 6.25000000000000e+01
+2305 2325 4.16666666666667e+00
+2305 2327 4.16666666666667e+00
+2305 2297 4.16666666666667e+00
+2305 2306 -8.33333333333333e+00
+2305 2296 -1.87500000000000e+01
+2305 2295 4.16666666666667e+00
+2305 2323 -6.25000000000000e+00
+2305 2322 4.16666666666667e+00
+2305 2310 -4.16666666666667e+00
+2305 2304 -8.33333333333333e+00
+2305 2054 4.16666666666667e+00
+2305 2421 -4.16666666666667e+00
+2305 2058 4.16666666666667e+00
+2305 2312 8.33333333333333e+00
+2305 2060 -8.33333333333333e+00
+2305 1952 2.08333333333333e+00
+2305 2423 -4.16666666666667e+00
+2305 2053 -1.87500000000000e+01
+2305 1950 -4.16666666666667e+00
+2305 2052 4.16666666666667e+00
+2305 2048 -2.08333333333333e+00
+2305 1925 2.08333333333333e+00
+2305 2324 -2.08333333333333e+00
+2305 2047 -6.25000000000000e+00
+2305 2311 -1.25000000000000e+01
+2305 2046 4.16666666666667e+00
+2305 1923 -4.16666666666667e+00
+2306 2306 6.25000000000000e+01
+2306 2322 4.16666666666667e+00
+2306 2326 4.16666666666667e+00
+2306 2325 -8.33333333333333e+00
+2306 2297 -6.25000000000000e+00
+2306 2296 4.16666666666667e+00
+2306 2305 -8.33333333333333e+00
+2306 1923 2.08333333333333e+00
+2306 2295 -2.08333333333333e+00
+2306 2324 -6.25000000000000e+00
+2306 1950 2.08333333333333e+00
+2306 2052 -2.08333333333333e+00
+2306 2053 4.16666666666667e+00
+2306 2311 8.33333333333333e+00
+2306 2059 -8.33333333333333e+00
+2306 2421 -4.16666666666667e+00
+2306 2058 4.16666666666667e+00
+2306 2054 -6.25000000000000e+00
+2306 1951 2.08333333333333e+00
+2306 2422 -4.16666666666667e+00
+2306 2323 -2.08333333333333e+00
+2306 2048 -6.25000000000000e+00
+2306 2312 -3.75000000000000e+01
+2306 2047 -2.08333333333333e+00
+2306 1924 2.08333333333333e+00
+2306 2304 -8.33333333333333e+00
+2306 2046 4.16666666666667e+00
+2306 2310 8.33333333333333e+00
+2307 2307 1.25000000000000e+02
+2307 2374 4.16666666666667e+00
+2307 2429 -4.16666666666667e+00
+2307 2060 4.16666666666667e+00
+2307 2059 -8.33333333333333e+00
+2307 2311 8.33333333333333e+00
+2307 2428 -4.16666666666667e+00
+2307 2312 8.33333333333333e+00
+2307 2310 -3.75000000000000e+01
+2307 2300 -4.16666666666667e+00
+2307 2195 4.16666666666667e+00
+2307 2299 8.33333333333333e+00
+2307 2194 -8.33333333333333e+00
+2307 1924 4.16666666666667e+00
+2307 2298 -1.25000000000000e+01
+2307 2309 -1.66666666666667e+01
+2307 2372 8.33333333333333e+00
+2307 1954 4.16666666666667e+00
+2307 2371 -4.16666666666667e+00
+2307 2370 -1.25000000000000e+01
+2307 2191 -4.16666666666667e+00
+2307 2048 8.33333333333333e+00
+2307 2044 4.16666666666667e+00
+2307 2047 -4.16666666666667e+00
+2307 2045 -8.33333333333333e+00
+2307 2204 8.33333333333333e+00
+2307 1925 4.16666666666667e+00
+2307 2192 -4.16666666666667e+00
+2307 2046 -1.25000000000000e+01
+2307 2057 -4.16666666666667e+00
+2307 1955 4.16666666666667e+00
+2307 2308 -1.66666666666667e+01
+2307 2056 8.33333333333333e+00
+2307 2203 8.33333333333333e+00
+2307 2375 -8.33333333333333e+00
+2307 2055 -1.25000000000000e+01
+2307 2202 -3.75000000000000e+01
+2308 2308 1.25000000000000e+02
+2308 2373 4.16666666666667e+00
+2308 2429 -4.16666666666667e+00
+2308 2060 4.16666666666667e+00
+2308 2312 -4.16666666666667e+00
+2308 2058 -8.33333333333333e+00
+2308 2310 8.33333333333333e+00
+2308 2427 -4.16666666666667e+00
+2308 2311 -1.25000000000000e+01
+2308 2195 4.16666666666667e+00
+2308 2298 8.33333333333333e+00
+2308 2193 -8.33333333333333e+00
+2308 2300 8.33333333333333e+00
+2308 2299 -3.75000000000000e+01
+2308 1923 4.16666666666667e+00
+2308 2372 8.33333333333333e+00
+2308 2371 -1.25000000000000e+01
+2308 1953 4.16666666666667e+00
+2308 2370 -4.16666666666667e+00
+2308 2190 -4.16666666666667e+00
+2308 2192 -4.16666666666667e+00
+2308 2309 -1.66666666666667e+01
+2308 2043 4.16666666666667e+00
+2308 2046 -4.16666666666667e+00
+2308 2045 4.16666666666667e+00
+2308 2204 -4.16666666666667e+00
+2308 1925 -8.33333333333333e+00
+2308 2048 8.33333333333333e+00
+2308 2047 -1.25000000000000e+01
+2308 2057 8.33333333333333e+00
+2308 1955 -8.33333333333333e+00
+2308 2375 4.16666666666667e+00
+2308 2056 -3.75000000000000e+01
+2308 2203 -1.25000000000000e+01
+2308 2307 -1.66666666666667e+01
+2308 2055 8.33333333333333e+00
+2308 2202 8.33333333333333e+00
+2309 2309 1.25000000000000e+02
+2309 2373 -8.33333333333333e+00
+2309 2427 -4.16666666666667e+00
+2309 2428 -4.16666666666667e+00
+2309 2058 4.16666666666667e+00
+2309 2059 4.16666666666667e+00
+2309 2311 -4.16666666666667e+00
+2309 2312 -1.25000000000000e+01
+2309 2310 8.33333333333333e+00
+2309 2194 4.16666666666667e+00
+2309 2298 -4.16666666666667e+00
+2309 2193 4.16666666666667e+00
+2309 2300 -1.25000000000000e+01
+2309 2299 8.33333333333333e+00
+2309 2372 -3.75000000000000e+01
+2309 2371 8.33333333333333e+00
+2309 2307 -1.66666666666667e+01
+2309 2370 8.33333333333333e+00
+2309 2191 -4.16666666666667e+00
+2309 2308 -1.66666666666667e+01
+2309 2046 8.33333333333333e+00
+2309 2044 4.16666666666667e+00
+2309 2203 -4.16666666666667e+00
+2309 2043 -8.33333333333333e+00
+2309 2202 8.33333333333333e+00
+2309 2048 -3.75000000000000e+01
+2309 1924 -8.33333333333333e+00
+2309 2047 8.33333333333333e+00
+2309 1923 4.16666666666667e+00
+2309 2190 -4.16666666666667e+00
+2309 2374 4.16666666666667e+00
+2309 2057 -1.25000000000000e+01
+2309 2204 -1.25000000000000e+01
+2309 2056 8.33333333333333e+00
+2309 1954 -8.33333333333333e+00
+2309 2055 -4.16666666666667e+00
+2309 1953 4.16666666666667e+00
+2310 2310 1.25000000000000e+02
+2310 2327 8.33333333333333e+00
+2310 2297 4.16666666666667e+00
+2310 2326 8.33333333333333e+00
+2310 2325 -3.75000000000000e+01
+2310 2305 -4.16666666666667e+00
+2310 2423 4.16666666666667e+00
+2310 2306 8.33333333333333e+00
+2310 2304 -1.25000000000000e+01
+2310 2422 -8.33333333333333e+00
+2310 2312 -1.66666666666667e+01
+2310 1958 -4.16666666666667e+00
+2310 1925 -4.16666666666667e+00
+2310 2389 4.16666666666667e+00
+2310 2374 -4.16666666666667e+00
+2310 2303 -4.16666666666667e+00
+2310 2300 4.16666666666667e+00
+2310 2390 -8.33333333333333e+00
+2310 2375 8.33333333333333e+00
+2310 2373 -1.25000000000000e+01
+2310 2302 8.33333333333333e+00
+2310 2299 -8.33333333333333e+00
+2310 2301 -1.25000000000000e+01
+2310 2060 -4.16666666666667e+00
+2310 2429 4.16666666666667e+00
+2310 2059 8.33333333333333e+00
+2310 2311 -1.66666666666667e+01
+2310 2308 8.33333333333333e+00
+2310 2428 4.16666666666667e+00
+2310 1957 -4.16666666666667e+00
+2310 2058 -1.25000000000000e+01
+2310 2309 8.33333333333333e+00
+2310 2048 -8.33333333333333e+00
+2310 2047 4.16666666666667e+00
+2310 1924 -4.16666666666667e+00
+2310 2307 -3.75000000000000e+01
+2310 2296 4.16666666666667e+00
+2311 2311 1.25000000000000e+02
+2311 2327 -4.16666666666667e+00
+2311 2297 -8.33333333333333e+00
+2311 2326 -1.25000000000000e+01
+2311 2325 8.33333333333333e+00
+2311 2304 -4.16666666666667e+00
+2311 2306 8.33333333333333e+00
+2311 2305 -1.25000000000000e+01
+2311 2423 4.16666666666667e+00
+2311 2421 -8.33333333333333e+00
+2311 2388 4.16666666666667e+00
+2311 2373 -4.16666666666667e+00
+2311 2303 8.33333333333333e+00
+2311 2312 -1.66666666666667e+01
+2311 2375 8.33333333333333e+00
+2311 1958 -4.16666666666667e+00
+2311 2390 4.16666666666667e+00
+2311 2374 -1.25000000000000e+01
+2311 1925 -4.16666666666667e+00
+2311 2300 4.16666666666667e+00
+2311 2302 -3.75000000000000e+01
+2311 2301 8.33333333333333e+00
+2311 2298 -8.33333333333333e+00
+2311 2048 4.16666666666667e+00
+2311 2309 -4.16666666666667e+00
+2311 2058 8.33333333333333e+00
+2311 2310 -1.66666666666667e+01
+2311 2307 8.33333333333333e+00
+2311 2429 -8.33333333333333e+00
+2311 2060 8.33333333333333e+00
+2311 2059 -3.75000000000000e+01
+2311 2427 4.16666666666667e+00
+2311 1956 -4.16666666666667e+00
+2311 2308 -1.25000000000000e+01
+2311 2295 4.16666666666667e+00
+2311 2046 4.16666666666667e+00
+2311 1923 -4.16666666666667e+00
+2312 2312 1.25000000000000e+02
+2312 2325 8.33333333333333e+00
+2312 2296 -8.33333333333333e+00
+2312 2295 4.16666666666667e+00
+2312 2327 -1.25000000000000e+01
+2312 2305 8.33333333333333e+00
+2312 2421 4.16666666666667e+00
+2312 2306 -3.75000000000000e+01
+2312 2304 8.33333333333333e+00
+2312 2422 4.16666666666667e+00
+2312 2310 -1.66666666666667e+01
+2312 1956 -4.16666666666667e+00
+2312 1923 -4.16666666666667e+00
+2312 2302 8.33333333333333e+00
+2312 2311 -1.66666666666667e+01
+2312 2374 8.33333333333333e+00
+2312 2301 -4.16666666666667e+00
+2312 2298 4.16666666666667e+00
+2312 2375 -3.75000000000000e+01
+2312 1957 -4.16666666666667e+00
+2312 2389 4.16666666666667e+00
+2312 2388 -8.33333333333333e+00
+2312 2373 8.33333333333333e+00
+2312 2303 -1.25000000000000e+01
+2312 1924 -4.16666666666667e+00
+2312 2299 4.16666666666667e+00
+2312 2058 -4.16666666666667e+00
+2312 2427 4.16666666666667e+00
+2312 2047 4.16666666666667e+00
+2312 2308 -4.16666666666667e+00
+2312 2060 -1.25000000000000e+01
+2312 2428 -8.33333333333333e+00
+2312 2059 8.33333333333333e+00
+2312 2309 -1.25000000000000e+01
+2312 2326 -4.16666666666667e+00
+2312 2307 8.33333333333333e+00
+2312 2046 -8.33333333333333e+00
+2313 2313 1.25000000000000e+02
+2313 2327 -4.16666666666667e+00
+2313 2326 8.33333333333333e+00
+2313 2325 -1.25000000000000e+01
+2313 2390 4.16666666666667e+00
+2313 2296 4.16666666666667e+00
+2313 2297 -8.33333333333333e+00
+2313 2303 8.33333333333333e+00
+2313 2302 8.33333333333333e+00
+2313 2301 -3.75000000000000e+01
+2313 2314 -1.66666666666667e+01
+2313 1927 -4.16666666666667e+00
+2313 1939 -4.16666666666667e+00
+2313 2392 -4.16666666666667e+00
+2313 2386 4.16666666666667e+00
+2313 2393 -4.16666666666667e+00
+2313 2330 4.16666666666667e+00
+2313 1928 8.33333333333333e+00
+2313 2315 -1.66666666666667e+01
+2313 2321 8.33333333333333e+00
+2313 2329 -8.33333333333333e+00
+2313 2320 8.33333333333333e+00
+2313 2319 -3.75000000000000e+01
+2313 1940 8.33333333333333e+00
+2313 2387 -8.33333333333333e+00
+2313 2014 -4.16666666666667e+00
+2313 2278 4.16666666666667e+00
+2313 2279 4.16666666666667e+00
+2313 2015 -4.16666666666667e+00
+2313 1926 -1.25000000000000e+01
+2313 2285 -4.16666666666667e+00
+2313 2027 4.16666666666667e+00
+2313 2284 8.33333333333333e+00
+2313 2026 -8.33333333333333e+00
+2313 2283 -1.25000000000000e+01
+2313 2389 4.16666666666667e+00
+2313 1938 -1.25000000000000e+01
+2314 2314 1.25000000000000e+02
+2314 2327 8.33333333333333e+00
+2314 2326 -3.75000000000000e+01
+2314 2325 8.33333333333333e+00
+2314 2390 -8.33333333333333e+00
+2314 2295 4.16666666666667e+00
+2314 2297 4.16666666666667e+00
+2314 2303 -4.16666666666667e+00
+2314 2302 -1.25000000000000e+01
+2314 2301 8.33333333333333e+00
+2314 2313 -1.66666666666667e+01
+2314 1926 -4.16666666666667e+00
+2314 1938 -4.16666666666667e+00
+2314 2391 -4.16666666666667e+00
+2314 2385 4.16666666666667e+00
+2314 2330 4.16666666666667e+00
+2314 2321 -4.16666666666667e+00
+2314 2320 -1.25000000000000e+01
+2314 2328 -8.33333333333333e+00
+2314 2319 8.33333333333333e+00
+2314 2393 -4.16666666666667e+00
+2314 2387 4.16666666666667e+00
+2314 2013 -4.16666666666667e+00
+2314 2277 4.16666666666667e+00
+2314 2015 -4.16666666666667e+00
+2314 2027 4.16666666666667e+00
+2314 2279 -8.33333333333333e+00
+2314 1928 8.33333333333333e+00
+2314 1927 -1.25000000000000e+01
+2314 2285 8.33333333333333e+00
+2314 2315 -1.66666666666667e+01
+2314 1940 8.33333333333333e+00
+2314 2284 -3.75000000000000e+01
+2314 2388 4.16666666666667e+00
+2314 1939 -1.25000000000000e+01
+2314 2283 8.33333333333333e+00
+2314 2025 -8.33333333333333e+00
+2315 2315 1.25000000000000e+02
+2315 2326 8.33333333333333e+00
+2315 2325 -4.16666666666667e+00
+2315 2389 -8.33333333333333e+00
+2315 2388 4.16666666666667e+00
+2315 2296 4.16666666666667e+00
+2315 2295 -8.33333333333333e+00
+2315 2303 -1.25000000000000e+01
+2315 2302 -4.16666666666667e+00
+2315 2301 8.33333333333333e+00
+2315 2391 -4.16666666666667e+00
+2315 2328 4.16666666666667e+00
+2315 2321 -1.25000000000000e+01
+2315 2329 4.16666666666667e+00
+2315 2320 -4.16666666666667e+00
+2315 1926 8.33333333333333e+00
+2315 2313 -1.66666666666667e+01
+2315 2319 8.33333333333333e+00
+2315 2392 -4.16666666666667e+00
+2315 2386 4.16666666666667e+00
+2315 1938 8.33333333333333e+00
+2315 2385 -8.33333333333333e+00
+2315 2014 -4.16666666666667e+00
+2315 2026 4.16666666666667e+00
+2315 1928 -3.75000000000000e+01
+2315 2278 -8.33333333333333e+00
+2315 1927 8.33333333333333e+00
+2315 2277 4.16666666666667e+00
+2315 2013 -4.16666666666667e+00
+2315 2285 -1.25000000000000e+01
+2315 2327 -1.25000000000000e+01
+2315 1940 -3.75000000000000e+01
+2315 2284 8.33333333333333e+00
+2315 2314 -1.66666666666667e+01
+2315 1939 8.33333333333333e+00
+2315 2283 -4.16666666666667e+00
+2315 2025 4.16666666666667e+00
+2316 2316 6.25000000000000e+01
+2316 2279 2.08333333333333e+00
+2316 2278 -4.16666666666667e+00
+2316 2287 4.16666666666667e+00
+2316 2286 -6.25000000000000e+00
+2316 1928 4.16666666666667e+00
+2316 2318 -8.33333333333333e+00
+2316 2321 8.33333333333333e+00
+2316 2320 -4.16666666666667e+00
+2316 2319 -1.25000000000000e+01
+2316 2329 4.16666666666667e+00
+2316 2063 -2.08333333333333e+00
+2316 2330 4.16666666666667e+00
+2316 2317 -8.33333333333333e+00
+2316 2062 4.16666666666667e+00
+2316 1927 4.16666666666667e+00
+2316 2288 -2.08333333333333e+00
+2316 2061 -6.25000000000000e+00
+2316 1926 -1.87500000000000e+01
+2316 1304 4.16666666666667e+00
+2316 1574 -8.33333333333333e+00
+2316 1573 4.16666666666667e+00
+2316 1582 -4.16666666666667e+00
+2316 1433 2.08333333333333e+00
+2316 1583 -4.16666666666667e+00
+2316 1303 4.16666666666667e+00
+2316 1432 -4.16666666666667e+00
+2316 1302 -1.87500000000000e+01
+2317 2317 6.25000000000000e+01
+2317 2318 -8.33333333333333e+00
+2317 1928 -2.08333333333333e+00
+2317 2279 2.08333333333333e+00
+2317 2277 -4.16666666666667e+00
+2317 2287 -1.87500000000000e+01
+2317 2286 4.16666666666667e+00
+2317 2321 8.33333333333333e+00
+2317 2320 -1.25000000000000e+01
+2317 2319 -4.16666666666667e+00
+2317 2328 4.16666666666667e+00
+2317 2063 4.16666666666667e+00
+2317 2330 -8.33333333333333e+00
+2317 2288 4.16666666666667e+00
+2317 2062 -1.87500000000000e+01
+2317 1927 -6.25000000000000e+00
+2317 2316 -8.33333333333333e+00
+2317 2061 4.16666666666667e+00
+2317 1926 4.16666666666667e+00
+2317 1304 -2.08333333333333e+00
+2317 1574 4.16666666666667e+00
+2317 1572 4.16666666666667e+00
+2317 1581 -4.16666666666667e+00
+2317 1433 2.08333333333333e+00
+2317 1583 -4.16666666666667e+00
+2317 1303 -6.25000000000000e+00
+2317 1302 4.16666666666667e+00
+2317 1431 -4.16666666666667e+00
+2318 2318 6.25000000000000e+01
+2318 2317 -8.33333333333333e+00
+2318 2286 -2.08333333333333e+00
+2318 2277 2.08333333333333e+00
+2318 1927 -2.08333333333333e+00
+2318 2278 2.08333333333333e+00
+2318 2288 -6.25000000000000e+00
+2318 2321 -3.75000000000000e+01
+2318 2320 8.33333333333333e+00
+2318 1926 4.16666666666667e+00
+2318 2316 -8.33333333333333e+00
+2318 2319 8.33333333333333e+00
+2318 2287 4.16666666666667e+00
+2318 2063 -6.25000000000000e+00
+2318 1928 -6.25000000000000e+00
+2318 2062 4.16666666666667e+00
+2318 2329 -8.33333333333333e+00
+2318 2061 -2.08333333333333e+00
+2318 2328 4.16666666666667e+00
+2318 1303 -2.08333333333333e+00
+2318 1573 4.16666666666667e+00
+2318 1302 4.16666666666667e+00
+2318 1572 -8.33333333333333e+00
+2318 1432 2.08333333333333e+00
+2318 1582 -4.16666666666667e+00
+2318 1304 -6.25000000000000e+00
+2318 1431 2.08333333333333e+00
+2318 1581 -4.16666666666667e+00
+2319 2319 1.25000000000000e+02
+2319 2284 -8.33333333333333e+00
+2319 2279 -4.16666666666667e+00
+2319 2287 4.16666666666667e+00
+2319 2278 -4.16666666666667e+00
+2319 2288 4.16666666666667e+00
+2319 2294 -4.16666666666667e+00
+2319 2293 8.33333333333333e+00
+2319 2292 -1.25000000000000e+01
+2319 2318 8.33333333333333e+00
+2319 1927 4.16666666666667e+00
+2319 2317 -4.16666666666667e+00
+2319 2316 -1.25000000000000e+01
+2319 2321 -1.66666666666667e+01
+2319 2386 -4.16666666666667e+00
+2319 2330 -4.16666666666667e+00
+2319 2392 4.16666666666667e+00
+2319 2393 4.16666666666667e+00
+2319 1928 -8.33333333333333e+00
+2319 2315 8.33333333333333e+00
+2319 2329 8.33333333333333e+00
+2319 2314 8.33333333333333e+00
+2319 2320 -1.66666666666667e+01
+2319 2328 -1.25000000000000e+01
+2319 2313 -3.75000000000000e+01
+2319 2387 8.33333333333333e+00
+2319 2285 4.16666666666667e+00
+2319 2385 -1.25000000000000e+01
+2319 1583 4.16666666666667e+00
+2319 1582 -8.33333333333333e+00
+2319 1573 8.33333333333333e+00
+2319 1574 8.33333333333333e+00
+2319 1315 4.16666666666667e+00
+2319 1572 -3.75000000000000e+01
+2319 1645 -4.16666666666667e+00
+2319 1646 -4.16666666666667e+00
+2319 1316 -8.33333333333333e+00
+2320 2320 1.25000000000000e+02
+2320 2283 -8.33333333333333e+00
+2320 2286 4.16666666666667e+00
+2320 2277 -4.16666666666667e+00
+2320 2288 -8.33333333333333e+00
+2320 2294 8.33333333333333e+00
+2320 2279 -4.16666666666667e+00
+2320 2293 -3.75000000000000e+01
+2320 2292 8.33333333333333e+00
+2320 2318 8.33333333333333e+00
+2320 2321 -1.66666666666667e+01
+2320 2317 -1.25000000000000e+01
+2320 1926 4.16666666666667e+00
+2320 2316 -4.16666666666667e+00
+2320 2385 -4.16666666666667e+00
+2320 2330 8.33333333333333e+00
+2320 2391 4.16666666666667e+00
+2320 2393 -8.33333333333333e+00
+2320 2387 8.33333333333333e+00
+2320 1928 4.16666666666667e+00
+2320 2315 -4.16666666666667e+00
+2320 2329 -3.75000000000000e+01
+2320 2314 -1.25000000000000e+01
+2320 2328 8.33333333333333e+00
+2320 2313 8.33333333333333e+00
+2320 2319 -1.66666666666667e+01
+2320 2285 4.16666666666667e+00
+2320 2386 -1.25000000000000e+01
+2320 1583 4.16666666666667e+00
+2320 1574 -4.16666666666667e+00
+2320 1581 -8.33333333333333e+00
+2320 1572 8.33333333333333e+00
+2320 1573 -1.25000000000000e+01
+2320 1314 4.16666666666667e+00
+2320 1644 -4.16666666666667e+00
+2320 1646 -4.16666666666667e+00
+2320 1316 4.16666666666667e+00
+2321 2321 1.25000000000000e+02
+2321 2283 4.16666666666667e+00
+2321 2277 -4.16666666666667e+00
+2321 2287 -8.33333333333333e+00
+2321 2293 8.33333333333333e+00
+2321 2286 4.16666666666667e+00
+2321 2292 -4.16666666666667e+00
+2321 2278 -4.16666666666667e+00
+2321 2294 -1.25000000000000e+01
+2321 2318 -3.75000000000000e+01
+2321 2317 8.33333333333333e+00
+2321 2320 -1.66666666666667e+01
+2321 2316 8.33333333333333e+00
+2321 2319 -1.66666666666667e+01
+2321 2328 -4.16666666666667e+00
+2321 2329 8.33333333333333e+00
+2321 2392 -8.33333333333333e+00
+2321 2386 8.33333333333333e+00
+2321 2391 4.16666666666667e+00
+2321 2330 -1.25000000000000e+01
+2321 2315 -1.25000000000000e+01
+2321 1927 4.16666666666667e+00
+2321 2314 -4.16666666666667e+00
+2321 1926 -8.33333333333333e+00
+2321 2313 8.33333333333333e+00
+2321 2284 4.16666666666667e+00
+2321 2387 -3.75000000000000e+01
+2321 2385 8.33333333333333e+00
+2321 1582 4.16666666666667e+00
+2321 1573 -4.16666666666667e+00
+2321 1581 4.16666666666667e+00
+2321 1574 -1.25000000000000e+01
+2321 1572 8.33333333333333e+00
+2321 1644 -4.16666666666667e+00
+2321 1645 -4.16666666666667e+00
+2321 1315 4.16666666666667e+00
+2321 1314 -8.33333333333333e+00
+2322 2322 6.25000000000000e+01
+2322 2306 4.16666666666667e+00
+2322 2297 2.08333333333333e+00
+2322 1928 -2.08333333333333e+00
+2322 2296 -4.16666666666667e+00
+2322 1952 -2.08333333333333e+00
+2322 2305 4.16666666666667e+00
+2322 2304 -1.87500000000000e+01
+2322 2423 4.16666666666667e+00
+2322 2422 4.16666666666667e+00
+2322 2327 8.33333333333333e+00
+2322 2326 -4.16666666666667e+00
+2322 2325 -1.25000000000000e+01
+2322 2329 4.16666666666667e+00
+2322 2425 -4.16666666666667e+00
+2322 2066 2.08333333333333e+00
+2322 2426 -4.16666666666667e+00
+2322 2065 -4.16666666666667e+00
+2322 1951 4.16666666666667e+00
+2322 1950 -6.25000000000000e+00
+2322 2063 4.16666666666667e+00
+2322 2330 -8.33333333333333e+00
+2322 2062 4.16666666666667e+00
+2322 2323 -8.33333333333333e+00
+2322 1927 4.16666666666667e+00
+2322 2061 -1.87500000000000e+01
+2322 2324 -8.33333333333333e+00
+2322 1926 -6.25000000000000e+00
+2323 2323 6.25000000000000e+01
+2323 2297 2.08333333333333e+00
+2323 2295 -4.16666666666667e+00
+2323 2305 -6.25000000000000e+00
+2323 2304 4.16666666666667e+00
+2323 1952 4.16666666666667e+00
+2323 2423 -8.33333333333333e+00
+2323 2421 4.16666666666667e+00
+2323 2324 -8.33333333333333e+00
+2323 1928 4.16666666666667e+00
+2323 2327 8.33333333333333e+00
+2323 2326 -1.25000000000000e+01
+2323 2325 -4.16666666666667e+00
+2323 2328 4.16666666666667e+00
+2323 2424 -4.16666666666667e+00
+2323 2066 2.08333333333333e+00
+2323 2426 -4.16666666666667e+00
+2323 1951 -1.87500000000000e+01
+2323 2064 -4.16666666666667e+00
+2323 1950 4.16666666666667e+00
+2323 2063 -2.08333333333333e+00
+2323 2330 4.16666666666667e+00
+2323 2062 -6.25000000000000e+00
+2323 2306 -2.08333333333333e+00
+2323 1927 -1.87500000000000e+01
+2323 2061 4.16666666666667e+00
+2323 2322 -8.33333333333333e+00
+2323 1926 4.16666666666667e+00
+2324 2324 6.25000000000000e+01
+2324 2296 2.08333333333333e+00
+2324 2322 -8.33333333333333e+00
+2324 2304 4.16666666666667e+00
+2324 2295 2.08333333333333e+00
+2324 1926 -2.08333333333333e+00
+2324 2306 -6.25000000000000e+00
+2324 1950 -2.08333333333333e+00
+2324 2421 4.16666666666667e+00
+2324 1951 4.16666666666667e+00
+2324 2422 -8.33333333333333e+00
+2324 2327 -3.75000000000000e+01
+2324 2323 -8.33333333333333e+00
+2324 1927 4.16666666666667e+00
+2324 2326 8.33333333333333e+00
+2324 2325 8.33333333333333e+00
+2324 2064 2.08333333333333e+00
+2324 2424 -4.16666666666667e+00
+2324 1952 -6.25000000000000e+00
+2324 2065 2.08333333333333e+00
+2324 2425 -4.16666666666667e+00
+2324 2063 -6.25000000000000e+00
+2324 2305 -2.08333333333333e+00
+2324 1928 -6.25000000000000e+00
+2324 2062 -2.08333333333333e+00
+2324 2329 4.16666666666667e+00
+2324 2061 4.16666666666667e+00
+2324 2328 -8.33333333333333e+00
+2325 2325 1.25000000000000e+02
+2325 2302 -8.33333333333333e+00
+2325 2296 -4.16666666666667e+00
+2325 2305 4.16666666666667e+00
+2325 2312 8.33333333333333e+00
+2325 2306 -8.33333333333333e+00
+2325 2297 -4.16666666666667e+00
+2325 2311 8.33333333333333e+00
+2325 2310 -3.75000000000000e+01
+2325 2426 4.16666666666667e+00
+2325 2423 -4.16666666666667e+00
+2325 2422 8.33333333333333e+00
+2325 2425 -8.33333333333333e+00
+2325 2324 8.33333333333333e+00
+2325 2327 -1.66666666666667e+01
+2325 2323 -4.16666666666667e+00
+2325 1927 4.16666666666667e+00
+2325 2322 -1.25000000000000e+01
+2325 1957 4.16666666666667e+00
+2325 2421 -1.25000000000000e+01
+2325 2389 -4.16666666666667e+00
+2325 2330 8.33333333333333e+00
+2325 2392 4.16666666666667e+00
+2325 2434 -4.16666666666667e+00
+2325 2393 -8.33333333333333e+00
+2325 2390 8.33333333333333e+00
+2325 1928 4.16666666666667e+00
+2325 2315 -4.16666666666667e+00
+2325 2329 8.33333333333333e+00
+2325 2314 8.33333333333333e+00
+2325 2326 -1.66666666666667e+01
+2325 2328 -3.75000000000000e+01
+2325 2313 -1.25000000000000e+01
+2325 2435 -4.16666666666667e+00
+2325 1958 4.16666666666667e+00
+2325 2303 4.16666666666667e+00
+2325 2388 -1.25000000000000e+01
+2326 2326 1.25000000000000e+02
+2326 2301 -8.33333333333333e+00
+2326 2297 -4.16666666666667e+00
+2326 2295 -4.16666666666667e+00
+2326 2304 4.16666666666667e+00
+2326 2312 -4.16666666666667e+00
+2326 2306 4.16666666666667e+00
+2326 2311 -1.25000000000000e+01
+2326 2310 8.33333333333333e+00
+2326 2426 4.16666666666667e+00
+2326 2421 8.33333333333333e+00
+2326 2424 -8.33333333333333e+00
+2326 2324 8.33333333333333e+00
+2326 2323 -1.25000000000000e+01
+2326 2322 -4.16666666666667e+00
+2326 1926 4.16666666666667e+00
+2326 2423 8.33333333333333e+00
+2326 2422 -3.75000000000000e+01
+2326 1956 4.16666666666667e+00
+2326 2327 -1.66666666666667e+01
+2326 2388 -4.16666666666667e+00
+2326 2330 -4.16666666666667e+00
+2326 2391 4.16666666666667e+00
+2326 2433 -4.16666666666667e+00
+2326 2435 -4.16666666666667e+00
+2326 2393 4.16666666666667e+00
+2326 1928 -8.33333333333333e+00
+2326 2315 8.33333333333333e+00
+2326 2329 -1.25000000000000e+01
+2326 2314 -3.75000000000000e+01
+2326 2328 8.33333333333333e+00
+2326 2313 8.33333333333333e+00
+2326 2325 -1.66666666666667e+01
+2326 2390 8.33333333333333e+00
+2326 1958 -8.33333333333333e+00
+2326 2303 4.16666666666667e+00
+2326 2389 -1.25000000000000e+01
+2327 2327 1.25000000000000e+02
+2327 2302 4.16666666666667e+00
+2327 2296 -4.16666666666667e+00
+2327 2311 -4.16666666666667e+00
+2327 2305 4.16666666666667e+00
+2327 2310 8.33333333333333e+00
+2327 2304 -8.33333333333333e+00
+2327 2295 -4.16666666666667e+00
+2327 2312 -1.25000000000000e+01
+2327 2424 4.16666666666667e+00
+2327 2421 -4.16666666666667e+00
+2327 2425 4.16666666666667e+00
+2327 2324 -3.75000000000000e+01
+2327 2323 8.33333333333333e+00
+2327 2322 8.33333333333333e+00
+2327 2325 -1.66666666666667e+01
+2327 2423 -1.25000000000000e+01
+2327 2422 8.33333333333333e+00
+2327 2326 -1.66666666666667e+01
+2327 2329 -4.16666666666667e+00
+2327 2328 8.33333333333333e+00
+2327 2434 -4.16666666666667e+00
+2327 2392 4.16666666666667e+00
+2327 2391 -8.33333333333333e+00
+2327 2388 8.33333333333333e+00
+2327 2330 -1.25000000000000e+01
+2327 2315 -1.25000000000000e+01
+2327 1927 -8.33333333333333e+00
+2327 2314 8.33333333333333e+00
+2327 1926 4.16666666666667e+00
+2327 2313 -4.16666666666667e+00
+2327 2301 4.16666666666667e+00
+2327 2390 -3.75000000000000e+01
+2327 2389 8.33333333333333e+00
+2327 1957 -8.33333333333333e+00
+2327 2433 -4.16666666666667e+00
+2327 1956 4.16666666666667e+00
+2328 2328 1.25000000000000e+02
+2328 2434 4.16666666666667e+00
+2328 2435 4.16666666666667e+00
+2328 2326 8.33333333333333e+00
+2328 2325 -3.75000000000000e+01
+2328 2323 4.16666666666667e+00
+2328 2426 -4.16666666666667e+00
+2328 2324 -8.33333333333333e+00
+2328 2425 8.33333333333333e+00
+2328 2424 -1.25000000000000e+01
+2328 2329 -1.66666666666667e+01
+2328 1927 -4.16666666666667e+00
+2328 2315 4.16666666666667e+00
+2328 2321 -4.16666666666667e+00
+2328 2392 -4.16666666666667e+00
+2328 2314 -8.33333333333333e+00
+2328 2320 8.33333333333333e+00
+2328 2319 -1.25000000000000e+01
+2328 2393 8.33333333333333e+00
+2328 2391 -1.25000000000000e+01
+2328 2062 -4.16666666666667e+00
+2328 2317 4.16666666666667e+00
+2328 2063 8.33333333333333e+00
+2328 2330 -1.66666666666667e+01
+2328 2318 4.16666666666667e+00
+2328 1928 -4.16666666666667e+00
+2328 2061 -1.25000000000000e+01
+2328 2327 8.33333333333333e+00
+2328 1345 -4.16666666666667e+00
+2328 1645 4.16666666666667e+00
+2328 1646 -8.33333333333333e+00
+2328 1583 8.33333333333333e+00
+2328 1439 4.16666666666667e+00
+2328 1346 -4.16666666666667e+00
+2328 1582 8.33333333333333e+00
+2328 1438 -8.33333333333333e+00
+2328 1581 -3.75000000000000e+01
+2329 2329 1.25000000000000e+02
+2329 2433 4.16666666666667e+00
+2329 2435 -8.33333333333333e+00
+2329 2326 -1.25000000000000e+01
+2329 2325 8.33333333333333e+00
+2329 2322 4.16666666666667e+00
+2329 2426 8.33333333333333e+00
+2329 2324 4.16666666666667e+00
+2329 2425 -3.75000000000000e+01
+2329 2424 8.33333333333333e+00
+2329 2328 -1.66666666666667e+01
+2329 1926 -4.16666666666667e+00
+2329 2393 8.33333333333333e+00
+2329 2330 -1.66666666666667e+01
+2329 2321 8.33333333333333e+00
+2329 2391 -4.16666666666667e+00
+2329 1928 -4.16666666666667e+00
+2329 2315 4.16666666666667e+00
+2329 2320 -3.75000000000000e+01
+2329 2313 -8.33333333333333e+00
+2329 2319 8.33333333333333e+00
+2329 2392 -1.25000000000000e+01
+2329 2061 -4.16666666666667e+00
+2329 2316 4.16666666666667e+00
+2329 2318 -8.33333333333333e+00
+2329 2063 8.33333333333333e+00
+2329 2062 -1.25000000000000e+01
+2329 2327 -4.16666666666667e+00
+2329 1344 -4.16666666666667e+00
+2329 1644 4.16666666666667e+00
+2329 1346 -4.16666666666667e+00
+2329 1646 4.16666666666667e+00
+2329 1439 4.16666666666667e+00
+2329 1583 -4.16666666666667e+00
+2329 1582 -1.25000000000000e+01
+2329 1581 8.33333333333333e+00
+2329 1437 -8.33333333333333e+00
+2330 2330 1.25000000000000e+02
+2330 2325 8.33333333333333e+00
+2330 2434 -8.33333333333333e+00
+2330 2433 4.16666666666667e+00
+2330 2327 -1.25000000000000e+01
+2330 2425 8.33333333333333e+00
+2330 2424 -4.16666666666667e+00
+2330 2323 4.16666666666667e+00
+2330 2322 -8.33333333333333e+00
+2330 2426 -1.25000000000000e+01
+2330 2313 4.16666666666667e+00
+2330 2319 -4.16666666666667e+00
+2330 2392 8.33333333333333e+00
+2330 2329 -1.66666666666667e+01
+2330 2320 8.33333333333333e+00
+2330 2321 -1.25000000000000e+01
+2330 1927 -4.16666666666667e+00
+2330 2314 4.16666666666667e+00
+2330 2393 -3.75000000000000e+01
+2330 2391 8.33333333333333e+00
+2330 2061 8.33333333333333e+00
+2330 2328 -1.66666666666667e+01
+2330 2063 -3.75000000000000e+01
+2330 2317 -8.33333333333333e+00
+2330 2062 8.33333333333333e+00
+2330 2316 4.16666666666667e+00
+2330 1926 -4.16666666666667e+00
+2330 2326 -4.16666666666667e+00
+2330 1345 -4.16666666666667e+00
+2330 1645 4.16666666666667e+00
+2330 1644 -8.33333333333333e+00
+2330 1438 4.16666666666667e+00
+2330 1582 -4.16666666666667e+00
+2330 1581 8.33333333333333e+00
+2330 1583 -1.25000000000000e+01
+2330 1437 4.16666666666667e+00
+2330 1344 -4.16666666666667e+00
+2331 2331 6.25000000000000e+01
+2331 2363 -4.16666666666667e+00
+2331 2360 -4.16666666666667e+00
+2331 2359 2.08333333333333e+00
+2331 2362 -4.16666666666667e+00
+2331 2342 4.16666666666667e+00
+2331 2341 -2.08333333333333e+00
+2331 2347 4.16666666666667e+00
+2331 2340 -6.25000000000000e+00
+2331 2020 -2.08333333333333e+00
+2331 2017 2.08333333333333e+00
+2331 2351 4.16666666666667e+00
+2331 2339 -4.16666666666667e+00
+2331 1931 4.16666666666667e+00
+2331 2018 -4.16666666666667e+00
+2331 1930 4.16666666666667e+00
+2331 2332 -8.33333333333333e+00
+2331 2338 8.33333333333333e+00
+2331 1929 -1.87500000000000e+01
+2331 2337 -1.25000000000000e+01
+2331 2333 -8.33333333333333e+00
+2331 1934 4.16666666666667e+00
+2331 2021 4.16666666666667e+00
+2331 1933 4.16666666666667e+00
+2331 2350 -8.33333333333333e+00
+2331 2348 4.16666666666667e+00
+2331 1932 -1.87500000000000e+01
+2331 2019 -6.25000000000000e+00
+2332 2332 6.25000000000000e+01
+2332 2363 -4.16666666666667e+00
+2332 2358 2.08333333333333e+00
+2332 2361 -4.16666666666667e+00
+2332 2342 4.16666666666667e+00
+2332 2348 -8.33333333333333e+00
+2332 2341 -6.25000000000000e+00
+2332 2340 -2.08333333333333e+00
+2332 2346 4.16666666666667e+00
+2332 2019 -2.08333333333333e+00
+2332 2016 2.08333333333333e+00
+2332 2021 4.16666666666667e+00
+2332 2333 -8.33333333333333e+00
+2332 2339 8.33333333333333e+00
+2332 1931 -2.08333333333333e+00
+2332 2018 2.08333333333333e+00
+2332 1930 -6.25000000000000e+00
+2332 2338 -3.75000000000000e+01
+2332 1929 4.16666666666667e+00
+2332 2331 -8.33333333333333e+00
+2332 2337 8.33333333333333e+00
+2332 1934 -2.08333333333333e+00
+2332 2351 4.16666666666667e+00
+2332 2360 2.08333333333333e+00
+2332 1933 -6.25000000000000e+00
+2332 2020 -6.25000000000000e+00
+2332 1932 4.16666666666667e+00
+2332 2349 -8.33333333333333e+00
+2333 2333 6.25000000000000e+01
+2333 2362 -4.16666666666667e+00
+2333 2346 4.16666666666667e+00
+2333 2361 -4.16666666666667e+00
+2333 2358 -4.16666666666667e+00
+2333 2342 -1.87500000000000e+01
+2333 2341 4.16666666666667e+00
+2333 2347 -8.33333333333333e+00
+2333 2340 4.16666666666667e+00
+2333 2020 4.16666666666667e+00
+2333 2332 -8.33333333333333e+00
+2333 2338 8.33333333333333e+00
+2333 2349 4.16666666666667e+00
+2333 2337 -4.16666666666667e+00
+2333 1931 -6.25000000000000e+00
+2333 2339 -1.25000000000000e+01
+2333 1930 -2.08333333333333e+00
+2333 2017 2.08333333333333e+00
+2333 1929 4.16666666666667e+00
+2333 2016 -4.16666666666667e+00
+2333 2359 2.08333333333333e+00
+2333 1934 -6.25000000000000e+00
+2333 2021 -1.87500000000000e+01
+2333 1933 -2.08333333333333e+00
+2333 2350 4.16666666666667e+00
+2333 2331 -8.33333333333333e+00
+2333 1932 4.16666666666667e+00
+2333 2019 4.16666666666667e+00
+2334 2334 1.25000000000000e+02
+2334 2348 -8.33333333333333e+00
+2334 2347 4.16666666666667e+00
+2334 2380 -4.16666666666667e+00
+2334 2339 8.33333333333333e+00
+2334 2369 4.16666666666667e+00
+2334 2368 -8.33333333333333e+00
+2334 2338 8.33333333333333e+00
+2334 2337 -3.75000000000000e+01
+2334 2336 -1.66666666666667e+01
+2334 2345 8.33333333333333e+00
+2334 2344 -4.16666666666667e+00
+2334 2377 4.16666666666667e+00
+2334 2378 4.16666666666667e+00
+2334 1937 -4.16666666666667e+00
+2334 1931 -4.16666666666667e+00
+2334 2343 -1.25000000000000e+01
+2334 2228 4.16666666666667e+00
+2334 1930 8.33333333333333e+00
+2334 2227 -8.33333333333333e+00
+2334 2231 8.33333333333333e+00
+2334 2335 -1.66666666666667e+01
+2334 1936 8.33333333333333e+00
+2334 2230 8.33333333333333e+00
+2334 2229 -3.75000000000000e+01
+2334 2018 4.16666666666667e+00
+2334 2165 -4.16666666666667e+00
+2334 2017 4.16666666666667e+00
+2334 2164 -4.16666666666667e+00
+2334 1929 -1.25000000000000e+01
+2334 2024 8.33333333333333e+00
+2334 2168 -8.33333333333333e+00
+2334 2023 -4.16666666666667e+00
+2334 2167 4.16666666666667e+00
+2334 2022 -1.25000000000000e+01
+2334 2381 -4.16666666666667e+00
+2334 1935 -1.25000000000000e+01
+2335 2335 1.25000000000000e+02
+2335 2381 -4.16666666666667e+00
+2335 2346 4.16666666666667e+00
+2335 2379 -4.16666666666667e+00
+2335 2369 4.16666666666667e+00
+2335 2339 -4.16666666666667e+00
+2335 2367 -8.33333333333333e+00
+2335 2338 -1.25000000000000e+01
+2335 2337 8.33333333333333e+00
+2335 2343 -4.16666666666667e+00
+2335 2376 4.16666666666667e+00
+2335 2378 -8.33333333333333e+00
+2335 2345 8.33333333333333e+00
+2335 2344 -1.25000000000000e+01
+2335 2228 4.16666666666667e+00
+2335 1929 8.33333333333333e+00
+2335 2226 -8.33333333333333e+00
+2335 2231 -4.16666666666667e+00
+2335 2230 -1.25000000000000e+01
+2335 2334 -1.66666666666667e+01
+2335 1935 8.33333333333333e+00
+2335 2229 8.33333333333333e+00
+2335 2168 4.16666666666667e+00
+2335 2165 -4.16666666666667e+00
+2335 2018 -8.33333333333333e+00
+2335 1931 8.33333333333333e+00
+2335 1930 -3.75000000000000e+01
+2335 2016 4.16666666666667e+00
+2335 2163 -4.16666666666667e+00
+2335 2024 8.33333333333333e+00
+2335 2336 -1.66666666666667e+01
+2335 1937 8.33333333333333e+00
+2335 2023 -1.25000000000000e+01
+2335 2348 4.16666666666667e+00
+2335 1936 -3.75000000000000e+01
+2335 2022 -4.16666666666667e+00
+2335 2166 4.16666666666667e+00
+2336 2336 1.25000000000000e+02
+2336 2347 4.16666666666667e+00
+2336 2380 -4.16666666666667e+00
+2336 2346 -8.33333333333333e+00
+2336 2368 4.16666666666667e+00
+2336 2338 -4.16666666666667e+00
+2336 2337 8.33333333333333e+00
+2336 2367 4.16666666666667e+00
+2336 2339 -1.25000000000000e+01
+2336 2334 -1.66666666666667e+01
+2336 2343 8.33333333333333e+00
+2336 2377 -8.33333333333333e+00
+2336 2376 4.16666666666667e+00
+2336 1935 -4.16666666666667e+00
+2336 2345 -3.75000000000000e+01
+2336 2344 8.33333333333333e+00
+2336 1929 -4.16666666666667e+00
+2336 2226 4.16666666666667e+00
+2336 2227 4.16666666666667e+00
+2336 2231 -1.25000000000000e+01
+2336 2230 -4.16666666666667e+00
+2336 2229 8.33333333333333e+00
+2336 2167 4.16666666666667e+00
+2336 2164 -4.16666666666667e+00
+2336 2016 4.16666666666667e+00
+2336 2163 -4.16666666666667e+00
+2336 1931 -1.25000000000000e+01
+2336 2017 -8.33333333333333e+00
+2336 1930 8.33333333333333e+00
+2336 2024 -3.75000000000000e+01
+2336 2379 -4.16666666666667e+00
+2336 1937 -1.25000000000000e+01
+2336 2023 8.33333333333333e+00
+2336 2335 -1.66666666666667e+01
+2336 1936 8.33333333333333e+00
+2336 2022 8.33333333333333e+00
+2336 2166 -8.33333333333333e+00
+2337 2337 1.25000000000000e+02
+2337 2381 4.16666666666667e+00
+2337 2336 8.33333333333333e+00
+2337 2024 -8.33333333333333e+00
+2337 2023 4.16666666666667e+00
+2337 2335 8.33333333333333e+00
+2337 2334 -3.75000000000000e+01
+2337 2369 -4.16666666666667e+00
+2337 2368 8.33333333333333e+00
+2337 2367 -1.25000000000000e+01
+2337 2347 -4.16666666666667e+00
+2337 2395 -4.16666666666667e+00
+2337 2362 4.16666666666667e+00
+2337 2348 8.33333333333333e+00
+2337 2363 -8.33333333333333e+00
+2337 1940 4.16666666666667e+00
+2337 2396 -4.16666666666667e+00
+2337 1931 4.16666666666667e+00
+2337 2346 -1.25000000000000e+01
+2337 2018 -4.16666666666667e+00
+2337 2017 -4.16666666666667e+00
+2337 2021 4.16666666666667e+00
+2337 2333 -4.16666666666667e+00
+2337 2338 -1.66666666666667e+01
+2337 2020 4.16666666666667e+00
+2337 2026 -4.16666666666667e+00
+2337 1930 -8.33333333333333e+00
+2337 2332 8.33333333333333e+00
+2337 2331 -1.25000000000000e+01
+2337 2339 -1.66666666666667e+01
+2337 2351 8.33333333333333e+00
+2337 2027 8.33333333333333e+00
+2337 2350 8.33333333333333e+00
+2337 1939 -8.33333333333333e+00
+2337 2380 4.16666666666667e+00
+2337 2349 -3.75000000000000e+01
+2337 2025 -1.25000000000000e+01
+2338 2338 1.25000000000000e+02
+2338 2381 -8.33333333333333e+00
+2338 2336 -4.16666666666667e+00
+2338 2024 4.16666666666667e+00
+2338 2022 4.16666666666667e+00
+2338 2335 -1.25000000000000e+01
+2338 2334 8.33333333333333e+00
+2338 2369 8.33333333333333e+00
+2338 2368 -3.75000000000000e+01
+2338 2367 8.33333333333333e+00
+2338 2346 -4.16666666666667e+00
+2338 2394 -4.16666666666667e+00
+2338 2361 4.16666666666667e+00
+2338 2396 -4.16666666666667e+00
+2338 2363 4.16666666666667e+00
+2338 2339 -1.66666666666667e+01
+2338 2348 8.33333333333333e+00
+2338 2347 -1.25000000000000e+01
+2338 2016 -4.16666666666667e+00
+2338 2333 8.33333333333333e+00
+2338 2337 -1.66666666666667e+01
+2338 2021 -8.33333333333333e+00
+2338 2027 8.33333333333333e+00
+2338 2019 4.16666666666667e+00
+2338 2025 -4.16666666666667e+00
+2338 1931 4.16666666666667e+00
+2338 2018 -4.16666666666667e+00
+2338 2332 -3.75000000000000e+01
+2338 1929 -8.33333333333333e+00
+2338 2331 8.33333333333333e+00
+2338 2351 -4.16666666666667e+00
+2338 1940 4.16666666666667e+00
+2338 2379 4.16666666666667e+00
+2338 2350 -1.25000000000000e+01
+2338 2026 -1.25000000000000e+01
+2338 2349 8.33333333333333e+00
+2338 1938 -8.33333333333333e+00
+2339 2339 1.25000000000000e+02
+2339 2379 4.16666666666667e+00
+2339 2335 -4.16666666666667e+00
+2339 2023 4.16666666666667e+00
+2339 2334 8.33333333333333e+00
+2339 2022 -8.33333333333333e+00
+2339 2336 -1.25000000000000e+01
+2339 2369 -1.25000000000000e+01
+2339 2368 8.33333333333333e+00
+2339 2367 -4.16666666666667e+00
+2339 2395 -4.16666666666667e+00
+2339 2362 4.16666666666667e+00
+2339 2346 8.33333333333333e+00
+2339 2361 -8.33333333333333e+00
+2339 1938 4.16666666666667e+00
+2339 2394 -4.16666666666667e+00
+2339 2348 -3.75000000000000e+01
+2339 2338 -1.66666666666667e+01
+2339 2347 8.33333333333333e+00
+2339 1929 4.16666666666667e+00
+2339 2016 -4.16666666666667e+00
+2339 2332 8.33333333333333e+00
+2339 2019 4.16666666666667e+00
+2339 2331 -4.16666666666667e+00
+2339 2020 -8.33333333333333e+00
+2339 2026 8.33333333333333e+00
+2339 2333 -1.25000000000000e+01
+2339 1930 4.16666666666667e+00
+2339 2017 -4.16666666666667e+00
+2339 2380 -8.33333333333333e+00
+2339 2351 -1.25000000000000e+01
+2339 2027 -3.75000000000000e+01
+2339 2350 -4.16666666666667e+00
+2339 1939 4.16666666666667e+00
+2339 2337 -1.66666666666667e+01
+2339 2349 8.33333333333333e+00
+2339 2025 8.33333333333333e+00
+2340 2340 6.25000000000000e+01
+2340 2363 4.16666666666667e+00
+2340 2362 -8.33333333333333e+00
+2340 2333 4.16666666666667e+00
+2340 2332 -2.08333333333333e+00
+2340 1930 2.08333333333333e+00
+2340 2331 -6.25000000000000e+00
+2340 2360 4.16666666666667e+00
+2340 1969 2.08333333333333e+00
+2340 2358 -1.87500000000000e+01
+2340 2348 -4.16666666666667e+00
+2340 2342 -8.33333333333333e+00
+2340 2089 -2.08333333333333e+00
+2340 2459 -4.16666666666667e+00
+2340 2096 4.16666666666667e+00
+2340 2458 -4.16666666666667e+00
+2340 2095 4.16666666666667e+00
+2340 2090 4.16666666666667e+00
+2340 1970 -4.16666666666667e+00
+2340 2088 -6.25000000000000e+00
+2340 2084 4.16666666666667e+00
+2340 1931 -4.16666666666667e+00
+2340 2083 4.16666666666667e+00
+2340 2341 -8.33333333333333e+00
+2340 2347 8.33333333333333e+00
+2340 2082 -1.87500000000000e+01
+2340 2359 4.16666666666667e+00
+2340 2346 -1.25000000000000e+01
+2341 2341 6.25000000000000e+01
+2341 2358 4.16666666666667e+00
+2341 2363 4.16666666666667e+00
+2341 2361 -8.33333333333333e+00
+2341 2333 4.16666666666667e+00
+2341 2342 -8.33333333333333e+00
+2341 2332 -6.25000000000000e+00
+2341 2331 -2.08333333333333e+00
+2341 1929 2.08333333333333e+00
+2341 2359 -6.25000000000000e+00
+2341 1968 2.08333333333333e+00
+2341 2088 -2.08333333333333e+00
+2341 2090 4.16666666666667e+00
+2341 2348 8.33333333333333e+00
+2341 2096 -8.33333333333333e+00
+2341 2457 -4.16666666666667e+00
+2341 2094 4.16666666666667e+00
+2341 1970 2.08333333333333e+00
+2341 2459 -4.16666666666667e+00
+2341 2089 -6.25000000000000e+00
+2341 2084 -2.08333333333333e+00
+2341 1931 2.08333333333333e+00
+2341 2083 -6.25000000000000e+00
+2341 2360 -2.08333333333333e+00
+2341 2347 -3.75000000000000e+01
+2341 2082 4.16666666666667e+00
+2341 2340 -8.33333333333333e+00
+2341 2346 8.33333333333333e+00
+2342 2342 6.25000000000000e+01
+2342 2361 4.16666666666667e+00
+2342 2362 4.16666666666667e+00
+2342 2333 -1.87500000000000e+01
+2342 2332 4.16666666666667e+00
+2342 2341 -8.33333333333333e+00
+2342 2331 4.16666666666667e+00
+2342 2360 -6.25000000000000e+00
+2342 2358 4.16666666666667e+00
+2342 2346 -4.16666666666667e+00
+2342 2340 -8.33333333333333e+00
+2342 2089 4.16666666666667e+00
+2342 2457 -4.16666666666667e+00
+2342 2094 4.16666666666667e+00
+2342 2347 8.33333333333333e+00
+2342 2095 -8.33333333333333e+00
+2342 2090 -1.87500000000000e+01
+2342 1969 2.08333333333333e+00
+2342 2458 -4.16666666666667e+00
+2342 2088 4.16666666666667e+00
+2342 1968 -4.16666666666667e+00
+2342 2084 -6.25000000000000e+00
+2342 2359 -2.08333333333333e+00
+2342 2348 -1.25000000000000e+01
+2342 2083 -2.08333333333333e+00
+2342 1930 2.08333333333333e+00
+2342 2082 4.16666666666667e+00
+2342 1929 -4.16666666666667e+00
+2343 2343 1.25000000000000e+02
+2343 2380 -8.33333333333333e+00
+2343 2348 8.33333333333333e+00
+2343 2096 -8.33333333333333e+00
+2343 2464 -4.16666666666667e+00
+2343 2095 4.16666666666667e+00
+2343 2465 -4.16666666666667e+00
+2343 2347 8.33333333333333e+00
+2343 2346 -3.75000000000000e+01
+2343 2336 8.33333333333333e+00
+2343 2335 -4.16666666666667e+00
+2343 2231 -8.33333333333333e+00
+2343 2230 4.16666666666667e+00
+2343 1973 4.16666666666667e+00
+2343 2378 -4.16666666666667e+00
+2343 2377 8.33333333333333e+00
+2343 2344 -1.66666666666667e+01
+2343 2376 -1.25000000000000e+01
+2343 1931 4.16666666666667e+00
+2343 2334 -1.25000000000000e+01
+2343 2084 -4.16666666666667e+00
+2343 2083 8.33333333333333e+00
+2343 2228 -4.16666666666667e+00
+2343 2081 4.16666666666667e+00
+2343 2239 8.33333333333333e+00
+2343 2080 -8.33333333333333e+00
+2343 1930 4.16666666666667e+00
+2343 2227 -4.16666666666667e+00
+2343 2082 -1.25000000000000e+01
+2343 2345 -1.66666666666667e+01
+2343 2093 8.33333333333333e+00
+2343 2240 8.33333333333333e+00
+2343 2092 -4.16666666666667e+00
+2343 1972 4.16666666666667e+00
+2343 2381 4.16666666666667e+00
+2343 2091 -1.25000000000000e+01
+2343 2238 -3.75000000000000e+01
+2344 2344 1.25000000000000e+02
+2344 2379 -8.33333333333333e+00
+2344 2348 -4.16666666666667e+00
+2344 2465 -4.16666666666667e+00
+2344 2096 4.16666666666667e+00
+2344 2463 -4.16666666666667e+00
+2344 2094 4.16666666666667e+00
+2344 2347 -1.25000000000000e+01
+2344 2346 8.33333333333333e+00
+2344 2334 -4.16666666666667e+00
+2344 2231 4.16666666666667e+00
+2344 2229 4.16666666666667e+00
+2344 2378 8.33333333333333e+00
+2344 2377 -3.75000000000000e+01
+2344 2376 8.33333333333333e+00
+2344 2343 -1.66666666666667e+01
+2344 2336 8.33333333333333e+00
+2344 2335 -1.25000000000000e+01
+2344 2240 -4.16666666666667e+00
+2344 2345 -1.66666666666667e+01
+2344 2228 -4.16666666666667e+00
+2344 2081 4.16666666666667e+00
+2344 2082 8.33333333333333e+00
+2344 2238 8.33333333333333e+00
+2344 2079 -8.33333333333333e+00
+2344 1931 -8.33333333333333e+00
+2344 2084 8.33333333333333e+00
+2344 2083 -3.75000000000000e+01
+2344 1929 4.16666666666667e+00
+2344 2226 -4.16666666666667e+00
+2344 2093 8.33333333333333e+00
+2344 1973 -8.33333333333333e+00
+2344 2381 4.16666666666667e+00
+2344 2092 -1.25000000000000e+01
+2344 2239 -1.25000000000000e+01
+2344 2091 -4.16666666666667e+00
+2344 1971 4.16666666666667e+00
+2345 2345 1.25000000000000e+02
+2345 2379 4.16666666666667e+00
+2345 2347 -4.16666666666667e+00
+2345 2464 -4.16666666666667e+00
+2345 2095 4.16666666666667e+00
+2345 2346 8.33333333333333e+00
+2345 2094 -8.33333333333333e+00
+2345 2463 -4.16666666666667e+00
+2345 2348 -1.25000000000000e+01
+2345 2334 8.33333333333333e+00
+2345 2230 4.16666666666667e+00
+2345 2229 -8.33333333333333e+00
+2345 2378 -1.25000000000000e+01
+2345 2377 8.33333333333333e+00
+2345 1971 4.16666666666667e+00
+2345 2376 -4.16666666666667e+00
+2345 2336 -3.75000000000000e+01
+2345 2335 8.33333333333333e+00
+2345 1929 4.16666666666667e+00
+2345 2239 -4.16666666666667e+00
+2345 2344 -1.66666666666667e+01
+2345 2082 -4.16666666666667e+00
+2345 2227 -4.16666666666667e+00
+2345 2080 4.16666666666667e+00
+2345 2226 -4.16666666666667e+00
+2345 2079 4.16666666666667e+00
+2345 2084 -1.25000000000000e+01
+2345 1930 -8.33333333333333e+00
+2345 2083 8.33333333333333e+00
+2345 2380 4.16666666666667e+00
+2345 2093 -3.75000000000000e+01
+2345 2240 -1.25000000000000e+01
+2345 2092 8.33333333333333e+00
+2345 1972 -8.33333333333333e+00
+2345 2343 -1.66666666666667e+01
+2345 2091 8.33333333333333e+00
+2345 2238 8.33333333333333e+00
+2346 2346 1.25000000000000e+02
+2346 2380 8.33333333333333e+00
+2346 2336 -8.33333333333333e+00
+2346 2335 4.16666666666667e+00
+2346 2379 -1.25000000000000e+01
+2346 2345 8.33333333333333e+00
+2346 2464 4.16666666666667e+00
+2346 2344 8.33333333333333e+00
+2346 2343 -3.75000000000000e+01
+2346 2465 4.16666666666667e+00
+2346 2338 -4.16666666666667e+00
+2346 2339 8.33333333333333e+00
+2346 2348 -1.66666666666667e+01
+2346 1931 -4.16666666666667e+00
+2346 2337 -1.25000000000000e+01
+2346 2396 4.16666666666667e+00
+2346 1976 -4.16666666666667e+00
+2346 2395 -8.33333333333333e+00
+2346 2333 4.16666666666667e+00
+2346 2347 -1.66666666666667e+01
+2346 2362 8.33333333333333e+00
+2346 2332 4.16666666666667e+00
+2346 1930 -4.16666666666667e+00
+2346 2363 8.33333333333333e+00
+2346 1975 -4.16666666666667e+00
+2346 2361 -3.75000000000000e+01
+2346 2342 -4.16666666666667e+00
+2346 2084 4.16666666666667e+00
+2346 2458 4.16666666666667e+00
+2346 2095 -4.16666666666667e+00
+2346 2083 -8.33333333333333e+00
+2346 2341 8.33333333333333e+00
+2346 2340 -1.25000000000000e+01
+2346 2096 8.33333333333333e+00
+2346 2459 -8.33333333333333e+00
+2346 2094 -1.25000000000000e+01
+2346 2381 -4.16666666666667e+00
+2347 2347 1.25000000000000e+02
+2347 2379 8.33333333333333e+00
+2347 2334 4.16666666666667e+00
+2347 2381 8.33333333333333e+00
+2347 2380 -3.75000000000000e+01
+2347 2345 -4.16666666666667e+00
+2347 2463 4.16666666666667e+00
+2347 2344 -1.25000000000000e+01
+2347 2343 8.33333333333333e+00
+2347 2465 -8.33333333333333e+00
+2347 2337 -4.16666666666667e+00
+2347 2396 4.16666666666667e+00
+2347 2339 8.33333333333333e+00
+2347 2338 -1.25000000000000e+01
+2347 2394 -8.33333333333333e+00
+2347 2363 -4.16666666666667e+00
+2347 2346 -1.66666666666667e+01
+2347 2361 8.33333333333333e+00
+2347 2333 -8.33333333333333e+00
+2347 2331 4.16666666666667e+00
+2347 1929 -4.16666666666667e+00
+2347 2362 -1.25000000000000e+01
+2347 1974 -4.16666666666667e+00
+2347 2342 8.33333333333333e+00
+2347 2348 -1.66666666666667e+01
+2347 2096 8.33333333333333e+00
+2347 2457 4.16666666666667e+00
+2347 2094 -4.16666666666667e+00
+2347 2084 4.16666666666667e+00
+2347 1931 -4.16666666666667e+00
+2347 2341 -3.75000000000000e+01
+2347 2082 -8.33333333333333e+00
+2347 2340 8.33333333333333e+00
+2347 2459 4.16666666666667e+00
+2347 1976 -4.16666666666667e+00
+2347 2095 -1.25000000000000e+01
+2347 2336 4.16666666666667e+00
+2348 2348 1.25000000000000e+02
+2348 2379 -4.16666666666667e+00
+2348 2334 -8.33333333333333e+00
+2348 2381 -1.25000000000000e+01
+2348 2380 8.33333333333333e+00
+2348 2344 -4.16666666666667e+00
+2348 2343 8.33333333333333e+00
+2348 2345 -1.25000000000000e+01
+2348 2464 -8.33333333333333e+00
+2348 2463 4.16666666666667e+00
+2348 2395 4.16666666666667e+00
+2348 2337 8.33333333333333e+00
+2348 2346 -1.66666666666667e+01
+2348 2339 -3.75000000000000e+01
+2348 2338 8.33333333333333e+00
+2348 1929 -4.16666666666667e+00
+2348 2394 4.16666666666667e+00
+2348 1974 -4.16666666666667e+00
+2348 2331 4.16666666666667e+00
+2348 2362 -4.16666666666667e+00
+2348 2332 -8.33333333333333e+00
+2348 2363 -1.25000000000000e+01
+2348 2361 8.33333333333333e+00
+2348 2340 -4.16666666666667e+00
+2348 2082 4.16666666666667e+00
+2348 2341 8.33333333333333e+00
+2348 2347 -1.66666666666667e+01
+2348 2095 8.33333333333333e+00
+2348 2342 -1.25000000000000e+01
+2348 2083 4.16666666666667e+00
+2348 1930 -4.16666666666667e+00
+2348 2096 -3.75000000000000e+01
+2348 2335 4.16666666666667e+00
+2348 2458 4.16666666666667e+00
+2348 1975 -4.16666666666667e+00
+2348 2094 8.33333333333333e+00
+2348 2457 -8.33333333333333e+00
+2349 2349 1.25000000000000e+02
+2349 2387 4.16666666666667e+00
+2349 2386 -8.33333333333333e+00
+2349 2356 8.33333333333333e+00
+2349 2355 -3.75000000000000e+01
+2349 2282 4.16666666666667e+00
+2349 2281 4.16666666666667e+00
+2349 2285 8.33333333333333e+00
+2349 2284 -4.16666666666667e+00
+2349 2283 -1.25000000000000e+01
+2349 2351 -1.66666666666667e+01
+2349 1934 -4.16666666666667e+00
+2349 1940 -4.16666666666667e+00
+2349 2399 -4.16666666666667e+00
+2349 2396 4.16666666666667e+00
+2349 2366 -8.33333333333333e+00
+2349 2363 8.33333333333333e+00
+2349 2365 4.16666666666667e+00
+2349 2362 -4.16666666666667e+00
+2349 2361 -1.25000000000000e+01
+2349 2398 -4.16666666666667e+00
+2349 2395 4.16666666666667e+00
+2349 2021 -4.16666666666667e+00
+2349 2333 4.16666666666667e+00
+2349 2020 -4.16666666666667e+00
+2349 2026 4.16666666666667e+00
+2349 2332 -8.33333333333333e+00
+2349 1933 8.33333333333333e+00
+2349 1932 -1.25000000000000e+01
+2349 2339 8.33333333333333e+00
+2349 2027 -8.33333333333333e+00
+2349 2338 8.33333333333333e+00
+2349 2350 -1.66666666666667e+01
+2349 1939 8.33333333333333e+00
+2349 2337 -3.75000000000000e+01
+2349 2357 8.33333333333333e+00
+2349 1938 -1.25000000000000e+01
+2350 2350 1.25000000000000e+02
+2350 2357 -4.16666666666667e+00
+2350 2385 -8.33333333333333e+00
+2350 2356 -1.25000000000000e+01
+2350 2355 8.33333333333333e+00
+2350 2282 -8.33333333333333e+00
+2350 2280 4.16666666666667e+00
+2350 2285 8.33333333333333e+00
+2350 2284 -1.25000000000000e+01
+2350 2283 -4.16666666666667e+00
+2350 2399 -4.16666666666667e+00
+2350 2366 4.16666666666667e+00
+2350 1934 8.33333333333333e+00
+2350 2351 -1.66666666666667e+01
+2350 2363 8.33333333333333e+00
+2350 2362 -1.25000000000000e+01
+2350 2364 4.16666666666667e+00
+2350 2361 -4.16666666666667e+00
+2350 1940 8.33333333333333e+00
+2350 2396 -8.33333333333333e+00
+2350 2397 -4.16666666666667e+00
+2350 2394 4.16666666666667e+00
+2350 2019 -4.16666666666667e+00
+2350 2025 4.16666666666667e+00
+2350 2333 4.16666666666667e+00
+2350 2021 -4.16666666666667e+00
+2350 1933 -3.75000000000000e+01
+2350 2331 -8.33333333333333e+00
+2350 1932 8.33333333333333e+00
+2350 2339 -4.16666666666667e+00
+2350 2027 4.16666666666667e+00
+2350 2338 -1.25000000000000e+01
+2350 2387 4.16666666666667e+00
+2350 1939 -3.75000000000000e+01
+2350 2337 8.33333333333333e+00
+2350 2349 -1.66666666666667e+01
+2350 1938 8.33333333333333e+00
+2351 2351 1.25000000000000e+02
+2351 2356 -4.16666666666667e+00
+2351 2355 8.33333333333333e+00
+2351 2385 4.16666666666667e+00
+2351 2357 -1.25000000000000e+01
+2351 2280 4.16666666666667e+00
+2351 2281 -8.33333333333333e+00
+2351 2285 -3.75000000000000e+01
+2351 2284 8.33333333333333e+00
+2351 2283 8.33333333333333e+00
+2351 2349 -1.66666666666667e+01
+2351 1932 -4.16666666666667e+00
+2351 1938 -4.16666666666667e+00
+2351 2397 -4.16666666666667e+00
+2351 2394 4.16666666666667e+00
+2351 2398 -4.16666666666667e+00
+2351 2365 4.16666666666667e+00
+2351 2363 -3.75000000000000e+01
+2351 1933 8.33333333333333e+00
+2351 2350 -1.66666666666667e+01
+2351 2362 8.33333333333333e+00
+2351 2364 -8.33333333333333e+00
+2351 2361 8.33333333333333e+00
+2351 1939 8.33333333333333e+00
+2351 2395 -8.33333333333333e+00
+2351 2019 -4.16666666666667e+00
+2351 2331 4.16666666666667e+00
+2351 1934 -1.25000000000000e+01
+2351 2332 4.16666666666667e+00
+2351 2020 -4.16666666666667e+00
+2351 2339 -1.25000000000000e+01
+2351 2386 4.16666666666667e+00
+2351 1940 -1.25000000000000e+01
+2351 2338 -4.16666666666667e+00
+2351 2026 4.16666666666667e+00
+2351 2337 8.33333333333333e+00
+2351 2025 -8.33333333333333e+00
+2352 2352 6.25000000000000e+01
+2352 2357 -4.16666666666667e+00
+2352 2290 -2.08333333333333e+00
+2352 2281 2.08333333333333e+00
+2352 2291 4.16666666666667e+00
+2352 2289 -6.25000000000000e+00
+2352 2282 -4.16666666666667e+00
+2352 2353 -8.33333333333333e+00
+2352 2356 8.33333333333333e+00
+2352 1933 4.16666666666667e+00
+2352 2355 -1.25000000000000e+01
+2352 2366 4.16666666666667e+00
+2352 2354 -8.33333333333333e+00
+2352 2099 4.16666666666667e+00
+2352 1934 4.16666666666667e+00
+2352 2098 -2.08333333333333e+00
+2352 2365 4.16666666666667e+00
+2352 2097 -6.25000000000000e+00
+2352 1932 -1.87500000000000e+01
+2352 1309 4.16666666666667e+00
+2352 1609 -8.33333333333333e+00
+2352 1619 -4.16666666666667e+00
+2352 1310 4.16666666666667e+00
+2352 1469 -4.16666666666667e+00
+2352 1468 2.08333333333333e+00
+2352 1618 -4.16666666666667e+00
+2352 1308 -1.87500000000000e+01
+2352 1610 4.16666666666667e+00
+2353 2353 6.25000000000000e+01
+2353 2291 4.16666666666667e+00
+2353 2357 8.33333333333333e+00
+2353 2289 -2.08333333333333e+00
+2353 2280 2.08333333333333e+00
+2353 2290 -6.25000000000000e+00
+2353 2282 2.08333333333333e+00
+2353 1934 -2.08333333333333e+00
+2353 2356 -3.75000000000000e+01
+2353 2352 -8.33333333333333e+00
+2353 2355 8.33333333333333e+00
+2353 1932 4.16666666666667e+00
+2353 2099 4.16666666666667e+00
+2353 2366 -8.33333333333333e+00
+2353 2354 -8.33333333333333e+00
+2353 2098 -6.25000000000000e+00
+2353 1933 -6.25000000000000e+00
+2353 2097 -2.08333333333333e+00
+2353 2364 4.16666666666667e+00
+2353 1310 -2.08333333333333e+00
+2353 1610 4.16666666666667e+00
+2353 1308 4.16666666666667e+00
+2353 1608 -8.33333333333333e+00
+2353 1469 2.08333333333333e+00
+2353 1619 -4.16666666666667e+00
+2353 1309 -6.25000000000000e+00
+2353 1467 2.08333333333333e+00
+2353 1617 -4.16666666666667e+00
+2354 2354 6.25000000000000e+01
+2354 2355 -4.16666666666667e+00
+2354 2353 -8.33333333333333e+00
+2354 2290 4.16666666666667e+00
+2354 2356 8.33333333333333e+00
+2354 2291 -1.87500000000000e+01
+2354 2289 4.16666666666667e+00
+2354 2357 -1.25000000000000e+01
+2354 2281 2.08333333333333e+00
+2354 1933 -2.08333333333333e+00
+2354 2280 -4.16666666666667e+00
+2354 2364 4.16666666666667e+00
+2354 2099 -1.87500000000000e+01
+2354 1934 -6.25000000000000e+00
+2354 2098 4.16666666666667e+00
+2354 2365 -8.33333333333333e+00
+2354 2352 -8.33333333333333e+00
+2354 2097 4.16666666666667e+00
+2354 1932 4.16666666666667e+00
+2354 1309 -2.08333333333333e+00
+2354 1609 4.16666666666667e+00
+2354 1468 2.08333333333333e+00
+2354 1618 -4.16666666666667e+00
+2354 1617 -4.16666666666667e+00
+2354 1310 -6.25000000000000e+00
+2354 1308 4.16666666666667e+00
+2354 1467 -4.16666666666667e+00
+2354 1608 4.16666666666667e+00
+2355 2355 1.25000000000000e+02
+2355 2398 4.16666666666667e+00
+2355 2366 8.33333333333333e+00
+2355 2365 -4.16666666666667e+00
+2355 2364 -1.25000000000000e+01
+2355 2291 4.16666666666667e+00
+2355 2354 -4.16666666666667e+00
+2355 2290 4.16666666666667e+00
+2355 2357 -1.66666666666667e+01
+2355 2353 8.33333333333333e+00
+2355 2352 -1.25000000000000e+01
+2355 2356 -1.66666666666667e+01
+2355 2293 -4.16666666666667e+00
+2355 2294 8.33333333333333e+00
+2355 2285 -8.33333333333333e+00
+2355 2351 8.33333333333333e+00
+2355 2281 -4.16666666666667e+00
+2355 2284 4.16666666666667e+00
+2355 2387 -4.16666666666667e+00
+2355 2386 8.33333333333333e+00
+2355 2292 -1.25000000000000e+01
+2355 2385 -1.25000000000000e+01
+2355 2282 -4.16666666666667e+00
+2355 1934 4.16666666666667e+00
+2355 2350 8.33333333333333e+00
+2355 1933 -8.33333333333333e+00
+2355 2399 4.16666666666667e+00
+2355 2349 -3.75000000000000e+01
+2355 1651 -4.16666666666667e+00
+2355 1619 -8.33333333333333e+00
+2355 1618 4.16666666666667e+00
+2355 1652 -4.16666666666667e+00
+2355 1610 8.33333333333333e+00
+2355 1609 8.33333333333333e+00
+2355 1608 -3.75000000000000e+01
+2355 1316 4.16666666666667e+00
+2355 1315 -8.33333333333333e+00
+2356 2356 1.25000000000000e+02
+2356 2397 4.16666666666667e+00
+2356 2364 -4.16666666666667e+00
+2356 2366 8.33333333333333e+00
+2356 2365 -1.25000000000000e+01
+2356 2354 8.33333333333333e+00
+2356 2291 -8.33333333333333e+00
+2356 2289 4.16666666666667e+00
+2356 1934 4.16666666666667e+00
+2356 2353 -3.75000000000000e+01
+2356 2352 8.33333333333333e+00
+2356 2351 -4.16666666666667e+00
+2356 2355 -1.66666666666667e+01
+2356 2292 -4.16666666666667e+00
+2356 2285 4.16666666666667e+00
+2356 2282 -4.16666666666667e+00
+2356 2280 -4.16666666666667e+00
+2356 2283 4.16666666666667e+00
+2356 2294 8.33333333333333e+00
+2356 2387 8.33333333333333e+00
+2356 2357 -1.66666666666667e+01
+2356 2293 -1.25000000000000e+01
+2356 2386 -3.75000000000000e+01
+2356 2385 8.33333333333333e+00
+2356 2399 -8.33333333333333e+00
+2356 2350 -1.25000000000000e+01
+2356 2349 8.33333333333333e+00
+2356 1932 -8.33333333333333e+00
+2356 1650 -4.16666666666667e+00
+2356 1652 -4.16666666666667e+00
+2356 1619 4.16666666666667e+00
+2356 1617 4.16666666666667e+00
+2356 1610 -4.16666666666667e+00
+2356 1316 4.16666666666667e+00
+2356 1609 -1.25000000000000e+01
+2356 1608 8.33333333333333e+00
+2356 1314 -8.33333333333333e+00
+2357 2357 1.25000000000000e+02
+2357 2398 -8.33333333333333e+00
+2357 2364 8.33333333333333e+00
+2357 2366 -3.75000000000000e+01
+2357 2365 8.33333333333333e+00
+2357 2289 4.16666666666667e+00
+2357 2352 -4.16666666666667e+00
+2357 2353 8.33333333333333e+00
+2357 2290 -8.33333333333333e+00
+2357 2355 -1.66666666666667e+01
+2357 2354 -1.25000000000000e+01
+2357 1933 4.16666666666667e+00
+2357 2350 -4.16666666666667e+00
+2357 2284 4.16666666666667e+00
+2357 2281 -4.16666666666667e+00
+2357 2292 8.33333333333333e+00
+2357 2283 -8.33333333333333e+00
+2357 2349 8.33333333333333e+00
+2357 2294 -3.75000000000000e+01
+2357 2387 -1.25000000000000e+01
+2357 2293 8.33333333333333e+00
+2357 2386 8.33333333333333e+00
+2357 2356 -1.66666666666667e+01
+2357 2385 -4.16666666666667e+00
+2357 2397 4.16666666666667e+00
+2357 2351 -1.25000000000000e+01
+2357 2280 -4.16666666666667e+00
+2357 1932 4.16666666666667e+00
+2357 1651 -4.16666666666667e+00
+2357 1618 4.16666666666667e+00
+2357 1617 -8.33333333333333e+00
+2357 1650 -4.16666666666667e+00
+2357 1610 -1.25000000000000e+01
+2357 1609 -4.16666666666667e+00
+2357 1315 4.16666666666667e+00
+2357 1608 8.33333333333333e+00
+2357 1314 4.16666666666667e+00
+2358 2358 6.25000000000000e+01
+2358 2359 -8.33333333333333e+00
+2358 2333 -4.16666666666667e+00
+2358 1933 -2.08333333333333e+00
+2358 2332 2.08333333333333e+00
+2358 2342 4.16666666666667e+00
+2358 1969 -2.08333333333333e+00
+2358 2340 -1.87500000000000e+01
+2358 2458 4.16666666666667e+00
+2358 2363 -4.16666666666667e+00
+2358 2362 8.33333333333333e+00
+2358 2361 -1.25000000000000e+01
+2358 2459 4.16666666666667e+00
+2358 2366 4.16666666666667e+00
+2358 2462 -4.16666666666667e+00
+2358 2101 2.08333333333333e+00
+2358 2461 -4.16666666666667e+00
+2358 1970 4.16666666666667e+00
+2358 2102 -4.16666666666667e+00
+2358 1968 -6.25000000000000e+00
+2358 2360 -8.33333333333333e+00
+2358 2099 4.16666666666667e+00
+2358 1934 4.16666666666667e+00
+2358 2098 4.16666666666667e+00
+2358 2365 -8.33333333333333e+00
+2358 2341 4.16666666666667e+00
+2358 2097 -1.87500000000000e+01
+2358 1932 -6.25000000000000e+00
+2359 2359 6.25000000000000e+01
+2359 2333 2.08333333333333e+00
+2359 2340 4.16666666666667e+00
+2359 2358 -8.33333333333333e+00
+2359 1932 -2.08333333333333e+00
+2359 2331 2.08333333333333e+00
+2359 2341 -6.25000000000000e+00
+2359 1968 -2.08333333333333e+00
+2359 2457 4.16666666666667e+00
+2359 1934 4.16666666666667e+00
+2359 2360 -8.33333333333333e+00
+2359 2363 8.33333333333333e+00
+2359 2362 -3.75000000000000e+01
+2359 2361 8.33333333333333e+00
+2359 1970 4.16666666666667e+00
+2359 2459 -8.33333333333333e+00
+2359 2100 2.08333333333333e+00
+2359 2460 -4.16666666666667e+00
+2359 2102 2.08333333333333e+00
+2359 2462 -4.16666666666667e+00
+2359 1969 -6.25000000000000e+00
+2359 2099 -2.08333333333333e+00
+2359 2366 4.16666666666667e+00
+2359 2342 -2.08333333333333e+00
+2359 2098 -6.25000000000000e+00
+2359 1933 -6.25000000000000e+00
+2359 2097 4.16666666666667e+00
+2359 2364 -8.33333333333333e+00
+2360 2360 6.25000000000000e+01
+2360 2332 2.08333333333333e+00
+2360 2331 -4.16666666666667e+00
+2360 2342 -6.25000000000000e+00
+2360 2340 4.16666666666667e+00
+2360 2363 -1.25000000000000e+01
+2360 1933 4.16666666666667e+00
+2360 2359 -8.33333333333333e+00
+2360 2362 8.33333333333333e+00
+2360 2361 -4.16666666666667e+00
+2360 1969 4.16666666666667e+00
+2360 2458 -8.33333333333333e+00
+2360 2457 4.16666666666667e+00
+2360 2364 4.16666666666667e+00
+2360 2460 -4.16666666666667e+00
+2360 1970 -1.87500000000000e+01
+2360 2101 2.08333333333333e+00
+2360 2461 -4.16666666666667e+00
+2360 1968 4.16666666666667e+00
+2360 2100 -4.16666666666667e+00
+2360 2341 -2.08333333333333e+00
+2360 2099 -6.25000000000000e+00
+2360 1934 -1.87500000000000e+01
+2360 2098 -2.08333333333333e+00
+2360 2365 4.16666666666667e+00
+2360 2358 -8.33333333333333e+00
+2360 2097 4.16666666666667e+00
+2360 1932 4.16666666666667e+00
+2361 2361 1.25000000000000e+02
+2361 2339 -8.33333333333333e+00
+2361 2342 4.16666666666667e+00
+2361 2333 -4.16666666666667e+00
+2361 2341 -8.33333333333333e+00
+2361 2347 8.33333333333333e+00
+2361 2332 -4.16666666666667e+00
+2361 2348 8.33333333333333e+00
+2361 2346 -3.75000000000000e+01
+2361 2461 4.16666666666667e+00
+2361 2458 -4.16666666666667e+00
+2361 2462 -8.33333333333333e+00
+2361 2459 8.33333333333333e+00
+2361 1934 4.16666666666667e+00
+2361 2360 -4.16666666666667e+00
+2361 2359 8.33333333333333e+00
+2361 2362 -1.66666666666667e+01
+2361 2358 -1.25000000000000e+01
+2361 1976 4.16666666666667e+00
+2361 2457 -1.25000000000000e+01
+2361 2396 -4.16666666666667e+00
+2361 2399 4.16666666666667e+00
+2361 2471 -4.16666666666667e+00
+2361 2365 8.33333333333333e+00
+2361 2398 -8.33333333333333e+00
+2361 2395 8.33333333333333e+00
+2361 2366 8.33333333333333e+00
+2361 2351 8.33333333333333e+00
+2361 2363 -1.66666666666667e+01
+2361 1933 4.16666666666667e+00
+2361 2350 -4.16666666666667e+00
+2361 2364 -3.75000000000000e+01
+2361 2349 -1.25000000000000e+01
+2361 2470 -4.16666666666667e+00
+2361 1975 4.16666666666667e+00
+2361 2338 4.16666666666667e+00
+2361 2394 -1.25000000000000e+01
+2362 2362 1.25000000000000e+02
+2362 2339 4.16666666666667e+00
+2362 2333 -4.16666666666667e+00
+2362 2342 4.16666666666667e+00
+2362 2348 -4.16666666666667e+00
+2362 2340 -8.33333333333333e+00
+2362 2346 8.33333333333333e+00
+2362 2331 -4.16666666666667e+00
+2362 2347 -1.25000000000000e+01
+2362 2460 4.16666666666667e+00
+2362 2457 -4.16666666666667e+00
+2362 2462 4.16666666666667e+00
+2362 2360 8.33333333333333e+00
+2362 2359 -3.75000000000000e+01
+2362 2358 8.33333333333333e+00
+2362 2361 -1.66666666666667e+01
+2362 2459 8.33333333333333e+00
+2362 2458 -1.25000000000000e+01
+2362 2363 -1.66666666666667e+01
+2362 2366 -4.16666666666667e+00
+2362 2364 8.33333333333333e+00
+2362 2399 4.16666666666667e+00
+2362 2471 -4.16666666666667e+00
+2362 2397 -8.33333333333333e+00
+2362 2394 8.33333333333333e+00
+2362 1934 -8.33333333333333e+00
+2362 2351 8.33333333333333e+00
+2362 2365 -1.25000000000000e+01
+2362 2350 -1.25000000000000e+01
+2362 1932 4.16666666666667e+00
+2362 2349 -4.16666666666667e+00
+2362 2396 8.33333333333333e+00
+2362 1976 -8.33333333333333e+00
+2362 2337 4.16666666666667e+00
+2362 2395 -3.75000000000000e+01
+2362 2469 -4.16666666666667e+00
+2362 1974 4.16666666666667e+00
+2363 2363 1.25000000000000e+02
+2363 2337 -8.33333333333333e+00
+2363 2332 -4.16666666666667e+00
+2363 2340 4.16666666666667e+00
+2363 2331 -4.16666666666667e+00
+2363 2341 4.16666666666667e+00
+2363 2347 -4.16666666666667e+00
+2363 2348 -1.25000000000000e+01
+2363 2346 8.33333333333333e+00
+2363 2461 4.16666666666667e+00
+2363 2460 -8.33333333333333e+00
+2363 2457 8.33333333333333e+00
+2363 2360 -1.25000000000000e+01
+2363 2359 8.33333333333333e+00
+2363 1932 4.16666666666667e+00
+2363 2358 -4.16666666666667e+00
+2363 2459 -3.75000000000000e+01
+2363 2458 8.33333333333333e+00
+2363 1974 4.16666666666667e+00
+2363 2362 -1.66666666666667e+01
+2363 2394 -4.16666666666667e+00
+2363 2365 -4.16666666666667e+00
+2363 2397 4.16666666666667e+00
+2363 2469 -4.16666666666667e+00
+2363 2398 4.16666666666667e+00
+2363 2470 -4.16666666666667e+00
+2363 2366 -1.25000000000000e+01
+2363 2351 -3.75000000000000e+01
+2363 1933 -8.33333333333333e+00
+2363 2350 8.33333333333333e+00
+2363 2364 8.33333333333333e+00
+2363 2349 8.33333333333333e+00
+2363 2361 -1.66666666666667e+01
+2363 2338 4.16666666666667e+00
+2363 2396 -1.25000000000000e+01
+2363 2395 8.33333333333333e+00
+2363 1975 -8.33333333333333e+00
+2364 2364 1.25000000000000e+02
+2364 2356 -4.16666666666667e+00
+2364 2355 -1.25000000000000e+01
+2364 2354 4.16666666666667e+00
+2364 2353 4.16666666666667e+00
+2364 2366 -1.66666666666667e+01
+2364 1934 -4.16666666666667e+00
+2364 2399 -4.16666666666667e+00
+2364 2471 4.16666666666667e+00
+2364 2398 8.33333333333333e+00
+2364 2365 -1.66666666666667e+01
+2364 2362 8.33333333333333e+00
+2364 2351 -8.33333333333333e+00
+2364 2363 8.33333333333333e+00
+2364 1933 -4.16666666666667e+00
+2364 2350 4.16666666666667e+00
+2364 2361 -3.75000000000000e+01
+2364 2470 4.16666666666667e+00
+2364 2397 -1.25000000000000e+01
+2364 2099 -4.16666666666667e+00
+2364 2360 4.16666666666667e+00
+2364 2461 -4.16666666666667e+00
+2364 2359 -8.33333333333333e+00
+2364 2098 8.33333333333333e+00
+2364 2097 -1.25000000000000e+01
+2364 2462 8.33333333333333e+00
+2364 2460 -1.25000000000000e+01
+2364 2357 8.33333333333333e+00
+2364 1652 4.16666666666667e+00
+2364 1651 -8.33333333333333e+00
+2364 1618 8.33333333333333e+00
+2364 1619 8.33333333333333e+00
+2364 1617 -3.75000000000000e+01
+2364 1364 -4.16666666666667e+00
+2364 1363 -4.16666666666667e+00
+2364 1474 4.16666666666667e+00
+2364 1475 -8.33333333333333e+00
+2365 2365 1.25000000000000e+02
+2365 2355 -4.16666666666667e+00
+2365 2357 8.33333333333333e+00
+2365 2356 -1.25000000000000e+01
+2365 2354 -8.33333333333333e+00
+2365 2352 4.16666666666667e+00
+2365 2351 4.16666666666667e+00
+2365 2363 -4.16666666666667e+00
+2365 2397 8.33333333333333e+00
+2365 2364 -1.66666666666667e+01
+2365 2361 8.33333333333333e+00
+2365 2362 -1.25000000000000e+01
+2365 1932 -4.16666666666667e+00
+2365 2349 4.16666666666667e+00
+2365 2399 8.33333333333333e+00
+2365 2471 -8.33333333333333e+00
+2365 2398 -3.75000000000000e+01
+2365 2469 4.16666666666667e+00
+2365 2099 8.33333333333333e+00
+2365 2366 -1.66666666666667e+01
+2365 2462 8.33333333333333e+00
+2365 2460 -4.16666666666667e+00
+2365 2360 4.16666666666667e+00
+2365 1934 -4.16666666666667e+00
+2365 2098 -3.75000000000000e+01
+2365 2358 -8.33333333333333e+00
+2365 2097 8.33333333333333e+00
+2365 2461 -1.25000000000000e+01
+2365 1650 -8.33333333333333e+00
+2365 1619 -4.16666666666667e+00
+2365 1617 8.33333333333333e+00
+2365 1618 -1.25000000000000e+01
+2365 1362 -4.16666666666667e+00
+2365 1473 4.16666666666667e+00
+2365 1475 4.16666666666667e+00
+2365 1364 -4.16666666666667e+00
+2365 1652 4.16666666666667e+00
+2366 2366 1.25000000000000e+02
+2366 2355 8.33333333333333e+00
+2366 2357 -3.75000000000000e+01
+2366 2356 8.33333333333333e+00
+2366 2352 4.16666666666667e+00
+2366 2353 -8.33333333333333e+00
+2366 2364 -1.66666666666667e+01
+2366 1932 -4.16666666666667e+00
+2366 2350 4.16666666666667e+00
+2366 2362 -4.16666666666667e+00
+2366 2397 -4.16666666666667e+00
+2366 2469 4.16666666666667e+00
+2366 2363 -1.25000000000000e+01
+2366 2349 -8.33333333333333e+00
+2366 2361 8.33333333333333e+00
+2366 2399 -1.25000000000000e+01
+2366 2398 8.33333333333333e+00
+2366 2470 -8.33333333333333e+00
+2366 2097 -4.16666666666667e+00
+2366 2358 4.16666666666667e+00
+2366 2098 8.33333333333333e+00
+2366 2365 -1.66666666666667e+01
+2366 2461 8.33333333333333e+00
+2366 2099 -1.25000000000000e+01
+2366 2359 4.16666666666667e+00
+2366 1933 -4.16666666666667e+00
+2366 2462 -3.75000000000000e+01
+2366 2460 8.33333333333333e+00
+2366 1650 4.16666666666667e+00
+2366 1618 -4.16666666666667e+00
+2366 1619 -1.25000000000000e+01
+2366 1617 8.33333333333333e+00
+2366 1362 -4.16666666666667e+00
+2366 1651 4.16666666666667e+00
+2366 1474 4.16666666666667e+00
+2366 1363 -4.16666666666667e+00
+2366 1473 -8.33333333333333e+00
+2367 2367 1.25000000000000e+02
+2367 2375 -4.16666666666667e+00
+2367 2389 -8.33333333333333e+00
+2367 2374 8.33333333333333e+00
+2367 2373 -1.25000000000000e+01
+2367 2300 -8.33333333333333e+00
+2367 2299 4.16666666666667e+00
+2367 2303 8.33333333333333e+00
+2367 2302 -4.16666666666667e+00
+2367 2301 -1.25000000000000e+01
+2367 2402 -4.16666666666667e+00
+2367 2384 4.16666666666667e+00
+2367 1937 8.33333333333333e+00
+2367 2369 -1.66666666666667e+01
+2367 2381 8.33333333333333e+00
+2367 2383 4.16666666666667e+00
+2367 2380 -4.16666666666667e+00
+2367 2379 -1.25000000000000e+01
+2367 1940 8.33333333333333e+00
+2367 2396 -8.33333333333333e+00
+2367 2401 -4.16666666666667e+00
+2367 2395 4.16666666666667e+00
+2367 2023 -4.16666666666667e+00
+2367 2026 4.16666666666667e+00
+2367 2336 4.16666666666667e+00
+2367 2024 -4.16666666666667e+00
+2367 1936 8.33333333333333e+00
+2367 2335 -8.33333333333333e+00
+2367 1935 -3.75000000000000e+01
+2367 2339 -4.16666666666667e+00
+2367 2027 4.16666666666667e+00
+2367 2368 -1.66666666666667e+01
+2367 2338 8.33333333333333e+00
+2367 1939 8.33333333333333e+00
+2367 2390 4.16666666666667e+00
+2367 2337 -1.25000000000000e+01
+2367 1938 -3.75000000000000e+01
+2368 2368 1.25000000000000e+02
+2368 2390 4.16666666666667e+00
+2368 2388 -8.33333333333333e+00
+2368 2374 -3.75000000000000e+01
+2368 2373 8.33333333333333e+00
+2368 2300 4.16666666666667e+00
+2368 2298 4.16666666666667e+00
+2368 2303 8.33333333333333e+00
+2368 2302 -1.25000000000000e+01
+2368 2301 -4.16666666666667e+00
+2368 2369 -1.66666666666667e+01
+2368 1940 -4.16666666666667e+00
+2368 1937 -4.16666666666667e+00
+2368 2396 4.16666666666667e+00
+2368 2402 -4.16666666666667e+00
+2368 2384 -8.33333333333333e+00
+2368 2381 8.33333333333333e+00
+2368 2380 -1.25000000000000e+01
+2368 2382 4.16666666666667e+00
+2368 2379 -4.16666666666667e+00
+2368 2400 -4.16666666666667e+00
+2368 2394 4.16666666666667e+00
+2368 2336 4.16666666666667e+00
+2368 2024 -4.16666666666667e+00
+2368 2022 -4.16666666666667e+00
+2368 2025 4.16666666666667e+00
+2368 1936 -1.25000000000000e+01
+2368 1935 8.33333333333333e+00
+2368 2334 -8.33333333333333e+00
+2368 2339 8.33333333333333e+00
+2368 2027 -8.33333333333333e+00
+2368 2375 8.33333333333333e+00
+2368 2338 -3.75000000000000e+01
+2368 1939 -1.25000000000000e+01
+2368 2367 -1.66666666666667e+01
+2368 2337 8.33333333333333e+00
+2368 1938 8.33333333333333e+00
+2369 2369 1.25000000000000e+02
+2369 2373 -4.16666666666667e+00
+2369 2374 8.33333333333333e+00
+2369 2389 4.16666666666667e+00
+2369 2375 -1.25000000000000e+01
+2369 2299 4.16666666666667e+00
+2369 2298 -8.33333333333333e+00
+2369 2303 -3.75000000000000e+01
+2369 2302 8.33333333333333e+00
+2369 2301 8.33333333333333e+00
+2369 2368 -1.66666666666667e+01
+2369 1939 -4.16666666666667e+00
+2369 1936 -4.16666666666667e+00
+2369 2395 4.16666666666667e+00
+2369 2401 -4.16666666666667e+00
+2369 2400 -4.16666666666667e+00
+2369 2382 4.16666666666667e+00
+2369 2381 -3.75000000000000e+01
+2369 2383 -8.33333333333333e+00
+2369 2380 8.33333333333333e+00
+2369 1935 8.33333333333333e+00
+2369 2367 -1.66666666666667e+01
+2369 2379 8.33333333333333e+00
+2369 1938 8.33333333333333e+00
+2369 2394 -8.33333333333333e+00
+2369 2335 4.16666666666667e+00
+2369 2023 -4.16666666666667e+00
+2369 1937 -1.25000000000000e+01
+2369 2334 4.16666666666667e+00
+2369 2022 -4.16666666666667e+00
+2369 2388 4.16666666666667e+00
+2369 2339 -1.25000000000000e+01
+2369 1940 -1.25000000000000e+01
+2369 2338 8.33333333333333e+00
+2369 2026 -8.33333333333333e+00
+2369 2337 -4.16666666666667e+00
+2369 2025 4.16666666666667e+00
+2370 2370 1.25000000000000e+02
+2370 2429 4.16666666666667e+00
+2370 2428 -8.33333333333333e+00
+2370 2374 8.33333333333333e+00
+2370 2373 -3.75000000000000e+01
+2370 2432 -4.16666666666667e+00
+2370 2431 -4.16666666666667e+00
+2370 2384 -8.33333333333333e+00
+2370 2383 4.16666666666667e+00
+2370 2300 4.16666666666667e+00
+2370 2309 8.33333333333333e+00
+2370 2308 -4.16666666666667e+00
+2370 2307 -1.25000000000000e+01
+2370 2299 4.16666666666667e+00
+2370 2203 4.16666666666667e+00
+2370 2194 -4.16666666666667e+00
+2370 2195 -4.16666666666667e+00
+2370 2204 -8.33333333333333e+00
+2370 2267 8.33333333333333e+00
+2370 2372 -1.66666666666667e+01
+2370 2120 8.33333333333333e+00
+2370 2125 4.16666666666667e+00
+2370 2119 -4.16666666666667e+00
+2370 1937 -4.16666666666667e+00
+2370 2261 4.16666666666667e+00
+2370 1936 8.33333333333333e+00
+2370 2260 -8.33333333333333e+00
+2370 1935 -1.25000000000000e+01
+2370 2118 -1.25000000000000e+01
+2370 1955 -4.16666666666667e+00
+2370 2126 4.16666666666667e+00
+2370 2371 -1.66666666666667e+01
+2370 1954 8.33333333333333e+00
+2370 2266 8.33333333333333e+00
+2370 2375 8.33333333333333e+00
+2370 1953 -1.25000000000000e+01
+2370 2265 -3.75000000000000e+01
+2371 2371 1.25000000000000e+02
+2371 2375 -4.16666666666667e+00
+2371 2427 -8.33333333333333e+00
+2371 2374 -1.25000000000000e+01
+2371 2373 8.33333333333333e+00
+2371 2432 -4.16666666666667e+00
+2371 2384 4.16666666666667e+00
+2371 2430 -4.16666666666667e+00
+2371 2382 4.16666666666667e+00
+2371 2309 8.33333333333333e+00
+2371 2308 -1.25000000000000e+01
+2371 2307 -4.16666666666667e+00
+2371 2300 -8.33333333333333e+00
+2371 2298 4.16666666666667e+00
+2371 2202 4.16666666666667e+00
+2371 2193 -4.16666666666667e+00
+2371 2204 4.16666666666667e+00
+2371 2195 -4.16666666666667e+00
+2371 2267 -4.16666666666667e+00
+2371 2261 4.16666666666667e+00
+2371 2124 4.16666666666667e+00
+2371 2118 -4.16666666666667e+00
+2371 1937 8.33333333333333e+00
+2371 2372 -1.66666666666667e+01
+2371 2120 8.33333333333333e+00
+2371 1936 -3.75000000000000e+01
+2371 2119 -1.25000000000000e+01
+2371 1935 8.33333333333333e+00
+2371 2259 -8.33333333333333e+00
+2371 1955 8.33333333333333e+00
+2371 2126 -8.33333333333333e+00
+2371 2429 4.16666666666667e+00
+2371 1954 -3.75000000000000e+01
+2371 2266 -1.25000000000000e+01
+2371 2370 -1.66666666666667e+01
+2371 1953 8.33333333333333e+00
+2371 2265 8.33333333333333e+00
+2372 2372 1.25000000000000e+02
+2372 2374 -4.16666666666667e+00
+2372 2373 8.33333333333333e+00
+2372 2427 4.16666666666667e+00
+2372 2375 -1.25000000000000e+01
+2372 2430 -4.16666666666667e+00
+2372 2431 -4.16666666666667e+00
+2372 2383 4.16666666666667e+00
+2372 2382 -8.33333333333333e+00
+2372 2298 4.16666666666667e+00
+2372 2309 -3.75000000000000e+01
+2372 2308 8.33333333333333e+00
+2372 2307 8.33333333333333e+00
+2372 2299 -8.33333333333333e+00
+2372 2193 -4.16666666666667e+00
+2372 2203 4.16666666666667e+00
+2372 2202 -8.33333333333333e+00
+2372 2194 -4.16666666666667e+00
+2372 2266 -4.16666666666667e+00
+2372 2260 4.16666666666667e+00
+2372 2265 8.33333333333333e+00
+2372 2370 -1.66666666666667e+01
+2372 2118 8.33333333333333e+00
+2372 1937 -1.25000000000000e+01
+2372 2120 -3.75000000000000e+01
+2372 1936 8.33333333333333e+00
+2372 2371 -1.66666666666667e+01
+2372 2119 8.33333333333333e+00
+2372 1935 -4.16666666666667e+00
+2372 2259 4.16666666666667e+00
+2372 2428 4.16666666666667e+00
+2372 1955 -1.25000000000000e+01
+2372 2267 -1.25000000000000e+01
+2372 1954 8.33333333333333e+00
+2372 2125 -8.33333333333333e+00
+2372 1953 -4.16666666666667e+00
+2372 2124 4.16666666666667e+00
+2373 2373 1.25000000000000e+02
+2373 2401 4.16666666666667e+00
+2373 2437 -4.16666666666667e+00
+2373 2432 4.16666666666667e+00
+2373 2438 -4.16666666666667e+00
+2373 2431 4.16666666666667e+00
+2373 2383 -4.16666666666667e+00
+2373 2384 8.33333333333333e+00
+2373 2382 -1.25000000000000e+01
+2373 2309 -8.33333333333333e+00
+2373 2372 8.33333333333333e+00
+2373 2308 4.16666666666667e+00
+2373 1958 4.16666666666667e+00
+2373 2429 -4.16666666666667e+00
+2373 2428 8.33333333333333e+00
+2373 2427 -1.25000000000000e+01
+2373 1937 4.16666666666667e+00
+2373 2371 8.33333333333333e+00
+2373 2370 -3.75000000000000e+01
+2373 2369 -4.16666666666667e+00
+2373 2374 -1.66666666666667e+01
+2373 2311 -4.16666666666667e+00
+2373 2303 4.16666666666667e+00
+2373 2300 -4.16666666666667e+00
+2373 2302 4.16666666666667e+00
+2373 2299 -4.16666666666667e+00
+2373 2312 8.33333333333333e+00
+2373 2390 8.33333333333333e+00
+2373 2375 -1.66666666666667e+01
+2373 1957 -8.33333333333333e+00
+2373 2389 8.33333333333333e+00
+2373 2310 -1.25000000000000e+01
+2373 2388 -3.75000000000000e+01
+2373 2368 8.33333333333333e+00
+2373 1936 -8.33333333333333e+00
+2373 2402 -8.33333333333333e+00
+2373 2367 -1.25000000000000e+01
+2374 2374 1.25000000000000e+02
+2374 2400 4.16666666666667e+00
+2374 2436 -4.16666666666667e+00
+2374 2432 -8.33333333333333e+00
+2374 2384 8.33333333333333e+00
+2374 2430 4.16666666666667e+00
+2374 2382 -4.16666666666667e+00
+2374 2438 -4.16666666666667e+00
+2374 2383 -1.25000000000000e+01
+2374 2309 4.16666666666667e+00
+2374 2372 -4.16666666666667e+00
+2374 2307 4.16666666666667e+00
+2374 2429 8.33333333333333e+00
+2374 2375 -1.66666666666667e+01
+2374 2428 -3.75000000000000e+01
+2374 2427 8.33333333333333e+00
+2374 2371 -1.25000000000000e+01
+2374 2370 8.33333333333333e+00
+2374 2373 -1.66666666666667e+01
+2374 2310 -4.16666666666667e+00
+2374 2312 8.33333333333333e+00
+2374 2303 -8.33333333333333e+00
+2374 2369 8.33333333333333e+00
+2374 2301 4.16666666666667e+00
+2374 2298 -4.16666666666667e+00
+2374 1958 4.16666666666667e+00
+2374 2390 -4.16666666666667e+00
+2374 2311 -1.25000000000000e+01
+2374 2389 -1.25000000000000e+01
+2374 1956 -8.33333333333333e+00
+2374 2388 8.33333333333333e+00
+2374 2300 -4.16666666666667e+00
+2374 1937 4.16666666666667e+00
+2374 2402 4.16666666666667e+00
+2374 2368 -3.75000000000000e+01
+2374 2367 8.33333333333333e+00
+2374 1935 -8.33333333333333e+00
+2375 2375 1.25000000000000e+02
+2375 2400 -8.33333333333333e+00
+2375 2430 4.16666666666667e+00
+2375 2436 -4.16666666666667e+00
+2375 2431 -8.33333333333333e+00
+2375 2383 8.33333333333333e+00
+2375 2437 -4.16666666666667e+00
+2375 2384 -3.75000000000000e+01
+2375 2382 8.33333333333333e+00
+2375 2308 4.16666666666667e+00
+2375 2371 -4.16666666666667e+00
+2375 2307 -8.33333333333333e+00
+2375 2370 8.33333333333333e+00
+2375 2429 -1.25000000000000e+01
+2375 2428 8.33333333333333e+00
+2375 2374 -1.66666666666667e+01
+2375 1956 4.16666666666667e+00
+2375 2427 -4.16666666666667e+00
+2375 2372 -1.25000000000000e+01
+2375 1935 4.16666666666667e+00
+2375 2367 -4.16666666666667e+00
+2375 2311 8.33333333333333e+00
+2375 2301 4.16666666666667e+00
+2375 2298 -4.16666666666667e+00
+2375 2302 -8.33333333333333e+00
+2375 2368 8.33333333333333e+00
+2375 2312 -3.75000000000000e+01
+2375 2390 -1.25000000000000e+01
+2375 1957 4.16666666666667e+00
+2375 2389 -4.16666666666667e+00
+2375 2310 8.33333333333333e+00
+2375 2388 8.33333333333333e+00
+2375 2373 -1.66666666666667e+01
+2375 2401 4.16666666666667e+00
+2375 2369 -1.25000000000000e+01
+2375 2299 -4.16666666666667e+00
+2375 1936 4.16666666666667e+00
+2376 2376 1.25000000000000e+02
+2376 2465 -8.33333333333333e+00
+2376 2381 8.33333333333333e+00
+2376 2380 8.33333333333333e+00
+2376 2379 -3.75000000000000e+01
+2376 2467 -4.16666666666667e+00
+2376 2468 -4.16666666666667e+00
+2376 2384 4.16666666666667e+00
+2376 2383 -8.33333333333333e+00
+2376 2335 4.16666666666667e+00
+2376 2230 -4.16666666666667e+00
+2376 2345 -4.16666666666667e+00
+2376 2240 4.16666666666667e+00
+2376 2344 8.33333333333333e+00
+2376 2239 -8.33333333333333e+00
+2376 2343 -1.25000000000000e+01
+2376 2336 4.16666666666667e+00
+2376 2231 -4.16666666666667e+00
+2376 2132 4.16666666666667e+00
+2376 2120 -4.16666666666667e+00
+2376 2377 -1.66666666666667e+01
+2376 2119 8.33333333333333e+00
+2376 2272 8.33333333333333e+00
+2376 1937 8.33333333333333e+00
+2376 2261 -8.33333333333333e+00
+2376 1936 -4.16666666666667e+00
+2376 2260 4.16666666666667e+00
+2376 1935 -1.25000000000000e+01
+2376 2118 -1.25000000000000e+01
+2376 2378 -1.66666666666667e+01
+2376 1973 8.33333333333333e+00
+2376 2273 8.33333333333333e+00
+2376 1972 -4.16666666666667e+00
+2376 2131 4.16666666666667e+00
+2376 2464 4.16666666666667e+00
+2376 1971 -1.25000000000000e+01
+2376 2271 -3.75000000000000e+01
+2377 2377 1.25000000000000e+02
+2377 2465 4.16666666666667e+00
+2377 2381 -4.16666666666667e+00
+2377 2380 -1.25000000000000e+01
+2377 2379 8.33333333333333e+00
+2377 2384 4.16666666666667e+00
+2377 2468 -4.16666666666667e+00
+2377 2466 -4.16666666666667e+00
+2377 2382 -8.33333333333333e+00
+2377 2334 4.16666666666667e+00
+2377 2229 -4.16666666666667e+00
+2377 2240 4.16666666666667e+00
+2377 2231 -4.16666666666667e+00
+2377 2345 8.33333333333333e+00
+2377 2344 -3.75000000000000e+01
+2377 2343 8.33333333333333e+00
+2377 2238 -8.33333333333333e+00
+2377 2336 -8.33333333333333e+00
+2377 2261 4.16666666666667e+00
+2377 2273 -4.16666666666667e+00
+2377 2376 -1.66666666666667e+01
+2377 2118 8.33333333333333e+00
+2377 2271 8.33333333333333e+00
+2377 1937 8.33333333333333e+00
+2377 2378 -1.66666666666667e+01
+2377 2120 8.33333333333333e+00
+2377 1936 -1.25000000000000e+01
+2377 2119 -3.75000000000000e+01
+2377 1935 -4.16666666666667e+00
+2377 2259 4.16666666666667e+00
+2377 1973 8.33333333333333e+00
+2377 2132 -8.33333333333333e+00
+2377 2463 4.16666666666667e+00
+2377 1972 -1.25000000000000e+01
+2377 2272 -1.25000000000000e+01
+2377 1971 -4.16666666666667e+00
+2377 2130 4.16666666666667e+00
+2378 2378 1.25000000000000e+02
+2378 2463 -8.33333333333333e+00
+2378 2381 -1.25000000000000e+01
+2378 2380 -4.16666666666667e+00
+2378 2379 8.33333333333333e+00
+2378 2383 4.16666666666667e+00
+2378 2467 -4.16666666666667e+00
+2378 2466 -4.16666666666667e+00
+2378 2382 4.16666666666667e+00
+2378 2239 4.16666666666667e+00
+2378 2230 -4.16666666666667e+00
+2378 2345 -1.25000000000000e+01
+2378 2344 8.33333333333333e+00
+2378 2343 -4.16666666666667e+00
+2378 2238 4.16666666666667e+00
+2378 2335 -8.33333333333333e+00
+2378 2334 4.16666666666667e+00
+2378 2229 -4.16666666666667e+00
+2378 2130 4.16666666666667e+00
+2378 2118 -4.16666666666667e+00
+2378 2260 4.16666666666667e+00
+2378 2272 -4.16666666666667e+00
+2378 1937 -3.75000000000000e+01
+2378 2120 -1.25000000000000e+01
+2378 1936 8.33333333333333e+00
+2378 2377 -1.66666666666667e+01
+2378 2119 8.33333333333333e+00
+2378 1935 8.33333333333333e+00
+2378 2259 -8.33333333333333e+00
+2378 2464 4.16666666666667e+00
+2378 1973 -3.75000000000000e+01
+2378 2273 -1.25000000000000e+01
+2378 1972 8.33333333333333e+00
+2378 2131 -8.33333333333333e+00
+2378 2376 -1.66666666666667e+01
+2378 1971 8.33333333333333e+00
+2378 2271 8.33333333333333e+00
+2379 2379 1.25000000000000e+02
+2379 2339 4.16666666666667e+00
+2379 2336 -4.16666666666667e+00
+2379 2348 -4.16666666666667e+00
+2379 2345 4.16666666666667e+00
+2379 2347 8.33333333333333e+00
+2379 2344 -8.33333333333333e+00
+2379 2335 -4.16666666666667e+00
+2379 2346 -1.25000000000000e+01
+2379 2467 4.16666666666667e+00
+2379 2464 -4.16666666666667e+00
+2379 2468 4.16666666666667e+00
+2379 2378 8.33333333333333e+00
+2379 2377 8.33333333333333e+00
+2379 2380 -1.66666666666667e+01
+2379 2376 -3.75000000000000e+01
+2379 2465 8.33333333333333e+00
+2379 2463 -1.25000000000000e+01
+2379 2381 -1.66666666666667e+01
+2379 2384 -4.16666666666667e+00
+2379 2383 8.33333333333333e+00
+2379 2474 -4.16666666666667e+00
+2379 2402 4.16666666666667e+00
+2379 2401 -8.33333333333333e+00
+2379 2395 8.33333333333333e+00
+2379 1937 -8.33333333333333e+00
+2379 2369 8.33333333333333e+00
+2379 1936 4.16666666666667e+00
+2379 2368 -4.16666666666667e+00
+2379 2382 -1.25000000000000e+01
+2379 2367 -1.25000000000000e+01
+2379 2396 8.33333333333333e+00
+2379 1976 -8.33333333333333e+00
+2379 2473 -4.16666666666667e+00
+2379 1975 4.16666666666667e+00
+2379 2338 4.16666666666667e+00
+2379 2394 -3.75000000000000e+01
+2380 2380 1.25000000000000e+02
+2380 2339 -8.33333333333333e+00
+2380 2336 -4.16666666666667e+00
+2380 2345 4.16666666666667e+00
+2380 2346 8.33333333333333e+00
+2380 2343 -8.33333333333333e+00
+2380 2334 -4.16666666666667e+00
+2380 2348 8.33333333333333e+00
+2380 2347 -3.75000000000000e+01
+2380 2466 4.16666666666667e+00
+2380 2463 -4.16666666666667e+00
+2380 2465 8.33333333333333e+00
+2380 2468 -8.33333333333333e+00
+2380 2378 -4.16666666666667e+00
+2380 1937 4.16666666666667e+00
+2380 2377 -1.25000000000000e+01
+2380 2376 8.33333333333333e+00
+2380 2379 -1.66666666666667e+01
+2380 1976 4.16666666666667e+00
+2380 2464 -1.25000000000000e+01
+2380 2396 -4.16666666666667e+00
+2380 2402 4.16666666666667e+00
+2380 2474 -4.16666666666667e+00
+2380 2382 8.33333333333333e+00
+2380 2400 -8.33333333333333e+00
+2380 2394 8.33333333333333e+00
+2380 2384 8.33333333333333e+00
+2380 2369 8.33333333333333e+00
+2380 2381 -1.66666666666667e+01
+2380 2383 -3.75000000000000e+01
+2380 2368 -1.25000000000000e+01
+2380 1935 4.16666666666667e+00
+2380 2367 -4.16666666666667e+00
+2380 2337 4.16666666666667e+00
+2380 2395 -1.25000000000000e+01
+2380 2472 -4.16666666666667e+00
+2380 1974 4.16666666666667e+00
+2381 2381 1.25000000000000e+02
+2381 2337 4.16666666666667e+00
+2381 2334 -4.16666666666667e+00
+2381 2335 -4.16666666666667e+00
+2381 2344 4.16666666666667e+00
+2381 2346 -4.16666666666667e+00
+2381 2343 4.16666666666667e+00
+2381 2348 -1.25000000000000e+01
+2381 2347 8.33333333333333e+00
+2381 2464 8.33333333333333e+00
+2381 2467 -8.33333333333333e+00
+2381 2466 4.16666666666667e+00
+2381 2378 -1.25000000000000e+01
+2381 2377 -4.16666666666667e+00
+2381 1936 4.16666666666667e+00
+2381 2376 8.33333333333333e+00
+2381 2465 -3.75000000000000e+01
+2381 1975 4.16666666666667e+00
+2381 2463 8.33333333333333e+00
+2381 2395 -4.16666666666667e+00
+2381 2379 -1.66666666666667e+01
+2381 2382 -4.16666666666667e+00
+2381 2401 4.16666666666667e+00
+2381 2473 -4.16666666666667e+00
+2381 2472 -4.16666666666667e+00
+2381 2400 4.16666666666667e+00
+2381 2384 -1.25000000000000e+01
+2381 2369 -3.75000000000000e+01
+2381 2383 8.33333333333333e+00
+2381 2368 8.33333333333333e+00
+2381 2380 -1.66666666666667e+01
+2381 1935 -8.33333333333333e+00
+2381 2367 8.33333333333333e+00
+2381 2338 -8.33333333333333e+00
+2381 2396 -1.25000000000000e+01
+2381 2394 8.33333333333333e+00
+2381 1974 -8.33333333333333e+00
+2382 2382 1.25000000000000e+02
+2382 2374 -4.16666666666667e+00
+2382 2437 -8.33333333333333e+00
+2382 2375 8.33333333333333e+00
+2382 2373 -1.25000000000000e+01
+2382 2432 -4.16666666666667e+00
+2382 2431 8.33333333333333e+00
+2382 2430 -1.25000000000000e+01
+2382 2372 -8.33333333333333e+00
+2382 2371 4.16666666666667e+00
+2382 2369 4.16666666666667e+00
+2382 2381 -4.16666666666667e+00
+2382 2383 -1.66666666666667e+01
+2382 2401 8.33333333333333e+00
+2382 2380 8.33333333333333e+00
+2382 2402 8.33333333333333e+00
+2382 2474 -8.33333333333333e+00
+2382 1981 -4.16666666666667e+00
+2382 2473 4.16666666666667e+00
+2382 2400 -3.75000000000000e+01
+2382 1936 -4.16666666666667e+00
+2382 2368 4.16666666666667e+00
+2382 2379 -1.25000000000000e+01
+2382 2120 8.33333333333333e+00
+2382 2384 -1.66666666666667e+01
+2382 2468 8.33333333333333e+00
+2382 2137 4.16666666666667e+00
+2382 2467 -4.16666666666667e+00
+2382 2378 4.16666666666667e+00
+2382 1937 -4.16666666666667e+00
+2382 2119 8.33333333333333e+00
+2382 2377 -8.33333333333333e+00
+2382 2118 -3.75000000000000e+01
+2382 2138 4.16666666666667e+00
+2382 1982 -4.16666666666667e+00
+2382 2466 -1.25000000000000e+01
+2382 2438 4.16666666666667e+00
+2383 2383 1.25000000000000e+02
+2383 2373 -4.16666666666667e+00
+2383 2438 4.16666666666667e+00
+2383 2436 -8.33333333333333e+00
+2383 2374 -1.25000000000000e+01
+2383 2372 4.16666666666667e+00
+2383 2430 8.33333333333333e+00
+2383 2432 8.33333333333333e+00
+2383 2431 -3.75000000000000e+01
+2383 2370 4.16666666666667e+00
+2383 2384 -1.66666666666667e+01
+2383 1937 -4.16666666666667e+00
+2383 1982 -4.16666666666667e+00
+2383 2402 -4.16666666666667e+00
+2383 2474 4.16666666666667e+00
+2383 2382 -1.66666666666667e+01
+2383 2400 8.33333333333333e+00
+2383 2379 8.33333333333333e+00
+2383 2401 -1.25000000000000e+01
+2383 1980 -4.16666666666667e+00
+2383 2472 4.16666666666667e+00
+2383 2369 -8.33333333333333e+00
+2383 2381 8.33333333333333e+00
+2383 2380 -3.75000000000000e+01
+2383 1935 -4.16666666666667e+00
+2383 2367 4.16666666666667e+00
+2383 2120 -4.16666666666667e+00
+2383 2378 4.16666666666667e+00
+2383 2136 4.16666666666667e+00
+2383 2466 -4.16666666666667e+00
+2383 2119 -1.25000000000000e+01
+2383 2118 8.33333333333333e+00
+2383 2376 -8.33333333333333e+00
+2383 2138 -8.33333333333333e+00
+2383 2468 8.33333333333333e+00
+2383 2467 -1.25000000000000e+01
+2383 2375 8.33333333333333e+00
+2384 2384 1.25000000000000e+02
+2384 2374 8.33333333333333e+00
+2384 2437 4.16666666666667e+00
+2384 2375 -3.75000000000000e+01
+2384 2373 8.33333333333333e+00
+2384 2430 -4.16666666666667e+00
+2384 2371 4.16666666666667e+00
+2384 2432 -1.25000000000000e+01
+2384 2431 8.33333333333333e+00
+2384 2370 -8.33333333333333e+00
+2384 2383 -1.66666666666667e+01
+2384 1936 -4.16666666666667e+00
+2384 1981 -4.16666666666667e+00
+2384 2367 4.16666666666667e+00
+2384 2379 -4.16666666666667e+00
+2384 2401 -4.16666666666667e+00
+2384 2473 4.16666666666667e+00
+2384 2402 -1.25000000000000e+01
+2384 2400 8.33333333333333e+00
+2384 2472 -8.33333333333333e+00
+2384 2381 -1.25000000000000e+01
+2384 2368 -8.33333333333333e+00
+2384 2380 8.33333333333333e+00
+2384 2119 -4.16666666666667e+00
+2384 2377 4.16666666666667e+00
+2384 2118 8.33333333333333e+00
+2384 2382 -1.66666666666667e+01
+2384 2466 8.33333333333333e+00
+2384 2120 -1.25000000000000e+01
+2384 2376 4.16666666666667e+00
+2384 1935 -4.16666666666667e+00
+2384 2468 -3.75000000000000e+01
+2384 2436 4.16666666666667e+00
+2384 2137 -8.33333333333333e+00
+2384 2467 8.33333333333333e+00
+2384 2136 4.16666666666667e+00
+2384 1980 -4.16666666666667e+00
+2385 2385 1.25000000000000e+02
+2385 2320 -4.16666666666667e+00
+2385 2315 -8.33333333333333e+00
+2385 2321 8.33333333333333e+00
+2385 2319 -1.25000000000000e+01
+2385 2393 -4.16666666666667e+00
+2385 2392 8.33333333333333e+00
+2385 2391 -1.25000000000000e+01
+2385 2284 -4.16666666666667e+00
+2385 2293 4.16666666666667e+00
+2385 2294 4.16666666666667e+00
+2385 2357 -4.16666666666667e+00
+2385 2386 -1.66666666666667e+01
+2385 2356 8.33333333333333e+00
+2385 2355 -1.25000000000000e+01
+2385 2285 -4.16666666666667e+00
+2385 2351 4.16666666666667e+00
+2385 1939 8.33333333333333e+00
+2385 2350 -8.33333333333333e+00
+2385 2141 4.16666666666667e+00
+2385 2387 -1.66666666666667e+01
+2385 2399 8.33333333333333e+00
+2385 1940 8.33333333333333e+00
+2385 2398 -4.16666666666667e+00
+2385 2140 4.16666666666667e+00
+2385 2314 4.16666666666667e+00
+2385 2397 -1.25000000000000e+01
+2385 1938 -3.75000000000000e+01
+2385 1646 4.16666666666667e+00
+2385 1645 -8.33333333333333e+00
+2385 1315 8.33333333333333e+00
+2385 1505 -4.16666666666667e+00
+2385 1316 8.33333333333333e+00
+2385 1652 -8.33333333333333e+00
+2385 1651 4.16666666666667e+00
+2385 1504 -4.16666666666667e+00
+2385 1314 -3.75000000000000e+01
+2386 2386 1.25000000000000e+02
+2386 2319 -4.16666666666667e+00
+2386 2321 8.33333333333333e+00
+2386 2315 4.16666666666667e+00
+2386 2320 -1.25000000000000e+01
+2386 2393 8.33333333333333e+00
+2386 2392 -3.75000000000000e+01
+2386 2391 8.33333333333333e+00
+2386 2387 -1.66666666666667e+01
+2386 1940 -4.16666666666667e+00
+2386 2351 4.16666666666667e+00
+2386 2285 -4.16666666666667e+00
+2386 2283 -4.16666666666667e+00
+2386 2292 4.16666666666667e+00
+2386 2294 -8.33333333333333e+00
+2386 2357 8.33333333333333e+00
+2386 2356 -3.75000000000000e+01
+2386 2385 -1.66666666666667e+01
+2386 2355 8.33333333333333e+00
+2386 1938 8.33333333333333e+00
+2386 2349 -8.33333333333333e+00
+2386 2399 8.33333333333333e+00
+2386 2141 -8.33333333333333e+00
+2386 2313 4.16666666666667e+00
+2386 2398 -1.25000000000000e+01
+2386 1939 -1.25000000000000e+01
+2386 2397 -4.16666666666667e+00
+2386 2139 4.16666666666667e+00
+2386 1646 4.16666666666667e+00
+2386 1644 -8.33333333333333e+00
+2386 1316 -4.16666666666667e+00
+2386 1314 8.33333333333333e+00
+2386 1652 4.16666666666667e+00
+2386 1505 -4.16666666666667e+00
+2386 1315 -1.25000000000000e+01
+2386 1650 4.16666666666667e+00
+2386 1503 -4.16666666666667e+00
+2387 2387 1.25000000000000e+02
+2387 2314 4.16666666666667e+00
+2387 2313 -8.33333333333333e+00
+2387 2321 -3.75000000000000e+01
+2387 2319 8.33333333333333e+00
+2387 2393 -1.25000000000000e+01
+2387 2392 8.33333333333333e+00
+2387 2391 -4.16666666666667e+00
+2387 2386 -1.66666666666667e+01
+2387 1939 -4.16666666666667e+00
+2387 2350 4.16666666666667e+00
+2387 2284 -4.16666666666667e+00
+2387 2357 -1.25000000000000e+01
+2387 2293 -8.33333333333333e+00
+2387 2356 8.33333333333333e+00
+2387 2292 4.16666666666667e+00
+2387 2355 -4.16666666666667e+00
+2387 2283 -4.16666666666667e+00
+2387 2349 4.16666666666667e+00
+2387 2139 4.16666666666667e+00
+2387 2320 8.33333333333333e+00
+2387 2399 -3.75000000000000e+01
+2387 1940 -1.25000000000000e+01
+2387 2398 8.33333333333333e+00
+2387 2140 -8.33333333333333e+00
+2387 2385 -1.66666666666667e+01
+2387 2397 8.33333333333333e+00
+2387 1938 8.33333333333333e+00
+2387 1645 4.16666666666667e+00
+2387 1644 4.16666666666667e+00
+2387 1315 -4.16666666666667e+00
+2387 1651 4.16666666666667e+00
+2387 1504 -4.16666666666667e+00
+2387 1503 -4.16666666666667e+00
+2387 1316 -1.25000000000000e+01
+2387 1314 8.33333333333333e+00
+2387 1650 -8.33333333333333e+00
+2388 2388 1.25000000000000e+02
+2388 2326 -4.16666666666667e+00
+2388 2327 8.33333333333333e+00
+2388 2315 4.16666666666667e+00
+2388 2325 -1.25000000000000e+01
+2388 2435 4.16666666666667e+00
+2388 2434 -8.33333333333333e+00
+2388 2393 8.33333333333333e+00
+2388 2392 8.33333333333333e+00
+2388 2391 -3.75000000000000e+01
+2388 2390 -1.66666666666667e+01
+2388 1958 -4.16666666666667e+00
+2388 1940 -4.16666666666667e+00
+2388 2303 -4.16666666666667e+00
+2388 2369 4.16666666666667e+00
+2388 2302 -4.16666666666667e+00
+2388 2311 4.16666666666667e+00
+2388 2312 -8.33333333333333e+00
+2388 2375 8.33333333333333e+00
+2388 1957 8.33333333333333e+00
+2388 2389 -1.66666666666667e+01
+2388 2374 8.33333333333333e+00
+2388 2373 -3.75000000000000e+01
+2388 1939 8.33333333333333e+00
+2388 2368 -8.33333333333333e+00
+2388 2144 -4.16666666666667e+00
+2388 2438 4.16666666666667e+00
+2388 2437 4.16666666666667e+00
+2388 2143 -4.16666666666667e+00
+2388 1956 -1.25000000000000e+01
+2388 2402 8.33333333333333e+00
+2388 2141 -8.33333333333333e+00
+2388 2401 -4.16666666666667e+00
+2388 2140 4.16666666666667e+00
+2388 2400 -1.25000000000000e+01
+2388 2314 4.16666666666667e+00
+2388 1938 -1.25000000000000e+01
+2389 2389 1.25000000000000e+02
+2389 2325 -4.16666666666667e+00
+2389 2315 -8.33333333333333e+00
+2389 2327 8.33333333333333e+00
+2389 2326 -1.25000000000000e+01
+2389 2435 4.16666666666667e+00
+2389 2433 -8.33333333333333e+00
+2389 2393 -4.16666666666667e+00
+2389 2392 -1.25000000000000e+01
+2389 2391 8.33333333333333e+00
+2389 2301 -4.16666666666667e+00
+2389 2310 4.16666666666667e+00
+2389 2312 4.16666666666667e+00
+2389 2375 -4.16666666666667e+00
+2389 2374 -1.25000000000000e+01
+2389 1956 8.33333333333333e+00
+2389 2388 -1.66666666666667e+01
+2389 2373 8.33333333333333e+00
+2389 2303 -4.16666666666667e+00
+2389 2369 4.16666666666667e+00
+2389 1938 8.33333333333333e+00
+2389 2367 -8.33333333333333e+00
+2389 2144 -4.16666666666667e+00
+2389 2141 4.16666666666667e+00
+2389 2438 -8.33333333333333e+00
+2389 1958 8.33333333333333e+00
+2389 1957 -3.75000000000000e+01
+2389 2436 4.16666666666667e+00
+2389 2142 -4.16666666666667e+00
+2389 2402 8.33333333333333e+00
+2389 2390 -1.66666666666667e+01
+2389 1940 8.33333333333333e+00
+2389 2401 -1.25000000000000e+01
+2389 2313 4.16666666666667e+00
+2389 1939 -3.75000000000000e+01
+2389 2400 -4.16666666666667e+00
+2389 2139 4.16666666666667e+00
+2390 2390 1.25000000000000e+02
+2390 2314 -8.33333333333333e+00
+2390 2313 4.16666666666667e+00
+2390 2327 -3.75000000000000e+01
+2390 2326 8.33333333333333e+00
+2390 2433 4.16666666666667e+00
+2390 2434 4.16666666666667e+00
+2390 2393 -1.25000000000000e+01
+2390 2392 -4.16666666666667e+00
+2390 2391 8.33333333333333e+00
+2390 2388 -1.66666666666667e+01
+2390 1956 -4.16666666666667e+00
+2390 1938 -4.16666666666667e+00
+2390 2301 -4.16666666666667e+00
+2390 2367 4.16666666666667e+00
+2390 2375 -1.25000000000000e+01
+2390 2311 4.16666666666667e+00
+2390 2374 -4.16666666666667e+00
+2390 2310 -8.33333333333333e+00
+2390 2373 8.33333333333333e+00
+2390 2302 -4.16666666666667e+00
+2390 2368 4.16666666666667e+00
+2390 2142 -4.16666666666667e+00
+2390 2436 4.16666666666667e+00
+2390 2143 -4.16666666666667e+00
+2390 2140 4.16666666666667e+00
+2390 1958 -1.25000000000000e+01
+2390 2437 -8.33333333333333e+00
+2390 1957 8.33333333333333e+00
+2390 2402 -3.75000000000000e+01
+2390 2325 8.33333333333333e+00
+2390 1940 -1.25000000000000e+01
+2390 2401 8.33333333333333e+00
+2390 2389 -1.66666666666667e+01
+2390 1939 8.33333333333333e+00
+2390 2400 8.33333333333333e+00
+2390 2139 -8.33333333333333e+00
+2391 2391 1.25000000000000e+02
+2391 2327 -8.33333333333333e+00
+2391 2435 -4.16666666666667e+00
+2391 2143 4.16666666666667e+00
+2391 2144 4.16666666666667e+00
+2391 2434 8.33333333333333e+00
+2391 2433 -1.25000000000000e+01
+2391 2390 8.33333333333333e+00
+2391 2389 8.33333333333333e+00
+2391 2388 -3.75000000000000e+01
+2391 2314 -4.16666666666667e+00
+2391 2315 -4.16666666666667e+00
+2391 2329 -4.16666666666667e+00
+2391 2320 4.16666666666667e+00
+2391 2321 4.16666666666667e+00
+2391 2330 8.33333333333333e+00
+2391 2393 -1.66666666666667e+01
+2391 2328 -1.25000000000000e+01
+2391 2140 -4.16666666666667e+00
+2391 2392 -1.66666666666667e+01
+2391 2141 8.33333333333333e+00
+2391 2387 -4.16666666666667e+00
+2391 1940 4.16666666666667e+00
+2391 2386 8.33333333333333e+00
+2391 1939 -8.33333333333333e+00
+2391 2385 -1.25000000000000e+01
+2391 2326 4.16666666666667e+00
+2391 2139 -1.25000000000000e+01
+2391 1646 8.33333333333333e+00
+2391 1507 -4.16666666666667e+00
+2391 1504 4.16666666666667e+00
+2391 1505 -8.33333333333333e+00
+2391 1346 4.16666666666667e+00
+2391 1508 -4.16666666666667e+00
+2391 1645 8.33333333333333e+00
+2391 1345 -8.33333333333333e+00
+2391 1644 -3.75000000000000e+01
+2392 2392 1.25000000000000e+02
+2392 2327 4.16666666666667e+00
+2392 2435 8.33333333333333e+00
+2392 2142 4.16666666666667e+00
+2392 2144 -8.33333333333333e+00
+2392 2434 -3.75000000000000e+01
+2392 2433 8.33333333333333e+00
+2392 2390 -4.16666666666667e+00
+2392 2389 -1.25000000000000e+01
+2392 2388 8.33333333333333e+00
+2392 2313 -4.16666666666667e+00
+2392 2330 8.33333333333333e+00
+2392 2328 -4.16666666666667e+00
+2392 2319 4.16666666666667e+00
+2392 2321 -8.33333333333333e+00
+2392 2329 -1.25000000000000e+01
+2392 2315 -4.16666666666667e+00
+2392 1940 4.16666666666667e+00
+2392 2139 -4.16666666666667e+00
+2392 2391 -1.66666666666667e+01
+2392 2387 8.33333333333333e+00
+2392 2393 -1.66666666666667e+01
+2392 2141 8.33333333333333e+00
+2392 2386 -3.75000000000000e+01
+2392 2325 4.16666666666667e+00
+2392 2140 -1.25000000000000e+01
+2392 2385 8.33333333333333e+00
+2392 1938 -8.33333333333333e+00
+2392 1346 4.16666666666667e+00
+2392 1646 -4.16666666666667e+00
+2392 1506 -4.16666666666667e+00
+2392 1503 4.16666666666667e+00
+2392 1508 -4.16666666666667e+00
+2392 1505 4.16666666666667e+00
+2392 1645 -1.25000000000000e+01
+2392 1644 8.33333333333333e+00
+2392 1344 -8.33333333333333e+00
+2393 2393 1.25000000000000e+02
+2393 2325 -8.33333333333333e+00
+2393 2433 -4.16666666666667e+00
+2393 2434 8.33333333333333e+00
+2393 2143 -8.33333333333333e+00
+2393 2142 4.16666666666667e+00
+2393 2435 -1.25000000000000e+01
+2393 2390 -1.25000000000000e+01
+2393 2389 -4.16666666666667e+00
+2393 2388 8.33333333333333e+00
+2393 2313 -4.16666666666667e+00
+2393 2329 8.33333333333333e+00
+2393 2320 -8.33333333333333e+00
+2393 2319 4.16666666666667e+00
+2393 2330 -3.75000000000000e+01
+2393 2328 8.33333333333333e+00
+2393 2391 -1.66666666666667e+01
+2393 2314 -4.16666666666667e+00
+2393 1939 4.16666666666667e+00
+2393 2139 8.33333333333333e+00
+2393 2387 -1.25000000000000e+01
+2393 2326 4.16666666666667e+00
+2393 2141 -3.75000000000000e+01
+2393 2386 8.33333333333333e+00
+2393 2392 -1.66666666666667e+01
+2393 2140 8.33333333333333e+00
+2393 2385 -4.16666666666667e+00
+2393 1938 4.16666666666667e+00
+2393 1345 4.16666666666667e+00
+2393 1645 -4.16666666666667e+00
+2393 1644 8.33333333333333e+00
+2393 1507 -4.16666666666667e+00
+2393 1504 4.16666666666667e+00
+2393 1503 -8.33333333333333e+00
+2393 1646 -1.25000000000000e+01
+2393 1344 4.16666666666667e+00
+2393 1506 -4.16666666666667e+00
+2394 2394 1.25000000000000e+02
+2394 2369 -8.33333333333333e+00
+2394 2368 4.16666666666667e+00
+2394 2381 8.33333333333333e+00
+2394 2379 -3.75000000000000e+01
+2394 2473 4.16666666666667e+00
+2394 2474 4.16666666666667e+00
+2394 2402 -4.16666666666667e+00
+2394 2401 8.33333333333333e+00
+2394 2400 -1.25000000000000e+01
+2394 2338 -4.16666666666667e+00
+2394 2339 -4.16666666666667e+00
+2394 2348 4.16666666666667e+00
+2394 2347 -8.33333333333333e+00
+2394 2351 4.16666666666667e+00
+2394 2363 -4.16666666666667e+00
+2394 2395 -1.66666666666667e+01
+2394 2362 8.33333333333333e+00
+2394 2350 4.16666666666667e+00
+2394 1939 -4.16666666666667e+00
+2394 1975 -4.16666666666667e+00
+2394 2361 -1.25000000000000e+01
+2394 2141 4.16666666666667e+00
+2394 2147 -4.16666666666667e+00
+2394 2470 4.16666666666667e+00
+2394 2146 -4.16666666666667e+00
+2394 1976 8.33333333333333e+00
+2394 2471 -8.33333333333333e+00
+2394 1974 -1.25000000000000e+01
+2394 2396 -1.66666666666667e+01
+2394 2399 8.33333333333333e+00
+2394 1940 8.33333333333333e+00
+2394 2398 8.33333333333333e+00
+2394 2140 -8.33333333333333e+00
+2394 2380 8.33333333333333e+00
+2394 2397 -3.75000000000000e+01
+2394 1938 -1.25000000000000e+01
+2395 2395 1.25000000000000e+02
+2395 2381 -4.16666666666667e+00
+2395 2379 8.33333333333333e+00
+2395 2367 4.16666666666667e+00
+2395 2380 -1.25000000000000e+01
+2395 2472 4.16666666666667e+00
+2395 2474 -8.33333333333333e+00
+2395 2402 8.33333333333333e+00
+2395 2401 -3.75000000000000e+01
+2395 2400 8.33333333333333e+00
+2395 2337 -4.16666666666667e+00
+2395 2339 -4.16666666666667e+00
+2395 2348 4.16666666666667e+00
+2395 2346 -8.33333333333333e+00
+2395 2394 -1.66666666666667e+01
+2395 2361 8.33333333333333e+00
+2395 2351 -8.33333333333333e+00
+2395 1940 8.33333333333333e+00
+2395 2349 4.16666666666667e+00
+2395 1938 -4.16666666666667e+00
+2395 2363 8.33333333333333e+00
+2395 2396 -1.66666666666667e+01
+2395 1976 8.33333333333333e+00
+2395 2362 -3.75000000000000e+01
+2395 1974 -4.16666666666667e+00
+2395 2469 4.16666666666667e+00
+2395 2145 -4.16666666666667e+00
+2395 2471 4.16666666666667e+00
+2395 2147 -4.16666666666667e+00
+2395 1975 -1.25000000000000e+01
+2395 2399 -4.16666666666667e+00
+2395 2141 4.16666666666667e+00
+2395 2369 4.16666666666667e+00
+2395 2398 -1.25000000000000e+01
+2395 1939 -1.25000000000000e+01
+2395 2397 8.33333333333333e+00
+2395 2139 -8.33333333333333e+00
+2396 2396 1.25000000000000e+02
+2396 2380 -4.16666666666667e+00
+2396 2367 -8.33333333333333e+00
+2396 2381 -1.25000000000000e+01
+2396 2379 8.33333333333333e+00
+2396 2473 -8.33333333333333e+00
+2396 2472 4.16666666666667e+00
+2396 2402 -1.25000000000000e+01
+2396 2401 8.33333333333333e+00
+2396 2400 -4.16666666666667e+00
+2396 2338 -4.16666666666667e+00
+2396 2347 4.16666666666667e+00
+2396 2337 -4.16666666666667e+00
+2396 2346 4.16666666666667e+00
+2396 2349 4.16666666666667e+00
+2396 2361 -4.16666666666667e+00
+2396 2350 -8.33333333333333e+00
+2396 1939 8.33333333333333e+00
+2396 2363 -1.25000000000000e+01
+2396 2362 8.33333333333333e+00
+2396 2395 -1.66666666666667e+01
+2396 1975 8.33333333333333e+00
+2396 2139 4.16666666666667e+00
+2396 2145 -4.16666666666667e+00
+2396 1976 -3.75000000000000e+01
+2396 2470 4.16666666666667e+00
+2396 2146 -4.16666666666667e+00
+2396 1974 8.33333333333333e+00
+2396 2469 -8.33333333333333e+00
+2396 2368 4.16666666666667e+00
+2396 2399 -1.25000000000000e+01
+2396 1940 -3.75000000000000e+01
+2396 2398 -4.16666666666667e+00
+2396 2140 4.16666666666667e+00
+2396 2394 -1.66666666666667e+01
+2396 2397 8.33333333333333e+00
+2396 1938 8.33333333333333e+00
+2397 2397 1.25000000000000e+02
+2397 2356 4.16666666666667e+00
+2397 2387 8.33333333333333e+00
+2397 2386 -4.16666666666667e+00
+2397 2385 -1.25000000000000e+01
+2397 2351 -4.16666666666667e+00
+2397 2366 -4.16666666666667e+00
+2397 2363 4.16666666666667e+00
+2397 2365 8.33333333333333e+00
+2397 2362 -8.33333333333333e+00
+2397 2364 -1.25000000000000e+01
+2397 2350 -4.16666666666667e+00
+2397 1939 4.16666666666667e+00
+2397 2141 -4.16666666666667e+00
+2397 2399 -1.66666666666667e+01
+2397 2470 -4.16666666666667e+00
+2397 2147 4.16666666666667e+00
+2397 2146 4.16666666666667e+00
+2397 2471 8.33333333333333e+00
+2397 2469 -1.25000000000000e+01
+2397 2396 8.33333333333333e+00
+2397 1940 -8.33333333333333e+00
+2397 2395 8.33333333333333e+00
+2397 2398 -1.66666666666667e+01
+2397 2140 8.33333333333333e+00
+2397 2394 -3.75000000000000e+01
+2397 2357 4.16666666666667e+00
+2397 2139 -1.25000000000000e+01
+2397 1651 8.33333333333333e+00
+2397 1505 4.16666666666667e+00
+2397 1504 -8.33333333333333e+00
+2397 1652 8.33333333333333e+00
+2397 1650 -3.75000000000000e+01
+2397 1363 4.16666666666667e+00
+2397 1511 -4.16666666666667e+00
+2397 1510 -4.16666666666667e+00
+2397 1364 -8.33333333333333e+00
+2398 2398 1.25000000000000e+02
+2398 2355 4.16666666666667e+00
+2398 2387 8.33333333333333e+00
+2398 2386 -1.25000000000000e+01
+2398 2385 -4.16666666666667e+00
+2398 2351 -4.16666666666667e+00
+2398 2364 8.33333333333333e+00
+2398 2363 4.16666666666667e+00
+2398 2361 -8.33333333333333e+00
+2398 2366 8.33333333333333e+00
+2398 2399 -1.66666666666667e+01
+2398 2365 -3.75000000000000e+01
+2398 2349 -4.16666666666667e+00
+2398 1938 4.16666666666667e+00
+2398 2469 -4.16666666666667e+00
+2398 2471 8.33333333333333e+00
+2398 2141 8.33333333333333e+00
+2398 2147 -8.33333333333333e+00
+2398 2145 4.16666666666667e+00
+2398 2470 -1.25000000000000e+01
+2398 2396 -4.16666666666667e+00
+2398 1940 4.16666666666667e+00
+2398 2395 -1.25000000000000e+01
+2398 2357 -8.33333333333333e+00
+2398 2140 -3.75000000000000e+01
+2398 2394 8.33333333333333e+00
+2398 2397 -1.66666666666667e+01
+2398 2139 8.33333333333333e+00
+2398 1652 -4.16666666666667e+00
+2398 1505 4.16666666666667e+00
+2398 1650 8.33333333333333e+00
+2398 1503 -8.33333333333333e+00
+2398 1651 -1.25000000000000e+01
+2398 1362 4.16666666666667e+00
+2398 1509 -4.16666666666667e+00
+2398 1364 4.16666666666667e+00
+2398 1511 -4.16666666666667e+00
+2399 2399 1.25000000000000e+02
+2399 2356 -8.33333333333333e+00
+2399 2387 -3.75000000000000e+01
+2399 2386 8.33333333333333e+00
+2399 2385 8.33333333333333e+00
+2399 2349 -4.16666666666667e+00
+2399 2350 -4.16666666666667e+00
+2399 2364 -4.16666666666667e+00
+2399 2361 4.16666666666667e+00
+2399 2362 4.16666666666667e+00
+2399 2366 -1.25000000000000e+01
+2399 2365 8.33333333333333e+00
+2399 2398 -1.66666666666667e+01
+2399 2139 -4.16666666666667e+00
+2399 2397 -1.66666666666667e+01
+2399 2470 8.33333333333333e+00
+2399 2145 4.16666666666667e+00
+2399 2140 8.33333333333333e+00
+2399 2146 -8.33333333333333e+00
+2399 2471 -3.75000000000000e+01
+2399 2469 8.33333333333333e+00
+2399 2396 -1.25000000000000e+01
+2399 2355 4.16666666666667e+00
+2399 2141 -1.25000000000000e+01
+2399 2395 -4.16666666666667e+00
+2399 1939 4.16666666666667e+00
+2399 2394 8.33333333333333e+00
+2399 1938 -8.33333333333333e+00
+2399 1651 -4.16666666666667e+00
+2399 1504 4.16666666666667e+00
+2399 1503 4.16666666666667e+00
+2399 1652 -1.25000000000000e+01
+2399 1650 8.33333333333333e+00
+2399 1509 -4.16666666666667e+00
+2399 1363 4.16666666666667e+00
+2399 1510 -4.16666666666667e+00
+2399 1362 -8.33333333333333e+00
+2400 2400 1.25000000000000e+02
+2400 2374 4.16666666666667e+00
+2400 2144 4.16666666666667e+00
+2400 2438 -4.16666666666667e+00
+2400 2437 8.33333333333333e+00
+2400 2143 -8.33333333333333e+00
+2400 2436 -1.25000000000000e+01
+2400 2390 8.33333333333333e+00
+2400 2389 -4.16666666666667e+00
+2400 2388 -1.25000000000000e+01
+2400 2369 -4.16666666666667e+00
+2400 2383 8.33333333333333e+00
+2400 2381 4.16666666666667e+00
+2400 2380 -8.33333333333333e+00
+2400 2384 8.33333333333333e+00
+2400 2402 -1.66666666666667e+01
+2400 1981 4.16666666666667e+00
+2400 2382 -3.75000000000000e+01
+2400 2368 -4.16666666666667e+00
+2400 1939 4.16666666666667e+00
+2400 2473 -4.16666666666667e+00
+2400 2474 8.33333333333333e+00
+2400 2141 8.33333333333333e+00
+2400 2147 -8.33333333333333e+00
+2400 2149 -4.16666666666667e+00
+2400 2146 4.16666666666667e+00
+2400 1982 4.16666666666667e+00
+2400 2150 -4.16666666666667e+00
+2400 2472 -1.25000000000000e+01
+2400 2396 -4.16666666666667e+00
+2400 1940 4.16666666666667e+00
+2400 2401 -1.66666666666667e+01
+2400 2395 8.33333333333333e+00
+2400 2140 8.33333333333333e+00
+2400 2375 -8.33333333333333e+00
+2400 2394 -1.25000000000000e+01
+2400 2139 -3.75000000000000e+01
+2401 2401 1.25000000000000e+02
+2401 2373 4.16666666666667e+00
+2401 2436 8.33333333333333e+00
+2401 2144 4.16666666666667e+00
+2401 2142 -8.33333333333333e+00
+2401 2438 8.33333333333333e+00
+2401 2437 -3.75000000000000e+01
+2401 2390 8.33333333333333e+00
+2401 2389 -1.25000000000000e+01
+2401 2388 -4.16666666666667e+00
+2401 2369 -4.16666666666667e+00
+2401 2384 -4.16666666666667e+00
+2401 2381 4.16666666666667e+00
+2401 2382 8.33333333333333e+00
+2401 2379 -8.33333333333333e+00
+2401 2383 -1.25000000000000e+01
+2401 1980 4.16666666666667e+00
+2401 2367 -4.16666666666667e+00
+2401 1938 4.16666666666667e+00
+2401 2141 -4.16666666666667e+00
+2401 2402 -1.66666666666667e+01
+2401 2472 -4.16666666666667e+00
+2401 2150 -4.16666666666667e+00
+2401 2147 4.16666666666667e+00
+2401 2148 -4.16666666666667e+00
+2401 2145 4.16666666666667e+00
+2401 1982 -8.33333333333333e+00
+2401 2474 8.33333333333333e+00
+2401 2473 -1.25000000000000e+01
+2401 2396 8.33333333333333e+00
+2401 1940 -8.33333333333333e+00
+2401 2375 4.16666666666667e+00
+2401 2395 -3.75000000000000e+01
+2401 2140 -1.25000000000000e+01
+2401 2400 -1.66666666666667e+01
+2401 2394 8.33333333333333e+00
+2401 2139 8.33333333333333e+00
+2402 2402 1.25000000000000e+02
+2402 2373 -8.33333333333333e+00
+2402 2142 4.16666666666667e+00
+2402 2436 -4.16666666666667e+00
+2402 2143 4.16666666666667e+00
+2402 2438 -1.25000000000000e+01
+2402 2437 8.33333333333333e+00
+2402 2390 -3.75000000000000e+01
+2402 2389 8.33333333333333e+00
+2402 2388 8.33333333333333e+00
+2402 2368 -4.16666666666667e+00
+2402 2367 -4.16666666666667e+00
+2402 2383 -4.16666666666667e+00
+2402 2380 4.16666666666667e+00
+2402 2379 4.16666666666667e+00
+2402 2384 -1.25000000000000e+01
+2402 2382 8.33333333333333e+00
+2402 2400 -1.66666666666667e+01
+2402 2140 -4.16666666666667e+00
+2402 2401 -1.66666666666667e+01
+2402 2149 -4.16666666666667e+00
+2402 2146 4.16666666666667e+00
+2402 2472 8.33333333333333e+00
+2402 2139 8.33333333333333e+00
+2402 2145 -8.33333333333333e+00
+2402 2474 -3.75000000000000e+01
+2402 1981 -8.33333333333333e+00
+2402 2473 8.33333333333333e+00
+2402 1980 4.16666666666667e+00
+2402 2148 -4.16666666666667e+00
+2402 2374 4.16666666666667e+00
+2402 2396 -1.25000000000000e+01
+2402 2141 -1.25000000000000e+01
+2402 2395 8.33333333333333e+00
+2402 1939 -8.33333333333333e+00
+2402 2394 -4.16666666666667e+00
+2402 1938 4.16666666666667e+00
+2403 2403 6.25000000000000e+01
+2403 2201 -4.16666666666667e+00
+2403 2404 -8.33333333333333e+00
+2403 2407 4.16666666666667e+00
+2403 2200 8.33333333333333e+00
+2403 2408 4.16666666666667e+00
+2403 1942 -2.08333333333333e+00
+2403 2197 4.16666666666667e+00
+2403 2406 -1.87500000000000e+01
+2403 2417 -4.16666666666667e+00
+2403 2416 2.08333333333333e+00
+2403 1948 -2.08333333333333e+00
+2403 2199 -1.25000000000000e+01
+2403 2035 2.08333333333333e+00
+2403 2179 -4.16666666666667e+00
+2403 2180 -4.16666666666667e+00
+2403 2186 4.16666666666667e+00
+2403 1943 4.16666666666667e+00
+2403 2036 -4.16666666666667e+00
+2403 1941 -6.25000000000000e+00
+2403 2405 -8.33333333333333e+00
+2403 2042 4.16666666666667e+00
+2403 1949 4.16666666666667e+00
+2403 2041 4.16666666666667e+00
+2403 2185 -8.33333333333333e+00
+2403 2198 4.16666666666667e+00
+2403 2040 -1.87500000000000e+01
+2403 1947 -6.25000000000000e+00
+2404 2404 6.25000000000000e+01
+2404 2417 2.08333333333333e+00
+2404 2403 -8.33333333333333e+00
+2404 2406 4.16666666666667e+00
+2404 2199 8.33333333333333e+00
+2404 1943 4.16666666666667e+00
+2404 2198 -8.33333333333333e+00
+2404 2407 -6.25000000000000e+00
+2404 1941 -2.08333333333333e+00
+2404 2196 4.16666666666667e+00
+2404 2405 -8.33333333333333e+00
+2404 2201 8.33333333333333e+00
+2404 1949 4.16666666666667e+00
+2404 2200 -3.75000000000000e+01
+2404 2415 2.08333333333333e+00
+2404 1947 -2.08333333333333e+00
+2404 2034 2.08333333333333e+00
+2404 2178 -4.16666666666667e+00
+2404 2036 2.08333333333333e+00
+2404 2180 -4.16666666666667e+00
+2404 1942 -6.25000000000000e+00
+2404 2042 -2.08333333333333e+00
+2404 2186 4.16666666666667e+00
+2404 2408 -2.08333333333333e+00
+2404 2041 -6.25000000000000e+00
+2404 1948 -6.25000000000000e+00
+2404 2040 4.16666666666667e+00
+2404 2184 -8.33333333333333e+00
+2405 2405 6.25000000000000e+01
+2405 2199 -4.16666666666667e+00
+2405 2407 -2.08333333333333e+00
+2405 2416 2.08333333333333e+00
+2405 2408 -6.25000000000000e+00
+2405 1942 4.16666666666667e+00
+2405 2197 -8.33333333333333e+00
+2405 2406 4.16666666666667e+00
+2405 2201 -1.25000000000000e+01
+2405 2404 -8.33333333333333e+00
+2405 2200 8.33333333333333e+00
+2405 1948 4.16666666666667e+00
+2405 2415 -4.16666666666667e+00
+2405 2178 -4.16666666666667e+00
+2405 2184 4.16666666666667e+00
+2405 1943 -1.87500000000000e+01
+2405 2035 2.08333333333333e+00
+2405 2179 -4.16666666666667e+00
+2405 1941 4.16666666666667e+00
+2405 2034 -4.16666666666667e+00
+2405 2196 4.16666666666667e+00
+2405 2042 -6.25000000000000e+00
+2405 1949 -1.87500000000000e+01
+2405 2041 -2.08333333333333e+00
+2405 2185 4.16666666666667e+00
+2405 2403 -8.33333333333333e+00
+2405 2040 4.16666666666667e+00
+2405 1947 4.16666666666667e+00
+2406 2406 6.25000000000000e+01
+2406 2404 4.16666666666667e+00
+2406 2200 -8.33333333333333e+00
+2406 2405 4.16666666666667e+00
+2406 1942 2.08333333333333e+00
+2406 2403 -1.87500000000000e+01
+2406 2417 4.16666666666667e+00
+2406 1954 2.08333333333333e+00
+2406 2416 -2.08333333333333e+00
+2406 2415 -6.25000000000000e+00
+2406 2197 -4.16666666666667e+00
+2406 2198 -4.16666666666667e+00
+2406 2408 -8.33333333333333e+00
+2406 2050 -2.08333333333333e+00
+2406 2044 4.16666666666667e+00
+2406 2045 4.16666666666667e+00
+2406 2204 -4.16666666666667e+00
+2406 2051 4.16666666666667e+00
+2406 1943 -4.16666666666667e+00
+2406 2049 -6.25000000000000e+00
+2406 2057 4.16666666666667e+00
+2406 1955 -4.16666666666667e+00
+2406 2056 4.16666666666667e+00
+2406 2407 -8.33333333333333e+00
+2406 2203 8.33333333333333e+00
+2406 2055 -1.87500000000000e+01
+2406 2201 4.16666666666667e+00
+2406 2202 -1.25000000000000e+01
+2407 2407 6.25000000000000e+01
+2407 2201 4.16666666666667e+00
+2407 2403 4.16666666666667e+00
+2407 2199 -8.33333333333333e+00
+2407 2404 -6.25000000000000e+00
+2407 1941 2.08333333333333e+00
+2407 2408 -8.33333333333333e+00
+2407 2417 4.16666666666667e+00
+2407 2416 -6.25000000000000e+00
+2407 1953 2.08333333333333e+00
+2407 2415 -2.08333333333333e+00
+2407 2196 -4.16666666666667e+00
+2407 2051 4.16666666666667e+00
+2407 2049 -2.08333333333333e+00
+2407 2043 4.16666666666667e+00
+2407 2045 -8.33333333333333e+00
+2407 2204 8.33333333333333e+00
+2407 1943 2.08333333333333e+00
+2407 2198 -4.16666666666667e+00
+2407 2050 -6.25000000000000e+00
+2407 2057 -2.08333333333333e+00
+2407 1955 2.08333333333333e+00
+2407 2056 -6.25000000000000e+00
+2407 2405 -2.08333333333333e+00
+2407 2203 -3.75000000000000e+01
+2407 2055 4.16666666666667e+00
+2407 2406 -8.33333333333333e+00
+2407 2202 8.33333333333333e+00
+2408 2408 6.25000000000000e+01
+2408 2404 -2.08333333333333e+00
+2408 2200 4.16666666666667e+00
+2408 2405 -6.25000000000000e+00
+2408 2403 4.16666666666667e+00
+2408 2417 -1.87500000000000e+01
+2408 2407 -8.33333333333333e+00
+2408 2416 4.16666666666667e+00
+2408 2415 4.16666666666667e+00
+2408 2196 -4.16666666666667e+00
+2408 2050 4.16666666666667e+00
+2408 2406 -8.33333333333333e+00
+2408 2044 -8.33333333333333e+00
+2408 2203 8.33333333333333e+00
+2408 2043 4.16666666666667e+00
+2408 2202 -4.16666666666667e+00
+2408 2051 -1.87500000000000e+01
+2408 1942 2.08333333333333e+00
+2408 2197 -4.16666666666667e+00
+2408 2049 4.16666666666667e+00
+2408 1941 -4.16666666666667e+00
+2408 2057 -6.25000000000000e+00
+2408 2199 4.16666666666667e+00
+2408 2204 -1.25000000000000e+01
+2408 2056 -2.08333333333333e+00
+2408 1954 2.08333333333333e+00
+2408 2055 4.16666666666667e+00
+2408 1953 -4.16666666666667e+00
+2409 2409 6.25000000000000e+01
+2409 2419 2.08333333333333e+00
+2409 2420 -4.16666666666667e+00
+2409 2414 4.16666666666667e+00
+2409 2412 -6.25000000000000e+00
+2409 2249 -4.16666666666667e+00
+2409 1948 4.16666666666667e+00
+2409 2410 -8.33333333333333e+00
+2409 2248 8.33333333333333e+00
+2409 2247 -1.25000000000000e+01
+2409 2246 0.00000000000000e+00
+2409 1945 0.00000000000000e+00
+2409 2245 0.00000000000000e+00
+2409 2186 4.16666666666667e+00
+2409 2183 0.00000000000000e+00
+2409 1946 0.00000000000000e+00
+2409 2039 0.00000000000000e+00
+2409 2038 0.00000000000000e+00
+2409 2182 0.00000000000000e+00
+2409 1944 0.00000000000000e+00
+2409 2411 -8.33333333333333e+00
+2409 2042 4.16666666666667e+00
+2409 1949 4.16666666666667e+00
+2409 2041 -2.08333333333333e+00
+2409 2185 4.16666666666667e+00
+2409 2413 -2.08333333333333e+00
+2409 2040 -6.25000000000000e+00
+2409 1947 -1.87500000000000e+01
+2410 2410 6.25000000000000e+01
+2410 2411 -8.33333333333333e+00
+2410 2412 -2.08333333333333e+00
+2410 2418 2.08333333333333e+00
+2410 1949 -2.08333333333333e+00
+2410 2420 2.08333333333333e+00
+2410 1946 0.00000000000000e+00
+2410 2413 -6.25000000000000e+00
+2410 2246 0.00000000000000e+00
+2410 2249 8.33333333333333e+00
+2410 2248 -3.75000000000000e+01
+2410 1947 4.16666666666667e+00
+2410 2409 -8.33333333333333e+00
+2410 2247 8.33333333333333e+00
+2410 1944 0.00000000000000e+00
+2410 2244 0.00000000000000e+00
+2410 2039 0.00000000000000e+00
+2410 2183 0.00000000000000e+00
+2410 1945 0.00000000000000e+00
+2410 2037 0.00000000000000e+00
+2410 2181 0.00000000000000e+00
+2410 2042 4.16666666666667e+00
+2410 2186 -8.33333333333333e+00
+2410 2414 4.16666666666667e+00
+2410 2041 -6.25000000000000e+00
+2410 1948 -6.25000000000000e+00
+2410 2040 -2.08333333333333e+00
+2410 2184 4.16666666666667e+00
+2411 2411 6.25000000000000e+01
+2411 2410 -8.33333333333333e+00
+2411 1948 -2.08333333333333e+00
+2411 2419 2.08333333333333e+00
+2411 2418 -4.16666666666667e+00
+2411 2414 -1.87500000000000e+01
+2411 1945 0.00000000000000e+00
+2411 2412 4.16666666666667e+00
+2411 2245 0.00000000000000e+00
+2411 2249 -1.25000000000000e+01
+2411 2248 8.33333333333333e+00
+2411 2247 -4.16666666666667e+00
+2411 2244 0.00000000000000e+00
+2411 2184 4.16666666666667e+00
+2411 2181 0.00000000000000e+00
+2411 2038 0.00000000000000e+00
+2411 2182 0.00000000000000e+00
+2411 1946 0.00000000000000e+00
+2411 1944 0.00000000000000e+00
+2411 2037 0.00000000000000e+00
+2411 2413 4.16666666666667e+00
+2411 2042 -1.87500000000000e+01
+2411 1949 -6.25000000000000e+00
+2411 2041 4.16666666666667e+00
+2411 2185 -8.33333333333333e+00
+2411 2409 -8.33333333333333e+00
+2411 2040 4.16666666666667e+00
+2411 1947 4.16666666666667e+00
+2412 2412 6.25000000000000e+01
+2412 2249 4.16666666666667e+00
+2412 2248 4.16666666666667e+00
+2412 2420 4.16666666666667e+00
+2412 2419 4.16666666666667e+00
+2412 2413 -8.33333333333333e+00
+2412 2418 -1.87500000000000e+01
+2412 2411 4.16666666666667e+00
+2412 2409 -6.25000000000000e+00
+2412 2258 -4.16666666666667e+00
+2412 2414 -8.33333333333333e+00
+2412 2246 0.00000000000000e+00
+2412 2105 0.00000000000000e+00
+2412 2107 0.00000000000000e+00
+2412 2257 8.33333333333333e+00
+2412 2104 0.00000000000000e+00
+2412 2108 0.00000000000000e+00
+2412 1946 0.00000000000000e+00
+2412 1945 0.00000000000000e+00
+2412 2245 0.00000000000000e+00
+2412 2106 0.00000000000000e+00
+2412 2114 4.16666666666667e+00
+2412 1979 -4.16666666666667e+00
+2412 2113 -2.08333333333333e+00
+2412 1978 2.08333333333333e+00
+2412 2112 -6.25000000000000e+00
+2412 2410 -2.08333333333333e+00
+2412 2256 -1.25000000000000e+01
+2413 2413 6.25000000000000e+01
+2413 2409 -2.08333333333333e+00
+2413 2249 -8.33333333333333e+00
+2413 2247 4.16666666666667e+00
+2413 2420 -2.08333333333333e+00
+2413 1979 2.08333333333333e+00
+2413 2419 -6.25000000000000e+00
+2413 2418 4.16666666666667e+00
+2413 2412 -8.33333333333333e+00
+2413 1946 0.00000000000000e+00
+2413 2410 -6.25000000000000e+00
+2413 2108 0.00000000000000e+00
+2413 2106 0.00000000000000e+00
+2413 2246 0.00000000000000e+00
+2413 2105 0.00000000000000e+00
+2413 2256 8.33333333333333e+00
+2413 2103 0.00000000000000e+00
+2413 2107 0.00000000000000e+00
+2413 1944 0.00000000000000e+00
+2413 2244 0.00000000000000e+00
+2413 2114 4.16666666666667e+00
+2413 2414 -8.33333333333333e+00
+2413 2258 8.33333333333333e+00
+2413 2113 -6.25000000000000e+00
+2413 2411 4.16666666666667e+00
+2413 2257 -3.75000000000000e+01
+2413 2112 -2.08333333333333e+00
+2413 1977 2.08333333333333e+00
+2414 2414 6.25000000000000e+01
+2414 2247 4.16666666666667e+00
+2414 2248 -8.33333333333333e+00
+2414 2420 -6.25000000000000e+00
+2414 2419 -2.08333333333333e+00
+2414 1978 2.08333333333333e+00
+2414 2418 4.16666666666667e+00
+2414 2411 -1.87500000000000e+01
+2414 1945 0.00000000000000e+00
+2414 2409 4.16666666666667e+00
+2414 2256 -4.16666666666667e+00
+2414 2107 0.00000000000000e+00
+2414 2412 -8.33333333333333e+00
+2414 2244 0.00000000000000e+00
+2414 2103 0.00000000000000e+00
+2414 2245 0.00000000000000e+00
+2414 2104 0.00000000000000e+00
+2414 2108 0.00000000000000e+00
+2414 2106 0.00000000000000e+00
+2414 1944 0.00000000000000e+00
+2414 2114 -1.87500000000000e+01
+2414 2410 4.16666666666667e+00
+2414 2258 -1.25000000000000e+01
+2414 2113 4.16666666666667e+00
+2414 2413 -8.33333333333333e+00
+2414 2257 8.33333333333333e+00
+2414 2112 4.16666666666667e+00
+2414 1977 -4.16666666666667e+00
+2415 2415 6.25000000000000e+01
+2415 2407 -2.08333333333333e+00
+2415 2406 -6.25000000000000e+00
+2415 2405 -4.16666666666667e+00
+2415 2404 2.08333333333333e+00
+2415 2203 4.16666666666667e+00
+2415 2200 -4.16666666666667e+00
+2415 2204 4.16666666666667e+00
+2415 2201 -4.16666666666667e+00
+2415 2264 4.16666666666667e+00
+2415 2267 -4.16666666666667e+00
+2415 2125 2.08333333333333e+00
+2415 2122 -2.08333333333333e+00
+2415 1955 4.16666666666667e+00
+2415 2126 -4.16666666666667e+00
+2415 1954 4.16666666666667e+00
+2415 2416 -8.33333333333333e+00
+2415 2266 8.33333333333333e+00
+2415 1953 -1.87500000000000e+01
+2415 2265 -1.25000000000000e+01
+2415 2417 -8.33333333333333e+00
+2415 1949 4.16666666666667e+00
+2415 2123 4.16666666666667e+00
+2415 1948 4.16666666666667e+00
+2415 2263 -8.33333333333333e+00
+2415 2408 4.16666666666667e+00
+2415 1947 -1.87500000000000e+01
+2415 2121 -6.25000000000000e+00
+2416 2416 6.25000000000000e+01
+2416 2408 4.16666666666667e+00
+2416 2407 -6.25000000000000e+00
+2416 2406 -2.08333333333333e+00
+2416 2403 2.08333333333333e+00
+2416 2202 4.16666666666667e+00
+2416 2199 -4.16666666666667e+00
+2416 2201 -4.16666666666667e+00
+2416 2204 -8.33333333333333e+00
+2416 2417 -8.33333333333333e+00
+2416 2267 8.33333333333333e+00
+2416 2123 4.16666666666667e+00
+2416 2124 2.08333333333333e+00
+2416 2121 -2.08333333333333e+00
+2416 1955 -2.08333333333333e+00
+2416 2126 2.08333333333333e+00
+2416 1954 -6.25000000000000e+00
+2416 2266 -3.75000000000000e+01
+2416 1953 4.16666666666667e+00
+2416 2415 -8.33333333333333e+00
+2416 2265 8.33333333333333e+00
+2416 1949 -2.08333333333333e+00
+2416 2264 4.16666666666667e+00
+2416 2405 2.08333333333333e+00
+2416 1948 -6.25000000000000e+00
+2416 2122 -6.25000000000000e+00
+2416 1947 4.16666666666667e+00
+2416 2262 -8.33333333333333e+00
+2417 2417 6.25000000000000e+01
+2417 2408 -1.87500000000000e+01
+2417 2407 4.16666666666667e+00
+2417 2406 4.16666666666667e+00
+2417 2403 -4.16666666666667e+00
+2417 2200 -4.16666666666667e+00
+2417 2203 -8.33333333333333e+00
+2417 2202 4.16666666666667e+00
+2417 2199 -4.16666666666667e+00
+2417 2262 4.16666666666667e+00
+2417 2265 -4.16666666666667e+00
+2417 2416 -8.33333333333333e+00
+2417 2266 8.33333333333333e+00
+2417 2122 4.16666666666667e+00
+2417 1955 -6.25000000000000e+00
+2417 2267 -1.25000000000000e+01
+2417 1954 -2.08333333333333e+00
+2417 2125 2.08333333333333e+00
+2417 1953 4.16666666666667e+00
+2417 2124 -4.16666666666667e+00
+2417 2404 2.08333333333333e+00
+2417 1949 -6.25000000000000e+00
+2417 2123 -1.87500000000000e+01
+2417 1948 -2.08333333333333e+00
+2417 2263 4.16666666666667e+00
+2417 2415 -8.33333333333333e+00
+2417 1947 4.16666666666667e+00
+2417 2121 4.16666666666667e+00
+2418 2418 6.25000000000000e+01
+2418 2248 -4.16666666666667e+00
+2418 2258 4.16666666666667e+00
+2418 2249 -4.16666666666667e+00
+2418 2411 -4.16666666666667e+00
+2418 2414 4.16666666666667e+00
+2418 2413 4.16666666666667e+00
+2418 2257 -8.33333333333333e+00
+2418 2412 -1.87500000000000e+01
+2418 2264 4.16666666666667e+00
+2418 2276 -4.16666666666667e+00
+2418 2122 4.16666666666667e+00
+2418 2419 -8.33333333333333e+00
+2418 2275 8.33333333333333e+00
+2418 1979 4.16666666666667e+00
+2418 2135 -4.16666666666667e+00
+2418 1978 -2.08333333333333e+00
+2418 2134 2.08333333333333e+00
+2418 1977 -6.25000000000000e+00
+2418 2274 -1.25000000000000e+01
+2418 2420 -8.33333333333333e+00
+2418 1949 4.16666666666667e+00
+2418 2123 4.16666666666667e+00
+2418 1948 -2.08333333333333e+00
+2418 2263 4.16666666666667e+00
+2418 2410 2.08333333333333e+00
+2418 1947 -6.25000000000000e+00
+2418 2121 -1.87500000000000e+01
+2419 2419 6.25000000000000e+01
+2419 2247 -4.16666666666667e+00
+2419 2411 2.08333333333333e+00
+2419 2249 -4.16666666666667e+00
+2419 2414 -2.08333333333333e+00
+2419 2258 4.16666666666667e+00
+2419 2413 -6.25000000000000e+00
+2419 2412 4.16666666666667e+00
+2419 2256 -8.33333333333333e+00
+2419 2123 -2.08333333333333e+00
+2419 2135 2.08333333333333e+00
+2419 2121 4.16666666666667e+00
+2419 2418 -8.33333333333333e+00
+2419 2274 8.33333333333333e+00
+2419 1979 4.16666666666667e+00
+2419 2420 -8.33333333333333e+00
+2419 2276 8.33333333333333e+00
+2419 1978 -6.25000000000000e+00
+2419 2275 -3.75000000000000e+01
+2419 1977 -2.08333333333333e+00
+2419 2133 2.08333333333333e+00
+2419 1949 4.16666666666667e+00
+2419 2264 -8.33333333333333e+00
+2419 2409 2.08333333333333e+00
+2419 1948 -6.25000000000000e+00
+2419 2122 -6.25000000000000e+00
+2419 1947 -2.08333333333333e+00
+2419 2262 4.16666666666667e+00
+2420 2420 6.25000000000000e+01
+2420 2247 -4.16666666666667e+00
+2420 2410 2.08333333333333e+00
+2420 2248 -4.16666666666667e+00
+2420 2409 -4.16666666666667e+00
+2420 2414 -6.25000000000000e+00
+2420 2413 -2.08333333333333e+00
+2420 2257 4.16666666666667e+00
+2420 2412 4.16666666666667e+00
+2420 2122 -2.08333333333333e+00
+2420 2134 2.08333333333333e+00
+2420 2262 4.16666666666667e+00
+2420 2274 -4.16666666666667e+00
+2420 1979 -1.87500000000000e+01
+2420 2276 -1.25000000000000e+01
+2420 1978 4.16666666666667e+00
+2420 2419 -8.33333333333333e+00
+2420 2275 8.33333333333333e+00
+2420 1977 4.16666666666667e+00
+2420 2133 -4.16666666666667e+00
+2420 2256 4.16666666666667e+00
+2420 1949 -1.87500000000000e+01
+2420 2123 -6.25000000000000e+00
+2420 1948 4.16666666666667e+00
+2420 2263 -8.33333333333333e+00
+2420 2418 -8.33333333333333e+00
+2420 1947 4.16666666666667e+00
+2420 2121 4.16666666666667e+00
+2421 2421 6.25000000000000e+01
+2421 2327 -4.16666666666667e+00
+2421 2422 -8.33333333333333e+00
+2421 2425 4.16666666666667e+00
+2421 2326 8.33333333333333e+00
+2421 2426 4.16666666666667e+00
+2421 1951 -2.08333333333333e+00
+2421 2323 4.16666666666667e+00
+2421 2424 -1.87500000000000e+01
+2421 2435 -4.16666666666667e+00
+2421 2434 2.08333333333333e+00
+2421 1957 -2.08333333333333e+00
+2421 2325 -1.25000000000000e+01
+2421 2053 2.08333333333333e+00
+2421 2305 -4.16666666666667e+00
+2421 2306 -4.16666666666667e+00
+2421 2312 4.16666666666667e+00
+2421 1952 4.16666666666667e+00
+2421 2054 -4.16666666666667e+00
+2421 1950 -6.25000000000000e+00
+2421 2423 -8.33333333333333e+00
+2421 2060 4.16666666666667e+00
+2421 1958 4.16666666666667e+00
+2421 2059 4.16666666666667e+00
+2421 2311 -8.33333333333333e+00
+2421 2324 4.16666666666667e+00
+2421 2058 -1.87500000000000e+01
+2421 1956 -6.25000000000000e+00
+2422 2422 6.25000000000000e+01
+2422 2435 2.08333333333333e+00
+2422 2421 -8.33333333333333e+00
+2422 2424 4.16666666666667e+00
+2422 2325 8.33333333333333e+00
+2422 1952 4.16666666666667e+00
+2422 2324 -8.33333333333333e+00
+2422 2425 -6.25000000000000e+00
+2422 1950 -2.08333333333333e+00
+2422 2322 4.16666666666667e+00
+2422 2423 -8.33333333333333e+00
+2422 2327 8.33333333333333e+00
+2422 1958 4.16666666666667e+00
+2422 2326 -3.75000000000000e+01
+2422 2433 2.08333333333333e+00
+2422 1956 -2.08333333333333e+00
+2422 2052 2.08333333333333e+00
+2422 2304 -4.16666666666667e+00
+2422 2054 2.08333333333333e+00
+2422 2306 -4.16666666666667e+00
+2422 1951 -6.25000000000000e+00
+2422 2060 -2.08333333333333e+00
+2422 2312 4.16666666666667e+00
+2422 2426 -2.08333333333333e+00
+2422 2059 -6.25000000000000e+00
+2422 1957 -6.25000000000000e+00
+2422 2058 4.16666666666667e+00
+2422 2310 -8.33333333333333e+00
+2423 2423 6.25000000000000e+01
+2423 2325 -4.16666666666667e+00
+2423 2425 -2.08333333333333e+00
+2423 2434 2.08333333333333e+00
+2423 2426 -6.25000000000000e+00
+2423 1951 4.16666666666667e+00
+2423 2323 -8.33333333333333e+00
+2423 2424 4.16666666666667e+00
+2423 2327 -1.25000000000000e+01
+2423 2422 -8.33333333333333e+00
+2423 2326 8.33333333333333e+00
+2423 1957 4.16666666666667e+00
+2423 2433 -4.16666666666667e+00
+2423 2304 -4.16666666666667e+00
+2423 2310 4.16666666666667e+00
+2423 1952 -1.87500000000000e+01
+2423 2053 2.08333333333333e+00
+2423 2305 -4.16666666666667e+00
+2423 1950 4.16666666666667e+00
+2423 2052 -4.16666666666667e+00
+2423 2322 4.16666666666667e+00
+2423 2060 -6.25000000000000e+00
+2423 1958 -1.87500000000000e+01
+2423 2059 -2.08333333333333e+00
+2423 2311 4.16666666666667e+00
+2423 2421 -8.33333333333333e+00
+2423 2058 4.16666666666667e+00
+2423 1956 4.16666666666667e+00
+2424 2424 6.25000000000000e+01
+2424 2422 4.16666666666667e+00
+2424 2326 -8.33333333333333e+00
+2424 2423 4.16666666666667e+00
+2424 1951 2.08333333333333e+00
+2424 2421 -1.87500000000000e+01
+2424 2435 4.16666666666667e+00
+2424 2434 -2.08333333333333e+00
+2424 2433 -6.25000000000000e+00
+2424 2323 -4.16666666666667e+00
+2424 2324 -4.16666666666667e+00
+2424 2426 -8.33333333333333e+00
+2424 2065 -2.08333333333333e+00
+2424 2062 4.16666666666667e+00
+2424 2063 4.16666666666667e+00
+2424 2330 -4.16666666666667e+00
+2424 2066 4.16666666666667e+00
+2424 1952 -4.16666666666667e+00
+2424 2064 -6.25000000000000e+00
+2424 2425 -8.33333333333333e+00
+2424 2329 8.33333333333333e+00
+2424 2327 4.16666666666667e+00
+2424 2328 -1.25000000000000e+01
+2424 1345 2.08333333333333e+00
+2424 1439 4.16666666666667e+00
+2424 1346 -4.16666666666667e+00
+2424 1438 4.16666666666667e+00
+2424 1437 -1.87500000000000e+01
+2425 2425 6.25000000000000e+01
+2425 2327 4.16666666666667e+00
+2425 2421 4.16666666666667e+00
+2425 2325 -8.33333333333333e+00
+2425 2422 -6.25000000000000e+00
+2425 1950 2.08333333333333e+00
+2425 2426 -8.33333333333333e+00
+2425 2435 4.16666666666667e+00
+2425 2434 -6.25000000000000e+00
+2425 2433 -2.08333333333333e+00
+2425 2322 -4.16666666666667e+00
+2425 2066 4.16666666666667e+00
+2425 2064 -2.08333333333333e+00
+2425 2061 4.16666666666667e+00
+2425 2063 -8.33333333333333e+00
+2425 2330 8.33333333333333e+00
+2425 1952 2.08333333333333e+00
+2425 2324 -4.16666666666667e+00
+2425 2065 -6.25000000000000e+00
+2425 2423 -2.08333333333333e+00
+2425 2329 -3.75000000000000e+01
+2425 2424 -8.33333333333333e+00
+2425 2328 8.33333333333333e+00
+2425 1344 2.08333333333333e+00
+2425 1439 -2.08333333333333e+00
+2425 1346 2.08333333333333e+00
+2425 1438 -6.25000000000000e+00
+2425 1437 4.16666666666667e+00
+2426 2426 6.25000000000000e+01
+2426 2422 -2.08333333333333e+00
+2426 2326 4.16666666666667e+00
+2426 2423 -6.25000000000000e+00
+2426 2421 4.16666666666667e+00
+2426 2435 -1.87500000000000e+01
+2426 2425 -8.33333333333333e+00
+2426 2434 4.16666666666667e+00
+2426 2433 4.16666666666667e+00
+2426 2322 -4.16666666666667e+00
+2426 2065 4.16666666666667e+00
+2426 2424 -8.33333333333333e+00
+2426 2062 -8.33333333333333e+00
+2426 2329 8.33333333333333e+00
+2426 2061 4.16666666666667e+00
+2426 2328 -4.16666666666667e+00
+2426 2066 -1.87500000000000e+01
+2426 1951 2.08333333333333e+00
+2426 2323 -4.16666666666667e+00
+2426 2064 4.16666666666667e+00
+2426 1950 -4.16666666666667e+00
+2426 2325 4.16666666666667e+00
+2426 2330 -1.25000000000000e+01
+2426 1439 -6.25000000000000e+00
+2426 1438 -2.08333333333333e+00
+2426 1345 2.08333333333333e+00
+2426 1437 4.16666666666667e+00
+2426 1344 -4.16666666666667e+00
+2427 2427 6.25000000000000e+01
+2427 2437 2.08333333333333e+00
+2427 2438 -4.16666666666667e+00
+2427 2432 4.16666666666667e+00
+2427 2430 -6.25000000000000e+00
+2427 2375 -4.16666666666667e+00
+2427 1957 4.16666666666667e+00
+2427 2428 -8.33333333333333e+00
+2427 2374 8.33333333333333e+00
+2427 2373 -1.25000000000000e+01
+2427 2372 4.16666666666667e+00
+2427 1954 4.16666666666667e+00
+2427 2371 -8.33333333333333e+00
+2427 2312 4.16666666666667e+00
+2427 2309 -4.16666666666667e+00
+2427 1955 4.16666666666667e+00
+2427 2057 -4.16666666666667e+00
+2427 2056 2.08333333333333e+00
+2427 2308 -4.16666666666667e+00
+2427 1953 -1.87500000000000e+01
+2427 2429 -8.33333333333333e+00
+2427 2060 4.16666666666667e+00
+2427 1958 4.16666666666667e+00
+2427 2059 -2.08333333333333e+00
+2427 2311 4.16666666666667e+00
+2427 2431 -2.08333333333333e+00
+2427 2058 -6.25000000000000e+00
+2427 1956 -1.87500000000000e+01
+2428 2428 6.25000000000000e+01
+2428 2429 -8.33333333333333e+00
+2428 2430 -2.08333333333333e+00
+2428 2436 2.08333333333333e+00
+2428 1958 -2.08333333333333e+00
+2428 2438 2.08333333333333e+00
+2428 1955 -2.08333333333333e+00
+2428 2431 -6.25000000000000e+00
+2428 2372 4.16666666666667e+00
+2428 2375 8.33333333333333e+00
+2428 2374 -3.75000000000000e+01
+2428 1956 4.16666666666667e+00
+2428 2427 -8.33333333333333e+00
+2428 2373 8.33333333333333e+00
+2428 1953 4.16666666666667e+00
+2428 2370 -8.33333333333333e+00
+2428 2057 2.08333333333333e+00
+2428 2309 -4.16666666666667e+00
+2428 1954 -6.25000000000000e+00
+2428 2055 2.08333333333333e+00
+2428 2307 -4.16666666666667e+00
+2428 2060 4.16666666666667e+00
+2428 2312 -8.33333333333333e+00
+2428 2432 4.16666666666667e+00
+2428 2059 -6.25000000000000e+00
+2428 1957 -6.25000000000000e+00
+2428 2058 -2.08333333333333e+00
+2428 2310 4.16666666666667e+00
+2429 2429 6.25000000000000e+01
+2429 2428 -8.33333333333333e+00
+2429 1957 -2.08333333333333e+00
+2429 2437 2.08333333333333e+00
+2429 2436 -4.16666666666667e+00
+2429 2432 -1.87500000000000e+01
+2429 1954 -2.08333333333333e+00
+2429 2430 4.16666666666667e+00
+2429 2371 4.16666666666667e+00
+2429 2375 -1.25000000000000e+01
+2429 2374 8.33333333333333e+00
+2429 2373 -4.16666666666667e+00
+2429 2370 4.16666666666667e+00
+2429 2310 4.16666666666667e+00
+2429 2307 -4.16666666666667e+00
+2429 2056 2.08333333333333e+00
+2429 2308 -4.16666666666667e+00
+2429 1955 -6.25000000000000e+00
+2429 1953 4.16666666666667e+00
+2429 2055 -4.16666666666667e+00
+2429 2431 4.16666666666667e+00
+2429 2060 -1.87500000000000e+01
+2429 1958 -6.25000000000000e+00
+2429 2059 4.16666666666667e+00
+2429 2311 -8.33333333333333e+00
+2429 2427 -8.33333333333333e+00
+2429 2058 4.16666666666667e+00
+2429 1956 4.16666666666667e+00
+2430 2430 6.25000000000000e+01
+2430 2375 4.16666666666667e+00
+2430 2374 4.16666666666667e+00
+2430 2438 4.16666666666667e+00
+2430 2437 4.16666666666667e+00
+2430 2431 -8.33333333333333e+00
+2430 2436 -1.87500000000000e+01
+2430 2429 4.16666666666667e+00
+2430 2427 -6.25000000000000e+00
+2430 2384 -4.16666666666667e+00
+2430 2432 -8.33333333333333e+00
+2430 2372 -4.16666666666667e+00
+2430 2120 4.16666666666667e+00
+2430 2125 4.16666666666667e+00
+2430 2383 8.33333333333333e+00
+2430 2119 -8.33333333333333e+00
+2430 2126 4.16666666666667e+00
+2430 1955 -4.16666666666667e+00
+2430 1954 2.08333333333333e+00
+2430 2371 -4.16666666666667e+00
+2430 2124 -1.87500000000000e+01
+2430 2138 4.16666666666667e+00
+2430 1982 -4.16666666666667e+00
+2430 2137 -2.08333333333333e+00
+2430 1981 2.08333333333333e+00
+2430 2136 -6.25000000000000e+00
+2430 2428 -2.08333333333333e+00
+2430 2382 -1.25000000000000e+01
+2431 2431 6.25000000000000e+01
+2431 2427 -2.08333333333333e+00
+2431 2375 -8.33333333333333e+00
+2431 2373 4.16666666666667e+00
+2431 2438 -2.08333333333333e+00
+2431 1982 2.08333333333333e+00
+2431 2437 -6.25000000000000e+00
+2431 2436 4.16666666666667e+00
+2431 2430 -8.33333333333333e+00
+2431 1955 2.08333333333333e+00
+2431 2428 -6.25000000000000e+00
+2431 2126 -2.08333333333333e+00
+2431 2124 4.16666666666667e+00
+2431 2372 -4.16666666666667e+00
+2431 2120 4.16666666666667e+00
+2431 2382 8.33333333333333e+00
+2431 2118 -8.33333333333333e+00
+2431 2125 -6.25000000000000e+00
+2431 1953 2.08333333333333e+00
+2431 2370 -4.16666666666667e+00
+2431 2138 4.16666666666667e+00
+2431 2432 -8.33333333333333e+00
+2431 2384 8.33333333333333e+00
+2431 2137 -6.25000000000000e+00
+2431 2429 4.16666666666667e+00
+2431 2383 -3.75000000000000e+01
+2431 2136 -2.08333333333333e+00
+2431 1980 2.08333333333333e+00
+2432 2432 6.25000000000000e+01
+2432 2373 4.16666666666667e+00
+2432 2374 -8.33333333333333e+00
+2432 2438 -6.25000000000000e+00
+2432 2437 -2.08333333333333e+00
+2432 1981 2.08333333333333e+00
+2432 2436 4.16666666666667e+00
+2432 2429 -1.87500000000000e+01
+2432 1954 2.08333333333333e+00
+2432 2427 4.16666666666667e+00
+2432 2382 -4.16666666666667e+00
+2432 2125 -2.08333333333333e+00
+2432 2430 -8.33333333333333e+00
+2432 2370 -4.16666666666667e+00
+2432 2118 4.16666666666667e+00
+2432 2371 -4.16666666666667e+00
+2432 2119 4.16666666666667e+00
+2432 2126 -6.25000000000000e+00
+2432 2124 4.16666666666667e+00
+2432 1953 -4.16666666666667e+00
+2432 2138 -1.87500000000000e+01
+2432 2428 4.16666666666667e+00
+2432 2384 -1.25000000000000e+01
+2432 2137 4.16666666666667e+00
+2432 2431 -8.33333333333333e+00
+2432 2383 8.33333333333333e+00
+2432 2136 4.16666666666667e+00
+2432 1980 -4.16666666666667e+00
+2433 2433 6.25000000000000e+01
+2433 2425 -2.08333333333333e+00
+2433 2424 -6.25000000000000e+00
+2433 2423 -4.16666666666667e+00
+2433 2422 2.08333333333333e+00
+2433 2329 4.16666666666667e+00
+2433 2326 -4.16666666666667e+00
+2433 2330 4.16666666666667e+00
+2433 2327 -4.16666666666667e+00
+2433 2390 4.16666666666667e+00
+2433 2393 -4.16666666666667e+00
+2433 2143 -2.08333333333333e+00
+2433 2434 -8.33333333333333e+00
+2433 2392 8.33333333333333e+00
+2433 2391 -1.25000000000000e+01
+2433 2435 -8.33333333333333e+00
+2433 1958 4.16666666666667e+00
+2433 2144 4.16666666666667e+00
+2433 1957 4.16666666666667e+00
+2433 2389 -8.33333333333333e+00
+2433 2426 4.16666666666667e+00
+2433 1956 -1.87500000000000e+01
+2433 2142 -6.25000000000000e+00
+2433 1507 2.08333333333333e+00
+2433 1346 4.16666666666667e+00
+2433 1508 -4.16666666666667e+00
+2433 1345 4.16666666666667e+00
+2433 1344 -1.87500000000000e+01
+2434 2434 6.25000000000000e+01
+2434 2426 4.16666666666667e+00
+2434 2425 -6.25000000000000e+00
+2434 2424 -2.08333333333333e+00
+2434 2421 2.08333333333333e+00
+2434 2328 4.16666666666667e+00
+2434 2325 -4.16666666666667e+00
+2434 2327 -4.16666666666667e+00
+2434 2330 -8.33333333333333e+00
+2434 2435 -8.33333333333333e+00
+2434 2393 8.33333333333333e+00
+2434 2144 4.16666666666667e+00
+2434 2142 -2.08333333333333e+00
+2434 2392 -3.75000000000000e+01
+2434 2433 -8.33333333333333e+00
+2434 2391 8.33333333333333e+00
+2434 1958 -2.08333333333333e+00
+2434 2390 4.16666666666667e+00
+2434 2423 2.08333333333333e+00
+2434 1957 -6.25000000000000e+00
+2434 2143 -6.25000000000000e+00
+2434 1956 4.16666666666667e+00
+2434 2388 -8.33333333333333e+00
+2434 1506 2.08333333333333e+00
+2434 1346 -2.08333333333333e+00
+2434 1508 2.08333333333333e+00
+2434 1345 -6.25000000000000e+00
+2434 1344 4.16666666666667e+00
+2435 2435 6.25000000000000e+01
+2435 2426 -1.87500000000000e+01
+2435 2425 4.16666666666667e+00
+2435 2424 4.16666666666667e+00
+2435 2421 -4.16666666666667e+00
+2435 2326 -4.16666666666667e+00
+2435 2329 -8.33333333333333e+00
+2435 2328 4.16666666666667e+00
+2435 2325 -4.16666666666667e+00
+2435 2388 4.16666666666667e+00
+2435 2391 -4.16666666666667e+00
+2435 2434 -8.33333333333333e+00
+2435 2392 8.33333333333333e+00
+2435 2143 4.16666666666667e+00
+2435 2393 -1.25000000000000e+01
+2435 2422 2.08333333333333e+00
+2435 1958 -6.25000000000000e+00
+2435 2144 -1.87500000000000e+01
+2435 1957 -2.08333333333333e+00
+2435 2389 4.16666666666667e+00
+2435 2433 -8.33333333333333e+00
+2435 1956 4.16666666666667e+00
+2435 2142 4.16666666666667e+00
+2435 1346 -6.25000000000000e+00
+2435 1345 -2.08333333333333e+00
+2435 1507 2.08333333333333e+00
+2435 1344 4.16666666666667e+00
+2435 1506 -4.16666666666667e+00
+2436 2436 6.25000000000000e+01
+2436 2374 -4.16666666666667e+00
+2436 2384 4.16666666666667e+00
+2436 2375 -4.16666666666667e+00
+2436 2429 -4.16666666666667e+00
+2436 2432 4.16666666666667e+00
+2436 2431 4.16666666666667e+00
+2436 2383 -8.33333333333333e+00
+2436 2430 -1.87500000000000e+01
+2436 2390 4.16666666666667e+00
+2436 2402 -4.16666666666667e+00
+2436 2143 4.16666666666667e+00
+2436 2437 -8.33333333333333e+00
+2436 2401 8.33333333333333e+00
+2436 1982 4.16666666666667e+00
+2436 2150 -4.16666666666667e+00
+2436 1981 -2.08333333333333e+00
+2436 2149 2.08333333333333e+00
+2436 1980 -6.25000000000000e+00
+2436 2400 -1.25000000000000e+01
+2436 2438 -8.33333333333333e+00
+2436 1958 4.16666666666667e+00
+2436 2144 4.16666666666667e+00
+2436 1957 -2.08333333333333e+00
+2436 2389 4.16666666666667e+00
+2436 2428 2.08333333333333e+00
+2436 1956 -6.25000000000000e+00
+2436 2142 -1.87500000000000e+01
+2437 2437 6.25000000000000e+01
+2437 2373 -4.16666666666667e+00
+2437 2429 2.08333333333333e+00
+2437 2375 -4.16666666666667e+00
+2437 2432 -2.08333333333333e+00
+2437 2384 4.16666666666667e+00
+2437 2431 -6.25000000000000e+00
+2437 2430 4.16666666666667e+00
+2437 2382 -8.33333333333333e+00
+2437 2144 -2.08333333333333e+00
+2437 2150 2.08333333333333e+00
+2437 2142 4.16666666666667e+00
+2437 2436 -8.33333333333333e+00
+2437 2400 8.33333333333333e+00
+2437 1982 4.16666666666667e+00
+2437 2438 -8.33333333333333e+00
+2437 2402 8.33333333333333e+00
+2437 1981 -6.25000000000000e+00
+2437 2401 -3.75000000000000e+01
+2437 1980 -2.08333333333333e+00
+2437 2148 2.08333333333333e+00
+2437 1958 4.16666666666667e+00
+2437 2390 -8.33333333333333e+00
+2437 2427 2.08333333333333e+00
+2437 1957 -6.25000000000000e+00
+2437 2143 -6.25000000000000e+00
+2437 1956 -2.08333333333333e+00
+2437 2388 4.16666666666667e+00
+2438 2438 6.25000000000000e+01
+2438 2373 -4.16666666666667e+00
+2438 2428 2.08333333333333e+00
+2438 2374 -4.16666666666667e+00
+2438 2427 -4.16666666666667e+00
+2438 2432 -6.25000000000000e+00
+2438 2431 -2.08333333333333e+00
+2438 2383 4.16666666666667e+00
+2438 2430 4.16666666666667e+00
+2438 2143 -2.08333333333333e+00
+2438 2149 2.08333333333333e+00
+2438 2388 4.16666666666667e+00
+2438 2400 -4.16666666666667e+00
+2438 1982 -1.87500000000000e+01
+2438 2402 -1.25000000000000e+01
+2438 1981 4.16666666666667e+00
+2438 2437 -8.33333333333333e+00
+2438 2401 8.33333333333333e+00
+2438 1980 4.16666666666667e+00
+2438 2148 -4.16666666666667e+00
+2438 2382 4.16666666666667e+00
+2438 1958 -1.87500000000000e+01
+2438 2144 -6.25000000000000e+00
+2438 1957 4.16666666666667e+00
+2438 2389 -8.33333333333333e+00
+2438 2436 -8.33333333333333e+00
+2438 1956 4.16666666666667e+00
+2438 2142 4.16666666666667e+00
+2439 2439 6.25000000000000e+01
+2439 2236 -4.16666666666667e+00
+2439 2444 4.16666666666667e+00
+2439 2441 -8.33333333333333e+00
+2439 2237 8.33333333333333e+00
+2439 2234 4.16666666666667e+00
+2439 1961 -2.08333333333333e+00
+2439 2443 4.16666666666667e+00
+2439 2442 -1.87500000000000e+01
+2439 2453 2.08333333333333e+00
+2439 1967 -2.08333333333333e+00
+2439 2452 -4.16666666666667e+00
+2439 2235 -1.25000000000000e+01
+2439 2216 -4.16666666666667e+00
+2439 2072 2.08333333333333e+00
+2439 2215 -4.16666666666667e+00
+2439 2221 4.16666666666667e+00
+2439 2071 -4.16666666666667e+00
+2439 1960 4.16666666666667e+00
+2439 1959 -6.25000000000000e+00
+2439 2078 4.16666666666667e+00
+2439 2222 -8.33333333333333e+00
+2439 2077 4.16666666666667e+00
+2439 2440 -8.33333333333333e+00
+2439 1966 4.16666666666667e+00
+2439 2076 -1.87500000000000e+01
+2439 2233 4.16666666666667e+00
+2439 1965 -6.25000000000000e+00
+2440 2440 6.25000000000000e+01
+2440 2235 -4.16666666666667e+00
+2440 2444 -2.08333333333333e+00
+2440 2453 2.08333333333333e+00
+2440 2234 -8.33333333333333e+00
+2440 1961 4.16666666666667e+00
+2440 2443 -6.25000000000000e+00
+2440 2442 4.16666666666667e+00
+2440 2237 8.33333333333333e+00
+2440 2441 -8.33333333333333e+00
+2440 1967 4.16666666666667e+00
+2440 2236 -1.25000000000000e+01
+2440 2451 -4.16666666666667e+00
+2440 2214 -4.16666666666667e+00
+2440 2220 4.16666666666667e+00
+2440 2072 2.08333333333333e+00
+2440 2216 -4.16666666666667e+00
+2440 1960 -1.87500000000000e+01
+2440 2070 -4.16666666666667e+00
+2440 1959 4.16666666666667e+00
+2440 2078 -2.08333333333333e+00
+2440 2222 4.16666666666667e+00
+2440 2077 -6.25000000000000e+00
+2440 2232 4.16666666666667e+00
+2440 1966 -1.87500000000000e+01
+2440 2076 4.16666666666667e+00
+2440 2439 -8.33333333333333e+00
+2440 1965 4.16666666666667e+00
+2441 2441 6.25000000000000e+01
+2441 2452 2.08333333333333e+00
+2441 2442 4.16666666666667e+00
+2441 2439 -8.33333333333333e+00
+2441 2235 8.33333333333333e+00
+2441 2444 -6.25000000000000e+00
+2441 2233 -8.33333333333333e+00
+2441 1960 4.16666666666667e+00
+2441 2232 4.16666666666667e+00
+2441 1959 -2.08333333333333e+00
+2441 2237 -3.75000000000000e+01
+2441 2236 8.33333333333333e+00
+2441 2440 -8.33333333333333e+00
+2441 1966 4.16666666666667e+00
+2441 2451 2.08333333333333e+00
+2441 1965 -2.08333333333333e+00
+2441 2214 -4.16666666666667e+00
+2441 2070 2.08333333333333e+00
+2441 1961 -6.25000000000000e+00
+2441 2071 2.08333333333333e+00
+2441 2215 -4.16666666666667e+00
+2441 2078 -6.25000000000000e+00
+2441 2443 -2.08333333333333e+00
+2441 1967 -6.25000000000000e+00
+2441 2077 -2.08333333333333e+00
+2441 2221 4.16666666666667e+00
+2441 2076 4.16666666666667e+00
+2441 2220 -8.33333333333333e+00
+2442 2442 6.25000000000000e+01
+2442 2441 4.16666666666667e+00
+2442 2237 -8.33333333333333e+00
+2442 1961 2.08333333333333e+00
+2442 2440 4.16666666666667e+00
+2442 2439 -1.87500000000000e+01
+2442 1973 2.08333333333333e+00
+2442 2453 -2.08333333333333e+00
+2442 2452 4.16666666666667e+00
+2442 2451 -6.25000000000000e+00
+2442 2234 -4.16666666666667e+00
+2442 2233 -4.16666666666667e+00
+2442 2081 4.16666666666667e+00
+2442 2087 -2.08333333333333e+00
+2442 2443 -8.33333333333333e+00
+2442 2080 4.16666666666667e+00
+2442 2239 -4.16666666666667e+00
+2442 1960 -4.16666666666667e+00
+2442 2086 4.16666666666667e+00
+2442 2085 -6.25000000000000e+00
+2442 2444 -8.33333333333333e+00
+2442 2093 4.16666666666667e+00
+2442 2240 8.33333333333333e+00
+2442 2092 4.16666666666667e+00
+2442 1972 -4.16666666666667e+00
+2442 2236 4.16666666666667e+00
+2442 2091 -1.87500000000000e+01
+2442 2238 -1.25000000000000e+01
+2443 2443 6.25000000000000e+01
+2443 2441 -2.08333333333333e+00
+2443 2237 4.16666666666667e+00
+2443 2440 -6.25000000000000e+00
+2443 2439 4.16666666666667e+00
+2443 2444 -8.33333333333333e+00
+2443 2453 4.16666666666667e+00
+2443 2452 -1.87500000000000e+01
+2443 2451 4.16666666666667e+00
+2443 2232 -4.16666666666667e+00
+2443 2087 4.16666666666667e+00
+2443 2442 -8.33333333333333e+00
+2443 2081 -8.33333333333333e+00
+2443 2240 8.33333333333333e+00
+2443 2079 4.16666666666667e+00
+2443 2238 -4.16666666666667e+00
+2443 1961 2.08333333333333e+00
+2443 2234 -4.16666666666667e+00
+2443 2086 -1.87500000000000e+01
+2443 1959 -4.16666666666667e+00
+2443 2085 4.16666666666667e+00
+2443 2093 -2.08333333333333e+00
+2443 1973 2.08333333333333e+00
+2443 2235 4.16666666666667e+00
+2443 2092 -6.25000000000000e+00
+2443 2239 -1.25000000000000e+01
+2443 2091 4.16666666666667e+00
+2443 1971 -4.16666666666667e+00
+2444 2444 6.25000000000000e+01
+2444 2236 4.16666666666667e+00
+2444 2439 4.16666666666667e+00
+2444 2235 -8.33333333333333e+00
+2444 2441 -6.25000000000000e+00
+2444 1959 2.08333333333333e+00
+2444 2453 -6.25000000000000e+00
+2444 2443 -8.33333333333333e+00
+2444 2452 4.16666666666667e+00
+2444 1971 2.08333333333333e+00
+2444 2451 -2.08333333333333e+00
+2444 2232 -4.16666666666667e+00
+2444 2086 4.16666666666667e+00
+2444 2079 4.16666666666667e+00
+2444 2085 -2.08333333333333e+00
+2444 2080 -8.33333333333333e+00
+2444 2239 8.33333333333333e+00
+2444 2087 -6.25000000000000e+00
+2444 1960 2.08333333333333e+00
+2444 2233 -4.16666666666667e+00
+2444 2440 -2.08333333333333e+00
+2444 2093 -6.25000000000000e+00
+2444 2240 -3.75000000000000e+01
+2444 2092 -2.08333333333333e+00
+2444 1972 2.08333333333333e+00
+2444 2442 -8.33333333333333e+00
+2444 2091 4.16666666666667e+00
+2444 2238 8.33333333333333e+00
+2445 2445 6.25000000000000e+01
+2445 2254 -4.16666666666667e+00
+2445 2450 -2.08333333333333e+00
+2445 2456 2.08333333333333e+00
+2445 1964 0.00000000000000e+00
+2445 2252 0.00000000000000e+00
+2445 2449 4.16666666666667e+00
+2445 2448 -6.25000000000000e+00
+2445 2447 -8.33333333333333e+00
+2445 2255 8.33333333333333e+00
+2445 1967 4.16666666666667e+00
+2445 2455 -4.16666666666667e+00
+2445 2253 -1.25000000000000e+01
+2445 2218 0.00000000000000e+00
+2445 2221 4.16666666666667e+00
+2445 2075 0.00000000000000e+00
+2445 2219 0.00000000000000e+00
+2445 1963 0.00000000000000e+00
+2445 2074 0.00000000000000e+00
+2445 1962 0.00000000000000e+00
+2445 2078 -2.08333333333333e+00
+2445 2222 4.16666666666667e+00
+2445 2446 -8.33333333333333e+00
+2445 2077 4.16666666666667e+00
+2445 1966 4.16666666666667e+00
+2445 2251 0.00000000000000e+00
+2445 2076 -6.25000000000000e+00
+2445 1965 -1.87500000000000e+01
+2446 2446 6.25000000000000e+01
+2446 2253 -4.16666666666667e+00
+2446 2447 -8.33333333333333e+00
+2446 2450 4.16666666666667e+00
+2446 2255 8.33333333333333e+00
+2446 1964 0.00000000000000e+00
+2446 2252 0.00000000000000e+00
+2446 2449 -1.87500000000000e+01
+2446 2448 4.16666666666667e+00
+2446 2456 2.08333333333333e+00
+2446 1967 -2.08333333333333e+00
+2446 2254 -1.25000000000000e+01
+2446 2454 -4.16666666666667e+00
+2446 2075 0.00000000000000e+00
+2446 2219 0.00000000000000e+00
+2446 2217 0.00000000000000e+00
+2446 2220 4.16666666666667e+00
+2446 1963 0.00000000000000e+00
+2446 1962 0.00000000000000e+00
+2446 2073 0.00000000000000e+00
+2446 2078 4.16666666666667e+00
+2446 2222 -8.33333333333333e+00
+2446 2250 0.00000000000000e+00
+2446 2077 -1.87500000000000e+01
+2446 1966 -6.25000000000000e+00
+2446 2445 -8.33333333333333e+00
+2446 2076 4.16666666666667e+00
+2446 1965 4.16666666666667e+00
+2447 2447 6.25000000000000e+01
+2447 2449 4.16666666666667e+00
+2447 2254 8.33333333333333e+00
+2447 2448 -2.08333333333333e+00
+2447 2454 2.08333333333333e+00
+2447 2450 -6.25000000000000e+00
+2447 1963 0.00000000000000e+00
+2447 2251 0.00000000000000e+00
+2447 1962 0.00000000000000e+00
+2447 2250 0.00000000000000e+00
+2447 2255 -3.75000000000000e+01
+2447 2455 2.08333333333333e+00
+2447 1966 -2.08333333333333e+00
+2447 2445 -8.33333333333333e+00
+2447 2253 8.33333333333333e+00
+2447 1965 4.16666666666667e+00
+2447 2074 0.00000000000000e+00
+2447 2218 0.00000000000000e+00
+2447 1964 0.00000000000000e+00
+2447 2073 0.00000000000000e+00
+2447 2217 0.00000000000000e+00
+2447 2446 -8.33333333333333e+00
+2447 2078 -6.25000000000000e+00
+2447 1967 -6.25000000000000e+00
+2447 2077 4.16666666666667e+00
+2447 2221 -8.33333333333333e+00
+2447 2076 -2.08333333333333e+00
+2447 2220 4.16666666666667e+00
+2448 2448 6.25000000000000e+01
+2448 2447 -2.08333333333333e+00
+2448 2255 4.16666666666667e+00
+2448 2446 4.16666666666667e+00
+2448 2445 -6.25000000000000e+00
+2448 2450 -8.33333333333333e+00
+2448 2456 4.16666666666667e+00
+2448 2455 4.16666666666667e+00
+2448 2454 -1.87500000000000e+01
+2448 2251 0.00000000000000e+00
+2448 2111 0.00000000000000e+00
+2448 2449 -8.33333333333333e+00
+2448 2105 0.00000000000000e+00
+2448 2258 8.33333333333333e+00
+2448 2104 0.00000000000000e+00
+2448 2257 -4.16666666666667e+00
+2448 1964 0.00000000000000e+00
+2448 2252 0.00000000000000e+00
+2448 2110 0.00000000000000e+00
+2448 1963 0.00000000000000e+00
+2448 2109 0.00000000000000e+00
+2448 2114 -2.08333333333333e+00
+2448 1979 2.08333333333333e+00
+2448 2113 4.16666666666667e+00
+2448 1978 -4.16666666666667e+00
+2448 2112 -6.25000000000000e+00
+2448 2254 4.16666666666667e+00
+2448 2256 -1.25000000000000e+01
+2449 2449 6.25000000000000e+01
+2449 2447 4.16666666666667e+00
+2449 2255 -8.33333333333333e+00
+2449 1964 0.00000000000000e+00
+2449 2446 -1.87500000000000e+01
+2449 2445 4.16666666666667e+00
+2449 1979 2.08333333333333e+00
+2449 2456 -2.08333333333333e+00
+2449 2455 -6.25000000000000e+00
+2449 2454 4.16666666666667e+00
+2449 2252 0.00000000000000e+00
+2449 2250 0.00000000000000e+00
+2449 2111 0.00000000000000e+00
+2449 2105 0.00000000000000e+00
+2449 2448 -8.33333333333333e+00
+2449 2103 0.00000000000000e+00
+2449 2256 -4.16666666666667e+00
+2449 2110 0.00000000000000e+00
+2449 2109 0.00000000000000e+00
+2449 1962 0.00000000000000e+00
+2449 2114 4.16666666666667e+00
+2449 2450 -8.33333333333333e+00
+2449 2258 8.33333333333333e+00
+2449 2113 -1.87500000000000e+01
+2449 2253 4.16666666666667e+00
+2449 2257 -1.25000000000000e+01
+2449 2112 4.16666666666667e+00
+2449 1977 -4.16666666666667e+00
+2450 2450 6.25000000000000e+01
+2450 2254 -8.33333333333333e+00
+2450 2445 -2.08333333333333e+00
+2450 2253 4.16666666666667e+00
+2450 2447 -6.25000000000000e+00
+2450 1963 0.00000000000000e+00
+2450 2456 -6.25000000000000e+00
+2450 1978 2.08333333333333e+00
+2450 2455 -2.08333333333333e+00
+2450 2448 -8.33333333333333e+00
+2450 2454 4.16666666666667e+00
+2450 2251 0.00000000000000e+00
+2450 2110 0.00000000000000e+00
+2450 2104 0.00000000000000e+00
+2450 2109 0.00000000000000e+00
+2450 2103 0.00000000000000e+00
+2450 2256 8.33333333333333e+00
+2450 2111 0.00000000000000e+00
+2450 1962 0.00000000000000e+00
+2450 2250 0.00000000000000e+00
+2450 2114 -6.25000000000000e+00
+2450 2446 4.16666666666667e+00
+2450 2258 -3.75000000000000e+01
+2450 2113 4.16666666666667e+00
+2450 2449 -8.33333333333333e+00
+2450 2257 8.33333333333333e+00
+2450 2112 -2.08333333333333e+00
+2450 1977 2.08333333333333e+00
+2451 2451 6.25000000000000e+01
+2451 2443 4.16666666666667e+00
+2451 2442 -6.25000000000000e+00
+2451 2441 2.08333333333333e+00
+2451 2440 -4.16666666666667e+00
+2451 2240 4.16666666666667e+00
+2451 2237 -4.16666666666667e+00
+2451 2239 4.16666666666667e+00
+2451 2236 -4.16666666666667e+00
+2451 2272 -4.16666666666667e+00
+2451 2269 4.16666666666667e+00
+2451 2132 2.08333333333333e+00
+2451 2129 -2.08333333333333e+00
+2451 1967 4.16666666666667e+00
+2451 2270 -8.33333333333333e+00
+2451 1966 4.16666666666667e+00
+2451 2452 -8.33333333333333e+00
+2451 2128 4.16666666666667e+00
+2451 1965 -1.87500000000000e+01
+2451 2127 -6.25000000000000e+00
+2451 2453 -8.33333333333333e+00
+2451 1973 4.16666666666667e+00
+2451 2273 8.33333333333333e+00
+2451 1972 4.16666666666667e+00
+2451 2131 -4.16666666666667e+00
+2451 2444 -2.08333333333333e+00
+2451 1971 -1.87500000000000e+01
+2451 2271 -1.25000000000000e+01
+2452 2452 6.25000000000000e+01
+2452 2444 4.16666666666667e+00
+2452 2443 -1.87500000000000e+01
+2452 2442 4.16666666666667e+00
+2452 2439 -4.16666666666667e+00
+2452 2237 -4.16666666666667e+00
+2452 2240 -8.33333333333333e+00
+2452 2238 4.16666666666667e+00
+2452 2235 -4.16666666666667e+00
+2452 2271 -4.16666666666667e+00
+2452 2268 4.16666666666667e+00
+2452 2273 8.33333333333333e+00
+2452 2453 -8.33333333333333e+00
+2452 2129 4.16666666666667e+00
+2452 1967 -2.08333333333333e+00
+2452 2270 4.16666666666667e+00
+2452 1966 -6.25000000000000e+00
+2452 2128 -1.87500000000000e+01
+2452 1965 4.16666666666667e+00
+2452 2451 -8.33333333333333e+00
+2452 2127 4.16666666666667e+00
+2452 1973 -2.08333333333333e+00
+2452 2132 2.08333333333333e+00
+2452 2441 2.08333333333333e+00
+2452 1972 -6.25000000000000e+00
+2452 2272 -1.25000000000000e+01
+2452 1971 4.16666666666667e+00
+2452 2130 -4.16666666666667e+00
+2453 2453 6.25000000000000e+01
+2453 2444 -6.25000000000000e+00
+2453 2443 4.16666666666667e+00
+2453 2442 -2.08333333333333e+00
+2453 2439 2.08333333333333e+00
+2453 2238 4.16666666666667e+00
+2453 2235 -4.16666666666667e+00
+2453 2236 -4.16666666666667e+00
+2453 2239 -8.33333333333333e+00
+2453 2272 8.33333333333333e+00
+2453 2452 -8.33333333333333e+00
+2453 2128 4.16666666666667e+00
+2453 2130 2.08333333333333e+00
+2453 2127 -2.08333333333333e+00
+2453 1967 -6.25000000000000e+00
+2453 2129 -6.25000000000000e+00
+2453 1966 -2.08333333333333e+00
+2453 2269 4.16666666666667e+00
+2453 1965 4.16666666666667e+00
+2453 2268 -8.33333333333333e+00
+2453 2440 2.08333333333333e+00
+2453 1973 -6.25000000000000e+00
+2453 2273 -3.75000000000000e+01
+2453 1972 -2.08333333333333e+00
+2453 2131 2.08333333333333e+00
+2453 2451 -8.33333333333333e+00
+2453 1971 4.16666666666667e+00
+2453 2271 8.33333333333333e+00
+2454 2454 6.25000000000000e+01
+2454 2450 4.16666666666667e+00
+2454 2449 4.16666666666667e+00
+2454 2448 -1.87500000000000e+01
+2454 2446 -4.16666666666667e+00
+2454 2255 -4.16666666666667e+00
+2454 2258 -8.33333333333333e+00
+2454 2257 4.16666666666667e+00
+2454 2254 -4.16666666666667e+00
+2454 2269 4.16666666666667e+00
+2454 2275 -4.16666666666667e+00
+2454 2456 -8.33333333333333e+00
+2454 2276 8.33333333333333e+00
+2454 2129 4.16666666666667e+00
+2454 1979 -2.08333333333333e+00
+2454 2135 2.08333333333333e+00
+2454 1978 4.16666666666667e+00
+2454 2134 -4.16666666666667e+00
+2454 1977 -6.25000000000000e+00
+2454 2274 -1.25000000000000e+01
+2454 1967 -2.08333333333333e+00
+2454 2270 4.16666666666667e+00
+2454 2455 -8.33333333333333e+00
+2454 1966 4.16666666666667e+00
+2454 2128 4.16666666666667e+00
+2454 2447 2.08333333333333e+00
+2454 1965 -6.25000000000000e+00
+2454 2127 -1.87500000000000e+01
+2455 2455 6.25000000000000e+01
+2455 2449 -6.25000000000000e+00
+2455 2448 4.16666666666667e+00
+2455 2447 2.08333333333333e+00
+2455 2445 -4.16666666666667e+00
+2455 2258 4.16666666666667e+00
+2455 2255 -4.16666666666667e+00
+2455 2256 4.16666666666667e+00
+2455 2253 -4.16666666666667e+00
+2455 2268 4.16666666666667e+00
+2455 2274 -4.16666666666667e+00
+2455 2135 2.08333333333333e+00
+2455 2129 -2.08333333333333e+00
+2455 1979 4.16666666666667e+00
+2455 2456 -8.33333333333333e+00
+2455 2276 8.33333333333333e+00
+2455 1978 -1.87500000000000e+01
+2455 2275 -1.25000000000000e+01
+2455 1977 4.16666666666667e+00
+2455 2133 -4.16666666666667e+00
+2455 1967 4.16666666666667e+00
+2455 2270 -8.33333333333333e+00
+2455 2450 -2.08333333333333e+00
+2455 1966 -1.87500000000000e+01
+2455 2128 -6.25000000000000e+00
+2455 2454 -8.33333333333333e+00
+2455 1965 4.16666666666667e+00
+2455 2127 4.16666666666667e+00
+2456 2456 6.25000000000000e+01
+2456 2450 -6.25000000000000e+00
+2456 2449 -2.08333333333333e+00
+2456 2448 4.16666666666667e+00
+2456 2446 2.08333333333333e+00
+2456 2257 4.16666666666667e+00
+2456 2254 -4.16666666666667e+00
+2456 2253 -4.16666666666667e+00
+2456 2256 -8.33333333333333e+00
+2456 2134 2.08333333333333e+00
+2456 2128 -2.08333333333333e+00
+2456 2454 -8.33333333333333e+00
+2456 2274 8.33333333333333e+00
+2456 2127 4.16666666666667e+00
+2456 1979 -6.25000000000000e+00
+2456 2276 -3.75000000000000e+01
+2456 1978 4.16666666666667e+00
+2456 2455 -8.33333333333333e+00
+2456 2275 8.33333333333333e+00
+2456 1977 -2.08333333333333e+00
+2456 2133 2.08333333333333e+00
+2456 2445 2.08333333333333e+00
+2456 1967 -6.25000000000000e+00
+2456 2129 -6.25000000000000e+00
+2456 1966 4.16666666666667e+00
+2456 2269 -8.33333333333333e+00
+2456 1965 -2.08333333333333e+00
+2456 2268 4.16666666666667e+00
+2457 2457 6.25000000000000e+01
+2457 2362 -4.16666666666667e+00
+2457 2462 4.16666666666667e+00
+2457 2459 -8.33333333333333e+00
+2457 2363 8.33333333333333e+00
+2457 2360 4.16666666666667e+00
+2457 1970 -2.08333333333333e+00
+2457 2461 4.16666666666667e+00
+2457 2460 -1.87500000000000e+01
+2457 2471 2.08333333333333e+00
+2457 1976 -2.08333333333333e+00
+2457 2470 -4.16666666666667e+00
+2457 2361 -1.25000000000000e+01
+2457 2342 -4.16666666666667e+00
+2457 2090 2.08333333333333e+00
+2457 2341 -4.16666666666667e+00
+2457 2347 4.16666666666667e+00
+2457 2089 -4.16666666666667e+00
+2457 1969 4.16666666666667e+00
+2457 1968 -6.25000000000000e+00
+2457 2096 4.16666666666667e+00
+2457 2348 -8.33333333333333e+00
+2457 2095 4.16666666666667e+00
+2457 2458 -8.33333333333333e+00
+2457 1975 4.16666666666667e+00
+2457 2094 -1.87500000000000e+01
+2457 2359 4.16666666666667e+00
+2457 1974 -6.25000000000000e+00
+2458 2458 6.25000000000000e+01
+2458 2361 -4.16666666666667e+00
+2458 2462 -2.08333333333333e+00
+2458 2471 2.08333333333333e+00
+2458 2360 -8.33333333333333e+00
+2458 1970 4.16666666666667e+00
+2458 2461 -6.25000000000000e+00
+2458 2460 4.16666666666667e+00
+2458 2363 8.33333333333333e+00
+2458 2459 -8.33333333333333e+00
+2458 1976 4.16666666666667e+00
+2458 2362 -1.25000000000000e+01
+2458 2469 -4.16666666666667e+00
+2458 2340 -4.16666666666667e+00
+2458 2346 4.16666666666667e+00
+2458 2090 2.08333333333333e+00
+2458 2342 -4.16666666666667e+00
+2458 1969 -1.87500000000000e+01
+2458 2088 -4.16666666666667e+00
+2458 1968 4.16666666666667e+00
+2458 2096 -2.08333333333333e+00
+2458 2348 4.16666666666667e+00
+2458 2095 -6.25000000000000e+00
+2458 2358 4.16666666666667e+00
+2458 1975 -1.87500000000000e+01
+2458 2094 4.16666666666667e+00
+2458 2457 -8.33333333333333e+00
+2458 1974 4.16666666666667e+00
+2459 2459 6.25000000000000e+01
+2459 2470 2.08333333333333e+00
+2459 2460 4.16666666666667e+00
+2459 2457 -8.33333333333333e+00
+2459 2361 8.33333333333333e+00
+2459 2462 -6.25000000000000e+00
+2459 2359 -8.33333333333333e+00
+2459 1969 4.16666666666667e+00
+2459 2358 4.16666666666667e+00
+2459 1968 -2.08333333333333e+00
+2459 2363 -3.75000000000000e+01
+2459 2362 8.33333333333333e+00
+2459 2458 -8.33333333333333e+00
+2459 1975 4.16666666666667e+00
+2459 2469 2.08333333333333e+00
+2459 1974 -2.08333333333333e+00
+2459 2340 -4.16666666666667e+00
+2459 2088 2.08333333333333e+00
+2459 1970 -6.25000000000000e+00
+2459 2089 2.08333333333333e+00
+2459 2341 -4.16666666666667e+00
+2459 2096 -6.25000000000000e+00
+2459 2461 -2.08333333333333e+00
+2459 1976 -6.25000000000000e+00
+2459 2095 -2.08333333333333e+00
+2459 2347 4.16666666666667e+00
+2459 2094 4.16666666666667e+00
+2459 2346 -8.33333333333333e+00
+2460 2460 6.25000000000000e+01
+2460 2459 4.16666666666667e+00
+2460 2363 -8.33333333333333e+00
+2460 1970 2.08333333333333e+00
+2460 2458 4.16666666666667e+00
+2460 2457 -1.87500000000000e+01
+2460 2471 -2.08333333333333e+00
+2460 2470 4.16666666666667e+00
+2460 2469 -6.25000000000000e+00
+2460 2360 -4.16666666666667e+00
+2460 2359 -4.16666666666667e+00
+2460 2099 4.16666666666667e+00
+2460 2102 -2.08333333333333e+00
+2460 2461 -8.33333333333333e+00
+2460 2098 4.16666666666667e+00
+2460 2365 -4.16666666666667e+00
+2460 1969 -4.16666666666667e+00
+2460 2101 4.16666666666667e+00
+2460 2100 -6.25000000000000e+00
+2460 2462 -8.33333333333333e+00
+2460 2366 8.33333333333333e+00
+2460 2362 4.16666666666667e+00
+2460 2364 -1.25000000000000e+01
+2460 1364 2.08333333333333e+00
+2460 1475 4.16666666666667e+00
+2460 1474 4.16666666666667e+00
+2460 1363 -4.16666666666667e+00
+2460 1473 -1.87500000000000e+01
+2461 2461 6.25000000000000e+01
+2461 2459 -2.08333333333333e+00
+2461 2363 4.16666666666667e+00
+2461 2458 -6.25000000000000e+00
+2461 2457 4.16666666666667e+00
+2461 2462 -8.33333333333333e+00
+2461 2471 4.16666666666667e+00
+2461 2470 -1.87500000000000e+01
+2461 2469 4.16666666666667e+00
+2461 2358 -4.16666666666667e+00
+2461 2102 4.16666666666667e+00
+2461 2460 -8.33333333333333e+00
+2461 2099 -8.33333333333333e+00
+2461 2366 8.33333333333333e+00
+2461 2097 4.16666666666667e+00
+2461 2364 -4.16666666666667e+00
+2461 1970 2.08333333333333e+00
+2461 2360 -4.16666666666667e+00
+2461 2101 -1.87500000000000e+01
+2461 1968 -4.16666666666667e+00
+2461 2100 4.16666666666667e+00
+2461 2361 4.16666666666667e+00
+2461 2365 -1.25000000000000e+01
+2461 1475 -2.08333333333333e+00
+2461 1364 2.08333333333333e+00
+2461 1474 -6.25000000000000e+00
+2461 1473 4.16666666666667e+00
+2461 1362 -4.16666666666667e+00
+2462 2462 6.25000000000000e+01
+2462 2362 4.16666666666667e+00
+2462 2457 4.16666666666667e+00
+2462 2361 -8.33333333333333e+00
+2462 2459 -6.25000000000000e+00
+2462 1968 2.08333333333333e+00
+2462 2471 -6.25000000000000e+00
+2462 2461 -8.33333333333333e+00
+2462 2470 4.16666666666667e+00
+2462 2469 -2.08333333333333e+00
+2462 2358 -4.16666666666667e+00
+2462 2101 4.16666666666667e+00
+2462 2097 4.16666666666667e+00
+2462 2100 -2.08333333333333e+00
+2462 2098 -8.33333333333333e+00
+2462 2365 8.33333333333333e+00
+2462 2102 -6.25000000000000e+00
+2462 1969 2.08333333333333e+00
+2462 2359 -4.16666666666667e+00
+2462 2458 -2.08333333333333e+00
+2462 2366 -3.75000000000000e+01
+2462 2460 -8.33333333333333e+00
+2462 2364 8.33333333333333e+00
+2462 1362 2.08333333333333e+00
+2462 1475 -6.25000000000000e+00
+2462 1474 -2.08333333333333e+00
+2462 1363 2.08333333333333e+00
+2462 1473 4.16666666666667e+00
+2463 2463 6.25000000000000e+01
+2463 2380 -4.16666666666667e+00
+2463 2468 -2.08333333333333e+00
+2463 2474 2.08333333333333e+00
+2463 1973 4.16666666666667e+00
+2463 2378 -8.33333333333333e+00
+2463 2467 4.16666666666667e+00
+2463 2466 -6.25000000000000e+00
+2463 2465 -8.33333333333333e+00
+2463 2381 8.33333333333333e+00
+2463 1976 4.16666666666667e+00
+2463 2473 -4.16666666666667e+00
+2463 2379 -1.25000000000000e+01
+2463 2344 -4.16666666666667e+00
+2463 2347 4.16666666666667e+00
+2463 2093 2.08333333333333e+00
+2463 2345 -4.16666666666667e+00
+2463 1972 4.16666666666667e+00
+2463 2092 -4.16666666666667e+00
+2463 1971 -1.87500000000000e+01
+2463 2096 -2.08333333333333e+00
+2463 2348 4.16666666666667e+00
+2463 2464 -8.33333333333333e+00
+2463 2095 4.16666666666667e+00
+2463 1975 4.16666666666667e+00
+2463 2377 4.16666666666667e+00
+2463 2094 -6.25000000000000e+00
+2463 1974 -1.87500000000000e+01
+2464 2464 6.25000000000000e+01
+2464 2379 -4.16666666666667e+00
+2464 2465 -8.33333333333333e+00
+2464 2468 4.16666666666667e+00
+2464 2381 8.33333333333333e+00
+2464 1973 -2.08333333333333e+00
+2464 2378 4.16666666666667e+00
+2464 2467 -1.87500000000000e+01
+2464 2466 4.16666666666667e+00
+2464 2474 2.08333333333333e+00
+2464 1976 -2.08333333333333e+00
+2464 2380 -1.25000000000000e+01
+2464 2472 -4.16666666666667e+00
+2464 2093 2.08333333333333e+00
+2464 2345 -4.16666666666667e+00
+2464 2343 -4.16666666666667e+00
+2464 2346 4.16666666666667e+00
+2464 1972 -6.25000000000000e+00
+2464 1971 4.16666666666667e+00
+2464 2091 -4.16666666666667e+00
+2464 2096 4.16666666666667e+00
+2464 2348 -8.33333333333333e+00
+2464 2376 4.16666666666667e+00
+2464 2095 -1.87500000000000e+01
+2464 1975 -6.25000000000000e+00
+2464 2463 -8.33333333333333e+00
+2464 2094 4.16666666666667e+00
+2464 1974 4.16666666666667e+00
+2465 2465 6.25000000000000e+01
+2465 2467 4.16666666666667e+00
+2465 2380 8.33333333333333e+00
+2465 2466 -2.08333333333333e+00
+2465 2472 2.08333333333333e+00
+2465 2468 -6.25000000000000e+00
+2465 1972 -2.08333333333333e+00
+2465 2377 4.16666666666667e+00
+2465 1971 4.16666666666667e+00
+2465 2376 -8.33333333333333e+00
+2465 2381 -3.75000000000000e+01
+2465 2473 2.08333333333333e+00
+2465 1975 -2.08333333333333e+00
+2465 2463 -8.33333333333333e+00
+2465 2379 8.33333333333333e+00
+2465 1974 4.16666666666667e+00
+2465 2092 2.08333333333333e+00
+2465 2344 -4.16666666666667e+00
+2465 1973 -6.25000000000000e+00
+2465 2091 2.08333333333333e+00
+2465 2343 -4.16666666666667e+00
+2465 2464 -8.33333333333333e+00
+2465 2096 -6.25000000000000e+00
+2465 1976 -6.25000000000000e+00
+2465 2095 4.16666666666667e+00
+2465 2347 -8.33333333333333e+00
+2465 2094 -2.08333333333333e+00
+2465 2346 4.16666666666667e+00
+2466 2466 6.25000000000000e+01
+2466 2465 -2.08333333333333e+00
+2466 2381 4.16666666666667e+00
+2466 2464 4.16666666666667e+00
+2466 2463 -6.25000000000000e+00
+2466 2468 -8.33333333333333e+00
+2466 2474 4.16666666666667e+00
+2466 2473 4.16666666666667e+00
+2466 2472 -1.87500000000000e+01
+2466 2377 -4.16666666666667e+00
+2466 2132 4.16666666666667e+00
+2466 2467 -8.33333333333333e+00
+2466 2120 -8.33333333333333e+00
+2466 2384 8.33333333333333e+00
+2466 2119 4.16666666666667e+00
+2466 2383 -4.16666666666667e+00
+2466 1973 2.08333333333333e+00
+2466 2378 -4.16666666666667e+00
+2466 2131 4.16666666666667e+00
+2466 1972 -4.16666666666667e+00
+2466 2130 -1.87500000000000e+01
+2466 2138 -2.08333333333333e+00
+2466 1982 2.08333333333333e+00
+2466 2137 4.16666666666667e+00
+2466 1981 -4.16666666666667e+00
+2466 2136 -6.25000000000000e+00
+2466 2380 4.16666666666667e+00
+2466 2382 -1.25000000000000e+01
+2467 2467 6.25000000000000e+01
+2467 2465 4.16666666666667e+00
+2467 2381 -8.33333333333333e+00
+2467 1973 2.08333333333333e+00
+2467 2464 -1.87500000000000e+01
+2467 2463 4.16666666666667e+00
+2467 1982 2.08333333333333e+00
+2467 2474 -2.08333333333333e+00
+2467 2473 -6.25000000000000e+00
+2467 2472 4.16666666666667e+00
+2467 2378 -4.16666666666667e+00
+2467 2376 -4.16666666666667e+00
+2467 2132 -2.08333333333333e+00
+2467 2120 4.16666666666667e+00
+2467 2466 -8.33333333333333e+00
+2467 2118 4.16666666666667e+00
+2467 2382 -4.16666666666667e+00
+2467 2131 -6.25000000000000e+00
+2467 2130 4.16666666666667e+00
+2467 1971 -4.16666666666667e+00
+2467 2138 4.16666666666667e+00
+2467 2468 -8.33333333333333e+00
+2467 2384 8.33333333333333e+00
+2467 2137 -1.87500000000000e+01
+2467 2379 4.16666666666667e+00
+2467 2383 -1.25000000000000e+01
+2467 2136 4.16666666666667e+00
+2467 1980 -4.16666666666667e+00
+2468 2468 6.25000000000000e+01
+2468 2380 -8.33333333333333e+00
+2468 2463 -2.08333333333333e+00
+2468 2379 4.16666666666667e+00
+2468 2465 -6.25000000000000e+00
+2468 1972 2.08333333333333e+00
+2468 2474 -6.25000000000000e+00
+2468 1981 2.08333333333333e+00
+2468 2473 -2.08333333333333e+00
+2468 2466 -8.33333333333333e+00
+2468 2472 4.16666666666667e+00
+2468 2377 -4.16666666666667e+00
+2468 2131 -2.08333333333333e+00
+2468 2119 4.16666666666667e+00
+2468 2130 4.16666666666667e+00
+2468 2118 -8.33333333333333e+00
+2468 2382 8.33333333333333e+00
+2468 2132 -6.25000000000000e+00
+2468 1971 2.08333333333333e+00
+2468 2376 -4.16666666666667e+00
+2468 2138 -6.25000000000000e+00
+2468 2464 4.16666666666667e+00
+2468 2384 -3.75000000000000e+01
+2468 2137 4.16666666666667e+00
+2468 2467 -8.33333333333333e+00
+2468 2383 8.33333333333333e+00
+2468 2136 -2.08333333333333e+00
+2468 1980 2.08333333333333e+00
+2469 2469 6.25000000000000e+01
+2469 2461 4.16666666666667e+00
+2469 2460 -6.25000000000000e+00
+2469 2459 2.08333333333333e+00
+2469 2458 -4.16666666666667e+00
+2469 2366 4.16666666666667e+00
+2469 2363 -4.16666666666667e+00
+2469 2365 4.16666666666667e+00
+2469 2362 -4.16666666666667e+00
+2469 2398 -4.16666666666667e+00
+2469 2395 4.16666666666667e+00
+2469 2147 -2.08333333333333e+00
+2469 1976 4.16666666666667e+00
+2469 2396 -8.33333333333333e+00
+2469 1975 4.16666666666667e+00
+2469 2470 -8.33333333333333e+00
+2469 2146 4.16666666666667e+00
+2469 1974 -1.87500000000000e+01
+2469 2145 -6.25000000000000e+00
+2469 2471 -8.33333333333333e+00
+2469 2399 8.33333333333333e+00
+2469 2462 -2.08333333333333e+00
+2469 2397 -1.25000000000000e+01
+2469 1511 2.08333333333333e+00
+2469 1364 4.16666666666667e+00
+2469 1363 4.16666666666667e+00
+2469 1510 -4.16666666666667e+00
+2469 1362 -1.87500000000000e+01
+2470 2470 6.25000000000000e+01
+2470 2462 4.16666666666667e+00
+2470 2461 -1.87500000000000e+01
+2470 2460 4.16666666666667e+00
+2470 2457 -4.16666666666667e+00
+2470 2363 -4.16666666666667e+00
+2470 2366 -8.33333333333333e+00
+2470 2364 4.16666666666667e+00
+2470 2361 -4.16666666666667e+00
+2470 2397 -4.16666666666667e+00
+2470 2394 4.16666666666667e+00
+2470 2399 8.33333333333333e+00
+2470 2471 -8.33333333333333e+00
+2470 2147 4.16666666666667e+00
+2470 1976 -2.08333333333333e+00
+2470 2396 4.16666666666667e+00
+2470 1975 -6.25000000000000e+00
+2470 2146 -1.87500000000000e+01
+2470 1974 4.16666666666667e+00
+2470 2469 -8.33333333333333e+00
+2470 2145 4.16666666666667e+00
+2470 2459 2.08333333333333e+00
+2470 2398 -1.25000000000000e+01
+2470 1364 -2.08333333333333e+00
+2470 1511 2.08333333333333e+00
+2470 1363 -6.25000000000000e+00
+2470 1362 4.16666666666667e+00
+2470 1509 -4.16666666666667e+00
+2471 2471 6.25000000000000e+01
+2471 2462 -6.25000000000000e+00
+2471 2461 4.16666666666667e+00
+2471 2460 -2.08333333333333e+00
+2471 2457 2.08333333333333e+00
+2471 2364 4.16666666666667e+00
+2471 2361 -4.16666666666667e+00
+2471 2362 -4.16666666666667e+00
+2471 2365 -8.33333333333333e+00
+2471 2398 8.33333333333333e+00
+2471 2470 -8.33333333333333e+00
+2471 2146 4.16666666666667e+00
+2471 2145 -2.08333333333333e+00
+2471 1976 -6.25000000000000e+00
+2471 2147 -6.25000000000000e+00
+2471 1975 -2.08333333333333e+00
+2471 2395 4.16666666666667e+00
+2471 1974 4.16666666666667e+00
+2471 2394 -8.33333333333333e+00
+2471 2458 2.08333333333333e+00
+2471 2399 -3.75000000000000e+01
+2471 2469 -8.33333333333333e+00
+2471 2397 8.33333333333333e+00
+2471 1509 2.08333333333333e+00
+2471 1364 -6.25000000000000e+00
+2471 1363 -2.08333333333333e+00
+2471 1510 2.08333333333333e+00
+2471 1362 4.16666666666667e+00
+2472 2472 6.25000000000000e+01
+2472 2468 4.16666666666667e+00
+2472 2467 4.16666666666667e+00
+2472 2466 -1.87500000000000e+01
+2472 2464 -4.16666666666667e+00
+2472 2381 -4.16666666666667e+00
+2472 2384 -8.33333333333333e+00
+2472 2383 4.16666666666667e+00
+2472 2380 -4.16666666666667e+00
+2472 2395 4.16666666666667e+00
+2472 2401 -4.16666666666667e+00
+2472 2474 -8.33333333333333e+00
+2472 2402 8.33333333333333e+00
+2472 2147 4.16666666666667e+00
+2472 1982 -2.08333333333333e+00
+2472 2150 2.08333333333333e+00
+2472 1981 4.16666666666667e+00
+2472 2149 -4.16666666666667e+00
+2472 1980 -6.25000000000000e+00
+2472 2400 -1.25000000000000e+01
+2472 1976 -2.08333333333333e+00
+2472 2396 4.16666666666667e+00
+2472 2473 -8.33333333333333e+00
+2472 1975 4.16666666666667e+00
+2472 2146 4.16666666666667e+00
+2472 2465 2.08333333333333e+00
+2472 1974 -6.25000000000000e+00
+2472 2145 -1.87500000000000e+01
+2473 2473 6.25000000000000e+01
+2473 2467 -6.25000000000000e+00
+2473 2466 4.16666666666667e+00
+2473 2465 2.08333333333333e+00
+2473 2463 -4.16666666666667e+00
+2473 2384 4.16666666666667e+00
+2473 2381 -4.16666666666667e+00
+2473 2382 4.16666666666667e+00
+2473 2379 -4.16666666666667e+00
+2473 2394 4.16666666666667e+00
+2473 2400 -4.16666666666667e+00
+2473 2150 2.08333333333333e+00
+2473 2147 -2.08333333333333e+00
+2473 1982 4.16666666666667e+00
+2473 2474 -8.33333333333333e+00
+2473 2402 8.33333333333333e+00
+2473 1981 -1.87500000000000e+01
+2473 2401 -1.25000000000000e+01
+2473 1980 4.16666666666667e+00
+2473 2148 -4.16666666666667e+00
+2473 1976 4.16666666666667e+00
+2473 2396 -8.33333333333333e+00
+2473 2468 -2.08333333333333e+00
+2473 1975 -1.87500000000000e+01
+2473 2146 -6.25000000000000e+00
+2473 2472 -8.33333333333333e+00
+2473 1974 4.16666666666667e+00
+2473 2145 4.16666666666667e+00
+2474 2474 6.25000000000000e+01
+2474 2468 -6.25000000000000e+00
+2474 2467 -2.08333333333333e+00
+2474 2466 4.16666666666667e+00
+2474 2464 2.08333333333333e+00
+2474 2383 4.16666666666667e+00
+2474 2380 -4.16666666666667e+00
+2474 2379 -4.16666666666667e+00
+2474 2382 -8.33333333333333e+00
+2474 2149 2.08333333333333e+00
+2474 2146 -2.08333333333333e+00
+2474 2472 -8.33333333333333e+00
+2474 2400 8.33333333333333e+00
+2474 2145 4.16666666666667e+00
+2474 1982 -6.25000000000000e+00
+2474 2402 -3.75000000000000e+01
+2474 1981 4.16666666666667e+00
+2474 2473 -8.33333333333333e+00
+2474 2401 8.33333333333333e+00
+2474 1980 -2.08333333333333e+00
+2474 2148 2.08333333333333e+00
+2474 2463 2.08333333333333e+00
+2474 1976 -6.25000000000000e+00
+2474 2147 -6.25000000000000e+00
+2474 1975 4.16666666666667e+00
+2474 2395 -8.33333333333333e+00
+2474 1974 -2.08333333333333e+00
+2474 2394 4.16666666666667e+00
diff --git a/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/b.IJ.00000 b/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/b.IJ.00000
new file mode 100644
index 00000000..e29c4d6a
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/b.IJ.00000
@@ -0,0 +1,676 @@
+0 674
+0 0.00000000000000e+00
+1 0.00000000000000e+00
+2 0.00000000000000e+00
+3 0.00000000000000e+00
+4 0.00000000000000e+00
+5 0.00000000000000e+00
+6 0.00000000000000e+00
+7 0.00000000000000e+00
+8 0.00000000000000e+00
+9 0.00000000000000e+00
+10 0.00000000000000e+00
+11 0.00000000000000e+00
+12 0.00000000000000e+00
+13 0.00000000000000e+00
+14 0.00000000000000e+00
+15 0.00000000000000e+00
+16 0.00000000000000e+00
+17 0.00000000000000e+00
+18 0.00000000000000e+00
+19 0.00000000000000e+00
+20 0.00000000000000e+00
+21 0.00000000000000e+00
+22 0.00000000000000e+00
+23 0.00000000000000e+00
+24 0.00000000000000e+00
+25 0.00000000000000e+00
+26 0.00000000000000e+00
+27 0.00000000000000e+00
+28 0.00000000000000e+00
+29 0.00000000000000e+00
+30 0.00000000000000e+00
+31 0.00000000000000e+00
+32 0.00000000000000e+00
+33 0.00000000000000e+00
+34 0.00000000000000e+00
+35 0.00000000000000e+00
+36 0.00000000000000e+00
+37 0.00000000000000e+00
+38 0.00000000000000e+00
+39 0.00000000000000e+00
+40 0.00000000000000e+00
+41 0.00000000000000e+00
+42 0.00000000000000e+00
+43 0.00000000000000e+00
+44 0.00000000000000e+00
+45 0.00000000000000e+00
+46 0.00000000000000e+00
+47 0.00000000000000e+00
+48 0.00000000000000e+00
+49 0.00000000000000e+00
+50 0.00000000000000e+00
+51 0.00000000000000e+00
+52 0.00000000000000e+00
+53 0.00000000000000e+00
+54 0.00000000000000e+00
+55 0.00000000000000e+00
+56 0.00000000000000e+00
+57 0.00000000000000e+00
+58 0.00000000000000e+00
+59 0.00000000000000e+00
+60 0.00000000000000e+00
+61 0.00000000000000e+00
+62 0.00000000000000e+00
+63 0.00000000000000e+00
+64 0.00000000000000e+00
+65 0.00000000000000e+00
+66 0.00000000000000e+00
+67 0.00000000000000e+00
+68 0.00000000000000e+00
+69 0.00000000000000e+00
+70 0.00000000000000e+00
+71 0.00000000000000e+00
+72 0.00000000000000e+00
+73 0.00000000000000e+00
+74 0.00000000000000e+00
+75 0.00000000000000e+00
+76 0.00000000000000e+00
+77 0.00000000000000e+00
+78 0.00000000000000e+00
+79 0.00000000000000e+00
+80 0.00000000000000e+00
+81 0.00000000000000e+00
+82 0.00000000000000e+00
+83 0.00000000000000e+00
+84 0.00000000000000e+00
+85 0.00000000000000e+00
+86 0.00000000000000e+00
+87 0.00000000000000e+00
+88 0.00000000000000e+00
+89 0.00000000000000e+00
+90 0.00000000000000e+00
+91 0.00000000000000e+00
+92 0.00000000000000e+00
+93 0.00000000000000e+00
+94 0.00000000000000e+00
+95 0.00000000000000e+00
+96 0.00000000000000e+00
+97 0.00000000000000e+00
+98 0.00000000000000e+00
+99 0.00000000000000e+00
+100 0.00000000000000e+00
+101 0.00000000000000e+00
+102 0.00000000000000e+00
+103 0.00000000000000e+00
+104 0.00000000000000e+00
+105 0.00000000000000e+00
+106 0.00000000000000e+00
+107 0.00000000000000e+00
+108 0.00000000000000e+00
+109 0.00000000000000e+00
+110 0.00000000000000e+00
+111 0.00000000000000e+00
+112 0.00000000000000e+00
+113 0.00000000000000e+00
+114 0.00000000000000e+00
+115 0.00000000000000e+00
+116 0.00000000000000e+00
+117 0.00000000000000e+00
+118 0.00000000000000e+00
+119 0.00000000000000e+00
+120 0.00000000000000e+00
+121 0.00000000000000e+00
+122 0.00000000000000e+00
+123 0.00000000000000e+00
+124 0.00000000000000e+00
+125 0.00000000000000e+00
+126 0.00000000000000e+00
+127 0.00000000000000e+00
+128 0.00000000000000e+00
+129 0.00000000000000e+00
+130 0.00000000000000e+00
+131 0.00000000000000e+00
+132 0.00000000000000e+00
+133 0.00000000000000e+00
+134 0.00000000000000e+00
+135 0.00000000000000e+00
+136 0.00000000000000e+00
+137 0.00000000000000e+00
+138 0.00000000000000e+00
+139 0.00000000000000e+00
+140 0.00000000000000e+00
+141 0.00000000000000e+00
+142 0.00000000000000e+00
+143 0.00000000000000e+00
+144 0.00000000000000e+00
+145 0.00000000000000e+00
+146 0.00000000000000e+00
+147 0.00000000000000e+00
+148 0.00000000000000e+00
+149 0.00000000000000e+00
+150 0.00000000000000e+00
+151 0.00000000000000e+00
+152 0.00000000000000e+00
+153 0.00000000000000e+00
+154 0.00000000000000e+00
+155 0.00000000000000e+00
+156 0.00000000000000e+00
+157 0.00000000000000e+00
+158 0.00000000000000e+00
+159 0.00000000000000e+00
+160 0.00000000000000e+00
+161 0.00000000000000e+00
+162 0.00000000000000e+00
+163 0.00000000000000e+00
+164 0.00000000000000e+00
+165 0.00000000000000e+00
+166 0.00000000000000e+00
+167 0.00000000000000e+00
+168 0.00000000000000e+00
+169 0.00000000000000e+00
+170 0.00000000000000e+00
+171 0.00000000000000e+00
+172 0.00000000000000e+00
+173 0.00000000000000e+00
+174 0.00000000000000e+00
+175 0.00000000000000e+00
+176 0.00000000000000e+00
+177 0.00000000000000e+00
+178 0.00000000000000e+00
+179 0.00000000000000e+00
+180 0.00000000000000e+00
+181 0.00000000000000e+00
+182 0.00000000000000e+00
+183 0.00000000000000e+00
+184 0.00000000000000e+00
+185 0.00000000000000e+00
+186 0.00000000000000e+00
+187 0.00000000000000e+00
+188 0.00000000000000e+00
+189 0.00000000000000e+00
+190 0.00000000000000e+00
+191 0.00000000000000e+00
+192 0.00000000000000e+00
+193 0.00000000000000e+00
+194 0.00000000000000e+00
+195 0.00000000000000e+00
+196 0.00000000000000e+00
+197 0.00000000000000e+00
+198 0.00000000000000e+00
+199 0.00000000000000e+00
+200 0.00000000000000e+00
+201 0.00000000000000e+00
+202 0.00000000000000e+00
+203 0.00000000000000e+00
+204 0.00000000000000e+00
+205 0.00000000000000e+00
+206 0.00000000000000e+00
+207 0.00000000000000e+00
+208 0.00000000000000e+00
+209 0.00000000000000e+00
+210 0.00000000000000e+00
+211 0.00000000000000e+00
+212 0.00000000000000e+00
+213 0.00000000000000e+00
+214 0.00000000000000e+00
+215 0.00000000000000e+00
+216 0.00000000000000e+00
+217 0.00000000000000e+00
+218 0.00000000000000e+00
+219 0.00000000000000e+00
+220 0.00000000000000e+00
+221 0.00000000000000e+00
+222 0.00000000000000e+00
+223 0.00000000000000e+00
+224 0.00000000000000e+00
+225 0.00000000000000e+00
+226 0.00000000000000e+00
+227 0.00000000000000e+00
+228 0.00000000000000e+00
+229 0.00000000000000e+00
+230 0.00000000000000e+00
+231 0.00000000000000e+00
+232 0.00000000000000e+00
+233 0.00000000000000e+00
+234 0.00000000000000e+00
+235 0.00000000000000e+00
+236 0.00000000000000e+00
+237 0.00000000000000e+00
+238 0.00000000000000e+00
+239 0.00000000000000e+00
+240 0.00000000000000e+00
+241 0.00000000000000e+00
+242 0.00000000000000e+00
+243 0.00000000000000e+00
+244 0.00000000000000e+00
+245 0.00000000000000e+00
+246 0.00000000000000e+00
+247 0.00000000000000e+00
+248 0.00000000000000e+00
+249 0.00000000000000e+00
+250 0.00000000000000e+00
+251 0.00000000000000e+00
+252 0.00000000000000e+00
+253 0.00000000000000e+00
+254 0.00000000000000e+00
+255 0.00000000000000e+00
+256 0.00000000000000e+00
+257 0.00000000000000e+00
+258 0.00000000000000e+00
+259 0.00000000000000e+00
+260 0.00000000000000e+00
+261 0.00000000000000e+00
+262 0.00000000000000e+00
+263 0.00000000000000e+00
+264 0.00000000000000e+00
+265 0.00000000000000e+00
+266 0.00000000000000e+00
+267 0.00000000000000e+00
+268 0.00000000000000e+00
+269 0.00000000000000e+00
+270 0.00000000000000e+00
+271 0.00000000000000e+00
+272 0.00000000000000e+00
+273 0.00000000000000e+00
+274 0.00000000000000e+00
+275 0.00000000000000e+00
+276 0.00000000000000e+00
+277 0.00000000000000e+00
+278 0.00000000000000e+00
+279 0.00000000000000e+00
+280 0.00000000000000e+00
+281 0.00000000000000e+00
+282 0.00000000000000e+00
+283 0.00000000000000e+00
+284 0.00000000000000e+00
+285 0.00000000000000e+00
+286 0.00000000000000e+00
+287 0.00000000000000e+00
+288 0.00000000000000e+00
+289 0.00000000000000e+00
+290 0.00000000000000e+00
+291 0.00000000000000e+00
+292 0.00000000000000e+00
+293 0.00000000000000e+00
+294 0.00000000000000e+00
+295 0.00000000000000e+00
+296 0.00000000000000e+00
+297 0.00000000000000e+00
+298 0.00000000000000e+00
+299 0.00000000000000e+00
+300 0.00000000000000e+00
+301 0.00000000000000e+00
+302 0.00000000000000e+00
+303 0.00000000000000e+00
+304 0.00000000000000e+00
+305 0.00000000000000e+00
+306 0.00000000000000e+00
+307 0.00000000000000e+00
+308 0.00000000000000e+00
+309 0.00000000000000e+00
+310 0.00000000000000e+00
+311 0.00000000000000e+00
+312 0.00000000000000e+00
+313 0.00000000000000e+00
+314 0.00000000000000e+00
+315 0.00000000000000e+00
+316 0.00000000000000e+00
+317 0.00000000000000e+00
+318 0.00000000000000e+00
+319 0.00000000000000e+00
+320 0.00000000000000e+00
+321 0.00000000000000e+00
+322 0.00000000000000e+00
+323 0.00000000000000e+00
+324 0.00000000000000e+00
+325 0.00000000000000e+00
+326 0.00000000000000e+00
+327 0.00000000000000e+00
+328 0.00000000000000e+00
+329 0.00000000000000e+00
+330 0.00000000000000e+00
+331 0.00000000000000e+00
+332 0.00000000000000e+00
+333 0.00000000000000e+00
+334 0.00000000000000e+00
+335 0.00000000000000e+00
+336 0.00000000000000e+00
+337 0.00000000000000e+00
+338 0.00000000000000e+00
+339 0.00000000000000e+00
+340 0.00000000000000e+00
+341 0.00000000000000e+00
+342 0.00000000000000e+00
+343 0.00000000000000e+00
+344 0.00000000000000e+00
+345 0.00000000000000e+00
+346 0.00000000000000e+00
+347 0.00000000000000e+00
+348 0.00000000000000e+00
+349 0.00000000000000e+00
+350 0.00000000000000e+00
+351 0.00000000000000e+00
+352 0.00000000000000e+00
+353 0.00000000000000e+00
+354 0.00000000000000e+00
+355 0.00000000000000e+00
+356 0.00000000000000e+00
+357 0.00000000000000e+00
+358 0.00000000000000e+00
+359 0.00000000000000e+00
+360 0.00000000000000e+00
+361 0.00000000000000e+00
+362 0.00000000000000e+00
+363 0.00000000000000e+00
+364 0.00000000000000e+00
+365 0.00000000000000e+00
+366 0.00000000000000e+00
+367 0.00000000000000e+00
+368 0.00000000000000e+00
+369 0.00000000000000e+00
+370 0.00000000000000e+00
+371 0.00000000000000e+00
+372 0.00000000000000e+00
+373 0.00000000000000e+00
+374 0.00000000000000e+00
+375 0.00000000000000e+00
+376 0.00000000000000e+00
+377 0.00000000000000e+00
+378 0.00000000000000e+00
+379 0.00000000000000e+00
+380 0.00000000000000e+00
+381 0.00000000000000e+00
+382 0.00000000000000e+00
+383 0.00000000000000e+00
+384 0.00000000000000e+00
+385 0.00000000000000e+00
+386 0.00000000000000e+00
+387 0.00000000000000e+00
+388 0.00000000000000e+00
+389 0.00000000000000e+00
+390 0.00000000000000e+00
+391 0.00000000000000e+00
+392 0.00000000000000e+00
+393 0.00000000000000e+00
+394 0.00000000000000e+00
+395 0.00000000000000e+00
+396 0.00000000000000e+00
+397 0.00000000000000e+00
+398 0.00000000000000e+00
+399 0.00000000000000e+00
+400 0.00000000000000e+00
+401 0.00000000000000e+00
+402 0.00000000000000e+00
+403 0.00000000000000e+00
+404 0.00000000000000e+00
+405 0.00000000000000e+00
+406 0.00000000000000e+00
+407 0.00000000000000e+00
+408 0.00000000000000e+00
+409 0.00000000000000e+00
+410 0.00000000000000e+00
+411 0.00000000000000e+00
+412 0.00000000000000e+00
+413 0.00000000000000e+00
+414 0.00000000000000e+00
+415 0.00000000000000e+00
+416 0.00000000000000e+00
+417 0.00000000000000e+00
+418 0.00000000000000e+00
+419 0.00000000000000e+00
+420 0.00000000000000e+00
+421 0.00000000000000e+00
+422 0.00000000000000e+00
+423 0.00000000000000e+00
+424 0.00000000000000e+00
+425 0.00000000000000e+00
+426 0.00000000000000e+00
+427 0.00000000000000e+00
+428 0.00000000000000e+00
+429 0.00000000000000e+00
+430 0.00000000000000e+00
+431 0.00000000000000e+00
+432 0.00000000000000e+00
+433 0.00000000000000e+00
+434 0.00000000000000e+00
+435 0.00000000000000e+00
+436 0.00000000000000e+00
+437 0.00000000000000e+00
+438 0.00000000000000e+00
+439 0.00000000000000e+00
+440 0.00000000000000e+00
+441 0.00000000000000e+00
+442 0.00000000000000e+00
+443 0.00000000000000e+00
+444 0.00000000000000e+00
+445 0.00000000000000e+00
+446 0.00000000000000e+00
+447 0.00000000000000e+00
+448 0.00000000000000e+00
+449 0.00000000000000e+00
+450 0.00000000000000e+00
+451 0.00000000000000e+00
+452 0.00000000000000e+00
+453 0.00000000000000e+00
+454 0.00000000000000e+00
+455 0.00000000000000e+00
+456 0.00000000000000e+00
+457 0.00000000000000e+00
+458 0.00000000000000e+00
+459 0.00000000000000e+00
+460 0.00000000000000e+00
+461 0.00000000000000e+00
+462 0.00000000000000e+00
+463 0.00000000000000e+00
+464 0.00000000000000e+00
+465 0.00000000000000e+00
+466 0.00000000000000e+00
+467 0.00000000000000e+00
+468 0.00000000000000e+00
+469 0.00000000000000e+00
+470 0.00000000000000e+00
+471 0.00000000000000e+00
+472 0.00000000000000e+00
+473 0.00000000000000e+00
+474 0.00000000000000e+00
+475 0.00000000000000e+00
+476 0.00000000000000e+00
+477 0.00000000000000e+00
+478 0.00000000000000e+00
+479 0.00000000000000e+00
+480 0.00000000000000e+00
+481 0.00000000000000e+00
+482 0.00000000000000e+00
+483 0.00000000000000e+00
+484 0.00000000000000e+00
+485 0.00000000000000e+00
+486 0.00000000000000e+00
+487 0.00000000000000e+00
+488 0.00000000000000e+00
+489 0.00000000000000e+00
+490 0.00000000000000e+00
+491 0.00000000000000e+00
+492 0.00000000000000e+00
+493 0.00000000000000e+00
+494 0.00000000000000e+00
+495 0.00000000000000e+00
+496 0.00000000000000e+00
+497 0.00000000000000e+00
+498 0.00000000000000e+00
+499 0.00000000000000e+00
+500 0.00000000000000e+00
+501 0.00000000000000e+00
+502 0.00000000000000e+00
+503 0.00000000000000e+00
+504 0.00000000000000e+00
+505 0.00000000000000e+00
+506 0.00000000000000e+00
+507 0.00000000000000e+00
+508 0.00000000000000e+00
+509 0.00000000000000e+00
+510 0.00000000000000e+00
+511 0.00000000000000e+00
+512 0.00000000000000e+00
+513 0.00000000000000e+00
+514 0.00000000000000e+00
+515 0.00000000000000e+00
+516 0.00000000000000e+00
+517 0.00000000000000e+00
+518 0.00000000000000e+00
+519 0.00000000000000e+00
+520 0.00000000000000e+00
+521 0.00000000000000e+00
+522 0.00000000000000e+00
+523 0.00000000000000e+00
+524 0.00000000000000e+00
+525 0.00000000000000e+00
+526 0.00000000000000e+00
+527 0.00000000000000e+00
+528 0.00000000000000e+00
+529 0.00000000000000e+00
+530 0.00000000000000e+00
+531 0.00000000000000e+00
+532 0.00000000000000e+00
+533 0.00000000000000e+00
+534 0.00000000000000e+00
+535 0.00000000000000e+00
+536 0.00000000000000e+00
+537 0.00000000000000e+00
+538 0.00000000000000e+00
+539 0.00000000000000e+00
+540 0.00000000000000e+00
+541 0.00000000000000e+00
+542 0.00000000000000e+00
+543 0.00000000000000e+00
+544 0.00000000000000e+00
+545 0.00000000000000e+00
+546 0.00000000000000e+00
+547 0.00000000000000e+00
+548 0.00000000000000e+00
+549 0.00000000000000e+00
+550 0.00000000000000e+00
+551 0.00000000000000e+00
+552 0.00000000000000e+00
+553 0.00000000000000e+00
+554 0.00000000000000e+00
+555 0.00000000000000e+00
+556 0.00000000000000e+00
+557 0.00000000000000e+00
+558 0.00000000000000e+00
+559 0.00000000000000e+00
+560 0.00000000000000e+00
+561 0.00000000000000e+00
+562 0.00000000000000e+00
+563 0.00000000000000e+00
+564 0.00000000000000e+00
+565 0.00000000000000e+00
+566 0.00000000000000e+00
+567 0.00000000000000e+00
+568 0.00000000000000e+00
+569 0.00000000000000e+00
+570 0.00000000000000e+00
+571 0.00000000000000e+00
+572 0.00000000000000e+00
+573 0.00000000000000e+00
+574 0.00000000000000e+00
+575 0.00000000000000e+00
+576 0.00000000000000e+00
+577 0.00000000000000e+00
+578 0.00000000000000e+00
+579 0.00000000000000e+00
+580 0.00000000000000e+00
+581 0.00000000000000e+00
+582 0.00000000000000e+00
+583 0.00000000000000e+00
+584 0.00000000000000e+00
+585 0.00000000000000e+00
+586 0.00000000000000e+00
+587 0.00000000000000e+00
+588 0.00000000000000e+00
+589 0.00000000000000e+00
+590 0.00000000000000e+00
+591 0.00000000000000e+00
+592 0.00000000000000e+00
+593 0.00000000000000e+00
+594 0.00000000000000e+00
+595 0.00000000000000e+00
+596 0.00000000000000e+00
+597 0.00000000000000e+00
+598 0.00000000000000e+00
+599 0.00000000000000e+00
+600 0.00000000000000e+00
+601 0.00000000000000e+00
+602 0.00000000000000e+00
+603 0.00000000000000e+00
+604 0.00000000000000e+00
+605 0.00000000000000e+00
+606 0.00000000000000e+00
+607 0.00000000000000e+00
+608 0.00000000000000e+00
+609 0.00000000000000e+00
+610 0.00000000000000e+00
+611 0.00000000000000e+00
+612 0.00000000000000e+00
+613 0.00000000000000e+00
+614 0.00000000000000e+00
+615 0.00000000000000e+00
+616 0.00000000000000e+00
+617 0.00000000000000e+00
+618 0.00000000000000e+00
+619 0.00000000000000e+00
+620 0.00000000000000e+00
+621 0.00000000000000e+00
+622 0.00000000000000e+00
+623 0.00000000000000e+00
+624 0.00000000000000e+00
+625 0.00000000000000e+00
+626 0.00000000000000e+00
+627 0.00000000000000e+00
+628 0.00000000000000e+00
+629 0.00000000000000e+00
+630 0.00000000000000e+00
+631 0.00000000000000e+00
+632 0.00000000000000e+00
+633 0.00000000000000e+00
+634 0.00000000000000e+00
+635 0.00000000000000e+00
+636 0.00000000000000e+00
+637 0.00000000000000e+00
+638 0.00000000000000e+00
+639 0.00000000000000e+00
+640 0.00000000000000e+00
+641 0.00000000000000e+00
+642 0.00000000000000e+00
+643 0.00000000000000e+00
+644 0.00000000000000e+00
+645 0.00000000000000e+00
+646 0.00000000000000e+00
+647 0.00000000000000e+00
+648 0.00000000000000e+00
+649 0.00000000000000e+00
+650 0.00000000000000e+00
+651 0.00000000000000e+00
+652 0.00000000000000e+00
+653 0.00000000000000e+00
+654 0.00000000000000e+00
+655 0.00000000000000e+00
+656 0.00000000000000e+00
+657 0.00000000000000e+00
+658 0.00000000000000e+00
+659 0.00000000000000e+00
+660 0.00000000000000e+00
+661 0.00000000000000e+00
+662 0.00000000000000e+00
+663 0.00000000000000e+00
+664 0.00000000000000e+00
+665 0.00000000000000e+00
+666 0.00000000000000e+00
+667 0.00000000000000e+00
+668 0.00000000000000e+00
+669 0.00000000000000e+00
+670 0.00000000000000e+00
+671 0.00000000000000e+00
+672 0.00000000000000e+00
+673 0.00000000000000e+00
+674 0.00000000000000e+00
diff --git a/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/b.IJ.00001 b/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/b.IJ.00001
new file mode 100644
index 00000000..83497fab
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/b.IJ.00001
@@ -0,0 +1,601 @@
+675 1274
+675 0.00000000000000e+00
+676 0.00000000000000e+00
+677 0.00000000000000e+00
+678 0.00000000000000e+00
+679 0.00000000000000e+00
+680 -2.08333333333333e-04
+681 0.00000000000000e+00
+682 0.00000000000000e+00
+683 0.00000000000000e+00
+684 0.00000000000000e+00
+685 0.00000000000000e+00
+686 -1.04166666666667e-04
+687 0.00000000000000e+00
+688 0.00000000000000e+00
+689 0.00000000000000e+00
+690 0.00000000000000e+00
+691 0.00000000000000e+00
+692 -1.04166666666667e-04
+693 0.00000000000000e+00
+694 0.00000000000000e+00
+695 0.00000000000000e+00
+696 0.00000000000000e+00
+697 0.00000000000000e+00
+698 -2.08333333333333e-04
+699 0.00000000000000e+00
+700 0.00000000000000e+00
+701 0.00000000000000e+00
+702 0.00000000000000e+00
+703 0.00000000000000e+00
+704 0.00000000000000e+00
+705 0.00000000000000e+00
+706 0.00000000000000e+00
+707 0.00000000000000e+00
+708 0.00000000000000e+00
+709 0.00000000000000e+00
+710 0.00000000000000e+00
+711 0.00000000000000e+00
+712 0.00000000000000e+00
+713 0.00000000000000e+00
+714 0.00000000000000e+00
+715 0.00000000000000e+00
+716 0.00000000000000e+00
+717 0.00000000000000e+00
+718 0.00000000000000e+00
+719 0.00000000000000e+00
+720 0.00000000000000e+00
+721 0.00000000000000e+00
+722 0.00000000000000e+00
+723 0.00000000000000e+00
+724 0.00000000000000e+00
+725 0.00000000000000e+00
+726 0.00000000000000e+00
+727 0.00000000000000e+00
+728 0.00000000000000e+00
+729 0.00000000000000e+00
+730 0.00000000000000e+00
+731 0.00000000000000e+00
+732 0.00000000000000e+00
+733 0.00000000000000e+00
+734 -3.12500000000000e-04
+735 0.00000000000000e+00
+736 0.00000000000000e+00
+737 -3.12500000000000e-04
+738 0.00000000000000e+00
+739 0.00000000000000e+00
+740 -6.25000000000000e-04
+741 0.00000000000000e+00
+742 0.00000000000000e+00
+743 0.00000000000000e+00
+744 0.00000000000000e+00
+745 0.00000000000000e+00
+746 0.00000000000000e+00
+747 0.00000000000000e+00
+748 0.00000000000000e+00
+749 0.00000000000000e+00
+750 0.00000000000000e+00
+751 0.00000000000000e+00
+752 0.00000000000000e+00
+753 0.00000000000000e+00
+754 0.00000000000000e+00
+755 0.00000000000000e+00
+756 0.00000000000000e+00
+757 0.00000000000000e+00
+758 -3.12500000000000e-04
+759 0.00000000000000e+00
+760 0.00000000000000e+00
+761 0.00000000000000e+00
+762 0.00000000000000e+00
+763 0.00000000000000e+00
+764 0.00000000000000e+00
+765 0.00000000000000e+00
+766 0.00000000000000e+00
+767 0.00000000000000e+00
+768 0.00000000000000e+00
+769 0.00000000000000e+00
+770 0.00000000000000e+00
+771 0.00000000000000e+00
+772 0.00000000000000e+00
+773 0.00000000000000e+00
+774 0.00000000000000e+00
+775 0.00000000000000e+00
+776 -3.12500000000000e-04
+777 0.00000000000000e+00
+778 0.00000000000000e+00
+779 0.00000000000000e+00
+780 0.00000000000000e+00
+781 0.00000000000000e+00
+782 0.00000000000000e+00
+783 0.00000000000000e+00
+784 0.00000000000000e+00
+785 0.00000000000000e+00
+786 0.00000000000000e+00
+787 0.00000000000000e+00
+788 0.00000000000000e+00
+789 0.00000000000000e+00
+790 0.00000000000000e+00
+791 0.00000000000000e+00
+792 0.00000000000000e+00
+793 0.00000000000000e+00
+794 0.00000000000000e+00
+795 0.00000000000000e+00
+796 0.00000000000000e+00
+797 0.00000000000000e+00
+798 0.00000000000000e+00
+799 0.00000000000000e+00
+800 0.00000000000000e+00
+801 0.00000000000000e+00
+802 0.00000000000000e+00
+803 0.00000000000000e+00
+804 0.00000000000000e+00
+805 0.00000000000000e+00
+806 0.00000000000000e+00
+807 0.00000000000000e+00
+808 0.00000000000000e+00
+809 0.00000000000000e+00
+810 0.00000000000000e+00
+811 0.00000000000000e+00
+812 0.00000000000000e+00
+813 0.00000000000000e+00
+814 0.00000000000000e+00
+815 0.00000000000000e+00
+816 0.00000000000000e+00
+817 0.00000000000000e+00
+818 0.00000000000000e+00
+819 0.00000000000000e+00
+820 0.00000000000000e+00
+821 0.00000000000000e+00
+822 0.00000000000000e+00
+823 0.00000000000000e+00
+824 -3.12500000000000e-04
+825 0.00000000000000e+00
+826 0.00000000000000e+00
+827 -3.12500000000000e-04
+828 0.00000000000000e+00
+829 0.00000000000000e+00
+830 -6.25000000000000e-04
+831 0.00000000000000e+00
+832 0.00000000000000e+00
+833 0.00000000000000e+00
+834 0.00000000000000e+00
+835 0.00000000000000e+00
+836 0.00000000000000e+00
+837 0.00000000000000e+00
+838 0.00000000000000e+00
+839 0.00000000000000e+00
+840 0.00000000000000e+00
+841 0.00000000000000e+00
+842 0.00000000000000e+00
+843 0.00000000000000e+00
+844 0.00000000000000e+00
+845 0.00000000000000e+00
+846 0.00000000000000e+00
+847 0.00000000000000e+00
+848 0.00000000000000e+00
+849 0.00000000000000e+00
+850 0.00000000000000e+00
+851 0.00000000000000e+00
+852 0.00000000000000e+00
+853 0.00000000000000e+00
+854 0.00000000000000e+00
+855 0.00000000000000e+00
+856 0.00000000000000e+00
+857 0.00000000000000e+00
+858 0.00000000000000e+00
+859 0.00000000000000e+00
+860 -3.12500000000000e-04
+861 0.00000000000000e+00
+862 0.00000000000000e+00
+863 0.00000000000000e+00
+864 0.00000000000000e+00
+865 0.00000000000000e+00
+866 -3.12500000000000e-04
+867 0.00000000000000e+00
+868 0.00000000000000e+00
+869 0.00000000000000e+00
+870 0.00000000000000e+00
+871 0.00000000000000e+00
+872 0.00000000000000e+00
+873 0.00000000000000e+00
+874 0.00000000000000e+00
+875 0.00000000000000e+00
+876 0.00000000000000e+00
+877 0.00000000000000e+00
+878 0.00000000000000e+00
+879 0.00000000000000e+00
+880 0.00000000000000e+00
+881 0.00000000000000e+00
+882 0.00000000000000e+00
+883 0.00000000000000e+00
+884 0.00000000000000e+00
+885 0.00000000000000e+00
+886 0.00000000000000e+00
+887 0.00000000000000e+00
+888 0.00000000000000e+00
+889 0.00000000000000e+00
+890 0.00000000000000e+00
+891 0.00000000000000e+00
+892 0.00000000000000e+00
+893 0.00000000000000e+00
+894 0.00000000000000e+00
+895 0.00000000000000e+00
+896 -3.12500000000000e-04
+897 0.00000000000000e+00
+898 0.00000000000000e+00
+899 0.00000000000000e+00
+900 0.00000000000000e+00
+901 0.00000000000000e+00
+902 -3.12500000000000e-04
+903 0.00000000000000e+00
+904 0.00000000000000e+00
+905 0.00000000000000e+00
+906 0.00000000000000e+00
+907 0.00000000000000e+00
+908 0.00000000000000e+00
+909 0.00000000000000e+00
+910 0.00000000000000e+00
+911 0.00000000000000e+00
+912 0.00000000000000e+00
+913 0.00000000000000e+00
+914 0.00000000000000e+00
+915 0.00000000000000e+00
+916 0.00000000000000e+00
+917 0.00000000000000e+00
+918 0.00000000000000e+00
+919 0.00000000000000e+00
+920 0.00000000000000e+00
+921 0.00000000000000e+00
+922 0.00000000000000e+00
+923 0.00000000000000e+00
+924 0.00000000000000e+00
+925 0.00000000000000e+00
+926 0.00000000000000e+00
+927 0.00000000000000e+00
+928 0.00000000000000e+00
+929 0.00000000000000e+00
+930 0.00000000000000e+00
+931 0.00000000000000e+00
+932 0.00000000000000e+00
+933 0.00000000000000e+00
+934 0.00000000000000e+00
+935 -6.25000000000000e-04
+936 0.00000000000000e+00
+937 0.00000000000000e+00
+938 0.00000000000000e+00
+939 0.00000000000000e+00
+940 0.00000000000000e+00
+941 -3.12500000000000e-04
+942 0.00000000000000e+00
+943 0.00000000000000e+00
+944 0.00000000000000e+00
+945 0.00000000000000e+00
+946 0.00000000000000e+00
+947 -3.12500000000000e-04
+948 0.00000000000000e+00
+949 0.00000000000000e+00
+950 0.00000000000000e+00
+951 0.00000000000000e+00
+952 0.00000000000000e+00
+953 0.00000000000000e+00
+954 0.00000000000000e+00
+955 0.00000000000000e+00
+956 0.00000000000000e+00
+957 0.00000000000000e+00
+958 0.00000000000000e+00
+959 0.00000000000000e+00
+960 0.00000000000000e+00
+961 0.00000000000000e+00
+962 0.00000000000000e+00
+963 0.00000000000000e+00
+964 0.00000000000000e+00
+965 0.00000000000000e+00
+966 0.00000000000000e+00
+967 0.00000000000000e+00
+968 0.00000000000000e+00
+969 0.00000000000000e+00
+970 0.00000000000000e+00
+971 0.00000000000000e+00
+972 0.00000000000000e+00
+973 0.00000000000000e+00
+974 0.00000000000000e+00
+975 0.00000000000000e+00
+976 0.00000000000000e+00
+977 0.00000000000000e+00
+978 0.00000000000000e+00
+979 0.00000000000000e+00
+980 0.00000000000000e+00
+981 0.00000000000000e+00
+982 0.00000000000000e+00
+983 0.00000000000000e+00
+984 0.00000000000000e+00
+985 0.00000000000000e+00
+986 0.00000000000000e+00
+987 0.00000000000000e+00
+988 0.00000000000000e+00
+989 0.00000000000000e+00
+990 0.00000000000000e+00
+991 0.00000000000000e+00
+992 0.00000000000000e+00
+993 0.00000000000000e+00
+994 0.00000000000000e+00
+995 0.00000000000000e+00
+996 0.00000000000000e+00
+997 0.00000000000000e+00
+998 0.00000000000000e+00
+999 0.00000000000000e+00
+1000 0.00000000000000e+00
+1001 0.00000000000000e+00
+1002 0.00000000000000e+00
+1003 0.00000000000000e+00
+1004 0.00000000000000e+00
+1005 0.00000000000000e+00
+1006 0.00000000000000e+00
+1007 0.00000000000000e+00
+1008 0.00000000000000e+00
+1009 0.00000000000000e+00
+1010 0.00000000000000e+00
+1011 0.00000000000000e+00
+1012 0.00000000000000e+00
+1013 0.00000000000000e+00
+1014 0.00000000000000e+00
+1015 0.00000000000000e+00
+1016 0.00000000000000e+00
+1017 0.00000000000000e+00
+1018 0.00000000000000e+00
+1019 0.00000000000000e+00
+1020 0.00000000000000e+00
+1021 0.00000000000000e+00
+1022 0.00000000000000e+00
+1023 0.00000000000000e+00
+1024 0.00000000000000e+00
+1025 0.00000000000000e+00
+1026 0.00000000000000e+00
+1027 0.00000000000000e+00
+1028 0.00000000000000e+00
+1029 0.00000000000000e+00
+1030 0.00000000000000e+00
+1031 0.00000000000000e+00
+1032 0.00000000000000e+00
+1033 0.00000000000000e+00
+1034 0.00000000000000e+00
+1035 0.00000000000000e+00
+1036 0.00000000000000e+00
+1037 0.00000000000000e+00
+1038 0.00000000000000e+00
+1039 0.00000000000000e+00
+1040 0.00000000000000e+00
+1041 0.00000000000000e+00
+1042 0.00000000000000e+00
+1043 0.00000000000000e+00
+1044 0.00000000000000e+00
+1045 0.00000000000000e+00
+1046 0.00000000000000e+00
+1047 0.00000000000000e+00
+1048 0.00000000000000e+00
+1049 0.00000000000000e+00
+1050 0.00000000000000e+00
+1051 0.00000000000000e+00
+1052 0.00000000000000e+00
+1053 0.00000000000000e+00
+1054 0.00000000000000e+00
+1055 0.00000000000000e+00
+1056 0.00000000000000e+00
+1057 0.00000000000000e+00
+1058 0.00000000000000e+00
+1059 0.00000000000000e+00
+1060 0.00000000000000e+00
+1061 0.00000000000000e+00
+1062 0.00000000000000e+00
+1063 0.00000000000000e+00
+1064 0.00000000000000e+00
+1065 0.00000000000000e+00
+1066 0.00000000000000e+00
+1067 0.00000000000000e+00
+1068 0.00000000000000e+00
+1069 0.00000000000000e+00
+1070 0.00000000000000e+00
+1071 0.00000000000000e+00
+1072 0.00000000000000e+00
+1073 0.00000000000000e+00
+1074 0.00000000000000e+00
+1075 0.00000000000000e+00
+1076 0.00000000000000e+00
+1077 0.00000000000000e+00
+1078 0.00000000000000e+00
+1079 0.00000000000000e+00
+1080 0.00000000000000e+00
+1081 0.00000000000000e+00
+1082 0.00000000000000e+00
+1083 0.00000000000000e+00
+1084 0.00000000000000e+00
+1085 0.00000000000000e+00
+1086 0.00000000000000e+00
+1087 0.00000000000000e+00
+1088 0.00000000000000e+00
+1089 0.00000000000000e+00
+1090 0.00000000000000e+00
+1091 0.00000000000000e+00
+1092 0.00000000000000e+00
+1093 0.00000000000000e+00
+1094 0.00000000000000e+00
+1095 0.00000000000000e+00
+1096 0.00000000000000e+00
+1097 0.00000000000000e+00
+1098 0.00000000000000e+00
+1099 0.00000000000000e+00
+1100 0.00000000000000e+00
+1101 0.00000000000000e+00
+1102 0.00000000000000e+00
+1103 0.00000000000000e+00
+1104 0.00000000000000e+00
+1105 0.00000000000000e+00
+1106 0.00000000000000e+00
+1107 0.00000000000000e+00
+1108 0.00000000000000e+00
+1109 0.00000000000000e+00
+1110 0.00000000000000e+00
+1111 0.00000000000000e+00
+1112 0.00000000000000e+00
+1113 0.00000000000000e+00
+1114 0.00000000000000e+00
+1115 0.00000000000000e+00
+1116 0.00000000000000e+00
+1117 0.00000000000000e+00
+1118 0.00000000000000e+00
+1119 0.00000000000000e+00
+1120 0.00000000000000e+00
+1121 0.00000000000000e+00
+1122 0.00000000000000e+00
+1123 0.00000000000000e+00
+1124 0.00000000000000e+00
+1125 0.00000000000000e+00
+1126 0.00000000000000e+00
+1127 0.00000000000000e+00
+1128 0.00000000000000e+00
+1129 0.00000000000000e+00
+1130 0.00000000000000e+00
+1131 0.00000000000000e+00
+1132 0.00000000000000e+00
+1133 0.00000000000000e+00
+1134 0.00000000000000e+00
+1135 0.00000000000000e+00
+1136 0.00000000000000e+00
+1137 0.00000000000000e+00
+1138 0.00000000000000e+00
+1139 0.00000000000000e+00
+1140 0.00000000000000e+00
+1141 0.00000000000000e+00
+1142 0.00000000000000e+00
+1143 0.00000000000000e+00
+1144 0.00000000000000e+00
+1145 0.00000000000000e+00
+1146 0.00000000000000e+00
+1147 0.00000000000000e+00
+1148 0.00000000000000e+00
+1149 0.00000000000000e+00
+1150 0.00000000000000e+00
+1151 0.00000000000000e+00
+1152 0.00000000000000e+00
+1153 0.00000000000000e+00
+1154 0.00000000000000e+00
+1155 0.00000000000000e+00
+1156 0.00000000000000e+00
+1157 0.00000000000000e+00
+1158 0.00000000000000e+00
+1159 0.00000000000000e+00
+1160 0.00000000000000e+00
+1161 0.00000000000000e+00
+1162 0.00000000000000e+00
+1163 0.00000000000000e+00
+1164 0.00000000000000e+00
+1165 0.00000000000000e+00
+1166 0.00000000000000e+00
+1167 0.00000000000000e+00
+1168 0.00000000000000e+00
+1169 0.00000000000000e+00
+1170 0.00000000000000e+00
+1171 0.00000000000000e+00
+1172 0.00000000000000e+00
+1173 0.00000000000000e+00
+1174 0.00000000000000e+00
+1175 0.00000000000000e+00
+1176 0.00000000000000e+00
+1177 0.00000000000000e+00
+1178 0.00000000000000e+00
+1179 0.00000000000000e+00
+1180 0.00000000000000e+00
+1181 0.00000000000000e+00
+1182 0.00000000000000e+00
+1183 0.00000000000000e+00
+1184 0.00000000000000e+00
+1185 0.00000000000000e+00
+1186 0.00000000000000e+00
+1187 -6.25000000000000e-04
+1188 0.00000000000000e+00
+1189 0.00000000000000e+00
+1190 -6.25000000000000e-04
+1191 0.00000000000000e+00
+1192 0.00000000000000e+00
+1193 -6.25000000000000e-04
+1194 0.00000000000000e+00
+1195 0.00000000000000e+00
+1196 -6.25000000000000e-04
+1197 0.00000000000000e+00
+1198 0.00000000000000e+00
+1199 -6.25000000000000e-04
+1200 0.00000000000000e+00
+1201 0.00000000000000e+00
+1202 -6.25000000000000e-04
+1203 0.00000000000000e+00
+1204 0.00000000000000e+00
+1205 0.00000000000000e+00
+1206 0.00000000000000e+00
+1207 0.00000000000000e+00
+1208 0.00000000000000e+00
+1209 0.00000000000000e+00
+1210 0.00000000000000e+00
+1211 0.00000000000000e+00
+1212 0.00000000000000e+00
+1213 0.00000000000000e+00
+1214 0.00000000000000e+00
+1215 0.00000000000000e+00
+1216 0.00000000000000e+00
+1217 0.00000000000000e+00
+1218 0.00000000000000e+00
+1219 0.00000000000000e+00
+1220 0.00000000000000e+00
+1221 0.00000000000000e+00
+1222 0.00000000000000e+00
+1223 0.00000000000000e+00
+1224 0.00000000000000e+00
+1225 0.00000000000000e+00
+1226 0.00000000000000e+00
+1227 0.00000000000000e+00
+1228 0.00000000000000e+00
+1229 0.00000000000000e+00
+1230 0.00000000000000e+00
+1231 0.00000000000000e+00
+1232 0.00000000000000e+00
+1233 0.00000000000000e+00
+1234 0.00000000000000e+00
+1235 0.00000000000000e+00
+1236 0.00000000000000e+00
+1237 0.00000000000000e+00
+1238 0.00000000000000e+00
+1239 0.00000000000000e+00
+1240 0.00000000000000e+00
+1241 0.00000000000000e+00
+1242 0.00000000000000e+00
+1243 0.00000000000000e+00
+1244 0.00000000000000e+00
+1245 0.00000000000000e+00
+1246 0.00000000000000e+00
+1247 0.00000000000000e+00
+1248 0.00000000000000e+00
+1249 0.00000000000000e+00
+1250 0.00000000000000e+00
+1251 0.00000000000000e+00
+1252 0.00000000000000e+00
+1253 0.00000000000000e+00
+1254 0.00000000000000e+00
+1255 0.00000000000000e+00
+1256 0.00000000000000e+00
+1257 0.00000000000000e+00
+1258 0.00000000000000e+00
+1259 0.00000000000000e+00
+1260 0.00000000000000e+00
+1261 0.00000000000000e+00
+1262 0.00000000000000e+00
+1263 0.00000000000000e+00
+1264 0.00000000000000e+00
+1265 0.00000000000000e+00
+1266 0.00000000000000e+00
+1267 0.00000000000000e+00
+1268 0.00000000000000e+00
+1269 0.00000000000000e+00
+1270 0.00000000000000e+00
+1271 0.00000000000000e+00
+1272 0.00000000000000e+00
+1273 0.00000000000000e+00
+1274 0.00000000000000e+00
diff --git a/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/b.IJ.00002 b/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/b.IJ.00002
new file mode 100644
index 00000000..3c64a019
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/b.IJ.00002
@@ -0,0 +1,601 @@
+1275 1874
+1275 0.00000000000000e+00
+1276 0.00000000000000e+00
+1277 0.00000000000000e+00
+1278 0.00000000000000e+00
+1279 0.00000000000000e+00
+1280 0.00000000000000e+00
+1281 0.00000000000000e+00
+1282 0.00000000000000e+00
+1283 0.00000000000000e+00
+1284 0.00000000000000e+00
+1285 0.00000000000000e+00
+1286 0.00000000000000e+00
+1287 0.00000000000000e+00
+1288 0.00000000000000e+00
+1289 0.00000000000000e+00
+1290 0.00000000000000e+00
+1291 0.00000000000000e+00
+1292 0.00000000000000e+00
+1293 0.00000000000000e+00
+1294 0.00000000000000e+00
+1295 0.00000000000000e+00
+1296 0.00000000000000e+00
+1297 0.00000000000000e+00
+1298 0.00000000000000e+00
+1299 0.00000000000000e+00
+1300 0.00000000000000e+00
+1301 0.00000000000000e+00
+1302 0.00000000000000e+00
+1303 0.00000000000000e+00
+1304 0.00000000000000e+00
+1305 0.00000000000000e+00
+1306 0.00000000000000e+00
+1307 0.00000000000000e+00
+1308 0.00000000000000e+00
+1309 0.00000000000000e+00
+1310 0.00000000000000e+00
+1311 0.00000000000000e+00
+1312 0.00000000000000e+00
+1313 0.00000000000000e+00
+1314 0.00000000000000e+00
+1315 0.00000000000000e+00
+1316 0.00000000000000e+00
+1317 0.00000000000000e+00
+1318 0.00000000000000e+00
+1319 0.00000000000000e+00
+1320 0.00000000000000e+00
+1321 0.00000000000000e+00
+1322 0.00000000000000e+00
+1323 0.00000000000000e+00
+1324 0.00000000000000e+00
+1325 0.00000000000000e+00
+1326 0.00000000000000e+00
+1327 0.00000000000000e+00
+1328 0.00000000000000e+00
+1329 0.00000000000000e+00
+1330 0.00000000000000e+00
+1331 0.00000000000000e+00
+1332 0.00000000000000e+00
+1333 0.00000000000000e+00
+1334 0.00000000000000e+00
+1335 0.00000000000000e+00
+1336 0.00000000000000e+00
+1337 0.00000000000000e+00
+1338 0.00000000000000e+00
+1339 0.00000000000000e+00
+1340 0.00000000000000e+00
+1341 0.00000000000000e+00
+1342 0.00000000000000e+00
+1343 0.00000000000000e+00
+1344 0.00000000000000e+00
+1345 0.00000000000000e+00
+1346 0.00000000000000e+00
+1347 0.00000000000000e+00
+1348 0.00000000000000e+00
+1349 0.00000000000000e+00
+1350 0.00000000000000e+00
+1351 0.00000000000000e+00
+1352 0.00000000000000e+00
+1353 0.00000000000000e+00
+1354 0.00000000000000e+00
+1355 0.00000000000000e+00
+1356 0.00000000000000e+00
+1357 0.00000000000000e+00
+1358 0.00000000000000e+00
+1359 0.00000000000000e+00
+1360 0.00000000000000e+00
+1361 0.00000000000000e+00
+1362 0.00000000000000e+00
+1363 0.00000000000000e+00
+1364 0.00000000000000e+00
+1365 0.00000000000000e+00
+1366 0.00000000000000e+00
+1367 0.00000000000000e+00
+1368 0.00000000000000e+00
+1369 0.00000000000000e+00
+1370 0.00000000000000e+00
+1371 0.00000000000000e+00
+1372 0.00000000000000e+00
+1373 0.00000000000000e+00
+1374 0.00000000000000e+00
+1375 0.00000000000000e+00
+1376 0.00000000000000e+00
+1377 0.00000000000000e+00
+1378 0.00000000000000e+00
+1379 0.00000000000000e+00
+1380 0.00000000000000e+00
+1381 0.00000000000000e+00
+1382 0.00000000000000e+00
+1383 0.00000000000000e+00
+1384 0.00000000000000e+00
+1385 0.00000000000000e+00
+1386 0.00000000000000e+00
+1387 0.00000000000000e+00
+1388 0.00000000000000e+00
+1389 0.00000000000000e+00
+1390 0.00000000000000e+00
+1391 0.00000000000000e+00
+1392 0.00000000000000e+00
+1393 0.00000000000000e+00
+1394 0.00000000000000e+00
+1395 0.00000000000000e+00
+1396 0.00000000000000e+00
+1397 0.00000000000000e+00
+1398 0.00000000000000e+00
+1399 0.00000000000000e+00
+1400 0.00000000000000e+00
+1401 0.00000000000000e+00
+1402 0.00000000000000e+00
+1403 0.00000000000000e+00
+1404 0.00000000000000e+00
+1405 0.00000000000000e+00
+1406 0.00000000000000e+00
+1407 0.00000000000000e+00
+1408 0.00000000000000e+00
+1409 0.00000000000000e+00
+1410 0.00000000000000e+00
+1411 0.00000000000000e+00
+1412 0.00000000000000e+00
+1413 0.00000000000000e+00
+1414 0.00000000000000e+00
+1415 0.00000000000000e+00
+1416 0.00000000000000e+00
+1417 0.00000000000000e+00
+1418 0.00000000000000e+00
+1419 0.00000000000000e+00
+1420 0.00000000000000e+00
+1421 0.00000000000000e+00
+1422 0.00000000000000e+00
+1423 0.00000000000000e+00
+1424 0.00000000000000e+00
+1425 0.00000000000000e+00
+1426 0.00000000000000e+00
+1427 0.00000000000000e+00
+1428 0.00000000000000e+00
+1429 0.00000000000000e+00
+1430 0.00000000000000e+00
+1431 0.00000000000000e+00
+1432 0.00000000000000e+00
+1433 0.00000000000000e+00
+1434 0.00000000000000e+00
+1435 0.00000000000000e+00
+1436 0.00000000000000e+00
+1437 0.00000000000000e+00
+1438 0.00000000000000e+00
+1439 0.00000000000000e+00
+1440 0.00000000000000e+00
+1441 0.00000000000000e+00
+1442 0.00000000000000e+00
+1443 0.00000000000000e+00
+1444 0.00000000000000e+00
+1445 0.00000000000000e+00
+1446 0.00000000000000e+00
+1447 0.00000000000000e+00
+1448 0.00000000000000e+00
+1449 0.00000000000000e+00
+1450 0.00000000000000e+00
+1451 0.00000000000000e+00
+1452 0.00000000000000e+00
+1453 0.00000000000000e+00
+1454 0.00000000000000e+00
+1455 0.00000000000000e+00
+1456 0.00000000000000e+00
+1457 0.00000000000000e+00
+1458 0.00000000000000e+00
+1459 0.00000000000000e+00
+1460 0.00000000000000e+00
+1461 0.00000000000000e+00
+1462 0.00000000000000e+00
+1463 0.00000000000000e+00
+1464 0.00000000000000e+00
+1465 0.00000000000000e+00
+1466 0.00000000000000e+00
+1467 0.00000000000000e+00
+1468 0.00000000000000e+00
+1469 0.00000000000000e+00
+1470 0.00000000000000e+00
+1471 0.00000000000000e+00
+1472 0.00000000000000e+00
+1473 0.00000000000000e+00
+1474 0.00000000000000e+00
+1475 0.00000000000000e+00
+1476 0.00000000000000e+00
+1477 0.00000000000000e+00
+1478 0.00000000000000e+00
+1479 0.00000000000000e+00
+1480 0.00000000000000e+00
+1481 0.00000000000000e+00
+1482 0.00000000000000e+00
+1483 0.00000000000000e+00
+1484 0.00000000000000e+00
+1485 0.00000000000000e+00
+1486 0.00000000000000e+00
+1487 0.00000000000000e+00
+1488 0.00000000000000e+00
+1489 0.00000000000000e+00
+1490 0.00000000000000e+00
+1491 0.00000000000000e+00
+1492 0.00000000000000e+00
+1493 0.00000000000000e+00
+1494 0.00000000000000e+00
+1495 0.00000000000000e+00
+1496 0.00000000000000e+00
+1497 0.00000000000000e+00
+1498 0.00000000000000e+00
+1499 0.00000000000000e+00
+1500 0.00000000000000e+00
+1501 0.00000000000000e+00
+1502 0.00000000000000e+00
+1503 0.00000000000000e+00
+1504 0.00000000000000e+00
+1505 0.00000000000000e+00
+1506 0.00000000000000e+00
+1507 0.00000000000000e+00
+1508 0.00000000000000e+00
+1509 0.00000000000000e+00
+1510 0.00000000000000e+00
+1511 0.00000000000000e+00
+1512 0.00000000000000e+00
+1513 0.00000000000000e+00
+1514 0.00000000000000e+00
+1515 0.00000000000000e+00
+1516 0.00000000000000e+00
+1517 0.00000000000000e+00
+1518 0.00000000000000e+00
+1519 0.00000000000000e+00
+1520 0.00000000000000e+00
+1521 0.00000000000000e+00
+1522 0.00000000000000e+00
+1523 0.00000000000000e+00
+1524 0.00000000000000e+00
+1525 0.00000000000000e+00
+1526 0.00000000000000e+00
+1527 0.00000000000000e+00
+1528 0.00000000000000e+00
+1529 0.00000000000000e+00
+1530 0.00000000000000e+00
+1531 0.00000000000000e+00
+1532 0.00000000000000e+00
+1533 0.00000000000000e+00
+1534 0.00000000000000e+00
+1535 0.00000000000000e+00
+1536 0.00000000000000e+00
+1537 0.00000000000000e+00
+1538 0.00000000000000e+00
+1539 0.00000000000000e+00
+1540 0.00000000000000e+00
+1541 0.00000000000000e+00
+1542 0.00000000000000e+00
+1543 0.00000000000000e+00
+1544 0.00000000000000e+00
+1545 0.00000000000000e+00
+1546 0.00000000000000e+00
+1547 0.00000000000000e+00
+1548 0.00000000000000e+00
+1549 0.00000000000000e+00
+1550 0.00000000000000e+00
+1551 0.00000000000000e+00
+1552 0.00000000000000e+00
+1553 0.00000000000000e+00
+1554 0.00000000000000e+00
+1555 0.00000000000000e+00
+1556 0.00000000000000e+00
+1557 0.00000000000000e+00
+1558 0.00000000000000e+00
+1559 0.00000000000000e+00
+1560 0.00000000000000e+00
+1561 0.00000000000000e+00
+1562 0.00000000000000e+00
+1563 0.00000000000000e+00
+1564 0.00000000000000e+00
+1565 0.00000000000000e+00
+1566 0.00000000000000e+00
+1567 0.00000000000000e+00
+1568 0.00000000000000e+00
+1569 0.00000000000000e+00
+1570 0.00000000000000e+00
+1571 0.00000000000000e+00
+1572 0.00000000000000e+00
+1573 0.00000000000000e+00
+1574 0.00000000000000e+00
+1575 0.00000000000000e+00
+1576 0.00000000000000e+00
+1577 0.00000000000000e+00
+1578 0.00000000000000e+00
+1579 0.00000000000000e+00
+1580 0.00000000000000e+00
+1581 0.00000000000000e+00
+1582 0.00000000000000e+00
+1583 0.00000000000000e+00
+1584 0.00000000000000e+00
+1585 0.00000000000000e+00
+1586 0.00000000000000e+00
+1587 0.00000000000000e+00
+1588 0.00000000000000e+00
+1589 0.00000000000000e+00
+1590 0.00000000000000e+00
+1591 0.00000000000000e+00
+1592 0.00000000000000e+00
+1593 0.00000000000000e+00
+1594 0.00000000000000e+00
+1595 0.00000000000000e+00
+1596 0.00000000000000e+00
+1597 0.00000000000000e+00
+1598 0.00000000000000e+00
+1599 0.00000000000000e+00
+1600 0.00000000000000e+00
+1601 0.00000000000000e+00
+1602 0.00000000000000e+00
+1603 0.00000000000000e+00
+1604 0.00000000000000e+00
+1605 0.00000000000000e+00
+1606 0.00000000000000e+00
+1607 0.00000000000000e+00
+1608 0.00000000000000e+00
+1609 0.00000000000000e+00
+1610 0.00000000000000e+00
+1611 0.00000000000000e+00
+1612 0.00000000000000e+00
+1613 0.00000000000000e+00
+1614 0.00000000000000e+00
+1615 0.00000000000000e+00
+1616 0.00000000000000e+00
+1617 0.00000000000000e+00
+1618 0.00000000000000e+00
+1619 0.00000000000000e+00
+1620 0.00000000000000e+00
+1621 0.00000000000000e+00
+1622 0.00000000000000e+00
+1623 0.00000000000000e+00
+1624 0.00000000000000e+00
+1625 0.00000000000000e+00
+1626 0.00000000000000e+00
+1627 0.00000000000000e+00
+1628 0.00000000000000e+00
+1629 0.00000000000000e+00
+1630 0.00000000000000e+00
+1631 0.00000000000000e+00
+1632 0.00000000000000e+00
+1633 0.00000000000000e+00
+1634 0.00000000000000e+00
+1635 0.00000000000000e+00
+1636 0.00000000000000e+00
+1637 0.00000000000000e+00
+1638 0.00000000000000e+00
+1639 0.00000000000000e+00
+1640 0.00000000000000e+00
+1641 0.00000000000000e+00
+1642 0.00000000000000e+00
+1643 0.00000000000000e+00
+1644 0.00000000000000e+00
+1645 0.00000000000000e+00
+1646 0.00000000000000e+00
+1647 0.00000000000000e+00
+1648 0.00000000000000e+00
+1649 0.00000000000000e+00
+1650 0.00000000000000e+00
+1651 0.00000000000000e+00
+1652 0.00000000000000e+00
+1653 0.00000000000000e+00
+1654 0.00000000000000e+00
+1655 0.00000000000000e+00
+1656 0.00000000000000e+00
+1657 0.00000000000000e+00
+1658 0.00000000000000e+00
+1659 0.00000000000000e+00
+1660 0.00000000000000e+00
+1661 0.00000000000000e+00
+1662 0.00000000000000e+00
+1663 0.00000000000000e+00
+1664 0.00000000000000e+00
+1665 0.00000000000000e+00
+1666 0.00000000000000e+00
+1667 0.00000000000000e+00
+1668 0.00000000000000e+00
+1669 0.00000000000000e+00
+1670 0.00000000000000e+00
+1671 0.00000000000000e+00
+1672 0.00000000000000e+00
+1673 0.00000000000000e+00
+1674 0.00000000000000e+00
+1675 0.00000000000000e+00
+1676 0.00000000000000e+00
+1677 0.00000000000000e+00
+1678 0.00000000000000e+00
+1679 0.00000000000000e+00
+1680 0.00000000000000e+00
+1681 0.00000000000000e+00
+1682 0.00000000000000e+00
+1683 0.00000000000000e+00
+1684 0.00000000000000e+00
+1685 0.00000000000000e+00
+1686 0.00000000000000e+00
+1687 0.00000000000000e+00
+1688 0.00000000000000e+00
+1689 0.00000000000000e+00
+1690 0.00000000000000e+00
+1691 0.00000000000000e+00
+1692 0.00000000000000e+00
+1693 0.00000000000000e+00
+1694 0.00000000000000e+00
+1695 0.00000000000000e+00
+1696 0.00000000000000e+00
+1697 0.00000000000000e+00
+1698 0.00000000000000e+00
+1699 0.00000000000000e+00
+1700 0.00000000000000e+00
+1701 0.00000000000000e+00
+1702 0.00000000000000e+00
+1703 0.00000000000000e+00
+1704 0.00000000000000e+00
+1705 0.00000000000000e+00
+1706 0.00000000000000e+00
+1707 0.00000000000000e+00
+1708 0.00000000000000e+00
+1709 0.00000000000000e+00
+1710 0.00000000000000e+00
+1711 0.00000000000000e+00
+1712 0.00000000000000e+00
+1713 0.00000000000000e+00
+1714 0.00000000000000e+00
+1715 0.00000000000000e+00
+1716 0.00000000000000e+00
+1717 0.00000000000000e+00
+1718 0.00000000000000e+00
+1719 0.00000000000000e+00
+1720 0.00000000000000e+00
+1721 0.00000000000000e+00
+1722 0.00000000000000e+00
+1723 0.00000000000000e+00
+1724 0.00000000000000e+00
+1725 0.00000000000000e+00
+1726 0.00000000000000e+00
+1727 0.00000000000000e+00
+1728 0.00000000000000e+00
+1729 0.00000000000000e+00
+1730 0.00000000000000e+00
+1731 0.00000000000000e+00
+1732 0.00000000000000e+00
+1733 0.00000000000000e+00
+1734 0.00000000000000e+00
+1735 0.00000000000000e+00
+1736 0.00000000000000e+00
+1737 0.00000000000000e+00
+1738 0.00000000000000e+00
+1739 0.00000000000000e+00
+1740 0.00000000000000e+00
+1741 0.00000000000000e+00
+1742 0.00000000000000e+00
+1743 0.00000000000000e+00
+1744 0.00000000000000e+00
+1745 0.00000000000000e+00
+1746 0.00000000000000e+00
+1747 0.00000000000000e+00
+1748 0.00000000000000e+00
+1749 0.00000000000000e+00
+1750 0.00000000000000e+00
+1751 0.00000000000000e+00
+1752 0.00000000000000e+00
+1753 0.00000000000000e+00
+1754 0.00000000000000e+00
+1755 0.00000000000000e+00
+1756 0.00000000000000e+00
+1757 0.00000000000000e+00
+1758 0.00000000000000e+00
+1759 0.00000000000000e+00
+1760 0.00000000000000e+00
+1761 0.00000000000000e+00
+1762 0.00000000000000e+00
+1763 0.00000000000000e+00
+1764 0.00000000000000e+00
+1765 0.00000000000000e+00
+1766 0.00000000000000e+00
+1767 0.00000000000000e+00
+1768 0.00000000000000e+00
+1769 0.00000000000000e+00
+1770 0.00000000000000e+00
+1771 0.00000000000000e+00
+1772 0.00000000000000e+00
+1773 0.00000000000000e+00
+1774 0.00000000000000e+00
+1775 0.00000000000000e+00
+1776 0.00000000000000e+00
+1777 0.00000000000000e+00
+1778 0.00000000000000e+00
+1779 0.00000000000000e+00
+1780 0.00000000000000e+00
+1781 0.00000000000000e+00
+1782 0.00000000000000e+00
+1783 0.00000000000000e+00
+1784 0.00000000000000e+00
+1785 0.00000000000000e+00
+1786 0.00000000000000e+00
+1787 0.00000000000000e+00
+1788 0.00000000000000e+00
+1789 0.00000000000000e+00
+1790 0.00000000000000e+00
+1791 0.00000000000000e+00
+1792 0.00000000000000e+00
+1793 0.00000000000000e+00
+1794 0.00000000000000e+00
+1795 0.00000000000000e+00
+1796 0.00000000000000e+00
+1797 0.00000000000000e+00
+1798 0.00000000000000e+00
+1799 0.00000000000000e+00
+1800 0.00000000000000e+00
+1801 0.00000000000000e+00
+1802 0.00000000000000e+00
+1803 0.00000000000000e+00
+1804 0.00000000000000e+00
+1805 0.00000000000000e+00
+1806 0.00000000000000e+00
+1807 0.00000000000000e+00
+1808 0.00000000000000e+00
+1809 0.00000000000000e+00
+1810 0.00000000000000e+00
+1811 0.00000000000000e+00
+1812 0.00000000000000e+00
+1813 0.00000000000000e+00
+1814 0.00000000000000e+00
+1815 0.00000000000000e+00
+1816 0.00000000000000e+00
+1817 0.00000000000000e+00
+1818 0.00000000000000e+00
+1819 0.00000000000000e+00
+1820 0.00000000000000e+00
+1821 0.00000000000000e+00
+1822 0.00000000000000e+00
+1823 0.00000000000000e+00
+1824 0.00000000000000e+00
+1825 0.00000000000000e+00
+1826 0.00000000000000e+00
+1827 0.00000000000000e+00
+1828 0.00000000000000e+00
+1829 0.00000000000000e+00
+1830 0.00000000000000e+00
+1831 0.00000000000000e+00
+1832 0.00000000000000e+00
+1833 0.00000000000000e+00
+1834 0.00000000000000e+00
+1835 0.00000000000000e+00
+1836 0.00000000000000e+00
+1837 0.00000000000000e+00
+1838 0.00000000000000e+00
+1839 0.00000000000000e+00
+1840 0.00000000000000e+00
+1841 0.00000000000000e+00
+1842 0.00000000000000e+00
+1843 0.00000000000000e+00
+1844 0.00000000000000e+00
+1845 0.00000000000000e+00
+1846 0.00000000000000e+00
+1847 0.00000000000000e+00
+1848 0.00000000000000e+00
+1849 0.00000000000000e+00
+1850 0.00000000000000e+00
+1851 0.00000000000000e+00
+1852 0.00000000000000e+00
+1853 0.00000000000000e+00
+1854 0.00000000000000e+00
+1855 0.00000000000000e+00
+1856 0.00000000000000e+00
+1857 0.00000000000000e+00
+1858 0.00000000000000e+00
+1859 0.00000000000000e+00
+1860 0.00000000000000e+00
+1861 0.00000000000000e+00
+1862 0.00000000000000e+00
+1863 0.00000000000000e+00
+1864 0.00000000000000e+00
+1865 0.00000000000000e+00
+1866 0.00000000000000e+00
+1867 0.00000000000000e+00
+1868 0.00000000000000e+00
+1869 0.00000000000000e+00
+1870 0.00000000000000e+00
+1871 0.00000000000000e+00
+1872 0.00000000000000e+00
+1873 0.00000000000000e+00
+1874 0.00000000000000e+00
diff --git a/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/b.IJ.00003 b/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/b.IJ.00003
new file mode 100644
index 00000000..7f5ab5cb
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/b.IJ.00003
@@ -0,0 +1,601 @@
+1875 2474
+1875 0.00000000000000e+00
+1876 0.00000000000000e+00
+1877 0.00000000000000e+00
+1878 0.00000000000000e+00
+1879 0.00000000000000e+00
+1880 0.00000000000000e+00
+1881 0.00000000000000e+00
+1882 0.00000000000000e+00
+1883 0.00000000000000e+00
+1884 0.00000000000000e+00
+1885 0.00000000000000e+00
+1886 0.00000000000000e+00
+1887 0.00000000000000e+00
+1888 0.00000000000000e+00
+1889 0.00000000000000e+00
+1890 0.00000000000000e+00
+1891 0.00000000000000e+00
+1892 0.00000000000000e+00
+1893 0.00000000000000e+00
+1894 0.00000000000000e+00
+1895 0.00000000000000e+00
+1896 0.00000000000000e+00
+1897 0.00000000000000e+00
+1898 0.00000000000000e+00
+1899 0.00000000000000e+00
+1900 0.00000000000000e+00
+1901 0.00000000000000e+00
+1902 0.00000000000000e+00
+1903 0.00000000000000e+00
+1904 0.00000000000000e+00
+1905 0.00000000000000e+00
+1906 0.00000000000000e+00
+1907 0.00000000000000e+00
+1908 0.00000000000000e+00
+1909 0.00000000000000e+00
+1910 0.00000000000000e+00
+1911 0.00000000000000e+00
+1912 0.00000000000000e+00
+1913 0.00000000000000e+00
+1914 0.00000000000000e+00
+1915 0.00000000000000e+00
+1916 0.00000000000000e+00
+1917 0.00000000000000e+00
+1918 0.00000000000000e+00
+1919 0.00000000000000e+00
+1920 0.00000000000000e+00
+1921 0.00000000000000e+00
+1922 0.00000000000000e+00
+1923 0.00000000000000e+00
+1924 0.00000000000000e+00
+1925 0.00000000000000e+00
+1926 0.00000000000000e+00
+1927 0.00000000000000e+00
+1928 0.00000000000000e+00
+1929 0.00000000000000e+00
+1930 0.00000000000000e+00
+1931 0.00000000000000e+00
+1932 0.00000000000000e+00
+1933 0.00000000000000e+00
+1934 0.00000000000000e+00
+1935 0.00000000000000e+00
+1936 0.00000000000000e+00
+1937 0.00000000000000e+00
+1938 0.00000000000000e+00
+1939 0.00000000000000e+00
+1940 0.00000000000000e+00
+1941 0.00000000000000e+00
+1942 0.00000000000000e+00
+1943 0.00000000000000e+00
+1944 0.00000000000000e+00
+1945 0.00000000000000e+00
+1946 0.00000000000000e+00
+1947 0.00000000000000e+00
+1948 0.00000000000000e+00
+1949 0.00000000000000e+00
+1950 0.00000000000000e+00
+1951 0.00000000000000e+00
+1952 0.00000000000000e+00
+1953 0.00000000000000e+00
+1954 0.00000000000000e+00
+1955 0.00000000000000e+00
+1956 0.00000000000000e+00
+1957 0.00000000000000e+00
+1958 0.00000000000000e+00
+1959 0.00000000000000e+00
+1960 0.00000000000000e+00
+1961 0.00000000000000e+00
+1962 0.00000000000000e+00
+1963 0.00000000000000e+00
+1964 0.00000000000000e+00
+1965 0.00000000000000e+00
+1966 0.00000000000000e+00
+1967 0.00000000000000e+00
+1968 0.00000000000000e+00
+1969 0.00000000000000e+00
+1970 0.00000000000000e+00
+1971 0.00000000000000e+00
+1972 0.00000000000000e+00
+1973 0.00000000000000e+00
+1974 0.00000000000000e+00
+1975 0.00000000000000e+00
+1976 0.00000000000000e+00
+1977 0.00000000000000e+00
+1978 0.00000000000000e+00
+1979 0.00000000000000e+00
+1980 0.00000000000000e+00
+1981 0.00000000000000e+00
+1982 0.00000000000000e+00
+1983 0.00000000000000e+00
+1984 0.00000000000000e+00
+1985 0.00000000000000e+00
+1986 0.00000000000000e+00
+1987 0.00000000000000e+00
+1988 0.00000000000000e+00
+1989 0.00000000000000e+00
+1990 0.00000000000000e+00
+1991 0.00000000000000e+00
+1992 0.00000000000000e+00
+1993 0.00000000000000e+00
+1994 0.00000000000000e+00
+1995 0.00000000000000e+00
+1996 0.00000000000000e+00
+1997 0.00000000000000e+00
+1998 0.00000000000000e+00
+1999 0.00000000000000e+00
+2000 0.00000000000000e+00
+2001 0.00000000000000e+00
+2002 0.00000000000000e+00
+2003 0.00000000000000e+00
+2004 0.00000000000000e+00
+2005 0.00000000000000e+00
+2006 0.00000000000000e+00
+2007 0.00000000000000e+00
+2008 0.00000000000000e+00
+2009 0.00000000000000e+00
+2010 0.00000000000000e+00
+2011 0.00000000000000e+00
+2012 0.00000000000000e+00
+2013 0.00000000000000e+00
+2014 0.00000000000000e+00
+2015 0.00000000000000e+00
+2016 0.00000000000000e+00
+2017 0.00000000000000e+00
+2018 0.00000000000000e+00
+2019 0.00000000000000e+00
+2020 0.00000000000000e+00
+2021 0.00000000000000e+00
+2022 0.00000000000000e+00
+2023 0.00000000000000e+00
+2024 0.00000000000000e+00
+2025 0.00000000000000e+00
+2026 0.00000000000000e+00
+2027 0.00000000000000e+00
+2028 0.00000000000000e+00
+2029 0.00000000000000e+00
+2030 0.00000000000000e+00
+2031 0.00000000000000e+00
+2032 0.00000000000000e+00
+2033 0.00000000000000e+00
+2034 0.00000000000000e+00
+2035 0.00000000000000e+00
+2036 0.00000000000000e+00
+2037 0.00000000000000e+00
+2038 0.00000000000000e+00
+2039 0.00000000000000e+00
+2040 0.00000000000000e+00
+2041 0.00000000000000e+00
+2042 0.00000000000000e+00
+2043 0.00000000000000e+00
+2044 0.00000000000000e+00
+2045 0.00000000000000e+00
+2046 0.00000000000000e+00
+2047 0.00000000000000e+00
+2048 0.00000000000000e+00
+2049 0.00000000000000e+00
+2050 0.00000000000000e+00
+2051 0.00000000000000e+00
+2052 0.00000000000000e+00
+2053 0.00000000000000e+00
+2054 0.00000000000000e+00
+2055 0.00000000000000e+00
+2056 0.00000000000000e+00
+2057 0.00000000000000e+00
+2058 0.00000000000000e+00
+2059 0.00000000000000e+00
+2060 0.00000000000000e+00
+2061 0.00000000000000e+00
+2062 0.00000000000000e+00
+2063 0.00000000000000e+00
+2064 0.00000000000000e+00
+2065 0.00000000000000e+00
+2066 0.00000000000000e+00
+2067 0.00000000000000e+00
+2068 0.00000000000000e+00
+2069 0.00000000000000e+00
+2070 0.00000000000000e+00
+2071 0.00000000000000e+00
+2072 0.00000000000000e+00
+2073 0.00000000000000e+00
+2074 0.00000000000000e+00
+2075 0.00000000000000e+00
+2076 0.00000000000000e+00
+2077 0.00000000000000e+00
+2078 0.00000000000000e+00
+2079 0.00000000000000e+00
+2080 0.00000000000000e+00
+2081 0.00000000000000e+00
+2082 0.00000000000000e+00
+2083 0.00000000000000e+00
+2084 0.00000000000000e+00
+2085 0.00000000000000e+00
+2086 0.00000000000000e+00
+2087 0.00000000000000e+00
+2088 0.00000000000000e+00
+2089 0.00000000000000e+00
+2090 0.00000000000000e+00
+2091 0.00000000000000e+00
+2092 0.00000000000000e+00
+2093 0.00000000000000e+00
+2094 0.00000000000000e+00
+2095 0.00000000000000e+00
+2096 0.00000000000000e+00
+2097 0.00000000000000e+00
+2098 0.00000000000000e+00
+2099 0.00000000000000e+00
+2100 0.00000000000000e+00
+2101 0.00000000000000e+00
+2102 0.00000000000000e+00
+2103 0.00000000000000e+00
+2104 0.00000000000000e+00
+2105 0.00000000000000e+00
+2106 0.00000000000000e+00
+2107 0.00000000000000e+00
+2108 0.00000000000000e+00
+2109 0.00000000000000e+00
+2110 0.00000000000000e+00
+2111 0.00000000000000e+00
+2112 0.00000000000000e+00
+2113 0.00000000000000e+00
+2114 0.00000000000000e+00
+2115 0.00000000000000e+00
+2116 0.00000000000000e+00
+2117 0.00000000000000e+00
+2118 0.00000000000000e+00
+2119 0.00000000000000e+00
+2120 0.00000000000000e+00
+2121 0.00000000000000e+00
+2122 0.00000000000000e+00
+2123 0.00000000000000e+00
+2124 0.00000000000000e+00
+2125 0.00000000000000e+00
+2126 0.00000000000000e+00
+2127 0.00000000000000e+00
+2128 0.00000000000000e+00
+2129 0.00000000000000e+00
+2130 0.00000000000000e+00
+2131 0.00000000000000e+00
+2132 0.00000000000000e+00
+2133 0.00000000000000e+00
+2134 0.00000000000000e+00
+2135 0.00000000000000e+00
+2136 0.00000000000000e+00
+2137 0.00000000000000e+00
+2138 0.00000000000000e+00
+2139 0.00000000000000e+00
+2140 0.00000000000000e+00
+2141 0.00000000000000e+00
+2142 0.00000000000000e+00
+2143 0.00000000000000e+00
+2144 0.00000000000000e+00
+2145 0.00000000000000e+00
+2146 0.00000000000000e+00
+2147 0.00000000000000e+00
+2148 0.00000000000000e+00
+2149 0.00000000000000e+00
+2150 0.00000000000000e+00
+2151 0.00000000000000e+00
+2152 0.00000000000000e+00
+2153 0.00000000000000e+00
+2154 0.00000000000000e+00
+2155 0.00000000000000e+00
+2156 0.00000000000000e+00
+2157 0.00000000000000e+00
+2158 0.00000000000000e+00
+2159 0.00000000000000e+00
+2160 0.00000000000000e+00
+2161 0.00000000000000e+00
+2162 0.00000000000000e+00
+2163 0.00000000000000e+00
+2164 0.00000000000000e+00
+2165 0.00000000000000e+00
+2166 0.00000000000000e+00
+2167 0.00000000000000e+00
+2168 0.00000000000000e+00
+2169 0.00000000000000e+00
+2170 0.00000000000000e+00
+2171 0.00000000000000e+00
+2172 0.00000000000000e+00
+2173 0.00000000000000e+00
+2174 0.00000000000000e+00
+2175 0.00000000000000e+00
+2176 0.00000000000000e+00
+2177 0.00000000000000e+00
+2178 0.00000000000000e+00
+2179 0.00000000000000e+00
+2180 0.00000000000000e+00
+2181 0.00000000000000e+00
+2182 0.00000000000000e+00
+2183 0.00000000000000e+00
+2184 0.00000000000000e+00
+2185 0.00000000000000e+00
+2186 0.00000000000000e+00
+2187 0.00000000000000e+00
+2188 0.00000000000000e+00
+2189 0.00000000000000e+00
+2190 0.00000000000000e+00
+2191 0.00000000000000e+00
+2192 0.00000000000000e+00
+2193 0.00000000000000e+00
+2194 0.00000000000000e+00
+2195 0.00000000000000e+00
+2196 0.00000000000000e+00
+2197 0.00000000000000e+00
+2198 0.00000000000000e+00
+2199 0.00000000000000e+00
+2200 0.00000000000000e+00
+2201 0.00000000000000e+00
+2202 0.00000000000000e+00
+2203 0.00000000000000e+00
+2204 0.00000000000000e+00
+2205 0.00000000000000e+00
+2206 0.00000000000000e+00
+2207 0.00000000000000e+00
+2208 0.00000000000000e+00
+2209 0.00000000000000e+00
+2210 0.00000000000000e+00
+2211 0.00000000000000e+00
+2212 0.00000000000000e+00
+2213 0.00000000000000e+00
+2214 0.00000000000000e+00
+2215 0.00000000000000e+00
+2216 0.00000000000000e+00
+2217 0.00000000000000e+00
+2218 0.00000000000000e+00
+2219 0.00000000000000e+00
+2220 0.00000000000000e+00
+2221 0.00000000000000e+00
+2222 0.00000000000000e+00
+2223 0.00000000000000e+00
+2224 0.00000000000000e+00
+2225 0.00000000000000e+00
+2226 0.00000000000000e+00
+2227 0.00000000000000e+00
+2228 0.00000000000000e+00
+2229 0.00000000000000e+00
+2230 0.00000000000000e+00
+2231 0.00000000000000e+00
+2232 0.00000000000000e+00
+2233 0.00000000000000e+00
+2234 0.00000000000000e+00
+2235 0.00000000000000e+00
+2236 0.00000000000000e+00
+2237 0.00000000000000e+00
+2238 0.00000000000000e+00
+2239 0.00000000000000e+00
+2240 0.00000000000000e+00
+2241 0.00000000000000e+00
+2242 0.00000000000000e+00
+2243 0.00000000000000e+00
+2244 0.00000000000000e+00
+2245 0.00000000000000e+00
+2246 0.00000000000000e+00
+2247 0.00000000000000e+00
+2248 0.00000000000000e+00
+2249 0.00000000000000e+00
+2250 0.00000000000000e+00
+2251 0.00000000000000e+00
+2252 0.00000000000000e+00
+2253 0.00000000000000e+00
+2254 0.00000000000000e+00
+2255 0.00000000000000e+00
+2256 0.00000000000000e+00
+2257 0.00000000000000e+00
+2258 0.00000000000000e+00
+2259 0.00000000000000e+00
+2260 0.00000000000000e+00
+2261 0.00000000000000e+00
+2262 0.00000000000000e+00
+2263 0.00000000000000e+00
+2264 0.00000000000000e+00
+2265 0.00000000000000e+00
+2266 0.00000000000000e+00
+2267 0.00000000000000e+00
+2268 0.00000000000000e+00
+2269 0.00000000000000e+00
+2270 0.00000000000000e+00
+2271 0.00000000000000e+00
+2272 0.00000000000000e+00
+2273 0.00000000000000e+00
+2274 0.00000000000000e+00
+2275 0.00000000000000e+00
+2276 0.00000000000000e+00
+2277 0.00000000000000e+00
+2278 0.00000000000000e+00
+2279 0.00000000000000e+00
+2280 0.00000000000000e+00
+2281 0.00000000000000e+00
+2282 0.00000000000000e+00
+2283 0.00000000000000e+00
+2284 0.00000000000000e+00
+2285 0.00000000000000e+00
+2286 0.00000000000000e+00
+2287 0.00000000000000e+00
+2288 0.00000000000000e+00
+2289 0.00000000000000e+00
+2290 0.00000000000000e+00
+2291 0.00000000000000e+00
+2292 0.00000000000000e+00
+2293 0.00000000000000e+00
+2294 0.00000000000000e+00
+2295 0.00000000000000e+00
+2296 0.00000000000000e+00
+2297 0.00000000000000e+00
+2298 0.00000000000000e+00
+2299 0.00000000000000e+00
+2300 0.00000000000000e+00
+2301 0.00000000000000e+00
+2302 0.00000000000000e+00
+2303 0.00000000000000e+00
+2304 0.00000000000000e+00
+2305 0.00000000000000e+00
+2306 0.00000000000000e+00
+2307 0.00000000000000e+00
+2308 0.00000000000000e+00
+2309 0.00000000000000e+00
+2310 0.00000000000000e+00
+2311 0.00000000000000e+00
+2312 0.00000000000000e+00
+2313 0.00000000000000e+00
+2314 0.00000000000000e+00
+2315 0.00000000000000e+00
+2316 0.00000000000000e+00
+2317 0.00000000000000e+00
+2318 0.00000000000000e+00
+2319 0.00000000000000e+00
+2320 0.00000000000000e+00
+2321 0.00000000000000e+00
+2322 0.00000000000000e+00
+2323 0.00000000000000e+00
+2324 0.00000000000000e+00
+2325 0.00000000000000e+00
+2326 0.00000000000000e+00
+2327 0.00000000000000e+00
+2328 0.00000000000000e+00
+2329 0.00000000000000e+00
+2330 0.00000000000000e+00
+2331 0.00000000000000e+00
+2332 0.00000000000000e+00
+2333 0.00000000000000e+00
+2334 0.00000000000000e+00
+2335 0.00000000000000e+00
+2336 0.00000000000000e+00
+2337 0.00000000000000e+00
+2338 0.00000000000000e+00
+2339 0.00000000000000e+00
+2340 0.00000000000000e+00
+2341 0.00000000000000e+00
+2342 0.00000000000000e+00
+2343 0.00000000000000e+00
+2344 0.00000000000000e+00
+2345 0.00000000000000e+00
+2346 0.00000000000000e+00
+2347 0.00000000000000e+00
+2348 0.00000000000000e+00
+2349 0.00000000000000e+00
+2350 0.00000000000000e+00
+2351 0.00000000000000e+00
+2352 0.00000000000000e+00
+2353 0.00000000000000e+00
+2354 0.00000000000000e+00
+2355 0.00000000000000e+00
+2356 0.00000000000000e+00
+2357 0.00000000000000e+00
+2358 0.00000000000000e+00
+2359 0.00000000000000e+00
+2360 0.00000000000000e+00
+2361 0.00000000000000e+00
+2362 0.00000000000000e+00
+2363 0.00000000000000e+00
+2364 0.00000000000000e+00
+2365 0.00000000000000e+00
+2366 0.00000000000000e+00
+2367 0.00000000000000e+00
+2368 0.00000000000000e+00
+2369 0.00000000000000e+00
+2370 0.00000000000000e+00
+2371 0.00000000000000e+00
+2372 0.00000000000000e+00
+2373 0.00000000000000e+00
+2374 0.00000000000000e+00
+2375 0.00000000000000e+00
+2376 0.00000000000000e+00
+2377 0.00000000000000e+00
+2378 0.00000000000000e+00
+2379 0.00000000000000e+00
+2380 0.00000000000000e+00
+2381 0.00000000000000e+00
+2382 0.00000000000000e+00
+2383 0.00000000000000e+00
+2384 0.00000000000000e+00
+2385 0.00000000000000e+00
+2386 0.00000000000000e+00
+2387 0.00000000000000e+00
+2388 0.00000000000000e+00
+2389 0.00000000000000e+00
+2390 0.00000000000000e+00
+2391 0.00000000000000e+00
+2392 0.00000000000000e+00
+2393 0.00000000000000e+00
+2394 0.00000000000000e+00
+2395 0.00000000000000e+00
+2396 0.00000000000000e+00
+2397 0.00000000000000e+00
+2398 0.00000000000000e+00
+2399 0.00000000000000e+00
+2400 0.00000000000000e+00
+2401 0.00000000000000e+00
+2402 0.00000000000000e+00
+2403 0.00000000000000e+00
+2404 0.00000000000000e+00
+2405 0.00000000000000e+00
+2406 0.00000000000000e+00
+2407 0.00000000000000e+00
+2408 0.00000000000000e+00
+2409 0.00000000000000e+00
+2410 0.00000000000000e+00
+2411 0.00000000000000e+00
+2412 0.00000000000000e+00
+2413 0.00000000000000e+00
+2414 0.00000000000000e+00
+2415 0.00000000000000e+00
+2416 0.00000000000000e+00
+2417 0.00000000000000e+00
+2418 0.00000000000000e+00
+2419 0.00000000000000e+00
+2420 0.00000000000000e+00
+2421 0.00000000000000e+00
+2422 0.00000000000000e+00
+2423 0.00000000000000e+00
+2424 0.00000000000000e+00
+2425 0.00000000000000e+00
+2426 0.00000000000000e+00
+2427 0.00000000000000e+00
+2428 0.00000000000000e+00
+2429 0.00000000000000e+00
+2430 0.00000000000000e+00
+2431 0.00000000000000e+00
+2432 0.00000000000000e+00
+2433 0.00000000000000e+00
+2434 0.00000000000000e+00
+2435 0.00000000000000e+00
+2436 0.00000000000000e+00
+2437 0.00000000000000e+00
+2438 0.00000000000000e+00
+2439 0.00000000000000e+00
+2440 0.00000000000000e+00
+2441 0.00000000000000e+00
+2442 0.00000000000000e+00
+2443 0.00000000000000e+00
+2444 0.00000000000000e+00
+2445 0.00000000000000e+00
+2446 0.00000000000000e+00
+2447 0.00000000000000e+00
+2448 0.00000000000000e+00
+2449 0.00000000000000e+00
+2450 0.00000000000000e+00
+2451 0.00000000000000e+00
+2452 0.00000000000000e+00
+2453 0.00000000000000e+00
+2454 0.00000000000000e+00
+2455 0.00000000000000e+00
+2456 0.00000000000000e+00
+2457 0.00000000000000e+00
+2458 0.00000000000000e+00
+2459 0.00000000000000e+00
+2460 0.00000000000000e+00
+2461 0.00000000000000e+00
+2462 0.00000000000000e+00
+2463 0.00000000000000e+00
+2464 0.00000000000000e+00
+2465 0.00000000000000e+00
+2466 0.00000000000000e+00
+2467 0.00000000000000e+00
+2468 0.00000000000000e+00
+2469 0.00000000000000e+00
+2470 0.00000000000000e+00
+2471 0.00000000000000e+00
+2472 0.00000000000000e+00
+2473 0.00000000000000e+00
+2474 0.00000000000000e+00
diff --git a/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/mfem.txt b/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/mfem.txt
new file mode 100644
index 00000000..317665f2
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/mfem.txt
@@ -0,0 +1,19 @@
+$ mpirun -np 4 ./ex2p -m ../beam-tet.mesh -sr 0 -sp 2 -no-vis
+
+Produced with mfem-4.4 (https://github.com/mfem/mfem/archive/refs/tags/v4.4.tar.gz)
+
+Options used:
+   --mesh ../beam-tet.mesh
+   --order 1
+   --serial_ref 0
+   --parallel_ref 2
+   --amg-for-systems
+   --no-static-condensation
+   --no-visualization
+   --by-vdim
+   --device cpu
+Device configuration: cpu
+Memory configuration: host-std
+Number of finite element unknowns: 2475
+Assembling: r.h.s. ... matrix ... done.
+Size of linear system: 2475
\ No newline at end of file
diff --git a/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/rbms.0.00000 b/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/rbms.0.00000
new file mode 100644
index 00000000..dc6a3cd9
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/rbms.0.00000
@@ -0,0 +1,676 @@
+0 675
+0 0.00000000000000e+00
+1 -4.00000000000000e+00
+2 0.00000000000000e+00
+3 0.00000000000000e+00
+4 -5.00000000000000e+00
+5 0.00000000000000e+00
+6 0.00000000000000e+00
+7 -6.00000000000000e+00
+8 0.00000000000000e+00
+9 1.00000000000000e+00
+10 -4.00000000000000e+00
+11 0.00000000000000e+00
+12 1.00000000000000e+00
+13 -5.00000000000000e+00
+14 0.00000000000000e+00
+15 1.00000000000000e+00
+16 -6.00000000000000e+00
+17 0.00000000000000e+00
+18 0.00000000000000e+00
+19 -4.00000000000000e+00
+20 0.00000000000000e+00
+21 0.00000000000000e+00
+22 -5.00000000000000e+00
+23 0.00000000000000e+00
+24 0.00000000000000e+00
+25 -6.00000000000000e+00
+26 0.00000000000000e+00
+27 1.00000000000000e+00
+28 -4.00000000000000e+00
+29 0.00000000000000e+00
+30 1.00000000000000e+00
+31 -5.00000000000000e+00
+32 0.00000000000000e+00
+33 1.00000000000000e+00
+34 -6.00000000000000e+00
+35 0.00000000000000e+00
+36 0.00000000000000e+00
+37 -4.50000000000000e+00
+38 0.00000000000000e+00
+39 5.00000000000000e-01
+40 -4.00000000000000e+00
+41 0.00000000000000e+00
+42 5.00000000000000e-01
+43 -4.50000000000000e+00
+44 0.00000000000000e+00
+45 0.00000000000000e+00
+46 -4.00000000000000e+00
+47 0.00000000000000e+00
+48 0.00000000000000e+00
+49 -4.50000000000000e+00
+50 0.00000000000000e+00
+51 5.00000000000000e-01
+52 -4.00000000000000e+00
+53 0.00000000000000e+00
+54 5.00000000000000e-01
+55 -4.50000000000000e+00
+56 0.00000000000000e+00
+57 0.00000000000000e+00
+58 -5.50000000000000e+00
+59 0.00000000000000e+00
+60 5.00000000000000e-01
+61 -5.00000000000000e+00
+62 0.00000000000000e+00
+63 5.00000000000000e-01
+64 -5.50000000000000e+00
+65 0.00000000000000e+00
+66 0.00000000000000e+00
+67 -5.00000000000000e+00
+68 0.00000000000000e+00
+69 0.00000000000000e+00
+70 -5.50000000000000e+00
+71 0.00000000000000e+00
+72 5.00000000000000e-01
+73 -5.00000000000000e+00
+74 0.00000000000000e+00
+75 5.00000000000000e-01
+76 -5.50000000000000e+00
+77 0.00000000000000e+00
+78 5.00000000000000e-01
+79 -6.00000000000000e+00
+80 0.00000000000000e+00
+81 0.00000000000000e+00
+82 -6.00000000000000e+00
+83 0.00000000000000e+00
+84 5.00000000000000e-01
+85 -6.00000000000000e+00
+86 0.00000000000000e+00
+87 1.00000000000000e+00
+88 -4.50000000000000e+00
+89 0.00000000000000e+00
+90 1.00000000000000e+00
+91 -4.00000000000000e+00
+92 0.00000000000000e+00
+93 1.00000000000000e+00
+94 -4.50000000000000e+00
+95 0.00000000000000e+00
+96 1.00000000000000e+00
+97 -5.50000000000000e+00
+98 0.00000000000000e+00
+99 1.00000000000000e+00
+100 -5.00000000000000e+00
+101 0.00000000000000e+00
+102 1.00000000000000e+00
+103 -5.50000000000000e+00
+104 0.00000000000000e+00
+105 1.00000000000000e+00
+106 -6.00000000000000e+00
+107 0.00000000000000e+00
+108 0.00000000000000e+00
+109 -4.50000000000000e+00
+110 0.00000000000000e+00
+111 5.00000000000000e-01
+112 -4.00000000000000e+00
+113 0.00000000000000e+00
+114 5.00000000000000e-01
+115 -4.50000000000000e+00
+116 0.00000000000000e+00
+117 0.00000000000000e+00
+118 -5.50000000000000e+00
+119 0.00000000000000e+00
+120 5.00000000000000e-01
+121 -5.00000000000000e+00
+122 0.00000000000000e+00
+123 5.00000000000000e-01
+124 -5.50000000000000e+00
+125 0.00000000000000e+00
+126 5.00000000000000e-01
+127 -6.00000000000000e+00
+128 0.00000000000000e+00
+129 1.00000000000000e+00
+130 -4.50000000000000e+00
+131 0.00000000000000e+00
+132 1.00000000000000e+00
+133 -5.50000000000000e+00
+134 0.00000000000000e+00
+135 0.00000000000000e+00
+136 -4.25000000000000e+00
+137 0.00000000000000e+00
+138 2.50000000000000e-01
+139 -4.00000000000000e+00
+140 0.00000000000000e+00
+141 2.50000000000000e-01
+142 -4.25000000000000e+00
+143 0.00000000000000e+00
+144 0.00000000000000e+00
+145 -4.00000000000000e+00
+146 0.00000000000000e+00
+147 0.00000000000000e+00
+148 -4.25000000000000e+00
+149 0.00000000000000e+00
+150 2.50000000000000e-01
+151 -4.00000000000000e+00
+152 0.00000000000000e+00
+153 2.50000000000000e-01
+154 -4.25000000000000e+00
+155 0.00000000000000e+00
+156 0.00000000000000e+00
+157 -4.75000000000000e+00
+158 0.00000000000000e+00
+159 0.00000000000000e+00
+160 -5.25000000000000e+00
+161 0.00000000000000e+00
+162 2.50000000000000e-01
+163 -5.00000000000000e+00
+164 0.00000000000000e+00
+165 2.50000000000000e-01
+166 -5.25000000000000e+00
+167 0.00000000000000e+00
+168 0.00000000000000e+00
+169 -5.00000000000000e+00
+170 0.00000000000000e+00
+171 0.00000000000000e+00
+172 -5.25000000000000e+00
+173 0.00000000000000e+00
+174 2.50000000000000e-01
+175 -5.00000000000000e+00
+176 0.00000000000000e+00
+177 2.50000000000000e-01
+178 -5.25000000000000e+00
+179 0.00000000000000e+00
+180 0.00000000000000e+00
+181 -5.75000000000000e+00
+182 0.00000000000000e+00
+183 2.50000000000000e-01
+184 -6.00000000000000e+00
+185 0.00000000000000e+00
+186 0.00000000000000e+00
+187 -6.00000000000000e+00
+188 0.00000000000000e+00
+189 2.50000000000000e-01
+190 -6.00000000000000e+00
+191 0.00000000000000e+00
+192 7.50000000000000e-01
+193 -4.00000000000000e+00
+194 0.00000000000000e+00
+195 1.00000000000000e+00
+196 -4.25000000000000e+00
+197 0.00000000000000e+00
+198 1.00000000000000e+00
+199 -4.00000000000000e+00
+200 0.00000000000000e+00
+201 1.00000000000000e+00
+202 -4.25000000000000e+00
+203 0.00000000000000e+00
+204 7.50000000000000e-01
+205 -4.75000000000000e+00
+206 0.00000000000000e+00
+207 7.50000000000000e-01
+208 -5.00000000000000e+00
+209 0.00000000000000e+00
+210 1.00000000000000e+00
+211 -4.75000000000000e+00
+212 0.00000000000000e+00
+213 1.00000000000000e+00
+214 -5.25000000000000e+00
+215 0.00000000000000e+00
+216 1.00000000000000e+00
+217 -5.00000000000000e+00
+218 0.00000000000000e+00
+219 1.00000000000000e+00
+220 -5.25000000000000e+00
+221 0.00000000000000e+00
+222 7.50000000000000e-01
+223 -5.75000000000000e+00
+224 0.00000000000000e+00
+225 7.50000000000000e-01
+226 -6.00000000000000e+00
+227 0.00000000000000e+00
+228 1.00000000000000e+00
+229 -5.75000000000000e+00
+230 0.00000000000000e+00
+231 1.00000000000000e+00
+232 -6.00000000000000e+00
+233 0.00000000000000e+00
+234 0.00000000000000e+00
+235 -4.00000000000000e+00
+236 0.00000000000000e+00
+237 0.00000000000000e+00
+238 -4.25000000000000e+00
+239 0.00000000000000e+00
+240 2.50000000000000e-01
+241 -4.00000000000000e+00
+242 0.00000000000000e+00
+243 2.50000000000000e-01
+244 -4.25000000000000e+00
+245 0.00000000000000e+00
+246 0.00000000000000e+00
+247 -4.75000000000000e+00
+248 0.00000000000000e+00
+249 0.00000000000000e+00
+250 -5.00000000000000e+00
+251 0.00000000000000e+00
+252 0.00000000000000e+00
+253 -4.75000000000000e+00
+254 0.00000000000000e+00
+255 0.00000000000000e+00
+256 -5.25000000000000e+00
+257 0.00000000000000e+00
+258 2.50000000000000e-01
+259 -5.00000000000000e+00
+260 0.00000000000000e+00
+261 2.50000000000000e-01
+262 -5.25000000000000e+00
+263 0.00000000000000e+00
+264 0.00000000000000e+00
+265 -5.75000000000000e+00
+266 0.00000000000000e+00
+267 0.00000000000000e+00
+268 -6.00000000000000e+00
+269 0.00000000000000e+00
+270 0.00000000000000e+00
+271 -5.75000000000000e+00
+272 0.00000000000000e+00
+273 2.50000000000000e-01
+274 -6.00000000000000e+00
+275 0.00000000000000e+00
+276 7.50000000000000e-01
+277 -4.00000000000000e+00
+278 0.00000000000000e+00
+279 1.00000000000000e+00
+280 -4.00000000000000e+00
+281 0.00000000000000e+00
+282 7.50000000000000e-01
+283 -4.00000000000000e+00
+284 0.00000000000000e+00
+285 1.00000000000000e+00
+286 -4.25000000000000e+00
+287 0.00000000000000e+00
+288 7.50000000000000e-01
+289 -4.75000000000000e+00
+290 0.00000000000000e+00
+291 7.50000000000000e-01
+292 -5.00000000000000e+00
+293 0.00000000000000e+00
+294 1.00000000000000e+00
+295 -4.75000000000000e+00
+296 0.00000000000000e+00
+297 1.00000000000000e+00
+298 -5.00000000000000e+00
+299 0.00000000000000e+00
+300 7.50000000000000e-01
+301 -4.75000000000000e+00
+302 0.00000000000000e+00
+303 7.50000000000000e-01
+304 -5.00000000000000e+00
+305 0.00000000000000e+00
+306 1.00000000000000e+00
+307 -4.75000000000000e+00
+308 0.00000000000000e+00
+309 1.00000000000000e+00
+310 -5.25000000000000e+00
+311 0.00000000000000e+00
+312 7.50000000000000e-01
+313 -5.75000000000000e+00
+314 0.00000000000000e+00
+315 7.50000000000000e-01
+316 -6.00000000000000e+00
+317 0.00000000000000e+00
+318 1.00000000000000e+00
+319 -5.75000000000000e+00
+320 0.00000000000000e+00
+321 1.00000000000000e+00
+322 -6.00000000000000e+00
+323 0.00000000000000e+00
+324 7.50000000000000e-01
+325 -5.75000000000000e+00
+326 0.00000000000000e+00
+327 7.50000000000000e-01
+328 -6.00000000000000e+00
+329 0.00000000000000e+00
+330 1.00000000000000e+00
+331 -5.75000000000000e+00
+332 0.00000000000000e+00
+333 2.50000000000000e-01
+334 -4.50000000000000e+00
+335 0.00000000000000e+00
+336 0.00000000000000e+00
+337 -4.50000000000000e+00
+338 0.00000000000000e+00
+339 2.50000000000000e-01
+340 -4.50000000000000e+00
+341 0.00000000000000e+00
+342 2.50000000000000e-01
+343 -4.75000000000000e+00
+344 0.00000000000000e+00
+345 0.00000000000000e+00
+346 -4.75000000000000e+00
+347 0.00000000000000e+00
+348 2.50000000000000e-01
+349 -4.75000000000000e+00
+350 0.00000000000000e+00
+351 5.00000000000000e-01
+352 -4.25000000000000e+00
+353 0.00000000000000e+00
+354 5.00000000000000e-01
+355 -4.00000000000000e+00
+356 0.00000000000000e+00
+357 5.00000000000000e-01
+358 -4.25000000000000e+00
+359 0.00000000000000e+00
+360 7.50000000000000e-01
+361 -4.25000000000000e+00
+362 0.00000000000000e+00
+363 7.50000000000000e-01
+364 -4.00000000000000e+00
+365 0.00000000000000e+00
+366 7.50000000000000e-01
+367 -4.25000000000000e+00
+368 0.00000000000000e+00
+369 5.00000000000000e-01
+370 -4.50000000000000e+00
+371 0.00000000000000e+00
+372 5.00000000000000e-01
+373 -4.75000000000000e+00
+374 0.00000000000000e+00
+375 5.00000000000000e-01
+376 -4.75000000000000e+00
+377 0.00000000000000e+00
+378 7.50000000000000e-01
+379 -4.50000000000000e+00
+380 0.00000000000000e+00
+381 7.50000000000000e-01
+382 -4.50000000000000e+00
+383 0.00000000000000e+00
+384 7.50000000000000e-01
+385 -4.75000000000000e+00
+386 0.00000000000000e+00
+387 0.00000000000000e+00
+388 -4.25000000000000e+00
+389 0.00000000000000e+00
+390 2.50000000000000e-01
+391 -4.00000000000000e+00
+392 0.00000000000000e+00
+393 2.50000000000000e-01
+394 -4.25000000000000e+00
+395 0.00000000000000e+00
+396 0.00000000000000e+00
+397 -4.25000000000000e+00
+398 0.00000000000000e+00
+399 2.50000000000000e-01
+400 -4.00000000000000e+00
+401 0.00000000000000e+00
+402 2.50000000000000e-01
+403 -4.25000000000000e+00
+404 0.00000000000000e+00
+405 2.50000000000000e-01
+406 -4.50000000000000e+00
+407 0.00000000000000e+00
+408 0.00000000000000e+00
+409 -4.75000000000000e+00
+410 0.00000000000000e+00
+411 2.50000000000000e-01
+412 -4.75000000000000e+00
+413 0.00000000000000e+00
+414 0.00000000000000e+00
+415 -4.50000000000000e+00
+416 0.00000000000000e+00
+417 2.50000000000000e-01
+418 -4.50000000000000e+00
+419 0.00000000000000e+00
+420 2.50000000000000e-01
+421 -4.75000000000000e+00
+422 0.00000000000000e+00
+423 5.00000000000000e-01
+424 -4.25000000000000e+00
+425 0.00000000000000e+00
+426 7.50000000000000e-01
+427 -4.00000000000000e+00
+428 0.00000000000000e+00
+429 7.50000000000000e-01
+430 -4.25000000000000e+00
+431 0.00000000000000e+00
+432 5.00000000000000e-01
+433 -4.00000000000000e+00
+434 0.00000000000000e+00
+435 5.00000000000000e-01
+436 -4.25000000000000e+00
+437 0.00000000000000e+00
+438 7.50000000000000e-01
+439 -4.25000000000000e+00
+440 0.00000000000000e+00
+441 5.00000000000000e-01
+442 -4.75000000000000e+00
+443 0.00000000000000e+00
+444 7.50000000000000e-01
+445 -4.50000000000000e+00
+446 0.00000000000000e+00
+447 7.50000000000000e-01
+448 -4.75000000000000e+00
+449 0.00000000000000e+00
+450 5.00000000000000e-01
+451 -4.50000000000000e+00
+452 0.00000000000000e+00
+453 5.00000000000000e-01
+454 -4.75000000000000e+00
+455 0.00000000000000e+00
+456 7.50000000000000e-01
+457 -4.50000000000000e+00
+458 0.00000000000000e+00
+459 2.50000000000000e-01
+460 -5.50000000000000e+00
+461 0.00000000000000e+00
+462 0.00000000000000e+00
+463 -5.50000000000000e+00
+464 0.00000000000000e+00
+465 2.50000000000000e-01
+466 -5.50000000000000e+00
+467 0.00000000000000e+00
+468 2.50000000000000e-01
+469 -5.75000000000000e+00
+470 0.00000000000000e+00
+471 0.00000000000000e+00
+472 -5.75000000000000e+00
+473 0.00000000000000e+00
+474 2.50000000000000e-01
+475 -5.75000000000000e+00
+476 0.00000000000000e+00
+477 5.00000000000000e-01
+478 -5.25000000000000e+00
+479 0.00000000000000e+00
+480 5.00000000000000e-01
+481 -5.00000000000000e+00
+482 0.00000000000000e+00
+483 5.00000000000000e-01
+484 -5.25000000000000e+00
+485 0.00000000000000e+00
+486 7.50000000000000e-01
+487 -5.25000000000000e+00
+488 0.00000000000000e+00
+489 7.50000000000000e-01
+490 -5.00000000000000e+00
+491 0.00000000000000e+00
+492 7.50000000000000e-01
+493 -5.25000000000000e+00
+494 0.00000000000000e+00
+495 5.00000000000000e-01
+496 -5.50000000000000e+00
+497 0.00000000000000e+00
+498 5.00000000000000e-01
+499 -5.75000000000000e+00
+500 0.00000000000000e+00
+501 5.00000000000000e-01
+502 -5.75000000000000e+00
+503 0.00000000000000e+00
+504 7.50000000000000e-01
+505 -5.50000000000000e+00
+506 0.00000000000000e+00
+507 7.50000000000000e-01
+508 -5.50000000000000e+00
+509 0.00000000000000e+00
+510 7.50000000000000e-01
+511 -5.75000000000000e+00
+512 0.00000000000000e+00
+513 0.00000000000000e+00
+514 -5.25000000000000e+00
+515 0.00000000000000e+00
+516 2.50000000000000e-01
+517 -5.00000000000000e+00
+518 0.00000000000000e+00
+519 2.50000000000000e-01
+520 -5.25000000000000e+00
+521 0.00000000000000e+00
+522 0.00000000000000e+00
+523 -5.25000000000000e+00
+524 0.00000000000000e+00
+525 2.50000000000000e-01
+526 -5.00000000000000e+00
+527 0.00000000000000e+00
+528 2.50000000000000e-01
+529 -5.25000000000000e+00
+530 0.00000000000000e+00
+531 2.50000000000000e-01
+532 -5.50000000000000e+00
+533 0.00000000000000e+00
+534 0.00000000000000e+00
+535 -5.75000000000000e+00
+536 0.00000000000000e+00
+537 2.50000000000000e-01
+538 -5.75000000000000e+00
+539 0.00000000000000e+00
+540 0.00000000000000e+00
+541 -5.50000000000000e+00
+542 0.00000000000000e+00
+543 2.50000000000000e-01
+544 -5.50000000000000e+00
+545 0.00000000000000e+00
+546 2.50000000000000e-01
+547 -5.75000000000000e+00
+548 0.00000000000000e+00
+549 5.00000000000000e-01
+550 -5.25000000000000e+00
+551 0.00000000000000e+00
+552 7.50000000000000e-01
+553 -5.00000000000000e+00
+554 0.00000000000000e+00
+555 7.50000000000000e-01
+556 -5.25000000000000e+00
+557 0.00000000000000e+00
+558 5.00000000000000e-01
+559 -5.00000000000000e+00
+560 0.00000000000000e+00
+561 5.00000000000000e-01
+562 -5.25000000000000e+00
+563 0.00000000000000e+00
+564 7.50000000000000e-01
+565 -5.25000000000000e+00
+566 0.00000000000000e+00
+567 5.00000000000000e-01
+568 -5.75000000000000e+00
+569 0.00000000000000e+00
+570 7.50000000000000e-01
+571 -5.50000000000000e+00
+572 0.00000000000000e+00
+573 7.50000000000000e-01
+574 -5.75000000000000e+00
+575 0.00000000000000e+00
+576 5.00000000000000e-01
+577 -5.50000000000000e+00
+578 0.00000000000000e+00
+579 5.00000000000000e-01
+580 -5.75000000000000e+00
+581 0.00000000000000e+00
+582 7.50000000000000e-01
+583 -5.50000000000000e+00
+584 0.00000000000000e+00
+585 5.00000000000000e-01
+586 -6.00000000000000e+00
+587 0.00000000000000e+00
+588 7.50000000000000e-01
+589 -6.00000000000000e+00
+590 0.00000000000000e+00
+591 2.50000000000000e-01
+592 -6.00000000000000e+00
+593 0.00000000000000e+00
+594 2.50000000000000e-01
+595 -6.00000000000000e+00
+596 0.00000000000000e+00
+597 7.50000000000000e-01
+598 -6.00000000000000e+00
+599 0.00000000000000e+00
+600 5.00000000000000e-01
+601 -6.00000000000000e+00
+602 0.00000000000000e+00
+603 1.00000000000000e+00
+604 -4.50000000000000e+00
+605 0.00000000000000e+00
+606 1.00000000000000e+00
+607 -4.75000000000000e+00
+608 0.00000000000000e+00
+609 1.00000000000000e+00
+610 -4.25000000000000e+00
+611 0.00000000000000e+00
+612 1.00000000000000e+00
+613 -4.25000000000000e+00
+614 0.00000000000000e+00
+615 1.00000000000000e+00
+616 -4.75000000000000e+00
+617 0.00000000000000e+00
+618 1.00000000000000e+00
+619 -4.50000000000000e+00
+620 0.00000000000000e+00
+621 1.00000000000000e+00
+622 -5.50000000000000e+00
+623 0.00000000000000e+00
+624 1.00000000000000e+00
+625 -5.75000000000000e+00
+626 0.00000000000000e+00
+627 1.00000000000000e+00
+628 -5.25000000000000e+00
+629 0.00000000000000e+00
+630 1.00000000000000e+00
+631 -5.25000000000000e+00
+632 0.00000000000000e+00
+633 1.00000000000000e+00
+634 -5.75000000000000e+00
+635 0.00000000000000e+00
+636 1.00000000000000e+00
+637 -5.50000000000000e+00
+638 0.00000000000000e+00
+639 2.50000000000000e-01
+640 -4.50000000000000e+00
+641 0.00000000000000e+00
+642 2.50000000000000e-01
+643 -4.75000000000000e+00
+644 0.00000000000000e+00
+645 5.00000000000000e-01
+646 -4.25000000000000e+00
+647 0.00000000000000e+00
+648 7.50000000000000e-01
+649 -4.25000000000000e+00
+650 0.00000000000000e+00
+651 5.00000000000000e-01
+652 -4.75000000000000e+00
+653 0.00000000000000e+00
+654 7.50000000000000e-01
+655 -4.50000000000000e+00
+656 0.00000000000000e+00
+657 2.50000000000000e-01
+658 -5.50000000000000e+00
+659 0.00000000000000e+00
+660 2.50000000000000e-01
+661 -5.75000000000000e+00
+662 0.00000000000000e+00
+663 5.00000000000000e-01
+664 -5.25000000000000e+00
+665 0.00000000000000e+00
+666 7.50000000000000e-01
+667 -5.25000000000000e+00
+668 0.00000000000000e+00
+669 5.00000000000000e-01
+670 -5.75000000000000e+00
+671 0.00000000000000e+00
+672 7.50000000000000e-01
+673 -5.50000000000000e+00
+674 0.00000000000000e+00
diff --git a/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/rbms.0.00001 b/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/rbms.0.00001
new file mode 100644
index 00000000..cf919916
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/rbms.0.00001
@@ -0,0 +1,601 @@
+675 1275
+675 0.00000000000000e+00
+676 -7.00000000000000e+00
+677 0.00000000000000e+00
+678 0.00000000000000e+00
+679 -8.00000000000000e+00
+680 0.00000000000000e+00
+681 1.00000000000000e+00
+682 -7.00000000000000e+00
+683 0.00000000000000e+00
+684 1.00000000000000e+00
+685 -8.00000000000000e+00
+686 0.00000000000000e+00
+687 0.00000000000000e+00
+688 -7.00000000000000e+00
+689 0.00000000000000e+00
+690 0.00000000000000e+00
+691 -8.00000000000000e+00
+692 0.00000000000000e+00
+693 1.00000000000000e+00
+694 -7.00000000000000e+00
+695 0.00000000000000e+00
+696 1.00000000000000e+00
+697 -8.00000000000000e+00
+698 0.00000000000000e+00
+699 0.00000000000000e+00
+700 -6.50000000000000e+00
+701 0.00000000000000e+00
+702 5.00000000000000e-01
+703 -6.50000000000000e+00
+704 0.00000000000000e+00
+705 0.00000000000000e+00
+706 -6.50000000000000e+00
+707 0.00000000000000e+00
+708 5.00000000000000e-01
+709 -6.50000000000000e+00
+710 0.00000000000000e+00
+711 0.00000000000000e+00
+712 -7.50000000000000e+00
+713 0.00000000000000e+00
+714 5.00000000000000e-01
+715 -7.00000000000000e+00
+716 0.00000000000000e+00
+717 5.00000000000000e-01
+718 -7.50000000000000e+00
+719 0.00000000000000e+00
+720 0.00000000000000e+00
+721 -7.00000000000000e+00
+722 0.00000000000000e+00
+723 0.00000000000000e+00
+724 -7.50000000000000e+00
+725 0.00000000000000e+00
+726 5.00000000000000e-01
+727 -7.00000000000000e+00
+728 0.00000000000000e+00
+729 5.00000000000000e-01
+730 -7.50000000000000e+00
+731 0.00000000000000e+00
+732 5.00000000000000e-01
+733 -8.00000000000000e+00
+734 0.00000000000000e+00
+735 0.00000000000000e+00
+736 -8.00000000000000e+00
+737 0.00000000000000e+00
+738 5.00000000000000e-01
+739 -8.00000000000000e+00
+740 0.00000000000000e+00
+741 1.00000000000000e+00
+742 -6.50000000000000e+00
+743 0.00000000000000e+00
+744 1.00000000000000e+00
+745 -6.50000000000000e+00
+746 0.00000000000000e+00
+747 1.00000000000000e+00
+748 -7.50000000000000e+00
+749 0.00000000000000e+00
+750 1.00000000000000e+00
+751 -7.00000000000000e+00
+752 0.00000000000000e+00
+753 1.00000000000000e+00
+754 -7.50000000000000e+00
+755 0.00000000000000e+00
+756 1.00000000000000e+00
+757 -8.00000000000000e+00
+758 0.00000000000000e+00
+759 0.00000000000000e+00
+760 -6.50000000000000e+00
+761 0.00000000000000e+00
+762 5.00000000000000e-01
+763 -6.50000000000000e+00
+764 0.00000000000000e+00
+765 0.00000000000000e+00
+766 -7.50000000000000e+00
+767 0.00000000000000e+00
+768 5.00000000000000e-01
+769 -7.00000000000000e+00
+770 0.00000000000000e+00
+771 5.00000000000000e-01
+772 -7.50000000000000e+00
+773 0.00000000000000e+00
+774 5.00000000000000e-01
+775 -8.00000000000000e+00
+776 0.00000000000000e+00
+777 1.00000000000000e+00
+778 -6.50000000000000e+00
+779 0.00000000000000e+00
+780 1.00000000000000e+00
+781 -7.50000000000000e+00
+782 0.00000000000000e+00
+783 0.00000000000000e+00
+784 -6.25000000000000e+00
+785 0.00000000000000e+00
+786 2.50000000000000e-01
+787 -6.25000000000000e+00
+788 0.00000000000000e+00
+789 0.00000000000000e+00
+790 -6.25000000000000e+00
+791 0.00000000000000e+00
+792 2.50000000000000e-01
+793 -6.25000000000000e+00
+794 0.00000000000000e+00
+795 0.00000000000000e+00
+796 -6.75000000000000e+00
+797 0.00000000000000e+00
+798 0.00000000000000e+00
+799 -7.25000000000000e+00
+800 0.00000000000000e+00
+801 2.50000000000000e-01
+802 -7.00000000000000e+00
+803 0.00000000000000e+00
+804 2.50000000000000e-01
+805 -7.25000000000000e+00
+806 0.00000000000000e+00
+807 0.00000000000000e+00
+808 -7.00000000000000e+00
+809 0.00000000000000e+00
+810 0.00000000000000e+00
+811 -7.25000000000000e+00
+812 0.00000000000000e+00
+813 2.50000000000000e-01
+814 -7.00000000000000e+00
+815 0.00000000000000e+00
+816 2.50000000000000e-01
+817 -7.25000000000000e+00
+818 0.00000000000000e+00
+819 0.00000000000000e+00
+820 -7.75000000000000e+00
+821 0.00000000000000e+00
+822 2.50000000000000e-01
+823 -8.00000000000000e+00
+824 0.00000000000000e+00
+825 0.00000000000000e+00
+826 -8.00000000000000e+00
+827 0.00000000000000e+00
+828 2.50000000000000e-01
+829 -8.00000000000000e+00
+830 0.00000000000000e+00
+831 1.00000000000000e+00
+832 -6.25000000000000e+00
+833 0.00000000000000e+00
+834 1.00000000000000e+00
+835 -6.25000000000000e+00
+836 0.00000000000000e+00
+837 7.50000000000000e-01
+838 -6.75000000000000e+00
+839 0.00000000000000e+00
+840 7.50000000000000e-01
+841 -7.00000000000000e+00
+842 0.00000000000000e+00
+843 1.00000000000000e+00
+844 -6.75000000000000e+00
+845 0.00000000000000e+00
+846 1.00000000000000e+00
+847 -7.25000000000000e+00
+848 0.00000000000000e+00
+849 1.00000000000000e+00
+850 -7.00000000000000e+00
+851 0.00000000000000e+00
+852 1.00000000000000e+00
+853 -7.25000000000000e+00
+854 0.00000000000000e+00
+855 7.50000000000000e-01
+856 -7.75000000000000e+00
+857 0.00000000000000e+00
+858 7.50000000000000e-01
+859 -8.00000000000000e+00
+860 0.00000000000000e+00
+861 1.00000000000000e+00
+862 -7.75000000000000e+00
+863 0.00000000000000e+00
+864 1.00000000000000e+00
+865 -8.00000000000000e+00
+866 0.00000000000000e+00
+867 0.00000000000000e+00
+868 -6.25000000000000e+00
+869 0.00000000000000e+00
+870 2.50000000000000e-01
+871 -6.25000000000000e+00
+872 0.00000000000000e+00
+873 0.00000000000000e+00
+874 -6.75000000000000e+00
+875 0.00000000000000e+00
+876 0.00000000000000e+00
+877 -7.00000000000000e+00
+878 0.00000000000000e+00
+879 0.00000000000000e+00
+880 -6.75000000000000e+00
+881 0.00000000000000e+00
+882 0.00000000000000e+00
+883 -7.25000000000000e+00
+884 0.00000000000000e+00
+885 2.50000000000000e-01
+886 -7.00000000000000e+00
+887 0.00000000000000e+00
+888 2.50000000000000e-01
+889 -7.25000000000000e+00
+890 0.00000000000000e+00
+891 0.00000000000000e+00
+892 -7.75000000000000e+00
+893 0.00000000000000e+00
+894 0.00000000000000e+00
+895 -8.00000000000000e+00
+896 0.00000000000000e+00
+897 0.00000000000000e+00
+898 -7.75000000000000e+00
+899 0.00000000000000e+00
+900 2.50000000000000e-01
+901 -8.00000000000000e+00
+902 0.00000000000000e+00
+903 1.00000000000000e+00
+904 -6.25000000000000e+00
+905 0.00000000000000e+00
+906 7.50000000000000e-01
+907 -6.75000000000000e+00
+908 0.00000000000000e+00
+909 7.50000000000000e-01
+910 -7.00000000000000e+00
+911 0.00000000000000e+00
+912 1.00000000000000e+00
+913 -6.75000000000000e+00
+914 0.00000000000000e+00
+915 1.00000000000000e+00
+916 -7.00000000000000e+00
+917 0.00000000000000e+00
+918 7.50000000000000e-01
+919 -6.75000000000000e+00
+920 0.00000000000000e+00
+921 7.50000000000000e-01
+922 -7.00000000000000e+00
+923 0.00000000000000e+00
+924 1.00000000000000e+00
+925 -6.75000000000000e+00
+926 0.00000000000000e+00
+927 1.00000000000000e+00
+928 -7.25000000000000e+00
+929 0.00000000000000e+00
+930 7.50000000000000e-01
+931 -7.75000000000000e+00
+932 0.00000000000000e+00
+933 7.50000000000000e-01
+934 -8.00000000000000e+00
+935 0.00000000000000e+00
+936 1.00000000000000e+00
+937 -7.75000000000000e+00
+938 0.00000000000000e+00
+939 1.00000000000000e+00
+940 -8.00000000000000e+00
+941 0.00000000000000e+00
+942 7.50000000000000e-01
+943 -7.75000000000000e+00
+944 0.00000000000000e+00
+945 7.50000000000000e-01
+946 -8.00000000000000e+00
+947 0.00000000000000e+00
+948 1.00000000000000e+00
+949 -7.75000000000000e+00
+950 0.00000000000000e+00
+951 2.50000000000000e-01
+952 -6.50000000000000e+00
+953 0.00000000000000e+00
+954 0.00000000000000e+00
+955 -6.50000000000000e+00
+956 0.00000000000000e+00
+957 2.50000000000000e-01
+958 -6.50000000000000e+00
+959 0.00000000000000e+00
+960 2.50000000000000e-01
+961 -6.75000000000000e+00
+962 0.00000000000000e+00
+963 0.00000000000000e+00
+964 -6.75000000000000e+00
+965 0.00000000000000e+00
+966 2.50000000000000e-01
+967 -6.75000000000000e+00
+968 0.00000000000000e+00
+969 5.00000000000000e-01
+970 -6.25000000000000e+00
+971 0.00000000000000e+00
+972 5.00000000000000e-01
+973 -6.25000000000000e+00
+974 0.00000000000000e+00
+975 7.50000000000000e-01
+976 -6.25000000000000e+00
+977 0.00000000000000e+00
+978 7.50000000000000e-01
+979 -6.25000000000000e+00
+980 0.00000000000000e+00
+981 5.00000000000000e-01
+982 -6.50000000000000e+00
+983 0.00000000000000e+00
+984 5.00000000000000e-01
+985 -6.75000000000000e+00
+986 0.00000000000000e+00
+987 5.00000000000000e-01
+988 -6.75000000000000e+00
+989 0.00000000000000e+00
+990 7.50000000000000e-01
+991 -6.50000000000000e+00
+992 0.00000000000000e+00
+993 7.50000000000000e-01
+994 -6.50000000000000e+00
+995 0.00000000000000e+00
+996 7.50000000000000e-01
+997 -6.75000000000000e+00
+998 0.00000000000000e+00
+999 0.00000000000000e+00
+1000 -6.25000000000000e+00
+1001 0.00000000000000e+00
+1002 2.50000000000000e-01
+1003 -6.25000000000000e+00
+1004 0.00000000000000e+00
+1005 0.00000000000000e+00
+1006 -6.25000000000000e+00
+1007 0.00000000000000e+00
+1008 2.50000000000000e-01
+1009 -6.25000000000000e+00
+1010 0.00000000000000e+00
+1011 2.50000000000000e-01
+1012 -6.50000000000000e+00
+1013 0.00000000000000e+00
+1014 0.00000000000000e+00
+1015 -6.75000000000000e+00
+1016 0.00000000000000e+00
+1017 2.50000000000000e-01
+1018 -6.75000000000000e+00
+1019 0.00000000000000e+00
+1020 0.00000000000000e+00
+1021 -6.50000000000000e+00
+1022 0.00000000000000e+00
+1023 2.50000000000000e-01
+1024 -6.50000000000000e+00
+1025 0.00000000000000e+00
+1026 2.50000000000000e-01
+1027 -6.75000000000000e+00
+1028 0.00000000000000e+00
+1029 5.00000000000000e-01
+1030 -6.25000000000000e+00
+1031 0.00000000000000e+00
+1032 7.50000000000000e-01
+1033 -6.25000000000000e+00
+1034 0.00000000000000e+00
+1035 5.00000000000000e-01
+1036 -6.25000000000000e+00
+1037 0.00000000000000e+00
+1038 7.50000000000000e-01
+1039 -6.25000000000000e+00
+1040 0.00000000000000e+00
+1041 5.00000000000000e-01
+1042 -6.75000000000000e+00
+1043 0.00000000000000e+00
+1044 7.50000000000000e-01
+1045 -6.50000000000000e+00
+1046 0.00000000000000e+00
+1047 7.50000000000000e-01
+1048 -6.75000000000000e+00
+1049 0.00000000000000e+00
+1050 5.00000000000000e-01
+1051 -6.50000000000000e+00
+1052 0.00000000000000e+00
+1053 5.00000000000000e-01
+1054 -6.75000000000000e+00
+1055 0.00000000000000e+00
+1056 7.50000000000000e-01
+1057 -6.50000000000000e+00
+1058 0.00000000000000e+00
+1059 2.50000000000000e-01
+1060 -7.50000000000000e+00
+1061 0.00000000000000e+00
+1062 0.00000000000000e+00
+1063 -7.50000000000000e+00
+1064 0.00000000000000e+00
+1065 2.50000000000000e-01
+1066 -7.50000000000000e+00
+1067 0.00000000000000e+00
+1068 2.50000000000000e-01
+1069 -7.75000000000000e+00
+1070 0.00000000000000e+00
+1071 0.00000000000000e+00
+1072 -7.75000000000000e+00
+1073 0.00000000000000e+00
+1074 2.50000000000000e-01
+1075 -7.75000000000000e+00
+1076 0.00000000000000e+00
+1077 5.00000000000000e-01
+1078 -7.25000000000000e+00
+1079 0.00000000000000e+00
+1080 5.00000000000000e-01
+1081 -7.00000000000000e+00
+1082 0.00000000000000e+00
+1083 5.00000000000000e-01
+1084 -7.25000000000000e+00
+1085 0.00000000000000e+00
+1086 7.50000000000000e-01
+1087 -7.25000000000000e+00
+1088 0.00000000000000e+00
+1089 7.50000000000000e-01
+1090 -7.00000000000000e+00
+1091 0.00000000000000e+00
+1092 7.50000000000000e-01
+1093 -7.25000000000000e+00
+1094 0.00000000000000e+00
+1095 5.00000000000000e-01
+1096 -7.50000000000000e+00
+1097 0.00000000000000e+00
+1098 5.00000000000000e-01
+1099 -7.75000000000000e+00
+1100 0.00000000000000e+00
+1101 5.00000000000000e-01
+1102 -7.75000000000000e+00
+1103 0.00000000000000e+00
+1104 7.50000000000000e-01
+1105 -7.50000000000000e+00
+1106 0.00000000000000e+00
+1107 7.50000000000000e-01
+1108 -7.50000000000000e+00
+1109 0.00000000000000e+00
+1110 7.50000000000000e-01
+1111 -7.75000000000000e+00
+1112 0.00000000000000e+00
+1113 0.00000000000000e+00
+1114 -7.25000000000000e+00
+1115 0.00000000000000e+00
+1116 2.50000000000000e-01
+1117 -7.00000000000000e+00
+1118 0.00000000000000e+00
+1119 2.50000000000000e-01
+1120 -7.25000000000000e+00
+1121 0.00000000000000e+00
+1122 0.00000000000000e+00
+1123 -7.25000000000000e+00
+1124 0.00000000000000e+00
+1125 2.50000000000000e-01
+1126 -7.00000000000000e+00
+1127 0.00000000000000e+00
+1128 2.50000000000000e-01
+1129 -7.25000000000000e+00
+1130 0.00000000000000e+00
+1131 2.50000000000000e-01
+1132 -7.50000000000000e+00
+1133 0.00000000000000e+00
+1134 0.00000000000000e+00
+1135 -7.75000000000000e+00
+1136 0.00000000000000e+00
+1137 2.50000000000000e-01
+1138 -7.75000000000000e+00
+1139 0.00000000000000e+00
+1140 0.00000000000000e+00
+1141 -7.50000000000000e+00
+1142 0.00000000000000e+00
+1143 2.50000000000000e-01
+1144 -7.50000000000000e+00
+1145 0.00000000000000e+00
+1146 2.50000000000000e-01
+1147 -7.75000000000000e+00
+1148 0.00000000000000e+00
+1149 5.00000000000000e-01
+1150 -7.25000000000000e+00
+1151 0.00000000000000e+00
+1152 7.50000000000000e-01
+1153 -7.00000000000000e+00
+1154 0.00000000000000e+00
+1155 7.50000000000000e-01
+1156 -7.25000000000000e+00
+1157 0.00000000000000e+00
+1158 5.00000000000000e-01
+1159 -7.00000000000000e+00
+1160 0.00000000000000e+00
+1161 5.00000000000000e-01
+1162 -7.25000000000000e+00
+1163 0.00000000000000e+00
+1164 7.50000000000000e-01
+1165 -7.25000000000000e+00
+1166 0.00000000000000e+00
+1167 5.00000000000000e-01
+1168 -7.75000000000000e+00
+1169 0.00000000000000e+00
+1170 7.50000000000000e-01
+1171 -7.50000000000000e+00
+1172 0.00000000000000e+00
+1173 7.50000000000000e-01
+1174 -7.75000000000000e+00
+1175 0.00000000000000e+00
+1176 5.00000000000000e-01
+1177 -7.50000000000000e+00
+1178 0.00000000000000e+00
+1179 5.00000000000000e-01
+1180 -7.75000000000000e+00
+1181 0.00000000000000e+00
+1182 7.50000000000000e-01
+1183 -7.50000000000000e+00
+1184 0.00000000000000e+00
+1185 5.00000000000000e-01
+1186 -8.00000000000000e+00
+1187 0.00000000000000e+00
+1188 7.50000000000000e-01
+1189 -8.00000000000000e+00
+1190 0.00000000000000e+00
+1191 2.50000000000000e-01
+1192 -8.00000000000000e+00
+1193 0.00000000000000e+00
+1194 2.50000000000000e-01
+1195 -8.00000000000000e+00
+1196 0.00000000000000e+00
+1197 7.50000000000000e-01
+1198 -8.00000000000000e+00
+1199 0.00000000000000e+00
+1200 5.00000000000000e-01
+1201 -8.00000000000000e+00
+1202 0.00000000000000e+00
+1203 1.00000000000000e+00
+1204 -6.50000000000000e+00
+1205 0.00000000000000e+00
+1206 1.00000000000000e+00
+1207 -6.75000000000000e+00
+1208 0.00000000000000e+00
+1209 1.00000000000000e+00
+1210 -6.25000000000000e+00
+1211 0.00000000000000e+00
+1212 1.00000000000000e+00
+1213 -6.25000000000000e+00
+1214 0.00000000000000e+00
+1215 1.00000000000000e+00
+1216 -6.75000000000000e+00
+1217 0.00000000000000e+00
+1218 1.00000000000000e+00
+1219 -6.50000000000000e+00
+1220 0.00000000000000e+00
+1221 1.00000000000000e+00
+1222 -7.50000000000000e+00
+1223 0.00000000000000e+00
+1224 1.00000000000000e+00
+1225 -7.75000000000000e+00
+1226 0.00000000000000e+00
+1227 1.00000000000000e+00
+1228 -7.25000000000000e+00
+1229 0.00000000000000e+00
+1230 1.00000000000000e+00
+1231 -7.25000000000000e+00
+1232 0.00000000000000e+00
+1233 1.00000000000000e+00
+1234 -7.75000000000000e+00
+1235 0.00000000000000e+00
+1236 1.00000000000000e+00
+1237 -7.50000000000000e+00
+1238 0.00000000000000e+00
+1239 2.50000000000000e-01
+1240 -6.50000000000000e+00
+1241 0.00000000000000e+00
+1242 2.50000000000000e-01
+1243 -6.75000000000000e+00
+1244 0.00000000000000e+00
+1245 5.00000000000000e-01
+1246 -6.25000000000000e+00
+1247 0.00000000000000e+00
+1248 7.50000000000000e-01
+1249 -6.25000000000000e+00
+1250 0.00000000000000e+00
+1251 5.00000000000000e-01
+1252 -6.75000000000000e+00
+1253 0.00000000000000e+00
+1254 7.50000000000000e-01
+1255 -6.50000000000000e+00
+1256 0.00000000000000e+00
+1257 2.50000000000000e-01
+1258 -7.50000000000000e+00
+1259 0.00000000000000e+00
+1260 2.50000000000000e-01
+1261 -7.75000000000000e+00
+1262 0.00000000000000e+00
+1263 5.00000000000000e-01
+1264 -7.25000000000000e+00
+1265 0.00000000000000e+00
+1266 7.50000000000000e-01
+1267 -7.25000000000000e+00
+1268 0.00000000000000e+00
+1269 5.00000000000000e-01
+1270 -7.75000000000000e+00
+1271 0.00000000000000e+00
+1272 7.50000000000000e-01
+1273 -7.50000000000000e+00
+1274 0.00000000000000e+00
diff --git a/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/rbms.0.00002 b/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/rbms.0.00002
new file mode 100644
index 00000000..03e6a0a5
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/rbms.0.00002
@@ -0,0 +1,601 @@
+1275 1875
+1275 0.00000000000000e+00
+1276 -2.00000000000000e+00
+1277 0.00000000000000e+00
+1278 0.00000000000000e+00
+1279 -3.00000000000000e+00
+1280 0.00000000000000e+00
+1281 1.00000000000000e+00
+1282 -2.00000000000000e+00
+1283 0.00000000000000e+00
+1284 1.00000000000000e+00
+1285 -3.00000000000000e+00
+1286 0.00000000000000e+00
+1287 0.00000000000000e+00
+1288 -2.00000000000000e+00
+1289 0.00000000000000e+00
+1290 0.00000000000000e+00
+1291 -3.00000000000000e+00
+1292 0.00000000000000e+00
+1293 1.00000000000000e+00
+1294 -2.00000000000000e+00
+1295 0.00000000000000e+00
+1296 1.00000000000000e+00
+1297 -3.00000000000000e+00
+1298 0.00000000000000e+00
+1299 0.00000000000000e+00
+1300 -2.50000000000000e+00
+1301 0.00000000000000e+00
+1302 5.00000000000000e-01
+1303 -2.00000000000000e+00
+1304 0.00000000000000e+00
+1305 5.00000000000000e-01
+1306 -2.50000000000000e+00
+1307 0.00000000000000e+00
+1308 0.00000000000000e+00
+1309 -2.00000000000000e+00
+1310 0.00000000000000e+00
+1311 0.00000000000000e+00
+1312 -2.50000000000000e+00
+1313 0.00000000000000e+00
+1314 5.00000000000000e-01
+1315 -2.00000000000000e+00
+1316 0.00000000000000e+00
+1317 5.00000000000000e-01
+1318 -2.50000000000000e+00
+1319 0.00000000000000e+00
+1320 0.00000000000000e+00
+1321 -3.50000000000000e+00
+1322 0.00000000000000e+00
+1323 5.00000000000000e-01
+1324 -3.00000000000000e+00
+1325 0.00000000000000e+00
+1326 5.00000000000000e-01
+1327 -3.50000000000000e+00
+1328 0.00000000000000e+00
+1329 0.00000000000000e+00
+1330 -3.00000000000000e+00
+1331 0.00000000000000e+00
+1332 0.00000000000000e+00
+1333 -3.50000000000000e+00
+1334 0.00000000000000e+00
+1335 5.00000000000000e-01
+1336 -3.00000000000000e+00
+1337 0.00000000000000e+00
+1338 5.00000000000000e-01
+1339 -3.50000000000000e+00
+1340 0.00000000000000e+00
+1341 1.00000000000000e+00
+1342 -2.50000000000000e+00
+1343 0.00000000000000e+00
+1344 1.00000000000000e+00
+1345 -2.00000000000000e+00
+1346 0.00000000000000e+00
+1347 1.00000000000000e+00
+1348 -2.50000000000000e+00
+1349 0.00000000000000e+00
+1350 1.00000000000000e+00
+1351 -3.50000000000000e+00
+1352 0.00000000000000e+00
+1353 1.00000000000000e+00
+1354 -3.00000000000000e+00
+1355 0.00000000000000e+00
+1356 1.00000000000000e+00
+1357 -3.50000000000000e+00
+1358 0.00000000000000e+00
+1359 0.00000000000000e+00
+1360 -2.50000000000000e+00
+1361 0.00000000000000e+00
+1362 5.00000000000000e-01
+1363 -2.00000000000000e+00
+1364 0.00000000000000e+00
+1365 5.00000000000000e-01
+1366 -2.50000000000000e+00
+1367 0.00000000000000e+00
+1368 0.00000000000000e+00
+1369 -3.50000000000000e+00
+1370 0.00000000000000e+00
+1371 5.00000000000000e-01
+1372 -3.00000000000000e+00
+1373 0.00000000000000e+00
+1374 5.00000000000000e-01
+1375 -3.50000000000000e+00
+1376 0.00000000000000e+00
+1377 1.00000000000000e+00
+1378 -2.50000000000000e+00
+1379 0.00000000000000e+00
+1380 1.00000000000000e+00
+1381 -3.50000000000000e+00
+1382 0.00000000000000e+00
+1383 0.00000000000000e+00
+1384 -2.25000000000000e+00
+1385 0.00000000000000e+00
+1386 2.50000000000000e-01
+1387 -2.00000000000000e+00
+1388 0.00000000000000e+00
+1389 2.50000000000000e-01
+1390 -2.25000000000000e+00
+1391 0.00000000000000e+00
+1392 0.00000000000000e+00
+1393 -2.00000000000000e+00
+1394 0.00000000000000e+00
+1395 0.00000000000000e+00
+1396 -2.25000000000000e+00
+1397 0.00000000000000e+00
+1398 2.50000000000000e-01
+1399 -2.00000000000000e+00
+1400 0.00000000000000e+00
+1401 2.50000000000000e-01
+1402 -2.25000000000000e+00
+1403 0.00000000000000e+00
+1404 0.00000000000000e+00
+1405 -2.75000000000000e+00
+1406 0.00000000000000e+00
+1407 0.00000000000000e+00
+1408 -3.25000000000000e+00
+1409 0.00000000000000e+00
+1410 2.50000000000000e-01
+1411 -3.00000000000000e+00
+1412 0.00000000000000e+00
+1413 2.50000000000000e-01
+1414 -3.25000000000000e+00
+1415 0.00000000000000e+00
+1416 0.00000000000000e+00
+1417 -3.00000000000000e+00
+1418 0.00000000000000e+00
+1419 0.00000000000000e+00
+1420 -3.25000000000000e+00
+1421 0.00000000000000e+00
+1422 2.50000000000000e-01
+1423 -3.00000000000000e+00
+1424 0.00000000000000e+00
+1425 2.50000000000000e-01
+1426 -3.25000000000000e+00
+1427 0.00000000000000e+00
+1428 0.00000000000000e+00
+1429 -3.75000000000000e+00
+1430 0.00000000000000e+00
+1431 7.50000000000000e-01
+1432 -2.00000000000000e+00
+1433 0.00000000000000e+00
+1434 1.00000000000000e+00
+1435 -2.25000000000000e+00
+1436 0.00000000000000e+00
+1437 1.00000000000000e+00
+1438 -2.00000000000000e+00
+1439 0.00000000000000e+00
+1440 1.00000000000000e+00
+1441 -2.25000000000000e+00
+1442 0.00000000000000e+00
+1443 7.50000000000000e-01
+1444 -2.75000000000000e+00
+1445 0.00000000000000e+00
+1446 7.50000000000000e-01
+1447 -3.00000000000000e+00
+1448 0.00000000000000e+00
+1449 1.00000000000000e+00
+1450 -2.75000000000000e+00
+1451 0.00000000000000e+00
+1452 1.00000000000000e+00
+1453 -3.25000000000000e+00
+1454 0.00000000000000e+00
+1455 1.00000000000000e+00
+1456 -3.00000000000000e+00
+1457 0.00000000000000e+00
+1458 1.00000000000000e+00
+1459 -3.25000000000000e+00
+1460 0.00000000000000e+00
+1461 7.50000000000000e-01
+1462 -3.75000000000000e+00
+1463 0.00000000000000e+00
+1464 1.00000000000000e+00
+1465 -3.75000000000000e+00
+1466 0.00000000000000e+00
+1467 0.00000000000000e+00
+1468 -2.00000000000000e+00
+1469 0.00000000000000e+00
+1470 0.00000000000000e+00
+1471 -2.25000000000000e+00
+1472 0.00000000000000e+00
+1473 2.50000000000000e-01
+1474 -2.00000000000000e+00
+1475 0.00000000000000e+00
+1476 2.50000000000000e-01
+1477 -2.25000000000000e+00
+1478 0.00000000000000e+00
+1479 0.00000000000000e+00
+1480 -2.75000000000000e+00
+1481 0.00000000000000e+00
+1482 0.00000000000000e+00
+1483 -3.00000000000000e+00
+1484 0.00000000000000e+00
+1485 0.00000000000000e+00
+1486 -2.75000000000000e+00
+1487 0.00000000000000e+00
+1488 0.00000000000000e+00
+1489 -3.25000000000000e+00
+1490 0.00000000000000e+00
+1491 2.50000000000000e-01
+1492 -3.00000000000000e+00
+1493 0.00000000000000e+00
+1494 2.50000000000000e-01
+1495 -3.25000000000000e+00
+1496 0.00000000000000e+00
+1497 0.00000000000000e+00
+1498 -3.75000000000000e+00
+1499 0.00000000000000e+00
+1500 0.00000000000000e+00
+1501 -3.75000000000000e+00
+1502 0.00000000000000e+00
+1503 7.50000000000000e-01
+1504 -2.00000000000000e+00
+1505 0.00000000000000e+00
+1506 1.00000000000000e+00
+1507 -2.00000000000000e+00
+1508 0.00000000000000e+00
+1509 7.50000000000000e-01
+1510 -2.00000000000000e+00
+1511 0.00000000000000e+00
+1512 1.00000000000000e+00
+1513 -2.25000000000000e+00
+1514 0.00000000000000e+00
+1515 7.50000000000000e-01
+1516 -2.75000000000000e+00
+1517 0.00000000000000e+00
+1518 7.50000000000000e-01
+1519 -3.00000000000000e+00
+1520 0.00000000000000e+00
+1521 1.00000000000000e+00
+1522 -2.75000000000000e+00
+1523 0.00000000000000e+00
+1524 1.00000000000000e+00
+1525 -3.00000000000000e+00
+1526 0.00000000000000e+00
+1527 7.50000000000000e-01
+1528 -2.75000000000000e+00
+1529 0.00000000000000e+00
+1530 7.50000000000000e-01
+1531 -3.00000000000000e+00
+1532 0.00000000000000e+00
+1533 1.00000000000000e+00
+1534 -2.75000000000000e+00
+1535 0.00000000000000e+00
+1536 1.00000000000000e+00
+1537 -3.25000000000000e+00
+1538 0.00000000000000e+00
+1539 7.50000000000000e-01
+1540 -3.75000000000000e+00
+1541 0.00000000000000e+00
+1542 1.00000000000000e+00
+1543 -3.75000000000000e+00
+1544 0.00000000000000e+00
+1545 7.50000000000000e-01
+1546 -3.75000000000000e+00
+1547 0.00000000000000e+00
+1548 1.00000000000000e+00
+1549 -3.75000000000000e+00
+1550 0.00000000000000e+00
+1551 2.50000000000000e-01
+1552 -2.50000000000000e+00
+1553 0.00000000000000e+00
+1554 0.00000000000000e+00
+1555 -2.50000000000000e+00
+1556 0.00000000000000e+00
+1557 2.50000000000000e-01
+1558 -2.50000000000000e+00
+1559 0.00000000000000e+00
+1560 2.50000000000000e-01
+1561 -2.75000000000000e+00
+1562 0.00000000000000e+00
+1563 0.00000000000000e+00
+1564 -2.75000000000000e+00
+1565 0.00000000000000e+00
+1566 2.50000000000000e-01
+1567 -2.75000000000000e+00
+1568 0.00000000000000e+00
+1569 5.00000000000000e-01
+1570 -2.25000000000000e+00
+1571 0.00000000000000e+00
+1572 5.00000000000000e-01
+1573 -2.00000000000000e+00
+1574 0.00000000000000e+00
+1575 5.00000000000000e-01
+1576 -2.25000000000000e+00
+1577 0.00000000000000e+00
+1578 7.50000000000000e-01
+1579 -2.25000000000000e+00
+1580 0.00000000000000e+00
+1581 7.50000000000000e-01
+1582 -2.00000000000000e+00
+1583 0.00000000000000e+00
+1584 7.50000000000000e-01
+1585 -2.25000000000000e+00
+1586 0.00000000000000e+00
+1587 5.00000000000000e-01
+1588 -2.50000000000000e+00
+1589 0.00000000000000e+00
+1590 5.00000000000000e-01
+1591 -2.75000000000000e+00
+1592 0.00000000000000e+00
+1593 5.00000000000000e-01
+1594 -2.75000000000000e+00
+1595 0.00000000000000e+00
+1596 7.50000000000000e-01
+1597 -2.50000000000000e+00
+1598 0.00000000000000e+00
+1599 7.50000000000000e-01
+1600 -2.50000000000000e+00
+1601 0.00000000000000e+00
+1602 7.50000000000000e-01
+1603 -2.75000000000000e+00
+1604 0.00000000000000e+00
+1605 0.00000000000000e+00
+1606 -2.25000000000000e+00
+1607 0.00000000000000e+00
+1608 2.50000000000000e-01
+1609 -2.00000000000000e+00
+1610 0.00000000000000e+00
+1611 2.50000000000000e-01
+1612 -2.25000000000000e+00
+1613 0.00000000000000e+00
+1614 0.00000000000000e+00
+1615 -2.25000000000000e+00
+1616 0.00000000000000e+00
+1617 2.50000000000000e-01
+1618 -2.00000000000000e+00
+1619 0.00000000000000e+00
+1620 2.50000000000000e-01
+1621 -2.25000000000000e+00
+1622 0.00000000000000e+00
+1623 2.50000000000000e-01
+1624 -2.50000000000000e+00
+1625 0.00000000000000e+00
+1626 0.00000000000000e+00
+1627 -2.75000000000000e+00
+1628 0.00000000000000e+00
+1629 2.50000000000000e-01
+1630 -2.75000000000000e+00
+1631 0.00000000000000e+00
+1632 0.00000000000000e+00
+1633 -2.50000000000000e+00
+1634 0.00000000000000e+00
+1635 2.50000000000000e-01
+1636 -2.50000000000000e+00
+1637 0.00000000000000e+00
+1638 2.50000000000000e-01
+1639 -2.75000000000000e+00
+1640 0.00000000000000e+00
+1641 5.00000000000000e-01
+1642 -2.25000000000000e+00
+1643 0.00000000000000e+00
+1644 7.50000000000000e-01
+1645 -2.00000000000000e+00
+1646 0.00000000000000e+00
+1647 7.50000000000000e-01
+1648 -2.25000000000000e+00
+1649 0.00000000000000e+00
+1650 5.00000000000000e-01
+1651 -2.00000000000000e+00
+1652 0.00000000000000e+00
+1653 5.00000000000000e-01
+1654 -2.25000000000000e+00
+1655 0.00000000000000e+00
+1656 7.50000000000000e-01
+1657 -2.25000000000000e+00
+1658 0.00000000000000e+00
+1659 5.00000000000000e-01
+1660 -2.75000000000000e+00
+1661 0.00000000000000e+00
+1662 7.50000000000000e-01
+1663 -2.50000000000000e+00
+1664 0.00000000000000e+00
+1665 7.50000000000000e-01
+1666 -2.75000000000000e+00
+1667 0.00000000000000e+00
+1668 5.00000000000000e-01
+1669 -2.50000000000000e+00
+1670 0.00000000000000e+00
+1671 5.00000000000000e-01
+1672 -2.75000000000000e+00
+1673 0.00000000000000e+00
+1674 7.50000000000000e-01
+1675 -2.50000000000000e+00
+1676 0.00000000000000e+00
+1677 2.50000000000000e-01
+1678 -3.50000000000000e+00
+1679 0.00000000000000e+00
+1680 0.00000000000000e+00
+1681 -3.50000000000000e+00
+1682 0.00000000000000e+00
+1683 2.50000000000000e-01
+1684 -3.50000000000000e+00
+1685 0.00000000000000e+00
+1686 2.50000000000000e-01
+1687 -3.75000000000000e+00
+1688 0.00000000000000e+00
+1689 0.00000000000000e+00
+1690 -3.75000000000000e+00
+1691 0.00000000000000e+00
+1692 2.50000000000000e-01
+1693 -3.75000000000000e+00
+1694 0.00000000000000e+00
+1695 5.00000000000000e-01
+1696 -3.25000000000000e+00
+1697 0.00000000000000e+00
+1698 5.00000000000000e-01
+1699 -3.00000000000000e+00
+1700 0.00000000000000e+00
+1701 5.00000000000000e-01
+1702 -3.25000000000000e+00
+1703 0.00000000000000e+00
+1704 7.50000000000000e-01
+1705 -3.25000000000000e+00
+1706 0.00000000000000e+00
+1707 7.50000000000000e-01
+1708 -3.00000000000000e+00
+1709 0.00000000000000e+00
+1710 7.50000000000000e-01
+1711 -3.25000000000000e+00
+1712 0.00000000000000e+00
+1713 5.00000000000000e-01
+1714 -3.50000000000000e+00
+1715 0.00000000000000e+00
+1716 5.00000000000000e-01
+1717 -3.75000000000000e+00
+1718 0.00000000000000e+00
+1719 5.00000000000000e-01
+1720 -3.75000000000000e+00
+1721 0.00000000000000e+00
+1722 7.50000000000000e-01
+1723 -3.50000000000000e+00
+1724 0.00000000000000e+00
+1725 7.50000000000000e-01
+1726 -3.50000000000000e+00
+1727 0.00000000000000e+00
+1728 7.50000000000000e-01
+1729 -3.75000000000000e+00
+1730 0.00000000000000e+00
+1731 0.00000000000000e+00
+1732 -3.25000000000000e+00
+1733 0.00000000000000e+00
+1734 2.50000000000000e-01
+1735 -3.00000000000000e+00
+1736 0.00000000000000e+00
+1737 2.50000000000000e-01
+1738 -3.25000000000000e+00
+1739 0.00000000000000e+00
+1740 0.00000000000000e+00
+1741 -3.25000000000000e+00
+1742 0.00000000000000e+00
+1743 2.50000000000000e-01
+1744 -3.00000000000000e+00
+1745 0.00000000000000e+00
+1746 2.50000000000000e-01
+1747 -3.25000000000000e+00
+1748 0.00000000000000e+00
+1749 2.50000000000000e-01
+1750 -3.50000000000000e+00
+1751 0.00000000000000e+00
+1752 0.00000000000000e+00
+1753 -3.75000000000000e+00
+1754 0.00000000000000e+00
+1755 2.50000000000000e-01
+1756 -3.75000000000000e+00
+1757 0.00000000000000e+00
+1758 0.00000000000000e+00
+1759 -3.50000000000000e+00
+1760 0.00000000000000e+00
+1761 2.50000000000000e-01
+1762 -3.50000000000000e+00
+1763 0.00000000000000e+00
+1764 2.50000000000000e-01
+1765 -3.75000000000000e+00
+1766 0.00000000000000e+00
+1767 5.00000000000000e-01
+1768 -3.25000000000000e+00
+1769 0.00000000000000e+00
+1770 7.50000000000000e-01
+1771 -3.00000000000000e+00
+1772 0.00000000000000e+00
+1773 7.50000000000000e-01
+1774 -3.25000000000000e+00
+1775 0.00000000000000e+00
+1776 5.00000000000000e-01
+1777 -3.00000000000000e+00
+1778 0.00000000000000e+00
+1779 5.00000000000000e-01
+1780 -3.25000000000000e+00
+1781 0.00000000000000e+00
+1782 7.50000000000000e-01
+1783 -3.25000000000000e+00
+1784 0.00000000000000e+00
+1785 5.00000000000000e-01
+1786 -3.75000000000000e+00
+1787 0.00000000000000e+00
+1788 7.50000000000000e-01
+1789 -3.50000000000000e+00
+1790 0.00000000000000e+00
+1791 7.50000000000000e-01
+1792 -3.75000000000000e+00
+1793 0.00000000000000e+00
+1794 5.00000000000000e-01
+1795 -3.50000000000000e+00
+1796 0.00000000000000e+00
+1797 5.00000000000000e-01
+1798 -3.75000000000000e+00
+1799 0.00000000000000e+00
+1800 7.50000000000000e-01
+1801 -3.50000000000000e+00
+1802 0.00000000000000e+00
+1803 1.00000000000000e+00
+1804 -2.50000000000000e+00
+1805 0.00000000000000e+00
+1806 1.00000000000000e+00
+1807 -2.75000000000000e+00
+1808 0.00000000000000e+00
+1809 1.00000000000000e+00
+1810 -2.25000000000000e+00
+1811 0.00000000000000e+00
+1812 1.00000000000000e+00
+1813 -2.25000000000000e+00
+1814 0.00000000000000e+00
+1815 1.00000000000000e+00
+1816 -2.75000000000000e+00
+1817 0.00000000000000e+00
+1818 1.00000000000000e+00
+1819 -2.50000000000000e+00
+1820 0.00000000000000e+00
+1821 1.00000000000000e+00
+1822 -3.50000000000000e+00
+1823 0.00000000000000e+00
+1824 1.00000000000000e+00
+1825 -3.75000000000000e+00
+1826 0.00000000000000e+00
+1827 1.00000000000000e+00
+1828 -3.25000000000000e+00
+1829 0.00000000000000e+00
+1830 1.00000000000000e+00
+1831 -3.25000000000000e+00
+1832 0.00000000000000e+00
+1833 1.00000000000000e+00
+1834 -3.75000000000000e+00
+1835 0.00000000000000e+00
+1836 1.00000000000000e+00
+1837 -3.50000000000000e+00
+1838 0.00000000000000e+00
+1839 2.50000000000000e-01
+1840 -2.50000000000000e+00
+1841 0.00000000000000e+00
+1842 2.50000000000000e-01
+1843 -2.75000000000000e+00
+1844 0.00000000000000e+00
+1845 5.00000000000000e-01
+1846 -2.25000000000000e+00
+1847 0.00000000000000e+00
+1848 7.50000000000000e-01
+1849 -2.25000000000000e+00
+1850 0.00000000000000e+00
+1851 5.00000000000000e-01
+1852 -2.75000000000000e+00
+1853 0.00000000000000e+00
+1854 7.50000000000000e-01
+1855 -2.50000000000000e+00
+1856 0.00000000000000e+00
+1857 2.50000000000000e-01
+1858 -3.50000000000000e+00
+1859 0.00000000000000e+00
+1860 2.50000000000000e-01
+1861 -3.75000000000000e+00
+1862 0.00000000000000e+00
+1863 5.00000000000000e-01
+1864 -3.25000000000000e+00
+1865 0.00000000000000e+00
+1866 7.50000000000000e-01
+1867 -3.25000000000000e+00
+1868 0.00000000000000e+00
+1869 5.00000000000000e-01
+1870 -3.75000000000000e+00
+1871 0.00000000000000e+00
+1872 7.50000000000000e-01
+1873 -3.50000000000000e+00
+1874 0.00000000000000e+00
diff --git a/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/rbms.0.00003 b/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/rbms.0.00003
new file mode 100644
index 00000000..295fa5b2
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/rbms.0.00003
@@ -0,0 +1,601 @@
+1875 2475
+1875 0.00000000000000e+00
+1876 0.00000000000000e+00
+1877 0.00000000000000e+00
+1878 0.00000000000000e+00
+1879 -1.00000000000000e+00
+1880 0.00000000000000e+00
+1881 1.00000000000000e+00
+1882 0.00000000000000e+00
+1883 0.00000000000000e+00
+1884 1.00000000000000e+00
+1885 -1.00000000000000e+00
+1886 0.00000000000000e+00
+1887 0.00000000000000e+00
+1888 0.00000000000000e+00
+1889 0.00000000000000e+00
+1890 0.00000000000000e+00
+1891 -1.00000000000000e+00
+1892 0.00000000000000e+00
+1893 1.00000000000000e+00
+1894 0.00000000000000e+00
+1895 0.00000000000000e+00
+1896 1.00000000000000e+00
+1897 -1.00000000000000e+00
+1898 0.00000000000000e+00
+1899 0.00000000000000e+00
+1900 -5.00000000000000e-01
+1901 0.00000000000000e+00
+1902 5.00000000000000e-01
+1903 0.00000000000000e+00
+1904 0.00000000000000e+00
+1905 5.00000000000000e-01
+1906 -5.00000000000000e-01
+1907 0.00000000000000e+00
+1908 0.00000000000000e+00
+1909 0.00000000000000e+00
+1910 0.00000000000000e+00
+1911 0.00000000000000e+00
+1912 -5.00000000000000e-01
+1913 0.00000000000000e+00
+1914 5.00000000000000e-01
+1915 0.00000000000000e+00
+1916 0.00000000000000e+00
+1917 5.00000000000000e-01
+1918 -5.00000000000000e-01
+1919 0.00000000000000e+00
+1920 0.00000000000000e+00
+1921 -1.50000000000000e+00
+1922 0.00000000000000e+00
+1923 5.00000000000000e-01
+1924 -1.00000000000000e+00
+1925 0.00000000000000e+00
+1926 5.00000000000000e-01
+1927 -1.50000000000000e+00
+1928 0.00000000000000e+00
+1929 0.00000000000000e+00
+1930 -1.00000000000000e+00
+1931 0.00000000000000e+00
+1932 0.00000000000000e+00
+1933 -1.50000000000000e+00
+1934 0.00000000000000e+00
+1935 5.00000000000000e-01
+1936 -1.00000000000000e+00
+1937 0.00000000000000e+00
+1938 5.00000000000000e-01
+1939 -1.50000000000000e+00
+1940 0.00000000000000e+00
+1941 1.00000000000000e+00
+1942 -5.00000000000000e-01
+1943 0.00000000000000e+00
+1944 1.00000000000000e+00
+1945 0.00000000000000e+00
+1946 0.00000000000000e+00
+1947 1.00000000000000e+00
+1948 -5.00000000000000e-01
+1949 0.00000000000000e+00
+1950 1.00000000000000e+00
+1951 -1.50000000000000e+00
+1952 0.00000000000000e+00
+1953 1.00000000000000e+00
+1954 -1.00000000000000e+00
+1955 0.00000000000000e+00
+1956 1.00000000000000e+00
+1957 -1.50000000000000e+00
+1958 0.00000000000000e+00
+1959 0.00000000000000e+00
+1960 -5.00000000000000e-01
+1961 0.00000000000000e+00
+1962 5.00000000000000e-01
+1963 0.00000000000000e+00
+1964 0.00000000000000e+00
+1965 5.00000000000000e-01
+1966 -5.00000000000000e-01
+1967 0.00000000000000e+00
+1968 0.00000000000000e+00
+1969 -1.50000000000000e+00
+1970 0.00000000000000e+00
+1971 5.00000000000000e-01
+1972 -1.00000000000000e+00
+1973 0.00000000000000e+00
+1974 5.00000000000000e-01
+1975 -1.50000000000000e+00
+1976 0.00000000000000e+00
+1977 1.00000000000000e+00
+1978 -5.00000000000000e-01
+1979 0.00000000000000e+00
+1980 1.00000000000000e+00
+1981 -1.50000000000000e+00
+1982 0.00000000000000e+00
+1983 0.00000000000000e+00
+1984 -2.50000000000000e-01
+1985 0.00000000000000e+00
+1986 2.50000000000000e-01
+1987 0.00000000000000e+00
+1988 0.00000000000000e+00
+1989 2.50000000000000e-01
+1990 -2.50000000000000e-01
+1991 0.00000000000000e+00
+1992 0.00000000000000e+00
+1993 0.00000000000000e+00
+1994 0.00000000000000e+00
+1995 0.00000000000000e+00
+1996 -2.50000000000000e-01
+1997 0.00000000000000e+00
+1998 2.50000000000000e-01
+1999 0.00000000000000e+00
+2000 0.00000000000000e+00
+2001 2.50000000000000e-01
+2002 -2.50000000000000e-01
+2003 0.00000000000000e+00
+2004 0.00000000000000e+00
+2005 -7.50000000000000e-01
+2006 0.00000000000000e+00
+2007 0.00000000000000e+00
+2008 -1.25000000000000e+00
+2009 0.00000000000000e+00
+2010 2.50000000000000e-01
+2011 -1.00000000000000e+00
+2012 0.00000000000000e+00
+2013 2.50000000000000e-01
+2014 -1.25000000000000e+00
+2015 0.00000000000000e+00
+2016 0.00000000000000e+00
+2017 -1.00000000000000e+00
+2018 0.00000000000000e+00
+2019 0.00000000000000e+00
+2020 -1.25000000000000e+00
+2021 0.00000000000000e+00
+2022 2.50000000000000e-01
+2023 -1.00000000000000e+00
+2024 0.00000000000000e+00
+2025 2.50000000000000e-01
+2026 -1.25000000000000e+00
+2027 0.00000000000000e+00
+2028 0.00000000000000e+00
+2029 -1.75000000000000e+00
+2030 0.00000000000000e+00
+2031 7.50000000000000e-01
+2032 0.00000000000000e+00
+2033 0.00000000000000e+00
+2034 1.00000000000000e+00
+2035 -2.50000000000000e-01
+2036 0.00000000000000e+00
+2037 1.00000000000000e+00
+2038 0.00000000000000e+00
+2039 0.00000000000000e+00
+2040 1.00000000000000e+00
+2041 -2.50000000000000e-01
+2042 0.00000000000000e+00
+2043 7.50000000000000e-01
+2044 -7.50000000000000e-01
+2045 0.00000000000000e+00
+2046 7.50000000000000e-01
+2047 -1.00000000000000e+00
+2048 0.00000000000000e+00
+2049 1.00000000000000e+00
+2050 -7.50000000000000e-01
+2051 0.00000000000000e+00
+2052 1.00000000000000e+00
+2053 -1.25000000000000e+00
+2054 0.00000000000000e+00
+2055 1.00000000000000e+00
+2056 -1.00000000000000e+00
+2057 0.00000000000000e+00
+2058 1.00000000000000e+00
+2059 -1.25000000000000e+00
+2060 0.00000000000000e+00
+2061 7.50000000000000e-01
+2062 -1.75000000000000e+00
+2063 0.00000000000000e+00
+2064 1.00000000000000e+00
+2065 -1.75000000000000e+00
+2066 0.00000000000000e+00
+2067 0.00000000000000e+00
+2068 0.00000000000000e+00
+2069 0.00000000000000e+00
+2070 0.00000000000000e+00
+2071 -2.50000000000000e-01
+2072 0.00000000000000e+00
+2073 2.50000000000000e-01
+2074 0.00000000000000e+00
+2075 0.00000000000000e+00
+2076 2.50000000000000e-01
+2077 -2.50000000000000e-01
+2078 0.00000000000000e+00
+2079 0.00000000000000e+00
+2080 -7.50000000000000e-01
+2081 0.00000000000000e+00
+2082 0.00000000000000e+00
+2083 -1.00000000000000e+00
+2084 0.00000000000000e+00
+2085 0.00000000000000e+00
+2086 -7.50000000000000e-01
+2087 0.00000000000000e+00
+2088 0.00000000000000e+00
+2089 -1.25000000000000e+00
+2090 0.00000000000000e+00
+2091 2.50000000000000e-01
+2092 -1.00000000000000e+00
+2093 0.00000000000000e+00
+2094 2.50000000000000e-01
+2095 -1.25000000000000e+00
+2096 0.00000000000000e+00
+2097 0.00000000000000e+00
+2098 -1.75000000000000e+00
+2099 0.00000000000000e+00
+2100 0.00000000000000e+00
+2101 -1.75000000000000e+00
+2102 0.00000000000000e+00
+2103 7.50000000000000e-01
+2104 0.00000000000000e+00
+2105 0.00000000000000e+00
+2106 1.00000000000000e+00
+2107 0.00000000000000e+00
+2108 0.00000000000000e+00
+2109 7.50000000000000e-01
+2110 0.00000000000000e+00
+2111 0.00000000000000e+00
+2112 1.00000000000000e+00
+2113 -2.50000000000000e-01
+2114 0.00000000000000e+00
+2115 7.50000000000000e-01
+2116 -7.50000000000000e-01
+2117 0.00000000000000e+00
+2118 7.50000000000000e-01
+2119 -1.00000000000000e+00
+2120 0.00000000000000e+00
+2121 1.00000000000000e+00
+2122 -7.50000000000000e-01
+2123 0.00000000000000e+00
+2124 1.00000000000000e+00
+2125 -1.00000000000000e+00
+2126 0.00000000000000e+00
+2127 7.50000000000000e-01
+2128 -7.50000000000000e-01
+2129 0.00000000000000e+00
+2130 7.50000000000000e-01
+2131 -1.00000000000000e+00
+2132 0.00000000000000e+00
+2133 1.00000000000000e+00
+2134 -7.50000000000000e-01
+2135 0.00000000000000e+00
+2136 1.00000000000000e+00
+2137 -1.25000000000000e+00
+2138 0.00000000000000e+00
+2139 7.50000000000000e-01
+2140 -1.75000000000000e+00
+2141 0.00000000000000e+00
+2142 1.00000000000000e+00
+2143 -1.75000000000000e+00
+2144 0.00000000000000e+00
+2145 7.50000000000000e-01
+2146 -1.75000000000000e+00
+2147 0.00000000000000e+00
+2148 1.00000000000000e+00
+2149 -1.75000000000000e+00
+2150 0.00000000000000e+00
+2151 2.50000000000000e-01
+2152 -5.00000000000000e-01
+2153 0.00000000000000e+00
+2154 0.00000000000000e+00
+2155 -5.00000000000000e-01
+2156 0.00000000000000e+00
+2157 2.50000000000000e-01
+2158 -5.00000000000000e-01
+2159 0.00000000000000e+00
+2160 2.50000000000000e-01
+2161 -7.50000000000000e-01
+2162 0.00000000000000e+00
+2163 0.00000000000000e+00
+2164 -7.50000000000000e-01
+2165 0.00000000000000e+00
+2166 2.50000000000000e-01
+2167 -7.50000000000000e-01
+2168 0.00000000000000e+00
+2169 5.00000000000000e-01
+2170 -2.50000000000000e-01
+2171 0.00000000000000e+00
+2172 5.00000000000000e-01
+2173 0.00000000000000e+00
+2174 0.00000000000000e+00
+2175 5.00000000000000e-01
+2176 -2.50000000000000e-01
+2177 0.00000000000000e+00
+2178 7.50000000000000e-01
+2179 -2.50000000000000e-01
+2180 0.00000000000000e+00
+2181 7.50000000000000e-01
+2182 0.00000000000000e+00
+2183 0.00000000000000e+00
+2184 7.50000000000000e-01
+2185 -2.50000000000000e-01
+2186 0.00000000000000e+00
+2187 5.00000000000000e-01
+2188 -5.00000000000000e-01
+2189 0.00000000000000e+00
+2190 5.00000000000000e-01
+2191 -7.50000000000000e-01
+2192 0.00000000000000e+00
+2193 5.00000000000000e-01
+2194 -7.50000000000000e-01
+2195 0.00000000000000e+00
+2196 7.50000000000000e-01
+2197 -5.00000000000000e-01
+2198 0.00000000000000e+00
+2199 7.50000000000000e-01
+2200 -5.00000000000000e-01
+2201 0.00000000000000e+00
+2202 7.50000000000000e-01
+2203 -7.50000000000000e-01
+2204 0.00000000000000e+00
+2205 0.00000000000000e+00
+2206 -2.50000000000000e-01
+2207 0.00000000000000e+00
+2208 2.50000000000000e-01
+2209 0.00000000000000e+00
+2210 0.00000000000000e+00
+2211 2.50000000000000e-01
+2212 -2.50000000000000e-01
+2213 0.00000000000000e+00
+2214 0.00000000000000e+00
+2215 -2.50000000000000e-01
+2216 0.00000000000000e+00
+2217 2.50000000000000e-01
+2218 0.00000000000000e+00
+2219 0.00000000000000e+00
+2220 2.50000000000000e-01
+2221 -2.50000000000000e-01
+2222 0.00000000000000e+00
+2223 2.50000000000000e-01
+2224 -5.00000000000000e-01
+2225 0.00000000000000e+00
+2226 0.00000000000000e+00
+2227 -7.50000000000000e-01
+2228 0.00000000000000e+00
+2229 2.50000000000000e-01
+2230 -7.50000000000000e-01
+2231 0.00000000000000e+00
+2232 0.00000000000000e+00
+2233 -5.00000000000000e-01
+2234 0.00000000000000e+00
+2235 2.50000000000000e-01
+2236 -5.00000000000000e-01
+2237 0.00000000000000e+00
+2238 2.50000000000000e-01
+2239 -7.50000000000000e-01
+2240 0.00000000000000e+00
+2241 5.00000000000000e-01
+2242 -2.50000000000000e-01
+2243 0.00000000000000e+00
+2244 7.50000000000000e-01
+2245 0.00000000000000e+00
+2246 0.00000000000000e+00
+2247 7.50000000000000e-01
+2248 -2.50000000000000e-01
+2249 0.00000000000000e+00
+2250 5.00000000000000e-01
+2251 0.00000000000000e+00
+2252 0.00000000000000e+00
+2253 5.00000000000000e-01
+2254 -2.50000000000000e-01
+2255 0.00000000000000e+00
+2256 7.50000000000000e-01
+2257 -2.50000000000000e-01
+2258 0.00000000000000e+00
+2259 5.00000000000000e-01
+2260 -7.50000000000000e-01
+2261 0.00000000000000e+00
+2262 7.50000000000000e-01
+2263 -5.00000000000000e-01
+2264 0.00000000000000e+00
+2265 7.50000000000000e-01
+2266 -7.50000000000000e-01
+2267 0.00000000000000e+00
+2268 5.00000000000000e-01
+2269 -5.00000000000000e-01
+2270 0.00000000000000e+00
+2271 5.00000000000000e-01
+2272 -7.50000000000000e-01
+2273 0.00000000000000e+00
+2274 7.50000000000000e-01
+2275 -5.00000000000000e-01
+2276 0.00000000000000e+00
+2277 2.50000000000000e-01
+2278 -1.50000000000000e+00
+2279 0.00000000000000e+00
+2280 0.00000000000000e+00
+2281 -1.50000000000000e+00
+2282 0.00000000000000e+00
+2283 2.50000000000000e-01
+2284 -1.50000000000000e+00
+2285 0.00000000000000e+00
+2286 2.50000000000000e-01
+2287 -1.75000000000000e+00
+2288 0.00000000000000e+00
+2289 0.00000000000000e+00
+2290 -1.75000000000000e+00
+2291 0.00000000000000e+00
+2292 2.50000000000000e-01
+2293 -1.75000000000000e+00
+2294 0.00000000000000e+00
+2295 5.00000000000000e-01
+2296 -1.25000000000000e+00
+2297 0.00000000000000e+00
+2298 5.00000000000000e-01
+2299 -1.00000000000000e+00
+2300 0.00000000000000e+00
+2301 5.00000000000000e-01
+2302 -1.25000000000000e+00
+2303 0.00000000000000e+00
+2304 7.50000000000000e-01
+2305 -1.25000000000000e+00
+2306 0.00000000000000e+00
+2307 7.50000000000000e-01
+2308 -1.00000000000000e+00
+2309 0.00000000000000e+00
+2310 7.50000000000000e-01
+2311 -1.25000000000000e+00
+2312 0.00000000000000e+00
+2313 5.00000000000000e-01
+2314 -1.50000000000000e+00
+2315 0.00000000000000e+00
+2316 5.00000000000000e-01
+2317 -1.75000000000000e+00
+2318 0.00000000000000e+00
+2319 5.00000000000000e-01
+2320 -1.75000000000000e+00
+2321 0.00000000000000e+00
+2322 7.50000000000000e-01
+2323 -1.50000000000000e+00
+2324 0.00000000000000e+00
+2325 7.50000000000000e-01
+2326 -1.50000000000000e+00
+2327 0.00000000000000e+00
+2328 7.50000000000000e-01
+2329 -1.75000000000000e+00
+2330 0.00000000000000e+00
+2331 0.00000000000000e+00
+2332 -1.25000000000000e+00
+2333 0.00000000000000e+00
+2334 2.50000000000000e-01
+2335 -1.00000000000000e+00
+2336 0.00000000000000e+00
+2337 2.50000000000000e-01
+2338 -1.25000000000000e+00
+2339 0.00000000000000e+00
+2340 0.00000000000000e+00
+2341 -1.25000000000000e+00
+2342 0.00000000000000e+00
+2343 2.50000000000000e-01
+2344 -1.00000000000000e+00
+2345 0.00000000000000e+00
+2346 2.50000000000000e-01
+2347 -1.25000000000000e+00
+2348 0.00000000000000e+00
+2349 2.50000000000000e-01
+2350 -1.50000000000000e+00
+2351 0.00000000000000e+00
+2352 0.00000000000000e+00
+2353 -1.75000000000000e+00
+2354 0.00000000000000e+00
+2355 2.50000000000000e-01
+2356 -1.75000000000000e+00
+2357 0.00000000000000e+00
+2358 0.00000000000000e+00
+2359 -1.50000000000000e+00
+2360 0.00000000000000e+00
+2361 2.50000000000000e-01
+2362 -1.50000000000000e+00
+2363 0.00000000000000e+00
+2364 2.50000000000000e-01
+2365 -1.75000000000000e+00
+2366 0.00000000000000e+00
+2367 5.00000000000000e-01
+2368 -1.25000000000000e+00
+2369 0.00000000000000e+00
+2370 7.50000000000000e-01
+2371 -1.00000000000000e+00
+2372 0.00000000000000e+00
+2373 7.50000000000000e-01
+2374 -1.25000000000000e+00
+2375 0.00000000000000e+00
+2376 5.00000000000000e-01
+2377 -1.00000000000000e+00
+2378 0.00000000000000e+00
+2379 5.00000000000000e-01
+2380 -1.25000000000000e+00
+2381 0.00000000000000e+00
+2382 7.50000000000000e-01
+2383 -1.25000000000000e+00
+2384 0.00000000000000e+00
+2385 5.00000000000000e-01
+2386 -1.75000000000000e+00
+2387 0.00000000000000e+00
+2388 7.50000000000000e-01
+2389 -1.50000000000000e+00
+2390 0.00000000000000e+00
+2391 7.50000000000000e-01
+2392 -1.75000000000000e+00
+2393 0.00000000000000e+00
+2394 5.00000000000000e-01
+2395 -1.50000000000000e+00
+2396 0.00000000000000e+00
+2397 5.00000000000000e-01
+2398 -1.75000000000000e+00
+2399 0.00000000000000e+00
+2400 7.50000000000000e-01
+2401 -1.50000000000000e+00
+2402 0.00000000000000e+00
+2403 1.00000000000000e+00
+2404 -5.00000000000000e-01
+2405 0.00000000000000e+00
+2406 1.00000000000000e+00
+2407 -7.50000000000000e-01
+2408 0.00000000000000e+00
+2409 1.00000000000000e+00
+2410 -2.50000000000000e-01
+2411 0.00000000000000e+00
+2412 1.00000000000000e+00
+2413 -2.50000000000000e-01
+2414 0.00000000000000e+00
+2415 1.00000000000000e+00
+2416 -7.50000000000000e-01
+2417 0.00000000000000e+00
+2418 1.00000000000000e+00
+2419 -5.00000000000000e-01
+2420 0.00000000000000e+00
+2421 1.00000000000000e+00
+2422 -1.50000000000000e+00
+2423 0.00000000000000e+00
+2424 1.00000000000000e+00
+2425 -1.75000000000000e+00
+2426 0.00000000000000e+00
+2427 1.00000000000000e+00
+2428 -1.25000000000000e+00
+2429 0.00000000000000e+00
+2430 1.00000000000000e+00
+2431 -1.25000000000000e+00
+2432 0.00000000000000e+00
+2433 1.00000000000000e+00
+2434 -1.75000000000000e+00
+2435 0.00000000000000e+00
+2436 1.00000000000000e+00
+2437 -1.50000000000000e+00
+2438 0.00000000000000e+00
+2439 2.50000000000000e-01
+2440 -5.00000000000000e-01
+2441 0.00000000000000e+00
+2442 2.50000000000000e-01
+2443 -7.50000000000000e-01
+2444 0.00000000000000e+00
+2445 5.00000000000000e-01
+2446 -2.50000000000000e-01
+2447 0.00000000000000e+00
+2448 7.50000000000000e-01
+2449 -2.50000000000000e-01
+2450 0.00000000000000e+00
+2451 5.00000000000000e-01
+2452 -7.50000000000000e-01
+2453 0.00000000000000e+00
+2454 7.50000000000000e-01
+2455 -5.00000000000000e-01
+2456 0.00000000000000e+00
+2457 2.50000000000000e-01
+2458 -1.50000000000000e+00
+2459 0.00000000000000e+00
+2460 2.50000000000000e-01
+2461 -1.75000000000000e+00
+2462 0.00000000000000e+00
+2463 5.00000000000000e-01
+2464 -1.25000000000000e+00
+2465 0.00000000000000e+00
+2466 7.50000000000000e-01
+2467 -1.25000000000000e+00
+2468 0.00000000000000e+00
+2469 5.00000000000000e-01
+2470 -1.75000000000000e+00
+2471 0.00000000000000e+00
+2472 7.50000000000000e-01
+2473 -1.50000000000000e+00
+2474 0.00000000000000e+00
diff --git a/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/rbms.1.00000 b/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/rbms.1.00000
new file mode 100644
index 00000000..f346afb4
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/rbms.1.00000
@@ -0,0 +1,676 @@
+0 675
+0 0.00000000000000e+00
+1 0.00000000000000e+00
+2 0.00000000000000e+00
+3 0.00000000000000e+00
+4 0.00000000000000e+00
+5 0.00000000000000e+00
+6 0.00000000000000e+00
+7 0.00000000000000e+00
+8 0.00000000000000e+00
+9 0.00000000000000e+00
+10 0.00000000000000e+00
+11 -1.00000000000000e+00
+12 0.00000000000000e+00
+13 0.00000000000000e+00
+14 -1.00000000000000e+00
+15 0.00000000000000e+00
+16 0.00000000000000e+00
+17 -1.00000000000000e+00
+18 0.00000000000000e+00
+19 1.00000000000000e+00
+20 0.00000000000000e+00
+21 0.00000000000000e+00
+22 1.00000000000000e+00
+23 0.00000000000000e+00
+24 0.00000000000000e+00
+25 1.00000000000000e+00
+26 0.00000000000000e+00
+27 0.00000000000000e+00
+28 1.00000000000000e+00
+29 -1.00000000000000e+00
+30 0.00000000000000e+00
+31 1.00000000000000e+00
+32 -1.00000000000000e+00
+33 0.00000000000000e+00
+34 1.00000000000000e+00
+35 -1.00000000000000e+00
+36 0.00000000000000e+00
+37 0.00000000000000e+00
+38 0.00000000000000e+00
+39 0.00000000000000e+00
+40 0.00000000000000e+00
+41 -5.00000000000000e-01
+42 0.00000000000000e+00
+43 0.00000000000000e+00
+44 -5.00000000000000e-01
+45 0.00000000000000e+00
+46 5.00000000000000e-01
+47 0.00000000000000e+00
+48 0.00000000000000e+00
+49 5.00000000000000e-01
+50 0.00000000000000e+00
+51 0.00000000000000e+00
+52 5.00000000000000e-01
+53 -5.00000000000000e-01
+54 0.00000000000000e+00
+55 5.00000000000000e-01
+56 -5.00000000000000e-01
+57 0.00000000000000e+00
+58 0.00000000000000e+00
+59 0.00000000000000e+00
+60 0.00000000000000e+00
+61 0.00000000000000e+00
+62 -5.00000000000000e-01
+63 0.00000000000000e+00
+64 0.00000000000000e+00
+65 -5.00000000000000e-01
+66 0.00000000000000e+00
+67 5.00000000000000e-01
+68 0.00000000000000e+00
+69 0.00000000000000e+00
+70 5.00000000000000e-01
+71 0.00000000000000e+00
+72 0.00000000000000e+00
+73 5.00000000000000e-01
+74 -5.00000000000000e-01
+75 0.00000000000000e+00
+76 5.00000000000000e-01
+77 -5.00000000000000e-01
+78 0.00000000000000e+00
+79 0.00000000000000e+00
+80 -5.00000000000000e-01
+81 0.00000000000000e+00
+82 5.00000000000000e-01
+83 0.00000000000000e+00
+84 0.00000000000000e+00
+85 5.00000000000000e-01
+86 -5.00000000000000e-01
+87 0.00000000000000e+00
+88 0.00000000000000e+00
+89 -1.00000000000000e+00
+90 0.00000000000000e+00
+91 5.00000000000000e-01
+92 -1.00000000000000e+00
+93 0.00000000000000e+00
+94 5.00000000000000e-01
+95 -1.00000000000000e+00
+96 0.00000000000000e+00
+97 0.00000000000000e+00
+98 -1.00000000000000e+00
+99 0.00000000000000e+00
+100 5.00000000000000e-01
+101 -1.00000000000000e+00
+102 0.00000000000000e+00
+103 5.00000000000000e-01
+104 -1.00000000000000e+00
+105 0.00000000000000e+00
+106 5.00000000000000e-01
+107 -1.00000000000000e+00
+108 0.00000000000000e+00
+109 1.00000000000000e+00
+110 0.00000000000000e+00
+111 0.00000000000000e+00
+112 1.00000000000000e+00
+113 -5.00000000000000e-01
+114 0.00000000000000e+00
+115 1.00000000000000e+00
+116 -5.00000000000000e-01
+117 0.00000000000000e+00
+118 1.00000000000000e+00
+119 0.00000000000000e+00
+120 0.00000000000000e+00
+121 1.00000000000000e+00
+122 -5.00000000000000e-01
+123 0.00000000000000e+00
+124 1.00000000000000e+00
+125 -5.00000000000000e-01
+126 0.00000000000000e+00
+127 1.00000000000000e+00
+128 -5.00000000000000e-01
+129 0.00000000000000e+00
+130 1.00000000000000e+00
+131 -1.00000000000000e+00
+132 0.00000000000000e+00
+133 1.00000000000000e+00
+134 -1.00000000000000e+00
+135 0.00000000000000e+00
+136 0.00000000000000e+00
+137 0.00000000000000e+00
+138 0.00000000000000e+00
+139 0.00000000000000e+00
+140 -2.50000000000000e-01
+141 0.00000000000000e+00
+142 0.00000000000000e+00
+143 -2.50000000000000e-01
+144 0.00000000000000e+00
+145 2.50000000000000e-01
+146 0.00000000000000e+00
+147 0.00000000000000e+00
+148 2.50000000000000e-01
+149 0.00000000000000e+00
+150 0.00000000000000e+00
+151 2.50000000000000e-01
+152 -2.50000000000000e-01
+153 0.00000000000000e+00
+154 2.50000000000000e-01
+155 -2.50000000000000e-01
+156 0.00000000000000e+00
+157 0.00000000000000e+00
+158 0.00000000000000e+00
+159 0.00000000000000e+00
+160 0.00000000000000e+00
+161 0.00000000000000e+00
+162 0.00000000000000e+00
+163 0.00000000000000e+00
+164 -2.50000000000000e-01
+165 0.00000000000000e+00
+166 0.00000000000000e+00
+167 -2.50000000000000e-01
+168 0.00000000000000e+00
+169 2.50000000000000e-01
+170 0.00000000000000e+00
+171 0.00000000000000e+00
+172 2.50000000000000e-01
+173 0.00000000000000e+00
+174 0.00000000000000e+00
+175 2.50000000000000e-01
+176 -2.50000000000000e-01
+177 0.00000000000000e+00
+178 2.50000000000000e-01
+179 -2.50000000000000e-01
+180 0.00000000000000e+00
+181 0.00000000000000e+00
+182 0.00000000000000e+00
+183 0.00000000000000e+00
+184 0.00000000000000e+00
+185 -2.50000000000000e-01
+186 0.00000000000000e+00
+187 2.50000000000000e-01
+188 0.00000000000000e+00
+189 0.00000000000000e+00
+190 2.50000000000000e-01
+191 -2.50000000000000e-01
+192 0.00000000000000e+00
+193 0.00000000000000e+00
+194 -7.50000000000000e-01
+195 0.00000000000000e+00
+196 0.00000000000000e+00
+197 -1.00000000000000e+00
+198 0.00000000000000e+00
+199 2.50000000000000e-01
+200 -1.00000000000000e+00
+201 0.00000000000000e+00
+202 2.50000000000000e-01
+203 -1.00000000000000e+00
+204 0.00000000000000e+00
+205 0.00000000000000e+00
+206 -7.50000000000000e-01
+207 0.00000000000000e+00
+208 0.00000000000000e+00
+209 -7.50000000000000e-01
+210 0.00000000000000e+00
+211 0.00000000000000e+00
+212 -1.00000000000000e+00
+213 0.00000000000000e+00
+214 0.00000000000000e+00
+215 -1.00000000000000e+00
+216 0.00000000000000e+00
+217 2.50000000000000e-01
+218 -1.00000000000000e+00
+219 0.00000000000000e+00
+220 2.50000000000000e-01
+221 -1.00000000000000e+00
+222 0.00000000000000e+00
+223 0.00000000000000e+00
+224 -7.50000000000000e-01
+225 0.00000000000000e+00
+226 0.00000000000000e+00
+227 -7.50000000000000e-01
+228 0.00000000000000e+00
+229 0.00000000000000e+00
+230 -1.00000000000000e+00
+231 0.00000000000000e+00
+232 2.50000000000000e-01
+233 -1.00000000000000e+00
+234 0.00000000000000e+00
+235 7.50000000000000e-01
+236 0.00000000000000e+00
+237 0.00000000000000e+00
+238 1.00000000000000e+00
+239 0.00000000000000e+00
+240 0.00000000000000e+00
+241 1.00000000000000e+00
+242 -2.50000000000000e-01
+243 0.00000000000000e+00
+244 1.00000000000000e+00
+245 -2.50000000000000e-01
+246 0.00000000000000e+00
+247 7.50000000000000e-01
+248 0.00000000000000e+00
+249 0.00000000000000e+00
+250 7.50000000000000e-01
+251 0.00000000000000e+00
+252 0.00000000000000e+00
+253 1.00000000000000e+00
+254 0.00000000000000e+00
+255 0.00000000000000e+00
+256 1.00000000000000e+00
+257 0.00000000000000e+00
+258 0.00000000000000e+00
+259 1.00000000000000e+00
+260 -2.50000000000000e-01
+261 0.00000000000000e+00
+262 1.00000000000000e+00
+263 -2.50000000000000e-01
+264 0.00000000000000e+00
+265 7.50000000000000e-01
+266 0.00000000000000e+00
+267 0.00000000000000e+00
+268 7.50000000000000e-01
+269 0.00000000000000e+00
+270 0.00000000000000e+00
+271 1.00000000000000e+00
+272 0.00000000000000e+00
+273 0.00000000000000e+00
+274 1.00000000000000e+00
+275 -2.50000000000000e-01
+276 0.00000000000000e+00
+277 7.50000000000000e-01
+278 -7.50000000000000e-01
+279 0.00000000000000e+00
+280 7.50000000000000e-01
+281 -1.00000000000000e+00
+282 0.00000000000000e+00
+283 1.00000000000000e+00
+284 -7.50000000000000e-01
+285 0.00000000000000e+00
+286 1.00000000000000e+00
+287 -1.00000000000000e+00
+288 0.00000000000000e+00
+289 7.50000000000000e-01
+290 -7.50000000000000e-01
+291 0.00000000000000e+00
+292 7.50000000000000e-01
+293 -7.50000000000000e-01
+294 0.00000000000000e+00
+295 7.50000000000000e-01
+296 -1.00000000000000e+00
+297 0.00000000000000e+00
+298 7.50000000000000e-01
+299 -1.00000000000000e+00
+300 0.00000000000000e+00
+301 1.00000000000000e+00
+302 -7.50000000000000e-01
+303 0.00000000000000e+00
+304 1.00000000000000e+00
+305 -7.50000000000000e-01
+306 0.00000000000000e+00
+307 1.00000000000000e+00
+308 -1.00000000000000e+00
+309 0.00000000000000e+00
+310 1.00000000000000e+00
+311 -1.00000000000000e+00
+312 0.00000000000000e+00
+313 7.50000000000000e-01
+314 -7.50000000000000e-01
+315 0.00000000000000e+00
+316 7.50000000000000e-01
+317 -7.50000000000000e-01
+318 0.00000000000000e+00
+319 7.50000000000000e-01
+320 -1.00000000000000e+00
+321 0.00000000000000e+00
+322 7.50000000000000e-01
+323 -1.00000000000000e+00
+324 0.00000000000000e+00
+325 1.00000000000000e+00
+326 -7.50000000000000e-01
+327 0.00000000000000e+00
+328 1.00000000000000e+00
+329 -7.50000000000000e-01
+330 0.00000000000000e+00
+331 1.00000000000000e+00
+332 -1.00000000000000e+00
+333 0.00000000000000e+00
+334 0.00000000000000e+00
+335 -2.50000000000000e-01
+336 0.00000000000000e+00
+337 2.50000000000000e-01
+338 0.00000000000000e+00
+339 0.00000000000000e+00
+340 2.50000000000000e-01
+341 -2.50000000000000e-01
+342 0.00000000000000e+00
+343 0.00000000000000e+00
+344 -2.50000000000000e-01
+345 0.00000000000000e+00
+346 2.50000000000000e-01
+347 0.00000000000000e+00
+348 0.00000000000000e+00
+349 2.50000000000000e-01
+350 -2.50000000000000e-01
+351 0.00000000000000e+00
+352 0.00000000000000e+00
+353 -5.00000000000000e-01
+354 0.00000000000000e+00
+355 2.50000000000000e-01
+356 -5.00000000000000e-01
+357 0.00000000000000e+00
+358 2.50000000000000e-01
+359 -5.00000000000000e-01
+360 0.00000000000000e+00
+361 0.00000000000000e+00
+362 -7.50000000000000e-01
+363 0.00000000000000e+00
+364 2.50000000000000e-01
+365 -7.50000000000000e-01
+366 0.00000000000000e+00
+367 2.50000000000000e-01
+368 -7.50000000000000e-01
+369 0.00000000000000e+00
+370 2.50000000000000e-01
+371 -5.00000000000000e-01
+372 0.00000000000000e+00
+373 0.00000000000000e+00
+374 -5.00000000000000e-01
+375 0.00000000000000e+00
+376 2.50000000000000e-01
+377 -5.00000000000000e-01
+378 0.00000000000000e+00
+379 0.00000000000000e+00
+380 -7.50000000000000e-01
+381 0.00000000000000e+00
+382 2.50000000000000e-01
+383 -7.50000000000000e-01
+384 0.00000000000000e+00
+385 2.50000000000000e-01
+386 -7.50000000000000e-01
+387 0.00000000000000e+00
+388 5.00000000000000e-01
+389 0.00000000000000e+00
+390 0.00000000000000e+00
+391 5.00000000000000e-01
+392 -2.50000000000000e-01
+393 0.00000000000000e+00
+394 5.00000000000000e-01
+395 -2.50000000000000e-01
+396 0.00000000000000e+00
+397 7.50000000000000e-01
+398 0.00000000000000e+00
+399 0.00000000000000e+00
+400 7.50000000000000e-01
+401 -2.50000000000000e-01
+402 0.00000000000000e+00
+403 7.50000000000000e-01
+404 -2.50000000000000e-01
+405 0.00000000000000e+00
+406 5.00000000000000e-01
+407 -2.50000000000000e-01
+408 0.00000000000000e+00
+409 5.00000000000000e-01
+410 0.00000000000000e+00
+411 0.00000000000000e+00
+412 5.00000000000000e-01
+413 -2.50000000000000e-01
+414 0.00000000000000e+00
+415 7.50000000000000e-01
+416 0.00000000000000e+00
+417 0.00000000000000e+00
+418 7.50000000000000e-01
+419 -2.50000000000000e-01
+420 0.00000000000000e+00
+421 7.50000000000000e-01
+422 -2.50000000000000e-01
+423 0.00000000000000e+00
+424 5.00000000000000e-01
+425 -5.00000000000000e-01
+426 0.00000000000000e+00
+427 5.00000000000000e-01
+428 -7.50000000000000e-01
+429 0.00000000000000e+00
+430 5.00000000000000e-01
+431 -7.50000000000000e-01
+432 0.00000000000000e+00
+433 7.50000000000000e-01
+434 -5.00000000000000e-01
+435 0.00000000000000e+00
+436 7.50000000000000e-01
+437 -5.00000000000000e-01
+438 0.00000000000000e+00
+439 7.50000000000000e-01
+440 -7.50000000000000e-01
+441 0.00000000000000e+00
+442 5.00000000000000e-01
+443 -5.00000000000000e-01
+444 0.00000000000000e+00
+445 5.00000000000000e-01
+446 -7.50000000000000e-01
+447 0.00000000000000e+00
+448 5.00000000000000e-01
+449 -7.50000000000000e-01
+450 0.00000000000000e+00
+451 7.50000000000000e-01
+452 -5.00000000000000e-01
+453 0.00000000000000e+00
+454 7.50000000000000e-01
+455 -5.00000000000000e-01
+456 0.00000000000000e+00
+457 7.50000000000000e-01
+458 -7.50000000000000e-01
+459 0.00000000000000e+00
+460 0.00000000000000e+00
+461 -2.50000000000000e-01
+462 0.00000000000000e+00
+463 2.50000000000000e-01
+464 0.00000000000000e+00
+465 0.00000000000000e+00
+466 2.50000000000000e-01
+467 -2.50000000000000e-01
+468 0.00000000000000e+00
+469 0.00000000000000e+00
+470 -2.50000000000000e-01
+471 0.00000000000000e+00
+472 2.50000000000000e-01
+473 0.00000000000000e+00
+474 0.00000000000000e+00
+475 2.50000000000000e-01
+476 -2.50000000000000e-01
+477 0.00000000000000e+00
+478 0.00000000000000e+00
+479 -5.00000000000000e-01
+480 0.00000000000000e+00
+481 2.50000000000000e-01
+482 -5.00000000000000e-01
+483 0.00000000000000e+00
+484 2.50000000000000e-01
+485 -5.00000000000000e-01
+486 0.00000000000000e+00
+487 0.00000000000000e+00
+488 -7.50000000000000e-01
+489 0.00000000000000e+00
+490 2.50000000000000e-01
+491 -7.50000000000000e-01
+492 0.00000000000000e+00
+493 2.50000000000000e-01
+494 -7.50000000000000e-01
+495 0.00000000000000e+00
+496 2.50000000000000e-01
+497 -5.00000000000000e-01
+498 0.00000000000000e+00
+499 0.00000000000000e+00
+500 -5.00000000000000e-01
+501 0.00000000000000e+00
+502 2.50000000000000e-01
+503 -5.00000000000000e-01
+504 0.00000000000000e+00
+505 0.00000000000000e+00
+506 -7.50000000000000e-01
+507 0.00000000000000e+00
+508 2.50000000000000e-01
+509 -7.50000000000000e-01
+510 0.00000000000000e+00
+511 2.50000000000000e-01
+512 -7.50000000000000e-01
+513 0.00000000000000e+00
+514 5.00000000000000e-01
+515 0.00000000000000e+00
+516 0.00000000000000e+00
+517 5.00000000000000e-01
+518 -2.50000000000000e-01
+519 0.00000000000000e+00
+520 5.00000000000000e-01
+521 -2.50000000000000e-01
+522 0.00000000000000e+00
+523 7.50000000000000e-01
+524 0.00000000000000e+00
+525 0.00000000000000e+00
+526 7.50000000000000e-01
+527 -2.50000000000000e-01
+528 0.00000000000000e+00
+529 7.50000000000000e-01
+530 -2.50000000000000e-01
+531 0.00000000000000e+00
+532 5.00000000000000e-01
+533 -2.50000000000000e-01
+534 0.00000000000000e+00
+535 5.00000000000000e-01
+536 0.00000000000000e+00
+537 0.00000000000000e+00
+538 5.00000000000000e-01
+539 -2.50000000000000e-01
+540 0.00000000000000e+00
+541 7.50000000000000e-01
+542 0.00000000000000e+00
+543 0.00000000000000e+00
+544 7.50000000000000e-01
+545 -2.50000000000000e-01
+546 0.00000000000000e+00
+547 7.50000000000000e-01
+548 -2.50000000000000e-01
+549 0.00000000000000e+00
+550 5.00000000000000e-01
+551 -5.00000000000000e-01
+552 0.00000000000000e+00
+553 5.00000000000000e-01
+554 -7.50000000000000e-01
+555 0.00000000000000e+00
+556 5.00000000000000e-01
+557 -7.50000000000000e-01
+558 0.00000000000000e+00
+559 7.50000000000000e-01
+560 -5.00000000000000e-01
+561 0.00000000000000e+00
+562 7.50000000000000e-01
+563 -5.00000000000000e-01
+564 0.00000000000000e+00
+565 7.50000000000000e-01
+566 -7.50000000000000e-01
+567 0.00000000000000e+00
+568 5.00000000000000e-01
+569 -5.00000000000000e-01
+570 0.00000000000000e+00
+571 5.00000000000000e-01
+572 -7.50000000000000e-01
+573 0.00000000000000e+00
+574 5.00000000000000e-01
+575 -7.50000000000000e-01
+576 0.00000000000000e+00
+577 7.50000000000000e-01
+578 -5.00000000000000e-01
+579 0.00000000000000e+00
+580 7.50000000000000e-01
+581 -5.00000000000000e-01
+582 0.00000000000000e+00
+583 7.50000000000000e-01
+584 -7.50000000000000e-01
+585 0.00000000000000e+00
+586 2.50000000000000e-01
+587 -5.00000000000000e-01
+588 0.00000000000000e+00
+589 2.50000000000000e-01
+590 -7.50000000000000e-01
+591 0.00000000000000e+00
+592 5.00000000000000e-01
+593 -2.50000000000000e-01
+594 0.00000000000000e+00
+595 7.50000000000000e-01
+596 -2.50000000000000e-01
+597 0.00000000000000e+00
+598 5.00000000000000e-01
+599 -7.50000000000000e-01
+600 0.00000000000000e+00
+601 7.50000000000000e-01
+602 -5.00000000000000e-01
+603 0.00000000000000e+00
+604 2.50000000000000e-01
+605 -1.00000000000000e+00
+606 0.00000000000000e+00
+607 2.50000000000000e-01
+608 -1.00000000000000e+00
+609 0.00000000000000e+00
+610 5.00000000000000e-01
+611 -1.00000000000000e+00
+612 0.00000000000000e+00
+613 7.50000000000000e-01
+614 -1.00000000000000e+00
+615 0.00000000000000e+00
+616 5.00000000000000e-01
+617 -1.00000000000000e+00
+618 0.00000000000000e+00
+619 7.50000000000000e-01
+620 -1.00000000000000e+00
+621 0.00000000000000e+00
+622 2.50000000000000e-01
+623 -1.00000000000000e+00
+624 0.00000000000000e+00
+625 2.50000000000000e-01
+626 -1.00000000000000e+00
+627 0.00000000000000e+00
+628 5.00000000000000e-01
+629 -1.00000000000000e+00
+630 0.00000000000000e+00
+631 7.50000000000000e-01
+632 -1.00000000000000e+00
+633 0.00000000000000e+00
+634 5.00000000000000e-01
+635 -1.00000000000000e+00
+636 0.00000000000000e+00
+637 7.50000000000000e-01
+638 -1.00000000000000e+00
+639 0.00000000000000e+00
+640 1.00000000000000e+00
+641 -2.50000000000000e-01
+642 0.00000000000000e+00
+643 1.00000000000000e+00
+644 -2.50000000000000e-01
+645 0.00000000000000e+00
+646 1.00000000000000e+00
+647 -5.00000000000000e-01
+648 0.00000000000000e+00
+649 1.00000000000000e+00
+650 -7.50000000000000e-01
+651 0.00000000000000e+00
+652 1.00000000000000e+00
+653 -5.00000000000000e-01
+654 0.00000000000000e+00
+655 1.00000000000000e+00
+656 -7.50000000000000e-01
+657 0.00000000000000e+00
+658 1.00000000000000e+00
+659 -2.50000000000000e-01
+660 0.00000000000000e+00
+661 1.00000000000000e+00
+662 -2.50000000000000e-01
+663 0.00000000000000e+00
+664 1.00000000000000e+00
+665 -5.00000000000000e-01
+666 0.00000000000000e+00
+667 1.00000000000000e+00
+668 -7.50000000000000e-01
+669 0.00000000000000e+00
+670 1.00000000000000e+00
+671 -5.00000000000000e-01
+672 0.00000000000000e+00
+673 1.00000000000000e+00
+674 -7.50000000000000e-01
diff --git a/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/rbms.1.00001 b/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/rbms.1.00001
new file mode 100644
index 00000000..54ad9eaf
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/rbms.1.00001
@@ -0,0 +1,601 @@
+675 1275
+675 0.00000000000000e+00
+676 0.00000000000000e+00
+677 0.00000000000000e+00
+678 0.00000000000000e+00
+679 0.00000000000000e+00
+680 0.00000000000000e+00
+681 0.00000000000000e+00
+682 0.00000000000000e+00
+683 -1.00000000000000e+00
+684 0.00000000000000e+00
+685 0.00000000000000e+00
+686 -1.00000000000000e+00
+687 0.00000000000000e+00
+688 1.00000000000000e+00
+689 0.00000000000000e+00
+690 0.00000000000000e+00
+691 1.00000000000000e+00
+692 0.00000000000000e+00
+693 0.00000000000000e+00
+694 1.00000000000000e+00
+695 -1.00000000000000e+00
+696 0.00000000000000e+00
+697 1.00000000000000e+00
+698 -1.00000000000000e+00
+699 0.00000000000000e+00
+700 0.00000000000000e+00
+701 0.00000000000000e+00
+702 0.00000000000000e+00
+703 0.00000000000000e+00
+704 -5.00000000000000e-01
+705 0.00000000000000e+00
+706 5.00000000000000e-01
+707 0.00000000000000e+00
+708 0.00000000000000e+00
+709 5.00000000000000e-01
+710 -5.00000000000000e-01
+711 0.00000000000000e+00
+712 0.00000000000000e+00
+713 0.00000000000000e+00
+714 0.00000000000000e+00
+715 0.00000000000000e+00
+716 -5.00000000000000e-01
+717 0.00000000000000e+00
+718 0.00000000000000e+00
+719 -5.00000000000000e-01
+720 0.00000000000000e+00
+721 5.00000000000000e-01
+722 0.00000000000000e+00
+723 0.00000000000000e+00
+724 5.00000000000000e-01
+725 0.00000000000000e+00
+726 0.00000000000000e+00
+727 5.00000000000000e-01
+728 -5.00000000000000e-01
+729 0.00000000000000e+00
+730 5.00000000000000e-01
+731 -5.00000000000000e-01
+732 0.00000000000000e+00
+733 0.00000000000000e+00
+734 -5.00000000000000e-01
+735 0.00000000000000e+00
+736 5.00000000000000e-01
+737 0.00000000000000e+00
+738 0.00000000000000e+00
+739 5.00000000000000e-01
+740 -5.00000000000000e-01
+741 0.00000000000000e+00
+742 0.00000000000000e+00
+743 -1.00000000000000e+00
+744 0.00000000000000e+00
+745 5.00000000000000e-01
+746 -1.00000000000000e+00
+747 0.00000000000000e+00
+748 0.00000000000000e+00
+749 -1.00000000000000e+00
+750 0.00000000000000e+00
+751 5.00000000000000e-01
+752 -1.00000000000000e+00
+753 0.00000000000000e+00
+754 5.00000000000000e-01
+755 -1.00000000000000e+00
+756 0.00000000000000e+00
+757 5.00000000000000e-01
+758 -1.00000000000000e+00
+759 0.00000000000000e+00
+760 1.00000000000000e+00
+761 0.00000000000000e+00
+762 0.00000000000000e+00
+763 1.00000000000000e+00
+764 -5.00000000000000e-01
+765 0.00000000000000e+00
+766 1.00000000000000e+00
+767 0.00000000000000e+00
+768 0.00000000000000e+00
+769 1.00000000000000e+00
+770 -5.00000000000000e-01
+771 0.00000000000000e+00
+772 1.00000000000000e+00
+773 -5.00000000000000e-01
+774 0.00000000000000e+00
+775 1.00000000000000e+00
+776 -5.00000000000000e-01
+777 0.00000000000000e+00
+778 1.00000000000000e+00
+779 -1.00000000000000e+00
+780 0.00000000000000e+00
+781 1.00000000000000e+00
+782 -1.00000000000000e+00
+783 0.00000000000000e+00
+784 0.00000000000000e+00
+785 0.00000000000000e+00
+786 0.00000000000000e+00
+787 0.00000000000000e+00
+788 -2.50000000000000e-01
+789 0.00000000000000e+00
+790 2.50000000000000e-01
+791 0.00000000000000e+00
+792 0.00000000000000e+00
+793 2.50000000000000e-01
+794 -2.50000000000000e-01
+795 0.00000000000000e+00
+796 0.00000000000000e+00
+797 0.00000000000000e+00
+798 0.00000000000000e+00
+799 0.00000000000000e+00
+800 0.00000000000000e+00
+801 0.00000000000000e+00
+802 0.00000000000000e+00
+803 -2.50000000000000e-01
+804 0.00000000000000e+00
+805 0.00000000000000e+00
+806 -2.50000000000000e-01
+807 0.00000000000000e+00
+808 2.50000000000000e-01
+809 0.00000000000000e+00
+810 0.00000000000000e+00
+811 2.50000000000000e-01
+812 0.00000000000000e+00
+813 0.00000000000000e+00
+814 2.50000000000000e-01
+815 -2.50000000000000e-01
+816 0.00000000000000e+00
+817 2.50000000000000e-01
+818 -2.50000000000000e-01
+819 0.00000000000000e+00
+820 0.00000000000000e+00
+821 0.00000000000000e+00
+822 0.00000000000000e+00
+823 0.00000000000000e+00
+824 -2.50000000000000e-01
+825 0.00000000000000e+00
+826 2.50000000000000e-01
+827 0.00000000000000e+00
+828 0.00000000000000e+00
+829 2.50000000000000e-01
+830 -2.50000000000000e-01
+831 0.00000000000000e+00
+832 0.00000000000000e+00
+833 -1.00000000000000e+00
+834 0.00000000000000e+00
+835 2.50000000000000e-01
+836 -1.00000000000000e+00
+837 0.00000000000000e+00
+838 0.00000000000000e+00
+839 -7.50000000000000e-01
+840 0.00000000000000e+00
+841 0.00000000000000e+00
+842 -7.50000000000000e-01
+843 0.00000000000000e+00
+844 0.00000000000000e+00
+845 -1.00000000000000e+00
+846 0.00000000000000e+00
+847 0.00000000000000e+00
+848 -1.00000000000000e+00
+849 0.00000000000000e+00
+850 2.50000000000000e-01
+851 -1.00000000000000e+00
+852 0.00000000000000e+00
+853 2.50000000000000e-01
+854 -1.00000000000000e+00
+855 0.00000000000000e+00
+856 0.00000000000000e+00
+857 -7.50000000000000e-01
+858 0.00000000000000e+00
+859 0.00000000000000e+00
+860 -7.50000000000000e-01
+861 0.00000000000000e+00
+862 0.00000000000000e+00
+863 -1.00000000000000e+00
+864 0.00000000000000e+00
+865 2.50000000000000e-01
+866 -1.00000000000000e+00
+867 0.00000000000000e+00
+868 1.00000000000000e+00
+869 0.00000000000000e+00
+870 0.00000000000000e+00
+871 1.00000000000000e+00
+872 -2.50000000000000e-01
+873 0.00000000000000e+00
+874 7.50000000000000e-01
+875 0.00000000000000e+00
+876 0.00000000000000e+00
+877 7.50000000000000e-01
+878 0.00000000000000e+00
+879 0.00000000000000e+00
+880 1.00000000000000e+00
+881 0.00000000000000e+00
+882 0.00000000000000e+00
+883 1.00000000000000e+00
+884 0.00000000000000e+00
+885 0.00000000000000e+00
+886 1.00000000000000e+00
+887 -2.50000000000000e-01
+888 0.00000000000000e+00
+889 1.00000000000000e+00
+890 -2.50000000000000e-01
+891 0.00000000000000e+00
+892 7.50000000000000e-01
+893 0.00000000000000e+00
+894 0.00000000000000e+00
+895 7.50000000000000e-01
+896 0.00000000000000e+00
+897 0.00000000000000e+00
+898 1.00000000000000e+00
+899 0.00000000000000e+00
+900 0.00000000000000e+00
+901 1.00000000000000e+00
+902 -2.50000000000000e-01
+903 0.00000000000000e+00
+904 1.00000000000000e+00
+905 -1.00000000000000e+00
+906 0.00000000000000e+00
+907 7.50000000000000e-01
+908 -7.50000000000000e-01
+909 0.00000000000000e+00
+910 7.50000000000000e-01
+911 -7.50000000000000e-01
+912 0.00000000000000e+00
+913 7.50000000000000e-01
+914 -1.00000000000000e+00
+915 0.00000000000000e+00
+916 7.50000000000000e-01
+917 -1.00000000000000e+00
+918 0.00000000000000e+00
+919 1.00000000000000e+00
+920 -7.50000000000000e-01
+921 0.00000000000000e+00
+922 1.00000000000000e+00
+923 -7.50000000000000e-01
+924 0.00000000000000e+00
+925 1.00000000000000e+00
+926 -1.00000000000000e+00
+927 0.00000000000000e+00
+928 1.00000000000000e+00
+929 -1.00000000000000e+00
+930 0.00000000000000e+00
+931 7.50000000000000e-01
+932 -7.50000000000000e-01
+933 0.00000000000000e+00
+934 7.50000000000000e-01
+935 -7.50000000000000e-01
+936 0.00000000000000e+00
+937 7.50000000000000e-01
+938 -1.00000000000000e+00
+939 0.00000000000000e+00
+940 7.50000000000000e-01
+941 -1.00000000000000e+00
+942 0.00000000000000e+00
+943 1.00000000000000e+00
+944 -7.50000000000000e-01
+945 0.00000000000000e+00
+946 1.00000000000000e+00
+947 -7.50000000000000e-01
+948 0.00000000000000e+00
+949 1.00000000000000e+00
+950 -1.00000000000000e+00
+951 0.00000000000000e+00
+952 0.00000000000000e+00
+953 -2.50000000000000e-01
+954 0.00000000000000e+00
+955 2.50000000000000e-01
+956 0.00000000000000e+00
+957 0.00000000000000e+00
+958 2.50000000000000e-01
+959 -2.50000000000000e-01
+960 0.00000000000000e+00
+961 0.00000000000000e+00
+962 -2.50000000000000e-01
+963 0.00000000000000e+00
+964 2.50000000000000e-01
+965 0.00000000000000e+00
+966 0.00000000000000e+00
+967 2.50000000000000e-01
+968 -2.50000000000000e-01
+969 0.00000000000000e+00
+970 0.00000000000000e+00
+971 -5.00000000000000e-01
+972 0.00000000000000e+00
+973 2.50000000000000e-01
+974 -5.00000000000000e-01
+975 0.00000000000000e+00
+976 0.00000000000000e+00
+977 -7.50000000000000e-01
+978 0.00000000000000e+00
+979 2.50000000000000e-01
+980 -7.50000000000000e-01
+981 0.00000000000000e+00
+982 2.50000000000000e-01
+983 -5.00000000000000e-01
+984 0.00000000000000e+00
+985 0.00000000000000e+00
+986 -5.00000000000000e-01
+987 0.00000000000000e+00
+988 2.50000000000000e-01
+989 -5.00000000000000e-01
+990 0.00000000000000e+00
+991 0.00000000000000e+00
+992 -7.50000000000000e-01
+993 0.00000000000000e+00
+994 2.50000000000000e-01
+995 -7.50000000000000e-01
+996 0.00000000000000e+00
+997 2.50000000000000e-01
+998 -7.50000000000000e-01
+999 0.00000000000000e+00
+1000 5.00000000000000e-01
+1001 0.00000000000000e+00
+1002 0.00000000000000e+00
+1003 5.00000000000000e-01
+1004 -2.50000000000000e-01
+1005 0.00000000000000e+00
+1006 7.50000000000000e-01
+1007 0.00000000000000e+00
+1008 0.00000000000000e+00
+1009 7.50000000000000e-01
+1010 -2.50000000000000e-01
+1011 0.00000000000000e+00
+1012 5.00000000000000e-01
+1013 -2.50000000000000e-01
+1014 0.00000000000000e+00
+1015 5.00000000000000e-01
+1016 0.00000000000000e+00
+1017 0.00000000000000e+00
+1018 5.00000000000000e-01
+1019 -2.50000000000000e-01
+1020 0.00000000000000e+00
+1021 7.50000000000000e-01
+1022 0.00000000000000e+00
+1023 0.00000000000000e+00
+1024 7.50000000000000e-01
+1025 -2.50000000000000e-01
+1026 0.00000000000000e+00
+1027 7.50000000000000e-01
+1028 -2.50000000000000e-01
+1029 0.00000000000000e+00
+1030 5.00000000000000e-01
+1031 -5.00000000000000e-01
+1032 0.00000000000000e+00
+1033 5.00000000000000e-01
+1034 -7.50000000000000e-01
+1035 0.00000000000000e+00
+1036 7.50000000000000e-01
+1037 -5.00000000000000e-01
+1038 0.00000000000000e+00
+1039 7.50000000000000e-01
+1040 -7.50000000000000e-01
+1041 0.00000000000000e+00
+1042 5.00000000000000e-01
+1043 -5.00000000000000e-01
+1044 0.00000000000000e+00
+1045 5.00000000000000e-01
+1046 -7.50000000000000e-01
+1047 0.00000000000000e+00
+1048 5.00000000000000e-01
+1049 -7.50000000000000e-01
+1050 0.00000000000000e+00
+1051 7.50000000000000e-01
+1052 -5.00000000000000e-01
+1053 0.00000000000000e+00
+1054 7.50000000000000e-01
+1055 -5.00000000000000e-01
+1056 0.00000000000000e+00
+1057 7.50000000000000e-01
+1058 -7.50000000000000e-01
+1059 0.00000000000000e+00
+1060 0.00000000000000e+00
+1061 -2.50000000000000e-01
+1062 0.00000000000000e+00
+1063 2.50000000000000e-01
+1064 0.00000000000000e+00
+1065 0.00000000000000e+00
+1066 2.50000000000000e-01
+1067 -2.50000000000000e-01
+1068 0.00000000000000e+00
+1069 0.00000000000000e+00
+1070 -2.50000000000000e-01
+1071 0.00000000000000e+00
+1072 2.50000000000000e-01
+1073 0.00000000000000e+00
+1074 0.00000000000000e+00
+1075 2.50000000000000e-01
+1076 -2.50000000000000e-01
+1077 0.00000000000000e+00
+1078 0.00000000000000e+00
+1079 -5.00000000000000e-01
+1080 0.00000000000000e+00
+1081 2.50000000000000e-01
+1082 -5.00000000000000e-01
+1083 0.00000000000000e+00
+1084 2.50000000000000e-01
+1085 -5.00000000000000e-01
+1086 0.00000000000000e+00
+1087 0.00000000000000e+00
+1088 -7.50000000000000e-01
+1089 0.00000000000000e+00
+1090 2.50000000000000e-01
+1091 -7.50000000000000e-01
+1092 0.00000000000000e+00
+1093 2.50000000000000e-01
+1094 -7.50000000000000e-01
+1095 0.00000000000000e+00
+1096 2.50000000000000e-01
+1097 -5.00000000000000e-01
+1098 0.00000000000000e+00
+1099 0.00000000000000e+00
+1100 -5.00000000000000e-01
+1101 0.00000000000000e+00
+1102 2.50000000000000e-01
+1103 -5.00000000000000e-01
+1104 0.00000000000000e+00
+1105 0.00000000000000e+00
+1106 -7.50000000000000e-01
+1107 0.00000000000000e+00
+1108 2.50000000000000e-01
+1109 -7.50000000000000e-01
+1110 0.00000000000000e+00
+1111 2.50000000000000e-01
+1112 -7.50000000000000e-01
+1113 0.00000000000000e+00
+1114 5.00000000000000e-01
+1115 0.00000000000000e+00
+1116 0.00000000000000e+00
+1117 5.00000000000000e-01
+1118 -2.50000000000000e-01
+1119 0.00000000000000e+00
+1120 5.00000000000000e-01
+1121 -2.50000000000000e-01
+1122 0.00000000000000e+00
+1123 7.50000000000000e-01
+1124 0.00000000000000e+00
+1125 0.00000000000000e+00
+1126 7.50000000000000e-01
+1127 -2.50000000000000e-01
+1128 0.00000000000000e+00
+1129 7.50000000000000e-01
+1130 -2.50000000000000e-01
+1131 0.00000000000000e+00
+1132 5.00000000000000e-01
+1133 -2.50000000000000e-01
+1134 0.00000000000000e+00
+1135 5.00000000000000e-01
+1136 0.00000000000000e+00
+1137 0.00000000000000e+00
+1138 5.00000000000000e-01
+1139 -2.50000000000000e-01
+1140 0.00000000000000e+00
+1141 7.50000000000000e-01
+1142 0.00000000000000e+00
+1143 0.00000000000000e+00
+1144 7.50000000000000e-01
+1145 -2.50000000000000e-01
+1146 0.00000000000000e+00
+1147 7.50000000000000e-01
+1148 -2.50000000000000e-01
+1149 0.00000000000000e+00
+1150 5.00000000000000e-01
+1151 -5.00000000000000e-01
+1152 0.00000000000000e+00
+1153 5.00000000000000e-01
+1154 -7.50000000000000e-01
+1155 0.00000000000000e+00
+1156 5.00000000000000e-01
+1157 -7.50000000000000e-01
+1158 0.00000000000000e+00
+1159 7.50000000000000e-01
+1160 -5.00000000000000e-01
+1161 0.00000000000000e+00
+1162 7.50000000000000e-01
+1163 -5.00000000000000e-01
+1164 0.00000000000000e+00
+1165 7.50000000000000e-01
+1166 -7.50000000000000e-01
+1167 0.00000000000000e+00
+1168 5.00000000000000e-01
+1169 -5.00000000000000e-01
+1170 0.00000000000000e+00
+1171 5.00000000000000e-01
+1172 -7.50000000000000e-01
+1173 0.00000000000000e+00
+1174 5.00000000000000e-01
+1175 -7.50000000000000e-01
+1176 0.00000000000000e+00
+1177 7.50000000000000e-01
+1178 -5.00000000000000e-01
+1179 0.00000000000000e+00
+1180 7.50000000000000e-01
+1181 -5.00000000000000e-01
+1182 0.00000000000000e+00
+1183 7.50000000000000e-01
+1184 -7.50000000000000e-01
+1185 0.00000000000000e+00
+1186 2.50000000000000e-01
+1187 -5.00000000000000e-01
+1188 0.00000000000000e+00
+1189 2.50000000000000e-01
+1190 -7.50000000000000e-01
+1191 0.00000000000000e+00
+1192 5.00000000000000e-01
+1193 -2.50000000000000e-01
+1194 0.00000000000000e+00
+1195 7.50000000000000e-01
+1196 -2.50000000000000e-01
+1197 0.00000000000000e+00
+1198 5.00000000000000e-01
+1199 -7.50000000000000e-01
+1200 0.00000000000000e+00
+1201 7.50000000000000e-01
+1202 -5.00000000000000e-01
+1203 0.00000000000000e+00
+1204 2.50000000000000e-01
+1205 -1.00000000000000e+00
+1206 0.00000000000000e+00
+1207 2.50000000000000e-01
+1208 -1.00000000000000e+00
+1209 0.00000000000000e+00
+1210 5.00000000000000e-01
+1211 -1.00000000000000e+00
+1212 0.00000000000000e+00
+1213 7.50000000000000e-01
+1214 -1.00000000000000e+00
+1215 0.00000000000000e+00
+1216 5.00000000000000e-01
+1217 -1.00000000000000e+00
+1218 0.00000000000000e+00
+1219 7.50000000000000e-01
+1220 -1.00000000000000e+00
+1221 0.00000000000000e+00
+1222 2.50000000000000e-01
+1223 -1.00000000000000e+00
+1224 0.00000000000000e+00
+1225 2.50000000000000e-01
+1226 -1.00000000000000e+00
+1227 0.00000000000000e+00
+1228 5.00000000000000e-01
+1229 -1.00000000000000e+00
+1230 0.00000000000000e+00
+1231 7.50000000000000e-01
+1232 -1.00000000000000e+00
+1233 0.00000000000000e+00
+1234 5.00000000000000e-01
+1235 -1.00000000000000e+00
+1236 0.00000000000000e+00
+1237 7.50000000000000e-01
+1238 -1.00000000000000e+00
+1239 0.00000000000000e+00
+1240 1.00000000000000e+00
+1241 -2.50000000000000e-01
+1242 0.00000000000000e+00
+1243 1.00000000000000e+00
+1244 -2.50000000000000e-01
+1245 0.00000000000000e+00
+1246 1.00000000000000e+00
+1247 -5.00000000000000e-01
+1248 0.00000000000000e+00
+1249 1.00000000000000e+00
+1250 -7.50000000000000e-01
+1251 0.00000000000000e+00
+1252 1.00000000000000e+00
+1253 -5.00000000000000e-01
+1254 0.00000000000000e+00
+1255 1.00000000000000e+00
+1256 -7.50000000000000e-01
+1257 0.00000000000000e+00
+1258 1.00000000000000e+00
+1259 -2.50000000000000e-01
+1260 0.00000000000000e+00
+1261 1.00000000000000e+00
+1262 -2.50000000000000e-01
+1263 0.00000000000000e+00
+1264 1.00000000000000e+00
+1265 -5.00000000000000e-01
+1266 0.00000000000000e+00
+1267 1.00000000000000e+00
+1268 -7.50000000000000e-01
+1269 0.00000000000000e+00
+1270 1.00000000000000e+00
+1271 -5.00000000000000e-01
+1272 0.00000000000000e+00
+1273 1.00000000000000e+00
+1274 -7.50000000000000e-01
diff --git a/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/rbms.1.00002 b/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/rbms.1.00002
new file mode 100644
index 00000000..d144d25c
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/rbms.1.00002
@@ -0,0 +1,601 @@
+1275 1875
+1275 0.00000000000000e+00
+1276 0.00000000000000e+00
+1277 0.00000000000000e+00
+1278 0.00000000000000e+00
+1279 0.00000000000000e+00
+1280 0.00000000000000e+00
+1281 0.00000000000000e+00
+1282 0.00000000000000e+00
+1283 -1.00000000000000e+00
+1284 0.00000000000000e+00
+1285 0.00000000000000e+00
+1286 -1.00000000000000e+00
+1287 0.00000000000000e+00
+1288 1.00000000000000e+00
+1289 0.00000000000000e+00
+1290 0.00000000000000e+00
+1291 1.00000000000000e+00
+1292 0.00000000000000e+00
+1293 0.00000000000000e+00
+1294 1.00000000000000e+00
+1295 -1.00000000000000e+00
+1296 0.00000000000000e+00
+1297 1.00000000000000e+00
+1298 -1.00000000000000e+00
+1299 0.00000000000000e+00
+1300 0.00000000000000e+00
+1301 0.00000000000000e+00
+1302 0.00000000000000e+00
+1303 0.00000000000000e+00
+1304 -5.00000000000000e-01
+1305 0.00000000000000e+00
+1306 0.00000000000000e+00
+1307 -5.00000000000000e-01
+1308 0.00000000000000e+00
+1309 5.00000000000000e-01
+1310 0.00000000000000e+00
+1311 0.00000000000000e+00
+1312 5.00000000000000e-01
+1313 0.00000000000000e+00
+1314 0.00000000000000e+00
+1315 5.00000000000000e-01
+1316 -5.00000000000000e-01
+1317 0.00000000000000e+00
+1318 5.00000000000000e-01
+1319 -5.00000000000000e-01
+1320 0.00000000000000e+00
+1321 0.00000000000000e+00
+1322 0.00000000000000e+00
+1323 0.00000000000000e+00
+1324 0.00000000000000e+00
+1325 -5.00000000000000e-01
+1326 0.00000000000000e+00
+1327 0.00000000000000e+00
+1328 -5.00000000000000e-01
+1329 0.00000000000000e+00
+1330 5.00000000000000e-01
+1331 0.00000000000000e+00
+1332 0.00000000000000e+00
+1333 5.00000000000000e-01
+1334 0.00000000000000e+00
+1335 0.00000000000000e+00
+1336 5.00000000000000e-01
+1337 -5.00000000000000e-01
+1338 0.00000000000000e+00
+1339 5.00000000000000e-01
+1340 -5.00000000000000e-01
+1341 0.00000000000000e+00
+1342 0.00000000000000e+00
+1343 -1.00000000000000e+00
+1344 0.00000000000000e+00
+1345 5.00000000000000e-01
+1346 -1.00000000000000e+00
+1347 0.00000000000000e+00
+1348 5.00000000000000e-01
+1349 -1.00000000000000e+00
+1350 0.00000000000000e+00
+1351 0.00000000000000e+00
+1352 -1.00000000000000e+00
+1353 0.00000000000000e+00
+1354 5.00000000000000e-01
+1355 -1.00000000000000e+00
+1356 0.00000000000000e+00
+1357 5.00000000000000e-01
+1358 -1.00000000000000e+00
+1359 0.00000000000000e+00
+1360 1.00000000000000e+00
+1361 0.00000000000000e+00
+1362 0.00000000000000e+00
+1363 1.00000000000000e+00
+1364 -5.00000000000000e-01
+1365 0.00000000000000e+00
+1366 1.00000000000000e+00
+1367 -5.00000000000000e-01
+1368 0.00000000000000e+00
+1369 1.00000000000000e+00
+1370 0.00000000000000e+00
+1371 0.00000000000000e+00
+1372 1.00000000000000e+00
+1373 -5.00000000000000e-01
+1374 0.00000000000000e+00
+1375 1.00000000000000e+00
+1376 -5.00000000000000e-01
+1377 0.00000000000000e+00
+1378 1.00000000000000e+00
+1379 -1.00000000000000e+00
+1380 0.00000000000000e+00
+1381 1.00000000000000e+00
+1382 -1.00000000000000e+00
+1383 0.00000000000000e+00
+1384 0.00000000000000e+00
+1385 0.00000000000000e+00
+1386 0.00000000000000e+00
+1387 0.00000000000000e+00
+1388 -2.50000000000000e-01
+1389 0.00000000000000e+00
+1390 0.00000000000000e+00
+1391 -2.50000000000000e-01
+1392 0.00000000000000e+00
+1393 2.50000000000000e-01
+1394 0.00000000000000e+00
+1395 0.00000000000000e+00
+1396 2.50000000000000e-01
+1397 0.00000000000000e+00
+1398 0.00000000000000e+00
+1399 2.50000000000000e-01
+1400 -2.50000000000000e-01
+1401 0.00000000000000e+00
+1402 2.50000000000000e-01
+1403 -2.50000000000000e-01
+1404 0.00000000000000e+00
+1405 0.00000000000000e+00
+1406 0.00000000000000e+00
+1407 0.00000000000000e+00
+1408 0.00000000000000e+00
+1409 0.00000000000000e+00
+1410 0.00000000000000e+00
+1411 0.00000000000000e+00
+1412 -2.50000000000000e-01
+1413 0.00000000000000e+00
+1414 0.00000000000000e+00
+1415 -2.50000000000000e-01
+1416 0.00000000000000e+00
+1417 2.50000000000000e-01
+1418 0.00000000000000e+00
+1419 0.00000000000000e+00
+1420 2.50000000000000e-01
+1421 0.00000000000000e+00
+1422 0.00000000000000e+00
+1423 2.50000000000000e-01
+1424 -2.50000000000000e-01
+1425 0.00000000000000e+00
+1426 2.50000000000000e-01
+1427 -2.50000000000000e-01
+1428 0.00000000000000e+00
+1429 0.00000000000000e+00
+1430 0.00000000000000e+00
+1431 0.00000000000000e+00
+1432 0.00000000000000e+00
+1433 -7.50000000000000e-01
+1434 0.00000000000000e+00
+1435 0.00000000000000e+00
+1436 -1.00000000000000e+00
+1437 0.00000000000000e+00
+1438 2.50000000000000e-01
+1439 -1.00000000000000e+00
+1440 0.00000000000000e+00
+1441 2.50000000000000e-01
+1442 -1.00000000000000e+00
+1443 0.00000000000000e+00
+1444 0.00000000000000e+00
+1445 -7.50000000000000e-01
+1446 0.00000000000000e+00
+1447 0.00000000000000e+00
+1448 -7.50000000000000e-01
+1449 0.00000000000000e+00
+1450 0.00000000000000e+00
+1451 -1.00000000000000e+00
+1452 0.00000000000000e+00
+1453 0.00000000000000e+00
+1454 -1.00000000000000e+00
+1455 0.00000000000000e+00
+1456 2.50000000000000e-01
+1457 -1.00000000000000e+00
+1458 0.00000000000000e+00
+1459 2.50000000000000e-01
+1460 -1.00000000000000e+00
+1461 0.00000000000000e+00
+1462 0.00000000000000e+00
+1463 -7.50000000000000e-01
+1464 0.00000000000000e+00
+1465 0.00000000000000e+00
+1466 -1.00000000000000e+00
+1467 0.00000000000000e+00
+1468 7.50000000000000e-01
+1469 0.00000000000000e+00
+1470 0.00000000000000e+00
+1471 1.00000000000000e+00
+1472 0.00000000000000e+00
+1473 0.00000000000000e+00
+1474 1.00000000000000e+00
+1475 -2.50000000000000e-01
+1476 0.00000000000000e+00
+1477 1.00000000000000e+00
+1478 -2.50000000000000e-01
+1479 0.00000000000000e+00
+1480 7.50000000000000e-01
+1481 0.00000000000000e+00
+1482 0.00000000000000e+00
+1483 7.50000000000000e-01
+1484 0.00000000000000e+00
+1485 0.00000000000000e+00
+1486 1.00000000000000e+00
+1487 0.00000000000000e+00
+1488 0.00000000000000e+00
+1489 1.00000000000000e+00
+1490 0.00000000000000e+00
+1491 0.00000000000000e+00
+1492 1.00000000000000e+00
+1493 -2.50000000000000e-01
+1494 0.00000000000000e+00
+1495 1.00000000000000e+00
+1496 -2.50000000000000e-01
+1497 0.00000000000000e+00
+1498 7.50000000000000e-01
+1499 0.00000000000000e+00
+1500 0.00000000000000e+00
+1501 1.00000000000000e+00
+1502 0.00000000000000e+00
+1503 0.00000000000000e+00
+1504 7.50000000000000e-01
+1505 -7.50000000000000e-01
+1506 0.00000000000000e+00
+1507 7.50000000000000e-01
+1508 -1.00000000000000e+00
+1509 0.00000000000000e+00
+1510 1.00000000000000e+00
+1511 -7.50000000000000e-01
+1512 0.00000000000000e+00
+1513 1.00000000000000e+00
+1514 -1.00000000000000e+00
+1515 0.00000000000000e+00
+1516 7.50000000000000e-01
+1517 -7.50000000000000e-01
+1518 0.00000000000000e+00
+1519 7.50000000000000e-01
+1520 -7.50000000000000e-01
+1521 0.00000000000000e+00
+1522 7.50000000000000e-01
+1523 -1.00000000000000e+00
+1524 0.00000000000000e+00
+1525 7.50000000000000e-01
+1526 -1.00000000000000e+00
+1527 0.00000000000000e+00
+1528 1.00000000000000e+00
+1529 -7.50000000000000e-01
+1530 0.00000000000000e+00
+1531 1.00000000000000e+00
+1532 -7.50000000000000e-01
+1533 0.00000000000000e+00
+1534 1.00000000000000e+00
+1535 -1.00000000000000e+00
+1536 0.00000000000000e+00
+1537 1.00000000000000e+00
+1538 -1.00000000000000e+00
+1539 0.00000000000000e+00
+1540 7.50000000000000e-01
+1541 -7.50000000000000e-01
+1542 0.00000000000000e+00
+1543 7.50000000000000e-01
+1544 -1.00000000000000e+00
+1545 0.00000000000000e+00
+1546 1.00000000000000e+00
+1547 -7.50000000000000e-01
+1548 0.00000000000000e+00
+1549 1.00000000000000e+00
+1550 -1.00000000000000e+00
+1551 0.00000000000000e+00
+1552 0.00000000000000e+00
+1553 -2.50000000000000e-01
+1554 0.00000000000000e+00
+1555 2.50000000000000e-01
+1556 0.00000000000000e+00
+1557 0.00000000000000e+00
+1558 2.50000000000000e-01
+1559 -2.50000000000000e-01
+1560 0.00000000000000e+00
+1561 0.00000000000000e+00
+1562 -2.50000000000000e-01
+1563 0.00000000000000e+00
+1564 2.50000000000000e-01
+1565 0.00000000000000e+00
+1566 0.00000000000000e+00
+1567 2.50000000000000e-01
+1568 -2.50000000000000e-01
+1569 0.00000000000000e+00
+1570 0.00000000000000e+00
+1571 -5.00000000000000e-01
+1572 0.00000000000000e+00
+1573 2.50000000000000e-01
+1574 -5.00000000000000e-01
+1575 0.00000000000000e+00
+1576 2.50000000000000e-01
+1577 -5.00000000000000e-01
+1578 0.00000000000000e+00
+1579 0.00000000000000e+00
+1580 -7.50000000000000e-01
+1581 0.00000000000000e+00
+1582 2.50000000000000e-01
+1583 -7.50000000000000e-01
+1584 0.00000000000000e+00
+1585 2.50000000000000e-01
+1586 -7.50000000000000e-01
+1587 0.00000000000000e+00
+1588 2.50000000000000e-01
+1589 -5.00000000000000e-01
+1590 0.00000000000000e+00
+1591 0.00000000000000e+00
+1592 -5.00000000000000e-01
+1593 0.00000000000000e+00
+1594 2.50000000000000e-01
+1595 -5.00000000000000e-01
+1596 0.00000000000000e+00
+1597 0.00000000000000e+00
+1598 -7.50000000000000e-01
+1599 0.00000000000000e+00
+1600 2.50000000000000e-01
+1601 -7.50000000000000e-01
+1602 0.00000000000000e+00
+1603 2.50000000000000e-01
+1604 -7.50000000000000e-01
+1605 0.00000000000000e+00
+1606 5.00000000000000e-01
+1607 0.00000000000000e+00
+1608 0.00000000000000e+00
+1609 5.00000000000000e-01
+1610 -2.50000000000000e-01
+1611 0.00000000000000e+00
+1612 5.00000000000000e-01
+1613 -2.50000000000000e-01
+1614 0.00000000000000e+00
+1615 7.50000000000000e-01
+1616 0.00000000000000e+00
+1617 0.00000000000000e+00
+1618 7.50000000000000e-01
+1619 -2.50000000000000e-01
+1620 0.00000000000000e+00
+1621 7.50000000000000e-01
+1622 -2.50000000000000e-01
+1623 0.00000000000000e+00
+1624 5.00000000000000e-01
+1625 -2.50000000000000e-01
+1626 0.00000000000000e+00
+1627 5.00000000000000e-01
+1628 0.00000000000000e+00
+1629 0.00000000000000e+00
+1630 5.00000000000000e-01
+1631 -2.50000000000000e-01
+1632 0.00000000000000e+00
+1633 7.50000000000000e-01
+1634 0.00000000000000e+00
+1635 0.00000000000000e+00
+1636 7.50000000000000e-01
+1637 -2.50000000000000e-01
+1638 0.00000000000000e+00
+1639 7.50000000000000e-01
+1640 -2.50000000000000e-01
+1641 0.00000000000000e+00
+1642 5.00000000000000e-01
+1643 -5.00000000000000e-01
+1644 0.00000000000000e+00
+1645 5.00000000000000e-01
+1646 -7.50000000000000e-01
+1647 0.00000000000000e+00
+1648 5.00000000000000e-01
+1649 -7.50000000000000e-01
+1650 0.00000000000000e+00
+1651 7.50000000000000e-01
+1652 -5.00000000000000e-01
+1653 0.00000000000000e+00
+1654 7.50000000000000e-01
+1655 -5.00000000000000e-01
+1656 0.00000000000000e+00
+1657 7.50000000000000e-01
+1658 -7.50000000000000e-01
+1659 0.00000000000000e+00
+1660 5.00000000000000e-01
+1661 -5.00000000000000e-01
+1662 0.00000000000000e+00
+1663 5.00000000000000e-01
+1664 -7.50000000000000e-01
+1665 0.00000000000000e+00
+1666 5.00000000000000e-01
+1667 -7.50000000000000e-01
+1668 0.00000000000000e+00
+1669 7.50000000000000e-01
+1670 -5.00000000000000e-01
+1671 0.00000000000000e+00
+1672 7.50000000000000e-01
+1673 -5.00000000000000e-01
+1674 0.00000000000000e+00
+1675 7.50000000000000e-01
+1676 -7.50000000000000e-01
+1677 0.00000000000000e+00
+1678 0.00000000000000e+00
+1679 -2.50000000000000e-01
+1680 0.00000000000000e+00
+1681 2.50000000000000e-01
+1682 0.00000000000000e+00
+1683 0.00000000000000e+00
+1684 2.50000000000000e-01
+1685 -2.50000000000000e-01
+1686 0.00000000000000e+00
+1687 0.00000000000000e+00
+1688 -2.50000000000000e-01
+1689 0.00000000000000e+00
+1690 2.50000000000000e-01
+1691 0.00000000000000e+00
+1692 0.00000000000000e+00
+1693 2.50000000000000e-01
+1694 -2.50000000000000e-01
+1695 0.00000000000000e+00
+1696 0.00000000000000e+00
+1697 -5.00000000000000e-01
+1698 0.00000000000000e+00
+1699 2.50000000000000e-01
+1700 -5.00000000000000e-01
+1701 0.00000000000000e+00
+1702 2.50000000000000e-01
+1703 -5.00000000000000e-01
+1704 0.00000000000000e+00
+1705 0.00000000000000e+00
+1706 -7.50000000000000e-01
+1707 0.00000000000000e+00
+1708 2.50000000000000e-01
+1709 -7.50000000000000e-01
+1710 0.00000000000000e+00
+1711 2.50000000000000e-01
+1712 -7.50000000000000e-01
+1713 0.00000000000000e+00
+1714 2.50000000000000e-01
+1715 -5.00000000000000e-01
+1716 0.00000000000000e+00
+1717 0.00000000000000e+00
+1718 -5.00000000000000e-01
+1719 0.00000000000000e+00
+1720 2.50000000000000e-01
+1721 -5.00000000000000e-01
+1722 0.00000000000000e+00
+1723 0.00000000000000e+00
+1724 -7.50000000000000e-01
+1725 0.00000000000000e+00
+1726 2.50000000000000e-01
+1727 -7.50000000000000e-01
+1728 0.00000000000000e+00
+1729 2.50000000000000e-01
+1730 -7.50000000000000e-01
+1731 0.00000000000000e+00
+1732 5.00000000000000e-01
+1733 0.00000000000000e+00
+1734 0.00000000000000e+00
+1735 5.00000000000000e-01
+1736 -2.50000000000000e-01
+1737 0.00000000000000e+00
+1738 5.00000000000000e-01
+1739 -2.50000000000000e-01
+1740 0.00000000000000e+00
+1741 7.50000000000000e-01
+1742 0.00000000000000e+00
+1743 0.00000000000000e+00
+1744 7.50000000000000e-01
+1745 -2.50000000000000e-01
+1746 0.00000000000000e+00
+1747 7.50000000000000e-01
+1748 -2.50000000000000e-01
+1749 0.00000000000000e+00
+1750 5.00000000000000e-01
+1751 -2.50000000000000e-01
+1752 0.00000000000000e+00
+1753 5.00000000000000e-01
+1754 0.00000000000000e+00
+1755 0.00000000000000e+00
+1756 5.00000000000000e-01
+1757 -2.50000000000000e-01
+1758 0.00000000000000e+00
+1759 7.50000000000000e-01
+1760 0.00000000000000e+00
+1761 0.00000000000000e+00
+1762 7.50000000000000e-01
+1763 -2.50000000000000e-01
+1764 0.00000000000000e+00
+1765 7.50000000000000e-01
+1766 -2.50000000000000e-01
+1767 0.00000000000000e+00
+1768 5.00000000000000e-01
+1769 -5.00000000000000e-01
+1770 0.00000000000000e+00
+1771 5.00000000000000e-01
+1772 -7.50000000000000e-01
+1773 0.00000000000000e+00
+1774 5.00000000000000e-01
+1775 -7.50000000000000e-01
+1776 0.00000000000000e+00
+1777 7.50000000000000e-01
+1778 -5.00000000000000e-01
+1779 0.00000000000000e+00
+1780 7.50000000000000e-01
+1781 -5.00000000000000e-01
+1782 0.00000000000000e+00
+1783 7.50000000000000e-01
+1784 -7.50000000000000e-01
+1785 0.00000000000000e+00
+1786 5.00000000000000e-01
+1787 -5.00000000000000e-01
+1788 0.00000000000000e+00
+1789 5.00000000000000e-01
+1790 -7.50000000000000e-01
+1791 0.00000000000000e+00
+1792 5.00000000000000e-01
+1793 -7.50000000000000e-01
+1794 0.00000000000000e+00
+1795 7.50000000000000e-01
+1796 -5.00000000000000e-01
+1797 0.00000000000000e+00
+1798 7.50000000000000e-01
+1799 -5.00000000000000e-01
+1800 0.00000000000000e+00
+1801 7.50000000000000e-01
+1802 -7.50000000000000e-01
+1803 0.00000000000000e+00
+1804 2.50000000000000e-01
+1805 -1.00000000000000e+00
+1806 0.00000000000000e+00
+1807 2.50000000000000e-01
+1808 -1.00000000000000e+00
+1809 0.00000000000000e+00
+1810 5.00000000000000e-01
+1811 -1.00000000000000e+00
+1812 0.00000000000000e+00
+1813 7.50000000000000e-01
+1814 -1.00000000000000e+00
+1815 0.00000000000000e+00
+1816 5.00000000000000e-01
+1817 -1.00000000000000e+00
+1818 0.00000000000000e+00
+1819 7.50000000000000e-01
+1820 -1.00000000000000e+00
+1821 0.00000000000000e+00
+1822 2.50000000000000e-01
+1823 -1.00000000000000e+00
+1824 0.00000000000000e+00
+1825 2.50000000000000e-01
+1826 -1.00000000000000e+00
+1827 0.00000000000000e+00
+1828 5.00000000000000e-01
+1829 -1.00000000000000e+00
+1830 0.00000000000000e+00
+1831 7.50000000000000e-01
+1832 -1.00000000000000e+00
+1833 0.00000000000000e+00
+1834 5.00000000000000e-01
+1835 -1.00000000000000e+00
+1836 0.00000000000000e+00
+1837 7.50000000000000e-01
+1838 -1.00000000000000e+00
+1839 0.00000000000000e+00
+1840 1.00000000000000e+00
+1841 -2.50000000000000e-01
+1842 0.00000000000000e+00
+1843 1.00000000000000e+00
+1844 -2.50000000000000e-01
+1845 0.00000000000000e+00
+1846 1.00000000000000e+00
+1847 -5.00000000000000e-01
+1848 0.00000000000000e+00
+1849 1.00000000000000e+00
+1850 -7.50000000000000e-01
+1851 0.00000000000000e+00
+1852 1.00000000000000e+00
+1853 -5.00000000000000e-01
+1854 0.00000000000000e+00
+1855 1.00000000000000e+00
+1856 -7.50000000000000e-01
+1857 0.00000000000000e+00
+1858 1.00000000000000e+00
+1859 -2.50000000000000e-01
+1860 0.00000000000000e+00
+1861 1.00000000000000e+00
+1862 -2.50000000000000e-01
+1863 0.00000000000000e+00
+1864 1.00000000000000e+00
+1865 -5.00000000000000e-01
+1866 0.00000000000000e+00
+1867 1.00000000000000e+00
+1868 -7.50000000000000e-01
+1869 0.00000000000000e+00
+1870 1.00000000000000e+00
+1871 -5.00000000000000e-01
+1872 0.00000000000000e+00
+1873 1.00000000000000e+00
+1874 -7.50000000000000e-01
diff --git a/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/rbms.1.00003 b/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/rbms.1.00003
new file mode 100644
index 00000000..93228d6e
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/rbms.1.00003
@@ -0,0 +1,601 @@
+1875 2475
+1875 0.00000000000000e+00
+1876 0.00000000000000e+00
+1877 0.00000000000000e+00
+1878 0.00000000000000e+00
+1879 0.00000000000000e+00
+1880 0.00000000000000e+00
+1881 0.00000000000000e+00
+1882 0.00000000000000e+00
+1883 -1.00000000000000e+00
+1884 0.00000000000000e+00
+1885 0.00000000000000e+00
+1886 -1.00000000000000e+00
+1887 0.00000000000000e+00
+1888 1.00000000000000e+00
+1889 0.00000000000000e+00
+1890 0.00000000000000e+00
+1891 1.00000000000000e+00
+1892 0.00000000000000e+00
+1893 0.00000000000000e+00
+1894 1.00000000000000e+00
+1895 -1.00000000000000e+00
+1896 0.00000000000000e+00
+1897 1.00000000000000e+00
+1898 -1.00000000000000e+00
+1899 0.00000000000000e+00
+1900 0.00000000000000e+00
+1901 0.00000000000000e+00
+1902 0.00000000000000e+00
+1903 0.00000000000000e+00
+1904 -5.00000000000000e-01
+1905 0.00000000000000e+00
+1906 0.00000000000000e+00
+1907 -5.00000000000000e-01
+1908 0.00000000000000e+00
+1909 5.00000000000000e-01
+1910 0.00000000000000e+00
+1911 0.00000000000000e+00
+1912 5.00000000000000e-01
+1913 0.00000000000000e+00
+1914 0.00000000000000e+00
+1915 5.00000000000000e-01
+1916 -5.00000000000000e-01
+1917 0.00000000000000e+00
+1918 5.00000000000000e-01
+1919 -5.00000000000000e-01
+1920 0.00000000000000e+00
+1921 0.00000000000000e+00
+1922 0.00000000000000e+00
+1923 0.00000000000000e+00
+1924 0.00000000000000e+00
+1925 -5.00000000000000e-01
+1926 0.00000000000000e+00
+1927 0.00000000000000e+00
+1928 -5.00000000000000e-01
+1929 0.00000000000000e+00
+1930 5.00000000000000e-01
+1931 0.00000000000000e+00
+1932 0.00000000000000e+00
+1933 5.00000000000000e-01
+1934 0.00000000000000e+00
+1935 0.00000000000000e+00
+1936 5.00000000000000e-01
+1937 -5.00000000000000e-01
+1938 0.00000000000000e+00
+1939 5.00000000000000e-01
+1940 -5.00000000000000e-01
+1941 0.00000000000000e+00
+1942 0.00000000000000e+00
+1943 -1.00000000000000e+00
+1944 0.00000000000000e+00
+1945 5.00000000000000e-01
+1946 -1.00000000000000e+00
+1947 0.00000000000000e+00
+1948 5.00000000000000e-01
+1949 -1.00000000000000e+00
+1950 0.00000000000000e+00
+1951 0.00000000000000e+00
+1952 -1.00000000000000e+00
+1953 0.00000000000000e+00
+1954 5.00000000000000e-01
+1955 -1.00000000000000e+00
+1956 0.00000000000000e+00
+1957 5.00000000000000e-01
+1958 -1.00000000000000e+00
+1959 0.00000000000000e+00
+1960 1.00000000000000e+00
+1961 0.00000000000000e+00
+1962 0.00000000000000e+00
+1963 1.00000000000000e+00
+1964 -5.00000000000000e-01
+1965 0.00000000000000e+00
+1966 1.00000000000000e+00
+1967 -5.00000000000000e-01
+1968 0.00000000000000e+00
+1969 1.00000000000000e+00
+1970 0.00000000000000e+00
+1971 0.00000000000000e+00
+1972 1.00000000000000e+00
+1973 -5.00000000000000e-01
+1974 0.00000000000000e+00
+1975 1.00000000000000e+00
+1976 -5.00000000000000e-01
+1977 0.00000000000000e+00
+1978 1.00000000000000e+00
+1979 -1.00000000000000e+00
+1980 0.00000000000000e+00
+1981 1.00000000000000e+00
+1982 -1.00000000000000e+00
+1983 0.00000000000000e+00
+1984 0.00000000000000e+00
+1985 0.00000000000000e+00
+1986 0.00000000000000e+00
+1987 0.00000000000000e+00
+1988 -2.50000000000000e-01
+1989 0.00000000000000e+00
+1990 0.00000000000000e+00
+1991 -2.50000000000000e-01
+1992 0.00000000000000e+00
+1993 2.50000000000000e-01
+1994 0.00000000000000e+00
+1995 0.00000000000000e+00
+1996 2.50000000000000e-01
+1997 0.00000000000000e+00
+1998 0.00000000000000e+00
+1999 2.50000000000000e-01
+2000 -2.50000000000000e-01
+2001 0.00000000000000e+00
+2002 2.50000000000000e-01
+2003 -2.50000000000000e-01
+2004 0.00000000000000e+00
+2005 0.00000000000000e+00
+2006 0.00000000000000e+00
+2007 0.00000000000000e+00
+2008 0.00000000000000e+00
+2009 0.00000000000000e+00
+2010 0.00000000000000e+00
+2011 0.00000000000000e+00
+2012 -2.50000000000000e-01
+2013 0.00000000000000e+00
+2014 0.00000000000000e+00
+2015 -2.50000000000000e-01
+2016 0.00000000000000e+00
+2017 2.50000000000000e-01
+2018 0.00000000000000e+00
+2019 0.00000000000000e+00
+2020 2.50000000000000e-01
+2021 0.00000000000000e+00
+2022 0.00000000000000e+00
+2023 2.50000000000000e-01
+2024 -2.50000000000000e-01
+2025 0.00000000000000e+00
+2026 2.50000000000000e-01
+2027 -2.50000000000000e-01
+2028 0.00000000000000e+00
+2029 0.00000000000000e+00
+2030 0.00000000000000e+00
+2031 0.00000000000000e+00
+2032 0.00000000000000e+00
+2033 -7.50000000000000e-01
+2034 0.00000000000000e+00
+2035 0.00000000000000e+00
+2036 -1.00000000000000e+00
+2037 0.00000000000000e+00
+2038 2.50000000000000e-01
+2039 -1.00000000000000e+00
+2040 0.00000000000000e+00
+2041 2.50000000000000e-01
+2042 -1.00000000000000e+00
+2043 0.00000000000000e+00
+2044 0.00000000000000e+00
+2045 -7.50000000000000e-01
+2046 0.00000000000000e+00
+2047 0.00000000000000e+00
+2048 -7.50000000000000e-01
+2049 0.00000000000000e+00
+2050 0.00000000000000e+00
+2051 -1.00000000000000e+00
+2052 0.00000000000000e+00
+2053 0.00000000000000e+00
+2054 -1.00000000000000e+00
+2055 0.00000000000000e+00
+2056 2.50000000000000e-01
+2057 -1.00000000000000e+00
+2058 0.00000000000000e+00
+2059 2.50000000000000e-01
+2060 -1.00000000000000e+00
+2061 0.00000000000000e+00
+2062 0.00000000000000e+00
+2063 -7.50000000000000e-01
+2064 0.00000000000000e+00
+2065 0.00000000000000e+00
+2066 -1.00000000000000e+00
+2067 0.00000000000000e+00
+2068 7.50000000000000e-01
+2069 0.00000000000000e+00
+2070 0.00000000000000e+00
+2071 1.00000000000000e+00
+2072 0.00000000000000e+00
+2073 0.00000000000000e+00
+2074 1.00000000000000e+00
+2075 -2.50000000000000e-01
+2076 0.00000000000000e+00
+2077 1.00000000000000e+00
+2078 -2.50000000000000e-01
+2079 0.00000000000000e+00
+2080 7.50000000000000e-01
+2081 0.00000000000000e+00
+2082 0.00000000000000e+00
+2083 7.50000000000000e-01
+2084 0.00000000000000e+00
+2085 0.00000000000000e+00
+2086 1.00000000000000e+00
+2087 0.00000000000000e+00
+2088 0.00000000000000e+00
+2089 1.00000000000000e+00
+2090 0.00000000000000e+00
+2091 0.00000000000000e+00
+2092 1.00000000000000e+00
+2093 -2.50000000000000e-01
+2094 0.00000000000000e+00
+2095 1.00000000000000e+00
+2096 -2.50000000000000e-01
+2097 0.00000000000000e+00
+2098 7.50000000000000e-01
+2099 0.00000000000000e+00
+2100 0.00000000000000e+00
+2101 1.00000000000000e+00
+2102 0.00000000000000e+00
+2103 0.00000000000000e+00
+2104 7.50000000000000e-01
+2105 -7.50000000000000e-01
+2106 0.00000000000000e+00
+2107 7.50000000000000e-01
+2108 -1.00000000000000e+00
+2109 0.00000000000000e+00
+2110 1.00000000000000e+00
+2111 -7.50000000000000e-01
+2112 0.00000000000000e+00
+2113 1.00000000000000e+00
+2114 -1.00000000000000e+00
+2115 0.00000000000000e+00
+2116 7.50000000000000e-01
+2117 -7.50000000000000e-01
+2118 0.00000000000000e+00
+2119 7.50000000000000e-01
+2120 -7.50000000000000e-01
+2121 0.00000000000000e+00
+2122 7.50000000000000e-01
+2123 -1.00000000000000e+00
+2124 0.00000000000000e+00
+2125 7.50000000000000e-01
+2126 -1.00000000000000e+00
+2127 0.00000000000000e+00
+2128 1.00000000000000e+00
+2129 -7.50000000000000e-01
+2130 0.00000000000000e+00
+2131 1.00000000000000e+00
+2132 -7.50000000000000e-01
+2133 0.00000000000000e+00
+2134 1.00000000000000e+00
+2135 -1.00000000000000e+00
+2136 0.00000000000000e+00
+2137 1.00000000000000e+00
+2138 -1.00000000000000e+00
+2139 0.00000000000000e+00
+2140 7.50000000000000e-01
+2141 -7.50000000000000e-01
+2142 0.00000000000000e+00
+2143 7.50000000000000e-01
+2144 -1.00000000000000e+00
+2145 0.00000000000000e+00
+2146 1.00000000000000e+00
+2147 -7.50000000000000e-01
+2148 0.00000000000000e+00
+2149 1.00000000000000e+00
+2150 -1.00000000000000e+00
+2151 0.00000000000000e+00
+2152 0.00000000000000e+00
+2153 -2.50000000000000e-01
+2154 0.00000000000000e+00
+2155 2.50000000000000e-01
+2156 0.00000000000000e+00
+2157 0.00000000000000e+00
+2158 2.50000000000000e-01
+2159 -2.50000000000000e-01
+2160 0.00000000000000e+00
+2161 0.00000000000000e+00
+2162 -2.50000000000000e-01
+2163 0.00000000000000e+00
+2164 2.50000000000000e-01
+2165 0.00000000000000e+00
+2166 0.00000000000000e+00
+2167 2.50000000000000e-01
+2168 -2.50000000000000e-01
+2169 0.00000000000000e+00
+2170 0.00000000000000e+00
+2171 -5.00000000000000e-01
+2172 0.00000000000000e+00
+2173 2.50000000000000e-01
+2174 -5.00000000000000e-01
+2175 0.00000000000000e+00
+2176 2.50000000000000e-01
+2177 -5.00000000000000e-01
+2178 0.00000000000000e+00
+2179 0.00000000000000e+00
+2180 -7.50000000000000e-01
+2181 0.00000000000000e+00
+2182 2.50000000000000e-01
+2183 -7.50000000000000e-01
+2184 0.00000000000000e+00
+2185 2.50000000000000e-01
+2186 -7.50000000000000e-01
+2187 0.00000000000000e+00
+2188 2.50000000000000e-01
+2189 -5.00000000000000e-01
+2190 0.00000000000000e+00
+2191 0.00000000000000e+00
+2192 -5.00000000000000e-01
+2193 0.00000000000000e+00
+2194 2.50000000000000e-01
+2195 -5.00000000000000e-01
+2196 0.00000000000000e+00
+2197 0.00000000000000e+00
+2198 -7.50000000000000e-01
+2199 0.00000000000000e+00
+2200 2.50000000000000e-01
+2201 -7.50000000000000e-01
+2202 0.00000000000000e+00
+2203 2.50000000000000e-01
+2204 -7.50000000000000e-01
+2205 0.00000000000000e+00
+2206 5.00000000000000e-01
+2207 0.00000000000000e+00
+2208 0.00000000000000e+00
+2209 5.00000000000000e-01
+2210 -2.50000000000000e-01
+2211 0.00000000000000e+00
+2212 5.00000000000000e-01
+2213 -2.50000000000000e-01
+2214 0.00000000000000e+00
+2215 7.50000000000000e-01
+2216 0.00000000000000e+00
+2217 0.00000000000000e+00
+2218 7.50000000000000e-01
+2219 -2.50000000000000e-01
+2220 0.00000000000000e+00
+2221 7.50000000000000e-01
+2222 -2.50000000000000e-01
+2223 0.00000000000000e+00
+2224 5.00000000000000e-01
+2225 -2.50000000000000e-01
+2226 0.00000000000000e+00
+2227 5.00000000000000e-01
+2228 0.00000000000000e+00
+2229 0.00000000000000e+00
+2230 5.00000000000000e-01
+2231 -2.50000000000000e-01
+2232 0.00000000000000e+00
+2233 7.50000000000000e-01
+2234 0.00000000000000e+00
+2235 0.00000000000000e+00
+2236 7.50000000000000e-01
+2237 -2.50000000000000e-01
+2238 0.00000000000000e+00
+2239 7.50000000000000e-01
+2240 -2.50000000000000e-01
+2241 0.00000000000000e+00
+2242 5.00000000000000e-01
+2243 -5.00000000000000e-01
+2244 0.00000000000000e+00
+2245 5.00000000000000e-01
+2246 -7.50000000000000e-01
+2247 0.00000000000000e+00
+2248 5.00000000000000e-01
+2249 -7.50000000000000e-01
+2250 0.00000000000000e+00
+2251 7.50000000000000e-01
+2252 -5.00000000000000e-01
+2253 0.00000000000000e+00
+2254 7.50000000000000e-01
+2255 -5.00000000000000e-01
+2256 0.00000000000000e+00
+2257 7.50000000000000e-01
+2258 -7.50000000000000e-01
+2259 0.00000000000000e+00
+2260 5.00000000000000e-01
+2261 -5.00000000000000e-01
+2262 0.00000000000000e+00
+2263 5.00000000000000e-01
+2264 -7.50000000000000e-01
+2265 0.00000000000000e+00
+2266 5.00000000000000e-01
+2267 -7.50000000000000e-01
+2268 0.00000000000000e+00
+2269 7.50000000000000e-01
+2270 -5.00000000000000e-01
+2271 0.00000000000000e+00
+2272 7.50000000000000e-01
+2273 -5.00000000000000e-01
+2274 0.00000000000000e+00
+2275 7.50000000000000e-01
+2276 -7.50000000000000e-01
+2277 0.00000000000000e+00
+2278 0.00000000000000e+00
+2279 -2.50000000000000e-01
+2280 0.00000000000000e+00
+2281 2.50000000000000e-01
+2282 0.00000000000000e+00
+2283 0.00000000000000e+00
+2284 2.50000000000000e-01
+2285 -2.50000000000000e-01
+2286 0.00000000000000e+00
+2287 0.00000000000000e+00
+2288 -2.50000000000000e-01
+2289 0.00000000000000e+00
+2290 2.50000000000000e-01
+2291 0.00000000000000e+00
+2292 0.00000000000000e+00
+2293 2.50000000000000e-01
+2294 -2.50000000000000e-01
+2295 0.00000000000000e+00
+2296 0.00000000000000e+00
+2297 -5.00000000000000e-01
+2298 0.00000000000000e+00
+2299 2.50000000000000e-01
+2300 -5.00000000000000e-01
+2301 0.00000000000000e+00
+2302 2.50000000000000e-01
+2303 -5.00000000000000e-01
+2304 0.00000000000000e+00
+2305 0.00000000000000e+00
+2306 -7.50000000000000e-01
+2307 0.00000000000000e+00
+2308 2.50000000000000e-01
+2309 -7.50000000000000e-01
+2310 0.00000000000000e+00
+2311 2.50000000000000e-01
+2312 -7.50000000000000e-01
+2313 0.00000000000000e+00
+2314 2.50000000000000e-01
+2315 -5.00000000000000e-01
+2316 0.00000000000000e+00
+2317 0.00000000000000e+00
+2318 -5.00000000000000e-01
+2319 0.00000000000000e+00
+2320 2.50000000000000e-01
+2321 -5.00000000000000e-01
+2322 0.00000000000000e+00
+2323 0.00000000000000e+00
+2324 -7.50000000000000e-01
+2325 0.00000000000000e+00
+2326 2.50000000000000e-01
+2327 -7.50000000000000e-01
+2328 0.00000000000000e+00
+2329 2.50000000000000e-01
+2330 -7.50000000000000e-01
+2331 0.00000000000000e+00
+2332 5.00000000000000e-01
+2333 0.00000000000000e+00
+2334 0.00000000000000e+00
+2335 5.00000000000000e-01
+2336 -2.50000000000000e-01
+2337 0.00000000000000e+00
+2338 5.00000000000000e-01
+2339 -2.50000000000000e-01
+2340 0.00000000000000e+00
+2341 7.50000000000000e-01
+2342 0.00000000000000e+00
+2343 0.00000000000000e+00
+2344 7.50000000000000e-01
+2345 -2.50000000000000e-01
+2346 0.00000000000000e+00
+2347 7.50000000000000e-01
+2348 -2.50000000000000e-01
+2349 0.00000000000000e+00
+2350 5.00000000000000e-01
+2351 -2.50000000000000e-01
+2352 0.00000000000000e+00
+2353 5.00000000000000e-01
+2354 0.00000000000000e+00
+2355 0.00000000000000e+00
+2356 5.00000000000000e-01
+2357 -2.50000000000000e-01
+2358 0.00000000000000e+00
+2359 7.50000000000000e-01
+2360 0.00000000000000e+00
+2361 0.00000000000000e+00
+2362 7.50000000000000e-01
+2363 -2.50000000000000e-01
+2364 0.00000000000000e+00
+2365 7.50000000000000e-01
+2366 -2.50000000000000e-01
+2367 0.00000000000000e+00
+2368 5.00000000000000e-01
+2369 -5.00000000000000e-01
+2370 0.00000000000000e+00
+2371 5.00000000000000e-01
+2372 -7.50000000000000e-01
+2373 0.00000000000000e+00
+2374 5.00000000000000e-01
+2375 -7.50000000000000e-01
+2376 0.00000000000000e+00
+2377 7.50000000000000e-01
+2378 -5.00000000000000e-01
+2379 0.00000000000000e+00
+2380 7.50000000000000e-01
+2381 -5.00000000000000e-01
+2382 0.00000000000000e+00
+2383 7.50000000000000e-01
+2384 -7.50000000000000e-01
+2385 0.00000000000000e+00
+2386 5.00000000000000e-01
+2387 -5.00000000000000e-01
+2388 0.00000000000000e+00
+2389 5.00000000000000e-01
+2390 -7.50000000000000e-01
+2391 0.00000000000000e+00
+2392 5.00000000000000e-01
+2393 -7.50000000000000e-01
+2394 0.00000000000000e+00
+2395 7.50000000000000e-01
+2396 -5.00000000000000e-01
+2397 0.00000000000000e+00
+2398 7.50000000000000e-01
+2399 -5.00000000000000e-01
+2400 0.00000000000000e+00
+2401 7.50000000000000e-01
+2402 -7.50000000000000e-01
+2403 0.00000000000000e+00
+2404 2.50000000000000e-01
+2405 -1.00000000000000e+00
+2406 0.00000000000000e+00
+2407 2.50000000000000e-01
+2408 -1.00000000000000e+00
+2409 0.00000000000000e+00
+2410 5.00000000000000e-01
+2411 -1.00000000000000e+00
+2412 0.00000000000000e+00
+2413 7.50000000000000e-01
+2414 -1.00000000000000e+00
+2415 0.00000000000000e+00
+2416 5.00000000000000e-01
+2417 -1.00000000000000e+00
+2418 0.00000000000000e+00
+2419 7.50000000000000e-01
+2420 -1.00000000000000e+00
+2421 0.00000000000000e+00
+2422 2.50000000000000e-01
+2423 -1.00000000000000e+00
+2424 0.00000000000000e+00
+2425 2.50000000000000e-01
+2426 -1.00000000000000e+00
+2427 0.00000000000000e+00
+2428 5.00000000000000e-01
+2429 -1.00000000000000e+00
+2430 0.00000000000000e+00
+2431 7.50000000000000e-01
+2432 -1.00000000000000e+00
+2433 0.00000000000000e+00
+2434 5.00000000000000e-01
+2435 -1.00000000000000e+00
+2436 0.00000000000000e+00
+2437 7.50000000000000e-01
+2438 -1.00000000000000e+00
+2439 0.00000000000000e+00
+2440 1.00000000000000e+00
+2441 -2.50000000000000e-01
+2442 0.00000000000000e+00
+2443 1.00000000000000e+00
+2444 -2.50000000000000e-01
+2445 0.00000000000000e+00
+2446 1.00000000000000e+00
+2447 -5.00000000000000e-01
+2448 0.00000000000000e+00
+2449 1.00000000000000e+00
+2450 -7.50000000000000e-01
+2451 0.00000000000000e+00
+2452 1.00000000000000e+00
+2453 -5.00000000000000e-01
+2454 0.00000000000000e+00
+2455 1.00000000000000e+00
+2456 -7.50000000000000e-01
+2457 0.00000000000000e+00
+2458 1.00000000000000e+00
+2459 -2.50000000000000e-01
+2460 0.00000000000000e+00
+2461 1.00000000000000e+00
+2462 -2.50000000000000e-01
+2463 0.00000000000000e+00
+2464 1.00000000000000e+00
+2465 -5.00000000000000e-01
+2466 0.00000000000000e+00
+2467 1.00000000000000e+00
+2468 -7.50000000000000e-01
+2469 0.00000000000000e+00
+2470 1.00000000000000e+00
+2471 -5.00000000000000e-01
+2472 0.00000000000000e+00
+2473 1.00000000000000e+00
+2474 -7.50000000000000e-01
diff --git a/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/rbms.2.00000 b/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/rbms.2.00000
new file mode 100644
index 00000000..22e24e34
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/rbms.2.00000
@@ -0,0 +1,676 @@
+0 675
+0 0.00000000000000e+00
+1 0.00000000000000e+00
+2 4.00000000000000e+00
+3 0.00000000000000e+00
+4 0.00000000000000e+00
+5 5.00000000000000e+00
+6 0.00000000000000e+00
+7 0.00000000000000e+00
+8 6.00000000000000e+00
+9 0.00000000000000e+00
+10 0.00000000000000e+00
+11 4.00000000000000e+00
+12 0.00000000000000e+00
+13 0.00000000000000e+00
+14 5.00000000000000e+00
+15 0.00000000000000e+00
+16 0.00000000000000e+00
+17 6.00000000000000e+00
+18 -1.00000000000000e+00
+19 0.00000000000000e+00
+20 4.00000000000000e+00
+21 -1.00000000000000e+00
+22 0.00000000000000e+00
+23 5.00000000000000e+00
+24 -1.00000000000000e+00
+25 0.00000000000000e+00
+26 6.00000000000000e+00
+27 -1.00000000000000e+00
+28 0.00000000000000e+00
+29 4.00000000000000e+00
+30 -1.00000000000000e+00
+31 0.00000000000000e+00
+32 5.00000000000000e+00
+33 -1.00000000000000e+00
+34 0.00000000000000e+00
+35 6.00000000000000e+00
+36 0.00000000000000e+00
+37 0.00000000000000e+00
+38 4.50000000000000e+00
+39 0.00000000000000e+00
+40 0.00000000000000e+00
+41 4.00000000000000e+00
+42 0.00000000000000e+00
+43 0.00000000000000e+00
+44 4.50000000000000e+00
+45 -5.00000000000000e-01
+46 0.00000000000000e+00
+47 4.00000000000000e+00
+48 -5.00000000000000e-01
+49 0.00000000000000e+00
+50 4.50000000000000e+00
+51 -5.00000000000000e-01
+52 0.00000000000000e+00
+53 4.00000000000000e+00
+54 -5.00000000000000e-01
+55 0.00000000000000e+00
+56 4.50000000000000e+00
+57 0.00000000000000e+00
+58 0.00000000000000e+00
+59 5.50000000000000e+00
+60 0.00000000000000e+00
+61 0.00000000000000e+00
+62 5.00000000000000e+00
+63 0.00000000000000e+00
+64 0.00000000000000e+00
+65 5.50000000000000e+00
+66 -5.00000000000000e-01
+67 0.00000000000000e+00
+68 5.00000000000000e+00
+69 -5.00000000000000e-01
+70 0.00000000000000e+00
+71 5.50000000000000e+00
+72 -5.00000000000000e-01
+73 0.00000000000000e+00
+74 5.00000000000000e+00
+75 -5.00000000000000e-01
+76 0.00000000000000e+00
+77 5.50000000000000e+00
+78 0.00000000000000e+00
+79 0.00000000000000e+00
+80 6.00000000000000e+00
+81 -5.00000000000000e-01
+82 0.00000000000000e+00
+83 6.00000000000000e+00
+84 -5.00000000000000e-01
+85 0.00000000000000e+00
+86 6.00000000000000e+00
+87 0.00000000000000e+00
+88 0.00000000000000e+00
+89 4.50000000000000e+00
+90 -5.00000000000000e-01
+91 0.00000000000000e+00
+92 4.00000000000000e+00
+93 -5.00000000000000e-01
+94 0.00000000000000e+00
+95 4.50000000000000e+00
+96 0.00000000000000e+00
+97 0.00000000000000e+00
+98 5.50000000000000e+00
+99 -5.00000000000000e-01
+100 0.00000000000000e+00
+101 5.00000000000000e+00
+102 -5.00000000000000e-01
+103 0.00000000000000e+00
+104 5.50000000000000e+00
+105 -5.00000000000000e-01
+106 0.00000000000000e+00
+107 6.00000000000000e+00
+108 -1.00000000000000e+00
+109 0.00000000000000e+00
+110 4.50000000000000e+00
+111 -1.00000000000000e+00
+112 0.00000000000000e+00
+113 4.00000000000000e+00
+114 -1.00000000000000e+00
+115 0.00000000000000e+00
+116 4.50000000000000e+00
+117 -1.00000000000000e+00
+118 0.00000000000000e+00
+119 5.50000000000000e+00
+120 -1.00000000000000e+00
+121 0.00000000000000e+00
+122 5.00000000000000e+00
+123 -1.00000000000000e+00
+124 0.00000000000000e+00
+125 5.50000000000000e+00
+126 -1.00000000000000e+00
+127 0.00000000000000e+00
+128 6.00000000000000e+00
+129 -1.00000000000000e+00
+130 0.00000000000000e+00
+131 4.50000000000000e+00
+132 -1.00000000000000e+00
+133 0.00000000000000e+00
+134 5.50000000000000e+00
+135 0.00000000000000e+00
+136 0.00000000000000e+00
+137 4.25000000000000e+00
+138 0.00000000000000e+00
+139 0.00000000000000e+00
+140 4.00000000000000e+00
+141 0.00000000000000e+00
+142 0.00000000000000e+00
+143 4.25000000000000e+00
+144 -2.50000000000000e-01
+145 0.00000000000000e+00
+146 4.00000000000000e+00
+147 -2.50000000000000e-01
+148 0.00000000000000e+00
+149 4.25000000000000e+00
+150 -2.50000000000000e-01
+151 0.00000000000000e+00
+152 4.00000000000000e+00
+153 -2.50000000000000e-01
+154 0.00000000000000e+00
+155 4.25000000000000e+00
+156 0.00000000000000e+00
+157 0.00000000000000e+00
+158 4.75000000000000e+00
+159 0.00000000000000e+00
+160 0.00000000000000e+00
+161 5.25000000000000e+00
+162 0.00000000000000e+00
+163 0.00000000000000e+00
+164 5.00000000000000e+00
+165 0.00000000000000e+00
+166 0.00000000000000e+00
+167 5.25000000000000e+00
+168 -2.50000000000000e-01
+169 0.00000000000000e+00
+170 5.00000000000000e+00
+171 -2.50000000000000e-01
+172 0.00000000000000e+00
+173 5.25000000000000e+00
+174 -2.50000000000000e-01
+175 0.00000000000000e+00
+176 5.00000000000000e+00
+177 -2.50000000000000e-01
+178 0.00000000000000e+00
+179 5.25000000000000e+00
+180 0.00000000000000e+00
+181 0.00000000000000e+00
+182 5.75000000000000e+00
+183 0.00000000000000e+00
+184 0.00000000000000e+00
+185 6.00000000000000e+00
+186 -2.50000000000000e-01
+187 0.00000000000000e+00
+188 6.00000000000000e+00
+189 -2.50000000000000e-01
+190 0.00000000000000e+00
+191 6.00000000000000e+00
+192 0.00000000000000e+00
+193 0.00000000000000e+00
+194 4.00000000000000e+00
+195 0.00000000000000e+00
+196 0.00000000000000e+00
+197 4.25000000000000e+00
+198 -2.50000000000000e-01
+199 0.00000000000000e+00
+200 4.00000000000000e+00
+201 -2.50000000000000e-01
+202 0.00000000000000e+00
+203 4.25000000000000e+00
+204 0.00000000000000e+00
+205 0.00000000000000e+00
+206 4.75000000000000e+00
+207 0.00000000000000e+00
+208 0.00000000000000e+00
+209 5.00000000000000e+00
+210 0.00000000000000e+00
+211 0.00000000000000e+00
+212 4.75000000000000e+00
+213 0.00000000000000e+00
+214 0.00000000000000e+00
+215 5.25000000000000e+00
+216 -2.50000000000000e-01
+217 0.00000000000000e+00
+218 5.00000000000000e+00
+219 -2.50000000000000e-01
+220 0.00000000000000e+00
+221 5.25000000000000e+00
+222 0.00000000000000e+00
+223 0.00000000000000e+00
+224 5.75000000000000e+00
+225 0.00000000000000e+00
+226 0.00000000000000e+00
+227 6.00000000000000e+00
+228 0.00000000000000e+00
+229 0.00000000000000e+00
+230 5.75000000000000e+00
+231 -2.50000000000000e-01
+232 0.00000000000000e+00
+233 6.00000000000000e+00
+234 -7.50000000000000e-01
+235 0.00000000000000e+00
+236 4.00000000000000e+00
+237 -1.00000000000000e+00
+238 0.00000000000000e+00
+239 4.25000000000000e+00
+240 -1.00000000000000e+00
+241 0.00000000000000e+00
+242 4.00000000000000e+00
+243 -1.00000000000000e+00
+244 0.00000000000000e+00
+245 4.25000000000000e+00
+246 -7.50000000000000e-01
+247 0.00000000000000e+00
+248 4.75000000000000e+00
+249 -7.50000000000000e-01
+250 0.00000000000000e+00
+251 5.00000000000000e+00
+252 -1.00000000000000e+00
+253 0.00000000000000e+00
+254 4.75000000000000e+00
+255 -1.00000000000000e+00
+256 0.00000000000000e+00
+257 5.25000000000000e+00
+258 -1.00000000000000e+00
+259 0.00000000000000e+00
+260 5.00000000000000e+00
+261 -1.00000000000000e+00
+262 0.00000000000000e+00
+263 5.25000000000000e+00
+264 -7.50000000000000e-01
+265 0.00000000000000e+00
+266 5.75000000000000e+00
+267 -7.50000000000000e-01
+268 0.00000000000000e+00
+269 6.00000000000000e+00
+270 -1.00000000000000e+00
+271 0.00000000000000e+00
+272 5.75000000000000e+00
+273 -1.00000000000000e+00
+274 0.00000000000000e+00
+275 6.00000000000000e+00
+276 -7.50000000000000e-01
+277 0.00000000000000e+00
+278 4.00000000000000e+00
+279 -7.50000000000000e-01
+280 0.00000000000000e+00
+281 4.00000000000000e+00
+282 -1.00000000000000e+00
+283 0.00000000000000e+00
+284 4.00000000000000e+00
+285 -1.00000000000000e+00
+286 0.00000000000000e+00
+287 4.25000000000000e+00
+288 -7.50000000000000e-01
+289 0.00000000000000e+00
+290 4.75000000000000e+00
+291 -7.50000000000000e-01
+292 0.00000000000000e+00
+293 5.00000000000000e+00
+294 -7.50000000000000e-01
+295 0.00000000000000e+00
+296 4.75000000000000e+00
+297 -7.50000000000000e-01
+298 0.00000000000000e+00
+299 5.00000000000000e+00
+300 -1.00000000000000e+00
+301 0.00000000000000e+00
+302 4.75000000000000e+00
+303 -1.00000000000000e+00
+304 0.00000000000000e+00
+305 5.00000000000000e+00
+306 -1.00000000000000e+00
+307 0.00000000000000e+00
+308 4.75000000000000e+00
+309 -1.00000000000000e+00
+310 0.00000000000000e+00
+311 5.25000000000000e+00
+312 -7.50000000000000e-01
+313 0.00000000000000e+00
+314 5.75000000000000e+00
+315 -7.50000000000000e-01
+316 0.00000000000000e+00
+317 6.00000000000000e+00
+318 -7.50000000000000e-01
+319 0.00000000000000e+00
+320 5.75000000000000e+00
+321 -7.50000000000000e-01
+322 0.00000000000000e+00
+323 6.00000000000000e+00
+324 -1.00000000000000e+00
+325 0.00000000000000e+00
+326 5.75000000000000e+00
+327 -1.00000000000000e+00
+328 0.00000000000000e+00
+329 6.00000000000000e+00
+330 -1.00000000000000e+00
+331 0.00000000000000e+00
+332 5.75000000000000e+00
+333 0.00000000000000e+00
+334 0.00000000000000e+00
+335 4.50000000000000e+00
+336 -2.50000000000000e-01
+337 0.00000000000000e+00
+338 4.50000000000000e+00
+339 -2.50000000000000e-01
+340 0.00000000000000e+00
+341 4.50000000000000e+00
+342 0.00000000000000e+00
+343 0.00000000000000e+00
+344 4.75000000000000e+00
+345 -2.50000000000000e-01
+346 0.00000000000000e+00
+347 4.75000000000000e+00
+348 -2.50000000000000e-01
+349 0.00000000000000e+00
+350 4.75000000000000e+00
+351 0.00000000000000e+00
+352 0.00000000000000e+00
+353 4.25000000000000e+00
+354 -2.50000000000000e-01
+355 0.00000000000000e+00
+356 4.00000000000000e+00
+357 -2.50000000000000e-01
+358 0.00000000000000e+00
+359 4.25000000000000e+00
+360 0.00000000000000e+00
+361 0.00000000000000e+00
+362 4.25000000000000e+00
+363 -2.50000000000000e-01
+364 0.00000000000000e+00
+365 4.00000000000000e+00
+366 -2.50000000000000e-01
+367 0.00000000000000e+00
+368 4.25000000000000e+00
+369 -2.50000000000000e-01
+370 0.00000000000000e+00
+371 4.50000000000000e+00
+372 0.00000000000000e+00
+373 0.00000000000000e+00
+374 4.75000000000000e+00
+375 -2.50000000000000e-01
+376 0.00000000000000e+00
+377 4.75000000000000e+00
+378 0.00000000000000e+00
+379 0.00000000000000e+00
+380 4.50000000000000e+00
+381 -2.50000000000000e-01
+382 0.00000000000000e+00
+383 4.50000000000000e+00
+384 -2.50000000000000e-01
+385 0.00000000000000e+00
+386 4.75000000000000e+00
+387 -5.00000000000000e-01
+388 0.00000000000000e+00
+389 4.25000000000000e+00
+390 -5.00000000000000e-01
+391 0.00000000000000e+00
+392 4.00000000000000e+00
+393 -5.00000000000000e-01
+394 0.00000000000000e+00
+395 4.25000000000000e+00
+396 -7.50000000000000e-01
+397 0.00000000000000e+00
+398 4.25000000000000e+00
+399 -7.50000000000000e-01
+400 0.00000000000000e+00
+401 4.00000000000000e+00
+402 -7.50000000000000e-01
+403 0.00000000000000e+00
+404 4.25000000000000e+00
+405 -5.00000000000000e-01
+406 0.00000000000000e+00
+407 4.50000000000000e+00
+408 -5.00000000000000e-01
+409 0.00000000000000e+00
+410 4.75000000000000e+00
+411 -5.00000000000000e-01
+412 0.00000000000000e+00
+413 4.75000000000000e+00
+414 -7.50000000000000e-01
+415 0.00000000000000e+00
+416 4.50000000000000e+00
+417 -7.50000000000000e-01
+418 0.00000000000000e+00
+419 4.50000000000000e+00
+420 -7.50000000000000e-01
+421 0.00000000000000e+00
+422 4.75000000000000e+00
+423 -5.00000000000000e-01
+424 0.00000000000000e+00
+425 4.25000000000000e+00
+426 -5.00000000000000e-01
+427 0.00000000000000e+00
+428 4.00000000000000e+00
+429 -5.00000000000000e-01
+430 0.00000000000000e+00
+431 4.25000000000000e+00
+432 -7.50000000000000e-01
+433 0.00000000000000e+00
+434 4.00000000000000e+00
+435 -7.50000000000000e-01
+436 0.00000000000000e+00
+437 4.25000000000000e+00
+438 -7.50000000000000e-01
+439 0.00000000000000e+00
+440 4.25000000000000e+00
+441 -5.00000000000000e-01
+442 0.00000000000000e+00
+443 4.75000000000000e+00
+444 -5.00000000000000e-01
+445 0.00000000000000e+00
+446 4.50000000000000e+00
+447 -5.00000000000000e-01
+448 0.00000000000000e+00
+449 4.75000000000000e+00
+450 -7.50000000000000e-01
+451 0.00000000000000e+00
+452 4.50000000000000e+00
+453 -7.50000000000000e-01
+454 0.00000000000000e+00
+455 4.75000000000000e+00
+456 -7.50000000000000e-01
+457 0.00000000000000e+00
+458 4.50000000000000e+00
+459 0.00000000000000e+00
+460 0.00000000000000e+00
+461 5.50000000000000e+00
+462 -2.50000000000000e-01
+463 0.00000000000000e+00
+464 5.50000000000000e+00
+465 -2.50000000000000e-01
+466 0.00000000000000e+00
+467 5.50000000000000e+00
+468 0.00000000000000e+00
+469 0.00000000000000e+00
+470 5.75000000000000e+00
+471 -2.50000000000000e-01
+472 0.00000000000000e+00
+473 5.75000000000000e+00
+474 -2.50000000000000e-01
+475 0.00000000000000e+00
+476 5.75000000000000e+00
+477 0.00000000000000e+00
+478 0.00000000000000e+00
+479 5.25000000000000e+00
+480 -2.50000000000000e-01
+481 0.00000000000000e+00
+482 5.00000000000000e+00
+483 -2.50000000000000e-01
+484 0.00000000000000e+00
+485 5.25000000000000e+00
+486 0.00000000000000e+00
+487 0.00000000000000e+00
+488 5.25000000000000e+00
+489 -2.50000000000000e-01
+490 0.00000000000000e+00
+491 5.00000000000000e+00
+492 -2.50000000000000e-01
+493 0.00000000000000e+00
+494 5.25000000000000e+00
+495 -2.50000000000000e-01
+496 0.00000000000000e+00
+497 5.50000000000000e+00
+498 0.00000000000000e+00
+499 0.00000000000000e+00
+500 5.75000000000000e+00
+501 -2.50000000000000e-01
+502 0.00000000000000e+00
+503 5.75000000000000e+00
+504 0.00000000000000e+00
+505 0.00000000000000e+00
+506 5.50000000000000e+00
+507 -2.50000000000000e-01
+508 0.00000000000000e+00
+509 5.50000000000000e+00
+510 -2.50000000000000e-01
+511 0.00000000000000e+00
+512 5.75000000000000e+00
+513 -5.00000000000000e-01
+514 0.00000000000000e+00
+515 5.25000000000000e+00
+516 -5.00000000000000e-01
+517 0.00000000000000e+00
+518 5.00000000000000e+00
+519 -5.00000000000000e-01
+520 0.00000000000000e+00
+521 5.25000000000000e+00
+522 -7.50000000000000e-01
+523 0.00000000000000e+00
+524 5.25000000000000e+00
+525 -7.50000000000000e-01
+526 0.00000000000000e+00
+527 5.00000000000000e+00
+528 -7.50000000000000e-01
+529 0.00000000000000e+00
+530 5.25000000000000e+00
+531 -5.00000000000000e-01
+532 0.00000000000000e+00
+533 5.50000000000000e+00
+534 -5.00000000000000e-01
+535 0.00000000000000e+00
+536 5.75000000000000e+00
+537 -5.00000000000000e-01
+538 0.00000000000000e+00
+539 5.75000000000000e+00
+540 -7.50000000000000e-01
+541 0.00000000000000e+00
+542 5.50000000000000e+00
+543 -7.50000000000000e-01
+544 0.00000000000000e+00
+545 5.50000000000000e+00
+546 -7.50000000000000e-01
+547 0.00000000000000e+00
+548 5.75000000000000e+00
+549 -5.00000000000000e-01
+550 0.00000000000000e+00
+551 5.25000000000000e+00
+552 -5.00000000000000e-01
+553 0.00000000000000e+00
+554 5.00000000000000e+00
+555 -5.00000000000000e-01
+556 0.00000000000000e+00
+557 5.25000000000000e+00
+558 -7.50000000000000e-01
+559 0.00000000000000e+00
+560 5.00000000000000e+00
+561 -7.50000000000000e-01
+562 0.00000000000000e+00
+563 5.25000000000000e+00
+564 -7.50000000000000e-01
+565 0.00000000000000e+00
+566 5.25000000000000e+00
+567 -5.00000000000000e-01
+568 0.00000000000000e+00
+569 5.75000000000000e+00
+570 -5.00000000000000e-01
+571 0.00000000000000e+00
+572 5.50000000000000e+00
+573 -5.00000000000000e-01
+574 0.00000000000000e+00
+575 5.75000000000000e+00
+576 -7.50000000000000e-01
+577 0.00000000000000e+00
+578 5.50000000000000e+00
+579 -7.50000000000000e-01
+580 0.00000000000000e+00
+581 5.75000000000000e+00
+582 -7.50000000000000e-01
+583 0.00000000000000e+00
+584 5.50000000000000e+00
+585 -2.50000000000000e-01
+586 0.00000000000000e+00
+587 6.00000000000000e+00
+588 -2.50000000000000e-01
+589 0.00000000000000e+00
+590 6.00000000000000e+00
+591 -5.00000000000000e-01
+592 0.00000000000000e+00
+593 6.00000000000000e+00
+594 -7.50000000000000e-01
+595 0.00000000000000e+00
+596 6.00000000000000e+00
+597 -5.00000000000000e-01
+598 0.00000000000000e+00
+599 6.00000000000000e+00
+600 -7.50000000000000e-01
+601 0.00000000000000e+00
+602 6.00000000000000e+00
+603 -2.50000000000000e-01
+604 0.00000000000000e+00
+605 4.50000000000000e+00
+606 -2.50000000000000e-01
+607 0.00000000000000e+00
+608 4.75000000000000e+00
+609 -5.00000000000000e-01
+610 0.00000000000000e+00
+611 4.25000000000000e+00
+612 -7.50000000000000e-01
+613 0.00000000000000e+00
+614 4.25000000000000e+00
+615 -5.00000000000000e-01
+616 0.00000000000000e+00
+617 4.75000000000000e+00
+618 -7.50000000000000e-01
+619 0.00000000000000e+00
+620 4.50000000000000e+00
+621 -2.50000000000000e-01
+622 0.00000000000000e+00
+623 5.50000000000000e+00
+624 -2.50000000000000e-01
+625 0.00000000000000e+00
+626 5.75000000000000e+00
+627 -5.00000000000000e-01
+628 0.00000000000000e+00
+629 5.25000000000000e+00
+630 -7.50000000000000e-01
+631 0.00000000000000e+00
+632 5.25000000000000e+00
+633 -5.00000000000000e-01
+634 0.00000000000000e+00
+635 5.75000000000000e+00
+636 -7.50000000000000e-01
+637 0.00000000000000e+00
+638 5.50000000000000e+00
+639 -1.00000000000000e+00
+640 0.00000000000000e+00
+641 4.50000000000000e+00
+642 -1.00000000000000e+00
+643 0.00000000000000e+00
+644 4.75000000000000e+00
+645 -1.00000000000000e+00
+646 0.00000000000000e+00
+647 4.25000000000000e+00
+648 -1.00000000000000e+00
+649 0.00000000000000e+00
+650 4.25000000000000e+00
+651 -1.00000000000000e+00
+652 0.00000000000000e+00
+653 4.75000000000000e+00
+654 -1.00000000000000e+00
+655 0.00000000000000e+00
+656 4.50000000000000e+00
+657 -1.00000000000000e+00
+658 0.00000000000000e+00
+659 5.50000000000000e+00
+660 -1.00000000000000e+00
+661 0.00000000000000e+00
+662 5.75000000000000e+00
+663 -1.00000000000000e+00
+664 0.00000000000000e+00
+665 5.25000000000000e+00
+666 -1.00000000000000e+00
+667 0.00000000000000e+00
+668 5.25000000000000e+00
+669 -1.00000000000000e+00
+670 0.00000000000000e+00
+671 5.75000000000000e+00
+672 -1.00000000000000e+00
+673 0.00000000000000e+00
+674 5.50000000000000e+00
diff --git a/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/rbms.2.00001 b/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/rbms.2.00001
new file mode 100644
index 00000000..20274656
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/rbms.2.00001
@@ -0,0 +1,601 @@
+675 1275
+675 0.00000000000000e+00
+676 0.00000000000000e+00
+677 7.00000000000000e+00
+678 0.00000000000000e+00
+679 0.00000000000000e+00
+680 8.00000000000000e+00
+681 0.00000000000000e+00
+682 0.00000000000000e+00
+683 7.00000000000000e+00
+684 0.00000000000000e+00
+685 0.00000000000000e+00
+686 8.00000000000000e+00
+687 -1.00000000000000e+00
+688 0.00000000000000e+00
+689 7.00000000000000e+00
+690 -1.00000000000000e+00
+691 0.00000000000000e+00
+692 8.00000000000000e+00
+693 -1.00000000000000e+00
+694 0.00000000000000e+00
+695 7.00000000000000e+00
+696 -1.00000000000000e+00
+697 0.00000000000000e+00
+698 8.00000000000000e+00
+699 0.00000000000000e+00
+700 0.00000000000000e+00
+701 6.50000000000000e+00
+702 0.00000000000000e+00
+703 0.00000000000000e+00
+704 6.50000000000000e+00
+705 -5.00000000000000e-01
+706 0.00000000000000e+00
+707 6.50000000000000e+00
+708 -5.00000000000000e-01
+709 0.00000000000000e+00
+710 6.50000000000000e+00
+711 0.00000000000000e+00
+712 0.00000000000000e+00
+713 7.50000000000000e+00
+714 0.00000000000000e+00
+715 0.00000000000000e+00
+716 7.00000000000000e+00
+717 0.00000000000000e+00
+718 0.00000000000000e+00
+719 7.50000000000000e+00
+720 -5.00000000000000e-01
+721 0.00000000000000e+00
+722 7.00000000000000e+00
+723 -5.00000000000000e-01
+724 0.00000000000000e+00
+725 7.50000000000000e+00
+726 -5.00000000000000e-01
+727 0.00000000000000e+00
+728 7.00000000000000e+00
+729 -5.00000000000000e-01
+730 0.00000000000000e+00
+731 7.50000000000000e+00
+732 0.00000000000000e+00
+733 0.00000000000000e+00
+734 8.00000000000000e+00
+735 -5.00000000000000e-01
+736 0.00000000000000e+00
+737 8.00000000000000e+00
+738 -5.00000000000000e-01
+739 0.00000000000000e+00
+740 8.00000000000000e+00
+741 0.00000000000000e+00
+742 0.00000000000000e+00
+743 6.50000000000000e+00
+744 -5.00000000000000e-01
+745 0.00000000000000e+00
+746 6.50000000000000e+00
+747 0.00000000000000e+00
+748 0.00000000000000e+00
+749 7.50000000000000e+00
+750 -5.00000000000000e-01
+751 0.00000000000000e+00
+752 7.00000000000000e+00
+753 -5.00000000000000e-01
+754 0.00000000000000e+00
+755 7.50000000000000e+00
+756 -5.00000000000000e-01
+757 0.00000000000000e+00
+758 8.00000000000000e+00
+759 -1.00000000000000e+00
+760 0.00000000000000e+00
+761 6.50000000000000e+00
+762 -1.00000000000000e+00
+763 0.00000000000000e+00
+764 6.50000000000000e+00
+765 -1.00000000000000e+00
+766 0.00000000000000e+00
+767 7.50000000000000e+00
+768 -1.00000000000000e+00
+769 0.00000000000000e+00
+770 7.00000000000000e+00
+771 -1.00000000000000e+00
+772 0.00000000000000e+00
+773 7.50000000000000e+00
+774 -1.00000000000000e+00
+775 0.00000000000000e+00
+776 8.00000000000000e+00
+777 -1.00000000000000e+00
+778 0.00000000000000e+00
+779 6.50000000000000e+00
+780 -1.00000000000000e+00
+781 0.00000000000000e+00
+782 7.50000000000000e+00
+783 0.00000000000000e+00
+784 0.00000000000000e+00
+785 6.25000000000000e+00
+786 0.00000000000000e+00
+787 0.00000000000000e+00
+788 6.25000000000000e+00
+789 -2.50000000000000e-01
+790 0.00000000000000e+00
+791 6.25000000000000e+00
+792 -2.50000000000000e-01
+793 0.00000000000000e+00
+794 6.25000000000000e+00
+795 0.00000000000000e+00
+796 0.00000000000000e+00
+797 6.75000000000000e+00
+798 0.00000000000000e+00
+799 0.00000000000000e+00
+800 7.25000000000000e+00
+801 0.00000000000000e+00
+802 0.00000000000000e+00
+803 7.00000000000000e+00
+804 0.00000000000000e+00
+805 0.00000000000000e+00
+806 7.25000000000000e+00
+807 -2.50000000000000e-01
+808 0.00000000000000e+00
+809 7.00000000000000e+00
+810 -2.50000000000000e-01
+811 0.00000000000000e+00
+812 7.25000000000000e+00
+813 -2.50000000000000e-01
+814 0.00000000000000e+00
+815 7.00000000000000e+00
+816 -2.50000000000000e-01
+817 0.00000000000000e+00
+818 7.25000000000000e+00
+819 0.00000000000000e+00
+820 0.00000000000000e+00
+821 7.75000000000000e+00
+822 0.00000000000000e+00
+823 0.00000000000000e+00
+824 8.00000000000000e+00
+825 -2.50000000000000e-01
+826 0.00000000000000e+00
+827 8.00000000000000e+00
+828 -2.50000000000000e-01
+829 0.00000000000000e+00
+830 8.00000000000000e+00
+831 0.00000000000000e+00
+832 0.00000000000000e+00
+833 6.25000000000000e+00
+834 -2.50000000000000e-01
+835 0.00000000000000e+00
+836 6.25000000000000e+00
+837 0.00000000000000e+00
+838 0.00000000000000e+00
+839 6.75000000000000e+00
+840 0.00000000000000e+00
+841 0.00000000000000e+00
+842 7.00000000000000e+00
+843 0.00000000000000e+00
+844 0.00000000000000e+00
+845 6.75000000000000e+00
+846 0.00000000000000e+00
+847 0.00000000000000e+00
+848 7.25000000000000e+00
+849 -2.50000000000000e-01
+850 0.00000000000000e+00
+851 7.00000000000000e+00
+852 -2.50000000000000e-01
+853 0.00000000000000e+00
+854 7.25000000000000e+00
+855 0.00000000000000e+00
+856 0.00000000000000e+00
+857 7.75000000000000e+00
+858 0.00000000000000e+00
+859 0.00000000000000e+00
+860 8.00000000000000e+00
+861 0.00000000000000e+00
+862 0.00000000000000e+00
+863 7.75000000000000e+00
+864 -2.50000000000000e-01
+865 0.00000000000000e+00
+866 8.00000000000000e+00
+867 -1.00000000000000e+00
+868 0.00000000000000e+00
+869 6.25000000000000e+00
+870 -1.00000000000000e+00
+871 0.00000000000000e+00
+872 6.25000000000000e+00
+873 -7.50000000000000e-01
+874 0.00000000000000e+00
+875 6.75000000000000e+00
+876 -7.50000000000000e-01
+877 0.00000000000000e+00
+878 7.00000000000000e+00
+879 -1.00000000000000e+00
+880 0.00000000000000e+00
+881 6.75000000000000e+00
+882 -1.00000000000000e+00
+883 0.00000000000000e+00
+884 7.25000000000000e+00
+885 -1.00000000000000e+00
+886 0.00000000000000e+00
+887 7.00000000000000e+00
+888 -1.00000000000000e+00
+889 0.00000000000000e+00
+890 7.25000000000000e+00
+891 -7.50000000000000e-01
+892 0.00000000000000e+00
+893 7.75000000000000e+00
+894 -7.50000000000000e-01
+895 0.00000000000000e+00
+896 8.00000000000000e+00
+897 -1.00000000000000e+00
+898 0.00000000000000e+00
+899 7.75000000000000e+00
+900 -1.00000000000000e+00
+901 0.00000000000000e+00
+902 8.00000000000000e+00
+903 -1.00000000000000e+00
+904 0.00000000000000e+00
+905 6.25000000000000e+00
+906 -7.50000000000000e-01
+907 0.00000000000000e+00
+908 6.75000000000000e+00
+909 -7.50000000000000e-01
+910 0.00000000000000e+00
+911 7.00000000000000e+00
+912 -7.50000000000000e-01
+913 0.00000000000000e+00
+914 6.75000000000000e+00
+915 -7.50000000000000e-01
+916 0.00000000000000e+00
+917 7.00000000000000e+00
+918 -1.00000000000000e+00
+919 0.00000000000000e+00
+920 6.75000000000000e+00
+921 -1.00000000000000e+00
+922 0.00000000000000e+00
+923 7.00000000000000e+00
+924 -1.00000000000000e+00
+925 0.00000000000000e+00
+926 6.75000000000000e+00
+927 -1.00000000000000e+00
+928 0.00000000000000e+00
+929 7.25000000000000e+00
+930 -7.50000000000000e-01
+931 0.00000000000000e+00
+932 7.75000000000000e+00
+933 -7.50000000000000e-01
+934 0.00000000000000e+00
+935 8.00000000000000e+00
+936 -7.50000000000000e-01
+937 0.00000000000000e+00
+938 7.75000000000000e+00
+939 -7.50000000000000e-01
+940 0.00000000000000e+00
+941 8.00000000000000e+00
+942 -1.00000000000000e+00
+943 0.00000000000000e+00
+944 7.75000000000000e+00
+945 -1.00000000000000e+00
+946 0.00000000000000e+00
+947 8.00000000000000e+00
+948 -1.00000000000000e+00
+949 0.00000000000000e+00
+950 7.75000000000000e+00
+951 0.00000000000000e+00
+952 0.00000000000000e+00
+953 6.50000000000000e+00
+954 -2.50000000000000e-01
+955 0.00000000000000e+00
+956 6.50000000000000e+00
+957 -2.50000000000000e-01
+958 0.00000000000000e+00
+959 6.50000000000000e+00
+960 0.00000000000000e+00
+961 0.00000000000000e+00
+962 6.75000000000000e+00
+963 -2.50000000000000e-01
+964 0.00000000000000e+00
+965 6.75000000000000e+00
+966 -2.50000000000000e-01
+967 0.00000000000000e+00
+968 6.75000000000000e+00
+969 0.00000000000000e+00
+970 0.00000000000000e+00
+971 6.25000000000000e+00
+972 -2.50000000000000e-01
+973 0.00000000000000e+00
+974 6.25000000000000e+00
+975 0.00000000000000e+00
+976 0.00000000000000e+00
+977 6.25000000000000e+00
+978 -2.50000000000000e-01
+979 0.00000000000000e+00
+980 6.25000000000000e+00
+981 -2.50000000000000e-01
+982 0.00000000000000e+00
+983 6.50000000000000e+00
+984 0.00000000000000e+00
+985 0.00000000000000e+00
+986 6.75000000000000e+00
+987 -2.50000000000000e-01
+988 0.00000000000000e+00
+989 6.75000000000000e+00
+990 0.00000000000000e+00
+991 0.00000000000000e+00
+992 6.50000000000000e+00
+993 -2.50000000000000e-01
+994 0.00000000000000e+00
+995 6.50000000000000e+00
+996 -2.50000000000000e-01
+997 0.00000000000000e+00
+998 6.75000000000000e+00
+999 -5.00000000000000e-01
+1000 0.00000000000000e+00
+1001 6.25000000000000e+00
+1002 -5.00000000000000e-01
+1003 0.00000000000000e+00
+1004 6.25000000000000e+00
+1005 -7.50000000000000e-01
+1006 0.00000000000000e+00
+1007 6.25000000000000e+00
+1008 -7.50000000000000e-01
+1009 0.00000000000000e+00
+1010 6.25000000000000e+00
+1011 -5.00000000000000e-01
+1012 0.00000000000000e+00
+1013 6.50000000000000e+00
+1014 -5.00000000000000e-01
+1015 0.00000000000000e+00
+1016 6.75000000000000e+00
+1017 -5.00000000000000e-01
+1018 0.00000000000000e+00
+1019 6.75000000000000e+00
+1020 -7.50000000000000e-01
+1021 0.00000000000000e+00
+1022 6.50000000000000e+00
+1023 -7.50000000000000e-01
+1024 0.00000000000000e+00
+1025 6.50000000000000e+00
+1026 -7.50000000000000e-01
+1027 0.00000000000000e+00
+1028 6.75000000000000e+00
+1029 -5.00000000000000e-01
+1030 0.00000000000000e+00
+1031 6.25000000000000e+00
+1032 -5.00000000000000e-01
+1033 0.00000000000000e+00
+1034 6.25000000000000e+00
+1035 -7.50000000000000e-01
+1036 0.00000000000000e+00
+1037 6.25000000000000e+00
+1038 -7.50000000000000e-01
+1039 0.00000000000000e+00
+1040 6.25000000000000e+00
+1041 -5.00000000000000e-01
+1042 0.00000000000000e+00
+1043 6.75000000000000e+00
+1044 -5.00000000000000e-01
+1045 0.00000000000000e+00
+1046 6.50000000000000e+00
+1047 -5.00000000000000e-01
+1048 0.00000000000000e+00
+1049 6.75000000000000e+00
+1050 -7.50000000000000e-01
+1051 0.00000000000000e+00
+1052 6.50000000000000e+00
+1053 -7.50000000000000e-01
+1054 0.00000000000000e+00
+1055 6.75000000000000e+00
+1056 -7.50000000000000e-01
+1057 0.00000000000000e+00
+1058 6.50000000000000e+00
+1059 0.00000000000000e+00
+1060 0.00000000000000e+00
+1061 7.50000000000000e+00
+1062 -2.50000000000000e-01
+1063 0.00000000000000e+00
+1064 7.50000000000000e+00
+1065 -2.50000000000000e-01
+1066 0.00000000000000e+00
+1067 7.50000000000000e+00
+1068 0.00000000000000e+00
+1069 0.00000000000000e+00
+1070 7.75000000000000e+00
+1071 -2.50000000000000e-01
+1072 0.00000000000000e+00
+1073 7.75000000000000e+00
+1074 -2.50000000000000e-01
+1075 0.00000000000000e+00
+1076 7.75000000000000e+00
+1077 0.00000000000000e+00
+1078 0.00000000000000e+00
+1079 7.25000000000000e+00
+1080 -2.50000000000000e-01
+1081 0.00000000000000e+00
+1082 7.00000000000000e+00
+1083 -2.50000000000000e-01
+1084 0.00000000000000e+00
+1085 7.25000000000000e+00
+1086 0.00000000000000e+00
+1087 0.00000000000000e+00
+1088 7.25000000000000e+00
+1089 -2.50000000000000e-01
+1090 0.00000000000000e+00
+1091 7.00000000000000e+00
+1092 -2.50000000000000e-01
+1093 0.00000000000000e+00
+1094 7.25000000000000e+00
+1095 -2.50000000000000e-01
+1096 0.00000000000000e+00
+1097 7.50000000000000e+00
+1098 0.00000000000000e+00
+1099 0.00000000000000e+00
+1100 7.75000000000000e+00
+1101 -2.50000000000000e-01
+1102 0.00000000000000e+00
+1103 7.75000000000000e+00
+1104 0.00000000000000e+00
+1105 0.00000000000000e+00
+1106 7.50000000000000e+00
+1107 -2.50000000000000e-01
+1108 0.00000000000000e+00
+1109 7.50000000000000e+00
+1110 -2.50000000000000e-01
+1111 0.00000000000000e+00
+1112 7.75000000000000e+00
+1113 -5.00000000000000e-01
+1114 0.00000000000000e+00
+1115 7.25000000000000e+00
+1116 -5.00000000000000e-01
+1117 0.00000000000000e+00
+1118 7.00000000000000e+00
+1119 -5.00000000000000e-01
+1120 0.00000000000000e+00
+1121 7.25000000000000e+00
+1122 -7.50000000000000e-01
+1123 0.00000000000000e+00
+1124 7.25000000000000e+00
+1125 -7.50000000000000e-01
+1126 0.00000000000000e+00
+1127 7.00000000000000e+00
+1128 -7.50000000000000e-01
+1129 0.00000000000000e+00
+1130 7.25000000000000e+00
+1131 -5.00000000000000e-01
+1132 0.00000000000000e+00
+1133 7.50000000000000e+00
+1134 -5.00000000000000e-01
+1135 0.00000000000000e+00
+1136 7.75000000000000e+00
+1137 -5.00000000000000e-01
+1138 0.00000000000000e+00
+1139 7.75000000000000e+00
+1140 -7.50000000000000e-01
+1141 0.00000000000000e+00
+1142 7.50000000000000e+00
+1143 -7.50000000000000e-01
+1144 0.00000000000000e+00
+1145 7.50000000000000e+00
+1146 -7.50000000000000e-01
+1147 0.00000000000000e+00
+1148 7.75000000000000e+00
+1149 -5.00000000000000e-01
+1150 0.00000000000000e+00
+1151 7.25000000000000e+00
+1152 -5.00000000000000e-01
+1153 0.00000000000000e+00
+1154 7.00000000000000e+00
+1155 -5.00000000000000e-01
+1156 0.00000000000000e+00
+1157 7.25000000000000e+00
+1158 -7.50000000000000e-01
+1159 0.00000000000000e+00
+1160 7.00000000000000e+00
+1161 -7.50000000000000e-01
+1162 0.00000000000000e+00
+1163 7.25000000000000e+00
+1164 -7.50000000000000e-01
+1165 0.00000000000000e+00
+1166 7.25000000000000e+00
+1167 -5.00000000000000e-01
+1168 0.00000000000000e+00
+1169 7.75000000000000e+00
+1170 -5.00000000000000e-01
+1171 0.00000000000000e+00
+1172 7.50000000000000e+00
+1173 -5.00000000000000e-01
+1174 0.00000000000000e+00
+1175 7.75000000000000e+00
+1176 -7.50000000000000e-01
+1177 0.00000000000000e+00
+1178 7.50000000000000e+00
+1179 -7.50000000000000e-01
+1180 0.00000000000000e+00
+1181 7.75000000000000e+00
+1182 -7.50000000000000e-01
+1183 0.00000000000000e+00
+1184 7.50000000000000e+00
+1185 -2.50000000000000e-01
+1186 0.00000000000000e+00
+1187 8.00000000000000e+00
+1188 -2.50000000000000e-01
+1189 0.00000000000000e+00
+1190 8.00000000000000e+00
+1191 -5.00000000000000e-01
+1192 0.00000000000000e+00
+1193 8.00000000000000e+00
+1194 -7.50000000000000e-01
+1195 0.00000000000000e+00
+1196 8.00000000000000e+00
+1197 -5.00000000000000e-01
+1198 0.00000000000000e+00
+1199 8.00000000000000e+00
+1200 -7.50000000000000e-01
+1201 0.00000000000000e+00
+1202 8.00000000000000e+00
+1203 -2.50000000000000e-01
+1204 0.00000000000000e+00
+1205 6.50000000000000e+00
+1206 -2.50000000000000e-01
+1207 0.00000000000000e+00
+1208 6.75000000000000e+00
+1209 -5.00000000000000e-01
+1210 0.00000000000000e+00
+1211 6.25000000000000e+00
+1212 -7.50000000000000e-01
+1213 0.00000000000000e+00
+1214 6.25000000000000e+00
+1215 -5.00000000000000e-01
+1216 0.00000000000000e+00
+1217 6.75000000000000e+00
+1218 -7.50000000000000e-01
+1219 0.00000000000000e+00
+1220 6.50000000000000e+00
+1221 -2.50000000000000e-01
+1222 0.00000000000000e+00
+1223 7.50000000000000e+00
+1224 -2.50000000000000e-01
+1225 0.00000000000000e+00
+1226 7.75000000000000e+00
+1227 -5.00000000000000e-01
+1228 0.00000000000000e+00
+1229 7.25000000000000e+00
+1230 -7.50000000000000e-01
+1231 0.00000000000000e+00
+1232 7.25000000000000e+00
+1233 -5.00000000000000e-01
+1234 0.00000000000000e+00
+1235 7.75000000000000e+00
+1236 -7.50000000000000e-01
+1237 0.00000000000000e+00
+1238 7.50000000000000e+00
+1239 -1.00000000000000e+00
+1240 0.00000000000000e+00
+1241 6.50000000000000e+00
+1242 -1.00000000000000e+00
+1243 0.00000000000000e+00
+1244 6.75000000000000e+00
+1245 -1.00000000000000e+00
+1246 0.00000000000000e+00
+1247 6.25000000000000e+00
+1248 -1.00000000000000e+00
+1249 0.00000000000000e+00
+1250 6.25000000000000e+00
+1251 -1.00000000000000e+00
+1252 0.00000000000000e+00
+1253 6.75000000000000e+00
+1254 -1.00000000000000e+00
+1255 0.00000000000000e+00
+1256 6.50000000000000e+00
+1257 -1.00000000000000e+00
+1258 0.00000000000000e+00
+1259 7.50000000000000e+00
+1260 -1.00000000000000e+00
+1261 0.00000000000000e+00
+1262 7.75000000000000e+00
+1263 -1.00000000000000e+00
+1264 0.00000000000000e+00
+1265 7.25000000000000e+00
+1266 -1.00000000000000e+00
+1267 0.00000000000000e+00
+1268 7.25000000000000e+00
+1269 -1.00000000000000e+00
+1270 0.00000000000000e+00
+1271 7.75000000000000e+00
+1272 -1.00000000000000e+00
+1273 0.00000000000000e+00
+1274 7.50000000000000e+00
diff --git a/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/rbms.2.00002 b/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/rbms.2.00002
new file mode 100644
index 00000000..ba6ddd38
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/rbms.2.00002
@@ -0,0 +1,601 @@
+1275 1875
+1275 0.00000000000000e+00
+1276 0.00000000000000e+00
+1277 2.00000000000000e+00
+1278 0.00000000000000e+00
+1279 0.00000000000000e+00
+1280 3.00000000000000e+00
+1281 0.00000000000000e+00
+1282 0.00000000000000e+00
+1283 2.00000000000000e+00
+1284 0.00000000000000e+00
+1285 0.00000000000000e+00
+1286 3.00000000000000e+00
+1287 -1.00000000000000e+00
+1288 0.00000000000000e+00
+1289 2.00000000000000e+00
+1290 -1.00000000000000e+00
+1291 0.00000000000000e+00
+1292 3.00000000000000e+00
+1293 -1.00000000000000e+00
+1294 0.00000000000000e+00
+1295 2.00000000000000e+00
+1296 -1.00000000000000e+00
+1297 0.00000000000000e+00
+1298 3.00000000000000e+00
+1299 0.00000000000000e+00
+1300 0.00000000000000e+00
+1301 2.50000000000000e+00
+1302 0.00000000000000e+00
+1303 0.00000000000000e+00
+1304 2.00000000000000e+00
+1305 0.00000000000000e+00
+1306 0.00000000000000e+00
+1307 2.50000000000000e+00
+1308 -5.00000000000000e-01
+1309 0.00000000000000e+00
+1310 2.00000000000000e+00
+1311 -5.00000000000000e-01
+1312 0.00000000000000e+00
+1313 2.50000000000000e+00
+1314 -5.00000000000000e-01
+1315 0.00000000000000e+00
+1316 2.00000000000000e+00
+1317 -5.00000000000000e-01
+1318 0.00000000000000e+00
+1319 2.50000000000000e+00
+1320 0.00000000000000e+00
+1321 0.00000000000000e+00
+1322 3.50000000000000e+00
+1323 0.00000000000000e+00
+1324 0.00000000000000e+00
+1325 3.00000000000000e+00
+1326 0.00000000000000e+00
+1327 0.00000000000000e+00
+1328 3.50000000000000e+00
+1329 -5.00000000000000e-01
+1330 0.00000000000000e+00
+1331 3.00000000000000e+00
+1332 -5.00000000000000e-01
+1333 0.00000000000000e+00
+1334 3.50000000000000e+00
+1335 -5.00000000000000e-01
+1336 0.00000000000000e+00
+1337 3.00000000000000e+00
+1338 -5.00000000000000e-01
+1339 0.00000000000000e+00
+1340 3.50000000000000e+00
+1341 0.00000000000000e+00
+1342 0.00000000000000e+00
+1343 2.50000000000000e+00
+1344 -5.00000000000000e-01
+1345 0.00000000000000e+00
+1346 2.00000000000000e+00
+1347 -5.00000000000000e-01
+1348 0.00000000000000e+00
+1349 2.50000000000000e+00
+1350 0.00000000000000e+00
+1351 0.00000000000000e+00
+1352 3.50000000000000e+00
+1353 -5.00000000000000e-01
+1354 0.00000000000000e+00
+1355 3.00000000000000e+00
+1356 -5.00000000000000e-01
+1357 0.00000000000000e+00
+1358 3.50000000000000e+00
+1359 -1.00000000000000e+00
+1360 0.00000000000000e+00
+1361 2.50000000000000e+00
+1362 -1.00000000000000e+00
+1363 0.00000000000000e+00
+1364 2.00000000000000e+00
+1365 -1.00000000000000e+00
+1366 0.00000000000000e+00
+1367 2.50000000000000e+00
+1368 -1.00000000000000e+00
+1369 0.00000000000000e+00
+1370 3.50000000000000e+00
+1371 -1.00000000000000e+00
+1372 0.00000000000000e+00
+1373 3.00000000000000e+00
+1374 -1.00000000000000e+00
+1375 0.00000000000000e+00
+1376 3.50000000000000e+00
+1377 -1.00000000000000e+00
+1378 0.00000000000000e+00
+1379 2.50000000000000e+00
+1380 -1.00000000000000e+00
+1381 0.00000000000000e+00
+1382 3.50000000000000e+00
+1383 0.00000000000000e+00
+1384 0.00000000000000e+00
+1385 2.25000000000000e+00
+1386 0.00000000000000e+00
+1387 0.00000000000000e+00
+1388 2.00000000000000e+00
+1389 0.00000000000000e+00
+1390 0.00000000000000e+00
+1391 2.25000000000000e+00
+1392 -2.50000000000000e-01
+1393 0.00000000000000e+00
+1394 2.00000000000000e+00
+1395 -2.50000000000000e-01
+1396 0.00000000000000e+00
+1397 2.25000000000000e+00
+1398 -2.50000000000000e-01
+1399 0.00000000000000e+00
+1400 2.00000000000000e+00
+1401 -2.50000000000000e-01
+1402 0.00000000000000e+00
+1403 2.25000000000000e+00
+1404 0.00000000000000e+00
+1405 0.00000000000000e+00
+1406 2.75000000000000e+00
+1407 0.00000000000000e+00
+1408 0.00000000000000e+00
+1409 3.25000000000000e+00
+1410 0.00000000000000e+00
+1411 0.00000000000000e+00
+1412 3.00000000000000e+00
+1413 0.00000000000000e+00
+1414 0.00000000000000e+00
+1415 3.25000000000000e+00
+1416 -2.50000000000000e-01
+1417 0.00000000000000e+00
+1418 3.00000000000000e+00
+1419 -2.50000000000000e-01
+1420 0.00000000000000e+00
+1421 3.25000000000000e+00
+1422 -2.50000000000000e-01
+1423 0.00000000000000e+00
+1424 3.00000000000000e+00
+1425 -2.50000000000000e-01
+1426 0.00000000000000e+00
+1427 3.25000000000000e+00
+1428 0.00000000000000e+00
+1429 0.00000000000000e+00
+1430 3.75000000000000e+00
+1431 0.00000000000000e+00
+1432 0.00000000000000e+00
+1433 2.00000000000000e+00
+1434 0.00000000000000e+00
+1435 0.00000000000000e+00
+1436 2.25000000000000e+00
+1437 -2.50000000000000e-01
+1438 0.00000000000000e+00
+1439 2.00000000000000e+00
+1440 -2.50000000000000e-01
+1441 0.00000000000000e+00
+1442 2.25000000000000e+00
+1443 0.00000000000000e+00
+1444 0.00000000000000e+00
+1445 2.75000000000000e+00
+1446 0.00000000000000e+00
+1447 0.00000000000000e+00
+1448 3.00000000000000e+00
+1449 0.00000000000000e+00
+1450 0.00000000000000e+00
+1451 2.75000000000000e+00
+1452 0.00000000000000e+00
+1453 0.00000000000000e+00
+1454 3.25000000000000e+00
+1455 -2.50000000000000e-01
+1456 0.00000000000000e+00
+1457 3.00000000000000e+00
+1458 -2.50000000000000e-01
+1459 0.00000000000000e+00
+1460 3.25000000000000e+00
+1461 0.00000000000000e+00
+1462 0.00000000000000e+00
+1463 3.75000000000000e+00
+1464 0.00000000000000e+00
+1465 0.00000000000000e+00
+1466 3.75000000000000e+00
+1467 -7.50000000000000e-01
+1468 0.00000000000000e+00
+1469 2.00000000000000e+00
+1470 -1.00000000000000e+00
+1471 0.00000000000000e+00
+1472 2.25000000000000e+00
+1473 -1.00000000000000e+00
+1474 0.00000000000000e+00
+1475 2.00000000000000e+00
+1476 -1.00000000000000e+00
+1477 0.00000000000000e+00
+1478 2.25000000000000e+00
+1479 -7.50000000000000e-01
+1480 0.00000000000000e+00
+1481 2.75000000000000e+00
+1482 -7.50000000000000e-01
+1483 0.00000000000000e+00
+1484 3.00000000000000e+00
+1485 -1.00000000000000e+00
+1486 0.00000000000000e+00
+1487 2.75000000000000e+00
+1488 -1.00000000000000e+00
+1489 0.00000000000000e+00
+1490 3.25000000000000e+00
+1491 -1.00000000000000e+00
+1492 0.00000000000000e+00
+1493 3.00000000000000e+00
+1494 -1.00000000000000e+00
+1495 0.00000000000000e+00
+1496 3.25000000000000e+00
+1497 -7.50000000000000e-01
+1498 0.00000000000000e+00
+1499 3.75000000000000e+00
+1500 -1.00000000000000e+00
+1501 0.00000000000000e+00
+1502 3.75000000000000e+00
+1503 -7.50000000000000e-01
+1504 0.00000000000000e+00
+1505 2.00000000000000e+00
+1506 -7.50000000000000e-01
+1507 0.00000000000000e+00
+1508 2.00000000000000e+00
+1509 -1.00000000000000e+00
+1510 0.00000000000000e+00
+1511 2.00000000000000e+00
+1512 -1.00000000000000e+00
+1513 0.00000000000000e+00
+1514 2.25000000000000e+00
+1515 -7.50000000000000e-01
+1516 0.00000000000000e+00
+1517 2.75000000000000e+00
+1518 -7.50000000000000e-01
+1519 0.00000000000000e+00
+1520 3.00000000000000e+00
+1521 -7.50000000000000e-01
+1522 0.00000000000000e+00
+1523 2.75000000000000e+00
+1524 -7.50000000000000e-01
+1525 0.00000000000000e+00
+1526 3.00000000000000e+00
+1527 -1.00000000000000e+00
+1528 0.00000000000000e+00
+1529 2.75000000000000e+00
+1530 -1.00000000000000e+00
+1531 0.00000000000000e+00
+1532 3.00000000000000e+00
+1533 -1.00000000000000e+00
+1534 0.00000000000000e+00
+1535 2.75000000000000e+00
+1536 -1.00000000000000e+00
+1537 0.00000000000000e+00
+1538 3.25000000000000e+00
+1539 -7.50000000000000e-01
+1540 0.00000000000000e+00
+1541 3.75000000000000e+00
+1542 -7.50000000000000e-01
+1543 0.00000000000000e+00
+1544 3.75000000000000e+00
+1545 -1.00000000000000e+00
+1546 0.00000000000000e+00
+1547 3.75000000000000e+00
+1548 -1.00000000000000e+00
+1549 0.00000000000000e+00
+1550 3.75000000000000e+00
+1551 0.00000000000000e+00
+1552 0.00000000000000e+00
+1553 2.50000000000000e+00
+1554 -2.50000000000000e-01
+1555 0.00000000000000e+00
+1556 2.50000000000000e+00
+1557 -2.50000000000000e-01
+1558 0.00000000000000e+00
+1559 2.50000000000000e+00
+1560 0.00000000000000e+00
+1561 0.00000000000000e+00
+1562 2.75000000000000e+00
+1563 -2.50000000000000e-01
+1564 0.00000000000000e+00
+1565 2.75000000000000e+00
+1566 -2.50000000000000e-01
+1567 0.00000000000000e+00
+1568 2.75000000000000e+00
+1569 0.00000000000000e+00
+1570 0.00000000000000e+00
+1571 2.25000000000000e+00
+1572 -2.50000000000000e-01
+1573 0.00000000000000e+00
+1574 2.00000000000000e+00
+1575 -2.50000000000000e-01
+1576 0.00000000000000e+00
+1577 2.25000000000000e+00
+1578 0.00000000000000e+00
+1579 0.00000000000000e+00
+1580 2.25000000000000e+00
+1581 -2.50000000000000e-01
+1582 0.00000000000000e+00
+1583 2.00000000000000e+00
+1584 -2.50000000000000e-01
+1585 0.00000000000000e+00
+1586 2.25000000000000e+00
+1587 -2.50000000000000e-01
+1588 0.00000000000000e+00
+1589 2.50000000000000e+00
+1590 0.00000000000000e+00
+1591 0.00000000000000e+00
+1592 2.75000000000000e+00
+1593 -2.50000000000000e-01
+1594 0.00000000000000e+00
+1595 2.75000000000000e+00
+1596 0.00000000000000e+00
+1597 0.00000000000000e+00
+1598 2.50000000000000e+00
+1599 -2.50000000000000e-01
+1600 0.00000000000000e+00
+1601 2.50000000000000e+00
+1602 -2.50000000000000e-01
+1603 0.00000000000000e+00
+1604 2.75000000000000e+00
+1605 -5.00000000000000e-01
+1606 0.00000000000000e+00
+1607 2.25000000000000e+00
+1608 -5.00000000000000e-01
+1609 0.00000000000000e+00
+1610 2.00000000000000e+00
+1611 -5.00000000000000e-01
+1612 0.00000000000000e+00
+1613 2.25000000000000e+00
+1614 -7.50000000000000e-01
+1615 0.00000000000000e+00
+1616 2.25000000000000e+00
+1617 -7.50000000000000e-01
+1618 0.00000000000000e+00
+1619 2.00000000000000e+00
+1620 -7.50000000000000e-01
+1621 0.00000000000000e+00
+1622 2.25000000000000e+00
+1623 -5.00000000000000e-01
+1624 0.00000000000000e+00
+1625 2.50000000000000e+00
+1626 -5.00000000000000e-01
+1627 0.00000000000000e+00
+1628 2.75000000000000e+00
+1629 -5.00000000000000e-01
+1630 0.00000000000000e+00
+1631 2.75000000000000e+00
+1632 -7.50000000000000e-01
+1633 0.00000000000000e+00
+1634 2.50000000000000e+00
+1635 -7.50000000000000e-01
+1636 0.00000000000000e+00
+1637 2.50000000000000e+00
+1638 -7.50000000000000e-01
+1639 0.00000000000000e+00
+1640 2.75000000000000e+00
+1641 -5.00000000000000e-01
+1642 0.00000000000000e+00
+1643 2.25000000000000e+00
+1644 -5.00000000000000e-01
+1645 0.00000000000000e+00
+1646 2.00000000000000e+00
+1647 -5.00000000000000e-01
+1648 0.00000000000000e+00
+1649 2.25000000000000e+00
+1650 -7.50000000000000e-01
+1651 0.00000000000000e+00
+1652 2.00000000000000e+00
+1653 -7.50000000000000e-01
+1654 0.00000000000000e+00
+1655 2.25000000000000e+00
+1656 -7.50000000000000e-01
+1657 0.00000000000000e+00
+1658 2.25000000000000e+00
+1659 -5.00000000000000e-01
+1660 0.00000000000000e+00
+1661 2.75000000000000e+00
+1662 -5.00000000000000e-01
+1663 0.00000000000000e+00
+1664 2.50000000000000e+00
+1665 -5.00000000000000e-01
+1666 0.00000000000000e+00
+1667 2.75000000000000e+00
+1668 -7.50000000000000e-01
+1669 0.00000000000000e+00
+1670 2.50000000000000e+00
+1671 -7.50000000000000e-01
+1672 0.00000000000000e+00
+1673 2.75000000000000e+00
+1674 -7.50000000000000e-01
+1675 0.00000000000000e+00
+1676 2.50000000000000e+00
+1677 0.00000000000000e+00
+1678 0.00000000000000e+00
+1679 3.50000000000000e+00
+1680 -2.50000000000000e-01
+1681 0.00000000000000e+00
+1682 3.50000000000000e+00
+1683 -2.50000000000000e-01
+1684 0.00000000000000e+00
+1685 3.50000000000000e+00
+1686 0.00000000000000e+00
+1687 0.00000000000000e+00
+1688 3.75000000000000e+00
+1689 -2.50000000000000e-01
+1690 0.00000000000000e+00
+1691 3.75000000000000e+00
+1692 -2.50000000000000e-01
+1693 0.00000000000000e+00
+1694 3.75000000000000e+00
+1695 0.00000000000000e+00
+1696 0.00000000000000e+00
+1697 3.25000000000000e+00
+1698 -2.50000000000000e-01
+1699 0.00000000000000e+00
+1700 3.00000000000000e+00
+1701 -2.50000000000000e-01
+1702 0.00000000000000e+00
+1703 3.25000000000000e+00
+1704 0.00000000000000e+00
+1705 0.00000000000000e+00
+1706 3.25000000000000e+00
+1707 -2.50000000000000e-01
+1708 0.00000000000000e+00
+1709 3.00000000000000e+00
+1710 -2.50000000000000e-01
+1711 0.00000000000000e+00
+1712 3.25000000000000e+00
+1713 -2.50000000000000e-01
+1714 0.00000000000000e+00
+1715 3.50000000000000e+00
+1716 0.00000000000000e+00
+1717 0.00000000000000e+00
+1718 3.75000000000000e+00
+1719 -2.50000000000000e-01
+1720 0.00000000000000e+00
+1721 3.75000000000000e+00
+1722 0.00000000000000e+00
+1723 0.00000000000000e+00
+1724 3.50000000000000e+00
+1725 -2.50000000000000e-01
+1726 0.00000000000000e+00
+1727 3.50000000000000e+00
+1728 -2.50000000000000e-01
+1729 0.00000000000000e+00
+1730 3.75000000000000e+00
+1731 -5.00000000000000e-01
+1732 0.00000000000000e+00
+1733 3.25000000000000e+00
+1734 -5.00000000000000e-01
+1735 0.00000000000000e+00
+1736 3.00000000000000e+00
+1737 -5.00000000000000e-01
+1738 0.00000000000000e+00
+1739 3.25000000000000e+00
+1740 -7.50000000000000e-01
+1741 0.00000000000000e+00
+1742 3.25000000000000e+00
+1743 -7.50000000000000e-01
+1744 0.00000000000000e+00
+1745 3.00000000000000e+00
+1746 -7.50000000000000e-01
+1747 0.00000000000000e+00
+1748 3.25000000000000e+00
+1749 -5.00000000000000e-01
+1750 0.00000000000000e+00
+1751 3.50000000000000e+00
+1752 -5.00000000000000e-01
+1753 0.00000000000000e+00
+1754 3.75000000000000e+00
+1755 -5.00000000000000e-01
+1756 0.00000000000000e+00
+1757 3.75000000000000e+00
+1758 -7.50000000000000e-01
+1759 0.00000000000000e+00
+1760 3.50000000000000e+00
+1761 -7.50000000000000e-01
+1762 0.00000000000000e+00
+1763 3.50000000000000e+00
+1764 -7.50000000000000e-01
+1765 0.00000000000000e+00
+1766 3.75000000000000e+00
+1767 -5.00000000000000e-01
+1768 0.00000000000000e+00
+1769 3.25000000000000e+00
+1770 -5.00000000000000e-01
+1771 0.00000000000000e+00
+1772 3.00000000000000e+00
+1773 -5.00000000000000e-01
+1774 0.00000000000000e+00
+1775 3.25000000000000e+00
+1776 -7.50000000000000e-01
+1777 0.00000000000000e+00
+1778 3.00000000000000e+00
+1779 -7.50000000000000e-01
+1780 0.00000000000000e+00
+1781 3.25000000000000e+00
+1782 -7.50000000000000e-01
+1783 0.00000000000000e+00
+1784 3.25000000000000e+00
+1785 -5.00000000000000e-01
+1786 0.00000000000000e+00
+1787 3.75000000000000e+00
+1788 -5.00000000000000e-01
+1789 0.00000000000000e+00
+1790 3.50000000000000e+00
+1791 -5.00000000000000e-01
+1792 0.00000000000000e+00
+1793 3.75000000000000e+00
+1794 -7.50000000000000e-01
+1795 0.00000000000000e+00
+1796 3.50000000000000e+00
+1797 -7.50000000000000e-01
+1798 0.00000000000000e+00
+1799 3.75000000000000e+00
+1800 -7.50000000000000e-01
+1801 0.00000000000000e+00
+1802 3.50000000000000e+00
+1803 -2.50000000000000e-01
+1804 0.00000000000000e+00
+1805 2.50000000000000e+00
+1806 -2.50000000000000e-01
+1807 0.00000000000000e+00
+1808 2.75000000000000e+00
+1809 -5.00000000000000e-01
+1810 0.00000000000000e+00
+1811 2.25000000000000e+00
+1812 -7.50000000000000e-01
+1813 0.00000000000000e+00
+1814 2.25000000000000e+00
+1815 -5.00000000000000e-01
+1816 0.00000000000000e+00
+1817 2.75000000000000e+00
+1818 -7.50000000000000e-01
+1819 0.00000000000000e+00
+1820 2.50000000000000e+00
+1821 -2.50000000000000e-01
+1822 0.00000000000000e+00
+1823 3.50000000000000e+00
+1824 -2.50000000000000e-01
+1825 0.00000000000000e+00
+1826 3.75000000000000e+00
+1827 -5.00000000000000e-01
+1828 0.00000000000000e+00
+1829 3.25000000000000e+00
+1830 -7.50000000000000e-01
+1831 0.00000000000000e+00
+1832 3.25000000000000e+00
+1833 -5.00000000000000e-01
+1834 0.00000000000000e+00
+1835 3.75000000000000e+00
+1836 -7.50000000000000e-01
+1837 0.00000000000000e+00
+1838 3.50000000000000e+00
+1839 -1.00000000000000e+00
+1840 0.00000000000000e+00
+1841 2.50000000000000e+00
+1842 -1.00000000000000e+00
+1843 0.00000000000000e+00
+1844 2.75000000000000e+00
+1845 -1.00000000000000e+00
+1846 0.00000000000000e+00
+1847 2.25000000000000e+00
+1848 -1.00000000000000e+00
+1849 0.00000000000000e+00
+1850 2.25000000000000e+00
+1851 -1.00000000000000e+00
+1852 0.00000000000000e+00
+1853 2.75000000000000e+00
+1854 -1.00000000000000e+00
+1855 0.00000000000000e+00
+1856 2.50000000000000e+00
+1857 -1.00000000000000e+00
+1858 0.00000000000000e+00
+1859 3.50000000000000e+00
+1860 -1.00000000000000e+00
+1861 0.00000000000000e+00
+1862 3.75000000000000e+00
+1863 -1.00000000000000e+00
+1864 0.00000000000000e+00
+1865 3.25000000000000e+00
+1866 -1.00000000000000e+00
+1867 0.00000000000000e+00
+1868 3.25000000000000e+00
+1869 -1.00000000000000e+00
+1870 0.00000000000000e+00
+1871 3.75000000000000e+00
+1872 -1.00000000000000e+00
+1873 0.00000000000000e+00
+1874 3.50000000000000e+00
diff --git a/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/rbms.2.00003 b/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/rbms.2.00003
new file mode 100644
index 00000000..e64deda3
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/data/beam_tet_dof2475_np4/rbms.2.00003
@@ -0,0 +1,601 @@
+1875 2475
+1875 0.00000000000000e+00
+1876 0.00000000000000e+00
+1877 0.00000000000000e+00
+1878 0.00000000000000e+00
+1879 0.00000000000000e+00
+1880 1.00000000000000e+00
+1881 0.00000000000000e+00
+1882 0.00000000000000e+00
+1883 0.00000000000000e+00
+1884 0.00000000000000e+00
+1885 0.00000000000000e+00
+1886 1.00000000000000e+00
+1887 -1.00000000000000e+00
+1888 0.00000000000000e+00
+1889 0.00000000000000e+00
+1890 -1.00000000000000e+00
+1891 0.00000000000000e+00
+1892 1.00000000000000e+00
+1893 -1.00000000000000e+00
+1894 0.00000000000000e+00
+1895 0.00000000000000e+00
+1896 -1.00000000000000e+00
+1897 0.00000000000000e+00
+1898 1.00000000000000e+00
+1899 0.00000000000000e+00
+1900 0.00000000000000e+00
+1901 5.00000000000000e-01
+1902 0.00000000000000e+00
+1903 0.00000000000000e+00
+1904 0.00000000000000e+00
+1905 0.00000000000000e+00
+1906 0.00000000000000e+00
+1907 5.00000000000000e-01
+1908 -5.00000000000000e-01
+1909 0.00000000000000e+00
+1910 0.00000000000000e+00
+1911 -5.00000000000000e-01
+1912 0.00000000000000e+00
+1913 5.00000000000000e-01
+1914 -5.00000000000000e-01
+1915 0.00000000000000e+00
+1916 0.00000000000000e+00
+1917 -5.00000000000000e-01
+1918 0.00000000000000e+00
+1919 5.00000000000000e-01
+1920 0.00000000000000e+00
+1921 0.00000000000000e+00
+1922 1.50000000000000e+00
+1923 0.00000000000000e+00
+1924 0.00000000000000e+00
+1925 1.00000000000000e+00
+1926 0.00000000000000e+00
+1927 0.00000000000000e+00
+1928 1.50000000000000e+00
+1929 -5.00000000000000e-01
+1930 0.00000000000000e+00
+1931 1.00000000000000e+00
+1932 -5.00000000000000e-01
+1933 0.00000000000000e+00
+1934 1.50000000000000e+00
+1935 -5.00000000000000e-01
+1936 0.00000000000000e+00
+1937 1.00000000000000e+00
+1938 -5.00000000000000e-01
+1939 0.00000000000000e+00
+1940 1.50000000000000e+00
+1941 0.00000000000000e+00
+1942 0.00000000000000e+00
+1943 5.00000000000000e-01
+1944 -5.00000000000000e-01
+1945 0.00000000000000e+00
+1946 0.00000000000000e+00
+1947 -5.00000000000000e-01
+1948 0.00000000000000e+00
+1949 5.00000000000000e-01
+1950 0.00000000000000e+00
+1951 0.00000000000000e+00
+1952 1.50000000000000e+00
+1953 -5.00000000000000e-01
+1954 0.00000000000000e+00
+1955 1.00000000000000e+00
+1956 -5.00000000000000e-01
+1957 0.00000000000000e+00
+1958 1.50000000000000e+00
+1959 -1.00000000000000e+00
+1960 0.00000000000000e+00
+1961 5.00000000000000e-01
+1962 -1.00000000000000e+00
+1963 0.00000000000000e+00
+1964 0.00000000000000e+00
+1965 -1.00000000000000e+00
+1966 0.00000000000000e+00
+1967 5.00000000000000e-01
+1968 -1.00000000000000e+00
+1969 0.00000000000000e+00
+1970 1.50000000000000e+00
+1971 -1.00000000000000e+00
+1972 0.00000000000000e+00
+1973 1.00000000000000e+00
+1974 -1.00000000000000e+00
+1975 0.00000000000000e+00
+1976 1.50000000000000e+00
+1977 -1.00000000000000e+00
+1978 0.00000000000000e+00
+1979 5.00000000000000e-01
+1980 -1.00000000000000e+00
+1981 0.00000000000000e+00
+1982 1.50000000000000e+00
+1983 0.00000000000000e+00
+1984 0.00000000000000e+00
+1985 2.50000000000000e-01
+1986 0.00000000000000e+00
+1987 0.00000000000000e+00
+1988 0.00000000000000e+00
+1989 0.00000000000000e+00
+1990 0.00000000000000e+00
+1991 2.50000000000000e-01
+1992 -2.50000000000000e-01
+1993 0.00000000000000e+00
+1994 0.00000000000000e+00
+1995 -2.50000000000000e-01
+1996 0.00000000000000e+00
+1997 2.50000000000000e-01
+1998 -2.50000000000000e-01
+1999 0.00000000000000e+00
+2000 0.00000000000000e+00
+2001 -2.50000000000000e-01
+2002 0.00000000000000e+00
+2003 2.50000000000000e-01
+2004 0.00000000000000e+00
+2005 0.00000000000000e+00
+2006 7.50000000000000e-01
+2007 0.00000000000000e+00
+2008 0.00000000000000e+00
+2009 1.25000000000000e+00
+2010 0.00000000000000e+00
+2011 0.00000000000000e+00
+2012 1.00000000000000e+00
+2013 0.00000000000000e+00
+2014 0.00000000000000e+00
+2015 1.25000000000000e+00
+2016 -2.50000000000000e-01
+2017 0.00000000000000e+00
+2018 1.00000000000000e+00
+2019 -2.50000000000000e-01
+2020 0.00000000000000e+00
+2021 1.25000000000000e+00
+2022 -2.50000000000000e-01
+2023 0.00000000000000e+00
+2024 1.00000000000000e+00
+2025 -2.50000000000000e-01
+2026 0.00000000000000e+00
+2027 1.25000000000000e+00
+2028 0.00000000000000e+00
+2029 0.00000000000000e+00
+2030 1.75000000000000e+00
+2031 0.00000000000000e+00
+2032 0.00000000000000e+00
+2033 0.00000000000000e+00
+2034 0.00000000000000e+00
+2035 0.00000000000000e+00
+2036 2.50000000000000e-01
+2037 -2.50000000000000e-01
+2038 0.00000000000000e+00
+2039 0.00000000000000e+00
+2040 -2.50000000000000e-01
+2041 0.00000000000000e+00
+2042 2.50000000000000e-01
+2043 0.00000000000000e+00
+2044 0.00000000000000e+00
+2045 7.50000000000000e-01
+2046 0.00000000000000e+00
+2047 0.00000000000000e+00
+2048 1.00000000000000e+00
+2049 0.00000000000000e+00
+2050 0.00000000000000e+00
+2051 7.50000000000000e-01
+2052 0.00000000000000e+00
+2053 0.00000000000000e+00
+2054 1.25000000000000e+00
+2055 -2.50000000000000e-01
+2056 0.00000000000000e+00
+2057 1.00000000000000e+00
+2058 -2.50000000000000e-01
+2059 0.00000000000000e+00
+2060 1.25000000000000e+00
+2061 0.00000000000000e+00
+2062 0.00000000000000e+00
+2063 1.75000000000000e+00
+2064 0.00000000000000e+00
+2065 0.00000000000000e+00
+2066 1.75000000000000e+00
+2067 -7.50000000000000e-01
+2068 0.00000000000000e+00
+2069 0.00000000000000e+00
+2070 -1.00000000000000e+00
+2071 0.00000000000000e+00
+2072 2.50000000000000e-01
+2073 -1.00000000000000e+00
+2074 0.00000000000000e+00
+2075 0.00000000000000e+00
+2076 -1.00000000000000e+00
+2077 0.00000000000000e+00
+2078 2.50000000000000e-01
+2079 -7.50000000000000e-01
+2080 0.00000000000000e+00
+2081 7.50000000000000e-01
+2082 -7.50000000000000e-01
+2083 0.00000000000000e+00
+2084 1.00000000000000e+00
+2085 -1.00000000000000e+00
+2086 0.00000000000000e+00
+2087 7.50000000000000e-01
+2088 -1.00000000000000e+00
+2089 0.00000000000000e+00
+2090 1.25000000000000e+00
+2091 -1.00000000000000e+00
+2092 0.00000000000000e+00
+2093 1.00000000000000e+00
+2094 -1.00000000000000e+00
+2095 0.00000000000000e+00
+2096 1.25000000000000e+00
+2097 -7.50000000000000e-01
+2098 0.00000000000000e+00
+2099 1.75000000000000e+00
+2100 -1.00000000000000e+00
+2101 0.00000000000000e+00
+2102 1.75000000000000e+00
+2103 -7.50000000000000e-01
+2104 0.00000000000000e+00
+2105 0.00000000000000e+00
+2106 -7.50000000000000e-01
+2107 0.00000000000000e+00
+2108 0.00000000000000e+00
+2109 -1.00000000000000e+00
+2110 0.00000000000000e+00
+2111 0.00000000000000e+00
+2112 -1.00000000000000e+00
+2113 0.00000000000000e+00
+2114 2.50000000000000e-01
+2115 -7.50000000000000e-01
+2116 0.00000000000000e+00
+2117 7.50000000000000e-01
+2118 -7.50000000000000e-01
+2119 0.00000000000000e+00
+2120 1.00000000000000e+00
+2121 -7.50000000000000e-01
+2122 0.00000000000000e+00
+2123 7.50000000000000e-01
+2124 -7.50000000000000e-01
+2125 0.00000000000000e+00
+2126 1.00000000000000e+00
+2127 -1.00000000000000e+00
+2128 0.00000000000000e+00
+2129 7.50000000000000e-01
+2130 -1.00000000000000e+00
+2131 0.00000000000000e+00
+2132 1.00000000000000e+00
+2133 -1.00000000000000e+00
+2134 0.00000000000000e+00
+2135 7.50000000000000e-01
+2136 -1.00000000000000e+00
+2137 0.00000000000000e+00
+2138 1.25000000000000e+00
+2139 -7.50000000000000e-01
+2140 0.00000000000000e+00
+2141 1.75000000000000e+00
+2142 -7.50000000000000e-01
+2143 0.00000000000000e+00
+2144 1.75000000000000e+00
+2145 -1.00000000000000e+00
+2146 0.00000000000000e+00
+2147 1.75000000000000e+00
+2148 -1.00000000000000e+00
+2149 0.00000000000000e+00
+2150 1.75000000000000e+00
+2151 0.00000000000000e+00
+2152 0.00000000000000e+00
+2153 5.00000000000000e-01
+2154 -2.50000000000000e-01
+2155 0.00000000000000e+00
+2156 5.00000000000000e-01
+2157 -2.50000000000000e-01
+2158 0.00000000000000e+00
+2159 5.00000000000000e-01
+2160 0.00000000000000e+00
+2161 0.00000000000000e+00
+2162 7.50000000000000e-01
+2163 -2.50000000000000e-01
+2164 0.00000000000000e+00
+2165 7.50000000000000e-01
+2166 -2.50000000000000e-01
+2167 0.00000000000000e+00
+2168 7.50000000000000e-01
+2169 0.00000000000000e+00
+2170 0.00000000000000e+00
+2171 2.50000000000000e-01
+2172 -2.50000000000000e-01
+2173 0.00000000000000e+00
+2174 0.00000000000000e+00
+2175 -2.50000000000000e-01
+2176 0.00000000000000e+00
+2177 2.50000000000000e-01
+2178 0.00000000000000e+00
+2179 0.00000000000000e+00
+2180 2.50000000000000e-01
+2181 -2.50000000000000e-01
+2182 0.00000000000000e+00
+2183 0.00000000000000e+00
+2184 -2.50000000000000e-01
+2185 0.00000000000000e+00
+2186 2.50000000000000e-01
+2187 -2.50000000000000e-01
+2188 0.00000000000000e+00
+2189 5.00000000000000e-01
+2190 0.00000000000000e+00
+2191 0.00000000000000e+00
+2192 7.50000000000000e-01
+2193 -2.50000000000000e-01
+2194 0.00000000000000e+00
+2195 7.50000000000000e-01
+2196 0.00000000000000e+00
+2197 0.00000000000000e+00
+2198 5.00000000000000e-01
+2199 -2.50000000000000e-01
+2200 0.00000000000000e+00
+2201 5.00000000000000e-01
+2202 -2.50000000000000e-01
+2203 0.00000000000000e+00
+2204 7.50000000000000e-01
+2205 -5.00000000000000e-01
+2206 0.00000000000000e+00
+2207 2.50000000000000e-01
+2208 -5.00000000000000e-01
+2209 0.00000000000000e+00
+2210 0.00000000000000e+00
+2211 -5.00000000000000e-01
+2212 0.00000000000000e+00
+2213 2.50000000000000e-01
+2214 -7.50000000000000e-01
+2215 0.00000000000000e+00
+2216 2.50000000000000e-01
+2217 -7.50000000000000e-01
+2218 0.00000000000000e+00
+2219 0.00000000000000e+00
+2220 -7.50000000000000e-01
+2221 0.00000000000000e+00
+2222 2.50000000000000e-01
+2223 -5.00000000000000e-01
+2224 0.00000000000000e+00
+2225 5.00000000000000e-01
+2226 -5.00000000000000e-01
+2227 0.00000000000000e+00
+2228 7.50000000000000e-01
+2229 -5.00000000000000e-01
+2230 0.00000000000000e+00
+2231 7.50000000000000e-01
+2232 -7.50000000000000e-01
+2233 0.00000000000000e+00
+2234 5.00000000000000e-01
+2235 -7.50000000000000e-01
+2236 0.00000000000000e+00
+2237 5.00000000000000e-01
+2238 -7.50000000000000e-01
+2239 0.00000000000000e+00
+2240 7.50000000000000e-01
+2241 -5.00000000000000e-01
+2242 0.00000000000000e+00
+2243 2.50000000000000e-01
+2244 -5.00000000000000e-01
+2245 0.00000000000000e+00
+2246 0.00000000000000e+00
+2247 -5.00000000000000e-01
+2248 0.00000000000000e+00
+2249 2.50000000000000e-01
+2250 -7.50000000000000e-01
+2251 0.00000000000000e+00
+2252 0.00000000000000e+00
+2253 -7.50000000000000e-01
+2254 0.00000000000000e+00
+2255 2.50000000000000e-01
+2256 -7.50000000000000e-01
+2257 0.00000000000000e+00
+2258 2.50000000000000e-01
+2259 -5.00000000000000e-01
+2260 0.00000000000000e+00
+2261 7.50000000000000e-01
+2262 -5.00000000000000e-01
+2263 0.00000000000000e+00
+2264 5.00000000000000e-01
+2265 -5.00000000000000e-01
+2266 0.00000000000000e+00
+2267 7.50000000000000e-01
+2268 -7.50000000000000e-01
+2269 0.00000000000000e+00
+2270 5.00000000000000e-01
+2271 -7.50000000000000e-01
+2272 0.00000000000000e+00
+2273 7.50000000000000e-01
+2274 -7.50000000000000e-01
+2275 0.00000000000000e+00
+2276 5.00000000000000e-01
+2277 0.00000000000000e+00
+2278 0.00000000000000e+00
+2279 1.50000000000000e+00
+2280 -2.50000000000000e-01
+2281 0.00000000000000e+00
+2282 1.50000000000000e+00
+2283 -2.50000000000000e-01
+2284 0.00000000000000e+00
+2285 1.50000000000000e+00
+2286 0.00000000000000e+00
+2287 0.00000000000000e+00
+2288 1.75000000000000e+00
+2289 -2.50000000000000e-01
+2290 0.00000000000000e+00
+2291 1.75000000000000e+00
+2292 -2.50000000000000e-01
+2293 0.00000000000000e+00
+2294 1.75000000000000e+00
+2295 0.00000000000000e+00
+2296 0.00000000000000e+00
+2297 1.25000000000000e+00
+2298 -2.50000000000000e-01
+2299 0.00000000000000e+00
+2300 1.00000000000000e+00
+2301 -2.50000000000000e-01
+2302 0.00000000000000e+00
+2303 1.25000000000000e+00
+2304 0.00000000000000e+00
+2305 0.00000000000000e+00
+2306 1.25000000000000e+00
+2307 -2.50000000000000e-01
+2308 0.00000000000000e+00
+2309 1.00000000000000e+00
+2310 -2.50000000000000e-01
+2311 0.00000000000000e+00
+2312 1.25000000000000e+00
+2313 -2.50000000000000e-01
+2314 0.00000000000000e+00
+2315 1.50000000000000e+00
+2316 0.00000000000000e+00
+2317 0.00000000000000e+00
+2318 1.75000000000000e+00
+2319 -2.50000000000000e-01
+2320 0.00000000000000e+00
+2321 1.75000000000000e+00
+2322 0.00000000000000e+00
+2323 0.00000000000000e+00
+2324 1.50000000000000e+00
+2325 -2.50000000000000e-01
+2326 0.00000000000000e+00
+2327 1.50000000000000e+00
+2328 -2.50000000000000e-01
+2329 0.00000000000000e+00
+2330 1.75000000000000e+00
+2331 -5.00000000000000e-01
+2332 0.00000000000000e+00
+2333 1.25000000000000e+00
+2334 -5.00000000000000e-01
+2335 0.00000000000000e+00
+2336 1.00000000000000e+00
+2337 -5.00000000000000e-01
+2338 0.00000000000000e+00
+2339 1.25000000000000e+00
+2340 -7.50000000000000e-01
+2341 0.00000000000000e+00
+2342 1.25000000000000e+00
+2343 -7.50000000000000e-01
+2344 0.00000000000000e+00
+2345 1.00000000000000e+00
+2346 -7.50000000000000e-01
+2347 0.00000000000000e+00
+2348 1.25000000000000e+00
+2349 -5.00000000000000e-01
+2350 0.00000000000000e+00
+2351 1.50000000000000e+00
+2352 -5.00000000000000e-01
+2353 0.00000000000000e+00
+2354 1.75000000000000e+00
+2355 -5.00000000000000e-01
+2356 0.00000000000000e+00
+2357 1.75000000000000e+00
+2358 -7.50000000000000e-01
+2359 0.00000000000000e+00
+2360 1.50000000000000e+00
+2361 -7.50000000000000e-01
+2362 0.00000000000000e+00
+2363 1.50000000000000e+00
+2364 -7.50000000000000e-01
+2365 0.00000000000000e+00
+2366 1.75000000000000e+00
+2367 -5.00000000000000e-01
+2368 0.00000000000000e+00
+2369 1.25000000000000e+00
+2370 -5.00000000000000e-01
+2371 0.00000000000000e+00
+2372 1.00000000000000e+00
+2373 -5.00000000000000e-01
+2374 0.00000000000000e+00
+2375 1.25000000000000e+00
+2376 -7.50000000000000e-01
+2377 0.00000000000000e+00
+2378 1.00000000000000e+00
+2379 -7.50000000000000e-01
+2380 0.00000000000000e+00
+2381 1.25000000000000e+00
+2382 -7.50000000000000e-01
+2383 0.00000000000000e+00
+2384 1.25000000000000e+00
+2385 -5.00000000000000e-01
+2386 0.00000000000000e+00
+2387 1.75000000000000e+00
+2388 -5.00000000000000e-01
+2389 0.00000000000000e+00
+2390 1.50000000000000e+00
+2391 -5.00000000000000e-01
+2392 0.00000000000000e+00
+2393 1.75000000000000e+00
+2394 -7.50000000000000e-01
+2395 0.00000000000000e+00
+2396 1.50000000000000e+00
+2397 -7.50000000000000e-01
+2398 0.00000000000000e+00
+2399 1.75000000000000e+00
+2400 -7.50000000000000e-01
+2401 0.00000000000000e+00
+2402 1.50000000000000e+00
+2403 -2.50000000000000e-01
+2404 0.00000000000000e+00
+2405 5.00000000000000e-01
+2406 -2.50000000000000e-01
+2407 0.00000000000000e+00
+2408 7.50000000000000e-01
+2409 -5.00000000000000e-01
+2410 0.00000000000000e+00
+2411 2.50000000000000e-01
+2412 -7.50000000000000e-01
+2413 0.00000000000000e+00
+2414 2.50000000000000e-01
+2415 -5.00000000000000e-01
+2416 0.00000000000000e+00
+2417 7.50000000000000e-01
+2418 -7.50000000000000e-01
+2419 0.00000000000000e+00
+2420 5.00000000000000e-01
+2421 -2.50000000000000e-01
+2422 0.00000000000000e+00
+2423 1.50000000000000e+00
+2424 -2.50000000000000e-01
+2425 0.00000000000000e+00
+2426 1.75000000000000e+00
+2427 -5.00000000000000e-01
+2428 0.00000000000000e+00
+2429 1.25000000000000e+00
+2430 -7.50000000000000e-01
+2431 0.00000000000000e+00
+2432 1.25000000000000e+00
+2433 -5.00000000000000e-01
+2434 0.00000000000000e+00
+2435 1.75000000000000e+00
+2436 -7.50000000000000e-01
+2437 0.00000000000000e+00
+2438 1.50000000000000e+00
+2439 -1.00000000000000e+00
+2440 0.00000000000000e+00
+2441 5.00000000000000e-01
+2442 -1.00000000000000e+00
+2443 0.00000000000000e+00
+2444 7.50000000000000e-01
+2445 -1.00000000000000e+00
+2446 0.00000000000000e+00
+2447 2.50000000000000e-01
+2448 -1.00000000000000e+00
+2449 0.00000000000000e+00
+2450 2.50000000000000e-01
+2451 -1.00000000000000e+00
+2452 0.00000000000000e+00
+2453 7.50000000000000e-01
+2454 -1.00000000000000e+00
+2455 0.00000000000000e+00
+2456 5.00000000000000e-01
+2457 -1.00000000000000e+00
+2458 0.00000000000000e+00
+2459 1.50000000000000e+00
+2460 -1.00000000000000e+00
+2461 0.00000000000000e+00
+2462 1.75000000000000e+00
+2463 -1.00000000000000e+00
+2464 0.00000000000000e+00
+2465 1.25000000000000e+00
+2466 -1.00000000000000e+00
+2467 0.00000000000000e+00
+2468 1.25000000000000e+00
+2469 -1.00000000000000e+00
+2470 0.00000000000000e+00
+2471 1.75000000000000e+00
+2472 -1.00000000000000e+00
+2473 0.00000000000000e+00
+2474 1.50000000000000e+00
diff --git a/external/hypre/src/test/TEST_ij/data/beam_tet_dof459_np1/A.IJ.00000 b/external/hypre/src/test/TEST_ij/data/beam_tet_dof459_np1/A.IJ.00000
new file mode 100644
index 00000000..0120a14d
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/data/beam_tet_dof459_np1/A.IJ.00000
@@ -0,0 +1,11278 @@
+0 458 0 458
+0 0 1.00000000000000e+00
+0 124 0.00000000000000e+00
+0 111 0.00000000000000e+00
+0 125 0.00000000000000e+00
+0 116 0.00000000000000e+00
+0 128 0.00000000000000e+00
+0 109 0.00000000000000e+00
+0 115 0.00000000000000e+00
+0 110 0.00000000000000e+00
+0 121 0.00000000000000e+00
+0 127 0.00000000000000e+00
+0 108 0.00000000000000e+00
+0 119 0.00000000000000e+00
+0 122 0.00000000000000e+00
+0 117 0.00000000000000e+00
+0 112 0.00000000000000e+00
+1 1 1.00000000000000e+00
+1 111 0.00000000000000e+00
+1 113 0.00000000000000e+00
+1 112 0.00000000000000e+00
+1 123 0.00000000000000e+00
+1 125 0.00000000000000e+00
+1 119 0.00000000000000e+00
+1 108 0.00000000000000e+00
+1 114 0.00000000000000e+00
+1 109 0.00000000000000e+00
+1 120 0.00000000000000e+00
+1 126 0.00000000000000e+00
+1 122 0.00000000000000e+00
+1 128 0.00000000000000e+00
+1 118 0.00000000000000e+00
+1 116 0.00000000000000e+00
+2 2 1.00000000000000e+00
+2 113 0.00000000000000e+00
+2 112 0.00000000000000e+00
+2 124 0.00000000000000e+00
+2 118 0.00000000000000e+00
+2 123 0.00000000000000e+00
+2 114 0.00000000000000e+00
+2 126 0.00000000000000e+00
+2 110 0.00000000000000e+00
+2 108 0.00000000000000e+00
+2 119 0.00000000000000e+00
+2 115 0.00000000000000e+00
+2 121 0.00000000000000e+00
+2 127 0.00000000000000e+00
+2 117 0.00000000000000e+00
+2 120 0.00000000000000e+00
+3 3 7.50000000000000e+01
+3 149 -8.33333333333333e+00
+3 130 4.16666666666667e+00
+3 136 -8.33333333333333e+00
+3 131 4.16666666666667e+00
+3 142 4.16666666666667e+00
+3 148 -8.33333333333333e+00
+3 129 -2.50000000000000e+01
+3 143 -8.33333333333333e+00
+3 134 -4.16666666666667e+00
+3 146 8.33333333333333e+00
+3 4 -8.33333333333333e+00
+3 133 8.33333333333333e+00
+3 109 4.16666666666667e+00
+3 132 -1.25000000000000e+01
+3 5 -8.33333333333333e+00
+3 140 8.33333333333333e+00
+3 110 4.16666666666667e+00
+3 139 -4.16666666666667e+00
+3 145 8.33333333333333e+00
+3 137 4.16666666666667e+00
+3 138 -1.25000000000000e+01
+3 108 -2.50000000000000e+01
+4 4 6.66666666666667e+01
+4 129 4.16666666666667e+00
+4 135 -8.33333333333333e+00
+4 130 -8.33333333333333e+00
+4 141 4.16666666666667e+00
+4 147 -8.33333333333333e+00
+4 143 4.16666666666667e+00
+4 149 -8.33333333333333e+00
+4 134 8.33333333333333e+00
+4 133 -3.75000000000000e+01
+4 3 -8.33333333333333e+00
+4 132 8.33333333333333e+00
+4 108 4.16666666666667e+00
+4 140 8.33333333333333e+00
+4 146 -1.66666666666667e+01
+4 137 4.16666666666667e+00
+4 139 -1.25000000000000e+01
+4 109 -8.33333333333333e+00
+4 138 -4.16666666666667e+00
+4 144 8.33333333333333e+00
+5 5 6.66666666666667e+01
+5 135 4.16666666666667e+00
+5 147 -8.33333333333333e+00
+5 131 -8.33333333333333e+00
+5 129 4.16666666666667e+00
+5 142 4.16666666666667e+00
+5 148 -8.33333333333333e+00
+5 141 -8.33333333333333e+00
+5 134 -1.25000000000000e+01
+5 133 8.33333333333333e+00
+5 132 -4.16666666666667e+00
+5 144 8.33333333333333e+00
+5 136 4.16666666666667e+00
+5 140 -3.75000000000000e+01
+5 110 -8.33333333333333e+00
+5 139 8.33333333333333e+00
+5 145 -1.66666666666667e+01
+5 3 -8.33333333333333e+00
+5 138 8.33333333333333e+00
+5 108 4.16666666666667e+00
+6 6 7.50000000000000e+01
+6 170 -8.33333333333333e+00
+6 151 4.16666666666667e+00
+6 157 -8.33333333333333e+00
+6 152 4.16666666666667e+00
+6 163 4.16666666666667e+00
+6 169 -8.33333333333333e+00
+6 150 -2.50000000000000e+01
+6 164 -8.33333333333333e+00
+6 155 -4.16666666666667e+00
+6 167 8.33333333333333e+00
+6 7 -8.33333333333333e+00
+6 154 8.33333333333333e+00
+6 130 4.16666666666667e+00
+6 153 -1.25000000000000e+01
+6 8 -8.33333333333333e+00
+6 161 8.33333333333333e+00
+6 131 4.16666666666667e+00
+6 160 -4.16666666666667e+00
+6 166 8.33333333333333e+00
+6 158 4.16666666666667e+00
+6 159 -1.25000000000000e+01
+6 129 -2.50000000000000e+01
+7 7 6.66666666666667e+01
+7 150 4.16666666666667e+00
+7 156 -8.33333333333333e+00
+7 151 -8.33333333333333e+00
+7 162 4.16666666666667e+00
+7 168 -8.33333333333333e+00
+7 164 4.16666666666667e+00
+7 170 -8.33333333333333e+00
+7 155 8.33333333333333e+00
+7 154 -3.75000000000000e+01
+7 6 -8.33333333333333e+00
+7 153 8.33333333333333e+00
+7 129 4.16666666666667e+00
+7 161 8.33333333333333e+00
+7 167 -1.66666666666667e+01
+7 158 4.16666666666667e+00
+7 160 -1.25000000000000e+01
+7 130 -8.33333333333333e+00
+7 159 -4.16666666666667e+00
+7 165 8.33333333333333e+00
+8 8 6.66666666666667e+01
+8 156 4.16666666666667e+00
+8 168 -8.33333333333333e+00
+8 152 -8.33333333333333e+00
+8 150 4.16666666666667e+00
+8 163 4.16666666666667e+00
+8 169 -8.33333333333333e+00
+8 162 -8.33333333333333e+00
+8 155 -1.25000000000000e+01
+8 154 8.33333333333333e+00
+8 153 -4.16666666666667e+00
+8 165 8.33333333333333e+00
+8 157 4.16666666666667e+00
+8 161 -3.75000000000000e+01
+8 131 -8.33333333333333e+00
+8 160 8.33333333333333e+00
+8 166 -1.66666666666667e+01
+8 6 -8.33333333333333e+00
+8 159 8.33333333333333e+00
+8 129 4.16666666666667e+00
+9 9 7.50000000000000e+01
+9 191 -8.33333333333333e+00
+9 172 4.16666666666667e+00
+9 178 -8.33333333333333e+00
+9 173 4.16666666666667e+00
+9 184 4.16666666666667e+00
+9 190 -8.33333333333333e+00
+9 171 -2.50000000000000e+01
+9 185 -8.33333333333333e+00
+9 176 -4.16666666666667e+00
+9 188 8.33333333333333e+00
+9 10 -8.33333333333333e+00
+9 175 8.33333333333333e+00
+9 151 4.16666666666667e+00
+9 174 -1.25000000000000e+01
+9 11 -8.33333333333333e+00
+9 182 8.33333333333333e+00
+9 152 4.16666666666667e+00
+9 181 -4.16666666666667e+00
+9 187 8.33333333333333e+00
+9 179 4.16666666666667e+00
+9 180 -1.25000000000000e+01
+9 150 -2.50000000000000e+01
+10 10 6.66666666666667e+01
+10 171 4.16666666666667e+00
+10 177 -8.33333333333333e+00
+10 172 -8.33333333333333e+00
+10 183 4.16666666666667e+00
+10 189 -8.33333333333333e+00
+10 185 4.16666666666667e+00
+10 191 -8.33333333333333e+00
+10 176 8.33333333333333e+00
+10 175 -3.75000000000000e+01
+10 9 -8.33333333333333e+00
+10 174 8.33333333333333e+00
+10 150 4.16666666666667e+00
+10 182 8.33333333333333e+00
+10 188 -1.66666666666667e+01
+10 179 4.16666666666667e+00
+10 181 -1.25000000000000e+01
+10 151 -8.33333333333333e+00
+10 180 -4.16666666666667e+00
+10 186 8.33333333333333e+00
+11 11 6.66666666666667e+01
+11 177 4.16666666666667e+00
+11 189 -8.33333333333333e+00
+11 173 -8.33333333333333e+00
+11 171 4.16666666666667e+00
+11 184 4.16666666666667e+00
+11 190 -8.33333333333333e+00
+11 183 -8.33333333333333e+00
+11 176 -1.25000000000000e+01
+11 175 8.33333333333333e+00
+11 174 -4.16666666666667e+00
+11 186 8.33333333333333e+00
+11 178 4.16666666666667e+00
+11 182 -3.75000000000000e+01
+11 152 -8.33333333333333e+00
+11 181 8.33333333333333e+00
+11 187 -1.66666666666667e+01
+11 9 -8.33333333333333e+00
+11 180 8.33333333333333e+00
+11 150 4.16666666666667e+00
+12 12 3.41666666666667e+01
+12 212 -1.66666666666667e-01
+12 193 8.33333333333333e-02
+12 199 -1.66666666666667e-01
+12 194 8.33333333333333e-02
+12 205 8.33333333333333e-02
+12 211 -1.66666666666667e-01
+12 192 -5.00000000000000e-01
+12 206 -1.66666666666667e-01
+12 197 -4.16666666666667e+00
+12 209 4.25000000000000e+00
+12 13 -8.33333333333333e+00
+12 196 4.25000000000000e+00
+12 172 4.16666666666667e+00
+12 195 -4.33333333333333e+00
+12 14 -8.33333333333333e+00
+12 203 4.25000000000000e+00
+12 173 4.16666666666667e+00
+12 202 -4.16666666666667e+00
+12 208 4.25000000000000e+00
+12 200 8.33333333333333e-02
+12 201 -4.33333333333333e+00
+12 171 -2.50000000000000e+01
+13 13 2.58333333333333e+01
+13 192 8.33333333333333e-02
+13 198 -1.66666666666667e-01
+13 193 -1.66666666666667e-01
+13 204 8.33333333333333e-02
+13 210 -1.66666666666667e-01
+13 206 8.33333333333333e-02
+13 212 -1.66666666666667e-01
+13 197 4.25000000000000e+00
+13 196 -1.30000000000000e+01
+13 12 -8.33333333333333e+00
+13 195 4.25000000000000e+00
+13 171 4.16666666666667e+00
+13 203 4.25000000000000e+00
+13 209 -8.50000000000000e+00
+13 200 8.33333333333333e-02
+13 202 -4.33333333333333e+00
+13 172 -8.33333333333333e+00
+13 201 -4.16666666666667e+00
+13 207 4.25000000000000e+00
+14 14 2.58333333333333e+01
+14 198 8.33333333333333e-02
+14 210 -1.66666666666667e-01
+14 194 -1.66666666666667e-01
+14 192 8.33333333333333e-02
+14 205 8.33333333333333e-02
+14 211 -1.66666666666667e-01
+14 204 -1.66666666666667e-01
+14 197 -4.33333333333333e+00
+14 196 4.25000000000000e+00
+14 195 -4.16666666666667e+00
+14 207 4.25000000000000e+00
+14 199 8.33333333333333e-02
+14 203 -1.30000000000000e+01
+14 173 -8.33333333333333e+00
+14 202 4.25000000000000e+00
+14 208 -8.50000000000000e+00
+14 12 -8.33333333333333e+00
+14 201 4.25000000000000e+00
+14 171 4.16666666666667e+00
+15 15 1.50000000000000e+00
+15 233 -1.66666666666667e-01
+15 214 8.33333333333333e-02
+15 220 -1.66666666666667e-01
+15 215 8.33333333333333e-02
+15 226 8.33333333333333e-02
+15 232 -1.66666666666667e-01
+15 213 -5.00000000000000e-01
+15 227 -1.66666666666667e-01
+15 218 -8.33333333333333e-02
+15 230 1.66666666666667e-01
+15 16 -1.66666666666667e-01
+15 217 1.66666666666667e-01
+15 193 8.33333333333333e-02
+15 216 -2.50000000000000e-01
+15 17 -1.66666666666667e-01
+15 224 1.66666666666667e-01
+15 194 8.33333333333333e-02
+15 223 -8.33333333333333e-02
+15 229 1.66666666666667e-01
+15 221 8.33333333333333e-02
+15 222 -2.50000000000000e-01
+15 192 -5.00000000000000e-01
+16 16 1.33333333333333e+00
+16 213 8.33333333333333e-02
+16 219 -1.66666666666667e-01
+16 214 -1.66666666666667e-01
+16 225 8.33333333333333e-02
+16 231 -1.66666666666667e-01
+16 227 8.33333333333333e-02
+16 233 -1.66666666666667e-01
+16 218 1.66666666666667e-01
+16 217 -7.50000000000000e-01
+16 15 -1.66666666666667e-01
+16 216 1.66666666666667e-01
+16 192 8.33333333333333e-02
+16 224 1.66666666666667e-01
+16 230 -3.33333333333333e-01
+16 221 8.33333333333333e-02
+16 223 -2.50000000000000e-01
+16 193 -1.66666666666667e-01
+16 222 -8.33333333333333e-02
+16 228 1.66666666666667e-01
+17 17 1.33333333333333e+00
+17 219 8.33333333333333e-02
+17 231 -1.66666666666667e-01
+17 215 -1.66666666666667e-01
+17 213 8.33333333333333e-02
+17 226 8.33333333333333e-02
+17 232 -1.66666666666667e-01
+17 225 -1.66666666666667e-01
+17 218 -2.50000000000000e-01
+17 217 1.66666666666667e-01
+17 216 -8.33333333333333e-02
+17 228 1.66666666666667e-01
+17 220 8.33333333333333e-02
+17 224 -7.50000000000000e-01
+17 194 -1.66666666666667e-01
+17 223 1.66666666666667e-01
+17 229 -3.33333333333333e-01
+17 15 -1.66666666666667e-01
+17 222 1.66666666666667e-01
+17 192 8.33333333333333e-02
+18 18 1.50000000000000e+00
+18 254 -1.66666666666667e-01
+18 235 8.33333333333333e-02
+18 241 -1.66666666666667e-01
+18 236 8.33333333333333e-02
+18 247 8.33333333333333e-02
+18 253 -1.66666666666667e-01
+18 234 -5.00000000000000e-01
+18 248 -1.66666666666667e-01
+18 239 -8.33333333333333e-02
+18 251 1.66666666666667e-01
+18 19 -1.66666666666667e-01
+18 238 1.66666666666667e-01
+18 214 8.33333333333333e-02
+18 237 -2.50000000000000e-01
+18 20 -1.66666666666667e-01
+18 245 1.66666666666667e-01
+18 215 8.33333333333333e-02
+18 244 -8.33333333333333e-02
+18 250 1.66666666666667e-01
+18 242 8.33333333333333e-02
+18 243 -2.50000000000000e-01
+18 213 -5.00000000000000e-01
+19 19 1.33333333333333e+00
+19 234 8.33333333333333e-02
+19 240 -1.66666666666667e-01
+19 235 -1.66666666666667e-01
+19 246 8.33333333333333e-02
+19 252 -1.66666666666667e-01
+19 248 8.33333333333333e-02
+19 254 -1.66666666666667e-01
+19 239 1.66666666666667e-01
+19 238 -7.50000000000000e-01
+19 18 -1.66666666666667e-01
+19 237 1.66666666666667e-01
+19 213 8.33333333333333e-02
+19 245 1.66666666666667e-01
+19 251 -3.33333333333333e-01
+19 242 8.33333333333333e-02
+19 244 -2.50000000000000e-01
+19 214 -1.66666666666667e-01
+19 243 -8.33333333333333e-02
+19 249 1.66666666666667e-01
+20 20 1.33333333333333e+00
+20 240 8.33333333333333e-02
+20 252 -1.66666666666667e-01
+20 236 -1.66666666666667e-01
+20 234 8.33333333333333e-02
+20 247 8.33333333333333e-02
+20 253 -1.66666666666667e-01
+20 246 -1.66666666666667e-01
+20 239 -2.50000000000000e-01
+20 238 1.66666666666667e-01
+20 237 -8.33333333333333e-02
+20 249 1.66666666666667e-01
+20 241 8.33333333333333e-02
+20 245 -7.50000000000000e-01
+20 215 -1.66666666666667e-01
+20 244 1.66666666666667e-01
+20 250 -3.33333333333333e-01
+20 18 -1.66666666666667e-01
+20 243 1.66666666666667e-01
+20 213 8.33333333333333e-02
+21 21 1.50000000000000e+00
+21 275 -1.66666666666667e-01
+21 256 8.33333333333333e-02
+21 262 -1.66666666666667e-01
+21 257 8.33333333333333e-02
+21 268 8.33333333333333e-02
+21 274 -1.66666666666667e-01
+21 255 -5.00000000000000e-01
+21 269 -1.66666666666667e-01
+21 260 -8.33333333333333e-02
+21 272 1.66666666666667e-01
+21 22 -1.66666666666667e-01
+21 259 1.66666666666667e-01
+21 235 8.33333333333333e-02
+21 258 -2.50000000000000e-01
+21 23 -1.66666666666667e-01
+21 266 1.66666666666667e-01
+21 236 8.33333333333333e-02
+21 265 -8.33333333333333e-02
+21 271 1.66666666666667e-01
+21 263 8.33333333333333e-02
+21 264 -2.50000000000000e-01
+21 234 -5.00000000000000e-01
+22 22 1.33333333333333e+00
+22 255 8.33333333333333e-02
+22 261 -1.66666666666667e-01
+22 256 -1.66666666666667e-01
+22 267 8.33333333333333e-02
+22 273 -1.66666666666667e-01
+22 269 8.33333333333333e-02
+22 275 -1.66666666666667e-01
+22 260 1.66666666666667e-01
+22 259 -7.50000000000000e-01
+22 21 -1.66666666666667e-01
+22 258 1.66666666666667e-01
+22 234 8.33333333333333e-02
+22 266 1.66666666666667e-01
+22 272 -3.33333333333333e-01
+22 263 8.33333333333333e-02
+22 265 -2.50000000000000e-01
+22 235 -1.66666666666667e-01
+22 264 -8.33333333333333e-02
+22 270 1.66666666666667e-01
+23 23 1.33333333333333e+00
+23 261 8.33333333333333e-02
+23 273 -1.66666666666667e-01
+23 257 -1.66666666666667e-01
+23 255 8.33333333333333e-02
+23 268 8.33333333333333e-02
+23 274 -1.66666666666667e-01
+23 267 -1.66666666666667e-01
+23 260 -2.50000000000000e-01
+23 259 1.66666666666667e-01
+23 258 -8.33333333333333e-02
+23 270 1.66666666666667e-01
+23 262 8.33333333333333e-02
+23 266 -7.50000000000000e-01
+23 236 -1.66666666666667e-01
+23 265 1.66666666666667e-01
+23 271 -3.33333333333333e-01
+23 21 -1.66666666666667e-01
+23 264 1.66666666666667e-01
+23 234 8.33333333333333e-02
+24 24 6.66666666666667e-01
+24 284 8.33333333333333e-02
+24 25 -1.66666666666667e-01
+24 277 8.33333333333333e-02
+24 256 8.33333333333333e-02
+24 276 -8.33333333333333e-02
+24 26 -1.66666666666667e-01
+24 281 8.33333333333333e-02
+24 257 8.33333333333333e-02
+24 280 -8.33333333333333e-02
+24 283 8.33333333333333e-02
+24 278 -8.33333333333333e-02
+24 279 -8.33333333333333e-02
+24 255 -5.00000000000000e-01
+25 25 5.00000000000000e-01
+25 277 -2.50000000000000e-01
+25 24 -1.66666666666667e-01
+25 276 8.33333333333333e-02
+25 255 8.33333333333333e-02
+25 281 8.33333333333333e-02
+25 284 -1.66666666666667e-01
+25 278 8.33333333333333e-02
+25 280 -8.33333333333333e-02
+25 256 -1.66666666666667e-01
+25 279 -8.33333333333333e-02
+25 282 8.33333333333333e-02
+26 26 5.00000000000000e-01
+26 277 8.33333333333333e-02
+26 276 -8.33333333333333e-02
+26 282 8.33333333333333e-02
+26 278 -8.33333333333333e-02
+26 281 -2.50000000000000e-01
+26 257 -1.66666666666667e-01
+26 280 8.33333333333333e-02
+26 283 -1.66666666666667e-01
+26 24 -1.66666666666667e-01
+26 279 8.33333333333333e-02
+26 255 8.33333333333333e-02
+27 27 1.00000000000000e+00
+27 286 0.00000000000000e+00
+27 28 0.00000000000000e+00
+27 112 0.00000000000000e+00
+27 285 0.00000000000000e+00
+27 290 0.00000000000000e+00
+27 293 0.00000000000000e+00
+27 289 0.00000000000000e+00
+27 292 0.00000000000000e+00
+27 288 0.00000000000000e+00
+27 287 0.00000000000000e+00
+27 111 0.00000000000000e+00
+28 28 1.00000000000000e+00
+28 293 0.00000000000000e+00
+28 286 0.00000000000000e+00
+28 285 0.00000000000000e+00
+28 27 0.00000000000000e+00
+28 111 0.00000000000000e+00
+28 290 0.00000000000000e+00
+28 29 0.00000000000000e+00
+28 113 0.00000000000000e+00
+28 289 0.00000000000000e+00
+28 287 0.00000000000000e+00
+28 112 0.00000000000000e+00
+28 288 0.00000000000000e+00
+28 291 0.00000000000000e+00
+29 29 1.00000000000000e+00
+29 286 0.00000000000000e+00
+29 292 0.00000000000000e+00
+29 285 0.00000000000000e+00
+29 290 0.00000000000000e+00
+29 287 0.00000000000000e+00
+29 113 0.00000000000000e+00
+29 289 0.00000000000000e+00
+29 28 0.00000000000000e+00
+29 112 0.00000000000000e+00
+29 288 0.00000000000000e+00
+29 291 0.00000000000000e+00
+30 30 5.00000000000000e+01
+30 295 4.16666666666667e+00
+30 31 -8.33333333333333e+00
+30 294 -1.25000000000000e+01
+30 302 -8.33333333333333e+00
+30 298 -4.16666666666667e+00
+30 301 4.16666666666667e+00
+30 32 -8.33333333333333e+00
+30 287 4.16666666666667e+00
+30 299 8.33333333333333e+00
+30 286 4.16666666666667e+00
+30 285 -1.25000000000000e+01
+30 134 -4.16666666666667e+00
+30 116 4.16666666666667e+00
+30 133 8.33333333333333e+00
+30 115 -8.33333333333333e+00
+30 132 -1.25000000000000e+01
+30 296 4.16666666666667e+00
+30 297 -1.25000000000000e+01
+31 31 5.83333333333333e+01
+31 302 4.16666666666667e+00
+31 295 -4.16666666666667e+00
+31 294 4.16666666666667e+00
+31 30 -8.33333333333333e+00
+31 297 -4.16666666666667e+00
+31 300 4.16666666666667e+00
+31 287 -4.16666666666667e+00
+31 116 4.16666666666667e+00
+31 286 -4.16666666666667e+00
+31 285 4.16666666666667e+00
+31 134 8.33333333333333e+00
+31 32 -1.66666666666667e+01
+31 299 8.33333333333333e+00
+31 133 -3.75000000000000e+01
+31 296 -4.16666666666667e+00
+31 298 -1.25000000000000e+01
+31 132 8.33333333333333e+00
+31 114 -8.33333333333333e+00
+32 32 5.83333333333333e+01
+32 295 -4.16666666666667e+00
+32 301 4.16666666666667e+00
+32 294 4.16666666666667e+00
+32 300 -8.33333333333333e+00
+32 287 -4.16666666666667e+00
+32 286 -4.16666666666667e+00
+32 115 4.16666666666667e+00
+32 30 -8.33333333333333e+00
+32 285 4.16666666666667e+00
+32 297 8.33333333333333e+00
+32 134 -1.25000000000000e+01
+32 296 -4.16666666666667e+00
+32 299 -3.75000000000000e+01
+32 133 8.33333333333333e+00
+32 31 -1.66666666666667e+01
+32 298 8.33333333333333e+00
+32 132 -4.16666666666667e+00
+32 114 4.16666666666667e+00
+33 33 5.00000000000000e+01
+33 304 4.16666666666667e+00
+33 34 -8.33333333333333e+00
+33 303 -1.25000000000000e+01
+33 311 -8.33333333333333e+00
+33 307 -4.16666666666667e+00
+33 310 4.16666666666667e+00
+33 35 -8.33333333333333e+00
+33 296 4.16666666666667e+00
+33 308 8.33333333333333e+00
+33 295 4.16666666666667e+00
+33 294 -1.25000000000000e+01
+33 155 -4.16666666666667e+00
+33 137 4.16666666666667e+00
+33 154 8.33333333333333e+00
+33 136 -8.33333333333333e+00
+33 153 -1.25000000000000e+01
+33 305 4.16666666666667e+00
+33 306 -1.25000000000000e+01
+34 34 5.83333333333333e+01
+34 311 4.16666666666667e+00
+34 304 -4.16666666666667e+00
+34 303 4.16666666666667e+00
+34 33 -8.33333333333333e+00
+34 306 -4.16666666666667e+00
+34 309 4.16666666666667e+00
+34 296 -4.16666666666667e+00
+34 137 4.16666666666667e+00
+34 295 -4.16666666666667e+00
+34 294 4.16666666666667e+00
+34 155 8.33333333333333e+00
+34 35 -1.66666666666667e+01
+34 308 8.33333333333333e+00
+34 154 -3.75000000000000e+01
+34 305 -4.16666666666667e+00
+34 307 -1.25000000000000e+01
+34 153 8.33333333333333e+00
+34 135 -8.33333333333333e+00
+35 35 5.83333333333333e+01
+35 304 -4.16666666666667e+00
+35 310 4.16666666666667e+00
+35 303 4.16666666666667e+00
+35 309 -8.33333333333333e+00
+35 296 -4.16666666666667e+00
+35 295 -4.16666666666667e+00
+35 136 4.16666666666667e+00
+35 33 -8.33333333333333e+00
+35 294 4.16666666666667e+00
+35 306 8.33333333333333e+00
+35 155 -1.25000000000000e+01
+35 305 -4.16666666666667e+00
+35 308 -3.75000000000000e+01
+35 154 8.33333333333333e+00
+35 34 -1.66666666666667e+01
+35 307 8.33333333333333e+00
+35 153 -4.16666666666667e+00
+35 135 4.16666666666667e+00
+36 36 5.00000000000000e+01
+36 313 4.16666666666667e+00
+36 37 -8.33333333333333e+00
+36 312 -1.25000000000000e+01
+36 320 -8.33333333333333e+00
+36 316 -4.16666666666667e+00
+36 319 4.16666666666667e+00
+36 38 -8.33333333333333e+00
+36 305 4.16666666666667e+00
+36 317 8.33333333333333e+00
+36 304 4.16666666666667e+00
+36 303 -1.25000000000000e+01
+36 176 -4.16666666666667e+00
+36 158 4.16666666666667e+00
+36 175 8.33333333333333e+00
+36 157 -8.33333333333333e+00
+36 174 -1.25000000000000e+01
+36 314 4.16666666666667e+00
+36 315 -1.25000000000000e+01
+37 37 5.83333333333333e+01
+37 320 4.16666666666667e+00
+37 313 -4.16666666666667e+00
+37 312 4.16666666666667e+00
+37 36 -8.33333333333333e+00
+37 315 -4.16666666666667e+00
+37 318 4.16666666666667e+00
+37 305 -4.16666666666667e+00
+37 158 4.16666666666667e+00
+37 304 -4.16666666666667e+00
+37 303 4.16666666666667e+00
+37 176 8.33333333333333e+00
+37 38 -1.66666666666667e+01
+37 317 8.33333333333333e+00
+37 175 -3.75000000000000e+01
+37 314 -4.16666666666667e+00
+37 316 -1.25000000000000e+01
+37 174 8.33333333333333e+00
+37 156 -8.33333333333333e+00
+38 38 5.83333333333333e+01
+38 313 -4.16666666666667e+00
+38 319 4.16666666666667e+00
+38 312 4.16666666666667e+00
+38 318 -8.33333333333333e+00
+38 305 -4.16666666666667e+00
+38 304 -4.16666666666667e+00
+38 157 4.16666666666667e+00
+38 36 -8.33333333333333e+00
+38 303 4.16666666666667e+00
+38 315 8.33333333333333e+00
+38 176 -1.25000000000000e+01
+38 314 -4.16666666666667e+00
+38 317 -3.75000000000000e+01
+38 175 8.33333333333333e+00
+38 37 -1.66666666666667e+01
+38 316 8.33333333333333e+00
+38 174 -4.16666666666667e+00
+38 156 4.16666666666667e+00
+39 39 2.55000000000000e+01
+39 322 8.33333333333333e-02
+39 40 -1.66666666666667e-01
+39 321 -2.50000000000000e-01
+39 329 -1.66666666666667e-01
+39 325 -8.33333333333333e-02
+39 328 8.33333333333333e-02
+39 41 -8.33333333333333e+00
+39 314 4.16666666666667e+00
+39 326 4.25000000000000e+00
+39 313 4.16666666666667e+00
+39 312 -1.25000000000000e+01
+39 197 -4.16666666666667e+00
+39 179 4.16666666666667e+00
+39 196 4.25000000000000e+00
+39 178 -8.33333333333333e+00
+39 195 -4.33333333333333e+00
+39 323 8.33333333333333e-02
+39 324 -8.41666666666667e+00
+40 40 2.56666666666667e+01
+40 329 8.33333333333333e-02
+40 322 -8.33333333333333e-02
+40 321 8.33333333333333e-02
+40 39 -1.66666666666667e-01
+40 324 -8.33333333333333e-02
+40 327 8.33333333333333e-02
+40 314 -4.16666666666667e+00
+40 179 4.16666666666667e+00
+40 313 -4.16666666666667e+00
+40 312 4.16666666666667e+00
+40 197 4.25000000000000e+00
+40 41 -8.50000000000000e+00
+40 326 4.25000000000000e+00
+40 196 -1.30000000000000e+01
+40 323 -8.33333333333333e-02
+40 325 -8.41666666666667e+00
+40 195 4.25000000000000e+00
+40 177 -8.33333333333333e+00
+41 41 3.38333333333333e+01
+41 322 -8.33333333333333e-02
+41 328 8.33333333333333e-02
+41 321 8.33333333333333e-02
+41 327 -1.66666666666667e-01
+41 314 -4.16666666666667e+00
+41 313 -4.16666666666667e+00
+41 178 4.16666666666667e+00
+41 39 -8.33333333333333e+00
+41 312 4.16666666666667e+00
+41 324 4.25000000000000e+00
+41 197 -4.33333333333333e+00
+41 323 -8.33333333333333e-02
+41 326 -2.52500000000000e+01
+41 196 4.25000000000000e+00
+41 40 -8.50000000000000e+00
+41 325 4.25000000000000e+00
+41 195 -4.16666666666667e+00
+41 177 4.16666666666667e+00
+42 42 1.00000000000000e+00
+42 331 8.33333333333333e-02
+42 43 -1.66666666666667e-01
+42 330 -2.50000000000000e-01
+42 338 -1.66666666666667e-01
+42 334 -8.33333333333333e-02
+42 337 8.33333333333333e-02
+42 44 -1.66666666666667e-01
+42 323 8.33333333333333e-02
+42 335 1.66666666666667e-01
+42 322 8.33333333333333e-02
+42 321 -2.50000000000000e-01
+42 218 -8.33333333333333e-02
+42 200 8.33333333333333e-02
+42 217 1.66666666666667e-01
+42 199 -1.66666666666667e-01
+42 216 -2.50000000000000e-01
+42 332 8.33333333333333e-02
+42 333 -2.50000000000000e-01
+43 43 1.16666666666667e+00
+43 338 8.33333333333333e-02
+43 331 -8.33333333333333e-02
+43 330 8.33333333333333e-02
+43 42 -1.66666666666667e-01
+43 333 -8.33333333333333e-02
+43 336 8.33333333333333e-02
+43 323 -8.33333333333333e-02
+43 200 8.33333333333333e-02
+43 322 -8.33333333333333e-02
+43 321 8.33333333333333e-02
+43 218 1.66666666666667e-01
+43 44 -3.33333333333333e-01
+43 335 1.66666666666667e-01
+43 217 -7.50000000000000e-01
+43 332 -8.33333333333333e-02
+43 334 -2.50000000000000e-01
+43 216 1.66666666666667e-01
+43 198 -1.66666666666667e-01
+44 44 1.16666666666667e+00
+44 331 -8.33333333333333e-02
+44 337 8.33333333333333e-02
+44 330 8.33333333333333e-02
+44 336 -1.66666666666667e-01
+44 323 -8.33333333333333e-02
+44 322 -8.33333333333333e-02
+44 199 8.33333333333333e-02
+44 42 -1.66666666666667e-01
+44 321 8.33333333333333e-02
+44 333 1.66666666666667e-01
+44 218 -2.50000000000000e-01
+44 332 -8.33333333333333e-02
+44 335 -7.50000000000000e-01
+44 217 1.66666666666667e-01
+44 43 -3.33333333333333e-01
+44 334 1.66666666666667e-01
+44 216 -8.33333333333333e-02
+44 198 8.33333333333333e-02
+45 45 1.00000000000000e+00
+45 340 8.33333333333333e-02
+45 46 -1.66666666666667e-01
+45 339 -2.50000000000000e-01
+45 347 -1.66666666666667e-01
+45 343 -8.33333333333333e-02
+45 346 8.33333333333333e-02
+45 47 -1.66666666666667e-01
+45 332 8.33333333333333e-02
+45 344 1.66666666666667e-01
+45 331 8.33333333333333e-02
+45 330 -2.50000000000000e-01
+45 239 -8.33333333333333e-02
+45 221 8.33333333333333e-02
+45 238 1.66666666666667e-01
+45 220 -1.66666666666667e-01
+45 237 -2.50000000000000e-01
+45 341 8.33333333333333e-02
+45 342 -2.50000000000000e-01
+46 46 1.16666666666667e+00
+46 347 8.33333333333333e-02
+46 340 -8.33333333333333e-02
+46 339 8.33333333333333e-02
+46 45 -1.66666666666667e-01
+46 342 -8.33333333333333e-02
+46 345 8.33333333333333e-02
+46 332 -8.33333333333333e-02
+46 221 8.33333333333333e-02
+46 331 -8.33333333333333e-02
+46 330 8.33333333333333e-02
+46 239 1.66666666666667e-01
+46 47 -3.33333333333333e-01
+46 344 1.66666666666667e-01
+46 238 -7.50000000000000e-01
+46 341 -8.33333333333333e-02
+46 343 -2.50000000000000e-01
+46 237 1.66666666666667e-01
+46 219 -1.66666666666667e-01
+47 47 1.16666666666667e+00
+47 340 -8.33333333333333e-02
+47 346 8.33333333333333e-02
+47 339 8.33333333333333e-02
+47 345 -1.66666666666667e-01
+47 332 -8.33333333333333e-02
+47 331 -8.33333333333333e-02
+47 220 8.33333333333333e-02
+47 45 -1.66666666666667e-01
+47 330 8.33333333333333e-02
+47 342 1.66666666666667e-01
+47 239 -2.50000000000000e-01
+47 341 -8.33333333333333e-02
+47 344 -7.50000000000000e-01
+47 238 1.66666666666667e-01
+47 46 -3.33333333333333e-01
+47 343 1.66666666666667e-01
+47 237 -8.33333333333333e-02
+47 219 8.33333333333333e-02
+48 48 1.00000000000000e+00
+48 349 8.33333333333333e-02
+48 49 -1.66666666666667e-01
+48 348 -2.50000000000000e-01
+48 356 -1.66666666666667e-01
+48 352 -8.33333333333333e-02
+48 355 8.33333333333333e-02
+48 50 -1.66666666666667e-01
+48 341 8.33333333333333e-02
+48 353 1.66666666666667e-01
+48 340 8.33333333333333e-02
+48 339 -2.50000000000000e-01
+48 260 -8.33333333333333e-02
+48 242 8.33333333333333e-02
+48 259 1.66666666666667e-01
+48 241 -1.66666666666667e-01
+48 258 -2.50000000000000e-01
+48 350 8.33333333333333e-02
+48 351 -2.50000000000000e-01
+49 49 1.16666666666667e+00
+49 356 8.33333333333333e-02
+49 349 -8.33333333333333e-02
+49 348 8.33333333333333e-02
+49 48 -1.66666666666667e-01
+49 351 -8.33333333333333e-02
+49 354 8.33333333333333e-02
+49 341 -8.33333333333333e-02
+49 242 8.33333333333333e-02
+49 340 -8.33333333333333e-02
+49 339 8.33333333333333e-02
+49 260 1.66666666666667e-01
+49 50 -3.33333333333333e-01
+49 353 1.66666666666667e-01
+49 259 -7.50000000000000e-01
+49 350 -8.33333333333333e-02
+49 352 -2.50000000000000e-01
+49 258 1.66666666666667e-01
+49 240 -1.66666666666667e-01
+50 50 1.16666666666667e+00
+50 349 -8.33333333333333e-02
+50 355 8.33333333333333e-02
+50 348 8.33333333333333e-02
+50 354 -1.66666666666667e-01
+50 341 -8.33333333333333e-02
+50 340 -8.33333333333333e-02
+50 241 8.33333333333333e-02
+50 48 -1.66666666666667e-01
+50 339 8.33333333333333e-02
+50 351 1.66666666666667e-01
+50 260 -2.50000000000000e-01
+50 350 -8.33333333333333e-02
+50 353 -7.50000000000000e-01
+50 259 1.66666666666667e-01
+50 49 -3.33333333333333e-01
+50 352 1.66666666666667e-01
+50 258 -8.33333333333333e-02
+50 240 8.33333333333333e-02
+51 51 5.00000000000000e-01
+51 350 8.33333333333333e-02
+51 359 8.33333333333333e-02
+51 349 8.33333333333333e-02
+51 348 -2.50000000000000e-01
+51 278 -8.33333333333333e-02
+51 263 8.33333333333333e-02
+51 277 8.33333333333333e-02
+51 262 -1.66666666666667e-01
+51 276 -8.33333333333333e-02
+51 53 -1.66666666666667e-01
+51 357 -1.66666666666667e-01
+52 52 5.00000000000000e-01
+52 263 8.33333333333333e-02
+52 349 -8.33333333333333e-02
+52 348 8.33333333333333e-02
+52 278 8.33333333333333e-02
+52 53 -1.66666666666667e-01
+52 359 8.33333333333333e-02
+52 277 -2.50000000000000e-01
+52 350 -8.33333333333333e-02
+52 358 -1.66666666666667e-01
+52 276 8.33333333333333e-02
+52 261 -1.66666666666667e-01
+53 53 6.66666666666667e-01
+53 349 -8.33333333333333e-02
+53 262 8.33333333333333e-02
+53 51 -1.66666666666667e-01
+53 348 8.33333333333333e-02
+53 357 8.33333333333333e-02
+53 278 -8.33333333333333e-02
+53 350 -8.33333333333333e-02
+53 359 -5.00000000000000e-01
+53 277 8.33333333333333e-02
+53 52 -1.66666666666667e-01
+53 358 8.33333333333333e-02
+53 276 -8.33333333333333e-02
+53 261 8.33333333333333e-02
+54 54 1.00000000000000e+00
+54 368 0.00000000000000e+00
+54 364 0.00000000000000e+00
+54 363 0.00000000000000e+00
+54 56 0.00000000000000e+00
+54 362 0.00000000000000e+00
+54 119 0.00000000000000e+00
+54 361 0.00000000000000e+00
+54 367 0.00000000000000e+00
+54 365 0.00000000000000e+00
+54 360 0.00000000000000e+00
+54 117 0.00000000000000e+00
+55 55 1.00000000000000e+00
+55 56 0.00000000000000e+00
+55 119 0.00000000000000e+00
+55 364 0.00000000000000e+00
+55 363 0.00000000000000e+00
+55 362 0.00000000000000e+00
+55 368 0.00000000000000e+00
+55 365 0.00000000000000e+00
+55 361 0.00000000000000e+00
+55 118 0.00000000000000e+00
+55 360 0.00000000000000e+00
+55 366 0.00000000000000e+00
+56 56 1.00000000000000e+00
+56 364 0.00000000000000e+00
+56 55 0.00000000000000e+00
+56 118 0.00000000000000e+00
+56 363 0.00000000000000e+00
+56 366 0.00000000000000e+00
+56 365 0.00000000000000e+00
+56 362 0.00000000000000e+00
+56 119 0.00000000000000e+00
+56 361 0.00000000000000e+00
+56 367 0.00000000000000e+00
+56 54 0.00000000000000e+00
+56 360 0.00000000000000e+00
+56 117 0.00000000000000e+00
+57 57 5.00000000000000e+01
+57 377 4.16666666666667e+00
+57 59 -8.33333333333333e+00
+57 371 4.16666666666667e+00
+57 370 4.16666666666667e+00
+57 376 -8.33333333333333e+00
+57 369 -1.25000000000000e+01
+57 140 8.33333333333333e+00
+57 139 -4.16666666666667e+00
+57 121 4.16666666666667e+00
+57 138 -1.25000000000000e+01
+57 362 4.16666666666667e+00
+57 122 -8.33333333333333e+00
+57 361 4.16666666666667e+00
+57 58 -8.33333333333333e+00
+57 373 8.33333333333333e+00
+57 360 -1.25000000000000e+01
+57 374 -4.16666666666667e+00
+57 372 -1.25000000000000e+01
+58 58 5.83333333333333e+01
+58 377 4.16666666666667e+00
+58 370 -4.16666666666667e+00
+58 369 4.16666666666667e+00
+58 375 -8.33333333333333e+00
+58 140 8.33333333333333e+00
+58 59 -1.66666666666667e+01
+58 374 8.33333333333333e+00
+58 139 -1.25000000000000e+01
+58 138 -4.16666666666667e+00
+58 120 4.16666666666667e+00
+58 362 -4.16666666666667e+00
+58 122 4.16666666666667e+00
+58 361 -4.16666666666667e+00
+58 371 -4.16666666666667e+00
+58 373 -3.75000000000000e+01
+58 360 4.16666666666667e+00
+58 57 -8.33333333333333e+00
+58 372 8.33333333333333e+00
+59 59 5.83333333333333e+01
+59 375 4.16666666666667e+00
+59 371 -4.16666666666667e+00
+59 370 -4.16666666666667e+00
+59 376 4.16666666666667e+00
+59 57 -8.33333333333333e+00
+59 369 4.16666666666667e+00
+59 140 -3.75000000000000e+01
+59 139 8.33333333333333e+00
+59 58 -1.66666666666667e+01
+59 373 8.33333333333333e+00
+59 138 8.33333333333333e+00
+59 362 -4.16666666666667e+00
+59 372 -4.16666666666667e+00
+59 374 -1.25000000000000e+01
+59 361 -4.16666666666667e+00
+59 121 4.16666666666667e+00
+59 360 4.16666666666667e+00
+59 120 -8.33333333333333e+00
+60 60 5.00000000000000e+01
+60 386 4.16666666666667e+00
+60 62 -8.33333333333333e+00
+60 380 4.16666666666667e+00
+60 379 4.16666666666667e+00
+60 385 -8.33333333333333e+00
+60 378 -1.25000000000000e+01
+60 161 8.33333333333333e+00
+60 160 -4.16666666666667e+00
+60 142 4.16666666666667e+00
+60 159 -1.25000000000000e+01
+60 371 4.16666666666667e+00
+60 143 -8.33333333333333e+00
+60 370 4.16666666666667e+00
+60 61 -8.33333333333333e+00
+60 382 8.33333333333333e+00
+60 369 -1.25000000000000e+01
+60 383 -4.16666666666667e+00
+60 381 -1.25000000000000e+01
+61 61 5.83333333333333e+01
+61 386 4.16666666666667e+00
+61 379 -4.16666666666667e+00
+61 378 4.16666666666667e+00
+61 384 -8.33333333333333e+00
+61 161 8.33333333333333e+00
+61 62 -1.66666666666667e+01
+61 383 8.33333333333333e+00
+61 160 -1.25000000000000e+01
+61 159 -4.16666666666667e+00
+61 141 4.16666666666667e+00
+61 371 -4.16666666666667e+00
+61 143 4.16666666666667e+00
+61 370 -4.16666666666667e+00
+61 380 -4.16666666666667e+00
+61 382 -3.75000000000000e+01
+61 369 4.16666666666667e+00
+61 60 -8.33333333333333e+00
+61 381 8.33333333333333e+00
+62 62 5.83333333333333e+01
+62 384 4.16666666666667e+00
+62 380 -4.16666666666667e+00
+62 379 -4.16666666666667e+00
+62 385 4.16666666666667e+00
+62 60 -8.33333333333333e+00
+62 378 4.16666666666667e+00
+62 161 -3.75000000000000e+01
+62 160 8.33333333333333e+00
+62 61 -1.66666666666667e+01
+62 382 8.33333333333333e+00
+62 159 8.33333333333333e+00
+62 371 -4.16666666666667e+00
+62 381 -4.16666666666667e+00
+62 383 -1.25000000000000e+01
+62 370 -4.16666666666667e+00
+62 142 4.16666666666667e+00
+62 369 4.16666666666667e+00
+62 141 -8.33333333333333e+00
+63 63 5.00000000000000e+01
+63 395 4.16666666666667e+00
+63 65 -8.33333333333333e+00
+63 389 4.16666666666667e+00
+63 388 4.16666666666667e+00
+63 394 -8.33333333333333e+00
+63 387 -1.25000000000000e+01
+63 182 8.33333333333333e+00
+63 181 -4.16666666666667e+00
+63 163 4.16666666666667e+00
+63 180 -1.25000000000000e+01
+63 380 4.16666666666667e+00
+63 164 -8.33333333333333e+00
+63 379 4.16666666666667e+00
+63 64 -8.33333333333333e+00
+63 391 8.33333333333333e+00
+63 378 -1.25000000000000e+01
+63 392 -4.16666666666667e+00
+63 390 -1.25000000000000e+01
+64 64 5.83333333333333e+01
+64 395 4.16666666666667e+00
+64 388 -4.16666666666667e+00
+64 387 4.16666666666667e+00
+64 393 -8.33333333333333e+00
+64 182 8.33333333333333e+00
+64 65 -1.66666666666667e+01
+64 392 8.33333333333333e+00
+64 181 -1.25000000000000e+01
+64 180 -4.16666666666667e+00
+64 162 4.16666666666667e+00
+64 380 -4.16666666666667e+00
+64 164 4.16666666666667e+00
+64 379 -4.16666666666667e+00
+64 389 -4.16666666666667e+00
+64 391 -3.75000000000000e+01
+64 378 4.16666666666667e+00
+64 63 -8.33333333333333e+00
+64 390 8.33333333333333e+00
+65 65 5.83333333333333e+01
+65 393 4.16666666666667e+00
+65 389 -4.16666666666667e+00
+65 388 -4.16666666666667e+00
+65 394 4.16666666666667e+00
+65 63 -8.33333333333333e+00
+65 387 4.16666666666667e+00
+65 182 -3.75000000000000e+01
+65 181 8.33333333333333e+00
+65 64 -1.66666666666667e+01
+65 391 8.33333333333333e+00
+65 180 8.33333333333333e+00
+65 380 -4.16666666666667e+00
+65 390 -4.16666666666667e+00
+65 392 -1.25000000000000e+01
+65 379 -4.16666666666667e+00
+65 163 4.16666666666667e+00
+65 378 4.16666666666667e+00
+65 162 -8.33333333333333e+00
+66 66 2.55000000000000e+01
+66 404 8.33333333333333e-02
+66 68 -1.66666666666667e-01
+66 398 8.33333333333333e-02
+66 397 8.33333333333333e-02
+66 403 -1.66666666666667e-01
+66 396 -2.50000000000000e-01
+66 203 4.25000000000000e+00
+66 202 -4.16666666666667e+00
+66 184 4.16666666666667e+00
+66 201 -4.33333333333333e+00
+66 389 4.16666666666667e+00
+66 185 -8.33333333333333e+00
+66 388 4.16666666666667e+00
+66 67 -8.33333333333333e+00
+66 400 4.25000000000000e+00
+66 387 -1.25000000000000e+01
+66 401 -8.33333333333333e-02
+66 399 -8.41666666666667e+00
+67 67 3.38333333333333e+01
+67 404 8.33333333333333e-02
+67 397 -8.33333333333333e-02
+67 396 8.33333333333333e-02
+67 402 -1.66666666666667e-01
+67 203 4.25000000000000e+00
+67 68 -8.50000000000000e+00
+67 401 4.25000000000000e+00
+67 202 -4.33333333333333e+00
+67 201 -4.16666666666667e+00
+67 183 4.16666666666667e+00
+67 389 -4.16666666666667e+00
+67 185 4.16666666666667e+00
+67 388 -4.16666666666667e+00
+67 398 -8.33333333333333e-02
+67 400 -2.52500000000000e+01
+67 387 4.16666666666667e+00
+67 66 -8.33333333333333e+00
+67 399 4.25000000000000e+00
+68 68 2.56666666666667e+01
+68 402 8.33333333333333e-02
+68 398 -8.33333333333333e-02
+68 397 -8.33333333333333e-02
+68 403 8.33333333333333e-02
+68 66 -1.66666666666667e-01
+68 396 8.33333333333333e-02
+68 203 -1.30000000000000e+01
+68 202 4.25000000000000e+00
+68 67 -8.50000000000000e+00
+68 400 4.25000000000000e+00
+68 201 4.25000000000000e+00
+68 389 -4.16666666666667e+00
+68 399 -8.33333333333333e-02
+68 401 -8.41666666666667e+00
+68 388 -4.16666666666667e+00
+68 184 4.16666666666667e+00
+68 387 4.16666666666667e+00
+68 183 -8.33333333333333e+00
+69 69 1.00000000000000e+00
+69 413 8.33333333333333e-02
+69 71 -1.66666666666667e-01
+69 407 8.33333333333333e-02
+69 406 8.33333333333333e-02
+69 412 -1.66666666666667e-01
+69 405 -2.50000000000000e-01
+69 224 1.66666666666667e-01
+69 223 -8.33333333333333e-02
+69 205 8.33333333333333e-02
+69 222 -2.50000000000000e-01
+69 398 8.33333333333333e-02
+69 206 -1.66666666666667e-01
+69 397 8.33333333333333e-02
+69 70 -1.66666666666667e-01
+69 409 1.66666666666667e-01
+69 396 -2.50000000000000e-01
+69 410 -8.33333333333333e-02
+69 408 -2.50000000000000e-01
+70 70 1.16666666666667e+00
+70 413 8.33333333333333e-02
+70 406 -8.33333333333333e-02
+70 405 8.33333333333333e-02
+70 411 -1.66666666666667e-01
+70 224 1.66666666666667e-01
+70 71 -3.33333333333333e-01
+70 410 1.66666666666667e-01
+70 223 -2.50000000000000e-01
+70 222 -8.33333333333333e-02
+70 204 8.33333333333333e-02
+70 398 -8.33333333333333e-02
+70 206 8.33333333333333e-02
+70 397 -8.33333333333333e-02
+70 407 -8.33333333333333e-02
+70 409 -7.50000000000000e-01
+70 396 8.33333333333333e-02
+70 69 -1.66666666666667e-01
+70 408 1.66666666666667e-01
+71 71 1.16666666666667e+00
+71 411 8.33333333333333e-02
+71 407 -8.33333333333333e-02
+71 406 -8.33333333333333e-02
+71 412 8.33333333333333e-02
+71 69 -1.66666666666667e-01
+71 405 8.33333333333333e-02
+71 224 -7.50000000000000e-01
+71 223 1.66666666666667e-01
+71 70 -3.33333333333333e-01
+71 409 1.66666666666667e-01
+71 222 1.66666666666667e-01
+71 398 -8.33333333333333e-02
+71 408 -8.33333333333333e-02
+71 410 -2.50000000000000e-01
+71 397 -8.33333333333333e-02
+71 205 8.33333333333333e-02
+71 396 8.33333333333333e-02
+71 204 -1.66666666666667e-01
+72 72 1.00000000000000e+00
+72 422 8.33333333333333e-02
+72 74 -1.66666666666667e-01
+72 416 8.33333333333333e-02
+72 415 8.33333333333333e-02
+72 421 -1.66666666666667e-01
+72 414 -2.50000000000000e-01
+72 245 1.66666666666667e-01
+72 244 -8.33333333333333e-02
+72 226 8.33333333333333e-02
+72 243 -2.50000000000000e-01
+72 407 8.33333333333333e-02
+72 227 -1.66666666666667e-01
+72 406 8.33333333333333e-02
+72 73 -1.66666666666667e-01
+72 418 1.66666666666667e-01
+72 405 -2.50000000000000e-01
+72 419 -8.33333333333333e-02
+72 417 -2.50000000000000e-01
+73 73 1.16666666666667e+00
+73 422 8.33333333333333e-02
+73 415 -8.33333333333333e-02
+73 414 8.33333333333333e-02
+73 420 -1.66666666666667e-01
+73 245 1.66666666666667e-01
+73 74 -3.33333333333333e-01
+73 419 1.66666666666667e-01
+73 244 -2.50000000000000e-01
+73 243 -8.33333333333333e-02
+73 225 8.33333333333333e-02
+73 407 -8.33333333333333e-02
+73 227 8.33333333333333e-02
+73 406 -8.33333333333333e-02
+73 416 -8.33333333333333e-02
+73 418 -7.50000000000000e-01
+73 405 8.33333333333333e-02
+73 72 -1.66666666666667e-01
+73 417 1.66666666666667e-01
+74 74 1.16666666666667e+00
+74 420 8.33333333333333e-02
+74 416 -8.33333333333333e-02
+74 415 -8.33333333333333e-02
+74 421 8.33333333333333e-02
+74 72 -1.66666666666667e-01
+74 414 8.33333333333333e-02
+74 245 -7.50000000000000e-01
+74 244 1.66666666666667e-01
+74 73 -3.33333333333333e-01
+74 418 1.66666666666667e-01
+74 243 1.66666666666667e-01
+74 407 -8.33333333333333e-02
+74 417 -8.33333333333333e-02
+74 419 -2.50000000000000e-01
+74 406 -8.33333333333333e-02
+74 226 8.33333333333333e-02
+74 405 8.33333333333333e-02
+74 225 -1.66666666666667e-01
+75 75 1.00000000000000e+00
+75 431 8.33333333333333e-02
+75 77 -1.66666666666667e-01
+75 425 8.33333333333333e-02
+75 424 8.33333333333333e-02
+75 430 -1.66666666666667e-01
+75 423 -2.50000000000000e-01
+75 266 1.66666666666667e-01
+75 265 -8.33333333333333e-02
+75 247 8.33333333333333e-02
+75 264 -2.50000000000000e-01
+75 416 8.33333333333333e-02
+75 248 -1.66666666666667e-01
+75 415 8.33333333333333e-02
+75 76 -1.66666666666667e-01
+75 427 1.66666666666667e-01
+75 414 -2.50000000000000e-01
+75 428 -8.33333333333333e-02
+75 426 -2.50000000000000e-01
+76 76 1.16666666666667e+00
+76 431 8.33333333333333e-02
+76 424 -8.33333333333333e-02
+76 423 8.33333333333333e-02
+76 429 -1.66666666666667e-01
+76 266 1.66666666666667e-01
+76 77 -3.33333333333333e-01
+76 428 1.66666666666667e-01
+76 265 -2.50000000000000e-01
+76 264 -8.33333333333333e-02
+76 246 8.33333333333333e-02
+76 416 -8.33333333333333e-02
+76 248 8.33333333333333e-02
+76 415 -8.33333333333333e-02
+76 425 -8.33333333333333e-02
+76 427 -7.50000000000000e-01
+76 414 8.33333333333333e-02
+76 75 -1.66666666666667e-01
+76 426 1.66666666666667e-01
+77 77 1.16666666666667e+00
+77 429 8.33333333333333e-02
+77 425 -8.33333333333333e-02
+77 424 -8.33333333333333e-02
+77 430 8.33333333333333e-02
+77 75 -1.66666666666667e-01
+77 423 8.33333333333333e-02
+77 266 -7.50000000000000e-01
+77 265 1.66666666666667e-01
+77 76 -3.33333333333333e-01
+77 427 1.66666666666667e-01
+77 264 1.66666666666667e-01
+77 416 -8.33333333333333e-02
+77 426 -8.33333333333333e-02
+77 428 -2.50000000000000e-01
+77 415 -8.33333333333333e-02
+77 247 8.33333333333333e-02
+77 414 8.33333333333333e-02
+77 246 -1.66666666666667e-01
+78 78 5.00000000000000e-01
+78 280 -8.33333333333333e-02
+78 268 8.33333333333333e-02
+78 279 -8.33333333333333e-02
+78 425 8.33333333333333e-02
+78 269 -1.66666666666667e-01
+78 424 8.33333333333333e-02
+78 79 -1.66666666666667e-01
+78 433 8.33333333333333e-02
+78 423 -2.50000000000000e-01
+78 281 8.33333333333333e-02
+78 432 -1.66666666666667e-01
+79 79 6.66666666666667e-01
+79 80 -1.66666666666667e-01
+79 434 8.33333333333333e-02
+79 280 -8.33333333333333e-02
+79 279 -8.33333333333333e-02
+79 267 8.33333333333333e-02
+79 425 -8.33333333333333e-02
+79 269 8.33333333333333e-02
+79 424 -8.33333333333333e-02
+79 281 8.33333333333333e-02
+79 433 -5.00000000000000e-01
+79 423 8.33333333333333e-02
+79 78 -1.66666666666667e-01
+79 432 8.33333333333333e-02
+80 80 5.00000000000000e-01
+80 280 8.33333333333333e-02
+80 79 -1.66666666666667e-01
+80 433 8.33333333333333e-02
+80 279 8.33333333333333e-02
+80 425 -8.33333333333333e-02
+80 281 -2.50000000000000e-01
+80 434 -1.66666666666667e-01
+80 424 -8.33333333333333e-02
+80 268 8.33333333333333e-02
+80 423 8.33333333333333e-02
+80 267 -1.66666666666667e-01
+81 81 1.00000000000000e+00
+81 290 0.00000000000000e+00
+81 437 0.00000000000000e+00
+81 289 0.00000000000000e+00
+81 124 0.00000000000000e+00
+81 288 0.00000000000000e+00
+81 365 0.00000000000000e+00
+81 125 0.00000000000000e+00
+81 82 0.00000000000000e+00
+81 364 0.00000000000000e+00
+81 436 0.00000000000000e+00
+81 83 0.00000000000000e+00
+81 363 0.00000000000000e+00
+81 435 0.00000000000000e+00
+82 82 1.00000000000000e+00
+82 289 0.00000000000000e+00
+82 288 0.00000000000000e+00
+82 123 0.00000000000000e+00
+82 365 0.00000000000000e+00
+82 125 0.00000000000000e+00
+82 290 0.00000000000000e+00
+82 364 0.00000000000000e+00
+82 436 0.00000000000000e+00
+82 81 0.00000000000000e+00
+82 363 0.00000000000000e+00
+82 435 0.00000000000000e+00
+83 83 1.00000000000000e+00
+83 289 0.00000000000000e+00
+83 81 0.00000000000000e+00
+83 288 0.00000000000000e+00
+83 435 0.00000000000000e+00
+83 290 0.00000000000000e+00
+83 365 0.00000000000000e+00
+83 437 0.00000000000000e+00
+83 364 0.00000000000000e+00
+83 124 0.00000000000000e+00
+83 363 0.00000000000000e+00
+83 123 0.00000000000000e+00
+84 84 7.50000000000000e+01
+84 440 4.16666666666667e+00
+84 298 -4.16666666666667e+00
+84 374 -4.16666666666667e+00
+84 85 -8.33333333333333e+00
+84 439 4.16666666666667e+00
+84 438 -2.50000000000000e+01
+84 299 8.33333333333333e+00
+84 437 4.16666666666667e+00
+84 293 -8.33333333333333e+00
+84 292 4.16666666666667e+00
+84 368 4.16666666666667e+00
+84 436 4.16666666666667e+00
+84 435 -2.50000000000000e+01
+84 146 8.33333333333333e+00
+84 128 -8.33333333333333e+00
+84 297 -1.25000000000000e+01
+84 145 8.33333333333333e+00
+84 127 -8.33333333333333e+00
+84 367 -8.33333333333333e+00
+84 373 8.33333333333333e+00
+84 372 -1.25000000000000e+01
+84 86 -8.33333333333333e+00
+85 85 6.66666666666667e+01
+85 439 -8.33333333333333e+00
+85 84 -8.33333333333333e+00
+85 438 4.16666666666667e+00
+85 293 4.16666666666667e+00
+85 291 4.16666666666667e+00
+85 436 -8.33333333333333e+00
+85 435 4.16666666666667e+00
+85 299 8.33333333333333e+00
+85 298 -1.25000000000000e+01
+85 146 -1.66666666666667e+01
+85 374 8.33333333333333e+00
+85 144 8.33333333333333e+00
+85 126 -8.33333333333333e+00
+85 368 4.16666666666667e+00
+85 128 -8.33333333333333e+00
+85 373 -3.75000000000000e+01
+85 297 -4.16666666666667e+00
+85 366 -8.33333333333333e+00
+85 372 8.33333333333333e+00
+86 86 6.66666666666667e+01
+86 438 4.16666666666667e+00
+86 440 -8.33333333333333e+00
+86 372 -4.16666666666667e+00
+86 292 4.16666666666667e+00
+86 297 8.33333333333333e+00
+86 435 4.16666666666667e+00
+86 291 -8.33333333333333e+00
+86 437 -8.33333333333333e+00
+86 366 4.16666666666667e+00
+86 299 -3.75000000000000e+01
+86 298 8.33333333333333e+00
+86 144 8.33333333333333e+00
+86 126 -8.33333333333333e+00
+86 145 -1.66666666666667e+01
+86 373 8.33333333333333e+00
+86 374 -1.25000000000000e+01
+86 84 -8.33333333333333e+00
+86 367 4.16666666666667e+00
+86 127 -8.33333333333333e+00
+87 87 7.50000000000000e+01
+87 443 4.16666666666667e+00
+87 307 -4.16666666666667e+00
+87 383 -4.16666666666667e+00
+87 88 -8.33333333333333e+00
+87 442 4.16666666666667e+00
+87 441 -2.50000000000000e+01
+87 308 8.33333333333333e+00
+87 440 4.16666666666667e+00
+87 302 -8.33333333333333e+00
+87 301 4.16666666666667e+00
+87 377 4.16666666666667e+00
+87 439 4.16666666666667e+00
+87 438 -2.50000000000000e+01
+87 167 8.33333333333333e+00
+87 149 -8.33333333333333e+00
+87 306 -1.25000000000000e+01
+87 166 8.33333333333333e+00
+87 148 -8.33333333333333e+00
+87 376 -8.33333333333333e+00
+87 382 8.33333333333333e+00
+87 381 -1.25000000000000e+01
+87 89 -8.33333333333333e+00
+88 88 6.66666666666667e+01
+88 442 -8.33333333333333e+00
+88 87 -8.33333333333333e+00
+88 441 4.16666666666667e+00
+88 302 4.16666666666667e+00
+88 300 4.16666666666667e+00
+88 439 -8.33333333333333e+00
+88 438 4.16666666666667e+00
+88 308 8.33333333333333e+00
+88 307 -1.25000000000000e+01
+88 167 -1.66666666666667e+01
+88 383 8.33333333333333e+00
+88 165 8.33333333333333e+00
+88 147 -8.33333333333333e+00
+88 377 4.16666666666667e+00
+88 149 -8.33333333333333e+00
+88 382 -3.75000000000000e+01
+88 306 -4.16666666666667e+00
+88 375 -8.33333333333333e+00
+88 381 8.33333333333333e+00
+89 89 6.66666666666667e+01
+89 441 4.16666666666667e+00
+89 443 -8.33333333333333e+00
+89 381 -4.16666666666667e+00
+89 301 4.16666666666667e+00
+89 306 8.33333333333333e+00
+89 438 4.16666666666667e+00
+89 300 -8.33333333333333e+00
+89 440 -8.33333333333333e+00
+89 375 4.16666666666667e+00
+89 308 -3.75000000000000e+01
+89 307 8.33333333333333e+00
+89 165 8.33333333333333e+00
+89 147 -8.33333333333333e+00
+89 166 -1.66666666666667e+01
+89 382 8.33333333333333e+00
+89 383 -1.25000000000000e+01
+89 87 -8.33333333333333e+00
+89 376 4.16666666666667e+00
+89 148 -8.33333333333333e+00
+90 90 7.50000000000000e+01
+90 446 4.16666666666667e+00
+90 316 -4.16666666666667e+00
+90 392 -4.16666666666667e+00
+90 91 -8.33333333333333e+00
+90 445 4.16666666666667e+00
+90 444 -2.50000000000000e+01
+90 317 8.33333333333333e+00
+90 443 4.16666666666667e+00
+90 311 -8.33333333333333e+00
+90 310 4.16666666666667e+00
+90 386 4.16666666666667e+00
+90 442 4.16666666666667e+00
+90 441 -2.50000000000000e+01
+90 188 8.33333333333333e+00
+90 170 -8.33333333333333e+00
+90 315 -1.25000000000000e+01
+90 187 8.33333333333333e+00
+90 169 -8.33333333333333e+00
+90 385 -8.33333333333333e+00
+90 391 8.33333333333333e+00
+90 390 -1.25000000000000e+01
+90 92 -8.33333333333333e+00
+91 91 6.66666666666667e+01
+91 445 -8.33333333333333e+00
+91 90 -8.33333333333333e+00
+91 444 4.16666666666667e+00
+91 311 4.16666666666667e+00
+91 309 4.16666666666667e+00
+91 442 -8.33333333333333e+00
+91 441 4.16666666666667e+00
+91 317 8.33333333333333e+00
+91 316 -1.25000000000000e+01
+91 188 -1.66666666666667e+01
+91 392 8.33333333333333e+00
+91 186 8.33333333333333e+00
+91 168 -8.33333333333333e+00
+91 386 4.16666666666667e+00
+91 170 -8.33333333333333e+00
+91 391 -3.75000000000000e+01
+91 315 -4.16666666666667e+00
+91 384 -8.33333333333333e+00
+91 390 8.33333333333333e+00
+92 92 6.66666666666667e+01
+92 444 4.16666666666667e+00
+92 446 -8.33333333333333e+00
+92 390 -4.16666666666667e+00
+92 310 4.16666666666667e+00
+92 315 8.33333333333333e+00
+92 441 4.16666666666667e+00
+92 309 -8.33333333333333e+00
+92 443 -8.33333333333333e+00
+92 384 4.16666666666667e+00
+92 317 -3.75000000000000e+01
+92 316 8.33333333333333e+00
+92 186 8.33333333333333e+00
+92 168 -8.33333333333333e+00
+92 187 -1.66666666666667e+01
+92 391 8.33333333333333e+00
+92 392 -1.25000000000000e+01
+92 90 -8.33333333333333e+00
+92 385 4.16666666666667e+00
+92 169 -8.33333333333333e+00
+93 93 4.23333333333333e+01
+93 449 8.33333333333333e-02
+93 325 -8.33333333333333e-02
+93 401 -8.33333333333333e-02
+93 94 -1.66666666666667e-01
+93 448 8.33333333333333e-02
+93 447 -5.00000000000000e-01
+93 326 4.25000000000000e+00
+93 446 4.16666666666667e+00
+93 320 -8.33333333333333e+00
+93 319 4.16666666666667e+00
+93 395 4.16666666666667e+00
+93 445 4.16666666666667e+00
+93 444 -2.50000000000000e+01
+93 209 4.25000000000000e+00
+93 191 -8.33333333333333e+00
+93 324 -8.41666666666667e+00
+93 208 4.25000000000000e+00
+93 190 -8.33333333333333e+00
+93 394 -8.33333333333333e+00
+93 400 4.25000000000000e+00
+93 399 -8.41666666666667e+00
+93 95 -1.66666666666667e-01
+94 94 4.21666666666667e+01
+94 448 -1.66666666666667e-01
+94 93 -1.66666666666667e-01
+94 447 8.33333333333333e-02
+94 320 4.16666666666667e+00
+94 318 4.16666666666667e+00
+94 445 -8.33333333333333e+00
+94 444 4.16666666666667e+00
+94 326 4.25000000000000e+00
+94 325 -8.41666666666667e+00
+94 209 -8.50000000000000e+00
+94 401 4.25000000000000e+00
+94 207 4.25000000000000e+00
+94 189 -8.33333333333333e+00
+94 395 4.16666666666667e+00
+94 191 -8.33333333333333e+00
+94 400 -2.52500000000000e+01
+94 324 -8.33333333333333e-02
+94 393 -8.33333333333333e+00
+94 399 4.25000000000000e+00
+95 95 4.21666666666667e+01
+95 447 8.33333333333333e-02
+95 449 -1.66666666666667e-01
+95 399 -8.33333333333333e-02
+95 319 4.16666666666667e+00
+95 324 4.25000000000000e+00
+95 444 4.16666666666667e+00
+95 318 -8.33333333333333e+00
+95 446 -8.33333333333333e+00
+95 393 4.16666666666667e+00
+95 326 -2.52500000000000e+01
+95 325 4.25000000000000e+00
+95 207 4.25000000000000e+00
+95 189 -8.33333333333333e+00
+95 208 -8.50000000000000e+00
+95 400 4.25000000000000e+00
+95 401 -8.41666666666667e+00
+95 93 -1.66666666666667e-01
+95 394 4.16666666666667e+00
+95 190 -8.33333333333333e+00
+96 96 1.50000000000000e+00
+96 452 8.33333333333333e-02
+96 334 -8.33333333333333e-02
+96 410 -8.33333333333333e-02
+96 97 -1.66666666666667e-01
+96 451 8.33333333333333e-02
+96 450 -5.00000000000000e-01
+96 335 1.66666666666667e-01
+96 449 8.33333333333333e-02
+96 329 -1.66666666666667e-01
+96 328 8.33333333333333e-02
+96 404 8.33333333333333e-02
+96 448 8.33333333333333e-02
+96 447 -5.00000000000000e-01
+96 230 1.66666666666667e-01
+96 212 -1.66666666666667e-01
+96 333 -2.50000000000000e-01
+96 229 1.66666666666667e-01
+96 211 -1.66666666666667e-01
+96 403 -1.66666666666667e-01
+96 409 1.66666666666667e-01
+96 408 -2.50000000000000e-01
+96 98 -1.66666666666667e-01
+97 97 1.33333333333333e+00
+97 451 -1.66666666666667e-01
+97 96 -1.66666666666667e-01
+97 450 8.33333333333333e-02
+97 329 8.33333333333333e-02
+97 327 8.33333333333333e-02
+97 448 -1.66666666666667e-01
+97 447 8.33333333333333e-02
+97 335 1.66666666666667e-01
+97 334 -2.50000000000000e-01
+97 230 -3.33333333333333e-01
+97 410 1.66666666666667e-01
+97 228 1.66666666666667e-01
+97 210 -1.66666666666667e-01
+97 404 8.33333333333333e-02
+97 212 -1.66666666666667e-01
+97 409 -7.50000000000000e-01
+97 333 -8.33333333333333e-02
+97 402 -1.66666666666667e-01
+97 408 1.66666666666667e-01
+98 98 1.33333333333333e+00
+98 450 8.33333333333333e-02
+98 452 -1.66666666666667e-01
+98 408 -8.33333333333333e-02
+98 328 8.33333333333333e-02
+98 333 1.66666666666667e-01
+98 447 8.33333333333333e-02
+98 327 -1.66666666666667e-01
+98 449 -1.66666666666667e-01
+98 402 8.33333333333333e-02
+98 335 -7.50000000000000e-01
+98 334 1.66666666666667e-01
+98 228 1.66666666666667e-01
+98 210 -1.66666666666667e-01
+98 229 -3.33333333333333e-01
+98 409 1.66666666666667e-01
+98 410 -2.50000000000000e-01
+98 96 -1.66666666666667e-01
+98 403 8.33333333333333e-02
+98 211 -1.66666666666667e-01
+99 99 1.50000000000000e+00
+99 455 8.33333333333333e-02
+99 343 -8.33333333333333e-02
+99 419 -8.33333333333333e-02
+99 100 -1.66666666666667e-01
+99 454 8.33333333333333e-02
+99 453 -5.00000000000000e-01
+99 344 1.66666666666667e-01
+99 452 8.33333333333333e-02
+99 338 -1.66666666666667e-01
+99 337 8.33333333333333e-02
+99 413 8.33333333333333e-02
+99 451 8.33333333333333e-02
+99 450 -5.00000000000000e-01
+99 251 1.66666666666667e-01
+99 233 -1.66666666666667e-01
+99 342 -2.50000000000000e-01
+99 250 1.66666666666667e-01
+99 232 -1.66666666666667e-01
+99 412 -1.66666666666667e-01
+99 418 1.66666666666667e-01
+99 417 -2.50000000000000e-01
+99 101 -1.66666666666667e-01
+100 100 1.33333333333333e+00
+100 454 -1.66666666666667e-01
+100 99 -1.66666666666667e-01
+100 453 8.33333333333333e-02
+100 338 8.33333333333333e-02
+100 336 8.33333333333333e-02
+100 451 -1.66666666666667e-01
+100 450 8.33333333333333e-02
+100 344 1.66666666666667e-01
+100 343 -2.50000000000000e-01
+100 251 -3.33333333333333e-01
+100 419 1.66666666666667e-01
+100 249 1.66666666666667e-01
+100 231 -1.66666666666667e-01
+100 413 8.33333333333333e-02
+100 233 -1.66666666666667e-01
+100 418 -7.50000000000000e-01
+100 342 -8.33333333333333e-02
+100 411 -1.66666666666667e-01
+100 417 1.66666666666667e-01
+101 101 1.33333333333333e+00
+101 453 8.33333333333333e-02
+101 455 -1.66666666666667e-01
+101 417 -8.33333333333333e-02
+101 337 8.33333333333333e-02
+101 342 1.66666666666667e-01
+101 450 8.33333333333333e-02
+101 336 -1.66666666666667e-01
+101 452 -1.66666666666667e-01
+101 411 8.33333333333333e-02
+101 344 -7.50000000000000e-01
+101 343 1.66666666666667e-01
+101 249 1.66666666666667e-01
+101 231 -1.66666666666667e-01
+101 250 -3.33333333333333e-01
+101 418 1.66666666666667e-01
+101 419 -2.50000000000000e-01
+101 99 -1.66666666666667e-01
+101 412 8.33333333333333e-02
+101 232 -1.66666666666667e-01
+102 102 1.50000000000000e+00
+102 458 8.33333333333333e-02
+102 352 -8.33333333333333e-02
+102 428 -8.33333333333333e-02
+102 103 -1.66666666666667e-01
+102 457 8.33333333333333e-02
+102 456 -5.00000000000000e-01
+102 353 1.66666666666667e-01
+102 455 8.33333333333333e-02
+102 347 -1.66666666666667e-01
+102 346 8.33333333333333e-02
+102 422 8.33333333333333e-02
+102 454 8.33333333333333e-02
+102 453 -5.00000000000000e-01
+102 272 1.66666666666667e-01
+102 254 -1.66666666666667e-01
+102 351 -2.50000000000000e-01
+102 271 1.66666666666667e-01
+102 253 -1.66666666666667e-01
+102 421 -1.66666666666667e-01
+102 427 1.66666666666667e-01
+102 426 -2.50000000000000e-01
+102 104 -1.66666666666667e-01
+103 103 1.33333333333333e+00
+103 457 -1.66666666666667e-01
+103 102 -1.66666666666667e-01
+103 456 8.33333333333333e-02
+103 347 8.33333333333333e-02
+103 345 8.33333333333333e-02
+103 454 -1.66666666666667e-01
+103 453 8.33333333333333e-02
+103 353 1.66666666666667e-01
+103 352 -2.50000000000000e-01
+103 272 -3.33333333333333e-01
+103 428 1.66666666666667e-01
+103 270 1.66666666666667e-01
+103 252 -1.66666666666667e-01
+103 422 8.33333333333333e-02
+103 254 -1.66666666666667e-01
+103 427 -7.50000000000000e-01
+103 351 -8.33333333333333e-02
+103 420 -1.66666666666667e-01
+103 426 1.66666666666667e-01
+104 104 1.33333333333333e+00
+104 456 8.33333333333333e-02
+104 458 -1.66666666666667e-01
+104 426 -8.33333333333333e-02
+104 346 8.33333333333333e-02
+104 351 1.66666666666667e-01
+104 453 8.33333333333333e-02
+104 345 -1.66666666666667e-01
+104 455 -1.66666666666667e-01
+104 420 8.33333333333333e-02
+104 353 -7.50000000000000e-01
+104 352 1.66666666666667e-01
+104 270 1.66666666666667e-01
+104 252 -1.66666666666667e-01
+104 271 -3.33333333333333e-01
+104 427 1.66666666666667e-01
+104 428 -2.50000000000000e-01
+104 102 -1.66666666666667e-01
+104 421 8.33333333333333e-02
+104 253 -1.66666666666667e-01
+105 105 8.33333333333333e-01
+105 458 8.33333333333333e-02
+105 356 -1.66666666666667e-01
+105 355 8.33333333333333e-02
+105 431 8.33333333333333e-02
+105 457 8.33333333333333e-02
+105 456 -5.00000000000000e-01
+105 284 8.33333333333333e-02
+105 275 -1.66666666666667e-01
+105 357 -1.66666666666667e-01
+105 283 8.33333333333333e-02
+105 274 -1.66666666666667e-01
+105 430 -1.66666666666667e-01
+105 433 8.33333333333333e-02
+105 432 -1.66666666666667e-01
+105 359 8.33333333333333e-02
+106 106 8.33333333333333e-01
+106 354 8.33333333333333e-02
+106 457 -1.66666666666667e-01
+106 456 8.33333333333333e-02
+106 359 8.33333333333333e-02
+106 358 -1.66666666666667e-01
+106 284 -1.66666666666667e-01
+106 434 8.33333333333333e-02
+106 282 8.33333333333333e-02
+106 273 -1.66666666666667e-01
+106 431 8.33333333333333e-02
+106 275 -1.66666666666667e-01
+106 433 -5.00000000000000e-01
+106 356 8.33333333333333e-02
+106 429 -1.66666666666667e-01
+106 432 8.33333333333333e-02
+107 107 8.33333333333333e-01
+107 357 8.33333333333333e-02
+107 456 8.33333333333333e-02
+107 354 -1.66666666666667e-01
+107 458 -1.66666666666667e-01
+107 429 8.33333333333333e-02
+107 359 -5.00000000000000e-01
+107 358 8.33333333333333e-02
+107 282 8.33333333333333e-02
+107 273 -1.66666666666667e-01
+107 283 -1.66666666666667e-01
+107 433 8.33333333333333e-02
+107 434 -1.66666666666667e-01
+107 355 8.33333333333333e-02
+107 430 8.33333333333333e-02
+107 274 -1.66666666666667e-01
+108 108 7.50000000000000e+01
+108 4 4.16666666666667e+00
+108 133 -8.33333333333333e+00
+108 116 -4.16666666666667e+00
+108 109 -8.33333333333333e+00
+108 115 8.33333333333333e+00
+108 1 0.00000000000000e+00
+108 114 -1.25000000000000e+01
+108 146 -8.33333333333333e+00
+108 128 8.33333333333333e+00
+108 5 4.16666666666667e+00
+108 140 -8.33333333333333e+00
+108 139 4.16666666666667e+00
+108 145 -8.33333333333333e+00
+108 3 -2.50000000000000e+01
+108 110 -8.33333333333333e+00
+108 122 8.33333333333333e+00
+108 2 0.00000000000000e+00
+108 121 -4.16666666666667e+00
+108 127 8.33333333333333e+00
+108 134 4.16666666666667e+00
+108 120 -1.25000000000000e+01
+108 0 0.00000000000000e+00
+109 109 6.66666666666667e+01
+109 3 4.16666666666667e+00
+109 132 -8.33333333333333e+00
+109 116 8.33333333333333e+00
+109 115 -3.75000000000000e+01
+109 108 -8.33333333333333e+00
+109 114 8.33333333333333e+00
+109 0 0.00000000000000e+00
+109 140 4.16666666666667e+00
+109 146 -8.33333333333333e+00
+109 4 -8.33333333333333e+00
+109 138 4.16666666666667e+00
+109 144 -8.33333333333333e+00
+109 122 8.33333333333333e+00
+109 128 -1.66666666666667e+01
+109 134 4.16666666666667e+00
+109 121 -1.25000000000000e+01
+109 1 0.00000000000000e+00
+109 120 -4.16666666666667e+00
+109 126 8.33333333333333e+00
+110 110 6.66666666666667e+01
+110 132 4.16666666666667e+00
+110 116 -1.25000000000000e+01
+110 115 8.33333333333333e+00
+110 114 -4.16666666666667e+00
+110 139 4.16666666666667e+00
+110 145 -8.33333333333333e+00
+110 144 -8.33333333333333e+00
+110 126 8.33333333333333e+00
+110 5 -8.33333333333333e+00
+110 3 4.16666666666667e+00
+110 138 -8.33333333333333e+00
+110 133 4.16666666666667e+00
+110 122 -3.75000000000000e+01
+110 2 0.00000000000000e+00
+110 121 8.33333333333333e+00
+110 127 -1.66666666666667e+01
+110 108 -8.33333333333333e+00
+110 120 8.33333333333333e+00
+110 0 0.00000000000000e+00
+111 111 1.00000000000000e+00
+111 286 0.00000000000000e+00
+111 28 0.00000000000000e+00
+111 116 0.00000000000000e+00
+111 115 0.00000000000000e+00
+111 112 0.00000000000000e+00
+111 1 0.00000000000000e+00
+111 114 0.00000000000000e+00
+111 293 0.00000000000000e+00
+111 290 0.00000000000000e+00
+111 289 0.00000000000000e+00
+111 292 0.00000000000000e+00
+111 27 0.00000000000000e+00
+111 125 0.00000000000000e+00
+111 128 0.00000000000000e+00
+111 124 0.00000000000000e+00
+111 127 0.00000000000000e+00
+111 123 0.00000000000000e+00
+111 287 0.00000000000000e+00
+111 0 0.00000000000000e+00
+112 112 1.00000000000000e+00
+112 285 0.00000000000000e+00
+112 27 0.00000000000000e+00
+112 116 0.00000000000000e+00
+112 115 0.00000000000000e+00
+112 114 0.00000000000000e+00
+112 111 0.00000000000000e+00
+112 0 0.00000000000000e+00
+112 293 0.00000000000000e+00
+112 128 0.00000000000000e+00
+112 290 0.00000000000000e+00
+112 29 0.00000000000000e+00
+112 28 0.00000000000000e+00
+112 288 0.00000000000000e+00
+112 291 0.00000000000000e+00
+112 125 0.00000000000000e+00
+112 113 0.00000000000000e+00
+112 2 0.00000000000000e+00
+112 124 0.00000000000000e+00
+112 287 0.00000000000000e+00
+112 1 0.00000000000000e+00
+112 123 0.00000000000000e+00
+112 126 0.00000000000000e+00
+113 113 1.00000000000000e+00
+113 286 0.00000000000000e+00
+113 116 0.00000000000000e+00
+113 115 0.00000000000000e+00
+113 114 0.00000000000000e+00
+113 291 0.00000000000000e+00
+113 288 0.00000000000000e+00
+113 292 0.00000000000000e+00
+113 127 0.00000000000000e+00
+113 29 0.00000000000000e+00
+113 289 0.00000000000000e+00
+113 28 0.00000000000000e+00
+113 125 0.00000000000000e+00
+113 285 0.00000000000000e+00
+113 2 0.00000000000000e+00
+113 124 0.00000000000000e+00
+113 112 0.00000000000000e+00
+113 1 0.00000000000000e+00
+113 123 0.00000000000000e+00
+113 126 0.00000000000000e+00
+114 114 1.25000000000000e+02
+114 292 8.33333333333333e+00
+114 293 8.33333333333333e+00
+114 286 8.33333333333333e+00
+114 285 -1.25000000000000e+01
+114 116 -1.66666666666667e+01
+114 113 0.00000000000000e+00
+114 112 0.00000000000000e+00
+114 111 0.00000000000000e+00
+114 127 -8.33333333333333e+00
+114 115 -1.66666666666667e+01
+114 134 8.33333333333333e+00
+114 298 -8.33333333333333e+00
+114 145 8.33333333333333e+00
+114 128 1.66666666666667e+01
+114 146 -1.66666666666667e+01
+114 32 4.16666666666667e+00
+114 299 -8.33333333333333e+00
+114 133 8.33333333333333e+00
+114 31 -8.33333333333333e+00
+114 132 -3.75000000000000e+01
+114 110 -4.16666666666667e+00
+114 2 0.00000000000000e+00
+114 109 8.33333333333333e+00
+114 1 0.00000000000000e+00
+114 108 -1.25000000000000e+01
+114 287 -4.16666666666667e+00
+114 126 -2.50000000000000e+01
+115 115 1.25000000000000e+02
+115 291 8.33333333333333e+00
+115 293 -1.66666666666667e+01
+115 32 4.16666666666667e+00
+115 286 -3.75000000000000e+01
+115 285 8.33333333333333e+00
+115 113 0.00000000000000e+00
+115 2 0.00000000000000e+00
+115 112 0.00000000000000e+00
+115 111 0.00000000000000e+00
+115 126 -8.33333333333333e+00
+115 134 -4.16666666666667e+00
+115 114 -1.66666666666667e+01
+115 297 -8.33333333333333e+00
+115 144 8.33333333333333e+00
+115 299 -8.33333333333333e+00
+115 146 8.33333333333333e+00
+115 133 -1.25000000000000e+01
+115 132 8.33333333333333e+00
+115 30 -8.33333333333333e+00
+115 110 8.33333333333333e+00
+115 116 -1.66666666666667e+01
+115 128 1.66666666666667e+01
+115 109 -3.75000000000000e+01
+115 287 8.33333333333333e+00
+115 127 -2.50000000000000e+01
+115 108 8.33333333333333e+00
+115 0 0.00000000000000e+00
+116 116 1.25000000000000e+02
+116 286 8.33333333333333e+00
+116 292 -1.66666666666667e+01
+116 291 8.33333333333333e+00
+116 287 -1.25000000000000e+01
+116 31 4.16666666666667e+00
+116 113 0.00000000000000e+00
+116 112 0.00000000000000e+00
+116 1 0.00000000000000e+00
+116 114 -1.66666666666667e+01
+116 111 0.00000000000000e+00
+116 133 -4.16666666666667e+00
+116 132 8.33333333333333e+00
+116 298 -8.33333333333333e+00
+116 145 8.33333333333333e+00
+116 126 1.66666666666667e+01
+116 144 -1.66666666666667e+01
+116 134 -1.25000000000000e+01
+116 30 4.16666666666667e+00
+116 297 -8.33333333333333e+00
+116 110 -1.25000000000000e+01
+116 285 -4.16666666666667e+00
+116 128 -7.50000000000000e+01
+116 109 8.33333333333333e+00
+116 115 -1.66666666666667e+01
+116 127 1.66666666666667e+01
+116 108 -4.16666666666667e+00
+116 0 0.00000000000000e+00
+117 117 1.00000000000000e+00
+117 365 0.00000000000000e+00
+117 125 0.00000000000000e+00
+117 124 0.00000000000000e+00
+117 123 0.00000000000000e+00
+117 128 0.00000000000000e+00
+117 368 0.00000000000000e+00
+117 361 0.00000000000000e+00
+117 367 0.00000000000000e+00
+117 56 0.00000000000000e+00
+117 362 0.00000000000000e+00
+117 54 0.00000000000000e+00
+117 119 0.00000000000000e+00
+117 122 0.00000000000000e+00
+117 2 0.00000000000000e+00
+117 121 0.00000000000000e+00
+117 127 0.00000000000000e+00
+117 364 0.00000000000000e+00
+117 120 0.00000000000000e+00
+117 0 0.00000000000000e+00
+118 118 1.00000000000000e+00
+118 365 0.00000000000000e+00
+118 56 0.00000000000000e+00
+118 125 0.00000000000000e+00
+118 119 0.00000000000000e+00
+118 2 0.00000000000000e+00
+118 124 0.00000000000000e+00
+118 123 0.00000000000000e+00
+118 360 0.00000000000000e+00
+118 366 0.00000000000000e+00
+118 362 0.00000000000000e+00
+118 368 0.00000000000000e+00
+118 55 0.00000000000000e+00
+118 122 0.00000000000000e+00
+118 128 0.00000000000000e+00
+118 363 0.00000000000000e+00
+118 121 0.00000000000000e+00
+118 1 0.00000000000000e+00
+118 120 0.00000000000000e+00
+118 126 0.00000000000000e+00
+119 119 1.00000000000000e+00
+119 55 0.00000000000000e+00
+119 363 0.00000000000000e+00
+119 125 0.00000000000000e+00
+119 124 0.00000000000000e+00
+119 118 0.00000000000000e+00
+119 1 0.00000000000000e+00
+119 123 0.00000000000000e+00
+119 126 0.00000000000000e+00
+119 366 0.00000000000000e+00
+119 56 0.00000000000000e+00
+119 361 0.00000000000000e+00
+119 367 0.00000000000000e+00
+119 54 0.00000000000000e+00
+119 360 0.00000000000000e+00
+119 364 0.00000000000000e+00
+119 122 0.00000000000000e+00
+119 2 0.00000000000000e+00
+119 121 0.00000000000000e+00
+119 127 0.00000000000000e+00
+119 117 0.00000000000000e+00
+119 120 0.00000000000000e+00
+119 0 0.00000000000000e+00
+120 120 1.25000000000000e+02
+120 146 8.33333333333333e+00
+120 145 -1.66666666666667e+01
+120 140 8.33333333333333e+00
+120 58 4.16666666666667e+00
+120 138 -3.75000000000000e+01
+120 110 8.33333333333333e+00
+120 109 -4.16666666666667e+00
+120 1 0.00000000000000e+00
+120 108 -1.25000000000000e+01
+120 128 -8.33333333333333e+00
+120 122 -1.66666666666667e+01
+120 361 -4.16666666666667e+00
+120 374 -8.33333333333333e+00
+120 368 8.33333333333333e+00
+120 373 -8.33333333333333e+00
+120 367 8.33333333333333e+00
+120 362 8.33333333333333e+00
+120 59 -8.33333333333333e+00
+120 360 -1.25000000000000e+01
+120 119 0.00000000000000e+00
+120 2 0.00000000000000e+00
+120 118 0.00000000000000e+00
+120 121 -1.66666666666667e+01
+120 127 1.66666666666667e+01
+120 117 0.00000000000000e+00
+120 139 8.33333333333333e+00
+120 126 -2.50000000000000e+01
+121 121 1.25000000000000e+02
+121 146 8.33333333333333e+00
+121 138 8.33333333333333e+00
+121 144 -1.66666666666667e+01
+121 139 -1.25000000000000e+01
+121 57 4.16666666666667e+00
+121 110 8.33333333333333e+00
+121 122 -1.66666666666667e+01
+121 109 -1.25000000000000e+01
+121 108 -4.16666666666667e+00
+121 0 0.00000000000000e+00
+121 360 -4.16666666666667e+00
+121 362 8.33333333333333e+00
+121 128 1.66666666666667e+01
+121 368 -1.66666666666667e+01
+121 372 -8.33333333333333e+00
+121 366 8.33333333333333e+00
+121 59 4.16666666666667e+00
+121 374 -8.33333333333333e+00
+121 361 -1.25000000000000e+01
+121 119 0.00000000000000e+00
+121 2 0.00000000000000e+00
+121 118 0.00000000000000e+00
+121 140 -4.16666666666667e+00
+121 127 -7.50000000000000e+01
+121 117 0.00000000000000e+00
+121 120 -1.66666666666667e+01
+121 126 1.66666666666667e+01
+122 122 1.25000000000000e+02
+122 145 8.33333333333333e+00
+122 144 8.33333333333333e+00
+122 140 -1.25000000000000e+01
+122 138 8.33333333333333e+00
+122 110 -3.75000000000000e+01
+122 109 8.33333333333333e+00
+122 121 -1.66666666666667e+01
+122 108 8.33333333333333e+00
+122 126 -8.33333333333333e+00
+122 120 -1.66666666666667e+01
+122 361 8.33333333333333e+00
+122 372 -8.33333333333333e+00
+122 366 8.33333333333333e+00
+122 127 1.66666666666667e+01
+122 367 -1.66666666666667e+01
+122 362 -3.75000000000000e+01
+122 58 4.16666666666667e+00
+122 373 -8.33333333333333e+00
+122 360 8.33333333333333e+00
+122 57 -8.33333333333333e+00
+122 119 0.00000000000000e+00
+122 139 -4.16666666666667e+00
+122 128 -2.50000000000000e+01
+122 118 0.00000000000000e+00
+122 1 0.00000000000000e+00
+122 117 0.00000000000000e+00
+122 0 0.00000000000000e+00
+123 123 1.00000000000000e+00
+123 290 0.00000000000000e+00
+123 289 0.00000000000000e+00
+123 292 0.00000000000000e+00
+123 82 0.00000000000000e+00
+123 288 0.00000000000000e+00
+123 125 0.00000000000000e+00
+123 113 0.00000000000000e+00
+123 112 0.00000000000000e+00
+123 1 0.00000000000000e+00
+123 111 0.00000000000000e+00
+123 364 0.00000000000000e+00
+123 365 0.00000000000000e+00
+123 128 0.00000000000000e+00
+123 368 0.00000000000000e+00
+123 436 0.00000000000000e+00
+123 367 0.00000000000000e+00
+123 83 0.00000000000000e+00
+123 437 0.00000000000000e+00
+123 363 0.00000000000000e+00
+123 119 0.00000000000000e+00
+123 2 0.00000000000000e+00
+123 124 0.00000000000000e+00
+123 118 0.00000000000000e+00
+123 127 0.00000000000000e+00
+123 293 0.00000000000000e+00
+123 117 0.00000000000000e+00
+123 126 0.00000000000000e+00
+124 124 1.00000000000000e+00
+124 293 0.00000000000000e+00
+124 291 0.00000000000000e+00
+124 290 0.00000000000000e+00
+124 289 0.00000000000000e+00
+124 81 0.00000000000000e+00
+124 113 0.00000000000000e+00
+124 112 0.00000000000000e+00
+124 111 0.00000000000000e+00
+124 0 0.00000000000000e+00
+124 128 0.00000000000000e+00
+124 125 0.00000000000000e+00
+124 363 0.00000000000000e+00
+124 437 0.00000000000000e+00
+124 368 0.00000000000000e+00
+124 435 0.00000000000000e+00
+124 366 0.00000000000000e+00
+124 83 0.00000000000000e+00
+124 365 0.00000000000000e+00
+124 364 0.00000000000000e+00
+124 119 0.00000000000000e+00
+124 2 0.00000000000000e+00
+124 288 0.00000000000000e+00
+124 118 0.00000000000000e+00
+124 127 0.00000000000000e+00
+124 123 0.00000000000000e+00
+124 117 0.00000000000000e+00
+124 126 0.00000000000000e+00
+125 125 1.00000000000000e+00
+125 288 0.00000000000000e+00
+125 292 0.00000000000000e+00
+125 290 0.00000000000000e+00
+125 289 0.00000000000000e+00
+125 113 0.00000000000000e+00
+125 112 0.00000000000000e+00
+125 123 0.00000000000000e+00
+125 111 0.00000000000000e+00
+125 127 0.00000000000000e+00
+125 124 0.00000000000000e+00
+125 436 0.00000000000000e+00
+125 367 0.00000000000000e+00
+125 363 0.00000000000000e+00
+125 126 0.00000000000000e+00
+125 366 0.00000000000000e+00
+125 365 0.00000000000000e+00
+125 82 0.00000000000000e+00
+125 364 0.00000000000000e+00
+125 81 0.00000000000000e+00
+125 435 0.00000000000000e+00
+125 291 0.00000000000000e+00
+125 119 0.00000000000000e+00
+125 128 0.00000000000000e+00
+125 118 0.00000000000000e+00
+125 1 0.00000000000000e+00
+125 117 0.00000000000000e+00
+125 0 0.00000000000000e+00
+126 126 2.50000000000000e+02
+126 292 1.66666666666667e+01
+126 291 -2.50000000000000e+01
+126 113 0.00000000000000e+00
+126 112 0.00000000000000e+00
+126 125 0.00000000000000e+00
+126 436 8.33333333333333e+00
+126 124 0.00000000000000e+00
+126 123 0.00000000000000e+00
+126 437 8.33333333333333e+00
+126 115 -8.33333333333333e+00
+126 116 1.66666666666667e+01
+126 128 -3.33333333333333e+01
+126 2 0.00000000000000e+00
+126 114 -2.50000000000000e+01
+126 299 8.33333333333333e+00
+126 86 -8.33333333333333e+00
+126 298 -1.66666666666667e+01
+126 110 8.33333333333333e+00
+126 145 1.66666666666667e+01
+126 127 -3.33333333333333e+01
+126 146 1.66666666666667e+01
+126 85 -8.33333333333333e+00
+126 144 -7.50000000000000e+01
+126 109 8.33333333333333e+00
+126 1 0.00000000000000e+00
+126 122 -8.33333333333333e+00
+126 119 0.00000000000000e+00
+126 373 8.33333333333333e+00
+126 367 -8.33333333333333e+00
+126 118 0.00000000000000e+00
+126 121 1.66666666666667e+01
+126 120 -2.50000000000000e+01
+126 368 1.66666666666667e+01
+126 374 -1.66666666666667e+01
+126 366 -2.50000000000000e+01
+126 293 -8.33333333333333e+00
+127 127 2.50000000000000e+02
+127 291 1.66666666666667e+01
+127 293 1.66666666666667e+01
+127 292 -7.50000000000000e+01
+127 111 0.00000000000000e+00
+127 125 0.00000000000000e+00
+127 435 8.33333333333333e+00
+127 124 0.00000000000000e+00
+127 123 0.00000000000000e+00
+127 437 -1.66666666666667e+01
+127 114 -8.33333333333333e+00
+127 299 8.33333333333333e+00
+127 116 1.66666666666667e+01
+127 115 -2.50000000000000e+01
+127 297 -1.66666666666667e+01
+127 146 -8.33333333333333e+00
+127 144 1.66666666666667e+01
+127 126 -3.33333333333333e+01
+127 145 -2.50000000000000e+01
+127 84 -8.33333333333333e+00
+127 110 -1.66666666666667e+01
+127 108 8.33333333333333e+00
+127 0 0.00000000000000e+00
+127 122 1.66666666666667e+01
+127 128 -3.33333333333333e+01
+127 368 1.66666666666667e+01
+127 372 8.33333333333333e+00
+127 366 -8.33333333333333e+00
+127 119 0.00000000000000e+00
+127 2 0.00000000000000e+00
+127 121 -7.50000000000000e+01
+127 117 0.00000000000000e+00
+127 120 1.66666666666667e+01
+127 374 8.33333333333333e+00
+127 86 -8.33333333333333e+00
+127 367 -2.50000000000000e+01
+127 113 0.00000000000000e+00
+128 128 2.50000000000000e+02
+128 112 0.00000000000000e+00
+128 293 -2.50000000000000e+01
+128 292 1.66666666666667e+01
+128 111 0.00000000000000e+00
+128 124 0.00000000000000e+00
+128 123 0.00000000000000e+00
+128 125 0.00000000000000e+00
+128 436 -1.66666666666667e+01
+128 435 8.33333333333333e+00
+128 298 8.33333333333333e+00
+128 114 1.66666666666667e+01
+128 126 -3.33333333333333e+01
+128 116 -7.50000000000000e+01
+128 115 1.66666666666667e+01
+128 0 0.00000000000000e+00
+128 297 8.33333333333333e+00
+128 84 -8.33333333333333e+00
+128 145 -8.33333333333333e+00
+128 108 8.33333333333333e+00
+128 146 -2.50000000000000e+01
+128 144 1.66666666666667e+01
+128 109 -1.66666666666667e+01
+128 120 -8.33333333333333e+00
+128 117 0.00000000000000e+00
+128 121 1.66666666666667e+01
+128 127 -3.33333333333333e+01
+128 367 1.66666666666667e+01
+128 122 -2.50000000000000e+01
+128 118 0.00000000000000e+00
+128 1 0.00000000000000e+00
+128 368 -7.50000000000000e+01
+128 291 -8.33333333333333e+00
+128 373 8.33333333333333e+00
+128 85 -8.33333333333333e+00
+128 366 1.66666666666667e+01
+128 372 -1.66666666666667e+01
+129 129 7.50000000000000e+01
+129 7 4.16666666666667e+00
+129 154 -8.33333333333333e+00
+129 137 -4.16666666666667e+00
+129 130 -8.33333333333333e+00
+129 136 8.33333333333333e+00
+129 4 4.16666666666667e+00
+129 135 -1.25000000000000e+01
+129 167 -8.33333333333333e+00
+129 149 8.33333333333333e+00
+129 8 4.16666666666667e+00
+129 161 -8.33333333333333e+00
+129 160 4.16666666666667e+00
+129 166 -8.33333333333333e+00
+129 6 -2.50000000000000e+01
+129 131 -8.33333333333333e+00
+129 143 8.33333333333333e+00
+129 5 4.16666666666667e+00
+129 142 -4.16666666666667e+00
+129 148 8.33333333333333e+00
+129 155 4.16666666666667e+00
+129 141 -1.25000000000000e+01
+129 3 -2.50000000000000e+01
+130 130 6.66666666666667e+01
+130 6 4.16666666666667e+00
+130 153 -8.33333333333333e+00
+130 137 8.33333333333333e+00
+130 136 -3.75000000000000e+01
+130 129 -8.33333333333333e+00
+130 135 8.33333333333333e+00
+130 3 4.16666666666667e+00
+130 161 4.16666666666667e+00
+130 167 -8.33333333333333e+00
+130 7 -8.33333333333333e+00
+130 159 4.16666666666667e+00
+130 165 -8.33333333333333e+00
+130 143 8.33333333333333e+00
+130 149 -1.66666666666667e+01
+130 155 4.16666666666667e+00
+130 142 -1.25000000000000e+01
+130 4 -8.33333333333333e+00
+130 141 -4.16666666666667e+00
+130 147 8.33333333333333e+00
+131 131 6.66666666666667e+01
+131 153 4.16666666666667e+00
+131 137 -1.25000000000000e+01
+131 136 8.33333333333333e+00
+131 135 -4.16666666666667e+00
+131 160 4.16666666666667e+00
+131 166 -8.33333333333333e+00
+131 165 -8.33333333333333e+00
+131 147 8.33333333333333e+00
+131 8 -8.33333333333333e+00
+131 6 4.16666666666667e+00
+131 159 -8.33333333333333e+00
+131 154 4.16666666666667e+00
+131 143 -3.75000000000000e+01
+131 5 -8.33333333333333e+00
+131 142 8.33333333333333e+00
+131 148 -1.66666666666667e+01
+131 129 -8.33333333333333e+00
+131 141 8.33333333333333e+00
+131 3 4.16666666666667e+00
+132 132 1.25000000000000e+02
+132 295 -8.33333333333333e+00
+132 137 8.33333333333333e+00
+132 136 8.33333333333333e+00
+132 135 -3.75000000000000e+01
+132 302 -8.33333333333333e+00
+132 301 -8.33333333333333e+00
+132 149 -1.66666666666667e+01
+132 148 8.33333333333333e+00
+132 116 8.33333333333333e+00
+132 134 -1.66666666666667e+01
+132 146 1.66666666666667e+01
+132 298 8.33333333333333e+00
+132 145 -8.33333333333333e+00
+132 5 -4.16666666666667e+00
+132 110 4.16666666666667e+00
+132 4 8.33333333333333e+00
+132 109 -8.33333333333333e+00
+132 3 -1.25000000000000e+01
+132 144 -2.50000000000000e+01
+132 32 -4.16666666666667e+00
+132 299 8.33333333333333e+00
+132 133 -1.66666666666667e+01
+132 31 8.33333333333333e+00
+132 115 8.33333333333333e+00
+132 296 4.16666666666667e+00
+132 30 -1.25000000000000e+01
+132 114 -3.75000000000000e+01
+133 133 1.25000000000000e+02
+133 294 -8.33333333333333e+00
+133 137 -4.16666666666667e+00
+133 136 -1.25000000000000e+01
+133 135 8.33333333333333e+00
+133 302 -8.33333333333333e+00
+133 149 8.33333333333333e+00
+133 300 -8.33333333333333e+00
+133 147 8.33333333333333e+00
+133 116 -4.16666666666667e+00
+133 110 4.16666666666667e+00
+133 297 8.33333333333333e+00
+133 144 -8.33333333333333e+00
+133 5 8.33333333333333e+00
+133 134 -1.66666666666667e+01
+133 146 1.66666666666667e+01
+133 4 -3.75000000000000e+01
+133 145 -2.50000000000000e+01
+133 3 8.33333333333333e+00
+133 108 -8.33333333333333e+00
+133 32 8.33333333333333e+00
+133 299 -1.66666666666667e+01
+133 296 4.16666666666667e+00
+133 31 -3.75000000000000e+01
+133 115 -1.25000000000000e+01
+133 132 -1.66666666666667e+01
+133 30 8.33333333333333e+00
+133 114 8.33333333333333e+00
+134 134 1.25000000000000e+02
+134 295 4.16666666666667e+00
+134 137 -1.25000000000000e+01
+134 136 -4.16666666666667e+00
+134 135 8.33333333333333e+00
+134 300 -8.33333333333333e+00
+134 301 -8.33333333333333e+00
+134 148 8.33333333333333e+00
+134 147 -1.66666666666667e+01
+134 115 -4.16666666666667e+00
+134 109 4.16666666666667e+00
+134 114 8.33333333333333e+00
+134 132 -1.66666666666667e+01
+134 144 1.66666666666667e+01
+134 5 -1.25000000000000e+01
+134 146 -7.50000000000000e+01
+134 4 8.33333333333333e+00
+134 133 -1.66666666666667e+01
+134 145 1.66666666666667e+01
+134 3 -4.16666666666667e+00
+134 108 4.16666666666667e+00
+134 294 4.16666666666667e+00
+134 32 -1.25000000000000e+01
+134 116 -1.25000000000000e+01
+134 31 8.33333333333333e+00
+134 298 -1.66666666666667e+01
+134 30 -4.16666666666667e+00
+134 297 8.33333333333333e+00
+135 135 1.25000000000000e+02
+135 301 8.33333333333333e+00
+135 302 8.33333333333333e+00
+135 295 8.33333333333333e+00
+135 294 -1.25000000000000e+01
+135 137 -1.66666666666667e+01
+135 134 8.33333333333333e+00
+135 133 8.33333333333333e+00
+135 132 -3.75000000000000e+01
+135 148 -8.33333333333333e+00
+135 136 -1.66666666666667e+01
+135 155 8.33333333333333e+00
+135 307 -8.33333333333333e+00
+135 166 8.33333333333333e+00
+135 149 1.66666666666667e+01
+135 167 -1.66666666666667e+01
+135 35 4.16666666666667e+00
+135 308 -8.33333333333333e+00
+135 154 8.33333333333333e+00
+135 34 -8.33333333333333e+00
+135 153 -3.75000000000000e+01
+135 131 -4.16666666666667e+00
+135 5 4.16666666666667e+00
+135 130 8.33333333333333e+00
+135 4 -8.33333333333333e+00
+135 129 -1.25000000000000e+01
+135 296 -4.16666666666667e+00
+135 147 -2.50000000000000e+01
+136 136 1.25000000000000e+02
+136 300 8.33333333333333e+00
+136 302 -1.66666666666667e+01
+136 35 4.16666666666667e+00
+136 295 -3.75000000000000e+01
+136 294 8.33333333333333e+00
+136 134 -4.16666666666667e+00
+136 5 4.16666666666667e+00
+136 133 -1.25000000000000e+01
+136 132 8.33333333333333e+00
+136 147 -8.33333333333333e+00
+136 155 -4.16666666666667e+00
+136 135 -1.66666666666667e+01
+136 306 -8.33333333333333e+00
+136 165 8.33333333333333e+00
+136 308 -8.33333333333333e+00
+136 167 8.33333333333333e+00
+136 154 -1.25000000000000e+01
+136 153 8.33333333333333e+00
+136 33 -8.33333333333333e+00
+136 131 8.33333333333333e+00
+136 137 -1.66666666666667e+01
+136 149 1.66666666666667e+01
+136 130 -3.75000000000000e+01
+136 296 8.33333333333333e+00
+136 148 -2.50000000000000e+01
+136 129 8.33333333333333e+00
+136 3 -8.33333333333333e+00
+137 137 1.25000000000000e+02
+137 295 8.33333333333333e+00
+137 301 -1.66666666666667e+01
+137 300 8.33333333333333e+00
+137 296 -1.25000000000000e+01
+137 34 4.16666666666667e+00
+137 134 -1.25000000000000e+01
+137 133 -4.16666666666667e+00
+137 4 4.16666666666667e+00
+137 135 -1.66666666666667e+01
+137 132 8.33333333333333e+00
+137 154 -4.16666666666667e+00
+137 153 8.33333333333333e+00
+137 307 -8.33333333333333e+00
+137 166 8.33333333333333e+00
+137 147 1.66666666666667e+01
+137 165 -1.66666666666667e+01
+137 155 -1.25000000000000e+01
+137 33 4.16666666666667e+00
+137 306 -8.33333333333333e+00
+137 131 -1.25000000000000e+01
+137 294 -4.16666666666667e+00
+137 149 -7.50000000000000e+01
+137 130 8.33333333333333e+00
+137 136 -1.66666666666667e+01
+137 148 1.66666666666667e+01
+137 129 -4.16666666666667e+00
+137 3 4.16666666666667e+00
+138 138 1.25000000000000e+02
+138 377 -8.33333333333333e+00
+138 370 4.16666666666667e+00
+138 376 -8.33333333333333e+00
+138 371 -8.33333333333333e+00
+138 143 8.33333333333333e+00
+138 142 8.33333333333333e+00
+138 148 -1.66666666666667e+01
+138 141 -3.75000000000000e+01
+138 374 8.33333333333333e+00
+138 146 -8.33333333333333e+00
+138 139 -1.66666666666667e+01
+138 145 1.66666666666667e+01
+138 121 8.33333333333333e+00
+138 5 8.33333333333333e+00
+138 110 -8.33333333333333e+00
+138 4 -4.16666666666667e+00
+138 109 4.16666666666667e+00
+138 3 -1.25000000000000e+01
+138 144 -2.50000000000000e+01
+138 140 -1.66666666666667e+01
+138 59 8.33333333333333e+00
+138 122 8.33333333333333e+00
+138 58 -4.16666666666667e+00
+138 373 8.33333333333333e+00
+138 149 8.33333333333333e+00
+138 57 -1.25000000000000e+01
+138 120 -3.75000000000000e+01
+139 139 1.25000000000000e+02
+139 375 -8.33333333333333e+00
+139 371 4.16666666666667e+00
+139 377 -8.33333333333333e+00
+139 143 -4.16666666666667e+00
+139 149 8.33333333333333e+00
+139 142 -1.25000000000000e+01
+139 141 8.33333333333333e+00
+139 147 -1.66666666666667e+01
+139 110 4.16666666666667e+00
+139 122 -4.16666666666667e+00
+139 138 -1.66666666666667e+01
+139 144 1.66666666666667e+01
+139 120 8.33333333333333e+00
+139 5 8.33333333333333e+00
+139 140 -1.66666666666667e+01
+139 146 1.66666666666667e+01
+139 4 -1.25000000000000e+01
+139 145 -7.50000000000000e+01
+139 3 -4.16666666666667e+00
+139 108 4.16666666666667e+00
+139 59 8.33333333333333e+00
+139 374 -1.66666666666667e+01
+139 369 4.16666666666667e+00
+139 58 -1.25000000000000e+01
+139 121 -1.25000000000000e+01
+139 57 -4.16666666666667e+00
+139 372 8.33333333333333e+00
+140 140 1.25000000000000e+02
+140 375 -8.33333333333333e+00
+140 370 4.16666666666667e+00
+140 376 -8.33333333333333e+00
+140 369 -8.33333333333333e+00
+140 143 -1.25000000000000e+01
+140 142 -4.16666666666667e+00
+140 148 8.33333333333333e+00
+140 141 8.33333333333333e+00
+140 372 8.33333333333333e+00
+140 144 -8.33333333333333e+00
+140 109 4.16666666666667e+00
+140 121 -4.16666666666667e+00
+140 5 -3.75000000000000e+01
+140 146 -2.50000000000000e+01
+140 4 8.33333333333333e+00
+140 139 -1.66666666666667e+01
+140 145 1.66666666666667e+01
+140 3 8.33333333333333e+00
+140 108 -8.33333333333333e+00
+140 147 8.33333333333333e+00
+140 59 -3.75000000000000e+01
+140 122 -1.25000000000000e+01
+140 58 8.33333333333333e+00
+140 373 -1.66666666666667e+01
+140 138 -1.66666666666667e+01
+140 57 8.33333333333333e+00
+140 120 8.33333333333333e+00
+141 141 1.25000000000000e+02
+141 167 8.33333333333333e+00
+141 166 -1.66666666666667e+01
+141 161 8.33333333333333e+00
+141 61 4.16666666666667e+00
+141 159 -3.75000000000000e+01
+141 131 8.33333333333333e+00
+141 130 -4.16666666666667e+00
+141 4 4.16666666666667e+00
+141 129 -1.25000000000000e+01
+141 149 -8.33333333333333e+00
+141 143 -1.66666666666667e+01
+141 370 -4.16666666666667e+00
+141 383 -8.33333333333333e+00
+141 377 8.33333333333333e+00
+141 382 -8.33333333333333e+00
+141 376 8.33333333333333e+00
+141 371 8.33333333333333e+00
+141 62 -8.33333333333333e+00
+141 369 -1.25000000000000e+01
+141 140 8.33333333333333e+00
+141 5 -8.33333333333333e+00
+141 139 8.33333333333333e+00
+141 142 -1.66666666666667e+01
+141 148 1.66666666666667e+01
+141 138 -3.75000000000000e+01
+141 160 8.33333333333333e+00
+141 147 -2.50000000000000e+01
+142 142 1.25000000000000e+02
+142 167 8.33333333333333e+00
+142 159 8.33333333333333e+00
+142 165 -1.66666666666667e+01
+142 160 -1.25000000000000e+01
+142 60 4.16666666666667e+00
+142 131 8.33333333333333e+00
+142 143 -1.66666666666667e+01
+142 130 -1.25000000000000e+01
+142 129 -4.16666666666667e+00
+142 3 4.16666666666667e+00
+142 369 -4.16666666666667e+00
+142 371 8.33333333333333e+00
+142 149 1.66666666666667e+01
+142 377 -1.66666666666667e+01
+142 381 -8.33333333333333e+00
+142 375 8.33333333333333e+00
+142 62 4.16666666666667e+00
+142 383 -8.33333333333333e+00
+142 370 -1.25000000000000e+01
+142 140 -4.16666666666667e+00
+142 5 4.16666666666667e+00
+142 139 -1.25000000000000e+01
+142 161 -4.16666666666667e+00
+142 148 -7.50000000000000e+01
+142 138 8.33333333333333e+00
+142 141 -1.66666666666667e+01
+142 147 1.66666666666667e+01
+143 143 1.25000000000000e+02
+143 166 8.33333333333333e+00
+143 165 8.33333333333333e+00
+143 161 -1.25000000000000e+01
+143 159 8.33333333333333e+00
+143 131 -3.75000000000000e+01
+143 130 8.33333333333333e+00
+143 142 -1.66666666666667e+01
+143 129 8.33333333333333e+00
+143 147 -8.33333333333333e+00
+143 141 -1.66666666666667e+01
+143 370 8.33333333333333e+00
+143 381 -8.33333333333333e+00
+143 375 8.33333333333333e+00
+143 148 1.66666666666667e+01
+143 376 -1.66666666666667e+01
+143 371 -3.75000000000000e+01
+143 61 4.16666666666667e+00
+143 382 -8.33333333333333e+00
+143 369 8.33333333333333e+00
+143 60 -8.33333333333333e+00
+143 140 -1.25000000000000e+01
+143 160 -4.16666666666667e+00
+143 149 -2.50000000000000e+01
+143 139 -4.16666666666667e+00
+143 4 4.16666666666667e+00
+143 138 8.33333333333333e+00
+143 3 -8.33333333333333e+00
+144 144 2.50000000000000e+02
+144 301 -1.66666666666667e+01
+144 149 1.66666666666667e+01
+144 377 -1.66666666666667e+01
+144 439 -8.33333333333333e+00
+144 376 8.33333333333333e+00
+144 440 -8.33333333333333e+00
+144 148 1.66666666666667e+01
+144 147 -7.50000000000000e+01
+144 134 1.66666666666667e+01
+144 115 8.33333333333333e+00
+144 133 -8.33333333333333e+00
+144 116 -1.66666666666667e+01
+144 5 8.33333333333333e+00
+144 132 -2.50000000000000e+01
+144 299 -8.33333333333333e+00
+144 86 8.33333333333333e+00
+144 145 -3.33333333333333e+01
+144 298 1.66666666666667e+01
+144 297 -2.50000000000000e+01
+144 140 -8.33333333333333e+00
+144 139 1.66666666666667e+01
+144 110 -8.33333333333333e+00
+144 122 8.33333333333333e+00
+144 127 1.66666666666667e+01
+144 121 -1.66666666666667e+01
+144 4 8.33333333333333e+00
+144 109 -8.33333333333333e+00
+144 138 -2.50000000000000e+01
+144 146 -3.33333333333333e+01
+144 374 1.66666666666667e+01
+144 128 1.66666666666667e+01
+144 373 -8.33333333333333e+00
+144 85 8.33333333333333e+00
+144 302 8.33333333333333e+00
+144 372 -2.50000000000000e+01
+144 126 -7.50000000000000e+01
+145 145 2.50000000000000e+02
+145 300 -1.66666666666667e+01
+145 149 -8.33333333333333e+00
+145 440 -8.33333333333333e+00
+145 377 8.33333333333333e+00
+145 438 -8.33333333333333e+00
+145 375 8.33333333333333e+00
+145 148 -2.50000000000000e+01
+145 147 1.66666666666667e+01
+145 114 8.33333333333333e+00
+145 132 -8.33333333333333e+00
+145 116 8.33333333333333e+00
+145 134 1.66666666666667e+01
+145 133 -2.50000000000000e+01
+145 299 1.66666666666667e+01
+145 298 -7.50000000000000e+01
+145 144 -3.33333333333333e+01
+145 297 1.66666666666667e+01
+145 128 -8.33333333333333e+00
+145 146 -3.33333333333333e+01
+145 110 -8.33333333333333e+00
+145 122 8.33333333333333e+00
+145 138 1.66666666666667e+01
+145 126 1.66666666666667e+01
+145 120 -1.66666666666667e+01
+145 5 -1.66666666666667e+01
+145 140 1.66666666666667e+01
+145 139 -7.50000000000000e+01
+145 3 8.33333333333333e+00
+145 108 -8.33333333333333e+00
+145 374 1.66666666666667e+01
+145 86 -1.66666666666667e+01
+145 302 8.33333333333333e+00
+145 373 -2.50000000000000e+01
+145 127 -2.50000000000000e+01
+145 372 -8.33333333333333e+00
+145 84 8.33333333333333e+00
+146 146 2.50000000000000e+02
+146 301 8.33333333333333e+00
+146 148 -8.33333333333333e+00
+146 439 -8.33333333333333e+00
+146 376 8.33333333333333e+00
+146 147 1.66666666666667e+01
+146 375 -1.66666666666667e+01
+146 438 -8.33333333333333e+00
+146 149 -2.50000000000000e+01
+146 132 1.66666666666667e+01
+146 115 8.33333333333333e+00
+146 114 -1.66666666666667e+01
+146 134 -7.50000000000000e+01
+146 133 1.66666666666667e+01
+146 3 8.33333333333333e+00
+146 299 -2.50000000000000e+01
+146 298 1.66666666666667e+01
+146 297 -8.33333333333333e+00
+146 84 8.33333333333333e+00
+146 127 -8.33333333333333e+00
+146 145 -3.33333333333333e+01
+146 138 -8.33333333333333e+00
+146 109 -8.33333333333333e+00
+146 121 8.33333333333333e+00
+146 108 -8.33333333333333e+00
+146 120 8.33333333333333e+00
+146 140 -2.50000000000000e+01
+146 4 -1.66666666666667e+01
+146 139 1.66666666666667e+01
+146 300 8.33333333333333e+00
+146 374 -7.50000000000000e+01
+146 128 -2.50000000000000e+01
+146 373 1.66666666666667e+01
+146 85 -1.66666666666667e+01
+146 144 -3.33333333333333e+01
+146 372 1.66666666666667e+01
+146 126 1.66666666666667e+01
+147 147 2.50000000000000e+02
+147 301 1.66666666666667e+01
+147 300 -2.50000000000000e+01
+147 134 -1.66666666666667e+01
+147 133 8.33333333333333e+00
+147 146 1.66666666666667e+01
+147 439 8.33333333333333e+00
+147 145 1.66666666666667e+01
+147 144 -7.50000000000000e+01
+147 440 8.33333333333333e+00
+147 136 -8.33333333333333e+00
+147 137 1.66666666666667e+01
+147 149 -3.33333333333333e+01
+147 5 -8.33333333333333e+00
+147 135 -2.50000000000000e+01
+147 308 8.33333333333333e+00
+147 89 -8.33333333333333e+00
+147 307 -1.66666666666667e+01
+147 131 8.33333333333333e+00
+147 166 1.66666666666667e+01
+147 148 -3.33333333333333e+01
+147 167 1.66666666666667e+01
+147 88 -8.33333333333333e+00
+147 165 -7.50000000000000e+01
+147 130 8.33333333333333e+00
+147 4 -8.33333333333333e+00
+147 143 -8.33333333333333e+00
+147 140 8.33333333333333e+00
+147 382 8.33333333333333e+00
+147 376 -8.33333333333333e+00
+147 139 -1.66666666666667e+01
+147 142 1.66666666666667e+01
+147 141 -2.50000000000000e+01
+147 377 1.66666666666667e+01
+147 383 -1.66666666666667e+01
+147 375 -2.50000000000000e+01
+147 302 -8.33333333333333e+00
+148 148 2.50000000000000e+02
+148 300 1.66666666666667e+01
+148 302 1.66666666666667e+01
+148 301 -7.50000000000000e+01
+148 132 8.33333333333333e+00
+148 146 -8.33333333333333e+00
+148 438 8.33333333333333e+00
+148 145 -2.50000000000000e+01
+148 144 1.66666666666667e+01
+148 440 -1.66666666666667e+01
+148 135 -8.33333333333333e+00
+148 308 8.33333333333333e+00
+148 137 1.66666666666667e+01
+148 136 -2.50000000000000e+01
+148 306 -1.66666666666667e+01
+148 167 -8.33333333333333e+00
+148 165 1.66666666666667e+01
+148 147 -3.33333333333333e+01
+148 166 -2.50000000000000e+01
+148 87 -8.33333333333333e+00
+148 131 -1.66666666666667e+01
+148 129 8.33333333333333e+00
+148 3 -8.33333333333333e+00
+148 143 1.66666666666667e+01
+148 149 -3.33333333333333e+01
+148 377 1.66666666666667e+01
+148 381 8.33333333333333e+00
+148 375 -8.33333333333333e+00
+148 140 8.33333333333333e+00
+148 5 -8.33333333333333e+00
+148 142 -7.50000000000000e+01
+148 138 -1.66666666666667e+01
+148 141 1.66666666666667e+01
+148 383 8.33333333333333e+00
+148 89 -8.33333333333333e+00
+148 376 -2.50000000000000e+01
+148 134 8.33333333333333e+00
+149 149 2.50000000000000e+02
+149 133 8.33333333333333e+00
+149 302 -2.50000000000000e+01
+149 301 1.66666666666667e+01
+149 132 -1.66666666666667e+01
+149 145 -8.33333333333333e+00
+149 144 1.66666666666667e+01
+149 146 -2.50000000000000e+01
+149 439 -1.66666666666667e+01
+149 438 8.33333333333333e+00
+149 307 8.33333333333333e+00
+149 135 1.66666666666667e+01
+149 147 -3.33333333333333e+01
+149 137 -7.50000000000000e+01
+149 136 1.66666666666667e+01
+149 3 -8.33333333333333e+00
+149 306 8.33333333333333e+00
+149 87 -8.33333333333333e+00
+149 166 -8.33333333333333e+00
+149 129 8.33333333333333e+00
+149 167 -2.50000000000000e+01
+149 165 1.66666666666667e+01
+149 130 -1.66666666666667e+01
+149 141 -8.33333333333333e+00
+149 138 8.33333333333333e+00
+149 142 1.66666666666667e+01
+149 148 -3.33333333333333e+01
+149 376 1.66666666666667e+01
+149 143 -2.50000000000000e+01
+149 139 8.33333333333333e+00
+149 4 -8.33333333333333e+00
+149 377 -7.50000000000000e+01
+149 300 -8.33333333333333e+00
+149 382 8.33333333333333e+00
+149 88 -8.33333333333333e+00
+149 375 1.66666666666667e+01
+149 381 -1.66666666666667e+01
+150 150 7.50000000000000e+01
+150 10 4.16666666666667e+00
+150 175 -8.33333333333333e+00
+150 158 -4.16666666666667e+00
+150 151 -8.33333333333333e+00
+150 157 8.33333333333333e+00
+150 7 4.16666666666667e+00
+150 156 -1.25000000000000e+01
+150 188 -8.33333333333333e+00
+150 170 8.33333333333333e+00
+150 11 4.16666666666667e+00
+150 182 -8.33333333333333e+00
+150 181 4.16666666666667e+00
+150 187 -8.33333333333333e+00
+150 9 -2.50000000000000e+01
+150 152 -8.33333333333333e+00
+150 164 8.33333333333333e+00
+150 8 4.16666666666667e+00
+150 163 -4.16666666666667e+00
+150 169 8.33333333333333e+00
+150 176 4.16666666666667e+00
+150 162 -1.25000000000000e+01
+150 6 -2.50000000000000e+01
+151 151 6.66666666666667e+01
+151 9 4.16666666666667e+00
+151 174 -8.33333333333333e+00
+151 158 8.33333333333333e+00
+151 157 -3.75000000000000e+01
+151 150 -8.33333333333333e+00
+151 156 8.33333333333333e+00
+151 6 4.16666666666667e+00
+151 182 4.16666666666667e+00
+151 188 -8.33333333333333e+00
+151 10 -8.33333333333333e+00
+151 180 4.16666666666667e+00
+151 186 -8.33333333333333e+00
+151 164 8.33333333333333e+00
+151 170 -1.66666666666667e+01
+151 176 4.16666666666667e+00
+151 163 -1.25000000000000e+01
+151 7 -8.33333333333333e+00
+151 162 -4.16666666666667e+00
+151 168 8.33333333333333e+00
+152 152 6.66666666666667e+01
+152 174 4.16666666666667e+00
+152 158 -1.25000000000000e+01
+152 157 8.33333333333333e+00
+152 156 -4.16666666666667e+00
+152 181 4.16666666666667e+00
+152 187 -8.33333333333333e+00
+152 186 -8.33333333333333e+00
+152 168 8.33333333333333e+00
+152 11 -8.33333333333333e+00
+152 9 4.16666666666667e+00
+152 180 -8.33333333333333e+00
+152 175 4.16666666666667e+00
+152 164 -3.75000000000000e+01
+152 8 -8.33333333333333e+00
+152 163 8.33333333333333e+00
+152 169 -1.66666666666667e+01
+152 150 -8.33333333333333e+00
+152 162 8.33333333333333e+00
+152 6 4.16666666666667e+00
+153 153 1.25000000000000e+02
+153 304 -8.33333333333333e+00
+153 158 8.33333333333333e+00
+153 157 8.33333333333333e+00
+153 156 -3.75000000000000e+01
+153 311 -8.33333333333333e+00
+153 310 -8.33333333333333e+00
+153 170 -1.66666666666667e+01
+153 169 8.33333333333333e+00
+153 137 8.33333333333333e+00
+153 155 -1.66666666666667e+01
+153 167 1.66666666666667e+01
+153 307 8.33333333333333e+00
+153 166 -8.33333333333333e+00
+153 8 -4.16666666666667e+00
+153 131 4.16666666666667e+00
+153 7 8.33333333333333e+00
+153 130 -8.33333333333333e+00
+153 6 -1.25000000000000e+01
+153 165 -2.50000000000000e+01
+153 35 -4.16666666666667e+00
+153 308 8.33333333333333e+00
+153 154 -1.66666666666667e+01
+153 34 8.33333333333333e+00
+153 136 8.33333333333333e+00
+153 305 4.16666666666667e+00
+153 33 -1.25000000000000e+01
+153 135 -3.75000000000000e+01
+154 154 1.25000000000000e+02
+154 303 -8.33333333333333e+00
+154 158 -4.16666666666667e+00
+154 157 -1.25000000000000e+01
+154 156 8.33333333333333e+00
+154 311 -8.33333333333333e+00
+154 170 8.33333333333333e+00
+154 309 -8.33333333333333e+00
+154 168 8.33333333333333e+00
+154 137 -4.16666666666667e+00
+154 131 4.16666666666667e+00
+154 306 8.33333333333333e+00
+154 165 -8.33333333333333e+00
+154 8 8.33333333333333e+00
+154 155 -1.66666666666667e+01
+154 167 1.66666666666667e+01
+154 7 -3.75000000000000e+01
+154 166 -2.50000000000000e+01
+154 6 8.33333333333333e+00
+154 129 -8.33333333333333e+00
+154 35 8.33333333333333e+00
+154 308 -1.66666666666667e+01
+154 305 4.16666666666667e+00
+154 34 -3.75000000000000e+01
+154 136 -1.25000000000000e+01
+154 153 -1.66666666666667e+01
+154 33 8.33333333333333e+00
+154 135 8.33333333333333e+00
+155 155 1.25000000000000e+02
+155 304 4.16666666666667e+00
+155 158 -1.25000000000000e+01
+155 157 -4.16666666666667e+00
+155 156 8.33333333333333e+00
+155 309 -8.33333333333333e+00
+155 310 -8.33333333333333e+00
+155 169 8.33333333333333e+00
+155 168 -1.66666666666667e+01
+155 136 -4.16666666666667e+00
+155 130 4.16666666666667e+00
+155 135 8.33333333333333e+00
+155 153 -1.66666666666667e+01
+155 165 1.66666666666667e+01
+155 8 -1.25000000000000e+01
+155 167 -7.50000000000000e+01
+155 7 8.33333333333333e+00
+155 154 -1.66666666666667e+01
+155 166 1.66666666666667e+01
+155 6 -4.16666666666667e+00
+155 129 4.16666666666667e+00
+155 303 4.16666666666667e+00
+155 35 -1.25000000000000e+01
+155 137 -1.25000000000000e+01
+155 34 8.33333333333333e+00
+155 307 -1.66666666666667e+01
+155 33 -4.16666666666667e+00
+155 306 8.33333333333333e+00
+156 156 1.25000000000000e+02
+156 310 8.33333333333333e+00
+156 311 8.33333333333333e+00
+156 304 8.33333333333333e+00
+156 303 -1.25000000000000e+01
+156 158 -1.66666666666667e+01
+156 155 8.33333333333333e+00
+156 154 8.33333333333333e+00
+156 153 -3.75000000000000e+01
+156 169 -8.33333333333333e+00
+156 157 -1.66666666666667e+01
+156 176 8.33333333333333e+00
+156 316 -8.33333333333333e+00
+156 187 8.33333333333333e+00
+156 170 1.66666666666667e+01
+156 188 -1.66666666666667e+01
+156 38 4.16666666666667e+00
+156 317 -8.33333333333333e+00
+156 175 8.33333333333333e+00
+156 37 -8.33333333333333e+00
+156 174 -3.75000000000000e+01
+156 152 -4.16666666666667e+00
+156 8 4.16666666666667e+00
+156 151 8.33333333333333e+00
+156 7 -8.33333333333333e+00
+156 150 -1.25000000000000e+01
+156 305 -4.16666666666667e+00
+156 168 -2.50000000000000e+01
+157 157 1.25000000000000e+02
+157 309 8.33333333333333e+00
+157 311 -1.66666666666667e+01
+157 38 4.16666666666667e+00
+157 304 -3.75000000000000e+01
+157 303 8.33333333333333e+00
+157 155 -4.16666666666667e+00
+157 8 4.16666666666667e+00
+157 154 -1.25000000000000e+01
+157 153 8.33333333333333e+00
+157 168 -8.33333333333333e+00
+157 176 -4.16666666666667e+00
+157 156 -1.66666666666667e+01
+157 315 -8.33333333333333e+00
+157 186 8.33333333333333e+00
+157 317 -8.33333333333333e+00
+157 188 8.33333333333333e+00
+157 175 -1.25000000000000e+01
+157 174 8.33333333333333e+00
+157 36 -8.33333333333333e+00
+157 152 8.33333333333333e+00
+157 158 -1.66666666666667e+01
+157 170 1.66666666666667e+01
+157 151 -3.75000000000000e+01
+157 305 8.33333333333333e+00
+157 169 -2.50000000000000e+01
+157 150 8.33333333333333e+00
+157 6 -8.33333333333333e+00
+158 158 1.25000000000000e+02
+158 304 8.33333333333333e+00
+158 310 -1.66666666666667e+01
+158 309 8.33333333333333e+00
+158 305 -1.25000000000000e+01
+158 37 4.16666666666667e+00
+158 155 -1.25000000000000e+01
+158 154 -4.16666666666667e+00
+158 7 4.16666666666667e+00
+158 156 -1.66666666666667e+01
+158 153 8.33333333333333e+00
+158 175 -4.16666666666667e+00
+158 174 8.33333333333333e+00
+158 316 -8.33333333333333e+00
+158 187 8.33333333333333e+00
+158 168 1.66666666666667e+01
+158 186 -1.66666666666667e+01
+158 176 -1.25000000000000e+01
+158 36 4.16666666666667e+00
+158 315 -8.33333333333333e+00
+158 152 -1.25000000000000e+01
+158 303 -4.16666666666667e+00
+158 170 -7.50000000000000e+01
+158 151 8.33333333333333e+00
+158 157 -1.66666666666667e+01
+158 169 1.66666666666667e+01
+158 150 -4.16666666666667e+00
+158 6 4.16666666666667e+00
+159 159 1.25000000000000e+02
+159 386 -8.33333333333333e+00
+159 379 4.16666666666667e+00
+159 385 -8.33333333333333e+00
+159 380 -8.33333333333333e+00
+159 164 8.33333333333333e+00
+159 163 8.33333333333333e+00
+159 169 -1.66666666666667e+01
+159 162 -3.75000000000000e+01
+159 383 8.33333333333333e+00
+159 167 -8.33333333333333e+00
+159 160 -1.66666666666667e+01
+159 166 1.66666666666667e+01
+159 142 8.33333333333333e+00
+159 8 8.33333333333333e+00
+159 131 -8.33333333333333e+00
+159 7 -4.16666666666667e+00
+159 130 4.16666666666667e+00
+159 6 -1.25000000000000e+01
+159 165 -2.50000000000000e+01
+159 161 -1.66666666666667e+01
+159 62 8.33333333333333e+00
+159 143 8.33333333333333e+00
+159 61 -4.16666666666667e+00
+159 382 8.33333333333333e+00
+159 170 8.33333333333333e+00
+159 60 -1.25000000000000e+01
+159 141 -3.75000000000000e+01
+160 160 1.25000000000000e+02
+160 384 -8.33333333333333e+00
+160 380 4.16666666666667e+00
+160 386 -8.33333333333333e+00
+160 164 -4.16666666666667e+00
+160 170 8.33333333333333e+00
+160 163 -1.25000000000000e+01
+160 162 8.33333333333333e+00
+160 168 -1.66666666666667e+01
+160 131 4.16666666666667e+00
+160 143 -4.16666666666667e+00
+160 159 -1.66666666666667e+01
+160 165 1.66666666666667e+01
+160 141 8.33333333333333e+00
+160 8 8.33333333333333e+00
+160 161 -1.66666666666667e+01
+160 167 1.66666666666667e+01
+160 7 -1.25000000000000e+01
+160 166 -7.50000000000000e+01
+160 6 -4.16666666666667e+00
+160 129 4.16666666666667e+00
+160 62 8.33333333333333e+00
+160 383 -1.66666666666667e+01
+160 378 4.16666666666667e+00
+160 61 -1.25000000000000e+01
+160 142 -1.25000000000000e+01
+160 60 -4.16666666666667e+00
+160 381 8.33333333333333e+00
+161 161 1.25000000000000e+02
+161 384 -8.33333333333333e+00
+161 379 4.16666666666667e+00
+161 385 -8.33333333333333e+00
+161 378 -8.33333333333333e+00
+161 164 -1.25000000000000e+01
+161 163 -4.16666666666667e+00
+161 169 8.33333333333333e+00
+161 162 8.33333333333333e+00
+161 381 8.33333333333333e+00
+161 165 -8.33333333333333e+00
+161 130 4.16666666666667e+00
+161 142 -4.16666666666667e+00
+161 8 -3.75000000000000e+01
+161 167 -2.50000000000000e+01
+161 7 8.33333333333333e+00
+161 160 -1.66666666666667e+01
+161 166 1.66666666666667e+01
+161 6 8.33333333333333e+00
+161 129 -8.33333333333333e+00
+161 168 8.33333333333333e+00
+161 62 -3.75000000000000e+01
+161 143 -1.25000000000000e+01
+161 61 8.33333333333333e+00
+161 382 -1.66666666666667e+01
+161 159 -1.66666666666667e+01
+161 60 8.33333333333333e+00
+161 141 8.33333333333333e+00
+162 162 1.25000000000000e+02
+162 188 8.33333333333333e+00
+162 187 -1.66666666666667e+01
+162 182 8.33333333333333e+00
+162 64 4.16666666666667e+00
+162 180 -3.75000000000000e+01
+162 152 8.33333333333333e+00
+162 151 -4.16666666666667e+00
+162 7 4.16666666666667e+00
+162 150 -1.25000000000000e+01
+162 170 -8.33333333333333e+00
+162 164 -1.66666666666667e+01
+162 379 -4.16666666666667e+00
+162 392 -8.33333333333333e+00
+162 386 8.33333333333333e+00
+162 391 -8.33333333333333e+00
+162 385 8.33333333333333e+00
+162 380 8.33333333333333e+00
+162 65 -8.33333333333333e+00
+162 378 -1.25000000000000e+01
+162 161 8.33333333333333e+00
+162 8 -8.33333333333333e+00
+162 160 8.33333333333333e+00
+162 163 -1.66666666666667e+01
+162 169 1.66666666666667e+01
+162 159 -3.75000000000000e+01
+162 181 8.33333333333333e+00
+162 168 -2.50000000000000e+01
+163 163 1.25000000000000e+02
+163 188 8.33333333333333e+00
+163 180 8.33333333333333e+00
+163 186 -1.66666666666667e+01
+163 181 -1.25000000000000e+01
+163 63 4.16666666666667e+00
+163 152 8.33333333333333e+00
+163 164 -1.66666666666667e+01
+163 151 -1.25000000000000e+01
+163 150 -4.16666666666667e+00
+163 6 4.16666666666667e+00
+163 378 -4.16666666666667e+00
+163 380 8.33333333333333e+00
+163 170 1.66666666666667e+01
+163 386 -1.66666666666667e+01
+163 390 -8.33333333333333e+00
+163 384 8.33333333333333e+00
+163 65 4.16666666666667e+00
+163 392 -8.33333333333333e+00
+163 379 -1.25000000000000e+01
+163 161 -4.16666666666667e+00
+163 8 4.16666666666667e+00
+163 160 -1.25000000000000e+01
+163 182 -4.16666666666667e+00
+163 169 -7.50000000000000e+01
+163 159 8.33333333333333e+00
+163 162 -1.66666666666667e+01
+163 168 1.66666666666667e+01
+164 164 1.25000000000000e+02
+164 187 8.33333333333333e+00
+164 186 8.33333333333333e+00
+164 182 -1.25000000000000e+01
+164 180 8.33333333333333e+00
+164 152 -3.75000000000000e+01
+164 151 8.33333333333333e+00
+164 163 -1.66666666666667e+01
+164 150 8.33333333333333e+00
+164 168 -8.33333333333333e+00
+164 162 -1.66666666666667e+01
+164 379 8.33333333333333e+00
+164 390 -8.33333333333333e+00
+164 384 8.33333333333333e+00
+164 169 1.66666666666667e+01
+164 385 -1.66666666666667e+01
+164 380 -3.75000000000000e+01
+164 64 4.16666666666667e+00
+164 391 -8.33333333333333e+00
+164 378 8.33333333333333e+00
+164 63 -8.33333333333333e+00
+164 161 -1.25000000000000e+01
+164 181 -4.16666666666667e+00
+164 170 -2.50000000000000e+01
+164 160 -4.16666666666667e+00
+164 7 4.16666666666667e+00
+164 159 8.33333333333333e+00
+164 6 -8.33333333333333e+00
+165 165 2.50000000000000e+02
+165 310 -1.66666666666667e+01
+165 170 1.66666666666667e+01
+165 386 -1.66666666666667e+01
+165 442 -8.33333333333333e+00
+165 385 8.33333333333333e+00
+165 443 -8.33333333333333e+00
+165 169 1.66666666666667e+01
+165 168 -7.50000000000000e+01
+165 155 1.66666666666667e+01
+165 136 8.33333333333333e+00
+165 154 -8.33333333333333e+00
+165 137 -1.66666666666667e+01
+165 8 8.33333333333333e+00
+165 153 -2.50000000000000e+01
+165 308 -8.33333333333333e+00
+165 89 8.33333333333333e+00
+165 166 -3.33333333333333e+01
+165 307 1.66666666666667e+01
+165 306 -2.50000000000000e+01
+165 161 -8.33333333333333e+00
+165 160 1.66666666666667e+01
+165 131 -8.33333333333333e+00
+165 143 8.33333333333333e+00
+165 148 1.66666666666667e+01
+165 142 -1.66666666666667e+01
+165 7 8.33333333333333e+00
+165 130 -8.33333333333333e+00
+165 159 -2.50000000000000e+01
+165 167 -3.33333333333333e+01
+165 383 1.66666666666667e+01
+165 149 1.66666666666667e+01
+165 382 -8.33333333333333e+00
+165 88 8.33333333333333e+00
+165 311 8.33333333333333e+00
+165 381 -2.50000000000000e+01
+165 147 -7.50000000000000e+01
+166 166 2.50000000000000e+02
+166 309 -1.66666666666667e+01
+166 170 -8.33333333333333e+00
+166 443 -8.33333333333333e+00
+166 386 8.33333333333333e+00
+166 441 -8.33333333333333e+00
+166 384 8.33333333333333e+00
+166 169 -2.50000000000000e+01
+166 168 1.66666666666667e+01
+166 135 8.33333333333333e+00
+166 153 -8.33333333333333e+00
+166 137 8.33333333333333e+00
+166 155 1.66666666666667e+01
+166 154 -2.50000000000000e+01
+166 308 1.66666666666667e+01
+166 307 -7.50000000000000e+01
+166 165 -3.33333333333333e+01
+166 306 1.66666666666667e+01
+166 149 -8.33333333333333e+00
+166 167 -3.33333333333333e+01
+166 131 -8.33333333333333e+00
+166 143 8.33333333333333e+00
+166 159 1.66666666666667e+01
+166 147 1.66666666666667e+01
+166 141 -1.66666666666667e+01
+166 8 -1.66666666666667e+01
+166 161 1.66666666666667e+01
+166 160 -7.50000000000000e+01
+166 6 8.33333333333333e+00
+166 129 -8.33333333333333e+00
+166 383 1.66666666666667e+01
+166 89 -1.66666666666667e+01
+166 311 8.33333333333333e+00
+166 382 -2.50000000000000e+01
+166 148 -2.50000000000000e+01
+166 381 -8.33333333333333e+00
+166 87 8.33333333333333e+00
+167 167 2.50000000000000e+02
+167 310 8.33333333333333e+00
+167 169 -8.33333333333333e+00
+167 442 -8.33333333333333e+00
+167 385 8.33333333333333e+00
+167 168 1.66666666666667e+01
+167 384 -1.66666666666667e+01
+167 441 -8.33333333333333e+00
+167 170 -2.50000000000000e+01
+167 153 1.66666666666667e+01
+167 136 8.33333333333333e+00
+167 135 -1.66666666666667e+01
+167 155 -7.50000000000000e+01
+167 154 1.66666666666667e+01
+167 6 8.33333333333333e+00
+167 308 -2.50000000000000e+01
+167 307 1.66666666666667e+01
+167 306 -8.33333333333333e+00
+167 87 8.33333333333333e+00
+167 148 -8.33333333333333e+00
+167 166 -3.33333333333333e+01
+167 159 -8.33333333333333e+00
+167 130 -8.33333333333333e+00
+167 142 8.33333333333333e+00
+167 129 -8.33333333333333e+00
+167 141 8.33333333333333e+00
+167 161 -2.50000000000000e+01
+167 7 -1.66666666666667e+01
+167 160 1.66666666666667e+01
+167 309 8.33333333333333e+00
+167 383 -7.50000000000000e+01
+167 149 -2.50000000000000e+01
+167 382 1.66666666666667e+01
+167 88 -1.66666666666667e+01
+167 165 -3.33333333333333e+01
+167 381 1.66666666666667e+01
+167 147 1.66666666666667e+01
+168 168 2.50000000000000e+02
+168 310 1.66666666666667e+01
+168 309 -2.50000000000000e+01
+168 155 -1.66666666666667e+01
+168 154 8.33333333333333e+00
+168 167 1.66666666666667e+01
+168 442 8.33333333333333e+00
+168 166 1.66666666666667e+01
+168 165 -7.50000000000000e+01
+168 443 8.33333333333333e+00
+168 157 -8.33333333333333e+00
+168 158 1.66666666666667e+01
+168 170 -3.33333333333333e+01
+168 8 -8.33333333333333e+00
+168 156 -2.50000000000000e+01
+168 317 8.33333333333333e+00
+168 92 -8.33333333333333e+00
+168 316 -1.66666666666667e+01
+168 152 8.33333333333333e+00
+168 187 1.66666666666667e+01
+168 169 -3.33333333333333e+01
+168 188 1.66666666666667e+01
+168 91 -8.33333333333333e+00
+168 186 -7.50000000000000e+01
+168 151 8.33333333333333e+00
+168 7 -8.33333333333333e+00
+168 164 -8.33333333333333e+00
+168 161 8.33333333333333e+00
+168 391 8.33333333333333e+00
+168 385 -8.33333333333333e+00
+168 160 -1.66666666666667e+01
+168 163 1.66666666666667e+01
+168 162 -2.50000000000000e+01
+168 386 1.66666666666667e+01
+168 392 -1.66666666666667e+01
+168 384 -2.50000000000000e+01
+168 311 -8.33333333333333e+00
+169 169 2.50000000000000e+02
+169 309 1.66666666666667e+01
+169 311 1.66666666666667e+01
+169 310 -7.50000000000000e+01
+169 153 8.33333333333333e+00
+169 167 -8.33333333333333e+00
+169 441 8.33333333333333e+00
+169 166 -2.50000000000000e+01
+169 165 1.66666666666667e+01
+169 443 -1.66666666666667e+01
+169 156 -8.33333333333333e+00
+169 317 8.33333333333333e+00
+169 158 1.66666666666667e+01
+169 157 -2.50000000000000e+01
+169 315 -1.66666666666667e+01
+169 188 -8.33333333333333e+00
+169 186 1.66666666666667e+01
+169 168 -3.33333333333333e+01
+169 187 -2.50000000000000e+01
+169 90 -8.33333333333333e+00
+169 152 -1.66666666666667e+01
+169 150 8.33333333333333e+00
+169 6 -8.33333333333333e+00
+169 164 1.66666666666667e+01
+169 170 -3.33333333333333e+01
+169 386 1.66666666666667e+01
+169 390 8.33333333333333e+00
+169 384 -8.33333333333333e+00
+169 161 8.33333333333333e+00
+169 8 -8.33333333333333e+00
+169 163 -7.50000000000000e+01
+169 159 -1.66666666666667e+01
+169 162 1.66666666666667e+01
+169 392 8.33333333333333e+00
+169 92 -8.33333333333333e+00
+169 385 -2.50000000000000e+01
+169 155 8.33333333333333e+00
+170 170 2.50000000000000e+02
+170 154 8.33333333333333e+00
+170 311 -2.50000000000000e+01
+170 310 1.66666666666667e+01
+170 153 -1.66666666666667e+01
+170 166 -8.33333333333333e+00
+170 165 1.66666666666667e+01
+170 167 -2.50000000000000e+01
+170 442 -1.66666666666667e+01
+170 441 8.33333333333333e+00
+170 316 8.33333333333333e+00
+170 156 1.66666666666667e+01
+170 168 -3.33333333333333e+01
+170 158 -7.50000000000000e+01
+170 157 1.66666666666667e+01
+170 6 -8.33333333333333e+00
+170 315 8.33333333333333e+00
+170 90 -8.33333333333333e+00
+170 187 -8.33333333333333e+00
+170 150 8.33333333333333e+00
+170 188 -2.50000000000000e+01
+170 186 1.66666666666667e+01
+170 151 -1.66666666666667e+01
+170 162 -8.33333333333333e+00
+170 159 8.33333333333333e+00
+170 163 1.66666666666667e+01
+170 169 -3.33333333333333e+01
+170 385 1.66666666666667e+01
+170 164 -2.50000000000000e+01
+170 160 8.33333333333333e+00
+170 7 -8.33333333333333e+00
+170 386 -7.50000000000000e+01
+170 309 -8.33333333333333e+00
+170 391 8.33333333333333e+00
+170 91 -8.33333333333333e+00
+170 384 1.66666666666667e+01
+170 390 -1.66666666666667e+01
+171 171 7.50000000000000e+01
+171 13 4.16666666666667e+00
+171 196 -8.33333333333333e+00
+171 179 -4.16666666666667e+00
+171 172 -8.33333333333333e+00
+171 178 8.33333333333333e+00
+171 10 4.16666666666667e+00
+171 177 -1.25000000000000e+01
+171 209 -8.33333333333333e+00
+171 191 8.33333333333333e+00
+171 14 4.16666666666667e+00
+171 203 -8.33333333333333e+00
+171 202 4.16666666666667e+00
+171 208 -8.33333333333333e+00
+171 12 -2.50000000000000e+01
+171 173 -8.33333333333333e+00
+171 185 8.33333333333333e+00
+171 11 4.16666666666667e+00
+171 184 -4.16666666666667e+00
+171 190 8.33333333333333e+00
+171 197 4.16666666666667e+00
+171 183 -1.25000000000000e+01
+171 9 -2.50000000000000e+01
+172 172 6.66666666666667e+01
+172 12 4.16666666666667e+00
+172 195 -8.33333333333333e+00
+172 179 8.33333333333333e+00
+172 178 -3.75000000000000e+01
+172 171 -8.33333333333333e+00
+172 177 8.33333333333333e+00
+172 9 4.16666666666667e+00
+172 203 4.16666666666667e+00
+172 209 -8.33333333333333e+00
+172 13 -8.33333333333333e+00
+172 201 4.16666666666667e+00
+172 207 -8.33333333333333e+00
+172 185 8.33333333333333e+00
+172 191 -1.66666666666667e+01
+172 197 4.16666666666667e+00
+172 184 -1.25000000000000e+01
+172 10 -8.33333333333333e+00
+172 183 -4.16666666666667e+00
+172 189 8.33333333333333e+00
+173 173 6.66666666666667e+01
+173 195 4.16666666666667e+00
+173 179 -1.25000000000000e+01
+173 178 8.33333333333333e+00
+173 177 -4.16666666666667e+00
+173 202 4.16666666666667e+00
+173 208 -8.33333333333333e+00
+173 207 -8.33333333333333e+00
+173 189 8.33333333333333e+00
+173 14 -8.33333333333333e+00
+173 12 4.16666666666667e+00
+173 201 -8.33333333333333e+00
+173 196 4.16666666666667e+00
+173 185 -3.75000000000000e+01
+173 11 -8.33333333333333e+00
+173 184 8.33333333333333e+00
+173 190 -1.66666666666667e+01
+173 171 -8.33333333333333e+00
+173 183 8.33333333333333e+00
+173 9 4.16666666666667e+00
+174 174 1.25000000000000e+02
+174 313 -8.33333333333333e+00
+174 179 8.33333333333333e+00
+174 178 8.33333333333333e+00
+174 177 -3.75000000000000e+01
+174 320 -8.33333333333333e+00
+174 319 -8.33333333333333e+00
+174 191 -1.66666666666667e+01
+174 190 8.33333333333333e+00
+174 158 8.33333333333333e+00
+174 176 -1.66666666666667e+01
+174 188 1.66666666666667e+01
+174 316 8.33333333333333e+00
+174 187 -8.33333333333333e+00
+174 11 -4.16666666666667e+00
+174 152 4.16666666666667e+00
+174 10 8.33333333333333e+00
+174 151 -8.33333333333333e+00
+174 9 -1.25000000000000e+01
+174 186 -2.50000000000000e+01
+174 38 -4.16666666666667e+00
+174 317 8.33333333333333e+00
+174 175 -1.66666666666667e+01
+174 37 8.33333333333333e+00
+174 157 8.33333333333333e+00
+174 314 4.16666666666667e+00
+174 36 -1.25000000000000e+01
+174 156 -3.75000000000000e+01
+175 175 1.25000000000000e+02
+175 312 -8.33333333333333e+00
+175 179 -4.16666666666667e+00
+175 178 -1.25000000000000e+01
+175 177 8.33333333333333e+00
+175 320 -8.33333333333333e+00
+175 191 8.33333333333333e+00
+175 318 -8.33333333333333e+00
+175 189 8.33333333333333e+00
+175 158 -4.16666666666667e+00
+175 152 4.16666666666667e+00
+175 315 8.33333333333333e+00
+175 186 -8.33333333333333e+00
+175 11 8.33333333333333e+00
+175 176 -1.66666666666667e+01
+175 188 1.66666666666667e+01
+175 10 -3.75000000000000e+01
+175 187 -2.50000000000000e+01
+175 9 8.33333333333333e+00
+175 150 -8.33333333333333e+00
+175 38 8.33333333333333e+00
+175 317 -1.66666666666667e+01
+175 314 4.16666666666667e+00
+175 37 -3.75000000000000e+01
+175 157 -1.25000000000000e+01
+175 174 -1.66666666666667e+01
+175 36 8.33333333333333e+00
+175 156 8.33333333333333e+00
+176 176 1.25000000000000e+02
+176 313 4.16666666666667e+00
+176 179 -1.25000000000000e+01
+176 178 -4.16666666666667e+00
+176 177 8.33333333333333e+00
+176 318 -8.33333333333333e+00
+176 319 -8.33333333333333e+00
+176 190 8.33333333333333e+00
+176 189 -1.66666666666667e+01
+176 157 -4.16666666666667e+00
+176 151 4.16666666666667e+00
+176 156 8.33333333333333e+00
+176 174 -1.66666666666667e+01
+176 186 1.66666666666667e+01
+176 11 -1.25000000000000e+01
+176 188 -7.50000000000000e+01
+176 10 8.33333333333333e+00
+176 175 -1.66666666666667e+01
+176 187 1.66666666666667e+01
+176 9 -4.16666666666667e+00
+176 150 4.16666666666667e+00
+176 312 4.16666666666667e+00
+176 38 -1.25000000000000e+01
+176 158 -1.25000000000000e+01
+176 37 8.33333333333333e+00
+176 316 -1.66666666666667e+01
+176 36 -4.16666666666667e+00
+176 315 8.33333333333333e+00
+177 177 1.25000000000000e+02
+177 319 8.33333333333333e+00
+177 320 8.33333333333333e+00
+177 313 8.33333333333333e+00
+177 312 -1.25000000000000e+01
+177 179 -1.66666666666667e+01
+177 176 8.33333333333333e+00
+177 175 8.33333333333333e+00
+177 174 -3.75000000000000e+01
+177 190 -8.33333333333333e+00
+177 178 -1.66666666666667e+01
+177 197 8.33333333333333e+00
+177 325 -8.33333333333333e+00
+177 208 8.33333333333333e+00
+177 191 1.66666666666667e+01
+177 209 -1.66666666666667e+01
+177 41 4.16666666666667e+00
+177 326 -8.33333333333333e+00
+177 196 8.33333333333333e+00
+177 40 -8.33333333333333e+00
+177 195 -3.75000000000000e+01
+177 173 -4.16666666666667e+00
+177 11 4.16666666666667e+00
+177 172 8.33333333333333e+00
+177 10 -8.33333333333333e+00
+177 171 -1.25000000000000e+01
+177 314 -4.16666666666667e+00
+177 189 -2.50000000000000e+01
+178 178 1.25000000000000e+02
+178 318 8.33333333333333e+00
+178 320 -1.66666666666667e+01
+178 41 4.16666666666667e+00
+178 313 -3.75000000000000e+01
+178 312 8.33333333333333e+00
+178 176 -4.16666666666667e+00
+178 11 4.16666666666667e+00
+178 175 -1.25000000000000e+01
+178 174 8.33333333333333e+00
+178 189 -8.33333333333333e+00
+178 197 -4.16666666666667e+00
+178 177 -1.66666666666667e+01
+178 324 -8.33333333333333e+00
+178 207 8.33333333333333e+00
+178 326 -8.33333333333333e+00
+178 209 8.33333333333333e+00
+178 196 -1.25000000000000e+01
+178 195 8.33333333333333e+00
+178 39 -8.33333333333333e+00
+178 173 8.33333333333333e+00
+178 179 -1.66666666666667e+01
+178 191 1.66666666666667e+01
+178 172 -3.75000000000000e+01
+178 314 8.33333333333333e+00
+178 190 -2.50000000000000e+01
+178 171 8.33333333333333e+00
+178 9 -8.33333333333333e+00
+179 179 1.25000000000000e+02
+179 313 8.33333333333333e+00
+179 319 -1.66666666666667e+01
+179 318 8.33333333333333e+00
+179 314 -1.25000000000000e+01
+179 40 4.16666666666667e+00
+179 176 -1.25000000000000e+01
+179 175 -4.16666666666667e+00
+179 10 4.16666666666667e+00
+179 177 -1.66666666666667e+01
+179 174 8.33333333333333e+00
+179 196 -4.16666666666667e+00
+179 195 8.33333333333333e+00
+179 325 -8.33333333333333e+00
+179 208 8.33333333333333e+00
+179 189 1.66666666666667e+01
+179 207 -1.66666666666667e+01
+179 197 -1.25000000000000e+01
+179 39 4.16666666666667e+00
+179 324 -8.33333333333333e+00
+179 173 -1.25000000000000e+01
+179 312 -4.16666666666667e+00
+179 191 -7.50000000000000e+01
+179 172 8.33333333333333e+00
+179 178 -1.66666666666667e+01
+179 190 1.66666666666667e+01
+179 171 -4.16666666666667e+00
+179 9 4.16666666666667e+00
+180 180 1.25000000000000e+02
+180 395 -8.33333333333333e+00
+180 388 4.16666666666667e+00
+180 394 -8.33333333333333e+00
+180 389 -8.33333333333333e+00
+180 185 8.33333333333333e+00
+180 184 8.33333333333333e+00
+180 190 -1.66666666666667e+01
+180 183 -3.75000000000000e+01
+180 392 8.33333333333333e+00
+180 188 -8.33333333333333e+00
+180 181 -1.66666666666667e+01
+180 187 1.66666666666667e+01
+180 163 8.33333333333333e+00
+180 11 8.33333333333333e+00
+180 152 -8.33333333333333e+00
+180 10 -4.16666666666667e+00
+180 151 4.16666666666667e+00
+180 9 -1.25000000000000e+01
+180 186 -2.50000000000000e+01
+180 182 -1.66666666666667e+01
+180 65 8.33333333333333e+00
+180 164 8.33333333333333e+00
+180 64 -4.16666666666667e+00
+180 391 8.33333333333333e+00
+180 191 8.33333333333333e+00
+180 63 -1.25000000000000e+01
+180 162 -3.75000000000000e+01
+181 181 1.25000000000000e+02
+181 393 -8.33333333333333e+00
+181 389 4.16666666666667e+00
+181 395 -8.33333333333333e+00
+181 185 -4.16666666666667e+00
+181 191 8.33333333333333e+00
+181 184 -1.25000000000000e+01
+181 183 8.33333333333333e+00
+181 189 -1.66666666666667e+01
+181 152 4.16666666666667e+00
+181 164 -4.16666666666667e+00
+181 180 -1.66666666666667e+01
+181 186 1.66666666666667e+01
+181 162 8.33333333333333e+00
+181 11 8.33333333333333e+00
+181 182 -1.66666666666667e+01
+181 188 1.66666666666667e+01
+181 10 -1.25000000000000e+01
+181 187 -7.50000000000000e+01
+181 9 -4.16666666666667e+00
+181 150 4.16666666666667e+00
+181 65 8.33333333333333e+00
+181 392 -1.66666666666667e+01
+181 387 4.16666666666667e+00
+181 64 -1.25000000000000e+01
+181 163 -1.25000000000000e+01
+181 63 -4.16666666666667e+00
+181 390 8.33333333333333e+00
+182 182 1.25000000000000e+02
+182 393 -8.33333333333333e+00
+182 388 4.16666666666667e+00
+182 394 -8.33333333333333e+00
+182 387 -8.33333333333333e+00
+182 185 -1.25000000000000e+01
+182 184 -4.16666666666667e+00
+182 190 8.33333333333333e+00
+182 183 8.33333333333333e+00
+182 390 8.33333333333333e+00
+182 186 -8.33333333333333e+00
+182 151 4.16666666666667e+00
+182 163 -4.16666666666667e+00
+182 11 -3.75000000000000e+01
+182 188 -2.50000000000000e+01
+182 10 8.33333333333333e+00
+182 181 -1.66666666666667e+01
+182 187 1.66666666666667e+01
+182 9 8.33333333333333e+00
+182 150 -8.33333333333333e+00
+182 189 8.33333333333333e+00
+182 65 -3.75000000000000e+01
+182 164 -1.25000000000000e+01
+182 64 8.33333333333333e+00
+182 391 -1.66666666666667e+01
+182 180 -1.66666666666667e+01
+182 63 8.33333333333333e+00
+182 162 8.33333333333333e+00
+183 183 1.25000000000000e+02
+183 209 8.33333333333333e+00
+183 208 -1.66666666666667e+01
+183 203 8.33333333333333e+00
+183 67 4.16666666666667e+00
+183 201 -3.75000000000000e+01
+183 173 8.33333333333333e+00
+183 172 -4.16666666666667e+00
+183 10 4.16666666666667e+00
+183 171 -1.25000000000000e+01
+183 191 -8.33333333333333e+00
+183 185 -1.66666666666667e+01
+183 388 -4.16666666666667e+00
+183 401 -8.33333333333333e+00
+183 395 8.33333333333333e+00
+183 400 -8.33333333333333e+00
+183 394 8.33333333333333e+00
+183 389 8.33333333333333e+00
+183 68 -8.33333333333333e+00
+183 387 -1.25000000000000e+01
+183 182 8.33333333333333e+00
+183 11 -8.33333333333333e+00
+183 181 8.33333333333333e+00
+183 184 -1.66666666666667e+01
+183 190 1.66666666666667e+01
+183 180 -3.75000000000000e+01
+183 202 8.33333333333333e+00
+183 189 -2.50000000000000e+01
+184 184 1.25000000000000e+02
+184 209 8.33333333333333e+00
+184 201 8.33333333333333e+00
+184 207 -1.66666666666667e+01
+184 202 -1.25000000000000e+01
+184 66 4.16666666666667e+00
+184 173 8.33333333333333e+00
+184 185 -1.66666666666667e+01
+184 172 -1.25000000000000e+01
+184 171 -4.16666666666667e+00
+184 9 4.16666666666667e+00
+184 387 -4.16666666666667e+00
+184 389 8.33333333333333e+00
+184 191 1.66666666666667e+01
+184 395 -1.66666666666667e+01
+184 399 -8.33333333333333e+00
+184 393 8.33333333333333e+00
+184 68 4.16666666666667e+00
+184 401 -8.33333333333333e+00
+184 388 -1.25000000000000e+01
+184 182 -4.16666666666667e+00
+184 11 4.16666666666667e+00
+184 181 -1.25000000000000e+01
+184 203 -4.16666666666667e+00
+184 190 -7.50000000000000e+01
+184 180 8.33333333333333e+00
+184 183 -1.66666666666667e+01
+184 189 1.66666666666667e+01
+185 185 1.25000000000000e+02
+185 208 8.33333333333333e+00
+185 207 8.33333333333333e+00
+185 203 -1.25000000000000e+01
+185 201 8.33333333333333e+00
+185 173 -3.75000000000000e+01
+185 172 8.33333333333333e+00
+185 184 -1.66666666666667e+01
+185 171 8.33333333333333e+00
+185 189 -8.33333333333333e+00
+185 183 -1.66666666666667e+01
+185 388 8.33333333333333e+00
+185 399 -8.33333333333333e+00
+185 393 8.33333333333333e+00
+185 190 1.66666666666667e+01
+185 394 -1.66666666666667e+01
+185 389 -3.75000000000000e+01
+185 67 4.16666666666667e+00
+185 400 -8.33333333333333e+00
+185 387 8.33333333333333e+00
+185 66 -8.33333333333333e+00
+185 182 -1.25000000000000e+01
+185 202 -4.16666666666667e+00
+185 191 -2.50000000000000e+01
+185 181 -4.16666666666667e+00
+185 10 4.16666666666667e+00
+185 180 8.33333333333333e+00
+185 9 -8.33333333333333e+00
+186 186 2.50000000000000e+02
+186 319 -1.66666666666667e+01
+186 191 1.66666666666667e+01
+186 395 -1.66666666666667e+01
+186 445 -8.33333333333333e+00
+186 394 8.33333333333333e+00
+186 446 -8.33333333333333e+00
+186 190 1.66666666666667e+01
+186 189 -7.50000000000000e+01
+186 176 1.66666666666667e+01
+186 157 8.33333333333333e+00
+186 175 -8.33333333333333e+00
+186 158 -1.66666666666667e+01
+186 11 8.33333333333333e+00
+186 174 -2.50000000000000e+01
+186 317 -8.33333333333333e+00
+186 92 8.33333333333333e+00
+186 187 -3.33333333333333e+01
+186 316 1.66666666666667e+01
+186 315 -2.50000000000000e+01
+186 182 -8.33333333333333e+00
+186 181 1.66666666666667e+01
+186 152 -8.33333333333333e+00
+186 164 8.33333333333333e+00
+186 169 1.66666666666667e+01
+186 163 -1.66666666666667e+01
+186 10 8.33333333333333e+00
+186 151 -8.33333333333333e+00
+186 180 -2.50000000000000e+01
+186 188 -3.33333333333333e+01
+186 392 1.66666666666667e+01
+186 170 1.66666666666667e+01
+186 391 -8.33333333333333e+00
+186 91 8.33333333333333e+00
+186 320 8.33333333333333e+00
+186 390 -2.50000000000000e+01
+186 168 -7.50000000000000e+01
+187 187 2.50000000000000e+02
+187 318 -1.66666666666667e+01
+187 191 -8.33333333333333e+00
+187 446 -8.33333333333333e+00
+187 395 8.33333333333333e+00
+187 444 -8.33333333333333e+00
+187 393 8.33333333333333e+00
+187 190 -2.50000000000000e+01
+187 189 1.66666666666667e+01
+187 156 8.33333333333333e+00
+187 174 -8.33333333333333e+00
+187 158 8.33333333333333e+00
+187 176 1.66666666666667e+01
+187 175 -2.50000000000000e+01
+187 317 1.66666666666667e+01
+187 316 -7.50000000000000e+01
+187 186 -3.33333333333333e+01
+187 315 1.66666666666667e+01
+187 170 -8.33333333333333e+00
+187 188 -3.33333333333333e+01
+187 152 -8.33333333333333e+00
+187 164 8.33333333333333e+00
+187 180 1.66666666666667e+01
+187 168 1.66666666666667e+01
+187 162 -1.66666666666667e+01
+187 11 -1.66666666666667e+01
+187 182 1.66666666666667e+01
+187 181 -7.50000000000000e+01
+187 9 8.33333333333333e+00
+187 150 -8.33333333333333e+00
+187 392 1.66666666666667e+01
+187 92 -1.66666666666667e+01
+187 320 8.33333333333333e+00
+187 391 -2.50000000000000e+01
+187 169 -2.50000000000000e+01
+187 390 -8.33333333333333e+00
+187 90 8.33333333333333e+00
+188 188 2.50000000000000e+02
+188 319 8.33333333333333e+00
+188 190 -8.33333333333333e+00
+188 445 -8.33333333333333e+00
+188 394 8.33333333333333e+00
+188 189 1.66666666666667e+01
+188 393 -1.66666666666667e+01
+188 444 -8.33333333333333e+00
+188 191 -2.50000000000000e+01
+188 174 1.66666666666667e+01
+188 157 8.33333333333333e+00
+188 156 -1.66666666666667e+01
+188 176 -7.50000000000000e+01
+188 175 1.66666666666667e+01
+188 9 8.33333333333333e+00
+188 317 -2.50000000000000e+01
+188 316 1.66666666666667e+01
+188 315 -8.33333333333333e+00
+188 90 8.33333333333333e+00
+188 169 -8.33333333333333e+00
+188 187 -3.33333333333333e+01
+188 180 -8.33333333333333e+00
+188 151 -8.33333333333333e+00
+188 163 8.33333333333333e+00
+188 150 -8.33333333333333e+00
+188 162 8.33333333333333e+00
+188 182 -2.50000000000000e+01
+188 10 -1.66666666666667e+01
+188 181 1.66666666666667e+01
+188 318 8.33333333333333e+00
+188 392 -7.50000000000000e+01
+188 170 -2.50000000000000e+01
+188 391 1.66666666666667e+01
+188 91 -1.66666666666667e+01
+188 186 -3.33333333333333e+01
+188 390 1.66666666666667e+01
+188 168 1.66666666666667e+01
+189 189 2.50000000000000e+02
+189 319 1.66666666666667e+01
+189 318 -2.50000000000000e+01
+189 176 -1.66666666666667e+01
+189 175 8.33333333333333e+00
+189 188 1.66666666666667e+01
+189 445 8.33333333333333e+00
+189 187 1.66666666666667e+01
+189 186 -7.50000000000000e+01
+189 446 8.33333333333333e+00
+189 178 -8.33333333333333e+00
+189 179 1.66666666666667e+01
+189 191 -3.33333333333333e+01
+189 11 -8.33333333333333e+00
+189 177 -2.50000000000000e+01
+189 326 8.33333333333333e+00
+189 95 -8.33333333333333e+00
+189 325 -1.66666666666667e+01
+189 173 8.33333333333333e+00
+189 208 1.66666666666667e+01
+189 190 -3.33333333333333e+01
+189 209 1.66666666666667e+01
+189 94 -8.33333333333333e+00
+189 207 -7.50000000000000e+01
+189 172 8.33333333333333e+00
+189 10 -8.33333333333333e+00
+189 185 -8.33333333333333e+00
+189 182 8.33333333333333e+00
+189 400 8.33333333333333e+00
+189 394 -8.33333333333333e+00
+189 181 -1.66666666666667e+01
+189 184 1.66666666666667e+01
+189 183 -2.50000000000000e+01
+189 395 1.66666666666667e+01
+189 401 -1.66666666666667e+01
+189 393 -2.50000000000000e+01
+189 320 -8.33333333333333e+00
+190 190 2.50000000000000e+02
+190 318 1.66666666666667e+01
+190 320 1.66666666666667e+01
+190 319 -7.50000000000000e+01
+190 174 8.33333333333333e+00
+190 188 -8.33333333333333e+00
+190 444 8.33333333333333e+00
+190 187 -2.50000000000000e+01
+190 186 1.66666666666667e+01
+190 446 -1.66666666666667e+01
+190 177 -8.33333333333333e+00
+190 326 8.33333333333333e+00
+190 179 1.66666666666667e+01
+190 178 -2.50000000000000e+01
+190 324 -1.66666666666667e+01
+190 209 -8.33333333333333e+00
+190 207 1.66666666666667e+01
+190 189 -3.33333333333333e+01
+190 208 -2.50000000000000e+01
+190 93 -8.33333333333333e+00
+190 173 -1.66666666666667e+01
+190 171 8.33333333333333e+00
+190 9 -8.33333333333333e+00
+190 185 1.66666666666667e+01
+190 191 -3.33333333333333e+01
+190 395 1.66666666666667e+01
+190 399 8.33333333333333e+00
+190 393 -8.33333333333333e+00
+190 182 8.33333333333333e+00
+190 11 -8.33333333333333e+00
+190 184 -7.50000000000000e+01
+190 180 -1.66666666666667e+01
+190 183 1.66666666666667e+01
+190 401 8.33333333333333e+00
+190 95 -8.33333333333333e+00
+190 394 -2.50000000000000e+01
+190 176 8.33333333333333e+00
+191 191 2.50000000000000e+02
+191 175 8.33333333333333e+00
+191 320 -2.50000000000000e+01
+191 319 1.66666666666667e+01
+191 174 -1.66666666666667e+01
+191 187 -8.33333333333333e+00
+191 186 1.66666666666667e+01
+191 188 -2.50000000000000e+01
+191 445 -1.66666666666667e+01
+191 444 8.33333333333333e+00
+191 325 8.33333333333333e+00
+191 177 1.66666666666667e+01
+191 189 -3.33333333333333e+01
+191 179 -7.50000000000000e+01
+191 178 1.66666666666667e+01
+191 9 -8.33333333333333e+00
+191 324 8.33333333333333e+00
+191 93 -8.33333333333333e+00
+191 208 -8.33333333333333e+00
+191 171 8.33333333333333e+00
+191 209 -2.50000000000000e+01
+191 207 1.66666666666667e+01
+191 172 -1.66666666666667e+01
+191 183 -8.33333333333333e+00
+191 180 8.33333333333333e+00
+191 184 1.66666666666667e+01
+191 190 -3.33333333333333e+01
+191 394 1.66666666666667e+01
+191 185 -2.50000000000000e+01
+191 181 8.33333333333333e+00
+191 10 -8.33333333333333e+00
+191 395 -7.50000000000000e+01
+191 318 -8.33333333333333e+00
+191 400 8.33333333333333e+00
+191 94 -8.33333333333333e+00
+191 393 1.66666666666667e+01
+191 399 -1.66666666666667e+01
+192 192 1.50000000000000e+00
+192 16 8.33333333333333e-02
+192 217 -1.66666666666667e-01
+192 200 -8.33333333333333e-02
+192 193 -1.66666666666667e-01
+192 199 1.66666666666667e-01
+192 13 8.33333333333333e-02
+192 198 -2.50000000000000e-01
+192 230 -1.66666666666667e-01
+192 212 1.66666666666667e-01
+192 17 8.33333333333333e-02
+192 224 -1.66666666666667e-01
+192 223 8.33333333333333e-02
+192 229 -1.66666666666667e-01
+192 15 -5.00000000000000e-01
+192 194 -1.66666666666667e-01
+192 206 1.66666666666667e-01
+192 14 8.33333333333333e-02
+192 205 -8.33333333333333e-02
+192 211 1.66666666666667e-01
+192 218 8.33333333333333e-02
+192 204 -2.50000000000000e-01
+192 12 -5.00000000000000e-01
+193 193 1.33333333333333e+00
+193 15 8.33333333333333e-02
+193 216 -1.66666666666667e-01
+193 200 1.66666666666667e-01
+193 199 -7.50000000000000e-01
+193 192 -1.66666666666667e-01
+193 198 1.66666666666667e-01
+193 12 8.33333333333333e-02
+193 224 8.33333333333333e-02
+193 230 -1.66666666666667e-01
+193 16 -1.66666666666667e-01
+193 222 8.33333333333333e-02
+193 228 -1.66666666666667e-01
+193 206 1.66666666666667e-01
+193 212 -3.33333333333333e-01
+193 218 8.33333333333333e-02
+193 205 -2.50000000000000e-01
+193 13 -1.66666666666667e-01
+193 204 -8.33333333333333e-02
+193 210 1.66666666666667e-01
+194 194 1.33333333333333e+00
+194 216 8.33333333333333e-02
+194 200 -2.50000000000000e-01
+194 199 1.66666666666667e-01
+194 198 -8.33333333333333e-02
+194 223 8.33333333333333e-02
+194 229 -1.66666666666667e-01
+194 228 -1.66666666666667e-01
+194 210 1.66666666666667e-01
+194 17 -1.66666666666667e-01
+194 15 8.33333333333333e-02
+194 222 -1.66666666666667e-01
+194 217 8.33333333333333e-02
+194 206 -7.50000000000000e-01
+194 14 -1.66666666666667e-01
+194 205 1.66666666666667e-01
+194 211 -3.33333333333333e-01
+194 192 -1.66666666666667e-01
+194 204 1.66666666666667e-01
+194 12 8.33333333333333e-02
+195 195 5.96666666666667e+01
+195 322 -1.66666666666667e-01
+195 200 1.66666666666667e-01
+195 199 1.66666666666667e-01
+195 198 -7.50000000000000e-01
+195 329 -1.66666666666667e-01
+195 328 -1.66666666666667e-01
+195 212 -3.33333333333333e-01
+195 211 1.66666666666667e-01
+195 179 8.33333333333333e+00
+195 197 -1.66666666666667e+01
+195 209 8.50000000000000e+00
+195 325 4.25000000000000e+00
+195 208 -4.25000000000000e+00
+195 14 -4.16666666666667e+00
+195 173 4.16666666666667e+00
+195 13 4.25000000000000e+00
+195 172 -8.33333333333333e+00
+195 12 -4.33333333333333e+00
+195 207 -1.27500000000000e+01
+195 41 -4.16666666666667e+00
+195 326 4.25000000000000e+00
+195 196 -8.50000000000000e+00
+195 40 4.25000000000000e+00
+195 178 8.33333333333333e+00
+195 323 8.33333333333333e-02
+195 39 -4.33333333333333e+00
+195 177 -3.75000000000000e+01
+196 196 5.15000000000000e+01
+196 321 -1.66666666666667e-01
+196 200 -8.33333333333333e-02
+196 199 -2.50000000000000e-01
+196 198 1.66666666666667e-01
+196 329 -1.66666666666667e-01
+196 212 1.66666666666667e-01
+196 327 -1.66666666666667e-01
+196 210 1.66666666666667e-01
+196 179 -4.16666666666667e+00
+196 173 4.16666666666667e+00
+196 324 4.25000000000000e+00
+196 207 -4.25000000000000e+00
+196 14 4.25000000000000e+00
+196 197 -8.50000000000000e+00
+196 209 8.50000000000000e+00
+196 13 -1.30000000000000e+01
+196 208 -1.27500000000000e+01
+196 12 4.25000000000000e+00
+196 171 -8.33333333333333e+00
+196 41 4.25000000000000e+00
+196 326 -8.50000000000000e+00
+196 323 8.33333333333333e-02
+196 40 -1.30000000000000e+01
+196 178 -1.25000000000000e+01
+196 195 -8.50000000000000e+00
+196 39 4.25000000000000e+00
+196 177 8.33333333333333e+00
+197 197 5.96666666666667e+01
+197 322 8.33333333333333e-02
+197 200 -2.50000000000000e-01
+197 199 -8.33333333333333e-02
+197 198 1.66666666666667e-01
+197 327 -1.66666666666667e-01
+197 328 -1.66666666666667e-01
+197 211 1.66666666666667e-01
+197 210 -3.33333333333333e-01
+197 178 -4.16666666666667e+00
+197 172 4.16666666666667e+00
+197 177 8.33333333333333e+00
+197 195 -1.66666666666667e+01
+197 207 8.50000000000000e+00
+197 14 -4.33333333333333e+00
+197 209 -3.82500000000000e+01
+197 13 4.25000000000000e+00
+197 196 -8.50000000000000e+00
+197 208 8.50000000000000e+00
+197 12 -4.16666666666667e+00
+197 171 4.16666666666667e+00
+197 321 8.33333333333333e-02
+197 41 -4.33333333333333e+00
+197 179 -1.25000000000000e+01
+197 40 4.25000000000000e+00
+197 325 -8.50000000000000e+00
+197 39 -4.16666666666667e+00
+197 324 4.25000000000000e+00
+198 198 2.50000000000000e+00
+198 328 1.66666666666667e-01
+198 329 1.66666666666667e-01
+198 322 1.66666666666667e-01
+198 321 -2.50000000000000e-01
+198 200 -3.33333333333333e-01
+198 197 1.66666666666667e-01
+198 196 1.66666666666667e-01
+198 195 -7.50000000000000e-01
+198 211 -1.66666666666667e-01
+198 199 -3.33333333333333e-01
+198 218 1.66666666666667e-01
+198 334 -1.66666666666667e-01
+198 229 1.66666666666667e-01
+198 212 3.33333333333333e-01
+198 230 -3.33333333333333e-01
+198 44 8.33333333333333e-02
+198 335 -1.66666666666667e-01
+198 217 1.66666666666667e-01
+198 43 -1.66666666666667e-01
+198 216 -7.50000000000000e-01
+198 194 -8.33333333333333e-02
+198 14 8.33333333333333e-02
+198 193 1.66666666666667e-01
+198 13 -1.66666666666667e-01
+198 192 -2.50000000000000e-01
+198 323 -8.33333333333333e-02
+198 210 -5.00000000000000e-01
+199 199 2.50000000000000e+00
+199 327 1.66666666666667e-01
+199 329 -3.33333333333333e-01
+199 44 8.33333333333333e-02
+199 322 -7.50000000000000e-01
+199 321 1.66666666666667e-01
+199 197 -8.33333333333333e-02
+199 14 8.33333333333333e-02
+199 196 -2.50000000000000e-01
+199 195 1.66666666666667e-01
+199 210 -1.66666666666667e-01
+199 218 -8.33333333333333e-02
+199 198 -3.33333333333333e-01
+199 333 -1.66666666666667e-01
+199 228 1.66666666666667e-01
+199 335 -1.66666666666667e-01
+199 230 1.66666666666667e-01
+199 217 -2.50000000000000e-01
+199 216 1.66666666666667e-01
+199 42 -1.66666666666667e-01
+199 194 1.66666666666667e-01
+199 200 -3.33333333333333e-01
+199 212 3.33333333333333e-01
+199 193 -7.50000000000000e-01
+199 323 1.66666666666667e-01
+199 211 -5.00000000000000e-01
+199 192 1.66666666666667e-01
+199 12 -1.66666666666667e-01
+200 200 2.50000000000000e+00
+200 322 1.66666666666667e-01
+200 328 -3.33333333333333e-01
+200 327 1.66666666666667e-01
+200 323 -2.50000000000000e-01
+200 43 8.33333333333333e-02
+200 197 -2.50000000000000e-01
+200 196 -8.33333333333333e-02
+200 13 8.33333333333333e-02
+200 198 -3.33333333333333e-01
+200 195 1.66666666666667e-01
+200 217 -8.33333333333333e-02
+200 216 1.66666666666667e-01
+200 334 -1.66666666666667e-01
+200 229 1.66666666666667e-01
+200 210 3.33333333333333e-01
+200 228 -3.33333333333333e-01
+200 218 -2.50000000000000e-01
+200 42 8.33333333333333e-02
+200 333 -1.66666666666667e-01
+200 194 -2.50000000000000e-01
+200 321 -8.33333333333333e-02
+200 212 -1.50000000000000e+00
+200 193 1.66666666666667e-01
+200 199 -3.33333333333333e-01
+200 211 3.33333333333333e-01
+200 192 -8.33333333333333e-02
+200 12 8.33333333333333e-02
+201 201 5.96666666666667e+01
+201 404 -1.66666666666667e-01
+201 397 8.33333333333333e-02
+201 403 -1.66666666666667e-01
+201 398 -1.66666666666667e-01
+201 206 1.66666666666667e-01
+201 205 1.66666666666667e-01
+201 211 -3.33333333333333e-01
+201 204 -7.50000000000000e-01
+201 401 4.25000000000000e+00
+201 209 -4.25000000000000e+00
+201 202 -1.66666666666667e+01
+201 208 8.50000000000000e+00
+201 184 8.33333333333333e+00
+201 14 4.25000000000000e+00
+201 173 -8.33333333333333e+00
+201 13 -4.16666666666667e+00
+201 172 4.16666666666667e+00
+201 12 -4.33333333333333e+00
+201 207 -1.27500000000000e+01
+201 203 -8.50000000000000e+00
+201 68 4.25000000000000e+00
+201 185 8.33333333333333e+00
+201 67 -4.16666666666667e+00
+201 400 4.25000000000000e+00
+201 212 1.66666666666667e-01
+201 66 -4.33333333333333e+00
+201 183 -3.75000000000000e+01
+202 202 5.96666666666667e+01
+202 402 -1.66666666666667e-01
+202 398 8.33333333333333e-02
+202 404 -1.66666666666667e-01
+202 206 -8.33333333333333e-02
+202 212 1.66666666666667e-01
+202 205 -2.50000000000000e-01
+202 204 1.66666666666667e-01
+202 210 -3.33333333333333e-01
+202 173 4.16666666666667e+00
+202 185 -4.16666666666667e+00
+202 201 -1.66666666666667e+01
+202 207 8.50000000000000e+00
+202 183 8.33333333333333e+00
+202 14 4.25000000000000e+00
+202 203 -8.50000000000000e+00
+202 209 8.50000000000000e+00
+202 13 -4.33333333333333e+00
+202 208 -3.82500000000000e+01
+202 12 -4.16666666666667e+00
+202 171 4.16666666666667e+00
+202 68 4.25000000000000e+00
+202 401 -8.50000000000000e+00
+202 396 8.33333333333333e-02
+202 67 -4.33333333333333e+00
+202 184 -1.25000000000000e+01
+202 66 -4.16666666666667e+00
+202 399 4.25000000000000e+00
+203 203 5.15000000000000e+01
+203 402 -1.66666666666667e-01
+203 397 8.33333333333333e-02
+203 403 -1.66666666666667e-01
+203 396 -1.66666666666667e-01
+203 206 -2.50000000000000e-01
+203 205 -8.33333333333333e-02
+203 211 1.66666666666667e-01
+203 204 1.66666666666667e-01
+203 399 4.25000000000000e+00
+203 207 -4.25000000000000e+00
+203 172 4.16666666666667e+00
+203 184 -4.16666666666667e+00
+203 14 -1.30000000000000e+01
+203 209 -1.27500000000000e+01
+203 13 4.25000000000000e+00
+203 202 -8.50000000000000e+00
+203 208 8.50000000000000e+00
+203 12 4.25000000000000e+00
+203 171 -8.33333333333333e+00
+203 210 1.66666666666667e-01
+203 68 -1.30000000000000e+01
+203 185 -1.25000000000000e+01
+203 67 4.25000000000000e+00
+203 400 -8.50000000000000e+00
+203 201 -8.50000000000000e+00
+203 66 4.25000000000000e+00
+203 183 8.33333333333333e+00
+204 204 2.50000000000000e+00
+204 230 1.66666666666667e-01
+204 229 -3.33333333333333e-01
+204 224 1.66666666666667e-01
+204 70 8.33333333333333e-02
+204 222 -7.50000000000000e-01
+204 194 1.66666666666667e-01
+204 193 -8.33333333333333e-02
+204 13 8.33333333333333e-02
+204 192 -2.50000000000000e-01
+204 212 -1.66666666666667e-01
+204 206 -3.33333333333333e-01
+204 397 -8.33333333333333e-02
+204 410 -1.66666666666667e-01
+204 404 1.66666666666667e-01
+204 409 -1.66666666666667e-01
+204 403 1.66666666666667e-01
+204 398 1.66666666666667e-01
+204 71 -1.66666666666667e-01
+204 396 -2.50000000000000e-01
+204 203 1.66666666666667e-01
+204 14 -1.66666666666667e-01
+204 202 1.66666666666667e-01
+204 205 -3.33333333333333e-01
+204 211 3.33333333333333e-01
+204 201 -7.50000000000000e-01
+204 223 1.66666666666667e-01
+204 210 -5.00000000000000e-01
+205 205 2.50000000000000e+00
+205 230 1.66666666666667e-01
+205 222 1.66666666666667e-01
+205 228 -3.33333333333333e-01
+205 223 -2.50000000000000e-01
+205 69 8.33333333333333e-02
+205 194 1.66666666666667e-01
+205 206 -3.33333333333333e-01
+205 193 -2.50000000000000e-01
+205 192 -8.33333333333333e-02
+205 12 8.33333333333333e-02
+205 396 -8.33333333333333e-02
+205 398 1.66666666666667e-01
+205 212 3.33333333333333e-01
+205 404 -3.33333333333333e-01
+205 408 -1.66666666666667e-01
+205 402 1.66666666666667e-01
+205 71 8.33333333333333e-02
+205 410 -1.66666666666667e-01
+205 397 -2.50000000000000e-01
+205 203 -8.33333333333333e-02
+205 14 8.33333333333333e-02
+205 202 -2.50000000000000e-01
+205 224 -8.33333333333333e-02
+205 211 -1.50000000000000e+00
+205 201 1.66666666666667e-01
+205 204 -3.33333333333333e-01
+205 210 3.33333333333333e-01
+206 206 2.50000000000000e+00
+206 229 1.66666666666667e-01
+206 228 1.66666666666667e-01
+206 224 -2.50000000000000e-01
+206 222 1.66666666666667e-01
+206 194 -7.50000000000000e-01
+206 193 1.66666666666667e-01
+206 205 -3.33333333333333e-01
+206 192 1.66666666666667e-01
+206 210 -1.66666666666667e-01
+206 204 -3.33333333333333e-01
+206 397 1.66666666666667e-01
+206 408 -1.66666666666667e-01
+206 402 1.66666666666667e-01
+206 211 3.33333333333333e-01
+206 403 -3.33333333333333e-01
+206 398 -7.50000000000000e-01
+206 70 8.33333333333333e-02
+206 409 -1.66666666666667e-01
+206 396 1.66666666666667e-01
+206 69 -1.66666666666667e-01
+206 203 -2.50000000000000e-01
+206 223 -8.33333333333333e-02
+206 212 -5.00000000000000e-01
+206 202 -8.33333333333333e-02
+206 13 8.33333333333333e-02
+206 201 1.66666666666667e-01
+206 12 -1.66666666666667e-01
+207 207 1.27500000000000e+02
+207 328 -3.33333333333333e-01
+207 212 3.33333333333333e-01
+207 404 -3.33333333333333e-01
+207 448 -1.66666666666667e-01
+207 403 1.66666666666667e-01
+207 449 -1.66666666666667e-01
+207 211 3.33333333333333e-01
+207 210 -1.50000000000000e+00
+207 197 8.50000000000000e+00
+207 178 8.33333333333333e+00
+207 196 -4.25000000000000e+00
+207 179 -1.66666666666667e+01
+207 14 4.25000000000000e+00
+207 195 -1.27500000000000e+01
+207 326 -4.25000000000000e+00
+207 95 4.25000000000000e+00
+207 208 -1.70000000000000e+01
+207 325 8.50000000000000e+00
+207 324 -1.27500000000000e+01
+207 203 -4.25000000000000e+00
+207 202 8.50000000000000e+00
+207 173 -8.33333333333333e+00
+207 185 8.33333333333333e+00
+207 190 1.66666666666667e+01
+207 184 -1.66666666666667e+01
+207 13 4.25000000000000e+00
+207 172 -8.33333333333333e+00
+207 201 -1.27500000000000e+01
+207 209 -1.70000000000000e+01
+207 401 8.50000000000000e+00
+207 191 1.66666666666667e+01
+207 400 -4.25000000000000e+00
+207 94 4.25000000000000e+00
+207 329 1.66666666666667e-01
+207 399 -1.27500000000000e+01
+207 189 -7.50000000000000e+01
+208 208 1.27500000000000e+02
+208 327 -3.33333333333333e-01
+208 212 -1.66666666666667e-01
+208 449 -1.66666666666667e-01
+208 404 1.66666666666667e-01
+208 447 -1.66666666666667e-01
+208 402 1.66666666666667e-01
+208 211 -5.00000000000000e-01
+208 210 3.33333333333333e-01
+208 177 8.33333333333333e+00
+208 195 -4.25000000000000e+00
+208 179 8.33333333333333e+00
+208 197 8.50000000000000e+00
+208 196 -1.27500000000000e+01
+208 326 8.50000000000000e+00
+208 325 -3.82500000000000e+01
+208 207 -1.70000000000000e+01
+208 324 8.50000000000000e+00
+208 191 -8.33333333333333e+00
+208 209 -1.70000000000000e+01
+208 173 -8.33333333333333e+00
+208 185 8.33333333333333e+00
+208 201 8.50000000000000e+00
+208 189 1.66666666666667e+01
+208 183 -1.66666666666667e+01
+208 14 -8.50000000000000e+00
+208 203 8.50000000000000e+00
+208 202 -3.82500000000000e+01
+208 12 4.25000000000000e+00
+208 171 -8.33333333333333e+00
+208 401 8.50000000000000e+00
+208 95 -8.50000000000000e+00
+208 329 1.66666666666667e-01
+208 400 -1.27500000000000e+01
+208 190 -2.50000000000000e+01
+208 399 -4.25000000000000e+00
+208 93 4.25000000000000e+00
+209 209 1.27500000000000e+02
+209 328 1.66666666666667e-01
+209 211 -1.66666666666667e-01
+209 448 -1.66666666666667e-01
+209 403 1.66666666666667e-01
+209 210 3.33333333333333e-01
+209 402 -3.33333333333333e-01
+209 447 -1.66666666666667e-01
+209 212 -5.00000000000000e-01
+209 195 8.50000000000000e+00
+209 178 8.33333333333333e+00
+209 177 -1.66666666666667e+01
+209 197 -3.82500000000000e+01
+209 196 8.50000000000000e+00
+209 12 4.25000000000000e+00
+209 326 -1.27500000000000e+01
+209 325 8.50000000000000e+00
+209 324 -4.25000000000000e+00
+209 93 4.25000000000000e+00
+209 190 -8.33333333333333e+00
+209 208 -1.70000000000000e+01
+209 201 -4.25000000000000e+00
+209 172 -8.33333333333333e+00
+209 184 8.33333333333333e+00
+209 171 -8.33333333333333e+00
+209 183 8.33333333333333e+00
+209 203 -1.27500000000000e+01
+209 13 -8.50000000000000e+00
+209 202 8.50000000000000e+00
+209 327 1.66666666666667e-01
+209 401 -3.82500000000000e+01
+209 191 -2.50000000000000e+01
+209 400 8.50000000000000e+00
+209 94 -8.50000000000000e+00
+209 207 -1.70000000000000e+01
+209 399 8.50000000000000e+00
+209 189 1.66666666666667e+01
+210 210 5.00000000000000e+00
+210 328 3.33333333333333e-01
+210 327 -5.00000000000000e-01
+210 197 -3.33333333333333e-01
+210 196 1.66666666666667e-01
+210 209 3.33333333333333e-01
+210 448 1.66666666666667e-01
+210 208 3.33333333333333e-01
+210 207 -1.50000000000000e+00
+210 449 1.66666666666667e-01
+210 199 -1.66666666666667e-01
+210 200 3.33333333333333e-01
+210 212 -6.66666666666667e-01
+210 14 -1.66666666666667e-01
+210 198 -5.00000000000000e-01
+210 335 1.66666666666667e-01
+210 98 -1.66666666666667e-01
+210 334 -3.33333333333333e-01
+210 194 1.66666666666667e-01
+210 229 3.33333333333333e-01
+210 211 -6.66666666666667e-01
+210 230 3.33333333333333e-01
+210 97 -1.66666666666667e-01
+210 228 -1.50000000000000e+00
+210 193 1.66666666666667e-01
+210 13 -1.66666666666667e-01
+210 206 -1.66666666666667e-01
+210 203 1.66666666666667e-01
+210 409 1.66666666666667e-01
+210 403 -1.66666666666667e-01
+210 202 -3.33333333333333e-01
+210 205 3.33333333333333e-01
+210 204 -5.00000000000000e-01
+210 404 3.33333333333333e-01
+210 410 -3.33333333333333e-01
+210 402 -5.00000000000000e-01
+210 329 -1.66666666666667e-01
+211 211 5.00000000000000e+00
+211 327 3.33333333333333e-01
+211 329 3.33333333333333e-01
+211 328 -1.50000000000000e+00
+211 195 1.66666666666667e-01
+211 209 -1.66666666666667e-01
+211 447 1.66666666666667e-01
+211 208 -5.00000000000000e-01
+211 207 3.33333333333333e-01
+211 449 -3.33333333333333e-01
+211 198 -1.66666666666667e-01
+211 335 1.66666666666667e-01
+211 200 3.33333333333333e-01
+211 199 -5.00000000000000e-01
+211 333 -3.33333333333333e-01
+211 230 -1.66666666666667e-01
+211 228 3.33333333333333e-01
+211 210 -6.66666666666667e-01
+211 229 -5.00000000000000e-01
+211 96 -1.66666666666667e-01
+211 194 -3.33333333333333e-01
+211 192 1.66666666666667e-01
+211 12 -1.66666666666667e-01
+211 206 3.33333333333333e-01
+211 212 -6.66666666666667e-01
+211 404 3.33333333333333e-01
+211 408 1.66666666666667e-01
+211 402 -1.66666666666667e-01
+211 203 1.66666666666667e-01
+211 14 -1.66666666666667e-01
+211 205 -1.50000000000000e+00
+211 201 -3.33333333333333e-01
+211 204 3.33333333333333e-01
+211 410 1.66666666666667e-01
+211 98 -1.66666666666667e-01
+211 403 -5.00000000000000e-01
+211 197 1.66666666666667e-01
+212 212 5.00000000000000e+00
+212 196 1.66666666666667e-01
+212 329 -5.00000000000000e-01
+212 328 3.33333333333333e-01
+212 195 -3.33333333333333e-01
+212 208 -1.66666666666667e-01
+212 207 3.33333333333333e-01
+212 209 -5.00000000000000e-01
+212 448 -3.33333333333333e-01
+212 447 1.66666666666667e-01
+212 334 1.66666666666667e-01
+212 198 3.33333333333333e-01
+212 210 -6.66666666666667e-01
+212 200 -1.50000000000000e+00
+212 199 3.33333333333333e-01
+212 12 -1.66666666666667e-01
+212 333 1.66666666666667e-01
+212 96 -1.66666666666667e-01
+212 229 -1.66666666666667e-01
+212 192 1.66666666666667e-01
+212 230 -5.00000000000000e-01
+212 228 3.33333333333333e-01
+212 193 -3.33333333333333e-01
+212 204 -1.66666666666667e-01
+212 201 1.66666666666667e-01
+212 205 3.33333333333333e-01
+212 211 -6.66666666666667e-01
+212 403 3.33333333333333e-01
+212 206 -5.00000000000000e-01
+212 202 1.66666666666667e-01
+212 13 -1.66666666666667e-01
+212 404 -1.50000000000000e+00
+212 327 -1.66666666666667e-01
+212 409 1.66666666666667e-01
+212 97 -1.66666666666667e-01
+212 402 3.33333333333333e-01
+212 408 -3.33333333333333e-01
+213 213 1.50000000000000e+00
+213 19 8.33333333333333e-02
+213 238 -1.66666666666667e-01
+213 221 -8.33333333333333e-02
+213 214 -1.66666666666667e-01
+213 220 1.66666666666667e-01
+213 16 8.33333333333333e-02
+213 219 -2.50000000000000e-01
+213 251 -1.66666666666667e-01
+213 233 1.66666666666667e-01
+213 20 8.33333333333333e-02
+213 245 -1.66666666666667e-01
+213 244 8.33333333333333e-02
+213 250 -1.66666666666667e-01
+213 18 -5.00000000000000e-01
+213 215 -1.66666666666667e-01
+213 227 1.66666666666667e-01
+213 17 8.33333333333333e-02
+213 226 -8.33333333333333e-02
+213 232 1.66666666666667e-01
+213 239 8.33333333333333e-02
+213 225 -2.50000000000000e-01
+213 15 -5.00000000000000e-01
+214 214 1.33333333333333e+00
+214 18 8.33333333333333e-02
+214 237 -1.66666666666667e-01
+214 221 1.66666666666667e-01
+214 220 -7.50000000000000e-01
+214 213 -1.66666666666667e-01
+214 219 1.66666666666667e-01
+214 15 8.33333333333333e-02
+214 245 8.33333333333333e-02
+214 251 -1.66666666666667e-01
+214 19 -1.66666666666667e-01
+214 243 8.33333333333333e-02
+214 249 -1.66666666666667e-01
+214 227 1.66666666666667e-01
+214 233 -3.33333333333333e-01
+214 239 8.33333333333333e-02
+214 226 -2.50000000000000e-01
+214 16 -1.66666666666667e-01
+214 225 -8.33333333333333e-02
+214 231 1.66666666666667e-01
+215 215 1.33333333333333e+00
+215 237 8.33333333333333e-02
+215 221 -2.50000000000000e-01
+215 220 1.66666666666667e-01
+215 219 -8.33333333333333e-02
+215 244 8.33333333333333e-02
+215 250 -1.66666666666667e-01
+215 249 -1.66666666666667e-01
+215 231 1.66666666666667e-01
+215 20 -1.66666666666667e-01
+215 18 8.33333333333333e-02
+215 243 -1.66666666666667e-01
+215 238 8.33333333333333e-02
+215 227 -7.50000000000000e-01
+215 17 -1.66666666666667e-01
+215 226 1.66666666666667e-01
+215 232 -3.33333333333333e-01
+215 213 -1.66666666666667e-01
+215 225 1.66666666666667e-01
+215 15 8.33333333333333e-02
+216 216 2.50000000000000e+00
+216 331 -1.66666666666667e-01
+216 221 1.66666666666667e-01
+216 220 1.66666666666667e-01
+216 219 -7.50000000000000e-01
+216 338 -1.66666666666667e-01
+216 337 -1.66666666666667e-01
+216 233 -3.33333333333333e-01
+216 232 1.66666666666667e-01
+216 200 1.66666666666667e-01
+216 218 -3.33333333333333e-01
+216 230 3.33333333333333e-01
+216 334 1.66666666666667e-01
+216 229 -1.66666666666667e-01
+216 17 -8.33333333333333e-02
+216 194 8.33333333333333e-02
+216 16 1.66666666666667e-01
+216 193 -1.66666666666667e-01
+216 15 -2.50000000000000e-01
+216 228 -5.00000000000000e-01
+216 44 -8.33333333333333e-02
+216 335 1.66666666666667e-01
+216 217 -3.33333333333333e-01
+216 43 1.66666666666667e-01
+216 199 1.66666666666667e-01
+216 332 8.33333333333333e-02
+216 42 -2.50000000000000e-01
+216 198 -7.50000000000000e-01
+217 217 2.50000000000000e+00
+217 330 -1.66666666666667e-01
+217 221 -8.33333333333333e-02
+217 220 -2.50000000000000e-01
+217 219 1.66666666666667e-01
+217 338 -1.66666666666667e-01
+217 233 1.66666666666667e-01
+217 336 -1.66666666666667e-01
+217 231 1.66666666666667e-01
+217 200 -8.33333333333333e-02
+217 194 8.33333333333333e-02
+217 333 1.66666666666667e-01
+217 228 -1.66666666666667e-01
+217 17 1.66666666666667e-01
+217 218 -3.33333333333333e-01
+217 230 3.33333333333333e-01
+217 16 -7.50000000000000e-01
+217 229 -5.00000000000000e-01
+217 15 1.66666666666667e-01
+217 192 -1.66666666666667e-01
+217 44 1.66666666666667e-01
+217 335 -3.33333333333333e-01
+217 332 8.33333333333333e-02
+217 43 -7.50000000000000e-01
+217 199 -2.50000000000000e-01
+217 216 -3.33333333333333e-01
+217 42 1.66666666666667e-01
+217 198 1.66666666666667e-01
+218 218 2.50000000000000e+00
+218 331 8.33333333333333e-02
+218 221 -2.50000000000000e-01
+218 220 -8.33333333333333e-02
+218 219 1.66666666666667e-01
+218 336 -1.66666666666667e-01
+218 337 -1.66666666666667e-01
+218 232 1.66666666666667e-01
+218 231 -3.33333333333333e-01
+218 199 -8.33333333333333e-02
+218 193 8.33333333333333e-02
+218 198 1.66666666666667e-01
+218 216 -3.33333333333333e-01
+218 228 3.33333333333333e-01
+218 17 -2.50000000000000e-01
+218 230 -1.50000000000000e+00
+218 16 1.66666666666667e-01
+218 217 -3.33333333333333e-01
+218 229 3.33333333333333e-01
+218 15 -8.33333333333333e-02
+218 192 8.33333333333333e-02
+218 330 8.33333333333333e-02
+218 44 -2.50000000000000e-01
+218 200 -2.50000000000000e-01
+218 43 1.66666666666667e-01
+218 334 -3.33333333333333e-01
+218 42 -8.33333333333333e-02
+218 333 1.66666666666667e-01
+219 219 2.50000000000000e+00
+219 337 1.66666666666667e-01
+219 338 1.66666666666667e-01
+219 331 1.66666666666667e-01
+219 330 -2.50000000000000e-01
+219 221 -3.33333333333333e-01
+219 218 1.66666666666667e-01
+219 217 1.66666666666667e-01
+219 216 -7.50000000000000e-01
+219 232 -1.66666666666667e-01
+219 220 -3.33333333333333e-01
+219 239 1.66666666666667e-01
+219 343 -1.66666666666667e-01
+219 250 1.66666666666667e-01
+219 233 3.33333333333333e-01
+219 251 -3.33333333333333e-01
+219 47 8.33333333333333e-02
+219 344 -1.66666666666667e-01
+219 238 1.66666666666667e-01
+219 46 -1.66666666666667e-01
+219 237 -7.50000000000000e-01
+219 215 -8.33333333333333e-02
+219 17 8.33333333333333e-02
+219 214 1.66666666666667e-01
+219 16 -1.66666666666667e-01
+219 213 -2.50000000000000e-01
+219 332 -8.33333333333333e-02
+219 231 -5.00000000000000e-01
+220 220 2.50000000000000e+00
+220 336 1.66666666666667e-01
+220 338 -3.33333333333333e-01
+220 47 8.33333333333333e-02
+220 331 -7.50000000000000e-01
+220 330 1.66666666666667e-01
+220 218 -8.33333333333333e-02
+220 17 8.33333333333333e-02
+220 217 -2.50000000000000e-01
+220 216 1.66666666666667e-01
+220 231 -1.66666666666667e-01
+220 239 -8.33333333333333e-02
+220 219 -3.33333333333333e-01
+220 342 -1.66666666666667e-01
+220 249 1.66666666666667e-01
+220 344 -1.66666666666667e-01
+220 251 1.66666666666667e-01
+220 238 -2.50000000000000e-01
+220 237 1.66666666666667e-01
+220 45 -1.66666666666667e-01
+220 215 1.66666666666667e-01
+220 221 -3.33333333333333e-01
+220 233 3.33333333333333e-01
+220 214 -7.50000000000000e-01
+220 332 1.66666666666667e-01
+220 232 -5.00000000000000e-01
+220 213 1.66666666666667e-01
+220 15 -1.66666666666667e-01
+221 221 2.50000000000000e+00
+221 331 1.66666666666667e-01
+221 337 -3.33333333333333e-01
+221 336 1.66666666666667e-01
+221 332 -2.50000000000000e-01
+221 46 8.33333333333333e-02
+221 218 -2.50000000000000e-01
+221 217 -8.33333333333333e-02
+221 16 8.33333333333333e-02
+221 219 -3.33333333333333e-01
+221 216 1.66666666666667e-01
+221 238 -8.33333333333333e-02
+221 237 1.66666666666667e-01
+221 343 -1.66666666666667e-01
+221 250 1.66666666666667e-01
+221 231 3.33333333333333e-01
+221 249 -3.33333333333333e-01
+221 239 -2.50000000000000e-01
+221 45 8.33333333333333e-02
+221 342 -1.66666666666667e-01
+221 215 -2.50000000000000e-01
+221 330 -8.33333333333333e-02
+221 233 -1.50000000000000e+00
+221 214 1.66666666666667e-01
+221 220 -3.33333333333333e-01
+221 232 3.33333333333333e-01
+221 213 -8.33333333333333e-02
+221 15 8.33333333333333e-02
+222 222 2.50000000000000e+00
+222 413 -1.66666666666667e-01
+222 406 8.33333333333333e-02
+222 412 -1.66666666666667e-01
+222 407 -1.66666666666667e-01
+222 227 1.66666666666667e-01
+222 226 1.66666666666667e-01
+222 232 -3.33333333333333e-01
+222 225 -7.50000000000000e-01
+222 410 1.66666666666667e-01
+222 230 -1.66666666666667e-01
+222 223 -3.33333333333333e-01
+222 229 3.33333333333333e-01
+222 205 1.66666666666667e-01
+222 17 1.66666666666667e-01
+222 194 -1.66666666666667e-01
+222 16 -8.33333333333333e-02
+222 193 8.33333333333333e-02
+222 15 -2.50000000000000e-01
+222 228 -5.00000000000000e-01
+222 224 -3.33333333333333e-01
+222 71 1.66666666666667e-01
+222 206 1.66666666666667e-01
+222 70 -8.33333333333333e-02
+222 409 1.66666666666667e-01
+222 233 1.66666666666667e-01
+222 69 -2.50000000000000e-01
+222 204 -7.50000000000000e-01
+223 223 2.50000000000000e+00
+223 411 -1.66666666666667e-01
+223 407 8.33333333333333e-02
+223 413 -1.66666666666667e-01
+223 227 -8.33333333333333e-02
+223 233 1.66666666666667e-01
+223 226 -2.50000000000000e-01
+223 225 1.66666666666667e-01
+223 231 -3.33333333333333e-01
+223 194 8.33333333333333e-02
+223 206 -8.33333333333333e-02
+223 222 -3.33333333333333e-01
+223 228 3.33333333333333e-01
+223 204 1.66666666666667e-01
+223 17 1.66666666666667e-01
+223 224 -3.33333333333333e-01
+223 230 3.33333333333333e-01
+223 16 -2.50000000000000e-01
+223 229 -1.50000000000000e+00
+223 15 -8.33333333333333e-02
+223 192 8.33333333333333e-02
+223 71 1.66666666666667e-01
+223 410 -3.33333333333333e-01
+223 405 8.33333333333333e-02
+223 70 -2.50000000000000e-01
+223 205 -2.50000000000000e-01
+223 69 -8.33333333333333e-02
+223 408 1.66666666666667e-01
+224 224 2.50000000000000e+00
+224 411 -1.66666666666667e-01
+224 406 8.33333333333333e-02
+224 412 -1.66666666666667e-01
+224 405 -1.66666666666667e-01
+224 227 -2.50000000000000e-01
+224 226 -8.33333333333333e-02
+224 232 1.66666666666667e-01
+224 225 1.66666666666667e-01
+224 408 1.66666666666667e-01
+224 228 -1.66666666666667e-01
+224 193 8.33333333333333e-02
+224 205 -8.33333333333333e-02
+224 17 -7.50000000000000e-01
+224 230 -5.00000000000000e-01
+224 16 1.66666666666667e-01
+224 223 -3.33333333333333e-01
+224 229 3.33333333333333e-01
+224 15 1.66666666666667e-01
+224 192 -1.66666666666667e-01
+224 231 1.66666666666667e-01
+224 71 -7.50000000000000e-01
+224 206 -2.50000000000000e-01
+224 70 1.66666666666667e-01
+224 409 -3.33333333333333e-01
+224 222 -3.33333333333333e-01
+224 69 1.66666666666667e-01
+224 204 1.66666666666667e-01
+225 225 2.50000000000000e+00
+225 251 1.66666666666667e-01
+225 250 -3.33333333333333e-01
+225 245 1.66666666666667e-01
+225 73 8.33333333333333e-02
+225 243 -7.50000000000000e-01
+225 215 1.66666666666667e-01
+225 214 -8.33333333333333e-02
+225 16 8.33333333333333e-02
+225 213 -2.50000000000000e-01
+225 233 -1.66666666666667e-01
+225 227 -3.33333333333333e-01
+225 406 -8.33333333333333e-02
+225 419 -1.66666666666667e-01
+225 413 1.66666666666667e-01
+225 418 -1.66666666666667e-01
+225 412 1.66666666666667e-01
+225 407 1.66666666666667e-01
+225 74 -1.66666666666667e-01
+225 405 -2.50000000000000e-01
+225 224 1.66666666666667e-01
+225 17 -1.66666666666667e-01
+225 223 1.66666666666667e-01
+225 226 -3.33333333333333e-01
+225 232 3.33333333333333e-01
+225 222 -7.50000000000000e-01
+225 244 1.66666666666667e-01
+225 231 -5.00000000000000e-01
+226 226 2.50000000000000e+00
+226 251 1.66666666666667e-01
+226 243 1.66666666666667e-01
+226 249 -3.33333333333333e-01
+226 244 -2.50000000000000e-01
+226 72 8.33333333333333e-02
+226 215 1.66666666666667e-01
+226 227 -3.33333333333333e-01
+226 214 -2.50000000000000e-01
+226 213 -8.33333333333333e-02
+226 15 8.33333333333333e-02
+226 405 -8.33333333333333e-02
+226 407 1.66666666666667e-01
+226 233 3.33333333333333e-01
+226 413 -3.33333333333333e-01
+226 417 -1.66666666666667e-01
+226 411 1.66666666666667e-01
+226 74 8.33333333333333e-02
+226 419 -1.66666666666667e-01
+226 406 -2.50000000000000e-01
+226 224 -8.33333333333333e-02
+226 17 8.33333333333333e-02
+226 223 -2.50000000000000e-01
+226 245 -8.33333333333333e-02
+226 232 -1.50000000000000e+00
+226 222 1.66666666666667e-01
+226 225 -3.33333333333333e-01
+226 231 3.33333333333333e-01
+227 227 2.50000000000000e+00
+227 250 1.66666666666667e-01
+227 249 1.66666666666667e-01
+227 245 -2.50000000000000e-01
+227 243 1.66666666666667e-01
+227 215 -7.50000000000000e-01
+227 214 1.66666666666667e-01
+227 226 -3.33333333333333e-01
+227 213 1.66666666666667e-01
+227 231 -1.66666666666667e-01
+227 225 -3.33333333333333e-01
+227 406 1.66666666666667e-01
+227 417 -1.66666666666667e-01
+227 411 1.66666666666667e-01
+227 232 3.33333333333333e-01
+227 412 -3.33333333333333e-01
+227 407 -7.50000000000000e-01
+227 73 8.33333333333333e-02
+227 418 -1.66666666666667e-01
+227 405 1.66666666666667e-01
+227 72 -1.66666666666667e-01
+227 224 -2.50000000000000e-01
+227 244 -8.33333333333333e-02
+227 233 -5.00000000000000e-01
+227 223 -8.33333333333333e-02
+227 16 8.33333333333333e-02
+227 222 1.66666666666667e-01
+227 15 -1.66666666666667e-01
+228 228 5.00000000000000e+00
+228 337 -3.33333333333333e-01
+228 233 3.33333333333333e-01
+228 413 -3.33333333333333e-01
+228 451 -1.66666666666667e-01
+228 412 1.66666666666667e-01
+228 452 -1.66666666666667e-01
+228 232 3.33333333333333e-01
+228 231 -1.50000000000000e+00
+228 218 3.33333333333333e-01
+228 199 1.66666666666667e-01
+228 217 -1.66666666666667e-01
+228 200 -3.33333333333333e-01
+228 17 1.66666666666667e-01
+228 216 -5.00000000000000e-01
+228 335 -1.66666666666667e-01
+228 98 1.66666666666667e-01
+228 229 -6.66666666666667e-01
+228 334 3.33333333333333e-01
+228 333 -5.00000000000000e-01
+228 224 -1.66666666666667e-01
+228 223 3.33333333333333e-01
+228 194 -1.66666666666667e-01
+228 206 1.66666666666667e-01
+228 211 3.33333333333333e-01
+228 205 -3.33333333333333e-01
+228 16 1.66666666666667e-01
+228 193 -1.66666666666667e-01
+228 222 -5.00000000000000e-01
+228 230 -6.66666666666667e-01
+228 410 3.33333333333333e-01
+228 212 3.33333333333333e-01
+228 409 -1.66666666666667e-01
+228 97 1.66666666666667e-01
+228 338 1.66666666666667e-01
+228 408 -5.00000000000000e-01
+228 210 -1.50000000000000e+00
+229 229 5.00000000000000e+00
+229 336 -3.33333333333333e-01
+229 233 -1.66666666666667e-01
+229 452 -1.66666666666667e-01
+229 413 1.66666666666667e-01
+229 450 -1.66666666666667e-01
+229 411 1.66666666666667e-01
+229 232 -5.00000000000000e-01
+229 231 3.33333333333333e-01
+229 198 1.66666666666667e-01
+229 216 -1.66666666666667e-01
+229 200 1.66666666666667e-01
+229 218 3.33333333333333e-01
+229 217 -5.00000000000000e-01
+229 335 3.33333333333333e-01
+229 334 -1.50000000000000e+00
+229 228 -6.66666666666667e-01
+229 333 3.33333333333333e-01
+229 212 -1.66666666666667e-01
+229 230 -6.66666666666667e-01
+229 194 -1.66666666666667e-01
+229 206 1.66666666666667e-01
+229 222 3.33333333333333e-01
+229 210 3.33333333333333e-01
+229 204 -3.33333333333333e-01
+229 17 -3.33333333333333e-01
+229 224 3.33333333333333e-01
+229 223 -1.50000000000000e+00
+229 15 1.66666666666667e-01
+229 192 -1.66666666666667e-01
+229 410 3.33333333333333e-01
+229 98 -3.33333333333333e-01
+229 338 1.66666666666667e-01
+229 409 -5.00000000000000e-01
+229 211 -5.00000000000000e-01
+229 408 -1.66666666666667e-01
+229 96 1.66666666666667e-01
+230 230 5.00000000000000e+00
+230 337 1.66666666666667e-01
+230 232 -1.66666666666667e-01
+230 451 -1.66666666666667e-01
+230 412 1.66666666666667e-01
+230 231 3.33333333333333e-01
+230 411 -3.33333333333333e-01
+230 450 -1.66666666666667e-01
+230 233 -5.00000000000000e-01
+230 216 3.33333333333333e-01
+230 199 1.66666666666667e-01
+230 198 -3.33333333333333e-01
+230 218 -1.50000000000000e+00
+230 217 3.33333333333333e-01
+230 15 1.66666666666667e-01
+230 335 -5.00000000000000e-01
+230 334 3.33333333333333e-01
+230 333 -1.66666666666667e-01
+230 96 1.66666666666667e-01
+230 211 -1.66666666666667e-01
+230 229 -6.66666666666667e-01
+230 222 -1.66666666666667e-01
+230 193 -1.66666666666667e-01
+230 205 1.66666666666667e-01
+230 192 -1.66666666666667e-01
+230 204 1.66666666666667e-01
+230 224 -5.00000000000000e-01
+230 16 -3.33333333333333e-01
+230 223 3.33333333333333e-01
+230 336 1.66666666666667e-01
+230 410 -1.50000000000000e+00
+230 212 -5.00000000000000e-01
+230 409 3.33333333333333e-01
+230 97 -3.33333333333333e-01
+230 228 -6.66666666666667e-01
+230 408 3.33333333333333e-01
+230 210 3.33333333333333e-01
+231 231 5.00000000000000e+00
+231 337 3.33333333333333e-01
+231 336 -5.00000000000000e-01
+231 218 -3.33333333333333e-01
+231 217 1.66666666666667e-01
+231 230 3.33333333333333e-01
+231 451 1.66666666666667e-01
+231 229 3.33333333333333e-01
+231 228 -1.50000000000000e+00
+231 452 1.66666666666667e-01
+231 220 -1.66666666666667e-01
+231 221 3.33333333333333e-01
+231 233 -6.66666666666667e-01
+231 17 -1.66666666666667e-01
+231 219 -5.00000000000000e-01
+231 344 1.66666666666667e-01
+231 101 -1.66666666666667e-01
+231 343 -3.33333333333333e-01
+231 215 1.66666666666667e-01
+231 250 3.33333333333333e-01
+231 232 -6.66666666666667e-01
+231 251 3.33333333333333e-01
+231 100 -1.66666666666667e-01
+231 249 -1.50000000000000e+00
+231 214 1.66666666666667e-01
+231 16 -1.66666666666667e-01
+231 227 -1.66666666666667e-01
+231 224 1.66666666666667e-01
+231 418 1.66666666666667e-01
+231 412 -1.66666666666667e-01
+231 223 -3.33333333333333e-01
+231 226 3.33333333333333e-01
+231 225 -5.00000000000000e-01
+231 413 3.33333333333333e-01
+231 419 -3.33333333333333e-01
+231 411 -5.00000000000000e-01
+231 338 -1.66666666666667e-01
+232 232 5.00000000000000e+00
+232 336 3.33333333333333e-01
+232 338 3.33333333333333e-01
+232 337 -1.50000000000000e+00
+232 216 1.66666666666667e-01
+232 230 -1.66666666666667e-01
+232 450 1.66666666666667e-01
+232 229 -5.00000000000000e-01
+232 228 3.33333333333333e-01
+232 452 -3.33333333333333e-01
+232 219 -1.66666666666667e-01
+232 344 1.66666666666667e-01
+232 221 3.33333333333333e-01
+232 220 -5.00000000000000e-01
+232 342 -3.33333333333333e-01
+232 251 -1.66666666666667e-01
+232 249 3.33333333333333e-01
+232 231 -6.66666666666667e-01
+232 250 -5.00000000000000e-01
+232 99 -1.66666666666667e-01
+232 215 -3.33333333333333e-01
+232 213 1.66666666666667e-01
+232 15 -1.66666666666667e-01
+232 227 3.33333333333333e-01
+232 233 -6.66666666666667e-01
+232 413 3.33333333333333e-01
+232 417 1.66666666666667e-01
+232 411 -1.66666666666667e-01
+232 224 1.66666666666667e-01
+232 17 -1.66666666666667e-01
+232 226 -1.50000000000000e+00
+232 222 -3.33333333333333e-01
+232 225 3.33333333333333e-01
+232 419 1.66666666666667e-01
+232 101 -1.66666666666667e-01
+232 412 -5.00000000000000e-01
+232 218 1.66666666666667e-01
+233 233 5.00000000000000e+00
+233 217 1.66666666666667e-01
+233 338 -5.00000000000000e-01
+233 337 3.33333333333333e-01
+233 216 -3.33333333333333e-01
+233 229 -1.66666666666667e-01
+233 228 3.33333333333333e-01
+233 230 -5.00000000000000e-01
+233 451 -3.33333333333333e-01
+233 450 1.66666666666667e-01
+233 343 1.66666666666667e-01
+233 219 3.33333333333333e-01
+233 231 -6.66666666666667e-01
+233 221 -1.50000000000000e+00
+233 220 3.33333333333333e-01
+233 15 -1.66666666666667e-01
+233 342 1.66666666666667e-01
+233 99 -1.66666666666667e-01
+233 250 -1.66666666666667e-01
+233 213 1.66666666666667e-01
+233 251 -5.00000000000000e-01
+233 249 3.33333333333333e-01
+233 214 -3.33333333333333e-01
+233 225 -1.66666666666667e-01
+233 222 1.66666666666667e-01
+233 226 3.33333333333333e-01
+233 232 -6.66666666666667e-01
+233 412 3.33333333333333e-01
+233 227 -5.00000000000000e-01
+233 223 1.66666666666667e-01
+233 16 -1.66666666666667e-01
+233 413 -1.50000000000000e+00
+233 336 -1.66666666666667e-01
+233 418 1.66666666666667e-01
+233 100 -1.66666666666667e-01
+233 411 3.33333333333333e-01
+233 417 -3.33333333333333e-01
+234 234 1.50000000000000e+00
+234 22 8.33333333333333e-02
+234 259 -1.66666666666667e-01
+234 242 -8.33333333333333e-02
+234 235 -1.66666666666667e-01
+234 241 1.66666666666667e-01
+234 19 8.33333333333333e-02
+234 240 -2.50000000000000e-01
+234 272 -1.66666666666667e-01
+234 254 1.66666666666667e-01
+234 23 8.33333333333333e-02
+234 266 -1.66666666666667e-01
+234 265 8.33333333333333e-02
+234 271 -1.66666666666667e-01
+234 21 -5.00000000000000e-01
+234 236 -1.66666666666667e-01
+234 248 1.66666666666667e-01
+234 20 8.33333333333333e-02
+234 247 -8.33333333333333e-02
+234 253 1.66666666666667e-01
+234 260 8.33333333333333e-02
+234 246 -2.50000000000000e-01
+234 18 -5.00000000000000e-01
+235 235 1.33333333333333e+00
+235 21 8.33333333333333e-02
+235 258 -1.66666666666667e-01
+235 242 1.66666666666667e-01
+235 241 -7.50000000000000e-01
+235 234 -1.66666666666667e-01
+235 240 1.66666666666667e-01
+235 18 8.33333333333333e-02
+235 266 8.33333333333333e-02
+235 272 -1.66666666666667e-01
+235 22 -1.66666666666667e-01
+235 264 8.33333333333333e-02
+235 270 -1.66666666666667e-01
+235 248 1.66666666666667e-01
+235 254 -3.33333333333333e-01
+235 260 8.33333333333333e-02
+235 247 -2.50000000000000e-01
+235 19 -1.66666666666667e-01
+235 246 -8.33333333333333e-02
+235 252 1.66666666666667e-01
+236 236 1.33333333333333e+00
+236 258 8.33333333333333e-02
+236 242 -2.50000000000000e-01
+236 241 1.66666666666667e-01
+236 240 -8.33333333333333e-02
+236 265 8.33333333333333e-02
+236 271 -1.66666666666667e-01
+236 270 -1.66666666666667e-01
+236 252 1.66666666666667e-01
+236 23 -1.66666666666667e-01
+236 21 8.33333333333333e-02
+236 264 -1.66666666666667e-01
+236 259 8.33333333333333e-02
+236 248 -7.50000000000000e-01
+236 20 -1.66666666666667e-01
+236 247 1.66666666666667e-01
+236 253 -3.33333333333333e-01
+236 234 -1.66666666666667e-01
+236 246 1.66666666666667e-01
+236 18 8.33333333333333e-02
+237 237 2.50000000000000e+00
+237 340 -1.66666666666667e-01
+237 242 1.66666666666667e-01
+237 241 1.66666666666667e-01
+237 240 -7.50000000000000e-01
+237 347 -1.66666666666667e-01
+237 346 -1.66666666666667e-01
+237 254 -3.33333333333333e-01
+237 253 1.66666666666667e-01
+237 221 1.66666666666667e-01
+237 239 -3.33333333333333e-01
+237 251 3.33333333333333e-01
+237 343 1.66666666666667e-01
+237 250 -1.66666666666667e-01
+237 20 -8.33333333333333e-02
+237 215 8.33333333333333e-02
+237 19 1.66666666666667e-01
+237 214 -1.66666666666667e-01
+237 18 -2.50000000000000e-01
+237 249 -5.00000000000000e-01
+237 47 -8.33333333333333e-02
+237 344 1.66666666666667e-01
+237 238 -3.33333333333333e-01
+237 46 1.66666666666667e-01
+237 220 1.66666666666667e-01
+237 341 8.33333333333333e-02
+237 45 -2.50000000000000e-01
+237 219 -7.50000000000000e-01
+238 238 2.50000000000000e+00
+238 339 -1.66666666666667e-01
+238 242 -8.33333333333333e-02
+238 241 -2.50000000000000e-01
+238 240 1.66666666666667e-01
+238 347 -1.66666666666667e-01
+238 254 1.66666666666667e-01
+238 345 -1.66666666666667e-01
+238 252 1.66666666666667e-01
+238 221 -8.33333333333333e-02
+238 215 8.33333333333333e-02
+238 342 1.66666666666667e-01
+238 249 -1.66666666666667e-01
+238 20 1.66666666666667e-01
+238 239 -3.33333333333333e-01
+238 251 3.33333333333333e-01
+238 19 -7.50000000000000e-01
+238 250 -5.00000000000000e-01
+238 18 1.66666666666667e-01
+238 213 -1.66666666666667e-01
+238 47 1.66666666666667e-01
+238 344 -3.33333333333333e-01
+238 341 8.33333333333333e-02
+238 46 -7.50000000000000e-01
+238 220 -2.50000000000000e-01
+238 237 -3.33333333333333e-01
+238 45 1.66666666666667e-01
+238 219 1.66666666666667e-01
+239 239 2.50000000000000e+00
+239 340 8.33333333333333e-02
+239 242 -2.50000000000000e-01
+239 241 -8.33333333333333e-02
+239 240 1.66666666666667e-01
+239 345 -1.66666666666667e-01
+239 346 -1.66666666666667e-01
+239 253 1.66666666666667e-01
+239 252 -3.33333333333333e-01
+239 220 -8.33333333333333e-02
+239 214 8.33333333333333e-02
+239 219 1.66666666666667e-01
+239 237 -3.33333333333333e-01
+239 249 3.33333333333333e-01
+239 20 -2.50000000000000e-01
+239 251 -1.50000000000000e+00
+239 19 1.66666666666667e-01
+239 238 -3.33333333333333e-01
+239 250 3.33333333333333e-01
+239 18 -8.33333333333333e-02
+239 213 8.33333333333333e-02
+239 339 8.33333333333333e-02
+239 47 -2.50000000000000e-01
+239 221 -2.50000000000000e-01
+239 46 1.66666666666667e-01
+239 343 -3.33333333333333e-01
+239 45 -8.33333333333333e-02
+239 342 1.66666666666667e-01
+240 240 2.50000000000000e+00
+240 346 1.66666666666667e-01
+240 347 1.66666666666667e-01
+240 340 1.66666666666667e-01
+240 339 -2.50000000000000e-01
+240 242 -3.33333333333333e-01
+240 239 1.66666666666667e-01
+240 238 1.66666666666667e-01
+240 237 -7.50000000000000e-01
+240 253 -1.66666666666667e-01
+240 241 -3.33333333333333e-01
+240 260 1.66666666666667e-01
+240 352 -1.66666666666667e-01
+240 271 1.66666666666667e-01
+240 254 3.33333333333333e-01
+240 272 -3.33333333333333e-01
+240 50 8.33333333333333e-02
+240 353 -1.66666666666667e-01
+240 259 1.66666666666667e-01
+240 49 -1.66666666666667e-01
+240 258 -7.50000000000000e-01
+240 236 -8.33333333333333e-02
+240 20 8.33333333333333e-02
+240 235 1.66666666666667e-01
+240 19 -1.66666666666667e-01
+240 234 -2.50000000000000e-01
+240 341 -8.33333333333333e-02
+240 252 -5.00000000000000e-01
+241 241 2.50000000000000e+00
+241 345 1.66666666666667e-01
+241 347 -3.33333333333333e-01
+241 50 8.33333333333333e-02
+241 340 -7.50000000000000e-01
+241 339 1.66666666666667e-01
+241 239 -8.33333333333333e-02
+241 20 8.33333333333333e-02
+241 238 -2.50000000000000e-01
+241 237 1.66666666666667e-01
+241 252 -1.66666666666667e-01
+241 260 -8.33333333333333e-02
+241 240 -3.33333333333333e-01
+241 351 -1.66666666666667e-01
+241 270 1.66666666666667e-01
+241 353 -1.66666666666667e-01
+241 272 1.66666666666667e-01
+241 259 -2.50000000000000e-01
+241 258 1.66666666666667e-01
+241 48 -1.66666666666667e-01
+241 236 1.66666666666667e-01
+241 242 -3.33333333333333e-01
+241 254 3.33333333333333e-01
+241 235 -7.50000000000000e-01
+241 341 1.66666666666667e-01
+241 253 -5.00000000000000e-01
+241 234 1.66666666666667e-01
+241 18 -1.66666666666667e-01
+242 242 2.50000000000000e+00
+242 340 1.66666666666667e-01
+242 346 -3.33333333333333e-01
+242 345 1.66666666666667e-01
+242 341 -2.50000000000000e-01
+242 49 8.33333333333333e-02
+242 239 -2.50000000000000e-01
+242 238 -8.33333333333333e-02
+242 19 8.33333333333333e-02
+242 240 -3.33333333333333e-01
+242 237 1.66666666666667e-01
+242 259 -8.33333333333333e-02
+242 258 1.66666666666667e-01
+242 352 -1.66666666666667e-01
+242 271 1.66666666666667e-01
+242 252 3.33333333333333e-01
+242 270 -3.33333333333333e-01
+242 260 -2.50000000000000e-01
+242 48 8.33333333333333e-02
+242 351 -1.66666666666667e-01
+242 236 -2.50000000000000e-01
+242 339 -8.33333333333333e-02
+242 254 -1.50000000000000e+00
+242 235 1.66666666666667e-01
+242 241 -3.33333333333333e-01
+242 253 3.33333333333333e-01
+242 234 -8.33333333333333e-02
+242 18 8.33333333333333e-02
+243 243 2.50000000000000e+00
+243 422 -1.66666666666667e-01
+243 415 8.33333333333333e-02
+243 421 -1.66666666666667e-01
+243 416 -1.66666666666667e-01
+243 248 1.66666666666667e-01
+243 247 1.66666666666667e-01
+243 253 -3.33333333333333e-01
+243 246 -7.50000000000000e-01
+243 419 1.66666666666667e-01
+243 251 -1.66666666666667e-01
+243 244 -3.33333333333333e-01
+243 250 3.33333333333333e-01
+243 226 1.66666666666667e-01
+243 20 1.66666666666667e-01
+243 215 -1.66666666666667e-01
+243 19 -8.33333333333333e-02
+243 214 8.33333333333333e-02
+243 18 -2.50000000000000e-01
+243 249 -5.00000000000000e-01
+243 245 -3.33333333333333e-01
+243 74 1.66666666666667e-01
+243 227 1.66666666666667e-01
+243 73 -8.33333333333333e-02
+243 418 1.66666666666667e-01
+243 254 1.66666666666667e-01
+243 72 -2.50000000000000e-01
+243 225 -7.50000000000000e-01
+244 244 2.50000000000000e+00
+244 420 -1.66666666666667e-01
+244 416 8.33333333333333e-02
+244 422 -1.66666666666667e-01
+244 248 -8.33333333333333e-02
+244 254 1.66666666666667e-01
+244 247 -2.50000000000000e-01
+244 246 1.66666666666667e-01
+244 252 -3.33333333333333e-01
+244 215 8.33333333333333e-02
+244 227 -8.33333333333333e-02
+244 243 -3.33333333333333e-01
+244 249 3.33333333333333e-01
+244 225 1.66666666666667e-01
+244 20 1.66666666666667e-01
+244 245 -3.33333333333333e-01
+244 251 3.33333333333333e-01
+244 19 -2.50000000000000e-01
+244 250 -1.50000000000000e+00
+244 18 -8.33333333333333e-02
+244 213 8.33333333333333e-02
+244 74 1.66666666666667e-01
+244 419 -3.33333333333333e-01
+244 414 8.33333333333333e-02
+244 73 -2.50000000000000e-01
+244 226 -2.50000000000000e-01
+244 72 -8.33333333333333e-02
+244 417 1.66666666666667e-01
+245 245 2.50000000000000e+00
+245 420 -1.66666666666667e-01
+245 415 8.33333333333333e-02
+245 421 -1.66666666666667e-01
+245 414 -1.66666666666667e-01
+245 248 -2.50000000000000e-01
+245 247 -8.33333333333333e-02
+245 253 1.66666666666667e-01
+245 246 1.66666666666667e-01
+245 417 1.66666666666667e-01
+245 249 -1.66666666666667e-01
+245 214 8.33333333333333e-02
+245 226 -8.33333333333333e-02
+245 20 -7.50000000000000e-01
+245 251 -5.00000000000000e-01
+245 19 1.66666666666667e-01
+245 244 -3.33333333333333e-01
+245 250 3.33333333333333e-01
+245 18 1.66666666666667e-01
+245 213 -1.66666666666667e-01
+245 252 1.66666666666667e-01
+245 74 -7.50000000000000e-01
+245 227 -2.50000000000000e-01
+245 73 1.66666666666667e-01
+245 418 -3.33333333333333e-01
+245 243 -3.33333333333333e-01
+245 72 1.66666666666667e-01
+245 225 1.66666666666667e-01
+246 246 2.50000000000000e+00
+246 272 1.66666666666667e-01
+246 271 -3.33333333333333e-01
+246 266 1.66666666666667e-01
+246 76 8.33333333333333e-02
+246 264 -7.50000000000000e-01
+246 236 1.66666666666667e-01
+246 235 -8.33333333333333e-02
+246 19 8.33333333333333e-02
+246 234 -2.50000000000000e-01
+246 254 -1.66666666666667e-01
+246 248 -3.33333333333333e-01
+246 415 -8.33333333333333e-02
+246 428 -1.66666666666667e-01
+246 422 1.66666666666667e-01
+246 427 -1.66666666666667e-01
+246 421 1.66666666666667e-01
+246 416 1.66666666666667e-01
+246 77 -1.66666666666667e-01
+246 414 -2.50000000000000e-01
+246 245 1.66666666666667e-01
+246 20 -1.66666666666667e-01
+246 244 1.66666666666667e-01
+246 247 -3.33333333333333e-01
+246 253 3.33333333333333e-01
+246 243 -7.50000000000000e-01
+246 265 1.66666666666667e-01
+246 252 -5.00000000000000e-01
+247 247 2.50000000000000e+00
+247 272 1.66666666666667e-01
+247 264 1.66666666666667e-01
+247 270 -3.33333333333333e-01
+247 265 -2.50000000000000e-01
+247 75 8.33333333333333e-02
+247 236 1.66666666666667e-01
+247 248 -3.33333333333333e-01
+247 235 -2.50000000000000e-01
+247 234 -8.33333333333333e-02
+247 18 8.33333333333333e-02
+247 414 -8.33333333333333e-02
+247 416 1.66666666666667e-01
+247 254 3.33333333333333e-01
+247 422 -3.33333333333333e-01
+247 426 -1.66666666666667e-01
+247 420 1.66666666666667e-01
+247 77 8.33333333333333e-02
+247 428 -1.66666666666667e-01
+247 415 -2.50000000000000e-01
+247 245 -8.33333333333333e-02
+247 20 8.33333333333333e-02
+247 244 -2.50000000000000e-01
+247 266 -8.33333333333333e-02
+247 253 -1.50000000000000e+00
+247 243 1.66666666666667e-01
+247 246 -3.33333333333333e-01
+247 252 3.33333333333333e-01
+248 248 2.50000000000000e+00
+248 271 1.66666666666667e-01
+248 270 1.66666666666667e-01
+248 266 -2.50000000000000e-01
+248 264 1.66666666666667e-01
+248 236 -7.50000000000000e-01
+248 235 1.66666666666667e-01
+248 247 -3.33333333333333e-01
+248 234 1.66666666666667e-01
+248 252 -1.66666666666667e-01
+248 246 -3.33333333333333e-01
+248 415 1.66666666666667e-01
+248 426 -1.66666666666667e-01
+248 420 1.66666666666667e-01
+248 253 3.33333333333333e-01
+248 421 -3.33333333333333e-01
+248 416 -7.50000000000000e-01
+248 76 8.33333333333333e-02
+248 427 -1.66666666666667e-01
+248 414 1.66666666666667e-01
+248 75 -1.66666666666667e-01
+248 245 -2.50000000000000e-01
+248 265 -8.33333333333333e-02
+248 254 -5.00000000000000e-01
+248 244 -8.33333333333333e-02
+248 19 8.33333333333333e-02
+248 243 1.66666666666667e-01
+248 18 -1.66666666666667e-01
+249 249 5.00000000000000e+00
+249 346 -3.33333333333333e-01
+249 254 3.33333333333333e-01
+249 422 -3.33333333333333e-01
+249 454 -1.66666666666667e-01
+249 421 1.66666666666667e-01
+249 455 -1.66666666666667e-01
+249 253 3.33333333333333e-01
+249 252 -1.50000000000000e+00
+249 239 3.33333333333333e-01
+249 220 1.66666666666667e-01
+249 238 -1.66666666666667e-01
+249 221 -3.33333333333333e-01
+249 20 1.66666666666667e-01
+249 237 -5.00000000000000e-01
+249 344 -1.66666666666667e-01
+249 101 1.66666666666667e-01
+249 250 -6.66666666666667e-01
+249 343 3.33333333333333e-01
+249 342 -5.00000000000000e-01
+249 245 -1.66666666666667e-01
+249 244 3.33333333333333e-01
+249 215 -1.66666666666667e-01
+249 227 1.66666666666667e-01
+249 232 3.33333333333333e-01
+249 226 -3.33333333333333e-01
+249 19 1.66666666666667e-01
+249 214 -1.66666666666667e-01
+249 243 -5.00000000000000e-01
+249 251 -6.66666666666667e-01
+249 419 3.33333333333333e-01
+249 233 3.33333333333333e-01
+249 418 -1.66666666666667e-01
+249 100 1.66666666666667e-01
+249 347 1.66666666666667e-01
+249 417 -5.00000000000000e-01
+249 231 -1.50000000000000e+00
+250 250 5.00000000000000e+00
+250 345 -3.33333333333333e-01
+250 254 -1.66666666666667e-01
+250 455 -1.66666666666667e-01
+250 422 1.66666666666667e-01
+250 453 -1.66666666666667e-01
+250 420 1.66666666666667e-01
+250 253 -5.00000000000000e-01
+250 252 3.33333333333333e-01
+250 219 1.66666666666667e-01
+250 237 -1.66666666666667e-01
+250 221 1.66666666666667e-01
+250 239 3.33333333333333e-01
+250 238 -5.00000000000000e-01
+250 344 3.33333333333333e-01
+250 343 -1.50000000000000e+00
+250 249 -6.66666666666667e-01
+250 342 3.33333333333333e-01
+250 233 -1.66666666666667e-01
+250 251 -6.66666666666667e-01
+250 215 -1.66666666666667e-01
+250 227 1.66666666666667e-01
+250 243 3.33333333333333e-01
+250 231 3.33333333333333e-01
+250 225 -3.33333333333333e-01
+250 20 -3.33333333333333e-01
+250 245 3.33333333333333e-01
+250 244 -1.50000000000000e+00
+250 18 1.66666666666667e-01
+250 213 -1.66666666666667e-01
+250 419 3.33333333333333e-01
+250 101 -3.33333333333333e-01
+250 347 1.66666666666667e-01
+250 418 -5.00000000000000e-01
+250 232 -5.00000000000000e-01
+250 417 -1.66666666666667e-01
+250 99 1.66666666666667e-01
+251 251 5.00000000000000e+00
+251 346 1.66666666666667e-01
+251 253 -1.66666666666667e-01
+251 454 -1.66666666666667e-01
+251 421 1.66666666666667e-01
+251 252 3.33333333333333e-01
+251 420 -3.33333333333333e-01
+251 453 -1.66666666666667e-01
+251 254 -5.00000000000000e-01
+251 237 3.33333333333333e-01
+251 220 1.66666666666667e-01
+251 219 -3.33333333333333e-01
+251 239 -1.50000000000000e+00
+251 238 3.33333333333333e-01
+251 18 1.66666666666667e-01
+251 344 -5.00000000000000e-01
+251 343 3.33333333333333e-01
+251 342 -1.66666666666667e-01
+251 99 1.66666666666667e-01
+251 232 -1.66666666666667e-01
+251 250 -6.66666666666667e-01
+251 243 -1.66666666666667e-01
+251 214 -1.66666666666667e-01
+251 226 1.66666666666667e-01
+251 213 -1.66666666666667e-01
+251 225 1.66666666666667e-01
+251 245 -5.00000000000000e-01
+251 19 -3.33333333333333e-01
+251 244 3.33333333333333e-01
+251 345 1.66666666666667e-01
+251 419 -1.50000000000000e+00
+251 233 -5.00000000000000e-01
+251 418 3.33333333333333e-01
+251 100 -3.33333333333333e-01
+251 249 -6.66666666666667e-01
+251 417 3.33333333333333e-01
+251 231 3.33333333333333e-01
+252 252 5.00000000000000e+00
+252 346 3.33333333333333e-01
+252 345 -5.00000000000000e-01
+252 239 -3.33333333333333e-01
+252 238 1.66666666666667e-01
+252 251 3.33333333333333e-01
+252 454 1.66666666666667e-01
+252 250 3.33333333333333e-01
+252 249 -1.50000000000000e+00
+252 455 1.66666666666667e-01
+252 241 -1.66666666666667e-01
+252 242 3.33333333333333e-01
+252 254 -6.66666666666667e-01
+252 20 -1.66666666666667e-01
+252 240 -5.00000000000000e-01
+252 353 1.66666666666667e-01
+252 104 -1.66666666666667e-01
+252 352 -3.33333333333333e-01
+252 236 1.66666666666667e-01
+252 271 3.33333333333333e-01
+252 253 -6.66666666666667e-01
+252 272 3.33333333333333e-01
+252 103 -1.66666666666667e-01
+252 270 -1.50000000000000e+00
+252 235 1.66666666666667e-01
+252 19 -1.66666666666667e-01
+252 248 -1.66666666666667e-01
+252 245 1.66666666666667e-01
+252 427 1.66666666666667e-01
+252 421 -1.66666666666667e-01
+252 244 -3.33333333333333e-01
+252 247 3.33333333333333e-01
+252 246 -5.00000000000000e-01
+252 422 3.33333333333333e-01
+252 428 -3.33333333333333e-01
+252 420 -5.00000000000000e-01
+252 347 -1.66666666666667e-01
+253 253 5.00000000000000e+00
+253 345 3.33333333333333e-01
+253 347 3.33333333333333e-01
+253 346 -1.50000000000000e+00
+253 237 1.66666666666667e-01
+253 251 -1.66666666666667e-01
+253 453 1.66666666666667e-01
+253 250 -5.00000000000000e-01
+253 249 3.33333333333333e-01
+253 455 -3.33333333333333e-01
+253 240 -1.66666666666667e-01
+253 353 1.66666666666667e-01
+253 242 3.33333333333333e-01
+253 241 -5.00000000000000e-01
+253 351 -3.33333333333333e-01
+253 272 -1.66666666666667e-01
+253 270 3.33333333333333e-01
+253 252 -6.66666666666667e-01
+253 271 -5.00000000000000e-01
+253 102 -1.66666666666667e-01
+253 236 -3.33333333333333e-01
+253 234 1.66666666666667e-01
+253 18 -1.66666666666667e-01
+253 248 3.33333333333333e-01
+253 254 -6.66666666666667e-01
+253 422 3.33333333333333e-01
+253 426 1.66666666666667e-01
+253 420 -1.66666666666667e-01
+253 245 1.66666666666667e-01
+253 20 -1.66666666666667e-01
+253 247 -1.50000000000000e+00
+253 243 -3.33333333333333e-01
+253 246 3.33333333333333e-01
+253 428 1.66666666666667e-01
+253 104 -1.66666666666667e-01
+253 421 -5.00000000000000e-01
+253 239 1.66666666666667e-01
+254 254 5.00000000000000e+00
+254 238 1.66666666666667e-01
+254 347 -5.00000000000000e-01
+254 346 3.33333333333333e-01
+254 237 -3.33333333333333e-01
+254 250 -1.66666666666667e-01
+254 249 3.33333333333333e-01
+254 251 -5.00000000000000e-01
+254 454 -3.33333333333333e-01
+254 453 1.66666666666667e-01
+254 352 1.66666666666667e-01
+254 240 3.33333333333333e-01
+254 252 -6.66666666666667e-01
+254 242 -1.50000000000000e+00
+254 241 3.33333333333333e-01
+254 18 -1.66666666666667e-01
+254 351 1.66666666666667e-01
+254 102 -1.66666666666667e-01
+254 271 -1.66666666666667e-01
+254 234 1.66666666666667e-01
+254 272 -5.00000000000000e-01
+254 270 3.33333333333333e-01
+254 235 -3.33333333333333e-01
+254 246 -1.66666666666667e-01
+254 243 1.66666666666667e-01
+254 247 3.33333333333333e-01
+254 253 -6.66666666666667e-01
+254 421 3.33333333333333e-01
+254 248 -5.00000000000000e-01
+254 244 1.66666666666667e-01
+254 19 -1.66666666666667e-01
+254 422 -1.50000000000000e+00
+254 345 -1.66666666666667e-01
+254 427 1.66666666666667e-01
+254 103 -1.66666666666667e-01
+254 420 3.33333333333333e-01
+254 426 -3.33333333333333e-01
+255 255 1.50000000000000e+00
+255 25 8.33333333333333e-02
+255 277 -1.66666666666667e-01
+255 263 -8.33333333333333e-02
+255 256 -1.66666666666667e-01
+255 262 1.66666666666667e-01
+255 22 8.33333333333333e-02
+255 261 -2.50000000000000e-01
+255 284 -1.66666666666667e-01
+255 275 1.66666666666667e-01
+255 26 8.33333333333333e-02
+255 281 -1.66666666666667e-01
+255 280 8.33333333333333e-02
+255 283 -1.66666666666667e-01
+255 24 -5.00000000000000e-01
+255 257 -1.66666666666667e-01
+255 269 1.66666666666667e-01
+255 23 8.33333333333333e-02
+255 268 -8.33333333333333e-02
+255 274 1.66666666666667e-01
+255 278 8.33333333333333e-02
+255 267 -2.50000000000000e-01
+255 21 -5.00000000000000e-01
+256 256 1.33333333333333e+00
+256 24 8.33333333333333e-02
+256 276 -1.66666666666667e-01
+256 263 1.66666666666667e-01
+256 262 -7.50000000000000e-01
+256 255 -1.66666666666667e-01
+256 261 1.66666666666667e-01
+256 21 8.33333333333333e-02
+256 281 8.33333333333333e-02
+256 284 -1.66666666666667e-01
+256 25 -1.66666666666667e-01
+256 279 8.33333333333333e-02
+256 282 -1.66666666666667e-01
+256 269 1.66666666666667e-01
+256 275 -3.33333333333333e-01
+256 278 8.33333333333333e-02
+256 268 -2.50000000000000e-01
+256 22 -1.66666666666667e-01
+256 267 -8.33333333333333e-02
+256 273 1.66666666666667e-01
+257 257 1.33333333333333e+00
+257 276 8.33333333333333e-02
+257 263 -2.50000000000000e-01
+257 262 1.66666666666667e-01
+257 261 -8.33333333333333e-02
+257 280 8.33333333333333e-02
+257 283 -1.66666666666667e-01
+257 282 -1.66666666666667e-01
+257 273 1.66666666666667e-01
+257 26 -1.66666666666667e-01
+257 24 8.33333333333333e-02
+257 279 -1.66666666666667e-01
+257 277 8.33333333333333e-02
+257 269 -7.50000000000000e-01
+257 23 -1.66666666666667e-01
+257 268 1.66666666666667e-01
+257 274 -3.33333333333333e-01
+257 255 -1.66666666666667e-01
+257 267 1.66666666666667e-01
+257 21 8.33333333333333e-02
+258 258 2.50000000000000e+00
+258 349 -1.66666666666667e-01
+258 263 1.66666666666667e-01
+258 262 1.66666666666667e-01
+258 261 -7.50000000000000e-01
+258 356 -1.66666666666667e-01
+258 355 -1.66666666666667e-01
+258 275 -3.33333333333333e-01
+258 274 1.66666666666667e-01
+258 242 1.66666666666667e-01
+258 260 -3.33333333333333e-01
+258 272 3.33333333333333e-01
+258 352 1.66666666666667e-01
+258 271 -1.66666666666667e-01
+258 23 -8.33333333333333e-02
+258 236 8.33333333333333e-02
+258 22 1.66666666666667e-01
+258 235 -1.66666666666667e-01
+258 21 -2.50000000000000e-01
+258 270 -5.00000000000000e-01
+258 50 -8.33333333333333e-02
+258 353 1.66666666666667e-01
+258 259 -3.33333333333333e-01
+258 49 1.66666666666667e-01
+258 241 1.66666666666667e-01
+258 350 8.33333333333333e-02
+258 48 -2.50000000000000e-01
+258 240 -7.50000000000000e-01
+259 259 2.50000000000000e+00
+259 348 -1.66666666666667e-01
+259 263 -8.33333333333333e-02
+259 262 -2.50000000000000e-01
+259 261 1.66666666666667e-01
+259 356 -1.66666666666667e-01
+259 275 1.66666666666667e-01
+259 354 -1.66666666666667e-01
+259 273 1.66666666666667e-01
+259 242 -8.33333333333333e-02
+259 236 8.33333333333333e-02
+259 351 1.66666666666667e-01
+259 270 -1.66666666666667e-01
+259 23 1.66666666666667e-01
+259 260 -3.33333333333333e-01
+259 272 3.33333333333333e-01
+259 22 -7.50000000000000e-01
+259 271 -5.00000000000000e-01
+259 21 1.66666666666667e-01
+259 234 -1.66666666666667e-01
+259 50 1.66666666666667e-01
+259 353 -3.33333333333333e-01
+259 350 8.33333333333333e-02
+259 49 -7.50000000000000e-01
+259 241 -2.50000000000000e-01
+259 258 -3.33333333333333e-01
+259 48 1.66666666666667e-01
+259 240 1.66666666666667e-01
+260 260 2.50000000000000e+00
+260 349 8.33333333333333e-02
+260 263 -2.50000000000000e-01
+260 262 -8.33333333333333e-02
+260 261 1.66666666666667e-01
+260 354 -1.66666666666667e-01
+260 355 -1.66666666666667e-01
+260 274 1.66666666666667e-01
+260 273 -3.33333333333333e-01
+260 241 -8.33333333333333e-02
+260 235 8.33333333333333e-02
+260 240 1.66666666666667e-01
+260 258 -3.33333333333333e-01
+260 270 3.33333333333333e-01
+260 23 -2.50000000000000e-01
+260 272 -1.50000000000000e+00
+260 22 1.66666666666667e-01
+260 259 -3.33333333333333e-01
+260 271 3.33333333333333e-01
+260 21 -8.33333333333333e-02
+260 234 8.33333333333333e-02
+260 348 8.33333333333333e-02
+260 50 -2.50000000000000e-01
+260 242 -2.50000000000000e-01
+260 49 1.66666666666667e-01
+260 352 -3.33333333333333e-01
+260 48 -8.33333333333333e-02
+260 351 1.66666666666667e-01
+261 261 2.50000000000000e+00
+261 355 1.66666666666667e-01
+261 356 1.66666666666667e-01
+261 349 1.66666666666667e-01
+261 348 -2.50000000000000e-01
+261 263 -3.33333333333333e-01
+261 260 1.66666666666667e-01
+261 259 1.66666666666667e-01
+261 258 -7.50000000000000e-01
+261 274 -1.66666666666667e-01
+261 262 -3.33333333333333e-01
+261 278 1.66666666666667e-01
+261 358 -1.66666666666667e-01
+261 283 1.66666666666667e-01
+261 275 3.33333333333333e-01
+261 284 -3.33333333333333e-01
+261 53 8.33333333333333e-02
+261 359 -1.66666666666667e-01
+261 277 1.66666666666667e-01
+261 52 -1.66666666666667e-01
+261 276 -7.50000000000000e-01
+261 257 -8.33333333333333e-02
+261 23 8.33333333333333e-02
+261 256 1.66666666666667e-01
+261 22 -1.66666666666667e-01
+261 255 -2.50000000000000e-01
+261 350 -8.33333333333333e-02
+261 273 -5.00000000000000e-01
+262 262 2.50000000000000e+00
+262 354 1.66666666666667e-01
+262 356 -3.33333333333333e-01
+262 53 8.33333333333333e-02
+262 349 -7.50000000000000e-01
+262 348 1.66666666666667e-01
+262 260 -8.33333333333333e-02
+262 23 8.33333333333333e-02
+262 259 -2.50000000000000e-01
+262 258 1.66666666666667e-01
+262 273 -1.66666666666667e-01
+262 278 -8.33333333333333e-02
+262 261 -3.33333333333333e-01
+262 357 -1.66666666666667e-01
+262 282 1.66666666666667e-01
+262 359 -1.66666666666667e-01
+262 284 1.66666666666667e-01
+262 277 -2.50000000000000e-01
+262 276 1.66666666666667e-01
+262 51 -1.66666666666667e-01
+262 257 1.66666666666667e-01
+262 263 -3.33333333333333e-01
+262 275 3.33333333333333e-01
+262 256 -7.50000000000000e-01
+262 350 1.66666666666667e-01
+262 274 -5.00000000000000e-01
+262 255 1.66666666666667e-01
+262 21 -1.66666666666667e-01
+263 263 2.50000000000000e+00
+263 349 1.66666666666667e-01
+263 355 -3.33333333333333e-01
+263 354 1.66666666666667e-01
+263 350 -2.50000000000000e-01
+263 52 8.33333333333333e-02
+263 260 -2.50000000000000e-01
+263 259 -8.33333333333333e-02
+263 22 8.33333333333333e-02
+263 261 -3.33333333333333e-01
+263 258 1.66666666666667e-01
+263 277 -8.33333333333333e-02
+263 276 1.66666666666667e-01
+263 358 -1.66666666666667e-01
+263 283 1.66666666666667e-01
+263 273 3.33333333333333e-01
+263 282 -3.33333333333333e-01
+263 278 -2.50000000000000e-01
+263 51 8.33333333333333e-02
+263 357 -1.66666666666667e-01
+263 257 -2.50000000000000e-01
+263 348 -8.33333333333333e-02
+263 275 -1.50000000000000e+00
+263 256 1.66666666666667e-01
+263 262 -3.33333333333333e-01
+263 274 3.33333333333333e-01
+263 255 -8.33333333333333e-02
+263 21 8.33333333333333e-02
+264 264 2.50000000000000e+00
+264 431 -1.66666666666667e-01
+264 424 8.33333333333333e-02
+264 430 -1.66666666666667e-01
+264 425 -1.66666666666667e-01
+264 269 1.66666666666667e-01
+264 268 1.66666666666667e-01
+264 274 -3.33333333333333e-01
+264 267 -7.50000000000000e-01
+264 428 1.66666666666667e-01
+264 272 -1.66666666666667e-01
+264 265 -3.33333333333333e-01
+264 271 3.33333333333333e-01
+264 247 1.66666666666667e-01
+264 23 1.66666666666667e-01
+264 236 -1.66666666666667e-01
+264 22 -8.33333333333333e-02
+264 235 8.33333333333333e-02
+264 21 -2.50000000000000e-01
+264 270 -5.00000000000000e-01
+264 266 -3.33333333333333e-01
+264 77 1.66666666666667e-01
+264 248 1.66666666666667e-01
+264 76 -8.33333333333333e-02
+264 427 1.66666666666667e-01
+264 275 1.66666666666667e-01
+264 75 -2.50000000000000e-01
+264 246 -7.50000000000000e-01
+265 265 2.50000000000000e+00
+265 429 -1.66666666666667e-01
+265 425 8.33333333333333e-02
+265 431 -1.66666666666667e-01
+265 269 -8.33333333333333e-02
+265 275 1.66666666666667e-01
+265 268 -2.50000000000000e-01
+265 267 1.66666666666667e-01
+265 273 -3.33333333333333e-01
+265 236 8.33333333333333e-02
+265 248 -8.33333333333333e-02
+265 264 -3.33333333333333e-01
+265 270 3.33333333333333e-01
+265 246 1.66666666666667e-01
+265 23 1.66666666666667e-01
+265 266 -3.33333333333333e-01
+265 272 3.33333333333333e-01
+265 22 -2.50000000000000e-01
+265 271 -1.50000000000000e+00
+265 21 -8.33333333333333e-02
+265 234 8.33333333333333e-02
+265 77 1.66666666666667e-01
+265 428 -3.33333333333333e-01
+265 423 8.33333333333333e-02
+265 76 -2.50000000000000e-01
+265 247 -2.50000000000000e-01
+265 75 -8.33333333333333e-02
+265 426 1.66666666666667e-01
+266 266 2.50000000000000e+00
+266 429 -1.66666666666667e-01
+266 424 8.33333333333333e-02
+266 430 -1.66666666666667e-01
+266 423 -1.66666666666667e-01
+266 269 -2.50000000000000e-01
+266 268 -8.33333333333333e-02
+266 274 1.66666666666667e-01
+266 267 1.66666666666667e-01
+266 426 1.66666666666667e-01
+266 270 -1.66666666666667e-01
+266 235 8.33333333333333e-02
+266 247 -8.33333333333333e-02
+266 23 -7.50000000000000e-01
+266 272 -5.00000000000000e-01
+266 22 1.66666666666667e-01
+266 265 -3.33333333333333e-01
+266 271 3.33333333333333e-01
+266 21 1.66666666666667e-01
+266 234 -1.66666666666667e-01
+266 273 1.66666666666667e-01
+266 77 -7.50000000000000e-01
+266 248 -2.50000000000000e-01
+266 76 1.66666666666667e-01
+266 427 -3.33333333333333e-01
+266 264 -3.33333333333333e-01
+266 75 1.66666666666667e-01
+266 246 1.66666666666667e-01
+267 267 2.50000000000000e+00
+267 284 1.66666666666667e-01
+267 283 -3.33333333333333e-01
+267 281 1.66666666666667e-01
+267 79 8.33333333333333e-02
+267 279 -7.50000000000000e-01
+267 257 1.66666666666667e-01
+267 256 -8.33333333333333e-02
+267 22 8.33333333333333e-02
+267 255 -2.50000000000000e-01
+267 275 -1.66666666666667e-01
+267 269 -3.33333333333333e-01
+267 424 -8.33333333333333e-02
+267 434 -1.66666666666667e-01
+267 431 1.66666666666667e-01
+267 433 -1.66666666666667e-01
+267 430 1.66666666666667e-01
+267 425 1.66666666666667e-01
+267 80 -1.66666666666667e-01
+267 423 -2.50000000000000e-01
+267 266 1.66666666666667e-01
+267 23 -1.66666666666667e-01
+267 265 1.66666666666667e-01
+267 268 -3.33333333333333e-01
+267 274 3.33333333333333e-01
+267 264 -7.50000000000000e-01
+267 280 1.66666666666667e-01
+267 273 -5.00000000000000e-01
+268 268 2.50000000000000e+00
+268 284 1.66666666666667e-01
+268 279 1.66666666666667e-01
+268 282 -3.33333333333333e-01
+268 280 -2.50000000000000e-01
+268 78 8.33333333333333e-02
+268 257 1.66666666666667e-01
+268 269 -3.33333333333333e-01
+268 256 -2.50000000000000e-01
+268 255 -8.33333333333333e-02
+268 21 8.33333333333333e-02
+268 423 -8.33333333333333e-02
+268 425 1.66666666666667e-01
+268 275 3.33333333333333e-01
+268 431 -3.33333333333333e-01
+268 432 -1.66666666666667e-01
+268 429 1.66666666666667e-01
+268 80 8.33333333333333e-02
+268 434 -1.66666666666667e-01
+268 424 -2.50000000000000e-01
+268 266 -8.33333333333333e-02
+268 23 8.33333333333333e-02
+268 265 -2.50000000000000e-01
+268 281 -8.33333333333333e-02
+268 274 -1.50000000000000e+00
+268 264 1.66666666666667e-01
+268 267 -3.33333333333333e-01
+268 273 3.33333333333333e-01
+269 269 2.50000000000000e+00
+269 283 1.66666666666667e-01
+269 282 1.66666666666667e-01
+269 281 -2.50000000000000e-01
+269 279 1.66666666666667e-01
+269 257 -7.50000000000000e-01
+269 256 1.66666666666667e-01
+269 268 -3.33333333333333e-01
+269 255 1.66666666666667e-01
+269 273 -1.66666666666667e-01
+269 267 -3.33333333333333e-01
+269 424 1.66666666666667e-01
+269 432 -1.66666666666667e-01
+269 429 1.66666666666667e-01
+269 274 3.33333333333333e-01
+269 430 -3.33333333333333e-01
+269 425 -7.50000000000000e-01
+269 79 8.33333333333333e-02
+269 433 -1.66666666666667e-01
+269 423 1.66666666666667e-01
+269 78 -1.66666666666667e-01
+269 266 -2.50000000000000e-01
+269 280 -8.33333333333333e-02
+269 275 -5.00000000000000e-01
+269 265 -8.33333333333333e-02
+269 22 8.33333333333333e-02
+269 264 1.66666666666667e-01
+269 21 -1.66666666666667e-01
+270 270 5.00000000000000e+00
+270 355 -3.33333333333333e-01
+270 275 3.33333333333333e-01
+270 431 -3.33333333333333e-01
+270 457 -1.66666666666667e-01
+270 430 1.66666666666667e-01
+270 458 -1.66666666666667e-01
+270 274 3.33333333333333e-01
+270 273 -1.50000000000000e+00
+270 260 3.33333333333333e-01
+270 241 1.66666666666667e-01
+270 259 -1.66666666666667e-01
+270 242 -3.33333333333333e-01
+270 23 1.66666666666667e-01
+270 258 -5.00000000000000e-01
+270 353 -1.66666666666667e-01
+270 104 1.66666666666667e-01
+270 271 -6.66666666666667e-01
+270 352 3.33333333333333e-01
+270 351 -5.00000000000000e-01
+270 266 -1.66666666666667e-01
+270 265 3.33333333333333e-01
+270 236 -1.66666666666667e-01
+270 248 1.66666666666667e-01
+270 253 3.33333333333333e-01
+270 247 -3.33333333333333e-01
+270 22 1.66666666666667e-01
+270 235 -1.66666666666667e-01
+270 264 -5.00000000000000e-01
+270 272 -6.66666666666667e-01
+270 428 3.33333333333333e-01
+270 254 3.33333333333333e-01
+270 427 -1.66666666666667e-01
+270 103 1.66666666666667e-01
+270 356 1.66666666666667e-01
+270 426 -5.00000000000000e-01
+270 252 -1.50000000000000e+00
+271 271 5.00000000000000e+00
+271 354 -3.33333333333333e-01
+271 275 -1.66666666666667e-01
+271 458 -1.66666666666667e-01
+271 431 1.66666666666667e-01
+271 456 -1.66666666666667e-01
+271 429 1.66666666666667e-01
+271 274 -5.00000000000000e-01
+271 273 3.33333333333333e-01
+271 240 1.66666666666667e-01
+271 258 -1.66666666666667e-01
+271 242 1.66666666666667e-01
+271 260 3.33333333333333e-01
+271 259 -5.00000000000000e-01
+271 353 3.33333333333333e-01
+271 352 -1.50000000000000e+00
+271 270 -6.66666666666667e-01
+271 351 3.33333333333333e-01
+271 254 -1.66666666666667e-01
+271 272 -6.66666666666667e-01
+271 236 -1.66666666666667e-01
+271 248 1.66666666666667e-01
+271 264 3.33333333333333e-01
+271 252 3.33333333333333e-01
+271 246 -3.33333333333333e-01
+271 23 -3.33333333333333e-01
+271 266 3.33333333333333e-01
+271 265 -1.50000000000000e+00
+271 21 1.66666666666667e-01
+271 234 -1.66666666666667e-01
+271 428 3.33333333333333e-01
+271 104 -3.33333333333333e-01
+271 356 1.66666666666667e-01
+271 427 -5.00000000000000e-01
+271 253 -5.00000000000000e-01
+271 426 -1.66666666666667e-01
+271 102 1.66666666666667e-01
+272 272 5.00000000000000e+00
+272 355 1.66666666666667e-01
+272 274 -1.66666666666667e-01
+272 457 -1.66666666666667e-01
+272 430 1.66666666666667e-01
+272 273 3.33333333333333e-01
+272 429 -3.33333333333333e-01
+272 456 -1.66666666666667e-01
+272 275 -5.00000000000000e-01
+272 258 3.33333333333333e-01
+272 241 1.66666666666667e-01
+272 240 -3.33333333333333e-01
+272 260 -1.50000000000000e+00
+272 259 3.33333333333333e-01
+272 21 1.66666666666667e-01
+272 353 -5.00000000000000e-01
+272 352 3.33333333333333e-01
+272 351 -1.66666666666667e-01
+272 102 1.66666666666667e-01
+272 253 -1.66666666666667e-01
+272 271 -6.66666666666667e-01
+272 264 -1.66666666666667e-01
+272 235 -1.66666666666667e-01
+272 247 1.66666666666667e-01
+272 234 -1.66666666666667e-01
+272 246 1.66666666666667e-01
+272 266 -5.00000000000000e-01
+272 22 -3.33333333333333e-01
+272 265 3.33333333333333e-01
+272 354 1.66666666666667e-01
+272 428 -1.50000000000000e+00
+272 254 -5.00000000000000e-01
+272 427 3.33333333333333e-01
+272 103 -3.33333333333333e-01
+272 270 -6.66666666666667e-01
+272 426 3.33333333333333e-01
+272 252 3.33333333333333e-01
+273 273 5.00000000000000e+00
+273 355 3.33333333333333e-01
+273 354 -5.00000000000000e-01
+273 260 -3.33333333333333e-01
+273 259 1.66666666666667e-01
+273 272 3.33333333333333e-01
+273 457 1.66666666666667e-01
+273 271 3.33333333333333e-01
+273 270 -1.50000000000000e+00
+273 458 1.66666666666667e-01
+273 262 -1.66666666666667e-01
+273 263 3.33333333333333e-01
+273 275 -6.66666666666667e-01
+273 23 -1.66666666666667e-01
+273 261 -5.00000000000000e-01
+273 359 1.66666666666667e-01
+273 107 -1.66666666666667e-01
+273 358 -3.33333333333333e-01
+273 257 1.66666666666667e-01
+273 283 3.33333333333333e-01
+273 274 -6.66666666666667e-01
+273 284 3.33333333333333e-01
+273 106 -1.66666666666667e-01
+273 282 -1.50000000000000e+00
+273 256 1.66666666666667e-01
+273 22 -1.66666666666667e-01
+273 269 -1.66666666666667e-01
+273 266 1.66666666666667e-01
+273 433 1.66666666666667e-01
+273 430 -1.66666666666667e-01
+273 265 -3.33333333333333e-01
+273 268 3.33333333333333e-01
+273 267 -5.00000000000000e-01
+273 431 3.33333333333333e-01
+273 434 -3.33333333333333e-01
+273 429 -5.00000000000000e-01
+273 356 -1.66666666666667e-01
+274 274 5.00000000000000e+00
+274 354 3.33333333333333e-01
+274 356 3.33333333333333e-01
+274 355 -1.50000000000000e+00
+274 258 1.66666666666667e-01
+274 272 -1.66666666666667e-01
+274 456 1.66666666666667e-01
+274 271 -5.00000000000000e-01
+274 270 3.33333333333333e-01
+274 458 -3.33333333333333e-01
+274 261 -1.66666666666667e-01
+274 359 1.66666666666667e-01
+274 263 3.33333333333333e-01
+274 262 -5.00000000000000e-01
+274 357 -3.33333333333333e-01
+274 284 -1.66666666666667e-01
+274 282 3.33333333333333e-01
+274 273 -6.66666666666667e-01
+274 283 -5.00000000000000e-01
+274 105 -1.66666666666667e-01
+274 257 -3.33333333333333e-01
+274 255 1.66666666666667e-01
+274 21 -1.66666666666667e-01
+274 269 3.33333333333333e-01
+274 275 -6.66666666666667e-01
+274 431 3.33333333333333e-01
+274 432 1.66666666666667e-01
+274 429 -1.66666666666667e-01
+274 266 1.66666666666667e-01
+274 23 -1.66666666666667e-01
+274 268 -1.50000000000000e+00
+274 264 -3.33333333333333e-01
+274 267 3.33333333333333e-01
+274 434 1.66666666666667e-01
+274 107 -1.66666666666667e-01
+274 430 -5.00000000000000e-01
+274 260 1.66666666666667e-01
+275 275 5.00000000000000e+00
+275 259 1.66666666666667e-01
+275 356 -5.00000000000000e-01
+275 355 3.33333333333333e-01
+275 258 -3.33333333333333e-01
+275 271 -1.66666666666667e-01
+275 270 3.33333333333333e-01
+275 272 -5.00000000000000e-01
+275 457 -3.33333333333333e-01
+275 456 1.66666666666667e-01
+275 358 1.66666666666667e-01
+275 261 3.33333333333333e-01
+275 273 -6.66666666666667e-01
+275 263 -1.50000000000000e+00
+275 262 3.33333333333333e-01
+275 21 -1.66666666666667e-01
+275 357 1.66666666666667e-01
+275 105 -1.66666666666667e-01
+275 283 -1.66666666666667e-01
+275 255 1.66666666666667e-01
+275 284 -5.00000000000000e-01
+275 282 3.33333333333333e-01
+275 256 -3.33333333333333e-01
+275 267 -1.66666666666667e-01
+275 264 1.66666666666667e-01
+275 268 3.33333333333333e-01
+275 274 -6.66666666666667e-01
+275 430 3.33333333333333e-01
+275 269 -5.00000000000000e-01
+275 265 1.66666666666667e-01
+275 22 -1.66666666666667e-01
+275 431 -1.50000000000000e+00
+275 354 -1.66666666666667e-01
+275 433 1.66666666666667e-01
+275 106 -1.66666666666667e-01
+275 429 3.33333333333333e-01
+275 432 -3.33333333333333e-01
+276 276 1.16666666666667e+00
+276 278 -3.33333333333333e-01
+276 284 1.66666666666667e-01
+276 358 8.33333333333333e-02
+276 283 -8.33333333333333e-02
+276 26 -8.33333333333333e-02
+276 257 8.33333333333333e-02
+276 25 8.33333333333333e-02
+276 256 -1.66666666666667e-01
+276 24 -8.33333333333333e-02
+276 282 -2.50000000000000e-01
+276 53 -8.33333333333333e-02
+276 359 8.33333333333333e-02
+276 277 -1.66666666666667e-01
+276 52 8.33333333333333e-02
+276 262 1.66666666666667e-01
+276 263 1.66666666666667e-01
+276 51 -8.33333333333333e-02
+276 261 -7.50000000000000e-01
+277 277 1.00000000000000e+00
+277 257 8.33333333333333e-02
+277 357 8.33333333333333e-02
+277 282 -8.33333333333333e-02
+277 26 8.33333333333333e-02
+277 278 -1.66666666666667e-01
+277 284 1.66666666666667e-01
+277 25 -2.50000000000000e-01
+277 283 -2.50000000000000e-01
+277 24 8.33333333333333e-02
+277 255 -1.66666666666667e-01
+277 53 8.33333333333333e-02
+277 359 -1.66666666666667e-01
+277 263 -8.33333333333333e-02
+277 52 -2.50000000000000e-01
+277 262 -2.50000000000000e-01
+277 276 -1.66666666666667e-01
+277 51 8.33333333333333e-02
+277 261 1.66666666666667e-01
+278 278 1.16666666666667e+00
+278 256 8.33333333333333e-02
+278 261 1.66666666666667e-01
+278 276 -3.33333333333333e-01
+278 282 1.66666666666667e-01
+278 26 -8.33333333333333e-02
+278 284 -7.50000000000000e-01
+278 25 8.33333333333333e-02
+278 277 -1.66666666666667e-01
+278 283 1.66666666666667e-01
+278 24 -8.33333333333333e-02
+278 255 8.33333333333333e-02
+278 262 -8.33333333333333e-02
+278 53 -8.33333333333333e-02
+278 263 -2.50000000000000e-01
+278 52 8.33333333333333e-02
+278 358 -1.66666666666667e-01
+278 51 -8.33333333333333e-02
+278 357 8.33333333333333e-02
+279 279 1.16666666666667e+00
+279 284 -8.33333333333333e-02
+279 280 -3.33333333333333e-01
+279 283 1.66666666666667e-01
+279 268 1.66666666666667e-01
+279 26 8.33333333333333e-02
+279 257 -1.66666666666667e-01
+279 25 -8.33333333333333e-02
+279 256 8.33333333333333e-02
+279 24 -8.33333333333333e-02
+279 282 -2.50000000000000e-01
+279 281 -1.66666666666667e-01
+279 80 8.33333333333333e-02
+279 269 1.66666666666667e-01
+279 79 -8.33333333333333e-02
+279 433 8.33333333333333e-02
+279 434 8.33333333333333e-02
+279 78 -8.33333333333333e-02
+279 267 -7.50000000000000e-01
+280 280 1.16666666666667e+00
+280 269 -8.33333333333333e-02
+280 279 -3.33333333333333e-01
+280 282 1.66666666666667e-01
+280 267 1.66666666666667e-01
+280 26 8.33333333333333e-02
+280 281 -1.66666666666667e-01
+280 284 1.66666666666667e-01
+280 25 -8.33333333333333e-02
+280 283 -7.50000000000000e-01
+280 24 -8.33333333333333e-02
+280 255 8.33333333333333e-02
+280 80 8.33333333333333e-02
+280 434 -1.66666666666667e-01
+280 257 8.33333333333333e-02
+280 79 -8.33333333333333e-02
+280 268 -2.50000000000000e-01
+280 78 -8.33333333333333e-02
+280 432 8.33333333333333e-02
+281 281 1.00000000000000e+00
+281 282 -8.33333333333333e-02
+281 256 8.33333333333333e-02
+281 268 -8.33333333333333e-02
+281 26 -2.50000000000000e-01
+281 284 -2.50000000000000e-01
+281 25 8.33333333333333e-02
+281 280 -1.66666666666667e-01
+281 283 1.66666666666667e-01
+281 24 8.33333333333333e-02
+281 255 -1.66666666666667e-01
+281 432 8.33333333333333e-02
+281 80 -2.50000000000000e-01
+281 269 -2.50000000000000e-01
+281 79 8.33333333333333e-02
+281 433 -1.66666666666667e-01
+281 279 -1.66666666666667e-01
+281 78 8.33333333333333e-02
+281 267 1.66666666666667e-01
+282 282 2.50000000000000e+00
+282 262 1.66666666666667e-01
+282 277 -8.33333333333333e-02
+282 263 -3.33333333333333e-01
+282 26 8.33333333333333e-02
+282 276 -2.50000000000000e-01
+282 359 -8.33333333333333e-02
+282 107 8.33333333333333e-02
+282 283 -3.33333333333333e-01
+282 358 1.66666666666667e-01
+282 357 -2.50000000000000e-01
+282 281 -8.33333333333333e-02
+282 280 1.66666666666667e-01
+282 257 -1.66666666666667e-01
+282 269 1.66666666666667e-01
+282 274 3.33333333333333e-01
+282 268 -3.33333333333333e-01
+282 25 8.33333333333333e-02
+282 256 -1.66666666666667e-01
+282 279 -2.50000000000000e-01
+282 284 -3.33333333333333e-01
+282 434 1.66666666666667e-01
+282 275 3.33333333333333e-01
+282 433 -8.33333333333333e-02
+282 106 8.33333333333333e-02
+282 278 1.66666666666667e-01
+282 432 -2.50000000000000e-01
+282 273 -1.50000000000000e+00
+283 283 2.50000000000000e+00
+283 276 -8.33333333333333e-02
+283 263 1.66666666666667e-01
+283 278 1.66666666666667e-01
+283 277 -2.50000000000000e-01
+283 359 1.66666666666667e-01
+283 358 -7.50000000000000e-01
+283 282 -3.33333333333333e-01
+283 357 1.66666666666667e-01
+283 275 -1.66666666666667e-01
+283 284 -3.33333333333333e-01
+283 257 -1.66666666666667e-01
+283 269 1.66666666666667e-01
+283 279 1.66666666666667e-01
+283 273 3.33333333333333e-01
+283 267 -3.33333333333333e-01
+283 26 -1.66666666666667e-01
+283 281 1.66666666666667e-01
+283 280 -7.50000000000000e-01
+283 24 8.33333333333333e-02
+283 255 -1.66666666666667e-01
+283 434 1.66666666666667e-01
+283 107 -1.66666666666667e-01
+283 261 1.66666666666667e-01
+283 433 -2.50000000000000e-01
+283 274 -5.00000000000000e-01
+283 432 -8.33333333333333e-02
+283 105 8.33333333333333e-02
+284 284 2.50000000000000e+00
+284 262 1.66666666666667e-01
+284 261 -3.33333333333333e-01
+284 278 -7.50000000000000e-01
+284 277 1.66666666666667e-01
+284 24 8.33333333333333e-02
+284 359 -2.50000000000000e-01
+284 358 1.66666666666667e-01
+284 357 -8.33333333333333e-02
+284 105 8.33333333333333e-02
+284 274 -1.66666666666667e-01
+284 283 -3.33333333333333e-01
+284 279 -8.33333333333333e-02
+284 256 -1.66666666666667e-01
+284 268 1.66666666666667e-01
+284 255 -1.66666666666667e-01
+284 267 1.66666666666667e-01
+284 281 -2.50000000000000e-01
+284 25 -1.66666666666667e-01
+284 280 1.66666666666667e-01
+284 276 1.66666666666667e-01
+284 434 -7.50000000000000e-01
+284 275 -5.00000000000000e-01
+284 433 1.66666666666667e-01
+284 106 -1.66666666666667e-01
+284 282 -3.33333333333333e-01
+284 432 1.66666666666667e-01
+284 273 3.33333333333333e-01
+285 285 5.00000000000000e+01
+285 116 -4.16666666666667e+00
+285 298 4.16666666666667e+00
+285 292 -4.16666666666667e+00
+285 32 4.16666666666667e+00
+285 299 -8.33333333333333e+00
+285 31 4.16666666666667e+00
+285 286 -8.33333333333333e+00
+285 115 8.33333333333333e+00
+285 30 -1.25000000000000e+01
+285 114 -1.25000000000000e+01
+285 287 -8.33333333333333e+00
+285 29 0.00000000000000e+00
+285 293 8.33333333333333e+00
+285 28 0.00000000000000e+00
+285 112 0.00000000000000e+00
+285 113 0.00000000000000e+00
+285 27 0.00000000000000e+00
+285 291 -1.25000000000000e+01
+286 286 5.83333333333333e+01
+286 116 8.33333333333333e+00
+286 293 8.33333333333333e+00
+286 297 4.16666666666667e+00
+286 291 -4.16666666666667e+00
+286 32 -4.16666666666667e+00
+286 299 4.16666666666667e+00
+286 31 -4.16666666666667e+00
+286 115 -3.75000000000000e+01
+286 30 4.16666666666667e+00
+286 285 -8.33333333333333e+00
+286 114 8.33333333333333e+00
+286 29 0.00000000000000e+00
+286 113 0.00000000000000e+00
+286 287 -1.66666666666667e+01
+286 28 0.00000000000000e+00
+286 292 -1.25000000000000e+01
+286 27 0.00000000000000e+00
+286 111 0.00000000000000e+00
+287 287 5.83333333333333e+01
+287 114 -4.16666666666667e+00
+287 286 -1.66666666666667e+01
+287 115 8.33333333333333e+00
+287 292 8.33333333333333e+00
+287 32 -4.16666666666667e+00
+287 116 -1.25000000000000e+01
+287 31 -4.16666666666667e+00
+287 298 4.16666666666667e+00
+287 30 4.16666666666667e+00
+287 297 -8.33333333333333e+00
+287 111 0.00000000000000e+00
+287 29 0.00000000000000e+00
+287 293 -3.75000000000000e+01
+287 28 0.00000000000000e+00
+287 112 0.00000000000000e+00
+287 285 -8.33333333333333e+00
+287 27 0.00000000000000e+00
+287 291 8.33333333333333e+00
+288 288 1.00000000000000e+00
+288 125 0.00000000000000e+00
+288 292 0.00000000000000e+00
+288 289 0.00000000000000e+00
+288 124 0.00000000000000e+00
+288 83 0.00000000000000e+00
+288 437 0.00000000000000e+00
+288 82 0.00000000000000e+00
+288 436 0.00000000000000e+00
+288 81 0.00000000000000e+00
+288 123 0.00000000000000e+00
+288 290 0.00000000000000e+00
+288 29 0.00000000000000e+00
+288 293 0.00000000000000e+00
+288 28 0.00000000000000e+00
+288 112 0.00000000000000e+00
+288 113 0.00000000000000e+00
+288 27 0.00000000000000e+00
+288 291 0.00000000000000e+00
+289 289 1.00000000000000e+00
+289 437 0.00000000000000e+00
+289 291 0.00000000000000e+00
+289 288 0.00000000000000e+00
+289 123 0.00000000000000e+00
+289 83 0.00000000000000e+00
+289 290 0.00000000000000e+00
+289 125 0.00000000000000e+00
+289 82 0.00000000000000e+00
+289 124 0.00000000000000e+00
+289 81 0.00000000000000e+00
+289 435 0.00000000000000e+00
+289 29 0.00000000000000e+00
+289 113 0.00000000000000e+00
+289 293 0.00000000000000e+00
+289 28 0.00000000000000e+00
+289 292 0.00000000000000e+00
+289 27 0.00000000000000e+00
+289 111 0.00000000000000e+00
+290 290 1.00000000000000e+00
+290 436 0.00000000000000e+00
+290 111 0.00000000000000e+00
+290 123 0.00000000000000e+00
+290 83 0.00000000000000e+00
+290 125 0.00000000000000e+00
+290 82 0.00000000000000e+00
+290 289 0.00000000000000e+00
+290 124 0.00000000000000e+00
+290 81 0.00000000000000e+00
+290 435 0.00000000000000e+00
+290 292 0.00000000000000e+00
+290 29 0.00000000000000e+00
+290 293 0.00000000000000e+00
+290 28 0.00000000000000e+00
+290 112 0.00000000000000e+00
+290 288 0.00000000000000e+00
+290 27 0.00000000000000e+00
+290 291 0.00000000000000e+00
+291 291 1.25000000000000e+02
+291 115 8.33333333333333e+00
+291 116 8.33333333333333e+00
+291 287 8.33333333333333e+00
+291 285 -1.25000000000000e+01
+291 299 8.33333333333333e+00
+291 298 8.33333333333333e+00
+291 292 -1.66666666666667e+01
+291 297 -3.75000000000000e+01
+291 128 -8.33333333333333e+00
+291 293 -1.66666666666667e+01
+291 113 0.00000000000000e+00
+291 125 0.00000000000000e+00
+291 289 0.00000000000000e+00
+291 127 1.66666666666667e+01
+291 124 0.00000000000000e+00
+291 290 0.00000000000000e+00
+291 29 0.00000000000000e+00
+291 28 0.00000000000000e+00
+291 112 0.00000000000000e+00
+291 288 0.00000000000000e+00
+291 437 8.33333333333333e+00
+291 86 -8.33333333333333e+00
+291 436 -4.16666666666667e+00
+291 85 4.16666666666667e+00
+291 435 -1.25000000000000e+01
+291 286 -4.16666666666667e+00
+291 126 -2.50000000000000e+01
+292 292 1.25000000000000e+02
+292 285 -4.16666666666667e+00
+292 114 8.33333333333333e+00
+292 116 -1.66666666666667e+01
+292 29 0.00000000000000e+00
+292 286 -1.25000000000000e+01
+292 299 -4.16666666666667e+00
+292 86 4.16666666666667e+00
+292 298 -1.25000000000000e+01
+292 297 8.33333333333333e+00
+292 291 -1.66666666666667e+01
+292 290 0.00000000000000e+00
+292 288 0.00000000000000e+00
+292 113 0.00000000000000e+00
+292 125 0.00000000000000e+00
+292 126 1.66666666666667e+01
+292 123 0.00000000000000e+00
+292 289 0.00000000000000e+00
+292 27 0.00000000000000e+00
+292 111 0.00000000000000e+00
+292 437 8.33333333333333e+00
+292 293 -1.66666666666667e+01
+292 128 1.66666666666667e+01
+292 436 -1.25000000000000e+01
+292 287 8.33333333333333e+00
+292 127 -7.50000000000000e+01
+292 435 -4.16666666666667e+00
+292 84 4.16666666666667e+00
+293 293 1.25000000000000e+02
+293 115 -1.66666666666667e+01
+293 114 8.33333333333333e+00
+293 287 -3.75000000000000e+01
+293 28 0.00000000000000e+00
+293 285 8.33333333333333e+00
+293 299 -1.25000000000000e+01
+293 298 -4.16666666666667e+00
+293 85 4.16666666666667e+00
+293 297 8.33333333333333e+00
+293 126 -8.33333333333333e+00
+293 289 0.00000000000000e+00
+293 291 -1.66666666666667e+01
+293 111 0.00000000000000e+00
+293 123 0.00000000000000e+00
+293 112 0.00000000000000e+00
+293 124 0.00000000000000e+00
+293 290 0.00000000000000e+00
+293 288 0.00000000000000e+00
+293 27 0.00000000000000e+00
+293 437 -3.75000000000000e+01
+293 286 8.33333333333333e+00
+293 128 -2.50000000000000e+01
+293 436 8.33333333333333e+00
+293 292 -1.66666666666667e+01
+293 127 1.66666666666667e+01
+293 435 8.33333333333333e+00
+293 84 -8.33333333333333e+00
+294 294 5.00000000000000e+01
+294 137 -4.16666666666667e+00
+294 307 4.16666666666667e+00
+294 301 -4.16666666666667e+00
+294 35 4.16666666666667e+00
+294 308 -8.33333333333333e+00
+294 34 4.16666666666667e+00
+294 295 -8.33333333333333e+00
+294 136 8.33333333333333e+00
+294 33 -1.25000000000000e+01
+294 135 -1.25000000000000e+01
+294 296 -8.33333333333333e+00
+294 32 4.16666666666667e+00
+294 302 8.33333333333333e+00
+294 31 4.16666666666667e+00
+294 133 -8.33333333333333e+00
+294 134 4.16666666666667e+00
+294 30 -1.25000000000000e+01
+294 300 -1.25000000000000e+01
+295 295 5.83333333333333e+01
+295 137 8.33333333333333e+00
+295 302 8.33333333333333e+00
+295 306 4.16666666666667e+00
+295 300 -4.16666666666667e+00
+295 35 -4.16666666666667e+00
+295 308 4.16666666666667e+00
+295 34 -4.16666666666667e+00
+295 136 -3.75000000000000e+01
+295 33 4.16666666666667e+00
+295 294 -8.33333333333333e+00
+295 135 8.33333333333333e+00
+295 32 -4.16666666666667e+00
+295 134 4.16666666666667e+00
+295 296 -1.66666666666667e+01
+295 31 -4.16666666666667e+00
+295 301 -1.25000000000000e+01
+295 30 4.16666666666667e+00
+295 132 -8.33333333333333e+00
+296 296 5.83333333333333e+01
+296 135 -4.16666666666667e+00
+296 295 -1.66666666666667e+01
+296 136 8.33333333333333e+00
+296 301 8.33333333333333e+00
+296 35 -4.16666666666667e+00
+296 137 -1.25000000000000e+01
+296 34 -4.16666666666667e+00
+296 307 4.16666666666667e+00
+296 33 4.16666666666667e+00
+296 306 -8.33333333333333e+00
+296 132 4.16666666666667e+00
+296 32 -4.16666666666667e+00
+296 302 -3.75000000000000e+01
+296 31 -4.16666666666667e+00
+296 133 4.16666666666667e+00
+296 294 -8.33333333333333e+00
+296 30 4.16666666666667e+00
+296 300 8.33333333333333e+00
+297 297 1.25000000000000e+02
+297 298 -1.66666666666667e+01
+297 440 -8.33333333333333e+00
+297 85 -4.16666666666667e+00
+297 439 4.16666666666667e+00
+297 302 8.33333333333333e+00
+297 31 -4.16666666666667e+00
+297 300 -3.75000000000000e+01
+297 286 4.16666666666667e+00
+297 32 8.33333333333333e+00
+297 287 -8.33333333333333e+00
+297 299 -1.66666666666667e+01
+297 293 8.33333333333333e+00
+297 86 8.33333333333333e+00
+297 292 8.33333333333333e+00
+297 291 -3.75000000000000e+01
+297 115 -8.33333333333333e+00
+297 133 8.33333333333333e+00
+297 134 8.33333333333333e+00
+297 116 -8.33333333333333e+00
+297 30 -1.25000000000000e+01
+297 146 -8.33333333333333e+00
+297 128 8.33333333333333e+00
+297 145 1.66666666666667e+01
+297 127 -1.66666666666667e+01
+297 144 -2.50000000000000e+01
+297 301 8.33333333333333e+00
+297 84 -1.25000000000000e+01
+298 298 1.25000000000000e+02
+298 440 4.16666666666667e+00
+298 300 8.33333333333333e+00
+298 297 -1.66666666666667e+01
+298 84 -4.16666666666667e+00
+298 438 4.16666666666667e+00
+298 301 -1.25000000000000e+01
+298 30 -4.16666666666667e+00
+298 285 4.16666666666667e+00
+298 287 4.16666666666667e+00
+298 293 -4.16666666666667e+00
+298 292 -1.25000000000000e+01
+298 291 8.33333333333333e+00
+298 114 -8.33333333333333e+00
+298 132 8.33333333333333e+00
+298 116 -8.33333333333333e+00
+298 128 8.33333333333333e+00
+298 134 -1.66666666666667e+01
+298 32 8.33333333333333e+00
+298 31 -1.25000000000000e+01
+298 146 1.66666666666667e+01
+298 299 -1.66666666666667e+01
+298 86 8.33333333333333e+00
+298 145 -7.50000000000000e+01
+298 302 -4.16666666666667e+00
+298 85 -1.25000000000000e+01
+298 144 1.66666666666667e+01
+298 126 -1.66666666666667e+01
+299 299 1.25000000000000e+02
+299 439 4.16666666666667e+00
+299 438 -8.33333333333333e+00
+299 302 -1.25000000000000e+01
+299 300 8.33333333333333e+00
+299 286 4.16666666666667e+00
+299 30 8.33333333333333e+00
+299 285 -8.33333333333333e+00
+299 293 -1.25000000000000e+01
+299 292 -4.16666666666667e+00
+299 297 -1.66666666666667e+01
+299 291 8.33333333333333e+00
+299 84 8.33333333333333e+00
+299 115 -8.33333333333333e+00
+299 127 8.33333333333333e+00
+299 32 -3.75000000000000e+01
+299 133 -1.66666666666667e+01
+299 31 8.33333333333333e+00
+299 132 8.33333333333333e+00
+299 114 -8.33333333333333e+00
+299 146 -2.50000000000000e+01
+299 301 -4.16666666666667e+00
+299 86 -3.75000000000000e+01
+299 145 1.66666666666667e+01
+299 298 -1.66666666666667e+01
+299 85 8.33333333333333e+00
+299 144 -8.33333333333333e+00
+299 126 8.33333333333333e+00
+300 300 1.25000000000000e+02
+300 136 8.33333333333333e+00
+300 137 8.33333333333333e+00
+300 296 8.33333333333333e+00
+300 294 -1.25000000000000e+01
+300 308 8.33333333333333e+00
+300 307 8.33333333333333e+00
+300 301 -1.66666666666667e+01
+300 306 -3.75000000000000e+01
+300 149 -8.33333333333333e+00
+300 302 -1.66666666666667e+01
+300 134 -8.33333333333333e+00
+300 146 8.33333333333333e+00
+300 298 8.33333333333333e+00
+300 148 1.66666666666667e+01
+300 145 -1.66666666666667e+01
+300 299 8.33333333333333e+00
+300 32 -8.33333333333333e+00
+300 31 4.16666666666667e+00
+300 133 -8.33333333333333e+00
+300 297 -3.75000000000000e+01
+300 440 8.33333333333333e+00
+300 89 -8.33333333333333e+00
+300 439 -4.16666666666667e+00
+300 88 4.16666666666667e+00
+300 438 -1.25000000000000e+01
+300 295 -4.16666666666667e+00
+300 147 -2.50000000000000e+01
+301 301 1.25000000000000e+02
+301 294 -4.16666666666667e+00
+301 135 8.33333333333333e+00
+301 137 -1.66666666666667e+01
+301 32 4.16666666666667e+00
+301 295 -1.25000000000000e+01
+301 308 -4.16666666666667e+00
+301 89 4.16666666666667e+00
+301 307 -1.25000000000000e+01
+301 306 8.33333333333333e+00
+301 300 -1.66666666666667e+01
+301 299 -4.16666666666667e+00
+301 297 8.33333333333333e+00
+301 134 -8.33333333333333e+00
+301 146 8.33333333333333e+00
+301 147 1.66666666666667e+01
+301 144 -1.66666666666667e+01
+301 298 -1.25000000000000e+01
+301 30 4.16666666666667e+00
+301 132 -8.33333333333333e+00
+301 440 8.33333333333333e+00
+301 302 -1.66666666666667e+01
+301 149 1.66666666666667e+01
+301 439 -1.25000000000000e+01
+301 296 8.33333333333333e+00
+301 148 -7.50000000000000e+01
+301 438 -4.16666666666667e+00
+301 87 4.16666666666667e+00
+302 302 1.25000000000000e+02
+302 136 -1.66666666666667e+01
+302 135 8.33333333333333e+00
+302 296 -3.75000000000000e+01
+302 31 4.16666666666667e+00
+302 294 8.33333333333333e+00
+302 308 -1.25000000000000e+01
+302 307 -4.16666666666667e+00
+302 88 4.16666666666667e+00
+302 306 8.33333333333333e+00
+302 147 -8.33333333333333e+00
+302 298 -4.16666666666667e+00
+302 300 -1.66666666666667e+01
+302 132 -8.33333333333333e+00
+302 144 8.33333333333333e+00
+302 133 -8.33333333333333e+00
+302 145 8.33333333333333e+00
+302 299 -1.25000000000000e+01
+302 297 8.33333333333333e+00
+302 30 -8.33333333333333e+00
+302 440 -3.75000000000000e+01
+302 295 8.33333333333333e+00
+302 149 -2.50000000000000e+01
+302 439 8.33333333333333e+00
+302 301 -1.66666666666667e+01
+302 148 1.66666666666667e+01
+302 438 8.33333333333333e+00
+302 87 -8.33333333333333e+00
+303 303 5.00000000000000e+01
+303 158 -4.16666666666667e+00
+303 316 4.16666666666667e+00
+303 310 -4.16666666666667e+00
+303 38 4.16666666666667e+00
+303 317 -8.33333333333333e+00
+303 37 4.16666666666667e+00
+303 304 -8.33333333333333e+00
+303 157 8.33333333333333e+00
+303 36 -1.25000000000000e+01
+303 156 -1.25000000000000e+01
+303 305 -8.33333333333333e+00
+303 35 4.16666666666667e+00
+303 311 8.33333333333333e+00
+303 34 4.16666666666667e+00
+303 154 -8.33333333333333e+00
+303 155 4.16666666666667e+00
+303 33 -1.25000000000000e+01
+303 309 -1.25000000000000e+01
+304 304 5.83333333333333e+01
+304 158 8.33333333333333e+00
+304 311 8.33333333333333e+00
+304 315 4.16666666666667e+00
+304 309 -4.16666666666667e+00
+304 38 -4.16666666666667e+00
+304 317 4.16666666666667e+00
+304 37 -4.16666666666667e+00
+304 157 -3.75000000000000e+01
+304 36 4.16666666666667e+00
+304 303 -8.33333333333333e+00
+304 156 8.33333333333333e+00
+304 35 -4.16666666666667e+00
+304 155 4.16666666666667e+00
+304 305 -1.66666666666667e+01
+304 34 -4.16666666666667e+00
+304 310 -1.25000000000000e+01
+304 33 4.16666666666667e+00
+304 153 -8.33333333333333e+00
+305 305 5.83333333333333e+01
+305 156 -4.16666666666667e+00
+305 304 -1.66666666666667e+01
+305 157 8.33333333333333e+00
+305 310 8.33333333333333e+00
+305 38 -4.16666666666667e+00
+305 158 -1.25000000000000e+01
+305 37 -4.16666666666667e+00
+305 316 4.16666666666667e+00
+305 36 4.16666666666667e+00
+305 315 -8.33333333333333e+00
+305 153 4.16666666666667e+00
+305 35 -4.16666666666667e+00
+305 311 -3.75000000000000e+01
+305 34 -4.16666666666667e+00
+305 154 4.16666666666667e+00
+305 303 -8.33333333333333e+00
+305 33 4.16666666666667e+00
+305 309 8.33333333333333e+00
+306 306 1.25000000000000e+02
+306 307 -1.66666666666667e+01
+306 443 -8.33333333333333e+00
+306 88 -4.16666666666667e+00
+306 442 4.16666666666667e+00
+306 311 8.33333333333333e+00
+306 34 -4.16666666666667e+00
+306 309 -3.75000000000000e+01
+306 295 4.16666666666667e+00
+306 35 8.33333333333333e+00
+306 296 -8.33333333333333e+00
+306 308 -1.66666666666667e+01
+306 302 8.33333333333333e+00
+306 89 8.33333333333333e+00
+306 301 8.33333333333333e+00
+306 300 -3.75000000000000e+01
+306 136 -8.33333333333333e+00
+306 154 8.33333333333333e+00
+306 155 8.33333333333333e+00
+306 137 -8.33333333333333e+00
+306 33 -1.25000000000000e+01
+306 167 -8.33333333333333e+00
+306 149 8.33333333333333e+00
+306 166 1.66666666666667e+01
+306 148 -1.66666666666667e+01
+306 165 -2.50000000000000e+01
+306 310 8.33333333333333e+00
+306 87 -1.25000000000000e+01
+307 307 1.25000000000000e+02
+307 443 4.16666666666667e+00
+307 309 8.33333333333333e+00
+307 306 -1.66666666666667e+01
+307 87 -4.16666666666667e+00
+307 441 4.16666666666667e+00
+307 310 -1.25000000000000e+01
+307 33 -4.16666666666667e+00
+307 294 4.16666666666667e+00
+307 296 4.16666666666667e+00
+307 302 -4.16666666666667e+00
+307 301 -1.25000000000000e+01
+307 300 8.33333333333333e+00
+307 135 -8.33333333333333e+00
+307 153 8.33333333333333e+00
+307 137 -8.33333333333333e+00
+307 149 8.33333333333333e+00
+307 155 -1.66666666666667e+01
+307 35 8.33333333333333e+00
+307 34 -1.25000000000000e+01
+307 167 1.66666666666667e+01
+307 308 -1.66666666666667e+01
+307 89 8.33333333333333e+00
+307 166 -7.50000000000000e+01
+307 311 -4.16666666666667e+00
+307 88 -1.25000000000000e+01
+307 165 1.66666666666667e+01
+307 147 -1.66666666666667e+01
+308 308 1.25000000000000e+02
+308 442 4.16666666666667e+00
+308 441 -8.33333333333333e+00
+308 311 -1.25000000000000e+01
+308 309 8.33333333333333e+00
+308 295 4.16666666666667e+00
+308 33 8.33333333333333e+00
+308 294 -8.33333333333333e+00
+308 302 -1.25000000000000e+01
+308 301 -4.16666666666667e+00
+308 306 -1.66666666666667e+01
+308 300 8.33333333333333e+00
+308 87 8.33333333333333e+00
+308 136 -8.33333333333333e+00
+308 148 8.33333333333333e+00
+308 35 -3.75000000000000e+01
+308 154 -1.66666666666667e+01
+308 34 8.33333333333333e+00
+308 153 8.33333333333333e+00
+308 135 -8.33333333333333e+00
+308 167 -2.50000000000000e+01
+308 310 -4.16666666666667e+00
+308 89 -3.75000000000000e+01
+308 166 1.66666666666667e+01
+308 307 -1.66666666666667e+01
+308 88 8.33333333333333e+00
+308 165 -8.33333333333333e+00
+308 147 8.33333333333333e+00
+309 309 1.25000000000000e+02
+309 157 8.33333333333333e+00
+309 158 8.33333333333333e+00
+309 305 8.33333333333333e+00
+309 303 -1.25000000000000e+01
+309 317 8.33333333333333e+00
+309 316 8.33333333333333e+00
+309 310 -1.66666666666667e+01
+309 315 -3.75000000000000e+01
+309 170 -8.33333333333333e+00
+309 311 -1.66666666666667e+01
+309 155 -8.33333333333333e+00
+309 167 8.33333333333333e+00
+309 307 8.33333333333333e+00
+309 169 1.66666666666667e+01
+309 166 -1.66666666666667e+01
+309 308 8.33333333333333e+00
+309 35 -8.33333333333333e+00
+309 34 4.16666666666667e+00
+309 154 -8.33333333333333e+00
+309 306 -3.75000000000000e+01
+309 443 8.33333333333333e+00
+309 92 -8.33333333333333e+00
+309 442 -4.16666666666667e+00
+309 91 4.16666666666667e+00
+309 441 -1.25000000000000e+01
+309 304 -4.16666666666667e+00
+309 168 -2.50000000000000e+01
+310 310 1.25000000000000e+02
+310 303 -4.16666666666667e+00
+310 156 8.33333333333333e+00
+310 158 -1.66666666666667e+01
+310 35 4.16666666666667e+00
+310 304 -1.25000000000000e+01
+310 317 -4.16666666666667e+00
+310 92 4.16666666666667e+00
+310 316 -1.25000000000000e+01
+310 315 8.33333333333333e+00
+310 309 -1.66666666666667e+01
+310 308 -4.16666666666667e+00
+310 306 8.33333333333333e+00
+310 155 -8.33333333333333e+00
+310 167 8.33333333333333e+00
+310 168 1.66666666666667e+01
+310 165 -1.66666666666667e+01
+310 307 -1.25000000000000e+01
+310 33 4.16666666666667e+00
+310 153 -8.33333333333333e+00
+310 443 8.33333333333333e+00
+310 311 -1.66666666666667e+01
+310 170 1.66666666666667e+01
+310 442 -1.25000000000000e+01
+310 305 8.33333333333333e+00
+310 169 -7.50000000000000e+01
+310 441 -4.16666666666667e+00
+310 90 4.16666666666667e+00
+311 311 1.25000000000000e+02
+311 157 -1.66666666666667e+01
+311 156 8.33333333333333e+00
+311 305 -3.75000000000000e+01
+311 34 4.16666666666667e+00
+311 303 8.33333333333333e+00
+311 317 -1.25000000000000e+01
+311 316 -4.16666666666667e+00
+311 91 4.16666666666667e+00
+311 315 8.33333333333333e+00
+311 168 -8.33333333333333e+00
+311 307 -4.16666666666667e+00
+311 309 -1.66666666666667e+01
+311 153 -8.33333333333333e+00
+311 165 8.33333333333333e+00
+311 154 -8.33333333333333e+00
+311 166 8.33333333333333e+00
+311 308 -1.25000000000000e+01
+311 306 8.33333333333333e+00
+311 33 -8.33333333333333e+00
+311 443 -3.75000000000000e+01
+311 304 8.33333333333333e+00
+311 170 -2.50000000000000e+01
+311 442 8.33333333333333e+00
+311 310 -1.66666666666667e+01
+311 169 1.66666666666667e+01
+311 441 8.33333333333333e+00
+311 90 -8.33333333333333e+00
+312 312 5.00000000000000e+01
+312 179 -4.16666666666667e+00
+312 325 4.16666666666667e+00
+312 319 -4.16666666666667e+00
+312 41 4.16666666666667e+00
+312 326 -8.33333333333333e+00
+312 40 4.16666666666667e+00
+312 313 -8.33333333333333e+00
+312 178 8.33333333333333e+00
+312 39 -1.25000000000000e+01
+312 177 -1.25000000000000e+01
+312 314 -8.33333333333333e+00
+312 38 4.16666666666667e+00
+312 320 8.33333333333333e+00
+312 37 4.16666666666667e+00
+312 175 -8.33333333333333e+00
+312 176 4.16666666666667e+00
+312 36 -1.25000000000000e+01
+312 318 -1.25000000000000e+01
+313 313 5.83333333333333e+01
+313 179 8.33333333333333e+00
+313 320 8.33333333333333e+00
+313 324 4.16666666666667e+00
+313 318 -4.16666666666667e+00
+313 41 -4.16666666666667e+00
+313 326 4.16666666666667e+00
+313 40 -4.16666666666667e+00
+313 178 -3.75000000000000e+01
+313 39 4.16666666666667e+00
+313 312 -8.33333333333333e+00
+313 177 8.33333333333333e+00
+313 38 -4.16666666666667e+00
+313 176 4.16666666666667e+00
+313 314 -1.66666666666667e+01
+313 37 -4.16666666666667e+00
+313 319 -1.25000000000000e+01
+313 36 4.16666666666667e+00
+313 174 -8.33333333333333e+00
+314 314 5.83333333333333e+01
+314 177 -4.16666666666667e+00
+314 313 -1.66666666666667e+01
+314 178 8.33333333333333e+00
+314 319 8.33333333333333e+00
+314 41 -4.16666666666667e+00
+314 179 -1.25000000000000e+01
+314 40 -4.16666666666667e+00
+314 325 4.16666666666667e+00
+314 39 4.16666666666667e+00
+314 324 -8.33333333333333e+00
+314 174 4.16666666666667e+00
+314 38 -4.16666666666667e+00
+314 320 -3.75000000000000e+01
+314 37 -4.16666666666667e+00
+314 175 4.16666666666667e+00
+314 312 -8.33333333333333e+00
+314 36 4.16666666666667e+00
+314 318 8.33333333333333e+00
+315 315 1.25000000000000e+02
+315 316 -1.66666666666667e+01
+315 446 -8.33333333333333e+00
+315 91 -4.16666666666667e+00
+315 445 4.16666666666667e+00
+315 320 8.33333333333333e+00
+315 37 -4.16666666666667e+00
+315 318 -3.75000000000000e+01
+315 304 4.16666666666667e+00
+315 38 8.33333333333333e+00
+315 305 -8.33333333333333e+00
+315 317 -1.66666666666667e+01
+315 311 8.33333333333333e+00
+315 92 8.33333333333333e+00
+315 310 8.33333333333333e+00
+315 309 -3.75000000000000e+01
+315 157 -8.33333333333333e+00
+315 175 8.33333333333333e+00
+315 176 8.33333333333333e+00
+315 158 -8.33333333333333e+00
+315 36 -1.25000000000000e+01
+315 188 -8.33333333333333e+00
+315 170 8.33333333333333e+00
+315 187 1.66666666666667e+01
+315 169 -1.66666666666667e+01
+315 186 -2.50000000000000e+01
+315 319 8.33333333333333e+00
+315 90 -1.25000000000000e+01
+316 316 1.25000000000000e+02
+316 446 4.16666666666667e+00
+316 318 8.33333333333333e+00
+316 315 -1.66666666666667e+01
+316 90 -4.16666666666667e+00
+316 444 4.16666666666667e+00
+316 319 -1.25000000000000e+01
+316 36 -4.16666666666667e+00
+316 303 4.16666666666667e+00
+316 305 4.16666666666667e+00
+316 311 -4.16666666666667e+00
+316 310 -1.25000000000000e+01
+316 309 8.33333333333333e+00
+316 156 -8.33333333333333e+00
+316 174 8.33333333333333e+00
+316 158 -8.33333333333333e+00
+316 170 8.33333333333333e+00
+316 176 -1.66666666666667e+01
+316 38 8.33333333333333e+00
+316 37 -1.25000000000000e+01
+316 188 1.66666666666667e+01
+316 317 -1.66666666666667e+01
+316 92 8.33333333333333e+00
+316 187 -7.50000000000000e+01
+316 320 -4.16666666666667e+00
+316 91 -1.25000000000000e+01
+316 186 1.66666666666667e+01
+316 168 -1.66666666666667e+01
+317 317 1.25000000000000e+02
+317 445 4.16666666666667e+00
+317 444 -8.33333333333333e+00
+317 320 -1.25000000000000e+01
+317 318 8.33333333333333e+00
+317 304 4.16666666666667e+00
+317 36 8.33333333333333e+00
+317 303 -8.33333333333333e+00
+317 311 -1.25000000000000e+01
+317 310 -4.16666666666667e+00
+317 315 -1.66666666666667e+01
+317 309 8.33333333333333e+00
+317 90 8.33333333333333e+00
+317 157 -8.33333333333333e+00
+317 169 8.33333333333333e+00
+317 38 -3.75000000000000e+01
+317 175 -1.66666666666667e+01
+317 37 8.33333333333333e+00
+317 174 8.33333333333333e+00
+317 156 -8.33333333333333e+00
+317 188 -2.50000000000000e+01
+317 319 -4.16666666666667e+00
+317 92 -3.75000000000000e+01
+317 187 1.66666666666667e+01
+317 316 -1.66666666666667e+01
+317 91 8.33333333333333e+00
+317 186 -8.33333333333333e+00
+317 168 8.33333333333333e+00
+318 318 1.25000000000000e+02
+318 178 8.33333333333333e+00
+318 179 8.33333333333333e+00
+318 314 8.33333333333333e+00
+318 312 -1.25000000000000e+01
+318 326 8.33333333333333e+00
+318 325 8.33333333333333e+00
+318 319 -1.66666666666667e+01
+318 324 -3.75000000000000e+01
+318 191 -8.33333333333333e+00
+318 320 -1.66666666666667e+01
+318 176 -8.33333333333333e+00
+318 188 8.33333333333333e+00
+318 316 8.33333333333333e+00
+318 190 1.66666666666667e+01
+318 187 -1.66666666666667e+01
+318 317 8.33333333333333e+00
+318 38 -8.33333333333333e+00
+318 37 4.16666666666667e+00
+318 175 -8.33333333333333e+00
+318 315 -3.75000000000000e+01
+318 446 8.33333333333333e+00
+318 95 -8.33333333333333e+00
+318 445 -4.16666666666667e+00
+318 94 4.16666666666667e+00
+318 444 -1.25000000000000e+01
+318 313 -4.16666666666667e+00
+318 189 -2.50000000000000e+01
+319 319 1.25000000000000e+02
+319 312 -4.16666666666667e+00
+319 177 8.33333333333333e+00
+319 179 -1.66666666666667e+01
+319 38 4.16666666666667e+00
+319 313 -1.25000000000000e+01
+319 326 -4.16666666666667e+00
+319 95 4.16666666666667e+00
+319 325 -1.25000000000000e+01
+319 324 8.33333333333333e+00
+319 318 -1.66666666666667e+01
+319 317 -4.16666666666667e+00
+319 315 8.33333333333333e+00
+319 176 -8.33333333333333e+00
+319 188 8.33333333333333e+00
+319 189 1.66666666666667e+01
+319 186 -1.66666666666667e+01
+319 316 -1.25000000000000e+01
+319 36 4.16666666666667e+00
+319 174 -8.33333333333333e+00
+319 446 8.33333333333333e+00
+319 320 -1.66666666666667e+01
+319 191 1.66666666666667e+01
+319 445 -1.25000000000000e+01
+319 314 8.33333333333333e+00
+319 190 -7.50000000000000e+01
+319 444 -4.16666666666667e+00
+319 93 4.16666666666667e+00
+320 320 1.25000000000000e+02
+320 178 -1.66666666666667e+01
+320 177 8.33333333333333e+00
+320 314 -3.75000000000000e+01
+320 37 4.16666666666667e+00
+320 312 8.33333333333333e+00
+320 326 -1.25000000000000e+01
+320 325 -4.16666666666667e+00
+320 94 4.16666666666667e+00
+320 324 8.33333333333333e+00
+320 189 -8.33333333333333e+00
+320 316 -4.16666666666667e+00
+320 318 -1.66666666666667e+01
+320 174 -8.33333333333333e+00
+320 186 8.33333333333333e+00
+320 175 -8.33333333333333e+00
+320 187 8.33333333333333e+00
+320 317 -1.25000000000000e+01
+320 315 8.33333333333333e+00
+320 36 -8.33333333333333e+00
+320 446 -3.75000000000000e+01
+320 313 8.33333333333333e+00
+320 191 -2.50000000000000e+01
+320 445 8.33333333333333e+00
+320 319 -1.66666666666667e+01
+320 190 1.66666666666667e+01
+320 444 8.33333333333333e+00
+320 93 -8.33333333333333e+00
+321 321 1.00000000000000e+00
+321 200 -8.33333333333333e-02
+321 334 8.33333333333333e-02
+321 328 -8.33333333333333e-02
+321 44 8.33333333333333e-02
+321 335 -1.66666666666667e-01
+321 43 8.33333333333333e-02
+321 322 -1.66666666666667e-01
+321 199 1.66666666666667e-01
+321 42 -2.50000000000000e-01
+321 198 -2.50000000000000e-01
+321 323 -1.66666666666667e-01
+321 41 8.33333333333333e-02
+321 329 1.66666666666667e-01
+321 40 8.33333333333333e-02
+321 196 -1.66666666666667e-01
+321 197 8.33333333333333e-02
+321 39 -2.50000000000000e-01
+321 327 -2.50000000000000e-01
+322 322 1.16666666666667e+00
+322 200 1.66666666666667e-01
+322 329 1.66666666666667e-01
+322 333 8.33333333333333e-02
+322 327 -8.33333333333333e-02
+322 44 -8.33333333333333e-02
+322 335 8.33333333333333e-02
+322 43 -8.33333333333333e-02
+322 199 -7.50000000000000e-01
+322 42 8.33333333333333e-02
+322 321 -1.66666666666667e-01
+322 198 1.66666666666667e-01
+322 41 -8.33333333333333e-02
+322 197 8.33333333333333e-02
+322 323 -3.33333333333333e-01
+322 40 -8.33333333333333e-02
+322 328 -2.50000000000000e-01
+322 39 8.33333333333333e-02
+322 195 -1.66666666666667e-01
+323 323 1.16666666666667e+00
+323 198 -8.33333333333333e-02
+323 322 -3.33333333333333e-01
+323 199 1.66666666666667e-01
+323 328 1.66666666666667e-01
+323 44 -8.33333333333333e-02
+323 200 -2.50000000000000e-01
+323 43 -8.33333333333333e-02
+323 334 8.33333333333333e-02
+323 42 8.33333333333333e-02
+323 333 -1.66666666666667e-01
+323 195 8.33333333333333e-02
+323 41 -8.33333333333333e-02
+323 329 -7.50000000000000e-01
+323 40 -8.33333333333333e-02
+323 196 8.33333333333333e-02
+323 321 -1.66666666666667e-01
+323 39 8.33333333333333e-02
+323 327 1.66666666666667e-01
+324 324 6.78333333333333e+01
+324 325 -3.33333333333333e-01
+324 449 -1.66666666666667e-01
+324 94 -8.33333333333333e-02
+324 448 8.33333333333333e-02
+324 329 1.66666666666667e-01
+324 40 -8.33333333333333e-02
+324 327 -7.50000000000000e-01
+324 313 4.16666666666667e+00
+324 41 4.25000000000000e+00
+324 314 -8.33333333333333e+00
+324 326 -8.50000000000000e+00
+324 320 8.33333333333333e+00
+324 95 4.25000000000000e+00
+324 319 8.33333333333333e+00
+324 318 -3.75000000000000e+01
+324 178 -8.33333333333333e+00
+324 196 4.25000000000000e+00
+324 197 4.25000000000000e+00
+324 179 -8.33333333333333e+00
+324 39 -8.41666666666667e+00
+324 209 -4.25000000000000e+00
+324 191 8.33333333333333e+00
+324 208 8.50000000000000e+00
+324 190 -1.66666666666667e+01
+324 207 -1.27500000000000e+01
+324 328 1.66666666666667e-01
+324 93 -8.41666666666667e+00
+325 325 6.78333333333333e+01
+325 449 8.33333333333333e-02
+325 327 1.66666666666667e-01
+325 324 -3.33333333333333e-01
+325 93 -8.33333333333333e-02
+325 447 8.33333333333333e-02
+325 328 -2.50000000000000e-01
+325 39 -8.33333333333333e-02
+325 312 4.16666666666667e+00
+325 314 4.16666666666667e+00
+325 320 -4.16666666666667e+00
+325 319 -1.25000000000000e+01
+325 318 8.33333333333333e+00
+325 177 -8.33333333333333e+00
+325 195 4.25000000000000e+00
+325 179 -8.33333333333333e+00
+325 191 8.33333333333333e+00
+325 197 -8.50000000000000e+00
+325 41 4.25000000000000e+00
+325 40 -8.41666666666667e+00
+325 209 8.50000000000000e+00
+325 326 -8.50000000000000e+00
+325 95 4.25000000000000e+00
+325 208 -3.82500000000000e+01
+325 329 -8.33333333333333e-02
+325 94 -8.41666666666667e+00
+325 207 8.50000000000000e+00
+325 189 -1.66666666666667e+01
+326 326 7.60000000000000e+01
+326 448 8.33333333333333e-02
+326 447 -1.66666666666667e-01
+326 329 -2.50000000000000e-01
+326 327 1.66666666666667e-01
+326 313 4.16666666666667e+00
+326 39 4.25000000000000e+00
+326 312 -8.33333333333333e+00
+326 320 -1.25000000000000e+01
+326 319 -4.16666666666667e+00
+326 324 -8.50000000000000e+00
+326 318 8.33333333333333e+00
+326 93 4.25000000000000e+00
+326 178 -8.33333333333333e+00
+326 190 8.33333333333333e+00
+326 41 -2.52500000000000e+01
+326 196 -8.50000000000000e+00
+326 40 4.25000000000000e+00
+326 195 4.25000000000000e+00
+326 177 -8.33333333333333e+00
+326 209 -1.27500000000000e+01
+326 328 -8.33333333333333e-02
+326 95 -2.52500000000000e+01
+326 208 8.50000000000000e+00
+326 325 -8.50000000000000e+00
+326 94 4.25000000000000e+00
+326 207 -4.25000000000000e+00
+326 189 8.33333333333333e+00
+327 327 2.50000000000000e+00
+327 199 1.66666666666667e-01
+327 200 1.66666666666667e-01
+327 323 1.66666666666667e-01
+327 321 -2.50000000000000e-01
+327 335 1.66666666666667e-01
+327 334 1.66666666666667e-01
+327 328 -3.33333333333333e-01
+327 333 -7.50000000000000e-01
+327 212 -1.66666666666667e-01
+327 329 -3.33333333333333e-01
+327 197 -1.66666666666667e-01
+327 209 1.66666666666667e-01
+327 325 1.66666666666667e-01
+327 211 3.33333333333333e-01
+327 208 -3.33333333333333e-01
+327 326 1.66666666666667e-01
+327 41 -1.66666666666667e-01
+327 40 8.33333333333333e-02
+327 196 -1.66666666666667e-01
+327 324 -7.50000000000000e-01
+327 449 1.66666666666667e-01
+327 98 -1.66666666666667e-01
+327 448 -8.33333333333333e-02
+327 97 8.33333333333333e-02
+327 447 -2.50000000000000e-01
+327 322 -8.33333333333333e-02
+327 210 -5.00000000000000e-01
+328 328 2.50000000000000e+00
+328 321 -8.33333333333333e-02
+328 198 1.66666666666667e-01
+328 200 -3.33333333333333e-01
+328 41 8.33333333333333e-02
+328 322 -2.50000000000000e-01
+328 335 -8.33333333333333e-02
+328 98 8.33333333333333e-02
+328 334 -2.50000000000000e-01
+328 333 1.66666666666667e-01
+328 327 -3.33333333333333e-01
+328 326 -8.33333333333333e-02
+328 324 1.66666666666667e-01
+328 197 -1.66666666666667e-01
+328 209 1.66666666666667e-01
+328 210 3.33333333333333e-01
+328 207 -3.33333333333333e-01
+328 325 -2.50000000000000e-01
+328 39 8.33333333333333e-02
+328 195 -1.66666666666667e-01
+328 449 1.66666666666667e-01
+328 329 -3.33333333333333e-01
+328 212 3.33333333333333e-01
+328 448 -2.50000000000000e-01
+328 323 1.66666666666667e-01
+328 211 -1.50000000000000e+00
+328 447 -8.33333333333333e-02
+328 96 8.33333333333333e-02
+329 329 2.50000000000000e+00
+329 199 -3.33333333333333e-01
+329 198 1.66666666666667e-01
+329 323 -7.50000000000000e-01
+329 40 8.33333333333333e-02
+329 321 1.66666666666667e-01
+329 335 -2.50000000000000e-01
+329 334 -8.33333333333333e-02
+329 97 8.33333333333333e-02
+329 333 1.66666666666667e-01
+329 210 -1.66666666666667e-01
+329 325 -8.33333333333333e-02
+329 327 -3.33333333333333e-01
+329 195 -1.66666666666667e-01
+329 207 1.66666666666667e-01
+329 196 -1.66666666666667e-01
+329 208 1.66666666666667e-01
+329 326 -2.50000000000000e-01
+329 324 1.66666666666667e-01
+329 39 -1.66666666666667e-01
+329 449 -7.50000000000000e-01
+329 322 1.66666666666667e-01
+329 212 -5.00000000000000e-01
+329 448 1.66666666666667e-01
+329 328 -3.33333333333333e-01
+329 211 3.33333333333333e-01
+329 447 1.66666666666667e-01
+329 96 -1.66666666666667e-01
+330 330 1.00000000000000e+00
+330 221 -8.33333333333333e-02
+330 343 8.33333333333333e-02
+330 337 -8.33333333333333e-02
+330 47 8.33333333333333e-02
+330 344 -1.66666666666667e-01
+330 46 8.33333333333333e-02
+330 331 -1.66666666666667e-01
+330 220 1.66666666666667e-01
+330 45 -2.50000000000000e-01
+330 219 -2.50000000000000e-01
+330 332 -1.66666666666667e-01
+330 44 8.33333333333333e-02
+330 338 1.66666666666667e-01
+330 43 8.33333333333333e-02
+330 217 -1.66666666666667e-01
+330 218 8.33333333333333e-02
+330 42 -2.50000000000000e-01
+330 336 -2.50000000000000e-01
+331 331 1.16666666666667e+00
+331 221 1.66666666666667e-01
+331 338 1.66666666666667e-01
+331 342 8.33333333333333e-02
+331 336 -8.33333333333333e-02
+331 47 -8.33333333333333e-02
+331 344 8.33333333333333e-02
+331 46 -8.33333333333333e-02
+331 220 -7.50000000000000e-01
+331 45 8.33333333333333e-02
+331 330 -1.66666666666667e-01
+331 219 1.66666666666667e-01
+331 44 -8.33333333333333e-02
+331 218 8.33333333333333e-02
+331 332 -3.33333333333333e-01
+331 43 -8.33333333333333e-02
+331 337 -2.50000000000000e-01
+331 42 8.33333333333333e-02
+331 216 -1.66666666666667e-01
+332 332 1.16666666666667e+00
+332 219 -8.33333333333333e-02
+332 331 -3.33333333333333e-01
+332 220 1.66666666666667e-01
+332 337 1.66666666666667e-01
+332 47 -8.33333333333333e-02
+332 221 -2.50000000000000e-01
+332 46 -8.33333333333333e-02
+332 343 8.33333333333333e-02
+332 45 8.33333333333333e-02
+332 342 -1.66666666666667e-01
+332 216 8.33333333333333e-02
+332 44 -8.33333333333333e-02
+332 338 -7.50000000000000e-01
+332 43 -8.33333333333333e-02
+332 217 8.33333333333333e-02
+332 330 -1.66666666666667e-01
+332 42 8.33333333333333e-02
+332 336 1.66666666666667e-01
+333 333 2.50000000000000e+00
+333 334 -3.33333333333333e-01
+333 452 -1.66666666666667e-01
+333 97 -8.33333333333333e-02
+333 451 8.33333333333333e-02
+333 338 1.66666666666667e-01
+333 43 -8.33333333333333e-02
+333 336 -7.50000000000000e-01
+333 322 8.33333333333333e-02
+333 44 1.66666666666667e-01
+333 323 -1.66666666666667e-01
+333 335 -3.33333333333333e-01
+333 329 1.66666666666667e-01
+333 98 1.66666666666667e-01
+333 328 1.66666666666667e-01
+333 327 -7.50000000000000e-01
+333 199 -1.66666666666667e-01
+333 217 1.66666666666667e-01
+333 218 1.66666666666667e-01
+333 200 -1.66666666666667e-01
+333 42 -2.50000000000000e-01
+333 230 -1.66666666666667e-01
+333 212 1.66666666666667e-01
+333 229 3.33333333333333e-01
+333 211 -3.33333333333333e-01
+333 228 -5.00000000000000e-01
+333 337 1.66666666666667e-01
+333 96 -2.50000000000000e-01
+334 334 2.50000000000000e+00
+334 452 8.33333333333333e-02
+334 336 1.66666666666667e-01
+334 333 -3.33333333333333e-01
+334 96 -8.33333333333333e-02
+334 450 8.33333333333333e-02
+334 337 -2.50000000000000e-01
+334 42 -8.33333333333333e-02
+334 321 8.33333333333333e-02
+334 323 8.33333333333333e-02
+334 329 -8.33333333333333e-02
+334 328 -2.50000000000000e-01
+334 327 1.66666666666667e-01
+334 198 -1.66666666666667e-01
+334 216 1.66666666666667e-01
+334 200 -1.66666666666667e-01
+334 212 1.66666666666667e-01
+334 218 -3.33333333333333e-01
+334 44 1.66666666666667e-01
+334 43 -2.50000000000000e-01
+334 230 3.33333333333333e-01
+334 335 -3.33333333333333e-01
+334 98 1.66666666666667e-01
+334 229 -1.50000000000000e+00
+334 338 -8.33333333333333e-02
+334 97 -2.50000000000000e-01
+334 228 3.33333333333333e-01
+334 210 -3.33333333333333e-01
+335 335 2.50000000000000e+00
+335 451 8.33333333333333e-02
+335 450 -1.66666666666667e-01
+335 338 -2.50000000000000e-01
+335 336 1.66666666666667e-01
+335 322 8.33333333333333e-02
+335 42 1.66666666666667e-01
+335 321 -1.66666666666667e-01
+335 329 -2.50000000000000e-01
+335 328 -8.33333333333333e-02
+335 333 -3.33333333333333e-01
+335 327 1.66666666666667e-01
+335 96 1.66666666666667e-01
+335 199 -1.66666666666667e-01
+335 211 1.66666666666667e-01
+335 44 -7.50000000000000e-01
+335 217 -3.33333333333333e-01
+335 43 1.66666666666667e-01
+335 216 1.66666666666667e-01
+335 198 -1.66666666666667e-01
+335 230 -5.00000000000000e-01
+335 337 -8.33333333333333e-02
+335 98 -7.50000000000000e-01
+335 229 3.33333333333333e-01
+335 334 -3.33333333333333e-01
+335 97 1.66666666666667e-01
+335 228 -1.66666666666667e-01
+335 210 1.66666666666667e-01
+336 336 2.50000000000000e+00
+336 220 1.66666666666667e-01
+336 221 1.66666666666667e-01
+336 332 1.66666666666667e-01
+336 330 -2.50000000000000e-01
+336 344 1.66666666666667e-01
+336 343 1.66666666666667e-01
+336 337 -3.33333333333333e-01
+336 342 -7.50000000000000e-01
+336 233 -1.66666666666667e-01
+336 338 -3.33333333333333e-01
+336 218 -1.66666666666667e-01
+336 230 1.66666666666667e-01
+336 334 1.66666666666667e-01
+336 232 3.33333333333333e-01
+336 229 -3.33333333333333e-01
+336 335 1.66666666666667e-01
+336 44 -1.66666666666667e-01
+336 43 8.33333333333333e-02
+336 217 -1.66666666666667e-01
+336 333 -7.50000000000000e-01
+336 452 1.66666666666667e-01
+336 101 -1.66666666666667e-01
+336 451 -8.33333333333333e-02
+336 100 8.33333333333333e-02
+336 450 -2.50000000000000e-01
+336 331 -8.33333333333333e-02
+336 231 -5.00000000000000e-01
+337 337 2.50000000000000e+00
+337 330 -8.33333333333333e-02
+337 219 1.66666666666667e-01
+337 221 -3.33333333333333e-01
+337 44 8.33333333333333e-02
+337 331 -2.50000000000000e-01
+337 344 -8.33333333333333e-02
+337 101 8.33333333333333e-02
+337 343 -2.50000000000000e-01
+337 342 1.66666666666667e-01
+337 336 -3.33333333333333e-01
+337 335 -8.33333333333333e-02
+337 333 1.66666666666667e-01
+337 218 -1.66666666666667e-01
+337 230 1.66666666666667e-01
+337 231 3.33333333333333e-01
+337 228 -3.33333333333333e-01
+337 334 -2.50000000000000e-01
+337 42 8.33333333333333e-02
+337 216 -1.66666666666667e-01
+337 452 1.66666666666667e-01
+337 338 -3.33333333333333e-01
+337 233 3.33333333333333e-01
+337 451 -2.50000000000000e-01
+337 332 1.66666666666667e-01
+337 232 -1.50000000000000e+00
+337 450 -8.33333333333333e-02
+337 99 8.33333333333333e-02
+338 338 2.50000000000000e+00
+338 220 -3.33333333333333e-01
+338 219 1.66666666666667e-01
+338 332 -7.50000000000000e-01
+338 43 8.33333333333333e-02
+338 330 1.66666666666667e-01
+338 344 -2.50000000000000e-01
+338 343 -8.33333333333333e-02
+338 100 8.33333333333333e-02
+338 342 1.66666666666667e-01
+338 231 -1.66666666666667e-01
+338 334 -8.33333333333333e-02
+338 336 -3.33333333333333e-01
+338 216 -1.66666666666667e-01
+338 228 1.66666666666667e-01
+338 217 -1.66666666666667e-01
+338 229 1.66666666666667e-01
+338 335 -2.50000000000000e-01
+338 333 1.66666666666667e-01
+338 42 -1.66666666666667e-01
+338 452 -7.50000000000000e-01
+338 331 1.66666666666667e-01
+338 233 -5.00000000000000e-01
+338 451 1.66666666666667e-01
+338 337 -3.33333333333333e-01
+338 232 3.33333333333333e-01
+338 450 1.66666666666667e-01
+338 99 -1.66666666666667e-01
+339 339 1.00000000000000e+00
+339 242 -8.33333333333333e-02
+339 352 8.33333333333333e-02
+339 346 -8.33333333333333e-02
+339 50 8.33333333333333e-02
+339 353 -1.66666666666667e-01
+339 49 8.33333333333333e-02
+339 340 -1.66666666666667e-01
+339 241 1.66666666666667e-01
+339 48 -2.50000000000000e-01
+339 240 -2.50000000000000e-01
+339 341 -1.66666666666667e-01
+339 47 8.33333333333333e-02
+339 347 1.66666666666667e-01
+339 46 8.33333333333333e-02
+339 238 -1.66666666666667e-01
+339 239 8.33333333333333e-02
+339 45 -2.50000000000000e-01
+339 345 -2.50000000000000e-01
+340 340 1.16666666666667e+00
+340 242 1.66666666666667e-01
+340 347 1.66666666666667e-01
+340 351 8.33333333333333e-02
+340 345 -8.33333333333333e-02
+340 50 -8.33333333333333e-02
+340 353 8.33333333333333e-02
+340 49 -8.33333333333333e-02
+340 241 -7.50000000000000e-01
+340 48 8.33333333333333e-02
+340 339 -1.66666666666667e-01
+340 240 1.66666666666667e-01
+340 47 -8.33333333333333e-02
+340 239 8.33333333333333e-02
+340 341 -3.33333333333333e-01
+340 46 -8.33333333333333e-02
+340 346 -2.50000000000000e-01
+340 45 8.33333333333333e-02
+340 237 -1.66666666666667e-01
+341 341 1.16666666666667e+00
+341 240 -8.33333333333333e-02
+341 340 -3.33333333333333e-01
+341 241 1.66666666666667e-01
+341 346 1.66666666666667e-01
+341 50 -8.33333333333333e-02
+341 242 -2.50000000000000e-01
+341 49 -8.33333333333333e-02
+341 352 8.33333333333333e-02
+341 48 8.33333333333333e-02
+341 351 -1.66666666666667e-01
+341 237 8.33333333333333e-02
+341 47 -8.33333333333333e-02
+341 347 -7.50000000000000e-01
+341 46 -8.33333333333333e-02
+341 238 8.33333333333333e-02
+341 339 -1.66666666666667e-01
+341 45 8.33333333333333e-02
+341 345 1.66666666666667e-01
+342 342 2.50000000000000e+00
+342 343 -3.33333333333333e-01
+342 455 -1.66666666666667e-01
+342 100 -8.33333333333333e-02
+342 454 8.33333333333333e-02
+342 347 1.66666666666667e-01
+342 46 -8.33333333333333e-02
+342 345 -7.50000000000000e-01
+342 331 8.33333333333333e-02
+342 47 1.66666666666667e-01
+342 332 -1.66666666666667e-01
+342 344 -3.33333333333333e-01
+342 338 1.66666666666667e-01
+342 101 1.66666666666667e-01
+342 337 1.66666666666667e-01
+342 336 -7.50000000000000e-01
+342 220 -1.66666666666667e-01
+342 238 1.66666666666667e-01
+342 239 1.66666666666667e-01
+342 221 -1.66666666666667e-01
+342 45 -2.50000000000000e-01
+342 251 -1.66666666666667e-01
+342 233 1.66666666666667e-01
+342 250 3.33333333333333e-01
+342 232 -3.33333333333333e-01
+342 249 -5.00000000000000e-01
+342 346 1.66666666666667e-01
+342 99 -2.50000000000000e-01
+343 343 2.50000000000000e+00
+343 455 8.33333333333333e-02
+343 345 1.66666666666667e-01
+343 342 -3.33333333333333e-01
+343 99 -8.33333333333333e-02
+343 453 8.33333333333333e-02
+343 346 -2.50000000000000e-01
+343 45 -8.33333333333333e-02
+343 330 8.33333333333333e-02
+343 332 8.33333333333333e-02
+343 338 -8.33333333333333e-02
+343 337 -2.50000000000000e-01
+343 336 1.66666666666667e-01
+343 219 -1.66666666666667e-01
+343 237 1.66666666666667e-01
+343 221 -1.66666666666667e-01
+343 233 1.66666666666667e-01
+343 239 -3.33333333333333e-01
+343 47 1.66666666666667e-01
+343 46 -2.50000000000000e-01
+343 251 3.33333333333333e-01
+343 344 -3.33333333333333e-01
+343 101 1.66666666666667e-01
+343 250 -1.50000000000000e+00
+343 347 -8.33333333333333e-02
+343 100 -2.50000000000000e-01
+343 249 3.33333333333333e-01
+343 231 -3.33333333333333e-01
+344 344 2.50000000000000e+00
+344 454 8.33333333333333e-02
+344 453 -1.66666666666667e-01
+344 347 -2.50000000000000e-01
+344 345 1.66666666666667e-01
+344 331 8.33333333333333e-02
+344 45 1.66666666666667e-01
+344 330 -1.66666666666667e-01
+344 338 -2.50000000000000e-01
+344 337 -8.33333333333333e-02
+344 342 -3.33333333333333e-01
+344 336 1.66666666666667e-01
+344 99 1.66666666666667e-01
+344 220 -1.66666666666667e-01
+344 232 1.66666666666667e-01
+344 47 -7.50000000000000e-01
+344 238 -3.33333333333333e-01
+344 46 1.66666666666667e-01
+344 237 1.66666666666667e-01
+344 219 -1.66666666666667e-01
+344 251 -5.00000000000000e-01
+344 346 -8.33333333333333e-02
+344 101 -7.50000000000000e-01
+344 250 3.33333333333333e-01
+344 343 -3.33333333333333e-01
+344 100 1.66666666666667e-01
+344 249 -1.66666666666667e-01
+344 231 1.66666666666667e-01
+345 345 2.50000000000000e+00
+345 241 1.66666666666667e-01
+345 242 1.66666666666667e-01
+345 341 1.66666666666667e-01
+345 339 -2.50000000000000e-01
+345 353 1.66666666666667e-01
+345 352 1.66666666666667e-01
+345 346 -3.33333333333333e-01
+345 351 -7.50000000000000e-01
+345 254 -1.66666666666667e-01
+345 347 -3.33333333333333e-01
+345 239 -1.66666666666667e-01
+345 251 1.66666666666667e-01
+345 343 1.66666666666667e-01
+345 253 3.33333333333333e-01
+345 250 -3.33333333333333e-01
+345 344 1.66666666666667e-01
+345 47 -1.66666666666667e-01
+345 46 8.33333333333333e-02
+345 238 -1.66666666666667e-01
+345 342 -7.50000000000000e-01
+345 455 1.66666666666667e-01
+345 104 -1.66666666666667e-01
+345 454 -8.33333333333333e-02
+345 103 8.33333333333333e-02
+345 453 -2.50000000000000e-01
+345 340 -8.33333333333333e-02
+345 252 -5.00000000000000e-01
+346 346 2.50000000000000e+00
+346 339 -8.33333333333333e-02
+346 240 1.66666666666667e-01
+346 242 -3.33333333333333e-01
+346 47 8.33333333333333e-02
+346 340 -2.50000000000000e-01
+346 353 -8.33333333333333e-02
+346 104 8.33333333333333e-02
+346 352 -2.50000000000000e-01
+346 351 1.66666666666667e-01
+346 345 -3.33333333333333e-01
+346 344 -8.33333333333333e-02
+346 342 1.66666666666667e-01
+346 239 -1.66666666666667e-01
+346 251 1.66666666666667e-01
+346 252 3.33333333333333e-01
+346 249 -3.33333333333333e-01
+346 343 -2.50000000000000e-01
+346 45 8.33333333333333e-02
+346 237 -1.66666666666667e-01
+346 455 1.66666666666667e-01
+346 347 -3.33333333333333e-01
+346 254 3.33333333333333e-01
+346 454 -2.50000000000000e-01
+346 341 1.66666666666667e-01
+346 253 -1.50000000000000e+00
+346 453 -8.33333333333333e-02
+346 102 8.33333333333333e-02
+347 347 2.50000000000000e+00
+347 241 -3.33333333333333e-01
+347 240 1.66666666666667e-01
+347 341 -7.50000000000000e-01
+347 46 8.33333333333333e-02
+347 339 1.66666666666667e-01
+347 353 -2.50000000000000e-01
+347 352 -8.33333333333333e-02
+347 103 8.33333333333333e-02
+347 351 1.66666666666667e-01
+347 252 -1.66666666666667e-01
+347 343 -8.33333333333333e-02
+347 345 -3.33333333333333e-01
+347 237 -1.66666666666667e-01
+347 249 1.66666666666667e-01
+347 238 -1.66666666666667e-01
+347 250 1.66666666666667e-01
+347 344 -2.50000000000000e-01
+347 342 1.66666666666667e-01
+347 45 -1.66666666666667e-01
+347 455 -7.50000000000000e-01
+347 340 1.66666666666667e-01
+347 254 -5.00000000000000e-01
+347 454 1.66666666666667e-01
+347 346 -3.33333333333333e-01
+347 253 3.33333333333333e-01
+347 453 1.66666666666667e-01
+347 102 -1.66666666666667e-01
+348 348 1.00000000000000e+00
+348 263 -8.33333333333333e-02
+348 358 8.33333333333333e-02
+348 355 -8.33333333333333e-02
+348 53 8.33333333333333e-02
+348 359 -1.66666666666667e-01
+348 52 8.33333333333333e-02
+348 349 -1.66666666666667e-01
+348 262 1.66666666666667e-01
+348 51 -2.50000000000000e-01
+348 261 -2.50000000000000e-01
+348 350 -1.66666666666667e-01
+348 50 8.33333333333333e-02
+348 356 1.66666666666667e-01
+348 49 8.33333333333333e-02
+348 259 -1.66666666666667e-01
+348 260 8.33333333333333e-02
+348 48 -2.50000000000000e-01
+348 354 -2.50000000000000e-01
+349 349 1.16666666666667e+00
+349 263 1.66666666666667e-01
+349 356 1.66666666666667e-01
+349 357 8.33333333333333e-02
+349 354 -8.33333333333333e-02
+349 53 -8.33333333333333e-02
+349 359 8.33333333333333e-02
+349 52 -8.33333333333333e-02
+349 262 -7.50000000000000e-01
+349 51 8.33333333333333e-02
+349 348 -1.66666666666667e-01
+349 261 1.66666666666667e-01
+349 50 -8.33333333333333e-02
+349 260 8.33333333333333e-02
+349 350 -3.33333333333333e-01
+349 49 -8.33333333333333e-02
+349 355 -2.50000000000000e-01
+349 48 8.33333333333333e-02
+349 258 -1.66666666666667e-01
+350 350 1.16666666666667e+00
+350 261 -8.33333333333333e-02
+350 349 -3.33333333333333e-01
+350 262 1.66666666666667e-01
+350 355 1.66666666666667e-01
+350 53 -8.33333333333333e-02
+350 263 -2.50000000000000e-01
+350 52 -8.33333333333333e-02
+350 358 8.33333333333333e-02
+350 51 8.33333333333333e-02
+350 357 -1.66666666666667e-01
+350 258 8.33333333333333e-02
+350 50 -8.33333333333333e-02
+350 356 -7.50000000000000e-01
+350 49 -8.33333333333333e-02
+350 259 8.33333333333333e-02
+350 348 -1.66666666666667e-01
+350 48 8.33333333333333e-02
+350 354 1.66666666666667e-01
+351 351 2.50000000000000e+00
+351 352 -3.33333333333333e-01
+351 458 -1.66666666666667e-01
+351 103 -8.33333333333333e-02
+351 457 8.33333333333333e-02
+351 356 1.66666666666667e-01
+351 49 -8.33333333333333e-02
+351 354 -7.50000000000000e-01
+351 340 8.33333333333333e-02
+351 50 1.66666666666667e-01
+351 341 -1.66666666666667e-01
+351 353 -3.33333333333333e-01
+351 347 1.66666666666667e-01
+351 104 1.66666666666667e-01
+351 346 1.66666666666667e-01
+351 345 -7.50000000000000e-01
+351 241 -1.66666666666667e-01
+351 259 1.66666666666667e-01
+351 260 1.66666666666667e-01
+351 242 -1.66666666666667e-01
+351 48 -2.50000000000000e-01
+351 272 -1.66666666666667e-01
+351 254 1.66666666666667e-01
+351 271 3.33333333333333e-01
+351 253 -3.33333333333333e-01
+351 270 -5.00000000000000e-01
+351 355 1.66666666666667e-01
+351 102 -2.50000000000000e-01
+352 352 2.50000000000000e+00
+352 458 8.33333333333333e-02
+352 354 1.66666666666667e-01
+352 351 -3.33333333333333e-01
+352 102 -8.33333333333333e-02
+352 456 8.33333333333333e-02
+352 355 -2.50000000000000e-01
+352 48 -8.33333333333333e-02
+352 339 8.33333333333333e-02
+352 341 8.33333333333333e-02
+352 347 -8.33333333333333e-02
+352 346 -2.50000000000000e-01
+352 345 1.66666666666667e-01
+352 240 -1.66666666666667e-01
+352 258 1.66666666666667e-01
+352 242 -1.66666666666667e-01
+352 254 1.66666666666667e-01
+352 260 -3.33333333333333e-01
+352 50 1.66666666666667e-01
+352 49 -2.50000000000000e-01
+352 272 3.33333333333333e-01
+352 353 -3.33333333333333e-01
+352 104 1.66666666666667e-01
+352 271 -1.50000000000000e+00
+352 356 -8.33333333333333e-02
+352 103 -2.50000000000000e-01
+352 270 3.33333333333333e-01
+352 252 -3.33333333333333e-01
+353 353 2.50000000000000e+00
+353 457 8.33333333333333e-02
+353 456 -1.66666666666667e-01
+353 356 -2.50000000000000e-01
+353 354 1.66666666666667e-01
+353 340 8.33333333333333e-02
+353 48 1.66666666666667e-01
+353 339 -1.66666666666667e-01
+353 347 -2.50000000000000e-01
+353 346 -8.33333333333333e-02
+353 351 -3.33333333333333e-01
+353 345 1.66666666666667e-01
+353 102 1.66666666666667e-01
+353 241 -1.66666666666667e-01
+353 253 1.66666666666667e-01
+353 50 -7.50000000000000e-01
+353 259 -3.33333333333333e-01
+353 49 1.66666666666667e-01
+353 258 1.66666666666667e-01
+353 240 -1.66666666666667e-01
+353 272 -5.00000000000000e-01
+353 355 -8.33333333333333e-02
+353 104 -7.50000000000000e-01
+353 271 3.33333333333333e-01
+353 352 -3.33333333333333e-01
+353 103 1.66666666666667e-01
+353 270 -1.66666666666667e-01
+353 252 1.66666666666667e-01
+354 354 2.50000000000000e+00
+354 262 1.66666666666667e-01
+354 263 1.66666666666667e-01
+354 350 1.66666666666667e-01
+354 348 -2.50000000000000e-01
+354 359 1.66666666666667e-01
+354 358 1.66666666666667e-01
+354 355 -3.33333333333333e-01
+354 357 -7.50000000000000e-01
+354 275 -1.66666666666667e-01
+354 356 -3.33333333333333e-01
+354 260 -1.66666666666667e-01
+354 272 1.66666666666667e-01
+354 352 1.66666666666667e-01
+354 274 3.33333333333333e-01
+354 271 -3.33333333333333e-01
+354 353 1.66666666666667e-01
+354 50 -1.66666666666667e-01
+354 49 8.33333333333333e-02
+354 259 -1.66666666666667e-01
+354 351 -7.50000000000000e-01
+354 458 1.66666666666667e-01
+354 107 -1.66666666666667e-01
+354 457 -8.33333333333333e-02
+354 106 8.33333333333333e-02
+354 456 -2.50000000000000e-01
+354 349 -8.33333333333333e-02
+354 273 -5.00000000000000e-01
+355 355 2.50000000000000e+00
+355 348 -8.33333333333333e-02
+355 261 1.66666666666667e-01
+355 263 -3.33333333333333e-01
+355 50 8.33333333333333e-02
+355 349 -2.50000000000000e-01
+355 359 -8.33333333333333e-02
+355 107 8.33333333333333e-02
+355 358 -2.50000000000000e-01
+355 357 1.66666666666667e-01
+355 354 -3.33333333333333e-01
+355 353 -8.33333333333333e-02
+355 351 1.66666666666667e-01
+355 260 -1.66666666666667e-01
+355 272 1.66666666666667e-01
+355 273 3.33333333333333e-01
+355 270 -3.33333333333333e-01
+355 352 -2.50000000000000e-01
+355 48 8.33333333333333e-02
+355 258 -1.66666666666667e-01
+355 458 1.66666666666667e-01
+355 356 -3.33333333333333e-01
+355 275 3.33333333333333e-01
+355 457 -2.50000000000000e-01
+355 350 1.66666666666667e-01
+355 274 -1.50000000000000e+00
+355 456 -8.33333333333333e-02
+355 105 8.33333333333333e-02
+356 356 2.50000000000000e+00
+356 262 -3.33333333333333e-01
+356 261 1.66666666666667e-01
+356 350 -7.50000000000000e-01
+356 49 8.33333333333333e-02
+356 348 1.66666666666667e-01
+356 359 -2.50000000000000e-01
+356 358 -8.33333333333333e-02
+356 106 8.33333333333333e-02
+356 357 1.66666666666667e-01
+356 273 -1.66666666666667e-01
+356 352 -8.33333333333333e-02
+356 354 -3.33333333333333e-01
+356 258 -1.66666666666667e-01
+356 270 1.66666666666667e-01
+356 259 -1.66666666666667e-01
+356 271 1.66666666666667e-01
+356 353 -2.50000000000000e-01
+356 351 1.66666666666667e-01
+356 48 -1.66666666666667e-01
+356 458 -7.50000000000000e-01
+356 349 1.66666666666667e-01
+356 275 -5.00000000000000e-01
+356 457 1.66666666666667e-01
+356 355 -3.33333333333333e-01
+356 274 3.33333333333333e-01
+356 456 1.66666666666667e-01
+356 105 -1.66666666666667e-01
+357 357 1.33333333333333e+00
+357 53 8.33333333333333e-02
+357 350 -1.66666666666667e-01
+357 359 -1.66666666666667e-01
+357 356 1.66666666666667e-01
+357 107 8.33333333333333e-02
+357 355 1.66666666666667e-01
+357 354 -7.50000000000000e-01
+357 262 -1.66666666666667e-01
+357 277 8.33333333333333e-02
+357 278 8.33333333333333e-02
+357 263 -1.66666666666667e-01
+357 51 -1.66666666666667e-01
+357 284 -8.33333333333333e-02
+357 275 1.66666666666667e-01
+357 283 1.66666666666667e-01
+357 274 -3.33333333333333e-01
+357 282 -2.50000000000000e-01
+357 349 8.33333333333333e-02
+357 105 -1.66666666666667e-01
+358 358 1.33333333333333e+00
+358 350 8.33333333333333e-02
+358 356 -8.33333333333333e-02
+358 355 -2.50000000000000e-01
+358 354 1.66666666666667e-01
+358 261 -1.66666666666667e-01
+358 276 8.33333333333333e-02
+358 263 -1.66666666666667e-01
+358 275 1.66666666666667e-01
+358 278 -1.66666666666667e-01
+358 53 8.33333333333333e-02
+358 52 -1.66666666666667e-01
+358 284 1.66666666666667e-01
+358 359 -1.66666666666667e-01
+358 107 8.33333333333333e-02
+358 283 -7.50000000000000e-01
+358 348 8.33333333333333e-02
+358 106 -1.66666666666667e-01
+358 282 1.66666666666667e-01
+358 273 -3.33333333333333e-01
+359 359 1.50000000000000e+00
+359 51 8.33333333333333e-02
+359 348 -1.66666666666667e-01
+359 356 -2.50000000000000e-01
+359 355 -8.33333333333333e-02
+359 357 -1.66666666666667e-01
+359 354 1.66666666666667e-01
+359 105 8.33333333333333e-02
+359 262 -1.66666666666667e-01
+359 274 1.66666666666667e-01
+359 53 -5.00000000000000e-01
+359 277 -1.66666666666667e-01
+359 52 8.33333333333333e-02
+359 276 8.33333333333333e-02
+359 261 -1.66666666666667e-01
+359 284 -2.50000000000000e-01
+359 349 8.33333333333333e-02
+359 107 -5.00000000000000e-01
+359 283 1.66666666666667e-01
+359 358 -1.66666666666667e-01
+359 106 8.33333333333333e-02
+359 282 -8.33333333333333e-02
+359 273 1.66666666666667e-01
+360 360 5.00000000000000e+01
+360 118 0.00000000000000e+00
+360 374 4.16666666666667e+00
+360 368 -4.16666666666667e+00
+360 56 0.00000000000000e+00
+360 119 0.00000000000000e+00
+360 55 0.00000000000000e+00
+360 361 -8.33333333333333e+00
+360 367 8.33333333333333e+00
+360 54 0.00000000000000e+00
+360 366 -1.25000000000000e+01
+360 362 -8.33333333333333e+00
+360 59 4.16666666666667e+00
+360 122 8.33333333333333e+00
+360 58 4.16666666666667e+00
+360 373 -8.33333333333333e+00
+360 121 -4.16666666666667e+00
+360 57 -1.25000000000000e+01
+360 120 -1.25000000000000e+01
+361 361 5.83333333333333e+01
+361 117 0.00000000000000e+00
+361 122 8.33333333333333e+00
+361 362 -1.66666666666667e+01
+361 368 8.33333333333333e+00
+361 56 0.00000000000000e+00
+361 119 0.00000000000000e+00
+361 55 0.00000000000000e+00
+361 367 -3.75000000000000e+01
+361 54 0.00000000000000e+00
+361 360 -8.33333333333333e+00
+361 366 8.33333333333333e+00
+361 59 -4.16666666666667e+00
+361 374 4.16666666666667e+00
+361 120 -4.16666666666667e+00
+361 58 -4.16666666666667e+00
+361 121 -1.25000000000000e+01
+361 57 4.16666666666667e+00
+361 372 -8.33333333333333e+00
+362 362 5.83333333333333e+01
+362 361 -1.66666666666667e+01
+362 367 8.33333333333333e+00
+362 372 4.16666666666667e+00
+362 366 -4.16666666666667e+00
+362 56 0.00000000000000e+00
+362 368 -1.25000000000000e+01
+362 55 0.00000000000000e+00
+362 118 0.00000000000000e+00
+362 54 0.00000000000000e+00
+362 117 0.00000000000000e+00
+362 121 8.33333333333333e+00
+362 59 -4.16666666666667e+00
+362 122 -3.75000000000000e+01
+362 58 -4.16666666666667e+00
+362 373 4.16666666666667e+00
+362 360 -8.33333333333333e+00
+362 57 4.16666666666667e+00
+362 120 8.33333333333333e+00
+363 363 1.00000000000000e+00
+363 124 0.00000000000000e+00
+363 365 0.00000000000000e+00
+363 125 0.00000000000000e+00
+363 368 0.00000000000000e+00
+363 83 0.00000000000000e+00
+363 437 0.00000000000000e+00
+363 82 0.00000000000000e+00
+363 436 0.00000000000000e+00
+363 81 0.00000000000000e+00
+363 123 0.00000000000000e+00
+363 56 0.00000000000000e+00
+363 119 0.00000000000000e+00
+363 364 0.00000000000000e+00
+363 55 0.00000000000000e+00
+363 367 0.00000000000000e+00
+363 118 0.00000000000000e+00
+363 54 0.00000000000000e+00
+363 366 0.00000000000000e+00
+364 364 1.00000000000000e+00
+364 123 0.00000000000000e+00
+364 437 0.00000000000000e+00
+364 368 0.00000000000000e+00
+364 83 0.00000000000000e+00
+364 365 0.00000000000000e+00
+364 125 0.00000000000000e+00
+364 82 0.00000000000000e+00
+364 124 0.00000000000000e+00
+364 81 0.00000000000000e+00
+364 435 0.00000000000000e+00
+364 56 0.00000000000000e+00
+364 119 0.00000000000000e+00
+364 117 0.00000000000000e+00
+364 55 0.00000000000000e+00
+364 367 0.00000000000000e+00
+364 363 0.00000000000000e+00
+364 54 0.00000000000000e+00
+364 366 0.00000000000000e+00
+365 365 1.00000000000000e+00
+365 367 0.00000000000000e+00
+365 363 0.00000000000000e+00
+365 123 0.00000000000000e+00
+365 366 0.00000000000000e+00
+365 83 0.00000000000000e+00
+365 125 0.00000000000000e+00
+365 82 0.00000000000000e+00
+365 364 0.00000000000000e+00
+365 124 0.00000000000000e+00
+365 81 0.00000000000000e+00
+365 435 0.00000000000000e+00
+365 436 0.00000000000000e+00
+365 56 0.00000000000000e+00
+365 368 0.00000000000000e+00
+365 55 0.00000000000000e+00
+365 118 0.00000000000000e+00
+365 54 0.00000000000000e+00
+365 117 0.00000000000000e+00
+366 366 1.25000000000000e+02
+366 125 0.00000000000000e+00
+366 124 0.00000000000000e+00
+366 56 0.00000000000000e+00
+366 364 0.00000000000000e+00
+366 363 0.00000000000000e+00
+366 437 -4.16666666666667e+00
+366 86 4.16666666666667e+00
+366 436 8.33333333333333e+00
+366 435 -1.25000000000000e+01
+366 119 0.00000000000000e+00
+366 118 0.00000000000000e+00
+366 122 8.33333333333333e+00
+366 362 -4.16666666666667e+00
+366 367 -1.66666666666667e+01
+366 121 8.33333333333333e+00
+366 127 -8.33333333333333e+00
+366 55 0.00000000000000e+00
+366 361 8.33333333333333e+00
+366 360 -1.25000000000000e+01
+366 368 -1.66666666666667e+01
+366 374 8.33333333333333e+00
+366 128 1.66666666666667e+01
+366 373 8.33333333333333e+00
+366 85 -8.33333333333333e+00
+366 365 0.00000000000000e+00
+366 372 -3.75000000000000e+01
+366 126 -2.50000000000000e+01
+367 367 1.25000000000000e+02
+367 125 0.00000000000000e+00
+367 123 0.00000000000000e+00
+367 364 0.00000000000000e+00
+367 363 0.00000000000000e+00
+367 437 8.33333333333333e+00
+367 368 -1.66666666666667e+01
+367 436 -3.75000000000000e+01
+367 435 8.33333333333333e+00
+367 117 0.00000000000000e+00
+367 362 8.33333333333333e+00
+367 366 -1.66666666666667e+01
+367 122 -1.66666666666667e+01
+367 128 1.66666666666667e+01
+367 120 8.33333333333333e+00
+367 126 -8.33333333333333e+00
+367 56 0.00000000000000e+00
+367 119 0.00000000000000e+00
+367 361 -3.75000000000000e+01
+367 54 0.00000000000000e+00
+367 360 8.33333333333333e+00
+367 374 -4.16666666666667e+00
+367 86 4.16666666666667e+00
+367 365 0.00000000000000e+00
+367 373 -1.25000000000000e+01
+367 127 -2.50000000000000e+01
+367 372 8.33333333333333e+00
+367 84 -8.33333333333333e+00
+368 368 1.25000000000000e+02
+368 124 0.00000000000000e+00
+368 363 0.00000000000000e+00
+368 123 0.00000000000000e+00
+368 365 0.00000000000000e+00
+368 54 0.00000000000000e+00
+368 437 -1.25000000000000e+01
+368 436 8.33333333333333e+00
+368 367 -1.66666666666667e+01
+368 435 -4.16666666666667e+00
+368 84 4.16666666666667e+00
+368 117 0.00000000000000e+00
+368 361 8.33333333333333e+00
+368 120 8.33333333333333e+00
+368 360 -4.16666666666667e+00
+368 121 -1.66666666666667e+01
+368 127 1.66666666666667e+01
+368 362 -1.25000000000000e+01
+368 55 0.00000000000000e+00
+368 118 0.00000000000000e+00
+368 364 0.00000000000000e+00
+368 374 -1.25000000000000e+01
+368 128 -7.50000000000000e+01
+368 373 -4.16666666666667e+00
+368 85 4.16666666666667e+00
+368 366 -1.66666666666667e+01
+368 372 8.33333333333333e+00
+368 126 1.66666666666667e+01
+369 369 5.00000000000000e+01
+369 139 4.16666666666667e+00
+369 383 4.16666666666667e+00
+369 377 -4.16666666666667e+00
+369 59 4.16666666666667e+00
+369 140 -8.33333333333333e+00
+369 58 4.16666666666667e+00
+369 370 -8.33333333333333e+00
+369 376 8.33333333333333e+00
+369 57 -1.25000000000000e+01
+369 375 -1.25000000000000e+01
+369 371 -8.33333333333333e+00
+369 62 4.16666666666667e+00
+369 143 8.33333333333333e+00
+369 61 4.16666666666667e+00
+369 382 -8.33333333333333e+00
+369 142 -4.16666666666667e+00
+369 60 -1.25000000000000e+01
+369 141 -1.25000000000000e+01
+370 370 5.83333333333333e+01
+370 138 4.16666666666667e+00
+370 143 8.33333333333333e+00
+370 371 -1.66666666666667e+01
+370 377 8.33333333333333e+00
+370 59 -4.16666666666667e+00
+370 140 4.16666666666667e+00
+370 58 -4.16666666666667e+00
+370 376 -3.75000000000000e+01
+370 57 4.16666666666667e+00
+370 369 -8.33333333333333e+00
+370 375 8.33333333333333e+00
+370 62 -4.16666666666667e+00
+370 383 4.16666666666667e+00
+370 141 -4.16666666666667e+00
+370 61 -4.16666666666667e+00
+370 142 -1.25000000000000e+01
+370 60 4.16666666666667e+00
+370 381 -8.33333333333333e+00
+371 371 5.83333333333333e+01
+371 370 -1.66666666666667e+01
+371 376 8.33333333333333e+00
+371 381 4.16666666666667e+00
+371 375 -4.16666666666667e+00
+371 59 -4.16666666666667e+00
+371 377 -1.25000000000000e+01
+371 58 -4.16666666666667e+00
+371 139 4.16666666666667e+00
+371 57 4.16666666666667e+00
+371 138 -8.33333333333333e+00
+371 142 8.33333333333333e+00
+371 62 -4.16666666666667e+00
+371 143 -3.75000000000000e+01
+371 61 -4.16666666666667e+00
+371 382 4.16666666666667e+00
+371 369 -8.33333333333333e+00
+371 60 4.16666666666667e+00
+371 141 8.33333333333333e+00
+372 372 1.25000000000000e+02
+372 377 8.33333333333333e+00
+372 86 -4.16666666666667e+00
+372 440 4.16666666666667e+00
+372 439 -8.33333333333333e+00
+372 59 -4.16666666666667e+00
+372 376 8.33333333333333e+00
+372 375 -3.75000000000000e+01
+372 140 8.33333333333333e+00
+372 139 8.33333333333333e+00
+372 146 1.66666666666667e+01
+372 145 -8.33333333333333e+00
+372 144 -2.50000000000000e+01
+372 122 -8.33333333333333e+00
+372 362 4.16666666666667e+00
+372 121 -8.33333333333333e+00
+372 127 8.33333333333333e+00
+372 361 -8.33333333333333e+00
+372 58 8.33333333333333e+00
+372 57 -1.25000000000000e+01
+372 368 8.33333333333333e+00
+372 128 -1.66666666666667e+01
+372 367 8.33333333333333e+00
+372 373 -1.66666666666667e+01
+372 85 8.33333333333333e+00
+372 366 -3.75000000000000e+01
+372 374 -1.66666666666667e+01
+372 84 -1.25000000000000e+01
+373 373 1.25000000000000e+02
+373 377 -4.16666666666667e+00
+373 438 -8.33333333333333e+00
+373 376 -1.25000000000000e+01
+373 375 8.33333333333333e+00
+373 140 -1.66666666666667e+01
+373 59 8.33333333333333e+00
+373 138 8.33333333333333e+00
+373 146 1.66666666666667e+01
+373 374 -1.66666666666667e+01
+373 86 8.33333333333333e+00
+373 145 -2.50000000000000e+01
+373 144 -8.33333333333333e+00
+373 120 -8.33333333333333e+00
+373 126 8.33333333333333e+00
+373 362 4.16666666666667e+00
+373 122 -8.33333333333333e+00
+373 58 -3.75000000000000e+01
+373 360 -8.33333333333333e+00
+373 57 8.33333333333333e+00
+373 368 -4.16666666666667e+00
+373 128 8.33333333333333e+00
+373 367 -1.25000000000000e+01
+373 440 4.16666666666667e+00
+373 85 -3.75000000000000e+01
+373 366 8.33333333333333e+00
+373 372 -1.66666666666667e+01
+373 84 8.33333333333333e+00
+374 374 1.25000000000000e+02
+374 376 -4.16666666666667e+00
+374 372 -1.66666666666667e+01
+374 375 8.33333333333333e+00
+374 84 -4.16666666666667e+00
+374 438 4.16666666666667e+00
+374 377 -1.25000000000000e+01
+374 57 -4.16666666666667e+00
+374 138 8.33333333333333e+00
+374 139 -1.66666666666667e+01
+374 58 8.33333333333333e+00
+374 146 -7.50000000000000e+01
+374 145 1.66666666666667e+01
+374 373 -1.66666666666667e+01
+374 85 8.33333333333333e+00
+374 144 1.66666666666667e+01
+374 120 -8.33333333333333e+00
+374 360 4.16666666666667e+00
+374 59 -1.25000000000000e+01
+374 361 4.16666666666667e+00
+374 121 -8.33333333333333e+00
+374 368 -1.25000000000000e+01
+374 439 4.16666666666667e+00
+374 86 -1.25000000000000e+01
+374 367 -4.16666666666667e+00
+374 127 8.33333333333333e+00
+374 366 8.33333333333333e+00
+374 126 -1.66666666666667e+01
+375 375 1.25000000000000e+02
+375 146 -1.66666666666667e+01
+375 145 8.33333333333333e+00
+375 59 4.16666666666667e+00
+375 373 8.33333333333333e+00
+375 372 -3.75000000000000e+01
+375 440 -4.16666666666667e+00
+375 89 4.16666666666667e+00
+375 439 8.33333333333333e+00
+375 438 -1.25000000000000e+01
+375 140 -8.33333333333333e+00
+375 139 -8.33333333333333e+00
+375 143 8.33333333333333e+00
+375 371 -4.16666666666667e+00
+375 376 -1.66666666666667e+01
+375 142 8.33333333333333e+00
+375 148 -8.33333333333333e+00
+375 58 -8.33333333333333e+00
+375 370 8.33333333333333e+00
+375 369 -1.25000000000000e+01
+375 377 -1.66666666666667e+01
+375 383 8.33333333333333e+00
+375 149 1.66666666666667e+01
+375 382 8.33333333333333e+00
+375 88 -8.33333333333333e+00
+375 374 8.33333333333333e+00
+375 381 -3.75000000000000e+01
+375 147 -2.50000000000000e+01
+376 376 1.25000000000000e+02
+376 146 8.33333333333333e+00
+376 144 8.33333333333333e+00
+376 373 -1.25000000000000e+01
+376 372 8.33333333333333e+00
+376 440 8.33333333333333e+00
+376 377 -1.66666666666667e+01
+376 439 -3.75000000000000e+01
+376 438 8.33333333333333e+00
+376 138 -8.33333333333333e+00
+376 371 8.33333333333333e+00
+376 375 -1.66666666666667e+01
+376 143 -1.66666666666667e+01
+376 149 1.66666666666667e+01
+376 141 8.33333333333333e+00
+376 147 -8.33333333333333e+00
+376 59 4.16666666666667e+00
+376 140 -8.33333333333333e+00
+376 370 -3.75000000000000e+01
+376 57 -8.33333333333333e+00
+376 369 8.33333333333333e+00
+376 383 -4.16666666666667e+00
+376 89 4.16666666666667e+00
+376 374 -4.16666666666667e+00
+376 382 -1.25000000000000e+01
+376 148 -2.50000000000000e+01
+376 381 8.33333333333333e+00
+376 87 -8.33333333333333e+00
+377 377 1.25000000000000e+02
+377 145 8.33333333333333e+00
+377 372 8.33333333333333e+00
+377 144 -1.66666666666667e+01
+377 374 -1.25000000000000e+01
+377 57 4.16666666666667e+00
+377 440 -1.25000000000000e+01
+377 439 8.33333333333333e+00
+377 376 -1.66666666666667e+01
+377 438 -4.16666666666667e+00
+377 87 4.16666666666667e+00
+377 138 -8.33333333333333e+00
+377 370 8.33333333333333e+00
+377 141 8.33333333333333e+00
+377 369 -4.16666666666667e+00
+377 142 -1.66666666666667e+01
+377 148 1.66666666666667e+01
+377 371 -1.25000000000000e+01
+377 58 4.16666666666667e+00
+377 139 -8.33333333333333e+00
+377 373 -4.16666666666667e+00
+377 383 -1.25000000000000e+01
+377 149 -7.50000000000000e+01
+377 382 -4.16666666666667e+00
+377 88 4.16666666666667e+00
+377 375 -1.66666666666667e+01
+377 381 8.33333333333333e+00
+377 147 1.66666666666667e+01
+378 378 5.00000000000000e+01
+378 160 4.16666666666667e+00
+378 392 4.16666666666667e+00
+378 386 -4.16666666666667e+00
+378 62 4.16666666666667e+00
+378 161 -8.33333333333333e+00
+378 61 4.16666666666667e+00
+378 379 -8.33333333333333e+00
+378 385 8.33333333333333e+00
+378 60 -1.25000000000000e+01
+378 384 -1.25000000000000e+01
+378 380 -8.33333333333333e+00
+378 65 4.16666666666667e+00
+378 164 8.33333333333333e+00
+378 64 4.16666666666667e+00
+378 391 -8.33333333333333e+00
+378 163 -4.16666666666667e+00
+378 63 -1.25000000000000e+01
+378 162 -1.25000000000000e+01
+379 379 5.83333333333333e+01
+379 159 4.16666666666667e+00
+379 164 8.33333333333333e+00
+379 380 -1.66666666666667e+01
+379 386 8.33333333333333e+00
+379 62 -4.16666666666667e+00
+379 161 4.16666666666667e+00
+379 61 -4.16666666666667e+00
+379 385 -3.75000000000000e+01
+379 60 4.16666666666667e+00
+379 378 -8.33333333333333e+00
+379 384 8.33333333333333e+00
+379 65 -4.16666666666667e+00
+379 392 4.16666666666667e+00
+379 162 -4.16666666666667e+00
+379 64 -4.16666666666667e+00
+379 163 -1.25000000000000e+01
+379 63 4.16666666666667e+00
+379 390 -8.33333333333333e+00
+380 380 5.83333333333333e+01
+380 379 -1.66666666666667e+01
+380 385 8.33333333333333e+00
+380 390 4.16666666666667e+00
+380 384 -4.16666666666667e+00
+380 62 -4.16666666666667e+00
+380 386 -1.25000000000000e+01
+380 61 -4.16666666666667e+00
+380 160 4.16666666666667e+00
+380 60 4.16666666666667e+00
+380 159 -8.33333333333333e+00
+380 163 8.33333333333333e+00
+380 65 -4.16666666666667e+00
+380 164 -3.75000000000000e+01
+380 64 -4.16666666666667e+00
+380 391 4.16666666666667e+00
+380 378 -8.33333333333333e+00
+380 63 4.16666666666667e+00
+380 162 8.33333333333333e+00
+381 381 1.25000000000000e+02
+381 386 8.33333333333333e+00
+381 89 -4.16666666666667e+00
+381 443 4.16666666666667e+00
+381 442 -8.33333333333333e+00
+381 62 -4.16666666666667e+00
+381 385 8.33333333333333e+00
+381 384 -3.75000000000000e+01
+381 161 8.33333333333333e+00
+381 160 8.33333333333333e+00
+381 167 1.66666666666667e+01
+381 166 -8.33333333333333e+00
+381 165 -2.50000000000000e+01
+381 143 -8.33333333333333e+00
+381 371 4.16666666666667e+00
+381 142 -8.33333333333333e+00
+381 148 8.33333333333333e+00
+381 370 -8.33333333333333e+00
+381 61 8.33333333333333e+00
+381 60 -1.25000000000000e+01
+381 377 8.33333333333333e+00
+381 149 -1.66666666666667e+01
+381 376 8.33333333333333e+00
+381 382 -1.66666666666667e+01
+381 88 8.33333333333333e+00
+381 375 -3.75000000000000e+01
+381 383 -1.66666666666667e+01
+381 87 -1.25000000000000e+01
+382 382 1.25000000000000e+02
+382 386 -4.16666666666667e+00
+382 441 -8.33333333333333e+00
+382 385 -1.25000000000000e+01
+382 384 8.33333333333333e+00
+382 161 -1.66666666666667e+01
+382 62 8.33333333333333e+00
+382 159 8.33333333333333e+00
+382 167 1.66666666666667e+01
+382 383 -1.66666666666667e+01
+382 89 8.33333333333333e+00
+382 166 -2.50000000000000e+01
+382 165 -8.33333333333333e+00
+382 141 -8.33333333333333e+00
+382 147 8.33333333333333e+00
+382 371 4.16666666666667e+00
+382 143 -8.33333333333333e+00
+382 61 -3.75000000000000e+01
+382 369 -8.33333333333333e+00
+382 60 8.33333333333333e+00
+382 377 -4.16666666666667e+00
+382 149 8.33333333333333e+00
+382 376 -1.25000000000000e+01
+382 443 4.16666666666667e+00
+382 88 -3.75000000000000e+01
+382 375 8.33333333333333e+00
+382 381 -1.66666666666667e+01
+382 87 8.33333333333333e+00
+383 383 1.25000000000000e+02
+383 385 -4.16666666666667e+00
+383 381 -1.66666666666667e+01
+383 384 8.33333333333333e+00
+383 87 -4.16666666666667e+00
+383 441 4.16666666666667e+00
+383 386 -1.25000000000000e+01
+383 60 -4.16666666666667e+00
+383 159 8.33333333333333e+00
+383 160 -1.66666666666667e+01
+383 61 8.33333333333333e+00
+383 167 -7.50000000000000e+01
+383 166 1.66666666666667e+01
+383 382 -1.66666666666667e+01
+383 88 8.33333333333333e+00
+383 165 1.66666666666667e+01
+383 141 -8.33333333333333e+00
+383 369 4.16666666666667e+00
+383 62 -1.25000000000000e+01
+383 370 4.16666666666667e+00
+383 142 -8.33333333333333e+00
+383 377 -1.25000000000000e+01
+383 442 4.16666666666667e+00
+383 89 -1.25000000000000e+01
+383 376 -4.16666666666667e+00
+383 148 8.33333333333333e+00
+383 375 8.33333333333333e+00
+383 147 -1.66666666666667e+01
+384 384 1.25000000000000e+02
+384 167 -1.66666666666667e+01
+384 166 8.33333333333333e+00
+384 62 4.16666666666667e+00
+384 382 8.33333333333333e+00
+384 381 -3.75000000000000e+01
+384 443 -4.16666666666667e+00
+384 92 4.16666666666667e+00
+384 442 8.33333333333333e+00
+384 441 -1.25000000000000e+01
+384 161 -8.33333333333333e+00
+384 160 -8.33333333333333e+00
+384 164 8.33333333333333e+00
+384 380 -4.16666666666667e+00
+384 385 -1.66666666666667e+01
+384 163 8.33333333333333e+00
+384 169 -8.33333333333333e+00
+384 61 -8.33333333333333e+00
+384 379 8.33333333333333e+00
+384 378 -1.25000000000000e+01
+384 386 -1.66666666666667e+01
+384 392 8.33333333333333e+00
+384 170 1.66666666666667e+01
+384 391 8.33333333333333e+00
+384 91 -8.33333333333333e+00
+384 383 8.33333333333333e+00
+384 390 -3.75000000000000e+01
+384 168 -2.50000000000000e+01
+385 385 1.25000000000000e+02
+385 167 8.33333333333333e+00
+385 165 8.33333333333333e+00
+385 382 -1.25000000000000e+01
+385 381 8.33333333333333e+00
+385 443 8.33333333333333e+00
+385 386 -1.66666666666667e+01
+385 442 -3.75000000000000e+01
+385 441 8.33333333333333e+00
+385 159 -8.33333333333333e+00
+385 380 8.33333333333333e+00
+385 384 -1.66666666666667e+01
+385 164 -1.66666666666667e+01
+385 170 1.66666666666667e+01
+385 162 8.33333333333333e+00
+385 168 -8.33333333333333e+00
+385 62 4.16666666666667e+00
+385 161 -8.33333333333333e+00
+385 379 -3.75000000000000e+01
+385 60 -8.33333333333333e+00
+385 378 8.33333333333333e+00
+385 392 -4.16666666666667e+00
+385 92 4.16666666666667e+00
+385 383 -4.16666666666667e+00
+385 391 -1.25000000000000e+01
+385 169 -2.50000000000000e+01
+385 390 8.33333333333333e+00
+385 90 -8.33333333333333e+00
+386 386 1.25000000000000e+02
+386 166 8.33333333333333e+00
+386 381 8.33333333333333e+00
+386 165 -1.66666666666667e+01
+386 383 -1.25000000000000e+01
+386 60 4.16666666666667e+00
+386 443 -1.25000000000000e+01
+386 442 8.33333333333333e+00
+386 385 -1.66666666666667e+01
+386 441 -4.16666666666667e+00
+386 90 4.16666666666667e+00
+386 159 -8.33333333333333e+00
+386 379 8.33333333333333e+00
+386 162 8.33333333333333e+00
+386 378 -4.16666666666667e+00
+386 163 -1.66666666666667e+01
+386 169 1.66666666666667e+01
+386 380 -1.25000000000000e+01
+386 61 4.16666666666667e+00
+386 160 -8.33333333333333e+00
+386 382 -4.16666666666667e+00
+386 392 -1.25000000000000e+01
+386 170 -7.50000000000000e+01
+386 391 -4.16666666666667e+00
+386 91 4.16666666666667e+00
+386 384 -1.66666666666667e+01
+386 390 8.33333333333333e+00
+386 168 1.66666666666667e+01
+387 387 5.00000000000000e+01
+387 181 4.16666666666667e+00
+387 401 4.16666666666667e+00
+387 395 -4.16666666666667e+00
+387 65 4.16666666666667e+00
+387 182 -8.33333333333333e+00
+387 64 4.16666666666667e+00
+387 388 -8.33333333333333e+00
+387 394 8.33333333333333e+00
+387 63 -1.25000000000000e+01
+387 393 -1.25000000000000e+01
+387 389 -8.33333333333333e+00
+387 68 4.16666666666667e+00
+387 185 8.33333333333333e+00
+387 67 4.16666666666667e+00
+387 400 -8.33333333333333e+00
+387 184 -4.16666666666667e+00
+387 66 -1.25000000000000e+01
+387 183 -1.25000000000000e+01
+388 388 5.83333333333333e+01
+388 180 4.16666666666667e+00
+388 185 8.33333333333333e+00
+388 389 -1.66666666666667e+01
+388 395 8.33333333333333e+00
+388 65 -4.16666666666667e+00
+388 182 4.16666666666667e+00
+388 64 -4.16666666666667e+00
+388 394 -3.75000000000000e+01
+388 63 4.16666666666667e+00
+388 387 -8.33333333333333e+00
+388 393 8.33333333333333e+00
+388 68 -4.16666666666667e+00
+388 401 4.16666666666667e+00
+388 183 -4.16666666666667e+00
+388 67 -4.16666666666667e+00
+388 184 -1.25000000000000e+01
+388 66 4.16666666666667e+00
+388 399 -8.33333333333333e+00
+389 389 5.83333333333333e+01
+389 388 -1.66666666666667e+01
+389 394 8.33333333333333e+00
+389 399 4.16666666666667e+00
+389 393 -4.16666666666667e+00
+389 65 -4.16666666666667e+00
+389 395 -1.25000000000000e+01
+389 64 -4.16666666666667e+00
+389 181 4.16666666666667e+00
+389 63 4.16666666666667e+00
+389 180 -8.33333333333333e+00
+389 184 8.33333333333333e+00
+389 68 -4.16666666666667e+00
+389 185 -3.75000000000000e+01
+389 67 -4.16666666666667e+00
+389 400 4.16666666666667e+00
+389 387 -8.33333333333333e+00
+389 66 4.16666666666667e+00
+389 183 8.33333333333333e+00
+390 390 1.25000000000000e+02
+390 395 8.33333333333333e+00
+390 92 -4.16666666666667e+00
+390 446 4.16666666666667e+00
+390 445 -8.33333333333333e+00
+390 65 -4.16666666666667e+00
+390 394 8.33333333333333e+00
+390 393 -3.75000000000000e+01
+390 182 8.33333333333333e+00
+390 181 8.33333333333333e+00
+390 188 1.66666666666667e+01
+390 187 -8.33333333333333e+00
+390 186 -2.50000000000000e+01
+390 164 -8.33333333333333e+00
+390 380 4.16666666666667e+00
+390 163 -8.33333333333333e+00
+390 169 8.33333333333333e+00
+390 379 -8.33333333333333e+00
+390 64 8.33333333333333e+00
+390 63 -1.25000000000000e+01
+390 386 8.33333333333333e+00
+390 170 -1.66666666666667e+01
+390 385 8.33333333333333e+00
+390 391 -1.66666666666667e+01
+390 91 8.33333333333333e+00
+390 384 -3.75000000000000e+01
+390 392 -1.66666666666667e+01
+390 90 -1.25000000000000e+01
+391 391 1.25000000000000e+02
+391 395 -4.16666666666667e+00
+391 444 -8.33333333333333e+00
+391 394 -1.25000000000000e+01
+391 393 8.33333333333333e+00
+391 182 -1.66666666666667e+01
+391 65 8.33333333333333e+00
+391 180 8.33333333333333e+00
+391 188 1.66666666666667e+01
+391 392 -1.66666666666667e+01
+391 92 8.33333333333333e+00
+391 187 -2.50000000000000e+01
+391 186 -8.33333333333333e+00
+391 162 -8.33333333333333e+00
+391 168 8.33333333333333e+00
+391 380 4.16666666666667e+00
+391 164 -8.33333333333333e+00
+391 64 -3.75000000000000e+01
+391 378 -8.33333333333333e+00
+391 63 8.33333333333333e+00
+391 386 -4.16666666666667e+00
+391 170 8.33333333333333e+00
+391 385 -1.25000000000000e+01
+391 446 4.16666666666667e+00
+391 91 -3.75000000000000e+01
+391 384 8.33333333333333e+00
+391 390 -1.66666666666667e+01
+391 90 8.33333333333333e+00
+392 392 1.25000000000000e+02
+392 394 -4.16666666666667e+00
+392 390 -1.66666666666667e+01
+392 393 8.33333333333333e+00
+392 90 -4.16666666666667e+00
+392 444 4.16666666666667e+00
+392 395 -1.25000000000000e+01
+392 63 -4.16666666666667e+00
+392 180 8.33333333333333e+00
+392 181 -1.66666666666667e+01
+392 64 8.33333333333333e+00
+392 188 -7.50000000000000e+01
+392 187 1.66666666666667e+01
+392 391 -1.66666666666667e+01
+392 91 8.33333333333333e+00
+392 186 1.66666666666667e+01
+392 162 -8.33333333333333e+00
+392 378 4.16666666666667e+00
+392 65 -1.25000000000000e+01
+392 379 4.16666666666667e+00
+392 163 -8.33333333333333e+00
+392 386 -1.25000000000000e+01
+392 445 4.16666666666667e+00
+392 92 -1.25000000000000e+01
+392 385 -4.16666666666667e+00
+392 169 8.33333333333333e+00
+392 384 8.33333333333333e+00
+392 168 -1.66666666666667e+01
+393 393 1.25000000000000e+02
+393 188 -1.66666666666667e+01
+393 187 8.33333333333333e+00
+393 65 4.16666666666667e+00
+393 391 8.33333333333333e+00
+393 390 -3.75000000000000e+01
+393 446 -4.16666666666667e+00
+393 95 4.16666666666667e+00
+393 445 8.33333333333333e+00
+393 444 -1.25000000000000e+01
+393 182 -8.33333333333333e+00
+393 181 -8.33333333333333e+00
+393 185 8.33333333333333e+00
+393 389 -4.16666666666667e+00
+393 394 -1.66666666666667e+01
+393 184 8.33333333333333e+00
+393 190 -8.33333333333333e+00
+393 64 -8.33333333333333e+00
+393 388 8.33333333333333e+00
+393 387 -1.25000000000000e+01
+393 395 -1.66666666666667e+01
+393 401 8.33333333333333e+00
+393 191 1.66666666666667e+01
+393 400 8.33333333333333e+00
+393 94 -8.33333333333333e+00
+393 392 8.33333333333333e+00
+393 399 -3.75000000000000e+01
+393 189 -2.50000000000000e+01
+394 394 1.25000000000000e+02
+394 188 8.33333333333333e+00
+394 186 8.33333333333333e+00
+394 391 -1.25000000000000e+01
+394 390 8.33333333333333e+00
+394 446 8.33333333333333e+00
+394 395 -1.66666666666667e+01
+394 445 -3.75000000000000e+01
+394 444 8.33333333333333e+00
+394 180 -8.33333333333333e+00
+394 389 8.33333333333333e+00
+394 393 -1.66666666666667e+01
+394 185 -1.66666666666667e+01
+394 191 1.66666666666667e+01
+394 183 8.33333333333333e+00
+394 189 -8.33333333333333e+00
+394 65 4.16666666666667e+00
+394 182 -8.33333333333333e+00
+394 388 -3.75000000000000e+01
+394 63 -8.33333333333333e+00
+394 387 8.33333333333333e+00
+394 401 -4.16666666666667e+00
+394 95 4.16666666666667e+00
+394 392 -4.16666666666667e+00
+394 400 -1.25000000000000e+01
+394 190 -2.50000000000000e+01
+394 399 8.33333333333333e+00
+394 93 -8.33333333333333e+00
+395 395 1.25000000000000e+02
+395 187 8.33333333333333e+00
+395 390 8.33333333333333e+00
+395 186 -1.66666666666667e+01
+395 392 -1.25000000000000e+01
+395 63 4.16666666666667e+00
+395 446 -1.25000000000000e+01
+395 445 8.33333333333333e+00
+395 394 -1.66666666666667e+01
+395 444 -4.16666666666667e+00
+395 93 4.16666666666667e+00
+395 180 -8.33333333333333e+00
+395 388 8.33333333333333e+00
+395 183 8.33333333333333e+00
+395 387 -4.16666666666667e+00
+395 184 -1.66666666666667e+01
+395 190 1.66666666666667e+01
+395 389 -1.25000000000000e+01
+395 64 4.16666666666667e+00
+395 181 -8.33333333333333e+00
+395 391 -4.16666666666667e+00
+395 401 -1.25000000000000e+01
+395 191 -7.50000000000000e+01
+395 400 -4.16666666666667e+00
+395 94 4.16666666666667e+00
+395 393 -1.66666666666667e+01
+395 399 8.33333333333333e+00
+395 189 1.66666666666667e+01
+396 396 1.00000000000000e+00
+396 202 8.33333333333333e-02
+396 410 8.33333333333333e-02
+396 404 -8.33333333333333e-02
+396 68 8.33333333333333e-02
+396 203 -1.66666666666667e-01
+396 67 8.33333333333333e-02
+396 397 -1.66666666666667e-01
+396 403 1.66666666666667e-01
+396 66 -2.50000000000000e-01
+396 402 -2.50000000000000e-01
+396 398 -1.66666666666667e-01
+396 71 8.33333333333333e-02
+396 206 1.66666666666667e-01
+396 70 8.33333333333333e-02
+396 409 -1.66666666666667e-01
+396 205 -8.33333333333333e-02
+396 69 -2.50000000000000e-01
+396 204 -2.50000000000000e-01
+397 397 1.16666666666667e+00
+397 201 8.33333333333333e-02
+397 206 1.66666666666667e-01
+397 398 -3.33333333333333e-01
+397 404 1.66666666666667e-01
+397 68 -8.33333333333333e-02
+397 203 8.33333333333333e-02
+397 67 -8.33333333333333e-02
+397 403 -7.50000000000000e-01
+397 66 8.33333333333333e-02
+397 396 -1.66666666666667e-01
+397 402 1.66666666666667e-01
+397 71 -8.33333333333333e-02
+397 410 8.33333333333333e-02
+397 204 -8.33333333333333e-02
+397 70 -8.33333333333333e-02
+397 205 -2.50000000000000e-01
+397 69 8.33333333333333e-02
+397 408 -1.66666666666667e-01
+398 398 1.16666666666667e+00
+398 397 -3.33333333333333e-01
+398 403 1.66666666666667e-01
+398 408 8.33333333333333e-02
+398 402 -8.33333333333333e-02
+398 68 -8.33333333333333e-02
+398 404 -2.50000000000000e-01
+398 67 -8.33333333333333e-02
+398 202 8.33333333333333e-02
+398 66 8.33333333333333e-02
+398 201 -1.66666666666667e-01
+398 205 1.66666666666667e-01
+398 71 -8.33333333333333e-02
+398 206 -7.50000000000000e-01
+398 70 -8.33333333333333e-02
+398 409 8.33333333333333e-02
+398 396 -1.66666666666667e-01
+398 69 8.33333333333333e-02
+398 204 1.66666666666667e-01
+399 399 6.78333333333333e+01
+399 404 1.66666666666667e-01
+399 95 -8.33333333333333e-02
+399 449 8.33333333333333e-02
+399 448 -1.66666666666667e-01
+399 68 -8.33333333333333e-02
+399 403 1.66666666666667e-01
+399 402 -7.50000000000000e-01
+399 203 4.25000000000000e+00
+399 202 4.25000000000000e+00
+399 209 8.50000000000000e+00
+399 208 -4.25000000000000e+00
+399 207 -1.27500000000000e+01
+399 185 -8.33333333333333e+00
+399 389 4.16666666666667e+00
+399 184 -8.33333333333333e+00
+399 190 8.33333333333333e+00
+399 388 -8.33333333333333e+00
+399 67 4.25000000000000e+00
+399 66 -8.41666666666667e+00
+399 395 8.33333333333333e+00
+399 191 -1.66666666666667e+01
+399 394 8.33333333333333e+00
+399 400 -8.50000000000000e+00
+399 94 4.25000000000000e+00
+399 393 -3.75000000000000e+01
+399 401 -3.33333333333333e-01
+399 93 -8.41666666666667e+00
+400 400 7.60000000000000e+01
+400 404 -8.33333333333333e-02
+400 447 -1.66666666666667e-01
+400 403 -2.50000000000000e-01
+400 402 1.66666666666667e-01
+400 203 -8.50000000000000e+00
+400 68 4.25000000000000e+00
+400 201 4.25000000000000e+00
+400 209 8.50000000000000e+00
+400 401 -8.50000000000000e+00
+400 95 4.25000000000000e+00
+400 208 -1.27500000000000e+01
+400 207 -4.25000000000000e+00
+400 183 -8.33333333333333e+00
+400 189 8.33333333333333e+00
+400 389 4.16666666666667e+00
+400 185 -8.33333333333333e+00
+400 67 -2.52500000000000e+01
+400 387 -8.33333333333333e+00
+400 66 4.25000000000000e+00
+400 395 -4.16666666666667e+00
+400 191 8.33333333333333e+00
+400 394 -1.25000000000000e+01
+400 449 8.33333333333333e-02
+400 94 -2.52500000000000e+01
+400 393 8.33333333333333e+00
+400 399 -8.50000000000000e+00
+400 93 4.25000000000000e+00
+401 401 6.78333333333333e+01
+401 403 -8.33333333333333e-02
+401 399 -3.33333333333333e-01
+401 402 1.66666666666667e-01
+401 93 -8.33333333333333e-02
+401 447 8.33333333333333e-02
+401 404 -2.50000000000000e-01
+401 66 -8.33333333333333e-02
+401 201 4.25000000000000e+00
+401 202 -8.50000000000000e+00
+401 67 4.25000000000000e+00
+401 209 -3.82500000000000e+01
+401 208 8.50000000000000e+00
+401 400 -8.50000000000000e+00
+401 94 4.25000000000000e+00
+401 207 8.50000000000000e+00
+401 183 -8.33333333333333e+00
+401 387 4.16666666666667e+00
+401 68 -8.41666666666667e+00
+401 388 4.16666666666667e+00
+401 184 -8.33333333333333e+00
+401 395 -1.25000000000000e+01
+401 448 8.33333333333333e-02
+401 95 -8.41666666666667e+00
+401 394 -4.16666666666667e+00
+401 190 8.33333333333333e+00
+401 393 8.33333333333333e+00
+401 189 -1.66666666666667e+01
+402 402 2.50000000000000e+00
+402 209 -3.33333333333333e-01
+402 208 1.66666666666667e-01
+402 68 8.33333333333333e-02
+402 400 1.66666666666667e-01
+402 399 -7.50000000000000e-01
+402 449 -8.33333333333333e-02
+402 98 8.33333333333333e-02
+402 448 1.66666666666667e-01
+402 447 -2.50000000000000e-01
+402 203 -1.66666666666667e-01
+402 202 -1.66666666666667e-01
+402 206 1.66666666666667e-01
+402 398 -8.33333333333333e-02
+402 403 -3.33333333333333e-01
+402 205 1.66666666666667e-01
+402 211 -1.66666666666667e-01
+402 67 -1.66666666666667e-01
+402 397 1.66666666666667e-01
+402 396 -2.50000000000000e-01
+402 404 -3.33333333333333e-01
+402 410 1.66666666666667e-01
+402 212 3.33333333333333e-01
+402 409 1.66666666666667e-01
+402 97 -1.66666666666667e-01
+402 401 1.66666666666667e-01
+402 408 -7.50000000000000e-01
+402 210 -5.00000000000000e-01
+403 403 2.50000000000000e+00
+403 209 1.66666666666667e-01
+403 207 1.66666666666667e-01
+403 400 -2.50000000000000e-01
+403 399 1.66666666666667e-01
+403 449 1.66666666666667e-01
+403 404 -3.33333333333333e-01
+403 448 -7.50000000000000e-01
+403 447 1.66666666666667e-01
+403 201 -1.66666666666667e-01
+403 398 1.66666666666667e-01
+403 402 -3.33333333333333e-01
+403 206 -3.33333333333333e-01
+403 212 3.33333333333333e-01
+403 204 1.66666666666667e-01
+403 210 -1.66666666666667e-01
+403 68 8.33333333333333e-02
+403 203 -1.66666666666667e-01
+403 397 -7.50000000000000e-01
+403 66 -1.66666666666667e-01
+403 396 1.66666666666667e-01
+403 410 -8.33333333333333e-02
+403 98 8.33333333333333e-02
+403 401 -8.33333333333333e-02
+403 409 -2.50000000000000e-01
+403 211 -5.00000000000000e-01
+403 408 1.66666666666667e-01
+403 96 -1.66666666666667e-01
+404 404 2.50000000000000e+00
+404 208 1.66666666666667e-01
+404 399 1.66666666666667e-01
+404 207 -3.33333333333333e-01
+404 401 -2.50000000000000e-01
+404 66 8.33333333333333e-02
+404 449 -2.50000000000000e-01
+404 448 1.66666666666667e-01
+404 403 -3.33333333333333e-01
+404 447 -8.33333333333333e-02
+404 96 8.33333333333333e-02
+404 201 -1.66666666666667e-01
+404 397 1.66666666666667e-01
+404 204 1.66666666666667e-01
+404 396 -8.33333333333333e-02
+404 205 -3.33333333333333e-01
+404 211 3.33333333333333e-01
+404 398 -2.50000000000000e-01
+404 67 8.33333333333333e-02
+404 202 -1.66666666666667e-01
+404 400 -8.33333333333333e-02
+404 410 -2.50000000000000e-01
+404 212 -1.50000000000000e+00
+404 409 -8.33333333333333e-02
+404 97 8.33333333333333e-02
+404 402 -3.33333333333333e-01
+404 408 1.66666666666667e-01
+404 210 3.33333333333333e-01
+405 405 1.00000000000000e+00
+405 223 8.33333333333333e-02
+405 419 8.33333333333333e-02
+405 413 -8.33333333333333e-02
+405 71 8.33333333333333e-02
+405 224 -1.66666666666667e-01
+405 70 8.33333333333333e-02
+405 406 -1.66666666666667e-01
+405 412 1.66666666666667e-01
+405 69 -2.50000000000000e-01
+405 411 -2.50000000000000e-01
+405 407 -1.66666666666667e-01
+405 74 8.33333333333333e-02
+405 227 1.66666666666667e-01
+405 73 8.33333333333333e-02
+405 418 -1.66666666666667e-01
+405 226 -8.33333333333333e-02
+405 72 -2.50000000000000e-01
+405 225 -2.50000000000000e-01
+406 406 1.16666666666667e+00
+406 222 8.33333333333333e-02
+406 227 1.66666666666667e-01
+406 407 -3.33333333333333e-01
+406 413 1.66666666666667e-01
+406 71 -8.33333333333333e-02
+406 224 8.33333333333333e-02
+406 70 -8.33333333333333e-02
+406 412 -7.50000000000000e-01
+406 69 8.33333333333333e-02
+406 405 -1.66666666666667e-01
+406 411 1.66666666666667e-01
+406 74 -8.33333333333333e-02
+406 419 8.33333333333333e-02
+406 225 -8.33333333333333e-02
+406 73 -8.33333333333333e-02
+406 226 -2.50000000000000e-01
+406 72 8.33333333333333e-02
+406 417 -1.66666666666667e-01
+407 407 1.16666666666667e+00
+407 406 -3.33333333333333e-01
+407 412 1.66666666666667e-01
+407 417 8.33333333333333e-02
+407 411 -8.33333333333333e-02
+407 71 -8.33333333333333e-02
+407 413 -2.50000000000000e-01
+407 70 -8.33333333333333e-02
+407 223 8.33333333333333e-02
+407 69 8.33333333333333e-02
+407 222 -1.66666666666667e-01
+407 226 1.66666666666667e-01
+407 74 -8.33333333333333e-02
+407 227 -7.50000000000000e-01
+407 73 -8.33333333333333e-02
+407 418 8.33333333333333e-02
+407 405 -1.66666666666667e-01
+407 72 8.33333333333333e-02
+407 225 1.66666666666667e-01
+408 408 2.50000000000000e+00
+408 413 1.66666666666667e-01
+408 98 -8.33333333333333e-02
+408 452 8.33333333333333e-02
+408 451 -1.66666666666667e-01
+408 71 -8.33333333333333e-02
+408 412 1.66666666666667e-01
+408 411 -7.50000000000000e-01
+408 224 1.66666666666667e-01
+408 223 1.66666666666667e-01
+408 230 3.33333333333333e-01
+408 229 -1.66666666666667e-01
+408 228 -5.00000000000000e-01
+408 206 -1.66666666666667e-01
+408 398 8.33333333333333e-02
+408 205 -1.66666666666667e-01
+408 211 1.66666666666667e-01
+408 397 -1.66666666666667e-01
+408 70 1.66666666666667e-01
+408 69 -2.50000000000000e-01
+408 404 1.66666666666667e-01
+408 212 -3.33333333333333e-01
+408 403 1.66666666666667e-01
+408 409 -3.33333333333333e-01
+408 97 1.66666666666667e-01
+408 402 -7.50000000000000e-01
+408 410 -3.33333333333333e-01
+408 96 -2.50000000000000e-01
+409 409 2.50000000000000e+00
+409 413 -8.33333333333333e-02
+409 450 -1.66666666666667e-01
+409 412 -2.50000000000000e-01
+409 411 1.66666666666667e-01
+409 224 -3.33333333333333e-01
+409 71 1.66666666666667e-01
+409 222 1.66666666666667e-01
+409 230 3.33333333333333e-01
+409 410 -3.33333333333333e-01
+409 98 1.66666666666667e-01
+409 229 -5.00000000000000e-01
+409 228 -1.66666666666667e-01
+409 204 -1.66666666666667e-01
+409 210 1.66666666666667e-01
+409 398 8.33333333333333e-02
+409 206 -1.66666666666667e-01
+409 70 -7.50000000000000e-01
+409 396 -1.66666666666667e-01
+409 69 1.66666666666667e-01
+409 404 -8.33333333333333e-02
+409 212 1.66666666666667e-01
+409 403 -2.50000000000000e-01
+409 452 8.33333333333333e-02
+409 97 -7.50000000000000e-01
+409 402 1.66666666666667e-01
+409 408 -3.33333333333333e-01
+409 96 1.66666666666667e-01
+410 410 2.50000000000000e+00
+410 412 -8.33333333333333e-02
+410 408 -3.33333333333333e-01
+410 411 1.66666666666667e-01
+410 96 -8.33333333333333e-02
+410 450 8.33333333333333e-02
+410 413 -2.50000000000000e-01
+410 69 -8.33333333333333e-02
+410 222 1.66666666666667e-01
+410 223 -3.33333333333333e-01
+410 70 1.66666666666667e-01
+410 230 -1.50000000000000e+00
+410 229 3.33333333333333e-01
+410 409 -3.33333333333333e-01
+410 97 1.66666666666667e-01
+410 228 3.33333333333333e-01
+410 204 -1.66666666666667e-01
+410 396 8.33333333333333e-02
+410 71 -2.50000000000000e-01
+410 397 8.33333333333333e-02
+410 205 -1.66666666666667e-01
+410 404 -2.50000000000000e-01
+410 451 8.33333333333333e-02
+410 98 -2.50000000000000e-01
+410 403 -8.33333333333333e-02
+410 211 1.66666666666667e-01
+410 402 1.66666666666667e-01
+410 210 -3.33333333333333e-01
+411 411 2.50000000000000e+00
+411 230 -3.33333333333333e-01
+411 229 1.66666666666667e-01
+411 71 8.33333333333333e-02
+411 409 1.66666666666667e-01
+411 408 -7.50000000000000e-01
+411 452 -8.33333333333333e-02
+411 101 8.33333333333333e-02
+411 451 1.66666666666667e-01
+411 450 -2.50000000000000e-01
+411 224 -1.66666666666667e-01
+411 223 -1.66666666666667e-01
+411 227 1.66666666666667e-01
+411 407 -8.33333333333333e-02
+411 412 -3.33333333333333e-01
+411 226 1.66666666666667e-01
+411 232 -1.66666666666667e-01
+411 70 -1.66666666666667e-01
+411 406 1.66666666666667e-01
+411 405 -2.50000000000000e-01
+411 413 -3.33333333333333e-01
+411 419 1.66666666666667e-01
+411 233 3.33333333333333e-01
+411 418 1.66666666666667e-01
+411 100 -1.66666666666667e-01
+411 410 1.66666666666667e-01
+411 417 -7.50000000000000e-01
+411 231 -5.00000000000000e-01
+412 412 2.50000000000000e+00
+412 230 1.66666666666667e-01
+412 228 1.66666666666667e-01
+412 409 -2.50000000000000e-01
+412 408 1.66666666666667e-01
+412 452 1.66666666666667e-01
+412 413 -3.33333333333333e-01
+412 451 -7.50000000000000e-01
+412 450 1.66666666666667e-01
+412 222 -1.66666666666667e-01
+412 407 1.66666666666667e-01
+412 411 -3.33333333333333e-01
+412 227 -3.33333333333333e-01
+412 233 3.33333333333333e-01
+412 225 1.66666666666667e-01
+412 231 -1.66666666666667e-01
+412 71 8.33333333333333e-02
+412 224 -1.66666666666667e-01
+412 406 -7.50000000000000e-01
+412 69 -1.66666666666667e-01
+412 405 1.66666666666667e-01
+412 419 -8.33333333333333e-02
+412 101 8.33333333333333e-02
+412 410 -8.33333333333333e-02
+412 418 -2.50000000000000e-01
+412 232 -5.00000000000000e-01
+412 417 1.66666666666667e-01
+412 99 -1.66666666666667e-01
+413 413 2.50000000000000e+00
+413 229 1.66666666666667e-01
+413 408 1.66666666666667e-01
+413 228 -3.33333333333333e-01
+413 410 -2.50000000000000e-01
+413 69 8.33333333333333e-02
+413 452 -2.50000000000000e-01
+413 451 1.66666666666667e-01
+413 412 -3.33333333333333e-01
+413 450 -8.33333333333333e-02
+413 99 8.33333333333333e-02
+413 222 -1.66666666666667e-01
+413 406 1.66666666666667e-01
+413 225 1.66666666666667e-01
+413 405 -8.33333333333333e-02
+413 226 -3.33333333333333e-01
+413 232 3.33333333333333e-01
+413 407 -2.50000000000000e-01
+413 70 8.33333333333333e-02
+413 223 -1.66666666666667e-01
+413 409 -8.33333333333333e-02
+413 419 -2.50000000000000e-01
+413 233 -1.50000000000000e+00
+413 418 -8.33333333333333e-02
+413 100 8.33333333333333e-02
+413 411 -3.33333333333333e-01
+413 417 1.66666666666667e-01
+413 231 3.33333333333333e-01
+414 414 1.00000000000000e+00
+414 244 8.33333333333333e-02
+414 428 8.33333333333333e-02
+414 422 -8.33333333333333e-02
+414 74 8.33333333333333e-02
+414 245 -1.66666666666667e-01
+414 73 8.33333333333333e-02
+414 415 -1.66666666666667e-01
+414 421 1.66666666666667e-01
+414 72 -2.50000000000000e-01
+414 420 -2.50000000000000e-01
+414 416 -1.66666666666667e-01
+414 77 8.33333333333333e-02
+414 248 1.66666666666667e-01
+414 76 8.33333333333333e-02
+414 427 -1.66666666666667e-01
+414 247 -8.33333333333333e-02
+414 75 -2.50000000000000e-01
+414 246 -2.50000000000000e-01
+415 415 1.16666666666667e+00
+415 243 8.33333333333333e-02
+415 248 1.66666666666667e-01
+415 416 -3.33333333333333e-01
+415 422 1.66666666666667e-01
+415 74 -8.33333333333333e-02
+415 245 8.33333333333333e-02
+415 73 -8.33333333333333e-02
+415 421 -7.50000000000000e-01
+415 72 8.33333333333333e-02
+415 414 -1.66666666666667e-01
+415 420 1.66666666666667e-01
+415 77 -8.33333333333333e-02
+415 428 8.33333333333333e-02
+415 246 -8.33333333333333e-02
+415 76 -8.33333333333333e-02
+415 247 -2.50000000000000e-01
+415 75 8.33333333333333e-02
+415 426 -1.66666666666667e-01
+416 416 1.16666666666667e+00
+416 415 -3.33333333333333e-01
+416 421 1.66666666666667e-01
+416 426 8.33333333333333e-02
+416 420 -8.33333333333333e-02
+416 74 -8.33333333333333e-02
+416 422 -2.50000000000000e-01
+416 73 -8.33333333333333e-02
+416 244 8.33333333333333e-02
+416 72 8.33333333333333e-02
+416 243 -1.66666666666667e-01
+416 247 1.66666666666667e-01
+416 77 -8.33333333333333e-02
+416 248 -7.50000000000000e-01
+416 76 -8.33333333333333e-02
+416 427 8.33333333333333e-02
+416 414 -1.66666666666667e-01
+416 75 8.33333333333333e-02
+416 246 1.66666666666667e-01
+417 417 2.50000000000000e+00
+417 422 1.66666666666667e-01
+417 101 -8.33333333333333e-02
+417 455 8.33333333333333e-02
+417 454 -1.66666666666667e-01
+417 74 -8.33333333333333e-02
+417 421 1.66666666666667e-01
+417 420 -7.50000000000000e-01
+417 245 1.66666666666667e-01
+417 244 1.66666666666667e-01
+417 251 3.33333333333333e-01
+417 250 -1.66666666666667e-01
+417 249 -5.00000000000000e-01
+417 227 -1.66666666666667e-01
+417 407 8.33333333333333e-02
+417 226 -1.66666666666667e-01
+417 232 1.66666666666667e-01
+417 406 -1.66666666666667e-01
+417 73 1.66666666666667e-01
+417 72 -2.50000000000000e-01
+417 413 1.66666666666667e-01
+417 233 -3.33333333333333e-01
+417 412 1.66666666666667e-01
+417 418 -3.33333333333333e-01
+417 100 1.66666666666667e-01
+417 411 -7.50000000000000e-01
+417 419 -3.33333333333333e-01
+417 99 -2.50000000000000e-01
+418 418 2.50000000000000e+00
+418 422 -8.33333333333333e-02
+418 453 -1.66666666666667e-01
+418 421 -2.50000000000000e-01
+418 420 1.66666666666667e-01
+418 245 -3.33333333333333e-01
+418 74 1.66666666666667e-01
+418 243 1.66666666666667e-01
+418 251 3.33333333333333e-01
+418 419 -3.33333333333333e-01
+418 101 1.66666666666667e-01
+418 250 -5.00000000000000e-01
+418 249 -1.66666666666667e-01
+418 225 -1.66666666666667e-01
+418 231 1.66666666666667e-01
+418 407 8.33333333333333e-02
+418 227 -1.66666666666667e-01
+418 73 -7.50000000000000e-01
+418 405 -1.66666666666667e-01
+418 72 1.66666666666667e-01
+418 413 -8.33333333333333e-02
+418 233 1.66666666666667e-01
+418 412 -2.50000000000000e-01
+418 455 8.33333333333333e-02
+418 100 -7.50000000000000e-01
+418 411 1.66666666666667e-01
+418 417 -3.33333333333333e-01
+418 99 1.66666666666667e-01
+419 419 2.50000000000000e+00
+419 421 -8.33333333333333e-02
+419 417 -3.33333333333333e-01
+419 420 1.66666666666667e-01
+419 99 -8.33333333333333e-02
+419 453 8.33333333333333e-02
+419 422 -2.50000000000000e-01
+419 72 -8.33333333333333e-02
+419 243 1.66666666666667e-01
+419 244 -3.33333333333333e-01
+419 73 1.66666666666667e-01
+419 251 -1.50000000000000e+00
+419 250 3.33333333333333e-01
+419 418 -3.33333333333333e-01
+419 100 1.66666666666667e-01
+419 249 3.33333333333333e-01
+419 225 -1.66666666666667e-01
+419 405 8.33333333333333e-02
+419 74 -2.50000000000000e-01
+419 406 8.33333333333333e-02
+419 226 -1.66666666666667e-01
+419 413 -2.50000000000000e-01
+419 454 8.33333333333333e-02
+419 101 -2.50000000000000e-01
+419 412 -8.33333333333333e-02
+419 232 1.66666666666667e-01
+419 411 1.66666666666667e-01
+419 231 -3.33333333333333e-01
+420 420 2.50000000000000e+00
+420 251 -3.33333333333333e-01
+420 250 1.66666666666667e-01
+420 74 8.33333333333333e-02
+420 418 1.66666666666667e-01
+420 417 -7.50000000000000e-01
+420 455 -8.33333333333333e-02
+420 104 8.33333333333333e-02
+420 454 1.66666666666667e-01
+420 453 -2.50000000000000e-01
+420 245 -1.66666666666667e-01
+420 244 -1.66666666666667e-01
+420 248 1.66666666666667e-01
+420 416 -8.33333333333333e-02
+420 421 -3.33333333333333e-01
+420 247 1.66666666666667e-01
+420 253 -1.66666666666667e-01
+420 73 -1.66666666666667e-01
+420 415 1.66666666666667e-01
+420 414 -2.50000000000000e-01
+420 422 -3.33333333333333e-01
+420 428 1.66666666666667e-01
+420 254 3.33333333333333e-01
+420 427 1.66666666666667e-01
+420 103 -1.66666666666667e-01
+420 419 1.66666666666667e-01
+420 426 -7.50000000000000e-01
+420 252 -5.00000000000000e-01
+421 421 2.50000000000000e+00
+421 251 1.66666666666667e-01
+421 249 1.66666666666667e-01
+421 418 -2.50000000000000e-01
+421 417 1.66666666666667e-01
+421 455 1.66666666666667e-01
+421 422 -3.33333333333333e-01
+421 454 -7.50000000000000e-01
+421 453 1.66666666666667e-01
+421 243 -1.66666666666667e-01
+421 416 1.66666666666667e-01
+421 420 -3.33333333333333e-01
+421 248 -3.33333333333333e-01
+421 254 3.33333333333333e-01
+421 246 1.66666666666667e-01
+421 252 -1.66666666666667e-01
+421 74 8.33333333333333e-02
+421 245 -1.66666666666667e-01
+421 415 -7.50000000000000e-01
+421 72 -1.66666666666667e-01
+421 414 1.66666666666667e-01
+421 428 -8.33333333333333e-02
+421 104 8.33333333333333e-02
+421 419 -8.33333333333333e-02
+421 427 -2.50000000000000e-01
+421 253 -5.00000000000000e-01
+421 426 1.66666666666667e-01
+421 102 -1.66666666666667e-01
+422 422 2.50000000000000e+00
+422 250 1.66666666666667e-01
+422 417 1.66666666666667e-01
+422 249 -3.33333333333333e-01
+422 419 -2.50000000000000e-01
+422 72 8.33333333333333e-02
+422 455 -2.50000000000000e-01
+422 454 1.66666666666667e-01
+422 421 -3.33333333333333e-01
+422 453 -8.33333333333333e-02
+422 102 8.33333333333333e-02
+422 243 -1.66666666666667e-01
+422 415 1.66666666666667e-01
+422 246 1.66666666666667e-01
+422 414 -8.33333333333333e-02
+422 247 -3.33333333333333e-01
+422 253 3.33333333333333e-01
+422 416 -2.50000000000000e-01
+422 73 8.33333333333333e-02
+422 244 -1.66666666666667e-01
+422 418 -8.33333333333333e-02
+422 428 -2.50000000000000e-01
+422 254 -1.50000000000000e+00
+422 427 -8.33333333333333e-02
+422 103 8.33333333333333e-02
+422 420 -3.33333333333333e-01
+422 426 1.66666666666667e-01
+422 252 3.33333333333333e-01
+423 423 1.00000000000000e+00
+423 265 8.33333333333333e-02
+423 434 8.33333333333333e-02
+423 431 -8.33333333333333e-02
+423 77 8.33333333333333e-02
+423 266 -1.66666666666667e-01
+423 76 8.33333333333333e-02
+423 424 -1.66666666666667e-01
+423 430 1.66666666666667e-01
+423 75 -2.50000000000000e-01
+423 429 -2.50000000000000e-01
+423 425 -1.66666666666667e-01
+423 80 8.33333333333333e-02
+423 269 1.66666666666667e-01
+423 79 8.33333333333333e-02
+423 433 -1.66666666666667e-01
+423 268 -8.33333333333333e-02
+423 78 -2.50000000000000e-01
+423 267 -2.50000000000000e-01
+424 424 1.16666666666667e+00
+424 264 8.33333333333333e-02
+424 269 1.66666666666667e-01
+424 425 -3.33333333333333e-01
+424 431 1.66666666666667e-01
+424 77 -8.33333333333333e-02
+424 266 8.33333333333333e-02
+424 76 -8.33333333333333e-02
+424 430 -7.50000000000000e-01
+424 75 8.33333333333333e-02
+424 423 -1.66666666666667e-01
+424 429 1.66666666666667e-01
+424 80 -8.33333333333333e-02
+424 434 8.33333333333333e-02
+424 267 -8.33333333333333e-02
+424 79 -8.33333333333333e-02
+424 268 -2.50000000000000e-01
+424 78 8.33333333333333e-02
+424 432 -1.66666666666667e-01
+425 425 1.16666666666667e+00
+425 424 -3.33333333333333e-01
+425 430 1.66666666666667e-01
+425 432 8.33333333333333e-02
+425 429 -8.33333333333333e-02
+425 77 -8.33333333333333e-02
+425 431 -2.50000000000000e-01
+425 76 -8.33333333333333e-02
+425 265 8.33333333333333e-02
+425 75 8.33333333333333e-02
+425 264 -1.66666666666667e-01
+425 268 1.66666666666667e-01
+425 80 -8.33333333333333e-02
+425 269 -7.50000000000000e-01
+425 79 -8.33333333333333e-02
+425 433 8.33333333333333e-02
+425 423 -1.66666666666667e-01
+425 78 8.33333333333333e-02
+425 267 1.66666666666667e-01
+426 426 2.50000000000000e+00
+426 431 1.66666666666667e-01
+426 104 -8.33333333333333e-02
+426 458 8.33333333333333e-02
+426 457 -1.66666666666667e-01
+426 77 -8.33333333333333e-02
+426 430 1.66666666666667e-01
+426 429 -7.50000000000000e-01
+426 266 1.66666666666667e-01
+426 265 1.66666666666667e-01
+426 272 3.33333333333333e-01
+426 271 -1.66666666666667e-01
+426 270 -5.00000000000000e-01
+426 248 -1.66666666666667e-01
+426 416 8.33333333333333e-02
+426 247 -1.66666666666667e-01
+426 253 1.66666666666667e-01
+426 415 -1.66666666666667e-01
+426 76 1.66666666666667e-01
+426 75 -2.50000000000000e-01
+426 422 1.66666666666667e-01
+426 254 -3.33333333333333e-01
+426 421 1.66666666666667e-01
+426 427 -3.33333333333333e-01
+426 103 1.66666666666667e-01
+426 420 -7.50000000000000e-01
+426 428 -3.33333333333333e-01
+426 102 -2.50000000000000e-01
+427 427 2.50000000000000e+00
+427 431 -8.33333333333333e-02
+427 456 -1.66666666666667e-01
+427 430 -2.50000000000000e-01
+427 429 1.66666666666667e-01
+427 266 -3.33333333333333e-01
+427 77 1.66666666666667e-01
+427 264 1.66666666666667e-01
+427 272 3.33333333333333e-01
+427 428 -3.33333333333333e-01
+427 104 1.66666666666667e-01
+427 271 -5.00000000000000e-01
+427 270 -1.66666666666667e-01
+427 246 -1.66666666666667e-01
+427 252 1.66666666666667e-01
+427 416 8.33333333333333e-02
+427 248 -1.66666666666667e-01
+427 76 -7.50000000000000e-01
+427 414 -1.66666666666667e-01
+427 75 1.66666666666667e-01
+427 422 -8.33333333333333e-02
+427 254 1.66666666666667e-01
+427 421 -2.50000000000000e-01
+427 458 8.33333333333333e-02
+427 103 -7.50000000000000e-01
+427 420 1.66666666666667e-01
+427 426 -3.33333333333333e-01
+427 102 1.66666666666667e-01
+428 428 2.50000000000000e+00
+428 430 -8.33333333333333e-02
+428 426 -3.33333333333333e-01
+428 429 1.66666666666667e-01
+428 102 -8.33333333333333e-02
+428 456 8.33333333333333e-02
+428 431 -2.50000000000000e-01
+428 75 -8.33333333333333e-02
+428 264 1.66666666666667e-01
+428 265 -3.33333333333333e-01
+428 76 1.66666666666667e-01
+428 272 -1.50000000000000e+00
+428 271 3.33333333333333e-01
+428 427 -3.33333333333333e-01
+428 103 1.66666666666667e-01
+428 270 3.33333333333333e-01
+428 246 -1.66666666666667e-01
+428 414 8.33333333333333e-02
+428 77 -2.50000000000000e-01
+428 415 8.33333333333333e-02
+428 247 -1.66666666666667e-01
+428 422 -2.50000000000000e-01
+428 457 8.33333333333333e-02
+428 104 -2.50000000000000e-01
+428 421 -8.33333333333333e-02
+428 253 1.66666666666667e-01
+428 420 1.66666666666667e-01
+428 252 -3.33333333333333e-01
+429 429 2.50000000000000e+00
+429 272 -3.33333333333333e-01
+429 271 1.66666666666667e-01
+429 77 8.33333333333333e-02
+429 427 1.66666666666667e-01
+429 426 -7.50000000000000e-01
+429 458 -8.33333333333333e-02
+429 107 8.33333333333333e-02
+429 457 1.66666666666667e-01
+429 456 -2.50000000000000e-01
+429 266 -1.66666666666667e-01
+429 265 -1.66666666666667e-01
+429 269 1.66666666666667e-01
+429 425 -8.33333333333333e-02
+429 430 -3.33333333333333e-01
+429 268 1.66666666666667e-01
+429 274 -1.66666666666667e-01
+429 76 -1.66666666666667e-01
+429 424 1.66666666666667e-01
+429 423 -2.50000000000000e-01
+429 431 -3.33333333333333e-01
+429 434 1.66666666666667e-01
+429 275 3.33333333333333e-01
+429 433 1.66666666666667e-01
+429 106 -1.66666666666667e-01
+429 428 1.66666666666667e-01
+429 432 -7.50000000000000e-01
+429 273 -5.00000000000000e-01
+430 430 2.50000000000000e+00
+430 272 1.66666666666667e-01
+430 270 1.66666666666667e-01
+430 427 -2.50000000000000e-01
+430 426 1.66666666666667e-01
+430 458 1.66666666666667e-01
+430 431 -3.33333333333333e-01
+430 457 -7.50000000000000e-01
+430 456 1.66666666666667e-01
+430 264 -1.66666666666667e-01
+430 425 1.66666666666667e-01
+430 429 -3.33333333333333e-01
+430 269 -3.33333333333333e-01
+430 275 3.33333333333333e-01
+430 267 1.66666666666667e-01
+430 273 -1.66666666666667e-01
+430 77 8.33333333333333e-02
+430 266 -1.66666666666667e-01
+430 424 -7.50000000000000e-01
+430 75 -1.66666666666667e-01
+430 423 1.66666666666667e-01
+430 434 -8.33333333333333e-02
+430 107 8.33333333333333e-02
+430 428 -8.33333333333333e-02
+430 433 -2.50000000000000e-01
+430 274 -5.00000000000000e-01
+430 432 1.66666666666667e-01
+430 105 -1.66666666666667e-01
+431 431 2.50000000000000e+00
+431 271 1.66666666666667e-01
+431 426 1.66666666666667e-01
+431 270 -3.33333333333333e-01
+431 428 -2.50000000000000e-01
+431 75 8.33333333333333e-02
+431 458 -2.50000000000000e-01
+431 457 1.66666666666667e-01
+431 430 -3.33333333333333e-01
+431 456 -8.33333333333333e-02
+431 105 8.33333333333333e-02
+431 264 -1.66666666666667e-01
+431 424 1.66666666666667e-01
+431 267 1.66666666666667e-01
+431 423 -8.33333333333333e-02
+431 268 -3.33333333333333e-01
+431 274 3.33333333333333e-01
+431 425 -2.50000000000000e-01
+431 76 8.33333333333333e-02
+431 265 -1.66666666666667e-01
+431 427 -8.33333333333333e-02
+431 434 -2.50000000000000e-01
+431 275 -1.50000000000000e+00
+431 433 -8.33333333333333e-02
+431 106 8.33333333333333e-02
+431 429 -3.33333333333333e-01
+431 432 1.66666666666667e-01
+431 273 3.33333333333333e-01
+432 432 1.33333333333333e+00
+432 280 8.33333333333333e-02
+432 284 1.66666666666667e-01
+432 283 -8.33333333333333e-02
+432 282 -2.50000000000000e-01
+432 269 -1.66666666666667e-01
+432 425 8.33333333333333e-02
+432 268 -1.66666666666667e-01
+432 274 1.66666666666667e-01
+432 424 -1.66666666666667e-01
+432 79 8.33333333333333e-02
+432 78 -1.66666666666667e-01
+432 431 1.66666666666667e-01
+432 275 -3.33333333333333e-01
+432 430 1.66666666666667e-01
+432 433 -1.66666666666667e-01
+432 106 8.33333333333333e-02
+432 429 -7.50000000000000e-01
+432 281 8.33333333333333e-02
+432 105 -1.66666666666667e-01
+433 433 1.50000000000000e+00
+433 80 8.33333333333333e-02
+433 279 8.33333333333333e-02
+433 284 1.66666666666667e-01
+433 434 -1.66666666666667e-01
+433 107 8.33333333333333e-02
+433 283 -2.50000000000000e-01
+433 282 -8.33333333333333e-02
+433 267 -1.66666666666667e-01
+433 273 1.66666666666667e-01
+433 425 8.33333333333333e-02
+433 269 -1.66666666666667e-01
+433 79 -5.00000000000000e-01
+433 423 -1.66666666666667e-01
+433 78 8.33333333333333e-02
+433 431 -8.33333333333333e-02
+433 275 1.66666666666667e-01
+433 430 -2.50000000000000e-01
+433 281 -1.66666666666667e-01
+433 106 -5.00000000000000e-01
+433 429 1.66666666666667e-01
+433 432 -1.66666666666667e-01
+433 105 8.33333333333333e-02
+434 434 1.33333333333333e+00
+434 280 -1.66666666666667e-01
+434 79 8.33333333333333e-02
+434 284 -7.50000000000000e-01
+434 283 1.66666666666667e-01
+434 433 -1.66666666666667e-01
+434 106 8.33333333333333e-02
+434 282 1.66666666666667e-01
+434 267 -1.66666666666667e-01
+434 423 8.33333333333333e-02
+434 80 -1.66666666666667e-01
+434 424 8.33333333333333e-02
+434 268 -1.66666666666667e-01
+434 431 -2.50000000000000e-01
+434 279 8.33333333333333e-02
+434 107 -1.66666666666667e-01
+434 430 -8.33333333333333e-02
+434 274 1.66666666666667e-01
+434 429 1.66666666666667e-01
+434 273 -3.33333333333333e-01
+435 435 7.50000000000000e+01
+435 290 0.00000000000000e+00
+435 289 0.00000000000000e+00
+435 437 -8.33333333333333e+00
+435 293 8.33333333333333e+00
+435 86 4.16666666666667e+00
+435 292 -4.16666666666667e+00
+435 291 -1.25000000000000e+01
+435 124 0.00000000000000e+00
+435 127 8.33333333333333e+00
+435 365 0.00000000000000e+00
+435 125 0.00000000000000e+00
+435 82 0.00000000000000e+00
+435 364 0.00000000000000e+00
+435 81 0.00000000000000e+00
+435 368 -4.16666666666667e+00
+435 128 8.33333333333333e+00
+435 436 -8.33333333333333e+00
+435 367 8.33333333333333e+00
+435 85 4.16666666666667e+00
+435 83 0.00000000000000e+00
+435 366 -1.25000000000000e+01
+435 84 -2.50000000000000e+01
+436 436 6.66666666666667e+01
+436 288 0.00000000000000e+00
+436 293 8.33333333333333e+00
+436 292 -1.25000000000000e+01
+436 291 -4.16666666666667e+00
+436 365 0.00000000000000e+00
+436 125 0.00000000000000e+00
+436 123 0.00000000000000e+00
+436 126 8.33333333333333e+00
+436 82 0.00000000000000e+00
+436 81 0.00000000000000e+00
+436 363 0.00000000000000e+00
+436 368 8.33333333333333e+00
+436 128 -1.66666666666667e+01
+436 290 0.00000000000000e+00
+436 367 -3.75000000000000e+01
+436 85 -8.33333333333333e+00
+436 435 -8.33333333333333e+00
+436 366 8.33333333333333e+00
+436 84 4.16666666666667e+00
+437 437 6.66666666666667e+01
+437 81 0.00000000000000e+00
+437 288 0.00000000000000e+00
+437 293 -3.75000000000000e+01
+437 292 8.33333333333333e+00
+437 435 -8.33333333333333e+00
+437 291 8.33333333333333e+00
+437 84 4.16666666666667e+00
+437 364 0.00000000000000e+00
+437 124 0.00000000000000e+00
+437 83 0.00000000000000e+00
+437 363 0.00000000000000e+00
+437 123 0.00000000000000e+00
+437 289 0.00000000000000e+00
+437 368 -1.25000000000000e+01
+437 86 -8.33333333333333e+00
+437 367 8.33333333333333e+00
+437 127 -1.66666666666667e+01
+437 366 -4.16666666666667e+00
+437 126 8.33333333333333e+00
+438 438 7.50000000000000e+01
+438 299 -8.33333333333333e+00
+438 298 4.16666666666667e+00
+438 440 -8.33333333333333e+00
+438 302 8.33333333333333e+00
+438 89 4.16666666666667e+00
+438 301 -4.16666666666667e+00
+438 300 -1.25000000000000e+01
+438 145 -8.33333333333333e+00
+438 148 8.33333333333333e+00
+438 374 4.16666666666667e+00
+438 146 -8.33333333333333e+00
+438 85 4.16666666666667e+00
+438 373 -8.33333333333333e+00
+438 84 -2.50000000000000e+01
+438 377 -4.16666666666667e+00
+438 149 8.33333333333333e+00
+438 439 -8.33333333333333e+00
+438 376 8.33333333333333e+00
+438 88 4.16666666666667e+00
+438 86 4.16666666666667e+00
+438 375 -1.25000000000000e+01
+438 87 -2.50000000000000e+01
+439 439 6.66666666666667e+01
+439 297 4.16666666666667e+00
+439 302 8.33333333333333e+00
+439 301 -1.25000000000000e+01
+439 300 -4.16666666666667e+00
+439 374 4.16666666666667e+00
+439 146 -8.33333333333333e+00
+439 144 -8.33333333333333e+00
+439 147 8.33333333333333e+00
+439 85 -8.33333333333333e+00
+439 84 4.16666666666667e+00
+439 372 -8.33333333333333e+00
+439 377 8.33333333333333e+00
+439 149 -1.66666666666667e+01
+439 299 4.16666666666667e+00
+439 376 -3.75000000000000e+01
+439 88 -8.33333333333333e+00
+439 438 -8.33333333333333e+00
+439 375 8.33333333333333e+00
+439 87 4.16666666666667e+00
+440 440 6.66666666666667e+01
+440 84 4.16666666666667e+00
+440 297 -8.33333333333333e+00
+440 302 -3.75000000000000e+01
+440 301 8.33333333333333e+00
+440 438 -8.33333333333333e+00
+440 300 8.33333333333333e+00
+440 87 4.16666666666667e+00
+440 373 4.16666666666667e+00
+440 145 -8.33333333333333e+00
+440 86 -8.33333333333333e+00
+440 372 4.16666666666667e+00
+440 144 -8.33333333333333e+00
+440 298 4.16666666666667e+00
+440 377 -1.25000000000000e+01
+440 89 -8.33333333333333e+00
+440 376 8.33333333333333e+00
+440 148 -1.66666666666667e+01
+440 375 -4.16666666666667e+00
+440 147 8.33333333333333e+00
+441 441 7.50000000000000e+01
+441 308 -8.33333333333333e+00
+441 307 4.16666666666667e+00
+441 443 -8.33333333333333e+00
+441 311 8.33333333333333e+00
+441 92 4.16666666666667e+00
+441 310 -4.16666666666667e+00
+441 309 -1.25000000000000e+01
+441 166 -8.33333333333333e+00
+441 169 8.33333333333333e+00
+441 383 4.16666666666667e+00
+441 167 -8.33333333333333e+00
+441 88 4.16666666666667e+00
+441 382 -8.33333333333333e+00
+441 87 -2.50000000000000e+01
+441 386 -4.16666666666667e+00
+441 170 8.33333333333333e+00
+441 442 -8.33333333333333e+00
+441 385 8.33333333333333e+00
+441 91 4.16666666666667e+00
+441 89 4.16666666666667e+00
+441 384 -1.25000000000000e+01
+441 90 -2.50000000000000e+01
+442 442 6.66666666666667e+01
+442 306 4.16666666666667e+00
+442 311 8.33333333333333e+00
+442 310 -1.25000000000000e+01
+442 309 -4.16666666666667e+00
+442 383 4.16666666666667e+00
+442 167 -8.33333333333333e+00
+442 165 -8.33333333333333e+00
+442 168 8.33333333333333e+00
+442 88 -8.33333333333333e+00
+442 87 4.16666666666667e+00
+442 381 -8.33333333333333e+00
+442 386 8.33333333333333e+00
+442 170 -1.66666666666667e+01
+442 308 4.16666666666667e+00
+442 385 -3.75000000000000e+01
+442 91 -8.33333333333333e+00
+442 441 -8.33333333333333e+00
+442 384 8.33333333333333e+00
+442 90 4.16666666666667e+00
+443 443 6.66666666666667e+01
+443 87 4.16666666666667e+00
+443 306 -8.33333333333333e+00
+443 311 -3.75000000000000e+01
+443 310 8.33333333333333e+00
+443 441 -8.33333333333333e+00
+443 309 8.33333333333333e+00
+443 90 4.16666666666667e+00
+443 382 4.16666666666667e+00
+443 166 -8.33333333333333e+00
+443 89 -8.33333333333333e+00
+443 381 4.16666666666667e+00
+443 165 -8.33333333333333e+00
+443 307 4.16666666666667e+00
+443 386 -1.25000000000000e+01
+443 92 -8.33333333333333e+00
+443 385 8.33333333333333e+00
+443 169 -1.66666666666667e+01
+443 384 -4.16666666666667e+00
+443 168 8.33333333333333e+00
+444 444 7.50000000000000e+01
+444 317 -8.33333333333333e+00
+444 316 4.16666666666667e+00
+444 446 -8.33333333333333e+00
+444 320 8.33333333333333e+00
+444 95 4.16666666666667e+00
+444 319 -4.16666666666667e+00
+444 318 -1.25000000000000e+01
+444 187 -8.33333333333333e+00
+444 190 8.33333333333333e+00
+444 392 4.16666666666667e+00
+444 188 -8.33333333333333e+00
+444 91 4.16666666666667e+00
+444 391 -8.33333333333333e+00
+444 90 -2.50000000000000e+01
+444 395 -4.16666666666667e+00
+444 191 8.33333333333333e+00
+444 445 -8.33333333333333e+00
+444 394 8.33333333333333e+00
+444 94 4.16666666666667e+00
+444 92 4.16666666666667e+00
+444 393 -1.25000000000000e+01
+444 93 -2.50000000000000e+01
+445 445 6.66666666666667e+01
+445 315 4.16666666666667e+00
+445 320 8.33333333333333e+00
+445 319 -1.25000000000000e+01
+445 318 -4.16666666666667e+00
+445 392 4.16666666666667e+00
+445 188 -8.33333333333333e+00
+445 186 -8.33333333333333e+00
+445 189 8.33333333333333e+00
+445 91 -8.33333333333333e+00
+445 90 4.16666666666667e+00
+445 390 -8.33333333333333e+00
+445 395 8.33333333333333e+00
+445 191 -1.66666666666667e+01
+445 317 4.16666666666667e+00
+445 394 -3.75000000000000e+01
+445 94 -8.33333333333333e+00
+445 444 -8.33333333333333e+00
+445 393 8.33333333333333e+00
+445 93 4.16666666666667e+00
+446 446 6.66666666666667e+01
+446 90 4.16666666666667e+00
+446 315 -8.33333333333333e+00
+446 320 -3.75000000000000e+01
+446 319 8.33333333333333e+00
+446 444 -8.33333333333333e+00
+446 318 8.33333333333333e+00
+446 93 4.16666666666667e+00
+446 391 4.16666666666667e+00
+446 187 -8.33333333333333e+00
+446 92 -8.33333333333333e+00
+446 390 4.16666666666667e+00
+446 186 -8.33333333333333e+00
+446 316 4.16666666666667e+00
+446 395 -1.25000000000000e+01
+446 95 -8.33333333333333e+00
+446 394 8.33333333333333e+00
+446 190 -1.66666666666667e+01
+446 393 -4.16666666666667e+00
+446 189 8.33333333333333e+00
+447 447 1.50000000000000e+00
+447 326 -1.66666666666667e-01
+447 325 8.33333333333333e-02
+447 449 -1.66666666666667e-01
+447 329 1.66666666666667e-01
+447 98 8.33333333333333e-02
+447 328 -8.33333333333333e-02
+447 327 -2.50000000000000e-01
+447 208 -1.66666666666667e-01
+447 211 1.66666666666667e-01
+447 401 8.33333333333333e-02
+447 209 -1.66666666666667e-01
+447 94 8.33333333333333e-02
+447 400 -1.66666666666667e-01
+447 93 -5.00000000000000e-01
+447 404 -8.33333333333333e-02
+447 212 1.66666666666667e-01
+447 448 -1.66666666666667e-01
+447 403 1.66666666666667e-01
+447 97 8.33333333333333e-02
+447 95 8.33333333333333e-02
+447 402 -2.50000000000000e-01
+447 96 -5.00000000000000e-01
+448 448 1.33333333333333e+00
+448 324 8.33333333333333e-02
+448 329 1.66666666666667e-01
+448 328 -2.50000000000000e-01
+448 327 -8.33333333333333e-02
+448 401 8.33333333333333e-02
+448 209 -1.66666666666667e-01
+448 207 -1.66666666666667e-01
+448 210 1.66666666666667e-01
+448 94 -1.66666666666667e-01
+448 93 8.33333333333333e-02
+448 399 -1.66666666666667e-01
+448 404 1.66666666666667e-01
+448 212 -3.33333333333333e-01
+448 326 8.33333333333333e-02
+448 403 -7.50000000000000e-01
+448 97 -1.66666666666667e-01
+448 447 -1.66666666666667e-01
+448 402 1.66666666666667e-01
+448 96 8.33333333333333e-02
+449 449 1.33333333333333e+00
+449 93 8.33333333333333e-02
+449 324 -1.66666666666667e-01
+449 329 -7.50000000000000e-01
+449 328 1.66666666666667e-01
+449 447 -1.66666666666667e-01
+449 327 1.66666666666667e-01
+449 96 8.33333333333333e-02
+449 400 8.33333333333333e-02
+449 208 -1.66666666666667e-01
+449 95 -1.66666666666667e-01
+449 399 8.33333333333333e-02
+449 207 -1.66666666666667e-01
+449 325 8.33333333333333e-02
+449 404 -2.50000000000000e-01
+449 98 -1.66666666666667e-01
+449 403 1.66666666666667e-01
+449 211 -3.33333333333333e-01
+449 402 -8.33333333333333e-02
+449 210 1.66666666666667e-01
+450 450 1.50000000000000e+00
+450 335 -1.66666666666667e-01
+450 334 8.33333333333333e-02
+450 452 -1.66666666666667e-01
+450 338 1.66666666666667e-01
+450 101 8.33333333333333e-02
+450 337 -8.33333333333333e-02
+450 336 -2.50000000000000e-01
+450 229 -1.66666666666667e-01
+450 232 1.66666666666667e-01
+450 410 8.33333333333333e-02
+450 230 -1.66666666666667e-01
+450 97 8.33333333333333e-02
+450 409 -1.66666666666667e-01
+450 96 -5.00000000000000e-01
+450 413 -8.33333333333333e-02
+450 233 1.66666666666667e-01
+450 451 -1.66666666666667e-01
+450 412 1.66666666666667e-01
+450 100 8.33333333333333e-02
+450 98 8.33333333333333e-02
+450 411 -2.50000000000000e-01
+450 99 -5.00000000000000e-01
+451 451 1.33333333333333e+00
+451 333 8.33333333333333e-02
+451 338 1.66666666666667e-01
+451 337 -2.50000000000000e-01
+451 336 -8.33333333333333e-02
+451 410 8.33333333333333e-02
+451 230 -1.66666666666667e-01
+451 228 -1.66666666666667e-01
+451 231 1.66666666666667e-01
+451 97 -1.66666666666667e-01
+451 96 8.33333333333333e-02
+451 408 -1.66666666666667e-01
+451 413 1.66666666666667e-01
+451 233 -3.33333333333333e-01
+451 335 8.33333333333333e-02
+451 412 -7.50000000000000e-01
+451 100 -1.66666666666667e-01
+451 450 -1.66666666666667e-01
+451 411 1.66666666666667e-01
+451 99 8.33333333333333e-02
+452 452 1.33333333333333e+00
+452 96 8.33333333333333e-02
+452 333 -1.66666666666667e-01
+452 338 -7.50000000000000e-01
+452 337 1.66666666666667e-01
+452 450 -1.66666666666667e-01
+452 336 1.66666666666667e-01
+452 99 8.33333333333333e-02
+452 409 8.33333333333333e-02
+452 229 -1.66666666666667e-01
+452 98 -1.66666666666667e-01
+452 408 8.33333333333333e-02
+452 228 -1.66666666666667e-01
+452 334 8.33333333333333e-02
+452 413 -2.50000000000000e-01
+452 101 -1.66666666666667e-01
+452 412 1.66666666666667e-01
+452 232 -3.33333333333333e-01
+452 411 -8.33333333333333e-02
+452 231 1.66666666666667e-01
+453 453 1.50000000000000e+00
+453 344 -1.66666666666667e-01
+453 343 8.33333333333333e-02
+453 455 -1.66666666666667e-01
+453 347 1.66666666666667e-01
+453 104 8.33333333333333e-02
+453 346 -8.33333333333333e-02
+453 345 -2.50000000000000e-01
+453 250 -1.66666666666667e-01
+453 253 1.66666666666667e-01
+453 419 8.33333333333333e-02
+453 251 -1.66666666666667e-01
+453 100 8.33333333333333e-02
+453 418 -1.66666666666667e-01
+453 99 -5.00000000000000e-01
+453 422 -8.33333333333333e-02
+453 254 1.66666666666667e-01
+453 454 -1.66666666666667e-01
+453 421 1.66666666666667e-01
+453 103 8.33333333333333e-02
+453 101 8.33333333333333e-02
+453 420 -2.50000000000000e-01
+453 102 -5.00000000000000e-01
+454 454 1.33333333333333e+00
+454 342 8.33333333333333e-02
+454 347 1.66666666666667e-01
+454 346 -2.50000000000000e-01
+454 345 -8.33333333333333e-02
+454 419 8.33333333333333e-02
+454 251 -1.66666666666667e-01
+454 249 -1.66666666666667e-01
+454 252 1.66666666666667e-01
+454 100 -1.66666666666667e-01
+454 99 8.33333333333333e-02
+454 417 -1.66666666666667e-01
+454 422 1.66666666666667e-01
+454 254 -3.33333333333333e-01
+454 344 8.33333333333333e-02
+454 421 -7.50000000000000e-01
+454 103 -1.66666666666667e-01
+454 453 -1.66666666666667e-01
+454 420 1.66666666666667e-01
+454 102 8.33333333333333e-02
+455 455 1.33333333333333e+00
+455 99 8.33333333333333e-02
+455 342 -1.66666666666667e-01
+455 347 -7.50000000000000e-01
+455 346 1.66666666666667e-01
+455 453 -1.66666666666667e-01
+455 345 1.66666666666667e-01
+455 102 8.33333333333333e-02
+455 418 8.33333333333333e-02
+455 250 -1.66666666666667e-01
+455 101 -1.66666666666667e-01
+455 417 8.33333333333333e-02
+455 249 -1.66666666666667e-01
+455 343 8.33333333333333e-02
+455 422 -2.50000000000000e-01
+455 104 -1.66666666666667e-01
+455 421 1.66666666666667e-01
+455 253 -3.33333333333333e-01
+455 420 -8.33333333333333e-02
+455 252 1.66666666666667e-01
+456 456 1.50000000000000e+00
+456 353 -1.66666666666667e-01
+456 352 8.33333333333333e-02
+456 458 -1.66666666666667e-01
+456 356 1.66666666666667e-01
+456 107 8.33333333333333e-02
+456 355 -8.33333333333333e-02
+456 354 -2.50000000000000e-01
+456 271 -1.66666666666667e-01
+456 274 1.66666666666667e-01
+456 428 8.33333333333333e-02
+456 272 -1.66666666666667e-01
+456 103 8.33333333333333e-02
+456 427 -1.66666666666667e-01
+456 102 -5.00000000000000e-01
+456 431 -8.33333333333333e-02
+456 275 1.66666666666667e-01
+456 457 -1.66666666666667e-01
+456 430 1.66666666666667e-01
+456 106 8.33333333333333e-02
+456 104 8.33333333333333e-02
+456 429 -2.50000000000000e-01
+456 105 -5.00000000000000e-01
+457 457 1.33333333333333e+00
+457 351 8.33333333333333e-02
+457 356 1.66666666666667e-01
+457 355 -2.50000000000000e-01
+457 354 -8.33333333333333e-02
+457 428 8.33333333333333e-02
+457 272 -1.66666666666667e-01
+457 270 -1.66666666666667e-01
+457 273 1.66666666666667e-01
+457 103 -1.66666666666667e-01
+457 102 8.33333333333333e-02
+457 426 -1.66666666666667e-01
+457 431 1.66666666666667e-01
+457 275 -3.33333333333333e-01
+457 353 8.33333333333333e-02
+457 430 -7.50000000000000e-01
+457 106 -1.66666666666667e-01
+457 456 -1.66666666666667e-01
+457 429 1.66666666666667e-01
+457 105 8.33333333333333e-02
+458 458 1.33333333333333e+00
+458 102 8.33333333333333e-02
+458 351 -1.66666666666667e-01
+458 356 -7.50000000000000e-01
+458 355 1.66666666666667e-01
+458 456 -1.66666666666667e-01
+458 354 1.66666666666667e-01
+458 105 8.33333333333333e-02
+458 427 8.33333333333333e-02
+458 271 -1.66666666666667e-01
+458 104 -1.66666666666667e-01
+458 426 8.33333333333333e-02
+458 270 -1.66666666666667e-01
+458 352 8.33333333333333e-02
+458 431 -2.50000000000000e-01
+458 107 -1.66666666666667e-01
+458 430 1.66666666666667e-01
+458 274 -3.33333333333333e-01
+458 429 -8.33333333333333e-02
+458 273 1.66666666666667e-01
diff --git a/external/hypre/src/test/TEST_ij/data/beam_tet_dof459_np1/b.IJ.00000 b/external/hypre/src/test/TEST_ij/data/beam_tet_dof459_np1/b.IJ.00000
new file mode 100644
index 00000000..91a76905
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/data/beam_tet_dof459_np1/b.IJ.00000
@@ -0,0 +1,460 @@
+0 458
+0 0.00000000000000e+00
+1 0.00000000000000e+00
+2 0.00000000000000e+00
+3 0.00000000000000e+00
+4 0.00000000000000e+00
+5 0.00000000000000e+00
+6 0.00000000000000e+00
+7 0.00000000000000e+00
+8 0.00000000000000e+00
+9 0.00000000000000e+00
+10 0.00000000000000e+00
+11 0.00000000000000e+00
+12 0.00000000000000e+00
+13 0.00000000000000e+00
+14 0.00000000000000e+00
+15 0.00000000000000e+00
+16 0.00000000000000e+00
+17 0.00000000000000e+00
+18 0.00000000000000e+00
+19 0.00000000000000e+00
+20 0.00000000000000e+00
+21 0.00000000000000e+00
+22 0.00000000000000e+00
+23 0.00000000000000e+00
+24 0.00000000000000e+00
+25 0.00000000000000e+00
+26 -8.33333333333333e-04
+27 0.00000000000000e+00
+28 0.00000000000000e+00
+29 0.00000000000000e+00
+30 0.00000000000000e+00
+31 0.00000000000000e+00
+32 0.00000000000000e+00
+33 0.00000000000000e+00
+34 0.00000000000000e+00
+35 0.00000000000000e+00
+36 0.00000000000000e+00
+37 0.00000000000000e+00
+38 0.00000000000000e+00
+39 0.00000000000000e+00
+40 0.00000000000000e+00
+41 0.00000000000000e+00
+42 0.00000000000000e+00
+43 0.00000000000000e+00
+44 0.00000000000000e+00
+45 0.00000000000000e+00
+46 0.00000000000000e+00
+47 0.00000000000000e+00
+48 0.00000000000000e+00
+49 0.00000000000000e+00
+50 0.00000000000000e+00
+51 0.00000000000000e+00
+52 0.00000000000000e+00
+53 -4.16666666666667e-04
+54 0.00000000000000e+00
+55 0.00000000000000e+00
+56 0.00000000000000e+00
+57 0.00000000000000e+00
+58 0.00000000000000e+00
+59 0.00000000000000e+00
+60 0.00000000000000e+00
+61 0.00000000000000e+00
+62 0.00000000000000e+00
+63 0.00000000000000e+00
+64 0.00000000000000e+00
+65 0.00000000000000e+00
+66 0.00000000000000e+00
+67 0.00000000000000e+00
+68 0.00000000000000e+00
+69 0.00000000000000e+00
+70 0.00000000000000e+00
+71 0.00000000000000e+00
+72 0.00000000000000e+00
+73 0.00000000000000e+00
+74 0.00000000000000e+00
+75 0.00000000000000e+00
+76 0.00000000000000e+00
+77 0.00000000000000e+00
+78 0.00000000000000e+00
+79 0.00000000000000e+00
+80 -4.16666666666667e-04
+81 0.00000000000000e+00
+82 0.00000000000000e+00
+83 0.00000000000000e+00
+84 0.00000000000000e+00
+85 0.00000000000000e+00
+86 0.00000000000000e+00
+87 0.00000000000000e+00
+88 0.00000000000000e+00
+89 0.00000000000000e+00
+90 0.00000000000000e+00
+91 0.00000000000000e+00
+92 0.00000000000000e+00
+93 0.00000000000000e+00
+94 0.00000000000000e+00
+95 0.00000000000000e+00
+96 0.00000000000000e+00
+97 0.00000000000000e+00
+98 0.00000000000000e+00
+99 0.00000000000000e+00
+100 0.00000000000000e+00
+101 0.00000000000000e+00
+102 0.00000000000000e+00
+103 0.00000000000000e+00
+104 0.00000000000000e+00
+105 0.00000000000000e+00
+106 0.00000000000000e+00
+107 -8.33333333333333e-04
+108 0.00000000000000e+00
+109 0.00000000000000e+00
+110 0.00000000000000e+00
+111 0.00000000000000e+00
+112 0.00000000000000e+00
+113 0.00000000000000e+00
+114 0.00000000000000e+00
+115 0.00000000000000e+00
+116 0.00000000000000e+00
+117 0.00000000000000e+00
+118 0.00000000000000e+00
+119 0.00000000000000e+00
+120 0.00000000000000e+00
+121 0.00000000000000e+00
+122 0.00000000000000e+00
+123 0.00000000000000e+00
+124 0.00000000000000e+00
+125 0.00000000000000e+00
+126 0.00000000000000e+00
+127 0.00000000000000e+00
+128 0.00000000000000e+00
+129 0.00000000000000e+00
+130 0.00000000000000e+00
+131 0.00000000000000e+00
+132 0.00000000000000e+00
+133 0.00000000000000e+00
+134 0.00000000000000e+00
+135 0.00000000000000e+00
+136 0.00000000000000e+00
+137 0.00000000000000e+00
+138 0.00000000000000e+00
+139 0.00000000000000e+00
+140 0.00000000000000e+00
+141 0.00000000000000e+00
+142 0.00000000000000e+00
+143 0.00000000000000e+00
+144 0.00000000000000e+00
+145 0.00000000000000e+00
+146 0.00000000000000e+00
+147 0.00000000000000e+00
+148 0.00000000000000e+00
+149 0.00000000000000e+00
+150 0.00000000000000e+00
+151 0.00000000000000e+00
+152 0.00000000000000e+00
+153 0.00000000000000e+00
+154 0.00000000000000e+00
+155 0.00000000000000e+00
+156 0.00000000000000e+00
+157 0.00000000000000e+00
+158 0.00000000000000e+00
+159 0.00000000000000e+00
+160 0.00000000000000e+00
+161 0.00000000000000e+00
+162 0.00000000000000e+00
+163 0.00000000000000e+00
+164 0.00000000000000e+00
+165 0.00000000000000e+00
+166 0.00000000000000e+00
+167 0.00000000000000e+00
+168 0.00000000000000e+00
+169 0.00000000000000e+00
+170 0.00000000000000e+00
+171 0.00000000000000e+00
+172 0.00000000000000e+00
+173 0.00000000000000e+00
+174 0.00000000000000e+00
+175 0.00000000000000e+00
+176 0.00000000000000e+00
+177 0.00000000000000e+00
+178 0.00000000000000e+00
+179 0.00000000000000e+00
+180 0.00000000000000e+00
+181 0.00000000000000e+00
+182 0.00000000000000e+00
+183 0.00000000000000e+00
+184 0.00000000000000e+00
+185 0.00000000000000e+00
+186 0.00000000000000e+00
+187 0.00000000000000e+00
+188 0.00000000000000e+00
+189 0.00000000000000e+00
+190 0.00000000000000e+00
+191 0.00000000000000e+00
+192 0.00000000000000e+00
+193 0.00000000000000e+00
+194 0.00000000000000e+00
+195 0.00000000000000e+00
+196 0.00000000000000e+00
+197 0.00000000000000e+00
+198 0.00000000000000e+00
+199 0.00000000000000e+00
+200 0.00000000000000e+00
+201 0.00000000000000e+00
+202 0.00000000000000e+00
+203 0.00000000000000e+00
+204 0.00000000000000e+00
+205 0.00000000000000e+00
+206 0.00000000000000e+00
+207 0.00000000000000e+00
+208 0.00000000000000e+00
+209 0.00000000000000e+00
+210 0.00000000000000e+00
+211 0.00000000000000e+00
+212 0.00000000000000e+00
+213 0.00000000000000e+00
+214 0.00000000000000e+00
+215 0.00000000000000e+00
+216 0.00000000000000e+00
+217 0.00000000000000e+00
+218 0.00000000000000e+00
+219 0.00000000000000e+00
+220 0.00000000000000e+00
+221 0.00000000000000e+00
+222 0.00000000000000e+00
+223 0.00000000000000e+00
+224 0.00000000000000e+00
+225 0.00000000000000e+00
+226 0.00000000000000e+00
+227 0.00000000000000e+00
+228 0.00000000000000e+00
+229 0.00000000000000e+00
+230 0.00000000000000e+00
+231 0.00000000000000e+00
+232 0.00000000000000e+00
+233 0.00000000000000e+00
+234 0.00000000000000e+00
+235 0.00000000000000e+00
+236 0.00000000000000e+00
+237 0.00000000000000e+00
+238 0.00000000000000e+00
+239 0.00000000000000e+00
+240 0.00000000000000e+00
+241 0.00000000000000e+00
+242 0.00000000000000e+00
+243 0.00000000000000e+00
+244 0.00000000000000e+00
+245 0.00000000000000e+00
+246 0.00000000000000e+00
+247 0.00000000000000e+00
+248 0.00000000000000e+00
+249 0.00000000000000e+00
+250 0.00000000000000e+00
+251 0.00000000000000e+00
+252 0.00000000000000e+00
+253 0.00000000000000e+00
+254 0.00000000000000e+00
+255 0.00000000000000e+00
+256 0.00000000000000e+00
+257 0.00000000000000e+00
+258 0.00000000000000e+00
+259 0.00000000000000e+00
+260 0.00000000000000e+00
+261 0.00000000000000e+00
+262 0.00000000000000e+00
+263 0.00000000000000e+00
+264 0.00000000000000e+00
+265 0.00000000000000e+00
+266 0.00000000000000e+00
+267 0.00000000000000e+00
+268 0.00000000000000e+00
+269 0.00000000000000e+00
+270 0.00000000000000e+00
+271 0.00000000000000e+00
+272 0.00000000000000e+00
+273 0.00000000000000e+00
+274 0.00000000000000e+00
+275 0.00000000000000e+00
+276 0.00000000000000e+00
+277 0.00000000000000e+00
+278 -1.25000000000000e-03
+279 0.00000000000000e+00
+280 0.00000000000000e+00
+281 -1.25000000000000e-03
+282 0.00000000000000e+00
+283 0.00000000000000e+00
+284 -2.50000000000000e-03
+285 0.00000000000000e+00
+286 0.00000000000000e+00
+287 0.00000000000000e+00
+288 0.00000000000000e+00
+289 0.00000000000000e+00
+290 0.00000000000000e+00
+291 0.00000000000000e+00
+292 0.00000000000000e+00
+293 0.00000000000000e+00
+294 0.00000000000000e+00
+295 0.00000000000000e+00
+296 0.00000000000000e+00
+297 0.00000000000000e+00
+298 0.00000000000000e+00
+299 0.00000000000000e+00
+300 0.00000000000000e+00
+301 0.00000000000000e+00
+302 0.00000000000000e+00
+303 0.00000000000000e+00
+304 0.00000000000000e+00
+305 0.00000000000000e+00
+306 0.00000000000000e+00
+307 0.00000000000000e+00
+308 0.00000000000000e+00
+309 0.00000000000000e+00
+310 0.00000000000000e+00
+311 0.00000000000000e+00
+312 0.00000000000000e+00
+313 0.00000000000000e+00
+314 0.00000000000000e+00
+315 0.00000000000000e+00
+316 0.00000000000000e+00
+317 0.00000000000000e+00
+318 0.00000000000000e+00
+319 0.00000000000000e+00
+320 0.00000000000000e+00
+321 0.00000000000000e+00
+322 0.00000000000000e+00
+323 0.00000000000000e+00
+324 0.00000000000000e+00
+325 0.00000000000000e+00
+326 0.00000000000000e+00
+327 0.00000000000000e+00
+328 0.00000000000000e+00
+329 0.00000000000000e+00
+330 0.00000000000000e+00
+331 0.00000000000000e+00
+332 0.00000000000000e+00
+333 0.00000000000000e+00
+334 0.00000000000000e+00
+335 0.00000000000000e+00
+336 0.00000000000000e+00
+337 0.00000000000000e+00
+338 0.00000000000000e+00
+339 0.00000000000000e+00
+340 0.00000000000000e+00
+341 0.00000000000000e+00
+342 0.00000000000000e+00
+343 0.00000000000000e+00
+344 0.00000000000000e+00
+345 0.00000000000000e+00
+346 0.00000000000000e+00
+347 0.00000000000000e+00
+348 0.00000000000000e+00
+349 0.00000000000000e+00
+350 0.00000000000000e+00
+351 0.00000000000000e+00
+352 0.00000000000000e+00
+353 0.00000000000000e+00
+354 0.00000000000000e+00
+355 0.00000000000000e+00
+356 0.00000000000000e+00
+357 0.00000000000000e+00
+358 0.00000000000000e+00
+359 -1.25000000000000e-03
+360 0.00000000000000e+00
+361 0.00000000000000e+00
+362 0.00000000000000e+00
+363 0.00000000000000e+00
+364 0.00000000000000e+00
+365 0.00000000000000e+00
+366 0.00000000000000e+00
+367 0.00000000000000e+00
+368 0.00000000000000e+00
+369 0.00000000000000e+00
+370 0.00000000000000e+00
+371 0.00000000000000e+00
+372 0.00000000000000e+00
+373 0.00000000000000e+00
+374 0.00000000000000e+00
+375 0.00000000000000e+00
+376 0.00000000000000e+00
+377 0.00000000000000e+00
+378 0.00000000000000e+00
+379 0.00000000000000e+00
+380 0.00000000000000e+00
+381 0.00000000000000e+00
+382 0.00000000000000e+00
+383 0.00000000000000e+00
+384 0.00000000000000e+00
+385 0.00000000000000e+00
+386 0.00000000000000e+00
+387 0.00000000000000e+00
+388 0.00000000000000e+00
+389 0.00000000000000e+00
+390 0.00000000000000e+00
+391 0.00000000000000e+00
+392 0.00000000000000e+00
+393 0.00000000000000e+00
+394 0.00000000000000e+00
+395 0.00000000000000e+00
+396 0.00000000000000e+00
+397 0.00000000000000e+00
+398 0.00000000000000e+00
+399 0.00000000000000e+00
+400 0.00000000000000e+00
+401 0.00000000000000e+00
+402 0.00000000000000e+00
+403 0.00000000000000e+00
+404 0.00000000000000e+00
+405 0.00000000000000e+00
+406 0.00000000000000e+00
+407 0.00000000000000e+00
+408 0.00000000000000e+00
+409 0.00000000000000e+00
+410 0.00000000000000e+00
+411 0.00000000000000e+00
+412 0.00000000000000e+00
+413 0.00000000000000e+00
+414 0.00000000000000e+00
+415 0.00000000000000e+00
+416 0.00000000000000e+00
+417 0.00000000000000e+00
+418 0.00000000000000e+00
+419 0.00000000000000e+00
+420 0.00000000000000e+00
+421 0.00000000000000e+00
+422 0.00000000000000e+00
+423 0.00000000000000e+00
+424 0.00000000000000e+00
+425 0.00000000000000e+00
+426 0.00000000000000e+00
+427 0.00000000000000e+00
+428 0.00000000000000e+00
+429 0.00000000000000e+00
+430 0.00000000000000e+00
+431 0.00000000000000e+00
+432 0.00000000000000e+00
+433 0.00000000000000e+00
+434 -1.25000000000000e-03
+435 0.00000000000000e+00
+436 0.00000000000000e+00
+437 0.00000000000000e+00
+438 0.00000000000000e+00
+439 0.00000000000000e+00
+440 0.00000000000000e+00
+441 0.00000000000000e+00
+442 0.00000000000000e+00
+443 0.00000000000000e+00
+444 0.00000000000000e+00
+445 0.00000000000000e+00
+446 0.00000000000000e+00
+447 0.00000000000000e+00
+448 0.00000000000000e+00
+449 0.00000000000000e+00
+450 0.00000000000000e+00
+451 0.00000000000000e+00
+452 0.00000000000000e+00
+453 0.00000000000000e+00
+454 0.00000000000000e+00
+455 0.00000000000000e+00
+456 0.00000000000000e+00
+457 0.00000000000000e+00
+458 0.00000000000000e+00
diff --git a/external/hypre/src/test/TEST_ij/data/beam_tet_dof459_np1/mfem.txt b/external/hypre/src/test/TEST_ij/data/beam_tet_dof459_np1/mfem.txt
new file mode 100644
index 00000000..c8f947d7
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/data/beam_tet_dof459_np1/mfem.txt
@@ -0,0 +1,19 @@
+$ mpirun -np 1 ./ex2p -m ../beam-tet.mesh -sr 1 -sp 0 -no-vis
+
+Produced with mfem-4.4 (https://github.com/mfem/mfem/archive/refs/tags/v4.4.tar.gz)
+
+Options used:
+   --mesh ../beam-tet.mesh
+   --order 1
+   --serial_ref 1
+   --parallel_ref 0
+   --amg-for-systems
+   --no-static-condensation
+   --no-visualization
+   --by-vdim
+   --device cpu
+Device configuration: cpu
+Memory configuration: host-std
+Number of finite element unknowns: 459
+Assembling: r.h.s. ... matrix ... done.
+Size of linear system: 459
\ No newline at end of file
diff --git a/external/hypre/src/test/TEST_ij/data/beam_tet_dof459_np1/rbms.0.00000 b/external/hypre/src/test/TEST_ij/data/beam_tet_dof459_np1/rbms.0.00000
new file mode 100644
index 00000000..c9c08061
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/data/beam_tet_dof459_np1/rbms.0.00000
@@ -0,0 +1,460 @@
+0 459
+0 0.00000000000000e+00
+1 -0.00000000000000e+00
+2 0.00000000000000e+00
+3 0.00000000000000e+00
+4 -1.00000000000000e+00
+5 0.00000000000000e+00
+6 0.00000000000000e+00
+7 -2.00000000000000e+00
+8 0.00000000000000e+00
+9 0.00000000000000e+00
+10 -3.00000000000000e+00
+11 0.00000000000000e+00
+12 0.00000000000000e+00
+13 -4.00000000000000e+00
+14 0.00000000000000e+00
+15 0.00000000000000e+00
+16 -5.00000000000000e+00
+17 0.00000000000000e+00
+18 0.00000000000000e+00
+19 -6.00000000000000e+00
+20 0.00000000000000e+00
+21 0.00000000000000e+00
+22 -7.00000000000000e+00
+23 0.00000000000000e+00
+24 0.00000000000000e+00
+25 -8.00000000000000e+00
+26 0.00000000000000e+00
+27 1.00000000000000e+00
+28 -0.00000000000000e+00
+29 0.00000000000000e+00
+30 1.00000000000000e+00
+31 -1.00000000000000e+00
+32 0.00000000000000e+00
+33 1.00000000000000e+00
+34 -2.00000000000000e+00
+35 0.00000000000000e+00
+36 1.00000000000000e+00
+37 -3.00000000000000e+00
+38 0.00000000000000e+00
+39 1.00000000000000e+00
+40 -4.00000000000000e+00
+41 0.00000000000000e+00
+42 1.00000000000000e+00
+43 -5.00000000000000e+00
+44 0.00000000000000e+00
+45 1.00000000000000e+00
+46 -6.00000000000000e+00
+47 0.00000000000000e+00
+48 1.00000000000000e+00
+49 -7.00000000000000e+00
+50 0.00000000000000e+00
+51 1.00000000000000e+00
+52 -8.00000000000000e+00
+53 0.00000000000000e+00
+54 0.00000000000000e+00
+55 -0.00000000000000e+00
+56 0.00000000000000e+00
+57 0.00000000000000e+00
+58 -1.00000000000000e+00
+59 0.00000000000000e+00
+60 0.00000000000000e+00
+61 -2.00000000000000e+00
+62 0.00000000000000e+00
+63 0.00000000000000e+00
+64 -3.00000000000000e+00
+65 0.00000000000000e+00
+66 0.00000000000000e+00
+67 -4.00000000000000e+00
+68 0.00000000000000e+00
+69 0.00000000000000e+00
+70 -5.00000000000000e+00
+71 0.00000000000000e+00
+72 0.00000000000000e+00
+73 -6.00000000000000e+00
+74 0.00000000000000e+00
+75 0.00000000000000e+00
+76 -7.00000000000000e+00
+77 0.00000000000000e+00
+78 0.00000000000000e+00
+79 -8.00000000000000e+00
+80 0.00000000000000e+00
+81 1.00000000000000e+00
+82 -0.00000000000000e+00
+83 0.00000000000000e+00
+84 1.00000000000000e+00
+85 -1.00000000000000e+00
+86 0.00000000000000e+00
+87 1.00000000000000e+00
+88 -2.00000000000000e+00
+89 0.00000000000000e+00
+90 1.00000000000000e+00
+91 -3.00000000000000e+00
+92 0.00000000000000e+00
+93 1.00000000000000e+00
+94 -4.00000000000000e+00
+95 0.00000000000000e+00
+96 1.00000000000000e+00
+97 -5.00000000000000e+00
+98 0.00000000000000e+00
+99 1.00000000000000e+00
+100 -6.00000000000000e+00
+101 0.00000000000000e+00
+102 1.00000000000000e+00
+103 -7.00000000000000e+00
+104 0.00000000000000e+00
+105 1.00000000000000e+00
+106 -8.00000000000000e+00
+107 0.00000000000000e+00
+108 0.00000000000000e+00
+109 -5.00000000000000e-01
+110 0.00000000000000e+00
+111 5.00000000000000e-01
+112 -0.00000000000000e+00
+113 0.00000000000000e+00
+114 5.00000000000000e-01
+115 -5.00000000000000e-01
+116 0.00000000000000e+00
+117 0.00000000000000e+00
+118 -0.00000000000000e+00
+119 0.00000000000000e+00
+120 0.00000000000000e+00
+121 -5.00000000000000e-01
+122 0.00000000000000e+00
+123 5.00000000000000e-01
+124 -0.00000000000000e+00
+125 0.00000000000000e+00
+126 5.00000000000000e-01
+127 -5.00000000000000e-01
+128 0.00000000000000e+00
+129 0.00000000000000e+00
+130 -1.50000000000000e+00
+131 0.00000000000000e+00
+132 5.00000000000000e-01
+133 -1.00000000000000e+00
+134 0.00000000000000e+00
+135 5.00000000000000e-01
+136 -1.50000000000000e+00
+137 0.00000000000000e+00
+138 0.00000000000000e+00
+139 -1.00000000000000e+00
+140 0.00000000000000e+00
+141 0.00000000000000e+00
+142 -1.50000000000000e+00
+143 0.00000000000000e+00
+144 5.00000000000000e-01
+145 -1.00000000000000e+00
+146 0.00000000000000e+00
+147 5.00000000000000e-01
+148 -1.50000000000000e+00
+149 0.00000000000000e+00
+150 0.00000000000000e+00
+151 -2.50000000000000e+00
+152 0.00000000000000e+00
+153 5.00000000000000e-01
+154 -2.00000000000000e+00
+155 0.00000000000000e+00
+156 5.00000000000000e-01
+157 -2.50000000000000e+00
+158 0.00000000000000e+00
+159 0.00000000000000e+00
+160 -2.00000000000000e+00
+161 0.00000000000000e+00
+162 0.00000000000000e+00
+163 -2.50000000000000e+00
+164 0.00000000000000e+00
+165 5.00000000000000e-01
+166 -2.00000000000000e+00
+167 0.00000000000000e+00
+168 5.00000000000000e-01
+169 -2.50000000000000e+00
+170 0.00000000000000e+00
+171 0.00000000000000e+00
+172 -3.50000000000000e+00
+173 0.00000000000000e+00
+174 5.00000000000000e-01
+175 -3.00000000000000e+00
+176 0.00000000000000e+00
+177 5.00000000000000e-01
+178 -3.50000000000000e+00
+179 0.00000000000000e+00
+180 0.00000000000000e+00
+181 -3.00000000000000e+00
+182 0.00000000000000e+00
+183 0.00000000000000e+00
+184 -3.50000000000000e+00
+185 0.00000000000000e+00
+186 5.00000000000000e-01
+187 -3.00000000000000e+00
+188 0.00000000000000e+00
+189 5.00000000000000e-01
+190 -3.50000000000000e+00
+191 0.00000000000000e+00
+192 0.00000000000000e+00
+193 -4.50000000000000e+00
+194 0.00000000000000e+00
+195 5.00000000000000e-01
+196 -4.00000000000000e+00
+197 0.00000000000000e+00
+198 5.00000000000000e-01
+199 -4.50000000000000e+00
+200 0.00000000000000e+00
+201 0.00000000000000e+00
+202 -4.00000000000000e+00
+203 0.00000000000000e+00
+204 0.00000000000000e+00
+205 -4.50000000000000e+00
+206 0.00000000000000e+00
+207 5.00000000000000e-01
+208 -4.00000000000000e+00
+209 0.00000000000000e+00
+210 5.00000000000000e-01
+211 -4.50000000000000e+00
+212 0.00000000000000e+00
+213 0.00000000000000e+00
+214 -5.50000000000000e+00
+215 0.00000000000000e+00
+216 5.00000000000000e-01
+217 -5.00000000000000e+00
+218 0.00000000000000e+00
+219 5.00000000000000e-01
+220 -5.50000000000000e+00
+221 0.00000000000000e+00
+222 0.00000000000000e+00
+223 -5.00000000000000e+00
+224 0.00000000000000e+00
+225 0.00000000000000e+00
+226 -5.50000000000000e+00
+227 0.00000000000000e+00
+228 5.00000000000000e-01
+229 -5.00000000000000e+00
+230 0.00000000000000e+00
+231 5.00000000000000e-01
+232 -5.50000000000000e+00
+233 0.00000000000000e+00
+234 0.00000000000000e+00
+235 -6.50000000000000e+00
+236 0.00000000000000e+00
+237 5.00000000000000e-01
+238 -6.00000000000000e+00
+239 0.00000000000000e+00
+240 5.00000000000000e-01
+241 -6.50000000000000e+00
+242 0.00000000000000e+00
+243 0.00000000000000e+00
+244 -6.00000000000000e+00
+245 0.00000000000000e+00
+246 0.00000000000000e+00
+247 -6.50000000000000e+00
+248 0.00000000000000e+00
+249 5.00000000000000e-01
+250 -6.00000000000000e+00
+251 0.00000000000000e+00
+252 5.00000000000000e-01
+253 -6.50000000000000e+00
+254 0.00000000000000e+00
+255 0.00000000000000e+00
+256 -7.50000000000000e+00
+257 0.00000000000000e+00
+258 5.00000000000000e-01
+259 -7.00000000000000e+00
+260 0.00000000000000e+00
+261 5.00000000000000e-01
+262 -7.50000000000000e+00
+263 0.00000000000000e+00
+264 0.00000000000000e+00
+265 -7.00000000000000e+00
+266 0.00000000000000e+00
+267 0.00000000000000e+00
+268 -7.50000000000000e+00
+269 0.00000000000000e+00
+270 5.00000000000000e-01
+271 -7.00000000000000e+00
+272 0.00000000000000e+00
+273 5.00000000000000e-01
+274 -7.50000000000000e+00
+275 0.00000000000000e+00
+276 5.00000000000000e-01
+277 -8.00000000000000e+00
+278 0.00000000000000e+00
+279 0.00000000000000e+00
+280 -8.00000000000000e+00
+281 0.00000000000000e+00
+282 5.00000000000000e-01
+283 -8.00000000000000e+00
+284 0.00000000000000e+00
+285 1.00000000000000e+00
+286 -5.00000000000000e-01
+287 0.00000000000000e+00
+288 1.00000000000000e+00
+289 -0.00000000000000e+00
+290 0.00000000000000e+00
+291 1.00000000000000e+00
+292 -5.00000000000000e-01
+293 0.00000000000000e+00
+294 1.00000000000000e+00
+295 -1.50000000000000e+00
+296 0.00000000000000e+00
+297 1.00000000000000e+00
+298 -1.00000000000000e+00
+299 0.00000000000000e+00
+300 1.00000000000000e+00
+301 -1.50000000000000e+00
+302 0.00000000000000e+00
+303 1.00000000000000e+00
+304 -2.50000000000000e+00
+305 0.00000000000000e+00
+306 1.00000000000000e+00
+307 -2.00000000000000e+00
+308 0.00000000000000e+00
+309 1.00000000000000e+00
+310 -2.50000000000000e+00
+311 0.00000000000000e+00
+312 1.00000000000000e+00
+313 -3.50000000000000e+00
+314 0.00000000000000e+00
+315 1.00000000000000e+00
+316 -3.00000000000000e+00
+317 0.00000000000000e+00
+318 1.00000000000000e+00
+319 -3.50000000000000e+00
+320 0.00000000000000e+00
+321 1.00000000000000e+00
+322 -4.50000000000000e+00
+323 0.00000000000000e+00
+324 1.00000000000000e+00
+325 -4.00000000000000e+00
+326 0.00000000000000e+00
+327 1.00000000000000e+00
+328 -4.50000000000000e+00
+329 0.00000000000000e+00
+330 1.00000000000000e+00
+331 -5.50000000000000e+00
+332 0.00000000000000e+00
+333 1.00000000000000e+00
+334 -5.00000000000000e+00
+335 0.00000000000000e+00
+336 1.00000000000000e+00
+337 -5.50000000000000e+00
+338 0.00000000000000e+00
+339 1.00000000000000e+00
+340 -6.50000000000000e+00
+341 0.00000000000000e+00
+342 1.00000000000000e+00
+343 -6.00000000000000e+00
+344 0.00000000000000e+00
+345 1.00000000000000e+00
+346 -6.50000000000000e+00
+347 0.00000000000000e+00
+348 1.00000000000000e+00
+349 -7.50000000000000e+00
+350 0.00000000000000e+00
+351 1.00000000000000e+00
+352 -7.00000000000000e+00
+353 0.00000000000000e+00
+354 1.00000000000000e+00
+355 -7.50000000000000e+00
+356 0.00000000000000e+00
+357 1.00000000000000e+00
+358 -8.00000000000000e+00
+359 0.00000000000000e+00
+360 0.00000000000000e+00
+361 -5.00000000000000e-01
+362 0.00000000000000e+00
+363 5.00000000000000e-01
+364 -0.00000000000000e+00
+365 0.00000000000000e+00
+366 5.00000000000000e-01
+367 -5.00000000000000e-01
+368 0.00000000000000e+00
+369 0.00000000000000e+00
+370 -1.50000000000000e+00
+371 0.00000000000000e+00
+372 5.00000000000000e-01
+373 -1.00000000000000e+00
+374 0.00000000000000e+00
+375 5.00000000000000e-01
+376 -1.50000000000000e+00
+377 0.00000000000000e+00
+378 0.00000000000000e+00
+379 -2.50000000000000e+00
+380 0.00000000000000e+00
+381 5.00000000000000e-01
+382 -2.00000000000000e+00
+383 0.00000000000000e+00
+384 5.00000000000000e-01
+385 -2.50000000000000e+00
+386 0.00000000000000e+00
+387 0.00000000000000e+00
+388 -3.50000000000000e+00
+389 0.00000000000000e+00
+390 5.00000000000000e-01
+391 -3.00000000000000e+00
+392 0.00000000000000e+00
+393 5.00000000000000e-01
+394 -3.50000000000000e+00
+395 0.00000000000000e+00
+396 0.00000000000000e+00
+397 -4.50000000000000e+00
+398 0.00000000000000e+00
+399 5.00000000000000e-01
+400 -4.00000000000000e+00
+401 0.00000000000000e+00
+402 5.00000000000000e-01
+403 -4.50000000000000e+00
+404 0.00000000000000e+00
+405 0.00000000000000e+00
+406 -5.50000000000000e+00
+407 0.00000000000000e+00
+408 5.00000000000000e-01
+409 -5.00000000000000e+00
+410 0.00000000000000e+00
+411 5.00000000000000e-01
+412 -5.50000000000000e+00
+413 0.00000000000000e+00
+414 0.00000000000000e+00
+415 -6.50000000000000e+00
+416 0.00000000000000e+00
+417 5.00000000000000e-01
+418 -6.00000000000000e+00
+419 0.00000000000000e+00
+420 5.00000000000000e-01
+421 -6.50000000000000e+00
+422 0.00000000000000e+00
+423 0.00000000000000e+00
+424 -7.50000000000000e+00
+425 0.00000000000000e+00
+426 5.00000000000000e-01
+427 -7.00000000000000e+00
+428 0.00000000000000e+00
+429 5.00000000000000e-01
+430 -7.50000000000000e+00
+431 0.00000000000000e+00
+432 5.00000000000000e-01
+433 -8.00000000000000e+00
+434 0.00000000000000e+00
+435 1.00000000000000e+00
+436 -5.00000000000000e-01
+437 0.00000000000000e+00
+438 1.00000000000000e+00
+439 -1.50000000000000e+00
+440 0.00000000000000e+00
+441 1.00000000000000e+00
+442 -2.50000000000000e+00
+443 0.00000000000000e+00
+444 1.00000000000000e+00
+445 -3.50000000000000e+00
+446 0.00000000000000e+00
+447 1.00000000000000e+00
+448 -4.50000000000000e+00
+449 0.00000000000000e+00
+450 1.00000000000000e+00
+451 -5.50000000000000e+00
+452 0.00000000000000e+00
+453 1.00000000000000e+00
+454 -6.50000000000000e+00
+455 0.00000000000000e+00
+456 1.00000000000000e+00
+457 -7.50000000000000e+00
+458 0.00000000000000e+00
diff --git a/external/hypre/src/test/TEST_ij/data/beam_tet_dof459_np1/rbms.1.00000 b/external/hypre/src/test/TEST_ij/data/beam_tet_dof459_np1/rbms.1.00000
new file mode 100644
index 00000000..0206146d
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/data/beam_tet_dof459_np1/rbms.1.00000
@@ -0,0 +1,460 @@
+0 459
+0 0.00000000000000e+00
+1 0.00000000000000e+00
+2 -0.00000000000000e+00
+3 0.00000000000000e+00
+4 0.00000000000000e+00
+5 -0.00000000000000e+00
+6 0.00000000000000e+00
+7 0.00000000000000e+00
+8 -0.00000000000000e+00
+9 0.00000000000000e+00
+10 0.00000000000000e+00
+11 -0.00000000000000e+00
+12 0.00000000000000e+00
+13 0.00000000000000e+00
+14 -0.00000000000000e+00
+15 0.00000000000000e+00
+16 0.00000000000000e+00
+17 -0.00000000000000e+00
+18 0.00000000000000e+00
+19 0.00000000000000e+00
+20 -0.00000000000000e+00
+21 0.00000000000000e+00
+22 0.00000000000000e+00
+23 -0.00000000000000e+00
+24 0.00000000000000e+00
+25 0.00000000000000e+00
+26 -0.00000000000000e+00
+27 0.00000000000000e+00
+28 0.00000000000000e+00
+29 -1.00000000000000e+00
+30 0.00000000000000e+00
+31 0.00000000000000e+00
+32 -1.00000000000000e+00
+33 0.00000000000000e+00
+34 0.00000000000000e+00
+35 -1.00000000000000e+00
+36 0.00000000000000e+00
+37 0.00000000000000e+00
+38 -1.00000000000000e+00
+39 0.00000000000000e+00
+40 0.00000000000000e+00
+41 -1.00000000000000e+00
+42 0.00000000000000e+00
+43 0.00000000000000e+00
+44 -1.00000000000000e+00
+45 0.00000000000000e+00
+46 0.00000000000000e+00
+47 -1.00000000000000e+00
+48 0.00000000000000e+00
+49 0.00000000000000e+00
+50 -1.00000000000000e+00
+51 0.00000000000000e+00
+52 0.00000000000000e+00
+53 -1.00000000000000e+00
+54 0.00000000000000e+00
+55 1.00000000000000e+00
+56 -0.00000000000000e+00
+57 0.00000000000000e+00
+58 1.00000000000000e+00
+59 -0.00000000000000e+00
+60 0.00000000000000e+00
+61 1.00000000000000e+00
+62 -0.00000000000000e+00
+63 0.00000000000000e+00
+64 1.00000000000000e+00
+65 -0.00000000000000e+00
+66 0.00000000000000e+00
+67 1.00000000000000e+00
+68 -0.00000000000000e+00
+69 0.00000000000000e+00
+70 1.00000000000000e+00
+71 -0.00000000000000e+00
+72 0.00000000000000e+00
+73 1.00000000000000e+00
+74 -0.00000000000000e+00
+75 0.00000000000000e+00
+76 1.00000000000000e+00
+77 -0.00000000000000e+00
+78 0.00000000000000e+00
+79 1.00000000000000e+00
+80 -0.00000000000000e+00
+81 0.00000000000000e+00
+82 1.00000000000000e+00
+83 -1.00000000000000e+00
+84 0.00000000000000e+00
+85 1.00000000000000e+00
+86 -1.00000000000000e+00
+87 0.00000000000000e+00
+88 1.00000000000000e+00
+89 -1.00000000000000e+00
+90 0.00000000000000e+00
+91 1.00000000000000e+00
+92 -1.00000000000000e+00
+93 0.00000000000000e+00
+94 1.00000000000000e+00
+95 -1.00000000000000e+00
+96 0.00000000000000e+00
+97 1.00000000000000e+00
+98 -1.00000000000000e+00
+99 0.00000000000000e+00
+100 1.00000000000000e+00
+101 -1.00000000000000e+00
+102 0.00000000000000e+00
+103 1.00000000000000e+00
+104 -1.00000000000000e+00
+105 0.00000000000000e+00
+106 1.00000000000000e+00
+107 -1.00000000000000e+00
+108 0.00000000000000e+00
+109 0.00000000000000e+00
+110 -0.00000000000000e+00
+111 0.00000000000000e+00
+112 0.00000000000000e+00
+113 -5.00000000000000e-01
+114 0.00000000000000e+00
+115 0.00000000000000e+00
+116 -5.00000000000000e-01
+117 0.00000000000000e+00
+118 5.00000000000000e-01
+119 -0.00000000000000e+00
+120 0.00000000000000e+00
+121 5.00000000000000e-01
+122 -0.00000000000000e+00
+123 0.00000000000000e+00
+124 5.00000000000000e-01
+125 -5.00000000000000e-01
+126 0.00000000000000e+00
+127 5.00000000000000e-01
+128 -5.00000000000000e-01
+129 0.00000000000000e+00
+130 0.00000000000000e+00
+131 -0.00000000000000e+00
+132 0.00000000000000e+00
+133 0.00000000000000e+00
+134 -5.00000000000000e-01
+135 0.00000000000000e+00
+136 0.00000000000000e+00
+137 -5.00000000000000e-01
+138 0.00000000000000e+00
+139 5.00000000000000e-01
+140 -0.00000000000000e+00
+141 0.00000000000000e+00
+142 5.00000000000000e-01
+143 -0.00000000000000e+00
+144 0.00000000000000e+00
+145 5.00000000000000e-01
+146 -5.00000000000000e-01
+147 0.00000000000000e+00
+148 5.00000000000000e-01
+149 -5.00000000000000e-01
+150 0.00000000000000e+00
+151 0.00000000000000e+00
+152 -0.00000000000000e+00
+153 0.00000000000000e+00
+154 0.00000000000000e+00
+155 -5.00000000000000e-01
+156 0.00000000000000e+00
+157 0.00000000000000e+00
+158 -5.00000000000000e-01
+159 0.00000000000000e+00
+160 5.00000000000000e-01
+161 -0.00000000000000e+00
+162 0.00000000000000e+00
+163 5.00000000000000e-01
+164 -0.00000000000000e+00
+165 0.00000000000000e+00
+166 5.00000000000000e-01
+167 -5.00000000000000e-01
+168 0.00000000000000e+00
+169 5.00000000000000e-01
+170 -5.00000000000000e-01
+171 0.00000000000000e+00
+172 0.00000000000000e+00
+173 -0.00000000000000e+00
+174 0.00000000000000e+00
+175 0.00000000000000e+00
+176 -5.00000000000000e-01
+177 0.00000000000000e+00
+178 0.00000000000000e+00
+179 -5.00000000000000e-01
+180 0.00000000000000e+00
+181 5.00000000000000e-01
+182 -0.00000000000000e+00
+183 0.00000000000000e+00
+184 5.00000000000000e-01
+185 -0.00000000000000e+00
+186 0.00000000000000e+00
+187 5.00000000000000e-01
+188 -5.00000000000000e-01
+189 0.00000000000000e+00
+190 5.00000000000000e-01
+191 -5.00000000000000e-01
+192 0.00000000000000e+00
+193 0.00000000000000e+00
+194 -0.00000000000000e+00
+195 0.00000000000000e+00
+196 0.00000000000000e+00
+197 -5.00000000000000e-01
+198 0.00000000000000e+00
+199 0.00000000000000e+00
+200 -5.00000000000000e-01
+201 0.00000000000000e+00
+202 5.00000000000000e-01
+203 -0.00000000000000e+00
+204 0.00000000000000e+00
+205 5.00000000000000e-01
+206 -0.00000000000000e+00
+207 0.00000000000000e+00
+208 5.00000000000000e-01
+209 -5.00000000000000e-01
+210 0.00000000000000e+00
+211 5.00000000000000e-01
+212 -5.00000000000000e-01
+213 0.00000000000000e+00
+214 0.00000000000000e+00
+215 -0.00000000000000e+00
+216 0.00000000000000e+00
+217 0.00000000000000e+00
+218 -5.00000000000000e-01
+219 0.00000000000000e+00
+220 0.00000000000000e+00
+221 -5.00000000000000e-01
+222 0.00000000000000e+00
+223 5.00000000000000e-01
+224 -0.00000000000000e+00
+225 0.00000000000000e+00
+226 5.00000000000000e-01
+227 -0.00000000000000e+00
+228 0.00000000000000e+00
+229 5.00000000000000e-01
+230 -5.00000000000000e-01
+231 0.00000000000000e+00
+232 5.00000000000000e-01
+233 -5.00000000000000e-01
+234 0.00000000000000e+00
+235 0.00000000000000e+00
+236 -0.00000000000000e+00
+237 0.00000000000000e+00
+238 0.00000000000000e+00
+239 -5.00000000000000e-01
+240 0.00000000000000e+00
+241 0.00000000000000e+00
+242 -5.00000000000000e-01
+243 0.00000000000000e+00
+244 5.00000000000000e-01
+245 -0.00000000000000e+00
+246 0.00000000000000e+00
+247 5.00000000000000e-01
+248 -0.00000000000000e+00
+249 0.00000000000000e+00
+250 5.00000000000000e-01
+251 -5.00000000000000e-01
+252 0.00000000000000e+00
+253 5.00000000000000e-01
+254 -5.00000000000000e-01
+255 0.00000000000000e+00
+256 0.00000000000000e+00
+257 -0.00000000000000e+00
+258 0.00000000000000e+00
+259 0.00000000000000e+00
+260 -5.00000000000000e-01
+261 0.00000000000000e+00
+262 0.00000000000000e+00
+263 -5.00000000000000e-01
+264 0.00000000000000e+00
+265 5.00000000000000e-01
+266 -0.00000000000000e+00
+267 0.00000000000000e+00
+268 5.00000000000000e-01
+269 -0.00000000000000e+00
+270 0.00000000000000e+00
+271 5.00000000000000e-01
+272 -5.00000000000000e-01
+273 0.00000000000000e+00
+274 5.00000000000000e-01
+275 -5.00000000000000e-01
+276 0.00000000000000e+00
+277 0.00000000000000e+00
+278 -5.00000000000000e-01
+279 0.00000000000000e+00
+280 5.00000000000000e-01
+281 -0.00000000000000e+00
+282 0.00000000000000e+00
+283 5.00000000000000e-01
+284 -5.00000000000000e-01
+285 0.00000000000000e+00
+286 0.00000000000000e+00
+287 -1.00000000000000e+00
+288 0.00000000000000e+00
+289 5.00000000000000e-01
+290 -1.00000000000000e+00
+291 0.00000000000000e+00
+292 5.00000000000000e-01
+293 -1.00000000000000e+00
+294 0.00000000000000e+00
+295 0.00000000000000e+00
+296 -1.00000000000000e+00
+297 0.00000000000000e+00
+298 5.00000000000000e-01
+299 -1.00000000000000e+00
+300 0.00000000000000e+00
+301 5.00000000000000e-01
+302 -1.00000000000000e+00
+303 0.00000000000000e+00
+304 0.00000000000000e+00
+305 -1.00000000000000e+00
+306 0.00000000000000e+00
+307 5.00000000000000e-01
+308 -1.00000000000000e+00
+309 0.00000000000000e+00
+310 5.00000000000000e-01
+311 -1.00000000000000e+00
+312 0.00000000000000e+00
+313 0.00000000000000e+00
+314 -1.00000000000000e+00
+315 0.00000000000000e+00
+316 5.00000000000000e-01
+317 -1.00000000000000e+00
+318 0.00000000000000e+00
+319 5.00000000000000e-01
+320 -1.00000000000000e+00
+321 0.00000000000000e+00
+322 0.00000000000000e+00
+323 -1.00000000000000e+00
+324 0.00000000000000e+00
+325 5.00000000000000e-01
+326 -1.00000000000000e+00
+327 0.00000000000000e+00
+328 5.00000000000000e-01
+329 -1.00000000000000e+00
+330 0.00000000000000e+00
+331 0.00000000000000e+00
+332 -1.00000000000000e+00
+333 0.00000000000000e+00
+334 5.00000000000000e-01
+335 -1.00000000000000e+00
+336 0.00000000000000e+00
+337 5.00000000000000e-01
+338 -1.00000000000000e+00
+339 0.00000000000000e+00
+340 0.00000000000000e+00
+341 -1.00000000000000e+00
+342 0.00000000000000e+00
+343 5.00000000000000e-01
+344 -1.00000000000000e+00
+345 0.00000000000000e+00
+346 5.00000000000000e-01
+347 -1.00000000000000e+00
+348 0.00000000000000e+00
+349 0.00000000000000e+00
+350 -1.00000000000000e+00
+351 0.00000000000000e+00
+352 5.00000000000000e-01
+353 -1.00000000000000e+00
+354 0.00000000000000e+00
+355 5.00000000000000e-01
+356 -1.00000000000000e+00
+357 0.00000000000000e+00
+358 5.00000000000000e-01
+359 -1.00000000000000e+00
+360 0.00000000000000e+00
+361 1.00000000000000e+00
+362 -0.00000000000000e+00
+363 0.00000000000000e+00
+364 1.00000000000000e+00
+365 -5.00000000000000e-01
+366 0.00000000000000e+00
+367 1.00000000000000e+00
+368 -5.00000000000000e-01
+369 0.00000000000000e+00
+370 1.00000000000000e+00
+371 -0.00000000000000e+00
+372 0.00000000000000e+00
+373 1.00000000000000e+00
+374 -5.00000000000000e-01
+375 0.00000000000000e+00
+376 1.00000000000000e+00
+377 -5.00000000000000e-01
+378 0.00000000000000e+00
+379 1.00000000000000e+00
+380 -0.00000000000000e+00
+381 0.00000000000000e+00
+382 1.00000000000000e+00
+383 -5.00000000000000e-01
+384 0.00000000000000e+00
+385 1.00000000000000e+00
+386 -5.00000000000000e-01
+387 0.00000000000000e+00
+388 1.00000000000000e+00
+389 -0.00000000000000e+00
+390 0.00000000000000e+00
+391 1.00000000000000e+00
+392 -5.00000000000000e-01
+393 0.00000000000000e+00
+394 1.00000000000000e+00
+395 -5.00000000000000e-01
+396 0.00000000000000e+00
+397 1.00000000000000e+00
+398 -0.00000000000000e+00
+399 0.00000000000000e+00
+400 1.00000000000000e+00
+401 -5.00000000000000e-01
+402 0.00000000000000e+00
+403 1.00000000000000e+00
+404 -5.00000000000000e-01
+405 0.00000000000000e+00
+406 1.00000000000000e+00
+407 -0.00000000000000e+00
+408 0.00000000000000e+00
+409 1.00000000000000e+00
+410 -5.00000000000000e-01
+411 0.00000000000000e+00
+412 1.00000000000000e+00
+413 -5.00000000000000e-01
+414 0.00000000000000e+00
+415 1.00000000000000e+00
+416 -0.00000000000000e+00
+417 0.00000000000000e+00
+418 1.00000000000000e+00
+419 -5.00000000000000e-01
+420 0.00000000000000e+00
+421 1.00000000000000e+00
+422 -5.00000000000000e-01
+423 0.00000000000000e+00
+424 1.00000000000000e+00
+425 -0.00000000000000e+00
+426 0.00000000000000e+00
+427 1.00000000000000e+00
+428 -5.00000000000000e-01
+429 0.00000000000000e+00
+430 1.00000000000000e+00
+431 -5.00000000000000e-01
+432 0.00000000000000e+00
+433 1.00000000000000e+00
+434 -5.00000000000000e-01
+435 0.00000000000000e+00
+436 1.00000000000000e+00
+437 -1.00000000000000e+00
+438 0.00000000000000e+00
+439 1.00000000000000e+00
+440 -1.00000000000000e+00
+441 0.00000000000000e+00
+442 1.00000000000000e+00
+443 -1.00000000000000e+00
+444 0.00000000000000e+00
+445 1.00000000000000e+00
+446 -1.00000000000000e+00
+447 0.00000000000000e+00
+448 1.00000000000000e+00
+449 -1.00000000000000e+00
+450 0.00000000000000e+00
+451 1.00000000000000e+00
+452 -1.00000000000000e+00
+453 0.00000000000000e+00
+454 1.00000000000000e+00
+455 -1.00000000000000e+00
+456 0.00000000000000e+00
+457 1.00000000000000e+00
+458 -1.00000000000000e+00
diff --git a/external/hypre/src/test/TEST_ij/data/beam_tet_dof459_np1/rbms.2.00000 b/external/hypre/src/test/TEST_ij/data/beam_tet_dof459_np1/rbms.2.00000
new file mode 100644
index 00000000..e29129bc
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/data/beam_tet_dof459_np1/rbms.2.00000
@@ -0,0 +1,460 @@
+0 459
+0 -0.00000000000000e+00
+1 0.00000000000000e+00
+2 0.00000000000000e+00
+3 -0.00000000000000e+00
+4 0.00000000000000e+00
+5 1.00000000000000e+00
+6 -0.00000000000000e+00
+7 0.00000000000000e+00
+8 2.00000000000000e+00
+9 -0.00000000000000e+00
+10 0.00000000000000e+00
+11 3.00000000000000e+00
+12 -0.00000000000000e+00
+13 0.00000000000000e+00
+14 4.00000000000000e+00
+15 -0.00000000000000e+00
+16 0.00000000000000e+00
+17 5.00000000000000e+00
+18 -0.00000000000000e+00
+19 0.00000000000000e+00
+20 6.00000000000000e+00
+21 -0.00000000000000e+00
+22 0.00000000000000e+00
+23 7.00000000000000e+00
+24 -0.00000000000000e+00
+25 0.00000000000000e+00
+26 8.00000000000000e+00
+27 -0.00000000000000e+00
+28 0.00000000000000e+00
+29 0.00000000000000e+00
+30 -0.00000000000000e+00
+31 0.00000000000000e+00
+32 1.00000000000000e+00
+33 -0.00000000000000e+00
+34 0.00000000000000e+00
+35 2.00000000000000e+00
+36 -0.00000000000000e+00
+37 0.00000000000000e+00
+38 3.00000000000000e+00
+39 -0.00000000000000e+00
+40 0.00000000000000e+00
+41 4.00000000000000e+00
+42 -0.00000000000000e+00
+43 0.00000000000000e+00
+44 5.00000000000000e+00
+45 -0.00000000000000e+00
+46 0.00000000000000e+00
+47 6.00000000000000e+00
+48 -0.00000000000000e+00
+49 0.00000000000000e+00
+50 7.00000000000000e+00
+51 -0.00000000000000e+00
+52 0.00000000000000e+00
+53 8.00000000000000e+00
+54 -1.00000000000000e+00
+55 0.00000000000000e+00
+56 0.00000000000000e+00
+57 -1.00000000000000e+00
+58 0.00000000000000e+00
+59 1.00000000000000e+00
+60 -1.00000000000000e+00
+61 0.00000000000000e+00
+62 2.00000000000000e+00
+63 -1.00000000000000e+00
+64 0.00000000000000e+00
+65 3.00000000000000e+00
+66 -1.00000000000000e+00
+67 0.00000000000000e+00
+68 4.00000000000000e+00
+69 -1.00000000000000e+00
+70 0.00000000000000e+00
+71 5.00000000000000e+00
+72 -1.00000000000000e+00
+73 0.00000000000000e+00
+74 6.00000000000000e+00
+75 -1.00000000000000e+00
+76 0.00000000000000e+00
+77 7.00000000000000e+00
+78 -1.00000000000000e+00
+79 0.00000000000000e+00
+80 8.00000000000000e+00
+81 -1.00000000000000e+00
+82 0.00000000000000e+00
+83 0.00000000000000e+00
+84 -1.00000000000000e+00
+85 0.00000000000000e+00
+86 1.00000000000000e+00
+87 -1.00000000000000e+00
+88 0.00000000000000e+00
+89 2.00000000000000e+00
+90 -1.00000000000000e+00
+91 0.00000000000000e+00
+92 3.00000000000000e+00
+93 -1.00000000000000e+00
+94 0.00000000000000e+00
+95 4.00000000000000e+00
+96 -1.00000000000000e+00
+97 0.00000000000000e+00
+98 5.00000000000000e+00
+99 -1.00000000000000e+00
+100 0.00000000000000e+00
+101 6.00000000000000e+00
+102 -1.00000000000000e+00
+103 0.00000000000000e+00
+104 7.00000000000000e+00
+105 -1.00000000000000e+00
+106 0.00000000000000e+00
+107 8.00000000000000e+00
+108 -0.00000000000000e+00
+109 0.00000000000000e+00
+110 5.00000000000000e-01
+111 -0.00000000000000e+00
+112 0.00000000000000e+00
+113 0.00000000000000e+00
+114 -0.00000000000000e+00
+115 0.00000000000000e+00
+116 5.00000000000000e-01
+117 -5.00000000000000e-01
+118 0.00000000000000e+00
+119 0.00000000000000e+00
+120 -5.00000000000000e-01
+121 0.00000000000000e+00
+122 5.00000000000000e-01
+123 -5.00000000000000e-01
+124 0.00000000000000e+00
+125 0.00000000000000e+00
+126 -5.00000000000000e-01
+127 0.00000000000000e+00
+128 5.00000000000000e-01
+129 -0.00000000000000e+00
+130 0.00000000000000e+00
+131 1.50000000000000e+00
+132 -0.00000000000000e+00
+133 0.00000000000000e+00
+134 1.00000000000000e+00
+135 -0.00000000000000e+00
+136 0.00000000000000e+00
+137 1.50000000000000e+00
+138 -5.00000000000000e-01
+139 0.00000000000000e+00
+140 1.00000000000000e+00
+141 -5.00000000000000e-01
+142 0.00000000000000e+00
+143 1.50000000000000e+00
+144 -5.00000000000000e-01
+145 0.00000000000000e+00
+146 1.00000000000000e+00
+147 -5.00000000000000e-01
+148 0.00000000000000e+00
+149 1.50000000000000e+00
+150 -0.00000000000000e+00
+151 0.00000000000000e+00
+152 2.50000000000000e+00
+153 -0.00000000000000e+00
+154 0.00000000000000e+00
+155 2.00000000000000e+00
+156 -0.00000000000000e+00
+157 0.00000000000000e+00
+158 2.50000000000000e+00
+159 -5.00000000000000e-01
+160 0.00000000000000e+00
+161 2.00000000000000e+00
+162 -5.00000000000000e-01
+163 0.00000000000000e+00
+164 2.50000000000000e+00
+165 -5.00000000000000e-01
+166 0.00000000000000e+00
+167 2.00000000000000e+00
+168 -5.00000000000000e-01
+169 0.00000000000000e+00
+170 2.50000000000000e+00
+171 -0.00000000000000e+00
+172 0.00000000000000e+00
+173 3.50000000000000e+00
+174 -0.00000000000000e+00
+175 0.00000000000000e+00
+176 3.00000000000000e+00
+177 -0.00000000000000e+00
+178 0.00000000000000e+00
+179 3.50000000000000e+00
+180 -5.00000000000000e-01
+181 0.00000000000000e+00
+182 3.00000000000000e+00
+183 -5.00000000000000e-01
+184 0.00000000000000e+00
+185 3.50000000000000e+00
+186 -5.00000000000000e-01
+187 0.00000000000000e+00
+188 3.00000000000000e+00
+189 -5.00000000000000e-01
+190 0.00000000000000e+00
+191 3.50000000000000e+00
+192 -0.00000000000000e+00
+193 0.00000000000000e+00
+194 4.50000000000000e+00
+195 -0.00000000000000e+00
+196 0.00000000000000e+00
+197 4.00000000000000e+00
+198 -0.00000000000000e+00
+199 0.00000000000000e+00
+200 4.50000000000000e+00
+201 -5.00000000000000e-01
+202 0.00000000000000e+00
+203 4.00000000000000e+00
+204 -5.00000000000000e-01
+205 0.00000000000000e+00
+206 4.50000000000000e+00
+207 -5.00000000000000e-01
+208 0.00000000000000e+00
+209 4.00000000000000e+00
+210 -5.00000000000000e-01
+211 0.00000000000000e+00
+212 4.50000000000000e+00
+213 -0.00000000000000e+00
+214 0.00000000000000e+00
+215 5.50000000000000e+00
+216 -0.00000000000000e+00
+217 0.00000000000000e+00
+218 5.00000000000000e+00
+219 -0.00000000000000e+00
+220 0.00000000000000e+00
+221 5.50000000000000e+00
+222 -5.00000000000000e-01
+223 0.00000000000000e+00
+224 5.00000000000000e+00
+225 -5.00000000000000e-01
+226 0.00000000000000e+00
+227 5.50000000000000e+00
+228 -5.00000000000000e-01
+229 0.00000000000000e+00
+230 5.00000000000000e+00
+231 -5.00000000000000e-01
+232 0.00000000000000e+00
+233 5.50000000000000e+00
+234 -0.00000000000000e+00
+235 0.00000000000000e+00
+236 6.50000000000000e+00
+237 -0.00000000000000e+00
+238 0.00000000000000e+00
+239 6.00000000000000e+00
+240 -0.00000000000000e+00
+241 0.00000000000000e+00
+242 6.50000000000000e+00
+243 -5.00000000000000e-01
+244 0.00000000000000e+00
+245 6.00000000000000e+00
+246 -5.00000000000000e-01
+247 0.00000000000000e+00
+248 6.50000000000000e+00
+249 -5.00000000000000e-01
+250 0.00000000000000e+00
+251 6.00000000000000e+00
+252 -5.00000000000000e-01
+253 0.00000000000000e+00
+254 6.50000000000000e+00
+255 -0.00000000000000e+00
+256 0.00000000000000e+00
+257 7.50000000000000e+00
+258 -0.00000000000000e+00
+259 0.00000000000000e+00
+260 7.00000000000000e+00
+261 -0.00000000000000e+00
+262 0.00000000000000e+00
+263 7.50000000000000e+00
+264 -5.00000000000000e-01
+265 0.00000000000000e+00
+266 7.00000000000000e+00
+267 -5.00000000000000e-01
+268 0.00000000000000e+00
+269 7.50000000000000e+00
+270 -5.00000000000000e-01
+271 0.00000000000000e+00
+272 7.00000000000000e+00
+273 -5.00000000000000e-01
+274 0.00000000000000e+00
+275 7.50000000000000e+00
+276 -0.00000000000000e+00
+277 0.00000000000000e+00
+278 8.00000000000000e+00
+279 -5.00000000000000e-01
+280 0.00000000000000e+00
+281 8.00000000000000e+00
+282 -5.00000000000000e-01
+283 0.00000000000000e+00
+284 8.00000000000000e+00
+285 -0.00000000000000e+00
+286 0.00000000000000e+00
+287 5.00000000000000e-01
+288 -5.00000000000000e-01
+289 0.00000000000000e+00
+290 0.00000000000000e+00
+291 -5.00000000000000e-01
+292 0.00000000000000e+00
+293 5.00000000000000e-01
+294 -0.00000000000000e+00
+295 0.00000000000000e+00
+296 1.50000000000000e+00
+297 -5.00000000000000e-01
+298 0.00000000000000e+00
+299 1.00000000000000e+00
+300 -5.00000000000000e-01
+301 0.00000000000000e+00
+302 1.50000000000000e+00
+303 -0.00000000000000e+00
+304 0.00000000000000e+00
+305 2.50000000000000e+00
+306 -5.00000000000000e-01
+307 0.00000000000000e+00
+308 2.00000000000000e+00
+309 -5.00000000000000e-01
+310 0.00000000000000e+00
+311 2.50000000000000e+00
+312 -0.00000000000000e+00
+313 0.00000000000000e+00
+314 3.50000000000000e+00
+315 -5.00000000000000e-01
+316 0.00000000000000e+00
+317 3.00000000000000e+00
+318 -5.00000000000000e-01
+319 0.00000000000000e+00
+320 3.50000000000000e+00
+321 -0.00000000000000e+00
+322 0.00000000000000e+00
+323 4.50000000000000e+00
+324 -5.00000000000000e-01
+325 0.00000000000000e+00
+326 4.00000000000000e+00
+327 -5.00000000000000e-01
+328 0.00000000000000e+00
+329 4.50000000000000e+00
+330 -0.00000000000000e+00
+331 0.00000000000000e+00
+332 5.50000000000000e+00
+333 -5.00000000000000e-01
+334 0.00000000000000e+00
+335 5.00000000000000e+00
+336 -5.00000000000000e-01
+337 0.00000000000000e+00
+338 5.50000000000000e+00
+339 -0.00000000000000e+00
+340 0.00000000000000e+00
+341 6.50000000000000e+00
+342 -5.00000000000000e-01
+343 0.00000000000000e+00
+344 6.00000000000000e+00
+345 -5.00000000000000e-01
+346 0.00000000000000e+00
+347 6.50000000000000e+00
+348 -0.00000000000000e+00
+349 0.00000000000000e+00
+350 7.50000000000000e+00
+351 -5.00000000000000e-01
+352 0.00000000000000e+00
+353 7.00000000000000e+00
+354 -5.00000000000000e-01
+355 0.00000000000000e+00
+356 7.50000000000000e+00
+357 -5.00000000000000e-01
+358 0.00000000000000e+00
+359 8.00000000000000e+00
+360 -1.00000000000000e+00
+361 0.00000000000000e+00
+362 5.00000000000000e-01
+363 -1.00000000000000e+00
+364 0.00000000000000e+00
+365 0.00000000000000e+00
+366 -1.00000000000000e+00
+367 0.00000000000000e+00
+368 5.00000000000000e-01
+369 -1.00000000000000e+00
+370 0.00000000000000e+00
+371 1.50000000000000e+00
+372 -1.00000000000000e+00
+373 0.00000000000000e+00
+374 1.00000000000000e+00
+375 -1.00000000000000e+00
+376 0.00000000000000e+00
+377 1.50000000000000e+00
+378 -1.00000000000000e+00
+379 0.00000000000000e+00
+380 2.50000000000000e+00
+381 -1.00000000000000e+00
+382 0.00000000000000e+00
+383 2.00000000000000e+00
+384 -1.00000000000000e+00
+385 0.00000000000000e+00
+386 2.50000000000000e+00
+387 -1.00000000000000e+00
+388 0.00000000000000e+00
+389 3.50000000000000e+00
+390 -1.00000000000000e+00
+391 0.00000000000000e+00
+392 3.00000000000000e+00
+393 -1.00000000000000e+00
+394 0.00000000000000e+00
+395 3.50000000000000e+00
+396 -1.00000000000000e+00
+397 0.00000000000000e+00
+398 4.50000000000000e+00
+399 -1.00000000000000e+00
+400 0.00000000000000e+00
+401 4.00000000000000e+00
+402 -1.00000000000000e+00
+403 0.00000000000000e+00
+404 4.50000000000000e+00
+405 -1.00000000000000e+00
+406 0.00000000000000e+00
+407 5.50000000000000e+00
+408 -1.00000000000000e+00
+409 0.00000000000000e+00
+410 5.00000000000000e+00
+411 -1.00000000000000e+00
+412 0.00000000000000e+00
+413 5.50000000000000e+00
+414 -1.00000000000000e+00
+415 0.00000000000000e+00
+416 6.50000000000000e+00
+417 -1.00000000000000e+00
+418 0.00000000000000e+00
+419 6.00000000000000e+00
+420 -1.00000000000000e+00
+421 0.00000000000000e+00
+422 6.50000000000000e+00
+423 -1.00000000000000e+00
+424 0.00000000000000e+00
+425 7.50000000000000e+00
+426 -1.00000000000000e+00
+427 0.00000000000000e+00
+428 7.00000000000000e+00
+429 -1.00000000000000e+00
+430 0.00000000000000e+00
+431 7.50000000000000e+00
+432 -1.00000000000000e+00
+433 0.00000000000000e+00
+434 8.00000000000000e+00
+435 -1.00000000000000e+00
+436 0.00000000000000e+00
+437 5.00000000000000e-01
+438 -1.00000000000000e+00
+439 0.00000000000000e+00
+440 1.50000000000000e+00
+441 -1.00000000000000e+00
+442 0.00000000000000e+00
+443 2.50000000000000e+00
+444 -1.00000000000000e+00
+445 0.00000000000000e+00
+446 3.50000000000000e+00
+447 -1.00000000000000e+00
+448 0.00000000000000e+00
+449 4.50000000000000e+00
+450 -1.00000000000000e+00
+451 0.00000000000000e+00
+452 5.50000000000000e+00
+453 -1.00000000000000e+00
+454 0.00000000000000e+00
+455 6.50000000000000e+00
+456 -1.00000000000000e+00
+457 0.00000000000000e+00
+458 7.50000000000000e+00
diff --git a/external/hypre/src/test/TEST_ij/data/generate_poisson_10x10x10.sh b/external/hypre/src/test/TEST_ij/data/generate_poisson_10x10x10.sh
new file mode 100755
index 00000000..88347fd7
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/data/generate_poisson_10x10x10.sh
@@ -0,0 +1,54 @@
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+####################################################################
+# This bash script is intended to regenerate the binary files under
+# the folders poisson_10x10x10_np1 and poisson_10x10x10_np4 if the
+# binary input/output functions from the IJ interface get changed.
+####################################################################
+
+function movefiles() {
+   mv -v IJ.out.A.${SUFFIX}  ${DEST_DIR}/IJ.A.${PREC}.${SUFFIX}
+   mv -v IJ.out.b.${SUFFIX}  ${DEST_DIR}/IJ.b.${PREC}.${SUFFIX}
+   mv -v IJ.out.x0.${SUFFIX} ${DEST_DIR}/IJ.x0.${PREC}.${SUFFIX}
+}
+
+CWD=$(pwd)
+HYPRE_SRC=$(dirname "$(readlink -f "${CWD}/../../")")
+PREC_ARRAY=("i4f4" "i4f8" "i8f4" "i8f8")
+CONFOPTS_ARRAY=("--disable-mixedint --enable-single"
+                "--disable-mixedint --disable-single"
+                "--enable-mixedint --enable-single"
+                "--enable-mixedint --disable-single")
+IJOPTS="-n 10 10 10 -printbin -tol 1 -solver 2"
+
+for I in {0..3}; do
+    PREC=${PREC_ARRAY[${I}]}
+    CONFOPTS=${CONFOPTS_ARRAY[${I}]}
+
+    cd ${HYPRE_SRC}
+    ./configure --enable-debug ${CONFOPTS}
+    make clean
+    make -j
+    cd test
+    make clean ij
+
+    # Sequential case
+    DEST_DIR=${HYPRE_SRC}/test/TEST_ij/data/poisson_10x10x10_np1
+    mpirun -np 1 ./ij ${IJOPTS}
+    SUFFIX=00000.bin
+    movefiles
+
+    # Parallel case
+    DEST_DIR=${HYPRE_SRC}/test/TEST_ij/data/poisson_10x10x10_np4
+    mpirun -np 4 ./ij ${IJOPTS} -P 2 2 1
+    for J in {0..3}; do
+       SUFFIX=0000${J}.bin
+       movefiles
+    done
+
+    rm -rf IJ.out.x.*
+done
diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np1/IJ.A.i4f4.00000.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np1/IJ.A.i4f4.00000.bin
new file mode 100644
index 0000000000000000000000000000000000000000..bb397ea07a5513f2f18dfe68dee5125e724940a9
GIT binary patch
literal 76888
zcmeI*1<alGmbP)+-JL><yE~L(#oety-QB&#U5nG=(Bkeb*5d9~+}-`Vt~t-jNB8_!
zGYuph$e!evXT9s*1Mj`grt@SbbI#OL{pY`?t9gDf?SB^WoND3f1M#eWe82i!_2X2v
zKgWJ*hFa6GtL0y=mcLuA>DkqqfnBW`+0~kfU9Fkf{n0G^Tx(W#C9|<FnVo&f9PCTx
zWM48D`;xiYm(0VyWM1~Q=3`fDes(1burFDVeaS-XOZ*CzEW*BIQT8Q^u`gMieXS+f
z)moBWNdxvJOR+Cmnte$__9czjmn_4+WLfql%dxMuJiA&euq#=SeaTAfOIBuIvI_f>
zRoR!U#=c~A_9bhuueBz-T5GW@S(|;yI_yi<WnZ!$`;zt9mu$ekWJC5P8?mpoF}qru
zuq)Y=eaU9*OB%B;*_?ez6ZR!rurJw?eaTkrYi-T0);8=)nzAq1mVL=~>`S(1U$O)H
zk{#KX?8LrgXZE#rVOMKcb|t&9FWH@a$sX)W_GDkO7yFXE*_Z6YzGPqawf1B8NBi@0
ztpnKAI*?thgV@zNm|d-A>}nmtuGXRKY8}SzkDBvytrqM`TCy)`#lEC9`;s>7OWLw8
zX~({#J^PXl>}z#oSJH`nrZZWl3t6TsS*9CVraM`t2U(^kS*90RNpJQgeb{IEl4bgl
zW%`q429RY2l4S;wWd@UFhLDvEWnVIkeP%dW=5Vsi5oDPo$udWgWsWAx97C2lmaODB
z_9e%&&zwM(Igu=L5?SVCvdk%DnN!I!r;%k&Co4IFeaQ&+nKQ{UXOU&jCd-^dmN}O!
za~@gde6q|1WF;fnmyBYcxsWV#5n1M9vdkr9nM=tsmyu;IC(B$xR&pi#lF{rlW5_aB
zk!7wX%Una2xt1(*9a-jjvdj%+B{#A!xru$|X0psJWSLvZGPjXsZYRs!L6*6bEOQrG
z$=&R0-NUYAEc=pi>`U%tUveM&lKa`0Jixx>LG~r%+1HxDuGT~BN*-ok@(BBqN7<J=
z#=hin_9aiSFL{!E$y4lWJ<YD<8TOfH$uiH8Wu7O?yg-(Dku38PS>|Q3%qwIiud*+B
zjeX{IvdkM~nTceXH_0+@k!9W{%e+IDd6%r@J@zH<v(J1$midq@^ATC*W3tRAWSLLN
zGM|xUJ|`>rf_=%C>@#1HWxgiMd_$J`mMrrfS>}7P%nxLlAIVC7Vqfwz`^+z7nP15=
zzma8rC(Hb=|3k*qe7G_-&&)JrnQ6&Nrej|+J^RcIWSJSsGBc57W+uzbLYA48EHfKf
zW_GfYIoOxX$v!g|S!Qms%sgb7dC4;Kk!9v5%Pc^aS&*z`A@(H;v(GF-mRXc6vlv-s
zak9)3WSJ$&G7ZQwOOcf<&AwJcb|sD2mn_4+WLfql%dsz6o_)y*>`PW;U$PSWS}U`w
zwF<kERoR!U#=c~A_9bhuFIkg)$y)47)@EO_4*Oc`vMX7SeP(^K%m!qc4aqVak!3a}
z%WOiH*_14^8CgkV_9dIM&om*+Y(bXUk}R_oS!Qdp%r<11rev9I$x60kU$Q;>%noFk
z9mz5~k!5x!%j`my*_AA_8(C&|vXVX6m+Z+tvlm%rZ?eojWSM=*GW(Hb_9x36K$ba>
ztmGi}B?q(5G$YF#LY6s{EOQuHra4)r1zDygS*8_PNo)2cZP;hpl4aVFW!jTvI*?^L
zl4UxPWjd2(x{#H0Wna>beWp8ErUzN3Ct0Q!S*ABxrVm-BFIlD^SxJBPB?H)J29jk4
zk!1#xWrmPthLUB5k!6OHWez7RIf8wyBiWT4#lGZd_9e%#FFBTd$#LvUj%QzT0{fB^
z+1EOWU9FSZm7K!9<W%-0r?D?Noqfp}>`O+lFFBKa$yw}coz1S~9QK)W$uj4WWzHwd
zTtJo?NtPK!mbs8Da}im|#q3KiVV}8_EOQxI=5n&k6=az!$ugtKGGoXxSCN%m&A#Ls
z_L*zRGS`u1t|!afK$f|YEOQfC=4P_YEo3FPvM;%fedczu%pGKzJIOM4k!9{C%iKej
z8B3NKM^<t#`;z<EXYMD<JV2ItkSsHvEHi;D^AK6)VY194WF?QXFL{i8=5eyj6J(hu
z$uduoWu7L>JVTawmMrreS;_P4OI~1~d66vh5?SVDvdk-FnODg&uaRY5C(FD+Rx*)&
z$(!smZ;@r*Cd<4-mU)*f^B!5|eX`64WSI}iN<Ly=>tl8$pRh0alzqu(>`OjpU-AX}
zk}uhpe8s-xYxcFiVOQ&0b|v4jFZrH*$q(#Heq>+r6Z?{%*_ZsnzT{W-wSHq)@;m#?
z|N4J=nTG%SQDthLnQ6!}(~@PTBg;%rmYIPpGb35aOzcZ$W}lgbEHf)vW;U|S>|~ia
z$TD-1W#%Hw%uQA@5BrjN*=Ob>%gj%fS%56FAX#Q1vdqF{nMKGli;|Tr#=c~6_L(Kf
zGE0(W8jxj{BFijImT5?qX+)M;hOA^+_9e@)&n!=tS%ECGB3Wi7vdqe4nN`R#tCD3_
zBP&^*eaRZ^Gi#D%)*{QSO_o`QEVC|IW<9dZ`ed06$VxV3U$PPV%*JGyO~^8vl4Uj{
z%QPm-Y)+PGLYCQrtYk~}C0nu2Y)zKghAh*REVC_HW;?RX_GFnI$TB;UmF&d6*3Rro
zc41$#EBlh&*q7|izGM&fC3~_j*^7P2-t24b!>-o8>`L}yU$Q^@k^|V69LT=pAoe8(
zvoC4JzT^=0wGL%hav1webFxeevP?^|Oe?ZXYqCrmvP@gDOgplY_UubKu+MZP%XA{k
zbSBGmA<J|n%XA~lbSKO7AS>y~zN8oXOmDJGAF@nevP?g+On<V>0J6+Lvdkc|lELgt
zhOo~JCCdyW%M2&W98Q)wf-G|+S>`CR%+X{e$FMIsmVM?pvdr;hnG?t|Cz54OBFmgi
zmN|tib1GTMY3xf*XP-HPEHi>Eb0%5lEV9hmWSMiwGUt+I&Lb;1pMA*%>@y?DGNZ^c
z7m{TzBFkJ%mbrv1b17NoGP07(*_T|wK652mW;9u53|ZzXvdq<FnQO>0*OFzfBP+R{
zeXSeVmE6d_<R<ndH?uFfg?-7b>`QKAUvfM9k~`Sfx|3b4yV#Z7&A#Lw_9bK4myBay
zaxeRm``DM<&%WdV_O%{lS2CV`W&&B}A+pTFWSK|EGLMpF9wW;<PL_FstmH}dB~P)>
zJWZB)hAi_eS>`#i%=2WK7sxU%l4V{ZD|wlH$t&zLuaae6Bg?!_mU)9LGm$LwCRye!
zvdr6LCGW5=d6#|WJ+jREWSI}hG9Qv<J|fF}OqThCEb}Q@$!F|KK4+i#f-LhTS>`LU
z%-3X@Z^$y=l4ZUl%Y08(@&o&lAK7PqBFp?tmidJ&^D9~AH?qv{WSRf<Z@e}w|97d%
z)I3Y3VP7&W`^<D?nd!+gGmvFwB+JZ1mYJC>GYeT}R<e@W*q6-CJ~IbdW=^uqTx6NK
z$ujehW#%Qz%tw})pR8m7_O%vdSF#ZMl7-oqEW*BIQT8Q^u`gMieaRB+OO|9`s{y-O
zOR+0inte$__9czjmn_4+WLfql%dsz6o_)y*>}##au4E<lnU%>htB_?@CCjWvmRX%F
zvj$maO|r~dWF>2}FIk6uW?iz(dSsdP$ub*|Wi}+sY($pXm@KmiS;?mCOEzPlX-t;c
zoGjCXEVBh!W=pcnR%Ds2$uirJl{95vvMu|}c4V3D$uc{TWp*UX>_nE?nJlvlS!P$V
zlHJ&s?9M*32U%uMvdms&nZ3y}`;cY!CCltbmf4@I<N)?12eQu`M3y<2EYplEa|l`H
zP_oQnWSQn<nHFRvE!mf}VxMVEmT5zlX-k%AN0w<%mgzv2=}4C8L{`$7eMuMgnXY7+
zZe*G6WSJghnVw{sUSyfxWSKr>C4Je~>c_66Kl_pa>`Ml+FB!zXWH9@ZA?!<rvM(9N
zzSeMde{?uM*E)h-ts~jhI*MJbquJFuhFz^=+0{CZU9IEU{m}{hT<b)3B`2{jIhlRQ
zDeOy5WnXd{`;ybymz=@AWCZ(KXR@nx7Q2$O*_WKdzT{l?CFij(IiG#W1?)>kvM(9M
zzSf28YF)&x<YM+Em#{Cnlzqu%>`N|ZUvdTek}KJljAmbJ47*xau`9WneaSWKORi;K
zavl4U>)Dswz`o>0_9Zv5uXQuKTDPz(xs`p%ZR|^KXJ2v$`;t4^m)ym^<ZkvQ_pq-u
zmR+rJ>`LxsUveM&lKa`0Jixx>LG~r%*_TXUU-A(9S`V|U^$5F?N7<J=#=hin_9aiS
zFL{!E$y4l0o@QV24EtKova9tRyOQVGm%PBf<VE%+FR?FqnSIGC>`Pu{U-BCJTCcPF
zqc`}u)<kx--egznEq1luW>@PScD3GRSL;1?wccm<NBnP&r{ezw;(z`#G@4hlJO0<t
z|MQ=r(W09D4F9eF^Piv5vYP$ObeJ8js@cy>k2%n~n*GcSm=kTP+0V>~xzM(n{me|5
z8||vu&&-T@(7u}e%)ID;S>S)oiuus7nxoTf{5(H8!8v;QJ1>CFaE@;N-V34&oTHz=
z`$Fgn=jiC~zc9MNIeOY*5p;)hbhXE#=mF>GYoEo?6VB0japqpIn_ca)1bSC<^tQ{A
z=mY2IZI=e<3+L!<m!;4T&e7X0OQS!WqqkieVgQ_@w_O@xAe^JOU6#QhI7e^$EQ`T#
zj^4{L4}sn6YM13Pw3?%L1Abls!{8jf?Xn_<!#R4}WhERA=jd&hm2m`|qqkjF!I5x|
z-ga3PN5MII+hsKz4d>`>pVe^;oTK*|%*VoRcD2izIIfzbw_Vo4@o;VcKWmq@aY8jm
zZ@a966X6`a?XoUTf^+n?%X&B&&e7X0>*EwSM{m1qfK%Zdz3sChPJ?sw-iY~h*v+nX
z*%)V3bM&^$CKv(d=xvuxaVDIjw_P^FS#XZtc4>^W;T*l~vN_IybM&@L6Pyd@=xvuR
za2}kaw|%z6`EZWjTQOe%yV=z)TVrH3M{m1qgHdpf-gaq<3*j8S8#8Z<i{Ko+?Xn#%
zhI90`%l5bg&e7X0JK$0{M{m3Ah|Ay{z3sCTE{AjU-kJFd*v+nX*#%ctbM&^$t{4sH
z=xvwXFb2-i+b+A~DmXWWxn1_a)zuum?XoAXfphe>%U-w^&e7X0d*eDdM{oP=gX`fO
zz4v9l0d}*iUG~F`)f~O;vOjKubM&^$0k|2?(c3Nu;ubhZZ@V0XTj3nN?Q$?~gLCw@
zOEcUK=jd&hLvRP2qqlty#hq}D-iI;Y1-seRE_YYY=xmRB;4}K#VJv(`SAYL;@EJY*
z-S36Z=-7<;KKP7&{?7NqXLR%TeE>eAm%s0W@EM)PGdG9-)dC$cp_-@WY1R^*@K7~R
z!_&{ULT5Z&&C~Mqv#rquk5uz?JpF7Nbj739JUvf8+ZNsMST)bU)6cd;cRXIrGxGGa
z?a>2IRP#(c{cH#H#FN!LGfzL;3s1prv%pUF>5ZqWc~+j$-%fq-44h{}+`wLa@hqHY
zN8G_~{qP)|=Rn-Te*N)0oaaQ`!;S;+0-WbU+{B&(@gkh(M%=}&gYXiZ=Rw@Y&V%tX
zoaaT{X9)8vu>XAUF7_RYSF3q`o^d1l4#R73UI1|;`wqwJa9$8`Bl{kXH{iSw;zss8
z0u$l9Fycn`JrZxic@e~o?0Xd6g7cz?8x3YY8gIjSF~p7Rd<@=!^Wumb9n1VK?7sxO
zi+zv7d)2%o&$y9&kH`CPZh*LveNVs#a9#>=Bm16+58=Et;zss82_M0^A>u~%JsBUv
zxe?+<_B{okz<C+OjqH0WK85qL7z{sW=hN_6H800AZge{H=dl0s@GkZ}17B403OwUR
z_8oyQ;k+W^M)o}uU%`1L#EtBG7QTk_%7`1;_iTIv=T#6lvhO+g7S5|8Ze-tc@g1C3
zL)^%|=iz%eua3BpozKS)a9#s(qYIdSg#Fiqcd_qC{8Y_r@r)bUcNBhx^V*0T+4n;H
z0_SxQH?r?V_!Z9UB5q{gi}4$r*F)UMzL(&4IIoYmk$o@4R8#+_`v#10Bl})vMCQC9
z;zoA99Mh0FZ-ltf70lDJAIWoLc$ZPQ64SAF-UM+Y`;Nx+WX_u+Ze-svn1RfBGsKPT
zdlhCRb8d{dk$tbmOk~cRBW`5hYcMmJa}&gk?0YR{A#>gWaU=U)hgr#-w?y2?&evl$
zGUu%jH@bm&cJ}t)8Y5xf8!-oa=WQ?we#X8xVNNpVridHa_h!sR=DaQ9M)ti0bCWr5
zhq#e_Z^b-h&f6nyWZ&B`FPZZWh#T4WcFafSyd&a9_Pqo1lR58%xRIUj!~$f_J0os%
z7xRMb?Y|4`Y~Q=F5PRoc5jV2$Jy@8`c{jw3>^l~VkU8&;xRHIwVNo*YJrFmt@4Z-z
z%z015jqH0L7AJGw3vna+-j5~7ocBiD$i5F?Niyes5I3^(gJ?kJyf5NL<C&LYZ~y(^
zUF^FwJD>X_?lYFTA$y+(AZ{~`xe<Gx2O{ob$7R_2JP2_U`z_1f=fQ}3*ljuXKARzK
zVXx)c`#c132Rp66-sho+8`x<@_C60o^k0eH1b%LghwwC3X6M`jW)I^Ttis;8CCnee
zvsjhAb1RrXis!Hzd*{|Le+<uKb@t9}VE#B>z#8nG+rs<_yofc~JGX=RlXwYhv3G6{
z^QZ7K)@JYA0p_n@9d>r>2s_#5RjkY2xf7zlonFIwWX_!tH?Y_1Sf9+f3*ruTdjlJg
zId?_e!hRF6A(?YG#69fzCN?5-?vA*LJ>SB{WX?Shcd_f+*o4fvC*n4Ceg~V9Irl=`
z=UwK_*xSE1yo-I`Lu2;NeGoUY@B7%C%(*Y(M)v&xO~{=4A#OC0`9o|$=G-4~qc@p9
z!j@#t0}wZ|@5k7R%y}T<M)v&#Ta!5tLfpu{pJE#_=fQ{@+4(axC37BvxY6g#+p@R+
zP<R*neu3@SI}bzL$i81<dot(Yh#T4WE9^k#d^qAp_Wc?=k~trNiSTpw{RTUcIUk8P
z;pgo8Ep{ezJ_>Oo`+kRA$efQx+{nJ)V^=cgV-Pp8^AFgK%=uWvjeca_oxS~!gLkp-
zPuPRK^YMrq+4pDcN#=Y4;zsuU1$&V>pNP1TeSgK?WX>lcZe-uzun(E@$%q@-_jl||
z=6nj`M)vjHX+Johinx(|eRtX)&Zi-6WM|)<4uJFNh#UFtbRg`12E2=XeRnzt&La>v
zvajz>2gCVH#EtAb1N&xhJ_~Up`_9Pz5ICQWxRHH*cRCc#=OAumU*DY$gY&sO;zsuM
z-Kja8&m)T)+1Gcc7H~eFEN*0H-<?{*`2w=Ik?&5eVE>Wqy^DQ)cWMpiQS9PI_VwMV
z4V*6|iyPV3cc->+zKAStWMAK%+QIo^vbd3beRpaP=S#@qM)vjHsRNuZC5s!`*LSCm
zaK6llr=PR0?@pbn`Es(jk)3^a>I~;A$l^x6J9UBmuVn9C?CZNz*J>WkK5k@R-<`U_
zc??<H$iBWib%*m+WN{<=`tH;N&R3JgjqK~YQ%^WwLl!r(ukTL1;CwAv+{nJZJN1V1
zb!2fP`}*$G2hP`%#f|LT0Da+n16kZ?DSqw;``^gkyV!SW^snZd*vF0R+Ykfbd^1_x
z$i9s*5YD%d#f|K{3<kmZR<gK}eV4^xINwGVH?r??7y{?p$>K)#T^>W>d<R+F$i6FJ
z7@Y4UiyPT_MGS}YU1V{imH7E^*#B<!-o?I0RL^_Z#eM90Bz%r#AGfjRQSdpAecZ*4
zN5kj6?Bgc(I|e@QV;}dh+p+L@Kl`|ay^e#=2iV6Q>~uVQKFB_9V5bw{b3FU#e<DAx
zj0x;k;khnOg7ZV{%vQyEIJuf1u0FdOKd+Bd;QR=CKf5|Mz^T>zD0}lYupv&X=EvCk
z*)_2dPOs+2+56eGurbc4<|o+u*|o6=MpW~Y?EUOI*c4}0^Hc2o>}EI%c6*wgo$S*X
zXIJwx?4!S(Hpe+|ewHk5V6P@P7tYU-#U1Rn1<r%>^JH-g`)!Hy;rs$w+{2Dr;Q~0n
zNESD-=hher=a<OhE_U4pqu~59S=`3XO>rTdUm=V8Y|GCV!TztZ_b&F`4i{JRYwY7j
z_T3(r!1;BuxRHH#z@>10gDh@j-yLxooF|gSjqJM<E{F4*WN{<=?u;wo?7LIk$iBPa
zN;v!O6gRT(t{4qx-<{${cHRwR;Ox6o+-P@xz6$pD-O0PycMn`$&AvOujqJN8u7R`f
zPH`jq?uBdN?7LIk$i92yIyn386gRT(KDZvvzB|Q@?7J^+fV1yTaU=Wgha2JSyHniA
zzWd`QIQ#AtH?s2qxEapAJH?F-<mX#pf8U+Fi+vBmt<~(iQ{2eD2jez4`|cDsvTrlo
z4rkw;;zss81b4vMcc-|KeGkQ*aQ59PZe-uXa2K3?cZwU?w>j>Hv+quEBm1_%J#hBj
zDQ;xvmKY0X-<{${t@wEy?C-micd>74+*{4QJH?Ic+XnZ+*>|V7k$v0ZemMK?6gRSO
zJ3Ihq-<{${_HB;`;q1Fp+{nHiFdoiRA#P;fj+g-FsS!7_Zznti=V=f(vU6uV4CiSP
zH|oOt2<$%{yo-Ii;?ZiJo@d<1zTNN`oM%AX$iCh2IGkrh+{nH?@C2M^Lfpu{J@F)*
zXGYw}zP<1ioM%DY$iBVtG@NHe+{nIt@C=-1L)^&Deeo=uXGh$qAM<mt{~Yix_U(`7
zt9eeIaU=T<zzcAm3vna+4#bOao*Qu^`wqfOaGnQoBl`}<%W$3-aU=T<!7Ff{4{;;=
z4#lf*o*!`|`wqiva9#j$BRdbr>u_EWaihbT-+=uWf_Jg+5tvxb3-gQ{+4o4i3Fk!+
zH?r?hcni*pB5q{gqwzMJ7en00zQ^DlI4_R4k$sQFyKr6taU=U4hxg#TB;rQ)Js$7F
zxdGxvc0K_gz<DXejZS3#5cXdh-o?HjRnLYz<34u%7(N>zZe!0+;By(oUF`TNd@hT)
ziTyr<&*c#Ju-oVGxjf<)_WA-oS3umsPG7?3iijK7=_~kL3DN&+=9928PR7~zrkYpb
zX?6<E!MD}CDo;OqD$d1s)w~){KYJR^!}ry^I!`})I?l%r)w~8zKYIo)z>n3uCQm;*
z0weKLHLu0f&z^}<__><b=ILk8!iD&yn%Cj!XD`C9u-m$@lYK76Z`HgW&**QbOYl3K
z*GJsIUYBC3Y5vo31LnAc-7dq_WX>BRZehR6F%6mXMu>aZ@d`{!=DacDCic7%(~&uE
zg1C!aM`L<2=S>l}vGW+rK<2y|;yza~&&b~Xjp1GFdo^Za@4PwUM)ti1Gm|+tLEOl`
z*J2hj=PeL7vhQ`6mCSid#EtBGJ!T_w-U@Le``&=r$(*-F+{nH+Vh%FrZ4fuI?@gGK
z%(*GzMs~g#bCEf3i@4D(%yYB1|90>$_PrJJuy@`baU=WQhIz@HcR<|8zPDpOGUpu;
zH?r>?n4ipfC&Z2HdnXnkbKV(oBm3Tk1<9OuLEOl`cVi(k=UovuvhO`un9O-M#EtAc
z7K@NM?~b_9IOav!+kX#u7yI6e#n?OViMWw{@5AC`&U+zlWZ(O-1ex>Rh#T4W0W3-8
zybt0=_I(fy$ei~@+{nJ;u@sr}eux{{cLJ6sbKW0uBl|vthGfnMAZ}#mhtY`4`9Q>t
z9${XFz5Ne@cd_rISeCu>!H65#_c1I-=G+W%Bl|v%<;k26LEOl`PhbTy=R*-UvhR~v
zk<9rp#EtCx6jma0ZjQK-eV@k4WX>%RH?r?DScS~FCE`YQeio~eIk!UG=sD)q*xSD~
zyo-IG$Lj2z+aPXa-xsh3nR8pjjqLj()+BRohq#e_U&2~s&g~I5vhT}So6NZb;zss;
z1?!MGcSPLCzOQ0kGUrZ+8`<|YtVibD8F3>!zmE0EoVy@y^ak?=?Cswb-o?HXu_1fs
zZipM%_f2d>=G+}|Bm2IEjmeyQAZ}#ex3LMCb5F#L?E4NjC3EhDxRHI|#b#vAy%9IE
z?|W!W=G+HyBm2IO&B>hmB5q{o5730nxgX+2A2M&j-v0gJUF`c2wq)--0C6MxevGZi
zoChLqWZzG)HJS4u#EtCxDYhYV9*nq=eLq7}GUp+P8`<}BY)j@m6mcW_eu3@CoQEN9
zWZy5bJ(=@x#EtCy6?PzVJ{)nQubFpbZ~r6UUF^FPJD*1)?qk=T+50>SaT|N?!rtf6
zh`ZQvSN1-SLEOZCyRr9qEaDz^+nv47;}Ey7*B<PB9*?+#o%Uq!^8~~V?6enqpC=;v
z@6GNTem)7`;y3KW&iQ1ReTUz%FMH=xVE#R(Vz(chPlfpp@SSRZIG+adAL0Ad0dPJY
z=0CxAsRQAB2F!nk?@<TAc?8UVf$vZU!}&~@{|euqn!))jnEUQ@2<&z?>|`I`oeqWb
zIf(vt^4;k$IG;-vH?WuQPR-$b9$DPMZoWIUfb;oeaSQwT?$i>_7m&q0?C85wD>#oN
zi<{Wfcc<2H9z_;+v8(S+ZQy(%S=`3XzB{#r^F?HFAK#tY!TuMs_b&GJ-KjmCFJTuq
zvajz>9pHQ^S=`9JzB_e<^JQdlBm4U9)Cta)lf{kf>$_8DIA1{)H?ptqPF>)9C0X3a
zzP>wkh4W~#xRHH*cj^Y`F=TNgJNxd`9nM#g#f^M->H+&-&EC7%*LSC$)qD;6xRHH*
zcj^V_Ysun9_VwMVH=M5{iyPV3cc(sZzMd>@WZwqp3+Efi;zsse3jN@GBU#+YzDuJ&
zoNpqF8`-xZ2Eh4dvbd3*8(|=vZy}2tEyK@)VE<d$dl&mIi^0`=8~eDCeV4-!INwed
zH?r^Y7z*b*$l^x!T>-=3d?#7l$i6FLIGpbyiyPT@B^(atyUF54_FWlA!1*4sxRHHV
z!I5wtOBOe>^Qt%s&g019Myv7j(Xju$?7fS9SI05cd>{L`k$u;|v2ebhEN*1qHE|rA
zA0Uex*>^1*59bHT;zsse8z;bdJXzexzU$ybI8Pvp8`*bVoCN2G$l^x!T@NS2`C+oS
zk)7AaDR6#-EN-*`Kc5QwKg!;_*mpymR?UyGj~m%{Bb*NB$I0SG_T3m~!1)QXxRHG~
z!3a1%NftM<@1{5t&QFoWjqJM_&VuvPWN{<=Hpba-eugY=WZ%tk4xFDQiyPUw3C@M{
zb7XO&E%^C7*#CL<-o?IK;{0lUfqmS_zFXk}IKN01H?r^67zyW>$l^x!-3FuJ{4!bG
z$i7W+A)H?!iyPT@TU-R^SIOc=_T3H_!}&F`xRHIg$0cxnoh)u-=N)h<oZlde8|}!?
zm%;uM*?SlJ?u5&$+4rZok$rc@6>#<)DsE)oU2r9weUFM8*>_irhO_TdaU=WghB0vV
zeJXBb-`#N)oPDQ?8`*acTn%U6tKvrX-4oZq*>|hBk)8L#wQ%<RDsHqlKVJv?`%dXy
z?0bFn^qn&9W7iwt(|5|ajXiIKPv0ryE_S>LK7FT*o7nGW`1GAJ?qRoE;L~@?xP`rL
zg-_op;|_MZ4L*IRj2qbLcKGz2GWy@a&-=i4tbKVNiaX)#`<2;#I1G1Hv+q{s`=dGT
zu4dn>{Okc}fqSaicPc-7AX;K<HTyp0XAeRvjH_nfrTpx{XpMWT+4m?v+YD`RUp4y<
z<!28;TijpGzCZcdc6b1G^WDi#_Gym?tJ!y_=x?VE7!T*E5I3+_M@)e8)QCIStrH%C
z^E8NC*sn7lhV!(Dd)ToH9)a_8h@056D;|aO^oYCIwHqFT^9+dF*tt6%hx3ex`}AOb
z0`{K?-o?H>@nkj6%rkCe-(GkM&a)tHWZ&L+8qTvKZe-s+cm~e1A#P;fzIYbSvm<U~
z-+p)w&T}AcWZ(XH9?o+jZe-s9cmd9HA#P;nfp`(lb0cmvi1{Vhe;#-j`wqs-)jTiH
zxRHH_;1xK}hq#e_hvHQ@&yTo~eTU&SI4^*>k$s2bbvQ4GxRHGi#~W~72yr9(9)XE)
zUKnvB`yPom;k*dqMs_|5Z^3y{#Ep(-ejD~*4Bo}Q$Kai6UYuv#$iBzoT{tg+xRHI2
z!+UUE5^*E@9*_6o+yHSS`<{Rg;Jg&#M)o}sAHsQQ#EtBG5<Y@+L&S~jdon(Tb0fr!
z?0gD7f%7tm8=cDhDeS*2yo-HL!)MjJ9M8CseNV^da9$p9Bm16#FW|fa;zsrzfiK~_
zBH~8&JriHSc_qY+?0XizhV#mZ8`<}4d;{lI5I3^#IrtXNt0Hb>=X3ELoL58K=sf1{
zVgJ?PUF>^4eyHX(c*c$FdjWog^O}eo*>@y<g7aF48`*aheunefh#T4WLi_^fbr3hQ
z??w0(&g&v>WZ#SN8=Tie+{nI{;CDE$kGPSYFU3^T{^#9s1LnBVWz18vxBrIlF7~|~
z)3A5m2yr9(UV&-JoHs_?$i7!%Ix^=?5I3^#XiQJ$yeZ;F_8o&6$ecGr+{nIHVMa3N
z#)uo)_iD^U=Da!LM)ti1Gm|+tLEOmB*J2hj=PeL7x{i5P_V(Wr-o?JxV>b5ATOn>_
z-y1MHne*0&8`<|p%t7Y74dO=jy$N%YIX6Yz$i6pYE;8qB5jV2$Ets3kc{{|7?0YNb
zA#>gyaU=WQhIz@HcR<|8&bMPeGUpu;H@bs)e)jg?3EsuN3$XLKGvYpWU68%cT@bgi
z=R)j#?uxjJ9T#Trb2r3I?6(MepSvUOVYfxu``iO@3wtfb-shf(JJ@M)_CEJQ+`vvt
zu=lw)qW_ZY?&Rlva2Fm#19r~)!t8F0$5QN__k;O8n1H3(JMRzkv3Lj#**hNq^Kp0>
zjo3RM2=jaK2$o^*d=Sj<!=qT1z4O5^zaNibIrh%YVEzCe$MWo*4}tj;Sb?404uzfU
z^CVVe?|c}dznz}KN@UK>5jU{c(^#3zxdq}5c6$b^kU6(R+`@j(VpTHdR)~Ap@j0wU
z=G+=_6MH_7)ybUOAnsz<7qAAIb6do1?EE6uBy(<uxX(+>Yq7U~dw3W7zKpfmJ9j|b
z$iA;&9Wv*Rh#T4WRjf<q+zD|b`@V+t$ecSPZe-uru|An|7sQS1`vx{3bMA_`k$op(
zLo(-Xh#T4WO>9Kw+#PWvJHLgE$((y2ZuB<uChYCs6W+zX?_g8*&b<&fvhTatjLf+=
z;zss;4~@y3`yg&)-}kXOnR8#njqLjYnvgm7L)^%|A7TqK=l+Nr+4m!CN#;BNaU=VF
zjIGF=2O@4{=TERTne!mTjXq`GhQ0j<!@Jn`Gc;xIJOptg`+kmX$()BGZe-stupOE6
zFvN}Q`z5v~a~_Vkk$u0y4rI=UBW`5hudySU^AU&}+4mdlMCN=X;zsuU7CVzUABDJ)
zoxj5_WX?w;ZuC9#uI%l947`hdf52|+osUJ_$i6>fcQWVW5I3^#PuPRZ`FO;Q?E5qJ
zBy&CiaU=Wwg1yL`Pek0vzQ1B`GUt;JH?r?<*oVydWW<f^`#bg}b3O%eBRl)<v>%*L
zMcl}Dr~P67)8Jj~>$}qda6TPzBm4U9bReA1K-|c_zB?TR=Mjh-+1GccgW-H8;zsuM
z-KiOz&qCbDzP>vh0_U?4H?ptqPKUzz9K?<6>$}roa6XqTZe(ZQotne>JhHfv?@ldX
z|MS^<7yJ6|)Dq4Yu!|en*LSB@a2`n(H?ptqPOafQiY#tqU*DbD!1+S5xRHH*cWMjg
zi^$?e_VwMV9h@&FiyPV3cc=DnzJx4pWMAK%I>7l-vbd3*eRt{z=gY|AM!q|Bg8eUN
z?_KQc`%~v?zJh(+$iBWqb%FDhWN{<=`X1F4&ZEiVM)vhxsvDfgkj0Jc>-$u9IA28;
zH?ptqR6XE)HCf!qzP?xWg!46IaU=WsZq*CU*OJAJ?CkqhZ#Z8^7B})8s}JmdJ$vtB
z-@euJ26k~DyY_?68`;Ng?AaeaZ(<*JvEu;vyqSI6#C`+e^A`4T54#P5&s*8YE$lTI
zK5t_mcd*kC_`IEc+`vvl;qwmm(SH~}H^80jmg2c0hQs+Tc4kXsB^+MOcUPZn$j>X|
z2sq!v-p@9|Dmb#5$FetH2CL$zY97bl&n}DAaC9}_%ihl}ht+XRHQ&eH&n}NOaBMZ-
z&)(0jfHiSkH9x@K&#r~zVYdg_*~va@<AiD+&p!IwX&syh=LuwS1ADEDli>UiS=_;H
z>)~WLKTH<4u;2PP1<sF<#Xan}0ZxVUqhxUtdv1u+;QSa_+{LaN;dD4ZP8PSZ^Ts#>
z&QFlVeKz6e5wQQ0?7fS9H^rIN{1p4Rk$pGAS#W-uEN*1q#yA_!&ydB9?7KP6f%CIu
zaU=US!MSjLjx26u-z{(+oS!F)8`*bDoDb(0$l^x!-3k}L`9-q0k)5~3NI1Vl7B||4
zpGU#|FSGY9_HBv_tN9i7aU=U~i;Lj=Dp}mfzT4qqIKM^~H?r^cxCG9xlf{kfy8|wT
z^BZJwBm3@%%iuhbEN*1qop3pveRql**>`7L0cYQx;zoAf1y{n^cc-|~uKYY2_V?Y%
zyV!R(jHzbdo#ICJ-5poK*>|V7k$v~T)o}LRDQ;xnJ#h`3eRql**>^8o3uoV*;zst}
z8`r_vcc-|KefPojaQ59PZe-tmaRZ!vcZwU?c|Y6;XWyOTM*H*gO|ZZ3PTs}72jJ#v
z_T4FNWZwgE3!Hs-iW}MYAlwRP-<{${_B|N4!P$4GxRHIE;dVIt?i4q&?;*GY&b~Xv
zjqH0U?u4`NPH`jq9)`Q%?7LIk$j;4iH=KQUiW{}y=X+p(-<`aReOqE|HT&)qH?nUl
zjDxf9PH`jqw#L11_T4FNWZyQp56-?j#f|LS7Wc#1cc-|KecRyyIQ#AtH?nVgJP2ps
zo#ICJ?SS!co(gdzJ9oqcI8TkZQ77hyVE<|0UF_Q#4_EWFJmW_8?Se<(JRRaj_U(#C
z;XFO!M)vK7$KX5zyo;Z+Z+ARi%`@_h8`-x9o`CaAh#T3rC!U1!%!nJ=w-=s*^DKxP
z*||5KhV!h58}(s+2KJu~-o?Is@oY8E&NFUg-+p)w&T}AcWZ(XH9?o+jZe-s9cmd9H
zA#P;ffp`(lb0cnK-$8f@&hsE{WZ%Jf8P4+}Ze-sfcm>Y$A#P;np?DR}^CNCFjQKU#
ze*t(G`@UX17vvfDvFjV~xe($u_M8Zx3nT7g$2Z|~5yVaG_ZECEinxc}-iFV`5Vx?`
zJMg(U;tqCt7e1Fj+`vxn!RL~Q{_isnM*|#=6RPJ@Jl!9G6RYRaJpIg(IH`Iz<mqRQ
z!pYUM5l=sJG)}3W%kcCw$KcfJxhzjVb1Y7)p3Cv{Gsofd>bX2mKXW|JsGckE^fM#i
z@4O=Xef?d}tez|Jj86W(XTj&nh+h8AXT#?zh;IJg=fLNxh<^U==fdY|h>rgL=fUUd
zh@N&hA3oPWbhXC?@VO?UuYE?s=URx)qnPcrHtcJc3#;ckJfpW=E`rZ>5xwnlF?_Cv
z=xvuv;B$RMZ@XLypBo^0+vPI&+z`>*E|<gSMu^^axdJ{nM)bDNmGHR<qW5TKdu<B)
z+GR}j+>B@Rw#!xU*%;B=E?2|n=7`>QxduL)AbQ*7TKL=o(c3Q9!RMBU-gdbjKDR>j
zw#yChxizA<eQt!$Z4kY0VzyUP*w-#MSI=#EMsK^^0-xI<dfVkz_}m`R+b*}k=MIS8
zcDWrscSQ8I%N_8!6QZ|W?u5^s5xwnl7kuu5=xv|7;d56+?|Yc-wHxefm$B7zcb?JP
zF5}>H4@7Uf+zX$3B6{29KKR@V(c3Qf!{^?J-gbEaKKDWNw#$R?xi6x(UB<)beu&=o
znE;>rBYHo?Y_9`gU%Nb9JrCp=z3uV{d>(}8ZI?&k^I$}8yF3P;%@Doq@;H1Rg6M6R
zC*bo?L~px137>}{dfVkG_-u~oZJ(#%vjw8}GtBmC3H#dR+3MMfXY{tqbMV<3(c3Q1
z!)F^rZ@atzpKTGn?eZdgwnOx`%S-Ut9?{z_FT-aCL~pyi0-qfbz3uZVe0D<gevR2)
zonc?Qyk0%K@QmJec>_MXB6{0pB7Am3^tQ{J@Yx;F+b(axXAeYgySxpbJrTX_@(z6V
zLiD!FyYSf?(c3=n!Dk;t@AsMQ)fe`)i~1ot+e7^keeIwDh_3$r8i?rW@2)|Jj{e>n
zjOgd@tRaYQ{=OQD=;iOLVTewA6C3ka<KK2C)c)-Lzj^n6{oS%2|CD{b=l}nXPVT!}
z|JSqp&+FfHm-_d%{=JQVUgKH%PW)Zp&+PA8`W;KV?7#n?vajt_`*YUgzvXlP*WV-S
z@lV;8dQR?l|F>uLdrbO2SL*ku-(zzB%-6pk_3uah`!VTvpni`(caJIkGv%M~`O@!L
z+WnQ^oxkI+Kc#=q$@Tp=Wc7PY`e#A?9`$=n?w{-W_oM#(sDD2u{SMUc@#pR_rGKXU
z6Fy)19ZS2v^1JhQ{Pm~w?>V`?|Awr7k4gV5sNbW0kIDUWUH^X6zaRDQ$E4qZ`aS;K
zJ*M=}lz+nKOTS}j_g8**{*J%?l>R*@*Z1F$)$cLsp9S@M)bBC5f3EA_kNWqc{{5Kr
zJ5ayJpS#DD{+aSm_<ZSiEbacv@6O-x*PqhA=j8hS8?yR6CjGOZevkS+Cil;E{rge>
ze$>AolYR&4_xN-7n9@H}{t2Hi{f?#GU-{knJO27p`uCh%-+x0^zsID17S!)izsKbM
zxvqad>few0_hZuUK>Z$n?jBS6XUad}^QGUhwEHW+JAcPte@g$Jlk59$$m;i)^v{C&
zJ?i(E+&|a#???UnQU88S`W>j><Imk=O8-pxCw#v2JC=5T<#*@r`0G#U-*a+({|#CF
z9+UoAP`^k09+Ug$y8ivBe?RKqk4e7+^?Uredraw{DgT7e*Zz*RKWE>W|CZ1FUw@CR
z$3JCX@A>Ec+5K<(*SY?$XZ>GKzmtDd`cBlpw|~#SAAIRwi_-4D?O&fM{e5aX)&89Q
K_5M3P_x}KQrsg65

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np1/IJ.A.i4f8.00000.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np1/IJ.A.i4f8.00000.bin
new file mode 100644
index 0000000000000000000000000000000000000000..1eeb970524cfc4c4240558a88ec7115d01eb8286
GIT binary patch
literal 102488
zcmeI51&m!+nsvj>%yF2R*<og8Cox07PGZI|Gm{-=X0*f1j1Dt1|7&&MPwIYiK6kxR
zx%zMEwX}40?S0Gj_P%eVqZ!T2xa0iuKND2vB-Q!J`2Q4fjx%c&#996LarIpF<2bcH
zhd(Z&mhtdv@t>>3&sNKXc(qJ~SIfkBwb-$iN%8)b$@saJ$?-}|fnQ=u{1Q{)mzWyA
z#5DLNro}HY9e#=F@oSj@ua+6{O3Z{`VrKjjv*4HTD^y}O{1UU{mzV>;#GLrG%!OCW
z+;}D0;Fp*Ozr?)wCFa8~F+YBZ1@KEOh+kqM{8|>qt7Q?q5{u%OSPZ|!;`k+&z%Q{R
zeu<^<ODv6FVj28emc^@OIlL0f<Cj<gzr>38C04>Ou`+&%Rq#u!ieF+i{90DWt7Q$m
z5^Lg@SPQ>ITl^Ah<Cj<mzr?!uCDy|)u|9q+8{pNlAzq1%@JnorUt$yd5}V?e*bKkK
z=J+MHz%Q{Sel1(!)v`5SiEZ#pY>QuFJNy#c<CoY0zr>FCC3eCuu`_-xyWssRyYh1_
zyW!QcJ6<h&;MKAxUM=nLYS{~~mc8+6*$3}mY0uBKbigao5x+zy{1Tn<OLW06(G|Z$
zH~bRa@k{i;uVr7n68qt2>`#_)09i&)vW#A283&SO97L9JFj+=#vJ!ppOZ3Ih=tq{(
zpDbelS;j!Jj6q}>gUK?6kYx-dD=`ee#3A?@hmvI+MwW3nS;i4$8Ap<397UFKG+D+m
zWF?NpFL4}x#_?nsCy-^FNS1LDS;om^8K;nCoJy8)8d-_c@k^Y6pK&Hx##v+;XOm@|
zLzZzaS;l!}8RwH_TtHT0IDUx{_!$?HWn4s-aWPrOC1e?wl4V>*mT@^*#ua2GuEZ~K
z6@JFmWEt0xWn4>^aUEI4^<)`0kY(IRmT?nViJS3D+=8ERD_O>EWEr=UW!yoQaVJ^E
zU1S+|lV#jPR^nd#TJFOuF%rMTDEt!l<Ck~<zr=(1B_6^r@i2agNAPQT6t9-Y@Jc+6
zU*ZY;5>MincnZJ7)A%Kx!7uSFeu?MsYk3~8#0&TtFOp@vM3(U~S;i}58LyIMyhfJs
zI$6dWWF_9jFYy+B#@l2W?~rATCd+u2EaN@0jQ7bhJ|N5ZkgUW<_$5BZ&-jEa<5RMX
z&&V=9C(HPPEaOYEjIYQtz9uX24StDl@iV?7%lMuw;|H>gAIUO)BFp%hEaMllj9<x0
z{DxoRcl?Y$$TI#U%lL~d<8QKz|MNe{7?+1D#^uZyk1S(+vJw;EmzWSgV<NJQiODi1
zA<LMQEMqdVjLFF|rXb6hlB~p3_$8*s&zOcRV_LF|>BussC(D?DEMrEpjG4$XW+p2!
z3x0`N@iS&4%b1-kV-B*6Imt5SBFmVYETaus#yn&t=EbjNKD-k1<Cj<fzr=$0B^JUj
zu`qs#Mes{3ieF+e{8|>rt7Qqi5=-KjSPH+y()cBo!7s5aeu?GqODvCHVg>wKR>Ui@
z5`M<YWErcFWvoh;u^L&%>SP&fkY%h%ma!IDiMIG9*2d3Rhb&`VvW)e}GS(-{*nli!
zL$ZvG$TBu2E3pZFiB0h{HY3Z}oGfDtvWzXsGPWYi*qSV38?uaT$x3X8Ut)Xwj2*}_
zb|lN#i7aDhvW#8GGIk})*o`b>cd`<D;Fs7FKcgL4#$IF@dy{4CLzdB=ETaQiMn|%Y
zPGluI<Co}ypV5^pqZ?U9ce0EgWEuOCW$Z_mu|HYH0c0h5;+N=!pK%~r#zABm2a{#=
zCd=qUmeH3iqaRsDf3gw-@JkHD&lp6OF_<i42wBEZvW#J58HbQ%97>jP7+HzK@oPB(
zuf&n~C62-`aWsC3WAIBHi(le6{1V6GmpB2xmJ{)6ISH@C$@nEs!7p(teu>lYOPr2h
z;tc!}XX2MQ3%{1L@k*S7pK&f(#(88J=aXezK$bC_EMo*&#)V`V7m<~?7{A0N_!*ay
zWn4y<aXDGW6=WG#l4V>)mT@&%#x-OmuEj5L9e&33WEnS*W!y-XaT8g_&14z3kY(IT
zmT?<diQDl@+<~8QCt1c_WEpppW!yuSaW7fMePkIU$udTfmAD_j!~^&l50Yg(M3(U|
zS;iw|8IO`>JVuuBI9bLMWF?-&FYy$9#?xdO&yZz2OP28*S;q5Z8847!yhxVu5?P6t
z@k_jdpYbYL#%p95uajlGL6-3*S;kvr8E=ziyhB!EG=7P9@iX2d%XptG;{&pc56Ln<
zBFp%gEaMZhj8Dl*e1>1k=XfQ)z%TJ7eu=N}OMH!A;v4)D-{P0}4!^|r__h3iSIduh
zC4Ry$@iTsjU+_!(ieKV4{1U(8m-qv}#Gm-J{DoKIZ~Tn^^S|^m9{=;Big7tJ#v{uZ
zpDbenvWyAIGA1I+n3$}@B={vJ#m|_GEMs!Aj48-6rX<UliY#MlvW#iSGNvUfF&%!1
z>G3mWAj_DMEMq3JjG4(YW+BU%l`La6vW(fuO3Z;@Vov;wxyUl+Cd+6;mN5@m#=K-1
z^O0rDPnNL&S&0SlODu$+u`pT2B4inhl4UGLma#Zl#u8*1OOj<QMOI>I{1VIHXDmyW
zu^d^(@?;q+kY%h$ma!69#>!+FtB{pg6~Dx4_!+B{WvoG#u_jr@T4Wh*$uia^%UFjj
zV_mWm>*1GJA3tLQvWyMMGBzU1*qAJ16S9m=$uc%0%h;T(#1{CqY>8K5EBq2$<CoY5
zzr?oqCAPyau|0l?9q>!+h+oT2c(v?|S7I0Z61(D;*bTqL?)WA4z%Q{Ueu;MYCHBIv
zWpBI^``~A^C(GzSmeG+cqZ3(1XR?egWEow_GP;qK=#F2a2Y$xBWEuOBW$aIuaR6CH
zPqK_&WElsNWgJ9S;$Zv|z40^pkY)5G%jidz(Vr}109nRBvW!7w8H34648bok6hC7a
zS;iq`8HbW(97dLLI9bLKWEn@2WgJCT;%NL5$KYoiOO|mQS;p~X87GisoJf{&5?RK{
zWErQBl{gi@#A)~$r;}xzL6&hQS;kpp8E2DaoI{pzE?LHTWF^kWFL42W#&EKX5o8$`
zl4V>(mT@sz#wBDKmy%^%Mpoi-{1R8-XIx2^aTQs{)npmhkY!v;mT?_f#`R<wH;|RM
z5x<t3@Jif_U*Z=061U=)xDCI=?f50`z%Owpeu=yAYq=Y*mV59@+>2l0KKv3R@k@-t
zFL6J9i3jjYJcwW7A^ch%#w+m%e#WC@8IO@=JWiJJ1X;$DWEoG9Wjsxm@eEmsXYors
zhoA90S;h-w884D$yhN7qGFiqeWEroLWxPgK;&uEIZ{TOVNtW>zS;pIB8Sju~j3&!?
zmn`EwvW)l1N_>D{;zRt5kH|7UCd>GQEaOwMjL*n2J}1lgf-K`pvJzk6m-re#;~TP!
zZ^<&gBg^=nEaL~Vj33D|ej>~GnXJSw_$7YD&-jfj<9D)*KgcrvB+K}VEaPvojQ{h0
zcx`<C=Ta5pa+Vkmzr^_X8559YOh}e75n0B>WEqo?WlTzzF&SCL<YXnLz%MZ+e#TT}
z8B>#GOhcA2Em_8NWEs<wWz0a9F(X-tnec0w8Lz}F_$6k=FEJZ_iP`Z>%z<BGPW%#c
z;g^^jzm_(5wakN8VqW|b^Wm46AHT!`_$3y^FR>7QiG}e?EP`LlqIe}1!_QcpEMp0>
zj3vo3mLkhonk-`(vW#WPGL|DNu{?f>74S1wB+FQdEMsM|j8(`oRwc_=jVxnzvWzvz
zO00=rVlDiPwqzM=lVz+!ma#5b#(HEK>yu?{K$fu~S&5DCOKgmvu?bnmreqnLk!5U7
zmazp{#+GCmTajgKO;%zX{1V&ZXKY87u{~MF4rCcSl4a~fma#Kg#x7(TyONdI4Zp<h
z_!)bUW$a0o(T*%*FS3li$ujmK%V<xQ(SfW)NBk0<@H0A-Wpp9S=t`E+jVz-(Sw;`C
zjD5*6_9H8?KYob=@H2XnW%MG;IFKykAhL{u$ufGAW%MD-=u1|jAAT+U@k$K9FEJ3m
z#31|<gYioY!7niszr-;75{KZ|awy)vau`3?ayVWsN8r_RBwj5?;ni|9UM<Jq)p9Ie
zEyv;gE64M5EhpfWI1#_ZN%$pB#xHRSeu-1@OPq#Z;&l8HXW-XzCSEOP;gvWWzr;EC
zCC<e!aUOn&^YKeufL~%beu)wIwOoi-%SCu4F2*l$34V!7@k?BWU*dB75?A1txDvm_
zRrs}BjaSPxcqOjIFL51yiR<x8+<;%=M*I>t;g`4>zr-#0wcLtV%WZfiZpSZi2Y!h=
z@k`u=U*c~368GSjxEH^~efYJE#H(c#UWxnhOFV#I;z9fp58;=17{A0L_$402FYy?D
zEsx{X@&sOqC-F->g<s-n{1VULmv|Px#B=y1p2sio0)8zo;??pJUWu3SOT2<#;#K?-
zui=+?9lyjI_$A)NFYy+BEpOxfEAQ}gEu-;jc^9vi_wZ_YAFq}V@M`%Gua=MSYWW!N
zU*W%VJP!XW5dZl9q0zq5di=Ma|MCArqeG>AhF|^1|No4RmG+qlU`pszX`h)8rh?9u
z_L+%bYUomFpP3k@fv%PInMq(;=vHZ;nG~jj?v?hL>7fTq2L5Mqm;v^!baa}6pJ#;q
zKpnmO%rn9MppI^S?wR2LP)9#M`z+8C)X~w;KP&VCb@a5uY;Yi`qpLk;hl4;JeeE*`
z91QB{JSVz0*v+nXnG5<<I(pk>Zs-f@=xvua&=1tn+b;7!e^5tnyUYs%Kpnm9G9L^C
zb@aB&{4faA(c3Nyz+g~EZ~H6=LqHw97eWsOyV=z)3&XHVNAEWLya*fu>ga8kMd46T
zM{m0<28V$<dfR1jI2_c`+b&DM5ulFVc3BdR1a<Vb%TjO@sH3-imWHE29le)99|Lx?
zt6i3bV=EoK?Xnyk2kJK9vvye?j<0m|w#y1|0;r?6T~>q>K^?vAvJ#vG>ga8kmEmMi
zM{m2V0;hmFdfR7JI2F{<do}cFU^lzkWpy~c($U*4Yrq+xj^1`z6V3#6^tQ`da2BYe
zw_V!8*`SWzc3B(F0d@4Y%Q|o_sH3-C)`jyx9lh<d9-I&A=)FGr0<fE1?Xm$3uXOab
z%Z4xl)Y0268^ML3j^1t28^cAQj^1|J1TF@3^tQ{Ua0#fRw_P@aOF<pI?Xo#s2I}Z-
zpDo~WP)F}A(N}=o>}r>-;L1uzZ@X*_SAjZu+hrTL8r0F-F5AL2pl%E1cG(WDt#tIZ
z%l2>`sH3-Cc7W?a9lh<cBisP$=xv{!;6_kK@14;%f!*wCmtElIN=I+I><YJlI(pk>
zH@Fql(c3P&!)>6B-gemoZU=Srw#%My2dJaBUE0B&ppM>l*$eIhb@aB+-f%alqxU}O
zd%$jXwadNL8J+EMA9zMzJB$R+=<4Sm1)kB<&wf96M#pyO2f#D>`I#RC&*<joeF!|G
zm!J1x@QhB6pxcB0=>Yq}qm>?))2t)x2ai>HJWikO1pC9|l^&ndXFJ0I@I<92;Plxp
z&=a1l^n{!~+ZB4jQ<a{G(`UQEf$(&tC+76o?r;!1Q|U=KeYOW249`}2Qcj=k4bOqy
zCIdU!rw=?|>B%{xzn%KR3!t6?Vgq~igBL+PCBzPP>klu1dMb!5>^A^j2KCesd)RRx
zyaMWJAU3h*Ab1tj(?aZG*TL`_sHcP2#?C|Fbx=<avCmNS8({w#z+LP+4Bo8tjGVEN
zeGh@RKs^)0M)o}v-Uju|5F6R|Fn9;lvp{TQ-@{=vsAq-P$i7FwyP%#8Vk7$=3Gab=
zc8HCJppSz0K|Ke=Ms_|LJ^=Nc5E~tX{t)ax7r2XkkA;saJvV1;WZ&c9V^Ft&*vP)e
z!zZAg2Vx`po&cYMdR~Z)?0X`72I~1BHnQ(Y@HwdGhuFxzC&L$@UI1bv`<?<{f_gz1
z0zPNwQ{k&hFT@!eoreAz?7uL$i+xXrZz{bAXKZBOGvHfLFAA}deb0pNK)o2mM)o}m
zz6bT<5F6R|Z1@4xOF(R7-*ezcP%jCwk$umFpFq77#76c#4}J#q(hwWj`F!{V)XP9@
zbOHKTu>Z2)F7_P`zg2oU&e+JlBj9&XFAuSieJ_MRK)nLQM)ti3{si@k5F6R|V)zTx
zD?w~z-%H?cP_GQJk$o?PamM{;_f?Rwk$o>SB2%vlv5}oGhw;eNt3hmZ1$un^;hd|3
zyNrM<VFG;h8W0=V_bQl>OuZ(=M)tiLCL&X>1+kHRuYrll)NLU)vhTGp37L9rh>h%f
z9ZX85UI$_$`(6)|k*U{(*vP&&z~p4=^&mE~^NlbCnR<PQjc!6uiEsZ6U^v+KW|#_J
zy&;SMpRw;PFg2NaBZ!Ucdn-&srrsE0Bm3S4(~_w-f!N5tx5IQ~>P;awvhN)*J(+ql
zh>h%fC(J;m-W*~h``!gJlBu_V*vQUz!%SrAEg?3#2R$>s{kH-;+xK3W1z){2#76eL
z4`wA(Zv(NBeMiD<Wa@1pHnQ(1n4L_$9mGcVy&vWvQ*RHkk$oS4Imy&JKx|~+2VpKU
z^^Oo5+4musn@qhE#71_07}}7jcZS&L5%fIx_TL5E#lG|6dF~3a&q(xq_@28#Y%>Zy
zKfdSg5WCoM0esIrAU3hzg7}_$LhNC;h44MwL2O~Kh4DT2g4n@Mi{N|i4Y7fp7RC46
z2crLCc#raPdw2|<hsE*K9l-2ycmbBcS9b*SC*Va`5?|d3%%6mpU@3fcXE1*XUWTRd
z)m^~+X?O*e!B=+$^Jm~ySQcO14a}c~*I+q(b$2j-4qk`l@zp)R{0&$E&u;sIo$T`_
ztcb7P52C-F-h!3L)cZqhV6V4fWis^v5IflI9ax1--4kL9`;CTG$<)0d_ORo-uo{{A
zK!{E3`5vrJralN_7rVX>YmliAhS<i=AHbSq>fR9he288P-~N5TUF`c2w8dBVh1kfx
zAH&*Y>V6O#+4mDzhfLicVx!UMPhnj$^#F*C-bH@~>yfDkLTqH;&tZKs^&p6i?E3|5
zK&BoHv5|ehgbm5mLm)P?^H;DDnR+P1Mqi^h#<%}4a2NZ21DoKh4}sXozTd*8Wa>j9
zHnQ(`uo;>9Fo=!p`#o$<ral}-gU{Lb2iSs4eFVG<K4;$_VM{Xgkq{f%_b1qjOnnr@
zM)v&~wkA^_4Y84(e}Qet)W<+<^ecK>eES~@?qc8HU^{&EaS$8X_jlNyOnp4WM)v&!
zb|6!q0I`vM|AZaM)F(o0WZ%DFCo=U(5F6R|Z`hekeKN#G_Vw<x3#d<l*vP)#opuHF
zsSq34*}Kzjpgs*^BkxYTgZ)njcd@T`r#(P@2E<18_3pGMsLzDh$i5Tdw*&QA5F6Qd
zV*I^8eKy2K_Vw<xH>l5n*vP)#o%R9sxg4>PeZ4!i2laVmv5|efJ9Pl{`DC$?oxMAC
z1oZ`Ev5|MDPGJAx`0ip~?@paTJpwN_vaffiE}*`UEH<*Qcc-qPzKAR~vaffiZlJ!H
zEH<*Qcc<>4zJx3`vaffi9-zLIEH<*Qcc*<peVGxb&)L_z(|(n{oGdo7vv;TcL45^T
zY~<bP0I>g+`0ip~?@m1{eHDIeWMA)2y+D06S!`rq?@kAT`Wmv>$iCj44g&SHWU-Nb
zy*nKY>g&j2Bl~)H>J94a$zmh>dUxsr>Kn*nBl~)H>I>={$zmfrw}F13zKJY0nunkJ
zgZ*#DcNhE43j->B3w~^5-}zu5sBa~UjqE!=3<C9SWU-Nb7l6T_zMU*KvhRX01k`ts
z#YXmB2!?|CPO{j@z6--JP~Sxs8`*aeI0V#plf_1MUK9=m^*v;<(PI337})<_e0Q<$
z;njH`UhHGnBfxVcer#jUBf)bNe(Yk$qrmfi{Mf{PM}y}B__2rGjsedH@nZ{n9Sfch
z;l~bkIu1M^#*Yo`bUb)If*<`);OE8RQM@HMSA-Km{TQCvlCTn-RO!d7XP4sVmEmMi
zKY{PFOT#K~N~NE~H(v%;g;Oj26u!?c3#-9tm3|uEXP1N3;q*#BgYUD;!y0f#rJu$3
z*%e?-IJ45v;rr}ba2D9@c|1GWr!Aaa=@;;$zn#{Gb3pwfS!`ghb>Li3zeE;0*lk@n
z57aM{#TNEk56%bmD`c^U9oL5oK>aFNY+}z1U^u8>Ba2<^x*?1J_3LD@jh#1w3qkz`
zS?sehKVJm)e-qzb?7InET<N#)V<Y=+3YUQTZL-+NzMH|NpniueHnQ*La2cpalf_2%
z-2yHL^}A%Tk$ty>D?shtDK@h2R&XV#y*tH5_T3t;0=0Li*vQV?z}2Ak?i3qs%g@(<
z{k=Q6i+#6)Yb)*DDK@h2_HZ4jy*tH5_T2%l2eo&n*vP&+!VRGI?i3r@cPF?J)ZU$9
zBm3?QH-Xx_Q*314UEpR=dv}VB?7J)60&4G0v5}p3gIhuE-6=NOou6+5`+IkC7yIr3
zw^!P`Q*314J>d>edv}VB?As3R1hsdk*vP(n!Cj#C?i3r@cW<~G)ZU$9Bm3?H_kh~F
zQ*314_HZw#y*tH5_U!=of!e!MY-Hz-FcQ?>onoU-{5%Tm@7>8=?Asacue5ik*vP(J
z-~mv3cZ!Yd+Z7%JwRfl3$iCg+Ay9jFijC~s9Uca?cc<9MzCGX(P>%z#k$v}tM?pO<
z#76er4;};ccn}-ed4G5u)Z;^JbO8DZu>S<$F81vSPgZ(D&e+Jlz2GTOPXw`%eGi1E
zK|L|VM)o}jo&ohF5F6R|V0aePlR|7{-`?;Xs3(Ki$i98xc~DOdv5|fI!V93D0%9XO
z_k$NfJtf3O{n0Oh{igzVvF`wQxzbZ}#zyuX2(N&88i<YTI|yC{^|TNh*>^C!2I}b`
zHnQ&!cpcQ!Lu_Q<q3{N%XMotqzQf>6P|palk$n$=w?I7;#71^L6y65)%n%zLhJFX^
zKMS~veGiAxm7bL|HnQ&#@GhulgV@NvN5Xrco*iN%`yK`FgL)2#jqH0gd;sb>AvUt_
zG4LU%=YrVCzQ@8xpq?9IBl{i)AA`CL#71^L9zFr}JP;e5fc_NhKQFk8eLt(t`8Z=A
zyM7Ly^FwT7&o97p0f=4f_$7EQ2(gL%z5>sMAoj4^*WkG@#1{7Y20Rym*uhTUg6E<T
z8`$YP@LUX{|M%z<VR1MK&W0Z<y#%M($#4$*Sm`A>efAVM7k;YrQk*_}Dx3#DS9)nq
zpFIuEhhHka45!bY4i~_$m0p(9XU~A)@LQ#q<Mi1xVFdhM>E$_n_AIy%{;2c{oIZOI
z{0Vkj5$t52i{Y<Iuf!Ss?Q{wJ4eFI4Hn7*FFwS`Y?6?X#cCg!JFfN&TRfsL@cR7ql
zrd|zV4?A7~<CCdZhuFlPSHc8j>NOyCvFlYZA(?tjh;8hAHB3aNUJGKMYtR$p+rKTi
zi+!(!N$}NcLu_Q<>tIqc^*Rt6+4p*wj7+^Q#76eL0VXF?uLrS_eQ$&*$kgjYY-Hb?
zU`jIe1`r$B_hy)iOuZq*M)ti0rY2Kw1hJ8wZ-r^d)Eh%=bQ^kFeEV+#?qc8DVLE*E
zrVtz1_YRnzOuZSzM)tiEW*}2<4zZDa?}8c0)LTGoWZ%1CCNlMw5F6R|9+;U-y%oep
z_PrNoAyaP+v5|f6gIUSc+dyn&=aDcQnR;7@jYgqo$G87>;4b#PALhVUZx6ANeII~1
z$<#YQY-HaDVJ<TDju0E!_aT^@OuZAtM)rLe+K{PthS<oykH9=+>Rli<vhSlXFPVB*
zh>h&~7|che-VI_SJ3kKdlc{%y*ysuL0{Hgd1Kh>FPr`!u>OCPgvhP!{5Sh9i#76dg
z8Wtu~?**}ueV>6v$kcm7Y-HbOVNo*mJ`fw(_c>UMOx+%0Bl|uNi<7B4Kx|~+7hnl8
zbw`Me?EE4uNv7@uvC&KDrSR?F8QjIbFT>LK>Mjr)+4mJ#hD_ZRVk7&$3d@qIyFqMZ
z-`8L{GIe)|jqLk6EKjEH0kM&N-+&d!)cZngWZySoMKbk%5F6R|Em(<6y+6c8c77XH
zCQ}~(vC%u|Rq*ZK6WqnVqhVEibuWmG?E5aPMy5UxVk7&$2dk5*4}#dpzVE{tWa@(<
zHnQ&ruqK(hH^fHv{Sek7Q}=<`$i5#zTQYTDh>h&~F|19d?gz1voj-wf$khEIHu@C3
zF24N-fV<fDGguE_JrH6e`+g4Vlc@(mY-HarU;{GsV2F+E`z35hrXB*Zk$t~{jmXqP
zAvUt_*RU~}dKkn;_WcGnAyXd$v5|ehg-yxSheB**=kH)MGWB5)8-0)79N+$jgS*&w
z3p~#wAoj8AmiV4WLTqEtt?)gMg4o55TjP5k4Y7&+w!!y224WApZHw=DEW{S}+793I
zIEWqWv^~D(@emu>X$O4I6CnEUi1!0Op9nv~U$7IN`Xn&>3I2wi@zp1T`Oh#8-Y%d%
z1<Zc|?^L^j`cyFg6}(UF2I|wm{5S9}wL7R!2lL;-d(<AFJ_F4E0Pj$Hg8ED_{}a4F
zwFC88VD8;%FR<I$U?=-{ciJ1&=RowglXs_mKz%M*Y+x_%PVGT`9$D;QH}6gzKz%-0
zY+*m|P8~sg0a@%}NAFIZKs}r+HnFF7r_P`rK^D8%)w@#{P+v$E+t}H=Q&&)5L>Bva
zcj^ZAzZl<L?CagBJE$+gi;e8--KhttFC~kO?CafWUr=9078}{uyVHK4zML#Jvaffi
z{Xu;NS!`rq?@kAR`bx6c$iCj4dV=~Yve?MJ-ko}Z`f9S+$j;uK4g~czWU-NVr-Q)$
z*W$a2eZ4y!T<PoZV<Y=|cj^u5>&apx`+9fk1L_;dVk7%{cj^o38_8lL`?i68puUML
zHnQ(L&>z${lf_2%ofigx`WCX-$iDNzKv3UG78}`lei#Jm+sI<01^9U|*#CBXcd_q+
zFr?CV;KxSxT?mGP`cAUg$i551Fi_t`78}`j5jX_Ycaz0N_FWVX1@%2-v5|cjgTp|5
zFIjA4-^Jl@P~S%u8`*aWI0Doo$zmfrF9}D2dK6h~v=l!d1@^xm-(BpxG#p*&2k>Jf
z`z`~=fcinQ*vP)i!m*%!h%7d;?{aV)s2?VajqJNT91rS8$YLY=t^g;1`cbmj$i6GW
ziJ*RrEH<+5N^laWA18~A?7T9Z4C*JyVxv{~`4q7Kllbmp-&Nt%N<W1k8`*a?I1SWK
zlf_2%T^&vb^)qC#k$u;IGeG?;S!`tAHQ`K9KSvfD*>^2C3)Ih(#YXmR3ulA+1+v)4
zzH7rdpnj1oHnQ_Na4x7{B8!dI<>&Lj{x9RZi+$IF^DF%der#ml_2B|gze*Mx*>?jN
z4(iv)Vk7%*2qQrKI$3OF-;LlxP`^PI8`*bbxCqp5lEp^$-2^TM^;=}Ik$pFXOF;cL
zS!`tI&EQf{ze5%qZO+e^f&EA0yNi9dfXgfG{V6uG@0M@{sJ%nQM)utbt^~FBsMyH9
zTf<eL_AV70*>@Yb8r0sWVk7%*3)g_!J5_9C-|gU9P<yY6jqJNUTnB3JR<V(tcYy0b
z?foh?+L51c0Q-BVbQk;HSe@P}V;{TT1fJe0V;g(k44&R8V;4K#0-oL}V-x$`3ZC96
zV-LIC2A<w2V+(uT4xZjAV+T9k0iNC|V*@+g37+05qyJs}yc2lG+L?22xEs{ougrFV
zec+x-d$%&*723nSmG)lcv%5hDxUbUQseE>K=m;Y#?S0B;_kd0?s?y%2e0ERh4EI;s
zdz8<%gD&turM*M>>|W3n9;~$YC!g&G4}smhJK4!T-QnR%dv}WdcIp9-fO;H=4eYfq
zJPPV@A$G9ae()Hm$Aj3ye*44YpdKG$4?7+JPk?#?h)wL-6P^V1gb=&fwHG`E>WLt>
zvGalOG^i(r*ykYhGhqKoz+LQnFg#o7NjYO9`}T(CKs_16M)vIk&x3k$h>h&q7hVAM
z6c8KPw;#L+>M0>MvTuKQ3Di?TY-Ha7@G_{UhS<oy1K|}=PXn=$od?0Ipq>_DqrvFc
z!2Z*LyV!RKyk6<)Ib$RH4uv;BJp;r>_8kUqf_g@XjqG~}yano+AU3k^q3|}SXNK6w
zzK6j(pq>R{Bl{i>qd`3@#76c#0^SAnY!DmS`AB#V)U!iubQJo1u>Tz3F7`bdKB)AZ
zoUxI8kAV+CJr~4A_B|Fp0`=Sw8`<|b_!!h}AU3k^@$d<#=YiPBz9+z^pq>|EBm15R
zpMiQlh>h%f5_}Ho`5`v4^U3f9s270P=oIvqVE+ZdUF>@*d{ya%IAbIGo(5lodSQr-
z?0Y(V1L{Q}HnQ&-@GYnph1kfxXTo=&UJPO*`<?~ggL-j@jqH0i`~d1DAU3k^Iq)N>
zmxS2J&ga5Upk4}Mqw~-|gZ-BVcd_sJ@Jpqa;f#&!djb3k>SZA|vhQ&C4b;m)Y-HaN
z@H?oNhuFxz7s4N)UIAhw`(6Zpf_g=WjqH0d`~~WjAU3k^CGa<>SBBWg&X>YC<Nx#S
zxC%Npx(q!ozWrAPcd_r~Fdn{oHHeMudj*V7rd}OlBl}(n6OgIbfY`{sSHXm2>NO!Y
zvhUR}5t(`|h>h%f4NOd?ZVR!IeXoT{$kb~?Y-Hc-U{W&mIuIM#`Ffa)Oua6|MmL}*
z$G87_;4b#P5vIUbuMe@2eQ$y($<!M_Y-Hb?VJb59h7cRs_ZFC%OuZ4rM)tiGrXf>r
z46%`YZ-Z&c)SEzTWZ&CiIx_X95F6R|4w#-yy&1$tcD@s4AX9G+vC&=V8S(AE1-OfS
zXTtN`5@H{_&W!K56~s37oCV)=YlvO!I4i#AHV~WGZ#I0-Z6Wrs+wAzB+d*t$uQ~8N
zw};rlPIKaW?f|iYo#w*#+!3Px+<15M^G<LNJPd8{)H{ROz3>RkgRkBN%<qFoVP1Uo
zu3$bA9)tPt)w_ZDD0m#^$5-zT=J&%BumHY#4={fKo`ePQ)q8^ZgYXnAgs*M~<`2Qs
zurR)QFED=w7QwUI-e4#DJPV8BtM`HEZ>Q&AF*0>~hz;!ZJS<M8?f|ia-Clqt$kZJn
zwy@ueuq2tf6T}{Nd<m8!Q+I~g#GWt1(q!r`5WCp*6<CH$-4$XRJHHCclBv5v?DHCW
zIehzf2Y0dW>##h&x(CEY_I(3ZAXD!Pv5|e>gcZru`$24E-?v~TGWGrt8`<}5SeZ<H
z0K`W2eFs({Q}=|}$iAatRWfxih>h&~F04kTJ`iFfJHH33lc^7a*yw%q8u<1<7~I9a
zAHbUU>fR6=+4n<Oi%i`IVk7&01Z~OGeIYio@5it<nYtguM)v&#)*(~(huFxzpTfFi
z>H!cN+4nP8k4!xfVk7&04(pSt2SIFP=PzIbGWB4HjlM*0h;RQP;4b$43O2%54~5vs
zzF)(}Wa?oM8`<|8*n~`d2*gJA{T4PQQy&Vkk$t~|&B)Y;L2P8-?_qN?_2Cd3+4l$7
zf=qn`#76f05w;{#9|^IMoqvL@$kazcZ1gjFYkd134eny!Utk-2^)V0|+4oo2mP~yt
z#76f04Yngw9|y6KeSe4T$<)U~Y-Ha*U<Wew2@o6E_fOc7OnoB6M)v&+b|O=s1hJ8Q
z|Aw8()F(r1WM}VAyMX!>h>g5E?F#lk72L(X-ko*>^=S|r+1I<%?w~#$Vk7%{ciIEg
zXFzOZU++$Pg8EE|jqK~)sU4`#g4oEu-ktUW_1O>`+1I<%-k?4QVk7%{ciIQk=aR)n
zcJ}Vn9@OWN#YWzpI)MGp$9EU|dUxsw>I?8<Bl~)H>ICZHWU-Nby*qUV^$4=q$iCj4
zx`6sZve?MJ-krLF`XaK}$iCj4x`Fy)ve?MJ-krLG`Vz9($iCj4dVu;;ve?MZ-ktUZ
z^<`wSk$0#4!2XxxyNi9jKkZ-XEAV3@`+A2u0Mu8K#YXn^9@P`nSCPd=_Vq5+3)EMW
z#YXn^K6N0duOW+#?CYKCAW&aR78}{ud)2|9zK$$5vaffm-k`poEH<*U_p3gjzJV+@
z@{ZLP?0+M^yV$p1b>4&*``EQVc;1X3+t_mec;12^yV!9cc;1R1o7is<c;1E|d)RF-
zc;1d5Ti9y|c;0~@JJ@L`c;1O08`x<Wc;1B{{SV>iHgGrIJe-Tdp`gA8&um^;3=XUG
zz16ex@$=$vIH>Q#_u2Vj2{@wCBk|1_fF<F`N{_<#*#%)KII7b3<NNGFurwT9=?CzA
zc41fsj;Zv6_&&P`EDOh0`XPLuT@H=|yFH9&C;Kc9$5;9h{OE6|72pI=KS~xG*lR^N
z5!8>7#SV5`2~Gm_<7Bag{Z@vPLHz_->|w`M;1p0lNfw*fb5%GM)K8JcE_PiFP6PGR
zWU-B%SBKL<{R~;`vj#t(0rr0u-(BpxCY)L6=kQ}A`>q9Nf%<u}*vP(Z;cQU9Ko%R>
zcWpQa)Gw07M)q9?&IR>LWU-Nb*M;*y{W4i>WZ(7Rd{Dna78}`jeYgPBuad<^cHRJn
zgZeeH*l0t39s%}$9p7E-yAfPi={N9WBl~U)7lHasve?MJo501Oev2$NvhSvF38>#D
zi;e8N8C(kLcgSKR`)&@GfqFDqY-Hap;BruVcZ!YdyCqx!YVS_5k)5}KD?#nuDK^@g
zpRWS@dv|gd`)&hQSK7N%Y-HbU;TlkTcZ!YdyB%B$YVS_5k$ty^>p<<@DK@h24sboF
zy*tH5_T3R~0JV3g*vP&+!HuBy?i3r@cW1Z>)ZU$9BRlT`H-p-{Q*5*=Ki>lO_wM8_
z_T3F`t+aQi*vP)S!)>7U?i3r@cMrH7)ZU$9Bm3?NcYxZvQ*314c5o-Cy*tH5_T3Ba
z0=0Li*vP(n!`-0v?i3r@cOSS1)ZU$9BRjW;dqM5pDK_fB&-a1-y*s&!eLKR)N_%&T
zjqKYAMuFP9Q*314&Tv1dy*tH5_U!@>fZDrLY-HcA@F1wYJH<x!?FJ8l+PhP1WZ&-a
zFsQvd#YXn+0gr%s9EgqVye~Wo>Tw}9+7JC0*nd257yIrHk5_tp&e+Jl2f!1co&aJa
z`}Tw<K|LYFM)vImPl0+Oa2KDm?}6}ir6=Z$jqH06JOk=UAU3k^!SF1oCxzI^zP;f&
zP)`Q2k)8X%^Prv_Vxzw37r_2gfV<eYAG}!UDLG>!`}T*IKs^=2M)n;5FN1n&h>h$!
z5MBZGG!PrvcM!Y^>S-Z1vhQGc4b;;?Y-Had@H(ichuFxzL*Wfj&j7KJorl4jpq>$8
zqeIYdf&FI!cd_r=)j2a~>|@t=z;hOeZR|N3JZFX2#g6ZS=WGz0*zY~?oE>5hyS)#d
zb3kliuMfa;PKX`s^dWf81+jshJ_66VA^LxeJ`~!(VQ_qP&cmsHIGj+O^K$yk5pZI4
z&d2F9N5V<fIX|b*90ey==K`EQb2OY%oeOgM%rS6kbuPr|GsnVd)wwXI&m0G*SLY&}
zK63{6nHL2=ub=hI>RgO7I{A6e0?)-Edij~p2G1oRy7{@!0na5N`uW+<1<$1*I{Nv~
z1J9))dfMT9@LUF>t356N&t)O{+GjX;E(g(h1lnH9gMICCVRf#+8NKat5qPc$(c3N;
zgXc;Rz3p-dc&-f5+b)-a=PD4r?Q$7-t_soHE|-JnY7o8cas_y<4$<2_SAypn5WTNL
z+iOj*uU)RL&b2tBw_UCQ&$bY~?Q$)6t_{)KF4uwQIuO0>ay@vi3(?yyH-P7Q5WVek
zBY3V4(c3OJf#(Jgz3p=|cy0*M`xdmlHUj(F<<{!lm@|6Y<u>r#1fsWHZU@gzA$r^8
z4)ELzqPJb{1kcSOdfVkL@Z18Tw_WZA&n+Q(+vOhc+zO(%eeMO%ts#2fhql)?U|+k8
ztj=vYqqki~f#-G*z3p;8cy15T+b$1)=ME6P?eZXa?g-J_E)Rj{P7uBA@-TSr4AI*z
zkAUYc5WVg5D0uD)(fcv9y><ip+U4=;+?_Le+vN%H+ykPwU7iHbJt2DA<tgxN2hrOu
zPlM-P5WVg440!Gh(c3Q1g6BREz3uWGc(#Y=ZJ+1Cvjar$7tr?V2==whi`ChQGkV+Q
zCGhMF(c3OBgJ&0r-gbEfJi9{lw#%#F*$tw%U0wsv?hw80@;Z3-faq<PH^6gWh~D;j
z6Fm2W==~PjUi*W6?ecbY9>5vB?eY$I_Jrtdm(k$a3!=AO-UZJCA$r^8J@7mTqPJb%
z2hW2cdfVj#@azrI+b$o1XCH{(_W1}r`$F{o7;Ue9U|+jPe~8ZZkO2^V?H~goy88KL
z5JXQuy9|ct=;xLp5dHkjG8CelpI3%K^z!q{ArPIo`SYJy+WzAh=Ntde@9>}6^FQVB
zeB-(1?bp(~)%!jg&zIj@>=I{7zo(}Dd-eYP#`BH$=>m=KSNVI;)LokTT;spq$~(s{
zagMD$oBHoI^|`VAc^m)!n7=PgeNRn&uCe!+_a58(H1$0-^|`VAc^m)!n7=PgeNRn&
zuCe!+_a58({HOQypYnP?U*q5V_xIh>d(`_r8qfdx`-nYi&;MWEQ+%$bex7(f&c^SR
z-*;>6Qt#iX_xZ+qF2CRZm0jw6-}OHKzp_K)bC$oy^}g?VpKt75-u-`NmwMlKz0d!z
z?9lj}<?nI5@4MdT8@rcx|6kdq-uGSa^ZzS5G(KnfdtC4PuJ`%I?&aP8S9WRY`)=xU
z&F$Uz_gm(B)YKiD`ds6Ej`_We?S01fdus0IZ~WevzZdnsx909y@87BS`R0DE#_u)0
zA1)BzgY0a4AIsm9*4m}szf<q?@!lK1_uqZb&3zB`zPEaxZ|>)6{9gI{)Y`k$`@ZXa
zzP0-_{$9&|uj+l@^*-NtUoHE-T6@oW-*>&ww|1Y#-)q_LV^iOEQ=e<@`)U09E%RQR
zx?@wHYrM}fzn8JS&)9xX&Hen1-y8GyqTct`+&%04JM})_+|Skcy~g*$1>$><osI8f
z`Fqk@yVU!4>U}=md*k>1yYIQV@1frJR`2u8{alUTD}SF_dzX6OcfHTIcAv)IYuWEr
zz3;o;=Ns><W#3n8?^*BruJ`%Y?$h{tE&F|J>icf$bIpA}jeoyo-fL5LZ0d83_c`YG
zGPd^_+wZBlpTF^YWBy*$``((nXT5)?-shY9xf;LM_<p!Rd=Ij-@qH|RPg-l2djC$n
z&&PXj{N8`}Jva9~)cfA*eZIM$tMPl~?^A2<Qt$h&_xaZD)A)NW`@O37eb@VZ<9)U4
z`)chy>wVw#KHu7X8h@{4zmH9Q-%Wk4x$md(@3+i*ZR(CqeXj97$NXN#_C90#JvI09
zH-2x---~+RTXXlU_wUsEd~-in<M$fh4;P5<L3TF2kLB-4Ywc3+->LWcc<+th`|rNz
z=Dvq|-&?)UH}`Wjey{v}YVBR>ec$yy-`af|f3Ib~SM|Q{dY^B+ua<pZt-WWx@4MdT
zTf0x=@3rjrv8nI7sn0d{{WSjlmU*vD-La|9HQwi#-^<wEXKcTx=6?Rh?~VC;QSW<e
z?w<AjoqC^d?&oU!UgP`W0`Wb_&c^q#{5@%{UF!Wi^*$f(z43eh-S^zw_fYS9tM~cl
zey+yvmA_A|y-U6CyWZzpyHDfqwe0t*-uGSa^Nsh_vhS<4_pJAQ*ZX{H_i6mSmi<09
z^?f(>x#qr~#=qY(@3pBrHubs2`yBIo8Qc4e?f2B&&)@jHF@G=WeQ(X(v);c`@AJ+5
zT#esrd_P<uz6aUa_&%1uC#|(hy?>|P=i|LMe(%5go}2p~>V0qZKHuEW)%d;g_o=ma
zsrP-?`+RHnY5cvG{a)4kzUzIy@xEI2eYN(U^}g?VpKt9xjlb8j-^ZrD@1{Q2-1pP?
z_gm(@Hg(6QKG%4kV}37Vd!MoWo|^ml8^1T^??t`ut+{*F`*-SnzPX>P@q3N$hYQ5_
zAUhl1$MW~2wRWlZ@6`Kzy!XcM{deDUbKgU~@2%eFoBO#MzgPY~we~LczVCXUZ|y#f
zzt^(gt9svez0Wt^SIfSy*50$;_g(Mvt=*^b_geP**wpvk)aRP}ej5LN%e>eBwBvuu
z>wSNXfA8PlTTAaz@B3&x|L^Z3_NYBu`aL!E-;2-Dcz(?9X>9G&)PJ|B&o$oXnBU{r
z-lwVWsj1J6?a$lz_s9HwY3h4w>T`{~$GrF0-lwVWsj1J6?a$lz_s9HwY3h4w>T`{~
m$GrF0-lwVWsj1J6?a$lz_s9Hw`A_fZKjroA+xYk5ef&Qm(~!>q

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np1/IJ.A.i8f4.00000.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np1/IJ.A.i8f4.00000.bin
new file mode 100644
index 0000000000000000000000000000000000000000..cb9918e393c1f858c0a66fcd128300c3bc46c0ef
GIT binary patch
literal 128088
zcmeIb1rXMC+pUY;-A#xnASePVp&*E$AYvdTpwivlAs~WE3n(Bc7=(ZlN(&}nkp|e^
z-QRrkUf2FM4D$T$(HUQz=gjO`-@Wd&ZsEE9I(vR+?{oIZ@t^-^e{^s3gT4OqKd3oQ
zV4*U;PmVFi&a?i`x(7xk-IH7<^^cKB{rhFoefZ~Q(tXKg(*4L~QaNPO1Gx7`dLa8u
zdJwr(J(zr|9zs4<4<(<fhmlX!!^x-W5#&?#Nb;$A6!}bgG`UQA47pT2mVBxnM?O`L
zC!ebR=OtB7<bJB2L_SqdCZDROkk6#2lFOv0kxSK_<Wn^l`BcqKK2`IOPu0`Or)pmE
zsd@(aRLw^|lb%T~lb%H`Rr8Zi)dJ*GwIKOaJ)3;079yXjg~_MtIpkCIT=JQ;2)Rsp
z9=TL4N<LMKkx$j)<Wu#0@~L_O`Bc4-e5#fppQ<IvXVOySGHGdYsd^FlRK1vds+J+2
zs%6Qi>Luh;wH*0WEl)mGFD0KzE0D{imyt`=isVzZ68TiUoP4TYK|WP0lTXzu<Wu!Z
z@~K*td?vk$TqdnXE>*84pQ_i8Pt|M5r|Na&Q?)wzRK1>js@5Q%sx`@H(pu#HNNcmt
zq;<$;(i_NS(z@g_X+3h8v_82^dLy|^dK0-!dNa8{(gy4^X+v_U+K7CrHYT5{O~|Ke
zQ}U_WjC`s#C!eY<$fs&c@|m<1xm0aUKB{f#MYS!xsJ5dQ)%NtF+JRnFJJO44Cwfus
zOfOZtkWbaF<fGb+UR1l&i)s&gQSC`Ds=eq%wKu(}_MsQmzVuSHANf@6Pd=&x=tXrP
zy{O(oFRFv+MRhQ}s1BhQ)m!OBbtt`5y^VaT4kI7c;q;<<JH4phK`*Lz(u?W{dQlxo
zFRG*HMRhd2R2@S;RmYN#>Nt8)y^CH{$J2}I1bR`ONH3~)(~Igo^rAY6UaC$epQ=;H
zNA+HMQJqRJs?+F2^*(x0y`NrGr_+n-40=(0fL^LTNIq2`A|KU<=|y!Wy{OKj7uDJH
zqB@6OR3D)i)w%SdI*(qe&L^L$kCKn-WAviBfL>G=(u?XMdQn|WFRG8zi|P~fqPm1$
zsxBp;NtcmJ)#c<<bp`oUT}eJwSCLQEC&{PkYVxVNhJ30%MLv^0O)ir@LoQXHC7-I#
zkx$j<$*1aC@~OIxe5$S|pQ<mAPt_O6XVRC*rRvM%qxuTHsBWMa)s6I`x`|#?H`9yi
z7J5<LN-wIf(o5CX$fxS-<fHlqy{K-Z7uD_bqWUJisJ=xns&CVa>O1tJ`YydxeUE&q
zzE3`?AJB{HhxDTQ5xuB>OfRaR(2MG)^rHG1y{LXpFIB%FpQ>MykLp+SqWU$xsD48)
zs^8L!>UZ>_`aQj<{y;CPKhjIppU9``&*Y=}3%#iRN-wIv(TnQu^rD($4~jwEgM3u?
zq!-n_=%wo3<WqGY@=@KFUR3v^7uEggMfCuBQ9Y1eR1cyT)r09p^$>cgdMNo+J&b%*
z52qK^Bj`o-NP1B{ie6NYrWe&?=tcEddQm-&UaB5XK2=X3AJr4-MfD_lQ9YSnR8OH7
z)l=z3^)z}>%}Fn+x#*>8Zt|Hl54lu5oqVe1C7-HikWbZo<Wu!b@~L_j`BcqMK2-~l
z&!h#(Wzw_BrD`GasalwPs-8nWRnH}#szu1B>Urc-wJ7;iEk-_*7AKdg=aY}>1@xkN
zA-$-UpcmDW^rBjdUQ|odi|R%6qIxmCR4qe3Rm+l(>Lv7|T8>^+%hQYMrSzg&fnHQE
zqZieR^rBjcUaDSBK2@(EAJxkAqFRMsRIj8L)vENOdKJB>R-+fytLa7c8hWXEE%{Wv
zj(k+B(~Ii$^rBjWUQ}z+i)t-;QLRlcs&(i^^#*#WT9<sP)*~O)`t+iDBfY5JL@%m0
z(~D{YdQojiFRG2`MYS=#RBb{&RhyEJYBPFKZB8$$E$BtHCB3M&q8HWH^rG5^UR2xC
zOVxJdQ?)($sCJ+i)sFO{+KFCNJJXA57kW|cN-wJ2=tZ?Vy;SW%K2>{?k7_S^QSD7H
zs(t81wJ*J>_M;co{`8_cfL>Gw(o5A_$Y;_)<WhAo`BWW3K2>iepQ=O2r|NCwQ*{{m
zR2@z}Rc|MsN$((+N$(_=sw2p!>PYgbI*NR%jwYX~W5}oKSn{blj(n=#MLv^`Czq-d
z$VYV|y{O(zFRJ&@i|QnLQJqXLs#EAi^<H{Wok}lNr;$(9`^ZQ2etJ=zPA{r6=tcDb
zdQp9lUQ{2V7uAR9MRg{<RGmdWRcDir>KuAeeS}_A=hBPnJbF=`PcN#E(u?Y2^rE_e
zUaBr6pQ?+<M|Cm1s6I|Fs!!01>JoZUT}m&i%jiXQIlZW^pqHvE$*1Zn@=<+~UQ}1p
zi|QJBQGJSDRG+37)o18M^;vpReU4tLK2JVX*OHIwI(kuEPcN!3(2MGe^rHF_y{NuS
zFRHK5i|Ph?sk)JTs%|15)y?#xx`kd;x6+I1tMsD!8oj8#PA{r&(2MFeda1gde5$@l
zKB{lgi|X6-qWTWKsJ=@ts_)T@>ihJf`T@PDen>A>KO&z=KPH!|pO8=0Psyk1XXI1$
zbMmSB1^HC{l6<OuMLt!(CZ9>aA(u(NC6}t-kx$j{$*1ZM<Wu!W@~Qe0`BeRxe5(FJ
zK2?7upGkism#V*$k7|xR`M-Y@)IG>Ybx(Rx-HTpS_of%sedtAXUwTp9k6x<oPd-%-
zARpBO=|%M*dQm-?UQ`dE7u7@QMfEUxQ9YbqRF9ySsz;Jf)uYHq^=NugJ%(OXkEIvY
z<LE{8czRJifnHQkq!-nb=%wn(<Wuz&@=-mNUQ|z`7uB5fqMD0dRCCjdY94w~J)K@u
z^U_PzGsvfEKJrmLlU`KMq8HWt^rBjTUQ`Rxi|X0*qFRVvR14Ef)pN+F>bc~jT7+Iy
z&!ZRBqV%F#j9yfW(~Ii)^rCtJy{KMDFI7vBPt}s-qgskyR7=x~>P7UTdNIAImZ2Bb
zvh<>Q3B9P6qnE1X$*1b2<fB@FUQ{om7uAaNqFRYwR4=C&)hp;lwKBb^R-u=wSCY@9
zRmr95Rpe8(8u?VcntZBWLq1inC7-I-kx$j?<Wu!}@|m;-xlCG<T&mV0pQ^RVr)nMY
zsd@wXRIN)sRqK&Y)%xU9^+xiU^d@qtdNcW`HlP>PhV-J^h+b41(~D{odQojkFRIPx
zMYTD-RBb^%Ra=seYAbqCZA~w#ZRka{Exo9=qZifo^rG5<UQ|2MOVv)~Q?)bssCJ<j
z)volS+KpaRyVHwm4|-AUNiV9s=tZ?Ry;SW(K2`gYk7_@9QSDDJssrdnbs)W{-a;>`
zgXl$dFukY_p_i(+l26s4<fD2Uy{HbO7uDhPqIx^MsNO*@s&~?h>IiyK9Z4@$N0Cp}
z(d45#hF(<1(u?XidQrWLUR1}^i|Pb=QJqLHs&~^%)qBXN>Ll_}olGyPQ|LwYUV2fT
zN-wI@=tcEDdQrWfUR0;kOVt_VQ}qGzQGJkJR3D-j)raXtbtb*2&Y~C9+4Q11hh9`4
zp_i(2$!F4e<WhA$`BZ(Be5yW1K2;ZxPt}FwQ*{yfR9#FyRUapxNuMB>NtcjI)urT9
zbs70oT~0n#SCCKDmE==(75P+sl6<PJCZ9>ykW1C4$Vc^QdQp9bUR0l@7uDzJMfG`l
zQC&+fs_W=Qbv?aQeSv(czDPc*FVTzY%k-l93caXqpcmDR^rE_nUQ{>Ji|Q77sk)VX
zs=i7-s;|+D>g)8P`UbtIZlf2~?ewDhCcUV>MK7vv(@WKN$fxSN<fHl?y{NuVFRCBV
zi|U8;qWTfNsD4Z@s-Mt{>ZkNl^)vFR`Z@WienBs)U($=}SM;L#HNB{QLoce|(u?YM
z^rHGby;S{ye5(FPKB_;_i|WtxqWTNHsQyYXs=v{T>hJWTnqx2i?@I-B5AvzHC;3#}
zi+oh~rWe(H=tXs3dQshvUR3v|7u5skMfE^>Q9X!Wsvb-}RSzK_)kEn;^)Px-J)B-t
zkDwRTBk4u;D0)#nnqE|op_i)1lFy{akxSL%$*1ZG<Wu!T@~L_f`BXibe5#&8K2=X8
zpQ@*k&!joYWzt;aQZ+aERLw&^RZl0Ms(Hz$>KWuyH6Qs@J(GN@o<%;B<|mh`1;|IW
zAib!bO)sj2=tZ?Ky{Mi;FRJI#i)s;iQ9X}dsum@ms>R4hwK%<~o=-2T7to99h4i9Y
zf?iZh(u-;-dQmM+FI6uhpQ;y=k7^luQ7ua^s+Z7<YB_pQEl)41m(q)B1$t4vj9#i%
zB%i94$Vc^ZdQrWCUQ{d7i)s~mQN5C0RIAd9>Q(fjT8&<+UQIq#uOT1RYw1PxI(kv9
zPA{t0(~D{idQq)OFRHcZMYT4)RINikRc|04)w=YeT8~~->(h(sjr5{=6TPV3OfRYp
z=tZ?5y;N;PK2;l&k7^ToQEf^us?F#{wK=`0wxAc)mh__9ie6M((@WJh<WsdR`KY#|
z7uELkqS}F8R6Ej(YA1S8?MyGKUFb!%E4@_hMn02vCzq-{$fs&g@~PU3e5&>)pQ?Sx
zr)ppFsoIZxs`e+JNe7VoBOS;-liorulMW)6Ne7e5q(jJM(p$-8(xK!s>22gP=`eDC
zq{G=~(%Z?U>K)`$^-l7sI)Z$vjwGL|qsXV~X!5B#hJ31yC7(&hk;|lakxSL_<WqG5
z`Ba@qK2`4~pQ`tePt{4}Q*|==RGmUTlio`%lTIa<s?*4)>V4!>^?vfHI-Pu~&LE$v
z50FpQ2g#@EL*z5*!{jpQOme9@i+rliCZDQv$fxQf<WqGn`Ba@pK2_(FPt`}sXVS;W
zWzq%YQgtEuR9!?qRTq;_)yK)F>J#KsbqV=YT}nPxmyyq;%gJTZ735NNCHYicMLt!Z
zB%i9Q$*1ZX@~Qe1`BZ(He5yV}K9fF6E|We-E>)i=pQ>xgr|LTLsk)wgs=h!zRbM2Z
zsxOgG)tAX<(pSi3(hcNNbtCyy-9$cBH<M4*E#y;mEBRD?m3*qcMm|+vC!a~*AooYQ
zjeREFPA-$aNiLJVMJ|)RO)itZLoSoPOD>bXM=q1TPwtPD|5M31`2P(=jsr0op!(+c
zKmMHKAdH5nzIpz!ISyvu2-P>gH~t}LV^rV#KKO^CO;COF`{EylHbwQ#?}vXl+6>h<
zzd!yFXmeEG`~mn!qAgH;^GD&gME$)P|KIO=G)61b-`n5Up1<!g<XWTp{?7LOosT8g
z2G#fXw(swK9J#irzQ4PDfA{0bwL|s&{q6hvpFplXsxJroayXG(2UK4k_T_OBxsIs5
zT<pu|WOAKQeR<kHg?(pKZt{`KsqDL;`f{-+m($2~MfK%kUoJVxbwl;#VqY$~$aP2c
z<zinhxykiF_2pt;E_ulHMD^ujUoNMU>xJse#lBqflIxA?%f-HY&LGzZ)t9UNeC+$8
za+8l-&Sc*Y)t8ICob1m+`=k1Du`ieW<OZPna<MO$0^|mw`f{-^mxAPOLG|TgUoK~p
z8-(i1#lBn$ksFNa%f-H23X>ax>dVExe9j?vE2=M7`{%MBipotsaw)?8HdJ3O_T+LN
zxnZb&&Yk*lDT+TF)t8HXxfCOJJE|`i`*JBx?haI6F81YeKDj$leYx0|%LU{{p!#yL
zFP96+jYRe3VqZQb$c;kv<!Zkq`_ZV}<Rh0-?8l(`a<wOy(&WaX`f{-^my5`aL-pli
zUoIDuy9?Eqi+#D2AvYe?my3P5lqEL-)t8HXxm-eSBC0PJ`*JBq?rv0HF81Y9p4>gC
zzFh5J%6<|mH~Gk=0{h9RzFh3d<uY<pP<^@BmrF%*_oDi8v0sLLC3GsPFBkiAxt!cI
zR9`Ok<#GkN`%rzk*q2LXa`&V9a<MO$D&(f4`f{-^pDW4DK=tKnzbg9&P`SxRE?2RC
z5Y?B9J-JjP_YkTt7yEL#n%u*vzFh3f<r;D`QT;MI_2qIc{w!2qF81Ye9l6=4zFh3f
zr8>DesJ>k6%jJ4<kD&T;u`iz*<mRIKa<yNR{XA4|@{vm|_VZDFx!99SZE}yI`f{-^
zmpbGgL-plqUoJP0TY&1z#lBqXl3R%C%f-H2>XBQ7>dVExT<VisjOxq9zFcl3_c*FA
z7yI(LiQE&YzFh6!%zg<fH~GkADSKymn3u;ga?WzFCx_+aoc;an`TMUR=j`up&)<C|
zIcI-wd-d6`LY@7c?fE-DNzU2d*Pg%cYI4s0uJ-(W*N}6ThrOrRH$at!{12_rr&0Yq
znC&%UZjC;J>hH;HzcF(g^jTDYFJ}8qnA@Vyq569>+i%L;4t*Zg--p?LGv@Z_T2y~u
zX8X;VJD}@O{r#Bjw_xswu1EFvXSUyxxfA*Vs(%2p{m#rUqH;TsSx)llg8ve#e-N{r
zyd$Ts>|aLp4`!B^_vF=${VS;cA<S~~p4_^#-+<~L$}B(c$*%|dji~-%%yRUe9DB0g
zgz6v8EKl#rvlsi#sQwYma`m2Ed$Zqy>L1B0U+>Ae5BsgC{!z?+C*JFe|0*i~qnYI_
z-+uV7q58)#%hx;d?a%&oRR36J`Fc;j1K7WT>L14}U+>9xAp32o{_)K6^`3lhVZR;K
zKY>}k-jnYj_HUy4Co;>|d-5I3{w-AhBxd<~uMhqZ^leoCWM=t#PtLcpe+Sh+h1u_=
z5A#s;T~z+3GRs-Mx8c8s>Yv6eU+>6w82k58{hZA5^`3l(v;P3q&&4cX@5%Re_8+49
zxtZnbJ^9|j{v%XB53_u|C*M2Se~jv%&MaT=$#(?%Pf-25%<}b~d`GhX6xBb2xew|+
zIgi5s4Asxa?Dyim(fFUE@;{SV&hj0D{{^al7PEZ4Bj2&?zeM%(Gt1X|@*T(iD^$M#
zvwXcL-@Dj<jp`R<maq5ZJD&YFsQ%f^^7Wp4C$Rq()i1;>U+>9xBKz-9{ld)h^`3n1
zX8%2^e-5*Jy(i~;*#Cg)pUdp`;=M`uKcez4!YpU`PR9QU)jy9}zTT1V6!t%(`bC-L
z>pl72%l;QszZkQ8y(izP?0-e|i!;mDd-9#e{x?+rd}jH2PrmoD{~gu8fLXrYlkffP
z{eOX~e<8kny(i!4?DyE?KmUV%34Hl_PtG&g?@3R;B);E^_a4CCi~MBfQmCBe`yl?_
z<n>GA%Xc!fd>>-oho1gL`119hd>>}NFFpN>@#X71`Oaj&A3gmt`119hd}p!WpPqhM
zeEE7$zO&gMKu`Y?eEE7$zH`_gNKd~UzI?qW-$&RVL{GmwzI?qW=eg_;rl)@?zTb=Y
z=HVYgUj7yEC!_M6&wMC({mbyDpx%-1qxgr>)31mxU+>BHG4_Yk)31atU+>9x0sAB9
z>0gd7U+>9xA^Rig>0f~_U+>9x5&NU)=~u>=ulMA;nElc8^sC^@*L(7Poc%HM^smI1
zulMBq1p8y@=~u<~d-2{9{Nu>W|0;Yr%XcaM@#OWZ;mg-M@?FOM1bX^c<IC53@?FmU
zM0)zy;LF#0@?F9HBzpSS;>*{2@?FXPWP1A7;mg;1@?FLL6ngsA@#X71`98`1RC@Z?
z<IC53@?FjTG<y0q@a5}0Ij>=#lb(J}e7_g(J%yi(y!>n7%UQm;$vM|1Cs+H+@$-;(
zu7fX6@2tQ-oxJl6_;U1)9P^TQu1j8i-jUxK<elr0mz#IwmXEx1ee&}1j=at!?|dV9
zIeAA;XOVZliM)KgBd7f2oo^;DXYUjs_cZ$k=ria`XhCxN4e{+g%ltBWHhKL<`1YS;
zeg!Q=UcWKE{pXoCpoPinH^H~RmU$z34tf2i`1aQ^Z$i%{uip&c{(9!kXc6-I&GGHO
zz`O-LkGy^heETmlZ$*oe*Kdh$|5fH<<mA>0UrzFQ4Zk>f{nq$$@{XKdXMa9D{WkdW
z@}9ijV1EHU{kHgW^Pb$cvA>X>emi{mc~5@Z*_WWF-yUC%-jm~->`T(q?|?5)@5%Em
z_ND0Qcf^;g_vHFE`_lCEJK@XMdvbn<{YCWjJLCJEc<){Oi^<Es3%;D?`yPH7^7>uz
z<?9{!zR$iaJ^gO@^7Wp4KVW|eJ^k+Z^7Y<!{14G`^z?h+%h!8v;(vser>EZ&U%uO!
z<@+)7rS$ZB;mg;1^8JK;1$z3u@#X71`F_g&GJ5)b@a5}0Ie*5!B0c@S_<k?m`y9U#
zdHMIlm$Q7oz`vZlet&%VdPlxrvcH0!{s4UWdQZMzv9C-|e;~emy(izV*;k>be+&M0
z)O+&%2LDQW`h)P_M7<~9Z}F?r(;tj4U+>BHJN8%6(;tE_U+>BHd-m1n>EDVkU+>BJ
z2liLf(;tfO_u{=D@vk8-|J(58EZ?8-uO+WP3}3$9k?+s!ucN0w9ACcPlkYF=tJBlJ
z9bdlQlkczWucxPf2flp0C*R-L*Py3=C%$~WC*R-M*QBRE0$;w~ldtbiwdm=Oq$gkR
z$=7$M+Vu2C(UY(D<m|gs9eVns>G{2Q&v&OA$jg5Wc{$71cc;4K^~aKzuXp6@yHh=S
z`s3)y*L(8y-Kjo3{k!PN*L(8y-RVYp`s3-z*L(8y-RUNJ`V;8M*L(8y-RWj}`V;BN
z*L(8y-KhaR{k!SO*L(8y-Kilx{d?%i*L!mI-Kh~h{YmuvUcBeKQ)BY-pG;oP^7Y-R
z33>e~<mKxf`TFkEl%D>*^yKS3`TFkEjGq2fdh+$2e0_InPEUUtJ^6Z1zP>xPpr?Ny
zJ^6Z1zP>xPq^EyBJ^6Z1zP>xPqNhKdo_xJ0U*DZt)6<_pPrlxhv+quA=;=Q|&+o;1
zzB{!gFaHP0%UQm@JGCRP{}6fkdPly#JGG~$|1drIdQZN-J9VI^Ka-w(y(eGaojTIf
zpG8l;-jlEIPMzrK&!#6|@5$G9r_S{B=g^a{_vGulQx|&rkI<8^_vGulQ&)QWbLq*~
zdveZ6z8k7PkDlL)_i~Zzj>>;Nc{$5BH@P0D{-fmO>mB*#A>R|#e~g}dy(iz($@fC_
z7toWh_vD+Gd~Z~LAwBtePrhf6?}O?uq9<SP$u}SQzNr3Udh+$2e9t7`57mF1o_xJ0
z-?PZ~NA;heCtvT$IY0RUsQwaqelOlDKyDx^|E1*REZ<wmIWHq8SNn1uMBaHhd3kzA
zo`cCduOKf+@5pfodFPen<>wvw-Adkh6?wUNM{YyOJ3mQYUfz+{ZRDL-lb4fs<TQ-D
z^BVH<@s6B^lXrfKyqvvrJGp}B)8x)(E{@)T>OVuyULp49qj#eE&+c@$F#8M85vcxi
z<n5os{z7yls{cHB`{%MRfsR7;*OIqigndbLG^)Rjy#4domqN#&`s>NtFUr0&Iu_M`
zfxP`<>@Pycq53b9w|_DFyHL5kL{3ifDMM~Ns{b;1IeSM=Wyw!K^<SYUFYn3g67myK
z{SEZw<~_NUBY!ulzmcB&yeGf%<nKZCH_?-$_vCmf`AMk$W_t4Uo;)j%pN#5np(j`G
z$@MbwQ&9b_^yKS3IaefqFRK44J--w0RU$VPmH%tx<t*RJ$xTD`UnehL@5uKG^7o<o
zZ_tyk_vBld{Qao@HhS{)o_wp2pN{Hprzc<U$@fa~Gf@3E>B-l7@~uk#0aV|2C;56$
zzE_cd5Y_kHNxt5bZ#D7{q58f%$=7>wzMA~QsJ`z`elOm;hTKe4{=PfOS-#hjn}zE8
z?j&FD$oD$(vr&EDo#g91`Bo=C2i5o8Nxt5b@Ac##LG^uilCSsVTZ8;uRNr?e`Fc;j
zHObFI^?i4eulM9zi~M|4-*+eZdQZN!$v=wf`|c!P@5#9i`NvRw-<|wkymte+1*rUe
zcapPw>ylfD>ig~_U+>7b9{EM6zVA-*^`3m|lV6PL`|c!P@5%Q@@{gnXzB|d+d-A=B
z{1d3Y?@sddo_ud6zXa9y-ATUQlWzm^OHqB_o#g91`8FiK4AuADNxt5bb0hN0QGMT?
z{9e4*nA{3f{=PfOS-wrktwi;GcapDn<lB_|DpcQhC;56$zRk!#iR%0ABwz2zw>kOM
zsJ`z`^7Wp4TaaIa>ig~_U+>AcCHbdN{T$5l^`3lNv40xX--B7c-ji=@_RpaDdos({
zdvb2W{#jIiFJ`|N@3qB$4we7j%yO1*JN)NS{e76_>mB*FXTKKJ-<Mgw-ji<!_Ulmn
z{g~zJJ^6NIzaG`!pIN@%lW!;XFQEDdFw56_^6kw2MO6PlX8C$gzFpYAgz6u}EMM=*
zw=4UXQT>CN<?B5;cVqtws(%Qx-;4LU<8MIae<-t@<=X>)BdUKGvwXcH-=6F@q56k2
z%h!AI?ZtjGs(%Ete7z^%-t4!a`bRR$*L(8q!+tBOe-yKPy(izk>|aIok7kyy_vG7;
z{cEWHG0gJyo_zbWe;w67mRY{ulk))fZ=m|eG5fuEZy^3QRQ|^^%UQm+;BQCuPhgg>
zcjP;W{hO%%iOll#o_q(he+$(=iCMnhlkX7rZ=?DrGt1X|^1YS)JE;CC%<}b~e221s
z7u7$NS-#$r?``bgL-kK%maq5ZJB<DNsD4gn`Fc;z!`Xj;>gQtid-2}w_#dM3&&@1n
z`F@1&oQGMi_T~C9d*{=c<>?)He!|{4FS8uIBgaqKJD<TUKkvxzGxpB;nC0djxqZ&w
z`AlYcc}HGfuy;O-Sx(-O)0ga>^E1oGJ97Gpy>kI(IeX`8{5#Ns=$+_z^qZahvzhIU
zV4i?}i|Q9*_U=gLiRgEzeqm<&qnPhTzen}YVYWY-`5yEKRR3IN`(v0Vp+BPfMVRf6
zWuA=wgzBHiY=0c{6!d3QzbLc)yO{4qe?j$&G25TY{3|NA;>>cA&ounsQ2q0n<>VbX
z-N*iSRR02Id3jG>_p{Hj=YJl6^e@DhoA=~4o&6s4^h@B&&wKKl!G2GA`X%w@=sh_;
zz<w`!`layY={<Qq$bN5n`la#Z>OHwW#C{)o`WNBL*L!k)nEk%=^e@KuJMrF3{Qbzw
zzYM;d<vR<1fAace@#X6s`Oap406qOn@a5}0`OaZ~AU*wZ`119hd>>(d5Iz0!`119h
zeCM)1n4bQn`119heCM%0gr0r{eEE7$zVq21N>BeXeEE7$zK^m$jGlf)eEE7$&X2J_
zoSuFqe7_g(Ex<p5y!<c6m$Q5q;vY#~{|bEhdPlyC*dIktzcRjjy(izr?2o3WUj<*j
z-jna+?2n<Re<i+ry(ix%*dI$zzbd|by(ix#?2n_Te-*xby(izL?2o6XUkzWr-jnY#
z_9xKOzZze@-jnlk_9xQQzXsp$#d|C8Pa-e>Yw_hQ-<9|$lh?lvU%uXv?<)4E(9^Gu
zFJJG;_eu7r($l{lU%uXx?`rm^(bKPiFJJG;cMbcT^z>`u%h!AIeTsc9diu5S<?B89
zKFvNiJ^kAF^7Wp4pJAVeo_-yC`Fc;z&$2(Ap8gH^elOm84nHq>`PaplvwWY&KZCq}
zJ$(6kN4{&>=cA`zA78%SlkYnAXVTNZ5nsOElka-=XVKHY317b6lkW@c^V8G68DGBM
zlkbb{3((VVfG=O~$@eAp1?lNG#Fwx4<oh!Fv+3zK!k4f2<opWzLiF?-<NLjMZv%c|
z^73zjFK78~#6O3;ep7t;dPlyS*q=*JzZt%Ky(izz?2FLTZ;mft@5y%y`}64Ox4@UL
z_vE{keNlS)E%D{+J^8-Mz8F3IR`~Muo_t?pU!0zPYkc{7Prk3SKcAj{8+`eCPtI?!
zzkr^8TYSG4?`^}ski7ic;mcXR+wn_~*Kdz6U+>8GP4*?}>36`FulMBp7W-24^gH6q
z*L(7Pn|*0|`knCQ>pl6t!~P<A`knFR>pl6t%l=||`d#ql>pl6t$G!|b{jT`(^`3m+
zXJ3|{em8vidQZ+Du)l<!es_Go7w>(DUyi)|d*I7iz8~S2C$HZVU%uXv@5k&frKjHu
zU%uXx?<edl(9`dYFJJG;_fz(l(bMmPFJJG;_cQht>FM{ym#_Ea`#Jkc^z{4T%h!AI
z{eu1F^z{4V%h!AI{gV9^^z;Yd%h!8y{)&BNdin$L{a(EHHGUQH^1lUN&hovIobw=Z
za<wnls^pyqlb5G=<arf&=ON_f=p8v$Bkz1GdHH!qepi!s9!g$r-jUli<ehILFE8)N
z>ss>8!^q3YJ94^?yz_AK^6`$Gs*`uVoxGgAb3M6l*x!MEi~fezAg6yPzP<05e@APQ
z*B^mz|9fWNt7?(gAIaYS56r$()h4e$ioN|GnSGzCLtcM0d;32z`!00@dHpf$?f=Z|
zdsJQW`eWJK|ApCisCwk}$FaBnE3@xU^~vks#ooT}PB)U1+jw$vl8^6BH<8z$KweJX
zk(2LEH`CLfNKanglb7#K4e06LO;2v#lbi2O4e9CMLr;F*lb`QSjp*r5q9;f1$<cSG
z#`N?j)03z7<mtOp6MFhn=*iW4a`oM*DLwsr>B-l7a`xS+89n`}^!!e|=etvL^75ZX
zUe5CM-Khn6{rkwv*E{m{-Kix#{rl<3*L(8y-KiBl{ps}N>pl7U?$nx|{tSBZ^`3lv
zcWOgV{{edP^`3lvcWO&d|3P~4^`3lvcWOsZ{~>zv^`3lvcWO^h|6zLa^`4x4cj`b-
ze<nS@7w`G*)RDaWXOWk)e0_K7L|%V3dHH%rzP>wkrl&uLo_xJ0U*Da&(9?f}o_xJ0
zU*Da&($k+yPrlxhZ%*>vQ2lxI<m)~8<|5x6)t^sKzTT5>Zt^`){YUA^*L(8KL%t`f
z{}?^_dQZ-$lkbJ<FQDi5;=R1&dZY4RNM6qJJ%d~yRDTh9`Fcmb`N;Q0^%v8VulMA8
zCi#A-{^RuI>pl6NMZQ0({{%hxdQZOj$qzvFm(Y{1_vBlE{6JKHDLwgmPre1o--7Bd
zqbFbQ$@gsXgHZkD^yKS3ITs>77}Z}v&+o;1g~<&;<-d}=oaK8Cxm!{FRpjOC9r>P1
zekiK{Bt7|hPrgOS--hb1rYB$T$@e_+!%+P-^yKS3`4%NV9Myk{o_xJ0-(uu%NA;hk
zCtvT$w>bGbQ2l4<$=7@GJ)iuYsQ$C`<m){-UqF5Ys{b54zZdUaNNyx5|L4ieS-vI6
zjY9R;l9#V{<Xe*bXjFe4J^6Z1zNN^ILG{<uldt#WTble>RR0Bf^7Wp4FCsq<)qjzm
ze7z^%i^<=G>c2!!zTT5>8S>*%{g>&<*L(6UOMU{X{|Y_%dQZ-mke`U^Z=mP*;=OX@
z?ndRmk-VJcTb|rKsQxDM^7W2<FC{+-)!$4{zTT5>1@e<o{Vnw5>pl5iMt%yazm=YR
zy(iy_<nKlGU!^Bs@5#3k`KhS>YxLynJ^5Zvej2L(Iz9P%Prg@>zYo=agPwf7C+EuK
z???5w(er!pUKMiFQThAsBxm_vNp1$J@B5Q{y(8bM<R3uweTR~-_vCvO`3F&b-=pN~
zJ^5B6{}8J0yOeyrC*P~dKaA@8J|$o8$@d!aGf{otspRWD`CdzY7OL-im3+M?-|NWF
zM)iHSlCSsVT%G(JRNwb2zZdUaPwo*^{=PHHS-x}0Is3jSSNn3EN8Z`@MR|Hhp7Y5&
z`@Seg@5u2{^3J|5%FjFUdyKrZ?~8Ktj@%ZIclLczUfz+{Lh{bOFUrX~a#}>*+4n{H
zct=i)$vgW_DQE9IPOb*(J628Ro6sjvec!L_)nb1$x&+nt-O7G#_6^XbsJ`!2_Uo{3
zh%Q6*eW$X21N%nka#Y{<Df@NVH%3>W`o2rqugAU#x)Rm*J<5K4_D#`MsJ`z|_HSh0
z41E&S_x;I!bM~uIx%uuSC;7A>w+7Ys-APW~kyA_ZPoerbnC0a?d9`ByG^)P`v)sHV
zx7O^RLG|}!mY?_J*M|MGsQzBea`c`Y+p>QS)!&<0p5BvZJND0``ui};)q8Sn&weec
zzb~_Vy(i}m?AM|C`!V~Sc&{V=dQ|@VGs{`No$y~k^$%c{uXp6znf;5X{(;Q$^`3mY
zuzv~FKZser-ji=v_AjIQ2Q$mpd-CnZ{uNaJ5N7#$PrlvRZ$R}AWtOk^<lBS&MpXYW
zX8C$gzCGD*LiG=4maq5Z+>8BYRR0KOzZdWI#@~X<|43#z%eN2yR#g8eX8C$YzJ1xh
zis~QDEMM=*w;%i0Q2k?=<?B89_GkY(s(&oAe7z^%0qoyE^^aqgulM9Tko`7P|9EEk
zdQZN$u-}gApTI0%@5y%%`!`Yj6Pe}fJvk3%{}!r$60_fn_lDrVjmrOIW;x6ER{VER
z{Zp9b>mB(HW&bX!e=4(ly(iz>*uRJBpT;a-@5y%<`}a}(oXqm|o_vS1{{Yp`#VlX%
z$@g~lAENrXndR#}`QE|)BUC>RvwXcL-#giVjOw4xEMM=*c?A1UQ2o5jelOk|iT^1o
z|1+57EZ<T1pP~BsnC0so`Hp7)IjVmqvwXcL-!bgJK=sdJmaq5ZJC^;IsD6HC`Fc;j
z<Jf<N>K9;^ulMA87yGYK{esN$^`3mkv;PLwKbu*;-jnYH_TQrVg_z~*JvmQg{~fAd
znAz{edw1i1kIMfXW;x6E9{e9r{d1Y+>mB({V*ewmUxZn{-jnZS_CKNe=P}FId-9#a
z{%2IbD6@RMC*OP7|AOilW0tS?<U5u9uc&@;X8C$gzSG$MhU%ZsEMM=*_dfQ&qxu&x
z%h!8yzMp-Lz4*T`#e5;^_u{?j_<N9-e+hg!%XbF;p5*mQ;>*`N@_m5)Ui9=!;mg;1
z@_mr~-t_cK<IC53@_mT?KJ@f2!k4f2<ohuDed+06j4xmB$#*9E{pjhJ!I!W1<U5P~
z{`B<A;>*{2@}1580DAhD;LF#0a-PHfKzjP+@OS=>9>G6|y!^}K%UQm2@ed}ie<{9v
zy(8aw><^)*Ujbjf-jnZq_J`8bzYJf#-jna6><^=-UlCuv-jnZR><_1>UkP8n-jnYF
z_D9guzZ_q_-jnY__D9mwzXD&r-jnYl_D9jvuZ-{a;ypPpW`8t2{VMo=FW!3`{}}S}
zzY<^0@;#QEb5(M3wJ+D>$U9#}UY_2O=kes7tC5$ZcjR~idFQLi%g;OVJCVHeHRR>y
z9l4!E-uYVc^74+nPA2bs9eFu<M^2}ZcdkxeKHibjspOrnCogC3oJQ^m_BGHY=o&O9
zIsKaW_Led~h2|o!Ukl&<GUlhz+~oCZ<J(`({0y3hynY>g`zx5AMNcQMe*?b#mCVnf
zdCBY7#kaqT`FZpV^7{4g?LW!97R^UqzdpYG)y(VAGs)}Uh;M&A^I7ENb`!pw<nsc4
ze)9S^<IBlAa(a<{0ebok@a5$_dA-EGAU*wt_;T}}++JpXHa-1D`113f{9a*Sh@O69
zd^vhgjvLq)rl;QoU!LBR=SKGD(9>^<FIVr$brbt@>FGDam#_EayqSFwdiu@r{Z72M
z1^+zq@^67JXZdc$FG^m&CBA&UBi~oq7o(@&3SYk7lkaQni__C@jW1vC$@g{k=hM?~
zgD+q2$@dNR7tqshi!WdA$#)z33+d^%!<Vo3<hz}H33~eN@#X71`M$}%Bt88O`119h
zoZn(!ik^N)e7_g(y^UX*y!<=i%UQnf;9o>uzcapky(8au*<VagzYD&6y(i!I*q5QF
z-xXiJ-jnb9?90;A?}jg5@5%QA_LtDp?~X5D@5%Q=_T}j5_rRC0_vHH#`||Ykd*aL2
zd-DC5{iXEud*RF1dvgASeFb{@z485Cy!R>oW#r}G2Vc(e{S3b%dHufl^7W2<KWATw
zo_;@k`Fc;jU$DQNo_>FP`Fc;jU$Vb~p8f!Q`Fc;jU$L)DPk$i3e7z^%ui00jr+*8+
ze7z^%Z`fZ+Pk#`;e7z^%Z`oI+r#~29zTT7bckHjCr#}SW@5OuH<5wdu|6B3pEZ-mS
zuO_cQ6kopHk?)V}uc4=Z8@_zKC*PmgUrSGa7`}YHC*PmhUq?@WIKF(nC*NP#SEr|c
zJHC9qC*NP$Ur$f}4t)7~PrkpguR%}$PJH=#PrkpiuSrjT1ipN|CuiTCYSGglNzd=a
zd%io>CNKX{<mD`1-<|4^*B?z@zTT0q?@l++(;q`mzTT6s?@o2;>5ru+U+>A+cc*&v
z^vBVYulMBZyHkC7`ghTjulMBZyVH&I^vBbaulMBZyVFhd^e51hulMBZyVK3|^e57j
zulMBayHf*t`ghawd-0y{P7TS+{~q#kmap$ljmYayA}?R>$k%tL#`N?j)040F<m<ar
z6MFhn=*ic6^7Y-RDLwsr>B-l7^7Y-R89n`}^yKS3`TFkEoSyzPdh+$2e0_InK~Mia
zdh+$2e0_InNl*WNdh+$2oPBp{MNfY^J--+4`R>%3y!>a7m$Q6*e`-Ts{{iyy^^Saf
zhiXet|3P~4^`3lvk7`Fx{~>zv^`3lvmugQ>|6zLa^`3lvpXxwQe<nTodQZN-Q+1@L
zKZ~Axy(eGat2)uspG{A`-jlEIR-NhT&!Hz@@5$Nst1k5PAED>>;yvH7x{{awT=H_3
zZ#Qzz^T^57zFfPLcb-pPp5BpX5Ax2Bl9!`*<k*wE^JC=Y=N<X=BJaF_yxhDax8CHP
z7m}BkcjVQFyz?URa`KLx`jU5EOkO_TkyAhN&X1Fqvv>NF%ZWZgE*EotbO5Tqgq*$H
z><gd+QT?Sm-Oa<kAbJa`zl^;7)7hVm4np;pleeFjeIax(s=tD~{WI7XMu(vKE6Ll>
z$Nn7jR#bl#dHZLwKNlT}>OV=|{#opcptqs=tI69xkNq%IZfnTNNj^o%4M+8#A}?p}
z$f+3l+fn_e>B-A`@+waL4pjdcdUErg+|DO|C#wG}J^6W0eix7*f$Bd;PmbP`<Avl$
zqWaI%lc)FOS%Um1RDUf!xq45oCCQIQ_1DppulM9!iu@Q<e?2|F6YrHKHx`xu3*_Z2
z-;2nNL-k)IFJJG-_hRyQq53b;ldt#WTZa62RR3jq^7Wp4%aWgf>c2uyzTT7XCFCcf
z`WxuU*L(6UNB(Y9e<MBldQZOP$=`$OZ=xq(@5%R4@{>^g&Gh8!Jvmn(KN;2ELeKBT
zdzX=$g35m@c{$6sBDs4}{a4A$*E{m9M1Cr&{~A5{dQZNWlb?p_zfMoS-jnYY<nKfE
z-=HU7@5#3^`TJ4*ZS>^pJ^5B4KONQg-ATUQlkb(}XQ2ANJIU93@~uk#0aV|2C;56$
z&R3Ct5Y_kH$?wH`)yO@B%HMY<Im`EIau1{WzB|d+JMz7T{7h8ecPIIJPrlcZpM~oC
z?j&FD$@e<)vr&EDo#g91`Bo=C2i5o8Nxt5b@Ac##LG^uilCSsVTZ8;uRNr?e`Fc;j
zHObFI^?i4eulM9!i~M|4-*+d!7w^?3_b4iV-<{+v-#X+TL-l=klCO8<djt6esJ`z`
z^7Wp4>ylrH>ig~_U+>Ac9{EM6zVA-*^`3m|lV6PL`|c!P@5%Q@@{gnXzB|d+d-A=B
z{1d3Y?@sddo_ud6zXa9y-ATUQlXC;|OHqB_o%~+B*O1&YRQ|p@$yvUQ$Sp_peRq<t
zcjVic{0daxcPIIJPrgmauSE5IcapF7<lB_|DpcQhC;56$zRk!#iR%0ABwz2zw>kOM
zsJ`z`^7Wp4TaaIa>ig~_U+>AcCHbdN{T$5l^`4wtv40xX--Frj#e1#spF!onC$pU8
z+XnwxRDUmK`FcmbZP`DE>hH}gU+>Ac9sB1|{e76_>pl6lXTKKJ-<Mgw-ji<!_Ulmn
z{g~zJJ^6NIzaG`!pIN@%lW!;XFQEDdFw56_^6kw2MO6PlX8C$g&Ry8Qgz6u}?Dyim
zuJ|vb@;{ha&hqVs{|c&q2(x^>Bj4`qH=z25GRxO{^6kNXBdUKGvwXcL-=6F@q56k2
z%h!AI?ZtjGs(%Ete7z^%-t4!a`bRR$*L(8q!+tBOe-yKPy(izk>|aIok7kyy_vGA<
z{cEWHG0c81-s_M5Ix7ETndL0sH}IX0W0tFZxo%_cd_1!}y(7=<?43_wmZNv%_$GVj
z6Pe}b9r?Y*-uWbExp_x!Z?ktknOR=mk=HxyoljwwlXv9wE_>%wndRdhIlaf;`7~xZ
zd*^-p0ccKiAUb@fITy3}TbOT0opbNh8^nAE>YQh%-eBfCQRmZl>J4EYfjZ~isdp>$
zNYwd^oq9u=N1@L7cIw^6JQ{UAbEn=g<}s-ASv&Q{GW$E{XZH8?cO8fCT!49JPX4}k
zv3D-WEFbUqJCA4Yd^WS3yyNdZfxUAfW_fwX-+dx`=fcc#^Nzp&-RzyuVV0kF<Zusr
z=X06m=pA`XV((mpS)SgJ&t&$_=P}FGJ5%uGRg_u2a=91Zxfrut?8{{;d*|ZJa`BE_
zrm=TEpII*6k;{GToiAXPi+AL5KYQm3ndRagxlCv8T!L9H-jT};_Rb}l<>DQ=Jiy+$
z6ti5sBcBJ^JC|mbuXi58m)Awi@{!BK_|6wI%f-H2X0mrK!z>r?$YmCL=d#Rl@s3<(
zvv<CPSuWm@%N+L3<(TE-9l1Qh-nl%pT)ZQfx$K=UWtNL~<T8)Fa|LF(ct<|-**jmx
zEMM<DiZ8E<%<_@TWBAUMnB`($E(_Q@U(PHS@5p5#d*>^d<>DQ=EMo6mnOQF0k;`KC
z&Q+M@;vKm>&ffV-X1RDrE>Ey`uF5PI@5p5dd*`c|<>DRrEM@Opjak0lS%xpKtC{5^
zm*x1**D%Y)zFbzYcfOWcF5Z#LO7_mzG0Vj}a#_XRxjM64yd#$<**jm)EEn&{Wi@-}
z8q9L>j$GETcdp4S7w^dBDfZ5_nC0Rf`8>_uxi+(Wz4Hvdyy`H^M=sCeJKw-87yEK~
zj=ghTX1RDrF3+=fuE#7F@5p5>d*}Mha`BE_*0FcKky$R@k;{7a&Nng3#XE9&fxYw1
z%yRLLTwY}F+<;jw-jUBs?427j%hx+E<IAfNvwY<83chn=X1Umx%Lew&O_=549l2~|
z@7$DGF5Z#LCic$FnC0Rfxol?d+?-i1-jT}|_RcMs<>DQ=Y-R7<l36a^k;|*>om(->
z#XItOjlFYgX8C&Ob$ofXVU~|v-oSTm%PbfBa@oe-xgE1yyd#(G?48>)%f&l#d6T_!
z2WGi=M=o!%ckak67w^dBZT8NcnC0RfxxB;Pxihm|yd#%)**kY(mWy}f^B#NWuFUfF
z&inZC>c%V|xv1UQ%fp^L)E?yIU|$YuPjdeL_Wk|UUgZ4U?fbi{y~+7|+xPcY`;hZ@
zw(sw(_9f@<Yv12j?MKev)xN*4+Mk?U?B~d_yiAT9eU|;-|Jr%}-`#(+m-=V>qrb;L
z#n1jd|L+_1d)?J<lI6MUe_#Ku-(^>fcIEwDf4;x!pS!ES)2_U~>Yw*_-PzUOX;<Fg
z_2>Jm{<*vQJMGH*tNwX^*PWgJPCL(k^ym6-$))}|{^;-VPw{v4_uSo|{olUJ{vJF2
z?}xI#NA~yF-M{nM?<4ztWWSFczk%%U@#lVz=zmlG3He?98F%IVmEX?aaX<Rc+}+>z
z->}R69y|WGAp3h{e~;b$d!7A0vfoGc``Gat$o?LG?)QlPH|3v@-_@USSKeRw?ff10
zqyNm^{eAxpyX^0=<9`dXzeo1>*xkR^+3zF!ePq9n9lwF>@A2n;kLZ6>{t5YA{TX-V
z{gvO&-*G?s&)nVL_usI~{vJF2w;=m_WPgv{{d=ALKC<6O_WRiJ8_511fA05){x{{H
zkl)pxaaZ17`R)82_oM&J-Ti(44ZG~`vEzRWvcE_6_t@RP*V*qQ`+a1;j~%~(?C<gC
zevjyXQ~nA0UHut%<^7f4&fjrA`p?|m-}m3J%l;la{<k3edt`r)-Tix={XVkaNA~;J
z@f*ng9)Irli2gU_pOD|xpK({-U-|9)9rvUE%-#Kc{|&qB@3G^53$njQ_V?J`zt`FC
zBl~@1zmFZif$Z<`=YEgqe^dSm`Ca`Pcjf(+-_GB0Kl;zy-QV}$u*?1)JN~yI`+H=6
zkKO%yo&7$t-$(ZQ*zp_4{vLns_lW*C<)4t>`OmoX{72u+e@ia)&+$ipkAI4v{d@ko
ze|P`eIA?igdH(M=`Tzf~U40YT@AmKc{~r9VSnSICZ{rjF^X&Y0+Ijw?d;cA|{{hKf
B<|Y6D

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np1/IJ.A.i8f8.00000.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np1/IJ.A.i8f8.00000.bin
new file mode 100644
index 0000000000000000000000000000000000000000..393a8965292dd1d41dde114b9753b0f859cc8894
GIT binary patch
literal 153688
zcmeIbWwe%cyRMJj-HibVDk!3apnxKZfPjR6gwoyJAQ*rGDkdeNpo9UUG!_=1QYK(`
zckbbMkK;eaVj$1&nqxBG|2xLBzMShiuk*a-!+qR)f4KL0_u3`jfBtLlZS<4f{$r^5
zjv=5jeoT%r-?p><wz>;OCf$`>CiQ1z(%re2N%tU^N%tg|N%ta`Nw?+jZ}UFf`#0T}
zeJ0(HT&nI*K2;AOpQ;CvPt}9Sr|QAvQ}qz?sd^~+R6UG*COw>7COv{&svb!`RgWT{
zsz;MgRsXM-R6Umasd^mwR6U-2s-8eTlb%Q}lb%E_Rr8Zi)sxAm>M7(?^;GhydK&pu
zEkHh13zAROLgX{)>EtqLVRETjgnX)=K|WQ_B%i8hkx$j4<Wsd6`BXide5#&9K9d$F
zmr2hhm#QVmr|Nm+Q}ulEsaleJs+J<3s-?-NY8mpWdI9-NT9#ZUEk`a@FC?F;7m-iZ
z^5j#s0{K*}NIq3BCZDR8kWbZ0<TL4|<T7bxa;bV5`Bc4}e5zI<pQ=}oPt~gAQ?(lT
zRIN@vRj(wUNo$bHq&3N<YAy1qdKLLptxY~v>yS^?y5v)}9{E(gntZC(C!a|hkoz}n
z$Uc)^LoSmxB9}=Ulgp${$Ys)|<TB~C<TB}X<T7b9a{s2y*=N!g<WjXI`BZI1K2=+j
zPt`W$Q?)JmRBcB-RojzK)eht{X-9IY+KGHrJJXA57kW|cN-wJ2=tZ?Vy{Pt}7uBBh
zqS}jIs`e(Is(r{uwJ*J>_M;co{`8_cfL>Gw(u?XKdQlxrFRDZ6rRq@fsXB~&RIjHO
z)#3D_I)YwQZ=e^|8|g*$CVEl5nO;;!(o5A*<WqGt`KaDPFRHiFi|QD9Q5{P!s^jQI
z^)`A@y`5fE@1U2e<H@J$o#dl>7rm(7O)skV(2MH5^rCtny{Jy07uAXMqB@CQs!k@K
zs#C~E^?rI$ok}mN)96KYI=!gQpcmB#=tcEGdQqK8FI8uePt}LWNA+QPQJqaMs&nW?
zbuPWA&Z8IAN9aZMQF>8*j9#ifPCixVlaJ~GdQp9XUQ`#-i|Ui~qWToQs4k)x)y4Fp
zx`bY;E+wBymyt`=<>XU!1^HB6Nj_DdCZDR$kWbZT$*1ab<Wu!|@|koMxlH;3xm10T
ze5$@gK2={PpQ^8rPu11rQ*{mbR9#CxRbM5aNnazEs;`re>N<K+T~9Bn8|X!KBfY3@
zq8HUS=tcESdQp9gUaG!LK2_f#AJup1MRha1sBWPb)vffR`X0TgzE3ZzAJB{HhxAhQ
zBl4;GG5M%|LNBVH(u?Y6^rHGXy{LXcFREYCi|SYOqWU$xRQ-m0s(wp8s^8Iz>i6`b
z`UAbF{zxyXKhcZo&-9}D3%#iRN-tG^BcH0jlaJ~j^rHGFy{P_0FRFjji)y}IC<b*G
z@=@KDUQ~CZm#VvyPt`rhM|DqnQQeDPRQIMA)qUtibzgc>-H%>W_oo-t1L&pdf#g&5
zAo5W?m|j#5p%>Ld=|%N0dQm-`UQ~~u7u6%_MfE6psd_Z|R6T}#RF9<>)#K<z^>}(w
zJ%L_SPox*sljub?KfS1)OfOYWA)iT4C6}tFkx$hE<WsdE`BW`LK2=XApQ?q)r)m-M
zsd@(aOnN4{OnMf%R4qzARf~~N)w9W`>N(_7wK(}yJ(ql{mLQ+1=aJ8(=aWm-lH{XW
zie6Mp(~D{udQrWAUR2A{i)uM~QN55}R4<~Js^!V2Y6bF9tw=Ab7t@RCCG?_NiC$DM
zr5Dx8^rCthy{KMJFIB6MPt_~PN3|-ws8*vF)#~)3dL_N6)}R;Fn)ISti(XW(qL-?*
z$){=^@=>izFRJzEMfGZWQLRrestxExwIRKzUPCXcjp(InWAdrmgnU$+(u?Y~^rCtl
zy{I;$7uDwUqS}I9R9n)EYAbrF+M0Z-wjm$Yw)CRfj$TyT(~D{cdQt62FRGpBMYS`%
zsCJ>3s$I#aYB%yx?M^SMJ?KTXC%vflq8HWP^rG5_UR3+ii)uf5soI}>stzC@)q(V)
zI*49W2h)q{5PDG^N-wIz=tcE<dQlxtFI7j7&!jhyOVu06r|M1QQ}t%@sXCH;s*WO`
zs-wxL>Mi6`^;YtkbPTynI+k3jjw7F{w~<fP+sUWu9pqDWJo!|;lYFY)MLt#UCZ9>~
zA(yK6l8@?r^rAX}UQ{R2i|QnLQJqXLs#EAi^?rI$ok}lNr;$(9>Exq2gI-i0pcmB#
z=|y!Wy{OKj7uAR8MfG8NQJqaMRp*dT)w$%OI*(pdAE6i3N9jfNF?vyboL*Gt(~If?
zdQp9XUaBr6pQ=xikLpwOqPmD)R2S2W>JoZUT}m&i%jiXQIlZW^pqHvE$*1bm<fHlw
zy{JA*FRIVci|X_AqPmJ+R9~PM)feeS^(A_#`ZD=ceT95fSJR8?8hTM(OE0Rg(u?YA
z^rHGYy{N9E7uEIjQgs9QRNY8Es+;IV^$mJaeUn~P-=Y`Qx9LUo9ePoHmtIsi(@WJY
z<WqGk`KZ1}FRJg;i|PmTqWU4dsD4B*svpyf>L>J~`YF9s{fvAj{hVB?enCD}za*ck
zUy)DMugRzCH{?_GTk@&;9r;xKo_r?#fm|m2kzA_&L_Sr2CZDRmkWbZL$*1aX<Wu!`
z@~Qd<`BeRrd?x*iT&n&}KC1b4<v)KE)LqC&bys>(-Hl#Ucc&NCJ?KSsPkK?^i(abk
zO+HokAs^L!=|y!vdQsh<UQ`dD7u5slMfD(hQ9YPmR1cw-s)v$K)x*d~^>BJoJ%V0T
zkE9pXqv%ETXnIjShF(;Ur5DxX=%woM<Wuzo@=-mJUQ|z_7uEdqqIxpDsGdSEs;AP6
z>S^?%T7X`v79^jlg~&(sbb3)OOfRZM=tcDmdQm--UR2Mb7uBNlqFRhzs-8_gRnH+G
z)#CJ`dM>@FmY^5a^XNtOe0otWNiV9U=tZ?Oy;LnjK2<LuAJww-qFRn#R4=3#)r;sw
zwLHD3R-hNviu9s-F}+m1gnX)2A|KUD=|#0Ny{KMBFRGW*i)s~mQN4m*RIAd9YBhSP
zTAh3*y^>t2)*zp%HOZ%HE%K>)75P-HO+HoYkWbaR<WsdC`Am8>xlCH0T&gx8pQ;VX
zr|LE2Q?(KKRBcQ?Rhy7c)u!ZA^;+_o^g42>+KhZuo70PG3wlv)NiV9c=tZ?Py{NXK
z7uB}(qS}sLs<tPesvXEjwIjW#cA^*6&h(<%g<e#<(u-<0dQt68FRDH0rD{*|soINt
zRD08lY9D%0?MpAJ{pdxtKfS09pcmDF^rAY5UaAfzpQ=O1M|CK@s1BnS)$8d+bvV7K
zj-VIS8|X##MtV`biC(JSOg>ddl8@>rdQlxsFRHiDi|VcPqB@3NRL9bb>Nt8)y^UU~
z-cCMM?;s!5@${m4C%vfNMK7v%(~Igo^rCt%y{O(tFRByhrRqfTsXB>#R43Dm>J)lW
zy`NrGr_zh+G<s2;PA{r6=tcDbda3##`Ba@rKB}|mMfD+iQGJ+RRA<wR>KuAeol7sO
z^XNtO5qhcmDEUnK7`aq^oP4UzC!eYd$fxQP<WqGa`BZ(9e5yW0K2;Zy&!mgVWzr?&
zQgtc$R9!|sRhN@b)fMDZbtU;!eVTl#K0`iLpCzA3pCgy5&y$bpDtb|UfnHQ!q!-nf
z=tcEqdQp9aUQ}1pi|QJBsk)YYs=i7-s;|+D>g)8Px{h8{*VBvY26|E5NH40J=tcDn
zda3#*`BZ(2d{p127u9#@MfF{JQQb^0s$1wqbt}E7zDF;r@6$`w56GwLhvcLB5xuB>
zOfRaR(2MG)^rHG1y{LXpFREYAi|Uv3QuQnHsrohfsD48)s^8L!>UZ>_`aQj<{y;CP
zKhlfpPxPYtGrd&(g?y_1N<ON;(TnQu^rHF)y{P_4FRFjhi|XI>qMC0v{_|2n-GzLr
z?n*vYcOxIw-RVVj4|-AElU`K!q8HV@=|y!PdQsh%UR3v^m#X`dPt^m+NA*B@Q9X!W
zR1c;X)kEk-^-y|IJ&ayd52qK^Bj}~-k>oS!QRGtfX!5Cg4Ea<&mVBxnM?O`LC!eY(
zkWbYU$*1Z`<TGi0a+&mGa;bU>`BXiXe5#&CK2-~lPt}6tQ?(HJR6U)1sum`nNsEw6
z)icOP^-OwEJ&Rsci_(i~F?vxwn_g7Up%>NS^rCt$y;LnhK2^^nAJy~eMYSZosFtD^
z)zb8$T83U!FQ6CIvh<=_j$W!>NIq3BA|KWA^rBjUUQ{d6i|WPnqIwCvs8*sE)l2C`
zwKBa_y^MUSUQRx$Rp>?a3VKnkN-wI_=tZ?Uy{KMEFRC@@MYSfqRINomRj(o+)!Ou;
zT8Ca#>(YyAJ$g~SnqE}v(~D{YdQojiFIBH0pQ??>N3}7%s5YS&)u!~KdM&-EUPmvg
z&FDq7IlZX1pqHvG$){>7@=<L~FRE?mMYS!xsJ5dQ)%NtF+JRnFJJO44Cwi&cnS82t
zAs^MQ^rG60UR1l&i)s&gQSC`Ds=eq%wKu(}_Mw-meaUCie&kZMKlxN0Kt5Fml26q^
z<WqGp`BWW3K2?X3Pt{@MGwJo@{!NFo&!i*BWzrkSWzrkTWzw6-Wzw6;Wzv!4GU+IC
znRGO{f74soXVP2ArRo^+sXCT?s*WR{s<)9()!WIZ>K)`$bv*f0y_0+<y^CBXy_;OB
z-a|fB?<JqA_mNN43FK3CBKcIEL_Sp~lTXzt<TL60<TB}0a;Z9ve5y_-pQ<y+r|JXb
zQ}sdesXCK<s?H*xst=LRqz{wJq_fGT>KyW^I+uK^&Lf|ykC0E*N6Dw^W8_oyaq_7;
zpL`}=KrWL$K`vDnl26qq$*1a5<WqGK`BYs@K2?{HPt~R5Q*{~nOuC$0CS5@;RacTv
z)u+j)>NDh1^;z<%`W*RGeV%-(t|FhRFObiqFOtioFOf^tm&vE<E96skHThIsLq1j4
zl26rF$*1aT<Wu!^@|koUxlFpAT&iv$pQ;<lr|Ks1srm-_RDF|ts=h@&Ro^C`s_&4`
zr0<gZH{HxWlWrlGNw<>Ar0<c-r0<i<q#uyWq#u&Yq#u#Xq#u*}H|2jSIUoOPAoA^t
z(Hzw`$N%_qzWp#-p!(+dv-$RC-xAd~zdQZ`Xe(6T{2urRqODPV^LyeSgtkHT&F_VO
zFxnQ?H@`RjA!s{P-~2xKhobFKee;LmcR+pKjQ`(rJshJW>ht#b+VlAyL9P?3?{l{A
zb3T$>XH?(kZQtj86uB;_zR%sh&;4j}T~U3XzkQ$oG32_T`f{)@hhxcgNA=}lUmnMi
z>w)Ua#lC!wC)X3zm#6&`*!M!^CLg(+$i6qKFBf}qIf+~!R9`Ok<&vLVUsPW%_T_Ri
zxqhg=T<pu`6mtDheYx0|%c<lBp!#yLFPGEE4Mg?jVqY!=$PGgE<zinx1<4IY_2p{6
z5c?sh+~gyd)7cM2_2ptOKl{SyFjQYI_T^H9-1VrwT<pu`406L!eYx0|%bDaxp!#yL
zFPF2(-GJ)L#lBpMlDiSrmy3P56eD*NsxKG&@;RH_&8WUy?VrPbBq}%g$fY>@QK-IL
z?8)U^a-&iG{M+>9QUd=LR9`Ok<#HamTTy+v*q6)s<i?=-a<MO$lH|ss`f{-^mr~@$
zq55*MFPGBfZbS9uVqZRG$lZ?W%hmn`?C(J3CLg(!Wj`L(m#aOwlp}X1sxKG&a=DP)
zU8ufX?91gMa(AQpa<MO$^5pJ8_2pt;E)~e#i|Wh8zFaDjyARcui+#CVOl|_IFBkjr
zxrE$AR9~+4E3u!1%1u6Uxs?56R9`Ok<Wia36jWa>_T_RJx%*Llx!5ny{&I9GsxKG&
za;ZXY8mccB`*OL0+;mi5F81Y8mD~(eUoQ6LQjOdLsJ>k6%cnZI2T^^w+P{+hOjK_2
zkxLEsvrv7x*po|5au1>Ua<MO$TI3!^_2pt;E?1G8jp~=*rZ1P;_;XNwx!9LW9ddI~
zeYx0|OI>pFP<^@BmrFfzkD&T;u`i#i$vukd%hi5;_K%@*laE{)uzwuYmy12QG$c14
z)t8HXxm-hT0je)o`*LYS?g><1F81ZpnA}2CUoQ6L(uCZTsJ>k6%cUu~r%-*l*q6(-
z<QAd&a<MO;>&Pue_2p{68T%!u+~gydrR<&MVO}1~$T`cwo*b5wbN2b$^ZBnJ=j?O0
z=W}04&e`W}uPOVdQD>jCJ)iS4<eYuJ_I$q2l5_UC+VlB7N6uLu_MT_o993HI-*iM*
zq58Wp+iS_(34H<8-<8>ZE9TDVi>Ur?%=TL|cR^o5^>=5s--fv>`ZB7&2ebXQ%-zse
zQ2jlb?YCp@j;==a_hPo+p1B9Q2G!r2*?tG+p6FUse;;Q1y_jD`<+d-goaECR|20&9
zKV~_3M^1g%zmDqf&nz$R$*V8>b*TOU%yRRd-1@O!kLn-DEI;qbuRr?@sQy9Ba`c`Y
z2e99W>L1K3Pw&ZdAp1?I{vphA^`2Y@v3~>AKa^R%-jnlS_HUy4hcWw}cy9>)Td4dG
zXO^>khvL7D>L0-@U+>6w82fin{Ue#>>pl5i&;DIh|0rhpdQZN?*>6Vmk7kyy_vAZ*
z{T5XJ7-so;Prf&>--_xV%Pe2-$@fO~@1gp~G0WF`gYj=d-$(V2XO^$`<a{&x4^aIR
zn0;RcGmk_+MCE@Xvz+BS3jZTi|0HJldPlya*?)}c=Vz9$_vCvE`%h5)lbPk~J^9|s
z{!>){6lVE)PrhT=e}?Lx$}C^+$#*RK&r$u;nC0s|`Ho}%1*%_wS-#$r?``bAMD+_Y
z4@SKw=iBkWLiGzV`@VSZ4*aiC`Jc`#XZeoD{|41B%q(B;$oEe6-=g|OnC0s|`QF9;
zJ5>J+X8C$gzIU_#9@RgSS-#$r?>+2)K=sdJmaq5ZdoTMRQT?LK^7Wp4?_>WHs$Yy*
zzTT7X1ol6p`e!rC*L!lF$o>~p{~TuD7w=8N{}q*gab`KocQXEOsQ$Uk^7W2<r?CGW
z)i1#;U+>BHe)fN$`sXpr*L(7v%KlGO|9ocodQZO7*#Cv<mt>Z&_vAaB{okm5DQ5Y4
zPrftQ`~QHdUm9P&-jnYG?04DaKmUz>8GQMAPtFgr-<6*J1^B)%-kXWP8~Mr1Wl=fH
zcNYHc<n_zp%Xc!fd>>-ogP#6{`119hd>>}NCq4a(@a5}0`Oap)7d`#*`119heCM#=
zo1T6JeEE7$zH`~{Lr=dVzI?qW-+Ao!rKf)}zI?qW-$&T*M^FC}eEE7$&X2O+pPqgt
zeBT%EJ%)b(dHG+8KN*$p<ID$=*RPB}1@(@6=i?tlPyaG}`Fc;j3)mk_Pycd!`Fc;j
zPq06Po_-a4`Fc;j3)vq^PyY&h`Fc;jPqIIZo_<w)`Fc;jPq9Coo_;la`Fc;ji`XAQ
zPro|8e7z^<#q5uyr++2B?~C`A;2%X^{x$IBEZ?R0N0ZmDi7#L8$afk0W9aGE!k4f2
z<hz{xvGnw>!k4f2<hz3XarE?S<IC53@?FXPczXJE@a5}0`99751bX^)@#X71`98z`
zM0)!5@a5}0`9913BzpQ+<IC53a(<3|etP=#@qJ&s_dNc|<mKN0U(WJ9g`9Ika&oo5
z9RF1E&e!0}(>p8hPb2T#2w#rgkz)b!&W*{-&pYxfNZz>#dAWH<ZiUD@HzhAG@5t+P
z^3K<imy>toRG7T;b>!va9XS;t@7#>MoV{}fxmE0&qc5PZp=XlQZ-H;`MdsJhv&ieW
z#JB$v^E$LBdHq)S_FraRj}{}Z-x}ZkE6f|vv&rkX!MDGfc_VrbdHuHd_SZ0PLW`5v
zZ-;MxE%O`bx#acR<J*6g`AxJ0dHoLf_TOSYkDS~(;>$@sZ{wd&UcVE*oV+8aci5Mt
zr{5W0Ufz?}yX;HR)9->WH}A=9GyBr?^t<BA&wKLQ!oCbW{ciYj^qw5IvcG_yes_F%
zdQYD3u`f$czX!fty(icA*_WfI-xFWH-jnkO>@TFJ-wWUO#Csp&UqoL1z47HN-;eOi
zlh^NqFJJG-_ha@I=;`;xm#_Ea`w9Ds^z{4T%h!8b@IOT_rl;Q@U%uYkivJmU2|fJ*
z`10MtEZ@(WE78**h%aC7$@dHPm(tT8gfCz3$@fe4mFejZ#+R@6<op%;%joG3!S{Xf
z-q-k-lb8Qcd^yYa8~iHd^@rih*E{n4mi-m<^smR4ulMBp9s8>E^oQfi*L(8)o_#fX
z`XlhSpx%@35BSyT>ED3A74@Ecf5g9%p8k#a^7Wp4e_~&Qp8iev^7Wp4e`a5kp8n1F
z^7Wpae_>yXp8iOD-xu%wihmV(`H#YvvwVNUuT5TmG`@VjBj4ZI*P*9>3%-24C*MEV
z*QKX_E53ZaC*MEW*Q2LD24BA3lkZ>bucoIz7GJ*JlkeZ`>(kR8hc936$=B~r4e06L
zMo+%plds>M8q(9hot}KXCuhGqT|-a*4tl;X-t)UtBl7YePhQUQ^}ADJ^7?m@m#=r^
z>vyLn^z`qdCtvT$*Y8eE>FM81Prlxhuiu@nrKf)nJ^6Z1zJ7PQj-LL#^yKS3`TE_d
z89n{`=*ic6^7Xq@b9(v{=*ic6^7Xq@3wrt!>B-l7a`wAZOM3c~==r{Q&+ksH$jg5+
zc{$71?@q1B>rWvsU+>7*?@n##>EBOJzTT6s-<{gh)1OLDzTT6s-<{gg)1O99zTT6s
z-<{gi)1OXHzTT6s-<>+p)1N_4zTT6s-<>+r(|>@Te7z@MzdLoJr~e>5`Fc;zes}6j
zPk$yo-xu%s-Kh(C`OhLRXZiZwsVjN?hsev<JM#6rQ#X4057U#c_vGt$r|$IhXVa6f
z_vGt$rylh5=g^a{_vGt$r=Ilm=hBm}_vGt$r(X2*=h2g|_vGt$r{47RAE75-@5$Hi
zPJQU<KT1!&-jj2F@_kYL$LRUKc<*F#{ZRQoPF~LPJ%wC<RDV8s`Fcmbr;;Cl>Mx)t
zU+>BHH1Y#c{U_+j*L(6UKz<OazmT4My(iy-<OierPtudG_vBlM{18<CDSGnto_tRy
zKNQtpL{GlnlW$@2!%+Rj^yKS3ITs;+J*vNip6`qI&LB4&mH$%ma+dE1a?Z=h$<@AG
zZy@iyoV+}}BhMSjJFg%wNAJk-Ci2cJ$;;0>^1GS5^V8(z<{i0>B=7tTd3kw9UZco6
zKTBRt-jUO2^3KnZmydVkbPIXs=gG_2JGYWM6J15_EavmkF{u6v<m?q?UlJXQ>c6<n
z-D2!Zq2o~fm&n^cn|*2YHdOy*^7hYRUk1G$)qjP&{o?E|K<_~HSChAYF8i|RcvOE4
zdHW^UmqYJF_1BWOe;)e_(YsLnSIOJIi2dED++HImC;5~ocMq!nI(a#JM@|*U-;3(6
zqbD!#$*Usy`%wM$^yKC}xm`?t0;<1(p8UKgze~tZMD;h)lcV?KSc&{3RDTmad3sNt
zmy(~1>c2rxuHKVtW%5%{{Ws~!*L!lljQstm{#*2XPrP?Ixv8l9-zG0-`Bot}4b^{#
zynMYQ-z&&ZNA=&OCtvT$w<`G=sQzYp^7Wp4tC4>I)!#x-zTT5>b@C6Q`djJA*L(84
zlKf0m-|tTH^`3ldke`L>``t;t-ji=l@(-c<es_|u_vBoQ{KKfe-<^D4ymuA3*{J;e
z?j&dV)+RRx)%UxTe7z&zI^^e~`hItkulM9zm;5|b-|tTH^`3m|k$(i$_q&sPy(izR
z$v=wf``t;t-ji>A@{ghVes_|u_vG7v{Nt#;-<{;^J^3~yKOfciyOVsqC+BO(FF^JE
z?&SO8y+-7oK;`duCppWvF}a1PzTchX>mB(vA^#+*?{_EpdQZMh$v=ha``t;t-jnaO
z<QJj(es_|u_vCvW`NgQd-<{;^J^3~xzXa9yyOVsqC*S7em!kT9capF7<lBP$GF0F1
zPV)7hoLiD#j_Ui}$@j&3t;nrF<?nYVIm@>-xs|BC-<{;^9r?B)|1_%acPIIJPrhx*
zKZEM~-ATUQlW#ln&!YN%capF7<lCP7bEv-Go#g91`F0@xJgT3MS-#$rZ%6j4Q2kw)
z<?B89c4Gems=q6<e7z^<&g@@A^><_Teeqrw{FhMq@6Ie|`F6#B8P(r|S-#$pZ#VX@
zp!$0<%h!AI?aqERs=pVre7z^%9_-hk`g=3W*L(8q$$l-WzYnu~y(iyZ>|aIo_hpu^
z_vG7~{cEWHe$4Xqo_zbTe;w7|pIN@%lXGA8>rnjzn0;To*AIU^D*pqS<t*R+_#06D
zgP7&(9r+GmzY*0xm|4EwlkY(Gn^65jnC0s|`3_?L2C9E3vwXcL-@)wPMD-72maq5Z
zJB0mPsQ%&1^7Wp4hq8Yg)jxt+zTT7XF!t}D`bRR$*L!llp8dP1{!z@nFWwuDzZsSP
z(ads|?+E-YsQxj`^7W2<Z(zR_)jyV5zTT7XjqKk;^^aqgulMA86Z`j3{o|SC>pl72
z%>DyZ{{&|FdQZM1*?)-YpU5m<@5y%*`;SollbGe}J^7Ai|1qkcpIN@%lk+X?KSA|R
zX7+vY-mUnbqVhk5S<dqP4Bz=wX1Usz>*ws9Ph*y+cjWm6d*=eoa`cWIzhv)RkXe4-
zk>6MBoeMF`%{y}Yn!WSs%<}S%yuM-YT$ou--jUO{?464+%f~x%`i{Nx8O(C_&iD9Z
z&@<7o=soBU+xTZO+Z)GxFZv^@UzFLqw=v&`{)FlmW43=g^91x~RR3&d`*$!;M1Mi`
z&tbMdo_P}bE2>|d+5Vl(lhNN${d1Y^-^Dxy{T<aW!EFC-=KIk<Q2q0m?N4R?6P4Tf
z%yN>?H2l9%{gTXb@{XLQv;P~_FU2e`@5yTh`+U3p=L3*_X?(ePPi_ye--Vuj8GQM9
zPks-w-<6*J1^9CGo*ZYg-;JJrS$uhVPoA^b?@mv@9KKw=C)bDA??F%hLVWppPtFgs
z-;<vHMfkoa-kXiT7kT-Y$CtBw=iu*6UcUmqe7z&zx$O6$r(Y3YzTT7XJofw2)4v#B
zzTT7XBkcF1r+*2)e7z^%N7?UBPrnkre7z^%$Jif0PybSU`Fc;jkF!6Jo_=L~`Fc;j
z^VuInPyaG}`Fc;z3)mk_Pycd!-xu#afqw{j`B%Z0vwRogA4*>T3Viu`N4`(8Ka8G!
zRebq+PrgsFKb)R^HGKJcPri%TA3;yQI=+0pC*Q^FkEEx6CBA&UC*LLPkD{kv17E)0
zlkZaYN7K`<i7#L8$#)t1W9aGE!k4f2<h-2yvGnw>!uNgg-U|HV$jiSrzMSQ|690Je
z`gQQ->mB(%&He;>`gQT;>pl5C!~R5i`t|VT>pl5C%l;&K`d8!2*L(7Pj(vW5`t|YU
z>pl5C&;De3`VH{q>pl6dVt)!f{f7AR^`3lRV1Ft-{cG^$>peNY$o@2X`i<~?U%dAc
zegX3GZ;UTz`M!)_ki32qeEE7uzOS$^L{GmdzI?qW-_`6-r>B1{zI?qW-!<$D)6>5W
zU%uXx?^^an=;=4Zm#_Ea`zrf0=;=4dm#_Ea`x^T*>FKw?m#_Ea`#Srx=;^n_m#_Ea
zypDZQdit&KeP6t{9={lQ`M1WGvwSz;pG{uB4ZeK6Bj1he&!MN^7GJ*JlkX<>#p&s{
z!<Vo3<ogEubLr`~$Ct17<ohQ367=*t;LF#0@_mc_dGz!<;>*{2@_n2A`SkQV;mg;1
z@_mPWNqYL7@#X71Ils%k6g~Ye_`WaR+l*hDy!^Z3%UQl#@XL_b?}jg5@5py6`wQsl
zcgL5n_vHH?`?B=(d*I90d-8pseK~siJ@Mu1J^6mX{z7{Cz3}DhJ^6mf{vvw%z47Ji
zJ^6mbzC1nsKKSzWo_s%MUxA)}Uwrv`PtKpPuSie7AHMI4_ddnHn7sV^<I7pTpW$CZ
zUVi|-e7z&z&)HX^r#}#1zTT7X7wj*kr#}c^zTT7Xm+ULk(;tj4U+>BHEB2Ss(;tE_
zU+>BHYxbAZ(;td2U+>BH8}?P`=?}w~ulMBpE&D6z>0gg8U+>BJJN8xS=?};EeevG+
z_|?eEe+0gq<y)Pc^9|(WYG1Bbl6St5yga=l&l=>NZz3;8@5r$xdFPwS%g;OVt3}><
zBzd`cM{ZY<cOFGvUfz*cZSu~e$;-(*a;ih#`4;l>@s6D8l6St9yqvvLkK7OJ$Dlu=
zf1y{C(;tg(?<eNJ(fZ`|$Kl)mnc44E4an=?#@_xf%zme8NM8ST_V#~e_WRT|<n`}h
zZ~r%Dze_bDuRor>{ok4W9@Ut<{+;aY|H15cs3zp~?_zKNPiDVAH6^cqH+%bjce<9G
z-0mSKC;9l@={oZI_mY>BcjV-Er)Ko@@1rL#@5#&WPR;4*PoO6^@5#;YPA%x^PoyV5
z@5#^aPA%!_PogJB@5#~cPOa$aPo^hN@5$5ePOa(bPoXDQ@5$BgPHpJv-%n4z-jlQ6
zo!ZjVpGwd7#Cv{sYDZrF)5yzNzJ7OVPhNjIdHH%rzJ7P=Ku>=LJ^6Z1zJ7P=NKgL(
zdh+$2eEsg!iJtz0^yKS3`TE_dGd=y8^yKS3`TE_d3qAc=^yKS3`TE_dD?R;(=*ic6
z^7Xq@H+uRH)040F<m`8+?)3C$)AN1tp5L8%keB})@^Y51-<^7r*PlyXzTT0q-<^8V
z)1OCAzTT6s-<^8X(|?4Xe7z@MzdQAzr~fED`Fc;j`N{W1^&g`rU+>BHWb*w`{m1Fa
z*L(6kg?xWhe?C3=dQZNmk{^KTFQ6x1@5%Wz@&i%*C+PXUc&`AtL8$x}l9#i53z8d*
z>OV<dzTS~<A@V~|{io>3*L(6ko%~Q#e-S<TdQZNE$qz&I7t@ok_vBlI{Pn2*5_<CW
zo_x<BKOEIxN>9Gtlkb`2N1*!4=*ic6@;!_E4XFNddh+$2oQsmb5!GKo&-cZ9#mL=+
z%6}z!Im`EKayO&;Pm`CgcjS8x`H`spGxX%^J^2<VKMK`<mY#gQC*O0)k4E*MqbFbQ
z$+ragTTuPy>B-l7@;#6It*HJgdh+$2e9tF82GxIoo_xJ0-;(6VqWUk=ldt#WT#EcS
zRR1M<zAxS@P3|^S{x6f4vwX{tyB*bkg}i*dBi{?i-+}6{rYB$T$+s-|@u>b9dh+$2
ze9Mu)6V+c!Prlxh?}g;=LiJyzCtvT$_agFlqx!GWldt#WTb}$qsQ&Bp<m)~8Rv>>b
zs=tn&e7z^<isbJ@_1Dw$eevGK<R+l<-#}i@^1X!IL{xtxdHH%rzLm&NLiIP%ldt#W
zdnx(JsQw%D<m)~8Rwh3M)qj(oe7z^%%gEo4>c2%#zTT7X<>aTL`ft;dulM9zh5R&B
z{~dbr^`3mMAU_?|f0v$oy(j0Y<Y%Dzo9X$!c&{3{2T=L@-AT^!txoPiRNwDU^7W2<
zuOvSc)%QD;e7z^%8sul8`hJg+ulM9zll()dzTc(f>pl6_BL6U|@AoPBdQZMrk)Ms~
z`<+U@-ji=_@^esqzgNlEd-APAelDu-cPsgNPtJA8&qMY7e&ze(y?W#xLFMmvMmfv(
zQF6|HUzDqTxjshT+3$<;^o~3qC-3a{MLBv$j`PVo`+ZS<-jUw|^3Hx=l$&?t_5^un
zzc0$mJMvmc-r4Vqa`KLxo+R(=_eJ@5M@~<XclJA_oV~M%+|{VxvFbBlhb~6-{eESy
z0sCg?5>(&sR`wgRZ;mcS_5EID{~Go!&}FE;->K|3V&4*7j_Uh;%6?<^t<V*yzTc(n
zH(}ozU5V=ZJ<5Jl_HEFoQGLHd*}s;3Tl5)J-|tWM+p&KZm7Cw4<RqW=<eo$I{q7_u
z@5reG`R7sne9ZFlp1eA;Uxn)L!YnuM$*mLn7f}6OndRp_`E_RhBC5X|vmCuA$1dz&
zLiKlNmZ$gR*_HjvsQw<za`m2EyRm--)!&m@zTT5_clN7M{k@odPrTOye+?@Cy_w}K
z-=6quQT=_G<?9{!_G14ks=qI@e7z^%-t1pP_4i|zulMBJhyClQ{{GDJ^`3nDvR{Yl
zAHXbM@5#3x`}L^)fz0yto_zbW-+<~L#4KO$$#($zji~;?%<}b~oCmVsgz6u{?EB)q
zLHKW=@;{VW&hj0M|0b$`7_)r6Bi|wH-$L~dXO^$`<U5r8+o=8#%<}b~e21}r2h~54
zS-#$r@Ad58MfHzjmaq5ZJDmMyRR3sZ`Fc;jBiL_2^^akeulMA81N*J0{;|yR^`4w>
zWd9zje;l*#i}!BAe;<|q@yv3T@6Grhp!z2;%hx;d9m)PfRR2U~`Fc;jqu76h>Yv0c
zU+>9xH2aTH{rt@G^`3lhVgCuLe=@Uty(iyW*?)@apTaC(@5y%z`_EAQQ<>%KJ^7Ah
z|2e9E8nb-8C+BhOzd-d1F#EoE?>77|QTZ2Sma}|s$Nvh|FT^Zg@5uKK_Ftp=r!&jf
zd-5I6{u@-kFtdEUC*M2Se~aoDVV1A=<a-zU?@;|SnC0s|`QFX`dsP2SX8C$gzW1>I
z0o6Z?S-#$r@4f7QMD>d@%h!8yzK{J+sD3eK-xu#q!2cPQ|JlrPmhVLTUr_yXnC0so
z`A%a0E2>|dS-#$r?_~DBq59`C%h!AIox=WiRKEnXe7z^%``Q12>Yv9fU+>9xD*HcC
z{qvdS>pl5SWB(VbUy@nA-jnZi_J5=LrI_XGJvq-{pKmw*^HR*EQQsHuJ%GOpdHI*Y
zm$Q5y#NU;?{ss8*^^SaJvfquKep!6^dQZNy*zZnHzZ|}Ny(iy?*zZA4|3ZBEdQZL&
zv)_}R{zdrm^`3lZv)_xJetCTPdQZM{*zZkGzXHB|y(izf?DwIkUlCuv-jnk@_WRP)
zzZiep_vjJ){m9Gz5_~z!_fh=)$?I3bm#=r^`xyHJ=;>dIFJJG;_i^?I($lYuFJJG;
zcRu@r=;>dEFJJG;cLDo@>FHmNFJJG;_X+lg(9^GiFJJG;cOm;j>FHmAFJJG;_eu7L
z(bKPr@B89CIX}hzaC-XH@O@vrw+R0T^75~aFK784NzVC7a&omV*Q3Zg*B~!X@5u9L
z^3FBM%h5Y>Jchh;E%Ng7j{J@#?|c<`xp_x!$B}ogO<rE!k=OC$o$HX7lXv8F0(s}U
z<mKZXIh{z}xgL2rd*>u_i`id|E<v9|^OMuBk8f`&^YiG*<n<fi+h4}K3O$9qenWiw
z%b8z5PbIH^4Zi&q%rBy+k=Jj8Z+|88OK1V|`i=4JKh69yT9CYc6MXy6Fu#HpBCp>R
z-~O}AtI^ZR>tBm+e+_eCa&o&4UrzE_i(iDielvVIc}GsKvOj~Kesg?zc~4%iu|JcZ
zehYlLc~5Syvp<WTeoK7$c~5@p*cYXz-wI!j-jm~c_QmMwx5k&J_vE>O{n_;N+u+O9
zdve{#{v3MxZSm#nJvnb;U!0zPJAB_0@4bP4E_wO4$CtBw-^4FLUcUpre7z&zx7eRY
zProC+e7z^%x7nXhPrnnse7z^%ci5Mtr{5W0zTT7XyX;HR)9->WU+>9xGyBr?^t<BA
z*L(8a!oCbW{cia3^`3mUvcG_yes_HNdQZ;pu`f$czX!hWi}&8gFGpVfJ@Mr%-w*IF
zB(L8KU%uXv?}zL!qNm>*U%uXx??>#*)6?&RFJJG;_ha@I=;`;xm#_Ea`w9Ds^z{4T
z%h!AI{gnO1^z{4V%h!AI{fzx3^z;Yd%h!AI{hWOzdin$L<?B5;f5HAzdisO#eP6uy
zC4Ob{@*j*ZXZe1Ge;IlGA^7t3j(opne>pw<q4@Iko_xPyUxl9jFnsxXPrl!>zk;6r
z_4xAjo_xP!UzMKzaD4fCPrl!?uSQRQ1ipN|C*L2~SEr|c1HOE{C*L30UrA5@Mtu2t
zPtHHFuR%}$CVbx)@BNHllf3+I#+S2vf5ERsUVkLMe7z&zU)f(pPk$7?e7z^%-`Llt
zr#~8BzTT7X@9gW))4v5@zTT7XAMESW)4vs8zTT7XpX}?=(;tH`U+>BHFZNf{(;tg3
zU+>BHZ}#=+>5s#gulMBacc%vQ^lzi*`{F&nJ2fOP|J%vSS-yUEx`w>|9pvTf9r^m*
zsS!Q>@$}^DJ^A|GsWCnMJL$>Sd-C<WQxkgnchQrt_vGt$r>6Au@1`eT@5$HiPS?`Y
zzlWZDy(eG4J6%Ul|6Y3X^`3nF?$nH){(bc1>peO9-KjY}{R#AZU%cmcrxxVpKasqg
z<?DB+mgMy(k(aM`<m-2*R`m2I)040F<m-2**7WqJ(37wC<m-2*HuUuGrzc<U$=B~r
zZRzPxr6*tS$=B~r?da)GqbFbQ$=B~r?dj=Hrzc<U$=B~r9q8%LpeJAN$=UBt9qH*m
zK+pHZdwzH7L|*<6l9#i5{r=RMy#7q`^7W2<{SMWIp8hO)^7Wp4{T|hop8iAh<m)~8
z`dz9UJ^hF2$=7@G_4`zJdit~J$=7@G^*dD$dirzd$=7@G^?OxMdirze$=7@G^}AIs
zdiwL|$=7>w_WM<Ddisyh^L_E2-?93Tm;a;W<t*R6<eVQPCs+G&?ML4Eaq{x?jy(I5
zcb-pPj^2^u0P@ZY$ji?=@*7Cr`3drJ^N!pGk#}B5US8gj*I@F_Pm-6DcjPpLyz^7!
z<>MVW4JGfqh`gM=GmKn*bTPS;nTw#;qxwt8**k^(8R&3Sf9W=NPi225Is(;SM&ABu
z?9W1PK=qfCw_kvLQS?Sse+7B_1=$xvZ$kA~lDA)o{n_ZvsQ%OB?Vry69CReA{|tHi
zh1nNJN1^)9lDB^@`_ZV}o+BqG`II1c3#$J-c{zJWPUn%o71duwPhQ@W*ZJhfp!zS+
zlbiSCR+9W!RR2YK^7EejN|7Ij>c2!!j^2}FY4W$B`Y+Ryr}yMphWzcQ{wwt4>OHw$
zK>iL?e>FY%dQZ+}$&W|%*U<Al@m@J{ccSuNOJ2_My^!2psQ#<u<?9{!UPS(GRR1-4
z^7Wp4%agwc)qkCye7z^%3gqua_1DppulM9zk^FtA{(5@y^`3k$CO-ky-#|~k-jnYo
z<R_x~8|lf{d-APBeiEv`iJpADC+ADaPe%3Mpy&JIy~^aKpz?o{yqx8G8M*sW{kO==
z*E{mPocvT&|808m^`3mIke`O?ze7*H-jnYY<fo(h@6wa6_vBlZ{0vloGd=lwPrlX2
zKY;4{-ATUQlW%qM52E^hcapF7<a;IgnW(<so#g91IoBXR3)T0#lkbc7YLa^hmA~Je
z<SgG><Q_)#{q7`R@5uKm^0QHWzdOm-d-APKeh#YdcPIIJPrh}?&qek9?j&FD$+s@~
zd8oeMo#g91`PL)<2&(UQC;56$zE_if6xH{;lYG4=-}>YqL-qacBwz2zxdHjdQGLHV
z`M!9sA-Vae{Qd4EXZc=3ZUL(AcPIIJN4|~7KY{A|-ATUQlW$}43sHT)JIU93@@+!?
zNmSqOPV)7he4CPg3f1?!lYG4=-)qS)LiPRbBwz2z_d4>6QGLHV$=7@GZAN|xs_%Cv
z`Fc;z&B-rC_5JST`{KP8<d&iG_q&sv<=c|na#Y{%PV)7Rd|Q!Uf$IC+Nxt5bZ)@@^
zQGLHV$=7@GZA1QPRNwDT^7Wp4+me3<)%UxTe7z^%cI2N$_5JQ7U+>AcJ^ANQeZM=&
z*L(8qK>m4DKOeJvy(j06>{p@syD<B{c&`)w3#j~eWtOviJLA8I>hH!ZU+>7b3;UN)
z{oR@6>pl5)W&bj&zX!8?y(iyp>|a6k_hgo@_vG81{c2QyFJ}3APrg0auR-<qW|pt_
z<lB?|T2y}@X8C$gzP;GLit6vnEMM=*xi|aQQ2qUweP6uS2mf_c{`)h_S-ySo*P;3c
zFw56F^6kfdJ*s~ovwXcL-~Q}3p!x?f%h!AI9l(Ags(&!Ee7z^%f$TS-`iC&f*L(6E
z#QqIb|4?T6dQZNC*}sYEAI2<S@5y%v`?pa2!<pslJvk3$|2C?B1hemp_lDuWgUbI%
zW;x6EU3}-GnB{6;uAA9AAI&UJ@5pltd*@@A<>(zbZe{O$EVKN)Bft09J0Hg^H}A;p
zefG}BGt0|6^7??i^9jsy@{XK7Wbb?;vwXZGr;pe>pTsO@?|h7ZJ(?dKj^47(d@{57
z5zM!u&ZlhCyMcKO>U`=py&IXwqRyvn)4Pdz9O_(Po8HaLx1r7jx9N>!z8!Tgv`udm
z^Bt)3>D%;1Gml4|3vbiAliBB7gxTlobG-}S`3&Z5Ir)6=X779^vwXbcbH0bY^I6Pt
z@{Z5@UiQvKndRjjpZk66or^Kc%{xB-3GAKEW|p6K<S>!F^Eu3N^o~3xv3D-cEKl#q
zXEJ-|bD8DpohkV8D#0vYx!jNMd>*r0?8{{;d*}0+<>DQ=Ok?j{l36a^k;`=U&ZU^;
z;vKonVDDU-SuWm@%LDA4%P`BuJ92rDz4Haka`BE_X0mrK%Pbe~$Y&ON=W@*Q_0B{1
z^16^&K5}^&-}xeDx!9M>Z1&FOndRagxy)hjT!C3G-jT~(_RbZV<>DQ=%wz9-F|%B}
zBbP_mJ72;q7w^dBQTEQ2nC0Rfxje?+`BG-Nct<{uvv;n{EMM=;$CuY-%<_@T0(|Go
zndM?%E>Ey`uEH!A@5p5#d*>^d<>DQ=Jjvd<DzjX?BbTSxJ6B_ti+AL*h`n=lX1RDr
zE{oYaU&$;N@5p5dd*>R=a`BFQma=!Q$t+**EW?*qEoS-1WjVg{Rm^g+FP9bUooh48
z#XE9Y$=<mRvs}C*m#5h~*JYNAcjWR6d*^!0a`BE_o@MWRHM3m2BbVpcJJ)BHi+AMm
zJbUK`%yRLLd{(h{ZpbWO@4SF7uWOj)BbOKPof|RB#lBo#V(;9TSuWm@%ggMYn=s48
zJ92r2y>nA$xp+q|tJynW%Pbe~$Yl+C=j)i|;vKoHW$)aKSuWm@%d702n={MBJMwvr
zy>km@`FiJde0jBGmXBQ4;XAitmWzG4tY`1snprO1k;?}5&TW|G;vKncWbfRTSuWm@
z%O>{D?U?1_9l5;0-nl)qT)ZQfH`zOPV3vz_<nk7K=Z?&B@s51nX7AjIS-#$R2VY*D
zndKvwck!LOFw4chTsE_J?#e6|@5p5fd*^P<a`BE_wz7Bb&MX)2$mKou&OMmr;vKoX
z&)&Hwvs}C*mk-!G_hOcdcjWRRd*|NFa`BFQK4S0OhgrVf`50ebeVOGW7quUIdDxSO
z+Mk>p?8`wNK+flH-{-FmB<FLt?{ilNk@I=m_j#*>$@!e^`<&Gw<b1yNeZJ~Yaz0o4
zK3{bhIl0*X&;Kt7N0<MPezR=*nrUw@o6Fhr%kAeD<&n*ApPSD`&23Jp_o9D4o6qw6
z=LuxrukF7Fsm~=fm;FC)+kehJ7j<Vn&(yoAxt;xcv-fxWzNB(W&1IkWj-U6=em<$3
zQgb`|_h#?!_<c#`l$y&v?;Styo&9_=amuuh{=V$J|I0hKpGTBOHvfNl_&m1N|G#kZ
zccuOw^J=!YecpNXT%vy`n$L3HKHvY9=Mv=|&Ht}FhwSg%{(Btd9nEK-`}Uvv|H^ZT
z@{Z>JSDr)mcW(bZj`EJ?v(J6|&;5VpxkPzK^ZzT)A^SVG{~kwqNAua|zWwL^zw%sC
zd8g)b`tQ!(&z<)u^*N^IvOIUpWoJL1oy{qyzdzgC@p}>Fmec1M{X5ZoPJdUnmwi9}
zc>=x%|EAgZar^H{UOkuS--+hsp6&g2Ip>r^lv^~P)8CctZU24B>*o^X9nI(UzbE_m
za`(N8@{Z=SymFUUUO&$$?`S@+|2^5im%Hy{D(}=>PWfc-=MLA@=a`zy^4u|(o&9`v
zHm98a{%mi@??sebPM>G=??m%C{ax8!_Wk(h3HToTn`Ym~?Y}2^^<1KVCz_Xgw)fxV
zoKp@_Zqa;Be^<7*{r4%apG%Z?G@sZ1p6uVt-S;ZWJDSh(%3WT0{XC<*qxro4_hkQG
z?!J$yyi;>I<&(XiJ6uzrV`?tTbH`kE_Vd}<oO1g6v%MX^7g26GeV)<36V2!JcV&Co
z_v4=@;Ct|IntdO)|DNR4bBX?)XkPBw-hY>KPB}!mMe{lRUD@9D->1BOE>Ygmd|v;1
zvVSjk->WF^Xg<p;cX{RY^NjM2=JWdBll^<S`#z@fPR-?%PxgN9a7}%VsktoA9dp^)
z&u3?I%IWXV_ICVUM7ibkc}D+EG@sMomF;EUkAI$k@4>%m_I=#`dy-erCHi-wdAVnM
z|6R^G<q+i-&FA!YWqaFypYr;-M0rQ^dHwIn{=M9NucEx8`7E#8<(1dZGs-)f&+C6r
z_V4BH`<Ti*HJ4L9+55S}HT5~B=CV9@%w=akpPkJqr@uej+wpr5<(AXu8T~uad`^E?
zwwHZB{&@nv2mhwo_i_90NnSmd=--Lv<(}>RcRA;jLzG)IpVQx!?QQ>k%IoJ6<sHrE
z^}i?k_j32Wit>);v%GSbS6)BQDDP-Kum3&Szn8o3V=C{|Tu%99@8=HJ)aRI*%ktbY
zm!185b~dM+{{C!l$L~dyTTY*6^zTITIsIMPUiSU?=Lz^8{F`Rq$L+r-dG%bPe<zxk
zd$#xA<(yLvQEt(EPJdUnxBd4iub)elcQl{Z|DNpM%iZ@X$~&6R^2%LadHp=2yrcQN
z{`X}6Uhck+sk~EjIpveRpF3PrpJQq+%X7zEcJ}kx*_?9v`?I|rzZX$%IenhdzZ1>p
z^mk=@+4tk0C*XVVZ<>7{xBs5x)pLpdooHU}+1`Jbb51!#xkd9i{axAK_TQ(xelAho
z(R^P2d$NBoci*ch?`S^DD|dP2_4ADKj^^|F-;@1&x%)n*@=nd=lu!14?r_cY95d~s
z{Id7{FSp!&9#J0I{Qu?Q^Vn8%n^WpNe@8aIV@^Bk`J~=W&1HG+nB&fVKB=5ib36O@
zX7BI#eM#k%n#(@#9Y61#{d`h6rRH|_@6F!d@%xg>DK(dU-aCHYJNx;ha!SqZ?BAQc
TzvK5M6Q@l3==06qlgIx9Bi4}9

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np1/IJ.b.i4f4.00000.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np1/IJ.b.i4f4.00000.bin
new file mode 100644
index 0000000000000000000000000000000000000000..4418372510ebcded6a92c63d785ce41b6422443a
GIT binary patch
literal 4064
zcmeIw!3_Wq3_#Heds)r6#&9SO7I1lz=J(K(yb}4^?#ZmVy)Eb9cJv724;Wy80R|Xg
QfB^;=V1NMz82D*m0Spf8{r~^~

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np1/IJ.b.i4f8.00000.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np1/IJ.b.i4f8.00000.bin
new file mode 100644
index 0000000000000000000000000000000000000000..c4253966bbae69ff1aaed18d89af203c1d15e798
GIT binary patch
literal 8064
zcmeIyu?+wa5Cu@8v6cNdQ5r$yC|JSMd=k~=-^(dZ-Fc#yxV@Rrhbu>mr!<E(0X@(I
rJ+KEH-~b0WzyS_$fCC)h00%h00S<70103K02ROh14sd`2|2Z%LbAY0t

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np1/IJ.b.i8f4.00000.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np1/IJ.b.i8f4.00000.bin
new file mode 100644
index 0000000000000000000000000000000000000000..4418372510ebcded6a92c63d785ce41b6422443a
GIT binary patch
literal 4064
zcmeIw!3_Wq3_#Heds)r6#&9SO7I1lz=J(K(yb}4^?#ZmVy)Eb9cJv724;Wy80R|Xg
QfB^;=V1NMz82D*m0Spf8{r~^~

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np1/IJ.b.i8f8.00000.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np1/IJ.b.i8f8.00000.bin
new file mode 100644
index 0000000000000000000000000000000000000000..c4253966bbae69ff1aaed18d89af203c1d15e798
GIT binary patch
literal 8064
zcmeIyu?+wa5Cu@8v6cNdQ5r$yC|JSMd=k~=-^(dZ-Fc#yxV@Rrhbu>mr!<E(0X@(I
rJ+KEH-~b0WzyS_$fCC)h00%h00S<70103K02ROh14sd`2|2Z%LbAY0t

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np1/IJ.x0.i4f4.00000.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np1/IJ.x0.i4f4.00000.bin
new file mode 100644
index 0000000000000000000000000000000000000000..fc1708b9d18cf505d11a14073809318dca2a24d8
GIT binary patch
literal 4064
zcmeIup%nli2t`pjy8oPvK|qQV7%t@ze!8*x&g~?3e{W+3N`L?X0t5&UAV7cs0RjXF
Gd?QfN3<Agi

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np1/IJ.x0.i4f8.00000.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np1/IJ.x0.i4f8.00000.bin
new file mode 100644
index 0000000000000000000000000000000000000000..fa5d27e46b15723d63fc7cd30f5fc6e467854bea
GIT binary patch
literal 8064
zcmeIup%nli2t`pj7Wbc$F$jpk87}1!e!8*x&g~?3e}7{JN`L?X0t5&UAV7cs0RjXF
Y5FkK+009C72oNAZfB*pk1PDBV0>*#>%m4rY

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np1/IJ.x0.i8f4.00000.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np1/IJ.x0.i8f4.00000.bin
new file mode 100644
index 0000000000000000000000000000000000000000..fc1708b9d18cf505d11a14073809318dca2a24d8
GIT binary patch
literal 4064
zcmeIup%nli2t`pjy8oPvK|qQV7%t@ze!8*x&g~?3e{W+3N`L?X0t5&UAV7cs0RjXF
Gd?QfN3<Agi

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np1/IJ.x0.i8f8.00000.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np1/IJ.x0.i8f8.00000.bin
new file mode 100644
index 0000000000000000000000000000000000000000..fa5d27e46b15723d63fc7cd30f5fc6e467854bea
GIT binary patch
literal 8064
zcmeIup%nli2t`pj7Wbc$F$jpk87}1!e!8*x&g~?3e}7{JN`L?X0t5&UAV7cs0RjXF
Y5FkK+009C72oNAZfB*pk1PDBV0>*#>%m4rY

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.A.i4f4.00000.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.A.i4f4.00000.bin
new file mode 100644
index 0000000000000000000000000000000000000000..c613d67b1be075b651c779b20bccf6d03f92e872
GIT binary patch
literal 19288
zcmeI1Wsuib5=9f@25}c4Lfl;k;_gBe;x5D;h=;g)fDm_Ag2dg4C&b--zwDlqd0p)O
z^O~(p4dKhA>eTPjx94@wy!)!QYR4U?`M>cSzMqfRT!`;DGd2IaX~NQ2K7ai0KgVhO
zci7`18fizZ5yv*-ZjDSptr1tNF%k6|6H~7-3H2J2Qg383YBeUOUSkUCHQH0J(Sdp+
zQ&Ouj74;fZQ?D@%^%~PsZ)7@ZHKwOtV+QIqW~5%jcr`LJwHmWfuQ4n28naQaF+24d
zb5PIdh?mg`FQYSF#+-OH=Axc4H(tg(co|*rGUmmrF(37e`SCIqz{^+=FJmFR8Vgg;
zSOhO)QM`=B@G=(1Yh(#(HI}4aV=3x2mZn}~8R|8brJk`IUdHlx87tsrtcX`*CF&U~
z<7KRZm(hfm(G{;oH|iOy;$^Icm$5ot#u|7v)})@X7GB2Mcp2;9Wvq+W$a>UjtWUkh
z2Gnb8NWI2J)N5=^J!2ERj7{+}Hp9!<9IwU})HAlk%h(DpqdQ*4)_66xp`NiVUdDEK
z8QbG!?0{FJ2lb4eco{q5W$c8Pu`^yHyHKmKEA<+?QLnK(^%{FnudyffjJ@zO_QuQD
z2QOn^yc+va&)6R?;{d#jUU(S?;?+2add9(c8HeCy9Ez857+#ITsb?I4mvJOs#!+|~
zN8>ee47D1^Qm@gQdW}BRYxJdF<2dRW$Kz$3fR}M1UdBmyHBP3UaSC3>sdyRv@G?%r
zt8qH@j5F{u&cw?&3oqkryc*|F&o~z^<2<~K^YJn+z-#0}YBesRUgKiwH7=oE<5KE1
zE~B1tIbOyUco|pXW%S3ZF@So;K)j5r@G=JBWn7I{;~MH2*WzVdhnI0ZUd9c0HEyJy
zaT8v~&3GBN;APy3*T`+uYTQn}#vRma+)2I0UDRvbO+Dityo`JCGVa66xF4^^1JpAf
z#LIXHFJmxX#>03uhEUHKikC4AFJm}f#v^z&9;Ke~7+%KXco|RNWju-3$Wzp6JWajE
zGt_H5OTET()N4FXJ>vzuj2H1TUc$?G8L!4G)H7bi%XkehV+3Bt>v%QZpq}w2UdCH^
z8E@ldyn|QcUFsR{;bpv!moXAA;{&|^=0pD7$Vb!~`IuTGpHOS$Q)-QTMy<x@)N6b}
zy~dZ+YkWn$k*}%M_=b9oZ>iV#j(UynsW<WiwHiNCukjQ08b4F7@eB1vex+99H|jNh
zr(WX^>NP0;`TuuJz;~vit+j&*VdkR8<vSis1hW)v&-gGg%v!WPlfZ27FYsLd^Q=i>
z_M$yc&+{gOIf{<Co;f*m1a-{z>?xoVsAGP6bZ7WCILEU+w*$;sbnM`{Q^H)JjvYLA
zDwrG8v4dw%4fB9Hc9;g;1;*!>agK96cUqXY=-9z?r-S)G9XojL^e{iDV+YTk0Tuvt
z>@XvGL70S@&T+2iE(AYQQ^yXTyD<DhT^&1k?jrCjb#?6E*^9z&)YY-WV(9kNeg`w+
zf9ArwT)b$kKRvVIT`mD?@6%rM(Giv`+WXWuC!JuaqP<Uhz00Lx8V+`j_vviU_CA*>
zIx=ccNAOOUEjqI5&p5+-U9M>FHg<BBce^~Oz2Df&`&|KMWDn;?hMnUbuL$bMuszQ4
zo>wZ`yY2|~Imf$RxoGb@c5{~Zy$Yzk^VrQhZ-Uv_!?}@b=Xm#BK^?ia$2s1Ax1zoO
z*v&a+U{z3?f!NJi=3q5Yn}gWREUXTl*~7V!b?2-BQ?zTI8Ckc-Icq|DJay#VpK;Dw
z&;d^!nYYhbYr~Xy>d3x*>p&NFm<rDfnhi5&F4isD-07J)GqGOL=FVO-XCBrs+C126
z?##jlMVkeC&B2DSAak7)`S)yduo0*u|MqykIoP=9j(lSuXPARcK-~#qCuf<1O+nom
zVy`CjX0RB0I5*ydbGpLjpf+!@n{&Fs7NCx|V4ri$!InkGTd=PQ%)wSgn}gWR9CU}J
z*~7W<9-Lzqwgz>)1$&%h7Pcum-hzG3F$>!k9dE&(ah6%wuIP9V{)}1J9#&uv=f-<*
z&JHk7yXKkk7VL3O59orYHgB<;b9%zOcxv+&yE$t|m=8}K@4>#Epotyk$1{Uw&&-*N
zor^YidS=c{>{7Iuu-D9)hh2*{5B8cnv#?vyX2D)_usf{IT<1joJ=+}Y0cvv)yLi4i
z*b~(82JCZ&IoPY{cn9`5%N*=ov^j{q%)vge4tqE^-h*?@!M>n2Z?T(m%)x%3HgB<;
zbIig1ppLg-pR>%t0Yx|Qjor*aFW8VhoZA)L$2n%<z@oeHjoqBn0}cYUIf&hy(-RH`
zwK<60oMjdc0d>3w`^>_juo-(eH{L@J^kJ|H8Bxbuu*W%vLld4l-a-$wbB=(ncxv+&
zyE*Gf=!U0`_h8>q(48Gt#WRCu&&-*Nql-2ddS=c{98<Kpv)9a-hhvL2clMe)v(UR}
zvtX||=mXm`*Ex}Y&o&2rL2V9V7tc2b$AQ`$#6He22gidt-hqA2G6yFV9q++Db8sT;
z#2(I#_uw3Ja1yA^LG0!nb8s@K%|Yzu9CL6AsLes_<}7n?DyZW<*k=y<!S3wg+;|Vp
zF$<@GI^Kdk&M^z87aecGKIfQ)Gm16`v758Z!kM6s_u$W%g|lEE_Hb^z2j`p(TagiU
z4~X5Ia}IRJQ}=|}%{k}7)_Ce2A$D`td9V$h+FZtN=c9YE!?t*4(CnGHzHmX&=0eZR
znTZRFHWT*t2J>)H(dN$HK42CuF4~Ot26J!;9LikhME*V799#-&a}c|DzB#xI)aD@e
zafUg#9MtBZH`wPab8tn`@gD3m2Uo&T?BU#a56&?M{XrdX!5-(Bg8@ayTd>bL=3rpa
z<{)-+mN~cz)bSqt8FMfQ`ml#{<2^XXEL;t0a}c{Z$1Gd}>UazGImawqTeLZd-JE3>
zt^>6>h~3P>^>8A4I5*ydb8dhG$cQ@Lf<4Z;5qjaN<1N_doSWc4JaxPU`<!(%9E7Ki
z_h8>G(2pGs#xsLv&&-*NTZ=XqdS=c{+*Y)iu-D9)hue$p&DUOYXBO@#x({D_&B2{;
z7IU4`7d+py`@>yDNB-^c`~h%x(dI4oamGNn2h`>uc5;?ExEIv%9_%v*_rdw>(VuU;
z2j`fB`$26EVmIfQg9ktzZ^1t2n1ct4HV3hrv&_Lmpf(4wn>iQ^m#~L(<2^XXEIbTq
z^A@`~$1Ds1b-V@poMRS-79DTFK4+PQVMWJ#@Mp}zaJZ5^oEz`KIgh}p?V4wrx7f`&
zk3v5@wRwx(obwo*hNm`fv756Vhtu)Y@gD4Z0tT_e8F*&UY?wK7@nq5FPS4DliKmJ-
z6ZV=p^YC=h=D}WbXBM6*+Kk$34xWYUnd_X$zh|3+=Rh6#x5x9%!ShAO8?etA=HP{*
z%|YzsEOYQ8sLes_We#3~TiC<7{lQtzF$XUfJ%DfQ<{WeI3aAG{?B<-I@G7X|E!gL*
zVenef@gD3O4kO@B_Hb^z2j`fD*FkL#Vz;4av+xF}%|Yzu9JBBysLes_<}9=D7O3Mr
z*k=~rhWpsVx$z#H^A23qu6bs>1$&(HE)2p`$6N4cobw)Bji)wmv758rhimZE@gD3O
z34__;T0Apo_RO5Q_@HQWr)TEO#D_(jJA2KXdHASk^I)&JGYcOVZ5He`2cN)j<~qk5
zc)n+wgHMY#2eFIin}g3l9dE#&afUhgyy$ob_BqQOd{K0~2Y<#Kd<jpmhjZgSIL91(
z1?qSU_Bh8Jd|k9Th~1oH4!!}kIf&hyWe&atb-V}r%)xi?EPFUN-h*?@!uOz#w_uNR
z%)$>v59J%XImayg2<l-FyE)4&`~>RZ5W9^;{|qm&hjZgSIOi95h>WP?E!g9nUtutw
zI^KeP&iM@<##5WO*li^GcNl`FHkYy6ALtS6Fcj|twAuI&%!OYwVcoo$2fyY`&#ajP
zzh+I(ta<-_&7_|9{x&l_GqUbk-nrk%xxVLl-+sO8nCqF|wO{W!W_z~x>^HJ*k9Rzh
zna+rud#?BEH}b9Tx!$ec$hJM6>%IE*PGbkp_D=nJpRt4Y`3W<f5t;T}@6&H&S>JQL
zOTUq0dpy^B^cxwr$FsddzmZ{kyuUA*>5Ry)=f1{$`i<P`d+rG8ej~H?c<$@e{YGBx
z@$5IK`yC0f!*|SklRBws;(xgh8Aap2_5O)kHm9}fwcnw&&d$zhn>i|1{*8h${ddXk
z<NwWX>Ca`qPfO2h>Cd(8@y}%}`&(!AmfmSgf39thQCVo|->|iRF1wSlRd4Oz&+|ri
zX7+oI?q|k?*S5!~w~_rV##Vhy-1q3t%zn?&{mhu~+V*J6q`4Xs*=p&TZJBJ#WLqXj
zWgz|*Eqza|{d3v-99#9){{7<b{da$#wmtru+3auF+JCET&e*EA_V3r0$-ic6bbsUQ
c-beQ{t?AX~{}Z**{SLMHf49Fi&S;zYAEBA4c>n+a

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.A.i4f4.00001.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.A.i4f4.00001.bin
new file mode 100644
index 0000000000000000000000000000000000000000..3d291d4e7e95b420cb5e499095ec8c979262ffcd
GIT binary patch
literal 19288
zcmeI1WzZGW7KTAFuv;+^Y_VGm>~2u8yD>1Z6$87)R&2#iz`*VT4D1$L5xswI-{%?j
zn(;fcmv{W;V}`l+IP=U|d%gSYcg?ro%{X(~w;TUohlbB@Cmr92&vu>0uX{{B{_}5T
z|8MQ{wR?Wg-&r^E4|<LKlU^hLqW63L&ALWA=c&-1UX4lU*O-)kBOU0~n2dgn$?4aa
zf_{xD={M4mUX7{f*O;1qjcMrDn3jGc)6uIjJ^dOp(62Eg{TegTZ)9eAHD;k-V^;b#
zW}{zYcKVIXK`)~dTE?7c8FQg!%#BuK9{L&cqGim7meCn4V}7(6UFc_YMax(KEn`8n
zjD^r@EKEOR5wwg&(J~f8%UB$(MmPF3mY`o_N%}RGqF-Za`i(3@FJoD>jOEZWmPgB2
z0j<W0^fOjM%UBsLV->WFRncm6r=PJJTE^;V8Ec?rtcg~m2mOq-&@$FW%UB03V_mcw
z>(Q^VKK&XS(66x}{Tdt5Z)9V78JnPGY>Jk#8Cu5XXf?K=pRpxc##U$<Tcc%cgI1#_
z{fu5{8QY>|Y=@SyJz9<4^fPuq%h(YuV<)tXozZISLchkY^lR)!zsBzLYwSV4kv-{U
z?1h%GH(JI%Xc_yW)!2`I#{Os-2cTsfh?a2>T8%#RGY&?}I0P-@P_&H0&}#IhpK&-^
z#t~>4N1|mMg;t{<{TfHpuW=0h8pqPFaUA_dj;EJ#0$Rq2Xc;G=Wt@ywqd)zOQ_wO_
zMawu1E#q{w8UyHOoPm~cCR)Z>Xc=dt)i{TK#<^%2=b>eskCt%(T8#_o*SLs&jf?5m
zxP*R<OX)W<kY2`RXc?EIWn6)laV1)ftLSH3jh1l@TE?|#8P}oJ7(_qgdbEri&@ygB
z%eV=x#?ACIZb8eq6)od7w2a%)Y7C}d;|}^Y?xbJiF8Vd@rr*dt^fK;6%eW6M<9@V^
z2heIfNI&Btw2X(*GKQdK3`MIkjDE%=Xc>>9WjuzK@i<zI;q)_}K+AX%E#oP)jHl6R
zJVU?6v-E2`N597N^lQ98zmXT|WxRxz@iJP*D`*+7qSbhfe#Yx)8E>Fvj6lm6iB@A2
z{fsx!GTuVVcpEL_9kd#w>1Vu)mhm21#`|a)AE4FvkbWZ{(QD*mdX0QSuaQsb{hrTQ
z*Z7=%jW6ie_>z8&ujn^2hF*=Y>DTy%evNPG*Z7WpBj3}j@dN!DKhm%96a5-L({E%f
zy&AvJuQ85(jbG{4_>F!e{_f##9sWi!GrGU8xVG=_9qs7N0@n8Zy`w$rS;5-AzjsW+
zdN#1OKPmO>;JKdVIUQgQ=vda_>v@wwC$J7*&zv0Q1ncnj>?vR_unzwzspkfL^!3b+
zFb_;u)-i|YP6hLVb<E(oQ^R~<9W!|LG|(BWV}@y|=LdcC^~~v@3(SnC>zKoHr-!a!
z9W!|D46p!L#|)l5BP<BkF~dyM3xPiRdgj6~2Yx?KGJYL%c<v%FmcDh&;JJ&!FZ8Wr
z2G3p$#?iNq85XDhm7W>#KFx%8*$w6?YwuItY<QPTl-m1rzxnVkmn^mS>0Wc<T`pB>
z@6)~B<<g)}<kNG#&t;$s`&@gcF^}har^|x1_Zsu);k_;g*4}N*q?dQQJXm|bF_-td
z0_YnV*26nq5f)|y*O6iO>Ek`GRBG=!X4A*JUKy;t@0d+5?|T)n_ReEA?|fCzH*&3q
zci$blF^6mKKIYTM`(F*Lz5kd^A2YBzSet>EO)qn>23VVen9VG#3HnCX_2>c1FvAr5
zChIz~?mm6if+^9gBk%6hXKm<+W*wP#pI+<0RA|<befO;kQ`0wt=FYsCi}hed=5TE;
z)XkikSijU}Lfy=nhYd<?9^7m0%)*AHHVf`G2OEJtk$=xM2OC3od|gNW-RJq{V3Sgt
zgP2DTbFe8`n}e81FLSUNSet{G%N%SD`o??E!yIe@J($C_If(i6F$Y_Mb-V@l>0=JI
zDz!O?+4M38TZ6SZh}q1+HlT032R+O}PgsvRT*q5*pFU=xSE=JIxKAImux+X1E%+V1
z%))l1j`!eq%)<7dZ@dRRdc(%d(3zaLHg7SXK0CntXx8Q}X47X!=z?Z#-eNYrc7m>G
z*6|+Pw=*n2-wc{N^JXq~fi0NBwYgI_b7o@KQkw~NGiM%lE46uWuemb|yO-K5xYr!)
z0s2J#J=YxU2|e+3Z4P1{&o>8qfpxqA_vv8{_Aa$Kh?(><2m64vIf%K;!M>nxyazqZ
z!G6%2Ib55!m`@*bus>MGTX3H~=HP%*$6IipUgqGyQpbDnJLcdZ&^O+L9%i8r?7|$b
z%|Xnkk6Abvtj$5prjJ=T1gy<L%%+!FI25eoJ-E*-90vNvd(fjV?8ywPkQ3MO7Tl-L
z;jk*2b-V@l>2m~hN3%9>F`HgT!fI&N@gCfF6s%6)44OOhW-j`{e$3(8T&SBlGjVjO
z&7HcLGY`j<+B~?|+?j=AOKle1YYvVBeIoy!YYvWwKKQye2QiQ5n}ZX;I^KZ$^e_h}
zmO9>n`}8sgCzU$hgWoX+CxgE69`rB={h=>&xHbndpFZZ`6tFf2F`GW-;8d_S2Qiyo
z=HN82j`!d`b8tH78}C66voHYqF^B7T3+~g$ESyp5cnj{+$1I##YI6{?>17tq0_%7W
ze#b1F4f@7=(Bm99o*A|#C$7y~%%{(}unn4Zyao5^a~||Wvo>!rn_lNbFEs0T5AM4F
zwxw?d&7FBO7Z*Z*=5TE;)XkikxTw_TPTkCzhl@*X?%Zqc%)%w5Hlyw}2bY3Ak$=xM
z2LoXMzOKzd%;Wjy;4-i_2QiNx=HPO$HU}}2UgqEmu#WfOK67v-=o{}r4|8x8oWmTh
z<1M&PA9HYZspBoUPakt|O{vX6%%+z)xE8GAJ@_4Sa2@Cy??Df<FbFPW4%g-&=F`V4
zTo2aq7Tl+gS-7Fp<{)O%%Piao*6|+vj#;<~^o{qR$IUR184e^TuFYG_r_U{L5Sn$o
z1^4N5EA&CLHg7STUbn%)Xx8x_+;=-1Lf;IUJM(5P2E$d%;o4lNn>jOaN2$$(x|uT%
zcb3{bxYyj7g}X{^M%`-;?go7#|DJ0O?twx0x{mz2&-2Z}y`_#f;66Rf!F{DR2Qiag
z=HPy?j`!eq%)tYoZ@dRR%)x_jGjq5$2Qi;M=HMZ)j<?`Geaykbr8WmKn_lK%2w2B^
z@H^&UDCisSK@YPq3<fiYYjY6u>0=fi0qb}R?$gICJX&gV5VPrJ79IoZcn^NZEIbbS
z#(U6XINZYwr;!ua<}K#a=Lt9+%{tzK`}BDd2B2A+x0p?@r{D}U>v#|Ddm7H9ZwAes
zc{3N!z=O=;+T5v|IWzHWsm-0bnKKX1mD)VG*W8(f=Syuy-D?hB0DU6=o@)+Xgkku)
zHU}|}=bM9<z&hT5`}8meFPGXJ#7ugbgIB;h-h<yU2d{#@@gDRr2d}|!=5TEeVm^J$
z!RufhZ^3=~n1eS;Z4P2Kz0AP~u#WfOcg(>^&^O+L9%f+_Ji{EW%|Xnkk6CyVtm7@X
zPam`JR;kTF%%+!FcpI$aJ@_57@DAu3??I2z@FFu@OHN#yx0p|#ci}oT>v#+9)8{=H
zgl28tVm7_rhwIU-<2|_V1Gs^{88mn1&0Ks4uQ7*fbD?hL%*02fHh1b~&OCfvYV+V;
zb7vMlDYY4OuQ~V>^ojg?t~vM&M&aw)9K<}HZw@{O>v#k1)59EmQEGD#GwEdxz69%d
z4}QlSd<FW(d(guijDgY2;o2O;eEOJ!ufaOrg8TF_2j7(19K>vTnS*b^I^KidF$dp)
zzVROPFbm(qhs@#H9K?M3n1vs}I^Kf&^f3!Rmf9S|Y<ii6pTIiagWoX=KZCyU9`qOs
zpE1J_a^l*&#eDkw0z=WP<1M&PpK&k@&Dy-hY<m3)kDyt{dvM=x@F;yVXzt9LxfsI?
z)@DM@yqO0-&6}E8GY5W}0X4Jc{rhPq)x3AljI4W(cm6#d*4}scdY<>~XXM;Hp6Olt
z={<+HXM4|nM%LZq9qSP}_e}41ES}chZOq}h-mRaJZTEPt_v)v28Z&sdcj{;4+CAQ<
z9+7F!^gjQBr?vMOb9k<I>1X8FJ)Y}5`WYE^k7s*_eny7f<NfIo`Sr}d;x~djwT|4n
z$8$&0_cJo<9?u;`-_OXadp!G1`hG@U-SZYb64rzN6MC{GZP}}xrQd|?Psp>g*_)m%
zGZdL>i@!^DMs^qf&AYYVYtGT~jwklNM>bzu^s_Tso2}M<uQ^9ElN0LSyJjX^X6t|T
z?~(l*(iZ*fjMn}wTl>A{94)gvvHv}?`P!nNozdECwf1|>IhvU?JFU&ng!o=Flg&&v
zGubi&&A-Q=`+H>nhO|XLJ7YrpTlhz3Hs@%WiHZ5|QJbx`z1sI$laoJl&Y#)aR<rzn
Gc>V{Ck*1#j

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.A.i4f4.00002.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.A.i4f4.00002.bin
new file mode 100644
index 0000000000000000000000000000000000000000..f8b3beb95ae2e0895b1cd94f65cb11cc842055f6
GIT binary patch
literal 19288
zcmeI1Rj{2^5=N8Y5Ih8T4-(uZcyM<O?k*v?y9Rd;ge17T1b4RtcbJzMAj}LivsUHr
zf;rQjs=37_4_vBN?cV+M+1>Z-Z&MVfbElF2jM=h&HO9z9tevJFx$iah$n|fXN3P#@
zsrT0WmLJ$>{763IC-NC1$Y=aazLmd|%lHTRjDM2P_=SANzsR@pZ*m!({H_u@lgsEr
zK4T2>t&B-7V=VF+W0TJqhkVAk<bTU}>{}V1Tq_fhYo#l>Rwg8uF%kKSiP0)1L93V)
ztzt5?jLFGYbVI9{0<EGuTE&!T8B>w3m>R8O8nlXO(JH1x%b1>g#SCZ_Gon?@gjO*#
zS}U`V%b1mX#%$y>W+$I92l<RS$ydyURxvkPMGv%!dC)TEC0{WgTE+Zm6+O`^7C_5b
zkbK2LXcY^iRV;#5u_#)`V&p3pN2^!@tzt>Eilxw6S(;qNGUPLsC7-bz`HbbsXY?Xp
zu>xAfif9!pp;fGmmaz)?idE4nRzs`kjaIQbTE-gWE7nA-SPQLUZM2GY&@$E~U$Guq
z#rkL!8=zHeh}OzR<T5rUpRoz~j7`aBY(_p~bMh5ipjB*%R<RXY#nxyU+mNr=7Oi4C
zw2D4x72Bg_>_EO^N3@Ea&?<IDtJnoCV^{JOyP;L=j#jY;TE(7dt?WfEV{h^q`;gDr
zmwd*4<TLgsUvU6h#erxQ2ccCQjFxc-`HH@16^Ei#^h2vS3@zhu@)bv*RUC;{aTHp`
z(P$aRkgqrvt>QSeisR8LPC#qrL~<D?k<U1pe8wr{GfpL+aT@uG)6pu<K&v<tt>P@S
zjI+sCoP$<zE?Px@w2Jf4GR`MoaRFMzg=iHQp;cUrmT?LBic8TdE<>xh9IfICv{tSp
zmvI&OjH}6KTthzNTJjm!k*~NOt>Ol>iUDX9H=<?SM80AmTE)$16@$<!2BT#RAzyI|
zTE(qs6}O>P+>VxU2l<LS(JJmjtGFAj;vTeC?j@ITANh>?$!9!3KI1|184r=Kco?nX
z5wwa&(JCH8%Xpl8#S>^1Poh-}MXPuUE#qnO70;kmJd0NG99qTmXc;e%uXquy;w7|-
zm(eO-L2Knzav86Y&v>1D#v9}_-X!13TjVm{CZF*R`HXkTXS_$gmG{YId_X>982OCh
z<TE}b-^xeiGCn4s@d^2iPswL|M!uEL$z^;&KI2RB8DEjl_?rB0`G$Qf-;!(PJ94dj
zPp%bz_wct4e~*|Dy&M1Q-@SQ%>+m;;iO5eu-o2W?b@-da#N@k^cdzDe9sVXU3Hd3>
zyI1q~h)Ky!MeZ-G_VRqs_BV;i$Qj2Rp6%}vlan`&IXt@)xo%(_b9jDda#MhD%+ZB?
zclayV$G)CB2Ky<&IA-wNF<~k&ju||6ESMUMV+PM28>Ru{m|+~^X<-D|$G)CBE=&i;
zF@xuh2h)Rb%;34>!wg^?GkEp{Fe4bp3|)z5f?vQs_VwJEn>G4-<}BbEy*+PMaE-p6
zHygM{&)JE)@LQW6@$U45_cjO2$LQ|8KXrZK-OUN}qq+AEt<f9a-(1iW&As<%jUMq1
z=Y|E)+<TYSc#l0`LGt4;hrPqI_VPaG0pswjHTLpO=WXKft#$VDUgvA#@UEY+pLaWd
z6NiWWjQ86Ux-y4-!^8IRju!yq@US)Z@tzlKV(&U;vyXSZ5Ey&kF`K=-?}fqGJCE7C
z^F?4%=CE)0+CJX>qG0U($87e|1B-#NK8V@uqZbwjWBm}b*-K9>0mk|wX44x>LU-n{
zZ+P84OMz?nT-_c^H*5IZ8qZ&*S;Obndj7J_8eX?{IhdB7dQji#H$AXCtcp+E>p6A(
zrU!b#YH05DoHhDQ53B&a(cJ4fYxJBRSP@o7bFVM0(E}^N8sukU4tvL&u$Mkq8I1K?
z%x5osunHLKgP6}=`e0Qs)(0`4{q(_VU>tA4I(^U^W@irj#(S`jK3E-$^+C*LAAPU}
z7{^<%&OZ8J%_i0dF`K>g!CGLf4`Mcbur~By4*SM?u#a9?2aMw_SYsdkux=B_Td>YP
zdSbmMj<?`v?4>W(Z(@BJv+0cupeJ+KH{OGNHUw8a7jxNTBXEs3V2$T*+^pe$Ydn9G
zW)1&ayD2O}Pd%vb^qU^o47SB5?)8DXe$xY+!**!y^?^0|O%H4VebC(N18el09@rAL
zM{}<)t<eKp!4Bk?WDa}Bo3NKY*cy!WfxWD;mp<60iQ_$3XD@xQZ4>K*n9qLtU^_6@
z2Qi;M=mX0!hkfHc*he31561c}X0wkz*a3{=Em&tCeXwH_$6K(@Uix6CCe{Zrn?BeX
zR$>nO#(S`jUf2bU^+L>MAN{Z^7{^<%&OUl#w<eCaV4c16#qLcU@4?ULjXj_@bJ#cD
zgMIb{S3MVV*<&wo)pIeE=kE=!;eTs9f1hRz|68*!tW8fnsPFWf9@r21;uH7!KwZD-
zf&Jl7H1~SW8vUjR4uF1W?)8B+dQJ}<2#2A$*9X?<frH?1@*6ORz2i;TOCKBz#`+-U
zvzI<N1dQW7SZ6PN(6@=>Jy>TyeQ;<K>w}n2AM}GwnZv&E9_*tJ4g+I-5VP4w9~=(G
z`YmR&k3Kj8jN>g>XD@wlWE01GuudNw1zRzPed9gYM=u-=#(E)UvyXl_28{JX%w``w
zaV!|eTd>Yv`r^1Ij`v`l-Z&omFo%8PJ=o_2aE*7MZjTe2RnNsto_`X!>baQ5^G^oX
z@V_;uz|Qp4gZfUt>48(>9DL$lAE@g$J#ZSFi{@U>S)<?d!0FH*&ApzpM$hSiGvGWl
z_xivZJ#Z$RPks;Puy?!(d+CF-z*rx|eD=}@XM?dmi23ZL56%JOcn{XuPamAy#PKGq
z(+B-wU*@oHya)T}gY&>xAH;0-(Ff;)u|9~|?4u7Z0Au|Yv)M}@TnNVT9<0*`7r{Zy
zVc&QU_R$L$gK@kCYwV*RE@@)@5VP4wPh1MddLm}Cm%g|RjN?66r#CK#e#~Ltcn|iu
z0$k%AsN3VpW{o#sjptw0ta>iy@%*d7HT-YwHE<L?^`O4fZ+hTb7>G~Y>jQQDrU$Nr
zo6+3s18ek~9=IL`p}E&{*62Asa03iRbFVM0(E|fu2>Iig!`|^G?4=KG1Y>;=^Vv%u
z+yut@Am+1|J{Snb`XJ`BpFX%5jN?sMrw<0fDa>Ktcn|i`2ZO;l-hwsu(Fa4CSRce}
z_R$BofU!P^+3ckcZUy6b57y~}+u%&*uy4Ev`{;$+!8qQ6HTKaDcQkRl1?%jiC+=)w
zJrT3nOJCdt#_=BfjNZ5#`ZI@p<2~5t9&pujF_%5=1=n~3)_DGX%^Lo<#`EuQ*6_cz
z55PtA)Pwp?zv+Po;R$@=ULUCIH$CtWJc;IBA6TQ`^uWU~6wSRputv}6fk)seH23<_
z8a?nRJWc*`=CF6X347^-$G|w=gEjWj2ah+gK8X43r4OC}V|@_w*-sxl3C8gztkVZW
z;Tq<!Z@dTl=!2)gINpLa_R$AVH*vfL>+GWso@ruz5VP4!A3O`j@gDq)K6nlWFo%8P
zJ=jMtJP*ctA!f6Wes}?l<1JWcA3gD66USSy&R+WBr6!K|;Aiy4%P@#J>>KaFKCghQ
zo{PEc@hZ6LxtPiGUjx_hzcrr!db5WAt$71(qo*F!clu2aya^xR6Zd*fUBBspw_q5W
zdwpPye$xYQ!*DeB`oJ1Jrw87F57FG~OKbGNyYLbDyP3n@@h0r058eagcn{XtOCP-7
z#PJ@ivzI>jpo#TC%x6D+Fbs_2P52poFdQCW4*SM?u#Z0Y5RCOf%w`{b@DUitTd>YP
z`rzXxj<;Z)z4XB+O&ssR&*+0s;Zf$WZ@dTl=!MU~STDqE_R$ZYgRy>y+3ceyz5wHR
z3)b07Uwqlb@gA(x8(+at=CE(P2m5>tuJI1k?eR^s>baQ7^S=dGJs0zM{&(OS{<r3P
zc#fWWP~Yh{J@5k_G1hNtdd>U)k-V{9Q`cwS{ZHhLy?b?i=Dm*~Z>$g1z4M>Ry-ZL0
zg#SI;J9qWIV-C;uzFouf)_Ase?HYc!#`C>r*YLYF-timsv`6^dbG=_z?>1)eT<_M^
zdyN@9*L!shUt8nZ-l=Q&+8XckU3%IhJngyOr)zjw-E+N9SMM@r@LccH)w_%tJlp$p
z4G&x6eGaFmJ;J}9E8$r+&y?`0y5~uFRNeC={Hgva=X0aI_^*mb{+ldkO?&3s^XzK&
zKSR&#Z~VP;)%P2|%KEjJ_DA*_)!*GQ$FKiRslJQRl^@l;wTD*yo$b+URA+X~(cww`
zF)EMz(OQQmJ3QIp$zMGX-^CyO4y%6E`y5^QYR>rHs=3<wx!?P|jye9<>;La}T-A@R
zd|U6dt)Hv@&bFS{*3Wg!@vE1s?_zZ2+j^&M{ap2Tw)MQWey(GV4o~Wxw)&?%KG)&N
Z(d)_T`)|*Dd!Ai+^v}>U`y1Py`w!`Rv9|yK

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.A.i4f4.00003.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.A.i4f4.00003.bin
new file mode 100644
index 0000000000000000000000000000000000000000..d5d670a492655b464970b3e77a0fe7783ce6c37c
GIT binary patch
literal 19288
zcmeI1Rj^)F5=N8YPH=Y(?hb+A?i$=(gF|p9xVr{-w*+_B;0`Y{*!T=HvsUGF6`bkL
z6u0iB@^GnIwR?B>zrW`0Z^Ogs*<<)Wqqf#>M;V@owa1jh_kBknzW%Y-@b#OfFWZ}I
z^BuX2@5yKUKtAI~@@;-1m+>d^8Gk09@fY$Le<k1MZ{#xmPCnxw<TL(BKI32H+x$!}
z<KN^n{zE>ahj*9IlU$o#<l2lvuFa_A+Kfi7&FJKQ$r$V_#-vs;7PX48sa1?aEn{5r
z72{E>7@u0j1k@@fq?XZ}e8oi6Dki2@F$uMbNvUN_M!sTlY86vZtC*5n#Z=TXrY4^;
z4f%{|$!APQK4W_FZDt@>F(b8#nW$CFOs!%TY8kVVub7Qm#q887=Ac$FC$)?|<SXW)
zRxvlVig~D2%u6j}KJpdwQ>$2jTE&9YDi)%au`v0JMaX9?N<L#T@)?VhZ?gosiY2L4
zEJdwiX=)YAP|H}Be8qCqD*95ZSe{zN3e+<Ck*`>hTE$A#Dpsaeu?n?}RmoSZMy+CX
zY87ixt5}m-##-bv)+V2^4*86A$!DxbzRmjNDmI{2u_3jJji^;@Of6#*@)es>tJsWM
z#pcv1wxE{LpM1rZ)GD^3R<Sj;ifyQ6Y)igkJ8Bi%Q>)m4TE&jkGIk=Lu`~IMUC3wb
zN<L#Z@@;k}SFs1Rian`S>_x3&Z)zF)kgwR6TE%|UD)y&VaR9Z90pu$Vq*iedwTgqO
zRUASs<52Pyhf%9IoLa>Z)GCgomNAfg#!=)mjwYXR4Ec;>$+tO<T*dL!Do&tQaU!*f
zlc;5!Ouph2Y89tat2m8X#p%>C29d8ggIdLz)GE%RR&h49jC06WoJ+0ZJZcr^Q>(au
zTE>OsGcF>ZaWVOfOUP$jO1{ly<SH(wR&fQjiYuvATtzM8YVsA=P^-9>TE%tLDz2xN
zF_?VC4b&=bq*iegwThdmW!yr(;#O)Ew^6IOom#~m)H3cQpK%xYjJwHa+(SO&Uh-}3
zBUf=hwTcI*RXj+o;vs4o50kHWgj&U;)G8jMRxyNH#!&JVk5j97f?CCs)GD5$mhm+C
zif5=*JWH+OIcgQpQ_FaPe8!99GhQN}@iO_0SID<{m0ZSa<TG9;pYaCyj5o=*d5c`e
z+vGFeA)oOs`Hc6-w;4t*<9+fOACS-ZkbK5R<lB5qF5?sO8K08R_>6qU=j7XbL9Wf0
z<l1~iuFcov+I&Oqm-yYo?;L)Q7=zmQJ^4-m=B)Xx!*3E}Qk#Ihdux8{@SDU~<R>KW
z-kRS!{3bCr`QGH+Tl0IwIOHZGr<P}XuHPiaCI2&d_c4oS`(0u@YQ`~#XZu}ZeDcOI
zhv)lUVgmBUF^AtICM2hhx}NDbiQeRTHT#&ubNwzc5jEqO!E^mCF)?}Ln8CAqkedXI
zV}_pWCk1uX^~_%ECxbDXeazvxqmZ8*jAI7R9Tlbk<Cwv-M}sNBIA$1~cq&jwUC*2v
z#%<!5!84};*U<L7X~8vgJ#RX24bAC^^@w+;AH262V0P}Vca!t}?9mtA-Hb2?b@$$(
zztbDu-%KzkHTT}5J$l4DoEiF1bMIZ+<2}v-bCFj&JgbiPIV(&?ulw+<eQJ59vo&$}
z);_ho*V&ucyN&tO^KRz=<M6P*@qXt7b;HAIc*lKUYR+*V9=1;%?|H5!4j<d6j(0tG
z6MNq=n_AxYJYXE2_BY=7yr6FQS`F`hKA3@X+=s92Q%4WX-^Af<`_$133pBBQh}qQA
z6AOZ|zKGfM#zLTOcwLQ!VOC}^4xihj#v;ucKDWp77j4$?xxJphShI%L?Oh!7pq|rf
zdSD6Yi%0sPYfjJEqu=zvlCV5=_j=AA{iX+&f)%K_*9Z3KIX$p6^rPlpU)rMwmVp(?
zs~vAb9euDY%*Pz=^;^uSmOfYxjN?7nr<OkG+r;`H=2K4}EDy%<Cj5;)SOL_H_n?M8
z=m!fkhkN}N^Qof`Rs`dC3-+m_4_0boeGs#$r4LpHV|@^_>4Q~3-FOdb=!I2b3FdIG
z-(o&>^uuak9B;usb@asQO&o8*KDG448ciJU!QbeOH9_5Y4{EFh%QAzpo{QPkSQ}j9
z4cO!P>ojZl-yY9jw^_sg_O1tdP|xW#J+MA(hDZ9LYfc~7qu=zv2CzAG_j=AA{iX*t
zge|DK*9Z3KIX$ou^rz-tU)rMwHij+9s~vAb9euC~tjZkj^+C+2mOj`NjN?7nr<Ok0
ztcmqO%%`3{*c^=YLCmKQwg7eGJ*c4%`omhx;a(raeCp_fEx|b6f_>`fgRPo4-hzE<
z>4UACINpQ5(Ffary73;=&<oqb`pn^8FT{N6=!fmVSii+=>gb8>!8qQ6eQN289hx}a
zgME5qM^HE3gBm-*Cd^>0=VCTBb_Q2H7c+VOF5nvex5x8$ZPxI=J-dM()N^`G59|*6
z;gSC6n$rjN=r=vE2kcMXy`Hm2zv+QJ;Q(sx^?^NlP7mw_1E{&z2lnWJz2QLeYR8*U
zM<471+cJlHeGoIMr4RN6V|^L(sihD01LJrP_Nk{2_HW{N6ZYwY13=w)4{GRx0k9Ku
zxYq|UpE~;BKrq$^F`GL2;2<!Lw_u-I`rzOuj`v`nJ~#x_jrX92UN{tXXAbvzA?8y@
zKO6?e`XOdhM^79M#`-O0Q%heQ0mktj?9&@Zg1Ye@)EEf+FoSWt1AEjss#*11%;fn;
zgR7p4c|89Za1H<4b1djVJ*U_7z;SRY9vOhHIelP{e$xZT!)esr>jQiAn;tj;PN(Kx
z&)K8r^uUQQh?;wSX^$Q_3C<v|cDxC7^uft+D08^i2Qi~s`rs5W)(0`4TKeErFxGD|
zpL+V>G%$`gVV^!Y9n_8YpoTse1Ou7Fy*`Nf)X@iLfU!P^+0@YoXM(Xlh}qQA2WNq?
z9*x=b!P%g0yazS(!Z~mpbGVPUV4phr;oK(H4>6lMdg44V))O(CTKeLAFpl?NpWe6t
z)Q$I`#)WV)GZ@D^ut$xHnl;{lJ)VDYv+B8+$MY`%*YLl+mx3PDb9zk=Tn5+TkwNI1
z(+BqGH$8AUTu0r#KCnl>>47WYdTQ?VfjxRo4_pa@skzse_UM7D;0E$)$D2?`A6yOR
zFo%165HqT!53T`YeGv1hr4OzJV|@_wsizOF17m#<^XY@@LEU%{YUqQ(a3OQJkGEi-
zI{M&-Ce{Zrn>za7MljX~F`HWY;3hDR_h6qsxEa)q_n?MexCJg_4)^gE>{CZS+}gzP
z7VJ|;Pu$kTdLm|1OJCd$#_=Bfjo!Ee)Q$I`#+`6AGZ^c+m`#nlz%|~0J)VDevxfie
z@%($5HT-Yyy`Ts6oL<ud_rarhWH7qs^npG4O%L1;k5PB85A4xzdf)*VLe0HCut(47
zfd^qIHTU|!9zF07JWgKicoXXAgNNZ3=5QbH!9KP0!6Qwq4`M#G^ueQGtPf&7_4L7G
zU>tA4K7B9*)Q$I`hCUbycQS|jcnkKaqYoZ$;&==8siO~`XkvX3v#F&Io&@7~5B^3U
zJO%2;dr(6!JPr3ThkLyc^QogBo&n={3-+m_C!THMcnkKar7xaq;&>1KMsGY1>c)Fe
z;{|w_8I1K@%%;YR;Hu|hCeMEfT*LqNc>c@H8veKE70`ovPOs^KSK%EzG8A2Ndd?pG
zrUzbwcd5JA2lnVUJ@7ibN6o!Hut(47fj3|nHTU|`9zF0TyiZ>3coXXAgSX&m=5QbH
z!9KP0!P`w7@4-H`^uaq#tPf&7_4L8JU>tA4-{^z)K;3u`YUqPu@B(wV*9S45I{M&!
zFpjripE~;BgC>r*V4qt0;KL@4_uy~z!AGEOyazS(!pHC`bGX+FF`qj6;S(^{4>6lM
zdg4<sj<;Z+TKeL%CXV-DpWgT!)Q$I`#uxAwGZ@D^ut$wAn^n)nOrHN0xazr>$Me4i
z*YLkR-+&&}b9zk=e1|`Vq3K?~S=Vdc|M%34^_q2k=H355-q^dhuFt&pAITf*L+jr8
zPvq1I|9h@?{xO=y-gnI6+1|Hnc-|h*_O4yS@Ai1U_v{*ex5qnHBYf_e-tQM^8hf`f
zhv#~?uHI|R;JMzbYxvq8&-PAT!`JqBpK64sJ=6RA7ER;uvOS*beY$#=F@xuNpRV3z
z%;4GHr)zlF9`93)@ULh70X^67taZ<n@Tzsslkli@&y(<{b^eNd`M>s%|D`MQU3s?u
zF4_56uIlZq{K%r2&C$_Z_Pg-U?^*jjwL0R55&fnsY9ssKqnfWX^3@q#@pm54ncZ{z
z`u`&%``@FQuQT%186)yfSJb-a==P+(>I!dl^vrHgc6+khlfU*r_uu2U{XMGxhIB^0
zI-{fiz3b@jy65<{Cr0+aM>St(<f}6}>aC9cu6vGdPwJhH`ll;?*X_w}PyRnoRvzh$
bd}o|7qIZ#<pXGk*8NaoEWYNs#=veN*&nmdn

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.A.i4f8.00000.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.A.i4f8.00000.bin
new file mode 100644
index 0000000000000000000000000000000000000000..45dbcc325786827c4971b61f1f65d0303b7f0d95
GIT binary patch
literal 25688
zcmeI2Ww4b;7DW@{?rww#ad&+XcNe0>-Q9tBh`R>}ad#yl#NFM9yZii^Su3wk)o`m%
zh4*Gs1uvJXRo~|9{`#DId-oltW=0*Q_0Q<#Id*w|K3c1Y=P1*({=H?)vY<Tv81}ED
zH2yv8Q4x)FqSlCQ8*#Qq#-P@SqtzITdJR8ojd7^g7?*k@<58<IKJ^+CP_Ho|^%@gV
zZ)9R>H7226V^ZohCZk?sa_WstL9ND=)N4#dy~fnkYZ$LarlnS6I_fp1r(R<Q>NRGh
zUSlTe8J+PmX2#3tf|oH1UX59)XUv9|F*{yHSG<fl@M_FSJ!3AsjJfeL=E2LD7q7;A
z)HCMC%UA#}V?n%(h430#m|BfRsMlDOdX2@X*I1l-jU}jOEQyz~6kf*Ccp1y!)mWB#
z#&UQW%j0FV;AM2ftI?f$#tL{DE8=CWgqN{0UX4|#XRL~su^L{+>UbGz;5D))wHj+t
zudz1u8tYK6u`cx*>ru~GA1`AAyo?R;GB(1iu`%_GP4F@{#mne{m$4aMjm@cNY=M`t
zC0@o>co|#c)#yn*V;j7TZSgX;!^_wnuaO<7)!31Gjh(31*qM5bU8vXCm3qc*cp1Cn
zW$b~Mu_s=Qy{KpGjhC?xUdFz78T;YY*q?gF0eBe);$<9!mvJy&jYFts9Ez857+%KV
zco|3FHF6}i8b?vD(TjSG-qdUKp<d%?>KVu2WgLr_aU5R8@pv^(pq_CeUdBmy8GZ3G
zPR6To3iXUr@iI=s%Qzh`;|#nSXHw5N3oqkryo_`3GS0<o<UDFM&Zl1E0_rs`q+a79
z>NPH=o^c6Y#-(@}m*Hjf!>iGsdd2{}jLY#d2I6I0fmh>7>KRwzWn7JyaSdL^wRknI
zqn>d+Ud9c088_l(+=SQ2&D3h#LcPYV)N9;Ey~gd-YurIS<4(McyYMpZ#>=<|ug1O9
zGw#F7xF0WL5MIUucr_lRo-r6N;~~6^A$S=N<JEYCdd8!88IR#*JdT&~1YRRgQmgS4
z^%_r8ukj4^8qZR%@f`Jx=kYRLz{_|MFXJV=8ZT4Ncm*%xRlJPX@G@S<tMLZ)j5qNz
z-ondx8!zJ>yc+LP&v*|n<9)o0p?Db|;Qcor^7lqQqSnaA)EfDOS|guQYveO(H9n_a
z;|uCFzNB8`E9#AWO|8Z^)N6c8y~cOcYkW_=ksqkl_>p>zpQzXPnR<<1s5kN}wHm)s
zukkze8h=o)LHW=By<-fX(-dv36O0Md7CkD@(O@i?u4vbc4r9agMZ0Dkm;wF;?&}}-
z8W(0P+Wqw0Z#<Z(=;-U7<3ndqM{oC@0A>bt^q&yj1^x~8ac}pX2xcidW^mt$VOCJb
z4DLG#%m(V1!M!Ji*+CsMOor|Xqw`_xV_)~39OfuGW^msrU`|lS4DLH6%mwP0!M&$~
zxj`K>OpTrg#-XQu?CZYs!q3#yF@yWg2ft8P#|-W}Km1Bv9W%K10`MDkb<D6JdO~Wy
zgBkIUx$rC(DjMrg&un;>3xnG8bglX542u-)dFq>!nPJhQJx|wqmW#n;Y-}IT)86jw
zc`jabWYjgC!82W==*X(?*u!&OvS`mXX0n%OyA-HB-<ZquT^gol4*N!i?c*6Q1M0}I
zYwY7WFI%){-5FeGAJ2NZqCM}J&0e1O@}Tz2V>Zvc1!iCl`$n$q<Jorub>!ML_VN6?
z7w!4SZ1yn&D}dSz#BBC52P=Zw9K>v9VI}Co9QKW@+h=8%pi^tl$hvFnvkFXzr;fb)
zj(t{ziSX2sdDq!%HJBJr9ocu?>d=)LCc!g<X2Z;xi#3WicY0>dOsrY7xpS?VGY@MO
zZ5~`}?##m4MVkfJnuB#<9{SoR^6%c}U|mp0{$1n#=3u>|JM)Zr>|qYp2ldPlGug`=
zYyj#m5OcMlH-rV5!@hAJ?9&Z40=0RI+3eFDHU@Rv1=rcf9Bfi_+y&RQfH~N-Xmb#=
znS&m%7<1S+?t^{I!e*e3yWkr8n1#)Yj=SJG`<R6-ijKSBJN7aQTNWMn!FSBUR<Ja4
z*f;KjeYS?#JGJ(VyWkr8^n|W>YV#Je*=HM=15a(<Vm5ni3v=SB<36}<J7{5sx$w-O
z*)wzIV*8@aot~L96FU@bCR}Ug%)^dFn+MmLJF~D;(PqK5=3r-7iN5xU{JXa~*ag()
zAZBrYbFeF@;|{pa9_C=TqT?R8&R*tV_oB@~%w-PtfYq79zHuMyV-EHNwRwx#>|+l0
z0=0RI+3aHu_6Bv_1=rcj9PCqc3(uI%9PA70Fo%7+f%DkMEbLcwcb+kueR{(Fpf(3F
zn|-!{13+yKVm5o3g#$qy_rY~$;UL(MIqVzvp(pxaSe}fi<1V<yK8HXHo;vPAPqcjw
zg>HCi^A@w&>oDk!r;hvJy2GIdGpvAT2F;$CGZ#k`Z7%f8oS8VXXmjUUGiM%-D%#w+
z*4&weUPYS)*P4UguoZpn6Zv;<bI=FW<{)Nqe{*m&sLeslV-It145;HCxXxbY;Mk($
zKDf>t90%JmhkfHd*vA|k4{CD|v)RWSoB(Qb5VP6G9GnPha}cxH%N(2p>bMWCGY5TP
zXXdbP+z0!Zg_A)YcfmFGF$<>@9e2TX_Av{m7Htk<HhY<c(?A{f!FSBU>97ZL*f;Kj
zea?VQ$%wiq#BBCC6MEpOw}F_=K4-yZc<OB-X0zAXusNRET*hqYp!a2lE%3~s*)wx}
z;M}6kg`Sx+6Xz9eCS2PK%)|Lbn>*L`2D5NM(Pp$4n1c)9Ao|)T^6%c};380)gP6tr
z&B4W>HU}|}J<P!+pf(4+z;*UA2bUHd_rZ1M;4(OzIqVzv!9M1oAE@IlxW+!_pnuVE
z7hGo_b1<N2a}cxH%N$$|>bMWSV-5yFZ|1OX+z0!Zg)2a94q`U@n1w4r9e2TX_Av`r
z6>Sb;HhY<ct3hoJVm7mI4IIZD_Ko{spKD<sGNO*V;2Qf}2m9iw<1V<)KG(y3c<Q(d
zuCvz-us@zU?t|-Ygucvh0G=5%duGmD+*Gu=&@*#p;^v~wglo;5dAOzMUOZiE?##li
zMfc|ET61t4oK9c+^a1yG?|yK5(UE`GxPO1RqiFLM^Vnkm+zD!P5Hs1!9NY!!xDT!~
z2Y16c%+Zf$+z0!ZgL^=24q`U@n1g#k9e2TX_Av+d6>Sb;HhY<a`$26EVm5Oy2rgs}
z`^J5+k6CyC)aET_vyWML5Y%xOTxTD%Fu3Tr3$C-5S$L@ExDUQ#7KXrO%wgZS5B7N&
zPU_U!)4auO_IU*Q;;GGB%x0fQ;bc6ud5hWX^%$Ijr;hvJy2oK4Gn|TN2F-?<GZ#-3
zZSM5UoSAsCXfxqjGiM&2D%w1_*4&wer;9eDt~CeGz%}%>Pvqad&B3#vj{LjE{msF1
zMaLa*ojuIK^F^D3n8{w|-~~{dgP6-4ya+ckhkg5jz3gKSUMjjj&zQ|V=HO*e4}h4>
zK7-*EP{&<xoxL7{SBsAO;JP938r;Sl_Ko{sAG7c}sLeslHW+Od-T<{Zh}rC87TyH4
zIf&WpWftB7b=(KnnT5CEZsxFW+z0!-1DAJd?HPB$HTHQI2I8sXF8Gdp-h(Uf)aET_
zv)B7@C7wF&gX@OEAZEA<&kUM9GiNS7DB9fVnK?7@VbSK!wPwydd{ne~aILvB3m+G4
z7F=r%K7k?hwU0S)fA=;ApB8NnVixx|2cLmD?tt&u!yJ5Gbld~i*~=V!QFPn~-!TVY
z!sE<g-?$I<F$Z6PI_`pN>|+kTF4`Q#Z1yn+-+<a2#BBC52j7A^?t|;h!FTWsbJ#cT
zgMG}x_n?lu;2Qgwg&&F@%rj=Qk6HK;)DJ<-W-qhw6R3wk%r+GLGrY(g_Ko{spI_j9
zGNO*V;2Qh<3WM;}aTi=?pWomCJhgd?*@mKjhX?W0<}zmc1N|B^495EaZ8kmxbK%oW
zST}Fx!KZoCGi&C+r&-f8Yo5PPGpXmfzfBMKjI6ttXYMm{uJ3-Hw@=SH`nsoQ?bCCP
z-tO%=`;4r+#xovDPkThp-PiN=8Tr<CU(eQOWZO0F>$&>$Ok)Q3_Dp?xo-u>x`3XJk
z5t(*h&(mjQS>Js<OP`Tr*SN3e=rc0x8u#`LeMW{|<N19_PkTgu-S<__(`V#X-+f=B
z?lUs$8uxvjy3fd~Yux({>OO};%<vuk-lX38XX=*L=l2iRpMT}YdmUw6TR+c;wtjfe
zVMLp|t@AWL=l^zJ+xmU~-Ru7;=h@!xv7^7&*7I+EAOD~GKeBv}&3v?;cU!-Qf7<$y
zCC}}hv#saZ-aaGCd(H1-*#8`8ejm->Nxy-(zkl`YsCntApDWI@t)H*0>)YFBWO=Xo
zeKdb3o4=F%KTBI$a}f7-c%L2hy^i|1;#}MM`P#a^y?sXX_uBeB{L|Kt=;s&n#q;kz
zpZ4|{S>9{w_cyY9uJ+E^{63oho^1Ymvia}H`2C1y^LJs`|9;W@KAOLi&ELu9?_~Tw
z#<Tgm(EOdO{VudM7yq>N9sT~a^*o#3$FRR6&F`aQe;>npKRU{~_U3tbKmXso|A;b2
Q^K;gJ7ux#0jJ)UhA2Y~QD*ylh

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.A.i4f8.00001.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.A.i4f8.00001.bin
new file mode 100644
index 0000000000000000000000000000000000000000..2d01c9682dbf2ae420ee113be0f6142013ff26b5
GIT binary patch
literal 25688
zcmeI1WzZZ%5<n9)!JXg`++BkNcMtBa!Cejy?ykYzHMqM5cXvyG`*VKpRi>+8Yx;`a
z@1VY|TB=@cPxtI}XXg!nzMefs{5MMZ>{UL$9(hC%pFJiUvF<<Gh|j;5eZTa~*Y5c>
z|6tw7Kgl)nFLI6io7}JY59=B|oToxhay3RGUt?tQjf_IB#;D|Lj7Gl3=;UkkBHu`F
zay7;vUt>)2HO3-eV{Gz`j6<%*xa4b$N501R<ZDbozL5#Z)tHEUjfu(En1p<dNy#_T
zhg`;F)G{WgmN5mjj47$rn2LPH)YLMjp_VZ%wT$Vg)#yt;V|r>CGf>Nzky^$~)N0I3
zK4TVY8M9K$n2lP-?9^(^LB7VE<ZH}DzQ)|-Ys^Ewk$K5w%ttL_erg#DP|H}5T8)Ls
zXDm!DV-ac@i&D#2j9QI;<TDnhmazo2j3udMEJdwGfASeiQ_EO}TE?=}GM1xOV|ns5
zRv=$vMe;RPB41-=@{O!QE@M?{8LLstSe;tN8q{j6Nj_sOY8h)&%UFk6#=6vM3?QGe
z9<_}1sby?HEn`D!H8vuju`#ubO{isTN-bkEYBe?|Ut<gMHMS&QV=MACwkF@mHsmt4
zrIxWBwT$hlW$Zw$#*XAOcA}QCGqsFesAcR*t;Rs|8M{%-*qvI&9@H}Sq*h}u@)>(m
z%h-on#=g`t_M=u~fATdBAYbD^@-+@3U*ll%jT}NQ<4|fDf1#Ff7`2SUsns}we8!Q~
zGLE8_aWu7zW2n^_L_XtKY8l5-%Q&7|#tGDFoJc<7Bx)HaQ_DDoTE?l=YMe&C#_8m1
zoI$?EndEDnMZS@<$z_~FE#q8j8Rt>UIG<XL3&>|&NG;<cY8e+(%eaJEjltwIE~S=n
z8MTbdsbyS2t;Ut)Gp?eRaW%D!Yp7*hORdIr<ZE0{zQzsYYure_#!ciKxtUzXEz~k@
zrIv9UwT#=T)wqLv#+}qM?xL1)H?@p=sMQ!kKI2|$8TV1kxSv|a1Jr6fNIv5sY8ekx
z%XoxZ#-r3~JVw68<K$~RLB7V5<ZC=dzLBTNWjsSI<5_AM&r!>Go?49;$Y;DrE#oC>
z881`Ic!gSxq2x1OrIzs;wT#!PWxPSH#+&3b-lCTAHnog*sAarMt;T!g8+o5xBOj1!
z<U?|ed_?Zoe9XGWC**5<O1{Qt<ZFCRzL77;)%cQpjjzbp_?mo;Z^$?DEx8)sk+1PR
z`5Hfvukj=KMuw5AF`RsjpUBtvnS703$T#BOJ^WjTf1{X?x_@7BZQj3k^dL787@PO+
z9X(l3494dDd&fwuCjn#gBNI;wp6gkjGYa&9-enzqJ#SQ)42+|%XO0GwgK_ls?9pKg
zFpmDch^GYm*w-_A!&ER%S;rinI|fV*#xaBEjtSF%am?V^W5Kjw95akfJRR7_zMeS_
z^o0rO={n}{+;L%gFpe2KcRZK@jAI7R9v@}|<CtLr;+eoc_Vvt}p%49j9BITl=J4EE
zU>JGhn89;rh2i9lV+PNj4SphT95c*L{4+Tn@ji9JyPN~2Dr@i4x^8%vbC%fqbiaOh
zmvfca`*g3Kc$agR*!y&^cR3H(C;aqW?{i-0%RblMY0TsK-syZ`?7hZ3_V8Zk2V?Ix
zX0n%ey8sw_zcH8hyCB#%9JYsdyb#RH2(H6n_u0pLUbw{Gb<AcT?|Kn1_P%2_dwJiB
zg0XiVvw7!>fqlbkdwBQ#U=HSR?cK+G_VNA~2V?I)X0wkDECI$k5VP4!50(UDJ&4(K
zVJWb0xNeXBFfTKV&fjERhwJXM&(hF~nsNB<KKm>Ky{Q?8^X{|PvM>fU<8a@7%fXoB
zbx`m0O)r**g_y&&URc*Tomip7I$>Ss^kKyk>w|msP8U`xu`ak*4^{^Ig#Vta2dh9o
z`nnGP-RJpwuxg3*Am*`$9;^n&dJr?&OAl5DV?Btu^k5CJZ@dS4=)s!MpE+FXLCj|#
zJy;8j<1M()K6<criS;06vzH#M1IBs~v+2RQVBdHT_Rxg^usn0Pj<?`G`{=@YC62e?
zKKtmx`X!FH;CJk$3mcR;-h<!Kg$=>J@gD545v;-t)8dJ1eT(_*voTCZ%~;=JHv4P>
zeW@AiTg+y!O<{U!#_=B9w;9YpUI+C~-}GX0Sd%$i>z#F-(}^ugtP|FCP9L@`u|Bw0
z?{s0S66=C{^<ZnTPx$Y-daw-)ps#B^h<Q9;54Hv4cmwXUhaPNKVm*kN?4<|WgRvgO
zTzaqr*f-vTJ@jBl*oZk?>s!ocA3fL!jN>i1&pvvvbBW_ExX)gCuuF;KJ@_3x*cI#>
z@4+6rFc3Cp4%d1R^Vvrib^~KQh}rC;3%i4{9>i?+(uF<1INpQ%bYV}hZ@dS4>;>B}
z!=iZNI^Kf&?6Ws4M$I_hg8S^V5A>sEtZy-!z4nF0sTs$6aNmBg1bH3QJAKoO{b5Ju
zaIF{CbxtP^D6!sI*ExMSu*CY{UcJ+WgG#Im?$v{X!9L-?=jy>BFp$2k^&sZ)d_6c6
zjN=Ws&mMa4mlDT2aG$;O;II<Md+<AYa5&gE-h(~#;0V}@Ib7>O%x51xI1-HYAZD|V
z9vlV6dJwbOOAn3)<9HA5(}QEczVROHp$mgxf97x<Z^3=`(S>769B;vW_R)poN~{Ml
zo4s`5crcFl;CFQ41h8+s2YZ|dhcLrBc;Z^$Vm|wv1nW{Wj<?`G`<x5|s2S^9%x14s
zU_ENa@gCfFDy&al2lY<h^x`x)f;n94g>{|NiPKB0ch+@IAI>PT-nm!rbm7br>!^G6
z;4H9D`0u%Ta5fC0uWLPsc|2ba&H-aRh<WUx2j_yZ9>h%c(u4EBINpQ%^x%B3Z@dS4
z=)nbWB6GNox8Oee=)r|0j<?`G`{=<%CDwzO&0czNF&M{t@H={N3D`H@gFSR%Fr3C5
zuJs`1vyU!Z3dZpk+-DzMxU9r_5VP4!7cK|mcn^L@7p?&N#(S{Gm2fsQ?1Cq*^)2SJ
z&sDH1HRE^-?z7L;Fp!$DzQt_zx(0TmW*qOqeb>V7<aJQ*^i40WgA16$wO&})Ii0w^
z#5!SJ=k(!*66=F|^-dRVEU}KdR}XFi`-K0Vs|Pp3VEVca|J~>LdT>jL;|;ja9(r(V
ziS;06vX>s*2FCFo{Ei;n4)%@rU=KaG1FmEa*Lo21*+&oV1mk!M?z4{`+*M*dh}rC=
z2X}*Uya&Id2ls$|<2~3z7ly!f%;8!OVm|xm!o6S|Z^3=`(S`d;tOqfhy>#JzFpl@&
zcXZ(auy4Evdprm?GsDq%;#%KgKKncb$51nlx8OeeJPd=V8S7ijX0J!!SZc=c9^CgR
z97kRU^-kaP;xV{`Ib7?Vb)D0R$4jht)^$!Fo+z<CxL5CV;mH!~sC)I`DX>rY@40&L
zGz_7yYdwg0JYNr<0poZB?z4v;JX>Nth?(rA2hV|Vya&Id2hW3j<2~3z4_<%=nZvan
z#C-PAgBQU#-h%t=qX#dQSPx=0d+EW;U>xtk@94oRVBdHT_Rxi)@ECKr)`OVOKDzKK
z7{^<1pM7-UwG!(=%w{iLcpZ%6J@_46cmwPk@4+5#!qd!fF`l^Ax0ug9Z^0$hjN>i1
z&pvO%U~0zt7PHyw9k`U5al8ljy$hF-*FnA0H@$cdUSJN_dSPAXbmILI>z#F-(}xdA
ztPk$hJ6-s&#5(F;J@^Rh6aIUy9()W#>FZh#Vjj=egHOOX-hlh;p$DIqSPx<*d+EVv
zU>xtk@94qjVBdHT_Rxbb;7#Umtp_omee~c<Fpjt2KKtmwS0&bin9W{#@HH66d+<AY
z@D12E-h(}K;ahl*Ib7>O%x526_zsNYEx6A<y6}C8^&n=mmoEGO#_=BfjxPKN_Ko*o
zk74jJGu(|QuJtYEv(Iq2hnjJ`1^3zKCm2G_Sl?ncd;JXeQZtVC;J#nrKJq%KclxFm
zUoeBQPFT}7eehG?tm&E__^AWdbj|zsQzxx?@17a1dyaShEj^6A@967!-nXCOxqCd*
zyY|z2j^3W_J^LB1yT?1WM|kd;-tRDa8hf`fhv#~?eumrb@m%lKPwzBl@NDnY&+ytk
z-lsjnY0vaN|4L6|?=j}^T<_A)@Yp?`>pl7z4!g&*y+c34VfT1{_6UDH^KbNfnL9NO
zZ{6d$uaNgMoOO@q4khnr`05_dewDnR;j4RIBRAr|KK)004uAN6e|Fb>zjv<q_qFT(
zcAdM~-@WtitiQu{{axC1?mybwX3vlP@!9O}`e%QyyU*A8J^nxcpK0}X?D+B9-@n=4
zqh0qmJ9n#owafQ9zem^JLA%^@t8;ez=$aqR{(jwMf3tJ6>Q}pbuk(9!?H#nsJ-0e%
z$B(Z0(d_TnUG_ISN2`9d%lA6JN7vp#yWDfDb9Vgbnjg*ne%)n%vvaiSSG#<#^Lupd
z9kk0mw>oFXkFNRA?C;lI_BT66tA4f1_d35v*WN+9+;gjQcKqm?AI<)L-DQ8XbF}JL
zyL_+ndvxs`w97rWI%mg^uKCgI@7G=SH#<kGeznW@I=@HP-a)(EbE|W9{AkUO-}}4$
i+53KPzdy^DKWd&o>fG-3yLA4YzkQ$G?S6j$JpTo3;89Tk

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.A.i4f8.00002.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.A.i4f8.00002.bin
new file mode 100644
index 0000000000000000000000000000000000000000..907a202b1a10a879b88187d67696a06f1bbe3c15
GIT binary patch
literal 25688
zcmeI21<ajQ5{BF2?xlEfr?^X@P>Q>2k>c(}ibHWI?ykk%wMcRI;trclcCp=Mcb_N!
znS|b)f!^+>>EB+GCuhES=boAWJMXz6Tsn4W`)ACuj$78R$7l;;?J!N-bN8{^*1vab
zTYu=3KU?#Ae&o5vPvmR-Ouoi1<ZJv&zL9^BtMO0rHU34u#&6_n{F{6u{~=eSgYT+B
zM{+efk*_fZ`9{VhS7R*lHO3}iV;u4|#wGuI#^bq>@yRtZ0l7vdB-hA9<Z4VzK4TKJ
zj7iZlCPT}Z9IeI_<TIv3%a{r+qcd8@)Mz!jkk6O~En`}=jOoxarbnwW1Nn>@(K2R2
z%jk-hF*8~tvyiJXEBP9;k*_g3`5JSOuQ4b2jJeP<=0?ky2Q6b>v>Nk~&zK)AV*#{`
zZfF?`qSaW4e8$3P8H=E0EQ*$~7+Q_R$!9Eqma!yS#!_e*OQSWi47nQ1lCQBG`5McU
zudxF88r{iftcaGe5?V$Nw2YO}YOF#&qbFL%s%RO#&@xs-tFb!yj5W|Q)<nx#3oT=9
zv>NM>&sY~NV?DHt_0cjmKx<?}ay2$0Ut?qPH8vq%V^i`qHY1<0Ia<aRXc=3gWo(63
zV{7sm+n{A^i<Z$FEn_>h8rzf4*a0nLN3@JSXc;@9)!3PQ#x7_XyP{?6hL*8AS|fXq
ztFb5f8heqiu{Ze|`;f1(FZqo9&@%Q%%Qyfn<3O|;2a(S>7%k%vw2Z!J8Hb|PIE;M8
z;b<90pk?$!%QzCP#!=)mjz-Hk1})=Qw2b4>8abX^jT6Y%IFWpf{^V<%M83w!<TFk|
z%QzJ+<21C4)6r_2K|bS5w2ZURG6tY!oQ+oF9P%0GqGg<imT^8>#sz3KE+n6E5n9H@
zXc?EFWn7BZ$YtbeTu#2m736DNNxsHa<ZE0_KI0m+jBC*{u0zYX9<9a=<TGwW%eV<G
zV<1|_&1f}lA)j$8TE=Z?8MmWl+<{i(PVyOdp=I2SmT?bS#=U5b+()j){p4#rK)%L<
z<ZC=czQ)7kGaf<9coZ$;F|>@w(P}(FKI2KWjHl2t2BBp<jaK6s@)^&fWju$LF&Hi5
zd9)fYkk5D#E#oD$jF-_eUO{W*RdO|6BVXfn@-^NdU*k>kjl4y!#@pm;yhFamyX0%U
zN4}Bw$<_FPe2ovu*BC;+#z*8E`IuadPsrE!lzffP$k+Isd?R0wtMMiI8efsG@iqAx
z-;n=3-}2nZcjOxRo?Ih8kZZ)>J^Zc1-y<eMpOXLd@3VP->+m;;iOEkz-e)y`>+m;;
zNyv95@3We}b@-daq~xb2@3We}M@&Yp3%S3r+ROdj+utN6CubaUxVOJcOhMi_=5X&0
z<fa7Un8W=$lA8*QV~$QdcZR=#eeCPLWAHpR7{?6mJ0^4i<CwvH$AW3VIA(C~v0+*;
zjv2-wo(_Hi``Fig$A#&^IA(C)@n8lpjv3r{e3%i8V+Qx00A>Q?m|;TVuJ9Y!$G+}6
zb6KOmd(Hx`(cArI1=r~7ezSpV^qifz6Th|T5zkIfcy4pR{EY6i=cleOJi9qz0W_aI
zLu>Sg=QkI0L-W~lv__A3hI7M$Xg+(E)_9Kdz(VB5VGetTXYJ*A&I`ujS!?X&na)?@
z@U3<B@?7UHad_9y*w3?Fpv2)}KjZm!g9(|#zTsi}c*YBYad_Ao`*_X^mDsb6+3e$4
zFAT<>cg$ul&wCLt_RM28&wNpsj5+KZzP68NzZe*M{xO?<^uXd^tPf%~`{;!wz*s-T
zZ1&O<OM<b!h}rbUQqY+>>>FOU&(h!;K3BKLGGz^)TjT!AmNk5Ct@|%m*6_Nu%foc^
z)Pwp?zv+P$peH`@S<k8KH$BiDRz>q!&sn42^uUVH3(aReXN{iI11rI5Xg=#pYxF=5
zSe<-V=CF6%347^-mBCoQ#eDYC2djXwK8X43r4M?7u|A0T?57V_1>?9A*6D*@FgtVD
zH|~Rd^ucOitPf%~`{;w!!8q=Mb@tH*Ym`_Y#BBD`2Wx_{K8V@$!CEj6bJ#cTgMIYE
z+F%@a!5aJMhjmIEcfmUQ=!tbp9CyLb*h^omS7Ln`v+0fXp&N79H|~RdHUL*W7jxNT
zLvW2dV2%54RMzmnHSWK0S;PO<ZUT$aQxEDp{iX*tg>CSO&-y@Jzv+R^U|Tew^?^0|
zO%H4iz0rKu2iE90J+K9Ahvu`sv_=nX3EPujiaG2Zcfwx!U@I`z2lleYUix6`632b8
z&R+Upn-c4Tn9qLtU|TTO2Qi;M=ncy=hkfHd*he312gdp>X0wkz*dC1IE?8$DeXv7`
z<1ScdFMY6MiS<FurVsi+59Y9M+z0#Ug`L1yFT`y2(GNR=aoh##?4u`kDRJBd>+Gd3
zb}ez-2S1}Xc7tBbVc)n9_Sqd=^<2zlk3GOu&&5pczbCkc|E+QVy~-N?w`Olxi=KK=
z-|06!un!!JPkhz~>iSI&><fpW`K;%x(QkTSKj@3*vp%p!&*_2v;ZQW6^?@~d-~c#`
z{QAsc@3<58(gz2Eu|A0T?4=J50^_(3*4axR99-hK57yaF9~@F*eGv2MgTAl{bJ#cT
zgMIYDp<t{JVmABegTugBzr}3!(Fccvaoh##?4=KmC~@2e>-0fC*pfNy8~4FJdf`Yg
z)(bJ4ee}aoV5}cvHv8y_qro`tf_3)N7sr%1?t^uD<5=j;9QKX-V4vf_HSU4BJ&rG{
zo{O2>{{(Q=b1{$mp9rque{1?fAA0IReW%~_z)5f>KJi%}sOvX9a59{Q=Chu&M!)HS
zQ(yp^&w9=pJ*Njwg|pFo)(6(;fz#j|^1CsIz2i>UOCOvL#`+-UvzI<N1B~@S%x5os
za3&bXeX!1c`rxb*$DOcF9}IxKnZv$uAMB$K&IV(B5VP4wADjcm`XFYrk3KjTjP+a0
zW-onk9vH`cuudPG4+k)Zed9jZM=x9e#&H*{v5$VZu*CWyX0wl;xCo5(M9gL{eQ_}u
z$9=F)Z(IU>nZv$uAMA4}xW+wDx5s5=jXPkC`(IvGJs0!1{}tdG{<ro@=toaIsPFWf
z9=Hl_#3w%M19knT2d;*j(0tYh*624qa19JZ^I6YXqv!O%wQw_<&-&6DJ#Zb|LjG9h
zuy@=Ed+CGg!B`)}eD=}@H-ND|i23ZL4{iiweGv26PaoU_#&IXC(+2~gKXceO?t^{w
z!OdVCcflI_=!08ItPf%~`{;vP!B`)}Z1&Ozw}Elo2kZ2~?Qj}%*f;Kjee}W|U>tYB
z8vE#nJ4+mQ!8-fsiMvXyCt@~x>5IF;IPQa=(Hr-`0Oqi7+z0#I3$A)D=Ca3q;2L+p
z8u!1ytl@ua-2Z{HhX1X75YDHk9@KaGO%FT-PvR4w^?|y6(*qB~Q)oWx18ek~9(V)>
zq4}&2tkH9N;8A!Q&1ZdSjUIRmo*{n;bJ#oXguV2^<6s>3!5Vw%gC|O?4`M!h>4PW1
zSRcfE_R|MXfpOdk>-51OxRN>S8~4FJ`rv6Wj=Nxuee}UIC62pboqhDdvnAFCF`K>g
z!E<07_rcHTgTZhebJ#cTgMIYE^I)tOVmABehZn#&?t*pp(GxG0IPQXV_R<$Gl{oH$
zpV1pH!$9V+Z`=p_yaKLzF6OewtKh2VVkY;04P3+j*0}%cWexvZ^9I~bPd%vb^qU@d
z6F$HvKI=Jk{iX-rf)CMr)(6(;H$Ct+3_<f*A6TR3^uRmt5t`5X(i%PRE__V>9_Fxj
z+zET>gZIEV?t?Y<(g*LCIPQaW_R<F*lvp3ceD>1^AA)h*2|uF`hQNc&Vc)n9_R$9)
zfw4Y_+3ceaJ_h5s3)b03AAC~cxC_?VOCNk%;<yifMjw0zk1>aR<389&FMJNhdLd@B
zkAC<9jP*mzW*<HAB^bwDu+Cok;;RzJeXve%d<}z`!@hAJ?DGw{#ywEC$G2tGb1{?q
ze+RC5F6MFn@4+?vZ_N)dn4Wr2-|06!@FN~E)^BQh&GY|>ys=(W*Jqyn&*Y6gdv$&0
zx&K1mSRbl;=D(7AnV$9u|GT$m?&^8R9PaITyN2hjac|GsHT-Uk`+Lr=;dg61<2UGO
zkMOzsdcLlnZOq`lo~^6r8Z)@B=js~1w#L0ZQ`hjdHJ<0Y^t4BK+I>Aw*YL8s`+A<P
zo@LD7zMiM6XBjiNx98~^9=68w970cfgn!*v!n11bDdAOh_ml9by8B7^Q~fjcZ~Lc9
z_qO$~kN)vGtaY(Zd#!J;b2t0mTYqQW@9piq4C}ljdtI~sjrv%J_3w-NSV#8HjqLM{
z==a!qA47j{wcbbD`)Kw(jBfQK`ks#He$Afeh@Njm_iMe6*7u}uAbb~Vv%VPJ>WB9|
zwU^H|d!Fs(?;74YTkoUwJ=yx6<o}NAKC}<wKK<D`s(x-%{k!5koBjKmtsmY#?d5Z=
z_tEx!(d>H|-Rj$mpNDtOX3ukY`?QzOwcf|j{~pnLAFc06-$2~oKU+stzl^GXSDa_F
ze_ylp!`r95e6ICATHlkc@5$DGhlua1SX<u<ZQl#6_wm2Ihh}}$-s?wozchP3t@knX
v{b{|A(c^tIdr#VHeS4j|*?ZXfJO4lTc4T>vBg-7k`fyn5hxP9p@pb<No>p9G

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.A.i4f8.00003.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.A.i4f8.00003.bin
new file mode 100644
index 0000000000000000000000000000000000000000..a6e3bd96674d91ac385913b30bb1f791385dfac0
GIT binary patch
literal 25688
zcmeI1Ww4x85{8oyTtaYn4ekyR++7pg-GW1q;1JwhgS%UTyK8WVKfBoaF1!0Yb-%76
zU!AVX%q^%psY%sSr%!j!dHc?JPvysS@7D3JXSGgHt>2H+5yaYU`i_0y@jBK&_vl!^
ztNKcNb9H_oSK>$VC4M4b;%D-8ej!)lFXT)7m3)c6kuULg@^$_}uEamdm-rX?68|P&
z;y>i;{7SCGf615lANdm9yt@M3$<^sWuFg2*>hvU6XIyf1#v}Jz#%G@~0kw<?sbx$=
zEn{M8B_<)CF)6i-$*5)YqLwi^wGzF_XG}pYV@hfnQ&G#9np%lz$Y)GTEn_-r8PikC
zn1Nb}8OfKJiF}Ef$(NXge2H1f*O`r6#_ZHG=Af1_C$)^ZsFj$Te8xP~GUlb0F(0*z
z`KguYLq1~xY8eYs%UFn7#=_J}EJ8kGQEC~BQOj7ITE-I8N-Rmf#8Tu-EKR<|GUQ7v
zOTNx><T940mazi0j1{S6tVFHE%H%Uvp_b8?T1G!=8U3l17(hN_RcaZlQOj7JTE-gG
zN~}pfV=ZbKYg5Zuhg!zE)Jm*JzQp?EOKd>C#D?TcY(&1!#^f?Kp_Z{JwT#WEWo%BZ
z#1`Z;wxpJ^6}615sby?Kt;9g`8H1>0Y)dU;J8Bu*Q!B9p`HUT@W$Z*PV`pj^yHG2!
zEBO+;kuR}3`4W4OFR>^2I(w1J*qd6$KGZVyrIxWDwG#W2&p3cu#(~r_4x*NEFtrkc
z$!8owE#pvX8HZ8JIGkFEBgkhQNiE|jY8gjU%Q%Kwi6P`m9812$apX%JPrk$n<m(J2
zmvJJsjFYHkoJ=j_6lx_-C7*E`wT#oLWt>4R<4kHLhLO)Wi(1Cn)H2SYmT@k%66cZ6
zIG<X^1=KPwq?U0JwGtPTFL4R^5|@%MaT)m%my@q^1-XnXsbyS6E#qox8P`xNaV`0b
z>!@X1Pc7pHY8f|DD>0mW#!b{RZl;!T3$=_}sg<~me8%n6GVY+3aVNEmyQr18n|z6T
z$d|a6e2M$Wm$;vNod?KeJV-6$A!->9Q_FaST8T%=XFNtN<8f*kPf*JkL9N6{@)=K3
z%Xo@f#?#a?o}pIaS@IdrQOkIqTE+|1GG3%s;wADWUM64S74jusC12t-@^xM(SK<xw
zCEg@o;w|ze-X>q?9dae!C12t_@+ICUU*ZGubw-gZ@geyVACWKdG5HdokgxM8xe}j|
zFY!6~5?_!n@g?~>Uy-ZxHMu(9kgM}8xjNsG`z`+N;qM&&9x*<($-4790hqJqZyo+7
zF#)w+<lS5Iw+?@kn2`MB<lS5Iw+?@kn23CD^6stqd&I=#rXZ)5XM3){NlZfiSMu&-
z7SHx~iAkv$#~hyR?-G-dH;y?x-`^#AkvEPx{7qtVa_Xq-nf@lxn_Q1-A9HxFze`L(
z%{XT8Tz{9ClDu)u;Mv{CO$Ej=LwEL5gF5PZW)Jq$!1&cZ=J4Ec$WIH#F@xv!gz3OI
zX7KEBVR|r*8O9@?0n|~~GiQWJsyJrw%$dM7v^{TTa1CA0n+04$b5>$K;@#;7?`<}i
zm%Hm-<-9+8^o4gfJIqJjy?5y6^oI902h2~+z4vI39`O$6gg(^Vdzbcjk8{BS<kb$(
zs^fjm4b#x;K0IrmTHfhARUE#xPc83t-YWKPV?On~+xfsaJnUz@-}yn^@UR-*aUYnG
zbKHlA?Ni5lUZ9G@$M&h?T`yS0-gnHVmiN677>B3*jCZ~;s2jdk!@FMuX5$?9;cNTU
z(F2QCad_K4b@akwRjeOkHnsG`;$W;VVm7_81gINcS7S+-n;DG5=k}<vRJDfB?eYAj
zt2KOXujemQt>JZhmjykj=k%H$SPuH)kv`~}({uLdH$AXC^rP-x&)K8j^uP+xpPGAp
zV2_^D11rJ+YVP%=J$hgzSe3lm@g~&K2P?xO%;8?Y#f)m{gH^yd-h+K=>4UyitPf&7
z_4GkMFpf9jXY@gTP&eL#8v0-WEXf@1^;^uRjy_lwjN>iXr;a{Yt%~(Q%%+w;SRIV@
zLCmHP)&O<mJ*c4<)`aDl!@Yis`P9)5Yk_gR1^d*|6Khv-yaoHz(iiJgal8jVqc_$C
zb>ls#u^z0<490pcW>aH*aE&)$kLPbtt>J%rJb%M#4gcG_5$HiZr`Pnr#;_G08Gx=i
zePEA%(*v8p*3{kWIeYY*9@rGNq2^v6*rVt4z-BOzntOd|j~>_@29Z}g-h?{(U<+82
zIo#`mm{Bc#uq7DBd$3O}eXvy(>w}n2J$<k>80&+WPakXp>c)FeLmv!;^_auGK8X3$
z(FcRTINpMN>ga=Qt2o|*eQN20?W#E5gP+j{+k?9C9@NkaJHW=w;a)GqeCp_j9l=<?
z#cb;6iJibW-hzE<>5HAKINpPOdSe$*H{OF9yTTUCV65k2HZ^twS3MUqdH(L;8veJ(
z^Y^IM@V`BKf*#a!dQA`P1qb4hf#{mk2lnVUJ+L<%MBTlfvq!(_fqmd$YVP%cJ$g<L
z><fdbxz`8w=z;y<5b|orn@~p|><>FIhkJbxGpeNz4gh0)8S|;74-N$5cn|ierw<OQ
z;&>DG>4Sqo-FOdb=!3zqD|5Kl2Qi;I`rr^S)(0`0I{M&HFpjripIZ9huquxCV4prX
z9Mp~XpoU&J0`_7K_j)1bQ%64>3C8*%W>ZH`90kVuEoM_oUmOj_@gD5c8^?gU@gCF|
z0{b(Aal8Y2)Ht?U^<2#4`Nx5)o{M=r|9Ef>|J!o{=s`WF*Yv<pI314+M%SD^ut&e?
zffL~j>hAS{J^D=#oCIf5bFb&@(Q|s>WEe)xy}q<Z51ayLkykt3ggW}*R5*e;-0Opw
zQ7wIN8W`(?m`^Qza5@<4x0p{oeQ*XC$D6QEADjv5#(Pjh9}I&b%;8=i#C+=LgR{U`
zAH;0x=!3JtSRce}YUzV>z*vvQZ2I6_P&eL#8hYV87|I;(<1N^yj(#}5iuFUxrjDMt
z0F3oS%%+yUxDbrvJ=mu=E&_GqJ*aUpoXQNw@eb@!<C1EPH(-zFUs|ntF6Qz4%fL1K
zZ|~)x2lbp@(*sw)^>}0$y5{tOJ^D=#TnRT&cdrlZ(QkU-D!7rFdwpP!p3?(Y!*FWu
z^`$*};2OAzyxQ?5)X@jm!g<W$ULVAaYUzXPz*rx|d}`@~>%mwb#C+=MgB!qDAH;n6
z;6_k4-h&$YU^raN9PZ;S*r$#@xT%WuLCmI(KDZf-^+C+0mOi)zjN?7nrw?ugb>ls#
zp%-q0E11K5yaoHz(GRy*al8fl)X@`nRI#3j+0@b(cY<-e2S1}X?gDk=J*aUvT+0l`
zdM;*D;~sF0H(-zF-&?KWe|tRtzG@Bs+j~FgK|QC}^uPn~I35{}t~q^RkABkw55g1F
z-RlE;^qU@d2u4tIuMh0eb9&%m7)i~&KCnj*JOWRWS3BN>I{M&IxQ#j7$9u3(Eq(A<
z73+hTPc41$I2h}Lm`^=@@B|pgo3KwGi~x1xJ*c4%M#A09;XdAied_3gC#yK#f_>`f
zgQu!kAH-~G>4T@iINpPw(Ff0fy73;=&<oGP1I*!GFT{N6=!fUPINpMN>gb8*t2o|*
zeQN287pgekgP+kGFM_)99@KaV9%Tk&Jr}d7@iMsTxtPiGUjf(fzdfG+YPE*{?RgFK
zpq|rfdf;_<508vQ*PNcSN5AQTH{gBh?)8B^`b`hK2_H~%uMh0eb9&${7)8y!zO+XV
zybT|cS3BN>I{M%pc$PWb$9u3(Eq(BA6~}w9Pc41$UKQ(um`^=@@IDyFoA5LG-~&)M
z-h&$YU=+N>9Paf&%%_e%_z;ZaE!d}yKKQ7L<1N^ymOl8nisL=_8GY~xs2lG=4ZZLw
zyv`i%^+L?2j(+$IjP*mzrjDNY9E{^F*r%4h_@avAJ=mu=z65pSJ*e>&yu%E}@eb@!
z<LheGb1{?We*><1F6Qz4Z^1SEZ_jt22lbp@(*r-?k5Op4*KgMKn)m-BHDkSIU7vaP
zKan@~?yc)H@BL@;#`@5@cm4}Gb;AFi>z#j!rm^=Ovv{`m?HZo9$Fsd_*YLYNp6@-o
zhTrY+j@1aCd#3mM6`IE0ZOq}h-mR<m8Z&sV_v#wHw#T!*Q`hjdJ>I7p;c3tGKEFrP
zIJ|6+=X#&6-et_-x!$L%cNsHyw)g289=6B(R3rTBnSVmhH9TwGGbOxg-SZ?oYTffB
z{As=8-*kOD)*nZV+1jf8tvYwy%b3nTrhSc`+tvEpf9L4$bxgmHKe}&B^}=7Vj;)^?
zTmP<R@2&lPH203<`;K*N{T>_ryIQrs(Yf3AKKi?9e;@7d!*3vbkga3uJ8SgsYSsQm
z=MEo?t)ClP|E^~5t^IwB{{KMx`{>;F(dhTrRr(v9quKY?DxYhAADw##t#Z%J&e`@y
z=ls#=_t#bW8=a$Bf3?cz+TTa#-a)I}bF*`{{n0spH2VE@mHtNOXx3k?^11f+(Ybff
zD)-#%oNa$}&L53_e_f@&(K(v+SF3!k{e5)q9kj|lH#=wBAD#0@qu*aw>2Gw7X8qMF
zpKE^~oqGqZa?j1q+4e{0{L$$5*H!wv${fG9Z`*(8=>Gn_zwh7s{Pum0exGCdef)8K
F{|Du~V}$?!

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.A.i8f4.00000.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.A.i8f4.00000.bin
new file mode 100644
index 0000000000000000000000000000000000000000..f7a9a57cebdc949bcabe31f7fc61bebe1affd03b
GIT binary patch
literal 32088
zcmeI(WwfAW*~Rf;#6YD?Y(S;Nz`&LP#K6Enr9=<|1C<g3bwEX>#K2YtB*ehLKqUrj
z#XtqI0YwozsQ1hJF4p{ivfhz1=ecJM^5wV|YoB{Rdtc|;_ndowbESDp{&$mb<?xal
zEcpS>yWNuWf*U0WuKNGSc}t&{`uy+XO8qn&&QCWRw(h*yP`=slhW*~z&~;438#i|<
z`gfU%t2BQq-ZcGec(Zg<@#g8L;;QMV;%e!q;_B&V!!^=P#WmAU#apDGinmNZ6>pV(
zHoSGZsd$_8Q}MRxr{Y@ar($)amS)7;H+L%DA^lXmWBRFhr}R_t&grM(UDA)@+WAIt
zoqVIXZoW~xYrd&?xAdcU_k5$cUcOOWKi?>BkZ&q(n0^#D$~TJl$Tx}`=NrX)=9`N5
zN<WJC&Nqtp$v29d<Qv8N=9>-gmu@QFKmAmEK>De;Y5J-7!1Pn`LFq^F!TCn<A^Aq}
zq4`GfVfm)w!_$xABl3;nX8A^OLB3JkJl|B@BK;_CnQs&ynQs)g$~TIS$~P4soqiM_
zlW!Csn{O1i&NqsW%QqW7KHXG&Li(xr#Pm~foAguhN$IEJlhcplQ}T`CQ}d1Dw)sZ!
zY5At&)6<XQGxCk%cKJqe`+TFgL%ylFWBO6tDc>kQGv6rgoNpALm2WEUl719-%{PkA
z&Nqs?<r~H4<eLqjn{FyTFa1<}e)_4nd-|#Pg7j1Ih3QA}MfpbY#rZ~Yk9?!}l6+I~
zrRhiUW%)*N&wQh}SH4l)JKt2?C;ceyn{O0fo^KTQ%QuRz$Tt;VnSK;sm2VVZoo^KP
z&o_#%$u}FmHr-TwUHYlGF#S|KApKN4F#S|~efm*+L%vabW4=*5DBmc)Dc@9lbNW$y
zOTJM&INvB9l5Z3b%{LVfOFxQ-=NrYh<{QN$@{Qu#@=e9Jrys?4<Qv6z<{QN$^Nr%W
z^38_tPB#_blYT0`H~mz6U;3%|{`6Dv1L;TcgZW1BL-|JWsC=WiDBn~(I{hdflW!D1
zoNpA5%{Pk2<(rDfrys==@{Qt0@{Qt&`9|@h`KIE>(vRZD^Nr#s@{Qt2`9|@R`DVjU
zrJIVMPCpetlYT0moPH{PHvLrmT>4S`e7;fqLcUQvCEqB1G2c}DQu<N+a=uYKHQy+n
zmTweK&o>p%NI!~;^Nr$}`9|@qe53f4d{gnO=|}Nv`9|^U`9|>@`9|@Z`DVj!rJIW1
zPCpgDlYT0moqj5QH~m!nUiwk|e!fxsLB3HuC*LUkFyB=CQTkE*alTPJH{U3pmv0n*
zl5Z-WpMDg7nr{?;mTwe)o^KR?k#8#gGW{t2D&HvnI^QT>kZ%+(%r_HW)c4u&H|b`>
z-=>=lFHScb{x02Y`1^EI@sjjY@ek>z;-%@Q;vdt`hJQ*o75|)mD*h$?RQzlDsra|_
zv*F*<O~rqtpNjuXKNbI#ekxv;em1;3-Bi3H{Zza%{Zzav{ZvdoZ>4^?VR*X`PdC3G
zZWP`=#M9p({>I@QLOlJ-@iz(Y7~<(yiN90$KcRg)&a>A|BkmmH?Z;=oo29!;h_@%d
zJ#U_F?GSHYetWN)Zk-S>C;w`FUpM^UP#$~RclEyCHN@MO&%SG<yIY92FTZ`)On3JX
zZ(n|U-y+?5AzohoTlRhZaOM7C<gvGXZ<TI?5N}^T``$X;h9Ta*{Pw*~x{X4-efjNu
z+jRE`@$&Mo)%T6VRmv%kz3qF?bpJ|+w=bW4@0I?t^mzO7+xOn-FHeuRFTcI-lm3eI
zczO9ZNw-?MD?>ff=Xv_VyS#57@Y(+T{}a(0-sSz$<GoLQ{jqks`-gb%lV6{#lkNc_
z-uvYDE;mhg%NCZ$`;^<>-sc1J;k{G)o3nO0@AN^P@!qQ(=E>o`J~$uVyOqa0xxCwl
z<imTv?!`Rs_o3<6>OSQ4j^&caJAPO`y!R}RIr4bV56_49uGd~_o;=?5Bl?c_zU47b
zF7JD@e0cBN{g~&SFGzo<?n7ShT`qaN`_1#=y?gg#jy&G~7WwerzdYv2qX)Lkht~u0
zm?xJ$cw|1jK5#$g>4mM*uiJgdtIy<;=TYfboxkJ<ygrl19C;p{Z?$}Qy(W)&@;oNr
z>iO{cO&;^)dThQm^5ONQ`!R3p^y_yIYv$8~dPC3Yi^t`|>kB?Trzakt9<L|(^_+fq
zLVCP@;MaG0;fd+-dVyabY?E%|^2(zR>~C*<@T7crePDlc?5_`=oDaWtXF1H1LmxaP
z9e$n8@|Y)=K6q+6{JNdpi+Ky;w+%PxKIGL0a>=uK`lp3>eISoH@@$d*=^<Vp$YY*7
z`rsM)@cKX=^A@Dj2itYV>jU>=o<7(<{ifZAy!t>cdGx{#`SAKc9&_Z;3p?h+>jQbr
zlSeP?ln<{D<S|b!z3|L@czv*7sd;)~=lF+qAM)xsx#W3P`t{~7`2nxr<S|E{UGlA;
z53k?kF;AXd^KFn1uixB{d2&5F--h|{`qKTFw_ExJ-NQ!t^q}6*bNb>r`SALJPtWOz
z=cdQ&34T4NAD)*UuOImJonCl;dc0oX*9W_&+p4_s=mY!PTOYh2A6_5W-yHkvgBRw*
z>jOE=lS3c8C?8%Q$YY*d`ryU+@cO{Ln5Pf+NWXRWA+J7=OCEjjl6-i5Adfln=!2K$
z!|MZi%#%kSyeuDHAIM{#T>4<oeE0>O-H&<tV6VP!(|yRhdAwZm=!L!ej^CoQJm$!=
zOW*ei@%lg>^W@nz{k|byAIM{#TzcW<`SAL{{g|g0_DjEQ_aU#IlWUiBuLw7*NAUVh
z9&_Y*WxfUZ@cK<2^W=F|zRmOD^_x8A$@S`dTjay*OZQ{m{^_^x9=6P<2la-Y(-*JF
zhu0T;dQMNgHa%WX@asAK@VfMP{lKs9^uogQc)h@{4-QDTb9v>_2lltOJ~%KRULV-s
z9Q*5o*XP6Q13Ao-Lm#{$A6_5GW1d|4;Enn4`oO)Irw<NFzgzbquRf4V9)0kpe0Y5z
zk2&(_gE!~H>jQbrlSd!CB_CcN$YY*d`rzPvczxi0%+m*lq~E>!kXIkbC68V>G#_3c
z$YYK?df~8qczqy`dGhFm!}H<wfjs8Pr5E0s53dj0k9m6Gi1d4OAM)xsx#W3U`t9lw
z{4VkGm?O{I`@VfX{I2oxm?zIW`o2Rx{IlcbF;A{{_I<~Eczx-9%sVpuUfsh^`ShUP
z&~pc-e^-dt7kqk7PrN%lUQh5Z?7Mz=PiMS-;6I@6df~mD@p^$@AG|N!e&v-%AK2gC
z`r!Tf@cO|1=Gb2!d>|iQAIM>z9Qxpc`SAK+;ZpPD(gz>vJ6<2S7xVPNQR(;ZKIGL0
za>=6)7Uje119{AmM;{!W53dj0k9qRwgJbgH^?^L*$)yiIoDZ)L+>d$s;MnvBbRY8S
z1G(hU3&-Wd>jQbrkw-5apAWAO<S|bky>LQ4ygrb}Jh}A3NAltIf%`E}FPxbEpzcFn
zJtvnuA5FjK{3So&^_x8A$n&v$d*#FHH+jsH=i~YI&WG1;@|Y*rC-Uu+53euXk9jAh
zKcsuuH=iEV8+uM(d@>(iU-0QUJ@KjZcs;?d=k&v;)8iK|<=1z5;WK^5AFz~PADkS2
zM0w>oFy8+5UKIb?5U&sHZ;t(sPXD<OuMgaVd2$?+{_`PTAGi<m<kAOU$cNVl?!`QP
za7y|kyN^Yk^?_XS=z}k&!|MZi%#lYQd?_DZAIM{#Jo@0v`SAKc9`oeV2dC!4>jU>=
zo<2A&{rkEPdG*1fzRRN*PG5@G2lALBk6t(<A6_5G<M+s;7Z&Hk>jQbrlS?n0nGdfI
z+>d#B;jHvWbszHTIl1KdO8SH6FZltl-{dhzp0DORBp+VC$zz^8U(0uBKD>UD$2_^d
zp6{@Hczx-9%=<?AW4njL^XWmoq386)H}m231)rYN6W>aY*Ax7DPCtA*JzhWX>pQ*h
zo%DFUz^@O^PIqE?<<STBx3@m{Za%y|u)jI>*9YIrht~&km?wum_<laTK9I*ex%9yg
z^5OM?dofQRoRj{f?nB;1@p8$d4}REp{L!7|F-IPK@S}A2V>-)Yo;-{D{^Jm@59BdV
zt~1l08{+kW`!VmVbmxU9cOUZV1G(hU3qQ$+*9Y>LvpAhzIKMMqAIM{#JbK}$`SAKc
z9`oeV3qQ+;*9Y#$JiYMq^rv(m^6ELc<oQMV56@rn175$$V~#w(%y(=)ynb8Uck|@=
zRs3=J@cK<2^W^$<zT@-Z_2pT8H}8VZr*#h}<kN$CL(l1p3-jUi1)rYN6Bnh&>j{26
zryqWk9<Lwx^_^b$ZF;<3;MWHir#q{>^5_Hm+gl&}E+1YW*xwxc>x19t!|MY%%#%YO
zT#^s359BdVE`9Kae0Y7}Ud+=6m!|(l_aU!7kV_tY@W*_3eISoH^5}y<<-_X(dCZeX
zAN)BVULVL~o?QCiFZuBL!2Ot~5B{3|?CwKeeIS=Sdf{*R@cKX=bL7zrf6s?s+*uy;
z<k1WNNQXbOvpnX>r5FC04zCZ~k9ilQ`&W2Q_aU#IlS`h<(w|z7;Psn4=E!q-zSHvI
z^_x8A$#X@%)AQl=n>^-Skp9Z>jC^=~>3+<+D*bug!{U4w#_NrXI_nE(JwdPE^n<fr
z;L~gRz*!IQ={4`)*}LcS-hW;WdwS>gvzK@7?0wsh-+tb=vv+MzbL{C|JA2ReHOJoG
zv$J<BuQ}fF1?7~(`?a@yy<cbV*1r7q^=_TLSNob{U+>k~JGHMl_V!Mly-&H#@jfpu
zrySm;z3uCLI(v`y<+rbQ>Fgca*BtwLkIvqoea*4Acj)Zh$!(7JcWF80&?EM?@454r
zJVa-`VPAgxo|oQPU)a|i`~D=ov!1Z8Irct3z4Hb2gxu!*wR}HKKX2aR1@q=DJmZ@G
zmOfwo?Z3gz^m|qme{C67)a;q&%>B-5{;saRBmZ63_cGJJ$85iUd3`hGS>Ace>zmu-
zzxOvb(_PQRFYmwU^7`iXxaMzRdGByV`)2w#xxV-no$u;-%bGb;&SiP7i*Iv#T=O<&
zx{K?Jzb^j0mo;;yoXhfD7vJXgnERW&`tRzx_}g0EnR9=WbAOX_f0Nhz4Y-TteNQXe
zH`DvPzW5cL&wY>PncL$(|7K^p!xep3GyR_Hi(k?C=Kd!C^KWZecRbU-`?5SM^4qoj
V{{IHItPI!o`$zRFV#eI>{69h9seJ$d

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.A.i8f4.00001.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.A.i8f4.00001.bin
new file mode 100644
index 0000000000000000000000000000000000000000..489829cf9c118de2a081caab7274a818cec4721a
GIT binary patch
literal 32088
zcmeI(chvv&{KxTcN=js8l-(dBBfCXLMm81MWK)rmkr5hXWMo7tGBPrvWoKkWDzeFl
zgy!#`-~Jt^`|XeKIbA-l*Y|uor{i}y$9Z%;-;c+$*W=aoy8m~rvEtJIt&^^mp1bCy
z|3Fu4bm`CAuYIZhN4`te_~$?KEv5h2o<;g!`4;Ja=Ub%zlW!^g-@cFPitb@l*T_Gr
zSIR%CYvy01Yvmi&E9W28weyeaRq~JOI{6pry7@-+s`*ECz5Jtkwfv)c_56!;{d}W(
zjr^l}&HST!t^A{U?fi>$gM6cUo&2ME-Tb3^z5Jtk{rrn`!+f*4QMp;YLAhDIVYyko
zQMpmQasFAoNx50QX}MXwS-Dx=xZJ32l7Ch=EjO#1m7CR@mz&jFlpEE}^Uvxn%gySo
z%FXJn%gyR-%8lw4`A7A(`A7A3`A7Bk`A78*`4{Py`DXQw<!1Fx<!1HH<!1FR<wo_c
z`DgWR<!1Hn<z{uOa<jU1xl!FF|Ez9XZdSJ|H>>w3H>>w7H>%s`pVfPno7H=lo7MZ2
zo7MZ48`T~1kLvyMkLvyNkLm;RkLm;SFVY?J&FX{7&FX{8&FVwS&FVwTjq1bl&+5a=
z&FUk{&FUk|&FZ7djp|PMXLaXtv${*US$%Z5S$#~oQQbBFtUk8ftUj*XtUkWntUjUK
zs6H|Os6HwGs6ILWs6HkCs6I9SBHb<DtUj&WtUkTmtUjaMtUj~cs6H$ItUkNktUjmQ
ztUkBgtUj;YsP3MBR`)13t9zE4)#sO+)fbc-)xGl1>I=)w>Wj+F>Wj<G>PyOv>fZTB
z^`-eo^=0`-_2v0T^%eOS=|1^p^_Asj^;P9&_0{EO^)=;2b>IB6`r2}{`nqzn`ucLS
zx?j0b-9P`V9#C#p4=gvUZzwmbZ!9;e2j!pDH<g>!H<z2$x0IXJx0V~#gY%E-+wza<
z+w+g=JMxd}JM%BnL-Nh)yUNY#yUWe$d&<q~d&`aLq4{U^edT8L{pDu$uyV8dfpVjI
zc>Y;EqTH+=S#DN8SZ-E7RBlv{%0H_gE;p+mDL1PhEjOzlD>te~=O5LN=O5Ki<R8^f
z<{#Bh<zJ-7<eSw`mz&kkl$+JhmYdbjl^fM#^Uvz%%gyQ+%FXI=<!1Hxa-(`e{#iY-
z+^n8dZdSioZdSikZdAXVe^$RzZdSiqZdSimZdSiuZd6asKdRrzKdRr%KdRr#KdRr(
zzerEXH>=+%H>=+*H>=+(H>=+-H>#)RpVc3fo7Eqdo7L0G&FYWJjq2(7XZ4J7vwCK^
zS^aUjS^Y`5Q9UdFtp2pztp2Rrtp2>*tp1|hsQxnlBK=jqMf&S}i}W}77U^&EEv0Ao
zeN=y!e^h^;e^mdFe^mdNf03S(Z&d%3e^mdRe^k%SKdOJpzevx^H>!WlKdOJrKdOJv
zKdR^FU!)i08`TT*kLpGFNA=?Tqk2jHMe6T8{9T8?qu8LlzccZj-`{tv$akI8oZsJf
ztkL)Drsn+qzT--Lzg}w2zh?96r_SqK&a+nEH%!;<??ileK6&T6a{i4{bLW(I&b9O1
zAT@VhdFQ@Lz8j|IddjcU_Zy}9IInZA+xHu%>(|qF=aqNftLDE+YVN%9&bwZ|o2KT@
zEAQM_%XhQXTwnRC_kH73ALn(>_4~d_x<NgCcV2nty+-~`Q*-B)ciwB}+blJAUU}!f
zR=%63=K9KCyYIJ1^>JS3+`R7_*6;i)UHT8cJFmR+-m=^U`OTeI-g$48|HAy{&MWWS
zx6Xf2esg{0Z<Fuhd^qBL;)Hj(MgAMt*LUwz9yh$p+m<u;KIQSlyS!a~bMI3gPrS?9
z=QsC0<-N;0<kQFdbZ+PMKDW%jNqv3yPMzOA=l4$USl--w)x$nLyw^LGGxu)wu}?4W
z_Ri(Zy<hiYpZ9y0{Q7#w`sm>u-!=c{-G}eqvp)9e<2~Q4yt#L+kA3=h*LN>x?tSZH
zpI+YgR^`mSbN6GPcfNIgeZ6;m^ziPt$-hPS;k$RQkA3=h|J#-~_x|;<PahoEuADgz
z=wqK=cyNz$=6K+K?8Ak7=GPa;^wDGcd|P%8SLyFueaAC>?9=C7<<}`^j%)hZr_a61
zty|6<-}JFhultm{YB_V9bU*gpH~)J1aS%7~4KH@cf7kBAcf63tIh?p(Idhzl$2oks
ze|~d(kjFb*ctC!0T#(0u2j<fU51iY1@nFaN+tk;0JaB&doF5M!RNfp9^srA4Ja}+9
zb3D+;KE3eZA?3{Rz`fXq2M^7!FCOTl2Oc~u|MuO7?|7h(efr?R!^@lFfj;)>g9nc&
zXO0K@*ryjBJhGfQ9=IR-@ZeGT^~D2y^uUFk^6$`n_>Kqq*ryLJ>|EX)5A?B5A6(d_
zoH-uoW1n8Q@aS^pc;J5Q!-dD>*B9UP(PP(qJ9ZB@izmM0n?CmG^VsqmmovvVeeBcc
zapg8CXO3_B*r(Uy%WYcD953CEeNV{0S$-VE4Sd6kC+2@x_u)HU$m1MNJgJ;HPRQdN
zK0G<UIX=ka9WFd2zd0_*<H1w&>4OK(?YwxfTmGHu>pLDezkSY+2Tv<+jt6?!rw1N9
zy_`87=wqK=c<_vJ=6K*<?8Ad+=GPYw^w9$ko|S*s?!$LH(8oS~@Zj0y&GA4V`}Dzs
z=ae(Y1AXk%3lE-K&KwWik9~OXy!`s&fj)ZR!tVK>*nRkp2m08j4=(Ic-W(6~u}>dd
z*t48D9_VAAUbyi5a^`s8e(b}A7v$F$-}KRAuY9|84_n0(-|<Z!`}BEX`K`;D<C{MA
z>GPs;+mtiMH+}5W>&4}^EoY9G?#I5D<lino4&nyB;l<whpVfW%ju-MchZ8R?XO0u{
zIEN1}%WsYk@_2^}FVAm|3-WmIihTOufpa@A9_*8U_xk#d2hMMw^W(uQ%bVkY9`@;h
z2d^q;jtBbKrxzZ)x|}&4xEK5I;5GU6#RGlxz=M7B@6~<yjtBbKrw<;yw!AqW=wqKg
zc<{P%=6IlweR|=+>&uzrf%~x!5BAHiFCOTl2QKWNfA8+YcRbL?K7DZEfb!;eppSj}
z;KG6B%<(`U`}D$vH<UBS1NUPeF1#_nzWAn(9tY*yr+av0Jn<dh^s!H$H<f=>Idgo|
z$3A`DTyCdw=J=+MeR{p6+|K39@zVX+_tyNo<i|nWz&E@&IRC!ghwpeHk8?QjwsPh;
zA&+zT@b>)X_#lsWxbTkr=C~k_2k*?M4<0zT^WwoF`S-7{?|9(+_BlTuysNx99_V48
z9(eHXa^`rTk9~UK!F$S?<AHmz4-ej(Utc`XM-MzWH2*=}hwpfxkA3>!!TZXa<AFZ*
z>4OLFFK3Pi`q-xz9voKA91q-&eR%MJ{QBa7K6>E7;rS2lK77XmeeBZ*7mg@zjtBbK
zrw=Y1S<V~}^s!GbT=-x)b3AZA_Tj>Z^6QIl`si^~zC*f)=f)G?@l7B5^!af4=an<Z
zH+}5W=Og8IFK3Q#`q-z}N6YO|&Kxh@k9{A@zh{0N#0`AIi=*=&+I{$r7xFlV6CW>U
zjuY}YhYz2~Z;lW0c!vw0%x{hh@_6v6eEQ&lb2~2{9Fza>`udIs&TpUd<H4uPo8y5V
z_UVBKpDAaK2m08j7an}JoH-u27yIzwbNThf1AX+sgJbg_)qVJm2m08j4<3BJyg44|
zW1l{F@P%^bc%YAcdf~xw<;?NG{n&>G$LH4<5A@Lk7f#53bob#q9_VAAKDcmVd2>9_
z$3A^<;iPirc%YAcdf~zs%bDYW`>_ufzLZ~IeA7pdFXua^dw6|3@g3jvu}`0`l;5wM
zIlk#*pFUqLw|_ZveACB1y}nlNfO6(|>3;0{dj13R;~;L}8(y58|Jd%scf63tIh^=L
zIdhzl$2olXW`1*gkjFb*_*Q;%T#(0uZ|Bno51iY1@!*vFC)C$>JaB&doF5OqQ{Eg8
z^srA4Jos)ob3D+;KE3eZd*#gWz`fXq2j9=HFCOTl2OgZ7|I6Kn?|7h(efr?R56YY4
zfj;)>g9kq>XO0K@*ryjBoL0^p58RJ^c<`hA`r?5;df>w8`A_aXe8&TQ?9&Gq&M0q=
z2m08j4=$Wp&KwW)u}?2t_;ERNJa9ku;lfYy>x*yt=y6uQQ@V%4;)(D0rjLF4{IvWB
z%9-PvKKAMJvvP-*Gsic5?9=P#<&G$4j+gGozF*`&GCvOD2EO6NFY}+;efW+S@;HYR
zzba>r6Y@BR55LZDjt}y9hYP>SZ;lJ{c<|eN`rv_cJ1-ubo&WUu`i=+AZ=dty!SBkO
z<AEOb>468oFK3Pi`q-xz9{i!4IUcwd`|#k8`SryEee}SCbMl|nefW+C`q-xr9{j1i
zIUeX^pFVi-=W^zFppSie;la7(%<;he*oOyy$*(US=%WWNoR|NX-G}dZppSj};KE<a
zo8y5#_UVHQe=BE>2m08j7cTt0oH-u2ANz3O{QUajn?8D6knim7;kbC>JHF{-pFS6s
zKfatfzUgD1J{Ofcp`1Cs>0_T>7neJ+oH<^)ANwxJe^P!N#0`AIi*vdMbDWUFH+=9j
zF38~;9{3pt<Z#XV_p^5|=e;|pckW!y<DH*Z4|DI^`Rs8%@7vGbwR76zoZhvcy=UjO
z$GN>{KYPde+T$JT;r%+Vb9%oQ)YII%bzXa%*Sqzz_v*a%IIs8WXYbT`?Qw4J)X(0h
z-u8H(dU%)4>zv-_ztz*+dvsoVoY%Ybvv=sc_BgNi=x6WGdF^p-@6gZQo!<6%e|q4D
z^E&6h*YC96sX1;quRYHDqx^ox3+J`Rc~8&pXPj_edz|}>{C>t8z3n+O--;Dq+kVB0
z*L-#5|F6#3W$pUMzwh##U!J>{I{Wg!bLHP5zf-H@UY6Ri)PIXb|L#@IEuUlM|HfDJ
z`&jCHt7E>@j#d5LTGib0IhKDXFE8FL|4y#_yY;VnA4@T0b<CIAv8s2us=4KJto*xt
zMZb@w&bK<|OYK<I->p^6EuUlgck&;<JFEKpb9v;Je<zoJCzpRGSN<JXzK^;4Sc)O5
uW4_dm%Y%jgZ0GVhR{ov1BHzbloo!WTmz7(U-;<d=Gv3v8mj56B&i?~|u%@E`

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.A.i8f4.00002.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.A.i8f4.00002.bin
new file mode 100644
index 0000000000000000000000000000000000000000..675298697a3f012ca21ca679fa2ac5d41b1937fa
GIT binary patch
literal 32088
zcmeI(Wz?@_nTGLA2nGg9DFy}xN+|{gq9~;p7#Jv}7#P@;VqjpPlwvCeN+|{gDk!BG
z*osn$fx&#4QE_IRndRd6EtYF|dGC8KH+*o<TC+}{>p9PB-{-^sKEAyxEV<(UuA8o$
zUb@m1|AQ{M`4!Jwu5yL`#|l^IWh-9&Gv7k`r}m8MpYxCEU-FOY<@rbTulX0#|I9b4
z|CN7K|2zMv{w@Eg{!jkJ^nde>>XLpxqq;)=QC%_rsIHWMF<m*|s9q=ksIHQKR9DSE
zs@KiGkY2C%i|O_AEv7ffx0tS$Z!x`LzEQnV{#m_oxmmqQxmjJk+^pWT+^F6x|E#W2
zZdTVUH>+!vo7J_;jp{o2XZ7agX7v{3W_8_ivwF*Nqk60SvwG`tvwE9yv$|fnS-ow!
z#q@UhM)mgjNA(W*M|J)Dqk6~uqk5<OvwG)pvwD|uv${dKS-oqyQN3IKS>3SQtZr0p
zRyQs;tDBS?)lKuy>fOuD>OIQM>SpC;^`7NM^<MdB_1@)X^*-fhb@Otwdf#%3>HYGJ
z>izSN>I3qR>K6G&^?~_Eb<6y-`k->N`rvZ2x>dPZeMq@ceQ5q!-MZYYZc}bnw=FlT
z+m##D?eov-!^+L-!^_R;4&`R`5#>hpk@;u!QRQa!(dA}!$8xj!m~xBhWAlyb<MNN{
z<MWT|PWeam3He9$iTP*sN#$ns$>nBs=W?_9lyal`)cmu$OSxIywcM=kR&G{zFE^@t
z<e$~2m7CS4mz&i+%gyRD%8lwX^UvzD%FXJt%gyRu<!1Fc<rdTD<{Q=L<sa4O=O5L*
z^N;Ea@{j5Z^Uvyw%FXJF%gyRb%FXIa%Z=*G^3Uo%<z{u?a<jT$xmn%6+^8Oqe^y^!
zZdPAWZdMO0H><BKH>$77KdY}UH><BHH>(Ggo7LBrTTEY<Z&Y8Oe^lR)e^d|7KdNuc
zKdNuaKdWypH>+<cH>-z~o7K0L8`ZbvpVdRl&FW$0X7%uLvwB3iQ9UyMtiHY6tiGe%
ztR7WvR^M4}RNs|<R^MH2R^L-@R^MB0R^L}{F@1l&QT;&vQT<^4Q9U~UsD3E_sD3#A
ztbU~2tbVlItR7QtRzFs5R6m}7R*x+=tH+g_)#J;}>IvmW^~C(M`iXM0`pI&$dQ!Pr
z{ZzS8{dE3W{Y<%8{cO2eJ-OVhey-eN`uTjL`i1<X`o;XCdP@FL{Zjr>{c`?U{Ytr6
zJ+<7do>p#Fzgliozm|ViPcJvCXOx@OGt15DS>;Cc?EJI(^>VZNjdHVkPPtkAX1P)Q
zR{mN2cDY&oPPth<x7@6Lx7=d-y?mqk{rsc)gZ!iV!~CQAqx_5MkMoV{Px6oIPxFuJ
zdHF~6XZaV?pXVFZ^Yf4D1^Gwy!u+FpQU1mB;(Vj}i~OVd%lxByN&Zp&RsO~F*ZD^E
zH~B~PxA{l)()^?PyZj63?|Z+P{vqFD`p0~W>1FvAQ-AN_?>hW_#0|@@amAmFEb*S-
z-*xyqi5ul#Gr#w8{;tE{N!&R9TKT<~^LHKoPU0r{*Us;~oWGA)J>NR{{;g-doZq?q
zoy1M^nLD?fbNhRVo8>omZh7Zkl5dUF+_~kQe}#N&rsn#}uh{#w(tl6&ac<{bsrPHA
z=FThUyesEhCpC9odFQ=OzMH4!&MWWStK_>yYOb&Rs=Z$~y*$;&xt;gAy}xB@?!0o&
zd%b+OO3j^D-g&Q|@7Afg^U6E-4f5S4HP=^uwcf9n{w>wVxt;g6z4z>#{LXp1e4d?8
z&iQVi&$DyMIo}=fdDcg6{ob$G-=*P*dxsP5+a2?7*nRch{gcNF_wG*RHY(@6duR`C
zxPNypw{bb|-A8+H#67%AxlPJ>?_S#DK5meI)BLOUJ@j@z_0!A!ylZ)L_f#)?^m0${
zR?ggg)yqD;+}91unY*`o*{7d-yHPoF_t*Ea&;8vv|7v{?ecfZd^l^_jDQE6J>tl~T
z?(?SQ%-w5!?9<1+zI!=y_gf$P^m4!NQO?{w_kHYh&o|4zdf!7|_gyc2-1~c$Gk5>>
zu}2>qxK}xIJkZBJeQ@F4<;?LxAN%yeiTji@#|z)bKHS(m|5|+yeQ`}MeeRpzGp^|&
zugCrJd&W2Cx5xSKpWidiIk!E||A73SaZ-PKw#c_`J#i2Z@C^qZn1Abd;yoV7;~Nfa
zS#Fzh-s6Ei_=W=yDz|Mp@A1GMoWp?!m)owK_jq6r4s4Zw`~2(mJ@m!{{q(|vhm<$R
z1HJ6g3lAPz&KwW)vQIBO*t(oK9_VGCet57=IdeSleeA=7ZS$|+_s|y)^wI|pwkv0j
z2m08f4<2k^&KwW)u}>d7cvv}eJkZBJz3|}S<;?NG_puKTcF4a$-$P$K&`Td&ctkmK
zT+qiJeemIt<;?LxAN%ydiAR+)#|eGx(+e*iUCtaYd>{L8W5@g(_dWE*JH7OIOn%Qe
zr-!^AkInBH=bYaj=YL#&&p7AY_Bj9J^Lxfi{q5N)-)8m1K|H`W9C$+hUE+!Ncp#5&
zIPk=ByO#4F5A4A=9C%W>-O7272ln6`4m`Qs?&ZA41AA~_=lpx*-@NakHy-Gx7alyN
zyg44|WshEX@YHhVc%YYkdf~w?<;?LwFZ=YvgI&v+<ALvEA0F(Me~Z3{zIdRQK6tQu
zIdeSF#~yv~V2^U<c%YAc`ryIS%9-PVKKAK_2Tw0&jt9PveR!~E{;m2R`r?6J`ryJd
z%9-PWKKAH?56>)Tjt~0Srw>j%tDHGb=wqK=c=7CV=6K=z*oPZ?<=?jNp)cO)rO$Kn
zd&W6E<n?%Ne$P1P{PsBi^YVMfIp?;=`JbQPGhXU%&))fVs3#8M0lwkD3-a$1PrSzi
zd3?ix7na+%ocDNO55D2Ri^}a+&U-wt2j_6$#pU)d=RF?Sg99(ge?a~n`yP7Zfqr`7
z!Ar}V<AGlG=!FL_D`$=edfBHJ9_&-j91rxePd_}^x12d1_&)aG!G8I7>U-#m2YTs)
z2m6;Z#{+%r(FYF>C})lb`q-xr9=yDqIUeX^pI&(IigM<7;QQEz2M6Zgx$mJb9_XbH
zF1)gwIWFj9k3RVDs&eM|ppSj};KZxTnd5{$_UVNeuPJAa7ru{uxN%Va-TEH-;+<al
zyf(jQoYO;IkJsh*jC0O!kMqAizh|6tZhM^n4f#FerT+FDoNv#1;vgR28xFiN|Do~3
zdpwZGHyn6Vxx>nNj|cYP8xFj=+~MWC#{+wC4hP;+?uc^U<AFUma7g|m^Y7L7&>Ii*
z(+dyYTHYKF^s+}UJa}6<b3D+?KE3eZ&~oN@pqG96;lW|$%<;hYu@4Up&%bxyLti}5
zOCLNqqMSJ%=wpvQcyMGnb3D+;K7H`u?d8nzKp*?`!h?5|Gsgqp$38qbD*sFR9{S>e
zUi#p|JIk5lf<E@>gAea2XO0j0*ryLpyt|w^PUvHwUU>1Ia^`s9``CvY@6Eqo-$P%#
z(@UTC<@bzpddTbX{`{VC&iU<e{tx8$jC0OykMn;pzh}JE-=3rM9av8s!~=Z8fe+<B
zHlBEo2lDua10ODTTsiOYz#e?Vfsd3szMS`XU=PmWz(>oSP|kZium=Z@$$w)0gZdtN
z<AHv9;lanso8y6A_UMHNA1`N)2YT737akm2&KwW)vQIxeIIf&I9{4`?;lc6w5AJ*D
ziwAn?g9j&+Gsgpc?9m4gPAq4R2m08j4<3A?oH-uoW1n7l@X2!Kc;NfkhX*I+Kcw%W
zFCOTn4=#MFoH;J&V~;-g@ab~q_@Iw{`ryQ8%9-PYKKAK_7oRO>ju*a<eYkOQ{=@qo
z`r@5l`g|_GXPnbRUXRb`_l$GSZ;$hTA-`vwb8dT_|BLxO<E8%goRaUTdg34+;2REn
zDgWv5#CtrD$2T1Ka=A0gd5;J7;2REnrQDh2yvGB3a1IAfEq7Kq@A1GM95^li+4<kw
z_s|;;^wSFuzFOWK5A?D}FFg2KIdeSF%RasE;Pi6lc%YYk`r*MD<;?NG_puKT&dh&w
z-$P$K&`TdYIIEmF9_V9_K6r3;IdeSF$3A`V;Ophg@jxH@^umL0lrzTz-^V^YI4A!x
zeGh%{Krel8;hW{maX}w@^udR3l{3c&eeBZ*C%#?I94GX#PcOXqPC0YD@O|vVjdSxK
z-}lfL@AT5=yZJrioF4Led@sLeoO6DAod5gzJ>#5n+vEH{$nP01^|$AT`A(`Q4&nj6
z;lPjbpC3=W#{+qM!+{@{yP%x+cwi5{;lNMIU0BY0Jg^7naNwuqE-L3e9@v8e=jFdR
z|H*w1z41Ulz3|{?<<0RxFMIUDgP)f(#{<3W(+dyIFK3PidfBHR9$Zk)91naS`|#kx
z{HOFi^u+_c^udFR%9-PVKKAH?2N#z!#{+%r(+3ZJQO+C>^s!GbJosffb3E{U?8Adg
z@}JiC&=(K%(gzoQRn8n2^sz@DeE4-ab9~UpK7DZFH|5N6LLd9|!i(RQGsg?x$3EP+
zH2;}>4}I}YFMWQO-!snXA+N{p^LxfQ=eNiC|B&A^&N;U|&i}{!p7BzDdoIg&PCaoD
z5AY2K{uD>daX=2&-2Xr4H+TQ#@yxydOMY|rULMcf_sjE}yYKSu`Cs#$TTgx5bLV$%
z_uRAl?cDOt?S6Z9ubtZ-=XS3>yU)&TkMq0Fp50@;?QxHPSWi9NU*~pS_t&#~>%8*L
z>)v{HU!B(;=XGB_yQj`;k8``Hp50Hq?QuWPtEV3BrE@#4`{~)ebY6Mqbw543m(FXC
z^SYm&-Am`S$GP24&+et(_PC!H)>98Wac<|O_~D##&Pj2@`Q)9C;)Qd`J0Haxz2q<H
z{7aUcw&ju~uRQf1|Np9HfA=iQ`Lf)-(AobL{>`iE_|Kj#^nLxVuIk@gR`0IKf9vXc
zFF(hXOj+n#TwC+2`|q|a-YwK~S^Qg9w{!V9mj5RI{`<JP-^exnZuxI=`EPRhZ}Q6D
zfNyb4-@}Fey@l@QwKZSpoW9#a=UUp_KYQQubNv6``s_De$bW6km-fHu(&iTGxwQM1
zHn;p7SN@h4`WDyLd};riE^Th1o=dxLX>-fZvHUmr_utOa{(hE4ZuxKW+Wk!~^!=CR
Ud|B>Z=r{VW@NZsK$EBbBAIb!=y8r+H

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.A.i8f4.00003.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.A.i8f4.00003.bin
new file mode 100644
index 0000000000000000000000000000000000000000..055e43ef4855752a73e0cb014a42db5451b0527e
GIT binary patch
literal 32088
zcmeI(Rn+cPy~XiO2&hP@C}Lm|1_lNOBA{ZoD4}9tV4wmj2G}B{Vqjnc1_lNOQYr=p
z22v^pD&Cx9o$!R`oWbDxxxlkup0)Pa+rh<l49E2UTXW9+n`^vldiAWa?DGGt7p@)t
zeyz*@2VAz<<=;E5b2<L=nwR6H@s|2FUxa_iZxsI+e-!@|e-!^5e-ZvA-YEV{{89YZ
z_@nr5@kjCB<1fO$#v8@|h(C(|8GjW2EB+|{cl<^8w|JxYKk-NLf8&qhvfkGyt`UC`
zt{HC;t`%<)t{ra?UM=1tTqoXAxNhgOxL&$hyn4D>yhgfNyk@#lTtEISUMt-!Zjf#k
zH%vE+8>Jh?jpNVaCh2DJ+UaKTI_YNdy6Hx7)A+M^y>zp9{dBXqS-M%gLAp`gJpL%&
zF#agsDE=tkIQ}T!B>p1YBHk?CG~F!TEZr>LJl!nbBHbw7GX5;yD%~t@nQj)hN;ivJ
zryIp>;?Lr()6L>-(#_&+)6L@T(v9M_@n`Y&>1Oc`>1Oec>1Odx=|*w8_@j8|_@j82
z_@j8&_@j8Y_=|A+c(Zu-bhCJmbhCKRbhCJ`bfdUK{8_wrx>?*Y-7MZG-7M~uZWMQp
zKa0Dho5lO4o5lO3o5lO58^vAY&*B5p&Ef;o&EkX7&EkX8jp9S%kK#k)kK)7PkK)7Q
zkK!ZZFTzL0o5e?^o5e?`o5jbZo5jbb8^zt?&*J0K&En(J&EoFqW^s>nqqt}MS==k#
zEIuLKEIu*aEIujSDDEA97N4AM7N3%C7N44K7N3@G6!(cgicgO}iqD8YiqDKciqDF_
z2=|RQi_cCsi_b|ni_c9ri_c3piu=W%#pkD+#TTTT#TTZV#r@Nb;sNnz@xXMm_@Z>P
z_~LZ4_>y#^cu@RVd}+E_d|A3#e0jQAd_}rZJUIR+9uj{PUm1TCUlo58UmbrDz9!x*
zzBb(~zAoJ?zCPV7z9HQx9vXiZ-<WO|4@)<Tho_sxBhroHk@08osC2XVrgXFT=5(|8
zmUN?dbo^O-Yr0u{Te?|%d%9VCN4ilwCjKbCGyW*PEB+|HJN_uXC;lQlHr_10H{C40
zFWoG@Kiw>TAl)c_F#arlDBUc6INdBBmu?o1PdADu#Gl2Fq?^T$rkll&rJKc%ryIo+
z<ImzJ(#_&0)6L?i(#_(h(~aUu@kjA9@kjBq@kjA<@kjCV@fYFA@n-Q0>1OeZ>1Odu
z>1OfE=|=IC__O$xbhCJBx>-Ce-7KD-ZWPamKZ|Fko5ioDo5ioCo5ioE8^yEY&*C@I
z&EhxH&EmJx&EmJyjpEtyNAWxHNAbJyNAY{{NAdgd7vVYaM)3#nNAZX8NAXATNAbt;
z7vZ__M)4={NAbM)qj-M&QM@4jBD^r(C|(qQ6n`3j6n_?f6n`Fn5ndc`6n_za6n`0i
z6n_<e6n`Cm5nd8+5&kCLBK&Q<MfkgTi}2ETOQGL;_&tZ;N35G}gEcPy{m5TKJUYMY
z@H>h1(rp;uIi25i_?^Vn<8Kt-Ii25i_?^Tx;%^+^Ii24}Tr=J#@#M0%ef>^i{rG>2
z@7&(>_V#;;Yo#-{H@&_6USfmz=Juwyzu!x27~fo8dcTv{D4sm_wWr@nY#eXRe&68S
zzV!C>dx=fbncJ7%zJ4!p?fB;QrMLI8c-INd<)vSv^XrE4*w>zGcD`x2?%)0H!@l(P
zT`T_eLUa4_x9{5Vt{<A)m)_o2i?>;5E-(E$o!=mo$G-O5yz}+TXKqhAd)_d<Z~M{N
z??&-_+l$VAH;(699=e-!u1CB({ouWA5pT=h-Nxm?^Zxkg3-9ix>9<Pn+&ko>H@v@_
zrQ154bMKLl9`O!uo^G3T&b>=M-s3Ie-#WhB-ltshc%QdSw`up`+&h(vpIqMQt<sx&
zuX6E|%X{52ow;`_7eD#D+pW@>d%y07pZB|Ue0jZNdF1epw~4=b_u<@omWQ7_-t(=~
zn|s&t@RP^8zD+uF?^_;za(UmkO=s?%yB~hu`R(G%>%Ge(hj+hi{4Kf<=ia|O{N&LC
zw@+`b59Hw|k6yS#I&=LX4?nr|#2wR_>kIe8PjB2QzP$QO9yzv)cgya<T(8N&M~*wE
z^R3_P&&U3EiSJv_*_)63?;78?o|K=@-Qwv%eW2I$!1nQWtVgyfFP=W&qu=zv-P7ME
zy>orQN5AQTd!*YbopXJ_N6+bjd#2ktopXJ_M-SX9{x0$5)(3LQqYrjSw{7>~Tp!5A
zPcD6M@AT&SKrViA>4P29nd<|&_{paa?vu`3AGjZW`e3K{^6CS5<j@B@$KS5|aIO#J
z;U|wi*d@KWK9Gl>Jo@0i>CE+kJpAO+2lq>7t`FP~KYeij`10xldF0RwyT;$X`*5xo
z<l!feet1B7bNwI>KY8@T1Jjx733>R*r7s?o&Rk!(AAWk{!SUtQbMnaXka#<E59WGK
z4nA@`G@WlfXMaBSe^`9qdd}W_?EmoizV)U2d>#=`59$NGrUxDw@A37>&gI3^2YmFK
z9(Yvx-P1eQ2YmFK9(Z)RJ<>VX2YmFL9(YW;J<~bY2YmFvW8?1?Uv7OMmpuAlw{*L9
zAI|lGT>RwH2aii{t`FqmCzn2Wd^&S|AQwOR^ug}w%=Ll$;inJwh%c``kVg)EuxI>-
zbRW+3fjs==(Fc2_H`fR9@RLU$JRzOAK9Gl>T>9XN>CE+k`{Ab#o)lkReISn<dSUPQ
zkL*62>jioE$)g{hoZehN$iq(_J@J%u=6XUNesbxHr=~O47w(6j-gsJkdG(w;a_kdt
zx9-7Q&&k0@j;E*dt>^5|$NtZV?_1B=n~(jU8Q-_Ql%LPD;^{$spx5-kzVTjAkL+1q
zJbl1Nzv+Qzr+;C3=lXz;e$xZbNw<GG=lXz;p3?)*O?N;#=lXz;9(Z2-1LMoB59E?Z
zAMBTI@9x97K9Gx_T>9Yo>CN?lT>RwH2QNrxt`FqmC!aoeVLEet;C}e&gZ<;ns}JOn
zLmwOvf1mEdxjvAGpFH~D!1U(&KpuYb=z|xfGuH?5@RLg)yf~e?K5#$$^ubHw%c~FM
zkwY&W6o23D!?|9Nho3z9;ic)#^@BY8<k1r^OJ}Yp<l!fmzIb^$bA91{`00&T#Ftmk
z$s@<X@%HN;%=MfceB?MJoo_v7e?InqWqjXy&fa|N|El=D^`-oLUL8*l>I1!|2VN8J
zuzKWx^5W?OKKe}$yf*#e>7DBXKKe}$ye{1l>745WK6*|MyguEL>745WK6>B{@sElx
zw?2?d9({0Vx`Vn8=lVb{esbx9H>Nk&2XgU~OCKDT&RieJ#ZNwcaCka%ec*oh>4PKU
z%c~FMkwYIG8UNt!!?`|?ho3z9;HdQG`am9j^5}y%r8CzD^6-;OAG|r8xjt||{Pe+F
z;>)WK<dH)!93B5P-G_6%AP+xz^ut@zo9hR8_{pOu-j>c>PsqbhE`9O#bmscP{qWNp
z?}#t2o|8w8W8xj!J(%k`Irzx&&UC)@oc;OO|6TEY>p6S#vH!c{`_`B8^LbA^J*W@#
znjSbd-iPavBg>1Y5BTUeJ@DT2$EA0!5BTUeJ@CGC$ES0y5BTUgJ@Ec?C!}+(5BTVT
z55)gSe7W_3T=M9H52ic1`*5xg<l-lnKKM|2bA2EeKe_b5htrws1G)Igrw@)xXRZ(2
z4?lfye0+KJfjn~PgA?K((|tJC2lDWfM<0A7y}3S+ho3z9;G^lx^?^M6<kANpOJ}YR
z+z&r}@bUQa>H~S?&<iKVKeqdDt{3FtCy##kM0#`mAP+xz^u#CAnd=F8_{pU&K9$Z~
zU$`HBdgIga<<)cY$Z=A<4|WgcdQJ{La(pJ8Z#`#!KKB1?eBXM`-hAx;x%j^IrTlz8
zA5RbJ1HGmPPL6kKJ#s>M@$>;7{iX-Lkp8sv&h-Hw{iX-LnC|p+&h-HwJ*Nl0l<tgl
z&h-HwJ@DoDXU3OXAIK$-J~$=aiQR{DeIOS<x%9zT(wpl8x%kPY4^B;It`FqmC!anz
zEuFbOa6kO?!Rhhk)d%v(p%2c8e^U41Tp!58Pab`6W_ojdAP+xz^ubrtnd<|2_{pUY
zzLw5hAGjZW`rzyF<<$rB$e|a`ihpwV;ao4s!%rUl@Qw85`avFk^5}_grZd+Q^6-;O
zUwkW_xxR2e{Pf1R<IAh(<dNg-c&Bs^=6X&JK5~2~oo_v7e?IpAZhYT*&fa|N|GoIW
z^`-oLz8_By>I1!|2hNFiUOjR~dGYiCAN{5WevtnB^v?AGAN{5Wewglpbk6kwA3diB
zew6OQbk6kwA3gBn_!q^OTOY_Jk3Kjz-C5m-bA2EeKe_b5Ptu#~1G)Igr4P<aXRZ(A
z;wPUzI6s}aK5#$$^uY!3<<$rB$e|A|jDL3b;anfc!%rT4a8Y`5eIO4%dGx_g)0yi7
zdHBht4}O-;Tpzd}e){0&@#WPA^2nhVE{=ar_u*VG$iq(_{qT$Q=K4V%e)8yvU#2tH
z6Y}trOJDpdow>enKm7E@uj9+B=j4&&l6dEK59WGK4nA`HCY^6RXMaBS|80EVdd}W_
z?Eky?zV)U2d@hZr2lato(*u8~KQ1h%b3H(>*S!BfrZe~c>Ghd+|EKuo-aWlO^WOg)
z-`snr_s;(kPaf~w-uCs*FD|FK_ib-J_V&Jgd)M~nV{h-;xA$ysKKA#XeS61p^YM=5
z@P6%UPw)4Va+-U$_T^(=@7A~XYF|F~^<I5@r}pJzZ|~H%_bE3Y?^6!%(!TceK7U_M
zbMMl=eC+Fe`t~mE%g4Unr*H4lzI^QMefst;<>upk%ArT>YtMfwpKtwPPkMVoy<tCk
z`$2tSFM9hyeIpnBvSnxNxNO-Wr~m)|uFCnU^u8?1^8A-KTZ+4~=2w+}b9sBL=xlj9
ze?R}ovw!5jwIY8HSEgANXIJ(6SZcqOF<;7KRowHHd9L2$ivK@yRlkp=_FEbAr97_e
z?`Kt<t=?nx-{fU~SF7T0YehX*|4pv`n_T@jdBwkh)%P)XA4_$}%9t<Zv7&vqqPo?4
zT=8$>s(v3!?YA=KOL?s5-`0xiR`0R;Z}PIgofZB2Srxj~f0L{KCKvrpF7-FEGUhA8
a<I3K}^8A-KoAsFGUse9i<?XRzv;PAZfVkHH

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.A.i8f8.00000.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.A.i8f8.00000.bin
new file mode 100644
index 0000000000000000000000000000000000000000..085f9e582b3bf35086e3015bc431bed52915a76e
GIT binary patch
literal 38488
zcmeI(b+qSI-No^7Obo=v1`JR!uoaa7#a0Xq!~iicFfgzMY!Sr3z#v2s0|Q%;0b4Op
z0TlzgTa4$Q=ULCX@0V*iOV{t5QC!T-^`Cvu{_g#m&p!8_t^atg6-)oQz#90ob1xBa
z#buYytIn4&_}f1oSFCwn<MZE-=jx|LxH8=$Y~2-$@I1|1gy&7S2wlf0p1--HxaRL=
z(RrihkKzT>FTx9@8^sH!AH|ELAH|K+kK#qsFTzdIjpD`9kK)DCkK!fLkK!fMFTzWu
z8^uefAH~b0AH_}6k79MCmi{GPuDPRl`ShcBh4iC%#q^_irSzkC<@B?-S-x4^Jl`yC
zk#82Sl5Z5Rntm3qmTwlXo^KYn%r}c$<r~Foq@TrW=9|T9<(tK=^UdP5^Nr$l($C^`
z^UdP*^3CEl`DXF@`4-^~(v9K`(~shf(vRYe(~sg!(vRXz)6e3~^3CGS^UdP6`DXDJ
z`9|@U>1Xj)`DSsue6zSJ-z;vQZxnY(Ka01{H;cE)H;X&wo5kDa8^znDpT*nfo5efi
zo5efko5efjTZDH`H;Q*jKZ<uvKZ-l0AH}<+AH}<;pT&FRo5g$Po5h{;&EmcCjpDu2
z&*FXZ&EkFY&EhWkX7PUcMse5lvv~h}v-p5~v-rS#v-qHVqqtl8S=>F}EIv5jEbftS
z79Wyt5k55CC_XIxC_X&>DDIhl6d#d(6d##>79W*w79X8&7Wc|Gi;u}SijPe{i;v4U
zi;vGYi+ksr#V6z&#V4kp#V6&P#V6;R#eMS4;#2aC;#1Sl;?wfY;?wiZ;xqEi;xqFt
z!e^x$#b>7<#eLI{;(qBzasTwA_?+~!_}qN6_`H0x`22jc_=0?+_`>wF_@aEX_~LxC
zctE~cd`Z4hJTUz%9+YnuUz%?g56(A>FUvQIFHb*<ugEuxugo`#hvb{ZSLIuTuTD3L
zuSq|OuT4LSho&FJ*QFoD*QcMwH{_eeH|Cqg!}87I;rT}Ki1f2~WWHH^Q@&X|D&H)=
zIo~M0CH*WOoo^Q3nr{}5$v2B{%QuQ|Pd|(A$Ty4c%r}e2=9|TL<y(aBPB)70Nk5A3
zO+Sjqr60xjr60xjr=P_S<eSA0=9|S2<(tJ1=NrY3q@Tr)=9|Tj<(tLh^UdPN^Nr#O
z>1T0uzF9mm-z=V#Zx%n1Zxlb7eilEKZx%nDZx%n3Zx%nBZxMbj-6(!O{V0AR{V1NC
zeiXl$eiXlyeipx+Zx+9jZx&C<H;Z4*H;P|NKZ{?_H;bp{o5j=e&Eo0#M)4czXYrf)
zX7OA3X7P-Cv-s_NqxhZlv-sV7v-rJyvv_8{S^R#!e}zBj`y%{dx<&Y-bc^uE=@#Kn
z(k;TDrW?hdr60wgrys>%q#wm!reB1=N;itXPCtsjNk59eO+SjiOTP$zpKcWYkbV^Z
zn0^%hlztS?O1}vIoNg5Vl71Bbntl}jmVOkIuQ*pfoHx8|h^JfG59bRn7vky99e@7t
z@*$r7Jn<I@uMpztH;TVv_&=e2JFc+T1tYE$;_b(0zYC?ia)`GlzdbLUZnF??Uw(UE
zB;DpAUQYgv`@Ti^zo9(#w(mvzew7e!Uq1V8lJ2S@-oE_yy;!=dg?Rh&+xz0_t{&p$
z<-bJVw+zqIFGe1F+xL>`whHm~<+Jal(p@9O+n3+Imri%h5N}_8dtWBqwL-kS{G0ZD
z>u{rT%42W)UOU~N(&6pPXW#3jKPx@nzWnyRZu&o`$J>|R-q%b2m-Kjf`L{{8ak{^T
zdZf=Q^o4hM{XXEc{r&$ZqBp$D8>Gj3pZxk`vvfBM@!luDKG{6ojY7Ql$?sj>INc>$
zSRU_FZhL#5H_3<hPVH~bX6d}sn|8)~uX30thxdB3e0c9x9`oe#Zf~9s@BO+L^Ss|}
z({I{+$m<=;C69M}i+p(RSsrub@t$v)5AR)Xw#Gbpyz5)_9q)b1W1d{z_jdX4-nsiR
z&pTh0{)*j)yxzN9@_6^#=fivV?#CQ?y#F2Y;k|!(%#%kC+&Uj#56EMlT>9WP`SAL{
z{g|g0c1*uT_aU!7lS`i4roYI_r62J6OdfOOxm~`E^WpWHJm$%B`+OJ8hu3fNm?zgA
z@@<k2uP5D)d3Q{|W%qEge0orC=sA6Hr+j#Q!Kdf+#GTXQ^#s43(+_t^kJk_U`c5z0
zH9cN0@auz}(rsN{dGvw(?X3^)mJhEF>~D_!^}*fq;Wz6nhk0`7gL|aIZ{ArR^W@S8
z_e_W1qO*H3Z&m!x;Wpiey!t>cdA3h~uMn>f<S|E{9n#-B#Onij%#%kS+$SGiAIM|g
zs&x9`zMb*<!2Ot~4|Yj^<L*OVeIS=Sdf|Tg@cKX=bL7zryXM2|19{AoM=#tzA6_5G
zW1d`k;Q{&Z`e4->^Yp?4<G1ZT<kfR>$@8G}S6{jG175$$V~#w#<=ZkJUcbp>o;<tf
z+bSPkzqudt<a%(vYvjZ0OZQ{m9_d$g57*462la-Y(-#lPhu0T;dQML~G(BEV@asAK
z@UZlF{lKs9^uoi_<Mjf+KG-wej^&j{AK2gC`rr}y@cO|1=Gb2!JTf0%AIM>z9Qxo<
z`SAKc9`oeV2anE&*9Y#!JbkcN`a5<X^6CS*<k1I@$%oem@|Yu!K6q?Cygrb}JbCoN
z<MQG4fjs8Pr4JsT55KCj`!P=+?A`aBx(|7`kC#gxz3_y-<9FyRk2&(}*7qldczqy`
zdGhR@{z)NTAIM{#TzcWj`SAL{{g|g0_DR2U_aU#IlWVthPYJiHNAUVh9&_Y*YQ9zZ
z@cK<2^W=G2zU}kj^_x8A$@TPnJLJRbOZQ{mGt%$UJ={8<9@HCpPG3ATA6{SZ={Y^|
ztn_$2!LR4^!?V-l^#i}Y(+m5i$Lj@teXw7;2bNbJePDlk>x2FC;q`(2&9T2ecuqdN
zK9IvaIrPDE^WpV@Jm$%z51y9~uMgaddHUe_>G$Y9<kbgq$)gWmkPoj9<S|DceelA3
zczqy`dGhFk7v;n219{AoOCP*AA6_50AM^CV0qOVbKIGL0a>=6?UXl;559BdN9=&j2
zKD<7V$2@uT!a@1)`amA@<kAZ-&4<?q?#Dd6aB%v)x(|8voLus}Ed71!5&UlP@|Yvf
z%lp1dKK$<S@|Y*jEBb!FeE0{)%VVBguk8D-`SAME{g`)1`n|h{`{&bxdPC3cpZ--L
zUSII(IX&^}^mskNzi;35!)rR@^#lKYeb)=G?Tpt8{QBU~bo-Q79(`bcd+USO<-_X(
z`<r8been8xczqy;d2;B3H{`?XgMHVSCzn2WW8d-mz`dBK4-QNJjP65TeIS=S`rz<<
zczqy`Ir8X(Bl6+(f%`E}9({0RKD<7V$2__8!JG2o^?~~_PahnWe!uQRUVR{!JbK~H
z`SAKc9&_Z;3vbDX*9Y>LCy!n@Iv-vi$YY*ddf~14@cO|0n5P$xN&o!rLtZ^6mppGv
z|M-<lKj8J7Jm$#r_I!Ki!|OMB%#-IG`JRvuuixY`Pp)_7dtyGkzH~q49h?4u?%_%K
z^q}6*bNb?4`SALJPtWOzcc;he34T4NAKsH5zwa7;eWw@R+jsnaYxwoSaq$P2SDyXj
z?QieH<KGwJ^@07(vHub2-yh=jfqO7djw925AjInf_hFt~`rw24@cO{Ln5Pdul>U(J
z<M7V<KrVUo!H3h~^?^L*$fFNFk`J#B<S|bkeeltIczqy`d2;E4kLAPb1NUQ|J~%%8
zq1}hP`rz=s%cB=Qz6P%k<S|Dcy>LQ4ygrb}zax)cSe*~A59BdVF1>JKKD<6~Kj!I$
zlhPm7eaNfl<dWwT>0i8Z=?A=ilgAu+KAG=;e0cpPk9qQZD&I@;;q{w5=E?Qxd<W*k
z>r3}z-e=Mu)jb@PPY>!1J*O`|n-8xq`1G8f_*{Ctp5WJW`r-5G@%n*Z-|2-fq{r(8
zetmFqx?{>Kk3O)!z4gHt^WpV@{mrqzKKN2Tygrb_JUR5im-FHEfjs8Pr4PQ653dj0
zi+TFsl=R1TAMzd^FPA*};H!PdAJJJJbL7znUrUESva>wq$+NoeUk~y6KpyktIx+pJ
zAzmN2AM;L1cUpK{_aU!7kV_uDaC$zxK9I+p)#>!YH#+0>fjs8PqZhuJ53dj8F;6bN
z@U47!ec*n~(+g*$|4{cKubz`jo^Pjr)5@hE@cK<2bL9C>zN7Nt_1o&cn<vkA<KLVQ
zuixY`Pp<FfdrLmNzC5Y#=AGI3`0nB8e0orC=sA7y{d{<R!Kdf+#1GQr^#s43(+@vP
zkJk_U`c5zWC_P>;@auygr#q><^5_Hm+gl&}Bp+TM*xwxc>w}->!|MY%%#%YO{45_{
zAIM{#T>9YW`SAL{y_lyDev$q&-G{vTKrVUo!7uaS^?^L*$fFN_l@G5E<S|bkeemmi
zczqy`d2;E4-{iyV1NUQ|KKO0=le-Uj^?_XS=!M_q!|MZi%#lYg{5~Ikb!U0ZlSeQ7
zAszn2&hnTimtOc|I=nt`Kjxj8?oZ(<-G{t-PA+-QO8>EX1h3!ZF-M+1=Q}<hUcbp>
zo;-ia_wjsq{U(ojXQuyactSqBzH~q4{Vn}z-NWj9-;dWDKj^G4ob?2~e$x-mdVx=`
z=>umyz^B)|e`oKW&wD?k9QO3i?Po9V+}ZoKAHV&)Z)fk?p61xoyLR@T?Q4#`y=Q0d
zSYC6y<1@=Chxco5`+C35-mQK4?d#n-d$0C2$G+aHvv+D=bL{P%I(wgTo8x`{xSVo$
zm-e==_v!3C+LzzH-lem5XkT;e>pePqfA%%U-rk|JcPF<w-rq0EDTf}hw|!4tx%3d7
z^@e@<?R#2!XMJH`bL@M1dS^XhUvupJjr7iE))R7@^V{-$GyRfm(^X6OyA%F7F8a>5
zzUXH2oYVB9zlU?$-n08G=lu8H>+F4>-TDpX_qn$BxW4;lfB(z(@t=AB>&iVY|9vd|
zzGv@YL({J-f6r^X=j`uuZU3Eh#kYJP|M=en%lEO|lmCAM-tQt@U;kd#*Ia&|v-xKA
zYy0o4E57CXSnkQ?o?NkF`5i31gLS31{@Z&l|9vd?<Z@3g_oUu|%e}Dt-y8p|7iRx1
zHZ=YE{(feEpUe00k3F({9~;Jf%)XNiO~3pOHjH<$zW<)rHs9=fU)z7@obH>whYd}C
zPXGPc51!q>pSAsW))n9E{jDpx)^^Vg{XRzXuP?g)*5AqKea-H3cFmpL<LuTi=lsw7
K@AtFs9{&#j9#k&?

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.A.i8f8.00001.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.A.i8f8.00001.bin
new file mode 100644
index 0000000000000000000000000000000000000000..0dc4dc1fb167197ed1f10dabe05263b77202c7c3
GIT binary patch
literal 38488
zcmeI(RkZhIwZ(Bt0kJVKPzlArz(6U*z`#HO16wgr3B|y`KqV9d0|TWL0|T2-F)%Pt
z!WIJ?Q32)LoIV%t_jBPH2lw;reQ>;cjP1?zzn(c4Yp(aV=G|U%jaC0!?|<QiYp*K6
zHEyu#_l{Ryh5r`+vNiwlZ@kOHf3MF%_#g2W!vBo75dK%Z%ftWfeH7Pd52Ltd{83yh
z{wS^;e<55a-Y8xv{wQ8K{wS^+e-zh?zYwk;ZxpW*e-t-}KZ;k4KZ;k2zYtzM-Y8xp
z{wQ8E{wQ86{wQ8M{zAB6yivSP{87Aa{87AK{87Aq{Dp9%c(ZtebhCKFbhCJ)bhCKl
zbfdU&{8_w7x>>wwx>>wgx>?*L-6(Dve-<}OH;bF6o5h=_o5fqC8^tZ+&*Cl9&El=n
z&El=o&Ejp+jpCN^NAb4tNAY&?NAdRYNAV8v7s9RL&Eg%?&ElQX&ElQY&Ej3sjpEkv
zXYsD-X7O(6W^tQzv$$=#QQR*6EN-7}7I#QDi+4{qi}y%3iaW-i#e1fk#e1cj#e1il
z#rvci#hv1h;(g<f;{D=};{D@~;sfF@ggeKZ#RsOF#RsLE#RsRG#fPLD#a-gh;zQHT
z;=|I-;;!jtakq4%xO@Cre0aK9d_=lgd}O*=d{nwo+#~)hK04hjJ|^8PJ~rJfJ}%uT
zK0f{^J|X@nJ~93%J}LevJ~{qExM#dsd`h}md}_K`d|J9$e0sW3+$;VpJ|o>MJ~Q1c
zJ}ccU?wxKF_lZA?`=*=4{nE|iv(wGubJC6C{_$t=x#?!{dFf{H`RQiy1?fidfcT^M
z!uX^3qWGiu;`pQZlK2bZf$?VXrRiqzW$9+|<>_Ye73oItp!l=+%5<~%s&upX>U6Vs
zaJo@EB>pTOnr;>kOE-(JNjHnHO*e{%$DhU5rJKdqr<=t$q?^SzrW?g0;*a8+;*a8+
z<B#H7;*a86<1d6q#+${rrJKdKr<=uhq?^TerW?hh;?Lr{(#_(#)6L@1>1Oembfb7|
z{8>CM-7FrTZWiB@ZWiC0ZWK?5Ka1~6H;eC2H;W%gH;W%kH;O05AH@&FAH@&HAH|Qv
zAH|QxUkFc%H;W%jH;W%nH;bQ0H;bQ4H;SK%KZ~DEH;bQ1H;X5yo5fSojpC{CXYsUj
zv-sI`v-r7mv-tURqj-A!S^Pq}S^Q$US^QGES^RRkQ9L95D1IgWD1J5mD1I&eD1JTu
zLU?ApS^P%2S^Q?YS^QSIS^RdoQ9LXDEPf~5EPglLES{Zi7SBmHis#0k#q-k5;`h?c
z;`h_d;t$e|;t%7`;*ZkJ;*ZnK;!o1e;!o3!;`#9x!k@)k2!9@LA^b(Wh47d0E)Os0
zeH4Ece-wWme-wWce-wWke<A!`yixpp{89Wv{879x{wV%2{z7<Byixp9{89XK{89W%
z{879({z7<3yivR~{wV%6{wV$}{wQ7+e<Aeu9{#Sw-%)Isex3fl!aKgd?^q+=bwYJ~
zf8ViY@7E30@%??rTD@N{RL5Vt`t?Ken#(-v^uAHJem=aLkKTM&ihqMp-JJC1ymGu7
zhU(^}H}|^nZWOBXNxxq2HxBtRuQ}K6edF-z`SfmHdh=c-{!K!4^U|AlgLpR$)y+$9
z?yJVTS*Xr0{ndKkB;?1u=Dd3En}!?a)4O@;&3ldbn}zD;r8n<2<82<Qo0s0)*NS)Z
zP@P};YxjPOkRS7!bBo?L%HPFnt@=OS%}a0ITc*1tzPfqo&3mi(m&R8&FTJ^M9sjTK
z)%m5rO}xLwlOyg^PPof0<8Pc_@9vXcZn(?arc-yH^zy@9-Y&kn`=pmA?(+8W)!iq(
zySzg@e%z<I&Fen5ioa=oy}MKM>t}v<ddKwY?v)Sy_;9axN~i8_`O%LrcYEh_>h9NG
z^mD&=iO;V)=7$e=ymkC7+J|@d%#VKjxaYg3S9jO^=*N${zFRtV_sx%fe7Wy!(y6<1
z`_a#xZyTRq_s$O=?tZ)YTec7H?w%k0_;LT+r&o9X{OHGz9M~b9x*Xs~KfdI_-P5Vd
z1N+fWF5DwNzjBNpK6Z?^ReM;szjO62&-l@gpL?cXFP*wv<3~S!?v-x+bn5brAN}~c
zce<;jQ<szWqu+hvZxCM&$_@D@FLsK*b^GuxFX-i*oVaf~bvZ#V=j6lv;;YLCdU+=o
z?jK)WF3`(^2gKt?9+=y_@?huq+vV50JTSk0=9dQ#Os_5v_|T6JdGMfg>hgde{rHjx
z4^F2p59~!hdGL_<{K^A<_>c#?#NV-fc$WwK=*N#dcxZZcdBBf;{K$icrBjy&{OHG*
zJlHjzx;(HS{p7)J@%fbp{O}<cc8|YP`|vIg_|cCax$yAx>hgde{rHg!k4UF35BSlK
zFS+o@bn5cJe)N+IkBZN)eB+0YJ>u=$9&T2ic$aVd=*Q2a({GYaUB2<7A3u*tw`n?c
z`Nofad_6YZX6e-BrTyslxcHmLmxFRczR8Qn$KR!Wc$XLSa!yV>A)UIMpqF#<;fe9p
z<paIElM7FZuPztp<-wEV@gon+ZC-h>XZ+ps>s=n0UqAE9gQuidmj`_4$A>(4YC3g!
zz>j`>$%Ch*Q<n$!qMtl?dVGH60Y7}mgT3PK(LTJ(1Ag@5M;<&Qy}CT$M?Ze#!86mT
z%L9J&<4YbqE1kMLupj;8!QS!tl?VLrAs6<E|M>RdT^{hGA3t(o-}LJ8fFJ$%kqi5!
zQ<n$)=*O2_cy>B<d0;>K$%W^{=U2Y*!^i&d_G}N^lqcTh8$bH-^W5~?rc;-1{OHHe
z^U`gXPF=q7qaR<-Pq%$Kb$Mw&`n@3j4)Nun+>meb;(+*jwGZ#|f?m$ai5I3*mlO1I
zPCmRSzPfy%mv?gE#qrhU0=+zVNj!e!fw|2q4-SmKPkz121M}-=etGcH^y>0}5B>O%
z2QN#fE)V$8k1u)f@^tF*z+Uu|2d{|FuRP#~4|#A<{QcX9cX_~%e*DOTSEg5&2mI*A
zk34u)I(2!#kA8f~gIA|hmk0KvpFB7?KELvSA3o&5A@L7rAKv8wKl<?_7Y<FYE)V$8
zj~}^kSUPoiz>j`>$%WUXQ<n$!qn})OZG3*^8$Wy;9`C^RuxokZUB2<7A3v{4zgs$W
z`Nofa{JcKh?&;L!8$bH-^@em0Pp2*~?MJ^i#(zY7IVd;eo4hz8{z2`-yS$*6b8_NM
z>D1)}y_}N|Z;r1nAL!+sTzE@-b-6$<58fJ&A9-MI^U8xG;~$b=@AAO>`k7xIye+-D
zJm5n=KIFmM)2Yh?e)Qu@9=s!+x;(HK{p7(r<MS&I_~Any92NiY_TgO~@S`6;^59+R
z)#U*{`tc(V-knZe9`K_dU-IDSbn5cJe)N+E$HeDX9`M75TsSuV5$(gfJm5z^e&oV&
z>DA={Kl<?_7miP-E)V$8k1x6Ko^<N+z<%_T3-683uYBW&j}zh@*&d!%o_LpU{OHHe
z`_k{7PF=q7qaQ!-Pq$Axb@|4Retdl(-M;D6<)!`T_rdu4#g~I}L%zw26XPG%KD^5d
zdO0U2K9o*fPSDFa`S9WR>hghJ-pPfJ#8;OK^zz`N@%WJk<~FZ9I4S<I`SmUj%&(vM
z<-y0&tIGpE^y5Pwd_0}HJm5z^zU09t(y7Y>d(lrGd@?@2@_-*c<iV%npU^(M%L9J&
z<3}ERI=#9);731x<iTgssmlX?^y5n&oSaTw9@vk5^5B&C{K^A<_>c>y#y_!rc$WwK
z=*N#-I4!-pJm5z^e&oVu)2Yh?e)Qu@E_^PXx;(HS{p7;u<MS)u_~GO9cqg@oSC=Q=
z<r_cx@$-fB2d7h)Z~W-T&ll4jl1^Q|@uMGKUrKjqI(2zzKl*(+{$cUupxlse^5Ts6
zpK2f8<psT*lM`P_r!FVx<(z!@YJ7G1Krip)!q?)f%LRIQ@b!57$OChmS00=h|J3|?
zmj~w8&;0V>8|l^M0U!GDArHQpPF)`GqaR=L;9Kd`<$=BECl9_IpI>>v4<GX2toWz5
z5AX7TAN}}|2j5ArE)V$8j~{vP-E`{mfFJ$%k_Ts}Q<n$!qn|uDCqBROfFC~O!nyI!
zXdm9?0YCcjBNxs~uPzVx(T^Xw@V#{E@_--x_>v3XPp2*q>_<Pj@PqjL$~S)a_+h*=
z+r!c2iFf(NkAD38DE%?%)a4sL`tkGQbjPMsmv8*&$JbBN9hXjBUfPd-KaGEUd^spL
z<eR)WKmJ+m!@InomveIBXX(`C1ihS-4?mBuE+6RSom}`ue08}%FAshhj~{tpZu826
z3*w)fU+?n3{Q8++9{ei3x;)@RKR)EauhXf^1Ag@5OCJ0tow_`*7yabHZ{zbT5BT9j
z9{eu;58H=#dBBf;{K$jfr&pH;{OHGzJorO8b$P&#etgM;3)88~1N+fW9{e#rzw&?|
zKIFnh@y~A`-sJ&5`tc(d{*+!_9`K_dKXT#E>D1)`Kl<?{7ygn?T^`tvesbaB`25N@
ze)zZ~-UaR9<nqM3eB(zyelAUaN;-A<#*cpd{59RF>D1*LKl<_Yw{)kaQ<s<aqu*um
zKO0{T$_@D@FMih^)a3-7e3K7;%LO{QCJ+3U19WoD{rm0i>D;?H-MP8U<IXS2hr0VV
zpFZYu-+sGmbLwMGckQ=(Hm^SBcF%shV}A8<$9%Y7^P1EBUXo9BcWYjK%<FFbcCY5u
z$Gq;<Z+B{5ea!7n{dS*x>*GH8aF^yar~CYue5$)g^Xg+>cj>n~G_OA9b&r0#KlAEi
zZg=RnyW?9Q_s56)Ft0iPHGgM!r|NRUy!x2;ocMmr3-jt@-gD#oEho&YkGao_@3*|+
zTc7X6TV-RT9arI{U;M|oy7ETn;%~X~m+RcKdtdSSf8XJ9-OF;F`-=W<XZz#B*}eX=
zb*uY)EBpBW$(hCOapn8?`~A=EW4ZEY=U(jhwOn*7`&il?ESG=h#m>3%eJt(!nBCv%
z!k?XEvESEn(XH%bX?L(({+$;)=gRl7wC`hff2#|Bc8<k<U&}?evX7<R!E*U`UhJGJ
z-^bFvkJ<gLF8tX!7W;iI7v0J}mUair<==U+bFO?JOZz@%_qV$6XXjY#_qAMfEBjd5
z9W0lB=f%#s@_j7r`<UI|>cXF$W3k`Ya?!2qV`+D=T>hOGJLk&xv9#}Fc7Ll2e|C<=
zeqYN)x3Z6=-NADCcV6tAE8oZBzK_wp{j+(a|Gj_K_i{zeb4B%C-S)EL^Y8C-b^G@j
HpXYx7j1Ey%

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.A.i8f8.00002.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.A.i8f8.00002.bin
new file mode 100644
index 0000000000000000000000000000000000000000..a5d2a78f87dbd813574a11760e6c988e3e17fa3b
GIT binary patch
literal 38488
zcmeI(Wz_FgorduPD4=4KCI$vdDF!Br5-J7;21+Rg1_nwgwql@^VqjoPC<X>9sDxr*
zV4#$Z!K_(pM#Y(NX4b58eO@pNc=kRo&f;($-`s2O-+h1G_dd_Q^v!>jB}@Oa=Ks@6
zR$ID3mu#?fz4hu#_1{-ns+X>M)oZ>h)4w)nRR5NLRR5lTR4>avs{hEpkp4%$QT@;S
zqxxU@NA;iiNA<t+FQosIZ&a7`_cN-i<R8^l^N;Fk`4`e_<r~#&=O5M8^N;Ep`A2ol
z{8y&e>H9)@-Fyq__3|yGYvo%=ub*#JZ;*dhZ&+?tZ&YqpZ(MFxZ&GelZ<>Er*Dg1!
z>y(?-b<54_dgVrS{rt1KLAhDIS-DxgdAV7=MY&PEW&T;cRk>Ncb-7vHu-vTPrrbh$
z+kB&XyZobi`~0K2QT|cAL;g{{WBysaQ@L5abGcdFxZJGXrQE3AHUF$`Qf^i^EjO#1
zm7CSg%Z=(5`DgWR<!1Hn<z{uua<h7ma-(|B{Ihzma<h8xa<jTsxmmqWxrOw;`9}4A
z`A7Bs`A78u`A7AE`A2o@{ImL?a<ls2a<jTkxmkTkxlw&+{#o6&+^lX_ZdSK1H>*38
z8`X#9pVfz#o7G2@o7El5&FUk|jq0QF&+4Pg&FW*y&FW6&X7#b<7ShM%8`a0>AJr%1
zAJv`nkLnZikLr{1&+3!Q&FWLi&FU`YX7#D%M)hg=XLZ+dv$|WkS>3(dtnN{6RQJq3
zt4}XCtIsGmt9zB3)n}F))o10O)n}KR)#sF()xFEj>T}C2q|eJYs?X0qsxQbts{7<0
z)feU;)feTT)fbnW)t8i;)qTs&>PyRw>dW%a>VD;Bb^mg+dO*2ZJ+R!U9+ZDpUtVrj
zUr}yW4=y*WuPisJugX8GuP!&MuPHaHuPryLuPe8ZzCPcmz9IjpzA^u(9+H1l-;{q;
z-<*F|-%@T?-&$@~4=p#VZ!0&dZ_hughn1Vv!^_R;5#?s}$a154RQ_3gN4Z&jXSrED
zy4<Y3tK6u*JO8Y{r`)W*x7@5AQ*Kt@S8gGFf4))uK>ktvVE$1(Hvg!8DF3K_IRC7E
zq};52wA`$ItlX@AyxgdMBLA#@vfQj5S8i61FE^_vlpEC(^Uvz1%FXJh%gyRZ<!1FW
z<wo_h`DgWW<!1Hs<!1Hda<lq{atrAf^Ns44@{j75^N;E&`A79D`A7Au`DgWO<!1HN
za<h6`xmo>sxl#Q_{#pHIxmi8E+^n8aZdT7MH>zjlpVe=bo7HcZo7J<+&FXi`jp}#v
z&+7Ne&Fc5d&FVSjX7vZ<7SbQ)8`U4>AJre{AJud7kLpkIFQh-sH>y9&KdL{^KdR^D
zAJt#vUr2wMZ&c6EKdKkxAJq%<kLpGF7t)LKjq0!RkLs`UkLqvokLqvpFQmWAH>$tS
zKdOJoKdP7HAJsqRzcT$(-xtz9=UYhsl5ZisG~Yt%_a1)N;r9{OFTeKEpN%Z>o!{>|
z{7&Kq`Pa$syPV&3_?^TJ^RJuVcR9c7@H>ec<zFwq?{a=0apQdJ=lhq|dO5#y`<=v1
z^4WK8Ip_9!iJRuP@7(gvy(Hh-seR{`cm7rKt&`f<SANyLubci`s*iI!?`nNtFSYNy
za?X3LeCwz7ombv@ubpp$)V}k|JNN4OZkF2DSALDY-#oo6)yKJ=cg?=vBDL?la?X35
ze78*PJFmR+UN_&ZQv1#;@7&kRck9%?zVd7JeZ%yhsXor_ytnDQwR7@2=WX*@JD;5M
z-7cTCbICd1?ekgdBezlCSM7IcIO5&mg!gub{G0S%efR$4@xr^iW4TSs`R*N>gB#x8
zoyu)i&Uf$8931fu?_6&4a=v?)=6H`A=ieg#8r_H9-lu+gd7pPFZ{IuB%N)JD)4P_l
z@4f0}o?hPTCgtpVw|beUpLe@yIs4wP`!Ub^-7NoF-G{#3v0nOk$D5b4?>*~djy~S=
z7Uk@F*ZP>Jk9U2ya`wG%eazF#`@VZQ``)?xG0!{SGXIUc4}HCNz4Y<!?@`Xa_pgsR
z`ryDl%h|^ReazDb7w%QgK0fGUo?bX{?{fC>!u^<s8(ZaHxBJi+*YwioKKZS2O%HiJ
z?wj8l-<;nZ=f7WmYn*d#bDaPF`K@tMe{&v?@8<QyK|H`W9C%><ZR3gWcp#5&IIwlO
z?aKL%2j<`#4m_yb_T_xX19NZ=2OeB*hjPB-fjKy^P5y`F-?0188xQo;3lAPr-aa1a
zWsY8W@X&Jh@jx&0^umK}%h|^Rz0A`O54J039}nD*d3dmW{*Ag1eepmqeeht1a`y2+
zA9M7<gNK!~j|cjgrw<-HyqtYJ(8oNz@Zb^U?Bjv^F%J)R%)fE>p)Vfjr4KGVvYdTf
z(8nBo@ZnMA?Bjzz=IMhIk1l5)C-gB-FT8k6Is16we$2y-o$_ziedvpKdg=4n{MI<9
zhrAw-%WsWy&To$MKR&-T&N;U^&i{n`)_AGEIXmauvYt4I2l$2qPt3n-Jn<b5<nav$
zo>XqPa=zn%IrxSHPcFB6Ip6WX9Gt^}r<B{HobPyG4i4;+f6x3|bsu`;fqr`7!BflI
z#{<30(F+frR?a>i=w+T>c(7|Z`*@(2dHUhOZsqLbf%`EJ4|dQ0fbK(IJkU!YJlLb0
zeLT>|9DVR$&vN$hKp*q;!GoulvyTV*n5P#WJfoa_Ja9ke;lW<{x9L9g#RI+c!G&j*
zvyTh<n4=FqJgc02e9*@{eQ@I0<?Q2xKIZ9#7tbkYA1~aGdAPB6{_VRDeeq5&eV&`&
z8t3$o*W-Elt#Quz&2j$c=eNc==QhXrUy$D#FZDNPpL{#k69@4C-*DiC`S*(_zT<&B
zzTv=&%I#mycRVl$-*Di?<qjz4J06&Wb2#vlatD_49S_XGfqnBIlz*r0LvK9LPcJ-p
zX?gp2pqDv%;lazw*~bID%+m`G_A6%}5A-rmKRnpKoP9iSKjz`V0r_|CKJ>){z4XC@
z1IyXR1AWZV2M-P^XCDvrF;5>nczHSdc%YAYdf~w<%Gt*Q_hTL&9Grib?n7TZ&`Td&
zcx5^JxS)?Y`ryN>%Gt*UeazDbCth97K2GRko?dwInsWB>!u^<s8?Vj3d-tI)-sz>!
z>+)OUoF4Leygt7*&N;t1&i{t|);Q<f<~aWw^IPMk{^lH#Z?AgdARgcw4!kM<Ve!Ow
zJdnpX9C&lN!^`=O2j<`#4!ot@5#@Zx19NZ=2i{ul$a22pfjKyEX#S(}@7;aqjR*Sa
zg$HjdZyyizGDj~wczZefc%YYgdf~xg<?Q2uUgqhC2Zxulj|c9@JUloe|32M^zIdRQ
zK6r3sIs15^k2(6_!BOSx<AFZr>4OLFC}$rJ^f6B_Ja}h0`*`4f%)^7D^Y7bz=!*w>
z>4OXJDrX-T^f5;te0X;``}m-bdHUeQd&=3z34P4d3oqVV&OTnaAM<eInEVHHANt~*
zUi!Q*zctS3A+N{#^IPMb^PA)RAINWwbIxs!^M5eEHD2m(&awFpt|t!S0lwkDhw^_i
zp7@Rj^7w`WA1-%XIp6WX9DKupkCZ#UobPyG4$k4gN6Vd1&UZX82M0cu|HS;S?LPFz
z1O4>EgO8WDj|Y00qZb~0qMUs^(91l%@Zgi>?Bju6=IMtA$Ca~>2kyr_JUBl8A>D_*
zc%YX)cyK~F`*@&_Ir`wiiRJ9$fj;Kxg9o1~XCDvrF;6c%_;fk@c;J4_!-JFZAKHEB
ziwAn?gA1Q2XCD{zF-ISK_-r}*_@Iw@`ryRp%Gt*WeazDfFFs$+K3=#V^Kj$j{6};j
z`r@5l`g|e3HO}cFug4ejTjQMbo8$an%5RNx&TWqKe>uN3Ug~eoDfy1BCl2BPzTv=E
z@_#d)_>Kqi_=W>tEq8i3-|@g4e8YjSl{=%H?|5Ji&f&nR<<2bUJ06&W1E=LbEB`Uw
zhu(OgpI&(I_44-dKreIj!h>&=vyTUQnWq;Xe6yT=JkZNL{qW%Qa`y4S{g{UbXXHP&
z`_LB;^wI|p&Mapi5A-odA3Qj#oP9jd$2@)T;9KSF<AFZr>4gX1E@vMP+>d#9aCZKW
zbszfTfnNIH!gtEq#|3@N(FY&CTh2Z{=wqHfIPtx5_HjZV^Yp@t@0YWW7w*SA+&Cxy
z@!f~Mc&C>>Kge&5b9%_@@x%PqIOqK4IRB6GTjQK_o8$aH&ToyE`kQlZzLV;SgLr^%
zIPjDF=f@M@@jxEmaNwuqE-2?a9+-n~IPkM_7nbuK56r<i9Qb*;i^}<q2j<|wdHFBS
ze{%PsHy-Gx7ashgynQ^-%N)J%;Fsm><AGl0>4gX9m$Q!tdYPvm9$Zk)J|4Iq^YGxp
z{HJsu`r?6J`ryGu<?Q2uKIZ6y2N##Kj|cjgrw<<ds+@g1(8oNz@Zi_w?Bjv^F%J)Z
zlmE2tLti}5OCMbLZ8`h6ppQBF;KT3A*~bTc%+m)aeqYW$PUvHvUU>0`a`y4U{g{Uv
zm*hXA`_LEf^wQ^#`K@tI4|zTQl;0ZXoZlSh|8st8oO5n-oc}NRt?^QSb1uzyc0F+r
z5AY2K{u)Q@<A5BldH;XQZ{Pcu$20H#@A>U}_wsn=y<e8!zV|Ngo&O`>IrY@XJ9mEP
z_Rg)nZ|9bGZtvULyLN7KoZGv$_MV;F9Ow6*t-WKt&GC-Ut*0K|uX8)E_iOFlI<LI*
zdbifztMi)Uyxyy|cj~<6IJb9d?S1NPj`w+9J@xP|o!fc6PiybedF7qg`?U5ho!1=a
z^**h=OXoGmxxG(o?^17byw3~ksRy1oxARi`a85brq`2XH^3F%`!nx#~kK&D9^1tc)
zOP}HTTQAjrJ@u+})Mw6$>R(aMJ$vtqJ+JuheMP&M(eqy2eY1bR{B*P*KfSu=uI}es
z-uJk8AD8FW;(aW=kJ)=z+5F4<oi6YHzS)1z<$b>8{ol8EAB&v)zZ>v(M`!;oRyO~#
z-qVVboBj7(QF<-wIT!C^k&}y@T(V^G9W1_sD|!dZ%GGOnZt=Y=eJ`{3u(J6V-@)a%
zx_BRp_i<JKJ9AC_`&ikyH{17``tN>C@3pM`7XLmj|Gxu^_p$UoX76ET^DparTTybe
z|DG#KuVp>w;(aV~@{0cd^6cNm%I06z_qL+sX8%1`lwQkv&c*v!<mAfC$=SdE71h6@
Zo_m&Si#;#Tv)TK*y7))`9hblFe*voQTx|dV

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.A.i8f8.00003.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.A.i8f8.00003.bin
new file mode 100644
index 0000000000000000000000000000000000000000..9516243d7d615f80acc796d31c5118251782c47f
GIT binary patch
literal 38488
zcmeI(WzhCjy~S}t0Sf^YK@1F}>`tUqY{fvz7F!Vk6$1m4QZcX<DHQ_)11Vb!Ob`PD
z>&-c$p74a{oH_G+KQC~Gx%R%F!Fg`x_RX6A-fR8bYd`n?^6FZ9tyTZq;P3Pg>#ka$
zYi+*jd&l)w=|8WtN`Ig4vc9b^(mytDR4>Uts(;Eqs(;SENdJ;=RR1OasQzpIQT@04
zqx$dp7wKQ~jp~2oAJzZNKdS$ge^mcF|04ZczES<3{G<B6`A2oF-q)zEoqv(8lW&o(
zn{Sa`Dc>T!a=t~nUcSrH_1mA-4a&{xRm#okRm;ul)yj?P)$`BlHOkHEhUI4Un&oD7
zqjICVasFA|q};4ttK6(!yWFf^r`)J+ntxWWTW(f2D>ti~mz&k=l^fM9@{j8E^N;Ec
z@{j5b^N;F{@-NaY^Udmw%gyRd%FXIc%gyS|%8lw)`DgX!<z{v3a<jTkxmn$|+^BAs
ze^$3IH><ZOH><ZSH><ZQH>$VJKdZMXH><ZTH><ZRH><ZVH>!8YKdN`kKdN`iKdN`m
zKdN`hzew+zZ&vSCZdUJJZdUJ6ZdUJEZd7;3KdbjDH>*3Ao7J7l&FaqOMs=6`v$|`!
zS-p3;S-nrWS-o$$QQa;7tlqEOtlq!etUjRJtUj>Zs6HtFs6IIVs6HhBs6I6Rs6H(J
zBHcaTtUkQltUjXLtUj{btUjvTsP2(}Rv%q%R`)D7t9zB3)xFD&>OT2rb>DKc`j~RF
z`q*-_`nYnV`uO~_`h;?``owax`lNER`s8w>x?lcLeM<gOeQN$ueOmreeR}>y`iy+D
z`pj~(`mA!Z`s{ME`kZp3x_|yzeQvo~J)qpIKCj%Y9$0Qv56VBQ2bY`G=a-w+7nGaT
z7nU2<L-Nn+i^|RFi_6XGOUljaOUsSwq4`JkW%)<-<@rbT75PW?mH8LxVfkkDRpn;&
z)#YaOHRWdYwdF?jb@^xY_2p*u@N%<yM7dc#vfQX1m48-`E;p-hC^xHbEH|rfDmSXf
z<e$|ymz&kMl$+JJmYdbLl^fM#^N;G=^N;E~@{j5}^N;Gg@-NbN=bP2{l$+J}mYdc0
zm7CS~mmAgN^3UoA%FXKW<!1GSa<h73xluhS|E!)|ZdN~7ZdN~3ZdN~BZd6anKdT=p
zH>)2lH>)2jH>)2nH>#)RAJtFfAJtFhAJtFgAJtFiU!<qyo7K;ho7K;jo7K;io7K;k
z8`abE&*~S-&FUHDX7$W+vwBv!Q9V2Vte#VDR=-$oR=-qkR=-?sRKJpcR=-+qR=-wm
zR=-|uR=-hhRL{*ns^82%s^7{#s^88(s^7`KNYBeRs^85&s^7~$s^8B)sz1oTNPn1b
zRDYCzRL{>psu$!R)gR|yq!;EJ)t}@a)t}}c)t}`b)t~2Iq!;BI)nDWv)nDcx)nDZw
z)nDgdq!;H~q`%3xNPnAek^U~<BK>{7%TmAh@Ouuwk66FlhHJ0-{m5TaJ~_YZ@H>eO
z%3U+ReL27D@H>gC<liX2eL27D@H>gC=HEEKeL266xLUqV^6BN=&g*v)SI_^q{Pvw&
z-nso=;u__wJGZ=Z`@O`5`K>#*yz~3L#5MC<*H_-}BsR*YkMlaG-$`toZ=HVMVBdM=
zo!9RrHYsP_dF7qg?<KC4-@5b4JNH`ouAN%fSAOmGuaoNIyw15!`<tfg|K0CCoLAm?
z*Uf+3)VlMU@4Q#aw^?f4dF7q^%K0`=t?MhlUi;Te^>JS3+@k%f*U!3h$~out^ZRx_
zIp@1UKHttI=X^KJ=UX4S8?}!k-W@)8Z(HWux_7s6efYdTbMV5uyK(t#%G>u2&A|=t
z?<VE8Eoa|*GzUk#!<&}duAF`E(j4#cX8E_zuebN9mp<O-R^>MBKJ0s^dYPw}cY5>k
z*1cD~%+t$z-MXB0?^ZAK^z&}FDQDgLbwB2LzuV^5*E`ln5AS%p{9AM%_Pu9)%+tqv
z-oCtb?^+-8^zp85QO>&et&e$ndEd7zXWct@KjwMox5}@t_pXl~-u<ofZ`pm=_x|-U
zPahn(O?m5hppSX_;KFUoS;q%`%+m`eZdcAaUbr9gaO3v*^~E!N^teO5t-1&6xTc3W
zdfc&`Z+vrpbDaN9`F-P@bDQJ*ch2t{C-pbyF8Oc}4{!|!?wW7MII>-R`S8FTe8Yje
zmEWnneLOG+-*DjW<#sM-9}mpIIUKl0xn0WH#{+Y4;GX$+&965e=%o)H>`?C3-G_ZV
z(91l%@ZetMt>b}S=IMn8JC?JK2YQ*OA0F&f&N?2rAM@~F=luHOfj)ZR!7lml(0$m)
z1AWZX2M=~FZygWxF;5>nxOX}0c%YAYdf~x+%2~$)_hTL&+&90zc%Y9SxUgIPyLKP;
zaX}yR^udSwmA8%$`k1E=PTaqob)3-0JiYMZ0p+aYh5IoNHy)T@U!2oNj|b)3p?k27
zb9$Jg$AioH#yRIV$N3+U-#5-Vw>i%L(EPsfQh#$EmJbK<0M~F}_k4TCkzMM`hX>~1
z8xB0Y{9fhl<AFK&h69f%w|6=Fcwi3B;lLxy?NiP^9+-mzkIKJqe!cNPFMaS}k8-<p
zANKJ;FZ1-mgGZOQjt6>~rxzaVS<X5h=w+UMc(7MF>v-UP%)^7d^XrQT`sjfN`{aL6
z_hBCo^f6B#JlMCqbv)3=Jbm!sG3Bh|fj;Kxg$Iu<XB`jRk9m0TxcvI!fj)ZR!sGMr
z-hJ4|1%1rZ2OpkL-a0<$W1c=Z@x*f0aY7&S^umiLm9vf)?#DdbcyfMyaZVpS_RF_N
z_h238^e{({r<C)JbIxy$^FKAeZ=7>(bDaNa`F-Q1{^mSA9}eOHuHnEl@*NOI_Ngx)
z9+-n~IPlE!&ns^q56r<g9C%i_1IyXR19NZ=2cBK-pmO%{z#JTSPX2@Q>x~C`>4OLR
zmwSBoVIL3lGEXl&cy4*?c%YYgdf~wV<*eg@UgqhC2hS^K9S_`(d3bPOetq#kA3gBk
zp#1xFANKJ;AM^CVgM-Uk#{+%L(+3ZpU(Pxn=wqH<c<_R9*73mon1=^1%&#vV=%WWN
z9FqST-G_Z#(8oM|@Zm+}t>c3}=IMhIFD_>tC-gB-FT8k3IqP`ge$2y-m*&?O=k(Fz
z(0u!M57u!`4|DW*SvlW0=lte4|I73H#yRIU$N688-#1?BZ_X?8;UFI18V($m@9;Qs
zP<{FEz#M$TfmfA3qP%@PFbCgo;ML`hEN34N%)vPvcul#Z%Gt*Qb8z6b`H#-8Hy-Gv
z4<5X(+#%hEeLT?1JiYMX_2sSOfnMh6g$IY1vyKOPnWrBf98u0X9=IR#@ZiY&`r?5;
zdf>rP`48<r?Bjtx=IMh6N0+yb2l|+&4<5XsoOL|V$2`68;Em<1<AM7z4-ejyUtc`X
zM-N;$CjVjGhkabo$2@)T;mzf(<AXlt>4Ot*DQ6ug^f6B_ym)Il>v-XQ%)^bh<<}SI
z^wHzke6Q;stmB*>=IHVEa=vlS`OR_ucjWhtbIxs!^S?8{Z@kpsoOk8JK|H`U9C&xW
z<KxIt_2t6@bMOrZ-c$aB^7iq-9DKup_m(@coP9hn2j_6$edSInXCDvD!GZVZKRLhN
zc%YX)cyL^~W4aIfc%YYgdf~wb%3H?+z0A`K4~{Qq9S`&}Pd_|3p`3L*a6jhZ!HN0x
z#RGlxz=M<WAKQJ{#{+%L(+3YuE^i$V^f6B#JosQa>v*7#d3xc&hss&U1NUPd9(*{z
zzIdRI9=LEy{&#mD_HjWU^Yp=okCeBL5Biv=4^DivoOPVg$2`68;$!8k<AwV%4>vxZ
zUtgTlM~_qU9oIcr$2mRB(c=^4eB+$+o8$bS%<miLoZB4d|5Se8c&WcRpU#Jacz|m-
za9X}I;>bz$<--GW@C^q(Q~u2I_VK_Re8YjymOHDQeLOG+=WyV2<<2f=9}mpIfzRhZ
zC%@i!pqD;)aC*5@x)1w!pqF`i;lUTmTgL;v%+m`G&M0Rc5A-rmKRh_IoOL{KKjz`V
zS^4$F1AX+sgR}FW+I`r^1AWZX2M^9EZygWxF;5>n_+mNhc%YAYdf~yB%2~$)_hTL&
zd^x|qc%Y9SxbT(yr*$9paX}yR^udR(mbZ=%`k1E=PJFGLb)3-0JiYMZ>*cKDh5IoN
zH@=ZyU!2oNk8|^#-aS~yIX%qL<D2Dt<DB!G<NV*s?;Gcw+Z^Zrc7ES@slPej$%lh@
zfNMB#UcU3=$l3Mf!vk~h4F|qk{(|!M@xUB>!-4OW`*At@cwi3B;lTIHU0BXO9+-mz
zKgj=+{CeYoUi#p{56gX}`>>A(dYPve9{i}hbv)3^JiYMX{BqXuKri$3!-EUTS;qtS
zV;&y-IKRGlppPDSaAE#)yAS(#ppSX_;K5JITgL-^%+m)Cep=2t9_VA9UU=}ca@O&{
z{g{UbKhLi(9_XV7E?kuVyzaw3F6d*PKKSs9^49S|AM^CViC>npjuZNrrx#xQs+@Ja
za6jhZ#;^11i*x$uadEyMb`REZP7ibR_)R(AIOqK4IR9_+`^GuvHplsYm)|#D>Tk~P
z^Wh*K;2IA6F@9WFPy09^k89rlCFQJp|MGa|-Tx`Sb?;st&%F0P=eO>?%X{a4$)}HZ
z?%dAnonKT>>)y9>o8#Qxw{P#-xy^BI@7lNb?A+!!zxV9hJJ#DA?^qA-*Lj`O`@OiH
z*1cQjHOG0qTi@QR^P1zl-m7o#)OpQuZtv8$_o=rz-lrbkrSm$c_xXo<TK6uU*Bs~d
zK7D(a&TEeIdY`_%OXoGmxxG){-lg8=c%ORUi1Rw<Kh@7SemJMRb5h)JK6&S(c;Q^~
z&PVY^FZor!?$~U{ReH%;W4c`Z%k|v;T}ID8>YJUrrukQTUi!U`-p4=MH~RnQ?~7hh
zb63<}OZ|6SxsRp2WA{z3sP{PAYq|Po&%N^Re(86!avv-A@&7mA@8GiZiu%rGdo5T0
z?796NTv2mZ)Lu*dcU!rSOaFIZ<vv#LK4$N4P4Um3W2x_Lx#U*vWA)y_a`|^&>N!{b
zK34DVWA^^m6#wiwmiqU#TyiV-v3l=dx%@jX^_(kzAFKEGF?)Y&ihuSTOa1#=F1eNa
zSiN_!T>hPxdd`)<kJbD8n7zL>#XozFrT%>_m)y#Itlm3VF8|I;J?F~b$Ljrk%--Lc
z;-5XoQvbe|OK#;pR_`4wmw)G_o^$2zWA*+%X76uJ@vkZ8xV-;vS9)Ih@B8w;@5_7s
Q%D?BO|2;?V;~(eyKUyJUi2wiq

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.b.i4f4.00000.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.b.i4f4.00000.bin
new file mode 100644
index 0000000000000000000000000000000000000000..d4dd4fda329db3d895263036fc5218453e5e36f5
GIT binary patch
literal 1064
qcmZQ%fB+UK4WoWR884V23>cpgrT|Vi*fTJU;?Xb|O#{O@4FCYu=)G(J

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.b.i4f4.00001.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.b.i4f4.00001.bin
new file mode 100644
index 0000000000000000000000000000000000000000..38df9a2c5befedfd116d4320183ae97eec9f4967
GIT binary patch
literal 1064
rcmZQ%fB+UK{R>KeVT3SVFhgjVI8+#_3Pd&7kK)lV7)=AiI}HE;!9%`b

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.b.i4f4.00002.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.b.i4f4.00002.bin
new file mode 100644
index 0000000000000000000000000000000000000000..e1dddab855ed786ccf7d9b1b124a3a8418373f08
GIT binary patch
literal 1064
scmZQ%fB+UK{e=<2c*g{xUob=HUr>3dG?WLT8tg~$Xc&y9f#ID70GN5cR{#J2

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.b.i4f4.00003.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.b.i4f4.00003.bin
new file mode 100644
index 0000000000000000000000000000000000000000..b9878a2cfdccb951f39be81e2be443419798ef67
GIT binary patch
literal 1064
qcmZQ%fB+UK{f-I3c)^TH|ANXhLTLomV9&rXibum>Gz|>rGyni^uf9zH

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.b.i4f8.00000.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.b.i4f8.00000.bin
new file mode 100644
index 0000000000000000000000000000000000000000..d61c9fc666d41182a93e6e7dce70de5436911d3d
GIT binary patch
literal 2064
zcmZQ%fB+6C4WoWR884V23>cpgrT~ThU=QJr(xc%33W3pdFq#fV)4^yy7%c~eS~&m!
Dv{NeI

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.b.i4f8.00001.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.b.i4f8.00001.bin
new file mode 100644
index 0000000000000000000000000000000000000000..43e994a7c615a2c86e116449548185835c3560c2
GIT binary patch
literal 2064
zcmZQ%fB+6C{R>KeVT3SVFhgjVI8+#_3Pydfhp<NJ(Qp8Tz-T%cO$VdtU^E|$mIFhr
G8~^}Z@+;H;

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.b.i4f8.00002.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.b.i4f8.00002.bin
new file mode 100644
index 0000000000000000000000000000000000000000..e16f2232efe01ab24de39567ee97be81cc30eb42
GIT binary patch
literal 2064
zcmZQ%fB+6C{e=<2c*g{xUob=HUr>3dG?WLUKG;K8qx5JvfI?t29gL=f(R47H4@S#@
Ip;it601X%`$^ZZW

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.b.i4f8.00003.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.b.i4f8.00003.bin
new file mode 100644
index 0000000000000000000000000000000000000000..42c1b38d5d8363d481457182a05d79390594ba1a
GIT binary patch
literal 2064
zcmZQ%fB+6C{f-I3c)^TH|ANXhLTOa$gFS>lN{@yEC<I2+!Du=dO$Vd-V6+?<YUKa`
Dy)P@k

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.b.i8f4.00000.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.b.i8f4.00000.bin
new file mode 100644
index 0000000000000000000000000000000000000000..d4dd4fda329db3d895263036fc5218453e5e36f5
GIT binary patch
literal 1064
qcmZQ%fB+UK4WoWR884V23>cpgrT|Vi*fTJU;?Xb|O#{O@4FCYu=)G(J

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.b.i8f4.00001.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.b.i8f4.00001.bin
new file mode 100644
index 0000000000000000000000000000000000000000..38df9a2c5befedfd116d4320183ae97eec9f4967
GIT binary patch
literal 1064
rcmZQ%fB+UK{R>KeVT3SVFhgjVI8+#_3Pd&7kK)lV7)=AiI}HE;!9%`b

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.b.i8f4.00002.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.b.i8f4.00002.bin
new file mode 100644
index 0000000000000000000000000000000000000000..e1dddab855ed786ccf7d9b1b124a3a8418373f08
GIT binary patch
literal 1064
scmZQ%fB+UK{e=<2c*g{xUob=HUr>3dG?WLT8tg~$Xc&y9f#ID70GN5cR{#J2

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.b.i8f4.00003.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.b.i8f4.00003.bin
new file mode 100644
index 0000000000000000000000000000000000000000..b9878a2cfdccb951f39be81e2be443419798ef67
GIT binary patch
literal 1064
qcmZQ%fB+UK{f-I3c)^TH|ANXhLTLomV9&rXibum>Gz|>rGyni^uf9zH

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.b.i8f8.00000.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.b.i8f8.00000.bin
new file mode 100644
index 0000000000000000000000000000000000000000..d61c9fc666d41182a93e6e7dce70de5436911d3d
GIT binary patch
literal 2064
zcmZQ%fB+6C4WoWR884V23>cpgrT~ThU=QJr(xc%33W3pdFq#fV)4^yy7%c~eS~&m!
Dv{NeI

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.b.i8f8.00001.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.b.i8f8.00001.bin
new file mode 100644
index 0000000000000000000000000000000000000000..43e994a7c615a2c86e116449548185835c3560c2
GIT binary patch
literal 2064
zcmZQ%fB+6C{R>KeVT3SVFhgjVI8+#_3Pydfhp<NJ(Qp8Tz-T%cO$VdtU^E|$mIFhr
G8~^}Z@+;H;

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.b.i8f8.00002.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.b.i8f8.00002.bin
new file mode 100644
index 0000000000000000000000000000000000000000..e16f2232efe01ab24de39567ee97be81cc30eb42
GIT binary patch
literal 2064
zcmZQ%fB+6C{e=<2c*g{xUob=HUr>3dG?WLUKG;K8qx5JvfI?t29gL=f(R47H4@S#@
Ip;it601X%`$^ZZW

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.b.i8f8.00003.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.b.i8f8.00003.bin
new file mode 100644
index 0000000000000000000000000000000000000000..42c1b38d5d8363d481457182a05d79390594ba1a
GIT binary patch
literal 2064
zcmZQ%fB+6C{f-I3c)^TH|ANXhLTOa$gFS>lN{@yEC<I2+!Du=dO$Vd-V6+?<YUKa`
Dy)P@k

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.x0.i4f4.00000.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.x0.i4f4.00000.bin
new file mode 100644
index 0000000000000000000000000000000000000000..db11fb98ed002f64aa6ea48f4d6af4328b0492d2
GIT binary patch
literal 1064
kcmZQ%fB+UK4WoWR884V23>cpgreKsF4S~@R7%?FL0I*^L<^TWy

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.x0.i4f4.00001.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.x0.i4f4.00001.bin
new file mode 100644
index 0000000000000000000000000000000000000000..b06276baaf2557ea81e5184b6a2477c9117d0a5e
GIT binary patch
literal 1064
ncmZQ%fB+UK{R>KeVT3SVFhgjVI8+#_YLprcfzc2c2_XOgo4o_u

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.x0.i4f4.00002.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.x0.i4f4.00002.bin
new file mode 100644
index 0000000000000000000000000000000000000000..81473be4ce54f2f09bab4cc1fc07b3918ff564d0
GIT binary patch
literal 1064
pcmZQ%fB+UK{e=<2c*g{xUob=HUr>3dG?X_=jfTKz2#kaf0046H1JM8g

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.x0.i4f4.00003.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.x0.i4f4.00003.bin
new file mode 100644
index 0000000000000000000000000000000000000000..0874ce661f832748a11f09224efa05cca495c955
GIT binary patch
literal 1064
kcmZQ%fB+UK{f-I3c)^TH|ANXhLg`UzGz3ONVB~}V07@wX#{d8T

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.x0.i4f8.00000.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.x0.i4f8.00000.bin
new file mode 100644
index 0000000000000000000000000000000000000000..e8fb5f2108ef02ee129fedd1727525a645e84663
GIT binary patch
literal 2064
ucmZQ%fB+6C4WoWR884V23>cpgreKsF4S~@R7!85Z5Eu=C(GVCmApig)rUL2!

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.x0.i4f8.00001.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.x0.i4f8.00001.bin
new file mode 100644
index 0000000000000000000000000000000000000000..644894b8117d9e6e003ee37969460001bca68037
GIT binary patch
literal 2064
xcmZQ%fB+6C{R>KeVT3SVFhgjVI8+#_YLprcfzc2c4S~@R7!85Z5Eu?2007K31K$7u

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.x0.i4f8.00002.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.x0.i4f8.00002.bin
new file mode 100644
index 0000000000000000000000000000000000000000..7fc348739ea791ce999ef7392f543ae6d1bd6e7e
GIT binary patch
literal 2064
zcmZQ%fB+6C{e=<2c*g{xUob=HUr>3dG?X_=jfTKz2#kinXb6mkz-R~zhY$b&d|U(7

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.x0.i4f8.00003.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.x0.i4f8.00003.bin
new file mode 100644
index 0000000000000000000000000000000000000000..63d3a3f170741a45a8a4da0196cc5fc60d699222
GIT binary patch
literal 2064
ucmZQ%fB+6C{f-I3c)^TH|ANXhLg`UzGz3ONU^E0qLtr!nMnhouga806f&<F{

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.x0.i8f4.00000.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.x0.i8f4.00000.bin
new file mode 100644
index 0000000000000000000000000000000000000000..db11fb98ed002f64aa6ea48f4d6af4328b0492d2
GIT binary patch
literal 1064
kcmZQ%fB+UK4WoWR884V23>cpgreKsF4S~@R7%?FL0I*^L<^TWy

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.x0.i8f4.00001.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.x0.i8f4.00001.bin
new file mode 100644
index 0000000000000000000000000000000000000000..b06276baaf2557ea81e5184b6a2477c9117d0a5e
GIT binary patch
literal 1064
ncmZQ%fB+UK{R>KeVT3SVFhgjVI8+#_YLprcfzc2c2_XOgo4o_u

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.x0.i8f4.00002.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.x0.i8f4.00002.bin
new file mode 100644
index 0000000000000000000000000000000000000000..81473be4ce54f2f09bab4cc1fc07b3918ff564d0
GIT binary patch
literal 1064
pcmZQ%fB+UK{e=<2c*g{xUob=HUr>3dG?X_=jfTKz2#kaf0046H1JM8g

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.x0.i8f4.00003.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.x0.i8f4.00003.bin
new file mode 100644
index 0000000000000000000000000000000000000000..0874ce661f832748a11f09224efa05cca495c955
GIT binary patch
literal 1064
kcmZQ%fB+UK{f-I3c)^TH|ANXhLg`UzGz3ONVB~}V07@wX#{d8T

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.x0.i8f8.00000.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.x0.i8f8.00000.bin
new file mode 100644
index 0000000000000000000000000000000000000000..e8fb5f2108ef02ee129fedd1727525a645e84663
GIT binary patch
literal 2064
ucmZQ%fB+6C4WoWR884V23>cpgreKsF4S~@R7!85Z5Eu=C(GVCmApig)rUL2!

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.x0.i8f8.00001.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.x0.i8f8.00001.bin
new file mode 100644
index 0000000000000000000000000000000000000000..644894b8117d9e6e003ee37969460001bca68037
GIT binary patch
literal 2064
xcmZQ%fB+6C{R>KeVT3SVFhgjVI8+#_YLprcfzc2c4S~@R7!85Z5Eu?2007K31K$7u

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.x0.i8f8.00002.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.x0.i8f8.00002.bin
new file mode 100644
index 0000000000000000000000000000000000000000..7fc348739ea791ce999ef7392f543ae6d1bd6e7e
GIT binary patch
literal 2064
zcmZQ%fB+6C{e=<2c*g{xUob=HUr>3dG?X_=jfTKz2#kinXb6mkz-R~zhY$b&d|U(7

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.x0.i8f8.00003.bin b/external/hypre/src/test/TEST_ij/data/poisson_10x10x10_np4/IJ.x0.i8f8.00003.bin
new file mode 100644
index 0000000000000000000000000000000000000000..63d3a3f170741a45a8a4da0196cc5fc60d699222
GIT binary patch
literal 2064
ucmZQ%fB+6C{f-I3c)^TH|ANXhLg`UzGz3ONU^E0qLtr!nMnhouga806f&<F{

literal 0
HcmV?d00001

diff --git a/external/hypre/src/test/TEST_ij/data/tucker21935/IJ.A.00000 b/external/hypre/src/test/TEST_ij/data/tucker21935/IJ.A.00000
new file mode 100644
index 00000000..433fa30b
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/data/tucker21935/IJ.A.00000
@@ -0,0 +1,8570 @@
+0 5483 0 5483
+0 0 1.00000000000000e+00
+1 1 1.00000000000000e+00
+2 2 1.00000000000000e+00
+3 3 1.00000000000000e+00
+4 4 1.00000000000000e+00
+5 5 1.00000000000000e+00
+6 6 1.00000000000000e+00
+7 7 1.00000000000000e+00
+8 8 1.00000000000000e+00
+9 9 1.00000000000000e+00
+10 10 1.00000000000000e+00
+11 11 1.00000000000000e+00
+12 12 1.00000000000000e+00
+13 13 1.00000000000000e+00
+14 14 1.00000000000000e+00
+15 15 1.00000000000000e+00
+16 16 1.00000000000000e+00
+17 17 1.00000000000000e+00
+18 18 1.00000000000000e+00
+19 19 1.00000000000000e+00
+20 20 1.00000000000000e+00
+21 21 1.00000000000000e+00
+22 22 1.00000000000000e+00
+23 23 1.00000000000000e+00
+24 24 1.00000000000000e+00
+25 25 1.00000000000000e+00
+26 26 1.00000000000000e+00
+27 27 1.00000000000000e+00
+28 28 1.00000000000000e+00
+29 29 1.00000000000000e+00
+30 30 1.00000000000000e+00
+31 31 1.00000000000000e+00
+32 32 1.00000000000000e+00
+33 33 1.00000000000000e+00
+34 34 1.00000000000000e+00
+35 35 1.00000000000000e+00
+36 36 1.00000000000000e+00
+37 37 1.00000000000000e+00
+38 38 1.00000000000000e+00
+39 39 1.00000000000000e+00
+40 40 1.00000000000000e+00
+41 41 1.00000000000000e+00
+42 42 1.00000000000000e+00
+43 43 1.00000000000000e+00
+44 44 1.00000000000000e+00
+45 45 1.00000000000000e+00
+46 46 1.00000000000000e+00
+47 47 1.00000000000000e+00
+48 48 1.00000000000000e+00
+49 49 1.00000000000000e+00
+50 50 1.00000000000000e+00
+51 51 1.00000000000000e+00
+52 52 1.00000000000000e+00
+53 53 1.00000000000000e+00
+54 54 1.00000000000000e+00
+55 55 1.00000000000000e+00
+56 56 1.00000000000000e+00
+57 57 1.00000000000000e+00
+58 58 1.00000000000000e+00
+59 59 1.00000000000000e+00
+60 60 1.00000000000000e+00
+61 61 1.00000000000000e+00
+62 62 1.00000000000000e+00
+63 63 1.00000000000000e+00
+64 64 1.00000000000000e+00
+65 65 1.00000000000000e+00
+66 66 1.00000000000000e+00
+67 67 1.00000000000000e+00
+68 68 1.00000000000000e+00
+69 69 1.00000000000000e+00
+70 70 1.00000000000000e+00
+71 71 1.00000000000000e+00
+72 72 1.00000000000000e+00
+73 73 1.00000000000000e+00
+74 74 1.00000000000000e+00
+75 75 1.00000000000000e+00
+76 76 1.00000000000000e+00
+77 77 1.00000000000000e+00
+78 78 1.00000000000000e+00
+79 79 1.00000000000000e+00
+80 80 1.00000000000000e+00
+81 81 1.00000000000000e+00
+82 82 1.00000000000000e+00
+83 83 1.00000000000000e+00
+84 84 1.00000000000000e+00
+85 85 1.00000000000000e+00
+86 86 1.00000000000000e+00
+87 87 1.00000000000000e+00
+88 88 1.00000000000000e+00
+89 89 1.00000000000000e+00
+90 90 1.00000000000000e+00
+91 91 1.00000000000000e+00
+92 92 1.00000000000000e+00
+93 93 1.00000000000000e+00
+94 94 1.00000000000000e+00
+95 95 1.00000000000000e+00
+96 96 1.00000000000000e+00
+97 97 1.00000000000000e+00
+98 98 1.00000000000000e+00
+99 99 1.00000000000000e+00
+100 100 1.00000000000000e+00
+101 101 1.00000000000000e+00
+102 102 1.00000000000000e+00
+103 103 1.00000000000000e+00
+104 104 1.00000000000000e+00
+105 105 1.00000000000000e+00
+106 106 1.00000000000000e+00
+107 107 1.00000000000000e+00
+108 108 1.00000000000000e+00
+109 109 1.00000000000000e+00
+110 110 1.00000000000000e+00
+111 111 1.00000000000000e+00
+112 112 1.00000000000000e+00
+113 113 1.00000000000000e+00
+114 114 1.00000000000000e+00
+115 115 1.00000000000000e+00
+116 116 1.00000000000000e+00
+117 117 1.00000000000000e+00
+118 118 1.00000000000000e+00
+119 119 1.00000000000000e+00
+120 120 1.00000000000000e+00
+121 121 1.00000000000000e+00
+122 122 1.00000000000000e+00
+123 123 1.00000000000000e+00
+124 124 1.00000000000000e+00
+125 125 1.00000000000000e+00
+126 126 1.00000000000000e+00
+127 127 1.00000000000000e+00
+128 128 1.00000000000000e+00
+129 129 1.00000000000000e+00
+130 130 1.00000000000000e+00
+131 131 1.00000000000000e+00
+132 132 1.00000000000000e+00
+133 133 1.00000000000000e+00
+134 134 1.00000000000000e+00
+135 135 1.00000000000000e+00
+136 136 1.00000000000000e+00
+137 137 1.00000000000000e+00
+138 138 1.00000000000000e+00
+139 139 1.00000000000000e+00
+140 140 1.00000000000000e+00
+141 141 1.00000000000000e+00
+142 142 1.00000000000000e+00
+143 143 1.00000000000000e+00
+144 144 1.00000000000000e+00
+145 145 1.00000000000000e+00
+146 146 1.00000000000000e+00
+147 147 1.00000000000000e+00
+148 148 1.00000000000000e+00
+149 149 1.00000000000000e+00
+150 150 1.00000000000000e+00
+151 151 1.00000000000000e+00
+152 152 1.00000000000000e+00
+153 153 1.00000000000000e+00
+154 154 1.00000000000000e+00
+155 155 1.00000000000000e+00
+156 156 1.00000000000000e+00
+157 157 1.00000000000000e+00
+158 158 1.00000000000000e+00
+159 159 1.00000000000000e+00
+160 160 1.00000000000000e+00
+161 161 1.00000000000000e+00
+162 162 1.00000000000000e+00
+163 163 1.00000000000000e+00
+164 164 1.00000000000000e+00
+165 165 1.00000000000000e+00
+166 166 1.00000000000000e+00
+167 167 1.00000000000000e+00
+168 168 1.00000000000000e+00
+169 169 1.00000000000000e+00
+170 170 1.00000000000000e+00
+171 171 1.00000000000000e+00
+172 172 1.00000000000000e+00
+173 173 1.00000000000000e+00
+174 174 1.00000000000000e+00
+175 175 1.00000000000000e+00
+176 176 1.00000000000000e+00
+177 177 1.00000000000000e+00
+178 178 1.00000000000000e+00
+179 179 1.00000000000000e+00
+180 180 1.00000000000000e+00
+181 181 1.00000000000000e+00
+182 182 1.00000000000000e+00
+183 183 1.00000000000000e+00
+184 184 1.00000000000000e+00
+185 185 1.00000000000000e+00
+186 186 1.00000000000000e+00
+187 187 1.00000000000000e+00
+188 188 1.00000000000000e+00
+189 189 1.00000000000000e+00
+190 190 1.00000000000000e+00
+191 191 1.00000000000000e+00
+192 192 1.00000000000000e+00
+193 193 1.00000000000000e+00
+194 194 1.00000000000000e+00
+195 195 1.00000000000000e+00
+196 196 1.00000000000000e+00
+197 197 1.00000000000000e+00
+198 198 1.00000000000000e+00
+199 199 1.00000000000000e+00
+200 200 1.00000000000000e+00
+201 201 1.00000000000000e+00
+202 202 1.00000000000000e+00
+203 203 1.00000000000000e+00
+204 204 1.00000000000000e+00
+205 205 1.00000000000000e+00
+206 206 1.00000000000000e+00
+207 207 1.00000000000000e+00
+208 208 1.00000000000000e+00
+209 209 1.00000000000000e+00
+210 210 1.00000000000000e+00
+211 211 1.00000000000000e+00
+212 212 1.00000000000000e+00
+213 213 1.00000000000000e+00
+214 214 1.00000000000000e+00
+215 215 1.00000000000000e+00
+216 216 1.00000000000000e+00
+217 217 1.00000000000000e+00
+218 218 1.00000000000000e+00
+219 219 1.00000000000000e+00
+220 220 1.00000000000000e+00
+221 221 1.00000000000000e+00
+222 222 1.00000000000000e+00
+223 223 1.00000000000000e+00
+224 224 1.00000000000000e+00
+225 225 1.00000000000000e+00
+226 226 1.00000000000000e+00
+227 227 1.00000000000000e+00
+228 228 1.00000000000000e+00
+229 229 1.00000000000000e+00
+230 230 1.00000000000000e+00
+231 231 1.00000000000000e+00
+232 232 1.00000000000000e+00
+233 233 1.00000000000000e+00
+234 234 1.00000000000000e+00
+235 235 1.00000000000000e+00
+236 236 1.00000000000000e+00
+237 237 1.00000000000000e+00
+238 238 1.00000000000000e+00
+239 239 1.00000000000000e+00
+240 240 1.00000000000000e+00
+241 241 1.00000000000000e+00
+242 242 1.00000000000000e+00
+243 243 1.00000000000000e+00
+244 244 1.00000000000000e+00
+245 245 1.00000000000000e+00
+246 246 1.00000000000000e+00
+247 247 1.00000000000000e+00
+248 248 1.00000000000000e+00
+249 249 1.00000000000000e+00
+250 250 1.00000000000000e+00
+251 251 1.00000000000000e+00
+252 252 1.00000000000000e+00
+253 253 1.00000000000000e+00
+254 254 1.00000000000000e+00
+255 255 1.00000000000000e+00
+256 256 1.00000000000000e+00
+257 257 1.00000000000000e+00
+258 258 1.00000000000000e+00
+259 259 1.00000000000000e+00
+260 260 1.00000000000000e+00
+261 261 1.00000000000000e+00
+262 262 1.00000000000000e+00
+263 263 1.00000000000000e+00
+264 264 1.00000000000000e+00
+265 265 1.00000000000000e+00
+266 266 1.00000000000000e+00
+267 267 1.00000000000000e+00
+268 268 1.00000000000000e+00
+269 269 1.00000000000000e+00
+270 270 1.00000000000000e+00
+271 271 1.00000000000000e+00
+272 272 1.00000000000000e+00
+273 273 1.00000000000000e+00
+274 274 1.00000000000000e+00
+275 275 1.00000000000000e+00
+276 276 1.00000000000000e+00
+277 277 1.00000000000000e+00
+278 278 1.00000000000000e+00
+279 279 1.00000000000000e+00
+280 280 1.00000000000000e+00
+281 281 1.00000000000000e+00
+282 282 1.00000000000000e+00
+283 283 1.00000000000000e+00
+284 284 1.00000000000000e+00
+285 285 1.00000000000000e+00
+286 286 1.00000000000000e+00
+287 287 1.00000000000000e+00
+288 288 1.00000000000000e+00
+289 289 1.00000000000000e+00
+290 290 1.00000000000000e+00
+291 291 1.00000000000000e+00
+292 292 1.00000000000000e+00
+293 293 1.00000000000000e+00
+294 294 1.00000000000000e+00
+295 295 1.00000000000000e+00
+296 296 1.00000000000000e+00
+297 297 1.00000000000000e+00
+298 298 1.00000000000000e+00
+299 299 1.00000000000000e+00
+300 300 1.00000000000000e+00
+301 301 1.00000000000000e+00
+302 302 1.00000000000000e+00
+303 303 1.00000000000000e+00
+304 304 1.00000000000000e+00
+305 305 1.00000000000000e+00
+306 306 1.00000000000000e+00
+307 307 1.00000000000000e+00
+308 308 1.00000000000000e+00
+309 309 1.00000000000000e+00
+310 310 1.00000000000000e+00
+311 311 1.00000000000000e+00
+312 312 1.00000000000000e+00
+313 313 1.00000000000000e+00
+314 314 1.00000000000000e+00
+315 315 1.00000000000000e+00
+316 316 1.00000000000000e+00
+317 317 1.00000000000000e+00
+318 318 1.00000000000000e+00
+319 319 1.00000000000000e+00
+320 320 1.00000000000000e+00
+321 321 1.00000000000000e+00
+322 322 1.00000000000000e+00
+323 323 1.00000000000000e+00
+324 324 1.00000000000000e+00
+325 325 1.00000000000000e+00
+326 326 1.00000000000000e+00
+327 327 1.00000000000000e+00
+328 328 1.00000000000000e+00
+329 329 1.00000000000000e+00
+330 330 1.00000000000000e+00
+331 331 1.00000000000000e+00
+332 332 1.00000000000000e+00
+333 333 1.00000000000000e+00
+334 334 1.00000000000000e+00
+335 335 1.00000000000000e+00
+336 336 1.00000000000000e+00
+337 337 1.00000000000000e+00
+338 338 1.00000000000000e+00
+339 339 1.00000000000000e+00
+340 340 1.00000000000000e+00
+341 341 1.00000000000000e+00
+342 342 1.00000000000000e+00
+343 343 1.00000000000000e+00
+344 344 1.00000000000000e+00
+345 345 1.00000000000000e+00
+346 346 1.00000000000000e+00
+347 347 1.00000000000000e+00
+348 348 1.00000000000000e+00
+349 349 1.00000000000000e+00
+350 350 1.00000000000000e+00
+351 351 1.00000000000000e+00
+352 352 1.00000000000000e+00
+353 353 1.00000000000000e+00
+354 354 1.00000000000000e+00
+355 355 1.00000000000000e+00
+356 356 1.00000000000000e+00
+357 357 1.00000000000000e+00
+358 358 1.00000000000000e+00
+359 359 1.00000000000000e+00
+360 360 1.00000000000000e+00
+361 361 1.00000000000000e+00
+362 362 1.00000000000000e+00
+363 363 1.00000000000000e+00
+364 364 1.00000000000000e+00
+365 365 1.00000000000000e+00
+366 366 1.00000000000000e+00
+367 367 1.00000000000000e+00
+368 368 1.00000000000000e+00
+369 369 1.00000000000000e+00
+370 370 1.00000000000000e+00
+371 371 1.00000000000000e+00
+372 372 1.00000000000000e+00
+373 373 1.00000000000000e+00
+374 374 1.00000000000000e+00
+375 375 1.00000000000000e+00
+376 376 1.00000000000000e+00
+377 377 1.00000000000000e+00
+378 378 1.00000000000000e+00
+379 379 1.00000000000000e+00
+380 380 1.00000000000000e+00
+381 381 1.00000000000000e+00
+382 382 1.00000000000000e+00
+383 383 1.00000000000000e+00
+384 384 1.00000000000000e+00
+385 385 1.00000000000000e+00
+386 386 1.00000000000000e+00
+387 387 1.00000000000000e+00
+388 388 1.00000000000000e+00
+389 389 1.00000000000000e+00
+390 390 1.00000000000000e+00
+391 391 1.00000000000000e+00
+392 392 1.00000000000000e+00
+393 393 1.00000000000000e+00
+394 394 1.00000000000000e+00
+395 395 1.00000000000000e+00
+396 396 1.00000000000000e+00
+397 397 1.00000000000000e+00
+398 398 1.00000000000000e+00
+399 399 1.00000000000000e+00
+400 400 1.00000000000000e+00
+401 401 1.00000000000000e+00
+402 402 1.00000000000000e+00
+403 403 1.00000000000000e+00
+404 404 1.00000000000000e+00
+405 405 1.00000000000000e+00
+406 406 1.00000000000000e+00
+407 407 1.00000000000000e+00
+408 408 1.00000000000000e+00
+409 409 1.00000000000000e+00
+410 410 1.00000000000000e+00
+411 411 1.00000000000000e+00
+412 412 1.00000000000000e+00
+413 413 1.00000000000000e+00
+414 414 1.00000000000000e+00
+415 415 1.00000000000000e+00
+416 416 1.00000000000000e+00
+417 417 1.00000000000000e+00
+418 418 1.00000000000000e+00
+419 419 1.00000000000000e+00
+420 420 1.00000000000000e+00
+421 421 1.00000000000000e+00
+422 422 1.00000000000000e+00
+423 423 1.00000000000000e+00
+424 424 1.00000000000000e+00
+425 425 1.00000000000000e+00
+426 426 1.00000000000000e+00
+427 427 1.00000000000000e+00
+428 428 1.00000000000000e+00
+429 429 1.00000000000000e+00
+430 430 1.00000000000000e+00
+431 431 1.00000000000000e+00
+432 432 1.00000000000000e+00
+433 433 1.00000000000000e+00
+434 434 1.00000000000000e+00
+435 435 1.00000000000000e+00
+436 436 1.00000000000000e+00
+437 437 1.00000000000000e+00
+438 438 1.00000000000000e+00
+439 439 1.00000000000000e+00
+440 440 1.00000000000000e+00
+441 441 1.00000000000000e+00
+442 442 1.00000000000000e+00
+443 443 1.00000000000000e+00
+444 444 1.00000000000000e+00
+445 445 1.00000000000000e+00
+446 446 1.00000000000000e+00
+447 447 1.00000000000000e+00
+448 448 1.00000000000000e+00
+449 449 1.00000000000000e+00
+450 450 1.00000000000000e+00
+451 451 1.00000000000000e+00
+452 452 1.00000000000000e+00
+453 453 1.00000000000000e+00
+454 454 1.00000000000000e+00
+455 455 1.00000000000000e+00
+456 456 1.00000000000000e+00
+457 457 1.00000000000000e+00
+458 458 1.00000000000000e+00
+459 459 1.00000000000000e+00
+460 460 1.00000000000000e+00
+461 461 1.00000000000000e+00
+462 462 1.00000000000000e+00
+463 463 1.00000000000000e+00
+464 464 1.00000000000000e+00
+465 465 1.00000000000000e+00
+466 466 1.00000000000000e+00
+467 467 1.00000000000000e+00
+468 468 1.00000000000000e+00
+469 469 1.00000000000000e+00
+470 470 1.00000000000000e+00
+471 471 1.00000000000000e+00
+472 472 1.00000000000000e+00
+473 473 1.00000000000000e+00
+474 474 1.00000000000000e+00
+475 475 1.00000000000000e+00
+476 476 1.00000000000000e+00
+477 477 1.00000000000000e+00
+478 478 1.00000000000000e+00
+479 479 1.00000000000000e+00
+480 480 1.00000000000000e+00
+481 481 1.00000000000000e+00
+482 482 1.00000000000000e+00
+483 483 1.00000000000000e+00
+484 484 1.00000000000000e+00
+485 485 1.00000000000000e+00
+486 486 1.00000000000000e+00
+487 487 1.00000000000000e+00
+488 488 1.00000000000000e+00
+489 489 1.00000000000000e+00
+490 490 1.00000000000000e+00
+491 491 1.00000000000000e+00
+492 492 1.00000000000000e+00
+493 493 1.00000000000000e+00
+494 494 1.00000000000000e+00
+495 495 1.00000000000000e+00
+496 496 1.00000000000000e+00
+497 497 1.00000000000000e+00
+498 498 1.00000000000000e+00
+499 499 1.00000000000000e+00
+500 500 1.00000000000000e+00
+501 501 1.00000000000000e+00
+502 502 1.00000000000000e+00
+503 503 1.00000000000000e+00
+504 504 1.00000000000000e+00
+505 505 1.00000000000000e+00
+506 506 1.00000000000000e+00
+507 507 1.00000000000000e+00
+508 508 1.00000000000000e+00
+509 509 1.00000000000000e+00
+510 510 1.00000000000000e+00
+511 511 1.00000000000000e+00
+512 512 1.00000000000000e+00
+513 513 1.00000000000000e+00
+514 514 1.00000000000000e+00
+515 515 1.00000000000000e+00
+516 516 1.00000000000000e+00
+517 517 1.00000000000000e+00
+518 518 1.00000000000000e+00
+519 519 1.00000000000000e+00
+520 520 1.00000000000000e+00
+521 521 1.00000000000000e+00
+522 522 1.00000000000000e+00
+523 523 1.00000000000000e+00
+524 524 1.00000000000000e+00
+525 525 1.00000000000000e+00
+526 526 1.00000000000000e+00
+527 527 1.00000000000000e+00
+528 528 1.00000000000000e+00
+529 529 1.00000000000000e+00
+530 530 1.00000000000000e+00
+531 531 1.00000000000000e+00
+532 532 1.00000000000000e+00
+533 533 1.00000000000000e+00
+534 534 1.00000000000000e+00
+535 535 1.00000000000000e+00
+536 536 1.00000000000000e+00
+537 537 1.00000000000000e+00
+538 538 1.00000000000000e+00
+539 539 1.00000000000000e+00
+540 540 1.00000000000000e+00
+541 541 1.00000000000000e+00
+542 542 1.00000000000000e+00
+543 543 1.00000000000000e+00
+544 544 1.00000000000000e+00
+545 545 1.00000000000000e+00
+546 546 1.00000000000000e+00
+547 547 1.00000000000000e+00
+548 548 1.00000000000000e+00
+549 549 1.00000000000000e+00
+550 550 1.00000000000000e+00
+551 551 1.00000000000000e+00
+552 552 1.00000000000000e+00
+553 553 1.00000000000000e+00
+554 554 1.00000000000000e+00
+555 555 1.00000000000000e+00
+556 556 1.00000000000000e+00
+557 557 1.00000000000000e+00
+558 558 1.00000000000000e+00
+559 559 1.00000000000000e+00
+560 560 1.00000000000000e+00
+561 561 1.00000000000000e+00
+562 562 1.00000000000000e+00
+563 563 1.00000000000000e+00
+564 564 1.00000000000000e+00
+565 565 1.00000000000000e+00
+566 566 1.00000000000000e+00
+567 567 1.00000000000000e+00
+568 568 1.00000000000000e+00
+569 569 1.00000000000000e+00
+570 570 1.00000000000000e+00
+571 571 1.00000000000000e+00
+572 572 1.00000000000000e+00
+573 573 1.00000000000000e+00
+574 574 1.00000000000000e+00
+575 575 1.00000000000000e+00
+576 576 1.00000000000000e+00
+577 577 1.00000000000000e+00
+578 578 1.00000000000000e+00
+579 579 1.00000000000000e+00
+580 580 1.00000000000000e+00
+581 581 1.00000000000000e+00
+582 582 1.00000000000000e+00
+583 583 1.00000000000000e+00
+584 584 1.00000000000000e+00
+585 585 1.00000000000000e+00
+586 586 1.00000000000000e+00
+587 587 1.00000000000000e+00
+588 588 1.00000000000000e+00
+589 589 1.00000000000000e+00
+590 590 1.00000000000000e+00
+591 591 1.00000000000000e+00
+592 592 1.00000000000000e+00
+593 593 1.00000000000000e+00
+594 594 1.00000000000000e+00
+595 595 1.00000000000000e+00
+596 596 1.00000000000000e+00
+597 597 1.00000000000000e+00
+598 598 1.00000000000000e+00
+599 599 1.00000000000000e+00
+600 600 1.00000000000000e+00
+601 601 1.00000000000000e+00
+602 602 1.00000000000000e+00
+603 603 1.00000000000000e+00
+604 604 1.00000000000000e+00
+605 605 1.00000000000000e+00
+606 606 1.00000000000000e+00
+607 607 1.00000000000000e+00
+608 608 1.00000000000000e+00
+609 609 1.00000000000000e+00
+610 610 1.00000000000000e+00
+611 611 1.00000000000000e+00
+612 612 1.00000000000000e+00
+613 613 1.00000000000000e+00
+614 614 1.00000000000000e+00
+615 615 1.00000000000000e+00
+616 616 1.00000000000000e+00
+617 617 1.00000000000000e+00
+618 618 1.00000000000000e+00
+619 619 1.00000000000000e+00
+620 620 1.00000000000000e+00
+621 621 1.00000000000000e+00
+622 622 1.00000000000000e+00
+623 623 1.00000000000000e+00
+624 624 1.00000000000000e+00
+625 625 1.00000000000000e+00
+626 626 1.00000000000000e+00
+627 627 1.00000000000000e+00
+628 628 1.00000000000000e+00
+629 629 1.00000000000000e+00
+630 630 1.00000000000000e+00
+631 631 1.00000000000000e+00
+632 632 1.00000000000000e+00
+633 633 1.00000000000000e+00
+634 634 1.00000000000000e+00
+635 635 1.00000000000000e+00
+636 636 1.00000000000000e+00
+637 637 1.00000000000000e+00
+638 638 1.00000000000000e+00
+639 639 1.00000000000000e+00
+640 640 1.00000000000000e+00
+641 641 1.00000000000000e+00
+642 642 1.00000000000000e+00
+643 643 1.00000000000000e+00
+644 644 1.00000000000000e+00
+645 645 1.00000000000000e+00
+646 646 1.00000000000000e+00
+647 647 1.00000000000000e+00
+648 648 1.00000000000000e+00
+649 649 1.00000000000000e+00
+650 650 1.00000000000000e+00
+651 651 1.00000000000000e+00
+652 652 1.00000000000000e+00
+653 653 1.00000000000000e+00
+654 654 1.00000000000000e+00
+655 655 1.00000000000000e+00
+656 656 1.00000000000000e+00
+657 657 1.00000000000000e+00
+658 658 1.00000000000000e+00
+659 659 1.00000000000000e+00
+660 660 1.00000000000000e+00
+661 661 1.00000000000000e+00
+662 662 1.00000000000000e+00
+663 663 1.00000000000000e+00
+664 664 1.00000000000000e+00
+665 665 1.00000000000000e+00
+666 666 1.00000000000000e+00
+667 667 1.00000000000000e+00
+668 668 1.00000000000000e+00
+669 669 1.00000000000000e+00
+670 670 1.00000000000000e+00
+671 671 1.00000000000000e+00
+672 672 1.00000000000000e+00
+673 673 1.00000000000000e+00
+674 674 1.00000000000000e+00
+675 675 1.00000000000000e+00
+676 676 1.00000000000000e+00
+677 677 1.00000000000000e+00
+678 678 1.00000000000000e+00
+679 679 1.00000000000000e+00
+680 680 1.00000000000000e+00
+681 681 1.00000000000000e+00
+682 682 1.00000000000000e+00
+683 683 1.00000000000000e+00
+684 684 1.00000000000000e+00
+685 685 1.00000000000000e+00
+686 686 1.00000000000000e+00
+687 687 1.00000000000000e+00
+688 688 1.00000000000000e+00
+689 689 1.00000000000000e+00
+690 690 1.00000000000000e+00
+691 691 1.00000000000000e+00
+692 692 1.00000000000000e+00
+693 693 1.00000000000000e+00
+694 694 1.00000000000000e+00
+695 695 1.00000000000000e+00
+696 696 1.00000000000000e+00
+697 697 1.00000000000000e+00
+698 698 1.00000000000000e+00
+699 699 1.00000000000000e+00
+700 700 1.00000000000000e+00
+701 701 1.00000000000000e+00
+702 702 1.00000000000000e+00
+703 703 1.00000000000000e+00
+704 704 1.00000000000000e+00
+705 705 1.00000000000000e+00
+706 706 1.00000000000000e+00
+707 707 1.00000000000000e+00
+708 708 1.00000000000000e+00
+709 709 1.00000000000000e+00
+710 710 1.00000000000000e+00
+711 711 1.00000000000000e+00
+712 712 1.00000000000000e+00
+713 713 1.00000000000000e+00
+714 714 1.00000000000000e+00
+715 715 1.00000000000000e+00
+716 716 1.00000000000000e+00
+717 717 1.00000000000000e+00
+718 718 1.00000000000000e+00
+719 719 1.00000000000000e+00
+720 720 1.00000000000000e+00
+721 721 1.00000000000000e+00
+722 722 1.00000000000000e+00
+723 723 1.00000000000000e+00
+724 724 1.00000000000000e+00
+725 725 1.00000000000000e+00
+726 726 1.00000000000000e+00
+727 727 1.00000000000000e+00
+728 728 1.00000000000000e+00
+729 729 1.00000000000000e+00
+730 730 1.00000000000000e+00
+731 731 1.00000000000000e+00
+732 732 1.00000000000000e+00
+733 733 1.00000000000000e+00
+734 734 1.00000000000000e+00
+735 735 1.00000000000000e+00
+736 736 1.00000000000000e+00
+737 737 1.00000000000000e+00
+738 738 1.00000000000000e+00
+739 739 1.00000000000000e+00
+740 740 1.00000000000000e+00
+741 741 1.00000000000000e+00
+742 742 1.00000000000000e+00
+743 743 1.00000000000000e+00
+744 744 1.00000000000000e+00
+745 745 1.00000000000000e+00
+746 746 1.00000000000000e+00
+747 747 1.00000000000000e+00
+748 748 1.00000000000000e+00
+749 749 1.00000000000000e+00
+750 750 1.00000000000000e+00
+751 751 1.00000000000000e+00
+752 752 1.00000000000000e+00
+753 753 1.00000000000000e+00
+754 754 1.00000000000000e+00
+755 755 1.00000000000000e+00
+756 756 1.00000000000000e+00
+757 757 1.00000000000000e+00
+758 758 1.00000000000000e+00
+759 759 1.00000000000000e+00
+760 760 1.00000000000000e+00
+761 761 1.00000000000000e+00
+762 762 1.00000000000000e+00
+763 763 1.00000000000000e+00
+764 764 1.00000000000000e+00
+765 765 1.00000000000000e+00
+766 766 1.00000000000000e+00
+767 767 1.00000000000000e+00
+768 768 1.00000000000000e+00
+769 769 1.00000000000000e+00
+770 770 1.00000000000000e+00
+771 771 1.00000000000000e+00
+772 772 1.00000000000000e+00
+773 773 1.00000000000000e+00
+774 774 1.00000000000000e+00
+775 775 1.00000000000000e+00
+776 776 1.00000000000000e+00
+777 777 1.00000000000000e+00
+778 778 1.00000000000000e+00
+779 779 1.00000000000000e+00
+780 780 1.00000000000000e+00
+781 781 1.00000000000000e+00
+782 782 1.00000000000000e+00
+783 783 1.00000000000000e+00
+784 784 1.00000000000000e+00
+785 785 1.00000000000000e+00
+786 786 1.00000000000000e+00
+787 787 1.00000000000000e+00
+788 788 1.00000000000000e+00
+789 789 1.00000000000000e+00
+790 790 1.00000000000000e+00
+791 791 1.00000000000000e+00
+792 792 1.00000000000000e+00
+793 793 1.00000000000000e+00
+794 794 1.00000000000000e+00
+795 795 1.00000000000000e+00
+796 796 1.00000000000000e+00
+797 797 1.00000000000000e+00
+798 798 1.00000000000000e+00
+799 799 1.00000000000000e+00
+800 800 1.00000000000000e+00
+801 801 1.00000000000000e+00
+802 802 1.00000000000000e+00
+803 803 1.00000000000000e+00
+804 804 1.00000000000000e+00
+805 805 1.00000000000000e+00
+806 806 1.00000000000000e+00
+807 807 1.00000000000000e+00
+808 808 1.00000000000000e+00
+809 809 1.00000000000000e+00
+810 810 1.00000000000000e+00
+811 811 1.00000000000000e+00
+812 812 1.00000000000000e+00
+813 813 1.00000000000000e+00
+814 814 1.00000000000000e+00
+815 815 1.00000000000000e+00
+816 816 1.00000000000000e+00
+817 817 1.00000000000000e+00
+818 818 1.00000000000000e+00
+819 819 1.00000000000000e+00
+820 820 1.00000000000000e+00
+821 821 1.00000000000000e+00
+822 822 1.00000000000000e+00
+823 823 1.00000000000000e+00
+824 824 1.00000000000000e+00
+825 825 1.00000000000000e+00
+826 826 1.00000000000000e+00
+827 827 1.00000000000000e+00
+828 828 1.00000000000000e+00
+829 829 1.00000000000000e+00
+830 830 1.00000000000000e+00
+831 831 1.00000000000000e+00
+832 832 1.00000000000000e+00
+833 833 1.00000000000000e+00
+834 834 1.00000000000000e+00
+835 835 1.00000000000000e+00
+836 836 1.00000000000000e+00
+837 837 1.00000000000000e+00
+838 838 1.00000000000000e+00
+839 839 1.00000000000000e+00
+840 840 1.00000000000000e+00
+841 841 1.00000000000000e+00
+842 842 1.00000000000000e+00
+843 843 1.00000000000000e+00
+844 844 1.00000000000000e+00
+845 845 1.00000000000000e+00
+846 846 1.00000000000000e+00
+847 847 1.00000000000000e+00
+848 848 1.00000000000000e+00
+849 849 1.00000000000000e+00
+850 850 1.00000000000000e+00
+851 851 1.00000000000000e+00
+852 852 1.00000000000000e+00
+853 853 1.00000000000000e+00
+854 854 1.00000000000000e+00
+855 855 1.00000000000000e+00
+856 856 1.00000000000000e+00
+857 857 1.00000000000000e+00
+858 858 1.00000000000000e+00
+859 859 1.00000000000000e+00
+860 860 1.00000000000000e+00
+861 861 1.00000000000000e+00
+862 862 1.00000000000000e+00
+863 863 1.00000000000000e+00
+864 864 1.00000000000000e+00
+865 865 1.00000000000000e+00
+866 866 1.00000000000000e+00
+867 867 1.00000000000000e+00
+868 868 1.00000000000000e+00
+869 869 1.00000000000000e+00
+870 870 1.00000000000000e+00
+871 871 1.00000000000000e+00
+872 872 1.00000000000000e+00
+873 873 1.00000000000000e+00
+874 874 1.00000000000000e+00
+875 875 1.00000000000000e+00
+876 876 1.00000000000000e+00
+877 877 1.00000000000000e+00
+878 878 1.00000000000000e+00
+879 879 1.00000000000000e+00
+880 880 1.00000000000000e+00
+881 881 1.00000000000000e+00
+882 882 1.00000000000000e+00
+883 883 1.00000000000000e+00
+884 884 1.00000000000000e+00
+885 885 1.00000000000000e+00
+886 886 1.00000000000000e+00
+887 887 1.00000000000000e+00
+888 888 1.00000000000000e+00
+889 889 1.00000000000000e+00
+890 890 1.00000000000000e+00
+891 891 1.00000000000000e+00
+892 892 1.00000000000000e+00
+893 893 1.00000000000000e+00
+894 894 1.00000000000000e+00
+895 895 1.00000000000000e+00
+896 896 1.00000000000000e+00
+897 897 1.00000000000000e+00
+898 898 1.00000000000000e+00
+899 899 1.00000000000000e+00
+900 900 1.00000000000000e+00
+901 901 1.00000000000000e+00
+902 902 1.00000000000000e+00
+903 903 1.00000000000000e+00
+904 904 1.00000000000000e+00
+905 905 1.00000000000000e+00
+906 906 1.00000000000000e+00
+907 907 1.00000000000000e+00
+908 908 1.00000000000000e+00
+909 909 1.00000000000000e+00
+910 910 1.00000000000000e+00
+911 911 1.00000000000000e+00
+912 912 1.00000000000000e+00
+913 913 1.00000000000000e+00
+914 914 1.00000000000000e+00
+915 915 1.00000000000000e+00
+916 916 1.00000000000000e+00
+917 917 1.00000000000000e+00
+918 918 1.00000000000000e+00
+919 919 1.00000000000000e+00
+920 920 1.00000000000000e+00
+921 921 1.00000000000000e+00
+922 922 1.00000000000000e+00
+923 923 1.00000000000000e+00
+924 924 1.00000000000000e+00
+925 925 1.00000000000000e+00
+926 926 1.00000000000000e+00
+927 927 1.00000000000000e+00
+928 928 1.00000000000000e+00
+929 929 1.00000000000000e+00
+930 930 1.00000000000000e+00
+931 931 1.00000000000000e+00
+932 932 1.00000000000000e+00
+933 933 1.00000000000000e+00
+934 934 1.00000000000000e+00
+935 935 1.00000000000000e+00
+936 936 1.00000000000000e+00
+937 937 1.00000000000000e+00
+938 938 1.00000000000000e+00
+939 939 1.00000000000000e+00
+940 940 1.00000000000000e+00
+941 941 1.00000000000000e+00
+942 942 1.00000000000000e+00
+943 943 1.00000000000000e+00
+944 944 1.00000000000000e+00
+945 945 1.00000000000000e+00
+946 946 1.00000000000000e+00
+947 947 1.00000000000000e+00
+948 948 1.00000000000000e+00
+949 949 1.00000000000000e+00
+950 950 1.00000000000000e+00
+951 951 1.00000000000000e+00
+952 952 1.00000000000000e+00
+953 953 1.00000000000000e+00
+954 954 1.00000000000000e+00
+955 955 1.00000000000000e+00
+956 956 1.00000000000000e+00
+957 957 1.00000000000000e+00
+958 958 1.00000000000000e+00
+959 959 1.00000000000000e+00
+960 960 1.00000000000000e+00
+961 961 1.00000000000000e+00
+962 962 1.00000000000000e+00
+963 963 1.00000000000000e+00
+964 964 1.00000000000000e+00
+965 965 1.00000000000000e+00
+966 966 1.00000000000000e+00
+967 967 1.00000000000000e+00
+968 968 1.00000000000000e+00
+969 969 1.00000000000000e+00
+970 970 1.00000000000000e+00
+971 971 1.00000000000000e+00
+972 972 1.00000000000000e+00
+973 973 1.00000000000000e+00
+974 974 1.00000000000000e+00
+975 975 1.00000000000000e+00
+976 976 1.00000000000000e+00
+977 977 1.00000000000000e+00
+978 978 1.00000000000000e+00
+979 979 1.00000000000000e+00
+980 980 1.00000000000000e+00
+981 981 1.00000000000000e+00
+982 982 1.00000000000000e+00
+983 983 1.00000000000000e+00
+984 984 1.00000000000000e+00
+985 985 1.00000000000000e+00
+986 986 1.00000000000000e+00
+987 987 1.00000000000000e+00
+988 988 1.00000000000000e+00
+989 989 1.00000000000000e+00
+990 990 1.00000000000000e+00
+991 991 1.00000000000000e+00
+992 992 1.00000000000000e+00
+993 993 1.00000000000000e+00
+994 994 1.00000000000000e+00
+995 995 1.00000000000000e+00
+996 996 1.00000000000000e+00
+997 997 1.00000000000000e+00
+998 998 1.00000000000000e+00
+999 999 1.00000000000000e+00
+1000 1000 1.00000000000000e+00
+1001 1001 1.00000000000000e+00
+1002 1002 1.00000000000000e+00
+1003 1003 1.00000000000000e+00
+1004 1004 1.00000000000000e+00
+1005 1005 1.00000000000000e+00
+1006 1006 1.00000000000000e+00
+1007 1007 1.00000000000000e+00
+1008 1008 1.00000000000000e+00
+1009 1009 1.00000000000000e+00
+1010 1010 1.00000000000000e+00
+1011 1011 1.00000000000000e+00
+1012 1012 1.00000000000000e+00
+1013 1013 1.00000000000000e+00
+1014 1014 1.00000000000000e+00
+1015 1015 1.00000000000000e+00
+1016 1016 1.00000000000000e+00
+1017 1017 1.00000000000000e+00
+1018 1018 1.00000000000000e+00
+1019 1019 1.00000000000000e+00
+1020 1020 1.00000000000000e+00
+1021 1021 1.00000000000000e+00
+1022 1022 1.00000000000000e+00
+1023 1023 1.00000000000000e+00
+1024 1024 1.00000000000000e+00
+1025 1025 1.00000000000000e+00
+1026 1026 1.00000000000000e+00
+1027 1027 1.00000000000000e+00
+1028 1028 1.00000000000000e+00
+1029 1029 1.00000000000000e+00
+1030 1030 1.00000000000000e+00
+1031 1031 1.00000000000000e+00
+1032 1032 1.00000000000000e+00
+1033 1033 1.00000000000000e+00
+1034 1034 1.00000000000000e+00
+1035 1035 1.00000000000000e+00
+1036 1036 1.00000000000000e+00
+1037 1037 1.00000000000000e+00
+1038 1038 1.00000000000000e+00
+1039 1039 1.00000000000000e+00
+1040 1040 1.00000000000000e+00
+1041 1041 1.00000000000000e+00
+1042 1042 1.00000000000000e+00
+1043 1043 1.00000000000000e+00
+1044 1044 1.00000000000000e+00
+1045 1045 1.00000000000000e+00
+1046 1046 1.00000000000000e+00
+1047 1047 1.00000000000000e+00
+1048 1048 1.00000000000000e+00
+1049 1049 1.00000000000000e+00
+1050 1050 1.00000000000000e+00
+1051 1051 1.00000000000000e+00
+1052 1052 1.00000000000000e+00
+1053 1053 1.00000000000000e+00
+1054 1054 1.00000000000000e+00
+1055 1055 1.00000000000000e+00
+1056 1056 1.00000000000000e+00
+1057 1057 1.00000000000000e+00
+1058 1058 1.00000000000000e+00
+1059 1059 1.00000000000000e+00
+1060 1060 1.00000000000000e+00
+1061 1061 1.00000000000000e+00
+1062 1062 1.00000000000000e+00
+1063 1063 1.00000000000000e+00
+1064 1064 1.00000000000000e+00
+1065 1065 1.00000000000000e+00
+1066 1066 1.00000000000000e+00
+1067 1067 1.00000000000000e+00
+1068 1068 1.00000000000000e+00
+1069 1069 1.00000000000000e+00
+1070 1070 1.00000000000000e+00
+1071 1071 1.00000000000000e+00
+1072 1072 1.00000000000000e+00
+1073 1073 1.00000000000000e+00
+1074 1074 1.00000000000000e+00
+1075 1075 1.00000000000000e+00
+1076 1076 1.00000000000000e+00
+1077 1077 1.00000000000000e+00
+1078 1078 1.00000000000000e+00
+1079 1079 1.00000000000000e+00
+1080 1080 1.00000000000000e+00
+1081 1081 1.00000000000000e+00
+1082 1082 1.00000000000000e+00
+1083 1083 1.00000000000000e+00
+1084 1084 1.00000000000000e+00
+1085 1085 1.00000000000000e+00
+1086 1086 1.00000000000000e+00
+1087 1087 1.00000000000000e+00
+1088 1088 1.00000000000000e+00
+1089 1089 1.00000000000000e+00
+1090 1090 1.00000000000000e+00
+1091 1091 1.00000000000000e+00
+1092 1092 1.00000000000000e+00
+1093 1093 1.00000000000000e+00
+1094 1094 1.00000000000000e+00
+1095 1095 1.00000000000000e+00
+1096 1096 1.00000000000000e+00
+1097 1097 1.00000000000000e+00
+1098 1098 1.00000000000000e+00
+1099 1099 1.00000000000000e+00
+1100 1100 1.00000000000000e+00
+1101 1101 1.00000000000000e+00
+1102 1102 1.00000000000000e+00
+1103 1103 1.00000000000000e+00
+1104 1104 1.00000000000000e+00
+1105 1105 1.00000000000000e+00
+1106 1106 1.00000000000000e+00
+1107 1107 1.00000000000000e+00
+1108 1108 1.00000000000000e+00
+1109 1109 1.00000000000000e+00
+1110 1110 1.00000000000000e+00
+1111 1111 1.00000000000000e+00
+1112 1112 1.00000000000000e+00
+1113 1113 1.00000000000000e+00
+1114 1114 1.00000000000000e+00
+1115 1115 1.00000000000000e+00
+1116 1116 1.00000000000000e+00
+1117 1117 1.00000000000000e+00
+1118 1118 1.00000000000000e+00
+1119 1119 1.00000000000000e+00
+1120 1120 1.00000000000000e+00
+1121 1121 1.00000000000000e+00
+1122 1122 1.00000000000000e+00
+1123 1123 1.00000000000000e+00
+1124 1124 1.00000000000000e+00
+1125 1125 1.00000000000000e+00
+1126 1126 1.00000000000000e+00
+1127 1127 1.00000000000000e+00
+1128 1128 1.00000000000000e+00
+1129 1129 1.00000000000000e+00
+1130 1130 1.00000000000000e+00
+1131 1131 1.00000000000000e+00
+1132 1132 1.00000000000000e+00
+1133 1133 1.00000000000000e+00
+1134 1134 1.00000000000000e+00
+1135 1135 1.00000000000000e+00
+1136 1136 1.00000000000000e+00
+1137 1137 1.00000000000000e+00
+1138 1138 1.00000000000000e+00
+1139 1139 1.00000000000000e+00
+1140 1140 1.00000000000000e+00
+1141 1141 1.00000000000000e+00
+1142 1142 1.00000000000000e+00
+1143 1143 1.00000000000000e+00
+1144 1144 1.00000000000000e+00
+1145 1145 1.00000000000000e+00
+1146 1146 1.00000000000000e+00
+1147 1147 1.00000000000000e+00
+1148 1148 1.00000000000000e+00
+1149 1149 1.00000000000000e+00
+1150 1150 1.00000000000000e+00
+1151 1151 1.00000000000000e+00
+1152 1152 1.00000000000000e+00
+1153 1153 1.00000000000000e+00
+1154 1154 1.00000000000000e+00
+1155 1155 1.00000000000000e+00
+1156 1156 1.00000000000000e+00
+1157 1157 1.00000000000000e+00
+1158 1158 1.00000000000000e+00
+1159 1159 1.00000000000000e+00
+1160 1160 1.00000000000000e+00
+1161 1161 1.00000000000000e+00
+1162 1162 1.00000000000000e+00
+1163 1163 1.00000000000000e+00
+1164 1164 1.00000000000000e+00
+1165 1165 1.00000000000000e+00
+1166 1166 1.00000000000000e+00
+1167 1167 1.00000000000000e+00
+1168 1168 1.00000000000000e+00
+1169 1169 1.00000000000000e+00
+1170 1170 1.00000000000000e+00
+1171 1171 1.00000000000000e+00
+1172 1172 1.00000000000000e+00
+1173 1173 1.00000000000000e+00
+1174 1174 1.00000000000000e+00
+1175 1175 1.00000000000000e+00
+1176 1176 1.00000000000000e+00
+1177 1177 1.00000000000000e+00
+1178 1178 1.00000000000000e+00
+1179 1179 1.00000000000000e+00
+1180 1180 1.00000000000000e+00
+1181 1181 1.00000000000000e+00
+1182 1182 1.00000000000000e+00
+1183 1183 1.00000000000000e+00
+1184 1184 1.00000000000000e+00
+1185 1185 1.00000000000000e+00
+1186 1186 1.00000000000000e+00
+1187 1187 1.00000000000000e+00
+1188 1188 1.00000000000000e+00
+1189 1189 1.00000000000000e+00
+1190 1190 1.00000000000000e+00
+1191 1191 1.00000000000000e+00
+1192 1192 1.00000000000000e+00
+1193 1193 1.00000000000000e+00
+1194 1194 1.00000000000000e+00
+1195 1195 1.00000000000000e+00
+1196 1196 1.00000000000000e+00
+1197 1197 1.00000000000000e+00
+1198 1198 1.00000000000000e+00
+1199 1199 1.00000000000000e+00
+1200 1200 1.00000000000000e+00
+1201 1201 1.00000000000000e+00
+1202 1202 1.00000000000000e+00
+1203 1203 1.00000000000000e+00
+1204 1204 1.00000000000000e+00
+1205 1205 1.00000000000000e+00
+1206 1206 1.00000000000000e+00
+1207 1207 1.00000000000000e+00
+1208 1208 1.00000000000000e+00
+1209 1209 1.00000000000000e+00
+1210 1210 1.00000000000000e+00
+1211 1211 1.00000000000000e+00
+1212 1212 1.00000000000000e+00
+1213 1213 1.00000000000000e+00
+1214 1214 1.00000000000000e+00
+1215 1215 1.00000000000000e+00
+1216 1216 1.00000000000000e+00
+1217 1217 1.00000000000000e+00
+1218 1218 1.00000000000000e+00
+1219 1219 1.00000000000000e+00
+1220 1220 1.00000000000000e+00
+1221 1221 1.00000000000000e+00
+1222 1222 1.00000000000000e+00
+1223 1223 1.00000000000000e+00
+1224 1224 1.00000000000000e+00
+1225 1225 1.00000000000000e+00
+1226 1226 1.00000000000000e+00
+1227 1227 1.00000000000000e+00
+1228 1228 1.00000000000000e+00
+1229 1229 1.00000000000000e+00
+1230 1230 1.00000000000000e+00
+1231 1231 1.00000000000000e+00
+1232 1232 1.00000000000000e+00
+1233 1233 1.00000000000000e+00
+1234 1234 1.00000000000000e+00
+1235 1235 1.00000000000000e+00
+1236 1236 1.00000000000000e+00
+1237 1237 1.00000000000000e+00
+1238 1238 1.00000000000000e+00
+1239 1239 1.00000000000000e+00
+1240 1240 1.00000000000000e+00
+1241 1241 1.00000000000000e+00
+1242 1242 1.00000000000000e+00
+1243 1243 1.00000000000000e+00
+1244 1244 1.00000000000000e+00
+1245 1245 1.00000000000000e+00
+1246 1246 1.00000000000000e+00
+1247 1247 1.00000000000000e+00
+1248 1248 1.00000000000000e+00
+1249 1249 1.00000000000000e+00
+1250 1250 1.00000000000000e+00
+1251 1251 1.00000000000000e+00
+1252 1252 1.00000000000000e+00
+1253 1253 1.00000000000000e+00
+1254 1254 1.00000000000000e+00
+1255 1255 1.00000000000000e+00
+1256 1256 1.00000000000000e+00
+1257 1257 1.00000000000000e+00
+1258 1258 1.00000000000000e+00
+1259 1259 1.00000000000000e+00
+1260 1260 1.00000000000000e+00
+1261 1261 1.00000000000000e+00
+1262 1262 1.00000000000000e+00
+1263 1263 1.00000000000000e+00
+1264 1264 1.00000000000000e+00
+1265 1265 1.00000000000000e+00
+1266 1266 1.00000000000000e+00
+1267 1267 1.00000000000000e+00
+1268 1268 1.00000000000000e+00
+1269 1269 1.00000000000000e+00
+1270 1270 1.00000000000000e+00
+1271 1271 1.00000000000000e+00
+1272 1272 1.00000000000000e+00
+1273 1273 1.00000000000000e+00
+1274 1274 1.00000000000000e+00
+1275 1275 1.00000000000000e+00
+1276 1276 1.00000000000000e+00
+1277 1277 1.00000000000000e+00
+1278 1278 1.00000000000000e+00
+1279 1279 1.00000000000000e+00
+1280 1280 1.00000000000000e+00
+1281 1281 1.00000000000000e+00
+1282 1282 1.00000000000000e+00
+1283 1283 1.00000000000000e+00
+1284 1284 1.00000000000000e+00
+1285 1285 1.00000000000000e+00
+1286 1286 1.00000000000000e+00
+1287 1287 1.00000000000000e+00
+1288 1288 1.00000000000000e+00
+1289 1289 1.00000000000000e+00
+1290 1290 1.00000000000000e+00
+1291 1291 1.00000000000000e+00
+1292 1292 1.00000000000000e+00
+1293 1293 1.00000000000000e+00
+1294 1294 1.00000000000000e+00
+1295 1295 1.00000000000000e+00
+1296 1296 1.00000000000000e+00
+1297 1297 1.00000000000000e+00
+1298 1298 1.00000000000000e+00
+1299 1299 1.00000000000000e+00
+1300 1300 1.00000000000000e+00
+1301 1301 1.00000000000000e+00
+1302 1302 1.00000000000000e+00
+1303 1303 1.00000000000000e+00
+1304 1304 1.00000000000000e+00
+1305 1305 1.00000000000000e+00
+1306 1306 1.00000000000000e+00
+1307 1307 1.00000000000000e+00
+1308 1308 1.00000000000000e+00
+1309 1309 1.00000000000000e+00
+1310 1310 1.00000000000000e+00
+1311 1311 1.00000000000000e+00
+1312 1312 1.00000000000000e+00
+1313 1313 1.00000000000000e+00
+1314 1314 1.00000000000000e+00
+1315 1315 1.00000000000000e+00
+1316 1316 1.00000000000000e+00
+1317 1317 1.00000000000000e+00
+1318 1318 1.00000000000000e+00
+1319 1319 1.00000000000000e+00
+1320 1320 1.00000000000000e+00
+1321 1321 1.00000000000000e+00
+1322 1322 1.00000000000000e+00
+1323 1323 1.00000000000000e+00
+1324 1324 1.00000000000000e+00
+1325 1325 1.00000000000000e+00
+1326 1326 1.00000000000000e+00
+1327 1327 1.00000000000000e+00
+1328 1328 1.00000000000000e+00
+1329 1329 1.00000000000000e+00
+1330 1330 1.00000000000000e+00
+1331 1331 1.00000000000000e+00
+1332 1332 1.00000000000000e+00
+1333 1333 1.00000000000000e+00
+1334 1334 1.00000000000000e+00
+1335 1335 1.00000000000000e+00
+1336 1336 1.00000000000000e+00
+1337 1337 1.00000000000000e+00
+1338 1338 1.00000000000000e+00
+1339 1339 1.00000000000000e+00
+1340 1340 1.00000000000000e+00
+1341 1341 1.00000000000000e+00
+1342 1342 1.00000000000000e+00
+1343 1343 1.00000000000000e+00
+1344 1344 1.00000000000000e+00
+1345 1345 1.00000000000000e+00
+1346 1346 1.00000000000000e+00
+1347 1347 1.00000000000000e+00
+1348 1348 1.00000000000000e+00
+1349 1349 1.00000000000000e+00
+1350 1350 1.00000000000000e+00
+1351 1351 1.00000000000000e+00
+1352 1352 1.00000000000000e+00
+1353 1353 1.00000000000000e+00
+1354 1354 1.00000000000000e+00
+1355 1355 1.00000000000000e+00
+1356 1356 1.00000000000000e+00
+1357 1357 1.00000000000000e+00
+1358 1358 1.00000000000000e+00
+1359 1359 1.00000000000000e+00
+1360 1360 1.00000000000000e+00
+1361 1361 1.00000000000000e+00
+1362 1362 1.00000000000000e+00
+1363 1363 1.00000000000000e+00
+1364 1364 1.00000000000000e+00
+1365 1365 1.00000000000000e+00
+1366 1366 1.00000000000000e+00
+1367 1367 1.00000000000000e+00
+1368 1368 1.00000000000000e+00
+1369 1369 1.00000000000000e+00
+1370 1370 1.00000000000000e+00
+1371 1371 1.00000000000000e+00
+1372 1372 1.00000000000000e+00
+1373 1373 1.00000000000000e+00
+1374 1374 1.00000000000000e+00
+1375 1375 1.00000000000000e+00
+1376 1376 1.00000000000000e+00
+1377 1377 1.00000000000000e+00
+1378 1378 1.00000000000000e+00
+1379 1379 1.00000000000000e+00
+1380 1380 1.00000000000000e+00
+1381 1381 1.00000000000000e+00
+1382 1382 1.00000000000000e+00
+1383 1383 1.00000000000000e+00
+1384 1384 1.00000000000000e+00
+1385 1385 1.00000000000000e+00
+1386 1386 1.00000000000000e+00
+1387 1387 1.00000000000000e+00
+1388 1388 1.00000000000000e+00
+1389 1389 1.00000000000000e+00
+1390 1390 1.00000000000000e+00
+1391 1391 1.00000000000000e+00
+1392 1392 1.00000000000000e+00
+1393 1393 1.00000000000000e+00
+1394 1394 1.00000000000000e+00
+1395 1395 1.00000000000000e+00
+1396 1396 1.00000000000000e+00
+1397 1397 1.00000000000000e+00
+1398 1398 1.00000000000000e+00
+1399 1399 1.00000000000000e+00
+1400 1400 1.00000000000000e+00
+1401 1401 1.00000000000000e+00
+1402 1402 1.00000000000000e+00
+1403 1403 1.00000000000000e+00
+1404 1404 1.00000000000000e+00
+1405 1405 1.00000000000000e+00
+1406 1406 1.00000000000000e+00
+1407 1407 1.00000000000000e+00
+1408 1408 1.00000000000000e+00
+1409 1409 1.00000000000000e+00
+1410 1410 1.00000000000000e+00
+1411 1411 1.00000000000000e+00
+1412 1412 1.00000000000000e+00
+1413 1413 1.00000000000000e+00
+1414 1414 1.00000000000000e+00
+1415 1415 1.00000000000000e+00
+1416 1416 1.00000000000000e+00
+1417 1417 1.00000000000000e+00
+1418 1418 1.00000000000000e+00
+1419 1419 1.00000000000000e+00
+1420 1420 1.00000000000000e+00
+1421 1421 1.00000000000000e+00
+1422 1422 1.00000000000000e+00
+1423 1423 1.00000000000000e+00
+1424 1424 1.00000000000000e+00
+1425 1425 1.00000000000000e+00
+1426 1426 1.00000000000000e+00
+1427 1427 1.00000000000000e+00
+1428 1428 1.00000000000000e+00
+1429 1429 1.00000000000000e+00
+1430 1430 1.00000000000000e+00
+1431 1431 1.00000000000000e+00
+1432 1432 1.00000000000000e+00
+1433 1433 1.00000000000000e+00
+1434 1434 1.00000000000000e+00
+1435 1435 1.00000000000000e+00
+1436 1436 1.00000000000000e+00
+1437 1437 1.00000000000000e+00
+1438 1438 1.00000000000000e+00
+1439 1439 1.00000000000000e+00
+1440 1440 1.00000000000000e+00
+1441 1441 1.00000000000000e+00
+1442 1442 1.00000000000000e+00
+1443 1443 1.00000000000000e+00
+1444 1444 1.00000000000000e+00
+1445 1445 1.00000000000000e+00
+1446 1446 1.00000000000000e+00
+1447 1447 1.00000000000000e+00
+1448 1448 1.00000000000000e+00
+1449 1449 1.00000000000000e+00
+1450 1450 1.00000000000000e+00
+1451 1451 1.00000000000000e+00
+1452 1452 1.00000000000000e+00
+1453 1453 1.00000000000000e+00
+1454 1454 1.00000000000000e+00
+1455 1455 1.00000000000000e+00
+1456 1456 1.00000000000000e+00
+1457 1457 1.00000000000000e+00
+1458 1458 1.00000000000000e+00
+1459 1459 1.00000000000000e+00
+1460 1460 1.00000000000000e+00
+1461 1461 1.00000000000000e+00
+1462 1462 1.00000000000000e+00
+1463 1463 1.00000000000000e+00
+1464 1464 1.00000000000000e+00
+1465 1465 1.00000000000000e+00
+1466 1466 1.00000000000000e+00
+1467 1467 1.00000000000000e+00
+1468 1468 1.00000000000000e+00
+1469 1469 1.00000000000000e+00
+1470 1470 1.00000000000000e+00
+1471 1471 1.00000000000000e+00
+1472 1472 1.00000000000000e+00
+1473 1473 1.00000000000000e+00
+1474 1474 1.00000000000000e+00
+1475 1475 1.00000000000000e+00
+1476 1476 1.00000000000000e+00
+1477 1477 1.00000000000000e+00
+1478 1478 1.00000000000000e+00
+1479 1479 1.00000000000000e+00
+1480 1480 1.00000000000000e+00
+1481 1481 1.00000000000000e+00
+1482 1482 1.00000000000000e+00
+1483 1483 1.00000000000000e+00
+1484 1484 1.00000000000000e+00
+1485 1485 1.00000000000000e+00
+1486 1486 1.00000000000000e+00
+1487 1487 1.00000000000000e+00
+1488 1488 1.00000000000000e+00
+1489 1489 1.00000000000000e+00
+1490 1490 1.00000000000000e+00
+1491 1491 1.00000000000000e+00
+1492 1492 1.00000000000000e+00
+1493 1493 1.00000000000000e+00
+1494 1494 1.00000000000000e+00
+1495 1495 1.00000000000000e+00
+1496 1496 1.00000000000000e+00
+1497 1497 1.00000000000000e+00
+1498 1498 1.00000000000000e+00
+1499 1499 1.00000000000000e+00
+1500 1500 1.00000000000000e+00
+1501 1501 1.00000000000000e+00
+1502 1502 1.00000000000000e+00
+1503 1503 1.00000000000000e+00
+1504 1504 1.00000000000000e+00
+1505 1505 1.00000000000000e+00
+1506 1506 1.00000000000000e+00
+1507 1507 1.00000000000000e+00
+1508 1508 1.00000000000000e+00
+1509 1509 1.00000000000000e+00
+1510 1510 1.00000000000000e+00
+1511 1511 1.00000000000000e+00
+1512 1512 1.00000000000000e+00
+1513 1513 1.00000000000000e+00
+1514 1514 1.00000000000000e+00
+1515 1515 1.00000000000000e+00
+1516 1516 1.00000000000000e+00
+1517 1517 1.00000000000000e+00
+1518 1518 1.00000000000000e+00
+1519 1519 1.00000000000000e+00
+1520 1520 1.00000000000000e+00
+1521 1521 1.00000000000000e+00
+1522 1522 1.00000000000000e+00
+1523 1523 1.00000000000000e+00
+1524 1524 1.00000000000000e+00
+1525 1525 1.00000000000000e+00
+1526 1526 1.00000000000000e+00
+1527 1527 1.00000000000000e+00
+1528 1528 1.00000000000000e+00
+1529 1529 1.00000000000000e+00
+1530 1530 1.00000000000000e+00
+1531 1531 1.00000000000000e+00
+1532 1532 1.00000000000000e+00
+1533 1533 1.00000000000000e+00
+1534 1534 1.00000000000000e+00
+1535 1535 1.00000000000000e+00
+1536 1536 1.00000000000000e+00
+1537 1537 1.00000000000000e+00
+1538 1538 1.00000000000000e+00
+1539 1539 1.00000000000000e+00
+1540 1540 1.00000000000000e+00
+1541 1541 1.00000000000000e+00
+1542 1542 1.00000000000000e+00
+1543 1543 1.00000000000000e+00
+1544 1544 1.00000000000000e+00
+1545 1545 1.00000000000000e+00
+1546 1546 1.00000000000000e+00
+1547 1547 1.00000000000000e+00
+1548 1548 1.00000000000000e+00
+1549 1549 1.00000000000000e+00
+1550 1550 1.00000000000000e+00
+1551 1551 1.00000000000000e+00
+1552 1552 1.00000000000000e+00
+1553 1553 1.00000000000000e+00
+1554 1554 1.00000000000000e+00
+1555 1555 1.00000000000000e+00
+1556 1556 1.00000000000000e+00
+1557 1557 1.00000000000000e+00
+1558 1558 1.00000000000000e+00
+1559 1559 1.00000000000000e+00
+1560 1560 1.00000000000000e+00
+1561 1561 1.00000000000000e+00
+1562 1562 1.00000000000000e+00
+1563 1563 1.00000000000000e+00
+1564 1564 1.00000000000000e+00
+1565 1565 1.00000000000000e+00
+1566 1566 1.00000000000000e+00
+1567 1567 1.00000000000000e+00
+1568 1568 1.00000000000000e+00
+1569 1569 1.00000000000000e+00
+1570 1570 1.00000000000000e+00
+1571 1571 1.00000000000000e+00
+1572 1572 1.00000000000000e+00
+1573 1573 1.00000000000000e+00
+1574 1574 1.00000000000000e+00
+1575 1575 1.00000000000000e+00
+1576 1576 1.00000000000000e+00
+1577 1577 1.00000000000000e+00
+1578 1578 1.00000000000000e+00
+1579 1579 1.00000000000000e+00
+1580 1580 1.00000000000000e+00
+1581 1581 1.00000000000000e+00
+1582 1582 1.00000000000000e+00
+1583 1583 1.00000000000000e+00
+1584 1584 1.00000000000000e+00
+1585 1585 1.00000000000000e+00
+1586 1586 1.00000000000000e+00
+1587 1587 1.00000000000000e+00
+1588 1588 1.00000000000000e+00
+1589 1589 1.00000000000000e+00
+1590 1590 1.00000000000000e+00
+1591 1591 1.00000000000000e+00
+1592 1592 1.00000000000000e+00
+1593 1593 1.00000000000000e+00
+1594 1594 1.00000000000000e+00
+1595 1595 1.00000000000000e+00
+1596 1596 1.00000000000000e+00
+1597 1597 1.00000000000000e+00
+1598 1598 1.00000000000000e+00
+1599 1599 1.00000000000000e+00
+1600 1600 1.00000000000000e+00
+1601 1601 1.00000000000000e+00
+1602 1602 1.00000000000000e+00
+1603 1603 1.00000000000000e+00
+1604 1604 1.00000000000000e+00
+1605 1605 1.00000000000000e+00
+1606 1606 1.00000000000000e+00
+1607 1607 1.00000000000000e+00
+1608 1608 1.00000000000000e+00
+1609 1609 1.00000000000000e+00
+1610 1610 1.00000000000000e+00
+1611 1611 1.00000000000000e+00
+1612 1612 1.00000000000000e+00
+1613 1613 1.00000000000000e+00
+1614 1614 1.00000000000000e+00
+1615 1615 1.00000000000000e+00
+1616 1616 1.00000000000000e+00
+1617 1617 1.00000000000000e+00
+1618 1618 1.00000000000000e+00
+1619 1619 1.00000000000000e+00
+1620 1620 1.00000000000000e+00
+1621 1621 1.00000000000000e+00
+1622 1622 1.00000000000000e+00
+1623 1623 1.00000000000000e+00
+1624 1624 1.00000000000000e+00
+1625 1625 1.00000000000000e+00
+1626 1626 1.00000000000000e+00
+1627 1627 1.00000000000000e+00
+1628 1628 1.00000000000000e+00
+1629 1629 1.00000000000000e+00
+1630 1630 1.00000000000000e+00
+1631 1631 1.00000000000000e+00
+1632 1632 1.00000000000000e+00
+1633 1633 1.00000000000000e+00
+1634 1634 1.00000000000000e+00
+1635 1635 1.00000000000000e+00
+1636 1636 1.00000000000000e+00
+1637 1637 1.00000000000000e+00
+1638 1638 1.00000000000000e+00
+1639 1639 1.00000000000000e+00
+1640 1640 1.00000000000000e+00
+1641 1641 1.00000000000000e+00
+1642 1642 1.00000000000000e+00
+1643 1643 1.00000000000000e+00
+1644 1644 1.00000000000000e+00
+1645 1645 1.00000000000000e+00
+1646 1646 1.00000000000000e+00
+1647 1647 1.00000000000000e+00
+1648 1648 1.00000000000000e+00
+1649 1649 1.00000000000000e+00
+1650 1650 1.00000000000000e+00
+1651 1651 1.00000000000000e+00
+1652 1652 1.00000000000000e+00
+1653 1653 1.00000000000000e+00
+1654 1654 1.00000000000000e+00
+1655 1655 1.00000000000000e+00
+1656 1656 1.00000000000000e+00
+1657 1657 1.00000000000000e+00
+1658 1658 1.00000000000000e+00
+1659 1659 1.00000000000000e+00
+1660 1660 1.00000000000000e+00
+1661 1661 1.00000000000000e+00
+1662 1662 1.00000000000000e+00
+1663 1663 1.00000000000000e+00
+1664 1664 1.00000000000000e+00
+1665 1665 1.00000000000000e+00
+1666 1666 1.00000000000000e+00
+1667 1667 1.00000000000000e+00
+1668 1668 1.00000000000000e+00
+1669 1669 1.00000000000000e+00
+1670 1670 1.00000000000000e+00
+1671 1671 1.00000000000000e+00
+1672 1672 1.00000000000000e+00
+1673 1673 1.00000000000000e+00
+1674 1674 1.00000000000000e+00
+1675 1675 1.00000000000000e+00
+1676 1676 1.00000000000000e+00
+1677 1677 1.00000000000000e+00
+1678 1678 1.00000000000000e+00
+1679 1679 1.00000000000000e+00
+1680 1680 1.00000000000000e+00
+1681 1681 1.00000000000000e+00
+1682 1682 1.00000000000000e+00
+1683 1683 1.00000000000000e+00
+1684 1684 1.00000000000000e+00
+1685 1685 1.00000000000000e+00
+1686 1686 1.00000000000000e+00
+1687 1687 1.00000000000000e+00
+1688 1688 1.00000000000000e+00
+1689 1689 1.00000000000000e+00
+1690 1690 1.00000000000000e+00
+1691 1691 1.00000000000000e+00
+1692 1692 1.00000000000000e+00
+1693 1693 1.00000000000000e+00
+1694 1694 1.00000000000000e+00
+1695 1695 1.00000000000000e+00
+1696 1696 1.00000000000000e+00
+1697 1697 1.00000000000000e+00
+1698 1698 1.00000000000000e+00
+1699 1699 1.00000000000000e+00
+1700 1700 1.00000000000000e+00
+1701 1701 1.00000000000000e+00
+1702 1702 1.00000000000000e+00
+1703 1703 1.00000000000000e+00
+1704 1704 1.00000000000000e+00
+1705 1705 1.00000000000000e+00
+1706 1706 1.00000000000000e+00
+1707 1707 1.00000000000000e+00
+1708 1708 1.00000000000000e+00
+1709 1709 1.00000000000000e+00
+1710 1710 1.00000000000000e+00
+1711 1711 1.00000000000000e+00
+1712 1712 1.00000000000000e+00
+1713 1713 1.00000000000000e+00
+1714 1714 1.00000000000000e+00
+1715 1715 1.00000000000000e+00
+1716 1716 1.00000000000000e+00
+1717 1717 1.00000000000000e+00
+1718 1718 1.00000000000000e+00
+1719 1719 1.00000000000000e+00
+1720 1720 1.00000000000000e+00
+1721 1721 1.00000000000000e+00
+1722 1722 1.00000000000000e+00
+1723 1723 1.00000000000000e+00
+1724 1724 1.00000000000000e+00
+1725 1725 1.00000000000000e+00
+1726 1726 1.00000000000000e+00
+1727 1727 1.00000000000000e+00
+1728 1728 1.00000000000000e+00
+1729 1729 1.00000000000000e+00
+1730 1730 1.00000000000000e+00
+1731 1731 1.00000000000000e+00
+1732 1732 1.00000000000000e+00
+1733 1733 1.00000000000000e+00
+1734 1734 1.00000000000000e+00
+1735 1735 1.00000000000000e+00
+1736 1736 1.00000000000000e+00
+1737 1737 1.00000000000000e+00
+1738 1738 1.00000000000000e+00
+1739 1739 1.00000000000000e+00
+1740 1740 1.00000000000000e+00
+1741 1741 1.00000000000000e+00
+1742 1742 1.00000000000000e+00
+1743 1743 1.00000000000000e+00
+1744 1744 1.00000000000000e+00
+1745 1745 1.00000000000000e+00
+1746 1746 1.00000000000000e+00
+1747 1747 1.00000000000000e+00
+1748 1748 1.00000000000000e+00
+1749 1749 1.00000000000000e+00
+1750 1750 1.00000000000000e+00
+1751 1751 1.00000000000000e+00
+1752 1752 1.00000000000000e+00
+1753 1753 1.00000000000000e+00
+1754 1754 1.00000000000000e+00
+1755 1755 1.00000000000000e+00
+1756 1756 1.00000000000000e+00
+1757 1757 1.00000000000000e+00
+1758 1758 1.00000000000000e+00
+1759 1759 1.00000000000000e+00
+1760 1760 1.00000000000000e+00
+1761 1761 1.00000000000000e+00
+1762 1762 1.00000000000000e+00
+1763 1763 1.00000000000000e+00
+1764 1764 1.00000000000000e+00
+1765 1765 1.00000000000000e+00
+1766 1766 1.00000000000000e+00
+1767 1767 1.00000000000000e+00
+1768 1768 1.00000000000000e+00
+1769 1769 1.00000000000000e+00
+1770 1770 1.00000000000000e+00
+1771 1771 1.00000000000000e+00
+1772 1772 1.00000000000000e+00
+1773 1773 1.00000000000000e+00
+1774 1774 1.00000000000000e+00
+1775 1775 1.00000000000000e+00
+1776 1776 1.00000000000000e+00
+1777 1777 1.00000000000000e+00
+1778 1778 1.00000000000000e+00
+1779 1779 1.00000000000000e+00
+1780 1780 1.00000000000000e+00
+1781 1781 1.00000000000000e+00
+1782 1782 1.00000000000000e+00
+1783 1783 1.00000000000000e+00
+1784 1784 1.00000000000000e+00
+1785 1785 1.00000000000000e+00
+1786 1786 1.00000000000000e+00
+1787 1787 1.00000000000000e+00
+1788 1788 1.00000000000000e+00
+1789 1789 1.00000000000000e+00
+1790 1790 1.00000000000000e+00
+1791 1791 1.00000000000000e+00
+1792 1792 1.00000000000000e+00
+1793 1793 1.00000000000000e+00
+1794 1794 1.00000000000000e+00
+1795 1795 1.00000000000000e+00
+1796 1796 1.00000000000000e+00
+1797 1797 1.00000000000000e+00
+1798 1798 1.00000000000000e+00
+1799 1799 1.00000000000000e+00
+1800 1800 1.00000000000000e+00
+1801 1801 1.00000000000000e+00
+1802 1802 1.00000000000000e+00
+1803 1803 1.00000000000000e+00
+1804 1804 1.00000000000000e+00
+1805 1805 1.00000000000000e+00
+1806 1806 1.00000000000000e+00
+1807 1807 1.00000000000000e+00
+1808 1808 1.00000000000000e+00
+1809 1809 1.00000000000000e+00
+1810 1810 1.00000000000000e+00
+1811 1811 1.00000000000000e+00
+1812 1812 1.00000000000000e+00
+1813 1813 1.00000000000000e+00
+1814 1814 1.00000000000000e+00
+1815 1815 1.00000000000000e+00
+1816 1816 1.00000000000000e+00
+1817 1817 1.00000000000000e+00
+1818 1818 1.00000000000000e+00
+1819 1819 1.00000000000000e+00
+1820 1820 1.00000000000000e+00
+1821 1821 1.00000000000000e+00
+1822 1822 1.00000000000000e+00
+1823 1823 1.00000000000000e+00
+1824 1824 1.00000000000000e+00
+1825 1825 1.00000000000000e+00
+1826 1826 1.00000000000000e+00
+1827 1827 1.00000000000000e+00
+1828 1828 1.00000000000000e+00
+1829 1829 1.00000000000000e+00
+1830 1830 1.00000000000000e+00
+1831 1831 1.00000000000000e+00
+1832 1832 1.00000000000000e+00
+1833 1833 1.00000000000000e+00
+1834 1834 1.00000000000000e+00
+1835 1835 1.00000000000000e+00
+1836 1836 1.00000000000000e+00
+1837 1837 1.00000000000000e+00
+1838 1838 1.00000000000000e+00
+1839 1839 1.00000000000000e+00
+1840 1840 1.00000000000000e+00
+1841 1841 1.00000000000000e+00
+1842 1842 1.00000000000000e+00
+1843 1843 1.00000000000000e+00
+1844 1844 1.00000000000000e+00
+1845 1845 1.00000000000000e+00
+1846 1846 1.00000000000000e+00
+1847 1847 1.00000000000000e+00
+1848 1848 1.00000000000000e+00
+1849 1849 1.00000000000000e+00
+1850 1850 1.00000000000000e+00
+1851 1851 1.00000000000000e+00
+1852 1852 1.00000000000000e+00
+1853 1853 1.00000000000000e+00
+1854 1854 1.00000000000000e+00
+1855 1855 1.00000000000000e+00
+1856 1856 1.00000000000000e+00
+1857 1857 1.00000000000000e+00
+1858 1858 1.00000000000000e+00
+1859 1859 1.00000000000000e+00
+1860 1860 1.00000000000000e+00
+1861 1861 1.00000000000000e+00
+1862 1862 1.00000000000000e+00
+1863 1863 1.00000000000000e+00
+1864 1864 1.00000000000000e+00
+1865 1865 1.00000000000000e+00
+1866 1866 1.00000000000000e+00
+1867 1867 1.00000000000000e+00
+1868 1868 1.00000000000000e+00
+1869 1869 1.00000000000000e+00
+1870 1870 1.00000000000000e+00
+1871 1871 1.00000000000000e+00
+1872 1872 1.00000000000000e+00
+1873 1873 1.00000000000000e+00
+1874 1874 1.00000000000000e+00
+1875 1875 1.00000000000000e+00
+1876 1876 1.00000000000000e+00
+1877 1877 1.00000000000000e+00
+1878 1878 1.00000000000000e+00
+1879 1879 1.00000000000000e+00
+1880 1880 1.00000000000000e+00
+1881 1881 1.00000000000000e+00
+1882 1882 1.00000000000000e+00
+1883 1883 1.00000000000000e+00
+1884 1884 1.00000000000000e+00
+1885 1885 1.00000000000000e+00
+1886 1886 1.00000000000000e+00
+1887 1887 1.00000000000000e+00
+1888 1888 1.00000000000000e+00
+1889 1889 1.00000000000000e+00
+1890 1890 1.00000000000000e+00
+1891 1891 1.00000000000000e+00
+1892 1892 1.00000000000000e+00
+1893 1893 1.00000000000000e+00
+1894 1894 1.00000000000000e+00
+1895 1895 1.00000000000000e+00
+1896 1896 1.00000000000000e+00
+1897 1897 1.00000000000000e+00
+1898 1898 1.00000000000000e+00
+1899 1899 1.00000000000000e+00
+1900 1900 1.00000000000000e+00
+1901 1901 1.00000000000000e+00
+1902 1902 1.00000000000000e+00
+1903 1903 1.00000000000000e+00
+1904 1904 1.00000000000000e+00
+1905 1905 1.00000000000000e+00
+1906 1906 1.00000000000000e+00
+1907 1907 1.00000000000000e+00
+1908 1908 1.00000000000000e+00
+1909 1909 1.00000000000000e+00
+1910 1910 1.00000000000000e+00
+1911 1911 1.00000000000000e+00
+1912 1912 1.00000000000000e+00
+1913 1913 1.00000000000000e+00
+1914 1914 1.00000000000000e+00
+1915 1915 1.00000000000000e+00
+1916 1916 1.00000000000000e+00
+1917 1917 1.00000000000000e+00
+1918 1918 1.00000000000000e+00
+1919 1919 1.00000000000000e+00
+1920 1920 1.00000000000000e+00
+1921 1921 1.00000000000000e+00
+1922 1922 1.00000000000000e+00
+1923 1923 1.00000000000000e+00
+1924 1924 1.00000000000000e+00
+1925 1925 1.00000000000000e+00
+1926 1926 1.00000000000000e+00
+1927 1927 1.00000000000000e+00
+1928 1928 1.00000000000000e+00
+1929 1929 1.00000000000000e+00
+1930 1930 1.00000000000000e+00
+1931 1931 1.00000000000000e+00
+1932 1932 1.00000000000000e+00
+1933 1933 1.00000000000000e+00
+1934 1934 1.00000000000000e+00
+1935 1935 1.00000000000000e+00
+1936 1936 1.00000000000000e+00
+1937 1937 1.00000000000000e+00
+1938 1938 1.00000000000000e+00
+1939 1939 1.00000000000000e+00
+1940 1940 1.00000000000000e+00
+1941 1941 1.00000000000000e+00
+1942 1942 1.00000000000000e+00
+1943 1943 1.00000000000000e+00
+1944 1944 1.00000000000000e+00
+1945 1945 1.00000000000000e+00
+1946 1946 1.00000000000000e+00
+1947 1947 1.00000000000000e+00
+1948 1948 1.00000000000000e+00
+1949 1949 1.00000000000000e+00
+1950 1950 1.00000000000000e+00
+1951 1951 1.00000000000000e+00
+1952 1952 1.00000000000000e+00
+1953 1953 1.00000000000000e+00
+1954 1954 1.00000000000000e+00
+1955 1955 1.00000000000000e+00
+1956 1956 1.00000000000000e+00
+1957 1957 1.00000000000000e+00
+1958 1958 1.00000000000000e+00
+1959 1959 1.00000000000000e+00
+1960 1960 1.00000000000000e+00
+1961 1961 1.00000000000000e+00
+1962 1962 1.00000000000000e+00
+1963 1963 1.00000000000000e+00
+1964 1964 1.00000000000000e+00
+1965 1965 1.00000000000000e+00
+1966 1966 1.00000000000000e+00
+1967 1967 1.00000000000000e+00
+1968 1968 1.00000000000000e+00
+1969 1969 1.00000000000000e+00
+1970 1970 1.00000000000000e+00
+1971 1971 1.00000000000000e+00
+1972 1972 1.00000000000000e+00
+1973 1973 1.00000000000000e+00
+1974 1974 1.00000000000000e+00
+1975 1975 1.00000000000000e+00
+1976 1976 1.00000000000000e+00
+1977 1977 1.00000000000000e+00
+1978 1978 1.00000000000000e+00
+1979 1979 1.00000000000000e+00
+1980 1980 1.00000000000000e+00
+1981 1981 1.00000000000000e+00
+1982 1982 1.00000000000000e+00
+1983 1983 1.00000000000000e+00
+1984 1984 1.00000000000000e+00
+1985 1985 1.00000000000000e+00
+1986 1986 1.00000000000000e+00
+1987 1987 1.00000000000000e+00
+1988 1988 1.00000000000000e+00
+1989 1989 1.00000000000000e+00
+1990 1990 1.00000000000000e+00
+1991 1991 1.00000000000000e+00
+1992 1992 1.00000000000000e+00
+1993 1993 1.00000000000000e+00
+1994 1994 1.00000000000000e+00
+1995 1995 1.00000000000000e+00
+1996 1996 1.00000000000000e+00
+1997 1997 1.00000000000000e+00
+1998 1998 1.00000000000000e+00
+1999 1999 1.00000000000000e+00
+2000 2000 1.00000000000000e+00
+2001 2001 1.00000000000000e+00
+2002 2002 1.00000000000000e+00
+2003 2003 1.00000000000000e+00
+2004 2004 1.00000000000000e+00
+2005 2005 1.00000000000000e+00
+2006 2006 1.00000000000000e+00
+2007 2007 1.00000000000000e+00
+2008 2008 1.00000000000000e+00
+2009 2009 1.00000000000000e+00
+2010 2010 1.00000000000000e+00
+2011 2011 1.00000000000000e+00
+2012 2012 1.00000000000000e+00
+2013 2013 1.00000000000000e+00
+2014 2014 1.00000000000000e+00
+2015 2015 1.00000000000000e+00
+2016 2016 1.00000000000000e+00
+2017 2017 1.00000000000000e+00
+2018 2018 1.00000000000000e+00
+2019 2019 1.00000000000000e+00
+2020 2020 1.00000000000000e+00
+2021 2021 1.00000000000000e+00
+2022 2022 1.00000000000000e+00
+2023 2023 1.00000000000000e+00
+2024 2024 1.00000000000000e+00
+2025 2025 1.00000000000000e+00
+2026 2026 1.00000000000000e+00
+2027 2027 1.00000000000000e+00
+2028 2028 1.00000000000000e+00
+2029 2029 1.00000000000000e+00
+2030 2030 1.00000000000000e+00
+2031 2031 1.00000000000000e+00
+2032 2032 1.00000000000000e+00
+2033 2033 1.00000000000000e+00
+2034 2034 1.00000000000000e+00
+2035 2035 1.00000000000000e+00
+2036 2036 1.00000000000000e+00
+2037 2037 1.00118062439057e+00
+2037 2061 6.14289272445784e-03
+2037 2085 5.45386769826278e-05
+2037 2637 2.46870374499711e-02
+2037 2661 1.09822659070729e-01
+2037 2685 7.20909761037706e-03
+2037 2709 3.38261348833630e-07
+2037 3237 1.06727575900903e-02
+2037 3261 2.33776633015668e-02
+2037 3285 2.79091754131915e-03
+2037 3309 2.84965056096460e-07
+2037 3837 4.59011807340396e-05
+2037 3861 7.20900767794626e-05
+2037 3885 4.55990495249551e-06
+2037 15000 -6.22474803362324e-02
+2037 15024 -3.88419704019061e-02
+2037 15048 -2.20520863822570e-03
+2037 15408 -4.69807489686164e-02
+2037 15432 -2.76749461282608e-02
+2037 15456 -1.19559189827217e-03
+2037 15816 -4.53057394300007e-03
+2037 15840 -2.35827455065936e-03
+2037 15864 -2.65678797598061e-05
+2038 2038 1.00000000000000e+00
+2039 2039 1.00000000000000e+00
+2040 2040 1.00000000000000e+00
+2041 2041 1.00000000000000e+00
+2042 2042 1.00000000000000e+00
+2043 2043 1.00000000000000e+00
+2044 2044 1.00000000000000e+00
+2045 2045 1.00000000000000e+00
+2046 2046 1.00000000000000e+00
+2047 2047 1.00000000000000e+00
+2048 2048 1.00000000000000e+00
+2049 2049 1.00000000000000e+00
+2050 2050 1.00000000000000e+00
+2051 2051 1.00000000000000e+00
+2052 2052 1.00000000000000e+00
+2053 2053 1.00000000000000e+00
+2054 2054 1.00000000000000e+00
+2055 2055 1.00000000000000e+00
+2056 2056 1.00000000000000e+00
+2057 2057 1.00000000000000e+00
+2058 2058 1.00000000000000e+00
+2059 2059 1.00000000000000e+00
+2060 2060 1.00000000000000e+00
+2061 2061 1.03255630443834e+00
+2061 2037 6.14289272445784e-03
+2061 2085 3.16146648534741e-04
+2061 2637 1.19790234883611e-01
+2061 2661 6.14209279220181e-01
+2061 2685 6.52632710066743e-02
+2061 2709 4.09279816281546e-06
+2061 3237 4.36793967859312e-02
+2061 3261 1.30411080783781e-01
+2061 3285 3.06976858560456e-02
+2061 3309 3.44776521549161e-06
+2061 3837 1.80194811187150e-04
+2061 3861 3.54827271089046e-04
+2061 3885 3.30881342016367e-05
+2061 15000 -3.31168804452562e-01
+2061 15024 -2.58559228758133e-01
+2061 15048 -2.65642361519578e-02
+2061 15408 -2.25383879039393e-01
+2061 15432 -1.61524079405966e-01
+2061 15456 -1.39520399675055e-02
+2061 15816 -1.70855648037462e-02
+2061 15840 -9.21270429339967e-03
+2061 15864 -1.91406254721879e-04
+2062 2062 1.00000000000000e+00
+2063 2063 1.00000000000000e+00
+2064 2064 1.00000000000000e+00
+2065 2065 1.00000000000000e+00
+2066 2066 1.00000000000000e+00
+2067 2067 1.00000000000000e+00
+2068 2068 1.00000000000000e+00
+2069 2069 1.00000000000000e+00
+2070 2070 1.00000000000000e+00
+2071 2071 1.00000000000000e+00
+2072 2072 1.00000000000000e+00
+2073 2073 1.00000000000000e+00
+2074 2074 1.00000000000000e+00
+2075 2075 1.00000000000000e+00
+2076 2076 1.00000000000000e+00
+2077 2077 1.00000000000000e+00
+2078 2078 1.00000000000000e+00
+2079 2079 1.00000000000000e+00
+2080 2080 1.00000000000000e+00
+2081 2081 1.00000000000000e+00
+2082 2082 1.00000000000000e+00
+2083 2083 1.00000000000000e+00
+2084 2084 1.00000000000000e+00
+2085 2085 1.00000435929869e+00
+2085 2037 5.45386769826278e-05
+2085 2061 3.16146648534741e-04
+2085 2637 9.64122588329135e-04
+2085 2661 8.11544335798943e-03
+2085 2685 1.95729919479387e-03
+2085 2709 1.52197706490310e-07
+2085 3237 2.13706456323183e-04
+2085 3261 2.07534537618295e-03
+2085 3285 1.07228177540026e-03
+2085 3309 1.28205453431010e-07
+2085 3837 7.09230616116290e-07
+2085 3861 3.19208832744818e-06
+2085 3885 5.18496828096290e-07
+2085 15000 -3.44015283048547e-03
+2085 15024 -5.16422235334543e-03
+2085 15048 -9.84041696600769e-04
+2085 15408 -1.89434110109505e-03
+2085 15432 -2.70507787133988e-03
+2085 15456 -5.02259234512101e-04
+2085 15816 -4.97899102435188e-05
+2085 15840 -3.51333413334755e-05
+2085 15864 -2.92525320334745e-06
+2086 2086 1.00000000000000e+00
+2087 2087 1.00000000000000e+00
+2088 2088 1.00000000000000e+00
+2089 2089 1.00000000000000e+00
+2090 2090 1.00000000000000e+00
+2091 2091 1.00000000000000e+00
+2092 2092 1.00000000000000e+00
+2093 2093 1.00000000000000e+00
+2094 2094 1.00000000000000e+00
+2095 2095 1.00000000000000e+00
+2096 2096 1.00000000000000e+00
+2097 2097 1.00000000000000e+00
+2098 2098 1.00000000000000e+00
+2099 2099 1.00000000000000e+00
+2100 2100 1.00000000000000e+00
+2101 2101 1.00000000000000e+00
+2102 2102 1.00000000000000e+00
+2103 2103 1.00000000000000e+00
+2104 2104 1.00000000000000e+00
+2105 2105 1.00000000000000e+00
+2106 2106 1.00000000000000e+00
+2107 2107 1.00000000000000e+00
+2108 2108 1.00000000000000e+00
+2109 2109 1.00000000000000e+00
+2110 2110 1.00000000000000e+00
+2111 2111 1.00000000000000e+00
+2112 2112 1.00000000000000e+00
+2113 2113 1.00000000000000e+00
+2114 2114 1.00000000000000e+00
+2115 2115 1.00000000000000e+00
+2116 2116 1.00000000000000e+00
+2117 2117 1.00000000000000e+00
+2118 2118 1.00000000000000e+00
+2119 2119 1.00000000000000e+00
+2120 2120 1.00000000000000e+00
+2121 2121 1.00000000000000e+00
+2122 2122 1.00000000000000e+00
+2123 2123 1.00000000000000e+00
+2124 2124 1.00000000000000e+00
+2125 2125 1.00000000000000e+00
+2126 2126 1.00000000000000e+00
+2127 2127 1.00000000000000e+00
+2128 2128 1.00000000000000e+00
+2129 2129 1.00000000000000e+00
+2130 2130 1.00000000000000e+00
+2131 2131 1.00000000000000e+00
+2132 2132 1.00000000000000e+00
+2133 2133 1.00000000000000e+00
+2134 2134 1.00000000000000e+00
+2135 2135 1.00000000000000e+00
+2136 2136 1.00000000000000e+00
+2137 2137 1.00000000000000e+00
+2138 2138 1.00000000000000e+00
+2139 2139 1.00000000000000e+00
+2140 2140 1.00000000000000e+00
+2141 2141 1.00000000000000e+00
+2142 2142 1.00000000000000e+00
+2143 2143 1.00000000000000e+00
+2144 2144 1.00000000000000e+00
+2145 2145 1.00000000000000e+00
+2146 2146 1.00000000000000e+00
+2147 2147 1.00000000000000e+00
+2148 2148 1.00000000000000e+00
+2149 2149 1.00000000000000e+00
+2150 2150 1.00000000000000e+00
+2151 2151 1.00000000000000e+00
+2152 2152 1.00000000000000e+00
+2153 2153 1.00000000000000e+00
+2154 2154 1.00000000000000e+00
+2155 2155 1.00000000000000e+00
+2156 2156 1.00000000000000e+00
+2157 2157 1.00000000000000e+00
+2158 2158 1.00000000000000e+00
+2159 2159 1.00000000000000e+00
+2160 2160 1.00000000000000e+00
+2161 2161 1.00000000000000e+00
+2162 2162 1.00000000000000e+00
+2163 2163 1.00000000000000e+00
+2164 2164 1.00000000000000e+00
+2165 2165 1.00000000000000e+00
+2166 2166 1.00000000000000e+00
+2167 2167 1.00000000000000e+00
+2168 2168 1.00000000000000e+00
+2169 2169 1.00000000000000e+00
+2170 2170 1.00000000000000e+00
+2171 2171 1.00000000000000e+00
+2172 2172 1.00000000000000e+00
+2173 2173 1.00000000000000e+00
+2174 2174 1.00000000000000e+00
+2175 2175 1.00000000000000e+00
+2176 2176 1.00000000000000e+00
+2177 2177 1.00000000000000e+00
+2178 2178 1.00000000000000e+00
+2179 2179 1.00000000000000e+00
+2180 2180 1.00000000000000e+00
+2181 2181 1.00000000000000e+00
+2182 2182 1.00000000000000e+00
+2183 2183 1.00000000000000e+00
+2184 2184 1.00000000000000e+00
+2185 2185 1.00000000000000e+00
+2186 2186 1.00000000000000e+00
+2187 2187 1.00000000000000e+00
+2188 2188 1.00000000000000e+00
+2189 2189 1.00000000000000e+00
+2190 2190 1.00000000000000e+00
+2191 2191 1.00000000000000e+00
+2192 2192 1.00000000000000e+00
+2193 2193 1.00000000000000e+00
+2194 2194 1.00000000000000e+00
+2195 2195 1.00000000000000e+00
+2196 2196 1.00000000000000e+00
+2197 2197 1.00000000000000e+00
+2198 2198 1.00000000000000e+00
+2199 2199 1.00000000000000e+00
+2200 2200 1.00000000000000e+00
+2201 2201 1.00000000000000e+00
+2202 2202 1.00000000000000e+00
+2203 2203 1.00000000000000e+00
+2204 2204 1.00000000000000e+00
+2205 2205 1.00000000000000e+00
+2206 2206 1.00000000000000e+00
+2207 2207 1.00000000000000e+00
+2208 2208 1.00000000000000e+00
+2209 2209 1.00000000000000e+00
+2210 2210 1.00000000000000e+00
+2211 2211 1.00000000000000e+00
+2212 2212 1.00000000000000e+00
+2213 2213 1.00000000000000e+00
+2214 2214 1.00000000000000e+00
+2215 2215 1.00000000000000e+00
+2216 2216 1.00000000000000e+00
+2217 2217 1.00000000000000e+00
+2218 2218 1.00000000000000e+00
+2219 2219 1.00000000000000e+00
+2220 2220 1.00000000000000e+00
+2221 2221 1.00000000000000e+00
+2222 2222 1.00000000000000e+00
+2223 2223 1.00000000000000e+00
+2224 2224 1.00000000000000e+00
+2225 2225 1.00000000000000e+00
+2226 2226 1.00000000000000e+00
+2227 2227 1.00000000000000e+00
+2228 2228 1.00000000000000e+00
+2229 2229 1.00000000000000e+00
+2230 2230 1.00000000000000e+00
+2231 2231 1.00000000000000e+00
+2232 2232 1.00000000000000e+00
+2233 2233 1.00000000000000e+00
+2234 2234 1.00000000000000e+00
+2235 2235 1.00000000000000e+00
+2236 2236 1.00000000000000e+00
+2237 2237 1.00000000000000e+00
+2238 2238 1.00000000000000e+00
+2239 2239 1.00000000000000e+00
+2240 2240 1.00000000000000e+00
+2241 2241 1.00000000000000e+00
+2242 2242 1.00000000000000e+00
+2243 2243 1.00000000000000e+00
+2244 2244 1.00000000000000e+00
+2245 2245 1.00000000000000e+00
+2246 2246 1.00000000000000e+00
+2247 2247 1.00000000000000e+00
+2248 2248 1.00000000000000e+00
+2249 2249 1.00000000000000e+00
+2250 2250 1.00000000000000e+00
+2251 2251 1.00000000000000e+00
+2252 2252 1.00000000000000e+00
+2253 2253 1.00000000000000e+00
+2254 2254 1.00000000000000e+00
+2255 2255 1.00000000000000e+00
+2256 2256 1.00000000000000e+00
+2257 2257 1.00000000000000e+00
+2258 2258 1.00000000000000e+00
+2259 2259 1.00000000000000e+00
+2260 2260 1.00000000000000e+00
+2261 2261 1.00000000000000e+00
+2262 2262 1.00000000000000e+00
+2263 2263 1.00000000000000e+00
+2264 2264 1.00000000000000e+00
+2265 2265 1.00000000000000e+00
+2266 2266 1.00000000000000e+00
+2267 2267 1.00000000000000e+00
+2268 2268 1.00000000000000e+00
+2269 2269 1.00000000000000e+00
+2270 2270 1.00000000000000e+00
+2271 2271 1.00000000000000e+00
+2272 2272 1.00000000000000e+00
+2273 2273 1.00000000000000e+00
+2274 2274 1.00000000000000e+00
+2275 2275 1.00000000000000e+00
+2276 2276 1.00000000000000e+00
+2277 2277 1.00000000000000e+00
+2278 2278 1.00000000000000e+00
+2279 2279 1.00000000000000e+00
+2280 2280 1.00000000000000e+00
+2281 2281 1.00000000000000e+00
+2282 2282 1.00000000000000e+00
+2283 2283 1.00000000000000e+00
+2284 2284 1.00000000000000e+00
+2285 2285 1.00000000000000e+00
+2286 2286 1.00000000000000e+00
+2287 2287 1.00000000000000e+00
+2288 2288 1.00000000000000e+00
+2289 2289 1.00000000000000e+00
+2290 2290 1.00000000000000e+00
+2291 2291 1.00000000000000e+00
+2292 2292 1.00000000000000e+00
+2293 2293 1.00000000000000e+00
+2294 2294 1.00000000000000e+00
+2295 2295 1.00000000000000e+00
+2296 2296 1.00000000000000e+00
+2297 2297 1.00000000000000e+00
+2298 2298 1.00000000000000e+00
+2299 2299 1.00000000000000e+00
+2300 2300 1.00000000000000e+00
+2301 2301 1.00000000000000e+00
+2302 2302 1.00000000000000e+00
+2303 2303 1.00000000000000e+00
+2304 2304 1.00000000000000e+00
+2305 2305 1.00000000000000e+00
+2306 2306 1.00000000000000e+00
+2307 2307 1.00000000000000e+00
+2308 2308 1.00000000000000e+00
+2309 2309 1.00000000000000e+00
+2310 2310 1.00000000000000e+00
+2311 2311 1.00000000000000e+00
+2312 2312 1.00000000000000e+00
+2313 2313 1.00000000000000e+00
+2314 2314 1.00000000000000e+00
+2315 2315 1.00000000000000e+00
+2316 2316 1.00000000000000e+00
+2317 2317 1.00000000000000e+00
+2318 2318 1.00000000000000e+00
+2319 2319 1.00000000000000e+00
+2320 2320 1.00000000000000e+00
+2321 2321 1.00000000000000e+00
+2322 2322 1.00000000000000e+00
+2323 2323 1.00000000000000e+00
+2324 2324 1.00000000000000e+00
+2325 2325 1.00000000000000e+00
+2326 2326 1.00000000000000e+00
+2327 2327 1.00000000000000e+00
+2328 2328 1.00000000000000e+00
+2329 2329 1.00000000000000e+00
+2330 2330 1.00000000000000e+00
+2331 2331 1.00000000000000e+00
+2332 2332 1.00000000000000e+00
+2333 2333 1.00000000000000e+00
+2334 2334 1.00000000000000e+00
+2335 2335 1.00000000000000e+00
+2336 2336 1.00000000000000e+00
+2337 2337 1.00000000000000e+00
+2338 2338 1.00000000000000e+00
+2339 2339 1.00000000000000e+00
+2340 2340 1.00000000000000e+00
+2341 2341 1.00000000000000e+00
+2342 2342 1.00000000000000e+00
+2343 2343 1.00000000000000e+00
+2344 2344 1.00000000000000e+00
+2345 2345 1.00000000000000e+00
+2346 2346 1.00000000000000e+00
+2347 2347 1.00000000000000e+00
+2348 2348 1.00000000000000e+00
+2349 2349 1.00000000000000e+00
+2350 2350 1.00000000000000e+00
+2351 2351 1.00000000000000e+00
+2352 2352 1.00000000000000e+00
+2353 2353 1.00000000000000e+00
+2354 2354 1.00000000000000e+00
+2355 2355 1.00000000000000e+00
+2356 2356 1.00000000000000e+00
+2357 2357 1.00000000000000e+00
+2358 2358 1.00000000000000e+00
+2359 2359 1.00000000000000e+00
+2360 2360 1.00000000000000e+00
+2361 2361 1.00000000000000e+00
+2362 2362 1.00000000000000e+00
+2363 2363 1.00000000000000e+00
+2364 2364 1.00000000000000e+00
+2365 2365 1.00000000000000e+00
+2366 2366 1.00000000000000e+00
+2367 2367 1.00000000000000e+00
+2368 2368 1.00000000000000e+00
+2369 2369 1.00000000000000e+00
+2370 2370 1.00000000000000e+00
+2371 2371 1.00000000000000e+00
+2372 2372 1.00000000000000e+00
+2373 2373 1.00000000000000e+00
+2374 2374 1.00000000000000e+00
+2375 2375 1.00000000000000e+00
+2376 2376 1.00000000000000e+00
+2377 2377 1.00000000000000e+00
+2378 2378 1.00000000000000e+00
+2379 2379 1.00000000000000e+00
+2380 2380 1.00000000000000e+00
+2381 2381 1.00000000000000e+00
+2382 2382 1.00000000000000e+00
+2383 2383 1.00000000000000e+00
+2384 2384 1.00000000000000e+00
+2385 2385 1.00000000000000e+00
+2386 2386 1.00000000000000e+00
+2387 2387 1.00000000000000e+00
+2388 2388 1.00000000000000e+00
+2389 2389 1.00000000000000e+00
+2390 2390 1.00000000000000e+00
+2391 2391 1.00000000000000e+00
+2392 2392 1.00000000000000e+00
+2393 2393 1.00000000000000e+00
+2394 2394 1.00000000000000e+00
+2395 2395 1.00000000000000e+00
+2396 2396 1.00000000000000e+00
+2397 2397 1.00000000000000e+00
+2398 2398 1.00000000000000e+00
+2399 2399 1.00000000000000e+00
+2400 2400 1.00000000000000e+00
+2401 2401 1.00000000000000e+00
+2402 2402 1.00000000000000e+00
+2403 2403 1.00000000000000e+00
+2404 2404 1.00000000000000e+00
+2405 2405 1.00000000000000e+00
+2406 2406 1.00000000000000e+00
+2407 2407 1.00000000000000e+00
+2408 2408 1.00000000000000e+00
+2409 2409 1.00000000000000e+00
+2410 2410 1.00000000000000e+00
+2411 2411 1.00000000000000e+00
+2412 2412 1.00000000000000e+00
+2413 2413 1.00000000000000e+00
+2414 2414 1.00000000000000e+00
+2415 2415 1.00000000000000e+00
+2416 2416 1.00000000000000e+00
+2417 2417 1.00000000000000e+00
+2418 2418 1.00000000000000e+00
+2419 2419 1.00000000000000e+00
+2420 2420 1.00000000000000e+00
+2421 2421 1.00000000000000e+00
+2422 2422 1.00000000000000e+00
+2423 2423 1.00000000000000e+00
+2424 2424 1.00000000000000e+00
+2425 2425 1.00000000000000e+00
+2426 2426 1.00000000000000e+00
+2427 2427 1.00000000000000e+00
+2428 2428 1.00000000000000e+00
+2429 2429 1.00000000000000e+00
+2430 2430 1.00000000000000e+00
+2431 2431 1.00000000000000e+00
+2432 2432 1.00000000000000e+00
+2433 2433 1.00000000000000e+00
+2434 2434 1.00000000000000e+00
+2435 2435 1.00000000000000e+00
+2436 2436 1.00000000000000e+00
+2437 2437 1.00000000000000e+00
+2438 2438 1.00000000000000e+00
+2439 2439 1.00000000000000e+00
+2440 2440 1.00000000000000e+00
+2441 2441 1.00000000000000e+00
+2442 2442 1.00000000000000e+00
+2443 2443 1.00000000000000e+00
+2444 2444 1.00000000000000e+00
+2445 2445 1.00000000000000e+00
+2446 2446 1.00000000000000e+00
+2447 2447 1.00000000000000e+00
+2448 2448 1.00000000000000e+00
+2449 2449 1.00000000000000e+00
+2450 2450 1.00000000000000e+00
+2451 2451 1.00000000000000e+00
+2452 2452 1.00000000000000e+00
+2453 2453 1.00000000000000e+00
+2454 2454 1.00000000000000e+00
+2455 2455 1.00000000000000e+00
+2456 2456 1.00000000000000e+00
+2457 2457 1.00000000000000e+00
+2458 2458 1.00000000000000e+00
+2459 2459 1.00000000000000e+00
+2460 2460 1.00000000000000e+00
+2461 2461 1.00000000000000e+00
+2462 2462 1.00000000000000e+00
+2463 2463 1.00000000000000e+00
+2464 2464 1.00000000000000e+00
+2465 2465 1.00000000000000e+00
+2466 2466 1.00000000000000e+00
+2467 2467 1.00000000000000e+00
+2468 2468 1.00000000000000e+00
+2469 2469 1.00000000000000e+00
+2470 2470 1.00000000000000e+00
+2471 2471 1.00000000000000e+00
+2472 2472 1.00000000000000e+00
+2473 2473 1.00000000000000e+00
+2474 2474 1.00000000000000e+00
+2475 2475 1.00000000000000e+00
+2476 2476 1.00000000000000e+00
+2477 2477 1.00000000000000e+00
+2478 2478 1.00000000000000e+00
+2479 2479 1.00000000000000e+00
+2480 2480 1.00000000000000e+00
+2481 2481 1.00000000000000e+00
+2482 2482 1.00000000000000e+00
+2483 2483 1.00000000000000e+00
+2484 2484 1.00000000000000e+00
+2485 2485 1.00000000000000e+00
+2486 2486 1.00000000000000e+00
+2487 2487 1.00000000000000e+00
+2488 2488 1.00000000000000e+00
+2489 2489 1.00000000000000e+00
+2490 2490 1.00000000000000e+00
+2491 2491 1.00000000000000e+00
+2492 2492 1.00000000000000e+00
+2493 2493 1.00000000000000e+00
+2494 2494 1.00000000000000e+00
+2495 2495 1.00000000000000e+00
+2496 2496 1.00000000000000e+00
+2497 2497 1.00000000000000e+00
+2498 2498 1.00000000000000e+00
+2499 2499 1.00000000000000e+00
+2500 2500 1.00000000000000e+00
+2501 2501 1.00000000000000e+00
+2502 2502 1.00000000000000e+00
+2503 2503 1.00000000000000e+00
+2504 2504 1.00000000000000e+00
+2505 2505 1.00000000000000e+00
+2506 2506 1.00000000000000e+00
+2507 2507 1.00000000000000e+00
+2508 2508 1.00000000000000e+00
+2509 2509 1.00000000000000e+00
+2510 2510 1.00000000000000e+00
+2511 2511 1.00000000000000e+00
+2512 2512 1.00000000000000e+00
+2513 2513 1.00000000000000e+00
+2514 2514 1.00000000000000e+00
+2515 2515 1.00000000000000e+00
+2516 2516 1.00000000000000e+00
+2517 2517 1.00000000000000e+00
+2518 2518 1.00000000000000e+00
+2519 2519 1.00000000000000e+00
+2520 2520 1.00000000000000e+00
+2521 2521 1.00000000000000e+00
+2522 2522 1.00000000000000e+00
+2523 2523 1.00000000000000e+00
+2524 2524 1.00000000000000e+00
+2525 2525 1.00000000000000e+00
+2526 2526 1.00000000000000e+00
+2527 2527 1.00000000000000e+00
+2528 2528 1.00000000000000e+00
+2529 2529 1.00000000000000e+00
+2530 2530 1.00000000000000e+00
+2531 2531 1.00000000000000e+00
+2532 2532 1.00000000000000e+00
+2533 2533 1.00000000000000e+00
+2534 2534 1.00000000000000e+00
+2535 2535 1.00000000000000e+00
+2536 2536 1.00000000000000e+00
+2537 2537 1.00000000000000e+00
+2538 2538 1.00000000000000e+00
+2539 2539 1.00000000000000e+00
+2540 2540 1.00000000000000e+00
+2541 2541 1.00000000000000e+00
+2542 2542 1.00000000000000e+00
+2543 2543 1.00000000000000e+00
+2544 2544 1.00000000000000e+00
+2545 2545 1.00000000000000e+00
+2546 2546 1.00000000000000e+00
+2547 2547 1.00000000000000e+00
+2548 2548 1.00000000000000e+00
+2549 2549 1.00000000000000e+00
+2550 2550 1.00000000000000e+00
+2551 2551 1.00000000000000e+00
+2552 2552 1.00000000000000e+00
+2553 2553 1.00000000000000e+00
+2554 2554 1.00000000000000e+00
+2555 2555 1.00000000000000e+00
+2556 2556 1.00000000000000e+00
+2557 2557 1.00000000000000e+00
+2558 2558 1.00000000000000e+00
+2559 2559 1.00000000000000e+00
+2560 2560 1.00000000000000e+00
+2561 2561 1.00000000000000e+00
+2562 2562 1.00000000000000e+00
+2563 2563 1.00000000000000e+00
+2564 2564 1.00000000000000e+00
+2565 2565 1.00000000000000e+00
+2566 2566 1.00000000000000e+00
+2567 2567 1.00000000000000e+00
+2568 2568 1.00000000000000e+00
+2569 2569 1.00000000000000e+00
+2570 2570 1.00000000000000e+00
+2571 2571 1.00000000000000e+00
+2572 2572 1.00000000000000e+00
+2573 2573 1.00000000000000e+00
+2574 2574 1.00000000000000e+00
+2575 2575 1.00000000000000e+00
+2576 2576 1.00000000000000e+00
+2577 2577 1.00000000000000e+00
+2578 2578 1.00000000000000e+00
+2579 2579 1.00000000000000e+00
+2580 2580 1.00000000000000e+00
+2581 2581 1.00000000000000e+00
+2582 2582 1.00000000000000e+00
+2583 2583 1.00000000000000e+00
+2584 2584 1.00000000000000e+00
+2585 2585 1.00000000000000e+00
+2586 2586 1.00000000000000e+00
+2587 2587 1.00000000000000e+00
+2588 2588 1.00000000000000e+00
+2589 2589 1.00000000000000e+00
+2590 2590 1.00000000000000e+00
+2591 2591 1.00000000000000e+00
+2592 2592 1.00000000000000e+00
+2593 2593 1.00000000000000e+00
+2594 2594 1.00000000000000e+00
+2595 2595 1.00000000000000e+00
+2596 2596 1.00000000000000e+00
+2597 2597 1.00000000000000e+00
+2598 2598 1.00000000000000e+00
+2599 2599 1.00000000000000e+00
+2600 2600 1.00000000000000e+00
+2601 2601 1.00000000000000e+00
+2602 2602 1.00000000000000e+00
+2603 2603 1.00000000000000e+00
+2604 2604 1.00000000000000e+00
+2605 2605 1.00000000000000e+00
+2606 2606 1.00000000000000e+00
+2607 2607 1.00000000000000e+00
+2608 2608 1.00000000000000e+00
+2609 2609 1.00000000000000e+00
+2610 2610 1.00000000000000e+00
+2611 2611 1.00000000000000e+00
+2612 2612 1.00000000000000e+00
+2613 2613 1.00000000000000e+00
+2614 2614 1.00000000000000e+00
+2615 2615 1.00000000000000e+00
+2616 2616 1.00000000000000e+00
+2617 2617 1.00000000000000e+00
+2618 2618 1.00000000000000e+00
+2619 2619 1.00000000000000e+00
+2620 2620 1.00000000000000e+00
+2621 2621 1.00000000000000e+00
+2622 2622 1.00000000000000e+00
+2623 2623 1.00000000000000e+00
+2624 2624 1.00000000000000e+00
+2625 2625 1.00000000000000e+00
+2626 2626 1.00000000000000e+00
+2627 2627 1.00000000000000e+00
+2628 2628 1.00000000000000e+00
+2629 2629 1.00000000000000e+00
+2630 2630 1.00000000000000e+00
+2631 2631 1.00000000000000e+00
+2632 2632 1.00000000000000e+00
+2633 2633 1.00000000000000e+00
+2634 2634 1.00000000000000e+00
+2635 2635 1.00000000000000e+00
+2636 2636 1.00000000000000e+00
+2637 2637 2.89240257957879e+00
+2637 2037 2.46870374499711e-02
+2637 2061 1.19790234883611e-01
+2637 2085 9.64122588329135e-04
+2637 2661 4.66704907915603e+00
+2637 2685 2.17844836818969e-01
+2637 2709 1.01894477122350e-05
+2637 3213 1.48846185431150e-02
+2637 3237 2.93723459434132e+00
+2637 3261 3.18335899755208e+00
+2637 3285 1.45416647043228e-01
+2637 3309 8.82040844097354e-06
+2637 3813 1.18136420444713e-02
+2637 3837 3.21523235303118e-01
+2637 3861 1.29727964301456e-01
+2637 3885 4.32657486010460e-03
+2637 3909 4.80711473217600e-08
+2637 4437 7.09412875459543e-05
+2637 4461 2.54420757694263e-04
+2637 4485 1.16629760528201e-06
+2637 4509 8.34516350000000e-13
+2637 15000 -1.86912480621183e+00
+2637 15024 -1.21722609796363e+00
+2637 15048 -8.07620712877337e-02
+2637 15072 -2.73434565390910e-07
+2637 15408 -4.54030951783678e+00
+2637 15432 -2.63427490152780e+00
+2637 15456 -1.04039244321090e-01
+2637 15480 -1.32403957025801e-06
+2637 15816 -1.81449700885238e+00
+2637 15840 -1.03543496275687e+00
+2637 15864 -3.66291396137364e-02
+2637 15888 -1.19463980016838e-06
+2637 16224 -2.11153262788651e-01
+2637 16248 -1.22950809007927e-01
+2637 16272 -4.96490615160416e-03
+2637 16296 -2.30301308694370e-07
+2638 2638 1.00000000000000e+00
+2639 2639 1.00000000000000e+00
+2640 2640 1.00000000000000e+00
+2641 2641 1.00000000000000e+00
+2642 2642 1.00000000000000e+00
+2643 2643 1.00000000000000e+00
+2644 2644 1.00000000000000e+00
+2645 2645 1.00000000000000e+00
+2646 2646 1.00000000000000e+00
+2647 2647 1.00000000000000e+00
+2648 2648 1.00000000000000e+00
+2649 2649 1.00000000000000e+00
+2650 2650 1.00000000000000e+00
+2651 2651 1.00000000000000e+00
+2652 2652 1.00000000000000e+00
+2653 2653 1.00000000000000e+00
+2654 2654 1.00000000000000e+00
+2655 2655 1.00000000000000e+00
+2656 2656 1.00000000000000e+00
+2657 2657 1.00000000000000e+00
+2658 2658 1.00000000000000e+00
+2659 2659 1.00000000000000e+00
+2660 2660 1.00000000000000e+00
+2661 2661 2.23335933073396e+01
+2661 2037 1.09822659070729e-01
+2661 2061 6.14209279220181e-01
+2661 2085 8.11544335798943e-03
+2661 2637 4.66704907915603e+00
+2661 2685 4.86555311739368e+00
+2661 2709 7.50878594565593e-02
+2661 2733 1.09086417370000e-10
+2661 3213 9.22890593949129e-03
+2661 3237 4.64065275503838e+00
+2661 3261 1.07535791920085e+01
+2661 3285 4.49687532095990e+00
+2661 3309 2.76648894908239e-01
+2661 3333 7.67643334023892e-06
+2661 3813 7.34843574811677e-03
+2661 3837 2.45504972402707e-01
+2661 3861 2.79777465397475e-01
+2661 3885 1.09481969201773e-01
+2661 3909 7.50438699090477e-03
+2661 3933 2.36590348617495e-06
+2661 4437 1.20547285967300e-04
+2661 4461 5.98389187080576e-04
+2661 4485 1.08990327590319e-04
+2661 4509 1.13169651915075e-06
+2661 15000 -8.01986008310668e+00
+2661 15024 -1.13506209985229e+01
+2661 15048 -3.59414605494425e+00
+2661 15072 -4.03388434389487e-01
+2661 15096 -1.07822922226173e-04
+2661 15408 -1.09051654129362e+01
+2661 15432 -1.07635608328280e+01
+2661 15456 -2.45302092463139e+00
+2661 15480 -2.52264035490318e-01
+2661 15504 -9.97392066839166e-05
+2661 15816 -2.47118942806325e+00
+2661 15840 -1.81132176135841e+00
+2661 15864 -2.20635404010207e-01
+2661 15888 -1.51639929481642e-02
+2661 15912 -1.30936415916657e-05
+2661 16224 -1.34917509756813e-01
+2661 16248 -9.62596793221455e-02
+2661 16272 -8.94430899049705e-03
+2661 16296 -1.92627463307723e-04
+2662 2662 1.00000000000000e+00
+2663 2663 1.00000000000000e+00
+2664 2664 1.00000000000000e+00
+2665 2665 1.00000000000000e+00
+2666 2666 1.00000000000000e+00
+2667 2667 1.00000000000000e+00
+2668 2668 1.00000000000000e+00
+2669 2669 1.00000000000000e+00
+2670 2670 1.00000000000000e+00
+2671 2671 1.00000000000000e+00
+2672 2672 1.00000000000000e+00
+2673 2673 1.00000000000000e+00
+2674 2674 1.00000000000000e+00
+2675 2675 1.00000000000000e+00
+2676 2676 1.00000000000000e+00
+2677 2677 1.00000000000000e+00
+2678 2678 1.00000000000000e+00
+2679 2679 1.00000000000000e+00
+2680 2680 1.00000000000000e+00
+2681 2681 1.00000000000000e+00
+2682 2682 1.00000000000000e+00
+2683 2683 1.00000000000000e+00
+2684 2684 1.00000000000000e+00
+2685 2685 6.56924940955695e+00
+2685 2037 7.20909761037706e-03
+2685 2061 6.52632710066743e-02
+2685 2085 1.95729919479387e-03
+2685 2637 2.17844836818969e-01
+2685 2661 4.86555311739368e+00
+2685 2709 3.57682624143001e-01
+2685 2733 1.65206772175220e-07
+2685 3213 1.25052203376214e-06
+2685 3237 1.27181616251688e-01
+2685 3261 3.15491505639718e+00
+2685 3285 9.52331039881100e+00
+2685 3309 1.82785208832563e+00
+2685 3333 1.20671885798248e-02
+2685 3357 2.60784759250900e-08
+2685 3813 1.36192251944492e-06
+2685 3837 2.98352467610303e-03
+2685 3861 9.08790737019995e-02
+2685 3885 2.98235611124593e-01
+2685 3909 1.55044360737322e-01
+2685 3933 4.31692185634905e-03
+2685 3957 3.84760914064400e-08
+2685 4437 1.85443126627615e-06
+2685 4461 3.87416569810659e-05
+2685 4485 3.90821018534074e-04
+2685 4509 2.98307779105627e-04
+2685 4533 1.76345157057950e-06
+2685 15000 -9.93950143461300e-01
+2685 15024 -5.11769890541419e+00
+2685 15048 -7.82386178903436e+00
+2685 15072 -2.29847746643466e+00
+2685 15096 -1.49586861259650e-01
+2685 15120 -7.59934449608780e-04
+2685 15408 -6.43859071509858e-01
+2685 15432 -3.05351420152938e+00
+2685 15456 -4.43068966198704e+00
+2685 15480 -1.30109975791990e+00
+2685 15504 -8.67773264820810e-02
+2685 15528 -3.88025594488405e-04
+2685 15816 -4.22648233034794e-02
+2685 15840 -1.42656758267414e-01
+2685 15864 -1.49049353647891e-01
+2685 15888 -4.35226319330419e-02
+2685 15912 -3.42397024350168e-03
+2685 15936 -2.30239133829011e-06
+2685 16224 -8.02216756130927e-05
+2685 16248 -3.56454239513493e-04
+2685 16272 -2.24151561366762e-04
+2685 16296 -3.60143894674400e-05
+2686 2686 1.00000000000000e+00
+2687 2687 1.00000000000000e+00
+2688 2688 1.00000000000000e+00
+2689 2689 1.00000000000000e+00
+2690 2690 1.00000000000000e+00
+2691 2691 1.00000000000000e+00
+2692 2692 1.00000000000000e+00
+2693 2693 1.00000000000000e+00
+2694 2694 1.00000000000000e+00
+2695 2695 1.00000000000000e+00
+2696 2696 1.00000000000000e+00
+2697 2697 1.00000000000000e+00
+2698 2698 1.00000000000000e+00
+2699 2699 1.00000000000000e+00
+2700 2700 1.00000000000000e+00
+2701 2701 1.00000000000000e+00
+2702 2702 1.00000000000000e+00
+2703 2703 1.00000000000000e+00
+2704 2704 1.00000000000000e+00
+2705 2705 1.00000000000000e+00
+2706 2706 1.00000000000000e+00
+2707 2707 1.00000000000000e+00
+2708 2708 1.00000000000000e+00
+2709 2709 1.05242261230147e+00
+2709 2037 3.38261348833630e-07
+2709 2061 4.09279816281546e-06
+2709 2085 1.52197706490310e-07
+2709 2637 1.01894477122350e-05
+2709 2661 7.50878594565593e-02
+2709 2685 3.57682624143001e-01
+2709 2733 1.23430727922290e-07
+2709 3237 1.74314569669890e-05
+2709 3261 1.02332936929997e-01
+2709 3285 9.54978556178009e-01
+2709 3309 5.82260908100780e-01
+2709 3333 1.38154135506727e-02
+2709 3357 1.47384460888300e-07
+2709 3837 5.17938663274500e-06
+2709 3861 2.93365015021248e-03
+2709 3885 5.66352263340657e-02
+2709 3909 9.79813381742708e-02
+2709 3933 8.35456992673652e-03
+2709 3957 2.17449701422410e-07
+2709 4461 2.08930460891820e-07
+2709 4485 1.60494948635366e-04
+2709 4509 1.51134942095430e-04
+2709 4533 9.01164771458639e-06
+2709 15000 -6.75149496405289e-05
+2709 15024 -1.38468320828470e-01
+2709 15048 -6.58684771145473e-01
+2709 15072 -5.65787260988341e-01
+2709 15096 -1.22992818690726e-01
+2709 15120 -4.29215165363144e-03
+2709 15408 -3.45539493907760e-05
+2709 15432 -7.30006766659667e-02
+2709 15456 -3.49593855422099e-01
+2709 15480 -3.07481855106385e-01
+2709 15504 -6.68357069655295e-02
+2709 15528 -2.18156224160910e-03
+2709 15816 -2.27564163003290e-07
+2709 15840 -1.07614750049477e-03
+2709 15864 -5.78613424267483e-03
+2709 15888 -7.02520703206120e-03
+2709 15912 -1.52551360576180e-03
+2709 15936 -1.01389756552504e-05
+2710 2710 1.00000000000000e+00
+2711 2711 1.00000000000000e+00
+2712 2712 1.00000000000000e+00
+2713 2713 1.00000000000000e+00
+2714 2714 1.00000000000000e+00
+2715 2715 1.00000000000000e+00
+2716 2716 1.00000000000000e+00
+2717 2717 1.00000000000000e+00
+2718 2718 1.00000000000000e+00
+2719 2719 1.00000000000000e+00
+2720 2720 1.00000000000000e+00
+2721 2721 1.00000000000000e+00
+2722 2722 1.00000000000000e+00
+2723 2723 1.00000000000000e+00
+2724 2724 1.00000000000000e+00
+2725 2725 1.00000000000000e+00
+2726 2726 1.00000000000000e+00
+2727 2727 1.00000000000000e+00
+2728 2728 1.00000000000000e+00
+2729 2729 1.00000000000000e+00
+2730 2730 1.00000000000000e+00
+2731 2731 1.00000000000000e+00
+2732 2732 1.00000000000000e+00
+2733 2733 1.00000000000106e+00
+2733 2661 1.09086417370000e-10
+2733 2685 1.65206772175220e-07
+2733 2709 1.23430727922290e-07
+2733 3261 2.22990279934000e-09
+2733 3285 1.47101733658933e-06
+2733 3309 4.40213679917619e-06
+2733 3333 8.87085011605720e-07
+2733 3357 2.16381754700000e-11
+2733 3861 1.91012521360000e-10
+2733 3885 1.76934258518440e-07
+2733 3909 1.86054858380126e-06
+2733 3933 8.87219725627850e-07
+2733 3957 3.19243961200000e-11
+2733 4461 3.55340800000000e-14
+2733 4485 7.31269937100000e-11
+2733 4509 9.32791876860000e-10
+2733 4533 8.85453302770000e-10
+2733 15048 -4.78380215078030e-07
+2733 15072 -2.54244484549938e-06
+2733 15096 -2.99407615582714e-06
+2733 15120 -6.28923985187280e-07
+2733 15456 -2.40186428761690e-07
+2733 15480 -1.27580809196147e-06
+2733 15504 -1.50043593642060e-06
+2733 15528 -3.15062376914730e-07
+2733 15864 -2.84663206480000e-10
+2733 15888 -1.31019120337000e-09
+2733 15912 -9.70816716290000e-10
+2733 15936 -1.71538377450000e-10
+2734 2734 1.00000000000000e+00
+2735 2735 1.00000000000000e+00
+2736 2736 1.00000000000000e+00
+2737 2737 1.00000000000000e+00
+2738 2738 1.00000000000000e+00
+2739 2739 1.00000000000000e+00
+2740 2740 1.00000000000000e+00
+2741 2741 1.00000000000000e+00
+2742 2742 1.00000000000000e+00
+2743 2743 1.00000000000000e+00
+2744 2744 1.00000000000000e+00
+2745 2745 1.00000000000000e+00
+2746 2746 1.00000000000000e+00
+2747 2747 1.00000000000000e+00
+2748 2748 1.00000000000000e+00
+2749 2749 1.00000000000000e+00
+2750 2750 1.00000000000000e+00
+2751 2751 1.00000000000000e+00
+2752 2752 1.00000000000000e+00
+2753 2753 1.00000000000000e+00
+2754 2754 1.00000000000000e+00
+2755 2755 1.00000000000000e+00
+2756 2756 1.00000000000000e+00
+2757 2757 1.00000000000000e+00
+2758 2758 1.00000000000000e+00
+2759 2759 1.00000000000000e+00
+2760 2760 1.00000000000000e+00
+2761 2761 1.00000000000000e+00
+2762 2762 1.00000000000000e+00
+2763 2763 1.00000000000000e+00
+2764 2764 1.00000000000000e+00
+2765 2765 1.00000000000000e+00
+2766 2766 1.00000000000000e+00
+2767 2767 1.00000000000000e+00
+2768 2768 1.00000000000000e+00
+2769 2769 1.00000000000000e+00
+2770 2770 1.00000000000000e+00
+2771 2771 1.00000000000000e+00
+2772 2772 1.00000000000000e+00
+2773 2773 1.00000000000000e+00
+2774 2774 1.00000000000000e+00
+2775 2775 1.00000000000000e+00
+2776 2776 1.00000000000000e+00
+2777 2777 1.00000000000000e+00
+2778 2778 1.00000000000000e+00
+2779 2779 1.00000000000000e+00
+2780 2780 1.00000000000000e+00
+2781 2781 1.00000000000000e+00
+2782 2782 1.00000000000000e+00
+2783 2783 1.00000000000000e+00
+2784 2784 1.00000000000000e+00
+2785 2785 1.00000000000000e+00
+2786 2786 1.00000000000000e+00
+2787 2787 1.00000000000000e+00
+2788 2788 1.00000000000000e+00
+2789 2789 1.00000000000000e+00
+2790 2790 1.00000000000000e+00
+2791 2791 1.00000000000000e+00
+2792 2792 1.00000000000000e+00
+2793 2793 1.00000000000000e+00
+2794 2794 1.00000000000000e+00
+2795 2795 1.00000000000000e+00
+2796 2796 1.00000000000000e+00
+2797 2797 1.00000000000000e+00
+2798 2798 1.00000000000000e+00
+2799 2799 1.00000000000000e+00
+2800 2800 1.00000000000000e+00
+2801 2801 1.00000000000000e+00
+2802 2802 1.00000000000000e+00
+2803 2803 1.00000000000000e+00
+2804 2804 1.00000000000000e+00
+2805 2805 1.00000000000000e+00
+2806 2806 1.00000000000000e+00
+2807 2807 1.00000000000000e+00
+2808 2808 1.00000000000000e+00
+2809 2809 1.00000000000000e+00
+2810 2810 1.00000000000000e+00
+2811 2811 1.00000000000000e+00
+2812 2812 1.00000000000000e+00
+2813 2813 1.00000000000000e+00
+2814 2814 1.00000000000000e+00
+2815 2815 1.00000000000000e+00
+2816 2816 1.00000000000000e+00
+2817 2817 1.00000000000000e+00
+2818 2818 1.00000000000000e+00
+2819 2819 1.00000000000000e+00
+2820 2820 1.00000000000000e+00
+2821 2821 1.00000000000000e+00
+2822 2822 1.00000000000000e+00
+2823 2823 1.00000000000000e+00
+2824 2824 1.00000000000000e+00
+2825 2825 1.00000000000000e+00
+2826 2826 1.00000000000000e+00
+2827 2827 1.00000000000000e+00
+2828 2828 1.00000000000000e+00
+2829 2829 1.00000000000000e+00
+2830 2830 1.00000000000000e+00
+2831 2831 1.00000000000000e+00
+2832 2832 1.00000000000000e+00
+2833 2833 1.00000000000000e+00
+2834 2834 1.00000000000000e+00
+2835 2835 1.00000000000000e+00
+2836 2836 1.00000000000000e+00
+2837 2837 1.00000000000000e+00
+2838 2838 1.00000000000000e+00
+2839 2839 1.00000000000000e+00
+2840 2840 1.00000000000000e+00
+2841 2841 1.00000000000000e+00
+2842 2842 1.00000000000000e+00
+2843 2843 1.00000000000000e+00
+2844 2844 1.00000000000000e+00
+2845 2845 1.00000000000000e+00
+2846 2846 1.00000000000000e+00
+2847 2847 1.00000000000000e+00
+2848 2848 1.00000000000000e+00
+2849 2849 1.00000000000000e+00
+2850 2850 1.00000000000000e+00
+2851 2851 1.00000000000000e+00
+2852 2852 1.00000000000000e+00
+2853 2853 1.00000000000000e+00
+2854 2854 1.00000000000000e+00
+2855 2855 1.00000000000000e+00
+2856 2856 1.00000000000000e+00
+2857 2857 1.00000000000000e+00
+2858 2858 1.00000000000000e+00
+2859 2859 1.00000000000000e+00
+2860 2860 1.00000000000000e+00
+2861 2861 1.00000000000000e+00
+2862 2862 1.00000000000000e+00
+2863 2863 1.00000000000000e+00
+2864 2864 1.00000000000000e+00
+2865 2865 1.00000000000000e+00
+2866 2866 1.00000000000000e+00
+2867 2867 1.00000000000000e+00
+2868 2868 1.00000000000000e+00
+2869 2869 1.00000000000000e+00
+2870 2870 1.00000000000000e+00
+2871 2871 1.00000000000000e+00
+2872 2872 1.00000000000000e+00
+2873 2873 1.00000000000000e+00
+2874 2874 1.00000000000000e+00
+2875 2875 1.00000000000000e+00
+2876 2876 1.00000000000000e+00
+2877 2877 1.00000000000000e+00
+2878 2878 1.00000000000000e+00
+2879 2879 1.00000000000000e+00
+2880 2880 1.00000000000000e+00
+2881 2881 1.00000000000000e+00
+2882 2882 1.00000000000000e+00
+2883 2883 1.00000000000000e+00
+2884 2884 1.00000000000000e+00
+2885 2885 1.00000000000000e+00
+2886 2886 1.00000000000000e+00
+2887 2887 1.00000000000000e+00
+2888 2888 1.00000000000000e+00
+2889 2889 1.00000000000000e+00
+2890 2890 1.00000000000000e+00
+2891 2891 1.00000000000000e+00
+2892 2892 1.00000000000000e+00
+2893 2893 1.00000000000000e+00
+2894 2894 1.00000000000000e+00
+2895 2895 1.00000000000000e+00
+2896 2896 1.00000000000000e+00
+2897 2897 1.00000000000000e+00
+2898 2898 1.00000000000000e+00
+2899 2899 1.00000000000000e+00
+2900 2900 1.00000000000000e+00
+2901 2901 1.00000000000000e+00
+2902 2902 1.00000000000000e+00
+2903 2903 1.00000000000000e+00
+2904 2904 1.00000000000000e+00
+2905 2905 1.00000000000000e+00
+2906 2906 1.00000000000000e+00
+2907 2907 1.00000000000000e+00
+2908 2908 1.00000000000000e+00
+2909 2909 1.00000000000000e+00
+2910 2910 1.00000000000000e+00
+2911 2911 1.00000000000000e+00
+2912 2912 1.00000000000000e+00
+2913 2913 1.00000000000000e+00
+2914 2914 1.00000000000000e+00
+2915 2915 1.00000000000000e+00
+2916 2916 1.00000000000000e+00
+2917 2917 1.00000000000000e+00
+2918 2918 1.00000000000000e+00
+2919 2919 1.00000000000000e+00
+2920 2920 1.00000000000000e+00
+2921 2921 1.00000000000000e+00
+2922 2922 1.00000000000000e+00
+2923 2923 1.00000000000000e+00
+2924 2924 1.00000000000000e+00
+2925 2925 1.00000000000000e+00
+2926 2926 1.00000000000000e+00
+2927 2927 1.00000000000000e+00
+2928 2928 1.00000000000000e+00
+2929 2929 1.00000000000000e+00
+2930 2930 1.00000000000000e+00
+2931 2931 1.00000000000000e+00
+2932 2932 1.00000000000000e+00
+2933 2933 1.00000000000000e+00
+2934 2934 1.00000000000000e+00
+2935 2935 1.00000000000000e+00
+2936 2936 1.00000000000000e+00
+2937 2937 1.00000000000000e+00
+2938 2938 1.00000000000000e+00
+2939 2939 1.00000000000000e+00
+2940 2940 1.00000000000000e+00
+2941 2941 1.00000000000000e+00
+2942 2942 1.00000000000000e+00
+2943 2943 1.00000000000000e+00
+2944 2944 1.00000000000000e+00
+2945 2945 1.00000000000000e+00
+2946 2946 1.00000000000000e+00
+2947 2947 1.00000000000000e+00
+2948 2948 1.00000000000000e+00
+2949 2949 1.00000000000000e+00
+2950 2950 1.00000000000000e+00
+2951 2951 1.00000000000000e+00
+2952 2952 1.00000000000000e+00
+2953 2953 1.00000000000000e+00
+2954 2954 1.00000000000000e+00
+2955 2955 1.00000000000000e+00
+2956 2956 1.00000000000000e+00
+2957 2957 1.00000000000000e+00
+2958 2958 1.00000000000000e+00
+2959 2959 1.00000000000000e+00
+2960 2960 1.00000000000000e+00
+2961 2961 1.00000000000000e+00
+2962 2962 1.00000000000000e+00
+2963 2963 1.00000000000000e+00
+2964 2964 1.00000000000000e+00
+2965 2965 1.00000000000000e+00
+2966 2966 1.00000000000000e+00
+2967 2967 1.00000000000000e+00
+2968 2968 1.00000000000000e+00
+2969 2969 1.00000000000000e+00
+2970 2970 1.00000000000000e+00
+2971 2971 1.00000000000000e+00
+2972 2972 1.00000000000000e+00
+2973 2973 1.00000000000000e+00
+2974 2974 1.00000000000000e+00
+2975 2975 1.00000000000000e+00
+2976 2976 1.00000000000000e+00
+2977 2977 1.00000000000000e+00
+2978 2978 1.00000000000000e+00
+2979 2979 1.00000000000000e+00
+2980 2980 1.00000000000000e+00
+2981 2981 1.00000000000000e+00
+2982 2982 1.00000000000000e+00
+2983 2983 1.00000000000000e+00
+2984 2984 1.00000000000000e+00
+2985 2985 1.00000000000000e+00
+2986 2986 1.00000000000000e+00
+2987 2987 1.00000000000000e+00
+2988 2988 1.00000000000000e+00
+2989 2989 1.00000000000000e+00
+2990 2990 1.00000000000000e+00
+2991 2991 1.00000000000000e+00
+2992 2992 1.00000000000000e+00
+2993 2993 1.00000000000000e+00
+2994 2994 1.00000000000000e+00
+2995 2995 1.00000000000000e+00
+2996 2996 1.00000000000000e+00
+2997 2997 1.00000000000000e+00
+2998 2998 1.00000000000000e+00
+2999 2999 1.00000000000000e+00
+3000 3000 1.00000000000000e+00
+3001 3001 1.00000000000000e+00
+3002 3002 1.00000000000000e+00
+3003 3003 1.00000000000000e+00
+3004 3004 1.00000000000000e+00
+3005 3005 1.00000000000000e+00
+3006 3006 1.00000000000000e+00
+3007 3007 1.00000000000000e+00
+3008 3008 1.00000000000000e+00
+3009 3009 1.00000000000000e+00
+3010 3010 1.00000000000000e+00
+3011 3011 1.00000000000000e+00
+3012 3012 1.00000000000000e+00
+3013 3013 1.00000000000000e+00
+3014 3014 1.00000000000000e+00
+3015 3015 1.00000000000000e+00
+3016 3016 1.00000000000000e+00
+3017 3017 1.00000000000000e+00
+3018 3018 1.00000000000000e+00
+3019 3019 1.00000000000000e+00
+3020 3020 1.00000000000000e+00
+3021 3021 1.00000000000000e+00
+3022 3022 1.00000000000000e+00
+3023 3023 1.00000000000000e+00
+3024 3024 1.00000000000000e+00
+3025 3025 1.00000000000000e+00
+3026 3026 1.00000000000000e+00
+3027 3027 1.00000000000000e+00
+3028 3028 1.00000000000000e+00
+3029 3029 1.00000000000000e+00
+3030 3030 1.00000000000000e+00
+3031 3031 1.00000000000000e+00
+3032 3032 1.00000000000000e+00
+3033 3033 1.00000000000000e+00
+3034 3034 1.00000000000000e+00
+3035 3035 1.00000000000000e+00
+3036 3036 1.00000000000000e+00
+3037 3037 1.00000000000000e+00
+3038 3038 1.00000000000000e+00
+3039 3039 1.00000000000000e+00
+3040 3040 1.00000000000000e+00
+3041 3041 1.00000000000000e+00
+3042 3042 1.00000000000000e+00
+3043 3043 1.00000000000000e+00
+3044 3044 1.00000000000000e+00
+3045 3045 1.00000000000000e+00
+3046 3046 1.00000000000000e+00
+3047 3047 1.00000000000000e+00
+3048 3048 1.00000000000000e+00
+3049 3049 1.00000000000000e+00
+3050 3050 1.00000000000000e+00
+3051 3051 1.00000000000000e+00
+3052 3052 1.00000000000000e+00
+3053 3053 1.00000000000000e+00
+3054 3054 1.00000000000000e+00
+3055 3055 1.00000000000000e+00
+3056 3056 1.00000000000000e+00
+3057 3057 1.00000000000000e+00
+3058 3058 1.00000000000000e+00
+3059 3059 1.00000000000000e+00
+3060 3060 1.00000000000000e+00
+3061 3061 1.00000000000000e+00
+3062 3062 1.00000000000000e+00
+3063 3063 1.00000000000000e+00
+3064 3064 1.00000000000000e+00
+3065 3065 1.00000000000000e+00
+3066 3066 1.00000000000000e+00
+3067 3067 1.00000000000000e+00
+3068 3068 1.00000000000000e+00
+3069 3069 1.00000000000000e+00
+3070 3070 1.00000000000000e+00
+3071 3071 1.00000000000000e+00
+3072 3072 1.00000000000000e+00
+3073 3073 1.00000000000000e+00
+3074 3074 1.00000000000000e+00
+3075 3075 1.00000000000000e+00
+3076 3076 1.00000000000000e+00
+3077 3077 1.00000000000000e+00
+3078 3078 1.00000000000000e+00
+3079 3079 1.00000000000000e+00
+3080 3080 1.00000000000000e+00
+3081 3081 1.00000000000000e+00
+3082 3082 1.00000000000000e+00
+3083 3083 1.00000000000000e+00
+3084 3084 1.00000000000000e+00
+3085 3085 1.00000000000000e+00
+3086 3086 1.00000000000000e+00
+3087 3087 1.00000000000000e+00
+3088 3088 1.00000000000000e+00
+3089 3089 1.00000000000000e+00
+3090 3090 1.00000000000000e+00
+3091 3091 1.00000000000000e+00
+3092 3092 1.00000000000000e+00
+3093 3093 1.00000000000000e+00
+3094 3094 1.00000000000000e+00
+3095 3095 1.00000000000000e+00
+3096 3096 1.00000000000000e+00
+3097 3097 1.00000000000000e+00
+3098 3098 1.00000000000000e+00
+3099 3099 1.00000000000000e+00
+3100 3100 1.00000000000000e+00
+3101 3101 1.00000000000000e+00
+3102 3102 1.00000000000000e+00
+3103 3103 1.00000000000000e+00
+3104 3104 1.00000000000000e+00
+3105 3105 1.00000000000000e+00
+3106 3106 1.00000000000000e+00
+3107 3107 1.00000000000000e+00
+3108 3108 1.00000000000000e+00
+3109 3109 1.00000000000000e+00
+3110 3110 1.00000000000000e+00
+3111 3111 1.00000000000000e+00
+3112 3112 1.00000000000000e+00
+3113 3113 1.00000000000000e+00
+3114 3114 1.00000000000000e+00
+3115 3115 1.00000000000000e+00
+3116 3116 1.00000000000000e+00
+3117 3117 1.00000000000000e+00
+3118 3118 1.00000000000000e+00
+3119 3119 1.00000000000000e+00
+3120 3120 1.00000000000000e+00
+3121 3121 1.00000000000000e+00
+3122 3122 1.00000000000000e+00
+3123 3123 1.00000000000000e+00
+3124 3124 1.00000000000000e+00
+3125 3125 1.00000000000000e+00
+3126 3126 1.00000000000000e+00
+3127 3127 1.00000000000000e+00
+3128 3128 1.00000000000000e+00
+3129 3129 1.00000000000000e+00
+3130 3130 1.00000000000000e+00
+3131 3131 1.00000000000000e+00
+3132 3132 1.00000000000000e+00
+3133 3133 1.00000000000000e+00
+3134 3134 1.00000000000000e+00
+3135 3135 1.00000000000000e+00
+3136 3136 1.00000000000000e+00
+3137 3137 1.00000000000000e+00
+3138 3138 1.00000000000000e+00
+3139 3139 1.00000000000000e+00
+3140 3140 1.00000000000000e+00
+3141 3141 1.00000000000000e+00
+3142 3142 1.00000000000000e+00
+3143 3143 1.00000000000000e+00
+3144 3144 1.00000000000000e+00
+3145 3145 1.00000000000000e+00
+3146 3146 1.00000000000000e+00
+3147 3147 1.00000000000000e+00
+3148 3148 1.00000000000000e+00
+3149 3149 1.00000000000000e+00
+3150 3150 1.00000000000000e+00
+3151 3151 1.00000000000000e+00
+3152 3152 1.00000000000000e+00
+3153 3153 1.00000000000000e+00
+3154 3154 1.00000000000000e+00
+3155 3155 1.00000000000000e+00
+3156 3156 1.00000000000000e+00
+3157 3157 1.00000000000000e+00
+3158 3158 1.00000000000000e+00
+3159 3159 1.00000000000000e+00
+3160 3160 1.00000000000000e+00
+3161 3161 1.00000000000000e+00
+3162 3162 1.00000000000000e+00
+3163 3163 1.00000000000000e+00
+3164 3164 1.00000000000000e+00
+3165 3165 1.00000000000000e+00
+3166 3166 1.00000000000000e+00
+3167 3167 1.00000000000000e+00
+3168 3168 1.00000000000000e+00
+3169 3169 1.00000000000000e+00
+3170 3170 1.00000000000000e+00
+3171 3171 1.00000000000000e+00
+3172 3172 1.00000000000000e+00
+3173 3173 1.00000000000000e+00
+3174 3174 1.00000000000000e+00
+3175 3175 1.00000000000000e+00
+3176 3176 1.00000000000000e+00
+3177 3177 1.00000000000000e+00
+3178 3178 1.00000000000000e+00
+3179 3179 1.00000000000000e+00
+3180 3180 1.00000000000000e+00
+3181 3181 1.00000000000000e+00
+3182 3182 1.00000000000000e+00
+3183 3183 1.00000000000000e+00
+3184 3184 1.00000000000000e+00
+3185 3185 1.00000000000000e+00
+3186 3186 1.00000000000000e+00
+3187 3187 1.00000000000000e+00
+3188 3188 1.00000000000000e+00
+3189 3189 1.00000000000000e+00
+3190 3190 1.00000000000000e+00
+3191 3191 1.00000000000000e+00
+3192 3192 1.00000000000000e+00
+3193 3193 1.00000000000000e+00
+3194 3194 1.00000000000000e+00
+3195 3195 1.00000000000000e+00
+3196 3196 1.00000000000000e+00
+3197 3197 1.00000000000000e+00
+3198 3198 1.00000000000000e+00
+3199 3199 1.00000000000000e+00
+3200 3200 1.00000000000000e+00
+3201 3201 1.00000000000000e+00
+3202 3202 1.00000000000000e+00
+3203 3203 1.00000000000000e+00
+3204 3204 1.00000000000000e+00
+3205 3205 1.00000000000000e+00
+3206 3206 1.00000000000000e+00
+3207 3207 1.00000000000000e+00
+3208 3208 1.00000000000000e+00
+3209 3209 1.00000000000000e+00
+3210 3210 1.00000000000000e+00
+3211 3211 1.00000000000000e+00
+3212 3212 1.00000000000000e+00
+3213 3213 1.03178973644449e+00
+3213 2637 1.48846185431150e-02
+3213 2661 9.22890593949129e-03
+3213 2685 1.25052203376214e-06
+3213 3237 4.31840613477253e-01
+3213 3261 9.43953024244507e-02
+3213 3285 1.95371943844939e-04
+3213 3789 2.80088098136377e-06
+3213 3813 1.83378625356757e-01
+3213 3837 6.74357737899597e-01
+3213 3861 4.82735193069476e-02
+3213 3885 1.28664970767145e-04
+3213 4389 2.68083483975976e-05
+3213 4413 4.59222211420516e-02
+3213 4437 5.71113368287821e-02
+3213 4461 2.48600030779947e-03
+3213 4485 4.13083515611080e-07
+3213 4989 5.75738267860000e-09
+3213 5013 1.38667055159875e-04
+3213 5037 1.48757014544795e-04
+3213 5061 6.07076150326416e-06
+3213 15408 -4.39367443243404e-02
+3213 15432 -2.32563123210227e-02
+3213 15456 -3.67982902529272e-04
+3213 15816 -2.89759613634642e-01
+3213 15840 -1.54266916353445e-01
+3213 15864 -2.68203129603534e-03
+3213 16224 -5.14197856185744e-01
+3213 16248 -2.75622480796976e-01
+3213 16272 -5.29244362974372e-03
+3213 16632 -1.70854902386414e-01
+3213 16656 -9.08396678635010e-02
+3213 16680 -1.54634762008396e-03
+3213 17040 -1.42105665122835e-02
+3213 17064 -7.39950019853676e-03
+3213 17088 -8.40619835414269e-05
+3214 3214 1.00000000000000e+00
+3215 3215 1.00000000000000e+00
+3216 3216 1.00000000000000e+00
+3217 3217 1.00000000000000e+00
+3218 3218 1.00000000000000e+00
+3219 3219 1.00000000000000e+00
+3220 3220 1.00000000000000e+00
+3221 3221 1.00000000000000e+00
+3222 3222 1.00000000000000e+00
+3223 3223 1.00000000000000e+00
+3224 3224 1.00000000000000e+00
+3225 3225 1.00000000000000e+00
+3226 3226 1.00000000000000e+00
+3227 3227 1.00000000000000e+00
+3228 3228 1.00000000000000e+00
+3229 3229 1.00000000000000e+00
+3230 3230 1.00000000000000e+00
+3231 3231 1.00000000000000e+00
+3232 3232 1.00000000000000e+00
+3233 3233 1.00000000000000e+00
+3234 3234 1.00000000000000e+00
+3235 3235 1.00000000000000e+00
+3236 3236 1.00000000000000e+00
+3237 3237 2.09499843293971e+01
+3237 2037 1.06727575900903e-02
+3237 2061 4.36793967859312e-02
+3237 2085 2.13706456323183e-04
+3237 2637 2.93723459434132e+00
+3237 2661 4.64065275503838e+00
+3237 2685 1.27181616251688e-01
+3237 2709 1.74314569669890e-05
+3237 3213 4.31840613477253e-01
+3237 3261 1.09723187831806e+01
+3237 3285 2.82792704146781e-01
+3237 3309 2.53629710191405e-04
+3237 3789 5.22093285751312e-06
+3237 3813 1.35780839835569e+00
+3237 3837 9.91943451262241e+00
+3237 3861 3.09914208319462e+00
+3237 3885 1.15026971954077e-01
+3237 3909 1.55156966072355e-04
+3237 4389 4.99765527714196e-05
+3237 4413 1.56701631720264e-01
+3237 4437 3.98093749650465e-01
+3237 4461 1.02944973256480e-01
+3237 4485 5.91766666038560e-03
+3237 4509 1.80315251593800e-08
+3237 4989 1.07430315361200e-08
+3237 5013 2.73574244309960e-04
+3237 5037 3.73082498911609e-04
+3237 5061 1.72881141110555e-04
+3237 5085 1.78071334005430e-05
+3237 15000 -1.27202318270220e+00
+3237 15024 -8.20147575343321e-01
+3237 15048 -5.34115908914601e-02
+3237 15072 -2.15737240607034e-04
+3237 15408 -7.86715197249462e+00
+3237 15432 -5.11981516898454e+00
+3237 15456 -3.64114134599591e-01
+3237 15480 -6.78156064318102e-03
+3237 15816 -1.47080981867762e+01
+3237 15840 -1.01045841424138e+01
+3237 15864 -8.81159512977690e-01
+3237 15888 -2.56556343381720e-02
+3237 16224 -6.70591694751832e+00
+3237 16248 -4.52174059881932e+00
+3237 16272 -3.82150713253347e-01
+3237 16296 -1.29804131789667e-02
+3237 16632 -9.84383496535956e-01
+3237 16656 -6.32999049357043e-01
+3237 16680 -4.67880445595028e-02
+3237 16704 -1.76545037455345e-03
+3237 17040 -2.65905112531984e-02
+3237 17064 -1.42217084326021e-02
+3237 17088 -2.64700801715131e-04
+3238 3238 1.00000000000000e+00
+3239 3239 1.00000000000000e+00
+3240 3240 1.00000000000000e+00
+3241 3241 1.00000000000000e+00
+3242 3242 1.00000000000000e+00
+3243 3243 1.00000000000000e+00
+3244 3244 1.00000000000000e+00
+3245 3245 1.00000000000000e+00
+3246 3246 1.00000000000000e+00
+3247 3247 1.00000000000000e+00
+3248 3248 1.00000000000000e+00
+3249 3249 1.00000000000000e+00
+3250 3250 1.00000000000000e+00
+3251 3251 1.00000000000000e+00
+3252 3252 1.00000000000000e+00
+3253 3253 1.00000000000000e+00
+3254 3254 1.00000000000000e+00
+3255 3255 1.00000000000000e+00
+3256 3256 1.00000000000000e+00
+3257 3257 1.00000000000000e+00
+3258 3258 1.00000000000000e+00
+3259 3259 1.00000000000000e+00
+3260 3260 1.00000000000000e+00
+3261 3261 1.87919716657741e+01
+3261 2037 2.33776633015668e-02
+3261 2061 1.30411080783781e-01
+3261 2085 2.07534537618295e-03
+3261 2637 3.18335899755208e+00
+3261 2661 1.07535791920085e+01
+3261 2685 3.15491505639718e+00
+3261 2709 1.02332936929997e-01
+3261 2733 2.22990279934000e-09
+3261 3213 9.43953024244507e-02
+3261 3237 1.09723187831806e+01
+3261 3285 7.14083795988865e+00
+3261 3309 4.95673214491780e-01
+3261 3333 3.47698256597022e-04
+3261 3789 1.31921271842000e-09
+3261 3813 1.48862480810996e-01
+3261 3837 3.76737230205419e+00
+3261 3861 6.98081283453296e+00
+3261 3885 2.68222047618842e+00
+3261 3909 9.86337930065479e-02
+3261 3933 1.59825900986147e-04
+3261 4389 1.26524962030200e-08
+3261 4413 8.22857654823530e-03
+3261 4437 1.06494160843870e-01
+3261 4461 3.44526895845680e-01
+3261 4485 1.65476629083131e-01
+3261 4509 7.60696239971773e-03
+3261 4989 2.76977475000000e-12
+3261 5013 1.44369951344170e-07
+3261 5037 4.77661153452631e-05
+3261 5061 8.42968691652808e-04
+3261 5085 1.53185448900642e-04
+3261 5109 2.13656657686153e-06
+3261 15000 -2.77159021881337e+00
+3261 15024 -5.32072509956956e+00
+3261 15048 -3.43113164804828e+00
+3261 15072 -6.50483221529800e-01
+3261 15096 -7.88146601817142e-03
+3261 15408 -8.54372163120853e+00
+3261 15432 -1.13396010740793e+01
+3261 15456 -5.66071931761898e+00
+3261 15480 -1.10367230428952e+00
+3261 15504 -3.30507753107728e-02
+3261 15816 -7.14013593441134e+00
+3261 15840 -9.88798952076251e+00
+3261 15864 -5.27654274785870e+00
+3261 15888 -1.07744492518077e+00
+3261 15912 -3.82846590392059e-02
+3261 16224 -1.63815643084325e+00
+3261 16248 -2.39548250059446e+00
+3261 16272 -1.32287667106862e+00
+3261 16296 -2.65653515247310e-01
+3261 16320 -8.24395122984949e-03
+3261 16632 -7.14390121570557e-02
+3261 16656 -1.07496598483682e-01
+3261 16680 -5.51496939522471e-02
+3261 16704 -9.50245677540159e-03
+3261 16728 -4.71154979898933e-05
+3261 17040 -7.22506791617707e-06
+3261 17064 -5.73103372691874e-06
+3261 17088 -6.05285648237200e-07
+3262 3262 1.00000000000000e+00
+3263 3263 1.00000000000000e+00
+3264 3264 1.00000000000000e+00
+3265 3265 1.00000000000000e+00
+3266 3266 1.00000000000000e+00
+3267 3267 1.00000000000000e+00
+3268 3268 1.00000000000000e+00
+3269 3269 1.00000000000000e+00
+3270 3270 1.00000000000000e+00
+3271 3271 1.00000000000000e+00
+3272 3272 1.00000000000000e+00
+3273 3273 1.00000000000000e+00
+3274 3274 1.00000000000000e+00
+3275 3275 1.00000000000000e+00
+3276 3276 1.00000000000000e+00
+3277 3277 1.00000000000000e+00
+3278 3278 1.00000000000000e+00
+3279 3279 1.00000000000000e+00
+3280 3280 1.00000000000000e+00
+3281 3281 1.00000000000000e+00
+3282 3282 1.00000000000000e+00
+3283 3283 1.00000000000000e+00
+3284 3284 1.00000000000000e+00
+3285 3285 2.74181977528582e+01
+3285 2037 2.79091754131915e-03
+3285 2061 3.06976858560456e-02
+3285 2085 1.07228177540026e-03
+3285 2637 1.45416647043228e-01
+3285 2661 4.49687532095990e+00
+3285 2685 9.52331039881100e+00
+3285 2709 9.54978556178009e-01
+3285 2733 1.47101733658933e-06
+3285 3213 1.95371943844939e-04
+3285 3237 2.82792704146781e-01
+3285 3261 7.14083795988865e+00
+3285 3309 9.78199297230538e+00
+3285 3333 2.74929435139289e-01
+3285 3357 4.17426610680257e-06
+3285 3813 2.39044322190814e-04
+3285 3837 1.37148490235047e-01
+3285 3861 2.64884504318002e+00
+3285 3885 5.96431524939480e+00
+3285 3909 3.14714061325156e+00
+3285 3933 2.50073467614360e-01
+3285 3957 6.16672890543066e-06
+3285 4413 5.17228162006518e-06
+3285 4437 3.82984705123397e-03
+3285 4461 1.58330381854041e-01
+3285 4485 3.90074702897613e-01
+3285 4509 1.10751375218815e-01
+3285 4533 5.34094459172507e-03
+3285 4557 1.50853894583000e-09
+3285 5037 3.03133255660104e-06
+3285 5061 7.51344158719152e-05
+3285 5085 2.31229553062047e-04
+3285 5109 3.60350842428249e-04
+3285 5133 1.89409891545966e-06
+3285 5157 2.19544460000000e-13
+3285 15000 -5.40869660850670e-01
+3285 15024 -5.62748706111379e+00
+3285 15048 -1.60834728731331e+01
+3285 15072 -9.31757742472425e+00
+3285 15096 -1.94760161133873e+00
+3285 15120 -1.34062314544309e-01
+3285 15144 -6.63024342517000e-09
+3285 15408 -4.98997919341108e-01
+3285 15432 -4.72007968522738e+00
+3285 15456 -1.32830061635956e+01
+3285 15480 -9.03319033806758e+00
+3285 15504 -1.99097178969350e+00
+3285 15528 -1.16854240285122e-01
+3285 15552 -2.84816028581600e-08
+3285 15816 -1.11494712416163e-01
+3285 15840 -1.13078752502025e+00
+3285 15864 -3.33774787695725e+00
+3285 15888 -2.41236416441363e+00
+3285 15912 -5.06189018822970e-01
+3285 15936 -2.09752511183678e-02
+3285 15960 -1.44727600551000e-08
+3285 16224 -1.25654930568486e-02
+3285 16248 -1.60508309066097e-01
+3285 16272 -5.04462076015912e-01
+3285 16296 -3.15687715384813e-01
+3285 16320 -5.81648819907583e-02
+3285 16344 -1.81463814625538e-03
+3285 16368 -1.96062915748000e-09
+3285 16632 -3.47011381079172e-05
+3285 16656 -7.25522370285966e-04
+3285 16680 -2.41565249248580e-03
+3285 16704 -7.23038149697060e-04
+3285 16728 -3.40800829606908e-05
+3286 3286 1.00000000000000e+00
+3287 3287 1.00000000000000e+00
+3288 3288 1.00000000000000e+00
+3289 3289 1.00000000000000e+00
+3290 3290 1.00000000000000e+00
+3291 3291 1.00000000000000e+00
+3292 3292 1.00000000000000e+00
+3293 3293 1.00000000000000e+00
+3294 3294 1.00000000000000e+00
+3295 3295 1.00000000000000e+00
+3296 3296 1.00000000000000e+00
+3297 3297 1.00000000000000e+00
+3298 3298 1.00000000000000e+00
+3299 3299 1.00000000000000e+00
+3300 3300 1.00000000000000e+00
+3301 3301 1.00000000000000e+00
+3302 3302 1.00000000000000e+00
+3303 3303 1.00000000000000e+00
+3304 3304 1.00000000000000e+00
+3305 3305 1.00000000000000e+00
+3306 3306 1.00000000000000e+00
+3307 3307 1.00000000000000e+00
+3308 3308 1.00000000000000e+00
+3309 3309 2.13447489157978e+01
+3309 2037 2.84965056096460e-07
+3309 2061 3.44776521549161e-06
+3309 2085 1.28205453431010e-07
+3309 2637 8.82040844097354e-06
+3309 2661 2.76648894908239e-01
+3309 2685 1.82785208832563e+00
+3309 2709 5.82260908100780e-01
+3309 2733 4.40213679917619e-06
+3309 3237 2.53629710191405e-04
+3309 3261 4.95673214491780e-01
+3309 3285 9.78199297230538e+00
+3309 3333 4.34538569436140e+00
+3309 3357 1.55949680715273e-02
+3309 3837 2.94496133374683e-04
+3309 3861 1.04720627674970e-01
+3309 3885 2.68265796979801e+00
+3309 3909 1.12062297642624e+01
+3309 3933 5.44645677899667e+00
+3309 3957 1.33556506834827e-01
+3309 3981 2.00195419374276e-06
+3309 4437 7.44503075326017e-06
+3309 4461 7.20183881084101e-03
+3309 4485 9.51566419059972e-02
+3309 4509 2.61946729281432e-01
+3309 4533 1.18442951526062e-01
+3309 4557 8.70653938089605e-03
+3309 4581 1.18392864123259e-06
+3309 5061 2.19087640160000e-10
+3309 5085 1.93604114647185e-04
+3309 5109 4.72542549108676e-04
+3309 5133 6.44276186536676e-05
+3309 5157 6.93965276951370e-07
+3309 5181 1.81280000000000e-16
+3309 15000 -5.68909072862895e-05
+3309 15024 -5.03800392544225e-01
+3309 15048 -3.99767481908073e+00
+3309 15072 -1.13558941478981e+01
+3309 15096 -1.38577901086792e+01
+3309 15120 -3.71267255158997e+00
+3309 15144 -1.98570423981024e-01
+3309 15168 -4.16008843137181e-05
+3309 15408 -2.91886673369857e-05
+3309 15432 -2.98294215297016e-01
+3309 15456 -2.68385561620018e+00
+3309 15480 -8.06189223988929e+00
+3309 15504 -8.81234700362064e+00
+3309 15528 -2.29622406868491e+00
+3309 15552 -1.24352589445774e-01
+3309 15576 -2.89818847393746e-05
+3309 15816 -2.12346769668850e-07
+3309 15840 -1.46556642943468e-02
+3309 15864 -2.26898724073114e-01
+3309 15888 -7.93553797255192e-01
+3309 15912 -5.98577294457400e-01
+3309 15936 -1.34464897613046e-01
+3309 15960 -7.17949674489180e-03
+3309 15984 -2.33755502357587e-06
+3309 16248 -3.76985077331550e-04
+3309 16272 -8.39440981508346e-03
+3309 16296 -3.02687018809989e-02
+3309 16320 -1.62745062553764e-02
+3309 16344 -2.36456528890254e-03
+3309 16368 -4.68162706606915e-06
+3310 3310 1.00000000000000e+00
+3311 3311 1.00000000000000e+00
+3312 3312 1.00000000000000e+00
+3313 3313 1.00000000000000e+00
+3314 3314 1.00000000000000e+00
+3315 3315 1.00000000000000e+00
+3316 3316 1.00000000000000e+00
+3317 3317 1.00000000000000e+00
+3318 3318 1.00000000000000e+00
+3319 3319 1.00000000000000e+00
+3320 3320 1.00000000000000e+00
+3321 3321 1.00000000000000e+00
+3322 3322 1.00000000000000e+00
+3323 3323 1.00000000000000e+00
+3324 3324 1.00000000000000e+00
+3325 3325 1.00000000000000e+00
+3326 3326 1.00000000000000e+00
+3327 3327 1.00000000000000e+00
+3328 3328 1.00000000000000e+00
+3329 3329 1.00000000000000e+00
+3330 3330 1.00000000000000e+00
+3331 3331 1.00000000000000e+00
+3332 3332 1.00000000000000e+00
+3333 3333 3.46517180999946e+00
+3333 2661 7.67643334023892e-06
+3333 2685 1.20671885798248e-02
+3333 2709 1.38154135506727e-02
+3333 2733 8.87085011605720e-07
+3333 3261 3.47698256597022e-04
+3333 3285 2.74929435139289e-01
+3333 3309 4.34538569436140e+00
+3333 3357 5.97228003931983e-02
+3333 3837 2.37500000000000e-16
+3333 3861 2.33188526392932e-04
+3333 3885 1.36090564095540e-01
+3333 3909 3.62600246314894e+00
+3333 3933 5.54000696248019e+00
+3333 3957 7.56157576803354e-01
+3333 3981 3.63532297866516e-03
+3333 4005 5.45496585000000e-12
+3333 4437 1.61450000000000e-16
+3333 4461 1.65821052232080e-07
+3333 4485 4.58947816494336e-03
+3333 4509 8.90814666278429e-02
+3333 4533 2.74020269122421e-01
+3333 4557 1.27588687451478e-01
+3333 4581 2.12411346181340e-03
+3333 4605 1.51028246000000e-11
+3333 5061 7.79578600000000e-14
+3333 5085 2.46575223213150e-07
+3333 5109 2.27667645083760e-05
+3333 5133 4.39095393213610e-04
+3333 5157 2.13322127890800e-04
+3333 5181 1.55053844990900e-08
+3333 5757 4.20640000000000e-16
+3333 5781 1.50650000000000e-16
+3333 15048 -3.24275802740584e-02
+3333 15072 -1.19951607928587e+00
+3333 15096 -5.00898442642425e+00
+3333 15120 -3.93265630313742e+00
+3333 15144 -9.91396379203770e-01
+3333 15168 -7.35208925300189e-02
+3333 15192 -1.40028719608417e-06
+3333 15456 -1.86238563130756e-02
+3333 15480 -6.70418245275486e-01
+3333 15504 -2.79768642905903e+00
+3333 15528 -2.21730298722634e+00
+3333 15552 -5.54951980889222e-01
+3333 15576 -3.98978040899699e-02
+3333 15600 -7.01874925208510e-07
+3333 15864 -6.88591247467974e-04
+3333 15888 -2.01988474371420e-02
+3333 15912 -8.38121177760752e-02
+3333 15936 -7.17232553767070e-02
+3333 15960 -1.69311411195082e-02
+3333 15984 -8.96387949988693e-04
+3333 16008 -4.94664904690000e-10
+3333 16272 -2.45391655890000e-10
+3333 16296 -2.75079980372742e-06
+3333 16320 -1.13997207202415e-05
+3333 16344 -4.35062775778430e-06
+3333 16368 -4.00202380170110e-07
+3334 3334 1.00000000000000e+00
+3335 3335 1.00000000000000e+00
+3336 3336 1.00000000000000e+00
+3337 3337 1.00000000000000e+00
+3338 3338 1.00000000000000e+00
+3339 3339 1.00000000000000e+00
+3340 3340 1.00000000000000e+00
+3341 3341 1.00000000000000e+00
+3342 3342 1.00000000000000e+00
+3343 3343 1.00000000000000e+00
+3344 3344 1.00000000000000e+00
+3345 3345 1.00000000000000e+00
+3346 3346 1.00000000000000e+00
+3347 3347 1.00000000000000e+00
+3348 3348 1.00000000000000e+00
+3349 3349 1.00000000000000e+00
+3350 3350 1.00000000000000e+00
+3351 3351 1.00000000000000e+00
+3352 3352 1.00000000000000e+00
+3353 3353 1.00000000000000e+00
+3354 3354 1.00000000000000e+00
+3355 3355 1.00000000000000e+00
+3356 3356 1.00000000000000e+00
+3357 3357 1.00509671531337e+00
+3357 2685 2.60784759250900e-08
+3357 2709 1.47384460888300e-07
+3357 2733 2.16381754700000e-11
+3357 3285 4.17426610680256e-06
+3357 3309 1.55949680715273e-02
+3357 3333 5.97228003931983e-02
+3357 3861 3.85400000000000e-17
+3357 3885 6.61673559220368e-06
+3357 3909 3.70617261712393e-02
+3357 3933 3.02172057297916e-01
+3357 3957 1.57248436422912e-01
+3357 3981 1.67498720578745e-03
+3357 4005 1.57623610900000e-11
+3357 4461 6.35000000000000e-18
+3357 4485 3.07268247464825e-06
+3357 4509 1.60503283768704e-03
+3357 4533 3.21160075323181e-02
+3357 4557 4.60996910959770e-02
+3357 4581 9.81314367921115e-04
+3357 4605 4.36402672700000e-11
+3357 5109 1.32826164813375e-06
+3357 5133 1.00310287655638e-04
+3357 5157 6.26332162683865e-05
+3357 5181 4.47785888509600e-08
+3357 5757 1.17839000000000e-15
+3357 5781 4.22030000000000e-16
+3357 15072 -2.68177621415981e-05
+3357 15096 -3.79506224605989e-02
+3357 15120 -1.85121313218595e-01
+3357 15144 -1.72731756794418e-01
+3357 15168 -3.37372744046849e-02
+3357 15192 -4.04614909029325e-06
+3357 15480 -1.35540959531497e-05
+3357 15504 -2.00238148159727e-02
+3357 15528 -9.76740571612998e-02
+3357 15552 -9.11000637037561e-02
+3357 15576 -1.77902210357923e-02
+3357 15600 -2.02792477156880e-06
+3357 15888 -4.14899663859000e-08
+3357 15912 -2.99572453049507e-04
+3357 15936 -1.46097158628630e-03
+3357 15960 -1.35262437329919e-03
+3357 15984 -2.63309666699972e-04
+3357 16008 -1.38577897776000e-09
+3358 3358 1.00000000000000e+00
+3359 3359 1.00000000000000e+00
+3360 3360 1.00000000000000e+00
+3361 3361 1.00000000000000e+00
+3362 3362 1.00000000000000e+00
+3363 3363 1.00000000000000e+00
+3364 3364 1.00000000000000e+00
+3365 3365 1.00000000000000e+00
+3366 3366 1.00000000000000e+00
+3367 3367 1.00000000000000e+00
+3368 3368 1.00000000000000e+00
+3369 3369 1.00000000000000e+00
+3370 3370 1.00000000000000e+00
+3371 3371 1.00000000000000e+00
+3372 3372 1.00000000000000e+00
+3373 3373 1.00000000000000e+00
+3374 3374 1.00000000000000e+00
+3375 3375 1.00000000000000e+00
+3376 3376 1.00000000000000e+00
+3377 3377 1.00000000000000e+00
+3378 3378 1.00000000000000e+00
+3379 3379 1.00000000000000e+00
+3380 3380 1.00000000000000e+00
+3381 3381 1.00000000000000e+00
+3382 3382 1.00000000000000e+00
+3383 3383 1.00000000000000e+00
+3384 3384 1.00000000000000e+00
+3385 3385 1.00000000000000e+00
+3386 3386 1.00000000000000e+00
+3387 3387 1.00000000000000e+00
+3388 3388 1.00000000000000e+00
+3389 3389 1.00000000000000e+00
+3390 3390 1.00000000000000e+00
+3391 3391 1.00000000000000e+00
+3392 3392 1.00000000000000e+00
+3393 3393 1.00000000000000e+00
+3394 3394 1.00000000000000e+00
+3395 3395 1.00000000000000e+00
+3396 3396 1.00000000000000e+00
+3397 3397 1.00000000000000e+00
+3398 3398 1.00000000000000e+00
+3399 3399 1.00000000000000e+00
+3400 3400 1.00000000000000e+00
+3401 3401 1.00000000000000e+00
+3402 3402 1.00000000000000e+00
+3403 3403 1.00000000000000e+00
+3404 3404 1.00000000000000e+00
+3405 3405 1.00000000000000e+00
+3406 3406 1.00000000000000e+00
+3407 3407 1.00000000000000e+00
+3408 3408 1.00000000000000e+00
+3409 3409 1.00000000000000e+00
+3410 3410 1.00000000000000e+00
+3411 3411 1.00000000000000e+00
+3412 3412 1.00000000000000e+00
+3413 3413 1.00000000000000e+00
+3414 3414 1.00000000000000e+00
+3415 3415 1.00000000000000e+00
+3416 3416 1.00000000000000e+00
+3417 3417 1.00000000000000e+00
+3418 3418 1.00000000000000e+00
+3419 3419 1.00000000000000e+00
+3420 3420 1.00000000000000e+00
+3421 3421 1.00000000000000e+00
+3422 3422 1.00000000000000e+00
+3423 3423 1.00000000000000e+00
+3424 3424 1.00000000000000e+00
+3425 3425 1.00000000000000e+00
+3426 3426 1.00000000000000e+00
+3427 3427 1.00000000000000e+00
+3428 3428 1.00000000000000e+00
+3429 3429 1.00000000000000e+00
+3430 3430 1.00000000000000e+00
+3431 3431 1.00000000000000e+00
+3432 3432 1.00000000000000e+00
+3433 3433 1.00000000000000e+00
+3434 3434 1.00000000000000e+00
+3435 3435 1.00000000000000e+00
+3436 3436 1.00000000000000e+00
+3437 3437 1.00000000000000e+00
+3438 3438 1.00000000000000e+00
+3439 3439 1.00000000000000e+00
+3440 3440 1.00000000000000e+00
+3441 3441 1.00000000000000e+00
+3442 3442 1.00000000000000e+00
+3443 3443 1.00000000000000e+00
+3444 3444 1.00000000000000e+00
+3445 3445 1.00000000000000e+00
+3446 3446 1.00000000000000e+00
+3447 3447 1.00000000000000e+00
+3448 3448 1.00000000000000e+00
+3449 3449 1.00000000000000e+00
+3450 3450 1.00000000000000e+00
+3451 3451 1.00000000000000e+00
+3452 3452 1.00000000000000e+00
+3453 3453 1.00000000000000e+00
+3454 3454 1.00000000000000e+00
+3455 3455 1.00000000000000e+00
+3456 3456 1.00000000000000e+00
+3457 3457 1.00000000000000e+00
+3458 3458 1.00000000000000e+00
+3459 3459 1.00000000000000e+00
+3460 3460 1.00000000000000e+00
+3461 3461 1.00000000000000e+00
+3462 3462 1.00000000000000e+00
+3463 3463 1.00000000000000e+00
+3464 3464 1.00000000000000e+00
+3465 3465 1.00000000000000e+00
+3466 3466 1.00000000000000e+00
+3467 3467 1.00000000000000e+00
+3468 3468 1.00000000000000e+00
+3469 3469 1.00000000000000e+00
+3470 3470 1.00000000000000e+00
+3471 3471 1.00000000000000e+00
+3472 3472 1.00000000000000e+00
+3473 3473 1.00000000000000e+00
+3474 3474 1.00000000000000e+00
+3475 3475 1.00000000000000e+00
+3476 3476 1.00000000000000e+00
+3477 3477 1.00000000000000e+00
+3478 3478 1.00000000000000e+00
+3479 3479 1.00000000000000e+00
+3480 3480 1.00000000000000e+00
+3481 3481 1.00000000000000e+00
+3482 3482 1.00000000000000e+00
+3483 3483 1.00000000000000e+00
+3484 3484 1.00000000000000e+00
+3485 3485 1.00000000000000e+00
+3486 3486 1.00000000000000e+00
+3487 3487 1.00000000000000e+00
+3488 3488 1.00000000000000e+00
+3489 3489 1.00000000000000e+00
+3490 3490 1.00000000000000e+00
+3491 3491 1.00000000000000e+00
+3492 3492 1.00000000000000e+00
+3493 3493 1.00000000000000e+00
+3494 3494 1.00000000000000e+00
+3495 3495 1.00000000000000e+00
+3496 3496 1.00000000000000e+00
+3497 3497 1.00000000000000e+00
+3498 3498 1.00000000000000e+00
+3499 3499 1.00000000000000e+00
+3500 3500 1.00000000000000e+00
+3501 3501 1.00000000000000e+00
+3502 3502 1.00000000000000e+00
+3503 3503 1.00000000000000e+00
+3504 3504 1.00000000000000e+00
+3505 3505 1.00000000000000e+00
+3506 3506 1.00000000000000e+00
+3507 3507 1.00000000000000e+00
+3508 3508 1.00000000000000e+00
+3509 3509 1.00000000000000e+00
+3510 3510 1.00000000000000e+00
+3511 3511 1.00000000000000e+00
+3512 3512 1.00000000000000e+00
+3513 3513 1.00000000000000e+00
+3514 3514 1.00000000000000e+00
+3515 3515 1.00000000000000e+00
+3516 3516 1.00000000000000e+00
+3517 3517 1.00000000000000e+00
+3518 3518 1.00000000000000e+00
+3519 3519 1.00000000000000e+00
+3520 3520 1.00000000000000e+00
+3521 3521 1.00000000000000e+00
+3522 3522 1.00000000000000e+00
+3523 3523 1.00000000000000e+00
+3524 3524 1.00000000000000e+00
+3525 3525 1.00000000000000e+00
+3526 3526 1.00000000000000e+00
+3527 3527 1.00000000000000e+00
+3528 3528 1.00000000000000e+00
+3529 3529 1.00000000000000e+00
+3530 3530 1.00000000000000e+00
+3531 3531 1.00000000000000e+00
+3532 3532 1.00000000000000e+00
+3533 3533 1.00000000000000e+00
+3534 3534 1.00000000000000e+00
+3535 3535 1.00000000000000e+00
+3536 3536 1.00000000000000e+00
+3537 3537 1.00000000000000e+00
+3538 3538 1.00000000000000e+00
+3539 3539 1.00000000000000e+00
+3540 3540 1.00000000000000e+00
+3541 3541 1.00000000000000e+00
+3542 3542 1.00000000000000e+00
+3543 3543 1.00000000000000e+00
+3544 3544 1.00000000000000e+00
+3545 3545 1.00000000000000e+00
+3546 3546 1.00000000000000e+00
+3547 3547 1.00000000000000e+00
+3548 3548 1.00000000000000e+00
+3549 3549 1.00000000000000e+00
+3550 3550 1.00000000000000e+00
+3551 3551 1.00000000000000e+00
+3552 3552 1.00000000000000e+00
+3553 3553 1.00000000000000e+00
+3554 3554 1.00000000000000e+00
+3555 3555 1.00000000000000e+00
+3556 3556 1.00000000000000e+00
+3557 3557 1.00000000000000e+00
+3558 3558 1.00000000000000e+00
+3559 3559 1.00000000000000e+00
+3560 3560 1.00000000000000e+00
+3561 3561 1.00000000000000e+00
+3562 3562 1.00000000000000e+00
+3563 3563 1.00000000000000e+00
+3564 3564 1.00000000000000e+00
+3565 3565 1.00000000000000e+00
+3566 3566 1.00000000000000e+00
+3567 3567 1.00000000000000e+00
+3568 3568 1.00000000000000e+00
+3569 3569 1.00000000000000e+00
+3570 3570 1.00000000000000e+00
+3571 3571 1.00000000000000e+00
+3572 3572 1.00000000000000e+00
+3573 3573 1.00000000000000e+00
+3574 3574 1.00000000000000e+00
+3575 3575 1.00000000000000e+00
+3576 3576 1.00000000000000e+00
+3577 3577 1.00000000000000e+00
+3578 3578 1.00000000000000e+00
+3579 3579 1.00000000000000e+00
+3580 3580 1.00000000000000e+00
+3581 3581 1.00000000000000e+00
+3582 3582 1.00000000000000e+00
+3583 3583 1.00000000000000e+00
+3584 3584 1.00000000000000e+00
+3585 3585 1.00000000000000e+00
+3586 3586 1.00000000000000e+00
+3587 3587 1.00000000000000e+00
+3588 3588 1.00000000000000e+00
+3589 3589 1.00000000000000e+00
+3590 3590 1.00000000000000e+00
+3591 3591 1.00000000000000e+00
+3592 3592 1.00000000000000e+00
+3593 3593 1.00000000000000e+00
+3594 3594 1.00000000000000e+00
+3595 3595 1.00000000000000e+00
+3596 3596 1.00000000000000e+00
+3597 3597 1.00000000000000e+00
+3598 3598 1.00000000000000e+00
+3599 3599 1.00000000000000e+00
+3600 3600 1.00000000000000e+00
+3601 3601 1.00000000000000e+00
+3602 3602 1.00000000000000e+00
+3603 3603 1.00000000000000e+00
+3604 3604 1.00000000000000e+00
+3605 3605 1.00000000000000e+00
+3606 3606 1.00000000000000e+00
+3607 3607 1.00000000000000e+00
+3608 3608 1.00000000000000e+00
+3609 3609 1.00000000000000e+00
+3610 3610 1.00000000000000e+00
+3611 3611 1.00000000000000e+00
+3612 3612 1.00000000000000e+00
+3613 3613 1.00000000000000e+00
+3614 3614 1.00000000000000e+00
+3615 3615 1.00000000000000e+00
+3616 3616 1.00000000000000e+00
+3617 3617 1.00000000000000e+00
+3618 3618 1.00000000000000e+00
+3619 3619 1.00000000000000e+00
+3620 3620 1.00000000000000e+00
+3621 3621 1.00000000000000e+00
+3622 3622 1.00000000000000e+00
+3623 3623 1.00000000000000e+00
+3624 3624 1.00000000000000e+00
+3625 3625 1.00000000000000e+00
+3626 3626 1.00000000000000e+00
+3627 3627 1.00000000000000e+00
+3628 3628 1.00000000000000e+00
+3629 3629 1.00000000000000e+00
+3630 3630 1.00000000000000e+00
+3631 3631 1.00000000000000e+00
+3632 3632 1.00000000000000e+00
+3633 3633 1.00000000000000e+00
+3634 3634 1.00000000000000e+00
+3635 3635 1.00000000000000e+00
+3636 3636 1.00000000000000e+00
+3637 3637 1.00000000000000e+00
+3638 3638 1.00000000000000e+00
+3639 3639 1.00000000000000e+00
+3640 3640 1.00000000000000e+00
+3641 3641 1.00000000000000e+00
+3642 3642 1.00000000000000e+00
+3643 3643 1.00000000000000e+00
+3644 3644 1.00000000000000e+00
+3645 3645 1.00000000000000e+00
+3646 3646 1.00000000000000e+00
+3647 3647 1.00000000000000e+00
+3648 3648 1.00000000000000e+00
+3649 3649 1.00000000000000e+00
+3650 3650 1.00000000000000e+00
+3651 3651 1.00000000000000e+00
+3652 3652 1.00000000000000e+00
+3653 3653 1.00000000000000e+00
+3654 3654 1.00000000000000e+00
+3655 3655 1.00000000000000e+00
+3656 3656 1.00000000000000e+00
+3657 3657 1.00000000000000e+00
+3658 3658 1.00000000000000e+00
+3659 3659 1.00000000000000e+00
+3660 3660 1.00000000000000e+00
+3661 3661 1.00000000000000e+00
+3662 3662 1.00000000000000e+00
+3663 3663 1.00000000000000e+00
+3664 3664 1.00000000000000e+00
+3665 3665 1.00000000000000e+00
+3666 3666 1.00000000000000e+00
+3667 3667 1.00000000000000e+00
+3668 3668 1.00000000000000e+00
+3669 3669 1.00000000000000e+00
+3670 3670 1.00000000000000e+00
+3671 3671 1.00000000000000e+00
+3672 3672 1.00000000000000e+00
+3673 3673 1.00000000000000e+00
+3674 3674 1.00000000000000e+00
+3675 3675 1.00000000000000e+00
+3676 3676 1.00000000000000e+00
+3677 3677 1.00000000000000e+00
+3678 3678 1.00000000000000e+00
+3679 3679 1.00000000000000e+00
+3680 3680 1.00000000000000e+00
+3681 3681 1.00000000000000e+00
+3682 3682 1.00000000000000e+00
+3683 3683 1.00000000000000e+00
+3684 3684 1.00000000000000e+00
+3685 3685 1.00000000000000e+00
+3686 3686 1.00000000000000e+00
+3687 3687 1.00000000000000e+00
+3688 3688 1.00000000000000e+00
+3689 3689 1.00000000000000e+00
+3690 3690 1.00000000000000e+00
+3691 3691 1.00000000000000e+00
+3692 3692 1.00000000000000e+00
+3693 3693 1.00000000000000e+00
+3694 3694 1.00000000000000e+00
+3695 3695 1.00000000000000e+00
+3696 3696 1.00000000000000e+00
+3697 3697 1.00000000000000e+00
+3698 3698 1.00000000000000e+00
+3699 3699 1.00000000000000e+00
+3700 3700 1.00000000000000e+00
+3701 3701 1.00000000000000e+00
+3702 3702 1.00000000000000e+00
+3703 3703 1.00000000000000e+00
+3704 3704 1.00000000000000e+00
+3705 3705 1.00000000000000e+00
+3706 3706 1.00000000000000e+00
+3707 3707 1.00000000000000e+00
+3708 3708 1.00000000000000e+00
+3709 3709 1.00000000000000e+00
+3710 3710 1.00000000000000e+00
+3711 3711 1.00000000000000e+00
+3712 3712 1.00000000000000e+00
+3713 3713 1.00000000000000e+00
+3714 3714 1.00000000000000e+00
+3715 3715 1.00000000000000e+00
+3716 3716 1.00000000000000e+00
+3717 3717 1.00000000000000e+00
+3718 3718 1.00000000000000e+00
+3719 3719 1.00000000000000e+00
+3720 3720 1.00000000000000e+00
+3721 3721 1.00000000000000e+00
+3722 3722 1.00000000000000e+00
+3723 3723 1.00000000000000e+00
+3724 3724 1.00000000000000e+00
+3725 3725 1.00000000000000e+00
+3726 3726 1.00000000000000e+00
+3727 3727 1.00000000000000e+00
+3728 3728 1.00000000000000e+00
+3729 3729 1.00000000000000e+00
+3730 3730 1.00000000000000e+00
+3731 3731 1.00000000000000e+00
+3732 3732 1.00000000000000e+00
+3733 3733 1.00000000000000e+00
+3734 3734 1.00000000000000e+00
+3735 3735 1.00000000000000e+00
+3736 3736 1.00000000000000e+00
+3737 3737 1.00000000000000e+00
+3738 3738 1.00000000000000e+00
+3739 3739 1.00000000000000e+00
+3740 3740 1.00000000000000e+00
+3741 3741 1.00000000000000e+00
+3742 3742 1.00000000000000e+00
+3743 3743 1.00000000000000e+00
+3744 3744 1.00000000000000e+00
+3745 3745 1.00000000000000e+00
+3746 3746 1.00000000000000e+00
+3747 3747 1.00000000000000e+00
+3748 3748 1.00000000000000e+00
+3749 3749 1.00000000000000e+00
+3750 3750 1.00000000000000e+00
+3751 3751 1.00000000000000e+00
+3752 3752 1.00000000000000e+00
+3753 3753 1.00000000000000e+00
+3754 3754 1.00000000000000e+00
+3755 3755 1.00000000000000e+00
+3756 3756 1.00000000000000e+00
+3757 3757 1.00000000000000e+00
+3758 3758 1.00000000000000e+00
+3759 3759 1.00000000000000e+00
+3760 3760 1.00000000000000e+00
+3761 3761 1.00000000000000e+00
+3762 3762 1.00000000000000e+00
+3763 3763 1.00000000000000e+00
+3764 3764 1.00000000000000e+00
+3765 3765 1.00000000000000e+00
+3766 3766 1.00000000000000e+00
+3767 3767 1.00000000000000e+00
+3768 3768 1.00000000000000e+00
+3769 3769 1.00000000000000e+00
+3770 3770 1.00000000000000e+00
+3771 3771 1.00000000000000e+00
+3772 3772 1.00000000000000e+00
+3773 3773 1.00000000000000e+00
+3774 3774 1.00000000000000e+00
+3775 3775 1.00000000000000e+00
+3776 3776 1.00000000000000e+00
+3777 3777 1.00000000000000e+00
+3778 3778 1.00000000000000e+00
+3779 3779 1.00000000000000e+00
+3780 3780 1.00000000000000e+00
+3781 3781 1.00000000000000e+00
+3782 3782 1.00000000000000e+00
+3783 3783 1.00000000000000e+00
+3784 3784 1.00000000000000e+00
+3785 3785 1.00000000000000e+00
+3786 3786 1.00000000000000e+00
+3787 3787 1.00000000000000e+00
+3788 3788 1.00000000000000e+00
+3789 3789 1.00000068632295e+00
+3789 3213 2.80088098136377e-06
+3789 3237 5.22093285751312e-06
+3789 3261 1.31921271842000e-09
+3789 3813 6.42960599027272e-04
+3789 3837 5.01825510064345e-04
+3789 3861 8.97612361523940e-07
+3789 4389 1.54671107146394e-04
+3789 4413 3.30908086177547e-03
+3789 4437 8.16320942124741e-04
+3789 4461 8.78103357304610e-07
+3789 4989 7.80904127106641e-05
+3789 5013 7.01132519780409e-04
+3789 5037 8.29054817407587e-05
+3789 5061 1.62635643746710e-07
+3789 5589 5.88890614340000e-09
+3789 5613 3.75230044358600e-08
+3789 5637 5.61618000186800e-08
+3789 5661 1.65361740000000e-13
+3789 6213 3.96000000000000e-17
+3789 6237 2.69600000000000e-17
+3789 16224 -1.67620106534635e-04
+3789 16248 -8.45132164331546e-05
+3789 16272 -2.00903761667800e-07
+3789 16632 -1.19673275115655e-03
+3789 16656 -6.07278449815367e-04
+3789 16680 -2.54630692488353e-06
+3789 17040 -2.27267444385334e-03
+3789 17064 -1.16143813803570e-03
+3789 17088 -7.17169031686446e-06
+3789 17448 -5.26432474004659e-04
+3789 17472 -2.69315925168935e-04
+3789 17496 -1.74276804760170e-06
+3789 17856 -4.50372466621900e-08
+3789 17880 -2.25852715468000e-08
+3789 17904 -1.90423473400000e-11
+3790 3790 1.00000000000000e+00
+3791 3791 1.00000000000000e+00
+3792 3792 1.00000000000000e+00
+3793 3793 1.00000000000000e+00
+3794 3794 1.00000000000000e+00
+3795 3795 1.00000000000000e+00
+3796 3796 1.00000000000000e+00
+3797 3797 1.00000000000000e+00
+3798 3798 1.00000000000000e+00
+3799 3799 1.00000000000000e+00
+3800 3800 1.00000000000000e+00
+3801 3801 1.00000000000000e+00
+3802 3802 1.00000000000000e+00
+3803 3803 1.00000000000000e+00
+3804 3804 1.00000000000000e+00
+3805 3805 1.00000000000000e+00
+3806 3806 1.00000000000000e+00
+3807 3807 1.00000000000000e+00
+3808 3808 1.00000000000000e+00
+3809 3809 1.00000000000000e+00
+3810 3810 1.00000000000000e+00
+3811 3811 1.00000000000000e+00
+3812 3812 1.00000000000000e+00
+3813 3813 6.60889732475958e+00
+3813 2637 1.18136420444713e-02
+3813 2661 7.34843574811677e-03
+3813 2685 1.36192251944492e-06
+3813 3213 1.83378625356757e-01
+3813 3237 1.35780839835569e+00
+3813 3261 1.48862480810996e-01
+3813 3285 2.39044322190814e-04
+3813 3789 6.42960599027272e-04
+3813 3837 8.47559702554766e+00
+3813 3861 2.78118470954534e-01
+3813 3885 3.23989771589686e-04
+3813 4389 6.30109354465528e-02
+3813 4413 6.11383506306117e+00
+3813 4437 4.37323350928698e+00
+3813 4461 9.56967206476581e-02
+3813 4485 1.81715951490776e-05
+3813 4989 3.01114647711882e-02
+3813 5013 3.28881041915934e-01
+3813 5037 1.15120413221378e-01
+3813 5061 3.27777054418445e-03
+3813 5085 1.82413221143818e-06
+3813 5589 4.05234314351900e-08
+3813 5613 1.19958834153309e-04
+3813 5637 2.34927877494182e-04
+3813 5661 3.01784208052619e-06
+3813 6213 2.85680000000000e-16
+3813 6237 1.94460000000000e-16
+3813 15408 -3.49139124709039e-02
+3813 15432 -1.88624550732972e-02
+3813 15456 -4.01571096527211e-04
+3813 15816 -7.35786296464262e-01
+3813 15840 -4.17890200362018e-01
+3813 15864 -1.42858512538454e-02
+3813 15888 -2.63635274781220e-07
+3813 16224 -4.44043579606690e+00
+3813 16248 -2.51925394366342e+00
+3813 16272 -8.56064705006712e-02
+3813 16296 -4.51231632600826e-05
+3813 16632 -8.88650814138442e+00
+3813 16656 -4.99269484567996e+00
+3813 16680 -1.57674992663909e-01
+3813 16704 -1.86284564303322e-04
+3813 17040 -2.84652083002149e+00
+3813 17064 -1.64156849315697e+00
+3813 17088 -6.26822243240912e-02
+3813 17112 -8.30543836997973e-05
+3813 17448 -2.06381545340387e-01
+3813 17472 -1.27735214090191e-01
+3813 17496 -7.04889861285685e-03
+3813 17520 -9.74644038470988e-06
+3813 17856 -3.09907564292860e-07
+3813 17880 -1.55434573406250e-07
+3813 17904 -1.37368931380000e-10
+3814 3814 1.00000000000000e+00
+3815 3815 1.00000000000000e+00
+3816 3816 1.00000000000000e+00
+3817 3817 1.00000000000000e+00
+3818 3818 1.00000000000000e+00
+3819 3819 1.00000000000000e+00
+3820 3820 1.00000000000000e+00
+3821 3821 1.00000000000000e+00
+3822 3822 1.00000000000000e+00
+3823 3823 1.00000000000000e+00
+3824 3824 1.00000000000000e+00
+3825 3825 1.00000000000000e+00
+3826 3826 1.00000000000000e+00
+3827 3827 1.00000000000000e+00
+3828 3828 1.00000000000000e+00
+3829 3829 1.00000000000000e+00
+3830 3830 1.00000000000000e+00
+3831 3831 1.00000000000000e+00
+3832 3832 1.00000000000000e+00
+3833 3833 1.00000000000000e+00
+3834 3834 1.00000000000000e+00
+3835 3835 1.00000000000000e+00
+3836 3836 1.00000000000000e+00
+3837 3837 2.52133658919628e+01
+3837 2037 4.59011807340396e-05
+3837 2061 1.80194811187150e-04
+3837 2085 7.09230616116290e-07
+3837 2637 3.21523235303118e-01
+3837 2661 2.45504972402707e-01
+3837 2685 2.98352467610303e-03
+3837 2709 5.17938663274500e-06
+3837 3213 6.74357737899597e-01
+3837 3237 9.91943451262241e+00
+3837 3261 3.76737230205418e+00
+3837 3285 1.37148490235047e-01
+3837 3309 2.94496133374683e-04
+3837 3333 2.37500000000000e-16
+3837 3789 5.01825510064345e-04
+3837 3813 8.47559702554766e+00
+3837 3861 5.81461242173243e+00
+3837 3885 3.88254869960615e-01
+3837 3909 4.30184941148576e-04
+3837 3933 1.70813000000000e-15
+3837 4389 2.29883960010645e-02
+3837 4413 6.37363411517362e+00
+3837 4437 8.30042343340743e+00
+3837 4461 2.28682142390906e+00
+3837 4485 1.59134713973787e-01
+3837 4509 7.38617469010381e-05
+3837 4989 9.74515294596649e-03
+3837 5013 1.65911619907650e-01
+3837 5037 2.84023234766726e-01
+3837 5061 1.41458480609613e-01
+3837 5085 3.14962360091569e-03
+3837 5109 2.33546346859161e-06
+3837 5613 1.28078995586533e-04
+3837 5637 4.71482473101207e-04
+3837 5661 1.01435749871596e-04
+3837 5685 6.98380998805092e-06
+3837 15000 -7.07189490284714e-03
+3837 15024 -8.34695865135725e-03
+3837 15048 -1.65556807285418e-03
+3837 15072 -7.56520811581506e-05
+3837 15408 -9.88607456833689e-01
+3837 15432 -9.48787970187838e-01
+3837 15456 -2.02228954966383e-01
+3837 15480 -1.94860308560969e-02
+3837 15504 -2.68148023391800e-08
+3837 15816 -6.32291240332999e+00
+3837 15840 -5.92201974611259e+00
+3837 15864 -1.39480511332749e+00
+3837 15888 -1.63888366341900e-01
+3837 15912 -1.91637324661198e-04
+3837 16224 -1.31344205713099e+01
+3837 16248 -1.16102424187959e+01
+3837 16272 -2.92410451374053e+00
+3837 16296 -4.02728245207740e-01
+3837 16320 -9.09969541231139e-04
+3837 16632 -1.16470936735664e+01
+3837 16656 -9.05696095074172e+00
+3837 16680 -1.76103804557888e+00
+3837 16704 -2.28262293221427e-01
+3837 16728 -7.66819923937577e-04
+3837 17040 -2.55228025707649e+00
+3837 17064 -1.92125528213324e+00
+3837 17088 -3.17162331399170e-01
+3837 17112 -3.63021842950960e-02
+3837 17136 -1.43822464621434e-04
+3837 17448 -6.91058902851671e-02
+3837 17472 -5.86754948615213e-02
+3837 17496 -7.88893963817137e-03
+3837 17520 -2.68364539589388e-04
+3838 3838 1.00000000000000e+00
+3839 3839 1.00000000000000e+00
+3840 3840 1.00000000000000e+00
+3841 3841 1.00000000000000e+00
+3842 3842 1.00000000000000e+00
+3843 3843 1.00000000000000e+00
+3844 3844 1.00000000000000e+00
+3845 3845 1.00000000000000e+00
+3846 3846 1.00000000000000e+00
+3847 3847 1.00000000000000e+00
+3848 3848 1.00000000000000e+00
+3849 3849 1.00000000000000e+00
+3850 3850 1.00000000000000e+00
+3851 3851 1.00000000000000e+00
+3852 3852 1.00000000000000e+00
+3853 3853 1.00000000000000e+00
+3854 3854 1.00000000000000e+00
+3855 3855 1.00000000000000e+00
+3856 3856 1.00000000000000e+00
+3857 3857 1.00000000000000e+00
+3858 3858 1.00000000000000e+00
+3859 3859 1.00000000000000e+00
+3860 3860 1.00000000000000e+00
+3861 3861 1.85107007957681e+01
+3861 2037 7.20900767794626e-05
+3861 2061 3.54827271089046e-04
+3861 2085 3.19208832744818e-06
+3861 2637 1.29727964301456e-01
+3861 2661 2.79777465397475e-01
+3861 2685 9.08790737019995e-02
+3861 2709 2.93365015021248e-03
+3861 2733 1.91012521360000e-10
+3861 3213 4.82735193069476e-02
+3861 3237 3.09914208319462e+00
+3861 3261 6.98081283453296e+00
+3861 3285 2.64884504318002e+00
+3861 3309 1.04720627674970e-01
+3861 3333 2.33188526392932e-04
+3861 3357 3.85400000000000e-17
+3861 3789 8.97612361523940e-07
+3861 3813 2.78118470954534e-01
+3861 3837 5.81461242173243e+00
+3861 3885 7.60940118776541e+00
+3861 3909 3.83651946384645e-01
+3861 3933 2.67258390988048e-04
+3861 3957 6.14500000000000e-17
+3861 4389 1.11277923894419e-05
+3861 4413 1.11544915246482e-01
+3861 4437 2.30136421296784e+00
+3861 4461 7.22470846299925e+00
+3861 4485 2.77392916116127e+00
+3861 4509 1.29158141991549e-01
+3861 4533 1.40199035422927e-04
+3861 4989 1.43358216180975e-06
+3861 5013 3.49349886848894e-03
+3861 5037 1.35101238191699e-01
+3861 5061 3.05741013405640e-01
+3861 5085 1.30017308321317e-01
+3861 5109 3.37533779248329e-03
+3861 5133 1.07354659163104e-06
+3861 5613 1.08879937028275e-06
+3861 5637 2.10763663817745e-05
+3861 5661 5.42606048985633e-04
+3861 5685 2.64738694593930e-04
+3861 5709 2.40795486257654e-06
+3861 15000 -2.04644255858374e-02
+3861 15024 -9.39954658147409e-02
+3861 15048 -1.57084032693361e-01
+3861 15072 -6.09452274392239e-02
+3861 15096 -6.72695047920763e-03
+3861 15120 -1.62243194400000e-11
+3861 15408 -4.70523537717523e-01
+3861 15432 -1.79211733908759e+00
+3861 15456 -2.84276194806406e+00
+3861 15480 -1.10467050991717e+00
+3861 15504 -1.24457816678191e-01
+3861 15528 -3.77341038477285e-04
+3861 15816 -1.79324213756288e+00
+3861 15840 -6.75754988964338e+00
+3861 15864 -1.09547396060201e+01
+3861 15888 -4.28313906253394e+00
+3861 15912 -4.87379513125262e-01
+3861 15936 -2.41855455161586e-03
+3861 16224 -1.28138291463891e+00
+3861 16248 -5.48334295921221e+00
+3861 16272 -1.00015592700933e+01
+3861 16296 -3.98187100407156e+00
+3861 16320 -4.60405244955091e-01
+3861 16344 -4.02285784986327e-03
+3861 16632 -3.00034719279312e-01
+3861 16656 -1.43888709538292e+00
+3861 16680 -2.67231919083986e+00
+3861 16704 -1.01738905164711e+00
+3861 16728 -1.09952822002806e-01
+3861 16752 -9.44207889060296e-04
+3861 17040 -2.05692093069995e-02
+3861 17064 -1.13112689805212e-01
+3861 17088 -1.94606147503319e-01
+3861 17112 -6.35762543224439e-02
+3861 17136 -5.15015269182185e-03
+3861 17160 -8.75431199719495e-06
+3861 17448 -1.96369108521814e-05
+3861 17472 -9.55235986069291e-05
+3861 17496 -8.75407316449953e-05
+3861 17520 -1.69759551982035e-05
+3862 3862 1.00000000000000e+00
+3863 3863 1.00000000000000e+00
+3864 3864 1.00000000000000e+00
+3865 3865 1.00000000000000e+00
+3866 3866 1.00000000000000e+00
+3867 3867 1.00000000000000e+00
+3868 3868 1.00000000000000e+00
+3869 3869 1.00000000000000e+00
+3870 3870 1.00000000000000e+00
+3871 3871 1.00000000000000e+00
+3872 3872 1.00000000000000e+00
+3873 3873 1.00000000000000e+00
+3874 3874 1.00000000000000e+00
+3875 3875 1.00000000000000e+00
+3876 3876 1.00000000000000e+00
+3877 3877 1.00000000000000e+00
+3878 3878 1.00000000000000e+00
+3879 3879 1.00000000000000e+00
+3880 3880 1.00000000000000e+00
+3881 3881 1.00000000000000e+00
+3882 3882 1.00000000000000e+00
+3883 3883 1.00000000000000e+00
+3884 3884 1.00000000000000e+00
+3885 3885 1.81406348468672e+01
+3885 2037 4.55990495249551e-06
+3885 2061 3.30881342016367e-05
+3885 2085 5.18496828096290e-07
+3885 2637 4.32657486010460e-03
+3885 2661 1.09481969201773e-01
+3885 2685 2.98235611124593e-01
+3885 2709 5.66352263340657e-02
+3885 2733 1.76934258518440e-07
+3885 3213 1.28664970767145e-04
+3885 3237 1.15026971954077e-01
+3885 3261 2.68222047618842e+00
+3885 3285 5.96431524939480e+00
+3885 3309 2.68265796979801e+00
+3885 3333 1.36090564095540e-01
+3885 3357 6.61673559220368e-06
+3885 3813 3.23989771589686e-04
+3885 3837 3.88254869960615e-01
+3885 3861 7.60940118776541e+00
+3885 3909 6.00181058392049e+00
+3885 3933 3.37952987363555e-01
+3885 3957 1.84499564047513e-04
+3885 4413 9.87647472616811e-05
+3885 4437 1.63787166671299e-01
+3885 4461 2.77588105773609e+00
+3885 4485 6.72471884021619e+00
+3885 4509 2.67314736954823e+00
+3885 4533 1.03910226659845e-01
+3885 4557 1.14998784692893e-04
+3885 5013 1.53658882619243e-05
+3885 5037 3.35210990307837e-03
+3885 5061 1.17467751532464e-01
+3885 5085 3.25771669079227e-01
+3885 5109 1.19649369036845e-01
+3885 5133 4.53064416783978e-03
+3885 5157 1.66357890694840e-07
+3885 5637 8.42870972887720e-07
+3885 5661 1.33659463189934e-04
+3885 5685 1.52045374293928e-04
+3885 5709 1.86724261971482e-04
+3885 5733 1.40334369341953e-05
+3885 15000 -2.63702574884978e-03
+3885 15024 -1.17498240106751e-01
+3885 15048 -7.56106341981153e-01
+3885 15072 -1.51207846681762e+00
+3885 15096 -7.35724208401014e-01
+3885 15120 -1.03422884076186e-01
+3885 15144 -2.42406379375074e-04
+3885 15408 -1.75666651323256e-02
+3885 15432 -6.38508544939129e-01
+3885 15456 -3.72278010225770e+00
+3885 15480 -6.68777816209319e+00
+3885 15504 -2.99889266328806e+00
+3885 15528 -4.08296859121539e-01
+3885 15552 -4.43604484561120e-03
+3885 15816 -3.10803560498734e-02
+3885 15840 -1.33316206270320e+00
+3885 15864 -7.34164664187888e+00
+3885 15888 -1.18093709731944e+01
+3885 15912 -5.28864690628289e+00
+3885 15936 -7.58041586363656e-01
+3885 15960 -1.45815447323934e-02
+3885 16224 -8.02848167035927e-03
+3885 16248 -5.38961450759740e-01
+3885 16272 -3.06527398950026e+00
+3885 16296 -4.89729124264456e+00
+3885 16320 -2.11930396500524e+00
+3885 16344 -2.92463126461178e-01
+3885 16368 -5.36026349040975e-03
+3885 16632 -2.44065315422977e-04
+3885 16656 -6.28594643042423e-02
+3885 16680 -3.75923620321791e-01
+3885 16704 -6.03687179371143e-01
+3885 16728 -2.45488223812454e-01
+3885 16752 -3.11108491462272e-02
+3885 16776 -4.73461040574712e-04
+3885 17064 -7.09905820190926e-04
+3885 17088 -4.05950296912925e-03
+3885 17112 -5.60829570506774e-03
+3885 17136 -1.29536421402409e-03
+3885 17160 -1.88711314146374e-05
+3886 3886 1.00000000000000e+00
+3887 3887 1.00000000000000e+00
+3888 3888 1.00000000000000e+00
+3889 3889 1.00000000000000e+00
+3890 3890 1.00000000000000e+00
+3891 3891 1.00000000000000e+00
+3892 3892 1.00000000000000e+00
+3893 3893 1.00000000000000e+00
+3894 3894 1.00000000000000e+00
+3895 3895 1.00000000000000e+00
+3896 3896 1.00000000000000e+00
+3897 3897 1.00000000000000e+00
+3898 3898 1.00000000000000e+00
+3899 3899 1.00000000000000e+00
+3900 3900 1.00000000000000e+00
+3901 3901 1.00000000000000e+00
+3902 3902 1.00000000000000e+00
+3903 3903 1.00000000000000e+00
+3904 3904 1.00000000000000e+00
+3905 3905 1.00000000000000e+00
+3906 3906 1.00000000000000e+00
+3907 3907 1.00000000000000e+00
+3908 3908 1.00000000000000e+00
+3909 3909 1.79804363934441e+01
+3909 2637 4.80711473217600e-08
+3909 2661 7.50438699090477e-03
+3909 2685 1.55044360737322e-01
+3909 2709 9.79813381742708e-02
+3909 2733 1.86054858380126e-06
+3909 3237 1.55156966072355e-04
+3909 3261 9.86337930065479e-02
+3909 3285 3.14714061325156e+00
+3909 3309 1.12062297642624e+01
+3909 3333 3.62600246314894e+00
+3909 3357 3.70617261712393e-02
+3909 3837 4.30184941148576e-04
+3909 3861 3.83651946384645e-01
+3909 3885 6.00181058392049e+00
+3909 3933 8.40787723111200e+00
+3909 3957 4.11150698402183e-01
+3909 3981 2.73392609382710e-04
+3909 4437 2.12410211905635e-04
+3909 4461 1.38803384818389e-01
+3909 4485 2.69560330541532e+00
+3909 4509 6.03243372310633e+00
+3909 4533 2.20243939165178e+00
+3909 4557 1.01036021558391e-01
+3909 4581 2.02409678011769e-04
+3909 5037 6.81126937739456e-06
+3909 5061 5.70101788762022e-03
+3909 5085 1.04668459507658e-01
+3909 5109 3.28037469003473e-01
+3909 5133 1.48638855963735e-01
+3909 5157 5.85510262322272e-03
+3909 5181 3.96083470000000e-13
+3909 5685 9.19256200499717e-05
+3909 5709 6.35178349373478e-04
+3909 5733 1.17189641502778e-04
+3909 5757 8.73668005157790e-06
+3909 15024 -1.19215732302669e-02
+3909 15048 -4.83551374784487e-01
+3909 15072 -3.96155814643469e+00
+3909 15096 -9.81224485046643e+00
+3909 15120 -4.42153745514157e+00
+3909 15144 -5.86323053563013e-01
+3909 15168 -8.66206699074866e-03
+3909 15432 -1.53507695888664e-02
+3909 15456 -8.37895207133275e-01
+3909 15480 -5.66644235563035e+00
+3909 15504 -1.17788140657166e+01
+3909 15528 -5.85915587839815e+00
+3909 15552 -9.28686431603785e-01
+3909 15576 -2.67141945964824e-02
+3909 15840 -5.05501392373296e-03
+3909 15864 -5.12343280474779e-01
+3909 15888 -3.34211054867200e+00
+3909 15912 -6.52746285474573e+00
+3909 15936 -3.63348164739559e+00
+3909 15960 -6.43339735310622e-01
+3909 15984 -2.05626619650520e-02
+3909 16248 -6.38658904564033e-04
+3909 16272 -1.04269346786835e-01
+3909 16296 -7.08432062787709e-01
+3909 16320 -1.42191071427140e+00
+3909 16344 -7.70581711034155e-01
+3909 16368 -1.31722113288670e-01
+3909 16392 -3.81608675529010e-03
+3909 16680 -3.26638239810645e-03
+3909 16704 -2.46988284185830e-02
+3909 16728 -5.17816687505499e-02
+3909 16752 -1.95621366677711e-02
+3909 16776 -1.98398564923316e-03
+3909 16800 -4.73650354579950e-07
+3910 3910 1.00000000000000e+00
+3911 3911 1.00000000000000e+00
+3912 3912 1.00000000000000e+00
+3913 3913 1.00000000000000e+00
+3914 3914 1.00000000000000e+00
+3915 3915 1.00000000000000e+00
+3916 3916 1.00000000000000e+00
+3917 3917 1.00000000000000e+00
+3918 3918 1.00000000000000e+00
+3919 3919 1.00000000000000e+00
+3920 3920 1.00000000000000e+00
+3921 3921 1.00000000000000e+00
+3922 3922 1.00000000000000e+00
+3923 3923 1.00000000000000e+00
+3924 3924 1.00000000000000e+00
+3925 3925 1.00000000000000e+00
+3926 3926 1.00000000000000e+00
+3927 3927 1.00000000000000e+00
+3928 3928 1.00000000000000e+00
+3929 3929 1.00000000000000e+00
+3930 3930 1.00000000000000e+00
+3931 3931 1.00000000000000e+00
+3932 3932 1.00000000000000e+00
+3933 3933 2.55581485016706e+01
+3933 2661 2.36590348617495e-06
+3933 2685 4.31692185634905e-03
+3933 2709 8.35456992673652e-03
+3933 2733 8.87219725627850e-07
+3933 3261 1.59825900986147e-04
+3933 3285 2.50073467614360e-01
+3933 3309 5.44645677899667e+00
+3933 3333 5.54000696248019e+00
+3933 3357 3.02172057297916e-01
+3933 3837 1.70813000000000e-15
+3933 3861 2.67258390988048e-04
+3933 3885 3.37952987363555e-01
+3933 3909 8.40787723111200e+00
+3933 3957 9.26996687393116e+00
+3933 3981 1.92744512039679e-01
+3933 4005 4.57242407563120e-07
+3933 4437 1.16118000000000e-15
+3933 4461 2.62041531254356e-04
+3933 4485 1.20597050544890e-01
+3933 4509 2.14495058601446e+00
+3933 4533 6.20292311079304e+00
+3933 4557 4.15240925190621e+00
+3933 4581 2.69689879613936e-01
+3933 4605 1.26615946688093e-06
+3933 5061 2.74962501930980e-06
+3933 5085 4.53171246542357e-03
+3933 5109 1.46585707143295e-01
+3933 5133 3.19728559420901e-01
+3933 5157 1.02243790726410e-01
+3933 5181 5.64636705605441e-03
+3933 5685 1.74930753381091e-06
+3933 5709 1.97278770701293e-05
+3933 5733 4.54537256974676e-04
+3933 5757 2.67866754088802e-04
+3933 5781 1.54657054999065e-06
+3933 15048 -9.65306573404754e-03
+3933 15072 -1.18740850620940e+00
+3933 15096 -7.28706157576636e+00
+3933 15120 -1.36483898526966e+01
+3933 15144 -9.88947253249652e+00
+3933 15168 -2.26850405724519e+00
+3933 15192 -1.24451148894912e-01
+3933 15456 -6.21525660309214e-03
+3933 15480 -8.34970990283421e-01
+3933 15504 -5.46128485173948e+00
+3933 15528 -1.11982184290233e+01
+3933 15552 -8.42168416152394e+00
+3933 15576 -1.88437508933349e+00
+3933 15600 -8.86963956974814e-02
+3933 15864 -3.96784765631882e-04
+3933 15888 -1.01470518843150e-01
+3933 15912 -8.51279404173898e-01
+3933 15936 -2.17167163998994e+00
+3933 15960 -1.52603805139534e+00
+3933 15984 -3.02877918445012e-01
+3933 16008 -9.12151484469944e-03
+3933 16272 -1.76489563238000e-09
+3933 16296 -8.79520094271788e-03
+3933 16320 -8.96751616157894e-02
+3933 16344 -2.48937627752003e-01
+3933 16368 -1.43573546139141e-01
+3933 16392 -2.38431983512806e-02
+3933 16416 -4.19575438955597e-04
+3933 16704 -9.43368006238351e-06
+3933 16728 -8.35721701630065e-05
+3933 16752 -1.93029350231713e-04
+3933 16776 -4.68209319752308e-05
+3933 16800 -2.45870515439590e-07
+3934 3934 1.00000000000000e+00
+3935 3935 1.00000000000000e+00
+3936 3936 1.00000000000000e+00
+3937 3937 1.00000000000000e+00
+3938 3938 1.00000000000000e+00
+3939 3939 1.00000000000000e+00
+3940 3940 1.00000000000000e+00
+3941 3941 1.00000000000000e+00
+3942 3942 1.00000000000000e+00
+3943 3943 1.00000000000000e+00
+3944 3944 1.00000000000000e+00
+3945 3945 1.00000000000000e+00
+3946 3946 1.00000000000000e+00
+3947 3947 1.00000000000000e+00
+3948 3948 1.00000000000000e+00
+3949 3949 1.00000000000000e+00
+3950 3950 1.00000000000000e+00
+3951 3951 1.00000000000000e+00
+3952 3952 1.00000000000000e+00
+3953 3953 1.00000000000000e+00
+3954 3954 1.00000000000000e+00
+3955 3955 1.00000000000000e+00
+3956 3956 1.00000000000000e+00
+3957 3957 1.65352612376491e+01
+3957 2685 3.84760914064400e-08
+3957 2709 2.17449701422410e-07
+3957 2733 3.19243961200000e-11
+3957 3285 6.16672890543066e-06
+3957 3309 1.33556506834827e-01
+3957 3333 7.56157576803354e-01
+3957 3357 1.57248436422912e-01
+3957 3861 6.14500000000000e-17
+3957 3885 1.84499564047513e-04
+3957 3909 4.11150698402183e-01
+3957 3933 9.26996687393116e+00
+3957 3981 2.24680920254792e+00
+3957 4005 2.08212736614838e-03
+3957 4461 1.01200000000000e-17
+3957 4485 2.14991453078892e-04
+3957 4509 1.01082040273076e-01
+3957 4533 3.20527510274181e+00
+3957 4557 1.20747408504984e+01
+3957 4581 4.59301705652272e+00
+3957 4605 6.52643325329211e-02
+3957 4629 2.65320809328760e-07
+3957 5085 9.75132400737207e-06
+3957 5109 4.31287933667559e-03
+3957 5133 8.83750882412678e-02
+3957 5157 2.53180377174194e-01
+3957 5181 1.34864340673858e-01
+3957 5205 9.82793053106742e-03
+3957 5229 2.76965240371850e-07
+3957 5709 5.63269850000790e-07
+3957 5733 1.46665177000229e-04
+3957 5757 2.69575548313876e-04
+3957 5781 1.97291361919338e-04
+3957 5805 7.77337397786230e-07
+3957 5829 1.83791670000000e-12
+3957 15072 -3.95711006277197e-05
+3957 15096 -3.24429347867767e-01
+3957 15120 -3.50736818545126e+00
+3957 15144 -1.14588221436155e+01
+3957 15168 -1.14939187741039e+01
+3957 15192 -2.73110193042548e+00
+3957 15216 -1.09415256228251e-01
+3957 15240 -8.84884528789628e-06
+3957 15480 -2.00170805911734e-05
+3957 15504 -1.97918336106527e-01
+3957 15528 -2.26455304050106e+00
+3957 15552 -7.40748823356999e+00
+3957 15576 -6.80856023493019e+00
+3957 15600 -1.58757384800460e+00
+3957 15624 -6.76799247529334e-02
+3957 15648 -5.06717717815108e-06
+3957 15888 -6.61515078038700e-08
+3957 15912 -1.07430284427307e-02
+3957 15936 -1.56376062952831e-01
+3957 15960 -5.14460043694642e-01
+3957 15984 -3.17500633505508e-01
+3957 16008 -6.49202412504744e-02
+3957 16032 -3.70637046823079e-03
+3957 16056 -1.83644152629410e-07
+3957 16320 -1.45918259762627e-04
+3957 16344 -2.80363635072941e-03
+3957 16368 -9.42561470530920e-03
+3957 16392 -3.81933610700285e-03
+3957 16416 -3.99843198830990e-04
+3958 3958 1.00000000000000e+00
+3959 3959 1.00000000000000e+00
+3960 3960 1.00000000000000e+00
+3961 3961 1.00000000000000e+00
+3962 3962 1.00000000000000e+00
+3963 3963 1.00000000000000e+00
+3964 3964 1.00000000000000e+00
+3965 3965 1.00000000000000e+00
+3966 3966 1.00000000000000e+00
+3967 3967 1.00000000000000e+00
+3968 3968 1.00000000000000e+00
+3969 3969 1.00000000000000e+00
+3970 3970 1.00000000000000e+00
+3971 3971 1.00000000000000e+00
+3972 3972 1.00000000000000e+00
+3973 3973 1.00000000000000e+00
+3974 3974 1.00000000000000e+00
+3975 3975 1.00000000000000e+00
+3976 3976 1.00000000000000e+00
+3977 3977 1.00000000000000e+00
+3978 3978 1.00000000000000e+00
+3979 3979 1.00000000000000e+00
+3980 3980 1.00000000000000e+00
+3981 3981 1.87999395128718e+00
+3981 3309 2.00195419374276e-06
+3981 3333 3.63532297866516e-03
+3981 3357 1.67498720578745e-03
+3981 3909 2.73392609382710e-04
+3981 3933 1.92744512039679e-01
+3981 3957 2.24680920254792e+00
+3981 4005 5.96412141363916e-03
+3981 4509 2.27061860767542e-04
+3981 4533 1.26642207232517e-01
+3981 4557 2.93990643686120e+00
+3981 4581 3.00812933496055e+00
+3981 4605 2.51332964486057e-01
+3981 4629 6.84807729967547e-04
+3981 5109 1.44666009939137e-06
+3981 5133 4.48672969599088e-03
+3981 5157 7.91253656423224e-02
+3981 5181 2.29394337282822e-01
+3981 5205 6.99586949078880e-02
+3981 5229 7.12317907240396e-04
+3981 5757 9.38864787359752e-05
+3981 5781 4.20437398965708e-04
+3981 5805 6.46479002001113e-05
+3981 5829 4.08628167584000e-09
+3981 15120 -2.72999557635276e-02
+3981 15144 -8.31443655203386e-01
+3981 15168 -3.21770864406451e+00
+3981 15192 -1.95058358179339e+00
+3981 15216 -3.91858603018195e-01
+3981 15240 -2.26063108285778e-02
+3981 15528 -1.51031657139677e-02
+3981 15552 -4.48334279241388e-01
+3981 15576 -1.73811843761455e+00
+3981 15600 -1.08493774795170e+00
+3981 15624 -2.18132430886976e-01
+3981 15648 -1.17009061321146e-02
+3981 15936 -4.15196523486826e-04
+3981 15960 -9.31784332562704e-03
+3981 15984 -3.69326044520844e-02
+3981 16008 -3.13274163014303e-02
+3981 16032 -6.34375125082232e-03
+3981 16056 -1.13643062235915e-04
+3982 3982 1.00000000000000e+00
+3983 3983 1.00000000000000e+00
+3984 3984 1.00000000000000e+00
+3985 3985 1.00000000000000e+00
+3986 3986 1.00000000000000e+00
+3987 3987 1.00000000000000e+00
+3988 3988 1.00000000000000e+00
+3989 3989 1.00000000000000e+00
+3990 3990 1.00000000000000e+00
+3991 3991 1.00000000000000e+00
+3992 3992 1.00000000000000e+00
+3993 3993 1.00000000000000e+00
+3994 3994 1.00000000000000e+00
+3995 3995 1.00000000000000e+00
+3996 3996 1.00000000000000e+00
+3997 3997 1.00000000000000e+00
+3998 3998 1.00000000000000e+00
+3999 3999 1.00000000000000e+00
+4000 4000 1.00000000000000e+00
+4001 4001 1.00000000000000e+00
+4002 4002 1.00000000000000e+00
+4003 4003 1.00000000000000e+00
+4004 4004 1.00000000000000e+00
+4005 4005 1.00019295784113e+00
+4005 3333 5.45496585000000e-12
+4005 3357 1.57623610900000e-11
+4005 3933 4.57242407563120e-07
+4005 3957 2.08212736614838e-03
+4005 3981 5.96412141363916e-03
+4005 4509 4.86770000000000e-16
+4005 4533 1.24828921303146e-06
+4005 4557 9.08688838913287e-03
+4005 4581 5.92060211873687e-02
+4005 4605 2.27218828907762e-02
+4005 4629 1.74906230975336e-04
+4005 5109 1.82940000000000e-16
+4005 5133 9.84462529829360e-07
+4005 5157 6.51068255958210e-04
+4005 5181 1.04734868936988e-02
+4005 5205 1.17535898769437e-02
+4005 5229 1.81867178720743e-04
+4005 5757 1.23556813447244e-06
+4005 5781 2.18137199729476e-05
+4005 5805 1.13653088228281e-05
+4005 5829 1.02677524531000e-09
+4005 15144 -3.07830518340566e-06
+4005 15168 -7.64040556608113e-03
+4005 15192 -3.62833187129932e-02
+4005 15216 -3.06995764510265e-02
+4005 15240 -5.76787102641976e-03
+4005 15552 -1.54782487178359e-06
+4005 15576 -4.00184406382046e-03
+4005 15600 -1.89372668443837e-02
+4005 15624 -1.58080846130477e-02
+4005 15648 -2.95310796217859e-03
+4005 15960 -2.47779430879000e-09
+4005 15984 -5.18975087942567e-05
+4005 16008 -2.27316425110599e-04
+4005 16032 -1.30941825009837e-04
+4005 16056 -1.97635568482039e-05
+4006 4006 1.00000000000000e+00
+4007 4007 1.00000000000000e+00
+4008 4008 1.00000000000000e+00
+4009 4009 1.00000000000000e+00
+4010 4010 1.00000000000000e+00
+4011 4011 1.00000000000000e+00
+4012 4012 1.00000000000000e+00
+4013 4013 1.00000000000000e+00
+4014 4014 1.00000000000000e+00
+4015 4015 1.00000000000000e+00
+4016 4016 1.00000000000000e+00
+4017 4017 1.00000000000000e+00
+4018 4018 1.00000000000000e+00
+4019 4019 1.00000000000000e+00
+4020 4020 1.00000000000000e+00
+4021 4021 1.00000000000000e+00
+4022 4022 1.00000000000000e+00
+4023 4023 1.00000000000000e+00
+4024 4024 1.00000000000000e+00
+4025 4025 1.00000000000000e+00
+4026 4026 1.00000000000000e+00
+4027 4027 1.00000000000000e+00
+4028 4028 1.00000000000000e+00
+4029 4029 1.00000000000000e+00
+4030 4030 1.00000000000000e+00
+4031 4031 1.00000000000000e+00
+4032 4032 1.00000000000000e+00
+4033 4033 1.00000000000000e+00
+4034 4034 1.00000000000000e+00
+4035 4035 1.00000000000000e+00
+4036 4036 1.00000000000000e+00
+4037 4037 1.00000000000000e+00
+4038 4038 1.00000000000000e+00
+4039 4039 1.00000000000000e+00
+4040 4040 1.00000000000000e+00
+4041 4041 1.00000000000000e+00
+4042 4042 1.00000000000000e+00
+4043 4043 1.00000000000000e+00
+4044 4044 1.00000000000000e+00
+4045 4045 1.00000000000000e+00
+4046 4046 1.00000000000000e+00
+4047 4047 1.00000000000000e+00
+4048 4048 1.00000000000000e+00
+4049 4049 1.00000000000000e+00
+4050 4050 1.00000000000000e+00
+4051 4051 1.00000000000000e+00
+4052 4052 1.00000000000000e+00
+4053 4053 1.00000000000000e+00
+4054 4054 1.00000000000000e+00
+4055 4055 1.00000000000000e+00
+4056 4056 1.00000000000000e+00
+4057 4057 1.00000000000000e+00
+4058 4058 1.00000000000000e+00
+4059 4059 1.00000000000000e+00
+4060 4060 1.00000000000000e+00
+4061 4061 1.00000000000000e+00
+4062 4062 1.00000000000000e+00
+4063 4063 1.00000000000000e+00
+4064 4064 1.00000000000000e+00
+4065 4065 1.00000000000000e+00
+4066 4066 1.00000000000000e+00
+4067 4067 1.00000000000000e+00
+4068 4068 1.00000000000000e+00
+4069 4069 1.00000000000000e+00
+4070 4070 1.00000000000000e+00
+4071 4071 1.00000000000000e+00
+4072 4072 1.00000000000000e+00
+4073 4073 1.00000000000000e+00
+4074 4074 1.00000000000000e+00
+4075 4075 1.00000000000000e+00
+4076 4076 1.00000000000000e+00
+4077 4077 1.00000000000000e+00
+4078 4078 1.00000000000000e+00
+4079 4079 1.00000000000000e+00
+4080 4080 1.00000000000000e+00
+4081 4081 1.00000000000000e+00
+4082 4082 1.00000000000000e+00
+4083 4083 1.00000000000000e+00
+4084 4084 1.00000000000000e+00
+4085 4085 1.00000000000000e+00
+4086 4086 1.00000000000000e+00
+4087 4087 1.00000000000000e+00
+4088 4088 1.00000000000000e+00
+4089 4089 1.00000000000000e+00
+4090 4090 1.00000000000000e+00
+4091 4091 1.00000000000000e+00
+4092 4092 1.00000000000000e+00
+4093 4093 1.00000000000000e+00
+4094 4094 1.00000000000000e+00
+4095 4095 1.00000000000000e+00
+4096 4096 1.00000000000000e+00
+4097 4097 1.00000000000000e+00
+4098 4098 1.00000000000000e+00
+4099 4099 1.00000000000000e+00
+4100 4100 1.00000000000000e+00
+4101 4101 1.00000000000000e+00
+4102 4102 1.00000000000000e+00
+4103 4103 1.00000000000000e+00
+4104 4104 1.00000000000000e+00
+4105 4105 1.00000000000000e+00
+4106 4106 1.00000000000000e+00
+4107 4107 1.00000000000000e+00
+4108 4108 1.00000000000000e+00
+4109 4109 1.00000000000000e+00
+4110 4110 1.00000000000000e+00
+4111 4111 1.00000000000000e+00
+4112 4112 1.00000000000000e+00
+4113 4113 1.00000000000000e+00
+4114 4114 1.00000000000000e+00
+4115 4115 1.00000000000000e+00
+4116 4116 1.00000000000000e+00
+4117 4117 1.00000000000000e+00
+4118 4118 1.00000000000000e+00
+4119 4119 1.00000000000000e+00
+4120 4120 1.00000000000000e+00
+4121 4121 1.00000000000000e+00
+4122 4122 1.00000000000000e+00
+4123 4123 1.00000000000000e+00
+4124 4124 1.00000000000000e+00
+4125 4125 1.00000000000000e+00
+4126 4126 1.00000000000000e+00
+4127 4127 1.00000000000000e+00
+4128 4128 1.00000000000000e+00
+4129 4129 1.00000000000000e+00
+4130 4130 1.00000000000000e+00
+4131 4131 1.00000000000000e+00
+4132 4132 1.00000000000000e+00
+4133 4133 1.00000000000000e+00
+4134 4134 1.00000000000000e+00
+4135 4135 1.00000000000000e+00
+4136 4136 1.00000000000000e+00
+4137 4137 1.00000000000000e+00
+4138 4138 1.00000000000000e+00
+4139 4139 1.00000000000000e+00
+4140 4140 1.00000000000000e+00
+4141 4141 1.00000000000000e+00
+4142 4142 1.00000000000000e+00
+4143 4143 1.00000000000000e+00
+4144 4144 1.00000000000000e+00
+4145 4145 1.00000000000000e+00
+4146 4146 1.00000000000000e+00
+4147 4147 1.00000000000000e+00
+4148 4148 1.00000000000000e+00
+4149 4149 1.00000000000000e+00
+4150 4150 1.00000000000000e+00
+4151 4151 1.00000000000000e+00
+4152 4152 1.00000000000000e+00
+4153 4153 1.00000000000000e+00
+4154 4154 1.00000000000000e+00
+4155 4155 1.00000000000000e+00
+4156 4156 1.00000000000000e+00
+4157 4157 1.00000000000000e+00
+4158 4158 1.00000000000000e+00
+4159 4159 1.00000000000000e+00
+4160 4160 1.00000000000000e+00
+4161 4161 1.00000000000000e+00
+4162 4162 1.00000000000000e+00
+4163 4163 1.00000000000000e+00
+4164 4164 1.00000000000000e+00
+4165 4165 1.00000000000000e+00
+4166 4166 1.00000000000000e+00
+4167 4167 1.00000000000000e+00
+4168 4168 1.00000000000000e+00
+4169 4169 1.00000000000000e+00
+4170 4170 1.00000000000000e+00
+4171 4171 1.00000000000000e+00
+4172 4172 1.00000000000000e+00
+4173 4173 1.00000000000000e+00
+4174 4174 1.00000000000000e+00
+4175 4175 1.00000000000000e+00
+4176 4176 1.00000000000000e+00
+4177 4177 1.00000000000000e+00
+4178 4178 1.00000000000000e+00
+4179 4179 1.00000000000000e+00
+4180 4180 1.00000000000000e+00
+4181 4181 1.00000000000000e+00
+4182 4182 1.00000000000000e+00
+4183 4183 1.00000000000000e+00
+4184 4184 1.00000000000000e+00
+4185 4185 1.00000000000000e+00
+4186 4186 1.00000000000000e+00
+4187 4187 1.00000000000000e+00
+4188 4188 1.00000000000000e+00
+4189 4189 1.00000000000000e+00
+4190 4190 1.00000000000000e+00
+4191 4191 1.00000000000000e+00
+4192 4192 1.00000000000000e+00
+4193 4193 1.00000000000000e+00
+4194 4194 1.00000000000000e+00
+4195 4195 1.00000000000000e+00
+4196 4196 1.00000000000000e+00
+4197 4197 1.00000000000000e+00
+4198 4198 1.00000000000000e+00
+4199 4199 1.00000000000000e+00
+4200 4200 1.00000000000000e+00
+4201 4201 1.00000000000000e+00
+4202 4202 1.00000000000000e+00
+4203 4203 1.00000000000000e+00
+4204 4204 1.00000000000000e+00
+4205 4205 1.00000000000000e+00
+4206 4206 1.00000000000000e+00
+4207 4207 1.00000000000000e+00
+4208 4208 1.00000000000000e+00
+4209 4209 1.00000000000000e+00
+4210 4210 1.00000000000000e+00
+4211 4211 1.00000000000000e+00
+4212 4212 1.00000000000000e+00
+4213 4213 1.00000000000000e+00
+4214 4214 1.00000000000000e+00
+4215 4215 1.00000000000000e+00
+4216 4216 1.00000000000000e+00
+4217 4217 1.00000000000000e+00
+4218 4218 1.00000000000000e+00
+4219 4219 1.00000000000000e+00
+4220 4220 1.00000000000000e+00
+4221 4221 1.00000000000000e+00
+4222 4222 1.00000000000000e+00
+4223 4223 1.00000000000000e+00
+4224 4224 1.00000000000000e+00
+4225 4225 1.00000000000000e+00
+4226 4226 1.00000000000000e+00
+4227 4227 1.00000000000000e+00
+4228 4228 1.00000000000000e+00
+4229 4229 1.00000000000000e+00
+4230 4230 1.00000000000000e+00
+4231 4231 1.00000000000000e+00
+4232 4232 1.00000000000000e+00
+4233 4233 1.00000000000000e+00
+4234 4234 1.00000000000000e+00
+4235 4235 1.00000000000000e+00
+4236 4236 1.00000000000000e+00
+4237 4237 1.00000000000000e+00
+4238 4238 1.00000000000000e+00
+4239 4239 1.00000000000000e+00
+4240 4240 1.00000000000000e+00
+4241 4241 1.00000000000000e+00
+4242 4242 1.00000000000000e+00
+4243 4243 1.00000000000000e+00
+4244 4244 1.00000000000000e+00
+4245 4245 1.00000000000000e+00
+4246 4246 1.00000000000000e+00
+4247 4247 1.00000000000000e+00
+4248 4248 1.00000000000000e+00
+4249 4249 1.00000000000000e+00
+4250 4250 1.00000000000000e+00
+4251 4251 1.00000000000000e+00
+4252 4252 1.00000000000000e+00
+4253 4253 1.00000000000000e+00
+4254 4254 1.00000000000000e+00
+4255 4255 1.00000000000000e+00
+4256 4256 1.00000000000000e+00
+4257 4257 1.00000000000000e+00
+4258 4258 1.00000000000000e+00
+4259 4259 1.00000000000000e+00
+4260 4260 1.00000000000000e+00
+4261 4261 1.00000000000000e+00
+4262 4262 1.00000000000000e+00
+4263 4263 1.00000000000000e+00
+4264 4264 1.00000000000000e+00
+4265 4265 1.00000000000000e+00
+4266 4266 1.00000000000000e+00
+4267 4267 1.00000000000000e+00
+4268 4268 1.00000000000000e+00
+4269 4269 1.00000000000000e+00
+4270 4270 1.00000000000000e+00
+4271 4271 1.00000000000000e+00
+4272 4272 1.00000000000000e+00
+4273 4273 1.00000000000000e+00
+4274 4274 1.00000000000000e+00
+4275 4275 1.00000000000000e+00
+4276 4276 1.00000000000000e+00
+4277 4277 1.00000000000000e+00
+4278 4278 1.00000000000000e+00
+4279 4279 1.00000000000000e+00
+4280 4280 1.00000000000000e+00
+4281 4281 1.00000000000000e+00
+4282 4282 1.00000000000000e+00
+4283 4283 1.00000000000000e+00
+4284 4284 1.00000000000000e+00
+4285 4285 1.00000000000000e+00
+4286 4286 1.00000000000000e+00
+4287 4287 1.00000000000000e+00
+4288 4288 1.00000000000000e+00
+4289 4289 1.00000000000000e+00
+4290 4290 1.00000000000000e+00
+4291 4291 1.00000000000000e+00
+4292 4292 1.00000000000000e+00
+4293 4293 1.00000000000000e+00
+4294 4294 1.00000000000000e+00
+4295 4295 1.00000000000000e+00
+4296 4296 1.00000000000000e+00
+4297 4297 1.00000000000000e+00
+4298 4298 1.00000000000000e+00
+4299 4299 1.00000000000000e+00
+4300 4300 1.00000000000000e+00
+4301 4301 1.00000000000000e+00
+4302 4302 1.00000000000000e+00
+4303 4303 1.00000000000000e+00
+4304 4304 1.00000000000000e+00
+4305 4305 1.00000000000000e+00
+4306 4306 1.00000000000000e+00
+4307 4307 1.00000000000000e+00
+4308 4308 1.00000000000000e+00
+4309 4309 1.00000000000000e+00
+4310 4310 1.00000000000000e+00
+4311 4311 1.00000000000000e+00
+4312 4312 1.00000000000000e+00
+4313 4313 1.00000000000000e+00
+4314 4314 1.00000000000000e+00
+4315 4315 1.00000000000000e+00
+4316 4316 1.00000000000000e+00
+4317 4317 1.00000000000000e+00
+4318 4318 1.00000000000000e+00
+4319 4319 1.00000000000000e+00
+4320 4320 1.00000000000000e+00
+4321 4321 1.00000000000000e+00
+4322 4322 1.00000000000000e+00
+4323 4323 1.00000000000000e+00
+4324 4324 1.00000000000000e+00
+4325 4325 1.00000000000000e+00
+4326 4326 1.00000000000000e+00
+4327 4327 1.00000000000000e+00
+4328 4328 1.00000000000000e+00
+4329 4329 1.00000000000000e+00
+4330 4330 1.00000000000000e+00
+4331 4331 1.00000000000000e+00
+4332 4332 1.00000000000000e+00
+4333 4333 1.00000000000000e+00
+4334 4334 1.00000000000000e+00
+4335 4335 1.00000000000000e+00
+4336 4336 1.00000000000000e+00
+4337 4337 1.00000000000000e+00
+4338 4338 1.00000000000000e+00
+4339 4339 1.00000000000000e+00
+4340 4340 1.00000000000000e+00
+4341 4341 1.00000000000000e+00
+4342 4342 1.00000000000000e+00
+4343 4343 1.00000000000000e+00
+4344 4344 1.00000000000000e+00
+4345 4345 1.00000000000000e+00
+4346 4346 1.00000000000000e+00
+4347 4347 1.00000000000000e+00
+4348 4348 1.00000000000000e+00
+4349 4349 1.00000000000000e+00
+4350 4350 1.00000000000000e+00
+4351 4351 1.00000000000000e+00
+4352 4352 1.00000000000000e+00
+4353 4353 1.00000000000000e+00
+4354 4354 1.00000000000000e+00
+4355 4355 1.00000000000000e+00
+4356 4356 1.00000000000000e+00
+4357 4357 1.00000000000000e+00
+4358 4358 1.00000000000000e+00
+4359 4359 1.00000000000000e+00
+4360 4360 1.00000000000000e+00
+4361 4361 1.00000000000000e+00
+4362 4362 1.00000000000000e+00
+4363 4363 1.00000000000000e+00
+4364 4364 1.00000000000000e+00
+4365 4365 1.00000000000000e+00
+4366 4366 1.00000000000000e+00
+4367 4367 1.00000000000000e+00
+4368 4368 1.00000000000000e+00
+4369 4369 1.00000000000000e+00
+4370 4370 1.00000000000000e+00
+4371 4371 1.00000000000000e+00
+4372 4372 1.00000000000000e+00
+4373 4373 1.00000000000000e+00
+4374 4374 1.00000000000000e+00
+4375 4375 1.00000000000000e+00
+4376 4376 1.00000000000000e+00
+4377 4377 1.00000000000000e+00
+4378 4378 1.00000000000000e+00
+4379 4379 1.00000000000000e+00
+4380 4380 1.00000000000000e+00
+4381 4381 1.00000000000000e+00
+4382 4382 1.00000000000000e+00
+4383 4383 1.00000000000000e+00
+4384 4384 1.00000000000000e+00
+4385 4385 1.00000000000000e+00
+4386 4386 1.00000000000000e+00
+4387 4387 1.00000000000000e+00
+4388 4388 1.00000000000000e+00
+4389 4389 1.21320765838513e+00
+4389 3213 2.68083483975976e-05
+4389 3237 4.99765527714196e-05
+4389 3261 1.26524962030200e-08
+4389 3789 1.54671107146394e-04
+4389 3813 6.30109354465528e-02
+4389 3837 2.29883960010645e-02
+4389 3861 1.11277923894419e-05
+4389 4413 1.31811892162328e+00
+4389 4437 1.62292688555021e-01
+4389 4461 3.80183219577206e-04
+4389 4965 1.74906230975333e-04
+4389 4989 7.68476838705000e-01
+4389 5013 1.66127993386259e+00
+4389 5037 6.68679335058792e-02
+4389 5061 1.64562920078711e-04
+4389 5565 6.84807729967536e-04
+4389 5589 1.07199625704486e-01
+4389 5613 9.52927344201592e-02
+4389 5637 3.56458842680582e-03
+4389 5661 4.13226415410000e-10
+4389 6165 2.65320809328760e-07
+4389 6189 2.15051154370615e-04
+4389 6213 1.96678742491974e-04
+4389 6237 4.55670212600412e-06
+4389 16224 -1.60490305820052e-03
+4389 16248 -8.11888108207356e-04
+4389 16272 -2.69616545916967e-06
+4389 16632 -1.32155033546539e-01
+4389 16656 -7.27606402896119e-02
+4389 16680 -1.90946386181216e-03
+4389 17040 -8.37008468300366e-01
+4389 17064 -4.56253711353295e-01
+4389 17088 -1.07855649151747e-02
+4389 17448 -1.47814744601899e+00
+4389 17472 -7.91085148021584e-01
+4389 17496 -1.48604071463105e-02
+4389 17856 -4.22719899012738e-01
+4389 17880 -2.25446163389847e-01
+4389 17904 -4.02463253813648e-03
+4389 18264 -2.25645047563798e-02
+4389 18288 -1.20141728929724e-02
+4389 18312 -2.09120147080729e-04
+4390 4390 1.00000000000000e+00
+4391 4391 1.00000000000000e+00
+4392 4392 1.00000000000000e+00
+4393 4393 1.00000000000000e+00
+4394 4394 1.00000000000000e+00
+4395 4395 1.00000000000000e+00
+4396 4396 1.00000000000000e+00
+4397 4397 1.00000000000000e+00
+4398 4398 1.00000000000000e+00
+4399 4399 1.00000000000000e+00
+4400 4400 1.00000000000000e+00
+4401 4401 1.00000000000000e+00
+4402 4402 1.00000000000000e+00
+4403 4403 1.00000000000000e+00
+4404 4404 1.00000000000000e+00
+4405 4405 1.00000000000000e+00
+4406 4406 1.00000000000000e+00
+4407 4407 1.00000000000000e+00
+4408 4408 1.00000000000000e+00
+4409 4409 1.00000000000000e+00
+4410 4410 1.00000000000000e+00
+4411 4411 1.00000000000000e+00
+4412 4412 1.00000000000000e+00
+4413 4413 2.32800694414842e+01
+4413 3213 4.59222211420516e-02
+4413 3237 1.56701631720264e-01
+4413 3261 8.22857654823530e-03
+4413 3285 5.17228162006518e-06
+4413 3789 3.30908086177547e-03
+4413 3813 6.11383506306117e+00
+4413 3837 6.37363411517362e+00
+4413 3861 1.11544915246482e-01
+4413 3885 9.87647472616811e-05
+4413 4389 1.31811892162328e+00
+4413 4437 9.48469133812469e+00
+4413 4461 2.56110343441899e-01
+4413 4485 7.01342460993342e-04
+4413 4965 1.81867178720740e-04
+4413 4989 2.82246097617265e+00
+4413 5013 1.00664315766850e+01
+4413 5037 2.47430333521974e+00
+4413 5061 1.14640260342688e-01
+4413 5085 1.09163930156511e-04
+4413 5565 7.12317907240384e-04
+4413 5589 2.26802376575180e-01
+4413 5613 3.91337936004920e-01
+4413 5637 9.66358510578611e-02
+4413 5661 6.61404141397720e-03
+4413 6165 2.76965240371850e-07
+4413 6189 2.50863875796689e-04
+4413 6213 3.22067592846329e-04
+4413 6237 2.22694656811325e-04
+4413 6261 7.65518854573805e-06
+4413 15816 -4.88682978709439e-02
+4413 15840 -3.23742370319451e-02
+4413 15864 -2.27056743930502e-03
+4413 15888 -5.30610853420280e-07
+4413 16224 -2.28074346771651e+00
+4413 16248 -1.42156879861829e+00
+4413 16272 -8.82386895391234e-02
+4413 16296 -2.12602681745371e-03
+4413 16632 -1.09254701506262e+01
+4413 16656 -7.22856710572103e+00
+4413 16680 -5.87225973957979e-01
+4413 16704 -2.22660675726953e-02
+4413 17040 -1.34003793834150e+01
+4413 17064 -1.01403827040803e+01
+4413 17088 -1.20726376709721e+00
+4413 17112 -6.04023209590327e-02
+4413 17448 -7.25120728299891e+00
+4413 17472 -4.98769432682693e+00
+4413 17496 -4.87838300554039e-01
+4413 17520 -2.65648743547446e-02
+4413 17856 -1.26735440242565e+00
+4413 17880 -7.88820640174501e-01
+4413 17904 -5.62077263860371e-02
+4413 17928 -3.19873872226571e-03
+4413 18264 -2.35820716352029e-02
+4413 18288 -1.30329133732078e-02
+4413 18312 -3.54822158744667e-04
+4414 4414 1.00000000000000e+00
+4415 4415 1.00000000000000e+00
+4416 4416 1.00000000000000e+00
+4417 4417 1.00000000000000e+00
+4418 4418 1.00000000000000e+00
+4419 4419 1.00000000000000e+00
+4420 4420 1.00000000000000e+00
+4421 4421 1.00000000000000e+00
+4422 4422 1.00000000000000e+00
+4423 4423 1.00000000000000e+00
+4424 4424 1.00000000000000e+00
+4425 4425 1.00000000000000e+00
+4426 4426 1.00000000000000e+00
+4427 4427 1.00000000000000e+00
+4428 4428 1.00000000000000e+00
+4429 4429 1.00000000000000e+00
+4430 4430 1.00000000000000e+00
+4431 4431 1.00000000000000e+00
+4432 4432 1.00000000000000e+00
+4433 4433 1.00000000000000e+00
+4434 4434 1.00000000000000e+00
+4435 4435 1.00000000000000e+00
+4436 4436 1.00000000000000e+00
+4437 4437 1.66107668831665e+01
+4437 2637 7.09412875459543e-05
+4437 2661 1.20547285967300e-04
+4437 2685 1.85443126627615e-06
+4437 3213 5.71113368287821e-02
+4437 3237 3.98093749650465e-01
+4437 3261 1.06494160843870e-01
+4437 3285 3.82984705123397e-03
+4437 3309 7.44503075326017e-06
+4437 3333 1.61450000000000e-16
+4437 3789 8.16320942124741e-04
+4437 3813 4.37323350928698e+00
+4437 3837 8.30042343340743e+00
+4437 3861 2.30136421296784e+00
+4437 3885 1.63787166671299e-01
+4437 3909 2.12410211905635e-04
+4437 3933 1.16118000000000e-15
+4437 4389 1.62292688555021e-01
+4437 4413 9.48469133812469e+00
+4437 4461 6.43803972467895e+00
+4437 4485 3.08047702966223e-01
+4437 4509 6.38231870732978e-04
+4437 4965 1.02677524531000e-09
+4437 4989 1.54296983896809e-01
+4437 5013 2.75103404825537e+00
+4437 5037 6.38956406917378e+00
+4437 5061 2.63300019074898e+00
+4437 5085 1.12349617391641e-01
+4437 5109 4.76842667935605e-05
+4437 5565 4.08628167584000e-09
+4437 5589 6.97895973065605e-03
+4437 5613 9.18742608481252e-02
+4437 5637 3.19722565471041e-01
+4437 5661 1.33641182211232e-01
+4437 5685 5.78011380667543e-03
+4437 5709 1.51877667859400e-08
+4437 6165 1.83791670000000e-12
+4437 6189 8.30405258521000e-09
+4437 6213 8.08979821477044e-05
+4437 6237 6.78079290028163e-04
+4437 6261 9.36342827745027e-05
+4437 6285 5.17030619608310e-07
+4437 6309 1.07492419000000e-12
+4437 15408 -3.39183723660170e-04
+4437 15432 -1.97299421219378e-03
+4437 15456 -2.80648045101085e-03
+4437 15480 -6.16935639697721e-04
+4437 15504 -1.82286164144400e-08
+4437 15816 -1.65636733875927e-01
+4437 15840 -3.45089594634299e-01
+4437 15864 -3.35634600221834e-01
+4437 15888 -7.56563029286552e-02
+4437 15912 -1.46560958747284e-03
+4437 16224 -2.36081159036054e+00
+4437 16248 -3.50368766140365e+00
+4437 16272 -2.74934680092513e+00
+4437 16296 -6.47334861429473e-01
+4437 16320 -2.30088250458341e-02
+4437 16344 -3.73102447881600e-08
+4437 16632 -7.62575536054902e+00
+4437 16656 -1.02980360621150e+01
+4437 16680 -7.16654941689140e+00
+4437 16704 -1.73717993124592e+00
+4437 16728 -8.21777190579343e-02
+4437 16752 -2.47764597396860e-07
+4437 17040 -4.33414068707040e+00
+4437 17064 -7.61855577416926e+00
+4437 17088 -5.68289186565238e+00
+4437 17112 -1.35589596977103e+00
+4437 17136 -6.57338060232603e-02
+4437 17160 -4.31404717765000e-07
+4437 17448 -8.02167487971855e-01
+4437 17472 -1.62540162070129e+00
+4437 17496 -1.23817040319278e+00
+4437 17520 -2.85679637321199e-01
+4437 17544 -1.24654553297144e-02
+4437 17568 -9.85236182442100e-08
+4437 17856 -3.85260548717751e-02
+4437 17880 -6.90657784007949e-02
+4437 17904 -4.79131606910220e-02
+4437 17928 -9.38575092160602e-03
+4437 17952 -8.49783613857458e-05
+4437 18264 -1.63349069221820e-07
+4437 18288 -2.10202261173670e-07
+4437 18312 -3.67222075893600e-08
+4438 4438 1.00000000000000e+00
+4439 4439 1.00000000000000e+00
+4440 4440 1.00000000000000e+00
+4441 4441 1.00000000000000e+00
+4442 4442 1.00000000000000e+00
+4443 4443 1.00000000000000e+00
+4444 4444 1.00000000000000e+00
+4445 4445 1.00000000000000e+00
+4446 4446 1.00000000000000e+00
+4447 4447 1.00000000000000e+00
+4448 4448 1.00000000000000e+00
+4449 4449 1.00000000000000e+00
+4450 4450 1.00000000000000e+00
+4451 4451 1.00000000000000e+00
+4452 4452 1.00000000000000e+00
+4453 4453 1.00000000000000e+00
+4454 4454 1.00000000000000e+00
+4455 4455 1.00000000000000e+00
+4456 4456 1.00000000000000e+00
+4457 4457 1.00000000000000e+00
+4458 4458 1.00000000000000e+00
+4459 4459 1.00000000000000e+00
+4460 4460 1.00000000000000e+00
+4461 4461 1.66152374232947e+01
+4461 2637 2.54420757694263e-04
+4461 2661 5.98389187080576e-04
+4461 2685 3.87416569810659e-05
+4461 2709 2.08930460891820e-07
+4461 2733 3.55340800000000e-14
+4461 3213 2.48600030779947e-03
+4461 3237 1.02944973256480e-01
+4461 3261 3.44526895845680e-01
+4461 3285 1.58330381854041e-01
+4461 3309 7.20183881084101e-03
+4461 3333 1.65821052232080e-07
+4461 3357 6.35000000000000e-18
+4461 3789 8.78103357304610e-07
+4461 3813 9.56967206476581e-02
+4461 3837 2.28682142390906e+00
+4461 3861 7.22470846299925e+00
+4461 3885 2.77588105773609e+00
+4461 3909 1.38803384818389e-01
+4461 3933 2.62041531254356e-04
+4461 3957 1.01200000000000e-17
+4461 4389 3.80183219577206e-04
+4461 4413 2.56110343441899e-01
+4461 4437 6.43803972467895e+00
+4461 4485 6.32140157665027e+00
+4461 4509 2.91682199132937e-01
+4461 4533 4.67153324025478e-04
+4461 4989 3.05165715246753e-04
+4461 5013 1.30468906119894e-01
+4461 5037 2.61139860278923e+00
+4461 5061 6.01317879021487e+00
+4461 5085 2.31426725984317e+00
+4461 5109 1.13542902326334e-01
+4461 5133 1.87607910286077e-05
+4461 5589 1.31669194616127e-06
+4461 5613 4.00256385214300e-03
+4461 5637 1.29959229577417e-01
+4461 5661 3.01419830152279e-01
+4461 5685 1.03986644421699e-01
+4461 5709 4.70380571098778e-03
+4461 5733 7.22147823010720e-07
+4461 6213 2.47633161065664e-06
+4461 6237 4.54682972154229e-05
+4461 6261 2.76673039955496e-04
+4461 6285 3.16588033027809e-04
+4461 6309 3.90695406012370e-07
+4461 15024 -3.45535269833850e-07
+4461 15048 -3.90079655830210e-06
+4461 15072 -1.04201598584569e-05
+4461 15096 -2.51866616999200e-06
+4461 15120 -2.67275633000000e-12
+4461 15408 -1.21583139608406e-03
+4461 15432 -3.39913024247126e-02
+4461 15456 -1.44954846645986e-01
+4461 15480 -1.38745469119399e-01
+4461 15504 -3.00750972078252e-02
+4461 15528 -7.12208246196801e-04
+4461 15816 -3.17314047065666e-02
+4461 15840 -5.66300017826269e-01
+4461 15864 -2.15460430129381e+00
+4461 15888 -1.87921702765295e+00
+4461 15912 -4.41673679756449e-01
+4461 15936 -2.20016673822274e-02
+4461 15960 -3.98147192210440e-07
+4461 16224 -1.43634132019865e-01
+4461 16248 -2.25180646794102e+00
+4461 16272 -8.19445174042288e+00
+4461 16296 -6.94499300146922e+00
+4461 16320 -1.71506375002887e+00
+4461 16344 -1.07211408631076e-01
+4461 16368 -1.33092751663790e-05
+4461 16632 -1.70767136446978e-01
+4461 16656 -2.49991636289071e+00
+4461 16680 -8.89099175463522e+00
+4461 16704 -7.59830514439927e+00
+4461 16728 -1.97095422806589e+00
+4461 16752 -1.41157639159402e-01
+4461 16776 -4.77885378091524e-05
+4461 17040 -5.14093378669864e-02
+4461 17064 -8.31720144615531e-01
+4461 17088 -3.01355636355886e+00
+4461 17112 -2.46519311509011e+00
+4461 17136 -6.07890324229406e-01
+4461 17160 -3.97012792058160e-02
+4461 17184 -1.38112665047085e-05
+4461 17448 -4.12660314887432e-03
+4461 17472 -8.48036522135806e-02
+4461 17496 -3.19772793067185e-01
+4461 17520 -2.40577424961979e-01
+4461 17544 -5.22627933309471e-02
+4461 17568 -2.45335414009289e-03
+4461 17592 -5.23645026792810e-07
+4461 17856 -2.87059089138043e-06
+4461 17880 -2.63403151354003e-04
+4461 17904 -1.04490660266624e-03
+4461 17928 -3.89332230272224e-04
+4461 17952 -3.43528606209355e-05
+4462 4462 1.00000000000000e+00
+4463 4463 1.00000000000000e+00
+4464 4464 1.00000000000000e+00
+4465 4465 1.00000000000000e+00
+4466 4466 1.00000000000000e+00
+4467 4467 1.00000000000000e+00
+4468 4468 1.00000000000000e+00
+4469 4469 1.00000000000000e+00
+4470 4470 1.00000000000000e+00
+4471 4471 1.00000000000000e+00
+4472 4472 1.00000000000000e+00
+4473 4473 1.00000000000000e+00
+4474 4474 1.00000000000000e+00
+4475 4475 1.00000000000000e+00
+4476 4476 1.00000000000000e+00
+4477 4477 1.00000000000000e+00
+4478 4478 1.00000000000000e+00
+4479 4479 1.00000000000000e+00
+4480 4480 1.00000000000000e+00
+4481 4481 1.00000000000000e+00
+4482 4482 1.00000000000000e+00
+4483 4483 1.00000000000000e+00
+4484 4484 1.00000000000000e+00
+4485 4485 1.58390083592943e+01
+4485 2637 1.16629760528201e-06
+4485 2661 1.08990327590319e-04
+4485 2685 3.90821018534074e-04
+4485 2709 1.60494948635366e-04
+4485 2733 7.31269937100000e-11
+4485 3213 4.13083515611080e-07
+4485 3237 5.91766666038560e-03
+4485 3261 1.65476629083131e-01
+4485 3285 3.90074702897613e-01
+4485 3309 9.51566419059972e-02
+4485 3333 4.58947816494336e-03
+4485 3357 3.07268247464825e-06
+4485 3813 1.81715951490776e-05
+4485 3837 1.59134713973787e-01
+4485 3861 2.77392916116127e+00
+4485 3885 6.72471884021619e+00
+4485 3909 2.69560330541532e+00
+4485 3933 1.20597050544890e-01
+4485 3957 2.14991453078892e-04
+4485 4413 7.01342460993342e-04
+4485 4437 3.08047702966223e-01
+4485 4461 6.32140157665027e+00
+4485 4509 6.07253200657606e+00
+4485 4533 3.24085759625726e-01
+4485 4557 3.89714704487467e-04
+4485 4581 3.80000000000000e-19
+4485 5013 2.20082275981327e-04
+4485 5037 1.22356735855194e-01
+4485 5061 2.32069493927853e+00
+4485 5085 5.58574866139339e+00
+4485 5109 2.27567422516411e+00
+4485 5133 1.29265031934992e-01
+4485 5157 3.45354354387674e-05
+4485 5613 2.79430157966997e-06
+4485 5637 4.93536473027629e-03
+4485 5661 8.99707006266845e-02
+4485 5685 2.94052596094355e-01
+4485 5709 1.13586382165692e-01
+4485 5733 3.00569983360125e-03
+4485 5757 2.19066051226412e-06
+4485 6237 2.14304096016500e-08
+4485 6261 1.76641060064218e-04
+4485 6285 2.80445054406418e-04
+4485 6309 8.43467389934002e-05
+4485 6333 5.31858846635916e-06
+4485 15024 -4.61831190340904e-06
+4485 15048 -2.16046850008645e-03
+4485 15072 -1.29413237855623e-02
+4485 15096 -1.97720813716512e-02
+4485 15120 -4.98947752019860e-03
+4485 15144 -1.55188264107734e-04
+4485 15408 -4.99658735013190e-06
+4485 15432 -1.65362016833932e-02
+4485 15456 -2.34219438433393e-01
+4485 15480 -8.76028072878760e-01
+4485 15504 -9.36190402441567e-01
+4485 15528 -2.68460388411363e-01
+4485 15552 -2.03872129237745e-02
+4485 15576 -1.33252547496470e-07
+4485 15816 -2.42166638779722e-05
+4485 15840 -1.10018885673366e-01
+4485 15864 -1.43097519682743e+00
+4485 15888 -5.11917555376152e+00
+4485 15912 -5.30453705292561e+00
+4485 15936 -1.59016329279602e+00
+4485 15960 -1.36848367689043e-01
+4485 15984 -9.54730890178446e-05
+4485 16224 -2.19178452599104e-05
+4485 16248 -2.00180555053652e-01
+4485 16272 -2.47405737344552e+00
+4485 16296 -8.63045626787820e+00
+4485 16320 -8.88021871768787e+00
+4485 16344 -2.79102250318825e+00
+4485 16368 -2.65399292796339e-01
+4485 16392 -4.18824570894584e-04
+4485 16632 -4.23031447744463e-06
+4485 16656 -7.55358123396616e-02
+4485 16680 -1.09956716241353e+00
+4485 16704 -4.10122884318575e+00
+4485 16728 -4.25765599427586e+00
+4485 16752 -1.30451795486918e+00
+4485 16776 -1.18129358804485e-01
+4485 16800 -2.50664090970469e-04
+4485 17064 -8.02865271786982e-03
+4485 17088 -1.55321867795441e-01
+4485 17112 -6.26267686291771e-01
+4485 17136 -6.39847535218463e-01
+4485 17160 -1.85449956010224e-01
+4485 17184 -1.51559787944261e-02
+4485 17208 -3.89310030356526e-05
+4485 17472 -3.48101433441661e-05
+4485 17496 -3.21498529089219e-03
+4485 17520 -1.42016680674157e-02
+4485 17544 -1.05393873554719e-02
+4485 17568 -1.89638474168424e-03
+4485 17592 -8.12642191870758e-06
+4486 4486 1.00000000000000e+00
+4487 4487 1.00000000000000e+00
+4488 4488 1.00000000000000e+00
+4489 4489 1.00000000000000e+00
+4490 4490 1.00000000000000e+00
+4491 4491 1.00000000000000e+00
+4492 4492 1.00000000000000e+00
+4493 4493 1.00000000000000e+00
+4494 4494 1.00000000000000e+00
+4495 4495 1.00000000000000e+00
+4496 4496 1.00000000000000e+00
+4497 4497 1.00000000000000e+00
+4498 4498 1.00000000000000e+00
+4499 4499 1.00000000000000e+00
+4500 4500 1.00000000000000e+00
+4501 4501 1.00000000000000e+00
+4502 4502 1.00000000000000e+00
+4503 4503 1.00000000000000e+00
+4504 4504 1.00000000000000e+00
+4505 4505 1.00000000000000e+00
+4506 4506 1.00000000000000e+00
+4507 4507 1.00000000000000e+00
+4508 4508 1.00000000000000e+00
+4509 4509 1.66019127419810e+01
+4509 2637 8.34516350000000e-13
+4509 2661 1.13169651915075e-06
+4509 2685 2.98307779105627e-04
+4509 2709 1.51134942095430e-04
+4509 2733 9.32791876860000e-10
+4509 3237 1.80315251593800e-08
+4509 3261 7.60696239971773e-03
+4509 3285 1.10751375218815e-01
+4509 3309 2.61946729281432e-01
+4509 3333 8.90814666278429e-02
+4509 3357 1.60503283768704e-03
+4509 3837 7.38617469010381e-05
+4509 3861 1.29158141991549e-01
+4509 3885 2.67314736954823e+00
+4509 3909 6.03243372310633e+00
+4509 3933 2.14495058601446e+00
+4509 3957 1.01082040273076e-01
+4509 3981 2.27061860767542e-04
+4509 4005 4.86770000000000e-16
+4509 4437 6.38231870732978e-04
+4509 4461 2.91682199132937e-01
+4509 4485 6.07253200657607e+00
+4509 4533 6.56258203238964e+00
+4509 4557 3.38445502301242e-01
+4509 4581 2.83309791446212e-04
+4509 4605 1.43269000000000e-15
+4509 5037 9.68204573979320e-05
+4509 5061 1.17330424634126e-01
+4509 5085 2.28425795486040e+00
+4509 5109 6.05533313607160e+00
+4509 5133 2.44145806955096e+00
+4509 5157 1.33750852826006e-01
+4509 5181 1.16427669681292e-04
+4509 5637 4.10056075839950e-07
+4509 5661 5.39569286250705e-03
+4509 5685 1.04894232584914e-01
+4509 5709 2.61254999604077e-01
+4509 5733 1.24287728839431e-01
+4509 5757 2.88298668641234e-03
+4509 5781 1.67959048382325e-06
+4509 6237 1.11133603000000e-12
+4509 6261 2.29509986312700e-08
+4509 6285 3.99813715338224e-05
+4509 6309 5.34088471120003e-04
+4509 6333 1.78814708764559e-04
+4509 6357 4.70536121254552e-06
+4509 6933 5.46280000000000e-16
+4509 6957 8.29700000000000e-17
+4509 15024 -7.90465775745000e-09
+4509 15048 -1.73196606922709e-03
+4509 15072 -4.16778281377553e-02
+4509 15096 -1.98215657855372e-01
+4509 15120 -2.75221263027286e-01
+4509 15144 -9.96338200064898e-02
+4509 15168 -1.05376172650655e-02
+4509 15192 -2.84904636177000e-09
+4509 15432 -1.26266347100430e-07
+4509 15456 -3.12514410067268e-02
+4509 15480 -5.39531734989152e-01
+4509 15504 -2.34143120142432e+00
+4509 15528 -3.15212942479744e+00
+4509 15552 -1.16968533203041e+00
+4509 15576 -1.30571047099530e-01
+4509 15600 -3.11177468058395e-04
+4509 15840 -3.86495522040020e-07
+4509 15864 -1.08175470687364e-01
+4509 15888 -1.74396899578495e+00
+4509 15912 -7.42284113932549e+00
+4509 15936 -1.00058294587787e+01
+4509 15960 -3.73623591502840e+00
+4509 15984 -4.22827509282693e-01
+4509 16008 -1.64331298995035e-03
+4509 16248 -9.46477160706400e-08
+4509 16272 -6.10196194821578e-02
+4509 16296 -1.19479722097738e+00
+4509 16320 -5.34832249232646e+00
+4509 16344 -7.17876805185175e+00
+4509 16368 -2.64775831761198e+00
+4509 16392 -2.97980555261445e-01
+4509 16416 -1.90576692073232e-03
+4509 16680 -9.54620552641469e-03
+4509 16704 -2.51340603069218e-01
+4509 16728 -1.18550249725813e+00
+4509 16752 -1.56150964536207e+00
+4509 16776 -5.43816655026182e-01
+4509 16800 -5.66160552656316e-02
+4509 16824 -3.98715594254582e-04
+4509 17088 -9.92519568879602e-05
+4509 17112 -1.23920601170130e-02
+4509 17136 -6.46783074102988e-02
+4509 17160 -7.96429948358936e-02
+4509 17184 -2.16090931874468e-02
+4509 17208 -1.25262710500987e-03
+4509 17232 -1.74352105968200e-08
+4509 17520 -1.61126130499370e-07
+4509 17544 -7.02160393795410e-07
+4509 17568 -3.91749617691140e-07
+4509 17592 -5.76558717979400e-08
+4510 4510 1.00000000000000e+00
+4511 4511 1.00000000000000e+00
+4512 4512 1.00000000000000e+00
+4513 4513 1.00000000000000e+00
+4514 4514 1.00000000000000e+00
+4515 4515 1.00000000000000e+00
+4516 4516 1.00000000000000e+00
+4517 4517 1.00000000000000e+00
+4518 4518 1.00000000000000e+00
+4519 4519 1.00000000000000e+00
+4520 4520 1.00000000000000e+00
+4521 4521 1.00000000000000e+00
+4522 4522 1.00000000000000e+00
+4523 4523 1.00000000000000e+00
+4524 4524 1.00000000000000e+00
+4525 4525 1.00000000000000e+00
+4526 4526 1.00000000000000e+00
+4527 4527 1.00000000000000e+00
+4528 4528 1.00000000000000e+00
+4529 4529 1.00000000000000e+00
+4530 4530 1.00000000000000e+00
+4531 4531 1.00000000000000e+00
+4532 4532 1.00000000000000e+00
+4533 4533 1.64581799012988e+01
+4533 2685 1.76345157057950e-06
+4533 2709 9.01164771458639e-06
+4533 2733 8.85453302770000e-10
+4533 3285 5.34094459172507e-03
+4533 3309 1.18442951526062e-01
+4533 3333 2.74020269122421e-01
+4533 3357 3.21160075323181e-02
+4533 3861 1.40199035422927e-04
+4533 3885 1.03910226659845e-01
+4533 3909 2.20243939165178e+00
+4533 3933 6.20292311079304e+00
+4533 3957 3.20527510274181e+00
+4533 3981 1.26642207232517e-01
+4533 4005 1.24828921303146e-06
+4533 4461 4.67153324025478e-04
+4533 4485 3.24085759625726e-01
+4533 4509 6.56258203238964e+00
+4533 4557 5.95013494598460e+00
+4533 4581 3.65589698849338e-01
+4533 4605 1.57546452617901e-04
+4533 5061 8.91005421407040e-05
+4533 5085 1.32107227727700e-01
+4533 5109 2.43971202276566e+00
+4533 5133 6.54732452314663e+00
+4533 5157 2.52076813096792e+00
+4533 5181 9.38903743213116e-02
+4533 5205 1.17729495477174e-04
+4533 5661 6.72456755290744e-06
+4533 5685 2.66749886865829e-03
+4533 5709 1.19507368978337e-01
+4533 5733 2.93701725343253e-01
+4533 5757 1.20361755725486e-01
+4533 5781 4.36077583164111e-03
+4533 5805 5.57780449472120e-07
+4533 6285 1.93816942058847e-06
+4533 6309 6.51738304218107e-05
+4533 6333 2.93336389137458e-04
+4533 6357 2.41938520180969e-04
+4533 6381 7.38583222521854e-06
+4533 6933 8.37030000000000e-16
+4533 6957 1.27120000000000e-16
+4533 15072 -6.82991249166330e-03
+4533 15096 -2.12057904827481e-01
+4533 15120 -1.33921351264528e+00
+4533 15144 -2.69515405120276e+00
+4533 15168 -1.14051294456304e+00
+4533 15192 -1.37927352900205e-01
+4533 15216 -3.08469849872086e-04
+4533 15480 -3.21841845409029e-02
+4533 15504 -8.00085278224091e-01
+4533 15528 -4.42373616499343e+00
+4533 15552 -7.85669670876051e+00
+4533 15576 -3.15244129814918e+00
+4533 15600 -3.74380593890012e-01
+4533 15624 -3.41592650809739e-03
+4533 15888 -3.98639657652776e-02
+4533 15912 -1.20828029646931e+00
+4533 15936 -6.39325921400920e+00
+4533 15960 -1.02216097184026e+01
+4533 15984 -4.32881999660594e+00
+4533 16008 -5.76961529729774e-01
+4533 16032 -9.14157579495089e-03
+4533 16296 -9.44696404610494e-03
+4533 16320 -3.96364039902606e-01
+4533 16344 -2.16294920165829e+00
+4533 16368 -3.40775270230956e+00
+4533 16392 -1.41134525042510e+00
+4533 16416 -1.82793376238339e-01
+4533 16440 -2.60171715117958e-03
+4533 16704 -2.48574860122963e-04
+4533 16728 -3.39204386699666e-02
+4533 16752 -1.98701968048536e-01
+4533 16776 -3.13158933648111e-01
+4533 16800 -1.19803551127479e-01
+4533 16824 -1.36571193791511e-02
+4533 16848 -1.04917510642634e-04
+4533 17136 -1.51013638628263e-04
+4533 17160 -7.78915299212616e-04
+4533 17184 -8.50483332369722e-04
+4533 17208 -1.74967604472396e-04
+4533 17232 -2.67149432083500e-08
+4534 4534 1.00000000000000e+00
+4535 4535 1.00000000000000e+00
+4536 4536 1.00000000000000e+00
+4537 4537 1.00000000000000e+00
+4538 4538 1.00000000000000e+00
+4539 4539 1.00000000000000e+00
+4540 4540 1.00000000000000e+00
+4541 4541 1.00000000000000e+00
+4542 4542 1.00000000000000e+00
+4543 4543 1.00000000000000e+00
+4544 4544 1.00000000000000e+00
+4545 4545 1.00000000000000e+00
+4546 4546 1.00000000000000e+00
+4547 4547 1.00000000000000e+00
+4548 4548 1.00000000000000e+00
+4549 4549 1.00000000000000e+00
+4550 4550 1.00000000000000e+00
+4551 4551 1.00000000000000e+00
+4552 4552 1.00000000000000e+00
+4553 4553 1.00000000000000e+00
+4554 4554 1.00000000000000e+00
+4555 4555 1.00000000000000e+00
+4556 4556 1.00000000000000e+00
+4557 4557 2.08251633581960e+01
+4557 3285 1.50853894583000e-09
+4557 3309 8.70653938089605e-03
+4557 3333 1.27588687451478e-01
+4557 3357 4.60996910959769e-02
+4557 3885 1.14998784692893e-04
+4557 3909 1.01036021558391e-01
+4557 3933 4.15240925190621e+00
+4557 3957 1.20747408504984e+01
+4557 3981 2.93990643686120e+00
+4557 4005 9.08688838913287e-03
+4557 4485 3.89714704487467e-04
+4557 4509 3.38445502301242e-01
+4557 4533 5.95013494598460e+00
+4557 4581 9.74156077354730e+00
+4557 4605 3.62451739099553e-01
+4557 4629 2.15051154370617e-04
+4557 5085 1.44147466930786e-04
+4557 5109 1.41882974823337e-01
+4557 5133 2.54478197047026e+00
+4557 5157 5.48682765881343e+00
+4557 5181 2.30610993286478e+00
+4557 5205 1.22248691713119e-01
+4557 5229 2.50863875796691e-04
+4557 5685 1.29078208718040e-05
+4557 5709 4.30756462080179e-03
+4557 5733 1.03318965213879e-01
+4557 5757 3.57259474892100e-01
+4557 5781 1.41675838469124e-01
+4557 5805 4.47462327059547e-03
+4557 5829 8.30405258521000e-09
+4557 6309 7.04711743687000e-09
+4557 6333 1.28308173330619e-04
+4557 6357 3.16858225254116e-04
+4557 6381 1.65828879302896e-04
+4557 6405 1.56403018457287e-05
+4557 15096 -2.06081244686773e-02
+4557 15120 -9.31015863958383e-01
+4557 15144 -6.32062101669729e+00
+4557 15168 -1.30472690748129e+01
+4557 15192 -5.21913909453381e+00
+4557 15216 -6.14318709256894e-01
+4557 15240 -9.58767802584515e-03
+4557 15504 -2.25678303861427e-02
+4557 15528 -1.14792032596769e+00
+4557 15552 -6.90326339321347e+00
+4557 15576 -1.24786044584956e+01
+4557 15600 -5.95229647679307e+00
+4557 15624 -9.00428623635621e-01
+4557 15648 -1.99678375256178e-02
+4557 15912 -5.20445063742404e-03
+4557 15936 -4.57856882564987e-01
+4557 15960 -2.77314972883564e+00
+4557 15984 -4.91357092063532e+00
+4557 16008 -2.61950144724899e+00
+4557 16032 -4.38209835369890e-01
+4557 16056 -1.02084568245078e-02
+4557 16320 -4.57831467629243e-04
+4557 16344 -7.60852993516091e-02
+4557 16368 -4.95781694150880e-01
+4557 16392 -9.34677063180291e-01
+4557 16416 -4.68654027442267e-01
+4557 16440 -7.35160147784661e-02
+4557 16464 -1.58120002869862e-03
+4557 16752 -1.42313807385484e-03
+4557 16776 -9.94001768869187e-03
+4557 16800 -1.87272890764834e-02
+4557 16824 -5.50462311142662e-03
+4557 16848 -3.14289429538529e-04
+4558 4558 1.00000000000000e+00
+4559 4559 1.00000000000000e+00
+4560 4560 1.00000000000000e+00
+4561 4561 1.00000000000000e+00
+4562 4562 1.00000000000000e+00
+4563 4563 1.00000000000000e+00
+4564 4564 1.00000000000000e+00
+4565 4565 1.00000000000000e+00
+4566 4566 1.00000000000000e+00
+4567 4567 1.00000000000000e+00
+4568 4568 1.00000000000000e+00
+4569 4569 1.00000000000000e+00
+4570 4570 1.00000000000000e+00
+4571 4571 1.00000000000000e+00
+4572 4572 1.00000000000000e+00
+4573 4573 1.00000000000000e+00
+4574 4574 1.00000000000000e+00
+4575 4575 1.00000000000000e+00
+4576 4576 1.00000000000000e+00
+4577 4577 1.00000000000000e+00
+4578 4578 1.00000000000000e+00
+4579 4579 1.00000000000000e+00
+4580 4580 1.00000000000000e+00
+4581 4581 2.50014043927918e+01
+4581 3309 1.18392864123259e-06
+4581 3333 2.12411346181340e-03
+4581 3357 9.81314367921115e-04
+4581 3909 2.02409678011769e-04
+4581 3933 2.69689879613936e-01
+4581 3957 4.59301705652272e+00
+4581 3981 3.00812933496055e+00
+4581 4005 5.92060211873687e-02
+4581 4485 3.80000000000000e-19
+4581 4509 2.83309791446212e-04
+4581 4533 3.65589698849338e-01
+4581 4557 9.74156077354730e+00
+4581 4605 8.41036131317713e+00
+4581 4629 1.07199625704489e-01
+4581 4653 5.88890614340000e-09
+4581 5085 4.40000000000000e-19
+4581 5109 2.51116470786623e-04
+4581 5133 1.05567678610664e-01
+4581 5157 2.18313486092396e+00
+4581 5181 7.59651806450870e+00
+4581 5205 5.59124452074491e+00
+4581 5229 2.26802376575185e-01
+4581 5253 4.05234314351900e-08
+4581 5709 1.01551698587120e-06
+4581 5733 6.21683783583442e-03
+4581 5757 1.34764034047412e-01
+4581 5781 2.76348776783462e-01
+4581 5805 1.05217503878585e-01
+4581 5829 6.97895973065629e-03
+4581 6309 5.21894530000000e-13
+4581 6333 8.53127317558100e-08
+4581 6357 4.63231239090605e-05
+4581 6381 7.57288505340502e-04
+4581 6405 1.35092304002422e-04
+4581 6429 1.31669194616131e-06
+4581 15120 -1.60538004493400e-02
+4581 15144 -1.42258422170924e+00
+4581 15168 -7.85719513899029e+00
+4581 15192 -1.31480554177428e+01
+4581 15216 -1.11286651487524e+01
+4581 15240 -2.49861912557892e+00
+4581 15264 -8.48984408304521e-02
+4581 15528 -9.46517302950758e-03
+4581 15552 -9.00313035298760e-01
+4581 15576 -5.50103384768730e+00
+4581 15600 -1.05430018435054e+01
+4581 15624 -8.15239410774465e+00
+4581 15648 -1.73985483446228e+00
+4581 15672 -5.65856354692914e-02
+4581 15936 -4.10935087373676e-04
+4581 15960 -7.39964518854133e-02
+4581 15984 -6.38758052884543e-01
+4581 16008 -1.62177710123623e+00
+4581 16032 -9.67865603429280e-01
+4581 16056 -1.70527780808149e-01
+4581 16080 -4.21211943045404e-03
+4581 16344 -7.46393400000000e-14
+4581 16368 -5.38291298606254e-03
+4581 16392 -5.10221569510306e-02
+4581 16416 -1.31335544505488e-01
+4581 16440 -6.14995665721276e-02
+4581 16464 -8.17707393505412e-03
+4581 16488 -4.66156117325986e-05
+4581 16776 -2.31168330062660e-07
+4581 16800 -1.46666927100903e-06
+4581 16824 -2.39915213309629e-06
+4581 16848 -5.41995950758410e-07
+4582 4582 1.00000000000000e+00
+4583 4583 1.00000000000000e+00
+4584 4584 1.00000000000000e+00
+4585 4585 1.00000000000000e+00
+4586 4586 1.00000000000000e+00
+4587 4587 1.00000000000000e+00
+4588 4588 1.00000000000000e+00
+4589 4589 1.00000000000000e+00
+4590 4590 1.00000000000000e+00
+4591 4591 1.00000000000000e+00
+4592 4592 1.00000000000000e+00
+4593 4593 1.00000000000000e+00
+4594 4594 1.00000000000000e+00
+4595 4595 1.00000000000000e+00
+4596 4596 1.00000000000000e+00
+4597 4597 1.00000000000000e+00
+4598 4598 1.00000000000000e+00
+4599 4599 1.00000000000000e+00
+4600 4600 1.00000000000000e+00
+4601 4601 1.00000000000000e+00
+4602 4602 1.00000000000000e+00
+4603 4603 1.00000000000000e+00
+4604 4604 1.00000000000000e+00
+4605 4605 1.12846611172946e+01
+4605 3333 1.51028246000000e-11
+4605 3357 4.36402672700000e-11
+4605 3933 1.26615946688093e-06
+4605 3957 6.52643325329211e-02
+4605 3981 2.51332964486057e-01
+4605 4005 2.27218828907762e-02
+4605 4509 1.43269000000000e-15
+4605 4533 1.57546452617901e-04
+4605 4557 3.62451739099553e-01
+4605 4581 8.41036131317713e+00
+4605 4629 7.68476838705022e-01
+4605 4653 7.80904127106655e-05
+4605 5109 5.38430000000000e-16
+4605 5133 2.11681717864975e-04
+4605 5157 1.07149062964959e-01
+4605 5181 3.98787308235862e+00
+4605 5205 1.08522054118621e+01
+4605 5229 2.82246097617273e+00
+4605 5253 3.01114647711887e-02
+4605 5277 5.75738267860000e-09
+4605 5733 8.25552108883434e-06
+4605 5757 2.91387883519292e-03
+4605 5781 9.43923886567084e-02
+4605 5805 2.68021749546518e-01
+4605 5829 1.54296983896814e-01
+4605 5853 9.74515294596671e-03
+4605 5877 1.07430315361200e-08
+4605 6357 2.76280475736875e-06
+4605 6381 6.65602558937131e-05
+4605 6405 1.93413419972703e-04
+4605 6429 3.05165715246779e-04
+4605 6453 1.43358216180987e-06
+4605 6477 2.76977475000000e-12
+4605 15144 -8.52313646765143e-06
+4605 15168 -2.41641731088433e-01
+4605 15192 -3.34611990479090e+00
+4605 15216 -1.10499459964701e+01
+4605 15240 -7.60221651864066e+00
+4605 15264 -1.54591739054225e+00
+4605 15288 -6.40768823076013e-02
+4605 15312 -3.45778598212080e-07
+4605 15552 -4.28709318978558e-06
+4605 15576 -1.51606456257916e-01
+4605 15600 -2.02506210321666e+00
+4605 15624 -6.55683928723499e+00
+4605 15648 -4.37787045752163e+00
+4605 15672 -8.79965056906127e-01
+4605 15696 -3.73800305753875e-02
+4605 15720 -1.80427590875910e-07
+4605 15960 -7.29284455996000e-09
+4605 15984 -8.98842633280559e-03
+4605 16008 -1.03095708974912e-01
+4605 16032 -3.02145747279514e-01
+4605 16056 -1.67023864717950e-01
+4605 16080 -3.06935392903597e-02
+4605 16104 -1.52616840616767e-03
+4605 16128 -2.15379764853000e-09
+4605 16392 -5.18385731630734e-05
+4605 16416 -6.79448506998607e-04
+4605 16440 -1.97260203679892e-03
+4605 16464 -6.01640639348701e-04
+4605 16488 -3.23866062505968e-05
+4606 4606 1.00000000000000e+00
+4607 4607 1.00000000000000e+00
+4608 4608 1.00000000000000e+00
+4609 4609 1.00000000000000e+00
+4610 4610 1.00000000000000e+00
+4611 4611 1.00000000000000e+00
+4612 4612 1.00000000000000e+00
+4613 4613 1.00000000000000e+00
+4614 4614 1.00000000000000e+00
+4615 4615 1.00000000000000e+00
+4616 4616 1.00000000000000e+00
+4617 4617 1.00000000000000e+00
+4618 4618 1.00000000000000e+00
+4619 4619 1.00000000000000e+00
+4620 4620 1.00000000000000e+00
+4621 4621 1.00000000000000e+00
+4622 4622 1.00000000000000e+00
+4623 4623 1.00000000000000e+00
+4624 4624 1.00000000000000e+00
+4625 4625 1.00000000000000e+00
+4626 4626 1.00000000000000e+00
+4627 4627 1.00000000000000e+00
+4628 4628 1.00000000000000e+00
+4629 4629 1.21320765838513e+00
+4629 3957 2.65320809328760e-07
+4629 3981 6.84807729967547e-04
+4629 4005 1.74906230975336e-04
+4629 4557 2.15051154370617e-04
+4629 4581 1.07199625704489e-01
+4629 4605 7.68476838705022e-01
+4629 4653 1.54671107146397e-04
+4629 5157 1.96678742491973e-04
+4629 5181 9.52927344201617e-02
+4629 5205 1.66127993386264e+00
+4629 5229 1.31811892162331e+00
+4629 5253 6.30109354465539e-02
+4629 5277 2.68083483975976e-05
+4629 5757 4.55670212600404e-06
+4629 5781 3.56458842680596e-03
+4629 5805 6.68679335058819e-02
+4629 5829 1.62292688555026e-01
+4629 5853 2.29883960010649e-02
+4629 5877 4.99765527714198e-05
+4629 6381 4.13226415410000e-10
+4629 6405 1.64562920078725e-04
+4629 6429 3.80183219577239e-04
+4629 6453 1.11277923894421e-05
+4629 6477 1.26524962030200e-08
+4629 15192 -2.25645047563801e-02
+4629 15216 -4.22719899012749e-01
+4629 15240 -1.47814744601903e+00
+4629 15264 -8.37008468300385e-01
+4629 15288 -1.32155033546541e-01
+4629 15312 -1.60490305820053e-03
+4629 15600 -1.20141728929726e-02
+4629 15624 -2.25446163389853e-01
+4629 15648 -7.91085148021607e-01
+4629 15672 -4.56253711353308e-01
+4629 15696 -7.27606402896137e-02
+4629 15720 -8.11888108207359e-04
+4629 16008 -2.09120147080725e-04
+4629 16032 -4.02463253813659e-03
+4629 16056 -1.48604071463111e-02
+4629 16080 -1.07855649151755e-02
+4629 16104 -1.90946386181233e-03
+4629 16128 -2.69616545916973e-06
+4630 4630 1.00000000000000e+00
+4631 4631 1.00000000000000e+00
+4632 4632 1.00000000000000e+00
+4633 4633 1.00000000000000e+00
+4634 4634 1.00000000000000e+00
+4635 4635 1.00000000000000e+00
+4636 4636 1.00000000000000e+00
+4637 4637 1.00000000000000e+00
+4638 4638 1.00000000000000e+00
+4639 4639 1.00000000000000e+00
+4640 4640 1.00000000000000e+00
+4641 4641 1.00000000000000e+00
+4642 4642 1.00000000000000e+00
+4643 4643 1.00000000000000e+00
+4644 4644 1.00000000000000e+00
+4645 4645 1.00000000000000e+00
+4646 4646 1.00000000000000e+00
+4647 4647 1.00000000000000e+00
+4648 4648 1.00000000000000e+00
+4649 4649 1.00000000000000e+00
+4650 4650 1.00000000000000e+00
+4651 4651 1.00000000000000e+00
+4652 4652 1.00000000000000e+00
+4653 4653 1.00000068632295e+00
+4653 4581 5.88890614340000e-09
+4653 4605 7.80904127106655e-05
+4653 4629 1.54671107146397e-04
+4653 5157 3.96000000000000e-17
+4653 5181 3.75230044358600e-08
+4653 5205 7.01132519780422e-04
+4653 5229 3.30908086177553e-03
+4653 5253 6.42960599027278e-04
+4653 5277 2.80088098136378e-06
+4653 5757 2.69600000000000e-17
+4653 5781 5.61618000186900e-08
+4653 5805 8.29054817407610e-05
+4653 5829 8.16320942124753e-04
+4653 5853 5.01825510064348e-04
+4653 5877 5.22093285751313e-06
+4653 6381 1.65361740000000e-13
+4653 6405 1.62635643746720e-07
+4653 6429 8.78103357304650e-07
+4653 6453 8.97612361523940e-07
+4653 6477 1.31921271842000e-09
+4653 15216 -4.50372466621900e-08
+4653 15240 -5.26432474004669e-04
+4653 15264 -2.27267444385338e-03
+4653 15288 -1.19673275115656e-03
+4653 15312 -1.67620106534635e-04
+4653 15624 -2.25852715468000e-08
+4653 15648 -2.69315925168941e-04
+4653 15672 -1.16143813803572e-03
+4653 15696 -6.07278449815373e-04
+4653 15720 -8.45132164331549e-05
+4653 16032 -1.90423473400000e-11
+4653 16056 -1.74276804760186e-06
+4653 16080 -7.17169031686507e-06
+4653 16104 -2.54630692488370e-06
+4653 16128 -2.00903761667810e-07
+4654 4654 1.00000000000000e+00
+4655 4655 1.00000000000000e+00
+4656 4656 1.00000000000000e+00
+4657 4657 1.00000000000000e+00
+4658 4658 1.00000000000000e+00
+4659 4659 1.00000000000000e+00
+4660 4660 1.00000000000000e+00
+4661 4661 1.00000000000000e+00
+4662 4662 1.00000000000000e+00
+4663 4663 1.00000000000000e+00
+4664 4664 1.00000000000000e+00
+4665 4665 1.00000000000000e+00
+4666 4666 1.00000000000000e+00
+4667 4667 1.00000000000000e+00
+4668 4668 1.00000000000000e+00
+4669 4669 1.00000000000000e+00
+4670 4670 1.00000000000000e+00
+4671 4671 1.00000000000000e+00
+4672 4672 1.00000000000000e+00
+4673 4673 1.00000000000000e+00
+4674 4674 1.00000000000000e+00
+4675 4675 1.00000000000000e+00
+4676 4676 1.00000000000000e+00
+4677 4677 1.00000000000000e+00
+4678 4678 1.00000000000000e+00
+4679 4679 1.00000000000000e+00
+4680 4680 1.00000000000000e+00
+4681 4681 1.00000000000000e+00
+4682 4682 1.00000000000000e+00
+4683 4683 1.00000000000000e+00
+4684 4684 1.00000000000000e+00
+4685 4685 1.00000000000000e+00
+4686 4686 1.00000000000000e+00
+4687 4687 1.00000000000000e+00
+4688 4688 1.00000000000000e+00
+4689 4689 1.00000000000000e+00
+4690 4690 1.00000000000000e+00
+4691 4691 1.00000000000000e+00
+4692 4692 1.00000000000000e+00
+4693 4693 1.00000000000000e+00
+4694 4694 1.00000000000000e+00
+4695 4695 1.00000000000000e+00
+4696 4696 1.00000000000000e+00
+4697 4697 1.00000000000000e+00
+4698 4698 1.00000000000000e+00
+4699 4699 1.00000000000000e+00
+4700 4700 1.00000000000000e+00
+4701 4701 1.00000000000000e+00
+4702 4702 1.00000000000000e+00
+4703 4703 1.00000000000000e+00
+4704 4704 1.00000000000000e+00
+4705 4705 1.00000000000000e+00
+4706 4706 1.00000000000000e+00
+4707 4707 1.00000000000000e+00
+4708 4708 1.00000000000000e+00
+4709 4709 1.00000000000000e+00
+4710 4710 1.00000000000000e+00
+4711 4711 1.00000000000000e+00
+4712 4712 1.00000000000000e+00
+4713 4713 1.00000000000000e+00
+4714 4714 1.00000000000000e+00
+4715 4715 1.00000000000000e+00
+4716 4716 1.00000000000000e+00
+4717 4717 1.00000000000000e+00
+4718 4718 1.00000000000000e+00
+4719 4719 1.00000000000000e+00
+4720 4720 1.00000000000000e+00
+4721 4721 1.00000000000000e+00
+4722 4722 1.00000000000000e+00
+4723 4723 1.00000000000000e+00
+4724 4724 1.00000000000000e+00
+4725 4725 1.00000000000000e+00
+4726 4726 1.00000000000000e+00
+4727 4727 1.00000000000000e+00
+4728 4728 1.00000000000000e+00
+4729 4729 1.00000000000000e+00
+4730 4730 1.00000000000000e+00
+4731 4731 1.00000000000000e+00
+4732 4732 1.00000000000000e+00
+4733 4733 1.00000000000000e+00
+4734 4734 1.00000000000000e+00
+4735 4735 1.00000000000000e+00
+4736 4736 1.00000000000000e+00
+4737 4737 1.00000000000000e+00
+4738 4738 1.00000000000000e+00
+4739 4739 1.00000000000000e+00
+4740 4740 1.00000000000000e+00
+4741 4741 1.00000000000000e+00
+4742 4742 1.00000000000000e+00
+4743 4743 1.00000000000000e+00
+4744 4744 1.00000000000000e+00
+4745 4745 1.00000000000000e+00
+4746 4746 1.00000000000000e+00
+4747 4747 1.00000000000000e+00
+4748 4748 1.00000000000000e+00
+4749 4749 1.00000000000000e+00
+4750 4750 1.00000000000000e+00
+4751 4751 1.00000000000000e+00
+4752 4752 1.00000000000000e+00
+4753 4753 1.00000000000000e+00
+4754 4754 1.00000000000000e+00
+4755 4755 1.00000000000000e+00
+4756 4756 1.00000000000000e+00
+4757 4757 1.00000000000000e+00
+4758 4758 1.00000000000000e+00
+4759 4759 1.00000000000000e+00
+4760 4760 1.00000000000000e+00
+4761 4761 1.00000000000000e+00
+4762 4762 1.00000000000000e+00
+4763 4763 1.00000000000000e+00
+4764 4764 1.00000000000000e+00
+4765 4765 1.00000000000000e+00
+4766 4766 1.00000000000000e+00
+4767 4767 1.00000000000000e+00
+4768 4768 1.00000000000000e+00
+4769 4769 1.00000000000000e+00
+4770 4770 1.00000000000000e+00
+4771 4771 1.00000000000000e+00
+4772 4772 1.00000000000000e+00
+4773 4773 1.00000000000000e+00
+4774 4774 1.00000000000000e+00
+4775 4775 1.00000000000000e+00
+4776 4776 1.00000000000000e+00
+4777 4777 1.00000000000000e+00
+4778 4778 1.00000000000000e+00
+4779 4779 1.00000000000000e+00
+4780 4780 1.00000000000000e+00
+4781 4781 1.00000000000000e+00
+4782 4782 1.00000000000000e+00
+4783 4783 1.00000000000000e+00
+4784 4784 1.00000000000000e+00
+4785 4785 1.00000000000000e+00
+4786 4786 1.00000000000000e+00
+4787 4787 1.00000000000000e+00
+4788 4788 1.00000000000000e+00
+4789 4789 1.00000000000000e+00
+4790 4790 1.00000000000000e+00
+4791 4791 1.00000000000000e+00
+4792 4792 1.00000000000000e+00
+4793 4793 1.00000000000000e+00
+4794 4794 1.00000000000000e+00
+4795 4795 1.00000000000000e+00
+4796 4796 1.00000000000000e+00
+4797 4797 1.00000000000000e+00
+4798 4798 1.00000000000000e+00
+4799 4799 1.00000000000000e+00
+4800 4800 1.00000000000000e+00
+4801 4801 1.00000000000000e+00
+4802 4802 1.00000000000000e+00
+4803 4803 1.00000000000000e+00
+4804 4804 1.00000000000000e+00
+4805 4805 1.00000000000000e+00
+4806 4806 1.00000000000000e+00
+4807 4807 1.00000000000000e+00
+4808 4808 1.00000000000000e+00
+4809 4809 1.00000000000000e+00
+4810 4810 1.00000000000000e+00
+4811 4811 1.00000000000000e+00
+4812 4812 1.00000000000000e+00
+4813 4813 1.00000000000000e+00
+4814 4814 1.00000000000000e+00
+4815 4815 1.00000000000000e+00
+4816 4816 1.00000000000000e+00
+4817 4817 1.00000000000000e+00
+4818 4818 1.00000000000000e+00
+4819 4819 1.00000000000000e+00
+4820 4820 1.00000000000000e+00
+4821 4821 1.00000000000000e+00
+4822 4822 1.00000000000000e+00
+4823 4823 1.00000000000000e+00
+4824 4824 1.00000000000000e+00
+4825 4825 1.00000000000000e+00
+4826 4826 1.00000000000000e+00
+4827 4827 1.00000000000000e+00
+4828 4828 1.00000000000000e+00
+4829 4829 1.00000000000000e+00
+4830 4830 1.00000000000000e+00
+4831 4831 1.00000000000000e+00
+4832 4832 1.00000000000000e+00
+4833 4833 1.00000000000000e+00
+4834 4834 1.00000000000000e+00
+4835 4835 1.00000000000000e+00
+4836 4836 1.00000000000000e+00
+4837 4837 1.00000000000000e+00
+4838 4838 1.00000000000000e+00
+4839 4839 1.00000000000000e+00
+4840 4840 1.00000000000000e+00
+4841 4841 1.00000000000000e+00
+4842 4842 1.00000000000000e+00
+4843 4843 1.00000000000000e+00
+4844 4844 1.00000000000000e+00
+4845 4845 1.00000000000000e+00
+4846 4846 1.00000000000000e+00
+4847 4847 1.00000000000000e+00
+4848 4848 1.00000000000000e+00
+4849 4849 1.00000000000000e+00
+4850 4850 1.00000000000000e+00
+4851 4851 1.00000000000000e+00
+4852 4852 1.00000000000000e+00
+4853 4853 1.00000000000000e+00
+4854 4854 1.00000000000000e+00
+4855 4855 1.00000000000000e+00
+4856 4856 1.00000000000000e+00
+4857 4857 1.00000000000000e+00
+4858 4858 1.00000000000000e+00
+4859 4859 1.00000000000000e+00
+4860 4860 1.00000000000000e+00
+4861 4861 1.00000000000000e+00
+4862 4862 1.00000000000000e+00
+4863 4863 1.00000000000000e+00
+4864 4864 1.00000000000000e+00
+4865 4865 1.00000000000000e+00
+4866 4866 1.00000000000000e+00
+4867 4867 1.00000000000000e+00
+4868 4868 1.00000000000000e+00
+4869 4869 1.00000000000000e+00
+4870 4870 1.00000000000000e+00
+4871 4871 1.00000000000000e+00
+4872 4872 1.00000000000000e+00
+4873 4873 1.00000000000000e+00
+4874 4874 1.00000000000000e+00
+4875 4875 1.00000000000000e+00
+4876 4876 1.00000000000000e+00
+4877 4877 1.00000000000000e+00
+4878 4878 1.00000000000000e+00
+4879 4879 1.00000000000000e+00
+4880 4880 1.00000000000000e+00
+4881 4881 1.00000000000000e+00
+4882 4882 1.00000000000000e+00
+4883 4883 1.00000000000000e+00
+4884 4884 1.00000000000000e+00
+4885 4885 1.00000000000000e+00
+4886 4886 1.00000000000000e+00
+4887 4887 1.00000000000000e+00
+4888 4888 1.00000000000000e+00
+4889 4889 1.00000000000000e+00
+4890 4890 1.00000000000000e+00
+4891 4891 1.00000000000000e+00
+4892 4892 1.00000000000000e+00
+4893 4893 1.00000000000000e+00
+4894 4894 1.00000000000000e+00
+4895 4895 1.00000000000000e+00
+4896 4896 1.00000000000000e+00
+4897 4897 1.00000000000000e+00
+4898 4898 1.00000000000000e+00
+4899 4899 1.00000000000000e+00
+4900 4900 1.00000000000000e+00
+4901 4901 1.00000000000000e+00
+4902 4902 1.00000000000000e+00
+4903 4903 1.00000000000000e+00
+4904 4904 1.00000000000000e+00
+4905 4905 1.00000000000000e+00
+4906 4906 1.00000000000000e+00
+4907 4907 1.00000000000000e+00
+4908 4908 1.00000000000000e+00
+4909 4909 1.00000000000000e+00
+4910 4910 1.00000000000000e+00
+4911 4911 1.00000000000000e+00
+4912 4912 1.00000000000000e+00
+4913 4913 1.00000000000000e+00
+4914 4914 1.00000000000000e+00
+4915 4915 1.00000000000000e+00
+4916 4916 1.00000000000000e+00
+4917 4917 1.00000000000000e+00
+4918 4918 1.00000000000000e+00
+4919 4919 1.00000000000000e+00
+4920 4920 1.00000000000000e+00
+4921 4921 1.00000000000000e+00
+4922 4922 1.00000000000000e+00
+4923 4923 1.00000000000000e+00
+4924 4924 1.00000000000000e+00
+4925 4925 1.00000000000000e+00
+4926 4926 1.00000000000000e+00
+4927 4927 1.00000000000000e+00
+4928 4928 1.00000000000000e+00
+4929 4929 1.00000000000000e+00
+4930 4930 1.00000000000000e+00
+4931 4931 1.00000000000000e+00
+4932 4932 1.00000000000000e+00
+4933 4933 1.00000000000000e+00
+4934 4934 1.00000000000000e+00
+4935 4935 1.00000000000000e+00
+4936 4936 1.00000000000000e+00
+4937 4937 1.00000000000000e+00
+4938 4938 1.00000000000000e+00
+4939 4939 1.00000000000000e+00
+4940 4940 1.00000000000000e+00
+4941 4941 1.00000000000000e+00
+4942 4942 1.00000000000000e+00
+4943 4943 1.00000000000000e+00
+4944 4944 1.00000000000000e+00
+4945 4945 1.00000000000000e+00
+4946 4946 1.00000000000000e+00
+4947 4947 1.00000000000000e+00
+4948 4948 1.00000000000000e+00
+4949 4949 1.00000000000000e+00
+4950 4950 1.00000000000000e+00
+4951 4951 1.00000000000000e+00
+4952 4952 1.00000000000000e+00
+4953 4953 1.00000000000000e+00
+4954 4954 1.00000000000000e+00
+4955 4955 1.00000000000000e+00
+4956 4956 1.00000000000000e+00
+4957 4957 1.00000000000000e+00
+4958 4958 1.00000000000000e+00
+4959 4959 1.00000000000000e+00
+4960 4960 1.00000000000000e+00
+4961 4961 1.00000000000000e+00
+4962 4962 1.00000000000000e+00
+4963 4963 1.00000000000000e+00
+4964 4964 1.00000000000000e+00
+4965 4965 1.00019295784113e+00
+4965 4389 1.74906230975333e-04
+4965 4413 1.81867178720740e-04
+4965 4437 1.02677524531000e-09
+4965 4989 2.27218828907758e-02
+4965 5013 1.17535898769435e-02
+4965 5037 1.13653088228283e-05
+4965 5565 5.96412141363904e-03
+4965 5589 5.92060211873675e-02
+4965 5613 1.04734868936986e-02
+4965 5637 2.18137199729478e-05
+4965 6141 1.57623610900000e-11
+4965 6165 2.08212736614834e-03
+4965 6189 9.08688838913268e-03
+4965 6213 6.51068255958192e-04
+4965 6237 1.23556813447242e-06
+4965 6741 5.45496585000000e-12
+4965 6765 4.57242407563110e-07
+4965 6789 1.24828921303143e-06
+4965 6813 9.84462529829330e-07
+4965 7389 4.86770000000000e-16
+4965 7413 1.82940000000000e-16
+4965 17448 -5.76787102641967e-03
+4965 17472 -2.95310796217855e-03
+4965 17496 -1.97635568482042e-05
+4965 17856 -3.06995764510260e-02
+4965 17880 -1.58080846130474e-02
+4965 17904 -1.30941825009836e-04
+4965 18264 -3.62833187129925e-02
+4965 18288 -1.89372668443833e-02
+4965 18312 -2.27316425110591e-04
+4965 18672 -7.64040556608097e-03
+4965 18696 -4.00184406382038e-03
+4965 18720 -5.18975087942547e-05
+4965 19080 -3.07830518340563e-06
+4965 19104 -1.54782487178358e-06
+4965 19128 -2.47779430879000e-09
+4966 4966 1.00000000000000e+00
+4967 4967 1.00000000000000e+00
+4968 4968 1.00000000000000e+00
+4969 4969 1.00000000000000e+00
+4970 4970 1.00000000000000e+00
+4971 4971 1.00000000000000e+00
+4972 4972 1.00000000000000e+00
+4973 4973 1.00000000000000e+00
+4974 4974 1.00000000000000e+00
+4975 4975 1.00000000000000e+00
+4976 4976 1.00000000000000e+00
+4977 4977 1.00000000000000e+00
+4978 4978 1.00000000000000e+00
+4979 4979 1.00000000000000e+00
+4980 4980 1.00000000000000e+00
+4981 4981 1.00000000000000e+00
+4982 4982 1.00000000000000e+00
+4983 4983 1.00000000000000e+00
+4984 4984 1.00000000000000e+00
+4985 4985 1.00000000000000e+00
+4986 4986 1.00000000000000e+00
+4987 4987 1.00000000000000e+00
+4988 4988 1.00000000000000e+00
+4989 4989 1.12846611172944e+01
+4989 3213 5.75738267860000e-09
+4989 3237 1.07430315361200e-08
+4989 3261 2.76977475000000e-12
+4989 3789 7.80904127106641e-05
+4989 3813 3.01114647711882e-02
+4989 3837 9.74515294596650e-03
+4989 3861 1.43358216180975e-06
+4989 4389 7.68476838705000e-01
+4989 4413 2.82246097617265e+00
+4989 4437 1.54296983896809e-01
+4989 4461 3.05165715246753e-04
+4989 4965 2.27218828907758e-02
+4989 5013 1.08522054118619e+01
+4989 5037 2.68021749546509e-01
+4989 5061 1.93413419972690e-04
+4989 5565 2.51332964486052e-01
+4989 5589 8.41036131317700e+00
+4989 5613 3.98787308235858e+00
+4989 5637 9.43923886567082e-02
+4989 5661 6.65602558937116e-05
+4989 6141 4.36402672700000e-11
+4989 6165 6.52643325329198e-02
+4989 6189 3.62451739099545e-01
+4989 6213 1.07149062964958e-01
+4989 6237 2.91387883519289e-03
+4989 6261 2.76280475736864e-06
+4989 6741 1.51028246000000e-11
+4989 6765 1.26615946688092e-06
+4989 6789 1.57546452617895e-04
+4989 6813 2.11681717864968e-04
+4989 6837 8.25552108883428e-06
+4989 7389 1.43269000000000e-15
+4989 7413 5.38430000000000e-16
+4989 16224 -3.45778598212080e-07
+4989 16248 -1.80427590875910e-07
+4989 16272 -2.15379764853000e-09
+4989 16632 -6.40768823076001e-02
+4989 16656 -3.73800305753864e-02
+4989 16680 -1.52616840616753e-03
+4989 17040 -1.54591739054221e+00
+4989 17064 -8.79965056906100e-01
+4989 17088 -3.06935392903582e-02
+4989 17112 -3.23866062505970e-05
+4989 17448 -7.60221651864047e+00
+4989 17472 -4.37787045752153e+00
+4989 17496 -1.67023864717947e-01
+4989 17520 -6.01640639348683e-04
+4989 17856 -1.10499459964699e+01
+4989 17880 -6.55683928723491e+00
+4989 17904 -3.02145747279517e-01
+4989 17928 -1.97260203679885e-03
+4989 18264 -3.34611990479084e+00
+4989 18288 -2.02506210321663e+00
+4989 18312 -1.03095708974912e-01
+4989 18336 -6.79448506998587e-04
+4989 18672 -2.41641731088428e-01
+4989 18696 -1.51606456257912e-01
+4989 18720 -8.98842633280525e-03
+4989 18744 -5.18385731630731e-05
+4989 19080 -8.52313646765135e-06
+4989 19104 -4.28709318978555e-06
+4989 19128 -7.29284455996000e-09
+4990 4990 1.00000000000000e+00
+4991 4991 1.00000000000000e+00
+4992 4992 1.00000000000000e+00
+4993 4993 1.00000000000000e+00
+4994 4994 1.00000000000000e+00
+4995 4995 1.00000000000000e+00
+4996 4996 1.00000000000000e+00
+4997 4997 1.00000000000000e+00
+4998 4998 1.00000000000000e+00
+4999 4999 1.00000000000000e+00
+5000 5000 1.00000000000000e+00
+5001 5001 1.00000000000000e+00
+5002 5002 1.00000000000000e+00
+5003 5003 1.00000000000000e+00
+5004 5004 1.00000000000000e+00
+5005 5005 1.00000000000000e+00
+5006 5006 1.00000000000000e+00
+5007 5007 1.00000000000000e+00
+5008 5008 1.00000000000000e+00
+5009 5009 1.00000000000000e+00
+5010 5010 1.00000000000000e+00
+5011 5011 1.00000000000000e+00
+5012 5012 1.00000000000000e+00
+5013 5013 2.33744226411695e+01
+5013 3213 1.38667055159875e-04
+5013 3237 2.73574244309960e-04
+5013 3261 1.44369951344170e-07
+5013 3789 7.01132519780409e-04
+5013 3813 3.28881041915934e-01
+5013 3837 1.65911619907650e-01
+5013 3861 3.49349886848894e-03
+5013 3885 1.53658882619243e-05
+5013 4389 1.66127993386259e+00
+5013 4413 1.00664315766850e+01
+5013 4437 2.75103404825537e+00
+5013 4461 1.30468906119894e-01
+5013 4485 2.20082275981327e-04
+5013 4965 1.17535898769435e-02
+5013 4989 1.08522054118619e+01
+5013 5037 5.30068757924893e+00
+5013 5061 3.70222890871775e-01
+5013 5085 1.66440736458122e-04
+5013 5565 6.99586949078867e-02
+5013 5589 5.59124452074484e+00
+5013 5613 6.71549843465456e+00
+5013 5637 2.39184467225705e+00
+5013 5661 1.24157463156090e-01
+5013 5685 1.31358384121015e-04
+5013 6165 9.82793053106720e-03
+5013 6189 1.22248691713117e-01
+5013 6213 3.04211210513150e-01
+5013 6237 1.45180600441257e-01
+5013 6261 2.98338614606087e-03
+5013 6285 9.53315919924650e-07
+5013 6789 1.17729495477171e-04
+5013 6813 4.19351447657609e-04
+5013 6837 1.11714081298827e-04
+5013 6861 1.30211113888135e-05
+5013 16224 -9.96711146675233e-03
+5013 16248 -1.38478634824622e-02
+5013 16272 -4.50836102338880e-03
+5013 16296 -5.31919679444214e-04
+5013 16632 -7.26009893524988e-01
+5013 16656 -9.00513750001239e-01
+5013 16680 -2.94052989407059e-01
+5013 16704 -3.78886813069680e-02
+5013 16728 -1.80659238066758e-05
+5013 17040 -5.61186521115540e+00
+5013 17064 -5.86735061115188e+00
+5013 17088 -1.87862984396715e+00
+5013 17112 -2.74822116270493e-01
+5013 17136 -1.21445491145512e-03
+5013 17448 -1.36812044076585e+01
+5013 17472 -1.21491661808581e+01
+5013 17496 -3.72294246617868e+00
+5013 17520 -6.13134529254239e-01
+5013 17544 -5.13431393213634e-03
+5013 17856 -9.15748002497567e+00
+5013 17880 -8.15750338257090e+00
+5013 17904 -2.24353417678793e+00
+5013 17928 -3.41170327114189e-01
+5013 17952 -3.33212378989235e-03
+5013 18264 -1.71458500707120e+00
+5013 18288 -1.55811480797780e+00
+5013 18312 -3.92717788799686e-01
+5013 18336 -5.38648376009517e-02
+5013 18360 -5.47483143415981e-04
+5013 18672 -3.72128208243898e-02
+5013 18696 -3.65312941816119e-02
+5013 18720 -6.49201867337113e-03
+5013 18744 -3.69013968260151e-04
+5014 5014 1.00000000000000e+00
+5015 5015 1.00000000000000e+00
+5016 5016 1.00000000000000e+00
+5017 5017 1.00000000000000e+00
+5018 5018 1.00000000000000e+00
+5019 5019 1.00000000000000e+00
+5020 5020 1.00000000000000e+00
+5021 5021 1.00000000000000e+00
+5022 5022 1.00000000000000e+00
+5023 5023 1.00000000000000e+00
+5024 5024 1.00000000000000e+00
+5025 5025 1.00000000000000e+00
+5026 5026 1.00000000000000e+00
+5027 5027 1.00000000000000e+00
+5028 5028 1.00000000000000e+00
+5029 5029 1.00000000000000e+00
+5030 5030 1.00000000000000e+00
+5031 5031 1.00000000000000e+00
+5032 5032 1.00000000000000e+00
+5033 5033 1.00000000000000e+00
+5034 5034 1.00000000000000e+00
+5035 5035 1.00000000000000e+00
+5036 5036 1.00000000000000e+00
+5037 5037 1.69611461768896e+01
+5037 3213 1.48757014544795e-04
+5037 3237 3.73082498911609e-04
+5037 3261 4.77661153452631e-05
+5037 3285 3.03133255660104e-06
+5037 3789 8.29054817407587e-05
+5037 3813 1.15120413221378e-01
+5037 3837 2.84023234766726e-01
+5037 3861 1.35101238191699e-01
+5037 3885 3.35210990307837e-03
+5037 3909 6.81126937739456e-06
+5037 4389 6.68679335058792e-02
+5037 4413 2.47430333521974e+00
+5037 4437 6.38956406917378e+00
+5037 4461 2.61139860278923e+00
+5037 4485 1.22356735855194e-01
+5037 4509 9.68204573979320e-05
+5037 4965 1.13653088228283e-05
+5037 4989 2.68021749546509e-01
+5037 5013 5.30068757924893e+00
+5037 5061 6.29112857326277e+00
+5037 5085 3.12738875079127e-01
+5037 5109 2.74904578863916e-04
+5037 5565 6.46479002001122e-05
+5037 5589 1.05217503878584e-01
+5037 5613 2.38090503758765e+00
+5037 5637 6.44362061844826e+00
+5037 5661 2.39295414762298e+00
+5037 5685 9.21548851110123e-02
+5037 5709 1.76444125597529e-04
+5037 6165 7.77337397786210e-07
+5037 6189 4.47462327059541e-03
+5037 6213 1.37978003661636e-01
+5037 6237 2.82925116133218e-01
+5037 6261 1.18382376377729e-01
+5037 6285 4.38303943466953e-03
+5037 6309 3.05027687506100e-08
+5037 6789 5.57780449472110e-07
+5037 6813 1.86095276753439e-05
+5037 6837 6.00232747143536e-04
+5037 6861 1.80679317919321e-04
+5037 6885 2.33359908483914e-06
+5037 15816 -1.33099563758210e-07
+5037 15840 -1.43016294015590e-04
+5037 15864 -6.20042783016785e-04
+5037 15888 -3.42380297403751e-04
+5037 15912 -4.99741004107984e-05
+5037 16224 -1.84717084370414e-02
+5037 16248 -1.23074941957581e-01
+5037 16272 -2.94623651010266e-01
+5037 16296 -1.30904245935941e-01
+5037 16320 -1.62013567064915e-02
+5037 16344 -7.48228670978528e-06
+5037 16632 -2.77611194666452e-01
+5037 16656 -1.56020234216348e+00
+5037 16680 -3.24277390371008e+00
+5037 16704 -1.46587366422926e+00
+5037 16728 -1.94900128605114e-01
+5037 16752 -1.79342829018024e-03
+5037 17040 -9.47053835614428e-01
+5037 17064 -5.10178297208419e+00
+5037 17088 -1.02349311736185e+01
+5037 17112 -4.72026243498163e+00
+5037 17136 -6.58101042165475e-01
+5037 17160 -9.66017648426699e-03
+5037 17448 -6.68819689456864e-01
+5037 17472 -3.94528752716482e+00
+5037 17496 -8.83501779089225e+00
+5037 17520 -4.21473093150739e+00
+5037 17544 -6.12047630761570e-01
+5037 17568 -1.21795169504232e-02
+5037 17856 -1.55218139672082e-01
+5037 17880 -1.01464558466501e+00
+5037 17904 -2.31875979400015e+00
+5037 17928 -1.05198764373595e+00
+5037 17952 -1.43978339114223e-01
+5037 17976 -2.68360686543640e-03
+5037 18264 -1.03974540170888e-02
+5037 18288 -7.89606507668571e-02
+5037 18312 -1.67675406492187e-01
+5037 18336 -6.27299216796498e-02
+5037 18360 -6.31400259870883e-03
+5037 18384 -2.12273103108980e-05
+5037 18672 -3.26042166295232e-06
+5037 18696 -1.90559154330356e-05
+5037 18720 -2.73173367878575e-05
+5037 18744 -6.01422878122630e-06
+5038 5038 1.00000000000000e+00
+5039 5039 1.00000000000000e+00
+5040 5040 1.00000000000000e+00
+5041 5041 1.00000000000000e+00
+5042 5042 1.00000000000000e+00
+5043 5043 1.00000000000000e+00
+5044 5044 1.00000000000000e+00
+5045 5045 1.00000000000000e+00
+5046 5046 1.00000000000000e+00
+5047 5047 1.00000000000000e+00
+5048 5048 1.00000000000000e+00
+5049 5049 1.00000000000000e+00
+5050 5050 1.00000000000000e+00
+5051 5051 1.00000000000000e+00
+5052 5052 1.00000000000000e+00
+5053 5053 1.00000000000000e+00
+5054 5054 1.00000000000000e+00
+5055 5055 1.00000000000000e+00
+5056 5056 1.00000000000000e+00
+5057 5057 1.00000000000000e+00
+5058 5058 1.00000000000000e+00
+5059 5059 1.00000000000000e+00
+5060 5060 1.00000000000000e+00
+5061 5061 1.52368589982419e+01
+5061 3213 6.07076150326416e-06
+5061 3237 1.72881141110555e-04
+5061 3261 8.42968691652808e-04
+5061 3285 7.51344158719152e-05
+5061 3309 2.19087640160000e-10
+5061 3333 7.79578600000000e-14
+5061 3789 1.62635643746710e-07
+5061 3813 3.27777054418445e-03
+5061 3837 1.41458480609613e-01
+5061 3861 3.05741013405640e-01
+5061 3885 1.17467751532464e-01
+5061 3909 5.70101788762022e-03
+5061 3933 2.74962501930980e-06
+5061 4389 1.64562920078711e-04
+5061 4413 1.14640260342688e-01
+5061 4437 2.63300019074898e+00
+5061 4461 6.01317879021487e+00
+5061 4485 2.32069493927853e+00
+5061 4509 1.17330424634126e-01
+5061 4533 8.91005421407040e-05
+5061 4989 1.93413419972690e-04
+5061 5013 3.70222890871775e-01
+5061 5037 6.29112857326277e+00
+5061 5085 5.42353049705149e+00
+5061 5109 2.82601434453932e-01
+5061 5133 5.00161568839047e-04
+5061 5589 1.35092304002419e-04
+5061 5613 1.36104287771051e-01
+5061 5637 2.38740455251694e+00
+5061 5661 5.50681995523432e+00
+5061 5685 2.25780169589532e+00
+5061 5709 8.63918164591274e-02
+5061 5733 1.25135402336310e-04
+5061 6189 1.56403018457281e-05
+5061 6213 2.81609474262592e-03
+5061 6237 1.09787995396197e-01
+5061 6261 2.90694425790977e-01
+5061 6285 9.94207410797819e-02
+5061 6309 5.12001329153910e-03
+5061 6813 1.62962235055496e-06
+5061 6837 8.84933336397303e-05
+5061 6861 1.38422994045988e-04
+5061 6885 2.33697018029741e-04
+5061 6909 6.86885643072792e-06
+5061 15456 -6.13896168510000e-10
+5061 15480 -3.15286122116000e-09
+5061 15504 -3.40300235706000e-09
+5061 15528 -6.97276547140000e-10
+5061 15816 -1.54286544133720e-07
+5061 15840 -2.45483860613439e-03
+5061 15864 -2.67986772911736e-02
+5061 15888 -7.66304469585001e-02
+5061 15912 -4.19819363012440e-02
+5061 15936 -6.25604395553294e-03
+5061 15960 -1.59177904572117e-06
+5061 16224 -1.22365447471562e-03
+5061 16248 -9.94144917253992e-02
+5061 16272 -6.94820792058661e-01
+5061 16296 -1.48312847787423e+00
+5061 16320 -8.23602821426849e-01
+5061 16344 -1.34270192548720e-01
+5061 16368 -1.93303940305551e-03
+5061 16632 -6.67400920711623e-03
+5061 16656 -5.23272904718788e-01
+5061 16680 -3.40661737920480e+00
+5061 16704 -6.73991693558080e+00
+5061 16728 -3.78383013424038e+00
+5061 16752 -6.48829834041628e-01
+5061 16776 -1.50083400241686e-02
+5061 17040 -8.36244219545003e-03
+5061 17064 -7.67651190101427e-01
+5061 17088 -4.91376916156051e+00
+5061 17112 -9.44829471250612e+00
+5061 17136 -5.35935612814149e+00
+5061 17160 -9.67683053614479e-01
+5061 17184 -3.19984746935319e-02
+5061 17448 -1.83203537140733e-03
+5061 17472 -2.75908869197928e-01
+5061 17496 -1.86663739218363e+00
+5061 17520 -3.73729413925658e+00
+5061 17544 -2.02840327989387e+00
+5061 17568 -3.49928920340780e-01
+5061 17592 -1.07863231621519e-02
+5061 17856 -1.25824412478916e-05
+5061 17880 -2.92956316988241e-02
+5061 17904 -2.16006340598428e-01
+5061 17928 -4.57991835894876e-01
+5061 17952 -2.30669445532562e-01
+5061 17976 -3.61825963381653e-02
+5061 18000 -8.71566016129888e-04
+5061 18288 -2.47411633771678e-04
+5061 18312 -1.78015374464236e-03
+5061 18336 -3.43551708160322e-03
+5061 18360 -8.94813647991479e-04
+5061 18384 -2.60766096089580e-05
+5062 5062 1.00000000000000e+00
+5063 5063 1.00000000000000e+00
+5064 5064 1.00000000000000e+00
+5065 5065 1.00000000000000e+00
+5066 5066 1.00000000000000e+00
+5067 5067 1.00000000000000e+00
+5068 5068 1.00000000000000e+00
+5069 5069 1.00000000000000e+00
+5070 5070 1.00000000000000e+00
+5071 5071 1.00000000000000e+00
+5072 5072 1.00000000000000e+00
+5073 5073 1.00000000000000e+00
+5074 5074 1.00000000000000e+00
+5075 5075 1.00000000000000e+00
+5076 5076 1.00000000000000e+00
+5077 5077 1.00000000000000e+00
+5078 5078 1.00000000000000e+00
+5079 5079 1.00000000000000e+00
+5080 5080 1.00000000000000e+00
+5081 5081 1.00000000000000e+00
+5082 5082 1.00000000000000e+00
+5083 5083 1.00000000000000e+00
+5084 5084 1.00000000000000e+00
+5085 5085 1.43612580844071e+01
+5085 3237 1.78071334005430e-05
+5085 3261 1.53185448900642e-04
+5085 3285 2.31229553062047e-04
+5085 3309 1.93604114647185e-04
+5085 3333 2.46575223213150e-07
+5085 3813 1.82413221143818e-06
+5085 3837 3.14962360091569e-03
+5085 3861 1.30017308321317e-01
+5085 3885 3.25771669079227e-01
+5085 3909 1.04668459507658e-01
+5085 3933 4.53171246542357e-03
+5085 3957 9.75132400737207e-06
+5085 4413 1.09163930156511e-04
+5085 4437 1.12349617391641e-01
+5085 4461 2.31426725984317e+00
+5085 4485 5.58574866139339e+00
+5085 4509 2.28425795486040e+00
+5085 4533 1.32107227727700e-01
+5085 4557 1.44147466930786e-04
+5085 4581 4.40000000000000e-19
+5085 5013 1.66440736458122e-04
+5085 5037 3.12738875079127e-01
+5085 5061 5.42353049705149e+00
+5085 5109 5.50028633803765e+00
+5085 5133 2.67067283445572e-01
+5085 5157 6.20724038309034e-04
+5085 5613 2.62739118781422e-04
+5085 5637 1.06238221895663e-01
+5085 5661 2.25961989461752e+00
+5085 5685 5.23127818559829e+00
+5085 5709 2.15224436646039e+00
+5085 5733 9.81329879921890e-02
+5085 5757 6.03166389497410e-05
+5085 6213 7.46695746236243e-06
+5085 6237 5.24590795012682e-03
+5085 6261 8.59626371374436e-02
+5085 6285 2.70682180385703e-01
+5085 6309 1.09060475920185e-01
+5085 6333 4.96671538245728e-03
+5085 6357 5.23284682600000e-11
+5085 6861 1.17724328222055e-04
+5085 6885 4.91919438840005e-04
+5085 6909 7.84963079505855e-05
+5085 6933 2.57973066677054e-06
+5085 6957 2.42173700000000e-14
+5085 15456 -2.30368090416419e-05
+5085 15480 -2.05883233787824e-03
+5085 15504 -9.62297346308543e-03
+5085 15528 -8.89962435477855e-03
+5085 15552 -1.73381330431106e-03
+5085 15576 -1.54264278491780e-07
+5085 15840 -2.84870293465081e-04
+5085 15864 -2.79573555867753e-02
+5085 15888 -2.38646796391964e-01
+5085 15912 -6.31129289373418e-01
+5085 15936 -4.52565793524384e-01
+5085 15960 -8.66559427129929e-02
+5085 15984 -1.67656038496181e-03
+5085 16248 -2.14648723749301e-03
+5085 16272 -2.12494015931437e-01
+5085 16296 -1.69477015015129e+00
+5085 16320 -4.23415220768885e+00
+5085 16344 -2.98627124706644e+00
+5085 16368 -6.02940997111873e-01
+5085 16392 -2.01656095848379e-02
+5085 16416 -1.32206470670000e-10
+5085 16656 -4.35560139697675e-03
+5085 16680 -4.69701797998804e-01
+5085 16704 -3.64519484217994e+00
+5085 16728 -8.86448444528996e+00
+5085 16752 -6.23407982509964e+00
+5085 16776 -1.32965709172447e+00
+5085 16800 -6.10846835017304e-02
+5085 16824 -7.06933854300000e-10
+5085 17064 -1.17783345955631e-03
+5085 17088 -2.53257024583946e-01
+5085 17112 -2.10508368685631e+00
+5085 17136 -5.31142189658302e+00
+5085 17160 -3.64136977461592e+00
+5085 17184 -7.66829074925670e-01
+5085 17208 -3.57113108533592e-02
+5085 17232 -8.44638357170000e-10
+5085 17472 -4.27068489809045e-05
+5085 17496 -4.20474139306105e-02
+5085 17520 -3.78249300822852e-01
+5085 17544 -9.90842359719972e-01
+5085 17568 -6.40927707820455e-01
+5085 17592 -1.28438112447599e-01
+5085 17616 -5.56833331860741e-03
+5085 17640 -1.78107971630000e-10
+5085 17904 -1.06285179056372e-03
+5085 17928 -1.19319310724472e-02
+5085 17952 -3.37284796292224e-02
+5085 17976 -1.54562329970989e-02
+5085 18000 -1.94985337928625e-03
+5085 18024 -1.58029534922598e-06
+5086 5086 1.00000000000000e+00
+5087 5087 1.00000000000000e+00
+5088 5088 1.00000000000000e+00
+5089 5089 1.00000000000000e+00
+5090 5090 1.00000000000000e+00
+5091 5091 1.00000000000000e+00
+5092 5092 1.00000000000000e+00
+5093 5093 1.00000000000000e+00
+5094 5094 1.00000000000000e+00
+5095 5095 1.00000000000000e+00
+5096 5096 1.00000000000000e+00
+5097 5097 1.00000000000000e+00
+5098 5098 1.00000000000000e+00
+5099 5099 1.00000000000000e+00
+5100 5100 1.00000000000000e+00
+5101 5101 1.00000000000000e+00
+5102 5102 1.00000000000000e+00
+5103 5103 1.00000000000000e+00
+5104 5104 1.00000000000000e+00
+5105 5105 1.00000000000000e+00
+5106 5106 1.00000000000000e+00
+5107 5107 1.00000000000000e+00
+5108 5108 1.00000000000000e+00
+5109 5109 1.44213860298006e+01
+5109 3261 2.13656657686153e-06
+5109 3285 3.60350842428249e-04
+5109 3309 4.72542549108676e-04
+5109 3333 2.27667645083760e-05
+5109 3357 1.32826164813375e-06
+5109 3837 2.33546346859161e-06
+5109 3861 3.37533779248329e-03
+5109 3885 1.19649369036845e-01
+5109 3909 3.28037469003473e-01
+5109 3933 1.46585707143295e-01
+5109 3957 4.31287933667559e-03
+5109 3981 1.44666009939137e-06
+5109 4005 1.82940000000000e-16
+5109 4437 4.76842667935605e-05
+5109 4461 1.13542902326334e-01
+5109 4485 2.27567422516411e+00
+5109 4509 6.05533313607160e+00
+5109 4533 2.43971202276566e+00
+5109 4557 1.41882974823337e-01
+5109 4581 2.51116470786623e-04
+5109 4605 5.38430000000000e-16
+5109 5037 2.74904578863916e-04
+5109 5061 2.82601434453932e-01
+5109 5085 5.50028633803765e+00
+5109 5133 5.76486307275885e+00
+5109 5157 2.77770045261555e-01
+5109 5181 5.43624149202182e-04
+5109 5637 3.16321383374538e-04
+5109 5661 1.00146710530681e-01
+5109 5685 2.14309867129194e+00
+5109 5709 5.35940821716823e+00
+5109 5733 2.13949290794890e+00
+5109 5757 1.08523138370519e-01
+5109 5781 3.05226841770284e-05
+5109 6237 4.62919780307250e-07
+5109 6261 4.42976897962892e-03
+5109 6285 1.06063705484242e-01
+5109 6309 2.50889615789968e-01
+5109 6333 1.03347535291058e-01
+5109 6357 5.11135706757784e-03
+5109 6381 1.84048516669520e-07
+5109 6861 7.87821774847100e-07
+5109 6885 1.58758229703413e-05
+5109 6909 3.84182544807877e-04
+5109 6933 2.12636592359754e-04
+5109 6957 1.45607376990150e-07
+5109 6981 8.10624600000000e-14
+5109 7533 2.84600000000000e-17
+5109 7557 1.86000000000000e-17
+5109 15096 -2.08381299950430e-05
+5109 15120 -1.55563455594227e-04
+5109 15144 -3.09682943183139e-04
+5109 15168 -7.22152185415608e-05
+5109 15192 -1.07073187650000e-09
+5109 15456 -5.59793347357103e-06
+5109 15480 -4.76276778342306e-03
+5109 15504 -7.02222855708120e-02
+5109 15528 -2.52605295670644e-01
+5109 15552 -2.23748796928769e-01
+5109 15576 -4.73116659948546e-02
+5109 15600 -1.11687003265817e-03
+5109 15864 -2.81280434771745e-04
+5109 15888 -7.51061278934854e-02
+5109 15912 -8.20278751359089e-01
+5109 15936 -2.57969505935665e+00
+5109 15960 -2.18514483610328e+00
+5109 15984 -5.02981888970402e-01
+5109 16008 -2.33917155530080e-02
+5109 16032 -3.49414465273950e-07
+5109 16272 -1.08121285912410e-03
+5109 16296 -2.70400200659882e-01
+5109 16320 -2.65973954927669e+00
+5109 16344 -7.84475762036920e+00
+5109 16368 -6.49493602195029e+00
+5109 16392 -1.58350204718123e+00
+5109 16416 -9.55746831138025e-02
+5109 16440 -3.41322157762277e-06
+5109 16680 -4.19129189440223e-04
+5109 16704 -2.24374614877636e-01
+5109 16728 -2.30331252695497e+00
+5109 16752 -6.93663822977327e+00
+5109 16776 -5.76875780633052e+00
+5109 16800 -1.44359395821833e+00
+5109 16824 -9.45460057249820e-02
+5109 16848 -8.41167939047497e-06
+5109 17088 -4.00601221406904e-05
+5109 17112 -5.20208389584607e-02
+5109 17136 -5.92579518169749e-01
+5109 17160 -1.86500071194450e+00
+5109 17184 -1.49717127446898e+00
+5109 17208 -3.57021004769807e-01
+5109 17232 -2.10748455066423e-02
+5109 17256 -2.01560395289938e-06
+5109 17520 -2.65351095419135e-03
+5109 17544 -4.05088426167653e-02
+5109 17568 -1.39874140180184e-01
+5109 17592 -1.01039043382733e-01
+5109 17616 -1.99554679510911e-02
+5109 17640 -5.78508518996033e-04
+5109 17664 -1.00590931000000e-11
+5109 17928 -6.94046372686320e-07
+5109 17952 -1.65162946727462e-05
+5109 17976 -5.60742176785095e-05
+5109 18000 -1.54190474932794e-05
+5109 18024 -4.19734577819620e-07
+5110 5110 1.00000000000000e+00
+5111 5111 1.00000000000000e+00
+5112 5112 1.00000000000000e+00
+5113 5113 1.00000000000000e+00
+5114 5114 1.00000000000000e+00
+5115 5115 1.00000000000000e+00
+5116 5116 1.00000000000000e+00
+5117 5117 1.00000000000000e+00
+5118 5118 1.00000000000000e+00
+5119 5119 1.00000000000000e+00
+5120 5120 1.00000000000000e+00
+5121 5121 1.00000000000000e+00
+5122 5122 1.00000000000000e+00
+5123 5123 1.00000000000000e+00
+5124 5124 1.00000000000000e+00
+5125 5125 1.00000000000000e+00
+5126 5126 1.00000000000000e+00
+5127 5127 1.00000000000000e+00
+5128 5128 1.00000000000000e+00
+5129 5129 1.00000000000000e+00
+5130 5130 1.00000000000000e+00
+5131 5131 1.00000000000000e+00
+5132 5132 1.00000000000000e+00
+5133 5133 1.52048834911819e+01
+5133 3285 1.89409891545966e-06
+5133 3309 6.44276186536676e-05
+5133 3333 4.39095393213610e-04
+5133 3357 1.00310287655638e-04
+5133 3861 1.07354659163104e-06
+5133 3885 4.53064416783978e-03
+5133 3909 1.48638855963735e-01
+5133 3933 3.19728559420901e-01
+5133 3957 8.83750882412678e-02
+5133 3981 4.48672969599089e-03
+5133 4005 9.84462529829360e-07
+5133 4461 1.87607910286077e-05
+5133 4485 1.29265031934992e-01
+5133 4509 2.44145806955096e+00
+5133 4533 6.54732452314663e+00
+5133 4557 2.54478197047026e+00
+5133 4581 1.05567678610664e-01
+5133 4605 2.11681717864975e-04
+5133 5061 5.00161568839047e-04
+5133 5085 2.67067283445572e-01
+5133 5109 5.76486307275885e+00
+5133 5157 6.10174473440794e+00
+5133 5181 3.22180068646861e-01
+5133 5205 4.19351447657615e-04
+5133 5661 2.46473168732270e-04
+5133 5685 1.09523577382535e-01
+5133 5709 2.13680044591839e+00
+5133 5733 5.46392976673377e+00
+5133 5757 2.30005723638079e+00
+5133 5781 1.28294801162544e-01
+5133 5805 1.86095276753436e-05
+5133 6261 2.33219156354420e-06
+5133 6285 2.99554152661755e-03
+5133 6309 9.54297444868264e-02
+5133 6333 2.86213876935506e-01
+5133 6357 1.03852201314301e-01
+5133 6381 3.81948091007362e-03
+5133 6405 1.62962235055491e-06
+5133 6885 8.44175032531260e-07
+5133 6909 1.15050029531138e-04
+5133 6933 2.33536006397605e-04
+5133 6957 2.24058402351042e-04
+5133 6981 2.33286633743798e-06
+5133 7533 1.87940000000000e-16
+5133 7557 1.22830000000000e-16
+5133 15096 -1.19661164935190e-04
+5133 15120 -8.19121310477230e-03
+5133 15144 -3.89639863280265e-02
+5133 15168 -4.00258339285648e-02
+5133 15192 -9.34229118965538e-03
+5133 15216 -3.37059951672553e-04
+5133 15480 -2.56465629442625e-05
+5133 15504 -2.67245997549201e-02
+5133 15528 -3.59609790199509e-01
+5133 15552 -1.28251347224220e+00
+5133 15576 -1.25135147236016e+00
+5133 15600 -3.40415392059889e-01
+5133 15624 -2.42284408096525e-02
+5133 15648 -3.64761453425590e-07
+5133 15888 -1.18646387859601e-04
+5133 15912 -1.44830657291899e-01
+5133 15936 -1.79075268972266e+00
+5133 15960 -6.17588936427211e+00
+5133 15984 -6.06421539807091e+00
+5133 16008 -1.72365237570311e+00
+5133 16032 -1.36403831570534e-01
+5133 16056 -4.38145079191052e-05
+5133 16296 -8.98871072744665e-05
+5133 16320 -1.90281153849869e-01
+5133 16344 -2.32104302524860e+00
+5133 16368 -8.01336539963254e+00
+5133 16392 -8.08169379493117e+00
+5133 16416 -2.40623175819998e+00
+5133 16440 -2.07628844917463e-01
+5133 16464 -1.77369989909063e-04
+5133 16704 -1.60601360825510e-05
+5133 16728 -6.02435661366246e-02
+5133 16752 -8.49994985456520e-01
+5133 16776 -3.09628035087762e+00
+5133 16800 -3.07599406256264e+00
+5133 16824 -8.81184445223637e-01
+5133 16848 -7.08050616192471e-02
+5133 16872 -7.26889822415073e-05
+5133 17136 -5.16812501595177e-03
+5133 17160 -9.71852575256437e-02
+5133 17184 -3.81038440365992e-01
+5133 17208 -3.62324339704616e-01
+5133 17232 -9.59646298107551e-02
+5133 17256 -6.56477375214311e-03
+5133 17280 -7.58338003402613e-06
+5133 17544 -1.04073115619177e-05
+5133 17568 -9.28518009400162e-04
+5133 17592 -3.87791204741481e-03
+5133 17616 -2.16668756254668e-03
+5133 17640 -3.19949948932865e-04
+5133 17664 -6.64224849700000e-11
+5134 5134 1.00000000000000e+00
+5135 5135 1.00000000000000e+00
+5136 5136 1.00000000000000e+00
+5137 5137 1.00000000000000e+00
+5138 5138 1.00000000000000e+00
+5139 5139 1.00000000000000e+00
+5140 5140 1.00000000000000e+00
+5141 5141 1.00000000000000e+00
+5142 5142 1.00000000000000e+00
+5143 5143 1.00000000000000e+00
+5144 5144 1.00000000000000e+00
+5145 5145 1.00000000000000e+00
+5146 5146 1.00000000000000e+00
+5147 5147 1.00000000000000e+00
+5148 5148 1.00000000000000e+00
+5149 5149 1.00000000000000e+00
+5150 5150 1.00000000000000e+00
+5151 5151 1.00000000000000e+00
+5152 5152 1.00000000000000e+00
+5153 5153 1.00000000000000e+00
+5154 5154 1.00000000000000e+00
+5155 5155 1.00000000000000e+00
+5156 5156 1.00000000000000e+00
+5157 5157 1.67148947905030e+01
+5157 3285 2.19544460000000e-13
+5157 3309 6.93965276951370e-07
+5157 3333 2.13322127890800e-04
+5157 3357 6.26332162683865e-05
+5157 3885 1.66357890694840e-07
+5157 3909 5.85510262322272e-03
+5157 3933 1.02243790726410e-01
+5157 3957 2.53180377174194e-01
+5157 3981 7.91253656423224e-02
+5157 4005 6.51068255958210e-04
+5157 4485 3.45354354387674e-05
+5157 4509 1.33750852826006e-01
+5157 4533 2.52076813096792e+00
+5157 4557 5.48682765881343e+00
+5157 4581 2.18313486092396e+00
+5157 4605 1.07149062964959e-01
+5157 4629 1.96678742491973e-04
+5157 4653 3.96000000000000e-17
+5157 5085 6.20724038309034e-04
+5157 5109 2.77770045261555e-01
+5157 5133 6.10174473440794e+00
+5157 5181 6.41976470167608e+00
+5157 5205 3.04211210513155e-01
+5157 5229 3.22067592846326e-04
+5157 5253 2.85680000000000e-16
+5157 5685 1.20323550370871e-04
+5157 5709 1.14020590599329e-01
+5157 5733 2.31147641763552e+00
+5157 5757 6.06166136081314e+00
+5157 5781 2.48928706355118e+00
+5157 5805 1.37978003661640e-01
+5157 5829 8.08979821477038e-05
+5157 6285 1.40034993139732e-06
+5157 6309 5.51968148406408e-03
+5157 6333 8.98139243420832e-02
+5157 6357 2.80845679566269e-01
+5157 6381 1.24288913731442e-01
+5157 6405 2.81609474262595e-03
+5157 6429 2.47633161065664e-06
+5157 6933 1.21338636937123e-04
+5157 6957 3.83618832664588e-04
+5157 6981 7.72839565029899e-05
+5157 7005 7.46695746236279e-06
+5157 15096 -2.93151783220590e-07
+5157 15120 -4.92885197545324e-03
+5157 15144 -7.96440172054075e-02
+5157 15168 -3.54401329386659e-01
+5157 15192 -5.13545222136790e-01
+5157 15216 -1.68324535039272e-01
+5157 15240 -1.46458338405460e-02
+5157 15264 -2.82679919691200e-08
+5157 15504 -2.38387544049822e-06
+5157 15528 -5.10251812906409e-02
+5157 15552 -7.34540317333676e-01
+5157 15576 -3.00685097530556e+00
+5157 15600 -3.99618407387613e+00
+5157 15624 -1.35404939750064e+00
+5157 15648 -1.30866721526178e-01
+5157 15672 -2.23427793991180e-04
+5157 15912 -5.13822501368402e-06
+5157 15936 -1.37572068971864e-01
+5157 15960 -2.01546910711484e+00
+5157 15984 -8.10899043378017e+00
+5157 16008 -1.02624281112437e+01
+5157 16032 -3.53361738223860e+00
+5157 16056 -3.59725190024005e-01
+5157 16080 -1.04604514369131e-03
+5157 16320 -1.21126830761586e-06
+5157 16344 -6.09726191576301e-02
+5157 16368 -1.11422845009597e+00
+5157 16392 -4.74306814100736e+00
+5157 16416 -5.86868412923079e+00
+5157 16440 -1.98400933919516e+00
+5157 16464 -1.98962185579800e-01
+5157 16488 -8.34346672447818e-04
+5157 16752 -7.58954126479118e-03
+5157 16776 -1.90496251635002e-01
+5157 16800 -8.56623399539284e-01
+5157 16824 -1.02406696179595e+00
+5157 16848 -3.28645579300924e-01
+5157 16872 -3.06138592859684e-02
+5157 16896 -1.52757987606129e-04
+5157 17160 -4.63546319988521e-05
+5157 17184 -6.15205480232561e-03
+5157 17208 -3.00451118904865e-02
+5157 17232 -3.06819938875620e-02
+5157 17256 -6.87824803542487e-03
+5157 17280 -1.86508968564511e-04
+5158 5158 1.00000000000000e+00
+5159 5159 1.00000000000000e+00
+5160 5160 1.00000000000000e+00
+5161 5161 1.00000000000000e+00
+5162 5162 1.00000000000000e+00
+5163 5163 1.00000000000000e+00
+5164 5164 1.00000000000000e+00
+5165 5165 1.00000000000000e+00
+5166 5166 1.00000000000000e+00
+5167 5167 1.00000000000000e+00
+5168 5168 1.00000000000000e+00
+5169 5169 1.00000000000000e+00
+5170 5170 1.00000000000000e+00
+5171 5171 1.00000000000000e+00
+5172 5172 1.00000000000000e+00
+5173 5173 1.00000000000000e+00
+5174 5174 1.00000000000000e+00
+5175 5175 1.00000000000000e+00
+5176 5176 1.00000000000000e+00
+5177 5177 1.00000000000000e+00
+5178 5178 1.00000000000000e+00
+5179 5179 1.00000000000000e+00
+5180 5180 1.00000000000000e+00
+5181 5181 1.59550388736789e+01
+5181 3309 1.81280000000000e-16
+5181 3333 1.55053844990900e-08
+5181 3357 4.47785888509600e-08
+5181 3909 3.96083470000000e-13
+5181 3933 5.64636705605441e-03
+5181 3957 1.34864340673858e-01
+5181 3981 2.29394337282822e-01
+5181 4005 1.04734868936988e-02
+5181 4509 1.16427669681292e-04
+5181 4533 9.38903743213116e-02
+5181 4557 2.30610993286478e+00
+5181 4581 7.59651806450870e+00
+5181 4605 3.98787308235862e+00
+5181 4629 9.52927344201617e-02
+5181 4653 3.75230044358600e-08
+5181 5109 5.43624149202182e-04
+5181 5133 3.22180068646861e-01
+5181 5157 6.41976470167608e+00
+5181 5205 6.71549843465462e+00
+5181 5229 3.91337936004932e-01
+5181 5253 1.19958834153319e-04
+5181 5709 8.34240246487340e-05
+5181 5733 1.30553376912942e-01
+5181 5757 2.49741496761038e+00
+5181 5781 6.56471963283418e+00
+5181 5805 2.38090503758767e+00
+5181 5829 9.18742608481268e-02
+5181 5853 1.28078995586542e-04
+5181 6309 1.22408211906465e-06
+5181 6333 4.01865511835701e-03
+5181 6357 1.20227799418492e-01
+5181 6381 2.81822420274195e-01
+5181 6405 1.36104287771051e-01
+5181 6429 4.00256385214289e-03
+5181 6453 1.08879937028275e-06
+5181 6933 7.94031900597660e-07
+5181 6957 1.59114016612105e-05
+5181 6981 5.56133606008093e-04
+5181 7005 2.62739118781434e-04
+5181 7029 2.79430157966992e-06
+5181 15120 -1.64223745000000e-12
+5181 15144 -1.68082945346771e-02
+5181 15168 -4.08749207963312e-01
+5181 15192 -2.47152522189266e+00
+5181 15216 -4.85138247369466e+00
+5181 15240 -1.71003083767369e+00
+5181 15264 -1.56683939199441e-01
+5181 15288 -3.57181806112216e-04
+5181 15528 -6.23034231000000e-12
+5181 15552 -4.59803680636695e-02
+5181 15576 -1.13270057768641e+00
+5181 15600 -5.81223872309210e+00
+5181 15624 -9.17219547194405e+00
+5181 15648 -3.32914583511338e+00
+5181 15672 -3.49286089514239e-01
+5181 15696 -2.60936372640858e-03
+5181 15936 -1.54549245000000e-12
+5181 15960 -4.35511837740995e-02
+5181 15984 -1.23592080630089e+00
+5181 16008 -6.10453891104462e+00
+5181 16032 -8.73478129569143e+00
+5181 16056 -3.48549779286629e+00
+5181 16080 -4.36925577003898e-01
+5181 16104 -5.08853050101870e-03
+5181 16368 -9.40248882104724e-03
+5181 16392 -3.40186827062610e-01
+5181 16416 -1.72986038849151e+00
+5181 16440 -2.45398170369841e+00
+5181 16464 -9.54578846059269e-01
+5181 16488 -1.15666008616456e-01
+5181 16512 -1.21570673088841e-03
+5181 16776 -1.52153242486531e-04
+5181 16800 -2.11921539795369e-02
+5181 16824 -1.17769960030617e-01
+5181 16848 -1.66742076918547e-01
+5181 16872 -5.53882674114007e-02
+5181 16896 -5.05902499824354e-03
+5181 16920 -8.76502208940870e-06
+5181 17208 -1.54009090715194e-05
+5181 17232 -7.21993790366314e-05
+5181 17256 -5.77838800737353e-05
+5181 17280 -1.05957427505540e-05
+5182 5182 1.00000000000000e+00
+5183 5183 1.00000000000000e+00
+5184 5184 1.00000000000000e+00
+5185 5185 1.00000000000000e+00
+5186 5186 1.00000000000000e+00
+5187 5187 1.00000000000000e+00
+5188 5188 1.00000000000000e+00
+5189 5189 1.00000000000000e+00
+5190 5190 1.00000000000000e+00
+5191 5191 1.00000000000000e+00
+5192 5192 1.00000000000000e+00
+5193 5193 1.00000000000000e+00
+5194 5194 1.00000000000000e+00
+5195 5195 1.00000000000000e+00
+5196 5196 1.00000000000000e+00
+5197 5197 1.00000000000000e+00
+5198 5198 1.00000000000000e+00
+5199 5199 1.00000000000000e+00
+5200 5200 1.00000000000000e+00
+5201 5201 1.00000000000000e+00
+5202 5202 1.00000000000000e+00
+5203 5203 1.00000000000000e+00
+5204 5204 1.00000000000000e+00
+5205 5205 2.33744226411701e+01
+5205 3957 9.82793053106742e-03
+5205 3981 6.99586949078880e-02
+5205 4005 1.17535898769437e-02
+5205 4533 1.17729495477174e-04
+5205 4557 1.22248691713119e-01
+5205 4581 5.59124452074491e+00
+5205 4605 1.08522054118621e+01
+5205 4629 1.66127993386264e+00
+5205 4653 7.01132519780422e-04
+5205 5133 4.19351447657615e-04
+5205 5157 3.04211210513155e-01
+5205 5181 6.71549843465462e+00
+5205 5229 1.00664315766853e+01
+5205 5253 3.28881041915943e-01
+5205 5277 1.38667055159876e-04
+5205 5733 1.11714081298826e-04
+5205 5757 1.45180600441261e-01
+5205 5781 2.39184467225707e+00
+5205 5805 5.30068757924905e+00
+5205 5829 2.75103404825551e+00
+5205 5853 1.65911619907656e-01
+5205 5877 2.73574244309962e-04
+5205 6333 1.30211113888131e-05
+5205 6357 2.98338614606087e-03
+5205 6381 1.24157463156090e-01
+5205 6405 3.70222890871767e-01
+5205 6429 1.30468906119894e-01
+5205 6453 3.49349886848909e-03
+5205 6477 1.44369951344170e-07
+5205 6957 9.53315919924690e-07
+5205 6981 1.31358384121021e-04
+5205 7005 1.66440736458125e-04
+5205 7029 2.20082275981342e-04
+5205 7053 1.53658882619258e-05
+5205 15168 -3.72128208243907e-02
+5205 15192 -1.71458500707122e+00
+5205 15216 -9.15748002497584e+00
+5205 15240 -1.36812044076589e+01
+5205 15264 -5.61186521115557e+00
+5205 15288 -7.26009893525010e-01
+5205 15312 -9.96711146675240e-03
+5205 15576 -3.65312941816130e-02
+5205 15600 -1.55811480797781e+00
+5205 15624 -8.15750338257099e+00
+5205 15648 -1.21491661808585e+01
+5205 15672 -5.86735061115216e+00
+5205 15696 -9.00513750001290e-01
+5205 15720 -1.38478634824625e-02
+5205 15984 -6.49201867337133e-03
+5205 16008 -3.92717788799692e-01
+5205 16032 -2.24353417678795e+00
+5205 16056 -3.72294246617872e+00
+5205 16080 -1.87862984396718e+00
+5205 16104 -2.94052989407066e-01
+5205 16128 -4.50836102338906e-03
+5205 16392 -3.69013968260154e-04
+5205 16416 -5.38648376009536e-02
+5205 16440 -3.41170327114196e-01
+5205 16464 -6.13134529254237e-01
+5205 16488 -2.74822116270487e-01
+5205 16512 -3.78886813069669e-02
+5205 16536 -5.31919679444265e-04
+5205 16824 -5.47483143415965e-04
+5205 16848 -3.33212378989233e-03
+5205 16872 -5.13431393213654e-03
+5205 16896 -1.21445491145518e-03
+5205 16920 -1.80659238066759e-05
+5206 5206 1.00000000000000e+00
+5207 5207 1.00000000000000e+00
+5208 5208 1.00000000000000e+00
+5209 5209 1.00000000000000e+00
+5210 5210 1.00000000000000e+00
+5211 5211 1.00000000000000e+00
+5212 5212 1.00000000000000e+00
+5213 5213 1.00000000000000e+00
+5214 5214 1.00000000000000e+00
+5215 5215 1.00000000000000e+00
+5216 5216 1.00000000000000e+00
+5217 5217 1.00000000000000e+00
+5218 5218 1.00000000000000e+00
+5219 5219 1.00000000000000e+00
+5220 5220 1.00000000000000e+00
+5221 5221 1.00000000000000e+00
+5222 5222 1.00000000000000e+00
+5223 5223 1.00000000000000e+00
+5224 5224 1.00000000000000e+00
+5225 5225 1.00000000000000e+00
+5226 5226 1.00000000000000e+00
+5227 5227 1.00000000000000e+00
+5228 5228 1.00000000000000e+00
+5229 5229 2.32800694414847e+01
+5229 3957 2.76965240371850e-07
+5229 3981 7.12317907240396e-04
+5229 4005 1.81867178720743e-04
+5229 4557 2.50863875796691e-04
+5229 4581 2.26802376575185e-01
+5229 4605 2.82246097617273e+00
+5229 4629 1.31811892162331e+00
+5229 4653 3.30908086177553e-03
+5229 5157 3.22067592846326e-04
+5229 5181 3.91337936004932e-01
+5229 5205 1.00664315766853e+01
+5229 5253 6.11383506306121e+00
+5229 5277 4.59222211420520e-02
+5229 5757 2.22694656811323e-04
+5229 5781 9.66358510578628e-02
+5229 5805 2.47430333521989e+00
+5229 5829 9.48469133812500e+00
+5229 5853 6.37363411517367e+00
+5229 5877 1.56701631720266e-01
+5229 6357 7.65518854573800e-06
+5229 6381 6.61404141397703e-03
+5229 6405 1.14640260342687e-01
+5229 6429 2.56110343441907e-01
+5229 6453 1.11544915246484e-01
+5229 6477 8.22857654823547e-03
+5229 7005 1.09163930156518e-04
+5229 7029 7.01342460993407e-04
+5229 7053 9.87647472616876e-05
+5229 7077 5.17228162006526e-06
+5229 15192 -2.35820716352033e-02
+5229 15216 -1.26735440242569e+00
+5229 15240 -7.25120728299911e+00
+5229 15264 -1.34003793834153e+01
+5229 15288 -1.09254701506263e+01
+5229 15312 -2.28074346771652e+00
+5229 15336 -4.88682978709450e-02
+5229 15600 -1.30329133732079e-02
+5229 15624 -7.88820640174525e-01
+5229 15648 -4.98769432682711e+00
+5229 15672 -1.01403827040808e+01
+5229 15696 -7.22856710572116e+00
+5229 15720 -1.42156879861830e+00
+5229 15744 -3.23742370319457e-02
+5229 16008 -3.54822158744661e-04
+5229 16032 -5.62077263860387e-02
+5229 16056 -4.87838300554062e-01
+5229 16080 -1.20726376709728e+00
+5229 16104 -5.87225973958005e-01
+5229 16128 -8.82386895391259e-02
+5229 16152 -2.27056743930506e-03
+5229 16440 -3.19873872226569e-03
+5229 16464 -2.65648743547440e-02
+5229 16488 -6.04023209590308e-02
+5229 16512 -2.22660675726956e-02
+5229 16536 -2.12602681745391e-03
+5229 16560 -5.30610853420270e-07
+5230 5230 1.00000000000000e+00
+5231 5231 1.00000000000000e+00
+5232 5232 1.00000000000000e+00
+5233 5233 1.00000000000000e+00
+5234 5234 1.00000000000000e+00
+5235 5235 1.00000000000000e+00
+5236 5236 1.00000000000000e+00
+5237 5237 1.00000000000000e+00
+5238 5238 1.00000000000000e+00
+5239 5239 1.00000000000000e+00
+5240 5240 1.00000000000000e+00
+5241 5241 1.00000000000000e+00
+5242 5242 1.00000000000000e+00
+5243 5243 1.00000000000000e+00
+5244 5244 1.00000000000000e+00
+5245 5245 1.00000000000000e+00
+5246 5246 1.00000000000000e+00
+5247 5247 1.00000000000000e+00
+5248 5248 1.00000000000000e+00
+5249 5249 1.00000000000000e+00
+5250 5250 1.00000000000000e+00
+5251 5251 1.00000000000000e+00
+5252 5252 1.00000000000000e+00
+5253 5253 6.60889732475962e+00
+5253 4581 4.05234314351900e-08
+5253 4605 3.01114647711887e-02
+5253 4629 6.30109354465539e-02
+5253 4653 6.42960599027278e-04
+5253 5157 2.85680000000000e-16
+5253 5181 1.19958834153319e-04
+5253 5205 3.28881041915943e-01
+5253 5229 6.11383506306121e+00
+5253 5277 1.83378625356760e-01
+5253 5757 1.94460000000000e-16
+5253 5781 2.34927877494202e-04
+5253 5805 1.15120413221383e-01
+5253 5829 4.37323350928703e+00
+5253 5853 8.47559702554776e+00
+5253 5877 1.35780839835573e+00
+5253 5901 1.18136420444717e-02
+5253 6381 3.01784208052608e-06
+5253 6405 3.27777054418457e-03
+5253 6429 9.56967206476602e-02
+5253 6453 2.78118470954539e-01
+5253 6477 1.48862480811000e-01
+5253 6501 7.34843574811701e-03
+5253 7005 1.82413221143836e-06
+5253 7029 1.81715951490790e-05
+5253 7053 3.23989771589693e-04
+5253 7077 2.39044322190822e-04
+5253 7101 1.36192251944497e-06
+5253 15216 -3.09907564292870e-07
+5253 15240 -2.06381545340391e-01
+5253 15264 -2.84652083002152e+00
+5253 15288 -8.88650814138446e+00
+5253 15312 -4.44043579606696e+00
+5253 15336 -7.35786296464280e-01
+5253 15360 -3.49139124709050e-02
+5253 15624 -1.55434573406250e-07
+5253 15648 -1.27735214090195e-01
+5253 15672 -1.64156849315699e+00
+5253 15696 -4.99269484567999e+00
+5253 15720 -2.51925394366346e+00
+5253 15744 -4.17890200362028e-01
+5253 15768 -1.88624550732978e-02
+5253 16032 -1.37368931380000e-10
+5253 16056 -7.04889861285746e-03
+5253 16080 -6.26822243240944e-02
+5253 16104 -1.57674992663913e-01
+5253 16128 -8.56064705006728e-02
+5253 16152 -1.42858512538457e-02
+5253 16176 -4.01571096527226e-04
+5253 16464 -9.74644038470951e-06
+5253 16488 -8.30543836998000e-05
+5253 16512 -1.86284564303339e-04
+5253 16536 -4.51231632600868e-05
+5253 16560 -2.63635274781210e-07
+5254 5254 1.00000000000000e+00
+5255 5255 1.00000000000000e+00
+5256 5256 1.00000000000000e+00
+5257 5257 1.00000000000000e+00
+5258 5258 1.00000000000000e+00
+5259 5259 1.00000000000000e+00
+5260 5260 1.00000000000000e+00
+5261 5261 1.00000000000000e+00
+5262 5262 1.00000000000000e+00
+5263 5263 1.00000000000000e+00
+5264 5264 1.00000000000000e+00
+5265 5265 1.00000000000000e+00
+5266 5266 1.00000000000000e+00
+5267 5267 1.00000000000000e+00
+5268 5268 1.00000000000000e+00
+5269 5269 1.00000000000000e+00
+5270 5270 1.00000000000000e+00
+5271 5271 1.00000000000000e+00
+5272 5272 1.00000000000000e+00
+5273 5273 1.00000000000000e+00
+5274 5274 1.00000000000000e+00
+5275 5275 1.00000000000000e+00
+5276 5276 1.00000000000000e+00
+5277 5277 1.03178973644449e+00
+5277 4605 5.75738267860000e-09
+5277 4629 2.68083483975976e-05
+5277 4653 2.80088098136378e-06
+5277 5205 1.38667055159876e-04
+5277 5229 4.59222211420520e-02
+5277 5253 1.83378625356760e-01
+5277 5805 1.48757014544797e-04
+5277 5829 5.71113368287830e-02
+5277 5853 6.74357737899612e-01
+5277 5877 4.31840613477265e-01
+5277 5901 1.48846185431154e-02
+5277 6405 6.07076150326429e-06
+5277 6429 2.48600030779952e-03
+5277 6453 4.82735193069488e-02
+5277 6477 9.43953024244535e-02
+5277 6501 9.22890593949159e-03
+5277 7029 4.13083515611090e-07
+5277 7053 1.28664970767149e-04
+5277 7077 1.95371943844946e-04
+5277 7101 1.25052203376219e-06
+5277 15264 -1.42105665122836e-02
+5277 15288 -1.70854902386417e-01
+5277 15312 -5.14197856185756e-01
+5277 15336 -2.89759613634650e-01
+5277 15360 -4.39367443243418e-02
+5277 15672 -7.39950019853679e-03
+5277 15696 -9.08396678635025e-02
+5277 15720 -2.75622480796982e-01
+5277 15744 -1.54266916353449e-01
+5277 15768 -2.32563123210234e-02
+5277 16080 -8.40619835414287e-05
+5277 16104 -1.54634762008399e-03
+5277 16128 -5.29244362974382e-03
+5277 16152 -2.68203129603541e-03
+5277 16176 -3.67982902529285e-04
+5278 5278 1.00000000000000e+00
+5279 5279 1.00000000000000e+00
+5280 5280 1.00000000000000e+00
+5281 5281 1.00000000000000e+00
+5282 5282 1.00000000000000e+00
+5283 5283 1.00000000000000e+00
+5284 5284 1.00000000000000e+00
+5285 5285 1.00000000000000e+00
+5286 5286 1.00000000000000e+00
+5287 5287 1.00000000000000e+00
+5288 5288 1.00000000000000e+00
+5289 5289 1.00000000000000e+00
+5290 5290 1.00000000000000e+00
+5291 5291 1.00000000000000e+00
+5292 5292 1.00000000000000e+00
+5293 5293 1.00000000000000e+00
+5294 5294 1.00000000000000e+00
+5295 5295 1.00000000000000e+00
+5296 5296 1.00000000000000e+00
+5297 5297 1.00000000000000e+00
+5298 5298 1.00000000000000e+00
+5299 5299 1.00000000000000e+00
+5300 5300 1.00000000000000e+00
+5301 5301 1.00000000000000e+00
+5302 5302 1.00000000000000e+00
+5303 5303 1.00000000000000e+00
+5304 5304 1.00000000000000e+00
+5305 5305 1.00000000000000e+00
+5306 5306 1.00000000000000e+00
+5307 5307 1.00000000000000e+00
+5308 5308 1.00000000000000e+00
+5309 5309 1.00000000000000e+00
+5310 5310 1.00000000000000e+00
+5311 5311 1.00000000000000e+00
+5312 5312 1.00000000000000e+00
+5313 5313 1.00000000000000e+00
+5314 5314 1.00000000000000e+00
+5315 5315 1.00000000000000e+00
+5316 5316 1.00000000000000e+00
+5317 5317 1.00000000000000e+00
+5318 5318 1.00000000000000e+00
+5319 5319 1.00000000000000e+00
+5320 5320 1.00000000000000e+00
+5321 5321 1.00000000000000e+00
+5322 5322 1.00000000000000e+00
+5323 5323 1.00000000000000e+00
+5324 5324 1.00000000000000e+00
+5325 5325 1.00000000000000e+00
+5326 5326 1.00000000000000e+00
+5327 5327 1.00000000000000e+00
+5328 5328 1.00000000000000e+00
+5329 5329 1.00000000000000e+00
+5330 5330 1.00000000000000e+00
+5331 5331 1.00000000000000e+00
+5332 5332 1.00000000000000e+00
+5333 5333 1.00000000000000e+00
+5334 5334 1.00000000000000e+00
+5335 5335 1.00000000000000e+00
+5336 5336 1.00000000000000e+00
+5337 5337 1.00000000000000e+00
+5338 5338 1.00000000000000e+00
+5339 5339 1.00000000000000e+00
+5340 5340 1.00000000000000e+00
+5341 5341 1.00000000000000e+00
+5342 5342 1.00000000000000e+00
+5343 5343 1.00000000000000e+00
+5344 5344 1.00000000000000e+00
+5345 5345 1.00000000000000e+00
+5346 5346 1.00000000000000e+00
+5347 5347 1.00000000000000e+00
+5348 5348 1.00000000000000e+00
+5349 5349 1.00000000000000e+00
+5350 5350 1.00000000000000e+00
+5351 5351 1.00000000000000e+00
+5352 5352 1.00000000000000e+00
+5353 5353 1.00000000000000e+00
+5354 5354 1.00000000000000e+00
+5355 5355 1.00000000000000e+00
+5356 5356 1.00000000000000e+00
+5357 5357 1.00000000000000e+00
+5358 5358 1.00000000000000e+00
+5359 5359 1.00000000000000e+00
+5360 5360 1.00000000000000e+00
+5361 5361 1.00000000000000e+00
+5362 5362 1.00000000000000e+00
+5363 5363 1.00000000000000e+00
+5364 5364 1.00000000000000e+00
+5365 5365 1.00000000000000e+00
+5366 5366 1.00000000000000e+00
+5367 5367 1.00000000000000e+00
+5368 5368 1.00000000000000e+00
+5369 5369 1.00000000000000e+00
+5370 5370 1.00000000000000e+00
+5371 5371 1.00000000000000e+00
+5372 5372 1.00000000000000e+00
+5373 5373 1.00000000000000e+00
+5374 5374 1.00000000000000e+00
+5375 5375 1.00000000000000e+00
+5376 5376 1.00000000000000e+00
+5377 5377 1.00000000000000e+00
+5378 5378 1.00000000000000e+00
+5379 5379 1.00000000000000e+00
+5380 5380 1.00000000000000e+00
+5381 5381 1.00000000000000e+00
+5382 5382 1.00000000000000e+00
+5383 5383 1.00000000000000e+00
+5384 5384 1.00000000000000e+00
+5385 5385 1.00000000000000e+00
+5386 5386 1.00000000000000e+00
+5387 5387 1.00000000000000e+00
+5388 5388 1.00000000000000e+00
+5389 5389 1.00000000000000e+00
+5390 5390 1.00000000000000e+00
+5391 5391 1.00000000000000e+00
+5392 5392 1.00000000000000e+00
+5393 5393 1.00000000000000e+00
+5394 5394 1.00000000000000e+00
+5395 5395 1.00000000000000e+00
+5396 5396 1.00000000000000e+00
+5397 5397 1.00000000000000e+00
+5398 5398 1.00000000000000e+00
+5399 5399 1.00000000000000e+00
+5400 5400 1.00000000000000e+00
+5401 5401 1.00000000000000e+00
+5402 5402 1.00000000000000e+00
+5403 5403 1.00000000000000e+00
+5404 5404 1.00000000000000e+00
+5405 5405 1.00000000000000e+00
+5406 5406 1.00000000000000e+00
+5407 5407 1.00000000000000e+00
+5408 5408 1.00000000000000e+00
+5409 5409 1.00000000000000e+00
+5410 5410 1.00000000000000e+00
+5411 5411 1.00000000000000e+00
+5412 5412 1.00000000000000e+00
+5413 5413 1.00000000000000e+00
+5414 5414 1.00000000000000e+00
+5415 5415 1.00000000000000e+00
+5416 5416 1.00000000000000e+00
+5417 5417 1.00000000000000e+00
+5418 5418 1.00000000000000e+00
+5419 5419 1.00000000000000e+00
+5420 5420 1.00000000000000e+00
+5421 5421 1.00000000000000e+00
+5422 5422 1.00000000000000e+00
+5423 5423 1.00000000000000e+00
+5424 5424 1.00000000000000e+00
+5425 5425 1.00000000000000e+00
+5426 5426 1.00000000000000e+00
+5427 5427 1.00000000000000e+00
+5428 5428 1.00000000000000e+00
+5429 5429 1.00000000000000e+00
+5430 5430 1.00000000000000e+00
+5431 5431 1.00000000000000e+00
+5432 5432 1.00000000000000e+00
+5433 5433 1.00000000000000e+00
+5434 5434 1.00000000000000e+00
+5435 5435 1.00000000000000e+00
+5436 5436 1.00000000000000e+00
+5437 5437 1.00000000000000e+00
+5438 5438 1.00000000000000e+00
+5439 5439 1.00000000000000e+00
+5440 5440 1.00000000000000e+00
+5441 5441 1.00000000000000e+00
+5442 5442 1.00000000000000e+00
+5443 5443 1.00000000000000e+00
+5444 5444 1.00000000000000e+00
+5445 5445 1.00000000000000e+00
+5446 5446 1.00000000000000e+00
+5447 5447 1.00000000000000e+00
+5448 5448 1.00000000000000e+00
+5449 5449 1.00000000000000e+00
+5450 5450 1.00000000000000e+00
+5451 5451 1.00000000000000e+00
+5452 5452 1.00000000000000e+00
+5453 5453 1.00000000000000e+00
+5454 5454 1.00000000000000e+00
+5455 5455 1.00000000000000e+00
+5456 5456 1.00000000000000e+00
+5457 5457 1.00000000000000e+00
+5458 5458 1.00000000000000e+00
+5459 5459 1.00000000000000e+00
+5460 5460 1.00000000000000e+00
+5461 5461 1.00000000000000e+00
+5462 5462 1.00000000000000e+00
+5463 5463 1.00000000000000e+00
+5464 5464 1.00000000000000e+00
+5465 5465 1.00000000000000e+00
+5466 5466 1.00000000000000e+00
+5467 5467 1.00000000000000e+00
+5468 5468 1.00000000000000e+00
+5469 5469 1.00000000000000e+00
+5470 5470 1.00000000000000e+00
+5471 5471 1.00000000000000e+00
+5472 5472 1.00000000000000e+00
+5473 5473 1.00000000000000e+00
+5474 5474 1.00000000000000e+00
+5475 5475 1.00000000000000e+00
+5476 5476 1.00000000000000e+00
+5477 5477 1.00000000000000e+00
+5478 5478 1.00000000000000e+00
+5479 5479 1.00000000000000e+00
+5480 5480 1.00000000000000e+00
+5481 5481 1.00000000000000e+00
+5482 5482 1.00000000000000e+00
+5483 5483 1.00000000000000e+00
diff --git a/external/hypre/src/test/TEST_ij/data/tucker21935/IJ.A.00001 b/external/hypre/src/test/TEST_ij/data/tucker21935/IJ.A.00001
new file mode 100644
index 00000000..d2e120f6
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/data/tucker21935/IJ.A.00001
@@ -0,0 +1,16687 @@
+5484 10967 5484 10967
+5484 5484 1.00000000000000e+00
+5485 5485 1.00000000000000e+00
+5486 5486 1.00000000000000e+00
+5487 5487 1.00000000000000e+00
+5488 5488 1.00000000000000e+00
+5489 5489 1.00000000000000e+00
+5490 5490 1.00000000000000e+00
+5491 5491 1.00000000000000e+00
+5492 5492 1.00000000000000e+00
+5493 5493 1.00000000000000e+00
+5494 5494 1.00000000000000e+00
+5495 5495 1.00000000000000e+00
+5496 5496 1.00000000000000e+00
+5497 5497 1.00000000000000e+00
+5498 5498 1.00000000000000e+00
+5499 5499 1.00000000000000e+00
+5500 5500 1.00000000000000e+00
+5501 5501 1.00000000000000e+00
+5502 5502 1.00000000000000e+00
+5503 5503 1.00000000000000e+00
+5504 5504 1.00000000000000e+00
+5505 5505 1.00000000000000e+00
+5506 5506 1.00000000000000e+00
+5507 5507 1.00000000000000e+00
+5508 5508 1.00000000000000e+00
+5509 5509 1.00000000000000e+00
+5510 5510 1.00000000000000e+00
+5511 5511 1.00000000000000e+00
+5512 5512 1.00000000000000e+00
+5513 5513 1.00000000000000e+00
+5514 5514 1.00000000000000e+00
+5515 5515 1.00000000000000e+00
+5516 5516 1.00000000000000e+00
+5517 5517 1.00000000000000e+00
+5518 5518 1.00000000000000e+00
+5519 5519 1.00000000000000e+00
+5520 5520 1.00000000000000e+00
+5521 5521 1.00000000000000e+00
+5522 5522 1.00000000000000e+00
+5523 5523 1.00000000000000e+00
+5524 5524 1.00000000000000e+00
+5525 5525 1.00000000000000e+00
+5526 5526 1.00000000000000e+00
+5527 5527 1.00000000000000e+00
+5528 5528 1.00000000000000e+00
+5529 5529 1.00000000000000e+00
+5530 5530 1.00000000000000e+00
+5531 5531 1.00000000000000e+00
+5532 5532 1.00000000000000e+00
+5533 5533 1.00000000000000e+00
+5534 5534 1.00000000000000e+00
+5535 5535 1.00000000000000e+00
+5536 5536 1.00000000000000e+00
+5537 5537 1.00000000000000e+00
+5538 5538 1.00000000000000e+00
+5539 5539 1.00000000000000e+00
+5540 5540 1.00000000000000e+00
+5541 5541 1.00000000000000e+00
+5542 5542 1.00000000000000e+00
+5543 5543 1.00000000000000e+00
+5544 5544 1.00000000000000e+00
+5545 5545 1.00000000000000e+00
+5546 5546 1.00000000000000e+00
+5547 5547 1.00000000000000e+00
+5548 5548 1.00000000000000e+00
+5549 5549 1.00000000000000e+00
+5550 5550 1.00000000000000e+00
+5551 5551 1.00000000000000e+00
+5552 5552 1.00000000000000e+00
+5553 5553 1.00000000000000e+00
+5554 5554 1.00000000000000e+00
+5555 5555 1.00000000000000e+00
+5556 5556 1.00000000000000e+00
+5557 5557 1.00000000000000e+00
+5558 5558 1.00000000000000e+00
+5559 5559 1.00000000000000e+00
+5560 5560 1.00000000000000e+00
+5561 5561 1.00000000000000e+00
+5562 5562 1.00000000000000e+00
+5563 5563 1.00000000000000e+00
+5564 5564 1.00000000000000e+00
+5565 4389 6.84807729967536e-04
+5565 4413 7.12317907240384e-04
+5565 4437 4.08628167584000e-09
+5565 4965 5.96412141363904e-03
+5565 4989 2.51332964486052e-01
+5565 5013 6.99586949078867e-02
+5565 5037 6.46479002001122e-05
+5565 5565 1.87999395128717e+00
+5565 5589 3.00812933496051e+00
+5565 5613 2.29394337282817e-01
+5565 5637 4.20437398965698e-04
+5565 6141 1.67498720578736e-03
+5565 6165 2.24680920254790e+00
+5565 6189 2.93990643686117e+00
+5565 6213 7.91253656423209e-02
+5565 6237 9.38864787359718e-05
+5565 6741 3.63532297866496e-03
+5565 6765 1.92744512039674e-01
+5565 6789 1.26642207232515e-01
+5565 6813 4.48672969599088e-03
+5565 7341 2.00195419374265e-06
+5565 7365 2.73392609382702e-04
+5565 7389 2.27061860767543e-04
+5565 7413 1.44666009939139e-06
+5565 17448 -2.26063108285774e-02
+5565 17472 -1.17009061321144e-02
+5565 17496 -1.13643062235917e-04
+5565 17856 -3.91858603018188e-01
+5565 17880 -2.18132430886971e-01
+5565 17904 -6.34375125082210e-03
+5565 18264 -1.95058358179336e+00
+5565 18288 -1.08493774795168e+00
+5565 18312 -3.13274163014294e-02
+5565 18672 -3.21770864406448e+00
+5565 18696 -1.73811843761454e+00
+5565 18720 -3.69326044520842e-02
+5565 19080 -8.31443655203374e-01
+5565 19104 -4.48334279241382e-01
+5565 19128 -9.31784332562705e-03
+5565 19488 -2.72999557635261e-02
+5565 19512 -1.51031657139670e-02
+5565 19536 -4.15196523486831e-04
+5566 5566 1.00000000000000e+00
+5567 5567 1.00000000000000e+00
+5568 5568 1.00000000000000e+00
+5569 5569 1.00000000000000e+00
+5570 5570 1.00000000000000e+00
+5571 5571 1.00000000000000e+00
+5572 5572 1.00000000000000e+00
+5573 5573 1.00000000000000e+00
+5574 5574 1.00000000000000e+00
+5575 5575 1.00000000000000e+00
+5576 5576 1.00000000000000e+00
+5577 5577 1.00000000000000e+00
+5578 5578 1.00000000000000e+00
+5579 5579 1.00000000000000e+00
+5580 5580 1.00000000000000e+00
+5581 5581 1.00000000000000e+00
+5582 5582 1.00000000000000e+00
+5583 5583 1.00000000000000e+00
+5584 5584 1.00000000000000e+00
+5585 5585 1.00000000000000e+00
+5586 5586 1.00000000000000e+00
+5587 5587 1.00000000000000e+00
+5588 5588 1.00000000000000e+00
+5589 3789 5.88890614340000e-09
+5589 3813 4.05234314351900e-08
+5589 4389 1.07199625704486e-01
+5589 4413 2.26802376575180e-01
+5589 4437 6.97895973065605e-03
+5589 4461 1.31669194616127e-06
+5589 4965 5.92060211873675e-02
+5589 4989 8.41036131317700e+00
+5589 5013 5.59124452074484e+00
+5589 5037 1.05217503878584e-01
+5589 5061 1.35092304002419e-04
+5589 5589 2.50014043927913e+01
+5589 5565 3.00812933496051e+00
+5589 5613 7.59651806450859e+00
+5589 5637 2.76348776783459e-01
+5589 5661 7.57288505340474e-04
+5589 6141 9.81314367921062e-04
+5589 6165 4.59301705652267e+00
+5589 6189 9.74156077354714e+00
+5589 6213 2.18313486092391e+00
+5589 6237 1.34764034047411e-01
+5589 6261 4.63231239090587e-05
+5589 6741 2.12411346181328e-03
+5589 6765 2.69689879613932e-01
+5589 6789 3.65589698849336e-01
+5589 6813 1.05567678610662e-01
+5589 6837 6.21683783583436e-03
+5589 6861 8.53127317558100e-08
+5589 7341 1.18392864123253e-06
+5589 7365 2.02409678011765e-04
+5589 7389 2.83309791446211e-04
+5589 7413 2.51116470786617e-04
+5589 7437 1.01551698587118e-06
+5589 7461 5.21894530000000e-13
+5589 7989 3.80000000000000e-19
+5589 8013 4.40000000000000e-19
+5589 17040 -8.48984408304495e-02
+5589 17064 -5.65856354692896e-02
+5589 17088 -4.21211943045388e-03
+5589 17112 -4.66156117325989e-05
+5589 17448 -2.49861912557888e+00
+5589 17472 -1.73985483446226e+00
+5589 17496 -1.70527780808149e-01
+5589 17520 -8.17707393505380e-03
+5589 17856 -1.11286651487522e+01
+5589 17880 -8.15239410774455e+00
+5589 17904 -9.67865603429273e-01
+5589 17928 -6.14995665721261e-02
+5589 17952 -5.41995950758400e-07
+5589 18264 -1.31480554177425e+01
+5589 18288 -1.05430018435051e+01
+5589 18312 -1.62177710123620e+00
+5589 18336 -1.31335544505487e-01
+5589 18360 -2.39915213309624e-06
+5589 18672 -7.85719513899019e+00
+5589 18696 -5.50103384768722e+00
+5589 18720 -6.38758052884531e-01
+5589 18744 -5.10221569510300e-02
+5589 18768 -1.46666927100900e-06
+5589 19080 -1.42258422170922e+00
+5589 19104 -9.00313035298752e-01
+5589 19128 -7.39964518854127e-02
+5589 19152 -5.38291298606242e-03
+5589 19176 -2.31168330062650e-07
+5589 19488 -1.60538004493392e-02
+5589 19512 -9.46517302950717e-03
+5589 19536 -4.10935087373680e-04
+5589 19560 -7.46393400000000e-14
+5590 5590 1.00000000000000e+00
+5591 5591 1.00000000000000e+00
+5592 5592 1.00000000000000e+00
+5593 5593 1.00000000000000e+00
+5594 5594 1.00000000000000e+00
+5595 5595 1.00000000000000e+00
+5596 5596 1.00000000000000e+00
+5597 5597 1.00000000000000e+00
+5598 5598 1.00000000000000e+00
+5599 5599 1.00000000000000e+00
+5600 5600 1.00000000000000e+00
+5601 5601 1.00000000000000e+00
+5602 5602 1.00000000000000e+00
+5603 5603 1.00000000000000e+00
+5604 5604 1.00000000000000e+00
+5605 5605 1.00000000000000e+00
+5606 5606 1.00000000000000e+00
+5607 5607 1.00000000000000e+00
+5608 5608 1.00000000000000e+00
+5609 5609 1.00000000000000e+00
+5610 5610 1.00000000000000e+00
+5611 5611 1.00000000000000e+00
+5612 5612 1.00000000000000e+00
+5613 3789 3.75230044358600e-08
+5613 3813 1.19958834153309e-04
+5613 3837 1.28078995586533e-04
+5613 3861 1.08879937028275e-06
+5613 4389 9.52927344201592e-02
+5613 4413 3.91337936004920e-01
+5613 4437 9.18742608481252e-02
+5613 4461 4.00256385214300e-03
+5613 4485 2.79430157966997e-06
+5613 4965 1.04734868936986e-02
+5613 4989 3.98787308235858e+00
+5613 5013 6.71549843465456e+00
+5613 5037 2.38090503758765e+00
+5613 5061 1.36104287771051e-01
+5613 5085 2.62739118781422e-04
+5613 5613 1.59550388736787e+01
+5613 5565 2.29394337282817e-01
+5613 5589 7.59651806450859e+00
+5613 5637 6.56471963283404e+00
+5613 5661 2.81822420274195e-01
+5613 5685 5.56133606008067e-04
+5613 6141 4.47785888509600e-08
+5613 6165 1.34864340673856e-01
+5613 6189 2.30610993286473e+00
+5613 6213 6.41976470167598e+00
+5613 6237 2.49741496761035e+00
+5613 6261 1.20227799418495e-01
+5613 6285 1.59114016612103e-05
+5613 6741 1.55053844990900e-08
+5613 6765 5.64636705605440e-03
+5613 6789 9.38903743213104e-02
+5613 6813 3.22180068646858e-01
+5613 6837 1.30553376912940e-01
+5613 6861 4.01865511835699e-03
+5613 6885 7.94031900597660e-07
+5613 7341 1.81280000000000e-16
+5613 7365 3.96083470000000e-13
+5613 7389 1.16427669681290e-04
+5613 7413 5.43624149202168e-04
+5613 7437 8.34240246487315e-05
+5613 7461 1.22408211906470e-06
+5613 16632 -3.57181806112185e-04
+5613 16656 -2.60936372640850e-03
+5613 16680 -5.08853050101885e-03
+5613 16704 -1.21570673088845e-03
+5613 16728 -8.76502208940866e-06
+5613 17040 -1.56683939199436e-01
+5613 17064 -3.49286089514230e-01
+5613 17088 -4.36925577003898e-01
+5613 17112 -1.15666008616456e-01
+5613 17136 -5.05902499824330e-03
+5613 17448 -1.71003083767366e+00
+5613 17472 -3.32914583511335e+00
+5613 17496 -3.48549779286624e+00
+5613 17520 -9.54578846059258e-01
+5613 17544 -5.53882674114008e-02
+5613 17568 -1.05957427505539e-05
+5613 17856 -4.85138247369462e+00
+5613 17880 -9.17219547194401e+00
+5613 17904 -8.73478129569122e+00
+5613 17928 -2.45398170369836e+00
+5613 17952 -1.66742076918551e-01
+5613 17976 -5.77838800737355e-05
+5613 18264 -2.47152522189262e+00
+5613 18288 -5.81223872309199e+00
+5613 18312 -6.10453891104451e+00
+5613 18336 -1.72986038849148e+00
+5613 18360 -1.17769960030617e-01
+5613 18384 -7.21993790366338e-05
+5613 18672 -4.08749207963302e-01
+5613 18696 -1.13270057768639e+00
+5613 18720 -1.23592080630087e+00
+5613 18744 -3.40186827062606e-01
+5613 18768 -2.11921539795365e-02
+5613 18792 -1.54009090715200e-05
+5613 19080 -1.68082945346771e-02
+5613 19104 -4.59803680636693e-02
+5613 19128 -4.35511837740988e-02
+5613 19152 -9.40248882104703e-03
+5613 19176 -1.52153242486526e-04
+5613 19488 -1.64223745000000e-12
+5613 19512 -6.23034231000000e-12
+5613 19536 -1.54549245000000e-12
+5614 5614 1.00000000000000e+00
+5615 5615 1.00000000000000e+00
+5616 5616 1.00000000000000e+00
+5617 5617 1.00000000000000e+00
+5618 5618 1.00000000000000e+00
+5619 5619 1.00000000000000e+00
+5620 5620 1.00000000000000e+00
+5621 5621 1.00000000000000e+00
+5622 5622 1.00000000000000e+00
+5623 5623 1.00000000000000e+00
+5624 5624 1.00000000000000e+00
+5625 5625 1.00000000000000e+00
+5626 5626 1.00000000000000e+00
+5627 5627 1.00000000000000e+00
+5628 5628 1.00000000000000e+00
+5629 5629 1.00000000000000e+00
+5630 5630 1.00000000000000e+00
+5631 5631 1.00000000000000e+00
+5632 5632 1.00000000000000e+00
+5633 5633 1.00000000000000e+00
+5634 5634 1.00000000000000e+00
+5635 5635 1.00000000000000e+00
+5636 5636 1.00000000000000e+00
+5637 3789 5.61618000186800e-08
+5637 3813 2.34927877494182e-04
+5637 3837 4.71482473101207e-04
+5637 3861 2.10763663817745e-05
+5637 3885 8.42870972887720e-07
+5637 4389 3.56458842680582e-03
+5637 4413 9.66358510578611e-02
+5637 4437 3.19722565471041e-01
+5637 4461 1.29959229577417e-01
+5637 4485 4.93536473027629e-03
+5637 4509 4.10056075839950e-07
+5637 4965 2.18137199729478e-05
+5637 4989 9.43923886567082e-02
+5637 5013 2.39184467225705e+00
+5637 5037 6.44362061844826e+00
+5637 5061 2.38740455251694e+00
+5637 5085 1.06238221895662e-01
+5637 5109 3.16321383374538e-04
+5637 5637 1.55068125774854e+01
+5637 5565 4.20437398965698e-04
+5637 5589 2.76348776783459e-01
+5637 5613 6.56471963283404e+00
+5637 5661 5.68740314343212e+00
+5637 5685 2.74627686916370e-01
+5637 5709 2.80163312061418e-04
+5637 6141 4.22030000000000e-16
+5637 6165 1.97291361919331e-04
+5637 6189 1.41675838469122e-01
+5637 6213 2.48928706355115e+00
+5637 6237 5.78776746291141e+00
+5637 6261 2.14319633633399e+00
+5637 6285 1.07044420043834e-01
+5637 6309 3.57994833680473e-05
+5637 6741 1.50650000000000e-16
+5637 6765 1.54657054999062e-06
+5637 6789 4.36077583164108e-03
+5637 6813 1.28294801162542e-01
+5637 6837 2.78594960790360e-01
+5637 6861 1.04998272549907e-01
+5637 6885 3.05267476070686e-03
+5637 6909 1.89681802581380e-06
+5637 7389 1.67959048382320e-06
+5637 7413 3.05226841770275e-05
+5637 7437 3.76580666462597e-04
+5637 7461 2.90316706081261e-04
+5637 7485 1.37306196538332e-06
+5637 16248 -6.36605257387310e-07
+5637 16272 -1.71530090327611e-05
+5637 16296 -5.96109218410207e-05
+5637 16320 -1.67984462863557e-05
+5637 16344 -5.47964570785970e-07
+5637 16632 -6.75108151057735e-04
+5637 16656 -2.75544390262802e-02
+5637 16680 -1.32485464574336e-01
+5637 16704 -1.56845308931475e-01
+5637 16728 -4.20503355344793e-02
+5637 16752 -2.41400275343918e-03
+5637 17040 -1.67149292436564e-02
+5637 17064 -4.28266688460056e-01
+5637 17088 -1.87406138757866e+00
+5637 17112 -2.05289357518910e+00
+5637 17136 -5.99376677632776e-01
+5637 17160 -4.71831589024726e-02
+5637 17184 -2.76739317972472e-05
+5637 17448 -7.54624655077900e-02
+5637 17472 -1.66495891798112e+00
+5637 17496 -6.98854935785902e+00
+5637 17520 -7.39535321592706e+00
+5637 17544 -2.25808474336955e+00
+5637 17568 -2.01108282090793e-01
+5637 17592 -2.81844181765467e-04
+5637 17856 -8.98711480908165e-02
+5637 17880 -1.82669002690140e+00
+5637 17904 -7.47852153566612e+00
+5637 17928 -7.77456076509330e+00
+5637 17952 -2.44933938889463e+00
+5637 17976 -2.35359211128363e-01
+5637 18000 -7.15434311001538e-04
+5637 18264 -2.24860482368026e-02
+5637 18288 -5.57018387595858e-01
+5637 18312 -2.35758391105404e+00
+5637 18336 -2.39601445015478e+00
+5637 18360 -7.15791459635713e-01
+5637 18384 -6.29703485864395e-02
+5637 18408 -1.83814698169986e-04
+5637 18672 -9.39185922044165e-04
+5637 18696 -4.82939482475489e-02
+5637 18720 -2.21176604075135e-01
+5637 18744 -2.16482774683166e-01
+5637 18768 -5.64564483220393e-02
+5637 18792 -3.60383670497819e-03
+5637 18816 -3.16656089837683e-06
+5637 19080 -4.41669362790000e-09
+5637 19104 -8.87003356679482e-05
+5637 19128 -3.83180860003058e-04
+5637 19152 -2.02465739836171e-04
+5637 19176 -2.84457677356835e-05
+5638 5638 1.00000000000000e+00
+5639 5639 1.00000000000000e+00
+5640 5640 1.00000000000000e+00
+5641 5641 1.00000000000000e+00
+5642 5642 1.00000000000000e+00
+5643 5643 1.00000000000000e+00
+5644 5644 1.00000000000000e+00
+5645 5645 1.00000000000000e+00
+5646 5646 1.00000000000000e+00
+5647 5647 1.00000000000000e+00
+5648 5648 1.00000000000000e+00
+5649 5649 1.00000000000000e+00
+5650 5650 1.00000000000000e+00
+5651 5651 1.00000000000000e+00
+5652 5652 1.00000000000000e+00
+5653 5653 1.00000000000000e+00
+5654 5654 1.00000000000000e+00
+5655 5655 1.00000000000000e+00
+5656 5656 1.00000000000000e+00
+5657 5657 1.00000000000000e+00
+5658 5658 1.00000000000000e+00
+5659 5659 1.00000000000000e+00
+5660 5660 1.00000000000000e+00
+5661 3789 1.65361740000000e-13
+5661 3813 3.01784208052619e-06
+5661 3837 1.01435749871596e-04
+5661 3861 5.42606048985633e-04
+5661 3885 1.33659463189934e-04
+5661 4389 4.13226415410000e-10
+5661 4413 6.61404141397720e-03
+5661 4437 1.33641182211232e-01
+5661 4461 3.01419830152279e-01
+5661 4485 8.99707006266845e-02
+5661 4509 5.39569286250705e-03
+5661 4533 6.72456755290744e-06
+5661 4989 6.65602558937116e-05
+5661 5013 1.24157463156090e-01
+5661 5037 2.39295414762298e+00
+5661 5061 5.50681995523432e+00
+5661 5085 2.25961989461752e+00
+5661 5109 1.00146710530681e-01
+5661 5133 2.46473168732270e-04
+5661 5661 1.42155940525200e+01
+5661 5589 7.57288505340474e-04
+5661 5613 2.81822420274195e-01
+5661 5637 5.68740314343212e+00
+5661 5685 5.17797855006935e+00
+5661 5709 2.82210798877976e-01
+5661 5733 1.40080260134690e-04
+5661 6189 1.65828879302890e-04
+5661 6213 1.24288913731445e-01
+5661 6237 2.15188580318620e+00
+5661 6261 5.19496917949438e+00
+5661 6285 2.08683207293720e+00
+5661 6309 1.00625901988247e-01
+5661 6333 7.84494215473652e-05
+5661 6789 7.38583222521842e-06
+5661 6813 3.81948091007359e-03
+5661 6837 9.20977706503654e-02
+5661 6861 2.80488210935187e-01
+5661 6885 1.06392574754094e-01
+5661 6909 2.37454150425827e-03
+5661 6933 1.59094207830700e-06
+5661 7413 1.84048516669520e-07
+5661 7437 1.56645013647059e-04
+5661 7461 1.84292133188979e-04
+5661 7485 1.06435412031523e-04
+5661 7509 1.13484136129365e-05
+5661 16248 -2.55024749279354e-06
+5661 16272 -2.24873890229679e-03
+5661 16296 -1.68136550660145e-02
+5661 16320 -3.45663066015175e-02
+5661 16344 -1.14567772184783e-02
+5661 16368 -8.99956012314765e-04
+5661 16632 -1.98860187077000e-09
+5661 16656 -8.22518959263143e-03
+5661 16680 -1.53167292222670e-01
+5661 16704 -6.98575913356125e-01
+5661 16728 -9.93116571711667e-01
+5661 16752 -3.52156070294230e-01
+5661 16776 -3.58048723393150e-02
+5661 16800 -2.31930704160451e-05
+5661 17040 -8.94809260414000e-09
+5661 17064 -5.14144086384409e-02
+5661 17088 -9.05256029698995e-01
+5661 17112 -3.93415720552649e+00
+5661 17136 -5.24984454072547e+00
+5661 17160 -1.93651044840103e+00
+5661 17184 -2.15879675201223e-01
+5661 17208 -7.57131174518666e-04
+5661 17448 -5.96334235505000e-09
+5661 17472 -8.46843250636792e-02
+5661 17496 -1.52988192885985e+00
+5661 17520 -6.59932721052840e+00
+5661 17544 -8.57804786423762e+00
+5661 17568 -3.29949882568259e+00
+5661 17592 -3.98034187425594e-01
+5661 17616 -2.84679740778396e-03
+5661 17856 -9.93685121070000e-10
+5661 17880 -2.75991069040430e-02
+5661 17904 -6.49578675580656e-01
+5661 17928 -2.99873944324042e+00
+5661 17952 -3.96244886125039e+00
+5661 17976 -1.47822609499832e+00
+5661 18000 -1.70937578879021e-01
+5661 18024 -1.32903395665438e-03
+5661 18288 -2.26300359808555e-03
+5661 18312 -8.64757018219492e-02
+5661 18336 -4.30138184579638e-01
+5661 18360 -5.70727423507642e-01
+5661 18384 -2.00674644131226e-01
+5661 18408 -2.12466860893380e-02
+5661 18432 -1.66168765949973e-04
+5661 18696 -3.20764573755020e-07
+5661 18720 -1.50947173666035e-03
+5661 18744 -7.59144487802216e-03
+5661 18768 -7.75557904544802e-03
+5661 18792 -1.61402046852438e-03
+5661 18816 -1.39127671343209e-05
+5662 5662 1.00000000000000e+00
+5663 5663 1.00000000000000e+00
+5664 5664 1.00000000000000e+00
+5665 5665 1.00000000000000e+00
+5666 5666 1.00000000000000e+00
+5667 5667 1.00000000000000e+00
+5668 5668 1.00000000000000e+00
+5669 5669 1.00000000000000e+00
+5670 5670 1.00000000000000e+00
+5671 5671 1.00000000000000e+00
+5672 5672 1.00000000000000e+00
+5673 5673 1.00000000000000e+00
+5674 5674 1.00000000000000e+00
+5675 5675 1.00000000000000e+00
+5676 5676 1.00000000000000e+00
+5677 5677 1.00000000000000e+00
+5678 5678 1.00000000000000e+00
+5679 5679 1.00000000000000e+00
+5680 5680 1.00000000000000e+00
+5681 5681 1.00000000000000e+00
+5682 5682 1.00000000000000e+00
+5683 5683 1.00000000000000e+00
+5684 5684 1.00000000000000e+00
+5685 3837 6.98380998805092e-06
+5685 3861 2.64738694593930e-04
+5685 3885 1.52045374293928e-04
+5685 3909 9.19256200499717e-05
+5685 3933 1.74930753381091e-06
+5685 4437 5.78011380667543e-03
+5685 4461 1.03986644421699e-01
+5685 4485 2.94052596094355e-01
+5685 4509 1.04894232584914e-01
+5685 4533 2.66749886865829e-03
+5685 4557 1.29078208718040e-05
+5685 5013 1.31358384121015e-04
+5685 5037 9.21548851110123e-02
+5685 5061 2.25780169589532e+00
+5685 5085 5.23127818559829e+00
+5685 5109 2.14309867129194e+00
+5685 5133 1.09523577382535e-01
+5685 5157 1.20323550370871e-04
+5685 5685 1.38340505320784e+01
+5685 5613 5.56133606008066e-04
+5685 5637 2.74627686916370e-01
+5685 5661 5.17797855006935e+00
+5685 5709 5.14992565412798e+00
+5685 5733 2.80952884632898e-01
+5685 5757 1.79724268891035e-04
+5685 6213 7.72839565029886e-05
+5685 6237 1.09974090606847e-01
+5685 6261 2.09507042579205e+00
+5685 6285 5.17540769465826e+00
+5685 6309 2.03413071720506e+00
+5685 6333 9.01462639339680e-02
+5685 6357 1.52487309262471e-04
+5685 6813 2.33286633743796e-06
+5685 6837 4.96537002526922e-03
+5685 6861 9.57663978761791e-02
+5685 6885 2.40930019848202e-01
+5685 6909 1.11890756819089e-01
+5685 6933 3.29078610576372e-03
+5685 6957 2.21431704970470e-07
+5685 7413 8.10624600000000e-14
+5685 7437 2.12450364950000e-10
+5685 7461 5.24284476533349e-05
+5685 7485 5.57366312412021e-04
+5685 7509 1.26060474670819e-04
+5685 7533 6.71275600306698e-06
+5685 15888 -3.13185518468507e-05
+5685 15912 -9.54445888291217e-04
+5685 15936 -3.53912977336373e-03
+5685 15960 -1.59366967251031e-03
+5685 15984 -1.91124497901625e-04
+5685 16272 -1.05007272993043e-03
+5685 16296 -3.91570541987386e-02
+5685 16320 -2.32535662013761e-01
+5685 16344 -4.23340971250767e-01
+5685 16368 -1.78671550878460e-01
+5685 16392 -2.18011093323529e-02
+5685 16416 -1.27615079143267e-05
+5685 16680 -1.29970123836128e-02
+5685 16704 -3.72818880152220e-01
+5685 16728 -2.01599738264802e+00
+5685 16752 -3.39171852619204e+00
+5685 16776 -1.48988839847489e+00
+5685 16800 -1.98152836711837e-01
+5685 16824 -1.49333307771918e-03
+5685 17088 -3.85963268737251e-02
+5685 17112 -1.01643732635627e+00
+5685 17136 -5.25957862952243e+00
+5685 17160 -8.46920094647177e+00
+5685 17184 -3.84397367768762e+00
+5685 17208 -5.44017519973798e-01
+5685 17232 -6.99137529405221e-03
+5685 17496 -1.82366467804069e-02
+5685 17520 -6.65735053161055e-01
+5685 17544 -3.65852053446200e+00
+5685 17568 -6.03043027825399e+00
+5685 17592 -2.71989718090500e+00
+5685 17616 -3.86242857738424e-01
+5685 17640 -6.28028490483834e-03
+5685 17904 -2.36917694260555e-03
+5685 17928 -1.34841749520498e-01
+5685 17952 -7.80770559015170e-01
+5685 17976 -1.30220261752322e+00
+5685 18000 -5.54442084415404e-01
+5685 18024 -7.39127451110982e-02
+5685 18048 -1.21000740674986e-03
+5685 18312 -2.45216359375905e-06
+5685 18336 -6.01949539313820e-03
+5685 18360 -3.76488888679948e-02
+5685 18384 -6.19881299017583e-02
+5685 18408 -1.97985618629703e-02
+5685 18432 -1.54822597046122e-03
+5685 18456 -1.35451214863840e-07
+5685 18744 -7.91806544230000e-10
+5685 18768 -3.72328364354000e-09
+5685 18792 -3.01603641067000e-09
+5685 18816 -5.56057466610000e-10
+5686 5686 1.00000000000000e+00
+5687 5687 1.00000000000000e+00
+5688 5688 1.00000000000000e+00
+5689 5689 1.00000000000000e+00
+5690 5690 1.00000000000000e+00
+5691 5691 1.00000000000000e+00
+5692 5692 1.00000000000000e+00
+5693 5693 1.00000000000000e+00
+5694 5694 1.00000000000000e+00
+5695 5695 1.00000000000000e+00
+5696 5696 1.00000000000000e+00
+5697 5697 1.00000000000000e+00
+5698 5698 1.00000000000000e+00
+5699 5699 1.00000000000000e+00
+5700 5700 1.00000000000000e+00
+5701 5701 1.00000000000000e+00
+5702 5702 1.00000000000000e+00
+5703 5703 1.00000000000000e+00
+5704 5704 1.00000000000000e+00
+5705 5705 1.00000000000000e+00
+5706 5706 1.00000000000000e+00
+5707 5707 1.00000000000000e+00
+5708 5708 1.00000000000000e+00
+5709 3861 2.40795486257654e-06
+5709 3885 1.86724261971482e-04
+5709 3909 6.35178349373478e-04
+5709 3933 1.97278770701293e-05
+5709 3957 5.63269850000790e-07
+5709 4437 1.51877667859400e-08
+5709 4461 4.70380571098778e-03
+5709 4485 1.13586382165692e-01
+5709 4509 2.61254999604077e-01
+5709 4533 1.19507368978337e-01
+5709 4557 4.30756462080179e-03
+5709 4581 1.01551698587120e-06
+5709 5037 1.76444125597529e-04
+5709 5061 8.63918164591274e-02
+5709 5085 2.15224436646039e+00
+5709 5109 5.35940821716823e+00
+5709 5133 2.13680044591839e+00
+5709 5157 1.14020590599329e-01
+5709 5181 8.34240246487340e-05
+5709 5709 1.36726238031768e+01
+5709 5637 2.80163312061418e-04
+5709 5661 2.82210798877976e-01
+5709 5685 5.14992565412798e+00
+5709 5733 5.12682007264041e+00
+5709 5757 2.81305087752589e-01
+5709 5781 3.76580666462584e-04
+5709 6237 7.71464689415067e-05
+5709 6261 1.07957058569067e-01
+5709 6285 2.02653932949449e+00
+5709 6309 5.11958293841722e+00
+5709 6333 2.12534457488612e+00
+5709 6357 8.13110836323441e-02
+5709 6381 1.56645013647053e-04
+5709 6837 5.53908622508738e-06
+5709 6861 2.64740635360718e-03
+5709 6885 1.08772846312620e-01
+5709 6909 2.51563538065896e-01
+5709 6933 9.78293108358415e-02
+5709 6957 4.89545672319198e-03
+5709 6981 2.12450364950000e-10
+5709 7461 2.00372158358374e-06
+5709 7485 3.31206932007271e-05
+5709 7509 2.87450017846346e-04
+5709 7533 2.09551952060579e-04
+5709 7557 4.07861261643045e-06
+5709 15528 -5.82139999520657e-06
+5709 15552 -2.73146508523374e-05
+5709 15576 -2.19376034812510e-05
+5709 15600 -4.02905087151112e-06
+5709 15888 -2.65552428960322e-05
+5709 15912 -6.95654844075536e-03
+5709 15936 -5.91529245750127e-02
+5709 15960 -1.44363945467570e-01
+5709 15984 -7.41832630423739e-02
+5709 16008 -1.06321116976911e-02
+5709 16032 -4.68288025480883e-06
+5709 16296 -3.08070724295743e-03
+5709 16320 -1.43723768517552e-01
+5709 16344 -9.41794062802636e-01
+5709 16368 -1.93483237870043e+00
+5709 16392 -1.01903277723736e+00
+5709 16416 -1.58796974729021e-01
+5709 16440 -1.95098127036774e-03
+5709 16704 -1.39338207108133e-02
+5709 16728 -5.94848422720122e-01
+5709 16752 -3.67439368781378e+00
+5709 16776 -7.13291989148017e+00
+5709 16800 -3.82742487958766e+00
+5709 16824 -6.27007469647813e-01
+5709 16848 -1.23074871066053e-02
+5709 17112 -1.10223094013719e-02
+5709 17136 -6.28313393694452e-01
+5709 17160 -3.99347476231917e+00
+5709 17184 -7.82063470981180e+00
+5709 17208 -4.28272850225017e+00
+5709 17232 -7.35882102626052e-01
+5709 17256 -2.04237157877315e-02
+5709 17520 -2.05148678363376e-03
+5709 17544 -1.85183137996139e-01
+5709 17568 -1.24030980514066e+00
+5709 17592 -2.48901865479227e+00
+5709 17616 -1.29828131778269e+00
+5709 17640 -2.12078387164962e-01
+5709 17664 -5.35878571918439e-03
+5709 17928 -1.05416003024271e-05
+5709 17952 -1.53834825153156e-02
+5709 17976 -1.12540250718599e-01
+5709 18000 -2.34465262564612e-01
+5709 18024 -1.09225360996484e-01
+5709 18048 -1.52511482932413e-02
+5709 18072 -1.96245122556973e-04
+5709 18360 -4.34911550910311e-05
+5709 18384 -2.69100304160322e-04
+5709 18408 -4.24155580695297e-04
+5709 18432 -9.56224454740982e-05
+5709 18456 -1.21690419475120e-07
+5710 5710 1.00000000000000e+00
+5711 5711 1.00000000000000e+00
+5712 5712 1.00000000000000e+00
+5713 5713 1.00000000000000e+00
+5714 5714 1.00000000000000e+00
+5715 5715 1.00000000000000e+00
+5716 5716 1.00000000000000e+00
+5717 5717 1.00000000000000e+00
+5718 5718 1.00000000000000e+00
+5719 5719 1.00000000000000e+00
+5720 5720 1.00000000000000e+00
+5721 5721 1.00000000000000e+00
+5722 5722 1.00000000000000e+00
+5723 5723 1.00000000000000e+00
+5724 5724 1.00000000000000e+00
+5725 5725 1.00000000000000e+00
+5726 5726 1.00000000000000e+00
+5727 5727 1.00000000000000e+00
+5728 5728 1.00000000000000e+00
+5729 5729 1.00000000000000e+00
+5730 5730 1.00000000000000e+00
+5731 5731 1.00000000000000e+00
+5732 5732 1.00000000000000e+00
+5733 3885 1.40334369341953e-05
+5733 3909 1.17189641502778e-04
+5733 3933 4.54537256974676e-04
+5733 3957 1.46665177000229e-04
+5733 4461 7.22147823010720e-07
+5733 4485 3.00569983360125e-03
+5733 4509 1.24287728839431e-01
+5733 4533 2.93701725343253e-01
+5733 4557 1.03318965213879e-01
+5733 4581 6.21683783583442e-03
+5733 4605 8.25552108883434e-06
+5733 5061 1.25135402336310e-04
+5733 5085 9.81329879921890e-02
+5733 5109 2.13949290794890e+00
+5733 5133 5.46392976673377e+00
+5733 5157 2.31147641763552e+00
+5733 5181 1.30553376912942e-01
+5733 5205 1.11714081298826e-04
+5733 5733 1.39656075658925e+01
+5733 5661 1.40080260134690e-04
+5733 5685 2.80952884632898e-01
+5733 5709 5.12682007264041e+00
+5733 5757 5.35035677744411e+00
+5733 5781 2.78594960790360e-01
+5733 5805 6.00232747143518e-04
+5733 6261 1.62005155421059e-04
+5733 6285 1.02519668862684e-01
+5733 6309 2.12226312376195e+00
+5733 6333 5.01444778180917e+00
+5733 6357 2.15568720645532e+00
+5733 6381 9.20977706503652e-02
+5733 6405 8.84933336397282e-05
+5733 6861 1.21535498385409e-05
+5733 6885 3.45602568546587e-03
+5733 6909 8.52217717989005e-02
+5733 6933 2.78473549213861e-01
+5733 6957 1.01104182244150e-01
+5733 6981 4.96537002526924e-03
+5733 7485 9.31527367732900e-08
+5733 7509 1.11059283569016e-04
+5733 7533 2.49408950444565e-04
+5733 7557 1.76905947185151e-04
+5733 7581 5.53908622508734e-06
+5733 15528 -3.92140677873932e-04
+5733 15552 -8.39152786425455e-03
+5733 15576 -3.18464976229817e-02
+5733 15600 -2.34736856990420e-02
+5733 15624 -4.16543717404546e-03
+5733 15648 -7.35209993245780e-07
+5733 15912 -6.49930412057389e-04
+5733 15936 -4.81042644266786e-02
+5733 15960 -3.90543641669718e-01
+5733 15984 -9.86091564195395e-01
+5733 16008 -6.46169679302493e-01
+5733 16032 -1.16903644012219e-01
+5733 16056 -1.95469579268319e-03
+5733 16320 -3.82397426018655e-03
+5733 16344 -2.95079386881862e-01
+5733 16368 -2.22780410194090e+00
+5733 16392 -5.27554891058874e+00
+5733 16416 -3.42870701505587e+00
+5733 16440 -6.49732174719313e-01
+5733 16464 -1.83378568091768e-02
+5733 16728 -5.56934197282919e-03
+5733 16752 -5.08138615513806e-01
+5733 16776 -3.75690140381853e+00
+5733 16800 -8.67746750985504e+00
+5733 16824 -5.69463606063275e+00
+5733 16848 -1.14612630496385e+00
+5733 16872 -4.65170820385606e-02
+5733 17136 -1.31385706373233e-03
+5733 17160 -2.18693144643843e-01
+5733 17184 -1.73159753784729e+00
+5733 17208 -4.15319957528701e+00
+5733 17232 -2.63136498869214e+00
+5733 17256 -5.14869724059536e-01
+5733 17280 -2.03097815182609e-02
+5733 17544 -2.24011129438340e-05
+5733 17568 -2.92174748183979e-02
+5733 17592 -2.51669427949051e-01
+5733 17616 -6.28655875378816e-01
+5733 17640 -3.73523759437002e-01
+5733 17664 -6.87655032636447e-02
+5733 17688 -2.44491993247954e-03
+5733 17976 -4.48079598200323e-04
+5733 18000 -4.43884181165068e-03
+5733 18024 -1.13536029586754e-02
+5733 18048 -3.92424215915950e-03
+5733 18072 -3.19429685077527e-04
+5734 5734 1.00000000000000e+00
+5735 5735 1.00000000000000e+00
+5736 5736 1.00000000000000e+00
+5737 5737 1.00000000000000e+00
+5738 5738 1.00000000000000e+00
+5739 5739 1.00000000000000e+00
+5740 5740 1.00000000000000e+00
+5741 5741 1.00000000000000e+00
+5742 5742 1.00000000000000e+00
+5743 5743 1.00000000000000e+00
+5744 5744 1.00000000000000e+00
+5745 5745 1.00000000000000e+00
+5746 5746 1.00000000000000e+00
+5747 5747 1.00000000000000e+00
+5748 5748 1.00000000000000e+00
+5749 5749 1.00000000000000e+00
+5750 5750 1.00000000000000e+00
+5751 5751 1.00000000000000e+00
+5752 5752 1.00000000000000e+00
+5753 5753 1.00000000000000e+00
+5754 5754 1.00000000000000e+00
+5755 5755 1.00000000000000e+00
+5756 5756 1.00000000000000e+00
+5757 3333 4.20640000000000e-16
+5757 3357 1.17839000000000e-15
+5757 3909 8.73668005157790e-06
+5757 3933 2.67866754088802e-04
+5757 3957 2.69575548313876e-04
+5757 3981 9.38864787359752e-05
+5757 4005 1.23556813447244e-06
+5757 4485 2.19066051226412e-06
+5757 4509 2.88298668641234e-03
+5757 4533 1.20361755725486e-01
+5757 4557 3.57259474892100e-01
+5757 4581 1.34764034047412e-01
+5757 4605 2.91387883519292e-03
+5757 4629 4.55670212600404e-06
+5757 4653 2.69600000000000e-17
+5757 5085 6.03166389497410e-05
+5757 5109 1.08523138370519e-01
+5757 5133 2.30005723638079e+00
+5757 5157 6.06166136081314e+00
+5757 5181 2.49741496761038e+00
+5757 5205 1.45180600441261e-01
+5757 5229 2.22694656811323e-04
+5757 5253 1.94460000000000e-16
+5757 5757 1.45485484512117e+01
+5757 5685 1.79724268891035e-04
+5757 5709 2.81305087752589e-01
+5757 5733 5.35035677744411e+00
+5757 5781 5.78776746291127e+00
+5757 5805 2.82925116133224e-01
+5757 5829 6.78079290028163e-04
+5757 6285 2.84168131865536e-04
+5757 6309 9.45590627379137e-02
+5757 6333 2.15151970522623e+00
+5757 6357 5.27654782800344e+00
+5757 6381 2.15188580318619e+00
+5757 6405 1.09787995396201e-01
+5757 6429 4.54682972154241e-05
+5757 6885 1.36098486988972e-06
+5757 6909 5.38660454727590e-03
+5757 6933 9.29174454274840e-02
+5757 6957 2.51306149652814e-01
+5757 6981 1.09974090606846e-01
+5757 7005 5.24590795012676e-03
+5757 7029 2.14304096016500e-08
+5757 7485 3.51291980000000e-13
+5757 7509 3.82862373842000e-09
+5757 7533 6.59455841648079e-05
+5757 7557 5.25146915451599e-04
+5757 7581 7.71464689415051e-05
+5757 7605 4.62919780307240e-07
+5757 7629 1.11133603000000e-12
+5757 15144 -1.23322260600600e-08
+5757 15168 -2.76167595293297e-04
+5757 15192 -1.52847645058492e-03
+5757 15216 -1.97210171975275e-03
+5757 15240 -4.24068021415259e-04
+5757 15264 -1.92421531558400e-08
+5757 15528 -5.95594804659699e-05
+5757 15552 -1.27081830126300e-02
+5757 15576 -1.45112262225359e-01
+5757 15600 -4.56776305238469e-01
+5757 15624 -3.51322853426498e-01
+5757 15648 -7.03796648728689e-02
+5757 15672 -1.69124856312048e-03
+5757 15936 -7.09749042147115e-04
+5757 15960 -1.27093248179569e-01
+5757 15984 -1.24236010428431e+00
+5757 16008 -3.59514649502361e+00
+5757 16032 -2.73881420483962e+00
+5757 16056 -5.91340677496699e-01
+5757 16080 -2.47456816655720e-02
+5757 16104 -6.02256811617600e-08
+5757 16344 -1.97908944809921e-03
+5757 16368 -3.54816042167562e-01
+5757 16392 -3.17368962354507e+00
+5757 16416 -8.66875421797876e+00
+5757 16440 -6.61043386329516e+00
+5757 16464 -1.52417843992882e+00
+5757 16488 -8.46942034598107e-02
+5757 16512 -3.81408583499220e-07
+5757 16752 -6.05453066284458e-04
+5757 16776 -2.26074176801015e-01
+5757 16800 -2.14962332383441e+00
+5757 16824 -6.07799992998208e+00
+5757 16848 -4.66363090861391e+00
+5757 16872 -1.08618188199010e+00
+5757 16896 -6.23693251947756e-02
+5757 16920 -6.22249116570490e-07
+5757 17160 -3.34854865003058e-05
+5757 17184 -4.32773454137623e-02
+5757 17208 -4.52262731923127e-01
+5757 17232 -1.33485408307050e+00
+5757 17256 -9.83374149245021e-01
+5757 17280 -2.18551967117538e-01
+5757 17304 -1.13664813412542e-02
+5757 17328 -1.40505858852180e-07
+5757 17592 -1.55307223477496e-03
+5757 17616 -2.16988591599805e-02
+5757 17640 -7.01592677812311e-02
+5757 17664 -4.21980672869890e-02
+5757 17688 -6.94726832043423e-03
+5757 17712 -7.18384143752443e-05
+5757 18000 -3.17062769720000e-09
+5757 18024 -3.06112379000400e-08
+5757 18048 -7.48855361421700e-08
+5757 18072 -1.79287271112400e-08
+5758 5758 1.00000000000000e+00
+5759 5759 1.00000000000000e+00
+5760 5760 1.00000000000000e+00
+5761 5761 1.00000000000000e+00
+5762 5762 1.00000000000000e+00
+5763 5763 1.00000000000000e+00
+5764 5764 1.00000000000000e+00
+5765 5765 1.00000000000000e+00
+5766 5766 1.00000000000000e+00
+5767 5767 1.00000000000000e+00
+5768 5768 1.00000000000000e+00
+5769 5769 1.00000000000000e+00
+5770 5770 1.00000000000000e+00
+5771 5771 1.00000000000000e+00
+5772 5772 1.00000000000000e+00
+5773 5773 1.00000000000000e+00
+5774 5774 1.00000000000000e+00
+5775 5775 1.00000000000000e+00
+5776 5776 1.00000000000000e+00
+5777 5777 1.00000000000000e+00
+5778 5778 1.00000000000000e+00
+5779 5779 1.00000000000000e+00
+5780 5780 1.00000000000000e+00
+5781 3333 1.50650000000000e-16
+5781 3357 4.22030000000000e-16
+5781 3933 1.54657054999065e-06
+5781 3957 1.97291361919338e-04
+5781 3981 4.20437398965708e-04
+5781 4005 2.18137199729476e-05
+5781 4509 1.67959048382325e-06
+5781 4533 4.36077583164111e-03
+5781 4557 1.41675838469124e-01
+5781 4581 2.76348776783462e-01
+5781 4605 9.43923886567084e-02
+5781 4629 3.56458842680596e-03
+5781 4653 5.61618000186900e-08
+5781 5109 3.05226841770284e-05
+5781 5133 1.28294801162544e-01
+5781 5157 2.48928706355118e+00
+5781 5181 6.56471963283418e+00
+5781 5205 2.39184467225707e+00
+5781 5229 9.66358510578628e-02
+5781 5253 2.34927877494202e-04
+5781 5781 1.55068125774854e+01
+5781 5709 3.76580666462584e-04
+5781 5733 2.78594960790360e-01
+5781 5757 5.78776746291127e+00
+5781 5805 6.44362061844831e+00
+5781 5829 3.19722565471035e-01
+5781 5853 4.71482473101217e-04
+5781 6309 2.90316706081250e-04
+5781 6333 1.04998272549906e-01
+5781 6357 2.14319633633396e+00
+5781 6381 5.68740314343221e+00
+5781 6405 2.38740455251700e+00
+5781 6429 1.29959229577415e-01
+5781 6453 2.10763663817741e-05
+5781 6909 1.37306196538331e-06
+5781 6933 3.05267476070688e-03
+5781 6957 1.07044420043833e-01
+5781 6981 2.74627686916368e-01
+5781 7005 1.06238221895664e-01
+5781 7029 4.93536473027632e-03
+5781 7053 8.42870972887730e-07
+5781 7533 1.89681802581378e-06
+5781 7557 3.57994833680467e-05
+5781 7581 2.80163312061428e-04
+5781 7605 3.16321383374553e-04
+5781 7629 4.10056075839960e-07
+5781 15144 -4.41669362790000e-09
+5781 15168 -9.39185922044201e-04
+5781 15192 -2.24860482368024e-02
+5781 15216 -8.98711480908158e-02
+5781 15240 -7.54624655077920e-02
+5781 15264 -1.67149292436572e-02
+5781 15288 -6.75108151057794e-04
+5781 15552 -8.87003356679501e-05
+5781 15576 -4.82939482475493e-02
+5781 15600 -5.57018387595870e-01
+5781 15624 -1.82669002690145e+00
+5781 15648 -1.66495891798113e+00
+5781 15672 -4.28266688460054e-01
+5781 15696 -2.75544390262795e-02
+5781 15720 -6.36605257387370e-07
+5781 15960 -3.83180860003066e-04
+5781 15984 -2.21176604075137e-01
+5781 16008 -2.35758391105407e+00
+5781 16032 -7.47852153566625e+00
+5781 16056 -6.98854935785907e+00
+5781 16080 -1.87406138757865e+00
+5781 16104 -1.32485464574332e-01
+5781 16128 -1.71530090327614e-05
+5781 16368 -2.02465739836176e-04
+5781 16392 -2.16482774683169e-01
+5781 16416 -2.39601445015473e+00
+5781 16440 -7.77456076509314e+00
+5781 16464 -7.39535321592722e+00
+5781 16488 -2.05289357518915e+00
+5781 16512 -1.56845308931475e-01
+5781 16536 -5.96109218410210e-05
+5781 16776 -2.84457677356845e-05
+5781 16800 -5.64564483220394e-02
+5781 16824 -7.15791459635699e-01
+5781 16848 -2.44933938889458e+00
+5781 16872 -2.25808474336958e+00
+5781 16896 -5.99376677632788e-01
+5781 16920 -4.20503355344799e-02
+5781 16944 -1.67984462863558e-05
+5781 17208 -3.60383670497804e-03
+5781 17232 -6.29703485864394e-02
+5781 17256 -2.35359211128364e-01
+5781 17280 -2.01108282090790e-01
+5781 17304 -4.71831589024721e-02
+5781 17328 -2.41400275343929e-03
+5781 17352 -5.47964570785970e-07
+5781 17616 -3.16656089837681e-06
+5781 17640 -1.83814698169984e-04
+5781 17664 -7.15434311001531e-04
+5781 17688 -2.81844181765463e-04
+5781 17712 -2.76739317972466e-05
+5782 5782 1.00000000000000e+00
+5783 5783 1.00000000000000e+00
+5784 5784 1.00000000000000e+00
+5785 5785 1.00000000000000e+00
+5786 5786 1.00000000000000e+00
+5787 5787 1.00000000000000e+00
+5788 5788 1.00000000000000e+00
+5789 5789 1.00000000000000e+00
+5790 5790 1.00000000000000e+00
+5791 5791 1.00000000000000e+00
+5792 5792 1.00000000000000e+00
+5793 5793 1.00000000000000e+00
+5794 5794 1.00000000000000e+00
+5795 5795 1.00000000000000e+00
+5796 5796 1.00000000000000e+00
+5797 5797 1.00000000000000e+00
+5798 5798 1.00000000000000e+00
+5799 5799 1.00000000000000e+00
+5800 5800 1.00000000000000e+00
+5801 5801 1.00000000000000e+00
+5802 5802 1.00000000000000e+00
+5803 5803 1.00000000000000e+00
+5804 5804 1.00000000000000e+00
+5805 3957 7.77337397786230e-07
+5805 3981 6.46479002001113e-05
+5805 4005 1.13653088228281e-05
+5805 4533 5.57780449472120e-07
+5805 4557 4.47462327059547e-03
+5805 4581 1.05217503878585e-01
+5805 4605 2.68021749546518e-01
+5805 4629 6.68679335058819e-02
+5805 4653 8.29054817407610e-05
+5805 5133 1.86095276753436e-05
+5805 5157 1.37978003661640e-01
+5805 5181 2.38090503758767e+00
+5805 5205 5.30068757924905e+00
+5805 5229 2.47430333521989e+00
+5805 5253 1.15120413221383e-01
+5805 5277 1.48757014544797e-04
+5805 5805 1.69611461768894e+01
+5805 5733 6.00232747143518e-04
+5805 5757 2.82925116133224e-01
+5805 5781 6.44362061844831e+00
+5805 5829 6.38956406917389e+00
+5805 5853 2.84023234766742e-01
+5805 5877 3.73082498911614e-04
+5805 6333 1.80679317919317e-04
+5805 6357 1.18382376377733e-01
+5805 6381 2.39295414762304e+00
+5805 6405 6.29112857326273e+00
+5805 6429 2.61139860278928e+00
+5805 6453 1.35101238191710e-01
+5805 6477 4.77661153452617e-05
+5805 6933 2.33359908483912e-06
+5805 6957 4.38303943466945e-03
+5805 6981 9.21548851110135e-02
+5805 7005 3.12738875079129e-01
+5805 7029 1.22356735855197e-01
+5805 7053 3.35210990307854e-03
+5805 7077 3.03133255660095e-06
+5805 7557 3.05027687506100e-08
+5805 7581 1.76444125597537e-04
+5805 7605 2.74904578863927e-04
+5805 7629 9.68204573979332e-05
+5805 7653 6.81126937739488e-06
+5805 15168 -3.26042166295244e-06
+5805 15192 -1.03974540170886e-02
+5805 15216 -1.55218139672086e-01
+5805 15240 -6.68819689456894e-01
+5805 15264 -9.47053835614488e-01
+5805 15288 -2.77611194666467e-01
+5805 15312 -1.84717084370417e-02
+5805 15336 -1.33099563758210e-07
+5805 15576 -1.90559154330361e-05
+5805 15600 -7.89606507668578e-02
+5805 15624 -1.01464558466502e+00
+5805 15648 -3.94528752716490e+00
+5805 15672 -5.10178297208434e+00
+5805 15696 -1.56020234216355e+00
+5805 15720 -1.23074941957588e-01
+5805 15744 -1.43016294015586e-04
+5805 15984 -2.73173367878578e-05
+5805 16008 -1.67675406492193e-01
+5805 16032 -2.31875979400017e+00
+5805 16056 -8.83501779089219e+00
+5805 16080 -1.02349311736184e+01
+5805 16104 -3.24277390371013e+00
+5805 16128 -2.94623651010291e-01
+5805 16152 -6.20042783016770e-04
+5805 16392 -6.01422878122634e-06
+5805 16416 -6.27299216796506e-02
+5805 16440 -1.05198764373597e+00
+5805 16464 -4.21473093150745e+00
+5805 16488 -4.72026243498160e+00
+5805 16512 -1.46587366422927e+00
+5805 16536 -1.30904245935948e-01
+5805 16560 -3.42380297403756e-04
+5805 16824 -6.31400259870865e-03
+5805 16848 -1.43978339114227e-01
+5805 16872 -6.12047630761590e-01
+5805 16896 -6.58101042165483e-01
+5805 16920 -1.94900128605115e-01
+5805 16944 -1.62013567064916e-02
+5805 16968 -4.99741004108008e-05
+5805 17232 -2.12273103108982e-05
+5805 17256 -2.68360686543634e-03
+5805 17280 -1.21795169504231e-02
+5805 17304 -9.66017648426725e-03
+5805 17328 -1.79342829018032e-03
+5805 17352 -7.48228670978536e-06
+5806 5806 1.00000000000000e+00
+5807 5807 1.00000000000000e+00
+5808 5808 1.00000000000000e+00
+5809 5809 1.00000000000000e+00
+5810 5810 1.00000000000000e+00
+5811 5811 1.00000000000000e+00
+5812 5812 1.00000000000000e+00
+5813 5813 1.00000000000000e+00
+5814 5814 1.00000000000000e+00
+5815 5815 1.00000000000000e+00
+5816 5816 1.00000000000000e+00
+5817 5817 1.00000000000000e+00
+5818 5818 1.00000000000000e+00
+5819 5819 1.00000000000000e+00
+5820 5820 1.00000000000000e+00
+5821 5821 1.00000000000000e+00
+5822 5822 1.00000000000000e+00
+5823 5823 1.00000000000000e+00
+5824 5824 1.00000000000000e+00
+5825 5825 1.00000000000000e+00
+5826 5826 1.00000000000000e+00
+5827 5827 1.00000000000000e+00
+5828 5828 1.00000000000000e+00
+5829 3957 1.83791670000000e-12
+5829 3981 4.08628167584000e-09
+5829 4005 1.02677524531000e-09
+5829 4557 8.30405258521000e-09
+5829 4581 6.97895973065629e-03
+5829 4605 1.54296983896814e-01
+5829 4629 1.62292688555026e-01
+5829 4653 8.16320942124753e-04
+5829 5157 8.08979821477038e-05
+5829 5181 9.18742608481268e-02
+5829 5205 2.75103404825551e+00
+5829 5229 9.48469133812500e+00
+5829 5253 4.37323350928703e+00
+5829 5277 5.71113368287830e-02
+5829 5829 1.66107668831673e+01
+5829 5757 6.78079290028162e-04
+5829 5781 3.19722565471035e-01
+5829 5805 6.38956406917389e+00
+5829 5853 8.30042343340762e+00
+5829 5877 3.98093749650472e-01
+5829 5901 7.09412875459569e-05
+5829 6357 9.36342827745058e-05
+5829 6381 1.33641182211230e-01
+5829 6405 2.63300019074904e+00
+5829 6429 6.43803972467936e+00
+5829 6453 2.30136421296788e+00
+5829 6477 1.06494160843872e-01
+5829 6501 1.20547285967305e-04
+5829 6957 5.17030619608320e-07
+5829 6981 5.78011380667545e-03
+5829 7005 1.12349617391643e-01
+5829 7029 3.08047702966230e-01
+5829 7053 1.63787166671296e-01
+5829 7077 3.82984705123423e-03
+5829 7101 1.85443126627629e-06
+5829 7557 1.07492419000000e-12
+5829 7581 1.51877667859400e-08
+5829 7605 4.76842667935613e-05
+5829 7629 6.38231870733005e-04
+5829 7653 2.12410211905647e-04
+5829 7677 7.44503075326120e-06
+5829 8253 1.16118000000000e-15
+5829 8277 1.61450000000000e-16
+5829 15192 -1.63349069221820e-07
+5829 15216 -3.85260548717763e-02
+5829 15240 -8.02167487971888e-01
+5829 15264 -4.33414068707053e+00
+5829 15288 -7.62575536054912e+00
+5829 15312 -2.36081159036057e+00
+5829 15336 -1.65636733875931e-01
+5829 15360 -3.39183723660182e-04
+5829 15600 -2.10202261173670e-07
+5829 15624 -6.90657784007971e-02
+5829 15648 -1.62540162070137e+00
+5829 15672 -7.61855577416965e+00
+5829 15696 -1.02980360621154e+01
+5829 15720 -3.50368766140374e+00
+5829 15744 -3.45089594634302e-01
+5829 15768 -1.97299421219392e-03
+5829 16008 -3.67222075893600e-08
+5829 16032 -4.79131606910222e-02
+5829 16056 -1.23817040319277e+00
+5829 16080 -5.68289186565247e+00
+5829 16104 -7.16654941689187e+00
+5829 16128 -2.74934680092522e+00
+5829 16152 -3.35634600221829e-01
+5829 16176 -2.80648045101120e-03
+5829 16440 -9.38575092160597e-03
+5829 16464 -2.85679637321192e-01
+5829 16488 -1.35589596977103e+00
+5829 16512 -1.73717993124602e+00
+5829 16536 -6.47334861429494e-01
+5829 16560 -7.56563029286538e-02
+5829 16584 -6.16935639697806e-04
+5829 16848 -8.49783613857499e-05
+5829 16872 -1.24654553297145e-02
+5829 16896 -6.57338060232606e-02
+5829 16920 -8.21777190579347e-02
+5829 16944 -2.30088250458344e-02
+5829 16968 -1.46560958747291e-03
+5829 16992 -1.82286164144400e-08
+5829 17280 -9.85236182442100e-08
+5829 17304 -4.31404717765010e-07
+5829 17328 -2.47764597396870e-07
+5829 17352 -3.73102447881600e-08
+5830 5830 1.00000000000000e+00
+5831 5831 1.00000000000000e+00
+5832 5832 1.00000000000000e+00
+5833 5833 1.00000000000000e+00
+5834 5834 1.00000000000000e+00
+5835 5835 1.00000000000000e+00
+5836 5836 1.00000000000000e+00
+5837 5837 1.00000000000000e+00
+5838 5838 1.00000000000000e+00
+5839 5839 1.00000000000000e+00
+5840 5840 1.00000000000000e+00
+5841 5841 1.00000000000000e+00
+5842 5842 1.00000000000000e+00
+5843 5843 1.00000000000000e+00
+5844 5844 1.00000000000000e+00
+5845 5845 1.00000000000000e+00
+5846 5846 1.00000000000000e+00
+5847 5847 1.00000000000000e+00
+5848 5848 1.00000000000000e+00
+5849 5849 1.00000000000000e+00
+5850 5850 1.00000000000000e+00
+5851 5851 1.00000000000000e+00
+5852 5852 1.00000000000000e+00
+5853 4605 9.74515294596671e-03
+5853 4629 2.29883960010649e-02
+5853 4653 5.01825510064348e-04
+5853 5181 1.28078995586542e-04
+5853 5205 1.65911619907656e-01
+5853 5229 6.37363411517367e+00
+5853 5253 8.47559702554776e+00
+5853 5277 6.74357737899612e-01
+5853 5853 2.52133658919632e+01
+5853 5781 4.71482473101217e-04
+5853 5805 2.84023234766742e-01
+5853 5829 8.30042343340762e+00
+5853 5877 9.91943451262268e+00
+5853 5901 3.21523235303128e-01
+5853 5925 4.59011807340410e-05
+5853 6381 1.01435749871593e-04
+5853 6405 1.41458480609625e-01
+5853 6429 2.28682142390913e+00
+5853 6453 5.81461242173254e+00
+5853 6477 3.76737230205427e+00
+5853 6501 2.45504972402715e-01
+5853 6525 1.80194811187155e-04
+5853 6981 6.98380998805095e-06
+5853 7005 3.14962360091581e-03
+5853 7029 1.59134713973785e-01
+5853 7053 3.88254869960634e-01
+5853 7077 1.37148490235058e-01
+5853 7101 2.98352467610302e-03
+5853 7125 7.09230616116300e-07
+5853 7605 2.33546346859170e-06
+5853 7629 7.38617469010416e-05
+5853 7653 4.30184941148632e-04
+5853 7677 2.94496133374715e-04
+5853 7701 5.17938663274501e-06
+5853 8253 1.70813000000000e-15
+5853 8277 2.37500000000000e-16
+5853 15240 -6.91058902851688e-02
+5853 15264 -2.55228025707651e+00
+5853 15288 -1.16470936735665e+01
+5853 15312 -1.31344205713101e+01
+5853 15336 -6.32291240333017e+00
+5853 15360 -9.88607456833721e-01
+5853 15384 -7.07189490284731e-03
+5853 15648 -5.86754948615242e-02
+5853 15672 -1.92125528213327e+00
+5853 15696 -9.05696095074184e+00
+5853 15720 -1.16102424187961e+01
+5853 15744 -5.92201974611276e+00
+5853 15768 -9.48787970187871e-01
+5853 15792 -8.34695865135725e-03
+5853 16056 -7.88893963817192e-03
+5853 16080 -3.17162331399189e-01
+5853 16104 -1.76103804557894e+00
+5853 16128 -2.92410451374053e+00
+5853 16152 -1.39480511332754e+00
+5853 16176 -2.02228954966398e-01
+5853 16200 -1.65556807285416e-03
+5853 16464 -2.68364539589378e-04
+5853 16488 -3.63021842950993e-02
+5853 16512 -2.28262293221438e-01
+5853 16536 -4.02728245207735e-01
+5853 16560 -1.63888366341908e-01
+5853 16584 -1.94860308560996e-02
+5853 16608 -7.56520811581507e-05
+5853 16896 -1.43822464621434e-04
+5853 16920 -7.66819923937588e-04
+5853 16944 -9.09969541231176e-04
+5853 16968 -1.91637324661207e-04
+5853 16992 -2.68148023391800e-08
+5854 5854 1.00000000000000e+00
+5855 5855 1.00000000000000e+00
+5856 5856 1.00000000000000e+00
+5857 5857 1.00000000000000e+00
+5858 5858 1.00000000000000e+00
+5859 5859 1.00000000000000e+00
+5860 5860 1.00000000000000e+00
+5861 5861 1.00000000000000e+00
+5862 5862 1.00000000000000e+00
+5863 5863 1.00000000000000e+00
+5864 5864 1.00000000000000e+00
+5865 5865 1.00000000000000e+00
+5866 5866 1.00000000000000e+00
+5867 5867 1.00000000000000e+00
+5868 5868 1.00000000000000e+00
+5869 5869 1.00000000000000e+00
+5870 5870 1.00000000000000e+00
+5871 5871 1.00000000000000e+00
+5872 5872 1.00000000000000e+00
+5873 5873 1.00000000000000e+00
+5874 5874 1.00000000000000e+00
+5875 5875 1.00000000000000e+00
+5876 5876 1.00000000000000e+00
+5877 4605 1.07430315361200e-08
+5877 4629 4.99765527714198e-05
+5877 4653 5.22093285751313e-06
+5877 5205 2.73574244309962e-04
+5877 5229 1.56701631720266e-01
+5877 5253 1.35780839835573e+00
+5877 5277 4.31840613477265e-01
+5877 5877 2.09499843293977e+01
+5877 5805 3.73082498911614e-04
+5877 5829 3.98093749650472e-01
+5877 5853 9.91943451262268e+00
+5877 5901 2.93723459434141e+00
+5877 5925 1.06727575900907e-02
+5877 6405 1.72881141110551e-04
+5877 6429 1.02944973256482e-01
+5877 6453 3.09914208319473e+00
+5877 6477 1.09723187831808e+01
+5877 6501 4.64065275503852e+00
+5877 6525 4.36793967859327e-02
+5877 7005 1.78071334005424e-05
+5877 7029 5.91766666038595e-03
+5877 7053 1.15026971954086e-01
+5877 7077 2.82792704146786e-01
+5877 7101 1.27181616251690e-01
+5877 7125 2.13706456323191e-04
+5877 7629 1.80315251593800e-08
+5877 7653 1.55156966072372e-04
+5877 7677 2.53629710191415e-04
+5877 7701 1.74314569669891e-05
+5877 15264 -2.65905112531985e-02
+5877 15288 -9.84383496535976e-01
+5877 15312 -6.70591694751850e+00
+5877 15336 -1.47080981867767e+01
+5877 15360 -7.86715197249487e+00
+5877 15384 -1.27202318270225e+00
+5877 15672 -1.42217084326022e-02
+5877 15696 -6.32999049357056e-01
+5877 15720 -4.52174059881944e+00
+5877 15744 -1.01045841424142e+01
+5877 15768 -5.11981516898468e+00
+5877 15792 -8.20147575343343e-01
+5877 16080 -2.64700801715137e-04
+5877 16104 -4.67880445595033e-02
+5877 16128 -3.82150713253358e-01
+5877 16152 -8.81159512977729e-01
+5877 16176 -3.64114134599598e-01
+5877 16200 -5.34115908914603e-02
+5877 16512 -1.76545037455340e-03
+5877 16536 -1.29804131789673e-02
+5877 16560 -2.56556343381753e-02
+5877 16584 -6.78156064318184e-03
+5877 16608 -2.15737240607034e-04
+5878 5878 1.00000000000000e+00
+5879 5879 1.00000000000000e+00
+5880 5880 1.00000000000000e+00
+5881 5881 1.00000000000000e+00
+5882 5882 1.00000000000000e+00
+5883 5883 1.00000000000000e+00
+5884 5884 1.00000000000000e+00
+5885 5885 1.00000000000000e+00
+5886 5886 1.00000000000000e+00
+5887 5887 1.00000000000000e+00
+5888 5888 1.00000000000000e+00
+5889 5889 1.00000000000000e+00
+5890 5890 1.00000000000000e+00
+5891 5891 1.00000000000000e+00
+5892 5892 1.00000000000000e+00
+5893 5893 1.00000000000000e+00
+5894 5894 1.00000000000000e+00
+5895 5895 1.00000000000000e+00
+5896 5896 1.00000000000000e+00
+5897 5897 1.00000000000000e+00
+5898 5898 1.00000000000000e+00
+5899 5899 1.00000000000000e+00
+5900 5900 1.00000000000000e+00
+5901 5253 1.18136420444717e-02
+5901 5277 1.48846185431154e-02
+5901 5901 2.89240257957885e+00
+5901 5829 7.09412875459569e-05
+5901 5853 3.21523235303128e-01
+5901 5877 2.93723459434141e+00
+5901 5925 2.46870374499721e-02
+5901 6429 2.54420757694272e-04
+5901 6453 1.29727964301459e-01
+5901 6477 3.18335899755218e+00
+5901 6501 4.66704907915619e+00
+5901 6525 1.19790234883616e-01
+5901 7029 1.16629760528206e-06
+5901 7053 4.32657486010460e-03
+5901 7077 1.45416647043232e-01
+5901 7101 2.17844836818978e-01
+5901 7125 9.64122588329177e-04
+5901 7629 8.34516350000000e-13
+5901 7653 4.80711473217600e-08
+5901 7677 8.82040844097404e-06
+5901 7701 1.01894477122356e-05
+5901 15312 -2.11153262788658e-01
+5901 15336 -1.81449700885244e+00
+5901 15360 -4.54030951783693e+00
+5901 15384 -1.86912480621190e+00
+5901 15720 -1.22950809007931e-01
+5901 15744 -1.03543496275690e+00
+5901 15768 -2.63427490152788e+00
+5901 15792 -1.21722609796368e+00
+5901 16128 -4.96490615160433e-03
+5901 16152 -3.66291396137368e-02
+5901 16176 -1.04039244321091e-01
+5901 16200 -8.07620712877373e-02
+5901 16536 -2.30301308694400e-07
+5901 16560 -1.19463980016851e-06
+5901 16584 -1.32403957025804e-06
+5901 16608 -2.73434565390910e-07
+5902 5902 1.00000000000000e+00
+5903 5903 1.00000000000000e+00
+5904 5904 1.00000000000000e+00
+5905 5905 1.00000000000000e+00
+5906 5906 1.00000000000000e+00
+5907 5907 1.00000000000000e+00
+5908 5908 1.00000000000000e+00
+5909 5909 1.00000000000000e+00
+5910 5910 1.00000000000000e+00
+5911 5911 1.00000000000000e+00
+5912 5912 1.00000000000000e+00
+5913 5913 1.00000000000000e+00
+5914 5914 1.00000000000000e+00
+5915 5915 1.00000000000000e+00
+5916 5916 1.00000000000000e+00
+5917 5917 1.00000000000000e+00
+5918 5918 1.00000000000000e+00
+5919 5919 1.00000000000000e+00
+5920 5920 1.00000000000000e+00
+5921 5921 1.00000000000000e+00
+5922 5922 1.00000000000000e+00
+5923 5923 1.00000000000000e+00
+5924 5924 1.00000000000000e+00
+5925 5925 1.00118062439057e+00
+5925 5853 4.59011807340410e-05
+5925 5877 1.06727575900907e-02
+5925 5901 2.46870374499721e-02
+5925 6453 7.20900767794638e-05
+5925 6477 2.33776633015677e-02
+5925 6501 1.09822659070734e-01
+5925 6525 6.14289272445810e-03
+5925 7053 4.55990495249544e-06
+5925 7077 2.79091754131930e-03
+5925 7101 7.20909761037743e-03
+5925 7125 5.45386769826301e-05
+5925 7677 2.84965056096480e-07
+5925 7701 3.38261348833650e-07
+5925 15336 -4.53057394300022e-03
+5925 15360 -4.69807489686183e-02
+5925 15384 -6.22474803362350e-02
+5925 15744 -2.35827455065943e-03
+5925 15768 -2.76749461282620e-02
+5925 15792 -3.88419704019079e-02
+5925 16152 -2.65678797598056e-05
+5925 16176 -1.19559189827223e-03
+5925 16200 -2.20520863822583e-03
+5926 5926 1.00000000000000e+00
+5927 5927 1.00000000000000e+00
+5928 5928 1.00000000000000e+00
+5929 5929 1.00000000000000e+00
+5930 5930 1.00000000000000e+00
+5931 5931 1.00000000000000e+00
+5932 5932 1.00000000000000e+00
+5933 5933 1.00000000000000e+00
+5934 5934 1.00000000000000e+00
+5935 5935 1.00000000000000e+00
+5936 5936 1.00000000000000e+00
+5937 5937 1.00000000000000e+00
+5938 5938 1.00000000000000e+00
+5939 5939 1.00000000000000e+00
+5940 5940 1.00000000000000e+00
+5941 5941 1.00000000000000e+00
+5942 5942 1.00000000000000e+00
+5943 5943 1.00000000000000e+00
+5944 5944 1.00000000000000e+00
+5945 5945 1.00000000000000e+00
+5946 5946 1.00000000000000e+00
+5947 5947 1.00000000000000e+00
+5948 5948 1.00000000000000e+00
+5949 5949 1.00000000000000e+00
+5950 5950 1.00000000000000e+00
+5951 5951 1.00000000000000e+00
+5952 5952 1.00000000000000e+00
+5953 5953 1.00000000000000e+00
+5954 5954 1.00000000000000e+00
+5955 5955 1.00000000000000e+00
+5956 5956 1.00000000000000e+00
+5957 5957 1.00000000000000e+00
+5958 5958 1.00000000000000e+00
+5959 5959 1.00000000000000e+00
+5960 5960 1.00000000000000e+00
+5961 5961 1.00000000000000e+00
+5962 5962 1.00000000000000e+00
+5963 5963 1.00000000000000e+00
+5964 5964 1.00000000000000e+00
+5965 5965 1.00000000000000e+00
+5966 5966 1.00000000000000e+00
+5967 5967 1.00000000000000e+00
+5968 5968 1.00000000000000e+00
+5969 5969 1.00000000000000e+00
+5970 5970 1.00000000000000e+00
+5971 5971 1.00000000000000e+00
+5972 5972 1.00000000000000e+00
+5973 5973 1.00000000000000e+00
+5974 5974 1.00000000000000e+00
+5975 5975 1.00000000000000e+00
+5976 5976 1.00000000000000e+00
+5977 5977 1.00000000000000e+00
+5978 5978 1.00000000000000e+00
+5979 5979 1.00000000000000e+00
+5980 5980 1.00000000000000e+00
+5981 5981 1.00000000000000e+00
+5982 5982 1.00000000000000e+00
+5983 5983 1.00000000000000e+00
+5984 5984 1.00000000000000e+00
+5985 5985 1.00000000000000e+00
+5986 5986 1.00000000000000e+00
+5987 5987 1.00000000000000e+00
+5988 5988 1.00000000000000e+00
+5989 5989 1.00000000000000e+00
+5990 5990 1.00000000000000e+00
+5991 5991 1.00000000000000e+00
+5992 5992 1.00000000000000e+00
+5993 5993 1.00000000000000e+00
+5994 5994 1.00000000000000e+00
+5995 5995 1.00000000000000e+00
+5996 5996 1.00000000000000e+00
+5997 5997 1.00000000000000e+00
+5998 5998 1.00000000000000e+00
+5999 5999 1.00000000000000e+00
+6000 6000 1.00000000000000e+00
+6001 6001 1.00000000000000e+00
+6002 6002 1.00000000000000e+00
+6003 6003 1.00000000000000e+00
+6004 6004 1.00000000000000e+00
+6005 6005 1.00000000000000e+00
+6006 6006 1.00000000000000e+00
+6007 6007 1.00000000000000e+00
+6008 6008 1.00000000000000e+00
+6009 6009 1.00000000000000e+00
+6010 6010 1.00000000000000e+00
+6011 6011 1.00000000000000e+00
+6012 6012 1.00000000000000e+00
+6013 6013 1.00000000000000e+00
+6014 6014 1.00000000000000e+00
+6015 6015 1.00000000000000e+00
+6016 6016 1.00000000000000e+00
+6017 6017 1.00000000000000e+00
+6018 6018 1.00000000000000e+00
+6019 6019 1.00000000000000e+00
+6020 6020 1.00000000000000e+00
+6021 6021 1.00000000000000e+00
+6022 6022 1.00000000000000e+00
+6023 6023 1.00000000000000e+00
+6024 6024 1.00000000000000e+00
+6025 6025 1.00000000000000e+00
+6026 6026 1.00000000000000e+00
+6027 6027 1.00000000000000e+00
+6028 6028 1.00000000000000e+00
+6029 6029 1.00000000000000e+00
+6030 6030 1.00000000000000e+00
+6031 6031 1.00000000000000e+00
+6032 6032 1.00000000000000e+00
+6033 6033 1.00000000000000e+00
+6034 6034 1.00000000000000e+00
+6035 6035 1.00000000000000e+00
+6036 6036 1.00000000000000e+00
+6037 6037 1.00000000000000e+00
+6038 6038 1.00000000000000e+00
+6039 6039 1.00000000000000e+00
+6040 6040 1.00000000000000e+00
+6041 6041 1.00000000000000e+00
+6042 6042 1.00000000000000e+00
+6043 6043 1.00000000000000e+00
+6044 6044 1.00000000000000e+00
+6045 6045 1.00000000000000e+00
+6046 6046 1.00000000000000e+00
+6047 6047 1.00000000000000e+00
+6048 6048 1.00000000000000e+00
+6049 6049 1.00000000000000e+00
+6050 6050 1.00000000000000e+00
+6051 6051 1.00000000000000e+00
+6052 6052 1.00000000000000e+00
+6053 6053 1.00000000000000e+00
+6054 6054 1.00000000000000e+00
+6055 6055 1.00000000000000e+00
+6056 6056 1.00000000000000e+00
+6057 6057 1.00000000000000e+00
+6058 6058 1.00000000000000e+00
+6059 6059 1.00000000000000e+00
+6060 6060 1.00000000000000e+00
+6061 6061 1.00000000000000e+00
+6062 6062 1.00000000000000e+00
+6063 6063 1.00000000000000e+00
+6064 6064 1.00000000000000e+00
+6065 6065 1.00000000000000e+00
+6066 6066 1.00000000000000e+00
+6067 6067 1.00000000000000e+00
+6068 6068 1.00000000000000e+00
+6069 6069 1.00000000000000e+00
+6070 6070 1.00000000000000e+00
+6071 6071 1.00000000000000e+00
+6072 6072 1.00000000000000e+00
+6073 6073 1.00000000000000e+00
+6074 6074 1.00000000000000e+00
+6075 6075 1.00000000000000e+00
+6076 6076 1.00000000000000e+00
+6077 6077 1.00000000000000e+00
+6078 6078 1.00000000000000e+00
+6079 6079 1.00000000000000e+00
+6080 6080 1.00000000000000e+00
+6081 6081 1.00000000000000e+00
+6082 6082 1.00000000000000e+00
+6083 6083 1.00000000000000e+00
+6084 6084 1.00000000000000e+00
+6085 6085 1.00000000000000e+00
+6086 6086 1.00000000000000e+00
+6087 6087 1.00000000000000e+00
+6088 6088 1.00000000000000e+00
+6089 6089 1.00000000000000e+00
+6090 6090 1.00000000000000e+00
+6091 6091 1.00000000000000e+00
+6092 6092 1.00000000000000e+00
+6093 6093 1.00000000000000e+00
+6094 6094 1.00000000000000e+00
+6095 6095 1.00000000000000e+00
+6096 6096 1.00000000000000e+00
+6097 6097 1.00000000000000e+00
+6098 6098 1.00000000000000e+00
+6099 6099 1.00000000000000e+00
+6100 6100 1.00000000000000e+00
+6101 6101 1.00000000000000e+00
+6102 6102 1.00000000000000e+00
+6103 6103 1.00000000000000e+00
+6104 6104 1.00000000000000e+00
+6105 6105 1.00000000000000e+00
+6106 6106 1.00000000000000e+00
+6107 6107 1.00000000000000e+00
+6108 6108 1.00000000000000e+00
+6109 6109 1.00000000000000e+00
+6110 6110 1.00000000000000e+00
+6111 6111 1.00000000000000e+00
+6112 6112 1.00000000000000e+00
+6113 6113 1.00000000000000e+00
+6114 6114 1.00000000000000e+00
+6115 6115 1.00000000000000e+00
+6116 6116 1.00000000000000e+00
+6117 6117 1.00000000000000e+00
+6118 6118 1.00000000000000e+00
+6119 6119 1.00000000000000e+00
+6120 6120 1.00000000000000e+00
+6121 6121 1.00000000000000e+00
+6122 6122 1.00000000000000e+00
+6123 6123 1.00000000000000e+00
+6124 6124 1.00000000000000e+00
+6125 6125 1.00000000000000e+00
+6126 6126 1.00000000000000e+00
+6127 6127 1.00000000000000e+00
+6128 6128 1.00000000000000e+00
+6129 6129 1.00000000000000e+00
+6130 6130 1.00000000000000e+00
+6131 6131 1.00000000000000e+00
+6132 6132 1.00000000000000e+00
+6133 6133 1.00000000000000e+00
+6134 6134 1.00000000000000e+00
+6135 6135 1.00000000000000e+00
+6136 6136 1.00000000000000e+00
+6137 6137 1.00000000000000e+00
+6138 6138 1.00000000000000e+00
+6139 6139 1.00000000000000e+00
+6140 6140 1.00000000000000e+00
+6141 4965 1.57623610900000e-11
+6141 4989 4.36402672700000e-11
+6141 6141 1.00509671531337e+00
+6141 5565 1.67498720578736e-03
+6141 5589 9.81314367921062e-04
+6141 5613 4.47785888509600e-08
+6141 5637 4.22030000000000e-16
+6141 6165 1.57248436422905e-01
+6141 6189 4.60996910959747e-02
+6141 6213 6.26332162683871e-05
+6141 6237 1.17839000000000e-15
+6141 6717 2.16381754700000e-11
+6141 6741 5.97228003931995e-02
+6141 6765 3.02172057297916e-01
+6141 6789 3.21160075323171e-02
+6141 6813 1.00310287655639e-04
+6141 7317 1.47384460888300e-07
+6141 7341 1.55949680715277e-02
+6141 7365 3.70617261712402e-02
+6141 7389 1.60503283768703e-03
+6141 7413 1.32826164813375e-06
+6141 7917 2.60784759250900e-08
+6141 7941 4.17426610680265e-06
+6141 7965 6.61673559220358e-06
+6141 7989 3.07268247464816e-06
+6141 8565 3.85400000000000e-17
+6141 8589 6.35000000000000e-18
+6141 18264 -4.04614909029321e-06
+6141 18288 -2.02792477156878e-06
+6141 18312 -1.38577897776000e-09
+6141 18672 -3.37372744046831e-02
+6141 18696 -1.77902210357914e-02
+6141 18720 -2.63309666699975e-04
+6141 19080 -1.72731756794411e-01
+6141 19104 -9.11000637037529e-02
+6141 19128 -1.35262437329919e-03
+6141 19488 -1.85121313218598e-01
+6141 19512 -9.76740571613008e-02
+6141 19536 -1.46097158628627e-03
+6141 19896 -3.79506224605999e-02
+6141 19920 -2.00238148159732e-02
+6141 19944 -2.99572453049499e-04
+6141 20304 -2.68177621415987e-05
+6141 20328 -1.35540959531500e-05
+6141 20352 -4.14899663859000e-08
+6142 6142 1.00000000000000e+00
+6143 6143 1.00000000000000e+00
+6144 6144 1.00000000000000e+00
+6145 6145 1.00000000000000e+00
+6146 6146 1.00000000000000e+00
+6147 6147 1.00000000000000e+00
+6148 6148 1.00000000000000e+00
+6149 6149 1.00000000000000e+00
+6150 6150 1.00000000000000e+00
+6151 6151 1.00000000000000e+00
+6152 6152 1.00000000000000e+00
+6153 6153 1.00000000000000e+00
+6154 6154 1.00000000000000e+00
+6155 6155 1.00000000000000e+00
+6156 6156 1.00000000000000e+00
+6157 6157 1.00000000000000e+00
+6158 6158 1.00000000000000e+00
+6159 6159 1.00000000000000e+00
+6160 6160 1.00000000000000e+00
+6161 6161 1.00000000000000e+00
+6162 6162 1.00000000000000e+00
+6163 6163 1.00000000000000e+00
+6164 6164 1.00000000000000e+00
+6165 4389 2.65320809328760e-07
+6165 4413 2.76965240371850e-07
+6165 4437 1.83791670000000e-12
+6165 4965 2.08212736614834e-03
+6165 4989 6.52643325329198e-02
+6165 5013 9.82793053106720e-03
+6165 5037 7.77337397786210e-07
+6165 6165 1.65352612376486e+01
+6165 5565 2.24680920254790e+00
+6165 5589 4.59301705652267e+00
+6165 5613 1.34864340673856e-01
+6165 5637 1.97291361919331e-04
+6165 6141 1.57248436422905e-01
+6165 6189 1.20747408504982e+01
+6165 6213 2.53180377174192e-01
+6165 6237 2.69575548313870e-04
+6165 6717 3.19243961200000e-11
+6165 6741 7.56157576803351e-01
+6165 6765 9.26996687393087e+00
+6165 6789 3.20527510274175e+00
+6165 6813 8.83750882412685e-02
+6165 6837 1.46665177000228e-04
+6165 7317 2.17449701422410e-07
+6165 7341 1.33556506834830e-01
+6165 7365 4.11150698402188e-01
+6165 7389 1.01082040273076e-01
+6165 7413 4.31287933667568e-03
+6165 7437 5.63269850000800e-07
+6165 7917 3.84760914064400e-08
+6165 7941 6.16672890543078e-06
+6165 7965 1.84499564047509e-04
+6165 7989 2.14991453078890e-04
+6165 8013 9.75132400737221e-06
+6165 8565 6.14500000000000e-17
+6165 8589 1.01200000000000e-17
+6165 17448 -8.84884528789615e-06
+6165 17472 -5.06717717815102e-06
+6165 17496 -1.83644152629410e-07
+6165 17856 -1.09415256228249e-01
+6165 17880 -6.76799247529317e-02
+6165 17904 -3.70637046823065e-03
+6165 18264 -2.73110193042545e+00
+6165 18288 -1.58757384800458e+00
+6165 18312 -6.49202412504737e-02
+6165 18336 -3.99843198830981e-04
+6165 18672 -1.14939187741037e+01
+6165 18696 -6.80856023493010e+00
+6165 18720 -3.17500633505509e-01
+6165 18744 -3.81933610700287e-03
+6165 19080 -1.14588221436150e+01
+6165 19104 -7.40748823356977e+00
+6165 19128 -5.14460043694646e-01
+6165 19152 -9.42561470530939e-03
+6165 19488 -3.50736818545118e+00
+6165 19512 -2.26455304050102e+00
+6165 19536 -1.56376062952831e-01
+6165 19560 -2.80363635072946e-03
+6165 19896 -3.24429347867775e-01
+6165 19920 -1.97918336106530e-01
+6165 19944 -1.07430284427304e-02
+6165 19968 -1.45918259762629e-04
+6165 20304 -3.95711006277205e-05
+6165 20328 -2.00170805911738e-05
+6165 20352 -6.61515078038700e-08
+6166 6166 1.00000000000000e+00
+6167 6167 1.00000000000000e+00
+6168 6168 1.00000000000000e+00
+6169 6169 1.00000000000000e+00
+6170 6170 1.00000000000000e+00
+6171 6171 1.00000000000000e+00
+6172 6172 1.00000000000000e+00
+6173 6173 1.00000000000000e+00
+6174 6174 1.00000000000000e+00
+6175 6175 1.00000000000000e+00
+6176 6176 1.00000000000000e+00
+6177 6177 1.00000000000000e+00
+6178 6178 1.00000000000000e+00
+6179 6179 1.00000000000000e+00
+6180 6180 1.00000000000000e+00
+6181 6181 1.00000000000000e+00
+6182 6182 1.00000000000000e+00
+6183 6183 1.00000000000000e+00
+6184 6184 1.00000000000000e+00
+6185 6185 1.00000000000000e+00
+6186 6186 1.00000000000000e+00
+6187 6187 1.00000000000000e+00
+6188 6188 1.00000000000000e+00
+6189 4389 2.15051154370615e-04
+6189 4413 2.50863875796689e-04
+6189 4437 8.30405258521000e-09
+6189 4965 9.08688838913267e-03
+6189 4989 3.62451739099545e-01
+6189 5013 1.22248691713117e-01
+6189 5037 4.47462327059541e-03
+6189 5061 1.56403018457281e-05
+6189 6189 2.08251633581958e+01
+6189 5565 2.93990643686117e+00
+6189 5589 9.74156077354714e+00
+6189 5613 2.30610993286473e+00
+6189 5637 1.41675838469122e-01
+6189 5661 1.65828879302890e-04
+6189 6141 4.60996910959747e-02
+6189 6165 1.20747408504982e+01
+6189 6213 5.48682765881335e+00
+6189 6237 3.57259474892096e-01
+6189 6261 3.16858225254110e-04
+6189 6741 1.27588687451474e-01
+6189 6765 4.15240925190611e+00
+6189 6789 5.95013494598463e+00
+6189 6813 2.54478197047024e+00
+6189 6837 1.03318965213877e-01
+6189 6861 1.28308173330615e-04
+6189 7341 8.70653938089619e-03
+6189 7365 1.01036021558391e-01
+6189 7389 3.38445502301248e-01
+6189 7413 1.41882974823338e-01
+6189 7437 4.30756462080162e-03
+6189 7461 7.04711743687000e-09
+6189 7941 1.50853894583000e-09
+6189 7965 1.14998784692892e-04
+6189 7989 3.89714704487470e-04
+6189 8013 1.44147466930781e-04
+6189 8037 1.29078208718035e-05
+6189 17448 -9.58767802584513e-03
+6189 17472 -1.99678375256179e-02
+6189 17496 -1.02084568245076e-02
+6189 17520 -1.58120002869856e-03
+6189 17856 -6.14318709256880e-01
+6189 17880 -9.00428623635597e-01
+6189 17904 -4.38209835369883e-01
+6189 17928 -7.35160147784654e-02
+6189 17952 -3.14289429538524e-04
+6189 18264 -5.21913909453373e+00
+6189 18288 -5.95229647679295e+00
+6189 18312 -2.61950144724895e+00
+6189 18336 -4.68654027442260e-01
+6189 18360 -5.50462311142646e-03
+6189 18672 -1.30472690748127e+01
+6189 18696 -1.24786044584955e+01
+6189 18720 -4.91357092063526e+00
+6189 18744 -9.34677063180274e-01
+6189 18768 -1.87272890764828e-02
+6189 19080 -6.32062101669712e+00
+6189 19104 -6.90326339321341e+00
+6189 19128 -2.77314972883565e+00
+6189 19152 -4.95781694150880e-01
+6189 19176 -9.94001768869147e-03
+6189 19488 -9.31015863958348e-01
+6189 19512 -1.14792032596768e+00
+6189 19536 -4.57856882564994e-01
+6189 19560 -7.60852993516103e-02
+6189 19584 -1.42313807385477e-03
+6189 19896 -2.06081244686777e-02
+6189 19920 -2.25678303861425e-02
+6189 19944 -5.20445063742397e-03
+6189 19968 -4.57831467629250e-04
+6190 6190 1.00000000000000e+00
+6191 6191 1.00000000000000e+00
+6192 6192 1.00000000000000e+00
+6193 6193 1.00000000000000e+00
+6194 6194 1.00000000000000e+00
+6195 6195 1.00000000000000e+00
+6196 6196 1.00000000000000e+00
+6197 6197 1.00000000000000e+00
+6198 6198 1.00000000000000e+00
+6199 6199 1.00000000000000e+00
+6200 6200 1.00000000000000e+00
+6201 6201 1.00000000000000e+00
+6202 6202 1.00000000000000e+00
+6203 6203 1.00000000000000e+00
+6204 6204 1.00000000000000e+00
+6205 6205 1.00000000000000e+00
+6206 6206 1.00000000000000e+00
+6207 6207 1.00000000000000e+00
+6208 6208 1.00000000000000e+00
+6209 6209 1.00000000000000e+00
+6210 6210 1.00000000000000e+00
+6211 6211 1.00000000000000e+00
+6212 6212 1.00000000000000e+00
+6213 3789 3.96000000000000e-17
+6213 3813 2.85680000000000e-16
+6213 4389 1.96678742491974e-04
+6213 4413 3.22067592846329e-04
+6213 4437 8.08979821477044e-05
+6213 4461 2.47633161065664e-06
+6213 4965 6.51068255958192e-04
+6213 4989 1.07149062964958e-01
+6213 5013 3.04211210513150e-01
+6213 5037 1.37978003661636e-01
+6213 5061 2.81609474262592e-03
+6213 5085 7.46695746236242e-06
+6213 6213 1.67148947905028e+01
+6213 5565 7.91253656423208e-02
+6213 5589 2.18313486092391e+00
+6213 5613 6.41976470167598e+00
+6213 5637 2.48928706355115e+00
+6213 5661 1.24288913731445e-01
+6213 5685 7.72839565029886e-05
+6213 6141 6.26332162683871e-05
+6213 6165 2.53180377174192e-01
+6213 6189 5.48682765881335e+00
+6213 6237 6.06166136081306e+00
+6213 6261 2.80845679566270e-01
+6213 6285 3.83618832664595e-04
+6213 6741 2.13322127890803e-04
+6213 6765 1.02243790726411e-01
+6213 6789 2.52076813096791e+00
+6213 6813 6.10174473440780e+00
+6213 6837 2.31147641763547e+00
+6213 6861 8.98139243420842e-02
+6213 6885 1.21338636937127e-04
+6213 7341 6.93965276951370e-07
+6213 7365 5.85510262322284e-03
+6213 7389 1.33750852826007e-01
+6213 7413 2.77770045261548e-01
+6213 7437 1.14020590599326e-01
+6213 7461 5.51968148406407e-03
+6213 7941 2.19544460000000e-13
+6213 7965 1.66357890694850e-07
+6213 7989 3.45354354387659e-05
+6213 8013 6.20724038309009e-04
+6213 8037 1.20323550370870e-04
+6213 8061 1.40034993139733e-06
+6213 17040 -2.82679919691200e-08
+6213 17064 -2.23427793991182e-04
+6213 17088 -1.04604514369131e-03
+6213 17112 -8.34346672447790e-04
+6213 17136 -1.52757987606121e-04
+6213 17448 -1.46458338405462e-02
+6213 17472 -1.30866721526175e-01
+6213 17496 -3.59725190023994e-01
+6213 17520 -1.98962185579801e-01
+6213 17544 -3.06138592859692e-02
+6213 17568 -1.86508968564509e-04
+6213 17856 -1.68324535039269e-01
+6213 17880 -1.35404939750061e+00
+6213 17904 -3.53361738223854e+00
+6213 17928 -1.98400933919514e+00
+6213 17952 -3.28645579300925e-01
+6213 17976 -6.87824803542511e-03
+6213 18264 -5.13545222136775e-01
+6213 18288 -3.99618407387605e+00
+6213 18312 -1.02624281112436e+01
+6213 18336 -5.86868412923071e+00
+6213 18360 -1.02406696179594e+00
+6213 18384 -3.06819938875630e-02
+6213 18672 -3.54401329386655e-01
+6213 18696 -3.00685097530552e+00
+6213 18720 -8.10899043378002e+00
+6213 18744 -4.74306814100725e+00
+6213 18768 -8.56623399539264e-01
+6213 18792 -3.00451118904866e-02
+6213 19080 -7.96440172054076e-02
+6213 19104 -7.34540317333673e-01
+6213 19128 -2.01546910711482e+00
+6213 19152 -1.11422845009594e+00
+6213 19176 -1.90496251634996e-01
+6213 19200 -6.15205480232559e-03
+6213 19488 -4.92885197545329e-03
+6213 19512 -5.10251812906418e-02
+6213 19536 -1.37572068971867e-01
+6213 19560 -6.09726191576294e-02
+6213 19584 -7.58954126479085e-03
+6213 19608 -4.63546319988546e-05
+6213 19896 -2.93151783220580e-07
+6213 19920 -2.38387544049821e-06
+6213 19944 -5.13822501368408e-06
+6213 19968 -1.21126830761588e-06
+6214 6214 1.00000000000000e+00
+6215 6215 1.00000000000000e+00
+6216 6216 1.00000000000000e+00
+6217 6217 1.00000000000000e+00
+6218 6218 1.00000000000000e+00
+6219 6219 1.00000000000000e+00
+6220 6220 1.00000000000000e+00
+6221 6221 1.00000000000000e+00
+6222 6222 1.00000000000000e+00
+6223 6223 1.00000000000000e+00
+6224 6224 1.00000000000000e+00
+6225 6225 1.00000000000000e+00
+6226 6226 1.00000000000000e+00
+6227 6227 1.00000000000000e+00
+6228 6228 1.00000000000000e+00
+6229 6229 1.00000000000000e+00
+6230 6230 1.00000000000000e+00
+6231 6231 1.00000000000000e+00
+6232 6232 1.00000000000000e+00
+6233 6233 1.00000000000000e+00
+6234 6234 1.00000000000000e+00
+6235 6235 1.00000000000000e+00
+6236 6236 1.00000000000000e+00
+6237 3789 2.69600000000000e-17
+6237 3813 1.94460000000000e-16
+6237 4389 4.55670212600412e-06
+6237 4413 2.22694656811325e-04
+6237 4437 6.78079290028163e-04
+6237 4461 4.54682972154229e-05
+6237 4485 2.14304096016500e-08
+6237 4509 1.11133603000000e-12
+6237 4965 1.23556813447242e-06
+6237 4989 2.91387883519289e-03
+6237 5013 1.45180600441257e-01
+6237 5037 2.82925116133218e-01
+6237 5061 1.09787995396197e-01
+6237 5085 5.24590795012682e-03
+6237 5109 4.62919780307250e-07
+6237 6237 1.45485484512117e+01
+6237 5565 9.38864787359718e-05
+6237 5589 1.34764034047411e-01
+6237 5613 2.49741496761035e+00
+6237 5637 5.78776746291141e+00
+6237 5661 2.15188580318620e+00
+6237 5685 1.09974090606847e-01
+6237 5709 7.71464689415067e-05
+6237 6141 1.17839000000000e-15
+6237 6165 2.69575548313870e-04
+6237 6189 3.57259474892096e-01
+6237 6213 6.06166136081306e+00
+6237 6261 5.27654782800350e+00
+6237 6285 2.51306149652815e-01
+6237 6309 5.25146915451604e-04
+6237 6741 4.20640000000000e-16
+6237 6765 2.67866754088798e-04
+6237 6789 1.20361755725483e-01
+6237 6813 2.30005723638074e+00
+6237 6837 5.35035677744415e+00
+6237 6861 2.15151970522629e+00
+6237 6885 9.29174454274847e-02
+6237 6909 6.59455841648084e-05
+6237 7365 8.73668005157809e-06
+6237 7389 2.88298668641225e-03
+6237 7413 1.08523138370516e-01
+6237 7437 2.81305087752587e-01
+6237 7461 9.45590627379141e-02
+6237 7485 5.38660454727592e-03
+6237 7509 3.82862373842000e-09
+6237 7989 2.19066051226402e-06
+6237 8013 6.03166389497405e-05
+6237 8037 1.79724268891034e-04
+6237 8061 2.84168131865531e-04
+6237 8085 1.36098486988969e-06
+6237 8109 3.51291980000000e-13
+6237 16680 -6.02256811617600e-08
+6237 16704 -3.81408583499220e-07
+6237 16728 -6.22249116570460e-07
+6237 16752 -1.40505858852180e-07
+6237 17040 -1.92421531558400e-08
+6237 17064 -1.69124856312049e-03
+6237 17088 -2.47456816655711e-02
+6237 17112 -8.46942034598075e-02
+6237 17136 -6.23693251947759e-02
+6237 17160 -1.13664813412545e-02
+6237 17184 -7.18384143752460e-05
+6237 17448 -4.24068021415266e-04
+6237 17472 -7.03796648728665e-02
+6237 17496 -5.91340677496694e-01
+6237 17520 -1.52417843992884e+00
+6237 17544 -1.08618188199010e+00
+6237 17568 -2.18551967117538e-01
+6237 17592 -6.94726832043429e-03
+6237 17856 -1.97210171975277e-03
+6237 17880 -3.51322853426487e-01
+6237 17904 -2.73881420483961e+00
+6237 17928 -6.61043386329524e+00
+6237 17952 -4.66363090861395e+00
+6237 17976 -9.83374149245025e-01
+6237 18000 -4.21980672869893e-02
+6237 18024 -1.79287271112400e-08
+6237 18264 -1.52847645058489e-03
+6237 18288 -4.56776305238464e-01
+6237 18312 -3.59514649502357e+00
+6237 18336 -8.66875421797871e+00
+6237 18360 -6.07799992998220e+00
+6237 18384 -1.33485408307054e+00
+6237 18408 -7.01592677812315e-02
+6237 18432 -7.48855361421700e-08
+6237 18672 -2.76167595293286e-04
+6237 18696 -1.45112262225358e-01
+6237 18720 -1.24236010428429e+00
+6237 18744 -3.17368962354501e+00
+6237 18768 -2.14962332383442e+00
+6237 18792 -4.52262731923135e-01
+6237 18816 -2.16988591599805e-02
+6237 18840 -3.06112379000400e-08
+6237 19080 -1.23322260600600e-08
+6237 19104 -1.27081830126297e-02
+6237 19128 -1.27093248179565e-01
+6237 19152 -3.54816042167551e-01
+6237 19176 -2.26074176801012e-01
+6237 19200 -4.32773454137620e-02
+6237 19224 -1.55307223477492e-03
+6237 19248 -3.17062769720000e-09
+6237 19512 -5.95594804659713e-05
+6237 19536 -7.09749042147098e-04
+6237 19560 -1.97908944809913e-03
+6237 19584 -6.05453066284443e-04
+6237 19608 -3.34854865003076e-05
+6238 6238 1.00000000000000e+00
+6239 6239 1.00000000000000e+00
+6240 6240 1.00000000000000e+00
+6241 6241 1.00000000000000e+00
+6242 6242 1.00000000000000e+00
+6243 6243 1.00000000000000e+00
+6244 6244 1.00000000000000e+00
+6245 6245 1.00000000000000e+00
+6246 6246 1.00000000000000e+00
+6247 6247 1.00000000000000e+00
+6248 6248 1.00000000000000e+00
+6249 6249 1.00000000000000e+00
+6250 6250 1.00000000000000e+00
+6251 6251 1.00000000000000e+00
+6252 6252 1.00000000000000e+00
+6253 6253 1.00000000000000e+00
+6254 6254 1.00000000000000e+00
+6255 6255 1.00000000000000e+00
+6256 6256 1.00000000000000e+00
+6257 6257 1.00000000000000e+00
+6258 6258 1.00000000000000e+00
+6259 6259 1.00000000000000e+00
+6260 6260 1.00000000000000e+00
+6261 4413 7.65518854573805e-06
+6261 4437 9.36342827745027e-05
+6261 4461 2.76673039955496e-04
+6261 4485 1.76641060064218e-04
+6261 4509 2.29509986312700e-08
+6261 4989 2.76280475736864e-06
+6261 5013 2.98338614606087e-03
+6261 5037 1.18382376377729e-01
+6261 5061 2.90694425790977e-01
+6261 5085 8.59626371374436e-02
+6261 5109 4.42976897962892e-03
+6261 5133 2.33219156354420e-06
+6261 6261 1.36444800739708e+01
+6261 5589 4.63231239090587e-05
+6261 5613 1.20227799418495e-01
+6261 5637 2.14319633633399e+00
+6261 5661 5.19496917949438e+00
+6261 5685 2.09507042579205e+00
+6261 5709 1.07957058569067e-01
+6261 5733 1.62005155421059e-04
+6261 6189 3.16858225254110e-04
+6261 6213 2.80845679566270e-01
+6261 6237 5.27654782800350e+00
+6261 6285 5.17337010637295e+00
+6261 6309 2.37311790284684e-01
+6261 6333 5.56335941560820e-04
+6261 6789 2.41938520180963e-04
+6261 6813 1.03852201314302e-01
+6261 6837 2.15568720645538e+00
+6261 6861 5.03563186199639e+00
+6261 6885 2.02145129931115e+00
+6261 6909 1.05587349081563e-01
+6261 6933 1.66984562117837e-05
+6261 7389 4.70536121254536e-06
+6261 7413 5.11135706757781e-03
+6261 7437 8.13110836323444e-02
+6261 7461 2.70606731348374e-01
+6261 7485 1.04108481663571e-01
+6261 7509 3.85851679879770e-03
+6261 7533 3.53353347430290e-07
+6261 8013 5.23284682600000e-11
+6261 8037 1.52487309262468e-04
+6261 8061 3.78755041462749e-04
+6261 8085 7.05197533765978e-05
+6261 8109 7.26515781837230e-07
+6261 16680 -1.03954862092585e-05
+6261 16704 -1.94381303127229e-03
+6261 16728 -1.02953049434358e-02
+6261 16752 -1.26258116673755e-02
+6261 16776 -2.75454565147807e-03
+6261 16800 -1.96401349981372e-05
+6261 17064 -6.02398997712603e-05
+6261 17088 -1.72064983002767e-02
+6261 17112 -1.90167096788184e-01
+6261 17136 -6.13801984343057e-01
+6261 17160 -5.59277921064767e-01
+6261 17184 -1.30268316315285e-01
+6261 17208 -5.60266975200139e-03
+6261 17472 -3.83203401246169e-04
+6261 17496 -1.26225497284194e-01
+6261 17520 -1.29413504051999e+00
+6261 17544 -3.97166244870866e+00
+6261 17568 -3.51256895453249e+00
+6261 17592 -8.64674467026414e-01
+6261 17616 -4.94199897693984e-02
+6261 17640 -3.38983153372560e-06
+6261 17880 -6.29502914319947e-04
+6261 17904 -2.64974126596216e-01
+6261 17928 -2.64139157095848e+00
+6261 17952 -7.93340222138178e+00
+6261 17976 -6.94373649909142e+00
+6261 18000 -1.80327671377134e+00
+6261 18024 -1.24081197234279e-01
+6261 18048 -1.62498969958989e-05
+6261 18288 -1.43395025777826e-04
+6261 18312 -1.28155566331302e-01
+6261 18336 -1.40261292381427e+00
+6261 18360 -4.40199915461416e+00
+6261 18384 -3.78016253433073e+00
+6261 18408 -9.64335460689663e-01
+6261 18432 -6.46742273828283e-02
+6261 18456 -1.41521149777115e-05
+6261 18696 -2.87805904174350e-07
+6261 18720 -1.85885487822356e-02
+6261 18744 -2.32391335660983e-01
+6261 18768 -7.65783553595152e-01
+6261 18792 -6.27511702787331e-01
+6261 18816 -1.52428787925998e-01
+6261 18840 -9.35970523369881e-03
+6261 18864 -2.69057086099646e-06
+6261 19128 -2.50271011591095e-04
+6261 19152 -5.97175117773273e-03
+6261 19176 -2.21346096836278e-02
+6261 19200 -1.29819148068436e-02
+6261 19224 -2.01993850345177e-03
+6261 19248 -4.56708922212469e-06
+6262 6262 1.00000000000000e+00
+6263 6263 1.00000000000000e+00
+6264 6264 1.00000000000000e+00
+6265 6265 1.00000000000000e+00
+6266 6266 1.00000000000000e+00
+6267 6267 1.00000000000000e+00
+6268 6268 1.00000000000000e+00
+6269 6269 1.00000000000000e+00
+6270 6270 1.00000000000000e+00
+6271 6271 1.00000000000000e+00
+6272 6272 1.00000000000000e+00
+6273 6273 1.00000000000000e+00
+6274 6274 1.00000000000000e+00
+6275 6275 1.00000000000000e+00
+6276 6276 1.00000000000000e+00
+6277 6277 1.00000000000000e+00
+6278 6278 1.00000000000000e+00
+6279 6279 1.00000000000000e+00
+6280 6280 1.00000000000000e+00
+6281 6281 1.00000000000000e+00
+6282 6282 1.00000000000000e+00
+6283 6283 1.00000000000000e+00
+6284 6284 1.00000000000000e+00
+6285 4437 5.17030619608310e-07
+6285 4461 3.16588033027809e-04
+6285 4485 2.80445054406418e-04
+6285 4509 3.99813715338224e-05
+6285 4533 1.93816942058847e-06
+6285 5013 9.53315919924650e-07
+6285 5037 4.38303943466953e-03
+6285 5061 9.94207410797819e-02
+6285 5085 2.70682180385703e-01
+6285 5109 1.06063705484242e-01
+6285 5133 2.99554152661755e-03
+6285 5157 1.40034993139732e-06
+6285 6285 1.32034534890934e+01
+6285 5613 1.59114016612103e-05
+6285 5637 1.07044420043834e-01
+6285 5661 2.08683207293720e+00
+6285 5685 5.17540769465826e+00
+6285 5709 2.02653932949449e+00
+6285 5733 1.02519668862684e-01
+6285 5757 2.84168131865536e-04
+6285 6213 3.83618832664595e-04
+6285 6237 2.51306149652815e-01
+6285 6261 5.17337010637295e+00
+6285 6309 5.12142788929223e+00
+6285 6333 2.47676792294821e-01
+6285 6357 3.78755041462756e-04
+6285 6789 1.27120000000000e-16
+6285 6813 2.24058402351051e-04
+6285 6837 1.01104182244151e-01
+6285 6861 2.02226749522321e+00
+6285 6885 5.09616803122629e+00
+6285 6909 1.94392165227318e+00
+6285 6933 1.05200073412956e-01
+6285 6957 2.44191106880425e-05
+6285 7389 8.29700000000000e-17
+6285 7413 1.45607376990150e-07
+6285 7437 4.89545672319201e-03
+6285 7461 9.95804102733944e-02
+6285 7485 2.35758953438194e-01
+6285 7509 1.04203715562111e-01
+6285 7533 3.20501286228353e-03
+6285 7557 1.29402964269486e-06
+6285 8013 2.42173700000000e-14
+6285 8037 2.21431704970470e-07
+6285 8061 2.44191106880425e-05
+6285 8085 4.29967431666138e-04
+6285 8109 1.99496121906747e-04
+6285 8133 1.15867545269000e-06
+6285 8709 6.70440000000000e-16
+6285 8733 2.39720000000000e-16
+6285 16320 -3.38155601221632e-05
+6285 16344 -3.25705673696310e-04
+6285 16368 -7.98683687606907e-04
+6285 16392 -2.02821011824109e-04
+6285 16416 -3.09439465411296e-06
+6285 16680 -7.74689897242050e-07
+6285 16704 -2.61242579381695e-03
+6285 16728 -4.94140797644577e-02
+6285 16752 -2.06892058201994e-01
+6285 16776 -2.35972834052834e-01
+6285 16800 -6.23061972031638e-02
+6285 16824 -3.48186344649801e-03
+6285 17088 -2.09075466857393e-05
+6285 17112 -4.08970490628928e-02
+6285 17136 -5.74376861200483e-01
+6285 17160 -2.14744083978137e+00
+6285 17184 -2.30931516770856e+00
+6285 17208 -6.59599075902195e-01
+6285 17232 -4.94282254897333e-02
+6285 17256 -2.21422910102272e-05
+6285 17496 -7.26598831971732e-05
+6285 17520 -1.43215743617080e-01
+6285 17544 -1.83374722468627e+00
+6285 17568 -6.53788922342882e+00
+6285 17592 -6.82542888510073e+00
+6285 17616 -2.04795403555764e+00
+6285 17640 -1.75776519637665e-01
+6285 17664 -1.47971231592431e-04
+6285 17904 -2.04089667481575e-05
+6285 17928 -1.06356067585759e-01
+6285 17952 -1.50118703445927e+00
+6285 17976 -5.55216590365651e+00
+6285 18000 -5.79840393114080e+00
+6285 18024 -1.76536172072492e+00
+6285 18048 -1.56910533252355e-01
+6285 18072 -2.59752650159813e-04
+6285 18312 -6.50044912846590e-07
+6285 18336 -2.14258727932296e-02
+6285 18360 -3.62480097222252e-01
+6285 18384 -1.41063348630125e+00
+6285 18408 -1.43848699559362e+00
+6285 18432 -4.15890163972256e-01
+6285 18456 -3.36791333816439e-02
+6285 18480 -5.94104233255154e-05
+6285 18744 -6.52984975638917e-04
+6285 18768 -2.17405842911069e-02
+6285 18792 -9.43825694898244e-02
+6285 18816 -8.88788763992183e-02
+6285 18840 -2.07758257319012e-02
+6285 18864 -8.90212526518233e-04
+6285 18888 -2.08894349837000e-09
+6285 19152 -9.21392776400000e-11
+6285 19176 -2.63632843519911e-06
+6285 19200 -1.09340842857504e-05
+6285 19224 -4.19657041456247e-06
+6285 19248 -3.90152634118480e-07
+6286 6286 1.00000000000000e+00
+6287 6287 1.00000000000000e+00
+6288 6288 1.00000000000000e+00
+6289 6289 1.00000000000000e+00
+6290 6290 1.00000000000000e+00
+6291 6291 1.00000000000000e+00
+6292 6292 1.00000000000000e+00
+6293 6293 1.00000000000000e+00
+6294 6294 1.00000000000000e+00
+6295 6295 1.00000000000000e+00
+6296 6296 1.00000000000000e+00
+6297 6297 1.00000000000000e+00
+6298 6298 1.00000000000000e+00
+6299 6299 1.00000000000000e+00
+6300 6300 1.00000000000000e+00
+6301 6301 1.00000000000000e+00
+6302 6302 1.00000000000000e+00
+6303 6303 1.00000000000000e+00
+6304 6304 1.00000000000000e+00
+6305 6305 1.00000000000000e+00
+6306 6306 1.00000000000000e+00
+6307 6307 1.00000000000000e+00
+6308 6308 1.00000000000000e+00
+6309 4437 1.07492419000000e-12
+6309 4461 3.90695406012370e-07
+6309 4485 8.43467389934002e-05
+6309 4509 5.34088471120003e-04
+6309 4533 6.51738304218107e-05
+6309 4557 7.04711743687000e-09
+6309 4581 5.21894530000000e-13
+6309 5037 3.05027687506100e-08
+6309 5061 5.12001329153911e-03
+6309 5085 1.09060475920185e-01
+6309 5109 2.50889615789968e-01
+6309 5133 9.54297444868264e-02
+6309 5157 5.51968148406408e-03
+6309 5181 1.22408211906465e-06
+6309 6309 1.32156586210116e+01
+6309 5637 3.57994833680473e-05
+6309 5661 1.00625901988247e-01
+6309 5685 2.03413071720506e+00
+6309 5709 5.11958293841722e+00
+6309 5733 2.12226312376195e+00
+6309 5757 9.45590627379138e-02
+6309 5781 2.90316706081250e-04
+6309 6237 5.25146915451604e-04
+6309 6261 2.37311790284684e-01
+6309 6285 5.12142788929223e+00
+6309 6333 5.01207283480078e+00
+6309 6357 2.70606731348373e-01
+6309 6381 1.84292133188973e-04
+6309 6813 1.22830000000000e-16
+6309 6837 1.76905947185153e-04
+6309 6861 1.10241595057533e-01
+6309 6885 1.94522732471998e+00
+6309 6909 4.98296884704721e+00
+6309 6933 2.00834264652637e+00
+6309 6957 9.95804102733940e-02
+6309 6981 5.24284476533345e-05
+6309 7413 1.86000000000000e-17
+6309 7437 4.07861261643046e-06
+6309 7461 2.51568580534586e-03
+6309 7485 9.82611695325461e-02
+6309 7509 2.62012914802079e-01
+6309 7533 9.76298792981403e-02
+6309 7557 2.51568580534585e-03
+6309 7581 2.00372158358373e-06
+6309 8061 1.29402964269485e-06
+6309 8085 9.44854427778995e-05
+6309 8109 2.30005939103817e-04
+6309 8133 2.09858096953743e-04
+6309 8157 5.76185385784561e-06
+6309 8709 1.87511000000000e-15
+6309 8733 6.70440000000000e-16
+6309 15960 -3.47987915137000e-08
+6309 15984 -1.44862846263400e-07
+6309 16008 -5.74695123481400e-08
+6309 16032 -5.66768020861000e-09
+6309 16320 -8.79221394985299e-05
+6309 16344 -7.63644529673730e-03
+6309 16368 -4.55087334551126e-02
+6309 16392 -7.39694930109535e-02
+6309 16416 -2.25121796792208e-02
+6309 16440 -1.55759882964487e-03
+6309 16704 -2.22255490871320e-07
+6309 16728 -1.20177584135244e-02
+6309 16752 -2.24619371477821e-01
+6309 16776 -9.98666130461227e-01
+6309 16800 -1.33991019064061e+00
+6309 16824 -4.46824974409305e-01
+6309 16848 -4.17062818071602e-02
+6309 16872 -2.95151509768484e-05
+6309 17112 -9.73631128109040e-07
+6309 17136 -6.33960961775750e-02
+6309 17160 -1.07520244867281e+00
+6309 17184 -4.54342432343412e+00
+6309 17208 -5.80227885164795e+00
+6309 17232 -2.02056147413533e+00
+6309 17256 -2.08634239809660e-01
+6309 17280 -4.98462211108425e-04
+6309 17520 -5.60692149366310e-07
+6309 17544 -7.95778024835329e-02
+6309 17568 -1.41055889312211e+00
+6309 17592 -5.99220336649914e+00
+6309 17616 -7.56571605479389e+00
+6309 17640 -2.74137618073188e+00
+6309 17664 -3.05397524757639e-01
+6309 17688 -1.58782338679894e-03
+6309 17928 -8.46091646237500e-08
+6309 17952 -2.19885461768134e-02
+6309 17976 -4.97254905233337e-01
+6309 18000 -2.23326814143203e+00
+6309 18024 -2.80557560879687e+00
+6309 18048 -9.74542059803761e-01
+6309 18072 -1.02094554323801e-01
+6309 18096 -5.27208835272877e-04
+6309 18360 -1.33629378071348e-03
+6309 18384 -5.29520423692181e-02
+6309 18408 -2.57273709859606e-01
+6309 18432 -3.18730314473021e-01
+6309 18456 -1.01881284312103e-01
+6309 18480 -9.23046608098402e-03
+6309 18504 -3.67018070179616e-05
+6309 18768 -3.49041330603600e-08
+6309 18792 -3.88327097074184e-04
+6309 18816 -1.81437017932960e-03
+6309 18840 -1.43453473503937e-03
+6309 18864 -2.61608722558179e-04
+6309 18888 -5.84238235270000e-09
+6310 6310 1.00000000000000e+00
+6311 6311 1.00000000000000e+00
+6312 6312 1.00000000000000e+00
+6313 6313 1.00000000000000e+00
+6314 6314 1.00000000000000e+00
+6315 6315 1.00000000000000e+00
+6316 6316 1.00000000000000e+00
+6317 6317 1.00000000000000e+00
+6318 6318 1.00000000000000e+00
+6319 6319 1.00000000000000e+00
+6320 6320 1.00000000000000e+00
+6321 6321 1.00000000000000e+00
+6322 6322 1.00000000000000e+00
+6323 6323 1.00000000000000e+00
+6324 6324 1.00000000000000e+00
+6325 6325 1.00000000000000e+00
+6326 6326 1.00000000000000e+00
+6327 6327 1.00000000000000e+00
+6328 6328 1.00000000000000e+00
+6329 6329 1.00000000000000e+00
+6330 6330 1.00000000000000e+00
+6331 6331 1.00000000000000e+00
+6332 6332 1.00000000000000e+00
+6333 4485 5.31858846635916e-06
+6333 4509 1.78814708764559e-04
+6333 4533 2.93336389137457e-04
+6333 4557 1.28308173330619e-04
+6333 4581 8.53127317558100e-08
+6333 5085 4.96671538245728e-03
+6333 5109 1.03347535291058e-01
+6333 5133 2.86213876935506e-01
+6333 5157 8.98139243420832e-02
+6333 5181 4.01865511835701e-03
+6333 5205 1.30211113888131e-05
+6333 6333 1.35061797798593e+01
+6333 5661 7.84494215473652e-05
+6333 5685 9.01462639339680e-02
+6333 5709 2.12534457488612e+00
+6333 5733 5.01444778180917e+00
+6333 5757 2.15151970522623e+00
+6333 5781 1.04998272549906e-01
+6333 5805 1.80679317919317e-04
+6333 6261 5.56335941560820e-04
+6333 6285 2.47676792294821e-01
+6333 6309 5.01207283480078e+00
+6333 6357 5.03563186199633e+00
+6333 6381 2.80488210935187e-01
+6333 6405 1.38422994045985e-04
+6333 6861 8.99998833830974e-05
+6333 6885 1.07567458814670e-01
+6333 6909 2.01957827044320e+00
+6333 6933 4.97708104918746e+00
+6333 6957 2.02226749522320e+00
+6333 6981 9.57663978761783e-02
+6333 7005 1.17724328222052e-04
+6333 7461 5.76185385784568e-06
+6333 7485 4.46279463381609e-03
+6333 7509 8.32621938773886e-02
+6333 7533 2.55684893376081e-01
+6333 7557 1.10241595057533e-01
+6333 7581 2.64740635360721e-03
+6333 7605 7.87821774847080e-07
+6333 8109 1.14629817987542e-04
+6333 8133 3.17936008973020e-04
+6333 8157 8.99998833830992e-05
+6333 8181 1.21535498385414e-05
+6333 15960 -4.06769525242702e-04
+6333 15984 -4.83582745070669e-03
+6333 16008 -1.37345708174827e-02
+6333 16032 -5.17996492292173e-03
+6333 16056 -4.92803893296462e-04
+6333 16344 -2.69918411505039e-03
+6333 16368 -7.37384779871932e-02
+6333 16392 -3.95378165876486e-01
+6333 16416 -6.56082329760192e-01
+6333 16440 -2.58902342369887e-01
+6333 16464 -2.95734225758221e-02
+6333 16488 -2.02242391247015e-05
+6333 16752 -2.16163911218316e-02
+6333 16776 -5.34791752860120e-01
+6333 16800 -2.69588979393633e+00
+6333 16824 -4.18131636633917e+00
+6333 16848 -1.71860913009058e+00
+6333 16872 -2.13828212972154e-01
+6333 16896 -1.17815807475608e-03
+6333 17160 -4.78374423681398e-02
+6333 17184 -1.14368139928722e+00
+6333 17208 -5.60361692656965e+00
+6333 17232 -8.39721704319991e+00
+6333 17256 -3.58766882084470e+00
+6333 17280 -4.78760119398730e-01
+6333 17304 -4.92164144620346e-03
+6333 17568 -1.82588596240220e-02
+6333 17592 -6.00080589743590e-01
+6333 17616 -3.12316738344967e+00
+6333 17640 -4.76234705419661e+00
+6333 17664 -1.99343558131643e+00
+6333 17688 -2.60977235824409e-01
+6333 17712 -3.14675205445592e-03
+6333 17976 -1.86222575103135e-03
+6333 18000 -9.93778601987013e-02
+6333 18024 -5.46152839053621e-01
+6333 18048 -8.36607401537234e-01
+6333 18072 -3.30604382240391e-01
+6333 18096 -4.04287971817126e-02
+6333 18120 -5.12372734049663e-04
+6333 18384 -6.46536115564740e-07
+6333 18408 -2.89134898941355e-03
+6333 18432 -1.65572343303867e-02
+6333 18456 -2.31392107675321e-02
+6333 18480 -5.97874547333357e-03
+6333 18504 -2.44302264716894e-04
+6334 6334 1.00000000000000e+00
+6335 6335 1.00000000000000e+00
+6336 6336 1.00000000000000e+00
+6337 6337 1.00000000000000e+00
+6338 6338 1.00000000000000e+00
+6339 6339 1.00000000000000e+00
+6340 6340 1.00000000000000e+00
+6341 6341 1.00000000000000e+00
+6342 6342 1.00000000000000e+00
+6343 6343 1.00000000000000e+00
+6344 6344 1.00000000000000e+00
+6345 6345 1.00000000000000e+00
+6346 6346 1.00000000000000e+00
+6347 6347 1.00000000000000e+00
+6348 6348 1.00000000000000e+00
+6349 6349 1.00000000000000e+00
+6350 6350 1.00000000000000e+00
+6351 6351 1.00000000000000e+00
+6352 6352 1.00000000000000e+00
+6353 6353 1.00000000000000e+00
+6354 6354 1.00000000000000e+00
+6355 6355 1.00000000000000e+00
+6356 6356 1.00000000000000e+00
+6357 4509 4.70536121254552e-06
+6357 4533 2.41938520180969e-04
+6357 4557 3.16858225254116e-04
+6357 4581 4.63231239090605e-05
+6357 4605 2.76280475736875e-06
+6357 5085 5.23284682600000e-11
+6357 5109 5.11135706757784e-03
+6357 5133 1.03852201314301e-01
+6357 5157 2.80845679566269e-01
+6357 5181 1.20227799418492e-01
+6357 5205 2.98338614606087e-03
+6357 5229 7.65518854573800e-06
+6357 6357 1.36444800739708e+01
+6357 5685 1.52487309262471e-04
+6357 5709 8.13110836323441e-02
+6357 5733 2.15568720645532e+00
+6357 5757 5.27654782800344e+00
+6357 5781 2.14319633633396e+00
+6357 5805 1.18382376377733e-01
+6357 5829 9.36342827745058e-05
+6357 6285 3.78755041462756e-04
+6357 6309 2.70606731348373e-01
+6357 6333 5.03563186199633e+00
+6357 6381 5.19496917949433e+00
+6357 6405 2.90694425790976e-01
+6357 6429 2.76673039955508e-04
+6357 6885 7.05197533765977e-05
+6357 6909 1.04108481663570e-01
+6357 6933 2.02145129931113e+00
+6357 6957 5.17337010637290e+00
+6357 6981 2.09507042579201e+00
+6357 7005 8.59626371374431e-02
+6357 7029 1.76641060064226e-04
+6357 7485 7.26515781837240e-07
+6357 7509 3.85851679879768e-03
+6357 7533 1.05587349081563e-01
+6357 7557 2.37311790284684e-01
+6357 7581 1.07957058569066e-01
+6357 7605 4.42976897962895e-03
+6357 7629 2.29509986312700e-08
+6357 8109 3.53353347430290e-07
+6357 8133 1.66984562117843e-05
+6357 8157 5.56335941560844e-04
+6357 8181 1.62005155421065e-04
+6357 8205 2.33219156354422e-06
+6357 15576 -2.87805904174350e-07
+6357 15600 -1.43395025777831e-04
+6357 15624 -6.29502914319969e-04
+6357 15648 -3.83203401246173e-04
+6357 15672 -6.02398997712599e-05
+6357 15960 -2.50271011591103e-04
+6357 15984 -1.85885487822359e-02
+6357 16008 -1.28155566331301e-01
+6357 16032 -2.64974126596210e-01
+6357 16056 -1.26225497284196e-01
+6357 16080 -1.72064983002776e-02
+6357 16104 -1.03954862092585e-05
+6357 16368 -5.97175117773279e-03
+6357 16392 -2.32391335660979e-01
+6357 16416 -1.40261292381425e+00
+6357 16440 -2.64139157095846e+00
+6357 16464 -1.29413504051998e+00
+6357 16488 -1.90167096788185e-01
+6357 16512 -1.94381303127237e-03
+6357 16776 -2.21346096836279e-02
+6357 16800 -7.65783553595130e-01
+6357 16824 -4.40199915461408e+00
+6357 16848 -7.93340222138178e+00
+6357 16872 -3.97166244870862e+00
+6357 16896 -6.13801984343046e-01
+6357 16920 -1.02953049434362e-02
+6357 17184 -1.29819148068438e-02
+6357 17208 -6.27511702787324e-01
+6357 17232 -3.78016253433069e+00
+6357 17256 -6.94373649909137e+00
+6357 17280 -3.51256895453244e+00
+6357 17304 -5.59277921064756e-01
+6357 17328 -1.26258116673756e-02
+6357 17592 -2.01993850345182e-03
+6357 17616 -1.52428787925998e-01
+6357 17640 -9.64335460689657e-01
+6357 17664 -1.80327671377133e+00
+6357 17688 -8.64674467026406e-01
+6357 17712 -1.30268316315284e-01
+6357 17736 -2.75454565147808e-03
+6357 18000 -4.56708922212480e-06
+6357 18024 -9.35970523369878e-03
+6357 18048 -6.46742273828280e-02
+6357 18072 -1.24081197234279e-01
+6357 18096 -4.94199897693993e-02
+6357 18120 -5.60266975200163e-03
+6357 18144 -1.96401349981375e-05
+6357 18432 -2.69057086099650e-06
+6357 18456 -1.41521149777116e-05
+6357 18480 -1.62498969958988e-05
+6357 18504 -3.38983153372556e-06
+6358 6358 1.00000000000000e+00
+6359 6359 1.00000000000000e+00
+6360 6360 1.00000000000000e+00
+6361 6361 1.00000000000000e+00
+6362 6362 1.00000000000000e+00
+6363 6363 1.00000000000000e+00
+6364 6364 1.00000000000000e+00
+6365 6365 1.00000000000000e+00
+6366 6366 1.00000000000000e+00
+6367 6367 1.00000000000000e+00
+6368 6368 1.00000000000000e+00
+6369 6369 1.00000000000000e+00
+6370 6370 1.00000000000000e+00
+6371 6371 1.00000000000000e+00
+6372 6372 1.00000000000000e+00
+6373 6373 1.00000000000000e+00
+6374 6374 1.00000000000000e+00
+6375 6375 1.00000000000000e+00
+6376 6376 1.00000000000000e+00
+6377 6377 1.00000000000000e+00
+6378 6378 1.00000000000000e+00
+6379 6379 1.00000000000000e+00
+6380 6380 1.00000000000000e+00
+6381 4533 7.38583222521854e-06
+6381 4557 1.65828879302896e-04
+6381 4581 7.57288505340502e-04
+6381 4605 6.65602558937131e-05
+6381 4629 4.13226415410000e-10
+6381 4653 1.65361740000000e-13
+6381 5109 1.84048516669520e-07
+6381 5133 3.81948091007362e-03
+6381 5157 1.24288913731442e-01
+6381 5181 2.81822420274195e-01
+6381 5205 1.24157463156090e-01
+6381 5229 6.61404141397703e-03
+6381 5253 3.01784208052608e-06
+6381 6381 1.42155940525201e+01
+6381 5709 1.56645013647053e-04
+6381 5733 9.20977706503652e-02
+6381 5757 2.15188580318619e+00
+6381 5781 5.68740314343221e+00
+6381 5805 2.39295414762304e+00
+6381 5829 1.33641182211230e-01
+6381 5853 1.01435749871593e-04
+6381 6309 1.84292133188973e-04
+6381 6333 2.80488210935187e-01
+6381 6357 5.19496917949433e+00
+6381 6405 5.50681995523443e+00
+6381 6429 3.01419830152280e-01
+6381 6453 5.42606048985635e-04
+6381 6909 1.06435412031522e-04
+6381 6933 1.06392574754093e-01
+6381 6957 2.08683207293716e+00
+6381 6981 5.17797855006936e+00
+6381 7005 2.25961989461759e+00
+6381 7029 8.99707006266858e-02
+6381 7053 1.33659463189934e-04
+6381 7509 1.13484136129364e-05
+6381 7533 2.37454150425829e-03
+6381 7557 1.00625901988246e-01
+6381 7581 2.82210798877977e-01
+6381 7605 1.00146710530683e-01
+6381 7629 5.39569286250711e-03
+6381 8133 1.59094207830707e-06
+6381 8157 7.84494215473683e-05
+6381 8181 1.40080260134692e-04
+6381 8205 2.46473168732274e-04
+6381 8229 6.72456755290754e-06
+6381 15216 -9.93685121070000e-10
+6381 15240 -5.96334235505000e-09
+6381 15264 -8.94809260414000e-09
+6381 15288 -1.98860187077000e-09
+6381 15576 -3.20764573755020e-07
+6381 15600 -2.26300359808564e-03
+6381 15624 -2.75991069040432e-02
+6381 15648 -8.46843250636784e-02
+6381 15672 -5.14144086384395e-02
+6381 15696 -8.22518959263112e-03
+6381 15720 -2.55024749279378e-06
+6381 15984 -1.50947173666037e-03
+6381 16008 -8.64757018219475e-02
+6381 16032 -6.49578675580661e-01
+6381 16056 -1.52988192885990e+00
+6381 16080 -9.05256029699004e-01
+6381 16104 -1.53167292222669e-01
+6381 16128 -2.24873890229680e-03
+6381 16392 -7.59144487802220e-03
+6381 16416 -4.30138184579631e-01
+6381 16440 -2.99873944324043e+00
+6381 16464 -6.59932721052856e+00
+6381 16488 -3.93415720552657e+00
+6381 16512 -6.98575913356135e-01
+6381 16536 -1.68136550660147e-02
+6381 16800 -7.75557904544779e-03
+6381 16824 -5.70727423507643e-01
+6381 16848 -3.96244886125038e+00
+6381 16872 -8.57804786423755e+00
+6381 16896 -5.24984454072558e+00
+6381 16920 -9.93116571711702e-01
+6381 16944 -3.45663066015178e-02
+6381 17208 -1.61402046852431e-03
+6381 17232 -2.00674644131226e-01
+6381 17256 -1.47822609499831e+00
+6381 17280 -3.29949882568253e+00
+6381 17304 -1.93651044840105e+00
+6381 17328 -3.52156070294240e-01
+6381 17352 -1.14567772184785e-02
+6381 17616 -1.39127671343208e-05
+6381 17640 -2.12466860893378e-02
+6381 17664 -1.70937578879019e-01
+6381 17688 -3.98034187425587e-01
+6381 17712 -2.15879675201222e-01
+6381 17736 -3.58048723393153e-02
+6381 17760 -8.99956012314778e-04
+6381 18048 -1.66168765949972e-04
+6381 18072 -1.32903395665440e-03
+6381 18096 -2.84679740778408e-03
+6381 18120 -7.57131174518698e-04
+6381 18144 -2.31930704160455e-05
+6382 6382 1.00000000000000e+00
+6383 6383 1.00000000000000e+00
+6384 6384 1.00000000000000e+00
+6385 6385 1.00000000000000e+00
+6386 6386 1.00000000000000e+00
+6387 6387 1.00000000000000e+00
+6388 6388 1.00000000000000e+00
+6389 6389 1.00000000000000e+00
+6390 6390 1.00000000000000e+00
+6391 6391 1.00000000000000e+00
+6392 6392 1.00000000000000e+00
+6393 6393 1.00000000000000e+00
+6394 6394 1.00000000000000e+00
+6395 6395 1.00000000000000e+00
+6396 6396 1.00000000000000e+00
+6397 6397 1.00000000000000e+00
+6398 6398 1.00000000000000e+00
+6399 6399 1.00000000000000e+00
+6400 6400 1.00000000000000e+00
+6401 6401 1.00000000000000e+00
+6402 6402 1.00000000000000e+00
+6403 6403 1.00000000000000e+00
+6404 6404 1.00000000000000e+00
+6405 4557 1.56403018457287e-05
+6405 4581 1.35092304002422e-04
+6405 4605 1.93413419972703e-04
+6405 4629 1.64562920078725e-04
+6405 4653 1.62635643746720e-07
+6405 5133 1.62962235055491e-06
+6405 5157 2.81609474262595e-03
+6405 5181 1.36104287771051e-01
+6405 5205 3.70222890871767e-01
+6405 5229 1.14640260342687e-01
+6405 5253 3.27777054418457e-03
+6405 5277 6.07076150326429e-06
+6405 6405 1.52368589982420e+01
+6405 5733 8.84933336397282e-05
+6405 5757 1.09787995396201e-01
+6405 5781 2.38740455251700e+00
+6405 5805 6.29112857326273e+00
+6405 5829 2.63300019074904e+00
+6405 5853 1.41458480609625e-01
+6405 5877 1.72881141110551e-04
+6405 6333 1.38422994045985e-04
+6405 6357 2.90694425790976e-01
+6405 6381 5.50681995523443e+00
+6405 6429 6.01317879021491e+00
+6405 6453 3.05741013405657e-01
+6405 6477 8.42968691652785e-04
+6405 6933 2.33697018029735e-04
+6405 6957 9.94207410797815e-02
+6405 6981 2.25780169589539e+00
+6405 7005 5.42353049705159e+00
+6405 7029 2.32069493927856e+00
+6405 7053 1.17467751532462e-01
+6405 7077 7.51344158719148e-05
+6405 7533 6.86885643072775e-06
+6405 7557 5.12001329153911e-03
+6405 7581 8.63918164591287e-02
+6405 7605 2.82601434453935e-01
+6405 7629 1.17330424634126e-01
+6405 7653 5.70101788762027e-03
+6405 7677 2.19087640160000e-10
+6405 8181 1.25135402336312e-04
+6405 8205 5.00161568839055e-04
+6405 8229 8.91005421407028e-05
+6405 8253 2.74962501930975e-06
+6405 8277 7.79578600000000e-14
+6405 15216 -1.25824412478921e-05
+6405 15240 -1.83203537140749e-03
+6405 15264 -8.36244219545068e-03
+6405 15288 -6.67400920711649e-03
+6405 15312 -1.22365447471564e-03
+6405 15336 -1.54286544133720e-07
+6405 15600 -2.47411633771688e-04
+6405 15624 -2.92956316988240e-02
+6405 15648 -2.75908869197922e-01
+6405 15672 -7.67651190101414e-01
+6405 15696 -5.23272904718816e-01
+6405 15720 -9.94144917254071e-02
+6405 15744 -2.45483860613432e-03
+6405 16008 -1.78015374464237e-03
+6405 16032 -2.16006340598431e-01
+6405 16056 -1.86663739218363e+00
+6405 16080 -4.91376916156046e+00
+6405 16104 -3.40661737920491e+00
+6405 16128 -6.94820792058696e-01
+6405 16152 -2.67986772911741e-02
+6405 16176 -6.13896168510000e-10
+6405 16416 -3.43551708160314e-03
+6405 16440 -4.57991835894893e-01
+6405 16464 -3.73729413925666e+00
+6405 16488 -9.44829471250618e+00
+6405 16512 -6.73991693558087e+00
+6405 16536 -1.48312847787425e+00
+6405 16560 -7.66304469585031e-02
+6405 16584 -3.15286122116000e-09
+6405 16824 -8.94813647991456e-04
+6405 16848 -2.30669445532564e-01
+6405 16872 -2.02840327989391e+00
+6405 16896 -5.35935612814163e+00
+6405 16920 -3.78383013424043e+00
+6405 16944 -8.23602821426855e-01
+6405 16968 -4.19819363012443e-02
+6405 16992 -3.40300235706000e-09
+6405 17232 -2.60766096089583e-05
+6405 17256 -3.61825963381644e-02
+6405 17280 -3.49928920340785e-01
+6405 17304 -9.67683053614513e-01
+6405 17328 -6.48829834041641e-01
+6405 17352 -1.34270192548721e-01
+6405 17376 -6.25604395553282e-03
+6405 17400 -6.97276547140000e-10
+6405 17664 -8.71566016129867e-04
+6405 17688 -1.07863231621519e-02
+6405 17712 -3.19984746935321e-02
+6405 17736 -1.50083400241687e-02
+6405 17760 -1.93303940305554e-03
+6405 17784 -1.59177904572115e-06
+6406 6406 1.00000000000000e+00
+6407 6407 1.00000000000000e+00
+6408 6408 1.00000000000000e+00
+6409 6409 1.00000000000000e+00
+6410 6410 1.00000000000000e+00
+6411 6411 1.00000000000000e+00
+6412 6412 1.00000000000000e+00
+6413 6413 1.00000000000000e+00
+6414 6414 1.00000000000000e+00
+6415 6415 1.00000000000000e+00
+6416 6416 1.00000000000000e+00
+6417 6417 1.00000000000000e+00
+6418 6418 1.00000000000000e+00
+6419 6419 1.00000000000000e+00
+6420 6420 1.00000000000000e+00
+6421 6421 1.00000000000000e+00
+6422 6422 1.00000000000000e+00
+6423 6423 1.00000000000000e+00
+6424 6424 1.00000000000000e+00
+6425 6425 1.00000000000000e+00
+6426 6426 1.00000000000000e+00
+6427 6427 1.00000000000000e+00
+6428 6428 1.00000000000000e+00
+6429 4581 1.31669194616130e-06
+6429 4605 3.05165715246779e-04
+6429 4629 3.80183219577239e-04
+6429 4653 8.78103357304650e-07
+6429 5157 2.47633161065664e-06
+6429 5181 4.00256385214289e-03
+6429 5205 1.30468906119894e-01
+6429 5229 2.56110343441907e-01
+6429 5253 9.56967206476602e-02
+6429 5277 2.48600030779952e-03
+6429 6429 1.66152374232953e+01
+6429 5757 4.54682972154241e-05
+6429 5781 1.29959229577415e-01
+6429 5805 2.61139860278928e+00
+6429 5829 6.43803972467936e+00
+6429 5853 2.28682142390913e+00
+6429 5877 1.02944973256482e-01
+6429 5901 2.54420757694272e-04
+6429 6357 2.76673039955508e-04
+6429 6381 3.01419830152280e-01
+6429 6405 6.01317879021491e+00
+6429 6453 7.22470846299943e+00
+6429 6477 3.44526895845705e-01
+6429 6501 5.98389187080616e-04
+6429 6957 3.16588033027823e-04
+6429 6981 1.03986644421700e-01
+6429 7005 2.31426725984316e+00
+6429 7029 6.32140157665042e+00
+6429 7053 2.77588105773608e+00
+6429 7077 1.58330381854054e-01
+6429 7101 3.87416569810706e-05
+6429 7557 3.90695406012380e-07
+6429 7581 4.70380571098784e-03
+6429 7605 1.13542902326334e-01
+6429 7629 2.91682199132938e-01
+6429 7653 1.38803384818389e-01
+6429 7677 7.20183881084092e-03
+6429 7701 2.08930460891830e-07
+6429 8181 7.22147823010730e-07
+6429 8205 1.87607910286075e-05
+6429 8229 4.67153324025474e-04
+6429 8253 2.62041531254356e-04
+6429 8277 1.65821052232080e-07
+6429 8301 3.55340800000000e-14
+6429 8853 1.01200000000000e-17
+6429 8877 6.35000000000000e-18
+6429 15216 -2.87059089138055e-06
+6429 15240 -4.12660314887467e-03
+6429 15264 -5.14093378669885e-02
+6429 15288 -1.70767136446982e-01
+6429 15312 -1.43634132019868e-01
+6429 15336 -3.17314047065672e-02
+6429 15360 -1.21583139608410e-03
+6429 15624 -2.63403151354002e-04
+6429 15648 -8.48036522135795e-02
+6429 15672 -8.31720144615564e-01
+6429 15696 -2.49991636289086e+00
+6429 15720 -2.25180646794107e+00
+6429 15744 -5.66300017826288e-01
+6429 15768 -3.39913024247168e-02
+6429 15792 -3.45535269833850e-07
+6429 16032 -1.04490660266624e-03
+6429 16056 -3.19772793067175e-01
+6429 16080 -3.01355636355895e+00
+6429 16104 -8.89099175463575e+00
+6429 16128 -8.19445174042308e+00
+6429 16152 -2.15460430129389e+00
+6429 16176 -1.44954846646002e-01
+6429 16200 -3.90079655830218e-06
+6429 16440 -3.89332230272228e-04
+6429 16464 -2.40577424961977e-01
+6429 16488 -2.46519311509011e+00
+6429 16512 -7.59830514439935e+00
+6429 16536 -6.94499300146942e+00
+6429 16560 -1.87921702765301e+00
+6429 16584 -1.38745469119401e-01
+6429 16608 -1.04201598584573e-05
+6429 16848 -3.43528606209371e-05
+6429 16872 -5.22627933309477e-02
+6429 16896 -6.07890324229403e-01
+6429 16920 -1.97095422806588e+00
+6429 16944 -1.71506375002891e+00
+6429 16968 -4.41673679756457e-01
+6429 16992 -3.00750972078247e-02
+6429 17016 -2.51866616999208e-06
+6429 17280 -2.45335414009301e-03
+6429 17304 -3.97012792058168e-02
+6429 17328 -1.41157639159403e-01
+6429 17352 -1.07211408631075e-01
+6429 17376 -2.20016673822270e-02
+6429 17400 -7.12208246196802e-04
+6429 17424 -2.67275633000000e-12
+6429 17688 -5.23645026792810e-07
+6429 17712 -1.38112665047087e-05
+6429 17736 -4.77885378091531e-05
+6429 17760 -1.33092751663792e-05
+6429 17784 -3.98147192210430e-07
+6430 6430 1.00000000000000e+00
+6431 6431 1.00000000000000e+00
+6432 6432 1.00000000000000e+00
+6433 6433 1.00000000000000e+00
+6434 6434 1.00000000000000e+00
+6435 6435 1.00000000000000e+00
+6436 6436 1.00000000000000e+00
+6437 6437 1.00000000000000e+00
+6438 6438 1.00000000000000e+00
+6439 6439 1.00000000000000e+00
+6440 6440 1.00000000000000e+00
+6441 6441 1.00000000000000e+00
+6442 6442 1.00000000000000e+00
+6443 6443 1.00000000000000e+00
+6444 6444 1.00000000000000e+00
+6445 6445 1.00000000000000e+00
+6446 6446 1.00000000000000e+00
+6447 6447 1.00000000000000e+00
+6448 6448 1.00000000000000e+00
+6449 6449 1.00000000000000e+00
+6450 6450 1.00000000000000e+00
+6451 6451 1.00000000000000e+00
+6452 6452 1.00000000000000e+00
+6453 4605 1.43358216180987e-06
+6453 4629 1.11277923894421e-05
+6453 4653 8.97612361523940e-07
+6453 5181 1.08879937028275e-06
+6453 5205 3.49349886848909e-03
+6453 5229 1.11544915246484e-01
+6453 5253 2.78118470954539e-01
+6453 5277 4.82735193069488e-02
+6453 6453 1.85107007957694e+01
+6453 5781 2.10763663817741e-05
+6453 5805 1.35101238191710e-01
+6453 5829 2.30136421296788e+00
+6453 5853 5.81461242173254e+00
+6453 5877 3.09914208319473e+00
+6453 5901 1.29727964301459e-01
+6453 5925 7.20900767794638e-05
+6453 6381 5.42606048985635e-04
+6453 6405 3.05741013405657e-01
+6453 6429 7.22470846299943e+00
+6453 6477 6.98081283453348e+00
+6453 6501 2.79777465397478e-01
+6453 6525 3.54827271089049e-04
+6453 6981 2.64738694593930e-04
+6453 7005 1.30017308321321e-01
+6453 7029 2.77392916116137e+00
+6453 7053 7.60940118776601e+00
+6453 7077 2.64884504318029e+00
+6453 7101 9.08790737019994e-02
+6453 7125 3.19208832744815e-06
+6453 7581 2.40795486257654e-06
+6453 7605 3.37533779248329e-03
+6453 7629 1.29158141991548e-01
+6453 7653 3.83651946384642e-01
+6453 7677 1.04720627674972e-01
+6453 7701 2.93365015021251e-03
+6453 8205 1.07354659163103e-06
+6453 8229 1.40199035422927e-04
+6453 8253 2.67258390988052e-04
+6453 8277 2.33188526392939e-04
+6453 8301 1.91012521360000e-10
+6453 8853 6.14500000000000e-17
+6453 8877 3.85400000000000e-17
+6453 15240 -1.96369108521831e-05
+6453 15264 -2.05692093069998e-02
+6453 15288 -3.00034719279318e-01
+6453 15312 -1.28138291463894e+00
+6453 15336 -1.79324213756294e+00
+6453 15360 -4.70523537717537e-01
+6453 15384 -2.04644255858374e-02
+6453 15648 -9.55235986069353e-05
+6453 15672 -1.13112689805217e-01
+6453 15696 -1.43888709538294e+00
+6453 15720 -5.48334295921232e+00
+6453 15744 -6.75754988964383e+00
+6453 15768 -1.79211733908770e+00
+6453 15792 -9.39954658147401e-02
+6453 16056 -8.75407316449945e-05
+6453 16080 -1.94606147503335e-01
+6453 16104 -2.67231919083988e+00
+6453 16128 -1.00015592700934e+01
+6453 16152 -1.09547396060214e+01
+6453 16176 -2.84276194806438e+00
+6453 16200 -1.57084032693362e-01
+6453 16464 -1.69759551982028e-05
+6453 16488 -6.35762543224481e-02
+6453 16512 -1.01738905164713e+00
+6453 16536 -3.98187100407165e+00
+6453 16560 -4.28313906253422e+00
+6453 16584 -1.10467050991724e+00
+6453 16608 -6.09452274392248e-02
+6453 16896 -5.15015269182187e-03
+6453 16920 -1.09952822002810e-01
+6453 16944 -4.60405244955105e-01
+6453 16968 -4.87379513125258e-01
+6453 16992 -1.24457816678190e-01
+6453 17016 -6.72695047920784e-03
+6453 17304 -8.75431199719505e-06
+6453 17328 -9.44207889060278e-04
+6453 17352 -4.02285784986320e-03
+6453 17376 -2.41855455161585e-03
+6453 17400 -3.77341038477286e-04
+6453 17424 -1.62243194400000e-11
+6454 6454 1.00000000000000e+00
+6455 6455 1.00000000000000e+00
+6456 6456 1.00000000000000e+00
+6457 6457 1.00000000000000e+00
+6458 6458 1.00000000000000e+00
+6459 6459 1.00000000000000e+00
+6460 6460 1.00000000000000e+00
+6461 6461 1.00000000000000e+00
+6462 6462 1.00000000000000e+00
+6463 6463 1.00000000000000e+00
+6464 6464 1.00000000000000e+00
+6465 6465 1.00000000000000e+00
+6466 6466 1.00000000000000e+00
+6467 6467 1.00000000000000e+00
+6468 6468 1.00000000000000e+00
+6469 6469 1.00000000000000e+00
+6470 6470 1.00000000000000e+00
+6471 6471 1.00000000000000e+00
+6472 6472 1.00000000000000e+00
+6473 6473 1.00000000000000e+00
+6474 6474 1.00000000000000e+00
+6475 6475 1.00000000000000e+00
+6476 6476 1.00000000000000e+00
+6477 4605 2.76977475000000e-12
+6477 4629 1.26524962030200e-08
+6477 4653 1.31921271842000e-09
+6477 5205 1.44369951344170e-07
+6477 5229 8.22857654823547e-03
+6477 5253 1.48862480811000e-01
+6477 5277 9.43953024244535e-02
+6477 6477 1.87919716657745e+01
+6477 5805 4.77661153452617e-05
+6477 5829 1.06494160843872e-01
+6477 5853 3.76737230205427e+00
+6477 5877 1.09723187831808e+01
+6477 5901 3.18335899755218e+00
+6477 5925 2.33776633015677e-02
+6477 6405 8.42968691652785e-04
+6477 6429 3.44526895845705e-01
+6477 6453 6.98081283453348e+00
+6477 6501 1.07535791920088e+01
+6477 6525 1.30411080783787e-01
+6477 7005 1.53185448900641e-04
+6477 7029 1.65476629083147e-01
+6477 7053 2.68222047618868e+00
+6477 7077 7.14083795988902e+00
+6477 7101 3.15491505639734e+00
+6477 7125 2.07534537618306e-03
+6477 7605 2.13656657686152e-06
+6477 7629 7.60696239971761e-03
+6477 7653 9.86337930065506e-02
+6477 7677 4.95673214491808e-01
+6477 7701 1.02332936930004e-01
+6477 8253 1.59825900986153e-04
+6477 8277 3.47698256597034e-04
+6477 8301 2.22990279934000e-09
+6477 15264 -7.22506791617711e-06
+6477 15288 -7.14390121570572e-02
+6477 15312 -1.63815643084329e+00
+6477 15336 -7.14013593441152e+00
+6477 15360 -8.54372163120876e+00
+6477 15384 -2.77159021881347e+00
+6477 15672 -5.73103372691881e-06
+6477 15696 -1.07496598483683e-01
+6477 15720 -2.39548250059452e+00
+6477 15744 -9.88798952076274e+00
+6477 15768 -1.13396010740795e+01
+6477 15792 -5.32072509956977e+00
+6477 16080 -6.05285648237220e-07
+6477 16104 -5.51496939522462e-02
+6477 16128 -1.32287667106873e+00
+6477 16152 -5.27654274785916e+00
+6477 16176 -5.66071931761925e+00
+6477 16200 -3.43113164804846e+00
+6477 16512 -9.50245677540132e-03
+6477 16536 -2.65653515247335e-01
+6477 16560 -1.07744492518088e+00
+6477 16584 -1.10367230428959e+00
+6477 16608 -6.50483221529839e-01
+6477 16920 -4.71154979898955e-05
+6477 16944 -8.24395122984934e-03
+6477 16968 -3.82846590392054e-02
+6477 16992 -3.30507753107734e-02
+6477 17016 -7.88146601817168e-03
+6478 6478 1.00000000000000e+00
+6479 6479 1.00000000000000e+00
+6480 6480 1.00000000000000e+00
+6481 6481 1.00000000000000e+00
+6482 6482 1.00000000000000e+00
+6483 6483 1.00000000000000e+00
+6484 6484 1.00000000000000e+00
+6485 6485 1.00000000000000e+00
+6486 6486 1.00000000000000e+00
+6487 6487 1.00000000000000e+00
+6488 6488 1.00000000000000e+00
+6489 6489 1.00000000000000e+00
+6490 6490 1.00000000000000e+00
+6491 6491 1.00000000000000e+00
+6492 6492 1.00000000000000e+00
+6493 6493 1.00000000000000e+00
+6494 6494 1.00000000000000e+00
+6495 6495 1.00000000000000e+00
+6496 6496 1.00000000000000e+00
+6497 6497 1.00000000000000e+00
+6498 6498 1.00000000000000e+00
+6499 6499 1.00000000000000e+00
+6500 6500 1.00000000000000e+00
+6501 5253 7.34843574811701e-03
+6501 5277 9.22890593949159e-03
+6501 6501 2.23335933073406e+01
+6501 5829 1.20547285967305e-04
+6501 5853 2.45504972402715e-01
+6501 5877 4.64065275503852e+00
+6501 5901 4.66704907915619e+00
+6501 5925 1.09822659070734e-01
+6501 6429 5.98389187080616e-04
+6501 6453 2.79777465397478e-01
+6501 6477 1.07535791920088e+01
+6501 6525 6.14209279220208e-01
+6501 7029 1.08990327590333e-04
+6501 7053 1.09481969201774e-01
+6501 7077 4.49687532096013e+00
+6501 7101 4.86555311739395e+00
+6501 7125 8.11544335798985e-03
+6501 7629 1.13169651915079e-06
+6501 7653 7.50438699090512e-03
+6501 7677 2.76648894908256e-01
+6501 7701 7.50878594565642e-02
+6501 8253 2.36590348617504e-06
+6501 8277 7.67643334023922e-06
+6501 8301 1.09086417370000e-10
+6501 15312 -1.34917509756817e-01
+6501 15336 -2.47118942806333e+00
+6501 15360 -1.09051654129365e+01
+6501 15384 -8.01986008310702e+00
+6501 15720 -9.62596793221488e-02
+6501 15744 -1.81132176135845e+00
+6501 15768 -1.07635608328284e+01
+6501 15792 -1.13506209985234e+01
+6501 16128 -8.94430899049745e-03
+6501 16152 -2.20635404010206e-01
+6501 16176 -2.45302092463149e+00
+6501 16200 -3.59414605494446e+00
+6501 16536 -1.92627463307750e-04
+6501 16560 -1.51639929481643e-02
+6501 16584 -2.52264035490331e-01
+6501 16608 -4.03388434389513e-01
+6501 16968 -1.30936415916661e-05
+6501 16992 -9.97392066839201e-05
+6501 17016 -1.07822922226178e-04
+6502 6502 1.00000000000000e+00
+6503 6503 1.00000000000000e+00
+6504 6504 1.00000000000000e+00
+6505 6505 1.00000000000000e+00
+6506 6506 1.00000000000000e+00
+6507 6507 1.00000000000000e+00
+6508 6508 1.00000000000000e+00
+6509 6509 1.00000000000000e+00
+6510 6510 1.00000000000000e+00
+6511 6511 1.00000000000000e+00
+6512 6512 1.00000000000000e+00
+6513 6513 1.00000000000000e+00
+6514 6514 1.00000000000000e+00
+6515 6515 1.00000000000000e+00
+6516 6516 1.00000000000000e+00
+6517 6517 1.00000000000000e+00
+6518 6518 1.00000000000000e+00
+6519 6519 1.00000000000000e+00
+6520 6520 1.00000000000000e+00
+6521 6521 1.00000000000000e+00
+6522 6522 1.00000000000000e+00
+6523 6523 1.00000000000000e+00
+6524 6524 1.00000000000000e+00
+6525 6525 1.03255630443834e+00
+6525 5853 1.80194811187155e-04
+6525 5877 4.36793967859327e-02
+6525 5901 1.19790234883616e-01
+6525 5925 6.14289272445810e-03
+6525 6453 3.54827271089049e-04
+6525 6477 1.30411080783787e-01
+6525 6501 6.14209279220208e-01
+6525 7053 3.30881342016362e-05
+6525 7077 3.06976858560474e-02
+6525 7101 6.52632710066779e-02
+6525 7125 3.16146648534755e-04
+6525 7677 3.44776521549182e-06
+6525 7701 4.09279816281571e-06
+6525 15336 -1.70855648037468e-02
+6525 15360 -2.25383879039402e-01
+6525 15384 -3.31168804452576e-01
+6525 15744 -9.21270429339994e-03
+6525 15768 -1.61524079405973e-01
+6525 15792 -2.58559228758146e-01
+6525 16152 -1.91406254721875e-04
+6525 16176 -1.39520399675063e-02
+6525 16200 -2.65642361519594e-02
+6526 6526 1.00000000000000e+00
+6527 6527 1.00000000000000e+00
+6528 6528 1.00000000000000e+00
+6529 6529 1.00000000000000e+00
+6530 6530 1.00000000000000e+00
+6531 6531 1.00000000000000e+00
+6532 6532 1.00000000000000e+00
+6533 6533 1.00000000000000e+00
+6534 6534 1.00000000000000e+00
+6535 6535 1.00000000000000e+00
+6536 6536 1.00000000000000e+00
+6537 6537 1.00000000000000e+00
+6538 6538 1.00000000000000e+00
+6539 6539 1.00000000000000e+00
+6540 6540 1.00000000000000e+00
+6541 6541 1.00000000000000e+00
+6542 6542 1.00000000000000e+00
+6543 6543 1.00000000000000e+00
+6544 6544 1.00000000000000e+00
+6545 6545 1.00000000000000e+00
+6546 6546 1.00000000000000e+00
+6547 6547 1.00000000000000e+00
+6548 6548 1.00000000000000e+00
+6549 6549 1.00000000000000e+00
+6550 6550 1.00000000000000e+00
+6551 6551 1.00000000000000e+00
+6552 6552 1.00000000000000e+00
+6553 6553 1.00000000000000e+00
+6554 6554 1.00000000000000e+00
+6555 6555 1.00000000000000e+00
+6556 6556 1.00000000000000e+00
+6557 6557 1.00000000000000e+00
+6558 6558 1.00000000000000e+00
+6559 6559 1.00000000000000e+00
+6560 6560 1.00000000000000e+00
+6561 6561 1.00000000000000e+00
+6562 6562 1.00000000000000e+00
+6563 6563 1.00000000000000e+00
+6564 6564 1.00000000000000e+00
+6565 6565 1.00000000000000e+00
+6566 6566 1.00000000000000e+00
+6567 6567 1.00000000000000e+00
+6568 6568 1.00000000000000e+00
+6569 6569 1.00000000000000e+00
+6570 6570 1.00000000000000e+00
+6571 6571 1.00000000000000e+00
+6572 6572 1.00000000000000e+00
+6573 6573 1.00000000000000e+00
+6574 6574 1.00000000000000e+00
+6575 6575 1.00000000000000e+00
+6576 6576 1.00000000000000e+00
+6577 6577 1.00000000000000e+00
+6578 6578 1.00000000000000e+00
+6579 6579 1.00000000000000e+00
+6580 6580 1.00000000000000e+00
+6581 6581 1.00000000000000e+00
+6582 6582 1.00000000000000e+00
+6583 6583 1.00000000000000e+00
+6584 6584 1.00000000000000e+00
+6585 6585 1.00000000000000e+00
+6586 6586 1.00000000000000e+00
+6587 6587 1.00000000000000e+00
+6588 6588 1.00000000000000e+00
+6589 6589 1.00000000000000e+00
+6590 6590 1.00000000000000e+00
+6591 6591 1.00000000000000e+00
+6592 6592 1.00000000000000e+00
+6593 6593 1.00000000000000e+00
+6594 6594 1.00000000000000e+00
+6595 6595 1.00000000000000e+00
+6596 6596 1.00000000000000e+00
+6597 6597 1.00000000000000e+00
+6598 6598 1.00000000000000e+00
+6599 6599 1.00000000000000e+00
+6600 6600 1.00000000000000e+00
+6601 6601 1.00000000000000e+00
+6602 6602 1.00000000000000e+00
+6603 6603 1.00000000000000e+00
+6604 6604 1.00000000000000e+00
+6605 6605 1.00000000000000e+00
+6606 6606 1.00000000000000e+00
+6607 6607 1.00000000000000e+00
+6608 6608 1.00000000000000e+00
+6609 6609 1.00000000000000e+00
+6610 6610 1.00000000000000e+00
+6611 6611 1.00000000000000e+00
+6612 6612 1.00000000000000e+00
+6613 6613 1.00000000000000e+00
+6614 6614 1.00000000000000e+00
+6615 6615 1.00000000000000e+00
+6616 6616 1.00000000000000e+00
+6617 6617 1.00000000000000e+00
+6618 6618 1.00000000000000e+00
+6619 6619 1.00000000000000e+00
+6620 6620 1.00000000000000e+00
+6621 6621 1.00000000000000e+00
+6622 6622 1.00000000000000e+00
+6623 6623 1.00000000000000e+00
+6624 6624 1.00000000000000e+00
+6625 6625 1.00000000000000e+00
+6626 6626 1.00000000000000e+00
+6627 6627 1.00000000000000e+00
+6628 6628 1.00000000000000e+00
+6629 6629 1.00000000000000e+00
+6630 6630 1.00000000000000e+00
+6631 6631 1.00000000000000e+00
+6632 6632 1.00000000000000e+00
+6633 6633 1.00000000000000e+00
+6634 6634 1.00000000000000e+00
+6635 6635 1.00000000000000e+00
+6636 6636 1.00000000000000e+00
+6637 6637 1.00000000000000e+00
+6638 6638 1.00000000000000e+00
+6639 6639 1.00000000000000e+00
+6640 6640 1.00000000000000e+00
+6641 6641 1.00000000000000e+00
+6642 6642 1.00000000000000e+00
+6643 6643 1.00000000000000e+00
+6644 6644 1.00000000000000e+00
+6645 6645 1.00000000000000e+00
+6646 6646 1.00000000000000e+00
+6647 6647 1.00000000000000e+00
+6648 6648 1.00000000000000e+00
+6649 6649 1.00000000000000e+00
+6650 6650 1.00000000000000e+00
+6651 6651 1.00000000000000e+00
+6652 6652 1.00000000000000e+00
+6653 6653 1.00000000000000e+00
+6654 6654 1.00000000000000e+00
+6655 6655 1.00000000000000e+00
+6656 6656 1.00000000000000e+00
+6657 6657 1.00000000000000e+00
+6658 6658 1.00000000000000e+00
+6659 6659 1.00000000000000e+00
+6660 6660 1.00000000000000e+00
+6661 6661 1.00000000000000e+00
+6662 6662 1.00000000000000e+00
+6663 6663 1.00000000000000e+00
+6664 6664 1.00000000000000e+00
+6665 6665 1.00000000000000e+00
+6666 6666 1.00000000000000e+00
+6667 6667 1.00000000000000e+00
+6668 6668 1.00000000000000e+00
+6669 6669 1.00000000000000e+00
+6670 6670 1.00000000000000e+00
+6671 6671 1.00000000000000e+00
+6672 6672 1.00000000000000e+00
+6673 6673 1.00000000000000e+00
+6674 6674 1.00000000000000e+00
+6675 6675 1.00000000000000e+00
+6676 6676 1.00000000000000e+00
+6677 6677 1.00000000000000e+00
+6678 6678 1.00000000000000e+00
+6679 6679 1.00000000000000e+00
+6680 6680 1.00000000000000e+00
+6681 6681 1.00000000000000e+00
+6682 6682 1.00000000000000e+00
+6683 6683 1.00000000000000e+00
+6684 6684 1.00000000000000e+00
+6685 6685 1.00000000000000e+00
+6686 6686 1.00000000000000e+00
+6687 6687 1.00000000000000e+00
+6688 6688 1.00000000000000e+00
+6689 6689 1.00000000000000e+00
+6690 6690 1.00000000000000e+00
+6691 6691 1.00000000000000e+00
+6692 6692 1.00000000000000e+00
+6693 6693 1.00000000000000e+00
+6694 6694 1.00000000000000e+00
+6695 6695 1.00000000000000e+00
+6696 6696 1.00000000000000e+00
+6697 6697 1.00000000000000e+00
+6698 6698 1.00000000000000e+00
+6699 6699 1.00000000000000e+00
+6700 6700 1.00000000000000e+00
+6701 6701 1.00000000000000e+00
+6702 6702 1.00000000000000e+00
+6703 6703 1.00000000000000e+00
+6704 6704 1.00000000000000e+00
+6705 6705 1.00000000000000e+00
+6706 6706 1.00000000000000e+00
+6707 6707 1.00000000000000e+00
+6708 6708 1.00000000000000e+00
+6709 6709 1.00000000000000e+00
+6710 6710 1.00000000000000e+00
+6711 6711 1.00000000000000e+00
+6712 6712 1.00000000000000e+00
+6713 6713 1.00000000000000e+00
+6714 6714 1.00000000000000e+00
+6715 6715 1.00000000000000e+00
+6716 6716 1.00000000000000e+00
+6717 6717 1.00000000000106e+00
+6717 6141 2.16381754700000e-11
+6717 6165 3.19243961200000e-11
+6717 6741 8.87085011605740e-07
+6717 6765 8.87219725627870e-07
+6717 6789 8.85453302770000e-10
+6717 7317 1.23430727922280e-07
+6717 7341 4.40213679917620e-06
+6717 7365 1.86054858380128e-06
+6717 7389 9.32791876860000e-10
+6717 7917 1.65206772175220e-07
+6717 7941 1.47101733658930e-06
+6717 7965 1.76934258518440e-07
+6717 7989 7.31269937100000e-11
+6717 8517 1.09086417370000e-10
+6717 8541 2.22990279934000e-09
+6717 8565 1.91012521360000e-10
+6717 8589 3.55340800000000e-14
+6717 19488 -6.28923985187290e-07
+6717 19512 -3.15062376914740e-07
+6717 19536 -1.71538377450000e-10
+6717 19896 -2.99407615582719e-06
+6717 19920 -1.50043593642063e-06
+6717 19944 -9.70816716290000e-10
+6717 20304 -2.54244484549936e-06
+6717 20328 -1.27580809196146e-06
+6717 20352 -1.31019120337000e-09
+6717 20712 -4.78380215078020e-07
+6717 20736 -2.40186428761680e-07
+6717 20760 -2.84663206480000e-10
+6718 6718 1.00000000000000e+00
+6719 6719 1.00000000000000e+00
+6720 6720 1.00000000000000e+00
+6721 6721 1.00000000000000e+00
+6722 6722 1.00000000000000e+00
+6723 6723 1.00000000000000e+00
+6724 6724 1.00000000000000e+00
+6725 6725 1.00000000000000e+00
+6726 6726 1.00000000000000e+00
+6727 6727 1.00000000000000e+00
+6728 6728 1.00000000000000e+00
+6729 6729 1.00000000000000e+00
+6730 6730 1.00000000000000e+00
+6731 6731 1.00000000000000e+00
+6732 6732 1.00000000000000e+00
+6733 6733 1.00000000000000e+00
+6734 6734 1.00000000000000e+00
+6735 6735 1.00000000000000e+00
+6736 6736 1.00000000000000e+00
+6737 6737 1.00000000000000e+00
+6738 6738 1.00000000000000e+00
+6739 6739 1.00000000000000e+00
+6740 6740 1.00000000000000e+00
+6741 4965 5.45496585000000e-12
+6741 4989 1.51028246000000e-11
+6741 6741 3.46517180999951e+00
+6741 5565 3.63532297866496e-03
+6741 5589 2.12411346181328e-03
+6741 5613 1.55053844990900e-08
+6741 5637 1.50650000000000e-16
+6741 6141 5.97228003931995e-02
+6741 6165 7.56157576803351e-01
+6741 6189 1.27588687451474e-01
+6741 6213 2.13322127890803e-04
+6741 6237 4.20640000000000e-16
+6741 6717 8.87085011605740e-07
+6741 6765 5.54000696248029e+00
+6741 6789 2.74020269122420e-01
+6741 6813 4.39095393213610e-04
+6741 7317 1.38154135506727e-02
+6741 7341 4.34538569436148e+00
+6741 7365 3.62600246314900e+00
+6741 7389 8.90814666278415e-02
+6741 7413 2.27667645083756e-05
+6741 7917 1.20671885798247e-02
+6741 7941 2.74929435139290e-01
+6741 7965 1.36090564095540e-01
+6741 7989 4.58947816494331e-03
+6741 8013 2.46575223213160e-07
+6741 8517 7.67643334023879e-06
+6741 8541 3.47698256597015e-04
+6741 8565 2.33188526392926e-04
+6741 8589 1.65821052232080e-07
+6741 8613 7.79578600000000e-14
+6741 9165 2.37500000000000e-16
+6741 9189 1.61450000000000e-16
+6741 18264 -1.40028719608416e-06
+6741 18288 -7.01874925208510e-07
+6741 18312 -4.94664904690000e-10
+6741 18672 -7.35208925300149e-02
+6741 18696 -3.98978040899679e-02
+6741 18720 -8.96387949988702e-04
+6741 19080 -9.91396379203772e-01
+6741 19104 -5.54951980889222e-01
+6741 19128 -1.69311411195078e-02
+6741 19152 -4.00202380170110e-07
+6741 19488 -3.93265630313751e+00
+6741 19512 -2.21730298722638e+00
+6741 19536 -7.17232553767054e-02
+6741 19560 -4.35062775778442e-06
+6741 19896 -5.00898442642436e+00
+6741 19920 -2.79768642905908e+00
+6741 19944 -8.38121177760741e-02
+6741 19968 -1.13997207202419e-05
+6741 20304 -1.19951607928589e+00
+6741 20328 -6.70418245275494e-01
+6741 20352 -2.01988474371417e-02
+6741 20376 -2.75079980372752e-06
+6741 20712 -3.24275802740579e-02
+6741 20736 -1.86238563130753e-02
+6741 20760 -6.88591247467957e-04
+6741 20784 -2.45391655890000e-10
+6742 6742 1.00000000000000e+00
+6743 6743 1.00000000000000e+00
+6744 6744 1.00000000000000e+00
+6745 6745 1.00000000000000e+00
+6746 6746 1.00000000000000e+00
+6747 6747 1.00000000000000e+00
+6748 6748 1.00000000000000e+00
+6749 6749 1.00000000000000e+00
+6750 6750 1.00000000000000e+00
+6751 6751 1.00000000000000e+00
+6752 6752 1.00000000000000e+00
+6753 6753 1.00000000000000e+00
+6754 6754 1.00000000000000e+00
+6755 6755 1.00000000000000e+00
+6756 6756 1.00000000000000e+00
+6757 6757 1.00000000000000e+00
+6758 6758 1.00000000000000e+00
+6759 6759 1.00000000000000e+00
+6760 6760 1.00000000000000e+00
+6761 6761 1.00000000000000e+00
+6762 6762 1.00000000000000e+00
+6763 6763 1.00000000000000e+00
+6764 6764 1.00000000000000e+00
+6765 4965 4.57242407563110e-07
+6765 4989 1.26615946688092e-06
+6765 6765 2.55581485016706e+01
+6765 5565 1.92744512039673e-01
+6765 5589 2.69689879613932e-01
+6765 5613 5.64636705605440e-03
+6765 5637 1.54657054999062e-06
+6765 6141 3.02172057297916e-01
+6765 6165 9.26996687393087e+00
+6765 6189 4.15240925190611e+00
+6765 6213 1.02243790726411e-01
+6765 6237 2.67866754088798e-04
+6765 6717 8.87219725627870e-07
+6765 6741 5.54000696248029e+00
+6765 6789 6.20292311079303e+00
+6765 6813 3.19728559420906e-01
+6765 6837 4.54537256974681e-04
+6765 7317 8.35456992673660e-03
+6765 7341 5.44645677899677e+00
+6765 7365 8.40787723111205e+00
+6765 7389 2.14495058601446e+00
+6765 7413 1.46585707143297e-01
+6765 7437 1.97278770701292e-05
+6765 7917 4.31692185634901e-03
+6765 7941 2.50073467614362e-01
+6765 7965 3.37952987363556e-01
+6765 7989 1.20597050544893e-01
+6765 8013 4.53171246542365e-03
+6765 8037 1.74930753381088e-06
+6765 8517 2.36590348617491e-06
+6765 8541 1.59825900986144e-04
+6765 8565 2.67258390988049e-04
+6765 8589 2.62041531254365e-04
+6765 8613 2.74962501930974e-06
+6765 9165 1.70813000000000e-15
+6765 9189 1.16118000000000e-15
+6765 18264 -1.24451148894911e-01
+6765 18288 -8.86963956974809e-02
+6765 18312 -9.12151484469939e-03
+6765 18336 -4.19575438955588e-04
+6765 18672 -2.26850405724510e+00
+6765 18696 -1.88437508933345e+00
+6765 18720 -3.02877918445016e-01
+6765 18744 -2.38431983512811e-02
+6765 18768 -2.45870515439580e-07
+6765 19080 -9.88947253249624e+00
+6765 19104 -8.42168416152380e+00
+6765 19128 -1.52603805139535e+00
+6765 19152 -1.43573546139144e-01
+6765 19176 -4.68209319752302e-05
+6765 19488 -1.36483898526968e+01
+6765 19512 -1.11982184290233e+01
+6765 19536 -2.17167163998993e+00
+6765 19560 -2.48937627752007e-01
+6765 19584 -1.93029350231710e-04
+6765 19896 -7.28706157576650e+00
+6765 19920 -5.46128485173952e+00
+6765 19944 -8.51279404173897e-01
+6765 19968 -8.96751616157913e-02
+6765 19992 -8.35721701630051e-05
+6765 20304 -1.18740850620942e+00
+6765 20328 -8.34970990283429e-01
+6765 20352 -1.01470518843151e-01
+6765 20376 -8.79520094271818e-03
+6765 20400 -9.43368006238332e-06
+6765 20712 -9.65306573404738e-03
+6765 20736 -6.21525660309202e-03
+6765 20760 -3.96784765631872e-04
+6765 20784 -1.76489563238000e-09
+6766 6766 1.00000000000000e+00
+6767 6767 1.00000000000000e+00
+6768 6768 1.00000000000000e+00
+6769 6769 1.00000000000000e+00
+6770 6770 1.00000000000000e+00
+6771 6771 1.00000000000000e+00
+6772 6772 1.00000000000000e+00
+6773 6773 1.00000000000000e+00
+6774 6774 1.00000000000000e+00
+6775 6775 1.00000000000000e+00
+6776 6776 1.00000000000000e+00
+6777 6777 1.00000000000000e+00
+6778 6778 1.00000000000000e+00
+6779 6779 1.00000000000000e+00
+6780 6780 1.00000000000000e+00
+6781 6781 1.00000000000000e+00
+6782 6782 1.00000000000000e+00
+6783 6783 1.00000000000000e+00
+6784 6784 1.00000000000000e+00
+6785 6785 1.00000000000000e+00
+6786 6786 1.00000000000000e+00
+6787 6787 1.00000000000000e+00
+6788 6788 1.00000000000000e+00
+6789 4965 1.24828921303143e-06
+6789 4989 1.57546452617895e-04
+6789 5013 1.17729495477171e-04
+6789 5037 5.57780449472110e-07
+6789 6789 1.64581799012995e+01
+6789 5565 1.26642207232515e-01
+6789 5589 3.65589698849336e-01
+6789 5613 9.38903743213104e-02
+6789 5637 4.36077583164108e-03
+6789 5661 7.38583222521842e-06
+6789 6141 3.21160075323171e-02
+6789 6165 3.20527510274175e+00
+6789 6189 5.95013494598463e+00
+6789 6213 2.52076813096791e+00
+6789 6237 1.20361755725483e-01
+6789 6261 2.41938520180963e-04
+6789 6285 1.27120000000000e-16
+6789 6717 8.85453302770000e-10
+6789 6741 2.74020269122420e-01
+6789 6765 6.20292311079303e+00
+6789 6813 6.54732452314674e+00
+6789 6837 2.93701725343242e-01
+6789 6861 2.93336389137450e-04
+6789 6885 8.37030000000000e-16
+6789 7317 9.01164771458647e-06
+6789 7341 1.18442951526061e-01
+6789 7365 2.20243939165181e+00
+6789 7389 6.56258203238990e+00
+6789 7413 2.43971202276567e+00
+6789 7437 1.19507368978332e-01
+6789 7461 6.51738304218140e-05
+6789 7917 1.76345157057951e-06
+6789 7941 5.34094459172504e-03
+6789 7965 1.03910226659848e-01
+6789 7989 3.24085759625737e-01
+6789 8013 1.32107227727700e-01
+6789 8037 2.66749886865825e-03
+6789 8061 1.93816942058855e-06
+6789 8565 1.40199035422931e-04
+6789 8589 4.67153324025481e-04
+6789 8613 8.91005421407023e-05
+6789 8637 6.72456755290733e-06
+6789 17856 -3.08469849872074e-04
+6789 17880 -3.41592650809732e-03
+6789 17904 -9.14157579495082e-03
+6789 17928 -2.60171715117956e-03
+6789 17952 -1.04917510642632e-04
+6789 18264 -1.37927352900204e-01
+6789 18288 -3.74380593890009e-01
+6789 18312 -5.76961529729763e-01
+6789 18336 -1.82793376238334e-01
+6789 18360 -1.36571193791506e-02
+6789 18384 -2.67149432083500e-08
+6789 18672 -1.14051294456303e+00
+6789 18696 -3.15244129814919e+00
+6789 18720 -4.32881999660597e+00
+6789 18744 -1.41134525042509e+00
+6789 18768 -1.19803551127474e-01
+6789 18792 -1.74967604472405e-04
+6789 19080 -2.69515405120270e+00
+6789 19104 -7.85669670876060e+00
+6789 19128 -1.02216097184029e+01
+6789 19152 -3.40775270230959e+00
+6789 19176 -3.13158933648098e-01
+6789 19200 -8.50483332369755e-04
+6789 19488 -1.33921351264526e+00
+6789 19512 -4.42373616499346e+00
+6789 19536 -6.39325921400946e+00
+6789 19560 -2.16294920165834e+00
+6789 19584 -1.98701968048531e-01
+6789 19608 -7.78915299212615e-04
+6789 19896 -2.12057904827480e-01
+6789 19920 -8.00085278224094e-01
+6789 19944 -1.20828029646936e+00
+6789 19968 -3.96364039902618e-01
+6789 19992 -3.39204386699661e-02
+6789 20016 -1.51013638628261e-04
+6789 20304 -6.82991249166325e-03
+6789 20328 -3.21841845409029e-02
+6789 20352 -3.98639657652787e-02
+6789 20376 -9.44696404610521e-03
+6789 20400 -2.48574860122958e-04
+6790 6790 1.00000000000000e+00
+6791 6791 1.00000000000000e+00
+6792 6792 1.00000000000000e+00
+6793 6793 1.00000000000000e+00
+6794 6794 1.00000000000000e+00
+6795 6795 1.00000000000000e+00
+6796 6796 1.00000000000000e+00
+6797 6797 1.00000000000000e+00
+6798 6798 1.00000000000000e+00
+6799 6799 1.00000000000000e+00
+6800 6800 1.00000000000000e+00
+6801 6801 1.00000000000000e+00
+6802 6802 1.00000000000000e+00
+6803 6803 1.00000000000000e+00
+6804 6804 1.00000000000000e+00
+6805 6805 1.00000000000000e+00
+6806 6806 1.00000000000000e+00
+6807 6807 1.00000000000000e+00
+6808 6808 1.00000000000000e+00
+6809 6809 1.00000000000000e+00
+6810 6810 1.00000000000000e+00
+6811 6811 1.00000000000000e+00
+6812 6812 1.00000000000000e+00
+6813 4965 9.84462529829330e-07
+6813 4989 2.11681717864968e-04
+6813 5013 4.19351447657609e-04
+6813 5037 1.86095276753439e-05
+6813 5061 1.62962235055496e-06
+6813 6813 1.52048834911816e+01
+6813 5565 4.48672969599088e-03
+6813 5589 1.05567678610662e-01
+6813 5613 3.22180068646858e-01
+6813 5637 1.28294801162542e-01
+6813 5661 3.81948091007359e-03
+6813 5685 2.33286633743796e-06
+6813 6141 1.00310287655639e-04
+6813 6165 8.83750882412685e-02
+6813 6189 2.54478197047024e+00
+6813 6213 6.10174473440780e+00
+6813 6237 2.30005723638074e+00
+6813 6261 1.03852201314302e-01
+6813 6285 2.24058402351051e-04
+6813 6309 1.22830000000000e-16
+6813 6741 4.39095393213610e-04
+6813 6765 3.19728559420907e-01
+6813 6789 6.54732452314674e+00
+6813 6837 5.46392976673366e+00
+6813 6861 2.86213876935507e-01
+6813 6885 2.33536006397607e-04
+6813 6909 1.87940000000000e-16
+6813 7341 6.44276186536662e-05
+6813 7365 1.48638855963737e-01
+6813 7389 2.44145806955094e+00
+6813 7413 5.76486307275872e+00
+6813 7437 2.13680044591841e+00
+6813 7461 9.54297444868273e-02
+6813 7485 1.15050029531136e-04
+6813 7941 1.89409891545972e-06
+6813 7965 4.53064416783982e-03
+6813 7989 1.29265031934991e-01
+6813 8013 2.67067283445570e-01
+6813 8037 1.09523577382538e-01
+6813 8061 2.99554152661755e-03
+6813 8085 8.44175032531240e-07
+6813 8565 1.07354659163104e-06
+6813 8589 1.87607910286074e-05
+6813 8613 5.00161568839039e-04
+6813 8637 2.46473168732267e-04
+6813 8661 2.33219156354420e-06
+6813 17472 -3.64761453425580e-07
+6813 17496 -4.38145079191064e-05
+6813 17520 -1.77369989909068e-04
+6813 17544 -7.26889822415083e-05
+6813 17568 -7.58338003402606e-06
+6813 17856 -3.37059951672540e-04
+6813 17880 -2.42284408096523e-02
+6813 17904 -1.36403831570532e-01
+6813 17928 -2.07628844917460e-01
+6813 17952 -7.08050616192474e-02
+6813 17976 -6.56477375214337e-03
+6813 18000 -6.64224849700000e-11
+6813 18264 -9.34229118965531e-03
+6813 18288 -3.40415392059884e-01
+6813 18312 -1.72365237570308e+00
+6813 18336 -2.40623175819992e+00
+6813 18360 -8.81184445223626e-01
+6813 18384 -9.59646298107557e-02
+6813 18408 -3.19949948932858e-04
+6813 18672 -4.00258339285648e-02
+6813 18696 -1.25135147236014e+00
+6813 18720 -6.06421539807080e+00
+6813 18744 -8.08169379493093e+00
+6813 18768 -3.07599406256259e+00
+6813 18792 -3.62324339704618e-01
+6813 18816 -2.16668756254664e-03
+6813 19080 -3.89639863280268e-02
+6813 19104 -1.28251347224221e+00
+6813 19128 -6.17588936427211e+00
+6813 19152 -8.01336539963230e+00
+6813 19176 -3.09628035087761e+00
+6813 19200 -3.81038440366006e-01
+6813 19224 -3.87791204741474e-03
+6813 19488 -8.19121310477237e-03
+6813 19512 -3.59609790199516e-01
+6813 19536 -1.79075268972267e+00
+6813 19560 -2.32104302524854e+00
+6813 19584 -8.49994985456517e-01
+6813 19608 -9.71852575256471e-02
+6813 19632 -9.28518009400147e-04
+6813 19896 -1.19661164935186e-04
+6813 19920 -2.67245997549204e-02
+6813 19944 -1.44830657291900e-01
+6813 19968 -1.90281153849867e-01
+6813 19992 -6.02435661366238e-02
+6813 20016 -5.16812501595168e-03
+6813 20040 -1.04073115619178e-05
+6813 20328 -2.56465629442634e-05
+6813 20352 -1.18646387859604e-04
+6813 20376 -8.98871072744660e-05
+6813 20400 -1.60601360825507e-05
+6814 6814 1.00000000000000e+00
+6815 6815 1.00000000000000e+00
+6816 6816 1.00000000000000e+00
+6817 6817 1.00000000000000e+00
+6818 6818 1.00000000000000e+00
+6819 6819 1.00000000000000e+00
+6820 6820 1.00000000000000e+00
+6821 6821 1.00000000000000e+00
+6822 6822 1.00000000000000e+00
+6823 6823 1.00000000000000e+00
+6824 6824 1.00000000000000e+00
+6825 6825 1.00000000000000e+00
+6826 6826 1.00000000000000e+00
+6827 6827 1.00000000000000e+00
+6828 6828 1.00000000000000e+00
+6829 6829 1.00000000000000e+00
+6830 6830 1.00000000000000e+00
+6831 6831 1.00000000000000e+00
+6832 6832 1.00000000000000e+00
+6833 6833 1.00000000000000e+00
+6834 6834 1.00000000000000e+00
+6835 6835 1.00000000000000e+00
+6836 6836 1.00000000000000e+00
+6837 4989 8.25552108883428e-06
+6837 5013 1.11714081298827e-04
+6837 5037 6.00232747143536e-04
+6837 5061 8.84933336397303e-05
+6837 6837 1.39656075658925e+01
+6837 5589 6.21683783583436e-03
+6837 5613 1.30553376912940e-01
+6837 5637 2.78594960790360e-01
+6837 5661 9.20977706503654e-02
+6837 5685 4.96537002526922e-03
+6837 5709 5.53908622508738e-06
+6837 6165 1.46665177000228e-04
+6837 6189 1.03318965213877e-01
+6837 6213 2.31147641763547e+00
+6837 6237 5.35035677744415e+00
+6837 6261 2.15568720645538e+00
+6837 6285 1.01104182244151e-01
+6837 6309 1.76905947185153e-04
+6837 6765 4.54537256974681e-04
+6837 6789 2.93701725343242e-01
+6837 6813 5.46392976673366e+00
+6837 6861 5.01444778180920e+00
+6837 6885 2.78473549213862e-01
+6837 6909 2.49408950444565e-04
+6837 7365 1.17189641502779e-04
+6837 7389 1.24287728839427e-01
+6837 7413 2.13949290794893e+00
+6837 7437 5.12682007264057e+00
+6837 7461 2.12226312376197e+00
+6837 7485 8.52217717988993e-02
+6837 7509 1.11059283569015e-04
+6837 7965 1.40334369341951e-05
+6837 7989 3.00569983360122e-03
+6837 8013 9.81329879921941e-02
+6837 8037 2.80952884632940e-01
+6837 8061 1.02519668862700e-01
+6837 8085 3.45602568546582e-03
+6837 8109 9.31527367732900e-08
+6837 8589 7.22147823010710e-07
+6837 8613 1.25135402336308e-04
+6837 8637 1.40080260134697e-04
+6837 8661 1.62005155421068e-04
+6837 8685 1.21535498385411e-05
+6837 17472 -7.35209993245750e-07
+6837 17496 -1.95469579268325e-03
+6837 17520 -1.83378568091769e-02
+6837 17544 -4.65170820385603e-02
+6837 17568 -2.03097815182608e-02
+6837 17592 -2.44491993247956e-03
+6837 17880 -4.16543717404543e-03
+6837 17904 -1.16903644012217e-01
+6837 17928 -6.49732174719315e-01
+6837 17952 -1.14612630496388e+00
+6837 17976 -5.14869724059545e-01
+6837 18000 -6.87655032636452e-02
+6837 18024 -3.19429685077528e-04
+6837 18288 -2.34736856990417e-02
+6837 18312 -6.46169679302480e-01
+6837 18336 -3.42870701505585e+00
+6837 18360 -5.69463606063286e+00
+6837 18384 -2.63136498869216e+00
+6837 18408 -3.73523759437001e-01
+6837 18432 -3.92424215915943e-03
+6837 18696 -3.18464976229811e-02
+6837 18720 -9.86091564195365e-01
+6837 18744 -5.27554891058864e+00
+6837 18768 -8.67746750985503e+00
+6837 18792 -4.15319957528700e+00
+6837 18816 -6.28655875378812e-01
+6837 18840 -1.13536029586752e-02
+6837 19104 -8.39152786425444e-03
+6837 19128 -3.90543641669703e-01
+6837 19152 -2.22780410194087e+00
+6837 19176 -3.75690140381861e+00
+6837 19200 -1.73159753784740e+00
+6837 19224 -2.51669427949074e-01
+6837 19248 -4.43884181165065e-03
+6837 19512 -3.92140677873941e-04
+6837 19536 -4.81042644266766e-02
+6837 19560 -2.95079386881859e-01
+6837 19584 -5.08138615513831e-01
+6837 19608 -2.18693144643874e-01
+6837 19632 -2.92174748184043e-02
+6837 19656 -4.48079598200331e-04
+6837 19944 -6.49930412057381e-04
+6837 19968 -3.82397426018649e-03
+6837 19992 -5.56934197282910e-03
+6837 20016 -1.31385706373231e-03
+6837 20040 -2.24011129438342e-05
+6838 6838 1.00000000000000e+00
+6839 6839 1.00000000000000e+00
+6840 6840 1.00000000000000e+00
+6841 6841 1.00000000000000e+00
+6842 6842 1.00000000000000e+00
+6843 6843 1.00000000000000e+00
+6844 6844 1.00000000000000e+00
+6845 6845 1.00000000000000e+00
+6846 6846 1.00000000000000e+00
+6847 6847 1.00000000000000e+00
+6848 6848 1.00000000000000e+00
+6849 6849 1.00000000000000e+00
+6850 6850 1.00000000000000e+00
+6851 6851 1.00000000000000e+00
+6852 6852 1.00000000000000e+00
+6853 6853 1.00000000000000e+00
+6854 6854 1.00000000000000e+00
+6855 6855 1.00000000000000e+00
+6856 6856 1.00000000000000e+00
+6857 6857 1.00000000000000e+00
+6858 6858 1.00000000000000e+00
+6859 6859 1.00000000000000e+00
+6860 6860 1.00000000000000e+00
+6861 5013 1.30211113888135e-05
+6861 5037 1.80679317919321e-04
+6861 5061 1.38422994045988e-04
+6861 5085 1.17724328222055e-04
+6861 5109 7.87821774847100e-07
+6861 6861 1.35061797798593e+01
+6861 5589 8.53127317558100e-08
+6861 5613 4.01865511835699e-03
+6861 5637 1.04998272549907e-01
+6861 5661 2.80488210935187e-01
+6861 5685 9.57663978761791e-02
+6861 5709 2.64740635360718e-03
+6861 5733 1.21535498385409e-05
+6861 6189 1.28308173330615e-04
+6861 6213 8.98139243420842e-02
+6861 6237 2.15151970522629e+00
+6861 6261 5.03563186199639e+00
+6861 6285 2.02226749522321e+00
+6861 6309 1.10241595057533e-01
+6861 6333 8.99998833830974e-05
+6861 6789 2.93336389137450e-04
+6861 6813 2.86213876935507e-01
+6861 6837 5.01444778180920e+00
+6861 6885 4.97708104918747e+00
+6861 6909 2.55684893376081e-01
+6861 6933 3.17936008973021e-04
+6861 7389 1.78814708764568e-04
+6861 7413 1.03347535291059e-01
+6861 7437 2.12534457488609e+00
+6861 7461 5.01207283480071e+00
+6861 7485 2.01957827044318e+00
+6861 7509 8.32621938773882e-02
+6861 7533 1.14629817987541e-04
+6861 7989 5.31858846635944e-06
+6861 8013 4.96671538245732e-03
+6861 8037 9.01462639339668e-02
+6861 8061 2.47676792294817e-01
+6861 8085 1.07567458814668e-01
+6861 8109 4.46279463381609e-03
+6861 8637 7.84494215473662e-05
+6861 8661 5.56335941560830e-04
+6861 8685 8.99998833830986e-05
+6861 8709 5.76185385784570e-06
+6861 17112 -2.02242391247020e-05
+6861 17136 -1.17815807475611e-03
+6861 17160 -4.92164144620354e-03
+6861 17184 -3.14675205445586e-03
+6861 17208 -5.12372734049640e-04
+6861 17496 -4.92803893296477e-04
+6861 17520 -2.95734225758219e-02
+6861 17544 -2.13828212972153e-01
+6861 17568 -4.78760119398734e-01
+6861 17592 -2.60977235824411e-01
+6861 17616 -4.04287971817127e-02
+6861 17640 -2.44302264716897e-04
+6861 17904 -5.17996492292174e-03
+6861 17928 -2.58902342369891e-01
+6861 17952 -1.71860913009061e+00
+6861 17976 -3.58766882084473e+00
+6861 18000 -1.99343558131644e+00
+6861 18024 -3.30604382240392e-01
+6861 18048 -5.97874547333352e-03
+6861 18312 -1.37345708174825e-02
+6861 18336 -6.56082329760212e-01
+6861 18360 -4.18131636633926e+00
+6861 18384 -8.39721704319996e+00
+6861 18408 -4.76234705419661e+00
+6861 18432 -8.36607401537234e-01
+6861 18456 -2.31392107675319e-02
+6861 18720 -4.83582745070658e-03
+6861 18744 -3.95378165876490e-01
+6861 18768 -2.69588979393633e+00
+6861 18792 -5.60361692656959e+00
+6861 18816 -3.12316738344963e+00
+6861 18840 -5.46152839053614e-01
+6861 18864 -1.65572343303867e-02
+6861 19128 -4.06769525242688e-04
+6861 19152 -7.37384779871934e-02
+6861 19176 -5.34791752860116e-01
+6861 19200 -1.14368139928720e+00
+6861 19224 -6.00080589743577e-01
+6861 19248 -9.93778601986994e-02
+6861 19272 -2.89134898941356e-03
+6861 19560 -2.69918411505053e-03
+6861 19584 -2.16163911218320e-02
+6861 19608 -4.78374423681392e-02
+6861 19632 -1.82588596240220e-02
+6861 19656 -1.86222575103139e-03
+6861 19680 -6.46536115564740e-07
+6862 6862 1.00000000000000e+00
+6863 6863 1.00000000000000e+00
+6864 6864 1.00000000000000e+00
+6865 6865 1.00000000000000e+00
+6866 6866 1.00000000000000e+00
+6867 6867 1.00000000000000e+00
+6868 6868 1.00000000000000e+00
+6869 6869 1.00000000000000e+00
+6870 6870 1.00000000000000e+00
+6871 6871 1.00000000000000e+00
+6872 6872 1.00000000000000e+00
+6873 6873 1.00000000000000e+00
+6874 6874 1.00000000000000e+00
+6875 6875 1.00000000000000e+00
+6876 6876 1.00000000000000e+00
+6877 6877 1.00000000000000e+00
+6878 6878 1.00000000000000e+00
+6879 6879 1.00000000000000e+00
+6880 6880 1.00000000000000e+00
+6881 6881 1.00000000000000e+00
+6882 6882 1.00000000000000e+00
+6883 6883 1.00000000000000e+00
+6884 6884 1.00000000000000e+00
+6885 5037 2.33359908483914e-06
+6885 5061 2.33697018029741e-04
+6885 5085 4.91919438840005e-04
+6885 5109 1.58758229703413e-05
+6885 5133 8.44175032531260e-07
+6885 6885 1.30625624573197e+01
+6885 5613 7.94031900597660e-07
+6885 5637 3.05267476070686e-03
+6885 5661 1.06392574754094e-01
+6885 5685 2.40930019848202e-01
+6885 5709 1.08772846312620e-01
+6885 5733 3.45602568546587e-03
+6885 5757 1.36098486988972e-06
+6885 6213 1.21338636937127e-04
+6885 6237 9.29174454274847e-02
+6885 6261 2.02145129931115e+00
+6885 6285 5.09616803122629e+00
+6885 6309 1.94522732471998e+00
+6885 6333 1.07567458814670e-01
+6885 6357 7.05197533765977e-05
+6885 6789 8.37030000000000e-16
+6885 6813 2.33536006397607e-04
+6885 6837 2.78473549213862e-01
+6885 6861 4.97708104918747e+00
+6885 6909 4.95787514450108e+00
+6885 6933 2.43852730636461e-01
+6885 6957 4.29967431666142e-04
+6885 7389 5.46280000000000e-16
+6885 7413 2.12636592359750e-04
+6885 7437 9.78293108358399e-02
+6885 7461 2.00834264652635e+00
+6885 7485 4.96244048857827e+00
+6885 7509 2.02259967515321e+00
+6885 7533 8.43200148895843e-02
+6885 7557 9.44854427779006e-05
+6885 8013 2.57973066677049e-06
+6885 8037 3.29078610576365e-03
+6885 8061 1.05200073412954e-01
+6885 8085 2.43852730636460e-01
+6885 8109 9.42274113557096e-02
+6885 8133 5.55556324055004e-03
+6885 8637 1.59094207830703e-06
+6885 8661 1.66984562117840e-05
+6885 8685 3.17936008973027e-04
+6885 8709 2.09858096953750e-04
+6885 8733 1.15867545269004e-06
+6885 16752 -1.22463021456102e-05
+6885 16776 -6.59348435444707e-05
+6885 16800 -8.00448419937305e-05
+6885 16824 -1.69496349620301e-05
+6885 17112 -9.82651904440210e-06
+6885 17136 -4.85672977793055e-03
+6885 17160 -5.25159046809858e-02
+6885 17184 -1.55713479595498e-01
+6885 17208 -1.05165732007160e-01
+6885 17232 -1.84595574985241e-02
+6885 17256 -1.27258756124396e-04
+6885 17520 -9.85286141680775e-04
+6885 17544 -9.46399802028858e-02
+6885 17568 -7.75414771434272e-01
+6885 17592 -1.96287925132751e+00
+6885 17616 -1.32125388491844e+00
+6885 17640 -2.53821298188305e-01
+6885 17664 -7.04436337218164e-03
+6885 17928 -4.15438031221892e-03
+6885 17952 -3.76017434900472e-01
+6885 17976 -2.88002145247029e+00
+6885 18000 -6.90984690437406e+00
+6885 18024 -4.66386840319997e+00
+6885 18048 -9.41744134857344e-01
+6885 18072 -3.60917035854071e-02
+6885 18336 -2.38851479682783e-03
+6885 18360 -3.63297660228323e-01
+6885 18384 -2.89436506660370e+00
+6885 18408 -7.08479211929128e+00
+6885 18432 -4.81535243342509e+00
+6885 18456 -1.00780222794440e+00
+6885 18480 -4.61905750663568e-02
+6885 18744 -3.60635957870881e-04
+6885 18768 -9.77203966759713e-02
+6885 18792 -8.34174209426216e-01
+6885 18816 -2.12020356069701e+00
+6885 18840 -1.37644441535068e+00
+6885 18864 -2.74213120676921e-01
+6885 18888 -1.12740152964936e-02
+6885 19152 -6.06677257560000e-10
+6885 19176 -6.88640208816345e-03
+6885 19200 -6.74916128452624e-02
+6885 19224 -1.83173325846020e-01
+6885 19248 -1.06320221811238e-01
+6885 19272 -1.79537556714430e-02
+6885 19296 -3.62720964486766e-04
+6885 19584 -8.91149563795797e-06
+6885 19608 -8.04923988436113e-05
+6885 19632 -1.88632296335792e-04
+6885 19656 -4.61869584146426e-05
+6885 19680 -3.35135530715780e-07
+6886 6886 1.00000000000000e+00
+6887 6887 1.00000000000000e+00
+6888 6888 1.00000000000000e+00
+6889 6889 1.00000000000000e+00
+6890 6890 1.00000000000000e+00
+6891 6891 1.00000000000000e+00
+6892 6892 1.00000000000000e+00
+6893 6893 1.00000000000000e+00
+6894 6894 1.00000000000000e+00
+6895 6895 1.00000000000000e+00
+6896 6896 1.00000000000000e+00
+6897 6897 1.00000000000000e+00
+6898 6898 1.00000000000000e+00
+6899 6899 1.00000000000000e+00
+6900 6900 1.00000000000000e+00
+6901 6901 1.00000000000000e+00
+6902 6902 1.00000000000000e+00
+6903 6903 1.00000000000000e+00
+6904 6904 1.00000000000000e+00
+6905 6905 1.00000000000000e+00
+6906 6906 1.00000000000000e+00
+6907 6907 1.00000000000000e+00
+6908 6908 1.00000000000000e+00
+6909 5061 6.86885643072792e-06
+6909 5085 7.84963079505855e-05
+6909 5109 3.84182544807877e-04
+6909 5133 1.15050029531138e-04
+6909 6909 1.30555747118988e+01
+6909 5637 1.89681802581380e-06
+6909 5661 2.37454150425827e-03
+6909 5685 1.11890756819089e-01
+6909 5709 2.51563538065896e-01
+6909 5733 8.52217717989005e-02
+6909 5757 5.38660454727590e-03
+6909 5781 1.37306196538331e-06
+6909 6237 6.59455841648084e-05
+6909 6261 1.05587349081563e-01
+6909 6285 1.94392165227318e+00
+6909 6309 4.98296884704721e+00
+6909 6333 2.01957827044320e+00
+6909 6357 1.04108481663570e-01
+6909 6381 1.06435412031522e-04
+6909 6813 1.87940000000000e-16
+6909 6837 2.49408950444565e-04
+6909 6861 2.55684893376081e-01
+6909 6885 4.95787514450108e+00
+6909 6933 4.96244048857830e+00
+6909 6957 2.35758953438193e-01
+6909 6981 5.57366312412018e-04
+6909 7413 2.84600000000000e-17
+6909 7437 2.09551952060577e-04
+6909 7461 9.76298792981398e-02
+6909 7485 2.01810107737033e+00
+6909 7509 4.82079811148037e+00
+6909 7533 2.01810107737034e+00
+6909 7557 9.82611695325452e-02
+6909 7581 3.31206932007269e-05
+6909 8037 6.71275600306681e-06
+6909 8061 3.20501286228353e-03
+6909 8085 8.43200148895841e-02
+6909 8109 2.72468734328648e-01
+6909 8133 9.42274113557098e-02
+6909 8157 4.46279463381606e-03
+6909 8181 9.31527367732900e-08
+6909 8661 3.53353347430300e-07
+6909 8685 1.14629817987545e-04
+6909 8709 2.30005939103824e-04
+6909 8733 1.99496121906751e-04
+6909 8757 7.26515781837250e-07
+6909 8781 3.51291980000000e-13
+6909 16752 -2.10501275725719e-04
+6909 16776 -7.22537427582622e-03
+6909 16800 -3.16680109148218e-02
+6909 16824 -3.01220400623413e-02
+6909 16848 -6.09418934663189e-03
+6909 16872 -4.25390998073086e-05
+6909 17136 -1.53172366412974e-04
+6909 17160 -2.93382054589836e-02
+6909 17184 -3.03095516402851e-01
+6909 17208 -9.24693753917579e-01
+6909 17232 -7.69802226468801e-01
+6909 17256 -1.69941020545760e-01
+6909 17280 -6.53347571849010e-03
+6909 17544 -8.00980653817310e-04
+6909 17568 -1.75026824014733e-01
+6909 17592 -1.66908141813580e+00
+6909 17616 -4.82545053729425e+00
+6909 17640 -3.94652603057979e+00
+6909 17664 -9.17064794435828e-01
+6909 17688 -4.68504653711725e-02
+6909 17712 -6.25027141297620e-07
+6909 17952 -9.06390528705473e-04
+6909 17976 -2.84162572146214e-01
+6909 18000 -2.67868645090644e+00
+6909 18024 -7.65930322967343e+00
+6909 18048 -6.27649976772462e+00
+6909 18072 -1.53990166618198e+00
+6909 18096 -9.59262161090050e-02
+6909 18120 -2.75579249208742e-06
+6909 18360 -1.88504826688788e-04
+6909 18384 -1.10295881093751e-01
+6909 18408 -1.14383406827339e+00
+6909 18432 -3.42674317775809e+00
+6909 18456 -2.72455878059633e+00
+6909 18480 -6.46991543310082e-01
+6909 18504 -3.79318522441511e-02
+6909 18528 -1.64776284888537e-06
+6909 18768 -5.34096308434300e-08
+6909 18792 -1.27531411453204e-02
+6909 18816 -1.52427932049991e-01
+6909 18840 -4.82708299194572e-01
+6909 18864 -3.62722235630271e-01
+6909 18888 -8.08640652260132e-02
+6909 18912 -4.14430081245736e-03
+6909 18936 -2.55683926896940e-07
+6909 19200 -1.03213653480996e-04
+6909 19224 -2.06384177255707e-03
+6909 19248 -7.05238029109584e-03
+6909 19272 -3.03185917096310e-03
+6909 19296 -3.45218003082504e-04
+6910 6910 1.00000000000000e+00
+6911 6911 1.00000000000000e+00
+6912 6912 1.00000000000000e+00
+6913 6913 1.00000000000000e+00
+6914 6914 1.00000000000000e+00
+6915 6915 1.00000000000000e+00
+6916 6916 1.00000000000000e+00
+6917 6917 1.00000000000000e+00
+6918 6918 1.00000000000000e+00
+6919 6919 1.00000000000000e+00
+6920 6920 1.00000000000000e+00
+6921 6921 1.00000000000000e+00
+6922 6922 1.00000000000000e+00
+6923 6923 1.00000000000000e+00
+6924 6924 1.00000000000000e+00
+6925 6925 1.00000000000000e+00
+6926 6926 1.00000000000000e+00
+6927 6927 1.00000000000000e+00
+6928 6928 1.00000000000000e+00
+6929 6929 1.00000000000000e+00
+6930 6930 1.00000000000000e+00
+6931 6931 1.00000000000000e+00
+6932 6932 1.00000000000000e+00
+6933 4509 5.46280000000000e-16
+6933 4533 8.37030000000000e-16
+6933 5085 2.57973066677054e-06
+6933 5109 2.12636592359754e-04
+6933 5133 2.33536006397605e-04
+6933 5157 1.21338636937123e-04
+6933 5181 7.94031900597660e-07
+6933 6933 1.30625624573197e+01
+6933 5661 1.59094207830700e-06
+6933 5685 3.29078610576372e-03
+6933 5709 9.78293108358415e-02
+6933 5733 2.78473549213861e-01
+6933 5757 9.29174454274840e-02
+6933 5781 3.05267476070688e-03
+6933 5805 2.33359908483912e-06
+6933 6261 1.66984562117837e-05
+6933 6285 1.05200073412956e-01
+6933 6309 2.00834264652637e+00
+6933 6333 4.97708104918746e+00
+6933 6357 2.02145129931113e+00
+6933 6381 1.06392574754093e-01
+6933 6405 2.33697018029735e-04
+6933 6861 3.17936008973021e-04
+6933 6885 2.43852730636461e-01
+6933 6909 4.96244048857830e+00
+6933 6957 5.09616803122628e+00
+6933 6981 2.40930019848205e-01
+6933 7005 4.91919438839994e-04
+6933 7461 2.09858096953741e-04
+6933 7485 9.42274113557097e-02
+6933 7509 2.02259967515323e+00
+6933 7533 4.95787514450105e+00
+6933 7557 1.94522732471997e+00
+6933 7581 1.08772846312623e-01
+6933 7605 1.58758229703415e-05
+6933 8061 1.15867545268999e-06
+6933 8085 5.55556324055003e-03
+6933 8109 8.43200148895844e-02
+6933 8133 2.43852730636458e-01
+6933 8157 1.07567458814667e-01
+6933 8181 3.45602568546578e-03
+6933 8205 8.44175032531270e-07
+6933 8709 9.44854427779014e-05
+6933 8733 4.29967431666146e-04
+6933 8757 7.05197533765987e-05
+6933 8781 1.36098486988972e-06
+6933 16368 -6.06677257560000e-10
+6933 16392 -3.60635957870867e-04
+6933 16416 -2.38851479682778e-03
+6933 16440 -4.15438031221894e-03
+6933 16464 -9.85286141680783e-04
+6933 16488 -9.82651904440186e-06
+6933 16752 -8.91149563795812e-06
+6933 16776 -6.88640208816359e-03
+6933 16800 -9.77203966759714e-02
+6933 16824 -3.63297660228320e-01
+6933 16848 -3.76017434900469e-01
+6933 16872 -9.46399802028848e-02
+6933 16896 -4.85672977793043e-03
+6933 17160 -8.04923988436111e-05
+6933 17184 -6.74916128452639e-02
+6933 17208 -8.34174209426219e-01
+6933 17232 -2.89436506660368e+00
+6933 17256 -2.88002145247027e+00
+6933 17280 -7.75414771434272e-01
+6933 17304 -5.25159046809868e-02
+6933 17328 -1.22463021456104e-05
+6933 17568 -1.88632296335788e-04
+6933 17592 -1.83173325846024e-01
+6933 17616 -2.12020356069703e+00
+6933 17640 -7.08479211929127e+00
+6933 17664 -6.90984690437403e+00
+6933 17688 -1.96287925132752e+00
+6933 17712 -1.55713479595503e-01
+6933 17736 -6.59348435444717e-05
+6933 17976 -4.61869584146417e-05
+6933 18000 -1.06320221811239e-01
+6933 18024 -1.37644441535069e+00
+6933 18048 -4.81535243342511e+00
+6933 18072 -4.66386840319994e+00
+6933 18096 -1.32125388491842e+00
+6933 18120 -1.05165732007158e-01
+6933 18144 -8.00448419937311e-05
+6933 18384 -3.35135530715780e-07
+6933 18408 -1.79537556714428e-02
+6933 18432 -2.74213120676922e-01
+6933 18456 -1.00780222794441e+00
+6933 18480 -9.41744134857338e-01
+6933 18504 -2.53821298188300e-01
+6933 18528 -1.84595574985232e-02
+6933 18552 -1.69496349620302e-05
+6933 18816 -3.62720964486749e-04
+6933 18840 -1.12740152964935e-02
+6933 18864 -4.61905750663568e-02
+6933 18888 -3.60917035854073e-02
+6933 18912 -7.04436337218170e-03
+6933 18936 -1.27258756124398e-04
+6934 6934 1.00000000000000e+00
+6935 6935 1.00000000000000e+00
+6936 6936 1.00000000000000e+00
+6937 6937 1.00000000000000e+00
+6938 6938 1.00000000000000e+00
+6939 6939 1.00000000000000e+00
+6940 6940 1.00000000000000e+00
+6941 6941 1.00000000000000e+00
+6942 6942 1.00000000000000e+00
+6943 6943 1.00000000000000e+00
+6944 6944 1.00000000000000e+00
+6945 6945 1.00000000000000e+00
+6946 6946 1.00000000000000e+00
+6947 6947 1.00000000000000e+00
+6948 6948 1.00000000000000e+00
+6949 6949 1.00000000000000e+00
+6950 6950 1.00000000000000e+00
+6951 6951 1.00000000000000e+00
+6952 6952 1.00000000000000e+00
+6953 6953 1.00000000000000e+00
+6954 6954 1.00000000000000e+00
+6955 6955 1.00000000000000e+00
+6956 6956 1.00000000000000e+00
+6957 4509 8.29700000000000e-17
+6957 4533 1.27120000000000e-16
+6957 5085 2.42173700000000e-14
+6957 5109 1.45607376990150e-07
+6957 5133 2.24058402351042e-04
+6957 5157 3.83618832664588e-04
+6957 5181 1.59114016612105e-05
+6957 5205 9.53315919924690e-07
+6957 6957 1.32034534890934e+01
+6957 5685 2.21431704970470e-07
+6957 5709 4.89545672319198e-03
+6957 5733 1.01104182244150e-01
+6957 5757 2.51306149652814e-01
+6957 5781 1.07044420043833e-01
+6957 5805 4.38303943466945e-03
+6957 5829 5.17030619608320e-07
+6957 6285 2.44191106880425e-05
+6957 6309 9.95804102733940e-02
+6957 6333 2.02226749522320e+00
+6957 6357 5.17337010637290e+00
+6957 6381 2.08683207293716e+00
+6957 6405 9.94207410797815e-02
+6957 6429 3.16588033027823e-04
+6957 6885 4.29967431666142e-04
+6957 6909 2.35758953438193e-01
+6957 6933 5.09616803122628e+00
+6957 6981 5.17540769465824e+00
+6957 7005 2.70682180385705e-01
+6957 7029 2.80445054406429e-04
+6957 7461 6.70440000000000e-16
+6957 7485 1.99496121906749e-04
+6957 7509 1.04203715562110e-01
+6957 7533 1.94392165227317e+00
+6957 7557 5.12142788929234e+00
+6957 7581 2.02653932949454e+00
+6957 7605 1.06063705484243e-01
+6957 7629 3.99813715338231e-05
+6957 8061 2.39720000000000e-16
+6957 8085 1.15867545269001e-06
+6957 8109 3.20501286228349e-03
+6957 8133 1.05200073412952e-01
+6957 8157 2.47676792294816e-01
+6957 8181 1.02519668862684e-01
+6957 8205 2.99554152661753e-03
+6957 8229 1.93816942058851e-06
+6957 8709 1.29402964269487e-06
+6957 8733 2.44191106880429e-05
+6957 8757 3.78755041462758e-04
+6957 8781 2.84168131865538e-04
+6957 8805 1.40034993139733e-06
+6957 16008 -6.50044912846570e-07
+6957 16032 -2.04089667481583e-05
+6957 16056 -7.26598831971766e-05
+6957 16080 -2.09075466857402e-05
+6957 16104 -7.74689897242060e-07
+6957 16368 -9.21392776400000e-11
+6957 16392 -6.52984975638891e-04
+6957 16416 -2.14258727932297e-02
+6957 16440 -1.06356067585759e-01
+6957 16464 -1.43215743617077e-01
+6957 16488 -4.08970490628926e-02
+6957 16512 -2.61242579381708e-03
+6957 16776 -2.63632843519916e-06
+6957 16800 -2.17405842911066e-02
+6957 16824 -3.62480097222250e-01
+6957 16848 -1.50118703445925e+00
+6957 16872 -1.83374722468623e+00
+6957 16896 -5.74376861200477e-01
+6957 16920 -4.94140797644584e-02
+6957 16944 -3.38155601221637e-05
+6957 17184 -1.09340842857506e-05
+6957 17208 -9.43825694898239e-02
+6957 17232 -1.41063348630124e+00
+6957 17256 -5.55216590365646e+00
+6957 17280 -6.53788922342876e+00
+6957 17304 -2.14744083978136e+00
+6957 17328 -2.06892058201996e-01
+6957 17352 -3.25705673696316e-04
+6957 17592 -4.19657041456257e-06
+6957 17616 -8.88788763992180e-02
+6957 17640 -1.43848699559362e+00
+6957 17664 -5.79840393114081e+00
+6957 17688 -6.82542888510088e+00
+6957 17712 -2.30931516770862e+00
+6957 17736 -2.35972834052837e-01
+6957 17760 -7.98683687606921e-04
+6957 18000 -3.90152634118490e-07
+6957 18024 -2.07758257319012e-02
+6957 18048 -4.15890163972253e-01
+6957 18072 -1.76536172072492e+00
+6957 18096 -2.04795403555766e+00
+6957 18120 -6.59599075902204e-01
+6957 18144 -6.23061972031647e-02
+6957 18168 -2.02821011824113e-04
+6957 18432 -8.90212526518244e-04
+6957 18456 -3.36791333816436e-02
+6957 18480 -1.56910533252352e-01
+6957 18504 -1.75776519637657e-01
+6957 18528 -4.94282254897317e-02
+6957 18552 -3.48186344649802e-03
+6957 18576 -3.09439465411297e-06
+6957 18840 -2.08894349837000e-09
+6957 18864 -5.94104233255159e-05
+6957 18888 -2.59752650159816e-04
+6957 18912 -1.47971231592433e-04
+6957 18936 -2.21422910102276e-05
+6958 6958 1.00000000000000e+00
+6959 6959 1.00000000000000e+00
+6960 6960 1.00000000000000e+00
+6961 6961 1.00000000000000e+00
+6962 6962 1.00000000000000e+00
+6963 6963 1.00000000000000e+00
+6964 6964 1.00000000000000e+00
+6965 6965 1.00000000000000e+00
+6966 6966 1.00000000000000e+00
+6967 6967 1.00000000000000e+00
+6968 6968 1.00000000000000e+00
+6969 6969 1.00000000000000e+00
+6970 6970 1.00000000000000e+00
+6971 6971 1.00000000000000e+00
+6972 6972 1.00000000000000e+00
+6973 6973 1.00000000000000e+00
+6974 6974 1.00000000000000e+00
+6975 6975 1.00000000000000e+00
+6976 6976 1.00000000000000e+00
+6977 6977 1.00000000000000e+00
+6978 6978 1.00000000000000e+00
+6979 6979 1.00000000000000e+00
+6980 6980 1.00000000000000e+00
+6981 5109 8.10624600000000e-14
+6981 5133 2.33286633743798e-06
+6981 5157 7.72839565029899e-05
+6981 5181 5.56133606008093e-04
+6981 5205 1.31358384121021e-04
+6981 6981 1.38340505320785e+01
+6981 5709 2.12450364950000e-10
+6981 5733 4.96537002526924e-03
+6981 5757 1.09974090606846e-01
+6981 5781 2.74627686916368e-01
+6981 5805 9.21548851110135e-02
+6981 5829 5.78011380667545e-03
+6981 5853 6.98380998805095e-06
+6981 6309 5.24284476533345e-05
+6981 6333 9.57663978761783e-02
+6981 6357 2.09507042579201e+00
+6981 6381 5.17797855006936e+00
+6981 6405 2.25780169589539e+00
+6981 6429 1.03986644421700e-01
+6981 6453 2.64738694593930e-04
+6981 6909 5.57366312412018e-04
+6981 6933 2.40930019848205e-01
+6981 6957 5.17540769465824e+00
+6981 7005 5.23127818559840e+00
+6981 7029 2.94052596094359e-01
+6981 7053 1.52045374293927e-04
+6981 7509 1.26060474670818e-04
+6981 7533 1.11890756819092e-01
+6981 7557 2.03413071720511e+00
+6981 7581 5.14992565412804e+00
+6981 7605 2.14309867129197e+00
+6981 7629 1.04894232584916e-01
+6981 7653 9.19256200499704e-05
+6981 8109 6.71275600306666e-06
+6981 8133 3.29078610576361e-03
+6981 8157 9.01462639339692e-02
+6981 8181 2.80952884632903e-01
+6981 8205 1.09523577382529e-01
+6981 8229 2.66749886865830e-03
+6981 8253 1.74930753381089e-06
+6981 8733 2.21431704970470e-07
+6981 8757 1.52487309262472e-04
+6981 8781 1.79724268891036e-04
+6981 8805 1.20323550370873e-04
+6981 8829 1.29078208718043e-05
+6981 16008 -2.45216359375897e-06
+6981 16032 -2.36917694260567e-03
+6981 16056 -1.82366467804074e-02
+6981 16080 -3.85963268737253e-02
+6981 16104 -1.29970123836128e-02
+6981 16128 -1.05007272993043e-03
+6981 16392 -7.91806544230000e-10
+6981 16416 -6.01949539313826e-03
+6981 16440 -1.34841749520496e-01
+6981 16464 -6.65735053161056e-01
+6981 16488 -1.01643732635630e+00
+6981 16512 -3.72818880152230e-01
+6981 16536 -3.91570541987390e-02
+6981 16560 -3.13185518468501e-05
+6981 16800 -3.72328364354000e-09
+6981 16824 -3.76488888679949e-02
+6981 16848 -7.80770559015156e-01
+6981 16872 -3.65852053446198e+00
+6981 16896 -5.25957862952256e+00
+6981 16920 -2.01599738264807e+00
+6981 16944 -2.32535662013764e-01
+6981 16968 -9.54445888291205e-04
+6981 17208 -3.01603641067000e-09
+6981 17232 -6.19881299017579e-02
+6981 17256 -1.30220261752319e+00
+6981 17280 -6.03043027825392e+00
+6981 17304 -8.46920094647183e+00
+6981 17328 -3.39171852619209e+00
+6981 17352 -4.23340971250773e-01
+6981 17376 -3.53912977336370e-03
+6981 17616 -5.56057466610000e-10
+6981 17640 -1.97985618629701e-02
+6981 17664 -5.54442084415409e-01
+6981 17688 -2.71989718090503e+00
+6981 17712 -3.84397367768766e+00
+6981 17736 -1.48988839847491e+00
+6981 17760 -1.78671550878463e-01
+6981 17784 -1.59366967251032e-03
+6981 18048 -1.54822597046121e-03
+6981 18072 -7.39127451111007e-02
+6981 18096 -3.86242857738437e-01
+6981 18120 -5.44017519973809e-01
+6981 18144 -1.98152836711840e-01
+6981 18168 -2.18011093323533e-02
+6981 18192 -1.91124497901628e-04
+6981 18456 -1.35451214863830e-07
+6981 18480 -1.21000740674980e-03
+6981 18504 -6.28028490483812e-03
+6981 18528 -6.99137529405218e-03
+6981 18552 -1.49333307771918e-03
+6981 18576 -1.27615079143267e-05
+6982 6982 1.00000000000000e+00
+6983 6983 1.00000000000000e+00
+6984 6984 1.00000000000000e+00
+6985 6985 1.00000000000000e+00
+6986 6986 1.00000000000000e+00
+6987 6987 1.00000000000000e+00
+6988 6988 1.00000000000000e+00
+6989 6989 1.00000000000000e+00
+6990 6990 1.00000000000000e+00
+6991 6991 1.00000000000000e+00
+6992 6992 1.00000000000000e+00
+6993 6993 1.00000000000000e+00
+6994 6994 1.00000000000000e+00
+6995 6995 1.00000000000000e+00
+6996 6996 1.00000000000000e+00
+6997 6997 1.00000000000000e+00
+6998 6998 1.00000000000000e+00
+6999 6999 1.00000000000000e+00
+7000 7000 1.00000000000000e+00
+7001 7001 1.00000000000000e+00
+7002 7002 1.00000000000000e+00
+7003 7003 1.00000000000000e+00
+7004 7004 1.00000000000000e+00
+7005 5157 7.46695746236279e-06
+7005 5181 2.62739118781434e-04
+7005 5205 1.66440736458125e-04
+7005 5229 1.09163930156518e-04
+7005 5253 1.82413221143836e-06
+7005 7005 1.43612580844073e+01
+7005 5757 5.24590795012676e-03
+7005 5781 1.06238221895664e-01
+7005 5805 3.12738875079129e-01
+7005 5829 1.12349617391643e-01
+7005 5853 3.14962360091581e-03
+7005 5877 1.78071334005424e-05
+7005 6333 1.17724328222052e-04
+7005 6357 8.59626371374431e-02
+7005 6381 2.25961989461759e+00
+7005 6405 5.42353049705159e+00
+7005 6429 2.31426725984316e+00
+7005 6453 1.30017308321321e-01
+7005 6477 1.53185448900642e-04
+7005 6933 4.91919438839994e-04
+7005 6957 2.70682180385705e-01
+7005 6981 5.23127818559840e+00
+7005 7029 5.58574866139339e+00
+7005 7053 3.25771669079221e-01
+7005 7077 2.31229553062048e-04
+7005 7533 7.84963079505863e-05
+7005 7557 1.09060475920186e-01
+7005 7581 2.15224436646042e+00
+7005 7605 5.50028633803769e+00
+7005 7629 2.28425795486038e+00
+7005 7653 1.04668459507657e-01
+7005 7677 1.93604114647185e-04
+7005 8133 2.57973066677058e-06
+7005 8157 4.96671538245737e-03
+7005 8181 9.81329879921907e-02
+7005 8205 2.67067283445568e-01
+7005 8229 1.32107227727701e-01
+7005 8253 4.53171246542376e-03
+7005 8277 2.46575223213160e-07
+7005 8733 2.42173700000000e-14
+7005 8757 5.23284682600000e-11
+7005 8781 6.03166389497422e-05
+7005 8805 6.20724038309046e-04
+7005 8829 1.44147466930790e-04
+7005 8853 9.75132400737259e-06
+7005 9429 4.40000000000000e-19
+7005 15648 -4.27068489809029e-05
+7005 15672 -1.17783345955640e-03
+7005 15696 -4.35560139697713e-03
+7005 15720 -2.14648723749308e-03
+7005 15744 -2.84870293465072e-04
+7005 16032 -1.06285179056377e-03
+7005 16056 -4.20474139306109e-02
+7005 16080 -2.53257024583947e-01
+7005 16104 -4.69701797998808e-01
+7005 16128 -2.12494015931442e-01
+7005 16152 -2.79573555867765e-02
+7005 16176 -2.30368090416415e-05
+7005 16440 -1.19319310724472e-02
+7005 16464 -3.78249300822861e-01
+7005 16488 -2.10508368685635e+00
+7005 16512 -3.64519484217998e+00
+7005 16536 -1.69477015015131e+00
+7005 16560 -2.38646796391967e-01
+7005 16584 -2.05883233787824e-03
+7005 16848 -3.37284796292217e-02
+7005 16872 -9.90842359720003e-01
+7005 16896 -5.31142189658318e+00
+7005 16920 -8.86448444529007e+00
+7005 16944 -4.23415220768883e+00
+7005 16968 -6.31129289373409e-01
+7005 16992 -9.62297346308554e-03
+7005 17256 -1.54562329970986e-02
+7005 17280 -6.40927707820464e-01
+7005 17304 -3.64136977461599e+00
+7005 17328 -6.23407982509971e+00
+7005 17352 -2.98627124706643e+00
+7005 17376 -4.52565793524380e-01
+7005 17400 -8.89962435477893e-03
+7005 17664 -1.94985337928620e-03
+7005 17688 -1.28438112447600e-01
+7005 17712 -7.66829074925678e-01
+7005 17736 -1.32965709172449e+00
+7005 17760 -6.02940997111874e-01
+7005 17784 -8.66559427129925e-02
+7005 17808 -1.73381330431116e-03
+7005 18072 -1.58029534922605e-06
+7005 18096 -5.56833331860751e-03
+7005 18120 -3.57113108533599e-02
+7005 18144 -6.10846835017315e-02
+7005 18168 -2.01656095848383e-02
+7005 18192 -1.67656038496184e-03
+7005 18216 -1.54264278491790e-07
+7005 18504 -1.78107971630000e-10
+7005 18528 -8.44638357170000e-10
+7005 18552 -7.06933854300000e-10
+7005 18576 -1.32206470670000e-10
+7006 7006 1.00000000000000e+00
+7007 7007 1.00000000000000e+00
+7008 7008 1.00000000000000e+00
+7009 7009 1.00000000000000e+00
+7010 7010 1.00000000000000e+00
+7011 7011 1.00000000000000e+00
+7012 7012 1.00000000000000e+00
+7013 7013 1.00000000000000e+00
+7014 7014 1.00000000000000e+00
+7015 7015 1.00000000000000e+00
+7016 7016 1.00000000000000e+00
+7017 7017 1.00000000000000e+00
+7018 7018 1.00000000000000e+00
+7019 7019 1.00000000000000e+00
+7020 7020 1.00000000000000e+00
+7021 7021 1.00000000000000e+00
+7022 7022 1.00000000000000e+00
+7023 7023 1.00000000000000e+00
+7024 7024 1.00000000000000e+00
+7025 7025 1.00000000000000e+00
+7026 7026 1.00000000000000e+00
+7027 7027 1.00000000000000e+00
+7028 7028 1.00000000000000e+00
+7029 5181 2.79430157966992e-06
+7029 5205 2.20082275981342e-04
+7029 5229 7.01342460993407e-04
+7029 5253 1.81715951490790e-05
+7029 5277 4.13083515611090e-07
+7029 7029 1.58390083592947e+01
+7029 5757 2.14304096016500e-08
+7029 5781 4.93536473027632e-03
+7029 5805 1.22356735855197e-01
+7029 5829 3.08047702966230e-01
+7029 5853 1.59134713973785e-01
+7029 5877 5.91766666038595e-03
+7029 5901 1.16629760528206e-06
+7029 6357 1.76641060064226e-04
+7029 6381 8.99707006266858e-02
+7029 6405 2.32069493927856e+00
+7029 6429 6.32140157665042e+00
+7029 6453 2.77392916116137e+00
+7029 6477 1.65476629083147e-01
+7029 6501 1.08990327590333e-04
+7029 6957 2.80445054406429e-04
+7029 6981 2.94052596094359e-01
+7029 7005 5.58574866139339e+00
+7029 7053 6.72471884021635e+00
+7029 7077 3.90074702897635e-01
+7029 7101 3.90821018534088e-04
+7029 7557 8.43467389934015e-05
+7029 7581 1.13586382165693e-01
+7029 7605 2.27567422516409e+00
+7029 7629 6.07253200657614e+00
+7029 7653 2.69560330541544e+00
+7029 7677 9.51566419060007e-02
+7029 7701 1.60494948635371e-04
+7029 8157 5.31858846635926e-06
+7029 8181 3.00569983360125e-03
+7029 8205 1.29265031934992e-01
+7029 8229 3.24085759625745e-01
+7029 8253 1.20597050544896e-01
+7029 8277 4.58947816494345e-03
+7029 8301 7.31269937100000e-11
+7029 8781 2.19066051226416e-06
+7029 8805 3.45354354387681e-05
+7029 8829 3.89714704487485e-04
+7029 8853 2.14991453078896e-04
+7029 8877 3.07268247464820e-06
+7029 9429 3.80000000000000e-19
+7029 15288 -4.23031447744470e-06
+7029 15312 -2.19178452599109e-05
+7029 15336 -2.42166638779730e-05
+7029 15360 -4.99658735013208e-06
+7029 15648 -3.48101433441648e-05
+7029 15672 -8.02865271787057e-03
+7029 15696 -7.55358123396634e-02
+7029 15720 -2.00180555053650e-01
+7029 15744 -1.10018885673374e-01
+7029 15768 -1.65362016833954e-02
+7029 15792 -4.61831190340905e-06
+7029 16056 -3.21498529089220e-03
+7029 16080 -1.55321867795444e-01
+7029 16104 -1.09956716241355e+00
+7029 16128 -2.47405737344558e+00
+7029 16152 -1.43097519682750e+00
+7029 16176 -2.34219438433409e-01
+7029 16200 -2.16046850008652e-03
+7029 16464 -1.42016680674158e-02
+7029 16488 -6.26267686291776e-01
+7029 16512 -4.10122884318582e+00
+7029 16536 -8.63045626787847e+00
+7029 16560 -5.11917555376173e+00
+7029 16584 -8.76028072878799e-01
+7029 16608 -1.29413237855627e-02
+7029 16872 -1.05393873554722e-02
+7029 16896 -6.39847535218470e-01
+7029 16920 -4.25765599427588e+00
+7029 16944 -8.88021871768787e+00
+7029 16968 -5.30453705292577e+00
+7029 16992 -9.36190402441613e-01
+7029 17016 -1.97720813716516e-02
+7029 17280 -1.89638474168433e-03
+7029 17304 -1.85449956010227e-01
+7029 17328 -1.30451795486918e+00
+7029 17352 -2.79102250318823e+00
+7029 17376 -1.59016329279607e+00
+7029 17400 -2.68460388411377e-01
+7029 17424 -4.98947752019868e-03
+7029 17688 -8.12642191870762e-06
+7029 17712 -1.51559787944263e-02
+7029 17736 -1.18129358804485e-01
+7029 17760 -2.65399292796337e-01
+7029 17784 -1.36848367689047e-01
+7029 17808 -2.03872129237756e-02
+7029 17832 -1.55188264107731e-04
+7029 18120 -3.89310030356533e-05
+7029 18144 -2.50664090970474e-04
+7029 18168 -4.18824570894592e-04
+7029 18192 -9.54730890178464e-05
+7029 18216 -1.33252547496470e-07
+7030 7030 1.00000000000000e+00
+7031 7031 1.00000000000000e+00
+7032 7032 1.00000000000000e+00
+7033 7033 1.00000000000000e+00
+7034 7034 1.00000000000000e+00
+7035 7035 1.00000000000000e+00
+7036 7036 1.00000000000000e+00
+7037 7037 1.00000000000000e+00
+7038 7038 1.00000000000000e+00
+7039 7039 1.00000000000000e+00
+7040 7040 1.00000000000000e+00
+7041 7041 1.00000000000000e+00
+7042 7042 1.00000000000000e+00
+7043 7043 1.00000000000000e+00
+7044 7044 1.00000000000000e+00
+7045 7045 1.00000000000000e+00
+7046 7046 1.00000000000000e+00
+7047 7047 1.00000000000000e+00
+7048 7048 1.00000000000000e+00
+7049 7049 1.00000000000000e+00
+7050 7050 1.00000000000000e+00
+7051 7051 1.00000000000000e+00
+7052 7052 1.00000000000000e+00
+7053 5205 1.53658882619257e-05
+7053 5229 9.87647472616876e-05
+7053 5253 3.23989771589693e-04
+7053 5277 1.28664970767149e-04
+7053 7053 1.81406348468673e+01
+7053 5781 8.42870972887730e-07
+7053 5805 3.35210990307854e-03
+7053 5829 1.63787166671296e-01
+7053 5853 3.88254869960634e-01
+7053 5877 1.15026971954086e-01
+7053 5901 4.32657486010460e-03
+7053 5925 4.55990495249544e-06
+7053 6381 1.33659463189935e-04
+7053 6405 1.17467751532462e-01
+7053 6429 2.77588105773608e+00
+7053 6453 7.60940118776601e+00
+7053 6477 2.68222047618868e+00
+7053 6501 1.09481969201774e-01
+7053 6525 3.30881342016362e-05
+7053 6981 1.52045374293927e-04
+7053 7005 3.25771669079221e-01
+7053 7029 6.72471884021635e+00
+7053 7077 5.96431524939501e+00
+7053 7101 2.98235611124602e-01
+7053 7125 5.18496828096280e-07
+7053 7581 1.86724261971480e-04
+7053 7605 1.19649369036844e-01
+7053 7629 2.67314736954824e+00
+7053 7653 6.00181058392055e+00
+7053 7677 2.68265796979807e+00
+7053 7701 5.66352263340678e-02
+7053 8181 1.40334369341952e-05
+7053 8205 4.53064416783995e-03
+7053 8229 1.03910226659848e-01
+7053 8253 3.37952987363564e-01
+7053 8277 1.36090564095546e-01
+7053 8301 1.76934258518450e-07
+7053 8805 1.66357890694850e-07
+7053 8829 1.14998784692895e-04
+7053 8853 1.84499564047511e-04
+7053 8877 6.61673559220372e-06
+7053 15288 -2.44065315422981e-04
+7053 15312 -8.02848167035954e-03
+7053 15336 -3.10803560498744e-02
+7053 15360 -1.75666651323257e-02
+7053 15384 -2.63702574884974e-03
+7053 15672 -7.09905820190994e-04
+7053 15696 -6.28594643042408e-02
+7053 15720 -5.38961450759771e-01
+7053 15744 -1.33316206270335e+00
+7053 15768 -6.38508544939169e-01
+7053 15792 -1.17498240106754e-01
+7053 16080 -4.05950296912952e-03
+7053 16104 -3.75923620321782e-01
+7053 16128 -3.06527398950036e+00
+7053 16152 -7.34164664187943e+00
+7053 16176 -3.72278010225788e+00
+7053 16200 -7.56106341981174e-01
+7053 16488 -5.60829570506782e-03
+7053 16512 -6.03687179371130e-01
+7053 16536 -4.89729124264450e+00
+7053 16560 -1.18093709731944e+01
+7053 16584 -6.68777816209331e+00
+7053 16608 -1.51207846681767e+00
+7053 16896 -1.29536421402410e-03
+7053 16920 -2.45488223812449e-01
+7053 16944 -2.11930396500521e+00
+7053 16968 -5.28864690628285e+00
+7053 16992 -2.99889266328810e+00
+7053 17016 -7.35724208401044e-01
+7053 17304 -1.88711314146376e-05
+7053 17328 -3.11108491462266e-02
+7053 17352 -2.92463126461177e-01
+7053 17376 -7.58041586363661e-01
+7053 17400 -4.08296859121547e-01
+7053 17424 -1.03422884076191e-01
+7053 17736 -4.73461040574706e-04
+7053 17760 -5.36026349040991e-03
+7053 17784 -1.45815447323941e-02
+7053 17808 -4.43604484561137e-03
+7053 17832 -2.42406379375070e-04
+7054 7054 1.00000000000000e+00
+7055 7055 1.00000000000000e+00
+7056 7056 1.00000000000000e+00
+7057 7057 1.00000000000000e+00
+7058 7058 1.00000000000000e+00
+7059 7059 1.00000000000000e+00
+7060 7060 1.00000000000000e+00
+7061 7061 1.00000000000000e+00
+7062 7062 1.00000000000000e+00
+7063 7063 1.00000000000000e+00
+7064 7064 1.00000000000000e+00
+7065 7065 1.00000000000000e+00
+7066 7066 1.00000000000000e+00
+7067 7067 1.00000000000000e+00
+7068 7068 1.00000000000000e+00
+7069 7069 1.00000000000000e+00
+7070 7070 1.00000000000000e+00
+7071 7071 1.00000000000000e+00
+7072 7072 1.00000000000000e+00
+7073 7073 1.00000000000000e+00
+7074 7074 1.00000000000000e+00
+7075 7075 1.00000000000000e+00
+7076 7076 1.00000000000000e+00
+7077 5229 5.17228162006526e-06
+7077 5253 2.39044322190822e-04
+7077 5277 1.95371943844946e-04
+7077 7077 2.74181977528594e+01
+7077 5805 3.03133255660095e-06
+7077 5829 3.82984705123423e-03
+7077 5853 1.37148490235058e-01
+7077 5877 2.82792704146786e-01
+7077 5901 1.45416647043232e-01
+7077 5925 2.79091754131930e-03
+7077 6405 7.51344158719148e-05
+7077 6429 1.58330381854054e-01
+7077 6453 2.64884504318029e+00
+7077 6477 7.14083795988902e+00
+7077 6501 4.49687532096013e+00
+7077 6525 3.06976858560474e-02
+7077 7005 2.31229553062048e-04
+7077 7029 3.90074702897635e-01
+7077 7053 5.96431524939501e+00
+7077 7101 9.52331039881157e+00
+7077 7125 1.07228177540032e-03
+7077 7605 3.60350842428249e-04
+7077 7629 1.10751375218820e-01
+7077 7653 3.14714061325168e+00
+7077 7677 9.78199297230561e+00
+7077 7701 9.54978556178062e-01
+7077 8205 1.89409891545966e-06
+7077 8229 5.34094459172518e-03
+7077 8253 2.50073467614373e-01
+7077 8277 2.74929435139304e-01
+7077 8301 1.47101733658939e-06
+7077 8805 2.19544460000000e-13
+7077 8829 1.50853894583000e-09
+7077 8853 6.16672890543108e-06
+7077 8877 4.17426610680285e-06
+7077 15288 -3.47011381079177e-05
+7077 15312 -1.25654930568490e-02
+7077 15336 -1.11494712416164e-01
+7077 15360 -4.98997919341120e-01
+7077 15384 -5.40869660850698e-01
+7077 15696 -7.25522370285950e-04
+7077 15720 -1.60508309066113e-01
+7077 15744 -1.13078752502031e+00
+7077 15768 -4.72007968522755e+00
+7077 15792 -5.62748706111411e+00
+7077 16104 -2.41565249248573e-03
+7077 16128 -5.04462076015971e-01
+7077 16152 -3.33774787695749e+00
+7077 16176 -1.32830061635961e+01
+7077 16200 -1.60834728731340e+01
+7077 16512 -7.23038149697049e-04
+7077 16536 -3.15687715384824e-01
+7077 16560 -2.41236416441370e+00
+7077 16584 -9.03319033806791e+00
+7077 16608 -9.31757742472469e+00
+7077 16920 -3.40800829606924e-05
+7077 16944 -5.81648819907573e-02
+7077 16968 -5.06189018822975e-01
+7077 16992 -1.99097178969357e+00
+7077 17016 -1.94760161133882e+00
+7077 17352 -1.81463814625538e-03
+7077 17376 -2.09752511183681e-02
+7077 17400 -1.16854240285127e-01
+7077 17424 -1.34062314544317e-01
+7077 17760 -1.96062915748000e-09
+7077 17784 -1.44727600551000e-08
+7077 17808 -2.84816028581600e-08
+7077 17832 -6.63024342517000e-09
+7078 7078 1.00000000000000e+00
+7079 7079 1.00000000000000e+00
+7080 7080 1.00000000000000e+00
+7081 7081 1.00000000000000e+00
+7082 7082 1.00000000000000e+00
+7083 7083 1.00000000000000e+00
+7084 7084 1.00000000000000e+00
+7085 7085 1.00000000000000e+00
+7086 7086 1.00000000000000e+00
+7087 7087 1.00000000000000e+00
+7088 7088 1.00000000000000e+00
+7089 7089 1.00000000000000e+00
+7090 7090 1.00000000000000e+00
+7091 7091 1.00000000000000e+00
+7092 7092 1.00000000000000e+00
+7093 7093 1.00000000000000e+00
+7094 7094 1.00000000000000e+00
+7095 7095 1.00000000000000e+00
+7096 7096 1.00000000000000e+00
+7097 7097 1.00000000000000e+00
+7098 7098 1.00000000000000e+00
+7099 7099 1.00000000000000e+00
+7100 7100 1.00000000000000e+00
+7101 5253 1.36192251944497e-06
+7101 5277 1.25052203376219e-06
+7101 7101 6.56924940955730e+00
+7101 5829 1.85443126627629e-06
+7101 5853 2.98352467610302e-03
+7101 5877 1.27181616251690e-01
+7101 5901 2.17844836818978e-01
+7101 5925 7.20909761037743e-03
+7101 6429 3.87416569810706e-05
+7101 6453 9.08790737019994e-02
+7101 6477 3.15491505639733e+00
+7101 6501 4.86555311739395e+00
+7101 6525 6.52632710066779e-02
+7101 7029 3.90821018534088e-04
+7101 7053 2.98235611124602e-01
+7101 7077 9.52331039881157e+00
+7101 7125 1.95729919479398e-03
+7101 7629 2.98307779105637e-04
+7101 7653 1.55044360737329e-01
+7101 7677 1.82785208832571e+00
+7101 7701 3.57682624143023e-01
+7101 8229 1.76345157057958e-06
+7101 8253 4.31692185634925e-03
+7101 8277 1.20671885798253e-02
+7101 8301 1.65206772175230e-07
+7101 8853 3.84760914064500e-08
+7101 8877 2.60784759250900e-08
+7101 15312 -8.02216756130956e-05
+7101 15336 -4.22648233034794e-02
+7101 15360 -6.43859071509886e-01
+7101 15384 -9.93950143461355e-01
+7101 15720 -3.56454239513509e-04
+7101 15744 -1.42656758267412e-01
+7101 15768 -3.05351420152953e+00
+7101 15792 -5.11769890541450e+00
+7101 16128 -2.24151561366785e-04
+7101 16152 -1.49049353647891e-01
+7101 16176 -4.43068966198729e+00
+7101 16200 -7.82386178903486e+00
+7101 16536 -3.60143894674450e-05
+7101 16560 -4.35226319330424e-02
+7101 16584 -1.30109975791997e+00
+7101 16608 -2.29847746643479e+00
+7101 16968 -3.42397024350178e-03
+7101 16992 -8.67773264820844e-02
+7101 17016 -1.49586861259656e-01
+7101 17376 -2.30239133829016e-06
+7101 17400 -3.88025594488432e-04
+7101 17424 -7.59934449608832e-04
+7102 7102 1.00000000000000e+00
+7103 7103 1.00000000000000e+00
+7104 7104 1.00000000000000e+00
+7105 7105 1.00000000000000e+00
+7106 7106 1.00000000000000e+00
+7107 7107 1.00000000000000e+00
+7108 7108 1.00000000000000e+00
+7109 7109 1.00000000000000e+00
+7110 7110 1.00000000000000e+00
+7111 7111 1.00000000000000e+00
+7112 7112 1.00000000000000e+00
+7113 7113 1.00000000000000e+00
+7114 7114 1.00000000000000e+00
+7115 7115 1.00000000000000e+00
+7116 7116 1.00000000000000e+00
+7117 7117 1.00000000000000e+00
+7118 7118 1.00000000000000e+00
+7119 7119 1.00000000000000e+00
+7120 7120 1.00000000000000e+00
+7121 7121 1.00000000000000e+00
+7122 7122 1.00000000000000e+00
+7123 7123 1.00000000000000e+00
+7124 7124 1.00000000000000e+00
+7125 7125 1.00000435929869e+00
+7125 5853 7.09230616116300e-07
+7125 5877 2.13706456323191e-04
+7125 5901 9.64122588329177e-04
+7125 5925 5.45386769826301e-05
+7125 6453 3.19208832744815e-06
+7125 6477 2.07534537618306e-03
+7125 6501 8.11544335798984e-03
+7125 6525 3.16146648534755e-04
+7125 7053 5.18496828096280e-07
+7125 7077 1.07228177540032e-03
+7125 7101 1.95729919479399e-03
+7125 7677 1.28205453431010e-07
+7125 7701 1.52197706490320e-07
+7125 15336 -4.97899102435202e-05
+7125 15360 -1.89434110109514e-03
+7125 15384 -3.44015283048563e-03
+7125 15744 -3.51333413334760e-05
+7125 15768 -2.70507787134003e-03
+7125 15792 -5.16422235334572e-03
+7125 16152 -2.92525320334740e-06
+7125 16176 -5.02259234512130e-04
+7125 16200 -9.84041696600829e-04
+7126 7126 1.00000000000000e+00
+7127 7127 1.00000000000000e+00
+7128 7128 1.00000000000000e+00
+7129 7129 1.00000000000000e+00
+7130 7130 1.00000000000000e+00
+7131 7131 1.00000000000000e+00
+7132 7132 1.00000000000000e+00
+7133 7133 1.00000000000000e+00
+7134 7134 1.00000000000000e+00
+7135 7135 1.00000000000000e+00
+7136 7136 1.00000000000000e+00
+7137 7137 1.00000000000000e+00
+7138 7138 1.00000000000000e+00
+7139 7139 1.00000000000000e+00
+7140 7140 1.00000000000000e+00
+7141 7141 1.00000000000000e+00
+7142 7142 1.00000000000000e+00
+7143 7143 1.00000000000000e+00
+7144 7144 1.00000000000000e+00
+7145 7145 1.00000000000000e+00
+7146 7146 1.00000000000000e+00
+7147 7147 1.00000000000000e+00
+7148 7148 1.00000000000000e+00
+7149 7149 1.00000000000000e+00
+7150 7150 1.00000000000000e+00
+7151 7151 1.00000000000000e+00
+7152 7152 1.00000000000000e+00
+7153 7153 1.00000000000000e+00
+7154 7154 1.00000000000000e+00
+7155 7155 1.00000000000000e+00
+7156 7156 1.00000000000000e+00
+7157 7157 1.00000000000000e+00
+7158 7158 1.00000000000000e+00
+7159 7159 1.00000000000000e+00
+7160 7160 1.00000000000000e+00
+7161 7161 1.00000000000000e+00
+7162 7162 1.00000000000000e+00
+7163 7163 1.00000000000000e+00
+7164 7164 1.00000000000000e+00
+7165 7165 1.00000000000000e+00
+7166 7166 1.00000000000000e+00
+7167 7167 1.00000000000000e+00
+7168 7168 1.00000000000000e+00
+7169 7169 1.00000000000000e+00
+7170 7170 1.00000000000000e+00
+7171 7171 1.00000000000000e+00
+7172 7172 1.00000000000000e+00
+7173 7173 1.00000000000000e+00
+7174 7174 1.00000000000000e+00
+7175 7175 1.00000000000000e+00
+7176 7176 1.00000000000000e+00
+7177 7177 1.00000000000000e+00
+7178 7178 1.00000000000000e+00
+7179 7179 1.00000000000000e+00
+7180 7180 1.00000000000000e+00
+7181 7181 1.00000000000000e+00
+7182 7182 1.00000000000000e+00
+7183 7183 1.00000000000000e+00
+7184 7184 1.00000000000000e+00
+7185 7185 1.00000000000000e+00
+7186 7186 1.00000000000000e+00
+7187 7187 1.00000000000000e+00
+7188 7188 1.00000000000000e+00
+7189 7189 1.00000000000000e+00
+7190 7190 1.00000000000000e+00
+7191 7191 1.00000000000000e+00
+7192 7192 1.00000000000000e+00
+7193 7193 1.00000000000000e+00
+7194 7194 1.00000000000000e+00
+7195 7195 1.00000000000000e+00
+7196 7196 1.00000000000000e+00
+7197 7197 1.00000000000000e+00
+7198 7198 1.00000000000000e+00
+7199 7199 1.00000000000000e+00
+7200 7200 1.00000000000000e+00
+7201 7201 1.00000000000000e+00
+7202 7202 1.00000000000000e+00
+7203 7203 1.00000000000000e+00
+7204 7204 1.00000000000000e+00
+7205 7205 1.00000000000000e+00
+7206 7206 1.00000000000000e+00
+7207 7207 1.00000000000000e+00
+7208 7208 1.00000000000000e+00
+7209 7209 1.00000000000000e+00
+7210 7210 1.00000000000000e+00
+7211 7211 1.00000000000000e+00
+7212 7212 1.00000000000000e+00
+7213 7213 1.00000000000000e+00
+7214 7214 1.00000000000000e+00
+7215 7215 1.00000000000000e+00
+7216 7216 1.00000000000000e+00
+7217 7217 1.00000000000000e+00
+7218 7218 1.00000000000000e+00
+7219 7219 1.00000000000000e+00
+7220 7220 1.00000000000000e+00
+7221 7221 1.00000000000000e+00
+7222 7222 1.00000000000000e+00
+7223 7223 1.00000000000000e+00
+7224 7224 1.00000000000000e+00
+7225 7225 1.00000000000000e+00
+7226 7226 1.00000000000000e+00
+7227 7227 1.00000000000000e+00
+7228 7228 1.00000000000000e+00
+7229 7229 1.00000000000000e+00
+7230 7230 1.00000000000000e+00
+7231 7231 1.00000000000000e+00
+7232 7232 1.00000000000000e+00
+7233 7233 1.00000000000000e+00
+7234 7234 1.00000000000000e+00
+7235 7235 1.00000000000000e+00
+7236 7236 1.00000000000000e+00
+7237 7237 1.00000000000000e+00
+7238 7238 1.00000000000000e+00
+7239 7239 1.00000000000000e+00
+7240 7240 1.00000000000000e+00
+7241 7241 1.00000000000000e+00
+7242 7242 1.00000000000000e+00
+7243 7243 1.00000000000000e+00
+7244 7244 1.00000000000000e+00
+7245 7245 1.00000000000000e+00
+7246 7246 1.00000000000000e+00
+7247 7247 1.00000000000000e+00
+7248 7248 1.00000000000000e+00
+7249 7249 1.00000000000000e+00
+7250 7250 1.00000000000000e+00
+7251 7251 1.00000000000000e+00
+7252 7252 1.00000000000000e+00
+7253 7253 1.00000000000000e+00
+7254 7254 1.00000000000000e+00
+7255 7255 1.00000000000000e+00
+7256 7256 1.00000000000000e+00
+7257 7257 1.00000000000000e+00
+7258 7258 1.00000000000000e+00
+7259 7259 1.00000000000000e+00
+7260 7260 1.00000000000000e+00
+7261 7261 1.00000000000000e+00
+7262 7262 1.00000000000000e+00
+7263 7263 1.00000000000000e+00
+7264 7264 1.00000000000000e+00
+7265 7265 1.00000000000000e+00
+7266 7266 1.00000000000000e+00
+7267 7267 1.00000000000000e+00
+7268 7268 1.00000000000000e+00
+7269 7269 1.00000000000000e+00
+7270 7270 1.00000000000000e+00
+7271 7271 1.00000000000000e+00
+7272 7272 1.00000000000000e+00
+7273 7273 1.00000000000000e+00
+7274 7274 1.00000000000000e+00
+7275 7275 1.00000000000000e+00
+7276 7276 1.00000000000000e+00
+7277 7277 1.00000000000000e+00
+7278 7278 1.00000000000000e+00
+7279 7279 1.00000000000000e+00
+7280 7280 1.00000000000000e+00
+7281 7281 1.00000000000000e+00
+7282 7282 1.00000000000000e+00
+7283 7283 1.00000000000000e+00
+7284 7284 1.00000000000000e+00
+7285 7285 1.00000000000000e+00
+7286 7286 1.00000000000000e+00
+7287 7287 1.00000000000000e+00
+7288 7288 1.00000000000000e+00
+7289 7289 1.00000000000000e+00
+7290 7290 1.00000000000000e+00
+7291 7291 1.00000000000000e+00
+7292 7292 1.00000000000000e+00
+7293 7293 1.00000000000000e+00
+7294 7294 1.00000000000000e+00
+7295 7295 1.00000000000000e+00
+7296 7296 1.00000000000000e+00
+7297 7297 1.00000000000000e+00
+7298 7298 1.00000000000000e+00
+7299 7299 1.00000000000000e+00
+7300 7300 1.00000000000000e+00
+7301 7301 1.00000000000000e+00
+7302 7302 1.00000000000000e+00
+7303 7303 1.00000000000000e+00
+7304 7304 1.00000000000000e+00
+7305 7305 1.00000000000000e+00
+7306 7306 1.00000000000000e+00
+7307 7307 1.00000000000000e+00
+7308 7308 1.00000000000000e+00
+7309 7309 1.00000000000000e+00
+7310 7310 1.00000000000000e+00
+7311 7311 1.00000000000000e+00
+7312 7312 1.00000000000000e+00
+7313 7313 1.00000000000000e+00
+7314 7314 1.00000000000000e+00
+7315 7315 1.00000000000000e+00
+7316 7316 1.00000000000000e+00
+7317 7317 1.05242261230147e+00
+7317 6141 1.47384460888300e-07
+7317 6165 2.17449701422410e-07
+7317 6717 1.23430727922280e-07
+7317 6741 1.38154135506727e-02
+7317 6765 8.35456992673660e-03
+7317 6789 9.01164771458647e-06
+7317 7341 5.82260908100774e-01
+7317 7365 9.79813381742695e-02
+7317 7389 1.51134942095427e-04
+7317 7893 1.52197706490310e-07
+7317 7917 3.57682624143009e-01
+7317 7941 9.54978556178021e-01
+7317 7965 5.66352263340650e-02
+7317 7989 1.60494948635362e-04
+7317 8493 4.09279816281544e-06
+7317 8517 7.50878594565614e-02
+7317 8541 1.02332936930000e-01
+7317 8565 2.93365015021248e-03
+7317 8589 2.08930460891820e-07
+7317 9093 3.38261348833630e-07
+7317 9117 1.01894477122349e-05
+7317 9141 1.74314569669890e-05
+7317 9165 5.17938663274502e-06
+7317 19488 -4.29215165363153e-03
+7317 19512 -2.18156224160914e-03
+7317 19536 -1.01389756552503e-05
+7317 19896 -1.22992818690725e-01
+7317 19920 -6.68357069655286e-02
+7317 19944 -1.52551360576176e-03
+7317 20304 -5.65787260988338e-01
+7317 20328 -3.07481855106383e-01
+7317 20352 -7.02520703206106e-03
+7317 20712 -6.58684771145486e-01
+7317 20736 -3.49593855422105e-01
+7317 20760 -5.78613424267481e-03
+7317 21120 -1.38468320828474e-01
+7317 21144 -7.30006766659686e-02
+7317 21168 -1.07614750049477e-03
+7317 21528 -6.75149496405286e-05
+7317 21552 -3.45539493907758e-05
+7317 21576 -2.27564163003280e-07
+7318 7318 1.00000000000000e+00
+7319 7319 1.00000000000000e+00
+7320 7320 1.00000000000000e+00
+7321 7321 1.00000000000000e+00
+7322 7322 1.00000000000000e+00
+7323 7323 1.00000000000000e+00
+7324 7324 1.00000000000000e+00
+7325 7325 1.00000000000000e+00
+7326 7326 1.00000000000000e+00
+7327 7327 1.00000000000000e+00
+7328 7328 1.00000000000000e+00
+7329 7329 1.00000000000000e+00
+7330 7330 1.00000000000000e+00
+7331 7331 1.00000000000000e+00
+7332 7332 1.00000000000000e+00
+7333 7333 1.00000000000000e+00
+7334 7334 1.00000000000000e+00
+7335 7335 1.00000000000000e+00
+7336 7336 1.00000000000000e+00
+7337 7337 1.00000000000000e+00
+7338 7338 1.00000000000000e+00
+7339 7339 1.00000000000000e+00
+7340 7340 1.00000000000000e+00
+7341 7341 2.13447489157978e+01
+7341 5565 2.00195419374265e-06
+7341 5589 1.18392864123253e-06
+7341 5613 1.81280000000000e-16
+7341 6141 1.55949680715277e-02
+7341 6165 1.33556506834830e-01
+7341 6189 8.70653938089619e-03
+7341 6213 6.93965276951370e-07
+7341 6717 4.40213679917620e-06
+7341 6741 4.34538569436148e+00
+7341 6765 5.44645677899677e+00
+7341 6789 1.18442951526061e-01
+7341 6813 6.44276186536662e-05
+7341 7317 5.82260908100774e-01
+7341 7365 1.12062297642625e+01
+7341 7389 2.61946729281430e-01
+7341 7413 4.72542549108692e-04
+7341 7893 1.28205453431010e-07
+7341 7917 1.82785208832565e+00
+7341 7941 9.78199297230528e+00
+7341 7965 2.68265796979796e+00
+7341 7989 9.51566419059959e-02
+7341 8013 1.93604114647191e-04
+7341 8493 3.44776521549160e-06
+7341 8517 2.76648894908246e-01
+7341 8541 4.95673214491788e-01
+7341 8565 1.04720627674968e-01
+7341 8589 7.20183881084083e-03
+7341 8613 2.19087640160000e-10
+7341 9093 2.84965056096460e-07
+7341 9117 8.82040844097349e-06
+7341 9141 2.53629710191410e-04
+7341 9165 2.94496133374696e-04
+7341 9189 7.44503075326058e-06
+7341 18672 -4.16008843137160e-05
+7341 18696 -2.89818847393736e-05
+7341 18720 -2.33755502357590e-06
+7341 19080 -1.98570423981029e-01
+7341 19104 -1.24352589445776e-01
+7341 19128 -7.17949674489160e-03
+7341 19152 -4.68162706606922e-06
+7341 19488 -3.71267255159004e+00
+7341 19512 -2.29622406868495e+00
+7341 19536 -1.34464897613045e-01
+7341 19560 -2.36456528890262e-03
+7341 19896 -1.38577901086794e+01
+7341 19920 -8.81234700362071e+00
+7341 19944 -5.98577294457393e-01
+7341 19968 -1.62745062553765e-02
+7341 20304 -1.13558941478981e+01
+7341 20328 -8.06189223988921e+00
+7341 20352 -7.93553797255175e-01
+7341 20376 -3.02687018809982e-02
+7341 20712 -3.99767481908075e+00
+7341 20736 -2.68385561620018e+00
+7341 20760 -2.26898724073111e-01
+7341 20784 -8.39440981508334e-03
+7341 21120 -5.03800392544239e-01
+7341 21144 -2.98294215297023e-01
+7341 21168 -1.46556642943469e-02
+7341 21192 -3.76985077331571e-04
+7341 21528 -5.68909072862892e-05
+7341 21552 -2.91886673369855e-05
+7341 21576 -2.12346769668840e-07
+7342 7342 1.00000000000000e+00
+7343 7343 1.00000000000000e+00
+7344 7344 1.00000000000000e+00
+7345 7345 1.00000000000000e+00
+7346 7346 1.00000000000000e+00
+7347 7347 1.00000000000000e+00
+7348 7348 1.00000000000000e+00
+7349 7349 1.00000000000000e+00
+7350 7350 1.00000000000000e+00
+7351 7351 1.00000000000000e+00
+7352 7352 1.00000000000000e+00
+7353 7353 1.00000000000000e+00
+7354 7354 1.00000000000000e+00
+7355 7355 1.00000000000000e+00
+7356 7356 1.00000000000000e+00
+7357 7357 1.00000000000000e+00
+7358 7358 1.00000000000000e+00
+7359 7359 1.00000000000000e+00
+7360 7360 1.00000000000000e+00
+7361 7361 1.00000000000000e+00
+7362 7362 1.00000000000000e+00
+7363 7363 1.00000000000000e+00
+7364 7364 1.00000000000000e+00
+7365 7365 1.79804363934441e+01
+7365 5565 2.73392609382702e-04
+7365 5589 2.02409678011765e-04
+7365 5613 3.96083470000000e-13
+7365 6141 3.70617261712402e-02
+7365 6165 4.11150698402188e-01
+7365 6189 1.01036021558391e-01
+7365 6213 5.85510262322284e-03
+7365 6237 8.73668005157809e-06
+7365 6717 1.86054858380128e-06
+7365 6741 3.62600246314900e+00
+7365 6765 8.40787723111205e+00
+7365 6789 2.20243939165181e+00
+7365 6813 1.48638855963737e-01
+7365 6837 1.17189641502779e-04
+7365 7317 9.79813381742695e-02
+7365 7341 1.12062297642625e+01
+7365 7389 6.03243372310644e+00
+7365 7413 3.28037469003477e-01
+7365 7437 6.35178349373469e-04
+7365 7917 1.55044360737320e-01
+7365 7941 3.14714061325150e+00
+7365 7965 6.00181058392055e+00
+7365 7989 2.69560330541537e+00
+7365 8013 1.04668459507657e-01
+7365 8037 9.19256200499704e-05
+7365 8517 7.50438699090499e-03
+7365 8541 9.86337930066167e-02
+7365 8565 3.83651946384808e-01
+7365 8589 1.38803384818398e-01
+7365 8613 5.70101788762022e-03
+7365 9117 4.80711473218400e-08
+7365 9141 1.55156966074483e-04
+7365 9165 4.30184941155473e-04
+7365 9189 2.12410211905863e-04
+7365 9213 6.81126937739475e-06
+7365 18672 -8.66206699074853e-03
+7365 18696 -2.67141945964826e-02
+7365 18720 -2.05626619650524e-02
+7365 18744 -3.81608675529018e-03
+7365 18768 -4.73650354579930e-07
+7365 19080 -5.86323053563021e-01
+7365 19104 -9.28686431603779e-01
+7365 19128 -6.43339735310626e-01
+7365 19152 -1.31722113288671e-01
+7365 19176 -1.98398564923313e-03
+7365 19488 -4.42153745514164e+00
+7365 19512 -5.85915587839813e+00
+7365 19536 -3.63348164739563e+00
+7365 19560 -7.70581711034168e-01
+7365 19584 -1.95621366677707e-02
+7365 19896 -9.81224485046657e+00
+7365 19920 -1.17788140657166e+01
+7365 19944 -6.52746285474585e+00
+7365 19968 -1.42191071427143e+00
+7365 19992 -5.17816687505490e-02
+7365 20304 -3.96155814643469e+00
+7365 20328 -5.66644235563031e+00
+7365 20352 -3.34211054867202e+00
+7365 20376 -7.08432062787719e-01
+7365 20400 -2.46988284185831e-02
+7365 20712 -4.83551374784479e-01
+7365 20736 -8.37895207133302e-01
+7365 20760 -5.12343280474946e-01
+7365 20784 -1.04269346786878e-01
+7365 20808 -3.26638239810655e-03
+7365 21120 -1.19215732302672e-02
+7365 21144 -1.53507695888778e-02
+7365 21168 -5.05501392377792e-03
+7365 21192 -6.38658904575269e-04
+7366 7366 1.00000000000000e+00
+7367 7367 1.00000000000000e+00
+7368 7368 1.00000000000000e+00
+7369 7369 1.00000000000000e+00
+7370 7370 1.00000000000000e+00
+7371 7371 1.00000000000000e+00
+7372 7372 1.00000000000000e+00
+7373 7373 1.00000000000000e+00
+7374 7374 1.00000000000000e+00
+7375 7375 1.00000000000000e+00
+7376 7376 1.00000000000000e+00
+7377 7377 1.00000000000000e+00
+7378 7378 1.00000000000000e+00
+7379 7379 1.00000000000000e+00
+7380 7380 1.00000000000000e+00
+7381 7381 1.00000000000000e+00
+7382 7382 1.00000000000000e+00
+7383 7383 1.00000000000000e+00
+7384 7384 1.00000000000000e+00
+7385 7385 1.00000000000000e+00
+7386 7386 1.00000000000000e+00
+7387 7387 1.00000000000000e+00
+7388 7388 1.00000000000000e+00
+7389 4965 4.86770000000000e-16
+7389 4989 1.43269000000000e-15
+7389 7389 1.66019127419812e+01
+7389 5565 2.27061860767543e-04
+7389 5589 2.83309791446211e-04
+7389 5613 1.16427669681290e-04
+7389 5637 1.67959048382320e-06
+7389 6141 1.60503283768703e-03
+7389 6165 1.01082040273076e-01
+7389 6189 3.38445502301248e-01
+7389 6213 1.33750852826007e-01
+7389 6237 2.88298668641225e-03
+7389 6261 4.70536121254536e-06
+7389 6285 8.29700000000000e-17
+7389 6717 9.32791876860000e-10
+7389 6741 8.90814666278415e-02
+7389 6765 2.14495058601446e+00
+7389 6789 6.56258203238990e+00
+7389 6813 2.44145806955094e+00
+7389 6837 1.24287728839427e-01
+7389 6861 1.78814708764568e-04
+7389 6885 5.46280000000000e-16
+7389 7317 1.51134942095427e-04
+7389 7341 2.61946729281430e-01
+7389 7365 6.03243372310644e+00
+7389 7413 6.05533313607153e+00
+7389 7437 2.61254999604072e-01
+7389 7461 5.34088471120026e-04
+7389 7917 2.98307779105620e-04
+7389 7941 1.10751375218813e-01
+7389 7965 2.67314736954827e+00
+7389 7989 6.07253200657607e+00
+7389 8013 2.28425795486038e+00
+7389 8037 1.04894232584914e-01
+7389 8061 3.99813715338226e-05
+7389 8517 1.13169651915072e-06
+7389 8541 7.60696239971752e-03
+7389 8565 1.29158141991547e-01
+7389 8589 2.91682199132936e-01
+7389 8613 1.17330424634126e-01
+7389 8637 5.39569286250715e-03
+7389 8661 2.29509986312700e-08
+7389 9117 8.34516350000000e-13
+7389 9141 1.80315251593800e-08
+7389 9165 7.38617469010401e-05
+7389 9189 6.38231870732993e-04
+7389 9213 9.68204573979322e-05
+7389 9237 4.10056075839960e-07
+7389 9261 1.11133603000000e-12
+7389 18264 -2.84904636177000e-09
+7389 18288 -3.11177468058388e-04
+7389 18312 -1.64331298995031e-03
+7389 18336 -1.90576692073226e-03
+7389 18360 -3.98715594254569e-04
+7389 18384 -1.74352105968200e-08
+7389 18672 -1.05376172650656e-02
+7389 18696 -1.30571047099532e-01
+7389 18720 -4.22827509282699e-01
+7389 18744 -2.97980555261437e-01
+7389 18768 -5.66160552656295e-02
+7389 18792 -1.25262710500993e-03
+7389 19080 -9.96338200064888e-02
+7389 19104 -1.16968533203042e+00
+7389 19128 -3.73623591502844e+00
+7389 19152 -2.64775831761194e+00
+7389 19176 -5.43816655026169e-01
+7389 19200 -2.16090931874467e-02
+7389 19224 -5.76558717979400e-08
+7389 19488 -2.75221263027280e-01
+7389 19512 -3.15212942479745e+00
+7389 19536 -1.00058294587789e+01
+7389 19560 -7.17876805185171e+00
+7389 19584 -1.56150964536205e+00
+7389 19608 -7.96429948358928e-02
+7389 19632 -3.91749617691150e-07
+7389 19896 -1.98215657855370e-01
+7389 19920 -2.34143120142435e+00
+7389 19944 -7.42284113932565e+00
+7389 19968 -5.34832249232644e+00
+7389 19992 -1.18550249725812e+00
+7389 20016 -6.46783074102998e-02
+7389 20040 -7.02160393795440e-07
+7389 20304 -4.16778281377548e-02
+7389 20328 -5.39531734989157e-01
+7389 20352 -1.74396899578497e+00
+7389 20376 -1.19479722097738e+00
+7389 20400 -2.51340603069217e-01
+7389 20424 -1.23920601170133e-02
+7389 20448 -1.61126130499370e-07
+7389 20712 -1.73196606922705e-03
+7389 20736 -3.12514410067259e-02
+7389 20760 -1.08175470687361e-01
+7389 20784 -6.10196194821581e-02
+7389 20808 -9.54620552641494e-03
+7389 20832 -9.92519568879595e-05
+7389 21120 -7.90465775745000e-09
+7389 21144 -1.26266347100430e-07
+7389 21168 -3.86495522040040e-07
+7389 21192 -9.46477160706500e-08
+7390 7390 1.00000000000000e+00
+7391 7391 1.00000000000000e+00
+7392 7392 1.00000000000000e+00
+7393 7393 1.00000000000000e+00
+7394 7394 1.00000000000000e+00
+7395 7395 1.00000000000000e+00
+7396 7396 1.00000000000000e+00
+7397 7397 1.00000000000000e+00
+7398 7398 1.00000000000000e+00
+7399 7399 1.00000000000000e+00
+7400 7400 1.00000000000000e+00
+7401 7401 1.00000000000000e+00
+7402 7402 1.00000000000000e+00
+7403 7403 1.00000000000000e+00
+7404 7404 1.00000000000000e+00
+7405 7405 1.00000000000000e+00
+7406 7406 1.00000000000000e+00
+7407 7407 1.00000000000000e+00
+7408 7408 1.00000000000000e+00
+7409 7409 1.00000000000000e+00
+7410 7410 1.00000000000000e+00
+7411 7411 1.00000000000000e+00
+7412 7412 1.00000000000000e+00
+7413 4965 1.82940000000000e-16
+7413 4989 5.38430000000000e-16
+7413 7413 1.44213860298005e+01
+7413 5565 1.44666009939139e-06
+7413 5589 2.51116470786617e-04
+7413 5613 5.43624149202169e-04
+7413 5637 3.05226841770275e-05
+7413 5661 1.84048516669520e-07
+7413 5685 8.10624600000000e-14
+7413 6141 1.32826164813375e-06
+7413 6165 4.31287933667568e-03
+7413 6189 1.41882974823338e-01
+7413 6213 2.77770045261548e-01
+7413 6237 1.08523138370516e-01
+7413 6261 5.11135706757781e-03
+7413 6285 1.45607376990150e-07
+7413 6309 1.86000000000000e-17
+7413 6741 2.27667645083755e-05
+7413 6765 1.46585707143297e-01
+7413 6789 2.43971202276567e+00
+7413 6813 5.76486307275872e+00
+7413 6837 2.13949290794893e+00
+7413 6861 1.03347535291059e-01
+7413 6885 2.12636592359750e-04
+7413 6909 2.84600000000000e-17
+7413 7341 4.72542549108692e-04
+7413 7365 3.28037469003477e-01
+7413 7389 6.05533313607153e+00
+7413 7437 5.35940821716833e+00
+7413 7461 2.50889615789969e-01
+7413 7485 3.84182544807869e-04
+7413 7941 3.60350842428261e-04
+7413 7965 1.19649369036845e-01
+7413 7989 2.27567422516408e+00
+7413 8013 5.50028633803761e+00
+7413 8037 2.14309867129194e+00
+7413 8061 1.06063705484242e-01
+7413 8085 1.58758229703411e-05
+7413 8541 2.13656657686150e-06
+7413 8565 3.37533779248327e-03
+7413 8589 1.13542902326335e-01
+7413 8613 2.82601434453938e-01
+7413 8637 1.00146710530683e-01
+7413 8661 4.42976897962898e-03
+7413 8685 7.87821774847090e-07
+7413 9165 2.33546346859166e-06
+7413 9189 4.76842667935607e-05
+7413 9213 2.74904578863928e-04
+7413 9237 3.16321383374554e-04
+7413 9261 4.62919780307250e-07
+7413 17904 -3.49414465273940e-07
+7413 17928 -3.41322157762283e-06
+7413 17952 -8.41167939047529e-06
+7413 17976 -2.01560395289946e-06
+7413 18000 -1.00590931000000e-11
+7413 18264 -1.07073187650000e-09
+7413 18288 -1.11687003265815e-03
+7413 18312 -2.33917155530072e-02
+7413 18336 -9.55746831137999e-02
+7413 18360 -9.45460057249810e-02
+7413 18384 -2.10748455066421e-02
+7413 18408 -5.78508518996021e-04
+7413 18672 -7.22152185415616e-05
+7413 18696 -4.73116659948555e-02
+7413 18720 -5.02981888970391e-01
+7413 18744 -1.58350204718119e+00
+7413 18768 -1.44359395821836e+00
+7413 18792 -3.57021004769816e-01
+7413 18816 -1.99554679510907e-02
+7413 18840 -4.19734577819630e-07
+7413 19080 -3.09682943183141e-04
+7413 19104 -2.23748796928774e-01
+7413 19128 -2.18514483610325e+00
+7413 19152 -6.49493602195014e+00
+7413 19176 -5.76875780633062e+00
+7413 19200 -1.49717127446901e+00
+7413 19224 -1.01039043382732e-01
+7413 19248 -1.54190474932792e-05
+7413 19488 -1.55563455594225e-04
+7413 19512 -2.52605295670648e-01
+7413 19536 -2.57969505935664e+00
+7413 19560 -7.84475762036908e+00
+7413 19584 -6.93663822977322e+00
+7413 19608 -1.86500071194450e+00
+7413 19632 -1.39874140180185e-01
+7413 19656 -5.60742176785086e-05
+7413 19896 -2.08381299950425e-05
+7413 19920 -7.02222855708134e-02
+7413 19944 -8.20278751359086e-01
+7413 19968 -2.65973954927666e+00
+7413 19992 -2.30331252695496e+00
+7413 20016 -5.92579518169752e-01
+7413 20040 -4.05088426167662e-02
+7413 20064 -1.65162946727460e-05
+7413 20328 -4.76276778342322e-03
+7413 20352 -7.51061278934850e-02
+7413 20376 -2.70400200659878e-01
+7413 20400 -2.24374614877639e-01
+7413 20424 -5.20208389584623e-02
+7413 20448 -2.65351095419149e-03
+7413 20472 -6.94046372686330e-07
+7413 20736 -5.59793347357087e-06
+7413 20760 -2.81280434771752e-04
+7413 20784 -1.08121285912413e-03
+7413 20808 -4.19129189440229e-04
+7413 20832 -4.00601221406902e-05
+7414 7414 1.00000000000000e+00
+7415 7415 1.00000000000000e+00
+7416 7416 1.00000000000000e+00
+7417 7417 1.00000000000000e+00
+7418 7418 1.00000000000000e+00
+7419 7419 1.00000000000000e+00
+7420 7420 1.00000000000000e+00
+7421 7421 1.00000000000000e+00
+7422 7422 1.00000000000000e+00
+7423 7423 1.00000000000000e+00
+7424 7424 1.00000000000000e+00
+7425 7425 1.00000000000000e+00
+7426 7426 1.00000000000000e+00
+7427 7427 1.00000000000000e+00
+7428 7428 1.00000000000000e+00
+7429 7429 1.00000000000000e+00
+7430 7430 1.00000000000000e+00
+7431 7431 1.00000000000000e+00
+7432 7432 1.00000000000000e+00
+7433 7433 1.00000000000000e+00
+7434 7434 1.00000000000000e+00
+7435 7435 1.00000000000000e+00
+7436 7436 1.00000000000000e+00
+7437 7437 1.36726238031769e+01
+7437 5589 1.01551698587118e-06
+7437 5613 8.34240246487315e-05
+7437 5637 3.76580666462597e-04
+7437 5661 1.56645013647059e-04
+7437 5685 2.12450364950000e-10
+7437 6165 5.63269850000800e-07
+7437 6189 4.30756462080162e-03
+7437 6213 1.14020590599326e-01
+7437 6237 2.81305087752587e-01
+7437 6261 8.13110836323444e-02
+7437 6285 4.89545672319201e-03
+7437 6309 4.07861261643046e-06
+7437 6765 1.97278770701292e-05
+7437 6789 1.19507368978332e-01
+7437 6813 2.13680044591841e+00
+7437 6837 5.12682007264057e+00
+7437 6861 2.12534457488609e+00
+7437 6885 9.78293108358399e-02
+7437 6909 2.09551952060577e-04
+7437 7365 6.35178349373469e-04
+7437 7389 2.61254999604072e-01
+7437 7413 5.35940821716833e+00
+7437 7461 5.11958293841724e+00
+7437 7485 2.51563538065903e-01
+7437 7509 2.87450017846340e-04
+7437 7965 1.86724261971479e-04
+7437 7989 1.13586382165691e-01
+7437 8013 2.15224436646039e+00
+7437 8037 5.14992565412800e+00
+7437 8061 2.02653932949459e+00
+7437 8085 1.08772846312633e-01
+7437 8109 3.31206932007268e-05
+7437 8565 2.40795486257655e-06
+7437 8589 4.70380571098790e-03
+7437 8613 8.63918164591289e-02
+7437 8637 2.82210798877978e-01
+7437 8661 1.07957058569068e-01
+7437 8685 2.64740635360737e-03
+7437 8709 2.00372158358373e-06
+7437 9189 1.51877667859400e-08
+7437 9213 1.76444125597537e-04
+7437 9237 2.80163312061426e-04
+7437 9261 7.71464689415058e-05
+7437 9285 5.53908622508739e-06
+7437 17904 -4.68288025480875e-06
+7437 17928 -1.95098127036782e-03
+7437 17952 -1.23074871066057e-02
+7437 17976 -2.04237157877317e-02
+7437 18000 -5.35878571918443e-03
+7437 18024 -1.96245122556974e-04
+7437 18288 -4.02905087151103e-06
+7437 18312 -1.06321116976907e-02
+7437 18336 -1.58796974729019e-01
+7437 18360 -6.27007469647809e-01
+7437 18384 -7.35882102626040e-01
+7437 18408 -2.12078387164958e-01
+7437 18432 -1.52511482932409e-02
+7437 18456 -1.21690419475120e-07
+7437 18696 -2.19376034812508e-05
+7437 18720 -7.41832630423710e-02
+7437 18744 -1.01903277723736e+00
+7437 18768 -3.82742487958769e+00
+7437 18792 -4.28272850225013e+00
+7437 18816 -1.29828131778270e+00
+7437 18840 -1.09225360996490e-01
+7437 18864 -9.56224454740975e-05
+7437 19104 -2.73146508523378e-05
+7437 19128 -1.44363945467564e-01
+7437 19152 -1.93483237870046e+00
+7437 19176 -7.13291989148037e+00
+7437 19200 -7.82063470981179e+00
+7437 19224 -2.48901865479237e+00
+7437 19248 -2.34465262564643e-01
+7437 19272 -4.24155580695294e-04
+7437 19512 -5.82139999520669e-06
+7437 19536 -5.91529245750109e-02
+7437 19560 -9.41794062802636e-01
+7437 19584 -3.67439368781381e+00
+7437 19608 -3.99347476231918e+00
+7437 19632 -1.24030980514069e+00
+7437 19656 -1.12540250718606e-01
+7437 19680 -2.69100304160322e-04
+7437 19944 -6.95654844075527e-03
+7437 19968 -1.43723768517551e-01
+7437 19992 -5.94848422720118e-01
+7437 20016 -6.28313393694458e-01
+7437 20040 -1.85183137996140e-01
+7437 20064 -1.53834825153154e-02
+7437 20088 -4.34911550910312e-05
+7437 20352 -2.65552428960317e-05
+7437 20376 -3.08070724295751e-03
+7437 20400 -1.39338207108137e-02
+7437 20424 -1.10223094013724e-02
+7437 20448 -2.05148678363387e-03
+7437 20472 -1.05416003024272e-05
+7438 7438 1.00000000000000e+00
+7439 7439 1.00000000000000e+00
+7440 7440 1.00000000000000e+00
+7441 7441 1.00000000000000e+00
+7442 7442 1.00000000000000e+00
+7443 7443 1.00000000000000e+00
+7444 7444 1.00000000000000e+00
+7445 7445 1.00000000000000e+00
+7446 7446 1.00000000000000e+00
+7447 7447 1.00000000000000e+00
+7448 7448 1.00000000000000e+00
+7449 7449 1.00000000000000e+00
+7450 7450 1.00000000000000e+00
+7451 7451 1.00000000000000e+00
+7452 7452 1.00000000000000e+00
+7453 7453 1.00000000000000e+00
+7454 7454 1.00000000000000e+00
+7455 7455 1.00000000000000e+00
+7456 7456 1.00000000000000e+00
+7457 7457 1.00000000000000e+00
+7458 7458 1.00000000000000e+00
+7459 7459 1.00000000000000e+00
+7460 7460 1.00000000000000e+00
+7461 7461 1.32156586210115e+01
+7461 5589 5.21894530000000e-13
+7461 5613 1.22408211906470e-06
+7461 5637 2.90316706081261e-04
+7461 5661 1.84292133188979e-04
+7461 5685 5.24284476533349e-05
+7461 5709 2.00372158358374e-06
+7461 6189 7.04711743687000e-09
+7461 6213 5.51968148406407e-03
+7461 6237 9.45590627379141e-02
+7461 6261 2.70606731348374e-01
+7461 6285 9.95804102733944e-02
+7461 6309 2.51568580534586e-03
+7461 6333 5.76185385784568e-06
+7461 6789 6.51738304218140e-05
+7461 6813 9.54297444868273e-02
+7461 6837 2.12226312376197e+00
+7461 6861 5.01207283480071e+00
+7461 6885 2.00834264652635e+00
+7461 6909 9.76298792981398e-02
+7461 6933 2.09858096953741e-04
+7461 6957 6.70440000000000e-16
+7461 7389 5.34088471120026e-04
+7461 7413 2.50889615789969e-01
+7461 7437 5.11958293841724e+00
+7461 7485 4.98296884704715e+00
+7461 7509 2.62012914802079e-01
+7461 7533 2.30005939103818e-04
+7461 7557 1.87511000000000e-15
+7461 7989 8.43467389933999e-05
+7461 8013 1.09060475920185e-01
+7461 8037 2.03413071720506e+00
+7461 8061 5.12142788929226e+00
+7461 8085 1.94522732471998e+00
+7461 8109 9.82611695325464e-02
+7461 8133 9.44854427779038e-05
+7461 8589 3.90695406012380e-07
+7461 8613 5.12001329153914e-03
+7461 8637 1.00625901988247e-01
+7461 8661 2.37311790284683e-01
+7461 8685 1.10241595057532e-01
+7461 8709 2.51568580534584e-03
+7461 8733 1.29402964269488e-06
+7461 9189 1.07492419000000e-12
+7461 9213 3.05027687506100e-08
+7461 9237 3.57994833680469e-05
+7461 9261 5.25146915451604e-04
+7461 9285 1.76905947185153e-04
+7461 9309 4.07861261643040e-06
+7461 9885 1.22830000000000e-16
+7461 9909 1.86000000000000e-17
+7461 17544 -2.95151509768486e-05
+7461 17568 -4.98462211108428e-04
+7461 17592 -1.58782338679894e-03
+7461 17616 -5.27208835272881e-04
+7461 17640 -3.67018070179620e-05
+7461 17904 -5.66768020861000e-09
+7461 17928 -1.55759882964494e-03
+7461 17952 -4.17062818071607e-02
+7461 17976 -2.08634239809661e-01
+7461 18000 -3.05397524757640e-01
+7461 18024 -1.02094554323801e-01
+7461 18048 -9.23046608098390e-03
+7461 18072 -5.84238235270000e-09
+7461 18312 -5.74695123481400e-08
+7461 18336 -2.25121796792210e-02
+7461 18360 -4.46824974409302e-01
+7461 18384 -2.02056147413531e+00
+7461 18408 -2.74137618073184e+00
+7461 18432 -9.74542059803753e-01
+7461 18456 -1.01881284312103e-01
+7461 18480 -2.61608722558192e-04
+7461 18720 -1.44862846263390e-07
+7461 18744 -7.39694930109536e-02
+7461 18768 -1.33991019064059e+00
+7461 18792 -5.80227885164784e+00
+7461 18816 -7.56571605479376e+00
+7461 18840 -2.80557560879685e+00
+7461 18864 -3.18730314473022e-01
+7461 18888 -1.43453473503941e-03
+7461 19128 -3.47987915137000e-08
+7461 19152 -4.55087334551140e-02
+7461 19176 -9.98666130461218e-01
+7461 19200 -4.54342432343407e+00
+7461 19224 -5.99220336649916e+00
+7461 19248 -2.23326814143203e+00
+7461 19272 -2.57273709859605e-01
+7461 19296 -1.81437017932958e-03
+7461 19560 -7.63644529673767e-03
+7461 19584 -2.24619371477821e-01
+7461 19608 -1.07520244867280e+00
+7461 19632 -1.41055889312212e+00
+7461 19656 -4.97254905233339e-01
+7461 19680 -5.29520423692178e-02
+7461 19704 -3.88327097074177e-04
+7461 19968 -8.79221394985284e-05
+7461 19992 -1.20177584135245e-02
+7461 20016 -6.33960961775753e-02
+7461 20040 -7.95778024835319e-02
+7461 20064 -2.19885461768131e-02
+7461 20088 -1.33629378071348e-03
+7461 20112 -3.49041330603600e-08
+7461 20400 -2.22255490871340e-07
+7461 20424 -9.73631128109090e-07
+7461 20448 -5.60692149366320e-07
+7461 20472 -8.46091646237500e-08
+7462 7462 1.00000000000000e+00
+7463 7463 1.00000000000000e+00
+7464 7464 1.00000000000000e+00
+7465 7465 1.00000000000000e+00
+7466 7466 1.00000000000000e+00
+7467 7467 1.00000000000000e+00
+7468 7468 1.00000000000000e+00
+7469 7469 1.00000000000000e+00
+7470 7470 1.00000000000000e+00
+7471 7471 1.00000000000000e+00
+7472 7472 1.00000000000000e+00
+7473 7473 1.00000000000000e+00
+7474 7474 1.00000000000000e+00
+7475 7475 1.00000000000000e+00
+7476 7476 1.00000000000000e+00
+7477 7477 1.00000000000000e+00
+7478 7478 1.00000000000000e+00
+7479 7479 1.00000000000000e+00
+7480 7480 1.00000000000000e+00
+7481 7481 1.00000000000000e+00
+7482 7482 1.00000000000000e+00
+7483 7483 1.00000000000000e+00
+7484 7484 1.00000000000000e+00
+7485 7485 1.30555747118988e+01
+7485 5637 1.37306196538332e-06
+7485 5661 1.06435412031523e-04
+7485 5685 5.57366312412021e-04
+7485 5709 3.31206932007271e-05
+7485 5733 9.31527367732900e-08
+7485 5757 3.51291980000000e-13
+7485 6237 5.38660454727592e-03
+7485 6261 1.04108481663571e-01
+7485 6285 2.35758953438194e-01
+7485 6309 9.82611695325461e-02
+7485 6333 4.46279463381609e-03
+7485 6357 7.26515781837240e-07
+7485 6813 1.15050029531136e-04
+7485 6837 8.52217717988993e-02
+7485 6861 2.01957827044318e+00
+7485 6885 4.96244048857827e+00
+7485 6909 2.01810107737033e+00
+7485 6933 9.42274113557097e-02
+7485 6957 1.99496121906749e-04
+7485 7413 3.84182544807869e-04
+7485 7437 2.51563538065903e-01
+7485 7461 4.98296884704715e+00
+7485 7509 4.82079811148042e+00
+7485 7533 2.72468734328648e-01
+7485 7557 2.30005939103819e-04
+7485 8013 7.84963079505842e-05
+7485 8037 1.11890756819090e-01
+7485 8061 1.94392165227317e+00
+7485 8085 4.95787514450112e+00
+7485 8109 2.01810107737038e+00
+7485 8133 8.43200148895854e-02
+7485 8157 1.14629817987543e-04
+7485 8613 6.86885643072780e-06
+7485 8637 2.37454150425827e-03
+7485 8661 1.05587349081562e-01
+7485 8685 2.55684893376080e-01
+7485 8709 9.76298792981412e-02
+7485 8733 3.20501286228352e-03
+7485 8757 3.53353347430290e-07
+7485 9237 1.89681802581380e-06
+7485 9261 6.59455841648086e-05
+7485 9285 2.49408950444562e-04
+7485 9309 2.09551952060575e-04
+7485 9333 6.71275600306683e-06
+7485 9885 1.87940000000000e-16
+7485 9909 2.84600000000000e-17
+7485 17184 -6.25027141297650e-07
+7485 17208 -2.75579249208753e-06
+7485 17232 -1.64776284888538e-06
+7485 17256 -2.55683926896930e-07
+7485 17544 -4.25390998073089e-05
+7485 17568 -6.53347571849014e-03
+7485 17592 -4.68504653711729e-02
+7485 17616 -9.59262161090060e-02
+7485 17640 -3.79318522441513e-02
+7485 17664 -4.14430081245733e-03
+7485 17952 -6.09418934663193e-03
+7485 17976 -1.69941020545760e-01
+7485 18000 -9.17064794435828e-01
+7485 18024 -1.53990166618198e+00
+7485 18048 -6.46991543310079e-01
+7485 18072 -8.08640652260130e-02
+7485 18096 -3.45218003082495e-04
+7485 18360 -3.01220400623413e-02
+7485 18384 -7.69802226468799e-01
+7485 18408 -3.94652603057977e+00
+7485 18432 -6.27649976772458e+00
+7485 18456 -2.72455878059634e+00
+7485 18480 -3.62722235630275e-01
+7485 18504 -3.03185917096305e-03
+7485 18768 -3.16680109148213e-02
+7485 18792 -9.24693753917562e-01
+7485 18816 -4.82545053729419e+00
+7485 18840 -7.65930322967344e+00
+7485 18864 -3.42674317775816e+00
+7485 18888 -4.82708299194590e-01
+7485 18912 -7.05238029109575e-03
+7485 19176 -7.22537427582608e-03
+7485 19200 -3.03095516402849e-01
+7485 19224 -1.66908141813579e+00
+7485 19248 -2.67868645090644e+00
+7485 19272 -1.14383406827340e+00
+7485 19296 -1.52427932049994e-01
+7485 19320 -2.06384177255705e-03
+7485 19584 -2.10501275725715e-04
+7485 19608 -2.93382054589841e-02
+7485 19632 -1.75026824014734e-01
+7485 19656 -2.84162572146212e-01
+7485 19680 -1.10295881093749e-01
+7485 19704 -1.27531411453202e-02
+7485 19728 -1.03213653480996e-04
+7485 20016 -1.53172366412971e-04
+7485 20040 -8.00980653817300e-04
+7485 20064 -9.06390528705472e-04
+7485 20088 -1.88504826688788e-04
+7485 20112 -5.34096308434300e-08
+7486 7486 1.00000000000000e+00
+7487 7487 1.00000000000000e+00
+7488 7488 1.00000000000000e+00
+7489 7489 1.00000000000000e+00
+7490 7490 1.00000000000000e+00
+7491 7491 1.00000000000000e+00
+7492 7492 1.00000000000000e+00
+7493 7493 1.00000000000000e+00
+7494 7494 1.00000000000000e+00
+7495 7495 1.00000000000000e+00
+7496 7496 1.00000000000000e+00
+7497 7497 1.00000000000000e+00
+7498 7498 1.00000000000000e+00
+7499 7499 1.00000000000000e+00
+7500 7500 1.00000000000000e+00
+7501 7501 1.00000000000000e+00
+7502 7502 1.00000000000000e+00
+7503 7503 1.00000000000000e+00
+7504 7504 1.00000000000000e+00
+7505 7505 1.00000000000000e+00
+7506 7506 1.00000000000000e+00
+7507 7507 1.00000000000000e+00
+7508 7508 1.00000000000000e+00
+7509 7509 1.31472905222685e+01
+7509 5661 1.13484136129365e-05
+7509 5685 1.26060474670819e-04
+7509 5709 2.87450017846346e-04
+7509 5733 1.11059283569016e-04
+7509 5757 3.82862373842000e-09
+7509 6237 3.82862373842000e-09
+7509 6261 3.85851679879770e-03
+7509 6285 1.04203715562111e-01
+7509 6309 2.62012914802079e-01
+7509 6333 8.32621938773885e-02
+7509 6357 3.85851679879768e-03
+7509 6381 1.13484136129364e-05
+7509 6837 1.11059283569015e-04
+7509 6861 8.32621938773882e-02
+7509 6885 2.02259967515321e+00
+7509 6909 4.82079811148037e+00
+7509 6933 2.02259967515323e+00
+7509 6957 1.04203715562110e-01
+7509 6981 1.26060474670818e-04
+7509 7437 2.87450017846340e-04
+7509 7461 2.62012914802079e-01
+7509 7485 4.82079811148042e+00
+7509 7533 4.82079811148048e+00
+7509 7557 2.62012914802081e-01
+7509 7581 2.87450017846335e-04
+7509 8037 1.26060474670818e-04
+7509 8061 1.04203715562112e-01
+7509 8085 2.02259967515333e+00
+7509 8109 4.82079811148057e+00
+7509 8133 2.02259967515330e+00
+7509 8157 8.32621938773911e-02
+7509 8181 1.11059283569015e-04
+7509 8637 1.13484136129364e-05
+7509 8661 3.85851679879765e-03
+7509 8685 8.32621938773912e-02
+7509 8709 2.62012914802083e-01
+7509 8733 1.04203715562111e-01
+7509 8757 3.85851679879775e-03
+7509 8781 3.82862373842000e-09
+7509 9261 3.82862373842000e-09
+7509 9285 1.11059283569014e-04
+7509 9309 2.87450017846340e-04
+7509 9333 1.26060474670821e-04
+7509 9357 1.13484136129366e-05
+7509 17184 -3.08191473876543e-04
+7509 17208 -5.17490449004992e-03
+7509 17232 -1.73529761959176e-02
+7509 17256 -9.04705997000787e-03
+7509 17280 -1.27623034386603e-03
+7509 17568 -1.27623034386604e-03
+7509 17592 -5.45870460972286e-02
+7509 17616 -3.57157477180801e-01
+7509 17640 -7.34647396722995e-01
+7509 17664 -3.71678060230641e-01
+7509 17688 -5.45870460972280e-02
+7509 17712 -3.08191473876528e-04
+7509 17976 -9.04705997000791e-03
+7509 18000 -3.71678060230642e-01
+7509 18024 -2.28807743415274e+00
+7509 18048 -4.42023205069238e+00
+7509 18072 -2.28807743415277e+00
+7509 18096 -3.57157477180807e-01
+7509 18120 -5.17490449004993e-03
+7509 18384 -1.73529761959176e-02
+7509 18408 -7.34647396722989e-01
+7509 18432 -4.42023205069236e+00
+7509 18456 -8.29821941083528e+00
+7509 18480 -4.42023205069251e+00
+7509 18504 -7.34647396723027e-01
+7509 18528 -1.73529761959179e-02
+7509 18792 -5.17490449004990e-03
+7509 18816 -3.57157477180800e-01
+7509 18840 -2.28807743415279e+00
+7509 18864 -4.42023205069257e+00
+7509 18888 -2.28807743415282e+00
+7509 18912 -3.71678060230651e-01
+7509 18936 -9.04705997000804e-03
+7509 19200 -3.08191473876535e-04
+7509 19224 -5.45870460972288e-02
+7509 19248 -3.71678060230656e-01
+7509 19272 -7.34647396723042e-01
+7509 19296 -3.57157477180811e-01
+7509 19320 -5.45870460972284e-02
+7509 19344 -1.27623034386605e-03
+7509 19632 -1.27623034386603e-03
+7509 19656 -9.04705997000780e-03
+7509 19680 -1.73529761959173e-02
+7509 19704 -5.17490449004984e-03
+7509 19728 -3.08191473876536e-04
+7510 7510 1.00000000000000e+00
+7511 7511 1.00000000000000e+00
+7512 7512 1.00000000000000e+00
+7513 7513 1.00000000000000e+00
+7514 7514 1.00000000000000e+00
+7515 7515 1.00000000000000e+00
+7516 7516 1.00000000000000e+00
+7517 7517 1.00000000000000e+00
+7518 7518 1.00000000000000e+00
+7519 7519 1.00000000000000e+00
+7520 7520 1.00000000000000e+00
+7521 7521 1.00000000000000e+00
+7522 7522 1.00000000000000e+00
+7523 7523 1.00000000000000e+00
+7524 7524 1.00000000000000e+00
+7525 7525 1.00000000000000e+00
+7526 7526 1.00000000000000e+00
+7527 7527 1.00000000000000e+00
+7528 7528 1.00000000000000e+00
+7529 7529 1.00000000000000e+00
+7530 7530 1.00000000000000e+00
+7531 7531 1.00000000000000e+00
+7532 7532 1.00000000000000e+00
+7533 5109 2.84600000000000e-17
+7533 5133 1.87940000000000e-16
+7533 7533 1.30555747118987e+01
+7533 5685 6.71275600306698e-06
+7533 5709 2.09551952060579e-04
+7533 5733 2.49408950444565e-04
+7533 5757 6.59455841648079e-05
+7533 5781 1.89681802581378e-06
+7533 6261 3.53353347430290e-07
+7533 6285 3.20501286228353e-03
+7533 6309 9.76298792981403e-02
+7533 6333 2.55684893376081e-01
+7533 6357 1.05587349081563e-01
+7533 6381 2.37454150425829e-03
+7533 6405 6.86885643072775e-06
+7533 6861 1.14629817987541e-04
+7533 6885 8.43200148895843e-02
+7533 6909 2.01810107737034e+00
+7533 6933 4.95787514450105e+00
+7533 6957 1.94392165227317e+00
+7533 6981 1.11890756819092e-01
+7533 7005 7.84963079505863e-05
+7533 7461 2.30005939103818e-04
+7533 7485 2.72468734328648e-01
+7533 7509 4.82079811148047e+00
+7533 7557 4.98296884704709e+00
+7533 7581 2.51563538065893e-01
+7533 7605 3.84182544807881e-04
+7533 8061 1.99496121906756e-04
+7533 8085 9.42274113557110e-02
+7533 8109 2.01810107737035e+00
+7533 8133 4.96244048857833e+00
+7533 8157 2.01957827044318e+00
+7533 8181 8.52217717988976e-02
+7533 8205 1.15050029531139e-04
+7533 8661 7.26515781837260e-07
+7533 8685 4.46279463381611e-03
+7533 8709 9.82611695325460e-02
+7533 8733 2.35758953438197e-01
+7533 8757 1.04108481663572e-01
+7533 8781 5.38660454727596e-03
+7533 9261 3.51291980000000e-13
+7533 9285 9.31527367732900e-08
+7533 9309 3.31206932007275e-05
+7533 9333 5.57366312412029e-04
+7533 9357 1.06435412031524e-04
+7533 9381 1.37306196538333e-06
+7533 16800 -5.34096308434300e-08
+7533 16824 -1.88504826688786e-04
+7533 16848 -9.06390528705463e-04
+7533 16872 -8.00980653817294e-04
+7533 16896 -1.53172366412970e-04
+7533 17184 -1.03213653480999e-04
+7533 17208 -1.27531411453204e-02
+7533 17232 -1.10295881093750e-01
+7533 17256 -2.84162572146213e-01
+7533 17280 -1.75026824014737e-01
+7533 17304 -2.93382054589848e-02
+7533 17328 -2.10501275725722e-04
+7533 17592 -2.06384177255707e-03
+7533 17616 -1.52427932049992e-01
+7533 17640 -1.14383406827339e+00
+7533 17664 -2.67868645090642e+00
+7533 17688 -1.66908141813578e+00
+7533 17712 -3.03095516402849e-01
+7533 17736 -7.22537427582627e-03
+7533 18000 -7.05238029109580e-03
+7533 18024 -4.82708299194577e-01
+7533 18048 -3.42674317775810e+00
+7533 18072 -7.65930322967335e+00
+7533 18096 -4.82545053729412e+00
+7533 18120 -9.24693753917552e-01
+7533 18144 -3.16680109148220e-02
+7533 18408 -3.03185917096303e-03
+7533 18432 -3.62722235630272e-01
+7533 18456 -2.72455878059634e+00
+7533 18480 -6.27649976772464e+00
+7533 18504 -3.94652603057980e+00
+7533 18528 -7.69802226468803e-01
+7533 18552 -3.01220400623416e-02
+7533 18816 -3.45218003082488e-04
+7533 18840 -8.08640652260136e-02
+7533 18864 -6.46991543310086e-01
+7533 18888 -1.53990166618200e+00
+7533 18912 -9.17064794435841e-01
+7533 18936 -1.69941020545763e-01
+7533 18960 -6.09418934663197e-03
+7533 19248 -4.14430081245748e-03
+7533 19272 -3.79318522441517e-02
+7533 19296 -9.59262161090056e-02
+7533 19320 -4.68504653711731e-02
+7533 19344 -6.53347571849024e-03
+7533 19368 -4.25390998073094e-05
+7533 19656 -2.55683926896930e-07
+7533 19680 -1.64776284888536e-06
+7533 19704 -2.75579249208747e-06
+7533 19728 -6.25027141297640e-07
+7534 7534 1.00000000000000e+00
+7535 7535 1.00000000000000e+00
+7536 7536 1.00000000000000e+00
+7537 7537 1.00000000000000e+00
+7538 7538 1.00000000000000e+00
+7539 7539 1.00000000000000e+00
+7540 7540 1.00000000000000e+00
+7541 7541 1.00000000000000e+00
+7542 7542 1.00000000000000e+00
+7543 7543 1.00000000000000e+00
+7544 7544 1.00000000000000e+00
+7545 7545 1.00000000000000e+00
+7546 7546 1.00000000000000e+00
+7547 7547 1.00000000000000e+00
+7548 7548 1.00000000000000e+00
+7549 7549 1.00000000000000e+00
+7550 7550 1.00000000000000e+00
+7551 7551 1.00000000000000e+00
+7552 7552 1.00000000000000e+00
+7553 7553 1.00000000000000e+00
+7554 7554 1.00000000000000e+00
+7555 7555 1.00000000000000e+00
+7556 7556 1.00000000000000e+00
+7557 5109 1.86000000000000e-17
+7557 5133 1.22830000000000e-16
+7557 7557 1.32156586210115e+01
+7557 5709 4.07861261643045e-06
+7557 5733 1.76905947185151e-04
+7557 5757 5.25146915451599e-04
+7557 5781 3.57994833680467e-05
+7557 5805 3.05027687506100e-08
+7557 5829 1.07492419000000e-12
+7557 6285 1.29402964269486e-06
+7557 6309 2.51568580534585e-03
+7557 6333 1.10241595057533e-01
+7557 6357 2.37311790284684e-01
+7557 6381 1.00625901988246e-01
+7557 6405 5.12001329153911e-03
+7557 6429 3.90695406012380e-07
+7557 6885 9.44854427779006e-05
+7557 6909 9.82611695325452e-02
+7557 6933 1.94522732471997e+00
+7557 6957 5.12142788929234e+00
+7557 6981 2.03413071720511e+00
+7557 7005 1.09060475920186e-01
+7557 7029 8.43467389934015e-05
+7557 7461 1.87511000000000e-15
+7557 7485 2.30005939103819e-04
+7557 7509 2.62012914802081e-01
+7557 7533 4.98296884704709e+00
+7557 7581 5.11958293841729e+00
+7557 7605 2.50889615789972e-01
+7557 7629 5.34088471120013e-04
+7557 8061 6.70440000000000e-16
+7557 8085 2.09858096953744e-04
+7557 8109 9.76298792981412e-02
+7557 8133 2.00834264652635e+00
+7557 8157 5.01207283480075e+00
+7557 8181 2.12226312376188e+00
+7557 8205 9.54297444868246e-02
+7557 8229 6.51738304218118e-05
+7557 8685 5.76185385784564e-06
+7557 8709 2.51568580534590e-03
+7557 8733 9.95804102733956e-02
+7557 8757 2.70606731348377e-01
+7557 8781 9.45590627379150e-02
+7557 8805 5.51968148406412e-03
+7557 8829 7.04711743687000e-09
+7557 9309 2.00372158358377e-06
+7557 9333 5.24284476533356e-05
+7557 9357 1.84292133188979e-04
+7557 9381 2.90316706081261e-04
+7557 9405 1.22408211906470e-06
+7557 9429 5.21894530000000e-13
+7557 16440 -8.46091646237400e-08
+7557 16464 -5.60692149366310e-07
+7557 16488 -9.73631128109080e-07
+7557 16512 -2.22255490871330e-07
+7557 16800 -3.49041330603600e-08
+7557 16824 -1.33629378071347e-03
+7557 16848 -2.19885461768129e-02
+7557 16872 -7.95778024835313e-02
+7557 16896 -6.33960961775749e-02
+7557 16920 -1.20177584135245e-02
+7557 16944 -8.79221394985312e-05
+7557 17208 -3.88327097074182e-04
+7557 17232 -5.29520423692178e-02
+7557 17256 -4.97254905233345e-01
+7557 17280 -1.41055889312214e+00
+7557 17304 -1.07520244867283e+00
+7557 17328 -2.24619371477825e-01
+7557 17352 -7.63644529673744e-03
+7557 17616 -1.81437017932960e-03
+7557 17640 -2.57273709859605e-01
+7557 17664 -2.23326814143205e+00
+7557 17688 -5.99220336649925e+00
+7557 17712 -4.54342432343419e+00
+7557 17736 -9.98666130461241e-01
+7557 17760 -4.55087334551132e-02
+7557 17784 -3.47987915136900e-08
+7557 18024 -1.43453473503938e-03
+7557 18048 -3.18730314473018e-01
+7557 18072 -2.80557560879681e+00
+7557 18096 -7.56571605479370e+00
+7557 18120 -5.80227885164792e+00
+7557 18144 -1.33991019064062e+00
+7557 18168 -7.39694930109539e-02
+7557 18192 -1.44862846263390e-07
+7557 18432 -2.61608722558182e-04
+7557 18456 -1.01881284312102e-01
+7557 18480 -9.74542059803748e-01
+7557 18504 -2.74137618073184e+00
+7557 18528 -2.02056147413533e+00
+7557 18552 -4.46824974409309e-01
+7557 18576 -2.25121796792212e-02
+7557 18600 -5.74695123481400e-08
+7557 18840 -5.84238235270000e-09
+7557 18864 -9.23046608098409e-03
+7557 18888 -1.02094554323802e-01
+7557 18912 -3.05397524757645e-01
+7557 18936 -2.08634239809663e-01
+7557 18960 -4.17062818071609e-02
+7557 18984 -1.55759882964493e-03
+7557 19008 -5.66768020861000e-09
+7557 19272 -3.67018070179617e-05
+7557 19296 -5.27208835272886e-04
+7557 19320 -1.58782338679897e-03
+7557 19344 -4.98462211108435e-04
+7557 19368 -2.95151509768490e-05
+7558 7558 1.00000000000000e+00
+7559 7559 1.00000000000000e+00
+7560 7560 1.00000000000000e+00
+7561 7561 1.00000000000000e+00
+7562 7562 1.00000000000000e+00
+7563 7563 1.00000000000000e+00
+7564 7564 1.00000000000000e+00
+7565 7565 1.00000000000000e+00
+7566 7566 1.00000000000000e+00
+7567 7567 1.00000000000000e+00
+7568 7568 1.00000000000000e+00
+7569 7569 1.00000000000000e+00
+7570 7570 1.00000000000000e+00
+7571 7571 1.00000000000000e+00
+7572 7572 1.00000000000000e+00
+7573 7573 1.00000000000000e+00
+7574 7574 1.00000000000000e+00
+7575 7575 1.00000000000000e+00
+7576 7576 1.00000000000000e+00
+7577 7577 1.00000000000000e+00
+7578 7578 1.00000000000000e+00
+7579 7579 1.00000000000000e+00
+7580 7580 1.00000000000000e+00
+7581 7581 1.36726238031770e+01
+7581 5733 5.53908622508734e-06
+7581 5757 7.71464689415051e-05
+7581 5781 2.80163312061428e-04
+7581 5805 1.76444125597537e-04
+7581 5829 1.51877667859400e-08
+7581 6309 2.00372158358373e-06
+7581 6333 2.64740635360721e-03
+7581 6357 1.07957058569066e-01
+7581 6381 2.82210798877977e-01
+7581 6405 8.63918164591287e-02
+7581 6429 4.70380571098784e-03
+7581 6453 2.40795486257654e-06
+7581 6909 3.31206932007269e-05
+7581 6933 1.08772846312623e-01
+7581 6957 2.02653932949454e+00
+7581 6981 5.14992565412804e+00
+7581 7005 2.15224436646042e+00
+7581 7029 1.13586382165693e-01
+7581 7053 1.86724261971480e-04
+7581 7509 2.87450017846335e-04
+7581 7533 2.51563538065893e-01
+7581 7557 5.11958293841729e+00
+7581 7605 5.35940821716831e+00
+7581 7629 2.61254999604079e-01
+7581 7653 6.35178349373470e-04
+7581 8109 2.09551952060577e-04
+7581 8133 9.78293108358406e-02
+7581 8157 2.12534457488613e+00
+7581 8181 5.12682007264041e+00
+7581 8205 2.13680044591831e+00
+7581 8229 1.19507368978339e-01
+7581 8253 1.97278770701271e-05
+7581 8709 4.07861261643052e-06
+7581 8733 4.89545672319204e-03
+7581 8757 8.13110836323451e-02
+7581 8781 2.81305087752589e-01
+7581 8805 1.14020590599322e-01
+7581 8829 4.30756462080172e-03
+7581 8853 5.63269850000800e-07
+7581 9333 2.12450364950000e-10
+7581 9357 1.56645013647059e-04
+7581 9381 3.76580666462597e-04
+7581 9405 8.34240246487300e-05
+7581 9429 1.01551698587119e-06
+7581 16440 -1.05416003024268e-05
+7581 16464 -2.05148678363386e-03
+7581 16488 -1.10223094013724e-02
+7581 16512 -1.39338207108135e-02
+7581 16536 -3.08070724295746e-03
+7581 16560 -2.65552428960317e-05
+7581 16824 -4.34911550910307e-05
+7581 16848 -1.53834825153153e-02
+7581 16872 -1.85183137996139e-01
+7581 16896 -6.28313393694458e-01
+7581 16920 -5.94848422720130e-01
+7581 16944 -1.43723768517554e-01
+7581 16968 -6.95654844075527e-03
+7581 17232 -2.69100304160320e-04
+7581 17256 -1.12540250718600e-01
+7581 17280 -1.24030980514067e+00
+7581 17304 -3.99347476231921e+00
+7581 17328 -3.67439368781383e+00
+7581 17352 -9.41794062802648e-01
+7581 17376 -5.91529245750130e-02
+7581 17400 -5.82139999520664e-06
+7581 17640 -4.24155580695295e-04
+7581 17664 -2.34465262564620e-01
+7581 17688 -2.48901865479233e+00
+7581 17712 -7.82063470981192e+00
+7581 17736 -7.13291989148029e+00
+7581 17760 -1.93483237870046e+00
+7581 17784 -1.44363945467572e-01
+7581 17808 -2.73146508523377e-05
+7581 18048 -9.56224454740977e-05
+7581 18072 -1.09225360996483e-01
+7581 18096 -1.29828131778270e+00
+7581 18120 -4.28272850225021e+00
+7581 18144 -3.82742487958770e+00
+7581 18168 -1.01903277723736e+00
+7581 18192 -7.41832630423723e-02
+7581 18216 -2.19376034812510e-05
+7581 18456 -1.21690419475120e-07
+7581 18480 -1.52511482932406e-02
+7581 18504 -2.12078387164960e-01
+7581 18528 -7.35882102626055e-01
+7581 18552 -6.27007469647816e-01
+7581 18576 -1.58796974729020e-01
+7581 18600 -1.06321116976905e-02
+7581 18624 -4.02905087151109e-06
+7581 18888 -1.96245122556977e-04
+7581 18912 -5.35878571918446e-03
+7581 18936 -2.04237157877318e-02
+7581 18960 -1.23074871066057e-02
+7581 18984 -1.95098127036781e-03
+7581 19008 -4.68288025480874e-06
+7582 7582 1.00000000000000e+00
+7583 7583 1.00000000000000e+00
+7584 7584 1.00000000000000e+00
+7585 7585 1.00000000000000e+00
+7586 7586 1.00000000000000e+00
+7587 7587 1.00000000000000e+00
+7588 7588 1.00000000000000e+00
+7589 7589 1.00000000000000e+00
+7590 7590 1.00000000000000e+00
+7591 7591 1.00000000000000e+00
+7592 7592 1.00000000000000e+00
+7593 7593 1.00000000000000e+00
+7594 7594 1.00000000000000e+00
+7595 7595 1.00000000000000e+00
+7596 7596 1.00000000000000e+00
+7597 7597 1.00000000000000e+00
+7598 7598 1.00000000000000e+00
+7599 7599 1.00000000000000e+00
+7600 7600 1.00000000000000e+00
+7601 7601 1.00000000000000e+00
+7602 7602 1.00000000000000e+00
+7603 7603 1.00000000000000e+00
+7604 7604 1.00000000000000e+00
+7605 7605 1.44213860298007e+01
+7605 5757 4.62919780307240e-07
+7605 5781 3.16321383374553e-04
+7605 5805 2.74904578863927e-04
+7605 5829 4.76842667935613e-05
+7605 5853 2.33546346859170e-06
+7605 6333 7.87821774847080e-07
+7605 6357 4.42976897962895e-03
+7605 6381 1.00146710530683e-01
+7605 6405 2.82601434453935e-01
+7605 6429 1.13542902326334e-01
+7605 6453 3.37533779248329e-03
+7605 6477 2.13656657686152e-06
+7605 6933 1.58758229703415e-05
+7605 6957 1.06063705484243e-01
+7605 6981 2.14309867129197e+00
+7605 7005 5.50028633803769e+00
+7605 7029 2.27567422516409e+00
+7605 7053 1.19649369036844e-01
+7605 7077 3.60350842428250e-04
+7605 7533 3.84182544807881e-04
+7605 7557 2.50889615789972e-01
+7605 7581 5.35940821716831e+00
+7605 7629 6.05533313607161e+00
+7605 7653 3.28037469003484e-01
+7605 7677 4.72542549108677e-04
+7605 8109 2.84600000000000e-17
+7605 8133 2.12636592359755e-04
+7605 8157 1.03347535291059e-01
+7605 8181 2.13949290794892e+00
+7605 8205 5.76486307275885e+00
+7605 8229 2.43971202276572e+00
+7605 8253 1.46585707143286e-01
+7605 8277 2.27667645083757e-05
+7605 8709 1.86000000000000e-17
+7605 8733 1.45607376990150e-07
+7605 8757 5.11135706757785e-03
+7605 8781 1.08523138370515e-01
+7605 8805 2.77770045261544e-01
+7605 8829 1.41882974823338e-01
+7605 8853 4.31287933667565e-03
+7605 8877 1.32826164813373e-06
+7605 9333 8.10624600000000e-14
+7605 9357 1.84048516669520e-07
+7605 9381 3.05226841770271e-05
+7605 9405 5.43624149202171e-04
+7605 9429 2.51116470786621e-04
+7605 9453 1.44666009939136e-06
+7605 10029 5.38430000000000e-16
+7605 10053 1.82940000000000e-16
+7605 16080 -4.00601221406906e-05
+7605 16104 -4.19129189440235e-04
+7605 16128 -1.08121285912415e-03
+7605 16152 -2.81280434771757e-04
+7605 16176 -5.59793347357092e-06
+7605 16440 -6.94046372686300e-07
+7605 16464 -2.65351095419148e-03
+7605 16488 -5.20208389584616e-02
+7605 16512 -2.24374614877637e-01
+7605 16536 -2.70400200659878e-01
+7605 16560 -7.51061278934845e-02
+7605 16584 -4.76276778342307e-03
+7605 16848 -1.65162946727458e-05
+7605 16872 -4.05088426167660e-02
+7605 16896 -5.92579518169758e-01
+7605 16920 -2.30331252695498e+00
+7605 16944 -2.65973954927667e+00
+7605 16968 -8.20278751359092e-01
+7605 16992 -7.02222855708147e-02
+7605 17016 -2.08381299950427e-05
+7605 17256 -5.60742176785082e-05
+7605 17280 -1.39874140180185e-01
+7605 17304 -1.86500071194453e+00
+7605 17328 -6.93663822977334e+00
+7605 17352 -7.84475762036918e+00
+7605 17376 -2.57969505935669e+00
+7605 17400 -2.52605295670655e-01
+7605 17424 -1.55563455594225e-04
+7605 17664 -1.54190474932791e-05
+7605 17688 -1.01039043382734e-01
+7605 17712 -1.49717127446900e+00
+7605 17736 -5.76875780633061e+00
+7605 17760 -6.49493602195037e+00
+7605 17784 -2.18514483610331e+00
+7605 17808 -2.23748796928774e-01
+7605 17832 -3.09682943183135e-04
+7605 18072 -4.19734577819640e-07
+7605 18096 -1.99554679510914e-02
+7605 18120 -3.57021004769812e-01
+7605 18144 -1.44359395821835e+00
+7605 18168 -1.58350204718124e+00
+7605 18192 -5.02981888970404e-01
+7605 18216 -4.73116659948551e-02
+7605 18240 -7.22152185415600e-05
+7605 18504 -5.78508518996036e-04
+7605 18528 -2.10748455066424e-02
+7605 18552 -9.45460057249813e-02
+7605 18576 -9.55746831137985e-02
+7605 18600 -2.33917155530069e-02
+7605 18624 -1.11687003265816e-03
+7605 18648 -1.07073187650000e-09
+7605 18912 -1.00590931000000e-11
+7605 18936 -2.01560395289946e-06
+7605 18960 -8.41167939047528e-06
+7605 18984 -3.41322157762282e-06
+7605 19008 -3.49414465273940e-07
+7606 7606 1.00000000000000e+00
+7607 7607 1.00000000000000e+00
+7608 7608 1.00000000000000e+00
+7609 7609 1.00000000000000e+00
+7610 7610 1.00000000000000e+00
+7611 7611 1.00000000000000e+00
+7612 7612 1.00000000000000e+00
+7613 7613 1.00000000000000e+00
+7614 7614 1.00000000000000e+00
+7615 7615 1.00000000000000e+00
+7616 7616 1.00000000000000e+00
+7617 7617 1.00000000000000e+00
+7618 7618 1.00000000000000e+00
+7619 7619 1.00000000000000e+00
+7620 7620 1.00000000000000e+00
+7621 7621 1.00000000000000e+00
+7622 7622 1.00000000000000e+00
+7623 7623 1.00000000000000e+00
+7624 7624 1.00000000000000e+00
+7625 7625 1.00000000000000e+00
+7626 7626 1.00000000000000e+00
+7627 7627 1.00000000000000e+00
+7628 7628 1.00000000000000e+00
+7629 7629 1.66019127419814e+01
+7629 5757 1.11133603000000e-12
+7629 5781 4.10056075839960e-07
+7629 5805 9.68204573979332e-05
+7629 5829 6.38231870733005e-04
+7629 5853 7.38617469010416e-05
+7629 5877 1.80315251593800e-08
+7629 5901 8.34516350000000e-13
+7629 6357 2.29509986312700e-08
+7629 6381 5.39569286250711e-03
+7629 6405 1.17330424634126e-01
+7629 6429 2.91682199132938e-01
+7629 6453 1.29158141991548e-01
+7629 6477 7.60696239971761e-03
+7629 6501 1.13169651915079e-06
+7629 6957 3.99813715338231e-05
+7629 6981 1.04894232584916e-01
+7629 7005 2.28425795486038e+00
+7629 7029 6.07253200657614e+00
+7629 7053 2.67314736954824e+00
+7629 7077 1.10751375218820e-01
+7629 7101 2.98307779105637e-04
+7629 7557 5.34088471120013e-04
+7629 7581 2.61254999604079e-01
+7629 7605 6.05533313607161e+00
+7629 7653 6.03243372310656e+00
+7629 7677 2.61946729281471e-01
+7629 7701 1.51134942095439e-04
+7629 8133 5.46280000000000e-16
+7629 8157 1.78814708764562e-04
+7629 8181 1.24287728839433e-01
+7629 8205 2.44145806955100e+00
+7629 8229 6.56258203239002e+00
+7629 8253 2.14495058601448e+00
+7629 8277 8.90814666278486e-02
+7629 8301 9.32791876860000e-10
+7629 8733 8.29700000000000e-17
+7629 8757 4.70536121254527e-06
+7629 8781 2.88298668641229e-03
+7629 8805 1.33750852826007e-01
+7629 8829 3.38445502301245e-01
+7629 8853 1.01082040273075e-01
+7629 8877 1.60503283768704e-03
+7629 9381 1.67959048382321e-06
+7629 9405 1.16427669681291e-04
+7629 9429 2.83309791446209e-04
+7629 9453 2.27061860767540e-04
+7629 10029 1.43269000000000e-15
+7629 10053 4.86770000000000e-16
+7629 15720 -9.46477160706600e-08
+7629 15744 -3.86495522040070e-07
+7629 15768 -1.26266347100440e-07
+7629 15792 -7.90465775745000e-09
+7629 16080 -9.92519568879605e-05
+7629 16104 -9.54620552641513e-03
+7629 16128 -6.10196194821591e-02
+7629 16152 -1.08175470687362e-01
+7629 16176 -3.12514410067265e-02
+7629 16200 -1.73196606922714e-03
+7629 16464 -1.61126130499370e-07
+7629 16488 -1.23920601170131e-02
+7629 16512 -2.51340603069217e-01
+7629 16536 -1.19479722097737e+00
+7629 16560 -1.74396899578495e+00
+7629 16584 -5.39531734989179e-01
+7629 16608 -4.16778281377626e-02
+7629 16872 -7.02160393795440e-07
+7629 16896 -6.46783074102996e-02
+7629 16920 -1.18550249725812e+00
+7629 16944 -5.34832249232643e+00
+7629 16968 -7.42284113932560e+00
+7629 16992 -2.34143120142445e+00
+7629 17016 -1.98215657855400e-01
+7629 17280 -3.91749617691150e-07
+7629 17304 -7.96429948358947e-02
+7629 17328 -1.56150964536206e+00
+7629 17352 -7.17876805185179e+00
+7629 17376 -1.00058294587791e+01
+7629 17400 -3.15212942479755e+00
+7629 17424 -2.75221263027290e-01
+7629 17688 -5.76558717979400e-08
+7629 17712 -2.16090931874471e-02
+7629 17736 -5.43816655026184e-01
+7629 17760 -2.64775831761201e+00
+7629 17784 -3.73623591502851e+00
+7629 17808 -1.16968533203044e+00
+7629 17832 -9.96338200064888e-02
+7629 18120 -1.25262710500989e-03
+7629 18144 -5.66160552656326e-02
+7629 18168 -2.97980555261449e-01
+7629 18192 -4.22827509282699e-01
+7629 18216 -1.30571047099530e-01
+7629 18240 -1.05376172650654e-02
+7629 18528 -1.74352105968200e-08
+7629 18552 -3.98715594254561e-04
+7629 18576 -1.90576692073224e-03
+7629 18600 -1.64331298995032e-03
+7629 18624 -3.11177468058393e-04
+7629 18648 -2.84904636177000e-09
+7630 7630 1.00000000000000e+00
+7631 7631 1.00000000000000e+00
+7632 7632 1.00000000000000e+00
+7633 7633 1.00000000000000e+00
+7634 7634 1.00000000000000e+00
+7635 7635 1.00000000000000e+00
+7636 7636 1.00000000000000e+00
+7637 7637 1.00000000000000e+00
+7638 7638 1.00000000000000e+00
+7639 7639 1.00000000000000e+00
+7640 7640 1.00000000000000e+00
+7641 7641 1.00000000000000e+00
+7642 7642 1.00000000000000e+00
+7643 7643 1.00000000000000e+00
+7644 7644 1.00000000000000e+00
+7645 7645 1.00000000000000e+00
+7646 7646 1.00000000000000e+00
+7647 7647 1.00000000000000e+00
+7648 7648 1.00000000000000e+00
+7649 7649 1.00000000000000e+00
+7650 7650 1.00000000000000e+00
+7651 7651 1.00000000000000e+00
+7652 7652 1.00000000000000e+00
+7653 7653 1.79804363934452e+01
+7653 5805 6.81126937739488e-06
+7653 5829 2.12410211905647e-04
+7653 5853 4.30184941148632e-04
+7653 5877 1.55156966072372e-04
+7653 5901 4.80711473217600e-08
+7653 6405 5.70101788762027e-03
+7653 6429 1.38803384818389e-01
+7653 6453 3.83651946384642e-01
+7653 6477 9.86337930065506e-02
+7653 6501 7.50438699090512e-03
+7653 6981 9.19256200499704e-05
+7653 7005 1.04668459507657e-01
+7653 7029 2.69560330541544e+00
+7653 7053 6.00181058392055e+00
+7653 7077 3.14714061325168e+00
+7653 7101 1.55044360737329e-01
+7653 7581 6.35178349373470e-04
+7653 7605 3.28037469003484e-01
+7653 7629 6.03243372310656e+00
+7653 7677 1.12062297642634e+01
+7653 7701 9.79813381742757e-02
+7653 8181 1.17189641502778e-04
+7653 8205 1.48638855963741e-01
+7653 8229 2.20243939165186e+00
+7653 8253 8.40787723111244e+00
+7653 8277 3.62600246314926e+00
+7653 8301 1.86054858380149e-06
+7653 8781 8.73668005157801e-06
+7653 8805 5.85510262322277e-03
+7653 8829 1.01036021558391e-01
+7653 8853 4.11150698402194e-01
+7653 8877 3.70617261712408e-02
+7653 9405 3.96083470000000e-13
+7653 9429 2.02409678011768e-04
+7653 9453 2.73392609382709e-04
+7653 15720 -6.38658904564122e-04
+7653 15744 -5.05501392373332e-03
+7653 15768 -1.53507695888668e-02
+7653 15792 -1.19215732302675e-02
+7653 16104 -3.26638239810661e-03
+7653 16128 -1.04269346786835e-01
+7653 16152 -5.12343280474778e-01
+7653 16176 -8.37895207133297e-01
+7653 16200 -4.83551374784505e-01
+7653 16512 -2.46988284185834e-02
+7653 16536 -7.08432062787704e-01
+7653 16560 -3.34211054867200e+00
+7653 16584 -5.66644235563060e+00
+7653 16608 -3.96155814643503e+00
+7653 16920 -5.17816687505491e-02
+7653 16944 -1.42191071427140e+00
+7653 16968 -6.52746285474579e+00
+7653 16992 -1.17788140657173e+01
+7653 17016 -9.81224485046757e+00
+7653 17328 -1.95621366677708e-02
+7653 17352 -7.70581711034177e-01
+7653 17376 -3.63348164739568e+00
+7653 17400 -5.85915587839834e+00
+7653 17424 -4.42153745514192e+00
+7653 17736 -1.98398564923313e-03
+7653 17760 -1.31722113288675e-01
+7653 17784 -6.43339735310644e-01
+7653 17808 -9.28686431603791e-01
+7653 17832 -5.86323053563030e-01
+7653 18144 -4.73650354579960e-07
+7653 18168 -3.81608675529014e-03
+7653 18192 -2.05626619650522e-02
+7653 18216 -2.67141945964822e-02
+7653 18240 -8.66206699074860e-03
+7654 7654 1.00000000000000e+00
+7655 7655 1.00000000000000e+00
+7656 7656 1.00000000000000e+00
+7657 7657 1.00000000000000e+00
+7658 7658 1.00000000000000e+00
+7659 7659 1.00000000000000e+00
+7660 7660 1.00000000000000e+00
+7661 7661 1.00000000000000e+00
+7662 7662 1.00000000000000e+00
+7663 7663 1.00000000000000e+00
+7664 7664 1.00000000000000e+00
+7665 7665 1.00000000000000e+00
+7666 7666 1.00000000000000e+00
+7667 7667 1.00000000000000e+00
+7668 7668 1.00000000000000e+00
+7669 7669 1.00000000000000e+00
+7670 7670 1.00000000000000e+00
+7671 7671 1.00000000000000e+00
+7672 7672 1.00000000000000e+00
+7673 7673 1.00000000000000e+00
+7674 7674 1.00000000000000e+00
+7675 7675 1.00000000000000e+00
+7676 7676 1.00000000000000e+00
+7677 7677 2.13447489157982e+01
+7677 5829 7.44503075326120e-06
+7677 5853 2.94496133374715e-04
+7677 5877 2.53629710191415e-04
+7677 5901 8.82040844097404e-06
+7677 5925 2.84965056096480e-07
+7677 6405 2.19087640160000e-10
+7677 6429 7.20183881084092e-03
+7677 6453 1.04720627674972e-01
+7677 6477 4.95673214491808e-01
+7677 6501 2.76648894908256e-01
+7677 6525 3.44776521549182e-06
+7677 7005 1.93604114647185e-04
+7677 7029 9.51566419060007e-02
+7677 7053 2.68265796979807e+00
+7677 7077 9.78199297230561e+00
+7677 7101 1.82785208832571e+00
+7677 7125 1.28205453431010e-07
+7677 7605 4.72542549108677e-04
+7677 7629 2.61946729281471e-01
+7677 7653 1.12062297642634e+01
+7677 7701 5.82260908100787e-01
+7677 8205 6.44276186536669e-05
+7677 8229 1.18442951526063e-01
+7677 8253 5.44645677899699e+00
+7677 8277 4.34538569436165e+00
+7677 8301 4.40213679917635e-06
+7677 8805 6.93965276951360e-07
+7677 8829 8.70653938089633e-03
+7677 8853 1.33556506834832e-01
+7677 8877 1.55949680715280e-02
+7677 9405 1.81280000000000e-16
+7677 9429 1.18392864123259e-06
+7677 9453 2.00195419374276e-06
+7677 15336 -2.12346769668840e-07
+7677 15360 -2.91886673369874e-05
+7677 15384 -5.68909072862929e-05
+7677 15720 -3.76985077331602e-04
+7677 15744 -1.46556642943470e-02
+7677 15768 -2.98294215297033e-01
+7677 15792 -5.03800392544258e-01
+7677 16128 -8.39440981508353e-03
+7677 16152 -2.26898724073119e-01
+7677 16176 -2.68385561620026e+00
+7677 16200 -3.99767481908086e+00
+7677 16536 -3.02687018809984e-02
+7677 16560 -7.93553797255210e-01
+7677 16584 -8.06189223988948e+00
+7677 16608 -1.13558941478984e+01
+7677 16944 -1.62745062553763e-02
+7677 16968 -5.98577294457413e-01
+7677 16992 -8.81234700362108e+00
+7677 17016 -1.38577901086800e+01
+7677 17352 -2.36456528890254e-03
+7677 17376 -1.34464897613048e-01
+7677 17400 -2.29622406868504e+00
+7677 17424 -3.71267255159020e+00
+7677 17760 -4.68162706606940e-06
+7677 17784 -7.17949674489168e-03
+7677 17808 -1.24352589445778e-01
+7677 17832 -1.98570423981032e-01
+7677 18192 -2.33755502357585e-06
+7677 18216 -2.89818847393745e-05
+7677 18240 -4.16008843137181e-05
+7678 7678 1.00000000000000e+00
+7679 7679 1.00000000000000e+00
+7680 7680 1.00000000000000e+00
+7681 7681 1.00000000000000e+00
+7682 7682 1.00000000000000e+00
+7683 7683 1.00000000000000e+00
+7684 7684 1.00000000000000e+00
+7685 7685 1.00000000000000e+00
+7686 7686 1.00000000000000e+00
+7687 7687 1.00000000000000e+00
+7688 7688 1.00000000000000e+00
+7689 7689 1.00000000000000e+00
+7690 7690 1.00000000000000e+00
+7691 7691 1.00000000000000e+00
+7692 7692 1.00000000000000e+00
+7693 7693 1.00000000000000e+00
+7694 7694 1.00000000000000e+00
+7695 7695 1.00000000000000e+00
+7696 7696 1.00000000000000e+00
+7697 7697 1.00000000000000e+00
+7698 7698 1.00000000000000e+00
+7699 7699 1.00000000000000e+00
+7700 7700 1.00000000000000e+00
+7701 7701 1.05242261230147e+00
+7701 5853 5.17938663274501e-06
+7701 5877 1.74314569669891e-05
+7701 5901 1.01894477122356e-05
+7701 5925 3.38261348833650e-07
+7701 6429 2.08930460891830e-07
+7701 6453 2.93365015021251e-03
+7701 6477 1.02332936930004e-01
+7701 6501 7.50878594565642e-02
+7701 6525 4.09279816281571e-06
+7701 7029 1.60494948635371e-04
+7701 7053 5.66352263340678e-02
+7701 7077 9.54978556178062e-01
+7701 7101 3.57682624143023e-01
+7701 7125 1.52197706490320e-07
+7701 7629 1.51134942095439e-04
+7701 7653 9.79813381742757e-02
+7701 7677 5.82260908100787e-01
+7701 8229 9.01164771458686e-06
+7701 8253 8.35456992673703e-03
+7701 8277 1.38154135506734e-02
+7701 8301 1.23430727922290e-07
+7701 8853 2.17449701422420e-07
+7701 8877 1.47384460888310e-07
+7701 15336 -2.27564163003280e-07
+7701 15360 -3.45539493907780e-05
+7701 15384 -6.75149496405330e-05
+7701 15744 -1.07614750049477e-03
+7701 15768 -7.30006766659712e-02
+7701 15792 -1.38468320828479e-01
+7701 16152 -5.78613424267488e-03
+7701 16176 -3.49593855422119e-01
+7701 16200 -6.58684771145513e-01
+7701 16560 -7.02520703206139e-03
+7701 16584 -3.07481855106399e-01
+7701 16608 -5.65787260988367e-01
+7701 16968 -1.52551360576185e-03
+7701 16992 -6.68357069655323e-02
+7701 17016 -1.22992818690732e-01
+7701 17376 -1.01389756552506e-05
+7701 17400 -2.18156224160925e-03
+7701 17424 -4.29215165363174e-03
+7702 7702 1.00000000000000e+00
+7703 7703 1.00000000000000e+00
+7704 7704 1.00000000000000e+00
+7705 7705 1.00000000000000e+00
+7706 7706 1.00000000000000e+00
+7707 7707 1.00000000000000e+00
+7708 7708 1.00000000000000e+00
+7709 7709 1.00000000000000e+00
+7710 7710 1.00000000000000e+00
+7711 7711 1.00000000000000e+00
+7712 7712 1.00000000000000e+00
+7713 7713 1.00000000000000e+00
+7714 7714 1.00000000000000e+00
+7715 7715 1.00000000000000e+00
+7716 7716 1.00000000000000e+00
+7717 7717 1.00000000000000e+00
+7718 7718 1.00000000000000e+00
+7719 7719 1.00000000000000e+00
+7720 7720 1.00000000000000e+00
+7721 7721 1.00000000000000e+00
+7722 7722 1.00000000000000e+00
+7723 7723 1.00000000000000e+00
+7724 7724 1.00000000000000e+00
+7725 7725 1.00000000000000e+00
+7726 7726 1.00000000000000e+00
+7727 7727 1.00000000000000e+00
+7728 7728 1.00000000000000e+00
+7729 7729 1.00000000000000e+00
+7730 7730 1.00000000000000e+00
+7731 7731 1.00000000000000e+00
+7732 7732 1.00000000000000e+00
+7733 7733 1.00000000000000e+00
+7734 7734 1.00000000000000e+00
+7735 7735 1.00000000000000e+00
+7736 7736 1.00000000000000e+00
+7737 7737 1.00000000000000e+00
+7738 7738 1.00000000000000e+00
+7739 7739 1.00000000000000e+00
+7740 7740 1.00000000000000e+00
+7741 7741 1.00000000000000e+00
+7742 7742 1.00000000000000e+00
+7743 7743 1.00000000000000e+00
+7744 7744 1.00000000000000e+00
+7745 7745 1.00000000000000e+00
+7746 7746 1.00000000000000e+00
+7747 7747 1.00000000000000e+00
+7748 7748 1.00000000000000e+00
+7749 7749 1.00000000000000e+00
+7750 7750 1.00000000000000e+00
+7751 7751 1.00000000000000e+00
+7752 7752 1.00000000000000e+00
+7753 7753 1.00000000000000e+00
+7754 7754 1.00000000000000e+00
+7755 7755 1.00000000000000e+00
+7756 7756 1.00000000000000e+00
+7757 7757 1.00000000000000e+00
+7758 7758 1.00000000000000e+00
+7759 7759 1.00000000000000e+00
+7760 7760 1.00000000000000e+00
+7761 7761 1.00000000000000e+00
+7762 7762 1.00000000000000e+00
+7763 7763 1.00000000000000e+00
+7764 7764 1.00000000000000e+00
+7765 7765 1.00000000000000e+00
+7766 7766 1.00000000000000e+00
+7767 7767 1.00000000000000e+00
+7768 7768 1.00000000000000e+00
+7769 7769 1.00000000000000e+00
+7770 7770 1.00000000000000e+00
+7771 7771 1.00000000000000e+00
+7772 7772 1.00000000000000e+00
+7773 7773 1.00000000000000e+00
+7774 7774 1.00000000000000e+00
+7775 7775 1.00000000000000e+00
+7776 7776 1.00000000000000e+00
+7777 7777 1.00000000000000e+00
+7778 7778 1.00000000000000e+00
+7779 7779 1.00000000000000e+00
+7780 7780 1.00000000000000e+00
+7781 7781 1.00000000000000e+00
+7782 7782 1.00000000000000e+00
+7783 7783 1.00000000000000e+00
+7784 7784 1.00000000000000e+00
+7785 7785 1.00000000000000e+00
+7786 7786 1.00000000000000e+00
+7787 7787 1.00000000000000e+00
+7788 7788 1.00000000000000e+00
+7789 7789 1.00000000000000e+00
+7790 7790 1.00000000000000e+00
+7791 7791 1.00000000000000e+00
+7792 7792 1.00000000000000e+00
+7793 7793 1.00000000000000e+00
+7794 7794 1.00000000000000e+00
+7795 7795 1.00000000000000e+00
+7796 7796 1.00000000000000e+00
+7797 7797 1.00000000000000e+00
+7798 7798 1.00000000000000e+00
+7799 7799 1.00000000000000e+00
+7800 7800 1.00000000000000e+00
+7801 7801 1.00000000000000e+00
+7802 7802 1.00000000000000e+00
+7803 7803 1.00000000000000e+00
+7804 7804 1.00000000000000e+00
+7805 7805 1.00000000000000e+00
+7806 7806 1.00000000000000e+00
+7807 7807 1.00000000000000e+00
+7808 7808 1.00000000000000e+00
+7809 7809 1.00000000000000e+00
+7810 7810 1.00000000000000e+00
+7811 7811 1.00000000000000e+00
+7812 7812 1.00000000000000e+00
+7813 7813 1.00000000000000e+00
+7814 7814 1.00000000000000e+00
+7815 7815 1.00000000000000e+00
+7816 7816 1.00000000000000e+00
+7817 7817 1.00000000000000e+00
+7818 7818 1.00000000000000e+00
+7819 7819 1.00000000000000e+00
+7820 7820 1.00000000000000e+00
+7821 7821 1.00000000000000e+00
+7822 7822 1.00000000000000e+00
+7823 7823 1.00000000000000e+00
+7824 7824 1.00000000000000e+00
+7825 7825 1.00000000000000e+00
+7826 7826 1.00000000000000e+00
+7827 7827 1.00000000000000e+00
+7828 7828 1.00000000000000e+00
+7829 7829 1.00000000000000e+00
+7830 7830 1.00000000000000e+00
+7831 7831 1.00000000000000e+00
+7832 7832 1.00000000000000e+00
+7833 7833 1.00000000000000e+00
+7834 7834 1.00000000000000e+00
+7835 7835 1.00000000000000e+00
+7836 7836 1.00000000000000e+00
+7837 7837 1.00000000000000e+00
+7838 7838 1.00000000000000e+00
+7839 7839 1.00000000000000e+00
+7840 7840 1.00000000000000e+00
+7841 7841 1.00000000000000e+00
+7842 7842 1.00000000000000e+00
+7843 7843 1.00000000000000e+00
+7844 7844 1.00000000000000e+00
+7845 7845 1.00000000000000e+00
+7846 7846 1.00000000000000e+00
+7847 7847 1.00000000000000e+00
+7848 7848 1.00000000000000e+00
+7849 7849 1.00000000000000e+00
+7850 7850 1.00000000000000e+00
+7851 7851 1.00000000000000e+00
+7852 7852 1.00000000000000e+00
+7853 7853 1.00000000000000e+00
+7854 7854 1.00000000000000e+00
+7855 7855 1.00000000000000e+00
+7856 7856 1.00000000000000e+00
+7857 7857 1.00000000000000e+00
+7858 7858 1.00000000000000e+00
+7859 7859 1.00000000000000e+00
+7860 7860 1.00000000000000e+00
+7861 7861 1.00000000000000e+00
+7862 7862 1.00000000000000e+00
+7863 7863 1.00000000000000e+00
+7864 7864 1.00000000000000e+00
+7865 7865 1.00000000000000e+00
+7866 7866 1.00000000000000e+00
+7867 7867 1.00000000000000e+00
+7868 7868 1.00000000000000e+00
+7869 7869 1.00000000000000e+00
+7870 7870 1.00000000000000e+00
+7871 7871 1.00000000000000e+00
+7872 7872 1.00000000000000e+00
+7873 7873 1.00000000000000e+00
+7874 7874 1.00000000000000e+00
+7875 7875 1.00000000000000e+00
+7876 7876 1.00000000000000e+00
+7877 7877 1.00000000000000e+00
+7878 7878 1.00000000000000e+00
+7879 7879 1.00000000000000e+00
+7880 7880 1.00000000000000e+00
+7881 7881 1.00000000000000e+00
+7882 7882 1.00000000000000e+00
+7883 7883 1.00000000000000e+00
+7884 7884 1.00000000000000e+00
+7885 7885 1.00000000000000e+00
+7886 7886 1.00000000000000e+00
+7887 7887 1.00000000000000e+00
+7888 7888 1.00000000000000e+00
+7889 7889 1.00000000000000e+00
+7890 7890 1.00000000000000e+00
+7891 7891 1.00000000000000e+00
+7892 7892 1.00000000000000e+00
+7893 7893 1.00000435929869e+00
+7893 7317 1.52197706490310e-07
+7893 7341 1.28205453431010e-07
+7893 7917 1.95729919479386e-03
+7893 7941 1.07228177540025e-03
+7893 7965 5.18496828096260e-07
+7893 8493 3.16146648534742e-04
+7893 8517 8.11544335798943e-03
+7893 8541 2.07534537618295e-03
+7893 8565 3.19208832744806e-06
+7893 9093 5.45386769826279e-05
+7893 9117 9.64122588329139e-04
+7893 9141 2.13706456323185e-04
+7893 9165 7.09230616116290e-07
+7893 20712 -9.84041696600765e-04
+7893 20736 -5.02259234512098e-04
+7893 20760 -2.92525320334731e-06
+7893 21120 -5.16422235334541e-03
+7893 21144 -2.70507787133987e-03
+7893 21168 -3.51333413334755e-05
+7893 21528 -3.44015283048547e-03
+7893 21552 -1.89434110109506e-03
+7893 21576 -4.97899102435199e-05
+7894 7894 1.00000000000000e+00
+7895 7895 1.00000000000000e+00
+7896 7896 1.00000000000000e+00
+7897 7897 1.00000000000000e+00
+7898 7898 1.00000000000000e+00
+7899 7899 1.00000000000000e+00
+7900 7900 1.00000000000000e+00
+7901 7901 1.00000000000000e+00
+7902 7902 1.00000000000000e+00
+7903 7903 1.00000000000000e+00
+7904 7904 1.00000000000000e+00
+7905 7905 1.00000000000000e+00
+7906 7906 1.00000000000000e+00
+7907 7907 1.00000000000000e+00
+7908 7908 1.00000000000000e+00
+7909 7909 1.00000000000000e+00
+7910 7910 1.00000000000000e+00
+7911 7911 1.00000000000000e+00
+7912 7912 1.00000000000000e+00
+7913 7913 1.00000000000000e+00
+7914 7914 1.00000000000000e+00
+7915 7915 1.00000000000000e+00
+7916 7916 1.00000000000000e+00
+7917 7917 6.56924940955705e+00
+7917 6141 2.60784759250900e-08
+7917 6165 3.84760914064400e-08
+7917 6717 1.65206772175220e-07
+7917 6741 1.20671885798247e-02
+7917 6765 4.31692185634901e-03
+7917 6789 1.76345157057951e-06
+7917 7317 3.57682624143009e-01
+7917 7341 1.82785208832565e+00
+7917 7365 1.55044360737320e-01
+7917 7389 2.98307779105620e-04
+7917 7893 1.95729919479386e-03
+7917 7941 9.52331039881120e+00
+7917 7965 2.98235611124594e-01
+7917 7989 3.90821018534066e-04
+7917 8493 6.52632710066741e-02
+7917 8517 4.86555311739368e+00
+7917 8541 3.15491505639718e+00
+7917 8565 9.08790737019986e-02
+7917 8589 3.87416569810678e-05
+7917 9093 7.20909761037705e-03
+7917 9117 2.17844836818968e-01
+7917 9141 1.27181616251686e-01
+7917 9165 2.98352467610294e-03
+7917 9189 1.85443126627622e-06
+7917 9741 1.25052203376217e-06
+7917 9765 1.36192251944495e-06
+7917 19488 -7.59934449608795e-04
+7917 19512 -3.88025594488413e-04
+7917 19536 -2.30239133829009e-06
+7917 19896 -1.49586861259648e-01
+7917 19920 -8.67773264820795e-02
+7917 19944 -3.42397024350159e-03
+7917 20304 -2.29847746643470e+00
+7917 20328 -1.30109975791992e+00
+7917 20352 -4.35226319330417e-02
+7917 20376 -3.60143894674420e-05
+7917 20712 -7.82386178903454e+00
+7917 20736 -4.43068966198713e+00
+7917 20760 -1.49049353647890e-01
+7917 20784 -2.24151561366772e-04
+7917 21120 -5.11769890541422e+00
+7917 21144 -3.05351420152938e+00
+7917 21168 -1.42656758267409e-01
+7917 21192 -3.56454239513502e-04
+7917 21528 -9.93950143461296e-01
+7917 21552 -6.43859071509853e-01
+7917 21576 -4.22648233034785e-02
+7917 21600 -8.02216756130946e-05
+7918 7918 1.00000000000000e+00
+7919 7919 1.00000000000000e+00
+7920 7920 1.00000000000000e+00
+7921 7921 1.00000000000000e+00
+7922 7922 1.00000000000000e+00
+7923 7923 1.00000000000000e+00
+7924 7924 1.00000000000000e+00
+7925 7925 1.00000000000000e+00
+7926 7926 1.00000000000000e+00
+7927 7927 1.00000000000000e+00
+7928 7928 1.00000000000000e+00
+7929 7929 1.00000000000000e+00
+7930 7930 1.00000000000000e+00
+7931 7931 1.00000000000000e+00
+7932 7932 1.00000000000000e+00
+7933 7933 1.00000000000000e+00
+7934 7934 1.00000000000000e+00
+7935 7935 1.00000000000000e+00
+7936 7936 1.00000000000000e+00
+7937 7937 1.00000000000000e+00
+7938 7938 1.00000000000000e+00
+7939 7939 1.00000000000000e+00
+7940 7940 1.00000000000000e+00
+7941 7941 2.74181977528583e+01
+7941 6141 4.17426610680265e-06
+7941 6165 6.16672890543078e-06
+7941 6189 1.50853894583000e-09
+7941 6213 2.19544460000000e-13
+7941 6717 1.47101733658930e-06
+7941 6741 2.74929435139290e-01
+7941 6765 2.50073467614362e-01
+7941 6789 5.34094459172504e-03
+7941 6813 1.89409891545972e-06
+7941 7317 9.54978556178021e-01
+7941 7341 9.78199297230528e+00
+7941 7365 3.14714061325150e+00
+7941 7389 1.10751375218813e-01
+7941 7413 3.60350842428261e-04
+7941 7893 1.07228177540025e-03
+7941 7917 9.52331039881120e+00
+7941 7965 5.96431524939470e+00
+7941 7989 3.90074702897607e-01
+7941 8013 2.31229553062051e-04
+7941 8493 3.06976858560455e-02
+7941 8517 4.49687532095992e+00
+7941 8541 7.14083795988871e+00
+7941 8565 2.64884504318010e+00
+7941 8589 1.58330381854045e-01
+7941 8613 7.51344158719125e-05
+7941 9093 2.79091754131914e-03
+7941 9117 1.45416647043225e-01
+7941 9141 2.82792704146777e-01
+7941 9165 1.37148490235051e-01
+7941 9189 3.82984705123400e-03
+7941 9213 3.03133255660085e-06
+7941 9741 1.95371943844944e-04
+7941 9765 2.39044322190820e-04
+7941 9789 5.17228162006529e-06
+7941 19080 -6.63024342517000e-09
+7941 19104 -2.84816028581600e-08
+7941 19128 -1.44727600551000e-08
+7941 19152 -1.96062915748000e-09
+7941 19488 -1.34062314544311e-01
+7941 19512 -1.16854240285122e-01
+7941 19536 -2.09752511183679e-02
+7941 19560 -1.81463814625544e-03
+7941 19896 -1.94760161133871e+00
+7941 19920 -1.99097178969344e+00
+7941 19944 -5.06189018822952e-01
+7941 19968 -5.81648819907571e-02
+7941 19992 -3.40800829606917e-05
+7941 20304 -9.31757742472421e+00
+7941 20328 -9.03319033806739e+00
+7941 20352 -2.41236416441358e+00
+7941 20376 -3.15687715384813e-01
+7941 20400 -7.23038149697026e-04
+7941 20712 -1.60834728731334e+01
+7941 20736 -1.32830061635957e+01
+7941 20760 -3.33774787695733e+00
+7941 20784 -5.04462076015934e-01
+7941 20808 -2.41565249248564e-03
+7941 21120 -5.62748706111386e+00
+7941 21144 -4.72007968522739e+00
+7941 21168 -1.13078752502027e+00
+7941 21192 -1.60508309066103e-01
+7941 21216 -7.25522370285930e-04
+7941 21528 -5.40869660850665e-01
+7941 21552 -4.98997919341096e-01
+7941 21576 -1.11494712416162e-01
+7941 21600 -1.25654930568489e-02
+7941 21624 -3.47011381079179e-05
+7942 7942 1.00000000000000e+00
+7943 7943 1.00000000000000e+00
+7944 7944 1.00000000000000e+00
+7945 7945 1.00000000000000e+00
+7946 7946 1.00000000000000e+00
+7947 7947 1.00000000000000e+00
+7948 7948 1.00000000000000e+00
+7949 7949 1.00000000000000e+00
+7950 7950 1.00000000000000e+00
+7951 7951 1.00000000000000e+00
+7952 7952 1.00000000000000e+00
+7953 7953 1.00000000000000e+00
+7954 7954 1.00000000000000e+00
+7955 7955 1.00000000000000e+00
+7956 7956 1.00000000000000e+00
+7957 7957 1.00000000000000e+00
+7958 7958 1.00000000000000e+00
+7959 7959 1.00000000000000e+00
+7960 7960 1.00000000000000e+00
+7961 7961 1.00000000000000e+00
+7962 7962 1.00000000000000e+00
+7963 7963 1.00000000000000e+00
+7964 7964 1.00000000000000e+00
+7965 7965 1.81406348468670e+01
+7965 6141 6.61673559220358e-06
+7965 6165 1.84499564047509e-04
+7965 6189 1.14998784692892e-04
+7965 6213 1.66357890694850e-07
+7965 6717 1.76934258518440e-07
+7965 6741 1.36090564095540e-01
+7965 6765 3.37952987363556e-01
+7965 6789 1.03910226659848e-01
+7965 6813 4.53064416783982e-03
+7965 6837 1.40334369341951e-05
+7965 7317 5.66352263340650e-02
+7965 7341 2.68265796979796e+00
+7965 7365 6.00181058392055e+00
+7965 7389 2.67314736954827e+00
+7965 7413 1.19649369036845e-01
+7965 7437 1.86724261971479e-04
+7965 7893 5.18496828096260e-07
+7965 7917 2.98235611124594e-01
+7965 7941 5.96431524939469e+00
+7965 7989 6.72471884021618e+00
+7965 8013 3.25771669079228e-01
+7965 8037 1.52045374293927e-04
+7965 8493 3.30881342016351e-05
+7965 8517 1.09481969201773e-01
+7965 8541 2.68222047618851e+00
+7965 8565 7.60940118776554e+00
+7965 8589 2.77588105773608e+00
+7965 8613 1.17467751532466e-01
+7965 8637 1.33659463189933e-04
+7965 9093 4.55990495249529e-06
+7965 9117 4.32657486010449e-03
+7965 9141 1.15026971954080e-01
+7965 9165 3.88254869960613e-01
+7965 9189 1.63787166671290e-01
+7965 9213 3.35210990307821e-03
+7965 9237 8.42870972887720e-07
+7965 9741 1.28664970767148e-04
+7965 9765 3.23989771589693e-04
+7965 9789 9.87647472616856e-05
+7965 9813 1.53658882619252e-05
+7965 19080 -2.42406379375067e-04
+7965 19104 -4.43604484561122e-03
+7965 19128 -1.45815447323936e-02
+7965 19152 -5.36026349040978e-03
+7965 19176 -4.73461040574706e-04
+7965 19488 -1.03422884076187e-01
+7965 19512 -4.08296859121543e-01
+7965 19536 -7.58041586363677e-01
+7965 19560 -2.92463126461181e-01
+7965 19584 -3.11108491462266e-02
+7965 19608 -1.88711314146379e-05
+7965 19896 -7.35724208401009e-01
+7965 19920 -2.99889266328804e+00
+7965 19944 -5.28864690628290e+00
+7965 19968 -2.11930396500525e+00
+7965 19992 -2.45488223812455e-01
+7965 20016 -1.29536421402409e-03
+7965 20304 -1.51207846681759e+00
+7965 20328 -6.68777816209307e+00
+7965 20352 -1.18093709731942e+01
+7965 20376 -4.89729124264455e+00
+7965 20400 -6.03687179371153e-01
+7965 20424 -5.60829570506775e-03
+7965 20712 -7.56106341981151e-01
+7965 20736 -3.72278010225773e+00
+7965 20760 -7.34164664187904e+00
+7965 20784 -3.06527398950025e+00
+7965 20808 -3.75923620321779e-01
+7965 20832 -4.05950296912941e-03
+7965 21120 -1.17498240106752e-01
+7965 21144 -6.38508544939145e-01
+7965 21168 -1.33316206270325e+00
+7965 21192 -5.38961450759740e-01
+7965 21216 -6.28594643042386e-02
+7965 21240 -7.09905820190969e-04
+7965 21528 -2.63702574884965e-03
+7965 21552 -1.75666651323252e-02
+7965 21576 -3.10803560498739e-02
+7965 21600 -8.02848167035946e-03
+7965 21624 -2.44065315422982e-04
+7966 7966 1.00000000000000e+00
+7967 7967 1.00000000000000e+00
+7968 7968 1.00000000000000e+00
+7969 7969 1.00000000000000e+00
+7970 7970 1.00000000000000e+00
+7971 7971 1.00000000000000e+00
+7972 7972 1.00000000000000e+00
+7973 7973 1.00000000000000e+00
+7974 7974 1.00000000000000e+00
+7975 7975 1.00000000000000e+00
+7976 7976 1.00000000000000e+00
+7977 7977 1.00000000000000e+00
+7978 7978 1.00000000000000e+00
+7979 7979 1.00000000000000e+00
+7980 7980 1.00000000000000e+00
+7981 7981 1.00000000000000e+00
+7982 7982 1.00000000000000e+00
+7983 7983 1.00000000000000e+00
+7984 7984 1.00000000000000e+00
+7985 7985 1.00000000000000e+00
+7986 7986 1.00000000000000e+00
+7987 7987 1.00000000000000e+00
+7988 7988 1.00000000000000e+00
+7989 7989 1.58390083592944e+01
+7989 5589 3.80000000000000e-19
+7989 6141 3.07268247464817e-06
+7989 6165 2.14991453078890e-04
+7989 6189 3.89714704487470e-04
+7989 6213 3.45354354387659e-05
+7989 6237 2.19066051226402e-06
+7989 6717 7.31269937100000e-11
+7989 6741 4.58947816494330e-03
+7989 6765 1.20597050544893e-01
+7989 6789 3.24085759625736e-01
+7989 6813 1.29265031934991e-01
+7989 6837 3.00569983360122e-03
+7989 6861 5.31858846635944e-06
+7989 7317 1.60494948635362e-04
+7989 7341 9.51566419059959e-02
+7989 7365 2.69560330541537e+00
+7989 7389 6.07253200657607e+00
+7989 7413 2.27567422516408e+00
+7989 7437 1.13586382165691e-01
+7989 7461 8.43467389933999e-05
+7989 7917 3.90821018534066e-04
+7989 7941 3.90074702897607e-01
+7989 7965 6.72471884021618e+00
+7989 8013 5.58574866139341e+00
+7989 8037 2.94052596094360e-01
+7989 8061 2.80445054406429e-04
+7989 8517 1.08990327590325e-04
+7989 8541 1.65476629083135e-01
+7989 8565 2.77392916116126e+00
+7989 8589 6.32140157665028e+00
+7989 8613 2.32069493927854e+00
+7989 8637 8.99707006266861e-02
+7989 8661 1.76641060064227e-04
+7989 9117 1.16629760528204e-06
+7989 9141 5.91766666038560e-03
+7989 9165 1.59134713973779e-01
+7989 9189 3.08047702966219e-01
+7989 9213 1.22356735855191e-01
+7989 9237 4.93536473027622e-03
+7989 9261 2.14304096016500e-08
+7989 9741 4.13083515611090e-07
+7989 9765 1.81715951490786e-05
+7989 9789 7.01342460993384e-04
+7989 9813 2.20082275981338e-04
+7989 9837 2.79430157966995e-06
+7989 18696 -1.33252547496470e-07
+7989 18720 -9.54730890178402e-05
+7989 18744 -4.18824570894568e-04
+7989 18768 -2.50664090970473e-04
+7989 18792 -3.89310030356546e-05
+7989 19080 -1.55188264107729e-04
+7989 19104 -2.03872129237748e-02
+7989 19128 -1.36848367689043e-01
+7989 19152 -2.65399292796336e-01
+7989 19176 -1.18129358804483e-01
+7989 19200 -1.51559787944259e-02
+7989 19224 -8.12642191870767e-06
+7989 19488 -4.98947752019853e-03
+7989 19512 -2.68460388411370e-01
+7989 19536 -1.59016329279604e+00
+7989 19560 -2.79102250318822e+00
+7989 19584 -1.30451795486918e+00
+7989 19608 -1.85449956010226e-01
+7989 19632 -1.89638474168434e-03
+7989 19896 -1.97720813716509e-02
+7989 19920 -9.36190402441585e-01
+7989 19944 -5.30453705292566e+00
+7989 19968 -8.88021871768782e+00
+7989 19992 -4.25765599427589e+00
+7989 20016 -6.39847535218475e-01
+7989 20040 -1.05393873554722e-02
+7989 20304 -1.29413237855621e-02
+7989 20328 -8.76028072878747e-01
+7989 20352 -5.11917555376150e+00
+7989 20376 -8.63045626787830e+00
+7989 20400 -4.10122884318578e+00
+7989 20424 -6.26267686291771e-01
+7989 20448 -1.42016680674156e-02
+7989 20712 -2.16046850008640e-03
+7989 20736 -2.34219438433392e-01
+7989 20760 -1.43097519682742e+00
+7989 20784 -2.47405737344551e+00
+7989 20808 -1.09956716241353e+00
+7989 20832 -1.55321867795442e-01
+7989 20856 -3.21498529089213e-03
+7989 21120 -4.61831190340906e-06
+7989 21144 -1.65362016833941e-02
+7989 21168 -1.10018885673367e-01
+7989 21192 -2.00180555053642e-01
+7989 21216 -7.55358123396607e-02
+7989 21240 -8.02865271787030e-03
+7989 21264 -3.48101433441661e-05
+7989 21552 -4.99658735013202e-06
+7989 21576 -2.42166638779728e-05
+7989 21600 -2.19178452599109e-05
+7989 21624 -4.23031447744472e-06
+7990 7990 1.00000000000000e+00
+7991 7991 1.00000000000000e+00
+7992 7992 1.00000000000000e+00
+7993 7993 1.00000000000000e+00
+7994 7994 1.00000000000000e+00
+7995 7995 1.00000000000000e+00
+7996 7996 1.00000000000000e+00
+7997 7997 1.00000000000000e+00
+7998 7998 1.00000000000000e+00
+7999 7999 1.00000000000000e+00
+8000 8000 1.00000000000000e+00
+8001 8001 1.00000000000000e+00
+8002 8002 1.00000000000000e+00
+8003 8003 1.00000000000000e+00
+8004 8004 1.00000000000000e+00
+8005 8005 1.00000000000000e+00
+8006 8006 1.00000000000000e+00
+8007 8007 1.00000000000000e+00
+8008 8008 1.00000000000000e+00
+8009 8009 1.00000000000000e+00
+8010 8010 1.00000000000000e+00
+8011 8011 1.00000000000000e+00
+8012 8012 1.00000000000000e+00
+8013 8013 1.43612580844073e+01
+8013 5589 4.40000000000000e-19
+8013 6165 9.75132400737221e-06
+8013 6189 1.44147466930781e-04
+8013 6213 6.20724038309009e-04
+8013 6237 6.03166389497405e-05
+8013 6261 5.23284682600000e-11
+8013 6285 2.42173700000000e-14
+8013 6741 2.46575223213160e-07
+8013 6765 4.53171246542365e-03
+8013 6789 1.32107227727700e-01
+8013 6813 2.67067283445570e-01
+8013 6837 9.81329879921941e-02
+8013 6861 4.96671538245732e-03
+8013 6885 2.57973066677049e-06
+8013 7341 1.93604114647191e-04
+8013 7365 1.04668459507657e-01
+8013 7389 2.28425795486038e+00
+8013 7413 5.50028633803761e+00
+8013 7437 2.15224436646039e+00
+8013 7461 1.09060475920185e-01
+8013 7485 7.84963079505842e-05
+8013 7941 2.31229553062051e-04
+8013 7965 3.25771669079228e-01
+8013 7989 5.58574866139341e+00
+8013 8037 5.23127818559839e+00
+8013 8061 2.70682180385706e-01
+8013 8085 4.91919438839997e-04
+8013 8541 1.53185448900637e-04
+8013 8565 1.30017308321319e-01
+8013 8589 2.31426725984315e+00
+8013 8613 5.42353049705159e+00
+8013 8637 2.25961989461760e+00
+8013 8661 8.59626371374448e-02
+8013 8685 1.17724328222053e-04
+8013 9141 1.78071334005418e-05
+8013 9165 3.14962360091572e-03
+8013 9189 1.12349617391641e-01
+8013 9213 3.12738875079109e-01
+8013 9237 1.06238221895660e-01
+8013 9261 5.24590795012684e-03
+8013 9765 1.82413221143829e-06
+8013 9789 1.09163930156516e-04
+8013 9813 1.66440736458122e-04
+8013 9837 2.62739118781417e-04
+8013 9861 7.46695746236228e-06
+8013 18336 -1.32206470670000e-10
+8013 18360 -7.06933854300000e-10
+8013 18384 -8.44638357170000e-10
+8013 18408 -1.78107971630000e-10
+8013 18696 -1.54264278491790e-07
+8013 18720 -1.67656038496173e-03
+8013 18744 -2.01656095848383e-02
+8013 18768 -6.10846835017330e-02
+8013 18792 -3.57113108533596e-02
+8013 18816 -5.56833331860731e-03
+8013 18840 -1.58029534922601e-06
+8013 19104 -1.73381330431109e-03
+8013 19128 -8.66559427129917e-02
+8013 19152 -6.02940997111866e-01
+8013 19176 -1.32965709172447e+00
+8013 19200 -7.66829074925672e-01
+8013 19224 -1.28438112447599e-01
+8013 19248 -1.94985337928621e-03
+8013 19512 -8.89962435477872e-03
+8013 19536 -4.52565793524378e-01
+8013 19560 -2.98627124706641e+00
+8013 19584 -6.23407982509963e+00
+8013 19608 -3.64136977461597e+00
+8013 19632 -6.40927707820468e-01
+8013 19656 -1.54562329970989e-02
+8013 19920 -9.62297346308573e-03
+8013 19944 -6.31129289373409e-01
+8013 19968 -4.23415220768884e+00
+8013 19992 -8.86448444529013e+00
+8013 20016 -5.31142189658321e+00
+8013 20040 -9.90842359720009e-01
+8013 20064 -3.37284796292226e-02
+8013 20328 -2.05883233787831e-03
+8013 20352 -2.38646796391965e-01
+8013 20376 -1.69477015015130e+00
+8013 20400 -3.64519484217998e+00
+8013 20424 -2.10508368685634e+00
+8013 20448 -3.78249300822858e-01
+8013 20472 -1.19319310724472e-02
+8013 20736 -2.30368090416413e-05
+8013 20760 -2.79573555867760e-02
+8013 20784 -2.12494015931439e-01
+8013 20808 -4.69701797998803e-01
+8013 20832 -2.53257024583943e-01
+8013 20856 -4.20474139306097e-02
+8013 20880 -1.06285179056370e-03
+8013 21168 -2.84870293465062e-04
+8013 21192 -2.14648723749300e-03
+8013 21216 -4.35560139697698e-03
+8013 21240 -1.17783345955637e-03
+8013 21264 -4.27068489809045e-05
+8014 8014 1.00000000000000e+00
+8015 8015 1.00000000000000e+00
+8016 8016 1.00000000000000e+00
+8017 8017 1.00000000000000e+00
+8018 8018 1.00000000000000e+00
+8019 8019 1.00000000000000e+00
+8020 8020 1.00000000000000e+00
+8021 8021 1.00000000000000e+00
+8022 8022 1.00000000000000e+00
+8023 8023 1.00000000000000e+00
+8024 8024 1.00000000000000e+00
+8025 8025 1.00000000000000e+00
+8026 8026 1.00000000000000e+00
+8027 8027 1.00000000000000e+00
+8028 8028 1.00000000000000e+00
+8029 8029 1.00000000000000e+00
+8030 8030 1.00000000000000e+00
+8031 8031 1.00000000000000e+00
+8032 8032 1.00000000000000e+00
+8033 8033 1.00000000000000e+00
+8034 8034 1.00000000000000e+00
+8035 8035 1.00000000000000e+00
+8036 8036 1.00000000000000e+00
+8037 8037 1.38340505320785e+01
+8037 6189 1.29078208718035e-05
+8037 6213 1.20323550370870e-04
+8037 6237 1.79724268891034e-04
+8037 6261 1.52487309262468e-04
+8037 6285 2.21431704970470e-07
+8037 6765 1.74930753381088e-06
+8037 6789 2.66749886865825e-03
+8037 6813 1.09523577382538e-01
+8037 6837 2.80952884632940e-01
+8037 6861 9.01462639339668e-02
+8037 6885 3.29078610576365e-03
+8037 6909 6.71275600306681e-06
+8037 7365 9.19256200499704e-05
+8037 7389 1.04894232584914e-01
+8037 7413 2.14309867129194e+00
+8037 7437 5.14992565412800e+00
+8037 7461 2.03413071720506e+00
+8037 7485 1.11890756819090e-01
+8037 7509 1.26060474670818e-04
+8037 7965 1.52045374293927e-04
+8037 7989 2.94052596094360e-01
+8037 8013 5.23127818559839e+00
+8037 8061 5.17540769465823e+00
+8037 8085 2.40930019848203e-01
+8037 8109 5.57366312412017e-04
+8037 8565 2.64738694593928e-04
+8037 8589 1.03986644421701e-01
+8037 8613 2.25780169589540e+00
+8037 8637 5.17797855006944e+00
+8037 8661 2.09507042579204e+00
+8037 8685 9.57663978761793e-02
+8037 8709 5.24284476533347e-05
+8037 9165 6.98380998805087e-06
+8037 9189 5.78011380667533e-03
+8037 9213 9.21548851110089e-02
+8037 9237 2.74627686916336e-01
+8037 9261 1.09974090606849e-01
+8037 9285 4.96537002526934e-03
+8037 9309 2.12450364950000e-10
+8037 9813 1.31358384121013e-04
+8037 9837 5.56133606008056e-04
+8037 9861 7.72839565029905e-05
+8037 9885 2.33286633743804e-06
+8037 9909 8.10624600000000e-14
+8037 18336 -1.27615079143266e-05
+8037 18360 -1.49333307771915e-03
+8037 18384 -6.99137529405206e-03
+8037 18408 -6.28028490483819e-03
+8037 18432 -1.21000740674983e-03
+8037 18456 -1.35451214863840e-07
+8037 18720 -1.91124497901616e-04
+8037 18744 -2.18011093323540e-02
+8037 18768 -1.98152836711839e-01
+8037 18792 -5.44017519973793e-01
+8037 18816 -3.86242857738427e-01
+8037 18840 -7.39127451110992e-02
+8037 18864 -1.54822597046121e-03
+8037 19128 -1.59366967251027e-03
+8037 19152 -1.78671550878463e-01
+8037 19176 -1.48988839847490e+00
+8037 19200 -3.84397367768761e+00
+8037 19224 -2.71989718090500e+00
+8037 19248 -5.54442084415405e-01
+8037 19272 -1.97985618629702e-02
+8037 19296 -5.56057466610000e-10
+8037 19536 -3.53912977336368e-03
+8037 19560 -4.23340971250763e-01
+8037 19584 -3.39171852619205e+00
+8037 19608 -8.46920094647185e+00
+8037 19632 -6.03043027825396e+00
+8037 19656 -1.30220261752320e+00
+8037 19680 -6.19881299017586e-02
+8037 19704 -3.01603641067000e-09
+8037 19944 -9.54445888291204e-04
+8037 19968 -2.32535662013764e-01
+8037 19992 -2.01599738264807e+00
+8037 20016 -5.25957862952259e+00
+8037 20040 -3.65852053446204e+00
+8037 20064 -7.80770559015173e-01
+8037 20088 -3.76488888679956e-02
+8037 20112 -3.72328364354000e-09
+8037 20352 -3.13185518468501e-05
+8037 20376 -3.91570541987395e-02
+8037 20400 -3.72818880152232e-01
+8037 20424 -1.01643732635631e+00
+8037 20448 -6.65735053161066e-01
+8037 20472 -1.34841749520500e-01
+8037 20496 -6.01949539313841e-03
+8037 20520 -7.91806544230000e-10
+8037 20784 -1.05007272993042e-03
+8037 20808 -1.29970123836126e-02
+8037 20832 -3.85963268737243e-02
+8037 20856 -1.82366467804065e-02
+8037 20880 -2.36917694260551e-03
+8037 20904 -2.45216359375918e-06
+8038 8038 1.00000000000000e+00
+8039 8039 1.00000000000000e+00
+8040 8040 1.00000000000000e+00
+8041 8041 1.00000000000000e+00
+8042 8042 1.00000000000000e+00
+8043 8043 1.00000000000000e+00
+8044 8044 1.00000000000000e+00
+8045 8045 1.00000000000000e+00
+8046 8046 1.00000000000000e+00
+8047 8047 1.00000000000000e+00
+8048 8048 1.00000000000000e+00
+8049 8049 1.00000000000000e+00
+8050 8050 1.00000000000000e+00
+8051 8051 1.00000000000000e+00
+8052 8052 1.00000000000000e+00
+8053 8053 1.00000000000000e+00
+8054 8054 1.00000000000000e+00
+8055 8055 1.00000000000000e+00
+8056 8056 1.00000000000000e+00
+8057 8057 1.00000000000000e+00
+8058 8058 1.00000000000000e+00
+8059 8059 1.00000000000000e+00
+8060 8060 1.00000000000000e+00
+8061 8061 1.32034534890934e+01
+8061 6213 1.40034993139733e-06
+8061 6237 2.84168131865531e-04
+8061 6261 3.78755041462749e-04
+8061 6285 2.44191106880425e-05
+8061 6309 1.29402964269485e-06
+8061 6789 1.93816942058855e-06
+8061 6813 2.99554152661755e-03
+8061 6837 1.02519668862700e-01
+8061 6861 2.47676792294817e-01
+8061 6885 1.05200073412954e-01
+8061 6909 3.20501286228353e-03
+8061 6933 1.15867545268999e-06
+8061 6957 2.39720000000000e-16
+8061 7389 3.99813715338226e-05
+8061 7413 1.06063705484242e-01
+8061 7437 2.02653932949459e+00
+8061 7461 5.12142788929226e+00
+8061 7485 1.94392165227317e+00
+8061 7509 1.04203715562112e-01
+8061 7533 1.99496121906756e-04
+8061 7557 6.70440000000000e-16
+8061 7989 2.80445054406429e-04
+8061 8013 2.70682180385706e-01
+8061 8037 5.17540769465823e+00
+8061 8085 5.09616803122627e+00
+8061 8109 2.35758953438192e-01
+8061 8133 4.29967431666151e-04
+8061 8589 3.16588033027824e-04
+8061 8613 9.94207410797834e-02
+8061 8637 2.08683207293719e+00
+8061 8661 5.17337010637295e+00
+8061 8685 2.02226749522321e+00
+8061 8709 9.95804102733936e-02
+8061 8733 2.44191106880423e-05
+8061 9189 5.17030619608300e-07
+8061 9213 4.38303943466957e-03
+8061 9237 1.07044420043825e-01
+8061 9261 2.51306149652820e-01
+8061 9285 1.01104182244151e-01
+8061 9309 4.89545672319202e-03
+8061 9333 2.21431704970470e-07
+8061 9813 9.53315919924630e-07
+8061 9837 1.59114016612106e-05
+8061 9861 3.83618832664601e-04
+8061 9885 2.24058402351051e-04
+8061 9909 1.45607376990160e-07
+8061 9933 2.42173700000000e-14
+8061 10485 1.27120000000000e-16
+8061 10509 8.29700000000000e-17
+8061 17976 -2.21422910102273e-05
+8061 18000 -1.47971231592430e-04
+8061 18024 -2.59752650159810e-04
+8061 18048 -5.94104233255147e-05
+8061 18072 -2.08894349837000e-09
+8061 18336 -3.09439465411294e-06
+8061 18360 -3.48186344649793e-03
+8061 18384 -4.94282254897321e-02
+8061 18408 -1.75776519637661e-01
+8061 18432 -1.56910533252355e-01
+8061 18456 -3.36791333816442e-02
+8061 18480 -8.90212526518275e-04
+8061 18744 -2.02821011824119e-04
+8061 18768 -6.23061972031627e-02
+8061 18792 -6.59599075902192e-01
+8061 18816 -2.04795403555765e+00
+8061 18840 -1.76536172072492e+00
+8061 18864 -4.15890163972254e-01
+8061 18888 -2.07758257319011e-02
+8061 18912 -3.90152634118480e-07
+8061 19152 -7.98683687606945e-04
+8061 19176 -2.35972834052831e-01
+8061 19200 -2.30931516770857e+00
+8061 19224 -6.82542888510078e+00
+8061 19248 -5.79840393114079e+00
+8061 19272 -1.43848699559361e+00
+8061 19296 -8.88788763992173e-02
+8061 19320 -4.19657041456259e-06
+8061 19560 -3.25705673696318e-04
+8061 19584 -2.06892058201995e-01
+8061 19608 -2.14744083978136e+00
+8061 19632 -6.53788922342877e+00
+8061 19656 -5.55216590365650e+00
+8061 19680 -1.41063348630125e+00
+8061 19704 -9.43825694898244e-02
+8061 19728 -1.09340842857508e-05
+8061 19968 -3.38155601221626e-05
+8061 19992 -4.94140797644586e-02
+8061 20016 -5.74376861200484e-01
+8061 20040 -1.83374722468626e+00
+8061 20064 -1.50118703445927e+00
+8061 20088 -3.62480097222255e-01
+8061 20112 -2.17405842911069e-02
+8061 20136 -2.63632843519922e-06
+8061 20400 -2.61242579381709e-03
+8061 20424 -4.08970490628936e-02
+8061 20448 -1.43215743617082e-01
+8061 20472 -1.06356067585762e-01
+8061 20496 -2.14258727932303e-02
+8061 20520 -6.52984975638916e-04
+8061 20544 -9.21392776400000e-11
+8061 20808 -7.74689897242040e-07
+8061 20832 -2.09075466857389e-05
+8061 20856 -7.26598831971718e-05
+8061 20880 -2.04089667481573e-05
+8061 20904 -6.50044912846620e-07
+8062 8062 1.00000000000000e+00
+8063 8063 1.00000000000000e+00
+8064 8064 1.00000000000000e+00
+8065 8065 1.00000000000000e+00
+8066 8066 1.00000000000000e+00
+8067 8067 1.00000000000000e+00
+8068 8068 1.00000000000000e+00
+8069 8069 1.00000000000000e+00
+8070 8070 1.00000000000000e+00
+8071 8071 1.00000000000000e+00
+8072 8072 1.00000000000000e+00
+8073 8073 1.00000000000000e+00
+8074 8074 1.00000000000000e+00
+8075 8075 1.00000000000000e+00
+8076 8076 1.00000000000000e+00
+8077 8077 1.00000000000000e+00
+8078 8078 1.00000000000000e+00
+8079 8079 1.00000000000000e+00
+8080 8080 1.00000000000000e+00
+8081 8081 1.00000000000000e+00
+8082 8082 1.00000000000000e+00
+8083 8083 1.00000000000000e+00
+8084 8084 1.00000000000000e+00
+8085 8085 1.30625624573197e+01
+8085 6237 1.36098486988969e-06
+8085 6261 7.05197533765978e-05
+8085 6285 4.29967431666138e-04
+8085 6309 9.44854427778995e-05
+8085 6813 8.44175032531240e-07
+8085 6837 3.45602568546582e-03
+8085 6861 1.07567458814668e-01
+8085 6885 2.43852730636460e-01
+8085 6909 8.43200148895841e-02
+8085 6933 5.55556324055003e-03
+8085 6957 1.15867545269001e-06
+8085 7413 1.58758229703411e-05
+8085 7437 1.08772846312633e-01
+8085 7461 1.94522732471998e+00
+8085 7485 4.95787514450112e+00
+8085 7509 2.02259967515333e+00
+8085 7533 9.42274113557110e-02
+8085 7557 2.09858096953744e-04
+8085 8013 4.91919438839997e-04
+8085 8037 2.40930019848203e-01
+8085 8061 5.09616803122627e+00
+8085 8109 4.96244048857834e+00
+8085 8133 2.43852730636461e-01
+8085 8157 3.17936008973022e-04
+8085 8613 2.33697018029737e-04
+8085 8637 1.06392574754094e-01
+8085 8661 2.02145129931115e+00
+8085 8685 4.97708104918744e+00
+8085 8709 2.00834264652634e+00
+8085 8733 1.05200073412954e-01
+8085 8757 1.66984562117836e-05
+8085 9213 2.33359908483919e-06
+8085 9237 3.05267476070694e-03
+8085 9261 9.29174454274852e-02
+8085 9285 2.78473549213862e-01
+8085 9309 9.78293108358420e-02
+8085 9333 3.29078610576367e-03
+8085 9357 1.59094207830698e-06
+8085 9837 7.94031900597680e-07
+8085 9861 1.21338636937128e-04
+8085 9885 2.33536006397612e-04
+8085 9909 2.12636592359758e-04
+8085 9933 2.57973066677049e-06
+8085 10485 8.37030000000000e-16
+8085 10509 5.46280000000000e-16
+8085 17976 -1.27258756124397e-04
+8085 18000 -7.04436337218156e-03
+8085 18024 -3.60917035854068e-02
+8085 18048 -4.61905750663567e-02
+8085 18072 -1.12740152964935e-02
+8085 18096 -3.62720964486756e-04
+8085 18360 -1.69496349620297e-05
+8085 18384 -1.84595574985236e-02
+8085 18408 -2.53821298188303e-01
+8085 18432 -9.41744134857352e-01
+8085 18456 -1.00780222794443e+00
+8085 18480 -2.74213120676928e-01
+8085 18504 -1.79537556714427e-02
+8085 18528 -3.35135530715790e-07
+8085 18768 -8.00448419937289e-05
+8085 18792 -1.05165732007159e-01
+8085 18816 -1.32125388491843e+00
+8085 18840 -4.66386840320000e+00
+8085 18864 -4.81535243342520e+00
+8085 18888 -1.37644441535070e+00
+8085 18912 -1.06320221811237e-01
+8085 18936 -4.61869584146412e-05
+8085 19176 -6.59348435444695e-05
+8085 19200 -1.55713479595500e-01
+8085 19224 -1.96287925132751e+00
+8085 19248 -6.90984690437402e+00
+8085 19272 -7.08479211929123e+00
+8085 19296 -2.12020356069701e+00
+8085 19320 -1.83173325846021e-01
+8085 19344 -1.88632296335786e-04
+8085 19584 -1.22463021456099e-05
+8085 19608 -5.25159046809861e-02
+8085 19632 -7.75414771434271e-01
+8085 19656 -2.88002145247028e+00
+8085 19680 -2.89436506660368e+00
+8085 19704 -8.34174209426217e-01
+8085 19728 -6.74916128452636e-02
+8085 19752 -8.04923988436100e-05
+8085 20016 -4.85672977793047e-03
+8085 20040 -9.46399802028857e-02
+8085 20064 -3.76017434900473e-01
+8085 20088 -3.63297660228324e-01
+8085 20112 -9.77203966759727e-02
+8085 20136 -6.88640208816373e-03
+8085 20160 -8.91149563795798e-06
+8085 20424 -9.82651904440218e-06
+8085 20448 -9.85286141680809e-04
+8085 20472 -4.15438031221905e-03
+8085 20496 -2.38851479682786e-03
+8085 20520 -3.60635957870881e-04
+8085 20544 -6.06677257560000e-10
+8086 8086 1.00000000000000e+00
+8087 8087 1.00000000000000e+00
+8088 8088 1.00000000000000e+00
+8089 8089 1.00000000000000e+00
+8090 8090 1.00000000000000e+00
+8091 8091 1.00000000000000e+00
+8092 8092 1.00000000000000e+00
+8093 8093 1.00000000000000e+00
+8094 8094 1.00000000000000e+00
+8095 8095 1.00000000000000e+00
+8096 8096 1.00000000000000e+00
+8097 8097 1.00000000000000e+00
+8098 8098 1.00000000000000e+00
+8099 8099 1.00000000000000e+00
+8100 8100 1.00000000000000e+00
+8101 8101 1.00000000000000e+00
+8102 8102 1.00000000000000e+00
+8103 8103 1.00000000000000e+00
+8104 8104 1.00000000000000e+00
+8105 8105 1.00000000000000e+00
+8106 8106 1.00000000000000e+00
+8107 8107 1.00000000000000e+00
+8108 8108 1.00000000000000e+00
+8109 8109 1.30555747118988e+01
+8109 6237 3.51291980000000e-13
+8109 6261 7.26515781837230e-07
+8109 6285 1.99496121906747e-04
+8109 6309 2.30005939103817e-04
+8109 6333 1.14629817987542e-04
+8109 6357 3.53353347430290e-07
+8109 6837 9.31527367732900e-08
+8109 6861 4.46279463381609e-03
+8109 6885 9.42274113557096e-02
+8109 6909 2.72468734328648e-01
+8109 6933 8.43200148895844e-02
+8109 6957 3.20501286228349e-03
+8109 6981 6.71275600306666e-06
+8109 7437 3.31206932007268e-05
+8109 7461 9.82611695325464e-02
+8109 7485 2.01810107737038e+00
+8109 7509 4.82079811148057e+00
+8109 7533 2.01810107737035e+00
+8109 7557 9.76298792981412e-02
+8109 7581 2.09551952060577e-04
+8109 7605 2.84600000000000e-17
+8109 8037 5.57366312412017e-04
+8109 8061 2.35758953438192e-01
+8109 8085 4.96244048857834e+00
+8109 8133 4.95787514450109e+00
+8109 8157 2.55684893376085e-01
+8109 8181 2.49408950444568e-04
+8109 8205 1.87940000000000e-16
+8109 8637 1.06435412031522e-04
+8109 8661 1.04108481663570e-01
+8109 8685 2.01957827044317e+00
+8109 8709 4.98296884704714e+00
+8109 8733 1.94392165227317e+00
+8109 8757 1.05587349081564e-01
+8109 8781 6.59455841648092e-05
+8109 9237 1.37306196538332e-06
+8109 9261 5.38660454727596e-03
+8109 9285 8.52217717988987e-02
+8109 9309 2.51563538065893e-01
+8109 9333 1.11890756819087e-01
+8109 9357 2.37454150425827e-03
+8109 9381 1.89681802581382e-06
+8109 9885 1.15050029531140e-04
+8109 9909 3.84182544807878e-04
+8109 9933 7.84963079505847e-05
+8109 9957 6.86885643072803e-06
+8109 17616 -3.45218003082492e-04
+8109 17640 -3.03185917096303e-03
+8109 17664 -7.05238029109572e-03
+8109 17688 -2.06384177255703e-03
+8109 17712 -1.03213653480994e-04
+8109 17976 -2.55683926896930e-07
+8109 18000 -4.14430081245728e-03
+8109 18024 -8.08640652260128e-02
+8109 18048 -3.62722235630272e-01
+8109 18072 -4.82708299194579e-01
+8109 18096 -1.52427932049993e-01
+8109 18120 -1.27531411453205e-02
+8109 18144 -5.34096308434300e-08
+8109 18384 -1.64776284888537e-06
+8109 18408 -3.79318522441511e-02
+8109 18432 -6.46991543310090e-01
+8109 18456 -2.72455878059637e+00
+8109 18480 -3.42674317775812e+00
+8109 18504 -1.14383406827340e+00
+8109 18528 -1.10295881093752e-01
+8109 18552 -1.88504826688790e-04
+8109 18792 -2.75579249208747e-06
+8109 18816 -9.59262161090063e-02
+8109 18840 -1.53990166618202e+00
+8109 18864 -6.27649976772474e+00
+8109 18888 -7.65930322967342e+00
+8109 18912 -2.67868645090644e+00
+8109 18936 -2.84162572146217e-01
+8109 18960 -9.06390528705483e-04
+8109 19200 -6.25027141297630e-07
+8109 19224 -4.68504653711728e-02
+8109 19248 -9.17064794435832e-01
+8109 19272 -3.94652603057978e+00
+8109 19296 -4.82545053729418e+00
+8109 19320 -1.66908141813578e+00
+8109 19344 -1.75026824014732e-01
+8109 19368 -8.00980653817322e-04
+8109 19632 -6.53347571849009e-03
+8109 19656 -1.69941020545758e-01
+8109 19680 -7.69802226468793e-01
+8109 19704 -9.24693753917565e-01
+8109 19728 -3.03095516402847e-01
+8109 19752 -2.93382054589833e-02
+8109 19776 -1.53172366412976e-04
+8109 20040 -4.25390998073090e-05
+8109 20064 -6.09418934663195e-03
+8109 20088 -3.01220400623416e-02
+8109 20112 -3.16680109148224e-02
+8109 20136 -7.22537427582635e-03
+8109 20160 -2.10501275725715e-04
+8110 8110 1.00000000000000e+00
+8111 8111 1.00000000000000e+00
+8112 8112 1.00000000000000e+00
+8113 8113 1.00000000000000e+00
+8114 8114 1.00000000000000e+00
+8115 8115 1.00000000000000e+00
+8116 8116 1.00000000000000e+00
+8117 8117 1.00000000000000e+00
+8118 8118 1.00000000000000e+00
+8119 8119 1.00000000000000e+00
+8120 8120 1.00000000000000e+00
+8121 8121 1.00000000000000e+00
+8122 8122 1.00000000000000e+00
+8123 8123 1.00000000000000e+00
+8124 8124 1.00000000000000e+00
+8125 8125 1.00000000000000e+00
+8126 8126 1.00000000000000e+00
+8127 8127 1.00000000000000e+00
+8128 8128 1.00000000000000e+00
+8129 8129 1.00000000000000e+00
+8130 8130 1.00000000000000e+00
+8131 8131 1.00000000000000e+00
+8132 8132 1.00000000000000e+00
+8133 8133 1.30625624573199e+01
+8133 6285 1.15867545269000e-06
+8133 6309 2.09858096953743e-04
+8133 6333 3.17936008973020e-04
+8133 6357 1.66984562117843e-05
+8133 6381 1.59094207830707e-06
+8133 6885 5.55556324055004e-03
+8133 6909 9.42274113557098e-02
+8133 6933 2.43852730636458e-01
+8133 6957 1.05200073412952e-01
+8133 6981 3.29078610576361e-03
+8133 7005 2.57973066677058e-06
+8133 7461 9.44854427779038e-05
+8133 7485 8.43200148895854e-02
+8133 7509 2.02259967515330e+00
+8133 7533 4.96244048857833e+00
+8133 7557 2.00834264652635e+00
+8133 7581 9.78293108358406e-02
+8133 7605 2.12636592359755e-04
+8133 7629 5.46280000000000e-16
+8133 8061 4.29967431666151e-04
+8133 8085 2.43852730636461e-01
+8133 8109 4.95787514450109e+00
+8133 8157 4.97708104918752e+00
+8133 8181 2.78473549213862e-01
+8133 8205 2.33536006397610e-04
+8133 8229 8.37030000000000e-16
+8133 8661 7.05197533765968e-05
+8133 8685 1.07567458814668e-01
+8133 8709 1.94522732471998e+00
+8133 8733 5.09616803122634e+00
+8133 8757 2.02145129931117e+00
+8133 8781 9.29174454274854e-02
+8133 8805 1.21338636937128e-04
+8133 9261 1.36098486988975e-06
+8133 9285 3.45602568546580e-03
+8133 9309 1.08772846312618e-01
+8133 9333 2.40930019848202e-01
+8133 9357 1.06392574754095e-01
+8133 9381 3.05267476070691e-03
+8133 9405 7.94031900597670e-07
+8133 9885 8.44175032531250e-07
+8133 9909 1.58758229703412e-05
+8133 9933 4.91919438840013e-04
+8133 9957 2.33697018029744e-04
+8133 9981 2.33359908483914e-06
+8133 17232 -3.35135530715780e-07
+8133 17256 -4.61869584146437e-05
+8133 17280 -1.88632296335796e-04
+8133 17304 -8.04923988436137e-05
+8133 17328 -8.91149563795828e-06
+8133 17616 -3.62720964486753e-04
+8133 17640 -1.79537556714427e-02
+8133 17664 -1.06320221811236e-01
+8133 17688 -1.83173325846016e-01
+8133 17712 -6.74916128452622e-02
+8133 17736 -6.88640208816362e-03
+8133 17760 -6.06677257560000e-10
+8133 18024 -1.12740152964935e-02
+8133 18048 -2.74213120676923e-01
+8133 18072 -1.37644441535069e+00
+8133 18096 -2.12020356069702e+00
+8133 18120 -8.34174209426221e-01
+8133 18144 -9.77203966759724e-02
+8133 18168 -3.60635957870881e-04
+8133 18432 -4.61905750663570e-02
+8133 18456 -1.00780222794441e+00
+8133 18480 -4.81535243342516e+00
+8133 18504 -7.08479211929137e+00
+8133 18528 -2.89436506660373e+00
+8133 18552 -3.63297660228326e-01
+8133 18576 -2.38851479682785e-03
+8133 18840 -3.60917035854080e-02
+8133 18864 -9.41744134857346e-01
+8133 18888 -4.66386840319999e+00
+8133 18912 -6.90984690437414e+00
+8133 18936 -2.88002145247032e+00
+8133 18960 -3.76017434900476e-01
+8133 18984 -4.15438031221900e-03
+8133 19248 -7.04436337218187e-03
+8133 19272 -2.53821298188303e-01
+8133 19296 -1.32125388491843e+00
+8133 19320 -1.96287925132751e+00
+8133 19344 -7.75414771434278e-01
+8133 19368 -9.46399802028869e-02
+8133 19392 -9.85286141680794e-04
+8133 19656 -1.27258756124394e-04
+8133 19680 -1.84595574985236e-02
+8133 19704 -1.05165732007158e-01
+8133 19728 -1.55713479595496e-01
+8133 19752 -5.25159046809857e-02
+8133 19776 -4.85672977793062e-03
+8133 19800 -9.82651904440193e-06
+8133 20088 -1.69496349620305e-05
+8133 20112 -8.00448419937318e-05
+8133 20136 -6.59348435444703e-05
+8133 20160 -1.22463021456100e-05
+8134 8134 1.00000000000000e+00
+8135 8135 1.00000000000000e+00
+8136 8136 1.00000000000000e+00
+8137 8137 1.00000000000000e+00
+8138 8138 1.00000000000000e+00
+8139 8139 1.00000000000000e+00
+8140 8140 1.00000000000000e+00
+8141 8141 1.00000000000000e+00
+8142 8142 1.00000000000000e+00
+8143 8143 1.00000000000000e+00
+8144 8144 1.00000000000000e+00
+8145 8145 1.00000000000000e+00
+8146 8146 1.00000000000000e+00
+8147 8147 1.00000000000000e+00
+8148 8148 1.00000000000000e+00
+8149 8149 1.00000000000000e+00
+8150 8150 1.00000000000000e+00
+8151 8151 1.00000000000000e+00
+8152 8152 1.00000000000000e+00
+8153 8153 1.00000000000000e+00
+8154 8154 1.00000000000000e+00
+8155 8155 1.00000000000000e+00
+8156 8156 1.00000000000000e+00
+8157 8157 1.35061797798595e+01
+8157 6309 5.76185385784561e-06
+8157 6333 8.99998833830992e-05
+8157 6357 5.56335941560844e-04
+8157 6381 7.84494215473683e-05
+8157 6909 4.46279463381606e-03
+8157 6933 1.07567458814667e-01
+8157 6957 2.47676792294816e-01
+8157 6981 9.01462639339692e-02
+8157 7005 4.96671538245737e-03
+8157 7029 5.31858846635926e-06
+8157 7485 1.14629817987543e-04
+8157 7509 8.32621938773911e-02
+8157 7533 2.01957827044318e+00
+8157 7557 5.01207283480075e+00
+8157 7581 2.12534457488613e+00
+8157 7605 1.03347535291059e-01
+8157 7629 1.78814708764562e-04
+8157 8085 3.17936008973022e-04
+8157 8109 2.55684893376085e-01
+8157 8133 4.97708104918752e+00
+8157 8181 5.01444778180917e+00
+8157 8205 2.86213876935508e-01
+8157 8229 2.93336389137444e-04
+8157 8685 8.99998833830966e-05
+8157 8709 1.10241595057534e-01
+8157 8733 2.02226749522323e+00
+8157 8757 5.03563186199643e+00
+8157 8781 2.15151970522629e+00
+8157 8805 8.98139243420841e-02
+8157 8829 1.28308173330614e-04
+8157 9285 1.21535498385407e-05
+8157 9309 2.64740635360718e-03
+8157 9333 9.57663978761802e-02
+8157 9357 2.80488210935191e-01
+8157 9381 1.04998272549908e-01
+8157 9405 4.01865511835702e-03
+8157 9429 8.53127317558100e-08
+8157 9909 7.87821774847120e-07
+8157 9933 1.17724328222056e-04
+8157 9957 1.38422994045989e-04
+8157 9981 1.80679317919328e-04
+8157 10005 1.30211113888141e-05
+8157 17232 -6.46536115564740e-07
+8157 17256 -1.86222575103144e-03
+8157 17280 -1.82588596240225e-02
+8157 17304 -4.78374423681407e-02
+8157 17328 -2.16163911218320e-02
+8157 17352 -2.69918411505044e-03
+8157 17640 -2.89134898941351e-03
+8157 17664 -9.93778601986976e-02
+8157 17688 -6.00080589743577e-01
+8157 17712 -1.14368139928723e+00
+8157 17736 -5.34791752860124e-01
+8157 17760 -7.37384779871936e-02
+8157 17784 -4.06769525242680e-04
+8157 18048 -1.65572343303866e-02
+8157 18072 -5.46152839053609e-01
+8157 18096 -3.12316738344963e+00
+8157 18120 -5.60361692656968e+00
+8157 18144 -2.69588979393636e+00
+8157 18168 -3.95378165876492e-01
+8157 18192 -4.83582745070654e-03
+8157 18456 -2.31392107675323e-02
+8157 18480 -8.36607401537243e-01
+8157 18504 -4.76234705419666e+00
+8157 18528 -8.39721704320002e+00
+8157 18552 -4.18131636633928e+00
+8157 18576 -6.56082329760212e-01
+8157 18600 -1.37345708174825e-02
+8157 18864 -5.97874547333361e-03
+8157 18888 -3.30604382240397e-01
+8157 18912 -1.99343558131646e+00
+8157 18936 -3.58766882084476e+00
+8157 18960 -1.71860913009062e+00
+8157 18984 -2.58902342369894e-01
+8157 19008 -5.17996492292182e-03
+8157 19272 -2.44302264716895e-04
+8157 19296 -4.04287971817133e-02
+8157 19320 -2.60977235824414e-01
+8157 19344 -4.78760119398739e-01
+8157 19368 -2.13828212972157e-01
+8157 19392 -2.95734225758226e-02
+8157 19416 -4.92803893296500e-04
+8157 19704 -5.12372734049634e-04
+8157 19728 -3.14675205445585e-03
+8157 19752 -4.92164144620360e-03
+8157 19776 -1.17815807475612e-03
+8157 19800 -2.02242391247017e-05
+8158 8158 1.00000000000000e+00
+8159 8159 1.00000000000000e+00
+8160 8160 1.00000000000000e+00
+8161 8161 1.00000000000000e+00
+8162 8162 1.00000000000000e+00
+8163 8163 1.00000000000000e+00
+8164 8164 1.00000000000000e+00
+8165 8165 1.00000000000000e+00
+8166 8166 1.00000000000000e+00
+8167 8167 1.00000000000000e+00
+8168 8168 1.00000000000000e+00
+8169 8169 1.00000000000000e+00
+8170 8170 1.00000000000000e+00
+8171 8171 1.00000000000000e+00
+8172 8172 1.00000000000000e+00
+8173 8173 1.00000000000000e+00
+8174 8174 1.00000000000000e+00
+8175 8175 1.00000000000000e+00
+8176 8176 1.00000000000000e+00
+8177 8177 1.00000000000000e+00
+8178 8178 1.00000000000000e+00
+8179 8179 1.00000000000000e+00
+8180 8180 1.00000000000000e+00
+8181 8181 1.39656075658925e+01
+8181 6333 1.21535498385414e-05
+8181 6357 1.62005155421065e-04
+8181 6381 1.40080260134692e-04
+8181 6405 1.25135402336312e-04
+8181 6429 7.22147823010730e-07
+8181 6909 9.31527367732900e-08
+8181 6933 3.45602568546578e-03
+8181 6957 1.02519668862684e-01
+8181 6981 2.80952884632903e-01
+8181 7005 9.81329879921907e-02
+8181 7029 3.00569983360125e-03
+8181 7053 1.40334369341952e-05
+8181 7509 1.11059283569015e-04
+8181 7533 8.52217717988976e-02
+8181 7557 2.12226312376188e+00
+8181 7581 5.12682007264041e+00
+8181 7605 2.13949290794892e+00
+8181 7629 1.24287728839433e-01
+8181 7653 1.17189641502778e-04
+8181 8109 2.49408950444568e-04
+8181 8133 2.78473549213862e-01
+8181 8157 5.01444778180917e+00
+8181 8205 5.46392976673361e+00
+8181 8229 2.93701725343250e-01
+8181 8253 4.54537256974539e-04
+8181 8709 1.76905947185155e-04
+8181 8733 1.01104182244151e-01
+8181 8757 2.15568720645538e+00
+8181 8781 5.35035677744414e+00
+8181 8805 2.31147641763538e+00
+8181 8829 1.03318965213877e-01
+8181 8853 1.46665177000229e-04
+8181 9309 5.53908622508744e-06
+8181 9333 4.96537002526930e-03
+8181 9357 9.20977706503669e-02
+8181 9381 2.78594960790361e-01
+8181 9405 1.30553376912941e-01
+8181 9429 6.21683783583451e-03
+8181 9957 8.84933336397340e-05
+8181 9981 6.00232747143563e-04
+8181 10005 1.11714081298831e-04
+8181 10029 8.25552108883452e-06
+8181 16872 -2.24011129438341e-05
+8181 16896 -1.31385706373235e-03
+8181 16920 -5.56934197282925e-03
+8181 16944 -3.82397426018653e-03
+8181 16968 -6.49930412057381e-04
+8181 17256 -4.48079598200343e-04
+8181 17280 -2.92174748183984e-02
+8181 17304 -2.18693144643847e-01
+8181 17328 -5.08138615513815e-01
+8181 17352 -2.95079386881867e-01
+8181 17376 -4.81042644266794e-02
+8181 17400 -3.92140677873937e-04
+8181 17664 -4.43884181165063e-03
+8181 17688 -2.51669427949046e-01
+8181 17712 -1.73159753784728e+00
+8181 17736 -3.75690140381855e+00
+8181 17760 -2.22780410194089e+00
+8181 17784 -3.90543641669712e-01
+8181 17808 -8.39152786425451e-03
+8181 18072 -1.13536029586749e-02
+8181 18096 -6.28655875378790e-01
+8181 18120 -4.15319957528692e+00
+8181 18144 -8.67746750985505e+00
+8181 18168 -5.27554891058860e+00
+8181 18192 -9.86091564195355e-01
+8181 18216 -3.18464976229816e-02
+8181 18480 -3.92424215915939e-03
+8181 18504 -3.73523759436999e-01
+8181 18528 -2.63136498869216e+00
+8181 18552 -5.69463606063287e+00
+8181 18576 -3.42870701505584e+00
+8181 18600 -6.46169679302478e-01
+8181 18624 -2.34736856990423e-02
+8181 18888 -3.19429685077532e-04
+8181 18912 -6.87655032636457e-02
+8181 18936 -5.14869724059548e-01
+8181 18960 -1.14612630496388e+00
+8181 18984 -6.49732174719316e-01
+8181 19008 -1.16903644012218e-01
+8181 19032 -4.16543717404555e-03
+8181 19320 -2.44491993247958e-03
+8181 19344 -2.03097815182611e-02
+8181 19368 -4.65170820385612e-02
+8181 19392 -1.83378568091775e-02
+8181 19416 -1.95469579268333e-03
+8181 19440 -7.35209993245760e-07
+8182 8182 1.00000000000000e+00
+8183 8183 1.00000000000000e+00
+8184 8184 1.00000000000000e+00
+8185 8185 1.00000000000000e+00
+8186 8186 1.00000000000000e+00
+8187 8187 1.00000000000000e+00
+8188 8188 1.00000000000000e+00
+8189 8189 1.00000000000000e+00
+8190 8190 1.00000000000000e+00
+8191 8191 1.00000000000000e+00
+8192 8192 1.00000000000000e+00
+8193 8193 1.00000000000000e+00
+8194 8194 1.00000000000000e+00
+8195 8195 1.00000000000000e+00
+8196 8196 1.00000000000000e+00
+8197 8197 1.00000000000000e+00
+8198 8198 1.00000000000000e+00
+8199 8199 1.00000000000000e+00
+8200 8200 1.00000000000000e+00
+8201 8201 1.00000000000000e+00
+8202 8202 1.00000000000000e+00
+8203 8203 1.00000000000000e+00
+8204 8204 1.00000000000000e+00
+8205 8205 1.52048834911817e+01
+8205 6357 2.33219156354422e-06
+8205 6381 2.46473168732274e-04
+8205 6405 5.00161568839055e-04
+8205 6429 1.87607910286075e-05
+8205 6453 1.07354659163103e-06
+8205 6933 8.44175032531270e-07
+8205 6957 2.99554152661753e-03
+8205 6981 1.09523577382529e-01
+8205 7005 2.67067283445567e-01
+8205 7029 1.29265031934992e-01
+8205 7053 4.53064416783995e-03
+8205 7077 1.89409891545966e-06
+8205 7533 1.15050029531139e-04
+8205 7557 9.54297444868246e-02
+8205 7581 2.13680044591831e+00
+8205 7605 5.76486307275885e+00
+8205 7629 2.44145806955100e+00
+8205 7653 1.48638855963741e-01
+8205 7677 6.44276186536669e-05
+8205 8109 1.87940000000000e-16
+8205 8133 2.33536006397610e-04
+8205 8157 2.86213876935508e-01
+8205 8181 5.46392976673361e+00
+8205 8229 6.54732452314670e+00
+8205 8253 3.19728559420826e-01
+8205 8277 4.39095393213604e-04
+8205 8709 1.22830000000000e-16
+8205 8733 2.24058402351051e-04
+8205 8757 1.03852201314302e-01
+8205 8781 2.30005723638072e+00
+8205 8805 6.10174473440770e+00
+8205 8829 2.54478197047026e+00
+8205 8853 8.83750882412685e-02
+8205 8877 1.00310287655636e-04
+8205 9333 2.33286633743801e-06
+8205 9357 3.81948091007359e-03
+8205 9381 1.28294801162543e-01
+8205 9405 3.22180068646864e-01
+8205 9429 1.05567678610665e-01
+8205 9453 4.48672969599103e-03
+8205 9957 1.62962235055504e-06
+8205 9981 1.86095276753446e-05
+8205 10005 4.19351447657620e-04
+8205 10029 2.11681717864973e-04
+8205 10053 9.84462529829350e-07
+8205 16512 -1.60601360825507e-05
+8205 16536 -8.98871072744653e-05
+8205 16560 -1.18646387859601e-04
+8205 16584 -2.56465629442626e-05
+8205 16872 -1.04073115619178e-05
+8205 16896 -5.16812501595184e-03
+8205 16920 -6.02435661366244e-02
+8205 16944 -1.90281153849868e-01
+8205 16968 -1.44830657291904e-01
+8205 16992 -2.67245997549215e-02
+8205 17016 -1.19661164935188e-04
+8205 17280 -9.28518009400178e-04
+8205 17304 -9.71852575256383e-02
+8205 17328 -8.49994985456503e-01
+8205 17352 -2.32104302524862e+00
+8205 17376 -1.79075268972270e+00
+8205 17400 -3.59609790199517e-01
+8205 17424 -8.19121310477220e-03
+8205 17688 -3.87791204741487e-03
+8205 17712 -3.81038440365969e-01
+8205 17736 -3.09628035087754e+00
+8205 17760 -8.01336539963256e+00
+8205 17784 -6.17588936427217e+00
+8205 17808 -1.28251347224221e+00
+8205 17832 -3.89639863280264e-02
+8205 18096 -2.16668756254670e-03
+8205 18120 -3.62324339704612e-01
+8205 18144 -3.07599406256256e+00
+8205 18168 -8.08169379493091e+00
+8205 18192 -6.06421539807084e+00
+8205 18216 -1.25135147236016e+00
+8205 18240 -4.00258339285658e-02
+8205 18504 -3.19949948932867e-04
+8205 18528 -9.59646298107564e-02
+8205 18552 -8.81184445223622e-01
+8205 18576 -2.40623175819990e+00
+8205 18600 -1.72365237570309e+00
+8205 18624 -3.40415392059891e-01
+8205 18648 -9.34229118965563e-03
+8205 18912 -6.64224849700000e-11
+8205 18936 -6.56477375214336e-03
+8205 18960 -7.08050616192473e-02
+8205 18984 -2.07628844917461e-01
+8205 19008 -1.36403831570535e-01
+8205 19032 -2.42284408096530e-02
+8205 19056 -3.37059951672547e-04
+8205 19344 -7.58338003402621e-06
+8205 19368 -7.26889822415109e-05
+8205 19392 -1.77369989909076e-04
+8205 19416 -4.38145079191083e-05
+8205 19440 -3.64761453425580e-07
+8206 8206 1.00000000000000e+00
+8207 8207 1.00000000000000e+00
+8208 8208 1.00000000000000e+00
+8209 8209 1.00000000000000e+00
+8210 8210 1.00000000000000e+00
+8211 8211 1.00000000000000e+00
+8212 8212 1.00000000000000e+00
+8213 8213 1.00000000000000e+00
+8214 8214 1.00000000000000e+00
+8215 8215 1.00000000000000e+00
+8216 8216 1.00000000000000e+00
+8217 8217 1.00000000000000e+00
+8218 8218 1.00000000000000e+00
+8219 8219 1.00000000000000e+00
+8220 8220 1.00000000000000e+00
+8221 8221 1.00000000000000e+00
+8222 8222 1.00000000000000e+00
+8223 8223 1.00000000000000e+00
+8224 8224 1.00000000000000e+00
+8225 8225 1.00000000000000e+00
+8226 8226 1.00000000000000e+00
+8227 8227 1.00000000000000e+00
+8228 8228 1.00000000000000e+00
+8229 8229 1.64581799012992e+01
+8229 6381 6.72456755290754e-06
+8229 6405 8.91005421407028e-05
+8229 6429 4.67153324025474e-04
+8229 6453 1.40199035422927e-04
+8229 6957 1.93816942058851e-06
+8229 6981 2.66749886865830e-03
+8229 7005 1.32107227727701e-01
+8229 7029 3.24085759625745e-01
+8229 7053 1.03910226659848e-01
+8229 7077 5.34094459172518e-03
+8229 7101 1.76345157057958e-06
+8229 7557 6.51738304218118e-05
+8229 7581 1.19507368978339e-01
+8229 7605 2.43971202276572e+00
+8229 7629 6.56258203239002e+00
+8229 7653 2.20243939165186e+00
+8229 7677 1.18442951526063e-01
+8229 7701 9.01164771458686e-06
+8229 8133 8.37030000000000e-16
+8229 8157 2.93336389137444e-04
+8229 8181 2.93701725343250e-01
+8229 8205 6.54732452314670e+00
+8229 8253 6.20292311079286e+00
+8229 8277 2.74020269122410e-01
+8229 8301 8.85453302770000e-10
+8229 8733 1.27120000000000e-16
+8229 8757 2.41938520180960e-04
+8229 8781 1.20361755725483e-01
+8229 8805 2.52076813096791e+00
+8229 8829 5.95013494598462e+00
+8229 8853 3.20527510274180e+00
+8229 8877 3.21160075323183e-02
+8229 9357 7.38583222521840e-06
+8229 9381 4.36077583164119e-03
+8229 9405 9.38903743213126e-02
+8229 9429 3.65589698849345e-01
+8229 9453 1.26642207232518e-01
+8229 9981 5.57780449472130e-07
+8229 10005 1.17729495477173e-04
+8229 10029 1.57546452617899e-04
+8229 10053 1.24828921303145e-06
+8229 16512 -2.48574860122958e-04
+8229 16536 -9.44696404610493e-03
+8229 16560 -3.98639657652778e-02
+8229 16584 -3.21841845409034e-02
+8229 16608 -6.82991249166350e-03
+8229 16896 -1.51013638628266e-04
+8229 16920 -3.39204386699661e-02
+8229 16944 -3.96364039902625e-01
+8229 16968 -1.20828029646939e+00
+8229 16992 -8.00085278224110e-01
+8229 17016 -2.12057904827484e-01
+8229 17304 -7.78915299212628e-04
+8229 17328 -1.98701968048535e-01
+8229 17352 -2.16294920165838e+00
+8229 17376 -6.39325921400955e+00
+8229 17400 -4.42373616499349e+00
+8229 17424 -1.33921351264528e+00
+8229 17712 -8.50483332369737e-04
+8229 17736 -3.13158933648115e-01
+8229 17760 -3.40775270230962e+00
+8229 17784 -1.02216097184028e+01
+8229 17808 -7.85669670876051e+00
+8229 17832 -2.69515405120276e+00
+8229 18120 -1.74967604472399e-04
+8229 18144 -1.19803551127477e-01
+8229 18168 -1.41134525042509e+00
+8229 18192 -4.32881999660595e+00
+8229 18216 -3.15244129814920e+00
+8229 18240 -1.14051294456305e+00
+8229 18528 -2.67149432083500e-08
+8229 18552 -1.36571193791504e-02
+8229 18576 -1.82793376238335e-01
+8229 18600 -5.76961529729772e-01
+8229 18624 -3.74380593890018e-01
+8229 18648 -1.37927352900207e-01
+8229 18960 -1.04917510642632e-04
+8229 18984 -2.60171715117962e-03
+8229 19008 -9.14157579495108e-03
+8229 19032 -3.41592650809741e-03
+8229 19056 -3.08469849872081e-04
+8230 8230 1.00000000000000e+00
+8231 8231 1.00000000000000e+00
+8232 8232 1.00000000000000e+00
+8233 8233 1.00000000000000e+00
+8234 8234 1.00000000000000e+00
+8235 8235 1.00000000000000e+00
+8236 8236 1.00000000000000e+00
+8237 8237 1.00000000000000e+00
+8238 8238 1.00000000000000e+00
+8239 8239 1.00000000000000e+00
+8240 8240 1.00000000000000e+00
+8241 8241 1.00000000000000e+00
+8242 8242 1.00000000000000e+00
+8243 8243 1.00000000000000e+00
+8244 8244 1.00000000000000e+00
+8245 8245 1.00000000000000e+00
+8246 8246 1.00000000000000e+00
+8247 8247 1.00000000000000e+00
+8248 8248 1.00000000000000e+00
+8249 8249 1.00000000000000e+00
+8250 8250 1.00000000000000e+00
+8251 8251 1.00000000000000e+00
+8252 8252 1.00000000000000e+00
+8253 8253 2.55581485016710e+01
+8253 5829 1.16118000000000e-15
+8253 5853 1.70813000000000e-15
+8253 6405 2.74962501930975e-06
+8253 6429 2.62041531254356e-04
+8253 6453 2.67258390988052e-04
+8253 6477 1.59825900986153e-04
+8253 6501 2.36590348617504e-06
+8253 6981 1.74930753381089e-06
+8253 7005 4.53171246542376e-03
+8253 7029 1.20597050544896e-01
+8253 7053 3.37952987363564e-01
+8253 7077 2.50073467614373e-01
+8253 7101 4.31692185634925e-03
+8253 7581 1.97278770701271e-05
+8253 7605 1.46585707143286e-01
+8253 7629 2.14495058601447e+00
+8253 7653 8.40787723111244e+00
+8253 7677 5.44645677899699e+00
+8253 7701 8.35456992673703e-03
+8253 8181 4.54537256974539e-04
+8253 8205 3.19728559420826e-01
+8253 8229 6.20292311079286e+00
+8253 8277 5.54000696248000e+00
+8253 8301 8.87219725627910e-07
+8253 8781 2.67866754088779e-04
+8253 8805 1.02243790726399e-01
+8253 8829 4.15240925190618e+00
+8253 8853 9.26996687393122e+00
+8253 8877 3.02172057297925e-01
+8253 9381 1.54657054999064e-06
+8253 9405 5.64636705605456e-03
+8253 9429 2.69689879613938e-01
+8253 9453 1.92744512039679e-01
+8253 10029 1.26615946688093e-06
+8253 10053 4.57242407563120e-07
+8253 16128 -1.76489563238000e-09
+8253 16152 -3.96784765631894e-04
+8253 16176 -6.21525660309237e-03
+8253 16200 -9.65306573404792e-03
+8253 16512 -9.43368006238333e-06
+8253 16536 -8.79520094271789e-03
+8253 16560 -1.01470518843152e-01
+8253 16584 -8.34970990283466e-01
+8253 16608 -1.18740850620948e+00
+8253 16920 -8.35721701630052e-05
+8253 16944 -8.96751616157923e-02
+8253 16968 -8.51279404173907e-01
+8253 16992 -5.46128485173967e+00
+8253 17016 -7.28706157576676e+00
+8253 17328 -1.93029350231710e-04
+8253 17352 -2.48937627752005e-01
+8253 17376 -2.17167163998992e+00
+8253 17400 -1.11982184290234e+01
+8253 17424 -1.36483898526971e+01
+8253 17736 -4.68209319752302e-05
+8253 17760 -1.43573546139108e-01
+8253 17784 -1.52603805139518e+00
+8253 17808 -8.42168416152389e+00
+8253 17832 -9.88947253249662e+00
+8253 18144 -2.45870515439590e-07
+8253 18168 -2.38431983512716e-02
+8253 18192 -3.02877918444975e-01
+8253 18216 -1.88437508933348e+00
+8253 18240 -2.26850405724519e+00
+8253 18576 -4.19575438955593e-04
+8253 18600 -9.12151484469968e-03
+8253 18624 -8.86963956974827e-02
+8253 18648 -1.24451148894913e-01
+8254 8254 1.00000000000000e+00
+8255 8255 1.00000000000000e+00
+8256 8256 1.00000000000000e+00
+8257 8257 1.00000000000000e+00
+8258 8258 1.00000000000000e+00
+8259 8259 1.00000000000000e+00
+8260 8260 1.00000000000000e+00
+8261 8261 1.00000000000000e+00
+8262 8262 1.00000000000000e+00
+8263 8263 1.00000000000000e+00
+8264 8264 1.00000000000000e+00
+8265 8265 1.00000000000000e+00
+8266 8266 1.00000000000000e+00
+8267 8267 1.00000000000000e+00
+8268 8268 1.00000000000000e+00
+8269 8269 1.00000000000000e+00
+8270 8270 1.00000000000000e+00
+8271 8271 1.00000000000000e+00
+8272 8272 1.00000000000000e+00
+8273 8273 1.00000000000000e+00
+8274 8274 1.00000000000000e+00
+8275 8275 1.00000000000000e+00
+8276 8276 1.00000000000000e+00
+8277 8277 3.46517180999936e+00
+8277 5829 1.61450000000000e-16
+8277 5853 2.37500000000000e-16
+8277 6405 7.79578600000000e-14
+8277 6429 1.65821052232080e-07
+8277 6453 2.33188526392939e-04
+8277 6477 3.47698256597034e-04
+8277 6501 7.67643334023922e-06
+8277 7005 2.46575223213160e-07
+8277 7029 4.58947816494345e-03
+8277 7053 1.36090564095546e-01
+8277 7077 2.74929435139304e-01
+8277 7101 1.20671885798253e-02
+8277 7605 2.27667645083757e-05
+8277 7629 8.90814666278486e-02
+8277 7653 3.62600246314926e+00
+8277 7677 4.34538569436165e+00
+8277 7701 1.38154135506734e-02
+8277 8205 4.39095393213604e-04
+8277 8229 2.74020269122410e-01
+8277 8253 5.54000696248000e+00
+8277 8301 8.87085011605780e-07
+8277 8781 4.20640000000000e-16
+8277 8805 2.13322127890798e-04
+8277 8829 1.27588687451476e-01
+8277 8853 7.56157576803318e-01
+8277 8877 5.97228003931940e-02
+8277 9381 1.50650000000000e-16
+8277 9405 1.55053844990900e-08
+8277 9429 2.12411346181340e-03
+8277 9453 3.63532297866516e-03
+8277 10029 1.51028246000000e-11
+8277 10053 5.45496585000000e-12
+8277 16128 -2.45391655890000e-10
+8277 16152 -6.88591247467996e-04
+8277 16176 -1.86238563130763e-02
+8277 16200 -3.24275802740597e-02
+8277 16536 -2.75079980372742e-06
+8277 16560 -2.01988474371424e-02
+8277 16584 -6.70418245275526e-01
+8277 16608 -1.19951607928595e+00
+8277 16944 -1.13997207202415e-05
+8277 16968 -8.38121177760765e-02
+8277 16992 -2.79768642905916e+00
+8277 17016 -5.00898442642449e+00
+8277 17352 -4.35062775778439e-06
+8277 17376 -7.17232553767065e-02
+8277 17400 -2.21730298722626e+00
+8277 17424 -3.93265630313728e+00
+8277 17760 -4.00202380170130e-07
+8277 17784 -1.69311411195079e-02
+8277 17808 -5.54951980889194e-01
+8277 17832 -9.91396379203716e-01
+8277 18192 -8.96387949988683e-04
+8277 18216 -3.98978040899698e-02
+8277 18240 -7.35208925300189e-02
+8277 18600 -4.94664904690000e-10
+8277 18624 -7.01874925208520e-07
+8277 18648 -1.40028719608418e-06
+8278 8278 1.00000000000000e+00
+8279 8279 1.00000000000000e+00
+8280 8280 1.00000000000000e+00
+8281 8281 1.00000000000000e+00
+8282 8282 1.00000000000000e+00
+8283 8283 1.00000000000000e+00
+8284 8284 1.00000000000000e+00
+8285 8285 1.00000000000000e+00
+8286 8286 1.00000000000000e+00
+8287 8287 1.00000000000000e+00
+8288 8288 1.00000000000000e+00
+8289 8289 1.00000000000000e+00
+8290 8290 1.00000000000000e+00
+8291 8291 1.00000000000000e+00
+8292 8292 1.00000000000000e+00
+8293 8293 1.00000000000000e+00
+8294 8294 1.00000000000000e+00
+8295 8295 1.00000000000000e+00
+8296 8296 1.00000000000000e+00
+8297 8297 1.00000000000000e+00
+8298 8298 1.00000000000000e+00
+8299 8299 1.00000000000000e+00
+8300 8300 1.00000000000000e+00
+8301 8301 1.00000000000106e+00
+8301 6429 3.55340800000000e-14
+8301 6453 1.91012521360000e-10
+8301 6477 2.22990279934000e-09
+8301 6501 1.09086417370000e-10
+8301 7029 7.31269937100000e-11
+8301 7053 1.76934258518450e-07
+8301 7077 1.47101733658939e-06
+8301 7101 1.65206772175230e-07
+8301 7629 9.32791876860000e-10
+8301 7653 1.86054858380149e-06
+8301 7677 4.40213679917635e-06
+8301 7701 1.23430727922290e-07
+8301 8229 8.85453302770000e-10
+8301 8253 8.87219725627910e-07
+8301 8277 8.87085011605780e-07
+8301 8853 3.19243961200000e-11
+8301 8877 2.16381754700000e-11
+8301 16152 -2.84663206480000e-10
+8301 16176 -2.40186428761700e-07
+8301 16200 -4.78380215078050e-07
+8301 16560 -1.31019120337000e-09
+8301 16584 -1.27580809196153e-06
+8301 16608 -2.54244484549950e-06
+8301 16968 -9.70816716290000e-10
+8301 16992 -1.50043593642070e-06
+8301 17016 -2.99407615582734e-06
+8301 17376 -1.71538377450000e-10
+8301 17400 -3.15062376914750e-07
+8301 17424 -6.28923985187320e-07
+8302 8302 1.00000000000000e+00
+8303 8303 1.00000000000000e+00
+8304 8304 1.00000000000000e+00
+8305 8305 1.00000000000000e+00
+8306 8306 1.00000000000000e+00
+8307 8307 1.00000000000000e+00
+8308 8308 1.00000000000000e+00
+8309 8309 1.00000000000000e+00
+8310 8310 1.00000000000000e+00
+8311 8311 1.00000000000000e+00
+8312 8312 1.00000000000000e+00
+8313 8313 1.00000000000000e+00
+8314 8314 1.00000000000000e+00
+8315 8315 1.00000000000000e+00
+8316 8316 1.00000000000000e+00
+8317 8317 1.00000000000000e+00
+8318 8318 1.00000000000000e+00
+8319 8319 1.00000000000000e+00
+8320 8320 1.00000000000000e+00
+8321 8321 1.00000000000000e+00
+8322 8322 1.00000000000000e+00
+8323 8323 1.00000000000000e+00
+8324 8324 1.00000000000000e+00
+8325 8325 1.00000000000000e+00
+8326 8326 1.00000000000000e+00
+8327 8327 1.00000000000000e+00
+8328 8328 1.00000000000000e+00
+8329 8329 1.00000000000000e+00
+8330 8330 1.00000000000000e+00
+8331 8331 1.00000000000000e+00
+8332 8332 1.00000000000000e+00
+8333 8333 1.00000000000000e+00
+8334 8334 1.00000000000000e+00
+8335 8335 1.00000000000000e+00
+8336 8336 1.00000000000000e+00
+8337 8337 1.00000000000000e+00
+8338 8338 1.00000000000000e+00
+8339 8339 1.00000000000000e+00
+8340 8340 1.00000000000000e+00
+8341 8341 1.00000000000000e+00
+8342 8342 1.00000000000000e+00
+8343 8343 1.00000000000000e+00
+8344 8344 1.00000000000000e+00
+8345 8345 1.00000000000000e+00
+8346 8346 1.00000000000000e+00
+8347 8347 1.00000000000000e+00
+8348 8348 1.00000000000000e+00
+8349 8349 1.00000000000000e+00
+8350 8350 1.00000000000000e+00
+8351 8351 1.00000000000000e+00
+8352 8352 1.00000000000000e+00
+8353 8353 1.00000000000000e+00
+8354 8354 1.00000000000000e+00
+8355 8355 1.00000000000000e+00
+8356 8356 1.00000000000000e+00
+8357 8357 1.00000000000000e+00
+8358 8358 1.00000000000000e+00
+8359 8359 1.00000000000000e+00
+8360 8360 1.00000000000000e+00
+8361 8361 1.00000000000000e+00
+8362 8362 1.00000000000000e+00
+8363 8363 1.00000000000000e+00
+8364 8364 1.00000000000000e+00
+8365 8365 1.00000000000000e+00
+8366 8366 1.00000000000000e+00
+8367 8367 1.00000000000000e+00
+8368 8368 1.00000000000000e+00
+8369 8369 1.00000000000000e+00
+8370 8370 1.00000000000000e+00
+8371 8371 1.00000000000000e+00
+8372 8372 1.00000000000000e+00
+8373 8373 1.00000000000000e+00
+8374 8374 1.00000000000000e+00
+8375 8375 1.00000000000000e+00
+8376 8376 1.00000000000000e+00
+8377 8377 1.00000000000000e+00
+8378 8378 1.00000000000000e+00
+8379 8379 1.00000000000000e+00
+8380 8380 1.00000000000000e+00
+8381 8381 1.00000000000000e+00
+8382 8382 1.00000000000000e+00
+8383 8383 1.00000000000000e+00
+8384 8384 1.00000000000000e+00
+8385 8385 1.00000000000000e+00
+8386 8386 1.00000000000000e+00
+8387 8387 1.00000000000000e+00
+8388 8388 1.00000000000000e+00
+8389 8389 1.00000000000000e+00
+8390 8390 1.00000000000000e+00
+8391 8391 1.00000000000000e+00
+8392 8392 1.00000000000000e+00
+8393 8393 1.00000000000000e+00
+8394 8394 1.00000000000000e+00
+8395 8395 1.00000000000000e+00
+8396 8396 1.00000000000000e+00
+8397 8397 1.00000000000000e+00
+8398 8398 1.00000000000000e+00
+8399 8399 1.00000000000000e+00
+8400 8400 1.00000000000000e+00
+8401 8401 1.00000000000000e+00
+8402 8402 1.00000000000000e+00
+8403 8403 1.00000000000000e+00
+8404 8404 1.00000000000000e+00
+8405 8405 1.00000000000000e+00
+8406 8406 1.00000000000000e+00
+8407 8407 1.00000000000000e+00
+8408 8408 1.00000000000000e+00
+8409 8409 1.00000000000000e+00
+8410 8410 1.00000000000000e+00
+8411 8411 1.00000000000000e+00
+8412 8412 1.00000000000000e+00
+8413 8413 1.00000000000000e+00
+8414 8414 1.00000000000000e+00
+8415 8415 1.00000000000000e+00
+8416 8416 1.00000000000000e+00
+8417 8417 1.00000000000000e+00
+8418 8418 1.00000000000000e+00
+8419 8419 1.00000000000000e+00
+8420 8420 1.00000000000000e+00
+8421 8421 1.00000000000000e+00
+8422 8422 1.00000000000000e+00
+8423 8423 1.00000000000000e+00
+8424 8424 1.00000000000000e+00
+8425 8425 1.00000000000000e+00
+8426 8426 1.00000000000000e+00
+8427 8427 1.00000000000000e+00
+8428 8428 1.00000000000000e+00
+8429 8429 1.00000000000000e+00
+8430 8430 1.00000000000000e+00
+8431 8431 1.00000000000000e+00
+8432 8432 1.00000000000000e+00
+8433 8433 1.00000000000000e+00
+8434 8434 1.00000000000000e+00
+8435 8435 1.00000000000000e+00
+8436 8436 1.00000000000000e+00
+8437 8437 1.00000000000000e+00
+8438 8438 1.00000000000000e+00
+8439 8439 1.00000000000000e+00
+8440 8440 1.00000000000000e+00
+8441 8441 1.00000000000000e+00
+8442 8442 1.00000000000000e+00
+8443 8443 1.00000000000000e+00
+8444 8444 1.00000000000000e+00
+8445 8445 1.00000000000000e+00
+8446 8446 1.00000000000000e+00
+8447 8447 1.00000000000000e+00
+8448 8448 1.00000000000000e+00
+8449 8449 1.00000000000000e+00
+8450 8450 1.00000000000000e+00
+8451 8451 1.00000000000000e+00
+8452 8452 1.00000000000000e+00
+8453 8453 1.00000000000000e+00
+8454 8454 1.00000000000000e+00
+8455 8455 1.00000000000000e+00
+8456 8456 1.00000000000000e+00
+8457 8457 1.00000000000000e+00
+8458 8458 1.00000000000000e+00
+8459 8459 1.00000000000000e+00
+8460 8460 1.00000000000000e+00
+8461 8461 1.00000000000000e+00
+8462 8462 1.00000000000000e+00
+8463 8463 1.00000000000000e+00
+8464 8464 1.00000000000000e+00
+8465 8465 1.00000000000000e+00
+8466 8466 1.00000000000000e+00
+8467 8467 1.00000000000000e+00
+8468 8468 1.00000000000000e+00
+8469 8469 1.00000000000000e+00
+8470 8470 1.00000000000000e+00
+8471 8471 1.00000000000000e+00
+8472 8472 1.00000000000000e+00
+8473 8473 1.00000000000000e+00
+8474 8474 1.00000000000000e+00
+8475 8475 1.00000000000000e+00
+8476 8476 1.00000000000000e+00
+8477 8477 1.00000000000000e+00
+8478 8478 1.00000000000000e+00
+8479 8479 1.00000000000000e+00
+8480 8480 1.00000000000000e+00
+8481 8481 1.00000000000000e+00
+8482 8482 1.00000000000000e+00
+8483 8483 1.00000000000000e+00
+8484 8484 1.00000000000000e+00
+8485 8485 1.00000000000000e+00
+8486 8486 1.00000000000000e+00
+8487 8487 1.00000000000000e+00
+8488 8488 1.00000000000000e+00
+8489 8489 1.00000000000000e+00
+8490 8490 1.00000000000000e+00
+8491 8491 1.00000000000000e+00
+8492 8492 1.00000000000000e+00
+8493 8493 1.03255630443834e+00
+8493 7317 4.09279816281544e-06
+8493 7341 3.44776521549160e-06
+8493 7893 3.16146648534742e-04
+8493 7917 6.52632710066741e-02
+8493 7941 3.06976858560455e-02
+8493 7965 3.30881342016351e-05
+8493 8517 6.14209279220184e-01
+8493 8541 1.30411080783782e-01
+8493 8565 3.54827271089042e-04
+8493 9093 6.14289272445787e-03
+8493 9117 1.19790234883612e-01
+8493 9141 4.36793967859321e-02
+8493 9165 1.80194811187154e-04
+8493 20712 -2.65642361519577e-02
+8493 20736 -1.39520399675054e-02
+8493 20760 -1.91406254721869e-04
+8493 21120 -2.58559228758133e-01
+8493 21144 -1.61524079405966e-01
+8493 21168 -9.21270429339987e-03
+8493 21528 -3.31168804452563e-01
+8493 21552 -2.25383879039395e-01
+8493 21576 -1.70855648037467e-02
+8494 8494 1.00000000000000e+00
+8495 8495 1.00000000000000e+00
+8496 8496 1.00000000000000e+00
+8497 8497 1.00000000000000e+00
+8498 8498 1.00000000000000e+00
+8499 8499 1.00000000000000e+00
+8500 8500 1.00000000000000e+00
+8501 8501 1.00000000000000e+00
+8502 8502 1.00000000000000e+00
+8503 8503 1.00000000000000e+00
+8504 8504 1.00000000000000e+00
+8505 8505 1.00000000000000e+00
+8506 8506 1.00000000000000e+00
+8507 8507 1.00000000000000e+00
+8508 8508 1.00000000000000e+00
+8509 8509 1.00000000000000e+00
+8510 8510 1.00000000000000e+00
+8511 8511 1.00000000000000e+00
+8512 8512 1.00000000000000e+00
+8513 8513 1.00000000000000e+00
+8514 8514 1.00000000000000e+00
+8515 8515 1.00000000000000e+00
+8516 8516 1.00000000000000e+00
+8517 8517 2.23335933073397e+01
+8517 6717 1.09086417370000e-10
+8517 6741 7.67643334023879e-06
+8517 6765 2.36590348617491e-06
+8517 7317 7.50878594565614e-02
+8517 7341 2.76648894908246e-01
+8517 7365 7.50438699090499e-03
+8517 7389 1.13169651915072e-06
+8517 7893 8.11544335798943e-03
+8517 7917 4.86555311739368e+00
+8517 7941 4.49687532095992e+00
+8517 7965 1.09481969201773e-01
+8517 7989 1.08990327590325e-04
+8517 8493 6.14209279220184e-01
+8517 8541 1.07535791920085e+01
+8517 8565 2.79777465397472e-01
+8517 8589 5.98389187080596e-04
+8517 9093 1.09822659070730e-01
+8517 9117 4.66704907915610e+00
+8517 9141 4.64065275503846e+00
+8517 9165 2.45504972402709e-01
+8517 9189 1.20547285967303e-04
+8517 9741 9.22890593949134e-03
+8517 9765 7.34843574811682e-03
+8517 19896 -1.07822922226171e-04
+8517 19920 -9.97392066839145e-05
+8517 19944 -1.30936415916653e-05
+8517 20304 -4.03388434389498e-01
+8517 20328 -2.52264035490324e-01
+8517 20352 -1.51639929481643e-02
+8517 20376 -1.92627463307734e-04
+8517 20712 -3.59414605494428e+00
+8517 20736 -2.45302092463139e+00
+8517 20760 -2.20635404010201e-01
+8517 20784 -8.94430899049728e-03
+8517 21120 -1.13506209985228e+01
+8517 21144 -1.07635608328280e+01
+8517 21168 -1.81132176135842e+00
+8517 21192 -9.62596793221467e-02
+8517 21528 -8.01986008310673e+00
+8517 21552 -1.09051654129363e+01
+8517 21576 -2.47118942806330e+00
+8517 21600 -1.34917509756813e-01
+8518 8518 1.00000000000000e+00
+8519 8519 1.00000000000000e+00
+8520 8520 1.00000000000000e+00
+8521 8521 1.00000000000000e+00
+8522 8522 1.00000000000000e+00
+8523 8523 1.00000000000000e+00
+8524 8524 1.00000000000000e+00
+8525 8525 1.00000000000000e+00
+8526 8526 1.00000000000000e+00
+8527 8527 1.00000000000000e+00
+8528 8528 1.00000000000000e+00
+8529 8529 1.00000000000000e+00
+8530 8530 1.00000000000000e+00
+8531 8531 1.00000000000000e+00
+8532 8532 1.00000000000000e+00
+8533 8533 1.00000000000000e+00
+8534 8534 1.00000000000000e+00
+8535 8535 1.00000000000000e+00
+8536 8536 1.00000000000000e+00
+8537 8537 1.00000000000000e+00
+8538 8538 1.00000000000000e+00
+8539 8539 1.00000000000000e+00
+8540 8540 1.00000000000000e+00
+8541 8541 1.87919716657742e+01
+8541 6717 2.22990279934000e-09
+8541 6741 3.47698256597015e-04
+8541 6765 1.59825900986144e-04
+8541 7317 1.02332936930000e-01
+8541 7341 4.95673214491788e-01
+8541 7365 9.86337930066167e-02
+8541 7389 7.60696239971752e-03
+8541 7413 2.13656657686150e-06
+8541 7893 2.07534537618295e-03
+8541 7917 3.15491505639718e+00
+8541 7941 7.14083795988871e+00
+8541 7965 2.68222047618851e+00
+8541 7989 1.65476629083135e-01
+8541 8013 1.53185448900637e-04
+8541 8493 1.30411080783782e-01
+8541 8517 1.07535791920085e+01
+8541 8565 6.98081283453317e+00
+8541 8589 3.44526895845683e-01
+8541 8613 8.42968691652756e-04
+8541 9093 2.33776633015670e-02
+8541 9117 3.18335899755214e+00
+8541 9141 1.09723187831807e+01
+8541 9165 3.76737230205425e+00
+8541 9189 1.06494160843871e-01
+8541 9213 4.77661153452600e-05
+8541 9741 9.43953024244516e-02
+8541 9765 1.48862480810999e-01
+8541 9789 8.22857654823549e-03
+8541 9813 1.44369951344170e-07
+8541 10365 1.31921271842000e-09
+8541 10389 1.26524962030200e-08
+8541 10413 2.76977475000000e-12
+8541 19896 -7.88146601817124e-03
+8541 19920 -3.30507753107719e-02
+8541 19944 -3.82846590392048e-02
+8541 19968 -8.24395122984927e-03
+8541 19992 -4.71154979898946e-05
+8541 20304 -6.50483221529814e-01
+8541 20328 -1.10367230428954e+00
+8541 20352 -1.07744492518081e+00
+8541 20376 -2.65653515247318e-01
+8541 20400 -9.50245677540098e-03
+8541 20712 -3.43113164804832e+00
+8541 20736 -5.66071931761901e+00
+8541 20760 -5.27654274785888e+00
+8541 20784 -1.32287667106866e+00
+8541 20808 -5.51496939522450e-02
+8541 20832 -6.05285648237200e-07
+8541 21120 -5.32072509956953e+00
+8541 21144 -1.13396010740792e+01
+8541 21168 -9.88798952076265e+00
+8541 21192 -2.39548250059451e+00
+8541 21216 -1.07496598483683e-01
+8541 21240 -5.73103372691886e-06
+8541 21528 -2.77159021881339e+00
+8541 21552 -8.54372163120864e+00
+8541 21576 -7.14013593441141e+00
+8541 21600 -1.63815643084327e+00
+8541 21624 -7.14390121570574e-02
+8541 21648 -7.22506791617730e-06
+8542 8542 1.00000000000000e+00
+8543 8543 1.00000000000000e+00
+8544 8544 1.00000000000000e+00
+8545 8545 1.00000000000000e+00
+8546 8546 1.00000000000000e+00
+8547 8547 1.00000000000000e+00
+8548 8548 1.00000000000000e+00
+8549 8549 1.00000000000000e+00
+8550 8550 1.00000000000000e+00
+8551 8551 1.00000000000000e+00
+8552 8552 1.00000000000000e+00
+8553 8553 1.00000000000000e+00
+8554 8554 1.00000000000000e+00
+8555 8555 1.00000000000000e+00
+8556 8556 1.00000000000000e+00
+8557 8557 1.00000000000000e+00
+8558 8558 1.00000000000000e+00
+8559 8559 1.00000000000000e+00
+8560 8560 1.00000000000000e+00
+8561 8561 1.00000000000000e+00
+8562 8562 1.00000000000000e+00
+8563 8563 1.00000000000000e+00
+8564 8564 1.00000000000000e+00
+8565 8565 1.85107007957682e+01
+8565 6141 3.85400000000000e-17
+8565 6165 6.14500000000000e-17
+8565 6717 1.91012521360000e-10
+8565 6741 2.33188526392926e-04
+8565 6765 2.67258390988049e-04
+8565 6789 1.40199035422931e-04
+8565 6813 1.07354659163104e-06
+8565 7317 2.93365015021248e-03
+8565 7341 1.04720627674968e-01
+8565 7365 3.83651946384808e-01
+8565 7389 1.29158141991547e-01
+8565 7413 3.37533779248327e-03
+8565 7437 2.40795486257655e-06
+8565 7893 3.19208832744806e-06
+8565 7917 9.08790737019986e-02
+8565 7941 2.64884504318010e+00
+8565 7965 7.60940118776554e+00
+8565 7989 2.77392916116126e+00
+8565 8013 1.30017308321319e-01
+8565 8037 2.64738694593928e-04
+8565 8493 3.54827271089042e-04
+8565 8517 2.79777465397472e-01
+8565 8541 6.98081283453317e+00
+8565 8589 7.22470846299902e+00
+8565 8613 3.05741013405648e-01
+8565 8637 5.42606048985630e-04
+8565 9093 7.20900767794627e-05
+8565 9117 1.29727964301457e-01
+8565 9141 3.09914208319468e+00
+8565 9165 5.81461242173245e+00
+8565 9189 2.30136421296780e+00
+8565 9213 1.35101238191691e-01
+8565 9237 2.10763663817746e-05
+8565 9741 4.82735193069485e-02
+8565 9765 2.78118470954539e-01
+8565 9789 1.11544915246483e-01
+8565 9813 3.49349886848900e-03
+8565 9837 1.08879937028277e-06
+8565 10365 8.97612361523960e-07
+8565 10389 1.11277923894422e-05
+8565 10413 1.43358216180982e-06
+8565 19488 -1.62243194400000e-11
+8565 19512 -3.77341038477298e-04
+8565 19536 -2.41855455161590e-03
+8565 19560 -4.02285784986320e-03
+8565 19584 -9.44207889060278e-04
+8565 19608 -8.75431199719518e-06
+8565 19896 -6.72695047920747e-03
+8565 19920 -1.24457816678187e-01
+8565 19944 -4.87379513125253e-01
+8565 19968 -4.60405244955097e-01
+8565 19992 -1.09952822002808e-01
+8565 20016 -5.15015269182182e-03
+8565 20304 -6.09452274392234e-02
+8565 20328 -1.10467050991718e+00
+8565 20352 -4.28313906253398e+00
+8565 20376 -3.98187100407150e+00
+8565 20400 -1.01738905164710e+00
+8565 20424 -6.35762543224464e-02
+8565 20448 -1.69759551982035e-05
+8565 20712 -1.57084032693361e-01
+8565 20736 -2.84276194806417e+00
+8565 20760 -1.09547396060205e+01
+8565 20784 -1.00015592700930e+01
+8565 20808 -2.67231919083980e+00
+8565 20832 -1.94606147503329e-01
+8565 20856 -8.75407316449964e-05
+8565 21120 -9.39954658147383e-02
+8565 21144 -1.79211733908763e+00
+8565 21168 -6.75754988964355e+00
+8565 21192 -5.48334295921220e+00
+8565 21216 -1.43888709538291e+00
+8565 21240 -1.13112689805214e-01
+8565 21264 -9.55235986069331e-05
+8565 21528 -2.04644255858369e-02
+8565 21552 -4.70523537717527e-01
+8565 21576 -1.79324213756291e+00
+8565 21600 -1.28138291463894e+00
+8565 21624 -3.00034719279317e-01
+8565 21648 -2.05692093069996e-02
+8565 21672 -1.96369108521824e-05
+8566 8566 1.00000000000000e+00
+8567 8567 1.00000000000000e+00
+8568 8568 1.00000000000000e+00
+8569 8569 1.00000000000000e+00
+8570 8570 1.00000000000000e+00
+8571 8571 1.00000000000000e+00
+8572 8572 1.00000000000000e+00
+8573 8573 1.00000000000000e+00
+8574 8574 1.00000000000000e+00
+8575 8575 1.00000000000000e+00
+8576 8576 1.00000000000000e+00
+8577 8577 1.00000000000000e+00
+8578 8578 1.00000000000000e+00
+8579 8579 1.00000000000000e+00
+8580 8580 1.00000000000000e+00
+8581 8581 1.00000000000000e+00
+8582 8582 1.00000000000000e+00
+8583 8583 1.00000000000000e+00
+8584 8584 1.00000000000000e+00
+8585 8585 1.00000000000000e+00
+8586 8586 1.00000000000000e+00
+8587 8587 1.00000000000000e+00
+8588 8588 1.00000000000000e+00
+8589 8589 1.66152374232946e+01
+8589 6141 6.35000000000000e-18
+8589 6165 1.01200000000000e-17
+8589 6717 3.55340800000000e-14
+8589 6741 1.65821052232080e-07
+8589 6765 2.62041531254365e-04
+8589 6789 4.67153324025481e-04
+8589 6813 1.87607910286074e-05
+8589 6837 7.22147823010710e-07
+8589 7317 2.08930460891820e-07
+8589 7341 7.20183881084083e-03
+8589 7365 1.38803384818398e-01
+8589 7389 2.91682199132936e-01
+8589 7413 1.13542902326335e-01
+8589 7437 4.70380571098790e-03
+8589 7461 3.90695406012380e-07
+8589 7917 3.87416569810678e-05
+8589 7941 1.58330381854045e-01
+8589 7965 2.77588105773608e+00
+8589 7989 6.32140157665028e+00
+8589 8013 2.31426725984315e+00
+8589 8037 1.03986644421701e-01
+8589 8061 3.16588033027825e-04
+8589 8517 5.98389187080596e-04
+8589 8541 3.44526895845683e-01
+8589 8565 7.22470846299902e+00
+8589 8613 6.01317879021483e+00
+8589 8637 3.01419830152276e-01
+8589 8661 2.76673039955506e-04
+8589 9117 2.54420757694269e-04
+8589 9141 1.02944973256481e-01
+8589 9165 2.28682142390904e+00
+8589 9189 6.43803972467902e+00
+8589 9213 2.61139860278913e+00
+8589 9237 1.29959229577416e-01
+8589 9261 4.54682972154234e-05
+8589 9741 2.48600030779952e-03
+8589 9765 9.56967206476587e-02
+8589 9789 2.56110343441903e-01
+8589 9813 1.30468906119896e-01
+8589 9837 4.00256385214307e-03
+8589 9861 2.47633161065679e-06
+8589 10365 8.78103357304630e-07
+8589 10389 3.80183219577225e-04
+8589 10413 3.05165715246769e-04
+8589 10437 1.31669194616133e-06
+8589 19128 -3.98147192210430e-07
+8589 19152 -1.33092751663788e-05
+8589 19176 -4.77885378091516e-05
+8589 19200 -1.38112665047084e-05
+8589 19224 -5.23645026792820e-07
+8589 19488 -2.67275633000000e-12
+8589 19512 -7.12208246196826e-04
+8589 19536 -2.20016673822271e-02
+8589 19560 -1.07211408631075e-01
+8589 19584 -1.41157639159405e-01
+8589 19608 -3.97012792058173e-02
+8589 19632 -2.45335414009302e-03
+8589 19896 -2.51866616999194e-06
+8589 19920 -3.00750972078245e-02
+8589 19944 -4.41673679756451e-01
+8589 19968 -1.71506375002889e+00
+8589 19992 -1.97095422806587e+00
+8589 20016 -6.07890324229398e-01
+8589 20040 -5.22627933309468e-02
+8589 20064 -3.43528606209348e-05
+8589 20304 -1.04201598584567e-05
+8589 20328 -1.38745469119397e-01
+8589 20352 -1.87921702765295e+00
+8589 20376 -6.94499300146922e+00
+8589 20400 -7.59830514439921e+00
+8589 20424 -2.46519311509008e+00
+8589 20448 -2.40577424961976e-01
+8589 20472 -3.89332230272238e-04
+8589 20712 -3.90079655830205e-06
+8589 20736 -1.44954846645992e-01
+8589 20760 -2.15460430129376e+00
+8589 20784 -8.19445174042265e+00
+8589 20808 -8.89099175463546e+00
+8589 20832 -3.01355636355893e+00
+8589 20856 -3.19772793067185e-01
+8589 20880 -1.04490660266631e-03
+8589 21120 -3.45535269833850e-07
+8589 21144 -3.39913024247143e-02
+8589 21168 -5.66300017826257e-01
+8589 21192 -2.25180646794097e+00
+8589 21216 -2.49991636289078e+00
+8589 21240 -8.31720144615557e-01
+8589 21264 -8.48036522135815e-02
+8589 21288 -2.63403151354021e-04
+8589 21552 -1.21583139608409e-03
+8589 21576 -3.17314047065673e-02
+8589 21600 -1.43634132019867e-01
+8589 21624 -1.70767136446979e-01
+8589 21648 -5.14093378669872e-02
+8589 21672 -4.12660314887453e-03
+8589 21696 -2.87059089138052e-06
+8590 8590 1.00000000000000e+00
+8591 8591 1.00000000000000e+00
+8592 8592 1.00000000000000e+00
+8593 8593 1.00000000000000e+00
+8594 8594 1.00000000000000e+00
+8595 8595 1.00000000000000e+00
+8596 8596 1.00000000000000e+00
+8597 8597 1.00000000000000e+00
+8598 8598 1.00000000000000e+00
+8599 8599 1.00000000000000e+00
+8600 8600 1.00000000000000e+00
+8601 8601 1.00000000000000e+00
+8602 8602 1.00000000000000e+00
+8603 8603 1.00000000000000e+00
+8604 8604 1.00000000000000e+00
+8605 8605 1.00000000000000e+00
+8606 8606 1.00000000000000e+00
+8607 8607 1.00000000000000e+00
+8608 8608 1.00000000000000e+00
+8609 8609 1.00000000000000e+00
+8610 8610 1.00000000000000e+00
+8611 8611 1.00000000000000e+00
+8612 8612 1.00000000000000e+00
+8613 8613 1.52368589982418e+01
+8613 6741 7.79578600000000e-14
+8613 6765 2.74962501930974e-06
+8613 6789 8.91005421407023e-05
+8613 6813 5.00161568839039e-04
+8613 6837 1.25135402336308e-04
+8613 7341 2.19087640160000e-10
+8613 7365 5.70101788762022e-03
+8613 7389 1.17330424634126e-01
+8613 7413 2.82601434453938e-01
+8613 7437 8.63918164591289e-02
+8613 7461 5.12001329153914e-03
+8613 7485 6.86885643072780e-06
+8613 7941 7.51344158719125e-05
+8613 7965 1.17467751532465e-01
+8613 7989 2.32069493927854e+00
+8613 8013 5.42353049705159e+00
+8613 8037 2.25780169589540e+00
+8613 8061 9.94207410797834e-02
+8613 8085 2.33697018029737e-04
+8613 8541 8.42968691652756e-04
+8613 8565 3.05741013405648e-01
+8613 8589 6.01317879021483e+00
+8613 8637 5.50681995523434e+00
+8613 8661 2.90694425790978e-01
+8613 8685 1.38422994045989e-04
+8613 9141 1.72881141110545e-04
+8613 9165 1.41458480609620e-01
+8613 9189 2.63300019074901e+00
+8613 9213 6.29112857326259e+00
+8613 9237 2.38740455251692e+00
+8613 9261 1.09787995396197e-01
+8613 9285 8.84933336397349e-05
+8613 9741 6.07076150326415e-06
+8613 9765 3.27777054418449e-03
+8613 9789 1.14640260342689e-01
+8613 9813 3.70222890871785e-01
+8613 9837 1.36104287771057e-01
+8613 9861 2.81609474262597e-03
+8613 9885 1.62962235055505e-06
+8613 10365 1.62635643746720e-07
+8613 10389 1.64562920078719e-04
+8613 10413 1.93413419972700e-04
+8613 10437 1.35092304002420e-04
+8613 10461 1.56403018457278e-05
+8613 19128 -1.59177904572115e-06
+8613 19152 -1.93303940305548e-03
+8613 19176 -1.50083400241685e-02
+8613 19200 -3.19984746935322e-02
+8613 19224 -1.07863231621519e-02
+8613 19248 -8.71566016129873e-04
+8613 19512 -6.97276547140000e-10
+8613 19536 -6.25604395553281e-03
+8613 19560 -1.34270192548722e-01
+8613 19584 -6.48829834041647e-01
+8613 19608 -9.67683053614519e-01
+8613 19632 -3.49928920340790e-01
+8613 19656 -3.61825963381655e-02
+8613 19680 -2.60766096089590e-05
+8613 19920 -3.40300235706000e-09
+8613 19944 -4.19819363012439e-02
+8613 19968 -8.23602821426857e-01
+8613 19992 -3.78383013424044e+00
+8613 20016 -5.35935612814161e+00
+8613 20040 -2.02840327989389e+00
+8613 20064 -2.30669445532562e-01
+8613 20088 -8.94813647991526e-04
+8613 20328 -3.15286122116000e-09
+8613 20352 -7.66304469585017e-02
+8613 20376 -1.48312847787424e+00
+8613 20400 -6.73991693558079e+00
+8613 20424 -9.44829471250603e+00
+8613 20448 -3.73729413925654e+00
+8613 20472 -4.57991835894871e-01
+8613 20496 -3.43551708160339e-03
+8613 20736 -6.13896168510000e-10
+8613 20760 -2.67986772911734e-02
+8613 20784 -6.94820792058679e-01
+8613 20808 -3.40661737920487e+00
+8613 20832 -4.91376916156050e+00
+8613 20856 -1.86663739218365e+00
+8613 20880 -2.16006340598433e-01
+8613 20904 -1.78015374464238e-03
+8613 21168 -2.45483860613423e-03
+8613 21192 -9.94144917254037e-02
+8613 21216 -5.23272904718809e-01
+8613 21240 -7.67651190101436e-01
+8613 21264 -2.75908869197936e-01
+8613 21288 -2.92956316988260e-02
+8613 21312 -2.47411633771673e-04
+8613 21576 -1.54286544133720e-07
+8613 21600 -1.22365447471562e-03
+8613 21624 -6.67400920711631e-03
+8613 21648 -8.36244219545040e-03
+8613 21672 -1.83203537140742e-03
+8613 21696 -1.25824412478920e-05
+8614 8614 1.00000000000000e+00
+8615 8615 1.00000000000000e+00
+8616 8616 1.00000000000000e+00
+8617 8617 1.00000000000000e+00
+8618 8618 1.00000000000000e+00
+8619 8619 1.00000000000000e+00
+8620 8620 1.00000000000000e+00
+8621 8621 1.00000000000000e+00
+8622 8622 1.00000000000000e+00
+8623 8623 1.00000000000000e+00
+8624 8624 1.00000000000000e+00
+8625 8625 1.00000000000000e+00
+8626 8626 1.00000000000000e+00
+8627 8627 1.00000000000000e+00
+8628 8628 1.00000000000000e+00
+8629 8629 1.00000000000000e+00
+8630 8630 1.00000000000000e+00
+8631 8631 1.00000000000000e+00
+8632 8632 1.00000000000000e+00
+8633 8633 1.00000000000000e+00
+8634 8634 1.00000000000000e+00
+8635 8635 1.00000000000000e+00
+8636 8636 1.00000000000000e+00
+8637 8637 1.42155940525201e+01
+8637 6789 6.72456755290733e-06
+8637 6813 2.46473168732267e-04
+8637 6837 1.40080260134697e-04
+8637 6861 7.84494215473662e-05
+8637 6885 1.59094207830703e-06
+8637 7389 5.39569286250715e-03
+8637 7413 1.00146710530683e-01
+8637 7437 2.82210798877978e-01
+8637 7461 1.00625901988247e-01
+8637 7485 2.37454150425827e-03
+8637 7509 1.13484136129364e-05
+8637 7965 1.33659463189933e-04
+8637 7989 8.99707006266861e-02
+8637 8013 2.25961989461760e+00
+8637 8037 5.17797855006944e+00
+8637 8061 2.08683207293719e+00
+8637 8085 1.06392574754094e-01
+8637 8109 1.06435412031522e-04
+8637 8565 5.42606048985630e-04
+8637 8589 3.01419830152276e-01
+8637 8613 5.50681995523434e+00
+8637 8661 5.19496917949446e+00
+8637 8685 2.80488210935193e-01
+8637 8709 1.84292133188979e-04
+8637 9165 1.01435749871596e-04
+8637 9189 1.33641182211231e-01
+8637 9213 2.39295414762293e+00
+8637 9237 5.68740314343198e+00
+8637 9261 2.15188580318627e+00
+8637 9285 9.20977706503677e-02
+8637 9309 1.56645013647059e-04
+8637 9765 3.01784208052619e-06
+8637 9789 6.61404141397737e-03
+8637 9813 1.24157463156096e-01
+8637 9837 2.81822420274204e-01
+8637 9861 1.24288913731450e-01
+8637 9885 3.81948091007352e-03
+8637 9909 1.84048516669520e-07
+8637 10365 1.65361740000000e-13
+8637 10389 4.13226415410000e-10
+8637 10413 6.65602558937122e-05
+8637 10437 7.57288505340460e-04
+8637 10461 1.65828879302887e-04
+8637 10485 7.38583222521824e-06
+8637 18768 -2.31930704160447e-05
+8637 18792 -7.57131174518678e-04
+8637 18816 -2.84679740778401e-03
+8637 18840 -1.32903395665439e-03
+8637 18864 -1.66168765949972e-04
+8637 19152 -8.99956012314750e-04
+8637 19176 -3.58048723393153e-02
+8637 19200 -2.15879675201223e-01
+8637 19224 -3.98034187425589e-01
+8637 19248 -1.70937578879020e-01
+8637 19272 -2.12466860893380e-02
+8637 19296 -1.39127671343209e-05
+8637 19560 -1.14567772184785e-02
+8637 19584 -3.52156070294241e-01
+8637 19608 -1.93651044840107e+00
+8637 19632 -3.29949882568259e+00
+8637 19656 -1.47822609499834e+00
+8637 19680 -2.00674644131230e-01
+8637 19704 -1.61402046852437e-03
+8637 19968 -3.45663066015182e-02
+8637 19992 -9.93116571711704e-01
+8637 20016 -5.24984454072561e+00
+8637 20040 -8.57804786423769e+00
+8637 20064 -3.96244886125048e+00
+8637 20088 -5.70727423507661e-01
+8637 20112 -7.75557904544798e-03
+8637 20376 -1.68136550660147e-02
+8637 20400 -6.98575913356126e-01
+8637 20424 -3.93415720552648e+00
+8637 20448 -6.59932721052835e+00
+8637 20472 -2.99873944324048e+00
+8637 20496 -4.30138184579657e-01
+8637 20520 -7.59144487802201e-03
+8637 20784 -2.24873890229678e-03
+8637 20808 -1.53167292222668e-01
+8637 20832 -9.05256029698987e-01
+8637 20856 -1.52988192885985e+00
+8637 20880 -6.49578675580671e-01
+8637 20904 -8.64757018219528e-02
+8637 20928 -1.50947173666031e-03
+8637 21192 -2.55024749279369e-06
+8637 21216 -8.22518959263143e-03
+8637 21240 -5.14144086384422e-02
+8637 21264 -8.46843250636841e-02
+8637 21288 -2.75991069040440e-02
+8637 21312 -2.26300359808550e-03
+8637 21336 -3.20764573755030e-07
+8637 21624 -1.98860187077000e-09
+8637 21648 -8.94809260414000e-09
+8637 21672 -5.96334235505000e-09
+8637 21696 -9.93685121070000e-10
+8638 8638 1.00000000000000e+00
+8639 8639 1.00000000000000e+00
+8640 8640 1.00000000000000e+00
+8641 8641 1.00000000000000e+00
+8642 8642 1.00000000000000e+00
+8643 8643 1.00000000000000e+00
+8644 8644 1.00000000000000e+00
+8645 8645 1.00000000000000e+00
+8646 8646 1.00000000000000e+00
+8647 8647 1.00000000000000e+00
+8648 8648 1.00000000000000e+00
+8649 8649 1.00000000000000e+00
+8650 8650 1.00000000000000e+00
+8651 8651 1.00000000000000e+00
+8652 8652 1.00000000000000e+00
+8653 8653 1.00000000000000e+00
+8654 8654 1.00000000000000e+00
+8655 8655 1.00000000000000e+00
+8656 8656 1.00000000000000e+00
+8657 8657 1.00000000000000e+00
+8658 8658 1.00000000000000e+00
+8659 8659 1.00000000000000e+00
+8660 8660 1.00000000000000e+00
+8661 8661 1.36444800739710e+01
+8661 6813 2.33219156354420e-06
+8661 6837 1.62005155421068e-04
+8661 6861 5.56335941560830e-04
+8661 6885 1.66984562117840e-05
+8661 6909 3.53353347430300e-07
+8661 7389 2.29509986312700e-08
+8661 7413 4.42976897962898e-03
+8661 7437 1.07957058569068e-01
+8661 7461 2.37311790284683e-01
+8661 7485 1.05587349081562e-01
+8661 7509 3.85851679879765e-03
+8661 7533 7.26515781837260e-07
+8661 7989 1.76641060064227e-04
+8661 8013 8.59626371374448e-02
+8661 8037 2.09507042579204e+00
+8661 8061 5.17337010637295e+00
+8661 8085 2.02145129931115e+00
+8661 8109 1.04108481663570e-01
+8661 8133 7.05197533765968e-05
+8661 8589 2.76673039955506e-04
+8661 8613 2.90694425790978e-01
+8661 8637 5.19496917949446e+00
+8661 8685 5.03563186199641e+00
+8661 8709 2.70606731348375e-01
+8661 8733 3.78755041462763e-04
+8661 9189 9.36342827745027e-05
+8661 9213 1.18382376377729e-01
+8661 9237 2.14319633633400e+00
+8661 9261 5.27654782800361e+00
+8661 9285 2.15568720645538e+00
+8661 9309 8.13110836323455e-02
+8661 9333 1.52487309262474e-04
+8661 9789 7.65518854573857e-06
+8661 9813 2.98338614606095e-03
+8661 9837 1.20227799418500e-01
+8661 9861 2.80845679566271e-01
+8661 9885 1.03852201314301e-01
+8661 9909 5.11135706757790e-03
+8661 9933 5.23284682600000e-11
+8661 10413 2.76280475736858e-06
+8661 10437 4.63231239090577e-05
+8661 10461 3.16858225254104e-04
+8661 10485 2.41938520180964e-04
+8661 10509 4.70536121254547e-06
+8661 18408 -3.38983153372562e-06
+8661 18432 -1.62498969958991e-05
+8661 18456 -1.41521149777120e-05
+8661 18480 -2.69057086099659e-06
+8661 18768 -1.96401349981369e-05
+8661 18792 -5.60266975200149e-03
+8661 18816 -4.94199897693987e-02
+8661 18840 -1.24081197234278e-01
+8661 18864 -6.46742273828275e-02
+8661 18888 -9.35970523369866e-03
+8661 18912 -4.56708922212470e-06
+8661 19176 -2.75454565147809e-03
+8661 19200 -1.30268316315284e-01
+8661 19224 -8.64674467026409e-01
+8661 19248 -1.80327671377134e+00
+8661 19272 -9.64335460689662e-01
+8661 19296 -1.52428787925998e-01
+8661 19320 -2.01993850345186e-03
+8661 19584 -1.26258116673757e-02
+8661 19608 -5.59277921064762e-01
+8661 19632 -3.51256895453248e+00
+8661 19656 -6.94373649909147e+00
+8661 19680 -3.78016253433075e+00
+8661 19704 -6.27511702787334e-01
+8661 19728 -1.29819148068440e-02
+8661 19992 -1.02953049434362e-02
+8661 20016 -6.13801984343060e-01
+8661 20040 -3.97166244870871e+00
+8661 20064 -7.93340222138199e+00
+8661 20088 -4.40199915461421e+00
+8661 20112 -7.65783553595153e-01
+8661 20136 -2.21346096836282e-02
+8661 20400 -1.94381303127238e-03
+8661 20424 -1.90167096788184e-01
+8661 20448 -1.29413504052001e+00
+8661 20472 -2.64139157095857e+00
+8661 20496 -1.40261292381429e+00
+8661 20520 -2.32391335660982e-01
+8661 20544 -5.97175117773285e-03
+8661 20808 -1.03954862092583e-05
+8661 20832 -1.72064983002764e-02
+8661 20856 -1.26225497284196e-01
+8661 20880 -2.64974126596227e-01
+8661 20904 -1.28155566331303e-01
+8661 20928 -1.85885487822351e-02
+8661 20952 -2.50271011591101e-04
+8661 21240 -6.02398997712644e-05
+8661 21264 -3.83203401246182e-04
+8661 21288 -6.29502914319938e-04
+8661 21312 -1.43395025777822e-04
+8661 21336 -2.87805904174350e-07
+8662 8662 1.00000000000000e+00
+8663 8663 1.00000000000000e+00
+8664 8664 1.00000000000000e+00
+8665 8665 1.00000000000000e+00
+8666 8666 1.00000000000000e+00
+8667 8667 1.00000000000000e+00
+8668 8668 1.00000000000000e+00
+8669 8669 1.00000000000000e+00
+8670 8670 1.00000000000000e+00
+8671 8671 1.00000000000000e+00
+8672 8672 1.00000000000000e+00
+8673 8673 1.00000000000000e+00
+8674 8674 1.00000000000000e+00
+8675 8675 1.00000000000000e+00
+8676 8676 1.00000000000000e+00
+8677 8677 1.00000000000000e+00
+8678 8678 1.00000000000000e+00
+8679 8679 1.00000000000000e+00
+8680 8680 1.00000000000000e+00
+8681 8681 1.00000000000000e+00
+8682 8682 1.00000000000000e+00
+8683 8683 1.00000000000000e+00
+8684 8684 1.00000000000000e+00
+8685 8685 1.35061797798594e+01
+8685 6837 1.21535498385411e-05
+8685 6861 8.99998833830986e-05
+8685 6885 3.17936008973027e-04
+8685 6909 1.14629817987545e-04
+8685 7413 7.87821774847090e-07
+8685 7437 2.64740635360737e-03
+8685 7461 1.10241595057532e-01
+8685 7485 2.55684893376080e-01
+8685 7509 8.32621938773912e-02
+8685 7533 4.46279463381611e-03
+8685 7557 5.76185385784564e-06
+8685 8013 1.17724328222053e-04
+8685 8037 9.57663978761793e-02
+8685 8061 2.02226749522321e+00
+8685 8085 4.97708104918744e+00
+8685 8109 2.01957827044317e+00
+8685 8133 1.07567458814668e-01
+8685 8157 8.99998833830966e-05
+8685 8613 1.38422994045989e-04
+8685 8637 2.80488210935193e-01
+8685 8661 5.03563186199641e+00
+8685 8709 5.01207283480080e+00
+8685 8733 2.47676792294818e-01
+8685 8757 5.56335941560814e-04
+8685 9213 1.80679317919330e-04
+8685 9237 1.04998272549909e-01
+8685 9261 2.15151970522629e+00
+8685 9285 5.01444778180920e+00
+8685 9309 2.12534457488616e+00
+8685 9333 9.01462639339635e-02
+8685 9357 7.84494215473642e-05
+8685 9813 1.30211113888142e-05
+8685 9837 4.01865511835696e-03
+8685 9861 8.98139243420839e-02
+8685 9885 2.86213876935511e-01
+8685 9909 1.03347535291060e-01
+8685 9933 4.96671538245732e-03
+8685 10437 8.53127317558100e-08
+8685 10461 1.28308173330616e-04
+8685 10485 2.93336389137456e-04
+8685 10509 1.78814708764567e-04
+8685 10533 5.31858846635943e-06
+8685 18408 -2.44302264716898e-04
+8685 18432 -5.97874547333376e-03
+8685 18456 -2.31392107675328e-02
+8685 18480 -1.65572343303868e-02
+8685 18504 -2.89134898941353e-03
+8685 18528 -6.46536115564750e-07
+8685 18792 -5.12372734049650e-04
+8685 18816 -4.04287971817125e-02
+8685 18840 -3.30604382240390e-01
+8685 18864 -8.36607401537227e-01
+8685 18888 -5.46152839053613e-01
+8685 18912 -9.93778601986993e-02
+8685 18936 -1.86222575103133e-03
+8685 19200 -3.14675205445588e-03
+8685 19224 -2.60977235824410e-01
+8685 19248 -1.99343558131643e+00
+8685 19272 -4.76234705419659e+00
+8685 19296 -3.12316738344965e+00
+8685 19320 -6.00080589743586e-01
+8685 19344 -1.82588596240218e-02
+8685 19608 -4.92164144620347e-03
+8685 19632 -4.78760119398735e-01
+8685 19656 -3.58766882084474e+00
+8685 19680 -8.39721704320000e+00
+8685 19704 -5.60361692656973e+00
+8685 19728 -1.14368139928724e+00
+8685 19752 -4.78374423681392e-02
+8685 20016 -1.17815807475609e-03
+8685 20040 -2.13828212972158e-01
+8685 20064 -1.71860913009062e+00
+8685 20088 -4.18131636633928e+00
+8685 20112 -2.69588979393638e+00
+8685 20136 -5.34791752860129e-01
+8685 20160 -2.16163911218320e-02
+8685 20424 -2.02242391247022e-05
+8685 20448 -2.95734225758230e-02
+8685 20472 -2.58902342369895e-01
+8685 20496 -6.56082329760212e-01
+8685 20520 -3.95378165876494e-01
+8685 20544 -7.37384779871945e-02
+8685 20568 -2.69918411505052e-03
+8685 20856 -4.92803893296505e-04
+8685 20880 -5.17996492292177e-03
+8685 20904 -1.37345708174822e-02
+8685 20928 -4.83582745070654e-03
+8685 20952 -4.06769525242698e-04
+8686 8686 1.00000000000000e+00
+8687 8687 1.00000000000000e+00
+8688 8688 1.00000000000000e+00
+8689 8689 1.00000000000000e+00
+8690 8690 1.00000000000000e+00
+8691 8691 1.00000000000000e+00
+8692 8692 1.00000000000000e+00
+8693 8693 1.00000000000000e+00
+8694 8694 1.00000000000000e+00
+8695 8695 1.00000000000000e+00
+8696 8696 1.00000000000000e+00
+8697 8697 1.00000000000000e+00
+8698 8698 1.00000000000000e+00
+8699 8699 1.00000000000000e+00
+8700 8700 1.00000000000000e+00
+8701 8701 1.00000000000000e+00
+8702 8702 1.00000000000000e+00
+8703 8703 1.00000000000000e+00
+8704 8704 1.00000000000000e+00
+8705 8705 1.00000000000000e+00
+8706 8706 1.00000000000000e+00
+8707 8707 1.00000000000000e+00
+8708 8708 1.00000000000000e+00
+8709 8709 1.32156586210115e+01
+8709 6285 6.70440000000000e-16
+8709 6309 1.87511000000000e-15
+8709 6861 5.76185385784570e-06
+8709 6885 2.09858096953750e-04
+8709 6909 2.30005939103824e-04
+8709 6933 9.44854427779014e-05
+8709 6957 1.29402964269487e-06
+8709 7437 2.00372158358373e-06
+8709 7461 2.51568580534584e-03
+8709 7485 9.76298792981412e-02
+8709 7509 2.62012914802083e-01
+8709 7533 9.82611695325460e-02
+8709 7557 2.51568580534590e-03
+8709 7581 4.07861261643052e-06
+8709 7605 1.86000000000000e-17
+8709 8037 5.24284476533347e-05
+8709 8061 9.95804102733936e-02
+8709 8085 2.00834264652634e+00
+8709 8109 4.98296884704714e+00
+8709 8133 1.94522732471998e+00
+8709 8157 1.10241595057534e-01
+8709 8181 1.76905947185154e-04
+8709 8205 1.22830000000000e-16
+8709 8637 1.84292133188979e-04
+8709 8661 2.70606731348375e-01
+8709 8685 5.01207283480080e+00
+8709 8733 5.12142788929219e+00
+8709 8757 2.37311790284686e-01
+8709 8781 5.25146915451610e-04
+8709 9237 2.90316706081261e-04
+8709 9261 9.45590627379155e-02
+8709 9285 2.12226312376190e+00
+8709 9309 5.11958293841721e+00
+8709 9333 2.03413071720501e+00
+8709 9357 1.00625901988250e-01
+8709 9381 3.57994833680478e-05
+8709 9837 1.22408211906470e-06
+8709 9861 5.51968148406416e-03
+8709 9885 9.54297444868284e-02
+8709 9909 2.50889615789971e-01
+8709 9933 1.09060475920188e-01
+8709 9957 5.12001329153937e-03
+8709 9981 3.05027687506100e-08
+8709 10437 5.21894530000000e-13
+8709 10461 7.04711743687000e-09
+8709 10485 6.51738304218139e-05
+8709 10509 5.34088471120028e-04
+8709 10533 8.43467389934029e-05
+8709 10557 3.90695406012390e-07
+8709 10581 1.07492419000000e-12
+8709 18024 -5.84238235270000e-09
+8709 18048 -2.61608722558184e-04
+8709 18072 -1.43453473503939e-03
+8709 18096 -1.81437017932963e-03
+8709 18120 -3.88327097074189e-04
+8709 18144 -3.49041330603600e-08
+8709 18408 -3.67018070179621e-05
+8709 18432 -9.23046608098434e-03
+8709 18456 -1.01881284312104e-01
+8709 18480 -3.18730314473020e-01
+8709 18504 -2.57273709859609e-01
+8709 18528 -5.29520423692189e-02
+8709 18552 -1.33629378071350e-03
+8709 18816 -5.27208835272879e-04
+8709 18840 -1.02094554323801e-01
+8709 18864 -9.74542059803753e-01
+8709 18888 -2.80557560879684e+00
+8709 18912 -2.23326814143202e+00
+8709 18936 -4.97254905233339e-01
+8709 18960 -2.19885461768137e-02
+8709 18984 -8.46091646237500e-08
+8709 19224 -1.58782338679893e-03
+8709 19248 -3.05397524757637e-01
+8709 19272 -2.74137618073184e+00
+8709 19296 -7.56571605479377e+00
+8709 19320 -5.99220336649907e+00
+8709 19344 -1.41055889312210e+00
+8709 19368 -7.95778024835346e-02
+8709 19392 -5.60692149366310e-07
+8709 19632 -4.98462211108425e-04
+8709 19656 -2.08634239809660e-01
+8709 19680 -2.02056147413534e+00
+8709 19704 -5.80227885164798e+00
+8709 19728 -4.54342432343409e+00
+8709 19752 -1.07520244867281e+00
+8709 19776 -6.33960961775780e-02
+8709 19800 -9.73631128109060e-07
+8709 20040 -2.95151509768487e-05
+8709 20064 -4.17062818071608e-02
+8709 20088 -4.46824974409313e-01
+8709 20112 -1.33991019064063e+00
+8709 20136 -9.98666130461230e-01
+8709 20160 -2.24619371477823e-01
+8709 20184 -1.20177584135251e-02
+8709 20208 -2.22255490871330e-07
+8709 20472 -1.55759882964493e-03
+8709 20496 -2.25121796792213e-02
+8709 20520 -7.39694930109547e-02
+8709 20544 -4.55087334551143e-02
+8709 20568 -7.63644529673767e-03
+8709 20592 -8.79221394985321e-05
+8709 20880 -5.66768020861000e-09
+8709 20904 -5.74695123481400e-08
+8709 20928 -1.44862846263400e-07
+8709 20952 -3.47987915137000e-08
+8710 8710 1.00000000000000e+00
+8711 8711 1.00000000000000e+00
+8712 8712 1.00000000000000e+00
+8713 8713 1.00000000000000e+00
+8714 8714 1.00000000000000e+00
+8715 8715 1.00000000000000e+00
+8716 8716 1.00000000000000e+00
+8717 8717 1.00000000000000e+00
+8718 8718 1.00000000000000e+00
+8719 8719 1.00000000000000e+00
+8720 8720 1.00000000000000e+00
+8721 8721 1.00000000000000e+00
+8722 8722 1.00000000000000e+00
+8723 8723 1.00000000000000e+00
+8724 8724 1.00000000000000e+00
+8725 8725 1.00000000000000e+00
+8726 8726 1.00000000000000e+00
+8727 8727 1.00000000000000e+00
+8728 8728 1.00000000000000e+00
+8729 8729 1.00000000000000e+00
+8730 8730 1.00000000000000e+00
+8731 8731 1.00000000000000e+00
+8732 8732 1.00000000000000e+00
+8733 8733 1.32034534890934e+01
+8733 6285 2.39720000000000e-16
+8733 6309 6.70440000000000e-16
+8733 6885 1.15867545269004e-06
+8733 6909 1.99496121906751e-04
+8733 6933 4.29967431666146e-04
+8733 6957 2.44191106880429e-05
+8733 6981 2.21431704970470e-07
+8733 7005 2.42173700000000e-14
+8733 7461 1.29402964269488e-06
+8733 7485 3.20501286228352e-03
+8733 7509 1.04203715562111e-01
+8733 7533 2.35758953438197e-01
+8733 7557 9.95804102733956e-02
+8733 7581 4.89545672319204e-03
+8733 7605 1.45607376990150e-07
+8733 7629 8.29700000000000e-17
+8733 8061 2.44191106880423e-05
+8733 8085 1.05200073412954e-01
+8733 8109 1.94392165227317e+00
+8733 8133 5.09616803122634e+00
+8733 8157 2.02226749522323e+00
+8733 8181 1.01104182244151e-01
+8733 8205 2.24058402351051e-04
+8733 8229 1.27120000000000e-16
+8733 8661 3.78755041462763e-04
+8733 8685 2.47676792294818e-01
+8733 8709 5.12142788929219e+00
+8733 8757 5.17337010637301e+00
+8733 8781 2.51306149652818e-01
+8733 8805 3.83618832664598e-04
+8733 9261 2.84168131865542e-04
+8733 9285 1.02519668862682e-01
+8733 9309 2.02653932949449e+00
+8733 9333 5.17540769465832e+00
+8733 9357 2.08683207293720e+00
+8733 9381 1.07044420043823e-01
+8733 9405 1.59114016612106e-05
+8733 9861 1.40034993139735e-06
+8733 9885 2.99554152661755e-03
+8733 9909 1.06063705484245e-01
+8733 9933 2.70682180385715e-01
+8733 9957 9.94207410797824e-02
+8733 9981 4.38303943466947e-03
+8733 10005 9.53315919924660e-07
+8733 10485 1.93816942058856e-06
+8733 10509 3.99813715338238e-05
+8733 10533 2.80445054406424e-04
+8733 10557 3.16588033027814e-04
+8733 10581 5.17030619608320e-07
+8733 17664 -3.90152634118470e-07
+8733 17688 -4.19657041456251e-06
+8733 17712 -1.09340842857506e-05
+8733 17736 -2.63632843519918e-06
+8733 17760 -9.21392776400000e-11
+8733 18024 -2.08894349837000e-09
+8733 18048 -8.90212526518251e-04
+8733 18072 -2.07758257319015e-02
+8733 18096 -8.88788763992195e-02
+8733 18120 -9.43825694898251e-02
+8733 18144 -2.17405842911070e-02
+8733 18168 -6.52984975638916e-04
+8733 18432 -5.94104233255175e-05
+8733 18456 -3.36791333816438e-02
+8733 18480 -4.15890163972259e-01
+8733 18504 -1.43848699559364e+00
+8733 18528 -1.41063348630127e+00
+8733 18552 -3.62480097222256e-01
+8733 18576 -2.14258727932300e-02
+8733 18600 -6.50044912846620e-07
+8733 18840 -2.59752650159821e-04
+8733 18864 -1.56910533252354e-01
+8733 18888 -1.76536172072493e+00
+8733 18912 -5.79840393114085e+00
+8733 18936 -5.55216590365657e+00
+8733 18960 -1.50118703445928e+00
+8733 18984 -1.06356067585760e-01
+8733 19008 -2.04089667481579e-05
+8733 19248 -1.47971231592432e-04
+8733 19272 -1.75776519637661e-01
+8733 19296 -2.04795403555762e+00
+8733 19320 -6.82542888510070e+00
+8733 19344 -6.53788922342889e+00
+8733 19368 -1.83374722468628e+00
+8733 19392 -1.43215743617078e-01
+8733 19416 -7.26598831971743e-05
+8733 19656 -2.21422910102269e-05
+8733 19680 -4.94282254897328e-02
+8733 19704 -6.59599075902187e-01
+8733 19728 -2.30931516770855e+00
+8733 19752 -2.14744083978141e+00
+8733 19776 -5.74376861200495e-01
+8733 19800 -4.08970490628925e-02
+8733 19824 -2.09075466857397e-05
+8733 20088 -3.48186344649808e-03
+8733 20112 -6.23061972031633e-02
+8733 20136 -2.35972834052833e-01
+8733 20160 -2.06892058202002e-01
+8733 20184 -4.94140797644601e-02
+8733 20208 -2.61242579381700e-03
+8733 20232 -7.74689897242070e-07
+8733 20496 -3.09439465411300e-06
+8733 20520 -2.02821011824119e-04
+8733 20544 -7.98683687606945e-04
+8733 20568 -3.25705673696323e-04
+8733 20592 -3.38155601221640e-05
+8734 8734 1.00000000000000e+00
+8735 8735 1.00000000000000e+00
+8736 8736 1.00000000000000e+00
+8737 8737 1.00000000000000e+00
+8738 8738 1.00000000000000e+00
+8739 8739 1.00000000000000e+00
+8740 8740 1.00000000000000e+00
+8741 8741 1.00000000000000e+00
+8742 8742 1.00000000000000e+00
+8743 8743 1.00000000000000e+00
+8744 8744 1.00000000000000e+00
+8745 8745 1.00000000000000e+00
+8746 8746 1.00000000000000e+00
+8747 8747 1.00000000000000e+00
+8748 8748 1.00000000000000e+00
+8749 8749 1.00000000000000e+00
+8750 8750 1.00000000000000e+00
+8751 8751 1.00000000000000e+00
+8752 8752 1.00000000000000e+00
+8753 8753 1.00000000000000e+00
+8754 8754 1.00000000000000e+00
+8755 8755 1.00000000000000e+00
+8756 8756 1.00000000000000e+00
+8757 8757 1.36444800739710e+01
+8757 6909 7.26515781837250e-07
+8757 6933 7.05197533765987e-05
+8757 6957 3.78755041462758e-04
+8757 6981 1.52487309262472e-04
+8757 7005 5.23284682600000e-11
+8757 7485 3.53353347430290e-07
+8757 7509 3.85851679879775e-03
+8757 7533 1.04108481663572e-01
+8757 7557 2.70606731348377e-01
+8757 7581 8.13110836323451e-02
+8757 7605 5.11135706757785e-03
+8757 7629 4.70536121254527e-06
+8757 8085 1.66984562117836e-05
+8757 8109 1.05587349081564e-01
+8757 8133 2.02145129931117e+00
+8757 8157 5.03563186199643e+00
+8757 8181 2.15568720645538e+00
+8757 8205 1.03852201314302e-01
+8757 8229 2.41938520180960e-04
+8757 8685 5.56335941560813e-04
+8757 8709 2.37311790284686e-01
+8757 8733 5.17337010637301e+00
+8757 8781 5.27654782800357e+00
+8757 8805 2.80845679566273e-01
+8757 8829 3.16858225254108e-04
+8757 9285 1.62005155421057e-04
+8757 9309 1.07957058569069e-01
+8757 9333 2.09507042579206e+00
+8757 9357 5.19496917949436e+00
+8757 9381 2.14319633633398e+00
+8757 9405 1.20227799418499e-01
+8757 9429 4.63231239090595e-05
+8757 9885 2.33219156354427e-06
+8757 9909 4.42976897962916e-03
+8757 9933 8.59626371374441e-02
+8757 9957 2.90694425790975e-01
+8757 9981 1.18382376377731e-01
+8757 10005 2.98338614606096e-03
+8757 10029 2.76280475736869e-06
+8757 10509 2.29509986312700e-08
+8757 10533 1.76641060064222e-04
+8757 10557 2.76673039955497e-04
+8757 10581 9.36342827745039e-05
+8757 10605 7.65518854573810e-06
+8757 17664 -4.56708922212459e-06
+8757 17688 -2.01993850345182e-03
+8757 17712 -1.29819148068438e-02
+8757 17736 -2.21346096836280e-02
+8757 17760 -5.97175117773276e-03
+8757 17784 -2.50271011591090e-04
+8757 18048 -2.69057086099652e-06
+8757 18072 -9.35970523369895e-03
+8757 18096 -1.52428787926000e-01
+8757 18120 -6.27511702787335e-01
+8757 18144 -7.65783553595153e-01
+8757 18168 -2.32391335660983e-01
+8757 18192 -1.85885487822355e-02
+8757 18216 -2.87805904174350e-07
+8757 18456 -1.41521149777116e-05
+8757 18480 -6.46742273828293e-02
+8757 18504 -9.64335460689672e-01
+8757 18528 -3.78016253433076e+00
+8757 18552 -4.40199915461420e+00
+8757 18576 -1.40261292381429e+00
+8757 18600 -1.28155566331304e-01
+8757 18624 -1.43395025777828e-04
+8757 18864 -1.62498969958988e-05
+8757 18888 -1.24081197234281e-01
+8757 18912 -1.80327671377137e+00
+8757 18936 -6.94373649909150e+00
+8757 18960 -7.93340222138191e+00
+8757 18984 -2.64139157095854e+00
+8757 19008 -2.64974126596226e-01
+8757 19032 -6.29502914319957e-04
+8757 19272 -3.38983153372558e-06
+8757 19296 -4.94199897693986e-02
+8757 19320 -8.64674467026424e-01
+8757 19344 -3.51256895453253e+00
+8757 19368 -3.97166244870867e+00
+8757 19392 -1.29413504052000e+00
+8757 19416 -1.26225497284198e-01
+8757 19440 -3.83203401246173e-04
+8757 19704 -5.60266975200132e-03
+8757 19728 -1.30268316315287e-01
+8757 19752 -5.59277921064774e-01
+8757 19776 -6.13801984343052e-01
+8757 19800 -1.90167096788183e-01
+8757 19824 -1.72064983002770e-02
+8757 19848 -6.02398997712607e-05
+8757 20112 -1.96401349981369e-05
+8757 20136 -2.75454565147822e-03
+8757 20160 -1.26258116673761e-02
+8757 20184 -1.02953049434361e-02
+8757 20208 -1.94381303127232e-03
+8757 20232 -1.03954862092587e-05
+8758 8758 1.00000000000000e+00
+8759 8759 1.00000000000000e+00
+8760 8760 1.00000000000000e+00
+8761 8761 1.00000000000000e+00
+8762 8762 1.00000000000000e+00
+8763 8763 1.00000000000000e+00
+8764 8764 1.00000000000000e+00
+8765 8765 1.00000000000000e+00
+8766 8766 1.00000000000000e+00
+8767 8767 1.00000000000000e+00
+8768 8768 1.00000000000000e+00
+8769 8769 1.00000000000000e+00
+8770 8770 1.00000000000000e+00
+8771 8771 1.00000000000000e+00
+8772 8772 1.00000000000000e+00
+8773 8773 1.00000000000000e+00
+8774 8774 1.00000000000000e+00
+8775 8775 1.00000000000000e+00
+8776 8776 1.00000000000000e+00
+8777 8777 1.00000000000000e+00
+8778 8778 1.00000000000000e+00
+8779 8779 1.00000000000000e+00
+8780 8780 1.00000000000000e+00
+8781 8781 1.45485484512119e+01
+8781 6909 3.51291980000000e-13
+8781 6933 1.36098486988972e-06
+8781 6957 2.84168131865538e-04
+8781 6981 1.79724268891036e-04
+8781 7005 6.03166389497422e-05
+8781 7029 2.19066051226416e-06
+8781 7509 3.82862373842000e-09
+8781 7533 5.38660454727596e-03
+8781 7557 9.45590627379150e-02
+8781 7581 2.81305087752589e-01
+8781 7605 1.08523138370515e-01
+8781 7629 2.88298668641229e-03
+8781 7653 8.73668005157801e-06
+8781 8109 6.59455841648092e-05
+8781 8133 9.29174454274854e-02
+8781 8157 2.15151970522629e+00
+8781 8181 5.35035677744414e+00
+8781 8205 2.30005723638072e+00
+8781 8229 1.20361755725483e-01
+8781 8253 2.67866754088779e-04
+8781 8277 4.20640000000000e-16
+8781 8709 5.25146915451610e-04
+8781 8733 2.51306149652818e-01
+8781 8757 5.27654782800358e+00
+8781 8805 6.06166136081308e+00
+8781 8829 3.57259474892104e-01
+8781 8853 2.69575548313874e-04
+8781 8877 1.17839000000000e-15
+8781 9309 7.71464689415076e-05
+8781 9333 1.09974090606847e-01
+8781 9357 2.15188580318626e+00
+8781 9381 5.78776746291150e+00
+8781 9405 2.49741496761040e+00
+8781 9429 1.34764034047414e-01
+8781 9453 9.38864787359738e-05
+8781 9909 4.62919780307240e-07
+8781 9933 5.24590795012676e-03
+8781 9957 1.09787995396199e-01
+8781 9981 2.82925116133225e-01
+8781 10005 1.45180600441259e-01
+8781 10029 2.91387883519293e-03
+8781 10053 1.23556813447244e-06
+8781 10509 1.11133603000000e-12
+8781 10533 2.14304096016500e-08
+8781 10557 4.54682972154234e-05
+8781 10581 6.78079290028168e-04
+8781 10605 2.22694656811326e-04
+8781 10629 4.55670212600414e-06
+8781 11205 1.94460000000000e-16
+8781 11229 2.69600000000000e-17
+8781 17304 -3.34854865003064e-05
+8781 17328 -6.05453066284470e-04
+8781 17352 -1.97908944809925e-03
+8781 17376 -7.09749042147127e-04
+8781 17400 -5.95594804659707e-05
+8781 17664 -3.17062769720000e-09
+8781 17688 -1.55307223477496e-03
+8781 17712 -4.32773454137625e-02
+8781 17736 -2.26074176801012e-01
+8781 17760 -3.54816042167546e-01
+8781 17784 -1.27093248179564e-01
+8781 17808 -1.27081830126299e-02
+8781 17832 -1.23322260600600e-08
+8781 18072 -3.06112379000400e-08
+8781 18096 -2.16988591599808e-02
+8781 18120 -4.52262731923137e-01
+8781 18144 -2.14962332383442e+00
+8781 18168 -3.17368962354499e+00
+8781 18192 -1.24236010428430e+00
+8781 18216 -1.45112262225361e-01
+8781 18240 -2.76167595293292e-04
+8781 18480 -7.48855361421800e-08
+8781 18504 -7.01592677812320e-02
+8781 18528 -1.33485408307054e+00
+8781 18552 -6.07799992998221e+00
+8781 18576 -8.66875421797874e+00
+8781 18600 -3.59514649502362e+00
+8781 18624 -4.56776305238476e-01
+8781 18648 -1.52847645058491e-03
+8781 18888 -1.79287271112400e-08
+8781 18912 -4.21980672869897e-02
+8781 18936 -9.83374149245038e-01
+8781 18960 -4.66363090861404e+00
+8781 18984 -6.61043386329543e+00
+8781 19008 -2.73881420483968e+00
+8781 19032 -3.51322853426494e-01
+8781 19056 -1.97210171975278e-03
+8781 19320 -6.94726832043437e-03
+8781 19344 -2.18551967117541e-01
+8781 19368 -1.08618188199012e+00
+8781 19392 -1.52417843992889e+00
+8781 19416 -5.91340677496710e-01
+8781 19440 -7.03796648728676e-02
+8781 19464 -4.24068021415267e-04
+8781 19728 -7.18384143752472e-05
+8781 19752 -1.13664813412543e-02
+8781 19776 -6.23693251947754e-02
+8781 19800 -8.46942034598083e-02
+8781 19824 -2.47456816655714e-02
+8781 19848 -1.69124856312050e-03
+8781 19872 -1.92421531558400e-08
+8781 20160 -1.40505858852180e-07
+8781 20184 -6.22249116570470e-07
+8781 20208 -3.81408583499220e-07
+8781 20232 -6.02256811617600e-08
+8782 8782 1.00000000000000e+00
+8783 8783 1.00000000000000e+00
+8784 8784 1.00000000000000e+00
+8785 8785 1.00000000000000e+00
+8786 8786 1.00000000000000e+00
+8787 8787 1.00000000000000e+00
+8788 8788 1.00000000000000e+00
+8789 8789 1.00000000000000e+00
+8790 8790 1.00000000000000e+00
+8791 8791 1.00000000000000e+00
+8792 8792 1.00000000000000e+00
+8793 8793 1.00000000000000e+00
+8794 8794 1.00000000000000e+00
+8795 8795 1.00000000000000e+00
+8796 8796 1.00000000000000e+00
+8797 8797 1.00000000000000e+00
+8798 8798 1.00000000000000e+00
+8799 8799 1.00000000000000e+00
+8800 8800 1.00000000000000e+00
+8801 8801 1.00000000000000e+00
+8802 8802 1.00000000000000e+00
+8803 8803 1.00000000000000e+00
+8804 8804 1.00000000000000e+00
+8805 8805 1.67148947905030e+01
+8805 6957 1.40034993139733e-06
+8805 6981 1.20323550370873e-04
+8805 7005 6.20724038309046e-04
+8805 7029 3.45354354387681e-05
+8805 7053 1.66357890694850e-07
+8805 7077 2.19544460000000e-13
+8805 7557 5.51968148406412e-03
+8805 7581 1.14020590599322e-01
+8805 7605 2.77770045261544e-01
+8805 7629 1.33750852826007e-01
+8805 7653 5.85510262322277e-03
+8805 7677 6.93965276951360e-07
+8805 8133 1.21338636937128e-04
+8805 8157 8.98139243420841e-02
+8805 8181 2.31147641763538e+00
+8805 8205 6.10174473440770e+00
+8805 8229 2.52076813096791e+00
+8805 8253 1.02243790726399e-01
+8805 8277 2.13322127890798e-04
+8805 8733 3.83618832664598e-04
+8805 8757 2.80845679566273e-01
+8805 8781 6.06166136081308e+00
+8805 8829 5.48682765881346e+00
+8805 8853 2.53180377174199e-01
+8805 8877 6.26332162683858e-05
+8805 9333 7.72839565029901e-05
+8805 9357 1.24288913731449e-01
+8805 9381 2.48928706355120e+00
+8805 9405 6.41976470167613e+00
+8805 9429 2.18313486092396e+00
+8805 9453 7.91253656423229e-02
+8805 9933 7.46695746236253e-06
+8805 9957 2.81609474262600e-03
+8805 9981 1.37978003661638e-01
+8805 10005 3.04211210513153e-01
+8805 10029 1.07149062964959e-01
+8805 10053 6.51068255958206e-04
+8805 10557 2.47633161065666e-06
+8805 10581 8.08979821477049e-05
+8805 10605 3.22067592846329e-04
+8805 10629 1.96678742491974e-04
+8805 11205 2.85680000000000e-16
+8805 11229 3.96000000000000e-17
+8805 16944 -1.21126830761592e-06
+8805 16968 -5.13822501368428e-06
+8805 16992 -2.38387544049827e-06
+8805 17016 -2.93151783220590e-07
+8805 17304 -4.63546319988530e-05
+8805 17328 -7.58954126479133e-03
+8805 17352 -6.09726191576311e-02
+8805 17376 -1.37572068971866e-01
+8805 17400 -5.10251812906411e-02
+8805 17424 -4.92885197545318e-03
+8805 17712 -6.15205480232564e-03
+8805 17736 -1.90496251634988e-01
+8805 17760 -1.11422845009591e+00
+8805 17784 -2.01546910711483e+00
+8805 17808 -7.34540317333682e-01
+8805 17832 -7.96440172054091e-02
+8805 18120 -3.00451118904868e-02
+8805 18144 -8.56623399539223e-01
+8805 18168 -4.74306814100711e+00
+8805 18192 -8.10899043378011e+00
+8805 18216 -3.00685097530558e+00
+8805 18240 -3.54401329386665e-01
+8805 18528 -3.06819938875630e-02
+8805 18552 -1.02406696179593e+00
+8805 18576 -5.86868412923072e+00
+8805 18600 -1.02624281112438e+01
+8805 18624 -3.99618407387615e+00
+8805 18648 -5.13545222136786e-01
+8805 18936 -6.87824803542512e-03
+8805 18960 -3.28645579300930e-01
+8805 18984 -1.98400933919518e+00
+8805 19008 -3.53361738223862e+00
+8805 19032 -1.35404939750064e+00
+8805 19056 -1.68324535039271e-01
+8805 19344 -1.86508968564513e-04
+8805 19368 -3.06138592859706e-02
+8805 19392 -1.98962185579807e-01
+8805 19416 -3.59725190024001e-01
+8805 19440 -1.30866721526177e-01
+8805 19464 -1.46458338405462e-02
+8805 19776 -1.52757987606123e-04
+8805 19800 -8.34346672447800e-04
+8805 19824 -1.04604514369132e-03
+8805 19848 -2.23427793991183e-04
+8805 19872 -2.82679919691200e-08
+8806 8806 1.00000000000000e+00
+8807 8807 1.00000000000000e+00
+8808 8808 1.00000000000000e+00
+8809 8809 1.00000000000000e+00
+8810 8810 1.00000000000000e+00
+8811 8811 1.00000000000000e+00
+8812 8812 1.00000000000000e+00
+8813 8813 1.00000000000000e+00
+8814 8814 1.00000000000000e+00
+8815 8815 1.00000000000000e+00
+8816 8816 1.00000000000000e+00
+8817 8817 1.00000000000000e+00
+8818 8818 1.00000000000000e+00
+8819 8819 1.00000000000000e+00
+8820 8820 1.00000000000000e+00
+8821 8821 1.00000000000000e+00
+8822 8822 1.00000000000000e+00
+8823 8823 1.00000000000000e+00
+8824 8824 1.00000000000000e+00
+8825 8825 1.00000000000000e+00
+8826 8826 1.00000000000000e+00
+8827 8827 1.00000000000000e+00
+8828 8828 1.00000000000000e+00
+8829 8829 2.08251633581962e+01
+8829 6981 1.29078208718043e-05
+8829 7005 1.44147466930790e-04
+8829 7029 3.89714704487485e-04
+8829 7053 1.14998784692895e-04
+8829 7077 1.50853894583000e-09
+8829 7557 7.04711743687000e-09
+8829 7581 4.30756462080172e-03
+8829 7605 1.41882974823338e-01
+8829 7629 3.38445502301245e-01
+8829 7653 1.01036021558391e-01
+8829 7677 8.70653938089633e-03
+8829 8157 1.28308173330614e-04
+8829 8181 1.03318965213877e-01
+8829 8205 2.54478197047026e+00
+8829 8229 5.95013494598462e+00
+8829 8253 4.15240925190618e+00
+8829 8277 1.27588687451476e-01
+8829 8757 3.16858225254108e-04
+8829 8781 3.57259474892104e-01
+8829 8805 5.48682765881346e+00
+8829 8853 1.20747408504984e+01
+8829 8877 4.60996910959770e-02
+8829 9357 1.65828879302893e-04
+8829 9381 1.41675838469126e-01
+8829 9405 2.30610993286478e+00
+8829 9429 9.74156077354733e+00
+8829 9453 2.93990643686121e+00
+8829 9957 1.56403018457284e-05
+8829 9981 4.47462327059546e-03
+8829 10005 1.22248691713119e-01
+8829 10029 3.62451739099552e-01
+8829 10053 9.08688838913288e-03
+8829 10581 8.30405258521000e-09
+8829 10605 2.50863875796688e-04
+8829 10629 2.15051154370613e-04
+8829 16944 -4.57831467629268e-04
+8829 16968 -5.20445063742408e-03
+8829 16992 -2.25678303861428e-02
+8829 17016 -2.06081244686780e-02
+8829 17328 -1.42313807385487e-03
+8829 17352 -7.60852993516102e-02
+8829 17376 -4.57856882564988e-01
+8829 17400 -1.14792032596768e+00
+8829 17424 -9.31015863958384e-01
+8829 17736 -9.94001768869176e-03
+8829 17760 -4.95781694150881e-01
+8829 17784 -2.77314972883565e+00
+8829 17808 -6.90326339321349e+00
+8829 17832 -6.32062101669730e+00
+8829 18144 -1.87272890764825e-02
+8829 18168 -9.34677063180284e-01
+8829 18192 -4.91357092063534e+00
+8829 18216 -1.24786044584958e+01
+8829 18240 -1.30472690748129e+01
+8829 18552 -5.50462311142637e-03
+8829 18576 -4.68654027442270e-01
+8829 18600 -2.61950144724901e+00
+8829 18624 -5.95229647679309e+00
+8829 18648 -5.21913909453383e+00
+8829 18960 -3.14289429538523e-04
+8829 18984 -7.35160147784674e-02
+8829 19008 -4.38209835369894e-01
+8829 19032 -9.00428623635615e-01
+8829 19056 -6.14318709256893e-01
+8829 19392 -1.58120002869859e-03
+8829 19416 -1.02084568245077e-02
+8829 19440 -1.99678375256180e-02
+8829 19464 -9.58767802584510e-03
+8830 8830 1.00000000000000e+00
+8831 8831 1.00000000000000e+00
+8832 8832 1.00000000000000e+00
+8833 8833 1.00000000000000e+00
+8834 8834 1.00000000000000e+00
+8835 8835 1.00000000000000e+00
+8836 8836 1.00000000000000e+00
+8837 8837 1.00000000000000e+00
+8838 8838 1.00000000000000e+00
+8839 8839 1.00000000000000e+00
+8840 8840 1.00000000000000e+00
+8841 8841 1.00000000000000e+00
+8842 8842 1.00000000000000e+00
+8843 8843 1.00000000000000e+00
+8844 8844 1.00000000000000e+00
+8845 8845 1.00000000000000e+00
+8846 8846 1.00000000000000e+00
+8847 8847 1.00000000000000e+00
+8848 8848 1.00000000000000e+00
+8849 8849 1.00000000000000e+00
+8850 8850 1.00000000000000e+00
+8851 8851 1.00000000000000e+00
+8852 8852 1.00000000000000e+00
+8853 8853 1.65352612376491e+01
+8853 6429 1.01200000000000e-17
+8853 6453 6.14500000000000e-17
+8853 7005 9.75132400737259e-06
+8853 7029 2.14991453078896e-04
+8853 7053 1.84499564047511e-04
+8853 7077 6.16672890543108e-06
+8853 7101 3.84760914064500e-08
+8853 7581 5.63269850000800e-07
+8853 7605 4.31287933667565e-03
+8853 7629 1.01082040273075e-01
+8853 7653 4.11150698402194e-01
+8853 7677 1.33556506834832e-01
+8853 7701 2.17449701422420e-07
+8853 8181 1.46665177000229e-04
+8853 8205 8.83750882412685e-02
+8853 8229 3.20527510274180e+00
+8853 8253 9.26996687393122e+00
+8853 8277 7.56157576803318e-01
+8853 8301 3.19243961200000e-11
+8853 8781 2.69575548313874e-04
+8853 8805 2.53180377174199e-01
+8853 8829 1.20747408504984e+01
+8853 8877 1.57248436422913e-01
+8853 9381 1.97291361919335e-04
+8853 9405 1.34864340673859e-01
+8853 9429 4.59301705652275e+00
+8853 9453 2.24680920254793e+00
+8853 9981 7.77337397786230e-07
+8853 10005 9.82793053106743e-03
+8853 10029 6.52643325329213e-02
+8853 10053 2.08212736614839e-03
+8853 10581 1.83791670000000e-12
+8853 10605 2.76965240371850e-07
+8853 10629 2.65320809328760e-07
+8853 16560 -6.61515078038800e-08
+8853 16584 -2.00170805911748e-05
+8853 16608 -3.95711006277224e-05
+8853 16944 -1.45918259762635e-04
+8853 16968 -1.07430284427305e-02
+8853 16992 -1.97918336106533e-01
+8853 17016 -3.24429347867781e-01
+8853 17352 -2.80363635072946e-03
+8853 17376 -1.56376062952829e-01
+8853 17400 -2.26455304050108e+00
+8853 17424 -3.50736818545131e+00
+8853 17760 -9.42561470530932e-03
+8853 17784 -5.14460043694639e-01
+8853 17808 -7.40748823356999e+00
+8853 17832 -1.14588221436155e+01
+8853 18168 -3.81933610700287e-03
+8853 18192 -3.17500633505514e-01
+8853 18216 -6.80856023493023e+00
+8853 18240 -1.14939187741039e+01
+8853 18576 -3.99843198830987e-04
+8853 18600 -6.49202412504758e-02
+8853 18624 -1.58757384800461e+00
+8853 18648 -2.73110193042549e+00
+8853 19008 -3.70637046823073e-03
+8853 19032 -6.76799247529333e-02
+8853 19056 -1.09415256228251e-01
+8853 19416 -1.83644152629420e-07
+8853 19440 -5.06717717815100e-06
+8853 19464 -8.84884528789609e-06
+8854 8854 1.00000000000000e+00
+8855 8855 1.00000000000000e+00
+8856 8856 1.00000000000000e+00
+8857 8857 1.00000000000000e+00
+8858 8858 1.00000000000000e+00
+8859 8859 1.00000000000000e+00
+8860 8860 1.00000000000000e+00
+8861 8861 1.00000000000000e+00
+8862 8862 1.00000000000000e+00
+8863 8863 1.00000000000000e+00
+8864 8864 1.00000000000000e+00
+8865 8865 1.00000000000000e+00
+8866 8866 1.00000000000000e+00
+8867 8867 1.00000000000000e+00
+8868 8868 1.00000000000000e+00
+8869 8869 1.00000000000000e+00
+8870 8870 1.00000000000000e+00
+8871 8871 1.00000000000000e+00
+8872 8872 1.00000000000000e+00
+8873 8873 1.00000000000000e+00
+8874 8874 1.00000000000000e+00
+8875 8875 1.00000000000000e+00
+8876 8876 1.00000000000000e+00
+8877 8877 1.00509671531337e+00
+8877 6429 6.35000000000000e-18
+8877 6453 3.85400000000000e-17
+8877 7029 3.07268247464820e-06
+8877 7053 6.61673559220372e-06
+8877 7077 4.17426610680285e-06
+8877 7101 2.60784759250900e-08
+8877 7605 1.32826164813373e-06
+8877 7629 1.60503283768704e-03
+8877 7653 3.70617261712408e-02
+8877 7677 1.55949680715280e-02
+8877 7701 1.47384460888310e-07
+8877 8205 1.00310287655636e-04
+8877 8229 3.21160075323183e-02
+8877 8253 3.02172057297925e-01
+8877 8277 5.97228003931940e-02
+8877 8301 2.16381754700000e-11
+8877 8781 1.17839000000000e-15
+8877 8805 6.26332162683858e-05
+8877 8829 4.60996910959770e-02
+8877 8853 1.57248436422913e-01
+8877 9381 4.22030000000000e-16
+8877 9405 4.47785888509600e-08
+8877 9429 9.81314367921115e-04
+8877 9453 1.67498720578745e-03
+8877 10029 4.36402672700000e-11
+8877 10053 1.57623610900000e-11
+8877 16560 -4.14899663859000e-08
+8877 16584 -1.35540959531506e-05
+8877 16608 -2.68177621416000e-05
+8877 16968 -2.99572453049502e-04
+8877 16992 -2.00238148159735e-02
+8877 17016 -3.79506224606006e-02
+8877 17376 -1.46097158628628e-03
+8877 17400 -9.76740571613031e-02
+8877 17424 -1.85121313218602e-01
+8877 17784 -1.35262437329917e-03
+8877 17808 -9.11000637037568e-02
+8877 17832 -1.72731756794419e-01
+8877 18192 -2.63309666699969e-04
+8877 18216 -1.77902210357923e-02
+8877 18240 -3.37372744046849e-02
+8877 18600 -1.38577897776000e-09
+8877 18624 -2.02792477156881e-06
+8877 18648 -4.04614909029327e-06
+8878 8878 1.00000000000000e+00
+8879 8879 1.00000000000000e+00
+8880 8880 1.00000000000000e+00
+8881 8881 1.00000000000000e+00
+8882 8882 1.00000000000000e+00
+8883 8883 1.00000000000000e+00
+8884 8884 1.00000000000000e+00
+8885 8885 1.00000000000000e+00
+8886 8886 1.00000000000000e+00
+8887 8887 1.00000000000000e+00
+8888 8888 1.00000000000000e+00
+8889 8889 1.00000000000000e+00
+8890 8890 1.00000000000000e+00
+8891 8891 1.00000000000000e+00
+8892 8892 1.00000000000000e+00
+8893 8893 1.00000000000000e+00
+8894 8894 1.00000000000000e+00
+8895 8895 1.00000000000000e+00
+8896 8896 1.00000000000000e+00
+8897 8897 1.00000000000000e+00
+8898 8898 1.00000000000000e+00
+8899 8899 1.00000000000000e+00
+8900 8900 1.00000000000000e+00
+8901 8901 1.00000000000000e+00
+8902 8902 1.00000000000000e+00
+8903 8903 1.00000000000000e+00
+8904 8904 1.00000000000000e+00
+8905 8905 1.00000000000000e+00
+8906 8906 1.00000000000000e+00
+8907 8907 1.00000000000000e+00
+8908 8908 1.00000000000000e+00
+8909 8909 1.00000000000000e+00
+8910 8910 1.00000000000000e+00
+8911 8911 1.00000000000000e+00
+8912 8912 1.00000000000000e+00
+8913 8913 1.00000000000000e+00
+8914 8914 1.00000000000000e+00
+8915 8915 1.00000000000000e+00
+8916 8916 1.00000000000000e+00
+8917 8917 1.00000000000000e+00
+8918 8918 1.00000000000000e+00
+8919 8919 1.00000000000000e+00
+8920 8920 1.00000000000000e+00
+8921 8921 1.00000000000000e+00
+8922 8922 1.00000000000000e+00
+8923 8923 1.00000000000000e+00
+8924 8924 1.00000000000000e+00
+8925 8925 1.00000000000000e+00
+8926 8926 1.00000000000000e+00
+8927 8927 1.00000000000000e+00
+8928 8928 1.00000000000000e+00
+8929 8929 1.00000000000000e+00
+8930 8930 1.00000000000000e+00
+8931 8931 1.00000000000000e+00
+8932 8932 1.00000000000000e+00
+8933 8933 1.00000000000000e+00
+8934 8934 1.00000000000000e+00
+8935 8935 1.00000000000000e+00
+8936 8936 1.00000000000000e+00
+8937 8937 1.00000000000000e+00
+8938 8938 1.00000000000000e+00
+8939 8939 1.00000000000000e+00
+8940 8940 1.00000000000000e+00
+8941 8941 1.00000000000000e+00
+8942 8942 1.00000000000000e+00
+8943 8943 1.00000000000000e+00
+8944 8944 1.00000000000000e+00
+8945 8945 1.00000000000000e+00
+8946 8946 1.00000000000000e+00
+8947 8947 1.00000000000000e+00
+8948 8948 1.00000000000000e+00
+8949 8949 1.00000000000000e+00
+8950 8950 1.00000000000000e+00
+8951 8951 1.00000000000000e+00
+8952 8952 1.00000000000000e+00
+8953 8953 1.00000000000000e+00
+8954 8954 1.00000000000000e+00
+8955 8955 1.00000000000000e+00
+8956 8956 1.00000000000000e+00
+8957 8957 1.00000000000000e+00
+8958 8958 1.00000000000000e+00
+8959 8959 1.00000000000000e+00
+8960 8960 1.00000000000000e+00
+8961 8961 1.00000000000000e+00
+8962 8962 1.00000000000000e+00
+8963 8963 1.00000000000000e+00
+8964 8964 1.00000000000000e+00
+8965 8965 1.00000000000000e+00
+8966 8966 1.00000000000000e+00
+8967 8967 1.00000000000000e+00
+8968 8968 1.00000000000000e+00
+8969 8969 1.00000000000000e+00
+8970 8970 1.00000000000000e+00
+8971 8971 1.00000000000000e+00
+8972 8972 1.00000000000000e+00
+8973 8973 1.00000000000000e+00
+8974 8974 1.00000000000000e+00
+8975 8975 1.00000000000000e+00
+8976 8976 1.00000000000000e+00
+8977 8977 1.00000000000000e+00
+8978 8978 1.00000000000000e+00
+8979 8979 1.00000000000000e+00
+8980 8980 1.00000000000000e+00
+8981 8981 1.00000000000000e+00
+8982 8982 1.00000000000000e+00
+8983 8983 1.00000000000000e+00
+8984 8984 1.00000000000000e+00
+8985 8985 1.00000000000000e+00
+8986 8986 1.00000000000000e+00
+8987 8987 1.00000000000000e+00
+8988 8988 1.00000000000000e+00
+8989 8989 1.00000000000000e+00
+8990 8990 1.00000000000000e+00
+8991 8991 1.00000000000000e+00
+8992 8992 1.00000000000000e+00
+8993 8993 1.00000000000000e+00
+8994 8994 1.00000000000000e+00
+8995 8995 1.00000000000000e+00
+8996 8996 1.00000000000000e+00
+8997 8997 1.00000000000000e+00
+8998 8998 1.00000000000000e+00
+8999 8999 1.00000000000000e+00
+9000 9000 1.00000000000000e+00
+9001 9001 1.00000000000000e+00
+9002 9002 1.00000000000000e+00
+9003 9003 1.00000000000000e+00
+9004 9004 1.00000000000000e+00
+9005 9005 1.00000000000000e+00
+9006 9006 1.00000000000000e+00
+9007 9007 1.00000000000000e+00
+9008 9008 1.00000000000000e+00
+9009 9009 1.00000000000000e+00
+9010 9010 1.00000000000000e+00
+9011 9011 1.00000000000000e+00
+9012 9012 1.00000000000000e+00
+9013 9013 1.00000000000000e+00
+9014 9014 1.00000000000000e+00
+9015 9015 1.00000000000000e+00
+9016 9016 1.00000000000000e+00
+9017 9017 1.00000000000000e+00
+9018 9018 1.00000000000000e+00
+9019 9019 1.00000000000000e+00
+9020 9020 1.00000000000000e+00
+9021 9021 1.00000000000000e+00
+9022 9022 1.00000000000000e+00
+9023 9023 1.00000000000000e+00
+9024 9024 1.00000000000000e+00
+9025 9025 1.00000000000000e+00
+9026 9026 1.00000000000000e+00
+9027 9027 1.00000000000000e+00
+9028 9028 1.00000000000000e+00
+9029 9029 1.00000000000000e+00
+9030 9030 1.00000000000000e+00
+9031 9031 1.00000000000000e+00
+9032 9032 1.00000000000000e+00
+9033 9033 1.00000000000000e+00
+9034 9034 1.00000000000000e+00
+9035 9035 1.00000000000000e+00
+9036 9036 1.00000000000000e+00
+9037 9037 1.00000000000000e+00
+9038 9038 1.00000000000000e+00
+9039 9039 1.00000000000000e+00
+9040 9040 1.00000000000000e+00
+9041 9041 1.00000000000000e+00
+9042 9042 1.00000000000000e+00
+9043 9043 1.00000000000000e+00
+9044 9044 1.00000000000000e+00
+9045 9045 1.00000000000000e+00
+9046 9046 1.00000000000000e+00
+9047 9047 1.00000000000000e+00
+9048 9048 1.00000000000000e+00
+9049 9049 1.00000000000000e+00
+9050 9050 1.00000000000000e+00
+9051 9051 1.00000000000000e+00
+9052 9052 1.00000000000000e+00
+9053 9053 1.00000000000000e+00
+9054 9054 1.00000000000000e+00
+9055 9055 1.00000000000000e+00
+9056 9056 1.00000000000000e+00
+9057 9057 1.00000000000000e+00
+9058 9058 1.00000000000000e+00
+9059 9059 1.00000000000000e+00
+9060 9060 1.00000000000000e+00
+9061 9061 1.00000000000000e+00
+9062 9062 1.00000000000000e+00
+9063 9063 1.00000000000000e+00
+9064 9064 1.00000000000000e+00
+9065 9065 1.00000000000000e+00
+9066 9066 1.00000000000000e+00
+9067 9067 1.00000000000000e+00
+9068 9068 1.00000000000000e+00
+9069 9069 1.00000000000000e+00
+9070 9070 1.00000000000000e+00
+9071 9071 1.00000000000000e+00
+9072 9072 1.00000000000000e+00
+9073 9073 1.00000000000000e+00
+9074 9074 1.00000000000000e+00
+9075 9075 1.00000000000000e+00
+9076 9076 1.00000000000000e+00
+9077 9077 1.00000000000000e+00
+9078 9078 1.00000000000000e+00
+9079 9079 1.00000000000000e+00
+9080 9080 1.00000000000000e+00
+9081 9081 1.00000000000000e+00
+9082 9082 1.00000000000000e+00
+9083 9083 1.00000000000000e+00
+9084 9084 1.00000000000000e+00
+9085 9085 1.00000000000000e+00
+9086 9086 1.00000000000000e+00
+9087 9087 1.00000000000000e+00
+9088 9088 1.00000000000000e+00
+9089 9089 1.00000000000000e+00
+9090 9090 1.00000000000000e+00
+9091 9091 1.00000000000000e+00
+9092 9092 1.00000000000000e+00
+9093 9093 1.00118062439057e+00
+9093 7317 3.38261348833630e-07
+9093 7341 2.84965056096460e-07
+9093 7893 5.45386769826279e-05
+9093 7917 7.20909761037705e-03
+9093 7941 2.79091754131914e-03
+9093 7965 4.55990495249529e-06
+9093 8493 6.14289272445787e-03
+9093 8517 1.09822659070730e-01
+9093 8541 2.33776633015670e-02
+9093 8565 7.20900767794627e-05
+9093 9117 2.46870374499713e-02
+9093 9141 1.06727575900906e-02
+9093 9165 4.59011807340407e-05
+9093 20712 -2.20520863822568e-03
+9093 20736 -1.19559189827216e-03
+9093 20760 -2.65678797598047e-05
+9093 21120 -3.88419704019062e-02
+9093 21144 -2.76749461282611e-02
+9093 21168 -2.35827455065941e-03
+9093 21528 -6.22474803362327e-02
+9093 21552 -4.69807489686170e-02
+9093 21576 -4.53057394300020e-03
+9094 9094 1.00000000000000e+00
+9095 9095 1.00000000000000e+00
+9096 9096 1.00000000000000e+00
+9097 9097 1.00000000000000e+00
+9098 9098 1.00000000000000e+00
+9099 9099 1.00000000000000e+00
+9100 9100 1.00000000000000e+00
+9101 9101 1.00000000000000e+00
+9102 9102 1.00000000000000e+00
+9103 9103 1.00000000000000e+00
+9104 9104 1.00000000000000e+00
+9105 9105 1.00000000000000e+00
+9106 9106 1.00000000000000e+00
+9107 9107 1.00000000000000e+00
+9108 9108 1.00000000000000e+00
+9109 9109 1.00000000000000e+00
+9110 9110 1.00000000000000e+00
+9111 9111 1.00000000000000e+00
+9112 9112 1.00000000000000e+00
+9113 9113 1.00000000000000e+00
+9114 9114 1.00000000000000e+00
+9115 9115 1.00000000000000e+00
+9116 9116 1.00000000000000e+00
+9117 9117 2.89240257957883e+00
+9117 7317 1.01894477122349e-05
+9117 7341 8.82040844097349e-06
+9117 7365 4.80711473218400e-08
+9117 7389 8.34516350000000e-13
+9117 7893 9.64122588329139e-04
+9117 7917 2.17844836818968e-01
+9117 7941 1.45416647043225e-01
+9117 7965 4.32657486010449e-03
+9117 7989 1.16629760528204e-06
+9117 8493 1.19790234883612e-01
+9117 8517 4.66704907915610e+00
+9117 8541 3.18335899755214e+00
+9117 8565 1.29727964301457e-01
+9117 8589 2.54420757694269e-04
+9117 9093 2.46870374499713e-02
+9117 9141 2.93723459434137e+00
+9117 9165 3.21523235303120e-01
+9117 9189 7.09412875459559e-05
+9117 9741 1.48846185431150e-02
+9117 9765 1.18136420444714e-02
+9117 20304 -2.73434565390910e-07
+9117 20328 -1.32403957025803e-06
+9117 20352 -1.19463980016843e-06
+9117 20376 -2.30301308694380e-07
+9117 20712 -8.07620712877326e-02
+9117 20736 -1.04039244321087e-01
+9117 20760 -3.66291396137360e-02
+9117 20784 -4.96490615160427e-03
+9117 21120 -1.21722609796364e+00
+9117 21144 -2.63427490152784e+00
+9117 21168 -1.03543496275688e+00
+9117 21192 -1.22950809007928e-01
+9117 21528 -1.86912480621186e+00
+9117 21552 -4.54030951783689e+00
+9117 21576 -1.81449700885241e+00
+9117 21600 -2.11153262788652e-01
+9118 9118 1.00000000000000e+00
+9119 9119 1.00000000000000e+00
+9120 9120 1.00000000000000e+00
+9121 9121 1.00000000000000e+00
+9122 9122 1.00000000000000e+00
+9123 9123 1.00000000000000e+00
+9124 9124 1.00000000000000e+00
+9125 9125 1.00000000000000e+00
+9126 9126 1.00000000000000e+00
+9127 9127 1.00000000000000e+00
+9128 9128 1.00000000000000e+00
+9129 9129 1.00000000000000e+00
+9130 9130 1.00000000000000e+00
+9131 9131 1.00000000000000e+00
+9132 9132 1.00000000000000e+00
+9133 9133 1.00000000000000e+00
+9134 9134 1.00000000000000e+00
+9135 9135 1.00000000000000e+00
+9136 9136 1.00000000000000e+00
+9137 9137 1.00000000000000e+00
+9138 9138 1.00000000000000e+00
+9139 9139 1.00000000000000e+00
+9140 9140 1.00000000000000e+00
+9141 9141 2.09499843293973e+01
+9141 7317 1.74314569669890e-05
+9141 7341 2.53629710191410e-04
+9141 7365 1.55156966074483e-04
+9141 7389 1.80315251593800e-08
+9141 7893 2.13706456323185e-04
+9141 7917 1.27181616251686e-01
+9141 7941 2.82792704146777e-01
+9141 7965 1.15026971954080e-01
+9141 7989 5.91766666038560e-03
+9141 8013 1.78071334005418e-05
+9141 8493 4.36793967859321e-02
+9141 8517 4.64065275503846e+00
+9141 8541 1.09723187831807e+01
+9141 8565 3.09914208319468e+00
+9141 8589 1.02944973256481e-01
+9141 8613 1.72881141110545e-04
+9141 9093 1.06727575900906e-02
+9141 9117 2.93723459434137e+00
+9141 9165 9.91943451262257e+00
+9141 9189 3.98093749650474e-01
+9141 9213 3.73082498911614e-04
+9141 9741 4.31840613477259e-01
+9141 9765 1.35780839835572e+00
+9141 9789 1.56701631720268e-01
+9141 9813 2.73574244309968e-04
+9141 10365 5.22093285751330e-06
+9141 10389 4.99765527714214e-05
+9141 10413 1.07430315361200e-08
+9141 20304 -2.15737240607035e-04
+9141 20328 -6.78156064318135e-03
+9141 20352 -2.56556343381732e-02
+9141 20376 -1.29804131789666e-02
+9141 20400 -1.76545037455334e-03
+9141 20712 -5.34115908914581e-02
+9141 20736 -3.64114134599589e-01
+9141 20760 -8.81159512977710e-01
+9141 20784 -3.82150713253353e-01
+9141 20808 -4.67880445595032e-02
+9141 20832 -2.64700801715131e-04
+9141 21120 -8.20147575343329e-01
+9141 21144 -5.11981516898460e+00
+9141 21168 -1.01045841424140e+01
+9141 21192 -4.52174059881939e+00
+9141 21216 -6.32999049357058e-01
+9141 21240 -1.42217084326026e-02
+9141 21528 -1.27202318270223e+00
+9141 21552 -7.86715197249476e+00
+9141 21576 -1.47080981867763e+01
+9141 21600 -6.70591694751842e+00
+9141 21624 -9.84383496535981e-01
+9141 21648 -2.65905112531993e-02
+9142 9142 1.00000000000000e+00
+9143 9143 1.00000000000000e+00
+9144 9144 1.00000000000000e+00
+9145 9145 1.00000000000000e+00
+9146 9146 1.00000000000000e+00
+9147 9147 1.00000000000000e+00
+9148 9148 1.00000000000000e+00
+9149 9149 1.00000000000000e+00
+9150 9150 1.00000000000000e+00
+9151 9151 1.00000000000000e+00
+9152 9152 1.00000000000000e+00
+9153 9153 1.00000000000000e+00
+9154 9154 1.00000000000000e+00
+9155 9155 1.00000000000000e+00
+9156 9156 1.00000000000000e+00
+9157 9157 1.00000000000000e+00
+9158 9158 1.00000000000000e+00
+9159 9159 1.00000000000000e+00
+9160 9160 1.00000000000000e+00
+9161 9161 1.00000000000000e+00
+9162 9162 1.00000000000000e+00
+9163 9163 1.00000000000000e+00
+9164 9164 1.00000000000000e+00
+9165 9165 2.52133658919633e+01
+9165 6741 2.37500000000000e-16
+9165 6765 1.70813000000000e-15
+9165 7317 5.17938663274502e-06
+9165 7341 2.94496133374696e-04
+9165 7365 4.30184941155473e-04
+9165 7389 7.38617469010402e-05
+9165 7413 2.33546346859166e-06
+9165 7893 7.09230616116290e-07
+9165 7917 2.98352467610294e-03
+9165 7941 1.37148490235051e-01
+9165 7965 3.88254869960613e-01
+9165 7989 1.59134713973779e-01
+9165 8013 3.14962360091572e-03
+9165 8037 6.98380998805087e-06
+9165 8493 1.80194811187154e-04
+9165 8517 2.45504972402709e-01
+9165 8541 3.76737230205425e+00
+9165 8565 5.81461242173245e+00
+9165 8589 2.28682142390904e+00
+9165 8613 1.41458480609620e-01
+9165 8637 1.01435749871596e-04
+9165 9093 4.59011807340407e-05
+9165 9117 3.21523235303120e-01
+9165 9141 9.91943451262257e+00
+9165 9189 8.30042343340759e+00
+9165 9213 2.84023234766722e-01
+9165 9237 4.71482473101218e-04
+9165 9741 6.74357737899612e-01
+9165 9765 8.47559702554792e+00
+9165 9789 6.37363411517381e+00
+9165 9813 1.65911619907654e-01
+9165 9837 1.28078995586539e-04
+9165 10365 5.01825510064360e-04
+9165 10389 2.29883960010649e-02
+9165 10413 9.74515294596663e-03
+9165 19920 -2.68148023391800e-08
+9165 19944 -1.91637324661204e-04
+9165 19968 -9.09969541231160e-04
+9165 19992 -7.66819923937578e-04
+9165 20016 -1.43822464621433e-04
+9165 20304 -7.56520811581509e-05
+9165 20328 -1.94860308560980e-02
+9165 20352 -1.63888366341898e-01
+9165 20376 -4.02728245207720e-01
+9165 20400 -2.28262293221430e-01
+9165 20424 -3.63021842950981e-02
+9165 20448 -2.68364539589388e-04
+9165 20712 -1.65556807285412e-03
+9165 20736 -2.02228954966389e-01
+9165 20760 -1.39480511332750e+00
+9165 20784 -2.92410451374048e+00
+9165 20808 -1.76103804557890e+00
+9165 20832 -3.17162331399180e-01
+9165 20856 -7.88893963817172e-03
+9165 21120 -8.34695865135706e-03
+9165 21144 -9.48787970187852e-01
+9165 21168 -5.92201974611269e+00
+9165 21192 -1.16102424187961e+01
+9165 21216 -9.05696095074192e+00
+9165 21240 -1.92125528213328e+00
+9165 21264 -5.86754948615230e-02
+9165 21528 -7.07189490284724e-03
+9165 21552 -9.88607456833696e-01
+9165 21576 -6.32291240333007e+00
+9165 21600 -1.31344205713102e+01
+9165 21624 -1.16470936735668e+01
+9165 21648 -2.55228025707658e+00
+9165 21672 -6.91058902851681e-02
+9166 9166 1.00000000000000e+00
+9167 9167 1.00000000000000e+00
+9168 9168 1.00000000000000e+00
+9169 9169 1.00000000000000e+00
+9170 9170 1.00000000000000e+00
+9171 9171 1.00000000000000e+00
+9172 9172 1.00000000000000e+00
+9173 9173 1.00000000000000e+00
+9174 9174 1.00000000000000e+00
+9175 9175 1.00000000000000e+00
+9176 9176 1.00000000000000e+00
+9177 9177 1.00000000000000e+00
+9178 9178 1.00000000000000e+00
+9179 9179 1.00000000000000e+00
+9180 9180 1.00000000000000e+00
+9181 9181 1.00000000000000e+00
+9182 9182 1.00000000000000e+00
+9183 9183 1.00000000000000e+00
+9184 9184 1.00000000000000e+00
+9185 9185 1.00000000000000e+00
+9186 9186 1.00000000000000e+00
+9187 9187 1.00000000000000e+00
+9188 9188 1.00000000000000e+00
+9189 9189 1.66107668831667e+01
+9189 6741 1.61450000000000e-16
+9189 6765 1.16118000000000e-15
+9189 7341 7.44503075326058e-06
+9189 7365 2.12410211905863e-04
+9189 7389 6.38231870732993e-04
+9189 7413 4.76842667935607e-05
+9189 7437 1.51877667859400e-08
+9189 7461 1.07492419000000e-12
+9189 7917 1.85443126627622e-06
+9189 7941 3.82984705123400e-03
+9189 7965 1.63787166671290e-01
+9189 7989 3.08047702966219e-01
+9189 8013 1.12349617391641e-01
+9189 8037 5.78011380667533e-03
+9189 8061 5.17030619608300e-07
+9189 8517 1.20547285967303e-04
+9189 8541 1.06494160843871e-01
+9189 8565 2.30136421296780e+00
+9189 8589 6.43803972467902e+00
+9189 8613 2.63300019074901e+00
+9189 8637 1.33641182211231e-01
+9189 8661 9.36342827745027e-05
+9189 9117 7.09412875459559e-05
+9189 9141 3.98093749650474e-01
+9189 9165 8.30042343340759e+00
+9189 9213 6.38956406917380e+00
+9189 9237 3.19722565471048e-01
+9189 9261 6.78079290028203e-04
+9189 9741 5.71113368287837e-02
+9189 9765 4.37323350928711e+00
+9189 9789 9.48469133812496e+00
+9189 9813 2.75103404825546e+00
+9189 9837 9.18742608481290e-02
+9189 9861 8.08979821477098e-05
+9189 10365 8.16320942124758e-04
+9189 10389 1.62292688555024e-01
+9189 10413 1.54296983896813e-01
+9189 10437 6.97895973065628e-03
+9189 10461 8.30405258521000e-09
+9189 11013 1.02677524531000e-09
+9189 11037 4.08628167584000e-09
+9189 11061 1.83791670000000e-12
+9189 19560 -3.73102447881600e-08
+9189 19584 -2.47764597396870e-07
+9189 19608 -4.31404717765020e-07
+9189 19632 -9.85236182442100e-08
+9189 19920 -1.82286164144400e-08
+9189 19944 -1.46560958747288e-03
+9189 19968 -2.30088250458341e-02
+9189 19992 -8.21777190579337e-02
+9189 20016 -6.57338060232593e-02
+9189 20040 -1.24654553297142e-02
+9189 20064 -8.49783613857441e-05
+9189 20328 -6.16935639697755e-04
+9189 20352 -7.56563029286511e-02
+9189 20376 -6.47334861429464e-01
+9189 20400 -1.73717993124594e+00
+9189 20424 -1.35589596977103e+00
+9189 20448 -2.85679637321201e-01
+9189 20472 -9.38575092160662e-03
+9189 20736 -2.80648045101099e-03
+9189 20760 -3.35634600221818e-01
+9189 20784 -2.74934680092509e+00
+9189 20808 -7.16654941689153e+00
+9189 20832 -5.68289186565247e+00
+9189 20856 -1.23817040319280e+00
+9189 20880 -4.79131606910248e-02
+9189 20904 -3.67222075893600e-08
+9189 21144 -1.97299421219385e-03
+9189 21168 -3.45089594634300e-01
+9189 21192 -3.50368766140368e+00
+9189 21216 -1.02980360621152e+01
+9189 21240 -7.61855577416950e+00
+9189 21264 -1.62540162070135e+00
+9189 21288 -6.90657784007974e-02
+9189 21312 -2.10202261173670e-07
+9189 21552 -3.39183723660178e-04
+9189 21576 -1.65636733875931e-01
+9189 21600 -2.36081159036061e+00
+9189 21624 -7.62575536054923e+00
+9189 21648 -4.33414068707059e+00
+9189 21672 -8.02167487971877e-01
+9189 21696 -3.85260548717765e-02
+9189 21720 -1.63349069221820e-07
+9190 9190 1.00000000000000e+00
+9191 9191 1.00000000000000e+00
+9192 9192 1.00000000000000e+00
+9193 9193 1.00000000000000e+00
+9194 9194 1.00000000000000e+00
+9195 9195 1.00000000000000e+00
+9196 9196 1.00000000000000e+00
+9197 9197 1.00000000000000e+00
+9198 9198 1.00000000000000e+00
+9199 9199 1.00000000000000e+00
+9200 9200 1.00000000000000e+00
+9201 9201 1.00000000000000e+00
+9202 9202 1.00000000000000e+00
+9203 9203 1.00000000000000e+00
+9204 9204 1.00000000000000e+00
+9205 9205 1.00000000000000e+00
+9206 9206 1.00000000000000e+00
+9207 9207 1.00000000000000e+00
+9208 9208 1.00000000000000e+00
+9209 9209 1.00000000000000e+00
+9210 9210 1.00000000000000e+00
+9211 9211 1.00000000000000e+00
+9212 9212 1.00000000000000e+00
+9213 9213 1.69611461768898e+01
+9213 7365 6.81126937739475e-06
+9213 7389 9.68204573979322e-05
+9213 7413 2.74904578863928e-04
+9213 7437 1.76444125597537e-04
+9213 7461 3.05027687506100e-08
+9213 7941 3.03133255660085e-06
+9213 7965 3.35210990307821e-03
+9213 7989 1.22356735855191e-01
+9213 8013 3.12738875079109e-01
+9213 8037 9.21548851110089e-02
+9213 8061 4.38303943466957e-03
+9213 8085 2.33359908483919e-06
+9213 8541 4.77661153452600e-05
+9213 8565 1.35101238191691e-01
+9213 8589 2.61139860278913e+00
+9213 8613 6.29112857326259e+00
+9213 8637 2.39295414762293e+00
+9213 8661 1.18382376377729e-01
+9213 8685 1.80679317919330e-04
+9213 9141 3.73082498911614e-04
+9213 9165 2.84023234766722e-01
+9213 9189 6.38956406917380e+00
+9213 9237 6.44362061844847e+00
+9213 9261 2.82925116133220e-01
+9213 9285 6.00232747143569e-04
+9213 9741 1.48757014544798e-04
+9213 9765 1.15120413221381e-01
+9213 9789 2.47430333521984e+00
+9213 9813 5.30068757924913e+00
+9213 9837 2.38090503758773e+00
+9213 9861 1.37978003661634e-01
+9213 9885 1.86095276753447e-05
+9213 10365 8.29054817407601e-05
+9213 10389 6.68679335058813e-02
+9213 10413 2.68021749546517e-01
+9213 10437 1.05217503878585e-01
+9213 10461 4.47462327059536e-03
+9213 10485 5.57780449472120e-07
+9213 11013 1.13653088228283e-05
+9213 11037 6.46479002001124e-05
+9213 11061 7.77337397786240e-07
+9213 19560 -7.48228670978547e-06
+9213 19584 -1.79342829018033e-03
+9213 19608 -9.66017648426737e-03
+9213 19632 -1.21795169504234e-02
+9213 19656 -2.68360686543643e-03
+9213 19680 -2.12273103108987e-05
+9213 19944 -4.99741004107998e-05
+9213 19968 -1.62013567064914e-02
+9213 19992 -1.94900128605103e-01
+9213 20016 -6.58101042165434e-01
+9213 20040 -6.12047630761552e-01
+9213 20064 -1.43978339114222e-01
+9213 20088 -6.31400259870918e-03
+9213 20352 -3.42380297403747e-04
+9213 20376 -1.30904245935936e-01
+9213 20400 -1.46587366422920e+00
+9213 20424 -4.72026243498148e+00
+9213 20448 -4.21473093150741e+00
+9213 20472 -1.05198764373597e+00
+9213 20496 -6.27299216796503e-02
+9213 20520 -6.01422878122641e-06
+9213 20760 -6.20042783016749e-04
+9213 20784 -2.94623651010246e-01
+9213 20808 -3.24277390371000e+00
+9213 20832 -1.02349311736186e+01
+9213 20856 -8.83501779089264e+00
+9213 20880 -2.31875979400024e+00
+9213 20904 -1.67675406492184e-01
+9213 20928 -2.73173367878581e-05
+9213 21168 -1.43016294015581e-04
+9213 21192 -1.23074941957576e-01
+9213 21216 -1.56020234216349e+00
+9213 21240 -5.10178297208434e+00
+9213 21264 -3.94528752716499e+00
+9213 21288 -1.01464558466504e+00
+9213 21312 -7.89606507668563e-02
+9213 21336 -1.90559154330363e-05
+9213 21576 -1.33099563758210e-07
+9213 21600 -1.84717084370415e-02
+9213 21624 -2.77611194666461e-01
+9213 21648 -9.47053835614475e-01
+9213 21672 -6.68819689456887e-01
+9213 21696 -1.55218139672086e-01
+9213 21720 -1.03974540170888e-02
+9213 21744 -3.26042166295247e-06
+9214 9214 1.00000000000000e+00
+9215 9215 1.00000000000000e+00
+9216 9216 1.00000000000000e+00
+9217 9217 1.00000000000000e+00
+9218 9218 1.00000000000000e+00
+9219 9219 1.00000000000000e+00
+9220 9220 1.00000000000000e+00
+9221 9221 1.00000000000000e+00
+9222 9222 1.00000000000000e+00
+9223 9223 1.00000000000000e+00
+9224 9224 1.00000000000000e+00
+9225 9225 1.00000000000000e+00
+9226 9226 1.00000000000000e+00
+9227 9227 1.00000000000000e+00
+9228 9228 1.00000000000000e+00
+9229 9229 1.00000000000000e+00
+9230 9230 1.00000000000000e+00
+9231 9231 1.00000000000000e+00
+9232 9232 1.00000000000000e+00
+9233 9233 1.00000000000000e+00
+9234 9234 1.00000000000000e+00
+9235 9235 1.00000000000000e+00
+9236 9236 1.00000000000000e+00
+9237 9237 1.55068125774855e+01
+9237 7389 4.10056075839960e-07
+9237 7413 3.16321383374554e-04
+9237 7437 2.80163312061426e-04
+9237 7461 3.57994833680469e-05
+9237 7485 1.89681802581380e-06
+9237 7965 8.42870972887720e-07
+9237 7989 4.93536473027622e-03
+9237 8013 1.06238221895660e-01
+9237 8037 2.74627686916336e-01
+9237 8061 1.07044420043825e-01
+9237 8085 3.05267476070694e-03
+9237 8109 1.37306196538332e-06
+9237 8565 2.10763663817746e-05
+9237 8589 1.29959229577416e-01
+9237 8613 2.38740455251692e+00
+9237 8637 5.68740314343198e+00
+9237 8661 2.14319633633400e+00
+9237 8685 1.04998272549909e-01
+9237 8709 2.90316706081261e-04
+9237 9165 4.71482473101218e-04
+9237 9189 3.19722565471048e-01
+9237 9213 6.44362061844847e+00
+9237 9261 5.78776746291149e+00
+9237 9285 2.78594960790357e-01
+9237 9309 3.76580666462597e-04
+9237 9765 2.34927877494194e-04
+9237 9789 9.66358510578650e-02
+9237 9813 2.39184467225713e+00
+9237 9837 6.56471963283403e+00
+9237 9861 2.48928706355115e+00
+9237 9885 1.28294801162541e-01
+9237 9909 3.05226841770282e-05
+9237 10365 5.61618000186800e-08
+9237 10389 3.56458842680593e-03
+9237 10413 9.43923886567089e-02
+9237 10437 2.76348776783459e-01
+9237 10461 1.41675838469124e-01
+9237 10485 4.36077583164116e-03
+9237 10509 1.67959048382326e-06
+9237 11013 2.18137199729480e-05
+9237 11037 4.20437398965713e-04
+9237 11061 1.97291361919340e-04
+9237 11085 1.54657054999068e-06
+9237 11661 4.22030000000000e-16
+9237 11685 1.50650000000000e-16
+9237 19200 -2.76739317972467e-05
+9237 19224 -2.81844181765466e-04
+9237 19248 -7.15434311001539e-04
+9237 19272 -1.83814698169986e-04
+9237 19296 -3.16656089837684e-06
+9237 19560 -5.47964570785980e-07
+9237 19584 -2.41400275343930e-03
+9237 19608 -4.71831589024664e-02
+9237 19632 -2.01108282090769e-01
+9237 19656 -2.35359211128363e-01
+9237 19680 -6.29703485864411e-02
+9237 19704 -3.60383670497818e-03
+9237 19968 -1.67984462863557e-05
+9237 19992 -4.20503355344792e-02
+9237 20016 -5.99376677632743e-01
+9237 20040 -2.25808474336944e+00
+9237 20064 -2.44933938889466e+00
+9237 20088 -7.15791459635724e-01
+9237 20112 -5.64564483220383e-02
+9237 20136 -2.84457677356842e-05
+9237 20376 -5.96109218410204e-05
+9237 20400 -1.56845308931473e-01
+9237 20424 -2.05289357518908e+00
+9237 20448 -7.39535321592705e+00
+9237 20472 -7.77456076509341e+00
+9237 20496 -2.39601445015480e+00
+9237 20520 -2.16482774683163e-01
+9237 20544 -2.02465739836177e-04
+9237 20784 -1.71530090327612e-05
+9237 20808 -1.32485464574335e-01
+9237 20832 -1.87406138757872e+00
+9237 20856 -6.98854935785926e+00
+9237 20880 -7.47852153566612e+00
+9237 20904 -2.35758391105403e+00
+9237 20928 -2.21176604075138e-01
+9237 20952 -3.83180860003073e-04
+9237 21192 -6.36605257387350e-07
+9237 21216 -2.75544390262804e-02
+9237 21240 -4.28266688460076e-01
+9237 21264 -1.66495891798119e+00
+9237 21288 -1.82669002690140e+00
+9237 21312 -5.57018387595856e-01
+9237 21336 -4.82939482475499e-02
+9237 21360 -8.87003356679518e-05
+9237 21624 -6.75108151057770e-04
+9237 21648 -1.67149292436570e-02
+9237 21672 -7.54624655077917e-02
+9237 21696 -8.98711480908170e-02
+9237 21720 -2.24860482368028e-02
+9237 21744 -9.39185922044208e-04
+9237 21768 -4.41669362790000e-09
+9238 9238 1.00000000000000e+00
+9239 9239 1.00000000000000e+00
+9240 9240 1.00000000000000e+00
+9241 9241 1.00000000000000e+00
+9242 9242 1.00000000000000e+00
+9243 9243 1.00000000000000e+00
+9244 9244 1.00000000000000e+00
+9245 9245 1.00000000000000e+00
+9246 9246 1.00000000000000e+00
+9247 9247 1.00000000000000e+00
+9248 9248 1.00000000000000e+00
+9249 9249 1.00000000000000e+00
+9250 9250 1.00000000000000e+00
+9251 9251 1.00000000000000e+00
+9252 9252 1.00000000000000e+00
+9253 9253 1.00000000000000e+00
+9254 9254 1.00000000000000e+00
+9255 9255 1.00000000000000e+00
+9256 9256 1.00000000000000e+00
+9257 9257 1.00000000000000e+00
+9258 9258 1.00000000000000e+00
+9259 9259 1.00000000000000e+00
+9260 9260 1.00000000000000e+00
+9261 9261 1.45485484512118e+01
+9261 7389 1.11133603000000e-12
+9261 7413 4.62919780307250e-07
+9261 7437 7.71464689415058e-05
+9261 7461 5.25146915451604e-04
+9261 7485 6.59455841648086e-05
+9261 7509 3.82862373842000e-09
+9261 7533 3.51291980000000e-13
+9261 7989 2.14304096016500e-08
+9261 8013 5.24590795012684e-03
+9261 8037 1.09974090606849e-01
+9261 8061 2.51306149652820e-01
+9261 8085 9.29174454274852e-02
+9261 8109 5.38660454727596e-03
+9261 8133 1.36098486988975e-06
+9261 8589 4.54682972154234e-05
+9261 8613 1.09787995396197e-01
+9261 8637 2.15188580318627e+00
+9261 8661 5.27654782800361e+00
+9261 8685 2.15151970522629e+00
+9261 8709 9.45590627379155e-02
+9261 8733 2.84168131865542e-04
+9261 9189 6.78079290028203e-04
+9261 9213 2.82925116133220e-01
+9261 9237 5.78776746291149e+00
+9261 9285 5.35035677744414e+00
+9261 9309 2.81305087752592e-01
+9261 9333 1.79724268891040e-04
+9261 9765 1.94460000000000e-16
+9261 9789 2.22694656811340e-04
+9261 9813 1.45180600441255e-01
+9261 9837 2.49741496761035e+00
+9261 9861 6.06166136081304e+00
+9261 9885 2.30005723638076e+00
+9261 9909 1.08523138370518e-01
+9261 9933 6.03166389497417e-05
+9261 10365 2.69600000000000e-17
+9261 10389 4.55670212600412e-06
+9261 10413 2.91387883519288e-03
+9261 10437 1.34764034047412e-01
+9261 10461 3.57259474892104e-01
+9261 10485 1.20361755725486e-01
+9261 10509 2.88298668641233e-03
+9261 10533 2.19066051226410e-06
+9261 11013 1.23556813447246e-06
+9261 11037 9.38864787359760e-05
+9261 11061 2.69575548313881e-04
+9261 11085 2.67866754088808e-04
+9261 11109 8.73668005157836e-06
+9261 11661 1.17839000000000e-15
+9261 11685 4.20640000000000e-16
+9261 18840 -1.79287271112400e-08
+9261 18864 -7.48855361421700e-08
+9261 18888 -3.06112379000400e-08
+9261 18912 -3.17062769720000e-09
+9261 19200 -7.18384143752448e-05
+9261 19224 -6.94726832043430e-03
+9261 19248 -4.21980672869894e-02
+9261 19272 -7.01592677812317e-02
+9261 19296 -2.16988591599808e-02
+9261 19320 -1.55307223477499e-03
+9261 19584 -1.40505858852180e-07
+9261 19608 -1.13664813412546e-02
+9261 19632 -2.18551967117544e-01
+9261 19656 -9.83374149245046e-01
+9261 19680 -1.33485408307054e+00
+9261 19704 -4.52262731923139e-01
+9261 19728 -4.32773454137629e-02
+9261 19752 -3.34854865003075e-05
+9261 19992 -6.22249116570490e-07
+9261 20016 -6.23693251947759e-02
+9261 20040 -1.08618188199013e+00
+9261 20064 -4.66363090861408e+00
+9261 20088 -6.07799992998220e+00
+9261 20112 -2.14962332383443e+00
+9261 20136 -2.26074176801017e-01
+9261 20160 -6.05453066284460e-04
+9261 20400 -3.81408583499220e-07
+9261 20424 -8.46942034598062e-02
+9261 20448 -1.52417843992889e+00
+9261 20472 -6.61043386329544e+00
+9261 20496 -8.66875421797863e+00
+9261 20520 -3.17368962354501e+00
+9261 20544 -3.54816042167559e-01
+9261 20568 -1.97908944809920e-03
+9261 20808 -6.02256811617600e-08
+9261 20832 -2.47456816655712e-02
+9261 20856 -5.91340677496702e-01
+9261 20880 -2.73881420483964e+00
+9261 20904 -3.59514649502357e+00
+9261 20928 -1.24236010428430e+00
+9261 20952 -1.27093248179569e-01
+9261 20976 -7.09749042147122e-04
+9261 21240 -1.69124856312060e-03
+9261 21264 -7.03796648728656e-02
+9261 21288 -3.51322853426484e-01
+9261 21312 -4.56776305238471e-01
+9261 21336 -1.45112262225362e-01
+9261 21360 -1.27081830126302e-02
+9261 21384 -5.95594804659731e-05
+9261 21648 -1.92421531558400e-08
+9261 21672 -4.24068021415266e-04
+9261 21696 -1.97210171975279e-03
+9261 21720 -1.52847645058494e-03
+9261 21744 -2.76167595293299e-04
+9261 21768 -1.23322260600600e-08
+9262 9262 1.00000000000000e+00
+9263 9263 1.00000000000000e+00
+9264 9264 1.00000000000000e+00
+9265 9265 1.00000000000000e+00
+9266 9266 1.00000000000000e+00
+9267 9267 1.00000000000000e+00
+9268 9268 1.00000000000000e+00
+9269 9269 1.00000000000000e+00
+9270 9270 1.00000000000000e+00
+9271 9271 1.00000000000000e+00
+9272 9272 1.00000000000000e+00
+9273 9273 1.00000000000000e+00
+9274 9274 1.00000000000000e+00
+9275 9275 1.00000000000000e+00
+9276 9276 1.00000000000000e+00
+9277 9277 1.00000000000000e+00
+9278 9278 1.00000000000000e+00
+9279 9279 1.00000000000000e+00
+9280 9280 1.00000000000000e+00
+9281 9281 1.00000000000000e+00
+9282 9282 1.00000000000000e+00
+9283 9283 1.00000000000000e+00
+9284 9284 1.00000000000000e+00
+9285 9285 1.39656075658926e+01
+9285 7437 5.53908622508739e-06
+9285 7461 1.76905947185153e-04
+9285 7485 2.49408950444562e-04
+9285 7509 1.11059283569014e-04
+9285 7533 9.31527367732900e-08
+9285 8037 4.96537002526934e-03
+9285 8061 1.01104182244151e-01
+9285 8085 2.78473549213862e-01
+9285 8109 8.52217717988987e-02
+9285 8133 3.45602568546580e-03
+9285 8157 1.21535498385407e-05
+9285 8613 8.84933336397349e-05
+9285 8637 9.20977706503677e-02
+9285 8661 2.15568720645538e+00
+9285 8685 5.01444778180920e+00
+9285 8709 2.12226312376190e+00
+9285 8733 1.02519668862682e-01
+9285 8757 1.62005155421057e-04
+9285 9213 6.00232747143569e-04
+9285 9237 2.78594960790357e-01
+9285 9261 5.35035677744414e+00
+9285 9309 5.12682007264049e+00
+9285 9333 2.80952884632892e-01
+9285 9357 1.40080260134692e-04
+9285 9813 1.11714081298831e-04
+9285 9837 1.30553376912939e-01
+9285 9861 2.31147641763548e+00
+9285 9885 5.46392976673388e+00
+9285 9909 2.13949290794903e+00
+9285 9933 9.81329879921933e-02
+9285 9957 1.25135402336313e-04
+9285 10413 8.25552108883444e-06
+9285 10437 6.21683783583451e-03
+9285 10461 1.03318965213880e-01
+9285 10485 2.93701725343275e-01
+9285 10509 1.24287728839448e-01
+9285 10533 3.00569983360132e-03
+9285 10557 7.22147823010740e-07
+9285 11061 1.46665177000233e-04
+9285 11085 4.54537256974696e-04
+9285 11109 1.17189641502781e-04
+9285 11133 1.40334369341953e-05
+9285 18840 -3.19429685077522e-04
+9285 18864 -3.92424215915942e-03
+9285 18888 -1.13536029586752e-02
+9285 18912 -4.43884181165060e-03
+9285 18936 -4.48079598200317e-04
+9285 19224 -2.44491993247956e-03
+9285 19248 -6.87655032636453e-02
+9285 19272 -3.73523759437000e-01
+9285 19296 -6.28655875378798e-01
+9285 19320 -2.51669427949044e-01
+9285 19344 -2.92174748183974e-02
+9285 19368 -2.24011129438353e-05
+9285 19632 -2.03097815182612e-02
+9285 19656 -5.14869724059547e-01
+9285 19680 -2.63136498869216e+00
+9285 19704 -4.15319957528697e+00
+9285 19728 -1.73159753784729e+00
+9285 19752 -2.18693144643847e-01
+9285 19776 -1.31385706373236e-03
+9285 20040 -4.65170820385618e-02
+9285 20064 -1.14612630496388e+00
+9285 20088 -5.69463606063288e+00
+9285 20112 -8.67746750985515e+00
+9285 20136 -3.75690140381865e+00
+9285 20160 -5.08138615513834e-01
+9285 20184 -5.56934197282932e-03
+9285 20448 -1.83378568091777e-02
+9285 20472 -6.49732174719309e-01
+9285 20496 -3.42870701505584e+00
+9285 20520 -5.27554891058876e+00
+9285 20544 -2.22780410194104e+00
+9285 20568 -2.95079386881896e-01
+9285 20592 -3.82397426018658e-03
+9285 20856 -1.95469579268335e-03
+9285 20880 -1.16903644012216e-01
+9285 20904 -6.46169679302477e-01
+9285 20928 -9.86091564195394e-01
+9285 20952 -3.90543641669745e-01
+9285 20976 -4.81042644266857e-02
+9285 21000 -6.49930412057389e-04
+9285 21264 -7.35209993245730e-07
+9285 21288 -4.16543717404551e-03
+9285 21312 -2.34736856990423e-02
+9285 21336 -3.18464976229823e-02
+9285 21360 -8.39152786425476e-03
+9285 21384 -3.92140677873953e-04
+9286 9286 1.00000000000000e+00
+9287 9287 1.00000000000000e+00
+9288 9288 1.00000000000000e+00
+9289 9289 1.00000000000000e+00
+9290 9290 1.00000000000000e+00
+9291 9291 1.00000000000000e+00
+9292 9292 1.00000000000000e+00
+9293 9293 1.00000000000000e+00
+9294 9294 1.00000000000000e+00
+9295 9295 1.00000000000000e+00
+9296 9296 1.00000000000000e+00
+9297 9297 1.00000000000000e+00
+9298 9298 1.00000000000000e+00
+9299 9299 1.00000000000000e+00
+9300 9300 1.00000000000000e+00
+9301 9301 1.00000000000000e+00
+9302 9302 1.00000000000000e+00
+9303 9303 1.00000000000000e+00
+9304 9304 1.00000000000000e+00
+9305 9305 1.00000000000000e+00
+9306 9306 1.00000000000000e+00
+9307 9307 1.00000000000000e+00
+9308 9308 1.00000000000000e+00
+9309 9309 1.36726238031770e+01
+9309 7461 4.07861261643040e-06
+9309 7485 2.09551952060575e-04
+9309 7509 2.87450017846340e-04
+9309 7533 3.31206932007275e-05
+9309 7557 2.00372158358377e-06
+9309 8037 2.12450364950000e-10
+9309 8061 4.89545672319202e-03
+9309 8085 9.78293108358420e-02
+9309 8109 2.51563538065893e-01
+9309 8133 1.08772846312618e-01
+9309 8157 2.64740635360718e-03
+9309 8181 5.53908622508744e-06
+9309 8637 1.56645013647059e-04
+9309 8661 8.13110836323455e-02
+9309 8685 2.12534457488616e+00
+9309 8709 5.11958293841721e+00
+9309 8733 2.02653932949449e+00
+9309 8757 1.07957058569069e-01
+9309 8781 7.71464689415076e-05
+9309 9237 3.76580666462597e-04
+9309 9261 2.81305087752592e-01
+9309 9285 5.12682007264049e+00
+9309 9333 5.14992565412798e+00
+9309 9357 2.82210798877989e-01
+9309 9381 2.80163312061419e-04
+9309 9837 8.34240246487332e-05
+9309 9861 1.14020590599328e-01
+9309 9885 2.13680044591844e+00
+9309 9909 5.35940821716841e+00
+9309 9933 2.15224436646047e+00
+9309 9957 8.63918164591308e-02
+9309 9981 1.76444125597532e-04
+9309 10437 1.01551698587122e-06
+9309 10461 4.30756462080175e-03
+9309 10485 1.19507368978336e-01
+9309 10509 2.61254999604079e-01
+9309 10533 1.13586382165694e-01
+9309 10557 4.70380571098789e-03
+9309 10581 1.51877667859400e-08
+9309 11061 5.63269850000820e-07
+9309 11085 1.97278770701296e-05
+9309 11109 6.35178349373478e-04
+9309 11133 1.86724261971482e-04
+9309 11157 2.40795486257657e-06
+9309 18456 -1.21690419475120e-07
+9309 18480 -9.56224454740996e-05
+9309 18504 -4.24155580695303e-04
+9309 18528 -2.69100304160325e-04
+9309 18552 -4.34911550910315e-05
+9309 18840 -1.96245122556971e-04
+9309 18864 -1.52511482932409e-02
+9309 18888 -1.09225360996482e-01
+9309 18912 -2.34465262564610e-01
+9309 18936 -1.12540250718600e-01
+9309 18960 -1.53834825153159e-02
+9309 18984 -1.05416003024269e-05
+9309 19248 -5.35878571918443e-03
+9309 19272 -2.12078387164964e-01
+9309 19296 -1.29828131778269e+00
+9309 19320 -2.48901865479225e+00
+9309 19344 -1.24030980514068e+00
+9309 19368 -1.85183137996147e-01
+9309 19392 -2.05148678363380e-03
+9309 19656 -2.04237157877317e-02
+9309 19680 -7.35882102626065e-01
+9309 19704 -4.28272850225022e+00
+9309 19728 -7.82063470981181e+00
+9309 19752 -3.99347476231928e+00
+9309 19776 -6.28313393694483e-01
+9309 19800 -1.10223094013722e-02
+9309 20064 -1.23074871066057e-02
+9309 20088 -6.27007469647823e-01
+9309 20112 -3.82742487958775e+00
+9309 20136 -7.13291989148040e+00
+9309 20160 -3.67439368781390e+00
+9309 20184 -5.94848422720141e-01
+9309 20208 -1.39338207108136e-02
+9309 20472 -1.95098127036781e-03
+9309 20496 -1.58796974729022e-01
+9309 20520 -1.01903277723737e+00
+9309 20544 -1.93483237870048e+00
+9309 20568 -9.41794062802659e-01
+9309 20592 -1.43723768517555e-01
+9309 20616 -3.08070724295751e-03
+9309 20880 -4.68288025480863e-06
+9309 20904 -1.06321116976910e-02
+9309 20928 -7.41832630423731e-02
+9309 20952 -1.44363945467569e-01
+9309 20976 -5.91529245750124e-02
+9309 21000 -6.95654844075536e-03
+9309 21024 -2.65552428960322e-05
+9309 21312 -4.02905087151119e-06
+9309 21336 -2.19376034812516e-05
+9309 21360 -2.73146508523387e-05
+9309 21384 -5.82139999520688e-06
+9310 9310 1.00000000000000e+00
+9311 9311 1.00000000000000e+00
+9312 9312 1.00000000000000e+00
+9313 9313 1.00000000000000e+00
+9314 9314 1.00000000000000e+00
+9315 9315 1.00000000000000e+00
+9316 9316 1.00000000000000e+00
+9317 9317 1.00000000000000e+00
+9318 9318 1.00000000000000e+00
+9319 9319 1.00000000000000e+00
+9320 9320 1.00000000000000e+00
+9321 9321 1.00000000000000e+00
+9322 9322 1.00000000000000e+00
+9323 9323 1.00000000000000e+00
+9324 9324 1.00000000000000e+00
+9325 9325 1.00000000000000e+00
+9326 9326 1.00000000000000e+00
+9327 9327 1.00000000000000e+00
+9328 9328 1.00000000000000e+00
+9329 9329 1.00000000000000e+00
+9330 9330 1.00000000000000e+00
+9331 9331 1.00000000000000e+00
+9332 9332 1.00000000000000e+00
+9333 9333 1.38340505320788e+01
+9333 7485 6.71275600306683e-06
+9333 7509 1.26060474670821e-04
+9333 7533 5.57366312412029e-04
+9333 7557 5.24284476533356e-05
+9333 7581 2.12450364950000e-10
+9333 7605 8.10624600000000e-14
+9333 8061 2.21431704970470e-07
+9333 8085 3.29078610576367e-03
+9333 8109 1.11890756819087e-01
+9333 8133 2.40930019848202e-01
+9333 8157 9.57663978761802e-02
+9333 8181 4.96537002526930e-03
+9333 8205 2.33286633743801e-06
+9333 8661 1.52487309262474e-04
+9333 8685 9.01462639339635e-02
+9333 8709 2.03413071720501e+00
+9333 8733 5.17540769465832e+00
+9333 8757 2.09507042579206e+00
+9333 8781 1.09974090606847e-01
+9333 8805 7.72839565029901e-05
+9333 9261 1.79724268891040e-04
+9333 9285 2.80952884632892e-01
+9333 9309 5.14992565412798e+00
+9333 9357 5.17797855006936e+00
+9333 9381 2.74627686916332e-01
+9333 9405 5.56133606008075e-04
+9333 9861 1.20323550370873e-04
+9333 9885 1.09523577382539e-01
+9333 9909 2.14309867129201e+00
+9333 9933 5.23127818559847e+00
+9333 9957 2.25780169589536e+00
+9333 9981 9.21548851110135e-02
+9333 10005 1.31358384121017e-04
+9333 10461 1.29078208718039e-05
+9333 10485 2.66749886865831e-03
+9333 10509 1.04894232584917e-01
+9333 10533 2.94052596094362e-01
+9333 10557 1.03986644421698e-01
+9333 10581 5.78011380667552e-03
+9333 11085 1.74930753381091e-06
+9333 11109 9.19256200499717e-05
+9333 11133 1.52045374293928e-04
+9333 11157 2.64738694593928e-04
+9333 11181 6.98380998805087e-06
+9333 18096 -5.56057466610000e-10
+9333 18120 -3.01603641067000e-09
+9333 18144 -3.72328364354000e-09
+9333 18168 -7.91806544230000e-10
+9333 18456 -1.35451214863830e-07
+9333 18480 -1.54822597046124e-03
+9333 18504 -1.97985618629705e-02
+9333 18528 -6.19881299017590e-02
+9333 18552 -3.76488888679954e-02
+9333 18576 -6.01949539313832e-03
+9333 18600 -2.45216359375916e-06
+9333 18864 -1.21000740674983e-03
+9333 18888 -7.39127451110974e-02
+9333 18912 -5.54442084415406e-01
+9333 18936 -1.30220261752323e+00
+9333 18960 -7.80770559015170e-01
+9333 18984 -1.34841749520497e-01
+9333 19008 -2.36917694260559e-03
+9333 19272 -6.28028490483826e-03
+9333 19296 -3.86242857738413e-01
+9333 19320 -2.71989718090498e+00
+9333 19344 -6.03043027825411e+00
+9333 19368 -3.65852053446203e+00
+9333 19392 -6.65735053161053e-01
+9333 19416 -1.82366467804072e-02
+9333 19680 -6.99137529405230e-03
+9333 19704 -5.44017519973765e-01
+9333 19728 -3.84397367768757e+00
+9333 19752 -8.46920094647210e+00
+9333 19776 -5.25957862952257e+00
+9333 19800 -1.01643732635629e+00
+9333 19824 -3.85963268737258e-02
+9333 20088 -1.49333307771921e-03
+9333 20112 -1.98152836711833e-01
+9333 20136 -1.48988839847490e+00
+9333 20160 -3.39171852619217e+00
+9333 20184 -2.01599738264808e+00
+9333 20208 -3.72818880152228e-01
+9333 20232 -1.29970123836129e-02
+9333 20496 -1.27615079143268e-05
+9333 20520 -2.18011093323539e-02
+9333 20544 -1.78671550878467e-01
+9333 20568 -4.23340971250778e-01
+9333 20592 -2.32535662013767e-01
+9333 20616 -3.91570541987394e-02
+9333 20640 -1.05007272993042e-03
+9333 20928 -1.91124497901623e-04
+9333 20952 -1.59366967251031e-03
+9333 20976 -3.53912977336373e-03
+9333 21000 -9.54445888291218e-04
+9333 21024 -3.13185518468507e-05
+9334 9334 1.00000000000000e+00
+9335 9335 1.00000000000000e+00
+9336 9336 1.00000000000000e+00
+9337 9337 1.00000000000000e+00
+9338 9338 1.00000000000000e+00
+9339 9339 1.00000000000000e+00
+9340 9340 1.00000000000000e+00
+9341 9341 1.00000000000000e+00
+9342 9342 1.00000000000000e+00
+9343 9343 1.00000000000000e+00
+9344 9344 1.00000000000000e+00
+9345 9345 1.00000000000000e+00
+9346 9346 1.00000000000000e+00
+9347 9347 1.00000000000000e+00
+9348 9348 1.00000000000000e+00
+9349 9349 1.00000000000000e+00
+9350 9350 1.00000000000000e+00
+9351 9351 1.00000000000000e+00
+9352 9352 1.00000000000000e+00
+9353 9353 1.00000000000000e+00
+9354 9354 1.00000000000000e+00
+9355 9355 1.00000000000000e+00
+9356 9356 1.00000000000000e+00
+9357 9357 1.42155940525200e+01
+9357 7509 1.13484136129366e-05
+9357 7533 1.06435412031524e-04
+9357 7557 1.84292133188979e-04
+9357 7581 1.56645013647059e-04
+9357 7605 1.84048516669520e-07
+9357 8085 1.59094207830698e-06
+9357 8109 2.37454150425827e-03
+9357 8133 1.06392574754095e-01
+9357 8157 2.80488210935191e-01
+9357 8181 9.20977706503669e-02
+9357 8205 3.81948091007359e-03
+9357 8229 7.38583222521840e-06
+9357 8685 7.84494215473642e-05
+9357 8709 1.00625901988250e-01
+9357 8733 2.08683207293720e+00
+9357 8757 5.19496917949436e+00
+9357 8781 2.15188580318626e+00
+9357 8805 1.24288913731449e-01
+9357 8829 1.65828879302893e-04
+9357 9285 1.40080260134692e-04
+9357 9309 2.82210798877989e-01
+9357 9333 5.17797855006936e+00
+9357 9381 5.68740314343214e+00
+9357 9405 2.81822420274204e-01
+9357 9429 7.57288505340487e-04
+9357 9885 2.46473168732277e-04
+9357 9909 1.00146710530685e-01
+9357 9933 2.25961989461756e+00
+9357 9957 5.50681995523441e+00
+9357 9981 2.39295414762304e+00
+9357 10005 1.24157463156091e-01
+9357 10029 6.65602558937124e-05
+9357 10485 6.72456755290762e-06
+9357 10509 5.39569286250718e-03
+9357 10533 8.99707006266862e-02
+9357 10557 3.01419830152242e-01
+9357 10581 1.33641182211229e-01
+9357 10605 6.61404141397696e-03
+9357 10629 4.13226415410000e-10
+9357 11133 1.33659463189933e-04
+9357 11157 5.42606048985629e-04
+9357 11181 1.01435749871591e-04
+9357 11205 3.01784208052601e-06
+9357 11229 1.65361740000000e-13
+9357 18096 -1.39127671343210e-05
+9357 18120 -1.61402046852438e-03
+9357 18144 -7.75557904544801e-03
+9357 18168 -7.59144487802214e-03
+9357 18192 -1.50947173666034e-03
+9357 18216 -3.20764573755030e-07
+9357 18480 -1.66168765949975e-04
+9357 18504 -2.12466860893382e-02
+9357 18528 -2.00674644131229e-01
+9357 18552 -5.70727423507654e-01
+9357 18576 -4.30138184579653e-01
+9357 18600 -8.64757018219526e-02
+9357 18624 -2.26300359808559e-03
+9357 18888 -1.32903395665438e-03
+9357 18912 -1.70937578879024e-01
+9357 18936 -1.47822609499833e+00
+9357 18960 -3.96244886125040e+00
+9357 18984 -2.99873944324051e+00
+9357 19008 -6.49578675580681e-01
+9357 19032 -2.75991069040432e-02
+9357 19056 -9.93685121070000e-10
+9357 19296 -2.84679740778393e-03
+9357 19320 -3.98034187425601e-01
+9357 19344 -3.29949882568257e+00
+9357 19368 -8.57804786423748e+00
+9357 19392 -6.59932721052855e+00
+9357 19416 -1.52988192885990e+00
+9357 19440 -8.46843250636792e-02
+9357 19464 -5.96334235505000e-09
+9357 19704 -7.57131174518657e-04
+9357 19728 -2.15879675201232e-01
+9357 19752 -1.93651044840107e+00
+9357 19776 -5.24984454072550e+00
+9357 19800 -3.93415720552657e+00
+9357 19824 -9.05256029699007e-01
+9357 19848 -5.14144086384390e-02
+9357 19872 -8.94809260414000e-09
+9357 20112 -2.31930704160447e-05
+9357 20136 -3.58048723393170e-02
+9357 20160 -3.52156070294242e-01
+9357 20184 -9.93116571711688e-01
+9357 20208 -6.98575913356137e-01
+9357 20232 -1.53167292222670e-01
+9357 20256 -8.22518959263092e-03
+9357 20280 -1.98860187077000e-09
+9357 20544 -8.99956012314788e-04
+9357 20568 -1.14567772184786e-02
+9357 20592 -3.45663066015183e-02
+9357 20616 -1.68136550660147e-02
+9357 20640 -2.24873890229678e-03
+9357 20664 -2.55024749279373e-06
+9358 9358 1.00000000000000e+00
+9359 9359 1.00000000000000e+00
+9360 9360 1.00000000000000e+00
+9361 9361 1.00000000000000e+00
+9362 9362 1.00000000000000e+00
+9363 9363 1.00000000000000e+00
+9364 9364 1.00000000000000e+00
+9365 9365 1.00000000000000e+00
+9366 9366 1.00000000000000e+00
+9367 9367 1.00000000000000e+00
+9368 9368 1.00000000000000e+00
+9369 9369 1.00000000000000e+00
+9370 9370 1.00000000000000e+00
+9371 9371 1.00000000000000e+00
+9372 9372 1.00000000000000e+00
+9373 9373 1.00000000000000e+00
+9374 9374 1.00000000000000e+00
+9375 9375 1.00000000000000e+00
+9376 9376 1.00000000000000e+00
+9377 9377 1.00000000000000e+00
+9378 9378 1.00000000000000e+00
+9379 9379 1.00000000000000e+00
+9380 9380 1.00000000000000e+00
+9381 9381 1.55068125774855e+01
+9381 7533 1.37306196538333e-06
+9381 7557 2.90316706081261e-04
+9381 7581 3.76580666462597e-04
+9381 7605 3.05226841770271e-05
+9381 7629 1.67959048382321e-06
+9381 8109 1.89681802581382e-06
+9381 8133 3.05267476070691e-03
+9381 8157 1.04998272549908e-01
+9381 8181 2.78594960790361e-01
+9381 8205 1.28294801162543e-01
+9381 8229 4.36077583164119e-03
+9381 8253 1.54657054999064e-06
+9381 8277 1.50650000000000e-16
+9381 8709 3.57994833680478e-05
+9381 8733 1.07044420043823e-01
+9381 8757 2.14319633633398e+00
+9381 8781 5.78776746291150e+00
+9381 8805 2.48928706355120e+00
+9381 8829 1.41675838469126e-01
+9381 8853 1.97291361919335e-04
+9381 8877 4.22030000000000e-16
+9381 9309 2.80163312061419e-04
+9381 9333 2.74627686916332e-01
+9381 9357 5.68740314343214e+00
+9381 9405 6.56471963283415e+00
+9381 9429 2.76348776783463e-01
+9381 9453 4.20437398965705e-04
+9381 9909 3.16321383374544e-04
+9381 9933 1.06238221895661e-01
+9381 9957 2.38740455251695e+00
+9381 9981 6.44362061844830e+00
+9381 10005 2.39184467225707e+00
+9381 10029 9.43923886567093e-02
+9381 10053 2.18137199729480e-05
+9381 10509 4.10056075839960e-07
+9381 10533 4.93536473027638e-03
+9381 10557 1.29959229577403e-01
+9381 10581 3.19722565471032e-01
+9381 10605 9.66358510578623e-02
+9381 10629 3.56458842680593e-03
+9381 11133 8.42870972887720e-07
+9381 11157 2.10763663817737e-05
+9381 11181 4.71482473101208e-04
+9381 11205 2.34927877494198e-04
+9381 11229 5.61618000186800e-08
+9381 17736 -2.84457677356829e-05
+9381 17760 -2.02465739836170e-04
+9381 17784 -3.83180860003062e-04
+9381 17808 -8.87003356679494e-05
+9381 17832 -4.41669362790000e-09
+9381 18096 -3.16656089837685e-06
+9381 18120 -3.60383670497818e-03
+9381 18144 -5.64564483220392e-02
+9381 18168 -2.16482774683167e-01
+9381 18192 -2.21176604075140e-01
+9381 18216 -4.82939482475503e-02
+9381 18240 -9.39185922044185e-04
+9381 18504 -1.83814698169988e-04
+9381 18528 -6.29703485864404e-02
+9381 18552 -7.15791459635722e-01
+9381 18576 -2.39601445015481e+00
+9381 18600 -2.35758391105408e+00
+9381 18624 -5.57018387595869e-01
+9381 18648 -2.24860482368027e-02
+9381 18912 -7.15434311001545e-04
+9381 18936 -2.35359211128359e-01
+9381 18960 -2.44933938889464e+00
+9381 18984 -7.77456076509343e+00
+9381 19008 -7.47852153566624e+00
+9381 19032 -1.82669002690143e+00
+9381 19056 -8.98711480908172e-02
+9381 19320 -2.81844181765471e-04
+9381 19344 -2.01108282090764e-01
+9381 19368 -2.25808474336946e+00
+9381 19392 -7.39535321592714e+00
+9381 19416 -6.98854935785908e+00
+9381 19440 -1.66495891798114e+00
+9381 19464 -7.54624655077918e-02
+9381 19728 -2.76739317972477e-05
+9381 19752 -4.71831589024651e-02
+9381 19776 -5.99376677632753e-01
+9381 19800 -2.05289357518911e+00
+9381 19824 -1.87406138757865e+00
+9381 19848 -4.28266688460054e-01
+9381 19872 -1.67149292436570e-02
+9381 20160 -2.41400275343922e-03
+9381 20184 -4.20503355344801e-02
+9381 20208 -1.56845308931476e-01
+9381 20232 -1.32485464574330e-01
+9381 20256 -2.75544390262789e-02
+9381 20280 -6.75108151057785e-04
+9381 20568 -5.47964570785980e-07
+9381 20592 -1.67984462863557e-05
+9381 20616 -5.96109218410203e-05
+9381 20640 -1.71530090327612e-05
+9381 20664 -6.36605257387360e-07
+9382 9382 1.00000000000000e+00
+9383 9383 1.00000000000000e+00
+9384 9384 1.00000000000000e+00
+9385 9385 1.00000000000000e+00
+9386 9386 1.00000000000000e+00
+9387 9387 1.00000000000000e+00
+9388 9388 1.00000000000000e+00
+9389 9389 1.00000000000000e+00
+9390 9390 1.00000000000000e+00
+9391 9391 1.00000000000000e+00
+9392 9392 1.00000000000000e+00
+9393 9393 1.00000000000000e+00
+9394 9394 1.00000000000000e+00
+9395 9395 1.00000000000000e+00
+9396 9396 1.00000000000000e+00
+9397 9397 1.00000000000000e+00
+9398 9398 1.00000000000000e+00
+9399 9399 1.00000000000000e+00
+9400 9400 1.00000000000000e+00
+9401 9401 1.00000000000000e+00
+9402 9402 1.00000000000000e+00
+9403 9403 1.00000000000000e+00
+9404 9404 1.00000000000000e+00
+9405 9405 1.59550388736789e+01
+9405 7557 1.22408211906470e-06
+9405 7581 8.34240246487300e-05
+9405 7605 5.43624149202171e-04
+9405 7629 1.16427669681291e-04
+9405 7653 3.96083470000000e-13
+9405 7677 1.81280000000000e-16
+9405 8133 7.94031900597670e-07
+9405 8157 4.01865511835702e-03
+9405 8181 1.30553376912941e-01
+9405 8205 3.22180068646864e-01
+9405 8229 9.38903743213126e-02
+9405 8253 5.64636705605456e-03
+9405 8277 1.55053844990900e-08
+9405 8733 1.59114016612106e-05
+9405 8757 1.20227799418499e-01
+9405 8781 2.49741496761040e+00
+9405 8805 6.41976470167613e+00
+9405 8829 2.30610993286478e+00
+9405 8853 1.34864340673859e-01
+9405 8877 4.47785888509600e-08
+9405 9333 5.56133606008075e-04
+9405 9357 2.81822420274204e-01
+9405 9381 6.56471963283415e+00
+9405 9429 7.59651806450866e+00
+9405 9453 2.29394337282821e-01
+9405 9933 2.62739118781426e-04
+9405 9957 1.36104287771052e-01
+9405 9981 2.38090503758767e+00
+9405 10005 6.71549843465461e+00
+9405 10029 3.98787308235858e+00
+9405 10053 1.04734868936986e-02
+9405 10533 2.79430157966990e-06
+9405 10557 4.00256385214283e-03
+9405 10581 9.18742608481266e-02
+9405 10605 3.91337936004934e-01
+9405 10629 9.52927344201621e-02
+9405 11157 1.08879937028273e-06
+9405 11181 1.28078995586540e-04
+9405 11205 1.19958834153317e-04
+9405 11229 3.75230044358600e-08
+9405 17376 -1.54549245000000e-12
+9405 17400 -6.23034231000000e-12
+9405 17424 -1.64223745000000e-12
+9405 17736 -1.52153242486523e-04
+9405 17760 -9.40248882104714e-03
+9405 17784 -4.35511837740995e-02
+9405 17808 -4.59803680636706e-02
+9405 17832 -1.68082945346775e-02
+9405 18120 -1.54009090715200e-05
+9405 18144 -2.11921539795365e-02
+9405 18168 -3.40186827062613e-01
+9405 18192 -1.23592080630090e+00
+9405 18216 -1.13270057768641e+00
+9405 18240 -4.08749207963311e-01
+9405 18528 -7.21993790366340e-05
+9405 18552 -1.17769960030618e-01
+9405 18576 -1.72986038849152e+00
+9405 18600 -6.10453891104466e+00
+9405 18624 -5.81223872309208e+00
+9405 18648 -2.47152522189264e+00
+9405 18936 -5.77838800737363e-05
+9405 18960 -1.66742076918557e-01
+9405 18984 -2.45398170369842e+00
+9405 19008 -8.73478129569136e+00
+9405 19032 -9.17219547194408e+00
+9405 19056 -4.85138247369461e+00
+9405 19344 -1.05957427505541e-05
+9405 19368 -5.53882674114027e-02
+9405 19392 -9.54578846059274e-01
+9405 19416 -3.48549779286629e+00
+9405 19440 -3.32914583511339e+00
+9405 19464 -1.71003083767368e+00
+9405 19776 -5.05902499824337e-03
+9405 19800 -1.15666008616457e-01
+9405 19824 -4.36925577003901e-01
+9405 19848 -3.49286089514239e-01
+9405 19872 -1.56683939199442e-01
+9405 20184 -8.76502208940883e-06
+9405 20208 -1.21570673088838e-03
+9405 20232 -5.08853050101858e-03
+9405 20256 -2.60936372640854e-03
+9405 20280 -3.57181806112211e-04
+9406 9406 1.00000000000000e+00
+9407 9407 1.00000000000000e+00
+9408 9408 1.00000000000000e+00
+9409 9409 1.00000000000000e+00
+9410 9410 1.00000000000000e+00
+9411 9411 1.00000000000000e+00
+9412 9412 1.00000000000000e+00
+9413 9413 1.00000000000000e+00
+9414 9414 1.00000000000000e+00
+9415 9415 1.00000000000000e+00
+9416 9416 1.00000000000000e+00
+9417 9417 1.00000000000000e+00
+9418 9418 1.00000000000000e+00
+9419 9419 1.00000000000000e+00
+9420 9420 1.00000000000000e+00
+9421 9421 1.00000000000000e+00
+9422 9422 1.00000000000000e+00
+9423 9423 1.00000000000000e+00
+9424 9424 1.00000000000000e+00
+9425 9425 1.00000000000000e+00
+9426 9426 1.00000000000000e+00
+9427 9427 1.00000000000000e+00
+9428 9428 1.00000000000000e+00
+9429 9429 2.50014043927917e+01
+9429 7005 4.40000000000000e-19
+9429 7029 3.80000000000000e-19
+9429 7557 5.21894530000000e-13
+9429 7581 1.01551698587119e-06
+9429 7605 2.51116470786621e-04
+9429 7629 2.83309791446209e-04
+9429 7653 2.02409678011768e-04
+9429 7677 1.18392864123259e-06
+9429 8157 8.53127317558100e-08
+9429 8181 6.21683783583451e-03
+9429 8205 1.05567678610665e-01
+9429 8229 3.65589698849345e-01
+9429 8253 2.69689879613938e-01
+9429 8277 2.12411346181340e-03
+9429 8757 4.63231239090595e-05
+9429 8781 1.34764034047414e-01
+9429 8805 2.18313486092396e+00
+9429 8829 9.74156077354733e+00
+9429 8853 4.59301705652275e+00
+9429 8877 9.81314367921115e-04
+9429 9357 7.57288505340487e-04
+9429 9381 2.76348776783463e-01
+9429 9405 7.59651806450866e+00
+9429 9453 3.00812933496056e+00
+9429 9957 1.35092304002420e-04
+9429 9981 1.05217503878586e-01
+9429 10005 5.59124452074484e+00
+9429 10029 8.41036131317700e+00
+9429 10053 5.92060211873684e-02
+9429 10557 1.31669194616130e-06
+9429 10581 6.97895973065632e-03
+9429 10605 2.26802376575187e-01
+9429 10629 1.07199625704488e-01
+9429 11205 4.05234314351900e-08
+9429 11229 5.88890614340000e-09
+9429 17352 -7.46393400000000e-14
+9429 17376 -4.10935087373671e-04
+9429 17400 -9.46517302950756e-03
+9429 17424 -1.60538004493400e-02
+9429 17736 -2.31168330062640e-07
+9429 17760 -5.38291298606250e-03
+9429 17784 -7.39964518854148e-02
+9429 17808 -9.00313035298770e-01
+9429 17832 -1.42258422170924e+00
+9429 18144 -1.46666927100898e-06
+9429 18168 -5.10221569510311e-02
+9429 18192 -6.38758052884548e-01
+9429 18216 -5.50103384768733e+00
+9429 18240 -7.85719513899032e+00
+9429 18552 -2.39915213309623e-06
+9429 18576 -1.31335544505490e-01
+9429 18600 -1.62177710123623e+00
+9429 18624 -1.05430018435053e+01
+9429 18648 -1.31480554177427e+01
+9429 18960 -5.41995950758400e-07
+9429 18984 -6.14995665721275e-02
+9429 19008 -9.67865603429286e-01
+9429 19032 -8.15239410774458e+00
+9429 19056 -1.11286651487522e+01
+9429 19392 -8.17707393505394e-03
+9429 19416 -1.70527780808150e-01
+9429 19440 -1.73985483446227e+00
+9429 19464 -2.49861912557889e+00
+9429 19800 -4.66156117325992e-05
+9429 19824 -4.21211943045400e-03
+9429 19848 -5.65856354692920e-02
+9429 19872 -8.48984408304536e-02
+9430 9430 1.00000000000000e+00
+9431 9431 1.00000000000000e+00
+9432 9432 1.00000000000000e+00
+9433 9433 1.00000000000000e+00
+9434 9434 1.00000000000000e+00
+9435 9435 1.00000000000000e+00
+9436 9436 1.00000000000000e+00
+9437 9437 1.00000000000000e+00
+9438 9438 1.00000000000000e+00
+9439 9439 1.00000000000000e+00
+9440 9440 1.00000000000000e+00
+9441 9441 1.00000000000000e+00
+9442 9442 1.00000000000000e+00
+9443 9443 1.00000000000000e+00
+9444 9444 1.00000000000000e+00
+9445 9445 1.00000000000000e+00
+9446 9446 1.00000000000000e+00
+9447 9447 1.00000000000000e+00
+9448 9448 1.00000000000000e+00
+9449 9449 1.00000000000000e+00
+9450 9450 1.00000000000000e+00
+9451 9451 1.00000000000000e+00
+9452 9452 1.00000000000000e+00
+9453 9453 1.87999395128718e+00
+9453 7605 1.44666009939136e-06
+9453 7629 2.27061860767540e-04
+9453 7653 2.73392609382709e-04
+9453 7677 2.00195419374276e-06
+9453 8205 4.48672969599103e-03
+9453 8229 1.26642207232518e-01
+9453 8253 1.92744512039679e-01
+9453 8277 3.63532297866516e-03
+9453 8781 9.38864787359738e-05
+9453 8805 7.91253656423229e-02
+9453 8829 2.93990643686121e+00
+9453 8853 2.24680920254793e+00
+9453 8877 1.67498720578745e-03
+9453 9381 4.20437398965705e-04
+9453 9405 2.29394337282822e-01
+9453 9429 3.00812933496056e+00
+9453 9981 6.46479002001124e-05
+9453 10005 6.99586949078870e-02
+9453 10029 2.51332964486056e-01
+9453 10053 5.96412141363918e-03
+9453 10581 4.08628167584000e-09
+9453 10605 7.12317907240379e-04
+9453 10629 6.84807729967531e-04
+9453 17376 -4.15196523486821e-04
+9453 17400 -1.51031657139677e-02
+9453 17424 -2.72999557635276e-02
+9453 17784 -9.31784332562728e-03
+9453 17808 -4.48334279241390e-01
+9453 17832 -8.31443655203389e-01
+9453 18192 -3.69326044520854e-02
+9453 18216 -1.73811843761457e+00
+9453 18240 -3.21770864406453e+00
+9453 18600 -3.13274163014302e-02
+9453 18624 -1.08493774795171e+00
+9453 18648 -1.95058358179340e+00
+9453 19008 -6.34375125082223e-03
+9453 19032 -2.18132430886975e-01
+9453 19056 -3.91858603018194e-01
+9453 19416 -1.13643062235917e-04
+9453 19440 -1.17009061321144e-02
+9453 19464 -2.26063108285773e-02
+9454 9454 1.00000000000000e+00
+9455 9455 1.00000000000000e+00
+9456 9456 1.00000000000000e+00
+9457 9457 1.00000000000000e+00
+9458 9458 1.00000000000000e+00
+9459 9459 1.00000000000000e+00
+9460 9460 1.00000000000000e+00
+9461 9461 1.00000000000000e+00
+9462 9462 1.00000000000000e+00
+9463 9463 1.00000000000000e+00
+9464 9464 1.00000000000000e+00
+9465 9465 1.00000000000000e+00
+9466 9466 1.00000000000000e+00
+9467 9467 1.00000000000000e+00
+9468 9468 1.00000000000000e+00
+9469 9469 1.00000000000000e+00
+9470 9470 1.00000000000000e+00
+9471 9471 1.00000000000000e+00
+9472 9472 1.00000000000000e+00
+9473 9473 1.00000000000000e+00
+9474 9474 1.00000000000000e+00
+9475 9475 1.00000000000000e+00
+9476 9476 1.00000000000000e+00
+9477 9477 1.00000000000000e+00
+9478 9478 1.00000000000000e+00
+9479 9479 1.00000000000000e+00
+9480 9480 1.00000000000000e+00
+9481 9481 1.00000000000000e+00
+9482 9482 1.00000000000000e+00
+9483 9483 1.00000000000000e+00
+9484 9484 1.00000000000000e+00
+9485 9485 1.00000000000000e+00
+9486 9486 1.00000000000000e+00
+9487 9487 1.00000000000000e+00
+9488 9488 1.00000000000000e+00
+9489 9489 1.00000000000000e+00
+9490 9490 1.00000000000000e+00
+9491 9491 1.00000000000000e+00
+9492 9492 1.00000000000000e+00
+9493 9493 1.00000000000000e+00
+9494 9494 1.00000000000000e+00
+9495 9495 1.00000000000000e+00
+9496 9496 1.00000000000000e+00
+9497 9497 1.00000000000000e+00
+9498 9498 1.00000000000000e+00
+9499 9499 1.00000000000000e+00
+9500 9500 1.00000000000000e+00
+9501 9501 1.00000000000000e+00
+9502 9502 1.00000000000000e+00
+9503 9503 1.00000000000000e+00
+9504 9504 1.00000000000000e+00
+9505 9505 1.00000000000000e+00
+9506 9506 1.00000000000000e+00
+9507 9507 1.00000000000000e+00
+9508 9508 1.00000000000000e+00
+9509 9509 1.00000000000000e+00
+9510 9510 1.00000000000000e+00
+9511 9511 1.00000000000000e+00
+9512 9512 1.00000000000000e+00
+9513 9513 1.00000000000000e+00
+9514 9514 1.00000000000000e+00
+9515 9515 1.00000000000000e+00
+9516 9516 1.00000000000000e+00
+9517 9517 1.00000000000000e+00
+9518 9518 1.00000000000000e+00
+9519 9519 1.00000000000000e+00
+9520 9520 1.00000000000000e+00
+9521 9521 1.00000000000000e+00
+9522 9522 1.00000000000000e+00
+9523 9523 1.00000000000000e+00
+9524 9524 1.00000000000000e+00
+9525 9525 1.00000000000000e+00
+9526 9526 1.00000000000000e+00
+9527 9527 1.00000000000000e+00
+9528 9528 1.00000000000000e+00
+9529 9529 1.00000000000000e+00
+9530 9530 1.00000000000000e+00
+9531 9531 1.00000000000000e+00
+9532 9532 1.00000000000000e+00
+9533 9533 1.00000000000000e+00
+9534 9534 1.00000000000000e+00
+9535 9535 1.00000000000000e+00
+9536 9536 1.00000000000000e+00
+9537 9537 1.00000000000000e+00
+9538 9538 1.00000000000000e+00
+9539 9539 1.00000000000000e+00
+9540 9540 1.00000000000000e+00
+9541 9541 1.00000000000000e+00
+9542 9542 1.00000000000000e+00
+9543 9543 1.00000000000000e+00
+9544 9544 1.00000000000000e+00
+9545 9545 1.00000000000000e+00
+9546 9546 1.00000000000000e+00
+9547 9547 1.00000000000000e+00
+9548 9548 1.00000000000000e+00
+9549 9549 1.00000000000000e+00
+9550 9550 1.00000000000000e+00
+9551 9551 1.00000000000000e+00
+9552 9552 1.00000000000000e+00
+9553 9553 1.00000000000000e+00
+9554 9554 1.00000000000000e+00
+9555 9555 1.00000000000000e+00
+9556 9556 1.00000000000000e+00
+9557 9557 1.00000000000000e+00
+9558 9558 1.00000000000000e+00
+9559 9559 1.00000000000000e+00
+9560 9560 1.00000000000000e+00
+9561 9561 1.00000000000000e+00
+9562 9562 1.00000000000000e+00
+9563 9563 1.00000000000000e+00
+9564 9564 1.00000000000000e+00
+9565 9565 1.00000000000000e+00
+9566 9566 1.00000000000000e+00
+9567 9567 1.00000000000000e+00
+9568 9568 1.00000000000000e+00
+9569 9569 1.00000000000000e+00
+9570 9570 1.00000000000000e+00
+9571 9571 1.00000000000000e+00
+9572 9572 1.00000000000000e+00
+9573 9573 1.00000000000000e+00
+9574 9574 1.00000000000000e+00
+9575 9575 1.00000000000000e+00
+9576 9576 1.00000000000000e+00
+9577 9577 1.00000000000000e+00
+9578 9578 1.00000000000000e+00
+9579 9579 1.00000000000000e+00
+9580 9580 1.00000000000000e+00
+9581 9581 1.00000000000000e+00
+9582 9582 1.00000000000000e+00
+9583 9583 1.00000000000000e+00
+9584 9584 1.00000000000000e+00
+9585 9585 1.00000000000000e+00
+9586 9586 1.00000000000000e+00
+9587 9587 1.00000000000000e+00
+9588 9588 1.00000000000000e+00
+9589 9589 1.00000000000000e+00
+9590 9590 1.00000000000000e+00
+9591 9591 1.00000000000000e+00
+9592 9592 1.00000000000000e+00
+9593 9593 1.00000000000000e+00
+9594 9594 1.00000000000000e+00
+9595 9595 1.00000000000000e+00
+9596 9596 1.00000000000000e+00
+9597 9597 1.00000000000000e+00
+9598 9598 1.00000000000000e+00
+9599 9599 1.00000000000000e+00
+9600 9600 1.00000000000000e+00
+9601 9601 1.00000000000000e+00
+9602 9602 1.00000000000000e+00
+9603 9603 1.00000000000000e+00
+9604 9604 1.00000000000000e+00
+9605 9605 1.00000000000000e+00
+9606 9606 1.00000000000000e+00
+9607 9607 1.00000000000000e+00
+9608 9608 1.00000000000000e+00
+9609 9609 1.00000000000000e+00
+9610 9610 1.00000000000000e+00
+9611 9611 1.00000000000000e+00
+9612 9612 1.00000000000000e+00
+9613 9613 1.00000000000000e+00
+9614 9614 1.00000000000000e+00
+9615 9615 1.00000000000000e+00
+9616 9616 1.00000000000000e+00
+9617 9617 1.00000000000000e+00
+9618 9618 1.00000000000000e+00
+9619 9619 1.00000000000000e+00
+9620 9620 1.00000000000000e+00
+9621 9621 1.00000000000000e+00
+9622 9622 1.00000000000000e+00
+9623 9623 1.00000000000000e+00
+9624 9624 1.00000000000000e+00
+9625 9625 1.00000000000000e+00
+9626 9626 1.00000000000000e+00
+9627 9627 1.00000000000000e+00
+9628 9628 1.00000000000000e+00
+9629 9629 1.00000000000000e+00
+9630 9630 1.00000000000000e+00
+9631 9631 1.00000000000000e+00
+9632 9632 1.00000000000000e+00
+9633 9633 1.00000000000000e+00
+9634 9634 1.00000000000000e+00
+9635 9635 1.00000000000000e+00
+9636 9636 1.00000000000000e+00
+9637 9637 1.00000000000000e+00
+9638 9638 1.00000000000000e+00
+9639 9639 1.00000000000000e+00
+9640 9640 1.00000000000000e+00
+9641 9641 1.00000000000000e+00
+9642 9642 1.00000000000000e+00
+9643 9643 1.00000000000000e+00
+9644 9644 1.00000000000000e+00
+9645 9645 1.00000000000000e+00
+9646 9646 1.00000000000000e+00
+9647 9647 1.00000000000000e+00
+9648 9648 1.00000000000000e+00
+9649 9649 1.00000000000000e+00
+9650 9650 1.00000000000000e+00
+9651 9651 1.00000000000000e+00
+9652 9652 1.00000000000000e+00
+9653 9653 1.00000000000000e+00
+9654 9654 1.00000000000000e+00
+9655 9655 1.00000000000000e+00
+9656 9656 1.00000000000000e+00
+9657 9657 1.00000000000000e+00
+9658 9658 1.00000000000000e+00
+9659 9659 1.00000000000000e+00
+9660 9660 1.00000000000000e+00
+9661 9661 1.00000000000000e+00
+9662 9662 1.00000000000000e+00
+9663 9663 1.00000000000000e+00
+9664 9664 1.00000000000000e+00
+9665 9665 1.00000000000000e+00
+9666 9666 1.00000000000000e+00
+9667 9667 1.00000000000000e+00
+9668 9668 1.00000000000000e+00
+9669 9669 1.00000000000000e+00
+9670 9670 1.00000000000000e+00
+9671 9671 1.00000000000000e+00
+9672 9672 1.00000000000000e+00
+9673 9673 1.00000000000000e+00
+9674 9674 1.00000000000000e+00
+9675 9675 1.00000000000000e+00
+9676 9676 1.00000000000000e+00
+9677 9677 1.00000000000000e+00
+9678 9678 1.00000000000000e+00
+9679 9679 1.00000000000000e+00
+9680 9680 1.00000000000000e+00
+9681 9681 1.00000000000000e+00
+9682 9682 1.00000000000000e+00
+9683 9683 1.00000000000000e+00
+9684 9684 1.00000000000000e+00
+9685 9685 1.00000000000000e+00
+9686 9686 1.00000000000000e+00
+9687 9687 1.00000000000000e+00
+9688 9688 1.00000000000000e+00
+9689 9689 1.00000000000000e+00
+9690 9690 1.00000000000000e+00
+9691 9691 1.00000000000000e+00
+9692 9692 1.00000000000000e+00
+9693 9693 1.00000000000000e+00
+9694 9694 1.00000000000000e+00
+9695 9695 1.00000000000000e+00
+9696 9696 1.00000000000000e+00
+9697 9697 1.00000000000000e+00
+9698 9698 1.00000000000000e+00
+9699 9699 1.00000000000000e+00
+9700 9700 1.00000000000000e+00
+9701 9701 1.00000000000000e+00
+9702 9702 1.00000000000000e+00
+9703 9703 1.00000000000000e+00
+9704 9704 1.00000000000000e+00
+9705 9705 1.00000000000000e+00
+9706 9706 1.00000000000000e+00
+9707 9707 1.00000000000000e+00
+9708 9708 1.00000000000000e+00
+9709 9709 1.00000000000000e+00
+9710 9710 1.00000000000000e+00
+9711 9711 1.00000000000000e+00
+9712 9712 1.00000000000000e+00
+9713 9713 1.00000000000000e+00
+9714 9714 1.00000000000000e+00
+9715 9715 1.00000000000000e+00
+9716 9716 1.00000000000000e+00
+9717 9717 1.00000000000000e+00
+9718 9718 1.00000000000000e+00
+9719 9719 1.00000000000000e+00
+9720 9720 1.00000000000000e+00
+9721 9721 1.00000000000000e+00
+9722 9722 1.00000000000000e+00
+9723 9723 1.00000000000000e+00
+9724 9724 1.00000000000000e+00
+9725 9725 1.00000000000000e+00
+9726 9726 1.00000000000000e+00
+9727 9727 1.00000000000000e+00
+9728 9728 1.00000000000000e+00
+9729 9729 1.00000000000000e+00
+9730 9730 1.00000000000000e+00
+9731 9731 1.00000000000000e+00
+9732 9732 1.00000000000000e+00
+9733 9733 1.00000000000000e+00
+9734 9734 1.00000000000000e+00
+9735 9735 1.00000000000000e+00
+9736 9736 1.00000000000000e+00
+9737 9737 1.00000000000000e+00
+9738 9738 1.00000000000000e+00
+9739 9739 1.00000000000000e+00
+9740 9740 1.00000000000000e+00
+9741 9741 1.03178973644449e+00
+9741 7917 1.25052203376217e-06
+9741 7941 1.95371943844944e-04
+9741 7965 1.28664970767148e-04
+9741 7989 4.13083515611090e-07
+9741 8517 9.22890593949134e-03
+9741 8541 9.43953024244516e-02
+9741 8565 4.82735193069485e-02
+9741 8589 2.48600030779952e-03
+9741 8613 6.07076150326415e-06
+9741 9117 1.48846185431150e-02
+9741 9141 4.31840613477259e-01
+9741 9165 6.74357737899612e-01
+9741 9189 5.71113368287837e-02
+9741 9213 1.48757014544798e-04
+9741 9765 1.83378625356761e-01
+9741 9789 4.59222211420531e-02
+9741 9813 1.38667055159880e-04
+9741 10365 2.80088098136387e-06
+9741 10389 2.68083483975985e-05
+9741 10413 5.75738267860000e-09
+9741 20736 -3.67982902529280e-04
+9741 20760 -2.68203129603540e-03
+9741 20784 -5.29244362974384e-03
+9741 20808 -1.54634762008399e-03
+9741 20832 -8.40619835414268e-05
+9741 21144 -2.32563123210228e-02
+9741 21168 -1.54266916353447e-01
+9741 21192 -2.75622480796982e-01
+9741 21216 -9.08396678635035e-02
+9741 21240 -7.39950019853701e-03
+9741 21552 -4.39367443243407e-02
+9741 21576 -2.89759613634646e-01
+9741 21600 -5.14197856185756e-01
+9741 21624 -1.70854902386419e-01
+9741 21648 -1.42105665122840e-02
+9742 9742 1.00000000000000e+00
+9743 9743 1.00000000000000e+00
+9744 9744 1.00000000000000e+00
+9745 9745 1.00000000000000e+00
+9746 9746 1.00000000000000e+00
+9747 9747 1.00000000000000e+00
+9748 9748 1.00000000000000e+00
+9749 9749 1.00000000000000e+00
+9750 9750 1.00000000000000e+00
+9751 9751 1.00000000000000e+00
+9752 9752 1.00000000000000e+00
+9753 9753 1.00000000000000e+00
+9754 9754 1.00000000000000e+00
+9755 9755 1.00000000000000e+00
+9756 9756 1.00000000000000e+00
+9757 9757 1.00000000000000e+00
+9758 9758 1.00000000000000e+00
+9759 9759 1.00000000000000e+00
+9760 9760 1.00000000000000e+00
+9761 9761 1.00000000000000e+00
+9762 9762 1.00000000000000e+00
+9763 9763 1.00000000000000e+00
+9764 9764 1.00000000000000e+00
+9765 9765 6.60889732475977e+00
+9765 7917 1.36192251944495e-06
+9765 7941 2.39044322190820e-04
+9765 7965 3.23989771589693e-04
+9765 7989 1.81715951490786e-05
+9765 8013 1.82413221143829e-06
+9765 8517 7.34843574811681e-03
+9765 8541 1.48862480810999e-01
+9765 8565 2.78118470954539e-01
+9765 8589 9.56967206476587e-02
+9765 8613 3.27777054418449e-03
+9765 8637 3.01784208052619e-06
+9765 9117 1.18136420444714e-02
+9765 9141 1.35780839835572e+00
+9765 9165 8.47559702554791e+00
+9765 9189 4.37323350928711e+00
+9765 9213 1.15120413221381e-01
+9765 9237 2.34927877494194e-04
+9765 9261 1.94460000000000e-16
+9765 9741 1.83378625356761e-01
+9765 9789 6.11383506306135e+00
+9765 9813 3.28881041915940e-01
+9765 9837 1.19958834153315e-04
+9765 9861 2.85680000000000e-16
+9765 10365 6.42960599027289e-04
+9765 10389 6.30109354465536e-02
+9765 10413 3.01114647711885e-02
+9765 10437 4.05234314351900e-08
+9765 20352 -2.63635274781210e-07
+9765 20376 -4.51231632600853e-05
+9765 20400 -1.86284564303333e-04
+9765 20424 -8.30543836998000e-05
+9765 20448 -9.74644038470989e-06
+9765 20736 -4.01571096527221e-04
+9765 20760 -1.42858512538457e-02
+9765 20784 -8.56064705006723e-02
+9765 20808 -1.57674992663909e-01
+9765 20832 -6.26822243240927e-02
+9765 20856 -7.04889861285721e-03
+9765 20880 -1.37368931380000e-10
+9765 21144 -1.88624550732973e-02
+9765 21168 -4.17890200362026e-01
+9765 21192 -2.51925394366349e+00
+9765 21216 -4.99269484568011e+00
+9765 21240 -1.64156849315702e+00
+9765 21264 -1.27735214090194e-01
+9765 21288 -1.55434573406250e-07
+9765 21552 -3.49139124709041e-02
+9765 21576 -7.35786296464277e-01
+9765 21600 -4.44043579606702e+00
+9765 21624 -8.88650814138471e+00
+9765 21648 -2.84652083002161e+00
+9765 21672 -2.06381545340390e-01
+9765 21696 -3.09907564292870e-07
+9766 9766 1.00000000000000e+00
+9767 9767 1.00000000000000e+00
+9768 9768 1.00000000000000e+00
+9769 9769 1.00000000000000e+00
+9770 9770 1.00000000000000e+00
+9771 9771 1.00000000000000e+00
+9772 9772 1.00000000000000e+00
+9773 9773 1.00000000000000e+00
+9774 9774 1.00000000000000e+00
+9775 9775 1.00000000000000e+00
+9776 9776 1.00000000000000e+00
+9777 9777 1.00000000000000e+00
+9778 9778 1.00000000000000e+00
+9779 9779 1.00000000000000e+00
+9780 9780 1.00000000000000e+00
+9781 9781 1.00000000000000e+00
+9782 9782 1.00000000000000e+00
+9783 9783 1.00000000000000e+00
+9784 9784 1.00000000000000e+00
+9785 9785 1.00000000000000e+00
+9786 9786 1.00000000000000e+00
+9787 9787 1.00000000000000e+00
+9788 9788 1.00000000000000e+00
+9789 9789 2.32800694414847e+01
+9789 7941 5.17228162006529e-06
+9789 7965 9.87647472616856e-05
+9789 7989 7.01342460993384e-04
+9789 8013 1.09163930156516e-04
+9789 8541 8.22857654823549e-03
+9789 8565 1.11544915246483e-01
+9789 8589 2.56110343441903e-01
+9789 8613 1.14640260342689e-01
+9789 8637 6.61404141397737e-03
+9789 8661 7.65518854573857e-06
+9789 9141 1.56701631720268e-01
+9789 9165 6.37363411517381e+00
+9789 9189 9.48469133812496e+00
+9789 9213 2.47430333521984e+00
+9789 9237 9.66358510578650e-02
+9789 9261 2.22694656811340e-04
+9789 9741 4.59222211420531e-02
+9789 9765 6.11383506306135e+00
+9789 9813 1.00664315766853e+01
+9789 9837 3.91337936004934e-01
+9789 9861 3.22067592846332e-04
+9789 10365 3.30908086177552e-03
+9789 10389 1.31811892162331e+00
+9789 10413 2.82246097617274e+00
+9789 10437 2.26802376575187e-01
+9789 10461 2.50863875796693e-04
+9789 11013 1.81867178720744e-04
+9789 11037 7.12317907240400e-04
+9789 11061 2.76965240371860e-07
+9789 20352 -5.30610853420250e-07
+9789 20376 -2.12602681745384e-03
+9789 20400 -2.22660675726958e-02
+9789 20424 -6.04023209590331e-02
+9789 20448 -2.65648743547455e-02
+9789 20472 -3.19873872226592e-03
+9789 20760 -2.27056743930507e-03
+9789 20784 -8.82386895391241e-02
+9789 20808 -5.87225973957992e-01
+9789 20832 -1.20726376709725e+00
+9789 20856 -4.87838300554059e-01
+9789 20880 -5.62077263860393e-02
+9789 20904 -3.54822158744667e-04
+9789 21168 -3.23742370319458e-02
+9789 21192 -1.42156879861833e+00
+9789 21216 -7.22856710572123e+00
+9789 21240 -1.01403827040806e+01
+9789 21264 -4.98769432682709e+00
+9789 21288 -7.88820640174529e-01
+9789 21312 -1.30329133732080e-02
+9789 21576 -4.88682978709450e-02
+9789 21600 -2.28074346771659e+00
+9789 21624 -1.09254701506266e+01
+9789 21648 -1.34003793834157e+01
+9789 21672 -7.25120728299913e+00
+9789 21696 -1.26735440242570e+00
+9789 21720 -2.35820716352034e-02
+9790 9790 1.00000000000000e+00
+9791 9791 1.00000000000000e+00
+9792 9792 1.00000000000000e+00
+9793 9793 1.00000000000000e+00
+9794 9794 1.00000000000000e+00
+9795 9795 1.00000000000000e+00
+9796 9796 1.00000000000000e+00
+9797 9797 1.00000000000000e+00
+9798 9798 1.00000000000000e+00
+9799 9799 1.00000000000000e+00
+9800 9800 1.00000000000000e+00
+9801 9801 1.00000000000000e+00
+9802 9802 1.00000000000000e+00
+9803 9803 1.00000000000000e+00
+9804 9804 1.00000000000000e+00
+9805 9805 1.00000000000000e+00
+9806 9806 1.00000000000000e+00
+9807 9807 1.00000000000000e+00
+9808 9808 1.00000000000000e+00
+9809 9809 1.00000000000000e+00
+9810 9810 1.00000000000000e+00
+9811 9811 1.00000000000000e+00
+9812 9812 1.00000000000000e+00
+9813 9813 2.33744226411700e+01
+9813 7965 1.53658882619252e-05
+9813 7989 2.20082275981338e-04
+9813 8013 1.66440736458122e-04
+9813 8037 1.31358384121013e-04
+9813 8061 9.53315919924630e-07
+9813 8541 1.44369951344170e-07
+9813 8565 3.49349886848900e-03
+9813 8589 1.30468906119896e-01
+9813 8613 3.70222890871785e-01
+9813 8637 1.24157463156096e-01
+9813 8661 2.98338614606095e-03
+9813 8685 1.30211113888142e-05
+9813 9141 2.73574244309968e-04
+9813 9165 1.65911619907654e-01
+9813 9189 2.75103404825546e+00
+9813 9213 5.30068757924913e+00
+9813 9237 2.39184467225713e+00
+9813 9261 1.45180600441255e-01
+9813 9285 1.11714081298831e-04
+9813 9741 1.38667055159880e-04
+9813 9765 3.28881041915940e-01
+9813 9789 1.00664315766853e+01
+9813 9837 6.71549843465464e+00
+9813 9861 3.04211210513148e-01
+9813 9885 4.19351447657620e-04
+9813 10365 7.01132519780417e-04
+9813 10389 1.66127993386265e+00
+9813 10413 1.08522054118622e+01
+9813 10437 5.59124452074495e+00
+9813 10461 1.22248691713121e-01
+9813 10485 1.17729495477175e-04
+9813 11013 1.17535898769438e-02
+9813 11037 6.99586949078888e-02
+9813 11061 9.82793053106761e-03
+9813 19992 -1.80659238066755e-05
+9813 20016 -1.21445491145510e-03
+9813 20040 -5.13431393213628e-03
+9813 20064 -3.33212378989244e-03
+9813 20088 -5.47483143416012e-04
+9813 20376 -5.31919679444246e-04
+9813 20400 -3.78886813069682e-02
+9813 20424 -2.74822116270501e-01
+9813 20448 -6.13134529254272e-01
+9813 20472 -3.41170327114193e-01
+9813 20496 -5.38648376009507e-02
+9813 20520 -3.69013968260158e-04
+9813 20784 -4.50836102338893e-03
+9813 20808 -2.94052989407066e-01
+9813 20832 -1.87862984396721e+00
+9813 20856 -3.72294246617883e+00
+9813 20880 -2.24353417678795e+00
+9813 20904 -3.92717788799683e-01
+9813 20928 -6.49201867337139e-03
+9813 21192 -1.38478634824624e-02
+9813 21216 -9.00513750001270e-01
+9813 21240 -5.86735061115207e+00
+9813 21264 -1.21491661808584e+01
+9813 21288 -8.15750338257103e+00
+9813 21312 -1.55811480797783e+00
+9813 21336 -3.65312941816135e-02
+9813 21600 -9.96711146675259e-03
+9813 21624 -7.26009893525002e-01
+9813 21648 -5.61186521115565e+00
+9813 21672 -1.36812044076590e+01
+9813 21696 -9.15748002497590e+00
+9813 21720 -1.71458500707124e+00
+9813 21744 -3.72128208243914e-02
+9814 9814 1.00000000000000e+00
+9815 9815 1.00000000000000e+00
+9816 9816 1.00000000000000e+00
+9817 9817 1.00000000000000e+00
+9818 9818 1.00000000000000e+00
+9819 9819 1.00000000000000e+00
+9820 9820 1.00000000000000e+00
+9821 9821 1.00000000000000e+00
+9822 9822 1.00000000000000e+00
+9823 9823 1.00000000000000e+00
+9824 9824 1.00000000000000e+00
+9825 9825 1.00000000000000e+00
+9826 9826 1.00000000000000e+00
+9827 9827 1.00000000000000e+00
+9828 9828 1.00000000000000e+00
+9829 9829 1.00000000000000e+00
+9830 9830 1.00000000000000e+00
+9831 9831 1.00000000000000e+00
+9832 9832 1.00000000000000e+00
+9833 9833 1.00000000000000e+00
+9834 9834 1.00000000000000e+00
+9835 9835 1.00000000000000e+00
+9836 9836 1.00000000000000e+00
+9837 9837 1.59550388736787e+01
+9837 7989 2.79430157966995e-06
+9837 8013 2.62739118781417e-04
+9837 8037 5.56133606008056e-04
+9837 8061 1.59114016612106e-05
+9837 8085 7.94031900597680e-07
+9837 8565 1.08879937028277e-06
+9837 8589 4.00256385214307e-03
+9837 8613 1.36104287771057e-01
+9837 8637 2.81822420274205e-01
+9837 8661 1.20227799418500e-01
+9837 8685 4.01865511835696e-03
+9837 8709 1.22408211906470e-06
+9837 9165 1.28078995586539e-04
+9837 9189 9.18742608481290e-02
+9837 9213 2.38090503758773e+00
+9837 9237 6.56471963283403e+00
+9837 9261 2.49741496761035e+00
+9837 9285 1.30553376912939e-01
+9837 9309 8.34240246487332e-05
+9837 9765 1.19958834153315e-04
+9837 9789 3.91337936004934e-01
+9837 9813 6.71549843465464e+00
+9837 9861 6.41976470167607e+00
+9837 9885 3.22180068646864e-01
+9837 9909 5.43624149202188e-04
+9837 10365 3.75230044358600e-08
+9837 10389 9.52927344201623e-02
+9837 10413 3.98787308235866e+00
+9837 10437 7.59651806450879e+00
+9837 10461 2.30610993286482e+00
+9837 10485 9.38903743213149e-02
+9837 10509 1.16427669681294e-04
+9837 11013 1.04734868936989e-02
+9837 11037 2.29394337282826e-01
+9837 11061 1.34864340673861e-01
+9837 11085 5.64636705605473e-03
+9837 11109 3.96083470000000e-13
+9837 11661 4.47785888509600e-08
+9837 11685 1.55053844990900e-08
+9837 11709 1.81280000000000e-16
+9837 19632 -1.05957427505543e-05
+9837 19656 -5.77838800737370e-05
+9837 19680 -7.21993790366341e-05
+9837 19704 -1.54009090715200e-05
+9837 19992 -8.76502208940850e-06
+9837 20016 -5.05902499824320e-03
+9837 20040 -5.53882674114023e-02
+9837 20064 -1.66742076918558e-01
+9837 20088 -1.17769960030617e-01
+9837 20112 -2.11921539795360e-02
+9837 20136 -1.52153242486529e-04
+9837 20400 -1.21570673088845e-03
+9837 20424 -1.15666008616462e-01
+9837 20448 -9.54578846059280e-01
+9837 20472 -2.45398170369837e+00
+9837 20496 -1.72986038849149e+00
+9837 20520 -3.40186827062610e-01
+9837 20544 -9.40248882104740e-03
+9837 20808 -5.08853050101887e-03
+9837 20832 -4.36925577003924e-01
+9837 20856 -3.48549779286631e+00
+9837 20880 -8.73478129569114e+00
+9837 20904 -6.10453891104458e+00
+9837 20928 -1.23592080630090e+00
+9837 20952 -4.35511837741008e-02
+9837 20976 -1.54549245000000e-12
+9837 21216 -2.60936372640858e-03
+9837 21240 -3.49286089514245e-01
+9837 21264 -3.32914583511341e+00
+9837 21288 -9.17219547194407e+00
+9837 21312 -5.81223872309214e+00
+9837 21336 -1.13270057768643e+00
+9837 21360 -4.59803680636722e-02
+9837 21384 -6.23034231000000e-12
+9837 21624 -3.57181806112203e-04
+9837 21648 -1.56683939199441e-01
+9837 21672 -1.71003083767370e+00
+9837 21696 -4.85138247369471e+00
+9837 21720 -2.47152522189269e+00
+9837 21744 -4.08749207963319e-01
+9837 21768 -1.68082945346777e-02
+9837 21792 -1.64223745000000e-12
+9838 9838 1.00000000000000e+00
+9839 9839 1.00000000000000e+00
+9840 9840 1.00000000000000e+00
+9841 9841 1.00000000000000e+00
+9842 9842 1.00000000000000e+00
+9843 9843 1.00000000000000e+00
+9844 9844 1.00000000000000e+00
+9845 9845 1.00000000000000e+00
+9846 9846 1.00000000000000e+00
+9847 9847 1.00000000000000e+00
+9848 9848 1.00000000000000e+00
+9849 9849 1.00000000000000e+00
+9850 9850 1.00000000000000e+00
+9851 9851 1.00000000000000e+00
+9852 9852 1.00000000000000e+00
+9853 9853 1.00000000000000e+00
+9854 9854 1.00000000000000e+00
+9855 9855 1.00000000000000e+00
+9856 9856 1.00000000000000e+00
+9857 9857 1.00000000000000e+00
+9858 9858 1.00000000000000e+00
+9859 9859 1.00000000000000e+00
+9860 9860 1.00000000000000e+00
+9861 9861 1.67148947905031e+01
+9861 8013 7.46695746236228e-06
+9861 8037 7.72839565029905e-05
+9861 8061 3.83618832664601e-04
+9861 8085 1.21338636937128e-04
+9861 8589 2.47633161065679e-06
+9861 8613 2.81609474262597e-03
+9861 8637 1.24288913731450e-01
+9861 8661 2.80845679566271e-01
+9861 8685 8.98139243420839e-02
+9861 8709 5.51968148406416e-03
+9861 8733 1.40034993139735e-06
+9861 9189 8.08979821477098e-05
+9861 9213 1.37978003661634e-01
+9861 9237 2.48928706355115e+00
+9861 9261 6.06166136081304e+00
+9861 9285 2.31147641763548e+00
+9861 9309 1.14020590599328e-01
+9861 9333 1.20323550370873e-04
+9861 9765 2.85680000000000e-16
+9861 9789 3.22067592846332e-04
+9861 9813 3.04211210513148e-01
+9861 9837 6.41976470167607e+00
+9861 9885 6.10174473440797e+00
+9861 9909 2.77770045261556e-01
+9861 9933 6.20724038309029e-04
+9861 10365 3.96000000000000e-17
+9861 10389 1.96678742491976e-04
+9861 10413 1.07149062964961e-01
+9861 10437 2.18313486092399e+00
+9861 10461 5.48682765881358e+00
+9861 10485 2.52076813096799e+00
+9861 10509 1.33750852826011e-01
+9861 10533 3.45354354387671e-05
+9861 11013 6.51068255958219e-04
+9861 11037 7.91253656423249e-02
+9861 11061 2.53180377174207e-01
+9861 11085 1.02243790726413e-01
+9861 11109 5.85510262322295e-03
+9861 11133 1.66357890694850e-07
+9861 11661 6.26332162683858e-05
+9861 11685 2.13322127890798e-04
+9861 11709 6.93965276951360e-07
+9861 11733 2.19544460000000e-13
+9861 19632 -1.86508968564515e-04
+9861 19656 -6.87824803542513e-03
+9861 19680 -3.06819938875631e-02
+9861 19704 -3.00451118904870e-02
+9861 19728 -6.15205480232570e-03
+9861 19752 -4.63546319988544e-05
+9861 20016 -1.52757987606118e-04
+9861 20040 -3.06138592859709e-02
+9861 20064 -3.28645579300927e-01
+9861 20088 -1.02406696179593e+00
+9861 20112 -8.56623399539274e-01
+9861 20136 -1.90496251635001e-01
+9861 20160 -7.58954126479111e-03
+9861 20424 -8.34346672447792e-04
+9861 20448 -1.98962185579805e-01
+9861 20472 -1.98400933919515e+00
+9861 20496 -5.86868412923070e+00
+9861 20520 -4.74306814100734e+00
+9861 20544 -1.11422845009598e+00
+9861 20568 -6.09726191576314e-02
+9861 20592 -1.21126830761592e-06
+9861 20832 -1.04604514369137e-03
+9861 20856 -3.59725190023989e-01
+9861 20880 -3.53361738223855e+00
+9861 20904 -1.02624281112438e+01
+9861 20928 -8.10899043378030e+00
+9861 20952 -2.01546910711490e+00
+9861 20976 -1.37572068971871e-01
+9861 21000 -5.13822501368427e-06
+9861 21240 -2.23427793991197e-04
+9861 21264 -1.30866721526174e-01
+9861 21288 -1.35404939750063e+00
+9861 21312 -3.99618407387618e+00
+9861 21336 -3.00685097530566e+00
+9861 21360 -7.34540317333704e-01
+9861 21384 -5.10251812906424e-02
+9861 21408 -2.38387544049828e-06
+9861 21648 -2.82679919691200e-08
+9861 21672 -1.46458338405462e-02
+9861 21696 -1.68324535039274e-01
+9861 21720 -5.13545222136799e-01
+9861 21744 -3.54401329386676e-01
+9861 21768 -7.96440172054113e-02
+9861 21792 -4.92885197545318e-03
+9861 21816 -2.93151783220590e-07
+9862 9862 1.00000000000000e+00
+9863 9863 1.00000000000000e+00
+9864 9864 1.00000000000000e+00
+9865 9865 1.00000000000000e+00
+9866 9866 1.00000000000000e+00
+9867 9867 1.00000000000000e+00
+9868 9868 1.00000000000000e+00
+9869 9869 1.00000000000000e+00
+9870 9870 1.00000000000000e+00
+9871 9871 1.00000000000000e+00
+9872 9872 1.00000000000000e+00
+9873 9873 1.00000000000000e+00
+9874 9874 1.00000000000000e+00
+9875 9875 1.00000000000000e+00
+9876 9876 1.00000000000000e+00
+9877 9877 1.00000000000000e+00
+9878 9878 1.00000000000000e+00
+9879 9879 1.00000000000000e+00
+9880 9880 1.00000000000000e+00
+9881 9881 1.00000000000000e+00
+9882 9882 1.00000000000000e+00
+9883 9883 1.00000000000000e+00
+9884 9884 1.00000000000000e+00
+9885 9885 1.52048834911820e+01
+9885 7461 1.22830000000000e-16
+9885 7485 1.87940000000000e-16
+9885 8037 2.33286633743804e-06
+9885 8061 2.24058402351051e-04
+9885 8085 2.33536006397612e-04
+9885 8109 1.15050029531140e-04
+9885 8133 8.44175032531250e-07
+9885 8613 1.62962235055505e-06
+9885 8637 3.81948091007352e-03
+9885 8661 1.03852201314301e-01
+9885 8685 2.86213876935511e-01
+9885 8709 9.54297444868284e-02
+9885 8733 2.99554152661755e-03
+9885 8757 2.33219156354427e-06
+9885 9213 1.86095276753447e-05
+9885 9237 1.28294801162541e-01
+9885 9261 2.30005723638076e+00
+9885 9285 5.46392976673388e+00
+9885 9309 2.13680044591844e+00
+9885 9333 1.09523577382539e-01
+9885 9357 2.46473168732277e-04
+9885 9813 4.19351447657620e-04
+9885 9837 3.22180068646864e-01
+9885 9861 6.10174473440797e+00
+9885 9909 5.76486307275887e+00
+9885 9933 2.67067283445575e-01
+9885 9957 5.00161568839060e-04
+9885 10413 2.11681717864977e-04
+9885 10437 1.05567678610667e-01
+9885 10461 2.54478197047033e+00
+9885 10485 6.54732452314687e+00
+9885 10509 2.44145806955102e+00
+9885 10533 1.29265031934993e-01
+9885 10557 1.87607910286078e-05
+9885 11013 9.84462529829370e-07
+9885 11037 4.48672969599122e-03
+9885 11061 8.83750882412705e-02
+9885 11085 3.19728559420914e-01
+9885 11109 1.48638855963742e-01
+9885 11133 4.53064416783996e-03
+9885 11157 1.07354659163106e-06
+9885 11661 1.00310287655637e-04
+9885 11685 4.39095393213606e-04
+9885 11709 6.44276186536676e-05
+9885 11733 1.89409891545976e-06
+9885 19248 -6.64224849700000e-11
+9885 19272 -3.19949948932872e-04
+9885 19296 -2.16668756254669e-03
+9885 19320 -3.87791204741476e-03
+9885 19344 -9.28518009400151e-04
+9885 19368 -1.04073115619183e-05
+9885 19632 -7.58338003402632e-06
+9885 19656 -6.56477375214336e-03
+9885 19680 -9.59646298107570e-02
+9885 19704 -3.62324339704623e-01
+9885 19728 -3.81038440366007e-01
+9885 19752 -9.71852575256478e-02
+9885 19776 -5.16812501595190e-03
+9885 20040 -7.26889822415117e-05
+9885 20064 -7.08050616192463e-02
+9885 20088 -8.81184445223634e-01
+9885 20112 -3.07599406256265e+00
+9885 20136 -3.09628035087767e+00
+9885 20160 -8.49994985456533e-01
+9885 20184 -6.02435661366252e-02
+9885 20208 -1.60601360825510e-05
+9885 20448 -1.77369989909078e-04
+9885 20472 -2.07628844917457e-01
+9885 20496 -2.40623175819995e+00
+9885 20520 -8.08169379493113e+00
+9885 20544 -8.01336539963254e+00
+9885 20568 -2.32104302524861e+00
+9885 20592 -1.90281153849870e-01
+9885 20616 -8.98871072744678e-05
+9885 20856 -4.38145079191087e-05
+9885 20880 -1.36403831570533e-01
+9885 20904 -1.72365237570312e+00
+9885 20928 -6.06421539807101e+00
+9885 20952 -6.17588936427231e+00
+9885 20976 -1.79075268972273e+00
+9885 21000 -1.44830657291904e-01
+9885 21024 -1.18646387859606e-04
+9885 21264 -3.64761453425570e-07
+9885 21288 -2.42284408096528e-02
+9885 21312 -3.40415392059897e-01
+9885 21336 -1.25135147236020e+00
+9885 21360 -1.28251347224225e+00
+9885 21384 -3.59609790199526e-01
+9885 21408 -2.67245997549214e-02
+9885 21432 -2.56465629442638e-05
+9885 21696 -3.37059951672555e-04
+9885 21720 -9.34229118965601e-03
+9885 21744 -4.00258339285672e-02
+9885 21768 -3.89639863280268e-02
+9885 21792 -8.19121310477222e-03
+9885 21816 -1.19661164935189e-04
+9886 9886 1.00000000000000e+00
+9887 9887 1.00000000000000e+00
+9888 9888 1.00000000000000e+00
+9889 9889 1.00000000000000e+00
+9890 9890 1.00000000000000e+00
+9891 9891 1.00000000000000e+00
+9892 9892 1.00000000000000e+00
+9893 9893 1.00000000000000e+00
+9894 9894 1.00000000000000e+00
+9895 9895 1.00000000000000e+00
+9896 9896 1.00000000000000e+00
+9897 9897 1.00000000000000e+00
+9898 9898 1.00000000000000e+00
+9899 9899 1.00000000000000e+00
+9900 9900 1.00000000000000e+00
+9901 9901 1.00000000000000e+00
+9902 9902 1.00000000000000e+00
+9903 9903 1.00000000000000e+00
+9904 9904 1.00000000000000e+00
+9905 9905 1.00000000000000e+00
+9906 9906 1.00000000000000e+00
+9907 9907 1.00000000000000e+00
+9908 9908 1.00000000000000e+00
+9909 9909 1.44213860298008e+01
+9909 7461 1.86000000000000e-17
+9909 7485 2.84600000000000e-17
+9909 8037 8.10624600000000e-14
+9909 8061 1.45607376990160e-07
+9909 8085 2.12636592359758e-04
+9909 8109 3.84182544807878e-04
+9909 8133 1.58758229703412e-05
+9909 8157 7.87821774847120e-07
+9909 8637 1.84048516669520e-07
+9909 8661 5.11135706757790e-03
+9909 8685 1.03347535291060e-01
+9909 8709 2.50889615789971e-01
+9909 8733 1.06063705484245e-01
+9909 8757 4.42976897962916e-03
+9909 8781 4.62919780307240e-07
+9909 9237 3.05226841770282e-05
+9909 9261 1.08523138370518e-01
+9909 9285 2.13949290794903e+00
+9909 9309 5.35940821716841e+00
+9909 9333 2.14309867129201e+00
+9909 9357 1.00146710530685e-01
+9909 9381 3.16321383374544e-04
+9909 9837 5.43624149202188e-04
+9909 9861 2.77770045261556e-01
+9909 9885 5.76486307275887e+00
+9909 9933 5.50028633803776e+00
+9909 9957 2.82601434453939e-01
+9909 9981 2.74904578863921e-04
+9909 10413 5.38430000000000e-16
+9909 10437 2.51116470786627e-04
+9909 10461 1.41882974823343e-01
+9909 10485 2.43971202276573e+00
+9909 10509 6.05533313607166e+00
+9909 10533 2.27567422516412e+00
+9909 10557 1.13542902326336e-01
+9909 10581 4.76842667935611e-05
+9909 11013 1.82940000000000e-16
+9909 11037 1.44666009939136e-06
+9909 11061 4.31287933667580e-03
+9909 11085 1.46585707143302e-01
+9909 11109 3.28037469003487e-01
+9909 11133 1.19649369036847e-01
+9909 11157 3.37533779248334e-03
+9909 11181 2.33546346859171e-06
+9909 11661 1.32826164813374e-06
+9909 11685 2.27667645083759e-05
+9909 11709 4.72542549108700e-04
+9909 11733 3.60350842428268e-04
+9909 11757 2.13656657686164e-06
+9909 18888 -4.19734577819610e-07
+9909 18912 -1.54190474932796e-05
+9909 18936 -5.60742176785103e-05
+9909 18960 -1.65162946727463e-05
+9909 18984 -6.94046372686310e-07
+9909 19248 -1.00590931000000e-11
+9909 19272 -5.78508518996045e-04
+9909 19296 -1.99554679510908e-02
+9909 19320 -1.01039043382733e-01
+9909 19344 -1.39874140180191e-01
+9909 19368 -4.05088426167672e-02
+9909 19392 -2.65351095419140e-03
+9909 19656 -2.01560395289946e-06
+9909 19680 -2.10748455066426e-02
+9909 19704 -3.57021004769817e-01
+9909 19728 -1.49717127446903e+00
+9909 19752 -1.86500071194457e+00
+9909 19776 -5.92579518169768e-01
+9909 19800 -5.20208389584619e-02
+9909 19824 -4.00601221406901e-05
+9909 20064 -8.41167939047527e-06
+9909 20088 -9.45460057249828e-02
+9909 20112 -1.44359395821837e+00
+9909 20136 -5.76875780633070e+00
+9909 20160 -6.93663822977343e+00
+9909 20184 -2.30331252695501e+00
+9909 20208 -2.24374614877640e-01
+9909 20232 -4.19129189440235e-04
+9909 20472 -3.41322157762279e-06
+9909 20496 -9.55746831138020e-02
+9909 20520 -1.58350204718123e+00
+9909 20544 -6.49493602195031e+00
+9909 20568 -7.84475762036924e+00
+9909 20592 -2.65973954927671e+00
+9909 20616 -2.70400200659883e-01
+9909 20640 -1.08121285912416e-03
+9909 20880 -3.49414465273930e-07
+9909 20904 -2.33917155530079e-02
+9909 20928 -5.02981888970408e-01
+9909 20952 -2.18514483610331e+00
+9909 20976 -2.57969505935670e+00
+9909 21000 -8.20278751359103e-01
+9909 21024 -7.51061278934865e-02
+9909 21048 -2.81280434771760e-04
+9909 21312 -1.11687003265819e-03
+9909 21336 -4.73116659948570e-02
+9909 21360 -2.23748796928781e-01
+9909 21384 -2.52605295670657e-01
+9909 21408 -7.02222855708155e-02
+9909 21432 -4.76276778342330e-03
+9909 21456 -5.59793347357133e-06
+9909 21720 -1.07073187650000e-09
+9909 21744 -7.22152185415601e-05
+9909 21768 -3.09682943183136e-04
+9909 21792 -1.55563455594226e-04
+9909 21816 -2.08381299950429e-05
+9910 9910 1.00000000000000e+00
+9911 9911 1.00000000000000e+00
+9912 9912 1.00000000000000e+00
+9913 9913 1.00000000000000e+00
+9914 9914 1.00000000000000e+00
+9915 9915 1.00000000000000e+00
+9916 9916 1.00000000000000e+00
+9917 9917 1.00000000000000e+00
+9918 9918 1.00000000000000e+00
+9919 9919 1.00000000000000e+00
+9920 9920 1.00000000000000e+00
+9921 9921 1.00000000000000e+00
+9922 9922 1.00000000000000e+00
+9923 9923 1.00000000000000e+00
+9924 9924 1.00000000000000e+00
+9925 9925 1.00000000000000e+00
+9926 9926 1.00000000000000e+00
+9927 9927 1.00000000000000e+00
+9928 9928 1.00000000000000e+00
+9929 9929 1.00000000000000e+00
+9930 9930 1.00000000000000e+00
+9931 9931 1.00000000000000e+00
+9932 9932 1.00000000000000e+00
+9933 9933 1.43612580844074e+01
+9933 8061 2.42173700000000e-14
+9933 8085 2.57973066677049e-06
+9933 8109 7.84963079505847e-05
+9933 8133 4.91919438840013e-04
+9933 8157 1.17724328222056e-04
+9933 8661 5.23284682600000e-11
+9933 8685 4.96671538245732e-03
+9933 8709 1.09060475920188e-01
+9933 8733 2.70682180385715e-01
+9933 8757 8.59626371374441e-02
+9933 8781 5.24590795012676e-03
+9933 8805 7.46695746236253e-06
+9933 9261 6.03166389497417e-05
+9933 9285 9.81329879921933e-02
+9933 9309 2.15224436646047e+00
+9933 9333 5.23127818559847e+00
+9933 9357 2.25961989461756e+00
+9933 9381 1.06238221895661e-01
+9933 9405 2.62739118781426e-04
+9933 9861 6.20724038309029e-04
+9933 9885 2.67067283445575e-01
+9933 9909 5.50028633803776e+00
+9933 9957 5.42353049705157e+00
+9933 9981 3.12738875079131e-01
+9933 10005 1.66440736458122e-04
+9933 10437 4.40000000000000e-19
+9933 10461 1.44147466930786e-04
+9933 10485 1.32107227727702e-01
+9933 10509 2.28425795486042e+00
+9933 10533 5.58574866139347e+00
+9933 10557 2.31426725984315e+00
+9933 10581 1.12349617391642e-01
+9933 10605 1.09163930156516e-04
+9933 11061 9.75132400737256e-06
+9933 11085 4.53171246542379e-03
+9933 11109 1.04668459507660e-01
+9933 11133 3.25771669079225e-01
+9933 11157 1.30017308321321e-01
+9933 11181 3.14962360091577e-03
+9933 11205 1.82413221143832e-06
+9933 11685 2.46575223213170e-07
+9933 11709 1.93604114647195e-04
+9933 11733 2.31229553062058e-04
+9933 11757 1.53185448900642e-04
+9933 11781 1.78071334005424e-05
+9933 18888 -1.58029534922596e-06
+9933 18912 -1.94985337928628e-03
+9933 18936 -1.54562329970989e-02
+9933 18960 -3.37284796292220e-02
+9933 18984 -1.19319310724471e-02
+9933 19008 -1.06285179056373e-03
+9933 19272 -1.78107971630000e-10
+9933 19296 -5.56833331860732e-03
+9933 19320 -1.28438112447604e-01
+9933 19344 -6.40927707820481e-01
+9933 19368 -9.90842359719990e-01
+9933 19392 -3.78249300822858e-01
+9933 19416 -4.20474139306113e-02
+9933 19440 -4.27068489809019e-05
+9933 19680 -8.44638357170000e-10
+9933 19704 -3.57113108533596e-02
+9933 19728 -7.66829074925700e-01
+9933 19752 -3.64136977461606e+00
+9933 19776 -5.31142189658314e+00
+9933 19800 -2.10508368685634e+00
+9933 19824 -2.53257024583949e-01
+9933 19848 -1.17783345955638e-03
+9933 20088 -7.06933854300000e-10
+9933 20112 -6.10846835017329e-02
+9933 20136 -1.32965709172451e+00
+9933 20160 -6.23407982509980e+00
+9933 20184 -8.86448444529016e+00
+9933 20208 -3.64519484217998e+00
+9933 20232 -4.69701797998805e-01
+9933 20256 -4.35560139697704e-03
+9933 20496 -1.32206470670000e-10
+9933 20520 -2.01656095848385e-02
+9933 20544 -6.02940997111881e-01
+9933 20568 -2.98627124706647e+00
+9933 20592 -4.23415220768890e+00
+9933 20616 -1.69477015015132e+00
+9933 20640 -2.12494015931441e-01
+9933 20664 -2.14648723749305e-03
+9933 20928 -1.67656038496179e-03
+9933 20952 -8.66559427129932e-02
+9933 20976 -4.52565793524386e-01
+9933 21000 -6.31129289373421e-01
+9933 21024 -2.38646796391970e-01
+9933 21048 -2.79573555867766e-02
+9933 21072 -2.84870293465071e-04
+9933 21336 -1.54264278491790e-07
+9933 21360 -1.73381330431115e-03
+9933 21384 -8.89962435477900e-03
+9933 21408 -9.62297346308592e-03
+9933 21432 -2.05883233787835e-03
+9933 21456 -2.30368090416432e-05
+9934 9934 1.00000000000000e+00
+9935 9935 1.00000000000000e+00
+9936 9936 1.00000000000000e+00
+9937 9937 1.00000000000000e+00
+9938 9938 1.00000000000000e+00
+9939 9939 1.00000000000000e+00
+9940 9940 1.00000000000000e+00
+9941 9941 1.00000000000000e+00
+9942 9942 1.00000000000000e+00
+9943 9943 1.00000000000000e+00
+9944 9944 1.00000000000000e+00
+9945 9945 1.00000000000000e+00
+9946 9946 1.00000000000000e+00
+9947 9947 1.00000000000000e+00
+9948 9948 1.00000000000000e+00
+9949 9949 1.00000000000000e+00
+9950 9950 1.00000000000000e+00
+9951 9951 1.00000000000000e+00
+9952 9952 1.00000000000000e+00
+9953 9953 1.00000000000000e+00
+9954 9954 1.00000000000000e+00
+9955 9955 1.00000000000000e+00
+9956 9956 1.00000000000000e+00
+9957 9957 1.52368589982420e+01
+9957 8109 6.86885643072803e-06
+9957 8133 2.33697018029744e-04
+9957 8157 1.38422994045989e-04
+9957 8181 8.84933336397340e-05
+9957 8205 1.62962235055504e-06
+9957 8709 5.12001329153937e-03
+9957 8733 9.94207410797824e-02
+9957 8757 2.90694425790975e-01
+9957 8781 1.09787995396199e-01
+9957 8805 2.81609474262600e-03
+9957 8829 1.56403018457284e-05
+9957 9285 1.25135402336313e-04
+9957 9309 8.63918164591308e-02
+9957 9333 2.25780169589536e+00
+9957 9357 5.50681995523441e+00
+9957 9381 2.38740455251695e+00
+9957 9405 1.36104287771052e-01
+9957 9429 1.35092304002420e-04
+9957 9885 5.00161568839060e-04
+9957 9909 2.82601434453939e-01
+9957 9933 5.42353049705157e+00
+9957 9981 6.29112857326265e+00
+9957 10005 3.70222890871764e-01
+9957 10029 1.93413419972701e-04
+9957 10485 8.91005421407044e-05
+9957 10509 1.17330424634128e-01
+9957 10533 2.32069493927855e+00
+9957 10557 6.01317879021471e+00
+9957 10581 2.63300019074896e+00
+9957 10605 1.14640260342685e-01
+9957 10629 1.64562920078723e-04
+9957 11085 2.74962501930980e-06
+9957 11109 5.70101788762034e-03
+9957 11133 1.17467751532462e-01
+9957 11157 3.05741013405653e-01
+9957 11181 1.41458480609622e-01
+9957 11205 3.27777054418452e-03
+9957 11229 1.62635643746720e-07
+9957 11685 7.79578600000000e-14
+9957 11709 2.19087640160000e-10
+9957 11733 7.51344158719147e-05
+9957 11757 8.42968691652782e-04
+9957 11781 1.72881141110550e-04
+9957 11805 6.07076150326421e-06
+9957 18528 -2.60766096089586e-05
+9957 18552 -8.94813647991517e-04
+9957 18576 -3.43551708160337e-03
+9957 18600 -1.78015374464241e-03
+9957 18624 -2.47411633771683e-04
+9957 18912 -8.71566016129902e-04
+9957 18936 -3.61825963381648e-02
+9957 18960 -2.30669445532562e-01
+9957 18984 -4.57991835894882e-01
+9957 19008 -2.16006340598430e-01
+9957 19032 -2.92956316988243e-02
+9957 19056 -1.25824412478920e-05
+9957 19320 -1.07863231621524e-02
+9957 19344 -3.49928920340783e-01
+9957 19368 -2.02840327989389e+00
+9957 19392 -3.73729413925663e+00
+9957 19416 -1.86663739218361e+00
+9957 19440 -2.75908869197920e-01
+9957 19464 -1.83203537140746e-03
+9957 19728 -3.19984746935336e-02
+9957 19752 -9.67683053614502e-01
+9957 19776 -5.35935612814158e+00
+9957 19800 -9.44829471250622e+00
+9957 19824 -4.91376916156041e+00
+9957 19848 -7.67651190101397e-01
+9957 19872 -8.36244219545056e-03
+9957 20136 -1.50083400241692e-02
+9957 20160 -6.48829834041644e-01
+9957 20184 -3.78383013424043e+00
+9957 20208 -6.73991693558084e+00
+9957 20232 -3.40661737920486e+00
+9957 20256 -5.23272904718805e-01
+9957 20280 -6.67400920711639e-03
+9957 20544 -1.93303940305556e-03
+9957 20568 -1.34270192548723e-01
+9957 20592 -8.23602821426861e-01
+9957 20616 -1.48312847787425e+00
+9957 20640 -6.94820792058686e-01
+9957 20664 -9.94144917254053e-02
+9957 20688 -1.22365447471563e-03
+9957 20952 -1.59177904572117e-06
+9957 20976 -6.25604395553294e-03
+9957 21000 -4.19819363012449e-02
+9957 21024 -7.66304469585035e-02
+9957 21048 -2.67986772911742e-02
+9957 21072 -2.45483860613431e-03
+9957 21096 -1.54286544133730e-07
+9957 21384 -6.97276547140000e-10
+9957 21408 -3.40300235706000e-09
+9957 21432 -3.15286122116000e-09
+9957 21456 -6.13896168510000e-10
+9958 9958 1.00000000000000e+00
+9959 9959 1.00000000000000e+00
+9960 9960 1.00000000000000e+00
+9961 9961 1.00000000000000e+00
+9962 9962 1.00000000000000e+00
+9963 9963 1.00000000000000e+00
+9964 9964 1.00000000000000e+00
+9965 9965 1.00000000000000e+00
+9966 9966 1.00000000000000e+00
+9967 9967 1.00000000000000e+00
+9968 9968 1.00000000000000e+00
+9969 9969 1.00000000000000e+00
+9970 9970 1.00000000000000e+00
+9971 9971 1.00000000000000e+00
+9972 9972 1.00000000000000e+00
+9973 9973 1.00000000000000e+00
+9974 9974 1.00000000000000e+00
+9975 9975 1.00000000000000e+00
+9976 9976 1.00000000000000e+00
+9977 9977 1.00000000000000e+00
+9978 9978 1.00000000000000e+00
+9979 9979 1.00000000000000e+00
+9980 9980 1.00000000000000e+00
+9981 9981 1.69611461768892e+01
+9981 8133 2.33359908483914e-06
+9981 8157 1.80679317919328e-04
+9981 8181 6.00232747143563e-04
+9981 8205 1.86095276753446e-05
+9981 8229 5.57780449472130e-07
+9981 8709 3.05027687506100e-08
+9981 8733 4.38303943466947e-03
+9981 8757 1.18382376377731e-01
+9981 8781 2.82925116133224e-01
+9981 8805 1.37978003661638e-01
+9981 8829 4.47462327059546e-03
+9981 8853 7.77337397786230e-07
+9981 9309 1.76444125597532e-04
+9981 9333 9.21548851110135e-02
+9981 9357 2.39295414762304e+00
+9981 9381 6.44362061844830e+00
+9981 9405 2.38090503758767e+00
+9981 9429 1.05217503878586e-01
+9981 9453 6.46479002001124e-05
+9981 9909 2.74904578863921e-04
+9981 9933 3.12738875079131e-01
+9981 9957 6.29112857326265e+00
+9981 10005 5.30068757924900e+00
+9981 10029 2.68021749546518e-01
+9981 10053 1.13653088228283e-05
+9981 10509 9.68204573979326e-05
+9981 10533 1.22356735855193e-01
+9981 10557 2.61139860278906e+00
+9981 10581 6.38956406917364e+00
+9981 10605 2.47430333521985e+00
+9981 10629 6.68679335058815e-02
+9981 11109 6.81126937739491e-06
+9981 11133 3.35210990307824e-03
+9981 11157 1.35101238191692e-01
+9981 11181 2.84023234766724e-01
+9981 11205 1.15120413221381e-01
+9981 11229 8.29054817407590e-05
+9981 11733 3.03133255660094e-06
+9981 11757 4.77661153452616e-05
+9981 11781 3.73082498911604e-04
+9981 11805 1.48757014544792e-04
+9981 18168 -6.01422878122647e-06
+9981 18192 -2.73173367878583e-05
+9981 18216 -1.90559154330360e-05
+9981 18240 -3.26042166295239e-06
+9981 18528 -2.12273103108984e-05
+9981 18552 -6.31400259870912e-03
+9981 18576 -6.27299216796516e-02
+9981 18600 -1.67675406492190e-01
+9981 18624 -7.89606507668578e-02
+9981 18648 -1.03974540170889e-02
+9981 18936 -2.68360686543636e-03
+9981 18960 -1.43978339114226e-01
+9981 18984 -1.05198764373597e+00
+9981 19008 -2.31875979400018e+00
+9981 19032 -1.01464558466502e+00
+9981 19056 -1.55218139672086e-01
+9981 19344 -1.21795169504231e-02
+9981 19368 -6.12047630761578e-01
+9981 19392 -4.21473093150740e+00
+9981 19416 -8.83501779089221e+00
+9981 19440 -3.94528752716489e+00
+9981 19464 -6.68819689456890e-01
+9981 19752 -9.66017648426708e-03
+9981 19776 -6.58101042165486e-01
+9981 19800 -4.72026243498156e+00
+9981 19824 -1.02349311736182e+01
+9981 19848 -5.10178297208426e+00
+9981 19872 -9.47053835614473e-01
+9981 20160 -1.79342829018027e-03
+9981 20184 -1.94900128605116e-01
+9981 20208 -1.46587366422923e+00
+9981 20232 -3.24277390370992e+00
+9981 20256 -1.56020234216348e+00
+9981 20280 -2.77611194666462e-01
+9981 20568 -7.48228670978547e-06
+9981 20592 -1.62013567064914e-02
+9981 20616 -1.30904245935937e-01
+9981 20640 -2.94623651010250e-01
+9981 20664 -1.23074941957577e-01
+9981 20688 -1.84717084370413e-02
+9981 21000 -4.99741004108010e-05
+9981 21024 -3.42380297403756e-04
+9981 21048 -6.20042783016768e-04
+9981 21072 -1.43016294015585e-04
+9981 21096 -1.33099563758220e-07
+9982 9982 1.00000000000000e+00
+9983 9983 1.00000000000000e+00
+9984 9984 1.00000000000000e+00
+9985 9985 1.00000000000000e+00
+9986 9986 1.00000000000000e+00
+9987 9987 1.00000000000000e+00
+9988 9988 1.00000000000000e+00
+9989 9989 1.00000000000000e+00
+9990 9990 1.00000000000000e+00
+9991 9991 1.00000000000000e+00
+9992 9992 1.00000000000000e+00
+9993 9993 1.00000000000000e+00
+9994 9994 1.00000000000000e+00
+9995 9995 1.00000000000000e+00
+9996 9996 1.00000000000000e+00
+9997 9997 1.00000000000000e+00
+9998 9998 1.00000000000000e+00
+9999 9999 1.00000000000000e+00
+10000 10000 1.00000000000000e+00
+10001 10001 1.00000000000000e+00
+10002 10002 1.00000000000000e+00
+10003 10003 1.00000000000000e+00
+10004 10004 1.00000000000000e+00
+10005 10005 2.33744226411700e+01
+10005 8157 1.30211113888141e-05
+10005 8181 1.11714081298831e-04
+10005 8205 4.19351447657620e-04
+10005 8229 1.17729495477173e-04
+10005 8733 9.53315919924660e-07
+10005 8757 2.98338614606096e-03
+10005 8781 1.45180600441259e-01
+10005 8805 3.04211210513153e-01
+10005 8829 1.22248691713119e-01
+10005 8853 9.82793053106743e-03
+10005 9333 1.31358384121017e-04
+10005 9357 1.24157463156091e-01
+10005 9381 2.39184467225707e+00
+10005 9405 6.71549843465461e+00
+10005 9429 5.59124452074484e+00
+10005 9453 6.99586949078870e-02
+10005 9933 1.66440736458121e-04
+10005 9957 3.70222890871764e-01
+10005 9981 5.30068757924900e+00
+10005 10029 1.08522054118621e+01
+10005 10053 1.17535898769434e-02
+10005 10533 2.20082275981338e-04
+10005 10557 1.30468906119891e-01
+10005 10581 2.75103404825547e+00
+10005 10605 1.00664315766853e+01
+10005 10629 1.66127993386266e+00
+10005 11133 1.53658882619254e-05
+10005 11157 3.49349886848903e-03
+10005 11181 1.65911619907652e-01
+10005 11205 3.28881041915935e-01
+10005 11229 7.01132519780404e-04
+10005 11757 1.44369951344170e-07
+10005 11781 2.73574244309951e-04
+10005 11805 1.38667055159870e-04
+10005 18168 -3.69013968260162e-04
+10005 18192 -6.49201867337128e-03
+10005 18216 -3.65312941816127e-02
+10005 18240 -3.72128208243907e-02
+10005 18552 -5.47483143416006e-04
+10005 18576 -5.38648376009527e-02
+10005 18600 -3.92717788799691e-01
+10005 18624 -1.55811480797781e+00
+10005 18648 -1.71458500707119e+00
+10005 18960 -3.33212378989246e-03
+10005 18984 -3.41170327114193e-01
+10005 19008 -2.24353417678795e+00
+10005 19032 -8.15750338257097e+00
+10005 19056 -9.15748002497577e+00
+10005 19368 -5.13431393213643e-03
+10005 19392 -6.13134529254241e-01
+10005 19416 -3.72294246617871e+00
+10005 19440 -1.21491661808584e+01
+10005 19464 -1.36812044076590e+01
+10005 19776 -1.21445491145514e-03
+10005 19800 -2.74822116270485e-01
+10005 19824 -1.87862984396716e+00
+10005 19848 -5.86735061115209e+00
+10005 19872 -5.61186521115555e+00
+10005 20184 -1.80659238066762e-05
+10005 20208 -3.78886813069660e-02
+10005 20232 -2.94052989407060e-01
+10005 20256 -9.00513750001273e-01
+10005 20280 -7.26009893524992e-01
+10005 20616 -5.31919679444254e-04
+10005 20640 -4.50836102338898e-03
+10005 20664 -1.38478634824622e-02
+10005 20688 -9.96711146675204e-03
+10006 10006 1.00000000000000e+00
+10007 10007 1.00000000000000e+00
+10008 10008 1.00000000000000e+00
+10009 10009 1.00000000000000e+00
+10010 10010 1.00000000000000e+00
+10011 10011 1.00000000000000e+00
+10012 10012 1.00000000000000e+00
+10013 10013 1.00000000000000e+00
+10014 10014 1.00000000000000e+00
+10015 10015 1.00000000000000e+00
+10016 10016 1.00000000000000e+00
+10017 10017 1.00000000000000e+00
+10018 10018 1.00000000000000e+00
+10019 10019 1.00000000000000e+00
+10020 10020 1.00000000000000e+00
+10021 10021 1.00000000000000e+00
+10022 10022 1.00000000000000e+00
+10023 10023 1.00000000000000e+00
+10024 10024 1.00000000000000e+00
+10025 10025 1.00000000000000e+00
+10026 10026 1.00000000000000e+00
+10027 10027 1.00000000000000e+00
+10028 10028 1.00000000000000e+00
+10029 10029 1.12846611172944e+01
+10029 7605 5.38430000000000e-16
+10029 7629 1.43269000000000e-15
+10029 8181 8.25552108883452e-06
+10029 8205 2.11681717864973e-04
+10029 8229 1.57546452617899e-04
+10029 8253 1.26615946688093e-06
+10029 8277 1.51028246000000e-11
+10029 8757 2.76280475736869e-06
+10029 8781 2.91387883519293e-03
+10029 8805 1.07149062964959e-01
+10029 8829 3.62451739099552e-01
+10029 8853 6.52643325329213e-02
+10029 8877 4.36402672700000e-11
+10029 9357 6.65602558937124e-05
+10029 9381 9.43923886567093e-02
+10029 9405 3.98787308235858e+00
+10029 9429 8.41036131317700e+00
+10029 9453 2.51332964486056e-01
+10029 9957 1.93413419972701e-04
+10029 9981 2.68021749546518e-01
+10029 10005 1.08522054118621e+01
+10029 10053 2.27218828907758e-02
+10029 10557 3.05165715246775e-04
+10029 10581 1.54296983896813e-01
+10029 10605 2.82246097617276e+00
+10029 10629 7.68476838705032e-01
+10029 11157 1.43358216180985e-06
+10029 11181 9.74515294596646e-03
+10029 11205 3.01114647711880e-02
+10029 11229 7.80904127106635e-05
+10029 11757 2.76977475000000e-12
+10029 11781 1.07430315361200e-08
+10029 11805 5.75738267860000e-09
+10029 17784 -7.29284455996000e-09
+10029 17808 -4.28709318978561e-06
+10029 17832 -8.52313646765147e-06
+10029 18168 -5.18385731630746e-05
+10029 18192 -8.98842633280545e-03
+10029 18216 -1.51606456257916e-01
+10029 18240 -2.41641731088433e-01
+10029 18576 -6.79448506998601e-04
+10029 18600 -1.03095708974913e-01
+10029 18624 -2.02506210321664e+00
+10029 18648 -3.34611990479085e+00
+10029 18984 -1.97260203679888e-03
+10029 19008 -3.02145747279519e-01
+10029 19032 -6.55683928723492e+00
+10029 19056 -1.10499459964699e+01
+10029 19392 -6.01640639348692e-04
+10029 19416 -1.67023864717951e-01
+10029 19440 -4.37787045752165e+00
+10029 19464 -7.60221651864070e+00
+10029 19800 -3.23866062505972e-05
+10029 19824 -3.06935392903594e-02
+10029 19848 -8.79965056906134e-01
+10029 19872 -1.54591739054227e+00
+10029 20232 -1.52616840616765e-03
+10029 20256 -3.73800305753866e-02
+10029 20280 -6.40768823075997e-02
+10029 20640 -2.15379764853000e-09
+10029 20664 -1.80427590875900e-07
+10029 20688 -3.45778598212060e-07
+10030 10030 1.00000000000000e+00
+10031 10031 1.00000000000000e+00
+10032 10032 1.00000000000000e+00
+10033 10033 1.00000000000000e+00
+10034 10034 1.00000000000000e+00
+10035 10035 1.00000000000000e+00
+10036 10036 1.00000000000000e+00
+10037 10037 1.00000000000000e+00
+10038 10038 1.00000000000000e+00
+10039 10039 1.00000000000000e+00
+10040 10040 1.00000000000000e+00
+10041 10041 1.00000000000000e+00
+10042 10042 1.00000000000000e+00
+10043 10043 1.00000000000000e+00
+10044 10044 1.00000000000000e+00
+10045 10045 1.00000000000000e+00
+10046 10046 1.00000000000000e+00
+10047 10047 1.00000000000000e+00
+10048 10048 1.00000000000000e+00
+10049 10049 1.00000000000000e+00
+10050 10050 1.00000000000000e+00
+10051 10051 1.00000000000000e+00
+10052 10052 1.00000000000000e+00
+10053 10053 1.00019295784113e+00
+10053 7605 1.82940000000000e-16
+10053 7629 4.86770000000000e-16
+10053 8205 9.84462529829350e-07
+10053 8229 1.24828921303145e-06
+10053 8253 4.57242407563120e-07
+10053 8277 5.45496585000000e-12
+10053 8781 1.23556813447244e-06
+10053 8805 6.51068255958206e-04
+10053 8829 9.08688838913288e-03
+10053 8853 2.08212736614839e-03
+10053 8877 1.57623610900000e-11
+10053 9381 2.18137199729480e-05
+10053 9405 1.04734868936986e-02
+10053 9429 5.92060211873684e-02
+10053 9453 5.96412141363918e-03
+10053 9981 1.13653088228283e-05
+10053 10005 1.17535898769434e-02
+10053 10029 2.27218828907758e-02
+10053 10581 1.02677524531000e-09
+10053 10605 1.81867178720739e-04
+10053 10629 1.74906230975332e-04
+10053 17784 -2.47779430879000e-09
+10053 17808 -1.54782487178360e-06
+10053 17832 -3.07830518340567e-06
+10053 18192 -5.18975087942558e-05
+10053 18216 -4.00184406382047e-03
+10053 18240 -7.64040556608115e-03
+10053 18600 -2.27316425110596e-04
+10053 18624 -1.89372668443837e-02
+10053 18648 -3.62833187129931e-02
+10053 19008 -1.30941825009838e-04
+10053 19032 -1.58080846130475e-02
+10053 19056 -3.06995764510260e-02
+10053 19416 -1.97635568482043e-05
+10053 19440 -2.95310796217853e-03
+10053 19464 -5.76787102641962e-03
+10054 10054 1.00000000000000e+00
+10055 10055 1.00000000000000e+00
+10056 10056 1.00000000000000e+00
+10057 10057 1.00000000000000e+00
+10058 10058 1.00000000000000e+00
+10059 10059 1.00000000000000e+00
+10060 10060 1.00000000000000e+00
+10061 10061 1.00000000000000e+00
+10062 10062 1.00000000000000e+00
+10063 10063 1.00000000000000e+00
+10064 10064 1.00000000000000e+00
+10065 10065 1.00000000000000e+00
+10066 10066 1.00000000000000e+00
+10067 10067 1.00000000000000e+00
+10068 10068 1.00000000000000e+00
+10069 10069 1.00000000000000e+00
+10070 10070 1.00000000000000e+00
+10071 10071 1.00000000000000e+00
+10072 10072 1.00000000000000e+00
+10073 10073 1.00000000000000e+00
+10074 10074 1.00000000000000e+00
+10075 10075 1.00000000000000e+00
+10076 10076 1.00000000000000e+00
+10077 10077 1.00000000000000e+00
+10078 10078 1.00000000000000e+00
+10079 10079 1.00000000000000e+00
+10080 10080 1.00000000000000e+00
+10081 10081 1.00000000000000e+00
+10082 10082 1.00000000000000e+00
+10083 10083 1.00000000000000e+00
+10084 10084 1.00000000000000e+00
+10085 10085 1.00000000000000e+00
+10086 10086 1.00000000000000e+00
+10087 10087 1.00000000000000e+00
+10088 10088 1.00000000000000e+00
+10089 10089 1.00000000000000e+00
+10090 10090 1.00000000000000e+00
+10091 10091 1.00000000000000e+00
+10092 10092 1.00000000000000e+00
+10093 10093 1.00000000000000e+00
+10094 10094 1.00000000000000e+00
+10095 10095 1.00000000000000e+00
+10096 10096 1.00000000000000e+00
+10097 10097 1.00000000000000e+00
+10098 10098 1.00000000000000e+00
+10099 10099 1.00000000000000e+00
+10100 10100 1.00000000000000e+00
+10101 10101 1.00000000000000e+00
+10102 10102 1.00000000000000e+00
+10103 10103 1.00000000000000e+00
+10104 10104 1.00000000000000e+00
+10105 10105 1.00000000000000e+00
+10106 10106 1.00000000000000e+00
+10107 10107 1.00000000000000e+00
+10108 10108 1.00000000000000e+00
+10109 10109 1.00000000000000e+00
+10110 10110 1.00000000000000e+00
+10111 10111 1.00000000000000e+00
+10112 10112 1.00000000000000e+00
+10113 10113 1.00000000000000e+00
+10114 10114 1.00000000000000e+00
+10115 10115 1.00000000000000e+00
+10116 10116 1.00000000000000e+00
+10117 10117 1.00000000000000e+00
+10118 10118 1.00000000000000e+00
+10119 10119 1.00000000000000e+00
+10120 10120 1.00000000000000e+00
+10121 10121 1.00000000000000e+00
+10122 10122 1.00000000000000e+00
+10123 10123 1.00000000000000e+00
+10124 10124 1.00000000000000e+00
+10125 10125 1.00000000000000e+00
+10126 10126 1.00000000000000e+00
+10127 10127 1.00000000000000e+00
+10128 10128 1.00000000000000e+00
+10129 10129 1.00000000000000e+00
+10130 10130 1.00000000000000e+00
+10131 10131 1.00000000000000e+00
+10132 10132 1.00000000000000e+00
+10133 10133 1.00000000000000e+00
+10134 10134 1.00000000000000e+00
+10135 10135 1.00000000000000e+00
+10136 10136 1.00000000000000e+00
+10137 10137 1.00000000000000e+00
+10138 10138 1.00000000000000e+00
+10139 10139 1.00000000000000e+00
+10140 10140 1.00000000000000e+00
+10141 10141 1.00000000000000e+00
+10142 10142 1.00000000000000e+00
+10143 10143 1.00000000000000e+00
+10144 10144 1.00000000000000e+00
+10145 10145 1.00000000000000e+00
+10146 10146 1.00000000000000e+00
+10147 10147 1.00000000000000e+00
+10148 10148 1.00000000000000e+00
+10149 10149 1.00000000000000e+00
+10150 10150 1.00000000000000e+00
+10151 10151 1.00000000000000e+00
+10152 10152 1.00000000000000e+00
+10153 10153 1.00000000000000e+00
+10154 10154 1.00000000000000e+00
+10155 10155 1.00000000000000e+00
+10156 10156 1.00000000000000e+00
+10157 10157 1.00000000000000e+00
+10158 10158 1.00000000000000e+00
+10159 10159 1.00000000000000e+00
+10160 10160 1.00000000000000e+00
+10161 10161 1.00000000000000e+00
+10162 10162 1.00000000000000e+00
+10163 10163 1.00000000000000e+00
+10164 10164 1.00000000000000e+00
+10165 10165 1.00000000000000e+00
+10166 10166 1.00000000000000e+00
+10167 10167 1.00000000000000e+00
+10168 10168 1.00000000000000e+00
+10169 10169 1.00000000000000e+00
+10170 10170 1.00000000000000e+00
+10171 10171 1.00000000000000e+00
+10172 10172 1.00000000000000e+00
+10173 10173 1.00000000000000e+00
+10174 10174 1.00000000000000e+00
+10175 10175 1.00000000000000e+00
+10176 10176 1.00000000000000e+00
+10177 10177 1.00000000000000e+00
+10178 10178 1.00000000000000e+00
+10179 10179 1.00000000000000e+00
+10180 10180 1.00000000000000e+00
+10181 10181 1.00000000000000e+00
+10182 10182 1.00000000000000e+00
+10183 10183 1.00000000000000e+00
+10184 10184 1.00000000000000e+00
+10185 10185 1.00000000000000e+00
+10186 10186 1.00000000000000e+00
+10187 10187 1.00000000000000e+00
+10188 10188 1.00000000000000e+00
+10189 10189 1.00000000000000e+00
+10190 10190 1.00000000000000e+00
+10191 10191 1.00000000000000e+00
+10192 10192 1.00000000000000e+00
+10193 10193 1.00000000000000e+00
+10194 10194 1.00000000000000e+00
+10195 10195 1.00000000000000e+00
+10196 10196 1.00000000000000e+00
+10197 10197 1.00000000000000e+00
+10198 10198 1.00000000000000e+00
+10199 10199 1.00000000000000e+00
+10200 10200 1.00000000000000e+00
+10201 10201 1.00000000000000e+00
+10202 10202 1.00000000000000e+00
+10203 10203 1.00000000000000e+00
+10204 10204 1.00000000000000e+00
+10205 10205 1.00000000000000e+00
+10206 10206 1.00000000000000e+00
+10207 10207 1.00000000000000e+00
+10208 10208 1.00000000000000e+00
+10209 10209 1.00000000000000e+00
+10210 10210 1.00000000000000e+00
+10211 10211 1.00000000000000e+00
+10212 10212 1.00000000000000e+00
+10213 10213 1.00000000000000e+00
+10214 10214 1.00000000000000e+00
+10215 10215 1.00000000000000e+00
+10216 10216 1.00000000000000e+00
+10217 10217 1.00000000000000e+00
+10218 10218 1.00000000000000e+00
+10219 10219 1.00000000000000e+00
+10220 10220 1.00000000000000e+00
+10221 10221 1.00000000000000e+00
+10222 10222 1.00000000000000e+00
+10223 10223 1.00000000000000e+00
+10224 10224 1.00000000000000e+00
+10225 10225 1.00000000000000e+00
+10226 10226 1.00000000000000e+00
+10227 10227 1.00000000000000e+00
+10228 10228 1.00000000000000e+00
+10229 10229 1.00000000000000e+00
+10230 10230 1.00000000000000e+00
+10231 10231 1.00000000000000e+00
+10232 10232 1.00000000000000e+00
+10233 10233 1.00000000000000e+00
+10234 10234 1.00000000000000e+00
+10235 10235 1.00000000000000e+00
+10236 10236 1.00000000000000e+00
+10237 10237 1.00000000000000e+00
+10238 10238 1.00000000000000e+00
+10239 10239 1.00000000000000e+00
+10240 10240 1.00000000000000e+00
+10241 10241 1.00000000000000e+00
+10242 10242 1.00000000000000e+00
+10243 10243 1.00000000000000e+00
+10244 10244 1.00000000000000e+00
+10245 10245 1.00000000000000e+00
+10246 10246 1.00000000000000e+00
+10247 10247 1.00000000000000e+00
+10248 10248 1.00000000000000e+00
+10249 10249 1.00000000000000e+00
+10250 10250 1.00000000000000e+00
+10251 10251 1.00000000000000e+00
+10252 10252 1.00000000000000e+00
+10253 10253 1.00000000000000e+00
+10254 10254 1.00000000000000e+00
+10255 10255 1.00000000000000e+00
+10256 10256 1.00000000000000e+00
+10257 10257 1.00000000000000e+00
+10258 10258 1.00000000000000e+00
+10259 10259 1.00000000000000e+00
+10260 10260 1.00000000000000e+00
+10261 10261 1.00000000000000e+00
+10262 10262 1.00000000000000e+00
+10263 10263 1.00000000000000e+00
+10264 10264 1.00000000000000e+00
+10265 10265 1.00000000000000e+00
+10266 10266 1.00000000000000e+00
+10267 10267 1.00000000000000e+00
+10268 10268 1.00000000000000e+00
+10269 10269 1.00000000000000e+00
+10270 10270 1.00000000000000e+00
+10271 10271 1.00000000000000e+00
+10272 10272 1.00000000000000e+00
+10273 10273 1.00000000000000e+00
+10274 10274 1.00000000000000e+00
+10275 10275 1.00000000000000e+00
+10276 10276 1.00000000000000e+00
+10277 10277 1.00000000000000e+00
+10278 10278 1.00000000000000e+00
+10279 10279 1.00000000000000e+00
+10280 10280 1.00000000000000e+00
+10281 10281 1.00000000000000e+00
+10282 10282 1.00000000000000e+00
+10283 10283 1.00000000000000e+00
+10284 10284 1.00000000000000e+00
+10285 10285 1.00000000000000e+00
+10286 10286 1.00000000000000e+00
+10287 10287 1.00000000000000e+00
+10288 10288 1.00000000000000e+00
+10289 10289 1.00000000000000e+00
+10290 10290 1.00000000000000e+00
+10291 10291 1.00000000000000e+00
+10292 10292 1.00000000000000e+00
+10293 10293 1.00000000000000e+00
+10294 10294 1.00000000000000e+00
+10295 10295 1.00000000000000e+00
+10296 10296 1.00000000000000e+00
+10297 10297 1.00000000000000e+00
+10298 10298 1.00000000000000e+00
+10299 10299 1.00000000000000e+00
+10300 10300 1.00000000000000e+00
+10301 10301 1.00000000000000e+00
+10302 10302 1.00000000000000e+00
+10303 10303 1.00000000000000e+00
+10304 10304 1.00000000000000e+00
+10305 10305 1.00000000000000e+00
+10306 10306 1.00000000000000e+00
+10307 10307 1.00000000000000e+00
+10308 10308 1.00000000000000e+00
+10309 10309 1.00000000000000e+00
+10310 10310 1.00000000000000e+00
+10311 10311 1.00000000000000e+00
+10312 10312 1.00000000000000e+00
+10313 10313 1.00000000000000e+00
+10314 10314 1.00000000000000e+00
+10315 10315 1.00000000000000e+00
+10316 10316 1.00000000000000e+00
+10317 10317 1.00000000000000e+00
+10318 10318 1.00000000000000e+00
+10319 10319 1.00000000000000e+00
+10320 10320 1.00000000000000e+00
+10321 10321 1.00000000000000e+00
+10322 10322 1.00000000000000e+00
+10323 10323 1.00000000000000e+00
+10324 10324 1.00000000000000e+00
+10325 10325 1.00000000000000e+00
+10326 10326 1.00000000000000e+00
+10327 10327 1.00000000000000e+00
+10328 10328 1.00000000000000e+00
+10329 10329 1.00000000000000e+00
+10330 10330 1.00000000000000e+00
+10331 10331 1.00000000000000e+00
+10332 10332 1.00000000000000e+00
+10333 10333 1.00000000000000e+00
+10334 10334 1.00000000000000e+00
+10335 10335 1.00000000000000e+00
+10336 10336 1.00000000000000e+00
+10337 10337 1.00000000000000e+00
+10338 10338 1.00000000000000e+00
+10339 10339 1.00000000000000e+00
+10340 10340 1.00000000000000e+00
+10341 10341 1.00000000000000e+00
+10342 10342 1.00000000000000e+00
+10343 10343 1.00000000000000e+00
+10344 10344 1.00000000000000e+00
+10345 10345 1.00000000000000e+00
+10346 10346 1.00000000000000e+00
+10347 10347 1.00000000000000e+00
+10348 10348 1.00000000000000e+00
+10349 10349 1.00000000000000e+00
+10350 10350 1.00000000000000e+00
+10351 10351 1.00000000000000e+00
+10352 10352 1.00000000000000e+00
+10353 10353 1.00000000000000e+00
+10354 10354 1.00000000000000e+00
+10355 10355 1.00000000000000e+00
+10356 10356 1.00000000000000e+00
+10357 10357 1.00000000000000e+00
+10358 10358 1.00000000000000e+00
+10359 10359 1.00000000000000e+00
+10360 10360 1.00000000000000e+00
+10361 10361 1.00000000000000e+00
+10362 10362 1.00000000000000e+00
+10363 10363 1.00000000000000e+00
+10364 10364 1.00000000000000e+00
+10365 10365 1.00000068632295e+00
+10365 8541 1.31921271842000e-09
+10365 8565 8.97612361523960e-07
+10365 8589 8.78103357304630e-07
+10365 8613 1.62635643746720e-07
+10365 8637 1.65361740000000e-13
+10365 9141 5.22093285751330e-06
+10365 9165 5.01825510064360e-04
+10365 9189 8.16320942124758e-04
+10365 9213 8.29054817407601e-05
+10365 9237 5.61618000186800e-08
+10365 9261 2.69600000000000e-17
+10365 9741 2.80088098136387e-06
+10365 9765 6.42960599027289e-04
+10365 9789 3.30908086177552e-03
+10365 9813 7.01132519780417e-04
+10365 9837 3.75230044358600e-08
+10365 9861 3.96000000000000e-17
+10365 10389 1.54671107146396e-04
+10365 10413 7.80904127106650e-05
+10365 10437 5.88890614340000e-09
+10365 20784 -2.00903761667800e-07
+10365 20808 -2.54630692488362e-06
+10365 20832 -7.17169031686482e-06
+10365 20856 -1.74276804760179e-06
+10365 20880 -1.90423473400000e-11
+10365 21192 -8.45132164331575e-05
+10365 21216 -6.07278449815382e-04
+10365 21240 -1.16143813803571e-03
+10365 21264 -2.69315925168939e-04
+10365 21288 -2.25852715468000e-08
+10365 21600 -1.67620106534640e-04
+10365 21624 -1.19673275115658e-03
+10365 21648 -2.27267444385346e-03
+10365 21672 -5.26432474004665e-04
+10365 21696 -4.50372466621900e-08
+10366 10366 1.00000000000000e+00
+10367 10367 1.00000000000000e+00
+10368 10368 1.00000000000000e+00
+10369 10369 1.00000000000000e+00
+10370 10370 1.00000000000000e+00
+10371 10371 1.00000000000000e+00
+10372 10372 1.00000000000000e+00
+10373 10373 1.00000000000000e+00
+10374 10374 1.00000000000000e+00
+10375 10375 1.00000000000000e+00
+10376 10376 1.00000000000000e+00
+10377 10377 1.00000000000000e+00
+10378 10378 1.00000000000000e+00
+10379 10379 1.00000000000000e+00
+10380 10380 1.00000000000000e+00
+10381 10381 1.00000000000000e+00
+10382 10382 1.00000000000000e+00
+10383 10383 1.00000000000000e+00
+10384 10384 1.00000000000000e+00
+10385 10385 1.00000000000000e+00
+10386 10386 1.00000000000000e+00
+10387 10387 1.00000000000000e+00
+10388 10388 1.00000000000000e+00
+10389 10389 1.21320765838514e+00
+10389 8541 1.26524962030200e-08
+10389 8565 1.11277923894422e-05
+10389 8589 3.80183219577225e-04
+10389 8613 1.64562920078719e-04
+10389 8637 4.13226415410000e-10
+10389 9141 4.99765527714214e-05
+10389 9165 2.29883960010649e-02
+10389 9189 1.62292688555024e-01
+10389 9213 6.68679335058813e-02
+10389 9237 3.56458842680593e-03
+10389 9261 4.55670212600412e-06
+10389 9741 2.68083483975985e-05
+10389 9765 6.30109354465536e-02
+10389 9789 1.31811892162331e+00
+10389 9813 1.66127993386265e+00
+10389 9837 9.52927344201623e-02
+10389 9861 1.96678742491976e-04
+10389 10365 1.54671107146396e-04
+10389 10413 7.68476838705028e-01
+10389 10437 1.07199625704489e-01
+10389 10461 2.15051154370618e-04
+10389 11013 1.74906230975337e-04
+10389 11037 6.84807729967551e-04
+10389 11061 2.65320809328760e-07
+10389 20784 -2.69616545916967e-06
+10389 20808 -1.90946386181226e-03
+10389 20832 -1.07855649151752e-02
+10389 20856 -1.48604071463110e-02
+10389 20880 -4.02463253813658e-03
+10389 20904 -2.09120147080729e-04
+10389 21192 -8.11888108207384e-04
+10389 21216 -7.27606402896131e-02
+10389 21240 -4.56253711353306e-01
+10389 21264 -7.91085148021612e-01
+10389 21288 -2.25446163389854e-01
+10389 21312 -1.20141728929727e-02
+10389 21600 -1.60490305820058e-03
+10389 21624 -1.32155033546540e-01
+10389 21648 -8.37008468300407e-01
+10389 21672 -1.47814744601904e+00
+10389 21696 -4.22719899012753e-01
+10389 21720 -2.25645047563803e-02
+10390 10390 1.00000000000000e+00
+10391 10391 1.00000000000000e+00
+10392 10392 1.00000000000000e+00
+10393 10393 1.00000000000000e+00
+10394 10394 1.00000000000000e+00
+10395 10395 1.00000000000000e+00
+10396 10396 1.00000000000000e+00
+10397 10397 1.00000000000000e+00
+10398 10398 1.00000000000000e+00
+10399 10399 1.00000000000000e+00
+10400 10400 1.00000000000000e+00
+10401 10401 1.00000000000000e+00
+10402 10402 1.00000000000000e+00
+10403 10403 1.00000000000000e+00
+10404 10404 1.00000000000000e+00
+10405 10405 1.00000000000000e+00
+10406 10406 1.00000000000000e+00
+10407 10407 1.00000000000000e+00
+10408 10408 1.00000000000000e+00
+10409 10409 1.00000000000000e+00
+10410 10410 1.00000000000000e+00
+10411 10411 1.00000000000000e+00
+10412 10412 1.00000000000000e+00
+10413 10413 1.12846611172946e+01
+10413 8541 2.76977475000000e-12
+10413 8565 1.43358216180982e-06
+10413 8589 3.05165715246769e-04
+10413 8613 1.93413419972700e-04
+10413 8637 6.65602558937122e-05
+10413 8661 2.76280475736859e-06
+10413 9141 1.07430315361200e-08
+10413 9165 9.74515294596662e-03
+10413 9189 1.54296983896813e-01
+10413 9213 2.68021749546517e-01
+10413 9237 9.43923886567089e-02
+10413 9261 2.91387883519288e-03
+10413 9285 8.25552108883444e-06
+10413 9741 5.75738267860000e-09
+10413 9765 3.01114647711885e-02
+10413 9789 2.82246097617274e+00
+10413 9813 1.08522054118622e+01
+10413 9837 3.98787308235866e+00
+10413 9861 1.07149062964961e-01
+10413 9885 2.11681717864977e-04
+10413 9909 5.38430000000000e-16
+10413 10365 7.80904127106650e-05
+10413 10389 7.68476838705028e-01
+10413 10437 8.41036131317721e+00
+10413 10461 3.62451739099559e-01
+10413 10485 1.57546452617902e-04
+10413 10509 1.43269000000000e-15
+10413 11013 2.27218828907764e-02
+10413 11037 2.51332964486061e-01
+10413 11061 6.52643325329225e-02
+10413 11085 1.26615946688091e-06
+10413 11661 4.36402672700000e-11
+10413 11685 1.51028246000000e-11
+10413 20424 -3.23866062505992e-05
+10413 20448 -6.01640639348681e-04
+10413 20472 -1.97260203679881e-03
+10413 20496 -6.79448506998580e-04
+10413 20520 -5.18385731630741e-05
+10413 20784 -2.15379764853000e-09
+10413 20808 -1.52616840616761e-03
+10413 20832 -3.06935392903593e-02
+10413 20856 -1.67023864717951e-01
+10413 20880 -3.02145747279519e-01
+10413 20904 -1.03095708974914e-01
+10413 20928 -8.98842633280566e-03
+10413 20952 -7.29284455996000e-09
+10413 21192 -1.80427590875920e-07
+10413 21216 -3.73800305753871e-02
+10413 21240 -8.79965056906130e-01
+10413 21264 -4.37787045752166e+00
+10413 21288 -6.55683928723505e+00
+10413 21312 -2.02506210321669e+00
+10413 21336 -1.51606456257919e-01
+10413 21360 -4.28709318978553e-06
+10413 21600 -3.45778598212090e-07
+10413 21624 -6.40768823076009e-02
+10413 21648 -1.54591739054227e+00
+10413 21672 -7.60221651864072e+00
+10413 21696 -1.10499459964702e+01
+10413 21720 -3.34611990479093e+00
+10413 21744 -2.41641731088438e-01
+10413 21768 -8.52313646765131e-06
+10414 10414 1.00000000000000e+00
+10415 10415 1.00000000000000e+00
+10416 10416 1.00000000000000e+00
+10417 10417 1.00000000000000e+00
+10418 10418 1.00000000000000e+00
+10419 10419 1.00000000000000e+00
+10420 10420 1.00000000000000e+00
+10421 10421 1.00000000000000e+00
+10422 10422 1.00000000000000e+00
+10423 10423 1.00000000000000e+00
+10424 10424 1.00000000000000e+00
+10425 10425 1.00000000000000e+00
+10426 10426 1.00000000000000e+00
+10427 10427 1.00000000000000e+00
+10428 10428 1.00000000000000e+00
+10429 10429 1.00000000000000e+00
+10430 10430 1.00000000000000e+00
+10431 10431 1.00000000000000e+00
+10432 10432 1.00000000000000e+00
+10433 10433 1.00000000000000e+00
+10434 10434 1.00000000000000e+00
+10435 10435 1.00000000000000e+00
+10436 10436 1.00000000000000e+00
+10437 10437 2.50014043927921e+01
+10437 8589 1.31669194616133e-06
+10437 8613 1.35092304002420e-04
+10437 8637 7.57288505340460e-04
+10437 8661 4.63231239090577e-05
+10437 8685 8.53127317558100e-08
+10437 8709 5.21894530000000e-13
+10437 9189 6.97895973065628e-03
+10437 9213 1.05217503878585e-01
+10437 9237 2.76348776783459e-01
+10437 9261 1.34764034047412e-01
+10437 9285 6.21683783583451e-03
+10437 9309 1.01551698587122e-06
+10437 9765 4.05234314351900e-08
+10437 9789 2.26802376575187e-01
+10437 9813 5.59124452074495e+00
+10437 9837 7.59651806450879e+00
+10437 9861 2.18313486092399e+00
+10437 9885 1.05567678610667e-01
+10437 9909 2.51116470786627e-04
+10437 9933 4.40000000000000e-19
+10437 10365 5.88890614340000e-09
+10437 10389 1.07199625704489e-01
+10437 10413 8.41036131317721e+00
+10437 10461 9.74156077354739e+00
+10437 10485 3.65589698849351e-01
+10437 10509 2.83309791446212e-04
+10437 10533 3.80000000000000e-19
+10437 11013 5.92060211873697e-02
+10437 11037 3.00812933496058e+00
+10437 11061 4.59301705652270e+00
+10437 11085 2.69689879613938e-01
+10437 11109 2.02409678011774e-04
+10437 11661 9.81314367921176e-04
+10437 11685 2.12411346181353e-03
+10437 11709 1.18392864123266e-06
+10437 20064 -5.41995950758390e-07
+10437 20088 -2.39915213309620e-06
+10437 20112 -1.46666927100900e-06
+10437 20136 -2.31168330062650e-07
+10437 20424 -4.66156117326021e-05
+10437 20448 -8.17707393505363e-03
+10437 20472 -6.14995665721259e-02
+10437 20496 -1.31335544505489e-01
+10437 20520 -5.10221569510314e-02
+10437 20544 -5.38291298606264e-03
+10437 20568 -7.46393400000000e-14
+10437 20832 -4.21211943045402e-03
+10437 20856 -1.70527780808149e-01
+10437 20880 -9.67865603429284e-01
+10437 20904 -1.62177710123625e+00
+10437 20928 -6.38758052884564e-01
+10437 20952 -7.39964518854176e-02
+10437 20976 -4.10935087373672e-04
+10437 21240 -5.65856354692916e-02
+10437 21264 -1.73985483446230e+00
+10437 21288 -8.15239410774474e+00
+10437 21312 -1.05430018435055e+01
+10437 21336 -5.50103384768736e+00
+10437 21360 -9.00313035298769e-01
+10437 21384 -9.46517302950805e-03
+10437 21648 -8.48984408304527e-02
+10437 21672 -2.49861912557894e+00
+10437 21696 -1.11286651487525e+01
+10437 21720 -1.31480554177430e+01
+10437 21744 -7.85719513899028e+00
+10437 21768 -1.42258422170923e+00
+10437 21792 -1.60538004493410e-02
+10438 10438 1.00000000000000e+00
+10439 10439 1.00000000000000e+00
+10440 10440 1.00000000000000e+00
+10441 10441 1.00000000000000e+00
+10442 10442 1.00000000000000e+00
+10443 10443 1.00000000000000e+00
+10444 10444 1.00000000000000e+00
+10445 10445 1.00000000000000e+00
+10446 10446 1.00000000000000e+00
+10447 10447 1.00000000000000e+00
+10448 10448 1.00000000000000e+00
+10449 10449 1.00000000000000e+00
+10450 10450 1.00000000000000e+00
+10451 10451 1.00000000000000e+00
+10452 10452 1.00000000000000e+00
+10453 10453 1.00000000000000e+00
+10454 10454 1.00000000000000e+00
+10455 10455 1.00000000000000e+00
+10456 10456 1.00000000000000e+00
+10457 10457 1.00000000000000e+00
+10458 10458 1.00000000000000e+00
+10459 10459 1.00000000000000e+00
+10460 10460 1.00000000000000e+00
+10461 10461 2.08251633581964e+01
+10461 8613 1.56403018457278e-05
+10461 8637 1.65828879302887e-04
+10461 8661 3.16858225254104e-04
+10461 8685 1.28308173330616e-04
+10461 8709 7.04711743687000e-09
+10461 9189 8.30405258521000e-09
+10461 9213 4.47462327059536e-03
+10461 9237 1.41675838469124e-01
+10461 9261 3.57259474892104e-01
+10461 9285 1.03318965213880e-01
+10461 9309 4.30756462080175e-03
+10461 9333 1.29078208718039e-05
+10461 9789 2.50863875796693e-04
+10461 9813 1.22248691713121e-01
+10461 9837 2.30610993286482e+00
+10461 9861 5.48682765881358e+00
+10461 9885 2.54478197047033e+00
+10461 9909 1.41882974823343e-01
+10461 9933 1.44147466930786e-04
+10461 10389 2.15051154370618e-04
+10461 10413 3.62451739099559e-01
+10461 10437 9.74156077354739e+00
+10461 10485 5.95013494598476e+00
+10461 10509 3.38445502301254e-01
+10461 10533 3.89714704487484e-04
+10461 11013 9.08688838913305e-03
+10461 11037 2.93990643686119e+00
+10461 11061 1.20747408504985e+01
+10461 11085 4.15240925190634e+00
+10461 11109 1.01036021558392e-01
+10461 11133 1.14998784692895e-04
+10461 11661 4.60996910959797e-02
+10461 11685 1.27588687451486e-01
+10461 11709 8.70653938089642e-03
+10461 11733 1.50853894583000e-09
+10461 20064 -3.14289429538516e-04
+10461 20088 -5.50462311142653e-03
+10461 20112 -1.87272890764832e-02
+10461 20136 -9.94001768869176e-03
+10461 20160 -1.42313807385482e-03
+10461 20448 -1.58120002869853e-03
+10461 20472 -7.35160147784665e-02
+10461 20496 -4.68654027442273e-01
+10461 20520 -9.34677063180309e-01
+10461 20544 -4.95781694150897e-01
+10461 20568 -7.60852993516128e-02
+10461 20592 -4.57831467629266e-04
+10461 20856 -1.02084568245075e-02
+10461 20880 -4.38209835369893e-01
+10461 20904 -2.61950144724905e+00
+10461 20928 -4.91357092063549e+00
+10461 20952 -2.77314972883573e+00
+10461 20976 -4.57856882565000e-01
+10461 21000 -5.20445063742411e-03
+10461 21264 -1.99678375256180e-02
+10461 21288 -9.00428623635632e-01
+10461 21312 -5.95229647679319e+00
+10461 21336 -1.24786044584959e+01
+10461 21360 -6.90326339321363e+00
+10461 21384 -1.14792032596771e+00
+10461 21408 -2.25678303861431e-02
+10461 21672 -9.58767802584526e-03
+10461 21696 -6.14318709256905e-01
+10461 21720 -5.21913909453384e+00
+10461 21744 -1.30472690748128e+01
+10461 21768 -6.32062101669744e+00
+10461 21792 -9.31015863958428e-01
+10461 21816 -2.06081244686783e-02
+10462 10462 1.00000000000000e+00
+10463 10463 1.00000000000000e+00
+10464 10464 1.00000000000000e+00
+10465 10465 1.00000000000000e+00
+10466 10466 1.00000000000000e+00
+10467 10467 1.00000000000000e+00
+10468 10468 1.00000000000000e+00
+10469 10469 1.00000000000000e+00
+10470 10470 1.00000000000000e+00
+10471 10471 1.00000000000000e+00
+10472 10472 1.00000000000000e+00
+10473 10473 1.00000000000000e+00
+10474 10474 1.00000000000000e+00
+10475 10475 1.00000000000000e+00
+10476 10476 1.00000000000000e+00
+10477 10477 1.00000000000000e+00
+10478 10478 1.00000000000000e+00
+10479 10479 1.00000000000000e+00
+10480 10480 1.00000000000000e+00
+10481 10481 1.00000000000000e+00
+10482 10482 1.00000000000000e+00
+10483 10483 1.00000000000000e+00
+10484 10484 1.00000000000000e+00
+10485 10485 1.64581799012995e+01
+10485 8061 1.27120000000000e-16
+10485 8085 8.37030000000000e-16
+10485 8637 7.38583222521824e-06
+10485 8661 2.41938520180964e-04
+10485 8685 2.93336389137456e-04
+10485 8709 6.51738304218139e-05
+10485 8733 1.93816942058856e-06
+10485 9213 5.57780449472120e-07
+10485 9237 4.36077583164116e-03
+10485 9261 1.20361755725486e-01
+10485 9285 2.93701725343275e-01
+10485 9309 1.19507368978336e-01
+10485 9333 2.66749886865831e-03
+10485 9357 6.72456755290762e-06
+10485 9813 1.17729495477175e-04
+10485 9837 9.38903743213149e-02
+10485 9861 2.52076813096799e+00
+10485 9885 6.54732452314687e+00
+10485 9909 2.43971202276573e+00
+10485 9933 1.32107227727702e-01
+10485 9957 8.91005421407044e-05
+10485 10413 1.57546452617902e-04
+10485 10437 3.65589698849351e-01
+10485 10461 5.95013494598476e+00
+10485 10509 6.56258203239007e+00
+10485 10533 3.24085759625745e-01
+10485 10557 4.67153324025490e-04
+10485 11013 1.24828921303147e-06
+10485 11037 1.26642207232519e-01
+10485 11061 3.20527510274188e+00
+10485 11085 6.20292311079316e+00
+10485 11109 2.20243939165187e+00
+10485 11133 1.03910226659851e-01
+10485 11157 1.40199035422934e-04
+10485 11661 3.21160075323196e-02
+10485 11685 2.74020269122430e-01
+10485 11709 1.18442951526064e-01
+10485 11733 5.34094459172515e-03
+10485 12285 8.85453302770000e-10
+10485 12309 9.01164771458703e-06
+10485 12333 1.76345157057961e-06
+10485 19680 -2.67149432083500e-08
+10485 19704 -1.74967604472405e-04
+10485 19728 -8.50483332369760e-04
+10485 19752 -7.78915299212640e-04
+10485 19776 -1.51013638628267e-04
+10485 20064 -1.04917510642629e-04
+10485 20088 -1.36571193791509e-02
+10485 20112 -1.19803551127478e-01
+10485 20136 -3.13158933648108e-01
+10485 20160 -1.98701968048535e-01
+10485 20184 -3.39204386699666e-02
+10485 20208 -2.48574860122963e-04
+10485 20472 -2.60171715117959e-03
+10485 20496 -1.82793376238340e-01
+10485 20520 -1.41134525042513e+00
+10485 20544 -3.40775270230967e+00
+10485 20568 -2.16294920165840e+00
+10485 20592 -3.96364039902628e-01
+10485 20616 -9.44696404610537e-03
+10485 20880 -9.14157579495100e-03
+10485 20904 -5.76961529729787e-01
+10485 20928 -4.32881999660609e+00
+10485 20952 -1.02216097184031e+01
+10485 20976 -6.39325921400962e+00
+10485 21000 -1.20828029646940e+00
+10485 21024 -3.98639657652794e-02
+10485 21288 -3.41592650809742e-03
+10485 21312 -3.74380593890030e-01
+10485 21336 -3.15244129814928e+00
+10485 21360 -7.85669670876064e+00
+10485 21384 -4.42373616499353e+00
+10485 21408 -8.00085278224114e-01
+10485 21432 -3.21841845409035e-02
+10485 21696 -3.08469849872088e-04
+10485 21720 -1.37927352900208e-01
+10485 21744 -1.14051294456307e+00
+10485 21768 -2.69515405120284e+00
+10485 21792 -1.33921351264531e+00
+10485 21816 -2.12057904827486e-01
+10485 21840 -6.82991249166345e-03
+10486 10486 1.00000000000000e+00
+10487 10487 1.00000000000000e+00
+10488 10488 1.00000000000000e+00
+10489 10489 1.00000000000000e+00
+10490 10490 1.00000000000000e+00
+10491 10491 1.00000000000000e+00
+10492 10492 1.00000000000000e+00
+10493 10493 1.00000000000000e+00
+10494 10494 1.00000000000000e+00
+10495 10495 1.00000000000000e+00
+10496 10496 1.00000000000000e+00
+10497 10497 1.00000000000000e+00
+10498 10498 1.00000000000000e+00
+10499 10499 1.00000000000000e+00
+10500 10500 1.00000000000000e+00
+10501 10501 1.00000000000000e+00
+10502 10502 1.00000000000000e+00
+10503 10503 1.00000000000000e+00
+10504 10504 1.00000000000000e+00
+10505 10505 1.00000000000000e+00
+10506 10506 1.00000000000000e+00
+10507 10507 1.00000000000000e+00
+10508 10508 1.00000000000000e+00
+10509 10509 1.66019127419816e+01
+10509 8061 8.29700000000000e-17
+10509 8085 5.46280000000000e-16
+10509 8661 4.70536121254547e-06
+10509 8685 1.78814708764567e-04
+10509 8709 5.34088471120028e-04
+10509 8733 3.99813715338238e-05
+10509 8757 2.29509986312700e-08
+10509 8781 1.11133603000000e-12
+10509 9237 1.67959048382326e-06
+10509 9261 2.88298668641233e-03
+10509 9285 1.24287728839448e-01
+10509 9309 2.61254999604079e-01
+10509 9333 1.04894232584917e-01
+10509 9357 5.39569286250718e-03
+10509 9381 4.10056075839960e-07
+10509 9837 1.16427669681294e-04
+10509 9861 1.33750852826011e-01
+10509 9885 2.44145806955102e+00
+10509 9909 6.05533313607166e+00
+10509 9933 2.28425795486042e+00
+10509 9957 1.17330424634128e-01
+10509 9981 9.68204573979326e-05
+10509 10413 1.43269000000000e-15
+10509 10437 2.83309791446212e-04
+10509 10461 3.38445502301254e-01
+10509 10485 6.56258203239007e+00
+10509 10533 6.07253200657621e+00
+10509 10557 2.91682199132944e-01
+10509 10581 6.38231870733007e-04
+10509 11013 4.86770000000000e-16
+10509 11037 2.27061860767542e-04
+10509 11061 1.01082040273076e-01
+10509 11085 2.14495058601454e+00
+10509 11109 6.03243372310670e+00
+10509 11133 2.67314736954836e+00
+10509 11157 1.29158141991555e-01
+10509 11181 7.38617469010419e-05
+10509 11661 1.60503283768706e-03
+10509 11685 8.90814666278496e-02
+10509 11709 2.61946729281470e-01
+10509 11733 1.10751375218823e-01
+10509 11757 7.60696239971812e-03
+10509 11781 1.80315251593800e-08
+10509 12285 9.32791876860000e-10
+10509 12309 1.51134942095437e-04
+10509 12333 2.98307779105633e-04
+10509 12357 1.13169651915077e-06
+10509 12381 8.34516350000000e-13
+10509 19320 -5.76558717979500e-08
+10509 19344 -3.91749617691160e-07
+10509 19368 -7.02160393795420e-07
+10509 19392 -1.61126130499370e-07
+10509 19680 -1.74352105968200e-08
+10509 19704 -1.25262710500993e-03
+10509 19728 -2.16090931874474e-02
+10509 19752 -7.96429948358956e-02
+10509 19776 -6.46783074103005e-02
+10509 19800 -1.23920601170133e-02
+10509 19824 -9.92519568879595e-05
+10509 20088 -3.98715594254578e-04
+10509 20112 -5.66160552656313e-02
+10509 20136 -5.43816655026182e-01
+10509 20160 -1.56150964536208e+00
+10509 20184 -1.18550249725814e+00
+10509 20208 -2.51340603069221e-01
+10509 20232 -9.54620552641516e-03
+10509 20496 -1.90576692073231e-03
+10509 20520 -2.97980555261447e-01
+10509 20544 -2.64775831761201e+00
+10509 20568 -7.17876805185186e+00
+10509 20592 -5.34832249232655e+00
+10509 20616 -1.19479722097741e+00
+10509 20640 -6.10196194821610e-02
+10509 20664 -9.46477160706500e-08
+10509 20904 -1.64331298995037e-03
+10509 20928 -4.22827509282712e-01
+10509 20952 -3.73623591502856e+00
+10509 20976 -1.00058294587792e+01
+10509 21000 -7.42284113932584e+00
+10509 21024 -1.74396899578504e+00
+10509 21048 -1.08175470687369e-01
+10509 21072 -3.86495522040050e-07
+10509 21312 -3.11177468058401e-04
+10509 21336 -1.30571047099534e-01
+10509 21360 -1.16968533203045e+00
+10509 21384 -3.15212942479756e+00
+10509 21408 -2.34143120142450e+00
+10509 21432 -5.39531734989198e-01
+10509 21456 -3.12514410067282e-02
+10509 21480 -1.26266347100440e-07
+10509 21720 -2.84904636177000e-09
+10509 21744 -1.05376172650655e-02
+10509 21768 -9.96338200064896e-02
+10509 21792 -2.75221263027292e-01
+10509 21816 -1.98215657855399e-01
+10509 21840 -4.16778281377620e-02
+10509 21864 -1.73196606922712e-03
+10509 21888 -7.90465775745000e-09
+10510 10510 1.00000000000000e+00
+10511 10511 1.00000000000000e+00
+10512 10512 1.00000000000000e+00
+10513 10513 1.00000000000000e+00
+10514 10514 1.00000000000000e+00
+10515 10515 1.00000000000000e+00
+10516 10516 1.00000000000000e+00
+10517 10517 1.00000000000000e+00
+10518 10518 1.00000000000000e+00
+10519 10519 1.00000000000000e+00
+10520 10520 1.00000000000000e+00
+10521 10521 1.00000000000000e+00
+10522 10522 1.00000000000000e+00
+10523 10523 1.00000000000000e+00
+10524 10524 1.00000000000000e+00
+10525 10525 1.00000000000000e+00
+10526 10526 1.00000000000000e+00
+10527 10527 1.00000000000000e+00
+10528 10528 1.00000000000000e+00
+10529 10529 1.00000000000000e+00
+10530 10530 1.00000000000000e+00
+10531 10531 1.00000000000000e+00
+10532 10532 1.00000000000000e+00
+10533 10533 1.58390083592948e+01
+10533 8685 5.31858846635943e-06
+10533 8709 8.43467389934029e-05
+10533 8733 2.80445054406424e-04
+10533 8757 1.76641060064222e-04
+10533 8781 2.14304096016500e-08
+10533 9261 2.19066051226410e-06
+10533 9285 3.00569983360132e-03
+10533 9309 1.13586382165694e-01
+10533 9333 2.94052596094362e-01
+10533 9357 8.99707006266862e-02
+10533 9381 4.93536473027638e-03
+10533 9405 2.79430157966990e-06
+10533 9861 3.45354354387671e-05
+10533 9885 1.29265031934993e-01
+10533 9909 2.27567422516412e+00
+10533 9933 5.58574866139347e+00
+10533 9957 2.32069493927855e+00
+10533 9981 1.22356735855193e-01
+10533 10005 2.20082275981338e-04
+10533 10437 3.80000000000000e-19
+10533 10461 3.89714704487484e-04
+10533 10485 3.24085759625745e-01
+10533 10509 6.07253200657621e+00
+10533 10557 6.32140157665043e+00
+10533 10581 3.08047702966224e-01
+10533 10605 7.01342460993393e-04
+10533 11061 2.14991453078897e-04
+10533 11085 1.20597050544896e-01
+10533 11109 2.69560330541548e+00
+10533 11133 6.72471884021658e+00
+10533 11157 2.77392916116140e+00
+10533 11181 1.59134713973784e-01
+10533 11205 1.81715951490790e-05
+10533 11661 3.07268247464823e-06
+10533 11685 4.58947816494339e-03
+10533 11709 9.51566419060030e-02
+10533 11733 3.90074702897652e-01
+10533 11757 1.65476629083145e-01
+10533 11781 5.91766666038578e-03
+10533 11805 4.13083515611120e-07
+10533 12285 7.31269937100000e-11
+10533 12309 1.60494948635369e-04
+10533 12333 3.90821018534082e-04
+10533 12357 1.08990327590328e-04
+10533 12381 1.16629760528223e-06
+10533 19320 -8.12642191870804e-06
+10533 19344 -1.89638474168428e-03
+10533 19368 -1.05393873554721e-02
+10533 19392 -1.42016680674160e-02
+10533 19416 -3.21498529089224e-03
+10533 19440 -3.48101433441640e-05
+10533 19704 -3.89310030356545e-05
+10533 19728 -1.51559787944265e-02
+10533 19752 -1.85449956010229e-01
+10533 19776 -6.39847535218475e-01
+10533 19800 -6.26267686291773e-01
+10533 19824 -1.55321867795443e-01
+10533 19848 -8.02865271787041e-03
+10533 20112 -2.50664090970476e-04
+10533 20136 -1.18129358804486e-01
+10533 20160 -1.30451795486920e+00
+10533 20184 -4.25765599427593e+00
+10533 20208 -4.10122884318582e+00
+10533 20232 -1.09956716241355e+00
+10533 20256 -7.55358123396626e-02
+10533 20280 -4.23031447744498e-06
+10533 20520 -4.18824570894582e-04
+10533 20544 -2.65399292796340e-01
+10533 20568 -2.79102250318827e+00
+10533 20592 -8.88021871768801e+00
+10533 20616 -8.63045626787857e+00
+10533 20640 -2.47405737344559e+00
+10533 20664 -2.00180555053648e-01
+10533 20688 -2.19178452599128e-05
+10533 20928 -9.54730890178436e-05
+10533 20952 -1.36848367689047e-01
+10533 20976 -1.59016329279607e+00
+10533 21000 -5.30453705292584e+00
+10533 21024 -5.11917555376193e+00
+10533 21048 -1.43097519682753e+00
+10533 21072 -1.10018885673370e-01
+10533 21096 -2.42166638779766e-05
+10533 21336 -1.33252547496480e-07
+10533 21360 -2.03872129237755e-02
+10533 21384 -2.68460388411376e-01
+10533 21408 -9.36190402441622e-01
+10533 21432 -8.76028072878844e-01
+10533 21456 -2.34219438433417e-01
+10533 21480 -1.65362016833945e-02
+10533 21504 -4.99658735013291e-06
+10533 21768 -1.55188264107733e-04
+10533 21792 -4.98947752019862e-03
+10533 21816 -1.97720813716513e-02
+10533 21840 -1.29413237855625e-02
+10533 21864 -2.16046850008649e-03
+10533 21888 -4.61831190340914e-06
+10534 10534 1.00000000000000e+00
+10535 10535 1.00000000000000e+00
+10536 10536 1.00000000000000e+00
+10537 10537 1.00000000000000e+00
+10538 10538 1.00000000000000e+00
+10539 10539 1.00000000000000e+00
+10540 10540 1.00000000000000e+00
+10541 10541 1.00000000000000e+00
+10542 10542 1.00000000000000e+00
+10543 10543 1.00000000000000e+00
+10544 10544 1.00000000000000e+00
+10545 10545 1.00000000000000e+00
+10546 10546 1.00000000000000e+00
+10547 10547 1.00000000000000e+00
+10548 10548 1.00000000000000e+00
+10549 10549 1.00000000000000e+00
+10550 10550 1.00000000000000e+00
+10551 10551 1.00000000000000e+00
+10552 10552 1.00000000000000e+00
+10553 10553 1.00000000000000e+00
+10554 10554 1.00000000000000e+00
+10555 10555 1.00000000000000e+00
+10556 10556 1.00000000000000e+00
+10557 10557 1.66152374232951e+01
+10557 8709 3.90695406012390e-07
+10557 8733 3.16588033027814e-04
+10557 8757 2.76673039955497e-04
+10557 8781 4.54682972154234e-05
+10557 8805 2.47633161065666e-06
+10557 9285 7.22147823010740e-07
+10557 9309 4.70380571098789e-03
+10557 9333 1.03986644421698e-01
+10557 9357 3.01419830152242e-01
+10557 9381 1.29959229577403e-01
+10557 9405 4.00256385214283e-03
+10557 9429 1.31669194616130e-06
+10557 9885 1.87607910286078e-05
+10557 9909 1.13542902326336e-01
+10557 9933 2.31426725984315e+00
+10557 9957 6.01317879021471e+00
+10557 9981 2.61139860278906e+00
+10557 10005 1.30468906119891e-01
+10557 10029 3.05165715246775e-04
+10557 10485 4.67153324025490e-04
+10557 10509 2.91682199132944e-01
+10557 10533 6.32140157665043e+00
+10557 10581 6.43803972467912e+00
+10557 10605 2.56110343441903e-01
+10557 10629 3.80183219577233e-04
+10557 11061 1.01200000000000e-17
+10557 11085 2.62041531254369e-04
+10557 11109 1.38803384818406e-01
+10557 11133 2.77588105773611e+00
+10557 11157 7.22470846299940e+00
+10557 11181 2.28682142390914e+00
+10557 11205 9.56967206476604e-02
+10557 11229 8.78103357304630e-07
+10557 11661 6.35000000000000e-18
+10557 11685 1.65821052232090e-07
+10557 11709 7.20183881084140e-03
+10557 11733 1.58330381854052e-01
+10557 11757 3.44526895845701e-01
+10557 11781 1.02944973256488e-01
+10557 11805 2.48600030779962e-03
+10557 12285 3.55340800000000e-14
+10557 12309 2.08930460891830e-07
+10557 12333 3.87416569810695e-05
+10557 12357 5.98389187080676e-04
+10557 12381 2.54420757694314e-04
+10557 18960 -3.43528606209360e-05
+10557 18984 -3.89332230272227e-04
+10557 19008 -1.04490660266625e-03
+10557 19032 -2.63403151354005e-04
+10557 19056 -2.87059089138052e-06
+10557 19320 -5.23645026792840e-07
+10557 19344 -2.45335414009294e-03
+10557 19368 -5.22627933309404e-02
+10557 19392 -2.40577424961947e-01
+10557 19416 -3.19772793067162e-01
+10557 19440 -8.48036522135777e-02
+10557 19464 -4.12660314887462e-03
+10557 19728 -1.38112665047090e-05
+10557 19752 -3.97012792058170e-02
+10557 19776 -6.07890324229372e-01
+10557 19800 -2.46519311508997e+00
+10557 19824 -3.01355636355886e+00
+10557 19848 -8.31720144615548e-01
+10557 19872 -5.14093378669878e-02
+10557 20136 -4.77885378091536e-05
+10557 20160 -1.41157639159405e-01
+10557 20184 -1.97095422806587e+00
+10557 20208 -7.59830514439925e+00
+10557 20232 -8.89099175463561e+00
+10557 20256 -2.49991636289083e+00
+10557 20280 -1.70767136446982e-01
+10557 20544 -1.33092751663793e-05
+10557 20568 -1.07211408631077e-01
+10557 20592 -1.71506375002892e+00
+10557 20616 -6.94499300146942e+00
+10557 20640 -8.19445174042303e+00
+10557 20664 -2.25180646794109e+00
+10557 20688 -1.43634132019874e-01
+10557 20952 -3.98147192210440e-07
+10557 20976 -2.20016673822275e-02
+10557 21000 -4.41673679756468e-01
+10557 21024 -1.87921702765304e+00
+10557 21048 -2.15460430129387e+00
+10557 21072 -5.66300017826290e-01
+10557 21096 -3.17314047065696e-02
+10557 21384 -7.12208246196838e-04
+10557 21408 -3.00750972078268e-02
+10557 21432 -1.38745469119407e-01
+10557 21456 -1.44954846645998e-01
+10557 21480 -3.39913024247160e-02
+10557 21504 -1.21583139608431e-03
+10557 21792 -2.67275633000000e-12
+10557 21816 -2.51866616999205e-06
+10557 21840 -1.04201598584571e-05
+10557 21864 -3.90079655830218e-06
+10557 21888 -3.45535269833860e-07
+10558 10558 1.00000000000000e+00
+10559 10559 1.00000000000000e+00
+10560 10560 1.00000000000000e+00
+10561 10561 1.00000000000000e+00
+10562 10562 1.00000000000000e+00
+10563 10563 1.00000000000000e+00
+10564 10564 1.00000000000000e+00
+10565 10565 1.00000000000000e+00
+10566 10566 1.00000000000000e+00
+10567 10567 1.00000000000000e+00
+10568 10568 1.00000000000000e+00
+10569 10569 1.00000000000000e+00
+10570 10570 1.00000000000000e+00
+10571 10571 1.00000000000000e+00
+10572 10572 1.00000000000000e+00
+10573 10573 1.00000000000000e+00
+10574 10574 1.00000000000000e+00
+10575 10575 1.00000000000000e+00
+10576 10576 1.00000000000000e+00
+10577 10577 1.00000000000000e+00
+10578 10578 1.00000000000000e+00
+10579 10579 1.00000000000000e+00
+10580 10580 1.00000000000000e+00
+10581 10581 1.66107668831668e+01
+10581 8709 1.07492419000000e-12
+10581 8733 5.17030619608320e-07
+10581 8757 9.36342827745039e-05
+10581 8781 6.78079290028168e-04
+10581 8805 8.08979821477049e-05
+10581 8829 8.30405258521000e-09
+10581 8853 1.83791670000000e-12
+10581 9309 1.51877667859400e-08
+10581 9333 5.78011380667552e-03
+10581 9357 1.33641182211229e-01
+10581 9381 3.19722565471032e-01
+10581 9405 9.18742608481266e-02
+10581 9429 6.97895973065632e-03
+10581 9453 4.08628167584000e-09
+10581 9909 4.76842667935611e-05
+10581 9933 1.12349617391642e-01
+10581 9957 2.63300019074896e+00
+10581 9981 6.38956406917364e+00
+10581 10005 2.75103404825547e+00
+10581 10029 1.54296983896813e-01
+10581 10053 1.02677524531000e-09
+10581 10509 6.38231870733007e-04
+10581 10533 3.08047702966224e-01
+10581 10557 6.43803972467912e+00
+10581 10605 9.48469133812474e+00
+10581 10629 1.62292688555022e-01
+10581 11085 1.16118000000000e-15
+10581 11109 2.12410211905868e-04
+10581 11133 1.63787166671295e-01
+10581 11157 2.30136421296787e+00
+10581 11181 8.30042343340740e+00
+10581 11205 4.37323350928686e+00
+10581 11229 8.16320942124727e-04
+10581 11685 1.61450000000000e-16
+10581 11709 7.44503075326079e-06
+10581 11733 3.82984705123414e-03
+10581 11757 1.06494160843875e-01
+10581 11781 3.98093749650452e-01
+10581 11805 5.71113368287785e-02
+10581 12333 1.85443126627644e-06
+10581 12357 1.20547285967324e-04
+10581 12381 7.09412875459686e-05
+10581 18600 -3.67222075893600e-08
+10581 18624 -2.10202261173670e-07
+10581 18648 -1.63349069221820e-07
+10581 18960 -8.49783613857471e-05
+10581 18984 -9.38575092160608e-03
+10581 19008 -4.79131606910226e-02
+10581 19032 -6.90657784007970e-02
+10581 19056 -3.85260548717767e-02
+10581 19344 -9.85236182442100e-08
+10581 19368 -1.24654553297146e-02
+10581 19392 -2.85679637321188e-01
+10581 19416 -1.23817040319275e+00
+10581 19440 -1.62540162070135e+00
+10581 19464 -8.02167487971875e-01
+10581 19752 -4.31404717765000e-07
+10581 19776 -6.57338060232611e-02
+10581 19800 -1.35589596977100e+00
+10581 19824 -5.68289186565232e+00
+10581 19848 -7.61855577416950e+00
+10581 19872 -4.33414068707041e+00
+10581 20160 -2.47764597396870e-07
+10581 20184 -8.21777190579342e-02
+10581 20208 -1.73717993124595e+00
+10581 20232 -7.16654941689160e+00
+10581 20256 -1.02980360621151e+01
+10581 20280 -7.62575536054883e+00
+10581 20568 -3.73102447881600e-08
+10581 20592 -2.30088250458343e-02
+10581 20616 -6.47334861429477e-01
+10581 20640 -2.74934680092517e+00
+10581 20664 -3.50368766140370e+00
+10581 20688 -2.36081159036046e+00
+10581 21000 -1.46560958747292e-03
+10581 21024 -7.56563029286534e-02
+10581 21048 -3.35634600221831e-01
+10581 21072 -3.45089594634309e-01
+10581 21096 -1.65636733875920e-01
+10581 21408 -1.82286164144400e-08
+10581 21432 -6.16935639697773e-04
+10581 21456 -2.80648045101112e-03
+10581 21480 -1.97299421219411e-03
+10581 21504 -3.39183723660238e-04
+10582 10582 1.00000000000000e+00
+10583 10583 1.00000000000000e+00
+10584 10584 1.00000000000000e+00
+10585 10585 1.00000000000000e+00
+10586 10586 1.00000000000000e+00
+10587 10587 1.00000000000000e+00
+10588 10588 1.00000000000000e+00
+10589 10589 1.00000000000000e+00
+10590 10590 1.00000000000000e+00
+10591 10591 1.00000000000000e+00
+10592 10592 1.00000000000000e+00
+10593 10593 1.00000000000000e+00
+10594 10594 1.00000000000000e+00
+10595 10595 1.00000000000000e+00
+10596 10596 1.00000000000000e+00
+10597 10597 1.00000000000000e+00
+10598 10598 1.00000000000000e+00
+10599 10599 1.00000000000000e+00
+10600 10600 1.00000000000000e+00
+10601 10601 1.00000000000000e+00
+10602 10602 1.00000000000000e+00
+10603 10603 1.00000000000000e+00
+10604 10604 1.00000000000000e+00
+10605 10605 2.32800694414842e+01
+10605 8757 7.65518854573810e-06
+10605 8781 2.22694656811326e-04
+10605 8805 3.22067592846329e-04
+10605 8829 2.50863875796688e-04
+10605 8853 2.76965240371850e-07
+10605 9357 6.61404141397696e-03
+10605 9381 9.66358510578624e-02
+10605 9405 3.91337936004934e-01
+10605 9429 2.26802376575187e-01
+10605 9453 7.12317907240379e-04
+10605 9933 1.09163930156516e-04
+10605 9957 1.14640260342685e-01
+10605 9981 2.47430333521985e+00
+10605 10005 1.00664315766853e+01
+10605 10029 2.82246097617276e+00
+10605 10053 1.81867178720739e-04
+10605 10533 7.01342460993393e-04
+10605 10557 2.56110343441903e-01
+10605 10581 9.48469133812474e+00
+10605 10629 1.31811892162331e+00
+10605 11133 9.87647472616887e-05
+10605 11157 1.11544915246483e-01
+10605 11181 6.37363411517340e+00
+10605 11205 6.11383506306097e+00
+10605 11229 3.30908086177543e-03
+10605 11733 5.17228162006560e-06
+10605 11757 8.22857654823490e-03
+10605 11781 1.56701631720252e-01
+10605 11805 4.59222211420490e-02
+10605 18600 -3.54822158744668e-04
+10605 18624 -1.30329133732077e-02
+10605 18648 -2.35820716352027e-02
+10605 18984 -3.19873872226573e-03
+10605 19008 -5.62077263860385e-02
+10605 19032 -7.88820640174533e-01
+10605 19056 -1.26735440242571e+00
+10605 19392 -2.65648743547438e-02
+10605 19416 -4.87838300554057e-01
+10605 19440 -4.98769432682711e+00
+10605 19464 -7.25120728299913e+00
+10605 19800 -6.04023209590295e-02
+10605 19824 -1.20726376709726e+00
+10605 19848 -1.01403827040805e+01
+10605 19872 -1.34003793834150e+01
+10605 20208 -2.22660675726951e-02
+10605 20232 -5.87225973957996e-01
+10605 20256 -7.22856710572093e+00
+10605 20280 -1.09254701506259e+01
+10605 20616 -2.12602681745387e-03
+10605 20640 -8.82386895391254e-02
+10605 20664 -1.42156879861824e+00
+10605 20688 -2.28074346771641e+00
+10605 21024 -5.30610853420270e-07
+10605 21048 -2.27056743930521e-03
+10605 21072 -3.23742370319432e-02
+10605 21096 -4.88682978709389e-02
+10606 10606 1.00000000000000e+00
+10607 10607 1.00000000000000e+00
+10608 10608 1.00000000000000e+00
+10609 10609 1.00000000000000e+00
+10610 10610 1.00000000000000e+00
+10611 10611 1.00000000000000e+00
+10612 10612 1.00000000000000e+00
+10613 10613 1.00000000000000e+00
+10614 10614 1.00000000000000e+00
+10615 10615 1.00000000000000e+00
+10616 10616 1.00000000000000e+00
+10617 10617 1.00000000000000e+00
+10618 10618 1.00000000000000e+00
+10619 10619 1.00000000000000e+00
+10620 10620 1.00000000000000e+00
+10621 10621 1.00000000000000e+00
+10622 10622 1.00000000000000e+00
+10623 10623 1.00000000000000e+00
+10624 10624 1.00000000000000e+00
+10625 10625 1.00000000000000e+00
+10626 10626 1.00000000000000e+00
+10627 10627 1.00000000000000e+00
+10628 10628 1.00000000000000e+00
+10629 10629 1.21320765838514e+00
+10629 8781 4.55670212600414e-06
+10629 8805 1.96678742491974e-04
+10629 8829 2.15051154370613e-04
+10629 8853 2.65320809328760e-07
+10629 9357 4.13226415410000e-10
+10629 9381 3.56458842680593e-03
+10629 9405 9.52927344201621e-02
+10629 9429 1.07199625704488e-01
+10629 9453 6.84807729967531e-04
+10629 9957 1.64562920078723e-04
+10629 9981 6.68679335058815e-02
+10629 10005 1.66127993386266e+00
+10629 10029 7.68476838705032e-01
+10629 10053 1.74906230975332e-04
+10629 10557 3.80183219577233e-04
+10629 10581 1.62292688555022e-01
+10629 10605 1.31811892162331e+00
+10629 11157 1.11277923894418e-05
+10629 11181 2.29883960010643e-02
+10629 11205 6.30109354465522e-02
+10629 11229 1.54671107146393e-04
+10629 11757 1.26524962030200e-08
+10629 11781 4.99765527714176e-05
+10629 11805 2.68083483975965e-05
+10629 18600 -2.09120147080730e-04
+10629 18624 -1.20141728929724e-02
+10629 18648 -2.25645047563796e-02
+10629 19008 -4.02463253813658e-03
+10629 19032 -2.25446163389855e-01
+10629 19056 -4.22719899012753e-01
+10629 19416 -1.48604071463110e-02
+10629 19440 -7.91085148021617e-01
+10629 19464 -1.47814744601905e+00
+10629 19824 -1.07855649151753e-02
+10629 19848 -4.56253711353303e-01
+10629 19872 -8.37008468300378e-01
+10629 20232 -1.90946386181230e-03
+10629 20256 -7.27606402896118e-02
+10629 20280 -1.32155033546538e-01
+10629 20640 -2.69616545916969e-06
+10629 20664 -8.11888108207324e-04
+10629 20688 -1.60490305820046e-03
+10630 10630 1.00000000000000e+00
+10631 10631 1.00000000000000e+00
+10632 10632 1.00000000000000e+00
+10633 10633 1.00000000000000e+00
+10634 10634 1.00000000000000e+00
+10635 10635 1.00000000000000e+00
+10636 10636 1.00000000000000e+00
+10637 10637 1.00000000000000e+00
+10638 10638 1.00000000000000e+00
+10639 10639 1.00000000000000e+00
+10640 10640 1.00000000000000e+00
+10641 10641 1.00000000000000e+00
+10642 10642 1.00000000000000e+00
+10643 10643 1.00000000000000e+00
+10644 10644 1.00000000000000e+00
+10645 10645 1.00000000000000e+00
+10646 10646 1.00000000000000e+00
+10647 10647 1.00000000000000e+00
+10648 10648 1.00000000000000e+00
+10649 10649 1.00000000000000e+00
+10650 10650 1.00000000000000e+00
+10651 10651 1.00000000000000e+00
+10652 10652 1.00000000000000e+00
+10653 10653 1.00000000000000e+00
+10654 10654 1.00000000000000e+00
+10655 10655 1.00000000000000e+00
+10656 10656 1.00000000000000e+00
+10657 10657 1.00000000000000e+00
+10658 10658 1.00000000000000e+00
+10659 10659 1.00000000000000e+00
+10660 10660 1.00000000000000e+00
+10661 10661 1.00000000000000e+00
+10662 10662 1.00000000000000e+00
+10663 10663 1.00000000000000e+00
+10664 10664 1.00000000000000e+00
+10665 10665 1.00000000000000e+00
+10666 10666 1.00000000000000e+00
+10667 10667 1.00000000000000e+00
+10668 10668 1.00000000000000e+00
+10669 10669 1.00000000000000e+00
+10670 10670 1.00000000000000e+00
+10671 10671 1.00000000000000e+00
+10672 10672 1.00000000000000e+00
+10673 10673 1.00000000000000e+00
+10674 10674 1.00000000000000e+00
+10675 10675 1.00000000000000e+00
+10676 10676 1.00000000000000e+00
+10677 10677 1.00000000000000e+00
+10678 10678 1.00000000000000e+00
+10679 10679 1.00000000000000e+00
+10680 10680 1.00000000000000e+00
+10681 10681 1.00000000000000e+00
+10682 10682 1.00000000000000e+00
+10683 10683 1.00000000000000e+00
+10684 10684 1.00000000000000e+00
+10685 10685 1.00000000000000e+00
+10686 10686 1.00000000000000e+00
+10687 10687 1.00000000000000e+00
+10688 10688 1.00000000000000e+00
+10689 10689 1.00000000000000e+00
+10690 10690 1.00000000000000e+00
+10691 10691 1.00000000000000e+00
+10692 10692 1.00000000000000e+00
+10693 10693 1.00000000000000e+00
+10694 10694 1.00000000000000e+00
+10695 10695 1.00000000000000e+00
+10696 10696 1.00000000000000e+00
+10697 10697 1.00000000000000e+00
+10698 10698 1.00000000000000e+00
+10699 10699 1.00000000000000e+00
+10700 10700 1.00000000000000e+00
+10701 10701 1.00000000000000e+00
+10702 10702 1.00000000000000e+00
+10703 10703 1.00000000000000e+00
+10704 10704 1.00000000000000e+00
+10705 10705 1.00000000000000e+00
+10706 10706 1.00000000000000e+00
+10707 10707 1.00000000000000e+00
+10708 10708 1.00000000000000e+00
+10709 10709 1.00000000000000e+00
+10710 10710 1.00000000000000e+00
+10711 10711 1.00000000000000e+00
+10712 10712 1.00000000000000e+00
+10713 10713 1.00000000000000e+00
+10714 10714 1.00000000000000e+00
+10715 10715 1.00000000000000e+00
+10716 10716 1.00000000000000e+00
+10717 10717 1.00000000000000e+00
+10718 10718 1.00000000000000e+00
+10719 10719 1.00000000000000e+00
+10720 10720 1.00000000000000e+00
+10721 10721 1.00000000000000e+00
+10722 10722 1.00000000000000e+00
+10723 10723 1.00000000000000e+00
+10724 10724 1.00000000000000e+00
+10725 10725 1.00000000000000e+00
+10726 10726 1.00000000000000e+00
+10727 10727 1.00000000000000e+00
+10728 10728 1.00000000000000e+00
+10729 10729 1.00000000000000e+00
+10730 10730 1.00000000000000e+00
+10731 10731 1.00000000000000e+00
+10732 10732 1.00000000000000e+00
+10733 10733 1.00000000000000e+00
+10734 10734 1.00000000000000e+00
+10735 10735 1.00000000000000e+00
+10736 10736 1.00000000000000e+00
+10737 10737 1.00000000000000e+00
+10738 10738 1.00000000000000e+00
+10739 10739 1.00000000000000e+00
+10740 10740 1.00000000000000e+00
+10741 10741 1.00000000000000e+00
+10742 10742 1.00000000000000e+00
+10743 10743 1.00000000000000e+00
+10744 10744 1.00000000000000e+00
+10745 10745 1.00000000000000e+00
+10746 10746 1.00000000000000e+00
+10747 10747 1.00000000000000e+00
+10748 10748 1.00000000000000e+00
+10749 10749 1.00000000000000e+00
+10750 10750 1.00000000000000e+00
+10751 10751 1.00000000000000e+00
+10752 10752 1.00000000000000e+00
+10753 10753 1.00000000000000e+00
+10754 10754 1.00000000000000e+00
+10755 10755 1.00000000000000e+00
+10756 10756 1.00000000000000e+00
+10757 10757 1.00000000000000e+00
+10758 10758 1.00000000000000e+00
+10759 10759 1.00000000000000e+00
+10760 10760 1.00000000000000e+00
+10761 10761 1.00000000000000e+00
+10762 10762 1.00000000000000e+00
+10763 10763 1.00000000000000e+00
+10764 10764 1.00000000000000e+00
+10765 10765 1.00000000000000e+00
+10766 10766 1.00000000000000e+00
+10767 10767 1.00000000000000e+00
+10768 10768 1.00000000000000e+00
+10769 10769 1.00000000000000e+00
+10770 10770 1.00000000000000e+00
+10771 10771 1.00000000000000e+00
+10772 10772 1.00000000000000e+00
+10773 10773 1.00000000000000e+00
+10774 10774 1.00000000000000e+00
+10775 10775 1.00000000000000e+00
+10776 10776 1.00000000000000e+00
+10777 10777 1.00000000000000e+00
+10778 10778 1.00000000000000e+00
+10779 10779 1.00000000000000e+00
+10780 10780 1.00000000000000e+00
+10781 10781 1.00000000000000e+00
+10782 10782 1.00000000000000e+00
+10783 10783 1.00000000000000e+00
+10784 10784 1.00000000000000e+00
+10785 10785 1.00000000000000e+00
+10786 10786 1.00000000000000e+00
+10787 10787 1.00000000000000e+00
+10788 10788 1.00000000000000e+00
+10789 10789 1.00000000000000e+00
+10790 10790 1.00000000000000e+00
+10791 10791 1.00000000000000e+00
+10792 10792 1.00000000000000e+00
+10793 10793 1.00000000000000e+00
+10794 10794 1.00000000000000e+00
+10795 10795 1.00000000000000e+00
+10796 10796 1.00000000000000e+00
+10797 10797 1.00000000000000e+00
+10798 10798 1.00000000000000e+00
+10799 10799 1.00000000000000e+00
+10800 10800 1.00000000000000e+00
+10801 10801 1.00000000000000e+00
+10802 10802 1.00000000000000e+00
+10803 10803 1.00000000000000e+00
+10804 10804 1.00000000000000e+00
+10805 10805 1.00000000000000e+00
+10806 10806 1.00000000000000e+00
+10807 10807 1.00000000000000e+00
+10808 10808 1.00000000000000e+00
+10809 10809 1.00000000000000e+00
+10810 10810 1.00000000000000e+00
+10811 10811 1.00000000000000e+00
+10812 10812 1.00000000000000e+00
+10813 10813 1.00000000000000e+00
+10814 10814 1.00000000000000e+00
+10815 10815 1.00000000000000e+00
+10816 10816 1.00000000000000e+00
+10817 10817 1.00000000000000e+00
+10818 10818 1.00000000000000e+00
+10819 10819 1.00000000000000e+00
+10820 10820 1.00000000000000e+00
+10821 10821 1.00000000000000e+00
+10822 10822 1.00000000000000e+00
+10823 10823 1.00000000000000e+00
+10824 10824 1.00000000000000e+00
+10825 10825 1.00000000000000e+00
+10826 10826 1.00000000000000e+00
+10827 10827 1.00000000000000e+00
+10828 10828 1.00000000000000e+00
+10829 10829 1.00000000000000e+00
+10830 10830 1.00000000000000e+00
+10831 10831 1.00000000000000e+00
+10832 10832 1.00000000000000e+00
+10833 10833 1.00000000000000e+00
+10834 10834 1.00000000000000e+00
+10835 10835 1.00000000000000e+00
+10836 10836 1.00000000000000e+00
+10837 10837 1.00000000000000e+00
+10838 10838 1.00000000000000e+00
+10839 10839 1.00000000000000e+00
+10840 10840 1.00000000000000e+00
+10841 10841 1.00000000000000e+00
+10842 10842 1.00000000000000e+00
+10843 10843 1.00000000000000e+00
+10844 10844 1.00000000000000e+00
+10845 10845 1.00000000000000e+00
+10846 10846 1.00000000000000e+00
+10847 10847 1.00000000000000e+00
+10848 10848 1.00000000000000e+00
+10849 10849 1.00000000000000e+00
+10850 10850 1.00000000000000e+00
+10851 10851 1.00000000000000e+00
+10852 10852 1.00000000000000e+00
+10853 10853 1.00000000000000e+00
+10854 10854 1.00000000000000e+00
+10855 10855 1.00000000000000e+00
+10856 10856 1.00000000000000e+00
+10857 10857 1.00000000000000e+00
+10858 10858 1.00000000000000e+00
+10859 10859 1.00000000000000e+00
+10860 10860 1.00000000000000e+00
+10861 10861 1.00000000000000e+00
+10862 10862 1.00000000000000e+00
+10863 10863 1.00000000000000e+00
+10864 10864 1.00000000000000e+00
+10865 10865 1.00000000000000e+00
+10866 10866 1.00000000000000e+00
+10867 10867 1.00000000000000e+00
+10868 10868 1.00000000000000e+00
+10869 10869 1.00000000000000e+00
+10870 10870 1.00000000000000e+00
+10871 10871 1.00000000000000e+00
+10872 10872 1.00000000000000e+00
+10873 10873 1.00000000000000e+00
+10874 10874 1.00000000000000e+00
+10875 10875 1.00000000000000e+00
+10876 10876 1.00000000000000e+00
+10877 10877 1.00000000000000e+00
+10878 10878 1.00000000000000e+00
+10879 10879 1.00000000000000e+00
+10880 10880 1.00000000000000e+00
+10881 10881 1.00000000000000e+00
+10882 10882 1.00000000000000e+00
+10883 10883 1.00000000000000e+00
+10884 10884 1.00000000000000e+00
+10885 10885 1.00000000000000e+00
+10886 10886 1.00000000000000e+00
+10887 10887 1.00000000000000e+00
+10888 10888 1.00000000000000e+00
+10889 10889 1.00000000000000e+00
+10890 10890 1.00000000000000e+00
+10891 10891 1.00000000000000e+00
+10892 10892 1.00000000000000e+00
+10893 10893 1.00000000000000e+00
+10894 10894 1.00000000000000e+00
+10895 10895 1.00000000000000e+00
+10896 10896 1.00000000000000e+00
+10897 10897 1.00000000000000e+00
+10898 10898 1.00000000000000e+00
+10899 10899 1.00000000000000e+00
+10900 10900 1.00000000000000e+00
+10901 10901 1.00000000000000e+00
+10902 10902 1.00000000000000e+00
+10903 10903 1.00000000000000e+00
+10904 10904 1.00000000000000e+00
+10905 10905 1.00000000000000e+00
+10906 10906 1.00000000000000e+00
+10907 10907 1.00000000000000e+00
+10908 10908 1.00000000000000e+00
+10909 10909 1.00000000000000e+00
+10910 10910 1.00000000000000e+00
+10911 10911 1.00000000000000e+00
+10912 10912 1.00000000000000e+00
+10913 10913 1.00000000000000e+00
+10914 10914 1.00000000000000e+00
+10915 10915 1.00000000000000e+00
+10916 10916 1.00000000000000e+00
+10917 10917 1.00000000000000e+00
+10918 10918 1.00000000000000e+00
+10919 10919 1.00000000000000e+00
+10920 10920 1.00000000000000e+00
+10921 10921 1.00000000000000e+00
+10922 10922 1.00000000000000e+00
+10923 10923 1.00000000000000e+00
+10924 10924 1.00000000000000e+00
+10925 10925 1.00000000000000e+00
+10926 10926 1.00000000000000e+00
+10927 10927 1.00000000000000e+00
+10928 10928 1.00000000000000e+00
+10929 10929 1.00000000000000e+00
+10930 10930 1.00000000000000e+00
+10931 10931 1.00000000000000e+00
+10932 10932 1.00000000000000e+00
+10933 10933 1.00000000000000e+00
+10934 10934 1.00000000000000e+00
+10935 10935 1.00000000000000e+00
+10936 10936 1.00000000000000e+00
+10937 10937 1.00000000000000e+00
+10938 10938 1.00000000000000e+00
+10939 10939 1.00000000000000e+00
+10940 10940 1.00000000000000e+00
+10941 10941 1.00000000000000e+00
+10942 10942 1.00000000000000e+00
+10943 10943 1.00000000000000e+00
+10944 10944 1.00000000000000e+00
+10945 10945 1.00000000000000e+00
+10946 10946 1.00000000000000e+00
+10947 10947 1.00000000000000e+00
+10948 10948 1.00000000000000e+00
+10949 10949 1.00000000000000e+00
+10950 10950 1.00000000000000e+00
+10951 10951 1.00000000000000e+00
+10952 10952 1.00000000000000e+00
+10953 10953 1.00000000000000e+00
+10954 10954 1.00000000000000e+00
+10955 10955 1.00000000000000e+00
+10956 10956 1.00000000000000e+00
+10957 10957 1.00000000000000e+00
+10958 10958 1.00000000000000e+00
+10959 10959 1.00000000000000e+00
+10960 10960 1.00000000000000e+00
+10961 10961 1.00000000000000e+00
+10962 10962 1.00000000000000e+00
+10963 10963 1.00000000000000e+00
+10964 10964 1.00000000000000e+00
+10965 10965 1.00000000000000e+00
+10966 10966 1.00000000000000e+00
+10967 10967 1.00000000000000e+00
diff --git a/external/hypre/src/test/TEST_ij/data/tucker21935/IJ.A.00002 b/external/hypre/src/test/TEST_ij/data/tucker21935/IJ.A.00002
new file mode 100644
index 00000000..3afd185b
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/data/tucker21935/IJ.A.00002
@@ -0,0 +1,9372 @@
+10968 16451 10968 16451
+10968 10968 1.00000000000000e+00
+10969 10969 1.00000000000000e+00
+10970 10970 1.00000000000000e+00
+10971 10971 1.00000000000000e+00
+10972 10972 1.00000000000000e+00
+10973 10973 1.00000000000000e+00
+10974 10974 1.00000000000000e+00
+10975 10975 1.00000000000000e+00
+10976 10976 1.00000000000000e+00
+10977 10977 1.00000000000000e+00
+10978 10978 1.00000000000000e+00
+10979 10979 1.00000000000000e+00
+10980 10980 1.00000000000000e+00
+10981 10981 1.00000000000000e+00
+10982 10982 1.00000000000000e+00
+10983 10983 1.00000000000000e+00
+10984 10984 1.00000000000000e+00
+10985 10985 1.00000000000000e+00
+10986 10986 1.00000000000000e+00
+10987 10987 1.00000000000000e+00
+10988 10988 1.00000000000000e+00
+10989 10989 1.00000000000000e+00
+10990 10990 1.00000000000000e+00
+10991 10991 1.00000000000000e+00
+10992 10992 1.00000000000000e+00
+10993 10993 1.00000000000000e+00
+10994 10994 1.00000000000000e+00
+10995 10995 1.00000000000000e+00
+10996 10996 1.00000000000000e+00
+10997 10997 1.00000000000000e+00
+10998 10998 1.00000000000000e+00
+10999 10999 1.00000000000000e+00
+11000 11000 1.00000000000000e+00
+11001 11001 1.00000000000000e+00
+11002 11002 1.00000000000000e+00
+11003 11003 1.00000000000000e+00
+11004 11004 1.00000000000000e+00
+11005 11005 1.00000000000000e+00
+11006 11006 1.00000000000000e+00
+11007 11007 1.00000000000000e+00
+11008 11008 1.00000000000000e+00
+11009 11009 1.00000000000000e+00
+11010 11010 1.00000000000000e+00
+11011 11011 1.00000000000000e+00
+11012 11012 1.00000000000000e+00
+11013 9189 1.02677524531000e-09
+11013 9213 1.13653088228283e-05
+11013 9237 2.18137199729480e-05
+11013 9261 1.23556813447246e-06
+11013 9789 1.81867178720744e-04
+11013 9813 1.17535898769438e-02
+11013 9837 1.04734868936989e-02
+11013 9861 6.51068255958219e-04
+11013 9885 9.84462529829370e-07
+11013 9909 1.82940000000000e-16
+11013 10389 1.74906230975337e-04
+11013 10413 2.27218828907764e-02
+11013 10437 5.92060211873697e-02
+11013 10461 9.08688838913305e-03
+11013 10485 1.24828921303147e-06
+11013 10509 4.86770000000000e-16
+11013 11013 1.00019295784113e+00
+11013 11037 5.96412141363928e-03
+11013 11061 2.08212736614843e-03
+11013 11085 4.57242407563110e-07
+11013 11661 1.57623610900000e-11
+11013 11685 5.45496585000000e-12
+11013 20856 -1.97635568482042e-05
+11013 20880 -1.30941825009839e-04
+11013 20904 -2.27316425110601e-04
+11013 20928 -5.18975087942571e-05
+11013 20952 -2.47779430879000e-09
+11013 21264 -2.95310796217861e-03
+11013 21288 -1.58080846130479e-02
+11013 21312 -1.89372668443841e-02
+11013 21336 -4.00184406382054e-03
+11013 21360 -1.54782487178357e-06
+11013 21672 -5.76787102641979e-03
+11013 21696 -3.06995764510268e-02
+11013 21720 -3.62833187129939e-02
+11013 21744 -7.64040556608129e-03
+11013 21768 -3.07830518340561e-06
+11014 11014 1.00000000000000e+00
+11015 11015 1.00000000000000e+00
+11016 11016 1.00000000000000e+00
+11017 11017 1.00000000000000e+00
+11018 11018 1.00000000000000e+00
+11019 11019 1.00000000000000e+00
+11020 11020 1.00000000000000e+00
+11021 11021 1.00000000000000e+00
+11022 11022 1.00000000000000e+00
+11023 11023 1.00000000000000e+00
+11024 11024 1.00000000000000e+00
+11025 11025 1.00000000000000e+00
+11026 11026 1.00000000000000e+00
+11027 11027 1.00000000000000e+00
+11028 11028 1.00000000000000e+00
+11029 11029 1.00000000000000e+00
+11030 11030 1.00000000000000e+00
+11031 11031 1.00000000000000e+00
+11032 11032 1.00000000000000e+00
+11033 11033 1.00000000000000e+00
+11034 11034 1.00000000000000e+00
+11035 11035 1.00000000000000e+00
+11036 11036 1.00000000000000e+00
+11037 9189 4.08628167584000e-09
+11037 9213 6.46479002001124e-05
+11037 9237 4.20437398965713e-04
+11037 9261 9.38864787359760e-05
+11037 9789 7.12317907240400e-04
+11037 9813 6.99586949078888e-02
+11037 9837 2.29394337282826e-01
+11037 9861 7.91253656423249e-02
+11037 9885 4.48672969599122e-03
+11037 9909 1.44666009939136e-06
+11037 10389 6.84807729967551e-04
+11037 10413 2.51332964486061e-01
+11037 10437 3.00812933496058e+00
+11037 10461 2.93990643686119e+00
+11037 10485 1.26642207232519e-01
+11037 10509 2.27061860767542e-04
+11037 11037 1.87999395128718e+00
+11037 11013 5.96412141363928e-03
+11037 11061 2.24680920254791e+00
+11037 11085 1.92744512039683e-01
+11037 11109 2.73392609382720e-04
+11037 11661 1.67498720578755e-03
+11037 11685 3.63532297866538e-03
+11037 11709 2.00195419374288e-06
+11037 20856 -1.13643062235917e-04
+11037 20880 -6.34375125082238e-03
+11037 20904 -3.13274163014311e-02
+11037 20928 -3.69326044520869e-02
+11037 20952 -9.31784332562762e-03
+11037 20976 -4.15196523486822e-04
+11037 21264 -1.17009061321147e-02
+11037 21288 -2.18132430886979e-01
+11037 21312 -1.08493774795171e+00
+11037 21336 -1.73811843761455e+00
+11037 21360 -4.48334279241388e-01
+11037 21384 -1.51031657139685e-02
+11037 21672 -2.26063108285779e-02
+11037 21696 -3.91858603018202e-01
+11037 21720 -1.95058358179340e+00
+11037 21744 -3.21770864406448e+00
+11037 21768 -8.31443655203383e-01
+11037 21792 -2.72999557635293e-02
+11038 11038 1.00000000000000e+00
+11039 11039 1.00000000000000e+00
+11040 11040 1.00000000000000e+00
+11041 11041 1.00000000000000e+00
+11042 11042 1.00000000000000e+00
+11043 11043 1.00000000000000e+00
+11044 11044 1.00000000000000e+00
+11045 11045 1.00000000000000e+00
+11046 11046 1.00000000000000e+00
+11047 11047 1.00000000000000e+00
+11048 11048 1.00000000000000e+00
+11049 11049 1.00000000000000e+00
+11050 11050 1.00000000000000e+00
+11051 11051 1.00000000000000e+00
+11052 11052 1.00000000000000e+00
+11053 11053 1.00000000000000e+00
+11054 11054 1.00000000000000e+00
+11055 11055 1.00000000000000e+00
+11056 11056 1.00000000000000e+00
+11057 11057 1.00000000000000e+00
+11058 11058 1.00000000000000e+00
+11059 11059 1.00000000000000e+00
+11060 11060 1.00000000000000e+00
+11061 9189 1.83791670000000e-12
+11061 9213 7.77337397786240e-07
+11061 9237 1.97291361919340e-04
+11061 9261 2.69575548313881e-04
+11061 9285 1.46665177000233e-04
+11061 9309 5.63269850000820e-07
+11061 9789 2.76965240371860e-07
+11061 9813 9.82793053106761e-03
+11061 9837 1.34864340673861e-01
+11061 9861 2.53180377174207e-01
+11061 9885 8.83750882412706e-02
+11061 9909 4.31287933667580e-03
+11061 9933 9.75132400737256e-06
+11061 10389 2.65320809328760e-07
+11061 10413 6.52643325329225e-02
+11061 10437 4.59301705652270e+00
+11061 10461 1.20747408504985e+01
+11061 10485 3.20527510274188e+00
+11061 10509 1.01082040273076e-01
+11061 10533 2.14991453078897e-04
+11061 10557 1.01200000000000e-17
+11061 11061 1.65352612376495e+01
+11061 11013 2.08212736614843e-03
+11061 11037 2.24680920254791e+00
+11061 11085 9.26996687393163e+00
+11061 11109 4.11150698402198e-01
+11061 11133 1.84499564047513e-04
+11061 11157 6.14500000000000e-17
+11061 11661 1.57248436422921e-01
+11061 11685 7.56157576803397e-01
+11061 11709 1.33556506834834e-01
+11061 11733 6.16672890543132e-06
+11061 12285 3.19243961200000e-11
+11061 12309 2.17449701422430e-07
+11061 12333 3.84760914064500e-08
+11061 20496 -3.99843198830997e-04
+11061 20520 -3.81933610700300e-03
+11061 20544 -9.42561470530969e-03
+11061 20568 -2.80363635072955e-03
+11061 20592 -1.45918259762635e-04
+11061 20856 -1.83644152629410e-07
+11061 20880 -3.70637046823082e-03
+11061 20904 -6.49202412504783e-02
+11061 20928 -3.17500633505523e-01
+11061 20952 -5.14460043694643e-01
+11061 20976 -1.56376062952830e-01
+11061 21000 -1.07430284427306e-02
+11061 21024 -6.61515078038800e-08
+11061 21264 -5.06717717815112e-06
+11061 21288 -6.76799247529346e-02
+11061 21312 -1.58757384800460e+00
+11061 21336 -6.80856023493025e+00
+11061 21360 -7.40748823357025e+00
+11061 21384 -2.26455304050115e+00
+11061 21408 -1.97918336106535e-01
+11061 21432 -2.00170805911756e-05
+11061 21672 -8.84884528789634e-06
+11061 21696 -1.09415256228253e-01
+11061 21720 -2.73110193042546e+00
+11061 21744 -1.14939187741039e+01
+11061 21768 -1.14588221436160e+01
+11061 21792 -3.50736818545146e+00
+11061 21816 -3.24429347867784e-01
+11061 21840 -3.95711006277240e-05
+11062 11062 1.00000000000000e+00
+11063 11063 1.00000000000000e+00
+11064 11064 1.00000000000000e+00
+11065 11065 1.00000000000000e+00
+11066 11066 1.00000000000000e+00
+11067 11067 1.00000000000000e+00
+11068 11068 1.00000000000000e+00
+11069 11069 1.00000000000000e+00
+11070 11070 1.00000000000000e+00
+11071 11071 1.00000000000000e+00
+11072 11072 1.00000000000000e+00
+11073 11073 1.00000000000000e+00
+11074 11074 1.00000000000000e+00
+11075 11075 1.00000000000000e+00
+11076 11076 1.00000000000000e+00
+11077 11077 1.00000000000000e+00
+11078 11078 1.00000000000000e+00
+11079 11079 1.00000000000000e+00
+11080 11080 1.00000000000000e+00
+11081 11081 1.00000000000000e+00
+11082 11082 1.00000000000000e+00
+11083 11083 1.00000000000000e+00
+11084 11084 1.00000000000000e+00
+11085 9237 1.54657054999068e-06
+11085 9261 2.67866754088808e-04
+11085 9285 4.54537256974696e-04
+11085 9309 1.97278770701296e-05
+11085 9333 1.74930753381091e-06
+11085 9837 5.64636705605473e-03
+11085 9861 1.02243790726413e-01
+11085 9885 3.19728559420914e-01
+11085 9909 1.46585707143302e-01
+11085 9933 4.53171246542379e-03
+11085 9957 2.74962501930980e-06
+11085 10413 1.26615946688091e-06
+11085 10437 2.69689879613938e-01
+11085 10461 4.15240925190634e+00
+11085 10485 6.20292311079316e+00
+11085 10509 2.14495058601454e+00
+11085 10533 1.20597050544896e-01
+11085 10557 2.62041531254369e-04
+11085 10581 1.16118000000000e-15
+11085 11085 2.55581485016717e+01
+11085 11013 4.57242407563110e-07
+11085 11037 1.92744512039683e-01
+11085 11061 9.26996687393163e+00
+11085 11109 8.40787723111261e+00
+11085 11133 3.37952987363567e-01
+11085 11157 2.67258390988057e-04
+11085 11181 1.70813000000000e-15
+11085 11661 3.02172057297933e-01
+11085 11685 5.54000696248055e+00
+11085 11709 5.44645677899715e+00
+11085 11733 2.50073467614380e-01
+11085 11757 1.59825900986152e-04
+11085 12285 8.87219725627950e-07
+11085 12309 8.35456992673731e-03
+11085 12333 4.31692185634936e-03
+11085 12357 2.36590348617509e-06
+11085 20112 -2.45870515439590e-07
+11085 20136 -4.68209319752308e-05
+11085 20160 -1.93029350231713e-04
+11085 20184 -8.35721701630065e-05
+11085 20208 -9.43368006238351e-06
+11085 20496 -4.19575438955604e-04
+11085 20520 -2.38431983512818e-02
+11085 20544 -1.43573546139148e-01
+11085 20568 -2.48937627752015e-01
+11085 20592 -8.96751616157939e-02
+11085 20616 -8.79520094271833e-03
+11085 20640 -1.76489563238000e-09
+11085 20904 -9.12151484470005e-03
+11085 20928 -3.02877918445017e-01
+11085 20952 -1.52603805139536e+00
+11085 20976 -2.17167163998999e+00
+11085 21000 -8.51279404173917e-01
+11085 21024 -1.01470518843153e-01
+11085 21048 -3.96784765631889e-04
+11085 21312 -8.86963956974830e-02
+11085 21336 -1.88437508933354e+00
+11085 21360 -8.42168416152418e+00
+11085 21384 -1.11982184290237e+01
+11085 21408 -5.46128485173979e+00
+11085 21432 -8.34970990283484e-01
+11085 21456 -6.21525660309246e-03
+11085 21720 -1.24451148894911e-01
+11085 21744 -2.26850405724528e+00
+11085 21768 -9.88947253249705e+00
+11085 21792 -1.36483898526973e+01
+11085 21816 -7.28706157576696e+00
+11085 21840 -1.18740850620952e+00
+11085 21864 -9.65306573404814e-03
+11086 11086 1.00000000000000e+00
+11087 11087 1.00000000000000e+00
+11088 11088 1.00000000000000e+00
+11089 11089 1.00000000000000e+00
+11090 11090 1.00000000000000e+00
+11091 11091 1.00000000000000e+00
+11092 11092 1.00000000000000e+00
+11093 11093 1.00000000000000e+00
+11094 11094 1.00000000000000e+00
+11095 11095 1.00000000000000e+00
+11096 11096 1.00000000000000e+00
+11097 11097 1.00000000000000e+00
+11098 11098 1.00000000000000e+00
+11099 11099 1.00000000000000e+00
+11100 11100 1.00000000000000e+00
+11101 11101 1.00000000000000e+00
+11102 11102 1.00000000000000e+00
+11103 11103 1.00000000000000e+00
+11104 11104 1.00000000000000e+00
+11105 11105 1.00000000000000e+00
+11106 11106 1.00000000000000e+00
+11107 11107 1.00000000000000e+00
+11108 11108 1.00000000000000e+00
+11109 9261 8.73668005157836e-06
+11109 9285 1.17189641502781e-04
+11109 9309 6.35178349373478e-04
+11109 9333 9.19256200499717e-05
+11109 9837 3.96083470000000e-13
+11109 9861 5.85510262322295e-03
+11109 9885 1.48638855963742e-01
+11109 9909 3.28037469003487e-01
+11109 9933 1.04668459507660e-01
+11109 9957 5.70101788762034e-03
+11109 9981 6.81126937739491e-06
+11109 10437 2.02409678011774e-04
+11109 10461 1.01036021558392e-01
+11109 10485 2.20243939165187e+00
+11109 10509 6.03243372310670e+00
+11109 10533 2.69560330541548e+00
+11109 10557 1.38803384818406e-01
+11109 10581 2.12410211905868e-04
+11109 11109 1.79804363934455e+01
+11109 11037 2.73392609382720e-04
+11109 11061 4.11150698402198e-01
+11109 11085 8.40787723111261e+00
+11109 11133 6.00181058392082e+00
+11109 11157 3.83651946384836e-01
+11109 11181 4.30184941155486e-04
+11109 11661 3.70617261712412e-02
+11109 11685 3.62600246314944e+00
+11109 11709 1.12062297642637e+01
+11109 11733 3.14714061325170e+00
+11109 11757 9.86337930066215e-02
+11109 11781 1.55156966074487e-04
+11109 12285 1.86054858380156e-06
+11109 12309 9.79813381742778e-02
+11109 12333 1.55044360737332e-01
+11109 12357 7.50438699090538e-03
+11109 12381 4.80711473218400e-08
+11109 20112 -4.73650354579940e-07
+11109 20136 -1.98398564923316e-03
+11109 20160 -1.95621366677711e-02
+11109 20184 -5.17816687505501e-02
+11109 20208 -2.46988284185836e-02
+11109 20232 -3.26638239810662e-03
+11109 20520 -3.81608675529030e-03
+11109 20544 -1.31722113288676e-01
+11109 20568 -7.70581711034190e-01
+11109 20592 -1.42191071427146e+00
+11109 20616 -7.08432062787755e-01
+11109 20640 -1.04269346786886e-01
+11109 20664 -6.38658904575288e-04
+11109 20928 -2.05626619650528e-02
+11109 20952 -6.43339735310646e-01
+11109 20976 -3.63348164739573e+00
+11109 21000 -6.52746285474599e+00
+11109 21024 -3.34211054867218e+00
+11109 21048 -5.12343280474981e-01
+11109 21072 -5.05501392377803e-03
+11109 21336 -2.67141945964825e-02
+11109 21360 -9.28686431603799e-01
+11109 21384 -5.85915587839840e+00
+11109 21408 -1.17788140657174e+01
+11109 21432 -5.66644235563066e+00
+11109 21456 -8.37895207133347e-01
+11109 21480 -1.53507695888783e-02
+11109 21744 -8.66206699074882e-03
+11109 21768 -5.86323053563036e-01
+11109 21792 -4.42153745514200e+00
+11109 21816 -9.81224485046785e+00
+11109 21840 -3.96155814643512e+00
+11109 21864 -4.83551374784512e-01
+11109 21888 -1.19215732302678e-02
+11110 11110 1.00000000000000e+00
+11111 11111 1.00000000000000e+00
+11112 11112 1.00000000000000e+00
+11113 11113 1.00000000000000e+00
+11114 11114 1.00000000000000e+00
+11115 11115 1.00000000000000e+00
+11116 11116 1.00000000000000e+00
+11117 11117 1.00000000000000e+00
+11118 11118 1.00000000000000e+00
+11119 11119 1.00000000000000e+00
+11120 11120 1.00000000000000e+00
+11121 11121 1.00000000000000e+00
+11122 11122 1.00000000000000e+00
+11123 11123 1.00000000000000e+00
+11124 11124 1.00000000000000e+00
+11125 11125 1.00000000000000e+00
+11126 11126 1.00000000000000e+00
+11127 11127 1.00000000000000e+00
+11128 11128 1.00000000000000e+00
+11129 11129 1.00000000000000e+00
+11130 11130 1.00000000000000e+00
+11131 11131 1.00000000000000e+00
+11132 11132 1.00000000000000e+00
+11133 9285 1.40334369341953e-05
+11133 9309 1.86724261971482e-04
+11133 9333 1.52045374293928e-04
+11133 9357 1.33659463189933e-04
+11133 9381 8.42870972887720e-07
+11133 9861 1.66357890694850e-07
+11133 9885 4.53064416783996e-03
+11133 9909 1.19649369036847e-01
+11133 9933 3.25771669079225e-01
+11133 9957 1.17467751532462e-01
+11133 9981 3.35210990307824e-03
+11133 10005 1.53658882619254e-05
+11133 10461 1.14998784692895e-04
+11133 10485 1.03910226659851e-01
+11133 10509 2.67314736954836e+00
+11133 10533 6.72471884021658e+00
+11133 10557 2.77588105773611e+00
+11133 10581 1.63787166671295e-01
+11133 10605 9.87647472616887e-05
+11133 11133 1.81406348468679e+01
+11133 11061 1.84499564047513e-04
+11133 11085 3.37952987363567e-01
+11133 11109 6.00181058392082e+00
+11133 11157 7.60940118776593e+00
+11133 11181 3.88254869960630e-01
+11133 11205 3.23989771589726e-04
+11133 11661 6.61673559220383e-06
+11133 11685 1.36090564095548e-01
+11133 11709 2.68265796979808e+00
+11133 11733 5.96431524939496e+00
+11133 11757 2.68222047618861e+00
+11133 11781 1.15026971954092e-01
+11133 11805 1.28664970767168e-04
+11133 12285 1.76934258518450e-07
+11133 12309 5.66352263340686e-02
+11133 12333 2.98235611124608e-01
+11133 12357 1.09481969201778e-01
+11133 12381 4.32657486010509e-03
+11133 12933 5.18496828096320e-07
+11133 12957 3.30881342016391e-05
+11133 12981 4.55990495249583e-06
+11133 19752 -1.88711314146378e-05
+11133 19776 -1.29536421402409e-03
+11133 19800 -5.60829570506776e-03
+11133 19824 -4.05950296912945e-03
+11133 19848 -7.09905820190979e-04
+11133 20136 -4.73461040574712e-04
+11133 20160 -3.11108491462272e-02
+11133 20184 -2.45488223812452e-01
+11133 20208 -6.03687179371132e-01
+11133 20232 -3.75923620321781e-01
+11133 20256 -6.28594643042406e-02
+11133 20280 -2.44065315422997e-04
+11133 20544 -5.36026349040993e-03
+11133 20568 -2.92463126461187e-01
+11133 20592 -2.11930396500530e+00
+11133 20616 -4.89729124264465e+00
+11133 20640 -3.06527398950034e+00
+11133 20664 -5.38961450759760e-01
+11133 20688 -8.02848167036077e-03
+11133 20952 -1.45815447323941e-02
+11133 20976 -7.58041586363691e-01
+11133 21000 -5.28864690628313e+00
+11133 21024 -1.18093709731950e+01
+11133 21048 -7.34164664187936e+00
+11133 21072 -1.33316206270331e+00
+11133 21096 -3.10803560498793e-02
+11133 21360 -4.43604484561137e-03
+11133 21384 -4.08296859121552e-01
+11133 21408 -2.99889266328815e+00
+11133 21432 -6.68777816209343e+00
+11133 21456 -3.72278010225788e+00
+11133 21480 -6.38508544939168e-01
+11133 21504 -1.75666651323277e-02
+11133 21768 -2.42406379375072e-04
+11133 21792 -1.03422884076192e-01
+11133 21816 -7.35724208401048e-01
+11133 21840 -1.51207846681767e+00
+11133 21864 -7.56106341981185e-01
+11133 21888 -1.17498240106757e-01
+11133 21912 -2.63702574884997e-03
+11134 11134 1.00000000000000e+00
+11135 11135 1.00000000000000e+00
+11136 11136 1.00000000000000e+00
+11137 11137 1.00000000000000e+00
+11138 11138 1.00000000000000e+00
+11139 11139 1.00000000000000e+00
+11140 11140 1.00000000000000e+00
+11141 11141 1.00000000000000e+00
+11142 11142 1.00000000000000e+00
+11143 11143 1.00000000000000e+00
+11144 11144 1.00000000000000e+00
+11145 11145 1.00000000000000e+00
+11146 11146 1.00000000000000e+00
+11147 11147 1.00000000000000e+00
+11148 11148 1.00000000000000e+00
+11149 11149 1.00000000000000e+00
+11150 11150 1.00000000000000e+00
+11151 11151 1.00000000000000e+00
+11152 11152 1.00000000000000e+00
+11153 11153 1.00000000000000e+00
+11154 11154 1.00000000000000e+00
+11155 11155 1.00000000000000e+00
+11156 11156 1.00000000000000e+00
+11157 9309 2.40795486257658e-06
+11157 9333 2.64738694593928e-04
+11157 9357 5.42606048985629e-04
+11157 9381 2.10763663817737e-05
+11157 9405 1.08879937028273e-06
+11157 9885 1.07354659163106e-06
+11157 9909 3.37533779248334e-03
+11157 9933 1.30017308321321e-01
+11157 9957 3.05741013405653e-01
+11157 9981 1.35101238191692e-01
+11157 10005 3.49349886848903e-03
+11157 10029 1.43358216180985e-06
+11157 10485 1.40199035422934e-04
+11157 10509 1.29158141991555e-01
+11157 10533 2.77392916116140e+00
+11157 10557 7.22470846299940e+00
+11157 10581 2.30136421296787e+00
+11157 10605 1.11544915246483e-01
+11157 10629 1.11277923894418e-05
+11157 11157 1.85107007957694e+01
+11157 11061 6.14500000000000e-17
+11157 11085 2.67258390988057e-04
+11157 11109 3.83651946384836e-01
+11157 11133 7.60940118776593e+00
+11157 11181 5.81461242173274e+00
+11157 11205 2.78118470954529e-01
+11157 11229 8.97612361523910e-07
+11157 11661 3.85400000000000e-17
+11157 11685 2.33188526392936e-04
+11157 11709 1.04720627674973e-01
+11157 11733 2.64884504318024e+00
+11157 11757 6.98081283453382e+00
+11157 11781 3.09914208319482e+00
+11157 11805 4.82735193069447e-02
+11157 12285 1.91012521360000e-10
+11157 12309 2.93365015021255e-03
+11157 12333 9.08790737020028e-02
+11157 12357 2.79777465397493e-01
+11157 12381 1.29727964301456e-01
+11157 12933 3.19208832744835e-06
+11157 12957 3.54827271089055e-04
+11157 12981 7.20900767794635e-05
+11157 19392 -1.69759551982024e-05
+11157 19416 -8.75407316449926e-05
+11157 19440 -9.55235986069338e-05
+11157 19464 -1.96369108521828e-05
+11157 19752 -8.75431199719517e-06
+11157 19776 -5.15015269182182e-03
+11157 19800 -6.35762543224470e-02
+11157 19824 -1.94606147503332e-01
+11157 19848 -1.13112689805215e-01
+11157 19872 -2.05692093069994e-02
+11157 20160 -9.44207889060297e-04
+11157 20184 -1.09952822002811e-01
+11157 20208 -1.01738905164712e+00
+11157 20232 -2.67231919083987e+00
+11157 20256 -1.43888709538295e+00
+11157 20280 -3.00034719279313e-01
+11157 20568 -4.02285784986329e-03
+11157 20592 -4.60405244955113e-01
+11157 20616 -3.98187100407165e+00
+11157 20640 -1.00015592700934e+01
+11157 20664 -5.48334295921252e+00
+11157 20688 -1.28138291463893e+00
+11157 20976 -2.41855455161594e-03
+11157 21000 -4.87379513125287e-01
+11157 21024 -4.28313906253423e+00
+11157 21048 -1.09547396060211e+01
+11157 21072 -6.75754988964425e+00
+11157 21096 -1.79324213756294e+00
+11157 21384 -3.77341038477304e-04
+11157 21408 -1.24457816678196e-01
+11157 21432 -1.10467050991725e+00
+11157 21456 -2.84276194806433e+00
+11157 21480 -1.79211733908782e+00
+11157 21504 -4.70523537717542e-01
+11157 21792 -1.62243194400000e-11
+11157 21816 -6.72695047920776e-03
+11157 21840 -6.09452274392252e-02
+11157 21864 -1.57084032693365e-01
+11157 21888 -9.39954658147455e-02
+11157 21912 -2.04644255858383e-02
+11158 11158 1.00000000000000e+00
+11159 11159 1.00000000000000e+00
+11160 11160 1.00000000000000e+00
+11161 11161 1.00000000000000e+00
+11162 11162 1.00000000000000e+00
+11163 11163 1.00000000000000e+00
+11164 11164 1.00000000000000e+00
+11165 11165 1.00000000000000e+00
+11166 11166 1.00000000000000e+00
+11167 11167 1.00000000000000e+00
+11168 11168 1.00000000000000e+00
+11169 11169 1.00000000000000e+00
+11170 11170 1.00000000000000e+00
+11171 11171 1.00000000000000e+00
+11172 11172 1.00000000000000e+00
+11173 11173 1.00000000000000e+00
+11174 11174 1.00000000000000e+00
+11175 11175 1.00000000000000e+00
+11176 11176 1.00000000000000e+00
+11177 11177 1.00000000000000e+00
+11178 11178 1.00000000000000e+00
+11179 11179 1.00000000000000e+00
+11180 11180 1.00000000000000e+00
+11181 9333 6.98380998805087e-06
+11181 9357 1.01435749871591e-04
+11181 9381 4.71482473101208e-04
+11181 9405 1.28078995586540e-04
+11181 9909 2.33546346859171e-06
+11181 9933 3.14962360091577e-03
+11181 9957 1.41458480609622e-01
+11181 9981 2.84023234766724e-01
+11181 10005 1.65911619907652e-01
+11181 10029 9.74515294596646e-03
+11181 10509 7.38617469010419e-05
+11181 10533 1.59134713973784e-01
+11181 10557 2.28682142390914e+00
+11181 10581 8.30042343340740e+00
+11181 10605 6.37363411517340e+00
+11181 10629 2.29883960010643e-02
+11181 11181 2.52133658919617e+01
+11181 11085 1.70813000000000e-15
+11181 11109 4.30184941155486e-04
+11181 11133 3.88254869960630e-01
+11181 11157 5.81461242173274e+00
+11181 11205 8.47559702554716e+00
+11181 11229 5.01825510064327e-04
+11181 11685 2.37500000000000e-16
+11181 11709 2.94496133374704e-04
+11181 11733 1.37148490235065e-01
+11181 11757 3.76737230205428e+00
+11181 11781 9.91943451262152e+00
+11181 11805 6.74357737899526e-01
+11181 12309 5.17938663274511e-06
+11181 12333 2.98352467610327e-03
+11181 12357 2.45504972402688e-01
+11181 12381 3.21523235303077e-01
+11181 12933 7.09230616116300e-07
+11181 12957 1.80194811187148e-04
+11181 12981 4.59011807340390e-05
+11181 19392 -2.68364539589372e-04
+11181 19416 -7.88893963817180e-03
+11181 19440 -5.86754948615230e-02
+11181 19464 -6.91058902851671e-02
+11181 19776 -1.43822464621433e-04
+11181 19800 -3.63021842950985e-02
+11181 19824 -3.17162331399183e-01
+11181 19848 -1.92125528213321e+00
+11181 19872 -2.55228025707641e+00
+11181 20184 -7.66819923937583e-04
+11181 20208 -2.28262293221435e-01
+11181 20232 -1.76103804557894e+00
+11181 20256 -9.05696095074154e+00
+11181 20280 -1.16470936735658e+01
+11181 20592 -9.09969541231178e-04
+11181 20616 -4.02728245207732e-01
+11181 20640 -2.92410451374061e+00
+11181 20664 -1.16102424187957e+01
+11181 20688 -1.31344205713088e+01
+11181 21000 -1.91637324661208e-04
+11181 21024 -1.63888366341903e-01
+11181 21048 -1.39480511332762e+00
+11181 21072 -5.92201974611267e+00
+11181 21096 -6.32291240332932e+00
+11181 21408 -2.68148023391800e-08
+11181 21432 -1.94860308560985e-02
+11181 21456 -2.02228954966414e-01
+11181 21480 -9.48787970187869e-01
+11181 21504 -9.88607456833578e-01
+11181 21840 -7.56520811581522e-05
+11181 21864 -1.65556807285428e-03
+11181 21888 -8.34695865135758e-03
+11181 21912 -7.07189490284714e-03
+11182 11182 1.00000000000000e+00
+11183 11183 1.00000000000000e+00
+11184 11184 1.00000000000000e+00
+11185 11185 1.00000000000000e+00
+11186 11186 1.00000000000000e+00
+11187 11187 1.00000000000000e+00
+11188 11188 1.00000000000000e+00
+11189 11189 1.00000000000000e+00
+11190 11190 1.00000000000000e+00
+11191 11191 1.00000000000000e+00
+11192 11192 1.00000000000000e+00
+11193 11193 1.00000000000000e+00
+11194 11194 1.00000000000000e+00
+11195 11195 1.00000000000000e+00
+11196 11196 1.00000000000000e+00
+11197 11197 1.00000000000000e+00
+11198 11198 1.00000000000000e+00
+11199 11199 1.00000000000000e+00
+11200 11200 1.00000000000000e+00
+11201 11201 1.00000000000000e+00
+11202 11202 1.00000000000000e+00
+11203 11203 1.00000000000000e+00
+11204 11204 1.00000000000000e+00
+11205 8781 1.94460000000000e-16
+11205 8805 2.85680000000000e-16
+11205 9357 3.01784208052601e-06
+11205 9381 2.34927877494198e-04
+11205 9405 1.19958834153317e-04
+11205 9429 4.05234314351900e-08
+11205 9933 1.82413221143832e-06
+11205 9957 3.27777054418452e-03
+11205 9981 1.15120413221381e-01
+11205 10005 3.28881041915935e-01
+11205 10029 3.01114647711880e-02
+11205 10533 1.81715951490790e-05
+11205 10557 9.56967206476604e-02
+11205 10581 4.37323350928686e+00
+11205 10605 6.11383506306097e+00
+11205 10629 6.30109354465522e-02
+11205 11205 6.60889732475931e+00
+11205 11133 3.23989771589726e-04
+11205 11157 2.78118470954529e-01
+11205 11181 8.47559702554716e+00
+11205 11229 6.42960599027254e-04
+11205 11733 2.39044322190859e-04
+11205 11757 1.48862480810981e-01
+11205 11781 1.35780839835555e+00
+11205 11805 1.83378625356739e-01
+11205 12333 1.36192251944519e-06
+11205 12357 7.34843574811564e-03
+11205 12381 1.18136420444695e-02
+11205 19008 -1.37368931380000e-10
+11205 19032 -1.55434573406260e-07
+11205 19056 -3.09907564292870e-07
+11205 19392 -9.74644038470928e-06
+11205 19416 -7.04889861285736e-03
+11205 19440 -1.27735214090192e-01
+11205 19464 -2.06381545340386e-01
+11205 19800 -8.30543836997982e-05
+11205 19824 -6.26822243240935e-02
+11205 19848 -1.64156849315694e+00
+11205 19872 -2.84652083002141e+00
+11205 20208 -1.86284564303335e-04
+11205 20232 -1.57674992663912e-01
+11205 20256 -4.99269484567977e+00
+11205 20280 -8.88650814138403e+00
+11205 20616 -4.51231632600859e-05
+11205 20640 -8.56064705006757e-02
+11205 20664 -2.51925394366327e+00
+11205 20688 -4.44043579606656e+00
+11205 21024 -2.63635274781210e-07
+11205 21048 -1.42858512538468e-02
+11205 21072 -4.17890200361980e-01
+11205 21096 -7.35786296464176e-01
+11205 21456 -4.01571096527292e-04
+11205 21480 -1.88624550732948e-02
+11205 21504 -3.49139124708985e-02
+11206 11206 1.00000000000000e+00
+11207 11207 1.00000000000000e+00
+11208 11208 1.00000000000000e+00
+11209 11209 1.00000000000000e+00
+11210 11210 1.00000000000000e+00
+11211 11211 1.00000000000000e+00
+11212 11212 1.00000000000000e+00
+11213 11213 1.00000000000000e+00
+11214 11214 1.00000000000000e+00
+11215 11215 1.00000000000000e+00
+11216 11216 1.00000000000000e+00
+11217 11217 1.00000000000000e+00
+11218 11218 1.00000000000000e+00
+11219 11219 1.00000000000000e+00
+11220 11220 1.00000000000000e+00
+11221 11221 1.00000000000000e+00
+11222 11222 1.00000000000000e+00
+11223 11223 1.00000000000000e+00
+11224 11224 1.00000000000000e+00
+11225 11225 1.00000000000000e+00
+11226 11226 1.00000000000000e+00
+11227 11227 1.00000000000000e+00
+11228 11228 1.00000000000000e+00
+11229 8781 2.69600000000000e-17
+11229 8805 3.96000000000000e-17
+11229 9357 1.65361740000000e-13
+11229 9381 5.61618000186800e-08
+11229 9405 3.75230044358600e-08
+11229 9429 5.88890614340000e-09
+11229 9957 1.62635643746720e-07
+11229 9981 8.29054817407590e-05
+11229 10005 7.01132519780404e-04
+11229 10029 7.80904127106635e-05
+11229 10557 8.78103357304630e-07
+11229 10581 8.16320942124727e-04
+11229 10605 3.30908086177543e-03
+11229 10629 1.54671107146393e-04
+11229 11229 1.00000068632295e+00
+11229 11157 8.97612361523910e-07
+11229 11181 5.01825510064327e-04
+11229 11205 6.42960599027254e-04
+11229 11757 1.31921271842000e-09
+11229 11781 5.22093285751291e-06
+11229 11805 2.80088098136366e-06
+11229 19008 -1.90423473400000e-11
+11229 19032 -2.25852715468000e-08
+11229 19056 -4.50372466621900e-08
+11229 19416 -1.74276804760183e-06
+11229 19440 -2.69315925168934e-04
+11229 19464 -5.26432474004655e-04
+11229 19824 -7.17169031686497e-06
+11229 19848 -1.16143813803568e-03
+11229 19872 -2.27267444385331e-03
+11229 20232 -2.54630692488367e-06
+11229 20256 -6.07278449815352e-04
+11229 20280 -1.19673275115652e-03
+11229 20640 -2.00903761667800e-07
+11229 20664 -8.45132164331512e-05
+11229 20688 -1.67620106534628e-04
+11230 11230 1.00000000000000e+00
+11231 11231 1.00000000000000e+00
+11232 11232 1.00000000000000e+00
+11233 11233 1.00000000000000e+00
+11234 11234 1.00000000000000e+00
+11235 11235 1.00000000000000e+00
+11236 11236 1.00000000000000e+00
+11237 11237 1.00000000000000e+00
+11238 11238 1.00000000000000e+00
+11239 11239 1.00000000000000e+00
+11240 11240 1.00000000000000e+00
+11241 11241 1.00000000000000e+00
+11242 11242 1.00000000000000e+00
+11243 11243 1.00000000000000e+00
+11244 11244 1.00000000000000e+00
+11245 11245 1.00000000000000e+00
+11246 11246 1.00000000000000e+00
+11247 11247 1.00000000000000e+00
+11248 11248 1.00000000000000e+00
+11249 11249 1.00000000000000e+00
+11250 11250 1.00000000000000e+00
+11251 11251 1.00000000000000e+00
+11252 11252 1.00000000000000e+00
+11253 11253 1.00000000000000e+00
+11254 11254 1.00000000000000e+00
+11255 11255 1.00000000000000e+00
+11256 11256 1.00000000000000e+00
+11257 11257 1.00000000000000e+00
+11258 11258 1.00000000000000e+00
+11259 11259 1.00000000000000e+00
+11260 11260 1.00000000000000e+00
+11261 11261 1.00000000000000e+00
+11262 11262 1.00000000000000e+00
+11263 11263 1.00000000000000e+00
+11264 11264 1.00000000000000e+00
+11265 11265 1.00000000000000e+00
+11266 11266 1.00000000000000e+00
+11267 11267 1.00000000000000e+00
+11268 11268 1.00000000000000e+00
+11269 11269 1.00000000000000e+00
+11270 11270 1.00000000000000e+00
+11271 11271 1.00000000000000e+00
+11272 11272 1.00000000000000e+00
+11273 11273 1.00000000000000e+00
+11274 11274 1.00000000000000e+00
+11275 11275 1.00000000000000e+00
+11276 11276 1.00000000000000e+00
+11277 11277 1.00000000000000e+00
+11278 11278 1.00000000000000e+00
+11279 11279 1.00000000000000e+00
+11280 11280 1.00000000000000e+00
+11281 11281 1.00000000000000e+00
+11282 11282 1.00000000000000e+00
+11283 11283 1.00000000000000e+00
+11284 11284 1.00000000000000e+00
+11285 11285 1.00000000000000e+00
+11286 11286 1.00000000000000e+00
+11287 11287 1.00000000000000e+00
+11288 11288 1.00000000000000e+00
+11289 11289 1.00000000000000e+00
+11290 11290 1.00000000000000e+00
+11291 11291 1.00000000000000e+00
+11292 11292 1.00000000000000e+00
+11293 11293 1.00000000000000e+00
+11294 11294 1.00000000000000e+00
+11295 11295 1.00000000000000e+00
+11296 11296 1.00000000000000e+00
+11297 11297 1.00000000000000e+00
+11298 11298 1.00000000000000e+00
+11299 11299 1.00000000000000e+00
+11300 11300 1.00000000000000e+00
+11301 11301 1.00000000000000e+00
+11302 11302 1.00000000000000e+00
+11303 11303 1.00000000000000e+00
+11304 11304 1.00000000000000e+00
+11305 11305 1.00000000000000e+00
+11306 11306 1.00000000000000e+00
+11307 11307 1.00000000000000e+00
+11308 11308 1.00000000000000e+00
+11309 11309 1.00000000000000e+00
+11310 11310 1.00000000000000e+00
+11311 11311 1.00000000000000e+00
+11312 11312 1.00000000000000e+00
+11313 11313 1.00000000000000e+00
+11314 11314 1.00000000000000e+00
+11315 11315 1.00000000000000e+00
+11316 11316 1.00000000000000e+00
+11317 11317 1.00000000000000e+00
+11318 11318 1.00000000000000e+00
+11319 11319 1.00000000000000e+00
+11320 11320 1.00000000000000e+00
+11321 11321 1.00000000000000e+00
+11322 11322 1.00000000000000e+00
+11323 11323 1.00000000000000e+00
+11324 11324 1.00000000000000e+00
+11325 11325 1.00000000000000e+00
+11326 11326 1.00000000000000e+00
+11327 11327 1.00000000000000e+00
+11328 11328 1.00000000000000e+00
+11329 11329 1.00000000000000e+00
+11330 11330 1.00000000000000e+00
+11331 11331 1.00000000000000e+00
+11332 11332 1.00000000000000e+00
+11333 11333 1.00000000000000e+00
+11334 11334 1.00000000000000e+00
+11335 11335 1.00000000000000e+00
+11336 11336 1.00000000000000e+00
+11337 11337 1.00000000000000e+00
+11338 11338 1.00000000000000e+00
+11339 11339 1.00000000000000e+00
+11340 11340 1.00000000000000e+00
+11341 11341 1.00000000000000e+00
+11342 11342 1.00000000000000e+00
+11343 11343 1.00000000000000e+00
+11344 11344 1.00000000000000e+00
+11345 11345 1.00000000000000e+00
+11346 11346 1.00000000000000e+00
+11347 11347 1.00000000000000e+00
+11348 11348 1.00000000000000e+00
+11349 11349 1.00000000000000e+00
+11350 11350 1.00000000000000e+00
+11351 11351 1.00000000000000e+00
+11352 11352 1.00000000000000e+00
+11353 11353 1.00000000000000e+00
+11354 11354 1.00000000000000e+00
+11355 11355 1.00000000000000e+00
+11356 11356 1.00000000000000e+00
+11357 11357 1.00000000000000e+00
+11358 11358 1.00000000000000e+00
+11359 11359 1.00000000000000e+00
+11360 11360 1.00000000000000e+00
+11361 11361 1.00000000000000e+00
+11362 11362 1.00000000000000e+00
+11363 11363 1.00000000000000e+00
+11364 11364 1.00000000000000e+00
+11365 11365 1.00000000000000e+00
+11366 11366 1.00000000000000e+00
+11367 11367 1.00000000000000e+00
+11368 11368 1.00000000000000e+00
+11369 11369 1.00000000000000e+00
+11370 11370 1.00000000000000e+00
+11371 11371 1.00000000000000e+00
+11372 11372 1.00000000000000e+00
+11373 11373 1.00000000000000e+00
+11374 11374 1.00000000000000e+00
+11375 11375 1.00000000000000e+00
+11376 11376 1.00000000000000e+00
+11377 11377 1.00000000000000e+00
+11378 11378 1.00000000000000e+00
+11379 11379 1.00000000000000e+00
+11380 11380 1.00000000000000e+00
+11381 11381 1.00000000000000e+00
+11382 11382 1.00000000000000e+00
+11383 11383 1.00000000000000e+00
+11384 11384 1.00000000000000e+00
+11385 11385 1.00000000000000e+00
+11386 11386 1.00000000000000e+00
+11387 11387 1.00000000000000e+00
+11388 11388 1.00000000000000e+00
+11389 11389 1.00000000000000e+00
+11390 11390 1.00000000000000e+00
+11391 11391 1.00000000000000e+00
+11392 11392 1.00000000000000e+00
+11393 11393 1.00000000000000e+00
+11394 11394 1.00000000000000e+00
+11395 11395 1.00000000000000e+00
+11396 11396 1.00000000000000e+00
+11397 11397 1.00000000000000e+00
+11398 11398 1.00000000000000e+00
+11399 11399 1.00000000000000e+00
+11400 11400 1.00000000000000e+00
+11401 11401 1.00000000000000e+00
+11402 11402 1.00000000000000e+00
+11403 11403 1.00000000000000e+00
+11404 11404 1.00000000000000e+00
+11405 11405 1.00000000000000e+00
+11406 11406 1.00000000000000e+00
+11407 11407 1.00000000000000e+00
+11408 11408 1.00000000000000e+00
+11409 11409 1.00000000000000e+00
+11410 11410 1.00000000000000e+00
+11411 11411 1.00000000000000e+00
+11412 11412 1.00000000000000e+00
+11413 11413 1.00000000000000e+00
+11414 11414 1.00000000000000e+00
+11415 11415 1.00000000000000e+00
+11416 11416 1.00000000000000e+00
+11417 11417 1.00000000000000e+00
+11418 11418 1.00000000000000e+00
+11419 11419 1.00000000000000e+00
+11420 11420 1.00000000000000e+00
+11421 11421 1.00000000000000e+00
+11422 11422 1.00000000000000e+00
+11423 11423 1.00000000000000e+00
+11424 11424 1.00000000000000e+00
+11425 11425 1.00000000000000e+00
+11426 11426 1.00000000000000e+00
+11427 11427 1.00000000000000e+00
+11428 11428 1.00000000000000e+00
+11429 11429 1.00000000000000e+00
+11430 11430 1.00000000000000e+00
+11431 11431 1.00000000000000e+00
+11432 11432 1.00000000000000e+00
+11433 11433 1.00000000000000e+00
+11434 11434 1.00000000000000e+00
+11435 11435 1.00000000000000e+00
+11436 11436 1.00000000000000e+00
+11437 11437 1.00000000000000e+00
+11438 11438 1.00000000000000e+00
+11439 11439 1.00000000000000e+00
+11440 11440 1.00000000000000e+00
+11441 11441 1.00000000000000e+00
+11442 11442 1.00000000000000e+00
+11443 11443 1.00000000000000e+00
+11444 11444 1.00000000000000e+00
+11445 11445 1.00000000000000e+00
+11446 11446 1.00000000000000e+00
+11447 11447 1.00000000000000e+00
+11448 11448 1.00000000000000e+00
+11449 11449 1.00000000000000e+00
+11450 11450 1.00000000000000e+00
+11451 11451 1.00000000000000e+00
+11452 11452 1.00000000000000e+00
+11453 11453 1.00000000000000e+00
+11454 11454 1.00000000000000e+00
+11455 11455 1.00000000000000e+00
+11456 11456 1.00000000000000e+00
+11457 11457 1.00000000000000e+00
+11458 11458 1.00000000000000e+00
+11459 11459 1.00000000000000e+00
+11460 11460 1.00000000000000e+00
+11461 11461 1.00000000000000e+00
+11462 11462 1.00000000000000e+00
+11463 11463 1.00000000000000e+00
+11464 11464 1.00000000000000e+00
+11465 11465 1.00000000000000e+00
+11466 11466 1.00000000000000e+00
+11467 11467 1.00000000000000e+00
+11468 11468 1.00000000000000e+00
+11469 11469 1.00000000000000e+00
+11470 11470 1.00000000000000e+00
+11471 11471 1.00000000000000e+00
+11472 11472 1.00000000000000e+00
+11473 11473 1.00000000000000e+00
+11474 11474 1.00000000000000e+00
+11475 11475 1.00000000000000e+00
+11476 11476 1.00000000000000e+00
+11477 11477 1.00000000000000e+00
+11478 11478 1.00000000000000e+00
+11479 11479 1.00000000000000e+00
+11480 11480 1.00000000000000e+00
+11481 11481 1.00000000000000e+00
+11482 11482 1.00000000000000e+00
+11483 11483 1.00000000000000e+00
+11484 11484 1.00000000000000e+00
+11485 11485 1.00000000000000e+00
+11486 11486 1.00000000000000e+00
+11487 11487 1.00000000000000e+00
+11488 11488 1.00000000000000e+00
+11489 11489 1.00000000000000e+00
+11490 11490 1.00000000000000e+00
+11491 11491 1.00000000000000e+00
+11492 11492 1.00000000000000e+00
+11493 11493 1.00000000000000e+00
+11494 11494 1.00000000000000e+00
+11495 11495 1.00000000000000e+00
+11496 11496 1.00000000000000e+00
+11497 11497 1.00000000000000e+00
+11498 11498 1.00000000000000e+00
+11499 11499 1.00000000000000e+00
+11500 11500 1.00000000000000e+00
+11501 11501 1.00000000000000e+00
+11502 11502 1.00000000000000e+00
+11503 11503 1.00000000000000e+00
+11504 11504 1.00000000000000e+00
+11505 11505 1.00000000000000e+00
+11506 11506 1.00000000000000e+00
+11507 11507 1.00000000000000e+00
+11508 11508 1.00000000000000e+00
+11509 11509 1.00000000000000e+00
+11510 11510 1.00000000000000e+00
+11511 11511 1.00000000000000e+00
+11512 11512 1.00000000000000e+00
+11513 11513 1.00000000000000e+00
+11514 11514 1.00000000000000e+00
+11515 11515 1.00000000000000e+00
+11516 11516 1.00000000000000e+00
+11517 11517 1.00000000000000e+00
+11518 11518 1.00000000000000e+00
+11519 11519 1.00000000000000e+00
+11520 11520 1.00000000000000e+00
+11521 11521 1.00000000000000e+00
+11522 11522 1.00000000000000e+00
+11523 11523 1.00000000000000e+00
+11524 11524 1.00000000000000e+00
+11525 11525 1.00000000000000e+00
+11526 11526 1.00000000000000e+00
+11527 11527 1.00000000000000e+00
+11528 11528 1.00000000000000e+00
+11529 11529 1.00000000000000e+00
+11530 11530 1.00000000000000e+00
+11531 11531 1.00000000000000e+00
+11532 11532 1.00000000000000e+00
+11533 11533 1.00000000000000e+00
+11534 11534 1.00000000000000e+00
+11535 11535 1.00000000000000e+00
+11536 11536 1.00000000000000e+00
+11537 11537 1.00000000000000e+00
+11538 11538 1.00000000000000e+00
+11539 11539 1.00000000000000e+00
+11540 11540 1.00000000000000e+00
+11541 11541 1.00000000000000e+00
+11542 11542 1.00000000000000e+00
+11543 11543 1.00000000000000e+00
+11544 11544 1.00000000000000e+00
+11545 11545 1.00000000000000e+00
+11546 11546 1.00000000000000e+00
+11547 11547 1.00000000000000e+00
+11548 11548 1.00000000000000e+00
+11549 11549 1.00000000000000e+00
+11550 11550 1.00000000000000e+00
+11551 11551 1.00000000000000e+00
+11552 11552 1.00000000000000e+00
+11553 11553 1.00000000000000e+00
+11554 11554 1.00000000000000e+00
+11555 11555 1.00000000000000e+00
+11556 11556 1.00000000000000e+00
+11557 11557 1.00000000000000e+00
+11558 11558 1.00000000000000e+00
+11559 11559 1.00000000000000e+00
+11560 11560 1.00000000000000e+00
+11561 11561 1.00000000000000e+00
+11562 11562 1.00000000000000e+00
+11563 11563 1.00000000000000e+00
+11564 11564 1.00000000000000e+00
+11565 11565 1.00000000000000e+00
+11566 11566 1.00000000000000e+00
+11567 11567 1.00000000000000e+00
+11568 11568 1.00000000000000e+00
+11569 11569 1.00000000000000e+00
+11570 11570 1.00000000000000e+00
+11571 11571 1.00000000000000e+00
+11572 11572 1.00000000000000e+00
+11573 11573 1.00000000000000e+00
+11574 11574 1.00000000000000e+00
+11575 11575 1.00000000000000e+00
+11576 11576 1.00000000000000e+00
+11577 11577 1.00000000000000e+00
+11578 11578 1.00000000000000e+00
+11579 11579 1.00000000000000e+00
+11580 11580 1.00000000000000e+00
+11581 11581 1.00000000000000e+00
+11582 11582 1.00000000000000e+00
+11583 11583 1.00000000000000e+00
+11584 11584 1.00000000000000e+00
+11585 11585 1.00000000000000e+00
+11586 11586 1.00000000000000e+00
+11587 11587 1.00000000000000e+00
+11588 11588 1.00000000000000e+00
+11589 11589 1.00000000000000e+00
+11590 11590 1.00000000000000e+00
+11591 11591 1.00000000000000e+00
+11592 11592 1.00000000000000e+00
+11593 11593 1.00000000000000e+00
+11594 11594 1.00000000000000e+00
+11595 11595 1.00000000000000e+00
+11596 11596 1.00000000000000e+00
+11597 11597 1.00000000000000e+00
+11598 11598 1.00000000000000e+00
+11599 11599 1.00000000000000e+00
+11600 11600 1.00000000000000e+00
+11601 11601 1.00000000000000e+00
+11602 11602 1.00000000000000e+00
+11603 11603 1.00000000000000e+00
+11604 11604 1.00000000000000e+00
+11605 11605 1.00000000000000e+00
+11606 11606 1.00000000000000e+00
+11607 11607 1.00000000000000e+00
+11608 11608 1.00000000000000e+00
+11609 11609 1.00000000000000e+00
+11610 11610 1.00000000000000e+00
+11611 11611 1.00000000000000e+00
+11612 11612 1.00000000000000e+00
+11613 11613 1.00000000000000e+00
+11614 11614 1.00000000000000e+00
+11615 11615 1.00000000000000e+00
+11616 11616 1.00000000000000e+00
+11617 11617 1.00000000000000e+00
+11618 11618 1.00000000000000e+00
+11619 11619 1.00000000000000e+00
+11620 11620 1.00000000000000e+00
+11621 11621 1.00000000000000e+00
+11622 11622 1.00000000000000e+00
+11623 11623 1.00000000000000e+00
+11624 11624 1.00000000000000e+00
+11625 11625 1.00000000000000e+00
+11626 11626 1.00000000000000e+00
+11627 11627 1.00000000000000e+00
+11628 11628 1.00000000000000e+00
+11629 11629 1.00000000000000e+00
+11630 11630 1.00000000000000e+00
+11631 11631 1.00000000000000e+00
+11632 11632 1.00000000000000e+00
+11633 11633 1.00000000000000e+00
+11634 11634 1.00000000000000e+00
+11635 11635 1.00000000000000e+00
+11636 11636 1.00000000000000e+00
+11637 11637 1.00000000000000e+00
+11638 11638 1.00000000000000e+00
+11639 11639 1.00000000000000e+00
+11640 11640 1.00000000000000e+00
+11641 11641 1.00000000000000e+00
+11642 11642 1.00000000000000e+00
+11643 11643 1.00000000000000e+00
+11644 11644 1.00000000000000e+00
+11645 11645 1.00000000000000e+00
+11646 11646 1.00000000000000e+00
+11647 11647 1.00000000000000e+00
+11648 11648 1.00000000000000e+00
+11649 11649 1.00000000000000e+00
+11650 11650 1.00000000000000e+00
+11651 11651 1.00000000000000e+00
+11652 11652 1.00000000000000e+00
+11653 11653 1.00000000000000e+00
+11654 11654 1.00000000000000e+00
+11655 11655 1.00000000000000e+00
+11656 11656 1.00000000000000e+00
+11657 11657 1.00000000000000e+00
+11658 11658 1.00000000000000e+00
+11659 11659 1.00000000000000e+00
+11660 11660 1.00000000000000e+00
+11661 9237 4.22030000000000e-16
+11661 9261 1.17839000000000e-15
+11661 9837 4.47785888509600e-08
+11661 9861 6.26332162683858e-05
+11661 9885 1.00310287655637e-04
+11661 9909 1.32826164813374e-06
+11661 10413 4.36402672700000e-11
+11661 10437 9.81314367921176e-04
+11661 10461 4.60996910959797e-02
+11661 10485 3.21160075323196e-02
+11661 10509 1.60503283768706e-03
+11661 10533 3.07268247464823e-06
+11661 10557 6.35000000000000e-18
+11661 11661 1.00509671531337e+00
+11661 11013 1.57623610900000e-11
+11661 11037 1.67498720578755e-03
+11661 11061 1.57248436422921e-01
+11661 11085 3.02172057297933e-01
+11661 11109 3.70617261712412e-02
+11661 11133 6.61673559220383e-06
+11661 11157 3.85400000000000e-17
+11661 11685 5.97228003932015e-02
+11661 11709 1.55949680715281e-02
+11661 11733 4.17426610680301e-06
+11661 12285 2.16381754700000e-11
+11661 12309 1.47384460888310e-07
+11661 12333 2.60784759250900e-08
+11661 20904 -1.38577897776000e-09
+11661 20928 -2.63309666699969e-04
+11661 20952 -1.35262437329917e-03
+11661 20976 -1.46097158628629e-03
+11661 21000 -2.99572453049506e-04
+11661 21024 -4.14899663859000e-08
+11661 21312 -2.02792477156877e-06
+11661 21336 -1.77902210357934e-02
+11661 21360 -9.11000637037612e-02
+11661 21384 -9.76740571613049e-02
+11661 21408 -2.00238148159737e-02
+11661 21432 -1.35540959531512e-05
+11661 21720 -4.04614909029319e-06
+11661 21744 -3.37372744046870e-02
+11661 21768 -1.72731756794428e-01
+11661 21792 -1.85121313218606e-01
+11661 21816 -3.79506224606009e-02
+11661 21840 -2.68177621416010e-05
+11662 11662 1.00000000000000e+00
+11663 11663 1.00000000000000e+00
+11664 11664 1.00000000000000e+00
+11665 11665 1.00000000000000e+00
+11666 11666 1.00000000000000e+00
+11667 11667 1.00000000000000e+00
+11668 11668 1.00000000000000e+00
+11669 11669 1.00000000000000e+00
+11670 11670 1.00000000000000e+00
+11671 11671 1.00000000000000e+00
+11672 11672 1.00000000000000e+00
+11673 11673 1.00000000000000e+00
+11674 11674 1.00000000000000e+00
+11675 11675 1.00000000000000e+00
+11676 11676 1.00000000000000e+00
+11677 11677 1.00000000000000e+00
+11678 11678 1.00000000000000e+00
+11679 11679 1.00000000000000e+00
+11680 11680 1.00000000000000e+00
+11681 11681 1.00000000000000e+00
+11682 11682 1.00000000000000e+00
+11683 11683 1.00000000000000e+00
+11684 11684 1.00000000000000e+00
+11685 9237 1.50650000000000e-16
+11685 9261 4.20640000000000e-16
+11685 9837 1.55053844990900e-08
+11685 9861 2.13322127890798e-04
+11685 9885 4.39095393213606e-04
+11685 9909 2.27667645083759e-05
+11685 9933 2.46575223213170e-07
+11685 9957 7.79578600000000e-14
+11685 10413 1.51028246000000e-11
+11685 10437 2.12411346181353e-03
+11685 10461 1.27588687451486e-01
+11685 10485 2.74020269122430e-01
+11685 10509 8.90814666278496e-02
+11685 10533 4.58947816494339e-03
+11685 10557 1.65821052232090e-07
+11685 10581 1.61450000000000e-16
+11685 11685 3.46517180999967e+00
+11685 11013 5.45496585000000e-12
+11685 11037 3.63532297866538e-03
+11685 11061 7.56157576803397e-01
+11685 11085 5.54000696248055e+00
+11685 11109 3.62600246314944e+00
+11685 11133 1.36090564095548e-01
+11685 11157 2.33188526392936e-04
+11685 11181 2.37500000000000e-16
+11685 11661 5.97228003932015e-02
+11685 11709 4.34538569436183e+00
+11685 11733 2.74929435139312e-01
+11685 11757 3.47698256597035e-04
+11685 12285 8.87085011605820e-07
+11685 12309 1.38154135506738e-02
+11685 12333 1.20671885798256e-02
+11685 12357 7.67643334023939e-06
+11685 20544 -4.00202380170130e-07
+11685 20568 -4.35062775778452e-06
+11685 20592 -1.13997207202421e-05
+11685 20616 -2.75079980372756e-06
+11685 20640 -2.45391655890000e-10
+11685 20904 -4.94664904690000e-10
+11685 20928 -8.96387949988684e-04
+11685 20952 -1.69311411195081e-02
+11685 20976 -7.17232553767068e-02
+11685 21000 -8.38121177760756e-02
+11685 21024 -2.01988474371421e-02
+11685 21048 -6.88591247467987e-04
+11685 21312 -7.01874925208500e-07
+11685 21336 -3.98978040899721e-02
+11685 21360 -5.54951980889249e-01
+11685 21384 -2.21730298722647e+00
+11685 21408 -2.79768642905928e+00
+11685 21432 -6.70418245275547e-01
+11685 21456 -1.86238563130767e-02
+11685 21720 -1.40028719608415e-06
+11685 21744 -7.35208925300235e-02
+11685 21768 -9.91396379203825e-01
+11685 21792 -3.93265630313768e+00
+11685 21816 -5.00898442642475e+00
+11685 21840 -1.19951607928600e+00
+11685 21864 -3.24275802740605e-02
+11686 11686 1.00000000000000e+00
+11687 11687 1.00000000000000e+00
+11688 11688 1.00000000000000e+00
+11689 11689 1.00000000000000e+00
+11690 11690 1.00000000000000e+00
+11691 11691 1.00000000000000e+00
+11692 11692 1.00000000000000e+00
+11693 11693 1.00000000000000e+00
+11694 11694 1.00000000000000e+00
+11695 11695 1.00000000000000e+00
+11696 11696 1.00000000000000e+00
+11697 11697 1.00000000000000e+00
+11698 11698 1.00000000000000e+00
+11699 11699 1.00000000000000e+00
+11700 11700 1.00000000000000e+00
+11701 11701 1.00000000000000e+00
+11702 11702 1.00000000000000e+00
+11703 11703 1.00000000000000e+00
+11704 11704 1.00000000000000e+00
+11705 11705 1.00000000000000e+00
+11706 11706 1.00000000000000e+00
+11707 11707 1.00000000000000e+00
+11708 11708 1.00000000000000e+00
+11709 9837 1.81280000000000e-16
+11709 9861 6.93965276951360e-07
+11709 9885 6.44276186536676e-05
+11709 9909 4.72542549108700e-04
+11709 9933 1.93604114647195e-04
+11709 9957 2.19087640160000e-10
+11709 10437 1.18392864123266e-06
+11709 10461 8.70653938089642e-03
+11709 10485 1.18442951526064e-01
+11709 10509 2.61946729281470e-01
+11709 10533 9.51566419060030e-02
+11709 10557 7.20183881084140e-03
+11709 10581 7.44503075326079e-06
+11709 11709 2.13447489157988e+01
+11709 11037 2.00195419374288e-06
+11709 11061 1.33556506834834e-01
+11709 11085 5.44645677899715e+00
+11709 11109 1.12062297642637e+01
+11709 11133 2.68265796979808e+00
+11709 11157 1.04720627674973e-01
+11709 11181 2.94496133374704e-04
+11709 11661 1.55949680715281e-02
+11709 11685 4.34538569436183e+00
+11709 11733 9.78199297230575e+00
+11709 11757 4.95673214491815e-01
+11709 11781 2.53629710191415e-04
+11709 12285 4.40213679917649e-06
+11709 12309 5.82260908100801e-01
+11709 12333 1.82785208832576e+00
+11709 12357 2.76648894908264e-01
+11709 12381 8.82040844097468e-06
+11709 12933 1.28205453431020e-07
+11709 12957 3.44776521549207e-06
+11709 12981 2.84965056096500e-07
+11709 20544 -4.68162706606939e-06
+11709 20568 -2.36456528890266e-03
+11709 20592 -1.62745062553772e-02
+11709 20616 -3.02687018810005e-02
+11709 20640 -8.39440981508395e-03
+11709 20664 -3.76985077331582e-04
+11709 20928 -2.33755502357585e-06
+11709 20952 -7.17949674489176e-03
+11709 20976 -1.34464897613047e-01
+11709 21000 -5.98577294457409e-01
+11709 21024 -7.93553797255210e-01
+11709 21048 -2.26898724073120e-01
+11709 21072 -1.46556642943472e-02
+11709 21096 -2.12346769668860e-07
+11709 21336 -2.89818847393758e-05
+11709 21360 -1.24352589445779e-01
+11709 21384 -2.29622406868509e+00
+11709 21408 -8.81234700362130e+00
+11709 21432 -8.06189223988961e+00
+11709 21456 -2.68385561620031e+00
+11709 21480 -2.98294215297041e-01
+11709 21504 -2.91886673369895e-05
+11709 21744 -4.16008843137206e-05
+11709 21768 -1.98570423981034e-01
+11709 21792 -3.71267255159031e+00
+11709 21816 -1.38577901086805e+01
+11709 21840 -1.13558941478987e+01
+11709 21864 -3.99767481908096e+00
+11709 21888 -5.03800392544273e-01
+11709 21912 -5.68909072862970e-05
+11710 11710 1.00000000000000e+00
+11711 11711 1.00000000000000e+00
+11712 11712 1.00000000000000e+00
+11713 11713 1.00000000000000e+00
+11714 11714 1.00000000000000e+00
+11715 11715 1.00000000000000e+00
+11716 11716 1.00000000000000e+00
+11717 11717 1.00000000000000e+00
+11718 11718 1.00000000000000e+00
+11719 11719 1.00000000000000e+00
+11720 11720 1.00000000000000e+00
+11721 11721 1.00000000000000e+00
+11722 11722 1.00000000000000e+00
+11723 11723 1.00000000000000e+00
+11724 11724 1.00000000000000e+00
+11725 11725 1.00000000000000e+00
+11726 11726 1.00000000000000e+00
+11727 11727 1.00000000000000e+00
+11728 11728 1.00000000000000e+00
+11729 11729 1.00000000000000e+00
+11730 11730 1.00000000000000e+00
+11731 11731 1.00000000000000e+00
+11732 11732 1.00000000000000e+00
+11733 9861 2.19544460000000e-13
+11733 9885 1.89409891545976e-06
+11733 9909 3.60350842428268e-04
+11733 9933 2.31229553062058e-04
+11733 9957 7.51344158719147e-05
+11733 9981 3.03133255660094e-06
+11733 10461 1.50853894583000e-09
+11733 10485 5.34094459172515e-03
+11733 10509 1.10751375218823e-01
+11733 10533 3.90074702897652e-01
+11733 10557 1.58330381854052e-01
+11733 10581 3.82984705123414e-03
+11733 10605 5.17228162006560e-06
+11733 11733 2.74181977528599e+01
+11733 11061 6.16672890543132e-06
+11733 11085 2.50073467614380e-01
+11733 11109 3.14714061325170e+00
+11733 11133 5.96431524939496e+00
+11733 11157 2.64884504318024e+00
+11733 11181 1.37148490235065e-01
+11733 11205 2.39044322190859e-04
+11733 11661 4.17426610680301e-06
+11733 11685 2.74929435139312e-01
+11733 11709 9.78199297230575e+00
+11733 11757 7.14083795988917e+00
+11733 11781 2.82792704146813e-01
+11733 11805 1.95371943844978e-04
+11733 12285 1.47101733658942e-06
+11733 12309 9.54978556178088e-01
+11733 12333 9.52331039881188e+00
+11733 12357 4.49687532096037e+00
+11733 12381 1.45416647043242e-01
+11733 12933 1.07228177540040e-03
+11733 12957 3.06976858560494e-02
+11733 12981 2.79091754131947e-03
+11733 20184 -3.40800829606925e-05
+11733 20208 -7.23038149697048e-04
+11733 20232 -2.41565249248572e-03
+11733 20256 -7.25522370285958e-04
+11733 20280 -3.47011381079200e-05
+11733 20544 -1.96062915748000e-09
+11733 20568 -1.81463814625547e-03
+11733 20592 -5.81648819907614e-02
+11733 20616 -3.15687715384833e-01
+11733 20640 -5.04462076015953e-01
+11733 20664 -1.60508309066116e-01
+11733 20688 -1.25654930568511e-02
+11733 20952 -1.44727600551000e-08
+11733 20976 -2.09752511183683e-02
+11733 21000 -5.06189018822980e-01
+11733 21024 -2.41236416441370e+00
+11733 21048 -3.33774787695744e+00
+11733 21072 -1.13078752502035e+00
+11733 21096 -1.11494712416177e-01
+11733 21360 -2.84816028581600e-08
+11733 21384 -1.16854240285129e-01
+11733 21408 -1.99097178969356e+00
+11733 21432 -9.03319033806789e+00
+11733 21456 -1.32830061635964e+01
+11733 21480 -4.72007968522776e+00
+11733 21504 -4.98997919341157e-01
+11733 21768 -6.63024342517000e-09
+11733 21792 -1.34062314544322e-01
+11733 21816 -1.94760161133886e+00
+11733 21840 -9.31757742472487e+00
+11733 21864 -1.60834728731345e+01
+11733 21888 -5.62748706111437e+00
+11733 21912 -5.40869660850736e-01
+11734 11734 1.00000000000000e+00
+11735 11735 1.00000000000000e+00
+11736 11736 1.00000000000000e+00
+11737 11737 1.00000000000000e+00
+11738 11738 1.00000000000000e+00
+11739 11739 1.00000000000000e+00
+11740 11740 1.00000000000000e+00
+11741 11741 1.00000000000000e+00
+11742 11742 1.00000000000000e+00
+11743 11743 1.00000000000000e+00
+11744 11744 1.00000000000000e+00
+11745 11745 1.00000000000000e+00
+11746 11746 1.00000000000000e+00
+11747 11747 1.00000000000000e+00
+11748 11748 1.00000000000000e+00
+11749 11749 1.00000000000000e+00
+11750 11750 1.00000000000000e+00
+11751 11751 1.00000000000000e+00
+11752 11752 1.00000000000000e+00
+11753 11753 1.00000000000000e+00
+11754 11754 1.00000000000000e+00
+11755 11755 1.00000000000000e+00
+11756 11756 1.00000000000000e+00
+11757 9909 2.13656657686164e-06
+11757 9933 1.53185448900642e-04
+11757 9957 8.42968691652782e-04
+11757 9981 4.77661153452615e-05
+11757 10005 1.44369951344170e-07
+11757 10029 2.76977475000000e-12
+11757 10509 7.60696239971812e-03
+11757 10533 1.65476629083145e-01
+11757 10557 3.44526895845701e-01
+11757 10581 1.06494160843875e-01
+11757 10605 8.22857654823490e-03
+11757 10629 1.26524962030200e-08
+11757 11757 1.87919716657752e+01
+11757 11085 1.59825900986152e-04
+11757 11109 9.86337930066215e-02
+11757 11133 2.68222047618861e+00
+11757 11157 6.98081283453382e+00
+11757 11181 3.76737230205428e+00
+11757 11205 1.48862480810981e-01
+11757 11229 1.31921271842000e-09
+11757 11685 3.47698256597035e-04
+11757 11709 4.95673214491815e-01
+11757 11733 7.14083795988917e+00
+11757 11781 1.09723187831802e+01
+11757 11805 9.43953024244384e-02
+11757 12285 2.22990279934000e-09
+11757 12309 1.02332936930006e-01
+11757 12333 3.15491505639749e+00
+11757 12357 1.07535791920089e+01
+11757 12381 3.18335899755204e+00
+11757 12933 2.07534537618316e-03
+11757 12957 1.30411080783787e-01
+11757 12981 2.33776633015672e-02
+11757 19824 -6.05285648237210e-07
+11757 19848 -5.73103372691863e-06
+11757 19872 -7.22506791617681e-06
+11757 20184 -4.71154979898957e-05
+11757 20208 -9.50245677540129e-03
+11757 20232 -5.51496939522473e-02
+11757 20256 -1.07496598483684e-01
+11757 20280 -7.14390121570512e-02
+11757 20592 -8.24395122984993e-03
+11757 20616 -2.65653515247327e-01
+11757 20640 -1.32287667106875e+00
+11757 20664 -2.39548250059466e+00
+11757 20688 -1.63815643084313e+00
+11757 21000 -3.82846590392077e-02
+11757 21024 -1.07744492518084e+00
+11757 21048 -5.27654274785924e+00
+11757 21072 -9.88798952076332e+00
+11757 21096 -7.14013593441091e+00
+11757 21408 -3.30507753107737e-02
+11757 21432 -1.10367230428958e+00
+11757 21456 -5.66071931761937e+00
+11757 21480 -1.13396010740800e+01
+11757 21504 -8.54372163120845e+00
+11757 21816 -7.88146601817165e-03
+11757 21840 -6.50483221529850e-01
+11757 21864 -3.43113164804858e+00
+11757 21888 -5.32072509957004e+00
+11757 21912 -2.77159021881346e+00
+11758 11758 1.00000000000000e+00
+11759 11759 1.00000000000000e+00
+11760 11760 1.00000000000000e+00
+11761 11761 1.00000000000000e+00
+11762 11762 1.00000000000000e+00
+11763 11763 1.00000000000000e+00
+11764 11764 1.00000000000000e+00
+11765 11765 1.00000000000000e+00
+11766 11766 1.00000000000000e+00
+11767 11767 1.00000000000000e+00
+11768 11768 1.00000000000000e+00
+11769 11769 1.00000000000000e+00
+11770 11770 1.00000000000000e+00
+11771 11771 1.00000000000000e+00
+11772 11772 1.00000000000000e+00
+11773 11773 1.00000000000000e+00
+11774 11774 1.00000000000000e+00
+11775 11775 1.00000000000000e+00
+11776 11776 1.00000000000000e+00
+11777 11777 1.00000000000000e+00
+11778 11778 1.00000000000000e+00
+11779 11779 1.00000000000000e+00
+11780 11780 1.00000000000000e+00
+11781 9933 1.78071334005424e-05
+11781 9957 1.72881141110550e-04
+11781 9981 3.73082498911604e-04
+11781 10005 2.73574244309951e-04
+11781 10029 1.07430315361200e-08
+11781 10509 1.80315251593800e-08
+11781 10533 5.91766666038578e-03
+11781 10557 1.02944973256488e-01
+11781 10581 3.98093749650452e-01
+11781 10605 1.56701631720252e-01
+11781 10629 4.99765527714176e-05
+11781 11781 2.09499843293948e+01
+11781 11109 1.55156966074487e-04
+11781 11133 1.15026971954092e-01
+11781 11157 3.09914208319482e+00
+11781 11181 9.91943451262152e+00
+11781 11205 1.35780839835555e+00
+11781 11229 5.22093285751291e-06
+11781 11709 2.53629710191415e-04
+11781 11733 2.82792704146813e-01
+11781 11757 1.09723187831802e+01
+11781 11805 4.31840613477196e-01
+11781 12309 1.74314569669896e-05
+11781 12333 1.27181616251696e-01
+11781 12357 4.64065275503826e+00
+11781 12381 2.93723459434113e+00
+11781 12933 2.13706456323187e-04
+11781 12957 4.36793967859309e-02
+11781 12981 1.06727575900902e-02
+11781 19824 -2.64700801715133e-04
+11781 19848 -1.42217084326016e-02
+11781 19872 -2.65905112531973e-02
+11781 20208 -1.76545037455339e-03
+11781 20232 -4.67880445595058e-02
+11781 20256 -6.32999049357007e-01
+11781 20280 -9.84383496535862e-01
+11781 20616 -1.29804131789670e-02
+11781 20640 -3.82150713253396e-01
+11781 20664 -4.52174059881908e+00
+11781 20688 -6.70591694751751e+00
+11781 21024 -2.56556343381740e-02
+11781 21048 -8.81159512977845e-01
+11781 21072 -1.01045841424134e+01
+11781 21096 -1.47080981867743e+01
+11781 21432 -6.78156064318154e-03
+11781 21456 -3.64114134599640e-01
+11781 21480 -5.11981516898445e+00
+11781 21504 -7.86715197249411e+00
+11781 21840 -2.15737240607039e-04
+11781 21864 -5.34115908914647e-02
+11781 21888 -8.20147575343330e-01
+11781 21912 -1.27202318270219e+00
+11782 11782 1.00000000000000e+00
+11783 11783 1.00000000000000e+00
+11784 11784 1.00000000000000e+00
+11785 11785 1.00000000000000e+00
+11786 11786 1.00000000000000e+00
+11787 11787 1.00000000000000e+00
+11788 11788 1.00000000000000e+00
+11789 11789 1.00000000000000e+00
+11790 11790 1.00000000000000e+00
+11791 11791 1.00000000000000e+00
+11792 11792 1.00000000000000e+00
+11793 11793 1.00000000000000e+00
+11794 11794 1.00000000000000e+00
+11795 11795 1.00000000000000e+00
+11796 11796 1.00000000000000e+00
+11797 11797 1.00000000000000e+00
+11798 11798 1.00000000000000e+00
+11799 11799 1.00000000000000e+00
+11800 11800 1.00000000000000e+00
+11801 11801 1.00000000000000e+00
+11802 11802 1.00000000000000e+00
+11803 11803 1.00000000000000e+00
+11804 11804 1.00000000000000e+00
+11805 9957 6.07076150326421e-06
+11805 9981 1.48757014544792e-04
+11805 10005 1.38667055159870e-04
+11805 10029 5.75738267860000e-09
+11805 10533 4.13083515611120e-07
+11805 10557 2.48600030779962e-03
+11805 10581 5.71113368287785e-02
+11805 10605 4.59222211420490e-02
+11805 10629 2.68083483975965e-05
+11805 11805 1.03178973644449e+00
+11805 11133 1.28664970767168e-04
+11805 11157 4.82735193069447e-02
+11805 11181 6.74357737899526e-01
+11805 11205 1.83378625356739e-01
+11805 11229 2.80088098136366e-06
+11805 11733 1.95371943844978e-04
+11805 11757 9.43953024244384e-02
+11805 11781 4.31840613477196e-01
+11805 12333 1.25052203376239e-06
+11805 12357 9.22890593948986e-03
+11805 12381 1.48846185431126e-02
+11805 19824 -8.40619835414275e-05
+11805 19848 -7.39950019853648e-03
+11805 19872 -1.42105665122830e-02
+11805 20232 -1.54634762008407e-03
+11805 20256 -9.08396678634940e-02
+11805 20280 -1.70854902386400e-01
+11805 20640 -5.29244362974420e-03
+11805 20664 -2.75622480796949e-01
+11805 20688 -5.14197856185687e-01
+11805 21048 -2.68203129603574e-03
+11805 21072 -1.54266916353426e-01
+11805 21096 -2.89759613634602e-01
+11805 21456 -3.67982902529346e-04
+11805 21480 -2.32563123210195e-02
+11805 21504 -4.39367443243335e-02
+11806 11806 1.00000000000000e+00
+11807 11807 1.00000000000000e+00
+11808 11808 1.00000000000000e+00
+11809 11809 1.00000000000000e+00
+11810 11810 1.00000000000000e+00
+11811 11811 1.00000000000000e+00
+11812 11812 1.00000000000000e+00
+11813 11813 1.00000000000000e+00
+11814 11814 1.00000000000000e+00
+11815 11815 1.00000000000000e+00
+11816 11816 1.00000000000000e+00
+11817 11817 1.00000000000000e+00
+11818 11818 1.00000000000000e+00
+11819 11819 1.00000000000000e+00
+11820 11820 1.00000000000000e+00
+11821 11821 1.00000000000000e+00
+11822 11822 1.00000000000000e+00
+11823 11823 1.00000000000000e+00
+11824 11824 1.00000000000000e+00
+11825 11825 1.00000000000000e+00
+11826 11826 1.00000000000000e+00
+11827 11827 1.00000000000000e+00
+11828 11828 1.00000000000000e+00
+11829 11829 1.00000000000000e+00
+11830 11830 1.00000000000000e+00
+11831 11831 1.00000000000000e+00
+11832 11832 1.00000000000000e+00
+11833 11833 1.00000000000000e+00
+11834 11834 1.00000000000000e+00
+11835 11835 1.00000000000000e+00
+11836 11836 1.00000000000000e+00
+11837 11837 1.00000000000000e+00
+11838 11838 1.00000000000000e+00
+11839 11839 1.00000000000000e+00
+11840 11840 1.00000000000000e+00
+11841 11841 1.00000000000000e+00
+11842 11842 1.00000000000000e+00
+11843 11843 1.00000000000000e+00
+11844 11844 1.00000000000000e+00
+11845 11845 1.00000000000000e+00
+11846 11846 1.00000000000000e+00
+11847 11847 1.00000000000000e+00
+11848 11848 1.00000000000000e+00
+11849 11849 1.00000000000000e+00
+11850 11850 1.00000000000000e+00
+11851 11851 1.00000000000000e+00
+11852 11852 1.00000000000000e+00
+11853 11853 1.00000000000000e+00
+11854 11854 1.00000000000000e+00
+11855 11855 1.00000000000000e+00
+11856 11856 1.00000000000000e+00
+11857 11857 1.00000000000000e+00
+11858 11858 1.00000000000000e+00
+11859 11859 1.00000000000000e+00
+11860 11860 1.00000000000000e+00
+11861 11861 1.00000000000000e+00
+11862 11862 1.00000000000000e+00
+11863 11863 1.00000000000000e+00
+11864 11864 1.00000000000000e+00
+11865 11865 1.00000000000000e+00
+11866 11866 1.00000000000000e+00
+11867 11867 1.00000000000000e+00
+11868 11868 1.00000000000000e+00
+11869 11869 1.00000000000000e+00
+11870 11870 1.00000000000000e+00
+11871 11871 1.00000000000000e+00
+11872 11872 1.00000000000000e+00
+11873 11873 1.00000000000000e+00
+11874 11874 1.00000000000000e+00
+11875 11875 1.00000000000000e+00
+11876 11876 1.00000000000000e+00
+11877 11877 1.00000000000000e+00
+11878 11878 1.00000000000000e+00
+11879 11879 1.00000000000000e+00
+11880 11880 1.00000000000000e+00
+11881 11881 1.00000000000000e+00
+11882 11882 1.00000000000000e+00
+11883 11883 1.00000000000000e+00
+11884 11884 1.00000000000000e+00
+11885 11885 1.00000000000000e+00
+11886 11886 1.00000000000000e+00
+11887 11887 1.00000000000000e+00
+11888 11888 1.00000000000000e+00
+11889 11889 1.00000000000000e+00
+11890 11890 1.00000000000000e+00
+11891 11891 1.00000000000000e+00
+11892 11892 1.00000000000000e+00
+11893 11893 1.00000000000000e+00
+11894 11894 1.00000000000000e+00
+11895 11895 1.00000000000000e+00
+11896 11896 1.00000000000000e+00
+11897 11897 1.00000000000000e+00
+11898 11898 1.00000000000000e+00
+11899 11899 1.00000000000000e+00
+11900 11900 1.00000000000000e+00
+11901 11901 1.00000000000000e+00
+11902 11902 1.00000000000000e+00
+11903 11903 1.00000000000000e+00
+11904 11904 1.00000000000000e+00
+11905 11905 1.00000000000000e+00
+11906 11906 1.00000000000000e+00
+11907 11907 1.00000000000000e+00
+11908 11908 1.00000000000000e+00
+11909 11909 1.00000000000000e+00
+11910 11910 1.00000000000000e+00
+11911 11911 1.00000000000000e+00
+11912 11912 1.00000000000000e+00
+11913 11913 1.00000000000000e+00
+11914 11914 1.00000000000000e+00
+11915 11915 1.00000000000000e+00
+11916 11916 1.00000000000000e+00
+11917 11917 1.00000000000000e+00
+11918 11918 1.00000000000000e+00
+11919 11919 1.00000000000000e+00
+11920 11920 1.00000000000000e+00
+11921 11921 1.00000000000000e+00
+11922 11922 1.00000000000000e+00
+11923 11923 1.00000000000000e+00
+11924 11924 1.00000000000000e+00
+11925 11925 1.00000000000000e+00
+11926 11926 1.00000000000000e+00
+11927 11927 1.00000000000000e+00
+11928 11928 1.00000000000000e+00
+11929 11929 1.00000000000000e+00
+11930 11930 1.00000000000000e+00
+11931 11931 1.00000000000000e+00
+11932 11932 1.00000000000000e+00
+11933 11933 1.00000000000000e+00
+11934 11934 1.00000000000000e+00
+11935 11935 1.00000000000000e+00
+11936 11936 1.00000000000000e+00
+11937 11937 1.00000000000000e+00
+11938 11938 1.00000000000000e+00
+11939 11939 1.00000000000000e+00
+11940 11940 1.00000000000000e+00
+11941 11941 1.00000000000000e+00
+11942 11942 1.00000000000000e+00
+11943 11943 1.00000000000000e+00
+11944 11944 1.00000000000000e+00
+11945 11945 1.00000000000000e+00
+11946 11946 1.00000000000000e+00
+11947 11947 1.00000000000000e+00
+11948 11948 1.00000000000000e+00
+11949 11949 1.00000000000000e+00
+11950 11950 1.00000000000000e+00
+11951 11951 1.00000000000000e+00
+11952 11952 1.00000000000000e+00
+11953 11953 1.00000000000000e+00
+11954 11954 1.00000000000000e+00
+11955 11955 1.00000000000000e+00
+11956 11956 1.00000000000000e+00
+11957 11957 1.00000000000000e+00
+11958 11958 1.00000000000000e+00
+11959 11959 1.00000000000000e+00
+11960 11960 1.00000000000000e+00
+11961 11961 1.00000000000000e+00
+11962 11962 1.00000000000000e+00
+11963 11963 1.00000000000000e+00
+11964 11964 1.00000000000000e+00
+11965 11965 1.00000000000000e+00
+11966 11966 1.00000000000000e+00
+11967 11967 1.00000000000000e+00
+11968 11968 1.00000000000000e+00
+11969 11969 1.00000000000000e+00
+11970 11970 1.00000000000000e+00
+11971 11971 1.00000000000000e+00
+11972 11972 1.00000000000000e+00
+11973 11973 1.00000000000000e+00
+11974 11974 1.00000000000000e+00
+11975 11975 1.00000000000000e+00
+11976 11976 1.00000000000000e+00
+11977 11977 1.00000000000000e+00
+11978 11978 1.00000000000000e+00
+11979 11979 1.00000000000000e+00
+11980 11980 1.00000000000000e+00
+11981 11981 1.00000000000000e+00
+11982 11982 1.00000000000000e+00
+11983 11983 1.00000000000000e+00
+11984 11984 1.00000000000000e+00
+11985 11985 1.00000000000000e+00
+11986 11986 1.00000000000000e+00
+11987 11987 1.00000000000000e+00
+11988 11988 1.00000000000000e+00
+11989 11989 1.00000000000000e+00
+11990 11990 1.00000000000000e+00
+11991 11991 1.00000000000000e+00
+11992 11992 1.00000000000000e+00
+11993 11993 1.00000000000000e+00
+11994 11994 1.00000000000000e+00
+11995 11995 1.00000000000000e+00
+11996 11996 1.00000000000000e+00
+11997 11997 1.00000000000000e+00
+11998 11998 1.00000000000000e+00
+11999 11999 1.00000000000000e+00
+12000 12000 1.00000000000000e+00
+12001 12001 1.00000000000000e+00
+12002 12002 1.00000000000000e+00
+12003 12003 1.00000000000000e+00
+12004 12004 1.00000000000000e+00
+12005 12005 1.00000000000000e+00
+12006 12006 1.00000000000000e+00
+12007 12007 1.00000000000000e+00
+12008 12008 1.00000000000000e+00
+12009 12009 1.00000000000000e+00
+12010 12010 1.00000000000000e+00
+12011 12011 1.00000000000000e+00
+12012 12012 1.00000000000000e+00
+12013 12013 1.00000000000000e+00
+12014 12014 1.00000000000000e+00
+12015 12015 1.00000000000000e+00
+12016 12016 1.00000000000000e+00
+12017 12017 1.00000000000000e+00
+12018 12018 1.00000000000000e+00
+12019 12019 1.00000000000000e+00
+12020 12020 1.00000000000000e+00
+12021 12021 1.00000000000000e+00
+12022 12022 1.00000000000000e+00
+12023 12023 1.00000000000000e+00
+12024 12024 1.00000000000000e+00
+12025 12025 1.00000000000000e+00
+12026 12026 1.00000000000000e+00
+12027 12027 1.00000000000000e+00
+12028 12028 1.00000000000000e+00
+12029 12029 1.00000000000000e+00
+12030 12030 1.00000000000000e+00
+12031 12031 1.00000000000000e+00
+12032 12032 1.00000000000000e+00
+12033 12033 1.00000000000000e+00
+12034 12034 1.00000000000000e+00
+12035 12035 1.00000000000000e+00
+12036 12036 1.00000000000000e+00
+12037 12037 1.00000000000000e+00
+12038 12038 1.00000000000000e+00
+12039 12039 1.00000000000000e+00
+12040 12040 1.00000000000000e+00
+12041 12041 1.00000000000000e+00
+12042 12042 1.00000000000000e+00
+12043 12043 1.00000000000000e+00
+12044 12044 1.00000000000000e+00
+12045 12045 1.00000000000000e+00
+12046 12046 1.00000000000000e+00
+12047 12047 1.00000000000000e+00
+12048 12048 1.00000000000000e+00
+12049 12049 1.00000000000000e+00
+12050 12050 1.00000000000000e+00
+12051 12051 1.00000000000000e+00
+12052 12052 1.00000000000000e+00
+12053 12053 1.00000000000000e+00
+12054 12054 1.00000000000000e+00
+12055 12055 1.00000000000000e+00
+12056 12056 1.00000000000000e+00
+12057 12057 1.00000000000000e+00
+12058 12058 1.00000000000000e+00
+12059 12059 1.00000000000000e+00
+12060 12060 1.00000000000000e+00
+12061 12061 1.00000000000000e+00
+12062 12062 1.00000000000000e+00
+12063 12063 1.00000000000000e+00
+12064 12064 1.00000000000000e+00
+12065 12065 1.00000000000000e+00
+12066 12066 1.00000000000000e+00
+12067 12067 1.00000000000000e+00
+12068 12068 1.00000000000000e+00
+12069 12069 1.00000000000000e+00
+12070 12070 1.00000000000000e+00
+12071 12071 1.00000000000000e+00
+12072 12072 1.00000000000000e+00
+12073 12073 1.00000000000000e+00
+12074 12074 1.00000000000000e+00
+12075 12075 1.00000000000000e+00
+12076 12076 1.00000000000000e+00
+12077 12077 1.00000000000000e+00
+12078 12078 1.00000000000000e+00
+12079 12079 1.00000000000000e+00
+12080 12080 1.00000000000000e+00
+12081 12081 1.00000000000000e+00
+12082 12082 1.00000000000000e+00
+12083 12083 1.00000000000000e+00
+12084 12084 1.00000000000000e+00
+12085 12085 1.00000000000000e+00
+12086 12086 1.00000000000000e+00
+12087 12087 1.00000000000000e+00
+12088 12088 1.00000000000000e+00
+12089 12089 1.00000000000000e+00
+12090 12090 1.00000000000000e+00
+12091 12091 1.00000000000000e+00
+12092 12092 1.00000000000000e+00
+12093 12093 1.00000000000000e+00
+12094 12094 1.00000000000000e+00
+12095 12095 1.00000000000000e+00
+12096 12096 1.00000000000000e+00
+12097 12097 1.00000000000000e+00
+12098 12098 1.00000000000000e+00
+12099 12099 1.00000000000000e+00
+12100 12100 1.00000000000000e+00
+12101 12101 1.00000000000000e+00
+12102 12102 1.00000000000000e+00
+12103 12103 1.00000000000000e+00
+12104 12104 1.00000000000000e+00
+12105 12105 1.00000000000000e+00
+12106 12106 1.00000000000000e+00
+12107 12107 1.00000000000000e+00
+12108 12108 1.00000000000000e+00
+12109 12109 1.00000000000000e+00
+12110 12110 1.00000000000000e+00
+12111 12111 1.00000000000000e+00
+12112 12112 1.00000000000000e+00
+12113 12113 1.00000000000000e+00
+12114 12114 1.00000000000000e+00
+12115 12115 1.00000000000000e+00
+12116 12116 1.00000000000000e+00
+12117 12117 1.00000000000000e+00
+12118 12118 1.00000000000000e+00
+12119 12119 1.00000000000000e+00
+12120 12120 1.00000000000000e+00
+12121 12121 1.00000000000000e+00
+12122 12122 1.00000000000000e+00
+12123 12123 1.00000000000000e+00
+12124 12124 1.00000000000000e+00
+12125 12125 1.00000000000000e+00
+12126 12126 1.00000000000000e+00
+12127 12127 1.00000000000000e+00
+12128 12128 1.00000000000000e+00
+12129 12129 1.00000000000000e+00
+12130 12130 1.00000000000000e+00
+12131 12131 1.00000000000000e+00
+12132 12132 1.00000000000000e+00
+12133 12133 1.00000000000000e+00
+12134 12134 1.00000000000000e+00
+12135 12135 1.00000000000000e+00
+12136 12136 1.00000000000000e+00
+12137 12137 1.00000000000000e+00
+12138 12138 1.00000000000000e+00
+12139 12139 1.00000000000000e+00
+12140 12140 1.00000000000000e+00
+12141 12141 1.00000000000000e+00
+12142 12142 1.00000000000000e+00
+12143 12143 1.00000000000000e+00
+12144 12144 1.00000000000000e+00
+12145 12145 1.00000000000000e+00
+12146 12146 1.00000000000000e+00
+12147 12147 1.00000000000000e+00
+12148 12148 1.00000000000000e+00
+12149 12149 1.00000000000000e+00
+12150 12150 1.00000000000000e+00
+12151 12151 1.00000000000000e+00
+12152 12152 1.00000000000000e+00
+12153 12153 1.00000000000000e+00
+12154 12154 1.00000000000000e+00
+12155 12155 1.00000000000000e+00
+12156 12156 1.00000000000000e+00
+12157 12157 1.00000000000000e+00
+12158 12158 1.00000000000000e+00
+12159 12159 1.00000000000000e+00
+12160 12160 1.00000000000000e+00
+12161 12161 1.00000000000000e+00
+12162 12162 1.00000000000000e+00
+12163 12163 1.00000000000000e+00
+12164 12164 1.00000000000000e+00
+12165 12165 1.00000000000000e+00
+12166 12166 1.00000000000000e+00
+12167 12167 1.00000000000000e+00
+12168 12168 1.00000000000000e+00
+12169 12169 1.00000000000000e+00
+12170 12170 1.00000000000000e+00
+12171 12171 1.00000000000000e+00
+12172 12172 1.00000000000000e+00
+12173 12173 1.00000000000000e+00
+12174 12174 1.00000000000000e+00
+12175 12175 1.00000000000000e+00
+12176 12176 1.00000000000000e+00
+12177 12177 1.00000000000000e+00
+12178 12178 1.00000000000000e+00
+12179 12179 1.00000000000000e+00
+12180 12180 1.00000000000000e+00
+12181 12181 1.00000000000000e+00
+12182 12182 1.00000000000000e+00
+12183 12183 1.00000000000000e+00
+12184 12184 1.00000000000000e+00
+12185 12185 1.00000000000000e+00
+12186 12186 1.00000000000000e+00
+12187 12187 1.00000000000000e+00
+12188 12188 1.00000000000000e+00
+12189 12189 1.00000000000000e+00
+12190 12190 1.00000000000000e+00
+12191 12191 1.00000000000000e+00
+12192 12192 1.00000000000000e+00
+12193 12193 1.00000000000000e+00
+12194 12194 1.00000000000000e+00
+12195 12195 1.00000000000000e+00
+12196 12196 1.00000000000000e+00
+12197 12197 1.00000000000000e+00
+12198 12198 1.00000000000000e+00
+12199 12199 1.00000000000000e+00
+12200 12200 1.00000000000000e+00
+12201 12201 1.00000000000000e+00
+12202 12202 1.00000000000000e+00
+12203 12203 1.00000000000000e+00
+12204 12204 1.00000000000000e+00
+12205 12205 1.00000000000000e+00
+12206 12206 1.00000000000000e+00
+12207 12207 1.00000000000000e+00
+12208 12208 1.00000000000000e+00
+12209 12209 1.00000000000000e+00
+12210 12210 1.00000000000000e+00
+12211 12211 1.00000000000000e+00
+12212 12212 1.00000000000000e+00
+12213 12213 1.00000000000000e+00
+12214 12214 1.00000000000000e+00
+12215 12215 1.00000000000000e+00
+12216 12216 1.00000000000000e+00
+12217 12217 1.00000000000000e+00
+12218 12218 1.00000000000000e+00
+12219 12219 1.00000000000000e+00
+12220 12220 1.00000000000000e+00
+12221 12221 1.00000000000000e+00
+12222 12222 1.00000000000000e+00
+12223 12223 1.00000000000000e+00
+12224 12224 1.00000000000000e+00
+12225 12225 1.00000000000000e+00
+12226 12226 1.00000000000000e+00
+12227 12227 1.00000000000000e+00
+12228 12228 1.00000000000000e+00
+12229 12229 1.00000000000000e+00
+12230 12230 1.00000000000000e+00
+12231 12231 1.00000000000000e+00
+12232 12232 1.00000000000000e+00
+12233 12233 1.00000000000000e+00
+12234 12234 1.00000000000000e+00
+12235 12235 1.00000000000000e+00
+12236 12236 1.00000000000000e+00
+12237 12237 1.00000000000000e+00
+12238 12238 1.00000000000000e+00
+12239 12239 1.00000000000000e+00
+12240 12240 1.00000000000000e+00
+12241 12241 1.00000000000000e+00
+12242 12242 1.00000000000000e+00
+12243 12243 1.00000000000000e+00
+12244 12244 1.00000000000000e+00
+12245 12245 1.00000000000000e+00
+12246 12246 1.00000000000000e+00
+12247 12247 1.00000000000000e+00
+12248 12248 1.00000000000000e+00
+12249 12249 1.00000000000000e+00
+12250 12250 1.00000000000000e+00
+12251 12251 1.00000000000000e+00
+12252 12252 1.00000000000000e+00
+12253 12253 1.00000000000000e+00
+12254 12254 1.00000000000000e+00
+12255 12255 1.00000000000000e+00
+12256 12256 1.00000000000000e+00
+12257 12257 1.00000000000000e+00
+12258 12258 1.00000000000000e+00
+12259 12259 1.00000000000000e+00
+12260 12260 1.00000000000000e+00
+12261 12261 1.00000000000000e+00
+12262 12262 1.00000000000000e+00
+12263 12263 1.00000000000000e+00
+12264 12264 1.00000000000000e+00
+12265 12265 1.00000000000000e+00
+12266 12266 1.00000000000000e+00
+12267 12267 1.00000000000000e+00
+12268 12268 1.00000000000000e+00
+12269 12269 1.00000000000000e+00
+12270 12270 1.00000000000000e+00
+12271 12271 1.00000000000000e+00
+12272 12272 1.00000000000000e+00
+12273 12273 1.00000000000000e+00
+12274 12274 1.00000000000000e+00
+12275 12275 1.00000000000000e+00
+12276 12276 1.00000000000000e+00
+12277 12277 1.00000000000000e+00
+12278 12278 1.00000000000000e+00
+12279 12279 1.00000000000000e+00
+12280 12280 1.00000000000000e+00
+12281 12281 1.00000000000000e+00
+12282 12282 1.00000000000000e+00
+12283 12283 1.00000000000000e+00
+12284 12284 1.00000000000000e+00
+12285 10485 8.85453302770000e-10
+12285 10509 9.32791876860000e-10
+12285 10533 7.31269937100000e-11
+12285 10557 3.55340800000000e-14
+12285 12285 1.00000000000106e+00
+12285 11061 3.19243961200000e-11
+12285 11085 8.87219725627950e-07
+12285 11109 1.86054858380156e-06
+12285 11133 1.76934258518450e-07
+12285 11157 1.91012521360000e-10
+12285 11661 2.16381754700000e-11
+12285 11685 8.87085011605820e-07
+12285 11709 4.40213679917649e-06
+12285 11733 1.47101733658942e-06
+12285 11757 2.22990279934000e-09
+12285 12309 1.23430727922290e-07
+12285 12333 1.65206772175230e-07
+12285 12357 1.09086417370000e-10
+12285 20976 -1.71538377450000e-10
+12285 21000 -9.70816716290000e-10
+12285 21024 -1.31019120337000e-09
+12285 21048 -2.84663206480000e-10
+12285 21384 -3.15062376914760e-07
+12285 21408 -1.50043593642075e-06
+12285 21432 -1.27580809196157e-06
+12285 21456 -2.40186428761700e-07
+12285 21792 -6.28923985187350e-07
+12285 21816 -2.99407615582745e-06
+12285 21840 -2.54244484549957e-06
+12285 21864 -4.78380215078060e-07
+12286 12286 1.00000000000000e+00
+12287 12287 1.00000000000000e+00
+12288 12288 1.00000000000000e+00
+12289 12289 1.00000000000000e+00
+12290 12290 1.00000000000000e+00
+12291 12291 1.00000000000000e+00
+12292 12292 1.00000000000000e+00
+12293 12293 1.00000000000000e+00
+12294 12294 1.00000000000000e+00
+12295 12295 1.00000000000000e+00
+12296 12296 1.00000000000000e+00
+12297 12297 1.00000000000000e+00
+12298 12298 1.00000000000000e+00
+12299 12299 1.00000000000000e+00
+12300 12300 1.00000000000000e+00
+12301 12301 1.00000000000000e+00
+12302 12302 1.00000000000000e+00
+12303 12303 1.00000000000000e+00
+12304 12304 1.00000000000000e+00
+12305 12305 1.00000000000000e+00
+12306 12306 1.00000000000000e+00
+12307 12307 1.00000000000000e+00
+12308 12308 1.00000000000000e+00
+12309 10485 9.01164771458703e-06
+12309 10509 1.51134942095437e-04
+12309 10533 1.60494948635369e-04
+12309 10557 2.08930460891830e-07
+12309 12309 1.05242261230147e+00
+12309 11061 2.17449701422430e-07
+12309 11085 8.35456992673731e-03
+12309 11109 9.79813381742778e-02
+12309 11133 5.66352263340686e-02
+12309 11157 2.93365015021255e-03
+12309 11181 5.17938663274511e-06
+12309 11661 1.47384460888310e-07
+12309 11685 1.38154135506738e-02
+12309 11709 5.82260908100801e-01
+12309 11733 9.54978556178088e-01
+12309 11757 1.02332936930006e-01
+12309 11781 1.74314569669896e-05
+12309 12285 1.23430727922290e-07
+12309 12333 3.57682624143033e-01
+12309 12357 7.50878594565664e-02
+12309 12381 1.01894477122363e-05
+12309 12933 1.52197706490330e-07
+12309 12957 4.09279816281600e-06
+12309 12981 3.38261348833680e-07
+12309 20976 -1.01389756552504e-05
+12309 21000 -1.52551360576183e-03
+12309 21024 -7.02520703206134e-03
+12309 21048 -5.78613424267495e-03
+12309 21072 -1.07614750049479e-03
+12309 21096 -2.27564163003300e-07
+12309 21384 -2.18156224160933e-03
+12309 21408 -6.68357069655338e-02
+12309 21432 -3.07481855106406e-01
+12309 21456 -3.49593855422128e-01
+12309 21480 -7.30006766659733e-02
+12309 21504 -3.45539493907805e-05
+12309 21792 -4.29215165363190e-03
+12309 21816 -1.22992818690735e-01
+12309 21840 -5.65787260988382e-01
+12309 21864 -6.58684771145532e-01
+12309 21888 -1.38468320828483e-01
+12309 21912 -6.75149496405379e-05
+12310 12310 1.00000000000000e+00
+12311 12311 1.00000000000000e+00
+12312 12312 1.00000000000000e+00
+12313 12313 1.00000000000000e+00
+12314 12314 1.00000000000000e+00
+12315 12315 1.00000000000000e+00
+12316 12316 1.00000000000000e+00
+12317 12317 1.00000000000000e+00
+12318 12318 1.00000000000000e+00
+12319 12319 1.00000000000000e+00
+12320 12320 1.00000000000000e+00
+12321 12321 1.00000000000000e+00
+12322 12322 1.00000000000000e+00
+12323 12323 1.00000000000000e+00
+12324 12324 1.00000000000000e+00
+12325 12325 1.00000000000000e+00
+12326 12326 1.00000000000000e+00
+12327 12327 1.00000000000000e+00
+12328 12328 1.00000000000000e+00
+12329 12329 1.00000000000000e+00
+12330 12330 1.00000000000000e+00
+12331 12331 1.00000000000000e+00
+12332 12332 1.00000000000000e+00
+12333 10485 1.76345157057961e-06
+12333 10509 2.98307779105633e-04
+12333 10533 3.90821018534082e-04
+12333 10557 3.87416569810695e-05
+12333 10581 1.85443126627644e-06
+12333 12333 6.56924940955753e+00
+12333 11061 3.84760914064500e-08
+12333 11085 4.31692185634936e-03
+12333 11109 1.55044360737332e-01
+12333 11133 2.98235611124608e-01
+12333 11157 9.08790737020028e-02
+12333 11181 2.98352467610327e-03
+12333 11205 1.36192251944519e-06
+12333 11661 2.60784759250900e-08
+12333 11685 1.20671885798256e-02
+12333 11709 1.82785208832576e+00
+12333 11733 9.52331039881188e+00
+12333 11757 3.15491505639749e+00
+12333 11781 1.27181616251696e-01
+12333 11805 1.25052203376239e-06
+12333 12285 1.65206772175230e-07
+12333 12309 3.57682624143033e-01
+12333 12357 4.86555311739424e+00
+12333 12381 2.17844836818987e-01
+12333 12933 1.95729919479411e-03
+12333 12957 6.52632710066810e-02
+12333 12981 7.20909761037764e-03
+12333 20616 -3.60143894674430e-05
+12333 20640 -2.24151561366790e-04
+12333 20664 -3.56454239513560e-04
+12333 20688 -8.02216756131089e-05
+12333 20976 -2.30239133829013e-06
+12333 21000 -3.42397024350174e-03
+12333 21024 -4.35226319330428e-02
+12333 21048 -1.49049353647895e-01
+12333 21072 -1.42656758267422e-01
+12333 21096 -4.22648233034809e-02
+12333 21384 -3.88025594488446e-04
+12333 21408 -8.67773264820860e-02
+12333 21432 -1.30109975792000e+00
+12333 21456 -4.43068966198744e+00
+12333 21480 -3.05351420152970e+00
+12333 21504 -6.43859071509918e-01
+12333 21792 -7.59934449608862e-04
+12333 21816 -1.49586861259660e-01
+12333 21840 -2.29847746643486e+00
+12333 21864 -7.82386178903512e+00
+12333 21888 -5.11769890541479e+00
+12333 21912 -9.93950143461411e-01
+12334 12334 1.00000000000000e+00
+12335 12335 1.00000000000000e+00
+12336 12336 1.00000000000000e+00
+12337 12337 1.00000000000000e+00
+12338 12338 1.00000000000000e+00
+12339 12339 1.00000000000000e+00
+12340 12340 1.00000000000000e+00
+12341 12341 1.00000000000000e+00
+12342 12342 1.00000000000000e+00
+12343 12343 1.00000000000000e+00
+12344 12344 1.00000000000000e+00
+12345 12345 1.00000000000000e+00
+12346 12346 1.00000000000000e+00
+12347 12347 1.00000000000000e+00
+12348 12348 1.00000000000000e+00
+12349 12349 1.00000000000000e+00
+12350 12350 1.00000000000000e+00
+12351 12351 1.00000000000000e+00
+12352 12352 1.00000000000000e+00
+12353 12353 1.00000000000000e+00
+12354 12354 1.00000000000000e+00
+12355 12355 1.00000000000000e+00
+12356 12356 1.00000000000000e+00
+12357 10509 1.13169651915077e-06
+12357 10533 1.08990327590328e-04
+12357 10557 5.98389187080676e-04
+12357 10581 1.20547285967324e-04
+12357 12357 2.23335933073408e+01
+12357 11085 2.36590348617509e-06
+12357 11109 7.50438699090538e-03
+12357 11133 1.09481969201778e-01
+12357 11157 2.79777465397493e-01
+12357 11181 2.45504972402688e-01
+12357 11205 7.34843574811565e-03
+12357 11685 7.67643334023939e-06
+12357 11709 2.76648894908264e-01
+12357 11733 4.49687532096037e+00
+12357 11757 1.07535791920089e+01
+12357 11781 4.64065275503827e+00
+12357 11805 9.22890593948986e-03
+12357 12285 1.09086417370000e-10
+12357 12309 7.50878594565664e-02
+12357 12333 4.86555311739424e+00
+12357 12381 4.66704907915603e+00
+12357 12933 8.11544335799004e-03
+12357 12957 6.14209279220201e-01
+12357 12981 1.09822659070731e-01
+12357 20616 -1.92627463307740e-04
+12357 20640 -8.94430899049876e-03
+12357 20664 -9.62596793221420e-02
+12357 20688 -1.34917509756794e-01
+12357 21000 -1.30936415916659e-05
+12357 21024 -1.51639929481646e-02
+12357 21048 -2.20635404010224e-01
+12357 21072 -1.81132176135842e+00
+12357 21096 -2.47118942806316e+00
+12357 21408 -9.97392066839205e-05
+12357 21432 -2.52264035490338e-01
+12357 21456 -2.45302092463163e+00
+12357 21480 -1.07635608328286e+01
+12357 21504 -1.09051654129362e+01
+12357 21816 -1.07822922226180e-04
+12357 21840 -4.03388434389524e-01
+12357 21864 -3.59414605494466e+00
+12357 21888 -1.13506209985239e+01
+12357 21912 -8.01986008310696e+00
+12358 12358 1.00000000000000e+00
+12359 12359 1.00000000000000e+00
+12360 12360 1.00000000000000e+00
+12361 12361 1.00000000000000e+00
+12362 12362 1.00000000000000e+00
+12363 12363 1.00000000000000e+00
+12364 12364 1.00000000000000e+00
+12365 12365 1.00000000000000e+00
+12366 12366 1.00000000000000e+00
+12367 12367 1.00000000000000e+00
+12368 12368 1.00000000000000e+00
+12369 12369 1.00000000000000e+00
+12370 12370 1.00000000000000e+00
+12371 12371 1.00000000000000e+00
+12372 12372 1.00000000000000e+00
+12373 12373 1.00000000000000e+00
+12374 12374 1.00000000000000e+00
+12375 12375 1.00000000000000e+00
+12376 12376 1.00000000000000e+00
+12377 12377 1.00000000000000e+00
+12378 12378 1.00000000000000e+00
+12379 12379 1.00000000000000e+00
+12380 12380 1.00000000000000e+00
+12381 10509 8.34516350000000e-13
+12381 10533 1.16629760528223e-06
+12381 10557 2.54420757694314e-04
+12381 10581 7.09412875459686e-05
+12381 12381 2.89240257957875e+00
+12381 11109 4.80711473218400e-08
+12381 11133 4.32657486010509e-03
+12381 11157 1.29727964301456e-01
+12381 11181 3.21523235303077e-01
+12381 11205 1.18136420444695e-02
+12381 11709 8.82040844097468e-06
+12381 11733 1.45416647043242e-01
+12381 11757 3.18335899755204e+00
+12381 11781 2.93723459434113e+00
+12381 11805 1.48846185431126e-02
+12381 12309 1.01894477122363e-05
+12381 12333 2.17844836818987e-01
+12381 12357 4.66704907915603e+00
+12381 12933 9.64122588329163e-04
+12381 12957 1.19790234883613e-01
+12381 12981 2.46870374499712e-02
+12381 20616 -2.30301308694390e-07
+12381 20640 -4.96490615160516e-03
+12381 20664 -1.22950809007915e-01
+12381 20688 -2.11153262788619e-01
+12381 21024 -1.19463980016846e-06
+12381 21048 -3.66291396137415e-02
+12381 21072 -1.03543496275681e+00
+12381 21096 -1.81449700885224e+00
+12381 21432 -1.32403957025805e-06
+12381 21456 -1.04039244321100e-01
+12381 21480 -2.63427490152779e+00
+12381 21504 -4.54030951783670e+00
+12381 21840 -2.73434565390920e-07
+12381 21864 -8.07620712877434e-02
+12381 21888 -1.21722609796367e+00
+12381 21912 -1.86912480621183e+00
+12382 12382 1.00000000000000e+00
+12383 12383 1.00000000000000e+00
+12384 12384 1.00000000000000e+00
+12385 12385 1.00000000000000e+00
+12386 12386 1.00000000000000e+00
+12387 12387 1.00000000000000e+00
+12388 12388 1.00000000000000e+00
+12389 12389 1.00000000000000e+00
+12390 12390 1.00000000000000e+00
+12391 12391 1.00000000000000e+00
+12392 12392 1.00000000000000e+00
+12393 12393 1.00000000000000e+00
+12394 12394 1.00000000000000e+00
+12395 12395 1.00000000000000e+00
+12396 12396 1.00000000000000e+00
+12397 12397 1.00000000000000e+00
+12398 12398 1.00000000000000e+00
+12399 12399 1.00000000000000e+00
+12400 12400 1.00000000000000e+00
+12401 12401 1.00000000000000e+00
+12402 12402 1.00000000000000e+00
+12403 12403 1.00000000000000e+00
+12404 12404 1.00000000000000e+00
+12405 12405 1.00000000000000e+00
+12406 12406 1.00000000000000e+00
+12407 12407 1.00000000000000e+00
+12408 12408 1.00000000000000e+00
+12409 12409 1.00000000000000e+00
+12410 12410 1.00000000000000e+00
+12411 12411 1.00000000000000e+00
+12412 12412 1.00000000000000e+00
+12413 12413 1.00000000000000e+00
+12414 12414 1.00000000000000e+00
+12415 12415 1.00000000000000e+00
+12416 12416 1.00000000000000e+00
+12417 12417 1.00000000000000e+00
+12418 12418 1.00000000000000e+00
+12419 12419 1.00000000000000e+00
+12420 12420 1.00000000000000e+00
+12421 12421 1.00000000000000e+00
+12422 12422 1.00000000000000e+00
+12423 12423 1.00000000000000e+00
+12424 12424 1.00000000000000e+00
+12425 12425 1.00000000000000e+00
+12426 12426 1.00000000000000e+00
+12427 12427 1.00000000000000e+00
+12428 12428 1.00000000000000e+00
+12429 12429 1.00000000000000e+00
+12430 12430 1.00000000000000e+00
+12431 12431 1.00000000000000e+00
+12432 12432 1.00000000000000e+00
+12433 12433 1.00000000000000e+00
+12434 12434 1.00000000000000e+00
+12435 12435 1.00000000000000e+00
+12436 12436 1.00000000000000e+00
+12437 12437 1.00000000000000e+00
+12438 12438 1.00000000000000e+00
+12439 12439 1.00000000000000e+00
+12440 12440 1.00000000000000e+00
+12441 12441 1.00000000000000e+00
+12442 12442 1.00000000000000e+00
+12443 12443 1.00000000000000e+00
+12444 12444 1.00000000000000e+00
+12445 12445 1.00000000000000e+00
+12446 12446 1.00000000000000e+00
+12447 12447 1.00000000000000e+00
+12448 12448 1.00000000000000e+00
+12449 12449 1.00000000000000e+00
+12450 12450 1.00000000000000e+00
+12451 12451 1.00000000000000e+00
+12452 12452 1.00000000000000e+00
+12453 12453 1.00000000000000e+00
+12454 12454 1.00000000000000e+00
+12455 12455 1.00000000000000e+00
+12456 12456 1.00000000000000e+00
+12457 12457 1.00000000000000e+00
+12458 12458 1.00000000000000e+00
+12459 12459 1.00000000000000e+00
+12460 12460 1.00000000000000e+00
+12461 12461 1.00000000000000e+00
+12462 12462 1.00000000000000e+00
+12463 12463 1.00000000000000e+00
+12464 12464 1.00000000000000e+00
+12465 12465 1.00000000000000e+00
+12466 12466 1.00000000000000e+00
+12467 12467 1.00000000000000e+00
+12468 12468 1.00000000000000e+00
+12469 12469 1.00000000000000e+00
+12470 12470 1.00000000000000e+00
+12471 12471 1.00000000000000e+00
+12472 12472 1.00000000000000e+00
+12473 12473 1.00000000000000e+00
+12474 12474 1.00000000000000e+00
+12475 12475 1.00000000000000e+00
+12476 12476 1.00000000000000e+00
+12477 12477 1.00000000000000e+00
+12478 12478 1.00000000000000e+00
+12479 12479 1.00000000000000e+00
+12480 12480 1.00000000000000e+00
+12481 12481 1.00000000000000e+00
+12482 12482 1.00000000000000e+00
+12483 12483 1.00000000000000e+00
+12484 12484 1.00000000000000e+00
+12485 12485 1.00000000000000e+00
+12486 12486 1.00000000000000e+00
+12487 12487 1.00000000000000e+00
+12488 12488 1.00000000000000e+00
+12489 12489 1.00000000000000e+00
+12490 12490 1.00000000000000e+00
+12491 12491 1.00000000000000e+00
+12492 12492 1.00000000000000e+00
+12493 12493 1.00000000000000e+00
+12494 12494 1.00000000000000e+00
+12495 12495 1.00000000000000e+00
+12496 12496 1.00000000000000e+00
+12497 12497 1.00000000000000e+00
+12498 12498 1.00000000000000e+00
+12499 12499 1.00000000000000e+00
+12500 12500 1.00000000000000e+00
+12501 12501 1.00000000000000e+00
+12502 12502 1.00000000000000e+00
+12503 12503 1.00000000000000e+00
+12504 12504 1.00000000000000e+00
+12505 12505 1.00000000000000e+00
+12506 12506 1.00000000000000e+00
+12507 12507 1.00000000000000e+00
+12508 12508 1.00000000000000e+00
+12509 12509 1.00000000000000e+00
+12510 12510 1.00000000000000e+00
+12511 12511 1.00000000000000e+00
+12512 12512 1.00000000000000e+00
+12513 12513 1.00000000000000e+00
+12514 12514 1.00000000000000e+00
+12515 12515 1.00000000000000e+00
+12516 12516 1.00000000000000e+00
+12517 12517 1.00000000000000e+00
+12518 12518 1.00000000000000e+00
+12519 12519 1.00000000000000e+00
+12520 12520 1.00000000000000e+00
+12521 12521 1.00000000000000e+00
+12522 12522 1.00000000000000e+00
+12523 12523 1.00000000000000e+00
+12524 12524 1.00000000000000e+00
+12525 12525 1.00000000000000e+00
+12526 12526 1.00000000000000e+00
+12527 12527 1.00000000000000e+00
+12528 12528 1.00000000000000e+00
+12529 12529 1.00000000000000e+00
+12530 12530 1.00000000000000e+00
+12531 12531 1.00000000000000e+00
+12532 12532 1.00000000000000e+00
+12533 12533 1.00000000000000e+00
+12534 12534 1.00000000000000e+00
+12535 12535 1.00000000000000e+00
+12536 12536 1.00000000000000e+00
+12537 12537 1.00000000000000e+00
+12538 12538 1.00000000000000e+00
+12539 12539 1.00000000000000e+00
+12540 12540 1.00000000000000e+00
+12541 12541 1.00000000000000e+00
+12542 12542 1.00000000000000e+00
+12543 12543 1.00000000000000e+00
+12544 12544 1.00000000000000e+00
+12545 12545 1.00000000000000e+00
+12546 12546 1.00000000000000e+00
+12547 12547 1.00000000000000e+00
+12548 12548 1.00000000000000e+00
+12549 12549 1.00000000000000e+00
+12550 12550 1.00000000000000e+00
+12551 12551 1.00000000000000e+00
+12552 12552 1.00000000000000e+00
+12553 12553 1.00000000000000e+00
+12554 12554 1.00000000000000e+00
+12555 12555 1.00000000000000e+00
+12556 12556 1.00000000000000e+00
+12557 12557 1.00000000000000e+00
+12558 12558 1.00000000000000e+00
+12559 12559 1.00000000000000e+00
+12560 12560 1.00000000000000e+00
+12561 12561 1.00000000000000e+00
+12562 12562 1.00000000000000e+00
+12563 12563 1.00000000000000e+00
+12564 12564 1.00000000000000e+00
+12565 12565 1.00000000000000e+00
+12566 12566 1.00000000000000e+00
+12567 12567 1.00000000000000e+00
+12568 12568 1.00000000000000e+00
+12569 12569 1.00000000000000e+00
+12570 12570 1.00000000000000e+00
+12571 12571 1.00000000000000e+00
+12572 12572 1.00000000000000e+00
+12573 12573 1.00000000000000e+00
+12574 12574 1.00000000000000e+00
+12575 12575 1.00000000000000e+00
+12576 12576 1.00000000000000e+00
+12577 12577 1.00000000000000e+00
+12578 12578 1.00000000000000e+00
+12579 12579 1.00000000000000e+00
+12580 12580 1.00000000000000e+00
+12581 12581 1.00000000000000e+00
+12582 12582 1.00000000000000e+00
+12583 12583 1.00000000000000e+00
+12584 12584 1.00000000000000e+00
+12585 12585 1.00000000000000e+00
+12586 12586 1.00000000000000e+00
+12587 12587 1.00000000000000e+00
+12588 12588 1.00000000000000e+00
+12589 12589 1.00000000000000e+00
+12590 12590 1.00000000000000e+00
+12591 12591 1.00000000000000e+00
+12592 12592 1.00000000000000e+00
+12593 12593 1.00000000000000e+00
+12594 12594 1.00000000000000e+00
+12595 12595 1.00000000000000e+00
+12596 12596 1.00000000000000e+00
+12597 12597 1.00000000000000e+00
+12598 12598 1.00000000000000e+00
+12599 12599 1.00000000000000e+00
+12600 12600 1.00000000000000e+00
+12601 12601 1.00000000000000e+00
+12602 12602 1.00000000000000e+00
+12603 12603 1.00000000000000e+00
+12604 12604 1.00000000000000e+00
+12605 12605 1.00000000000000e+00
+12606 12606 1.00000000000000e+00
+12607 12607 1.00000000000000e+00
+12608 12608 1.00000000000000e+00
+12609 12609 1.00000000000000e+00
+12610 12610 1.00000000000000e+00
+12611 12611 1.00000000000000e+00
+12612 12612 1.00000000000000e+00
+12613 12613 1.00000000000000e+00
+12614 12614 1.00000000000000e+00
+12615 12615 1.00000000000000e+00
+12616 12616 1.00000000000000e+00
+12617 12617 1.00000000000000e+00
+12618 12618 1.00000000000000e+00
+12619 12619 1.00000000000000e+00
+12620 12620 1.00000000000000e+00
+12621 12621 1.00000000000000e+00
+12622 12622 1.00000000000000e+00
+12623 12623 1.00000000000000e+00
+12624 12624 1.00000000000000e+00
+12625 12625 1.00000000000000e+00
+12626 12626 1.00000000000000e+00
+12627 12627 1.00000000000000e+00
+12628 12628 1.00000000000000e+00
+12629 12629 1.00000000000000e+00
+12630 12630 1.00000000000000e+00
+12631 12631 1.00000000000000e+00
+12632 12632 1.00000000000000e+00
+12633 12633 1.00000000000000e+00
+12634 12634 1.00000000000000e+00
+12635 12635 1.00000000000000e+00
+12636 12636 1.00000000000000e+00
+12637 12637 1.00000000000000e+00
+12638 12638 1.00000000000000e+00
+12639 12639 1.00000000000000e+00
+12640 12640 1.00000000000000e+00
+12641 12641 1.00000000000000e+00
+12642 12642 1.00000000000000e+00
+12643 12643 1.00000000000000e+00
+12644 12644 1.00000000000000e+00
+12645 12645 1.00000000000000e+00
+12646 12646 1.00000000000000e+00
+12647 12647 1.00000000000000e+00
+12648 12648 1.00000000000000e+00
+12649 12649 1.00000000000000e+00
+12650 12650 1.00000000000000e+00
+12651 12651 1.00000000000000e+00
+12652 12652 1.00000000000000e+00
+12653 12653 1.00000000000000e+00
+12654 12654 1.00000000000000e+00
+12655 12655 1.00000000000000e+00
+12656 12656 1.00000000000000e+00
+12657 12657 1.00000000000000e+00
+12658 12658 1.00000000000000e+00
+12659 12659 1.00000000000000e+00
+12660 12660 1.00000000000000e+00
+12661 12661 1.00000000000000e+00
+12662 12662 1.00000000000000e+00
+12663 12663 1.00000000000000e+00
+12664 12664 1.00000000000000e+00
+12665 12665 1.00000000000000e+00
+12666 12666 1.00000000000000e+00
+12667 12667 1.00000000000000e+00
+12668 12668 1.00000000000000e+00
+12669 12669 1.00000000000000e+00
+12670 12670 1.00000000000000e+00
+12671 12671 1.00000000000000e+00
+12672 12672 1.00000000000000e+00
+12673 12673 1.00000000000000e+00
+12674 12674 1.00000000000000e+00
+12675 12675 1.00000000000000e+00
+12676 12676 1.00000000000000e+00
+12677 12677 1.00000000000000e+00
+12678 12678 1.00000000000000e+00
+12679 12679 1.00000000000000e+00
+12680 12680 1.00000000000000e+00
+12681 12681 1.00000000000000e+00
+12682 12682 1.00000000000000e+00
+12683 12683 1.00000000000000e+00
+12684 12684 1.00000000000000e+00
+12685 12685 1.00000000000000e+00
+12686 12686 1.00000000000000e+00
+12687 12687 1.00000000000000e+00
+12688 12688 1.00000000000000e+00
+12689 12689 1.00000000000000e+00
+12690 12690 1.00000000000000e+00
+12691 12691 1.00000000000000e+00
+12692 12692 1.00000000000000e+00
+12693 12693 1.00000000000000e+00
+12694 12694 1.00000000000000e+00
+12695 12695 1.00000000000000e+00
+12696 12696 1.00000000000000e+00
+12697 12697 1.00000000000000e+00
+12698 12698 1.00000000000000e+00
+12699 12699 1.00000000000000e+00
+12700 12700 1.00000000000000e+00
+12701 12701 1.00000000000000e+00
+12702 12702 1.00000000000000e+00
+12703 12703 1.00000000000000e+00
+12704 12704 1.00000000000000e+00
+12705 12705 1.00000000000000e+00
+12706 12706 1.00000000000000e+00
+12707 12707 1.00000000000000e+00
+12708 12708 1.00000000000000e+00
+12709 12709 1.00000000000000e+00
+12710 12710 1.00000000000000e+00
+12711 12711 1.00000000000000e+00
+12712 12712 1.00000000000000e+00
+12713 12713 1.00000000000000e+00
+12714 12714 1.00000000000000e+00
+12715 12715 1.00000000000000e+00
+12716 12716 1.00000000000000e+00
+12717 12717 1.00000000000000e+00
+12718 12718 1.00000000000000e+00
+12719 12719 1.00000000000000e+00
+12720 12720 1.00000000000000e+00
+12721 12721 1.00000000000000e+00
+12722 12722 1.00000000000000e+00
+12723 12723 1.00000000000000e+00
+12724 12724 1.00000000000000e+00
+12725 12725 1.00000000000000e+00
+12726 12726 1.00000000000000e+00
+12727 12727 1.00000000000000e+00
+12728 12728 1.00000000000000e+00
+12729 12729 1.00000000000000e+00
+12730 12730 1.00000000000000e+00
+12731 12731 1.00000000000000e+00
+12732 12732 1.00000000000000e+00
+12733 12733 1.00000000000000e+00
+12734 12734 1.00000000000000e+00
+12735 12735 1.00000000000000e+00
+12736 12736 1.00000000000000e+00
+12737 12737 1.00000000000000e+00
+12738 12738 1.00000000000000e+00
+12739 12739 1.00000000000000e+00
+12740 12740 1.00000000000000e+00
+12741 12741 1.00000000000000e+00
+12742 12742 1.00000000000000e+00
+12743 12743 1.00000000000000e+00
+12744 12744 1.00000000000000e+00
+12745 12745 1.00000000000000e+00
+12746 12746 1.00000000000000e+00
+12747 12747 1.00000000000000e+00
+12748 12748 1.00000000000000e+00
+12749 12749 1.00000000000000e+00
+12750 12750 1.00000000000000e+00
+12751 12751 1.00000000000000e+00
+12752 12752 1.00000000000000e+00
+12753 12753 1.00000000000000e+00
+12754 12754 1.00000000000000e+00
+12755 12755 1.00000000000000e+00
+12756 12756 1.00000000000000e+00
+12757 12757 1.00000000000000e+00
+12758 12758 1.00000000000000e+00
+12759 12759 1.00000000000000e+00
+12760 12760 1.00000000000000e+00
+12761 12761 1.00000000000000e+00
+12762 12762 1.00000000000000e+00
+12763 12763 1.00000000000000e+00
+12764 12764 1.00000000000000e+00
+12765 12765 1.00000000000000e+00
+12766 12766 1.00000000000000e+00
+12767 12767 1.00000000000000e+00
+12768 12768 1.00000000000000e+00
+12769 12769 1.00000000000000e+00
+12770 12770 1.00000000000000e+00
+12771 12771 1.00000000000000e+00
+12772 12772 1.00000000000000e+00
+12773 12773 1.00000000000000e+00
+12774 12774 1.00000000000000e+00
+12775 12775 1.00000000000000e+00
+12776 12776 1.00000000000000e+00
+12777 12777 1.00000000000000e+00
+12778 12778 1.00000000000000e+00
+12779 12779 1.00000000000000e+00
+12780 12780 1.00000000000000e+00
+12781 12781 1.00000000000000e+00
+12782 12782 1.00000000000000e+00
+12783 12783 1.00000000000000e+00
+12784 12784 1.00000000000000e+00
+12785 12785 1.00000000000000e+00
+12786 12786 1.00000000000000e+00
+12787 12787 1.00000000000000e+00
+12788 12788 1.00000000000000e+00
+12789 12789 1.00000000000000e+00
+12790 12790 1.00000000000000e+00
+12791 12791 1.00000000000000e+00
+12792 12792 1.00000000000000e+00
+12793 12793 1.00000000000000e+00
+12794 12794 1.00000000000000e+00
+12795 12795 1.00000000000000e+00
+12796 12796 1.00000000000000e+00
+12797 12797 1.00000000000000e+00
+12798 12798 1.00000000000000e+00
+12799 12799 1.00000000000000e+00
+12800 12800 1.00000000000000e+00
+12801 12801 1.00000000000000e+00
+12802 12802 1.00000000000000e+00
+12803 12803 1.00000000000000e+00
+12804 12804 1.00000000000000e+00
+12805 12805 1.00000000000000e+00
+12806 12806 1.00000000000000e+00
+12807 12807 1.00000000000000e+00
+12808 12808 1.00000000000000e+00
+12809 12809 1.00000000000000e+00
+12810 12810 1.00000000000000e+00
+12811 12811 1.00000000000000e+00
+12812 12812 1.00000000000000e+00
+12813 12813 1.00000000000000e+00
+12814 12814 1.00000000000000e+00
+12815 12815 1.00000000000000e+00
+12816 12816 1.00000000000000e+00
+12817 12817 1.00000000000000e+00
+12818 12818 1.00000000000000e+00
+12819 12819 1.00000000000000e+00
+12820 12820 1.00000000000000e+00
+12821 12821 1.00000000000000e+00
+12822 12822 1.00000000000000e+00
+12823 12823 1.00000000000000e+00
+12824 12824 1.00000000000000e+00
+12825 12825 1.00000000000000e+00
+12826 12826 1.00000000000000e+00
+12827 12827 1.00000000000000e+00
+12828 12828 1.00000000000000e+00
+12829 12829 1.00000000000000e+00
+12830 12830 1.00000000000000e+00
+12831 12831 1.00000000000000e+00
+12832 12832 1.00000000000000e+00
+12833 12833 1.00000000000000e+00
+12834 12834 1.00000000000000e+00
+12835 12835 1.00000000000000e+00
+12836 12836 1.00000000000000e+00
+12837 12837 1.00000000000000e+00
+12838 12838 1.00000000000000e+00
+12839 12839 1.00000000000000e+00
+12840 12840 1.00000000000000e+00
+12841 12841 1.00000000000000e+00
+12842 12842 1.00000000000000e+00
+12843 12843 1.00000000000000e+00
+12844 12844 1.00000000000000e+00
+12845 12845 1.00000000000000e+00
+12846 12846 1.00000000000000e+00
+12847 12847 1.00000000000000e+00
+12848 12848 1.00000000000000e+00
+12849 12849 1.00000000000000e+00
+12850 12850 1.00000000000000e+00
+12851 12851 1.00000000000000e+00
+12852 12852 1.00000000000000e+00
+12853 12853 1.00000000000000e+00
+12854 12854 1.00000000000000e+00
+12855 12855 1.00000000000000e+00
+12856 12856 1.00000000000000e+00
+12857 12857 1.00000000000000e+00
+12858 12858 1.00000000000000e+00
+12859 12859 1.00000000000000e+00
+12860 12860 1.00000000000000e+00
+12861 12861 1.00000000000000e+00
+12862 12862 1.00000000000000e+00
+12863 12863 1.00000000000000e+00
+12864 12864 1.00000000000000e+00
+12865 12865 1.00000000000000e+00
+12866 12866 1.00000000000000e+00
+12867 12867 1.00000000000000e+00
+12868 12868 1.00000000000000e+00
+12869 12869 1.00000000000000e+00
+12870 12870 1.00000000000000e+00
+12871 12871 1.00000000000000e+00
+12872 12872 1.00000000000000e+00
+12873 12873 1.00000000000000e+00
+12874 12874 1.00000000000000e+00
+12875 12875 1.00000000000000e+00
+12876 12876 1.00000000000000e+00
+12877 12877 1.00000000000000e+00
+12878 12878 1.00000000000000e+00
+12879 12879 1.00000000000000e+00
+12880 12880 1.00000000000000e+00
+12881 12881 1.00000000000000e+00
+12882 12882 1.00000000000000e+00
+12883 12883 1.00000000000000e+00
+12884 12884 1.00000000000000e+00
+12885 12885 1.00000000000000e+00
+12886 12886 1.00000000000000e+00
+12887 12887 1.00000000000000e+00
+12888 12888 1.00000000000000e+00
+12889 12889 1.00000000000000e+00
+12890 12890 1.00000000000000e+00
+12891 12891 1.00000000000000e+00
+12892 12892 1.00000000000000e+00
+12893 12893 1.00000000000000e+00
+12894 12894 1.00000000000000e+00
+12895 12895 1.00000000000000e+00
+12896 12896 1.00000000000000e+00
+12897 12897 1.00000000000000e+00
+12898 12898 1.00000000000000e+00
+12899 12899 1.00000000000000e+00
+12900 12900 1.00000000000000e+00
+12901 12901 1.00000000000000e+00
+12902 12902 1.00000000000000e+00
+12903 12903 1.00000000000000e+00
+12904 12904 1.00000000000000e+00
+12905 12905 1.00000000000000e+00
+12906 12906 1.00000000000000e+00
+12907 12907 1.00000000000000e+00
+12908 12908 1.00000000000000e+00
+12909 12909 1.00000000000000e+00
+12910 12910 1.00000000000000e+00
+12911 12911 1.00000000000000e+00
+12912 12912 1.00000000000000e+00
+12913 12913 1.00000000000000e+00
+12914 12914 1.00000000000000e+00
+12915 12915 1.00000000000000e+00
+12916 12916 1.00000000000000e+00
+12917 12917 1.00000000000000e+00
+12918 12918 1.00000000000000e+00
+12919 12919 1.00000000000000e+00
+12920 12920 1.00000000000000e+00
+12921 12921 1.00000000000000e+00
+12922 12922 1.00000000000000e+00
+12923 12923 1.00000000000000e+00
+12924 12924 1.00000000000000e+00
+12925 12925 1.00000000000000e+00
+12926 12926 1.00000000000000e+00
+12927 12927 1.00000000000000e+00
+12928 12928 1.00000000000000e+00
+12929 12929 1.00000000000000e+00
+12930 12930 1.00000000000000e+00
+12931 12931 1.00000000000000e+00
+12932 12932 1.00000000000000e+00
+12933 12933 1.00000435929869e+00
+12933 11133 5.18496828096320e-07
+12933 11157 3.19208832744835e-06
+12933 11181 7.09230616116300e-07
+12933 11709 1.28205453431020e-07
+12933 11733 1.07228177540040e-03
+12933 11757 2.07534537618316e-03
+12933 11781 2.13706456323187e-04
+12933 12309 1.52197706490330e-07
+12933 12333 1.95729919479411e-03
+12933 12357 8.11544335799004e-03
+12933 12381 9.64122588329163e-04
+12933 12957 3.16146648534752e-04
+12933 12981 5.45386769826291e-05
+12933 21048 -2.92525320334765e-06
+12933 21072 -3.51333413334758e-05
+12933 21096 -4.97899102435181e-05
+12933 21456 -5.02259234512167e-04
+12933 21480 -2.70507787134015e-03
+12933 21504 -1.89434110109513e-03
+12933 21864 -9.84041696600900e-04
+12933 21888 -5.16422235334597e-03
+12933 21912 -3.44015283048563e-03
+12934 12934 1.00000000000000e+00
+12935 12935 1.00000000000000e+00
+12936 12936 1.00000000000000e+00
+12937 12937 1.00000000000000e+00
+12938 12938 1.00000000000000e+00
+12939 12939 1.00000000000000e+00
+12940 12940 1.00000000000000e+00
+12941 12941 1.00000000000000e+00
+12942 12942 1.00000000000000e+00
+12943 12943 1.00000000000000e+00
+12944 12944 1.00000000000000e+00
+12945 12945 1.00000000000000e+00
+12946 12946 1.00000000000000e+00
+12947 12947 1.00000000000000e+00
+12948 12948 1.00000000000000e+00
+12949 12949 1.00000000000000e+00
+12950 12950 1.00000000000000e+00
+12951 12951 1.00000000000000e+00
+12952 12952 1.00000000000000e+00
+12953 12953 1.00000000000000e+00
+12954 12954 1.00000000000000e+00
+12955 12955 1.00000000000000e+00
+12956 12956 1.00000000000000e+00
+12957 12957 1.03255630443834e+00
+12957 11133 3.30881342016390e-05
+12957 11157 3.54827271089055e-04
+12957 11181 1.80194811187148e-04
+12957 11709 3.44776521549207e-06
+12957 11733 3.06976858560494e-02
+12957 11757 1.30411080783787e-01
+12957 11781 4.36793967859309e-02
+12957 12309 4.09279816281600e-06
+12957 12333 6.52632710066810e-02
+12957 12357 6.14209279220201e-01
+12957 12381 1.19790234883613e-01
+12957 12933 3.16146648534752e-04
+12957 12981 6.14289272445794e-03
+12957 21048 -1.91406254721892e-04
+12957 21072 -9.21270429339958e-03
+12957 21096 -1.70855648037459e-02
+12957 21456 -1.39520399675073e-02
+12957 21480 -1.61524079405973e-01
+12957 21504 -2.25383879039395e-01
+12957 21864 -2.65642361519613e-02
+12957 21888 -2.58559228758149e-01
+12957 21912 -3.31168804452569e-01
+12958 12958 1.00000000000000e+00
+12959 12959 1.00000000000000e+00
+12960 12960 1.00000000000000e+00
+12961 12961 1.00000000000000e+00
+12962 12962 1.00000000000000e+00
+12963 12963 1.00000000000000e+00
+12964 12964 1.00000000000000e+00
+12965 12965 1.00000000000000e+00
+12966 12966 1.00000000000000e+00
+12967 12967 1.00000000000000e+00
+12968 12968 1.00000000000000e+00
+12969 12969 1.00000000000000e+00
+12970 12970 1.00000000000000e+00
+12971 12971 1.00000000000000e+00
+12972 12972 1.00000000000000e+00
+12973 12973 1.00000000000000e+00
+12974 12974 1.00000000000000e+00
+12975 12975 1.00000000000000e+00
+12976 12976 1.00000000000000e+00
+12977 12977 1.00000000000000e+00
+12978 12978 1.00000000000000e+00
+12979 12979 1.00000000000000e+00
+12980 12980 1.00000000000000e+00
+12981 12981 1.00118062439057e+00
+12981 11133 4.55990495249583e-06
+12981 11157 7.20900767794635e-05
+12981 11181 4.59011807340390e-05
+12981 11709 2.84965056096500e-07
+12981 11733 2.79091754131947e-03
+12981 11757 2.33776633015672e-02
+12981 11781 1.06727575900902e-02
+12981 12309 3.38261348833680e-07
+12981 12333 7.20909761037764e-03
+12981 12357 1.09822659070731e-01
+12981 12381 2.46870374499712e-02
+12981 12933 5.45386769826291e-05
+12981 12957 6.14289272445794e-03
+12981 21048 -2.65678797598079e-05
+12981 21072 -2.35827455065933e-03
+12981 21096 -4.53057394300000e-03
+12981 21456 -1.19559189827232e-03
+12981 21480 -2.76749461282615e-02
+12981 21504 -4.69807489686166e-02
+12981 21864 -2.20520863822599e-03
+12981 21888 -3.88419704019076e-02
+12981 21912 -6.22474803362333e-02
+12982 12982 1.00000000000000e+00
+12983 12983 1.00000000000000e+00
+12984 12984 1.00000000000000e+00
+12985 12985 1.00000000000000e+00
+12986 12986 1.00000000000000e+00
+12987 12987 1.00000000000000e+00
+12988 12988 1.00000000000000e+00
+12989 12989 1.00000000000000e+00
+12990 12990 1.00000000000000e+00
+12991 12991 1.00000000000000e+00
+12992 12992 1.00000000000000e+00
+12993 12993 1.00000000000000e+00
+12994 12994 1.00000000000000e+00
+12995 12995 1.00000000000000e+00
+12996 12996 1.00000000000000e+00
+12997 12997 1.00000000000000e+00
+12998 12998 1.00000000000000e+00
+12999 12999 1.00000000000000e+00
+13000 13000 1.00000000000000e+00
+13001 13001 1.00000000000000e+00
+13002 13002 1.00000000000000e+00
+13003 13003 1.00000000000000e+00
+13004 13004 1.00000000000000e+00
+13005 13005 1.00000000000000e+00
+13006 13006 1.00000000000000e+00
+13007 13007 1.00000000000000e+00
+13008 13008 1.00000000000000e+00
+13009 13009 1.00000000000000e+00
+13010 13010 1.00000000000000e+00
+13011 13011 1.00000000000000e+00
+13012 13012 1.00000000000000e+00
+13013 13013 1.00000000000000e+00
+13014 13014 1.00000000000000e+00
+13015 13015 1.00000000000000e+00
+13016 13016 1.00000000000000e+00
+13017 13017 1.00000000000000e+00
+13018 13018 1.00000000000000e+00
+13019 13019 1.00000000000000e+00
+13020 13020 1.00000000000000e+00
+13021 13021 1.00000000000000e+00
+13022 13022 1.00000000000000e+00
+13023 13023 1.00000000000000e+00
+13024 13024 1.00000000000000e+00
+13025 13025 1.00000000000000e+00
+13026 13026 1.00000000000000e+00
+13027 13027 1.00000000000000e+00
+13028 13028 1.00000000000000e+00
+13029 13029 1.00000000000000e+00
+13030 13030 1.00000000000000e+00
+13031 13031 1.00000000000000e+00
+13032 13032 1.00000000000000e+00
+13033 13033 1.00000000000000e+00
+13034 13034 1.00000000000000e+00
+13035 13035 1.00000000000000e+00
+13036 13036 1.00000000000000e+00
+13037 13037 1.00000000000000e+00
+13038 13038 1.00000000000000e+00
+13039 13039 1.00000000000000e+00
+13040 13040 1.00000000000000e+00
+13041 13041 1.00000000000000e+00
+13042 13042 1.00000000000000e+00
+13043 13043 1.00000000000000e+00
+13044 13044 1.00000000000000e+00
+13045 13045 1.00000000000000e+00
+13046 13046 1.00000000000000e+00
+13047 13047 1.00000000000000e+00
+13048 13048 1.00000000000000e+00
+13049 13049 1.00000000000000e+00
+13050 13050 1.00000000000000e+00
+13051 13051 1.00000000000000e+00
+13052 13052 1.00000000000000e+00
+13053 13053 1.00000000000000e+00
+13054 13054 1.00000000000000e+00
+13055 13055 1.00000000000000e+00
+13056 13056 1.00000000000000e+00
+13057 13057 1.00000000000000e+00
+13058 13058 1.00000000000000e+00
+13059 13059 1.00000000000000e+00
+13060 13060 1.00000000000000e+00
+13061 13061 1.00000000000000e+00
+13062 13062 1.00000000000000e+00
+13063 13063 1.00000000000000e+00
+13064 13064 1.00000000000000e+00
+13065 13065 1.00000000000000e+00
+13066 13066 1.00000000000000e+00
+13067 13067 1.00000000000000e+00
+13068 13068 1.00000000000000e+00
+13069 13069 1.00000000000000e+00
+13070 13070 1.00000000000000e+00
+13071 13071 1.00000000000000e+00
+13072 13072 1.00000000000000e+00
+13073 13073 1.00000000000000e+00
+13074 13074 1.00000000000000e+00
+13075 13075 1.00000000000000e+00
+13076 13076 1.00000000000000e+00
+13077 13077 1.00000000000000e+00
+13078 13078 1.00000000000000e+00
+13079 13079 1.00000000000000e+00
+13080 13080 1.00000000000000e+00
+13081 13081 1.00000000000000e+00
+13082 13082 1.00000000000000e+00
+13083 13083 1.00000000000000e+00
+13084 13084 1.00000000000000e+00
+13085 13085 1.00000000000000e+00
+13086 13086 1.00000000000000e+00
+13087 13087 1.00000000000000e+00
+13088 13088 1.00000000000000e+00
+13089 13089 1.00000000000000e+00
+13090 13090 1.00000000000000e+00
+13091 13091 1.00000000000000e+00
+13092 13092 1.00000000000000e+00
+13093 13093 1.00000000000000e+00
+13094 13094 1.00000000000000e+00
+13095 13095 1.00000000000000e+00
+13096 13096 1.00000000000000e+00
+13097 13097 1.00000000000000e+00
+13098 13098 1.00000000000000e+00
+13099 13099 1.00000000000000e+00
+13100 13100 1.00000000000000e+00
+13101 13101 1.00000000000000e+00
+13102 13102 1.00000000000000e+00
+13103 13103 1.00000000000000e+00
+13104 13104 1.00000000000000e+00
+13105 13105 1.00000000000000e+00
+13106 13106 1.00000000000000e+00
+13107 13107 1.00000000000000e+00
+13108 13108 1.00000000000000e+00
+13109 13109 1.00000000000000e+00
+13110 13110 1.00000000000000e+00
+13111 13111 1.00000000000000e+00
+13112 13112 1.00000000000000e+00
+13113 13113 1.00000000000000e+00
+13114 13114 1.00000000000000e+00
+13115 13115 1.00000000000000e+00
+13116 13116 1.00000000000000e+00
+13117 13117 1.00000000000000e+00
+13118 13118 1.00000000000000e+00
+13119 13119 1.00000000000000e+00
+13120 13120 1.00000000000000e+00
+13121 13121 1.00000000000000e+00
+13122 13122 1.00000000000000e+00
+13123 13123 1.00000000000000e+00
+13124 13124 1.00000000000000e+00
+13125 13125 1.00000000000000e+00
+13126 13126 1.00000000000000e+00
+13127 13127 1.00000000000000e+00
+13128 13128 1.00000000000000e+00
+13129 13129 1.00000000000000e+00
+13130 13130 1.00000000000000e+00
+13131 13131 1.00000000000000e+00
+13132 13132 1.00000000000000e+00
+13133 13133 1.00000000000000e+00
+13134 13134 1.00000000000000e+00
+13135 13135 1.00000000000000e+00
+13136 13136 1.00000000000000e+00
+13137 13137 1.00000000000000e+00
+13138 13138 1.00000000000000e+00
+13139 13139 1.00000000000000e+00
+13140 13140 1.00000000000000e+00
+13141 13141 1.00000000000000e+00
+13142 13142 1.00000000000000e+00
+13143 13143 1.00000000000000e+00
+13144 13144 1.00000000000000e+00
+13145 13145 1.00000000000000e+00
+13146 13146 1.00000000000000e+00
+13147 13147 1.00000000000000e+00
+13148 13148 1.00000000000000e+00
+13149 13149 1.00000000000000e+00
+13150 13150 1.00000000000000e+00
+13151 13151 1.00000000000000e+00
+13152 13152 1.00000000000000e+00
+13153 13153 1.00000000000000e+00
+13154 13154 1.00000000000000e+00
+13155 13155 1.00000000000000e+00
+13156 13156 1.00000000000000e+00
+13157 13157 1.00000000000000e+00
+13158 13158 1.00000000000000e+00
+13159 13159 1.00000000000000e+00
+13160 13160 1.00000000000000e+00
+13161 13161 1.00000000000000e+00
+13162 13162 1.00000000000000e+00
+13163 13163 1.00000000000000e+00
+13164 13164 1.00000000000000e+00
+13165 13165 1.00000000000000e+00
+13166 13166 1.00000000000000e+00
+13167 13167 1.00000000000000e+00
+13168 13168 1.00000000000000e+00
+13169 13169 1.00000000000000e+00
+13170 13170 1.00000000000000e+00
+13171 13171 1.00000000000000e+00
+13172 13172 1.00000000000000e+00
+13173 13173 1.00000000000000e+00
+13174 13174 1.00000000000000e+00
+13175 13175 1.00000000000000e+00
+13176 13176 1.00000000000000e+00
+13177 13177 1.00000000000000e+00
+13178 13178 1.00000000000000e+00
+13179 13179 1.00000000000000e+00
+13180 13180 1.00000000000000e+00
+13181 13181 1.00000000000000e+00
+13182 13182 1.00000000000000e+00
+13183 13183 1.00000000000000e+00
+13184 13184 1.00000000000000e+00
+13185 13185 1.00000000000000e+00
+13186 13186 1.00000000000000e+00
+13187 13187 1.00000000000000e+00
+13188 13188 1.00000000000000e+00
+13189 13189 1.00000000000000e+00
+13190 13190 1.00000000000000e+00
+13191 13191 1.00000000000000e+00
+13192 13192 1.00000000000000e+00
+13193 13193 1.00000000000000e+00
+13194 13194 1.00000000000000e+00
+13195 13195 1.00000000000000e+00
+13196 13196 1.00000000000000e+00
+13197 13197 1.00000000000000e+00
+13198 13198 1.00000000000000e+00
+13199 13199 1.00000000000000e+00
+13200 13200 1.00000000000000e+00
+13201 13201 1.00000000000000e+00
+13202 13202 1.00000000000000e+00
+13203 13203 1.00000000000000e+00
+13204 13204 1.00000000000000e+00
+13205 13205 1.00000000000000e+00
+13206 13206 1.00000000000000e+00
+13207 13207 1.00000000000000e+00
+13208 13208 1.00000000000000e+00
+13209 13209 1.00000000000000e+00
+13210 13210 1.00000000000000e+00
+13211 13211 1.00000000000000e+00
+13212 13212 1.00000000000000e+00
+13213 13213 1.00000000000000e+00
+13214 13214 1.00000000000000e+00
+13215 13215 1.00000000000000e+00
+13216 13216 1.00000000000000e+00
+13217 13217 1.00000000000000e+00
+13218 13218 1.00000000000000e+00
+13219 13219 1.00000000000000e+00
+13220 13220 1.00000000000000e+00
+13221 13221 1.00000000000000e+00
+13222 13222 1.00000000000000e+00
+13223 13223 1.00000000000000e+00
+13224 13224 1.00000000000000e+00
+13225 13225 1.00000000000000e+00
+13226 13226 1.00000000000000e+00
+13227 13227 1.00000000000000e+00
+13228 13228 1.00000000000000e+00
+13229 13229 1.00000000000000e+00
+13230 13230 1.00000000000000e+00
+13231 13231 1.00000000000000e+00
+13232 13232 1.00000000000000e+00
+13233 13233 1.00000000000000e+00
+13234 13234 1.00000000000000e+00
+13235 13235 1.00000000000000e+00
+13236 13236 1.00000000000000e+00
+13237 13237 1.00000000000000e+00
+13238 13238 1.00000000000000e+00
+13239 13239 1.00000000000000e+00
+13240 13240 1.00000000000000e+00
+13241 13241 1.00000000000000e+00
+13242 13242 1.00000000000000e+00
+13243 13243 1.00000000000000e+00
+13244 13244 1.00000000000000e+00
+13245 13245 1.00000000000000e+00
+13246 13246 1.00000000000000e+00
+13247 13247 1.00000000000000e+00
+13248 13248 1.00000000000000e+00
+13249 13249 1.00000000000000e+00
+13250 13250 1.00000000000000e+00
+13251 13251 1.00000000000000e+00
+13252 13252 1.00000000000000e+00
+13253 13253 1.00000000000000e+00
+13254 13254 1.00000000000000e+00
+13255 13255 1.00000000000000e+00
+13256 13256 1.00000000000000e+00
+13257 13257 1.00000000000000e+00
+13258 13258 1.00000000000000e+00
+13259 13259 1.00000000000000e+00
+13260 13260 1.00000000000000e+00
+13261 13261 1.00000000000000e+00
+13262 13262 1.00000000000000e+00
+13263 13263 1.00000000000000e+00
+13264 13264 1.00000000000000e+00
+13265 13265 1.00000000000000e+00
+13266 13266 1.00000000000000e+00
+13267 13267 1.00000000000000e+00
+13268 13268 1.00000000000000e+00
+13269 13269 1.00000000000000e+00
+13270 13270 1.00000000000000e+00
+13271 13271 1.00000000000000e+00
+13272 13272 1.00000000000000e+00
+13273 13273 1.00000000000000e+00
+13274 13274 1.00000000000000e+00
+13275 13275 1.00000000000000e+00
+13276 13276 1.00000000000000e+00
+13277 13277 1.00000000000000e+00
+13278 13278 1.00000000000000e+00
+13279 13279 1.00000000000000e+00
+13280 13280 1.00000000000000e+00
+13281 13281 1.00000000000000e+00
+13282 13282 1.00000000000000e+00
+13283 13283 1.00000000000000e+00
+13284 13284 1.00000000000000e+00
+13285 13285 1.00000000000000e+00
+13286 13286 1.00000000000000e+00
+13287 13287 1.00000000000000e+00
+13288 13288 1.00000000000000e+00
+13289 13289 1.00000000000000e+00
+13290 13290 1.00000000000000e+00
+13291 13291 1.00000000000000e+00
+13292 13292 1.00000000000000e+00
+13293 13293 1.00000000000000e+00
+13294 13294 1.00000000000000e+00
+13295 13295 1.00000000000000e+00
+13296 13296 1.00000000000000e+00
+13297 13297 1.00000000000000e+00
+13298 13298 1.00000000000000e+00
+13299 13299 1.00000000000000e+00
+13300 13300 1.00000000000000e+00
+13301 13301 1.00000000000000e+00
+13302 13302 1.00000000000000e+00
+13303 13303 1.00000000000000e+00
+13304 13304 1.00000000000000e+00
+13305 13305 1.00000000000000e+00
+13306 13306 1.00000000000000e+00
+13307 13307 1.00000000000000e+00
+13308 13308 1.00000000000000e+00
+13309 13309 1.00000000000000e+00
+13310 13310 1.00000000000000e+00
+13311 13311 1.00000000000000e+00
+13312 13312 1.00000000000000e+00
+13313 13313 1.00000000000000e+00
+13314 13314 1.00000000000000e+00
+13315 13315 1.00000000000000e+00
+13316 13316 1.00000000000000e+00
+13317 13317 1.00000000000000e+00
+13318 13318 1.00000000000000e+00
+13319 13319 1.00000000000000e+00
+13320 13320 1.00000000000000e+00
+13321 13321 1.00000000000000e+00
+13322 13322 1.00000000000000e+00
+13323 13323 1.00000000000000e+00
+13324 13324 1.00000000000000e+00
+13325 13325 1.00000000000000e+00
+13326 13326 1.00000000000000e+00
+13327 13327 1.00000000000000e+00
+13328 13328 1.00000000000000e+00
+13329 13329 1.00000000000000e+00
+13330 13330 1.00000000000000e+00
+13331 13331 1.00000000000000e+00
+13332 13332 1.00000000000000e+00
+13333 13333 1.00000000000000e+00
+13334 13334 1.00000000000000e+00
+13335 13335 1.00000000000000e+00
+13336 13336 1.00000000000000e+00
+13337 13337 1.00000000000000e+00
+13338 13338 1.00000000000000e+00
+13339 13339 1.00000000000000e+00
+13340 13340 1.00000000000000e+00
+13341 13341 1.00000000000000e+00
+13342 13342 1.00000000000000e+00
+13343 13343 1.00000000000000e+00
+13344 13344 1.00000000000000e+00
+13345 13345 1.00000000000000e+00
+13346 13346 1.00000000000000e+00
+13347 13347 1.00000000000000e+00
+13348 13348 1.00000000000000e+00
+13349 13349 1.00000000000000e+00
+13350 13350 1.00000000000000e+00
+13351 13351 1.00000000000000e+00
+13352 13352 1.00000000000000e+00
+13353 13353 1.00000000000000e+00
+13354 13354 1.00000000000000e+00
+13355 13355 1.00000000000000e+00
+13356 13356 1.00000000000000e+00
+13357 13357 1.00000000000000e+00
+13358 13358 1.00000000000000e+00
+13359 13359 1.00000000000000e+00
+13360 13360 1.00000000000000e+00
+13361 13361 1.00000000000000e+00
+13362 13362 1.00000000000000e+00
+13363 13363 1.00000000000000e+00
+13364 13364 1.00000000000000e+00
+13365 13365 1.00000000000000e+00
+13366 13366 1.00000000000000e+00
+13367 13367 1.00000000000000e+00
+13368 13368 1.00000000000000e+00
+13369 13369 1.00000000000000e+00
+13370 13370 1.00000000000000e+00
+13371 13371 1.00000000000000e+00
+13372 13372 1.00000000000000e+00
+13373 13373 1.00000000000000e+00
+13374 13374 1.00000000000000e+00
+13375 13375 1.00000000000000e+00
+13376 13376 1.00000000000000e+00
+13377 13377 1.00000000000000e+00
+13378 13378 1.00000000000000e+00
+13379 13379 1.00000000000000e+00
+13380 13380 1.00000000000000e+00
+13381 13381 1.00000000000000e+00
+13382 13382 1.00000000000000e+00
+13383 13383 1.00000000000000e+00
+13384 13384 1.00000000000000e+00
+13385 13385 1.00000000000000e+00
+13386 13386 1.00000000000000e+00
+13387 13387 1.00000000000000e+00
+13388 13388 1.00000000000000e+00
+13389 13389 1.00000000000000e+00
+13390 13390 1.00000000000000e+00
+13391 13391 1.00000000000000e+00
+13392 13392 1.00000000000000e+00
+13393 13393 1.00000000000000e+00
+13394 13394 1.00000000000000e+00
+13395 13395 1.00000000000000e+00
+13396 13396 1.00000000000000e+00
+13397 13397 1.00000000000000e+00
+13398 13398 1.00000000000000e+00
+13399 13399 1.00000000000000e+00
+13400 13400 1.00000000000000e+00
+13401 13401 1.00000000000000e+00
+13402 13402 1.00000000000000e+00
+13403 13403 1.00000000000000e+00
+13404 13404 1.00000000000000e+00
+13405 13405 1.00000000000000e+00
+13406 13406 1.00000000000000e+00
+13407 13407 1.00000000000000e+00
+13408 13408 1.00000000000000e+00
+13409 13409 1.00000000000000e+00
+13410 13410 1.00000000000000e+00
+13411 13411 1.00000000000000e+00
+13412 13412 1.00000000000000e+00
+13413 13413 1.00000000000000e+00
+13414 13414 1.00000000000000e+00
+13415 13415 1.00000000000000e+00
+13416 13416 1.00000000000000e+00
+13417 13417 1.00000000000000e+00
+13418 13418 1.00000000000000e+00
+13419 13419 1.00000000000000e+00
+13420 13420 1.00000000000000e+00
+13421 13421 1.00000000000000e+00
+13422 13422 1.00000000000000e+00
+13423 13423 1.00000000000000e+00
+13424 13424 1.00000000000000e+00
+13425 13425 1.00000000000000e+00
+13426 13426 1.00000000000000e+00
+13427 13427 1.00000000000000e+00
+13428 13428 1.00000000000000e+00
+13429 13429 1.00000000000000e+00
+13430 13430 1.00000000000000e+00
+13431 13431 1.00000000000000e+00
+13432 13432 1.00000000000000e+00
+13433 13433 1.00000000000000e+00
+13434 13434 1.00000000000000e+00
+13435 13435 1.00000000000000e+00
+13436 13436 1.00000000000000e+00
+13437 13437 1.00000000000000e+00
+13438 13438 1.00000000000000e+00
+13439 13439 1.00000000000000e+00
+13440 13440 1.00000000000000e+00
+13441 13441 1.00000000000000e+00
+13442 13442 1.00000000000000e+00
+13443 13443 1.00000000000000e+00
+13444 13444 1.00000000000000e+00
+13445 13445 1.00000000000000e+00
+13446 13446 1.00000000000000e+00
+13447 13447 1.00000000000000e+00
+13448 13448 1.00000000000000e+00
+13449 13449 1.00000000000000e+00
+13450 13450 1.00000000000000e+00
+13451 13451 1.00000000000000e+00
+13452 13452 1.00000000000000e+00
+13453 13453 1.00000000000000e+00
+13454 13454 1.00000000000000e+00
+13455 13455 1.00000000000000e+00
+13456 13456 1.00000000000000e+00
+13457 13457 1.00000000000000e+00
+13458 13458 1.00000000000000e+00
+13459 13459 1.00000000000000e+00
+13460 13460 1.00000000000000e+00
+13461 13461 1.00000000000000e+00
+13462 13462 1.00000000000000e+00
+13463 13463 1.00000000000000e+00
+13464 13464 1.00000000000000e+00
+13465 13465 1.00000000000000e+00
+13466 13466 1.00000000000000e+00
+13467 13467 1.00000000000000e+00
+13468 13468 1.00000000000000e+00
+13469 13469 1.00000000000000e+00
+13470 13470 1.00000000000000e+00
+13471 13471 1.00000000000000e+00
+13472 13472 1.00000000000000e+00
+13473 13473 1.00000000000000e+00
+13474 13474 1.00000000000000e+00
+13475 13475 1.00000000000000e+00
+13476 13476 1.00000000000000e+00
+13477 13477 1.00000000000000e+00
+13478 13478 1.00000000000000e+00
+13479 13479 1.00000000000000e+00
+13480 13480 1.00000000000000e+00
+13481 13481 1.00000000000000e+00
+13482 13482 1.00000000000000e+00
+13483 13483 1.00000000000000e+00
+13484 13484 1.00000000000000e+00
+13485 13485 1.00000000000000e+00
+13486 13486 1.00000000000000e+00
+13487 13487 1.00000000000000e+00
+13488 13488 1.00000000000000e+00
+13489 13489 1.00000000000000e+00
+13490 13490 1.00000000000000e+00
+13491 13491 1.00000000000000e+00
+13492 13492 1.00000000000000e+00
+13493 13493 1.00000000000000e+00
+13494 13494 1.00000000000000e+00
+13495 13495 1.00000000000000e+00
+13496 13496 1.00000000000000e+00
+13497 13497 1.00000000000000e+00
+13498 13498 1.00000000000000e+00
+13499 13499 1.00000000000000e+00
+13500 13500 1.00000000000000e+00
+13501 13501 1.00000000000000e+00
+13502 13502 1.00000000000000e+00
+13503 13503 1.00000000000000e+00
+13504 13504 1.00000000000000e+00
+13505 13505 1.00000000000000e+00
+13506 13506 1.00000000000000e+00
+13507 13507 1.00000000000000e+00
+13508 13508 1.00000000000000e+00
+13509 13509 1.00000000000000e+00
+13510 13510 1.00000000000000e+00
+13511 13511 1.00000000000000e+00
+13512 13512 1.00000000000000e+00
+13513 13513 1.00000000000000e+00
+13514 13514 1.00000000000000e+00
+13515 13515 1.00000000000000e+00
+13516 13516 1.00000000000000e+00
+13517 13517 1.00000000000000e+00
+13518 13518 1.00000000000000e+00
+13519 13519 1.00000000000000e+00
+13520 13520 1.00000000000000e+00
+13521 13521 1.00000000000000e+00
+13522 13522 1.00000000000000e+00
+13523 13523 1.00000000000000e+00
+13524 13524 1.00000000000000e+00
+13525 13525 1.00000000000000e+00
+13526 13526 1.00000000000000e+00
+13527 13527 1.00000000000000e+00
+13528 13528 1.00000000000000e+00
+13529 13529 1.00000000000000e+00
+13530 13530 1.00000000000000e+00
+13531 13531 1.00000000000000e+00
+13532 13532 1.00000000000000e+00
+13533 13533 1.00000000000000e+00
+13534 13534 1.00000000000000e+00
+13535 13535 1.00000000000000e+00
+13536 13536 1.00000000000000e+00
+13537 13537 1.00000000000000e+00
+13538 13538 1.00000000000000e+00
+13539 13539 1.00000000000000e+00
+13540 13540 1.00000000000000e+00
+13541 13541 1.00000000000000e+00
+13542 13542 1.00000000000000e+00
+13543 13543 1.00000000000000e+00
+13544 13544 1.00000000000000e+00
+13545 13545 1.00000000000000e+00
+13546 13546 1.00000000000000e+00
+13547 13547 1.00000000000000e+00
+13548 13548 1.00000000000000e+00
+13549 13549 1.00000000000000e+00
+13550 13550 1.00000000000000e+00
+13551 13551 1.00000000000000e+00
+13552 13552 1.00000000000000e+00
+13553 13553 1.00000000000000e+00
+13554 13554 1.00000000000000e+00
+13555 13555 1.00000000000000e+00
+13556 13556 1.00000000000000e+00
+13557 13557 1.00000000000000e+00
+13558 13558 1.00000000000000e+00
+13559 13559 1.00000000000000e+00
+13560 13560 1.00000000000000e+00
+13561 13561 1.00000000000000e+00
+13562 13562 1.00000000000000e+00
+13563 13563 1.00000000000000e+00
+13564 13564 1.00000000000000e+00
+13565 13565 1.00000000000000e+00
+13566 13566 1.00000000000000e+00
+13567 13567 1.00000000000000e+00
+13568 13568 1.00000000000000e+00
+13569 13569 1.00000000000000e+00
+13570 13570 1.00000000000000e+00
+13571 13571 1.00000000000000e+00
+13572 13572 1.00000000000000e+00
+13573 13573 1.00000000000000e+00
+13574 13574 1.00000000000000e+00
+13575 13575 1.00000000000000e+00
+13576 13576 1.00000000000000e+00
+13577 13577 1.00000000000000e+00
+13578 13578 1.00000000000000e+00
+13579 13579 1.00000000000000e+00
+13580 13580 1.00000000000000e+00
+13581 13581 1.00000000000000e+00
+13582 13582 1.00000000000000e+00
+13583 13583 1.00000000000000e+00
+13584 13584 1.00000000000000e+00
+13585 13585 1.00000000000000e+00
+13586 13586 1.00000000000000e+00
+13587 13587 1.00000000000000e+00
+13588 13588 1.00000000000000e+00
+13589 13589 1.00000000000000e+00
+13590 13590 1.00000000000000e+00
+13591 13591 1.00000000000000e+00
+13592 13592 1.00000000000000e+00
+13593 13593 1.00000000000000e+00
+13594 13594 1.00000000000000e+00
+13595 13595 1.00000000000000e+00
+13596 13596 1.00000000000000e+00
+13597 13597 1.00000000000000e+00
+13598 13598 1.00000000000000e+00
+13599 13599 1.00000000000000e+00
+13600 13600 1.00000000000000e+00
+13601 13601 1.00000000000000e+00
+13602 13602 1.00000000000000e+00
+13603 13603 1.00000000000000e+00
+13604 13604 1.00000000000000e+00
+13605 13605 1.00000000000000e+00
+13606 13606 1.00000000000000e+00
+13607 13607 1.00000000000000e+00
+13608 13608 1.00000000000000e+00
+13609 13609 1.00000000000000e+00
+13610 13610 1.00000000000000e+00
+13611 13611 1.00000000000000e+00
+13612 13612 1.00000000000000e+00
+13613 13613 1.00000000000000e+00
+13614 13614 1.00000000000000e+00
+13615 13615 1.00000000000000e+00
+13616 13616 1.00000000000000e+00
+13617 13617 1.00000000000000e+00
+13618 13618 1.00000000000000e+00
+13619 13619 1.00000000000000e+00
+13620 13620 1.00000000000000e+00
+13621 13621 1.00000000000000e+00
+13622 13622 1.00000000000000e+00
+13623 13623 1.00000000000000e+00
+13624 13624 1.00000000000000e+00
+13625 13625 1.00000000000000e+00
+13626 13626 1.00000000000000e+00
+13627 13627 1.00000000000000e+00
+13628 13628 1.00000000000000e+00
+13629 13629 1.00000000000000e+00
+13630 13630 1.00000000000000e+00
+13631 13631 1.00000000000000e+00
+13632 13632 1.00000000000000e+00
+13633 13633 1.00000000000000e+00
+13634 13634 1.00000000000000e+00
+13635 13635 1.00000000000000e+00
+13636 13636 1.00000000000000e+00
+13637 13637 1.00000000000000e+00
+13638 13638 1.00000000000000e+00
+13639 13639 1.00000000000000e+00
+13640 13640 1.00000000000000e+00
+13641 13641 1.00000000000000e+00
+13642 13642 1.00000000000000e+00
+13643 13643 1.00000000000000e+00
+13644 13644 1.00000000000000e+00
+13645 13645 1.00000000000000e+00
+13646 13646 1.00000000000000e+00
+13647 13647 1.00000000000000e+00
+13648 13648 1.00000000000000e+00
+13649 13649 1.00000000000000e+00
+13650 13650 1.00000000000000e+00
+13651 13651 1.00000000000000e+00
+13652 13652 1.00000000000000e+00
+13653 13653 1.00000000000000e+00
+13654 13654 1.00000000000000e+00
+13655 13655 1.00000000000000e+00
+13656 13656 1.00000000000000e+00
+13657 13657 1.00000000000000e+00
+13658 13658 1.00000000000000e+00
+13659 13659 1.00000000000000e+00
+13660 13660 1.00000000000000e+00
+13661 13661 1.00000000000000e+00
+13662 13662 1.00000000000000e+00
+13663 13663 1.00000000000000e+00
+13664 13664 1.00000000000000e+00
+13665 13665 1.00000000000000e+00
+13666 13666 1.00000000000000e+00
+13667 13667 1.00000000000000e+00
+13668 13668 1.00000000000000e+00
+13669 13669 1.00000000000000e+00
+13670 13670 1.00000000000000e+00
+13671 13671 1.00000000000000e+00
+13672 13672 1.00000000000000e+00
+13673 13673 1.00000000000000e+00
+13674 13674 1.00000000000000e+00
+13675 13675 1.00000000000000e+00
+13676 13676 1.00000000000000e+00
+13677 13677 1.00000000000000e+00
+13678 13678 1.00000000000000e+00
+13679 13679 1.00000000000000e+00
+13680 13680 1.00000000000000e+00
+13681 13681 1.00000000000000e+00
+13682 13682 1.00000000000000e+00
+13683 13683 1.00000000000000e+00
+13684 13684 1.00000000000000e+00
+13685 13685 1.00000000000000e+00
+13686 13686 1.00000000000000e+00
+13687 13687 1.00000000000000e+00
+13688 13688 1.00000000000000e+00
+13689 13689 1.00000000000000e+00
+13690 13690 1.00000000000000e+00
+13691 13691 1.00000000000000e+00
+13692 13692 1.00000000000000e+00
+13693 13693 1.00000000000000e+00
+13694 13694 1.00000000000000e+00
+13695 13695 1.00000000000000e+00
+13696 13696 1.00000000000000e+00
+13697 13697 1.00000000000000e+00
+13698 13698 1.00000000000000e+00
+13699 13699 1.00000000000000e+00
+13700 13700 1.00000000000000e+00
+13701 13701 1.00000000000000e+00
+13702 13702 1.00000000000000e+00
+13703 13703 1.00000000000000e+00
+13704 13704 1.00000000000000e+00
+13705 13705 1.00000000000000e+00
+13706 13706 1.00000000000000e+00
+13707 13707 1.00000000000000e+00
+13708 13708 1.00000000000000e+00
+13709 13709 1.00000000000000e+00
+13710 13710 1.00000000000000e+00
+13711 13711 1.00000000000000e+00
+13712 13712 1.00000000000000e+00
+13713 13713 1.00000000000000e+00
+13714 13714 1.00000000000000e+00
+13715 13715 1.00000000000000e+00
+13716 13716 1.00000000000000e+00
+13717 13717 1.00000000000000e+00
+13718 13718 1.00000000000000e+00
+13719 13719 1.00000000000000e+00
+13720 13720 1.00000000000000e+00
+13721 13721 1.00000000000000e+00
+13722 13722 1.00000000000000e+00
+13723 13723 1.00000000000000e+00
+13724 13724 1.00000000000000e+00
+13725 13725 1.00000000000000e+00
+13726 13726 1.00000000000000e+00
+13727 13727 1.00000000000000e+00
+13728 13728 1.00000000000000e+00
+13729 13729 1.00000000000000e+00
+13730 13730 1.00000000000000e+00
+13731 13731 1.00000000000000e+00
+13732 13732 1.00000000000000e+00
+13733 13733 1.00000000000000e+00
+13734 13734 1.00000000000000e+00
+13735 13735 1.00000000000000e+00
+13736 13736 1.00000000000000e+00
+13737 13737 1.00000000000000e+00
+13738 13738 1.00000000000000e+00
+13739 13739 1.00000000000000e+00
+13740 13740 1.00000000000000e+00
+13741 13741 1.00000000000000e+00
+13742 13742 1.00000000000000e+00
+13743 13743 1.00000000000000e+00
+13744 13744 1.00000000000000e+00
+13745 13745 1.00000000000000e+00
+13746 13746 1.00000000000000e+00
+13747 13747 1.00000000000000e+00
+13748 13748 1.00000000000000e+00
+13749 13749 1.00000000000000e+00
+13750 13750 1.00000000000000e+00
+13751 13751 1.00000000000000e+00
+13752 13752 1.00000000000000e+00
+13753 13753 1.00000000000000e+00
+13754 13754 1.00000000000000e+00
+13755 13755 1.00000000000000e+00
+13756 13756 1.00000000000000e+00
+13757 13757 1.00000000000000e+00
+13758 13758 1.00000000000000e+00
+13759 13759 1.00000000000000e+00
+13760 13760 1.00000000000000e+00
+13761 13761 1.00000000000000e+00
+13762 13762 1.00000000000000e+00
+13763 13763 1.00000000000000e+00
+13764 13764 1.00000000000000e+00
+13765 13765 1.00000000000000e+00
+13766 13766 1.00000000000000e+00
+13767 13767 1.00000000000000e+00
+13768 13768 1.00000000000000e+00
+13769 13769 1.00000000000000e+00
+13770 13770 1.00000000000000e+00
+13771 13771 1.00000000000000e+00
+13772 13772 1.00000000000000e+00
+13773 13773 1.00000000000000e+00
+13774 13774 1.00000000000000e+00
+13775 13775 1.00000000000000e+00
+13776 13776 1.00000000000000e+00
+13777 13777 1.00000000000000e+00
+13778 13778 1.00000000000000e+00
+13779 13779 1.00000000000000e+00
+13780 13780 1.00000000000000e+00
+13781 13781 1.00000000000000e+00
+13782 13782 1.00000000000000e+00
+13783 13783 1.00000000000000e+00
+13784 13784 1.00000000000000e+00
+13785 13785 1.00000000000000e+00
+13786 13786 1.00000000000000e+00
+13787 13787 1.00000000000000e+00
+13788 13788 1.00000000000000e+00
+13789 13789 1.00000000000000e+00
+13790 13790 1.00000000000000e+00
+13791 13791 1.00000000000000e+00
+13792 13792 1.00000000000000e+00
+13793 13793 1.00000000000000e+00
+13794 13794 1.00000000000000e+00
+13795 13795 1.00000000000000e+00
+13796 13796 1.00000000000000e+00
+13797 13797 1.00000000000000e+00
+13798 13798 1.00000000000000e+00
+13799 13799 1.00000000000000e+00
+13800 13800 1.00000000000000e+00
+13801 13801 1.00000000000000e+00
+13802 13802 1.00000000000000e+00
+13803 13803 1.00000000000000e+00
+13804 13804 1.00000000000000e+00
+13805 13805 1.00000000000000e+00
+13806 13806 1.00000000000000e+00
+13807 13807 1.00000000000000e+00
+13808 13808 1.00000000000000e+00
+13809 13809 1.00000000000000e+00
+13810 13810 1.00000000000000e+00
+13811 13811 1.00000000000000e+00
+13812 13812 1.00000000000000e+00
+13813 13813 1.00000000000000e+00
+13814 13814 1.00000000000000e+00
+13815 13815 1.00000000000000e+00
+13816 13816 1.00000000000000e+00
+13817 13817 1.00000000000000e+00
+13818 13818 1.00000000000000e+00
+13819 13819 1.00000000000000e+00
+13820 13820 1.00000000000000e+00
+13821 13821 1.00000000000000e+00
+13822 13822 1.00000000000000e+00
+13823 13823 1.00000000000000e+00
+13824 13824 1.00000000000000e+00
+13825 13825 1.00000000000000e+00
+13826 13826 1.00000000000000e+00
+13827 13827 1.00000000000000e+00
+13828 13828 1.00000000000000e+00
+13829 13829 1.00000000000000e+00
+13830 13830 1.00000000000000e+00
+13831 13831 1.00000000000000e+00
+13832 13832 1.00000000000000e+00
+13833 13833 1.00000000000000e+00
+13834 13834 1.00000000000000e+00
+13835 13835 1.00000000000000e+00
+13836 13836 1.00000000000000e+00
+13837 13837 1.00000000000000e+00
+13838 13838 1.00000000000000e+00
+13839 13839 1.00000000000000e+00
+13840 13840 1.00000000000000e+00
+13841 13841 1.00000000000000e+00
+13842 13842 1.00000000000000e+00
+13843 13843 1.00000000000000e+00
+13844 13844 1.00000000000000e+00
+13845 13845 1.00000000000000e+00
+13846 13846 1.00000000000000e+00
+13847 13847 1.00000000000000e+00
+13848 13848 1.00000000000000e+00
+13849 13849 1.00000000000000e+00
+13850 13850 1.00000000000000e+00
+13851 13851 1.00000000000000e+00
+13852 13852 1.00000000000000e+00
+13853 13853 1.00000000000000e+00
+13854 13854 1.00000000000000e+00
+13855 13855 1.00000000000000e+00
+13856 13856 1.00000000000000e+00
+13857 13857 1.00000000000000e+00
+13858 13858 1.00000000000000e+00
+13859 13859 1.00000000000000e+00
+13860 13860 1.00000000000000e+00
+13861 13861 1.00000000000000e+00
+13862 13862 1.00000000000000e+00
+13863 13863 1.00000000000000e+00
+13864 13864 1.00000000000000e+00
+13865 13865 1.00000000000000e+00
+13866 13866 1.00000000000000e+00
+13867 13867 1.00000000000000e+00
+13868 13868 1.00000000000000e+00
+13869 13869 1.00000000000000e+00
+13870 13870 1.00000000000000e+00
+13871 13871 1.00000000000000e+00
+13872 13872 1.00000000000000e+00
+13873 13873 1.00000000000000e+00
+13874 13874 1.00000000000000e+00
+13875 13875 1.00000000000000e+00
+13876 13876 1.00000000000000e+00
+13877 13877 1.00000000000000e+00
+13878 13878 1.00000000000000e+00
+13879 13879 1.00000000000000e+00
+13880 13880 1.00000000000000e+00
+13881 13881 1.00000000000000e+00
+13882 13882 1.00000000000000e+00
+13883 13883 1.00000000000000e+00
+13884 13884 1.00000000000000e+00
+13885 13885 1.00000000000000e+00
+13886 13886 1.00000000000000e+00
+13887 13887 1.00000000000000e+00
+13888 13888 1.00000000000000e+00
+13889 13889 1.00000000000000e+00
+13890 13890 1.00000000000000e+00
+13891 13891 1.00000000000000e+00
+13892 13892 1.00000000000000e+00
+13893 13893 1.00000000000000e+00
+13894 13894 1.00000000000000e+00
+13895 13895 1.00000000000000e+00
+13896 13896 1.00000000000000e+00
+13897 13897 1.00000000000000e+00
+13898 13898 1.00000000000000e+00
+13899 13899 1.00000000000000e+00
+13900 13900 1.00000000000000e+00
+13901 13901 1.00000000000000e+00
+13902 13902 1.00000000000000e+00
+13903 13903 1.00000000000000e+00
+13904 13904 1.00000000000000e+00
+13905 13905 1.00000000000000e+00
+13906 13906 1.00000000000000e+00
+13907 13907 1.00000000000000e+00
+13908 13908 1.00000000000000e+00
+13909 13909 1.00000000000000e+00
+13910 13910 1.00000000000000e+00
+13911 13911 1.00000000000000e+00
+13912 13912 1.00000000000000e+00
+13913 13913 1.00000000000000e+00
+13914 13914 1.00000000000000e+00
+13915 13915 1.00000000000000e+00
+13916 13916 1.00000000000000e+00
+13917 13917 1.00000000000000e+00
+13918 13918 1.00000000000000e+00
+13919 13919 1.00000000000000e+00
+13920 13920 1.00000000000000e+00
+13921 13921 1.00000000000000e+00
+13922 13922 1.00000000000000e+00
+13923 13923 1.00000000000000e+00
+13924 13924 1.00000000000000e+00
+13925 13925 1.00000000000000e+00
+13926 13926 1.00000000000000e+00
+13927 13927 1.00000000000000e+00
+13928 13928 1.00000000000000e+00
+13929 13929 1.00000000000000e+00
+13930 13930 1.00000000000000e+00
+13931 13931 1.00000000000000e+00
+13932 13932 1.00000000000000e+00
+13933 13933 1.00000000000000e+00
+13934 13934 1.00000000000000e+00
+13935 13935 1.00000000000000e+00
+13936 13936 1.00000000000000e+00
+13937 13937 1.00000000000000e+00
+13938 13938 1.00000000000000e+00
+13939 13939 1.00000000000000e+00
+13940 13940 1.00000000000000e+00
+13941 13941 1.00000000000000e+00
+13942 13942 1.00000000000000e+00
+13943 13943 1.00000000000000e+00
+13944 13944 1.00000000000000e+00
+13945 13945 1.00000000000000e+00
+13946 13946 1.00000000000000e+00
+13947 13947 1.00000000000000e+00
+13948 13948 1.00000000000000e+00
+13949 13949 1.00000000000000e+00
+13950 13950 1.00000000000000e+00
+13951 13951 1.00000000000000e+00
+13952 13952 1.00000000000000e+00
+13953 13953 1.00000000000000e+00
+13954 13954 1.00000000000000e+00
+13955 13955 1.00000000000000e+00
+13956 13956 1.00000000000000e+00
+13957 13957 1.00000000000000e+00
+13958 13958 1.00000000000000e+00
+13959 13959 1.00000000000000e+00
+13960 13960 1.00000000000000e+00
+13961 13961 1.00000000000000e+00
+13962 13962 1.00000000000000e+00
+13963 13963 1.00000000000000e+00
+13964 13964 1.00000000000000e+00
+13965 13965 1.00000000000000e+00
+13966 13966 1.00000000000000e+00
+13967 13967 1.00000000000000e+00
+13968 13968 1.00000000000000e+00
+13969 13969 1.00000000000000e+00
+13970 13970 1.00000000000000e+00
+13971 13971 1.00000000000000e+00
+13972 13972 1.00000000000000e+00
+13973 13973 1.00000000000000e+00
+13974 13974 1.00000000000000e+00
+13975 13975 1.00000000000000e+00
+13976 13976 1.00000000000000e+00
+13977 13977 1.00000000000000e+00
+13978 13978 1.00000000000000e+00
+13979 13979 1.00000000000000e+00
+13980 13980 1.00000000000000e+00
+13981 13981 1.00000000000000e+00
+13982 13982 1.00000000000000e+00
+13983 13983 1.00000000000000e+00
+13984 13984 1.00000000000000e+00
+13985 13985 1.00000000000000e+00
+13986 13986 1.00000000000000e+00
+13987 13987 1.00000000000000e+00
+13988 13988 1.00000000000000e+00
+13989 13989 1.00000000000000e+00
+13990 13990 1.00000000000000e+00
+13991 13991 1.00000000000000e+00
+13992 13992 1.00000000000000e+00
+13993 13993 1.00000000000000e+00
+13994 13994 1.00000000000000e+00
+13995 13995 1.00000000000000e+00
+13996 13996 1.00000000000000e+00
+13997 13997 1.00000000000000e+00
+13998 13998 1.00000000000000e+00
+13999 13999 1.00000000000000e+00
+14000 14000 1.00000000000000e+00
+14001 14001 1.00000000000000e+00
+14002 14002 1.00000000000000e+00
+14003 14003 1.00000000000000e+00
+14004 14004 1.00000000000000e+00
+14005 14005 1.00000000000000e+00
+14006 14006 1.00000000000000e+00
+14007 14007 1.00000000000000e+00
+14008 14008 1.00000000000000e+00
+14009 14009 1.00000000000000e+00
+14010 14010 1.00000000000000e+00
+14011 14011 1.00000000000000e+00
+14012 14012 1.00000000000000e+00
+14013 14013 1.00000000000000e+00
+14014 14014 1.00000000000000e+00
+14015 14015 1.00000000000000e+00
+14016 14016 1.00000000000000e+00
+14017 14017 1.00000000000000e+00
+14018 14018 1.00000000000000e+00
+14019 14019 1.00000000000000e+00
+14020 14020 1.00000000000000e+00
+14021 14021 1.00000000000000e+00
+14022 14022 1.00000000000000e+00
+14023 14023 1.00000000000000e+00
+14024 14024 1.00000000000000e+00
+14025 14025 1.00000000000000e+00
+14026 14026 1.00000000000000e+00
+14027 14027 1.00000000000000e+00
+14028 14028 1.00000000000000e+00
+14029 14029 1.00000000000000e+00
+14030 14030 1.00000000000000e+00
+14031 14031 1.00000000000000e+00
+14032 14032 1.00000000000000e+00
+14033 14033 1.00000000000000e+00
+14034 14034 1.00000000000000e+00
+14035 14035 1.00000000000000e+00
+14036 14036 1.00000000000000e+00
+14037 14037 1.00000000000000e+00
+14038 14038 1.00000000000000e+00
+14039 14039 1.00000000000000e+00
+14040 14040 1.00000000000000e+00
+14041 14041 1.00000000000000e+00
+14042 14042 1.00000000000000e+00
+14043 14043 1.00000000000000e+00
+14044 14044 1.00000000000000e+00
+14045 14045 1.00000000000000e+00
+14046 14046 1.00000000000000e+00
+14047 14047 1.00000000000000e+00
+14048 14048 1.00000000000000e+00
+14049 14049 1.00000000000000e+00
+14050 14050 1.00000000000000e+00
+14051 14051 1.00000000000000e+00
+14052 14052 1.00000000000000e+00
+14053 14053 1.00000000000000e+00
+14054 14054 1.00000000000000e+00
+14055 14055 1.00000000000000e+00
+14056 14056 1.00000000000000e+00
+14057 14057 1.00000000000000e+00
+14058 14058 1.00000000000000e+00
+14059 14059 1.00000000000000e+00
+14060 14060 1.00000000000000e+00
+14061 14061 1.00000000000000e+00
+14062 14062 1.00000000000000e+00
+14063 14063 1.00000000000000e+00
+14064 14064 1.00000000000000e+00
+14065 14065 1.00000000000000e+00
+14066 14066 1.00000000000000e+00
+14067 14067 1.00000000000000e+00
+14068 14068 1.00000000000000e+00
+14069 14069 1.00000000000000e+00
+14070 14070 1.00000000000000e+00
+14071 14071 1.00000000000000e+00
+14072 14072 1.00000000000000e+00
+14073 14073 1.00000000000000e+00
+14074 14074 1.00000000000000e+00
+14075 14075 1.00000000000000e+00
+14076 14076 1.00000000000000e+00
+14077 14077 1.00000000000000e+00
+14078 14078 1.00000000000000e+00
+14079 14079 1.00000000000000e+00
+14080 14080 1.00000000000000e+00
+14081 14081 1.00000000000000e+00
+14082 14082 1.00000000000000e+00
+14083 14083 1.00000000000000e+00
+14084 14084 1.00000000000000e+00
+14085 14085 1.00000000000000e+00
+14086 14086 1.00000000000000e+00
+14087 14087 1.00000000000000e+00
+14088 14088 1.00000000000000e+00
+14089 14089 1.00000000000000e+00
+14090 14090 1.00000000000000e+00
+14091 14091 1.00000000000000e+00
+14092 14092 1.00000000000000e+00
+14093 14093 1.00000000000000e+00
+14094 14094 1.00000000000000e+00
+14095 14095 1.00000000000000e+00
+14096 14096 1.00000000000000e+00
+14097 14097 1.00000000000000e+00
+14098 14098 1.00000000000000e+00
+14099 14099 1.00000000000000e+00
+14100 14100 1.00000000000000e+00
+14101 14101 1.00000000000000e+00
+14102 14102 1.00000000000000e+00
+14103 14103 1.00000000000000e+00
+14104 14104 1.00000000000000e+00
+14105 14105 1.00000000000000e+00
+14106 14106 1.00000000000000e+00
+14107 14107 1.00000000000000e+00
+14108 14108 1.00000000000000e+00
+14109 14109 1.00000000000000e+00
+14110 14110 1.00000000000000e+00
+14111 14111 1.00000000000000e+00
+14112 14112 1.00000000000000e+00
+14113 14113 1.00000000000000e+00
+14114 14114 1.00000000000000e+00
+14115 14115 1.00000000000000e+00
+14116 14116 1.00000000000000e+00
+14117 14117 1.00000000000000e+00
+14118 14118 1.00000000000000e+00
+14119 14119 1.00000000000000e+00
+14120 14120 1.00000000000000e+00
+14121 14121 1.00000000000000e+00
+14122 14122 1.00000000000000e+00
+14123 14123 1.00000000000000e+00
+14124 14124 1.00000000000000e+00
+14125 14125 1.00000000000000e+00
+14126 14126 1.00000000000000e+00
+14127 14127 1.00000000000000e+00
+14128 14128 1.00000000000000e+00
+14129 14129 1.00000000000000e+00
+14130 14130 1.00000000000000e+00
+14131 14131 1.00000000000000e+00
+14132 14132 1.00000000000000e+00
+14133 14133 1.00000000000000e+00
+14134 14134 1.00000000000000e+00
+14135 14135 1.00000000000000e+00
+14136 14136 1.00000000000000e+00
+14137 14137 1.00000000000000e+00
+14138 14138 1.00000000000000e+00
+14139 14139 1.00000000000000e+00
+14140 14140 1.00000000000000e+00
+14141 14141 1.00000000000000e+00
+14142 14142 1.00000000000000e+00
+14143 14143 1.00000000000000e+00
+14144 14144 1.00000000000000e+00
+14145 14145 1.00000000000000e+00
+14146 14146 1.00000000000000e+00
+14147 14147 1.00000000000000e+00
+14148 14148 1.00000000000000e+00
+14149 14149 1.00000000000000e+00
+14150 14150 1.00000000000000e+00
+14151 14151 1.00000000000000e+00
+14152 14152 1.00000000000000e+00
+14153 14153 1.00000000000000e+00
+14154 14154 1.00000000000000e+00
+14155 14155 1.00000000000000e+00
+14156 14156 1.00000000000000e+00
+14157 14157 1.00000000000000e+00
+14158 14158 1.00000000000000e+00
+14159 14159 1.00000000000000e+00
+14160 14160 1.00000000000000e+00
+14161 14161 1.00000000000000e+00
+14162 14162 1.00000000000000e+00
+14163 14163 1.00000000000000e+00
+14164 14164 1.00000000000000e+00
+14165 14165 1.00000000000000e+00
+14166 14166 1.00000000000000e+00
+14167 14167 1.00000000000000e+00
+14168 14168 1.00000000000000e+00
+14169 14169 1.00000000000000e+00
+14170 14170 1.00000000000000e+00
+14171 14171 1.00000000000000e+00
+14172 14172 1.00000000000000e+00
+14173 14173 1.00000000000000e+00
+14174 14174 1.00000000000000e+00
+14175 14175 1.00000000000000e+00
+14176 14176 1.00000000000000e+00
+14177 14177 1.00000000000000e+00
+14178 14178 1.00000000000000e+00
+14179 14179 1.00000000000000e+00
+14180 14180 1.00000000000000e+00
+14181 14181 1.00000000000000e+00
+14182 14182 1.00000000000000e+00
+14183 14183 1.00000000000000e+00
+14184 14184 1.00000000000000e+00
+14185 14185 1.00000000000000e+00
+14186 14186 1.00000000000000e+00
+14187 14187 1.00000000000000e+00
+14188 14188 1.00000000000000e+00
+14189 14189 1.00000000000000e+00
+14190 14190 1.00000000000000e+00
+14191 14191 1.00000000000000e+00
+14192 14192 1.00000000000000e+00
+14193 14193 1.00000000000000e+00
+14194 14194 1.00000000000000e+00
+14195 14195 1.00000000000000e+00
+14196 14196 1.00000000000000e+00
+14197 14197 1.00000000000000e+00
+14198 14198 1.00000000000000e+00
+14199 14199 1.00000000000000e+00
+14200 14200 1.00000000000000e+00
+14201 14201 1.00000000000000e+00
+14202 14202 1.00000000000000e+00
+14203 14203 1.00000000000000e+00
+14204 14204 1.00000000000000e+00
+14205 14205 1.00000000000000e+00
+14206 14206 1.00000000000000e+00
+14207 14207 1.00000000000000e+00
+14208 14208 1.00000000000000e+00
+14209 14209 1.00000000000000e+00
+14210 14210 1.00000000000000e+00
+14211 14211 1.00000000000000e+00
+14212 14212 1.00000000000000e+00
+14213 14213 1.00000000000000e+00
+14214 14214 1.00000000000000e+00
+14215 14215 1.00000000000000e+00
+14216 14216 1.00000000000000e+00
+14217 14217 1.00000000000000e+00
+14218 14218 1.00000000000000e+00
+14219 14219 1.00000000000000e+00
+14220 14220 1.00000000000000e+00
+14221 14221 1.00000000000000e+00
+14222 14222 1.00000000000000e+00
+14223 14223 1.00000000000000e+00
+14224 14224 1.00000000000000e+00
+14225 14225 1.00000000000000e+00
+14226 14226 1.00000000000000e+00
+14227 14227 1.00000000000000e+00
+14228 14228 1.00000000000000e+00
+14229 14229 1.00000000000000e+00
+14230 14230 1.00000000000000e+00
+14231 14231 1.00000000000000e+00
+14232 14232 1.00000000000000e+00
+14233 14233 1.00000000000000e+00
+14234 14234 1.00000000000000e+00
+14235 14235 1.00000000000000e+00
+14236 14236 1.00000000000000e+00
+14237 14237 1.00000000000000e+00
+14238 14238 1.00000000000000e+00
+14239 14239 1.00000000000000e+00
+14240 14240 1.00000000000000e+00
+14241 14241 1.00000000000000e+00
+14242 14242 1.00000000000000e+00
+14243 14243 1.00000000000000e+00
+14244 14244 1.00000000000000e+00
+14245 14245 1.00000000000000e+00
+14246 14246 1.00000000000000e+00
+14247 14247 1.00000000000000e+00
+14248 14248 1.00000000000000e+00
+14249 14249 1.00000000000000e+00
+14250 14250 1.00000000000000e+00
+14251 14251 1.00000000000000e+00
+14252 14252 1.00000000000000e+00
+14253 14253 1.00000000000000e+00
+14254 14254 1.00000000000000e+00
+14255 14255 1.00000000000000e+00
+14256 14256 1.00000000000000e+00
+14257 14257 1.00000000000000e+00
+14258 14258 1.00000000000000e+00
+14259 14259 1.00000000000000e+00
+14260 14260 1.00000000000000e+00
+14261 14261 1.00000000000000e+00
+14262 14262 1.00000000000000e+00
+14263 14263 1.00000000000000e+00
+14264 14264 1.00000000000000e+00
+14265 14265 1.00000000000000e+00
+14266 14266 1.00000000000000e+00
+14267 14267 1.00000000000000e+00
+14268 14268 1.00000000000000e+00
+14269 14269 1.00000000000000e+00
+14270 14270 1.00000000000000e+00
+14271 14271 1.00000000000000e+00
+14272 14272 1.00000000000000e+00
+14273 14273 1.00000000000000e+00
+14274 14274 1.00000000000000e+00
+14275 14275 1.00000000000000e+00
+14276 14276 1.00000000000000e+00
+14277 14277 1.00000000000000e+00
+14278 14278 1.00000000000000e+00
+14279 14279 1.00000000000000e+00
+14280 14280 1.00000000000000e+00
+14281 14281 1.00000000000000e+00
+14282 14282 1.00000000000000e+00
+14283 14283 1.00000000000000e+00
+14284 14284 1.00000000000000e+00
+14285 14285 1.00000000000000e+00
+14286 14286 1.00000000000000e+00
+14287 14287 1.00000000000000e+00
+14288 14288 1.00000000000000e+00
+14289 14289 1.00000000000000e+00
+14290 14290 1.00000000000000e+00
+14291 14291 1.00000000000000e+00
+14292 14292 1.00000000000000e+00
+14293 14293 1.00000000000000e+00
+14294 14294 1.00000000000000e+00
+14295 14295 1.00000000000000e+00
+14296 14296 1.00000000000000e+00
+14297 14297 1.00000000000000e+00
+14298 14298 1.00000000000000e+00
+14299 14299 1.00000000000000e+00
+14300 14300 1.00000000000000e+00
+14301 14301 1.00000000000000e+00
+14302 14302 1.00000000000000e+00
+14303 14303 1.00000000000000e+00
+14304 14304 1.00000000000000e+00
+14305 14305 1.00000000000000e+00
+14306 14306 1.00000000000000e+00
+14307 14307 1.00000000000000e+00
+14308 14308 1.00000000000000e+00
+14309 14309 1.00000000000000e+00
+14310 14310 1.00000000000000e+00
+14311 14311 1.00000000000000e+00
+14312 14312 1.00000000000000e+00
+14313 14313 1.00000000000000e+00
+14314 14314 1.00000000000000e+00
+14315 14315 1.00000000000000e+00
+14316 14316 1.00000000000000e+00
+14317 14317 1.00000000000000e+00
+14318 14318 1.00000000000000e+00
+14319 14319 1.00000000000000e+00
+14320 14320 1.00000000000000e+00
+14321 14321 1.00000000000000e+00
+14322 14322 1.00000000000000e+00
+14323 14323 1.00000000000000e+00
+14324 14324 1.00000000000000e+00
+14325 14325 1.00000000000000e+00
+14326 14326 1.00000000000000e+00
+14327 14327 1.00000000000000e+00
+14328 14328 1.00000000000000e+00
+14329 14329 1.00000000000000e+00
+14330 14330 1.00000000000000e+00
+14331 14331 1.00000000000000e+00
+14332 14332 1.00000000000000e+00
+14333 14333 1.00000000000000e+00
+14334 14334 1.00000000000000e+00
+14335 14335 1.00000000000000e+00
+14336 14336 1.00000000000000e+00
+14337 14337 1.00000000000000e+00
+14338 14338 1.00000000000000e+00
+14339 14339 1.00000000000000e+00
+14340 14340 1.00000000000000e+00
+14341 14341 1.00000000000000e+00
+14342 14342 1.00000000000000e+00
+14343 14343 1.00000000000000e+00
+14344 14344 1.00000000000000e+00
+14345 14345 1.00000000000000e+00
+14346 14346 1.00000000000000e+00
+14347 14347 1.00000000000000e+00
+14348 14348 1.00000000000000e+00
+14349 14349 1.00000000000000e+00
+14350 14350 1.00000000000000e+00
+14351 14351 1.00000000000000e+00
+14352 14352 1.00000000000000e+00
+14353 14353 1.00000000000000e+00
+14354 14354 1.00000000000000e+00
+14355 14355 1.00000000000000e+00
+14356 14356 1.00000000000000e+00
+14357 14357 1.00000000000000e+00
+14358 14358 1.00000000000000e+00
+14359 14359 1.00000000000000e+00
+14360 14360 1.00000000000000e+00
+14361 14361 1.00000000000000e+00
+14362 14362 1.00000000000000e+00
+14363 14363 1.00000000000000e+00
+14364 14364 1.00000000000000e+00
+14365 14365 1.00000000000000e+00
+14366 14366 1.00000000000000e+00
+14367 14367 1.00000000000000e+00
+14368 14368 1.00000000000000e+00
+14369 14369 1.00000000000000e+00
+14370 14370 1.00000000000000e+00
+14371 14371 1.00000000000000e+00
+14372 14372 1.00000000000000e+00
+14373 14373 1.00000000000000e+00
+14374 14374 1.00000000000000e+00
+14375 14375 1.00000000000000e+00
+14376 14376 1.00000000000000e+00
+14377 14377 1.00000000000000e+00
+14378 14378 1.00000000000000e+00
+14379 14379 1.00000000000000e+00
+14380 14380 1.00000000000000e+00
+14381 14381 1.00000000000000e+00
+14382 14382 1.00000000000000e+00
+14383 14383 1.00000000000000e+00
+14384 14384 1.00000000000000e+00
+14385 14385 1.00000000000000e+00
+14386 14386 1.00000000000000e+00
+14387 14387 1.00000000000000e+00
+14388 14388 1.00000000000000e+00
+14389 14389 1.00000000000000e+00
+14390 14390 1.00000000000000e+00
+14391 14391 1.00000000000000e+00
+14392 14392 1.00000000000000e+00
+14393 14393 1.00000000000000e+00
+14394 14394 1.00000000000000e+00
+14395 14395 1.00000000000000e+00
+14396 14396 1.00000000000000e+00
+14397 14397 1.00000000000000e+00
+14398 14398 1.00000000000000e+00
+14399 14399 1.00000000000000e+00
+14400 14400 1.00000000000000e+00
+14401 14401 1.00000000000000e+00
+14402 14402 1.00000000000000e+00
+14403 14403 1.00000000000000e+00
+14404 14404 1.00000000000000e+00
+14405 14405 1.00000000000000e+00
+14406 14406 1.00000000000000e+00
+14407 14407 1.00000000000000e+00
+14408 14408 1.00000000000000e+00
+14409 14409 1.00000000000000e+00
+14410 14410 1.00000000000000e+00
+14411 14411 1.00000000000000e+00
+14412 14412 1.00000000000000e+00
+14413 14413 1.00000000000000e+00
+14414 14414 1.00000000000000e+00
+14415 14415 1.00000000000000e+00
+14416 14416 1.00000000000000e+00
+14417 14417 1.00000000000000e+00
+14418 14418 1.00000000000000e+00
+14419 14419 1.00000000000000e+00
+14420 14420 1.00000000000000e+00
+14421 14421 1.00000000000000e+00
+14422 14422 1.00000000000000e+00
+14423 14423 1.00000000000000e+00
+14424 14424 1.00000000000000e+00
+14425 14425 1.00000000000000e+00
+14426 14426 1.00000000000000e+00
+14427 14427 1.00000000000000e+00
+14428 14428 1.00000000000000e+00
+14429 14429 1.00000000000000e+00
+14430 14430 1.00000000000000e+00
+14431 14431 1.00000000000000e+00
+14432 14432 1.00000000000000e+00
+14433 14433 1.00000000000000e+00
+14434 14434 1.00000000000000e+00
+14435 14435 1.00000000000000e+00
+14436 14436 1.00000000000000e+00
+14437 14437 1.00000000000000e+00
+14438 14438 1.00000000000000e+00
+14439 14439 1.00000000000000e+00
+14440 14440 1.00000000000000e+00
+14441 14441 1.00000000000000e+00
+14442 14442 1.00000000000000e+00
+14443 14443 1.00000000000000e+00
+14444 14444 1.00000000000000e+00
+14445 14445 1.00000000000000e+00
+14446 14446 1.00000000000000e+00
+14447 14447 1.00000000000000e+00
+14448 14448 1.00000000000000e+00
+14449 14449 1.00000000000000e+00
+14450 14450 1.00000000000000e+00
+14451 14451 1.00000000000000e+00
+14452 14452 1.00000000000000e+00
+14453 14453 1.00000000000000e+00
+14454 14454 1.00000000000000e+00
+14455 14455 1.00000000000000e+00
+14456 14456 1.00000000000000e+00
+14457 14457 1.00000000000000e+00
+14458 14458 1.00000000000000e+00
+14459 14459 1.00000000000000e+00
+14460 14460 1.00000000000000e+00
+14461 14461 1.00000000000000e+00
+14462 14462 1.00000000000000e+00
+14463 14463 1.00000000000000e+00
+14464 14464 1.00000000000000e+00
+14465 14465 1.00000000000000e+00
+14466 14466 1.00000000000000e+00
+14467 14467 1.00000000000000e+00
+14468 14468 1.00000000000000e+00
+14469 14469 1.00000000000000e+00
+14470 14470 1.00000000000000e+00
+14471 14471 1.00000000000000e+00
+14472 14472 1.00000000000000e+00
+14473 14473 1.00000000000000e+00
+14474 14474 1.00000000000000e+00
+14475 14475 1.00000000000000e+00
+14476 14476 1.00000000000000e+00
+14477 14477 1.00000000000000e+00
+14478 14478 1.00000000000000e+00
+14479 14479 1.00000000000000e+00
+14480 14480 1.00000000000000e+00
+14481 14481 1.00000000000000e+00
+14482 14482 1.00000000000000e+00
+14483 14483 1.00000000000000e+00
+14484 14484 1.00000000000000e+00
+14485 14485 1.00000000000000e+00
+14486 14486 1.00000000000000e+00
+14487 14487 1.00000000000000e+00
+14488 14488 1.00000000000000e+00
+14489 14489 1.00000000000000e+00
+14490 14490 1.00000000000000e+00
+14491 14491 1.00000000000000e+00
+14492 14492 1.00000000000000e+00
+14493 14493 1.00000000000000e+00
+14494 14494 1.00000000000000e+00
+14495 14495 1.00000000000000e+00
+14496 14496 1.00000000000000e+00
+14497 14497 1.00000000000000e+00
+14498 14498 1.00000000000000e+00
+14499 14499 1.00000000000000e+00
+14500 14500 1.00000000000000e+00
+14501 14501 1.00000000000000e+00
+14502 14502 1.00000000000000e+00
+14503 14503 1.00000000000000e+00
+14504 14504 1.00000000000000e+00
+14505 14505 1.00000000000000e+00
+14506 14506 1.00000000000000e+00
+14507 14507 1.00000000000000e+00
+14508 14508 1.00000000000000e+00
+14509 14509 1.00000000000000e+00
+14510 14510 1.00000000000000e+00
+14511 14511 1.00000000000000e+00
+14512 14512 1.00000000000000e+00
+14513 14513 1.00000000000000e+00
+14514 14514 1.00000000000000e+00
+14515 14515 1.00000000000000e+00
+14516 14516 1.00000000000000e+00
+14517 14517 1.00000000000000e+00
+14518 14518 1.00000000000000e+00
+14519 14519 1.00000000000000e+00
+14520 14520 1.00000000000000e+00
+14521 14521 1.00000000000000e+00
+14522 14522 1.00000000000000e+00
+14523 14523 1.00000000000000e+00
+14524 14524 1.00000000000000e+00
+14525 14525 1.00000000000000e+00
+14526 14526 1.00000000000000e+00
+14527 14527 1.00000000000000e+00
+14528 14528 1.00000000000000e+00
+14529 14529 1.00000000000000e+00
+14530 14530 1.00000000000000e+00
+14531 14531 1.00000000000000e+00
+14532 14532 1.00000000000000e+00
+14533 14533 1.00000000000000e+00
+14534 14534 1.00000000000000e+00
+14535 14535 1.00000000000000e+00
+14536 14536 1.00000000000000e+00
+14537 14537 1.00000000000000e+00
+14538 14538 1.00000000000000e+00
+14539 14539 1.00000000000000e+00
+14540 14540 1.00000000000000e+00
+14541 14541 1.00000000000000e+00
+14542 14542 1.00000000000000e+00
+14543 14543 1.00000000000000e+00
+14544 14544 1.00000000000000e+00
+14545 14545 1.00000000000000e+00
+14546 14546 1.00000000000000e+00
+14547 14547 1.00000000000000e+00
+14548 14548 1.00000000000000e+00
+14549 14549 1.00000000000000e+00
+14550 14550 1.00000000000000e+00
+14551 14551 1.00000000000000e+00
+14552 14552 1.00000000000000e+00
+14553 14553 1.00000000000000e+00
+14554 14554 1.00000000000000e+00
+14555 14555 1.00000000000000e+00
+14556 14556 1.00000000000000e+00
+14557 14557 1.00000000000000e+00
+14558 14558 1.00000000000000e+00
+14559 14559 1.00000000000000e+00
+14560 14560 1.00000000000000e+00
+14561 14561 1.00000000000000e+00
+14562 14562 1.00000000000000e+00
+14563 14563 1.00000000000000e+00
+14564 14564 1.00000000000000e+00
+14565 14565 1.00000000000000e+00
+14566 14566 1.00000000000000e+00
+14567 14567 1.00000000000000e+00
+14568 14568 1.00000000000000e+00
+14569 14569 1.00000000000000e+00
+14570 14570 1.00000000000000e+00
+14571 14571 1.00000000000000e+00
+14572 14572 1.00000000000000e+00
+14573 14573 1.00000000000000e+00
+14574 14574 1.00000000000000e+00
+14575 14575 1.00000000000000e+00
+14576 14576 1.00000000000000e+00
+14577 14577 1.00000000000000e+00
+14578 14578 1.00000000000000e+00
+14579 14579 1.00000000000000e+00
+14580 14580 1.00000000000000e+00
+14581 14581 1.00000000000000e+00
+14582 14582 1.00000000000000e+00
+14583 14583 1.00000000000000e+00
+14584 14584 1.00000000000000e+00
+14585 14585 1.00000000000000e+00
+14586 14586 1.00000000000000e+00
+14587 14587 1.00000000000000e+00
+14588 14588 1.00000000000000e+00
+14589 14589 1.00000000000000e+00
+14590 14590 1.00000000000000e+00
+14591 14591 1.00000000000000e+00
+14592 14592 1.00000000000000e+00
+14593 14593 1.00000000000000e+00
+14594 14594 1.00000000000000e+00
+14595 14595 1.00000000000000e+00
+14596 14596 1.00000000000000e+00
+14597 14597 1.00000000000000e+00
+14598 14598 1.00000000000000e+00
+14599 14599 1.00000000000000e+00
+14600 14600 1.00000000000000e+00
+14601 14601 1.00000000000000e+00
+14602 14602 1.00000000000000e+00
+14603 14603 1.00000000000000e+00
+14604 14604 1.00000000000000e+00
+14605 14605 1.00000000000000e+00
+14606 14606 1.00000000000000e+00
+14607 14607 1.00000000000000e+00
+14608 14608 1.00000000000000e+00
+14609 14609 1.00000000000000e+00
+14610 14610 1.00000000000000e+00
+14611 14611 1.00000000000000e+00
+14612 14612 1.00000000000000e+00
+14613 14613 1.00000000000000e+00
+14614 14614 1.00000000000000e+00
+14615 14615 1.00000000000000e+00
+14616 14616 1.00000000000000e+00
+14617 14617 1.00000000000000e+00
+14618 14618 1.00000000000000e+00
+14619 14619 1.00000000000000e+00
+14620 14620 1.00000000000000e+00
+14621 14621 1.00000000000000e+00
+14622 14622 1.00000000000000e+00
+14623 14623 1.00000000000000e+00
+14624 14624 1.00000000000000e+00
+14625 14625 1.00000000000000e+00
+14626 14626 1.00000000000000e+00
+14627 14627 1.00000000000000e+00
+14628 14628 1.00000000000000e+00
+14629 14629 1.00000000000000e+00
+14630 14630 1.00000000000000e+00
+14631 14631 1.00000000000000e+00
+14632 14632 1.00000000000000e+00
+14633 14633 1.00000000000000e+00
+14634 14634 1.00000000000000e+00
+14635 14635 1.00000000000000e+00
+14636 14636 1.00000000000000e+00
+14637 14637 1.00000000000000e+00
+14638 14638 1.00000000000000e+00
+14639 14639 1.00000000000000e+00
+14640 14640 1.00000000000000e+00
+14641 14641 1.00000000000000e+00
+14642 14642 1.00000000000000e+00
+14643 14643 1.00000000000000e+00
+14644 14644 1.00000000000000e+00
+14645 14645 1.00000000000000e+00
+14646 14646 1.00000000000000e+00
+14647 14647 1.00000000000000e+00
+14648 14648 1.00000000000000e+00
+14649 14649 1.00000000000000e+00
+14650 14650 1.00000000000000e+00
+14651 14651 1.00000000000000e+00
+14652 14652 1.00000000000000e+00
+14653 14653 1.00000000000000e+00
+14654 14654 1.00000000000000e+00
+14655 14655 1.00000000000000e+00
+14656 14656 1.00000000000000e+00
+14657 14657 1.00000000000000e+00
+14658 14658 1.00000000000000e+00
+14659 14659 1.00000000000000e+00
+14660 14660 1.00000000000000e+00
+14661 14661 1.00000000000000e+00
+14662 14662 1.00000000000000e+00
+14663 14663 1.00000000000000e+00
+14664 14664 1.00000000000000e+00
+14665 14665 1.00000000000000e+00
+14666 14666 1.00000000000000e+00
+14667 14667 1.00000000000000e+00
+14668 14668 1.00000000000000e+00
+14669 14669 1.00000000000000e+00
+14670 14670 1.00000000000000e+00
+14671 14671 1.00000000000000e+00
+14672 14672 1.00000000000000e+00
+14673 14673 1.00000000000000e+00
+14674 14674 1.00000000000000e+00
+14675 14675 1.00000000000000e+00
+14676 14676 1.00000000000000e+00
+14677 14677 1.00000000000000e+00
+14678 14678 1.00000000000000e+00
+14679 14679 1.00000000000000e+00
+14680 14680 1.00000000000000e+00
+14681 14681 1.00000000000000e+00
+14682 14682 1.00000000000000e+00
+14683 14683 1.00000000000000e+00
+14684 14684 1.00000000000000e+00
+14685 14685 1.00000000000000e+00
+14686 14686 1.00000000000000e+00
+14687 14687 1.00000000000000e+00
+14688 14688 1.00000000000000e+00
+14689 14689 1.00000000000000e+00
+14690 14690 1.00000000000000e+00
+14691 14691 1.00000000000000e+00
+14692 14692 1.00000000000000e+00
+14693 14693 1.00000000000000e+00
+14694 14694 1.00000000000000e+00
+14695 14695 1.00000000000000e+00
+14696 14696 1.00000000000000e+00
+14697 14697 1.00000000000000e+00
+14698 14698 1.00000000000000e+00
+14699 14699 1.00000000000000e+00
+14700 14700 1.00000000000000e+00
+14701 14701 1.00000000000000e+00
+14702 14702 1.00000000000000e+00
+14703 14703 1.00000000000000e+00
+14704 14704 1.00000000000000e+00
+14705 14705 1.00000000000000e+00
+14706 14706 1.00000000000000e+00
+14707 14707 1.00000000000000e+00
+14708 14708 1.00000000000000e+00
+14709 14709 1.00000000000000e+00
+14710 14710 1.00000000000000e+00
+14711 14711 1.00000000000000e+00
+14712 14712 1.00000000000000e+00
+14713 14713 1.00000000000000e+00
+14714 14714 1.00000000000000e+00
+14715 14715 1.00000000000000e+00
+14716 14716 1.00000000000000e+00
+14717 14717 1.00000000000000e+00
+14718 14718 1.00000000000000e+00
+14719 14719 1.00000000000000e+00
+14720 14720 1.00000000000000e+00
+14721 14721 1.00000000000000e+00
+14722 14722 1.00000000000000e+00
+14723 14723 1.00000000000000e+00
+14724 14724 1.00000000000000e+00
+14725 14725 1.00000000000000e+00
+14726 14726 1.00000000000000e+00
+14727 14727 1.00000000000000e+00
+14728 14728 1.00000000000000e+00
+14729 14729 1.00000000000000e+00
+14730 14730 1.00000000000000e+00
+14731 14731 1.00000000000000e+00
+14732 14732 1.00000000000000e+00
+14733 14733 1.00000000000000e+00
+14734 14734 1.00000000000000e+00
+14735 14735 1.00000000000000e+00
+14736 14736 1.00000000000000e+00
+14737 14737 1.00000000000000e+00
+14738 14738 1.00000000000000e+00
+14739 14739 1.00000000000000e+00
+14740 14740 1.00000000000000e+00
+14741 14741 1.00000000000000e+00
+14742 14742 1.00000000000000e+00
+14743 14743 1.00000000000000e+00
+14744 14744 1.00000000000000e+00
+14745 14745 1.00000000000000e+00
+14746 14746 1.00000000000000e+00
+14747 14747 1.00000000000000e+00
+14748 14748 1.00000000000000e+00
+14749 14749 1.00000000000000e+00
+14750 14750 1.00000000000000e+00
+14751 14751 1.00000000000000e+00
+14752 14752 1.00000000000000e+00
+14753 14753 1.00000000000000e+00
+14754 14754 1.00000000000000e+00
+14755 14755 1.00000000000000e+00
+14756 14756 1.00000000000000e+00
+14757 14757 1.00000000000000e+00
+14758 14758 1.00000000000000e+00
+14759 14759 1.00000000000000e+00
+14760 14760 1.00000000000000e+00
+14761 14761 1.00000000000000e+00
+14762 14762 1.00000000000000e+00
+14763 14763 1.00000000000000e+00
+14764 14764 1.00000000000000e+00
+14765 14765 1.00000000000000e+00
+14766 14766 1.00000000000000e+00
+14767 14767 1.00000000000000e+00
+14768 14768 1.00000000000000e+00
+14769 14769 1.00000000000000e+00
+14770 14770 1.00000000000000e+00
+14771 14771 1.00000000000000e+00
+14772 14772 1.00000000000000e+00
+14773 14773 1.00000000000000e+00
+14774 14774 1.00000000000000e+00
+14775 14775 1.00000000000000e+00
+14776 14776 1.00000000000000e+00
+14777 14777 1.00000000000000e+00
+14778 14778 1.00000000000000e+00
+14779 14779 1.00000000000000e+00
+14780 14780 1.00000000000000e+00
+14781 14781 1.00000000000000e+00
+14782 14782 1.00000000000000e+00
+14783 14783 1.00000000000000e+00
+14784 14784 1.00000000000000e+00
+14785 14785 1.00000000000000e+00
+14786 14786 1.00000000000000e+00
+14787 14787 1.00000000000000e+00
+14788 14788 1.00000000000000e+00
+14789 14789 1.00000000000000e+00
+14790 14790 1.00000000000000e+00
+14791 14791 1.00000000000000e+00
+14792 14792 1.00000000000000e+00
+14793 14793 1.00000000000000e+00
+14794 14794 1.00000000000000e+00
+14795 14795 1.00000000000000e+00
+14796 14796 1.00000000000000e+00
+14797 14797 1.00000000000000e+00
+14798 14798 1.00000000000000e+00
+14799 14799 1.00000000000000e+00
+14800 14800 1.00000000000000e+00
+14801 14801 1.00000000000000e+00
+14802 14802 1.00000000000000e+00
+14803 14803 1.00000000000000e+00
+14804 14804 1.00000000000000e+00
+14805 14805 1.00000000000000e+00
+14806 14806 1.00000000000000e+00
+14807 14807 1.00000000000000e+00
+14808 14808 1.00000000000000e+00
+14809 14809 1.00000000000000e+00
+14810 14810 1.00000000000000e+00
+14811 14811 1.00000000000000e+00
+14812 14812 1.00000000000000e+00
+14813 14813 1.00000000000000e+00
+14814 14814 1.00000000000000e+00
+14815 14815 1.00000000000000e+00
+14816 14816 1.00000000000000e+00
+14817 14817 1.00000000000000e+00
+14818 14818 1.00000000000000e+00
+14819 14819 1.00000000000000e+00
+14820 14820 1.00000000000000e+00
+14821 14821 1.00000000000000e+00
+14822 14822 1.00000000000000e+00
+14823 14823 1.00000000000000e+00
+14824 14824 1.00000000000000e+00
+14825 14825 1.00000000000000e+00
+14826 14826 1.00000000000000e+00
+14827 14827 1.00000000000000e+00
+14828 14828 1.00000000000000e+00
+14829 14829 1.00000000000000e+00
+14830 14830 1.00000000000000e+00
+14831 14831 1.00000000000000e+00
+14832 14832 1.00000000000000e+00
+14833 14833 1.00000000000000e+00
+14834 14834 1.00000000000000e+00
+14835 14835 1.00000000000000e+00
+14836 14836 1.00000000000000e+00
+14837 14837 1.00000000000000e+00
+14838 14838 1.00000000000000e+00
+14839 14839 1.00000000000000e+00
+14840 14840 1.00000000000000e+00
+14841 14841 1.00000000000000e+00
+14842 14842 1.00000000000000e+00
+14843 14843 1.00000000000000e+00
+14844 14844 1.00000000000000e+00
+14845 14845 1.00000000000000e+00
+14846 14846 1.00000000000000e+00
+14847 14847 1.00000000000000e+00
+14848 14848 1.00000000000000e+00
+14849 14849 1.00000000000000e+00
+14850 14850 1.00000000000000e+00
+14851 14851 1.00000000000000e+00
+14852 14852 1.00000000000000e+00
+14853 14853 1.00000000000000e+00
+14854 14854 1.00000000000000e+00
+14855 14855 1.00000000000000e+00
+14856 14856 1.00000000000000e+00
+14857 14857 1.00000000000000e+00
+14858 14858 1.00000000000000e+00
+14859 14859 1.00000000000000e+00
+14860 14860 1.00000000000000e+00
+14861 14861 1.00000000000000e+00
+14862 14862 1.00000000000000e+00
+14863 14863 1.00000000000000e+00
+14864 14864 1.00000000000000e+00
+14865 14865 1.00000000000000e+00
+14866 14866 1.00000000000000e+00
+14867 14867 1.00000000000000e+00
+14868 14868 1.00000000000000e+00
+14869 14869 1.00000000000000e+00
+14870 14870 1.00000000000000e+00
+14871 14871 1.00000000000000e+00
+14872 14872 1.00000000000000e+00
+14873 14873 1.00000000000000e+00
+14874 14874 1.00000000000000e+00
+14875 14875 1.00000000000000e+00
+14876 14876 1.00000000000000e+00
+14877 14877 1.00000000000000e+00
+14878 14878 1.00000000000000e+00
+14879 14879 1.00000000000000e+00
+14880 14880 1.00000000000000e+00
+14881 14881 1.00000000000000e+00
+14882 14882 1.00000000000000e+00
+14883 14883 1.00000000000000e+00
+14884 14884 1.00000000000000e+00
+14885 14885 1.00000000000000e+00
+14886 14886 1.00000000000000e+00
+14887 14887 1.00000000000000e+00
+14888 14888 1.00000000000000e+00
+14889 14889 1.00000000000000e+00
+14890 14890 1.00000000000000e+00
+14891 14891 1.00000000000000e+00
+14892 14892 1.00000000000000e+00
+14893 14893 1.00000000000000e+00
+14894 14894 1.00000000000000e+00
+14895 14895 1.00000000000000e+00
+14896 14896 1.00000000000000e+00
+14897 14897 1.00000000000000e+00
+14898 14898 1.00000000000000e+00
+14899 14899 1.00000000000000e+00
+14900 14900 1.00000000000000e+00
+14901 14901 1.00000000000000e+00
+14902 14902 1.00000000000000e+00
+14903 14903 1.00000000000000e+00
+14904 14904 1.00000000000000e+00
+14905 14905 1.00000000000000e+00
+14906 14906 1.00000000000000e+00
+14907 14907 1.00000000000000e+00
+14908 14908 1.00000000000000e+00
+14909 14909 1.00000000000000e+00
+14910 14910 1.00000000000000e+00
+14911 14911 1.00000000000000e+00
+14912 14912 1.00000000000000e+00
+14913 14913 1.00000000000000e+00
+14914 14914 1.00000000000000e+00
+14915 14915 1.00000000000000e+00
+14916 14916 1.00000000000000e+00
+14917 14917 1.00000000000000e+00
+14918 14918 1.00000000000000e+00
+14919 14919 1.00000000000000e+00
+14920 14920 1.00000000000000e+00
+14921 14921 1.00000000000000e+00
+14922 14922 1.00000000000000e+00
+14923 14923 1.00000000000000e+00
+14924 14924 1.00000000000000e+00
+14925 14925 1.00000000000000e+00
+14926 14926 1.00000000000000e+00
+14927 14927 1.00000000000000e+00
+14928 14928 1.00000000000000e+00
+14929 14929 1.00000000000000e+00
+14930 14930 1.00000000000000e+00
+14931 14931 1.00000000000000e+00
+14932 14932 1.00000000000000e+00
+14933 14933 1.00000000000000e+00
+14934 14934 1.00000000000000e+00
+14935 14935 1.00000000000000e+00
+14936 14936 1.00000000000000e+00
+14937 14937 1.00000000000000e+00
+14938 14938 1.00000000000000e+00
+14939 14939 1.00000000000000e+00
+14940 14940 1.00000000000000e+00
+14941 14941 1.00000000000000e+00
+14942 14942 1.00000000000000e+00
+14943 14943 1.00000000000000e+00
+14944 14944 1.00000000000000e+00
+14945 14945 1.00000000000000e+00
+14946 14946 1.00000000000000e+00
+14947 14947 1.00000000000000e+00
+14948 14948 1.00000000000000e+00
+14949 14949 1.00000000000000e+00
+14950 14950 1.00000000000000e+00
+14951 14951 1.00000000000000e+00
+14952 14952 1.00000000000000e+00
+14953 14953 1.00000000000000e+00
+14954 14954 1.00000000000000e+00
+14955 14955 1.00000000000000e+00
+14956 14956 1.00000000000000e+00
+14957 14957 1.00000000000000e+00
+14958 14958 1.00000000000000e+00
+14959 14959 1.00000000000000e+00
+14960 14960 1.00000000000000e+00
+14961 14961 1.00000000000000e+00
+14962 14962 1.00000000000000e+00
+14963 14963 1.00000000000000e+00
+14964 14964 1.00000000000000e+00
+14965 14965 1.00000000000000e+00
+14966 14966 1.00000000000000e+00
+14967 14967 1.00000000000000e+00
+14968 14968 1.00000000000000e+00
+14969 14969 1.00000000000000e+00
+14970 14970 1.00000000000000e+00
+14971 14971 1.00000000000000e+00
+14972 14972 1.00000000000000e+00
+14973 14973 1.00000000000000e+00
+14974 14974 1.00000000000000e+00
+14975 14975 1.00000000000000e+00
+14976 14976 1.00000000000000e+00
+14977 14977 1.00000000000000e+00
+14978 14978 1.00000000000000e+00
+14979 14979 1.00000000000000e+00
+14980 14980 1.00000000000000e+00
+14981 14981 1.00000000000000e+00
+14982 14982 1.00000000000000e+00
+14983 14983 1.00000000000000e+00
+14984 14984 1.00000000000000e+00
+14985 14985 1.00000000000000e+00
+14986 14986 1.00000000000000e+00
+14987 14987 1.00000000000000e+00
+14988 14988 1.00000000000000e+00
+14989 14989 1.00000000000000e+00
+14990 14990 1.00000000000000e+00
+14991 14991 1.00000000000000e+00
+14992 14992 1.00000000000000e+00
+14993 14993 1.00000000000000e+00
+14994 14994 1.00000000000000e+00
+14995 14995 1.00000000000000e+00
+14996 14996 1.00000000000000e+00
+14997 14997 1.00000000000000e+00
+14998 14998 1.00000000000000e+00
+14999 14999 1.00000000000000e+00
+15000 2037 -6.22474803362324e-02
+15000 2061 -3.31168804452562e-01
+15000 2085 -3.44015283048547e-03
+15000 2637 -1.86912480621183e+00
+15000 2661 -8.01986008310668e+00
+15000 2685 -9.93950143461300e-01
+15000 2709 -6.75149496405289e-05
+15000 3237 -1.27202318270220e+00
+15000 3261 -2.77159021881337e+00
+15000 3285 -5.40869660850670e-01
+15000 3309 -5.68909072862895e-05
+15000 3837 -7.07189490284714e-03
+15000 3861 -2.04644255858374e-02
+15000 3885 -2.63702574884978e-03
+15000 15000 4.75728965237749e+00
+15000 15024 3.45137496366532e+00
+15000 15048 4.49351467850451e-01
+15000 15408 4.00158194817474e+00
+15000 15432 2.97669063250814e+00
+15000 15456 2.78828473834503e-01
+15000 15816 6.06553463424571e-01
+15000 15840 3.57429471621563e-01
+15000 15864 1.54722114026508e-02
+15001 15001 1.00000000000000e+00
+15002 15002 1.00000000000000e+00
+15003 15003 1.00000000000000e+00
+15004 15004 1.00000000000000e+00
+15005 15005 1.00000000000000e+00
+15006 15006 1.00000000000000e+00
+15007 15007 1.00000000000000e+00
+15008 15008 1.00000000000000e+00
+15009 15009 1.00000000000000e+00
+15010 15010 1.00000000000000e+00
+15011 15011 1.00000000000000e+00
+15012 15012 1.00000000000000e+00
+15013 15013 1.00000000000000e+00
+15014 15014 1.00000000000000e+00
+15015 15015 1.00000000000000e+00
+15016 15016 1.00000000000000e+00
+15017 15017 1.00000000000000e+00
+15018 15018 1.00000000000000e+00
+15019 15019 1.00000000000000e+00
+15020 15020 1.00000000000000e+00
+15021 15021 1.00000000000000e+00
+15022 15022 1.00000000000000e+00
+15023 15023 1.00000000000000e+00
+15024 2037 -3.88419704019061e-02
+15024 2061 -2.58559228758133e-01
+15024 2085 -5.16422235334543e-03
+15024 2637 -1.21722609796363e+00
+15024 2661 -1.13506209985229e+01
+15024 2685 -5.11769890541419e+00
+15024 2709 -1.38468320828470e-01
+15024 3237 -8.20147575343321e-01
+15024 3261 -5.32072509956956e+00
+15024 3285 -5.62748706111379e+00
+15024 3309 -5.03800392544225e-01
+15024 3837 -8.34695865135725e-03
+15024 3861 -9.39954658147409e-02
+15024 3885 -1.17498240106751e-01
+15024 3909 -1.19215732302669e-02
+15024 4461 -3.45535269833850e-07
+15024 4485 -4.61831190340904e-06
+15024 4509 -7.90465775745000e-09
+15024 15024 9.75447987253463e+00
+15024 15000 3.45137496366532e+00
+15024 15048 4.74889323458441e+00
+15024 15072 7.37871840795652e-01
+15024 15408 2.97669063250813e+00
+15024 15432 5.81606050191948e+00
+15024 15456 2.81178010326741e+00
+15024 15480 4.24116551982347e-01
+15024 15816 3.57429471621563e-01
+15024 15840 4.11091590186327e-01
+15024 15864 1.24952424564341e-01
+15024 15888 1.57658947384345e-02
+15025 15025 1.00000000000000e+00
+15026 15026 1.00000000000000e+00
+15027 15027 1.00000000000000e+00
+15028 15028 1.00000000000000e+00
+15029 15029 1.00000000000000e+00
+15030 15030 1.00000000000000e+00
+15031 15031 1.00000000000000e+00
+15032 15032 1.00000000000000e+00
+15033 15033 1.00000000000000e+00
+15034 15034 1.00000000000000e+00
+15035 15035 1.00000000000000e+00
+15036 15036 1.00000000000000e+00
+15037 15037 1.00000000000000e+00
+15038 15038 1.00000000000000e+00
+15039 15039 1.00000000000000e+00
+15040 15040 1.00000000000000e+00
+15041 15041 1.00000000000000e+00
+15042 15042 1.00000000000000e+00
+15043 15043 1.00000000000000e+00
+15044 15044 1.00000000000000e+00
+15045 15045 1.00000000000000e+00
+15046 15046 1.00000000000000e+00
+15047 15047 1.00000000000000e+00
+15048 2037 -2.20520863822570e-03
+15048 2061 -2.65642361519578e-02
+15048 2085 -9.84041696600769e-04
+15048 2637 -8.07620712877337e-02
+15048 2661 -3.59414605494425e+00
+15048 2685 -7.82386178903436e+00
+15048 2709 -6.58684771145473e-01
+15048 2733 -4.78380215078030e-07
+15048 3237 -5.34115908914601e-02
+15048 3261 -3.43113164804828e+00
+15048 3285 -1.60834728731331e+01
+15048 3309 -3.99767481908073e+00
+15048 3333 -3.24275802740584e-02
+15048 3837 -1.65556807285418e-03
+15048 3861 -1.57084032693361e-01
+15048 3885 -7.56106341981153e-01
+15048 3909 -4.83551374784487e-01
+15048 3933 -9.65306573404754e-03
+15048 4461 -3.90079655830210e-06
+15048 4485 -2.16046850008645e-03
+15048 4509 -1.73196606922709e-03
+15048 15048 1.36913543179813e+01
+15048 15000 4.49351467850451e-01
+15048 15024 4.74889323458441e+00
+15048 15072 4.69570095278423e+00
+15048 15096 4.36053397400406e-01
+15048 15408 2.78828473834503e-01
+15048 15432 2.81178010326741e+00
+15048 15456 7.35333930796889e+00
+15048 15480 2.85105021759667e+00
+15048 15504 2.88646002416820e-01
+15048 15816 1.54722114026508e-02
+15048 15840 1.24952424564341e-01
+15048 15864 2.87903471136636e-01
+15048 15888 1.43771354629872e-01
+15048 15912 2.01769439190334e-02
+15049 15049 1.00000000000000e+00
+15050 15050 1.00000000000000e+00
+15051 15051 1.00000000000000e+00
+15052 15052 1.00000000000000e+00
+15053 15053 1.00000000000000e+00
+15054 15054 1.00000000000000e+00
+15055 15055 1.00000000000000e+00
+15056 15056 1.00000000000000e+00
+15057 15057 1.00000000000000e+00
+15058 15058 1.00000000000000e+00
+15059 15059 1.00000000000000e+00
+15060 15060 1.00000000000000e+00
+15061 15061 1.00000000000000e+00
+15062 15062 1.00000000000000e+00
+15063 15063 1.00000000000000e+00
+15064 15064 1.00000000000000e+00
+15065 15065 1.00000000000000e+00
+15066 15066 1.00000000000000e+00
+15067 15067 1.00000000000000e+00
+15068 15068 1.00000000000000e+00
+15069 15069 1.00000000000000e+00
+15070 15070 1.00000000000000e+00
+15071 15071 1.00000000000000e+00
+15072 2637 -2.73434565390910e-07
+15072 2661 -4.03388434389487e-01
+15072 2685 -2.29847746643466e+00
+15072 2709 -5.65787260988341e-01
+15072 2733 -2.54244484549938e-06
+15072 3237 -2.15737240607034e-04
+15072 3261 -6.50483221529800e-01
+15072 3285 -9.31757742472425e+00
+15072 3309 -1.13558941478981e+01
+15072 3333 -1.19951607928587e+00
+15072 3357 -2.68177621415981e-05
+15072 3837 -7.56520811581506e-05
+15072 3861 -6.09452274392239e-02
+15072 3885 -1.51207846681762e+00
+15072 3909 -3.96155814643469e+00
+15072 3933 -1.18740850620940e+00
+15072 3957 -3.95711006277197e-05
+15072 4461 -1.04201598584569e-05
+15072 4485 -1.29413237855623e-02
+15072 4509 -4.16778281377553e-02
+15072 4533 -6.82991249166330e-03
+15072 15072 9.51025959481667e+00
+15072 15024 7.37871840795652e-01
+15072 15048 4.69570095278423e+00
+15072 15096 4.92634717205970e+00
+15072 15120 7.95533395614517e-01
+15072 15432 4.24116551982347e-01
+15072 15456 2.85105021759667e+00
+15072 15480 5.50134950102235e+00
+15072 15504 2.99017165115069e+00
+15072 15528 4.58896910370851e-01
+15072 15840 1.57658947384345e-02
+15072 15864 1.43771354629872e-01
+15072 15888 3.56062772461138e-01
+15072 15912 1.50570875748810e-01
+15072 15936 1.74657750181691e-02
+15073 15073 1.00000000000000e+00
+15074 15074 1.00000000000000e+00
+15075 15075 1.00000000000000e+00
+15076 15076 1.00000000000000e+00
+15077 15077 1.00000000000000e+00
+15078 15078 1.00000000000000e+00
+15079 15079 1.00000000000000e+00
+15080 15080 1.00000000000000e+00
+15081 15081 1.00000000000000e+00
+15082 15082 1.00000000000000e+00
+15083 15083 1.00000000000000e+00
+15084 15084 1.00000000000000e+00
+15085 15085 1.00000000000000e+00
+15086 15086 1.00000000000000e+00
+15087 15087 1.00000000000000e+00
+15088 15088 1.00000000000000e+00
+15089 15089 1.00000000000000e+00
+15090 15090 1.00000000000000e+00
+15091 15091 1.00000000000000e+00
+15092 15092 1.00000000000000e+00
+15093 15093 1.00000000000000e+00
+15094 15094 1.00000000000000e+00
+15095 15095 1.00000000000000e+00
+15096 2661 -1.07822922226173e-04
+15096 2685 -1.49586861259650e-01
+15096 2709 -1.22992818690726e-01
+15096 2733 -2.99407615582715e-06
+15096 3261 -7.88146601817142e-03
+15096 3285 -1.94760161133873e+00
+15096 3309 -1.38577901086792e+01
+15096 3333 -5.00898442642425e+00
+15096 3357 -3.79506224605989e-02
+15096 3861 -6.72695047920763e-03
+15096 3885 -7.35724208401014e-01
+15096 3909 -9.81224485046643e+00
+15096 3933 -7.28706157576636e+00
+15096 3957 -3.24429347867767e-01
+15096 4461 -2.51866616999200e-06
+15096 4485 -1.97720813716512e-02
+15096 4509 -1.98215657855372e-01
+15096 4533 -2.12057904827481e-01
+15096 4557 -2.06081244686773e-02
+15096 5109 -2.08381299950430e-05
+15096 5133 -1.19661164935190e-04
+15096 5157 -2.93151783220590e-07
+15096 15096 1.46474152274484e+01
+15096 15048 4.36053397400406e-01
+15096 15072 4.92634717205970e+00
+15096 15120 5.11344358332090e+00
+15096 15144 4.82827500215708e-01
+15096 15456 2.88646002416820e-01
+15096 15480 2.99017165115069e+00
+15096 15504 7.92551584905643e+00
+15096 15528 3.01366476430732e+00
+15096 15552 2.94519280705977e-01
+15096 15864 2.01769439190334e-02
+15096 15888 1.50570875748810e-01
+15096 15912 3.14802352952060e-01
+15096 15936 1.30555135041960e-01
+15096 15960 1.51730087423209e-02
+15097 15097 1.00000000000000e+00
+15098 15098 1.00000000000000e+00
+15099 15099 1.00000000000000e+00
+15100 15100 1.00000000000000e+00
+15101 15101 1.00000000000000e+00
+15102 15102 1.00000000000000e+00
+15103 15103 1.00000000000000e+00
+15104 15104 1.00000000000000e+00
+15105 15105 1.00000000000000e+00
+15106 15106 1.00000000000000e+00
+15107 15107 1.00000000000000e+00
+15108 15108 1.00000000000000e+00
+15109 15109 1.00000000000000e+00
+15110 15110 1.00000000000000e+00
+15111 15111 1.00000000000000e+00
+15112 15112 1.00000000000000e+00
+15113 15113 1.00000000000000e+00
+15114 15114 1.00000000000000e+00
+15115 15115 1.00000000000000e+00
+15116 15116 1.00000000000000e+00
+15117 15117 1.00000000000000e+00
+15118 15118 1.00000000000000e+00
+15119 15119 1.00000000000000e+00
+15120 2685 -7.59934449608780e-04
+15120 2709 -4.29215165363144e-03
+15120 2733 -6.28923985187280e-07
+15120 3285 -1.34062314544309e-01
+15120 3309 -3.71267255158997e+00
+15120 3333 -3.93265630313742e+00
+15120 3357 -1.85121313218595e-01
+15120 3861 -1.62243194400000e-11
+15120 3885 -1.03422884076186e-01
+15120 3909 -4.42153745514157e+00
+15120 3933 -1.36483898526966e+01
+15120 3957 -3.50736818545126e+00
+15120 3981 -2.72999557635276e-02
+15120 4461 -2.67275633000000e-12
+15120 4485 -4.98947752019860e-03
+15120 4509 -2.75221263027286e-01
+15120 4533 -1.33921351264528e+00
+15120 4557 -9.31015863958383e-01
+15120 4581 -1.60538004493400e-02
+15120 5109 -1.55563455594227e-04
+15120 5133 -8.19121310477230e-03
+15120 5157 -4.92885197545324e-03
+15120 5181 -1.64223745000000e-12
+15120 15120 1.00814082330134e+01
+15120 15072 7.95533395614517e-01
+15120 15096 5.11344358332090e+00
+15120 15144 4.17384933665307e+00
+15120 15168 5.60634833947561e-01
+15120 15480 4.58896910370851e-01
+15120 15504 3.01366476430732e+00
+15120 15528 5.52408794703334e+00
+15120 15552 2.58960730429125e+00
+15120 15576 3.52882545366833e-01
+15120 15888 1.74657750181691e-02
+15120 15912 1.30555135041960e-01
+15120 15936 2.80966808721890e-01
+15120 15960 1.43623610275630e-01
+15120 15984 2.07328938265866e-02
+15121 15121 1.00000000000000e+00
+15122 15122 1.00000000000000e+00
+15123 15123 1.00000000000000e+00
+15124 15124 1.00000000000000e+00
+15125 15125 1.00000000000000e+00
+15126 15126 1.00000000000000e+00
+15127 15127 1.00000000000000e+00
+15128 15128 1.00000000000000e+00
+15129 15129 1.00000000000000e+00
+15130 15130 1.00000000000000e+00
+15131 15131 1.00000000000000e+00
+15132 15132 1.00000000000000e+00
+15133 15133 1.00000000000000e+00
+15134 15134 1.00000000000000e+00
+15135 15135 1.00000000000000e+00
+15136 15136 1.00000000000000e+00
+15137 15137 1.00000000000000e+00
+15138 15138 1.00000000000000e+00
+15139 15139 1.00000000000000e+00
+15140 15140 1.00000000000000e+00
+15141 15141 1.00000000000000e+00
+15142 15142 1.00000000000000e+00
+15143 15143 1.00000000000000e+00
+15144 3285 -6.63024342517000e-09
+15144 3309 -1.98570423981024e-01
+15144 3333 -9.91396379203770e-01
+15144 3357 -1.72731756794418e-01
+15144 3885 -2.42406379375074e-04
+15144 3909 -5.86323053563013e-01
+15144 3933 -9.88947253249652e+00
+15144 3957 -1.14588221436155e+01
+15144 3981 -8.31443655203386e-01
+15144 4005 -3.07830518340566e-06
+15144 4485 -1.55188264107734e-04
+15144 4509 -9.96338200064898e-02
+15144 4533 -2.69515405120276e+00
+15144 4557 -6.32062101669729e+00
+15144 4581 -1.42258422170924e+00
+15144 4605 -8.52313646765143e-06
+15144 5109 -3.09682943183139e-04
+15144 5133 -3.89639863280265e-02
+15144 5157 -7.96440172054075e-02
+15144 5181 -1.68082945346771e-02
+15144 5757 -1.23322260600600e-08
+15144 5781 -4.41669362790000e-09
+15144 15144 1.12567841678208e+01
+15144 15096 4.82827500215708e-01
+15144 15120 4.17384933665307e+00
+15144 15168 5.45773663356666e+00
+15144 15192 8.03799324444103e-01
+15144 15504 2.94519280705977e-01
+15144 15528 2.58960730429125e+00
+15144 15552 6.39329861863230e+00
+15144 15576 3.22216462969519e+00
+15144 15600 4.52658612056962e-01
+15144 15912 1.51730087423209e-02
+15144 15936 1.43623610275630e-01
+15144 15960 3.61401867063395e-01
+15144 15984 1.40941803689101e-01
+15144 16008 1.45025570956886e-02
+15145 15145 1.00000000000000e+00
+15146 15146 1.00000000000000e+00
+15147 15147 1.00000000000000e+00
+15148 15148 1.00000000000000e+00
+15149 15149 1.00000000000000e+00
+15150 15150 1.00000000000000e+00
+15151 15151 1.00000000000000e+00
+15152 15152 1.00000000000000e+00
+15153 15153 1.00000000000000e+00
+15154 15154 1.00000000000000e+00
+15155 15155 1.00000000000000e+00
+15156 15156 1.00000000000000e+00
+15157 15157 1.00000000000000e+00
+15158 15158 1.00000000000000e+00
+15159 15159 1.00000000000000e+00
+15160 15160 1.00000000000000e+00
+15161 15161 1.00000000000000e+00
+15162 15162 1.00000000000000e+00
+15163 15163 1.00000000000000e+00
+15164 15164 1.00000000000000e+00
+15165 15165 1.00000000000000e+00
+15166 15166 1.00000000000000e+00
+15167 15167 1.00000000000000e+00
+15168 3309 -4.16008843137181e-05
+15168 3333 -7.35208925300189e-02
+15168 3357 -3.37372744046849e-02
+15168 3909 -8.66206699074866e-03
+15168 3933 -2.26850405724519e+00
+15168 3957 -1.14939187741039e+01
+15168 3981 -3.21770864406451e+00
+15168 4005 -7.64040556608113e-03
+15168 4509 -1.05376172650655e-02
+15168 4533 -1.14051294456304e+00
+15168 4557 -1.30472690748129e+01
+15168 4581 -7.85719513899029e+00
+15168 4605 -2.41641731088433e-01
+15168 5109 -7.22152185415608e-05
+15168 5133 -4.00258339285647e-02
+15168 5157 -3.54401329386659e-01
+15168 5181 -4.08749207963312e-01
+15168 5205 -3.72128208243907e-02
+15168 5757 -2.76167595293297e-04
+15168 5781 -9.39185922044201e-04
+15168 5805 -3.26042166295244e-06
+15168 15168 1.48273894024812e+01
+15168 15120 5.60634833947561e-01
+15168 15144 5.45773663356666e+00
+15168 15192 4.83905880748850e+00
+15168 15216 4.05965377428022e-01
+15168 15528 3.52882545366833e-01
+15168 15552 3.22216462969519e+00
+15168 15576 7.86066781462639e+00
+15168 15600 2.87162435362044e+00
+15168 15624 2.65247476348146e-01
+15168 15936 2.07328938265866e-02
+15168 15960 1.40941803689101e-01
+15168 15984 2.70563746681643e-01
+15168 16008 1.29169985678908e-01
+15168 16032 1.77899393240385e-02
+15169 15169 1.00000000000000e+00
+15170 15170 1.00000000000000e+00
+15171 15171 1.00000000000000e+00
+15172 15172 1.00000000000000e+00
+15173 15173 1.00000000000000e+00
+15174 15174 1.00000000000000e+00
+15175 15175 1.00000000000000e+00
+15176 15176 1.00000000000000e+00
+15177 15177 1.00000000000000e+00
+15178 15178 1.00000000000000e+00
+15179 15179 1.00000000000000e+00
+15180 15180 1.00000000000000e+00
+15181 15181 1.00000000000000e+00
+15182 15182 1.00000000000000e+00
+15183 15183 1.00000000000000e+00
+15184 15184 1.00000000000000e+00
+15185 15185 1.00000000000000e+00
+15186 15186 1.00000000000000e+00
+15187 15187 1.00000000000000e+00
+15188 15188 1.00000000000000e+00
+15189 15189 1.00000000000000e+00
+15190 15190 1.00000000000000e+00
+15191 15191 1.00000000000000e+00
+15192 3333 -1.40028719608417e-06
+15192 3357 -4.04614909029325e-06
+15192 3933 -1.24451148894912e-01
+15192 3957 -2.73110193042548e+00
+15192 3981 -1.95058358179339e+00
+15192 4005 -3.62833187129932e-02
+15192 4509 -2.84904636177000e-09
+15192 4533 -1.37927352900205e-01
+15192 4557 -5.21913909453381e+00
+15192 4581 -1.31480554177428e+01
+15192 4605 -3.34611990479090e+00
+15192 4629 -2.25645047563801e-02
+15192 5109 -1.07073187650000e-09
+15192 5133 -9.34229118965537e-03
+15192 5157 -5.13545222136790e-01
+15192 5181 -2.47152522189266e+00
+15192 5205 -1.71458500707122e+00
+15192 5229 -2.35820716352033e-02
+15192 5757 -1.52847645058492e-03
+15192 5781 -2.24860482368024e-02
+15192 5805 -1.03974540170886e-02
+15192 5829 -1.63349069221820e-07
+15192 15192 9.05430117290746e+00
+15192 15144 8.03799324444103e-01
+15192 15168 4.83905880748850e+00
+15192 15216 4.64408474817213e+00
+15192 15240 7.55055809615010e-01
+15192 15552 4.52658612056962e-01
+15192 15576 2.87162435362044e+00
+15192 15600 5.14231724303767e+00
+15192 15624 2.84378594303401e+00
+15192 15648 4.45699009410354e-01
+15192 15960 1.45025570956886e-02
+15192 15984 1.29169985678908e-01
+15192 16008 3.18619044738261e-01
+15192 16032 1.49069591127981e-01
+15192 16056 1.94774584579568e-02
+15193 15193 1.00000000000000e+00
+15194 15194 1.00000000000000e+00
+15195 15195 1.00000000000000e+00
+15196 15196 1.00000000000000e+00
+15197 15197 1.00000000000000e+00
+15198 15198 1.00000000000000e+00
+15199 15199 1.00000000000000e+00
+15200 15200 1.00000000000000e+00
+15201 15201 1.00000000000000e+00
+15202 15202 1.00000000000000e+00
+15203 15203 1.00000000000000e+00
+15204 15204 1.00000000000000e+00
+15205 15205 1.00000000000000e+00
+15206 15206 1.00000000000000e+00
+15207 15207 1.00000000000000e+00
+15208 15208 1.00000000000000e+00
+15209 15209 1.00000000000000e+00
+15210 15210 1.00000000000000e+00
+15211 15211 1.00000000000000e+00
+15212 15212 1.00000000000000e+00
+15213 15213 1.00000000000000e+00
+15214 15214 1.00000000000000e+00
+15215 15215 1.00000000000000e+00
+15216 3957 -1.09415256228251e-01
+15216 3981 -3.91858603018195e-01
+15216 4005 -3.06995764510265e-02
+15216 4533 -3.08469849872086e-04
+15216 4557 -6.14318709256894e-01
+15216 4581 -1.11286651487524e+01
+15216 4605 -1.10499459964701e+01
+15216 4629 -4.22719899012749e-01
+15216 4653 -4.50372466621900e-08
+15216 5133 -3.37059951672553e-04
+15216 5157 -1.68324535039272e-01
+15216 5181 -4.85138247369466e+00
+15216 5205 -9.15748002497584e+00
+15216 5229 -1.26735440242569e+00
+15216 5253 -3.09907564292870e-07
+15216 5757 -1.97210171975275e-03
+15216 5781 -8.98711480908158e-02
+15216 5805 -1.55218139672086e-01
+15216 5829 -3.85260548717763e-02
+15216 6381 -9.93685121070000e-10
+15216 6405 -1.25824412478921e-05
+15216 6429 -2.87059089138055e-06
+15216 15216 1.41192821628462e+01
+15216 15168 4.05965377428022e-01
+15216 15192 4.64408474817213e+00
+15216 15240 5.54991856477212e+00
+15216 15264 6.32423831578019e-01
+15216 15576 2.65247476348146e-01
+15216 15600 2.84378594303400e+00
+15216 15624 7.76021858978305e+00
+15216 15648 3.23794388911826e+00
+15216 15672 3.63786962869211e-01
+15216 15984 1.77899393240385e-02
+15216 16008 1.49069591127981e-01
+15216 16032 3.43022145245691e-01
+15216 16056 1.32281316209200e-01
+15216 16080 1.35928705943433e-02
+15217 15217 1.00000000000000e+00
+15218 15218 1.00000000000000e+00
+15219 15219 1.00000000000000e+00
+15220 15220 1.00000000000000e+00
+15221 15221 1.00000000000000e+00
+15222 15222 1.00000000000000e+00
+15223 15223 1.00000000000000e+00
+15224 15224 1.00000000000000e+00
+15225 15225 1.00000000000000e+00
+15226 15226 1.00000000000000e+00
+15227 15227 1.00000000000000e+00
+15228 15228 1.00000000000000e+00
+15229 15229 1.00000000000000e+00
+15230 15230 1.00000000000000e+00
+15231 15231 1.00000000000000e+00
+15232 15232 1.00000000000000e+00
+15233 15233 1.00000000000000e+00
+15234 15234 1.00000000000000e+00
+15235 15235 1.00000000000000e+00
+15236 15236 1.00000000000000e+00
+15237 15237 1.00000000000000e+00
+15238 15238 1.00000000000000e+00
+15239 15239 1.00000000000000e+00
+15240 3957 -8.84884528789628e-06
+15240 3981 -2.26063108285778e-02
+15240 4005 -5.76787102641976e-03
+15240 4557 -9.58767802584515e-03
+15240 4581 -2.49861912557892e+00
+15240 4605 -7.60221651864066e+00
+15240 4629 -1.47814744601903e+00
+15240 4653 -5.26432474004669e-04
+15240 5157 -1.46458338405460e-02
+15240 5181 -1.71003083767369e+00
+15240 5205 -1.36812044076589e+01
+15240 5229 -7.25120728299911e+00
+15240 5253 -2.06381545340391e-01
+15240 5757 -4.24068021415259e-04
+15240 5781 -7.54624655077920e-02
+15240 5805 -6.68819689456894e-01
+15240 5829 -8.02167487971888e-01
+15240 5853 -6.91058902851688e-02
+15240 6381 -5.96334235505000e-09
+15240 6405 -1.83203537140749e-03
+15240 6429 -4.12660314887467e-03
+15240 6453 -1.96369108521831e-05
+15240 15240 1.23161012279492e+01
+15240 15192 7.55055809615010e-01
+15240 15216 5.54991856477212e+00
+15240 15264 4.29875177865576e+00
+15240 15288 4.42264113085922e-01
+15240 15600 4.45699009410354e-01
+15240 15624 3.23794388911827e+00
+15240 15648 6.56077331714627e+00
+15240 15672 2.63307945879096e+00
+15240 15696 2.94482901828528e-01
+15240 16008 1.94774584579568e-02
+15240 16032 1.32281316209200e-01
+15240 16056 2.57920772334754e-01
+15240 16080 1.38201019846592e-01
+15240 16104 2.09573843673048e-02
+15241 15241 1.00000000000000e+00
+15242 15242 1.00000000000000e+00
+15243 15243 1.00000000000000e+00
+15244 15244 1.00000000000000e+00
+15245 15245 1.00000000000000e+00
+15246 15246 1.00000000000000e+00
+15247 15247 1.00000000000000e+00
+15248 15248 1.00000000000000e+00
+15249 15249 1.00000000000000e+00
+15250 15250 1.00000000000000e+00
+15251 15251 1.00000000000000e+00
+15252 15252 1.00000000000000e+00
+15253 15253 1.00000000000000e+00
+15254 15254 1.00000000000000e+00
+15255 15255 1.00000000000000e+00
+15256 15256 1.00000000000000e+00
+15257 15257 1.00000000000000e+00
+15258 15258 1.00000000000000e+00
+15259 15259 1.00000000000000e+00
+15260 15260 1.00000000000000e+00
+15261 15261 1.00000000000000e+00
+15262 15262 1.00000000000000e+00
+15263 15263 1.00000000000000e+00
+15264 4581 -8.48984408304521e-02
+15264 4605 -1.54591739054225e+00
+15264 4629 -8.37008468300386e-01
+15264 4653 -2.27267444385338e-03
+15264 5157 -2.82679919691200e-08
+15264 5181 -1.56683939199441e-01
+15264 5205 -5.61186521115557e+00
+15264 5229 -1.34003793834153e+01
+15264 5253 -2.84652083002152e+00
+15264 5277 -1.42105665122836e-02
+15264 5757 -1.92421531558400e-08
+15264 5781 -1.67149292436572e-02
+15264 5805 -9.47053835614488e-01
+15264 5829 -4.33414068707053e+00
+15264 5853 -2.55228025707651e+00
+15264 5877 -2.65905112531985e-02
+15264 6381 -8.94809260414000e-09
+15264 6405 -8.36244219545068e-03
+15264 6429 -5.14093378669885e-02
+15264 6453 -2.05692093069998e-02
+15264 6477 -7.22506791617711e-06
+15264 15264 9.57031379276868e+00
+15264 15216 6.32423831578019e-01
+15264 15240 4.29875177865576e+00
+15264 15288 5.21571305960734e+00
+15264 15312 8.61664151815914e-01
+15264 15624 3.63786962869211e-01
+15264 15648 2.63307945879096e+00
+15264 15672 5.56573923087694e+00
+15264 15696 3.13883496231916e+00
+15264 15720 4.90225838751259e-01
+15264 16032 1.35928705943433e-02
+15264 16056 1.38201019846592e-01
+15264 16080 3.65880666997878e-01
+15264 16104 1.51708123575850e-01
+15264 16128 1.69696465266578e-02
+15265 15265 1.00000000000000e+00
+15266 15266 1.00000000000000e+00
+15267 15267 1.00000000000000e+00
+15268 15268 1.00000000000000e+00
+15269 15269 1.00000000000000e+00
+15270 15270 1.00000000000000e+00
+15271 15271 1.00000000000000e+00
+15272 15272 1.00000000000000e+00
+15273 15273 1.00000000000000e+00
+15274 15274 1.00000000000000e+00
+15275 15275 1.00000000000000e+00
+15276 15276 1.00000000000000e+00
+15277 15277 1.00000000000000e+00
+15278 15278 1.00000000000000e+00
+15279 15279 1.00000000000000e+00
+15280 15280 1.00000000000000e+00
+15281 15281 1.00000000000000e+00
+15282 15282 1.00000000000000e+00
+15283 15283 1.00000000000000e+00
+15284 15284 1.00000000000000e+00
+15285 15285 1.00000000000000e+00
+15286 15286 1.00000000000000e+00
+15287 15287 1.00000000000000e+00
+15288 4605 -6.40768823076013e-02
+15288 4629 -1.32155033546541e-01
+15288 4653 -1.19673275115656e-03
+15288 5181 -3.57181806112216e-04
+15288 5205 -7.26009893525010e-01
+15288 5229 -1.09254701506263e+01
+15288 5253 -8.88650814138446e+00
+15288 5277 -1.70854902386417e-01
+15288 5781 -6.75108151057794e-04
+15288 5805 -2.77611194666467e-01
+15288 5829 -7.62575536054912e+00
+15288 5853 -1.16470936735665e+01
+15288 5877 -9.84383496535977e-01
+15288 6381 -1.98860187077000e-09
+15288 6405 -6.67400920711649e-03
+15288 6429 -1.70767136446982e-01
+15288 6453 -3.00034719279318e-01
+15288 6477 -7.14390121570572e-02
+15288 7029 -4.23031447744470e-06
+15288 7053 -2.44065315422981e-04
+15288 7077 -3.47011381079177e-05
+15288 15288 1.56934120813321e+01
+15288 15240 4.42264113085922e-01
+15288 15264 5.21571305960734e+00
+15288 15312 5.30474276403004e+00
+15288 15336 4.64521539191594e-01
+15288 15648 2.94482901828528e-01
+15288 15672 3.13883496231916e+00
+15288 15696 8.42373780668300e+00
+15288 15720 3.10346929434225e+00
+15288 15744 2.85641484834302e-01
+15288 16056 2.09573843673048e-02
+15288 16080 1.51708123575850e-01
+15288 16104 3.07723361719116e-01
+15288 16128 1.28885117807780e-01
+15288 16152 1.52516329252871e-02
+15289 15289 1.00000000000000e+00
+15290 15290 1.00000000000000e+00
+15291 15291 1.00000000000000e+00
+15292 15292 1.00000000000000e+00
+15293 15293 1.00000000000000e+00
+15294 15294 1.00000000000000e+00
+15295 15295 1.00000000000000e+00
+15296 15296 1.00000000000000e+00
+15297 15297 1.00000000000000e+00
+15298 15298 1.00000000000000e+00
+15299 15299 1.00000000000000e+00
+15300 15300 1.00000000000000e+00
+15301 15301 1.00000000000000e+00
+15302 15302 1.00000000000000e+00
+15303 15303 1.00000000000000e+00
+15304 15304 1.00000000000000e+00
+15305 15305 1.00000000000000e+00
+15306 15306 1.00000000000000e+00
+15307 15307 1.00000000000000e+00
+15308 15308 1.00000000000000e+00
+15309 15309 1.00000000000000e+00
+15310 15310 1.00000000000000e+00
+15311 15311 1.00000000000000e+00
+15312 4605 -3.45778598212080e-07
+15312 4629 -1.60490305820053e-03
+15312 4653 -1.67620106534635e-04
+15312 5205 -9.96711146675240e-03
+15312 5229 -2.28074346771652e+00
+15312 5253 -4.44043579606696e+00
+15312 5277 -5.14197856185756e-01
+15312 5805 -1.84717084370417e-02
+15312 5829 -2.36081159036057e+00
+15312 5853 -1.31344205713101e+01
+15312 5877 -6.70591694751850e+00
+15312 5901 -2.11153262788658e-01
+15312 6405 -1.22365447471564e-03
+15312 6429 -1.43634132019868e-01
+15312 6453 -1.28138291463894e+00
+15312 6477 -1.63815643084329e+00
+15312 6501 -1.34917509756817e-01
+15312 7029 -2.19178452599109e-05
+15312 7053 -8.02848167035954e-03
+15312 7077 -1.25654930568490e-02
+15312 7101 -8.02216756130956e-05
+15312 15312 9.92442391352000e+00
+15312 15264 8.61664151815914e-01
+15312 15288 5.30474276403004e+00
+15312 15336 4.37974669532067e+00
+15312 15360 6.30415134638574e-01
+15312 15672 4.90225838751259e-01
+15312 15696 3.10346929434225e+00
+15312 15720 5.45879703285381e+00
+15312 15744 2.73579568635200e+00
+15312 15768 3.98307436753696e-01
+15312 16080 1.69696465266578e-02
+15312 16104 1.28885117807780e-01
+15312 16128 2.84738593169654e-01
+15312 16152 1.55977811054759e-01
+15312 16176 2.37428198384026e-02
+15313 15313 1.00000000000000e+00
+15314 15314 1.00000000000000e+00
+15315 15315 1.00000000000000e+00
+15316 15316 1.00000000000000e+00
+15317 15317 1.00000000000000e+00
+15318 15318 1.00000000000000e+00
+15319 15319 1.00000000000000e+00
+15320 15320 1.00000000000000e+00
+15321 15321 1.00000000000000e+00
+15322 15322 1.00000000000000e+00
+15323 15323 1.00000000000000e+00
+15324 15324 1.00000000000000e+00
+15325 15325 1.00000000000000e+00
+15326 15326 1.00000000000000e+00
+15327 15327 1.00000000000000e+00
+15328 15328 1.00000000000000e+00
+15329 15329 1.00000000000000e+00
+15330 15330 1.00000000000000e+00
+15331 15331 1.00000000000000e+00
+15332 15332 1.00000000000000e+00
+15333 15333 1.00000000000000e+00
+15334 15334 1.00000000000000e+00
+15335 15335 1.00000000000000e+00
+15336 5229 -4.88682978709450e-02
+15336 5253 -7.35786296464280e-01
+15336 5277 -2.89759613634650e-01
+15336 5805 -1.33099563758210e-07
+15336 5829 -1.65636733875931e-01
+15336 5853 -6.32291240333016e+00
+15336 5877 -1.47080981867767e+01
+15336 5901 -1.81449700885244e+00
+15336 5925 -4.53057394300022e-03
+15336 6405 -1.54286544133720e-07
+15336 6429 -3.17314047065672e-02
+15336 6453 -1.79324213756294e+00
+15336 6477 -7.14013593441152e+00
+15336 6501 -2.47118942806333e+00
+15336 6525 -1.70855648037468e-02
+15336 7029 -2.42166638779730e-05
+15336 7053 -3.10803560498744e-02
+15336 7077 -1.11494712416164e-01
+15336 7101 -4.22648233034794e-02
+15336 7125 -4.97899102435202e-05
+15336 7677 -2.12346769668840e-07
+15336 7701 -2.27564163003280e-07
+15336 15336 1.21577171568334e+01
+15336 15288 4.64521539191594e-01
+15336 15312 4.37974669532067e+00
+15336 15360 4.94787439225266e+00
+15336 15384 6.06553463424591e-01
+15336 15696 2.85641484834302e-01
+15336 15720 2.73579568635200e+00
+15336 15744 7.01598994451505e+00
+15336 15768 3.02294763350108e+00
+15336 15792 3.57429471621572e-01
+15336 16104 1.52516329252871e-02
+15336 16128 1.55977811054759e-01
+15336 16152 4.10608961742379e-01
+15336 16176 1.56860124964212e-01
+15336 16200 1.54722114026505e-02
+15337 15337 1.00000000000000e+00
+15338 15338 1.00000000000000e+00
+15339 15339 1.00000000000000e+00
+15340 15340 1.00000000000000e+00
+15341 15341 1.00000000000000e+00
+15342 15342 1.00000000000000e+00
+15343 15343 1.00000000000000e+00
+15344 15344 1.00000000000000e+00
+15345 15345 1.00000000000000e+00
+15346 15346 1.00000000000000e+00
+15347 15347 1.00000000000000e+00
+15348 15348 1.00000000000000e+00
+15349 15349 1.00000000000000e+00
+15350 15350 1.00000000000000e+00
+15351 15351 1.00000000000000e+00
+15352 15352 1.00000000000000e+00
+15353 15353 1.00000000000000e+00
+15354 15354 1.00000000000000e+00
+15355 15355 1.00000000000000e+00
+15356 15356 1.00000000000000e+00
+15357 15357 1.00000000000000e+00
+15358 15358 1.00000000000000e+00
+15359 15359 1.00000000000000e+00
+15360 5253 -3.49139124709050e-02
+15360 5277 -4.39367443243418e-02
+15360 5829 -3.39183723660182e-04
+15360 5853 -9.88607456833720e-01
+15360 5877 -7.86715197249487e+00
+15360 5901 -4.54030951783693e+00
+15360 5925 -4.69807489686183e-02
+15360 6429 -1.21583139608410e-03
+15360 6453 -4.70523537717537e-01
+15360 6477 -8.54372163120876e+00
+15360 6501 -1.09051654129365e+01
+15360 6525 -2.25383879039402e-01
+15360 7029 -4.99658735013208e-06
+15360 7053 -1.75666651323257e-02
+15360 7077 -4.98997919341120e-01
+15360 7101 -6.43859071509885e-01
+15360 7125 -1.89434110109514e-03
+15360 7677 -2.91886673369874e-05
+15360 7701 -3.45539493907780e-05
+15360 15360 1.21229545966703e+01
+15360 15312 6.30415134638574e-01
+15360 15336 4.94787439225266e+00
+15360 15384 4.00158194817489e+00
+15360 15720 3.98307436753696e-01
+15360 15744 3.02294763350108e+00
+15360 15768 6.89066535570985e+00
+15360 15792 2.97669063250825e+00
+15360 16128 2.37428198384026e-02
+15360 16152 1.56860124964212e-01
+15360 16176 3.79768016392767e-01
+15360 16200 2.78828473834515e-01
+15361 15361 1.00000000000000e+00
+15362 15362 1.00000000000000e+00
+15363 15363 1.00000000000000e+00
+15364 15364 1.00000000000000e+00
+15365 15365 1.00000000000000e+00
+15366 15366 1.00000000000000e+00
+15367 15367 1.00000000000000e+00
+15368 15368 1.00000000000000e+00
+15369 15369 1.00000000000000e+00
+15370 15370 1.00000000000000e+00
+15371 15371 1.00000000000000e+00
+15372 15372 1.00000000000000e+00
+15373 15373 1.00000000000000e+00
+15374 15374 1.00000000000000e+00
+15375 15375 1.00000000000000e+00
+15376 15376 1.00000000000000e+00
+15377 15377 1.00000000000000e+00
+15378 15378 1.00000000000000e+00
+15379 15379 1.00000000000000e+00
+15380 15380 1.00000000000000e+00
+15381 15381 1.00000000000000e+00
+15382 15382 1.00000000000000e+00
+15383 15383 1.00000000000000e+00
+15384 5853 -7.07189490284731e-03
+15384 5877 -1.27202318270225e+00
+15384 5901 -1.86912480621190e+00
+15384 5925 -6.22474803362350e-02
+15384 6453 -2.04644255858374e-02
+15384 6477 -2.77159021881347e+00
+15384 6501 -8.01986008310702e+00
+15384 6525 -3.31168804452576e-01
+15384 7053 -2.63702574884974e-03
+15384 7077 -5.40869660850698e-01
+15384 7101 -9.93950143461355e-01
+15384 7125 -3.44015283048563e-03
+15384 7677 -5.68909072862929e-05
+15384 7701 -6.75149496405330e-05
+15384 15384 4.75728965237765e+00
+15384 15336 6.06553463424591e-01
+15384 15360 4.00158194817489e+00
+15384 15744 3.57429471621572e-01
+15384 15768 2.97669063250825e+00
+15384 15792 3.45137496366549e+00
+15384 16152 1.54722114026505e-02
+15384 16176 2.78828473834515e-01
+15384 16200 4.49351467850477e-01
+15385 15385 1.00000000000000e+00
+15386 15386 1.00000000000000e+00
+15387 15387 1.00000000000000e+00
+15388 15388 1.00000000000000e+00
+15389 15389 1.00000000000000e+00
+15390 15390 1.00000000000000e+00
+15391 15391 1.00000000000000e+00
+15392 15392 1.00000000000000e+00
+15393 15393 1.00000000000000e+00
+15394 15394 1.00000000000000e+00
+15395 15395 1.00000000000000e+00
+15396 15396 1.00000000000000e+00
+15397 15397 1.00000000000000e+00
+15398 15398 1.00000000000000e+00
+15399 15399 1.00000000000000e+00
+15400 15400 1.00000000000000e+00
+15401 15401 1.00000000000000e+00
+15402 15402 1.00000000000000e+00
+15403 15403 1.00000000000000e+00
+15404 15404 1.00000000000000e+00
+15405 15405 1.00000000000000e+00
+15406 15406 1.00000000000000e+00
+15407 15407 1.00000000000000e+00
+15408 2037 -4.69807489686164e-02
+15408 2061 -2.25383879039393e-01
+15408 2085 -1.89434110109505e-03
+15408 2637 -4.54030951783678e+00
+15408 2661 -1.09051654129362e+01
+15408 2685 -6.43859071509858e-01
+15408 2709 -3.45539493907760e-05
+15408 3213 -4.39367443243404e-02
+15408 3237 -7.86715197249462e+00
+15408 3261 -8.54372163120853e+00
+15408 3285 -4.98997919341108e-01
+15408 3309 -2.91886673369857e-05
+15408 3813 -3.49139124709039e-02
+15408 3837 -9.88607456833689e-01
+15408 3861 -4.70523537717523e-01
+15408 3885 -1.75666651323256e-02
+15408 4437 -3.39183723660170e-04
+15408 4461 -1.21583139608406e-03
+15408 4485 -4.99658735013190e-06
+15408 15408 1.21229545966699e+01
+15408 15000 4.00158194817474e+00
+15408 15024 2.97669063250813e+00
+15408 15048 2.78828473834503e-01
+15408 15432 6.89066535570966e+00
+15408 15456 3.79768016392764e-01
+15408 15816 4.94787439225250e+00
+15408 15840 3.02294763350099e+00
+15408 15864 1.56860124964210e-01
+15408 16224 6.30415134638554e-01
+15408 16248 3.98307436753683e-01
+15408 16272 2.37428198384017e-02
+15409 15409 1.00000000000000e+00
+15410 15410 1.00000000000000e+00
+15411 15411 1.00000000000000e+00
+15412 15412 1.00000000000000e+00
+15413 15413 1.00000000000000e+00
+15414 15414 1.00000000000000e+00
+15415 15415 1.00000000000000e+00
+15416 15416 1.00000000000000e+00
+15417 15417 1.00000000000000e+00
+15418 15418 1.00000000000000e+00
+15419 15419 1.00000000000000e+00
+15420 15420 1.00000000000000e+00
+15421 15421 1.00000000000000e+00
+15422 15422 1.00000000000000e+00
+15423 15423 1.00000000000000e+00
+15424 15424 1.00000000000000e+00
+15425 15425 1.00000000000000e+00
+15426 15426 1.00000000000000e+00
+15427 15427 1.00000000000000e+00
+15428 15428 1.00000000000000e+00
+15429 15429 1.00000000000000e+00
+15430 15430 1.00000000000000e+00
+15431 15431 1.00000000000000e+00
+15432 2037 -2.76749461282608e-02
+15432 2061 -1.61524079405966e-01
+15432 2085 -2.70507787133988e-03
+15432 2637 -2.63427490152780e+00
+15432 2661 -1.07635608328280e+01
+15432 2685 -3.05351420152938e+00
+15432 2709 -7.30006766659667e-02
+15432 3213 -2.32563123210227e-02
+15432 3237 -5.11981516898454e+00
+15432 3261 -1.13396010740793e+01
+15432 3285 -4.72007968522738e+00
+15432 3309 -2.98294215297016e-01
+15432 3813 -1.88624550732972e-02
+15432 3837 -9.48787970187838e-01
+15432 3861 -1.79211733908759e+00
+15432 3885 -6.38508544939129e-01
+15432 3909 -1.53507695888664e-02
+15432 4437 -1.97299421219378e-03
+15432 4461 -3.39913024247126e-02
+15432 4485 -1.65362016833932e-02
+15432 4509 -1.26266347100430e-07
+15432 15432 1.02261200668354e+01
+15432 15000 2.97669063250814e+00
+15432 15024 5.81606050191948e+00
+15432 15048 2.81178010326741e+00
+15432 15072 4.24116551982347e-01
+15432 15408 6.89066535570966e+00
+15432 15456 3.37521270349812e+00
+15432 15480 4.64035159481754e-01
+15432 15816 3.02294763350099e+00
+15432 15840 3.89559657381322e+00
+15432 15864 1.37976453011178e+00
+15432 15888 1.88081007563730e-01
+15432 16224 3.98307436753683e-01
+15432 16248 5.62807553266964e-01
+15432 16272 2.19988707963599e-01
+15432 16296 3.12543571524980e-02
+15433 15433 1.00000000000000e+00
+15434 15434 1.00000000000000e+00
+15435 15435 1.00000000000000e+00
+15436 15436 1.00000000000000e+00
+15437 15437 1.00000000000000e+00
+15438 15438 1.00000000000000e+00
+15439 15439 1.00000000000000e+00
+15440 15440 1.00000000000000e+00
+15441 15441 1.00000000000000e+00
+15442 15442 1.00000000000000e+00
+15443 15443 1.00000000000000e+00
+15444 15444 1.00000000000000e+00
+15445 15445 1.00000000000000e+00
+15446 15446 1.00000000000000e+00
+15447 15447 1.00000000000000e+00
+15448 15448 1.00000000000000e+00
+15449 15449 1.00000000000000e+00
+15450 15450 1.00000000000000e+00
+15451 15451 1.00000000000000e+00
+15452 15452 1.00000000000000e+00
+15453 15453 1.00000000000000e+00
+15454 15454 1.00000000000000e+00
+15455 15455 1.00000000000000e+00
+15456 2037 -1.19559189827217e-03
+15456 2061 -1.39520399675055e-02
+15456 2085 -5.02259234512101e-04
+15456 2637 -1.04039244321090e-01
+15456 2661 -2.45302092463139e+00
+15456 2685 -4.43068966198704e+00
+15456 2709 -3.49593855422099e-01
+15456 2733 -2.40186428761690e-07
+15456 3213 -3.67982902529272e-04
+15456 3237 -3.64114134599591e-01
+15456 3261 -5.66071931761898e+00
+15456 3285 -1.32830061635956e+01
+15456 3309 -2.68385561620018e+00
+15456 3333 -1.86238563130756e-02
+15456 3813 -4.01571096527211e-04
+15456 3837 -2.02228954966383e-01
+15456 3861 -2.84276194806406e+00
+15456 3885 -3.72278010225770e+00
+15456 3909 -8.37895207133275e-01
+15456 3933 -6.21525660309214e-03
+15456 4437 -2.80648045101085e-03
+15456 4461 -1.44954846645986e-01
+15456 4485 -2.34219438433393e-01
+15456 4509 -3.12514410067268e-02
+15456 5061 -6.13896168510000e-10
+15456 5085 -2.30368090416419e-05
+15456 5109 -5.59793347357103e-06
+15456 15456 9.25883673882528e+00
+15456 15000 2.78828473834503e-01
+15456 15024 2.81178010326741e+00
+15456 15048 7.35333930796889e+00
+15456 15072 2.85105021759667e+00
+15456 15096 2.88646002416820e-01
+15456 15408 3.79768016392764e-01
+15456 15432 3.37521270349812e+00
+15456 15480 3.67416532082412e+00
+15456 15504 4.54506170724262e-01
+15456 15816 1.56860124964210e-01
+15456 15840 1.37976453011177e+00
+15456 15864 3.35768784025763e+00
+15456 15888 1.51845040734963e+00
+15456 15912 1.91531594273673e-01
+15456 16224 2.37428198384017e-02
+15456 16248 2.19988707963599e-01
+15456 16272 5.51518488927754e-01
+15456 16296 2.35841247207531e-01
+15456 16320 2.77059546493849e-02
+15457 15457 1.00000000000000e+00
+15458 15458 1.00000000000000e+00
+15459 15459 1.00000000000000e+00
+15460 15460 1.00000000000000e+00
+15461 15461 1.00000000000000e+00
+15462 15462 1.00000000000000e+00
+15463 15463 1.00000000000000e+00
+15464 15464 1.00000000000000e+00
+15465 15465 1.00000000000000e+00
+15466 15466 1.00000000000000e+00
+15467 15467 1.00000000000000e+00
+15468 15468 1.00000000000000e+00
+15469 15469 1.00000000000000e+00
+15470 15470 1.00000000000000e+00
+15471 15471 1.00000000000000e+00
+15472 15472 1.00000000000000e+00
+15473 15473 1.00000000000000e+00
+15474 15474 1.00000000000000e+00
+15475 15475 1.00000000000000e+00
+15476 15476 1.00000000000000e+00
+15477 15477 1.00000000000000e+00
+15478 15478 1.00000000000000e+00
+15479 15479 1.00000000000000e+00
+15480 2637 -1.32403957025801e-06
+15480 2661 -2.52264035490318e-01
+15480 2685 -1.30109975791990e+00
+15480 2709 -3.07481855106385e-01
+15480 2733 -1.27580809196147e-06
+15480 3237 -6.78156064318102e-03
+15480 3261 -1.10367230428952e+00
+15480 3285 -9.03319033806758e+00
+15480 3309 -8.06189223988929e+00
+15480 3333 -6.70418245275486e-01
+15480 3357 -1.35540959531497e-05
+15480 3837 -1.94860308560969e-02
+15480 3861 -1.10467050991717e+00
+15480 3885 -6.68777816209319e+00
+15480 3909 -5.66644235563035e+00
+15480 3933 -8.34970990283421e-01
+15480 3957 -2.00170805911734e-05
+15480 4437 -6.16935639697721e-04
+15480 4461 -1.38745469119399e-01
+15480 4485 -8.76028072878760e-01
+15480 4509 -5.39531734989152e-01
+15480 4533 -3.21841845409029e-02
+15480 5061 -3.15286122116000e-09
+15480 5085 -2.05883233787824e-03
+15480 5109 -4.76276778342306e-03
+15480 5133 -2.56465629442625e-05
+15480 15480 9.23470004433134e+00
+15480 15024 4.24116551982347e-01
+15480 15048 2.85105021759667e+00
+15480 15072 5.50134950102235e+00
+15480 15096 2.99017165115069e+00
+15480 15120 4.58896910370851e-01
+15480 15432 4.64035159481754e-01
+15480 15456 3.67416532082412e+00
+15480 15504 3.81228929594174e+00
+15480 15528 4.98566153261159e-01
+15480 15840 1.88081007563730e-01
+15480 15864 1.51845040734963e+00
+15480 15888 3.42083700730071e+00
+15480 15912 1.43912834252727e+00
+15480 15936 1.68250491358141e-01
+15480 16248 3.12543571524980e-02
+15480 16272 2.35841247207531e-01
+15480 16296 4.99146479364022e-01
+15480 16320 2.09211209883004e-01
+15480 16344 2.45968478213660e-02
+15481 15481 1.00000000000000e+00
+15482 15482 1.00000000000000e+00
+15483 15483 1.00000000000000e+00
+15484 15484 1.00000000000000e+00
+15485 15485 1.00000000000000e+00
+15486 15486 1.00000000000000e+00
+15487 15487 1.00000000000000e+00
+15488 15488 1.00000000000000e+00
+15489 15489 1.00000000000000e+00
+15490 15490 1.00000000000000e+00
+15491 15491 1.00000000000000e+00
+15492 15492 1.00000000000000e+00
+15493 15493 1.00000000000000e+00
+15494 15494 1.00000000000000e+00
+15495 15495 1.00000000000000e+00
+15496 15496 1.00000000000000e+00
+15497 15497 1.00000000000000e+00
+15498 15498 1.00000000000000e+00
+15499 15499 1.00000000000000e+00
+15500 15500 1.00000000000000e+00
+15501 15501 1.00000000000000e+00
+15502 15502 1.00000000000000e+00
+15503 15503 1.00000000000000e+00
+15504 2661 -9.97392066839166e-05
+15504 2685 -8.67773264820810e-02
+15504 2709 -6.68357069655295e-02
+15504 2733 -1.50043593642060e-06
+15504 3261 -3.30507753107728e-02
+15504 3285 -1.99097178969350e+00
+15504 3309 -8.81234700362064e+00
+15504 3333 -2.79768642905903e+00
+15504 3357 -2.00238148159727e-02
+15504 3837 -2.68148023391800e-08
+15504 3861 -1.24457816678191e-01
+15504 3885 -2.99889266328806e+00
+15504 3909 -1.17788140657166e+01
+15504 3933 -5.46128485173948e+00
+15504 3957 -1.97918336106527e-01
+15504 4437 -1.82286164144400e-08
+15504 4461 -3.00750972078252e-02
+15504 4485 -9.36190402441567e-01
+15504 4509 -2.34143120142432e+00
+15504 4533 -8.00085278224091e-01
+15504 4557 -2.25678303861427e-02
+15504 5061 -3.40300235706000e-09
+15504 5085 -9.62297346308543e-03
+15504 5109 -7.02222855708120e-02
+15504 5133 -2.67245997549201e-02
+15504 5157 -2.38387544049822e-06
+15504 15504 9.81721687035758e+00
+15504 15048 2.88646002416820e-01
+15504 15072 2.99017165115069e+00
+15504 15096 7.92551584905643e+00
+15504 15120 3.01366476430732e+00
+15504 15144 2.94519280705977e-01
+15504 15456 4.54506170724262e-01
+15504 15480 3.81228929594174e+00
+15504 15528 3.53687360286299e+00
+15504 15552 3.85652247454578e-01
+15504 15864 1.91531594273673e-01
+15504 15888 1.43912834252727e+00
+15504 15912 3.04811342980965e+00
+15504 15936 1.33129786065526e+00
+15504 15960 1.64573973805670e-01
+15504 16272 2.77059546493849e-02
+15504 16296 2.09211209883004e-01
+15504 16320 4.47226004500338e-01
+15504 16344 2.02269330121850e-01
+15504 16368 2.59704847090965e-02
+15505 15505 1.00000000000000e+00
+15506 15506 1.00000000000000e+00
+15507 15507 1.00000000000000e+00
+15508 15508 1.00000000000000e+00
+15509 15509 1.00000000000000e+00
+15510 15510 1.00000000000000e+00
+15511 15511 1.00000000000000e+00
+15512 15512 1.00000000000000e+00
+15513 15513 1.00000000000000e+00
+15514 15514 1.00000000000000e+00
+15515 15515 1.00000000000000e+00
+15516 15516 1.00000000000000e+00
+15517 15517 1.00000000000000e+00
+15518 15518 1.00000000000000e+00
+15519 15519 1.00000000000000e+00
+15520 15520 1.00000000000000e+00
+15521 15521 1.00000000000000e+00
+15522 15522 1.00000000000000e+00
+15523 15523 1.00000000000000e+00
+15524 15524 1.00000000000000e+00
+15525 15525 1.00000000000000e+00
+15526 15526 1.00000000000000e+00
+15527 15527 1.00000000000000e+00
+15528 2685 -3.88025594488405e-04
+15528 2709 -2.18156224160910e-03
+15528 2733 -3.15062376914730e-07
+15528 3285 -1.16854240285122e-01
+15528 3309 -2.29622406868491e+00
+15528 3333 -2.21730298722634e+00
+15528 3357 -9.76740571612998e-02
+15528 3861 -3.77341038477285e-04
+15528 3885 -4.08296859121539e-01
+15528 3909 -5.85915587839815e+00
+15528 3933 -1.11982184290233e+01
+15528 3957 -2.26455304050106e+00
+15528 3981 -1.51031657139677e-02
+15528 4461 -7.12208246196801e-04
+15528 4485 -2.68460388411363e-01
+15528 4509 -3.15212942479744e+00
+15528 4533 -4.42373616499343e+00
+15528 4557 -1.14792032596769e+00
+15528 4581 -9.46517302950758e-03
+15528 5061 -6.97276547140000e-10
+15528 5085 -8.89962435477855e-03
+15528 5109 -2.52605295670644e-01
+15528 5133 -3.59609790199509e-01
+15528 5157 -5.10251812906409e-02
+15528 5181 -6.23034231000000e-12
+15528 5709 -5.82139999520657e-06
+15528 5733 -3.92140677873932e-04
+15528 5757 -5.95594804659699e-05
+15528 15528 8.16173749686313e+00
+15528 15072 4.58896910370851e-01
+15528 15096 3.01366476430732e+00
+15528 15120 5.52408794703334e+00
+15528 15144 2.58960730429125e+00
+15528 15168 3.52882545366833e-01
+15528 15480 4.98566153261159e-01
+15528 15504 3.53687360286299e+00
+15528 15552 3.51355052713259e+00
+15528 15576 4.92735384328558e-01
+15528 15888 1.68250491358141e-01
+15528 15912 1.33129786065526e+00
+15528 15936 2.98850003984698e+00
+15528 15960 1.40655976561495e+00
+15528 15984 1.87065967598063e-01
+15528 16296 2.45968478213660e-02
+15528 16320 2.02269330121850e-01
+15528 16344 4.66158201239839e-01
+15528 16368 2.08016331128103e-01
+15528 16392 2.60335980729292e-02
+15529 15529 1.00000000000000e+00
+15530 15530 1.00000000000000e+00
+15531 15531 1.00000000000000e+00
+15532 15532 1.00000000000000e+00
+15533 15533 1.00000000000000e+00
+15534 15534 1.00000000000000e+00
+15535 15535 1.00000000000000e+00
+15536 15536 1.00000000000000e+00
+15537 15537 1.00000000000000e+00
+15538 15538 1.00000000000000e+00
+15539 15539 1.00000000000000e+00
+15540 15540 1.00000000000000e+00
+15541 15541 1.00000000000000e+00
+15542 15542 1.00000000000000e+00
+15543 15543 1.00000000000000e+00
+15544 15544 1.00000000000000e+00
+15545 15545 1.00000000000000e+00
+15546 15546 1.00000000000000e+00
+15547 15547 1.00000000000000e+00
+15548 15548 1.00000000000000e+00
+15549 15549 1.00000000000000e+00
+15550 15550 1.00000000000000e+00
+15551 15551 1.00000000000000e+00
+15552 3285 -2.84816028581600e-08
+15552 3309 -1.24352589445774e-01
+15552 3333 -5.54951980889222e-01
+15552 3357 -9.11000637037561e-02
+15552 3885 -4.43604484561120e-03
+15552 3909 -9.28686431603785e-01
+15552 3933 -8.42168416152394e+00
+15552 3957 -7.40748823356999e+00
+15552 3981 -4.48334279241388e-01
+15552 4005 -1.54782487178359e-06
+15552 4485 -2.03872129237745e-02
+15552 4509 -1.16968533203041e+00
+15552 4533 -7.85669670876051e+00
+15552 4557 -6.90326339321347e+00
+15552 4581 -9.00313035298760e-01
+15552 4605 -4.28709318978558e-06
+15552 5085 -1.73381330431106e-03
+15552 5109 -2.23748796928769e-01
+15552 5133 -1.28251347224220e+00
+15552 5157 -7.34540317333676e-01
+15552 5181 -4.59803680636695e-02
+15552 5709 -2.73146508523374e-05
+15552 5733 -8.39152786425455e-03
+15552 5757 -1.27081830126300e-02
+15552 5781 -8.87003356679501e-05
+15552 15552 9.72287790042688e+00
+15552 15096 2.94519280705977e-01
+15552 15120 2.58960730429125e+00
+15552 15144 6.39329861863230e+00
+15552 15168 3.22216462969519e+00
+15552 15192 4.52658612056962e-01
+15552 15504 3.85652247454578e-01
+15552 15528 3.51355052713259e+00
+15552 15576 3.78477955217484e+00
+15552 15600 4.53459503715140e-01
+15552 15912 1.64573973805670e-01
+15552 15936 1.40655976561495e+00
+15552 15960 3.31201727714557e+00
+15552 15984 1.36581515747559e+00
+15552 16008 1.54387821770829e-01
+15552 16320 2.59704847090965e-02
+15552 16344 2.08016331128103e-01
+15552 16368 4.66602452222982e-01
+15552 16392 2.00511985679792e-01
+15552 16416 2.40943983470187e-02
+15553 15553 1.00000000000000e+00
+15554 15554 1.00000000000000e+00
+15555 15555 1.00000000000000e+00
+15556 15556 1.00000000000000e+00
+15557 15557 1.00000000000000e+00
+15558 15558 1.00000000000000e+00
+15559 15559 1.00000000000000e+00
+15560 15560 1.00000000000000e+00
+15561 15561 1.00000000000000e+00
+15562 15562 1.00000000000000e+00
+15563 15563 1.00000000000000e+00
+15564 15564 1.00000000000000e+00
+15565 15565 1.00000000000000e+00
+15566 15566 1.00000000000000e+00
+15567 15567 1.00000000000000e+00
+15568 15568 1.00000000000000e+00
+15569 15569 1.00000000000000e+00
+15570 15570 1.00000000000000e+00
+15571 15571 1.00000000000000e+00
+15572 15572 1.00000000000000e+00
+15573 15573 1.00000000000000e+00
+15574 15574 1.00000000000000e+00
+15575 15575 1.00000000000000e+00
+15576 3309 -2.89818847393746e-05
+15576 3333 -3.98978040899699e-02
+15576 3357 -1.77902210357923e-02
+15576 3909 -2.67141945964824e-02
+15576 3933 -1.88437508933349e+00
+15576 3957 -6.80856023493019e+00
+15576 3981 -1.73811843761455e+00
+15576 4005 -4.00184406382046e-03
+15576 4485 -1.33252547496470e-07
+15576 4509 -1.30571047099530e-01
+15576 4533 -3.15244129814918e+00
+15576 4557 -1.24786044584956e+01
+15576 4581 -5.50103384768730e+00
+15576 4605 -1.51606456257916e-01
+15576 5085 -1.54264278491780e-07
+15576 5109 -4.73116659948546e-02
+15576 5133 -1.25135147236016e+00
+15576 5157 -3.00685097530556e+00
+15576 5181 -1.13270057768641e+00
+15576 5205 -3.65312941816130e-02
+15576 5709 -2.19376034812510e-05
+15576 5733 -3.18464976229817e-02
+15576 5757 -1.45112262225359e-01
+15576 5781 -4.82939482475493e-02
+15576 5805 -1.90559154330361e-05
+15576 6357 -2.87805904174350e-07
+15576 6381 -3.20764573755020e-07
+15576 15576 9.15595174166997e+00
+15576 15120 3.52882545366833e-01
+15576 15144 3.22216462969519e+00
+15576 15168 7.86066781462639e+00
+15576 15192 2.87162435362044e+00
+15576 15216 2.65247476348146e-01
+15576 15528 4.92735384328558e-01
+15576 15552 3.78477955217484e+00
+15576 15600 3.44529520645660e+00
+15576 15624 4.07864297898998e-01
+15576 15936 1.87065967598063e-01
+15576 15960 1.36581515747558e+00
+15576 15984 2.83315650998109e+00
+15576 16008 1.32109286328214e+00
+15576 16032 1.75885394049701e-01
+15576 16344 2.60335980729292e-02
+15576 16368 2.00511985679792e-01
+15576 16392 4.37725380813616e-01
+15576 16416 2.01103230141622e-01
+15576 16440 2.61814091883868e-02
+15577 15577 1.00000000000000e+00
+15578 15578 1.00000000000000e+00
+15579 15579 1.00000000000000e+00
+15580 15580 1.00000000000000e+00
+15581 15581 1.00000000000000e+00
+15582 15582 1.00000000000000e+00
+15583 15583 1.00000000000000e+00
+15584 15584 1.00000000000000e+00
+15585 15585 1.00000000000000e+00
+15586 15586 1.00000000000000e+00
+15587 15587 1.00000000000000e+00
+15588 15588 1.00000000000000e+00
+15589 15589 1.00000000000000e+00
+15590 15590 1.00000000000000e+00
+15591 15591 1.00000000000000e+00
+15592 15592 1.00000000000000e+00
+15593 15593 1.00000000000000e+00
+15594 15594 1.00000000000000e+00
+15595 15595 1.00000000000000e+00
+15596 15596 1.00000000000000e+00
+15597 15597 1.00000000000000e+00
+15598 15598 1.00000000000000e+00
+15599 15599 1.00000000000000e+00
+15600 3333 -7.01874925208510e-07
+15600 3357 -2.02792477156880e-06
+15600 3933 -8.86963956974814e-02
+15600 3957 -1.58757384800460e+00
+15600 3981 -1.08493774795170e+00
+15600 4005 -1.89372668443837e-02
+15600 4509 -3.11177468058395e-04
+15600 4533 -3.74380593890012e-01
+15600 4557 -5.95229647679307e+00
+15600 4581 -1.05430018435054e+01
+15600 4605 -2.02506210321666e+00
+15600 4629 -1.20141728929726e-02
+15600 5109 -1.11687003265817e-03
+15600 5133 -3.40415392059889e-01
+15600 5157 -3.99618407387613e+00
+15600 5181 -5.81223872309210e+00
+15600 5205 -1.55811480797781e+00
+15600 5229 -1.30329133732079e-02
+15600 5709 -4.02905087151112e-06
+15600 5733 -2.34736856990420e-02
+15600 5757 -4.56776305238469e-01
+15600 5781 -5.57018387595870e-01
+15600 5805 -7.89606507668578e-02
+15600 5829 -2.10202261173670e-07
+15600 6357 -1.43395025777831e-04
+15600 6381 -2.26300359808564e-03
+15600 6405 -2.47411633771688e-04
+15600 15600 8.49983496383112e+00
+15600 15144 4.52658612056962e-01
+15600 15168 2.87162435362044e+00
+15600 15192 5.14231724303767e+00
+15600 15216 2.84378594303400e+00
+15600 15240 4.45699009410354e-01
+15600 15552 4.53459503715140e-01
+15600 15576 3.44529520645660e+00
+15600 15624 3.71364396652326e+00
+15600 15648 5.20546693731802e-01
+15600 15960 1.54387821770829e-01
+15600 15984 1.32109286328214e+00
+15600 16008 3.14651504285886e+00
+15600 16032 1.41538524136981e+00
+15600 16056 1.77960916292746e-01
+15600 16368 2.40943983470187e-02
+15600 16392 2.01103230141622e-01
+15600 16416 4.68009715976438e-01
+15600 16440 2.04776719214466e-01
+15600 16464 2.50127706152297e-02
+15601 15601 1.00000000000000e+00
+15602 15602 1.00000000000000e+00
+15603 15603 1.00000000000000e+00
+15604 15604 1.00000000000000e+00
+15605 15605 1.00000000000000e+00
+15606 15606 1.00000000000000e+00
+15607 15607 1.00000000000000e+00
+15608 15608 1.00000000000000e+00
+15609 15609 1.00000000000000e+00
+15610 15610 1.00000000000000e+00
+15611 15611 1.00000000000000e+00
+15612 15612 1.00000000000000e+00
+15613 15613 1.00000000000000e+00
+15614 15614 1.00000000000000e+00
+15615 15615 1.00000000000000e+00
+15616 15616 1.00000000000000e+00
+15617 15617 1.00000000000000e+00
+15618 15618 1.00000000000000e+00
+15619 15619 1.00000000000000e+00
+15620 15620 1.00000000000000e+00
+15621 15621 1.00000000000000e+00
+15622 15622 1.00000000000000e+00
+15623 15623 1.00000000000000e+00
+15624 3957 -6.76799247529334e-02
+15624 3981 -2.18132430886976e-01
+15624 4005 -1.58080846130477e-02
+15624 4533 -3.41592650809739e-03
+15624 4557 -9.00428623635621e-01
+15624 4581 -8.15239410774465e+00
+15624 4605 -6.55683928723499e+00
+15624 4629 -2.25446163389853e-01
+15624 4653 -2.25852715468000e-08
+15624 5133 -2.42284408096525e-02
+15624 5157 -1.35404939750064e+00
+15624 5181 -9.17219547194405e+00
+15624 5205 -8.15750338257099e+00
+15624 5229 -7.88820640174525e-01
+15624 5253 -1.55434573406250e-07
+15624 5733 -4.16543717404546e-03
+15624 5757 -3.51322853426498e-01
+15624 5781 -1.82669002690145e+00
+15624 5805 -1.01464558466502e+00
+15624 5829 -6.90657784007971e-02
+15624 6357 -6.29502914319969e-04
+15624 6381 -2.75991069040432e-02
+15624 6405 -2.92956316988240e-02
+15624 6429 -2.63403151354002e-04
+15624 15624 1.01339764526105e+01
+15624 15168 2.65247476348146e-01
+15624 15192 2.84378594303401e+00
+15624 15216 7.76021858978305e+00
+15624 15240 3.23794388911827e+00
+15624 15264 3.63786962869211e-01
+15624 15576 4.07864297898998e-01
+15624 15600 3.71364396652326e+00
+15624 15648 3.67164699493718e+00
+15624 15672 3.97365055002481e-01
+15624 15984 1.75885394049701e-01
+15624 16008 1.41538524136981e+00
+15624 16032 3.17831707809936e+00
+15624 16056 1.33207175863362e+00
+15624 16080 1.55057023365655e-01
+15624 16392 2.61814091883868e-02
+15624 16416 2.04776719214466e-01
+15624 16440 4.51557124279133e-01
+15624 16464 2.00736623449201e-01
+15624 16488 2.51713852470706e-02
+15625 15625 1.00000000000000e+00
+15626 15626 1.00000000000000e+00
+15627 15627 1.00000000000000e+00
+15628 15628 1.00000000000000e+00
+15629 15629 1.00000000000000e+00
+15630 15630 1.00000000000000e+00
+15631 15631 1.00000000000000e+00
+15632 15632 1.00000000000000e+00
+15633 15633 1.00000000000000e+00
+15634 15634 1.00000000000000e+00
+15635 15635 1.00000000000000e+00
+15636 15636 1.00000000000000e+00
+15637 15637 1.00000000000000e+00
+15638 15638 1.00000000000000e+00
+15639 15639 1.00000000000000e+00
+15640 15640 1.00000000000000e+00
+15641 15641 1.00000000000000e+00
+15642 15642 1.00000000000000e+00
+15643 15643 1.00000000000000e+00
+15644 15644 1.00000000000000e+00
+15645 15645 1.00000000000000e+00
+15646 15646 1.00000000000000e+00
+15647 15647 1.00000000000000e+00
+15648 3957 -5.06717717815108e-06
+15648 3981 -1.17009061321146e-02
+15648 4005 -2.95310796217859e-03
+15648 4557 -1.99678375256178e-02
+15648 4581 -1.73985483446228e+00
+15648 4605 -4.37787045752163e+00
+15648 4629 -7.91085148021607e-01
+15648 4653 -2.69315925168941e-04
+15648 5133 -3.64761453425590e-07
+15648 5157 -1.30866721526178e-01
+15648 5181 -3.32914583511338e+00
+15648 5205 -1.21491661808585e+01
+15648 5229 -4.98769432682711e+00
+15648 5253 -1.27735214090195e-01
+15648 5733 -7.35209993245780e-07
+15648 5757 -7.03796648728689e-02
+15648 5781 -1.66495891798113e+00
+15648 5805 -3.94528752716490e+00
+15648 5829 -1.62540162070137e+00
+15648 5853 -5.86754948615242e-02
+15648 6357 -3.83203401246173e-04
+15648 6381 -8.46843250636784e-02
+15648 6405 -2.75908869197922e-01
+15648 6429 -8.48036522135795e-02
+15648 6453 -9.55235986069353e-05
+15648 7005 -4.27068489809029e-05
+15648 7029 -3.48101433441648e-05
+15648 15648 8.34560968819237e+00
+15648 15192 4.45699009410354e-01
+15648 15216 3.23794388911826e+00
+15648 15240 6.56077331714627e+00
+15648 15264 2.63307945879096e+00
+15648 15288 2.94482901828528e-01
+15648 15600 5.20546693731802e-01
+15648 15624 3.67164699493718e+00
+15648 15672 3.45834867769280e+00
+15648 15696 4.67222114420705e-01
+15648 16008 1.77960916292746e-01
+15648 16032 1.33207175863362e+00
+15648 16056 2.84901195706920e+00
+15648 16080 1.38078276116629e+00
+15648 16104 1.90138666925913e-01
+15648 16416 2.50127706152297e-02
+15648 16440 2.00736623449201e-01
+15648 16464 4.54332216932532e-01
+15648 16488 2.06994670444976e-01
+15648 16512 2.65772823641734e-02
+15649 15649 1.00000000000000e+00
+15650 15650 1.00000000000000e+00
+15651 15651 1.00000000000000e+00
+15652 15652 1.00000000000000e+00
+15653 15653 1.00000000000000e+00
+15654 15654 1.00000000000000e+00
+15655 15655 1.00000000000000e+00
+15656 15656 1.00000000000000e+00
+15657 15657 1.00000000000000e+00
+15658 15658 1.00000000000000e+00
+15659 15659 1.00000000000000e+00
+15660 15660 1.00000000000000e+00
+15661 15661 1.00000000000000e+00
+15662 15662 1.00000000000000e+00
+15663 15663 1.00000000000000e+00
+15664 15664 1.00000000000000e+00
+15665 15665 1.00000000000000e+00
+15666 15666 1.00000000000000e+00
+15667 15667 1.00000000000000e+00
+15668 15668 1.00000000000000e+00
+15669 15669 1.00000000000000e+00
+15670 15670 1.00000000000000e+00
+15671 15671 1.00000000000000e+00
+15672 4581 -5.65856354692914e-02
+15672 4605 -8.79965056906127e-01
+15672 4629 -4.56253711353308e-01
+15672 4653 -1.16143813803572e-03
+15672 5157 -2.23427793991180e-04
+15672 5181 -3.49286089514239e-01
+15672 5205 -5.86735061115216e+00
+15672 5229 -1.01403827040808e+01
+15672 5253 -1.64156849315699e+00
+15672 5277 -7.39950019853679e-03
+15672 5757 -1.69124856312048e-03
+15672 5781 -4.28266688460053e-01
+15672 5805 -5.10178297208434e+00
+15672 5829 -7.61855577416965e+00
+15672 5853 -1.92125528213327e+00
+15672 5877 -1.42217084326022e-02
+15672 6357 -6.02398997712599e-05
+15672 6381 -5.14144086384395e-02
+15672 6405 -7.67651190101414e-01
+15672 6429 -8.31720144615564e-01
+15672 6453 -1.13112689805217e-01
+15672 6477 -5.73103372691881e-06
+15672 7005 -1.17783345955640e-03
+15672 7029 -8.02865271787057e-03
+15672 7053 -7.09905820190994e-04
+15672 15672 9.38018160737747e+00
+15672 15216 3.63786962869211e-01
+15672 15240 2.63307945879096e+00
+15672 15264 5.56573923087694e+00
+15672 15288 3.13883496231916e+00
+15672 15312 4.90225838751259e-01
+15672 15624 3.97365055002481e-01
+15672 15648 3.45834867769280e+00
+15672 15696 3.89793934425677e+00
+15672 15720 5.07262721643473e-01
+15672 16032 1.55057023365655e-01
+15672 16056 1.38078276116629e+00
+15672 16080 3.36345328386550e+00
+15672 16104 1.42526502644434e+00
+15672 16128 1.66177589685169e-01
+15672 16440 2.51713852470706e-02
+15672 16464 2.06994670444976e-01
+15672 16488 4.74982653968479e-01
+15672 16512 2.04608133035231e-01
+15672 16536 2.45747508946344e-02
+15673 15673 1.00000000000000e+00
+15674 15674 1.00000000000000e+00
+15675 15675 1.00000000000000e+00
+15676 15676 1.00000000000000e+00
+15677 15677 1.00000000000000e+00
+15678 15678 1.00000000000000e+00
+15679 15679 1.00000000000000e+00
+15680 15680 1.00000000000000e+00
+15681 15681 1.00000000000000e+00
+15682 15682 1.00000000000000e+00
+15683 15683 1.00000000000000e+00
+15684 15684 1.00000000000000e+00
+15685 15685 1.00000000000000e+00
+15686 15686 1.00000000000000e+00
+15687 15687 1.00000000000000e+00
+15688 15688 1.00000000000000e+00
+15689 15689 1.00000000000000e+00
+15690 15690 1.00000000000000e+00
+15691 15691 1.00000000000000e+00
+15692 15692 1.00000000000000e+00
+15693 15693 1.00000000000000e+00
+15694 15694 1.00000000000000e+00
+15695 15695 1.00000000000000e+00
+15696 4605 -3.73800305753875e-02
+15696 4629 -7.27606402896137e-02
+15696 4653 -6.07278449815373e-04
+15696 5181 -2.60936372640858e-03
+15696 5205 -9.00513750001290e-01
+15696 5229 -7.22856710572116e+00
+15696 5253 -4.99269484567999e+00
+15696 5277 -9.08396678635025e-02
+15696 5781 -2.75544390262795e-02
+15696 5805 -1.56020234216355e+00
+15696 5829 -1.02980360621154e+01
+15696 5853 -9.05696095074184e+00
+15696 5877 -6.32999049357056e-01
+15696 6381 -8.22518959263112e-03
+15696 6405 -5.23272904718816e-01
+15696 6429 -2.49991636289086e+00
+15696 6453 -1.43888709538293e+00
+15696 6477 -1.07496598483683e-01
+15696 7005 -4.35560139697713e-03
+15696 7029 -7.55358123396634e-02
+15696 7053 -6.28594643042408e-02
+15696 7077 -7.25522370285950e-04
+15696 15696 9.96801212356337e+00
+15696 15240 2.94482901828528e-01
+15696 15264 3.13883496231916e+00
+15696 15288 8.42373780668300e+00
+15696 15312 3.10346929434225e+00
+15696 15336 2.85641484834302e-01
+15696 15648 4.67222114420705e-01
+15696 15672 3.89793934425677e+00
+15696 15720 3.56739673796153e+00
+15696 15744 3.84586462846898e-01
+15696 16056 1.90138666925913e-01
+15696 16080 1.42526502644434e+00
+15696 16104 3.02295807149273e+00
+15696 16128 1.36062223715692e+00
+15696 16152 1.73977969604057e-01
+15696 16464 2.65772823641734e-02
+15696 16488 2.04608133035231e-01
+15696 16512 4.48016156154050e-01
+15696 16536 2.11270441481446e-01
+15696 16560 2.82428594757272e-02
+15697 15697 1.00000000000000e+00
+15698 15698 1.00000000000000e+00
+15699 15699 1.00000000000000e+00
+15700 15700 1.00000000000000e+00
+15701 15701 1.00000000000000e+00
+15702 15702 1.00000000000000e+00
+15703 15703 1.00000000000000e+00
+15704 15704 1.00000000000000e+00
+15705 15705 1.00000000000000e+00
+15706 15706 1.00000000000000e+00
+15707 15707 1.00000000000000e+00
+15708 15708 1.00000000000000e+00
+15709 15709 1.00000000000000e+00
+15710 15710 1.00000000000000e+00
+15711 15711 1.00000000000000e+00
+15712 15712 1.00000000000000e+00
+15713 15713 1.00000000000000e+00
+15714 15714 1.00000000000000e+00
+15715 15715 1.00000000000000e+00
+15716 15716 1.00000000000000e+00
+15717 15717 1.00000000000000e+00
+15718 15718 1.00000000000000e+00
+15719 15719 1.00000000000000e+00
+15720 4605 -1.80427590875910e-07
+15720 4629 -8.11888108207359e-04
+15720 4653 -8.45132164331549e-05
+15720 5205 -1.38478634824625e-02
+15720 5229 -1.42156879861830e+00
+15720 5253 -2.51925394366346e+00
+15720 5277 -2.75622480796982e-01
+15720 5781 -6.36605257387370e-07
+15720 5805 -1.23074941957588e-01
+15720 5829 -3.50368766140374e+00
+15720 5853 -1.16102424187961e+01
+15720 5877 -4.52174059881944e+00
+15720 5901 -1.22950809007931e-01
+15720 6381 -2.55024749279378e-06
+15720 6405 -9.94144917254071e-02
+15720 6429 -2.25180646794107e+00
+15720 6453 -5.48334295921232e+00
+15720 6477 -2.39548250059452e+00
+15720 6501 -9.62596793221488e-02
+15720 7005 -2.14648723749308e-03
+15720 7029 -2.00180555053650e-01
+15720 7053 -5.38961450759771e-01
+15720 7077 -1.60508309066113e-01
+15720 7101 -3.56454239513509e-04
+15720 7629 -9.46477160706600e-08
+15720 7653 -6.38658904564122e-04
+15720 7677 -3.76985077331602e-04
+15720 15720 8.22345368046100e+00
+15720 15264 4.90225838751259e-01
+15720 15288 3.10346929434225e+00
+15720 15312 5.45879703285381e+00
+15720 15336 2.73579568635200e+00
+15720 15360 3.98307436753696e-01
+15720 15672 5.07262721643473e-01
+15720 15696 3.56739673796153e+00
+15720 15744 3.78957606445559e+00
+15720 15768 5.62807553266987e-01
+15720 16080 1.66177589685169e-01
+15720 16104 1.36062223715692e+00
+15720 16128 3.16981381131377e+00
+15720 16152 1.57586671027072e+00
+15720 16176 2.19988707963619e-01
+15720 16488 2.45747508946344e-02
+15720 16512 2.11270441481446e-01
+15720 16536 5.07714859658772e-01
+15720 16560 2.37988866512918e-01
+15720 16584 3.12543571525023e-02
+15721 15721 1.00000000000000e+00
+15722 15722 1.00000000000000e+00
+15723 15723 1.00000000000000e+00
+15724 15724 1.00000000000000e+00
+15725 15725 1.00000000000000e+00
+15726 15726 1.00000000000000e+00
+15727 15727 1.00000000000000e+00
+15728 15728 1.00000000000000e+00
+15729 15729 1.00000000000000e+00
+15730 15730 1.00000000000000e+00
+15731 15731 1.00000000000000e+00
+15732 15732 1.00000000000000e+00
+15733 15733 1.00000000000000e+00
+15734 15734 1.00000000000000e+00
+15735 15735 1.00000000000000e+00
+15736 15736 1.00000000000000e+00
+15737 15737 1.00000000000000e+00
+15738 15738 1.00000000000000e+00
+15739 15739 1.00000000000000e+00
+15740 15740 1.00000000000000e+00
+15741 15741 1.00000000000000e+00
+15742 15742 1.00000000000000e+00
+15743 15743 1.00000000000000e+00
+15744 5229 -3.23742370319457e-02
+15744 5253 -4.17890200362028e-01
+15744 5277 -1.54266916353449e-01
+15744 5805 -1.43016294015586e-04
+15744 5829 -3.45089594634302e-01
+15744 5853 -5.92201974611276e+00
+15744 5877 -1.01045841424142e+01
+15744 5901 -1.03543496275690e+00
+15744 5925 -2.35827455065943e-03
+15744 6405 -2.45483860613432e-03
+15744 6429 -5.66300017826288e-01
+15744 6453 -6.75754988964383e+00
+15744 6477 -9.88798952076274e+00
+15744 6501 -1.81132176135845e+00
+15744 6525 -9.21270429339994e-03
+15744 7005 -2.84870293465072e-04
+15744 7029 -1.10018885673374e-01
+15744 7053 -1.33316206270335e+00
+15744 7077 -1.13078752502031e+00
+15744 7101 -1.42656758267412e-01
+15744 7125 -3.51333413334760e-05
+15744 7629 -3.86495522040070e-07
+15744 7653 -5.05501392373332e-03
+15744 7677 -1.46556642943470e-02
+15744 7701 -1.07614750049477e-03
+15744 15744 1.08005989053053e+01
+15744 15288 2.85641484834302e-01
+15744 15312 2.73579568635200e+00
+15744 15336 7.01598994451505e+00
+15744 15360 3.02294763350108e+00
+15744 15384 3.57429471621572e-01
+15744 15696 3.84586462846898e-01
+15744 15720 3.78957606445559e+00
+15744 15768 3.89559657381331e+00
+15744 15792 4.11091590186328e-01
+15744 16104 1.73977969604057e-01
+15744 16128 1.57586671027073e+00
+15744 16152 3.81874972158639e+00
+15744 16176 1.37976453011185e+00
+15744 16200 1.24952424564340e-01
+15744 16512 2.82428594757272e-02
+15744 16536 2.37988866512918e-01
+15744 16560 5.44078468654198e-01
+15744 16584 1.88081007563747e-01
+15744 16608 1.57658947384345e-02
+15745 15745 1.00000000000000e+00
+15746 15746 1.00000000000000e+00
+15747 15747 1.00000000000000e+00
+15748 15748 1.00000000000000e+00
+15749 15749 1.00000000000000e+00
+15750 15750 1.00000000000000e+00
+15751 15751 1.00000000000000e+00
+15752 15752 1.00000000000000e+00
+15753 15753 1.00000000000000e+00
+15754 15754 1.00000000000000e+00
+15755 15755 1.00000000000000e+00
+15756 15756 1.00000000000000e+00
+15757 15757 1.00000000000000e+00
+15758 15758 1.00000000000000e+00
+15759 15759 1.00000000000000e+00
+15760 15760 1.00000000000000e+00
+15761 15761 1.00000000000000e+00
+15762 15762 1.00000000000000e+00
+15763 15763 1.00000000000000e+00
+15764 15764 1.00000000000000e+00
+15765 15765 1.00000000000000e+00
+15766 15766 1.00000000000000e+00
+15767 15767 1.00000000000000e+00
+15768 5253 -1.88624550732978e-02
+15768 5277 -2.32563123210234e-02
+15768 5829 -1.97299421219392e-03
+15768 5853 -9.48787970187871e-01
+15768 5877 -5.11981516898468e+00
+15768 5901 -2.63427490152788e+00
+15768 5925 -2.76749461282620e-02
+15768 6429 -3.39913024247168e-02
+15768 6453 -1.79211733908770e+00
+15768 6477 -1.13396010740795e+01
+15768 6501 -1.07635608328284e+01
+15768 6525 -1.61524079405973e-01
+15768 7029 -1.65362016833954e-02
+15768 7053 -6.38508544939169e-01
+15768 7077 -4.72007968522755e+00
+15768 7101 -3.05351420152953e+00
+15768 7125 -2.70507787134003e-03
+15768 7629 -1.26266347100440e-07
+15768 7653 -1.53507695888668e-02
+15768 7677 -2.98294215297033e-01
+15768 7701 -7.30006766659712e-02
+15768 15768 1.02261200668356e+01
+15768 15312 3.98307436753696e-01
+15768 15336 3.02294763350108e+00
+15768 15360 6.89066535570985e+00
+15768 15384 2.97669063250825e+00
+15768 15720 5.62807553266987e-01
+15768 15744 3.89559657381331e+00
+15768 15792 5.81606050191973e+00
+15768 16128 2.19988707963619e-01
+15768 16152 1.37976453011186e+00
+15768 16176 3.37521270349820e+00
+15768 16200 2.81178010326755e+00
+15768 16536 3.12543571525023e-02
+15768 16560 1.88081007563747e-01
+15768 16584 4.64035159481771e-01
+15768 16608 4.24116551982371e-01
+15769 15769 1.00000000000000e+00
+15770 15770 1.00000000000000e+00
+15771 15771 1.00000000000000e+00
+15772 15772 1.00000000000000e+00
+15773 15773 1.00000000000000e+00
+15774 15774 1.00000000000000e+00
+15775 15775 1.00000000000000e+00
+15776 15776 1.00000000000000e+00
+15777 15777 1.00000000000000e+00
+15778 15778 1.00000000000000e+00
+15779 15779 1.00000000000000e+00
+15780 15780 1.00000000000000e+00
+15781 15781 1.00000000000000e+00
+15782 15782 1.00000000000000e+00
+15783 15783 1.00000000000000e+00
+15784 15784 1.00000000000000e+00
+15785 15785 1.00000000000000e+00
+15786 15786 1.00000000000000e+00
+15787 15787 1.00000000000000e+00
+15788 15788 1.00000000000000e+00
+15789 15789 1.00000000000000e+00
+15790 15790 1.00000000000000e+00
+15791 15791 1.00000000000000e+00
+15792 5853 -8.34695865135725e-03
+15792 5877 -8.20147575343343e-01
+15792 5901 -1.21722609796368e+00
+15792 5925 -3.88419704019079e-02
+15792 6429 -3.45535269833850e-07
+15792 6453 -9.39954658147401e-02
+15792 6477 -5.32072509956977e+00
+15792 6501 -1.13506209985234e+01
+15792 6525 -2.58559228758146e-01
+15792 7029 -4.61831190340905e-06
+15792 7053 -1.17498240106754e-01
+15792 7077 -5.62748706111411e+00
+15792 7101 -5.11769890541450e+00
+15792 7125 -5.16422235334572e-03
+15792 7629 -7.90465775745000e-09
+15792 7653 -1.19215732302675e-02
+15792 7677 -5.03800392544258e-01
+15792 7701 -1.38468320828479e-01
+15792 15792 9.75447987253512e+00
+15792 15336 3.57429471621572e-01
+15792 15360 2.97669063250825e+00
+15792 15384 3.45137496366549e+00
+15792 15744 4.11091590186328e-01
+15792 15768 5.81606050191973e+00
+15792 16152 1.24952424564340e-01
+15792 16176 2.81178010326755e+00
+15792 16200 4.74889323458471e+00
+15792 16560 1.57658947384345e-02
+15792 16584 4.24116551982371e-01
+15792 16608 7.37871840795700e-01
+15793 15793 1.00000000000000e+00
+15794 15794 1.00000000000000e+00
+15795 15795 1.00000000000000e+00
+15796 15796 1.00000000000000e+00
+15797 15797 1.00000000000000e+00
+15798 15798 1.00000000000000e+00
+15799 15799 1.00000000000000e+00
+15800 15800 1.00000000000000e+00
+15801 15801 1.00000000000000e+00
+15802 15802 1.00000000000000e+00
+15803 15803 1.00000000000000e+00
+15804 15804 1.00000000000000e+00
+15805 15805 1.00000000000000e+00
+15806 15806 1.00000000000000e+00
+15807 15807 1.00000000000000e+00
+15808 15808 1.00000000000000e+00
+15809 15809 1.00000000000000e+00
+15810 15810 1.00000000000000e+00
+15811 15811 1.00000000000000e+00
+15812 15812 1.00000000000000e+00
+15813 15813 1.00000000000000e+00
+15814 15814 1.00000000000000e+00
+15815 15815 1.00000000000000e+00
+15816 2037 -4.53057394300007e-03
+15816 2061 -1.70855648037462e-02
+15816 2085 -4.97899102435187e-05
+15816 2637 -1.81449700885238e+00
+15816 2661 -2.47118942806325e+00
+15816 2685 -4.22648233034794e-02
+15816 2709 -2.27564163003290e-07
+15816 3213 -2.89759613634642e-01
+15816 3237 -1.47080981867762e+01
+15816 3261 -7.14013593441134e+00
+15816 3285 -1.11494712416163e-01
+15816 3309 -2.12346769668850e-07
+15816 3813 -7.35786296464262e-01
+15816 3837 -6.32291240332999e+00
+15816 3861 -1.79324213756288e+00
+15816 3885 -3.10803560498734e-02
+15816 4413 -4.88682978709439e-02
+15816 4437 -1.65636733875927e-01
+15816 4461 -3.17314047065666e-02
+15816 4485 -2.42166638779722e-05
+15816 5037 -1.33099563758210e-07
+15816 5061 -1.54286544133720e-07
+15816 15816 1.21577171568330e+01
+15816 15000 6.06553463424571e-01
+15816 15024 3.57429471621563e-01
+15816 15048 1.54722114026508e-02
+15816 15408 4.94787439225250e+00
+15816 15432 3.02294763350099e+00
+15816 15456 1.56860124964210e-01
+15816 15840 7.01598994451482e+00
+15816 15864 4.10608961742365e-01
+15816 16224 4.37974669532055e+00
+15816 16248 2.73579568635192e+00
+15816 16272 1.55977811054754e-01
+15816 16632 4.64521539191584e-01
+15816 16656 2.85641484834296e-01
+15816 16680 1.52516329252869e-02
+15817 15817 1.00000000000000e+00
+15818 15818 1.00000000000000e+00
+15819 15819 1.00000000000000e+00
+15820 15820 1.00000000000000e+00
+15821 15821 1.00000000000000e+00
+15822 15822 1.00000000000000e+00
+15823 15823 1.00000000000000e+00
+15824 15824 1.00000000000000e+00
+15825 15825 1.00000000000000e+00
+15826 15826 1.00000000000000e+00
+15827 15827 1.00000000000000e+00
+15828 15828 1.00000000000000e+00
+15829 15829 1.00000000000000e+00
+15830 15830 1.00000000000000e+00
+15831 15831 1.00000000000000e+00
+15832 15832 1.00000000000000e+00
+15833 15833 1.00000000000000e+00
+15834 15834 1.00000000000000e+00
+15835 15835 1.00000000000000e+00
+15836 15836 1.00000000000000e+00
+15837 15837 1.00000000000000e+00
+15838 15838 1.00000000000000e+00
+15839 15839 1.00000000000000e+00
+15840 2037 -2.35827455065936e-03
+15840 2061 -9.21270429339967e-03
+15840 2085 -3.51333413334755e-05
+15840 2637 -1.03543496275687e+00
+15840 2661 -1.81132176135841e+00
+15840 2685 -1.42656758267414e-01
+15840 2709 -1.07614750049477e-03
+15840 3213 -1.54266916353445e-01
+15840 3237 -1.01045841424138e+01
+15840 3261 -9.88798952076252e+00
+15840 3285 -1.13078752502025e+00
+15840 3309 -1.46556642943468e-02
+15840 3813 -4.17890200362018e-01
+15840 3837 -5.92201974611259e+00
+15840 3861 -6.75754988964339e+00
+15840 3885 -1.33316206270320e+00
+15840 3909 -5.05501392373296e-03
+15840 4413 -3.23742370319451e-02
+15840 4437 -3.45089594634299e-01
+15840 4461 -5.66300017826269e-01
+15840 4485 -1.10018885673366e-01
+15840 4509 -3.86495522040020e-07
+15840 5037 -1.43016294015590e-04
+15840 5061 -2.45483860613439e-03
+15840 5085 -2.84870293465081e-04
+15840 15840 1.08005989053049e+01
+15840 15000 3.57429471621563e-01
+15840 15024 4.11091590186327e-01
+15840 15048 1.24952424564341e-01
+15840 15072 1.57658947384345e-02
+15840 15408 3.02294763350099e+00
+15840 15432 3.89559657381322e+00
+15840 15456 1.37976453011177e+00
+15840 15480 1.88081007563730e-01
+15840 15816 7.01598994451482e+00
+15840 15864 3.81874972158606e+00
+15840 15888 5.44078468654130e-01
+15840 16224 2.73579568635192e+00
+15840 16248 3.78957606445548e+00
+15840 16272 1.57586671027065e+00
+15840 16296 2.37988866512904e-01
+15840 16632 2.85641484834296e-01
+15840 16656 3.84586462846892e-01
+15840 16680 1.73977969604060e-01
+15840 16704 2.82428594757281e-02
+15841 15841 1.00000000000000e+00
+15842 15842 1.00000000000000e+00
+15843 15843 1.00000000000000e+00
+15844 15844 1.00000000000000e+00
+15845 15845 1.00000000000000e+00
+15846 15846 1.00000000000000e+00
+15847 15847 1.00000000000000e+00
+15848 15848 1.00000000000000e+00
+15849 15849 1.00000000000000e+00
+15850 15850 1.00000000000000e+00
+15851 15851 1.00000000000000e+00
+15852 15852 1.00000000000000e+00
+15853 15853 1.00000000000000e+00
+15854 15854 1.00000000000000e+00
+15855 15855 1.00000000000000e+00
+15856 15856 1.00000000000000e+00
+15857 15857 1.00000000000000e+00
+15858 15858 1.00000000000000e+00
+15859 15859 1.00000000000000e+00
+15860 15860 1.00000000000000e+00
+15861 15861 1.00000000000000e+00
+15862 15862 1.00000000000000e+00
+15863 15863 1.00000000000000e+00
+15864 2037 -2.65678797598061e-05
+15864 2061 -1.91406254721879e-04
+15864 2085 -2.92525320334745e-06
+15864 2637 -3.66291396137364e-02
+15864 2661 -2.20635404010207e-01
+15864 2685 -1.49049353647891e-01
+15864 2709 -5.78613424267483e-03
+15864 2733 -2.84663206480000e-10
+15864 3213 -2.68203129603534e-03
+15864 3237 -8.81159512977690e-01
+15864 3261 -5.27654274785870e+00
+15864 3285 -3.33774787695725e+00
+15864 3309 -2.26898724073114e-01
+15864 3333 -6.88591247467974e-04
+15864 3813 -1.42858512538454e-02
+15864 3837 -1.39480511332749e+00
+15864 3861 -1.09547396060201e+01
+15864 3885 -7.34164664187888e+00
+15864 3909 -5.12343280474780e-01
+15864 3933 -3.96784765631882e-04
+15864 4413 -2.27056743930503e-03
+15864 4437 -3.35634600221834e-01
+15864 4461 -2.15460430129381e+00
+15864 4485 -1.43097519682743e+00
+15864 4509 -1.08175470687364e-01
+15864 5037 -6.20042783016785e-04
+15864 5061 -2.67986772911736e-02
+15864 5085 -2.79573555867753e-02
+15864 5109 -2.81280434771745e-04
+15864 15864 1.06033020384089e+01
+15864 15000 1.54722114026508e-02
+15864 15024 1.24952424564341e-01
+15864 15048 2.87903471136636e-01
+15864 15072 1.43771354629872e-01
+15864 15096 2.01769439190334e-02
+15864 15408 1.56860124964210e-01
+15864 15432 1.37976453011178e+00
+15864 15456 3.35768784025763e+00
+15864 15480 1.51845040734963e+00
+15864 15504 1.91531594273673e-01
+15864 15816 4.10608961742365e-01
+15864 15840 3.81874972158606e+00
+15864 15888 4.12606418741692e+00
+15864 15912 4.87437578200078e-01
+15864 16224 1.55977811054754e-01
+15864 16248 1.57586671027065e+00
+15864 16272 4.17048493342239e+00
+15864 16296 1.77869649869598e+00
+15864 16320 2.06685258161086e-01
+15864 16632 1.52516329252869e-02
+15864 16656 1.73977969604060e-01
+15864 16680 4.91102744427823e-01
+15864 16704 2.08832877466459e-01
+15864 16728 2.39653598908867e-02
+15865 15865 1.00000000000000e+00
+15866 15866 1.00000000000000e+00
+15867 15867 1.00000000000000e+00
+15868 15868 1.00000000000000e+00
+15869 15869 1.00000000000000e+00
+15870 15870 1.00000000000000e+00
+15871 15871 1.00000000000000e+00
+15872 15872 1.00000000000000e+00
+15873 15873 1.00000000000000e+00
+15874 15874 1.00000000000000e+00
+15875 15875 1.00000000000000e+00
+15876 15876 1.00000000000000e+00
+15877 15877 1.00000000000000e+00
+15878 15878 1.00000000000000e+00
+15879 15879 1.00000000000000e+00
+15880 15880 1.00000000000000e+00
+15881 15881 1.00000000000000e+00
+15882 15882 1.00000000000000e+00
+15883 15883 1.00000000000000e+00
+15884 15884 1.00000000000000e+00
+15885 15885 1.00000000000000e+00
+15886 15886 1.00000000000000e+00
+15887 15887 1.00000000000000e+00
+15888 2637 -1.19463980016838e-06
+15888 2661 -1.51639929481642e-02
+15888 2685 -4.35226319330419e-02
+15888 2709 -7.02520703206120e-03
+15888 2733 -1.31019120337000e-09
+15888 3237 -2.56556343381720e-02
+15888 3261 -1.07744492518077e+00
+15888 3285 -2.41236416441363e+00
+15888 3309 -7.93553797255192e-01
+15888 3333 -2.01988474371420e-02
+15888 3357 -4.14899663859000e-08
+15888 3813 -2.63635274781220e-07
+15888 3837 -1.63888366341900e-01
+15888 3861 -4.28313906253394e+00
+15888 3885 -1.18093709731944e+01
+15888 3909 -3.34211054867200e+00
+15888 3933 -1.01470518843150e-01
+15888 3957 -6.61515078038700e-08
+15888 4413 -5.30610853420280e-07
+15888 4437 -7.56563029286552e-02
+15888 4461 -1.87921702765295e+00
+15888 4485 -5.11917555376152e+00
+15888 4509 -1.74396899578495e+00
+15888 4533 -3.98639657652776e-02
+15888 5037 -3.42380297403751e-04
+15888 5061 -7.66304469585001e-02
+15888 5085 -2.38646796391964e-01
+15888 5109 -7.51061278934855e-02
+15888 5133 -1.18646387859601e-04
+15888 5685 -3.13185518468507e-05
+15888 5709 -2.65552428960322e-05
+15888 15888 9.77556496807971e+00
+15888 15024 1.57658947384345e-02
+15888 15048 1.43771354629872e-01
+15888 15072 3.56062772461138e-01
+15888 15096 1.50570875748810e-01
+15888 15120 1.74657750181691e-02
+15888 15432 1.88081007563730e-01
+15888 15456 1.51845040734963e+00
+15888 15480 3.42083700730071e+00
+15888 15504 1.43912834252727e+00
+15888 15528 1.68250491358141e-01
+15888 15840 5.44078468654130e-01
+15888 15864 4.12606418741692e+00
+15888 15912 3.67969130569640e+00
+15888 15936 4.32485248224002e-01
+15888 16248 2.37988866512904e-01
+15888 16272 1.77869649869598e+00
+15888 16296 3.72922002063173e+00
+15888 16320 1.56380912680985e+00
+15888 16344 1.84267023541371e-01
+15888 16656 2.82428594757281e-02
+15888 16680 2.08832877466459e-01
+15888 16704 4.33158525793892e-01
+15888 16728 1.81741071819453e-01
+15888 16752 2.14699080639766e-02
+15889 15889 1.00000000000000e+00
+15890 15890 1.00000000000000e+00
+15891 15891 1.00000000000000e+00
+15892 15892 1.00000000000000e+00
+15893 15893 1.00000000000000e+00
+15894 15894 1.00000000000000e+00
+15895 15895 1.00000000000000e+00
+15896 15896 1.00000000000000e+00
+15897 15897 1.00000000000000e+00
+15898 15898 1.00000000000000e+00
+15899 15899 1.00000000000000e+00
+15900 15900 1.00000000000000e+00
+15901 15901 1.00000000000000e+00
+15902 15902 1.00000000000000e+00
+15903 15903 1.00000000000000e+00
+15904 15904 1.00000000000000e+00
+15905 15905 1.00000000000000e+00
+15906 15906 1.00000000000000e+00
+15907 15907 1.00000000000000e+00
+15908 15908 1.00000000000000e+00
+15909 15909 1.00000000000000e+00
+15910 15910 1.00000000000000e+00
+15911 15911 1.00000000000000e+00
+15912 2661 -1.30936415916657e-05
+15912 2685 -3.42397024350168e-03
+15912 2709 -1.52551360576180e-03
+15912 2733 -9.70816716290000e-10
+15912 3261 -3.82846590392059e-02
+15912 3285 -5.06189018822970e-01
+15912 3309 -5.98577294457400e-01
+15912 3333 -8.38121177760752e-02
+15912 3357 -2.99572453049507e-04
+15912 3837 -1.91637324661198e-04
+15912 3861 -4.87379513125262e-01
+15912 3885 -5.28864690628289e+00
+15912 3909 -6.52746285474573e+00
+15912 3933 -8.51279404173898e-01
+15912 3957 -1.07430284427307e-02
+15912 4437 -1.46560958747284e-03
+15912 4461 -4.41673679756449e-01
+15912 4485 -5.30453705292561e+00
+15912 4509 -7.42284113932549e+00
+15912 4533 -1.20828029646931e+00
+15912 4557 -5.20445063742404e-03
+15912 5037 -4.99741004107984e-05
+15912 5061 -4.19819363012440e-02
+15912 5085 -6.31129289373418e-01
+15912 5109 -8.20278751359089e-01
+15912 5133 -1.44830657291899e-01
+15912 5157 -5.13822501368402e-06
+15912 5685 -9.54445888291217e-04
+15912 5709 -6.95654844075536e-03
+15912 5733 -6.49930412057389e-04
+15912 15912 8.85982970989341e+00
+15912 15048 2.01769439190334e-02
+15912 15072 1.50570875748810e-01
+15912 15096 3.14802352952060e-01
+15912 15120 1.30555135041960e-01
+15912 15144 1.51730087423209e-02
+15912 15456 1.91531594273673e-01
+15912 15480 1.43912834252727e+00
+15912 15504 3.04811342980965e+00
+15912 15528 1.33129786065526e+00
+15912 15552 1.64573973805670e-01
+15912 15864 4.87437578200078e-01
+15912 15888 3.67969130569640e+00
+15912 15936 3.54045363333212e+00
+15912 15960 4.52628160109008e-01
+15912 16272 2.06685258161086e-01
+15912 16296 1.56380912680985e+00
+15912 16320 3.34654915774404e+00
+15912 16344 1.50343418584934e+00
+15912 16368 1.91591522920960e-01
+15912 16680 2.39653598908867e-02
+15912 16704 1.81741071819453e-01
+15912 16728 3.89411284935657e-01
+15912 16752 1.73589216340481e-01
+15912 16776 2.19273960211435e-02
+15913 15913 1.00000000000000e+00
+15914 15914 1.00000000000000e+00
+15915 15915 1.00000000000000e+00
+15916 15916 1.00000000000000e+00
+15917 15917 1.00000000000000e+00
+15918 15918 1.00000000000000e+00
+15919 15919 1.00000000000000e+00
+15920 15920 1.00000000000000e+00
+15921 15921 1.00000000000000e+00
+15922 15922 1.00000000000000e+00
+15923 15923 1.00000000000000e+00
+15924 15924 1.00000000000000e+00
+15925 15925 1.00000000000000e+00
+15926 15926 1.00000000000000e+00
+15927 15927 1.00000000000000e+00
+15928 15928 1.00000000000000e+00
+15929 15929 1.00000000000000e+00
+15930 15930 1.00000000000000e+00
+15931 15931 1.00000000000000e+00
+15932 15932 1.00000000000000e+00
+15933 15933 1.00000000000000e+00
+15934 15934 1.00000000000000e+00
+15935 15935 1.00000000000000e+00
+15936 2685 -2.30239133829011e-06
+15936 2709 -1.01389756552504e-05
+15936 2733 -1.71538377450000e-10
+15936 3285 -2.09752511183678e-02
+15936 3309 -1.34464897613046e-01
+15936 3333 -7.17232553767070e-02
+15936 3357 -1.46097158628630e-03
+15936 3861 -2.41855455161586e-03
+15936 3885 -7.58041586363656e-01
+15936 3909 -3.63348164739559e+00
+15936 3933 -2.17167163998994e+00
+15936 3957 -1.56376062952831e-01
+15936 3981 -4.15196523486826e-04
+15936 4461 -2.20016673822274e-02
+15936 4485 -1.59016329279602e+00
+15936 4509 -1.00058294587787e+01
+15936 4533 -6.39325921400920e+00
+15936 4557 -4.57856882564987e-01
+15936 4581 -4.10935087373676e-04
+15936 5061 -6.25604395553294e-03
+15936 5085 -4.52565793524384e-01
+15936 5109 -2.57969505935665e+00
+15936 5133 -1.79075268972266e+00
+15936 5157 -1.37572068971864e-01
+15936 5181 -1.54549245000000e-12
+15936 5685 -3.53912977336373e-03
+15936 5709 -5.91529245750127e-02
+15936 5733 -4.81042644266786e-02
+15936 5757 -7.09749042147114e-04
+15936 15936 9.13287850138151e+00
+15936 15072 1.74657750181691e-02
+15936 15096 1.30555135041960e-01
+15936 15120 2.80966808721890e-01
+15936 15144 1.43623610275630e-01
+15936 15168 2.07328938265866e-02
+15936 15480 1.68250491358141e-01
+15936 15504 1.33129786065526e+00
+15936 15528 2.98850003984698e+00
+15936 15552 1.40655976561495e+00
+15936 15576 1.87065967598063e-01
+15936 15888 4.32485248224002e-01
+15936 15912 3.54045363333212e+00
+15936 15960 3.64388340608840e+00
+15936 15984 4.58342691413074e-01
+15936 16296 1.84267023541371e-01
+15936 16320 1.50343418584934e+00
+15936 16344 3.43815469624700e+00
+15936 16368 1.52005931556464e+00
+15936 16392 1.88423305970196e-01
+15936 16704 2.14699080639766e-02
+15936 16728 1.73589216340481e-01
+15936 16752 3.93380472821893e-01
+15936 16776 1.71998497763053e-01
+15936 16800 2.10722284196199e-02
+15937 15937 1.00000000000000e+00
+15938 15938 1.00000000000000e+00
+15939 15939 1.00000000000000e+00
+15940 15940 1.00000000000000e+00
+15941 15941 1.00000000000000e+00
+15942 15942 1.00000000000000e+00
+15943 15943 1.00000000000000e+00
+15944 15944 1.00000000000000e+00
+15945 15945 1.00000000000000e+00
+15946 15946 1.00000000000000e+00
+15947 15947 1.00000000000000e+00
+15948 15948 1.00000000000000e+00
+15949 15949 1.00000000000000e+00
+15950 15950 1.00000000000000e+00
+15951 15951 1.00000000000000e+00
+15952 15952 1.00000000000000e+00
+15953 15953 1.00000000000000e+00
+15954 15954 1.00000000000000e+00
+15955 15955 1.00000000000000e+00
+15956 15956 1.00000000000000e+00
+15957 15957 1.00000000000000e+00
+15958 15958 1.00000000000000e+00
+15959 15959 1.00000000000000e+00
+15960 3285 -1.44727600551000e-08
+15960 3309 -7.17949674489180e-03
+15960 3333 -1.69311411195082e-02
+15960 3357 -1.35262437329919e-03
+15960 3885 -1.45815447323934e-02
+15960 3909 -6.43339735310622e-01
+15960 3933 -1.52603805139534e+00
+15960 3957 -5.14460043694642e-01
+15960 3981 -9.31784332562704e-03
+15960 4005 -2.47779430879000e-09
+15960 4461 -3.98147192210440e-07
+15960 4485 -1.36848367689043e-01
+15960 4509 -3.73623591502840e+00
+15960 4533 -1.02216097184026e+01
+15960 4557 -2.77314972883564e+00
+15960 4581 -7.39964518854133e-02
+15960 4605 -7.29284455996000e-09
+15960 5061 -1.59177904572117e-06
+15960 5085 -8.66559427129929e-02
+15960 5109 -2.18514483610328e+00
+15960 5133 -6.17588936427211e+00
+15960 5157 -2.01546910711484e+00
+15960 5181 -4.35511837740995e-02
+15960 5685 -1.59366967251031e-03
+15960 5709 -1.44363945467570e-01
+15960 5733 -3.90543641669718e-01
+15960 5757 -1.27093248179569e-01
+15960 5781 -3.83180860003066e-04
+15960 6309 -3.47987915137000e-08
+15960 6333 -4.06769525242702e-04
+15960 6357 -2.50271011591103e-04
+15960 15960 9.20734770868306e+00
+15960 15096 1.51730087423209e-02
+15960 15120 1.43623610275630e-01
+15960 15144 3.61401867063395e-01
+15960 15168 1.40941803689101e-01
+15960 15192 1.45025570956886e-02
+15960 15504 1.64573973805670e-01
+15960 15528 1.40655976561495e+00
+15960 15552 3.31201727714557e+00
+15960 15576 1.36581515747558e+00
+15960 15600 1.54387821770829e-01
+15960 15912 4.52628160109008e-01
+15960 15936 3.64388340608840e+00
+15960 15984 3.51831670951067e+00
+15960 16008 4.21236485964575e-01
+15960 16320 1.91591522920960e-01
+15960 16344 1.52005931556464e+00
+15960 16368 3.38763623309859e+00
+15960 16392 1.47878048249849e+00
+15960 16416 1.81271814654422e-01
+15960 16728 2.19273960211435e-02
+15960 16752 1.71998497763053e-01
+15960 16776 3.80306606051648e-01
+15960 16800 1.69183134944827e-01
+15960 16824 2.12235553165868e-02
+15961 15961 1.00000000000000e+00
+15962 15962 1.00000000000000e+00
+15963 15963 1.00000000000000e+00
+15964 15964 1.00000000000000e+00
+15965 15965 1.00000000000000e+00
+15966 15966 1.00000000000000e+00
+15967 15967 1.00000000000000e+00
+15968 15968 1.00000000000000e+00
+15969 15969 1.00000000000000e+00
+15970 15970 1.00000000000000e+00
+15971 15971 1.00000000000000e+00
+15972 15972 1.00000000000000e+00
+15973 15973 1.00000000000000e+00
+15974 15974 1.00000000000000e+00
+15975 15975 1.00000000000000e+00
+15976 15976 1.00000000000000e+00
+15977 15977 1.00000000000000e+00
+15978 15978 1.00000000000000e+00
+15979 15979 1.00000000000000e+00
+15980 15980 1.00000000000000e+00
+15981 15981 1.00000000000000e+00
+15982 15982 1.00000000000000e+00
+15983 15983 1.00000000000000e+00
+15984 3309 -2.33755502357588e-06
+15984 3333 -8.96387949988693e-04
+15984 3357 -2.63309666699972e-04
+15984 3909 -2.05626619650520e-02
+15984 3933 -3.02877918445012e-01
+15984 3957 -3.17500633505508e-01
+15984 3981 -3.69326044520844e-02
+15984 4005 -5.18975087942567e-05
+15984 4485 -9.54730890178446e-05
+15984 4509 -4.22827509282693e-01
+15984 4533 -4.32881999660594e+00
+15984 4557 -4.91357092063532e+00
+15984 4581 -6.38758052884543e-01
+15984 4605 -8.98842633280559e-03
+15984 5085 -1.67656038496181e-03
+15984 5109 -5.02981888970402e-01
+15984 5133 -6.06421539807091e+00
+15984 5157 -8.10899043378017e+00
+15984 5181 -1.23592080630089e+00
+15984 5205 -6.49201867337133e-03
+15984 5685 -1.91124497901625e-04
+15984 5709 -7.41832630423739e-02
+15984 5733 -9.86091564195395e-01
+15984 5757 -1.24236010428431e+00
+15984 5781 -2.21176604075137e-01
+15984 5805 -2.73173367878578e-05
+15984 6309 -1.44862846263400e-07
+15984 6333 -4.83582745070669e-03
+15984 6357 -1.85885487822359e-02
+15984 6381 -1.50947173666037e-03
+15984 15984 8.65632096176572e+00
+15984 15120 2.07328938265866e-02
+15984 15144 1.40941803689101e-01
+15984 15168 2.70563746681643e-01
+15984 15192 1.29169985678908e-01
+15984 15216 1.77899393240385e-02
+15984 15528 1.87065967598063e-01
+15984 15552 1.36581515747559e+00
+15984 15576 2.83315650998109e+00
+15984 15600 1.32109286328214e+00
+15984 15624 1.75885394049701e-01
+15984 15936 4.58342691413074e-01
+15984 15960 3.51831670951067e+00
+15984 16008 3.51772392353504e+00
+15984 16032 4.58194494919168e-01
+15984 16344 1.88423305970196e-01
+15984 16368 1.47878048249849e+00
+15984 16392 3.27950601151832e+00
+15984 16416 1.48802194292694e+00
+15984 16440 1.90733671077308e-01
+15984 16752 2.10722284196199e-02
+15984 16776 1.69183134944827e-01
+15984 16800 3.82151122065949e-01
+15984 16824 1.70902255590108e-01
+15984 16848 2.15020085809401e-02
+15985 15985 1.00000000000000e+00
+15986 15986 1.00000000000000e+00
+15987 15987 1.00000000000000e+00
+15988 15988 1.00000000000000e+00
+15989 15989 1.00000000000000e+00
+15990 15990 1.00000000000000e+00
+15991 15991 1.00000000000000e+00
+15992 15992 1.00000000000000e+00
+15993 15993 1.00000000000000e+00
+15994 15994 1.00000000000000e+00
+15995 15995 1.00000000000000e+00
+15996 15996 1.00000000000000e+00
+15997 15997 1.00000000000000e+00
+15998 15998 1.00000000000000e+00
+15999 15999 1.00000000000000e+00
+16000 16000 1.00000000000000e+00
+16001 16001 1.00000000000000e+00
+16002 16002 1.00000000000000e+00
+16003 16003 1.00000000000000e+00
+16004 16004 1.00000000000000e+00
+16005 16005 1.00000000000000e+00
+16006 16006 1.00000000000000e+00
+16007 16007 1.00000000000000e+00
+16008 3333 -4.94664904690000e-10
+16008 3357 -1.38577897776000e-09
+16008 3933 -9.12151484469943e-03
+16008 3957 -6.49202412504744e-02
+16008 3981 -3.13274163014303e-02
+16008 4005 -2.27316425110599e-04
+16008 4509 -1.64331298995035e-03
+16008 4533 -5.76961529729774e-01
+16008 4557 -2.61950144724899e+00
+16008 4581 -1.62177710123623e+00
+16008 4605 -1.03095708974912e-01
+16008 4629 -2.09120147080725e-04
+16008 5109 -2.33917155530080e-02
+16008 5133 -1.72365237570311e+00
+16008 5157 -1.02624281112437e+01
+16008 5181 -6.10453891104462e+00
+16008 5205 -3.92717788799692e-01
+16008 5229 -3.54822158744661e-04
+16008 5709 -1.06321116976911e-02
+16008 5733 -6.46169679302493e-01
+16008 5757 -3.59514649502361e+00
+16008 5781 -2.35758391105407e+00
+16008 5805 -1.67675406492193e-01
+16008 5829 -3.67222075893600e-08
+16008 6309 -5.74695123481400e-08
+16008 6333 -1.37345708174827e-02
+16008 6357 -1.28155566331301e-01
+16008 6381 -8.64757018219475e-02
+16008 6405 -1.78015374464237e-03
+16008 6957 -6.50044912846570e-07
+16008 6981 -2.45216359375897e-06
+16008 16008 9.19275053062589e+00
+16008 15144 1.45025570956886e-02
+16008 15168 1.29169985678908e-01
+16008 15192 3.18619044738261e-01
+16008 15216 1.49069591127981e-01
+16008 15240 1.94774584579568e-02
+16008 15552 1.54387821770829e-01
+16008 15576 1.32109286328214e+00
+16008 15600 3.14651504285886e+00
+16008 15624 1.41538524136981e+00
+16008 15648 1.77960916292746e-01
+16008 15960 4.21236485964575e-01
+16008 15984 3.51772392353504e+00
+16008 16032 3.59438648349406e+00
+16008 16056 4.40402125954329e-01
+16008 16368 1.81271814654422e-01
+16008 16392 1.48802194292694e+00
+16008 16416 3.41594298496312e+00
+16008 16440 1.49466441659606e+00
+16008 16464 1.82932433071703e-01
+16008 16776 2.12235553165868e-02
+16008 16800 1.70902255590108e-01
+16008 16824 3.85976030264325e-01
+16008 16848 1.68889384934545e-01
+16008 16872 2.07203376526960e-02
+16009 16009 1.00000000000000e+00
+16010 16010 1.00000000000000e+00
+16011 16011 1.00000000000000e+00
+16012 16012 1.00000000000000e+00
+16013 16013 1.00000000000000e+00
+16014 16014 1.00000000000000e+00
+16015 16015 1.00000000000000e+00
+16016 16016 1.00000000000000e+00
+16017 16017 1.00000000000000e+00
+16018 16018 1.00000000000000e+00
+16019 16019 1.00000000000000e+00
+16020 16020 1.00000000000000e+00
+16021 16021 1.00000000000000e+00
+16022 16022 1.00000000000000e+00
+16023 16023 1.00000000000000e+00
+16024 16024 1.00000000000000e+00
+16025 16025 1.00000000000000e+00
+16026 16026 1.00000000000000e+00
+16027 16027 1.00000000000000e+00
+16028 16028 1.00000000000000e+00
+16029 16029 1.00000000000000e+00
+16030 16030 1.00000000000000e+00
+16031 16031 1.00000000000000e+00
+16032 3957 -3.70637046823079e-03
+16032 3981 -6.34375125082232e-03
+16032 4005 -1.30941825009837e-04
+16032 4533 -9.14157579495089e-03
+16032 4557 -4.38209835369890e-01
+16032 4581 -9.67865603429280e-01
+16032 4605 -3.02145747279514e-01
+16032 4629 -4.02463253813659e-03
+16032 4653 -1.90423473400000e-11
+16032 5109 -3.49414465273950e-07
+16032 5133 -1.36403831570534e-01
+16032 5157 -3.53361738223860e+00
+16032 5181 -8.73478129569143e+00
+16032 5205 -2.24353417678795e+00
+16032 5229 -5.62077263860387e-02
+16032 5253 -1.37368931380000e-10
+16032 5709 -4.68288025480883e-06
+16032 5733 -1.16903644012219e-01
+16032 5757 -2.73881420483962e+00
+16032 5781 -7.47852153566625e+00
+16032 5805 -2.31875979400017e+00
+16032 5829 -4.79131606910222e-02
+16032 6309 -5.66768020861000e-09
+16032 6333 -5.17996492292173e-03
+16032 6357 -2.64974126596210e-01
+16032 6381 -6.49578675580661e-01
+16032 6405 -2.16006340598431e-01
+16032 6429 -1.04490660266624e-03
+16032 6957 -2.04089667481583e-05
+16032 6981 -2.36917694260567e-03
+16032 7005 -1.06285179056377e-03
+16032 16032 8.94270722031870e+00
+16032 15168 1.77899393240385e-02
+16032 15192 1.49069591127981e-01
+16032 15216 3.43022145245691e-01
+16032 15240 1.32281316209200e-01
+16032 15264 1.35928705943433e-02
+16032 15576 1.75885394049701e-01
+16032 15600 1.41538524136981e+00
+16032 15624 3.17831707809936e+00
+16032 15648 1.33207175863362e+00
+16032 15672 1.55057023365655e-01
+16032 15984 4.58194494919168e-01
+16032 16008 3.59438648349406e+00
+16032 16056 3.51392334433735e+00
+16032 16080 4.38078710129992e-01
+16032 16392 1.90733671077308e-01
+16032 16416 1.49466441659606e+00
+16032 16440 3.30531284354298e+00
+16032 16464 1.48237070556027e+00
+16032 16488 1.87660243318361e-01
+16032 16800 2.15020085809401e-02
+16032 16824 1.68889384934545e-01
+16032 16848 3.74771086606596e-01
+16032 16872 1.69856052940863e-01
+16032 16896 2.17436755825198e-02
+16033 16033 1.00000000000000e+00
+16034 16034 1.00000000000000e+00
+16035 16035 1.00000000000000e+00
+16036 16036 1.00000000000000e+00
+16037 16037 1.00000000000000e+00
+16038 16038 1.00000000000000e+00
+16039 16039 1.00000000000000e+00
+16040 16040 1.00000000000000e+00
+16041 16041 1.00000000000000e+00
+16042 16042 1.00000000000000e+00
+16043 16043 1.00000000000000e+00
+16044 16044 1.00000000000000e+00
+16045 16045 1.00000000000000e+00
+16046 16046 1.00000000000000e+00
+16047 16047 1.00000000000000e+00
+16048 16048 1.00000000000000e+00
+16049 16049 1.00000000000000e+00
+16050 16050 1.00000000000000e+00
+16051 16051 1.00000000000000e+00
+16052 16052 1.00000000000000e+00
+16053 16053 1.00000000000000e+00
+16054 16054 1.00000000000000e+00
+16055 16055 1.00000000000000e+00
+16056 3957 -1.83644152629410e-07
+16056 3981 -1.13643062235915e-04
+16056 4005 -1.97635568482039e-05
+16056 4557 -1.02084568245078e-02
+16056 4581 -1.70527780808149e-01
+16056 4605 -1.67023864717950e-01
+16056 4629 -1.48604071463111e-02
+16056 4653 -1.74276804760186e-06
+16056 5133 -4.38145079191052e-05
+16056 5157 -3.59725190024005e-01
+16056 5181 -3.48549779286629e+00
+16056 5205 -3.72294246617872e+00
+16056 5229 -4.87838300554062e-01
+16056 5253 -7.04889861285746e-03
+16056 5733 -1.95469579268319e-03
+16056 5757 -5.91340677496699e-01
+16056 5781 -6.98854935785907e+00
+16056 5805 -8.83501779089219e+00
+16056 5829 -1.23817040319277e+00
+16056 5853 -7.88893963817192e-03
+16056 6333 -4.92803893296462e-04
+16056 6357 -1.26225497284196e-01
+16056 6381 -1.52988192885990e+00
+16056 6405 -1.86663739218363e+00
+16056 6429 -3.19772793067175e-01
+16056 6453 -8.75407316449945e-05
+16056 6957 -7.26598831971766e-05
+16056 6981 -1.82366467804074e-02
+16056 7005 -4.20474139306109e-02
+16056 7029 -3.21498529089220e-03
+16056 16056 8.91745842228485e+00
+16056 15192 1.94774584579568e-02
+16056 15216 1.32281316209200e-01
+16056 15240 2.57920772334754e-01
+16056 15264 1.38201019846592e-01
+16056 15288 2.09573843673048e-02
+16056 15600 1.77960916292746e-01
+16056 15624 1.33207175863362e+00
+16056 15648 2.84901195706920e+00
+16056 15672 1.38078276116629e+00
+16056 15696 1.90138666925913e-01
+16056 16008 4.40402125954329e-01
+16056 16032 3.51392334433735e+00
+16056 16080 3.62350257752149e+00
+16056 16104 4.67796934250362e-01
+16056 16416 1.82932433071703e-01
+16056 16440 1.48237070556027e+00
+16056 16464 3.37821758384738e+00
+16056 16488 1.52152600400077e+00
+16056 16512 1.92721257681826e-01
+16056 16824 2.07203376526960e-02
+16056 16848 1.69856052940863e-01
+16056 16872 3.90222179029296e-01
+16056 16896 1.73386830555212e-01
+16056 16920 2.16030320562831e-02
+16057 16057 1.00000000000000e+00
+16058 16058 1.00000000000000e+00
+16059 16059 1.00000000000000e+00
+16060 16060 1.00000000000000e+00
+16061 16061 1.00000000000000e+00
+16062 16062 1.00000000000000e+00
+16063 16063 1.00000000000000e+00
+16064 16064 1.00000000000000e+00
+16065 16065 1.00000000000000e+00
+16066 16066 1.00000000000000e+00
+16067 16067 1.00000000000000e+00
+16068 16068 1.00000000000000e+00
+16069 16069 1.00000000000000e+00
+16070 16070 1.00000000000000e+00
+16071 16071 1.00000000000000e+00
+16072 16072 1.00000000000000e+00
+16073 16073 1.00000000000000e+00
+16074 16074 1.00000000000000e+00
+16075 16075 1.00000000000000e+00
+16076 16076 1.00000000000000e+00
+16077 16077 1.00000000000000e+00
+16078 16078 1.00000000000000e+00
+16079 16079 1.00000000000000e+00
+16080 4581 -4.21211943045404e-03
+16080 4605 -3.06935392903597e-02
+16080 4629 -1.07855649151755e-02
+16080 4653 -7.17169031686507e-06
+16080 5157 -1.04604514369131e-03
+16080 5181 -4.36925577003898e-01
+16080 5205 -1.87862984396718e+00
+16080 5229 -1.20726376709728e+00
+16080 5253 -6.26822243240944e-02
+16080 5277 -8.40619835414287e-05
+16080 5757 -2.47456816655720e-02
+16080 5781 -1.87406138757865e+00
+16080 5805 -1.02349311736184e+01
+16080 5829 -5.68289186565247e+00
+16080 5853 -3.17162331399189e-01
+16080 5877 -2.64700801715137e-04
+16080 6357 -1.72064983002776e-02
+16080 6381 -9.05256029699004e-01
+16080 6405 -4.91376916156046e+00
+16080 6429 -3.01355636355895e+00
+16080 6453 -1.94606147503335e-01
+16080 6477 -6.05285648237220e-07
+16080 6957 -2.09075466857402e-05
+16080 6981 -3.85963268737253e-02
+16080 7005 -2.53257024583947e-01
+16080 7029 -1.55321867795444e-01
+16080 7053 -4.05950296912952e-03
+16080 7605 -4.00601221406906e-05
+16080 7629 -9.92519568879605e-05
+16080 16080 9.35462019827755e+00
+16080 15216 1.35928705943433e-02
+16080 15240 1.38201019846592e-01
+16080 15264 3.65880666997878e-01
+16080 15288 1.51708123575850e-01
+16080 15312 1.69696465266578e-02
+16080 15624 1.55057023365655e-01
+16080 15648 1.38078276116629e+00
+16080 15672 3.36345328386550e+00
+16080 15696 1.42526502644434e+00
+16080 15720 1.66177589685169e-01
+16080 16032 4.38078710129992e-01
+16080 16056 3.62350257752149e+00
+16080 16104 3.59834989756739e+00
+16080 16128 4.31790540141469e-01
+16080 16440 1.87660243318361e-01
+16080 16464 1.52152600400077e+00
+16080 16488 3.45599888700882e+00
+16080 16512 1.51007911385205e+00
+16080 16536 1.84798520781182e-01
+16080 16848 2.17436755825198e-02
+16080 16872 1.73386830555212e-01
+16080 16896 3.89017067783710e-01
+16080 16920 1.72911645427777e-01
+16080 16944 2.16248793006611e-02
+16081 16081 1.00000000000000e+00
+16082 16082 1.00000000000000e+00
+16083 16083 1.00000000000000e+00
+16084 16084 1.00000000000000e+00
+16085 16085 1.00000000000000e+00
+16086 16086 1.00000000000000e+00
+16087 16087 1.00000000000000e+00
+16088 16088 1.00000000000000e+00
+16089 16089 1.00000000000000e+00
+16090 16090 1.00000000000000e+00
+16091 16091 1.00000000000000e+00
+16092 16092 1.00000000000000e+00
+16093 16093 1.00000000000000e+00
+16094 16094 1.00000000000000e+00
+16095 16095 1.00000000000000e+00
+16096 16096 1.00000000000000e+00
+16097 16097 1.00000000000000e+00
+16098 16098 1.00000000000000e+00
+16099 16099 1.00000000000000e+00
+16100 16100 1.00000000000000e+00
+16101 16101 1.00000000000000e+00
+16102 16102 1.00000000000000e+00
+16103 16103 1.00000000000000e+00
+16104 4605 -1.52616840616767e-03
+16104 4629 -1.90946386181233e-03
+16104 4653 -2.54630692488370e-06
+16104 5181 -5.08853050101870e-03
+16104 5205 -2.94052989407066e-01
+16104 5229 -5.87225973958005e-01
+16104 5253 -1.57674992663913e-01
+16104 5277 -1.54634762008399e-03
+16104 5757 -6.02256811617600e-08
+16104 5781 -1.32485464574332e-01
+16104 5805 -3.24277390371013e+00
+16104 5829 -7.16654941689187e+00
+16104 5853 -1.76103804557894e+00
+16104 5877 -4.67880445595033e-02
+16104 6357 -1.03954862092585e-05
+16104 6381 -1.53167292222669e-01
+16104 6405 -3.40661737920491e+00
+16104 6429 -8.89099175463575e+00
+16104 6453 -2.67231919083988e+00
+16104 6477 -5.51496939522462e-02
+16104 6957 -7.74689897242060e-07
+16104 6981 -1.29970123836128e-02
+16104 7005 -4.69701797998808e-01
+16104 7029 -1.09956716241355e+00
+16104 7053 -3.75923620321782e-01
+16104 7077 -2.41565249248573e-03
+16104 7605 -4.19129189440235e-04
+16104 7629 -9.54620552641513e-03
+16104 7653 -3.26638239810661e-03
+16104 16104 8.86754832094195e+00
+16104 15240 2.09573843673048e-02
+16104 15264 1.51708123575850e-01
+16104 15288 3.07723361719116e-01
+16104 15312 1.28885117807780e-01
+16104 15336 1.52516329252871e-02
+16104 15648 1.90138666925913e-01
+16104 15672 1.42526502644434e+00
+16104 15696 3.02295807149273e+00
+16104 15720 1.36062223715692e+00
+16104 15744 1.73977969604057e-01
+16104 16056 4.67796934250362e-01
+16104 16080 3.59834989756739e+00
+16104 16128 3.69157313827719e+00
+16104 16152 4.91102744427811e-01
+16104 16464 1.92721257681826e-01
+16104 16488 1.51007911385205e+00
+16104 16512 3.35833046764726e+00
+16104 16536 1.57452559299059e+00
+16104 16560 2.08832877466460e-01
+16104 16872 2.16030320562831e-02
+16104 16896 1.72911645427777e-01
+16104 16920 3.91566460757748e-01
+16104 16944 1.82360956766196e-01
+16104 16968 2.39653598908879e-02
+16105 16105 1.00000000000000e+00
+16106 16106 1.00000000000000e+00
+16107 16107 1.00000000000000e+00
+16108 16108 1.00000000000000e+00
+16109 16109 1.00000000000000e+00
+16110 16110 1.00000000000000e+00
+16111 16111 1.00000000000000e+00
+16112 16112 1.00000000000000e+00
+16113 16113 1.00000000000000e+00
+16114 16114 1.00000000000000e+00
+16115 16115 1.00000000000000e+00
+16116 16116 1.00000000000000e+00
+16117 16117 1.00000000000000e+00
+16118 16118 1.00000000000000e+00
+16119 16119 1.00000000000000e+00
+16120 16120 1.00000000000000e+00
+16121 16121 1.00000000000000e+00
+16122 16122 1.00000000000000e+00
+16123 16123 1.00000000000000e+00
+16124 16124 1.00000000000000e+00
+16125 16125 1.00000000000000e+00
+16126 16126 1.00000000000000e+00
+16127 16127 1.00000000000000e+00
+16128 4605 -2.15379764853000e-09
+16128 4629 -2.69616545916973e-06
+16128 4653 -2.00903761667810e-07
+16128 5205 -4.50836102338906e-03
+16128 5229 -8.82386895391259e-02
+16128 5253 -8.56064705006728e-02
+16128 5277 -5.29244362974382e-03
+16128 5781 -1.71530090327614e-05
+16128 5805 -2.94623651010291e-01
+16128 5829 -2.74934680092522e+00
+16128 5853 -2.92410451374053e+00
+16128 5877 -3.82150713253358e-01
+16128 5901 -4.96490615160433e-03
+16128 6381 -2.24873890229680e-03
+16128 6405 -6.94820792058696e-01
+16128 6429 -8.19445174042308e+00
+16128 6453 -1.00015592700934e+01
+16128 6477 -1.32287667106873e+00
+16128 6501 -8.94430899049745e-03
+16128 6981 -1.05007272993043e-03
+16128 7005 -2.12494015931442e-01
+16128 7029 -2.47405737344558e+00
+16128 7053 -3.06527398950036e+00
+16128 7077 -5.04462076015971e-01
+16128 7101 -2.24151561366785e-04
+16128 7605 -1.08121285912415e-03
+16128 7629 -6.10196194821591e-02
+16128 7653 -1.04269346786835e-01
+16128 7677 -8.39440981508353e-03
+16128 8253 -1.76489563238000e-09
+16128 8277 -2.45391655890000e-10
+16128 16128 9.84095293991459e+00
+16128 15264 1.69696465266578e-02
+16128 15288 1.28885117807780e-01
+16128 15312 2.84738593169654e-01
+16128 15336 1.55977811054759e-01
+16128 15360 2.37428198384026e-02
+16128 15672 1.66177589685169e-01
+16128 15696 1.36062223715692e+00
+16128 15720 3.16981381131377e+00
+16128 15744 1.57586671027073e+00
+16128 15768 2.19988707963619e-01
+16128 16080 4.31790540141469e-01
+16128 16104 3.69157313827719e+00
+16128 16152 4.17048493342262e+00
+16128 16176 5.51518488927823e-01
+16128 16488 1.84798520781182e-01
+16128 16512 1.57452559299059e+00
+16128 16536 3.76196580745217e+00
+16128 16560 1.77869649869605e+00
+16128 16584 2.35841247207546e-01
+16128 16896 2.16248793006611e-02
+16128 16920 1.82360956766196e-01
+16128 16944 4.32776592204251e-01
+16128 16968 2.06685258161089e-01
+16128 16992 2.77059546493843e-02
+16129 16129 1.00000000000000e+00
+16130 16130 1.00000000000000e+00
+16131 16131 1.00000000000000e+00
+16132 16132 1.00000000000000e+00
+16133 16133 1.00000000000000e+00
+16134 16134 1.00000000000000e+00
+16135 16135 1.00000000000000e+00
+16136 16136 1.00000000000000e+00
+16137 16137 1.00000000000000e+00
+16138 16138 1.00000000000000e+00
+16139 16139 1.00000000000000e+00
+16140 16140 1.00000000000000e+00
+16141 16141 1.00000000000000e+00
+16142 16142 1.00000000000000e+00
+16143 16143 1.00000000000000e+00
+16144 16144 1.00000000000000e+00
+16145 16145 1.00000000000000e+00
+16146 16146 1.00000000000000e+00
+16147 16147 1.00000000000000e+00
+16148 16148 1.00000000000000e+00
+16149 16149 1.00000000000000e+00
+16150 16150 1.00000000000000e+00
+16151 16151 1.00000000000000e+00
+16152 5229 -2.27056743930506e-03
+16152 5253 -1.42858512538457e-02
+16152 5277 -2.68203129603541e-03
+16152 5805 -6.20042783016770e-04
+16152 5829 -3.35634600221829e-01
+16152 5853 -1.39480511332754e+00
+16152 5877 -8.81159512977729e-01
+16152 5901 -3.66291396137368e-02
+16152 5925 -2.65678797598056e-05
+16152 6405 -2.67986772911741e-02
+16152 6429 -2.15460430129389e+00
+16152 6453 -1.09547396060214e+01
+16152 6477 -5.27654274785916e+00
+16152 6501 -2.20635404010206e-01
+16152 6525 -1.91406254721875e-04
+16152 7005 -2.79573555867765e-02
+16152 7029 -1.43097519682750e+00
+16152 7053 -7.34164664187943e+00
+16152 7077 -3.33774787695749e+00
+16152 7101 -1.49049353647891e-01
+16152 7125 -2.92525320334740e-06
+16152 7605 -2.81280434771757e-04
+16152 7629 -1.08175470687362e-01
+16152 7653 -5.12343280474778e-01
+16152 7677 -2.26898724073119e-01
+16152 7701 -5.78613424267488e-03
+16152 8253 -3.96784765631894e-04
+16152 8277 -6.88591247467996e-04
+16152 8301 -2.84663206480000e-10
+16152 16152 1.06033020384100e+01
+16152 15288 1.52516329252871e-02
+16152 15312 1.55977811054759e-01
+16152 15336 4.10608961742379e-01
+16152 15360 1.56860124964212e-01
+16152 15384 1.54722114026505e-02
+16152 15696 1.73977969604057e-01
+16152 15720 1.57586671027072e+00
+16152 15744 3.81874972158639e+00
+16152 15768 1.37976453011186e+00
+16152 15792 1.24952424564340e-01
+16152 16104 4.91102744427811e-01
+16152 16128 4.17048493342262e+00
+16152 16176 3.35768784025791e+00
+16152 16200 2.87903471136637e-01
+16152 16512 2.08832877466460e-01
+16152 16536 1.77869649869605e+00
+16152 16560 4.12606418741716e+00
+16152 16584 1.51845040734970e+00
+16152 16608 1.43771354629874e-01
+16152 16920 2.39653598908879e-02
+16152 16944 2.06685258161089e-01
+16152 16968 4.87437578200071e-01
+16152 16992 1.91531594273673e-01
+16152 17016 2.01769439190340e-02
+16153 16153 1.00000000000000e+00
+16154 16154 1.00000000000000e+00
+16155 16155 1.00000000000000e+00
+16156 16156 1.00000000000000e+00
+16157 16157 1.00000000000000e+00
+16158 16158 1.00000000000000e+00
+16159 16159 1.00000000000000e+00
+16160 16160 1.00000000000000e+00
+16161 16161 1.00000000000000e+00
+16162 16162 1.00000000000000e+00
+16163 16163 1.00000000000000e+00
+16164 16164 1.00000000000000e+00
+16165 16165 1.00000000000000e+00
+16166 16166 1.00000000000000e+00
+16167 16167 1.00000000000000e+00
+16168 16168 1.00000000000000e+00
+16169 16169 1.00000000000000e+00
+16170 16170 1.00000000000000e+00
+16171 16171 1.00000000000000e+00
+16172 16172 1.00000000000000e+00
+16173 16173 1.00000000000000e+00
+16174 16174 1.00000000000000e+00
+16175 16175 1.00000000000000e+00
+16176 5253 -4.01571096527226e-04
+16176 5277 -3.67982902529285e-04
+16176 5829 -2.80648045101120e-03
+16176 5853 -2.02228954966398e-01
+16176 5877 -3.64114134599598e-01
+16176 5901 -1.04039244321091e-01
+16176 5925 -1.19559189827223e-03
+16176 6405 -6.13896168510000e-10
+16176 6429 -1.44954846646002e-01
+16176 6453 -2.84276194806438e+00
+16176 6477 -5.66071931761925e+00
+16176 6501 -2.45302092463149e+00
+16176 6525 -1.39520399675063e-02
+16176 7005 -2.30368090416415e-05
+16176 7029 -2.34219438433409e-01
+16176 7053 -3.72278010225788e+00
+16176 7077 -1.32830061635961e+01
+16176 7101 -4.43068966198729e+00
+16176 7125 -5.02259234512130e-04
+16176 7605 -5.59793347357092e-06
+16176 7629 -3.12514410067265e-02
+16176 7653 -8.37895207133297e-01
+16176 7677 -2.68385561620026e+00
+16176 7701 -3.49593855422119e-01
+16176 8253 -6.21525660309237e-03
+16176 8277 -1.86238563130763e-02
+16176 8301 -2.40186428761700e-07
+16176 16176 9.25883673882556e+00
+16176 15312 2.37428198384026e-02
+16176 15336 1.56860124964212e-01
+16176 15360 3.79768016392767e-01
+16176 15384 2.78828473834515e-01
+16176 15720 2.19988707963619e-01
+16176 15744 1.37976453011185e+00
+16176 15768 3.37521270349820e+00
+16176 15792 2.81178010326755e+00
+16176 16128 5.51518488927823e-01
+16176 16152 3.35768784025791e+00
+16176 16200 7.35333930796930e+00
+16176 16536 2.35841247207546e-01
+16176 16560 1.51845040734970e+00
+16176 16584 3.67416532082424e+00
+16176 16608 2.85105021759681e+00
+16176 16944 2.77059546493843e-02
+16176 16968 1.91531594273673e-01
+16176 16992 4.54506170724276e-01
+16176 17016 2.88646002416831e-01
+16177 16177 1.00000000000000e+00
+16178 16178 1.00000000000000e+00
+16179 16179 1.00000000000000e+00
+16180 16180 1.00000000000000e+00
+16181 16181 1.00000000000000e+00
+16182 16182 1.00000000000000e+00
+16183 16183 1.00000000000000e+00
+16184 16184 1.00000000000000e+00
+16185 16185 1.00000000000000e+00
+16186 16186 1.00000000000000e+00
+16187 16187 1.00000000000000e+00
+16188 16188 1.00000000000000e+00
+16189 16189 1.00000000000000e+00
+16190 16190 1.00000000000000e+00
+16191 16191 1.00000000000000e+00
+16192 16192 1.00000000000000e+00
+16193 16193 1.00000000000000e+00
+16194 16194 1.00000000000000e+00
+16195 16195 1.00000000000000e+00
+16196 16196 1.00000000000000e+00
+16197 16197 1.00000000000000e+00
+16198 16198 1.00000000000000e+00
+16199 16199 1.00000000000000e+00
+16200 5853 -1.65556807285416e-03
+16200 5877 -5.34115908914603e-02
+16200 5901 -8.07620712877373e-02
+16200 5925 -2.20520863822583e-03
+16200 6429 -3.90079655830218e-06
+16200 6453 -1.57084032693362e-01
+16200 6477 -3.43113164804846e+00
+16200 6501 -3.59414605494446e+00
+16200 6525 -2.65642361519594e-02
+16200 7029 -2.16046850008652e-03
+16200 7053 -7.56106341981174e-01
+16200 7077 -1.60834728731340e+01
+16200 7101 -7.82386178903486e+00
+16200 7125 -9.84041696600829e-04
+16200 7629 -1.73196606922714e-03
+16200 7653 -4.83551374784505e-01
+16200 7677 -3.99767481908086e+00
+16200 7701 -6.58684771145513e-01
+16200 8253 -9.65306573404792e-03
+16200 8277 -3.24275802740597e-02
+16200 8301 -4.78380215078050e-07
+16200 16200 1.36913543179821e+01
+16200 15336 1.54722114026505e-02
+16200 15360 2.78828473834515e-01
+16200 15384 4.49351467850477e-01
+16200 15744 1.24952424564340e-01
+16200 15768 2.81178010326755e+00
+16200 15792 4.74889323458471e+00
+16200 16152 2.87903471136637e-01
+16200 16176 7.35333930796930e+00
+16200 16560 1.43771354629874e-01
+16200 16584 2.85105021759681e+00
+16200 16608 4.69570095278449e+00
+16200 16968 2.01769439190340e-02
+16200 16992 2.88646002416831e-01
+16200 17016 4.36053397400423e-01
+16201 16201 1.00000000000000e+00
+16202 16202 1.00000000000000e+00
+16203 16203 1.00000000000000e+00
+16204 16204 1.00000000000000e+00
+16205 16205 1.00000000000000e+00
+16206 16206 1.00000000000000e+00
+16207 16207 1.00000000000000e+00
+16208 16208 1.00000000000000e+00
+16209 16209 1.00000000000000e+00
+16210 16210 1.00000000000000e+00
+16211 16211 1.00000000000000e+00
+16212 16212 1.00000000000000e+00
+16213 16213 1.00000000000000e+00
+16214 16214 1.00000000000000e+00
+16215 16215 1.00000000000000e+00
+16216 16216 1.00000000000000e+00
+16217 16217 1.00000000000000e+00
+16218 16218 1.00000000000000e+00
+16219 16219 1.00000000000000e+00
+16220 16220 1.00000000000000e+00
+16221 16221 1.00000000000000e+00
+16222 16222 1.00000000000000e+00
+16223 16223 1.00000000000000e+00
+16224 2637 -2.11153262788651e-01
+16224 2661 -1.34917509756813e-01
+16224 2685 -8.02216756130927e-05
+16224 3213 -5.14197856185744e-01
+16224 3237 -6.70591694751832e+00
+16224 3261 -1.63815643084325e+00
+16224 3285 -1.25654930568486e-02
+16224 3789 -1.67620106534635e-04
+16224 3813 -4.44043579606690e+00
+16224 3837 -1.31344205713099e+01
+16224 3861 -1.28138291463891e+00
+16224 3885 -8.02848167035927e-03
+16224 4389 -1.60490305820052e-03
+16224 4413 -2.28074346771651e+00
+16224 4437 -2.36081159036054e+00
+16224 4461 -1.43634132019865e-01
+16224 4485 -2.19178452599104e-05
+16224 4989 -3.45778598212080e-07
+16224 5013 -9.96711146675233e-03
+16224 5037 -1.84717084370414e-02
+16224 5061 -1.22365447471562e-03
+16224 16224 9.92442391351981e+00
+16224 15408 6.30415134638554e-01
+16224 15432 3.98307436753683e-01
+16224 15456 2.37428198384017e-02
+16224 15816 4.37974669532055e+00
+16224 15840 2.73579568635192e+00
+16224 15864 1.55977811054754e-01
+16224 16248 5.45879703285370e+00
+16224 16272 2.84738593169649e-01
+16224 16632 5.30474276402998e+00
+16224 16656 3.10346929434222e+00
+16224 16680 1.28885117807777e-01
+16224 17040 8.61664151815911e-01
+16224 17064 4.90225838751257e-01
+16224 17088 1.69696465266574e-02
+16225 16225 1.00000000000000e+00
+16226 16226 1.00000000000000e+00
+16227 16227 1.00000000000000e+00
+16228 16228 1.00000000000000e+00
+16229 16229 1.00000000000000e+00
+16230 16230 1.00000000000000e+00
+16231 16231 1.00000000000000e+00
+16232 16232 1.00000000000000e+00
+16233 16233 1.00000000000000e+00
+16234 16234 1.00000000000000e+00
+16235 16235 1.00000000000000e+00
+16236 16236 1.00000000000000e+00
+16237 16237 1.00000000000000e+00
+16238 16238 1.00000000000000e+00
+16239 16239 1.00000000000000e+00
+16240 16240 1.00000000000000e+00
+16241 16241 1.00000000000000e+00
+16242 16242 1.00000000000000e+00
+16243 16243 1.00000000000000e+00
+16244 16244 1.00000000000000e+00
+16245 16245 1.00000000000000e+00
+16246 16246 1.00000000000000e+00
+16247 16247 1.00000000000000e+00
+16248 2637 -1.22950809007927e-01
+16248 2661 -9.62596793221455e-02
+16248 2685 -3.56454239513493e-04
+16248 3213 -2.75622480796976e-01
+16248 3237 -4.52174059881932e+00
+16248 3261 -2.39548250059446e+00
+16248 3285 -1.60508309066097e-01
+16248 3309 -3.76985077331550e-04
+16248 3789 -8.45132164331546e-05
+16248 3813 -2.51925394366342e+00
+16248 3837 -1.16102424187959e+01
+16248 3861 -5.48334295921221e+00
+16248 3885 -5.38961450759740e-01
+16248 3909 -6.38658904564033e-04
+16248 4389 -8.11888108207356e-04
+16248 4413 -1.42156879861829e+00
+16248 4437 -3.50368766140365e+00
+16248 4461 -2.25180646794102e+00
+16248 4485 -2.00180555053652e-01
+16248 4509 -9.46477160706400e-08
+16248 4989 -1.80427590875910e-07
+16248 5013 -1.38478634824622e-02
+16248 5037 -1.23074941957581e-01
+16248 5061 -9.94144917253992e-02
+16248 5085 -2.14648723749301e-03
+16248 5637 -6.36605257387310e-07
+16248 5661 -2.55024749279354e-06
+16248 16248 8.22345368046088e+00
+16248 15408 3.98307436753683e-01
+16248 15432 5.62807553266964e-01
+16248 15456 2.19988707963599e-01
+16248 15480 3.12543571524980e-02
+16248 15816 2.73579568635192e+00
+16248 15840 3.78957606445548e+00
+16248 15864 1.57586671027065e+00
+16248 15888 2.37988866512904e-01
+16248 16224 5.45879703285370e+00
+16248 16272 3.16981381131378e+00
+16248 16296 5.07714859658779e-01
+16248 16632 3.10346929434222e+00
+16248 16656 3.56739673796147e+00
+16248 16680 1.36062223715688e+00
+16248 16704 2.11270441481440e-01
+16248 17040 4.90225838751257e-01
+16248 17064 5.07262721643464e-01
+16248 17088 1.66177589685158e-01
+16248 17112 2.45747508946320e-02
+16249 16249 1.00000000000000e+00
+16250 16250 1.00000000000000e+00
+16251 16251 1.00000000000000e+00
+16252 16252 1.00000000000000e+00
+16253 16253 1.00000000000000e+00
+16254 16254 1.00000000000000e+00
+16255 16255 1.00000000000000e+00
+16256 16256 1.00000000000000e+00
+16257 16257 1.00000000000000e+00
+16258 16258 1.00000000000000e+00
+16259 16259 1.00000000000000e+00
+16260 16260 1.00000000000000e+00
+16261 16261 1.00000000000000e+00
+16262 16262 1.00000000000000e+00
+16263 16263 1.00000000000000e+00
+16264 16264 1.00000000000000e+00
+16265 16265 1.00000000000000e+00
+16266 16266 1.00000000000000e+00
+16267 16267 1.00000000000000e+00
+16268 16268 1.00000000000000e+00
+16269 16269 1.00000000000000e+00
+16270 16270 1.00000000000000e+00
+16271 16271 1.00000000000000e+00
+16272 2637 -4.96490615160415e-03
+16272 2661 -8.94430899049704e-03
+16272 2685 -2.24151561366762e-04
+16272 3213 -5.29244362974372e-03
+16272 3237 -3.82150713253347e-01
+16272 3261 -1.32287667106862e+00
+16272 3285 -5.04462076015912e-01
+16272 3309 -8.39440981508346e-03
+16272 3333 -2.45391655890000e-10
+16272 3789 -2.00903761667800e-07
+16272 3813 -8.56064705006712e-02
+16272 3837 -2.92410451374053e+00
+16272 3861 -1.00015592700933e+01
+16272 3885 -3.06527398950026e+00
+16272 3909 -1.04269346786835e-01
+16272 3933 -1.76489563238000e-09
+16272 4389 -2.69616545916967e-06
+16272 4413 -8.82386895391234e-02
+16272 4437 -2.74934680092513e+00
+16272 4461 -8.19445174042288e+00
+16272 4485 -2.47405737344552e+00
+16272 4509 -6.10196194821578e-02
+16272 4989 -2.15379764853000e-09
+16272 5013 -4.50836102338880e-03
+16272 5037 -2.94623651010266e-01
+16272 5061 -6.94820792058661e-01
+16272 5085 -2.12494015931437e-01
+16272 5109 -1.08121285912410e-03
+16272 5637 -1.71530090327611e-05
+16272 5661 -2.24873890229679e-03
+16272 5685 -1.05007272993043e-03
+16272 16272 9.84095293991468e+00
+16272 15408 2.37428198384017e-02
+16272 15432 2.19988707963599e-01
+16272 15456 5.51518488927754e-01
+16272 15480 2.35841247207531e-01
+16272 15504 2.77059546493849e-02
+16272 15816 1.55977811054754e-01
+16272 15840 1.57586671027065e+00
+16272 15864 4.17048493342239e+00
+16272 15888 1.77869649869598e+00
+16272 15912 2.06685258161086e-01
+16272 16224 2.84738593169649e-01
+16272 16248 3.16981381131378e+00
+16272 16296 3.76196580745213e+00
+16272 16320 4.32776592204233e-01
+16272 16632 1.28885117807777e-01
+16272 16656 1.36062223715689e+00
+16272 16680 3.69157313827709e+00
+16272 16704 1.57452559299054e+00
+16272 16728 1.82360956766191e-01
+16272 17040 1.69696465266574e-02
+16272 17064 1.66177589685158e-01
+16272 17088 4.31790540141430e-01
+16272 17112 1.84798520781172e-01
+16272 17136 2.16248793006610e-02
+16273 16273 1.00000000000000e+00
+16274 16274 1.00000000000000e+00
+16275 16275 1.00000000000000e+00
+16276 16276 1.00000000000000e+00
+16277 16277 1.00000000000000e+00
+16278 16278 1.00000000000000e+00
+16279 16279 1.00000000000000e+00
+16280 16280 1.00000000000000e+00
+16281 16281 1.00000000000000e+00
+16282 16282 1.00000000000000e+00
+16283 16283 1.00000000000000e+00
+16284 16284 1.00000000000000e+00
+16285 16285 1.00000000000000e+00
+16286 16286 1.00000000000000e+00
+16287 16287 1.00000000000000e+00
+16288 16288 1.00000000000000e+00
+16289 16289 1.00000000000000e+00
+16290 16290 1.00000000000000e+00
+16291 16291 1.00000000000000e+00
+16292 16292 1.00000000000000e+00
+16293 16293 1.00000000000000e+00
+16294 16294 1.00000000000000e+00
+16295 16295 1.00000000000000e+00
+16296 2637 -2.30301308694370e-07
+16296 2661 -1.92627463307723e-04
+16296 2685 -3.60143894674400e-05
+16296 3237 -1.29804131789667e-02
+16296 3261 -2.65653515247310e-01
+16296 3285 -3.15687715384813e-01
+16296 3309 -3.02687018809988e-02
+16296 3333 -2.75079980372742e-06
+16296 3813 -4.51231632600826e-05
+16296 3837 -4.02728245207740e-01
+16296 3861 -3.98187100407156e+00
+16296 3885 -4.89729124264456e+00
+16296 3909 -7.08432062787709e-01
+16296 3933 -8.79520094271789e-03
+16296 4413 -2.12602681745371e-03
+16296 4437 -6.47334861429473e-01
+16296 4461 -6.94499300146922e+00
+16296 4485 -8.63045626787820e+00
+16296 4509 -1.19479722097738e+00
+16296 4533 -9.44696404610494e-03
+16296 5013 -5.31919679444214e-04
+16296 5037 -1.30904245935941e-01
+16296 5061 -1.48312847787423e+00
+16296 5085 -1.69477015015129e+00
+16296 5109 -2.70400200659882e-01
+16296 5133 -8.98871072744665e-05
+16296 5637 -5.96109218410207e-05
+16296 5661 -1.68136550660145e-02
+16296 5685 -3.91570541987386e-02
+16296 5709 -3.08070724295743e-03
+16296 16296 8.82054501110448e+00
+16296 15432 3.12543571524980e-02
+16296 15456 2.35841247207531e-01
+16296 15480 4.99146479364022e-01
+16296 15504 2.09211209883004e-01
+16296 15528 2.45968478213660e-02
+16296 15840 2.37988866512904e-01
+16296 15864 1.77869649869598e+00
+16296 15888 3.72922002063173e+00
+16296 15912 1.56380912680985e+00
+16296 15936 1.84267023541371e-01
+16296 16248 5.07714859658779e-01
+16296 16272 3.76196580745213e+00
+16296 16320 3.28472507352777e+00
+16296 16344 3.88404676177692e-01
+16296 16656 2.11270441481440e-01
+16296 16680 1.57452559299054e+00
+16296 16704 3.29608257932726e+00
+16296 16728 1.39759114541159e+00
+16296 16752 1.67036829586704e-01
+16296 17064 2.45747508946320e-02
+16296 17088 1.84798520781172e-01
+16296 17112 3.90862119037907e-01
+16296 17136 1.67656714533441e-01
+16296 17160 2.02892993326993e-02
+16297 16297 1.00000000000000e+00
+16298 16298 1.00000000000000e+00
+16299 16299 1.00000000000000e+00
+16300 16300 1.00000000000000e+00
+16301 16301 1.00000000000000e+00
+16302 16302 1.00000000000000e+00
+16303 16303 1.00000000000000e+00
+16304 16304 1.00000000000000e+00
+16305 16305 1.00000000000000e+00
+16306 16306 1.00000000000000e+00
+16307 16307 1.00000000000000e+00
+16308 16308 1.00000000000000e+00
+16309 16309 1.00000000000000e+00
+16310 16310 1.00000000000000e+00
+16311 16311 1.00000000000000e+00
+16312 16312 1.00000000000000e+00
+16313 16313 1.00000000000000e+00
+16314 16314 1.00000000000000e+00
+16315 16315 1.00000000000000e+00
+16316 16316 1.00000000000000e+00
+16317 16317 1.00000000000000e+00
+16318 16318 1.00000000000000e+00
+16319 16319 1.00000000000000e+00
+16320 3261 -8.24395122984949e-03
+16320 3285 -5.81648819907583e-02
+16320 3309 -1.62745062553764e-02
+16320 3333 -1.13997207202415e-05
+16320 3837 -9.09969541231139e-04
+16320 3861 -4.60405244955091e-01
+16320 3885 -2.11930396500524e+00
+16320 3909 -1.42191071427140e+00
+16320 3933 -8.96751616157894e-02
+16320 3957 -1.45918259762627e-04
+16320 4437 -2.30088250458341e-02
+16320 4461 -1.71506375002887e+00
+16320 4485 -8.88021871768787e+00
+16320 4509 -5.34832249232646e+00
+16320 4533 -3.96364039902606e-01
+16320 4557 -4.57831467629243e-04
+16320 5037 -1.62013567064915e-02
+16320 5061 -8.23602821426849e-01
+16320 5085 -4.23415220768885e+00
+16320 5109 -2.65973954927669e+00
+16320 5133 -1.90281153849869e-01
+16320 5157 -1.21126830761586e-06
+16320 5637 -1.67984462863557e-05
+16320 5661 -3.45663066015175e-02
+16320 5685 -2.32535662013761e-01
+16320 5709 -1.43723768517552e-01
+16320 5733 -3.82397426018655e-03
+16320 6285 -3.38155601221632e-05
+16320 6309 -8.79221394985299e-05
+16320 16320 8.04427054762166e+00
+16320 15456 2.77059546493849e-02
+16320 15480 2.09211209883004e-01
+16320 15504 4.47226004500338e-01
+16320 15528 2.02269330121850e-01
+16320 15552 2.59704847090965e-02
+16320 15864 2.06685258161086e-01
+16320 15888 1.56380912680985e+00
+16320 15912 3.34654915774405e+00
+16320 15936 1.50343418584934e+00
+16320 15960 1.91591522920960e-01
+16320 16272 4.32776592204233e-01
+16320 16296 3.28472507352777e+00
+16320 16344 3.14169525100730e+00
+16320 16368 3.97019136574117e-01
+16320 16680 1.82360956766191e-01
+16320 16704 1.39759114541159e+00
+16320 16728 3.02350107634498e+00
+16320 16752 1.34235070311272e+00
+16320 16776 1.68550846191473e-01
+16320 17088 2.16248793006610e-02
+16320 17112 1.67656714533441e-01
+16320 17136 3.66463984150574e-01
+16320 17160 1.61998459437696e-01
+16320 17184 2.02103155267248e-02
+16321 16321 1.00000000000000e+00
+16322 16322 1.00000000000000e+00
+16323 16323 1.00000000000000e+00
+16324 16324 1.00000000000000e+00
+16325 16325 1.00000000000000e+00
+16326 16326 1.00000000000000e+00
+16327 16327 1.00000000000000e+00
+16328 16328 1.00000000000000e+00
+16329 16329 1.00000000000000e+00
+16330 16330 1.00000000000000e+00
+16331 16331 1.00000000000000e+00
+16332 16332 1.00000000000000e+00
+16333 16333 1.00000000000000e+00
+16334 16334 1.00000000000000e+00
+16335 16335 1.00000000000000e+00
+16336 16336 1.00000000000000e+00
+16337 16337 1.00000000000000e+00
+16338 16338 1.00000000000000e+00
+16339 16339 1.00000000000000e+00
+16340 16340 1.00000000000000e+00
+16341 16341 1.00000000000000e+00
+16342 16342 1.00000000000000e+00
+16343 16343 1.00000000000000e+00
+16344 3285 -1.81463814625538e-03
+16344 3309 -2.36456528890254e-03
+16344 3333 -4.35062775778430e-06
+16344 3861 -4.02285784986327e-03
+16344 3885 -2.92463126461179e-01
+16344 3909 -7.70581711034155e-01
+16344 3933 -2.48937627752003e-01
+16344 3957 -2.80363635072941e-03
+16344 4437 -3.73102447881600e-08
+16344 4461 -1.07211408631076e-01
+16344 4485 -2.79102250318825e+00
+16344 4509 -7.17876805185175e+00
+16344 4533 -2.16294920165829e+00
+16344 4557 -7.60852993516091e-02
+16344 4581 -7.46393400000000e-14
+16344 5037 -7.48228670978528e-06
+16344 5061 -1.34270192548720e-01
+16344 5085 -2.98627124706644e+00
+16344 5109 -7.84475762036920e+00
+16344 5133 -2.32104302524860e+00
+16344 5157 -6.09726191576301e-02
+16344 5637 -5.47964570785970e-07
+16344 5661 -1.14567772184783e-02
+16344 5685 -4.23340971250767e-01
+16344 5709 -9.41794062802636e-01
+16344 5733 -2.95079386881862e-01
+16344 5757 -1.97908944809921e-03
+16344 6285 -3.25705673696310e-04
+16344 6309 -7.63644529673730e-03
+16344 6333 -2.69918411505039e-03
+16344 16344 8.12365760161966e+00
+16344 15480 2.45968478213660e-02
+16344 15504 2.02269330121850e-01
+16344 15528 4.66158201239839e-01
+16344 15552 2.08016331128103e-01
+16344 15576 2.60335980729292e-02
+16344 15888 1.84267023541371e-01
+16344 15912 1.50343418584934e+00
+16344 15936 3.43815469624700e+00
+16344 15960 1.52005931556464e+00
+16344 15984 1.88423305970196e-01
+16344 16296 3.88404676177692e-01
+16344 16320 3.14169525100730e+00
+16344 16368 3.11986350731988e+00
+16344 16392 3.82946740255838e-01
+16344 16704 1.67036829586704e-01
+16344 16728 1.34235070311272e+00
+16344 16752 3.02716923220478e+00
+16344 16776 1.32747883898368e+00
+16344 16800 1.63318863554444e-01
+16344 17112 2.02892993326993e-02
+16344 17136 1.61998459437696e-01
+16344 17160 3.63411835229287e-01
+16344 17184 1.59871211982864e-01
+16344 17208 1.97574874689911e-02
+16345 16345 1.00000000000000e+00
+16346 16346 1.00000000000000e+00
+16347 16347 1.00000000000000e+00
+16348 16348 1.00000000000000e+00
+16349 16349 1.00000000000000e+00
+16350 16350 1.00000000000000e+00
+16351 16351 1.00000000000000e+00
+16352 16352 1.00000000000000e+00
+16353 16353 1.00000000000000e+00
+16354 16354 1.00000000000000e+00
+16355 16355 1.00000000000000e+00
+16356 16356 1.00000000000000e+00
+16357 16357 1.00000000000000e+00
+16358 16358 1.00000000000000e+00
+16359 16359 1.00000000000000e+00
+16360 16360 1.00000000000000e+00
+16361 16361 1.00000000000000e+00
+16362 16362 1.00000000000000e+00
+16363 16363 1.00000000000000e+00
+16364 16364 1.00000000000000e+00
+16365 16365 1.00000000000000e+00
+16366 16366 1.00000000000000e+00
+16367 16367 1.00000000000000e+00
+16368 3285 -1.96062915748000e-09
+16368 3309 -4.68162706606915e-06
+16368 3333 -4.00202380170110e-07
+16368 3885 -5.36026349040975e-03
+16368 3909 -1.31722113288670e-01
+16368 3933 -1.43573546139141e-01
+16368 3957 -9.42561470530920e-03
+16368 4461 -1.33092751663790e-05
+16368 4485 -2.65399292796339e-01
+16368 4509 -2.64775831761198e+00
+16368 4533 -3.40775270230956e+00
+16368 4557 -4.95781694150880e-01
+16368 4581 -5.38291298606254e-03
+16368 5061 -1.93303940305551e-03
+16368 5085 -6.02940997111873e-01
+16368 5109 -6.49493602195029e+00
+16368 5133 -8.01336539963254e+00
+16368 5157 -1.11422845009597e+00
+16368 5181 -9.40248882104724e-03
+16368 5661 -8.99956012314765e-04
+16368 5685 -1.78671550878460e-01
+16368 5709 -1.93483237870043e+00
+16368 5733 -2.22780410194090e+00
+16368 5757 -3.54816042167562e-01
+16368 5781 -2.02465739836176e-04
+16368 6285 -7.98683687606907e-04
+16368 6309 -4.55087334551126e-02
+16368 6333 -7.37384779871932e-02
+16368 6357 -5.97175117773279e-03
+16368 6933 -6.06677257560000e-10
+16368 6957 -9.21392776400000e-11
+16368 16368 7.90720107965380e+00
+16368 15504 2.59704847090965e-02
+16368 15528 2.08016331128103e-01
+16368 15552 4.66602452222982e-01
+16368 15576 2.00511985679792e-01
+16368 15600 2.40943983470187e-02
+16368 15912 1.91591522920960e-01
+16368 15936 1.52005931556464e+00
+16368 15960 3.38763623309859e+00
+16368 15984 1.47878048249849e+00
+16368 16008 1.81271814654422e-01
+16368 16320 3.97019136574117e-01
+16368 16344 3.11986350731988e+00
+16368 16392 3.06392335696756e+00
+16368 16416 3.83034098986036e-01
+16368 16728 1.68550846191473e-01
+16368 16752 1.32747883898368e+00
+16368 16776 2.94399814662349e+00
+16368 16800 1.30265738846123e+00
+16368 16824 1.62345483560861e-01
+16368 17136 2.02103155267248e-02
+16368 17160 1.59871211982864e-01
+16368 17184 3.55692930604211e-01
+16368 17208 1.56481212170478e-01
+16368 17232 1.93628155736284e-02
+16369 16369 1.00000000000000e+00
+16370 16370 1.00000000000000e+00
+16371 16371 1.00000000000000e+00
+16372 16372 1.00000000000000e+00
+16373 16373 1.00000000000000e+00
+16374 16374 1.00000000000000e+00
+16375 16375 1.00000000000000e+00
+16376 16376 1.00000000000000e+00
+16377 16377 1.00000000000000e+00
+16378 16378 1.00000000000000e+00
+16379 16379 1.00000000000000e+00
+16380 16380 1.00000000000000e+00
+16381 16381 1.00000000000000e+00
+16382 16382 1.00000000000000e+00
+16383 16383 1.00000000000000e+00
+16384 16384 1.00000000000000e+00
+16385 16385 1.00000000000000e+00
+16386 16386 1.00000000000000e+00
+16387 16387 1.00000000000000e+00
+16388 16388 1.00000000000000e+00
+16389 16389 1.00000000000000e+00
+16390 16390 1.00000000000000e+00
+16391 16391 1.00000000000000e+00
+16392 3909 -3.81608675529010e-03
+16392 3933 -2.38431983512806e-02
+16392 3957 -3.81933610700285e-03
+16392 4485 -4.18824570894584e-04
+16392 4509 -2.97980555261444e-01
+16392 4533 -1.41134525042510e+00
+16392 4557 -9.34677063180291e-01
+16392 4581 -5.10221569510306e-02
+16392 4605 -5.18385731630734e-05
+16392 5085 -2.01656095848379e-02
+16392 5109 -1.58350204718123e+00
+16392 5133 -8.08169379493117e+00
+16392 5157 -4.74306814100736e+00
+16392 5181 -3.40186827062610e-01
+16392 5205 -3.69013968260154e-04
+16392 5685 -2.18011093323529e-02
+16392 5709 -1.01903277723736e+00
+16392 5733 -5.27554891058874e+00
+16392 5757 -3.17368962354507e+00
+16392 5781 -2.16482774683169e-01
+16392 5805 -6.01422878122634e-06
+16392 6285 -2.02821011824109e-04
+16392 6309 -7.39694930109535e-02
+16392 6333 -3.95378165876486e-01
+16392 6357 -2.32391335660979e-01
+16392 6381 -7.59144487802220e-03
+16392 6933 -3.60635957870867e-04
+16392 6957 -6.52984975638891e-04
+16392 6981 -7.91806544230000e-10
+16392 16392 7.90139368247138e+00
+16392 15528 2.60335980729292e-02
+16392 15552 2.00511985679792e-01
+16392 15576 4.37725380813616e-01
+16392 15600 2.01103230141622e-01
+16392 15624 2.61814091883868e-02
+16392 15936 1.88423305970196e-01
+16392 15960 1.47878048249849e+00
+16392 15984 3.27950601151832e+00
+16392 16008 1.48802194292694e+00
+16392 16032 1.90733671077308e-01
+16392 16344 3.82946740255838e-01
+16392 16368 3.06392335696756e+00
+16392 16416 3.09174182969907e+00
+16392 16440 3.89901358438716e-01
+16392 16752 1.63318863554444e-01
+16392 16776 1.30265738846123e+00
+16392 16800 2.92560588267318e+00
+16392 16824 1.30841906282309e+00
+16392 16848 1.64759282144908e-01
+16392 17160 1.97574874689911e-02
+16392 17184 1.56481212170478e-01
+16392 17208 3.49250348602332e-01
+16392 17232 1.56202510115661e-01
+16392 17256 1.96878119552869e-02
+16393 16393 1.00000000000000e+00
+16394 16394 1.00000000000000e+00
+16395 16395 1.00000000000000e+00
+16396 16396 1.00000000000000e+00
+16397 16397 1.00000000000000e+00
+16398 16398 1.00000000000000e+00
+16399 16399 1.00000000000000e+00
+16400 16400 1.00000000000000e+00
+16401 16401 1.00000000000000e+00
+16402 16402 1.00000000000000e+00
+16403 16403 1.00000000000000e+00
+16404 16404 1.00000000000000e+00
+16405 16405 1.00000000000000e+00
+16406 16406 1.00000000000000e+00
+16407 16407 1.00000000000000e+00
+16408 16408 1.00000000000000e+00
+16409 16409 1.00000000000000e+00
+16410 16410 1.00000000000000e+00
+16411 16411 1.00000000000000e+00
+16412 16412 1.00000000000000e+00
+16413 16413 1.00000000000000e+00
+16414 16414 1.00000000000000e+00
+16415 16415 1.00000000000000e+00
+16416 3933 -4.19575438955597e-04
+16416 3957 -3.99843198830990e-04
+16416 4509 -1.90576692073232e-03
+16416 4533 -1.82793376238339e-01
+16416 4557 -4.68654027442267e-01
+16416 4581 -1.31335544505488e-01
+16416 4605 -6.79448506998607e-04
+16416 5085 -1.32206470670000e-10
+16416 5109 -9.55746831138025e-02
+16416 5133 -2.40623175819998e+00
+16416 5157 -5.86868412923079e+00
+16416 5181 -1.72986038849151e+00
+16416 5205 -5.38648376009536e-02
+16416 5685 -1.27615079143267e-05
+16416 5709 -1.58796974729021e-01
+16416 5733 -3.42870701505587e+00
+16416 5757 -8.66875421797876e+00
+16416 5781 -2.39601445015473e+00
+16416 5805 -6.27299216796506e-02
+16416 6285 -3.09439465411296e-06
+16416 6309 -2.25121796792208e-02
+16416 6333 -6.56082329760192e-01
+16416 6357 -1.40261292381425e+00
+16416 6381 -4.30138184579631e-01
+16416 6405 -3.43551708160314e-03
+16416 6933 -2.38851479682778e-03
+16416 6957 -2.14258727932297e-02
+16416 6981 -6.01949539313826e-03
+16416 16416 7.99757378523743e+00
+16416 15552 2.40943983470187e-02
+16416 15576 2.01103230141622e-01
+16416 15600 4.68009715976438e-01
+16416 15624 2.04776719214466e-01
+16416 15648 2.50127706152297e-02
+16416 15960 1.81271814654422e-01
+16416 15984 1.48802194292694e+00
+16416 16008 3.41594298496312e+00
+16416 16032 1.49466441659606e+00
+16416 16056 1.82932433071703e-01
+16416 16368 3.83034098986036e-01
+16416 16392 3.09174182969907e+00
+16416 16440 3.06407723868170e+00
+16416 16464 3.76117951231693e-01
+16416 16776 1.62345483560861e-01
+16416 16800 1.30841906282309e+00
+16416 16824 2.95969446118355e+00
+16416 16848 1.30383898179603e+00
+16416 16872 1.61200463304095e-01
+16416 17184 1.93628155736284e-02
+16416 17208 1.56202510115661e-01
+16416 17232 3.53947585031547e-01
+16416 17256 1.57070360514459e-01
+16416 17280 1.95797781733278e-02
+16417 16417 1.00000000000000e+00
+16418 16418 1.00000000000000e+00
+16419 16419 1.00000000000000e+00
+16420 16420 1.00000000000000e+00
+16421 16421 1.00000000000000e+00
+16422 16422 1.00000000000000e+00
+16423 16423 1.00000000000000e+00
+16424 16424 1.00000000000000e+00
+16425 16425 1.00000000000000e+00
+16426 16426 1.00000000000000e+00
+16427 16427 1.00000000000000e+00
+16428 16428 1.00000000000000e+00
+16429 16429 1.00000000000000e+00
+16430 16430 1.00000000000000e+00
+16431 16431 1.00000000000000e+00
+16432 16432 1.00000000000000e+00
+16433 16433 1.00000000000000e+00
+16434 16434 1.00000000000000e+00
+16435 16435 1.00000000000000e+00
+16436 16436 1.00000000000000e+00
+16437 16437 1.00000000000000e+00
+16438 16438 1.00000000000000e+00
+16439 16439 1.00000000000000e+00
+16440 4533 -2.60171715117958e-03
+16440 4557 -7.35160147784661e-02
+16440 4581 -6.14995665721276e-02
+16440 4605 -1.97260203679892e-03
+16440 5109 -3.41322157762277e-06
+16440 5133 -2.07628844917463e-01
+16440 5157 -1.98400933919516e+00
+16440 5181 -2.45398170369841e+00
+16440 5205 -3.41170327114196e-01
+16440 5229 -3.19873872226569e-03
+16440 5709 -1.95098127036774e-03
+16440 5733 -6.49732174719313e-01
+16440 5757 -6.61043386329516e+00
+16440 5781 -7.77456076509314e+00
+16440 5805 -1.05198764373597e+00
+16440 5829 -9.38575092160597e-03
+16440 6309 -1.55759882964487e-03
+16440 6333 -2.58902342369887e-01
+16440 6357 -2.64139157095846e+00
+16440 6381 -2.99873944324043e+00
+16440 6405 -4.57991835894893e-01
+16440 6429 -3.89332230272228e-04
+16440 6933 -4.15438031221894e-03
+16440 6957 -1.06356067585759e-01
+16440 6981 -1.34841749520496e-01
+16440 7005 -1.19319310724472e-02
+16440 7557 -8.46091646237400e-08
+16440 7581 -1.05416003024268e-05
+16440 7605 -6.94046372686300e-07
+16440 16440 7.80038152703573e+00
+16440 15576 2.61814091883868e-02
+16440 15600 2.04776719214466e-01
+16440 15624 4.51557124279133e-01
+16440 15648 2.00736623449201e-01
+16440 15672 2.51713852470706e-02
+16440 15984 1.90733671077308e-01
+16440 16008 1.49466441659606e+00
+16440 16032 3.30531284354298e+00
+16440 16056 1.48237070556027e+00
+16440 16080 1.87660243318361e-01
+16440 16392 3.89901358438716e-01
+16440 16416 3.06407723868170e+00
+16440 16464 3.07484360048556e+00
+16440 16488 3.92592948889682e-01
+16440 16800 1.64759282144908e-01
+16440 16824 1.30383898179603e+00
+16440 16848 2.90903241462974e+00
+16440 16872 1.30506473169342e+00
+16440 16896 1.65065719619256e-01
+16440 17208 1.96878119552869e-02
+16440 17232 1.57070360514459e-01
+16440 17256 3.52487017050825e-01
+16440 17280 1.56410129982488e-01
+16440 17304 1.95227543222943e-02
+16441 16441 1.00000000000000e+00
+16442 16442 1.00000000000000e+00
+16443 16443 1.00000000000000e+00
+16444 16444 1.00000000000000e+00
+16445 16445 1.00000000000000e+00
+16446 16446 1.00000000000000e+00
+16447 16447 1.00000000000000e+00
+16448 16448 1.00000000000000e+00
+16449 16449 1.00000000000000e+00
+16450 16450 1.00000000000000e+00
+16451 16451 1.00000000000000e+00
diff --git a/external/hypre/src/test/TEST_ij/data/tucker21935/IJ.A.00003 b/external/hypre/src/test/TEST_ij/data/tucker21935/IJ.A.00003
new file mode 100644
index 00000000..ad94fc6d
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/data/tucker21935/IJ.A.00003
@@ -0,0 +1,16553 @@
+16452 21935 16452 21935
+16452 16452 1.00000000000000e+00
+16453 16453 1.00000000000000e+00
+16454 16454 1.00000000000000e+00
+16455 16455 1.00000000000000e+00
+16456 16456 1.00000000000000e+00
+16457 16457 1.00000000000000e+00
+16458 16458 1.00000000000000e+00
+16459 16459 1.00000000000000e+00
+16460 16460 1.00000000000000e+00
+16461 16461 1.00000000000000e+00
+16462 16462 1.00000000000000e+00
+16463 16463 1.00000000000000e+00
+16464 4557 -1.58120002869862e-03
+16464 4581 -8.17707393505412e-03
+16464 4605 -6.01640639348701e-04
+16464 5133 -1.77369989909063e-04
+16464 5157 -1.98962185579800e-01
+16464 5181 -9.54578846059269e-01
+16464 5205 -6.13134529254237e-01
+16464 5229 -2.65648743547440e-02
+16464 5253 -9.74644038470952e-06
+16464 5733 -1.83378568091768e-02
+16464 5757 -1.52417843992882e+00
+16464 5781 -7.39535321592722e+00
+16464 5805 -4.21473093150745e+00
+16464 5829 -2.85679637321192e-01
+16464 5853 -2.68364539589378e-04
+16464 6333 -2.95734225758221e-02
+16464 6357 -1.29413504051998e+00
+16464 6381 -6.59932721052856e+00
+16464 6405 -3.73729413925666e+00
+16464 6429 -2.40577424961977e-01
+16464 6453 -1.69759551982028e-05
+16464 6933 -9.85286141680783e-04
+16464 6957 -1.43215743617077e-01
+16464 6981 -6.65735053161056e-01
+16464 7005 -3.78249300822861e-01
+16464 7029 -1.42016680674158e-02
+16464 7557 -5.60692149366310e-07
+16464 7581 -2.05148678363386e-03
+16464 7605 -2.65351095419148e-03
+16464 7629 -1.61126130499370e-07
+16464 15600 2.50127706152297e-02
+16464 15624 2.00736623449201e-01
+16464 15648 4.54332216932532e-01
+16464 15672 2.06994670444976e-01
+16464 15696 2.65772823641734e-02
+16464 16008 1.82932433071703e-01
+16464 16032 1.48237070556027e+00
+16464 16056 3.37821758384738e+00
+16464 16080 1.52152600400077e+00
+16464 16104 1.92721257681826e-01
+16464 16416 3.76117951231693e-01
+16464 16440 3.07484360048556e+00
+16464 16464 8.05020205385287e+00
+16464 16488 3.14075947710285e+00
+16464 16512 3.92596920386014e-01
+16464 16824 1.61200463304095e-01
+16464 16848 1.30506473169342e+00
+16464 16872 2.97014860592264e+00
+16464 16896 1.33184939331856e+00
+16464 16920 1.67896628710379e-01
+16464 17232 1.95797781733278e-02
+16464 17256 1.56410129982488e-01
+16464 17280 3.52314972451348e-01
+16464 17304 1.59575517774424e-01
+16464 17328 2.03711251213117e-02
+16465 16465 1.00000000000000e+00
+16466 16466 1.00000000000000e+00
+16467 16467 1.00000000000000e+00
+16468 16468 1.00000000000000e+00
+16469 16469 1.00000000000000e+00
+16470 16470 1.00000000000000e+00
+16471 16471 1.00000000000000e+00
+16472 16472 1.00000000000000e+00
+16473 16473 1.00000000000000e+00
+16474 16474 1.00000000000000e+00
+16475 16475 1.00000000000000e+00
+16476 16476 1.00000000000000e+00
+16477 16477 1.00000000000000e+00
+16478 16478 1.00000000000000e+00
+16479 16479 1.00000000000000e+00
+16480 16480 1.00000000000000e+00
+16481 16481 1.00000000000000e+00
+16482 16482 1.00000000000000e+00
+16483 16483 1.00000000000000e+00
+16484 16484 1.00000000000000e+00
+16485 16485 1.00000000000000e+00
+16486 16486 1.00000000000000e+00
+16487 16487 1.00000000000000e+00
+16488 4581 -4.66156117325986e-05
+16488 4605 -3.23866062505968e-05
+16488 5157 -8.34346672447818e-04
+16488 5181 -1.15666008616456e-01
+16488 5205 -2.74822116270487e-01
+16488 5229 -6.04023209590308e-02
+16488 5253 -8.30543836998000e-05
+16488 5757 -8.46942034598107e-02
+16488 5781 -2.05289357518915e+00
+16488 5805 -4.72026243498160e+00
+16488 5829 -1.35589596977103e+00
+16488 5853 -3.63021842950993e-02
+16488 6333 -2.02242391247015e-05
+16488 6357 -1.90167096788185e-01
+16488 6381 -3.93415720552657e+00
+16488 6405 -9.44829471250618e+00
+16488 6429 -2.46519311509011e+00
+16488 6453 -6.35762543224481e-02
+16488 6933 -9.82651904440186e-06
+16488 6957 -4.08970490628926e-02
+16488 6981 -1.01643732635630e+00
+16488 7005 -2.10508368685635e+00
+16488 7029 -6.26267686291776e-01
+16488 7053 -5.60829570506782e-03
+16488 7557 -9.73631128109080e-07
+16488 7581 -1.10223094013724e-02
+16488 7605 -5.20208389584616e-02
+16488 7629 -1.23920601170131e-02
+16488 15624 2.51713852470706e-02
+16488 15648 2.06994670444976e-01
+16488 15672 4.74982653968479e-01
+16488 15696 2.04608133035231e-01
+16488 15720 2.45747508946344e-02
+16488 16032 1.87660243318361e-01
+16488 16056 1.52152600400077e+00
+16488 16080 3.45599888700882e+00
+16488 16104 1.51007911385205e+00
+16488 16128 1.84798520781182e-01
+16488 16440 3.92592948889682e-01
+16488 16488 8.06500579410407e+00
+16488 16464 3.14075947710285e+00
+16488 16512 3.13383615769576e+00
+16488 16536 3.90862119037911e-01
+16488 16848 1.65065719619256e-01
+16488 16872 1.33184939331856e+00
+16488 16896 3.01906849351882e+00
+16488 16920 1.34221337297530e+00
+16488 16944 1.67656714533442e-01
+16488 17256 1.95227543222943e-02
+16488 17280 1.59575517774424e-01
+16488 17304 3.65750055595980e-01
+16488 17328 1.62641697816045e-01
+16488 17352 2.02892993326995e-02
+16489 16489 1.00000000000000e+00
+16490 16490 1.00000000000000e+00
+16491 16491 1.00000000000000e+00
+16492 16492 1.00000000000000e+00
+16493 16493 1.00000000000000e+00
+16494 16494 1.00000000000000e+00
+16495 16495 1.00000000000000e+00
+16496 16496 1.00000000000000e+00
+16497 16497 1.00000000000000e+00
+16498 16498 1.00000000000000e+00
+16499 16499 1.00000000000000e+00
+16500 16500 1.00000000000000e+00
+16501 16501 1.00000000000000e+00
+16502 16502 1.00000000000000e+00
+16503 16503 1.00000000000000e+00
+16504 16504 1.00000000000000e+00
+16505 16505 1.00000000000000e+00
+16506 16506 1.00000000000000e+00
+16507 16507 1.00000000000000e+00
+16508 16508 1.00000000000000e+00
+16509 16509 1.00000000000000e+00
+16510 16510 1.00000000000000e+00
+16511 16511 1.00000000000000e+00
+16512 5181 -1.21570673088841e-03
+16512 5205 -3.78886813069669e-02
+16512 5229 -2.22660675726956e-02
+16512 5253 -1.86284564303339e-04
+16512 5757 -3.81408583499220e-07
+16512 5781 -1.56845308931475e-01
+16512 5805 -1.46587366422927e+00
+16512 5829 -1.73717993124602e+00
+16512 5853 -2.28262293221438e-01
+16512 5877 -1.76545037455340e-03
+16512 6357 -1.94381303127237e-03
+16512 6381 -6.98575913356135e-01
+16512 6405 -6.73991693558086e+00
+16512 6429 -7.59830514439935e+00
+16512 6453 -1.01738905164713e+00
+16512 6477 -9.50245677540132e-03
+16512 6957 -2.61242579381708e-03
+16512 6981 -3.72818880152230e-01
+16512 7005 -3.64519484217998e+00
+16512 7029 -4.10122884318582e+00
+16512 7053 -6.03687179371130e-01
+16512 7077 -7.23038149697049e-04
+16512 7557 -2.22255490871330e-07
+16512 7581 -1.39338207108135e-02
+16512 7605 -2.24374614877637e-01
+16512 7629 -2.51340603069217e-01
+16512 7653 -2.46988284185834e-02
+16512 8205 -1.60601360825507e-05
+16512 8229 -2.48574860122958e-04
+16512 8253 -9.43368006238333e-06
+16512 15648 2.65772823641734e-02
+16512 15672 2.04608133035231e-01
+16512 15696 4.48016156154050e-01
+16512 15720 2.11270441481446e-01
+16512 15744 2.82428594757272e-02
+16512 16056 1.92721257681826e-01
+16512 16080 1.51007911385205e+00
+16512 16104 3.35833046764726e+00
+16512 16128 1.57452559299059e+00
+16512 16152 2.08832877466460e-01
+16512 16512 8.07954935078675e+00
+16512 16464 3.92596920386014e-01
+16512 16488 3.13383615769576e+00
+16512 16536 3.29608257932735e+00
+16512 16560 4.33158525793909e-01
+16512 16872 1.67896628710379e-01
+16512 16896 1.34221337297530e+00
+16512 16920 3.03214513306497e+00
+16512 16944 1.39759114541161e+00
+16512 16968 1.81741071819456e-01
+16512 17280 2.03711251213117e-02
+16512 17304 1.62641697816045e-01
+16512 17328 3.66469822508480e-01
+16512 17352 1.67036829586703e-01
+16512 17376 2.14699080639762e-02
+16513 16513 1.00000000000000e+00
+16514 16514 1.00000000000000e+00
+16515 16515 1.00000000000000e+00
+16516 16516 1.00000000000000e+00
+16517 16517 1.00000000000000e+00
+16518 16518 1.00000000000000e+00
+16519 16519 1.00000000000000e+00
+16520 16520 1.00000000000000e+00
+16521 16521 1.00000000000000e+00
+16522 16522 1.00000000000000e+00
+16523 16523 1.00000000000000e+00
+16524 16524 1.00000000000000e+00
+16525 16525 1.00000000000000e+00
+16526 16526 1.00000000000000e+00
+16527 16527 1.00000000000000e+00
+16528 16528 1.00000000000000e+00
+16529 16529 1.00000000000000e+00
+16530 16530 1.00000000000000e+00
+16531 16531 1.00000000000000e+00
+16532 16532 1.00000000000000e+00
+16533 16533 1.00000000000000e+00
+16534 16534 1.00000000000000e+00
+16535 16535 1.00000000000000e+00
+16536 5205 -5.31919679444265e-04
+16536 5229 -2.12602681745391e-03
+16536 5253 -4.51231632600868e-05
+16536 5781 -5.96109218410210e-05
+16536 5805 -1.30904245935948e-01
+16536 5829 -6.47334861429494e-01
+16536 5853 -4.02728245207735e-01
+16536 5877 -1.29804131789673e-02
+16536 5901 -2.30301308694400e-07
+16536 6381 -1.68136550660147e-02
+16536 6405 -1.48312847787425e+00
+16536 6429 -6.94499300146942e+00
+16536 6453 -3.98187100407165e+00
+16536 6477 -2.65653515247335e-01
+16536 6501 -1.92627463307750e-04
+16536 6981 -3.91570541987390e-02
+16536 7005 -1.69477015015131e+00
+16536 7029 -8.63045626787847e+00
+16536 7053 -4.89729124264450e+00
+16536 7077 -3.15687715384824e-01
+16536 7101 -3.60143894674450e-05
+16536 7581 -3.08070724295746e-03
+16536 7605 -2.70400200659878e-01
+16536 7629 -1.19479722097737e+00
+16536 7653 -7.08432062787704e-01
+16536 7677 -3.02687018809984e-02
+16536 8205 -8.98871072744653e-05
+16536 8229 -9.44696404610493e-03
+16536 8253 -8.79520094271789e-03
+16536 8277 -2.75079980372742e-06
+16536 15672 2.45747508946344e-02
+16536 15696 2.11270441481446e-01
+16536 15720 5.07714859658772e-01
+16536 15744 2.37988866512918e-01
+16536 15768 3.12543571525023e-02
+16536 16080 1.84798520781182e-01
+16536 16104 1.57452559299059e+00
+16536 16128 3.76196580745217e+00
+16536 16152 1.77869649869605e+00
+16536 16176 2.35841247207546e-01
+16536 16536 8.82054501110475e+00
+16536 16488 3.90862119037911e-01
+16536 16512 3.29608257932735e+00
+16536 16560 3.72922002063178e+00
+16536 16584 4.99146479364018e-01
+16536 16896 1.67656714533442e-01
+16536 16920 1.39759114541161e+00
+16536 16944 3.28472507352781e+00
+16536 16968 1.56380912680985e+00
+16536 16992 2.09211209883002e-01
+16536 17304 2.02892993326995e-02
+16536 17328 1.67036829586703e-01
+16536 17352 3.88404676177685e-01
+16536 17376 1.84267023541369e-01
+16536 17400 2.45968478213661e-02
+16537 16537 1.00000000000000e+00
+16538 16538 1.00000000000000e+00
+16539 16539 1.00000000000000e+00
+16540 16540 1.00000000000000e+00
+16541 16541 1.00000000000000e+00
+16542 16542 1.00000000000000e+00
+16543 16543 1.00000000000000e+00
+16544 16544 1.00000000000000e+00
+16545 16545 1.00000000000000e+00
+16546 16546 1.00000000000000e+00
+16547 16547 1.00000000000000e+00
+16548 16548 1.00000000000000e+00
+16549 16549 1.00000000000000e+00
+16550 16550 1.00000000000000e+00
+16551 16551 1.00000000000000e+00
+16552 16552 1.00000000000000e+00
+16553 16553 1.00000000000000e+00
+16554 16554 1.00000000000000e+00
+16555 16555 1.00000000000000e+00
+16556 16556 1.00000000000000e+00
+16557 16557 1.00000000000000e+00
+16558 16558 1.00000000000000e+00
+16559 16559 1.00000000000000e+00
+16560 5229 -5.30610853420270e-07
+16560 5253 -2.63635274781210e-07
+16560 5805 -3.42380297403756e-04
+16560 5829 -7.56563029286538e-02
+16560 5853 -1.63888366341908e-01
+16560 5877 -2.56556343381753e-02
+16560 5901 -1.19463980016851e-06
+16560 6405 -7.66304469585031e-02
+16560 6429 -1.87921702765301e+00
+16560 6453 -4.28313906253422e+00
+16560 6477 -1.07744492518088e+00
+16560 6501 -1.51639929481643e-02
+16560 6981 -3.13185518468501e-05
+16560 7005 -2.38646796391967e-01
+16560 7029 -5.11917555376173e+00
+16560 7053 -1.18093709731944e+01
+16560 7077 -2.41236416441370e+00
+16560 7101 -4.35226319330424e-02
+16560 7581 -2.65552428960317e-05
+16560 7605 -7.51061278934845e-02
+16560 7629 -1.74396899578495e+00
+16560 7653 -3.34211054867200e+00
+16560 7677 -7.93553797255210e-01
+16560 7701 -7.02520703206139e-03
+16560 8205 -1.18646387859601e-04
+16560 8229 -3.98639657652778e-02
+16560 8253 -1.01470518843152e-01
+16560 8277 -2.01988474371424e-02
+16560 8301 -1.31019120337000e-09
+16560 8853 -6.61515078038800e-08
+16560 8877 -4.14899663859000e-08
+16560 15696 2.82428594757272e-02
+16560 15720 2.37988866512918e-01
+16560 15744 5.44078468654198e-01
+16560 15768 1.88081007563747e-01
+16560 15792 1.57658947384345e-02
+16560 16104 2.08832877466460e-01
+16560 16128 1.77869649869605e+00
+16560 16152 4.12606418741716e+00
+16560 16176 1.51845040734970e+00
+16560 16200 1.43771354629874e-01
+16560 16560 9.77556496807966e+00
+16560 16512 4.33158525793909e-01
+16560 16536 3.72922002063178e+00
+16560 16584 3.42083700730073e+00
+16560 16608 3.56062772461148e-01
+16560 16920 1.81741071819456e-01
+16560 16944 1.56380912680985e+00
+16560 16968 3.67969130569637e+00
+16560 16992 1.43912834252728e+00
+16560 17016 1.50570875748814e-01
+16560 17328 2.14699080639762e-02
+16560 17352 1.84267023541369e-01
+16560 17376 4.32485248224003e-01
+16560 17400 1.68250491358142e-01
+16560 17424 1.74657750181695e-02
+16561 16561 1.00000000000000e+00
+16562 16562 1.00000000000000e+00
+16563 16563 1.00000000000000e+00
+16564 16564 1.00000000000000e+00
+16565 16565 1.00000000000000e+00
+16566 16566 1.00000000000000e+00
+16567 16567 1.00000000000000e+00
+16568 16568 1.00000000000000e+00
+16569 16569 1.00000000000000e+00
+16570 16570 1.00000000000000e+00
+16571 16571 1.00000000000000e+00
+16572 16572 1.00000000000000e+00
+16573 16573 1.00000000000000e+00
+16574 16574 1.00000000000000e+00
+16575 16575 1.00000000000000e+00
+16576 16576 1.00000000000000e+00
+16577 16577 1.00000000000000e+00
+16578 16578 1.00000000000000e+00
+16579 16579 1.00000000000000e+00
+16580 16580 1.00000000000000e+00
+16581 16581 1.00000000000000e+00
+16582 16582 1.00000000000000e+00
+16583 16583 1.00000000000000e+00
+16584 5829 -6.16935639697806e-04
+16584 5853 -1.94860308560996e-02
+16584 5877 -6.78156064318184e-03
+16584 5901 -1.32403957025804e-06
+16584 6405 -3.15286122116000e-09
+16584 6429 -1.38745469119401e-01
+16584 6453 -1.10467050991724e+00
+16584 6477 -1.10367230428959e+00
+16584 6501 -2.52264035490331e-01
+16584 7005 -2.05883233787824e-03
+16584 7029 -8.76028072878799e-01
+16584 7053 -6.68777816209331e+00
+16584 7077 -9.03319033806791e+00
+16584 7101 -1.30109975791997e+00
+16584 7605 -4.76276778342307e-03
+16584 7629 -5.39531734989179e-01
+16584 7653 -5.66644235563060e+00
+16584 7677 -8.06189223988948e+00
+16584 7701 -3.07481855106399e-01
+16584 8205 -2.56465629442626e-05
+16584 8229 -3.21841845409034e-02
+16584 8253 -8.34970990283466e-01
+16584 8277 -6.70418245275526e-01
+16584 8301 -1.27580809196153e-06
+16584 8853 -2.00170805911748e-05
+16584 8877 -1.35540959531506e-05
+16584 15720 3.12543571525023e-02
+16584 15744 1.88081007563747e-01
+16584 15768 4.64035159481771e-01
+16584 15792 4.24116551982371e-01
+16584 16128 2.35841247207546e-01
+16584 16152 1.51845040734970e+00
+16584 16176 3.67416532082424e+00
+16584 16200 2.85105021759681e+00
+16584 16584 9.23470004433160e+00
+16584 16536 4.99146479364018e-01
+16584 16560 3.42083700730073e+00
+16584 16608 5.50134950102257e+00
+16584 16944 2.09211209883002e-01
+16584 16968 1.43912834252728e+00
+16584 16992 3.81228929594187e+00
+16584 17016 2.99017165115085e+00
+16584 17352 2.45968478213661e-02
+16584 17376 1.68250491358142e-01
+16584 17400 4.98566153261178e-01
+16584 17424 4.58896910370879e-01
+16585 16585 1.00000000000000e+00
+16586 16586 1.00000000000000e+00
+16587 16587 1.00000000000000e+00
+16588 16588 1.00000000000000e+00
+16589 16589 1.00000000000000e+00
+16590 16590 1.00000000000000e+00
+16591 16591 1.00000000000000e+00
+16592 16592 1.00000000000000e+00
+16593 16593 1.00000000000000e+00
+16594 16594 1.00000000000000e+00
+16595 16595 1.00000000000000e+00
+16596 16596 1.00000000000000e+00
+16597 16597 1.00000000000000e+00
+16598 16598 1.00000000000000e+00
+16599 16599 1.00000000000000e+00
+16600 16600 1.00000000000000e+00
+16601 16601 1.00000000000000e+00
+16602 16602 1.00000000000000e+00
+16603 16603 1.00000000000000e+00
+16604 16604 1.00000000000000e+00
+16605 16605 1.00000000000000e+00
+16606 16606 1.00000000000000e+00
+16607 16607 1.00000000000000e+00
+16608 5853 -7.56520811581507e-05
+16608 5877 -2.15737240607035e-04
+16608 5901 -2.73434565390910e-07
+16608 6429 -1.04201598584573e-05
+16608 6453 -6.09452274392248e-02
+16608 6477 -6.50483221529839e-01
+16608 6501 -4.03388434389513e-01
+16608 7029 -1.29413237855627e-02
+16608 7053 -1.51207846681767e+00
+16608 7077 -9.31757742472469e+00
+16608 7101 -2.29847746643479e+00
+16608 7629 -4.16778281377626e-02
+16608 7653 -3.96155814643503e+00
+16608 7677 -1.13558941478984e+01
+16608 7701 -5.65787260988367e-01
+16608 8229 -6.82991249166350e-03
+16608 8253 -1.18740850620948e+00
+16608 8277 -1.19951607928595e+00
+16608 8301 -2.54244484549950e-06
+16608 8853 -3.95711006277224e-05
+16608 8877 -2.68177621416000e-05
+16608 15744 1.57658947384345e-02
+16608 15768 4.24116551982371e-01
+16608 15792 7.37871840795700e-01
+16608 16152 1.43771354629874e-01
+16608 16176 2.85105021759681e+00
+16608 16200 4.69570095278449e+00
+16608 16608 9.51025959481704e+00
+16608 16560 3.56062772461148e-01
+16608 16584 5.50134950102257e+00
+16608 16968 1.50570875748814e-01
+16608 16992 2.99017165115084e+00
+16608 17016 4.92634717205998e+00
+16608 17376 1.74657750181695e-02
+16608 17400 4.58896910370879e-01
+16608 17424 7.95533395614571e-01
+16609 16609 1.00000000000000e+00
+16610 16610 1.00000000000000e+00
+16611 16611 1.00000000000000e+00
+16612 16612 1.00000000000000e+00
+16613 16613 1.00000000000000e+00
+16614 16614 1.00000000000000e+00
+16615 16615 1.00000000000000e+00
+16616 16616 1.00000000000000e+00
+16617 16617 1.00000000000000e+00
+16618 16618 1.00000000000000e+00
+16619 16619 1.00000000000000e+00
+16620 16620 1.00000000000000e+00
+16621 16621 1.00000000000000e+00
+16622 16622 1.00000000000000e+00
+16623 16623 1.00000000000000e+00
+16624 16624 1.00000000000000e+00
+16625 16625 1.00000000000000e+00
+16626 16626 1.00000000000000e+00
+16627 16627 1.00000000000000e+00
+16628 16628 1.00000000000000e+00
+16629 16629 1.00000000000000e+00
+16630 16630 1.00000000000000e+00
+16631 16631 1.00000000000000e+00
+16632 3213 -1.70854902386414e-01
+16632 3237 -9.84383496535956e-01
+16632 3261 -7.14390121570557e-02
+16632 3285 -3.47011381079172e-05
+16632 3789 -1.19673275115655e-03
+16632 3813 -8.88650814138442e+00
+16632 3837 -1.16470936735664e+01
+16632 3861 -3.00034719279312e-01
+16632 3885 -2.44065315422977e-04
+16632 4389 -1.32155033546539e-01
+16632 4413 -1.09254701506262e+01
+16632 4437 -7.62575536054902e+00
+16632 4461 -1.70767136446978e-01
+16632 4485 -4.23031447744463e-06
+16632 4989 -6.40768823076001e-02
+16632 5013 -7.26009893524988e-01
+16632 5037 -2.77611194666452e-01
+16632 5061 -6.67400920711623e-03
+16632 5613 -3.57181806112185e-04
+16632 5637 -6.75108151057735e-04
+16632 5661 -1.98860187077000e-09
+16632 15816 4.64521539191584e-01
+16632 15840 2.85641484834296e-01
+16632 15864 1.52516329252869e-02
+16632 16224 5.30474276402998e+00
+16632 16248 3.10346929434222e+00
+16632 16272 1.28885117807777e-01
+16632 16632 1.56934120813321e+01
+16632 16656 8.42373780668294e+00
+16632 16680 3.07723361719108e-01
+16632 17040 5.21571305960729e+00
+16632 17064 3.13883496231910e+00
+16632 17088 1.51708123575842e-01
+16632 17448 4.42264113085912e-01
+16632 17472 2.94482901828517e-01
+16632 17496 2.09573843673030e-02
+16633 16633 1.00000000000000e+00
+16634 16634 1.00000000000000e+00
+16635 16635 1.00000000000000e+00
+16636 16636 1.00000000000000e+00
+16637 16637 1.00000000000000e+00
+16638 16638 1.00000000000000e+00
+16639 16639 1.00000000000000e+00
+16640 16640 1.00000000000000e+00
+16641 16641 1.00000000000000e+00
+16642 16642 1.00000000000000e+00
+16643 16643 1.00000000000000e+00
+16644 16644 1.00000000000000e+00
+16645 16645 1.00000000000000e+00
+16646 16646 1.00000000000000e+00
+16647 16647 1.00000000000000e+00
+16648 16648 1.00000000000000e+00
+16649 16649 1.00000000000000e+00
+16650 16650 1.00000000000000e+00
+16651 16651 1.00000000000000e+00
+16652 16652 1.00000000000000e+00
+16653 16653 1.00000000000000e+00
+16654 16654 1.00000000000000e+00
+16655 16655 1.00000000000000e+00
+16656 3213 -9.08396678635010e-02
+16656 3237 -6.32999049357043e-01
+16656 3261 -1.07496598483682e-01
+16656 3285 -7.25522370285966e-04
+16656 3789 -6.07278449815367e-04
+16656 3813 -4.99269484567996e+00
+16656 3837 -9.05696095074172e+00
+16656 3861 -1.43888709538292e+00
+16656 3885 -6.28594643042423e-02
+16656 4389 -7.27606402896119e-02
+16656 4413 -7.22856710572103e+00
+16656 4437 -1.02980360621150e+01
+16656 4461 -2.49991636289071e+00
+16656 4485 -7.55358123396616e-02
+16656 4989 -3.73800305753864e-02
+16656 5013 -9.00513750001239e-01
+16656 5037 -1.56020234216348e+00
+16656 5061 -5.23272904718788e-01
+16656 5085 -4.35560139697675e-03
+16656 5613 -2.60936372640850e-03
+16656 5637 -2.75544390262802e-02
+16656 5661 -8.22518959263143e-03
+16656 15816 2.85641484834296e-01
+16656 15840 3.84586462846892e-01
+16656 15864 1.73977969604060e-01
+16656 15888 2.82428594757281e-02
+16656 16224 3.10346929434222e+00
+16656 16248 3.56739673796147e+00
+16656 16272 1.36062223715689e+00
+16656 16296 2.11270441481440e-01
+16656 16656 9.96801212356319e+00
+16656 16632 8.42373780668294e+00
+16656 16680 3.02295807149255e+00
+16656 16704 4.48016156154014e-01
+16656 17040 3.13883496231910e+00
+16656 17064 3.89793934425661e+00
+16656 17088 1.42526502644428e+00
+16656 17112 2.04608133035225e-01
+16656 17448 2.94482901828517e-01
+16656 17472 4.67222114420675e-01
+16656 17496 1.90138666925910e-01
+16656 17520 2.65772823641744e-02
+16657 16657 1.00000000000000e+00
+16658 16658 1.00000000000000e+00
+16659 16659 1.00000000000000e+00
+16660 16660 1.00000000000000e+00
+16661 16661 1.00000000000000e+00
+16662 16662 1.00000000000000e+00
+16663 16663 1.00000000000000e+00
+16664 16664 1.00000000000000e+00
+16665 16665 1.00000000000000e+00
+16666 16666 1.00000000000000e+00
+16667 16667 1.00000000000000e+00
+16668 16668 1.00000000000000e+00
+16669 16669 1.00000000000000e+00
+16670 16670 1.00000000000000e+00
+16671 16671 1.00000000000000e+00
+16672 16672 1.00000000000000e+00
+16673 16673 1.00000000000000e+00
+16674 16674 1.00000000000000e+00
+16675 16675 1.00000000000000e+00
+16676 16676 1.00000000000000e+00
+16677 16677 1.00000000000000e+00
+16678 16678 1.00000000000000e+00
+16679 16679 1.00000000000000e+00
+16680 3213 -1.54634762008396e-03
+16680 3237 -4.67880445595028e-02
+16680 3261 -5.51496939522471e-02
+16680 3285 -2.41565249248580e-03
+16680 3789 -2.54630692488353e-06
+16680 3813 -1.57674992663909e-01
+16680 3837 -1.76103804557888e+00
+16680 3861 -2.67231919083986e+00
+16680 3885 -3.75923620321791e-01
+16680 3909 -3.26638239810645e-03
+16680 4389 -1.90946386181216e-03
+16680 4413 -5.87225973957979e-01
+16680 4437 -7.16654941689140e+00
+16680 4461 -8.89099175463522e+00
+16680 4485 -1.09956716241353e+00
+16680 4509 -9.54620552641469e-03
+16680 4989 -1.52616840616753e-03
+16680 5013 -2.94052989407059e-01
+16680 5037 -3.24277390371008e+00
+16680 5061 -3.40661737920480e+00
+16680 5085 -4.69701797998804e-01
+16680 5109 -4.19129189440223e-04
+16680 5613 -5.08853050101885e-03
+16680 5637 -1.32485464574336e-01
+16680 5661 -1.53167292222670e-01
+16680 5685 -1.29970123836128e-02
+16680 6237 -6.02256811617600e-08
+16680 6261 -1.03954862092585e-05
+16680 6285 -7.74689897242050e-07
+16680 15816 1.52516329252869e-02
+16680 15840 1.73977969604060e-01
+16680 15864 4.91102744427823e-01
+16680 15888 2.08832877466459e-01
+16680 15912 2.39653598908867e-02
+16680 16224 1.28885117807777e-01
+16680 16248 1.36062223715688e+00
+16680 16272 3.69157313827709e+00
+16680 16296 1.57452559299054e+00
+16680 16320 1.82360956766191e-01
+16680 16680 8.86754832094137e+00
+16680 16632 3.07723361719108e-01
+16680 16656 3.02295807149255e+00
+16680 16704 3.35833046764711e+00
+16680 16728 3.91566460757746e-01
+16680 17040 1.51708123575842e-01
+16680 17064 1.42526502644428e+00
+16680 17088 3.59834989756730e+00
+16680 17112 1.51007911385202e+00
+16680 17136 1.72911645427776e-01
+16680 17448 2.09573843673030e-02
+16680 17472 1.90138666925910e-01
+16680 17496 4.67796934250376e-01
+16680 17520 1.92721257681829e-01
+16680 17544 2.16030320562830e-02
+16681 16681 1.00000000000000e+00
+16682 16682 1.00000000000000e+00
+16683 16683 1.00000000000000e+00
+16684 16684 1.00000000000000e+00
+16685 16685 1.00000000000000e+00
+16686 16686 1.00000000000000e+00
+16687 16687 1.00000000000000e+00
+16688 16688 1.00000000000000e+00
+16689 16689 1.00000000000000e+00
+16690 16690 1.00000000000000e+00
+16691 16691 1.00000000000000e+00
+16692 16692 1.00000000000000e+00
+16693 16693 1.00000000000000e+00
+16694 16694 1.00000000000000e+00
+16695 16695 1.00000000000000e+00
+16696 16696 1.00000000000000e+00
+16697 16697 1.00000000000000e+00
+16698 16698 1.00000000000000e+00
+16699 16699 1.00000000000000e+00
+16700 16700 1.00000000000000e+00
+16701 16701 1.00000000000000e+00
+16702 16702 1.00000000000000e+00
+16703 16703 1.00000000000000e+00
+16704 3237 -1.76545037455345e-03
+16704 3261 -9.50245677540159e-03
+16704 3285 -7.23038149697060e-04
+16704 3813 -1.86284564303322e-04
+16704 3837 -2.28262293221427e-01
+16704 3861 -1.01738905164711e+00
+16704 3885 -6.03687179371143e-01
+16704 3909 -2.46988284185830e-02
+16704 3933 -9.43368006238351e-06
+16704 4413 -2.22660675726953e-02
+16704 4437 -1.73717993124592e+00
+16704 4461 -7.59830514439927e+00
+16704 4485 -4.10122884318575e+00
+16704 4509 -2.51340603069218e-01
+16704 4533 -2.48574860122963e-04
+16704 5013 -3.78886813069680e-02
+16704 5037 -1.46587366422926e+00
+16704 5061 -6.73991693558080e+00
+16704 5085 -3.64519484217994e+00
+16704 5109 -2.24374614877636e-01
+16704 5133 -1.60601360825510e-05
+16704 5613 -1.21570673088845e-03
+16704 5637 -1.56845308931475e-01
+16704 5661 -6.98575913356125e-01
+16704 5685 -3.72818880152220e-01
+16704 5709 -1.39338207108133e-02
+16704 6237 -3.81408583499220e-07
+16704 6261 -1.94381303127229e-03
+16704 6285 -2.61242579381695e-03
+16704 6309 -2.22255490871320e-07
+16704 15840 2.82428594757281e-02
+16704 15864 2.08832877466459e-01
+16704 15888 4.33158525793892e-01
+16704 15912 1.81741071819453e-01
+16704 15936 2.14699080639766e-02
+16704 16248 2.11270441481440e-01
+16704 16272 1.57452559299054e+00
+16704 16296 3.29608257932726e+00
+16704 16320 1.39759114541159e+00
+16704 16344 1.67036829586704e-01
+16704 16704 8.07954935078667e+00
+16704 16656 4.48016156154014e-01
+16704 16680 3.35833046764711e+00
+16704 16728 3.03214513306494e+00
+16704 16752 3.66469822508475e-01
+16704 17064 2.04608133035225e-01
+16704 17088 1.51007911385202e+00
+16704 17112 3.13383615769574e+00
+16704 17136 1.34221337297528e+00
+16704 17160 1.62641697816040e-01
+16704 17472 2.65772823641744e-02
+16704 17496 1.92721257681829e-01
+16704 17520 3.92596920386013e-01
+16704 17544 1.67896628710375e-01
+16704 17568 2.03711251213107e-02
+16705 16705 1.00000000000000e+00
+16706 16706 1.00000000000000e+00
+16707 16707 1.00000000000000e+00
+16708 16708 1.00000000000000e+00
+16709 16709 1.00000000000000e+00
+16710 16710 1.00000000000000e+00
+16711 16711 1.00000000000000e+00
+16712 16712 1.00000000000000e+00
+16713 16713 1.00000000000000e+00
+16714 16714 1.00000000000000e+00
+16715 16715 1.00000000000000e+00
+16716 16716 1.00000000000000e+00
+16717 16717 1.00000000000000e+00
+16718 16718 1.00000000000000e+00
+16719 16719 1.00000000000000e+00
+16720 16720 1.00000000000000e+00
+16721 16721 1.00000000000000e+00
+16722 16722 1.00000000000000e+00
+16723 16723 1.00000000000000e+00
+16724 16724 1.00000000000000e+00
+16725 16725 1.00000000000000e+00
+16726 16726 1.00000000000000e+00
+16727 16727 1.00000000000000e+00
+16728 3261 -4.71154979898933e-05
+16728 3285 -3.40800829606908e-05
+16728 3837 -7.66819923937577e-04
+16728 3861 -1.09952822002806e-01
+16728 3885 -2.45488223812454e-01
+16728 3909 -5.17816687505499e-02
+16728 3933 -8.35721701630065e-05
+16728 4437 -8.21777190579343e-02
+16728 4461 -1.97095422806589e+00
+16728 4485 -4.25765599427586e+00
+16728 4509 -1.18550249725813e+00
+16728 4533 -3.39204386699666e-02
+16728 5013 -1.80659238066758e-05
+16728 5037 -1.94900128605114e-01
+16728 5061 -3.78383013424038e+00
+16728 5085 -8.86448444528996e+00
+16728 5109 -2.30331252695497e+00
+16728 5133 -6.02435661366246e-02
+16728 5613 -8.76502208940866e-06
+16728 5637 -4.20503355344793e-02
+16728 5661 -9.93116571711667e-01
+16728 5685 -2.01599738264802e+00
+16728 5709 -5.94848422720122e-01
+16728 5733 -5.56934197282919e-03
+16728 6237 -6.22249116570460e-07
+16728 6261 -1.02953049434358e-02
+16728 6285 -4.94140797644577e-02
+16728 6309 -1.20177584135244e-02
+16728 15864 2.39653598908867e-02
+16728 15888 1.81741071819453e-01
+16728 15912 3.89411284935657e-01
+16728 15936 1.73589216340481e-01
+16728 15960 2.19273960211435e-02
+16728 16272 1.82360956766191e-01
+16728 16296 1.39759114541159e+00
+16728 16320 3.02350107634498e+00
+16728 16344 1.34235070311272e+00
+16728 16368 1.68550846191473e-01
+16728 16728 7.61989303799175e+00
+16728 16680 3.91566460757746e-01
+16728 16704 3.03214513306494e+00
+16728 16752 2.92511695842663e+00
+16728 16776 3.64809417098168e-01
+16728 17088 1.72911645427776e-01
+16728 17112 1.34221337297528e+00
+16728 17136 2.93408796318908e+00
+16728 17160 1.28620340208262e+00
+16728 17184 1.58909152704612e-01
+16728 17496 2.16030320562830e-02
+16728 17520 1.67896628710375e-01
+16728 17544 3.67058006646683e-01
+16728 17568 1.59552391082956e-01
+16728 17592 1.95169726494283e-02
+16729 16729 1.00000000000000e+00
+16730 16730 1.00000000000000e+00
+16731 16731 1.00000000000000e+00
+16732 16732 1.00000000000000e+00
+16733 16733 1.00000000000000e+00
+16734 16734 1.00000000000000e+00
+16735 16735 1.00000000000000e+00
+16736 16736 1.00000000000000e+00
+16737 16737 1.00000000000000e+00
+16738 16738 1.00000000000000e+00
+16739 16739 1.00000000000000e+00
+16740 16740 1.00000000000000e+00
+16741 16741 1.00000000000000e+00
+16742 16742 1.00000000000000e+00
+16743 16743 1.00000000000000e+00
+16744 16744 1.00000000000000e+00
+16745 16745 1.00000000000000e+00
+16746 16746 1.00000000000000e+00
+16747 16747 1.00000000000000e+00
+16748 16748 1.00000000000000e+00
+16749 16749 1.00000000000000e+00
+16750 16750 1.00000000000000e+00
+16751 16751 1.00000000000000e+00
+16752 3861 -9.44207889060296e-04
+16752 3885 -3.11108491462272e-02
+16752 3909 -1.95621366677711e-02
+16752 3933 -1.93029350231713e-04
+16752 4437 -2.47764597396860e-07
+16752 4461 -1.41157639159402e-01
+16752 4485 -1.30451795486918e+00
+16752 4509 -1.56150964536207e+00
+16752 4533 -1.98701968048536e-01
+16752 4557 -1.42313807385484e-03
+16752 5037 -1.79342829018024e-03
+16752 5061 -6.48829834041628e-01
+16752 5085 -6.23407982509964e+00
+16752 5109 -6.93663822977327e+00
+16752 5133 -8.49994985456520e-01
+16752 5157 -7.58954126479118e-03
+16752 5637 -2.41400275343918e-03
+16752 5661 -3.52156070294230e-01
+16752 5685 -3.39171852619204e+00
+16752 5709 -3.67439368781378e+00
+16752 5733 -5.08138615513806e-01
+16752 5757 -6.05453066284458e-04
+16752 6237 -1.40505858852180e-07
+16752 6261 -1.26258116673755e-02
+16752 6285 -2.06892058201994e-01
+16752 6309 -2.24619371477821e-01
+16752 6333 -2.16163911218316e-02
+16752 6885 -1.22463021456102e-05
+16752 6909 -2.10501275725719e-04
+16752 6933 -8.91149563795812e-06
+16752 15888 2.14699080639766e-02
+16752 15912 1.73589216340481e-01
+16752 15936 3.93380472821893e-01
+16752 15960 1.71998497763053e-01
+16752 15984 2.10722284196199e-02
+16752 16296 1.67036829586704e-01
+16752 16320 1.34235070311272e+00
+16752 16344 3.02716923220478e+00
+16752 16368 1.32747883898368e+00
+16752 16392 1.63318863554444e-01
+16752 16752 7.55985454896849e+00
+16752 16704 3.66469822508475e-01
+16752 16728 2.92511695842663e+00
+16752 16776 2.88497387994911e+00
+16752 16800 3.56434052889094e-01
+16752 17112 1.62641697816040e-01
+16752 17136 1.28620340208262e+00
+16752 17160 2.86118619082832e+00
+16752 17184 1.25962880977218e+00
+16752 17208 1.55998049738430e-01
+16752 17520 2.03711251213107e-02
+16752 17544 1.59552391082956e-01
+16752 17568 3.51884712477780e-01
+16752 17592 1.55035990460178e-01
+16752 17616 1.92420249656163e-02
+16753 16753 1.00000000000000e+00
+16754 16754 1.00000000000000e+00
+16755 16755 1.00000000000000e+00
+16756 16756 1.00000000000000e+00
+16757 16757 1.00000000000000e+00
+16758 16758 1.00000000000000e+00
+16759 16759 1.00000000000000e+00
+16760 16760 1.00000000000000e+00
+16761 16761 1.00000000000000e+00
+16762 16762 1.00000000000000e+00
+16763 16763 1.00000000000000e+00
+16764 16764 1.00000000000000e+00
+16765 16765 1.00000000000000e+00
+16766 16766 1.00000000000000e+00
+16767 16767 1.00000000000000e+00
+16768 16768 1.00000000000000e+00
+16769 16769 1.00000000000000e+00
+16770 16770 1.00000000000000e+00
+16771 16771 1.00000000000000e+00
+16772 16772 1.00000000000000e+00
+16773 16773 1.00000000000000e+00
+16774 16774 1.00000000000000e+00
+16775 16775 1.00000000000000e+00
+16776 3885 -4.73461040574712e-04
+16776 3909 -1.98398564923316e-03
+16776 3933 -4.68209319752308e-05
+16776 4461 -4.77885378091524e-05
+16776 4485 -1.18129358804485e-01
+16776 4509 -5.43816655026182e-01
+16776 4533 -3.13158933648111e-01
+16776 4557 -9.94001768869187e-03
+16776 4581 -2.31168330062660e-07
+16776 5061 -1.50083400241686e-02
+16776 5085 -1.32965709172447e+00
+16776 5109 -5.76875780633052e+00
+16776 5133 -3.09628035087762e+00
+16776 5157 -1.90496251635002e-01
+16776 5181 -1.52153242486531e-04
+16776 5661 -3.58048723393150e-02
+16776 5685 -1.48988839847489e+00
+16776 5709 -7.13291989148017e+00
+16776 5733 -3.75690140381852e+00
+16776 5757 -2.26074176801015e-01
+16776 5781 -2.84457677356845e-05
+16776 6261 -2.75454565147807e-03
+16776 6285 -2.35972834052833e-01
+16776 6309 -9.98666130461227e-01
+16776 6333 -5.34791752860120e-01
+16776 6357 -2.21346096836279e-02
+16776 6885 -6.59348435444707e-05
+16776 6909 -7.22537427582622e-03
+16776 6933 -6.88640208816359e-03
+16776 6957 -2.63632843519916e-06
+16776 15912 2.19273960211435e-02
+16776 15936 1.71998497763053e-01
+16776 15960 3.80306606051648e-01
+16776 15984 1.69183134944827e-01
+16776 16008 2.12235553165868e-02
+16776 16320 1.68550846191473e-01
+16776 16344 1.32747883898368e+00
+16776 16368 2.94399814662349e+00
+16776 16392 1.30265738846123e+00
+16776 16416 1.62345483560861e-01
+16776 16776 7.41816968014227e+00
+16776 16728 3.64809417098168e-01
+16776 16752 2.88497387994911e+00
+16776 16800 2.82739787882992e+00
+16776 16824 3.50415416818372e-01
+16776 17136 1.58909152704612e-01
+16776 17160 1.25962880977218e+00
+16776 17184 2.80987646010898e+00
+16776 17208 1.24398624531148e+00
+16776 17232 1.54998511589436e-01
+16776 17544 1.95169726494283e-02
+16776 17568 1.55035990460178e-01
+16776 17592 3.46776184423020e-01
+16776 17616 1.54515349157387e-01
+16776 17640 1.93868123237305e-02
+16777 16777 1.00000000000000e+00
+16778 16778 1.00000000000000e+00
+16779 16779 1.00000000000000e+00
+16780 16780 1.00000000000000e+00
+16781 16781 1.00000000000000e+00
+16782 16782 1.00000000000000e+00
+16783 16783 1.00000000000000e+00
+16784 16784 1.00000000000000e+00
+16785 16785 1.00000000000000e+00
+16786 16786 1.00000000000000e+00
+16787 16787 1.00000000000000e+00
+16788 16788 1.00000000000000e+00
+16789 16789 1.00000000000000e+00
+16790 16790 1.00000000000000e+00
+16791 16791 1.00000000000000e+00
+16792 16792 1.00000000000000e+00
+16793 16793 1.00000000000000e+00
+16794 16794 1.00000000000000e+00
+16795 16795 1.00000000000000e+00
+16796 16796 1.00000000000000e+00
+16797 16797 1.00000000000000e+00
+16798 16798 1.00000000000000e+00
+16799 16799 1.00000000000000e+00
+16800 3909 -4.73650354579950e-07
+16800 3933 -2.45870515439590e-07
+16800 4485 -2.50664090970469e-04
+16800 4509 -5.66160552656316e-02
+16800 4533 -1.19803551127479e-01
+16800 4557 -1.87272890764834e-02
+16800 4581 -1.46666927100903e-06
+16800 5085 -6.10846835017304e-02
+16800 5109 -1.44359395821833e+00
+16800 5133 -3.07599406256264e+00
+16800 5157 -8.56623399539284e-01
+16800 5181 -2.11921539795369e-02
+16800 5661 -2.31930704160451e-05
+16800 5685 -1.98152836711837e-01
+16800 5709 -3.82742487958766e+00
+16800 5733 -8.67746750985504e+00
+16800 5757 -2.14962332383441e+00
+16800 5781 -5.64564483220395e-02
+16800 6261 -1.96401349981372e-05
+16800 6285 -6.23061972031637e-02
+16800 6309 -1.33991019064061e+00
+16800 6333 -2.69588979393633e+00
+16800 6357 -7.65783553595130e-01
+16800 6381 -7.75557904544779e-03
+16800 6885 -8.00448419937305e-05
+16800 6909 -3.16680109148218e-02
+16800 6933 -9.77203966759714e-02
+16800 6957 -2.17405842911066e-02
+16800 6981 -3.72328364354000e-09
+16800 7533 -5.34096308434300e-08
+16800 7557 -3.49041330603600e-08
+16800 15936 2.10722284196199e-02
+16800 15960 1.69183134944827e-01
+16800 15984 3.82151122065949e-01
+16800 16008 1.70902255590108e-01
+16800 16032 2.15020085809401e-02
+16800 16344 1.63318863554444e-01
+16800 16368 1.30265738846123e+00
+16800 16392 2.92560588267318e+00
+16800 16416 1.30841906282309e+00
+16800 16440 1.64759282144908e-01
+16800 16800 7.31846347239756e+00
+16800 16752 3.56434052889094e-01
+16800 16776 2.82739787882992e+00
+16800 16824 2.82319266893073e+00
+16800 16848 3.55382750414297e-01
+16800 17160 1.55998049738430e-01
+16800 17184 1.24398624531148e+00
+16800 17208 2.79022848518567e+00
+16800 17232 1.23701104642259e+00
+16800 17256 1.54254250016209e-01
+16800 17568 1.92420249656163e-02
+16800 17592 1.54515349157387e-01
+16800 17616 3.48306772694070e-01
+16800 17640 1.53050251489984e-01
+16800 17664 1.88757505487653e-02
+16801 16801 1.00000000000000e+00
+16802 16802 1.00000000000000e+00
+16803 16803 1.00000000000000e+00
+16804 16804 1.00000000000000e+00
+16805 16805 1.00000000000000e+00
+16806 16806 1.00000000000000e+00
+16807 16807 1.00000000000000e+00
+16808 16808 1.00000000000000e+00
+16809 16809 1.00000000000000e+00
+16810 16810 1.00000000000000e+00
+16811 16811 1.00000000000000e+00
+16812 16812 1.00000000000000e+00
+16813 16813 1.00000000000000e+00
+16814 16814 1.00000000000000e+00
+16815 16815 1.00000000000000e+00
+16816 16816 1.00000000000000e+00
+16817 16817 1.00000000000000e+00
+16818 16818 1.00000000000000e+00
+16819 16819 1.00000000000000e+00
+16820 16820 1.00000000000000e+00
+16821 16821 1.00000000000000e+00
+16822 16822 1.00000000000000e+00
+16823 16823 1.00000000000000e+00
+16824 4509 -3.98715594254582e-04
+16824 4533 -1.36571193791511e-02
+16824 4557 -5.50462311142662e-03
+16824 4581 -2.39915213309629e-06
+16824 5085 -7.06933854300000e-10
+16824 5109 -9.45460057249820e-02
+16824 5133 -8.81184445223637e-01
+16824 5157 -1.02406696179595e+00
+16824 5181 -1.17769960030617e-01
+16824 5205 -5.47483143415965e-04
+16824 5685 -1.49333307771918e-03
+16824 5709 -6.27007469647813e-01
+16824 5733 -5.69463606063275e+00
+16824 5757 -6.07799992998208e+00
+16824 5781 -7.15791459635699e-01
+16824 5805 -6.31400259870865e-03
+16824 6285 -3.48186344649801e-03
+16824 6309 -4.46824974409305e-01
+16824 6333 -4.18131636633917e+00
+16824 6357 -4.40199915461408e+00
+16824 6381 -5.70727423507643e-01
+16824 6405 -8.94813647991456e-04
+16824 6885 -1.69496349620301e-05
+16824 6909 -3.01220400623413e-02
+16824 6933 -3.63297660228321e-01
+16824 6957 -3.62480097222250e-01
+16824 6981 -3.76488888679949e-02
+16824 7533 -1.88504826688786e-04
+16824 7557 -1.33629378071347e-03
+16824 7581 -4.34911550910307e-05
+16824 15960 2.12235553165868e-02
+16824 15984 1.70902255590108e-01
+16824 16008 3.85976030264325e-01
+16824 16032 1.68889384934545e-01
+16824 16056 2.07203376526960e-02
+16824 16368 1.62345483560861e-01
+16824 16392 1.30841906282309e+00
+16824 16416 2.95969446118355e+00
+16824 16440 1.30383898179603e+00
+16824 16824 7.38973295076625e+00
+16824 16464 1.61200463304095e-01
+16824 16776 3.50415416818372e-01
+16824 16800 2.82319266893073e+00
+16824 16848 2.83430511093286e+00
+16824 16872 3.53193527318905e-01
+16824 17184 1.54998511589436e-01
+16824 17208 1.23701104642259e+00
+16824 17232 2.77817258011401e+00
+16824 17256 1.23744127312553e+00
+16824 17280 1.55106068265170e-01
+16824 17592 1.93868123237305e-02
+16824 17616 1.53050251489984e-01
+16824 17640 3.40595559996941e-01
+16824 17664 1.52289957766921e-01
+16824 17688 1.91967388929648e-02
+16825 16825 1.00000000000000e+00
+16826 16826 1.00000000000000e+00
+16827 16827 1.00000000000000e+00
+16828 16828 1.00000000000000e+00
+16829 16829 1.00000000000000e+00
+16830 16830 1.00000000000000e+00
+16831 16831 1.00000000000000e+00
+16832 16832 1.00000000000000e+00
+16833 16833 1.00000000000000e+00
+16834 16834 1.00000000000000e+00
+16835 16835 1.00000000000000e+00
+16836 16836 1.00000000000000e+00
+16837 16837 1.00000000000000e+00
+16838 16838 1.00000000000000e+00
+16839 16839 1.00000000000000e+00
+16840 16840 1.00000000000000e+00
+16841 16841 1.00000000000000e+00
+16842 16842 1.00000000000000e+00
+16843 16843 1.00000000000000e+00
+16844 16844 1.00000000000000e+00
+16845 16845 1.00000000000000e+00
+16846 16846 1.00000000000000e+00
+16847 16847 1.00000000000000e+00
+16848 4533 -1.04917510642634e-04
+16848 4557 -3.14289429538529e-04
+16848 4581 -5.41995950758410e-07
+16848 5109 -8.41167939047497e-06
+16848 5133 -7.08050616192471e-02
+16848 5157 -3.28645579300924e-01
+16848 5181 -1.66742076918547e-01
+16848 5205 -3.33212378989233e-03
+16848 5709 -1.23074871066053e-02
+16848 5733 -1.14612630496385e+00
+16848 5757 -4.66363090861391e+00
+16848 5781 -2.44933938889458e+00
+16848 5805 -1.43978339114227e-01
+16848 5829 -8.49783613857499e-05
+16848 6309 -4.17062818071602e-02
+16848 6333 -1.71860913009058e+00
+16848 6357 -7.93340222138178e+00
+16848 6381 -3.96244886125038e+00
+16848 6405 -2.30669445532564e-01
+16848 6429 -3.43528606209371e-05
+16848 6909 -6.09418934663189e-03
+16848 6933 -3.76017434900469e-01
+16848 6957 -1.50118703445925e+00
+16848 6981 -7.80770559015156e-01
+16848 7005 -3.37284796292217e-02
+16848 7533 -9.06390528705463e-04
+16848 7557 -2.19885461768129e-02
+16848 7581 -1.53834825153153e-02
+16848 7605 -1.65162946727458e-05
+16848 15984 2.15020085809401e-02
+16848 16008 1.68889384934545e-01
+16848 16032 3.74771086606596e-01
+16848 16056 1.69856052940863e-01
+16848 16080 2.17436755825198e-02
+16848 16392 1.64759282144908e-01
+16848 16416 1.30383898179603e+00
+16848 16440 2.90903241462974e+00
+16848 16848 7.36002245700799e+00
+16848 16464 1.30506473169342e+00
+16848 16488 1.65065719619256e-01
+16848 16800 3.55382750414297e-01
+16848 16824 2.83430511093286e+00
+16848 16872 2.82694718723965e+00
+16848 16896 3.53543269490995e-01
+16848 17208 1.54254250016209e-01
+16848 17232 1.23744127312553e+00
+16848 17256 2.79178445855523e+00
+16848 17280 1.24375673824566e+00
+16848 17304 1.55833116296242e-01
+16848 17616 1.88757505487653e-02
+16848 17640 1.52289957766921e-01
+16848 17664 3.45459097587969e-01
+16848 17688 1.54529054578924e-01
+16848 17712 1.94355247517661e-02
+16849 16849 1.00000000000000e+00
+16850 16850 1.00000000000000e+00
+16851 16851 1.00000000000000e+00
+16852 16852 1.00000000000000e+00
+16853 16853 1.00000000000000e+00
+16854 16854 1.00000000000000e+00
+16855 16855 1.00000000000000e+00
+16856 16856 1.00000000000000e+00
+16857 16857 1.00000000000000e+00
+16858 16858 1.00000000000000e+00
+16859 16859 1.00000000000000e+00
+16860 16860 1.00000000000000e+00
+16861 16861 1.00000000000000e+00
+16862 16862 1.00000000000000e+00
+16863 16863 1.00000000000000e+00
+16864 16864 1.00000000000000e+00
+16865 16865 1.00000000000000e+00
+16866 16866 1.00000000000000e+00
+16867 16867 1.00000000000000e+00
+16868 16868 1.00000000000000e+00
+16869 16869 1.00000000000000e+00
+16870 16870 1.00000000000000e+00
+16871 16871 1.00000000000000e+00
+16872 5133 -7.26889822415073e-05
+16872 5157 -3.06138592859684e-02
+16872 5181 -5.53882674114007e-02
+16872 5205 -5.13431393213654e-03
+16872 5733 -4.65170820385606e-02
+16872 5757 -1.08618188199010e+00
+16872 5781 -2.25808474336958e+00
+16872 5805 -6.12047630761590e-01
+16872 5829 -1.24654553297145e-02
+16872 6309 -2.95151509768484e-05
+16872 6333 -2.13828212972154e-01
+16872 6357 -3.97166244870862e+00
+16872 6381 -8.57804786423755e+00
+16872 6405 -2.02840327989391e+00
+16872 6429 -5.22627933309477e-02
+16872 6909 -4.25390998073086e-05
+16872 6933 -9.46399802028848e-02
+16872 6957 -1.83374722468623e+00
+16872 6981 -3.65852053446198e+00
+16872 7005 -9.90842359720003e-01
+16872 7029 -1.05393873554722e-02
+16872 7533 -8.00980653817294e-04
+16872 7557 -7.95778024835313e-02
+16872 7581 -1.85183137996139e-01
+16872 7605 -4.05088426167660e-02
+16872 7629 -7.02160393795440e-07
+16872 8181 -2.24011129438341e-05
+16872 8205 -1.04073115619178e-05
+16872 16008 2.07203376526960e-02
+16872 16032 1.69856052940863e-01
+16872 16056 3.90222179029296e-01
+16872 16080 1.73386830555212e-01
+16872 16104 2.16030320562831e-02
+16872 16416 1.61200463304095e-01
+16872 16440 1.30506473169342e+00
+16872 16872 7.37694384582174e+00
+16872 16464 2.97014860592264e+00
+16872 16488 1.33184939331856e+00
+16872 16512 1.67896628710379e-01
+16872 16824 3.53193527318905e-01
+16872 16848 2.82694718723965e+00
+16872 16896 2.88240510455083e+00
+16872 16920 3.67058006646698e-01
+16872 17232 1.55106068265170e-01
+16872 17256 1.24375673824566e+00
+16872 17280 2.80798832008805e+00
+16872 17304 1.26154202951682e+00
+16872 17328 1.59552391082960e-01
+16872 17640 1.91967388929648e-02
+16872 17664 1.54529054578924e-01
+16872 17688 3.49682107570650e-01
+16872 17712 1.55809989604778e-01
+16872 17736 1.95169726494284e-02
+16873 16873 1.00000000000000e+00
+16874 16874 1.00000000000000e+00
+16875 16875 1.00000000000000e+00
+16876 16876 1.00000000000000e+00
+16877 16877 1.00000000000000e+00
+16878 16878 1.00000000000000e+00
+16879 16879 1.00000000000000e+00
+16880 16880 1.00000000000000e+00
+16881 16881 1.00000000000000e+00
+16882 16882 1.00000000000000e+00
+16883 16883 1.00000000000000e+00
+16884 16884 1.00000000000000e+00
+16885 16885 1.00000000000000e+00
+16886 16886 1.00000000000000e+00
+16887 16887 1.00000000000000e+00
+16888 16888 1.00000000000000e+00
+16889 16889 1.00000000000000e+00
+16890 16890 1.00000000000000e+00
+16891 16891 1.00000000000000e+00
+16892 16892 1.00000000000000e+00
+16893 16893 1.00000000000000e+00
+16894 16894 1.00000000000000e+00
+16895 16895 1.00000000000000e+00
+16896 5157 -1.52757987606128e-04
+16896 5181 -5.05902499824354e-03
+16896 5205 -1.21445491145518e-03
+16896 5757 -6.23693251947756e-02
+16896 5781 -5.99376677632788e-01
+16896 5805 -6.58101042165483e-01
+16896 5829 -6.57338060232606e-02
+16896 5853 -1.43822464621434e-04
+16896 6333 -1.17815807475608e-03
+16896 6357 -6.13801984343046e-01
+16896 6381 -5.24984454072558e+00
+16896 6405 -5.35935612814163e+00
+16896 6429 -6.07890324229403e-01
+16896 6453 -5.15015269182187e-03
+16896 6933 -4.85672977793043e-03
+16896 6957 -5.74376861200477e-01
+16896 6981 -5.25957862952256e+00
+16896 7005 -5.31142189658318e+00
+16896 7029 -6.39847535218470e-01
+16896 7053 -1.29536421402410e-03
+16896 7533 -1.53172366412970e-04
+16896 7557 -6.33960961775749e-02
+16896 7581 -6.28313393694458e-01
+16896 7605 -5.92579518169758e-01
+16896 7629 -6.46783074102996e-02
+16896 8181 -1.31385706373235e-03
+16896 8205 -5.16812501595184e-03
+16896 8229 -1.51013638628266e-04
+16896 16032 2.17436755825198e-02
+16896 16056 1.73386830555212e-01
+16896 16080 3.89017067783710e-01
+16896 16104 1.72911645427777e-01
+16896 16128 2.16248793006611e-02
+16896 16440 1.65065719619256e-01
+16896 16896 7.59293535998898e+00
+16896 16464 1.33184939331856e+00
+16896 16488 3.01906849351882e+00
+16896 16512 1.34221337297530e+00
+16896 16536 1.67656714533442e-01
+16896 16848 3.53543269490995e-01
+16896 16872 2.88240510455083e+00
+16896 16920 2.93408796318916e+00
+16896 16944 3.66463984150578e-01
+16896 17256 1.55833116296242e-01
+16896 17280 1.26154202951682e+00
+16896 17304 2.87066983306136e+00
+16896 17328 1.28620340208265e+00
+16896 17352 1.61998459437698e-01
+16896 17664 1.94355247517661e-02
+16896 17688 1.55809989604778e-01
+16896 17712 3.51917402669346e-01
+16896 17736 1.58909152704614e-01
+16896 17760 2.02103155267251e-02
+16897 16897 1.00000000000000e+00
+16898 16898 1.00000000000000e+00
+16899 16899 1.00000000000000e+00
+16900 16900 1.00000000000000e+00
+16901 16901 1.00000000000000e+00
+16902 16902 1.00000000000000e+00
+16903 16903 1.00000000000000e+00
+16904 16904 1.00000000000000e+00
+16905 16905 1.00000000000000e+00
+16906 16906 1.00000000000000e+00
+16907 16907 1.00000000000000e+00
+16908 16908 1.00000000000000e+00
+16909 16909 1.00000000000000e+00
+16910 16910 1.00000000000000e+00
+16911 16911 1.00000000000000e+00
+16912 16912 1.00000000000000e+00
+16913 16913 1.00000000000000e+00
+16914 16914 1.00000000000000e+00
+16915 16915 1.00000000000000e+00
+16916 16916 1.00000000000000e+00
+16917 16917 1.00000000000000e+00
+16918 16918 1.00000000000000e+00
+16919 16919 1.00000000000000e+00
+16920 5181 -8.76502208940870e-06
+16920 5205 -1.80659238066759e-05
+16920 5757 -6.22249116570490e-07
+16920 5781 -4.20503355344799e-02
+16920 5805 -1.94900128605115e-01
+16920 5829 -8.21777190579347e-02
+16920 5853 -7.66819923937588e-04
+16920 6357 -1.02953049434362e-02
+16920 6381 -9.93116571711702e-01
+16920 6405 -3.78383013424043e+00
+16920 6429 -1.97095422806588e+00
+16920 6453 -1.09952822002810e-01
+16920 6477 -4.71154979898955e-05
+16920 6957 -4.94140797644584e-02
+16920 6981 -2.01599738264807e+00
+16920 7005 -8.86448444529007e+00
+16920 7029 -4.25765599427588e+00
+16920 7053 -2.45488223812449e-01
+16920 7077 -3.40800829606924e-05
+16920 7557 -1.20177584135245e-02
+16920 7581 -5.94848422720130e-01
+16920 7605 -2.30331252695498e+00
+16920 7629 -1.18550249725812e+00
+16920 7653 -5.17816687505491e-02
+16920 8181 -5.56934197282925e-03
+16920 8205 -6.02435661366244e-02
+16920 8229 -3.39204386699661e-02
+16920 8253 -8.35721701630052e-05
+16920 16056 2.16030320562831e-02
+16920 16080 1.72911645427777e-01
+16920 16104 3.91566460757748e-01
+16920 16128 1.82360956766196e-01
+16920 16152 2.39653598908879e-02
+16920 16920 7.61989303799183e+00
+16920 16464 1.67896628710379e-01
+16920 16488 1.34221337297530e+00
+16920 16512 3.03214513306497e+00
+16920 16536 1.39759114541161e+00
+16920 16560 1.81741071819456e-01
+16920 16872 3.67058006646698e-01
+16920 16896 2.93408796318916e+00
+16920 16944 3.02350107634497e+00
+16920 16968 3.89411284935651e-01
+16920 17280 1.59552391082960e-01
+16920 17304 1.28620340208265e+00
+16920 17328 2.92511695842667e+00
+16920 17352 1.34235070311272e+00
+16920 17376 1.73589216340478e-01
+16920 17688 1.95169726494284e-02
+16920 17712 1.58909152704614e-01
+16920 17736 3.64809417098173e-01
+16920 17760 1.68550846191473e-01
+16920 17784 2.19273960211432e-02
+16921 16921 1.00000000000000e+00
+16922 16922 1.00000000000000e+00
+16923 16923 1.00000000000000e+00
+16924 16924 1.00000000000000e+00
+16925 16925 1.00000000000000e+00
+16926 16926 1.00000000000000e+00
+16927 16927 1.00000000000000e+00
+16928 16928 1.00000000000000e+00
+16929 16929 1.00000000000000e+00
+16930 16930 1.00000000000000e+00
+16931 16931 1.00000000000000e+00
+16932 16932 1.00000000000000e+00
+16933 16933 1.00000000000000e+00
+16934 16934 1.00000000000000e+00
+16935 16935 1.00000000000000e+00
+16936 16936 1.00000000000000e+00
+16937 16937 1.00000000000000e+00
+16938 16938 1.00000000000000e+00
+16939 16939 1.00000000000000e+00
+16940 16940 1.00000000000000e+00
+16941 16941 1.00000000000000e+00
+16942 16942 1.00000000000000e+00
+16943 16943 1.00000000000000e+00
+16944 5781 -1.67984462863558e-05
+16944 5805 -1.62013567064916e-02
+16944 5829 -2.30088250458344e-02
+16944 5853 -9.09969541231176e-04
+16944 6381 -3.45663066015178e-02
+16944 6405 -8.23602821426855e-01
+16944 6429 -1.71506375002891e+00
+16944 6453 -4.60405244955105e-01
+16944 6477 -8.24395122984934e-03
+16944 6957 -3.38155601221637e-05
+16944 6981 -2.32535662013764e-01
+16944 7005 -4.23415220768883e+00
+16944 7029 -8.88021871768788e+00
+16944 7053 -2.11930396500521e+00
+16944 7077 -5.81648819907573e-02
+16944 7557 -8.79221394985312e-05
+16944 7581 -1.43723768517554e-01
+16944 7605 -2.65973954927667e+00
+16944 7629 -5.34832249232643e+00
+16944 7653 -1.42191071427140e+00
+16944 7677 -1.62745062553763e-02
+16944 8181 -3.82397426018653e-03
+16944 8205 -1.90281153849868e-01
+16944 8229 -3.96364039902626e-01
+16944 8253 -8.96751616157923e-02
+16944 8277 -1.13997207202415e-05
+16944 8805 -1.21126830761592e-06
+16944 8829 -4.57831467629268e-04
+16944 8853 -1.45918259762635e-04
+16944 16080 2.16248793006611e-02
+16944 16104 1.82360956766196e-01
+16944 16128 4.32776592204251e-01
+16944 16152 2.06685258161089e-01
+16944 16176 2.77059546493843e-02
+16944 16944 8.04427054762158e+00
+16944 16488 1.67656714533442e-01
+16944 16512 1.39759114541161e+00
+16944 16536 3.28472507352781e+00
+16944 16560 1.56380912680985e+00
+16944 16584 2.09211209883002e-01
+16944 16896 3.66463984150578e-01
+16944 16920 3.02350107634497e+00
+16944 16968 3.34654915774403e+00
+16944 16992 4.47226004500340e-01
+16944 17304 1.61998459437698e-01
+16944 17328 1.34235070311272e+00
+16944 17352 3.14169525100726e+00
+16944 17376 1.50343418584935e+00
+16944 17400 2.02269330121856e-01
+16944 17712 2.02103155267251e-02
+16944 17736 1.68550846191473e-01
+16944 17760 3.97019136574115e-01
+16944 17784 1.91591522920964e-01
+16944 17808 2.59704847090979e-02
+16945 16945 1.00000000000000e+00
+16946 16946 1.00000000000000e+00
+16947 16947 1.00000000000000e+00
+16948 16948 1.00000000000000e+00
+16949 16949 1.00000000000000e+00
+16950 16950 1.00000000000000e+00
+16951 16951 1.00000000000000e+00
+16952 16952 1.00000000000000e+00
+16953 16953 1.00000000000000e+00
+16954 16954 1.00000000000000e+00
+16955 16955 1.00000000000000e+00
+16956 16956 1.00000000000000e+00
+16957 16957 1.00000000000000e+00
+16958 16958 1.00000000000000e+00
+16959 16959 1.00000000000000e+00
+16960 16960 1.00000000000000e+00
+16961 16961 1.00000000000000e+00
+16962 16962 1.00000000000000e+00
+16963 16963 1.00000000000000e+00
+16964 16964 1.00000000000000e+00
+16965 16965 1.00000000000000e+00
+16966 16966 1.00000000000000e+00
+16967 16967 1.00000000000000e+00
+16968 5805 -4.99741004108008e-05
+16968 5829 -1.46560958747291e-03
+16968 5853 -1.91637324661207e-04
+16968 6405 -4.19819363012443e-02
+16968 6429 -4.41673679756457e-01
+16968 6453 -4.87379513125258e-01
+16968 6477 -3.82846590392055e-02
+16968 6501 -1.30936415916661e-05
+16968 6981 -9.54445888291205e-04
+16968 7005 -6.31129289373409e-01
+16968 7029 -5.30453705292577e+00
+16968 7053 -5.28864690628285e+00
+16968 7077 -5.06189018822975e-01
+16968 7101 -3.42397024350178e-03
+16968 7581 -6.95654844075527e-03
+16968 7605 -8.20278751359092e-01
+16968 7629 -7.42284113932560e+00
+16968 7653 -6.52746285474579e+00
+16968 7677 -5.98577294457413e-01
+16968 7701 -1.52551360576185e-03
+16968 8181 -6.49930412057381e-04
+16968 8205 -1.44830657291904e-01
+16968 8229 -1.20828029646939e+00
+16968 8253 -8.51279404173907e-01
+16968 8277 -8.38121177760765e-02
+16968 8301 -9.70816716290000e-10
+16968 8805 -5.13822501368428e-06
+16968 8829 -5.20445063742408e-03
+16968 8853 -1.07430284427305e-02
+16968 8877 -2.99572453049502e-04
+16968 16104 2.39653598908879e-02
+16968 16128 2.06685258161089e-01
+16968 16152 4.87437578200071e-01
+16968 16176 1.91531594273673e-01
+16968 16200 2.01769439190340e-02
+16968 16968 8.85982970989343e+00
+16968 16512 1.81741071819456e-01
+16968 16536 1.56380912680985e+00
+16968 16560 3.67969130569637e+00
+16968 16584 1.43912834252728e+00
+16968 16608 1.50570875748814e-01
+16968 16920 3.89411284935651e-01
+16968 16944 3.34654915774403e+00
+16968 16992 3.04811342980968e+00
+16968 17016 3.14802352952066e-01
+16968 17328 1.73589216340478e-01
+16968 17352 1.50343418584935e+00
+16968 17376 3.54045363333220e+00
+16968 17400 1.33129786065528e+00
+16968 17424 1.30555135041961e-01
+16968 17736 2.19273960211432e-02
+16968 17760 1.91591522920964e-01
+16968 17784 4.52628160109030e-01
+16968 17808 1.64573973805674e-01
+16968 17832 1.51730087423207e-02
+16969 16969 1.00000000000000e+00
+16970 16970 1.00000000000000e+00
+16971 16971 1.00000000000000e+00
+16972 16972 1.00000000000000e+00
+16973 16973 1.00000000000000e+00
+16974 16974 1.00000000000000e+00
+16975 16975 1.00000000000000e+00
+16976 16976 1.00000000000000e+00
+16977 16977 1.00000000000000e+00
+16978 16978 1.00000000000000e+00
+16979 16979 1.00000000000000e+00
+16980 16980 1.00000000000000e+00
+16981 16981 1.00000000000000e+00
+16982 16982 1.00000000000000e+00
+16983 16983 1.00000000000000e+00
+16984 16984 1.00000000000000e+00
+16985 16985 1.00000000000000e+00
+16986 16986 1.00000000000000e+00
+16987 16987 1.00000000000000e+00
+16988 16988 1.00000000000000e+00
+16989 16989 1.00000000000000e+00
+16990 16990 1.00000000000000e+00
+16991 16991 1.00000000000000e+00
+16992 5829 -1.82286164144400e-08
+16992 5853 -2.68148023391800e-08
+16992 6405 -3.40300235706000e-09
+16992 6429 -3.00750972078247e-02
+16992 6453 -1.24457816678190e-01
+16992 6477 -3.30507753107734e-02
+16992 6501 -9.97392066839201e-05
+16992 7005 -9.62297346308554e-03
+16992 7029 -9.36190402441613e-01
+16992 7053 -2.99889266328810e+00
+16992 7077 -1.99097178969357e+00
+16992 7101 -8.67773264820844e-02
+16992 7605 -7.02222855708147e-02
+16992 7629 -2.34143120142445e+00
+16992 7653 -1.17788140657173e+01
+16992 7677 -8.81234700362108e+00
+16992 7701 -6.68357069655323e-02
+16992 8205 -2.67245997549215e-02
+16992 8229 -8.00085278224110e-01
+16992 8253 -5.46128485173967e+00
+16992 8277 -2.79768642905916e+00
+16992 8301 -1.50043593642070e-06
+16992 8805 -2.38387544049827e-06
+16992 8829 -2.25678303861428e-02
+16992 8853 -1.97918336106533e-01
+16992 8877 -2.00238148159735e-02
+16992 16128 2.77059546493843e-02
+16992 16152 1.91531594273673e-01
+16992 16176 4.54506170724276e-01
+16992 16200 2.88646002416831e-01
+16992 16992 9.81721687035791e+00
+16992 16536 2.09211209883002e-01
+16992 16560 1.43912834252728e+00
+16992 16584 3.81228929594187e+00
+16992 16608 2.99017165115084e+00
+16992 16944 4.47226004500340e-01
+16992 16968 3.04811342980968e+00
+16992 17016 7.92551584905691e+00
+16992 17352 2.02269330121856e-01
+16992 17376 1.33129786065528e+00
+16992 17400 3.53687360286308e+00
+16992 17424 3.01366476430747e+00
+16992 17760 2.59704847090979e-02
+16992 17784 1.64573973805674e-01
+16992 17808 3.85652247454580e-01
+16992 17832 2.94519280705986e-01
+16993 16993 1.00000000000000e+00
+16994 16994 1.00000000000000e+00
+16995 16995 1.00000000000000e+00
+16996 16996 1.00000000000000e+00
+16997 16997 1.00000000000000e+00
+16998 16998 1.00000000000000e+00
+16999 16999 1.00000000000000e+00
+17000 17000 1.00000000000000e+00
+17001 17001 1.00000000000000e+00
+17002 17002 1.00000000000000e+00
+17003 17003 1.00000000000000e+00
+17004 17004 1.00000000000000e+00
+17005 17005 1.00000000000000e+00
+17006 17006 1.00000000000000e+00
+17007 17007 1.00000000000000e+00
+17008 17008 1.00000000000000e+00
+17009 17009 1.00000000000000e+00
+17010 17010 1.00000000000000e+00
+17011 17011 1.00000000000000e+00
+17012 17012 1.00000000000000e+00
+17013 17013 1.00000000000000e+00
+17014 17014 1.00000000000000e+00
+17015 17015 1.00000000000000e+00
+17016 6429 -2.51866616999208e-06
+17016 6453 -6.72695047920784e-03
+17016 6477 -7.88146601817168e-03
+17016 6501 -1.07822922226178e-04
+17016 7029 -1.97720813716516e-02
+17016 7053 -7.35724208401044e-01
+17016 7077 -1.94760161133882e+00
+17016 7101 -1.49586861259656e-01
+17016 7605 -2.08381299950427e-05
+17016 7629 -1.98215657855400e-01
+17016 7653 -9.81224485046757e+00
+17016 7677 -1.38577901086800e+01
+17016 7701 -1.22992818690732e-01
+17016 8205 -1.19661164935188e-04
+17016 8229 -2.12057904827484e-01
+17016 8253 -7.28706157576676e+00
+17016 8277 -5.00898442642449e+00
+17016 8301 -2.99407615582734e-06
+17016 8805 -2.93151783220590e-07
+17016 8829 -2.06081244686780e-02
+17016 8853 -3.24429347867781e-01
+17016 8877 -3.79506224606006e-02
+17016 16152 2.01769439190340e-02
+17016 16176 2.88646002416831e-01
+17016 16200 4.36053397400423e-01
+17016 17016 1.46474152274493e+01
+17016 16560 1.50570875748814e-01
+17016 16584 2.99017165115085e+00
+17016 16608 4.92634717205998e+00
+17016 16968 3.14802352952066e-01
+17016 16992 7.92551584905691e+00
+17016 17376 1.30555135041961e-01
+17016 17400 3.01366476430747e+00
+17016 17424 5.11344358332120e+00
+17016 17784 1.51730087423207e-02
+17016 17808 2.94519280705986e-01
+17016 17832 4.82827500215728e-01
+17017 17017 1.00000000000000e+00
+17018 17018 1.00000000000000e+00
+17019 17019 1.00000000000000e+00
+17020 17020 1.00000000000000e+00
+17021 17021 1.00000000000000e+00
+17022 17022 1.00000000000000e+00
+17023 17023 1.00000000000000e+00
+17024 17024 1.00000000000000e+00
+17025 17025 1.00000000000000e+00
+17026 17026 1.00000000000000e+00
+17027 17027 1.00000000000000e+00
+17028 17028 1.00000000000000e+00
+17029 17029 1.00000000000000e+00
+17030 17030 1.00000000000000e+00
+17031 17031 1.00000000000000e+00
+17032 17032 1.00000000000000e+00
+17033 17033 1.00000000000000e+00
+17034 17034 1.00000000000000e+00
+17035 17035 1.00000000000000e+00
+17036 17036 1.00000000000000e+00
+17037 17037 1.00000000000000e+00
+17038 17038 1.00000000000000e+00
+17039 17039 1.00000000000000e+00
+17040 3213 -1.42105665122835e-02
+17040 3237 -2.65905112531984e-02
+17040 3261 -7.22506791617707e-06
+17040 3789 -2.27267444385334e-03
+17040 3813 -2.84652083002149e+00
+17040 3837 -2.55228025707649e+00
+17040 3861 -2.05692093069995e-02
+17040 4389 -8.37008468300366e-01
+17040 4413 -1.34003793834150e+01
+17040 4437 -4.33414068707040e+00
+17040 4461 -5.14093378669864e-02
+17040 4989 -1.54591739054221e+00
+17040 5013 -5.61186521115540e+00
+17040 5037 -9.47053835614428e-01
+17040 5061 -8.36244219545003e-03
+17040 5589 -8.48984408304495e-02
+17040 5613 -1.56683939199436e-01
+17040 5637 -1.67149292436564e-02
+17040 5661 -8.94809260414000e-09
+17040 6213 -2.82679919691200e-08
+17040 6237 -1.92421531558400e-08
+17040 16224 8.61664151815911e-01
+17040 16248 4.90225838751257e-01
+17040 16272 1.69696465266574e-02
+17040 17040 9.57031379276851e+00
+17040 16632 5.21571305960729e+00
+17040 16656 3.13883496231910e+00
+17040 16680 1.51708123575842e-01
+17040 17064 5.56573923087675e+00
+17040 17088 3.65880666997848e-01
+17040 17448 4.29875177865565e+00
+17040 17472 2.63307945879087e+00
+17040 17496 1.38201019846583e-01
+17040 17856 6.32423831578000e-01
+17040 17880 3.63786962869199e-01
+17040 17904 1.35928705943427e-02
+17041 17041 1.00000000000000e+00
+17042 17042 1.00000000000000e+00
+17043 17043 1.00000000000000e+00
+17044 17044 1.00000000000000e+00
+17045 17045 1.00000000000000e+00
+17046 17046 1.00000000000000e+00
+17047 17047 1.00000000000000e+00
+17048 17048 1.00000000000000e+00
+17049 17049 1.00000000000000e+00
+17050 17050 1.00000000000000e+00
+17051 17051 1.00000000000000e+00
+17052 17052 1.00000000000000e+00
+17053 17053 1.00000000000000e+00
+17054 17054 1.00000000000000e+00
+17055 17055 1.00000000000000e+00
+17056 17056 1.00000000000000e+00
+17057 17057 1.00000000000000e+00
+17058 17058 1.00000000000000e+00
+17059 17059 1.00000000000000e+00
+17060 17060 1.00000000000000e+00
+17061 17061 1.00000000000000e+00
+17062 17062 1.00000000000000e+00
+17063 17063 1.00000000000000e+00
+17064 3213 -7.39950019853676e-03
+17064 3237 -1.42217084326021e-02
+17064 3261 -5.73103372691874e-06
+17064 3789 -1.16143813803570e-03
+17064 3813 -1.64156849315697e+00
+17064 3837 -1.92125528213324e+00
+17064 3861 -1.13112689805212e-01
+17064 3885 -7.09905820190926e-04
+17064 4389 -4.56253711353295e-01
+17064 4413 -1.01403827040803e+01
+17064 4437 -7.61855577416926e+00
+17064 4461 -8.31720144615531e-01
+17064 4485 -8.02865271786982e-03
+17064 4989 -8.79965056906100e-01
+17064 5013 -5.86735061115188e+00
+17064 5037 -5.10178297208419e+00
+17064 5061 -7.67651190101427e-01
+17064 5085 -1.17783345955631e-03
+17064 5589 -5.65856354692896e-02
+17064 5613 -3.49286089514230e-01
+17064 5637 -4.28266688460056e-01
+17064 5661 -5.14144086384409e-02
+17064 6213 -2.23427793991182e-04
+17064 6237 -1.69124856312049e-03
+17064 6261 -6.02398997712603e-05
+17064 16224 4.90225838751257e-01
+17064 16248 5.07262721643464e-01
+17064 16272 1.66177589685158e-01
+17064 16296 2.45747508946320e-02
+17064 17064 9.38018160737697e+00
+17064 16632 3.13883496231910e+00
+17064 16656 3.89793934425661e+00
+17064 16680 1.42526502644428e+00
+17064 16704 2.04608133035225e-01
+17064 17040 5.56573923087675e+00
+17064 17088 3.36345328386543e+00
+17064 17112 4.74982653968493e-01
+17064 17448 2.63307945879087e+00
+17064 17472 3.45834867769262e+00
+17064 17496 1.38078276116627e+00
+17064 17520 2.06994670444980e-01
+17064 17856 3.63786962869199e-01
+17064 17880 3.97365055002468e-01
+17064 17904 1.55057023365654e-01
+17064 17928 2.51713852470707e-02
+17065 17065 1.00000000000000e+00
+17066 17066 1.00000000000000e+00
+17067 17067 1.00000000000000e+00
+17068 17068 1.00000000000000e+00
+17069 17069 1.00000000000000e+00
+17070 17070 1.00000000000000e+00
+17071 17071 1.00000000000000e+00
+17072 17072 1.00000000000000e+00
+17073 17073 1.00000000000000e+00
+17074 17074 1.00000000000000e+00
+17075 17075 1.00000000000000e+00
+17076 17076 1.00000000000000e+00
+17077 17077 1.00000000000000e+00
+17078 17078 1.00000000000000e+00
+17079 17079 1.00000000000000e+00
+17080 17080 1.00000000000000e+00
+17081 17081 1.00000000000000e+00
+17082 17082 1.00000000000000e+00
+17083 17083 1.00000000000000e+00
+17084 17084 1.00000000000000e+00
+17085 17085 1.00000000000000e+00
+17086 17086 1.00000000000000e+00
+17087 17087 1.00000000000000e+00
+17088 3213 -8.40619835414269e-05
+17088 3237 -2.64700801715131e-04
+17088 3261 -6.05285648237200e-07
+17088 3789 -7.17169031686446e-06
+17088 3813 -6.26822243240912e-02
+17088 3837 -3.17162331399170e-01
+17088 3861 -1.94606147503319e-01
+17088 3885 -4.05950296912925e-03
+17088 4389 -1.07855649151747e-02
+17088 4413 -1.20726376709721e+00
+17088 4437 -5.68289186565238e+00
+17088 4461 -3.01355636355886e+00
+17088 4485 -1.55321867795441e-01
+17088 4509 -9.92519568879602e-05
+17088 4989 -3.06935392903582e-02
+17088 5013 -1.87862984396715e+00
+17088 5037 -1.02349311736186e+01
+17088 5061 -4.91376916156051e+00
+17088 5085 -2.53257024583946e-01
+17088 5109 -4.00601221406904e-05
+17088 5589 -4.21211943045388e-03
+17088 5613 -4.36925577003898e-01
+17088 5637 -1.87406138757866e+00
+17088 5661 -9.05256029698995e-01
+17088 5685 -3.85963268737251e-02
+17088 6213 -1.04604514369131e-03
+17088 6237 -2.47456816655711e-02
+17088 6261 -1.72064983002767e-02
+17088 6285 -2.09075466857393e-05
+17088 16224 1.69696465266574e-02
+17088 16248 1.66177589685158e-01
+17088 16272 4.31790540141430e-01
+17088 16296 1.84798520781172e-01
+17088 16320 2.16248793006610e-02
+17088 17088 9.35462019827774e+00
+17088 16632 1.51708123575842e-01
+17088 16656 1.42526502644428e+00
+17088 16680 3.59834989756730e+00
+17088 16704 1.51007911385202e+00
+17088 16728 1.72911645427776e-01
+17088 17040 3.65880666997848e-01
+17088 17064 3.36345328386543e+00
+17088 17112 3.45599888700887e+00
+17088 17136 3.89017067783708e-01
+17088 17448 1.38201019846583e-01
+17088 17472 1.38078276116627e+00
+17088 17496 3.62350257752155e+00
+17088 17520 1.52152600400077e+00
+17088 17544 1.73386830555207e-01
+17088 17856 1.35928705943427e-02
+17088 17880 1.55057023365654e-01
+17088 17904 4.38078710129993e-01
+17088 17928 1.87660243318358e-01
+17088 17952 2.17436755825188e-02
+17089 17089 1.00000000000000e+00
+17090 17090 1.00000000000000e+00
+17091 17091 1.00000000000000e+00
+17092 17092 1.00000000000000e+00
+17093 17093 1.00000000000000e+00
+17094 17094 1.00000000000000e+00
+17095 17095 1.00000000000000e+00
+17096 17096 1.00000000000000e+00
+17097 17097 1.00000000000000e+00
+17098 17098 1.00000000000000e+00
+17099 17099 1.00000000000000e+00
+17100 17100 1.00000000000000e+00
+17101 17101 1.00000000000000e+00
+17102 17102 1.00000000000000e+00
+17103 17103 1.00000000000000e+00
+17104 17104 1.00000000000000e+00
+17105 17105 1.00000000000000e+00
+17106 17106 1.00000000000000e+00
+17107 17107 1.00000000000000e+00
+17108 17108 1.00000000000000e+00
+17109 17109 1.00000000000000e+00
+17110 17110 1.00000000000000e+00
+17111 17111 1.00000000000000e+00
+17112 3813 -8.30543836997973e-05
+17112 3837 -3.63021842950960e-02
+17112 3861 -6.35762543224439e-02
+17112 3885 -5.60829570506774e-03
+17112 4413 -6.04023209590327e-02
+17112 4437 -1.35589596977103e+00
+17112 4461 -2.46519311509011e+00
+17112 4485 -6.26267686291772e-01
+17112 4509 -1.23920601170130e-02
+17112 4989 -3.23866062505970e-05
+17112 5013 -2.74822116270493e-01
+17112 5037 -4.72026243498163e+00
+17112 5061 -9.44829471250612e+00
+17112 5085 -2.10508368685631e+00
+17112 5109 -5.20208389584607e-02
+17112 5589 -4.66156117325989e-05
+17112 5613 -1.15666008616456e-01
+17112 5637 -2.05289357518910e+00
+17112 5661 -3.93415720552649e+00
+17112 5685 -1.01643732635627e+00
+17112 5709 -1.10223094013720e-02
+17112 6213 -8.34346672447790e-04
+17112 6237 -8.46942034598075e-02
+17112 6261 -1.90167096788184e-01
+17112 6285 -4.08970490628928e-02
+17112 6309 -9.73631128109040e-07
+17112 6861 -2.02242391247020e-05
+17112 6885 -9.82651904440210e-06
+17112 16248 2.45747508946320e-02
+17112 16272 1.84798520781172e-01
+17112 16296 3.90862119037907e-01
+17112 16320 1.67656714533441e-01
+17112 16344 2.02892993326993e-02
+17112 17112 8.06500579410403e+00
+17112 16656 2.04608133035225e-01
+17112 16680 1.51007911385202e+00
+17112 16704 3.13383615769574e+00
+17112 16728 1.34221337297528e+00
+17112 16752 1.62641697816040e-01
+17112 17064 4.74982653968493e-01
+17112 17088 3.45599888700887e+00
+17112 17136 3.01906849351875e+00
+17112 17160 3.65750055595965e-01
+17112 17472 2.06994670444980e-01
+17112 17496 1.52152600400077e+00
+17112 17520 3.14075947710278e+00
+17112 17544 1.33184939331853e+00
+17112 17568 1.59575517774422e-01
+17112 17880 2.51713852470707e-02
+17112 17904 1.87660243318358e-01
+17112 17928 3.92592948889666e-01
+17112 17952 1.65065719619254e-01
+17112 17976 1.95227543222948e-02
+17113 17113 1.00000000000000e+00
+17114 17114 1.00000000000000e+00
+17115 17115 1.00000000000000e+00
+17116 17116 1.00000000000000e+00
+17117 17117 1.00000000000000e+00
+17118 17118 1.00000000000000e+00
+17119 17119 1.00000000000000e+00
+17120 17120 1.00000000000000e+00
+17121 17121 1.00000000000000e+00
+17122 17122 1.00000000000000e+00
+17123 17123 1.00000000000000e+00
+17124 17124 1.00000000000000e+00
+17125 17125 1.00000000000000e+00
+17126 17126 1.00000000000000e+00
+17127 17127 1.00000000000000e+00
+17128 17128 1.00000000000000e+00
+17129 17129 1.00000000000000e+00
+17130 17130 1.00000000000000e+00
+17131 17131 1.00000000000000e+00
+17132 17132 1.00000000000000e+00
+17133 17133 1.00000000000000e+00
+17134 17134 1.00000000000000e+00
+17135 17135 1.00000000000000e+00
+17136 3837 -1.43822464621434e-04
+17136 3861 -5.15015269182185e-03
+17136 3885 -1.29536421402409e-03
+17136 4437 -6.57338060232603e-02
+17136 4461 -6.07890324229406e-01
+17136 4485 -6.39847535218463e-01
+17136 4509 -6.46783074102988e-02
+17136 4533 -1.51013638628263e-04
+17136 5013 -1.21445491145512e-03
+17136 5037 -6.58101042165475e-01
+17136 5061 -5.35935612814149e+00
+17136 5085 -5.31142189658302e+00
+17136 5109 -5.92579518169749e-01
+17136 5133 -5.16812501595177e-03
+17136 5613 -5.05902499824330e-03
+17136 5637 -5.99376677632776e-01
+17136 5661 -5.24984454072547e+00
+17136 5685 -5.25957862952243e+00
+17136 5709 -6.28313393694452e-01
+17136 5733 -1.31385706373233e-03
+17136 6213 -1.52757987606121e-04
+17136 6237 -6.23693251947759e-02
+17136 6261 -6.13801984343057e-01
+17136 6285 -5.74376861200483e-01
+17136 6309 -6.33960961775750e-02
+17136 6861 -1.17815807475611e-03
+17136 6885 -4.85672977793055e-03
+17136 6909 -1.53172366412974e-04
+17136 16272 2.16248793006610e-02
+17136 16296 1.67656714533441e-01
+17136 16320 3.66463984150574e-01
+17136 16344 1.61998459437696e-01
+17136 16368 2.02103155267248e-02
+17136 17136 7.59293535998873e+00
+17136 16680 1.72911645427776e-01
+17136 16704 1.34221337297528e+00
+17136 16728 2.93408796318908e+00
+17136 16752 1.28620340208262e+00
+17136 16776 1.58909152704612e-01
+17136 17088 3.89017067783708e-01
+17136 17112 3.01906849351875e+00
+17136 17160 2.87066983306129e+00
+17136 17184 3.51917402669344e-01
+17136 17496 1.73386830555207e-01
+17136 17520 1.33184939331853e+00
+17136 17544 2.88240510455080e+00
+17136 17568 1.26154202951682e+00
+17136 17592 1.55809989604779e-01
+17136 17904 2.17436755825188e-02
+17136 17928 1.65065719619254e-01
+17136 17952 3.53543269491002e-01
+17136 17976 1.55833116296245e-01
+17136 18000 1.94355247517665e-02
+17137 17137 1.00000000000000e+00
+17138 17138 1.00000000000000e+00
+17139 17139 1.00000000000000e+00
+17140 17140 1.00000000000000e+00
+17141 17141 1.00000000000000e+00
+17142 17142 1.00000000000000e+00
+17143 17143 1.00000000000000e+00
+17144 17144 1.00000000000000e+00
+17145 17145 1.00000000000000e+00
+17146 17146 1.00000000000000e+00
+17147 17147 1.00000000000000e+00
+17148 17148 1.00000000000000e+00
+17149 17149 1.00000000000000e+00
+17150 17150 1.00000000000000e+00
+17151 17151 1.00000000000000e+00
+17152 17152 1.00000000000000e+00
+17153 17153 1.00000000000000e+00
+17154 17154 1.00000000000000e+00
+17155 17155 1.00000000000000e+00
+17156 17156 1.00000000000000e+00
+17157 17157 1.00000000000000e+00
+17158 17158 1.00000000000000e+00
+17159 17159 1.00000000000000e+00
+17160 3861 -8.75431199719495e-06
+17160 3885 -1.88711314146374e-05
+17160 4437 -4.31404717765000e-07
+17160 4461 -3.97012792058160e-02
+17160 4485 -1.85449956010224e-01
+17160 4509 -7.96429948358936e-02
+17160 4533 -7.78915299212616e-04
+17160 5037 -9.66017648426699e-03
+17160 5061 -9.67683053614479e-01
+17160 5085 -3.64136977461592e+00
+17160 5109 -1.86500071194450e+00
+17160 5133 -9.71852575256437e-02
+17160 5157 -4.63546319988521e-05
+17160 5637 -4.71831589024726e-02
+17160 5661 -1.93651044840103e+00
+17160 5685 -8.46920094647177e+00
+17160 5709 -3.99347476231917e+00
+17160 5733 -2.18693144643843e-01
+17160 5757 -3.34854865003058e-05
+17160 6237 -1.13664813412545e-02
+17160 6261 -5.59277921064767e-01
+17160 6285 -2.14744083978137e+00
+17160 6309 -1.07520244867281e+00
+17160 6333 -4.78374423681398e-02
+17160 6861 -4.92164144620354e-03
+17160 6885 -5.25159046809858e-02
+17160 6909 -2.93382054589836e-02
+17160 6933 -8.04923988436111e-05
+17160 16296 2.02892993326993e-02
+17160 16320 1.61998459437696e-01
+17160 16344 3.63411835229287e-01
+17160 16368 1.59871211982864e-01
+17160 16392 1.97574874689911e-02
+17160 17160 7.34294864953841e+00
+17160 16704 1.62641697816040e-01
+17160 16728 1.28620340208262e+00
+17160 16752 2.86118619082832e+00
+17160 16776 1.25962880977218e+00
+17160 16800 1.55998049738430e-01
+17160 17112 3.65750055595965e-01
+17160 17136 2.87066983306129e+00
+17160 17184 2.79375021560830e+00
+17160 17208 3.46520151232717e-01
+17160 17520 1.59575517774422e-01
+17160 17544 1.26154202951682e+00
+17160 17568 2.80506450856887e+00
+17160 17592 1.23335658689082e+00
+17160 17616 1.52529157117923e-01
+17160 17928 1.95227543222948e-02
+17160 17952 1.55833116296245e-01
+17160 17976 3.49381414664424e-01
+17160 18000 1.53303156262524e-01
+17160 18024 1.88902643138646e-02
+17161 17161 1.00000000000000e+00
+17162 17162 1.00000000000000e+00
+17163 17163 1.00000000000000e+00
+17164 17164 1.00000000000000e+00
+17165 17165 1.00000000000000e+00
+17166 17166 1.00000000000000e+00
+17167 17167 1.00000000000000e+00
+17168 17168 1.00000000000000e+00
+17169 17169 1.00000000000000e+00
+17170 17170 1.00000000000000e+00
+17171 17171 1.00000000000000e+00
+17172 17172 1.00000000000000e+00
+17173 17173 1.00000000000000e+00
+17174 17174 1.00000000000000e+00
+17175 17175 1.00000000000000e+00
+17176 17176 1.00000000000000e+00
+17177 17177 1.00000000000000e+00
+17178 17178 1.00000000000000e+00
+17179 17179 1.00000000000000e+00
+17180 17180 1.00000000000000e+00
+17181 17181 1.00000000000000e+00
+17182 17182 1.00000000000000e+00
+17183 17183 1.00000000000000e+00
+17184 4461 -1.38112665047085e-05
+17184 4485 -1.51559787944261e-02
+17184 4509 -2.16090931874468e-02
+17184 4533 -8.50483332369722e-04
+17184 5061 -3.19984746935319e-02
+17184 5085 -7.66829074925670e-01
+17184 5109 -1.49717127446898e+00
+17184 5133 -3.81038440365992e-01
+17184 5157 -6.15205480232561e-03
+17184 5637 -2.76739317972472e-05
+17184 5661 -2.15879675201223e-01
+17184 5685 -3.84397367768762e+00
+17184 5709 -7.82063470981180e+00
+17184 5733 -1.73159753784729e+00
+17184 5757 -4.32773454137623e-02
+17184 6237 -7.18384143752460e-05
+17184 6261 -1.30268316315285e-01
+17184 6285 -2.30931516770856e+00
+17184 6309 -4.54342432343412e+00
+17184 6333 -1.14368139928722e+00
+17184 6357 -1.29819148068438e-02
+17184 6861 -3.14675205445586e-03
+17184 6885 -1.55713479595498e-01
+17184 6909 -3.03095516402851e-01
+17184 6933 -6.74916128452639e-02
+17184 6957 -1.09340842857506e-05
+17184 7485 -6.25027141297650e-07
+17184 7509 -3.08191473876543e-04
+17184 7533 -1.03213653480999e-04
+17184 16320 2.02103155267248e-02
+17184 16344 1.59871211982864e-01
+17184 16368 3.55692930604211e-01
+17184 16392 1.56481212170478e-01
+17184 16416 1.93628155736284e-02
+17184 17184 7.24442172701012e+00
+17184 16728 1.58909152704612e-01
+17184 16752 1.25962880977218e+00
+17184 16776 2.80987646010898e+00
+17184 16800 1.24398624531148e+00
+17184 16824 1.54998511589436e-01
+17184 17136 3.51917402669344e-01
+17184 17160 2.79375021560830e+00
+17184 17208 2.77880822339929e+00
+17184 17232 3.48181904617091e-01
+17184 17544 1.55809989604779e-01
+17184 17568 1.23335658689082e+00
+17184 17592 2.74834412024163e+00
+17184 17616 1.21838709547178e+00
+17184 17640 1.52067616750017e-01
+17184 17952 1.94355247517665e-02
+17184 17976 1.53303156262524e-01
+17184 18000 3.40309845637373e-01
+17184 18024 1.50081424710553e-01
+17184 18048 1.86300918637737e-02
+17185 17185 1.00000000000000e+00
+17186 17186 1.00000000000000e+00
+17187 17187 1.00000000000000e+00
+17188 17188 1.00000000000000e+00
+17189 17189 1.00000000000000e+00
+17190 17190 1.00000000000000e+00
+17191 17191 1.00000000000000e+00
+17192 17192 1.00000000000000e+00
+17193 17193 1.00000000000000e+00
+17194 17194 1.00000000000000e+00
+17195 17195 1.00000000000000e+00
+17196 17196 1.00000000000000e+00
+17197 17197 1.00000000000000e+00
+17198 17198 1.00000000000000e+00
+17199 17199 1.00000000000000e+00
+17200 17200 1.00000000000000e+00
+17201 17201 1.00000000000000e+00
+17202 17202 1.00000000000000e+00
+17203 17203 1.00000000000000e+00
+17204 17204 1.00000000000000e+00
+17205 17205 1.00000000000000e+00
+17206 17206 1.00000000000000e+00
+17207 17207 1.00000000000000e+00
+17208 4485 -3.89310030356526e-05
+17208 4509 -1.25262710500987e-03
+17208 4533 -1.74967604472396e-04
+17208 5085 -3.57113108533592e-02
+17208 5109 -3.57021004769807e-01
+17208 5133 -3.62324339704616e-01
+17208 5157 -3.00451118904865e-02
+17208 5181 -1.54009090715194e-05
+17208 5661 -7.57131174518667e-04
+17208 5685 -5.44017519973798e-01
+17208 5709 -4.28272850225017e+00
+17208 5733 -4.15319957528701e+00
+17208 5757 -4.52262731923127e-01
+17208 5781 -3.60383670497804e-03
+17208 6261 -5.60266975200139e-03
+17208 6285 -6.59599075902195e-01
+17208 6309 -5.80227885164794e+00
+17208 6333 -5.60361692656965e+00
+17208 6357 -6.27511702787324e-01
+17208 6381 -1.61402046852431e-03
+17208 6861 -5.12372734049640e-04
+17208 6885 -1.05165732007160e-01
+17208 6909 -9.24693753917579e-01
+17208 6933 -8.34174209426219e-01
+17208 6957 -9.43825694898238e-02
+17208 6981 -3.01603641067000e-09
+17208 7485 -2.75579249208753e-06
+17208 7509 -5.17490449004992e-03
+17208 7533 -1.27531411453203e-02
+17208 7557 -3.88327097074182e-04
+17208 16344 1.97574874689911e-02
+17208 16368 1.56481212170478e-01
+17208 16392 3.49250348602332e-01
+17208 16416 1.56202510115661e-01
+17208 16440 1.96878119552869e-02
+17208 17208 7.25784715332240e+00
+17208 16752 1.55998049738430e-01
+17208 16776 1.24398624531148e+00
+17208 16800 2.79022848518567e+00
+17208 16824 1.23701104642259e+00
+17208 16848 1.54254250016209e-01
+17208 17160 3.46520151232717e-01
+17208 17184 2.77880822339929e+00
+17208 17232 2.75439373133247e+00
+17208 17256 3.40416528216012e-01
+17208 17568 1.52529157117923e-01
+17208 17592 1.21838709547178e+00
+17208 17616 2.73598085723523e+00
+17208 17640 1.20974979546801e+00
+17208 17664 1.50369832116982e-01
+17208 17976 1.88902643138646e-02
+17208 18000 1.50081424710553e-01
+17208 18024 3.35688441614723e-01
+17208 18048 1.49387197377015e-01
+17208 18072 1.87167074804801e-02
+17209 17209 1.00000000000000e+00
+17210 17210 1.00000000000000e+00
+17211 17211 1.00000000000000e+00
+17212 17212 1.00000000000000e+00
+17213 17213 1.00000000000000e+00
+17214 17214 1.00000000000000e+00
+17215 17215 1.00000000000000e+00
+17216 17216 1.00000000000000e+00
+17217 17217 1.00000000000000e+00
+17218 17218 1.00000000000000e+00
+17219 17219 1.00000000000000e+00
+17220 17220 1.00000000000000e+00
+17221 17221 1.00000000000000e+00
+17222 17222 1.00000000000000e+00
+17223 17223 1.00000000000000e+00
+17224 17224 1.00000000000000e+00
+17225 17225 1.00000000000000e+00
+17226 17226 1.00000000000000e+00
+17227 17227 1.00000000000000e+00
+17228 17228 1.00000000000000e+00
+17229 17229 1.00000000000000e+00
+17230 17230 1.00000000000000e+00
+17231 17231 1.00000000000000e+00
+17232 4509 -1.74352105968200e-08
+17232 4533 -2.67149432083500e-08
+17232 5085 -8.44638357170000e-10
+17232 5109 -2.10748455066423e-02
+17232 5133 -9.59646298107551e-02
+17232 5157 -3.06819938875620e-02
+17232 5181 -7.21993790366314e-05
+17232 5685 -6.99137529405220e-03
+17232 5709 -7.35882102626052e-01
+17232 5733 -2.63136498869214e+00
+17232 5757 -1.33485408307050e+00
+17232 5781 -6.29703485864394e-02
+17232 5805 -2.12273103108982e-05
+17232 6285 -4.94282254897333e-02
+17232 6309 -2.02056147413533e+00
+17232 6333 -8.39721704319991e+00
+17232 6357 -3.78016253433069e+00
+17232 6381 -2.00674644131226e-01
+17232 6405 -2.60766096089583e-05
+17232 6885 -1.84595574985241e-02
+17232 6909 -7.69802226468801e-01
+17232 6933 -2.89436506660368e+00
+17232 6957 -1.41063348630124e+00
+17232 6981 -6.19881299017579e-02
+17232 7485 -1.64776284888538e-06
+17232 7509 -1.73529761959176e-02
+17232 7533 -1.10295881093750e-01
+17232 7557 -5.29520423692178e-02
+17232 7581 -2.69100304160320e-04
+17232 8133 -3.35135530715780e-07
+17232 8157 -6.46536115564740e-07
+17232 16368 1.93628155736284e-02
+17232 16392 1.56202510115661e-01
+17232 16416 3.53947585031547e-01
+17232 16440 1.57070360514459e-01
+17232 17232 7.14026111656749e+00
+17232 16464 1.95797781733278e-02
+17232 16776 1.54998511589436e-01
+17232 16800 1.23701104642259e+00
+17232 16824 2.77817258011401e+00
+17232 16848 1.23744127312553e+00
+17232 16872 1.55106068265170e-01
+17232 17184 3.48181904617091e-01
+17232 17208 2.75439373133247e+00
+17232 17256 2.74332515484005e+00
+17232 17280 3.45414760493986e-01
+17232 17592 1.52067616750017e-01
+17232 17616 1.20974979546801e+00
+17232 17640 2.70952052632652e+00
+17232 17664 1.20762171128691e+00
+17232 17688 1.51535595704743e-01
+17232 18000 1.86300918637737e-02
+17232 18024 1.49387197377015e-01
+17232 18048 3.36784571584676e-01
+17232 18072 1.49615470054804e-01
+17232 18096 1.86871600332210e-02
+17233 17233 1.00000000000000e+00
+17234 17234 1.00000000000000e+00
+17235 17235 1.00000000000000e+00
+17236 17236 1.00000000000000e+00
+17237 17237 1.00000000000000e+00
+17238 17238 1.00000000000000e+00
+17239 17239 1.00000000000000e+00
+17240 17240 1.00000000000000e+00
+17241 17241 1.00000000000000e+00
+17242 17242 1.00000000000000e+00
+17243 17243 1.00000000000000e+00
+17244 17244 1.00000000000000e+00
+17245 17245 1.00000000000000e+00
+17246 17246 1.00000000000000e+00
+17247 17247 1.00000000000000e+00
+17248 17248 1.00000000000000e+00
+17249 17249 1.00000000000000e+00
+17250 17250 1.00000000000000e+00
+17251 17251 1.00000000000000e+00
+17252 17252 1.00000000000000e+00
+17253 17253 1.00000000000000e+00
+17254 17254 1.00000000000000e+00
+17255 17255 1.00000000000000e+00
+17256 5109 -2.01560395289938e-06
+17256 5133 -6.56477375214311e-03
+17256 5157 -6.87824803542487e-03
+17256 5181 -5.77838800737353e-05
+17256 5709 -2.04237157877315e-02
+17256 5733 -5.14869724059536e-01
+17256 5757 -9.83374149245021e-01
+17256 5781 -2.35359211128364e-01
+17256 5805 -2.68360686543634e-03
+17256 6285 -2.21422910102272e-05
+17256 6309 -2.08634239809660e-01
+17256 6333 -3.58766882084470e+00
+17256 6357 -6.94373649909137e+00
+17256 6381 -1.47822609499831e+00
+17256 6405 -3.61825963381644e-02
+17256 6885 -1.27258756124396e-04
+17256 6909 -1.69941020545760e-01
+17256 6933 -2.88002145247027e+00
+17256 6957 -5.55216590365646e+00
+17256 6981 -1.30220261752319e+00
+17256 7005 -1.54562329970986e-02
+17256 7485 -2.55683926896930e-07
+17256 7509 -9.04705997000787e-03
+17256 7533 -2.84162572146214e-01
+17256 7557 -4.97254905233345e-01
+17256 7581 -1.12540250718600e-01
+17256 7605 -5.60742176785082e-05
+17256 8133 -4.61869584146437e-05
+17256 8157 -1.86222575103144e-03
+17256 8181 -4.48079598200342e-04
+17256 16392 1.96878119552869e-02
+17256 16416 1.57070360514459e-01
+17256 16440 3.52487017050825e-01
+17256 17256 7.21643411078443e+00
+17256 16464 1.56410129982488e-01
+17256 16488 1.95227543222943e-02
+17256 16800 1.54254250016209e-01
+17256 16824 1.23744127312553e+00
+17256 16848 2.79178445855523e+00
+17256 16872 1.24375673824566e+00
+17256 16896 1.55833116296242e-01
+17256 17208 3.40416528216012e-01
+17256 17232 2.74332515484005e+00
+17256 17280 2.77918470063367e+00
+17256 17304 3.49381414664417e-01
+17256 17616 1.50369832116982e-01
+17256 17640 1.20762171128691e+00
+17256 17664 2.72824251965545e+00
+17256 17688 1.21935500786909e+00
+17256 17712 1.53303156262526e-01
+17256 18024 1.87167074804801e-02
+17256 18048 1.49615470054804e-01
+17256 18072 3.36601532325881e-01
+17256 18096 1.50309697388346e-01
+17256 18120 1.88902643138654e-02
+17257 17257 1.00000000000000e+00
+17258 17258 1.00000000000000e+00
+17259 17259 1.00000000000000e+00
+17260 17260 1.00000000000000e+00
+17261 17261 1.00000000000000e+00
+17262 17262 1.00000000000000e+00
+17263 17263 1.00000000000000e+00
+17264 17264 1.00000000000000e+00
+17265 17265 1.00000000000000e+00
+17266 17266 1.00000000000000e+00
+17267 17267 1.00000000000000e+00
+17268 17268 1.00000000000000e+00
+17269 17269 1.00000000000000e+00
+17270 17270 1.00000000000000e+00
+17271 17271 1.00000000000000e+00
+17272 17272 1.00000000000000e+00
+17273 17273 1.00000000000000e+00
+17274 17274 1.00000000000000e+00
+17275 17275 1.00000000000000e+00
+17276 17276 1.00000000000000e+00
+17277 17277 1.00000000000000e+00
+17278 17278 1.00000000000000e+00
+17279 17279 1.00000000000000e+00
+17280 5133 -7.58338003402613e-06
+17280 5157 -1.86508968564511e-04
+17280 5181 -1.05957427505540e-05
+17280 5733 -2.03097815182609e-02
+17280 5757 -2.18551967117538e-01
+17280 5781 -2.01108282090790e-01
+17280 5805 -1.21795169504231e-02
+17280 5829 -9.85236182442100e-08
+17280 6309 -4.98462211108425e-04
+17280 6333 -4.78760119398730e-01
+17280 6357 -3.51256895453244e+00
+17280 6381 -3.29949882568253e+00
+17280 6405 -3.49928920340785e-01
+17280 6429 -2.45335414009301e-03
+17280 6909 -6.53347571849010e-03
+17280 6933 -7.75414771434272e-01
+17280 6957 -6.53788922342876e+00
+17280 6981 -6.03043027825392e+00
+17280 7005 -6.40927707820464e-01
+17280 7029 -1.89638474168433e-03
+17280 7509 -1.27623034386603e-03
+17280 7533 -1.75026824014737e-01
+17280 7557 -1.41055889312214e+00
+17280 7581 -1.24030980514067e+00
+17280 7605 -1.39874140180185e-01
+17280 7629 -3.91749617691150e-07
+17280 8133 -1.88632296335796e-04
+17280 8157 -1.82588596240225e-02
+17280 8181 -2.92174748183984e-02
+17280 8205 -9.28518009400178e-04
+17280 16416 1.95797781733278e-02
+17280 16440 1.56410129982488e-01
+17280 17280 7.28740210760266e+00
+17280 16464 3.52314972451348e-01
+17280 16488 1.59575517774424e-01
+17280 16512 2.03711251213117e-02
+17280 16824 1.55106068265170e-01
+17280 16848 1.24375673824566e+00
+17280 16872 2.80798832008805e+00
+17280 16896 1.26154202951682e+00
+17280 16920 1.59552391082960e-01
+17280 17232 3.45414760493986e-01
+17280 17256 2.77918470063367e+00
+17280 17304 2.80506450856885e+00
+17280 17328 3.51884712477783e-01
+17280 17640 1.51535595704743e-01
+17280 17664 1.21935500786909e+00
+17280 17688 2.75942208636539e+00
+17280 17712 1.23335658689084e+00
+17280 17736 1.55035990460180e-01
+17280 18048 1.86871600332210e-02
+17280 18072 1.50309697388346e-01
+17280 18096 3.40173414020684e-01
+17280 18120 1.52529157117928e-01
+17280 18144 1.92420249656166e-02
+17281 17281 1.00000000000000e+00
+17282 17282 1.00000000000000e+00
+17283 17283 1.00000000000000e+00
+17284 17284 1.00000000000000e+00
+17285 17285 1.00000000000000e+00
+17286 17286 1.00000000000000e+00
+17287 17287 1.00000000000000e+00
+17288 17288 1.00000000000000e+00
+17289 17289 1.00000000000000e+00
+17290 17290 1.00000000000000e+00
+17291 17291 1.00000000000000e+00
+17292 17292 1.00000000000000e+00
+17293 17293 1.00000000000000e+00
+17294 17294 1.00000000000000e+00
+17295 17295 1.00000000000000e+00
+17296 17296 1.00000000000000e+00
+17297 17297 1.00000000000000e+00
+17298 17298 1.00000000000000e+00
+17299 17299 1.00000000000000e+00
+17300 17300 1.00000000000000e+00
+17301 17301 1.00000000000000e+00
+17302 17302 1.00000000000000e+00
+17303 17303 1.00000000000000e+00
+17304 5757 -1.13664813412542e-02
+17304 5781 -4.71831589024721e-02
+17304 5805 -9.66017648426725e-03
+17304 5829 -4.31404717765020e-07
+17304 6333 -4.92164144620346e-03
+17304 6357 -5.59277921064756e-01
+17304 6381 -1.93651044840105e+00
+17304 6405 -9.67683053614513e-01
+17304 6429 -3.97012792058168e-02
+17304 6453 -8.75431199719505e-06
+17304 6933 -5.25159046809868e-02
+17304 6957 -2.14744083978136e+00
+17304 6981 -8.46920094647183e+00
+17304 7005 -3.64136977461599e+00
+17304 7029 -1.85449956010227e-01
+17304 7053 -1.88711314146376e-05
+17304 7533 -2.93382054589848e-02
+17304 7557 -1.07520244867283e+00
+17304 7581 -3.99347476231921e+00
+17304 7605 -1.86500071194453e+00
+17304 7629 -7.96429948358947e-02
+17304 8133 -8.04923988436137e-05
+17304 8157 -4.78374423681407e-02
+17304 8181 -2.18693144643847e-01
+17304 8205 -9.71852575256383e-02
+17304 8229 -7.78915299212628e-04
+17304 8781 -3.34854865003064e-05
+17304 8805 -4.63546319988530e-05
+17304 16440 1.95227543222943e-02
+17304 17304 7.34294864953846e+00
+17304 16464 1.59575517774424e-01
+17304 16488 3.65750055595980e-01
+17304 16512 1.62641697816045e-01
+17304 16536 2.02892993326995e-02
+17304 16848 1.55833116296242e-01
+17304 16872 1.26154202951682e+00
+17304 16896 2.87066983306136e+00
+17304 16920 1.28620340208265e+00
+17304 16944 1.61998459437698e-01
+17304 17256 3.49381414664417e-01
+17304 17280 2.80506450856885e+00
+17304 17328 2.86118619082836e+00
+17304 17352 3.63411835229292e-01
+17304 17664 1.53303156262526e-01
+17304 17688 1.23335658689084e+00
+17304 17712 2.79375021560833e+00
+17304 17736 1.25962880977220e+00
+17304 17760 1.59871211982866e-01
+17304 18072 1.88902643138654e-02
+17304 18096 1.52529157117928e-01
+17304 18120 3.46520151232723e-01
+17304 18144 1.55998049738432e-01
+17304 18168 1.97574874689915e-02
+17305 17305 1.00000000000000e+00
+17306 17306 1.00000000000000e+00
+17307 17307 1.00000000000000e+00
+17308 17308 1.00000000000000e+00
+17309 17309 1.00000000000000e+00
+17310 17310 1.00000000000000e+00
+17311 17311 1.00000000000000e+00
+17312 17312 1.00000000000000e+00
+17313 17313 1.00000000000000e+00
+17314 17314 1.00000000000000e+00
+17315 17315 1.00000000000000e+00
+17316 17316 1.00000000000000e+00
+17317 17317 1.00000000000000e+00
+17318 17318 1.00000000000000e+00
+17319 17319 1.00000000000000e+00
+17320 17320 1.00000000000000e+00
+17321 17321 1.00000000000000e+00
+17322 17322 1.00000000000000e+00
+17323 17323 1.00000000000000e+00
+17324 17324 1.00000000000000e+00
+17325 17325 1.00000000000000e+00
+17326 17326 1.00000000000000e+00
+17327 17327 1.00000000000000e+00
+17328 5757 -1.40505858852180e-07
+17328 5781 -2.41400275343929e-03
+17328 5805 -1.79342829018032e-03
+17328 5829 -2.47764597396870e-07
+17328 6357 -1.26258116673756e-02
+17328 6381 -3.52156070294240e-01
+17328 6405 -6.48829834041641e-01
+17328 6429 -1.41157639159403e-01
+17328 6453 -9.44207889060279e-04
+17328 6933 -1.22463021456104e-05
+17328 6957 -2.06892058201996e-01
+17328 6981 -3.39171852619209e+00
+17328 7005 -6.23407982509971e+00
+17328 7029 -1.30451795486918e+00
+17328 7053 -3.11108491462266e-02
+17328 7533 -2.10501275725722e-04
+17328 7557 -2.24619371477825e-01
+17328 7581 -3.67439368781383e+00
+17328 7605 -6.93663822977334e+00
+17328 7629 -1.56150964536206e+00
+17328 7653 -1.95621366677708e-02
+17328 8133 -8.91149563795827e-06
+17328 8157 -2.16163911218320e-02
+17328 8181 -5.08138615513815e-01
+17328 8205 -8.49994985456503e-01
+17328 8229 -1.98701968048535e-01
+17328 8253 -1.93029350231710e-04
+17328 8781 -6.05453066284470e-04
+17328 8805 -7.58954126479133e-03
+17328 8829 -1.42313807385487e-03
+17328 17328 7.55985454896858e+00
+17328 16464 2.03711251213117e-02
+17328 16488 1.62641697816045e-01
+17328 16512 3.66469822508480e-01
+17328 16536 1.67036829586703e-01
+17328 16560 2.14699080639762e-02
+17328 16872 1.59552391082960e-01
+17328 16896 1.28620340208265e+00
+17328 16920 2.92511695842667e+00
+17328 16944 1.34235070311272e+00
+17328 16968 1.73589216340478e-01
+17328 17280 3.51884712477783e-01
+17328 17304 2.86118619082836e+00
+17328 17352 3.02716923220478e+00
+17328 17376 3.93380472821888e-01
+17328 17688 1.55035990460180e-01
+17328 17712 1.25962880977220e+00
+17328 17736 2.88497387994915e+00
+17328 17760 1.32747883898370e+00
+17328 17784 1.71998497763054e-01
+17328 18096 1.92420249656166e-02
+17328 18120 1.55998049738432e-01
+17328 18144 3.56434052889101e-01
+17328 18168 1.63318863554447e-01
+17328 18192 2.10722284196203e-02
+17329 17329 1.00000000000000e+00
+17330 17330 1.00000000000000e+00
+17331 17331 1.00000000000000e+00
+17332 17332 1.00000000000000e+00
+17333 17333 1.00000000000000e+00
+17334 17334 1.00000000000000e+00
+17335 17335 1.00000000000000e+00
+17336 17336 1.00000000000000e+00
+17337 17337 1.00000000000000e+00
+17338 17338 1.00000000000000e+00
+17339 17339 1.00000000000000e+00
+17340 17340 1.00000000000000e+00
+17341 17341 1.00000000000000e+00
+17342 17342 1.00000000000000e+00
+17343 17343 1.00000000000000e+00
+17344 17344 1.00000000000000e+00
+17345 17345 1.00000000000000e+00
+17346 17346 1.00000000000000e+00
+17347 17347 1.00000000000000e+00
+17348 17348 1.00000000000000e+00
+17349 17349 1.00000000000000e+00
+17350 17350 1.00000000000000e+00
+17351 17351 1.00000000000000e+00
+17352 5781 -5.47964570785970e-07
+17352 5805 -7.48228670978536e-06
+17352 5829 -3.73102447881600e-08
+17352 6381 -1.14567772184785e-02
+17352 6405 -1.34270192548721e-01
+17352 6429 -1.07211408631075e-01
+17352 6453 -4.02285784986320e-03
+17352 6957 -3.25705673696316e-04
+17352 6981 -4.23340971250773e-01
+17352 7005 -2.98627124706643e+00
+17352 7029 -2.79102250318823e+00
+17352 7053 -2.92463126461177e-01
+17352 7077 -1.81463814625538e-03
+17352 7557 -7.63644529673744e-03
+17352 7581 -9.41794062802648e-01
+17352 7605 -7.84475762036918e+00
+17352 7629 -7.17876805185179e+00
+17352 7653 -7.70581711034177e-01
+17352 7677 -2.36456528890254e-03
+17352 8157 -2.69918411505044e-03
+17352 8181 -2.95079386881867e-01
+17352 8205 -2.32104302524862e+00
+17352 8229 -2.16294920165838e+00
+17352 8253 -2.48937627752005e-01
+17352 8277 -4.35062775778439e-06
+17352 8781 -1.97908944809925e-03
+17352 8805 -6.09726191576311e-02
+17352 8829 -7.60852993516102e-02
+17352 8853 -2.80363635072946e-03
+17352 9429 -7.46393400000000e-14
+17352 17352 8.12365760161962e+00
+17352 16488 2.02892993326995e-02
+17352 16512 1.67036829586703e-01
+17352 16536 3.88404676177685e-01
+17352 16560 1.84267023541369e-01
+17352 16584 2.45968478213661e-02
+17352 16896 1.61998459437698e-01
+17352 16920 1.34235070311272e+00
+17352 16944 3.14169525100726e+00
+17352 16968 1.50343418584935e+00
+17352 16992 2.02269330121856e-01
+17352 17304 3.63411835229292e-01
+17352 17328 3.02716923220478e+00
+17352 17376 3.43815469624707e+00
+17352 17400 4.66158201239862e-01
+17352 17712 1.59871211982866e-01
+17352 17736 1.32747883898370e+00
+17352 17760 3.11986350731990e+00
+17352 17784 1.52005931556467e+00
+17352 17808 2.08016331128110e-01
+17352 18120 1.97574874689915e-02
+17352 18144 1.63318863554447e-01
+17352 18168 3.82946740255845e-01
+17352 18192 1.88423305970199e-01
+17352 18216 2.60335980729295e-02
+17353 17353 1.00000000000000e+00
+17354 17354 1.00000000000000e+00
+17355 17355 1.00000000000000e+00
+17356 17356 1.00000000000000e+00
+17357 17357 1.00000000000000e+00
+17358 17358 1.00000000000000e+00
+17359 17359 1.00000000000000e+00
+17360 17360 1.00000000000000e+00
+17361 17361 1.00000000000000e+00
+17362 17362 1.00000000000000e+00
+17363 17363 1.00000000000000e+00
+17364 17364 1.00000000000000e+00
+17365 17365 1.00000000000000e+00
+17366 17366 1.00000000000000e+00
+17367 17367 1.00000000000000e+00
+17368 17368 1.00000000000000e+00
+17369 17369 1.00000000000000e+00
+17370 17370 1.00000000000000e+00
+17371 17371 1.00000000000000e+00
+17372 17372 1.00000000000000e+00
+17373 17373 1.00000000000000e+00
+17374 17374 1.00000000000000e+00
+17375 17375 1.00000000000000e+00
+17376 6405 -6.25604395553282e-03
+17376 6429 -2.20016673822270e-02
+17376 6453 -2.41855455161585e-03
+17376 6981 -3.53912977336370e-03
+17376 7005 -4.52565793524380e-01
+17376 7029 -1.59016329279607e+00
+17376 7053 -7.58041586363661e-01
+17376 7077 -2.09752511183681e-02
+17376 7101 -2.30239133829016e-06
+17376 7581 -5.91529245750130e-02
+17376 7605 -2.57969505935669e+00
+17376 7629 -1.00058294587791e+01
+17376 7653 -3.63348164739568e+00
+17376 7677 -1.34464897613048e-01
+17376 7701 -1.01389756552506e-05
+17376 8181 -4.81042644266794e-02
+17376 8205 -1.79075268972270e+00
+17376 8229 -6.39325921400955e+00
+17376 8253 -2.17167163998992e+00
+17376 8277 -7.17232553767065e-02
+17376 8301 -1.71538377450000e-10
+17376 8781 -7.09749042147127e-04
+17376 8805 -1.37572068971866e-01
+17376 8829 -4.57856882564989e-01
+17376 8853 -1.56376062952829e-01
+17376 8877 -1.46097158628628e-03
+17376 9405 -1.54549245000000e-12
+17376 9429 -4.10935087373671e-04
+17376 9453 -4.15196523486821e-04
+17376 17376 9.13287850138186e+00
+17376 16512 2.14699080639762e-02
+17376 16536 1.84267023541369e-01
+17376 16560 4.32485248224003e-01
+17376 16584 1.68250491358142e-01
+17376 16608 1.74657750181695e-02
+17376 16920 1.73589216340478e-01
+17376 16944 1.50343418584935e+00
+17376 16968 3.54045363333220e+00
+17376 16992 1.33129786065528e+00
+17376 17016 1.30555135041961e-01
+17376 17328 3.93380472821888e-01
+17376 17352 3.43815469624707e+00
+17376 17400 2.98850003984705e+00
+17376 17424 2.80966808721886e-01
+17376 17736 1.71998497763054e-01
+17376 17760 1.52005931556467e+00
+17376 17784 3.64388340608851e+00
+17376 17808 1.40655976561497e+00
+17376 17832 1.43623610275628e-01
+17376 18144 2.10722284196203e-02
+17376 18168 1.88423305970199e-01
+17376 18192 4.58342691413079e-01
+17376 18216 1.87065967598063e-01
+17376 18240 2.07328938265863e-02
+17377 17377 1.00000000000000e+00
+17378 17378 1.00000000000000e+00
+17379 17379 1.00000000000000e+00
+17380 17380 1.00000000000000e+00
+17381 17381 1.00000000000000e+00
+17382 17382 1.00000000000000e+00
+17383 17383 1.00000000000000e+00
+17384 17384 1.00000000000000e+00
+17385 17385 1.00000000000000e+00
+17386 17386 1.00000000000000e+00
+17387 17387 1.00000000000000e+00
+17388 17388 1.00000000000000e+00
+17389 17389 1.00000000000000e+00
+17390 17390 1.00000000000000e+00
+17391 17391 1.00000000000000e+00
+17392 17392 1.00000000000000e+00
+17393 17393 1.00000000000000e+00
+17394 17394 1.00000000000000e+00
+17395 17395 1.00000000000000e+00
+17396 17396 1.00000000000000e+00
+17397 17397 1.00000000000000e+00
+17398 17398 1.00000000000000e+00
+17399 17399 1.00000000000000e+00
+17400 6405 -6.97276547140000e-10
+17400 6429 -7.12208246196802e-04
+17400 6453 -3.77341038477286e-04
+17400 7005 -8.89962435477893e-03
+17400 7029 -2.68460388411377e-01
+17400 7053 -4.08296859121547e-01
+17400 7077 -1.16854240285127e-01
+17400 7101 -3.88025594488432e-04
+17400 7581 -5.82139999520664e-06
+17400 7605 -2.52605295670655e-01
+17400 7629 -3.15212942479755e+00
+17400 7653 -5.85915587839834e+00
+17400 7677 -2.29622406868504e+00
+17400 7701 -2.18156224160925e-03
+17400 8181 -3.92140677873937e-04
+17400 8205 -3.59609790199517e-01
+17400 8229 -4.42373616499349e+00
+17400 8253 -1.11982184290234e+01
+17400 8277 -2.21730298722626e+00
+17400 8301 -3.15062376914750e-07
+17400 8781 -5.95594804659707e-05
+17400 8805 -5.10251812906411e-02
+17400 8829 -1.14792032596768e+00
+17400 8853 -2.26455304050108e+00
+17400 8877 -9.76740571613030e-02
+17400 9405 -6.23034231000000e-12
+17400 9429 -9.46517302950756e-03
+17400 9453 -1.51031657139677e-02
+17400 17400 8.16173749686319e+00
+17400 16536 2.45968478213661e-02
+17400 16560 1.68250491358142e-01
+17400 16584 4.98566153261178e-01
+17400 16608 4.58896910370879e-01
+17400 16944 2.02269330121856e-01
+17400 16968 1.33129786065528e+00
+17400 16992 3.53687360286308e+00
+17400 17016 3.01366476430747e+00
+17400 17352 4.66158201239862e-01
+17400 17376 2.98850003984705e+00
+17400 17424 5.52408794703351e+00
+17400 17760 2.08016331128110e-01
+17400 17784 1.40655976561497e+00
+17400 17808 3.51355052713259e+00
+17400 17832 2.58960730429128e+00
+17400 18168 2.60335980729295e-02
+17400 18192 1.87065967598063e-01
+17400 18216 4.92735384328554e-01
+17400 18240 3.52882545366832e-01
+17401 17401 1.00000000000000e+00
+17402 17402 1.00000000000000e+00
+17403 17403 1.00000000000000e+00
+17404 17404 1.00000000000000e+00
+17405 17405 1.00000000000000e+00
+17406 17406 1.00000000000000e+00
+17407 17407 1.00000000000000e+00
+17408 17408 1.00000000000000e+00
+17409 17409 1.00000000000000e+00
+17410 17410 1.00000000000000e+00
+17411 17411 1.00000000000000e+00
+17412 17412 1.00000000000000e+00
+17413 17413 1.00000000000000e+00
+17414 17414 1.00000000000000e+00
+17415 17415 1.00000000000000e+00
+17416 17416 1.00000000000000e+00
+17417 17417 1.00000000000000e+00
+17418 17418 1.00000000000000e+00
+17419 17419 1.00000000000000e+00
+17420 17420 1.00000000000000e+00
+17421 17421 1.00000000000000e+00
+17422 17422 1.00000000000000e+00
+17423 17423 1.00000000000000e+00
+17424 6429 -2.67275633000000e-12
+17424 6453 -1.62243194400000e-11
+17424 7029 -4.98947752019868e-03
+17424 7053 -1.03422884076191e-01
+17424 7077 -1.34062314544317e-01
+17424 7101 -7.59934449608832e-04
+17424 7605 -1.55563455594225e-04
+17424 7629 -2.75221263027290e-01
+17424 7653 -4.42153745514192e+00
+17424 7677 -3.71267255159020e+00
+17424 7701 -4.29215165363174e-03
+17424 8205 -8.19121310477220e-03
+17424 8229 -1.33921351264528e+00
+17424 8253 -1.36483898526971e+01
+17424 8277 -3.93265630313728e+00
+17424 8301 -6.28923985187320e-07
+17424 8805 -4.92885197545318e-03
+17424 8829 -9.31015863958384e-01
+17424 8853 -3.50736818545131e+00
+17424 8877 -1.85121313218602e-01
+17424 9405 -1.64223745000000e-12
+17424 9429 -1.60538004493400e-02
+17424 9453 -2.72999557635276e-02
+17424 17424 1.00814082330138e+01
+17424 16560 1.74657750181695e-02
+17424 16584 4.58896910370879e-01
+17424 16608 7.95533395614571e-01
+17424 16968 1.30555135041961e-01
+17424 16992 3.01366476430747e+00
+17424 17016 5.11344358332120e+00
+17424 17376 2.80966808721886e-01
+17424 17400 5.52408794703351e+00
+17424 17784 1.43623610275628e-01
+17424 17808 2.58960730429128e+00
+17424 17832 4.17384933665315e+00
+17424 18192 2.07328938265863e-02
+17424 18216 3.52882545366832e-01
+17424 18240 5.60634833947560e-01
+17425 17425 1.00000000000000e+00
+17426 17426 1.00000000000000e+00
+17427 17427 1.00000000000000e+00
+17428 17428 1.00000000000000e+00
+17429 17429 1.00000000000000e+00
+17430 17430 1.00000000000000e+00
+17431 17431 1.00000000000000e+00
+17432 17432 1.00000000000000e+00
+17433 17433 1.00000000000000e+00
+17434 17434 1.00000000000000e+00
+17435 17435 1.00000000000000e+00
+17436 17436 1.00000000000000e+00
+17437 17437 1.00000000000000e+00
+17438 17438 1.00000000000000e+00
+17439 17439 1.00000000000000e+00
+17440 17440 1.00000000000000e+00
+17441 17441 1.00000000000000e+00
+17442 17442 1.00000000000000e+00
+17443 17443 1.00000000000000e+00
+17444 17444 1.00000000000000e+00
+17445 17445 1.00000000000000e+00
+17446 17446 1.00000000000000e+00
+17447 17447 1.00000000000000e+00
+17448 3789 -5.26432474004659e-04
+17448 3813 -2.06381545340387e-01
+17448 3837 -6.91058902851671e-02
+17448 3861 -1.96369108521814e-05
+17448 4389 -1.47814744601899e+00
+17448 4413 -7.25120728299891e+00
+17448 4437 -8.02167487971855e-01
+17448 4461 -4.12660314887432e-03
+17448 4965 -5.76787102641967e-03
+17448 4989 -7.60221651864047e+00
+17448 5013 -1.36812044076585e+01
+17448 5037 -6.68819689456864e-01
+17448 5061 -1.83203537140733e-03
+17448 5565 -2.26063108285775e-02
+17448 5589 -2.49861912557888e+00
+17448 5613 -1.71003083767366e+00
+17448 5637 -7.54624655077900e-02
+17448 5661 -5.96334235505000e-09
+17448 6165 -8.84884528789615e-06
+17448 6189 -9.58767802584513e-03
+17448 6213 -1.46458338405462e-02
+17448 6237 -4.24068021415266e-04
+17448 17448 1.23161012279489e+01
+17448 16632 4.42264113085912e-01
+17448 16656 2.94482901828517e-01
+17448 16680 2.09573843673030e-02
+17448 17040 4.29875177865565e+00
+17448 17064 2.63307945879087e+00
+17448 17088 1.38201019846583e-01
+17448 17472 6.56077331714608e+00
+17448 17496 2.57920772334743e-01
+17448 17856 5.54991856477199e+00
+17448 17880 3.23794388911820e+00
+17448 17904 1.32281316209199e-01
+17448 18264 7.55055809614999e-01
+17448 18288 4.45699009410349e-01
+17448 18312 1.94774584579571e-02
+17449 17449 1.00000000000000e+00
+17450 17450 1.00000000000000e+00
+17451 17451 1.00000000000000e+00
+17452 17452 1.00000000000000e+00
+17453 17453 1.00000000000000e+00
+17454 17454 1.00000000000000e+00
+17455 17455 1.00000000000000e+00
+17456 17456 1.00000000000000e+00
+17457 17457 1.00000000000000e+00
+17458 17458 1.00000000000000e+00
+17459 17459 1.00000000000000e+00
+17460 17460 1.00000000000000e+00
+17461 17461 1.00000000000000e+00
+17462 17462 1.00000000000000e+00
+17463 17463 1.00000000000000e+00
+17464 17464 1.00000000000000e+00
+17465 17465 1.00000000000000e+00
+17466 17466 1.00000000000000e+00
+17467 17467 1.00000000000000e+00
+17468 17468 1.00000000000000e+00
+17469 17469 1.00000000000000e+00
+17470 17470 1.00000000000000e+00
+17471 17471 1.00000000000000e+00
+17472 3789 -2.69315925168935e-04
+17472 3813 -1.27735214090191e-01
+17472 3837 -5.86754948615213e-02
+17472 3861 -9.55235986069291e-05
+17472 4389 -7.91085148021584e-01
+17472 4413 -4.98769432682692e+00
+17472 4437 -1.62540162070129e+00
+17472 4461 -8.48036522135806e-02
+17472 4485 -3.48101433441661e-05
+17472 4965 -2.95310796217855e-03
+17472 4989 -4.37787045752153e+00
+17472 5013 -1.21491661808581e+01
+17472 5037 -3.94528752716482e+00
+17472 5061 -2.75908869197928e-01
+17472 5085 -4.27068489809045e-05
+17472 5565 -1.17009061321144e-02
+17472 5589 -1.73985483446226e+00
+17472 5613 -3.32914583511335e+00
+17472 5637 -1.66495891798112e+00
+17472 5661 -8.46843250636792e-02
+17472 6165 -5.06717717815103e-06
+17472 6189 -1.99678375256179e-02
+17472 6213 -1.30866721526175e-01
+17472 6237 -7.03796648728665e-02
+17472 6261 -3.83203401246169e-04
+17472 6813 -3.64761453425580e-07
+17472 6837 -7.35209993245750e-07
+17472 17472 8.34560968819213e+00
+17472 16632 2.94482901828517e-01
+17472 16656 4.67222114420675e-01
+17472 16680 1.90138666925910e-01
+17472 16704 2.65772823641744e-02
+17472 17040 2.63307945879087e+00
+17472 17064 3.45834867769262e+00
+17472 17088 1.38078276116627e+00
+17472 17112 2.06994670444980e-01
+17472 17448 6.56077331714608e+00
+17472 17496 2.84901195706917e+00
+17472 17520 4.54332216932535e-01
+17472 17856 3.23794388911820e+00
+17472 17880 3.67164699493713e+00
+17472 17904 1.33207175863360e+00
+17472 17928 2.00736623449198e-01
+17472 18264 4.45699009410349e-01
+17472 18288 5.20546693731803e-01
+17472 18312 1.77960916292744e-01
+17472 18336 2.50127706152287e-02
+17473 17473 1.00000000000000e+00
+17474 17474 1.00000000000000e+00
+17475 17475 1.00000000000000e+00
+17476 17476 1.00000000000000e+00
+17477 17477 1.00000000000000e+00
+17478 17478 1.00000000000000e+00
+17479 17479 1.00000000000000e+00
+17480 17480 1.00000000000000e+00
+17481 17481 1.00000000000000e+00
+17482 17482 1.00000000000000e+00
+17483 17483 1.00000000000000e+00
+17484 17484 1.00000000000000e+00
+17485 17485 1.00000000000000e+00
+17486 17486 1.00000000000000e+00
+17487 17487 1.00000000000000e+00
+17488 17488 1.00000000000000e+00
+17489 17489 1.00000000000000e+00
+17490 17490 1.00000000000000e+00
+17491 17491 1.00000000000000e+00
+17492 17492 1.00000000000000e+00
+17493 17493 1.00000000000000e+00
+17494 17494 1.00000000000000e+00
+17495 17495 1.00000000000000e+00
+17496 3789 -1.74276804760171e-06
+17496 3813 -7.04889861285685e-03
+17496 3837 -7.88893963817137e-03
+17496 3861 -8.75407316449953e-05
+17496 4389 -1.48604071463105e-02
+17496 4413 -4.87838300554039e-01
+17496 4437 -1.23817040319278e+00
+17496 4461 -3.19772793067185e-01
+17496 4485 -3.21498529089219e-03
+17496 4965 -1.97635568482042e-05
+17496 4989 -1.67023864717947e-01
+17496 5013 -3.72294246617868e+00
+17496 5037 -8.83501779089225e+00
+17496 5061 -1.86663739218363e+00
+17496 5085 -4.20474139306105e-02
+17496 5565 -1.13643062235917e-04
+17496 5589 -1.70527780808149e-01
+17496 5613 -3.48549779286624e+00
+17496 5637 -6.98854935785902e+00
+17496 5661 -1.52988192885985e+00
+17496 5685 -1.82366467804069e-02
+17496 6165 -1.83644152629410e-07
+17496 6189 -1.02084568245076e-02
+17496 6213 -3.59725190023994e-01
+17496 6237 -5.91340677496694e-01
+17496 6261 -1.26225497284194e-01
+17496 6285 -7.26598831971732e-05
+17496 6813 -4.38145079191064e-05
+17496 6837 -1.95469579268325e-03
+17496 6861 -4.92803893296477e-04
+17496 17496 8.91745842228487e+00
+17496 16632 2.09573843673030e-02
+17496 16656 1.90138666925910e-01
+17496 16680 4.67796934250376e-01
+17496 16704 1.92721257681829e-01
+17496 16728 2.16030320562830e-02
+17496 17040 1.38201019846583e-01
+17496 17064 1.38078276116627e+00
+17496 17088 3.62350257752155e+00
+17496 17112 1.52152600400077e+00
+17496 17136 1.73386830555207e-01
+17496 17448 2.57920772334743e-01
+17496 17472 2.84901195706917e+00
+17496 17520 3.37821758384733e+00
+17496 17544 3.90222179029280e-01
+17496 17856 1.32281316209199e-01
+17496 17880 1.33207175863361e+00
+17496 17904 3.51392334433730e+00
+17496 17928 1.48237070556025e+00
+17496 17952 1.69856052940862e-01
+17496 18264 1.94774584579571e-02
+17496 18288 1.77960916292744e-01
+17496 18312 4.40402125954314e-01
+17496 18336 1.82932433071701e-01
+17496 18360 2.07203376526966e-02
+17497 17497 1.00000000000000e+00
+17498 17498 1.00000000000000e+00
+17499 17499 1.00000000000000e+00
+17500 17500 1.00000000000000e+00
+17501 17501 1.00000000000000e+00
+17502 17502 1.00000000000000e+00
+17503 17503 1.00000000000000e+00
+17504 17504 1.00000000000000e+00
+17505 17505 1.00000000000000e+00
+17506 17506 1.00000000000000e+00
+17507 17507 1.00000000000000e+00
+17508 17508 1.00000000000000e+00
+17509 17509 1.00000000000000e+00
+17510 17510 1.00000000000000e+00
+17511 17511 1.00000000000000e+00
+17512 17512 1.00000000000000e+00
+17513 17513 1.00000000000000e+00
+17514 17514 1.00000000000000e+00
+17515 17515 1.00000000000000e+00
+17516 17516 1.00000000000000e+00
+17517 17517 1.00000000000000e+00
+17518 17518 1.00000000000000e+00
+17519 17519 1.00000000000000e+00
+17520 3813 -9.74644038470988e-06
+17520 3837 -2.68364539589388e-04
+17520 3861 -1.69759551982035e-05
+17520 4413 -2.65648743547446e-02
+17520 4437 -2.85679637321199e-01
+17520 4461 -2.40577424961979e-01
+17520 4485 -1.42016680674157e-02
+17520 4509 -1.61126130499370e-07
+17520 4989 -6.01640639348683e-04
+17520 5013 -6.13134529254239e-01
+17520 5037 -4.21473093150739e+00
+17520 5061 -3.73729413925658e+00
+17520 5085 -3.78249300822852e-01
+17520 5109 -2.65351095419135e-03
+17520 5589 -8.17707393505380e-03
+17520 5613 -9.54578846059258e-01
+17520 5637 -7.39535321592706e+00
+17520 5661 -6.59932721052840e+00
+17520 5685 -6.65735053161055e-01
+17520 5709 -2.05148678363376e-03
+17520 6189 -1.58120002869856e-03
+17520 6213 -1.98962185579801e-01
+17520 6237 -1.52417843992884e+00
+17520 6261 -1.29413504051999e+00
+17520 6285 -1.43215743617080e-01
+17520 6309 -5.60692149366310e-07
+17520 6813 -1.77369989909068e-04
+17520 6837 -1.83378568091769e-02
+17520 6861 -2.95734225758219e-02
+17520 6885 -9.85286141680775e-04
+17520 17520 8.05020205385262e+00
+17520 16656 2.65772823641744e-02
+17520 16680 1.92721257681829e-01
+17520 16704 3.92596920386013e-01
+17520 16728 1.67896628710375e-01
+17520 16752 2.03711251213107e-02
+17520 17064 2.06994670444980e-01
+17520 17088 1.52152600400077e+00
+17520 17112 3.14075947710278e+00
+17520 17136 1.33184939331853e+00
+17520 17160 1.59575517774422e-01
+17520 17472 4.54332216932535e-01
+17520 17496 3.37821758384733e+00
+17520 17544 2.97014860592260e+00
+17520 17568 3.52314972451355e-01
+17520 17880 2.00736623449198e-01
+17520 17904 1.48237070556025e+00
+17520 17928 3.07484360048553e+00
+17520 17952 1.30506473169342e+00
+17520 17976 1.56410129982489e-01
+17520 18288 2.50127706152287e-02
+17520 18312 1.82932433071701e-01
+17520 18336 3.76117951231702e-01
+17520 18360 1.61200463304097e-01
+17520 18384 1.95797781733276e-02
+17521 17521 1.00000000000000e+00
+17522 17522 1.00000000000000e+00
+17523 17523 1.00000000000000e+00
+17524 17524 1.00000000000000e+00
+17525 17525 1.00000000000000e+00
+17526 17526 1.00000000000000e+00
+17527 17527 1.00000000000000e+00
+17528 17528 1.00000000000000e+00
+17529 17529 1.00000000000000e+00
+17530 17530 1.00000000000000e+00
+17531 17531 1.00000000000000e+00
+17532 17532 1.00000000000000e+00
+17533 17533 1.00000000000000e+00
+17534 17534 1.00000000000000e+00
+17535 17535 1.00000000000000e+00
+17536 17536 1.00000000000000e+00
+17537 17537 1.00000000000000e+00
+17538 17538 1.00000000000000e+00
+17539 17539 1.00000000000000e+00
+17540 17540 1.00000000000000e+00
+17541 17541 1.00000000000000e+00
+17542 17542 1.00000000000000e+00
+17543 17543 1.00000000000000e+00
+17544 4437 -1.24654553297144e-02
+17544 4461 -5.22627933309471e-02
+17544 4485 -1.05393873554719e-02
+17544 4509 -7.02160393795410e-07
+17544 5013 -5.13431393213634e-03
+17544 5037 -6.12047630761570e-01
+17544 5061 -2.02840327989387e+00
+17544 5085 -9.90842359719972e-01
+17544 5109 -4.05088426167653e-02
+17544 5133 -1.04073115619177e-05
+17544 5613 -5.53882674114008e-02
+17544 5637 -2.25808474336955e+00
+17544 5661 -8.57804786423762e+00
+17544 5685 -3.65852053446200e+00
+17544 5709 -1.85183137996139e-01
+17544 5733 -2.24011129438340e-05
+17544 6213 -3.06138592859693e-02
+17544 6237 -1.08618188199010e+00
+17544 6261 -3.97166244870866e+00
+17544 6285 -1.83374722468627e+00
+17544 6309 -7.95778024835329e-02
+17544 6813 -7.26889822415083e-05
+17544 6837 -4.65170820385603e-02
+17544 6861 -2.13828212972154e-01
+17544 6885 -9.46399802028858e-02
+17544 6909 -8.00980653817310e-04
+17544 7461 -2.95151509768486e-05
+17544 7485 -4.25390998073089e-05
+17544 17544 7.37694384582184e+00
+17544 16680 2.16030320562830e-02
+17544 16704 1.67896628710375e-01
+17544 16728 3.67058006646683e-01
+17544 16752 1.59552391082956e-01
+17544 16776 1.95169726494283e-02
+17544 17088 1.73386830555207e-01
+17544 17112 1.33184939331853e+00
+17544 17136 2.88240510455080e+00
+17544 17160 1.26154202951682e+00
+17544 17184 1.55809989604779e-01
+17544 17496 3.90222179029280e-01
+17544 17520 2.97014860592260e+00
+17544 17568 2.80798832008811e+00
+17544 17592 3.49682107570658e-01
+17544 17904 1.69856052940862e-01
+17544 17928 1.30506473169342e+00
+17544 17952 2.82694718723967e+00
+17544 17976 1.24375673824568e+00
+17544 18000 1.54529054578926e-01
+17544 18312 2.07203376526966e-02
+17544 18336 1.61200463304097e-01
+17544 18360 3.53193527318903e-01
+17544 18384 1.55106068265170e-01
+17544 18408 1.91967388929650e-02
+17545 17545 1.00000000000000e+00
+17546 17546 1.00000000000000e+00
+17547 17547 1.00000000000000e+00
+17548 17548 1.00000000000000e+00
+17549 17549 1.00000000000000e+00
+17550 17550 1.00000000000000e+00
+17551 17551 1.00000000000000e+00
+17552 17552 1.00000000000000e+00
+17553 17553 1.00000000000000e+00
+17554 17554 1.00000000000000e+00
+17555 17555 1.00000000000000e+00
+17556 17556 1.00000000000000e+00
+17557 17557 1.00000000000000e+00
+17558 17558 1.00000000000000e+00
+17559 17559 1.00000000000000e+00
+17560 17560 1.00000000000000e+00
+17561 17561 1.00000000000000e+00
+17562 17562 1.00000000000000e+00
+17563 17563 1.00000000000000e+00
+17564 17564 1.00000000000000e+00
+17565 17565 1.00000000000000e+00
+17566 17566 1.00000000000000e+00
+17567 17567 1.00000000000000e+00
+17568 4437 -9.85236182442100e-08
+17568 4461 -2.45335414009289e-03
+17568 4485 -1.89638474168424e-03
+17568 4509 -3.91749617691140e-07
+17568 5037 -1.21795169504232e-02
+17568 5061 -3.49928920340780e-01
+17568 5085 -6.40927707820455e-01
+17568 5109 -1.39874140180184e-01
+17568 5133 -9.28518009400162e-04
+17568 5613 -1.05957427505539e-05
+17568 5637 -2.01108282090794e-01
+17568 5661 -3.29949882568259e+00
+17568 5685 -6.03043027825399e+00
+17568 5709 -1.24030980514066e+00
+17568 5733 -2.92174748183979e-02
+17568 6213 -1.86508968564509e-04
+17568 6237 -2.18551967117538e-01
+17568 6261 -3.51256895453249e+00
+17568 6285 -6.53788922342882e+00
+17568 6309 -1.41055889312211e+00
+17568 6333 -1.82588596240220e-02
+17568 6813 -7.58338003402606e-06
+17568 6837 -2.03097815182608e-02
+17568 6861 -4.78760119398734e-01
+17568 6885 -7.75414771434272e-01
+17568 6909 -1.75026824014733e-01
+17568 6933 -1.88632296335788e-04
+17568 7461 -4.98462211108428e-04
+17568 7485 -6.53347571849014e-03
+17568 7509 -1.27623034386604e-03
+17568 17568 7.28740210760278e+00
+17568 16704 2.03711251213107e-02
+17568 16728 1.59552391082956e-01
+17568 16752 3.51884712477780e-01
+17568 16776 1.55035990460178e-01
+17568 16800 1.92420249656163e-02
+17568 17112 1.59575517774422e-01
+17568 17136 1.26154202951682e+00
+17568 17160 2.80506450856887e+00
+17568 17184 1.23335658689082e+00
+17568 17208 1.52529157117923e-01
+17568 17520 3.52314972451355e-01
+17568 17544 2.80798832008811e+00
+17568 17592 2.75942208636537e+00
+17568 17616 3.40173414020670e-01
+17568 17928 1.56410129982489e-01
+17568 17952 1.24375673824568e+00
+17568 17976 2.77918470063371e+00
+17568 18000 1.21935500786909e+00
+17568 18024 1.50309697388343e-01
+17568 18336 1.95797781733276e-02
+17568 18360 1.55106068265170e-01
+17568 18384 3.45414760493988e-01
+17568 18408 1.51535595704744e-01
+17568 18432 1.86871600332211e-02
+17569 17569 1.00000000000000e+00
+17570 17570 1.00000000000000e+00
+17571 17571 1.00000000000000e+00
+17572 17572 1.00000000000000e+00
+17573 17573 1.00000000000000e+00
+17574 17574 1.00000000000000e+00
+17575 17575 1.00000000000000e+00
+17576 17576 1.00000000000000e+00
+17577 17577 1.00000000000000e+00
+17578 17578 1.00000000000000e+00
+17579 17579 1.00000000000000e+00
+17580 17580 1.00000000000000e+00
+17581 17581 1.00000000000000e+00
+17582 17582 1.00000000000000e+00
+17583 17583 1.00000000000000e+00
+17584 17584 1.00000000000000e+00
+17585 17585 1.00000000000000e+00
+17586 17586 1.00000000000000e+00
+17587 17587 1.00000000000000e+00
+17588 17588 1.00000000000000e+00
+17589 17589 1.00000000000000e+00
+17590 17590 1.00000000000000e+00
+17591 17591 1.00000000000000e+00
+17592 4461 -5.23645026792810e-07
+17592 4485 -8.12642191870758e-06
+17592 4509 -5.76558717979400e-08
+17592 5061 -1.07863231621519e-02
+17592 5085 -1.28438112447599e-01
+17592 5109 -1.01039043382733e-01
+17592 5133 -3.87791204741481e-03
+17592 5637 -2.81844181765467e-04
+17592 5661 -3.98034187425594e-01
+17592 5685 -2.71989718090500e+00
+17592 5709 -2.48901865479227e+00
+17592 5733 -2.51669427949051e-01
+17592 5757 -1.55307223477496e-03
+17592 6237 -6.94726832043429e-03
+17592 6261 -8.64674467026414e-01
+17592 6285 -6.82542888510073e+00
+17592 6309 -5.99220336649914e+00
+17592 6333 -6.00080589743590e-01
+17592 6357 -2.01993850345182e-03
+17592 6837 -2.44491993247956e-03
+17592 6861 -2.60977235824411e-01
+17592 6885 -1.96287925132751e+00
+17592 6909 -1.66908141813580e+00
+17592 6933 -1.83173325846024e-01
+17592 6957 -4.19657041456257e-06
+17592 7461 -1.58782338679894e-03
+17592 7485 -4.68504653711729e-02
+17592 7509 -5.45870460972286e-02
+17592 7533 -2.06384177255707e-03
+17592 17592 7.12836795763660e+00
+17592 16728 1.95169726494283e-02
+17592 16752 1.55035990460178e-01
+17592 16776 3.46776184423020e-01
+17592 16800 1.54515349157387e-01
+17592 16824 1.93868123237305e-02
+17592 17136 1.55809989604779e-01
+17592 17160 1.23335658689082e+00
+17592 17184 2.74834412024163e+00
+17592 17208 1.21838709547178e+00
+17592 17232 1.52067616750017e-01
+17592 17544 3.49682107570658e-01
+17592 17568 2.75942208636537e+00
+17592 17616 2.70433855902273e+00
+17592 17640 3.35911225734997e-01
+17592 17952 1.54529054578926e-01
+17592 17976 1.21935500786909e+00
+17592 18000 2.70777635461111e+00
+17592 18024 1.19440735682797e+00
+17592 18048 1.48292141818646e-01
+17592 18360 1.91967388929650e-02
+17592 18384 1.51535595704744e-01
+17592 18408 3.36634243015390e-01
+17592 18432 1.48520414496436e-01
+17592 18456 1.84429435908879e-02
+17593 17593 1.00000000000000e+00
+17594 17594 1.00000000000000e+00
+17595 17595 1.00000000000000e+00
+17596 17596 1.00000000000000e+00
+17597 17597 1.00000000000000e+00
+17598 17598 1.00000000000000e+00
+17599 17599 1.00000000000000e+00
+17600 17600 1.00000000000000e+00
+17601 17601 1.00000000000000e+00
+17602 17602 1.00000000000000e+00
+17603 17603 1.00000000000000e+00
+17604 17604 1.00000000000000e+00
+17605 17605 1.00000000000000e+00
+17606 17606 1.00000000000000e+00
+17607 17607 1.00000000000000e+00
+17608 17608 1.00000000000000e+00
+17609 17609 1.00000000000000e+00
+17610 17610 1.00000000000000e+00
+17611 17611 1.00000000000000e+00
+17612 17612 1.00000000000000e+00
+17613 17613 1.00000000000000e+00
+17614 17614 1.00000000000000e+00
+17615 17615 1.00000000000000e+00
+17616 5085 -5.56833331860741e-03
+17616 5109 -1.99554679510910e-02
+17616 5133 -2.16668756254668e-03
+17616 5661 -2.84679740778396e-03
+17616 5685 -3.86242857738424e-01
+17616 5709 -1.29828131778269e+00
+17616 5733 -6.28655875378816e-01
+17616 5757 -2.16988591599805e-02
+17616 5781 -3.16656089837681e-06
+17616 6261 -4.94199897693984e-02
+17616 6285 -2.04795403555764e+00
+17616 6309 -7.56571605479389e+00
+17616 6333 -3.12316738344967e+00
+17616 6357 -1.52428787925998e-01
+17616 6381 -1.39127671343208e-05
+17616 6861 -4.04287971817127e-02
+17616 6885 -1.32125388491844e+00
+17616 6909 -4.82545053729425e+00
+17616 6933 -2.12020356069703e+00
+17616 6957 -8.88788763992180e-02
+17616 6981 -5.56057466610000e-10
+17616 7461 -5.27208835272881e-04
+17616 7485 -9.59262161090060e-02
+17616 7509 -3.57157477180801e-01
+17616 7533 -1.52427932049992e-01
+17616 7557 -1.81437017932960e-03
+17616 8109 -3.45218003082492e-04
+17616 8133 -3.62720964486753e-04
+17616 17616 7.05170990002158e+00
+17616 16752 1.92420249656163e-02
+17616 16776 1.54515349157387e-01
+17616 16800 3.48306772694070e-01
+17616 16824 1.53050251489984e-01
+17616 16848 1.88757505487653e-02
+17616 17160 1.52529157117923e-01
+17616 17184 1.21838709547177e+00
+17616 17208 2.73598085723523e+00
+17616 17232 1.20974979546801e+00
+17616 17256 1.50369832116982e-01
+17616 17568 3.40173414020670e-01
+17616 17592 2.70433855902272e+00
+17616 17640 2.69147239990298e+00
+17616 17664 3.36956874240736e-01
+17616 17976 1.50309697388343e-01
+17616 18000 1.19440735682797e+00
+17616 18024 2.67230601242581e+00
+17616 18048 1.19045675103090e+00
+17616 18072 1.49322045939075e-01
+17616 18384 1.86871600332211e-02
+17616 18408 1.48520414496436e-01
+17616 18432 3.32388061491717e-01
+17616 18456 1.48226990380707e-01
+17616 18480 1.86138040042888e-02
+17617 17617 1.00000000000000e+00
+17618 17618 1.00000000000000e+00
+17619 17619 1.00000000000000e+00
+17620 17620 1.00000000000000e+00
+17621 17621 1.00000000000000e+00
+17622 17622 1.00000000000000e+00
+17623 17623 1.00000000000000e+00
+17624 17624 1.00000000000000e+00
+17625 17625 1.00000000000000e+00
+17626 17626 1.00000000000000e+00
+17627 17627 1.00000000000000e+00
+17628 17628 1.00000000000000e+00
+17629 17629 1.00000000000000e+00
+17630 17630 1.00000000000000e+00
+17631 17631 1.00000000000000e+00
+17632 17632 1.00000000000000e+00
+17633 17633 1.00000000000000e+00
+17634 17634 1.00000000000000e+00
+17635 17635 1.00000000000000e+00
+17636 17636 1.00000000000000e+00
+17637 17637 1.00000000000000e+00
+17638 17638 1.00000000000000e+00
+17639 17639 1.00000000000000e+00
+17640 5085 -1.78107971630000e-10
+17640 5109 -5.78508518996033e-04
+17640 5133 -3.19949948932865e-04
+17640 5685 -6.28028490483834e-03
+17640 5709 -2.12078387164962e-01
+17640 5733 -3.73523759437002e-01
+17640 5757 -7.01592677812311e-02
+17640 5781 -1.83814698169984e-04
+17640 6261 -3.38983153372560e-06
+17640 6285 -1.75776519637665e-01
+17640 6309 -2.74137618073188e+00
+17640 6333 -4.76234705419661e+00
+17640 6357 -9.64335460689657e-01
+17640 6381 -2.12466860893378e-02
+17640 6861 -2.44302264716897e-04
+17640 6885 -2.53821298188305e-01
+17640 6909 -3.94652603057979e+00
+17640 6933 -7.08479211929127e+00
+17640 6957 -1.43848699559362e+00
+17640 6981 -1.97985618629701e-02
+17640 7461 -3.67018070179620e-05
+17640 7485 -3.79318522441513e-02
+17640 7509 -7.34647396722995e-01
+17640 7533 -1.14383406827339e+00
+17640 7557 -2.57273709859605e-01
+17640 7581 -4.24155580695295e-04
+17640 8109 -3.03185917096303e-03
+17640 8133 -1.79537556714427e-02
+17640 8157 -2.89134898941351e-03
+17640 17640 7.06385545660237e+00
+17640 16776 1.93868123237305e-02
+17640 16800 1.53050251489984e-01
+17640 16824 3.40595559996941e-01
+17640 16848 1.52289957766921e-01
+17640 16872 1.91967388929648e-02
+17640 17184 1.52067616750017e-01
+17640 17208 1.20974979546801e+00
+17640 17232 2.70952052632652e+00
+17640 17256 1.20762171128691e+00
+17640 17280 1.51535595704743e-01
+17640 17592 3.35911225734997e-01
+17640 17616 2.69147239990299e+00
+17640 17664 2.69436446902455e+00
+17640 17688 3.36634243015388e-01
+17640 18000 1.48292141818646e-01
+17640 18024 1.19045675103090e+00
+17640 18048 2.68596529134034e+00
+17640 18072 1.19136984174206e+00
+17640 18096 1.48520414496435e-01
+17640 18408 1.84429435908879e-02
+17640 18432 1.48226990380707e-01
+17640 18456 3.34706751250396e-01
+17640 18480 1.48226990380706e-01
+17640 18504 1.84429435908877e-02
+17641 17641 1.00000000000000e+00
+17642 17642 1.00000000000000e+00
+17643 17643 1.00000000000000e+00
+17644 17644 1.00000000000000e+00
+17645 17645 1.00000000000000e+00
+17646 17646 1.00000000000000e+00
+17647 17647 1.00000000000000e+00
+17648 17648 1.00000000000000e+00
+17649 17649 1.00000000000000e+00
+17650 17650 1.00000000000000e+00
+17651 17651 1.00000000000000e+00
+17652 17652 1.00000000000000e+00
+17653 17653 1.00000000000000e+00
+17654 17654 1.00000000000000e+00
+17655 17655 1.00000000000000e+00
+17656 17656 1.00000000000000e+00
+17657 17657 1.00000000000000e+00
+17658 17658 1.00000000000000e+00
+17659 17659 1.00000000000000e+00
+17660 17660 1.00000000000000e+00
+17661 17661 1.00000000000000e+00
+17662 17662 1.00000000000000e+00
+17663 17663 1.00000000000000e+00
+17664 5109 -1.00590931000000e-11
+17664 5133 -6.64224849700000e-11
+17664 5709 -5.35878571918439e-03
+17664 5733 -6.87655032636447e-02
+17664 5757 -4.21980672869890e-02
+17664 5781 -7.15434311001531e-04
+17664 6285 -1.47971231592431e-04
+17664 6309 -3.05397524757639e-01
+17664 6333 -1.99343558131643e+00
+17664 6357 -1.80327671377133e+00
+17664 6381 -1.70937578879019e-01
+17664 6405 -8.71566016129867e-04
+17664 6885 -7.04436337218164e-03
+17664 6909 -9.17064794435828e-01
+17664 6933 -6.90984690437403e+00
+17664 6957 -5.79840393114081e+00
+17664 6981 -5.54442084415410e-01
+17664 7005 -1.94985337928620e-03
+17664 7485 -4.14430081245733e-03
+17664 7509 -3.71678060230641e-01
+17664 7533 -2.67868645090642e+00
+17664 7557 -2.23326814143205e+00
+17664 7581 -2.34465262564620e-01
+17664 7605 -1.54190474932791e-05
+17664 8109 -7.05238029109572e-03
+17664 8133 -1.06320221811236e-01
+17664 8157 -9.93778601986976e-02
+17664 8181 -4.43884181165063e-03
+17664 8733 -3.90152634118470e-07
+17664 8757 -4.56708922212459e-06
+17664 8781 -3.17062769720000e-09
+17664 17664 7.06341460812455e+00
+17664 16800 1.88757505487653e-02
+17664 16824 1.52289957766921e-01
+17664 16848 3.45459097587969e-01
+17664 16872 1.54529054578924e-01
+17664 16896 1.94355247517661e-02
+17664 17208 1.50369832116982e-01
+17664 17232 1.20762171128691e+00
+17664 17256 2.72824251965545e+00
+17664 17280 1.21935500786909e+00
+17664 17304 1.53303156262526e-01
+17664 17616 3.36956874240736e-01
+17664 17640 2.69436446902455e+00
+17664 17688 2.70777635461115e+00
+17664 17712 3.40309845637385e-01
+17664 18024 1.49322045939075e-01
+17664 18048 1.19136984174206e+00
+17664 18072 2.67573010259264e+00
+17664 18096 1.19440735682796e+00
+17664 18120 1.50081424710553e-01
+17664 18432 1.86138040042888e-02
+17664 18456 1.48226990380706e-01
+17664 18480 3.32330993322265e-01
+17664 18504 1.48292141818642e-01
+17664 18528 1.86300918637728e-02
+17665 17665 1.00000000000000e+00
+17666 17666 1.00000000000000e+00
+17667 17667 1.00000000000000e+00
+17668 17668 1.00000000000000e+00
+17669 17669 1.00000000000000e+00
+17670 17670 1.00000000000000e+00
+17671 17671 1.00000000000000e+00
+17672 17672 1.00000000000000e+00
+17673 17673 1.00000000000000e+00
+17674 17674 1.00000000000000e+00
+17675 17675 1.00000000000000e+00
+17676 17676 1.00000000000000e+00
+17677 17677 1.00000000000000e+00
+17678 17678 1.00000000000000e+00
+17679 17679 1.00000000000000e+00
+17680 17680 1.00000000000000e+00
+17681 17681 1.00000000000000e+00
+17682 17682 1.00000000000000e+00
+17683 17683 1.00000000000000e+00
+17684 17684 1.00000000000000e+00
+17685 17685 1.00000000000000e+00
+17686 17686 1.00000000000000e+00
+17687 17687 1.00000000000000e+00
+17688 5733 -2.44491993247954e-03
+17688 5757 -6.94726832043423e-03
+17688 5781 -2.81844181765463e-04
+17688 6309 -1.58782338679894e-03
+17688 6333 -2.60977235824409e-01
+17688 6357 -8.64674467026406e-01
+17688 6381 -3.98034187425587e-01
+17688 6405 -1.07863231621519e-02
+17688 6429 -5.23645026792810e-07
+17688 6909 -4.68504653711725e-02
+17688 6933 -1.96287925132752e+00
+17688 6957 -6.82542888510088e+00
+17688 6981 -2.71989718090503e+00
+17688 7005 -1.28438112447600e-01
+17688 7029 -8.12642191870762e-06
+17688 7509 -5.45870460972280e-02
+17688 7533 -1.66908141813578e+00
+17688 7557 -5.99220336649925e+00
+17688 7581 -2.48901865479233e+00
+17688 7605 -1.01039043382734e-01
+17688 7629 -5.76558717979400e-08
+17688 8109 -2.06384177255703e-03
+17688 8133 -1.83173325846016e-01
+17688 8157 -6.00080589743577e-01
+17688 8181 -2.51669427949046e-01
+17688 8205 -3.87791204741487e-03
+17688 8733 -4.19657041456251e-06
+17688 8757 -2.01993850345182e-03
+17688 8781 -1.55307223477496e-03
+17688 17688 7.12836795763680e+00
+17688 16824 1.91967388929648e-02
+17688 16848 1.54529054578924e-01
+17688 16872 3.49682107570650e-01
+17688 16896 1.55809989604778e-01
+17688 16920 1.95169726494284e-02
+17688 17232 1.51535595704743e-01
+17688 17256 1.21935500786909e+00
+17688 17280 2.75942208636539e+00
+17688 17304 1.23335658689084e+00
+17688 17328 1.55035990460180e-01
+17688 17640 3.36634243015388e-01
+17688 17664 2.70777635461115e+00
+17688 17712 2.74834412024170e+00
+17688 17736 3.46776184423025e-01
+17688 18048 1.48520414496435e-01
+17688 18072 1.19440735682796e+00
+17688 18096 2.70433855902272e+00
+17688 18120 1.21838709547178e+00
+17688 18144 1.54515349157389e-01
+17688 18456 1.84429435908877e-02
+17688 18480 1.48292141818642e-01
+17688 18504 3.35911225734983e-01
+17688 18528 1.52067616750014e-01
+17688 18552 1.93868123237306e-02
+17689 17689 1.00000000000000e+00
+17690 17690 1.00000000000000e+00
+17691 17691 1.00000000000000e+00
+17692 17692 1.00000000000000e+00
+17693 17693 1.00000000000000e+00
+17694 17694 1.00000000000000e+00
+17695 17695 1.00000000000000e+00
+17696 17696 1.00000000000000e+00
+17697 17697 1.00000000000000e+00
+17698 17698 1.00000000000000e+00
+17699 17699 1.00000000000000e+00
+17700 17700 1.00000000000000e+00
+17701 17701 1.00000000000000e+00
+17702 17702 1.00000000000000e+00
+17703 17703 1.00000000000000e+00
+17704 17704 1.00000000000000e+00
+17705 17705 1.00000000000000e+00
+17706 17706 1.00000000000000e+00
+17707 17707 1.00000000000000e+00
+17708 17708 1.00000000000000e+00
+17709 17709 1.00000000000000e+00
+17710 17710 1.00000000000000e+00
+17711 17711 1.00000000000000e+00
+17712 5757 -7.18384143752443e-05
+17712 5781 -2.76739317972466e-05
+17712 6333 -3.14675205445592e-03
+17712 6357 -1.30268316315284e-01
+17712 6381 -2.15879675201222e-01
+17712 6405 -3.19984746935321e-02
+17712 6429 -1.38112665047087e-05
+17712 6909 -6.25027141297620e-07
+17712 6933 -1.55713479595503e-01
+17712 6957 -2.30931516770862e+00
+17712 6981 -3.84397367768766e+00
+17712 7005 -7.66829074925678e-01
+17712 7029 -1.51559787944263e-02
+17712 7509 -3.08191473876528e-04
+17712 7533 -3.03095516402849e-01
+17712 7557 -4.54342432343419e+00
+17712 7581 -7.82063470981192e+00
+17712 7605 -1.49717127446900e+00
+17712 7629 -2.16090931874471e-02
+17712 8109 -1.03213653480994e-04
+17712 8133 -6.74916128452622e-02
+17712 8157 -1.14368139928723e+00
+17712 8181 -1.73159753784728e+00
+17712 8205 -3.81038440365969e-01
+17712 8229 -8.50483332369737e-04
+17712 8733 -1.09340842857506e-05
+17712 8757 -1.29819148068438e-02
+17712 8781 -4.32773454137625e-02
+17712 8805 -6.15205480232564e-03
+17712 17712 7.24442172701023e+00
+17712 16848 1.94355247517661e-02
+17712 16872 1.55809989604778e-01
+17712 16896 3.51917402669346e-01
+17712 16920 1.58909152704614e-01
+17712 16944 2.02103155267251e-02
+17712 17256 1.53303156262526e-01
+17712 17280 1.23335658689084e+00
+17712 17304 2.79375021560833e+00
+17712 17328 1.25962880977220e+00
+17712 17352 1.59871211982866e-01
+17712 17664 3.40309845637385e-01
+17712 17688 2.74834412024170e+00
+17712 17736 2.80987646010903e+00
+17712 17760 3.55692930604217e-01
+17712 18072 1.50081424710553e-01
+17712 18096 1.21838709547178e+00
+17712 18120 2.77880822339931e+00
+17712 18144 1.24398624531149e+00
+17712 18168 1.56481212170480e-01
+17712 18480 1.86300918637728e-02
+17712 18504 1.52067616750014e-01
+17712 18528 3.48181904617092e-01
+17712 18552 1.54998511589437e-01
+17712 18576 1.93628155736285e-02
+17713 17713 1.00000000000000e+00
+17714 17714 1.00000000000000e+00
+17715 17715 1.00000000000000e+00
+17716 17716 1.00000000000000e+00
+17717 17717 1.00000000000000e+00
+17718 17718 1.00000000000000e+00
+17719 17719 1.00000000000000e+00
+17720 17720 1.00000000000000e+00
+17721 17721 1.00000000000000e+00
+17722 17722 1.00000000000000e+00
+17723 17723 1.00000000000000e+00
+17724 17724 1.00000000000000e+00
+17725 17725 1.00000000000000e+00
+17726 17726 1.00000000000000e+00
+17727 17727 1.00000000000000e+00
+17728 17728 1.00000000000000e+00
+17729 17729 1.00000000000000e+00
+17730 17730 1.00000000000000e+00
+17731 17731 1.00000000000000e+00
+17732 17732 1.00000000000000e+00
+17733 17733 1.00000000000000e+00
+17734 17734 1.00000000000000e+00
+17735 17735 1.00000000000000e+00
+17736 6357 -2.75454565147808e-03
+17736 6381 -3.58048723393153e-02
+17736 6405 -1.50083400241687e-02
+17736 6429 -4.77885378091531e-05
+17736 6933 -6.59348435444717e-05
+17736 6957 -2.35972834052837e-01
+17736 6981 -1.48988839847491e+00
+17736 7005 -1.32965709172449e+00
+17736 7029 -1.18129358804485e-01
+17736 7053 -4.73461040574706e-04
+17736 7533 -7.22537427582627e-03
+17736 7557 -9.98666130461241e-01
+17736 7581 -7.13291989148029e+00
+17736 7605 -5.76875780633061e+00
+17736 7629 -5.43816655026184e-01
+17736 7653 -1.98398564923313e-03
+17736 8133 -6.88640208816362e-03
+17736 8157 -5.34791752860124e-01
+17736 8181 -3.75690140381855e+00
+17736 8205 -3.09628035087754e+00
+17736 8229 -3.13158933648115e-01
+17736 8253 -4.68209319752302e-05
+17736 8733 -2.63632843519918e-06
+17736 8757 -2.21346096836280e-02
+17736 8781 -2.26074176801012e-01
+17736 8805 -1.90496251634988e-01
+17736 8829 -9.94001768869176e-03
+17736 9381 -2.84457677356830e-05
+17736 9405 -1.52153242486523e-04
+17736 9429 -2.31168330062640e-07
+17736 17736 7.41816968014238e+00
+17736 16872 1.95169726494284e-02
+17736 16896 1.58909152704614e-01
+17736 16920 3.64809417098173e-01
+17736 16944 1.68550846191473e-01
+17736 16968 2.19273960211432e-02
+17736 17280 1.55035990460180e-01
+17736 17304 1.25962880977220e+00
+17736 17328 2.88497387994915e+00
+17736 17352 1.32747883898370e+00
+17736 17376 1.71998497763054e-01
+17736 17688 3.46776184423025e-01
+17736 17712 2.80987646010903e+00
+17736 17760 2.94399814662354e+00
+17736 17784 3.80306606051653e-01
+17736 18096 1.54515349157389e-01
+17736 18120 1.24398624531149e+00
+17736 18144 2.82739787882995e+00
+17736 18168 1.30265738846123e+00
+17736 18192 1.69183134944824e-01
+17736 18504 1.93868123237306e-02
+17736 18528 1.54998511589437e-01
+17736 18552 3.50415416818372e-01
+17736 18576 1.62345483560857e-01
+17736 18600 2.12235553165857e-02
+17737 17737 1.00000000000000e+00
+17738 17738 1.00000000000000e+00
+17739 17739 1.00000000000000e+00
+17740 17740 1.00000000000000e+00
+17741 17741 1.00000000000000e+00
+17742 17742 1.00000000000000e+00
+17743 17743 1.00000000000000e+00
+17744 17744 1.00000000000000e+00
+17745 17745 1.00000000000000e+00
+17746 17746 1.00000000000000e+00
+17747 17747 1.00000000000000e+00
+17748 17748 1.00000000000000e+00
+17749 17749 1.00000000000000e+00
+17750 17750 1.00000000000000e+00
+17751 17751 1.00000000000000e+00
+17752 17752 1.00000000000000e+00
+17753 17753 1.00000000000000e+00
+17754 17754 1.00000000000000e+00
+17755 17755 1.00000000000000e+00
+17756 17756 1.00000000000000e+00
+17757 17757 1.00000000000000e+00
+17758 17758 1.00000000000000e+00
+17759 17759 1.00000000000000e+00
+17760 6381 -8.99956012314778e-04
+17760 6405 -1.93303940305554e-03
+17760 6429 -1.33092751663792e-05
+17760 6957 -7.98683687606921e-04
+17760 6981 -1.78671550878463e-01
+17760 7005 -6.02940997111874e-01
+17760 7029 -2.65399292796337e-01
+17760 7053 -5.36026349040991e-03
+17760 7077 -1.96062915748000e-09
+17760 7557 -4.55087334551132e-02
+17760 7581 -1.93483237870046e+00
+17760 7605 -6.49493602195037e+00
+17760 7629 -2.64775831761201e+00
+17760 7653 -1.31722113288675e-01
+17760 7677 -4.68162706606940e-06
+17760 8133 -6.06677257560000e-10
+17760 8157 -7.37384779871936e-02
+17760 8181 -2.22780410194089e+00
+17760 8205 -8.01336539963256e+00
+17760 8229 -3.40775270230962e+00
+17760 8253 -1.43573546139108e-01
+17760 8277 -4.00202380170130e-07
+17760 8733 -9.21392776400000e-11
+17760 8757 -5.97175117773276e-03
+17760 8781 -3.54816042167546e-01
+17760 8805 -1.11422845009591e+00
+17760 8829 -4.95781694150881e-01
+17760 8853 -9.42561470530932e-03
+17760 9381 -2.02465739836170e-04
+17760 9405 -9.40248882104714e-03
+17760 9429 -5.38291298606250e-03
+17760 17760 7.90720107965390e+00
+17760 16896 2.02103155267251e-02
+17760 16920 1.68550846191473e-01
+17760 16944 3.97019136574115e-01
+17760 16968 1.91591522920964e-01
+17760 16992 2.59704847090979e-02
+17760 17304 1.59871211982866e-01
+17760 17328 1.32747883898370e+00
+17760 17352 3.11986350731990e+00
+17760 17376 1.52005931556467e+00
+17760 17400 2.08016331128110e-01
+17760 17712 3.55692930604217e-01
+17760 17736 2.94399814662354e+00
+17760 17784 3.38763623309864e+00
+17760 17808 4.66602452222989e-01
+17760 18120 1.56481212170480e-01
+17760 18144 1.30265738846123e+00
+17760 18168 3.06392335696751e+00
+17760 18192 1.47878048249848e+00
+17760 18216 2.00511985679792e-01
+17760 18528 1.93628155736285e-02
+17760 18552 1.62345483560857e-01
+17760 18576 3.83034098986018e-01
+17760 18600 1.81271814654417e-01
+17760 18624 2.40943983470185e-02
+17761 17761 1.00000000000000e+00
+17762 17762 1.00000000000000e+00
+17763 17763 1.00000000000000e+00
+17764 17764 1.00000000000000e+00
+17765 17765 1.00000000000000e+00
+17766 17766 1.00000000000000e+00
+17767 17767 1.00000000000000e+00
+17768 17768 1.00000000000000e+00
+17769 17769 1.00000000000000e+00
+17770 17770 1.00000000000000e+00
+17771 17771 1.00000000000000e+00
+17772 17772 1.00000000000000e+00
+17773 17773 1.00000000000000e+00
+17774 17774 1.00000000000000e+00
+17775 17775 1.00000000000000e+00
+17776 17776 1.00000000000000e+00
+17777 17777 1.00000000000000e+00
+17778 17778 1.00000000000000e+00
+17779 17779 1.00000000000000e+00
+17780 17780 1.00000000000000e+00
+17781 17781 1.00000000000000e+00
+17782 17782 1.00000000000000e+00
+17783 17783 1.00000000000000e+00
+17784 6405 -1.59177904572115e-06
+17784 6429 -3.98147192210430e-07
+17784 6981 -1.59366967251032e-03
+17784 7005 -8.66559427129925e-02
+17784 7029 -1.36848367689047e-01
+17784 7053 -1.45815447323941e-02
+17784 7077 -1.44727600551000e-08
+17784 7557 -3.47987915136900e-08
+17784 7581 -1.44363945467572e-01
+17784 7605 -2.18514483610331e+00
+17784 7629 -3.73623591502851e+00
+17784 7653 -6.43339735310644e-01
+17784 7677 -7.17949674489168e-03
+17784 8157 -4.06769525242680e-04
+17784 8181 -3.90543641669712e-01
+17784 8205 -6.17588936427217e+00
+17784 8229 -1.02216097184028e+01
+17784 8253 -1.52603805139518e+00
+17784 8277 -1.69311411195079e-02
+17784 8757 -2.50271011591090e-04
+17784 8781 -1.27093248179564e-01
+17784 8805 -2.01546910711483e+00
+17784 8829 -2.77314972883565e+00
+17784 8853 -5.14460043694639e-01
+17784 8877 -1.35262437329917e-03
+17784 9381 -3.83180860003062e-04
+17784 9405 -4.35511837740995e-02
+17784 9429 -7.39964518854148e-02
+17784 9453 -9.31784332562728e-03
+17784 10029 -7.29284455996000e-09
+17784 10053 -2.47779430879000e-09
+17784 17784 9.20734770868317e+00
+17784 16920 2.19273960211432e-02
+17784 16944 1.91591522920964e-01
+17784 16968 4.52628160109030e-01
+17784 16992 1.64573973805674e-01
+17784 17016 1.51730087423207e-02
+17784 17328 1.71998497763054e-01
+17784 17352 1.52005931556467e+00
+17784 17376 3.64388340608851e+00
+17784 17400 1.40655976561497e+00
+17784 17424 1.43623610275628e-01
+17784 17736 3.80306606051653e-01
+17784 17760 3.38763623309864e+00
+17784 17808 3.31201727714559e+00
+17784 17832 3.61401867063391e-01
+17784 18144 1.69183134944824e-01
+17784 18168 1.47878048249848e+00
+17784 18192 3.51831670951067e+00
+17784 18216 1.36581515747559e+00
+17784 18240 1.40941803689102e-01
+17784 18552 2.12235553165857e-02
+17784 18576 1.81271814654417e-01
+17784 18600 4.21236485964572e-01
+17784 18624 1.54387821770831e-01
+17784 18648 1.45025570956891e-02
+17785 17785 1.00000000000000e+00
+17786 17786 1.00000000000000e+00
+17787 17787 1.00000000000000e+00
+17788 17788 1.00000000000000e+00
+17789 17789 1.00000000000000e+00
+17790 17790 1.00000000000000e+00
+17791 17791 1.00000000000000e+00
+17792 17792 1.00000000000000e+00
+17793 17793 1.00000000000000e+00
+17794 17794 1.00000000000000e+00
+17795 17795 1.00000000000000e+00
+17796 17796 1.00000000000000e+00
+17797 17797 1.00000000000000e+00
+17798 17798 1.00000000000000e+00
+17799 17799 1.00000000000000e+00
+17800 17800 1.00000000000000e+00
+17801 17801 1.00000000000000e+00
+17802 17802 1.00000000000000e+00
+17803 17803 1.00000000000000e+00
+17804 17804 1.00000000000000e+00
+17805 17805 1.00000000000000e+00
+17806 17806 1.00000000000000e+00
+17807 17807 1.00000000000000e+00
+17808 7005 -1.73381330431116e-03
+17808 7029 -2.03872129237756e-02
+17808 7053 -4.43604484561137e-03
+17808 7077 -2.84816028581600e-08
+17808 7581 -2.73146508523377e-05
+17808 7605 -2.23748796928774e-01
+17808 7629 -1.16968533203044e+00
+17808 7653 -9.28686431603791e-01
+17808 7677 -1.24352589445778e-01
+17808 8181 -8.39152786425451e-03
+17808 8205 -1.28251347224221e+00
+17808 8229 -7.85669670876051e+00
+17808 8253 -8.42168416152389e+00
+17808 8277 -5.54951980889194e-01
+17808 8781 -1.27081830126299e-02
+17808 8805 -7.34540317333682e-01
+17808 8829 -6.90326339321349e+00
+17808 8853 -7.40748823356999e+00
+17808 8877 -9.11000637037568e-02
+17808 9381 -8.87003356679494e-05
+17808 9405 -4.59803680636706e-02
+17808 9429 -9.00313035298770e-01
+17808 9453 -4.48334279241390e-01
+17808 10029 -4.28709318978560e-06
+17808 10053 -1.54782487178360e-06
+17808 17808 9.72287790042684e+00
+17808 16944 2.59704847090979e-02
+17808 16968 1.64573973805674e-01
+17808 16992 3.85652247454580e-01
+17808 17016 2.94519280705986e-01
+17808 17352 2.08016331128110e-01
+17808 17376 1.40655976561497e+00
+17808 17400 3.51355052713259e+00
+17808 17424 2.58960730429128e+00
+17808 17760 4.66602452222989e-01
+17808 17784 3.31201727714559e+00
+17808 17832 6.39329861863230e+00
+17808 18168 2.00511985679792e-01
+17808 18192 1.36581515747559e+00
+17808 18216 3.78477955217486e+00
+17808 18240 3.22216462969520e+00
+17808 18576 2.40943983470185e-02
+17808 18600 1.54387821770831e-01
+17808 18624 4.53459503715149e-01
+17808 18648 4.52658612056966e-01
+17809 17809 1.00000000000000e+00
+17810 17810 1.00000000000000e+00
+17811 17811 1.00000000000000e+00
+17812 17812 1.00000000000000e+00
+17813 17813 1.00000000000000e+00
+17814 17814 1.00000000000000e+00
+17815 17815 1.00000000000000e+00
+17816 17816 1.00000000000000e+00
+17817 17817 1.00000000000000e+00
+17818 17818 1.00000000000000e+00
+17819 17819 1.00000000000000e+00
+17820 17820 1.00000000000000e+00
+17821 17821 1.00000000000000e+00
+17822 17822 1.00000000000000e+00
+17823 17823 1.00000000000000e+00
+17824 17824 1.00000000000000e+00
+17825 17825 1.00000000000000e+00
+17826 17826 1.00000000000000e+00
+17827 17827 1.00000000000000e+00
+17828 17828 1.00000000000000e+00
+17829 17829 1.00000000000000e+00
+17830 17830 1.00000000000000e+00
+17831 17831 1.00000000000000e+00
+17832 7029 -1.55188264107731e-04
+17832 7053 -2.42406379375070e-04
+17832 7077 -6.63024342517000e-09
+17832 7605 -3.09682943183135e-04
+17832 7629 -9.96338200064888e-02
+17832 7653 -5.86323053563030e-01
+17832 7677 -1.98570423981032e-01
+17832 8205 -3.89639863280264e-02
+17832 8229 -2.69515405120276e+00
+17832 8253 -9.88947253249662e+00
+17832 8277 -9.91396379203716e-01
+17832 8781 -1.23322260600600e-08
+17832 8805 -7.96440172054091e-02
+17832 8829 -6.32062101669730e+00
+17832 8853 -1.14588221436155e+01
+17832 8877 -1.72731756794419e-01
+17832 9381 -4.41669362790000e-09
+17832 9405 -1.68082945346775e-02
+17832 9429 -1.42258422170924e+00
+17832 9453 -8.31443655203389e-01
+17832 10029 -8.52313646765147e-06
+17832 10053 -3.07830518340567e-06
+17832 17832 1.12567841678208e+01
+17832 16968 1.51730087423207e-02
+17832 16992 2.94519280705986e-01
+17832 17016 4.82827500215728e-01
+17832 17376 1.43623610275628e-01
+17832 17400 2.58960730429128e+00
+17832 17424 4.17384933665315e+00
+17832 17784 3.61401867063391e-01
+17832 17808 6.39329861863230e+00
+17832 18192 1.40941803689102e-01
+17832 18216 3.22216462969520e+00
+17832 18240 5.45773663356667e+00
+17832 18600 1.45025570956891e-02
+17832 18624 4.52658612056966e-01
+17832 18648 8.03799324444108e-01
+17833 17833 1.00000000000000e+00
+17834 17834 1.00000000000000e+00
+17835 17835 1.00000000000000e+00
+17836 17836 1.00000000000000e+00
+17837 17837 1.00000000000000e+00
+17838 17838 1.00000000000000e+00
+17839 17839 1.00000000000000e+00
+17840 17840 1.00000000000000e+00
+17841 17841 1.00000000000000e+00
+17842 17842 1.00000000000000e+00
+17843 17843 1.00000000000000e+00
+17844 17844 1.00000000000000e+00
+17845 17845 1.00000000000000e+00
+17846 17846 1.00000000000000e+00
+17847 17847 1.00000000000000e+00
+17848 17848 1.00000000000000e+00
+17849 17849 1.00000000000000e+00
+17850 17850 1.00000000000000e+00
+17851 17851 1.00000000000000e+00
+17852 17852 1.00000000000000e+00
+17853 17853 1.00000000000000e+00
+17854 17854 1.00000000000000e+00
+17855 17855 1.00000000000000e+00
+17856 3789 -4.50372466621900e-08
+17856 3813 -3.09907564292860e-07
+17856 4389 -4.22719899012738e-01
+17856 4413 -1.26735440242565e+00
+17856 4437 -3.85260548717751e-02
+17856 4461 -2.87059089138043e-06
+17856 4965 -3.06995764510260e-02
+17856 4989 -1.10499459964699e+01
+17856 5013 -9.15748002497568e+00
+17856 5037 -1.55218139672082e-01
+17856 5061 -1.25824412478916e-05
+17856 5565 -3.91858603018188e-01
+17856 5589 -1.11286651487522e+01
+17856 5613 -4.85138247369462e+00
+17856 5637 -8.98711480908165e-02
+17856 5661 -9.93685121070000e-10
+17856 6165 -1.09415256228249e-01
+17856 6189 -6.14318709256880e-01
+17856 6213 -1.68324535039269e-01
+17856 6237 -1.97210171975277e-03
+17856 6789 -3.08469849872074e-04
+17856 6813 -3.37059951672540e-04
+17856 17856 1.41192821628460e+01
+17856 17040 6.32423831578000e-01
+17856 17064 3.63786962869199e-01
+17856 17088 1.35928705943427e-02
+17856 17448 5.54991856477199e+00
+17856 17472 3.23794388911820e+00
+17856 17496 1.32281316209199e-01
+17856 17880 7.76021858978296e+00
+17856 17904 3.43022145245695e-01
+17856 18264 4.64408474817205e+00
+17856 18288 2.84378594303396e+00
+17856 18312 1.49069591127980e-01
+17856 18672 4.05965377428013e-01
+17856 18696 2.65247476348139e-01
+17856 18720 1.77899393240378e-02
+17857 17857 1.00000000000000e+00
+17858 17858 1.00000000000000e+00
+17859 17859 1.00000000000000e+00
+17860 17860 1.00000000000000e+00
+17861 17861 1.00000000000000e+00
+17862 17862 1.00000000000000e+00
+17863 17863 1.00000000000000e+00
+17864 17864 1.00000000000000e+00
+17865 17865 1.00000000000000e+00
+17866 17866 1.00000000000000e+00
+17867 17867 1.00000000000000e+00
+17868 17868 1.00000000000000e+00
+17869 17869 1.00000000000000e+00
+17870 17870 1.00000000000000e+00
+17871 17871 1.00000000000000e+00
+17872 17872 1.00000000000000e+00
+17873 17873 1.00000000000000e+00
+17874 17874 1.00000000000000e+00
+17875 17875 1.00000000000000e+00
+17876 17876 1.00000000000000e+00
+17877 17877 1.00000000000000e+00
+17878 17878 1.00000000000000e+00
+17879 17879 1.00000000000000e+00
+17880 3789 -2.25852715468000e-08
+17880 3813 -1.55434573406250e-07
+17880 4389 -2.25446163389847e-01
+17880 4413 -7.88820640174501e-01
+17880 4437 -6.90657784007949e-02
+17880 4461 -2.63403151354003e-04
+17880 4965 -1.58080846130474e-02
+17880 4989 -6.55683928723491e+00
+17880 5013 -8.15750338257090e+00
+17880 5037 -1.01464558466501e+00
+17880 5061 -2.92956316988241e-02
+17880 5565 -2.18132430886971e-01
+17880 5589 -8.15239410774455e+00
+17880 5613 -9.17219547194401e+00
+17880 5637 -1.82669002690140e+00
+17880 5661 -2.75991069040430e-02
+17880 6165 -6.76799247529317e-02
+17880 6189 -9.00428623635597e-01
+17880 6213 -1.35404939750061e+00
+17880 6237 -3.51322853426487e-01
+17880 6261 -6.29502914319947e-04
+17880 6789 -3.41592650809732e-03
+17880 6813 -2.42284408096523e-02
+17880 6837 -4.16543717404543e-03
+17880 17880 1.01339764526105e+01
+17880 17040 3.63786962869199e-01
+17880 17064 3.97365055002468e-01
+17880 17088 1.55057023365654e-01
+17880 17112 2.51713852470707e-02
+17880 17448 3.23794388911820e+00
+17880 17472 3.67164699493713e+00
+17880 17496 1.33207175863361e+00
+17880 17520 2.00736623449198e-01
+17880 17856 7.76021858978296e+00
+17880 17904 3.17831707809931e+00
+17880 17928 4.51557124279117e-01
+17880 18264 2.84378594303396e+00
+17880 18288 3.71364396652321e+00
+17880 18312 1.41538524136978e+00
+17880 18336 2.04776719214462e-01
+17880 18672 2.65247476348139e-01
+17880 18696 4.07864297898985e-01
+17880 18720 1.75885394049698e-01
+17880 18744 2.61814091883867e-02
+17881 17881 1.00000000000000e+00
+17882 17882 1.00000000000000e+00
+17883 17883 1.00000000000000e+00
+17884 17884 1.00000000000000e+00
+17885 17885 1.00000000000000e+00
+17886 17886 1.00000000000000e+00
+17887 17887 1.00000000000000e+00
+17888 17888 1.00000000000000e+00
+17889 17889 1.00000000000000e+00
+17890 17890 1.00000000000000e+00
+17891 17891 1.00000000000000e+00
+17892 17892 1.00000000000000e+00
+17893 17893 1.00000000000000e+00
+17894 17894 1.00000000000000e+00
+17895 17895 1.00000000000000e+00
+17896 17896 1.00000000000000e+00
+17897 17897 1.00000000000000e+00
+17898 17898 1.00000000000000e+00
+17899 17899 1.00000000000000e+00
+17900 17900 1.00000000000000e+00
+17901 17901 1.00000000000000e+00
+17902 17902 1.00000000000000e+00
+17903 17903 1.00000000000000e+00
+17904 3789 -1.90423473400000e-11
+17904 3813 -1.37368931380000e-10
+17904 4389 -4.02463253813648e-03
+17904 4413 -5.62077263860371e-02
+17904 4437 -4.79131606910220e-02
+17904 4461 -1.04490660266624e-03
+17904 4965 -1.30941825009836e-04
+17904 4989 -3.02145747279517e-01
+17904 5013 -2.24353417678793e+00
+17904 5037 -2.31875979400015e+00
+17904 5061 -2.16006340598428e-01
+17904 5085 -1.06285179056372e-03
+17904 5565 -6.34375125082210e-03
+17904 5589 -9.67865603429273e-01
+17904 5613 -8.73478129569122e+00
+17904 5637 -7.47852153566612e+00
+17904 5661 -6.49578675580656e-01
+17904 5685 -2.36917694260555e-03
+17904 6165 -3.70637046823065e-03
+17904 6189 -4.38209835369883e-01
+17904 6213 -3.53361738223854e+00
+17904 6237 -2.73881420483961e+00
+17904 6261 -2.64974126596216e-01
+17904 6285 -2.04089667481575e-05
+17904 6789 -9.14157579495082e-03
+17904 6813 -1.36403831570532e-01
+17904 6837 -1.16903644012217e-01
+17904 6861 -5.17996492292174e-03
+17904 7413 -3.49414465273940e-07
+17904 7437 -4.68288025480875e-06
+17904 7461 -5.66768020861000e-09
+17904 17904 8.94270722031846e+00
+17904 17040 1.35928705943427e-02
+17904 17064 1.55057023365654e-01
+17904 17088 4.38078710129993e-01
+17904 17112 1.87660243318358e-01
+17904 17136 2.17436755825188e-02
+17904 17448 1.32281316209199e-01
+17904 17472 1.33207175863360e+00
+17904 17496 3.51392334433730e+00
+17904 17520 1.48237070556025e+00
+17904 17544 1.69856052940862e-01
+17904 17856 3.43022145245695e-01
+17904 17880 3.17831707809931e+00
+17904 17928 3.30531284354295e+00
+17904 17952 3.74771086606604e-01
+17904 18264 1.49069591127980e-01
+17904 18288 1.41538524136978e+00
+17904 18312 3.59438648349398e+00
+17904 18336 1.49466441659605e+00
+17904 18360 1.68889384934546e-01
+17904 18672 1.77899393240378e-02
+17904 18696 1.75885394049698e-01
+17904 18720 4.58194494919164e-01
+17904 18744 1.90733671077306e-01
+17904 18768 2.15020085809398e-02
+17905 17905 1.00000000000000e+00
+17906 17906 1.00000000000000e+00
+17907 17907 1.00000000000000e+00
+17908 17908 1.00000000000000e+00
+17909 17909 1.00000000000000e+00
+17910 17910 1.00000000000000e+00
+17911 17911 1.00000000000000e+00
+17912 17912 1.00000000000000e+00
+17913 17913 1.00000000000000e+00
+17914 17914 1.00000000000000e+00
+17915 17915 1.00000000000000e+00
+17916 17916 1.00000000000000e+00
+17917 17917 1.00000000000000e+00
+17918 17918 1.00000000000000e+00
+17919 17919 1.00000000000000e+00
+17920 17920 1.00000000000000e+00
+17921 17921 1.00000000000000e+00
+17922 17922 1.00000000000000e+00
+17923 17923 1.00000000000000e+00
+17924 17924 1.00000000000000e+00
+17925 17925 1.00000000000000e+00
+17926 17926 1.00000000000000e+00
+17927 17927 1.00000000000000e+00
+17928 4413 -3.19873872226571e-03
+17928 4437 -9.38575092160602e-03
+17928 4461 -3.89332230272224e-04
+17928 4989 -1.97260203679885e-03
+17928 5013 -3.41170327114189e-01
+17928 5037 -1.05198764373595e+00
+17928 5061 -4.57991835894876e-01
+17928 5085 -1.19319310724472e-02
+17928 5109 -6.94046372686320e-07
+17928 5589 -6.14995665721261e-02
+17928 5613 -2.45398170369836e+00
+17928 5637 -7.77456076509330e+00
+17928 5661 -2.99873944324042e+00
+17928 5685 -1.34841749520498e-01
+17928 5709 -1.05416003024271e-05
+17928 6189 -7.35160147784654e-02
+17928 6213 -1.98400933919514e+00
+17928 6237 -6.61043386329524e+00
+17928 6261 -2.64139157095848e+00
+17928 6285 -1.06356067585759e-01
+17928 6309 -8.46091646237500e-08
+17928 6789 -2.60171715117956e-03
+17928 6813 -2.07628844917461e-01
+17928 6837 -6.49732174719315e-01
+17928 6861 -2.58902342369891e-01
+17928 6885 -4.15438031221892e-03
+17928 7413 -3.41322157762283e-06
+17928 7437 -1.95098127036782e-03
+17928 7461 -1.55759882964494e-03
+17928 17928 7.80038152703585e+00
+17928 17064 2.51713852470707e-02
+17928 17088 1.87660243318358e-01
+17928 17112 3.92592948889666e-01
+17928 17136 1.65065719619254e-01
+17928 17160 1.95227543222948e-02
+17928 17472 2.00736623449198e-01
+17928 17496 1.48237070556025e+00
+17928 17520 3.07484360048553e+00
+17928 17544 1.30506473169342e+00
+17928 17568 1.56410129982489e-01
+17928 17880 4.51557124279117e-01
+17928 17904 3.30531284354295e+00
+17928 17952 2.90903241462977e+00
+17928 17976 3.52487017050824e-01
+17928 18288 2.04776719214462e-01
+17928 18312 1.49466441659605e+00
+17928 18336 3.06407723868171e+00
+17928 18360 1.30383898179604e+00
+17928 18384 1.57070360514461e-01
+17928 18696 2.61814091883867e-02
+17928 18720 1.90733671077306e-01
+17928 18744 3.89901358438711e-01
+17928 18768 1.64759282144910e-01
+17928 18792 1.96878119552877e-02
+17929 17929 1.00000000000000e+00
+17930 17930 1.00000000000000e+00
+17931 17931 1.00000000000000e+00
+17932 17932 1.00000000000000e+00
+17933 17933 1.00000000000000e+00
+17934 17934 1.00000000000000e+00
+17935 17935 1.00000000000000e+00
+17936 17936 1.00000000000000e+00
+17937 17937 1.00000000000000e+00
+17938 17938 1.00000000000000e+00
+17939 17939 1.00000000000000e+00
+17940 17940 1.00000000000000e+00
+17941 17941 1.00000000000000e+00
+17942 17942 1.00000000000000e+00
+17943 17943 1.00000000000000e+00
+17944 17944 1.00000000000000e+00
+17945 17945 1.00000000000000e+00
+17946 17946 1.00000000000000e+00
+17947 17947 1.00000000000000e+00
+17948 17948 1.00000000000000e+00
+17949 17949 1.00000000000000e+00
+17950 17950 1.00000000000000e+00
+17951 17951 1.00000000000000e+00
+17952 4437 -8.49783613857458e-05
+17952 4461 -3.43528606209355e-05
+17952 5013 -3.33212378989235e-03
+17952 5037 -1.43978339114223e-01
+17952 5061 -2.30669445532562e-01
+17952 5085 -3.37284796292224e-02
+17952 5109 -1.65162946727462e-05
+17952 5589 -5.41995950758400e-07
+17952 5613 -1.66742076918551e-01
+17952 5637 -2.44933938889463e+00
+17952 5661 -3.96244886125039e+00
+17952 5685 -7.80770559015170e-01
+17952 5709 -1.53834825153156e-02
+17952 6189 -3.14289429538524e-04
+17952 6213 -3.28645579300925e-01
+17952 6237 -4.66363090861395e+00
+17952 6261 -7.93340222138178e+00
+17952 6285 -1.50118703445927e+00
+17952 6309 -2.19885461768134e-02
+17952 6789 -1.04917510642632e-04
+17952 6813 -7.08050616192474e-02
+17952 6837 -1.14612630496388e+00
+17952 6861 -1.71860913009061e+00
+17952 6885 -3.76017434900472e-01
+17952 6909 -9.06390528705473e-04
+17952 7413 -8.41167939047529e-06
+17952 7437 -1.23074871066057e-02
+17952 7461 -4.17062818071607e-02
+17952 7485 -6.09418934663193e-03
+17952 17952 7.36002245700798e+00
+17952 17088 2.17436755825188e-02
+17952 17112 1.65065719619254e-01
+17952 17136 3.53543269491002e-01
+17952 17160 1.55833116296245e-01
+17952 17184 1.94355247517665e-02
+17952 17496 1.69856052940862e-01
+17952 17520 1.30506473169342e+00
+17952 17544 2.82694718723967e+00
+17952 17568 1.24375673824568e+00
+17952 17592 1.54529054578926e-01
+17952 17904 3.74771086606604e-01
+17952 17928 2.90903241462977e+00
+17952 17976 2.79178445855524e+00
+17952 18000 3.45459097587972e-01
+17952 18312 1.68889384934546e-01
+17952 18336 1.30383898179604e+00
+17952 18360 2.83430511093290e+00
+17952 18384 1.23744127312555e+00
+17952 18408 1.52289957766922e-01
+17952 18720 2.15020085809398e-02
+17952 18744 1.64759282144910e-01
+17952 18768 3.55382750414309e-01
+17952 18792 1.54254250016213e-01
+17952 18816 1.88757505487655e-02
+17953 17953 1.00000000000000e+00
+17954 17954 1.00000000000000e+00
+17955 17955 1.00000000000000e+00
+17956 17956 1.00000000000000e+00
+17957 17957 1.00000000000000e+00
+17958 17958 1.00000000000000e+00
+17959 17959 1.00000000000000e+00
+17960 17960 1.00000000000000e+00
+17961 17961 1.00000000000000e+00
+17962 17962 1.00000000000000e+00
+17963 17963 1.00000000000000e+00
+17964 17964 1.00000000000000e+00
+17965 17965 1.00000000000000e+00
+17966 17966 1.00000000000000e+00
+17967 17967 1.00000000000000e+00
+17968 17968 1.00000000000000e+00
+17969 17969 1.00000000000000e+00
+17970 17970 1.00000000000000e+00
+17971 17971 1.00000000000000e+00
+17972 17972 1.00000000000000e+00
+17973 17973 1.00000000000000e+00
+17974 17974 1.00000000000000e+00
+17975 17975 1.00000000000000e+00
+17976 5037 -2.68360686543640e-03
+17976 5061 -3.61825963381653e-02
+17976 5085 -1.54562329970989e-02
+17976 5109 -5.60742176785095e-05
+17976 5613 -5.77838800737355e-05
+17976 5637 -2.35359211128363e-01
+17976 5661 -1.47822609499832e+00
+17976 5685 -1.30220261752322e+00
+17976 5709 -1.12540250718599e-01
+17976 5733 -4.48079598200323e-04
+17976 6213 -6.87824803542511e-03
+17976 6237 -9.83374149245025e-01
+17976 6261 -6.94373649909142e+00
+17976 6285 -5.55216590365651e+00
+17976 6309 -4.97254905233338e-01
+17976 6333 -1.86222575103135e-03
+17976 6813 -6.56477375214337e-03
+17976 6837 -5.14869724059545e-01
+17976 6861 -3.58766882084473e+00
+17976 6885 -2.88002145247029e+00
+17976 6909 -2.84162572146214e-01
+17976 6933 -4.61869584146418e-05
+17976 7413 -2.01560395289946e-06
+17976 7437 -2.04237157877317e-02
+17976 7461 -2.08634239809661e-01
+17976 7485 -1.69941020545760e-01
+17976 7509 -9.04705997000791e-03
+17976 8061 -2.21422910102273e-05
+17976 8085 -1.27258756124397e-04
+17976 8109 -2.55683926896930e-07
+17976 17976 7.21643411078448e+00
+17976 17112 1.95227543222948e-02
+17976 17136 1.55833116296245e-01
+17976 17160 3.49381414664424e-01
+17976 17184 1.53303156262524e-01
+17976 17208 1.88902643138646e-02
+17976 17520 1.56410129982489e-01
+17976 17544 1.24375673824568e+00
+17976 17568 2.77918470063371e+00
+17976 17592 1.21935500786909e+00
+17976 17616 1.50309697388343e-01
+17976 17928 3.52487017050824e-01
+17976 17952 2.79178445855524e+00
+17976 18000 2.72824251965547e+00
+17976 18024 3.36601532325882e-01
+17976 18336 1.57070360514461e-01
+17976 18360 1.23744127312555e+00
+17976 18384 2.74332515484007e+00
+17976 18408 1.20762171128692e+00
+17976 18432 1.49615470054805e-01
+17976 18744 1.96878119552877e-02
+17976 18768 1.54254250016213e-01
+17976 18792 3.40416528216015e-01
+17976 18816 1.50369832116982e-01
+17976 18840 1.87167074804801e-02
+17977 17977 1.00000000000000e+00
+17978 17978 1.00000000000000e+00
+17979 17979 1.00000000000000e+00
+17980 17980 1.00000000000000e+00
+17981 17981 1.00000000000000e+00
+17982 17982 1.00000000000000e+00
+17983 17983 1.00000000000000e+00
+17984 17984 1.00000000000000e+00
+17985 17985 1.00000000000000e+00
+17986 17986 1.00000000000000e+00
+17987 17987 1.00000000000000e+00
+17988 17988 1.00000000000000e+00
+17989 17989 1.00000000000000e+00
+17990 17990 1.00000000000000e+00
+17991 17991 1.00000000000000e+00
+17992 17992 1.00000000000000e+00
+17993 17993 1.00000000000000e+00
+17994 17994 1.00000000000000e+00
+17995 17995 1.00000000000000e+00
+17996 17996 1.00000000000000e+00
+17997 17997 1.00000000000000e+00
+17998 17998 1.00000000000000e+00
+17999 17999 1.00000000000000e+00
+18000 5061 -8.71566016129888e-04
+18000 5085 -1.94985337928625e-03
+18000 5109 -1.54190474932794e-05
+18000 5637 -7.15434311001538e-04
+18000 5661 -1.70937578879021e-01
+18000 5685 -5.54442084415404e-01
+18000 5709 -2.34465262564612e-01
+18000 5733 -4.43884181165068e-03
+18000 5757 -3.17062769720000e-09
+18000 6237 -4.21980672869893e-02
+18000 6261 -1.80327671377134e+00
+18000 6285 -5.79840393114080e+00
+18000 6309 -2.23326814143203e+00
+18000 6333 -9.93778601987012e-02
+18000 6357 -4.56708922212480e-06
+18000 6813 -6.64224849700000e-11
+18000 6837 -6.87655032636452e-02
+18000 6861 -1.99343558131644e+00
+18000 6885 -6.90984690437406e+00
+18000 6909 -2.67868645090644e+00
+18000 6933 -1.06320221811239e-01
+18000 6957 -3.90152634118490e-07
+18000 7413 -1.00590931000000e-11
+18000 7437 -5.35878571918443e-03
+18000 7461 -3.05397524757640e-01
+18000 7485 -9.17064794435828e-01
+18000 7509 -3.71678060230642e-01
+18000 7533 -7.05238029109580e-03
+18000 8061 -1.47971231592430e-04
+18000 8085 -7.04436337218156e-03
+18000 8109 -4.14430081245728e-03
+18000 18000 7.06341460812457e+00
+18000 17136 1.94355247517665e-02
+18000 17160 1.53303156262524e-01
+18000 17184 3.40309845637373e-01
+18000 17208 1.50081424710553e-01
+18000 17232 1.86300918637737e-02
+18000 17544 1.54529054578926e-01
+18000 17568 1.21935500786909e+00
+18000 17592 2.70777635461111e+00
+18000 17616 1.19440735682797e+00
+18000 17640 1.48292141818646e-01
+18000 17952 3.45459097587972e-01
+18000 17976 2.72824251965547e+00
+18000 18024 2.67573010259266e+00
+18000 18048 3.32330993322269e-01
+18000 18360 1.52289957766922e-01
+18000 18384 1.20762171128692e+00
+18000 18408 2.69436446902456e+00
+18000 18432 1.19136984174206e+00
+18000 18456 1.48226990380706e-01
+18000 18768 1.88757505487655e-02
+18000 18792 1.50369832116982e-01
+18000 18816 3.36956874240736e-01
+18000 18840 1.49322045939075e-01
+18000 18864 1.86138040042886e-02
+18001 18001 1.00000000000000e+00
+18002 18002 1.00000000000000e+00
+18003 18003 1.00000000000000e+00
+18004 18004 1.00000000000000e+00
+18005 18005 1.00000000000000e+00
+18006 18006 1.00000000000000e+00
+18007 18007 1.00000000000000e+00
+18008 18008 1.00000000000000e+00
+18009 18009 1.00000000000000e+00
+18010 18010 1.00000000000000e+00
+18011 18011 1.00000000000000e+00
+18012 18012 1.00000000000000e+00
+18013 18013 1.00000000000000e+00
+18014 18014 1.00000000000000e+00
+18015 18015 1.00000000000000e+00
+18016 18016 1.00000000000000e+00
+18017 18017 1.00000000000000e+00
+18018 18018 1.00000000000000e+00
+18019 18019 1.00000000000000e+00
+18020 18020 1.00000000000000e+00
+18021 18021 1.00000000000000e+00
+18022 18022 1.00000000000000e+00
+18023 18023 1.00000000000000e+00
+18024 5085 -1.58029534922598e-06
+18024 5109 -4.19734577819620e-07
+18024 5661 -1.32903395665438e-03
+18024 5685 -7.39127451110982e-02
+18024 5709 -1.09225360996484e-01
+18024 5733 -1.13536029586754e-02
+18024 5757 -3.06112379000400e-08
+18024 6237 -1.79287271112400e-08
+18024 6261 -1.24081197234279e-01
+18024 6285 -1.76536172072492e+00
+18024 6309 -2.80557560879687e+00
+18024 6333 -5.46152839053621e-01
+18024 6357 -9.35970523369878e-03
+18024 6837 -3.19429685077528e-04
+18024 6861 -3.30604382240392e-01
+18024 6885 -4.66386840319997e+00
+18024 6909 -7.65930322967343e+00
+18024 6933 -1.37644441535069e+00
+18024 6957 -2.07758257319012e-02
+18024 7437 -1.96245122556974e-04
+18024 7461 -1.02094554323801e-01
+18024 7485 -1.53990166618198e+00
+18024 7509 -2.28807743415274e+00
+18024 7533 -4.82708299194577e-01
+18024 7557 -1.43453473503938e-03
+18024 8061 -2.59752650159810e-04
+18024 8085 -3.60917035854068e-02
+18024 8109 -8.08640652260128e-02
+18024 8133 -1.12740152964935e-02
+18024 8709 -5.84238235270000e-09
+18024 8733 -2.08894349837000e-09
+18024 18024 6.98863844253899e+00
+18024 17160 1.88902643138646e-02
+18024 17184 1.50081424710553e-01
+18024 17208 3.35688441614723e-01
+18024 17232 1.49387197377015e-01
+18024 17256 1.87167074804801e-02
+18024 17568 1.50309697388343e-01
+18024 17592 1.19440735682797e+00
+18024 17616 2.67230601242582e+00
+18024 17640 1.19045675103090e+00
+18024 17664 1.49322045939075e-01
+18024 17976 3.36601532325882e-01
+18024 18000 2.67573010259266e+00
+18024 18048 2.66828804151547e+00
+18024 18072 3.34741017056585e-01
+18024 18384 1.49615470054805e-01
+18024 18408 1.19136984174206e+00
+18024 18432 2.66851631419325e+00
+18024 18456 1.18198395371120e+00
+18024 18480 1.47268998047092e-01
+18024 18792 1.87167074804801e-02
+18024 18816 1.49322045939075e-01
+18024 18840 3.34741017056581e-01
+18024 18864 1.47268998047091e-01
+18024 18888 1.82034455074842e-02
+18025 18025 1.00000000000000e+00
+18026 18026 1.00000000000000e+00
+18027 18027 1.00000000000000e+00
+18028 18028 1.00000000000000e+00
+18029 18029 1.00000000000000e+00
+18030 18030 1.00000000000000e+00
+18031 18031 1.00000000000000e+00
+18032 18032 1.00000000000000e+00
+18033 18033 1.00000000000000e+00
+18034 18034 1.00000000000000e+00
+18035 18035 1.00000000000000e+00
+18036 18036 1.00000000000000e+00
+18037 18037 1.00000000000000e+00
+18038 18038 1.00000000000000e+00
+18039 18039 1.00000000000000e+00
+18040 18040 1.00000000000000e+00
+18041 18041 1.00000000000000e+00
+18042 18042 1.00000000000000e+00
+18043 18043 1.00000000000000e+00
+18044 18044 1.00000000000000e+00
+18045 18045 1.00000000000000e+00
+18046 18046 1.00000000000000e+00
+18047 18047 1.00000000000000e+00
+18048 5685 -1.21000740674986e-03
+18048 5709 -1.52511482932413e-02
+18048 5733 -3.92424215915950e-03
+18048 5757 -7.48855361421700e-08
+18048 6261 -1.62498969958989e-05
+18048 6285 -1.56910533252355e-01
+18048 6309 -9.74542059803761e-01
+18048 6333 -8.36607401537234e-01
+18048 6357 -6.46742273828280e-02
+18048 6381 -1.66168765949972e-04
+18048 6861 -5.97874547333352e-03
+18048 6885 -9.41744134857343e-01
+18048 6909 -6.27649976772462e+00
+18048 6933 -4.81535243342511e+00
+18048 6957 -4.15890163972253e-01
+18048 6981 -1.54822597046121e-03
+18048 7461 -9.23046608098390e-03
+18048 7485 -6.46991543310079e-01
+18048 7509 -4.42023205069238e+00
+18048 7533 -3.42674317775810e+00
+18048 7557 -3.18730314473018e-01
+18048 7581 -9.56224454740977e-05
+18048 8061 -5.94104233255147e-05
+18048 8085 -4.61905750663567e-02
+18048 8109 -3.62722235630272e-01
+18048 8133 -2.74213120676923e-01
+18048 8157 -1.65572343303866e-02
+18048 8709 -2.61608722558184e-04
+18048 8733 -8.90212526518251e-04
+18048 8757 -2.69057086099652e-06
+18048 18048 7.02057532771956e+00
+18048 17184 1.86300918637737e-02
+18048 17208 1.49387197377015e-01
+18048 17232 3.36784571584676e-01
+18048 17256 1.49615470054804e-01
+18048 17280 1.86871600332210e-02
+18048 17592 1.48292141818646e-01
+18048 17616 1.19045675103090e+00
+18048 17640 2.68596529134034e+00
+18048 17664 1.19136984174206e+00
+18048 17688 1.48520414496435e-01
+18048 18000 3.32330993322269e-01
+18048 18024 2.66828804151547e+00
+18048 18072 2.66851631419325e+00
+18048 18096 3.32388061491714e-01
+18048 18408 1.48226990380706e-01
+18048 18432 1.18198395371121e+00
+18048 18456 2.65275794951494e+00
+18048 18480 1.18198395371121e+00
+18048 18504 1.48226990380707e-01
+18048 18816 1.86138040042886e-02
+18048 18840 1.47268998047091e-01
+18048 18864 3.28482736128325e-01
+18048 18888 1.47268998047093e-01
+18048 18912 1.86138040042889e-02
+18049 18049 1.00000000000000e+00
+18050 18050 1.00000000000000e+00
+18051 18051 1.00000000000000e+00
+18052 18052 1.00000000000000e+00
+18053 18053 1.00000000000000e+00
+18054 18054 1.00000000000000e+00
+18055 18055 1.00000000000000e+00
+18056 18056 1.00000000000000e+00
+18057 18057 1.00000000000000e+00
+18058 18058 1.00000000000000e+00
+18059 18059 1.00000000000000e+00
+18060 18060 1.00000000000000e+00
+18061 18061 1.00000000000000e+00
+18062 18062 1.00000000000000e+00
+18063 18063 1.00000000000000e+00
+18064 18064 1.00000000000000e+00
+18065 18065 1.00000000000000e+00
+18066 18066 1.00000000000000e+00
+18067 18067 1.00000000000000e+00
+18068 18068 1.00000000000000e+00
+18069 18069 1.00000000000000e+00
+18070 18070 1.00000000000000e+00
+18071 18071 1.00000000000000e+00
+18072 5709 -1.96245122556973e-04
+18072 5733 -3.19429685077527e-04
+18072 5757 -1.79287271112400e-08
+18072 6285 -2.59752650159813e-04
+18072 6309 -1.02094554323801e-01
+18072 6333 -3.30604382240391e-01
+18072 6357 -1.24081197234279e-01
+18072 6381 -1.32903395665440e-03
+18072 6885 -3.60917035854071e-02
+18072 6909 -1.53990166618198e+00
+18072 6933 -4.66386840319994e+00
+18072 6957 -1.76536172072492e+00
+18072 6981 -7.39127451111007e-02
+18072 7005 -1.58029534922605e-06
+18072 7461 -5.84238235270000e-09
+18072 7485 -8.08640652260130e-02
+18072 7509 -2.28807743415277e+00
+18072 7533 -7.65930322967335e+00
+18072 7557 -2.80557560879681e+00
+18072 7581 -1.09225360996483e-01
+18072 7605 -4.19734577819640e-07
+18072 8061 -2.08894349837000e-09
+18072 8085 -1.12740152964935e-02
+18072 8109 -4.82708299194579e-01
+18072 8133 -1.37644441535069e+00
+18072 8157 -5.46152839053609e-01
+18072 8181 -1.13536029586749e-02
+18072 8709 -1.43453473503940e-03
+18072 8733 -2.07758257319015e-02
+18072 8757 -9.35970523369895e-03
+18072 8781 -3.06112379000400e-08
+18072 18072 6.98863844253893e+00
+18072 17208 1.87167074804801e-02
+18072 17232 1.49615470054804e-01
+18072 17256 3.36601532325881e-01
+18072 17280 1.50309697388346e-01
+18072 17304 1.88902643138654e-02
+18072 17616 1.49322045939075e-01
+18072 17640 1.19136984174205e+00
+18072 17664 2.67573010259264e+00
+18072 17688 1.19440735682796e+00
+18072 17712 1.50081424710553e-01
+18072 18024 3.34741017056585e-01
+18072 18048 2.66851631419325e+00
+18072 18096 2.67230601242575e+00
+18072 18120 3.35688441614710e-01
+18072 18432 1.47268998047092e-01
+18072 18456 1.18198395371121e+00
+18072 18480 2.66828804151546e+00
+18072 18504 1.19045675103089e+00
+18072 18528 1.49387197377013e-01
+18072 18840 1.82034455074842e-02
+18072 18864 1.47268998047093e-01
+18072 18888 3.34741017056588e-01
+18072 18912 1.49322045939077e-01
+18072 18936 1.87167074804804e-02
+18073 18073 1.00000000000000e+00
+18074 18074 1.00000000000000e+00
+18075 18075 1.00000000000000e+00
+18076 18076 1.00000000000000e+00
+18077 18077 1.00000000000000e+00
+18078 18078 1.00000000000000e+00
+18079 18079 1.00000000000000e+00
+18080 18080 1.00000000000000e+00
+18081 18081 1.00000000000000e+00
+18082 18082 1.00000000000000e+00
+18083 18083 1.00000000000000e+00
+18084 18084 1.00000000000000e+00
+18085 18085 1.00000000000000e+00
+18086 18086 1.00000000000000e+00
+18087 18087 1.00000000000000e+00
+18088 18088 1.00000000000000e+00
+18089 18089 1.00000000000000e+00
+18090 18090 1.00000000000000e+00
+18091 18091 1.00000000000000e+00
+18092 18092 1.00000000000000e+00
+18093 18093 1.00000000000000e+00
+18094 18094 1.00000000000000e+00
+18095 18095 1.00000000000000e+00
+18096 6309 -5.27208835272877e-04
+18096 6333 -4.04287971817126e-02
+18096 6357 -4.94199897693993e-02
+18096 6381 -2.84679740778408e-03
+18096 6909 -9.59262161090050e-02
+18096 6933 -1.32125388491842e+00
+18096 6957 -2.04795403555766e+00
+18096 6981 -3.86242857738437e-01
+18096 7005 -5.56833331860751e-03
+18096 7485 -3.45218003082495e-04
+18096 7509 -3.57157477180807e-01
+18096 7533 -4.82545053729412e+00
+18096 7557 -7.56571605479370e+00
+18096 7581 -1.29828131778270e+00
+18096 7605 -1.99554679510914e-02
+18096 8085 -3.62720964486756e-04
+18096 8109 -1.52427932049993e-01
+18096 8133 -2.12020356069702e+00
+18096 8157 -3.12316738344963e+00
+18096 8181 -6.28655875378790e-01
+18096 8205 -2.16668756254670e-03
+18096 8709 -1.81437017932963e-03
+18096 8733 -8.88788763992195e-02
+18096 8757 -1.52428787926000e-01
+18096 8781 -2.16988591599808e-02
+18096 9333 -5.56057466610000e-10
+18096 9357 -1.39127671343210e-05
+18096 9381 -3.16656089837685e-06
+18096 18096 7.05170990002137e+00
+18096 17232 1.86871600332210e-02
+18096 17256 1.50309697388346e-01
+18096 17280 3.40173414020684e-01
+18096 17304 1.52529157117928e-01
+18096 17328 1.92420249656166e-02
+18096 17640 1.48520414496435e-01
+18096 17664 1.19440735682796e+00
+18096 17688 2.70433855902272e+00
+18096 17712 1.21838709547178e+00
+18096 17736 1.54515349157389e-01
+18096 18048 3.32388061491714e-01
+18096 18072 2.67230601242575e+00
+18096 18120 2.73598085723519e+00
+18096 18144 3.48306772694073e-01
+18096 18456 1.48226990380707e-01
+18096 18480 1.19045675103089e+00
+18096 18504 2.69147239990295e+00
+18096 18528 1.20974979546800e+00
+18096 18552 1.53050251489985e-01
+18096 18864 1.86138040042889e-02
+18096 18888 1.49322045939077e-01
+18096 18912 3.36956874240741e-01
+18096 18936 1.50369832116984e-01
+18096 18960 1.88757505487656e-02
+18097 18097 1.00000000000000e+00
+18098 18098 1.00000000000000e+00
+18099 18099 1.00000000000000e+00
+18100 18100 1.00000000000000e+00
+18101 18101 1.00000000000000e+00
+18102 18102 1.00000000000000e+00
+18103 18103 1.00000000000000e+00
+18104 18104 1.00000000000000e+00
+18105 18105 1.00000000000000e+00
+18106 18106 1.00000000000000e+00
+18107 18107 1.00000000000000e+00
+18108 18108 1.00000000000000e+00
+18109 18109 1.00000000000000e+00
+18110 18110 1.00000000000000e+00
+18111 18111 1.00000000000000e+00
+18112 18112 1.00000000000000e+00
+18113 18113 1.00000000000000e+00
+18114 18114 1.00000000000000e+00
+18115 18115 1.00000000000000e+00
+18116 18116 1.00000000000000e+00
+18117 18117 1.00000000000000e+00
+18118 18118 1.00000000000000e+00
+18119 18119 1.00000000000000e+00
+18120 6333 -5.12372734049663e-04
+18120 6357 -5.60266975200163e-03
+18120 6381 -7.57131174518697e-04
+18120 6909 -2.75579249208742e-06
+18120 6933 -1.05165732007158e-01
+18120 6957 -6.59599075902204e-01
+18120 6981 -5.44017519973809e-01
+18120 7005 -3.57113108533599e-02
+18120 7029 -3.89310030356533e-05
+18120 7509 -5.17490449004993e-03
+18120 7533 -9.24693753917552e-01
+18120 7557 -5.80227885164792e+00
+18120 7581 -4.28272850225021e+00
+18120 7605 -3.57021004769812e-01
+18120 7629 -1.25262710500989e-03
+18120 8109 -1.27531411453205e-02
+18120 8133 -8.34174209426221e-01
+18120 8157 -5.60361692656968e+00
+18120 8181 -4.15319957528692e+00
+18120 8205 -3.62324339704612e-01
+18120 8229 -1.74967604472399e-04
+18120 8709 -3.88327097074189e-04
+18120 8733 -9.43825694898251e-02
+18120 8757 -6.27511702787335e-01
+18120 8781 -4.52262731923137e-01
+18120 8805 -3.00451118904868e-02
+18120 9333 -3.01603641067000e-09
+18120 9357 -1.61402046852438e-03
+18120 9381 -3.60383670497818e-03
+18120 9405 -1.54009090715200e-05
+18120 18120 7.25784715332243e+00
+18120 17256 1.88902643138654e-02
+18120 17280 1.52529157117928e-01
+18120 17304 3.46520151232723e-01
+18120 17328 1.55998049738432e-01
+18120 17352 1.97574874689915e-02
+18120 17664 1.50081424710553e-01
+18120 17688 1.21838709547178e+00
+18120 17712 2.77880822339931e+00
+18120 17736 1.24398624531149e+00
+18120 17760 1.56481212170480e-01
+18120 18072 3.35688441614710e-01
+18120 18096 2.73598085723519e+00
+18120 18144 2.79022848518569e+00
+18120 18168 3.49250348602335e-01
+18120 18480 1.49387197377013e-01
+18120 18504 1.20974979546800e+00
+18120 18528 2.75439373133249e+00
+18120 18552 1.23701104642261e+00
+18120 18576 1.56202510115665e-01
+18120 18888 1.87167074804804e-02
+18120 18912 1.50369832116984e-01
+18120 18936 3.40416528216017e-01
+18120 18960 1.54254250016213e-01
+18120 18984 1.96878119552877e-02
+18121 18121 1.00000000000000e+00
+18122 18122 1.00000000000000e+00
+18123 18123 1.00000000000000e+00
+18124 18124 1.00000000000000e+00
+18125 18125 1.00000000000000e+00
+18126 18126 1.00000000000000e+00
+18127 18127 1.00000000000000e+00
+18128 18128 1.00000000000000e+00
+18129 18129 1.00000000000000e+00
+18130 18130 1.00000000000000e+00
+18131 18131 1.00000000000000e+00
+18132 18132 1.00000000000000e+00
+18133 18133 1.00000000000000e+00
+18134 18134 1.00000000000000e+00
+18135 18135 1.00000000000000e+00
+18136 18136 1.00000000000000e+00
+18137 18137 1.00000000000000e+00
+18138 18138 1.00000000000000e+00
+18139 18139 1.00000000000000e+00
+18140 18140 1.00000000000000e+00
+18141 18141 1.00000000000000e+00
+18142 18142 1.00000000000000e+00
+18143 18143 1.00000000000000e+00
+18144 6357 -1.96401349981375e-05
+18144 6381 -2.31930704160455e-05
+18144 6933 -8.00448419937311e-05
+18144 6957 -6.23061972031647e-02
+18144 6981 -1.98152836711840e-01
+18144 7005 -6.10846835017315e-02
+18144 7029 -2.50664090970474e-04
+18144 7533 -3.16680109148220e-02
+18144 7557 -1.33991019064062e+00
+18144 7581 -3.82742487958769e+00
+18144 7605 -1.44359395821835e+00
+18144 7629 -5.66160552656326e-02
+18144 7653 -4.73650354579960e-07
+18144 8109 -5.34096308434300e-08
+18144 8133 -9.77203966759724e-02
+18144 8157 -2.69588979393636e+00
+18144 8181 -8.67746750985505e+00
+18144 8205 -3.07599406256256e+00
+18144 8229 -1.19803551127477e-01
+18144 8253 -2.45870515439590e-07
+18144 8709 -3.49041330603600e-08
+18144 8733 -2.17405842911070e-02
+18144 8757 -7.65783553595153e-01
+18144 8781 -2.14962332383442e+00
+18144 8805 -8.56623399539223e-01
+18144 8829 -1.87272890764825e-02
+18144 9333 -3.72328364354000e-09
+18144 9357 -7.75557904544801e-03
+18144 9381 -5.64564483220392e-02
+18144 9405 -2.11921539795365e-02
+18144 9429 -1.46666927100898e-06
+18144 18144 7.31846347239759e+00
+18144 17280 1.92420249656166e-02
+18144 17304 1.55998049738432e-01
+18144 17328 3.56434052889101e-01
+18144 17352 1.63318863554447e-01
+18144 17376 2.10722284196203e-02
+18144 17688 1.54515349157389e-01
+18144 17712 1.24398624531149e+00
+18144 17736 2.82739787882995e+00
+18144 17760 1.30265738846123e+00
+18144 17784 1.69183134944824e-01
+18144 18096 3.48306772694073e-01
+18144 18120 2.79022848518569e+00
+18144 18168 2.92560588267312e+00
+18144 18192 3.82151122065931e-01
+18144 18504 1.53050251489985e-01
+18144 18528 1.23701104642261e+00
+18144 18552 2.82319266893078e+00
+18144 18576 1.30841906282308e+00
+18144 18600 1.70902255590102e-01
+18144 18912 1.88757505487656e-02
+18144 18936 1.54254250016213e-01
+18144 18960 3.55382750414309e-01
+18144 18984 1.64759282144910e-01
+18144 19008 2.15020085809397e-02
+18145 18145 1.00000000000000e+00
+18146 18146 1.00000000000000e+00
+18147 18147 1.00000000000000e+00
+18148 18148 1.00000000000000e+00
+18149 18149 1.00000000000000e+00
+18150 18150 1.00000000000000e+00
+18151 18151 1.00000000000000e+00
+18152 18152 1.00000000000000e+00
+18153 18153 1.00000000000000e+00
+18154 18154 1.00000000000000e+00
+18155 18155 1.00000000000000e+00
+18156 18156 1.00000000000000e+00
+18157 18157 1.00000000000000e+00
+18158 18158 1.00000000000000e+00
+18159 18159 1.00000000000000e+00
+18160 18160 1.00000000000000e+00
+18161 18161 1.00000000000000e+00
+18162 18162 1.00000000000000e+00
+18163 18163 1.00000000000000e+00
+18164 18164 1.00000000000000e+00
+18165 18165 1.00000000000000e+00
+18166 18166 1.00000000000000e+00
+18167 18167 1.00000000000000e+00
+18168 6957 -2.02821011824113e-04
+18168 6981 -2.18011093323533e-02
+18168 7005 -2.01656095848383e-02
+18168 7029 -4.18824570894592e-04
+18168 7557 -7.39694930109539e-02
+18168 7581 -1.01903277723736e+00
+18168 7605 -1.58350204718124e+00
+18168 7629 -2.97980555261449e-01
+18168 7653 -3.81608675529015e-03
+18168 8133 -3.60635957870881e-04
+18168 8157 -3.95378165876492e-01
+18168 8181 -5.27554891058860e+00
+18168 8205 -8.08169379493091e+00
+18168 8229 -1.41134525042509e+00
+18168 8253 -2.38431983512716e-02
+18168 8733 -6.52984975638916e-04
+18168 8757 -2.32391335660983e-01
+18168 8781 -3.17368962354499e+00
+18168 8805 -4.74306814100712e+00
+18168 8829 -9.34677063180284e-01
+18168 8853 -3.81933610700287e-03
+18168 9333 -7.91806544230000e-10
+18168 9357 -7.59144487802214e-03
+18168 9381 -2.16482774683167e-01
+18168 9405 -3.40186827062613e-01
+18168 9429 -5.10221569510311e-02
+18168 9981 -6.01422878122647e-06
+18168 10005 -3.69013968260162e-04
+18168 10029 -5.18385731630746e-05
+18168 18168 7.90139368247109e+00
+18168 17304 1.97574874689915e-02
+18168 17328 1.63318863554447e-01
+18168 17352 3.82946740255845e-01
+18168 17376 1.88423305970199e-01
+18168 17400 2.60335980729295e-02
+18168 17712 1.56481212170480e-01
+18168 17736 1.30265738846123e+00
+18168 17760 3.06392335696752e+00
+18168 17784 1.47878048249848e+00
+18168 17808 2.00511985679792e-01
+18168 18120 3.49250348602335e-01
+18168 18144 2.92560588267312e+00
+18168 18192 3.27950601151824e+00
+18168 18216 4.37725380813614e-01
+18168 18528 1.56202510115665e-01
+18168 18552 1.30841906282308e+00
+18168 18576 3.09174182969898e+00
+18168 18600 1.48802194292692e+00
+18168 18624 2.01103230141624e-01
+18168 18936 1.96878119552877e-02
+18168 18960 1.64759282144910e-01
+18168 18984 3.89901358438711e-01
+18168 19008 1.90733671077309e-01
+18168 19032 2.61814091883874e-02
+18169 18169 1.00000000000000e+00
+18170 18170 1.00000000000000e+00
+18171 18171 1.00000000000000e+00
+18172 18172 1.00000000000000e+00
+18173 18173 1.00000000000000e+00
+18174 18174 1.00000000000000e+00
+18175 18175 1.00000000000000e+00
+18176 18176 1.00000000000000e+00
+18177 18177 1.00000000000000e+00
+18178 18178 1.00000000000000e+00
+18179 18179 1.00000000000000e+00
+18180 18180 1.00000000000000e+00
+18181 18181 1.00000000000000e+00
+18182 18182 1.00000000000000e+00
+18183 18183 1.00000000000000e+00
+18184 18184 1.00000000000000e+00
+18185 18185 1.00000000000000e+00
+18186 18186 1.00000000000000e+00
+18187 18187 1.00000000000000e+00
+18188 18188 1.00000000000000e+00
+18189 18189 1.00000000000000e+00
+18190 18190 1.00000000000000e+00
+18191 18191 1.00000000000000e+00
+18192 6981 -1.91124497901628e-04
+18192 7005 -1.67656038496184e-03
+18192 7029 -9.54730890178464e-05
+18192 7557 -1.44862846263390e-07
+18192 7581 -7.41832630423723e-02
+18192 7605 -5.02981888970404e-01
+18192 7629 -4.22827509282699e-01
+18192 7653 -2.05626619650522e-02
+18192 7677 -2.33755502357585e-06
+18192 8157 -4.83582745070654e-03
+18192 8181 -9.86091564195355e-01
+18192 8205 -6.06421539807084e+00
+18192 8229 -4.32881999660595e+00
+18192 8253 -3.02877918444975e-01
+18192 8277 -8.96387949988683e-04
+18192 8757 -1.85885487822355e-02
+18192 8781 -1.24236010428430e+00
+18192 8805 -8.10899043378011e+00
+18192 8829 -4.91357092063534e+00
+18192 8853 -3.17500633505514e-01
+18192 8877 -2.63309666699969e-04
+18192 9357 -1.50947173666034e-03
+18192 9381 -2.21176604075140e-01
+18192 9405 -1.23592080630090e+00
+18192 9429 -6.38758052884548e-01
+18192 9453 -3.69326044520854e-02
+18192 9981 -2.73173367878583e-05
+18192 10005 -6.49201867337128e-03
+18192 10029 -8.98842633280545e-03
+18192 10053 -5.18975087942558e-05
+18192 18192 8.65632096176568e+00
+18192 17328 2.10722284196203e-02
+18192 17352 1.88423305970199e-01
+18192 17376 4.58342691413079e-01
+18192 17400 1.87065967598063e-01
+18192 17424 2.07328938265863e-02
+18192 17736 1.69183134944824e-01
+18192 17760 1.47878048249848e+00
+18192 17784 3.51831670951067e+00
+18192 17808 1.36581515747559e+00
+18192 17832 1.40941803689102e-01
+18192 18144 3.82151122065931e-01
+18192 18168 3.27950601151824e+00
+18192 18216 2.83315650998111e+00
+18192 18240 2.70563746681651e-01
+18192 18552 1.70902255590102e-01
+18192 18576 1.48802194292692e+00
+18192 18600 3.51772392353507e+00
+18192 18624 1.32109286328215e+00
+18192 18648 1.29169985678909e-01
+18192 18960 2.15020085809397e-02
+18192 18984 1.90733671077309e-01
+18192 19008 4.58194494919177e-01
+18192 19032 1.75885394049702e-01
+18192 19056 1.77899393240382e-02
+18193 18193 1.00000000000000e+00
+18194 18194 1.00000000000000e+00
+18195 18195 1.00000000000000e+00
+18196 18196 1.00000000000000e+00
+18197 18197 1.00000000000000e+00
+18198 18198 1.00000000000000e+00
+18199 18199 1.00000000000000e+00
+18200 18200 1.00000000000000e+00
+18201 18201 1.00000000000000e+00
+18202 18202 1.00000000000000e+00
+18203 18203 1.00000000000000e+00
+18204 18204 1.00000000000000e+00
+18205 18205 1.00000000000000e+00
+18206 18206 1.00000000000000e+00
+18207 18207 1.00000000000000e+00
+18208 18208 1.00000000000000e+00
+18209 18209 1.00000000000000e+00
+18210 18210 1.00000000000000e+00
+18211 18211 1.00000000000000e+00
+18212 18212 1.00000000000000e+00
+18213 18213 1.00000000000000e+00
+18214 18214 1.00000000000000e+00
+18215 18215 1.00000000000000e+00
+18216 7005 -1.54264278491790e-07
+18216 7029 -1.33252547496470e-07
+18216 7581 -2.19376034812510e-05
+18216 7605 -4.73116659948551e-02
+18216 7629 -1.30571047099530e-01
+18216 7653 -2.67141945964822e-02
+18216 7677 -2.89818847393745e-05
+18216 8181 -3.18464976229816e-02
+18216 8205 -1.25135147236016e+00
+18216 8229 -3.15244129814920e+00
+18216 8253 -1.88437508933348e+00
+18216 8277 -3.98978040899698e-02
+18216 8757 -2.87805904174350e-07
+18216 8781 -1.45112262225361e-01
+18216 8805 -3.00685097530558e+00
+18216 8829 -1.24786044584958e+01
+18216 8853 -6.80856023493023e+00
+18216 8877 -1.77902210357923e-02
+18216 9357 -3.20764573755030e-07
+18216 9381 -4.82939482475503e-02
+18216 9405 -1.13270057768641e+00
+18216 9429 -5.50103384768733e+00
+18216 9453 -1.73811843761457e+00
+18216 9981 -1.90559154330360e-05
+18216 10005 -3.65312941816127e-02
+18216 10029 -1.51606456257916e-01
+18216 10053 -4.00184406382047e-03
+18216 18216 9.15595174167010e+00
+18216 17352 2.60335980729295e-02
+18216 17376 1.87065967598063e-01
+18216 17400 4.92735384328554e-01
+18216 17424 3.52882545366832e-01
+18216 17760 2.00511985679792e-01
+18216 17784 1.36581515747559e+00
+18216 17808 3.78477955217486e+00
+18216 17832 3.22216462969520e+00
+18216 18168 4.37725380813614e-01
+18216 18192 2.83315650998111e+00
+18216 18240 7.86066781462645e+00
+18216 18576 2.01103230141624e-01
+18216 18600 1.32109286328215e+00
+18216 18624 3.44529520645662e+00
+18216 18648 2.87162435362045e+00
+18216 18984 2.61814091883874e-02
+18216 19008 1.75885394049702e-01
+18216 19032 4.07864297898995e-01
+18216 19056 2.65247476348145e-01
+18217 18217 1.00000000000000e+00
+18218 18218 1.00000000000000e+00
+18219 18219 1.00000000000000e+00
+18220 18220 1.00000000000000e+00
+18221 18221 1.00000000000000e+00
+18222 18222 1.00000000000000e+00
+18223 18223 1.00000000000000e+00
+18224 18224 1.00000000000000e+00
+18225 18225 1.00000000000000e+00
+18226 18226 1.00000000000000e+00
+18227 18227 1.00000000000000e+00
+18228 18228 1.00000000000000e+00
+18229 18229 1.00000000000000e+00
+18230 18230 1.00000000000000e+00
+18231 18231 1.00000000000000e+00
+18232 18232 1.00000000000000e+00
+18233 18233 1.00000000000000e+00
+18234 18234 1.00000000000000e+00
+18235 18235 1.00000000000000e+00
+18236 18236 1.00000000000000e+00
+18237 18237 1.00000000000000e+00
+18238 18238 1.00000000000000e+00
+18239 18239 1.00000000000000e+00
+18240 7605 -7.22152185415600e-05
+18240 7629 -1.05376172650654e-02
+18240 7653 -8.66206699074860e-03
+18240 7677 -4.16008843137181e-05
+18240 8205 -4.00258339285658e-02
+18240 8229 -1.14051294456305e+00
+18240 8253 -2.26850405724519e+00
+18240 8277 -7.35208925300189e-02
+18240 8781 -2.76167595293292e-04
+18240 8805 -3.54401329386665e-01
+18240 8829 -1.30472690748129e+01
+18240 8853 -1.14939187741039e+01
+18240 8877 -3.37372744046849e-02
+18240 9381 -9.39185922044185e-04
+18240 9405 -4.08749207963311e-01
+18240 9429 -7.85719513899032e+00
+18240 9453 -3.21770864406453e+00
+18240 9981 -3.26042166295239e-06
+18240 10005 -3.72128208243907e-02
+18240 10029 -2.41641731088433e-01
+18240 10053 -7.64040556608115e-03
+18240 18240 1.48273894024813e+01
+18240 17376 2.07328938265863e-02
+18240 17400 3.52882545366832e-01
+18240 17424 5.60634833947560e-01
+18240 17784 1.40941803689102e-01
+18240 17808 3.22216462969520e+00
+18240 17832 5.45773663356667e+00
+18240 18192 2.70563746681651e-01
+18240 18216 7.86066781462645e+00
+18240 18600 1.29169985678909e-01
+18240 18624 2.87162435362045e+00
+18240 18648 4.83905880748852e+00
+18240 19008 1.77899393240382e-02
+18240 19032 2.65247476348145e-01
+18240 19056 4.05965377428023e-01
+18241 18241 1.00000000000000e+00
+18242 18242 1.00000000000000e+00
+18243 18243 1.00000000000000e+00
+18244 18244 1.00000000000000e+00
+18245 18245 1.00000000000000e+00
+18246 18246 1.00000000000000e+00
+18247 18247 1.00000000000000e+00
+18248 18248 1.00000000000000e+00
+18249 18249 1.00000000000000e+00
+18250 18250 1.00000000000000e+00
+18251 18251 1.00000000000000e+00
+18252 18252 1.00000000000000e+00
+18253 18253 1.00000000000000e+00
+18254 18254 1.00000000000000e+00
+18255 18255 1.00000000000000e+00
+18256 18256 1.00000000000000e+00
+18257 18257 1.00000000000000e+00
+18258 18258 1.00000000000000e+00
+18259 18259 1.00000000000000e+00
+18260 18260 1.00000000000000e+00
+18261 18261 1.00000000000000e+00
+18262 18262 1.00000000000000e+00
+18263 18263 1.00000000000000e+00
+18264 4389 -2.25645047563798e-02
+18264 4413 -2.35820716352029e-02
+18264 4437 -1.63349069221820e-07
+18264 4965 -3.62833187129925e-02
+18264 4989 -3.34611990479084e+00
+18264 5013 -1.71458500707120e+00
+18264 5037 -1.03974540170888e-02
+18264 5565 -1.95058358179336e+00
+18264 5589 -1.31480554177425e+01
+18264 5613 -2.47152522189262e+00
+18264 5637 -2.24860482368026e-02
+18264 6141 -4.04614909029321e-06
+18264 6165 -2.73110193042545e+00
+18264 6189 -5.21913909453373e+00
+18264 6213 -5.13545222136775e-01
+18264 6237 -1.52847645058489e-03
+18264 6741 -1.40028719608416e-06
+18264 6765 -1.24451148894911e-01
+18264 6789 -1.37927352900204e-01
+18264 6813 -9.34229118965531e-03
+18264 7389 -2.84904636177000e-09
+18264 7413 -1.07073187650000e-09
+18264 18264 9.05430117290731e+00
+18264 17448 7.55055809614999e-01
+18264 17472 4.45699009410349e-01
+18264 17496 1.94774584579571e-02
+18264 17856 4.64408474817205e+00
+18264 17880 2.84378594303396e+00
+18264 17904 1.49069591127980e-01
+18264 18288 5.14231724303756e+00
+18264 18312 3.18619044738251e-01
+18264 18672 4.83905880748844e+00
+18264 18696 2.87162435362039e+00
+18264 18720 1.29169985678906e-01
+18264 19080 8.03799324444096e-01
+18264 19104 4.52658612056958e-01
+18264 19128 1.45025570956886e-02
+18265 18265 1.00000000000000e+00
+18266 18266 1.00000000000000e+00
+18267 18267 1.00000000000000e+00
+18268 18268 1.00000000000000e+00
+18269 18269 1.00000000000000e+00
+18270 18270 1.00000000000000e+00
+18271 18271 1.00000000000000e+00
+18272 18272 1.00000000000000e+00
+18273 18273 1.00000000000000e+00
+18274 18274 1.00000000000000e+00
+18275 18275 1.00000000000000e+00
+18276 18276 1.00000000000000e+00
+18277 18277 1.00000000000000e+00
+18278 18278 1.00000000000000e+00
+18279 18279 1.00000000000000e+00
+18280 18280 1.00000000000000e+00
+18281 18281 1.00000000000000e+00
+18282 18282 1.00000000000000e+00
+18283 18283 1.00000000000000e+00
+18284 18284 1.00000000000000e+00
+18285 18285 1.00000000000000e+00
+18286 18286 1.00000000000000e+00
+18287 18287 1.00000000000000e+00
+18288 4389 -1.20141728929724e-02
+18288 4413 -1.30329133732078e-02
+18288 4437 -2.10202261173670e-07
+18288 4965 -1.89372668443833e-02
+18288 4989 -2.02506210321663e+00
+18288 5013 -1.55811480797780e+00
+18288 5037 -7.89606507668570e-02
+18288 5061 -2.47411633771678e-04
+18288 5565 -1.08493774795168e+00
+18288 5589 -1.05430018435051e+01
+18288 5613 -5.81223872309198e+00
+18288 5637 -5.57018387595858e-01
+18288 5661 -2.26300359808555e-03
+18288 6141 -2.02792477156878e-06
+18288 6165 -1.58757384800458e+00
+18288 6189 -5.95229647679295e+00
+18288 6213 -3.99618407387605e+00
+18288 6237 -4.56776305238464e-01
+18288 6261 -1.43395025777826e-04
+18288 6741 -7.01874925208510e-07
+18288 6765 -8.86963956974809e-02
+18288 6789 -3.74380593890009e-01
+18288 6813 -3.40415392059884e-01
+18288 6837 -2.34736856990417e-02
+18288 7389 -3.11177468058388e-04
+18288 7413 -1.11687003265815e-03
+18288 7437 -4.02905087151103e-06
+18288 18288 8.49983496383091e+00
+18288 17448 4.45699009410349e-01
+18288 17472 5.20546693731803e-01
+18288 17496 1.77960916292744e-01
+18288 17520 2.50127706152287e-02
+18288 17856 2.84378594303396e+00
+18288 17880 3.71364396652321e+00
+18288 17904 1.41538524136978e+00
+18288 17928 2.04776719214462e-01
+18288 18264 5.14231724303756e+00
+18288 18312 3.14651504285880e+00
+18288 18336 4.68009715976434e-01
+18288 18672 2.87162435362040e+00
+18288 18696 3.44529520645654e+00
+18288 18720 1.32109286328212e+00
+18288 18744 2.01103230141620e-01
+18288 19080 4.52658612056958e-01
+18288 19104 4.53459503715138e-01
+18288 19128 1.54387821770827e-01
+18288 19152 2.40943983470182e-02
+18289 18289 1.00000000000000e+00
+18290 18290 1.00000000000000e+00
+18291 18291 1.00000000000000e+00
+18292 18292 1.00000000000000e+00
+18293 18293 1.00000000000000e+00
+18294 18294 1.00000000000000e+00
+18295 18295 1.00000000000000e+00
+18296 18296 1.00000000000000e+00
+18297 18297 1.00000000000000e+00
+18298 18298 1.00000000000000e+00
+18299 18299 1.00000000000000e+00
+18300 18300 1.00000000000000e+00
+18301 18301 1.00000000000000e+00
+18302 18302 1.00000000000000e+00
+18303 18303 1.00000000000000e+00
+18304 18304 1.00000000000000e+00
+18305 18305 1.00000000000000e+00
+18306 18306 1.00000000000000e+00
+18307 18307 1.00000000000000e+00
+18308 18308 1.00000000000000e+00
+18309 18309 1.00000000000000e+00
+18310 18310 1.00000000000000e+00
+18311 18311 1.00000000000000e+00
+18312 4389 -2.09120147080729e-04
+18312 4413 -3.54822158744667e-04
+18312 4437 -3.67222075893600e-08
+18312 4965 -2.27316425110591e-04
+18312 4989 -1.03095708974912e-01
+18312 5013 -3.92717788799686e-01
+18312 5037 -1.67675406492187e-01
+18312 5061 -1.78015374464236e-03
+18312 5565 -3.13274163014294e-02
+18312 5589 -1.62177710123620e+00
+18312 5613 -6.10453891104451e+00
+18312 5637 -2.35758391105403e+00
+18312 5661 -8.64757018219492e-02
+18312 5685 -2.45216359375905e-06
+18312 6141 -1.38577897776000e-09
+18312 6165 -6.49202412504737e-02
+18312 6189 -2.61950144724895e+00
+18312 6213 -1.02624281112436e+01
+18312 6237 -3.59514649502357e+00
+18312 6261 -1.28155566331302e-01
+18312 6285 -6.50044912846590e-07
+18312 6741 -4.94664904690000e-10
+18312 6765 -9.12151484469939e-03
+18312 6789 -5.76961529729763e-01
+18312 6813 -1.72365237570308e+00
+18312 6837 -6.46169679302480e-01
+18312 6861 -1.37345708174825e-02
+18312 7389 -1.64331298995031e-03
+18312 7413 -2.33917155530072e-02
+18312 7437 -1.06321116976907e-02
+18312 7461 -5.74695123481400e-08
+18312 18312 9.19275053062581e+00
+18312 17448 1.94774584579571e-02
+18312 17472 1.77960916292744e-01
+18312 17496 4.40402125954314e-01
+18312 17520 1.82932433071701e-01
+18312 17544 2.07203376526966e-02
+18312 17856 1.49069591127980e-01
+18312 17880 1.41538524136978e+00
+18312 17904 3.59438648349398e+00
+18312 17928 1.49466441659605e+00
+18312 17952 1.68889384934546e-01
+18312 18264 3.18619044738251e-01
+18312 18288 3.14651504285880e+00
+18312 18336 3.41594298496308e+00
+18312 18360 3.85976030264319e-01
+18312 18672 1.29169985678906e-01
+18312 18696 1.32109286328212e+00
+18312 18720 3.51772392353499e+00
+18312 18744 1.48802194292691e+00
+18312 18768 1.70902255590104e-01
+18312 19080 1.45025570956886e-02
+18312 19104 1.54387821770827e-01
+18312 19128 4.21236485964566e-01
+18312 19152 1.81271814654417e-01
+18312 19176 2.12235553165861e-02
+18313 18313 1.00000000000000e+00
+18314 18314 1.00000000000000e+00
+18315 18315 1.00000000000000e+00
+18316 18316 1.00000000000000e+00
+18317 18317 1.00000000000000e+00
+18318 18318 1.00000000000000e+00
+18319 18319 1.00000000000000e+00
+18320 18320 1.00000000000000e+00
+18321 18321 1.00000000000000e+00
+18322 18322 1.00000000000000e+00
+18323 18323 1.00000000000000e+00
+18324 18324 1.00000000000000e+00
+18325 18325 1.00000000000000e+00
+18326 18326 1.00000000000000e+00
+18327 18327 1.00000000000000e+00
+18328 18328 1.00000000000000e+00
+18329 18329 1.00000000000000e+00
+18330 18330 1.00000000000000e+00
+18331 18331 1.00000000000000e+00
+18332 18332 1.00000000000000e+00
+18333 18333 1.00000000000000e+00
+18334 18334 1.00000000000000e+00
+18335 18335 1.00000000000000e+00
+18336 4989 -6.79448506998587e-04
+18336 5013 -5.38648376009517e-02
+18336 5037 -6.27299216796498e-02
+18336 5061 -3.43551708160322e-03
+18336 5589 -1.31335544505487e-01
+18336 5613 -1.72986038849148e+00
+18336 5637 -2.39601445015478e+00
+18336 5661 -4.30138184579638e-01
+18336 5685 -6.01949539313820e-03
+18336 6165 -3.99843198830981e-04
+18336 6189 -4.68654027442260e-01
+18336 6213 -5.86868412923071e+00
+18336 6237 -8.66875421797871e+00
+18336 6261 -1.40261292381427e+00
+18336 6285 -2.14258727932296e-02
+18336 6765 -4.19575438955588e-04
+18336 6789 -1.82793376238334e-01
+18336 6813 -2.40623175819992e+00
+18336 6837 -3.42870701505585e+00
+18336 6861 -6.56082329760212e-01
+18336 6885 -2.38851479682783e-03
+18336 7389 -1.90576692073226e-03
+18336 7413 -9.55746831137999e-02
+18336 7437 -1.58796974729019e-01
+18336 7461 -2.25121796792210e-02
+18336 8013 -1.32206470670000e-10
+18336 8037 -1.27615079143266e-05
+18336 8061 -3.09439465411294e-06
+18336 18336 7.99757378523735e+00
+18336 17472 2.50127706152287e-02
+18336 17496 1.82932433071701e-01
+18336 17520 3.76117951231702e-01
+18336 17544 1.61200463304097e-01
+18336 17568 1.95797781733276e-02
+18336 17880 2.04776719214462e-01
+18336 17904 1.49466441659605e+00
+18336 17928 3.06407723868171e+00
+18336 17952 1.30383898179604e+00
+18336 17976 1.57070360514461e-01
+18336 18288 4.68009715976434e-01
+18336 18312 3.41594298496308e+00
+18336 18360 2.95969446118357e+00
+18336 18384 3.53947585031560e-01
+18336 18696 2.01103230141620e-01
+18336 18720 1.48802194292691e+00
+18336 18744 3.09174182969900e+00
+18336 18768 1.30841906282309e+00
+18336 18792 1.56202510115664e-01
+18336 19104 2.40943983470182e-02
+18336 19128 1.81271814654417e-01
+18336 19152 3.83034098986024e-01
+18336 19176 1.62345483560858e-01
+18336 19200 1.93628155736283e-02
+18337 18337 1.00000000000000e+00
+18338 18338 1.00000000000000e+00
+18339 18339 1.00000000000000e+00
+18340 18340 1.00000000000000e+00
+18341 18341 1.00000000000000e+00
+18342 18342 1.00000000000000e+00
+18343 18343 1.00000000000000e+00
+18344 18344 1.00000000000000e+00
+18345 18345 1.00000000000000e+00
+18346 18346 1.00000000000000e+00
+18347 18347 1.00000000000000e+00
+18348 18348 1.00000000000000e+00
+18349 18349 1.00000000000000e+00
+18350 18350 1.00000000000000e+00
+18351 18351 1.00000000000000e+00
+18352 18352 1.00000000000000e+00
+18353 18353 1.00000000000000e+00
+18354 18354 1.00000000000000e+00
+18355 18355 1.00000000000000e+00
+18356 18356 1.00000000000000e+00
+18357 18357 1.00000000000000e+00
+18358 18358 1.00000000000000e+00
+18359 18359 1.00000000000000e+00
+18360 5013 -5.47483143415981e-04
+18360 5037 -6.31400259870883e-03
+18360 5061 -8.94813647991479e-04
+18360 5589 -2.39915213309624e-06
+18360 5613 -1.17769960030617e-01
+18360 5637 -7.15791459635713e-01
+18360 5661 -5.70727423507642e-01
+18360 5685 -3.76488888679948e-02
+18360 5709 -4.34911550910311e-05
+18360 6189 -5.50462311142646e-03
+18360 6213 -1.02406696179594e+00
+18360 6237 -6.07799992998220e+00
+18360 6261 -4.40199915461416e+00
+18360 6285 -3.62480097222252e-01
+18360 6309 -1.33629378071348e-03
+18360 6789 -1.36571193791506e-02
+18360 6813 -8.81184445223626e-01
+18360 6837 -5.69463606063286e+00
+18360 6861 -4.18131636633926e+00
+18360 6885 -3.63297660228323e-01
+18360 6909 -1.88504826688788e-04
+18360 7389 -3.98715594254569e-04
+18360 7413 -9.45460057249810e-02
+18360 7437 -6.27007469647809e-01
+18360 7461 -4.46824974409302e-01
+18360 7485 -3.01220400623413e-02
+18360 8013 -7.06933854300000e-10
+18360 8037 -1.49333307771915e-03
+18360 8061 -3.48186344649793e-03
+18360 8085 -1.69496349620297e-05
+18360 18360 7.38973295076644e+00
+18360 17496 2.07203376526966e-02
+18360 17520 1.61200463304097e-01
+18360 17544 3.53193527318903e-01
+18360 17568 1.55106068265170e-01
+18360 17592 1.91967388929650e-02
+18360 17904 1.68889384934546e-01
+18360 17928 1.30383898179604e+00
+18360 17952 2.83430511093290e+00
+18360 17976 1.23744127312555e+00
+18360 18000 1.52289957766922e-01
+18360 18312 3.85976030264319e-01
+18360 18336 2.95969446118357e+00
+18360 18384 2.77817258011406e+00
+18360 18408 3.40595559996942e-01
+18360 18720 1.70902255590104e-01
+18360 18744 1.30841906282309e+00
+18360 18768 2.82319266893077e+00
+18360 18792 1.23701104642260e+00
+18360 18816 1.53050251489982e-01
+18360 19128 2.12235553165861e-02
+18360 19152 1.62345483560858e-01
+18360 19176 3.50415416818369e-01
+18360 19200 1.54998511589434e-01
+18360 19224 1.93868123237301e-02
+18361 18361 1.00000000000000e+00
+18362 18362 1.00000000000000e+00
+18363 18363 1.00000000000000e+00
+18364 18364 1.00000000000000e+00
+18365 18365 1.00000000000000e+00
+18366 18366 1.00000000000000e+00
+18367 18367 1.00000000000000e+00
+18368 18368 1.00000000000000e+00
+18369 18369 1.00000000000000e+00
+18370 18370 1.00000000000000e+00
+18371 18371 1.00000000000000e+00
+18372 18372 1.00000000000000e+00
+18373 18373 1.00000000000000e+00
+18374 18374 1.00000000000000e+00
+18375 18375 1.00000000000000e+00
+18376 18376 1.00000000000000e+00
+18377 18377 1.00000000000000e+00
+18378 18378 1.00000000000000e+00
+18379 18379 1.00000000000000e+00
+18380 18380 1.00000000000000e+00
+18381 18381 1.00000000000000e+00
+18382 18382 1.00000000000000e+00
+18383 18383 1.00000000000000e+00
+18384 5037 -2.12273103108980e-05
+18384 5061 -2.60766096089580e-05
+18384 5613 -7.21993790366338e-05
+18384 5637 -6.29703485864395e-02
+18384 5661 -2.00674644131226e-01
+18384 5685 -6.19881299017583e-02
+18384 5709 -2.69100304160322e-04
+18384 6213 -3.06819938875630e-02
+18384 6237 -1.33485408307054e+00
+18384 6261 -3.78016253433073e+00
+18384 6285 -1.41063348630125e+00
+18384 6309 -5.29520423692181e-02
+18384 6333 -6.46536115564740e-07
+18384 6789 -2.67149432083500e-08
+18384 6813 -9.59646298107557e-02
+18384 6837 -2.63136498869216e+00
+18384 6861 -8.39721704319996e+00
+18384 6885 -2.89436506660370e+00
+18384 6909 -1.10295881093751e-01
+18384 6933 -3.35135530715780e-07
+18384 7389 -1.74352105968200e-08
+18384 7413 -2.10748455066421e-02
+18384 7437 -7.35882102626040e-01
+18384 7461 -2.02056147413531e+00
+18384 7485 -7.69802226468799e-01
+18384 7509 -1.73529761959176e-02
+18384 8013 -8.44638357170000e-10
+18384 8037 -6.99137529405206e-03
+18384 8061 -4.94282254897322e-02
+18384 8085 -1.84595574985236e-02
+18384 8109 -1.64776284888537e-06
+18384 18384 7.14026111656753e+00
+18384 17520 1.95797781733276e-02
+18384 17544 1.55106068265170e-01
+18384 17568 3.45414760493988e-01
+18384 17592 1.51535595704744e-01
+18384 17616 1.86871600332211e-02
+18384 17928 1.57070360514461e-01
+18384 17952 1.23744127312555e+00
+18384 17976 2.74332515484007e+00
+18384 18000 1.20762171128692e+00
+18384 18024 1.49615470054805e-01
+18384 18336 3.53947585031560e-01
+18384 18360 2.77817258011406e+00
+18384 18408 2.70952052632653e+00
+18384 18432 3.36784571584677e-01
+18384 18744 1.56202510115664e-01
+18384 18768 1.23701104642260e+00
+18384 18792 2.75439373133245e+00
+18384 18816 1.20974979546800e+00
+18384 18840 1.49387197377013e-01
+18384 19152 1.93628155736283e-02
+18384 19176 1.54998511589434e-01
+18384 19200 3.48181904617084e-01
+18384 19224 1.52067616750013e-01
+18384 19248 1.86300918637732e-02
+18385 18385 1.00000000000000e+00
+18386 18386 1.00000000000000e+00
+18387 18387 1.00000000000000e+00
+18388 18388 1.00000000000000e+00
+18389 18389 1.00000000000000e+00
+18390 18390 1.00000000000000e+00
+18391 18391 1.00000000000000e+00
+18392 18392 1.00000000000000e+00
+18393 18393 1.00000000000000e+00
+18394 18394 1.00000000000000e+00
+18395 18395 1.00000000000000e+00
+18396 18396 1.00000000000000e+00
+18397 18397 1.00000000000000e+00
+18398 18398 1.00000000000000e+00
+18399 18399 1.00000000000000e+00
+18400 18400 1.00000000000000e+00
+18401 18401 1.00000000000000e+00
+18402 18402 1.00000000000000e+00
+18403 18403 1.00000000000000e+00
+18404 18404 1.00000000000000e+00
+18405 18405 1.00000000000000e+00
+18406 18406 1.00000000000000e+00
+18407 18407 1.00000000000000e+00
+18408 5637 -1.83814698169986e-04
+18408 5661 -2.12466860893379e-02
+18408 5685 -1.97985618629703e-02
+18408 5709 -4.24155580695297e-04
+18408 6237 -7.01592677812315e-02
+18408 6261 -9.64335460689663e-01
+18408 6285 -1.43848699559362e+00
+18408 6309 -2.57273709859606e-01
+18408 6333 -2.89134898941355e-03
+18408 6813 -3.19949948932858e-04
+18408 6837 -3.73523759437001e-01
+18408 6861 -4.76234705419661e+00
+18408 6885 -7.08479211929128e+00
+18408 6909 -1.14383406827339e+00
+18408 6933 -1.79537556714428e-02
+18408 7413 -5.78508518996021e-04
+18408 7437 -2.12078387164958e-01
+18408 7461 -2.74137618073184e+00
+18408 7485 -3.94652603057977e+00
+18408 7509 -7.34647396722989e-01
+18408 7533 -3.03185917096303e-03
+18408 8013 -1.78107971630000e-10
+18408 8037 -6.28028490483819e-03
+18408 8061 -1.75776519637661e-01
+18408 8085 -2.53821298188303e-01
+18408 8109 -3.79318522441511e-02
+18408 8661 -3.38983153372562e-06
+18408 8685 -2.44302264716898e-04
+18408 8709 -3.67018070179622e-05
+18408 18408 7.06385545660238e+00
+18408 17544 1.91967388929650e-02
+18408 17568 1.51535595704744e-01
+18408 17592 3.36634243015390e-01
+18408 17616 1.48520414496436e-01
+18408 17640 1.84429435908879e-02
+18408 17952 1.52289957766922e-01
+18408 17976 1.20762171128692e+00
+18408 18000 2.69436446902456e+00
+18408 18024 1.19136984174206e+00
+18408 18048 1.48226990380706e-01
+18408 18360 3.40595559996942e-01
+18408 18384 2.70952052632653e+00
+18408 18432 2.68596529134033e+00
+18408 18456 3.34706751250393e-01
+18408 18768 1.53050251489982e-01
+18408 18792 1.20974979546800e+00
+18408 18816 2.69147239990296e+00
+18408 18840 1.19045675103089e+00
+18408 18864 1.48226990380706e-01
+18408 19176 1.93868123237301e-02
+18408 19200 1.52067616750013e-01
+18408 19224 3.35911225734989e-01
+18408 19248 1.48292141818645e-01
+18408 19272 1.84429435908880e-02
+18409 18409 1.00000000000000e+00
+18410 18410 1.00000000000000e+00
+18411 18411 1.00000000000000e+00
+18412 18412 1.00000000000000e+00
+18413 18413 1.00000000000000e+00
+18414 18414 1.00000000000000e+00
+18415 18415 1.00000000000000e+00
+18416 18416 1.00000000000000e+00
+18417 18417 1.00000000000000e+00
+18418 18418 1.00000000000000e+00
+18419 18419 1.00000000000000e+00
+18420 18420 1.00000000000000e+00
+18421 18421 1.00000000000000e+00
+18422 18422 1.00000000000000e+00
+18423 18423 1.00000000000000e+00
+18424 18424 1.00000000000000e+00
+18425 18425 1.00000000000000e+00
+18426 18426 1.00000000000000e+00
+18427 18427 1.00000000000000e+00
+18428 18428 1.00000000000000e+00
+18429 18429 1.00000000000000e+00
+18430 18430 1.00000000000000e+00
+18431 18431 1.00000000000000e+00
+18432 5661 -1.66168765949973e-04
+18432 5685 -1.54822597046122e-03
+18432 5709 -9.56224454740982e-05
+18432 6237 -7.48855361421700e-08
+18432 6261 -6.46742273828283e-02
+18432 6285 -4.15890163972256e-01
+18432 6309 -3.18730314473021e-01
+18432 6333 -1.65572343303867e-02
+18432 6357 -2.69057086099650e-06
+18432 6837 -3.92424215915944e-03
+18432 6861 -8.36607401537234e-01
+18432 6885 -4.81535243342509e+00
+18432 6909 -3.42674317775809e+00
+18432 6933 -2.74213120676922e-01
+18432 6957 -8.90212526518244e-04
+18432 7437 -1.52511482932409e-02
+18432 7461 -9.74542059803753e-01
+18432 7485 -6.27649976772458e+00
+18432 7509 -4.42023205069236e+00
+18432 7533 -3.62722235630272e-01
+18432 7557 -2.61608722558182e-04
+18432 8037 -1.21000740674983e-03
+18432 8061 -1.56910533252355e-01
+18432 8085 -9.41744134857352e-01
+18432 8109 -6.46991543310090e-01
+18432 8133 -4.61905750663570e-02
+18432 8661 -1.62498969958991e-05
+18432 8685 -5.97874547333376e-03
+18432 8709 -9.23046608098434e-03
+18432 8733 -5.94104233255175e-05
+18432 18432 7.02057532771950e+00
+18432 17568 1.86871600332211e-02
+18432 17592 1.48520414496436e-01
+18432 17616 3.32388061491717e-01
+18432 17640 1.48226990380707e-01
+18432 17664 1.86138040042888e-02
+18432 17976 1.49615470054805e-01
+18432 18000 1.19136984174206e+00
+18432 18024 2.66851631419325e+00
+18432 18048 1.18198395371121e+00
+18432 18072 1.47268998047092e-01
+18432 18384 3.36784571584677e-01
+18432 18408 2.68596529134033e+00
+18432 18456 2.65275794951493e+00
+18432 18480 3.28482736128326e-01
+18432 18792 1.49387197377013e-01
+18432 18816 1.19045675103089e+00
+18432 18840 2.66828804151546e+00
+18432 18864 1.18198395371122e+00
+18432 18888 1.47268998047095e-01
+18432 19200 1.86300918637732e-02
+18432 19224 1.48292141818645e-01
+18432 19248 3.32330993322271e-01
+18432 19272 1.48226990380710e-01
+18432 19296 1.86138040042894e-02
+18433 18433 1.00000000000000e+00
+18434 18434 1.00000000000000e+00
+18435 18435 1.00000000000000e+00
+18436 18436 1.00000000000000e+00
+18437 18437 1.00000000000000e+00
+18438 18438 1.00000000000000e+00
+18439 18439 1.00000000000000e+00
+18440 18440 1.00000000000000e+00
+18441 18441 1.00000000000000e+00
+18442 18442 1.00000000000000e+00
+18443 18443 1.00000000000000e+00
+18444 18444 1.00000000000000e+00
+18445 18445 1.00000000000000e+00
+18446 18446 1.00000000000000e+00
+18447 18447 1.00000000000000e+00
+18448 18448 1.00000000000000e+00
+18449 18449 1.00000000000000e+00
+18450 18450 1.00000000000000e+00
+18451 18451 1.00000000000000e+00
+18452 18452 1.00000000000000e+00
+18453 18453 1.00000000000000e+00
+18454 18454 1.00000000000000e+00
+18455 18455 1.00000000000000e+00
+18456 5685 -1.35451214863840e-07
+18456 5709 -1.21690419475120e-07
+18456 6261 -1.41521149777115e-05
+18456 6285 -3.36791333816439e-02
+18456 6309 -1.01881284312103e-01
+18456 6333 -2.31392107675321e-02
+18456 6357 -1.41521149777116e-05
+18456 6861 -2.31392107675319e-02
+18456 6885 -1.00780222794440e+00
+18456 6909 -2.72455878059633e+00
+18456 6933 -1.00780222794441e+00
+18456 6957 -3.36791333816436e-02
+18456 6981 -1.35451214863830e-07
+18456 7437 -1.21690419475120e-07
+18456 7461 -1.01881284312103e-01
+18456 7485 -2.72455878059634e+00
+18456 7509 -8.29821941083528e+00
+18456 7533 -2.72455878059634e+00
+18456 7557 -1.01881284312102e-01
+18456 7581 -1.21690419475120e-07
+18456 8037 -1.35451214863840e-07
+18456 8061 -3.36791333816442e-02
+18456 8085 -1.00780222794443e+00
+18456 8109 -2.72455878059637e+00
+18456 8133 -1.00780222794441e+00
+18456 8157 -2.31392107675323e-02
+18456 8661 -1.41521149777120e-05
+18456 8685 -2.31392107675328e-02
+18456 8709 -1.01881284312104e-01
+18456 8733 -3.36791333816438e-02
+18456 8757 -1.41521149777116e-05
+18456 9309 -1.21690419475120e-07
+18456 9333 -1.35451214863830e-07
+18456 18456 6.92513728055421e+00
+18456 17592 1.84429435908879e-02
+18456 17616 1.48226990380707e-01
+18456 17640 3.34706751250396e-01
+18456 17664 1.48226990380706e-01
+18456 17688 1.84429435908877e-02
+18456 18000 1.48226990380706e-01
+18456 18024 1.18198395371120e+00
+18456 18048 2.65275794951494e+00
+18456 18072 1.18198395371121e+00
+18456 18096 1.48226990380707e-01
+18456 18408 3.34706751250393e-01
+18456 18432 2.65275794951493e+00
+18456 18480 2.65275794951495e+00
+18456 18504 3.34706751250399e-01
+18456 18816 1.48226990380706e-01
+18456 18840 1.18198395371122e+00
+18456 18864 2.65275794951498e+00
+18456 18888 1.18198395371122e+00
+18456 18912 1.48226990380707e-01
+18456 19224 1.84429435908880e-02
+18456 19248 1.48226990380710e-01
+18456 19272 3.34706751250407e-01
+18456 19296 1.48226990380709e-01
+18456 19320 1.84429435908878e-02
+18457 18457 1.00000000000000e+00
+18458 18458 1.00000000000000e+00
+18459 18459 1.00000000000000e+00
+18460 18460 1.00000000000000e+00
+18461 18461 1.00000000000000e+00
+18462 18462 1.00000000000000e+00
+18463 18463 1.00000000000000e+00
+18464 18464 1.00000000000000e+00
+18465 18465 1.00000000000000e+00
+18466 18466 1.00000000000000e+00
+18467 18467 1.00000000000000e+00
+18468 18468 1.00000000000000e+00
+18469 18469 1.00000000000000e+00
+18470 18470 1.00000000000000e+00
+18471 18471 1.00000000000000e+00
+18472 18472 1.00000000000000e+00
+18473 18473 1.00000000000000e+00
+18474 18474 1.00000000000000e+00
+18475 18475 1.00000000000000e+00
+18476 18476 1.00000000000000e+00
+18477 18477 1.00000000000000e+00
+18478 18478 1.00000000000000e+00
+18479 18479 1.00000000000000e+00
+18480 6285 -5.94104233255154e-05
+18480 6309 -9.23046608098402e-03
+18480 6333 -5.97874547333357e-03
+18480 6357 -1.62498969958988e-05
+18480 6885 -4.61905750663568e-02
+18480 6909 -6.46991543310082e-01
+18480 6933 -9.41744134857338e-01
+18480 6957 -1.56910533252352e-01
+18480 6981 -1.21000740674980e-03
+18480 7461 -2.61608722558192e-04
+18480 7485 -3.62722235630275e-01
+18480 7509 -4.42023205069251e+00
+18480 7533 -6.27649976772464e+00
+18480 7557 -9.74542059803748e-01
+18480 7581 -1.52511482932406e-02
+18480 8061 -8.90212526518275e-04
+18480 8085 -2.74213120676928e-01
+18480 8109 -3.42674317775812e+00
+18480 8133 -4.81535243342516e+00
+18480 8157 -8.36607401537243e-01
+18480 8181 -3.92424215915939e-03
+18480 8661 -2.69057086099659e-06
+18480 8685 -1.65572343303868e-02
+18480 8709 -3.18730314473020e-01
+18480 8733 -4.15890163972259e-01
+18480 8757 -6.46742273828293e-02
+18480 8781 -7.48855361421800e-08
+18480 9309 -9.56224454740996e-05
+18480 9333 -1.54822597046124e-03
+18480 9357 -1.66168765949975e-04
+18480 18480 7.02057532771960e+00
+18480 17616 1.86138040042888e-02
+18480 17640 1.48226990380706e-01
+18480 17664 3.32330993322265e-01
+18480 17688 1.48292141818642e-01
+18480 17712 1.86300918637728e-02
+18480 18024 1.47268998047092e-01
+18480 18048 1.18198395371121e+00
+18480 18072 2.66828804151546e+00
+18480 18096 1.19045675103089e+00
+18480 18120 1.49387197377013e-01
+18480 18432 3.28482736128326e-01
+18480 18456 2.65275794951495e+00
+18480 18504 2.68596529134037e+00
+18480 18528 3.36784571584681e-01
+18480 18840 1.47268998047095e-01
+18480 18864 1.18198395371122e+00
+18480 18888 2.66851631419327e+00
+18480 18912 1.19136984174207e+00
+18480 18936 1.49615470054807e-01
+18480 19248 1.86138040042894e-02
+18480 19272 1.48226990380709e-01
+18480 19296 3.32388061491716e-01
+18480 19320 1.48520414496437e-01
+18480 19344 1.86871600332214e-02
+18481 18481 1.00000000000000e+00
+18482 18482 1.00000000000000e+00
+18483 18483 1.00000000000000e+00
+18484 18484 1.00000000000000e+00
+18485 18485 1.00000000000000e+00
+18486 18486 1.00000000000000e+00
+18487 18487 1.00000000000000e+00
+18488 18488 1.00000000000000e+00
+18489 18489 1.00000000000000e+00
+18490 18490 1.00000000000000e+00
+18491 18491 1.00000000000000e+00
+18492 18492 1.00000000000000e+00
+18493 18493 1.00000000000000e+00
+18494 18494 1.00000000000000e+00
+18495 18495 1.00000000000000e+00
+18496 18496 1.00000000000000e+00
+18497 18497 1.00000000000000e+00
+18498 18498 1.00000000000000e+00
+18499 18499 1.00000000000000e+00
+18500 18500 1.00000000000000e+00
+18501 18501 1.00000000000000e+00
+18502 18502 1.00000000000000e+00
+18503 18503 1.00000000000000e+00
+18504 6309 -3.67018070179616e-05
+18504 6333 -2.44302264716894e-04
+18504 6357 -3.38983153372556e-06
+18504 6909 -3.79318522441511e-02
+18504 6933 -2.53821298188300e-01
+18504 6957 -1.75776519637657e-01
+18504 6981 -6.28028490483812e-03
+18504 7005 -1.78107971630000e-10
+18504 7485 -3.03185917096305e-03
+18504 7509 -7.34647396723027e-01
+18504 7533 -3.94652603057980e+00
+18504 7557 -2.74137618073184e+00
+18504 7581 -2.12078387164960e-01
+18504 7605 -5.78508518996036e-04
+18504 8085 -1.79537556714427e-02
+18504 8109 -1.14383406827340e+00
+18504 8133 -7.08479211929137e+00
+18504 8157 -4.76234705419666e+00
+18504 8181 -3.73523759436999e-01
+18504 8205 -3.19949948932867e-04
+18504 8685 -2.89134898941353e-03
+18504 8709 -2.57273709859609e-01
+18504 8733 -1.43848699559364e+00
+18504 8757 -9.64335460689672e-01
+18504 8781 -7.01592677812320e-02
+18504 9309 -4.24155580695303e-04
+18504 9333 -1.97985618629705e-02
+18504 9357 -2.12466860893382e-02
+18504 9381 -1.83814698169988e-04
+18504 18504 7.06385545660245e+00
+18504 17640 1.84429435908877e-02
+18504 17664 1.48292141818642e-01
+18504 17688 3.35911225734983e-01
+18504 17712 1.52067616750014e-01
+18504 17736 1.93868123237306e-02
+18504 18048 1.48226990380707e-01
+18504 18072 1.19045675103089e+00
+18504 18096 2.69147239990295e+00
+18504 18120 1.20974979546800e+00
+18504 18144 1.53050251489985e-01
+18504 18456 3.34706751250399e-01
+18504 18480 2.68596529134037e+00
+18504 18528 2.70952052632656e+00
+18504 18552 3.40595559996945e-01
+18504 18864 1.48226990380707e-01
+18504 18888 1.19136984174207e+00
+18504 18912 2.69436446902460e+00
+18504 18936 1.20762171128693e+00
+18504 18960 1.52289957766923e-01
+18504 19272 1.84429435908878e-02
+18504 19296 1.48520414496437e-01
+18504 19320 3.36634243015395e-01
+18504 19344 1.51535595704746e-01
+18504 19368 1.91967388929652e-02
+18505 18505 1.00000000000000e+00
+18506 18506 1.00000000000000e+00
+18507 18507 1.00000000000000e+00
+18508 18508 1.00000000000000e+00
+18509 18509 1.00000000000000e+00
+18510 18510 1.00000000000000e+00
+18511 18511 1.00000000000000e+00
+18512 18512 1.00000000000000e+00
+18513 18513 1.00000000000000e+00
+18514 18514 1.00000000000000e+00
+18515 18515 1.00000000000000e+00
+18516 18516 1.00000000000000e+00
+18517 18517 1.00000000000000e+00
+18518 18518 1.00000000000000e+00
+18519 18519 1.00000000000000e+00
+18520 18520 1.00000000000000e+00
+18521 18521 1.00000000000000e+00
+18522 18522 1.00000000000000e+00
+18523 18523 1.00000000000000e+00
+18524 18524 1.00000000000000e+00
+18525 18525 1.00000000000000e+00
+18526 18526 1.00000000000000e+00
+18527 18527 1.00000000000000e+00
+18528 6909 -1.64776284888537e-06
+18528 6933 -1.84595574985232e-02
+18528 6957 -4.94282254897317e-02
+18528 6981 -6.99137529405218e-03
+18528 7005 -8.44638357170000e-10
+18528 7509 -1.73529761959179e-02
+18528 7533 -7.69802226468803e-01
+18528 7557 -2.02056147413533e+00
+18528 7581 -7.35882102626055e-01
+18528 7605 -2.10748455066424e-02
+18528 7629 -1.74352105968200e-08
+18528 8085 -3.35135530715790e-07
+18528 8109 -1.10295881093752e-01
+18528 8133 -2.89436506660373e+00
+18528 8157 -8.39721704320003e+00
+18528 8181 -2.63136498869216e+00
+18528 8205 -9.59646298107564e-02
+18528 8229 -2.67149432083500e-08
+18528 8685 -6.46536115564750e-07
+18528 8709 -5.29520423692189e-02
+18528 8733 -1.41063348630127e+00
+18528 8757 -3.78016253433076e+00
+18528 8781 -1.33485408307054e+00
+18528 8805 -3.06819938875630e-02
+18528 9309 -2.69100304160325e-04
+18528 9333 -6.19881299017590e-02
+18528 9357 -2.00674644131229e-01
+18528 9381 -6.29703485864404e-02
+18528 9405 -7.21993790366340e-05
+18528 9957 -2.60766096089586e-05
+18528 9981 -2.12273103108984e-05
+18528 18528 7.14026111656758e+00
+18528 17664 1.86300918637728e-02
+18528 17688 1.52067616750014e-01
+18528 17712 3.48181904617092e-01
+18528 17736 1.54998511589437e-01
+18528 17760 1.93628155736285e-02
+18528 18072 1.49387197377013e-01
+18528 18096 1.20974979546800e+00
+18528 18120 2.75439373133249e+00
+18528 18144 1.23701104642261e+00
+18528 18168 1.56202510115665e-01
+18528 18480 3.36784571584681e-01
+18528 18504 2.70952052632656e+00
+18528 18552 2.77817258011408e+00
+18528 18576 3.53947585031560e-01
+18528 18888 1.49615470054807e-01
+18528 18912 1.20762171128693e+00
+18528 18936 2.74332515484009e+00
+18528 18960 1.23744127312556e+00
+18528 18984 1.57070360514463e-01
+18528 19296 1.86871600332214e-02
+18528 19320 1.51535595704746e-01
+18528 19344 3.45414760493992e-01
+18528 19368 1.55106068265173e-01
+18528 19392 1.95797781733280e-02
+18529 18529 1.00000000000000e+00
+18530 18530 1.00000000000000e+00
+18531 18531 1.00000000000000e+00
+18532 18532 1.00000000000000e+00
+18533 18533 1.00000000000000e+00
+18534 18534 1.00000000000000e+00
+18535 18535 1.00000000000000e+00
+18536 18536 1.00000000000000e+00
+18537 18537 1.00000000000000e+00
+18538 18538 1.00000000000000e+00
+18539 18539 1.00000000000000e+00
+18540 18540 1.00000000000000e+00
+18541 18541 1.00000000000000e+00
+18542 18542 1.00000000000000e+00
+18543 18543 1.00000000000000e+00
+18544 18544 1.00000000000000e+00
+18545 18545 1.00000000000000e+00
+18546 18546 1.00000000000000e+00
+18547 18547 1.00000000000000e+00
+18548 18548 1.00000000000000e+00
+18549 18549 1.00000000000000e+00
+18550 18550 1.00000000000000e+00
+18551 18551 1.00000000000000e+00
+18552 6933 -1.69496349620302e-05
+18552 6957 -3.48186344649802e-03
+18552 6981 -1.49333307771918e-03
+18552 7005 -7.06933854300000e-10
+18552 7533 -3.01220400623416e-02
+18552 7557 -4.46824974409309e-01
+18552 7581 -6.27007469647816e-01
+18552 7605 -9.45460057249813e-02
+18552 7629 -3.98715594254561e-04
+18552 8109 -1.88504826688790e-04
+18552 8133 -3.63297660228326e-01
+18552 8157 -4.18131636633928e+00
+18552 8181 -5.69463606063287e+00
+18552 8205 -8.81184445223622e-01
+18552 8229 -1.36571193791504e-02
+18552 8709 -1.33629378071350e-03
+18552 8733 -3.62480097222256e-01
+18552 8757 -4.40199915461420e+00
+18552 8781 -6.07799992998221e+00
+18552 8805 -1.02406696179593e+00
+18552 8829 -5.50462311142637e-03
+18552 9309 -4.34911550910315e-05
+18552 9333 -3.76488888679954e-02
+18552 9357 -5.70727423507654e-01
+18552 9381 -7.15791459635722e-01
+18552 9405 -1.17769960030618e-01
+18552 9429 -2.39915213309623e-06
+18552 9957 -8.94813647991517e-04
+18552 9981 -6.31400259870912e-03
+18552 10005 -5.47483143416006e-04
+18552 18552 7.38973295076645e+00
+18552 17688 1.93868123237306e-02
+18552 17712 1.54998511589437e-01
+18552 17736 3.50415416818372e-01
+18552 17760 1.62345483560857e-01
+18552 17784 2.12235553165857e-02
+18552 18096 1.53050251489985e-01
+18552 18120 1.23701104642261e+00
+18552 18144 2.82319266893078e+00
+18552 18168 1.30841906282308e+00
+18552 18192 1.70902255590102e-01
+18552 18504 3.40595559996945e-01
+18552 18528 2.77817258011408e+00
+18552 18576 2.95969446118357e+00
+18552 18600 3.85976030264319e-01
+18552 18912 1.52289957766923e-01
+18552 18936 1.23744127312556e+00
+18552 18960 2.83430511093293e+00
+18552 18984 1.30383898179606e+00
+18552 19008 1.68889384934549e-01
+18552 19320 1.91967388929652e-02
+18552 19344 1.55106068265173e-01
+18552 19368 3.53193527318910e-01
+18552 19392 1.61200463304102e-01
+18552 19416 2.07203376526976e-02
+18553 18553 1.00000000000000e+00
+18554 18554 1.00000000000000e+00
+18555 18555 1.00000000000000e+00
+18556 18556 1.00000000000000e+00
+18557 18557 1.00000000000000e+00
+18558 18558 1.00000000000000e+00
+18559 18559 1.00000000000000e+00
+18560 18560 1.00000000000000e+00
+18561 18561 1.00000000000000e+00
+18562 18562 1.00000000000000e+00
+18563 18563 1.00000000000000e+00
+18564 18564 1.00000000000000e+00
+18565 18565 1.00000000000000e+00
+18566 18566 1.00000000000000e+00
+18567 18567 1.00000000000000e+00
+18568 18568 1.00000000000000e+00
+18569 18569 1.00000000000000e+00
+18570 18570 1.00000000000000e+00
+18571 18571 1.00000000000000e+00
+18572 18572 1.00000000000000e+00
+18573 18573 1.00000000000000e+00
+18574 18574 1.00000000000000e+00
+18575 18575 1.00000000000000e+00
+18576 6957 -3.09439465411297e-06
+18576 6981 -1.27615079143267e-05
+18576 7005 -1.32206470670000e-10
+18576 7557 -2.25121796792212e-02
+18576 7581 -1.58796974729020e-01
+18576 7605 -9.55746831137985e-02
+18576 7629 -1.90576692073224e-03
+18576 8133 -2.38851479682785e-03
+18576 8157 -6.56082329760212e-01
+18576 8181 -3.42870701505584e+00
+18576 8205 -2.40623175819990e+00
+18576 8229 -1.82793376238335e-01
+18576 8253 -4.19575438955593e-04
+18576 8733 -2.14258727932300e-02
+18576 8757 -1.40261292381429e+00
+18576 8781 -8.66875421797874e+00
+18576 8805 -5.86868412923072e+00
+18576 8829 -4.68654027442270e-01
+18576 8853 -3.99843198830987e-04
+18576 9333 -6.01949539313832e-03
+18576 9357 -4.30138184579653e-01
+18576 9381 -2.39601445015481e+00
+18576 9405 -1.72986038849152e+00
+18576 9429 -1.31335544505490e-01
+18576 9957 -3.43551708160337e-03
+18576 9981 -6.27299216796516e-02
+18576 10005 -5.38648376009527e-02
+18576 10029 -6.79448506998601e-04
+18576 18576 7.99757378523735e+00
+18576 17712 1.93628155736285e-02
+18576 17736 1.62345483560857e-01
+18576 17760 3.83034098986018e-01
+18576 17784 1.81271814654417e-01
+18576 17808 2.40943983470185e-02
+18576 18120 1.56202510115665e-01
+18576 18144 1.30841906282308e+00
+18576 18168 3.09174182969898e+00
+18576 18192 1.48802194292692e+00
+18576 18216 2.01103230141624e-01
+18576 18528 3.53947585031560e-01
+18576 18552 2.95969446118357e+00
+18576 18600 3.41594298496313e+00
+18576 18624 4.68009715976447e-01
+18576 18936 1.57070360514463e-01
+18576 18960 1.30383898179606e+00
+18576 18984 3.06407723868178e+00
+18576 19008 1.49466441659608e+00
+18576 19032 2.04776719214466e-01
+18576 19344 1.95797781733280e-02
+18576 19368 1.61200463304102e-01
+18576 19392 3.76117951231718e-01
+18576 19416 1.82932433071707e-01
+18576 19440 2.50127706152292e-02
+18577 18577 1.00000000000000e+00
+18578 18578 1.00000000000000e+00
+18579 18579 1.00000000000000e+00
+18580 18580 1.00000000000000e+00
+18581 18581 1.00000000000000e+00
+18582 18582 1.00000000000000e+00
+18583 18583 1.00000000000000e+00
+18584 18584 1.00000000000000e+00
+18585 18585 1.00000000000000e+00
+18586 18586 1.00000000000000e+00
+18587 18587 1.00000000000000e+00
+18588 18588 1.00000000000000e+00
+18589 18589 1.00000000000000e+00
+18590 18590 1.00000000000000e+00
+18591 18591 1.00000000000000e+00
+18592 18592 1.00000000000000e+00
+18593 18593 1.00000000000000e+00
+18594 18594 1.00000000000000e+00
+18595 18595 1.00000000000000e+00
+18596 18596 1.00000000000000e+00
+18597 18597 1.00000000000000e+00
+18598 18598 1.00000000000000e+00
+18599 18599 1.00000000000000e+00
+18600 7557 -5.74695123481400e-08
+18600 7581 -1.06321116976905e-02
+18600 7605 -2.33917155530069e-02
+18600 7629 -1.64331298995032e-03
+18600 8157 -1.37345708174825e-02
+18600 8181 -6.46169679302478e-01
+18600 8205 -1.72365237570309e+00
+18600 8229 -5.76961529729772e-01
+18600 8253 -9.12151484469968e-03
+18600 8277 -4.94664904690000e-10
+18600 8733 -6.50044912846620e-07
+18600 8757 -1.28155566331304e-01
+18600 8781 -3.59514649502362e+00
+18600 8805 -1.02624281112438e+01
+18600 8829 -2.61950144724901e+00
+18600 8853 -6.49202412504758e-02
+18600 8877 -1.38577897776000e-09
+18600 9333 -2.45216359375916e-06
+18600 9357 -8.64757018219526e-02
+18600 9381 -2.35758391105408e+00
+18600 9405 -6.10453891104466e+00
+18600 9429 -1.62177710123623e+00
+18600 9453 -3.13274163014302e-02
+18600 9957 -1.78015374464241e-03
+18600 9981 -1.67675406492190e-01
+18600 10005 -3.92717788799691e-01
+18600 10029 -1.03095708974913e-01
+18600 10053 -2.27316425110596e-04
+18600 10581 -3.67222075893600e-08
+18600 10605 -3.54822158744668e-04
+18600 10629 -2.09120147080730e-04
+18600 18600 9.19275053062602e+00
+18600 17736 2.12235553165857e-02
+18600 17760 1.81271814654417e-01
+18600 17784 4.21236485964572e-01
+18600 17808 1.54387821770831e-01
+18600 17832 1.45025570956891e-02
+18600 18144 1.70902255590102e-01
+18600 18168 1.48802194292692e+00
+18600 18192 3.51772392353507e+00
+18600 18216 1.32109286328215e+00
+18600 18240 1.29169985678909e-01
+18600 18552 3.85976030264319e-01
+18600 18576 3.41594298496313e+00
+18600 18624 3.14651504285888e+00
+18600 18648 3.18619044738257e-01
+18600 18960 1.68889384934549e-01
+18600 18984 1.49466441659608e+00
+18600 19008 3.59438648349407e+00
+18600 19032 1.41538524136981e+00
+18600 19056 1.49069591127982e-01
+18600 19368 2.07203376526976e-02
+18600 19392 1.82932433071707e-01
+18600 19416 4.40402125954322e-01
+18600 19440 1.77960916292746e-01
+18600 19464 1.94774584579572e-02
+18601 18601 1.00000000000000e+00
+18602 18602 1.00000000000000e+00
+18603 18603 1.00000000000000e+00
+18604 18604 1.00000000000000e+00
+18605 18605 1.00000000000000e+00
+18606 18606 1.00000000000000e+00
+18607 18607 1.00000000000000e+00
+18608 18608 1.00000000000000e+00
+18609 18609 1.00000000000000e+00
+18610 18610 1.00000000000000e+00
+18611 18611 1.00000000000000e+00
+18612 18612 1.00000000000000e+00
+18613 18613 1.00000000000000e+00
+18614 18614 1.00000000000000e+00
+18615 18615 1.00000000000000e+00
+18616 18616 1.00000000000000e+00
+18617 18617 1.00000000000000e+00
+18618 18618 1.00000000000000e+00
+18619 18619 1.00000000000000e+00
+18620 18620 1.00000000000000e+00
+18621 18621 1.00000000000000e+00
+18622 18622 1.00000000000000e+00
+18623 18623 1.00000000000000e+00
+18624 7581 -4.02905087151109e-06
+18624 7605 -1.11687003265816e-03
+18624 7629 -3.11177468058393e-04
+18624 8181 -2.34736856990423e-02
+18624 8205 -3.40415392059891e-01
+18624 8229 -3.74380593890018e-01
+18624 8253 -8.86963956974827e-02
+18624 8277 -7.01874925208520e-07
+18624 8757 -1.43395025777828e-04
+18624 8781 -4.56776305238476e-01
+18624 8805 -3.99618407387615e+00
+18624 8829 -5.95229647679309e+00
+18624 8853 -1.58757384800461e+00
+18624 8877 -2.02792477156881e-06
+18624 9357 -2.26300359808559e-03
+18624 9381 -5.57018387595869e-01
+18624 9405 -5.81223872309208e+00
+18624 9429 -1.05430018435053e+01
+18624 9453 -1.08493774795171e+00
+18624 9957 -2.47411633771683e-04
+18624 9981 -7.89606507668578e-02
+18624 10005 -1.55811480797781e+00
+18624 10029 -2.02506210321664e+00
+18624 10053 -1.89372668443837e-02
+18624 10581 -2.10202261173670e-07
+18624 10605 -1.30329133732077e-02
+18624 10629 -1.20141728929724e-02
+18624 18624 8.49983496383107e+00
+18624 17760 2.40943983470185e-02
+18624 17784 1.54387821770831e-01
+18624 17808 4.53459503715149e-01
+18624 17832 4.52658612056966e-01
+18624 18168 2.01103230141624e-01
+18624 18192 1.32109286328215e+00
+18624 18216 3.44529520645662e+00
+18624 18240 2.87162435362045e+00
+18624 18576 4.68009715976447e-01
+18624 18600 3.14651504285888e+00
+18624 18648 5.14231724303766e+00
+18624 18984 2.04776719214466e-01
+18624 19008 1.41538524136981e+00
+18624 19032 3.71364396652325e+00
+18624 19056 2.84378594303397e+00
+18624 19392 2.50127706152292e-02
+18624 19416 1.77960916292746e-01
+18624 19440 5.20546693731804e-01
+18624 19464 4.45699009410347e-01
+18625 18625 1.00000000000000e+00
+18626 18626 1.00000000000000e+00
+18627 18627 1.00000000000000e+00
+18628 18628 1.00000000000000e+00
+18629 18629 1.00000000000000e+00
+18630 18630 1.00000000000000e+00
+18631 18631 1.00000000000000e+00
+18632 18632 1.00000000000000e+00
+18633 18633 1.00000000000000e+00
+18634 18634 1.00000000000000e+00
+18635 18635 1.00000000000000e+00
+18636 18636 1.00000000000000e+00
+18637 18637 1.00000000000000e+00
+18638 18638 1.00000000000000e+00
+18639 18639 1.00000000000000e+00
+18640 18640 1.00000000000000e+00
+18641 18641 1.00000000000000e+00
+18642 18642 1.00000000000000e+00
+18643 18643 1.00000000000000e+00
+18644 18644 1.00000000000000e+00
+18645 18645 1.00000000000000e+00
+18646 18646 1.00000000000000e+00
+18647 18647 1.00000000000000e+00
+18648 7605 -1.07073187650000e-09
+18648 7629 -2.84904636177000e-09
+18648 8205 -9.34229118965563e-03
+18648 8229 -1.37927352900207e-01
+18648 8253 -1.24451148894913e-01
+18648 8277 -1.40028719608418e-06
+18648 8781 -1.52847645058491e-03
+18648 8805 -5.13545222136786e-01
+18648 8829 -5.21913909453383e+00
+18648 8853 -2.73110193042549e+00
+18648 8877 -4.04614909029327e-06
+18648 9381 -2.24860482368027e-02
+18648 9405 -2.47152522189264e+00
+18648 9429 -1.31480554177427e+01
+18648 9453 -1.95058358179340e+00
+18648 9981 -1.03974540170889e-02
+18648 10005 -1.71458500707119e+00
+18648 10029 -3.34611990479085e+00
+18648 10053 -3.62833187129931e-02
+18648 10581 -1.63349069221820e-07
+18648 10605 -2.35820716352027e-02
+18648 10629 -2.25645047563796e-02
+18648 18648 9.05430117290746e+00
+18648 17784 1.45025570956891e-02
+18648 17808 4.52658612056966e-01
+18648 17832 8.03799324444108e-01
+18648 18192 1.29169985678909e-01
+18648 18216 2.87162435362045e+00
+18648 18240 4.83905880748852e+00
+18648 18600 3.18619044738257e-01
+18648 18624 5.14231724303766e+00
+18648 19008 1.49069591127982e-01
+18648 19032 2.84378594303397e+00
+18648 19056 4.64408474817206e+00
+18648 19416 1.94774584579572e-02
+18648 19440 4.45699009410347e-01
+18648 19464 7.55055809614993e-01
+18649 18649 1.00000000000000e+00
+18650 18650 1.00000000000000e+00
+18651 18651 1.00000000000000e+00
+18652 18652 1.00000000000000e+00
+18653 18653 1.00000000000000e+00
+18654 18654 1.00000000000000e+00
+18655 18655 1.00000000000000e+00
+18656 18656 1.00000000000000e+00
+18657 18657 1.00000000000000e+00
+18658 18658 1.00000000000000e+00
+18659 18659 1.00000000000000e+00
+18660 18660 1.00000000000000e+00
+18661 18661 1.00000000000000e+00
+18662 18662 1.00000000000000e+00
+18663 18663 1.00000000000000e+00
+18664 18664 1.00000000000000e+00
+18665 18665 1.00000000000000e+00
+18666 18666 1.00000000000000e+00
+18667 18667 1.00000000000000e+00
+18668 18668 1.00000000000000e+00
+18669 18669 1.00000000000000e+00
+18670 18670 1.00000000000000e+00
+18671 18671 1.00000000000000e+00
+18672 4965 -7.64040556608097e-03
+18672 4989 -2.41641731088428e-01
+18672 5013 -3.72128208243898e-02
+18672 5037 -3.26042166295232e-06
+18672 5565 -3.21770864406448e+00
+18672 5589 -7.85719513899019e+00
+18672 5613 -4.08749207963302e-01
+18672 5637 -9.39185922044165e-04
+18672 6141 -3.37372744046831e-02
+18672 6165 -1.14939187741037e+01
+18672 6189 -1.30472690748127e+01
+18672 6213 -3.54401329386655e-01
+18672 6237 -2.76167595293286e-04
+18672 6741 -7.35208925300149e-02
+18672 6765 -2.26850405724510e+00
+18672 6789 -1.14051294456303e+00
+18672 6813 -4.00258339285648e-02
+18672 7341 -4.16008843137160e-05
+18672 7365 -8.66206699074853e-03
+18672 7389 -1.05376172650656e-02
+18672 7413 -7.22152185415616e-05
+18672 18672 1.48273894024811e+01
+18672 17856 4.05965377428013e-01
+18672 17880 2.65247476348139e-01
+18672 17904 1.77899393240378e-02
+18672 18264 4.83905880748844e+00
+18672 18288 2.87162435362040e+00
+18672 18312 1.29169985678906e-01
+18672 18696 7.86066781462631e+00
+18672 18720 2.70563746681642e-01
+18672 19080 5.45773663356651e+00
+18672 19104 3.22216462969512e+00
+18672 19128 1.40941803689102e-01
+18672 19488 5.60634833947531e-01
+18672 19512 3.52882545366819e-01
+18672 19536 2.07328938265868e-02
+18673 18673 1.00000000000000e+00
+18674 18674 1.00000000000000e+00
+18675 18675 1.00000000000000e+00
+18676 18676 1.00000000000000e+00
+18677 18677 1.00000000000000e+00
+18678 18678 1.00000000000000e+00
+18679 18679 1.00000000000000e+00
+18680 18680 1.00000000000000e+00
+18681 18681 1.00000000000000e+00
+18682 18682 1.00000000000000e+00
+18683 18683 1.00000000000000e+00
+18684 18684 1.00000000000000e+00
+18685 18685 1.00000000000000e+00
+18686 18686 1.00000000000000e+00
+18687 18687 1.00000000000000e+00
+18688 18688 1.00000000000000e+00
+18689 18689 1.00000000000000e+00
+18690 18690 1.00000000000000e+00
+18691 18691 1.00000000000000e+00
+18692 18692 1.00000000000000e+00
+18693 18693 1.00000000000000e+00
+18694 18694 1.00000000000000e+00
+18695 18695 1.00000000000000e+00
+18696 4965 -4.00184406382038e-03
+18696 4989 -1.51606456257912e-01
+18696 5013 -3.65312941816119e-02
+18696 5037 -1.90559154330356e-05
+18696 5565 -1.73811843761454e+00
+18696 5589 -5.50103384768722e+00
+18696 5613 -1.13270057768639e+00
+18696 5637 -4.82939482475489e-02
+18696 5661 -3.20764573755020e-07
+18696 6141 -1.77902210357914e-02
+18696 6165 -6.80856023493010e+00
+18696 6189 -1.24786044584955e+01
+18696 6213 -3.00685097530552e+00
+18696 6237 -1.45112262225358e-01
+18696 6261 -2.87805904174350e-07
+18696 6741 -3.98978040899679e-02
+18696 6765 -1.88437508933345e+00
+18696 6789 -3.15244129814919e+00
+18696 6813 -1.25135147236014e+00
+18696 6837 -3.18464976229811e-02
+18696 7341 -2.89818847393736e-05
+18696 7365 -2.67141945964826e-02
+18696 7389 -1.30571047099532e-01
+18696 7413 -4.73116659948555e-02
+18696 7437 -2.19376034812508e-05
+18696 7989 -1.33252547496470e-07
+18696 8013 -1.54264278491790e-07
+18696 18696 9.15595174166991e+00
+18696 17856 2.65247476348139e-01
+18696 17880 4.07864297898985e-01
+18696 17904 1.75885394049698e-01
+18696 17928 2.61814091883867e-02
+18696 18264 2.87162435362039e+00
+18696 18288 3.44529520645654e+00
+18696 18312 1.32109286328212e+00
+18696 18336 2.01103230141620e-01
+18696 18672 7.86066781462631e+00
+18696 18720 2.83315650998106e+00
+18696 18744 4.37725380813608e-01
+18696 19080 3.22216462969512e+00
+18696 19104 3.78477955217482e+00
+18696 19128 1.36581515747559e+00
+18696 19152 2.00511985679792e-01
+18696 19488 3.52882545366819e-01
+18696 19512 4.92735384328554e-01
+18696 19536 1.87065967598066e-01
+18696 19560 2.60335980729298e-02
+18697 18697 1.00000000000000e+00
+18698 18698 1.00000000000000e+00
+18699 18699 1.00000000000000e+00
+18700 18700 1.00000000000000e+00
+18701 18701 1.00000000000000e+00
+18702 18702 1.00000000000000e+00
+18703 18703 1.00000000000000e+00
+18704 18704 1.00000000000000e+00
+18705 18705 1.00000000000000e+00
+18706 18706 1.00000000000000e+00
+18707 18707 1.00000000000000e+00
+18708 18708 1.00000000000000e+00
+18709 18709 1.00000000000000e+00
+18710 18710 1.00000000000000e+00
+18711 18711 1.00000000000000e+00
+18712 18712 1.00000000000000e+00
+18713 18713 1.00000000000000e+00
+18714 18714 1.00000000000000e+00
+18715 18715 1.00000000000000e+00
+18716 18716 1.00000000000000e+00
+18717 18717 1.00000000000000e+00
+18718 18718 1.00000000000000e+00
+18719 18719 1.00000000000000e+00
+18720 4965 -5.18975087942547e-05
+18720 4989 -8.98842633280525e-03
+18720 5013 -6.49201867337113e-03
+18720 5037 -2.73173367878575e-05
+18720 5565 -3.69326044520842e-02
+18720 5589 -6.38758052884531e-01
+18720 5613 -1.23592080630087e+00
+18720 5637 -2.21176604075135e-01
+18720 5661 -1.50947173666035e-03
+18720 6141 -2.63309666699975e-04
+18720 6165 -3.17500633505509e-01
+18720 6189 -4.91357092063526e+00
+18720 6213 -8.10899043378002e+00
+18720 6237 -1.24236010428429e+00
+18720 6261 -1.85885487822356e-02
+18720 6741 -8.96387949988702e-04
+18720 6765 -3.02877918445016e-01
+18720 6789 -4.32881999660597e+00
+18720 6813 -6.06421539807080e+00
+18720 6837 -9.86091564195365e-01
+18720 6861 -4.83582745070658e-03
+18720 7341 -2.33755502357590e-06
+18720 7365 -2.05626619650524e-02
+18720 7389 -4.22827509282699e-01
+18720 7413 -5.02981888970391e-01
+18720 7437 -7.41832630423711e-02
+18720 7461 -1.44862846263390e-07
+18720 7989 -9.54730890178402e-05
+18720 8013 -1.67656038496173e-03
+18720 8037 -1.91124497901616e-04
+18720 18720 8.65632096176558e+00
+18720 17856 1.77899393240378e-02
+18720 17880 1.75885394049698e-01
+18720 17904 4.58194494919164e-01
+18720 17928 1.90733671077306e-01
+18720 17952 2.15020085809398e-02
+18720 18264 1.29169985678906e-01
+18720 18288 1.32109286328212e+00
+18720 18312 3.51772392353499e+00
+18720 18336 1.48802194292691e+00
+18720 18360 1.70902255590104e-01
+18720 18672 2.70563746681642e-01
+18720 18696 2.83315650998106e+00
+18720 18744 3.27950601151824e+00
+18720 18768 3.82151122065936e-01
+18720 19080 1.40941803689102e-01
+18720 19104 1.36581515747559e+00
+18720 19128 3.51831670951067e+00
+18720 19152 1.47878048249846e+00
+18720 19176 1.69183134944820e-01
+18720 19488 2.07328938265868e-02
+18720 19512 1.87065967598066e-01
+18720 19536 4.58342691413082e-01
+18720 19560 1.88423305970195e-01
+18720 19584 2.10722284196189e-02
+18721 18721 1.00000000000000e+00
+18722 18722 1.00000000000000e+00
+18723 18723 1.00000000000000e+00
+18724 18724 1.00000000000000e+00
+18725 18725 1.00000000000000e+00
+18726 18726 1.00000000000000e+00
+18727 18727 1.00000000000000e+00
+18728 18728 1.00000000000000e+00
+18729 18729 1.00000000000000e+00
+18730 18730 1.00000000000000e+00
+18731 18731 1.00000000000000e+00
+18732 18732 1.00000000000000e+00
+18733 18733 1.00000000000000e+00
+18734 18734 1.00000000000000e+00
+18735 18735 1.00000000000000e+00
+18736 18736 1.00000000000000e+00
+18737 18737 1.00000000000000e+00
+18738 18738 1.00000000000000e+00
+18739 18739 1.00000000000000e+00
+18740 18740 1.00000000000000e+00
+18741 18741 1.00000000000000e+00
+18742 18742 1.00000000000000e+00
+18743 18743 1.00000000000000e+00
+18744 4989 -5.18385731630731e-05
+18744 5013 -3.69013968260151e-04
+18744 5037 -6.01422878122630e-06
+18744 5589 -5.10221569510300e-02
+18744 5613 -3.40186827062606e-01
+18744 5637 -2.16482774683166e-01
+18744 5661 -7.59144487802216e-03
+18744 5685 -7.91806544230000e-10
+18744 6165 -3.81933610700287e-03
+18744 6189 -9.34677063180274e-01
+18744 6213 -4.74306814100725e+00
+18744 6237 -3.17368962354501e+00
+18744 6261 -2.32391335660983e-01
+18744 6285 -6.52984975638917e-04
+18744 6765 -2.38431983512811e-02
+18744 6789 -1.41134525042509e+00
+18744 6813 -8.08169379493093e+00
+18744 6837 -5.27554891058864e+00
+18744 6861 -3.95378165876490e-01
+18744 6885 -3.60635957870881e-04
+18744 7365 -3.81608675529018e-03
+18744 7389 -2.97980555261437e-01
+18744 7413 -1.58350204718119e+00
+18744 7437 -1.01903277723736e+00
+18744 7461 -7.39694930109535e-02
+18744 7989 -4.18824570894568e-04
+18744 8013 -2.01656095848383e-02
+18744 8037 -2.18011093323540e-02
+18744 8061 -2.02821011824119e-04
+18744 18744 7.90139368247117e+00
+18744 17880 2.61814091883867e-02
+18744 17904 1.90733671077306e-01
+18744 17928 3.89901358438711e-01
+18744 17952 1.64759282144910e-01
+18744 17976 1.96878119552877e-02
+18744 18288 2.01103230141620e-01
+18744 18312 1.48802194292691e+00
+18744 18336 3.09174182969900e+00
+18744 18360 1.30841906282309e+00
+18744 18384 1.56202510115664e-01
+18744 18696 4.37725380813608e-01
+18744 18720 3.27950601151824e+00
+18744 18768 2.92560588267314e+00
+18744 18792 3.49250348602333e-01
+18744 19104 2.00511985679792e-01
+18744 19128 1.47878048249847e+00
+18744 19152 3.06392335696745e+00
+18744 19176 1.30265738846122e+00
+18744 19200 1.56481212170482e-01
+18744 19512 2.60335980729298e-02
+18744 19536 1.88423305970195e-01
+18744 19560 3.82946740255824e-01
+18744 19584 1.63318863554444e-01
+18744 19608 1.97574874689921e-02
+18745 18745 1.00000000000000e+00
+18746 18746 1.00000000000000e+00
+18747 18747 1.00000000000000e+00
+18748 18748 1.00000000000000e+00
+18749 18749 1.00000000000000e+00
+18750 18750 1.00000000000000e+00
+18751 18751 1.00000000000000e+00
+18752 18752 1.00000000000000e+00
+18753 18753 1.00000000000000e+00
+18754 18754 1.00000000000000e+00
+18755 18755 1.00000000000000e+00
+18756 18756 1.00000000000000e+00
+18757 18757 1.00000000000000e+00
+18758 18758 1.00000000000000e+00
+18759 18759 1.00000000000000e+00
+18760 18760 1.00000000000000e+00
+18761 18761 1.00000000000000e+00
+18762 18762 1.00000000000000e+00
+18763 18763 1.00000000000000e+00
+18764 18764 1.00000000000000e+00
+18765 18765 1.00000000000000e+00
+18766 18766 1.00000000000000e+00
+18767 18767 1.00000000000000e+00
+18768 5589 -1.46666927100900e-06
+18768 5613 -2.11921539795365e-02
+18768 5637 -5.64564483220393e-02
+18768 5661 -7.75557904544802e-03
+18768 5685 -3.72328364354000e-09
+18768 6189 -1.87272890764828e-02
+18768 6213 -8.56623399539264e-01
+18768 6237 -2.14962332383442e+00
+18768 6261 -7.65783553595152e-01
+18768 6285 -2.17405842911069e-02
+18768 6309 -3.49041330603600e-08
+18768 6765 -2.45870515439580e-07
+18768 6789 -1.19803551127474e-01
+18768 6813 -3.07599406256259e+00
+18768 6837 -8.67746750985503e+00
+18768 6861 -2.69588979393633e+00
+18768 6885 -9.77203966759713e-02
+18768 6909 -5.34096308434300e-08
+18768 7365 -4.73650354579930e-07
+18768 7389 -5.66160552656295e-02
+18768 7413 -1.44359395821836e+00
+18768 7437 -3.82742487958769e+00
+18768 7461 -1.33991019064059e+00
+18768 7485 -3.16680109148213e-02
+18768 7989 -2.50664090970473e-04
+18768 8013 -6.10846835017330e-02
+18768 8037 -1.98152836711839e-01
+18768 8061 -6.23061972031627e-02
+18768 8085 -8.00448419937289e-05
+18768 8637 -2.31930704160447e-05
+18768 8661 -1.96401349981369e-05
+18768 18768 7.31846347239754e+00
+18768 17904 2.15020085809398e-02
+18768 17928 1.64759282144910e-01
+18768 17952 3.55382750414309e-01
+18768 17976 1.54254250016213e-01
+18768 18000 1.88757505487655e-02
+18768 18312 1.70902255590104e-01
+18768 18336 1.30841906282309e+00
+18768 18360 2.82319266893077e+00
+18768 18384 1.23701104642260e+00
+18768 18408 1.53050251489982e-01
+18768 18720 3.82151122065936e-01
+18768 18744 2.92560588267314e+00
+18768 18792 2.79022848518564e+00
+18768 18816 3.48306772694064e-01
+18768 19128 1.69183134944820e-01
+18768 19152 1.30265738846122e+00
+18768 19176 2.82739787882997e+00
+18768 19200 1.24398624531148e+00
+18768 19224 1.54515349157384e-01
+18768 19536 2.10722284196189e-02
+18768 19560 1.63318863554444e-01
+18768 19584 3.56434052889109e-01
+18768 19608 1.55998049738432e-01
+18768 19632 1.92420249656160e-02
+18769 18769 1.00000000000000e+00
+18770 18770 1.00000000000000e+00
+18771 18771 1.00000000000000e+00
+18772 18772 1.00000000000000e+00
+18773 18773 1.00000000000000e+00
+18774 18774 1.00000000000000e+00
+18775 18775 1.00000000000000e+00
+18776 18776 1.00000000000000e+00
+18777 18777 1.00000000000000e+00
+18778 18778 1.00000000000000e+00
+18779 18779 1.00000000000000e+00
+18780 18780 1.00000000000000e+00
+18781 18781 1.00000000000000e+00
+18782 18782 1.00000000000000e+00
+18783 18783 1.00000000000000e+00
+18784 18784 1.00000000000000e+00
+18785 18785 1.00000000000000e+00
+18786 18786 1.00000000000000e+00
+18787 18787 1.00000000000000e+00
+18788 18788 1.00000000000000e+00
+18789 18789 1.00000000000000e+00
+18790 18790 1.00000000000000e+00
+18791 18791 1.00000000000000e+00
+18792 5613 -1.54009090715200e-05
+18792 5637 -3.60383670497819e-03
+18792 5661 -1.61402046852438e-03
+18792 5685 -3.01603641067000e-09
+18792 6213 -3.00451118904866e-02
+18792 6237 -4.52262731923135e-01
+18792 6261 -6.27511702787331e-01
+18792 6285 -9.43825694898244e-02
+18792 6309 -3.88327097074184e-04
+18792 6789 -1.74967604472405e-04
+18792 6813 -3.62324339704618e-01
+18792 6837 -4.15319957528700e+00
+18792 6861 -5.60361692656959e+00
+18792 6885 -8.34174209426216e-01
+18792 6909 -1.27531411453204e-02
+18792 7389 -1.25262710500993e-03
+18792 7413 -3.57021004769816e-01
+18792 7437 -4.28272850225013e+00
+18792 7461 -5.80227885164784e+00
+18792 7485 -9.24693753917562e-01
+18792 7509 -5.17490449004990e-03
+18792 7989 -3.89310030356546e-05
+18792 8013 -3.57113108533596e-02
+18792 8037 -5.44017519973793e-01
+18792 8061 -6.59599075902192e-01
+18792 8085 -1.05165732007159e-01
+18792 8109 -2.75579249208747e-06
+18792 8637 -7.57131174518678e-04
+18792 8661 -5.60266975200149e-03
+18792 8685 -5.12372734049650e-04
+18792 18792 7.25784715332229e+00
+18792 17928 1.96878119552877e-02
+18792 17952 1.54254250016213e-01
+18792 17976 3.40416528216015e-01
+18792 18000 1.50369832116982e-01
+18792 18024 1.87167074804801e-02
+18792 18336 1.56202510115664e-01
+18792 18360 1.23701104642260e+00
+18792 18384 2.75439373133245e+00
+18792 18408 1.20974979546800e+00
+18792 18432 1.49387197377013e-01
+18792 18744 3.49250348602333e-01
+18792 18768 2.79022848518564e+00
+18792 18816 2.73598085723518e+00
+18792 18840 3.35688441614716e-01
+18792 19152 1.56481212170482e-01
+18792 19176 1.24398624531148e+00
+18792 19200 2.77880822339924e+00
+18792 19224 1.21838709547176e+00
+18792 19248 1.50081424710553e-01
+18792 19560 1.97574874689921e-02
+18792 19584 1.55998049738432e-01
+18792 19608 3.46520151232713e-01
+18792 19632 1.52529157117924e-01
+18792 19656 1.88902643138649e-02
+18793 18793 1.00000000000000e+00
+18794 18794 1.00000000000000e+00
+18795 18795 1.00000000000000e+00
+18796 18796 1.00000000000000e+00
+18797 18797 1.00000000000000e+00
+18798 18798 1.00000000000000e+00
+18799 18799 1.00000000000000e+00
+18800 18800 1.00000000000000e+00
+18801 18801 1.00000000000000e+00
+18802 18802 1.00000000000000e+00
+18803 18803 1.00000000000000e+00
+18804 18804 1.00000000000000e+00
+18805 18805 1.00000000000000e+00
+18806 18806 1.00000000000000e+00
+18807 18807 1.00000000000000e+00
+18808 18808 1.00000000000000e+00
+18809 18809 1.00000000000000e+00
+18810 18810 1.00000000000000e+00
+18811 18811 1.00000000000000e+00
+18812 18812 1.00000000000000e+00
+18813 18813 1.00000000000000e+00
+18814 18814 1.00000000000000e+00
+18815 18815 1.00000000000000e+00
+18816 5637 -3.16656089837683e-06
+18816 5661 -1.39127671343209e-05
+18816 5685 -5.56057466610000e-10
+18816 6237 -2.16988591599805e-02
+18816 6261 -1.52428787925998e-01
+18816 6285 -8.88788763992183e-02
+18816 6309 -1.81437017932960e-03
+18816 6813 -2.16668756254664e-03
+18816 6837 -6.28655875378812e-01
+18816 6861 -3.12316738344963e+00
+18816 6885 -2.12020356069701e+00
+18816 6909 -1.52427932049991e-01
+18816 6933 -3.62720964486749e-04
+18816 7413 -1.99554679510907e-02
+18816 7437 -1.29828131778270e+00
+18816 7461 -7.56571605479376e+00
+18816 7485 -4.82545053729419e+00
+18816 7509 -3.57157477180800e-01
+18816 7533 -3.45218003082488e-04
+18816 8013 -5.56833331860731e-03
+18816 8037 -3.86242857738427e-01
+18816 8061 -2.04795403555765e+00
+18816 8085 -1.32125388491843e+00
+18816 8109 -9.59262161090063e-02
+18816 8637 -2.84679740778401e-03
+18816 8661 -4.94199897693987e-02
+18816 8685 -4.04287971817125e-02
+18816 8709 -5.27208835272879e-04
+18816 18816 7.05170990002146e+00
+18816 17952 1.88757505487655e-02
+18816 17976 1.50369832116982e-01
+18816 18000 3.36956874240736e-01
+18816 18024 1.49322045939075e-01
+18816 18048 1.86138040042886e-02
+18816 18360 1.53050251489982e-01
+18816 18384 1.20974979546800e+00
+18816 18408 2.69147239990296e+00
+18816 18432 1.19045675103089e+00
+18816 18456 1.48226990380706e-01
+18816 18768 3.48306772694064e-01
+18816 18792 2.73598085723518e+00
+18816 18840 2.67230601242579e+00
+18816 18864 3.32388061491718e-01
+18816 19176 1.54515349157384e-01
+18816 19200 1.21838709547176e+00
+18816 19224 2.70433855902271e+00
+18816 19248 1.19440735682797e+00
+18816 19272 1.48520414496436e-01
+18816 19584 1.92420249656160e-02
+18816 19608 1.52529157117924e-01
+18816 19632 3.40173414020676e-01
+18816 19656 1.50309697388344e-01
+18816 19680 1.86871600332210e-02
+18817 18817 1.00000000000000e+00
+18818 18818 1.00000000000000e+00
+18819 18819 1.00000000000000e+00
+18820 18820 1.00000000000000e+00
+18821 18821 1.00000000000000e+00
+18822 18822 1.00000000000000e+00
+18823 18823 1.00000000000000e+00
+18824 18824 1.00000000000000e+00
+18825 18825 1.00000000000000e+00
+18826 18826 1.00000000000000e+00
+18827 18827 1.00000000000000e+00
+18828 18828 1.00000000000000e+00
+18829 18829 1.00000000000000e+00
+18830 18830 1.00000000000000e+00
+18831 18831 1.00000000000000e+00
+18832 18832 1.00000000000000e+00
+18833 18833 1.00000000000000e+00
+18834 18834 1.00000000000000e+00
+18835 18835 1.00000000000000e+00
+18836 18836 1.00000000000000e+00
+18837 18837 1.00000000000000e+00
+18838 18838 1.00000000000000e+00
+18839 18839 1.00000000000000e+00
+18840 6237 -3.06112379000400e-08
+18840 6261 -9.35970523369881e-03
+18840 6285 -2.07758257319012e-02
+18840 6309 -1.43453473503937e-03
+18840 6837 -1.13536029586752e-02
+18840 6861 -5.46152839053614e-01
+18840 6885 -1.37644441535068e+00
+18840 6909 -4.82708299194572e-01
+18840 6933 -1.12740152964935e-02
+18840 6957 -2.08894349837000e-09
+18840 7413 -4.19734577819630e-07
+18840 7437 -1.09225360996490e-01
+18840 7461 -2.80557560879685e+00
+18840 7485 -7.65930322967344e+00
+18840 7509 -2.28807743415279e+00
+18840 7533 -8.08640652260136e-02
+18840 7557 -5.84238235270000e-09
+18840 8013 -1.58029534922601e-06
+18840 8037 -7.39127451110992e-02
+18840 8061 -1.76536172072492e+00
+18840 8085 -4.66386840320000e+00
+18840 8109 -1.53990166618202e+00
+18840 8133 -3.60917035854080e-02
+18840 8637 -1.32903395665439e-03
+18840 8661 -1.24081197234278e-01
+18840 8685 -3.30604382240390e-01
+18840 8709 -1.02094554323801e-01
+18840 8733 -2.59752650159821e-04
+18840 9261 -1.79287271112400e-08
+18840 9285 -3.19429685077522e-04
+18840 9309 -1.96245122556971e-04
+18840 18840 6.98863844253901e+00
+18840 17976 1.87167074804801e-02
+18840 18000 1.49322045939075e-01
+18840 18024 3.34741017056581e-01
+18840 18048 1.47268998047091e-01
+18840 18072 1.82034455074842e-02
+18840 18384 1.49387197377013e-01
+18840 18408 1.19045675103089e+00
+18840 18432 2.66828804151546e+00
+18840 18456 1.18198395371122e+00
+18840 18480 1.47268998047095e-01
+18840 18792 3.35688441614716e-01
+18840 18816 2.67230601242579e+00
+18840 18864 2.66851631419331e+00
+18840 18888 3.34741017056595e-01
+18840 19200 1.50081424710553e-01
+18840 19224 1.19440735682797e+00
+18840 19248 2.67573010259266e+00
+18840 19272 1.19136984174207e+00
+18840 19296 1.49322045939077e-01
+18840 19608 1.88902643138649e-02
+18840 19632 1.50309697388344e-01
+18840 19656 3.36601532325880e-01
+18840 19680 1.49615470054803e-01
+18840 19704 1.87167074804798e-02
+18841 18841 1.00000000000000e+00
+18842 18842 1.00000000000000e+00
+18843 18843 1.00000000000000e+00
+18844 18844 1.00000000000000e+00
+18845 18845 1.00000000000000e+00
+18846 18846 1.00000000000000e+00
+18847 18847 1.00000000000000e+00
+18848 18848 1.00000000000000e+00
+18849 18849 1.00000000000000e+00
+18850 18850 1.00000000000000e+00
+18851 18851 1.00000000000000e+00
+18852 18852 1.00000000000000e+00
+18853 18853 1.00000000000000e+00
+18854 18854 1.00000000000000e+00
+18855 18855 1.00000000000000e+00
+18856 18856 1.00000000000000e+00
+18857 18857 1.00000000000000e+00
+18858 18858 1.00000000000000e+00
+18859 18859 1.00000000000000e+00
+18860 18860 1.00000000000000e+00
+18861 18861 1.00000000000000e+00
+18862 18862 1.00000000000000e+00
+18863 18863 1.00000000000000e+00
+18864 6261 -2.69057086099646e-06
+18864 6285 -8.90212526518233e-04
+18864 6309 -2.61608722558179e-04
+18864 6861 -1.65572343303867e-02
+18864 6885 -2.74213120676921e-01
+18864 6909 -3.62722235630271e-01
+18864 6933 -4.61905750663568e-02
+18864 6957 -5.94104233255159e-05
+18864 7437 -9.56224454740975e-05
+18864 7461 -3.18730314473022e-01
+18864 7485 -3.42674317775816e+00
+18864 7509 -4.42023205069257e+00
+18864 7533 -6.46991543310086e-01
+18864 7557 -9.23046608098409e-03
+18864 8037 -1.54822597046121e-03
+18864 8061 -4.15890163972254e-01
+18864 8085 -4.81535243342520e+00
+18864 8109 -6.27649976772474e+00
+18864 8133 -9.41744134857346e-01
+18864 8157 -5.97874547333361e-03
+18864 8637 -1.66168765949972e-04
+18864 8661 -6.46742273828275e-02
+18864 8685 -8.36607401537227e-01
+18864 8709 -9.74542059803753e-01
+18864 8733 -1.56910533252354e-01
+18864 8757 -1.62498969958988e-05
+18864 9261 -7.48855361421700e-08
+18864 9285 -3.92424215915942e-03
+18864 9309 -1.52511482932409e-02
+18864 9333 -1.21000740674983e-03
+18864 18864 7.02057532771972e+00
+18864 18000 1.86138040042886e-02
+18864 18024 1.47268998047091e-01
+18864 18048 3.28482736128325e-01
+18864 18072 1.47268998047093e-01
+18864 18096 1.86138040042889e-02
+18864 18408 1.48226990380706e-01
+18864 18432 1.18198395371122e+00
+18864 18456 2.65275794951498e+00
+18864 18480 1.18198395371122e+00
+18864 18504 1.48226990380707e-01
+18864 18816 3.32388061491718e-01
+18864 18840 2.66851631419331e+00
+18864 18888 2.66828804151550e+00
+18864 18912 3.32330993322267e-01
+18864 19224 1.48520414496436e-01
+18864 19248 1.19136984174207e+00
+18864 19272 2.68596529134037e+00
+18864 19296 1.19045675103090e+00
+18864 19320 1.48292141818644e-01
+18864 19632 1.86871600332210e-02
+18864 19656 1.49615470054803e-01
+18864 19680 3.36784571584672e-01
+18864 19704 1.49387197377012e-01
+18864 19728 1.86300918637733e-02
+18865 18865 1.00000000000000e+00
+18866 18866 1.00000000000000e+00
+18867 18867 1.00000000000000e+00
+18868 18868 1.00000000000000e+00
+18869 18869 1.00000000000000e+00
+18870 18870 1.00000000000000e+00
+18871 18871 1.00000000000000e+00
+18872 18872 1.00000000000000e+00
+18873 18873 1.00000000000000e+00
+18874 18874 1.00000000000000e+00
+18875 18875 1.00000000000000e+00
+18876 18876 1.00000000000000e+00
+18877 18877 1.00000000000000e+00
+18878 18878 1.00000000000000e+00
+18879 18879 1.00000000000000e+00
+18880 18880 1.00000000000000e+00
+18881 18881 1.00000000000000e+00
+18882 18882 1.00000000000000e+00
+18883 18883 1.00000000000000e+00
+18884 18884 1.00000000000000e+00
+18885 18885 1.00000000000000e+00
+18886 18886 1.00000000000000e+00
+18887 18887 1.00000000000000e+00
+18888 6285 -2.08894349837000e-09
+18888 6309 -5.84238235270000e-09
+18888 6885 -1.12740152964936e-02
+18888 6909 -8.08640652260132e-02
+18888 6933 -3.60917035854073e-02
+18888 6957 -2.59752650159816e-04
+18888 7461 -1.43453473503941e-03
+18888 7485 -4.82708299194590e-01
+18888 7509 -2.28807743415282e+00
+18888 7533 -1.53990166618200e+00
+18888 7557 -1.02094554323802e-01
+18888 7581 -1.96245122556977e-04
+18888 8061 -2.07758257319011e-02
+18888 8085 -1.37644441535070e+00
+18888 8109 -7.65930322967342e+00
+18888 8133 -4.66386840319999e+00
+18888 8157 -3.30604382240397e-01
+18888 8181 -3.19429685077532e-04
+18888 8661 -9.35970523369866e-03
+18888 8685 -5.46152839053613e-01
+18888 8709 -2.80557560879684e+00
+18888 8733 -1.76536172072493e+00
+18888 8757 -1.24081197234281e-01
+18888 8781 -1.79287271112400e-08
+18888 9261 -3.06112379000400e-08
+18888 9285 -1.13536029586752e-02
+18888 9309 -1.09225360996482e-01
+18888 9333 -7.39127451110974e-02
+18888 9357 -1.32903395665438e-03
+18888 9909 -4.19734577819610e-07
+18888 9933 -1.58029534922596e-06
+18888 18888 6.98863844253897e+00
+18888 18024 1.82034455074842e-02
+18888 18048 1.47268998047093e-01
+18888 18072 3.34741017056588e-01
+18888 18096 1.49322045939077e-01
+18888 18120 1.87167074804804e-02
+18888 18432 1.47268998047095e-01
+18888 18456 1.18198395371122e+00
+18888 18480 2.66851631419327e+00
+18888 18504 1.19136984174207e+00
+18888 18528 1.49615470054807e-01
+18888 18840 3.34741017056595e-01
+18888 18864 2.66828804151550e+00
+18888 18912 2.67573010259267e+00
+18888 18936 3.36601532325887e-01
+18888 19248 1.49322045939077e-01
+18888 19272 1.19045675103090e+00
+18888 19296 2.67230601242578e+00
+18888 19320 1.19440735682796e+00
+18888 19344 1.50309697388343e-01
+18888 19656 1.87167074804798e-02
+18888 19680 1.49387197377012e-01
+18888 19704 3.35688441614716e-01
+18888 19728 1.50081424710550e-01
+18888 19752 1.88902643138643e-02
+18889 18889 1.00000000000000e+00
+18890 18890 1.00000000000000e+00
+18891 18891 1.00000000000000e+00
+18892 18892 1.00000000000000e+00
+18893 18893 1.00000000000000e+00
+18894 18894 1.00000000000000e+00
+18895 18895 1.00000000000000e+00
+18896 18896 1.00000000000000e+00
+18897 18897 1.00000000000000e+00
+18898 18898 1.00000000000000e+00
+18899 18899 1.00000000000000e+00
+18900 18900 1.00000000000000e+00
+18901 18901 1.00000000000000e+00
+18902 18902 1.00000000000000e+00
+18903 18903 1.00000000000000e+00
+18904 18904 1.00000000000000e+00
+18905 18905 1.00000000000000e+00
+18906 18906 1.00000000000000e+00
+18907 18907 1.00000000000000e+00
+18908 18908 1.00000000000000e+00
+18909 18909 1.00000000000000e+00
+18910 18910 1.00000000000000e+00
+18911 18911 1.00000000000000e+00
+18912 6909 -4.14430081245737e-03
+18912 6933 -7.04436337218170e-03
+18912 6957 -1.47971231592433e-04
+18912 7485 -7.05238029109575e-03
+18912 7509 -3.71678060230651e-01
+18912 7533 -9.17064794435841e-01
+18912 7557 -3.05397524757645e-01
+18912 7581 -5.35878571918446e-03
+18912 7605 -1.00590931000000e-11
+18912 8061 -3.90152634118480e-07
+18912 8085 -1.06320221811237e-01
+18912 8109 -2.67868645090644e+00
+18912 8133 -6.90984690437414e+00
+18912 8157 -1.99343558131646e+00
+18912 8181 -6.87655032636456e-02
+18912 8205 -6.64224849700000e-11
+18912 8661 -4.56708922212470e-06
+18912 8685 -9.93778601986993e-02
+18912 8709 -2.23326814143202e+00
+18912 8733 -5.79840393114085e+00
+18912 8757 -1.80327671377137e+00
+18912 8781 -4.21980672869897e-02
+18912 9261 -3.17062769720000e-09
+18912 9285 -4.43884181165060e-03
+18912 9309 -2.34465262564610e-01
+18912 9333 -5.54442084415406e-01
+18912 9357 -1.70937578879024e-01
+18912 9381 -7.15434311001545e-04
+18912 9909 -1.54190474932796e-05
+18912 9933 -1.94985337928628e-03
+18912 9957 -8.71566016129902e-04
+18912 18912 7.06341460812464e+00
+18912 18048 1.86138040042889e-02
+18912 18072 1.49322045939077e-01
+18912 18096 3.36956874240741e-01
+18912 18120 1.50369832116984e-01
+18912 18144 1.88757505487656e-02
+18912 18456 1.48226990380707e-01
+18912 18480 1.19136984174207e+00
+18912 18504 2.69436446902460e+00
+18912 18528 1.20762171128693e+00
+18912 18552 1.52289957766923e-01
+18912 18864 3.32330993322267e-01
+18912 18888 2.67573010259267e+00
+18912 18936 2.72824251965550e+00
+18912 18960 3.45459097587975e-01
+18912 19272 1.48292141818644e-01
+18912 19296 1.19440735682796e+00
+18912 19320 2.70777635461111e+00
+18912 19344 1.21935500786910e+00
+18912 19368 1.54529054578928e-01
+18912 19680 1.86300918637733e-02
+18912 19704 1.50081424710550e-01
+18912 19728 3.40309845637370e-01
+18912 19752 1.53303156262525e-01
+18912 19776 1.94355247517668e-02
+18913 18913 1.00000000000000e+00
+18914 18914 1.00000000000000e+00
+18915 18915 1.00000000000000e+00
+18916 18916 1.00000000000000e+00
+18917 18917 1.00000000000000e+00
+18918 18918 1.00000000000000e+00
+18919 18919 1.00000000000000e+00
+18920 18920 1.00000000000000e+00
+18921 18921 1.00000000000000e+00
+18922 18922 1.00000000000000e+00
+18923 18923 1.00000000000000e+00
+18924 18924 1.00000000000000e+00
+18925 18925 1.00000000000000e+00
+18926 18926 1.00000000000000e+00
+18927 18927 1.00000000000000e+00
+18928 18928 1.00000000000000e+00
+18929 18929 1.00000000000000e+00
+18930 18930 1.00000000000000e+00
+18931 18931 1.00000000000000e+00
+18932 18932 1.00000000000000e+00
+18933 18933 1.00000000000000e+00
+18934 18934 1.00000000000000e+00
+18935 18935 1.00000000000000e+00
+18936 6909 -2.55683926896940e-07
+18936 6933 -1.27258756124398e-04
+18936 6957 -2.21422910102276e-05
+18936 7509 -9.04705997000804e-03
+18936 7533 -1.69941020545763e-01
+18936 7557 -2.08634239809663e-01
+18936 7581 -2.04237157877318e-02
+18936 7605 -2.01560395289946e-06
+18936 8085 -4.61869584146412e-05
+18936 8109 -2.84162572146217e-01
+18936 8133 -2.88002145247032e+00
+18936 8157 -3.58766882084476e+00
+18936 8181 -5.14869724059548e-01
+18936 8205 -6.56477375214336e-03
+18936 8685 -1.86222575103133e-03
+18936 8709 -4.97254905233339e-01
+18936 8733 -5.55216590365657e+00
+18936 8757 -6.94373649909150e+00
+18936 8781 -9.83374149245038e-01
+18936 8805 -6.87824803542512e-03
+18936 9285 -4.48079598200317e-04
+18936 9309 -1.12540250718600e-01
+18936 9333 -1.30220261752323e+00
+18936 9357 -1.47822609499833e+00
+18936 9381 -2.35359211128359e-01
+18936 9405 -5.77838800737363e-05
+18936 9909 -5.60742176785103e-05
+18936 9933 -1.54562329970989e-02
+18936 9957 -3.61825963381648e-02
+18936 9981 -2.68360686543636e-03
+18936 18936 7.21643411078454e+00
+18936 18072 1.87167074804804e-02
+18936 18096 1.50369832116984e-01
+18936 18120 3.40416528216017e-01
+18936 18144 1.54254250016213e-01
+18936 18168 1.96878119552877e-02
+18936 18480 1.49615470054807e-01
+18936 18504 1.20762171128693e+00
+18936 18528 2.74332515484009e+00
+18936 18552 1.23744127312556e+00
+18936 18576 1.57070360514463e-01
+18936 18888 3.36601532325887e-01
+18936 18912 2.72824251965550e+00
+18936 18960 2.79178445855528e+00
+18936 18984 3.52487017050829e-01
+18936 19296 1.50309697388343e-01
+18936 19320 1.21935500786910e+00
+18936 19344 2.77918470063374e+00
+18936 19368 1.24375673824569e+00
+18936 19392 1.56410129982490e-01
+18936 19704 1.88902643138643e-02
+18936 19728 1.53303156262525e-01
+18936 19752 3.49381414664428e-01
+18936 19776 1.55833116296245e-01
+18936 19800 1.95227543222945e-02
+18937 18937 1.00000000000000e+00
+18938 18938 1.00000000000000e+00
+18939 18939 1.00000000000000e+00
+18940 18940 1.00000000000000e+00
+18941 18941 1.00000000000000e+00
+18942 18942 1.00000000000000e+00
+18943 18943 1.00000000000000e+00
+18944 18944 1.00000000000000e+00
+18945 18945 1.00000000000000e+00
+18946 18946 1.00000000000000e+00
+18947 18947 1.00000000000000e+00
+18948 18948 1.00000000000000e+00
+18949 18949 1.00000000000000e+00
+18950 18950 1.00000000000000e+00
+18951 18951 1.00000000000000e+00
+18952 18952 1.00000000000000e+00
+18953 18953 1.00000000000000e+00
+18954 18954 1.00000000000000e+00
+18955 18955 1.00000000000000e+00
+18956 18956 1.00000000000000e+00
+18957 18957 1.00000000000000e+00
+18958 18958 1.00000000000000e+00
+18959 18959 1.00000000000000e+00
+18960 7533 -6.09418934663197e-03
+18960 7557 -4.17062818071609e-02
+18960 7581 -1.23074871066057e-02
+18960 7605 -8.41167939047528e-06
+18960 8109 -9.06390528705483e-04
+18960 8133 -3.76017434900476e-01
+18960 8157 -1.71860913009062e+00
+18960 8181 -1.14612630496388e+00
+18960 8205 -7.08050616192473e-02
+18960 8229 -1.04917510642632e-04
+18960 8709 -2.19885461768137e-02
+18960 8733 -1.50118703445928e+00
+18960 8757 -7.93340222138191e+00
+18960 8781 -4.66363090861404e+00
+18960 8805 -3.28645579300930e-01
+18960 8829 -3.14289429538523e-04
+18960 9309 -1.53834825153159e-02
+18960 9333 -7.80770559015170e-01
+18960 9357 -3.96244886125040e+00
+18960 9381 -2.44933938889464e+00
+18960 9405 -1.66742076918557e-01
+18960 9429 -5.41995950758400e-07
+18960 9909 -1.65162946727463e-05
+18960 9933 -3.37284796292220e-02
+18960 9957 -2.30669445532562e-01
+18960 9981 -1.43978339114226e-01
+18960 10005 -3.33212378989246e-03
+18960 10557 -3.43528606209360e-05
+18960 10581 -8.49783613857471e-05
+18960 18960 7.36002245700809e+00
+18960 18096 1.88757505487656e-02
+18960 18120 1.54254250016213e-01
+18960 18144 3.55382750414309e-01
+18960 18168 1.64759282144910e-01
+18960 18192 2.15020085809397e-02
+18960 18504 1.52289957766923e-01
+18960 18528 1.23744127312556e+00
+18960 18552 2.83430511093293e+00
+18960 18576 1.30383898179606e+00
+18960 18600 1.68889384934549e-01
+18960 18912 3.45459097587975e-01
+18960 18936 2.79178445855528e+00
+18960 18984 2.90903241462986e+00
+18960 19008 3.74771086606620e-01
+18960 19320 1.54529054578928e-01
+18960 19344 1.24375673824569e+00
+18960 19368 2.82694718723969e+00
+18960 19392 1.30506473169344e+00
+18960 19416 1.69856052940867e-01
+18960 19728 1.94355247517668e-02
+18960 19752 1.55833116296245e-01
+18960 19776 3.53543269490997e-01
+18960 19800 1.65065719619254e-01
+18960 19824 2.17436755825191e-02
+18961 18961 1.00000000000000e+00
+18962 18962 1.00000000000000e+00
+18963 18963 1.00000000000000e+00
+18964 18964 1.00000000000000e+00
+18965 18965 1.00000000000000e+00
+18966 18966 1.00000000000000e+00
+18967 18967 1.00000000000000e+00
+18968 18968 1.00000000000000e+00
+18969 18969 1.00000000000000e+00
+18970 18970 1.00000000000000e+00
+18971 18971 1.00000000000000e+00
+18972 18972 1.00000000000000e+00
+18973 18973 1.00000000000000e+00
+18974 18974 1.00000000000000e+00
+18975 18975 1.00000000000000e+00
+18976 18976 1.00000000000000e+00
+18977 18977 1.00000000000000e+00
+18978 18978 1.00000000000000e+00
+18979 18979 1.00000000000000e+00
+18980 18980 1.00000000000000e+00
+18981 18981 1.00000000000000e+00
+18982 18982 1.00000000000000e+00
+18983 18983 1.00000000000000e+00
+18984 7557 -1.55759882964494e-03
+18984 7581 -1.95098127036782e-03
+18984 7605 -3.41322157762282e-06
+18984 8133 -4.15438031221900e-03
+18984 8157 -2.58902342369894e-01
+18984 8181 -6.49732174719316e-01
+18984 8205 -2.07628844917461e-01
+18984 8229 -2.60171715117962e-03
+18984 8709 -8.46091646237500e-08
+18984 8733 -1.06356067585760e-01
+18984 8757 -2.64139157095854e+00
+18984 8781 -6.61043386329543e+00
+18984 8805 -1.98400933919518e+00
+18984 8829 -7.35160147784674e-02
+18984 9309 -1.05416003024269e-05
+18984 9333 -1.34841749520497e-01
+18984 9357 -2.99873944324051e+00
+18984 9381 -7.77456076509343e+00
+18984 9405 -2.45398170369842e+00
+18984 9429 -6.14995665721275e-02
+18984 9909 -6.94046372686310e-07
+18984 9933 -1.19319310724471e-02
+18984 9957 -4.57991835894882e-01
+18984 9981 -1.05198764373597e+00
+18984 10005 -3.41170327114194e-01
+18984 10029 -1.97260203679888e-03
+18984 10557 -3.89332230272227e-04
+18984 10581 -9.38575092160608e-03
+18984 10605 -3.19873872226573e-03
+18984 18984 7.80038152703611e+00
+18984 18120 1.96878119552877e-02
+18984 18144 1.64759282144910e-01
+18984 18168 3.89901358438711e-01
+18984 18192 1.90733671077309e-01
+18984 18216 2.61814091883874e-02
+18984 18528 1.57070360514463e-01
+18984 18552 1.30383898179606e+00
+18984 18576 3.06407723868178e+00
+18984 18600 1.49466441659608e+00
+18984 18624 2.04776719214466e-01
+18984 18936 3.52487017050829e-01
+18984 18960 2.90903241462986e+00
+18984 19008 3.30531284354305e+00
+18984 19032 4.51557124279125e-01
+18984 19344 1.56410129982490e-01
+18984 19368 1.30506473169344e+00
+18984 19392 3.07484360048562e+00
+18984 19416 1.48237070556028e+00
+18984 19440 2.00736623449200e-01
+18984 19752 1.95227543222945e-02
+18984 19776 1.65065719619254e-01
+18984 19800 3.92592948889671e-01
+18984 19824 1.87660243318360e-01
+18984 19848 2.51713852470709e-02
+18985 18985 1.00000000000000e+00
+18986 18986 1.00000000000000e+00
+18987 18987 1.00000000000000e+00
+18988 18988 1.00000000000000e+00
+18989 18989 1.00000000000000e+00
+18990 18990 1.00000000000000e+00
+18991 18991 1.00000000000000e+00
+18992 18992 1.00000000000000e+00
+18993 18993 1.00000000000000e+00
+18994 18994 1.00000000000000e+00
+18995 18995 1.00000000000000e+00
+18996 18996 1.00000000000000e+00
+18997 18997 1.00000000000000e+00
+18998 18998 1.00000000000000e+00
+18999 18999 1.00000000000000e+00
+19000 19000 1.00000000000000e+00
+19001 19001 1.00000000000000e+00
+19002 19002 1.00000000000000e+00
+19003 19003 1.00000000000000e+00
+19004 19004 1.00000000000000e+00
+19005 19005 1.00000000000000e+00
+19006 19006 1.00000000000000e+00
+19007 19007 1.00000000000000e+00
+19008 7557 -5.66768020861000e-09
+19008 7581 -4.68288025480873e-06
+19008 7605 -3.49414465273940e-07
+19008 8157 -5.17996492292182e-03
+19008 8181 -1.16903644012218e-01
+19008 8205 -1.36403831570535e-01
+19008 8229 -9.14157579495108e-03
+19008 8733 -2.04089667481579e-05
+19008 8757 -2.64974126596226e-01
+19008 8781 -2.73881420483968e+00
+19008 8805 -3.53361738223862e+00
+19008 8829 -4.38209835369894e-01
+19008 8853 -3.70637046823073e-03
+19008 9333 -2.36917694260559e-03
+19008 9357 -6.49578675580681e-01
+19008 9381 -7.47852153566624e+00
+19008 9405 -8.73478129569136e+00
+19008 9429 -9.67865603429286e-01
+19008 9453 -6.34375125082223e-03
+19008 9933 -1.06285179056373e-03
+19008 9957 -2.16006340598430e-01
+19008 9981 -2.31875979400018e+00
+19008 10005 -2.24353417678795e+00
+19008 10029 -3.02145747279519e-01
+19008 10053 -1.30941825009838e-04
+19008 10557 -1.04490660266625e-03
+19008 10581 -4.79131606910225e-02
+19008 10605 -5.62077263860385e-02
+19008 10629 -4.02463253813658e-03
+19008 11205 -1.37368931380000e-10
+19008 11229 -1.90423473400000e-11
+19008 19008 8.94270722031861e+00
+19008 18144 2.15020085809397e-02
+19008 18168 1.90733671077309e-01
+19008 18192 4.58194494919177e-01
+19008 18216 1.75885394049702e-01
+19008 18240 1.77899393240382e-02
+19008 18552 1.68889384934549e-01
+19008 18576 1.49466441659608e+00
+19008 18600 3.59438648349407e+00
+19008 18624 1.41538524136981e+00
+19008 18648 1.49069591127982e-01
+19008 18960 3.74771086606620e-01
+19008 18984 3.30531284354305e+00
+19008 19032 3.17831707809935e+00
+19008 19056 3.43022145245697e-01
+19008 19368 1.69856052940867e-01
+19008 19392 1.48237070556028e+00
+19008 19416 3.51392334433734e+00
+19008 19440 1.33207175863362e+00
+19008 19464 1.32281316209201e-01
+19008 19776 2.17436755825191e-02
+19008 19800 1.87660243318360e-01
+19008 19824 4.38078710129996e-01
+19008 19848 1.55057023365656e-01
+19008 19872 1.35928705943431e-02
+19009 19009 1.00000000000000e+00
+19010 19010 1.00000000000000e+00
+19011 19011 1.00000000000000e+00
+19012 19012 1.00000000000000e+00
+19013 19013 1.00000000000000e+00
+19014 19014 1.00000000000000e+00
+19015 19015 1.00000000000000e+00
+19016 19016 1.00000000000000e+00
+19017 19017 1.00000000000000e+00
+19018 19018 1.00000000000000e+00
+19019 19019 1.00000000000000e+00
+19020 19020 1.00000000000000e+00
+19021 19021 1.00000000000000e+00
+19022 19022 1.00000000000000e+00
+19023 19023 1.00000000000000e+00
+19024 19024 1.00000000000000e+00
+19025 19025 1.00000000000000e+00
+19026 19026 1.00000000000000e+00
+19027 19027 1.00000000000000e+00
+19028 19028 1.00000000000000e+00
+19029 19029 1.00000000000000e+00
+19030 19030 1.00000000000000e+00
+19031 19031 1.00000000000000e+00
+19032 8181 -4.16543717404555e-03
+19032 8205 -2.42284408096530e-02
+19032 8229 -3.41592650809741e-03
+19032 8757 -6.29502914319957e-04
+19032 8781 -3.51322853426494e-01
+19032 8805 -1.35404939750064e+00
+19032 8829 -9.00428623635615e-01
+19032 8853 -6.76799247529333e-02
+19032 9357 -2.75991069040432e-02
+19032 9381 -1.82669002690143e+00
+19032 9405 -9.17219547194408e+00
+19032 9429 -8.15239410774458e+00
+19032 9453 -2.18132430886975e-01
+19032 9957 -2.92956316988243e-02
+19032 9981 -1.01464558466502e+00
+19032 10005 -8.15750338257097e+00
+19032 10029 -6.55683928723492e+00
+19032 10053 -1.58080846130475e-02
+19032 10557 -2.63403151354005e-04
+19032 10581 -6.90657784007970e-02
+19032 10605 -7.88820640174533e-01
+19032 10629 -2.25446163389855e-01
+19032 11205 -1.55434573406260e-07
+19032 11229 -2.25852715468000e-08
+19032 19032 1.01339764526106e+01
+19032 18168 2.61814091883874e-02
+19032 18192 1.75885394049702e-01
+19032 18216 4.07864297898995e-01
+19032 18240 2.65247476348145e-01
+19032 18576 2.04776719214466e-01
+19032 18600 1.41538524136981e+00
+19032 18624 3.71364396652325e+00
+19032 18648 2.84378594303397e+00
+19032 18984 4.51557124279125e-01
+19032 19008 3.17831707809935e+00
+19032 19056 7.76021858978294e+00
+19032 19392 2.00736623449200e-01
+19032 19416 1.33207175863362e+00
+19032 19440 3.67164699493719e+00
+19032 19464 3.23794388911826e+00
+19032 19800 2.51713852470709e-02
+19032 19824 1.55057023365656e-01
+19032 19848 3.97365055002482e-01
+19032 19872 3.63786962869216e-01
+19033 19033 1.00000000000000e+00
+19034 19034 1.00000000000000e+00
+19035 19035 1.00000000000000e+00
+19036 19036 1.00000000000000e+00
+19037 19037 1.00000000000000e+00
+19038 19038 1.00000000000000e+00
+19039 19039 1.00000000000000e+00
+19040 19040 1.00000000000000e+00
+19041 19041 1.00000000000000e+00
+19042 19042 1.00000000000000e+00
+19043 19043 1.00000000000000e+00
+19044 19044 1.00000000000000e+00
+19045 19045 1.00000000000000e+00
+19046 19046 1.00000000000000e+00
+19047 19047 1.00000000000000e+00
+19048 19048 1.00000000000000e+00
+19049 19049 1.00000000000000e+00
+19050 19050 1.00000000000000e+00
+19051 19051 1.00000000000000e+00
+19052 19052 1.00000000000000e+00
+19053 19053 1.00000000000000e+00
+19054 19054 1.00000000000000e+00
+19055 19055 1.00000000000000e+00
+19056 8205 -3.37059951672547e-04
+19056 8229 -3.08469849872081e-04
+19056 8781 -1.97210171975278e-03
+19056 8805 -1.68324535039271e-01
+19056 8829 -6.14318709256893e-01
+19056 8853 -1.09415256228251e-01
+19056 9357 -9.93685121070000e-10
+19056 9381 -8.98711480908172e-02
+19056 9405 -4.85138247369461e+00
+19056 9429 -1.11286651487522e+01
+19056 9453 -3.91858603018194e-01
+19056 9957 -1.25824412478920e-05
+19056 9981 -1.55218139672086e-01
+19056 10005 -9.15748002497577e+00
+19056 10029 -1.10499459964699e+01
+19056 10053 -3.06995764510260e-02
+19056 10557 -2.87059089138052e-06
+19056 10581 -3.85260548717767e-02
+19056 10605 -1.26735440242571e+00
+19056 10629 -4.22719899012753e-01
+19056 11205 -3.09907564292870e-07
+19056 11229 -4.50372466621900e-08
+19056 19056 1.41192821628459e+01
+19056 18192 1.77899393240382e-02
+19056 18216 2.65247476348145e-01
+19056 18240 4.05965377428023e-01
+19056 18600 1.49069591127982e-01
+19056 18624 2.84378594303397e+00
+19056 18648 4.64408474817206e+00
+19056 19008 3.43022145245697e-01
+19056 19032 7.76021858978294e+00
+19056 19416 1.32281316209201e-01
+19056 19440 3.23794388911826e+00
+19056 19464 5.54991856477209e+00
+19056 19824 1.35928705943431e-02
+19056 19848 3.63786962869216e-01
+19056 19872 6.32423831578030e-01
+19057 19057 1.00000000000000e+00
+19058 19058 1.00000000000000e+00
+19059 19059 1.00000000000000e+00
+19060 19060 1.00000000000000e+00
+19061 19061 1.00000000000000e+00
+19062 19062 1.00000000000000e+00
+19063 19063 1.00000000000000e+00
+19064 19064 1.00000000000000e+00
+19065 19065 1.00000000000000e+00
+19066 19066 1.00000000000000e+00
+19067 19067 1.00000000000000e+00
+19068 19068 1.00000000000000e+00
+19069 19069 1.00000000000000e+00
+19070 19070 1.00000000000000e+00
+19071 19071 1.00000000000000e+00
+19072 19072 1.00000000000000e+00
+19073 19073 1.00000000000000e+00
+19074 19074 1.00000000000000e+00
+19075 19075 1.00000000000000e+00
+19076 19076 1.00000000000000e+00
+19077 19077 1.00000000000000e+00
+19078 19078 1.00000000000000e+00
+19079 19079 1.00000000000000e+00
+19080 4965 -3.07830518340563e-06
+19080 4989 -8.52313646765136e-06
+19080 5565 -8.31443655203374e-01
+19080 5589 -1.42258422170922e+00
+19080 5613 -1.68082945346771e-02
+19080 5637 -4.41669362790000e-09
+19080 6141 -1.72731756794411e-01
+19080 6165 -1.14588221436150e+01
+19080 6189 -6.32062101669712e+00
+19080 6213 -7.96440172054076e-02
+19080 6237 -1.23322260600600e-08
+19080 6741 -9.91396379203772e-01
+19080 6765 -9.88947253249624e+00
+19080 6789 -2.69515405120270e+00
+19080 6813 -3.89639863280268e-02
+19080 7341 -1.98570423981029e-01
+19080 7365 -5.86323053563021e-01
+19080 7389 -9.96338200064888e-02
+19080 7413 -3.09682943183141e-04
+19080 7941 -6.63024342517000e-09
+19080 7965 -2.42406379375067e-04
+19080 7989 -1.55188264107729e-04
+19080 19080 1.12567841678203e+01
+19080 18264 8.03799324444096e-01
+19080 18288 4.52658612056958e-01
+19080 18312 1.45025570956886e-02
+19080 18672 5.45773663356651e+00
+19080 18696 3.22216462969512e+00
+19080 18720 1.40941803689102e-01
+19080 19104 6.39329861863208e+00
+19080 19128 3.61401867063397e-01
+19080 19488 4.17384933665300e+00
+19080 19512 2.58960730429121e+00
+19080 19536 1.43623610275629e-01
+19080 19896 4.82827500215720e-01
+19080 19920 2.94519280705982e-01
+19080 19944 1.51730087423205e-02
+19081 19081 1.00000000000000e+00
+19082 19082 1.00000000000000e+00
+19083 19083 1.00000000000000e+00
+19084 19084 1.00000000000000e+00
+19085 19085 1.00000000000000e+00
+19086 19086 1.00000000000000e+00
+19087 19087 1.00000000000000e+00
+19088 19088 1.00000000000000e+00
+19089 19089 1.00000000000000e+00
+19090 19090 1.00000000000000e+00
+19091 19091 1.00000000000000e+00
+19092 19092 1.00000000000000e+00
+19093 19093 1.00000000000000e+00
+19094 19094 1.00000000000000e+00
+19095 19095 1.00000000000000e+00
+19096 19096 1.00000000000000e+00
+19097 19097 1.00000000000000e+00
+19098 19098 1.00000000000000e+00
+19099 19099 1.00000000000000e+00
+19100 19100 1.00000000000000e+00
+19101 19101 1.00000000000000e+00
+19102 19102 1.00000000000000e+00
+19103 19103 1.00000000000000e+00
+19104 4965 -1.54782487178358e-06
+19104 4989 -4.28709318978555e-06
+19104 5565 -4.48334279241382e-01
+19104 5589 -9.00313035298752e-01
+19104 5613 -4.59803680636693e-02
+19104 5637 -8.87003356679482e-05
+19104 6141 -9.11000637037529e-02
+19104 6165 -7.40748823356977e+00
+19104 6189 -6.90326339321341e+00
+19104 6213 -7.34540317333673e-01
+19104 6237 -1.27081830126297e-02
+19104 6741 -5.54951980889222e-01
+19104 6765 -8.42168416152380e+00
+19104 6789 -7.85669670876060e+00
+19104 6813 -1.28251347224221e+00
+19104 6837 -8.39152786425444e-03
+19104 7341 -1.24352589445776e-01
+19104 7365 -9.28686431603779e-01
+19104 7389 -1.16968533203042e+00
+19104 7413 -2.23748796928774e-01
+19104 7437 -2.73146508523378e-05
+19104 7941 -2.84816028581600e-08
+19104 7965 -4.43604484561122e-03
+19104 7989 -2.03872129237748e-02
+19104 8013 -1.73381330431109e-03
+19104 19104 9.72287790042682e+00
+19104 18264 4.52658612056958e-01
+19104 18288 4.53459503715138e-01
+19104 18312 1.54387821770827e-01
+19104 18336 2.40943983470182e-02
+19104 18672 3.22216462969512e+00
+19104 18696 3.78477955217482e+00
+19104 18720 1.36581515747559e+00
+19104 18744 2.00511985679792e-01
+19104 19080 6.39329861863208e+00
+19104 19128 3.31201727714562e+00
+19104 19152 4.66602452222991e-01
+19104 19488 2.58960730429121e+00
+19104 19512 3.51355052713257e+00
+19104 19536 1.40655976561496e+00
+19104 19560 2.08016331128107e-01
+19104 19896 2.94519280705982e-01
+19104 19920 3.85652247454574e-01
+19104 19944 1.64573973805669e-01
+19104 19968 2.59704847090969e-02
+19105 19105 1.00000000000000e+00
+19106 19106 1.00000000000000e+00
+19107 19107 1.00000000000000e+00
+19108 19108 1.00000000000000e+00
+19109 19109 1.00000000000000e+00
+19110 19110 1.00000000000000e+00
+19111 19111 1.00000000000000e+00
+19112 19112 1.00000000000000e+00
+19113 19113 1.00000000000000e+00
+19114 19114 1.00000000000000e+00
+19115 19115 1.00000000000000e+00
+19116 19116 1.00000000000000e+00
+19117 19117 1.00000000000000e+00
+19118 19118 1.00000000000000e+00
+19119 19119 1.00000000000000e+00
+19120 19120 1.00000000000000e+00
+19121 19121 1.00000000000000e+00
+19122 19122 1.00000000000000e+00
+19123 19123 1.00000000000000e+00
+19124 19124 1.00000000000000e+00
+19125 19125 1.00000000000000e+00
+19126 19126 1.00000000000000e+00
+19127 19127 1.00000000000000e+00
+19128 4965 -2.47779430879000e-09
+19128 4989 -7.29284455996000e-09
+19128 5565 -9.31784332562705e-03
+19128 5589 -7.39964518854127e-02
+19128 5613 -4.35511837740988e-02
+19128 5637 -3.83180860003058e-04
+19128 6141 -1.35262437329919e-03
+19128 6165 -5.14460043694646e-01
+19128 6189 -2.77314972883565e+00
+19128 6213 -2.01546910711482e+00
+19128 6237 -1.27093248179565e-01
+19128 6261 -2.50271011591095e-04
+19128 6741 -1.69311411195078e-02
+19128 6765 -1.52603805139535e+00
+19128 6789 -1.02216097184029e+01
+19128 6813 -6.17588936427211e+00
+19128 6837 -3.90543641669703e-01
+19128 6861 -4.06769525242688e-04
+19128 7341 -7.17949674489160e-03
+19128 7365 -6.43339735310626e-01
+19128 7389 -3.73623591502844e+00
+19128 7413 -2.18514483610325e+00
+19128 7437 -1.44363945467564e-01
+19128 7461 -3.47987915137000e-08
+19128 7941 -1.44727600551000e-08
+19128 7965 -1.45815447323936e-02
+19128 7989 -1.36848367689043e-01
+19128 8013 -8.66559427129917e-02
+19128 8037 -1.59366967251027e-03
+19128 8589 -3.98147192210430e-07
+19128 8613 -1.59177904572115e-06
+19128 19128 9.20734770868319e+00
+19128 18264 1.45025570956886e-02
+19128 18288 1.54387821770827e-01
+19128 18312 4.21236485964566e-01
+19128 18336 1.81271814654417e-01
+19128 18360 2.12235553165861e-02
+19128 18672 1.40941803689102e-01
+19128 18696 1.36581515747559e+00
+19128 18720 3.51831670951067e+00
+19128 18744 1.47878048249847e+00
+19128 18768 1.69183134944820e-01
+19128 19080 3.61401867063397e-01
+19128 19104 3.31201727714562e+00
+19128 19152 3.38763623309856e+00
+19128 19176 3.80306606051632e-01
+19128 19488 1.43623610275629e-01
+19128 19512 1.40655976561496e+00
+19128 19536 3.64388340608846e+00
+19128 19560 1.52005931556464e+00
+19128 19584 1.71998497763048e-01
+19128 19896 1.51730087423205e-02
+19128 19920 1.64573973805669e-01
+19128 19944 4.52628160109014e-01
+19128 19968 1.91591522920960e-01
+19128 19992 2.19273960211432e-02
+19129 19129 1.00000000000000e+00
+19130 19130 1.00000000000000e+00
+19131 19131 1.00000000000000e+00
+19132 19132 1.00000000000000e+00
+19133 19133 1.00000000000000e+00
+19134 19134 1.00000000000000e+00
+19135 19135 1.00000000000000e+00
+19136 19136 1.00000000000000e+00
+19137 19137 1.00000000000000e+00
+19138 19138 1.00000000000000e+00
+19139 19139 1.00000000000000e+00
+19140 19140 1.00000000000000e+00
+19141 19141 1.00000000000000e+00
+19142 19142 1.00000000000000e+00
+19143 19143 1.00000000000000e+00
+19144 19144 1.00000000000000e+00
+19145 19145 1.00000000000000e+00
+19146 19146 1.00000000000000e+00
+19147 19147 1.00000000000000e+00
+19148 19148 1.00000000000000e+00
+19149 19149 1.00000000000000e+00
+19150 19150 1.00000000000000e+00
+19151 19151 1.00000000000000e+00
+19152 5589 -5.38291298606242e-03
+19152 5613 -9.40248882104703e-03
+19152 5637 -2.02465739836171e-04
+19152 6165 -9.42561470530939e-03
+19152 6189 -4.95781694150880e-01
+19152 6213 -1.11422845009594e+00
+19152 6237 -3.54816042167551e-01
+19152 6261 -5.97175117773273e-03
+19152 6285 -9.21392776400000e-11
+19152 6741 -4.00202380170110e-07
+19152 6765 -1.43573546139144e-01
+19152 6789 -3.40775270230960e+00
+19152 6813 -8.01336539963230e+00
+19152 6837 -2.22780410194087e+00
+19152 6861 -7.37384779871934e-02
+19152 6885 -6.06677257560000e-10
+19152 7341 -4.68162706606922e-06
+19152 7365 -1.31722113288671e-01
+19152 7389 -2.64775831761194e+00
+19152 7413 -6.49493602195014e+00
+19152 7437 -1.93483237870046e+00
+19152 7461 -4.55087334551140e-02
+19152 7941 -1.96062915748000e-09
+19152 7965 -5.36026349040977e-03
+19152 7989 -2.65399292796336e-01
+19152 8013 -6.02940997111866e-01
+19152 8037 -1.78671550878463e-01
+19152 8061 -7.98683687606945e-04
+19152 8589 -1.33092751663788e-05
+19152 8613 -1.93303940305548e-03
+19152 8637 -8.99956012314750e-04
+19152 19152 7.90720107965357e+00
+19152 18288 2.40943983470182e-02
+19152 18312 1.81271814654417e-01
+19152 18336 3.83034098986024e-01
+19152 18360 1.62345483560858e-01
+19152 18384 1.93628155736283e-02
+19152 18696 2.00511985679792e-01
+19152 18720 1.47878048249846e+00
+19152 18744 3.06392335696745e+00
+19152 18768 1.30265738846122e+00
+19152 18792 1.56481212170482e-01
+19152 19104 4.66602452222991e-01
+19152 19128 3.38763623309856e+00
+19152 19176 2.94399814662349e+00
+19152 19200 3.55692930604227e-01
+19152 19512 2.08016331128107e-01
+19152 19536 1.52005931556464e+00
+19152 19560 3.11986350731981e+00
+19152 19584 1.32747883898367e+00
+19152 19608 1.59871211982866e-01
+19152 19920 2.59704847090969e-02
+19152 19944 1.91591522920960e-01
+19152 19968 3.97019136574113e-01
+19152 19992 1.68550846191471e-01
+19152 20016 2.02103155267244e-02
+19153 19153 1.00000000000000e+00
+19154 19154 1.00000000000000e+00
+19155 19155 1.00000000000000e+00
+19156 19156 1.00000000000000e+00
+19157 19157 1.00000000000000e+00
+19158 19158 1.00000000000000e+00
+19159 19159 1.00000000000000e+00
+19160 19160 1.00000000000000e+00
+19161 19161 1.00000000000000e+00
+19162 19162 1.00000000000000e+00
+19163 19163 1.00000000000000e+00
+19164 19164 1.00000000000000e+00
+19165 19165 1.00000000000000e+00
+19166 19166 1.00000000000000e+00
+19167 19167 1.00000000000000e+00
+19168 19168 1.00000000000000e+00
+19169 19169 1.00000000000000e+00
+19170 19170 1.00000000000000e+00
+19171 19171 1.00000000000000e+00
+19172 19172 1.00000000000000e+00
+19173 19173 1.00000000000000e+00
+19174 19174 1.00000000000000e+00
+19175 19175 1.00000000000000e+00
+19176 5589 -2.31168330062650e-07
+19176 5613 -1.52153242486526e-04
+19176 5637 -2.84457677356835e-05
+19176 6189 -9.94001768869147e-03
+19176 6213 -1.90496251634996e-01
+19176 6237 -2.26074176801012e-01
+19176 6261 -2.21346096836278e-02
+19176 6285 -2.63632843519911e-06
+19176 6765 -4.68209319752302e-05
+19176 6789 -3.13158933648098e-01
+19176 6813 -3.09628035087761e+00
+19176 6837 -3.75690140381861e+00
+19176 6861 -5.34791752860116e-01
+19176 6885 -6.88640208816345e-03
+19176 7365 -1.98398564923313e-03
+19176 7389 -5.43816655026169e-01
+19176 7413 -5.76875780633062e+00
+19176 7437 -7.13291989148037e+00
+19176 7461 -9.98666130461218e-01
+19176 7485 -7.22537427582608e-03
+19176 7965 -4.73461040574706e-04
+19176 7989 -1.18129358804483e-01
+19176 8013 -1.32965709172447e+00
+19176 8037 -1.48988839847490e+00
+19176 8061 -2.35972834052831e-01
+19176 8085 -6.59348435444695e-05
+19176 8589 -4.77885378091516e-05
+19176 8613 -1.50083400241685e-02
+19176 8637 -3.58048723393153e-02
+19176 8661 -2.75454565147809e-03
+19176 19176 7.41816968014250e+00
+19176 18312 2.12235553165861e-02
+19176 18336 1.62345483560858e-01
+19176 18360 3.50415416818369e-01
+19176 18384 1.54998511589434e-01
+19176 18408 1.93868123237301e-02
+19176 18720 1.69183134944820e-01
+19176 18744 1.30265738846122e+00
+19176 18768 2.82739787882997e+00
+19176 18792 1.24398624531148e+00
+19176 18816 1.54515349157384e-01
+19176 19128 3.80306606051632e-01
+19176 19152 2.94399814662349e+00
+19176 19200 2.80987646010902e+00
+19176 19224 3.46776184423014e-01
+19176 19536 1.71998497763048e-01
+19176 19560 1.32747883898367e+00
+19176 19584 2.88497387994914e+00
+19176 19608 1.25962880977219e+00
+19176 19632 1.55035990460178e-01
+19176 19944 2.19273960211432e-02
+19176 19968 1.68550846191471e-01
+19176 19992 3.64809417098163e-01
+19176 20016 1.58909152704612e-01
+19176 20040 1.95169726494285e-02
+19177 19177 1.00000000000000e+00
+19178 19178 1.00000000000000e+00
+19179 19179 1.00000000000000e+00
+19180 19180 1.00000000000000e+00
+19181 19181 1.00000000000000e+00
+19182 19182 1.00000000000000e+00
+19183 19183 1.00000000000000e+00
+19184 19184 1.00000000000000e+00
+19185 19185 1.00000000000000e+00
+19186 19186 1.00000000000000e+00
+19187 19187 1.00000000000000e+00
+19188 19188 1.00000000000000e+00
+19189 19189 1.00000000000000e+00
+19190 19190 1.00000000000000e+00
+19191 19191 1.00000000000000e+00
+19192 19192 1.00000000000000e+00
+19193 19193 1.00000000000000e+00
+19194 19194 1.00000000000000e+00
+19195 19195 1.00000000000000e+00
+19196 19196 1.00000000000000e+00
+19197 19197 1.00000000000000e+00
+19198 19198 1.00000000000000e+00
+19199 19199 1.00000000000000e+00
+19200 6213 -6.15205480232559e-03
+19200 6237 -4.32773454137620e-02
+19200 6261 -1.29819148068436e-02
+19200 6285 -1.09340842857504e-05
+19200 6789 -8.50483332369755e-04
+19200 6813 -3.81038440366006e-01
+19200 6837 -1.73159753784740e+00
+19200 6861 -1.14368139928720e+00
+19200 6885 -6.74916128452624e-02
+19200 6909 -1.03213653480996e-04
+19200 7389 -2.16090931874467e-02
+19200 7413 -1.49717127446901e+00
+19200 7437 -7.82063470981179e+00
+19200 7461 -4.54342432343407e+00
+19200 7485 -3.03095516402849e-01
+19200 7509 -3.08191473876535e-04
+19200 7989 -1.51559787944259e-02
+19200 8013 -7.66829074925672e-01
+19200 8037 -3.84397367768761e+00
+19200 8061 -2.30931516770857e+00
+19200 8085 -1.55713479595500e-01
+19200 8109 -6.25027141297630e-07
+19200 8589 -1.38112665047084e-05
+19200 8613 -3.19984746935322e-02
+19200 8637 -2.15879675201223e-01
+19200 8661 -1.30268316315284e-01
+19200 8685 -3.14675205445588e-03
+19200 9237 -2.76739317972468e-05
+19200 9261 -7.18384143752448e-05
+19200 19200 7.24442172701005e+00
+19200 18336 1.93628155736283e-02
+19200 18360 1.54998511589434e-01
+19200 18384 3.48181904617084e-01
+19200 18408 1.52067616750013e-01
+19200 18432 1.86300918637732e-02
+19200 18744 1.56481212170482e-01
+19200 18768 1.24398624531148e+00
+19200 18792 2.77880822339924e+00
+19200 18816 1.21838709547176e+00
+19200 18840 1.50081424710553e-01
+19200 19152 3.55692930604227e-01
+19200 19176 2.80987646010902e+00
+19200 19224 2.74834412024162e+00
+19200 19248 3.40309845637378e-01
+19200 19560 1.59871211982866e-01
+19200 19584 1.25962880977219e+00
+19200 19608 2.79375021560829e+00
+19200 19632 1.23335658689082e+00
+19200 19656 1.53303156262525e-01
+19200 19968 2.02103155267244e-02
+19200 19992 1.58909152704612e-01
+19200 20016 3.51917402669347e-01
+19200 20040 1.55809989604779e-01
+19200 20064 1.94355247517662e-02
+19201 19201 1.00000000000000e+00
+19202 19202 1.00000000000000e+00
+19203 19203 1.00000000000000e+00
+19204 19204 1.00000000000000e+00
+19205 19205 1.00000000000000e+00
+19206 19206 1.00000000000000e+00
+19207 19207 1.00000000000000e+00
+19208 19208 1.00000000000000e+00
+19209 19209 1.00000000000000e+00
+19210 19210 1.00000000000000e+00
+19211 19211 1.00000000000000e+00
+19212 19212 1.00000000000000e+00
+19213 19213 1.00000000000000e+00
+19214 19214 1.00000000000000e+00
+19215 19215 1.00000000000000e+00
+19216 19216 1.00000000000000e+00
+19217 19217 1.00000000000000e+00
+19218 19218 1.00000000000000e+00
+19219 19219 1.00000000000000e+00
+19220 19220 1.00000000000000e+00
+19221 19221 1.00000000000000e+00
+19222 19222 1.00000000000000e+00
+19223 19223 1.00000000000000e+00
+19224 6237 -1.55307223477492e-03
+19224 6261 -2.01993850345177e-03
+19224 6285 -4.19657041456247e-06
+19224 6813 -3.87791204741474e-03
+19224 6837 -2.51669427949074e-01
+19224 6861 -6.00080589743577e-01
+19224 6885 -1.83173325846020e-01
+19224 6909 -2.06384177255707e-03
+19224 7389 -5.76558717979400e-08
+19224 7413 -1.01039043382732e-01
+19224 7437 -2.48901865479237e+00
+19224 7461 -5.99220336649916e+00
+19224 7485 -1.66908141813579e+00
+19224 7509 -5.45870460972288e-02
+19224 7989 -8.12642191870767e-06
+19224 8013 -1.28438112447600e-01
+19224 8037 -2.71989718090500e+00
+19224 8061 -6.82542888510078e+00
+19224 8085 -1.96287925132751e+00
+19224 8109 -4.68504653711728e-02
+19224 8589 -5.23645026792820e-07
+19224 8613 -1.07863231621519e-02
+19224 8637 -3.98034187425589e-01
+19224 8661 -8.64674467026409e-01
+19224 8685 -2.60977235824410e-01
+19224 8709 -1.58782338679893e-03
+19224 9237 -2.81844181765466e-04
+19224 9261 -6.94726832043430e-03
+19224 9285 -2.44491993247956e-03
+19224 19224 7.12836795763667e+00
+19224 18360 1.93868123237301e-02
+19224 18384 1.52067616750013e-01
+19224 18408 3.35911225734989e-01
+19224 18432 1.48292141818645e-01
+19224 18456 1.84429435908880e-02
+19224 18768 1.54515349157384e-01
+19224 18792 1.21838709547176e+00
+19224 18816 2.70433855902271e+00
+19224 18840 1.19440735682797e+00
+19224 18864 1.48520414496436e-01
+19224 19176 3.46776184423014e-01
+19224 19200 2.74834412024163e+00
+19224 19248 2.70777635461112e+00
+19224 19272 3.36634243015388e-01
+19224 19584 1.55035990460178e-01
+19224 19608 1.23335658689082e+00
+19224 19632 2.75942208636537e+00
+19224 19656 1.21935500786909e+00
+19224 19680 1.51535595704744e-01
+19224 19992 1.95169726494285e-02
+19224 20016 1.55809989604779e-01
+19224 20040 3.49682107570653e-01
+19224 20064 1.54529054578925e-01
+19224 20088 1.91967388929650e-02
+19225 19225 1.00000000000000e+00
+19226 19226 1.00000000000000e+00
+19227 19227 1.00000000000000e+00
+19228 19228 1.00000000000000e+00
+19229 19229 1.00000000000000e+00
+19230 19230 1.00000000000000e+00
+19231 19231 1.00000000000000e+00
+19232 19232 1.00000000000000e+00
+19233 19233 1.00000000000000e+00
+19234 19234 1.00000000000000e+00
+19235 19235 1.00000000000000e+00
+19236 19236 1.00000000000000e+00
+19237 19237 1.00000000000000e+00
+19238 19238 1.00000000000000e+00
+19239 19239 1.00000000000000e+00
+19240 19240 1.00000000000000e+00
+19241 19241 1.00000000000000e+00
+19242 19242 1.00000000000000e+00
+19243 19243 1.00000000000000e+00
+19244 19244 1.00000000000000e+00
+19245 19245 1.00000000000000e+00
+19246 19246 1.00000000000000e+00
+19247 19247 1.00000000000000e+00
+19248 6237 -3.17062769720000e-09
+19248 6261 -4.56708922212469e-06
+19248 6285 -3.90152634118480e-07
+19248 6837 -4.43884181165065e-03
+19248 6861 -9.93778601986994e-02
+19248 6885 -1.06320221811238e-01
+19248 6909 -7.05238029109584e-03
+19248 7413 -1.54190474932792e-05
+19248 7437 -2.34465262564643e-01
+19248 7461 -2.23326814143203e+00
+19248 7485 -2.67868645090644e+00
+19248 7509 -3.71678060230656e-01
+19248 7533 -4.14430081245748e-03
+19248 8013 -1.94985337928621e-03
+19248 8037 -5.54442084415405e-01
+19248 8061 -5.79840393114079e+00
+19248 8085 -6.90984690437402e+00
+19248 8109 -9.17064794435832e-01
+19248 8133 -7.04436337218187e-03
+19248 8613 -8.71566016129873e-04
+19248 8637 -1.70937578879020e-01
+19248 8661 -1.80327671377134e+00
+19248 8685 -1.99343558131643e+00
+19248 8709 -3.05397524757637e-01
+19248 8733 -1.47971231592432e-04
+19248 9237 -7.15434311001539e-04
+19248 9261 -4.21980672869894e-02
+19248 9285 -6.87655032636453e-02
+19248 9309 -5.35878571918443e-03
+19248 9885 -6.64224849700000e-11
+19248 9909 -1.00590931000000e-11
+19248 19248 7.06341460812454e+00
+19248 18384 1.86300918637732e-02
+19248 18408 1.48292141818645e-01
+19248 18432 3.32330993322271e-01
+19248 18456 1.48226990380710e-01
+19248 18480 1.86138040042894e-02
+19248 18792 1.50081424710553e-01
+19248 18816 1.19440735682797e+00
+19248 18840 2.67573010259266e+00
+19248 18864 1.19136984174207e+00
+19248 18888 1.49322045939077e-01
+19248 19200 3.40309845637378e-01
+19248 19224 2.70777635461112e+00
+19248 19272 2.69436446902454e+00
+19248 19296 3.36956874240732e-01
+19248 19608 1.53303156262525e-01
+19248 19632 1.21935500786909e+00
+19248 19656 2.72824251965546e+00
+19248 19680 1.20762171128691e+00
+19248 19704 1.50369832116981e-01
+19248 20016 1.94355247517662e-02
+19248 20040 1.54529054578925e-01
+19248 20064 3.45459097587972e-01
+19248 20088 1.52289957766922e-01
+19248 20112 1.88757505487655e-02
+19249 19249 1.00000000000000e+00
+19250 19250 1.00000000000000e+00
+19251 19251 1.00000000000000e+00
+19252 19252 1.00000000000000e+00
+19253 19253 1.00000000000000e+00
+19254 19254 1.00000000000000e+00
+19255 19255 1.00000000000000e+00
+19256 19256 1.00000000000000e+00
+19257 19257 1.00000000000000e+00
+19258 19258 1.00000000000000e+00
+19259 19259 1.00000000000000e+00
+19260 19260 1.00000000000000e+00
+19261 19261 1.00000000000000e+00
+19262 19262 1.00000000000000e+00
+19263 19263 1.00000000000000e+00
+19264 19264 1.00000000000000e+00
+19265 19265 1.00000000000000e+00
+19266 19266 1.00000000000000e+00
+19267 19267 1.00000000000000e+00
+19268 19268 1.00000000000000e+00
+19269 19269 1.00000000000000e+00
+19270 19270 1.00000000000000e+00
+19271 19271 1.00000000000000e+00
+19272 6861 -2.89134898941356e-03
+19272 6885 -1.79537556714430e-02
+19272 6909 -3.03185917096310e-03
+19272 7437 -4.24155580695294e-04
+19272 7461 -2.57273709859605e-01
+19272 7485 -1.14383406827340e+00
+19272 7509 -7.34647396723042e-01
+19272 7533 -3.79318522441517e-02
+19272 7557 -3.67018070179617e-05
+19272 8037 -1.97985618629702e-02
+19272 8061 -1.43848699559361e+00
+19272 8085 -7.08479211929123e+00
+19272 8109 -3.94652603057978e+00
+19272 8133 -2.53821298188303e-01
+19272 8157 -2.44302264716895e-04
+19272 8637 -2.12466860893380e-02
+19272 8661 -9.64335460689662e-01
+19272 8685 -4.76234705419659e+00
+19272 8709 -2.74137618073184e+00
+19272 8733 -1.75776519637661e-01
+19272 8757 -3.38983153372558e-06
+19272 9237 -1.83814698169986e-04
+19272 9261 -7.01592677812317e-02
+19272 9285 -3.73523759437000e-01
+19272 9309 -2.12078387164964e-01
+19272 9333 -6.28028490483826e-03
+19272 9885 -3.19949948932872e-04
+19272 9909 -5.78508518996045e-04
+19272 9933 -1.78107971630000e-10
+19272 19272 7.06385545660231e+00
+19272 18408 1.84429435908880e-02
+19272 18432 1.48226990380710e-01
+19272 18456 3.34706751250407e-01
+19272 18480 1.48226990380709e-01
+19272 18504 1.84429435908878e-02
+19272 18816 1.48520414496436e-01
+19272 18840 1.19136984174207e+00
+19272 18864 2.68596529134037e+00
+19272 18888 1.19045675103090e+00
+19272 18912 1.48292141818644e-01
+19272 19224 3.36634243015388e-01
+19272 19248 2.69436446902454e+00
+19272 19296 2.69147239990295e+00
+19272 19320 3.35911225734991e-01
+19272 19632 1.51535595704744e-01
+19272 19656 1.20762171128691e+00
+19272 19680 2.70952052632652e+00
+19272 19704 1.20974979546801e+00
+19272 19728 1.52067616750017e-01
+19272 20040 1.91967388929650e-02
+19272 20064 1.52289957766922e-01
+19272 20088 3.40595559996944e-01
+19272 20112 1.53050251489986e-01
+19272 20136 1.93868123237310e-02
+19273 19273 1.00000000000000e+00
+19274 19274 1.00000000000000e+00
+19275 19275 1.00000000000000e+00
+19276 19276 1.00000000000000e+00
+19277 19277 1.00000000000000e+00
+19278 19278 1.00000000000000e+00
+19279 19279 1.00000000000000e+00
+19280 19280 1.00000000000000e+00
+19281 19281 1.00000000000000e+00
+19282 19282 1.00000000000000e+00
+19283 19283 1.00000000000000e+00
+19284 19284 1.00000000000000e+00
+19285 19285 1.00000000000000e+00
+19286 19286 1.00000000000000e+00
+19287 19287 1.00000000000000e+00
+19288 19288 1.00000000000000e+00
+19289 19289 1.00000000000000e+00
+19290 19290 1.00000000000000e+00
+19291 19291 1.00000000000000e+00
+19292 19292 1.00000000000000e+00
+19293 19293 1.00000000000000e+00
+19294 19294 1.00000000000000e+00
+19295 19295 1.00000000000000e+00
+19296 6885 -3.62720964486766e-04
+19296 6909 -3.45218003082504e-04
+19296 7461 -1.81437017932958e-03
+19296 7485 -1.52427932049994e-01
+19296 7509 -3.57157477180811e-01
+19296 7533 -9.59262161090056e-02
+19296 7557 -5.27208835272886e-04
+19296 8037 -5.56057466610000e-10
+19296 8061 -8.88788763992173e-02
+19296 8085 -2.12020356069701e+00
+19296 8109 -4.82545053729418e+00
+19296 8133 -1.32125388491843e+00
+19296 8157 -4.04287971817133e-02
+19296 8637 -1.39127671343209e-05
+19296 8661 -1.52428787925998e-01
+19296 8685 -3.12316738344965e+00
+19296 8709 -7.56571605479377e+00
+19296 8733 -2.04795403555762e+00
+19296 8757 -4.94199897693986e-02
+19296 9237 -3.16656089837684e-06
+19296 9261 -2.16988591599808e-02
+19296 9285 -6.28655875378798e-01
+19296 9309 -1.29828131778269e+00
+19296 9333 -3.86242857738413e-01
+19296 9357 -2.84679740778393e-03
+19296 9885 -2.16668756254669e-03
+19296 9909 -1.99554679510908e-02
+19296 9933 -5.56833331860732e-03
+19296 19296 7.05170990002147e+00
+19296 18432 1.86138040042894e-02
+19296 18456 1.48226990380709e-01
+19296 18480 3.32388061491716e-01
+19296 18504 1.48520414496437e-01
+19296 18528 1.86871600332214e-02
+19296 18840 1.49322045939077e-01
+19296 18864 1.19045675103090e+00
+19296 18888 2.67230601242578e+00
+19296 18912 1.19440735682796e+00
+19296 18936 1.50309697388343e-01
+19296 19248 3.36956874240732e-01
+19296 19272 2.69147239990295e+00
+19296 19320 2.70433855902268e+00
+19296 19344 3.40173414020667e-01
+19296 19656 1.50369832116981e-01
+19296 19680 1.20974979546801e+00
+19296 19704 2.73598085723523e+00
+19296 19728 1.21838709547177e+00
+19296 19752 1.52529157117921e-01
+19296 20064 1.88757505487655e-02
+19296 20088 1.53050251489986e-01
+19296 20112 3.48306772694077e-01
+19296 20136 1.54515349157388e-01
+19296 20160 1.92420249656160e-02
+19297 19297 1.00000000000000e+00
+19298 19298 1.00000000000000e+00
+19299 19299 1.00000000000000e+00
+19300 19300 1.00000000000000e+00
+19301 19301 1.00000000000000e+00
+19302 19302 1.00000000000000e+00
+19303 19303 1.00000000000000e+00
+19304 19304 1.00000000000000e+00
+19305 19305 1.00000000000000e+00
+19306 19306 1.00000000000000e+00
+19307 19307 1.00000000000000e+00
+19308 19308 1.00000000000000e+00
+19309 19309 1.00000000000000e+00
+19310 19310 1.00000000000000e+00
+19311 19311 1.00000000000000e+00
+19312 19312 1.00000000000000e+00
+19313 19313 1.00000000000000e+00
+19314 19314 1.00000000000000e+00
+19315 19315 1.00000000000000e+00
+19316 19316 1.00000000000000e+00
+19317 19317 1.00000000000000e+00
+19318 19318 1.00000000000000e+00
+19319 19319 1.00000000000000e+00
+19320 7485 -2.06384177255705e-03
+19320 7509 -5.45870460972284e-02
+19320 7533 -4.68504653711731e-02
+19320 7557 -1.58782338679897e-03
+19320 8061 -4.19657041456259e-06
+19320 8085 -1.83173325846021e-01
+19320 8109 -1.66908141813578e+00
+19320 8133 -1.96287925132751e+00
+19320 8157 -2.60977235824414e-01
+19320 8181 -2.44491993247958e-03
+19320 8661 -2.01993850345186e-03
+19320 8685 -6.00080589743586e-01
+19320 8709 -5.99220336649907e+00
+19320 8733 -6.82542888510070e+00
+19320 8757 -8.64674467026424e-01
+19320 8781 -6.94726832043436e-03
+19320 9261 -1.55307223477499e-03
+19320 9285 -2.51669427949044e-01
+19320 9309 -2.48901865479225e+00
+19320 9333 -2.71989718090498e+00
+19320 9357 -3.98034187425601e-01
+19320 9381 -2.81844181765471e-04
+19320 9885 -3.87791204741476e-03
+19320 9909 -1.01039043382733e-01
+19320 9933 -1.28438112447604e-01
+19320 9957 -1.07863231621524e-02
+19320 10509 -5.76558717979500e-08
+19320 10533 -8.12642191870804e-06
+19320 10557 -5.23645026792840e-07
+19320 19320 7.12836795763654e+00
+19320 18456 1.84429435908878e-02
+19320 18480 1.48520414496437e-01
+19320 18504 3.36634243015395e-01
+19320 18528 1.51535595704746e-01
+19320 18552 1.91967388929652e-02
+19320 18864 1.48292141818644e-01
+19320 18888 1.19440735682796e+00
+19320 18912 2.70777635461111e+00
+19320 18936 1.21935500786910e+00
+19320 18960 1.54529054578928e-01
+19320 19272 3.35911225734991e-01
+19320 19296 2.70433855902268e+00
+19320 19344 2.75942208636538e+00
+19320 19368 3.49682107570664e-01
+19320 19680 1.52067616750017e-01
+19320 19704 1.21838709547177e+00
+19320 19728 2.74834412024160e+00
+19320 19752 1.23335658689084e+00
+19320 19776 1.55809989604785e-01
+19320 20088 1.93868123237310e-02
+19320 20112 1.54515349157388e-01
+19320 20136 3.46776184423016e-01
+19320 20160 1.55035990460182e-01
+19320 20184 1.95169726494294e-02
+19321 19321 1.00000000000000e+00
+19322 19322 1.00000000000000e+00
+19323 19323 1.00000000000000e+00
+19324 19324 1.00000000000000e+00
+19325 19325 1.00000000000000e+00
+19326 19326 1.00000000000000e+00
+19327 19327 1.00000000000000e+00
+19328 19328 1.00000000000000e+00
+19329 19329 1.00000000000000e+00
+19330 19330 1.00000000000000e+00
+19331 19331 1.00000000000000e+00
+19332 19332 1.00000000000000e+00
+19333 19333 1.00000000000000e+00
+19334 19334 1.00000000000000e+00
+19335 19335 1.00000000000000e+00
+19336 19336 1.00000000000000e+00
+19337 19337 1.00000000000000e+00
+19338 19338 1.00000000000000e+00
+19339 19339 1.00000000000000e+00
+19340 19340 1.00000000000000e+00
+19341 19341 1.00000000000000e+00
+19342 19342 1.00000000000000e+00
+19343 19343 1.00000000000000e+00
+19344 7509 -1.27623034386605e-03
+19344 7533 -6.53347571849024e-03
+19344 7557 -4.98462211108435e-04
+19344 8085 -1.88632296335786e-04
+19344 8109 -1.75026824014732e-01
+19344 8133 -7.75414771434278e-01
+19344 8157 -4.78760119398739e-01
+19344 8181 -2.03097815182611e-02
+19344 8205 -7.58338003402621e-06
+19344 8685 -1.82588596240218e-02
+19344 8709 -1.41055889312210e+00
+19344 8733 -6.53788922342889e+00
+19344 8757 -3.51256895453253e+00
+19344 8781 -2.18551967117541e-01
+19344 8805 -1.86508968564513e-04
+19344 9285 -2.92174748183974e-02
+19344 9309 -1.24030980514068e+00
+19344 9333 -6.03043027825411e+00
+19344 9357 -3.29949882568257e+00
+19344 9381 -2.01108282090764e-01
+19344 9405 -1.05957427505541e-05
+19344 9885 -9.28518009400151e-04
+19344 9909 -1.39874140180191e-01
+19344 9933 -6.40927707820481e-01
+19344 9957 -3.49928920340783e-01
+19344 9981 -1.21795169504231e-02
+19344 10509 -3.91749617691160e-07
+19344 10533 -1.89638474168428e-03
+19344 10557 -2.45335414009294e-03
+19344 10581 -9.85236182442100e-08
+19344 19344 7.28740210760287e+00
+19344 18480 1.86871600332214e-02
+19344 18504 1.51535595704746e-01
+19344 18528 3.45414760493992e-01
+19344 18552 1.55106068265173e-01
+19344 18576 1.95797781733280e-02
+19344 18888 1.50309697388343e-01
+19344 18912 1.21935500786910e+00
+19344 18936 2.77918470063374e+00
+19344 18960 1.24375673824569e+00
+19344 18984 1.56410129982490e-01
+19344 19296 3.40173414020667e-01
+19344 19320 2.75942208636538e+00
+19344 19368 2.80798832008811e+00
+19344 19392 3.52314972451350e-01
+19344 19704 1.52529157117921e-01
+19344 19728 1.23335658689084e+00
+19344 19752 2.80506450856896e+00
+19344 19776 1.26154202951684e+00
+19344 19800 1.59575517774422e-01
+19344 20112 1.92420249656160e-02
+19344 20136 1.55035990460182e-01
+19344 20160 3.51884712477798e-01
+19344 20184 1.59552391082962e-01
+19344 20208 2.03711251213111e-02
+19345 19345 1.00000000000000e+00
+19346 19346 1.00000000000000e+00
+19347 19347 1.00000000000000e+00
+19348 19348 1.00000000000000e+00
+19349 19349 1.00000000000000e+00
+19350 19350 1.00000000000000e+00
+19351 19351 1.00000000000000e+00
+19352 19352 1.00000000000000e+00
+19353 19353 1.00000000000000e+00
+19354 19354 1.00000000000000e+00
+19355 19355 1.00000000000000e+00
+19356 19356 1.00000000000000e+00
+19357 19357 1.00000000000000e+00
+19358 19358 1.00000000000000e+00
+19359 19359 1.00000000000000e+00
+19360 19360 1.00000000000000e+00
+19361 19361 1.00000000000000e+00
+19362 19362 1.00000000000000e+00
+19363 19363 1.00000000000000e+00
+19364 19364 1.00000000000000e+00
+19365 19365 1.00000000000000e+00
+19366 19366 1.00000000000000e+00
+19367 19367 1.00000000000000e+00
+19368 7533 -4.25390998073094e-05
+19368 7557 -2.95151509768490e-05
+19368 8109 -8.00980653817322e-04
+19368 8133 -9.46399802028869e-02
+19368 8157 -2.13828212972157e-01
+19368 8181 -4.65170820385612e-02
+19368 8205 -7.26889822415108e-05
+19368 8709 -7.95778024835346e-02
+19368 8733 -1.83374722468628e+00
+19368 8757 -3.97166244870867e+00
+19368 8781 -1.08618188199012e+00
+19368 8805 -3.06138592859706e-02
+19368 9285 -2.24011129438353e-05
+19368 9309 -1.85183137996147e-01
+19368 9333 -3.65852053446203e+00
+19368 9357 -8.57804786423748e+00
+19368 9381 -2.25808474336946e+00
+19368 9405 -5.53882674114027e-02
+19368 9885 -1.04073115619183e-05
+19368 9909 -4.05088426167672e-02
+19368 9933 -9.90842359719990e-01
+19368 9957 -2.02840327989389e+00
+19368 9981 -6.12047630761578e-01
+19368 10005 -5.13431393213643e-03
+19368 10509 -7.02160393795420e-07
+19368 10533 -1.05393873554721e-02
+19368 10557 -5.22627933309404e-02
+19368 10581 -1.24654553297146e-02
+19368 19368 7.37694384582178e+00
+19368 18504 1.91967388929652e-02
+19368 18528 1.55106068265173e-01
+19368 18552 3.53193527318910e-01
+19368 18576 1.61200463304102e-01
+19368 18600 2.07203376526976e-02
+19368 18912 1.54529054578928e-01
+19368 18936 1.24375673824569e+00
+19368 18960 2.82694718723969e+00
+19368 18984 1.30506473169344e+00
+19368 19008 1.69856052940867e-01
+19368 19320 3.49682107570664e-01
+19368 19344 2.80798832008811e+00
+19368 19392 2.97014860592261e+00
+19368 19416 3.90222179029286e-01
+19368 19728 1.55809989604785e-01
+19368 19752 1.26154202951684e+00
+19368 19776 2.88240510455081e+00
+19368 19800 1.33184939331854e+00
+19368 19824 1.73386830555210e-01
+19368 20136 1.95169726494294e-02
+19368 20160 1.59552391082962e-01
+19368 20184 3.67058006646690e-01
+19368 20208 1.67896628710378e-01
+19368 20232 2.16030320562834e-02
+19369 19369 1.00000000000000e+00
+19370 19370 1.00000000000000e+00
+19371 19371 1.00000000000000e+00
+19372 19372 1.00000000000000e+00
+19373 19373 1.00000000000000e+00
+19374 19374 1.00000000000000e+00
+19375 19375 1.00000000000000e+00
+19376 19376 1.00000000000000e+00
+19377 19377 1.00000000000000e+00
+19378 19378 1.00000000000000e+00
+19379 19379 1.00000000000000e+00
+19380 19380 1.00000000000000e+00
+19381 19381 1.00000000000000e+00
+19382 19382 1.00000000000000e+00
+19383 19383 1.00000000000000e+00
+19384 19384 1.00000000000000e+00
+19385 19385 1.00000000000000e+00
+19386 19386 1.00000000000000e+00
+19387 19387 1.00000000000000e+00
+19388 19388 1.00000000000000e+00
+19389 19389 1.00000000000000e+00
+19390 19390 1.00000000000000e+00
+19391 19391 1.00000000000000e+00
+19392 8133 -9.85286141680794e-04
+19392 8157 -2.95734225758226e-02
+19392 8181 -1.83378568091775e-02
+19392 8205 -1.77369989909076e-04
+19392 8709 -5.60692149366310e-07
+19392 8733 -1.43215743617078e-01
+19392 8757 -1.29413504052000e+00
+19392 8781 -1.52417843992889e+00
+19392 8805 -1.98962185579807e-01
+19392 8829 -1.58120002869859e-03
+19392 9309 -2.05148678363380e-03
+19392 9333 -6.65735053161053e-01
+19392 9357 -6.59932721052855e+00
+19392 9381 -7.39535321592714e+00
+19392 9405 -9.54578846059274e-01
+19392 9429 -8.17707393505394e-03
+19392 9909 -2.65351095419140e-03
+19392 9933 -3.78249300822858e-01
+19392 9957 -3.73729413925663e+00
+19392 9981 -4.21473093150740e+00
+19392 10005 -6.13134529254241e-01
+19392 10029 -6.01640639348692e-04
+19392 10509 -1.61126130499370e-07
+19392 10533 -1.42016680674160e-02
+19392 10557 -2.40577424961947e-01
+19392 10581 -2.85679637321188e-01
+19392 10605 -2.65648743547438e-02
+19392 11157 -1.69759551982024e-05
+19392 11181 -2.68364539589372e-04
+19392 11205 -9.74644038470928e-06
+19392 19392 8.05020205385271e+00
+19392 18528 1.95797781733280e-02
+19392 18552 1.61200463304102e-01
+19392 18576 3.76117951231718e-01
+19392 18600 1.82932433071707e-01
+19392 18624 2.50127706152292e-02
+19392 18936 1.56410129982490e-01
+19392 18960 1.30506473169344e+00
+19392 18984 3.07484360048562e+00
+19392 19008 1.48237070556028e+00
+19392 19032 2.00736623449200e-01
+19392 19344 3.52314972451350e-01
+19392 19368 2.97014860592261e+00
+19392 19416 3.37821758384736e+00
+19392 19440 4.54332216932536e-01
+19392 19752 1.59575517774422e-01
+19392 19776 1.33184939331854e+00
+19392 19800 3.14075947710282e+00
+19392 19824 1.52152600400075e+00
+19392 19848 2.06994670444974e-01
+19392 20160 2.03711251213111e-02
+19392 20184 1.67896628710378e-01
+19392 20208 3.92596920386018e-01
+19392 20232 1.92721257681825e-01
+19392 20256 2.65772823641727e-02
+19393 19393 1.00000000000000e+00
+19394 19394 1.00000000000000e+00
+19395 19395 1.00000000000000e+00
+19396 19396 1.00000000000000e+00
+19397 19397 1.00000000000000e+00
+19398 19398 1.00000000000000e+00
+19399 19399 1.00000000000000e+00
+19400 19400 1.00000000000000e+00
+19401 19401 1.00000000000000e+00
+19402 19402 1.00000000000000e+00
+19403 19403 1.00000000000000e+00
+19404 19404 1.00000000000000e+00
+19405 19405 1.00000000000000e+00
+19406 19406 1.00000000000000e+00
+19407 19407 1.00000000000000e+00
+19408 19408 1.00000000000000e+00
+19409 19409 1.00000000000000e+00
+19410 19410 1.00000000000000e+00
+19411 19411 1.00000000000000e+00
+19412 19412 1.00000000000000e+00
+19413 19413 1.00000000000000e+00
+19414 19414 1.00000000000000e+00
+19415 19415 1.00000000000000e+00
+19416 8157 -4.92803893296500e-04
+19416 8181 -1.95469579268333e-03
+19416 8205 -4.38145079191083e-05
+19416 8733 -7.26598831971743e-05
+19416 8757 -1.26225497284198e-01
+19416 8781 -5.91340677496710e-01
+19416 8805 -3.59725190024001e-01
+19416 8829 -1.02084568245077e-02
+19416 8853 -1.83644152629420e-07
+19416 9333 -1.82366467804072e-02
+19416 9357 -1.52988192885990e+00
+19416 9381 -6.98854935785908e+00
+19416 9405 -3.48549779286629e+00
+19416 9429 -1.70527780808150e-01
+19416 9453 -1.13643062235917e-04
+19416 9933 -4.20474139306113e-02
+19416 9957 -1.86663739218361e+00
+19416 9981 -8.83501779089221e+00
+19416 10005 -3.72294246617871e+00
+19416 10029 -1.67023864717951e-01
+19416 10053 -1.97635568482043e-05
+19416 10533 -3.21498529089224e-03
+19416 10557 -3.19772793067162e-01
+19416 10581 -1.23817040319275e+00
+19416 10605 -4.87838300554057e-01
+19416 10629 -1.48604071463110e-02
+19416 11157 -8.75407316449926e-05
+19416 11181 -7.88893963817180e-03
+19416 11205 -7.04889861285736e-03
+19416 11229 -1.74276804760183e-06
+19416 19416 8.91745842228491e+00
+19416 18552 2.07203376526976e-02
+19416 18576 1.82932433071707e-01
+19416 18600 4.40402125954322e-01
+19416 18624 1.77960916292746e-01
+19416 18648 1.94774584579572e-02
+19416 18960 1.69856052940867e-01
+19416 18984 1.48237070556028e+00
+19416 19008 3.51392334433734e+00
+19416 19032 1.33207175863362e+00
+19416 19056 1.32281316209201e-01
+19416 19368 3.90222179029286e-01
+19416 19392 3.37821758384736e+00
+19416 19440 2.84901195706921e+00
+19416 19464 2.57920772334751e-01
+19416 19776 1.73386830555210e-01
+19416 19800 1.52152600400075e+00
+19416 19824 3.62350257752147e+00
+19416 19848 1.38078276116628e+00
+19416 19872 1.38201019846591e-01
+19416 20184 2.16030320562834e-02
+19416 20208 1.92721257681825e-01
+19416 20232 4.67796934250352e-01
+19416 20256 1.90138666925909e-01
+19416 20280 2.09573843673046e-02
+19417 19417 1.00000000000000e+00
+19418 19418 1.00000000000000e+00
+19419 19419 1.00000000000000e+00
+19420 19420 1.00000000000000e+00
+19421 19421 1.00000000000000e+00
+19422 19422 1.00000000000000e+00
+19423 19423 1.00000000000000e+00
+19424 19424 1.00000000000000e+00
+19425 19425 1.00000000000000e+00
+19426 19426 1.00000000000000e+00
+19427 19427 1.00000000000000e+00
+19428 19428 1.00000000000000e+00
+19429 19429 1.00000000000000e+00
+19430 19430 1.00000000000000e+00
+19431 19431 1.00000000000000e+00
+19432 19432 1.00000000000000e+00
+19433 19433 1.00000000000000e+00
+19434 19434 1.00000000000000e+00
+19435 19435 1.00000000000000e+00
+19436 19436 1.00000000000000e+00
+19437 19437 1.00000000000000e+00
+19438 19438 1.00000000000000e+00
+19439 19439 1.00000000000000e+00
+19440 8181 -7.35209993245760e-07
+19440 8205 -3.64761453425580e-07
+19440 8757 -3.83203401246173e-04
+19440 8781 -7.03796648728676e-02
+19440 8805 -1.30866721526177e-01
+19440 8829 -1.99678375256180e-02
+19440 8853 -5.06717717815100e-06
+19440 9357 -8.46843250636792e-02
+19440 9381 -1.66495891798114e+00
+19440 9405 -3.32914583511339e+00
+19440 9429 -1.73985483446227e+00
+19440 9453 -1.17009061321144e-02
+19440 9933 -4.27068489809019e-05
+19440 9957 -2.75908869197920e-01
+19440 9981 -3.94528752716489e+00
+19440 10005 -1.21491661808584e+01
+19440 10029 -4.37787045752165e+00
+19440 10053 -2.95310796217853e-03
+19440 10533 -3.48101433441640e-05
+19440 10557 -8.48036522135777e-02
+19440 10581 -1.62540162070135e+00
+19440 10605 -4.98769432682711e+00
+19440 10629 -7.91085148021617e-01
+19440 11157 -9.55235986069338e-05
+19440 11181 -5.86754948615230e-02
+19440 11205 -1.27735214090192e-01
+19440 11229 -2.69315925168934e-04
+19440 19440 8.34560968819238e+00
+19440 18576 2.50127706152292e-02
+19440 18600 1.77960916292746e-01
+19440 18624 5.20546693731804e-01
+19440 18648 4.45699009410347e-01
+19440 18984 2.00736623449200e-01
+19440 19008 1.33207175863362e+00
+19440 19032 3.67164699493719e+00
+19440 19056 3.23794388911826e+00
+19440 19392 4.54332216932536e-01
+19440 19416 2.84901195706921e+00
+19440 19464 6.56077331714634e+00
+19440 19800 2.06994670444974e-01
+19440 19824 1.38078276116627e+00
+19440 19848 3.45834867769277e+00
+19440 19872 2.63307945879095e+00
+19440 20208 2.65772823641727e-02
+19440 20232 1.90138666925909e-01
+19440 20256 4.67222114420697e-01
+19440 20280 2.94482901828521e-01
+19441 19441 1.00000000000000e+00
+19442 19442 1.00000000000000e+00
+19443 19443 1.00000000000000e+00
+19444 19444 1.00000000000000e+00
+19445 19445 1.00000000000000e+00
+19446 19446 1.00000000000000e+00
+19447 19447 1.00000000000000e+00
+19448 19448 1.00000000000000e+00
+19449 19449 1.00000000000000e+00
+19450 19450 1.00000000000000e+00
+19451 19451 1.00000000000000e+00
+19452 19452 1.00000000000000e+00
+19453 19453 1.00000000000000e+00
+19454 19454 1.00000000000000e+00
+19455 19455 1.00000000000000e+00
+19456 19456 1.00000000000000e+00
+19457 19457 1.00000000000000e+00
+19458 19458 1.00000000000000e+00
+19459 19459 1.00000000000000e+00
+19460 19460 1.00000000000000e+00
+19461 19461 1.00000000000000e+00
+19462 19462 1.00000000000000e+00
+19463 19463 1.00000000000000e+00
+19464 8781 -4.24068021415267e-04
+19464 8805 -1.46458338405462e-02
+19464 8829 -9.58767802584510e-03
+19464 8853 -8.84884528789608e-06
+19464 9357 -5.96334235505000e-09
+19464 9381 -7.54624655077918e-02
+19464 9405 -1.71003083767368e+00
+19464 9429 -2.49861912557889e+00
+19464 9453 -2.26063108285773e-02
+19464 9957 -1.83203537140746e-03
+19464 9981 -6.68819689456890e-01
+19464 10005 -1.36812044076590e+01
+19464 10029 -7.60221651864070e+00
+19464 10053 -5.76787102641962e-03
+19464 10557 -4.12660314887462e-03
+19464 10581 -8.02167487971875e-01
+19464 10605 -7.25120728299913e+00
+19464 10629 -1.47814744601905e+00
+19464 11157 -1.96369108521828e-05
+19464 11181 -6.91058902851671e-02
+19464 11205 -2.06381545340386e-01
+19464 11229 -5.26432474004655e-04
+19464 19464 1.23161012279494e+01
+19464 18600 1.94774584579572e-02
+19464 18624 4.45699009410347e-01
+19464 18648 7.55055809614993e-01
+19464 19008 1.32281316209201e-01
+19464 19032 3.23794388911826e+00
+19464 19056 5.54991856477209e+00
+19464 19416 2.57920772334751e-01
+19464 19440 6.56077331714634e+00
+19464 19824 1.38201019846591e-01
+19464 19848 2.63307945879096e+00
+19464 19872 4.29875177865576e+00
+19464 20232 2.09573843673046e-02
+19464 20256 2.94482901828521e-01
+19464 20280 4.42264113085910e-01
+19465 19465 1.00000000000000e+00
+19466 19466 1.00000000000000e+00
+19467 19467 1.00000000000000e+00
+19468 19468 1.00000000000000e+00
+19469 19469 1.00000000000000e+00
+19470 19470 1.00000000000000e+00
+19471 19471 1.00000000000000e+00
+19472 19472 1.00000000000000e+00
+19473 19473 1.00000000000000e+00
+19474 19474 1.00000000000000e+00
+19475 19475 1.00000000000000e+00
+19476 19476 1.00000000000000e+00
+19477 19477 1.00000000000000e+00
+19478 19478 1.00000000000000e+00
+19479 19479 1.00000000000000e+00
+19480 19480 1.00000000000000e+00
+19481 19481 1.00000000000000e+00
+19482 19482 1.00000000000000e+00
+19483 19483 1.00000000000000e+00
+19484 19484 1.00000000000000e+00
+19485 19485 1.00000000000000e+00
+19486 19486 1.00000000000000e+00
+19487 19487 1.00000000000000e+00
+19488 5565 -2.72999557635261e-02
+19488 5589 -1.60538004493392e-02
+19488 5613 -1.64223745000000e-12
+19488 6141 -1.85121313218598e-01
+19488 6165 -3.50736818545118e+00
+19488 6189 -9.31015863958348e-01
+19488 6213 -4.92885197545329e-03
+19488 6717 -6.28923985187290e-07
+19488 6741 -3.93265630313751e+00
+19488 6765 -1.36483898526968e+01
+19488 6789 -1.33921351264526e+00
+19488 6813 -8.19121310477236e-03
+19488 7317 -4.29215165363153e-03
+19488 7341 -3.71267255159004e+00
+19488 7365 -4.42153745514164e+00
+19488 7389 -2.75221263027280e-01
+19488 7413 -1.55563455594225e-04
+19488 7917 -7.59934449608795e-04
+19488 7941 -1.34062314544311e-01
+19488 7965 -1.03422884076187e-01
+19488 7989 -4.98947752019853e-03
+19488 8565 -1.62243194400000e-11
+19488 8589 -2.67275633000000e-12
+19488 19488 1.00814082330136e+01
+19488 18672 5.60634833947531e-01
+19488 18696 3.52882545366819e-01
+19488 18720 2.07328938265868e-02
+19488 19080 4.17384933665300e+00
+19488 19104 2.58960730429121e+00
+19488 19128 1.43623610275629e-01
+19488 19512 5.52408794703340e+00
+19488 19536 2.80966808721883e-01
+19488 19896 5.11344358332101e+00
+19488 19920 3.01366476430736e+00
+19488 19944 1.30555135041958e-01
+19488 20304 7.95533395614533e-01
+19488 20328 4.58896910370858e-01
+19488 20352 1.74657750181689e-02
+19489 19489 1.00000000000000e+00
+19490 19490 1.00000000000000e+00
+19491 19491 1.00000000000000e+00
+19492 19492 1.00000000000000e+00
+19493 19493 1.00000000000000e+00
+19494 19494 1.00000000000000e+00
+19495 19495 1.00000000000000e+00
+19496 19496 1.00000000000000e+00
+19497 19497 1.00000000000000e+00
+19498 19498 1.00000000000000e+00
+19499 19499 1.00000000000000e+00
+19500 19500 1.00000000000000e+00
+19501 19501 1.00000000000000e+00
+19502 19502 1.00000000000000e+00
+19503 19503 1.00000000000000e+00
+19504 19504 1.00000000000000e+00
+19505 19505 1.00000000000000e+00
+19506 19506 1.00000000000000e+00
+19507 19507 1.00000000000000e+00
+19508 19508 1.00000000000000e+00
+19509 19509 1.00000000000000e+00
+19510 19510 1.00000000000000e+00
+19511 19511 1.00000000000000e+00
+19512 5565 -1.51031657139670e-02
+19512 5589 -9.46517302950717e-03
+19512 5613 -6.23034231000000e-12
+19512 6141 -9.76740571613008e-02
+19512 6165 -2.26455304050102e+00
+19512 6189 -1.14792032596768e+00
+19512 6213 -5.10251812906418e-02
+19512 6237 -5.95594804659713e-05
+19512 6717 -3.15062376914740e-07
+19512 6741 -2.21730298722638e+00
+19512 6765 -1.11982184290233e+01
+19512 6789 -4.42373616499346e+00
+19512 6813 -3.59609790199516e-01
+19512 6837 -3.92140677873941e-04
+19512 7317 -2.18156224160914e-03
+19512 7341 -2.29622406868495e+00
+19512 7365 -5.85915587839813e+00
+19512 7389 -3.15212942479745e+00
+19512 7413 -2.52605295670648e-01
+19512 7437 -5.82139999520669e-06
+19512 7917 -3.88025594488413e-04
+19512 7941 -1.16854240285122e-01
+19512 7965 -4.08296859121543e-01
+19512 7989 -2.68460388411370e-01
+19512 8013 -8.89962435477872e-03
+19512 8565 -3.77341038477298e-04
+19512 8589 -7.12208246196826e-04
+19512 8613 -6.97276547140000e-10
+19512 19512 8.16173749686308e+00
+19512 18672 3.52882545366819e-01
+19512 18696 4.92735384328554e-01
+19512 18720 1.87065967598066e-01
+19512 18744 2.60335980729298e-02
+19512 19080 2.58960730429121e+00
+19512 19104 3.51355052713257e+00
+19512 19128 1.40655976561496e+00
+19512 19152 2.08016331128107e-01
+19512 19488 5.52408794703340e+00
+19512 19536 2.98850003984698e+00
+19512 19560 4.66158201239847e-01
+19512 19896 3.01366476430736e+00
+19512 19920 3.53687360286299e+00
+19512 19944 1.33129786065526e+00
+19512 19968 2.02269330121855e-01
+19512 20304 4.58896910370858e-01
+19512 20328 4.98566153261160e-01
+19512 20352 1.68250491358143e-01
+19512 20376 2.45968478213669e-02
+19513 19513 1.00000000000000e+00
+19514 19514 1.00000000000000e+00
+19515 19515 1.00000000000000e+00
+19516 19516 1.00000000000000e+00
+19517 19517 1.00000000000000e+00
+19518 19518 1.00000000000000e+00
+19519 19519 1.00000000000000e+00
+19520 19520 1.00000000000000e+00
+19521 19521 1.00000000000000e+00
+19522 19522 1.00000000000000e+00
+19523 19523 1.00000000000000e+00
+19524 19524 1.00000000000000e+00
+19525 19525 1.00000000000000e+00
+19526 19526 1.00000000000000e+00
+19527 19527 1.00000000000000e+00
+19528 19528 1.00000000000000e+00
+19529 19529 1.00000000000000e+00
+19530 19530 1.00000000000000e+00
+19531 19531 1.00000000000000e+00
+19532 19532 1.00000000000000e+00
+19533 19533 1.00000000000000e+00
+19534 19534 1.00000000000000e+00
+19535 19535 1.00000000000000e+00
+19536 5565 -4.15196523486830e-04
+19536 5589 -4.10935087373680e-04
+19536 5613 -1.54549245000000e-12
+19536 6141 -1.46097158628627e-03
+19536 6165 -1.56376062952831e-01
+19536 6189 -4.57856882564994e-01
+19536 6213 -1.37572068971867e-01
+19536 6237 -7.09749042147098e-04
+19536 6717 -1.71538377450000e-10
+19536 6741 -7.17232553767053e-02
+19536 6765 -2.17167163998993e+00
+19536 6789 -6.39325921400946e+00
+19536 6813 -1.79075268972267e+00
+19536 6837 -4.81042644266766e-02
+19536 7317 -1.01389756552503e-05
+19536 7341 -1.34464897613044e-01
+19536 7365 -3.63348164739563e+00
+19536 7389 -1.00058294587789e+01
+19536 7413 -2.57969505935664e+00
+19536 7437 -5.91529245750109e-02
+19536 7917 -2.30239133829009e-06
+19536 7941 -2.09752511183679e-02
+19536 7965 -7.58041586363677e-01
+19536 7989 -1.59016329279604e+00
+19536 8013 -4.52565793524378e-01
+19536 8037 -3.53912977336368e-03
+19536 8565 -2.41855455161590e-03
+19536 8589 -2.20016673822271e-02
+19536 8613 -6.25604395553281e-03
+19536 19536 9.13287850138161e+00
+19536 18672 2.07328938265868e-02
+19536 18696 1.87065967598066e-01
+19536 18720 4.58342691413082e-01
+19536 18744 1.88423305970195e-01
+19536 18768 2.10722284196189e-02
+19536 19080 1.43623610275629e-01
+19536 19104 1.40655976561496e+00
+19536 19128 3.64388340608846e+00
+19536 19152 1.52005931556464e+00
+19536 19176 1.71998497763048e-01
+19536 19488 2.80966808721883e-01
+19536 19512 2.98850003984698e+00
+19536 19560 3.43815469624700e+00
+19536 19584 3.93380472821887e-01
+19536 19896 1.30555135041958e-01
+19536 19920 1.33129786065527e+00
+19536 19944 3.54045363333219e+00
+19536 19968 1.50343418584935e+00
+19536 19992 1.73589216340478e-01
+19536 20304 1.74657750181689e-02
+19536 20328 1.68250491358143e-01
+19536 20352 4.32485248224015e-01
+19536 20376 1.84267023541372e-01
+19536 20400 2.14699080639762e-02
+19537 19537 1.00000000000000e+00
+19538 19538 1.00000000000000e+00
+19539 19539 1.00000000000000e+00
+19540 19540 1.00000000000000e+00
+19541 19541 1.00000000000000e+00
+19542 19542 1.00000000000000e+00
+19543 19543 1.00000000000000e+00
+19544 19544 1.00000000000000e+00
+19545 19545 1.00000000000000e+00
+19546 19546 1.00000000000000e+00
+19547 19547 1.00000000000000e+00
+19548 19548 1.00000000000000e+00
+19549 19549 1.00000000000000e+00
+19550 19550 1.00000000000000e+00
+19551 19551 1.00000000000000e+00
+19552 19552 1.00000000000000e+00
+19553 19553 1.00000000000000e+00
+19554 19554 1.00000000000000e+00
+19555 19555 1.00000000000000e+00
+19556 19556 1.00000000000000e+00
+19557 19557 1.00000000000000e+00
+19558 19558 1.00000000000000e+00
+19559 19559 1.00000000000000e+00
+19560 5589 -7.46393400000000e-14
+19560 6165 -2.80363635072946e-03
+19560 6189 -7.60852993516103e-02
+19560 6213 -6.09726191576294e-02
+19560 6237 -1.97908944809913e-03
+19560 6741 -4.35062775778442e-06
+19560 6765 -2.48937627752007e-01
+19560 6789 -2.16294920165834e+00
+19560 6813 -2.32104302524854e+00
+19560 6837 -2.95079386881859e-01
+19560 6861 -2.69918411505053e-03
+19560 7341 -2.36456528890262e-03
+19560 7365 -7.70581711034168e-01
+19560 7389 -7.17876805185171e+00
+19560 7413 -7.84475762036908e+00
+19560 7437 -9.41794062802636e-01
+19560 7461 -7.63644529673767e-03
+19560 7941 -1.81463814625544e-03
+19560 7965 -2.92463126461182e-01
+19560 7989 -2.79102250318822e+00
+19560 8013 -2.98627124706641e+00
+19560 8037 -4.23340971250763e-01
+19560 8061 -3.25705673696318e-04
+19560 8565 -4.02285784986320e-03
+19560 8589 -1.07211408631075e-01
+19560 8613 -1.34270192548722e-01
+19560 8637 -1.14567772184785e-02
+19560 9189 -3.73102447881600e-08
+19560 9213 -7.48228670978547e-06
+19560 9237 -5.47964570785980e-07
+19560 19560 8.12365760161957e+00
+19560 18696 2.60335980729298e-02
+19560 18720 1.88423305970195e-01
+19560 18744 3.82946740255824e-01
+19560 18768 1.63318863554444e-01
+19560 18792 1.97574874689921e-02
+19560 19104 2.08016331128107e-01
+19560 19128 1.52005931556464e+00
+19560 19152 3.11986350731981e+00
+19560 19176 1.32747883898367e+00
+19560 19200 1.59871211982866e-01
+19560 19512 4.66158201239847e-01
+19560 19536 3.43815469624700e+00
+19560 19584 3.02716923220474e+00
+19560 19608 3.63411835229283e-01
+19560 19920 2.02269330121855e-01
+19560 19944 1.50343418584935e+00
+19560 19968 3.14169525100726e+00
+19560 19992 1.34235070311271e+00
+19560 20016 1.61998459437697e-01
+19560 20328 2.45968478213669e-02
+19560 20352 1.84267023541372e-01
+19560 20376 3.88404676177686e-01
+19560 20400 1.67036829586704e-01
+19560 20424 2.02892993326998e-02
+19561 19561 1.00000000000000e+00
+19562 19562 1.00000000000000e+00
+19563 19563 1.00000000000000e+00
+19564 19564 1.00000000000000e+00
+19565 19565 1.00000000000000e+00
+19566 19566 1.00000000000000e+00
+19567 19567 1.00000000000000e+00
+19568 19568 1.00000000000000e+00
+19569 19569 1.00000000000000e+00
+19570 19570 1.00000000000000e+00
+19571 19571 1.00000000000000e+00
+19572 19572 1.00000000000000e+00
+19573 19573 1.00000000000000e+00
+19574 19574 1.00000000000000e+00
+19575 19575 1.00000000000000e+00
+19576 19576 1.00000000000000e+00
+19577 19577 1.00000000000000e+00
+19578 19578 1.00000000000000e+00
+19579 19579 1.00000000000000e+00
+19580 19580 1.00000000000000e+00
+19581 19581 1.00000000000000e+00
+19582 19582 1.00000000000000e+00
+19583 19583 1.00000000000000e+00
+19584 6189 -1.42313807385478e-03
+19584 6213 -7.58954126479085e-03
+19584 6237 -6.05453066284443e-04
+19584 6765 -1.93029350231710e-04
+19584 6789 -1.98701968048531e-01
+19584 6813 -8.49994985456517e-01
+19584 6837 -5.08138615513831e-01
+19584 6861 -2.16163911218320e-02
+19584 6885 -8.91149563795797e-06
+19584 7365 -1.95621366677707e-02
+19584 7389 -1.56150964536205e+00
+19584 7413 -6.93663822977322e+00
+19584 7437 -3.67439368781381e+00
+19584 7461 -2.24619371477821e-01
+19584 7485 -2.10501275725715e-04
+19584 7965 -3.11108491462266e-02
+19584 7989 -1.30451795486918e+00
+19584 8013 -6.23407982509963e+00
+19584 8037 -3.39171852619205e+00
+19584 8061 -2.06892058201995e-01
+19584 8085 -1.22463021456099e-05
+19584 8565 -9.44207889060278e-04
+19584 8589 -1.41157639159405e-01
+19584 8613 -6.48829834041647e-01
+19584 8637 -3.52156070294241e-01
+19584 8661 -1.26258116673757e-02
+19584 9189 -2.47764597396870e-07
+19584 9213 -1.79342829018033e-03
+19584 9237 -2.41400275343930e-03
+19584 9261 -1.40505858852180e-07
+19584 19584 7.55985454896843e+00
+19584 18720 2.10722284196189e-02
+19584 18744 1.63318863554444e-01
+19584 18768 3.56434052889109e-01
+19584 18792 1.55998049738432e-01
+19584 18816 1.92420249656160e-02
+19584 19128 1.71998497763048e-01
+19584 19152 1.32747883898367e+00
+19584 19176 2.88497387994914e+00
+19584 19200 1.25962880977219e+00
+19584 19224 1.55035990460178e-01
+19584 19536 3.93380472821887e-01
+19584 19560 3.02716923220474e+00
+19584 19608 2.86118619082832e+00
+19584 19632 3.51884712477784e-01
+19584 19944 1.73589216340478e-01
+19584 19968 1.34235070311271e+00
+19584 19992 2.92511695842665e+00
+19584 20016 1.28620340208265e+00
+19584 20040 1.59552391082961e-01
+19584 20352 2.14699080639762e-02
+19584 20376 1.67036829586704e-01
+19584 20400 3.66469822508484e-01
+19584 20424 1.62641697816046e-01
+19584 20448 2.03711251213117e-02
+19585 19585 1.00000000000000e+00
+19586 19586 1.00000000000000e+00
+19587 19587 1.00000000000000e+00
+19588 19588 1.00000000000000e+00
+19589 19589 1.00000000000000e+00
+19590 19590 1.00000000000000e+00
+19591 19591 1.00000000000000e+00
+19592 19592 1.00000000000000e+00
+19593 19593 1.00000000000000e+00
+19594 19594 1.00000000000000e+00
+19595 19595 1.00000000000000e+00
+19596 19596 1.00000000000000e+00
+19597 19597 1.00000000000000e+00
+19598 19598 1.00000000000000e+00
+19599 19599 1.00000000000000e+00
+19600 19600 1.00000000000000e+00
+19601 19601 1.00000000000000e+00
+19602 19602 1.00000000000000e+00
+19603 19603 1.00000000000000e+00
+19604 19604 1.00000000000000e+00
+19605 19605 1.00000000000000e+00
+19606 19606 1.00000000000000e+00
+19607 19607 1.00000000000000e+00
+19608 6213 -4.63546319988546e-05
+19608 6237 -3.34854865003076e-05
+19608 6789 -7.78915299212615e-04
+19608 6813 -9.71852575256471e-02
+19608 6837 -2.18693144643874e-01
+19608 6861 -4.78374423681392e-02
+19608 6885 -8.04923988436113e-05
+19608 7389 -7.96429948358928e-02
+19608 7413 -1.86500071194450e+00
+19608 7437 -3.99347476231918e+00
+19608 7461 -1.07520244867280e+00
+19608 7485 -2.93382054589841e-02
+19608 7965 -1.88711314146379e-05
+19608 7989 -1.85449956010226e-01
+19608 8013 -3.64136977461597e+00
+19608 8037 -8.46920094647185e+00
+19608 8061 -2.14744083978136e+00
+19608 8085 -5.25159046809861e-02
+19608 8565 -8.75431199719518e-06
+19608 8589 -3.97012792058173e-02
+19608 8613 -9.67683053614519e-01
+19608 8637 -1.93651044840107e+00
+19608 8661 -5.59277921064762e-01
+19608 8685 -4.92164144620347e-03
+19608 9189 -4.31404717765020e-07
+19608 9213 -9.66017648426737e-03
+19608 9237 -4.71831589024664e-02
+19608 9261 -1.13664813412546e-02
+19608 19608 7.34294864953847e+00
+19608 18744 1.97574874689921e-02
+19608 18768 1.55998049738432e-01
+19608 18792 3.46520151232713e-01
+19608 18816 1.52529157117924e-01
+19608 18840 1.88902643138649e-02
+19608 19152 1.59871211982866e-01
+19608 19176 1.25962880977219e+00
+19608 19200 2.79375021560829e+00
+19608 19224 1.23335658689082e+00
+19608 19248 1.53303156262525e-01
+19608 19560 3.63411835229283e-01
+19608 19584 2.86118619082832e+00
+19608 19632 2.80506450856887e+00
+19608 19656 3.49381414664419e-01
+19608 19968 1.61998459437697e-01
+19608 19992 1.28620340208265e+00
+19608 20016 2.87066983306137e+00
+19608 20040 1.26154202951684e+00
+19608 20064 1.55833116296245e-01
+19608 20376 2.02892993326998e-02
+19608 20400 1.62641697816046e-01
+19608 20424 3.65750055595983e-01
+19608 20448 1.59575517774427e-01
+19608 20472 1.95227543222949e-02
+19609 19609 1.00000000000000e+00
+19610 19610 1.00000000000000e+00
+19611 19611 1.00000000000000e+00
+19612 19612 1.00000000000000e+00
+19613 19613 1.00000000000000e+00
+19614 19614 1.00000000000000e+00
+19615 19615 1.00000000000000e+00
+19616 19616 1.00000000000000e+00
+19617 19617 1.00000000000000e+00
+19618 19618 1.00000000000000e+00
+19619 19619 1.00000000000000e+00
+19620 19620 1.00000000000000e+00
+19621 19621 1.00000000000000e+00
+19622 19622 1.00000000000000e+00
+19623 19623 1.00000000000000e+00
+19624 19624 1.00000000000000e+00
+19625 19625 1.00000000000000e+00
+19626 19626 1.00000000000000e+00
+19627 19627 1.00000000000000e+00
+19628 19628 1.00000000000000e+00
+19629 19629 1.00000000000000e+00
+19630 19630 1.00000000000000e+00
+19631 19631 1.00000000000000e+00
+19632 6813 -9.28518009400147e-04
+19632 6837 -2.92174748184043e-02
+19632 6861 -1.82588596240220e-02
+19632 6885 -1.88632296335792e-04
+19632 7389 -3.91749617691150e-07
+19632 7413 -1.39874140180185e-01
+19632 7437 -1.24030980514069e+00
+19632 7461 -1.41055889312212e+00
+19632 7485 -1.75026824014734e-01
+19632 7509 -1.27623034386603e-03
+19632 7989 -1.89638474168434e-03
+19632 8013 -6.40927707820468e-01
+19632 8037 -6.03043027825396e+00
+19632 8061 -6.53788922342877e+00
+19632 8085 -7.75414771434271e-01
+19632 8109 -6.53347571849009e-03
+19632 8589 -2.45335414009302e-03
+19632 8613 -3.49928920340790e-01
+19632 8637 -3.29949882568259e+00
+19632 8661 -3.51256895453248e+00
+19632 8685 -4.78760119398735e-01
+19632 8709 -4.98462211108425e-04
+19632 9189 -9.85236182442100e-08
+19632 9213 -1.21795169504234e-02
+19632 9237 -2.01108282090769e-01
+19632 9261 -2.18551967117544e-01
+19632 9285 -2.03097815182612e-02
+19632 9837 -1.05957427505543e-05
+19632 9861 -1.86508968564515e-04
+19632 9885 -7.58338003402632e-06
+19632 19632 7.28740210760271e+00
+19632 18768 1.92420249656160e-02
+19632 18792 1.52529157117924e-01
+19632 18816 3.40173414020676e-01
+19632 18840 1.50309697388344e-01
+19632 18864 1.86871600332210e-02
+19632 19176 1.55035990460178e-01
+19632 19200 1.23335658689082e+00
+19632 19224 2.75942208636537e+00
+19632 19248 1.21935500786909e+00
+19632 19272 1.51535595704744e-01
+19632 19584 3.51884712477784e-01
+19632 19608 2.80506450856887e+00
+19632 19656 2.77918470063369e+00
+19632 19680 3.45414760493990e-01
+19632 19992 1.59552391082961e-01
+19632 20016 1.26154202951684e+00
+19632 20040 2.80798832008810e+00
+19632 20064 1.24375673824569e+00
+19632 20088 1.55106068265173e-01
+19632 20400 2.03711251213117e-02
+19632 20424 1.59575517774427e-01
+19632 20448 3.52314972451359e-01
+19632 20472 1.56410129982493e-01
+19632 20496 1.95797781733282e-02
+19633 19633 1.00000000000000e+00
+19634 19634 1.00000000000000e+00
+19635 19635 1.00000000000000e+00
+19636 19636 1.00000000000000e+00
+19637 19637 1.00000000000000e+00
+19638 19638 1.00000000000000e+00
+19639 19639 1.00000000000000e+00
+19640 19640 1.00000000000000e+00
+19641 19641 1.00000000000000e+00
+19642 19642 1.00000000000000e+00
+19643 19643 1.00000000000000e+00
+19644 19644 1.00000000000000e+00
+19645 19645 1.00000000000000e+00
+19646 19646 1.00000000000000e+00
+19647 19647 1.00000000000000e+00
+19648 19648 1.00000000000000e+00
+19649 19649 1.00000000000000e+00
+19650 19650 1.00000000000000e+00
+19651 19651 1.00000000000000e+00
+19652 19652 1.00000000000000e+00
+19653 19653 1.00000000000000e+00
+19654 19654 1.00000000000000e+00
+19655 19655 1.00000000000000e+00
+19656 6837 -4.48079598200331e-04
+19656 6861 -1.86222575103139e-03
+19656 6885 -4.61869584146426e-05
+19656 7413 -5.60742176785086e-05
+19656 7437 -1.12540250718606e-01
+19656 7461 -4.97254905233339e-01
+19656 7485 -2.84162572146212e-01
+19656 7509 -9.04705997000780e-03
+19656 7533 -2.55683926896930e-07
+19656 8013 -1.54562329970989e-02
+19656 8037 -1.30220261752320e+00
+19656 8061 -5.55216590365650e+00
+19656 8085 -2.88002145247028e+00
+19656 8109 -1.69941020545758e-01
+19656 8133 -1.27258756124394e-04
+19656 8613 -3.61825963381655e-02
+19656 8637 -1.47822609499834e+00
+19656 8661 -6.94373649909147e+00
+19656 8685 -3.58766882084474e+00
+19656 8709 -2.08634239809660e-01
+19656 8733 -2.21422910102269e-05
+19656 9213 -2.68360686543643e-03
+19656 9237 -2.35359211128363e-01
+19656 9261 -9.83374149245046e-01
+19656 9285 -5.14869724059547e-01
+19656 9309 -2.04237157877317e-02
+19656 9837 -5.77838800737370e-05
+19656 9861 -6.87824803542513e-03
+19656 9885 -6.56477375214336e-03
+19656 9909 -2.01560395289946e-06
+19656 19656 7.21643411078449e+00
+19656 18792 1.88902643138649e-02
+19656 18816 1.50309697388344e-01
+19656 18840 3.36601532325880e-01
+19656 18864 1.49615470054803e-01
+19656 18888 1.87167074804798e-02
+19656 19200 1.53303156262525e-01
+19656 19224 1.21935500786909e+00
+19656 19248 2.72824251965546e+00
+19656 19272 1.20762171128691e+00
+19656 19296 1.50369832116981e-01
+19656 19608 3.49381414664419e-01
+19656 19632 2.77918470063369e+00
+19656 19680 2.74332515484008e+00
+19656 19704 3.40416528216016e-01
+19656 20016 1.55833116296245e-01
+19656 20040 1.24375673824568e+00
+19656 20064 2.79178445855528e+00
+19656 20088 1.23744127312556e+00
+19656 20112 1.54254250016213e-01
+19656 20424 1.95227543222949e-02
+19656 20448 1.56410129982493e-01
+19656 20472 3.52487017050835e-01
+19656 20496 1.57070360514464e-01
+19656 20520 1.96878119552877e-02
+19657 19657 1.00000000000000e+00
+19658 19658 1.00000000000000e+00
+19659 19659 1.00000000000000e+00
+19660 19660 1.00000000000000e+00
+19661 19661 1.00000000000000e+00
+19662 19662 1.00000000000000e+00
+19663 19663 1.00000000000000e+00
+19664 19664 1.00000000000000e+00
+19665 19665 1.00000000000000e+00
+19666 19666 1.00000000000000e+00
+19667 19667 1.00000000000000e+00
+19668 19668 1.00000000000000e+00
+19669 19669 1.00000000000000e+00
+19670 19670 1.00000000000000e+00
+19671 19671 1.00000000000000e+00
+19672 19672 1.00000000000000e+00
+19673 19673 1.00000000000000e+00
+19674 19674 1.00000000000000e+00
+19675 19675 1.00000000000000e+00
+19676 19676 1.00000000000000e+00
+19677 19677 1.00000000000000e+00
+19678 19678 1.00000000000000e+00
+19679 19679 1.00000000000000e+00
+19680 6861 -6.46536115564740e-07
+19680 6885 -3.35135530715780e-07
+19680 7437 -2.69100304160322e-04
+19680 7461 -5.29520423692178e-02
+19680 7485 -1.10295881093749e-01
+19680 7509 -1.73529761959173e-02
+19680 7533 -1.64776284888536e-06
+19680 8037 -6.19881299017586e-02
+19680 8061 -1.41063348630125e+00
+19680 8085 -2.89436506660368e+00
+19680 8109 -7.69802226468792e-01
+19680 8133 -1.84595574985236e-02
+19680 8613 -2.60766096089590e-05
+19680 8637 -2.00674644131230e-01
+19680 8661 -3.78016253433075e+00
+19680 8685 -8.39721704320000e+00
+19680 8709 -2.02056147413534e+00
+19680 8733 -4.94282254897328e-02
+19680 9213 -2.12273103108987e-05
+19680 9237 -6.29703485864411e-02
+19680 9261 -1.33485408307054e+00
+19680 9285 -2.63136498869217e+00
+19680 9309 -7.35882102626065e-01
+19680 9333 -6.99137529405230e-03
+19680 9837 -7.21993790366341e-05
+19680 9861 -3.06819938875631e-02
+19680 9885 -9.59646298107570e-02
+19680 9909 -2.10748455066426e-02
+19680 9933 -8.44638357170000e-10
+19680 10485 -2.67149432083500e-08
+19680 10509 -1.74352105968200e-08
+19680 19680 7.14026111656756e+00
+19680 18816 1.86871600332210e-02
+19680 18840 1.49615470054803e-01
+19680 18864 3.36784571584672e-01
+19680 18888 1.49387197377012e-01
+19680 18912 1.86300918637733e-02
+19680 19224 1.51535595704744e-01
+19680 19248 1.20762171128691e+00
+19680 19272 2.70952052632652e+00
+19680 19296 1.20974979546801e+00
+19680 19320 1.52067616750017e-01
+19680 19632 3.45414760493990e-01
+19680 19656 2.74332515484008e+00
+19680 19704 2.75439373133251e+00
+19680 19728 3.48181904617097e-01
+19680 20040 1.55106068265173e-01
+19680 20064 1.23744127312556e+00
+19680 20088 2.77817258011407e+00
+19680 20112 1.23701104642262e+00
+19680 20136 1.54998511589438e-01
+19680 20448 1.95797781733282e-02
+19680 20472 1.57070360514464e-01
+19680 20496 3.53947585031560e-01
+19680 20520 1.56202510115665e-01
+19680 20544 1.93628155736287e-02
+19681 19681 1.00000000000000e+00
+19682 19682 1.00000000000000e+00
+19683 19683 1.00000000000000e+00
+19684 19684 1.00000000000000e+00
+19685 19685 1.00000000000000e+00
+19686 19686 1.00000000000000e+00
+19687 19687 1.00000000000000e+00
+19688 19688 1.00000000000000e+00
+19689 19689 1.00000000000000e+00
+19690 19690 1.00000000000000e+00
+19691 19691 1.00000000000000e+00
+19692 19692 1.00000000000000e+00
+19693 19693 1.00000000000000e+00
+19694 19694 1.00000000000000e+00
+19695 19695 1.00000000000000e+00
+19696 19696 1.00000000000000e+00
+19697 19697 1.00000000000000e+00
+19698 19698 1.00000000000000e+00
+19699 19699 1.00000000000000e+00
+19700 19700 1.00000000000000e+00
+19701 19701 1.00000000000000e+00
+19702 19702 1.00000000000000e+00
+19703 19703 1.00000000000000e+00
+19704 7461 -3.88327097074177e-04
+19704 7485 -1.27531411453202e-02
+19704 7509 -5.17490449004984e-03
+19704 7533 -2.75579249208747e-06
+19704 8037 -3.01603641067000e-09
+19704 8061 -9.43825694898244e-02
+19704 8085 -8.34174209426217e-01
+19704 8109 -9.24693753917565e-01
+19704 8133 -1.05165732007158e-01
+19704 8157 -5.12372734049634e-04
+19704 8637 -1.61402046852437e-03
+19704 8661 -6.27511702787334e-01
+19704 8685 -5.60361692656973e+00
+19704 8709 -5.80227885164798e+00
+19704 8733 -6.59599075902187e-01
+19704 8757 -5.60266975200132e-03
+19704 9237 -3.60383670497818e-03
+19704 9261 -4.52262731923139e-01
+19704 9285 -4.15319957528697e+00
+19704 9309 -4.28272850225022e+00
+19704 9333 -5.44017519973765e-01
+19704 9357 -7.57131174518657e-04
+19704 9837 -1.54009090715200e-05
+19704 9861 -3.00451118904870e-02
+19704 9885 -3.62324339704623e-01
+19704 9909 -3.57021004769817e-01
+19704 9933 -3.57113108533596e-02
+19704 10485 -1.74967604472405e-04
+19704 10509 -1.25262710500993e-03
+19704 10533 -3.89310030356545e-05
+19704 19704 7.25784715332251e+00
+19704 18840 1.87167074804798e-02
+19704 18864 1.49387197377012e-01
+19704 18888 3.35688441614716e-01
+19704 18912 1.50081424710550e-01
+19704 18936 1.88902643138643e-02
+19704 19248 1.50369832116981e-01
+19704 19272 1.20974979546801e+00
+19704 19296 2.73598085723523e+00
+19704 19320 1.21838709547177e+00
+19704 19344 1.52529157117921e-01
+19704 19656 3.40416528216016e-01
+19704 19680 2.75439373133251e+00
+19704 19728 2.77880822339929e+00
+19704 19752 3.46520151232713e-01
+19704 20064 1.54254250016213e-01
+19704 20088 1.23701104642262e+00
+19704 20112 2.79022848518572e+00
+19704 20136 1.24398624531150e+00
+19704 20160 1.55998049738432e-01
+19704 20472 1.96878119552877e-02
+19704 20496 1.56202510115665e-01
+19704 20520 3.49250348602338e-01
+19704 20544 1.56481212170483e-01
+19704 20568 1.97574874689921e-02
+19705 19705 1.00000000000000e+00
+19706 19706 1.00000000000000e+00
+19707 19707 1.00000000000000e+00
+19708 19708 1.00000000000000e+00
+19709 19709 1.00000000000000e+00
+19710 19710 1.00000000000000e+00
+19711 19711 1.00000000000000e+00
+19712 19712 1.00000000000000e+00
+19713 19713 1.00000000000000e+00
+19714 19714 1.00000000000000e+00
+19715 19715 1.00000000000000e+00
+19716 19716 1.00000000000000e+00
+19717 19717 1.00000000000000e+00
+19718 19718 1.00000000000000e+00
+19719 19719 1.00000000000000e+00
+19720 19720 1.00000000000000e+00
+19721 19721 1.00000000000000e+00
+19722 19722 1.00000000000000e+00
+19723 19723 1.00000000000000e+00
+19724 19724 1.00000000000000e+00
+19725 19725 1.00000000000000e+00
+19726 19726 1.00000000000000e+00
+19727 19727 1.00000000000000e+00
+19728 7485 -1.03213653480996e-04
+19728 7509 -3.08191473876536e-04
+19728 7533 -6.25027141297630e-07
+19728 8061 -1.09340842857508e-05
+19728 8085 -6.74916128452636e-02
+19728 8109 -3.03095516402847e-01
+19728 8133 -1.55713479595496e-01
+19728 8157 -3.14675205445585e-03
+19728 8661 -1.29819148068440e-02
+19728 8685 -1.14368139928724e+00
+19728 8709 -4.54342432343409e+00
+19728 8733 -2.30931516770855e+00
+19728 8757 -1.30268316315287e-01
+19728 8781 -7.18384143752472e-05
+19728 9261 -4.32773454137629e-02
+19728 9285 -1.73159753784729e+00
+19728 9309 -7.82063470981181e+00
+19728 9333 -3.84397367768757e+00
+19728 9357 -2.15879675201232e-01
+19728 9381 -2.76739317972476e-05
+19728 9861 -6.15205480232570e-03
+19728 9885 -3.81038440366007e-01
+19728 9909 -1.49717127446903e+00
+19728 9933 -7.66829074925700e-01
+19728 9957 -3.19984746935336e-02
+19728 10485 -8.50483332369760e-04
+19728 10509 -2.16090931874474e-02
+19728 10533 -1.51559787944265e-02
+19728 10557 -1.38112665047090e-05
+19728 19728 7.24442172701008e+00
+19728 18864 1.86300918637733e-02
+19728 18888 1.50081424710550e-01
+19728 18912 3.40309845637370e-01
+19728 18936 1.53303156262525e-01
+19728 18960 1.94355247517668e-02
+19728 19272 1.52067616750017e-01
+19728 19296 1.21838709547177e+00
+19728 19320 2.74834412024160e+00
+19728 19344 1.23335658689084e+00
+19728 19368 1.55809989604785e-01
+19728 19680 3.48181904617097e-01
+19728 19704 2.77880822339929e+00
+19728 19752 2.79375021560836e+00
+19728 19776 3.51917402669363e-01
+19728 20088 1.54998511589438e-01
+19728 20112 1.24398624531150e+00
+19728 20136 2.80987646010903e+00
+19728 20160 1.25962880977222e+00
+19728 20184 1.58909152704619e-01
+19728 20496 1.93628155736287e-02
+19728 20520 1.56481212170483e-01
+19728 20544 3.55692930604228e-01
+19728 20568 1.59871211982870e-01
+19728 20592 2.02103155267253e-02
+19729 19729 1.00000000000000e+00
+19730 19730 1.00000000000000e+00
+19731 19731 1.00000000000000e+00
+19732 19732 1.00000000000000e+00
+19733 19733 1.00000000000000e+00
+19734 19734 1.00000000000000e+00
+19735 19735 1.00000000000000e+00
+19736 19736 1.00000000000000e+00
+19737 19737 1.00000000000000e+00
+19738 19738 1.00000000000000e+00
+19739 19739 1.00000000000000e+00
+19740 19740 1.00000000000000e+00
+19741 19741 1.00000000000000e+00
+19742 19742 1.00000000000000e+00
+19743 19743 1.00000000000000e+00
+19744 19744 1.00000000000000e+00
+19745 19745 1.00000000000000e+00
+19746 19746 1.00000000000000e+00
+19747 19747 1.00000000000000e+00
+19748 19748 1.00000000000000e+00
+19749 19749 1.00000000000000e+00
+19750 19750 1.00000000000000e+00
+19751 19751 1.00000000000000e+00
+19752 8085 -8.04923988436100e-05
+19752 8109 -2.93382054589833e-02
+19752 8133 -5.25159046809857e-02
+19752 8157 -4.92164144620360e-03
+19752 8685 -4.78374423681392e-02
+19752 8709 -1.07520244867281e+00
+19752 8733 -2.14744083978141e+00
+19752 8757 -5.59277921064774e-01
+19752 8781 -1.13664813412543e-02
+19752 9261 -3.34854865003075e-05
+19752 9285 -2.18693144643847e-01
+19752 9309 -3.99347476231928e+00
+19752 9333 -8.46920094647210e+00
+19752 9357 -1.93651044840107e+00
+19752 9381 -4.71831589024652e-02
+19752 9861 -4.63546319988544e-05
+19752 9885 -9.71852575256478e-02
+19752 9909 -1.86500071194457e+00
+19752 9933 -3.64136977461606e+00
+19752 9957 -9.67683053614502e-01
+19752 9981 -9.66017648426708e-03
+19752 10485 -7.78915299212640e-04
+19752 10509 -7.96429948358956e-02
+19752 10533 -1.85449956010229e-01
+19752 10557 -3.97012792058170e-02
+19752 10581 -4.31404717765000e-07
+19752 11133 -1.88711314146378e-05
+19752 11157 -8.75431199719517e-06
+19752 19752 7.34294864953871e+00
+19752 18888 1.88902643138643e-02
+19752 18912 1.53303156262525e-01
+19752 18936 3.49381414664428e-01
+19752 18960 1.55833116296245e-01
+19752 18984 1.95227543222945e-02
+19752 19296 1.52529157117921e-01
+19752 19320 1.23335658689084e+00
+19752 19344 2.80506450856896e+00
+19752 19368 1.26154202951684e+00
+19752 19392 1.59575517774422e-01
+19752 19704 3.46520151232713e-01
+19752 19728 2.79375021560836e+00
+19752 19776 2.87066983306139e+00
+19752 19800 3.65750055595972e-01
+19752 20112 1.55998049738432e-01
+19752 20136 1.25962880977222e+00
+19752 20160 2.86118619082843e+00
+19752 20184 1.28620340208266e+00
+19752 20208 1.62641697816043e-01
+19752 20520 1.97574874689921e-02
+19752 20544 1.59871211982870e-01
+19752 20568 3.63411835229297e-01
+19752 20592 1.61998459437700e-01
+19752 20616 2.02892993326998e-02
+19753 19753 1.00000000000000e+00
+19754 19754 1.00000000000000e+00
+19755 19755 1.00000000000000e+00
+19756 19756 1.00000000000000e+00
+19757 19757 1.00000000000000e+00
+19758 19758 1.00000000000000e+00
+19759 19759 1.00000000000000e+00
+19760 19760 1.00000000000000e+00
+19761 19761 1.00000000000000e+00
+19762 19762 1.00000000000000e+00
+19763 19763 1.00000000000000e+00
+19764 19764 1.00000000000000e+00
+19765 19765 1.00000000000000e+00
+19766 19766 1.00000000000000e+00
+19767 19767 1.00000000000000e+00
+19768 19768 1.00000000000000e+00
+19769 19769 1.00000000000000e+00
+19770 19770 1.00000000000000e+00
+19771 19771 1.00000000000000e+00
+19772 19772 1.00000000000000e+00
+19773 19773 1.00000000000000e+00
+19774 19774 1.00000000000000e+00
+19775 19775 1.00000000000000e+00
+19776 8109 -1.53172366412976e-04
+19776 8133 -4.85672977793062e-03
+19776 8157 -1.17815807475612e-03
+19776 8709 -6.33960961775780e-02
+19776 8733 -5.74376861200495e-01
+19776 8757 -6.13801984343052e-01
+19776 8781 -6.23693251947754e-02
+19776 8805 -1.52757987606123e-04
+19776 9285 -1.31385706373236e-03
+19776 9309 -6.28313393694483e-01
+19776 9333 -5.25957862952257e+00
+19776 9357 -5.24984454072550e+00
+19776 9381 -5.99376677632753e-01
+19776 9405 -5.05902499824337e-03
+19776 9885 -5.16812501595190e-03
+19776 9909 -5.92579518169768e-01
+19776 9933 -5.31142189658314e+00
+19776 9957 -5.35935612814158e+00
+19776 9981 -6.58101042165486e-01
+19776 10005 -1.21445491145514e-03
+19776 10485 -1.51013638628267e-04
+19776 10509 -6.46783074103005e-02
+19776 10533 -6.39847535218475e-01
+19776 10557 -6.07890324229372e-01
+19776 10581 -6.57338060232611e-02
+19776 11133 -1.29536421402409e-03
+19776 11157 -5.15015269182182e-03
+19776 11181 -1.43822464621433e-04
+19776 19776 7.59293535998886e+00
+19776 18912 1.94355247517668e-02
+19776 18936 1.55833116296245e-01
+19776 18960 3.53543269490997e-01
+19776 18984 1.65065719619254e-01
+19776 19008 2.17436755825191e-02
+19776 19320 1.55809989604785e-01
+19776 19344 1.26154202951684e+00
+19776 19368 2.88240510455081e+00
+19776 19392 1.33184939331854e+00
+19776 19416 1.73386830555210e-01
+19776 19728 3.51917402669363e-01
+19776 19752 2.87066983306139e+00
+19776 19800 3.01906849351881e+00
+19776 19824 3.89017067783714e-01
+19776 20136 1.58909152704619e-01
+19776 20160 1.28620340208266e+00
+19776 20184 2.93408796318915e+00
+19776 20208 1.34221337297530e+00
+19776 20232 1.72911645427777e-01
+19776 20544 2.02103155267253e-02
+19776 20568 1.61998459437700e-01
+19776 20592 3.66463984150582e-01
+19776 20616 1.67656714533442e-01
+19776 20640 2.16248793006608e-02
+19777 19777 1.00000000000000e+00
+19778 19778 1.00000000000000e+00
+19779 19779 1.00000000000000e+00
+19780 19780 1.00000000000000e+00
+19781 19781 1.00000000000000e+00
+19782 19782 1.00000000000000e+00
+19783 19783 1.00000000000000e+00
+19784 19784 1.00000000000000e+00
+19785 19785 1.00000000000000e+00
+19786 19786 1.00000000000000e+00
+19787 19787 1.00000000000000e+00
+19788 19788 1.00000000000000e+00
+19789 19789 1.00000000000000e+00
+19790 19790 1.00000000000000e+00
+19791 19791 1.00000000000000e+00
+19792 19792 1.00000000000000e+00
+19793 19793 1.00000000000000e+00
+19794 19794 1.00000000000000e+00
+19795 19795 1.00000000000000e+00
+19796 19796 1.00000000000000e+00
+19797 19797 1.00000000000000e+00
+19798 19798 1.00000000000000e+00
+19799 19799 1.00000000000000e+00
+19800 8133 -9.82651904440193e-06
+19800 8157 -2.02242391247017e-05
+19800 8709 -9.73631128109060e-07
+19800 8733 -4.08970490628925e-02
+19800 8757 -1.90167096788183e-01
+19800 8781 -8.46942034598083e-02
+19800 8805 -8.34346672447800e-04
+19800 9309 -1.10223094013722e-02
+19800 9333 -1.01643732635629e+00
+19800 9357 -3.93415720552657e+00
+19800 9381 -2.05289357518911e+00
+19800 9405 -1.15666008616457e-01
+19800 9429 -4.66156117325992e-05
+19800 9909 -5.20208389584619e-02
+19800 9933 -2.10508368685634e+00
+19800 9957 -9.44829471250622e+00
+19800 9981 -4.72026243498156e+00
+19800 10005 -2.74822116270485e-01
+19800 10029 -3.23866062505972e-05
+19800 10509 -1.23920601170133e-02
+19800 10533 -6.26267686291773e-01
+19800 10557 -2.46519311508997e+00
+19800 10581 -1.35589596977100e+00
+19800 10605 -6.04023209590295e-02
+19800 11133 -5.60829570506776e-03
+19800 11157 -6.35762543224470e-02
+19800 11181 -3.63021842950985e-02
+19800 11205 -8.30543836997982e-05
+19800 19800 8.06500579410412e+00
+19800 18936 1.95227543222945e-02
+19800 18960 1.65065719619254e-01
+19800 18984 3.92592948889671e-01
+19800 19008 1.87660243318360e-01
+19800 19032 2.51713852470709e-02
+19800 19344 1.59575517774422e-01
+19800 19368 1.33184939331854e+00
+19800 19392 3.14075947710282e+00
+19800 19416 1.52152600400075e+00
+19800 19440 2.06994670444974e-01
+19800 19752 3.65750055595972e-01
+19800 19776 3.01906849351881e+00
+19800 19824 3.45599888700880e+00
+19800 19848 4.74982653968468e-01
+19800 20160 1.62641697816043e-01
+19800 20184 1.34221337297530e+00
+19800 20208 3.13383615769576e+00
+19800 20232 1.51007911385203e+00
+19800 20256 2.04608133035226e-01
+19800 20568 2.02892993326998e-02
+19800 20592 1.67656714533442e-01
+19800 20616 3.90862119037907e-01
+19800 20640 1.84798520781179e-01
+19800 20664 2.45747508946339e-02
+19801 19801 1.00000000000000e+00
+19802 19802 1.00000000000000e+00
+19803 19803 1.00000000000000e+00
+19804 19804 1.00000000000000e+00
+19805 19805 1.00000000000000e+00
+19806 19806 1.00000000000000e+00
+19807 19807 1.00000000000000e+00
+19808 19808 1.00000000000000e+00
+19809 19809 1.00000000000000e+00
+19810 19810 1.00000000000000e+00
+19811 19811 1.00000000000000e+00
+19812 19812 1.00000000000000e+00
+19813 19813 1.00000000000000e+00
+19814 19814 1.00000000000000e+00
+19815 19815 1.00000000000000e+00
+19816 19816 1.00000000000000e+00
+19817 19817 1.00000000000000e+00
+19818 19818 1.00000000000000e+00
+19819 19819 1.00000000000000e+00
+19820 19820 1.00000000000000e+00
+19821 19821 1.00000000000000e+00
+19822 19822 1.00000000000000e+00
+19823 19823 1.00000000000000e+00
+19824 8733 -2.09075466857397e-05
+19824 8757 -1.72064983002770e-02
+19824 8781 -2.47456816655714e-02
+19824 8805 -1.04604514369132e-03
+19824 9333 -3.85963268737258e-02
+19824 9357 -9.05256029699007e-01
+19824 9381 -1.87406138757865e+00
+19824 9405 -4.36925577003901e-01
+19824 9429 -4.21211943045400e-03
+19824 9909 -4.00601221406901e-05
+19824 9933 -2.53257024583949e-01
+19824 9957 -4.91376916156041e+00
+19824 9981 -1.02349311736182e+01
+19824 10005 -1.87862984396716e+00
+19824 10029 -3.06935392903594e-02
+19824 10509 -9.92519568879595e-05
+19824 10533 -1.55321867795443e-01
+19824 10557 -3.01355636355886e+00
+19824 10581 -5.68289186565232e+00
+19824 10605 -1.20726376709726e+00
+19824 10629 -1.07855649151753e-02
+19824 11133 -4.05950296912945e-03
+19824 11157 -1.94606147503332e-01
+19824 11181 -3.17162331399183e-01
+19824 11205 -6.26822243240935e-02
+19824 11229 -7.17169031686498e-06
+19824 11757 -6.05285648237210e-07
+19824 11781 -2.64700801715133e-04
+19824 11805 -8.40619835414275e-05
+19824 19824 9.35462019827739e+00
+19824 18960 2.17436755825191e-02
+19824 18984 1.87660243318360e-01
+19824 19008 4.38078710129996e-01
+19824 19032 1.55057023365656e-01
+19824 19056 1.35928705943431e-02
+19824 19368 1.73386830555210e-01
+19824 19392 1.52152600400075e+00
+19824 19416 3.62350257752147e+00
+19824 19440 1.38078276116627e+00
+19824 19464 1.38201019846591e-01
+19824 19776 3.89017067783714e-01
+19824 19800 3.45599888700880e+00
+19824 19848 3.36345328386544e+00
+19824 19872 3.65880666997873e-01
+19824 20184 1.72911645427777e-01
+19824 20208 1.51007911385203e+00
+19824 20232 3.59834989756732e+00
+19824 20256 1.42526502644431e+00
+19824 20280 1.51708123575848e-01
+19824 20592 2.16248793006608e-02
+19824 20616 1.84798520781179e-01
+19824 20640 4.31790540141460e-01
+19824 20664 1.66177589685166e-01
+19824 20688 1.69696465266575e-02
+19825 19825 1.00000000000000e+00
+19826 19826 1.00000000000000e+00
+19827 19827 1.00000000000000e+00
+19828 19828 1.00000000000000e+00
+19829 19829 1.00000000000000e+00
+19830 19830 1.00000000000000e+00
+19831 19831 1.00000000000000e+00
+19832 19832 1.00000000000000e+00
+19833 19833 1.00000000000000e+00
+19834 19834 1.00000000000000e+00
+19835 19835 1.00000000000000e+00
+19836 19836 1.00000000000000e+00
+19837 19837 1.00000000000000e+00
+19838 19838 1.00000000000000e+00
+19839 19839 1.00000000000000e+00
+19840 19840 1.00000000000000e+00
+19841 19841 1.00000000000000e+00
+19842 19842 1.00000000000000e+00
+19843 19843 1.00000000000000e+00
+19844 19844 1.00000000000000e+00
+19845 19845 1.00000000000000e+00
+19846 19846 1.00000000000000e+00
+19847 19847 1.00000000000000e+00
+19848 8757 -6.02398997712607e-05
+19848 8781 -1.69124856312050e-03
+19848 8805 -2.23427793991183e-04
+19848 9357 -5.14144086384390e-02
+19848 9381 -4.28266688460054e-01
+19848 9405 -3.49286089514239e-01
+19848 9429 -5.65856354692920e-02
+19848 9933 -1.17783345955638e-03
+19848 9957 -7.67651190101397e-01
+19848 9981 -5.10178297208426e+00
+19848 10005 -5.86735061115209e+00
+19848 10029 -8.79965056906134e-01
+19848 10533 -8.02865271787041e-03
+19848 10557 -8.31720144615548e-01
+19848 10581 -7.61855577416950e+00
+19848 10605 -1.01403827040806e+01
+19848 10629 -4.56253711353304e-01
+19848 11133 -7.09905820190979e-04
+19848 11157 -1.13112689805215e-01
+19848 11181 -1.92125528213321e+00
+19848 11205 -1.64156849315694e+00
+19848 11229 -1.16143813803568e-03
+19848 11757 -5.73103372691863e-06
+19848 11781 -1.42217084326016e-02
+19848 11805 -7.39950019853648e-03
+19848 19848 9.38018160737733e+00
+19848 18984 2.51713852470709e-02
+19848 19008 1.55057023365656e-01
+19848 19032 3.97365055002482e-01
+19848 19056 3.63786962869216e-01
+19848 19392 2.06994670444974e-01
+19848 19416 1.38078276116628e+00
+19848 19440 3.45834867769277e+00
+19848 19464 2.63307945879096e+00
+19848 19800 4.74982653968468e-01
+19848 19824 3.36345328386544e+00
+19848 19872 5.56573923087682e+00
+19848 20208 2.04608133035226e-01
+19848 20232 1.42526502644432e+00
+19848 20256 3.89793934425668e+00
+19848 20280 3.13883496231905e+00
+19848 20616 2.45747508946339e-02
+19848 20640 1.66177589685166e-01
+19848 20664 5.07262721643460e-01
+19848 20688 4.90225838751240e-01
+19849 19849 1.00000000000000e+00
+19850 19850 1.00000000000000e+00
+19851 19851 1.00000000000000e+00
+19852 19852 1.00000000000000e+00
+19853 19853 1.00000000000000e+00
+19854 19854 1.00000000000000e+00
+19855 19855 1.00000000000000e+00
+19856 19856 1.00000000000000e+00
+19857 19857 1.00000000000000e+00
+19858 19858 1.00000000000000e+00
+19859 19859 1.00000000000000e+00
+19860 19860 1.00000000000000e+00
+19861 19861 1.00000000000000e+00
+19862 19862 1.00000000000000e+00
+19863 19863 1.00000000000000e+00
+19864 19864 1.00000000000000e+00
+19865 19865 1.00000000000000e+00
+19866 19866 1.00000000000000e+00
+19867 19867 1.00000000000000e+00
+19868 19868 1.00000000000000e+00
+19869 19869 1.00000000000000e+00
+19870 19870 1.00000000000000e+00
+19871 19871 1.00000000000000e+00
+19872 8781 -1.92421531558400e-08
+19872 8805 -2.82679919691200e-08
+19872 9357 -8.94809260414000e-09
+19872 9381 -1.67149292436570e-02
+19872 9405 -1.56683939199442e-01
+19872 9429 -8.48984408304536e-02
+19872 9957 -8.36244219545056e-03
+19872 9981 -9.47053835614473e-01
+19872 10005 -5.61186521115555e+00
+19872 10029 -1.54591739054227e+00
+19872 10557 -5.14093378669878e-02
+19872 10581 -4.33414068707041e+00
+19872 10605 -1.34003793834150e+01
+19872 10629 -8.37008468300378e-01
+19872 11157 -2.05692093069994e-02
+19872 11181 -2.55228025707641e+00
+19872 11205 -2.84652083002141e+00
+19872 11229 -2.27267444385331e-03
+19872 11757 -7.22506791617681e-06
+19872 11781 -2.65905112531973e-02
+19872 11805 -1.42105665122830e-02
+19872 19872 9.57031379276847e+00
+19872 19008 1.35928705943431e-02
+19872 19032 3.63786962869216e-01
+19872 19056 6.32423831578030e-01
+19872 19416 1.38201019846591e-01
+19872 19440 2.63307945879095e+00
+19872 19464 4.29875177865576e+00
+19872 19824 3.65880666997873e-01
+19872 19848 5.56573923087682e+00
+19872 20232 1.51708123575848e-01
+19872 20256 3.13883496231905e+00
+19872 20280 5.21571305960715e+00
+19872 20640 1.69696465266575e-02
+19872 20664 4.90225838751240e-01
+19872 20688 8.61664151815878e-01
+19873 19873 1.00000000000000e+00
+19874 19874 1.00000000000000e+00
+19875 19875 1.00000000000000e+00
+19876 19876 1.00000000000000e+00
+19877 19877 1.00000000000000e+00
+19878 19878 1.00000000000000e+00
+19879 19879 1.00000000000000e+00
+19880 19880 1.00000000000000e+00
+19881 19881 1.00000000000000e+00
+19882 19882 1.00000000000000e+00
+19883 19883 1.00000000000000e+00
+19884 19884 1.00000000000000e+00
+19885 19885 1.00000000000000e+00
+19886 19886 1.00000000000000e+00
+19887 19887 1.00000000000000e+00
+19888 19888 1.00000000000000e+00
+19889 19889 1.00000000000000e+00
+19890 19890 1.00000000000000e+00
+19891 19891 1.00000000000000e+00
+19892 19892 1.00000000000000e+00
+19893 19893 1.00000000000000e+00
+19894 19894 1.00000000000000e+00
+19895 19895 1.00000000000000e+00
+19896 6141 -3.79506224605999e-02
+19896 6165 -3.24429347867775e-01
+19896 6189 -2.06081244686777e-02
+19896 6213 -2.93151783220580e-07
+19896 6717 -2.99407615582719e-06
+19896 6741 -5.00898442642436e+00
+19896 6765 -7.28706157576650e+00
+19896 6789 -2.12057904827480e-01
+19896 6813 -1.19661164935186e-04
+19896 7317 -1.22992818690725e-01
+19896 7341 -1.38577901086794e+01
+19896 7365 -9.81224485046657e+00
+19896 7389 -1.98215657855370e-01
+19896 7413 -2.08381299950425e-05
+19896 7917 -1.49586861259648e-01
+19896 7941 -1.94760161133871e+00
+19896 7965 -7.35724208401009e-01
+19896 7989 -1.97720813716509e-02
+19896 8517 -1.07822922226171e-04
+19896 8541 -7.88146601817124e-03
+19896 8565 -6.72695047920747e-03
+19896 8589 -2.51866616999194e-06
+19896 19896 1.46474152274486e+01
+19896 19080 4.82827500215720e-01
+19896 19104 2.94519280705982e-01
+19896 19128 1.51730087423205e-02
+19896 19488 5.11344358332101e+00
+19896 19512 3.01366476430736e+00
+19896 19536 1.30555135041958e-01
+19896 19920 7.92551584905654e+00
+19896 19944 3.14802352952056e-01
+19896 20304 4.92634717205973e+00
+19896 20328 2.99017165115070e+00
+19896 20352 1.50570875748807e-01
+19896 20712 4.36053397400399e-01
+19896 20736 2.88646002416814e-01
+19896 20760 2.01769439190329e-02
+19897 19897 1.00000000000000e+00
+19898 19898 1.00000000000000e+00
+19899 19899 1.00000000000000e+00
+19900 19900 1.00000000000000e+00
+19901 19901 1.00000000000000e+00
+19902 19902 1.00000000000000e+00
+19903 19903 1.00000000000000e+00
+19904 19904 1.00000000000000e+00
+19905 19905 1.00000000000000e+00
+19906 19906 1.00000000000000e+00
+19907 19907 1.00000000000000e+00
+19908 19908 1.00000000000000e+00
+19909 19909 1.00000000000000e+00
+19910 19910 1.00000000000000e+00
+19911 19911 1.00000000000000e+00
+19912 19912 1.00000000000000e+00
+19913 19913 1.00000000000000e+00
+19914 19914 1.00000000000000e+00
+19915 19915 1.00000000000000e+00
+19916 19916 1.00000000000000e+00
+19917 19917 1.00000000000000e+00
+19918 19918 1.00000000000000e+00
+19919 19919 1.00000000000000e+00
+19920 6141 -2.00238148159732e-02
+19920 6165 -1.97918336106530e-01
+19920 6189 -2.25678303861425e-02
+19920 6213 -2.38387544049821e-06
+19920 6717 -1.50043593642062e-06
+19920 6741 -2.79768642905908e+00
+19920 6765 -5.46128485173952e+00
+19920 6789 -8.00085278224094e-01
+19920 6813 -2.67245997549204e-02
+19920 7317 -6.68357069655286e-02
+19920 7341 -8.81234700362071e+00
+19920 7365 -1.17788140657166e+01
+19920 7389 -2.34143120142435e+00
+19920 7413 -7.02222855708134e-02
+19920 7917 -8.67773264820795e-02
+19920 7941 -1.99097178969344e+00
+19920 7965 -2.99889266328804e+00
+19920 7989 -9.36190402441585e-01
+19920 8013 -9.62297346308573e-03
+19920 8517 -9.97392066839145e-05
+19920 8541 -3.30507753107719e-02
+19920 8565 -1.24457816678187e-01
+19920 8589 -3.00750972078245e-02
+19920 8613 -3.40300235706000e-09
+19920 9165 -2.68148023391800e-08
+19920 9189 -1.82286164144400e-08
+19920 19920 9.81721687035760e+00
+19920 19080 2.94519280705982e-01
+19920 19104 3.85652247454574e-01
+19920 19128 1.64573973805669e-01
+19920 19152 2.59704847090969e-02
+19920 19488 3.01366476430736e+00
+19920 19512 3.53687360286299e+00
+19920 19536 1.33129786065527e+00
+19920 19560 2.02269330121855e-01
+19920 19896 7.92551584905654e+00
+19920 19944 3.04811342980969e+00
+19920 19968 4.47226004500351e-01
+19920 20304 2.99017165115070e+00
+19920 20328 3.81228929594170e+00
+19920 20352 1.43912834252726e+00
+19920 20376 2.09211209883004e-01
+19920 20712 2.88646002416814e-01
+19920 20736 4.54506170724252e-01
+19920 20760 1.91531594273668e-01
+19920 20784 2.77059546493841e-02
+19921 19921 1.00000000000000e+00
+19922 19922 1.00000000000000e+00
+19923 19923 1.00000000000000e+00
+19924 19924 1.00000000000000e+00
+19925 19925 1.00000000000000e+00
+19926 19926 1.00000000000000e+00
+19927 19927 1.00000000000000e+00
+19928 19928 1.00000000000000e+00
+19929 19929 1.00000000000000e+00
+19930 19930 1.00000000000000e+00
+19931 19931 1.00000000000000e+00
+19932 19932 1.00000000000000e+00
+19933 19933 1.00000000000000e+00
+19934 19934 1.00000000000000e+00
+19935 19935 1.00000000000000e+00
+19936 19936 1.00000000000000e+00
+19937 19937 1.00000000000000e+00
+19938 19938 1.00000000000000e+00
+19939 19939 1.00000000000000e+00
+19940 19940 1.00000000000000e+00
+19941 19941 1.00000000000000e+00
+19942 19942 1.00000000000000e+00
+19943 19943 1.00000000000000e+00
+19944 6141 -2.99572453049499e-04
+19944 6165 -1.07430284427304e-02
+19944 6189 -5.20445063742397e-03
+19944 6213 -5.13822501368409e-06
+19944 6717 -9.70816716290000e-10
+19944 6741 -8.38121177760741e-02
+19944 6765 -8.51279404173897e-01
+19944 6789 -1.20828029646936e+00
+19944 6813 -1.44830657291900e-01
+19944 6837 -6.49930412057381e-04
+19944 7317 -1.52551360576176e-03
+19944 7341 -5.98577294457393e-01
+19944 7365 -6.52746285474585e+00
+19944 7389 -7.42284113932565e+00
+19944 7413 -8.20278751359086e-01
+19944 7437 -6.95654844075527e-03
+19944 7917 -3.42397024350159e-03
+19944 7941 -5.06189018822952e-01
+19944 7965 -5.28864690628290e+00
+19944 7989 -5.30453705292566e+00
+19944 8013 -6.31129289373409e-01
+19944 8037 -9.54445888291204e-04
+19944 8517 -1.30936415916653e-05
+19944 8541 -3.82846590392048e-02
+19944 8565 -4.87379513125253e-01
+19944 8589 -4.41673679756451e-01
+19944 8613 -4.19819363012439e-02
+19944 9165 -1.91637324661204e-04
+19944 9189 -1.46560958747288e-03
+19944 9213 -4.99741004107998e-05
+19944 19944 8.85982970989361e+00
+19944 19080 1.51730087423205e-02
+19944 19104 1.64573973805669e-01
+19944 19128 4.52628160109014e-01
+19944 19152 1.91591522920960e-01
+19944 19176 2.19273960211432e-02
+19944 19488 1.30555135041958e-01
+19944 19512 1.33129786065526e+00
+19944 19536 3.54045363333219e+00
+19944 19560 1.50343418584935e+00
+19944 19584 1.73589216340478e-01
+19944 19896 3.14802352952056e-01
+19944 19920 3.04811342980969e+00
+19944 19968 3.34654915774407e+00
+19944 19992 3.89411284935650e-01
+19944 20304 1.50570875748807e-01
+19944 20328 1.43912834252726e+00
+19944 20352 3.67969130569640e+00
+19944 20376 1.56380912680985e+00
+19944 20400 1.81741071819454e-01
+19944 20712 2.01769439190329e-02
+19944 20736 1.91531594273668e-01
+19944 20760 4.87437578200066e-01
+19944 20784 2.06685258161086e-01
+19944 20808 2.39653598908874e-02
+19945 19945 1.00000000000000e+00
+19946 19946 1.00000000000000e+00
+19947 19947 1.00000000000000e+00
+19948 19948 1.00000000000000e+00
+19949 19949 1.00000000000000e+00
+19950 19950 1.00000000000000e+00
+19951 19951 1.00000000000000e+00
+19952 19952 1.00000000000000e+00
+19953 19953 1.00000000000000e+00
+19954 19954 1.00000000000000e+00
+19955 19955 1.00000000000000e+00
+19956 19956 1.00000000000000e+00
+19957 19957 1.00000000000000e+00
+19958 19958 1.00000000000000e+00
+19959 19959 1.00000000000000e+00
+19960 19960 1.00000000000000e+00
+19961 19961 1.00000000000000e+00
+19962 19962 1.00000000000000e+00
+19963 19963 1.00000000000000e+00
+19964 19964 1.00000000000000e+00
+19965 19965 1.00000000000000e+00
+19966 19966 1.00000000000000e+00
+19967 19967 1.00000000000000e+00
+19968 6165 -1.45918259762629e-04
+19968 6189 -4.57831467629250e-04
+19968 6213 -1.21126830761588e-06
+19968 6741 -1.13997207202419e-05
+19968 6765 -8.96751616157913e-02
+19968 6789 -3.96364039902618e-01
+19968 6813 -1.90281153849867e-01
+19968 6837 -3.82397426018649e-03
+19968 7341 -1.62745062553765e-02
+19968 7365 -1.42191071427143e+00
+19968 7389 -5.34832249232644e+00
+19968 7413 -2.65973954927666e+00
+19968 7437 -1.43723768517551e-01
+19968 7461 -8.79221394985284e-05
+19968 7941 -5.81648819907571e-02
+19968 7965 -2.11930396500525e+00
+19968 7989 -8.88021871768782e+00
+19968 8013 -4.23415220768884e+00
+19968 8037 -2.32535662013764e-01
+19968 8061 -3.38155601221626e-05
+19968 8541 -8.24395122984927e-03
+19968 8565 -4.60405244955097e-01
+19968 8589 -1.71506375002889e+00
+19968 8613 -8.23602821426857e-01
+19968 8637 -3.45663066015182e-02
+19968 9165 -9.09969541231160e-04
+19968 9189 -2.30088250458341e-02
+19968 9213 -1.62013567064914e-02
+19968 9237 -1.67984462863557e-05
+19968 19968 8.04427054762158e+00
+19968 19104 2.59704847090969e-02
+19968 19128 1.91591522920960e-01
+19968 19152 3.97019136574113e-01
+19968 19176 1.68550846191471e-01
+19968 19200 2.02103155267244e-02
+19968 19512 2.02269330121855e-01
+19968 19536 1.50343418584935e+00
+19968 19560 3.14169525100726e+00
+19968 19584 1.34235070311271e+00
+19968 19608 1.61998459437697e-01
+19968 19920 4.47226004500351e-01
+19968 19944 3.34654915774407e+00
+19968 19992 3.02350107634499e+00
+19968 20016 3.66463984150582e-01
+19968 20328 2.09211209883004e-01
+19968 20352 1.56380912680985e+00
+19968 20376 3.28472507352778e+00
+19968 20400 1.39759114541160e+00
+19968 20424 1.67656714533442e-01
+19968 20736 2.77059546493841e-02
+19968 20760 2.06685258161086e-01
+19968 20784 4.32776592204243e-01
+19968 20808 1.82360956766193e-01
+19968 20832 2.16248793006608e-02
+19969 19969 1.00000000000000e+00
+19970 19970 1.00000000000000e+00
+19971 19971 1.00000000000000e+00
+19972 19972 1.00000000000000e+00
+19973 19973 1.00000000000000e+00
+19974 19974 1.00000000000000e+00
+19975 19975 1.00000000000000e+00
+19976 19976 1.00000000000000e+00
+19977 19977 1.00000000000000e+00
+19978 19978 1.00000000000000e+00
+19979 19979 1.00000000000000e+00
+19980 19980 1.00000000000000e+00
+19981 19981 1.00000000000000e+00
+19982 19982 1.00000000000000e+00
+19983 19983 1.00000000000000e+00
+19984 19984 1.00000000000000e+00
+19985 19985 1.00000000000000e+00
+19986 19986 1.00000000000000e+00
+19987 19987 1.00000000000000e+00
+19988 19988 1.00000000000000e+00
+19989 19989 1.00000000000000e+00
+19990 19990 1.00000000000000e+00
+19991 19991 1.00000000000000e+00
+19992 6765 -8.35721701630051e-05
+19992 6789 -3.39204386699661e-02
+19992 6813 -6.02435661366238e-02
+19992 6837 -5.56934197282910e-03
+19992 7365 -5.17816687505490e-02
+19992 7389 -1.18550249725812e+00
+19992 7413 -2.30331252695496e+00
+19992 7437 -5.94848422720118e-01
+19992 7461 -1.20177584135245e-02
+19992 7941 -3.40800829606917e-05
+19992 7965 -2.45488223812455e-01
+19992 7989 -4.25765599427589e+00
+19992 8013 -8.86448444529013e+00
+19992 8037 -2.01599738264807e+00
+19992 8061 -4.94140797644586e-02
+19992 8541 -4.71154979898946e-05
+19992 8565 -1.09952822002808e-01
+19992 8589 -1.97095422806587e+00
+19992 8613 -3.78383013424044e+00
+19992 8637 -9.93116571711704e-01
+19992 8661 -1.02953049434362e-02
+19992 9165 -7.66819923937578e-04
+19992 9189 -8.21777190579337e-02
+19992 9213 -1.94900128605103e-01
+19992 9237 -4.20503355344792e-02
+19992 9261 -6.22249116570490e-07
+19992 9813 -1.80659238066755e-05
+19992 9837 -8.76502208940850e-06
+19992 19992 7.61989303799189e+00
+19992 19128 2.19273960211432e-02
+19992 19152 1.68550846191471e-01
+19992 19176 3.64809417098163e-01
+19992 19200 1.58909152704612e-01
+19992 19224 1.95169726494285e-02
+19992 19536 1.73589216340478e-01
+19992 19560 1.34235070311271e+00
+19992 19584 2.92511695842665e+00
+19992 19608 1.28620340208265e+00
+19992 19632 1.59552391082961e-01
+19992 19944 3.89411284935650e-01
+19992 19968 3.02350107634499e+00
+19992 20016 2.93408796318918e+00
+19992 20040 3.67058006646699e-01
+19992 20352 1.81741071819454e-01
+19992 20376 1.39759114541160e+00
+19992 20400 3.03214513306497e+00
+19992 20424 1.34221337297529e+00
+19992 20448 1.67896628710377e-01
+19992 20760 2.39653598908874e-02
+19992 20784 1.82360956766193e-01
+19992 20808 3.91566460757743e-01
+19992 20832 1.72911645427774e-01
+19992 20856 2.16030320562826e-02
+19993 19993 1.00000000000000e+00
+19994 19994 1.00000000000000e+00
+19995 19995 1.00000000000000e+00
+19996 19996 1.00000000000000e+00
+19997 19997 1.00000000000000e+00
+19998 19998 1.00000000000000e+00
+19999 19999 1.00000000000000e+00
+20000 20000 1.00000000000000e+00
+20001 20001 1.00000000000000e+00
+20002 20002 1.00000000000000e+00
+20003 20003 1.00000000000000e+00
+20004 20004 1.00000000000000e+00
+20005 20005 1.00000000000000e+00
+20006 20006 1.00000000000000e+00
+20007 20007 1.00000000000000e+00
+20008 20008 1.00000000000000e+00
+20009 20009 1.00000000000000e+00
+20010 20010 1.00000000000000e+00
+20011 20011 1.00000000000000e+00
+20012 20012 1.00000000000000e+00
+20013 20013 1.00000000000000e+00
+20014 20014 1.00000000000000e+00
+20015 20015 1.00000000000000e+00
+20016 6789 -1.51013638628261e-04
+20016 6813 -5.16812501595168e-03
+20016 6837 -1.31385706373231e-03
+20016 7389 -6.46783074102998e-02
+20016 7413 -5.92579518169752e-01
+20016 7437 -6.28313393694458e-01
+20016 7461 -6.33960961775753e-02
+20016 7485 -1.53172366412972e-04
+20016 7965 -1.29536421402409e-03
+20016 7989 -6.39847535218475e-01
+20016 8013 -5.31142189658321e+00
+20016 8037 -5.25957862952259e+00
+20016 8061 -5.74376861200484e-01
+20016 8085 -4.85672977793047e-03
+20016 8565 -5.15015269182182e-03
+20016 8589 -6.07890324229398e-01
+20016 8613 -5.35935612814161e+00
+20016 8637 -5.24984454072561e+00
+20016 8661 -6.13801984343060e-01
+20016 8685 -1.17815807475609e-03
+20016 9165 -1.43822464621433e-04
+20016 9189 -6.57338060232593e-02
+20016 9213 -6.58101042165434e-01
+20016 9237 -5.99376677632743e-01
+20016 9261 -6.23693251947758e-02
+20016 9813 -1.21445491145510e-03
+20016 9837 -5.05902499824320e-03
+20016 9861 -1.52757987606118e-04
+20016 20016 7.59293535998900e+00
+20016 19152 2.02103155267244e-02
+20016 19176 1.58909152704612e-01
+20016 19200 3.51917402669347e-01
+20016 19224 1.55809989604779e-01
+20016 19248 1.94355247517662e-02
+20016 19560 1.61998459437697e-01
+20016 19584 1.28620340208265e+00
+20016 19608 2.87066983306137e+00
+20016 19632 1.26154202951684e+00
+20016 19656 1.55833116296245e-01
+20016 19968 3.66463984150582e-01
+20016 19992 2.93408796318918e+00
+20016 20040 2.88240510455087e+00
+20016 20064 3.53543269491004e-01
+20016 20376 1.67656714533442e-01
+20016 20400 1.34221337297529e+00
+20016 20424 3.01906849351879e+00
+20016 20448 1.33184939331854e+00
+20016 20472 1.65065719619253e-01
+20016 20784 2.16248793006608e-02
+20016 20808 1.72911645427774e-01
+20016 20832 3.89017067783700e-01
+20016 20856 1.73386830555204e-01
+20016 20880 2.17436755825183e-02
+20017 20017 1.00000000000000e+00
+20018 20018 1.00000000000000e+00
+20019 20019 1.00000000000000e+00
+20020 20020 1.00000000000000e+00
+20021 20021 1.00000000000000e+00
+20022 20022 1.00000000000000e+00
+20023 20023 1.00000000000000e+00
+20024 20024 1.00000000000000e+00
+20025 20025 1.00000000000000e+00
+20026 20026 1.00000000000000e+00
+20027 20027 1.00000000000000e+00
+20028 20028 1.00000000000000e+00
+20029 20029 1.00000000000000e+00
+20030 20030 1.00000000000000e+00
+20031 20031 1.00000000000000e+00
+20032 20032 1.00000000000000e+00
+20033 20033 1.00000000000000e+00
+20034 20034 1.00000000000000e+00
+20035 20035 1.00000000000000e+00
+20036 20036 1.00000000000000e+00
+20037 20037 1.00000000000000e+00
+20038 20038 1.00000000000000e+00
+20039 20039 1.00000000000000e+00
+20040 6813 -1.04073115619178e-05
+20040 6837 -2.24011129438342e-05
+20040 7389 -7.02160393795440e-07
+20040 7413 -4.05088426167662e-02
+20040 7437 -1.85183137996140e-01
+20040 7461 -7.95778024835319e-02
+20040 7485 -8.00980653817300e-04
+20040 7989 -1.05393873554722e-02
+20040 8013 -9.90842359720009e-01
+20040 8037 -3.65852053446204e+00
+20040 8061 -1.83374722468626e+00
+20040 8085 -9.46399802028857e-02
+20040 8109 -4.25390998073090e-05
+20040 8589 -5.22627933309468e-02
+20040 8613 -2.02840327989389e+00
+20040 8637 -8.57804786423769e+00
+20040 8661 -3.97166244870871e+00
+20040 8685 -2.13828212972158e-01
+20040 8709 -2.95151509768487e-05
+20040 9189 -1.24654553297142e-02
+20040 9213 -6.12047630761552e-01
+20040 9237 -2.25808474336944e+00
+20040 9261 -1.08618188199013e+00
+20040 9285 -4.65170820385618e-02
+20040 9813 -5.13431393213628e-03
+20040 9837 -5.53882674114023e-02
+20040 9861 -3.06138592859709e-02
+20040 9885 -7.26889822415117e-05
+20040 20040 7.37694384582190e+00
+20040 19176 1.95169726494285e-02
+20040 19200 1.55809989604779e-01
+20040 19224 3.49682107570653e-01
+20040 19248 1.54529054578925e-01
+20040 19272 1.91967388929650e-02
+20040 19584 1.59552391082961e-01
+20040 19608 1.26154202951684e+00
+20040 19632 2.80798832008810e+00
+20040 19656 1.24375673824568e+00
+20040 19680 1.55106068265173e-01
+20040 19992 3.67058006646699e-01
+20040 20016 2.88240510455087e+00
+20040 20064 2.82694718723973e+00
+20040 20088 3.53193527318915e-01
+20040 20400 1.67896628710377e-01
+20040 20424 1.33184939331854e+00
+20040 20448 2.97014860592259e+00
+20040 20472 1.30506473169344e+00
+20040 20496 1.61200463304104e-01
+20040 20808 2.16030320562826e-02
+20040 20832 1.73386830555204e-01
+20040 20856 3.90222179029274e-01
+20040 20880 1.69856052940864e-01
+20040 20904 2.07203376526978e-02
+20041 20041 1.00000000000000e+00
+20042 20042 1.00000000000000e+00
+20043 20043 1.00000000000000e+00
+20044 20044 1.00000000000000e+00
+20045 20045 1.00000000000000e+00
+20046 20046 1.00000000000000e+00
+20047 20047 1.00000000000000e+00
+20048 20048 1.00000000000000e+00
+20049 20049 1.00000000000000e+00
+20050 20050 1.00000000000000e+00
+20051 20051 1.00000000000000e+00
+20052 20052 1.00000000000000e+00
+20053 20053 1.00000000000000e+00
+20054 20054 1.00000000000000e+00
+20055 20055 1.00000000000000e+00
+20056 20056 1.00000000000000e+00
+20057 20057 1.00000000000000e+00
+20058 20058 1.00000000000000e+00
+20059 20059 1.00000000000000e+00
+20060 20060 1.00000000000000e+00
+20061 20061 1.00000000000000e+00
+20062 20062 1.00000000000000e+00
+20063 20063 1.00000000000000e+00
+20064 7413 -1.65162946727460e-05
+20064 7437 -1.53834825153154e-02
+20064 7461 -2.19885461768131e-02
+20064 7485 -9.06390528705472e-04
+20064 8013 -3.37284796292226e-02
+20064 8037 -7.80770559015173e-01
+20064 8061 -1.50118703445927e+00
+20064 8085 -3.76017434900473e-01
+20064 8109 -6.09418934663195e-03
+20064 8589 -3.43528606209348e-05
+20064 8613 -2.30669445532562e-01
+20064 8637 -3.96244886125048e+00
+20064 8661 -7.93340222138199e+00
+20064 8685 -1.71860913009062e+00
+20064 8709 -4.17062818071608e-02
+20064 9189 -8.49783613857441e-05
+20064 9213 -1.43978339114222e-01
+20064 9237 -2.44933938889466e+00
+20064 9261 -4.66363090861408e+00
+20064 9285 -1.14612630496388e+00
+20064 9309 -1.23074871066057e-02
+20064 9813 -3.33212378989244e-03
+20064 9837 -1.66742076918558e-01
+20064 9861 -3.28645579300927e-01
+20064 9885 -7.08050616192463e-02
+20064 9909 -8.41167939047527e-06
+20064 10437 -5.41995950758390e-07
+20064 10461 -3.14289429538516e-04
+20064 10485 -1.04917510642629e-04
+20064 20064 7.36002245700817e+00
+20064 19200 1.94355247517662e-02
+20064 19224 1.54529054578925e-01
+20064 19248 3.45459097587972e-01
+20064 19272 1.52289957766922e-01
+20064 19296 1.88757505487655e-02
+20064 19608 1.55833116296245e-01
+20064 19632 1.24375673824568e+00
+20064 19656 2.79178445855528e+00
+20064 19680 1.23744127312556e+00
+20064 19704 1.54254250016213e-01
+20064 20016 3.53543269491004e-01
+20064 20040 2.82694718723973e+00
+20064 20088 2.83430511093295e+00
+20064 20112 3.55382750414308e-01
+20064 20424 1.65065719619253e-01
+20064 20448 1.30506473169344e+00
+20064 20472 2.90903241462988e+00
+20064 20496 1.30383898179606e+00
+20064 20520 1.64759282144908e-01
+20064 20832 2.17436755825183e-02
+20064 20856 1.69856052940864e-01
+20064 20880 3.74771086606622e-01
+20064 20904 1.68889384934548e-01
+20064 20928 2.15020085809392e-02
+20065 20065 1.00000000000000e+00
+20066 20066 1.00000000000000e+00
+20067 20067 1.00000000000000e+00
+20068 20068 1.00000000000000e+00
+20069 20069 1.00000000000000e+00
+20070 20070 1.00000000000000e+00
+20071 20071 1.00000000000000e+00
+20072 20072 1.00000000000000e+00
+20073 20073 1.00000000000000e+00
+20074 20074 1.00000000000000e+00
+20075 20075 1.00000000000000e+00
+20076 20076 1.00000000000000e+00
+20077 20077 1.00000000000000e+00
+20078 20078 1.00000000000000e+00
+20079 20079 1.00000000000000e+00
+20080 20080 1.00000000000000e+00
+20081 20081 1.00000000000000e+00
+20082 20082 1.00000000000000e+00
+20083 20083 1.00000000000000e+00
+20084 20084 1.00000000000000e+00
+20085 20085 1.00000000000000e+00
+20086 20086 1.00000000000000e+00
+20087 20087 1.00000000000000e+00
+20088 7437 -4.34911550910312e-05
+20088 7461 -1.33629378071348e-03
+20088 7485 -1.88504826688788e-04
+20088 8037 -3.76488888679956e-02
+20088 8061 -3.62480097222255e-01
+20088 8085 -3.63297660228324e-01
+20088 8109 -3.01220400623416e-02
+20088 8133 -1.69496349620305e-05
+20088 8613 -8.94813647991526e-04
+20088 8637 -5.70727423507661e-01
+20088 8661 -4.40199915461421e+00
+20088 8685 -4.18131636633928e+00
+20088 8709 -4.46824974409313e-01
+20088 8733 -3.48186344649808e-03
+20088 9213 -6.31400259870918e-03
+20088 9237 -7.15791459635724e-01
+20088 9261 -6.07799992998220e+00
+20088 9285 -5.69463606063288e+00
+20088 9309 -6.27007469647823e-01
+20088 9333 -1.49333307771921e-03
+20088 9813 -5.47483143416012e-04
+20088 9837 -1.17769960030617e-01
+20088 9861 -1.02406696179593e+00
+20088 9885 -8.81184445223634e-01
+20088 9909 -9.45460057249828e-02
+20088 9933 -7.06933854300000e-10
+20088 10437 -2.39915213309620e-06
+20088 10461 -5.50462311142653e-03
+20088 10485 -1.36571193791509e-02
+20088 10509 -3.98715594254578e-04
+20088 20088 7.38973295076645e+00
+20088 19224 1.91967388929650e-02
+20088 19248 1.52289957766922e-01
+20088 19272 3.40595559996944e-01
+20088 19296 1.53050251489986e-01
+20088 19320 1.93868123237310e-02
+20088 19632 1.55106068265173e-01
+20088 19656 1.23744127312556e+00
+20088 19680 2.77817258011407e+00
+20088 19704 1.23701104642262e+00
+20088 19728 1.54998511589438e-01
+20088 20040 3.53193527318915e-01
+20088 20064 2.83430511093295e+00
+20088 20112 2.82319266893079e+00
+20088 20136 3.50415416818376e-01
+20088 20448 1.61200463304104e-01
+20088 20472 1.30383898179606e+00
+20088 20496 2.95969446118355e+00
+20088 20520 1.30841906282309e+00
+20088 20544 1.62345483560861e-01
+20088 20856 2.07203376526978e-02
+20088 20880 1.68889384934548e-01
+20088 20904 3.85976030264312e-01
+20088 20928 1.70902255590103e-01
+20088 20952 2.12235553165866e-02
+20089 20089 1.00000000000000e+00
+20090 20090 1.00000000000000e+00
+20091 20091 1.00000000000000e+00
+20092 20092 1.00000000000000e+00
+20093 20093 1.00000000000000e+00
+20094 20094 1.00000000000000e+00
+20095 20095 1.00000000000000e+00
+20096 20096 1.00000000000000e+00
+20097 20097 1.00000000000000e+00
+20098 20098 1.00000000000000e+00
+20099 20099 1.00000000000000e+00
+20100 20100 1.00000000000000e+00
+20101 20101 1.00000000000000e+00
+20102 20102 1.00000000000000e+00
+20103 20103 1.00000000000000e+00
+20104 20104 1.00000000000000e+00
+20105 20105 1.00000000000000e+00
+20106 20106 1.00000000000000e+00
+20107 20107 1.00000000000000e+00
+20108 20108 1.00000000000000e+00
+20109 20109 1.00000000000000e+00
+20110 20110 1.00000000000000e+00
+20111 20111 1.00000000000000e+00
+20112 7461 -3.49041330603600e-08
+20112 7485 -5.34096308434300e-08
+20112 8037 -3.72328364354000e-09
+20112 8061 -2.17405842911069e-02
+20112 8085 -9.77203966759727e-02
+20112 8109 -3.16680109148224e-02
+20112 8133 -8.00448419937318e-05
+20112 8637 -7.75557904544798e-03
+20112 8661 -7.65783553595153e-01
+20112 8685 -2.69588979393638e+00
+20112 8709 -1.33991019064063e+00
+20112 8733 -6.23061972031633e-02
+20112 8757 -1.96401349981369e-05
+20112 9237 -5.64564483220383e-02
+20112 9261 -2.14962332383443e+00
+20112 9285 -8.67746750985515e+00
+20112 9309 -3.82742487958775e+00
+20112 9333 -1.98152836711833e-01
+20112 9357 -2.31930704160447e-05
+20112 9837 -2.11921539795360e-02
+20112 9861 -8.56623399539274e-01
+20112 9885 -3.07599406256265e+00
+20112 9909 -1.44359395821837e+00
+20112 9933 -6.10846835017329e-02
+20112 10437 -1.46666927100900e-06
+20112 10461 -1.87272890764832e-02
+20112 10485 -1.19803551127478e-01
+20112 10509 -5.66160552656313e-02
+20112 10533 -2.50664090970476e-04
+20112 11085 -2.45870515439590e-07
+20112 11109 -4.73650354579940e-07
+20112 20112 7.31846347239766e+00
+20112 19248 1.88757505487655e-02
+20112 19272 1.53050251489986e-01
+20112 19296 3.48306772694077e-01
+20112 19320 1.54515349157388e-01
+20112 19344 1.92420249656160e-02
+20112 19656 1.54254250016213e-01
+20112 19680 1.23701104642262e+00
+20112 19704 2.79022848518572e+00
+20112 19728 1.24398624531150e+00
+20112 19752 1.55998049738432e-01
+20112 20064 3.55382750414308e-01
+20112 20088 2.82319266893079e+00
+20112 20136 2.82739787883000e+00
+20112 20160 3.56434052889109e-01
+20112 20472 1.64759282144908e-01
+20112 20496 1.30841906282309e+00
+20112 20520 2.92560588267319e+00
+20112 20544 1.30265738846125e+00
+20112 20568 1.63318863554447e-01
+20112 20880 2.15020085809392e-02
+20112 20904 1.70902255590103e-01
+20112 20928 3.82151122065945e-01
+20112 20952 1.69183134944825e-01
+20112 20976 2.10722284196196e-02
+20113 20113 1.00000000000000e+00
+20114 20114 1.00000000000000e+00
+20115 20115 1.00000000000000e+00
+20116 20116 1.00000000000000e+00
+20117 20117 1.00000000000000e+00
+20118 20118 1.00000000000000e+00
+20119 20119 1.00000000000000e+00
+20120 20120 1.00000000000000e+00
+20121 20121 1.00000000000000e+00
+20122 20122 1.00000000000000e+00
+20123 20123 1.00000000000000e+00
+20124 20124 1.00000000000000e+00
+20125 20125 1.00000000000000e+00
+20126 20126 1.00000000000000e+00
+20127 20127 1.00000000000000e+00
+20128 20128 1.00000000000000e+00
+20129 20129 1.00000000000000e+00
+20130 20130 1.00000000000000e+00
+20131 20131 1.00000000000000e+00
+20132 20132 1.00000000000000e+00
+20133 20133 1.00000000000000e+00
+20134 20134 1.00000000000000e+00
+20135 20135 1.00000000000000e+00
+20136 8061 -2.63632843519922e-06
+20136 8085 -6.88640208816373e-03
+20136 8109 -7.22537427582635e-03
+20136 8133 -6.59348435444703e-05
+20136 8661 -2.21346096836282e-02
+20136 8685 -5.34791752860129e-01
+20136 8709 -9.98666130461230e-01
+20136 8733 -2.35972834052833e-01
+20136 8757 -2.75454565147822e-03
+20136 9237 -2.84457677356842e-05
+20136 9261 -2.26074176801017e-01
+20136 9285 -3.75690140381865e+00
+20136 9309 -7.13291989148040e+00
+20136 9333 -1.48988839847490e+00
+20136 9357 -3.58048723393170e-02
+20136 9837 -1.52153242486529e-04
+20136 9861 -1.90496251635001e-01
+20136 9885 -3.09628035087767e+00
+20136 9909 -5.76875780633070e+00
+20136 9933 -1.32965709172451e+00
+20136 9957 -1.50083400241692e-02
+20136 10437 -2.31168330062650e-07
+20136 10461 -9.94001768869176e-03
+20136 10485 -3.13158933648108e-01
+20136 10509 -5.43816655026182e-01
+20136 10533 -1.18129358804486e-01
+20136 10557 -4.77885378091536e-05
+20136 11085 -4.68209319752308e-05
+20136 11109 -1.98398564923316e-03
+20136 11133 -4.73461040574712e-04
+20136 20136 7.41816968014253e+00
+20136 19272 1.93868123237310e-02
+20136 19296 1.54515349157388e-01
+20136 19320 3.46776184423016e-01
+20136 19344 1.55035990460182e-01
+20136 19368 1.95169726494294e-02
+20136 19680 1.54998511589438e-01
+20136 19704 1.24398624531150e+00
+20136 19728 2.80987646010903e+00
+20136 19752 1.25962880977222e+00
+20136 19776 1.58909152704619e-01
+20136 20088 3.50415416818376e-01
+20136 20112 2.82739787883000e+00
+20136 20160 2.88497387994920e+00
+20136 20184 3.64809417098178e-01
+20136 20496 1.62345483560861e-01
+20136 20520 1.30265738846125e+00
+20136 20544 2.94399814662354e+00
+20136 20568 1.32747883898370e+00
+20136 20592 1.68550846191475e-01
+20136 20904 2.12235553165866e-02
+20136 20928 1.69183134944825e-01
+20136 20952 3.80306606051644e-01
+20136 20976 1.71998497763053e-01
+20136 21000 2.19273960211435e-02
+20137 20137 1.00000000000000e+00
+20138 20138 1.00000000000000e+00
+20139 20139 1.00000000000000e+00
+20140 20140 1.00000000000000e+00
+20141 20141 1.00000000000000e+00
+20142 20142 1.00000000000000e+00
+20143 20143 1.00000000000000e+00
+20144 20144 1.00000000000000e+00
+20145 20145 1.00000000000000e+00
+20146 20146 1.00000000000000e+00
+20147 20147 1.00000000000000e+00
+20148 20148 1.00000000000000e+00
+20149 20149 1.00000000000000e+00
+20150 20150 1.00000000000000e+00
+20151 20151 1.00000000000000e+00
+20152 20152 1.00000000000000e+00
+20153 20153 1.00000000000000e+00
+20154 20154 1.00000000000000e+00
+20155 20155 1.00000000000000e+00
+20156 20156 1.00000000000000e+00
+20157 20157 1.00000000000000e+00
+20158 20158 1.00000000000000e+00
+20159 20159 1.00000000000000e+00
+20160 8085 -8.91149563795798e-06
+20160 8109 -2.10501275725715e-04
+20160 8133 -1.22463021456100e-05
+20160 8685 -2.16163911218320e-02
+20160 8709 -2.24619371477823e-01
+20160 8733 -2.06892058202002e-01
+20160 8757 -1.26258116673761e-02
+20160 8781 -1.40505858852180e-07
+20160 9261 -6.05453066284460e-04
+20160 9285 -5.08138615513834e-01
+20160 9309 -3.67439368781390e+00
+20160 9333 -3.39171852619217e+00
+20160 9357 -3.52156070294242e-01
+20160 9381 -2.41400275343922e-03
+20160 9861 -7.58954126479111e-03
+20160 9885 -8.49994985456533e-01
+20160 9909 -6.93663822977343e+00
+20160 9933 -6.23407982509980e+00
+20160 9957 -6.48829834041644e-01
+20160 9981 -1.79342829018027e-03
+20160 10461 -1.42313807385482e-03
+20160 10485 -1.98701968048535e-01
+20160 10509 -1.56150964536208e+00
+20160 10533 -1.30451795486920e+00
+20160 10557 -1.41157639159405e-01
+20160 10581 -2.47764597396870e-07
+20160 11085 -1.93029350231713e-04
+20160 11109 -1.95621366677711e-02
+20160 11133 -3.11108491462272e-02
+20160 11157 -9.44207889060297e-04
+20160 20160 7.55985454896867e+00
+20160 19296 1.92420249656160e-02
+20160 19320 1.55035990460182e-01
+20160 19344 3.51884712477798e-01
+20160 19368 1.59552391082962e-01
+20160 19392 2.03711251213111e-02
+20160 19704 1.55998049738432e-01
+20160 19728 1.25962880977222e+00
+20160 19752 2.86118619082843e+00
+20160 19776 1.28620340208266e+00
+20160 19800 1.62641697816043e-01
+20160 20112 3.56434052889109e-01
+20160 20136 2.88497387994920e+00
+20160 20184 2.92511695842670e+00
+20160 20208 3.66469822508484e-01
+20160 20520 1.63318863554447e-01
+20160 20544 1.32747883898370e+00
+20160 20568 3.02716923220482e+00
+20160 20592 1.34235070311274e+00
+20160 20616 1.67036829586706e-01
+20160 20928 2.10722284196196e-02
+20160 20952 1.71998497763053e-01
+20160 20976 3.93380472821893e-01
+20160 21000 1.73589216340481e-01
+20160 21024 2.14699080639767e-02
+20161 20161 1.00000000000000e+00
+20162 20162 1.00000000000000e+00
+20163 20163 1.00000000000000e+00
+20164 20164 1.00000000000000e+00
+20165 20165 1.00000000000000e+00
+20166 20166 1.00000000000000e+00
+20167 20167 1.00000000000000e+00
+20168 20168 1.00000000000000e+00
+20169 20169 1.00000000000000e+00
+20170 20170 1.00000000000000e+00
+20171 20171 1.00000000000000e+00
+20172 20172 1.00000000000000e+00
+20173 20173 1.00000000000000e+00
+20174 20174 1.00000000000000e+00
+20175 20175 1.00000000000000e+00
+20176 20176 1.00000000000000e+00
+20177 20177 1.00000000000000e+00
+20178 20178 1.00000000000000e+00
+20179 20179 1.00000000000000e+00
+20180 20180 1.00000000000000e+00
+20181 20181 1.00000000000000e+00
+20182 20182 1.00000000000000e+00
+20183 20183 1.00000000000000e+00
+20184 8709 -1.20177584135251e-02
+20184 8733 -4.94140797644601e-02
+20184 8757 -1.02953049434361e-02
+20184 8781 -6.22249116570470e-07
+20184 9285 -5.56934197282932e-03
+20184 9309 -5.94848422720141e-01
+20184 9333 -2.01599738264808e+00
+20184 9357 -9.93116571711688e-01
+20184 9381 -4.20503355344801e-02
+20184 9405 -8.76502208940883e-06
+20184 9885 -6.02435661366252e-02
+20184 9909 -2.30331252695501e+00
+20184 9933 -8.86448444529016e+00
+20184 9957 -3.78383013424043e+00
+20184 9981 -1.94900128605116e-01
+20184 10005 -1.80659238066762e-05
+20184 10485 -3.39204386699666e-02
+20184 10509 -1.18550249725814e+00
+20184 10533 -4.25765599427593e+00
+20184 10557 -1.97095422806587e+00
+20184 10581 -8.21777190579342e-02
+20184 11085 -8.35721701630065e-05
+20184 11109 -5.17816687505501e-02
+20184 11133 -2.45488223812452e-01
+20184 11157 -1.09952822002811e-01
+20184 11181 -7.66819923937583e-04
+20184 11733 -3.40800829606925e-05
+20184 11757 -4.71154979898957e-05
+20184 20184 7.61989303799190e+00
+20184 19320 1.95169726494294e-02
+20184 19344 1.59552391082962e-01
+20184 19368 3.67058006646690e-01
+20184 19392 1.67896628710378e-01
+20184 19416 2.16030320562834e-02
+20184 19728 1.58909152704619e-01
+20184 19752 1.28620340208266e+00
+20184 19776 2.93408796318915e+00
+20184 19800 1.34221337297530e+00
+20184 19824 1.72911645427777e-01
+20184 20136 3.64809417098178e-01
+20184 20160 2.92511695842670e+00
+20184 20208 3.03214513306497e+00
+20184 20232 3.91566460757745e-01
+20184 20544 1.68550846191475e-01
+20184 20568 1.34235070311274e+00
+20184 20592 3.02350107634502e+00
+20184 20616 1.39759114541162e+00
+20184 20640 1.82360956766195e-01
+20184 20952 2.19273960211435e-02
+20184 20976 1.73589216340481e-01
+20184 21000 3.89411284935658e-01
+20184 21024 1.81741071819458e-01
+20184 21048 2.39653598908880e-02
+20185 20185 1.00000000000000e+00
+20186 20186 1.00000000000000e+00
+20187 20187 1.00000000000000e+00
+20188 20188 1.00000000000000e+00
+20189 20189 1.00000000000000e+00
+20190 20190 1.00000000000000e+00
+20191 20191 1.00000000000000e+00
+20192 20192 1.00000000000000e+00
+20193 20193 1.00000000000000e+00
+20194 20194 1.00000000000000e+00
+20195 20195 1.00000000000000e+00
+20196 20196 1.00000000000000e+00
+20197 20197 1.00000000000000e+00
+20198 20198 1.00000000000000e+00
+20199 20199 1.00000000000000e+00
+20200 20200 1.00000000000000e+00
+20201 20201 1.00000000000000e+00
+20202 20202 1.00000000000000e+00
+20203 20203 1.00000000000000e+00
+20204 20204 1.00000000000000e+00
+20205 20205 1.00000000000000e+00
+20206 20206 1.00000000000000e+00
+20207 20207 1.00000000000000e+00
+20208 8709 -2.22255490871330e-07
+20208 8733 -2.61242579381700e-03
+20208 8757 -1.94381303127232e-03
+20208 8781 -3.81408583499220e-07
+20208 9309 -1.39338207108136e-02
+20208 9333 -3.72818880152228e-01
+20208 9357 -6.98575913356137e-01
+20208 9381 -1.56845308931476e-01
+20208 9405 -1.21570673088838e-03
+20208 9885 -1.60601360825510e-05
+20208 9909 -2.24374614877640e-01
+20208 9933 -3.64519484217998e+00
+20208 9957 -6.73991693558084e+00
+20208 9981 -1.46587366422923e+00
+20208 10005 -3.78886813069660e-02
+20208 10485 -2.48574860122963e-04
+20208 10509 -2.51340603069221e-01
+20208 10533 -4.10122884318582e+00
+20208 10557 -7.59830514439925e+00
+20208 10581 -1.73717993124595e+00
+20208 10605 -2.22660675726951e-02
+20208 11085 -9.43368006238351e-06
+20208 11109 -2.46988284185836e-02
+20208 11133 -6.03687179371132e-01
+20208 11157 -1.01738905164712e+00
+20208 11181 -2.28262293221435e-01
+20208 11205 -1.86284564303335e-04
+20208 11733 -7.23038149697048e-04
+20208 11757 -9.50245677540129e-03
+20208 11781 -1.76545037455339e-03
+20208 20208 8.07954935078669e+00
+20208 19344 2.03711251213111e-02
+20208 19368 1.67896628710378e-01
+20208 19392 3.92596920386018e-01
+20208 19416 1.92721257681825e-01
+20208 19440 2.65772823641727e-02
+20208 19752 1.62641697816043e-01
+20208 19776 1.34221337297530e+00
+20208 19800 3.13383615769576e+00
+20208 19824 1.51007911385203e+00
+20208 19848 2.04608133035226e-01
+20208 20160 3.66469822508484e-01
+20208 20184 3.03214513306497e+00
+20208 20232 3.35833046764721e+00
+20208 20256 4.48016156154042e-01
+20208 20568 1.67036829586706e-01
+20208 20592 1.39759114541162e+00
+20208 20616 3.29608257932734e+00
+20208 20640 1.57452559299057e+00
+20208 20664 2.11270441481444e-01
+20208 20976 2.14699080639767e-02
+20208 21000 1.81741071819458e-01
+20208 21024 4.33158525793911e-01
+20208 21048 2.08832877466460e-01
+20208 21072 2.82428594757271e-02
+20209 20209 1.00000000000000e+00
+20210 20210 1.00000000000000e+00
+20211 20211 1.00000000000000e+00
+20212 20212 1.00000000000000e+00
+20213 20213 1.00000000000000e+00
+20214 20214 1.00000000000000e+00
+20215 20215 1.00000000000000e+00
+20216 20216 1.00000000000000e+00
+20217 20217 1.00000000000000e+00
+20218 20218 1.00000000000000e+00
+20219 20219 1.00000000000000e+00
+20220 20220 1.00000000000000e+00
+20221 20221 1.00000000000000e+00
+20222 20222 1.00000000000000e+00
+20223 20223 1.00000000000000e+00
+20224 20224 1.00000000000000e+00
+20225 20225 1.00000000000000e+00
+20226 20226 1.00000000000000e+00
+20227 20227 1.00000000000000e+00
+20228 20228 1.00000000000000e+00
+20229 20229 1.00000000000000e+00
+20230 20230 1.00000000000000e+00
+20231 20231 1.00000000000000e+00
+20232 8733 -7.74689897242070e-07
+20232 8757 -1.03954862092587e-05
+20232 8781 -6.02256811617600e-08
+20232 9333 -1.29970123836129e-02
+20232 9357 -1.53167292222670e-01
+20232 9381 -1.32485464574330e-01
+20232 9405 -5.08853050101858e-03
+20232 9909 -4.19129189440235e-04
+20232 9933 -4.69701797998805e-01
+20232 9957 -3.40661737920486e+00
+20232 9981 -3.24277390370992e+00
+20232 10005 -2.94052989407060e-01
+20232 10029 -1.52616840616765e-03
+20232 10509 -9.54620552641516e-03
+20232 10533 -1.09956716241355e+00
+20232 10557 -8.89099175463561e+00
+20232 10581 -7.16654941689160e+00
+20232 10605 -5.87225973957996e-01
+20232 10629 -1.90946386181230e-03
+20232 11109 -3.26638239810662e-03
+20232 11133 -3.75923620321781e-01
+20232 11157 -2.67231919083987e+00
+20232 11181 -1.76103804557894e+00
+20232 11205 -1.57674992663912e-01
+20232 11229 -2.54630692488367e-06
+20232 11733 -2.41565249248572e-03
+20232 11757 -5.51496939522473e-02
+20232 11781 -4.67880445595058e-02
+20232 11805 -1.54634762008407e-03
+20232 20232 8.86754832094181e+00
+20232 19368 2.16030320562834e-02
+20232 19392 1.92721257681825e-01
+20232 19416 4.67796934250352e-01
+20232 19440 1.90138666925909e-01
+20232 19464 2.09573843673046e-02
+20232 19776 1.72911645427777e-01
+20232 19800 1.51007911385203e+00
+20232 19824 3.59834989756732e+00
+20232 19848 1.42526502644432e+00
+20232 19872 1.51708123575848e-01
+20232 20184 3.91566460757745e-01
+20232 20208 3.35833046764721e+00
+20232 20256 3.02295807149268e+00
+20232 20280 3.07723361719113e-01
+20232 20592 1.82360956766195e-01
+20232 20616 1.57452559299057e+00
+20232 20640 3.69157313827716e+00
+20232 20664 1.36062223715692e+00
+20232 20688 1.28885117807783e-01
+20232 21000 2.39653598908880e-02
+20232 21024 2.08832877466460e-01
+20232 21048 4.91102744427810e-01
+20232 21072 1.73977969604061e-01
+20232 21096 1.52516329252881e-02
+20233 20233 1.00000000000000e+00
+20234 20234 1.00000000000000e+00
+20235 20235 1.00000000000000e+00
+20236 20236 1.00000000000000e+00
+20237 20237 1.00000000000000e+00
+20238 20238 1.00000000000000e+00
+20239 20239 1.00000000000000e+00
+20240 20240 1.00000000000000e+00
+20241 20241 1.00000000000000e+00
+20242 20242 1.00000000000000e+00
+20243 20243 1.00000000000000e+00
+20244 20244 1.00000000000000e+00
+20245 20245 1.00000000000000e+00
+20246 20246 1.00000000000000e+00
+20247 20247 1.00000000000000e+00
+20248 20248 1.00000000000000e+00
+20249 20249 1.00000000000000e+00
+20250 20250 1.00000000000000e+00
+20251 20251 1.00000000000000e+00
+20252 20252 1.00000000000000e+00
+20253 20253 1.00000000000000e+00
+20254 20254 1.00000000000000e+00
+20255 20255 1.00000000000000e+00
+20256 9357 -8.22518959263092e-03
+20256 9381 -2.75544390262789e-02
+20256 9405 -2.60936372640854e-03
+20256 9933 -4.35560139697704e-03
+20256 9957 -5.23272904718805e-01
+20256 9981 -1.56020234216348e+00
+20256 10005 -9.00513750001273e-01
+20256 10029 -3.73800305753866e-02
+20256 10533 -7.55358123396626e-02
+20256 10557 -2.49991636289083e+00
+20256 10581 -1.02980360621151e+01
+20256 10605 -7.22856710572093e+00
+20256 10629 -7.27606402896119e-02
+20256 11133 -6.28594643042406e-02
+20256 11157 -1.43888709538295e+00
+20256 11181 -9.05696095074154e+00
+20256 11205 -4.99269484567977e+00
+20256 11229 -6.07278449815352e-04
+20256 11733 -7.25522370285957e-04
+20256 11757 -1.07496598483684e-01
+20256 11781 -6.32999049357007e-01
+20256 11805 -9.08396678634940e-02
+20256 20256 9.96801212356314e+00
+20256 19392 2.65772823641727e-02
+20256 19416 1.90138666925909e-01
+20256 19440 4.67222114420697e-01
+20256 19464 2.94482901828521e-01
+20256 19800 2.04608133035226e-01
+20256 19824 1.42526502644431e+00
+20256 19848 3.89793934425668e+00
+20256 19872 3.13883496231905e+00
+20256 20208 4.48016156154042e-01
+20256 20232 3.02295807149268e+00
+20256 20280 8.42373780668266e+00
+20256 20616 2.11270441481444e-01
+20256 20640 1.36062223715692e+00
+20256 20664 3.56739673796148e+00
+20256 20688 3.10346929434207e+00
+20256 21024 2.82428594757271e-02
+20256 21048 1.73977969604061e-01
+20256 21072 3.84586462846899e-01
+20256 21096 2.85641484834276e-01
+20257 20257 1.00000000000000e+00
+20258 20258 1.00000000000000e+00
+20259 20259 1.00000000000000e+00
+20260 20260 1.00000000000000e+00
+20261 20261 1.00000000000000e+00
+20262 20262 1.00000000000000e+00
+20263 20263 1.00000000000000e+00
+20264 20264 1.00000000000000e+00
+20265 20265 1.00000000000000e+00
+20266 20266 1.00000000000000e+00
+20267 20267 1.00000000000000e+00
+20268 20268 1.00000000000000e+00
+20269 20269 1.00000000000000e+00
+20270 20270 1.00000000000000e+00
+20271 20271 1.00000000000000e+00
+20272 20272 1.00000000000000e+00
+20273 20273 1.00000000000000e+00
+20274 20274 1.00000000000000e+00
+20275 20275 1.00000000000000e+00
+20276 20276 1.00000000000000e+00
+20277 20277 1.00000000000000e+00
+20278 20278 1.00000000000000e+00
+20279 20279 1.00000000000000e+00
+20280 9357 -1.98860187077000e-09
+20280 9381 -6.75108151057785e-04
+20280 9405 -3.57181806112211e-04
+20280 9957 -6.67400920711639e-03
+20280 9981 -2.77611194666462e-01
+20280 10005 -7.26009893524992e-01
+20280 10029 -6.40768823075997e-02
+20280 10533 -4.23031447744498e-06
+20280 10557 -1.70767136446982e-01
+20280 10581 -7.62575536054883e+00
+20280 10605 -1.09254701506259e+01
+20280 10629 -1.32155033546538e-01
+20280 11133 -2.44065315422997e-04
+20280 11157 -3.00034719279313e-01
+20280 11181 -1.16470936735658e+01
+20280 11205 -8.88650814138403e+00
+20280 11229 -1.19673275115652e-03
+20280 11733 -3.47011381079200e-05
+20280 11757 -7.14390121570512e-02
+20280 11781 -9.84383496535862e-01
+20280 11805 -1.70854902386400e-01
+20280 20280 1.56934120813315e+01
+20280 19416 2.09573843673046e-02
+20280 19440 2.94482901828521e-01
+20280 19464 4.42264113085910e-01
+20280 19824 1.51708123575848e-01
+20280 19848 3.13883496231905e+00
+20280 19872 5.21571305960715e+00
+20280 20232 3.07723361719113e-01
+20280 20256 8.42373780668266e+00
+20280 20640 1.28885117807783e-01
+20280 20664 3.10346929434207e+00
+20280 20688 5.30474276402965e+00
+20280 21048 1.52516329252881e-02
+20280 21072 2.85641484834276e-01
+20280 21096 4.64521539191535e-01
+20281 20281 1.00000000000000e+00
+20282 20282 1.00000000000000e+00
+20283 20283 1.00000000000000e+00
+20284 20284 1.00000000000000e+00
+20285 20285 1.00000000000000e+00
+20286 20286 1.00000000000000e+00
+20287 20287 1.00000000000000e+00
+20288 20288 1.00000000000000e+00
+20289 20289 1.00000000000000e+00
+20290 20290 1.00000000000000e+00
+20291 20291 1.00000000000000e+00
+20292 20292 1.00000000000000e+00
+20293 20293 1.00000000000000e+00
+20294 20294 1.00000000000000e+00
+20295 20295 1.00000000000000e+00
+20296 20296 1.00000000000000e+00
+20297 20297 1.00000000000000e+00
+20298 20298 1.00000000000000e+00
+20299 20299 1.00000000000000e+00
+20300 20300 1.00000000000000e+00
+20301 20301 1.00000000000000e+00
+20302 20302 1.00000000000000e+00
+20303 20303 1.00000000000000e+00
+20304 6141 -2.68177621415987e-05
+20304 6165 -3.95711006277205e-05
+20304 6717 -2.54244484549936e-06
+20304 6741 -1.19951607928589e+00
+20304 6765 -1.18740850620942e+00
+20304 6789 -6.82991249166325e-03
+20304 7317 -5.65787260988338e-01
+20304 7341 -1.13558941478981e+01
+20304 7365 -3.96155814643469e+00
+20304 7389 -4.16778281377548e-02
+20304 7917 -2.29847746643470e+00
+20304 7941 -9.31757742472422e+00
+20304 7965 -1.51207846681759e+00
+20304 7989 -1.29413237855621e-02
+20304 8517 -4.03388434389498e-01
+20304 8541 -6.50483221529814e-01
+20304 8565 -6.09452274392234e-02
+20304 8589 -1.04201598584567e-05
+20304 9117 -2.73434565390910e-07
+20304 9141 -2.15737240607035e-04
+20304 9165 -7.56520811581509e-05
+20304 20304 9.51025959481658e+00
+20304 19488 7.95533395614533e-01
+20304 19512 4.58896910370858e-01
+20304 19536 1.74657750181689e-02
+20304 19896 4.92634717205973e+00
+20304 19920 2.99017165115070e+00
+20304 19944 1.50570875748807e-01
+20304 20328 5.50134950102227e+00
+20304 20352 3.56062772461130e-01
+20304 20712 4.69570095278428e+00
+20304 20736 2.85105021759669e+00
+20304 20760 1.43771354629870e-01
+20304 21120 7.37871840795673e-01
+20304 21144 4.24116551982357e-01
+20304 21168 1.57658947384346e-02
+20305 20305 1.00000000000000e+00
+20306 20306 1.00000000000000e+00
+20307 20307 1.00000000000000e+00
+20308 20308 1.00000000000000e+00
+20309 20309 1.00000000000000e+00
+20310 20310 1.00000000000000e+00
+20311 20311 1.00000000000000e+00
+20312 20312 1.00000000000000e+00
+20313 20313 1.00000000000000e+00
+20314 20314 1.00000000000000e+00
+20315 20315 1.00000000000000e+00
+20316 20316 1.00000000000000e+00
+20317 20317 1.00000000000000e+00
+20318 20318 1.00000000000000e+00
+20319 20319 1.00000000000000e+00
+20320 20320 1.00000000000000e+00
+20321 20321 1.00000000000000e+00
+20322 20322 1.00000000000000e+00
+20323 20323 1.00000000000000e+00
+20324 20324 1.00000000000000e+00
+20325 20325 1.00000000000000e+00
+20326 20326 1.00000000000000e+00
+20327 20327 1.00000000000000e+00
+20328 6141 -1.35540959531500e-05
+20328 6165 -2.00170805911738e-05
+20328 6717 -1.27580809196146e-06
+20328 6741 -6.70418245275494e-01
+20328 6765 -8.34970990283429e-01
+20328 6789 -3.21841845409029e-02
+20328 6813 -2.56465629442634e-05
+20328 7317 -3.07481855106383e-01
+20328 7341 -8.06189223988921e+00
+20328 7365 -5.66644235563031e+00
+20328 7389 -5.39531734989157e-01
+20328 7413 -4.76276778342322e-03
+20328 7917 -1.30109975791992e+00
+20328 7941 -9.03319033806739e+00
+20328 7965 -6.68777816209307e+00
+20328 7989 -8.76028072878747e-01
+20328 8013 -2.05883233787831e-03
+20328 8517 -2.52264035490324e-01
+20328 8541 -1.10367230428954e+00
+20328 8565 -1.10467050991718e+00
+20328 8589 -1.38745469119397e-01
+20328 8613 -3.15286122116000e-09
+20328 9117 -1.32403957025803e-06
+20328 9141 -6.78156064318135e-03
+20328 9165 -1.94860308560980e-02
+20328 9189 -6.16935639697755e-04
+20328 20328 9.23470004433118e+00
+20328 19488 4.58896910370858e-01
+20328 19512 4.98566153261160e-01
+20328 19536 1.68250491358143e-01
+20328 19560 2.45968478213669e-02
+20328 19896 2.99017165115070e+00
+20328 19920 3.81228929594170e+00
+20328 19944 1.43912834252726e+00
+20328 19968 2.09211209883004e-01
+20328 20304 5.50134950102227e+00
+20328 20352 3.42083700730064e+00
+20328 20376 4.99146479364012e-01
+20328 20712 2.85105021759669e+00
+20328 20736 3.67416532082411e+00
+20328 20760 1.51845040734964e+00
+20328 20784 2.35841247207535e-01
+20328 21120 4.24116551982357e-01
+20328 21144 4.64035159481762e-01
+20328 21168 1.88081007563737e-01
+20328 21192 3.12543571524997e-02
+20329 20329 1.00000000000000e+00
+20330 20330 1.00000000000000e+00
+20331 20331 1.00000000000000e+00
+20332 20332 1.00000000000000e+00
+20333 20333 1.00000000000000e+00
+20334 20334 1.00000000000000e+00
+20335 20335 1.00000000000000e+00
+20336 20336 1.00000000000000e+00
+20337 20337 1.00000000000000e+00
+20338 20338 1.00000000000000e+00
+20339 20339 1.00000000000000e+00
+20340 20340 1.00000000000000e+00
+20341 20341 1.00000000000000e+00
+20342 20342 1.00000000000000e+00
+20343 20343 1.00000000000000e+00
+20344 20344 1.00000000000000e+00
+20345 20345 1.00000000000000e+00
+20346 20346 1.00000000000000e+00
+20347 20347 1.00000000000000e+00
+20348 20348 1.00000000000000e+00
+20349 20349 1.00000000000000e+00
+20350 20350 1.00000000000000e+00
+20351 20351 1.00000000000000e+00
+20352 6141 -4.14899663859000e-08
+20352 6165 -6.61515078038700e-08
+20352 6717 -1.31019120337000e-09
+20352 6741 -2.01988474371417e-02
+20352 6765 -1.01470518843151e-01
+20352 6789 -3.98639657652787e-02
+20352 6813 -1.18646387859604e-04
+20352 7317 -7.02520703206106e-03
+20352 7341 -7.93553797255174e-01
+20352 7365 -3.34211054867202e+00
+20352 7389 -1.74396899578497e+00
+20352 7413 -7.51061278934850e-02
+20352 7437 -2.65552428960317e-05
+20352 7917 -4.35226319330417e-02
+20352 7941 -2.41236416441358e+00
+20352 7965 -1.18093709731942e+01
+20352 7989 -5.11917555376150e+00
+20352 8013 -2.38646796391965e-01
+20352 8037 -3.13185518468501e-05
+20352 8517 -1.51639929481643e-02
+20352 8541 -1.07744492518081e+00
+20352 8565 -4.28313906253398e+00
+20352 8589 -1.87921702765295e+00
+20352 8613 -7.66304469585017e-02
+20352 9117 -1.19463980016843e-06
+20352 9141 -2.56556343381732e-02
+20352 9165 -1.63888366341898e-01
+20352 9189 -7.56563029286511e-02
+20352 9213 -3.42380297403747e-04
+20352 9765 -2.63635274781210e-07
+20352 9789 -5.30610853420250e-07
+20352 20352 9.77556496807954e+00
+20352 19488 1.74657750181689e-02
+20352 19512 1.68250491358143e-01
+20352 19536 4.32485248224015e-01
+20352 19560 1.84267023541372e-01
+20352 19584 2.14699080639762e-02
+20352 19896 1.50570875748807e-01
+20352 19920 1.43912834252726e+00
+20352 19944 3.67969130569640e+00
+20352 19968 1.56380912680985e+00
+20352 19992 1.81741071819454e-01
+20352 20304 3.56062772461130e-01
+20352 20328 3.42083700730064e+00
+20352 20376 3.72922002063173e+00
+20352 20400 4.33158525793901e-01
+20352 20712 1.43771354629870e-01
+20352 20736 1.51845040734964e+00
+20352 20760 4.12606418741697e+00
+20352 20784 1.77869649869598e+00
+20352 20808 2.08832877466454e-01
+20352 21120 1.57658947384346e-02
+20352 21144 1.88081007563737e-01
+20352 21168 5.44078468654156e-01
+20352 21192 2.37988866512904e-01
+20352 21216 2.82428594757262e-02
+20353 20353 1.00000000000000e+00
+20354 20354 1.00000000000000e+00
+20355 20355 1.00000000000000e+00
+20356 20356 1.00000000000000e+00
+20357 20357 1.00000000000000e+00
+20358 20358 1.00000000000000e+00
+20359 20359 1.00000000000000e+00
+20360 20360 1.00000000000000e+00
+20361 20361 1.00000000000000e+00
+20362 20362 1.00000000000000e+00
+20363 20363 1.00000000000000e+00
+20364 20364 1.00000000000000e+00
+20365 20365 1.00000000000000e+00
+20366 20366 1.00000000000000e+00
+20367 20367 1.00000000000000e+00
+20368 20368 1.00000000000000e+00
+20369 20369 1.00000000000000e+00
+20370 20370 1.00000000000000e+00
+20371 20371 1.00000000000000e+00
+20372 20372 1.00000000000000e+00
+20373 20373 1.00000000000000e+00
+20374 20374 1.00000000000000e+00
+20375 20375 1.00000000000000e+00
+20376 6741 -2.75079980372752e-06
+20376 6765 -8.79520094271818e-03
+20376 6789 -9.44696404610521e-03
+20376 6813 -8.98871072744660e-05
+20376 7341 -3.02687018809982e-02
+20376 7365 -7.08432062787719e-01
+20376 7389 -1.19479722097738e+00
+20376 7413 -2.70400200659878e-01
+20376 7437 -3.08070724295751e-03
+20376 7917 -3.60143894674420e-05
+20376 7941 -3.15687715384813e-01
+20376 7965 -4.89729124264455e+00
+20376 7989 -8.63045626787830e+00
+20376 8013 -1.69477015015130e+00
+20376 8037 -3.91570541987395e-02
+20376 8517 -1.92627463307734e-04
+20376 8541 -2.65653515247318e-01
+20376 8565 -3.98187100407150e+00
+20376 8589 -6.94499300146922e+00
+20376 8613 -1.48312847787424e+00
+20376 8637 -1.68136550660147e-02
+20376 9117 -2.30301308694380e-07
+20376 9141 -1.29804131789666e-02
+20376 9165 -4.02728245207720e-01
+20376 9189 -6.47334861429464e-01
+20376 9213 -1.30904245935936e-01
+20376 9237 -5.96109218410204e-05
+20376 9765 -4.51231632600853e-05
+20376 9789 -2.12602681745384e-03
+20376 9813 -5.31919679444246e-04
+20376 20376 8.82054501110461e+00
+20376 19512 2.45968478213669e-02
+20376 19536 1.84267023541372e-01
+20376 19560 3.88404676177686e-01
+20376 19584 1.67036829586704e-01
+20376 19608 2.02892993326998e-02
+20376 19920 2.09211209883004e-01
+20376 19944 1.56380912680985e+00
+20376 19968 3.28472507352778e+00
+20376 19992 1.39759114541160e+00
+20376 20016 1.67656714533442e-01
+20376 20328 4.99146479364012e-01
+20376 20352 3.72922002063173e+00
+20376 20400 3.29608257932730e+00
+20376 20424 3.90862119037907e-01
+20376 20736 2.35841247207535e-01
+20376 20760 1.77869649869598e+00
+20376 20784 3.76196580745206e+00
+20376 20808 1.57452559299054e+00
+20376 20832 1.84798520781177e-01
+20376 21144 3.12543571524997e-02
+20376 21168 2.37988866512904e-01
+20376 21192 5.07714859658753e-01
+20376 21216 2.11270441481439e-01
+20376 21240 2.45747508946335e-02
+20377 20377 1.00000000000000e+00
+20378 20378 1.00000000000000e+00
+20379 20379 1.00000000000000e+00
+20380 20380 1.00000000000000e+00
+20381 20381 1.00000000000000e+00
+20382 20382 1.00000000000000e+00
+20383 20383 1.00000000000000e+00
+20384 20384 1.00000000000000e+00
+20385 20385 1.00000000000000e+00
+20386 20386 1.00000000000000e+00
+20387 20387 1.00000000000000e+00
+20388 20388 1.00000000000000e+00
+20389 20389 1.00000000000000e+00
+20390 20390 1.00000000000000e+00
+20391 20391 1.00000000000000e+00
+20392 20392 1.00000000000000e+00
+20393 20393 1.00000000000000e+00
+20394 20394 1.00000000000000e+00
+20395 20395 1.00000000000000e+00
+20396 20396 1.00000000000000e+00
+20397 20397 1.00000000000000e+00
+20398 20398 1.00000000000000e+00
+20399 20399 1.00000000000000e+00
+20400 6765 -9.43368006238332e-06
+20400 6789 -2.48574860122958e-04
+20400 6813 -1.60601360825507e-05
+20400 7365 -2.46988284185831e-02
+20400 7389 -2.51340603069217e-01
+20400 7413 -2.24374614877639e-01
+20400 7437 -1.39338207108137e-02
+20400 7461 -2.22255490871340e-07
+20400 7941 -7.23038149697026e-04
+20400 7965 -6.03687179371153e-01
+20400 7989 -4.10122884318578e+00
+20400 8013 -3.64519484217998e+00
+20400 8037 -3.72818880152232e-01
+20400 8061 -2.61242579381709e-03
+20400 8541 -9.50245677540098e-03
+20400 8565 -1.01738905164710e+00
+20400 8589 -7.59830514439921e+00
+20400 8613 -6.73991693558079e+00
+20400 8637 -6.98575913356126e-01
+20400 8661 -1.94381303127238e-03
+20400 9141 -1.76545037455334e-03
+20400 9165 -2.28262293221430e-01
+20400 9189 -1.73717993124594e+00
+20400 9213 -1.46587366422920e+00
+20400 9237 -1.56845308931473e-01
+20400 9261 -3.81408583499220e-07
+20400 9765 -1.86284564303333e-04
+20400 9789 -2.22660675726958e-02
+20400 9813 -3.78886813069682e-02
+20400 9837 -1.21570673088845e-03
+20400 20400 8.07954935078666e+00
+20400 19536 2.14699080639762e-02
+20400 19560 1.67036829586704e-01
+20400 19584 3.66469822508484e-01
+20400 19608 1.62641697816046e-01
+20400 19632 2.03711251213117e-02
+20400 19944 1.81741071819454e-01
+20400 19968 1.39759114541160e+00
+20400 19992 3.03214513306497e+00
+20400 20016 1.34221337297529e+00
+20400 20040 1.67896628710377e-01
+20400 20352 4.33158525793901e-01
+20400 20376 3.29608257932730e+00
+20400 20424 3.13383615769572e+00
+20400 20448 3.92596920386007e-01
+20400 20760 2.08832877466454e-01
+20400 20784 1.57452559299055e+00
+20400 20808 3.35833046764719e+00
+20400 20832 1.51007911385204e+00
+20400 20856 1.92721257681828e-01
+20400 21168 2.82428594757262e-02
+20400 21192 2.11270441481439e-01
+20400 21216 4.48016156154037e-01
+20400 21240 2.04608133035232e-01
+20400 21264 2.65772823641744e-02
+20401 20401 1.00000000000000e+00
+20402 20402 1.00000000000000e+00
+20403 20403 1.00000000000000e+00
+20404 20404 1.00000000000000e+00
+20405 20405 1.00000000000000e+00
+20406 20406 1.00000000000000e+00
+20407 20407 1.00000000000000e+00
+20408 20408 1.00000000000000e+00
+20409 20409 1.00000000000000e+00
+20410 20410 1.00000000000000e+00
+20411 20411 1.00000000000000e+00
+20412 20412 1.00000000000000e+00
+20413 20413 1.00000000000000e+00
+20414 20414 1.00000000000000e+00
+20415 20415 1.00000000000000e+00
+20416 20416 1.00000000000000e+00
+20417 20417 1.00000000000000e+00
+20418 20418 1.00000000000000e+00
+20419 20419 1.00000000000000e+00
+20420 20420 1.00000000000000e+00
+20421 20421 1.00000000000000e+00
+20422 20422 1.00000000000000e+00
+20423 20423 1.00000000000000e+00
+20424 7389 -1.23920601170133e-02
+20424 7413 -5.20208389584623e-02
+20424 7437 -1.10223094013724e-02
+20424 7461 -9.73631128109090e-07
+20424 7965 -5.60829570506775e-03
+20424 7989 -6.26267686291771e-01
+20424 8013 -2.10508368685634e+00
+20424 8037 -1.01643732635631e+00
+20424 8061 -4.08970490628936e-02
+20424 8085 -9.82651904440218e-06
+20424 8565 -6.35762543224464e-02
+20424 8589 -2.46519311509008e+00
+20424 8613 -9.44829471250603e+00
+20424 8637 -3.93415720552648e+00
+20424 8661 -1.90167096788184e-01
+20424 8685 -2.02242391247022e-05
+20424 9165 -3.63021842950981e-02
+20424 9189 -1.35589596977103e+00
+20424 9213 -4.72026243498148e+00
+20424 9237 -2.05289357518908e+00
+20424 9261 -8.46942034598062e-02
+20424 9765 -8.30543836998000e-05
+20424 9789 -6.04023209590331e-02
+20424 9813 -2.74822116270502e-01
+20424 9837 -1.15666008616462e-01
+20424 9861 -8.34346672447792e-04
+20424 10413 -3.23866062505992e-05
+20424 10437 -4.66156117326021e-05
+20424 20424 8.06500579410394e+00
+20424 19560 2.02892993326998e-02
+20424 19584 1.62641697816046e-01
+20424 19608 3.65750055595983e-01
+20424 19632 1.59575517774427e-01
+20424 19656 1.95227543222949e-02
+20424 19968 1.67656714533442e-01
+20424 19992 1.34221337297529e+00
+20424 20016 3.01906849351879e+00
+20424 20040 1.33184939331854e+00
+20424 20064 1.65065719619253e-01
+20424 20376 3.90862119037907e-01
+20424 20400 3.13383615769572e+00
+20424 20448 3.14075947710273e+00
+20424 20472 3.92592948889661e-01
+20424 20784 1.84798520781177e-01
+20424 20808 1.51007911385204e+00
+20424 20832 3.45599888700886e+00
+20424 20856 1.52152600400078e+00
+20424 20880 1.87660243318363e-01
+20424 21192 2.45747508946335e-02
+20424 21216 2.04608133035232e-01
+20424 21240 4.74982653968496e-01
+20424 21264 2.06994670444987e-01
+20424 21288 2.51713852470724e-02
+20425 20425 1.00000000000000e+00
+20426 20426 1.00000000000000e+00
+20427 20427 1.00000000000000e+00
+20428 20428 1.00000000000000e+00
+20429 20429 1.00000000000000e+00
+20430 20430 1.00000000000000e+00
+20431 20431 1.00000000000000e+00
+20432 20432 1.00000000000000e+00
+20433 20433 1.00000000000000e+00
+20434 20434 1.00000000000000e+00
+20435 20435 1.00000000000000e+00
+20436 20436 1.00000000000000e+00
+20437 20437 1.00000000000000e+00
+20438 20438 1.00000000000000e+00
+20439 20439 1.00000000000000e+00
+20440 20440 1.00000000000000e+00
+20441 20441 1.00000000000000e+00
+20442 20442 1.00000000000000e+00
+20443 20443 1.00000000000000e+00
+20444 20444 1.00000000000000e+00
+20445 20445 1.00000000000000e+00
+20446 20446 1.00000000000000e+00
+20447 20447 1.00000000000000e+00
+20448 7389 -1.61126130499370e-07
+20448 7413 -2.65351095419149e-03
+20448 7437 -2.05148678363387e-03
+20448 7461 -5.60692149366320e-07
+20448 7989 -1.42016680674155e-02
+20448 8013 -3.78249300822858e-01
+20448 8037 -6.65735053161066e-01
+20448 8061 -1.43215743617082e-01
+20448 8085 -9.85286141680809e-04
+20448 8565 -1.69759551982035e-05
+20448 8589 -2.40577424961976e-01
+20448 8613 -3.73729413925654e+00
+20448 8637 -6.59932721052835e+00
+20448 8661 -1.29413504052001e+00
+20448 8685 -2.95734225758230e-02
+20448 9165 -2.68364539589388e-04
+20448 9189 -2.85679637321201e-01
+20448 9213 -4.21473093150741e+00
+20448 9237 -7.39535321592705e+00
+20448 9261 -1.52417843992889e+00
+20448 9285 -1.83378568091777e-02
+20448 9765 -9.74644038470989e-06
+20448 9789 -2.65648743547455e-02
+20448 9813 -6.13134529254272e-01
+20448 9837 -9.54578846059280e-01
+20448 9861 -1.98962185579805e-01
+20448 9885 -1.77369989909078e-04
+20448 10413 -6.01640639348681e-04
+20448 10437 -8.17707393505363e-03
+20448 10461 -1.58120002869853e-03
+20448 20448 8.05020205385255e+00
+20448 19584 2.03711251213117e-02
+20448 19608 1.59575517774427e-01
+20448 19632 3.52314972451359e-01
+20448 19656 1.56410129982493e-01
+20448 19680 1.95797781733282e-02
+20448 19992 1.67896628710377e-01
+20448 20016 1.33184939331854e+00
+20448 20040 2.97014860592259e+00
+20448 20064 1.30506473169344e+00
+20448 20088 1.61200463304104e-01
+20448 20400 3.92596920386007e-01
+20448 20424 3.14075947710273e+00
+20448 20472 3.07484360048559e+00
+20448 20496 3.76117951231721e-01
+20448 20808 1.92721257681828e-01
+20448 20832 1.52152600400078e+00
+20448 20856 3.37821758384741e+00
+20448 20880 1.48237070556028e+00
+20448 20904 1.82932433071704e-01
+20448 21216 2.65772823641744e-02
+20448 21240 2.06994670444987e-01
+20448 21264 4.54332216932561e-01
+20448 21288 2.00736623449202e-01
+20448 21312 2.50127706152282e-02
+20449 20449 1.00000000000000e+00
+20450 20450 1.00000000000000e+00
+20451 20451 1.00000000000000e+00
+20452 20452 1.00000000000000e+00
+20453 20453 1.00000000000000e+00
+20454 20454 1.00000000000000e+00
+20455 20455 1.00000000000000e+00
+20456 20456 1.00000000000000e+00
+20457 20457 1.00000000000000e+00
+20458 20458 1.00000000000000e+00
+20459 20459 1.00000000000000e+00
+20460 20460 1.00000000000000e+00
+20461 20461 1.00000000000000e+00
+20462 20462 1.00000000000000e+00
+20463 20463 1.00000000000000e+00
+20464 20464 1.00000000000000e+00
+20465 20465 1.00000000000000e+00
+20466 20466 1.00000000000000e+00
+20467 20467 1.00000000000000e+00
+20468 20468 1.00000000000000e+00
+20469 20469 1.00000000000000e+00
+20470 20470 1.00000000000000e+00
+20471 20471 1.00000000000000e+00
+20472 7413 -6.94046372686330e-07
+20472 7437 -1.05416003024272e-05
+20472 7461 -8.46091646237500e-08
+20472 8013 -1.19319310724472e-02
+20472 8037 -1.34841749520500e-01
+20472 8061 -1.06356067585762e-01
+20472 8085 -4.15438031221905e-03
+20472 8589 -3.89332230272238e-04
+20472 8613 -4.57991835894871e-01
+20472 8637 -2.99873944324048e+00
+20472 8661 -2.64139157095857e+00
+20472 8685 -2.58902342369895e-01
+20472 8709 -1.55759882964494e-03
+20472 9189 -9.38575092160662e-03
+20472 9213 -1.05198764373597e+00
+20472 9237 -7.77456076509341e+00
+20472 9261 -6.61043386329543e+00
+20472 9285 -6.49732174719309e-01
+20472 9309 -1.95098127036781e-03
+20472 9789 -3.19873872226592e-03
+20472 9813 -3.41170327114193e-01
+20472 9837 -2.45398170369837e+00
+20472 9861 -1.98400933919515e+00
+20472 9885 -2.07628844917457e-01
+20472 9909 -3.41322157762279e-06
+20472 10413 -1.97260203679881e-03
+20472 10437 -6.14995665721259e-02
+20472 10461 -7.35160147784665e-02
+20472 10485 -2.60171715117959e-03
+20472 20472 7.80038152703614e+00
+20472 19608 1.95227543222949e-02
+20472 19632 1.56410129982493e-01
+20472 19656 3.52487017050835e-01
+20472 19680 1.57070360514464e-01
+20472 19704 1.96878119552877e-02
+20472 20016 1.65065719619253e-01
+20472 20040 1.30506473169344e+00
+20472 20064 2.90903241462988e+00
+20472 20088 1.30383898179606e+00
+20472 20112 1.64759282144908e-01
+20472 20424 3.92592948889661e-01
+20472 20448 3.07484360048559e+00
+20472 20496 3.06407723868175e+00
+20472 20520 3.89901358438703e-01
+20472 20832 1.87660243318363e-01
+20472 20856 1.48237070556028e+00
+20472 20880 3.30531284354300e+00
+20472 20904 1.49466441659605e+00
+20472 20928 1.90733671077306e-01
+20472 21240 2.51713852470724e-02
+20472 21264 2.00736623449202e-01
+20472 21288 4.51557124279110e-01
+20472 21312 2.04776719214461e-01
+20472 21336 2.61814091883872e-02
+20473 20473 1.00000000000000e+00
+20474 20474 1.00000000000000e+00
+20475 20475 1.00000000000000e+00
+20476 20476 1.00000000000000e+00
+20477 20477 1.00000000000000e+00
+20478 20478 1.00000000000000e+00
+20479 20479 1.00000000000000e+00
+20480 20480 1.00000000000000e+00
+20481 20481 1.00000000000000e+00
+20482 20482 1.00000000000000e+00
+20483 20483 1.00000000000000e+00
+20484 20484 1.00000000000000e+00
+20485 20485 1.00000000000000e+00
+20486 20486 1.00000000000000e+00
+20487 20487 1.00000000000000e+00
+20488 20488 1.00000000000000e+00
+20489 20489 1.00000000000000e+00
+20490 20490 1.00000000000000e+00
+20491 20491 1.00000000000000e+00
+20492 20492 1.00000000000000e+00
+20493 20493 1.00000000000000e+00
+20494 20494 1.00000000000000e+00
+20495 20495 1.00000000000000e+00
+20496 8037 -6.01949539313841e-03
+20496 8061 -2.14258727932303e-02
+20496 8085 -2.38851479682786e-03
+20496 8613 -3.43551708160339e-03
+20496 8637 -4.30138184579657e-01
+20496 8661 -1.40261292381429e+00
+20496 8685 -6.56082329760212e-01
+20496 8709 -2.25121796792213e-02
+20496 8733 -3.09439465411300e-06
+20496 9213 -6.27299216796503e-02
+20496 9237 -2.39601445015480e+00
+20496 9261 -8.66875421797863e+00
+20496 9285 -3.42870701505584e+00
+20496 9309 -1.58796974729022e-01
+20496 9333 -1.27615079143268e-05
+20496 9813 -5.38648376009507e-02
+20496 9837 -1.72986038849149e+00
+20496 9861 -5.86868412923070e+00
+20496 9885 -2.40623175819995e+00
+20496 9909 -9.55746831138020e-02
+20496 9933 -1.32206470670000e-10
+20496 10413 -6.79448506998580e-04
+20496 10437 -1.31335544505489e-01
+20496 10461 -4.68654027442273e-01
+20496 10485 -1.82793376238340e-01
+20496 10509 -1.90576692073231e-03
+20496 11061 -3.99843198830997e-04
+20496 11085 -4.19575438955604e-04
+20496 20496 7.99757378523725e+00
+20496 19632 1.95797781733282e-02
+20496 19656 1.57070360514464e-01
+20496 19680 3.53947585031560e-01
+20496 19704 1.56202510115665e-01
+20496 19728 1.93628155736287e-02
+20496 20040 1.61200463304104e-01
+20496 20064 1.30383898179606e+00
+20496 20088 2.95969446118355e+00
+20496 20112 1.30841906282309e+00
+20496 20136 1.62345483560861e-01
+20496 20448 3.76117951231721e-01
+20496 20472 3.06407723868175e+00
+20496 20520 3.09174182969901e+00
+20496 20544 3.83034098986034e-01
+20496 20856 1.82932433071704e-01
+20496 20880 1.49466441659605e+00
+20496 20904 3.41594298496309e+00
+20496 20928 1.48802194292693e+00
+20496 20952 1.81271814654423e-01
+20496 21264 2.50127706152282e-02
+20496 21288 2.04776719214461e-01
+20496 21312 4.68009715976442e-01
+20496 21336 2.01103230141625e-01
+20496 21360 2.40943983470192e-02
+20497 20497 1.00000000000000e+00
+20498 20498 1.00000000000000e+00
+20499 20499 1.00000000000000e+00
+20500 20500 1.00000000000000e+00
+20501 20501 1.00000000000000e+00
+20502 20502 1.00000000000000e+00
+20503 20503 1.00000000000000e+00
+20504 20504 1.00000000000000e+00
+20505 20505 1.00000000000000e+00
+20506 20506 1.00000000000000e+00
+20507 20507 1.00000000000000e+00
+20508 20508 1.00000000000000e+00
+20509 20509 1.00000000000000e+00
+20510 20510 1.00000000000000e+00
+20511 20511 1.00000000000000e+00
+20512 20512 1.00000000000000e+00
+20513 20513 1.00000000000000e+00
+20514 20514 1.00000000000000e+00
+20515 20515 1.00000000000000e+00
+20516 20516 1.00000000000000e+00
+20517 20517 1.00000000000000e+00
+20518 20518 1.00000000000000e+00
+20519 20519 1.00000000000000e+00
+20520 8037 -7.91806544230000e-10
+20520 8061 -6.52984975638916e-04
+20520 8085 -3.60635957870881e-04
+20520 8637 -7.59144487802201e-03
+20520 8661 -2.32391335660982e-01
+20520 8685 -3.95378165876494e-01
+20520 8709 -7.39694930109547e-02
+20520 8733 -2.02821011824119e-04
+20520 9213 -6.01422878122641e-06
+20520 9237 -2.16482774683163e-01
+20520 9261 -3.17368962354501e+00
+20520 9285 -5.27554891058876e+00
+20520 9309 -1.01903277723737e+00
+20520 9333 -2.18011093323539e-02
+20520 9813 -3.69013968260158e-04
+20520 9837 -3.40186827062610e-01
+20520 9861 -4.74306814100734e+00
+20520 9885 -8.08169379493113e+00
+20520 9909 -1.58350204718123e+00
+20520 9933 -2.01656095848385e-02
+20520 10413 -5.18385731630741e-05
+20520 10437 -5.10221569510314e-02
+20520 10461 -9.34677063180309e-01
+20520 10485 -1.41134525042513e+00
+20520 10509 -2.97980555261447e-01
+20520 10533 -4.18824570894582e-04
+20520 11061 -3.81933610700300e-03
+20520 11085 -2.38431983512818e-02
+20520 11109 -3.81608675529030e-03
+20520 20520 7.90139368247132e+00
+20520 19656 1.96878119552877e-02
+20520 19680 1.56202510115665e-01
+20520 19704 3.49250348602338e-01
+20520 19728 1.56481212170483e-01
+20520 19752 1.97574874689921e-02
+20520 20064 1.64759282144908e-01
+20520 20088 1.30841906282309e+00
+20520 20112 2.92560588267319e+00
+20520 20136 1.30265738846125e+00
+20520 20160 1.63318863554447e-01
+20520 20472 3.89901358438703e-01
+20520 20496 3.09174182969901e+00
+20520 20544 3.06392335696754e+00
+20520 20568 3.82946740255837e-01
+20520 20880 1.90733671077306e-01
+20520 20904 1.48802194292693e+00
+20520 20928 3.27950601151834e+00
+20520 20952 1.47878048249851e+00
+20520 20976 1.88423305970201e-01
+20520 21288 2.61814091883872e-02
+20520 21312 2.01103230141625e-01
+20520 21336 4.37725380813625e-01
+20520 21360 2.00511985679799e-01
+20520 21384 2.60335980729306e-02
+20521 20521 1.00000000000000e+00
+20522 20522 1.00000000000000e+00
+20523 20523 1.00000000000000e+00
+20524 20524 1.00000000000000e+00
+20525 20525 1.00000000000000e+00
+20526 20526 1.00000000000000e+00
+20527 20527 1.00000000000000e+00
+20528 20528 1.00000000000000e+00
+20529 20529 1.00000000000000e+00
+20530 20530 1.00000000000000e+00
+20531 20531 1.00000000000000e+00
+20532 20532 1.00000000000000e+00
+20533 20533 1.00000000000000e+00
+20534 20534 1.00000000000000e+00
+20535 20535 1.00000000000000e+00
+20536 20536 1.00000000000000e+00
+20537 20537 1.00000000000000e+00
+20538 20538 1.00000000000000e+00
+20539 20539 1.00000000000000e+00
+20540 20540 1.00000000000000e+00
+20541 20541 1.00000000000000e+00
+20542 20542 1.00000000000000e+00
+20543 20543 1.00000000000000e+00
+20544 8061 -9.21392776400000e-11
+20544 8085 -6.06677257560000e-10
+20544 8661 -5.97175117773285e-03
+20544 8685 -7.37384779871945e-02
+20544 8709 -4.55087334551142e-02
+20544 8733 -7.98683687606945e-04
+20544 9237 -2.02465739836177e-04
+20544 9261 -3.54816042167559e-01
+20544 9285 -2.22780410194104e+00
+20544 9309 -1.93483237870048e+00
+20544 9333 -1.78671550878467e-01
+20544 9357 -8.99956012314788e-04
+20544 9837 -9.40248882104740e-03
+20544 9861 -1.11422845009598e+00
+20544 9885 -8.01336539963254e+00
+20544 9909 -6.49493602195031e+00
+20544 9933 -6.02940997111881e-01
+20544 9957 -1.93303940305556e-03
+20544 10437 -5.38291298606264e-03
+20544 10461 -4.95781694150897e-01
+20544 10485 -3.40775270230967e+00
+20544 10509 -2.64775831761201e+00
+20544 10533 -2.65399292796340e-01
+20544 10557 -1.33092751663793e-05
+20544 11061 -9.42561470530969e-03
+20544 11085 -1.43573546139148e-01
+20544 11109 -1.31722113288676e-01
+20544 11133 -5.36026349040993e-03
+20544 11685 -4.00202380170130e-07
+20544 11709 -4.68162706606939e-06
+20544 11733 -1.96062915748000e-09
+20544 20544 7.90720107965378e+00
+20544 19680 1.93628155736287e-02
+20544 19704 1.56481212170483e-01
+20544 19728 3.55692930604228e-01
+20544 19752 1.59871211982870e-01
+20544 19776 2.02103155267253e-02
+20544 20088 1.62345483560861e-01
+20544 20112 1.30265738846125e+00
+20544 20136 2.94399814662354e+00
+20544 20160 1.32747883898370e+00
+20544 20184 1.68550846191475e-01
+20544 20496 3.83034098986034e-01
+20544 20520 3.06392335696754e+00
+20544 20568 3.11986350731989e+00
+20544 20592 3.97019136574119e-01
+20544 20904 1.81271814654423e-01
+20544 20928 1.47878048249851e+00
+20544 20952 3.38763623309867e+00
+20544 20976 1.52005931556468e+00
+20544 21000 1.91591522920965e-01
+20544 21312 2.40943983470192e-02
+20544 21336 2.00511985679799e-01
+20544 21360 4.66602452223006e-01
+20544 21384 2.08016331128114e-01
+20544 21408 2.59704847090978e-02
+20545 20545 1.00000000000000e+00
+20546 20546 1.00000000000000e+00
+20547 20547 1.00000000000000e+00
+20548 20548 1.00000000000000e+00
+20549 20549 1.00000000000000e+00
+20550 20550 1.00000000000000e+00
+20551 20551 1.00000000000000e+00
+20552 20552 1.00000000000000e+00
+20553 20553 1.00000000000000e+00
+20554 20554 1.00000000000000e+00
+20555 20555 1.00000000000000e+00
+20556 20556 1.00000000000000e+00
+20557 20557 1.00000000000000e+00
+20558 20558 1.00000000000000e+00
+20559 20559 1.00000000000000e+00
+20560 20560 1.00000000000000e+00
+20561 20561 1.00000000000000e+00
+20562 20562 1.00000000000000e+00
+20563 20563 1.00000000000000e+00
+20564 20564 1.00000000000000e+00
+20565 20565 1.00000000000000e+00
+20566 20566 1.00000000000000e+00
+20567 20567 1.00000000000000e+00
+20568 8685 -2.69918411505052e-03
+20568 8709 -7.63644529673767e-03
+20568 8733 -3.25705673696323e-04
+20568 9261 -1.97908944809920e-03
+20568 9285 -2.95079386881896e-01
+20568 9309 -9.41794062802659e-01
+20568 9333 -4.23340971250778e-01
+20568 9357 -1.14567772184786e-02
+20568 9381 -5.47964570785980e-07
+20568 9861 -6.09726191576314e-02
+20568 9885 -2.32104302524861e+00
+20568 9909 -7.84475762036924e+00
+20568 9933 -2.98627124706647e+00
+20568 9957 -1.34270192548723e-01
+20568 9981 -7.48228670978547e-06
+20568 10437 -7.46393400000000e-14
+20568 10461 -7.60852993516128e-02
+20568 10485 -2.16294920165840e+00
+20568 10509 -7.17876805185186e+00
+20568 10533 -2.79102250318827e+00
+20568 10557 -1.07211408631077e-01
+20568 10581 -3.73102447881600e-08
+20568 11061 -2.80363635072955e-03
+20568 11085 -2.48937627752015e-01
+20568 11109 -7.70581711034190e-01
+20568 11133 -2.92463126461187e-01
+20568 11157 -4.02285784986329e-03
+20568 11685 -4.35062775778452e-06
+20568 11709 -2.36456528890266e-03
+20568 11733 -1.81463814625547e-03
+20568 20568 8.12365760161969e+00
+20568 19704 1.97574874689921e-02
+20568 19728 1.59871211982870e-01
+20568 19752 3.63411835229297e-01
+20568 19776 1.61998459437700e-01
+20568 19800 2.02892993326998e-02
+20568 20112 1.63318863554447e-01
+20568 20136 1.32747883898370e+00
+20568 20160 3.02716923220482e+00
+20568 20184 1.34235070311274e+00
+20568 20208 1.67036829586706e-01
+20568 20520 3.82946740255837e-01
+20568 20544 3.11986350731989e+00
+20568 20592 3.14169525100731e+00
+20568 20616 3.88404676177694e-01
+20568 20928 1.88423305970201e-01
+20568 20952 1.52005931556468e+00
+20568 20976 3.43815469624709e+00
+20568 21000 1.50343418584938e+00
+20568 21024 1.84267023541376e-01
+20568 21336 2.60335980729306e-02
+20568 21360 2.08016331128114e-01
+20568 21384 4.66158201239863e-01
+20568 21408 2.02269330121860e-01
+20568 21432 2.45968478213673e-02
+20569 20569 1.00000000000000e+00
+20570 20570 1.00000000000000e+00
+20571 20571 1.00000000000000e+00
+20572 20572 1.00000000000000e+00
+20573 20573 1.00000000000000e+00
+20574 20574 1.00000000000000e+00
+20575 20575 1.00000000000000e+00
+20576 20576 1.00000000000000e+00
+20577 20577 1.00000000000000e+00
+20578 20578 1.00000000000000e+00
+20579 20579 1.00000000000000e+00
+20580 20580 1.00000000000000e+00
+20581 20581 1.00000000000000e+00
+20582 20582 1.00000000000000e+00
+20583 20583 1.00000000000000e+00
+20584 20584 1.00000000000000e+00
+20585 20585 1.00000000000000e+00
+20586 20586 1.00000000000000e+00
+20587 20587 1.00000000000000e+00
+20588 20588 1.00000000000000e+00
+20589 20589 1.00000000000000e+00
+20590 20590 1.00000000000000e+00
+20591 20591 1.00000000000000e+00
+20592 8709 -8.79221394985321e-05
+20592 8733 -3.38155601221640e-05
+20592 9285 -3.82397426018658e-03
+20592 9309 -1.43723768517555e-01
+20592 9333 -2.32535662013767e-01
+20592 9357 -3.45663066015183e-02
+20592 9381 -1.67984462863557e-05
+20592 9861 -1.21126830761592e-06
+20592 9885 -1.90281153849870e-01
+20592 9909 -2.65973954927671e+00
+20592 9933 -4.23415220768890e+00
+20592 9957 -8.23602821426861e-01
+20592 9981 -1.62013567064914e-02
+20592 10461 -4.57831467629266e-04
+20592 10485 -3.96364039902628e-01
+20592 10509 -5.34832249232655e+00
+20592 10533 -8.88021871768801e+00
+20592 10557 -1.71506375002892e+00
+20592 10581 -2.30088250458343e-02
+20592 11061 -1.45918259762635e-04
+20592 11085 -8.96751616157939e-02
+20592 11109 -1.42191071427146e+00
+20592 11133 -2.11930396500530e+00
+20592 11157 -4.60405244955113e-01
+20592 11181 -9.09969541231178e-04
+20592 11685 -1.13997207202421e-05
+20592 11709 -1.62745062553772e-02
+20592 11733 -5.81648819907614e-02
+20592 11757 -8.24395122984993e-03
+20592 20592 8.04427054762172e+00
+20592 19728 2.02103155267253e-02
+20592 19752 1.61998459437700e-01
+20592 19776 3.66463984150582e-01
+20592 19800 1.67656714533442e-01
+20592 19824 2.16248793006608e-02
+20592 20136 1.68550846191475e-01
+20592 20160 1.34235070311274e+00
+20592 20184 3.02350107634502e+00
+20592 20208 1.39759114541162e+00
+20592 20232 1.82360956766195e-01
+20592 20544 3.97019136574119e-01
+20592 20568 3.14169525100731e+00
+20592 20616 3.28472507352786e+00
+20592 20640 4.32776592204255e-01
+20592 20952 1.91591522920965e-01
+20592 20976 1.50343418584938e+00
+20592 21000 3.34654915774414e+00
+20592 21024 1.56380912680991e+00
+20592 21048 2.06685258161097e-01
+20592 21360 2.59704847090978e-02
+20592 21384 2.02269330121860e-01
+20592 21408 4.47226004500361e-01
+20592 21432 2.09211209883015e-01
+20592 21456 2.77059546493864e-02
+20593 20593 1.00000000000000e+00
+20594 20594 1.00000000000000e+00
+20595 20595 1.00000000000000e+00
+20596 20596 1.00000000000000e+00
+20597 20597 1.00000000000000e+00
+20598 20598 1.00000000000000e+00
+20599 20599 1.00000000000000e+00
+20600 20600 1.00000000000000e+00
+20601 20601 1.00000000000000e+00
+20602 20602 1.00000000000000e+00
+20603 20603 1.00000000000000e+00
+20604 20604 1.00000000000000e+00
+20605 20605 1.00000000000000e+00
+20606 20606 1.00000000000000e+00
+20607 20607 1.00000000000000e+00
+20608 20608 1.00000000000000e+00
+20609 20609 1.00000000000000e+00
+20610 20610 1.00000000000000e+00
+20611 20611 1.00000000000000e+00
+20612 20612 1.00000000000000e+00
+20613 20613 1.00000000000000e+00
+20614 20614 1.00000000000000e+00
+20615 20615 1.00000000000000e+00
+20616 9309 -3.08070724295751e-03
+20616 9333 -3.91570541987394e-02
+20616 9357 -1.68136550660147e-02
+20616 9381 -5.96109218410203e-05
+20616 9885 -8.98871072744678e-05
+20616 9909 -2.70400200659883e-01
+20616 9933 -1.69477015015132e+00
+20616 9957 -1.48312847787425e+00
+20616 9981 -1.30904245935937e-01
+20616 10005 -5.31919679444254e-04
+20616 10485 -9.44696404610537e-03
+20616 10509 -1.19479722097741e+00
+20616 10533 -8.63045626787857e+00
+20616 10557 -6.94499300146942e+00
+20616 10581 -6.47334861429477e-01
+20616 10605 -2.12602681745387e-03
+20616 11085 -8.79520094271833e-03
+20616 11109 -7.08432062787755e-01
+20616 11133 -4.89729124264465e+00
+20616 11157 -3.98187100407164e+00
+20616 11181 -4.02728245207732e-01
+20616 11205 -4.51231632600859e-05
+20616 11685 -2.75079980372756e-06
+20616 11709 -3.02687018810005e-02
+20616 11733 -3.15687715384833e-01
+20616 11757 -2.65653515247327e-01
+20616 11781 -1.29804131789670e-02
+20616 12333 -3.60143894674430e-05
+20616 12357 -1.92627463307740e-04
+20616 12381 -2.30301308694390e-07
+20616 20616 8.82054501110481e+00
+20616 19752 2.02892993326998e-02
+20616 19776 1.67656714533442e-01
+20616 19800 3.90862119037907e-01
+20616 19824 1.84798520781179e-01
+20616 19848 2.45747508946339e-02
+20616 20160 1.67036829586706e-01
+20616 20184 1.39759114541162e+00
+20616 20208 3.29608257932734e+00
+20616 20232 1.57452559299057e+00
+20616 20256 2.11270441481444e-01
+20616 20568 3.88404676177694e-01
+20616 20592 3.28472507352786e+00
+20616 20640 3.76196580745217e+00
+20616 20664 5.07714859658768e-01
+20616 20976 1.84267023541376e-01
+20616 21000 1.56380912680991e+00
+20616 21024 3.72922002063192e+00
+20616 21048 1.77869649869605e+00
+20616 21072 2.37988866512911e-01
+20616 21384 2.45968478213673e-02
+20616 21408 2.09211209883015e-01
+20616 21432 4.99146479364050e-01
+20616 21456 2.35841247207548e-01
+20616 21480 3.12543571525006e-02
+20617 20617 1.00000000000000e+00
+20618 20618 1.00000000000000e+00
+20619 20619 1.00000000000000e+00
+20620 20620 1.00000000000000e+00
+20621 20621 1.00000000000000e+00
+20622 20622 1.00000000000000e+00
+20623 20623 1.00000000000000e+00
+20624 20624 1.00000000000000e+00
+20625 20625 1.00000000000000e+00
+20626 20626 1.00000000000000e+00
+20627 20627 1.00000000000000e+00
+20628 20628 1.00000000000000e+00
+20629 20629 1.00000000000000e+00
+20630 20630 1.00000000000000e+00
+20631 20631 1.00000000000000e+00
+20632 20632 1.00000000000000e+00
+20633 20633 1.00000000000000e+00
+20634 20634 1.00000000000000e+00
+20635 20635 1.00000000000000e+00
+20636 20636 1.00000000000000e+00
+20637 20637 1.00000000000000e+00
+20638 20638 1.00000000000000e+00
+20639 20639 1.00000000000000e+00
+20640 9333 -1.05007272993042e-03
+20640 9357 -2.24873890229678e-03
+20640 9381 -1.71530090327612e-05
+20640 9909 -1.08121285912416e-03
+20640 9933 -2.12494015931441e-01
+20640 9957 -6.94820792058686e-01
+20640 9981 -2.94623651010250e-01
+20640 10005 -4.50836102338898e-03
+20640 10029 -2.15379764853000e-09
+20640 10509 -6.10196194821610e-02
+20640 10533 -2.47405737344559e+00
+20640 10557 -8.19445174042303e+00
+20640 10581 -2.74934680092517e+00
+20640 10605 -8.82386895391254e-02
+20640 10629 -2.69616545916969e-06
+20640 11085 -1.76489563238000e-09
+20640 11109 -1.04269346786886e-01
+20640 11133 -3.06527398950034e+00
+20640 11157 -1.00015592700934e+01
+20640 11181 -2.92410451374061e+00
+20640 11205 -8.56064705006757e-02
+20640 11229 -2.00903761667800e-07
+20640 11685 -2.45391655890000e-10
+20640 11709 -8.39440981508395e-03
+20640 11733 -5.04462076015953e-01
+20640 11757 -1.32287667106875e+00
+20640 11781 -3.82150713253396e-01
+20640 11805 -5.29244362974420e-03
+20640 12333 -2.24151561366790e-04
+20640 12357 -8.94430899049876e-03
+20640 12381 -4.96490615160515e-03
+20640 20640 9.84095293991455e+00
+20640 19776 2.16248793006608e-02
+20640 19800 1.84798520781179e-01
+20640 19824 4.31790540141460e-01
+20640 19848 1.66177589685166e-01
+20640 19872 1.69696465266575e-02
+20640 20184 1.82360956766195e-01
+20640 20208 1.57452559299057e+00
+20640 20232 3.69157313827716e+00
+20640 20256 1.36062223715692e+00
+20640 20280 1.28885117807783e-01
+20640 20592 4.32776592204255e-01
+20640 20616 3.76196580745217e+00
+20640 20664 3.16981381131383e+00
+20640 20688 2.84738593169674e-01
+20640 21000 2.06685258161097e-01
+20640 21024 1.77869649869605e+00
+20640 21048 4.17048493342253e+00
+20640 21072 1.57586671027078e+00
+20640 21096 1.55977811054779e-01
+20640 21408 2.77059546493864e-02
+20640 21432 2.35841247207548e-01
+20640 21456 5.51518488927802e-01
+20640 21480 2.19988707963628e-01
+20640 21504 2.37428198384065e-02
+20641 20641 1.00000000000000e+00
+20642 20642 1.00000000000000e+00
+20643 20643 1.00000000000000e+00
+20644 20644 1.00000000000000e+00
+20645 20645 1.00000000000000e+00
+20646 20646 1.00000000000000e+00
+20647 20647 1.00000000000000e+00
+20648 20648 1.00000000000000e+00
+20649 20649 1.00000000000000e+00
+20650 20650 1.00000000000000e+00
+20651 20651 1.00000000000000e+00
+20652 20652 1.00000000000000e+00
+20653 20653 1.00000000000000e+00
+20654 20654 1.00000000000000e+00
+20655 20655 1.00000000000000e+00
+20656 20656 1.00000000000000e+00
+20657 20657 1.00000000000000e+00
+20658 20658 1.00000000000000e+00
+20659 20659 1.00000000000000e+00
+20660 20660 1.00000000000000e+00
+20661 20661 1.00000000000000e+00
+20662 20662 1.00000000000000e+00
+20663 20663 1.00000000000000e+00
+20664 9357 -2.55024749279373e-06
+20664 9381 -6.36605257387360e-07
+20664 9933 -2.14648723749305e-03
+20664 9957 -9.94144917254053e-02
+20664 9981 -1.23074941957577e-01
+20664 10005 -1.38478634824622e-02
+20664 10029 -1.80427590875900e-07
+20664 10509 -9.46477160706500e-08
+20664 10533 -2.00180555053648e-01
+20664 10557 -2.25180646794109e+00
+20664 10581 -3.50368766140370e+00
+20664 10605 -1.42156879861824e+00
+20664 10629 -8.11888108207324e-04
+20664 11109 -6.38658904575288e-04
+20664 11133 -5.38961450759760e-01
+20664 11157 -5.48334295921252e+00
+20664 11181 -1.16102424187957e+01
+20664 11205 -2.51925394366327e+00
+20664 11229 -8.45132164331512e-05
+20664 11709 -3.76985077331582e-04
+20664 11733 -1.60508309066116e-01
+20664 11757 -2.39548250059466e+00
+20664 11781 -4.52174059881908e+00
+20664 11805 -2.75622480796949e-01
+20664 12333 -3.56454239513560e-04
+20664 12357 -9.62596793221420e-02
+20664 12381 -1.22950809007915e-01
+20664 20664 8.22345368046104e+00
+20664 19800 2.45747508946339e-02
+20664 19824 1.66177589685166e-01
+20664 19848 5.07262721643460e-01
+20664 19872 4.90225838751240e-01
+20664 20208 2.11270441481444e-01
+20664 20232 1.36062223715692e+00
+20664 20256 3.56739673796148e+00
+20664 20280 3.10346929434207e+00
+20664 20616 5.07714859658768e-01
+20664 20640 3.16981381131383e+00
+20664 20688 5.45879703285333e+00
+20664 21024 2.37988866512911e-01
+20664 21048 1.57586671027077e+00
+20664 21072 3.78957606445573e+00
+20664 21096 2.73579568635172e+00
+20664 21432 3.12543571525006e-02
+20664 21456 2.19988707963628e-01
+20664 21480 5.62807553267019e-01
+20664 21504 3.98307436753654e-01
+20665 20665 1.00000000000000e+00
+20666 20666 1.00000000000000e+00
+20667 20667 1.00000000000000e+00
+20668 20668 1.00000000000000e+00
+20669 20669 1.00000000000000e+00
+20670 20670 1.00000000000000e+00
+20671 20671 1.00000000000000e+00
+20672 20672 1.00000000000000e+00
+20673 20673 1.00000000000000e+00
+20674 20674 1.00000000000000e+00
+20675 20675 1.00000000000000e+00
+20676 20676 1.00000000000000e+00
+20677 20677 1.00000000000000e+00
+20678 20678 1.00000000000000e+00
+20679 20679 1.00000000000000e+00
+20680 20680 1.00000000000000e+00
+20681 20681 1.00000000000000e+00
+20682 20682 1.00000000000000e+00
+20683 20683 1.00000000000000e+00
+20684 20684 1.00000000000000e+00
+20685 20685 1.00000000000000e+00
+20686 20686 1.00000000000000e+00
+20687 20687 1.00000000000000e+00
+20688 9957 -1.22365447471563e-03
+20688 9981 -1.84717084370413e-02
+20688 10005 -9.96711146675204e-03
+20688 10029 -3.45778598212060e-07
+20688 10533 -2.19178452599128e-05
+20688 10557 -1.43634132019874e-01
+20688 10581 -2.36081159036046e+00
+20688 10605 -2.28074346771641e+00
+20688 10629 -1.60490305820046e-03
+20688 11133 -8.02848167036077e-03
+20688 11157 -1.28138291463893e+00
+20688 11181 -1.31344205713088e+01
+20688 11205 -4.44043579606656e+00
+20688 11229 -1.67620106534628e-04
+20688 11733 -1.25654930568511e-02
+20688 11757 -1.63815643084313e+00
+20688 11781 -6.70591694751751e+00
+20688 11805 -5.14197856185687e-01
+20688 12333 -8.02216756131089e-05
+20688 12357 -1.34917509756794e-01
+20688 12381 -2.11153262788619e-01
+20688 20688 9.92442391351890e+00
+20688 19824 1.69696465266575e-02
+20688 19848 4.90225838751240e-01
+20688 19872 8.61664151815878e-01
+20688 20232 1.28885117807783e-01
+20688 20256 3.10346929434207e+00
+20688 20280 5.30474276402965e+00
+20688 20640 2.84738593169674e-01
+20688 20664 5.45879703285333e+00
+20688 21048 1.55977811054779e-01
+20688 21072 2.73579568635173e+00
+20688 21096 4.37974669531999e+00
+20688 21456 2.37428198384065e-02
+20688 21480 3.98307436753654e-01
+20688 21504 6.30415134638462e-01
+20689 20689 1.00000000000000e+00
+20690 20690 1.00000000000000e+00
+20691 20691 1.00000000000000e+00
+20692 20692 1.00000000000000e+00
+20693 20693 1.00000000000000e+00
+20694 20694 1.00000000000000e+00
+20695 20695 1.00000000000000e+00
+20696 20696 1.00000000000000e+00
+20697 20697 1.00000000000000e+00
+20698 20698 1.00000000000000e+00
+20699 20699 1.00000000000000e+00
+20700 20700 1.00000000000000e+00
+20701 20701 1.00000000000000e+00
+20702 20702 1.00000000000000e+00
+20703 20703 1.00000000000000e+00
+20704 20704 1.00000000000000e+00
+20705 20705 1.00000000000000e+00
+20706 20706 1.00000000000000e+00
+20707 20707 1.00000000000000e+00
+20708 20708 1.00000000000000e+00
+20709 20709 1.00000000000000e+00
+20710 20710 1.00000000000000e+00
+20711 20711 1.00000000000000e+00
+20712 6717 -4.78380215078020e-07
+20712 6741 -3.24275802740579e-02
+20712 6765 -9.65306573404738e-03
+20712 7317 -6.58684771145486e-01
+20712 7341 -3.99767481908075e+00
+20712 7365 -4.83551374784479e-01
+20712 7389 -1.73196606922705e-03
+20712 7893 -9.84041696600765e-04
+20712 7917 -7.82386178903454e+00
+20712 7941 -1.60834728731334e+01
+20712 7965 -7.56106341981151e-01
+20712 7989 -2.16046850008640e-03
+20712 8493 -2.65642361519577e-02
+20712 8517 -3.59414605494428e+00
+20712 8541 -3.43113164804832e+00
+20712 8565 -1.57084032693361e-01
+20712 8589 -3.90079655830205e-06
+20712 9093 -2.20520863822568e-03
+20712 9117 -8.07620712877326e-02
+20712 9141 -5.34115908914581e-02
+20712 9165 -1.65556807285412e-03
+20712 20712 1.36913543179816e+01
+20712 19896 4.36053397400399e-01
+20712 19920 2.88646002416814e-01
+20712 19944 2.01769439190329e-02
+20712 20304 4.69570095278428e+00
+20712 20328 2.85105021759669e+00
+20712 20352 1.43771354629870e-01
+20712 20736 7.35333930796905e+00
+20712 20760 2.87903471136636e-01
+20712 21120 4.74889323458448e+00
+20712 21144 2.81178010326743e+00
+20712 21168 1.24952424564338e-01
+20712 21528 4.49351467850448e-01
+20712 21552 2.78828473834499e-01
+20712 21576 1.54722114026500e-02
+20713 20713 1.00000000000000e+00
+20714 20714 1.00000000000000e+00
+20715 20715 1.00000000000000e+00
+20716 20716 1.00000000000000e+00
+20717 20717 1.00000000000000e+00
+20718 20718 1.00000000000000e+00
+20719 20719 1.00000000000000e+00
+20720 20720 1.00000000000000e+00
+20721 20721 1.00000000000000e+00
+20722 20722 1.00000000000000e+00
+20723 20723 1.00000000000000e+00
+20724 20724 1.00000000000000e+00
+20725 20725 1.00000000000000e+00
+20726 20726 1.00000000000000e+00
+20727 20727 1.00000000000000e+00
+20728 20728 1.00000000000000e+00
+20729 20729 1.00000000000000e+00
+20730 20730 1.00000000000000e+00
+20731 20731 1.00000000000000e+00
+20732 20732 1.00000000000000e+00
+20733 20733 1.00000000000000e+00
+20734 20734 1.00000000000000e+00
+20735 20735 1.00000000000000e+00
+20736 6717 -2.40186428761680e-07
+20736 6741 -1.86238563130753e-02
+20736 6765 -6.21525660309202e-03
+20736 7317 -3.49593855422105e-01
+20736 7341 -2.68385561620018e+00
+20736 7365 -8.37895207133302e-01
+20736 7389 -3.12514410067259e-02
+20736 7413 -5.59793347357087e-06
+20736 7893 -5.02259234512098e-04
+20736 7917 -4.43068966198713e+00
+20736 7941 -1.32830061635957e+01
+20736 7965 -3.72278010225773e+00
+20736 7989 -2.34219438433392e-01
+20736 8013 -2.30368090416413e-05
+20736 8493 -1.39520399675054e-02
+20736 8517 -2.45302092463139e+00
+20736 8541 -5.66071931761901e+00
+20736 8565 -2.84276194806417e+00
+20736 8589 -1.44954846645992e-01
+20736 8613 -6.13896168510000e-10
+20736 9093 -1.19559189827216e-03
+20736 9117 -1.04039244321087e-01
+20736 9141 -3.64114134599589e-01
+20736 9165 -2.02228954966389e-01
+20736 9189 -2.80648045101099e-03
+20736 9741 -3.67982902529280e-04
+20736 9765 -4.01571096527221e-04
+20736 20736 9.25883673882538e+00
+20736 19896 2.88646002416814e-01
+20736 19920 4.54506170724252e-01
+20736 19944 1.91531594273668e-01
+20736 19968 2.77059546493841e-02
+20736 20304 2.85105021759669e+00
+20736 20328 3.67416532082411e+00
+20736 20352 1.51845040734964e+00
+20736 20376 2.35841247207535e-01
+20736 20712 7.35333930796905e+00
+20736 20760 3.35768784025774e+00
+20736 20784 5.51518488927781e-01
+20736 21120 2.81178010326743e+00
+20736 21144 3.37521270349810e+00
+20736 21168 1.37976453011180e+00
+20736 21192 2.19988707963608e-01
+20736 21528 2.78828473834499e-01
+20736 21552 3.79768016392752e-01
+20736 21576 1.56860124964209e-01
+20736 21600 2.37428198384023e-02
+20737 20737 1.00000000000000e+00
+20738 20738 1.00000000000000e+00
+20739 20739 1.00000000000000e+00
+20740 20740 1.00000000000000e+00
+20741 20741 1.00000000000000e+00
+20742 20742 1.00000000000000e+00
+20743 20743 1.00000000000000e+00
+20744 20744 1.00000000000000e+00
+20745 20745 1.00000000000000e+00
+20746 20746 1.00000000000000e+00
+20747 20747 1.00000000000000e+00
+20748 20748 1.00000000000000e+00
+20749 20749 1.00000000000000e+00
+20750 20750 1.00000000000000e+00
+20751 20751 1.00000000000000e+00
+20752 20752 1.00000000000000e+00
+20753 20753 1.00000000000000e+00
+20754 20754 1.00000000000000e+00
+20755 20755 1.00000000000000e+00
+20756 20756 1.00000000000000e+00
+20757 20757 1.00000000000000e+00
+20758 20758 1.00000000000000e+00
+20759 20759 1.00000000000000e+00
+20760 6717 -2.84663206480000e-10
+20760 6741 -6.88591247467957e-04
+20760 6765 -3.96784765631872e-04
+20760 7317 -5.78613424267481e-03
+20760 7341 -2.26898724073111e-01
+20760 7365 -5.12343280474946e-01
+20760 7389 -1.08175470687361e-01
+20760 7413 -2.81280434771752e-04
+20760 7893 -2.92525320334731e-06
+20760 7917 -1.49049353647890e-01
+20760 7941 -3.33774787695733e+00
+20760 7965 -7.34164664187904e+00
+20760 7989 -1.43097519682742e+00
+20760 8013 -2.79573555867760e-02
+20760 8493 -1.91406254721869e-04
+20760 8517 -2.20635404010202e-01
+20760 8541 -5.27654274785888e+00
+20760 8565 -1.09547396060205e+01
+20760 8589 -2.15460430129376e+00
+20760 8613 -2.67986772911734e-02
+20760 9093 -2.65678797598047e-05
+20760 9117 -3.66291396137360e-02
+20760 9141 -8.81159512977710e-01
+20760 9165 -1.39480511332750e+00
+20760 9189 -3.35634600221818e-01
+20760 9213 -6.20042783016749e-04
+20760 9741 -2.68203129603540e-03
+20760 9765 -1.42858512538457e-02
+20760 9789 -2.27056743930507e-03
+20760 20760 1.06033020384093e+01
+20760 19896 2.01769439190329e-02
+20760 19920 1.91531594273668e-01
+20760 19944 4.87437578200066e-01
+20760 19968 2.06685258161086e-01
+20760 19992 2.39653598908874e-02
+20760 20304 1.43771354629870e-01
+20760 20328 1.51845040734964e+00
+20760 20352 4.12606418741697e+00
+20760 20376 1.77869649869598e+00
+20760 20400 2.08832877466454e-01
+20760 20712 2.87903471136636e-01
+20760 20736 3.35768784025774e+00
+20760 20784 4.17048493342239e+00
+20760 20808 4.91102744427794e-01
+20760 21120 1.24952424564338e-01
+20760 21144 1.37976453011180e+00
+20760 21168 3.81874972158620e+00
+20760 21192 1.57586671027066e+00
+20760 21216 1.73977969604054e-01
+20760 21528 1.54722114026500e-02
+20760 21552 1.56860124964209e-01
+20760 21576 4.10608961742374e-01
+20760 21600 1.55977811054758e-01
+20760 21624 1.52516329252872e-02
+20761 20761 1.00000000000000e+00
+20762 20762 1.00000000000000e+00
+20763 20763 1.00000000000000e+00
+20764 20764 1.00000000000000e+00
+20765 20765 1.00000000000000e+00
+20766 20766 1.00000000000000e+00
+20767 20767 1.00000000000000e+00
+20768 20768 1.00000000000000e+00
+20769 20769 1.00000000000000e+00
+20770 20770 1.00000000000000e+00
+20771 20771 1.00000000000000e+00
+20772 20772 1.00000000000000e+00
+20773 20773 1.00000000000000e+00
+20774 20774 1.00000000000000e+00
+20775 20775 1.00000000000000e+00
+20776 20776 1.00000000000000e+00
+20777 20777 1.00000000000000e+00
+20778 20778 1.00000000000000e+00
+20779 20779 1.00000000000000e+00
+20780 20780 1.00000000000000e+00
+20781 20781 1.00000000000000e+00
+20782 20782 1.00000000000000e+00
+20783 20783 1.00000000000000e+00
+20784 6741 -2.45391655890000e-10
+20784 6765 -1.76489563238000e-09
+20784 7341 -8.39440981508334e-03
+20784 7365 -1.04269346786878e-01
+20784 7389 -6.10196194821581e-02
+20784 7413 -1.08121285912413e-03
+20784 7917 -2.24151561366772e-04
+20784 7941 -5.04462076015934e-01
+20784 7965 -3.06527398950025e+00
+20784 7989 -2.47405737344551e+00
+20784 8013 -2.12494015931439e-01
+20784 8037 -1.05007272993042e-03
+20784 8517 -8.94430899049728e-03
+20784 8541 -1.32287667106866e+00
+20784 8565 -1.00015592700930e+01
+20784 8589 -8.19445174042265e+00
+20784 8613 -6.94820792058679e-01
+20784 8637 -2.24873890229678e-03
+20784 9117 -4.96490615160427e-03
+20784 9141 -3.82150713253353e-01
+20784 9165 -2.92410451374048e+00
+20784 9189 -2.74934680092509e+00
+20784 9213 -2.94623651010246e-01
+20784 9237 -1.71530090327612e-05
+20784 9741 -5.29244362974384e-03
+20784 9765 -8.56064705006723e-02
+20784 9789 -8.82386895391241e-02
+20784 9813 -4.50836102338893e-03
+20784 10365 -2.00903761667800e-07
+20784 10389 -2.69616545916967e-06
+20784 10413 -2.15379764853000e-09
+20784 20784 9.84095293991427e+00
+20784 19920 2.77059546493841e-02
+20784 19944 2.06685258161086e-01
+20784 19968 4.32776592204243e-01
+20784 19992 1.82360956766193e-01
+20784 20016 2.16248793006608e-02
+20784 20328 2.35841247207535e-01
+20784 20352 1.77869649869598e+00
+20784 20376 3.76196580745206e+00
+20784 20400 1.57452559299055e+00
+20784 20424 1.84798520781177e-01
+20784 20736 5.51518488927781e-01
+20784 20760 4.17048493342239e+00
+20784 20808 3.69157313827707e+00
+20784 20832 4.31790540141454e-01
+20784 21144 2.19988707963608e-01
+20784 21168 1.57586671027066e+00
+20784 21192 3.16981381131369e+00
+20784 21216 1.36062223715689e+00
+20784 21240 1.66177589685164e-01
+20784 21552 2.37428198384023e-02
+20784 21576 1.55977811054758e-01
+20784 21600 2.84738593169655e-01
+20784 21624 1.28885117807778e-01
+20784 21648 1.69696465266574e-02
+20785 20785 1.00000000000000e+00
+20786 20786 1.00000000000000e+00
+20787 20787 1.00000000000000e+00
+20788 20788 1.00000000000000e+00
+20789 20789 1.00000000000000e+00
+20790 20790 1.00000000000000e+00
+20791 20791 1.00000000000000e+00
+20792 20792 1.00000000000000e+00
+20793 20793 1.00000000000000e+00
+20794 20794 1.00000000000000e+00
+20795 20795 1.00000000000000e+00
+20796 20796 1.00000000000000e+00
+20797 20797 1.00000000000000e+00
+20798 20798 1.00000000000000e+00
+20799 20799 1.00000000000000e+00
+20800 20800 1.00000000000000e+00
+20801 20801 1.00000000000000e+00
+20802 20802 1.00000000000000e+00
+20803 20803 1.00000000000000e+00
+20804 20804 1.00000000000000e+00
+20805 20805 1.00000000000000e+00
+20806 20806 1.00000000000000e+00
+20807 20807 1.00000000000000e+00
+20808 7365 -3.26638239810655e-03
+20808 7389 -9.54620552641494e-03
+20808 7413 -4.19129189440229e-04
+20808 7941 -2.41565249248564e-03
+20808 7965 -3.75923620321779e-01
+20808 7989 -1.09956716241353e+00
+20808 8013 -4.69701797998803e-01
+20808 8037 -1.29970123836126e-02
+20808 8061 -7.74689897242040e-07
+20808 8541 -5.51496939522450e-02
+20808 8565 -2.67231919083980e+00
+20808 8589 -8.89099175463546e+00
+20808 8613 -3.40661737920487e+00
+20808 8637 -1.53167292222668e-01
+20808 8661 -1.03954862092583e-05
+20808 9141 -4.67880445595032e-02
+20808 9165 -1.76103804557890e+00
+20808 9189 -7.16654941689153e+00
+20808 9213 -3.24277390371000e+00
+20808 9237 -1.32485464574335e-01
+20808 9261 -6.02256811617600e-08
+20808 9741 -1.54634762008399e-03
+20808 9765 -1.57674992663909e-01
+20808 9789 -5.87225973957992e-01
+20808 9813 -2.94052989407066e-01
+20808 9837 -5.08853050101887e-03
+20808 10365 -2.54630692488362e-06
+20808 10389 -1.90946386181226e-03
+20808 10413 -1.52616840616761e-03
+20808 20808 8.86754832094172e+00
+20808 19944 2.39653598908874e-02
+20808 19968 1.82360956766193e-01
+20808 19992 3.91566460757743e-01
+20808 20016 1.72911645427774e-01
+20808 20040 2.16030320562826e-02
+20808 20352 2.08832877466454e-01
+20808 20376 1.57452559299054e+00
+20808 20400 3.35833046764719e+00
+20808 20424 1.51007911385204e+00
+20808 20448 1.92721257681828e-01
+20808 20760 4.91102744427794e-01
+20808 20784 3.69157313827707e+00
+20808 20832 3.59834989756740e+00
+20808 20856 4.67796934250377e-01
+20808 21168 1.73977969604054e-01
+20808 21192 1.36062223715688e+00
+20808 21216 3.02295807149264e+00
+20808 21240 1.42526502644433e+00
+20808 21264 1.90138666925914e-01
+20808 21576 1.52516329252872e-02
+20808 21600 1.28885117807778e-01
+20808 21624 3.07723361719110e-01
+20808 21648 1.51708123575846e-01
+20808 21672 2.09573843673041e-02
+20809 20809 1.00000000000000e+00
+20810 20810 1.00000000000000e+00
+20811 20811 1.00000000000000e+00
+20812 20812 1.00000000000000e+00
+20813 20813 1.00000000000000e+00
+20814 20814 1.00000000000000e+00
+20815 20815 1.00000000000000e+00
+20816 20816 1.00000000000000e+00
+20817 20817 1.00000000000000e+00
+20818 20818 1.00000000000000e+00
+20819 20819 1.00000000000000e+00
+20820 20820 1.00000000000000e+00
+20821 20821 1.00000000000000e+00
+20822 20822 1.00000000000000e+00
+20823 20823 1.00000000000000e+00
+20824 20824 1.00000000000000e+00
+20825 20825 1.00000000000000e+00
+20826 20826 1.00000000000000e+00
+20827 20827 1.00000000000000e+00
+20828 20828 1.00000000000000e+00
+20829 20829 1.00000000000000e+00
+20830 20830 1.00000000000000e+00
+20831 20831 1.00000000000000e+00
+20832 7389 -9.92519568879595e-05
+20832 7413 -4.00601221406902e-05
+20832 7965 -4.05950296912941e-03
+20832 7989 -1.55321867795442e-01
+20832 8013 -2.53257024583943e-01
+20832 8037 -3.85963268737243e-02
+20832 8061 -2.09075466857389e-05
+20832 8541 -6.05285648237200e-07
+20832 8565 -1.94606147503329e-01
+20832 8589 -3.01355636355893e+00
+20832 8613 -4.91376916156050e+00
+20832 8637 -9.05256029698987e-01
+20832 8661 -1.72064983002764e-02
+20832 9141 -2.64700801715131e-04
+20832 9165 -3.17162331399180e-01
+20832 9189 -5.68289186565247e+00
+20832 9213 -1.02349311736186e+01
+20832 9237 -1.87406138757872e+00
+20832 9261 -2.47456816655712e-02
+20832 9741 -8.40619835414268e-05
+20832 9765 -6.26822243240927e-02
+20832 9789 -1.20726376709725e+00
+20832 9813 -1.87862984396721e+00
+20832 9837 -4.36925577003924e-01
+20832 9861 -1.04604514369137e-03
+20832 10365 -7.17169031686482e-06
+20832 10389 -1.07855649151752e-02
+20832 10413 -3.06935392903593e-02
+20832 10437 -4.21211943045402e-03
+20832 20832 9.35462019827781e+00
+20832 19968 2.16248793006608e-02
+20832 19992 1.72911645427774e-01
+20832 20016 3.89017067783700e-01
+20832 20040 1.73386830555204e-01
+20832 20064 2.17436755825183e-02
+20832 20376 1.84798520781177e-01
+20832 20400 1.51007911385204e+00
+20832 20424 3.45599888700886e+00
+20832 20448 1.52152600400078e+00
+20832 20472 1.87660243318363e-01
+20832 20784 4.31790540141454e-01
+20832 20808 3.59834989756740e+00
+20832 20856 3.62350257752166e+00
+20832 20880 4.38078710130020e-01
+20832 21192 1.66177589685164e-01
+20832 21216 1.42526502644433e+00
+20832 21240 3.36345328386552e+00
+20832 21264 1.38078276116632e+00
+20832 21288 1.55057023365662e-01
+20832 21600 1.69696465266574e-02
+20832 21624 1.51708123575846e-01
+20832 21648 3.65880666997866e-01
+20832 21672 1.38201019846589e-01
+20832 21696 1.35928705943431e-02
+20833 20833 1.00000000000000e+00
+20834 20834 1.00000000000000e+00
+20835 20835 1.00000000000000e+00
+20836 20836 1.00000000000000e+00
+20837 20837 1.00000000000000e+00
+20838 20838 1.00000000000000e+00
+20839 20839 1.00000000000000e+00
+20840 20840 1.00000000000000e+00
+20841 20841 1.00000000000000e+00
+20842 20842 1.00000000000000e+00
+20843 20843 1.00000000000000e+00
+20844 20844 1.00000000000000e+00
+20845 20845 1.00000000000000e+00
+20846 20846 1.00000000000000e+00
+20847 20847 1.00000000000000e+00
+20848 20848 1.00000000000000e+00
+20849 20849 1.00000000000000e+00
+20850 20850 1.00000000000000e+00
+20851 20851 1.00000000000000e+00
+20852 20852 1.00000000000000e+00
+20853 20853 1.00000000000000e+00
+20854 20854 1.00000000000000e+00
+20855 20855 1.00000000000000e+00
+20856 7989 -3.21498529089213e-03
+20856 8013 -4.20474139306097e-02
+20856 8037 -1.82366467804065e-02
+20856 8061 -7.26598831971718e-05
+20856 8565 -8.75407316449964e-05
+20856 8589 -3.19772793067185e-01
+20856 8613 -1.86663739218365e+00
+20856 8637 -1.52988192885985e+00
+20856 8661 -1.26225497284196e-01
+20856 8685 -4.92803893296505e-04
+20856 9165 -7.88893963817172e-03
+20856 9189 -1.23817040319280e+00
+20856 9213 -8.83501779089264e+00
+20856 9237 -6.98854935785926e+00
+20856 9261 -5.91340677496702e-01
+20856 9285 -1.95469579268335e-03
+20856 9765 -7.04889861285721e-03
+20856 9789 -4.87838300554059e-01
+20856 9813 -3.72294246617883e+00
+20856 9837 -3.48549779286631e+00
+20856 9861 -3.59725190023989e-01
+20856 9885 -4.38145079191087e-05
+20856 10365 -1.74276804760179e-06
+20856 10389 -1.48604071463110e-02
+20856 10413 -1.67023864717951e-01
+20856 10437 -1.70527780808149e-01
+20856 10461 -1.02084568245075e-02
+20856 11013 -1.97635568482042e-05
+20856 11037 -1.13643062235917e-04
+20856 11061 -1.83644152629410e-07
+20856 20856 8.91745842228530e+00
+20856 19992 2.16030320562826e-02
+20856 20016 1.73386830555204e-01
+20856 20040 3.90222179029274e-01
+20856 20064 1.69856052940864e-01
+20856 20088 2.07203376526978e-02
+20856 20400 1.92721257681828e-01
+20856 20424 1.52152600400078e+00
+20856 20448 3.37821758384741e+00
+20856 20472 1.48237070556028e+00
+20856 20496 1.82932433071704e-01
+20856 20808 4.67796934250377e-01
+20856 20832 3.62350257752166e+00
+20856 20880 3.51392334433738e+00
+20856 20904 4.40402125954306e-01
+20856 21216 1.90138666925914e-01
+20856 21240 1.38078276116632e+00
+20856 21264 2.84901195706931e+00
+20856 21288 1.33207175863363e+00
+20856 21312 1.77960916292741e-01
+20856 21624 2.09573843673041e-02
+20856 21648 1.38201019846589e-01
+20856 21672 2.57920772334751e-01
+20856 21696 1.32281316209201e-01
+20856 21720 1.94774584579572e-02
+20857 20857 1.00000000000000e+00
+20858 20858 1.00000000000000e+00
+20859 20859 1.00000000000000e+00
+20860 20860 1.00000000000000e+00
+20861 20861 1.00000000000000e+00
+20862 20862 1.00000000000000e+00
+20863 20863 1.00000000000000e+00
+20864 20864 1.00000000000000e+00
+20865 20865 1.00000000000000e+00
+20866 20866 1.00000000000000e+00
+20867 20867 1.00000000000000e+00
+20868 20868 1.00000000000000e+00
+20869 20869 1.00000000000000e+00
+20870 20870 1.00000000000000e+00
+20871 20871 1.00000000000000e+00
+20872 20872 1.00000000000000e+00
+20873 20873 1.00000000000000e+00
+20874 20874 1.00000000000000e+00
+20875 20875 1.00000000000000e+00
+20876 20876 1.00000000000000e+00
+20877 20877 1.00000000000000e+00
+20878 20878 1.00000000000000e+00
+20879 20879 1.00000000000000e+00
+20880 8013 -1.06285179056370e-03
+20880 8037 -2.36917694260551e-03
+20880 8061 -2.04089667481573e-05
+20880 8589 -1.04490660266631e-03
+20880 8613 -2.16006340598433e-01
+20880 8637 -6.49578675580671e-01
+20880 8661 -2.64974126596227e-01
+20880 8685 -5.17996492292177e-03
+20880 8709 -5.66768020861000e-09
+20880 9189 -4.79131606910248e-02
+20880 9213 -2.31875979400024e+00
+20880 9237 -7.47852153566612e+00
+20880 9261 -2.73881420483964e+00
+20880 9285 -1.16903644012216e-01
+20880 9309 -4.68288025480863e-06
+20880 9765 -1.37368931380000e-10
+20880 9789 -5.62077263860393e-02
+20880 9813 -2.24353417678795e+00
+20880 9837 -8.73478129569114e+00
+20880 9861 -3.53361738223855e+00
+20880 9885 -1.36403831570533e-01
+20880 9909 -3.49414465273930e-07
+20880 10365 -1.90423473400000e-11
+20880 10389 -4.02463253813658e-03
+20880 10413 -3.02145747279519e-01
+20880 10437 -9.67865603429284e-01
+20880 10461 -4.38209835369893e-01
+20880 10485 -9.14157579495100e-03
+20880 11013 -1.30941825009839e-04
+20880 11037 -6.34375125082238e-03
+20880 11061 -3.70637046823082e-03
+20880 20880 8.94270722031837e+00
+20880 20016 2.17436755825183e-02
+20880 20040 1.69856052940864e-01
+20880 20064 3.74771086606622e-01
+20880 20088 1.68889384934548e-01
+20880 20112 2.15020085809392e-02
+20880 20424 1.87660243318363e-01
+20880 20448 1.48237070556028e+00
+20880 20472 3.30531284354300e+00
+20880 20496 1.49466441659605e+00
+20880 20520 1.90733671077306e-01
+20880 20832 4.38078710130020e-01
+20880 20856 3.51392334433738e+00
+20880 20904 3.59438648349399e+00
+20880 20928 4.58194494919172e-01
+20880 21240 1.55057023365662e-01
+20880 21264 1.33207175863363e+00
+20880 21288 3.17831707809929e+00
+20880 21312 1.41538524136979e+00
+20880 21336 1.75885394049703e-01
+20880 21648 1.35928705943431e-02
+20880 21672 1.32281316209201e-01
+20880 21696 3.43022145245696e-01
+20880 21720 1.49069591127983e-01
+20880 21744 1.77899393240386e-02
+20881 20881 1.00000000000000e+00
+20882 20882 1.00000000000000e+00
+20883 20883 1.00000000000000e+00
+20884 20884 1.00000000000000e+00
+20885 20885 1.00000000000000e+00
+20886 20886 1.00000000000000e+00
+20887 20887 1.00000000000000e+00
+20888 20888 1.00000000000000e+00
+20889 20889 1.00000000000000e+00
+20890 20890 1.00000000000000e+00
+20891 20891 1.00000000000000e+00
+20892 20892 1.00000000000000e+00
+20893 20893 1.00000000000000e+00
+20894 20894 1.00000000000000e+00
+20895 20895 1.00000000000000e+00
+20896 20896 1.00000000000000e+00
+20897 20897 1.00000000000000e+00
+20898 20898 1.00000000000000e+00
+20899 20899 1.00000000000000e+00
+20900 20900 1.00000000000000e+00
+20901 20901 1.00000000000000e+00
+20902 20902 1.00000000000000e+00
+20903 20903 1.00000000000000e+00
+20904 8037 -2.45216359375918e-06
+20904 8061 -6.50044912846620e-07
+20904 8613 -1.78015374464238e-03
+20904 8637 -8.64757018219528e-02
+20904 8661 -1.28155566331303e-01
+20904 8685 -1.37345708174822e-02
+20904 8709 -5.74695123481400e-08
+20904 9189 -3.67222075893600e-08
+20904 9213 -1.67675406492184e-01
+20904 9237 -2.35758391105403e+00
+20904 9261 -3.59514649502357e+00
+20904 9285 -6.46169679302477e-01
+20904 9309 -1.06321116976910e-02
+20904 9789 -3.54822158744667e-04
+20904 9813 -3.92717788799683e-01
+20904 9837 -6.10453891104458e+00
+20904 9861 -1.02624281112438e+01
+20904 9885 -1.72365237570312e+00
+20904 9909 -2.33917155530079e-02
+20904 10389 -2.09120147080729e-04
+20904 10413 -1.03095708974914e-01
+20904 10437 -1.62177710123625e+00
+20904 10461 -2.61950144724905e+00
+20904 10485 -5.76961529729787e-01
+20904 10509 -1.64331298995037e-03
+20904 11013 -2.27316425110601e-04
+20904 11037 -3.13274163014311e-02
+20904 11061 -6.49202412504783e-02
+20904 11085 -9.12151484470005e-03
+20904 11661 -1.38577897776000e-09
+20904 11685 -4.94664904690000e-10
+20904 20904 9.19275053062595e+00
+20904 20040 2.07203376526978e-02
+20904 20064 1.68889384934548e-01
+20904 20088 3.85976030264312e-01
+20904 20112 1.70902255590103e-01
+20904 20136 2.12235553165866e-02
+20904 20448 1.82932433071704e-01
+20904 20472 1.49466441659605e+00
+20904 20496 3.41594298496309e+00
+20904 20520 1.48802194292693e+00
+20904 20544 1.81271814654423e-01
+20904 20856 4.40402125954306e-01
+20904 20880 3.59438648349399e+00
+20904 20928 3.51772392353510e+00
+20904 20952 4.21236485964583e-01
+20904 21264 1.77960916292741e-01
+20904 21288 1.41538524136979e+00
+20904 21312 3.14651504285889e+00
+20904 21336 1.32109286328217e+00
+20904 21360 1.54387821770836e-01
+20904 21672 1.94774584579572e-02
+20904 21696 1.49069591127983e-01
+20904 21720 3.18619044738265e-01
+20904 21744 1.29169985678914e-01
+20904 21768 1.45025570956898e-02
+20905 20905 1.00000000000000e+00
+20906 20906 1.00000000000000e+00
+20907 20907 1.00000000000000e+00
+20908 20908 1.00000000000000e+00
+20909 20909 1.00000000000000e+00
+20910 20910 1.00000000000000e+00
+20911 20911 1.00000000000000e+00
+20912 20912 1.00000000000000e+00
+20913 20913 1.00000000000000e+00
+20914 20914 1.00000000000000e+00
+20915 20915 1.00000000000000e+00
+20916 20916 1.00000000000000e+00
+20917 20917 1.00000000000000e+00
+20918 20918 1.00000000000000e+00
+20919 20919 1.00000000000000e+00
+20920 20920 1.00000000000000e+00
+20921 20921 1.00000000000000e+00
+20922 20922 1.00000000000000e+00
+20923 20923 1.00000000000000e+00
+20924 20924 1.00000000000000e+00
+20925 20925 1.00000000000000e+00
+20926 20926 1.00000000000000e+00
+20927 20927 1.00000000000000e+00
+20928 8637 -1.50947173666031e-03
+20928 8661 -1.85885487822351e-02
+20928 8685 -4.83582745070654e-03
+20928 8709 -1.44862846263400e-07
+20928 9213 -2.73173367878581e-05
+20928 9237 -2.21176604075138e-01
+20928 9261 -1.24236010428430e+00
+20928 9285 -9.86091564195393e-01
+20928 9309 -7.41832630423731e-02
+20928 9333 -1.91124497901623e-04
+20928 9813 -6.49201867337139e-03
+20928 9837 -1.23592080630090e+00
+20928 9861 -8.10899043378030e+00
+20928 9885 -6.06421539807101e+00
+20928 9909 -5.02981888970408e-01
+20928 9933 -1.67656038496179e-03
+20928 10413 -8.98842633280566e-03
+20928 10437 -6.38758052884564e-01
+20928 10461 -4.91357092063549e+00
+20928 10485 -4.32881999660609e+00
+20928 10509 -4.22827509282712e-01
+20928 10533 -9.54730890178436e-05
+20928 11013 -5.18975087942571e-05
+20928 11037 -3.69326044520869e-02
+20928 11061 -3.17500633505523e-01
+20928 11085 -3.02877918445017e-01
+20928 11109 -2.05626619650528e-02
+20928 11661 -2.63309666699969e-04
+20928 11685 -8.96387949988684e-04
+20928 11709 -2.33755502357585e-06
+20928 20928 8.65632096176588e+00
+20928 20064 2.15020085809392e-02
+20928 20088 1.70902255590103e-01
+20928 20112 3.82151122065945e-01
+20928 20136 1.69183134944825e-01
+20928 20160 2.10722284196196e-02
+20928 20472 1.90733671077306e-01
+20928 20496 1.48802194292693e+00
+20928 20520 3.27950601151834e+00
+20928 20544 1.47878048249851e+00
+20928 20568 1.88423305970201e-01
+20928 20880 4.58194494919172e-01
+20928 20904 3.51772392353510e+00
+20928 20952 3.51831670951079e+00
+20928 20976 4.58342691413095e-01
+20928 21288 1.75885394049703e-01
+20928 21312 1.32109286328217e+00
+20928 21336 2.83315650998120e+00
+20928 21360 1.36581515747563e+00
+20928 21384 1.87065967598068e-01
+20928 21696 1.77899393240386e-02
+20928 21720 1.29169985678914e-01
+20928 21744 2.70563746681661e-01
+20928 21768 1.40941803689104e-01
+20928 21792 2.07328938265863e-02
+20929 20929 1.00000000000000e+00
+20930 20930 1.00000000000000e+00
+20931 20931 1.00000000000000e+00
+20932 20932 1.00000000000000e+00
+20933 20933 1.00000000000000e+00
+20934 20934 1.00000000000000e+00
+20935 20935 1.00000000000000e+00
+20936 20936 1.00000000000000e+00
+20937 20937 1.00000000000000e+00
+20938 20938 1.00000000000000e+00
+20939 20939 1.00000000000000e+00
+20940 20940 1.00000000000000e+00
+20941 20941 1.00000000000000e+00
+20942 20942 1.00000000000000e+00
+20943 20943 1.00000000000000e+00
+20944 20944 1.00000000000000e+00
+20945 20945 1.00000000000000e+00
+20946 20946 1.00000000000000e+00
+20947 20947 1.00000000000000e+00
+20948 20948 1.00000000000000e+00
+20949 20949 1.00000000000000e+00
+20950 20950 1.00000000000000e+00
+20951 20951 1.00000000000000e+00
+20952 8661 -2.50271011591101e-04
+20952 8685 -4.06769525242698e-04
+20952 8709 -3.47987915137000e-08
+20952 9237 -3.83180860003073e-04
+20952 9261 -1.27093248179569e-01
+20952 9285 -3.90543641669745e-01
+20952 9309 -1.44363945467569e-01
+20952 9333 -1.59366967251031e-03
+20952 9837 -4.35511837741008e-02
+20952 9861 -2.01546910711490e+00
+20952 9885 -6.17588936427231e+00
+20952 9909 -2.18514483610331e+00
+20952 9933 -8.66559427129932e-02
+20952 9957 -1.59177904572117e-06
+20952 10413 -7.29284455996000e-09
+20952 10437 -7.39964518854176e-02
+20952 10461 -2.77314972883573e+00
+20952 10485 -1.02216097184031e+01
+20952 10509 -3.73623591502856e+00
+20952 10533 -1.36848367689047e-01
+20952 10557 -3.98147192210440e-07
+20952 11013 -2.47779430879000e-09
+20952 11037 -9.31784332562762e-03
+20952 11061 -5.14460043694643e-01
+20952 11085 -1.52603805139536e+00
+20952 11109 -6.43339735310646e-01
+20952 11133 -1.45815447323941e-02
+20952 11661 -1.35262437329917e-03
+20952 11685 -1.69311411195081e-02
+20952 11709 -7.17949674489176e-03
+20952 11733 -1.44727600551000e-08
+20952 20952 9.20734770868344e+00
+20952 20088 2.12235553165866e-02
+20952 20112 1.69183134944825e-01
+20952 20136 3.80306606051644e-01
+20952 20160 1.71998497763053e-01
+20952 20184 2.19273960211435e-02
+20952 20496 1.81271814654423e-01
+20952 20520 1.47878048249851e+00
+20952 20544 3.38763623309867e+00
+20952 20568 1.52005931556468e+00
+20952 20592 1.91591522920965e-01
+20952 20904 4.21236485964583e-01
+20952 20928 3.51831670951079e+00
+20952 20976 3.64388340608857e+00
+20952 21000 4.52628160109029e-01
+20952 21312 1.54387821770836e-01
+20952 21336 1.36581515747563e+00
+20952 21360 3.31201727714566e+00
+20952 21384 1.40655976561498e+00
+20952 21408 1.64573973805675e-01
+20952 21720 1.45025570956898e-02
+20952 21744 1.40941803689104e-01
+20952 21768 3.61401867063392e-01
+20952 21792 1.43623610275629e-01
+20952 21816 1.51730087423208e-02
+20953 20953 1.00000000000000e+00
+20954 20954 1.00000000000000e+00
+20955 20955 1.00000000000000e+00
+20956 20956 1.00000000000000e+00
+20957 20957 1.00000000000000e+00
+20958 20958 1.00000000000000e+00
+20959 20959 1.00000000000000e+00
+20960 20960 1.00000000000000e+00
+20961 20961 1.00000000000000e+00
+20962 20962 1.00000000000000e+00
+20963 20963 1.00000000000000e+00
+20964 20964 1.00000000000000e+00
+20965 20965 1.00000000000000e+00
+20966 20966 1.00000000000000e+00
+20967 20967 1.00000000000000e+00
+20968 20968 1.00000000000000e+00
+20969 20969 1.00000000000000e+00
+20970 20970 1.00000000000000e+00
+20971 20971 1.00000000000000e+00
+20972 20972 1.00000000000000e+00
+20973 20973 1.00000000000000e+00
+20974 20974 1.00000000000000e+00
+20975 20975 1.00000000000000e+00
+20976 9261 -7.09749042147122e-04
+20976 9285 -4.81042644266857e-02
+20976 9309 -5.91529245750124e-02
+20976 9333 -3.53912977336373e-03
+20976 9837 -1.54549245000000e-12
+20976 9861 -1.37572068971871e-01
+20976 9885 -1.79075268972273e+00
+20976 9909 -2.57969505935670e+00
+20976 9933 -4.52565793524386e-01
+20976 9957 -6.25604395553294e-03
+20976 10437 -4.10935087373672e-04
+20976 10461 -4.57856882565000e-01
+20976 10485 -6.39325921400962e+00
+20976 10509 -1.00058294587792e+01
+20976 10533 -1.59016329279607e+00
+20976 10557 -2.20016673822275e-02
+20976 11037 -4.15196523486822e-04
+20976 11061 -1.56376062952830e-01
+20976 11085 -2.17167163998999e+00
+20976 11109 -3.63348164739573e+00
+20976 11133 -7.58041586363691e-01
+20976 11157 -2.41855455161594e-03
+20976 11661 -1.46097158628629e-03
+20976 11685 -7.17232553767068e-02
+20976 11709 -1.34464897613047e-01
+20976 11733 -2.09752511183683e-02
+20976 12285 -1.71538377450000e-10
+20976 12309 -1.01389756552504e-05
+20976 12333 -2.30239133829013e-06
+20976 20976 9.13287850138189e+00
+20976 20112 2.10722284196196e-02
+20976 20136 1.71998497763053e-01
+20976 20160 3.93380472821893e-01
+20976 20184 1.73589216340481e-01
+20976 20208 2.14699080639767e-02
+20976 20520 1.88423305970201e-01
+20976 20544 1.52005931556468e+00
+20976 20568 3.43815469624709e+00
+20976 20592 1.50343418584938e+00
+20976 20616 1.84267023541376e-01
+20976 20928 4.58342691413095e-01
+20976 20952 3.64388340608857e+00
+20976 21000 3.54045363333228e+00
+20976 21024 4.32485248224023e-01
+20976 21336 1.87065967598068e-01
+20976 21360 1.40655976561499e+00
+20976 21384 2.98850003984707e+00
+20976 21408 1.33129786065530e+00
+20976 21432 1.68250491358146e-01
+20976 21744 2.07328938265863e-02
+20976 21768 1.43623610275629e-01
+20976 21792 2.80966808721889e-01
+20976 21816 1.30555135041960e-01
+20976 21840 1.74657750181692e-02
+20977 20977 1.00000000000000e+00
+20978 20978 1.00000000000000e+00
+20979 20979 1.00000000000000e+00
+20980 20980 1.00000000000000e+00
+20981 20981 1.00000000000000e+00
+20982 20982 1.00000000000000e+00
+20983 20983 1.00000000000000e+00
+20984 20984 1.00000000000000e+00
+20985 20985 1.00000000000000e+00
+20986 20986 1.00000000000000e+00
+20987 20987 1.00000000000000e+00
+20988 20988 1.00000000000000e+00
+20989 20989 1.00000000000000e+00
+20990 20990 1.00000000000000e+00
+20991 20991 1.00000000000000e+00
+20992 20992 1.00000000000000e+00
+20993 20993 1.00000000000000e+00
+20994 20994 1.00000000000000e+00
+20995 20995 1.00000000000000e+00
+20996 20996 1.00000000000000e+00
+20997 20997 1.00000000000000e+00
+20998 20998 1.00000000000000e+00
+20999 20999 1.00000000000000e+00
+21000 9285 -6.49930412057389e-04
+21000 9309 -6.95654844075536e-03
+21000 9333 -9.54445888291218e-04
+21000 9861 -5.13822501368427e-06
+21000 9885 -1.44830657291904e-01
+21000 9909 -8.20278751359103e-01
+21000 9933 -6.31129289373421e-01
+21000 9957 -4.19819363012449e-02
+21000 9981 -4.99741004108010e-05
+21000 10461 -5.20445063742411e-03
+21000 10485 -1.20828029646940e+00
+21000 10509 -7.42284113932584e+00
+21000 10533 -5.30453705292584e+00
+21000 10557 -4.41673679756468e-01
+21000 10581 -1.46560958747292e-03
+21000 11061 -1.07430284427306e-02
+21000 11085 -8.51279404173917e-01
+21000 11109 -6.52746285474599e+00
+21000 11133 -5.28864690628313e+00
+21000 11157 -4.87379513125287e-01
+21000 11181 -1.91637324661208e-04
+21000 11661 -2.99572453049506e-04
+21000 11685 -8.38121177760756e-02
+21000 11709 -5.98577294457409e-01
+21000 11733 -5.06189018822980e-01
+21000 11757 -3.82846590392077e-02
+21000 12285 -9.70816716290000e-10
+21000 12309 -1.52551360576183e-03
+21000 12333 -3.42397024350174e-03
+21000 12357 -1.30936415916659e-05
+21000 21000 8.85982970989378e+00
+21000 20136 2.19273960211435e-02
+21000 20160 1.73589216340481e-01
+21000 20184 3.89411284935658e-01
+21000 20208 1.81741071819458e-01
+21000 20232 2.39653598908880e-02
+21000 20544 1.91591522920965e-01
+21000 20568 1.50343418584938e+00
+21000 20592 3.34654915774414e+00
+21000 20616 1.56380912680991e+00
+21000 20640 2.06685258161097e-01
+21000 20952 4.52628160109029e-01
+21000 20976 3.54045363333228e+00
+21000 21024 3.67969130569658e+00
+21000 21048 4.87437578200103e-01
+21000 21360 1.64573973805675e-01
+21000 21384 1.33129786065530e+00
+21000 21408 3.04811342980975e+00
+21000 21432 1.43912834252732e+00
+21000 21456 1.91531594273680e-01
+21000 21768 1.51730087423208e-02
+21000 21792 1.30555135041960e-01
+21000 21816 3.14802352952062e-01
+21000 21840 1.50570875748812e-01
+21000 21864 2.01769439190338e-02
+21001 21001 1.00000000000000e+00
+21002 21002 1.00000000000000e+00
+21003 21003 1.00000000000000e+00
+21004 21004 1.00000000000000e+00
+21005 21005 1.00000000000000e+00
+21006 21006 1.00000000000000e+00
+21007 21007 1.00000000000000e+00
+21008 21008 1.00000000000000e+00
+21009 21009 1.00000000000000e+00
+21010 21010 1.00000000000000e+00
+21011 21011 1.00000000000000e+00
+21012 21012 1.00000000000000e+00
+21013 21013 1.00000000000000e+00
+21014 21014 1.00000000000000e+00
+21015 21015 1.00000000000000e+00
+21016 21016 1.00000000000000e+00
+21017 21017 1.00000000000000e+00
+21018 21018 1.00000000000000e+00
+21019 21019 1.00000000000000e+00
+21020 21020 1.00000000000000e+00
+21021 21021 1.00000000000000e+00
+21022 21022 1.00000000000000e+00
+21023 21023 1.00000000000000e+00
+21024 9309 -2.65552428960322e-05
+21024 9333 -3.13185518468507e-05
+21024 9885 -1.18646387859606e-04
+21024 9909 -7.51061278934865e-02
+21024 9933 -2.38646796391970e-01
+21024 9957 -7.66304469585035e-02
+21024 9981 -3.42380297403756e-04
+21024 10485 -3.98639657652794e-02
+21024 10509 -1.74396899578504e+00
+21024 10533 -5.11917555376193e+00
+21024 10557 -1.87921702765304e+00
+21024 10581 -7.56563029286534e-02
+21024 10605 -5.30610853420270e-07
+21024 11061 -6.61515078038800e-08
+21024 11085 -1.01470518843153e-01
+21024 11109 -3.34211054867218e+00
+21024 11133 -1.18093709731950e+01
+21024 11157 -4.28313906253423e+00
+21024 11181 -1.63888366341903e-01
+21024 11205 -2.63635274781210e-07
+21024 11661 -4.14899663859000e-08
+21024 11685 -2.01988474371421e-02
+21024 11709 -7.93553797255210e-01
+21024 11733 -2.41236416441370e+00
+21024 11757 -1.07744492518084e+00
+21024 11781 -2.56556343381740e-02
+21024 12285 -1.31019120337000e-09
+21024 12309 -7.02520703206134e-03
+21024 12333 -4.35226319330428e-02
+21024 12357 -1.51639929481646e-02
+21024 12381 -1.19463980016846e-06
+21024 21024 9.77556496808017e+00
+21024 20160 2.14699080639767e-02
+21024 20184 1.81741071819458e-01
+21024 20208 4.33158525793911e-01
+21024 20232 2.08832877466460e-01
+21024 20256 2.82428594757271e-02
+21024 20568 1.84267023541376e-01
+21024 20592 1.56380912680991e+00
+21024 20616 3.72922002063192e+00
+21024 20640 1.77869649869605e+00
+21024 20664 2.37988866512911e-01
+21024 20976 4.32485248224023e-01
+21024 21000 3.67969130569658e+00
+21024 21048 4.12606418741718e+00
+21024 21072 5.44078468654171e-01
+21024 21384 1.68250491358146e-01
+21024 21408 1.43912834252732e+00
+21024 21432 3.42083700730084e+00
+21024 21456 1.51845040734970e+00
+21024 21480 1.88081007563742e-01
+21024 21792 1.74657750181692e-02
+21024 21816 1.50570875748812e-01
+21024 21840 3.56062772461144e-01
+21024 21864 1.43771354629874e-01
+21024 21888 1.57658947384348e-02
+21025 21025 1.00000000000000e+00
+21026 21026 1.00000000000000e+00
+21027 21027 1.00000000000000e+00
+21028 21028 1.00000000000000e+00
+21029 21029 1.00000000000000e+00
+21030 21030 1.00000000000000e+00
+21031 21031 1.00000000000000e+00
+21032 21032 1.00000000000000e+00
+21033 21033 1.00000000000000e+00
+21034 21034 1.00000000000000e+00
+21035 21035 1.00000000000000e+00
+21036 21036 1.00000000000000e+00
+21037 21037 1.00000000000000e+00
+21038 21038 1.00000000000000e+00
+21039 21039 1.00000000000000e+00
+21040 21040 1.00000000000000e+00
+21041 21041 1.00000000000000e+00
+21042 21042 1.00000000000000e+00
+21043 21043 1.00000000000000e+00
+21044 21044 1.00000000000000e+00
+21045 21045 1.00000000000000e+00
+21046 21046 1.00000000000000e+00
+21047 21047 1.00000000000000e+00
+21048 9909 -2.81280434771760e-04
+21048 9933 -2.79573555867766e-02
+21048 9957 -2.67986772911742e-02
+21048 9981 -6.20042783016768e-04
+21048 10509 -1.08175470687369e-01
+21048 10533 -1.43097519682753e+00
+21048 10557 -2.15460430129387e+00
+21048 10581 -3.35634600221831e-01
+21048 10605 -2.27056743930521e-03
+21048 11085 -3.96784765631889e-04
+21048 11109 -5.12343280474981e-01
+21048 11133 -7.34164664187936e+00
+21048 11157 -1.09547396060211e+01
+21048 11181 -1.39480511332762e+00
+21048 11205 -1.42858512538468e-02
+21048 11685 -6.88591247467987e-04
+21048 11709 -2.26898724073120e-01
+21048 11733 -3.33774787695744e+00
+21048 11757 -5.27654274785924e+00
+21048 11781 -8.81159512977845e-01
+21048 11805 -2.68203129603574e-03
+21048 12285 -2.84663206480000e-10
+21048 12309 -5.78613424267495e-03
+21048 12333 -1.49049353647895e-01
+21048 12357 -2.20635404010224e-01
+21048 12381 -3.66291396137415e-02
+21048 12933 -2.92525320334765e-06
+21048 12957 -1.91406254721892e-04
+21048 12981 -2.65678797598079e-05
+21048 21048 1.06033020384096e+01
+21048 20184 2.39653598908880e-02
+21048 20208 2.08832877466460e-01
+21048 20232 4.91102744427810e-01
+21048 20256 1.73977969604061e-01
+21048 20280 1.52516329252881e-02
+21048 20592 2.06685258161097e-01
+21048 20616 1.77869649869605e+00
+21048 20640 4.17048493342253e+00
+21048 20664 1.57586671027077e+00
+21048 20688 1.55977811054779e-01
+21048 21000 4.87437578200103e-01
+21048 21024 4.12606418741718e+00
+21048 21072 3.81874972158654e+00
+21048 21096 4.10608961742444e-01
+21048 21408 1.91531594273680e-01
+21048 21432 1.51845040734971e+00
+21048 21456 3.35768784025785e+00
+21048 21480 1.37976453011192e+00
+21048 21504 1.56860124964233e-01
+21048 21816 2.01769439190338e-02
+21048 21840 1.43771354629874e-01
+21048 21864 2.87903471136643e-01
+21048 21888 1.24952424564347e-01
+21048 21912 1.54722114026518e-02
+21049 21049 1.00000000000000e+00
+21050 21050 1.00000000000000e+00
+21051 21051 1.00000000000000e+00
+21052 21052 1.00000000000000e+00
+21053 21053 1.00000000000000e+00
+21054 21054 1.00000000000000e+00
+21055 21055 1.00000000000000e+00
+21056 21056 1.00000000000000e+00
+21057 21057 1.00000000000000e+00
+21058 21058 1.00000000000000e+00
+21059 21059 1.00000000000000e+00
+21060 21060 1.00000000000000e+00
+21061 21061 1.00000000000000e+00
+21062 21062 1.00000000000000e+00
+21063 21063 1.00000000000000e+00
+21064 21064 1.00000000000000e+00
+21065 21065 1.00000000000000e+00
+21066 21066 1.00000000000000e+00
+21067 21067 1.00000000000000e+00
+21068 21068 1.00000000000000e+00
+21069 21069 1.00000000000000e+00
+21070 21070 1.00000000000000e+00
+21071 21071 1.00000000000000e+00
+21072 9933 -2.84870293465071e-04
+21072 9957 -2.45483860613431e-03
+21072 9981 -1.43016294015585e-04
+21072 10509 -3.86495522040050e-07
+21072 10533 -1.10018885673370e-01
+21072 10557 -5.66300017826290e-01
+21072 10581 -3.45089594634309e-01
+21072 10605 -3.23742370319432e-02
+21072 11109 -5.05501392377803e-03
+21072 11133 -1.33316206270331e+00
+21072 11157 -6.75754988964425e+00
+21072 11181 -5.92201974611267e+00
+21072 11205 -4.17890200361980e-01
+21072 11709 -1.46556642943472e-02
+21072 11733 -1.13078752502035e+00
+21072 11757 -9.88798952076332e+00
+21072 11781 -1.01045841424134e+01
+21072 11805 -1.54266916353426e-01
+21072 12309 -1.07614750049479e-03
+21072 12333 -1.42656758267422e-01
+21072 12357 -1.81132176135842e+00
+21072 12381 -1.03543496275681e+00
+21072 12933 -3.51333413334758e-05
+21072 12957 -9.21270429339958e-03
+21072 12981 -2.35827455065932e-03
+21072 21072 1.08005989053058e+01
+21072 20208 2.82428594757271e-02
+21072 20232 1.73977969604061e-01
+21072 20256 3.84586462846899e-01
+21072 20280 2.85641484834276e-01
+21072 20616 2.37988866512911e-01
+21072 20640 1.57586671027078e+00
+21072 20664 3.78957606445573e+00
+21072 20688 2.73579568635173e+00
+21072 21024 5.44078468654171e-01
+21072 21048 3.81874972158654e+00
+21072 21096 7.01598994451433e+00
+21072 21432 1.88081007563742e-01
+21072 21456 1.37976453011191e+00
+21072 21480 3.89559657381350e+00
+21072 21504 3.02294763350087e+00
+21072 21840 1.57658947384348e-02
+21072 21864 1.24952424564347e-01
+21072 21888 4.11091590186342e-01
+21072 21912 3.57429471621562e-01
+21073 21073 1.00000000000000e+00
+21074 21074 1.00000000000000e+00
+21075 21075 1.00000000000000e+00
+21076 21076 1.00000000000000e+00
+21077 21077 1.00000000000000e+00
+21078 21078 1.00000000000000e+00
+21079 21079 1.00000000000000e+00
+21080 21080 1.00000000000000e+00
+21081 21081 1.00000000000000e+00
+21082 21082 1.00000000000000e+00
+21083 21083 1.00000000000000e+00
+21084 21084 1.00000000000000e+00
+21085 21085 1.00000000000000e+00
+21086 21086 1.00000000000000e+00
+21087 21087 1.00000000000000e+00
+21088 21088 1.00000000000000e+00
+21089 21089 1.00000000000000e+00
+21090 21090 1.00000000000000e+00
+21091 21091 1.00000000000000e+00
+21092 21092 1.00000000000000e+00
+21093 21093 1.00000000000000e+00
+21094 21094 1.00000000000000e+00
+21095 21095 1.00000000000000e+00
+21096 9957 -1.54286544133730e-07
+21096 9981 -1.33099563758220e-07
+21096 10533 -2.42166638779766e-05
+21096 10557 -3.17314047065696e-02
+21096 10581 -1.65636733875920e-01
+21096 10605 -4.88682978709389e-02
+21096 11133 -3.10803560498793e-02
+21096 11157 -1.79324213756294e+00
+21096 11181 -6.32291240332932e+00
+21096 11205 -7.35786296464176e-01
+21096 11709 -2.12346769668860e-07
+21096 11733 -1.11494712416177e-01
+21096 11757 -7.14013593441091e+00
+21096 11781 -1.47080981867743e+01
+21096 11805 -2.89759613634602e-01
+21096 12309 -2.27564163003300e-07
+21096 12333 -4.22648233034809e-02
+21096 12357 -2.47118942806315e+00
+21096 12381 -1.81449700885224e+00
+21096 12933 -4.97899102435181e-05
+21096 12957 -1.70855648037459e-02
+21096 12981 -4.53057394299999e-03
+21096 21096 1.21577171568315e+01
+21096 20232 1.52516329252881e-02
+21096 20256 2.85641484834276e-01
+21096 20280 4.64521539191535e-01
+21096 20640 1.55977811054779e-01
+21096 20664 2.73579568635172e+00
+21096 20688 4.37974669531999e+00
+21096 21048 4.10608961742444e-01
+21096 21072 7.01598994451433e+00
+21096 21456 1.56860124964233e-01
+21096 21480 3.02294763350087e+00
+21096 21504 4.94787439225209e+00
+21096 21864 1.54722114026518e-02
+21096 21888 3.57429471621562e-01
+21096 21912 6.06553463424562e-01
+21097 21097 1.00000000000000e+00
+21098 21098 1.00000000000000e+00
+21099 21099 1.00000000000000e+00
+21100 21100 1.00000000000000e+00
+21101 21101 1.00000000000000e+00
+21102 21102 1.00000000000000e+00
+21103 21103 1.00000000000000e+00
+21104 21104 1.00000000000000e+00
+21105 21105 1.00000000000000e+00
+21106 21106 1.00000000000000e+00
+21107 21107 1.00000000000000e+00
+21108 21108 1.00000000000000e+00
+21109 21109 1.00000000000000e+00
+21110 21110 1.00000000000000e+00
+21111 21111 1.00000000000000e+00
+21112 21112 1.00000000000000e+00
+21113 21113 1.00000000000000e+00
+21114 21114 1.00000000000000e+00
+21115 21115 1.00000000000000e+00
+21116 21116 1.00000000000000e+00
+21117 21117 1.00000000000000e+00
+21118 21118 1.00000000000000e+00
+21119 21119 1.00000000000000e+00
+21120 7317 -1.38468320828474e-01
+21120 7341 -5.03800392544239e-01
+21120 7365 -1.19215732302672e-02
+21120 7389 -7.90465775745000e-09
+21120 7893 -5.16422235334541e-03
+21120 7917 -5.11769890541422e+00
+21120 7941 -5.62748706111386e+00
+21120 7965 -1.17498240106752e-01
+21120 7989 -4.61831190340906e-06
+21120 8493 -2.58559228758133e-01
+21120 8517 -1.13506209985228e+01
+21120 8541 -5.32072509956953e+00
+21120 8565 -9.39954658147383e-02
+21120 8589 -3.45535269833850e-07
+21120 9093 -3.88419704019062e-02
+21120 9117 -1.21722609796364e+00
+21120 9141 -8.20147575343329e-01
+21120 9165 -8.34695865135706e-03
+21120 21120 9.75447987253461e+00
+21120 20304 7.37871840795673e-01
+21120 20328 4.24116551982357e-01
+21120 20352 1.57658947384346e-02
+21120 20712 4.74889323458448e+00
+21120 20736 2.81178010326743e+00
+21120 20760 1.24952424564338e-01
+21120 21144 5.81606050191944e+00
+21120 21168 4.11091590186319e-01
+21120 21528 3.45137496366532e+00
+21120 21552 2.97669063250815e+00
+21120 21576 3.57429471621569e-01
+21121 21121 1.00000000000000e+00
+21122 21122 1.00000000000000e+00
+21123 21123 1.00000000000000e+00
+21124 21124 1.00000000000000e+00
+21125 21125 1.00000000000000e+00
+21126 21126 1.00000000000000e+00
+21127 21127 1.00000000000000e+00
+21128 21128 1.00000000000000e+00
+21129 21129 1.00000000000000e+00
+21130 21130 1.00000000000000e+00
+21131 21131 1.00000000000000e+00
+21132 21132 1.00000000000000e+00
+21133 21133 1.00000000000000e+00
+21134 21134 1.00000000000000e+00
+21135 21135 1.00000000000000e+00
+21136 21136 1.00000000000000e+00
+21137 21137 1.00000000000000e+00
+21138 21138 1.00000000000000e+00
+21139 21139 1.00000000000000e+00
+21140 21140 1.00000000000000e+00
+21141 21141 1.00000000000000e+00
+21142 21142 1.00000000000000e+00
+21143 21143 1.00000000000000e+00
+21144 7317 -7.30006766659686e-02
+21144 7341 -2.98294215297023e-01
+21144 7365 -1.53507695888778e-02
+21144 7389 -1.26266347100430e-07
+21144 7893 -2.70507787133987e-03
+21144 7917 -3.05351420152937e+00
+21144 7941 -4.72007968522739e+00
+21144 7965 -6.38508544939145e-01
+21144 7989 -1.65362016833941e-02
+21144 8493 -1.61524079405966e-01
+21144 8517 -1.07635608328280e+01
+21144 8541 -1.13396010740792e+01
+21144 8565 -1.79211733908763e+00
+21144 8589 -3.39913024247143e-02
+21144 9093 -2.76749461282611e-02
+21144 9117 -2.63427490152784e+00
+21144 9141 -5.11981516898460e+00
+21144 9165 -9.48787970187852e-01
+21144 9189 -1.97299421219385e-03
+21144 9741 -2.32563123210228e-02
+21144 9765 -1.88624550732973e-02
+21144 21144 1.02261200668353e+01
+21144 20304 4.24116551982357e-01
+21144 20328 4.64035159481762e-01
+21144 20352 1.88081007563737e-01
+21144 20376 3.12543571524997e-02
+21144 20712 2.81178010326743e+00
+21144 20736 3.37521270349810e+00
+21144 20760 1.37976453011180e+00
+21144 20784 2.19988707963608e-01
+21144 21120 5.81606050191944e+00
+21144 21168 3.89559657381323e+00
+21144 21192 5.62807553266975e-01
+21144 21528 2.97669063250816e+00
+21144 21552 6.89066535570974e+00
+21144 21576 3.02294763350103e+00
+21144 21600 3.98307436753687e-01
+21145 21145 1.00000000000000e+00
+21146 21146 1.00000000000000e+00
+21147 21147 1.00000000000000e+00
+21148 21148 1.00000000000000e+00
+21149 21149 1.00000000000000e+00
+21150 21150 1.00000000000000e+00
+21151 21151 1.00000000000000e+00
+21152 21152 1.00000000000000e+00
+21153 21153 1.00000000000000e+00
+21154 21154 1.00000000000000e+00
+21155 21155 1.00000000000000e+00
+21156 21156 1.00000000000000e+00
+21157 21157 1.00000000000000e+00
+21158 21158 1.00000000000000e+00
+21159 21159 1.00000000000000e+00
+21160 21160 1.00000000000000e+00
+21161 21161 1.00000000000000e+00
+21162 21162 1.00000000000000e+00
+21163 21163 1.00000000000000e+00
+21164 21164 1.00000000000000e+00
+21165 21165 1.00000000000000e+00
+21166 21166 1.00000000000000e+00
+21167 21167 1.00000000000000e+00
+21168 7317 -1.07614750049477e-03
+21168 7341 -1.46556642943469e-02
+21168 7365 -5.05501392377792e-03
+21168 7389 -3.86495522040040e-07
+21168 7893 -3.51333413334755e-05
+21168 7917 -1.42656758267409e-01
+21168 7941 -1.13078752502027e+00
+21168 7965 -1.33316206270325e+00
+21168 7989 -1.10018885673367e-01
+21168 8013 -2.84870293465062e-04
+21168 8493 -9.21270429339987e-03
+21168 8517 -1.81132176135842e+00
+21168 8541 -9.88798952076265e+00
+21168 8565 -6.75754988964355e+00
+21168 8589 -5.66300017826257e-01
+21168 8613 -2.45483860613423e-03
+21168 9093 -2.35827455065941e-03
+21168 9117 -1.03543496275688e+00
+21168 9141 -1.01045841424140e+01
+21168 9165 -5.92201974611269e+00
+21168 9189 -3.45089594634301e-01
+21168 9213 -1.43016294015581e-04
+21168 9741 -1.54266916353447e-01
+21168 9765 -4.17890200362026e-01
+21168 9789 -3.23742370319458e-02
+21168 21168 1.08005989053051e+01
+21168 20304 1.57658947384346e-02
+21168 20328 1.88081007563737e-01
+21168 20352 5.44078468654156e-01
+21168 20376 2.37988866512904e-01
+21168 20400 2.82428594757262e-02
+21168 20712 1.24952424564338e-01
+21168 20736 1.37976453011180e+00
+21168 20760 3.81874972158620e+00
+21168 20784 1.57586671027066e+00
+21168 20808 1.73977969604054e-01
+21168 21120 4.11091590186319e-01
+21168 21144 3.89559657381323e+00
+21168 21192 3.78957606445555e+00
+21168 21216 3.84586462846898e-01
+21168 21528 3.57429471621569e-01
+21168 21552 3.02294763350103e+00
+21168 21576 7.01598994451490e+00
+21168 21600 2.73579568635197e+00
+21168 21624 2.85641484834303e-01
+21169 21169 1.00000000000000e+00
+21170 21170 1.00000000000000e+00
+21171 21171 1.00000000000000e+00
+21172 21172 1.00000000000000e+00
+21173 21173 1.00000000000000e+00
+21174 21174 1.00000000000000e+00
+21175 21175 1.00000000000000e+00
+21176 21176 1.00000000000000e+00
+21177 21177 1.00000000000000e+00
+21178 21178 1.00000000000000e+00
+21179 21179 1.00000000000000e+00
+21180 21180 1.00000000000000e+00
+21181 21181 1.00000000000000e+00
+21182 21182 1.00000000000000e+00
+21183 21183 1.00000000000000e+00
+21184 21184 1.00000000000000e+00
+21185 21185 1.00000000000000e+00
+21186 21186 1.00000000000000e+00
+21187 21187 1.00000000000000e+00
+21188 21188 1.00000000000000e+00
+21189 21189 1.00000000000000e+00
+21190 21190 1.00000000000000e+00
+21191 21191 1.00000000000000e+00
+21192 7341 -3.76985077331571e-04
+21192 7365 -6.38658904575269e-04
+21192 7389 -9.46477160706500e-08
+21192 7917 -3.56454239513502e-04
+21192 7941 -1.60508309066103e-01
+21192 7965 -5.38961450759740e-01
+21192 7989 -2.00180555053642e-01
+21192 8013 -2.14648723749300e-03
+21192 8517 -9.62596793221467e-02
+21192 8541 -2.39548250059451e+00
+21192 8565 -5.48334295921220e+00
+21192 8589 -2.25180646794097e+00
+21192 8613 -9.94144917254037e-02
+21192 8637 -2.55024749279370e-06
+21192 9117 -1.22950809007928e-01
+21192 9141 -4.52174059881939e+00
+21192 9165 -1.16102424187961e+01
+21192 9189 -3.50368766140368e+00
+21192 9213 -1.23074941957576e-01
+21192 9237 -6.36605257387350e-07
+21192 9741 -2.75622480796982e-01
+21192 9765 -2.51925394366349e+00
+21192 9789 -1.42156879861833e+00
+21192 9813 -1.38478634824624e-02
+21192 10365 -8.45132164331575e-05
+21192 10389 -8.11888108207384e-04
+21192 10413 -1.80427590875920e-07
+21192 21192 8.22345368046100e+00
+21192 20328 3.12543571524997e-02
+21192 20352 2.37988866512904e-01
+21192 20376 5.07714859658753e-01
+21192 20400 2.11270441481439e-01
+21192 20424 2.45747508946335e-02
+21192 20736 2.19988707963608e-01
+21192 20760 1.57586671027066e+00
+21192 20784 3.16981381131369e+00
+21192 20808 1.36062223715688e+00
+21192 20832 1.66177589685164e-01
+21192 21144 5.62807553266975e-01
+21192 21168 3.78957606445555e+00
+21192 21216 3.56739673796153e+00
+21192 21240 5.07262721643473e-01
+21192 21552 3.98307436753687e-01
+21192 21576 2.73579568635196e+00
+21192 21600 5.45879703285382e+00
+21192 21624 3.10346929434230e+00
+21192 21648 4.90225838751271e-01
+21193 21193 1.00000000000000e+00
+21194 21194 1.00000000000000e+00
+21195 21195 1.00000000000000e+00
+21196 21196 1.00000000000000e+00
+21197 21197 1.00000000000000e+00
+21198 21198 1.00000000000000e+00
+21199 21199 1.00000000000000e+00
+21200 21200 1.00000000000000e+00
+21201 21201 1.00000000000000e+00
+21202 21202 1.00000000000000e+00
+21203 21203 1.00000000000000e+00
+21204 21204 1.00000000000000e+00
+21205 21205 1.00000000000000e+00
+21206 21206 1.00000000000000e+00
+21207 21207 1.00000000000000e+00
+21208 21208 1.00000000000000e+00
+21209 21209 1.00000000000000e+00
+21210 21210 1.00000000000000e+00
+21211 21211 1.00000000000000e+00
+21212 21212 1.00000000000000e+00
+21213 21213 1.00000000000000e+00
+21214 21214 1.00000000000000e+00
+21215 21215 1.00000000000000e+00
+21216 7941 -7.25522370285930e-04
+21216 7965 -6.28594643042386e-02
+21216 7989 -7.55358123396607e-02
+21216 8013 -4.35560139697698e-03
+21216 8541 -1.07496598483683e-01
+21216 8565 -1.43888709538291e+00
+21216 8589 -2.49991636289078e+00
+21216 8613 -5.23272904718809e-01
+21216 8637 -8.22518959263143e-03
+21216 9141 -6.32999049357058e-01
+21216 9165 -9.05696095074192e+00
+21216 9189 -1.02980360621152e+01
+21216 9213 -1.56020234216349e+00
+21216 9237 -2.75544390262804e-02
+21216 9741 -9.08396678635035e-02
+21216 9765 -4.99269484568011e+00
+21216 9789 -7.22856710572123e+00
+21216 9813 -9.00513750001270e-01
+21216 9837 -2.60936372640858e-03
+21216 10365 -6.07278449815382e-04
+21216 10389 -7.27606402896131e-02
+21216 10413 -3.73800305753871e-02
+21216 21216 9.96801212356335e+00
+21216 20352 2.82428594757262e-02
+21216 20376 2.11270441481439e-01
+21216 20400 4.48016156154037e-01
+21216 20424 2.04608133035232e-01
+21216 20448 2.65772823641744e-02
+21216 20760 1.73977969604054e-01
+21216 20784 1.36062223715689e+00
+21216 20808 3.02295807149264e+00
+21216 20832 1.42526502644433e+00
+21216 20856 1.90138666925914e-01
+21216 21168 3.84586462846898e-01
+21216 21192 3.56739673796153e+00
+21216 21240 3.89793934425672e+00
+21216 21264 4.67222114420693e-01
+21216 21576 2.85641484834303e-01
+21216 21600 3.10346929434230e+00
+21216 21624 8.42373780668319e+00
+21216 21648 3.13883496231922e+00
+21216 21672 2.94482901828523e-01
+21217 21217 1.00000000000000e+00
+21218 21218 1.00000000000000e+00
+21219 21219 1.00000000000000e+00
+21220 21220 1.00000000000000e+00
+21221 21221 1.00000000000000e+00
+21222 21222 1.00000000000000e+00
+21223 21223 1.00000000000000e+00
+21224 21224 1.00000000000000e+00
+21225 21225 1.00000000000000e+00
+21226 21226 1.00000000000000e+00
+21227 21227 1.00000000000000e+00
+21228 21228 1.00000000000000e+00
+21229 21229 1.00000000000000e+00
+21230 21230 1.00000000000000e+00
+21231 21231 1.00000000000000e+00
+21232 21232 1.00000000000000e+00
+21233 21233 1.00000000000000e+00
+21234 21234 1.00000000000000e+00
+21235 21235 1.00000000000000e+00
+21236 21236 1.00000000000000e+00
+21237 21237 1.00000000000000e+00
+21238 21238 1.00000000000000e+00
+21239 21239 1.00000000000000e+00
+21240 7965 -7.09905820190969e-04
+21240 7989 -8.02865271787030e-03
+21240 8013 -1.17783345955637e-03
+21240 8541 -5.73103372691886e-06
+21240 8565 -1.13112689805214e-01
+21240 8589 -8.31720144615557e-01
+21240 8613 -7.67651190101436e-01
+21240 8637 -5.14144086384422e-02
+21240 8661 -6.02398997712644e-05
+21240 9141 -1.42217084326026e-02
+21240 9165 -1.92125528213328e+00
+21240 9189 -7.61855577416950e+00
+21240 9213 -5.10178297208434e+00
+21240 9237 -4.28266688460076e-01
+21240 9261 -1.69124856312060e-03
+21240 9741 -7.39950019853701e-03
+21240 9765 -1.64156849315702e+00
+21240 9789 -1.01403827040806e+01
+21240 9813 -5.86735061115207e+00
+21240 9837 -3.49286089514245e-01
+21240 9861 -2.23427793991197e-04
+21240 10365 -1.16143813803571e-03
+21240 10389 -4.56253711353306e-01
+21240 10413 -8.79965056906130e-01
+21240 10437 -5.65856354692916e-02
+21240 21240 9.38018160737729e+00
+21240 20376 2.45747508946335e-02
+21240 20400 2.04608133035232e-01
+21240 20424 4.74982653968496e-01
+21240 20448 2.06994670444987e-01
+21240 20472 2.51713852470724e-02
+21240 20784 1.66177589685164e-01
+21240 20808 1.42526502644433e+00
+21240 20832 3.36345328386552e+00
+21240 20856 1.38078276116632e+00
+21240 20880 1.55057023365662e-01
+21240 21192 5.07262721643473e-01
+21240 21216 3.89793934425672e+00
+21240 21264 3.45834867769275e+00
+21240 21288 3.97365055002482e-01
+21240 21600 4.90225838751271e-01
+21240 21624 3.13883496231919e+00
+21240 21648 5.56573923087704e+00
+21240 21672 2.63307945879095e+00
+21240 21696 3.63786962869213e-01
+21241 21241 1.00000000000000e+00
+21242 21242 1.00000000000000e+00
+21243 21243 1.00000000000000e+00
+21244 21244 1.00000000000000e+00
+21245 21245 1.00000000000000e+00
+21246 21246 1.00000000000000e+00
+21247 21247 1.00000000000000e+00
+21248 21248 1.00000000000000e+00
+21249 21249 1.00000000000000e+00
+21250 21250 1.00000000000000e+00
+21251 21251 1.00000000000000e+00
+21252 21252 1.00000000000000e+00
+21253 21253 1.00000000000000e+00
+21254 21254 1.00000000000000e+00
+21255 21255 1.00000000000000e+00
+21256 21256 1.00000000000000e+00
+21257 21257 1.00000000000000e+00
+21258 21258 1.00000000000000e+00
+21259 21259 1.00000000000000e+00
+21260 21260 1.00000000000000e+00
+21261 21261 1.00000000000000e+00
+21262 21262 1.00000000000000e+00
+21263 21263 1.00000000000000e+00
+21264 7989 -3.48101433441661e-05
+21264 8013 -4.27068489809045e-05
+21264 8565 -9.55235986069331e-05
+21264 8589 -8.48036522135815e-02
+21264 8613 -2.75908869197936e-01
+21264 8637 -8.46843250636841e-02
+21264 8661 -3.83203401246183e-04
+21264 9165 -5.86754948615230e-02
+21264 9189 -1.62540162070135e+00
+21264 9213 -3.94528752716499e+00
+21264 9237 -1.66495891798119e+00
+21264 9261 -7.03796648728656e-02
+21264 9285 -7.35209993245730e-07
+21264 9765 -1.27735214090194e-01
+21264 9789 -4.98769432682709e+00
+21264 9813 -1.21491661808584e+01
+21264 9837 -3.32914583511341e+00
+21264 9861 -1.30866721526174e-01
+21264 9885 -3.64761453425570e-07
+21264 10365 -2.69315925168939e-04
+21264 10389 -7.91085148021612e-01
+21264 10413 -4.37787045752166e+00
+21264 10437 -1.73985483446230e+00
+21264 10461 -1.99678375256180e-02
+21264 11013 -2.95310796217861e-03
+21264 11037 -1.17009061321147e-02
+21264 11061 -5.06717717815112e-06
+21264 21264 8.34560968819238e+00
+21264 20400 2.65772823641744e-02
+21264 20424 2.06994670444987e-01
+21264 20448 4.54332216932561e-01
+21264 20472 2.00736623449202e-01
+21264 20496 2.50127706152282e-02
+21264 20808 1.90138666925914e-01
+21264 20832 1.38078276116632e+00
+21264 20856 2.84901195706931e+00
+21264 20880 1.33207175863363e+00
+21264 20904 1.77960916292741e-01
+21264 21216 4.67222114420693e-01
+21264 21240 3.45834867769275e+00
+21264 21288 3.67164699493721e+00
+21264 21312 5.20546693731807e-01
+21264 21624 2.94482901828523e-01
+21264 21648 2.63307945879099e+00
+21264 21672 6.56077331714630e+00
+21264 21696 3.23794388911829e+00
+21264 21720 4.45699009410358e-01
+21265 21265 1.00000000000000e+00
+21266 21266 1.00000000000000e+00
+21267 21267 1.00000000000000e+00
+21268 21268 1.00000000000000e+00
+21269 21269 1.00000000000000e+00
+21270 21270 1.00000000000000e+00
+21271 21271 1.00000000000000e+00
+21272 21272 1.00000000000000e+00
+21273 21273 1.00000000000000e+00
+21274 21274 1.00000000000000e+00
+21275 21275 1.00000000000000e+00
+21276 21276 1.00000000000000e+00
+21277 21277 1.00000000000000e+00
+21278 21278 1.00000000000000e+00
+21279 21279 1.00000000000000e+00
+21280 21280 1.00000000000000e+00
+21281 21281 1.00000000000000e+00
+21282 21282 1.00000000000000e+00
+21283 21283 1.00000000000000e+00
+21284 21284 1.00000000000000e+00
+21285 21285 1.00000000000000e+00
+21286 21286 1.00000000000000e+00
+21287 21287 1.00000000000000e+00
+21288 8589 -2.63403151354021e-04
+21288 8613 -2.92956316988260e-02
+21288 8637 -2.75991069040440e-02
+21288 8661 -6.29502914319938e-04
+21288 9189 -6.90657784007974e-02
+21288 9213 -1.01464558466504e+00
+21288 9237 -1.82669002690140e+00
+21288 9261 -3.51322853426484e-01
+21288 9285 -4.16543717404551e-03
+21288 9765 -1.55434573406250e-07
+21288 9789 -7.88820640174529e-01
+21288 9813 -8.15750338257103e+00
+21288 9837 -9.17219547194407e+00
+21288 9861 -1.35404939750063e+00
+21288 9885 -2.42284408096528e-02
+21288 10365 -2.25852715468000e-08
+21288 10389 -2.25446163389854e-01
+21288 10413 -6.55683928723505e+00
+21288 10437 -8.15239410774474e+00
+21288 10461 -9.00428623635632e-01
+21288 10485 -3.41592650809742e-03
+21288 11013 -1.58080846130479e-02
+21288 11037 -2.18132430886979e-01
+21288 11061 -6.76799247529346e-02
+21288 21288 1.01339764526106e+01
+21288 20424 2.51713852470724e-02
+21288 20448 2.00736623449202e-01
+21288 20472 4.51557124279110e-01
+21288 20496 2.04776719214461e-01
+21288 20520 2.61814091883872e-02
+21288 20832 1.55057023365662e-01
+21288 20856 1.33207175863363e+00
+21288 20880 3.17831707809929e+00
+21288 20904 1.41538524136979e+00
+21288 20928 1.75885394049703e-01
+21288 21240 3.97365055002482e-01
+21288 21264 3.67164699493721e+00
+21288 21312 3.71364396652329e+00
+21288 21336 4.07864297899003e-01
+21288 21648 3.63786962869213e-01
+21288 21672 3.23794388911829e+00
+21288 21696 7.76021858978311e+00
+21288 21720 2.84378594303404e+00
+21288 21744 2.65247476348150e-01
+21289 21289 1.00000000000000e+00
+21290 21290 1.00000000000000e+00
+21291 21291 1.00000000000000e+00
+21292 21292 1.00000000000000e+00
+21293 21293 1.00000000000000e+00
+21294 21294 1.00000000000000e+00
+21295 21295 1.00000000000000e+00
+21296 21296 1.00000000000000e+00
+21297 21297 1.00000000000000e+00
+21298 21298 1.00000000000000e+00
+21299 21299 1.00000000000000e+00
+21300 21300 1.00000000000000e+00
+21301 21301 1.00000000000000e+00
+21302 21302 1.00000000000000e+00
+21303 21303 1.00000000000000e+00
+21304 21304 1.00000000000000e+00
+21305 21305 1.00000000000000e+00
+21306 21306 1.00000000000000e+00
+21307 21307 1.00000000000000e+00
+21308 21308 1.00000000000000e+00
+21309 21309 1.00000000000000e+00
+21310 21310 1.00000000000000e+00
+21311 21311 1.00000000000000e+00
+21312 8613 -2.47411633771673e-04
+21312 8637 -2.26300359808550e-03
+21312 8661 -1.43395025777822e-04
+21312 9189 -2.10202261173670e-07
+21312 9213 -7.89606507668563e-02
+21312 9237 -5.57018387595856e-01
+21312 9261 -4.56776305238471e-01
+21312 9285 -2.34736856990423e-02
+21312 9309 -4.02905087151119e-06
+21312 9789 -1.30329133732080e-02
+21312 9813 -1.55811480797783e+00
+21312 9837 -5.81223872309214e+00
+21312 9861 -3.99618407387618e+00
+21312 9885 -3.40415392059897e-01
+21312 9909 -1.11687003265819e-03
+21312 10389 -1.20141728929727e-02
+21312 10413 -2.02506210321669e+00
+21312 10437 -1.05430018435055e+01
+21312 10461 -5.95229647679319e+00
+21312 10485 -3.74380593890030e-01
+21312 10509 -3.11177468058401e-04
+21312 11013 -1.89372668443841e-02
+21312 11037 -1.08493774795171e+00
+21312 11061 -1.58757384800460e+00
+21312 11085 -8.86963956974830e-02
+21312 11661 -2.02792477156877e-06
+21312 11685 -7.01874925208500e-07
+21312 21312 8.49983496383122e+00
+21312 20448 2.50127706152282e-02
+21312 20472 2.04776719214461e-01
+21312 20496 4.68009715976442e-01
+21312 20520 2.01103230141625e-01
+21312 20544 2.40943983470192e-02
+21312 20856 1.77960916292741e-01
+21312 20880 1.41538524136979e+00
+21312 20904 3.14651504285889e+00
+21312 20928 1.32109286328217e+00
+21312 20952 1.54387821770836e-01
+21312 21264 5.20546693731807e-01
+21312 21288 3.71364396652329e+00
+21312 21336 3.44529520645668e+00
+21312 21360 4.53459503715156e-01
+21312 21672 4.45699009410358e-01
+21312 21696 2.84378594303404e+00
+21312 21720 5.14231724303775e+00
+21312 21744 2.87162435362045e+00
+21312 21768 4.52658612056961e-01
+21313 21313 1.00000000000000e+00
+21314 21314 1.00000000000000e+00
+21315 21315 1.00000000000000e+00
+21316 21316 1.00000000000000e+00
+21317 21317 1.00000000000000e+00
+21318 21318 1.00000000000000e+00
+21319 21319 1.00000000000000e+00
+21320 21320 1.00000000000000e+00
+21321 21321 1.00000000000000e+00
+21322 21322 1.00000000000000e+00
+21323 21323 1.00000000000000e+00
+21324 21324 1.00000000000000e+00
+21325 21325 1.00000000000000e+00
+21326 21326 1.00000000000000e+00
+21327 21327 1.00000000000000e+00
+21328 21328 1.00000000000000e+00
+21329 21329 1.00000000000000e+00
+21330 21330 1.00000000000000e+00
+21331 21331 1.00000000000000e+00
+21332 21332 1.00000000000000e+00
+21333 21333 1.00000000000000e+00
+21334 21334 1.00000000000000e+00
+21335 21335 1.00000000000000e+00
+21336 8637 -3.20764573755030e-07
+21336 8661 -2.87805904174350e-07
+21336 9213 -1.90559154330363e-05
+21336 9237 -4.82939482475499e-02
+21336 9261 -1.45112262225362e-01
+21336 9285 -3.18464976229823e-02
+21336 9309 -2.19376034812516e-05
+21336 9813 -3.65312941816135e-02
+21336 9837 -1.13270057768643e+00
+21336 9861 -3.00685097530566e+00
+21336 9885 -1.25135147236020e+00
+21336 9909 -4.73116659948570e-02
+21336 9933 -1.54264278491790e-07
+21336 10413 -1.51606456257919e-01
+21336 10437 -5.50103384768736e+00
+21336 10461 -1.24786044584959e+01
+21336 10485 -3.15244129814928e+00
+21336 10509 -1.30571047099534e-01
+21336 10533 -1.33252547496480e-07
+21336 11013 -4.00184406382054e-03
+21336 11037 -1.73811843761455e+00
+21336 11061 -6.80856023493025e+00
+21336 11085 -1.88437508933354e+00
+21336 11109 -2.67141945964825e-02
+21336 11661 -1.77902210357934e-02
+21336 11685 -3.98978040899721e-02
+21336 11709 -2.89818847393758e-05
+21336 21336 9.15595174167024e+00
+21336 20472 2.61814091883872e-02
+21336 20496 2.01103230141625e-01
+21336 20520 4.37725380813625e-01
+21336 20544 2.00511985679799e-01
+21336 20568 2.60335980729306e-02
+21336 20880 1.75885394049703e-01
+21336 20904 1.32109286328217e+00
+21336 20928 2.83315650998120e+00
+21336 20952 1.36581515747563e+00
+21336 20976 1.87065967598068e-01
+21336 21288 4.07864297899003e-01
+21336 21312 3.44529520645668e+00
+21336 21360 3.78477955217493e+00
+21336 21384 4.92735384328564e-01
+21336 21696 2.65247476348150e-01
+21336 21720 2.87162435362045e+00
+21336 21744 7.86066781462640e+00
+21336 21768 3.22216462969525e+00
+21336 21792 3.52882545366849e-01
+21337 21337 1.00000000000000e+00
+21338 21338 1.00000000000000e+00
+21339 21339 1.00000000000000e+00
+21340 21340 1.00000000000000e+00
+21341 21341 1.00000000000000e+00
+21342 21342 1.00000000000000e+00
+21343 21343 1.00000000000000e+00
+21344 21344 1.00000000000000e+00
+21345 21345 1.00000000000000e+00
+21346 21346 1.00000000000000e+00
+21347 21347 1.00000000000000e+00
+21348 21348 1.00000000000000e+00
+21349 21349 1.00000000000000e+00
+21350 21350 1.00000000000000e+00
+21351 21351 1.00000000000000e+00
+21352 21352 1.00000000000000e+00
+21353 21353 1.00000000000000e+00
+21354 21354 1.00000000000000e+00
+21355 21355 1.00000000000000e+00
+21356 21356 1.00000000000000e+00
+21357 21357 1.00000000000000e+00
+21358 21358 1.00000000000000e+00
+21359 21359 1.00000000000000e+00
+21360 9237 -8.87003356679518e-05
+21360 9261 -1.27081830126302e-02
+21360 9285 -8.39152786425476e-03
+21360 9309 -2.73146508523387e-05
+21360 9837 -4.59803680636722e-02
+21360 9861 -7.34540317333704e-01
+21360 9885 -1.28251347224225e+00
+21360 9909 -2.23748796928781e-01
+21360 9933 -1.73381330431115e-03
+21360 10413 -4.28709318978553e-06
+21360 10437 -9.00313035298769e-01
+21360 10461 -6.90326339321363e+00
+21360 10485 -7.85669670876064e+00
+21360 10509 -1.16968533203045e+00
+21360 10533 -2.03872129237755e-02
+21360 11013 -1.54782487178357e-06
+21360 11037 -4.48334279241388e-01
+21360 11061 -7.40748823357025e+00
+21360 11085 -8.42168416152418e+00
+21360 11109 -9.28686431603799e-01
+21360 11133 -4.43604484561137e-03
+21360 11661 -9.11000637037613e-02
+21360 11685 -5.54951980889249e-01
+21360 11709 -1.24352589445779e-01
+21360 11733 -2.84816028581600e-08
+21360 21360 9.72287790042700e+00
+21360 20496 2.40943983470192e-02
+21360 20520 2.00511985679799e-01
+21360 20544 4.66602452223006e-01
+21360 20568 2.08016331128114e-01
+21360 20592 2.59704847090978e-02
+21360 20904 1.54387821770836e-01
+21360 20928 1.36581515747563e+00
+21360 20952 3.31201727714566e+00
+21360 20976 1.40655976561499e+00
+21360 21000 1.64573973805675e-01
+21360 21312 4.53459503715156e-01
+21360 21336 3.78477955217493e+00
+21360 21384 3.51355052713264e+00
+21360 21408 3.85652247454584e-01
+21360 21720 4.52658612056961e-01
+21360 21744 3.22216462969525e+00
+21360 21768 6.39329861863257e+00
+21360 21792 2.58960730429136e+00
+21360 21816 2.94519280705989e-01
+21361 21361 1.00000000000000e+00
+21362 21362 1.00000000000000e+00
+21363 21363 1.00000000000000e+00
+21364 21364 1.00000000000000e+00
+21365 21365 1.00000000000000e+00
+21366 21366 1.00000000000000e+00
+21367 21367 1.00000000000000e+00
+21368 21368 1.00000000000000e+00
+21369 21369 1.00000000000000e+00
+21370 21370 1.00000000000000e+00
+21371 21371 1.00000000000000e+00
+21372 21372 1.00000000000000e+00
+21373 21373 1.00000000000000e+00
+21374 21374 1.00000000000000e+00
+21375 21375 1.00000000000000e+00
+21376 21376 1.00000000000000e+00
+21377 21377 1.00000000000000e+00
+21378 21378 1.00000000000000e+00
+21379 21379 1.00000000000000e+00
+21380 21380 1.00000000000000e+00
+21381 21381 1.00000000000000e+00
+21382 21382 1.00000000000000e+00
+21383 21383 1.00000000000000e+00
+21384 9261 -5.95594804659731e-05
+21384 9285 -3.92140677873953e-04
+21384 9309 -5.82139999520688e-06
+21384 9837 -6.23034231000000e-12
+21384 9861 -5.10251812906424e-02
+21384 9885 -3.59609790199526e-01
+21384 9909 -2.52605295670657e-01
+21384 9933 -8.89962435477900e-03
+21384 9957 -6.97276547140000e-10
+21384 10437 -9.46517302950805e-03
+21384 10461 -1.14792032596771e+00
+21384 10485 -4.42373616499353e+00
+21384 10509 -3.15212942479756e+00
+21384 10533 -2.68460388411376e-01
+21384 10557 -7.12208246196838e-04
+21384 11037 -1.51031657139685e-02
+21384 11061 -2.26455304050115e+00
+21384 11085 -1.11982184290237e+01
+21384 11109 -5.85915587839840e+00
+21384 11133 -4.08296859121552e-01
+21384 11157 -3.77341038477304e-04
+21384 11661 -9.76740571613049e-02
+21384 11685 -2.21730298722647e+00
+21384 11709 -2.29622406868509e+00
+21384 11733 -1.16854240285129e-01
+21384 12285 -3.15062376914760e-07
+21384 12309 -2.18156224160933e-03
+21384 12333 -3.88025594488446e-04
+21384 21384 8.16173749686326e+00
+21384 20520 2.60335980729306e-02
+21384 20544 2.08016331128114e-01
+21384 20568 4.66158201239863e-01
+21384 20592 2.02269330121860e-01
+21384 20616 2.45968478213673e-02
+21384 20928 1.87065967598068e-01
+21384 20952 1.40655976561498e+00
+21384 20976 2.98850003984707e+00
+21384 21000 1.33129786065530e+00
+21384 21024 1.68250491358146e-01
+21384 21336 4.92735384328564e-01
+21384 21360 3.51355052713264e+00
+21384 21408 3.53687360286311e+00
+21384 21432 4.98566153261183e-01
+21384 21744 3.52882545366849e-01
+21384 21768 2.58960730429136e+00
+21384 21792 5.52408794703359e+00
+21384 21816 3.01366476430753e+00
+21384 21840 4.58896910370893e-01
+21385 21385 1.00000000000000e+00
+21386 21386 1.00000000000000e+00
+21387 21387 1.00000000000000e+00
+21388 21388 1.00000000000000e+00
+21389 21389 1.00000000000000e+00
+21390 21390 1.00000000000000e+00
+21391 21391 1.00000000000000e+00
+21392 21392 1.00000000000000e+00
+21393 21393 1.00000000000000e+00
+21394 21394 1.00000000000000e+00
+21395 21395 1.00000000000000e+00
+21396 21396 1.00000000000000e+00
+21397 21397 1.00000000000000e+00
+21398 21398 1.00000000000000e+00
+21399 21399 1.00000000000000e+00
+21400 21400 1.00000000000000e+00
+21401 21401 1.00000000000000e+00
+21402 21402 1.00000000000000e+00
+21403 21403 1.00000000000000e+00
+21404 21404 1.00000000000000e+00
+21405 21405 1.00000000000000e+00
+21406 21406 1.00000000000000e+00
+21407 21407 1.00000000000000e+00
+21408 9861 -2.38387544049828e-06
+21408 9885 -2.67245997549214e-02
+21408 9909 -7.02222855708155e-02
+21408 9933 -9.62297346308592e-03
+21408 9957 -3.40300235706000e-09
+21408 10461 -2.25678303861431e-02
+21408 10485 -8.00085278224114e-01
+21408 10509 -2.34143120142450e+00
+21408 10533 -9.36190402441622e-01
+21408 10557 -3.00750972078268e-02
+21408 10581 -1.82286164144400e-08
+21408 11061 -1.97918336106535e-01
+21408 11085 -5.46128485173979e+00
+21408 11109 -1.17788140657174e+01
+21408 11133 -2.99889266328815e+00
+21408 11157 -1.24457816678196e-01
+21408 11181 -2.68148023391800e-08
+21408 11661 -2.00238148159737e-02
+21408 11685 -2.79768642905928e+00
+21408 11709 -8.81234700362130e+00
+21408 11733 -1.99097178969356e+00
+21408 11757 -3.30507753107737e-02
+21408 12285 -1.50043593642075e-06
+21408 12309 -6.68357069655338e-02
+21408 12333 -8.67773264820860e-02
+21408 12357 -9.97392066839205e-05
+21408 21408 9.81721687035799e+00
+21408 20544 2.59704847090978e-02
+21408 20568 2.02269330121860e-01
+21408 20592 4.47226004500361e-01
+21408 20616 2.09211209883015e-01
+21408 20640 2.77059546493864e-02
+21408 20952 1.64573973805675e-01
+21408 20976 1.33129786065530e+00
+21408 21000 3.04811342980975e+00
+21408 21024 1.43912834252732e+00
+21408 21048 1.91531594273680e-01
+21408 21360 3.85652247454584e-01
+21408 21384 3.53687360286311e+00
+21408 21432 3.81228929594189e+00
+21408 21456 4.54506170724276e-01
+21408 21768 2.94519280705989e-01
+21408 21792 3.01366476430754e+00
+21408 21816 7.92551584905714e+00
+21408 21840 2.99017165115092e+00
+21408 21864 2.88646002416835e-01
+21409 21409 1.00000000000000e+00
+21410 21410 1.00000000000000e+00
+21411 21411 1.00000000000000e+00
+21412 21412 1.00000000000000e+00
+21413 21413 1.00000000000000e+00
+21414 21414 1.00000000000000e+00
+21415 21415 1.00000000000000e+00
+21416 21416 1.00000000000000e+00
+21417 21417 1.00000000000000e+00
+21418 21418 1.00000000000000e+00
+21419 21419 1.00000000000000e+00
+21420 21420 1.00000000000000e+00
+21421 21421 1.00000000000000e+00
+21422 21422 1.00000000000000e+00
+21423 21423 1.00000000000000e+00
+21424 21424 1.00000000000000e+00
+21425 21425 1.00000000000000e+00
+21426 21426 1.00000000000000e+00
+21427 21427 1.00000000000000e+00
+21428 21428 1.00000000000000e+00
+21429 21429 1.00000000000000e+00
+21430 21430 1.00000000000000e+00
+21431 21431 1.00000000000000e+00
+21432 9885 -2.56465629442638e-05
+21432 9909 -4.76276778342330e-03
+21432 9933 -2.05883233787835e-03
+21432 9957 -3.15286122116000e-09
+21432 10485 -3.21841845409035e-02
+21432 10509 -5.39531734989198e-01
+21432 10533 -8.76028072878844e-01
+21432 10557 -1.38745469119407e-01
+21432 10581 -6.16935639697773e-04
+21432 11061 -2.00170805911756e-05
+21432 11085 -8.34970990283484e-01
+21432 11109 -5.66644235563066e+00
+21432 11133 -6.68777816209343e+00
+21432 11157 -1.10467050991725e+00
+21432 11181 -1.94860308560985e-02
+21432 11661 -1.35540959531512e-05
+21432 11685 -6.70418245275547e-01
+21432 11709 -8.06189223988961e+00
+21432 11733 -9.03319033806789e+00
+21432 11757 -1.10367230428958e+00
+21432 11781 -6.78156064318154e-03
+21432 12285 -1.27580809196157e-06
+21432 12309 -3.07481855106406e-01
+21432 12333 -1.30109975792000e+00
+21432 12357 -2.52264035490338e-01
+21432 12381 -1.32403957025805e-06
+21432 21432 9.23470004433162e+00
+21432 20568 2.45968478213673e-02
+21432 20592 2.09211209883015e-01
+21432 20616 4.99146479364050e-01
+21432 20640 2.35841247207548e-01
+21432 20664 3.12543571525006e-02
+21432 20976 1.68250491358146e-01
+21432 21000 1.43912834252732e+00
+21432 21024 3.42083700730084e+00
+21432 21048 1.51845040734971e+00
+21432 21072 1.88081007563742e-01
+21432 21384 4.98566153261183e-01
+21432 21408 3.81228929594189e+00
+21432 21456 3.67416532082428e+00
+21432 21480 4.64035159481780e-01
+21432 21792 4.58896910370893e-01
+21432 21816 2.99017165115092e+00
+21432 21840 5.50134950102266e+00
+21432 21864 2.85105021759688e+00
+21432 21888 4.24116551982383e-01
+21433 21433 1.00000000000000e+00
+21434 21434 1.00000000000000e+00
+21435 21435 1.00000000000000e+00
+21436 21436 1.00000000000000e+00
+21437 21437 1.00000000000000e+00
+21438 21438 1.00000000000000e+00
+21439 21439 1.00000000000000e+00
+21440 21440 1.00000000000000e+00
+21441 21441 1.00000000000000e+00
+21442 21442 1.00000000000000e+00
+21443 21443 1.00000000000000e+00
+21444 21444 1.00000000000000e+00
+21445 21445 1.00000000000000e+00
+21446 21446 1.00000000000000e+00
+21447 21447 1.00000000000000e+00
+21448 21448 1.00000000000000e+00
+21449 21449 1.00000000000000e+00
+21450 21450 1.00000000000000e+00
+21451 21451 1.00000000000000e+00
+21452 21452 1.00000000000000e+00
+21453 21453 1.00000000000000e+00
+21454 21454 1.00000000000000e+00
+21455 21455 1.00000000000000e+00
+21456 9909 -5.59793347357133e-06
+21456 9933 -2.30368090416432e-05
+21456 9957 -6.13896168510000e-10
+21456 10509 -3.12514410067282e-02
+21456 10533 -2.34219438433417e-01
+21456 10557 -1.44954846645998e-01
+21456 10581 -2.80648045101112e-03
+21456 11085 -6.21525660309246e-03
+21456 11109 -8.37895207133347e-01
+21456 11133 -3.72278010225788e+00
+21456 11157 -2.84276194806433e+00
+21456 11181 -2.02228954966414e-01
+21456 11205 -4.01571096527292e-04
+21456 11685 -1.86238563130767e-02
+21456 11709 -2.68385561620031e+00
+21456 11733 -1.32830061635964e+01
+21456 11757 -5.66071931761937e+00
+21456 11781 -3.64114134599640e-01
+21456 11805 -3.67982902529346e-04
+21456 12285 -2.40186428761700e-07
+21456 12309 -3.49593855422128e-01
+21456 12333 -4.43068966198744e+00
+21456 12357 -2.45302092463163e+00
+21456 12381 -1.04039244321100e-01
+21456 12933 -5.02259234512167e-04
+21456 12957 -1.39520399675073e-02
+21456 12981 -1.19559189827232e-03
+21456 21456 9.25883673882573e+00
+21456 20592 2.77059546493864e-02
+21456 20616 2.35841247207548e-01
+21456 20640 5.51518488927802e-01
+21456 20664 2.19988707963628e-01
+21456 20688 2.37428198384065e-02
+21456 21000 1.91531594273680e-01
+21456 21024 1.51845040734970e+00
+21456 21048 3.35768784025785e+00
+21456 21072 1.37976453011191e+00
+21456 21096 1.56860124964233e-01
+21456 21408 4.54506170724276e-01
+21456 21432 3.67416532082428e+00
+21456 21480 3.37521270349837e+00
+21456 21504 3.79768016392801e-01
+21456 21816 2.88646002416835e-01
+21456 21840 2.85105021759687e+00
+21456 21864 7.35333930796951e+00
+21456 21888 2.81178010326768e+00
+21456 21912 2.78828473834536e-01
+21457 21457 1.00000000000000e+00
+21458 21458 1.00000000000000e+00
+21459 21459 1.00000000000000e+00
+21460 21460 1.00000000000000e+00
+21461 21461 1.00000000000000e+00
+21462 21462 1.00000000000000e+00
+21463 21463 1.00000000000000e+00
+21464 21464 1.00000000000000e+00
+21465 21465 1.00000000000000e+00
+21466 21466 1.00000000000000e+00
+21467 21467 1.00000000000000e+00
+21468 21468 1.00000000000000e+00
+21469 21469 1.00000000000000e+00
+21470 21470 1.00000000000000e+00
+21471 21471 1.00000000000000e+00
+21472 21472 1.00000000000000e+00
+21473 21473 1.00000000000000e+00
+21474 21474 1.00000000000000e+00
+21475 21475 1.00000000000000e+00
+21476 21476 1.00000000000000e+00
+21477 21477 1.00000000000000e+00
+21478 21478 1.00000000000000e+00
+21479 21479 1.00000000000000e+00
+21480 10509 -1.26266347100440e-07
+21480 10533 -1.65362016833945e-02
+21480 10557 -3.39913024247160e-02
+21480 10581 -1.97299421219411e-03
+21480 11109 -1.53507695888783e-02
+21480 11133 -6.38508544939168e-01
+21480 11157 -1.79211733908782e+00
+21480 11181 -9.48787970187869e-01
+21480 11205 -1.88624550732948e-02
+21480 11709 -2.98294215297041e-01
+21480 11733 -4.72007968522777e+00
+21480 11757 -1.13396010740800e+01
+21480 11781 -5.11981516898445e+00
+21480 11805 -2.32563123210195e-02
+21480 12309 -7.30006766659733e-02
+21480 12333 -3.05351420152970e+00
+21480 12357 -1.07635608328286e+01
+21480 12381 -2.63427490152779e+00
+21480 12933 -2.70507787134015e-03
+21480 12957 -1.61524079405973e-01
+21480 12981 -2.76749461282615e-02
+21480 21480 1.02261200668360e+01
+21480 20616 3.12543571525006e-02
+21480 20640 2.19988707963628e-01
+21480 20664 5.62807553267019e-01
+21480 20688 3.98307436753654e-01
+21480 21024 1.88081007563742e-01
+21480 21048 1.37976453011192e+00
+21480 21072 3.89559657381350e+00
+21480 21096 3.02294763350087e+00
+21480 21432 4.64035159481780e-01
+21480 21456 3.37521270349837e+00
+21480 21504 6.89066535570968e+00
+21480 21840 4.24116551982383e-01
+21480 21864 2.81178010326768e+00
+21480 21888 5.81606050192004e+00
+21480 21912 2.97669063250826e+00
+21481 21481 1.00000000000000e+00
+21482 21482 1.00000000000000e+00
+21483 21483 1.00000000000000e+00
+21484 21484 1.00000000000000e+00
+21485 21485 1.00000000000000e+00
+21486 21486 1.00000000000000e+00
+21487 21487 1.00000000000000e+00
+21488 21488 1.00000000000000e+00
+21489 21489 1.00000000000000e+00
+21490 21490 1.00000000000000e+00
+21491 21491 1.00000000000000e+00
+21492 21492 1.00000000000000e+00
+21493 21493 1.00000000000000e+00
+21494 21494 1.00000000000000e+00
+21495 21495 1.00000000000000e+00
+21496 21496 1.00000000000000e+00
+21497 21497 1.00000000000000e+00
+21498 21498 1.00000000000000e+00
+21499 21499 1.00000000000000e+00
+21500 21500 1.00000000000000e+00
+21501 21501 1.00000000000000e+00
+21502 21502 1.00000000000000e+00
+21503 21503 1.00000000000000e+00
+21504 10533 -4.99658735013291e-06
+21504 10557 -1.21583139608431e-03
+21504 10581 -3.39183723660238e-04
+21504 11133 -1.75666651323277e-02
+21504 11157 -4.70523537717542e-01
+21504 11181 -9.88607456833578e-01
+21504 11205 -3.49139124708985e-02
+21504 11709 -2.91886673369895e-05
+21504 11733 -4.98997919341157e-01
+21504 11757 -8.54372163120845e+00
+21504 11781 -7.86715197249411e+00
+21504 11805 -4.39367443243335e-02
+21504 12309 -3.45539493907805e-05
+21504 12333 -6.43859071509918e-01
+21504 12357 -1.09051654129362e+01
+21504 12381 -4.54030951783670e+00
+21504 12933 -1.89434110109513e-03
+21504 12957 -2.25383879039395e-01
+21504 12981 -4.69807489686166e-02
+21504 21504 1.21229545966697e+01
+21504 20640 2.37428198384065e-02
+21504 20664 3.98307436753654e-01
+21504 20688 6.30415134638462e-01
+21504 21048 1.56860124964233e-01
+21504 21072 3.02294763350087e+00
+21504 21096 4.94787439225209e+00
+21504 21456 3.79768016392801e-01
+21504 21480 6.89066535570968e+00
+21504 21864 2.78828473834536e-01
+21504 21888 2.97669063250825e+00
+21504 21912 4.00158194817475e+00
+21505 21505 1.00000000000000e+00
+21506 21506 1.00000000000000e+00
+21507 21507 1.00000000000000e+00
+21508 21508 1.00000000000000e+00
+21509 21509 1.00000000000000e+00
+21510 21510 1.00000000000000e+00
+21511 21511 1.00000000000000e+00
+21512 21512 1.00000000000000e+00
+21513 21513 1.00000000000000e+00
+21514 21514 1.00000000000000e+00
+21515 21515 1.00000000000000e+00
+21516 21516 1.00000000000000e+00
+21517 21517 1.00000000000000e+00
+21518 21518 1.00000000000000e+00
+21519 21519 1.00000000000000e+00
+21520 21520 1.00000000000000e+00
+21521 21521 1.00000000000000e+00
+21522 21522 1.00000000000000e+00
+21523 21523 1.00000000000000e+00
+21524 21524 1.00000000000000e+00
+21525 21525 1.00000000000000e+00
+21526 21526 1.00000000000000e+00
+21527 21527 1.00000000000000e+00
+21528 7317 -6.75149496405286e-05
+21528 7341 -5.68909072862892e-05
+21528 7893 -3.44015283048548e-03
+21528 7917 -9.93950143461296e-01
+21528 7941 -5.40869660850665e-01
+21528 7965 -2.63702574884965e-03
+21528 8493 -3.31168804452563e-01
+21528 8517 -8.01986008310673e+00
+21528 8541 -2.77159021881339e+00
+21528 8565 -2.04644255858369e-02
+21528 9093 -6.22474803362327e-02
+21528 9117 -1.86912480621186e+00
+21528 9141 -1.27202318270223e+00
+21528 9165 -7.07189490284724e-03
+21528 21528 4.75728965237751e+00
+21528 20712 4.49351467850448e-01
+21528 20736 2.78828473834499e-01
+21528 20760 1.54722114026500e-02
+21528 21120 3.45137496366532e+00
+21528 21144 2.97669063250816e+00
+21528 21168 3.57429471621569e-01
+21528 21552 4.00158194817481e+00
+21528 21576 6.06553463424587e-01
+21529 21529 1.00000000000000e+00
+21530 21530 1.00000000000000e+00
+21531 21531 1.00000000000000e+00
+21532 21532 1.00000000000000e+00
+21533 21533 1.00000000000000e+00
+21534 21534 1.00000000000000e+00
+21535 21535 1.00000000000000e+00
+21536 21536 1.00000000000000e+00
+21537 21537 1.00000000000000e+00
+21538 21538 1.00000000000000e+00
+21539 21539 1.00000000000000e+00
+21540 21540 1.00000000000000e+00
+21541 21541 1.00000000000000e+00
+21542 21542 1.00000000000000e+00
+21543 21543 1.00000000000000e+00
+21544 21544 1.00000000000000e+00
+21545 21545 1.00000000000000e+00
+21546 21546 1.00000000000000e+00
+21547 21547 1.00000000000000e+00
+21548 21548 1.00000000000000e+00
+21549 21549 1.00000000000000e+00
+21550 21550 1.00000000000000e+00
+21551 21551 1.00000000000000e+00
+21552 7317 -3.45539493907758e-05
+21552 7341 -2.91886673369855e-05
+21552 7893 -1.89434110109506e-03
+21552 7917 -6.43859071509853e-01
+21552 7941 -4.98997919341096e-01
+21552 7965 -1.75666651323252e-02
+21552 7989 -4.99658735013202e-06
+21552 8493 -2.25383879039395e-01
+21552 8517 -1.09051654129363e+01
+21552 8541 -8.54372163120864e+00
+21552 8565 -4.70523537717527e-01
+21552 8589 -1.21583139608409e-03
+21552 9093 -4.69807489686170e-02
+21552 9117 -4.54030951783689e+00
+21552 9141 -7.86715197249476e+00
+21552 9165 -9.88607456833696e-01
+21552 9189 -3.39183723660178e-04
+21552 9741 -4.39367443243407e-02
+21552 9765 -3.49139124709041e-02
+21552 21552 1.21229545966702e+01
+21552 20712 2.78828473834499e-01
+21552 20736 3.79768016392752e-01
+21552 20760 1.56860124964209e-01
+21552 20784 2.37428198384023e-02
+21552 21120 2.97669063250815e+00
+21552 21144 6.89066535570974e+00
+21552 21168 3.02294763350103e+00
+21552 21192 3.98307436753687e-01
+21552 21528 4.00158194817481e+00
+21552 21576 4.94787439225258e+00
+21552 21600 6.30415134638558e-01
+21553 21553 1.00000000000000e+00
+21554 21554 1.00000000000000e+00
+21555 21555 1.00000000000000e+00
+21556 21556 1.00000000000000e+00
+21557 21557 1.00000000000000e+00
+21558 21558 1.00000000000000e+00
+21559 21559 1.00000000000000e+00
+21560 21560 1.00000000000000e+00
+21561 21561 1.00000000000000e+00
+21562 21562 1.00000000000000e+00
+21563 21563 1.00000000000000e+00
+21564 21564 1.00000000000000e+00
+21565 21565 1.00000000000000e+00
+21566 21566 1.00000000000000e+00
+21567 21567 1.00000000000000e+00
+21568 21568 1.00000000000000e+00
+21569 21569 1.00000000000000e+00
+21570 21570 1.00000000000000e+00
+21571 21571 1.00000000000000e+00
+21572 21572 1.00000000000000e+00
+21573 21573 1.00000000000000e+00
+21574 21574 1.00000000000000e+00
+21575 21575 1.00000000000000e+00
+21576 7317 -2.27564163003280e-07
+21576 7341 -2.12346769668840e-07
+21576 7893 -4.97899102435199e-05
+21576 7917 -4.22648233034785e-02
+21576 7941 -1.11494712416162e-01
+21576 7965 -3.10803560498739e-02
+21576 7989 -2.42166638779728e-05
+21576 8493 -1.70855648037467e-02
+21576 8517 -2.47118942806330e+00
+21576 8541 -7.14013593441141e+00
+21576 8565 -1.79324213756291e+00
+21576 8589 -3.17314047065673e-02
+21576 8613 -1.54286544133720e-07
+21576 9093 -4.53057394300020e-03
+21576 9117 -1.81449700885241e+00
+21576 9141 -1.47080981867763e+01
+21576 9165 -6.32291240333007e+00
+21576 9189 -1.65636733875931e-01
+21576 9213 -1.33099563758210e-07
+21576 9741 -2.89759613634646e-01
+21576 9765 -7.35786296464277e-01
+21576 9789 -4.88682978709450e-02
+21576 21576 1.21577171568331e+01
+21576 20712 1.54722114026500e-02
+21576 20736 1.56860124964209e-01
+21576 20760 4.10608961742374e-01
+21576 20784 1.55977811054758e-01
+21576 20808 1.52516329252872e-02
+21576 21120 3.57429471621569e-01
+21576 21144 3.02294763350103e+00
+21576 21168 7.01598994451490e+00
+21576 21192 2.73579568635196e+00
+21576 21216 2.85641484834303e-01
+21576 21528 6.06553463424587e-01
+21576 21552 4.94787439225258e+00
+21576 21600 4.37974669532061e+00
+21576 21624 4.64521539191595e-01
+21577 21577 1.00000000000000e+00
+21578 21578 1.00000000000000e+00
+21579 21579 1.00000000000000e+00
+21580 21580 1.00000000000000e+00
+21581 21581 1.00000000000000e+00
+21582 21582 1.00000000000000e+00
+21583 21583 1.00000000000000e+00
+21584 21584 1.00000000000000e+00
+21585 21585 1.00000000000000e+00
+21586 21586 1.00000000000000e+00
+21587 21587 1.00000000000000e+00
+21588 21588 1.00000000000000e+00
+21589 21589 1.00000000000000e+00
+21590 21590 1.00000000000000e+00
+21591 21591 1.00000000000000e+00
+21592 21592 1.00000000000000e+00
+21593 21593 1.00000000000000e+00
+21594 21594 1.00000000000000e+00
+21595 21595 1.00000000000000e+00
+21596 21596 1.00000000000000e+00
+21597 21597 1.00000000000000e+00
+21598 21598 1.00000000000000e+00
+21599 21599 1.00000000000000e+00
+21600 7917 -8.02216756130946e-05
+21600 7941 -1.25654930568489e-02
+21600 7965 -8.02848167035946e-03
+21600 7989 -2.19178452599109e-05
+21600 8517 -1.34917509756813e-01
+21600 8541 -1.63815643084327e+00
+21600 8565 -1.28138291463894e+00
+21600 8589 -1.43634132019868e-01
+21600 8613 -1.22365447471562e-03
+21600 9117 -2.11153262788652e-01
+21600 9141 -6.70591694751842e+00
+21600 9165 -1.31344205713102e+01
+21600 9189 -2.36081159036061e+00
+21600 9213 -1.84717084370415e-02
+21600 9741 -5.14197856185756e-01
+21600 9765 -4.44043579606702e+00
+21600 9789 -2.28074346771659e+00
+21600 9813 -9.96711146675259e-03
+21600 10365 -1.67620106534640e-04
+21600 10389 -1.60490305820058e-03
+21600 10413 -3.45778598212090e-07
+21600 21600 9.92442391352002e+00
+21600 20736 2.37428198384023e-02
+21600 20760 1.55977811054758e-01
+21600 20784 2.84738593169655e-01
+21600 20808 1.28885117807778e-01
+21600 20832 1.69696465266574e-02
+21600 21144 3.98307436753687e-01
+21600 21168 2.73579568635197e+00
+21600 21192 5.45879703285382e+00
+21600 21216 3.10346929434230e+00
+21600 21240 4.90225838751271e-01
+21600 21552 6.30415134638558e-01
+21600 21576 4.37974669532061e+00
+21600 21624 5.30474276403014e+00
+21600 21648 8.61664151815941e-01
+21601 21601 1.00000000000000e+00
+21602 21602 1.00000000000000e+00
+21603 21603 1.00000000000000e+00
+21604 21604 1.00000000000000e+00
+21605 21605 1.00000000000000e+00
+21606 21606 1.00000000000000e+00
+21607 21607 1.00000000000000e+00
+21608 21608 1.00000000000000e+00
+21609 21609 1.00000000000000e+00
+21610 21610 1.00000000000000e+00
+21611 21611 1.00000000000000e+00
+21612 21612 1.00000000000000e+00
+21613 21613 1.00000000000000e+00
+21614 21614 1.00000000000000e+00
+21615 21615 1.00000000000000e+00
+21616 21616 1.00000000000000e+00
+21617 21617 1.00000000000000e+00
+21618 21618 1.00000000000000e+00
+21619 21619 1.00000000000000e+00
+21620 21620 1.00000000000000e+00
+21621 21621 1.00000000000000e+00
+21622 21622 1.00000000000000e+00
+21623 21623 1.00000000000000e+00
+21624 7941 -3.47011381079179e-05
+21624 7965 -2.44065315422982e-04
+21624 7989 -4.23031447744472e-06
+21624 8541 -7.14390121570574e-02
+21624 8565 -3.00034719279317e-01
+21624 8589 -1.70767136446979e-01
+21624 8613 -6.67400920711631e-03
+21624 8637 -1.98860187077000e-09
+21624 9141 -9.84383496535981e-01
+21624 9165 -1.16470936735668e+01
+21624 9189 -7.62575536054923e+00
+21624 9213 -2.77611194666461e-01
+21624 9237 -6.75108151057770e-04
+21624 9741 -1.70854902386419e-01
+21624 9765 -8.88650814138471e+00
+21624 9789 -1.09254701506266e+01
+21624 9813 -7.26009893525002e-01
+21624 9837 -3.57181806112203e-04
+21624 10365 -1.19673275115658e-03
+21624 10389 -1.32155033546540e-01
+21624 10413 -6.40768823076009e-02
+21624 21624 1.56934120813326e+01
+21624 20760 1.52516329252872e-02
+21624 20784 1.28885117807778e-01
+21624 20808 3.07723361719110e-01
+21624 20832 1.51708123575846e-01
+21624 20856 2.09573843673041e-02
+21624 21168 2.85641484834303e-01
+21624 21192 3.10346929434230e+00
+21624 21216 8.42373780668319e+00
+21624 21240 3.13883496231919e+00
+21624 21264 2.94482901828523e-01
+21624 21576 4.64521539191595e-01
+21624 21600 5.30474276403014e+00
+21624 21648 5.21571305960751e+00
+21624 21672 4.42264113085918e-01
+21625 21625 1.00000000000000e+00
+21626 21626 1.00000000000000e+00
+21627 21627 1.00000000000000e+00
+21628 21628 1.00000000000000e+00
+21629 21629 1.00000000000000e+00
+21630 21630 1.00000000000000e+00
+21631 21631 1.00000000000000e+00
+21632 21632 1.00000000000000e+00
+21633 21633 1.00000000000000e+00
+21634 21634 1.00000000000000e+00
+21635 21635 1.00000000000000e+00
+21636 21636 1.00000000000000e+00
+21637 21637 1.00000000000000e+00
+21638 21638 1.00000000000000e+00
+21639 21639 1.00000000000000e+00
+21640 21640 1.00000000000000e+00
+21641 21641 1.00000000000000e+00
+21642 21642 1.00000000000000e+00
+21643 21643 1.00000000000000e+00
+21644 21644 1.00000000000000e+00
+21645 21645 1.00000000000000e+00
+21646 21646 1.00000000000000e+00
+21647 21647 1.00000000000000e+00
+21648 8541 -7.22506791617730e-06
+21648 8565 -2.05692093069996e-02
+21648 8589 -5.14093378669872e-02
+21648 8613 -8.36244219545040e-03
+21648 8637 -8.94809260414000e-09
+21648 9141 -2.65905112531993e-02
+21648 9165 -2.55228025707658e+00
+21648 9189 -4.33414068707059e+00
+21648 9213 -9.47053835614475e-01
+21648 9237 -1.67149292436570e-02
+21648 9261 -1.92421531558400e-08
+21648 9741 -1.42105665122840e-02
+21648 9765 -2.84652083002161e+00
+21648 9789 -1.34003793834157e+01
+21648 9813 -5.61186521115565e+00
+21648 9837 -1.56683939199441e-01
+21648 9861 -2.82679919691200e-08
+21648 10365 -2.27267444385346e-03
+21648 10389 -8.37008468300407e-01
+21648 10413 -1.54591739054227e+00
+21648 10437 -8.48984408304527e-02
+21648 21648 9.57031379276926e+00
+21648 20784 1.69696465266574e-02
+21648 20808 1.51708123575846e-01
+21648 20832 3.65880666997866e-01
+21648 20856 1.38201019846589e-01
+21648 20880 1.35928705943431e-02
+21648 21192 4.90225838751271e-01
+21648 21216 3.13883496231922e+00
+21648 21240 5.56573923087704e+00
+21648 21264 2.63307945879099e+00
+21648 21288 3.63786962869213e-01
+21648 21600 8.61664151815941e-01
+21648 21624 5.21571305960751e+00
+21648 21672 4.29875177865584e+00
+21648 21696 6.32423831578024e-01
+21649 21649 1.00000000000000e+00
+21650 21650 1.00000000000000e+00
+21651 21651 1.00000000000000e+00
+21652 21652 1.00000000000000e+00
+21653 21653 1.00000000000000e+00
+21654 21654 1.00000000000000e+00
+21655 21655 1.00000000000000e+00
+21656 21656 1.00000000000000e+00
+21657 21657 1.00000000000000e+00
+21658 21658 1.00000000000000e+00
+21659 21659 1.00000000000000e+00
+21660 21660 1.00000000000000e+00
+21661 21661 1.00000000000000e+00
+21662 21662 1.00000000000000e+00
+21663 21663 1.00000000000000e+00
+21664 21664 1.00000000000000e+00
+21665 21665 1.00000000000000e+00
+21666 21666 1.00000000000000e+00
+21667 21667 1.00000000000000e+00
+21668 21668 1.00000000000000e+00
+21669 21669 1.00000000000000e+00
+21670 21670 1.00000000000000e+00
+21671 21671 1.00000000000000e+00
+21672 8565 -1.96369108521824e-05
+21672 8589 -4.12660314887453e-03
+21672 8613 -1.83203537140742e-03
+21672 8637 -5.96334235505000e-09
+21672 9165 -6.91058902851681e-02
+21672 9189 -8.02167487971877e-01
+21672 9213 -6.68819689456887e-01
+21672 9237 -7.54624655077917e-02
+21672 9261 -4.24068021415266e-04
+21672 9765 -2.06381545340390e-01
+21672 9789 -7.25120728299913e+00
+21672 9813 -1.36812044076590e+01
+21672 9837 -1.71003083767370e+00
+21672 9861 -1.46458338405462e-02
+21672 10365 -5.26432474004665e-04
+21672 10389 -1.47814744601904e+00
+21672 10413 -7.60221651864072e+00
+21672 10437 -2.49861912557894e+00
+21672 10461 -9.58767802584526e-03
+21672 11013 -5.76787102641979e-03
+21672 11037 -2.26063108285779e-02
+21672 11061 -8.84884528789634e-06
+21672 21672 1.23161012279493e+01
+21672 20808 2.09573843673041e-02
+21672 20832 1.38201019846589e-01
+21672 20856 2.57920772334751e-01
+21672 20880 1.32281316209201e-01
+21672 20904 1.94774584579572e-02
+21672 21216 2.94482901828523e-01
+21672 21240 2.63307945879095e+00
+21672 21264 6.56077331714630e+00
+21672 21288 3.23794388911829e+00
+21672 21312 4.45699009410358e-01
+21672 21624 4.42264113085918e-01
+21672 21648 4.29875177865584e+00
+21672 21696 5.54991856477216e+00
+21672 21720 7.55055809615015e-01
+21673 21673 1.00000000000000e+00
+21674 21674 1.00000000000000e+00
+21675 21675 1.00000000000000e+00
+21676 21676 1.00000000000000e+00
+21677 21677 1.00000000000000e+00
+21678 21678 1.00000000000000e+00
+21679 21679 1.00000000000000e+00
+21680 21680 1.00000000000000e+00
+21681 21681 1.00000000000000e+00
+21682 21682 1.00000000000000e+00
+21683 21683 1.00000000000000e+00
+21684 21684 1.00000000000000e+00
+21685 21685 1.00000000000000e+00
+21686 21686 1.00000000000000e+00
+21687 21687 1.00000000000000e+00
+21688 21688 1.00000000000000e+00
+21689 21689 1.00000000000000e+00
+21690 21690 1.00000000000000e+00
+21691 21691 1.00000000000000e+00
+21692 21692 1.00000000000000e+00
+21693 21693 1.00000000000000e+00
+21694 21694 1.00000000000000e+00
+21695 21695 1.00000000000000e+00
+21696 8589 -2.87059089138052e-06
+21696 8613 -1.25824412478920e-05
+21696 8637 -9.93685121070000e-10
+21696 9189 -3.85260548717765e-02
+21696 9213 -1.55218139672086e-01
+21696 9237 -8.98711480908170e-02
+21696 9261 -1.97210171975279e-03
+21696 9765 -3.09907564292870e-07
+21696 9789 -1.26735440242570e+00
+21696 9813 -9.15748002497590e+00
+21696 9837 -4.85138247369471e+00
+21696 9861 -1.68324535039274e-01
+21696 9885 -3.37059951672555e-04
+21696 10365 -4.50372466621900e-08
+21696 10389 -4.22719899012753e-01
+21696 10413 -1.10499459964702e+01
+21696 10437 -1.11286651487525e+01
+21696 10461 -6.14318709256905e-01
+21696 10485 -3.08469849872088e-04
+21696 11013 -3.06995764510268e-02
+21696 11037 -3.91858603018202e-01
+21696 11061 -1.09415256228253e-01
+21696 21696 1.41192821628463e+01
+21696 20832 1.35928705943431e-02
+21696 20856 1.32281316209201e-01
+21696 20880 3.43022145245696e-01
+21696 20904 1.49069591127983e-01
+21696 20928 1.77899393240386e-02
+21696 21240 3.63786962869213e-01
+21696 21264 3.23794388911829e+00
+21696 21288 7.76021858978311e+00
+21696 21312 2.84378594303404e+00
+21696 21336 2.65247476348150e-01
+21696 21648 6.32423831578024e-01
+21696 21672 5.54991856477216e+00
+21696 21720 4.64408474817218e+00
+21696 21744 4.05965377428030e-01
+21697 21697 1.00000000000000e+00
+21698 21698 1.00000000000000e+00
+21699 21699 1.00000000000000e+00
+21700 21700 1.00000000000000e+00
+21701 21701 1.00000000000000e+00
+21702 21702 1.00000000000000e+00
+21703 21703 1.00000000000000e+00
+21704 21704 1.00000000000000e+00
+21705 21705 1.00000000000000e+00
+21706 21706 1.00000000000000e+00
+21707 21707 1.00000000000000e+00
+21708 21708 1.00000000000000e+00
+21709 21709 1.00000000000000e+00
+21710 21710 1.00000000000000e+00
+21711 21711 1.00000000000000e+00
+21712 21712 1.00000000000000e+00
+21713 21713 1.00000000000000e+00
+21714 21714 1.00000000000000e+00
+21715 21715 1.00000000000000e+00
+21716 21716 1.00000000000000e+00
+21717 21717 1.00000000000000e+00
+21718 21718 1.00000000000000e+00
+21719 21719 1.00000000000000e+00
+21720 9189 -1.63349069221820e-07
+21720 9213 -1.03974540170888e-02
+21720 9237 -2.24860482368028e-02
+21720 9261 -1.52847645058494e-03
+21720 9789 -2.35820716352034e-02
+21720 9813 -1.71458500707124e+00
+21720 9837 -2.47152522189269e+00
+21720 9861 -5.13545222136799e-01
+21720 9885 -9.34229118965601e-03
+21720 9909 -1.07073187650000e-09
+21720 10389 -2.25645047563803e-02
+21720 10413 -3.34611990479093e+00
+21720 10437 -1.31480554177430e+01
+21720 10461 -5.21913909453384e+00
+21720 10485 -1.37927352900208e-01
+21720 10509 -2.84904636177000e-09
+21720 11013 -3.62833187129939e-02
+21720 11037 -1.95058358179340e+00
+21720 11061 -2.73110193042546e+00
+21720 11085 -1.24451148894911e-01
+21720 11661 -4.04614909029319e-06
+21720 11685 -1.40028719608415e-06
+21720 21720 9.05430117290759e+00
+21720 20856 1.94774584579572e-02
+21720 20880 1.49069591127983e-01
+21720 20904 3.18619044738265e-01
+21720 20928 1.29169985678914e-01
+21720 20952 1.45025570956898e-02
+21720 21264 4.45699009410358e-01
+21720 21288 2.84378594303404e+00
+21720 21312 5.14231724303775e+00
+21720 21336 2.87162435362045e+00
+21720 21360 4.52658612056961e-01
+21720 21672 7.55055809615015e-01
+21720 21696 4.64408474817218e+00
+21720 21744 4.83905880748849e+00
+21720 21768 8.03799324444094e-01
+21721 21721 1.00000000000000e+00
+21722 21722 1.00000000000000e+00
+21723 21723 1.00000000000000e+00
+21724 21724 1.00000000000000e+00
+21725 21725 1.00000000000000e+00
+21726 21726 1.00000000000000e+00
+21727 21727 1.00000000000000e+00
+21728 21728 1.00000000000000e+00
+21729 21729 1.00000000000000e+00
+21730 21730 1.00000000000000e+00
+21731 21731 1.00000000000000e+00
+21732 21732 1.00000000000000e+00
+21733 21733 1.00000000000000e+00
+21734 21734 1.00000000000000e+00
+21735 21735 1.00000000000000e+00
+21736 21736 1.00000000000000e+00
+21737 21737 1.00000000000000e+00
+21738 21738 1.00000000000000e+00
+21739 21739 1.00000000000000e+00
+21740 21740 1.00000000000000e+00
+21741 21741 1.00000000000000e+00
+21742 21742 1.00000000000000e+00
+21743 21743 1.00000000000000e+00
+21744 9213 -3.26042166295247e-06
+21744 9237 -9.39185922044208e-04
+21744 9261 -2.76167595293299e-04
+21744 9813 -3.72128208243914e-02
+21744 9837 -4.08749207963319e-01
+21744 9861 -3.54401329386676e-01
+21744 9885 -4.00258339285672e-02
+21744 9909 -7.22152185415601e-05
+21744 10413 -2.41641731088438e-01
+21744 10437 -7.85719513899028e+00
+21744 10461 -1.30472690748128e+01
+21744 10485 -1.14051294456307e+00
+21744 10509 -1.05376172650655e-02
+21744 11013 -7.64040556608129e-03
+21744 11037 -3.21770864406448e+00
+21744 11061 -1.14939187741039e+01
+21744 11085 -2.26850405724528e+00
+21744 11109 -8.66206699074882e-03
+21744 11661 -3.37372744046870e-02
+21744 11685 -7.35208925300235e-02
+21744 11709 -4.16008843137206e-05
+21744 21744 1.48273894024811e+01
+21744 20880 1.77899393240386e-02
+21744 20904 1.29169985678914e-01
+21744 20928 2.70563746681661e-01
+21744 20952 1.40941803689104e-01
+21744 20976 2.07328938265863e-02
+21744 21288 2.65247476348150e-01
+21744 21312 2.87162435362045e+00
+21744 21336 7.86066781462640e+00
+21744 21360 3.22216462969525e+00
+21744 21384 3.52882545366849e-01
+21744 21696 4.05965377428030e-01
+21744 21720 4.83905880748849e+00
+21744 21768 5.45773663356675e+00
+21744 21792 5.60634833947594e-01
+21745 21745 1.00000000000000e+00
+21746 21746 1.00000000000000e+00
+21747 21747 1.00000000000000e+00
+21748 21748 1.00000000000000e+00
+21749 21749 1.00000000000000e+00
+21750 21750 1.00000000000000e+00
+21751 21751 1.00000000000000e+00
+21752 21752 1.00000000000000e+00
+21753 21753 1.00000000000000e+00
+21754 21754 1.00000000000000e+00
+21755 21755 1.00000000000000e+00
+21756 21756 1.00000000000000e+00
+21757 21757 1.00000000000000e+00
+21758 21758 1.00000000000000e+00
+21759 21759 1.00000000000000e+00
+21760 21760 1.00000000000000e+00
+21761 21761 1.00000000000000e+00
+21762 21762 1.00000000000000e+00
+21763 21763 1.00000000000000e+00
+21764 21764 1.00000000000000e+00
+21765 21765 1.00000000000000e+00
+21766 21766 1.00000000000000e+00
+21767 21767 1.00000000000000e+00
+21768 9237 -4.41669362790000e-09
+21768 9261 -1.23322260600600e-08
+21768 9837 -1.68082945346777e-02
+21768 9861 -7.96440172054113e-02
+21768 9885 -3.89639863280268e-02
+21768 9909 -3.09682943183136e-04
+21768 10413 -8.52313646765131e-06
+21768 10437 -1.42258422170923e+00
+21768 10461 -6.32062101669744e+00
+21768 10485 -2.69515405120284e+00
+21768 10509 -9.96338200064895e-02
+21768 10533 -1.55188264107733e-04
+21768 11013 -3.07830518340561e-06
+21768 11037 -8.31443655203383e-01
+21768 11061 -1.14588221436160e+01
+21768 11085 -9.88947253249705e+00
+21768 11109 -5.86323053563036e-01
+21768 11133 -2.42406379375072e-04
+21768 11661 -1.72731756794428e-01
+21768 11685 -9.91396379203825e-01
+21768 11709 -1.98570423981034e-01
+21768 11733 -6.63024342517000e-09
+21768 21768 1.12567841678213e+01
+21768 20904 1.45025570956898e-02
+21768 20928 1.40941803689104e-01
+21768 20952 3.61401867063392e-01
+21768 20976 1.43623610275629e-01
+21768 21000 1.51730087423208e-02
+21768 21312 4.52658612056961e-01
+21768 21336 3.22216462969525e+00
+21768 21360 6.39329861863257e+00
+21768 21384 2.58960730429136e+00
+21768 21408 2.94519280705989e-01
+21768 21720 8.03799324444094e-01
+21768 21744 5.45773663356675e+00
+21768 21792 4.17384933665331e+00
+21768 21816 4.82827500215733e-01
+21769 21769 1.00000000000000e+00
+21770 21770 1.00000000000000e+00
+21771 21771 1.00000000000000e+00
+21772 21772 1.00000000000000e+00
+21773 21773 1.00000000000000e+00
+21774 21774 1.00000000000000e+00
+21775 21775 1.00000000000000e+00
+21776 21776 1.00000000000000e+00
+21777 21777 1.00000000000000e+00
+21778 21778 1.00000000000000e+00
+21779 21779 1.00000000000000e+00
+21780 21780 1.00000000000000e+00
+21781 21781 1.00000000000000e+00
+21782 21782 1.00000000000000e+00
+21783 21783 1.00000000000000e+00
+21784 21784 1.00000000000000e+00
+21785 21785 1.00000000000000e+00
+21786 21786 1.00000000000000e+00
+21787 21787 1.00000000000000e+00
+21788 21788 1.00000000000000e+00
+21789 21789 1.00000000000000e+00
+21790 21790 1.00000000000000e+00
+21791 21791 1.00000000000000e+00
+21792 9837 -1.64223745000000e-12
+21792 9861 -4.92885197545318e-03
+21792 9885 -8.19121310477222e-03
+21792 9909 -1.55563455594226e-04
+21792 10437 -1.60538004493410e-02
+21792 10461 -9.31015863958428e-01
+21792 10485 -1.33921351264531e+00
+21792 10509 -2.75221263027292e-01
+21792 10533 -4.98947752019862e-03
+21792 10557 -2.67275633000000e-12
+21792 11037 -2.72999557635293e-02
+21792 11061 -3.50736818545146e+00
+21792 11085 -1.36483898526973e+01
+21792 11109 -4.42153745514200e+00
+21792 11133 -1.03422884076192e-01
+21792 11157 -1.62243194400000e-11
+21792 11661 -1.85121313218606e-01
+21792 11685 -3.93265630313768e+00
+21792 11709 -3.71267255159031e+00
+21792 11733 -1.34062314544322e-01
+21792 12285 -6.28923985187350e-07
+21792 12309 -4.29215165363190e-03
+21792 12333 -7.59934449608862e-04
+21792 21792 1.00814082330139e+01
+21792 20928 2.07328938265863e-02
+21792 20952 1.43623610275629e-01
+21792 20976 2.80966808721889e-01
+21792 21000 1.30555135041960e-01
+21792 21024 1.74657750181692e-02
+21792 21336 3.52882545366849e-01
+21792 21360 2.58960730429136e+00
+21792 21384 5.52408794703359e+00
+21792 21408 3.01366476430754e+00
+21792 21432 4.58896910370893e-01
+21792 21744 5.60634833947594e-01
+21792 21768 4.17384933665331e+00
+21792 21816 5.11344358332134e+00
+21792 21840 7.95533395614602e-01
+21793 21793 1.00000000000000e+00
+21794 21794 1.00000000000000e+00
+21795 21795 1.00000000000000e+00
+21796 21796 1.00000000000000e+00
+21797 21797 1.00000000000000e+00
+21798 21798 1.00000000000000e+00
+21799 21799 1.00000000000000e+00
+21800 21800 1.00000000000000e+00
+21801 21801 1.00000000000000e+00
+21802 21802 1.00000000000000e+00
+21803 21803 1.00000000000000e+00
+21804 21804 1.00000000000000e+00
+21805 21805 1.00000000000000e+00
+21806 21806 1.00000000000000e+00
+21807 21807 1.00000000000000e+00
+21808 21808 1.00000000000000e+00
+21809 21809 1.00000000000000e+00
+21810 21810 1.00000000000000e+00
+21811 21811 1.00000000000000e+00
+21812 21812 1.00000000000000e+00
+21813 21813 1.00000000000000e+00
+21814 21814 1.00000000000000e+00
+21815 21815 1.00000000000000e+00
+21816 9861 -2.93151783220590e-07
+21816 9885 -1.19661164935189e-04
+21816 9909 -2.08381299950429e-05
+21816 10461 -2.06081244686783e-02
+21816 10485 -2.12057904827486e-01
+21816 10509 -1.98215657855399e-01
+21816 10533 -1.97720813716513e-02
+21816 10557 -2.51866616999205e-06
+21816 11061 -3.24429347867784e-01
+21816 11085 -7.28706157576696e+00
+21816 11109 -9.81224485046785e+00
+21816 11133 -7.35724208401048e-01
+21816 11157 -6.72695047920776e-03
+21816 11661 -3.79506224606009e-02
+21816 11685 -5.00898442642475e+00
+21816 11709 -1.38577901086805e+01
+21816 11733 -1.94760161133886e+00
+21816 11757 -7.88146601817165e-03
+21816 12285 -2.99407615582745e-06
+21816 12309 -1.22992818690735e-01
+21816 12333 -1.49586861259660e-01
+21816 12357 -1.07822922226180e-04
+21816 21816 1.46474152274498e+01
+21816 20952 1.51730087423208e-02
+21816 20976 1.30555135041960e-01
+21816 21000 3.14802352952062e-01
+21816 21024 1.50570875748812e-01
+21816 21048 2.01769439190338e-02
+21816 21360 2.94519280705989e-01
+21816 21384 3.01366476430753e+00
+21816 21408 7.92551584905714e+00
+21816 21432 2.99017165115092e+00
+21816 21456 2.88646002416835e-01
+21816 21768 4.82827500215733e-01
+21816 21792 5.11344358332134e+00
+21816 21840 4.92634717206014e+00
+21816 21864 4.36053397400433e-01
+21817 21817 1.00000000000000e+00
+21818 21818 1.00000000000000e+00
+21819 21819 1.00000000000000e+00
+21820 21820 1.00000000000000e+00
+21821 21821 1.00000000000000e+00
+21822 21822 1.00000000000000e+00
+21823 21823 1.00000000000000e+00
+21824 21824 1.00000000000000e+00
+21825 21825 1.00000000000000e+00
+21826 21826 1.00000000000000e+00
+21827 21827 1.00000000000000e+00
+21828 21828 1.00000000000000e+00
+21829 21829 1.00000000000000e+00
+21830 21830 1.00000000000000e+00
+21831 21831 1.00000000000000e+00
+21832 21832 1.00000000000000e+00
+21833 21833 1.00000000000000e+00
+21834 21834 1.00000000000000e+00
+21835 21835 1.00000000000000e+00
+21836 21836 1.00000000000000e+00
+21837 21837 1.00000000000000e+00
+21838 21838 1.00000000000000e+00
+21839 21839 1.00000000000000e+00
+21840 10485 -6.82991249166345e-03
+21840 10509 -4.16778281377620e-02
+21840 10533 -1.29413237855625e-02
+21840 10557 -1.04201598584571e-05
+21840 11061 -3.95711006277240e-05
+21840 11085 -1.18740850620952e+00
+21840 11109 -3.96155814643512e+00
+21840 11133 -1.51207846681767e+00
+21840 11157 -6.09452274392252e-02
+21840 11181 -7.56520811581522e-05
+21840 11661 -2.68177621416010e-05
+21840 11685 -1.19951607928600e+00
+21840 11709 -1.13558941478987e+01
+21840 11733 -9.31757742472487e+00
+21840 11757 -6.50483221529850e-01
+21840 11781 -2.15737240607039e-04
+21840 12285 -2.54244484549957e-06
+21840 12309 -5.65787260988382e-01
+21840 12333 -2.29847746643486e+00
+21840 12357 -4.03388434389524e-01
+21840 12381 -2.73434565390920e-07
+21840 21840 9.51025959481725e+00
+21840 20976 1.74657750181692e-02
+21840 21000 1.50570875748812e-01
+21840 21024 3.56062772461144e-01
+21840 21048 1.43771354629874e-01
+21840 21072 1.57658947384348e-02
+21840 21384 4.58896910370893e-01
+21840 21408 2.99017165115092e+00
+21840 21432 5.50134950102266e+00
+21840 21456 2.85105021759687e+00
+21840 21480 4.24116551982383e-01
+21840 21792 7.95533395614602e-01
+21840 21816 4.92634717206014e+00
+21840 21864 4.69570095278462e+00
+21840 21888 7.37871840795721e-01
+21841 21841 1.00000000000000e+00
+21842 21842 1.00000000000000e+00
+21843 21843 1.00000000000000e+00
+21844 21844 1.00000000000000e+00
+21845 21845 1.00000000000000e+00
+21846 21846 1.00000000000000e+00
+21847 21847 1.00000000000000e+00
+21848 21848 1.00000000000000e+00
+21849 21849 1.00000000000000e+00
+21850 21850 1.00000000000000e+00
+21851 21851 1.00000000000000e+00
+21852 21852 1.00000000000000e+00
+21853 21853 1.00000000000000e+00
+21854 21854 1.00000000000000e+00
+21855 21855 1.00000000000000e+00
+21856 21856 1.00000000000000e+00
+21857 21857 1.00000000000000e+00
+21858 21858 1.00000000000000e+00
+21859 21859 1.00000000000000e+00
+21860 21860 1.00000000000000e+00
+21861 21861 1.00000000000000e+00
+21862 21862 1.00000000000000e+00
+21863 21863 1.00000000000000e+00
+21864 10509 -1.73196606922712e-03
+21864 10533 -2.16046850008649e-03
+21864 10557 -3.90079655830218e-06
+21864 11085 -9.65306573404814e-03
+21864 11109 -4.83551374784512e-01
+21864 11133 -7.56106341981185e-01
+21864 11157 -1.57084032693365e-01
+21864 11181 -1.65556807285428e-03
+21864 11685 -3.24275802740605e-02
+21864 11709 -3.99767481908096e+00
+21864 11733 -1.60834728731345e+01
+21864 11757 -3.43113164804858e+00
+21864 11781 -5.34115908914647e-02
+21864 12285 -4.78380215078060e-07
+21864 12309 -6.58684771145532e-01
+21864 12333 -7.82386178903512e+00
+21864 12357 -3.59414605494466e+00
+21864 12381 -8.07620712877434e-02
+21864 12933 -9.84041696600900e-04
+21864 12957 -2.65642361519613e-02
+21864 12981 -2.20520863822599e-03
+21864 21864 1.36913543179825e+01
+21864 21000 2.01769439190338e-02
+21864 21024 1.43771354629874e-01
+21864 21048 2.87903471136643e-01
+21864 21072 1.24952424564347e-01
+21864 21096 1.54722114026518e-02
+21864 21408 2.88646002416835e-01
+21864 21432 2.85105021759688e+00
+21864 21456 7.35333930796951e+00
+21864 21480 2.81178010326768e+00
+21864 21504 2.78828473834536e-01
+21864 21816 4.36053397400433e-01
+21864 21840 4.69570095278462e+00
+21864 21888 4.74889323458492e+00
+21864 21912 4.49351467850510e-01
+21865 21865 1.00000000000000e+00
+21866 21866 1.00000000000000e+00
+21867 21867 1.00000000000000e+00
+21868 21868 1.00000000000000e+00
+21869 21869 1.00000000000000e+00
+21870 21870 1.00000000000000e+00
+21871 21871 1.00000000000000e+00
+21872 21872 1.00000000000000e+00
+21873 21873 1.00000000000000e+00
+21874 21874 1.00000000000000e+00
+21875 21875 1.00000000000000e+00
+21876 21876 1.00000000000000e+00
+21877 21877 1.00000000000000e+00
+21878 21878 1.00000000000000e+00
+21879 21879 1.00000000000000e+00
+21880 21880 1.00000000000000e+00
+21881 21881 1.00000000000000e+00
+21882 21882 1.00000000000000e+00
+21883 21883 1.00000000000000e+00
+21884 21884 1.00000000000000e+00
+21885 21885 1.00000000000000e+00
+21886 21886 1.00000000000000e+00
+21887 21887 1.00000000000000e+00
+21888 10509 -7.90465775745000e-09
+21888 10533 -4.61831190340914e-06
+21888 10557 -3.45535269833860e-07
+21888 11109 -1.19215732302678e-02
+21888 11133 -1.17498240106757e-01
+21888 11157 -9.39954658147455e-02
+21888 11181 -8.34695865135758e-03
+21888 11709 -5.03800392544273e-01
+21888 11733 -5.62748706111437e+00
+21888 11757 -5.32072509957004e+00
+21888 11781 -8.20147575343330e-01
+21888 12309 -1.38468320828483e-01
+21888 12333 -5.11769890541479e+00
+21888 12357 -1.13506209985239e+01
+21888 12381 -1.21722609796367e+00
+21888 12933 -5.16422235334597e-03
+21888 12957 -2.58559228758149e-01
+21888 12981 -3.88419704019076e-02
+21888 21888 9.75447987253565e+00
+21888 21024 1.57658947384348e-02
+21888 21048 1.24952424564347e-01
+21888 21072 4.11091590186342e-01
+21888 21096 3.57429471621562e-01
+21888 21432 4.24116551982383e-01
+21888 21456 2.81178010326768e+00
+21888 21480 5.81606050192004e+00
+21888 21504 2.97669063250825e+00
+21888 21840 7.37871840795721e-01
+21888 21864 4.74889323458492e+00
+21888 21912 3.45137496366557e+00
+21889 21889 1.00000000000000e+00
+21890 21890 1.00000000000000e+00
+21891 21891 1.00000000000000e+00
+21892 21892 1.00000000000000e+00
+21893 21893 1.00000000000000e+00
+21894 21894 1.00000000000000e+00
+21895 21895 1.00000000000000e+00
+21896 21896 1.00000000000000e+00
+21897 21897 1.00000000000000e+00
+21898 21898 1.00000000000000e+00
+21899 21899 1.00000000000000e+00
+21900 21900 1.00000000000000e+00
+21901 21901 1.00000000000000e+00
+21902 21902 1.00000000000000e+00
+21903 21903 1.00000000000000e+00
+21904 21904 1.00000000000000e+00
+21905 21905 1.00000000000000e+00
+21906 21906 1.00000000000000e+00
+21907 21907 1.00000000000000e+00
+21908 21908 1.00000000000000e+00
+21909 21909 1.00000000000000e+00
+21910 21910 1.00000000000000e+00
+21911 21911 1.00000000000000e+00
+21912 11133 -2.63702574884997e-03
+21912 11157 -2.04644255858383e-02
+21912 11181 -7.07189490284714e-03
+21912 11709 -5.68909072862970e-05
+21912 11733 -5.40869660850735e-01
+21912 11757 -2.77159021881346e+00
+21912 11781 -1.27202318270219e+00
+21912 12309 -6.75149496405379e-05
+21912 12333 -9.93950143461411e-01
+21912 12357 -8.01986008310696e+00
+21912 12381 -1.86912480621183e+00
+21912 12933 -3.44015283048563e-03
+21912 12957 -3.31168804452569e-01
+21912 12981 -6.22474803362333e-02
+21912 21912 4.75728965237757e+00
+21912 21048 1.54722114026518e-02
+21912 21072 3.57429471621562e-01
+21912 21096 6.06553463424562e-01
+21912 21456 2.78828473834536e-01
+21912 21480 2.97669063250826e+00
+21912 21504 4.00158194817475e+00
+21912 21864 4.49351467850510e-01
+21912 21888 3.45137496366557e+00
+21913 21913 1.00000000000000e+00
+21914 21914 1.00000000000000e+00
+21915 21915 1.00000000000000e+00
+21916 21916 1.00000000000000e+00
+21917 21917 1.00000000000000e+00
+21918 21918 1.00000000000000e+00
+21919 21919 1.00000000000000e+00
+21920 21920 1.00000000000000e+00
+21921 21921 1.00000000000000e+00
+21922 21922 1.00000000000000e+00
+21923 21923 1.00000000000000e+00
+21924 21924 1.00000000000000e+00
+21925 21925 1.00000000000000e+00
+21926 21926 1.00000000000000e+00
+21927 21927 1.00000000000000e+00
+21928 21928 1.00000000000000e+00
+21929 21929 1.00000000000000e+00
+21930 21930 1.00000000000000e+00
+21931 21931 1.00000000000000e+00
+21932 21932 1.00000000000000e+00
+21933 21933 1.00000000000000e+00
+21934 21934 1.00000000000000e+00
+21935 21935 1.00000000000000e+00
diff --git a/external/hypre/src/test/TEST_ij/default.jobs b/external/hypre/src/test/TEST_ij/default.jobs
old mode 100644
new mode 100755
index 36dc0495..5bf2b64d
--- a/external/hypre/src/test/TEST_ij/default.jobs
+++ b/external/hypre/src/test/TEST_ij/default.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_ij/default.saved.aurora b/external/hypre/src/test/TEST_ij/default.saved.aurora
new file mode 100644
index 00000000..350f6690
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/default.saved.aurora
@@ -0,0 +1,21 @@
+# Output file: default.out.0
+ Average Convergence Factor = 0.670777
+
+     Complexity:    grid = 1.413000
+                operator = 3.362344
+                   cycle = 6.712031
+
+# Output file: default.out.1
+ Average Convergence Factor = 0.670777
+
+     Complexity:    grid = 1.413000
+                operator = 3.362344
+                   cycle = 6.712031
+
+# Output file: default.out.2
+ Average Convergence Factor = 0.670777
+
+     Complexity:    grid = 1.413000
+                operator = 3.362344
+                   cycle = 6.712031
+
diff --git a/external/hypre/src/test/TEST_ij/default.saved.lassen_cpu b/external/hypre/src/test/TEST_ij/default.saved.lassen_cpu
new file mode 100644
index 00000000..df37a26b
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/default.saved.lassen_cpu
@@ -0,0 +1,21 @@
+# Output file: default.out.0
+ Average Convergence Factor = 0.678738
+
+     Complexity:    grid = 1.407000
+                operator = 3.252344
+                   cycle = 6.499062
+
+# Output file: default.out.1
+ Average Convergence Factor = 0.678738
+
+     Complexity:    grid = 1.407000
+                operator = 3.252344
+                   cycle = 6.499062
+
+# Output file: default.out.2
+ Average Convergence Factor = 0.678738
+
+     Complexity:    grid = 1.407000
+                operator = 3.252344
+                   cycle = 6.499062
+
diff --git a/external/hypre/src/test/TEST_ij/default.saved.ray b/external/hypre/src/test/TEST_ij/default.saved.ray
deleted file mode 100644
index 173aa811..00000000
--- a/external/hypre/src/test/TEST_ij/default.saved.ray
+++ /dev/null
@@ -1,21 +0,0 @@
-# Output file: default.out.0
- Average Convergence Factor = 0.770311
-
-     Complexity:    grid = 1.417000
-                operator = 3.197969
-                   cycle = 6.392031
-
-# Output file: default.out.1
- Average Convergence Factor = 0.770311
-
-     Complexity:    grid = 1.417000
-                operator = 3.197969
-                   cycle = 6.392031
-
-# Output file: default.out.2
- Average Convergence Factor = 0.770311
-
-     Complexity:    grid = 1.417000
-                operator = 3.197969
-                   cycle = 6.392031
-
diff --git a/external/hypre/src/test/TEST_ij/default.sh b/external/hypre/src/test/TEST_ij/default.sh
old mode 100644
new mode 100755
index 828f337e..ae7f5300
--- a/external/hypre/src/test/TEST_ij/default.sh
+++ b/external/hypre/src/test/TEST_ij/default.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_ij/elast.jobs b/external/hypre/src/test/TEST_ij/elast.jobs
old mode 100644
new mode 100755
index ff189aa5..fa196f9d
--- a/external/hypre/src/test/TEST_ij/elast.jobs
+++ b/external/hypre/src/test/TEST_ij/elast.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_ij/elast.saved.aurora b/external/hypre/src/test/TEST_ij/elast.saved.aurora
new file mode 100644
index 00000000..35d03559
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/elast.saved.aurora
@@ -0,0 +1,84 @@
+# Output file: elast.out.0
+Iterations = 15
+Final Relative Residual Norm = 3.696503e-09
+
+# Output file: elast.out.1
+Iterations = 19
+Final Relative Residual Norm = 5.280301e-09
+
+# Output file: elast.out.2
+Iterations = 17
+Final Relative Residual Norm = 5.006925e-09
+
+# Output file: elast.out.3
+Iterations = 18
+Final Relative Residual Norm = 1.915650e-09
+
+# Output file: elast.out.4
+Iterations = 18
+Final Relative Residual Norm = 9.702040e-09
+
+# Output file: elast.out.5
+Iterations = 15
+Final Relative Residual Norm = 1.732501e-09
+
+# Output file: elast.out.6
+Iterations = 14
+Final Relative Residual Norm = 7.197345e-10
+
+# Output file: elast.out.7
+Iterations = 18
+Final Relative Residual Norm = 4.534614e-09
+
+# Output file: elast.out.8
+Iterations = 22
+Final Relative Residual Norm = 9.819907e-09
+
+# Output file: elast.out.9
+Iterations = 20
+Final Relative Residual Norm = 3.084274e-09
+
+# Output file: elast.out.10
+Iterations = 30
+Final Relative Residual Norm = 7.596931e-09
+
+# Output file: elast.out.11
+Iterations = 24
+Final Relative Residual Norm = 5.897597e-09
+
+# Output file: elast.out.12
+Iterations = 15
+Final Relative Residual Norm = 3.696503e-09
+
+# Output file: elast.out.13
+Iterations = 19
+Final Relative Residual Norm = 5.280301e-09
+
+# Output file: elast.out.14
+Iterations = 22
+Final Relative Residual Norm = 3.824699e-09
+
+# Output file: elast.out.15
+Iterations = 22
+Final Relative Residual Norm = 3.661821e-09
+
+# Output file: elast.out.16
+Iterations = 22
+Final Relative Residual Norm = 2.580454e-09
+
+# Output file: elast.out.17
+Iterations = 17
+Final Relative Residual Norm = 3.760837e-09
+
+# Output file: elast.out.18
+Iterations = 15
+Final Relative Residual Norm = 7.375784e-09
+
+# Output file: elast.out.19
+Iterations = 22
+Final Relative Residual Norm = 3.824699e-09
+
+# Output file: elast.out.20
+Iterations = 26
+Final Relative Residual Norm = 3.261487e-09
+
diff --git a/external/hypre/src/test/TEST_ij/elast.saved.lassen b/external/hypre/src/test/TEST_ij/elast.saved.lassen
index 7368192e..98b7c2d2 100644
--- a/external/hypre/src/test/TEST_ij/elast.saved.lassen
+++ b/external/hypre/src/test/TEST_ij/elast.saved.lassen
@@ -1,6 +1,6 @@
 # Output file: elast.out.0
 Iterations = 15
-Final Relative Residual Norm = 3.696505e-09
+Final Relative Residual Norm = 3.696508e-09
 
 # Output file: elast.out.1
 Iterations = 19
@@ -16,31 +16,31 @@ Final Relative Residual Norm = 1.982784e-09
 
 # Output file: elast.out.4
 Iterations = 18
-Final Relative Residual Norm = 9.718385e-09
+Final Relative Residual Norm = 9.702037e-09
 
 # Output file: elast.out.5
 Iterations = 15
-Final Relative Residual Norm = 1.728601e-09
+Final Relative Residual Norm = 1.733122e-09
 
 # Output file: elast.out.6
 Iterations = 14
-Final Relative Residual Norm = 7.661178e-10
+Final Relative Residual Norm = 7.092333e-10
 
 # Output file: elast.out.7
 Iterations = 17
-Final Relative Residual Norm = 5.935038e-09
+Final Relative Residual Norm = 3.595817e-09
 
 # Output file: elast.out.8
 Iterations = 21
-Final Relative Residual Norm = 4.320611e-09
+Final Relative Residual Norm = 4.320022e-09
 
 # Output file: elast.out.9
-Iterations = 17
-Final Relative Residual Norm = 9.246032e-09
+Iterations = 18
+Final Relative Residual Norm = 3.131906e-09
 
 # Output file: elast.out.10
 Iterations = 30
-Final Relative Residual Norm = 7.596938e-09
+Final Relative Residual Norm = 7.596939e-09
 
 # Output file: elast.out.11
 Iterations = 24
@@ -48,7 +48,7 @@ Final Relative Residual Norm = 5.897597e-09
 
 # Output file: elast.out.12
 Iterations = 15
-Final Relative Residual Norm = 3.696505e-09
+Final Relative Residual Norm = 3.696508e-09
 
 # Output file: elast.out.13
 Iterations = 19
@@ -56,29 +56,29 @@ Final Relative Residual Norm = 5.280302e-09
 
 # Output file: elast.out.14
 Iterations = 21
-Final Relative Residual Norm = 3.750122e-09
+Final Relative Residual Norm = 3.749017e-09
 
 # Output file: elast.out.15
 Iterations = 21
-Final Relative Residual Norm = 2.631552e-09
+Final Relative Residual Norm = 2.497467e-09
 
 # Output file: elast.out.16
 Iterations = 21
-Final Relative Residual Norm = 3.706737e-09
+Final Relative Residual Norm = 3.707944e-09
 
 # Output file: elast.out.17
 Iterations = 15
-Final Relative Residual Norm = 6.403256e-09
+Final Relative Residual Norm = 6.340959e-09
 
 # Output file: elast.out.18
 Iterations = 15
-Final Relative Residual Norm = 2.467636e-09
+Final Relative Residual Norm = 2.390385e-09
 
 # Output file: elast.out.19
 Iterations = 21
-Final Relative Residual Norm = 3.750122e-09
+Final Relative Residual Norm = 3.749017e-09
 
 # Output file: elast.out.20
-Iterations = 30
-Final Relative Residual Norm = 5.648175e-09
+Iterations = 29
+Final Relative Residual Norm = 7.098349e-09
 
diff --git a/external/hypre/src/test/TEST_ij/elast.saved.ray b/external/hypre/src/test/TEST_ij/elast.saved.lassen_cpu
similarity index 51%
rename from external/hypre/src/test/TEST_ij/elast.saved.ray
rename to external/hypre/src/test/TEST_ij/elast.saved.lassen_cpu
index 332a3616..1bb79d15 100644
--- a/external/hypre/src/test/TEST_ij/elast.saved.ray
+++ b/external/hypre/src/test/TEST_ij/elast.saved.lassen_cpu
@@ -1,6 +1,6 @@
 # Output file: elast.out.0
 Iterations = 15
-Final Relative Residual Norm = 3.696503e-09
+Final Relative Residual Norm = 3.031440e-09
 
 # Output file: elast.out.1
 Iterations = 19
@@ -8,7 +8,7 @@ Final Relative Residual Norm = 5.280300e-09
 
 # Output file: elast.out.2
 Iterations = 17
-Final Relative Residual Norm = 5.006926e-09
+Final Relative Residual Norm = 5.006925e-09
 
 # Output file: elast.out.3
 Iterations = 18
@@ -16,69 +16,69 @@ Final Relative Residual Norm = 1.982784e-09
 
 # Output file: elast.out.4
 Iterations = 18
-Final Relative Residual Norm = 9.718389e-09
+Final Relative Residual Norm = 9.976830e-09
 
 # Output file: elast.out.5
-Iterations = 15
-Final Relative Residual Norm = 1.728601e-09
+Iterations = 14
+Final Relative Residual Norm = 7.212489e-09
 
 # Output file: elast.out.6
 Iterations = 14
-Final Relative Residual Norm = 7.661178e-10
+Final Relative Residual Norm = 1.032022e-09
 
 # Output file: elast.out.7
-Iterations = 17
-Final Relative Residual Norm = 5.935033e-09
+Iterations = 16
+Final Relative Residual Norm = 1.869415e-09
 
 # Output file: elast.out.8
-Iterations = 21
-Final Relative Residual Norm = 4.320611e-09
+Iterations = 19
+Final Relative Residual Norm = 5.947438e-09
 
 # Output file: elast.out.9
 Iterations = 17
-Final Relative Residual Norm = 9.246032e-09
+Final Relative Residual Norm = 1.459105e-09
 
 # Output file: elast.out.10
-Iterations = 30
-Final Relative Residual Norm = 7.596938e-09
+Iterations = 23
+Final Relative Residual Norm = 4.126014e-09
 
 # Output file: elast.out.11
-Iterations = 24
-Final Relative Residual Norm = 5.897597e-09
+Iterations = 22
+Final Relative Residual Norm = 2.695354e-09
 
 # Output file: elast.out.12
 Iterations = 15
-Final Relative Residual Norm = 3.696503e-09
+Final Relative Residual Norm = 3.031440e-09
 
 # Output file: elast.out.13
 Iterations = 19
 Final Relative Residual Norm = 5.280300e-09
 
 # Output file: elast.out.14
-Iterations = 21
-Final Relative Residual Norm = 3.750122e-09
+Iterations = 17
+Final Relative Residual Norm = 3.806724e-09
 
 # Output file: elast.out.15
-Iterations = 21
-Final Relative Residual Norm = 2.631554e-09
+Iterations = 17
+Final Relative Residual Norm = 6.522765e-09
 
 # Output file: elast.out.16
-Iterations = 21
-Final Relative Residual Norm = 3.706737e-09
+Iterations = 18
+Final Relative Residual Norm = 7.070903e-09
 
 # Output file: elast.out.17
 Iterations = 15
-Final Relative Residual Norm = 6.403256e-09
+Final Relative Residual Norm = 3.102875e-09
 
 # Output file: elast.out.18
-Iterations = 15
-Final Relative Residual Norm = 2.465800e-09
+Iterations = 14
+Final Relative Residual Norm = 7.848992e-09
 
 # Output file: elast.out.19
-Iterations = 21
-Final Relative Residual Norm = 3.750122e-09
+Iterations = 17
+Final Relative Residual Norm = 3.080671e-09
 
 # Output file: elast.out.20
-Iterations = 30
-Final Relative Residual Norm = 5.648175e-09
+Iterations = 20
+Final Relative Residual Norm = 3.155988e-09
 
diff --git a/external/hypre/src/test/TEST_ij/elast.sh b/external/hypre/src/test/TEST_ij/elast.sh
old mode 100644
new mode 100755
index 6733ac8b..b3ae5c91
--- a/external/hypre/src/test/TEST_ij/elast.sh
+++ b/external/hypre/src/test/TEST_ij/elast.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_ij/fsai.jobs b/external/hypre/src/test/TEST_ij/fsai.jobs
new file mode 100755
index 00000000..0e6cb24d
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/fsai.jobs
@@ -0,0 +1,89 @@
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+#=============================================================================
+# Instructions for new adding new regression tests:
+#
+# 1) Given a new scenario, add matching tests for FSAI as a preconditioner and
+#    FSAI as a smoother to BoomerAMG, e.g., see fsai.out.0 and fsai.out.100
+#
+#=============================================================================
+
+#=============================================================================
+# Preconditioner to Krylov methods
+#=============================================================================
+
+# Computes the full inverse of the lower Cholesky factor. Not practical, but it's a good sanity check.
+mpirun -np 1 ./ij -n 5 5 5 -solver 31 -fs_max_steps 125 -fs_max_step_size 1 -fs_kap_tol 0 > fsai.out.0
+
+# The FSAI factor G is simply sqrt(1/D_A). This should give the same result as DS-PCG
+mpirun -np 1 ./ij -n 10 10 10 -solver 31 -fs_max_steps 0 -fs_max_step_size 0 -fs_kap_tol 0 > fsai.out.1
+mpirun -np 1 ./ij -n 10 10 10 -solver 31 -fs_max_steps 0 -fs_max_step_size 1 -fs_kap_tol 0 > fsai.out.2
+mpirun -np 1 ./ij -n 10 10 10 -solver 2 > fsai.out.3
+
+# Test different setup combinations for FSAI
+mpirun -np 1 ./ij -n 10 10 10 -solver 31 -fs_max_steps 5 -fs_max_step_size 1 -fs_kap_tol 0 > fsai.out.4
+mpirun -np 1 ./ij -n 10 10 10 -solver 31 -fs_max_steps 5 -fs_max_step_size 4 -fs_kap_tol 0 > fsai.out.5
+mpirun -np 1 ./ij -n 10 10 10 -solver 31 -fs_max_steps 5 -fs_max_step_size 4 -fs_kap_tol 1e-3 > fsai.out.6
+mpirun -np 1 ./ij -n 10 10 10 -solver 31 -fs_max_steps 5 -fs_max_step_size 4 -fs_kap_tol 1e-1 > fsai.out.7
+
+# Test with larger problem stencils
+mpirun -np 1 ./ij -n 10 10 10 -27pt -solver 31 -fs_max_steps 5 -fs_max_step_size 3 -fs_kap_tol 0 > fsai.out.8
+mpirun -np 2 ./ij -n 10 10 10 -P 2 1 1 -27pt -solver 31 -fs_max_steps 5 -fs_max_step_size 3 -fs_kap_tol 0 > fsai.out.9
+mpirun -np 3 ./ij -n 10 10 10 -P 3 1 1 -27pt -solver 31 -fs_max_steps 5 -fs_max_step_size 3 -fs_kap_tol 0 > fsai.out.10
+mpirun -np 1 ./ij -n 10 10 10 -sysL 3 -solver 31 -fs_max_steps 5 -fs_max_step_size 3 -fs_kap_tol 0 > fsai.out.11
+mpirun -np 2 ./ij -n 10 10 10 -P 2 1 1 -sysL 3 -solver 31 -fs_max_steps 5 -fs_max_step_size 3 -fs_kap_tol 0 > fsai.out.12
+mpirun -np 3 ./ij -n 10 10 10 -P 3 1 1 -sysL 3 -solver 31 -fs_max_steps 5 -fs_max_step_size 3 -fs_kap_tol 0 > fsai.out.13
+
+# Test with linear elasticity problems
+mpirun -np 1 ./ij -fromfile data/beam_tet_dof459_np1/A.IJ -rhsfromfile data/beam_tet_dof459_np1/b.IJ \
+                  -solver 31 -fs_max_steps 5 -fs_max_step_size 3 -fs_kap_tol 0 > fsai.out.14
+mpirun -np 2 ./ij -fromfile data/beam_hex_dof459_np2/A.IJ -rhsfromfile data/beam_hex_dof459_np2/b.IJ \
+                  -solver 31 -fs_max_steps 5 -fs_max_step_size 3 -fs_kap_tol 0 > fsai.out.15
+mpirun -np 4 ./ij -fromfile data/beam_tet_dof2475_np4/A.IJ -rhsfromfile data/beam_tet_dof2475_np4/b.IJ \
+                  -solver 31 -fs_max_steps 5 -fs_max_step_size 3 -fs_kap_tol 0 > fsai.out.16
+mpirun -np 4 ./ij -fromfile data/beam_tet_dof2475_np4/A.IJ -rhsfromfile data/beam_tet_dof2475_np4/b.IJ \
+                  -solver 31 -fs_max_steps 15 -fs_max_step_size 4 -fs_kap_tol 0 > fsai.out.17
+mpirun -np 4 ./ij -fromfile data/beam_tet_dof2475_np4/A.IJ -rhsfromfile data/beam_tet_dof2475_np4/b.IJ \
+                  -solver 31 > fsai.out.18
+
+#=============================================================================
+# Complex smoother to BoomerAMG
+#=============================================================================
+
+# Computes the full inverse of the lower Cholesky factor. Not practical, but it's a good sanity check.
+mpirun -np 1 ./ij -n 5 5 5 -solver 1 -smtype 4 -smlv 25 -fs_max_steps 125 -fs_max_step_size 1 -fs_kap_tol 0 -fs_eig_max_iters 5 > fsai.out.100
+
+# The FSAI factor G is simply sqrt(1/D_A). This should give the same result as BoomerAMG(Jac)-PCG
+mpirun -np 1 ./ij -n 10 10 10 -solver 1 -smtype 4 -smlv 4 -fs_max_steps 0 -fs_max_step_size 0 -fs_kap_tol 0 -fs_eig_max_iters 0 > fsai.out.101
+mpirun -np 1 ./ij -n 10 10 10 -solver 1 -smtype 4 -smlv 4 -fs_max_steps 0 -fs_max_step_size 1 -fs_kap_tol 0 -fs_eig_max_iters 0 > fsai.out.102
+mpirun -np 1 ./ij -n 10 10 10 -solver 1 -rlx 7 > fsai.out.103
+
+# Test different setup combinations for FSAI
+mpirun -np 1 ./ij -n 10 10 10 -solver 1 -smtype 4 -smlv 25 -fs_max_steps 5 -fs_max_step_size 1 -fs_kap_tol 0 -fs_eig_max_iters 5 > fsai.out.104
+mpirun -np 1 ./ij -n 10 10 10 -solver 1 -smtype 4 -smlv 25 -fs_max_steps 5 -fs_max_step_size 4 -fs_kap_tol 0 -fs_eig_max_iters 5 > fsai.out.105
+mpirun -np 1 ./ij -n 10 10 10 -solver 1 -smtype 4 -smlv 25 -fs_max_steps 5 -fs_max_step_size 4 -fs_kap_tol 1e-3 -fs_eig_max_iters 5 > fsai.out.106
+mpirun -np 1 ./ij -n 10 10 10 -solver 1 -smtype 4 -smlv 25 -fs_max_steps 5 -fs_max_step_size 4 -fs_kap_tol 1e-1 -fs_eig_max_iters 5 > fsai.out.107
+
+# Test with larger problem stencils
+mpirun -np 1 ./ij -n 10 10 10 -27pt -solver 1 -smtype 4 -smlv 25 -fs_max_steps 5 -fs_max_step_size 3 -fs_kap_tol 0 -fs_eig_max_iters 5 > fsai.out.108
+mpirun -np 2 ./ij -n 10 10 10 -P 2 1 1 -27pt -solver 1 -smtype 4 -smlv 25 -fs_max_steps 5 -fs_max_step_size 3 -fs_kap_tol 0 -fs_eig_max_iters 5 > fsai.out.109
+mpirun -np 3 ./ij -n 10 10 10 -P 3 1 1 -27pt -solver 1 -smtype 4 -smlv 25 -fs_max_steps 5 -fs_max_step_size 3 -fs_kap_tol 0 -fs_eig_max_iters 5 > fsai.out.110
+mpirun -np 1 ./ij -n 10 10 10 -sysL 3 -solver 1 -smtype 4 -smlv 25 -fs_max_steps 5 -fs_max_step_size 3 -fs_kap_tol 0 -fs_eig_max_iters 5 > fsai.out.111
+mpirun -np 2 ./ij -n 10 10 10 -P 2 1 1 -sysL 3 -solver 1 -smtype 4 -smlv 25 -fs_max_steps 5 -fs_max_step_size 3 -fs_kap_tol 0 -fs_eig_max_iters 5 > fsai.out.112
+mpirun -np 3 ./ij -n 10 10 10 -P 3 1 1 -sysL 3 -solver 1 -smtype 4 -smlv 25 -fs_max_steps 5 -fs_max_step_size 3 -fs_kap_tol 0 -fs_eig_max_iters 5 > fsai.out.113
+
+# Test with linear elasticity problems
+mpirun -np 1 ./ij -fromfile data/beam_tet_dof459_np1/A.IJ -rhsfromfile data/beam_tet_dof459_np1/b.IJ \
+                  -nf 3 -solver 1 -smtype 4 -smlv 25 -fs_max_steps 5 -fs_max_step_size 3 -fs_kap_tol 0 -fs_eig_max_iters 5 > fsai.out.114
+mpirun -np 2 ./ij -fromfile data/beam_hex_dof459_np2/A.IJ -rhsfromfile data/beam_hex_dof459_np2/b.IJ \
+                  -nf 3 -solver 1 -smtype 4 -smlv 25 -fs_max_steps 5 -fs_max_step_size 3 -fs_kap_tol 0 -fs_eig_max_iters 5 > fsai.out.115
+mpirun -np 4 ./ij -fromfile data/beam_tet_dof2475_np4/A.IJ -rhsfromfile data/beam_tet_dof2475_np4/b.IJ \
+                  -nf 3 -solver 1 -smtype 4 -smlv 25 -fs_max_steps 5 -fs_max_step_size 3 -fs_kap_tol 0 -fs_eig_max_iters 5 > fsai.out.116
+mpirun -np 4 ./ij -fromfile data/beam_tet_dof2475_np4/A.IJ -rhsfromfile data/beam_tet_dof2475_np4/b.IJ \
+                  -nf 3 -solver 1 -smtype 4 -smlv 25 -fs_max_steps 15 -fs_max_step_size 4 -fs_kap_tol 0 -fs_eig_max_iters 5 > fsai.out.117
+mpirun -np 4 ./ij -fromfile data/beam_tet_dof2475_np4/A.IJ -rhsfromfile data/beam_tet_dof2475_np4/b.IJ \
+                  -nf 3 -solver 1 -smtype 4 -smlv 25 > fsai.out.118
diff --git a/external/hypre/src/test/TEST_ij/fsai.saved b/external/hypre/src/test/TEST_ij/fsai.saved
new file mode 100644
index 00000000..b677738f
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/fsai.saved
@@ -0,0 +1,152 @@
+# Output file: fsai.out.0
+Iterations = 1
+Final Relative Residual Norm = 2.761185e-15
+
+# Output file: fsai.out.1
+Iterations = 23
+Final Relative Residual Norm = 8.691352e-09
+
+# Output file: fsai.out.2
+Iterations = 23
+Final Relative Residual Norm = 8.691352e-09
+
+# Output file: fsai.out.3
+Iterations = 23
+Final Relative Residual Norm = 8.691352e-09
+
+# Output file: fsai.out.4
+Iterations = 19
+Final Relative Residual Norm = 8.939605e-09
+
+# Output file: fsai.out.5
+Iterations = 13
+Final Relative Residual Norm = 9.676517e-09
+
+# Output file: fsai.out.6
+Iterations = 13
+Final Relative Residual Norm = 4.048616e-09
+
+# Output file: fsai.out.7
+Iterations = 18
+Final Relative Residual Norm = 8.582135e-09
+
+# Output file: fsai.out.8
+Iterations = 12
+Final Relative Residual Norm = 5.755183e-09
+
+# Output file: fsai.out.9
+Iterations = 16
+Final Relative Residual Norm = 4.809895e-09
+
+# Output file: fsai.out.10
+Iterations = 17
+Final Relative Residual Norm = 9.601188e-09
+
+# Output file: fsai.out.11
+Iterations = 23
+Final Relative Residual Norm = 6.857102e-09
+
+# Output file: fsai.out.12
+Iterations = 26
+Final Relative Residual Norm = 7.063015e-09
+
+# Output file: fsai.out.13
+Iterations = 27
+Final Relative Residual Norm = 5.145896e-09
+
+# Output file: fsai.out.14
+Iterations = 78
+Final Relative Residual Norm = 3.787505e-09
+
+# Output file: fsai.out.15
+Iterations = 78
+Final Relative Residual Norm = 5.414675e-09
+
+# Output file: fsai.out.16
+Iterations = 171
+Final Relative Residual Norm = 4.941318e-09
+
+# Output file: fsai.out.17
+Iterations = 126
+Final Relative Residual Norm = 9.030852e-09
+
+# Output file: fsai.out.18
+Iterations = 185
+Final Relative Residual Norm = 4.894088e-09
+
+# Output file: fsai.out.100
+Iterations = 1
+Final Relative Residual Norm = 8.370817e-16
+
+# Output file: fsai.out.101
+Iterations = 22
+Final Relative Residual Norm = 7.480945e-09
+
+# Output file: fsai.out.102
+Iterations = 22
+Final Relative Residual Norm = 7.480945e-09
+
+# Output file: fsai.out.103
+Iterations = 22
+Final Relative Residual Norm = 7.480945e-09
+
+# Output file: fsai.out.104
+Iterations = 6
+Final Relative Residual Norm = 1.781486e-09
+
+# Output file: fsai.out.105
+Iterations = 4
+Final Relative Residual Norm = 6.366437e-09
+
+# Output file: fsai.out.106
+Iterations = 4
+Final Relative Residual Norm = 7.562368e-09
+
+# Output file: fsai.out.107
+Iterations = 7
+Final Relative Residual Norm = 5.412177e-09
+
+# Output file: fsai.out.108
+Iterations = 5
+Final Relative Residual Norm = 4.839232e-10
+
+# Output file: fsai.out.109
+Iterations = 6
+Final Relative Residual Norm = 9.585043e-09
+
+# Output file: fsai.out.110
+Iterations = 7
+Final Relative Residual Norm = 1.636774e-09
+
+# Output file: fsai.out.111
+Iterations = 9
+Final Relative Residual Norm = 1.190776e-09
+
+# Output file: fsai.out.112
+Iterations = 9
+Final Relative Residual Norm = 9.352486e-09
+
+# Output file: fsai.out.113
+Iterations = 10
+Final Relative Residual Norm = 1.877799e-09
+
+# Output file: fsai.out.114
+Iterations = 24
+Final Relative Residual Norm = 1.913199e-09
+
+# Output file: fsai.out.115
+Iterations = 27
+Final Relative Residual Norm = 8.714453e-09
+
+# Output file: fsai.out.116
+Iterations = 34
+Final Relative Residual Norm = 1.456606e-09
+
+# Output file: fsai.out.117
+Iterations = 30
+Final Relative Residual Norm = 2.318909e-09
+
+# Output file: fsai.out.118
+Iterations = 35
+Final Relative Residual Norm = 2.996819e-09
+
diff --git a/external/hypre/src/test/TEST_ij/fsai.saved.aurora b/external/hypre/src/test/TEST_ij/fsai.saved.aurora
new file mode 100644
index 00000000..bdb77378
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/fsai.saved.aurora
@@ -0,0 +1,152 @@
+# Output file: fsai.out.0
+Iterations = 1
+Final Relative Residual Norm = 1.327968e-15
+
+# Output file: fsai.out.1
+Iterations = 23
+Final Relative Residual Norm = 8.691352e-09
+
+# Output file: fsai.out.2
+Iterations = 23
+Final Relative Residual Norm = 8.691352e-09
+
+# Output file: fsai.out.3
+Iterations = 23
+Final Relative Residual Norm = 8.691352e-09
+
+# Output file: fsai.out.4
+Iterations = 19
+Final Relative Residual Norm = 8.939605e-09
+
+# Output file: fsai.out.5
+Iterations = 13
+Final Relative Residual Norm = 9.676517e-09
+
+# Output file: fsai.out.6
+Iterations = 13
+Final Relative Residual Norm = 4.048616e-09
+
+# Output file: fsai.out.7
+Iterations = 18
+Final Relative Residual Norm = 8.582135e-09
+
+# Output file: fsai.out.8
+Iterations = 12
+Final Relative Residual Norm = 5.755183e-09
+
+# Output file: fsai.out.9
+Iterations = 16
+Final Relative Residual Norm = 4.809895e-09
+
+# Output file: fsai.out.10
+Iterations = 17
+Final Relative Residual Norm = 9.601188e-09
+
+# Output file: fsai.out.11
+Iterations = 23
+Final Relative Residual Norm = 6.857102e-09
+
+# Output file: fsai.out.12
+Iterations = 26
+Final Relative Residual Norm = 7.063015e-09
+
+# Output file: fsai.out.13
+Iterations = 27
+Final Relative Residual Norm = 5.145896e-09
+
+# Output file: fsai.out.14
+Iterations = 78
+Final Relative Residual Norm = 3.787405e-09
+
+# Output file: fsai.out.15
+Iterations = 78
+Final Relative Residual Norm = 5.652639e-09
+
+# Output file: fsai.out.16
+Iterations = 171
+Final Relative Residual Norm = 4.890543e-09
+
+# Output file: fsai.out.17
+Iterations = 126
+Final Relative Residual Norm = 9.009656e-09
+
+# Output file: fsai.out.18
+Iterations = 184
+Final Relative Residual Norm = 8.235568e-09
+
+# Output file: fsai.out.100
+Iterations = 1
+Final Relative Residual Norm = 8.500568e-16
+
+# Output file: fsai.out.101
+Iterations = 21
+Final Relative Residual Norm = 4.410327e-09
+
+# Output file: fsai.out.102
+Iterations = 21
+Final Relative Residual Norm = 4.410327e-09
+
+# Output file: fsai.out.103
+Iterations = 21
+Final Relative Residual Norm = 4.410327e-09
+
+# Output file: fsai.out.104
+Iterations = 6
+Final Relative Residual Norm = 8.335263e-09
+
+# Output file: fsai.out.105
+Iterations = 5
+Final Relative Residual Norm = 2.235485e-09
+
+# Output file: fsai.out.106
+Iterations = 5
+Final Relative Residual Norm = 2.243140e-09
+
+# Output file: fsai.out.107
+Iterations = 7
+Final Relative Residual Norm = 5.102038e-09
+
+# Output file: fsai.out.108
+Iterations = 5
+Final Relative Residual Norm = 5.076365e-10
+
+# Output file: fsai.out.109
+Iterations = 6
+Final Relative Residual Norm = 6.739539e-09
+
+# Output file: fsai.out.110
+Iterations = 7
+Final Relative Residual Norm = 3.488908e-10
+
+# Output file: fsai.out.111
+Iterations = 9
+Final Relative Residual Norm = 3.676980e-09
+
+# Output file: fsai.out.112
+Iterations = 10
+Final Relative Residual Norm = 1.938122e-09
+
+# Output file: fsai.out.113
+Iterations = 10
+Final Relative Residual Norm = 3.955283e-09
+
+# Output file: fsai.out.114
+Iterations = 25
+Final Relative Residual Norm = 2.112909e-09
+
+# Output file: fsai.out.115
+Iterations = 27
+Final Relative Residual Norm = 3.910858e-09
+
+# Output file: fsai.out.116
+Iterations = 37
+Final Relative Residual Norm = 2.122027e-09
+
+# Output file: fsai.out.117
+Iterations = 33
+Final Relative Residual Norm = 1.272242e-09
+
+# Output file: fsai.out.118
+Iterations = 38
+Final Relative Residual Norm = 5.770945e-09
+
diff --git a/external/hypre/src/test/TEST_ij/fsai.saved.lassen b/external/hypre/src/test/TEST_ij/fsai.saved.lassen
new file mode 100644
index 00000000..47b4ae6f
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/fsai.saved.lassen
@@ -0,0 +1,151 @@
+# Output file: fsai.out.0
+Iterations = 1
+Final Relative Residual Norm = 1.228129e-15
+
+# Output file: fsai.out.1
+Iterations = 23
+Final Relative Residual Norm = 8.691352e-09
+
+# Output file: fsai.out.2
+Iterations = 23
+Final Relative Residual Norm = 8.691352e-09
+
+# Output file: fsai.out.3
+Iterations = 23
+Final Relative Residual Norm = 8.691352e-09
+
+# Output file: fsai.out.4
+Iterations = 19
+Final Relative Residual Norm = 8.939605e-09
+
+# Output file: fsai.out.5
+Iterations = 13
+Final Relative Residual Norm = 9.676493e-09
+
+# Output file: fsai.out.6
+Iterations = 13
+Final Relative Residual Norm = 4.052388e-09
+
+# Output file: fsai.out.7
+Iterations = 18
+Final Relative Residual Norm = 8.582135e-09
+
+# Output file: fsai.out.8
+Iterations = 12
+Final Relative Residual Norm = 4.959354e-09
+
+# Output file: fsai.out.9
+Iterations = 16
+Final Relative Residual Norm = 4.823866e-09
+
+# Output file: fsai.out.10
+Iterations = 17
+Final Relative Residual Norm = 9.617105e-09
+
+# Output file: fsai.out.11
+Iterations = 23
+Final Relative Residual Norm = 6.181709e-09
+
+# Output file: fsai.out.12
+Iterations = 26
+Final Relative Residual Norm = 6.972951e-09
+
+# Output file: fsai.out.13
+Iterations = 27
+Final Relative Residual Norm = 5.307599e-09
+
+# Output file: fsai.out.14
+Iterations = 78
+Final Relative Residual Norm = 3.771847e-09
+
+# Output file: fsai.out.15
+Iterations = 78
+Final Relative Residual Norm = 5.076820e-09
+
+# Output file: fsai.out.16
+Iterations = 171
+Final Relative Residual Norm = 5.063815e-09
+
+# Output file: fsai.out.17
+Iterations = 126
+Final Relative Residual Norm = 8.488999e-09
+
+# Output file: fsai.out.18
+Iterations = 184
+Final Relative Residual Norm = 7.904808e-09
+
+# Output file: fsai.out.100
+Iterations = 1
+Final Relative Residual Norm = 9.870376e-16
+
+# Output file: fsai.out.101
+Iterations = 21
+Final Relative Residual Norm = 7.992635e-09
+
+# Output file: fsai.out.102
+Iterations = 21
+Final Relative Residual Norm = 7.992635e-09
+
+# Output file: fsai.out.103
+Iterations = 21
+Final Relative Residual Norm = 7.992635e-09
+
+# Output file: fsai.out.104
+Iterations = 7
+Final Relative Residual Norm = 3.296684e-10
+
+# Output file: fsai.out.105
+Iterations = 5
+Final Relative Residual Norm = 1.829167e-09
+
+# Output file: fsai.out.106
+Iterations = 5
+Final Relative Residual Norm = 1.901994e-09
+
+# Output file: fsai.out.107
+Iterations = 7
+Final Relative Residual Norm = 7.069461e-09
+
+# Output file: fsai.out.108
+Iterations = 5
+Final Relative Residual Norm = 3.267638e-10
+
+# Output file: fsai.out.109
+Iterations = 6
+Final Relative Residual Norm = 8.879422e-09
+
+# Output file: fsai.out.110
+Iterations = 7
+Final Relative Residual Norm = 9.454511e-10
+
+# Output file: fsai.out.111
+Iterations = 10
+Final Relative Residual Norm = 1.114164e-09
+
+# Output file: fsai.out.112
+Iterations = 10
+Final Relative Residual Norm = 2.738091e-09
+
+# Output file: fsai.out.113
+Iterations = 10
+Final Relative Residual Norm = 4.476226e-09
+
+# Output file: fsai.out.114
+Iterations = 25
+Final Relative Residual Norm = 2.054687e-09
+
+# Output file: fsai.out.115
+Iterations = 27
+Final Relative Residual Norm = 2.533347e-09
+
+# Output file: fsai.out.116
+Iterations = 37
+Final Relative Residual Norm = 1.700494e-09
+
+# Output file: fsai.out.117
+Iterations = 32
+Final Relative Residual Norm = 7.611745e-09
+
+# Output file: fsai.out.118
+Iterations = 38
+Final Relative Residual Norm = 6.230831e-09
diff --git a/external/hypre/src/test/TEST_ij/fsai.saved.lassen_cpu b/external/hypre/src/test/TEST_ij/fsai.saved.lassen_cpu
new file mode 100644
index 00000000..2ab95d28
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/fsai.saved.lassen_cpu
@@ -0,0 +1,152 @@
+# Output file: fsai.out.0
+Iterations = 1
+Final Relative Residual Norm = 2.749303e-15
+
+# Output file: fsai.out.1
+Iterations = 23
+Final Relative Residual Norm = 8.691352e-09
+
+# Output file: fsai.out.2
+Iterations = 23
+Final Relative Residual Norm = 8.691352e-09
+
+# Output file: fsai.out.3
+Iterations = 23
+Final Relative Residual Norm = 8.691352e-09
+
+# Output file: fsai.out.4
+Iterations = 19
+Final Relative Residual Norm = 8.939605e-09
+
+# Output file: fsai.out.5
+Iterations = 13
+Final Relative Residual Norm = 9.676493e-09
+
+# Output file: fsai.out.6
+Iterations = 13
+Final Relative Residual Norm = 4.052388e-09
+
+# Output file: fsai.out.7
+Iterations = 18
+Final Relative Residual Norm = 8.582135e-09
+
+# Output file: fsai.out.8
+Iterations = 12
+Final Relative Residual Norm = 4.959354e-09
+
+# Output file: fsai.out.9
+Iterations = 16
+Final Relative Residual Norm = 4.823866e-09
+
+# Output file: fsai.out.10
+Iterations = 17
+Final Relative Residual Norm = 9.617105e-09
+
+# Output file: fsai.out.11
+Iterations = 23
+Final Relative Residual Norm = 6.181709e-09
+
+# Output file: fsai.out.12
+Iterations = 26
+Final Relative Residual Norm = 6.972951e-09
+
+# Output file: fsai.out.13
+Iterations = 27
+Final Relative Residual Norm = 5.307599e-09
+
+# Output file: fsai.out.14
+Iterations = 78
+Final Relative Residual Norm = 3.771384e-09
+
+# Output file: fsai.out.15
+Iterations = 78
+Final Relative Residual Norm = 5.047449e-09
+
+# Output file: fsai.out.16
+Iterations = 171
+Final Relative Residual Norm = 4.772278e-09
+
+# Output file: fsai.out.17
+Iterations = 126
+Final Relative Residual Norm = 8.487749e-09
+
+# Output file: fsai.out.18
+Iterations = 184
+Final Relative Residual Norm = 7.799267e-09
+
+# Output file: fsai.out.100
+Iterations = 1
+Final Relative Residual Norm = 7.571037e-16
+
+# Output file: fsai.out.101
+Iterations = 22
+Final Relative Residual Norm = 7.482225e-09
+
+# Output file: fsai.out.102
+Iterations = 22
+Final Relative Residual Norm = 7.482225e-09
+
+# Output file: fsai.out.103
+Iterations = 22
+Final Relative Residual Norm = 7.482225e-09
+
+# Output file: fsai.out.104
+Iterations = 6
+Final Relative Residual Norm = 1.770040e-09
+
+# Output file: fsai.out.105
+Iterations = 4
+Final Relative Residual Norm = 6.400389e-09
+
+# Output file: fsai.out.106
+Iterations = 4
+Final Relative Residual Norm = 7.626472e-09
+
+# Output file: fsai.out.107
+Iterations = 7
+Final Relative Residual Norm = 5.411192e-09
+
+# Output file: fsai.out.108
+Iterations = 5
+Final Relative Residual Norm = 4.951758e-10
+
+# Output file: fsai.out.109
+Iterations = 6
+Final Relative Residual Norm = 9.572177e-09
+
+# Output file: fsai.out.110
+Iterations = 7
+Final Relative Residual Norm = 1.624844e-09
+
+# Output file: fsai.out.111
+Iterations = 9
+Final Relative Residual Norm = 1.023579e-09
+
+# Output file: fsai.out.112
+Iterations = 9
+Final Relative Residual Norm = 9.228804e-09
+
+# Output file: fsai.out.113
+Iterations = 10
+Final Relative Residual Norm = 1.921603e-09
+
+# Output file: fsai.out.114
+Iterations = 24
+Final Relative Residual Norm = 1.826448e-09
+
+# Output file: fsai.out.115
+Iterations = 27
+Final Relative Residual Norm = 9.403460e-09
+
+# Output file: fsai.out.116
+Iterations = 34
+Final Relative Residual Norm = 1.473745e-09
+
+# Output file: fsai.out.117
+Iterations = 30
+Final Relative Residual Norm = 2.330513e-09
+
+# Output file: fsai.out.118
+Iterations = 35
+Final Relative Residual Norm = 2.996136e-09
+
diff --git a/external/hypre/src/test/TEST_ij/fsai.sh b/external/hypre/src/test/TEST_ij/fsai.sh
new file mode 100755
index 00000000..61c0cd55
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/fsai.sh
@@ -0,0 +1,67 @@
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+TNAME=`basename $0 .sh`
+RTOL=$1
+ATOL=$2
+
+#=============================================================================
+# compare with baseline case
+#=============================================================================
+
+FILES="\
+ ${TNAME}.out.0\
+ ${TNAME}.out.1\
+ ${TNAME}.out.2\
+ ${TNAME}.out.3\
+ ${TNAME}.out.4\
+ ${TNAME}.out.5\
+ ${TNAME}.out.6\
+ ${TNAME}.out.7\
+ ${TNAME}.out.8\
+ ${TNAME}.out.9\
+ ${TNAME}.out.10\
+ ${TNAME}.out.11\
+ ${TNAME}.out.12\
+ ${TNAME}.out.13\
+ ${TNAME}.out.14\
+ ${TNAME}.out.15\
+ ${TNAME}.out.16\
+ ${TNAME}.out.17\
+ ${TNAME}.out.18\
+ ${TNAME}.out.100\
+ ${TNAME}.out.101\
+ ${TNAME}.out.102\
+ ${TNAME}.out.103\
+ ${TNAME}.out.104\
+ ${TNAME}.out.105\
+ ${TNAME}.out.106\
+ ${TNAME}.out.107\
+ ${TNAME}.out.108\
+ ${TNAME}.out.109\
+ ${TNAME}.out.110\
+ ${TNAME}.out.111\
+ ${TNAME}.out.112\
+ ${TNAME}.out.113\
+ ${TNAME}.out.114\
+ ${TNAME}.out.115\
+ ${TNAME}.out.116\
+ ${TNAME}.out.117\
+ ${TNAME}.out.118\
+"
+
+for i in $FILES
+do
+  echo "# Output file: $i"
+  tail -3 $i
+done > ${TNAME}.out
+
+# Make sure that the output file is reasonable
+RUNCOUNT=`echo $FILES | wc -w`
+OUTCOUNT=`grep "Iterations" ${TNAME}.out | wc -l`
+if [ "$OUTCOUNT" != "$RUNCOUNT" ]; then
+   echo "Incorrect number of runs in ${TNAME}.out" >&2
+fi
diff --git a/external/hypre/src/test/TEST_ij/ilu.jobs b/external/hypre/src/test/TEST_ij/ilu.jobs
new file mode 100755
index 00000000..26c9dfc6
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/ilu.jobs
@@ -0,0 +1,49 @@
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+#
+# hypre_ILU tests
+# Tests ILU(0), ILUK and ILUK solvers sequentially
+# Tests Parallel combination of ILU solvers
+# Tests ILU-(Flex)GMRES
+# Test AMG with ILU as a complex smoother
+#
+mpirun -np 1  ./ij -solver 80 -ilu_type 0 -ilu_lfil 0 > ilu.out.300
+mpirun -np 1  ./ij -solver 80 -ilu_type 0 -ilu_lfil 1 > ilu.out.301
+mpirun -np 1  ./ij -solver 80 -ilu_type 1 -ilu_droptol 1.0e-2 -ilu_max_row_nnz 1000 > ilu.out.302
+# parallel ILU
+# BJ
+mpirun -np 2  ./ij -solver 80 -ilu_type 0 -ilu_lfil 1 > ilu.out.303
+mpirun -np 2  ./ij -solver 80 -ilu_type 1 -ilu_droptol 1.0e-2 -ilu_max_row_nnz 1000  > ilu.out.304
+# GMRES+ILU
+mpirun -np 2  ./ij -solver 80 -ilu_type 10 -ilu_lfil 1 -ilu_schur_max_iter 5 > ilu.out.305
+mpirun -np 2  ./ij -solver 80 -ilu_type 11 -ilu_droptol 1.0e-2 -ilu_max_row_nnz 1000 -ilu_schur_max_iter 5  > ilu.out.306
+# NSH+ILU
+mpirun -np 2  ./ij -solver 80 -ilu_type 20 -ilu_lfil 1 -ilu_schur_max_iter 5 > ilu.out.307
+mpirun -np 2  ./ij -solver 80 -ilu_type 21 -ilu_droptol 1.0e-2 -ilu_max_row_nnz 1000 -ilu_schur_max_iter 5  > ilu.out.308
+# RAS+ILU
+mpirun -np 2  ./ij -solver 80 -ilu_type 30 -ilu_lfil 1 > ilu.out.309
+mpirun -np 2  ./ij -solver 80 -ilu_type 31 -ilu_droptol 1.0e-2 -ilu_max_row_nnz 1000 > ilu.out.310
+# ddPQ-GMRES+ILU
+mpirun -np 2  ./ij -solver 80 -ilu_type 40 -ilu_lfil 1 -ilu_schur_max_iter 5 > ilu.out.311
+mpirun -np 2  ./ij -solver 80 -ilu_type 41 -ilu_droptol 1.0e-2 -ilu_max_row_nnz 1000 -ilu_schur_max_iter 5  > ilu.out.312
+##  ILU-GMRES
+mpirun -np 2  ./ij -solver 81 -ilu_type 0 -ilu_lfil 0 > ilu.out.313
+mpirun -np 2  ./ij -solver 81 -ilu_type 1 -ilu_droptol 1.0e-2 -ilu_max_row_nnz 1000  > ilu.out.314
+mpirun -np 2  ./ij -solver 81 -ilu_type 30 -ilu_lfil 0 > ilu.out.315
+mpirun -np 2  ./ij -solver 81 -ilu_type 31 -ilu_droptol 1.0e-2 -ilu_max_row_nnz 1000  > ilu.out.316
+##  ILU-FlexGMRES
+mpirun -np 2  ./ij -solver 82 -ilu_type 10 -ilu_lfil 0 -ilu_schur_max_iter 5 > ilu.out.317
+mpirun -np 2  ./ij -solver 82 -ilu_type 11 -ilu_droptol 1.0e-2 -ilu_max_row_nnz 1000 -ilu_schur_max_iter 5  > ilu.out.318
+mpirun -np 2  ./ij -solver 82 -ilu_type 20 -ilu_lfil 0 -ilu_schur_max_iter 5 > ilu.out.319
+mpirun -np 2  ./ij -solver 82 -ilu_type 21 -ilu_droptol 1.0e-2 -ilu_max_row_nnz 1000 -ilu_schur_max_iter 5  > ilu.out.320
+mpirun -np 2  ./ij -solver 82 -ilu_type 40 -ilu_lfil 0 -ilu_schur_max_iter 5 > ilu.out.321
+mpirun -np 2  ./ij -solver 82 -ilu_type 41 -ilu_droptol 1.0e-2 -ilu_max_row_nnz 1000 -ilu_schur_max_iter 5  > ilu.out.322
+## RAP-ILU
+mpirun -np 2  ./ij -solver 82 -ilu_type 50 -ilu_lfil 0 > ilu.out.323
+## ILU smoother for AMG
+mpirun -np 2  ./ij -solver 0 -smtype 5  -smlv 1 -ilu_type 30 > ilu.out.324
+mpirun -np 2  ./ij -solver 0 -smtype 15 -smlv 1 -ilu_type 30 > ilu.out.325
diff --git a/external/hypre/src/test/TEST_ij/ilu.saved b/external/hypre/src/test/TEST_ij/ilu.saved
new file mode 100644
index 00000000..c71674c4
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/ilu.saved
@@ -0,0 +1,104 @@
+# Output file: solvers.out.300
+hypre_ILU Iterations = 85
+Final Relative Residual Norm = 9.266244e-09
+
+# Output file: solvers.out.301
+hypre_ILU Iterations = 40
+Final Relative Residual Norm = 9.772377e-09
+
+# Output file: solvers.out.302
+hypre_ILU Iterations = 23
+Final Relative Residual Norm = 5.512717e-09
+
+# Output file: solvers.out.303
+hypre_ILU Iterations = 64
+Final Relative Residual Norm = 8.558467e-09
+
+# Output file: solvers.out.304
+hypre_ILU Iterations = 52
+Final Relative Residual Norm = 9.189235e-09
+
+# Output file: solvers.out.305
+hypre_ILU Iterations = 38
+Final Relative Residual Norm = 7.024121e-09
+
+# Output file: solvers.out.306
+hypre_ILU Iterations = 26
+Final Relative Residual Norm = 7.556742e-09
+
+# Output file: solvers.out.307
+hypre_ILU Iterations = 38
+Final Relative Residual Norm = 7.037599e-09
+
+# Output file: solvers.out.308
+hypre_ILU Iterations = 26
+Final Relative Residual Norm = 7.593126e-09
+
+# Output file: solvers.out.309
+hypre_ILU Iterations = 49
+Final Relative Residual Norm = 7.072947e-09
+
+# Output file: solvers.out.310
+hypre_ILU Iterations = 42
+Final Relative Residual Norm = 6.699477e-09
+
+# Output file: solvers.out.311
+hypre_ILU Iterations = 36
+Final Relative Residual Norm = 6.392185e-09
+
+# Output file: solvers.out.312
+hypre_ILU Iterations = 24
+Final Relative Residual Norm = 5.953652e-09
+
+# Output file: solvers.out.313
+GMRES Iterations = 25
+Final GMRES Relative Residual Norm = 3.968804e-09
+
+# Output file: solvers.out.314
+GMRES Iterations = 19
+Final GMRES Relative Residual Norm = 7.026446e-09
+
+# Output file: solvers.out.315
+GMRES Iterations = 20
+Final GMRES Relative Residual Norm = 7.908624e-09
+
+# Output file: solvers.out.316
+GMRES Iterations = 13
+Final GMRES Relative Residual Norm = 7.969372e-09
+
+# Output file: solvers.out.317
+FlexGMRES Iterations = 17
+Final FlexGMRES Relative Residual Norm = 9.152443e-09
+
+# Output file: solvers.out.318
+FlexGMRES Iterations = 9
+Final FlexGMRES Relative Residual Norm = 5.768785e-09
+
+# Output file: solvers.out.319
+FlexGMRES Iterations = 17
+Final FlexGMRES Relative Residual Norm = 9.133102e-09
+
+# Output file: solvers.out.320
+FlexGMRES Iterations = 9
+Final FlexGMRES Relative Residual Norm = 6.299457e-09
+
+# Output file: solvers.out.321
+FlexGMRES Iterations = 17
+Final FlexGMRES Relative Residual Norm = 4.489256e-09
+
+# Output file: solvers.out.322
+FlexGMRES Iterations = 8
+Final FlexGMRES Relative Residual Norm = 3.082447e-09
+
+# Output file: solvers.out.323
+FlexGMRES Iterations = 18
+Final FlexGMRES Relative Residual Norm = 4.133851e-09
+
+# Output file: solvers.out.324
+BoomerAMG Iterations = 8
+Final Relative Residual Norm = 8.380440e-09
+
+# Output file: solvers.out.325
+BoomerAMG Iterations = 7
+Final Relative Residual Norm = 7.074639e-09
+
diff --git a/external/hypre/src/test/TEST_ij/ilu.saved.aurora b/external/hypre/src/test/TEST_ij/ilu.saved.aurora
new file mode 100644
index 00000000..5bf054d2
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/ilu.saved.aurora
@@ -0,0 +1,104 @@
+# Output file: ilu.out.300
+hypre_ILU Iterations = 85
+Final Relative Residual Norm = 9.266245e-09
+
+# Output file: ilu.out.301
+hypre_ILU Iterations = 40
+Final Relative Residual Norm = 9.772377e-09
+
+# Output file: ilu.out.302
+hypre_ILU Iterations = 23
+Final Relative Residual Norm = 5.512717e-09
+
+# Output file: ilu.out.303
+hypre_ILU Iterations = 64
+Final Relative Residual Norm = 8.558468e-09
+
+# Output file: ilu.out.304
+hypre_ILU Iterations = 52
+Final Relative Residual Norm = 9.189235e-09
+
+# Output file: ilu.out.305
+hypre_ILU Iterations = 39
+Final Relative Residual Norm = 8.838452e-09
+
+# Output file: ilu.out.306
+hypre_ILU Iterations = 27
+Final Relative Residual Norm = 6.194020e-09
+
+# Output file: ilu.out.307
+hypre_ILU Iterations = 39
+Final Relative Residual Norm = 6.866281e-09
+
+# Output file: ilu.out.308
+hypre_ILU Iterations = 27
+Final Relative Residual Norm = 9.107681e-09
+
+# Output file: ilu.out.309
+hypre_ILU Iterations = 49
+Final Relative Residual Norm = 7.072947e-09
+
+# Output file: ilu.out.310
+hypre_ILU Iterations = 42
+Final Relative Residual Norm = 6.699477e-09
+
+# Output file: ilu.out.311
+hypre_ILU Iterations = 36
+Final Relative Residual Norm = 6.392185e-09
+
+# Output file: ilu.out.312
+hypre_ILU Iterations = 24
+Final Relative Residual Norm = 5.953652e-09
+
+# Output file: ilu.out.313
+GMRES Iterations = 25
+Final GMRES Relative Residual Norm = 3.968804e-09
+
+# Output file: ilu.out.314
+GMRES Iterations = 19
+Final GMRES Relative Residual Norm = 7.026445e-09
+
+# Output file: ilu.out.315
+GMRES Iterations = 20
+Final GMRES Relative Residual Norm = 7.908624e-09
+
+# Output file: ilu.out.316
+GMRES Iterations = 13
+Final GMRES Relative Residual Norm = 7.969372e-09
+
+# Output file: ilu.out.317
+FlexGMRES Iterations = 17
+Final FlexGMRES Relative Residual Norm = 7.140004e-09
+
+# Output file: ilu.out.318
+FlexGMRES Iterations = 9
+Final FlexGMRES Relative Residual Norm = 9.362787e-09
+
+# Output file: ilu.out.319
+FlexGMRES Iterations = 17
+Final FlexGMRES Relative Residual Norm = 8.299377e-09
+
+# Output file: ilu.out.320
+FlexGMRES Iterations = 9
+Final FlexGMRES Relative Residual Norm = 3.716965e-09
+
+# Output file: ilu.out.321
+FlexGMRES Iterations = 17
+Final FlexGMRES Relative Residual Norm = 4.489256e-09
+
+# Output file: ilu.out.322
+FlexGMRES Iterations = 8
+Final FlexGMRES Relative Residual Norm = 3.082447e-09
+
+# Output file: ilu.out.323
+FlexGMRES Iterations = 18
+Final FlexGMRES Relative Residual Norm = 3.782082e-09
+
+# Output file: ilu.out.324
+BoomerAMG Iterations = 10
+Final Relative Residual Norm = 7.955485e-09
+
+# Output file: ilu.out.325
+BoomerAMG Iterations = 9
+Final Relative Residual Norm = 2.327436e-09
+
diff --git a/external/hypre/src/test/TEST_ij/ilu.saved.lassen b/external/hypre/src/test/TEST_ij/ilu.saved.lassen
new file mode 100644
index 00000000..ba77e785
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/ilu.saved.lassen
@@ -0,0 +1,104 @@
+# Output file: solvers.out.300
+hypre_ILU Iterations = 85
+Final Relative Residual Norm = 9.266244e-09
+
+# Output file: solvers.out.301
+hypre_ILU Iterations = 40
+Final Relative Residual Norm = 9.772377e-09
+
+# Output file: solvers.out.302
+hypre_ILU Iterations = 23
+Final Relative Residual Norm = 5.512717e-09
+
+# Output file: solvers.out.303
+hypre_ILU Iterations = 64
+Final Relative Residual Norm = 8.558467e-09
+
+# Output file: solvers.out.304
+hypre_ILU Iterations = 52
+Final Relative Residual Norm = 9.189235e-09
+
+# Output file: solvers.out.305
+hypre_ILU Iterations = 39
+Final Relative Residual Norm = 8.838452e-09
+
+# Output file: solvers.out.306
+hypre_ILU Iterations = 27
+Final Relative Residual Norm = 6.194020e-09
+
+# Output file: solvers.out.307
+hypre_ILU Iterations = 39
+Final Relative Residual Norm = 6.866281e-09
+
+# Output file: solvers.out.308
+hypre_ILU Iterations = 27
+Final Relative Residual Norm = 9.107681e-09
+
+# Output file: solvers.out.309
+hypre_ILU Iterations = 49
+Final Relative Residual Norm = 7.072947e-09
+
+# Output file: solvers.out.310
+hypre_ILU Iterations = 42
+Final Relative Residual Norm = 6.699477e-09
+
+# Output file: solvers.out.311
+hypre_ILU Iterations = 35
+Final Relative Residual Norm = 6.392185e-09
+
+# Output file: solvers.out.312
+hypre_ILU Iterations = 23
+Final Relative Residual Norm = 5.953652e-09
+
+# Output file: solvers.out.313
+GMRES Iterations = 25
+Final GMRES Relative Residual Norm = 3.968804e-09
+
+# Output file: solvers.out.314
+GMRES Iterations = 19
+Final GMRES Relative Residual Norm = 7.026445e-09
+
+# Output file: solvers.out.315
+GMRES Iterations = 20
+Final GMRES Relative Residual Norm = 7.908624e-09
+
+# Output file: solvers.out.316
+GMRES Iterations = 13
+Final GMRES Relative Residual Norm = 7.969372e-09
+
+# Output file: solvers.out.317
+FlexGMRES Iterations = 17
+Final FlexGMRES Relative Residual Norm = 7.140004e-09
+
+# Output file: solvers.out.318
+FlexGMRES Iterations = 9
+Final FlexGMRES Relative Residual Norm = 9.362787e-09
+
+# Output file: solvers.out.319
+FlexGMRES Iterations = 17
+Final FlexGMRES Relative Residual Norm = 8.299377e-09
+
+# Output file: solvers.out.320
+FlexGMRES Iterations = 9
+Final FlexGMRES Relative Residual Norm = 3.716965e-09
+
+# Output file: solvers.out.321
+FlexGMRES Iterations = 17
+Final FlexGMRES Relative Residual Norm = 4.489256e-09
+
+# Output file: solvers.out.322
+FlexGMRES Iterations = 9
+Final FlexGMRES Relative Residual Norm = 3.082447e-09
+
+# Output file: solvers.out.323
+FlexGMRES Iterations = 18
+Final FlexGMRES Relative Residual Norm = 3.782082e-09
+
+# Output file: solvers.out.324
+BoomerAMG Iterations = 11
+Final Relative Residual Norm = 3.641397e-09
+
+# Output file: solvers.out.325
+BoomerAMG Iterations = 9
+Final Relative Residual Norm = 3.551558e-09
+
diff --git a/external/hypre/src/test/TEST_ij/ilu.saved.lassen_cpu b/external/hypre/src/test/TEST_ij/ilu.saved.lassen_cpu
new file mode 100644
index 00000000..7384d8e8
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/ilu.saved.lassen_cpu
@@ -0,0 +1,104 @@
+# Output file: ilu.out.300
+hypre_ILU Iterations = 85
+Final Relative Residual Norm = 9.266244e-09
+
+# Output file: ilu.out.301
+hypre_ILU Iterations = 40
+Final Relative Residual Norm = 9.772377e-09
+
+# Output file: ilu.out.302
+hypre_ILU Iterations = 23
+Final Relative Residual Norm = 5.512717e-09
+
+# Output file: ilu.out.303
+hypre_ILU Iterations = 64
+Final Relative Residual Norm = 8.558467e-09
+
+# Output file: ilu.out.304
+hypre_ILU Iterations = 52
+Final Relative Residual Norm = 9.189235e-09
+
+# Output file: ilu.out.305
+hypre_ILU Iterations = 38
+Final Relative Residual Norm = 7.024121e-09
+
+# Output file: ilu.out.306
+hypre_ILU Iterations = 26
+Final Relative Residual Norm = 7.556742e-09
+
+# Output file: ilu.out.307
+hypre_ILU Iterations = 38
+Final Relative Residual Norm = 7.037599e-09
+
+# Output file: ilu.out.308
+hypre_ILU Iterations = 26
+Final Relative Residual Norm = 7.593126e-09
+
+# Output file: ilu.out.309
+hypre_ILU Iterations = 49
+Final Relative Residual Norm = 7.072947e-09
+
+# Output file: ilu.out.310
+hypre_ILU Iterations = 42
+Final Relative Residual Norm = 6.699477e-09
+
+# Output file: ilu.out.311
+hypre_ILU Iterations = 36
+Final Relative Residual Norm = 6.392185e-09
+
+# Output file: ilu.out.312
+hypre_ILU Iterations = 24
+Final Relative Residual Norm = 5.953652e-09
+
+# Output file: ilu.out.313
+GMRES Iterations = 25
+Final GMRES Relative Residual Norm = 3.968804e-09
+
+# Output file: ilu.out.314
+GMRES Iterations = 19
+Final GMRES Relative Residual Norm = 7.026446e-09
+
+# Output file: ilu.out.315
+GMRES Iterations = 20
+Final GMRES Relative Residual Norm = 7.908624e-09
+
+# Output file: ilu.out.316
+GMRES Iterations = 13
+Final GMRES Relative Residual Norm = 7.969372e-09
+
+# Output file: ilu.out.317
+FlexGMRES Iterations = 17
+Final FlexGMRES Relative Residual Norm = 9.152443e-09
+
+# Output file: ilu.out.318
+FlexGMRES Iterations = 9
+Final FlexGMRES Relative Residual Norm = 5.768784e-09
+
+# Output file: ilu.out.319
+FlexGMRES Iterations = 17
+Final FlexGMRES Relative Residual Norm = 9.133102e-09
+
+# Output file: ilu.out.320
+FlexGMRES Iterations = 9
+Final FlexGMRES Relative Residual Norm = 6.299457e-09
+
+# Output file: ilu.out.321
+FlexGMRES Iterations = 17
+Final FlexGMRES Relative Residual Norm = 4.489256e-09
+
+# Output file: ilu.out.322
+FlexGMRES Iterations = 8
+Final FlexGMRES Relative Residual Norm = 3.082447e-09
+
+# Output file: ilu.out.323
+FlexGMRES Iterations = 18
+Final FlexGMRES Relative Residual Norm = 4.133851e-09
+
+# Output file: ilu.out.324
+BoomerAMG Iterations = 8
+Final Relative Residual Norm = 8.314480e-09
+
+# Output file: ilu.out.325
+BoomerAMG Iterations = 7
+Final Relative Residual Norm = 7.035763e-09
+
diff --git a/external/hypre/src/test/TEST_ij/ilu.sh b/external/hypre/src/test/TEST_ij/ilu.sh
new file mode 100755
index 00000000..df64a4dc
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/ilu.sh
@@ -0,0 +1,56 @@
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+TNAME=`basename $0 .sh`
+RTOL=$1
+ATOL=$2
+
+FILES="\
+ ${TNAME}.out.300\
+ ${TNAME}.out.301\
+ ${TNAME}.out.302\
+ ${TNAME}.out.303\
+ ${TNAME}.out.304\
+ ${TNAME}.out.305\
+ ${TNAME}.out.306\
+ ${TNAME}.out.307\
+ ${TNAME}.out.308\
+ ${TNAME}.out.309\
+ ${TNAME}.out.310\
+ ${TNAME}.out.311\
+ ${TNAME}.out.312\
+ ${TNAME}.out.313\
+ ${TNAME}.out.314\
+ ${TNAME}.out.315\
+ ${TNAME}.out.316\
+ ${TNAME}.out.317\
+ ${TNAME}.out.318\
+ ${TNAME}.out.319\
+ ${TNAME}.out.320\
+ ${TNAME}.out.321\
+ ${TNAME}.out.322\
+ ${TNAME}.out.323\
+ ${TNAME}.out.324\
+ ${TNAME}.out.325\
+"
+
+for i in $FILES
+do
+  echo "# Output file: $i"
+  tail -3 $i
+done > ${TNAME}.out
+
+# Make sure that the output file is reasonable
+RUNCOUNT=`echo $FILES | wc -w`
+OUTCOUNT=`grep "Iterations" ${TNAME}.out | wc -l`
+if [ "$OUTCOUNT" != "$RUNCOUNT" ]; then
+   echo "Incorrect number of runs in ${TNAME}.out" >&2
+fi
+
+#=============================================================================
+# remove temporary files
+#=============================================================================
+
diff --git a/external/hypre/src/test/TEST_ij/interp.jobs b/external/hypre/src/test/TEST_ij/interp.jobs
old mode 100644
new mode 100755
index d525778f..a704b601
--- a/external/hypre/src/test/TEST_ij/interp.jobs
+++ b/external/hypre/src/test/TEST_ij/interp.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -44,4 +44,14 @@ mpirun -np 4  ./ij -rhsrand -n 15 15 10 -P 2 2 1 -interptype 16 -Pmx 12 \
 mpirun -np 4  ./ij -rhsrand -n 15 15 10 -P 2 2 1 -interptype 17 \
  > interp.out.8
 
+mpirun -np 4 ./ij -rhsrand -n 8 8 8 -sysL 2 -nf 2 -interptype 15 \
+ > interp.out.9
 
+mpirun -np 4 ./ij -rhsrand -n 8 8 8 -sysL 2 -nf 2 -interptype 16 \
+ > interp.out.10
+
+mpirun -np 4 ./ij -rhsrand -n 8 8 8 -sysL 2 -nf 2 -interptype 17 \
+ > interp.out.11
+
+mpirun -np 4 ./ij -rhsrand -n 8 8 8 -sysL 2 -nf 2 -interptype 18 \
+ > interp.out.12
diff --git a/external/hypre/src/test/TEST_ij/interp.saved b/external/hypre/src/test/TEST_ij/interp.saved
index 8c2a926e..0fb2fa5a 100644
--- a/external/hypre/src/test/TEST_ij/interp.saved
+++ b/external/hypre/src/test/TEST_ij/interp.saved
@@ -61,3 +61,30 @@
                 operator = 2.681224
                    cycle = 5.360748
 
+# Output file: interp.out.9
+ Average Convergence Factor = 0.522598
+
+     Complexity:    grid = 1.489258
+                operator = 2.126953
+                   cycle = 4.251953
+
+# Output file: interp.out.10
+ Average Convergence Factor = 0.467057
+
+     Complexity:    grid = 1.474609
+                operator = 2.478906
+                   cycle = 4.957109
+
+# Output file: interp.out.11
+ Average Convergence Factor = 0.423068
+
+     Complexity:    grid = 1.478516
+                operator = 2.503750
+                   cycle = 5.005547
+
+# Output file: interp.out.12
+ Average Convergence Factor = 0.428721
+
+     Complexity:    grid = 1.479492
+                operator = 2.506016
+                   cycle = 5.010078
diff --git a/external/hypre/src/test/TEST_ij/interp.saved.aurora b/external/hypre/src/test/TEST_ij/interp.saved.aurora
new file mode 100644
index 00000000..3defe781
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/interp.saved.aurora
@@ -0,0 +1,91 @@
+# Output file: interp.out.0
+ Average Convergence Factor = 0.473381
+
+     Complexity:    grid = 1.397778
+                operator = 3.521837
+                   cycle = 7.043061
+
+# Output file: interp.out.1
+ Average Convergence Factor = 0.474675
+
+     Complexity:    grid = 1.400444
+                operator = 3.456939
+                   cycle = 6.912177
+
+# Output file: interp.out.2
+ Average Convergence Factor = 0.472783
+
+     Complexity:    grid = 1.398667
+                operator = 3.508095
+                   cycle = 7.015102
+
+# Output file: interp.out.3
+ Average Convergence Factor = 0.469524
+
+     Complexity:    grid = 1.410222
+                operator = 2.566327
+                   cycle = 5.131565
+
+# Output file: interp.out.4
+ Average Convergence Factor = 0.474961
+
+     Complexity:    grid = 1.409778
+                operator = 2.539456
+                   cycle = 5.075578
+
+# Output file: interp.out.5
+ Average Convergence Factor = 0.484045
+
+     Complexity:    grid = 1.403111
+                operator = 2.556667
+                   cycle = 5.113061
+
+# Output file: interp.out.6
+ Average Convergence Factor = 0.284534
+
+     Complexity:    grid = 1.716889
+                operator = 3.594082
+                   cycle = 7.186463
+
+# Output file: interp.out.7
+ Average Convergence Factor = 0.508605
+
+     Complexity:    grid = 1.412889
+                operator = 3.766871
+                   cycle = 7.531293
+
+# Output file: interp.out.8
+ Average Convergence Factor = 0.469524
+
+     Complexity:    grid = 1.410222
+                operator = 2.566327
+                   cycle = 5.131565
+
+# Output file: interp.out.9
+ Average Convergence Factor = 0.795761
+
+     Complexity:    grid = 1.460938
+                operator = 2.152031
+                   cycle = 4.303359
+
+# Output file: interp.out.10
+ Average Convergence Factor = 0.795949
+
+     Complexity:    grid = 1.447266
+                operator = 2.585625
+                   cycle = 5.170547
+
+# Output file: interp.out.11
+ Average Convergence Factor = 0.764146
+
+     Complexity:    grid = 1.429688
+                operator = 2.505000
+                   cycle = 5.005000
+
+# Output file: interp.out.12
+ Average Convergence Factor = 0.764224
+
+     Complexity:    grid = 1.429688
+                operator = 2.502813
+                   cycle = 5.000625
+
diff --git a/external/hypre/src/test/TEST_ij/interp.saved.lassen b/external/hypre/src/test/TEST_ij/interp.saved.lassen
index 834391cc..6fc8c9bf 100644
--- a/external/hypre/src/test/TEST_ij/interp.saved.lassen
+++ b/external/hypre/src/test/TEST_ij/interp.saved.lassen
@@ -20,25 +20,25 @@
                    cycle = 7.073741
 
 # Output file: interp.out.3
- Average Convergence Factor = 0.465899
+ Average Convergence Factor = 0.467056
 
-     Complexity:    grid = 1.412889
-                operator = 2.571633
-                   cycle = 5.142177
+     Complexity:    grid = 1.408889
+                operator = 2.556327
+                   cycle = 5.110952
 
 # Output file: interp.out.4
- Average Convergence Factor = 0.467607
+ Average Convergence Factor = 0.468315
 
-     Complexity:    grid = 1.409778
-                operator = 2.547347
-                   cycle = 5.094082
+     Complexity:    grid = 1.406667
+                operator = 2.531361
+                   cycle = 5.062109
 
 # Output file: interp.out.5
- Average Convergence Factor = 0.486364
+ Average Convergence Factor = 0.482765
 
-     Complexity:    grid = 1.402222
-                operator = 2.533810
-                   cycle = 5.066531
+     Complexity:    grid = 1.404444
+                operator = 2.561361
+                   cycle = 5.122109
 
 # Output file: interp.out.6
  Average Convergence Factor = 0.284534
@@ -55,9 +55,36 @@
                    cycle = 7.536871
 
 # Output file: interp.out.8
- Average Convergence Factor = 0.465899
+ Average Convergence Factor = 0.467056
 
-     Complexity:    grid = 1.412889
-                operator = 2.571633
-                   cycle = 5.142177
+     Complexity:    grid = 1.408889
+                operator = 2.556327
+                   cycle = 5.110952
 
+# Output file: interp.out.9
+ Average Convergence Factor = 0.790196
+
+     Complexity:    grid = 1.487305
+                operator = 2.181797
+                   cycle = 4.363281
+
+# Output file: interp.out.10
+ Average Convergence Factor = 0.797378
+
+     Complexity:    grid = 1.471680
+                operator = 2.534453
+                   cycle = 5.068203
+
+# Output file: interp.out.11
+ Average Convergence Factor = 0.767811
+
+     Complexity:    grid = 1.469727
+                operator = 2.535234
+                   cycle = 5.070156
+
+# Output file: interp.out.12
+ Average Convergence Factor = 0.767716
+
+     Complexity:    grid = 1.465820
+                operator = 2.527891
+                   cycle = 5.049453
diff --git a/external/hypre/src/test/TEST_ij/interp.saved.lassen_cpu b/external/hypre/src/test/TEST_ij/interp.saved.lassen_cpu
new file mode 100644
index 00000000..21ffacf8
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/interp.saved.lassen_cpu
@@ -0,0 +1,90 @@
+# Output file: interp.out.0
+ Average Convergence Factor = 0.199088
+
+     Complexity:    grid = 1.571556
+                operator = 2.973333
+                   cycle = 5.944218
+
+# Output file: interp.out.1
+ Average Convergence Factor = 0.197964
+
+     Complexity:    grid = 1.580000
+                operator = 2.885102
+                   cycle = 5.765850
+
+# Output file: interp.out.2
+ Average Convergence Factor = 0.181048
+
+     Complexity:    grid = 1.572889
+                operator = 2.983469
+                   cycle = 5.966327
+
+# Output file: interp.out.3
+ Average Convergence Factor = 0.194064
+
+     Complexity:    grid = 1.587556
+                operator = 2.683946
+                   cycle = 5.365442
+
+# Output file: interp.out.4
+ Average Convergence Factor = 0.195128
+
+     Complexity:    grid = 1.588444
+                operator = 2.627483
+                   cycle = 5.252517
+
+# Output file: interp.out.5
+ Average Convergence Factor = 0.203480
+
+     Complexity:    grid = 1.582667
+                operator = 2.662245
+                   cycle = 5.324218
+
+# Output file: interp.out.6
+ Average Convergence Factor = 0.166090
+
+     Complexity:    grid = 1.713333
+                operator = 3.541020
+                   cycle = 7.080340
+
+# Output file: interp.out.7
+ Average Convergence Factor = 0.219604
+
+     Complexity:    grid = 1.571556
+                operator = 2.958639
+                   cycle = 5.916190
+
+# Output file: interp.out.8
+ Average Convergence Factor = 0.194359
+
+     Complexity:    grid = 1.586667
+                operator = 2.681224
+                   cycle = 5.360748
+
+# Output file: interp.out.9
+ Average Convergence Factor = 0.522598
+
+     Complexity:    grid = 1.489258
+                operator = 2.126953
+                   cycle = 4.251953
+
+# Output file: interp.out.10
+ Average Convergence Factor = 0.467547
+
+     Complexity:    grid = 1.472656
+                operator = 2.464844
+                   cycle = 4.928984
+
+# Output file: interp.out.11
+ Average Convergence Factor = 0.423068
+
+     Complexity:    grid = 1.478516
+                operator = 2.503750
+                   cycle = 5.005547
+
+# Output file: interp.out.12
+ Average Convergence Factor = 0.428721
+
+     Complexity:    grid = 1.479492
+                operator = 2.506016
+                   cycle = 5.010078
diff --git a/external/hypre/src/test/TEST_ij/interp.saved.ray b/external/hypre/src/test/TEST_ij/interp.saved.ray
deleted file mode 100644
index 834391cc..00000000
--- a/external/hypre/src/test/TEST_ij/interp.saved.ray
+++ /dev/null
@@ -1,63 +0,0 @@
-# Output file: interp.out.0
- Average Convergence Factor = 0.468023
-
-     Complexity:    grid = 1.400000
-                operator = 3.557007
-                   cycle = 7.113401
-
-# Output file: interp.out.1
- Average Convergence Factor = 0.468239
-
-     Complexity:    grid = 1.401778
-                operator = 3.477007
-                   cycle = 6.952313
-
-# Output file: interp.out.2
- Average Convergence Factor = 0.472049
-
-     Complexity:    grid = 1.399111
-                operator = 3.537415
-                   cycle = 7.073741
-
-# Output file: interp.out.3
- Average Convergence Factor = 0.465899
-
-     Complexity:    grid = 1.412889
-                operator = 2.571633
-                   cycle = 5.142177
-
-# Output file: interp.out.4
- Average Convergence Factor = 0.467607
-
-     Complexity:    grid = 1.409778
-                operator = 2.547347
-                   cycle = 5.094082
-
-# Output file: interp.out.5
- Average Convergence Factor = 0.486364
-
-     Complexity:    grid = 1.402222
-                operator = 2.533810
-                   cycle = 5.066531
-
-# Output file: interp.out.6
- Average Convergence Factor = 0.284534
-
-     Complexity:    grid = 1.716889
-                operator = 3.594082
-                   cycle = 7.186463
-
-# Output file: interp.out.7
- Average Convergence Factor = 0.486438
-
-     Complexity:    grid = 1.411556
-                operator = 3.768980
-                   cycle = 7.536871
-
-# Output file: interp.out.8
- Average Convergence Factor = 0.465899
-
-     Complexity:    grid = 1.412889
-                operator = 2.571633
-                   cycle = 5.142177
-
diff --git a/external/hypre/src/test/TEST_ij/interp.sh b/external/hypre/src/test/TEST_ij/interp.sh
old mode 100644
new mode 100755
index 235a2298..c82954be
--- a/external/hypre/src/test/TEST_ij/interp.sh
+++ b/external/hypre/src/test/TEST_ij/interp.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -22,6 +22,10 @@ FILES="\
  ${TNAME}.out.6\
  ${TNAME}.out.7\
  ${TNAME}.out.8\
+ ${TNAME}.out.9\
+ ${TNAME}.out.10\
+ ${TNAME}.out.11\
+ ${TNAME}.out.12\
 "
 
 for i in $FILES
diff --git a/external/hypre/src/test/TEST_ij/io.jobs b/external/hypre/src/test/TEST_ij/io.jobs
new file mode 100755
index 00000000..dcd36240
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/io.jobs
@@ -0,0 +1,71 @@
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+#=============================================================================
+# IJ input tests - Sequential
+#=============================================================================
+
+mpirun -np 1 ./ij -solver 2 -tol 1e-2 \
+ -frombinfile data/poisson_10x10x10_np1/IJ.A.i4f8 \
+ -rhsfrombinfile data/poisson_10x10x10_np1/IJ.b.i4f8 \
+ -x0frombinfile data/poisson_10x10x10_np1/IJ.x0.i4f8 > io.out.0
+
+mpirun -np 1 ./ij -solver 2 -tol 1e-2 \
+ -frombinfile data/poisson_10x10x10_np1/IJ.A.i8f8 \
+ -rhsfrombinfile data/poisson_10x10x10_np1/IJ.b.i8f8 \
+ -x0frombinfile data/poisson_10x10x10_np1/IJ.x0.i8f8 > io.out.1
+
+mpirun -np 1 ./ij -solver 2 -tol 1e-2 \
+ -frombinfile data/poisson_10x10x10_np1/IJ.A.i4f4 \
+ -rhsfrombinfile data/poisson_10x10x10_np1/IJ.b.i4f4 \
+ -x0frombinfile data/poisson_10x10x10_np1/IJ.x0.i4f4 > io.out.2
+
+mpirun -np 1 ./ij -solver 2 -tol 1e-2 \
+ -frombinfile data/poisson_10x10x10_np1/IJ.A.i8f4 \
+ -rhsfrombinfile data/poisson_10x10x10_np1/IJ.b.i8f4 \
+ -x0frombinfile data/poisson_10x10x10_np1/IJ.x0.i8f4 > io.out.3
+
+#=============================================================================
+# IJ output tests - Sequential
+#=============================================================================
+
+mpirun -np 1 ./ij -solver 2 -tol 1e-2 -printbin > io.out.50
+mpirun -np 1 ./ij -solver 2 -tol 1e-2 -printbin \
+ -frombinfile IJ.out.A -rhsfrombinfile IJ.out.b \
+ -x0frombinfile IJ.out.x0 > io.out.51
+
+#=============================================================================
+# IJ input tests - Parallel
+#=============================================================================
+
+mpirun -np 4 ./ij -solver 2 -tol 1e-2 \
+ -frombinfile data/poisson_10x10x10_np4/IJ.A.i4f8 \
+ -rhsfrombinfile data/poisson_10x10x10_np4/IJ.b.i4f8 \
+ -x0frombinfile data/poisson_10x10x10_np4/IJ.x0.i4f8 > io.out.100
+
+mpirun -np 4 ./ij -solver 2 -tol 1e-2 \
+ -frombinfile data/poisson_10x10x10_np4/IJ.A.i8f8 \
+ -rhsfrombinfile data/poisson_10x10x10_np4/IJ.b.i8f8 \
+ -x0frombinfile data/poisson_10x10x10_np4/IJ.x0.i8f8 > io.out.101
+
+mpirun -np 4 ./ij -solver 2 -tol 1e-2 \
+ -frombinfile data/poisson_10x10x10_np4/IJ.A.i4f4 \
+ -rhsfrombinfile data/poisson_10x10x10_np4/IJ.b.i4f4 \
+ -x0frombinfile data/poisson_10x10x10_np4/IJ.x0.i4f4 > io.out.102
+
+mpirun -np 4 ./ij -solver 2 -tol 1e-2 \
+ -frombinfile data/poisson_10x10x10_np4/IJ.A.i8f4 \
+ -rhsfrombinfile data/poisson_10x10x10_np4/IJ.b.i8f4 \
+ -x0frombinfile data/poisson_10x10x10_np4/IJ.x0.i8f4 > io.out.103
+
+#=============================================================================
+# IJ output tests - Sequential
+#=============================================================================
+
+mpirun -np 4 ./ij -solver 2 -tol 1e-2 -printbin > io.out.150
+mpirun -np 4 ./ij -solver 2 -tol 1e-2 -printbin \
+ -frombinfile IJ.out.A -rhsfrombinfile IJ.out.b \
+ -x0frombinfile IJ.out.x0 > io.out.151
diff --git a/external/hypre/src/test/TEST_ij/io.saved b/external/hypre/src/test/TEST_ij/io.saved
new file mode 100644
index 00000000..92c2ceac
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/io.saved
@@ -0,0 +1,47 @@
+# Output file: solvers.out.0
+Iterations = 11
+Final Relative Residual Norm = 6.733697e-03
+
+# Output file: solvers.out.1
+Iterations = 11
+Final Relative Residual Norm = 6.733697e-03
+
+# Output file: solvers.out.2
+Iterations = 11
+Final Relative Residual Norm = 6.733697e-03
+
+# Output file: solvers.out.3
+Iterations = 11
+Final Relative Residual Norm = 6.733697e-03
+
+# Output file: solvers.out.50
+Iterations = 11
+Final Relative Residual Norm = 6.733697e-03
+
+# Output file: solvers.out.51
+Iterations = 11
+Final Relative Residual Norm = 6.733697e-03
+
+# Output file: solvers.out.100
+Iterations = 11
+Final Relative Residual Norm = 6.733697e-03
+
+# Output file: solvers.out.101
+Iterations = 11
+Final Relative Residual Norm = 6.733697e-03
+
+# Output file: solvers.out.102
+Iterations = 11
+Final Relative Residual Norm = 6.733697e-03
+
+# Output file: solvers.out.103
+Iterations = 11
+Final Relative Residual Norm = 6.733697e-03
+
+# Output file: solvers.out.150
+Iterations = 11
+Final Relative Residual Norm = 6.733697e-03
+
+# Output file: solvers.out.151
+Iterations = 11
+Final Relative Residual Norm = 6.733697e-03
diff --git a/external/hypre/src/test/TEST_ij/io.sh b/external/hypre/src/test/TEST_ij/io.sh
new file mode 100755
index 00000000..922556ad
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/io.sh
@@ -0,0 +1,43 @@
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+TNAME=`basename $0 .sh`
+RTOL=$1
+ATOL=$2
+
+FILES="\
+ ${TNAME}.out.0\
+ ${TNAME}.out.1\
+ ${TNAME}.out.2\
+ ${TNAME}.out.3\
+ ${TNAME}.out.50\
+ ${TNAME}.out.51\
+ ${TNAME}.out.100\
+ ${TNAME}.out.101\
+ ${TNAME}.out.102\
+ ${TNAME}.out.103\
+ ${TNAME}.out.150\
+ ${TNAME}.out.151\
+"
+
+for i in $FILES
+do
+  echo "# Output file: $i"
+  tail -3 $i
+done > ${TNAME}.out
+
+# Make sure that the output file is reasonable
+RUNCOUNT=`echo $FILES | wc -w`
+OUTCOUNT=`grep "Iterations" ${TNAME}.out | wc -l`
+if [ "$OUTCOUNT" != "$RUNCOUNT" ]; then
+   echo "Incorrect number of runs in ${TNAME}.out" >&2
+fi
+
+#=============================================================================
+# remove temporary files
+#=============================================================================
+
+rm -rf IJ.out.A.0000?.bin IJ.out.b.0000?.bin IJ.out.x0.0000?.bin IJ.out.x.0000?.bin
diff --git a/external/hypre/src/test/TEST_ij/lazy.jobs b/external/hypre/src/test/TEST_ij/lazy.jobs
new file mode 100755
index 00000000..a7c7045e
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/lazy.jobs
@@ -0,0 +1,16 @@
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+#=============================================================================
+# Test library lazy initialization (sequential and parallel)
+#=============================================================================
+
+mpirun -np 1 ./ij                         > lazy.out.1.a
+mpirun -np 1 ./ij -lazy_device_init 1     > lazy.out.1.b
+
+mpirun -np 4 ./ij                         > lazy.out.2.a
+mpirun -np 4 ./ij -lazy_device_init 1     > lazy.out.2.b
+
diff --git a/external/hypre/src/test/TEST_ij/lazy.sh b/external/hypre/src/test/TEST_ij/lazy.sh
new file mode 100755
index 00000000..6fe3822b
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/lazy.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+TNAME=`basename $0 .sh`
+
+tail -3 ${TNAME}.out.1.a | head -2 > ${TNAME}.testdata
+tail -3 ${TNAME}.out.1.b | head -2 > ${TNAME}.testdata.temp
+
+# Abuse HYPRE_NO_SAVED to skip the following diff with OMP
+if [ -z $HYPRE_NO_SAVED ]; then
+   diff ${TNAME}.testdata ${TNAME}.testdata.temp >&2
+fi
+
+tail -3 ${TNAME}.out.2.a | head -2 > ${TNAME}.testdata
+tail -3 ${TNAME}.out.2.b | head -2 > ${TNAME}.testdata.temp
+
+# Abuse HYPRE_NO_SAVED to skip the following diff with OMP
+if [ -z $HYPRE_NO_SAVED ]; then
+   diff ${TNAME}.testdata ${TNAME}.testdata.temp >&2
+fi
+
+#=============================================================================
+# remove temporary files
+#=============================================================================
+
+rm -f ${TNAME}.testdata*
diff --git a/external/hypre/src/test/TEST_ij/matrix.jobs b/external/hypre/src/test/TEST_ij/matrix.jobs
old mode 100644
new mode 100755
index 902651d8..9658073f
--- a/external/hypre/src/test/TEST_ij/matrix.jobs
+++ b/external/hypre/src/test/TEST_ij/matrix.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -33,3 +33,25 @@ mpirun -np 2 ./ij -test_ij -solver 2 -tol 0 -max_iter 5 -chunk 1 -omp 1 > matrix
 mpirun -np 3 ./ij -fromfile test.A -rhsfromfile test.b > matrix.out.11
 
 mpirun -np 2 ./ij -test_ij -solver 2 -tol 0 -max_iter 5 -chunk 1 -add 1 -check_constant 1 > matrix.out.12
+
+#=============================================================================
+# Test matrix scaling. Solver: BJ-GMRES
+#=============================================================================
+
+# Sequential - Left scaling
+mpirun -np 1 ./ij -fromfile data/beam_tet_dof459_np1/A.IJ  -solver 4 -tol 1e-2 -k 100 -test_scaling 1 > matrix.out.100
+
+# Sequential - Right scaling
+mpirun -np 1 ./ij -fromfile data/beam_tet_dof459_np1/A.IJ  -solver 4 -tol 1e-2 -k 100 -test_scaling 2 > matrix.out.101
+
+# Sequential - Left and right scaling
+mpirun -np 1 ./ij -fromfile data/beam_tet_dof459_np1/A.IJ  -solver 4 -tol 1e-2 -k 100 -test_scaling 3 > matrix.out.102
+
+# Parallel - Left scaling
+mpirun -np 4 ./ij -fromfile data/beam_tet_dof2475_np4/A.IJ -solver 4 -tol 9e-1 -k 100 -test_scaling 1 > matrix.out.110
+
+# Parallel - Right scaling
+mpirun -np 4 ./ij -fromfile data/beam_tet_dof2475_np4/A.IJ -solver 4 -tol 9e-1 -k 100 -test_scaling 2 > matrix.out.111
+
+# Parallel - Left and right scaling
+mpirun -np 4 ./ij -fromfile data/beam_tet_dof2475_np4/A.IJ -solver 4 -tol 9e-1 -k 100 -test_scaling 3 > matrix.out.112
diff --git a/external/hypre/src/test/TEST_ij/matrix.saved b/external/hypre/src/test/TEST_ij/matrix.saved
index 0dc9e2c9..ff6bd0c7 100644
--- a/external/hypre/src/test/TEST_ij/matrix.saved
+++ b/external/hypre/src/test/TEST_ij/matrix.saved
@@ -50,3 +50,26 @@ Final Relative Residual Norm = 2.638706e-09
 Iterations = 5
 Final Relative Residual Norm = 3.515462e-01
 
+# Output file: matrix.out.100
+GMRES Iterations = 79
+Final GMRES Relative Residual Norm = 9.996735e-03
+
+# Output file: matrix.out.101
+GMRES Iterations = 79
+Final GMRES Relative Residual Norm = 7.176706e-03
+
+# Output file: matrix.out.102
+GMRES Iterations = 74
+Final GMRES Relative Residual Norm = 7.155117e-03
+
+# Output file: matrix.out.110
+GMRES Iterations = 13
+Final GMRES Relative Residual Norm = 8.997992e-01
+
+# Output file: matrix.out.111
+GMRES Iterations = 35
+Final GMRES Relative Residual Norm = 8.909955e-01
+
+# Output file: matrix.out.112
+GMRES Iterations = 6
+Final GMRES Relative Residual Norm = 8.963555e-01
\ No newline at end of file
diff --git a/external/hypre/src/test/TEST_ij/matrix.saved.ray b/external/hypre/src/test/TEST_ij/matrix.saved.aurora
similarity index 54%
rename from external/hypre/src/test/TEST_ij/matrix.saved.ray
rename to external/hypre/src/test/TEST_ij/matrix.saved.aurora
index 46ff169c..1865584e 100644
--- a/external/hypre/src/test/TEST_ij/matrix.saved.ray
+++ b/external/hypre/src/test/TEST_ij/matrix.saved.aurora
@@ -1,14 +1,14 @@
 # Output file: matrix.out.0
-BoomerAMG Iterations = 25
-Final Relative Residual Norm = 5.900046e-09
+BoomerAMG Iterations = 24
+Final Relative Residual Norm = 6.703514e-09
 
 # Output file: matrix.out.1
-BoomerAMG Iterations = 25
-Final Relative Residual Norm = 5.900046e-09
+BoomerAMG Iterations = 24
+Final Relative Residual Norm = 6.703514e-09
 
 # Output file: matrix.out.2
-BoomerAMG Iterations = 25
-Final Relative Residual Norm = 5.900046e-09
+BoomerAMG Iterations = 24
+Final Relative Residual Norm = 6.703514e-09
 
 # Output file: matrix.out.3
 BoomerAMG Iterations = 1
@@ -50,3 +50,27 @@ Final Relative Residual Norm = 3.055519e-09
 Iterations = 5
 Final Relative Residual Norm = 3.515462e-01
 
+# Output file: matrix.out.100
+GMRES Iterations = 79
+Final GMRES Relative Residual Norm = 9.996735e-03
+
+# Output file: matrix.out.101
+GMRES Iterations = 79
+Final GMRES Relative Residual Norm = 7.176706e-03
+
+# Output file: matrix.out.102
+GMRES Iterations = 74
+Final GMRES Relative Residual Norm = 7.155117e-03
+
+# Output file: matrix.out.110
+GMRES Iterations = 13
+Final GMRES Relative Residual Norm = 8.997992e-01
+
+# Output file: matrix.out.111
+GMRES Iterations = 35
+Final GMRES Relative Residual Norm = 8.909955e-01
+
+# Output file: matrix.out.112
+GMRES Iterations = 6
+Final GMRES Relative Residual Norm = 8.963555e-01
+
diff --git a/external/hypre/src/test/TEST_ij/matrix.saved.lassen b/external/hypre/src/test/TEST_ij/matrix.saved.lassen
index 46ff169c..fb90f62a 100644
--- a/external/hypre/src/test/TEST_ij/matrix.saved.lassen
+++ b/external/hypre/src/test/TEST_ij/matrix.saved.lassen
@@ -1,14 +1,14 @@
 # Output file: matrix.out.0
-BoomerAMG Iterations = 25
-Final Relative Residual Norm = 5.900046e-09
+BoomerAMG Iterations = 23
+Final Relative Residual Norm = 8.600534e-09
 
 # Output file: matrix.out.1
-BoomerAMG Iterations = 25
-Final Relative Residual Norm = 5.900046e-09
+BoomerAMG Iterations = 23
+Final Relative Residual Norm = 8.600534e-09
 
 # Output file: matrix.out.2
-BoomerAMG Iterations = 25
-Final Relative Residual Norm = 5.900046e-09
+BoomerAMG Iterations = 23
+Final Relative Residual Norm = 8.600534e-09
 
 # Output file: matrix.out.3
 BoomerAMG Iterations = 1
@@ -50,3 +50,26 @@ Final Relative Residual Norm = 3.055519e-09
 Iterations = 5
 Final Relative Residual Norm = 3.515462e-01
 
+# Output file: matrix.out.100
+GMRES Iterations = 79
+Final GMRES Relative Residual Norm = 9.996735e-03
+
+# Output file: matrix.out.101
+GMRES Iterations = 79
+Final GMRES Relative Residual Norm = 7.176706e-03
+
+# Output file: matrix.out.102
+GMRES Iterations = 74
+Final GMRES Relative Residual Norm = 7.155117e-03
+
+# Output file: matrix.out.110
+GMRES Iterations = 13
+Final GMRES Relative Residual Norm = 8.997992e-01
+
+# Output file: matrix.out.111
+GMRES Iterations = 35
+Final GMRES Relative Residual Norm = 8.909955e-01
+
+# Output file: matrix.out.112
+GMRES Iterations = 6
+Final GMRES Relative Residual Norm = 8.963555e-01
diff --git a/external/hypre/src/test/TEST_ij/matrix.saved.lassen_cpu b/external/hypre/src/test/TEST_ij/matrix.saved.lassen_cpu
new file mode 100644
index 00000000..924ae733
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/matrix.saved.lassen_cpu
@@ -0,0 +1,75 @@
+# Output file: matrix.out.0
+BoomerAMG Iterations = 11
+Final Relative Residual Norm = 4.156373e-09
+
+# Output file: matrix.out.1
+BoomerAMG Iterations = 11
+Final Relative Residual Norm = 4.156373e-09
+
+# Output file: matrix.out.2
+BoomerAMG Iterations = 11
+Final Relative Residual Norm = 4.156373e-09
+
+# Output file: matrix.out.3
+BoomerAMG Iterations = 1
+Final Relative Residual Norm = 0.000000e+00
+
+# Output file: matrix.out.4
+Iterations = 5
+Final Relative Residual Norm = 3.515462e-01
+
+# Output file: matrix.out.5
+Iterations = 5
+Final Relative Residual Norm = 4.233149e-01
+
+# Output file: matrix.out.6
+Iterations = 5
+Final Relative Residual Norm = 3.515462e-01
+
+# Output file: matrix.out.7
+Iterations = 5
+Final Relative Residual Norm = 3.515462e-01
+
+# Output file: matrix.out.8
+Iterations = 5
+Final Relative Residual Norm = 4.233149e-01
+
+# Output file: matrix.out.9
+Iterations = 5
+Final Relative Residual Norm = 3.515462e-01
+
+# Output file: matrix.out.10
+Iterations = 5
+Final Relative Residual Norm = 3.515462e-01
+
+# Output file: matrix.out.11
+BoomerAMG Iterations = 8
+Final Relative Residual Norm = 2.638706e-09
+
+# Output file: matrix.out.12
+Iterations = 5
+Final Relative Residual Norm = 3.515462e-01
+
+# Output file: matrix.out.100
+GMRES Iterations = 79
+Final GMRES Relative Residual Norm = 9.996735e-03
+
+# Output file: matrix.out.101
+GMRES Iterations = 79
+Final GMRES Relative Residual Norm = 7.176706e-03
+
+# Output file: matrix.out.102
+GMRES Iterations = 74
+Final GMRES Relative Residual Norm = 7.155117e-03
+
+# Output file: matrix.out.110
+GMRES Iterations = 13
+Final GMRES Relative Residual Norm = 8.997992e-01
+
+# Output file: matrix.out.111
+GMRES Iterations = 35
+Final GMRES Relative Residual Norm = 8.909955e-01
+
+# Output file: matrix.out.112
+GMRES Iterations = 6
+Final GMRES Relative Residual Norm = 8.963555e-01
diff --git a/external/hypre/src/test/TEST_ij/matrix.sh b/external/hypre/src/test/TEST_ij/matrix.sh
old mode 100644
new mode 100755
index 59b04eb0..7fb4c112
--- a/external/hypre/src/test/TEST_ij/matrix.sh
+++ b/external/hypre/src/test/TEST_ij/matrix.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -42,6 +42,12 @@ FILES="\
  ${TNAME}.out.10\
  ${TNAME}.out.11\
  ${TNAME}.out.12\
+ ${TNAME}.out.100\
+ ${TNAME}.out.101\
+ ${TNAME}.out.102\
+ ${TNAME}.out.110\
+ ${TNAME}.out.111\
+ ${TNAME}.out.112\
 "
 
 for i in $FILES
diff --git a/external/hypre/src/test/TEST_ij/nonmixedint.jobs b/external/hypre/src/test/TEST_ij/nonmixedint.jobs
old mode 100644
new mode 100755
index ea7d414f..53475888
--- a/external/hypre/src/test/TEST_ij/nonmixedint.jobs
+++ b/external/hypre/src/test/TEST_ij/nonmixedint.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_ij/nonmixedint.saved.ray b/external/hypre/src/test/TEST_ij/nonmixedint.saved.aurora
similarity index 85%
rename from external/hypre/src/test/TEST_ij/nonmixedint.saved.ray
rename to external/hypre/src/test/TEST_ij/nonmixedint.saved.aurora
index 6fe9cfce..c24f8ac7 100644
--- a/external/hypre/src/test/TEST_ij/nonmixedint.saved.ray
+++ b/external/hypre/src/test/TEST_ij/nonmixedint.saved.aurora
@@ -1,6 +1,6 @@
 # Output file: nonmixedint.out.0
 BoomerAMG Iterations = 18
-Final Relative Residual Norm = 5.361427e-09
+Final Relative Residual Norm = 4.636260e-09
 
 # Output file: nonmixedint.out.1
 GMRES Iterations = 32
diff --git a/external/hypre/src/test/TEST_ij/nonmixedint.saved.lassen b/external/hypre/src/test/TEST_ij/nonmixedint.saved.lassen
index 6fe9cfce..c24f8ac7 100644
--- a/external/hypre/src/test/TEST_ij/nonmixedint.saved.lassen
+++ b/external/hypre/src/test/TEST_ij/nonmixedint.saved.lassen
@@ -1,6 +1,6 @@
 # Output file: nonmixedint.out.0
 BoomerAMG Iterations = 18
-Final Relative Residual Norm = 5.361427e-09
+Final Relative Residual Norm = 4.636260e-09
 
 # Output file: nonmixedint.out.1
 GMRES Iterations = 32
diff --git a/external/hypre/src/test/TEST_ij/nonmixedint.saved.lassen_cpu b/external/hypre/src/test/TEST_ij/nonmixedint.saved.lassen_cpu
new file mode 100644
index 00000000..14f073b9
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/nonmixedint.saved.lassen_cpu
@@ -0,0 +1,12 @@
+# Output file: nonmixedint.out.0
+BoomerAMG Iterations = 16
+Final Relative Residual Norm = 3.804106e-09
+
+# Output file: nonmixedint.out.1
+GMRES Iterations = 32
+Final GMRES Relative Residual Norm = 6.756785e-09
+
+# Output file: nonmixedint.out.2
+Iterations = 22
+Final Relative Residual Norm = 9.936851e-09
+
diff --git a/external/hypre/src/test/TEST_ij/nonmixedint.sh b/external/hypre/src/test/TEST_ij/nonmixedint.sh
old mode 100644
new mode 100755
index 5481ea7b..326e0522
--- a/external/hypre/src/test/TEST_ij/nonmixedint.sh
+++ b/external/hypre/src/test/TEST_ij/nonmixedint.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_ij/posneg.jobs b/external/hypre/src/test/TEST_ij/posneg.jobs
new file mode 100755
index 00000000..a1f0a91f
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/posneg.jobs
@@ -0,0 +1,17 @@
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+## Solve Ax=b and -Ax=b, convergence should be the same
+mpirun -np 2 ./ij -solver 0 -rhsrand -negA 0 > posneg.out.400.p
+mpirun -np 2 ./ij -solver 0 -rhsrand -negA 1 > posneg.out.400.n
+mpirun -np 3 ./ij -solver 3 -rhsrand -negA 0 > posneg.out.401.p
+mpirun -np 3 ./ij -solver 3 -rhsrand -negA 1 > posneg.out.401.n
+mpirun -np 4 ./ij -cheby_eig_est 10 -cheby_order 4 -cheby_variant 0 -cheby_scale 1 -rlx 16 -negA 0 > posneg.out.402.p
+mpirun -np 4 ./ij -cheby_eig_est 10 -cheby_order 4 -cheby_variant 0 -cheby_scale 1 -rlx 16 -negA 1 > posneg.out.402.n
+mpirun -np 4 ./ij -solver 3 -cheby_eig_est 0 -cheby_order 3 -cheby_variant 1 -cheby_scale 1 -rlx 16 -negA 0 > posneg.out.403.p
+mpirun -np 4 ./ij -solver 3 -cheby_eig_est 0 -cheby_order 3 -cheby_variant 1 -cheby_scale 1 -rlx 16 -negA 1 > posneg.out.403.n
+
+
diff --git a/external/hypre/src/test/TEST_ij/posneg.sh b/external/hypre/src/test/TEST_ij/posneg.sh
new file mode 100755
index 00000000..85918e04
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/posneg.sh
@@ -0,0 +1,46 @@
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+TNAME=`basename $0 .sh`
+
+tail -3 ${TNAME}.out.400.p | head -2 > ${TNAME}.testdata
+tail -3 ${TNAME}.out.400.n | head -2 > ${TNAME}.testdata.temp
+
+# Abuse HYPRE_NO_SAVED to skip the following diff with OMP
+if [ -z $HYPRE_NO_SAVED ]; then
+   diff ${TNAME}.testdata ${TNAME}.testdata.temp >&2
+fi
+
+tail -3 ${TNAME}.out.401.p | head -2 > ${TNAME}.testdata
+tail -3 ${TNAME}.out.401.n | head -2 > ${TNAME}.testdata.temp
+
+# Abuse HYPRE_NO_SAVED to skip the following diff with OMP
+if [ -z $HYPRE_NO_SAVED ]; then
+   diff ${TNAME}.testdata ${TNAME}.testdata.temp >&2
+fi
+
+tail -3 ${TNAME}.out.402.p | head -2 > ${TNAME}.testdata
+tail -3 ${TNAME}.out.402.n | head -2 > ${TNAME}.testdata.temp
+
+# Abuse HYPRE_NO_SAVED to skip the following diff with OMP
+if [ -z $HYPRE_NO_SAVED ]; then
+   diff ${TNAME}.testdata ${TNAME}.testdata.temp >&2
+fi
+
+tail -3 ${TNAME}.out.403.p | head -2 > ${TNAME}.testdata
+tail -3 ${TNAME}.out.403.n | head -2 > ${TNAME}.testdata.temp
+
+# Abuse HYPRE_NO_SAVED to skip the following diff with OMP
+if [ -z $HYPRE_NO_SAVED ]; then
+   diff ${TNAME}.testdata ${TNAME}.testdata.temp >&2
+fi
+
+#=============================================================================
+# remove temporary files
+#=============================================================================
+
+rm -f ${TNAME}.testdata*
+
diff --git a/external/hypre/src/test/TEST_ij/smoother.jobs b/external/hypre/src/test/TEST_ij/smoother.jobs
old mode 100644
new mode 100755
index c2fc2a23..96df376b
--- a/external/hypre/src/test/TEST_ij/smoother.jobs
+++ b/external/hypre/src/test/TEST_ij/smoother.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -63,6 +63,12 @@ mpirun -np 3  ./ij -rhsrand -n 15 30 10 -rlx 18 \
 mpirun -np 4  ./ij -rhsrand -solver 1 -rlx 8 -n 20 20 10 -P 2 2 1 \
 > smoother.out.11
 
+mpirun -np 4  ./ij -rhsrand -solver 1 -rlx 88 -n 20 20 10 -P 2 2 1 \
+> smoother.out.11.1
+
+mpirun -np 4  ./ij -rhsrand -solver 1 -rlx 89 -n 20 20 10 -P 2 2 1 \
+> smoother.out.11.2
+
 mpirun -np 4  ./ij -rhsrand -solver 1 -rlx 16 -n 20 20 10 -P 2 2 1 \
 > smoother.out.12
 
diff --git a/external/hypre/src/test/TEST_ij/smoother.saved b/external/hypre/src/test/TEST_ij/smoother.saved
index f7a782b0..495f061c 100644
--- a/external/hypre/src/test/TEST_ij/smoother.saved
+++ b/external/hypre/src/test/TEST_ij/smoother.saved
@@ -40,7 +40,7 @@ Final Relative Residual Norm = 5.359205e-09
 
 # Output file: smoother.out.7
 BoomerAMG Iterations = 18
-Final Relative Residual Norm = 7.334920e-09
+Final Relative Residual Norm = 7.334921e-09
 
 # Output file: smoother.out.8
 BoomerAMG Iterations = 11
@@ -58,13 +58,21 @@ Final Relative Residual Norm = 8.254191e-09
 Iterations = 6
 Final Relative Residual Norm = 2.509163e-09
 
+# Output file: smoother.out.11.1
+Iterations = 6
+Final Relative Residual Norm = 2.881634e-09
+
+# Output file: smoother.out.11.2
+Iterations = 6
+Final Relative Residual Norm = 3.877871e-10
+
 # Output file: smoother.out.12
 Iterations = 6
-Final Relative Residual Norm = 2.510138e-09
+Final Relative Residual Norm = 2.510130e-09
 
 # Output file: smoother.out.13
 Iterations = 5
-Final Relative Residual Norm = 6.702216e-09
+Final Relative Residual Norm = 6.702200e-09
 
 # Output file: smoother.out.14
 Iterations = 6
diff --git a/external/hypre/src/test/TEST_ij/smoother.saved.aurora b/external/hypre/src/test/TEST_ij/smoother.saved.aurora
new file mode 100644
index 00000000..4f8f9db0
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/smoother.saved.aurora
@@ -0,0 +1,120 @@
+# Output file: smoother.out.0
+ Average Convergence Factor = 0.431523
+
+     Complexity:    grid = 1.421333
+                operator = 2.629966
+                   cycle = 5.257845
+
+# Output file: smoother.out.1
+ Average Convergence Factor = 0.110961
+
+     Complexity:    grid = 1.410222
+                operator = 2.566327
+                   cycle = 5.131565
+
+# Output file: smoother.out.2
+ Average Convergence Factor = 0.212015
+
+     Complexity:    grid = 1.391500
+                operator = 2.577045
+                   cycle = 5.153750
+
+# Output file: smoother.out.3
+ Average Convergence Factor = 0.412913
+
+     Complexity:    grid = 1.391500
+                operator = 2.577045
+                   cycle = 5.153750
+
+# Output file: smoother.out.4
+Iterations = 7
+Final Relative Residual Norm = 1.278668e-09
+
+# Output file: smoother.out.5
+BoomerAMG Iterations = 15
+Final Relative Residual Norm = 5.891292e-09
+
+# Output file: smoother.out.6
+Iterations = 12
+Final Relative Residual Norm = 2.096851e-09
+
+# Output file: smoother.out.7
+BoomerAMG Iterations = 26
+Final Relative Residual Norm = 6.720942e-09
+
+# Output file: smoother.out.8
+BoomerAMG Iterations = 16
+Final Relative Residual Norm = 5.214696e-09
+
+# Output file: smoother.out.9
+BoomerAMG Iterations = 21
+Final Relative Residual Norm = 6.303936e-09
+
+# Output file: smoother.out.10
+BoomerAMG Iterations = 25
+Final Relative Residual Norm = 7.215178e-09
+
+# Output file: smoother.out.11
+Iterations = 6
+Final Relative Residual Norm = 9.298524e-09
+
+# Output file: smoother.out.11.1
+Iterations = 7
+Final Relative Residual Norm = 5.260748e-10
+
+# Output file: smoother.out.11.2
+Iterations = 6
+Final Relative Residual Norm = 2.206219e-09
+
+# Output file: smoother.out.12
+Iterations = 7
+Final Relative Residual Norm = 8.196976e-10
+
+# Output file: smoother.out.13
+Iterations = 6
+Final Relative Residual Norm = 1.773257e-09
+
+# Output file: smoother.out.14
+Iterations = 7
+Final Relative Residual Norm = 2.271932e-09
+
+# Output file: smoother.out.15
+Iterations = 11
+Final Relative Residual Norm = 3.586129e-09
+
+# Output file: smoother.out.16
+Iterations = 6
+Final Relative Residual Norm = 1.304969e-09
+
+# Output file: smoother.out.17
+Iterations = 8
+Final Relative Residual Norm = 9.180516e-10
+
+# Output file: smoother.out.18
+GMRES Iterations = 11
+Final GMRES Relative Residual Norm = 4.221402e-09
+
+# Output file: smoother.out.19
+Iterations = 8
+Final Relative Residual Norm = 8.108092e-10
+
+# Output file: smoother.out.20
+Iterations = 12
+Final Relative Residual Norm = 1.470318e-09
+
+# Output file: smoother.out.21
+Iterations = 8
+Final Relative Residual Norm = 7.703209e-09
+
+# Output file: smoother.out.22
+Iterations = 8
+Final Relative Residual Norm = 5.187397e-09
+
+# Output file: smoother.out.23
+Iterations = 9
+Final Relative Residual Norm = 1.766467e-09
+
+# Output file: smoother.out.24
+Iterations = 9
+Final Relative Residual Norm = 4.371789e-09
+
diff --git a/external/hypre/src/test/TEST_ij/smoother.saved.lassen b/external/hypre/src/test/TEST_ij/smoother.saved.lassen
index 1534fc1d..58b1d360 100644
--- a/external/hypre/src/test/TEST_ij/smoother.saved.lassen
+++ b/external/hypre/src/test/TEST_ij/smoother.saved.lassen
@@ -1,34 +1,34 @@
 # Output file: smoother.out.0
- Average Convergence Factor = 0.430612
+ Average Convergence Factor = 0.431493
 
-     Complexity:    grid = 1.404222
-                operator = 2.596532
-                   cycle = 5.191852
+     Complexity:    grid = 1.408000
+                operator = 2.614613
+                   cycle = 5.228687
 
 # Output file: smoother.out.1
- Average Convergence Factor = 0.109467
+ Average Convergence Factor = 0.113256
 
-     Complexity:    grid = 1.412889
-                operator = 2.571633
-                   cycle = 5.142177
+     Complexity:    grid = 1.408889
+                operator = 2.556327
+                   cycle = 5.110952
 
 # Output file: smoother.out.2
- Average Convergence Factor = 0.213961
+ Average Convergence Factor = 0.224466
 
-     Complexity:    grid = 1.403750
-                operator = 2.592614
-                   cycle = 5.183864
+     Complexity:    grid = 1.405000
+                operator = 2.599848
+                   cycle = 5.197424
 
 # Output file: smoother.out.3
- Average Convergence Factor = 0.412622
+ Average Convergence Factor = 0.421413
 
-     Complexity:    grid = 1.403750
-                operator = 2.592614
-                   cycle = 5.183864
+     Complexity:    grid = 1.405000
+                operator = 2.599848
+                   cycle = 5.197424
 
 # Output file: smoother.out.4
 Iterations = 7
-Final Relative Residual Norm = 1.757560e-09
+Final Relative Residual Norm = 1.555935e-09
 
 # Output file: smoother.out.5
 BoomerAMG Iterations = 16
@@ -36,77 +36,85 @@ Final Relative Residual Norm = 5.453527e-09
 
 # Output file: smoother.out.6
 Iterations = 12
-Final Relative Residual Norm = 2.762490e-09
+Final Relative Residual Norm = 2.566134e-09
 
 # Output file: smoother.out.7
-BoomerAMG Iterations = 26
-Final Relative Residual Norm = 5.404255e-09
+BoomerAMG Iterations = 25
+Final Relative Residual Norm = 7.315253e-09
 
 # Output file: smoother.out.8
 BoomerAMG Iterations = 17
-Final Relative Residual Norm = 3.896878e-09
+Final Relative Residual Norm = 4.008618e-09
 
 # Output file: smoother.out.9
 BoomerAMG Iterations = 21
-Final Relative Residual Norm = 5.872644e-09
+Final Relative Residual Norm = 5.801823e-09
 
 # Output file: smoother.out.10
 BoomerAMG Iterations = 25
-Final Relative Residual Norm = 6.780708e-09
+Final Relative Residual Norm = 7.183351e-09
 
 # Output file: smoother.out.11
 Iterations = 7
-Final Relative Residual Norm = 4.597200e-10
+Final Relative Residual Norm = 5.165447e-10
+
+# Output file: smoother.out.11.1
+Iterations = 7
+Final Relative Residual Norm = 7.894184e-10
+
+# Output file: smoother.out.11.2
+Iterations = 6
+Final Relative Residual Norm = 2.796467e-09
 
 # Output file: smoother.out.12
 Iterations = 7
-Final Relative Residual Norm = 1.208193e-09
+Final Relative Residual Norm = 1.029948e-09
 
 # Output file: smoother.out.13
 Iterations = 6
-Final Relative Residual Norm = 2.719926e-09
+Final Relative Residual Norm = 2.623731e-09
 
 # Output file: smoother.out.14
 Iterations = 7
-Final Relative Residual Norm = 1.367899e-09
+Final Relative Residual Norm = 2.017716e-09
 
 # Output file: smoother.out.15
 Iterations = 11
-Final Relative Residual Norm = 7.629513e-09
+Final Relative Residual Norm = 6.677405e-09
 
 # Output file: smoother.out.16
 Iterations = 6
-Final Relative Residual Norm = 2.357281e-09
+Final Relative Residual Norm = 1.779789e-09
 
 # Output file: smoother.out.17
 Iterations = 8
-Final Relative Residual Norm = 9.338545e-10
+Final Relative Residual Norm = 8.751128e-10
 
 # Output file: smoother.out.18
 GMRES Iterations = 11
-Final GMRES Relative Residual Norm = 6.828913e-09
+Final GMRES Relative Residual Norm = 7.508329e-09
 
 # Output file: smoother.out.19
-Iterations = 7
-Final Relative Residual Norm = 8.750911e-09
+Iterations = 8
+Final Relative Residual Norm = 7.890622e-10
 
 # Output file: smoother.out.20
 Iterations = 12
-Final Relative Residual Norm = 3.976961e-09
+Final Relative Residual Norm = 4.179250e-09
 
 # Output file: smoother.out.21
 Iterations = 8
-Final Relative Residual Norm = 4.590448e-09
+Final Relative Residual Norm = 7.563157e-09
 
 # Output file: smoother.out.22
 Iterations = 8
-Final Relative Residual Norm = 3.792255e-09
+Final Relative Residual Norm = 4.121892e-09
 
 # Output file: smoother.out.23
 Iterations = 9
-Final Relative Residual Norm = 8.958228e-10
+Final Relative Residual Norm = 1.248089e-09
 
 # Output file: smoother.out.24
 Iterations = 9
-Final Relative Residual Norm = 2.458527e-09
+Final Relative Residual Norm = 4.848620e-09
 
diff --git a/external/hypre/src/test/TEST_ij/smoother.saved.lassen_cpu b/external/hypre/src/test/TEST_ij/smoother.saved.lassen_cpu
new file mode 100644
index 00000000..560fe1bc
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/smoother.saved.lassen_cpu
@@ -0,0 +1,120 @@
+# Output file: smoother.out.0
+ Average Convergence Factor = 0.239194
+
+     Complexity:    grid = 1.608444
+                operator = 2.760808
+                   cycle = 5.521077
+
+# Output file: smoother.out.1
+ Average Convergence Factor = 0.114248
+
+     Complexity:    grid = 1.587556
+                operator = 2.683946
+                   cycle = 5.365442
+
+# Output file: smoother.out.2
+ Average Convergence Factor = 0.200422
+
+     Complexity:    grid = 1.601000
+                operator = 2.738333
+                   cycle = 5.476061
+
+# Output file: smoother.out.3
+ Average Convergence Factor = 0.120193
+
+     Complexity:    grid = 1.601000
+                operator = 2.738333
+                   cycle = 5.476061
+
+# Output file: smoother.out.4
+Iterations = 6
+Final Relative Residual Norm = 5.847352e-09
+
+# Output file: smoother.out.5
+BoomerAMG Iterations = 17
+Final Relative Residual Norm = 5.893051e-09
+
+# Output file: smoother.out.6
+Iterations = 10
+Final Relative Residual Norm = 5.359240e-09
+
+# Output file: smoother.out.7
+BoomerAMG Iterations = 18
+Final Relative Residual Norm = 7.391197e-09
+
+# Output file: smoother.out.8
+BoomerAMG Iterations = 11
+Final Relative Residual Norm = 7.427657e-09
+
+# Output file: smoother.out.9
+BoomerAMG Iterations = 17
+Final Relative Residual Norm = 4.933895e-09
+
+# Output file: smoother.out.10
+BoomerAMG Iterations = 23
+Final Relative Residual Norm = 8.200305e-09
+
+# Output file: smoother.out.11
+Iterations = 6
+Final Relative Residual Norm = 2.508901e-09
+
+# Output file: smoother.out.11.1
+Iterations = 6
+Final Relative Residual Norm = 2.881660e-09
+
+# Output file: smoother.out.11.2
+Iterations = 6
+Final Relative Residual Norm = 3.875555e-10
+
+# Output file: smoother.out.12
+Iterations = 6
+Final Relative Residual Norm = 2.508759e-09
+
+# Output file: smoother.out.13
+Iterations = 5
+Final Relative Residual Norm = 6.702046e-09
+
+# Output file: smoother.out.14
+Iterations = 6
+Final Relative Residual Norm = 5.041183e-10
+
+# Output file: smoother.out.15
+Iterations = 15
+Final Relative Residual Norm = 5.817439e-09
+
+# Output file: smoother.out.16
+Iterations = 6
+Final Relative Residual Norm = 1.555966e-09
+
+# Output file: smoother.out.17
+Iterations = 7
+Final Relative Residual Norm = 2.088773e-09
+
+# Output file: smoother.out.18
+GMRES Iterations = 11
+Final GMRES Relative Residual Norm = 7.591488e-09
+
+# Output file: smoother.out.19
+Iterations = 6
+Final Relative Residual Norm = 8.887235e-10
+
+# Output file: smoother.out.20
+Iterations = 11
+Final Relative Residual Norm = 2.175824e-09
+
+# Output file: smoother.out.21
+Iterations = 8
+Final Relative Residual Norm = 8.625152e-10
+
+# Output file: smoother.out.22
+Iterations = 7
+Final Relative Residual Norm = 8.370996e-09
+
+# Output file: smoother.out.23
+Iterations = 8
+Final Relative Residual Norm = 3.171595e-09
+
+# Output file: smoother.out.24
+Iterations = 9
+Final Relative Residual Norm = 1.481290e-09
+
diff --git a/external/hypre/src/test/TEST_ij/smoother.saved.ray b/external/hypre/src/test/TEST_ij/smoother.saved.ray
deleted file mode 100644
index c00d09e1..00000000
--- a/external/hypre/src/test/TEST_ij/smoother.saved.ray
+++ /dev/null
@@ -1,112 +0,0 @@
-# Output file: smoother.out.0
- Average Convergence Factor = 0.430612
-
-     Complexity:    grid = 1.404222
-                operator = 2.596532
-                   cycle = 5.191852
-
-# Output file: smoother.out.1
- Average Convergence Factor = 0.109467
-
-     Complexity:    grid = 1.412889
-                operator = 2.571633
-                   cycle = 5.142177
-
-# Output file: smoother.out.2
- Average Convergence Factor = 0.213961
-
-     Complexity:    grid = 1.403750
-                operator = 2.592614
-                   cycle = 5.183864
-
-# Output file: smoother.out.3
- Average Convergence Factor = 0.412622
-
-     Complexity:    grid = 1.403750
-                operator = 2.592614
-                   cycle = 5.183864
-
-# Output file: smoother.out.4
-Iterations = 7
-Final Relative Residual Norm = 1.757560e-09
-
-# Output file: smoother.out.5
-BoomerAMG Iterations = 16
-Final Relative Residual Norm = 5.453527e-09
-
-# Output file: smoother.out.6
-Iterations = 12
-Final Relative Residual Norm = 2.762490e-09
-
-# Output file: smoother.out.7
-BoomerAMG Iterations = 26
-Final Relative Residual Norm = 5.404255e-09
-
-# Output file: smoother.out.8
-BoomerAMG Iterations = 17
-Final Relative Residual Norm = 3.896878e-09
-
-# Output file: smoother.out.9
-BoomerAMG Iterations = 21
-Final Relative Residual Norm = 5.872645e-09
-
-# Output file: smoother.out.10
-BoomerAMG Iterations = 25
-Final Relative Residual Norm = 6.780708e-09
-
-# Output file: smoother.out.11
-Iterations = 7
-Final Relative Residual Norm = 4.597200e-10
-
-# Output file: smoother.out.12
-Iterations = 7
-Final Relative Residual Norm = 1.208193e-09
-
-# Output file: smoother.out.13
-Iterations = 6
-Final Relative Residual Norm = 2.719926e-09
-
-# Output file: smoother.out.14
-Iterations = 7
-Final Relative Residual Norm = 1.367899e-09
-
-# Output file: smoother.out.15
-Iterations = 11
-Final Relative Residual Norm = 7.629513e-09
-
-# Output file: smoother.out.16
-Iterations = 6
-Final Relative Residual Norm = 2.345015e-09
-
-# Output file: smoother.out.17
-Iterations = 8
-Final Relative Residual Norm = 9.338545e-10
-
-# Output file: smoother.out.18
-GMRES Iterations = 11
-Final GMRES Relative Residual Norm = 6.828913e-09
-
-# Output file: smoother.out.19
-Iterations = 7
-Final Relative Residual Norm = 8.750911e-09
-
-# Output file: smoother.out.20
-Iterations = 12
-Final Relative Residual Norm = 3.976961e-09
-
-# Output file: smoother.out.21
-Iterations = 8
-Final Relative Residual Norm = 5.442169e-09
-
-# Output file: smoother.out.22
-Iterations = 8
-Final Relative Residual Norm = 4.050427e-09
-
-# Output file: smoother.out.23
-Iterations = 9
-Final Relative Residual Norm = 1.019347e-09
-
-# Output file: smoother.out.24
-Iterations = 9
-Final Relative Residual Norm = 2.886424e-09
-
diff --git a/external/hypre/src/test/TEST_ij/smoother.sh b/external/hypre/src/test/TEST_ij/smoother.sh
old mode 100644
new mode 100755
index 687196a2..a478278c
--- a/external/hypre/src/test/TEST_ij/smoother.sh
+++ b/external/hypre/src/test/TEST_ij/smoother.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -34,6 +34,8 @@ FILES="\
  ${TNAME}.out.9\
  ${TNAME}.out.10\
  ${TNAME}.out.11\
+ ${TNAME}.out.11.1\
+ ${TNAME}.out.11.2\
  ${TNAME}.out.12\
  ${TNAME}.out.13\
  ${TNAME}.out.14\
diff --git a/external/hypre/src/test/TEST_ij/solvers.jobs b/external/hypre/src/test/TEST_ij/solvers.jobs
old mode 100644
new mode 100755
index f1c37d82..8a043b10
--- a/external/hypre/src/test/TEST_ij/solvers.jobs
+++ b/external/hypre/src/test/TEST_ij/solvers.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -50,11 +50,27 @@ mpirun -np 2 ./ij -solver 17 -rhsrand -unroll 4 > solvers.out.16
 mpirun -np 2 ./ij -solver 3 -rhsrand -check_residual > solvers.out.17
 mpirun -np 2 ./ij -solver 4 -rhsrand -check_residual > solvers.out.18
 
+mpirun -np 3 ./ij -n 23 29 31 -solver 1 -rhsrand -precon_cycles 2 -rlx 18 > solvers.out.19
+mpirun -np 4 ./ij -n 23 29 31 -solver 3 -rhsrand -precon_cycles 3 -rlx 18 > solvers.out.20
+mpirun -np 2 ./ij -n 23 29 31 -solver 0 -rhsrand -mu 2            -rlx 18 > solvers.out.21
+mpirun -np 2 ./ij -n 23 29 31 -solver 3 -rhsrand -mu 2            -rlx 18 > solvers.out.22
+mpirun -np 2 ./ij -n 23 29 31 -solver 0 -rhsrand -fmg             -rlx 18 > solvers.out.23
+mpirun -np 2 ./ij -n 23 29 31 -solver 3 -rhsrand -fmg             -rlx 18 > solvers.out.24
+#flexible CG vs CG; AMG with CG smoother
+mpirun -np 2 ./ij -solver 1 -rlx 15 -flex 1 > solvers.out.25
+mpirun -np 2 ./ij -solver 1 -rlx 15 > solvers.out.26
+
 #systems AMG run ...unknown approach, hybrid approach, nodal approach
 mpirun -np 2 ./ij -n 20 20 20 -sysL 2 -nf 2 > solvers.out.sysu
 mpirun -np 2 ./ij -n 20 20 20 -sysL 2 -nf 2 -nodal 1 -smtype 6 -smlv 10 -dom 1 -ov 0 > solvers.out.sysh
 mpirun -np 2 ./ij -n 20 20 20 -sysL 2 -nf 2 -interptype 10 -Pmx 6 > solvers.out.sysn
 
+#systems AMG using unknown approach and filtering
+mpirun -np 1 ./ij -solver 1 -n 8 8 8 -sysL 2 -nf 2 -ff 1 > solvers.out.27
+mpirun -np 1 ./ij -solver 1 -n 8 8 8 -sysL 3 -nf 3 -ff 1 > solvers.out.28
+mpirun -np 4 ./ij -solver 1 -n 8 8 8 -sysL 2 -nf 2 -ff 1 > solvers.out.29
+mpirun -np 4 ./ij -solver 1 -n 8 8 8 -sysL 3 -nf 3 -ff 1 > solvers.out.30
+
 #LGMRS and FlexGMRES
 mpirun -np 2 ./ij -solver 50 -rhsrand > solvers.out.101
 mpirun -np 2 ./ij -solver 51 -rhsrand > solvers.out.102
@@ -116,57 +132,6 @@ mpirun -np 2 ./ij -solver 70 -mgr_nlevels 5 -mgr_bsize 2 -mgr_non_c_to_f 0 -mgr_
 mpirun -np 2 ./ij -solver 71 -mgr_nlevels 0 -mgr_bsize 2 -mgr_non_c_to_f 0 -mgr_frelax_method 0 -mgr_num_reserved_nodes 0 > solvers.out.212
 mpirun -np 2 ./ij -solver 71 -mgr_nlevels 1 -mgr_bsize 2 -mgr_non_c_to_f 0 -mgr_frelax_method 0 -mgr_num_reserved_nodes 0 > solvers.out.213
 
-#
-# hypre_ILU tests
-# Tests ILU(0), ILUK and ILUK solvers sequentially
-# Tests Parallel combination of ILU solvers
-# Tests ILU-(Flex)GMRES
-# Test AMG with ILU as a complex smoother
-#
-mpirun -np 1  ./ij -solver 80 -ilu_type 0 -ilu_lfil 0 > solvers.out.300
-mpirun -np 1  ./ij -solver 80 -ilu_type 0 -ilu_lfil 1 > solvers.out.301
-mpirun -np 1  ./ij -solver 80 -ilu_type 1 -ilu_droptol 1.0e-2 -ilu_max_row_nnz 1000 > solvers.out.302
-# parallel ILU
-# BJ
-mpirun -np 2  ./ij -solver 80 -ilu_type 0 -ilu_lfil 1 > solvers.out.303
-mpirun -np 2  ./ij -solver 80 -ilu_type 1 -ilu_droptol 1.0e-2 -ilu_max_row_nnz 1000  > solvers.out.304
-# GMRES+ILU
-mpirun -np 2  ./ij -solver 80 -ilu_type 10 -ilu_lfil 1 -ilu_schur_max_iter 5 > solvers.out.305
-mpirun -np 2  ./ij -solver 80 -ilu_type 11 -ilu_droptol 1.0e-2 -ilu_max_row_nnz 1000 -ilu_schur_max_iter 5  > solvers.out.306
-# NSH+ILU
-mpirun -np 2  ./ij -solver 80 -ilu_type 20 -ilu_lfil 1 -ilu_schur_max_iter 5 > solvers.out.307
-mpirun -np 2  ./ij -solver 80 -ilu_type 21 -ilu_droptol 1.0e-2 -ilu_max_row_nnz 1000 -ilu_schur_max_iter 5  > solvers.out.308
-# RAS+ILU
-mpirun -np 2  ./ij -solver 80 -ilu_type 30 -ilu_lfil 1 > solvers.out.309
-mpirun -np 2  ./ij -solver 80 -ilu_type 31 -ilu_droptol 1.0e-2 -ilu_max_row_nnz 1000 > solvers.out.310
-# ddPQ-GMRES+ILU
-mpirun -np 2  ./ij -solver 80 -ilu_type 40 -ilu_lfil 1 -ilu_schur_max_iter 5 > solvers.out.311
-mpirun -np 2  ./ij -solver 80 -ilu_type 41 -ilu_droptol 1.0e-2 -ilu_max_row_nnz 1000 -ilu_schur_max_iter 5  > solvers.out.312
-##  ILU-GMRES
-mpirun -np 2  ./ij -solver 81 -ilu_type 0 -ilu_lfil 0 > solvers.out.313
-mpirun -np 2  ./ij -solver 81 -ilu_type 1 -ilu_droptol 1.0e-2 -ilu_max_row_nnz 1000  > solvers.out.314
-mpirun -np 2  ./ij -solver 81 -ilu_type 30 -ilu_lfil 0 > solvers.out.315
-mpirun -np 2  ./ij -solver 81 -ilu_type 31 -ilu_droptol 1.0e-2 -ilu_max_row_nnz 1000  > solvers.out.316
-##  ILU-FlexGMRES
-mpirun -np 2  ./ij -solver 82 -ilu_type 10 -ilu_lfil 0 -ilu_schur_max_iter 5 > solvers.out.317
-mpirun -np 2  ./ij -solver 82 -ilu_type 11 -ilu_droptol 1.0e-2 -ilu_max_row_nnz 1000 -ilu_schur_max_iter 5  > solvers.out.318
-mpirun -np 2  ./ij -solver 82 -ilu_type 20 -ilu_lfil 0 -ilu_schur_max_iter 5 > solvers.out.319
-mpirun -np 2  ./ij -solver 82 -ilu_type 21 -ilu_droptol 1.0e-2 -ilu_max_row_nnz 1000 -ilu_schur_max_iter 5  > solvers.out.320
-mpirun -np 2  ./ij -solver 82 -ilu_type 40 -ilu_lfil 0 -ilu_schur_max_iter 5 > solvers.out.321
-mpirun -np 2  ./ij -solver 82 -ilu_type 41 -ilu_droptol 1.0e-2 -ilu_max_row_nnz 1000 -ilu_schur_max_iter 5  > solvers.out.322
-## RAP-ILU
-mpirun -np 2  ./ij -solver 82 -ilu_type 50 -ilu_lfil 0 > solvers.out.323
-## ILU smoother for AMG
-mpirun -np 2  ./ij -solver 0 -smtype 5  -smlv 1 -ilu_type 30 > solvers.out.324
-mpirun -np 2  ./ij -solver 0 -smtype 15 -smlv 1 -ilu_type 30 > solvers.out.325
-
-## Solve Ax=b and -Ax=b, convergence should be the same
-mpirun -np 2 ./ij -solver 0 -rhsrand -negA 0 > solvers.out.400.p
-mpirun -np 2 ./ij -solver 0 -rhsrand -negA 1 > solvers.out.400.n
-mpirun -np 3 ./ij -solver 3 -rhsrand -negA 0 > solvers.out.401.p
-mpirun -np 3 ./ij -solver 3 -rhsrand -negA 1 > solvers.out.401.n
-mpirun -np 4 ./ij -cheby_eig_est 10 -cheby_order 4 -cheby_variant 0 -cheby_scale 1 -rlx 16 -negA 0 > solvers.out.402.p
-mpirun -np 4 ./ij -cheby_eig_est 10 -cheby_order 4 -cheby_variant 0 -cheby_scale 1 -rlx 16 -negA 1 > solvers.out.402.n
-mpirun -np 4 ./ij -solver 3 -cheby_eig_est 0 -cheby_order 3 -cheby_variant 1 -cheby_scale 1 -rlx 16 -negA 0 > solvers.out.403.p
-mpirun -np 4 ./ij -solver 3 -cheby_eig_est 0 -cheby_order 3 -cheby_variant 1 -cheby_scale 1 -rlx 16 -negA 1 > solvers.out.403.n
-
+## Test relaxation methods 88 (L1 hybrid Symm. Gauss-Seidel with a convergent l1 term) and 89 (L1 Symm. hybrid Gauss-Seidel)
+mpirun -np 4 ./ij -fromfile data/tucker21935/IJ.A -solver 1 -rlx 88 > solvers.out.404
+mpirun -np 4 ./ij -fromfile data/tucker21935/IJ.A -solver 1 -rlx 89 > solvers.out.405
diff --git a/external/hypre/src/test/TEST_ij/solvers.saved b/external/hypre/src/test/TEST_ij/solvers.saved
index 0cee9ca2..f0bdd53a 100644
--- a/external/hypre/src/test/TEST_ij/solvers.saved
+++ b/external/hypre/src/test/TEST_ij/solvers.saved
@@ -88,6 +88,54 @@ index 19 value -7.497267e-11
 GMRES Iterations = 93
 Final GMRES Relative Residual Norm = 8.225661e-09
 
+# Output file: solvers.out.19
+
+
+Iterations = 8
+Final Relative Residual Norm = 2.463625e-09
+
+# Output file: solvers.out.20
+
+
+GMRES Iterations = 7
+Final GMRES Relative Residual Norm = 5.912905e-10
+
+# Output file: solvers.out.21
+
+
+BoomerAMG Iterations = 23
+Final Relative Residual Norm = 5.120965e-09
+
+# Output file: solvers.out.22
+
+
+GMRES Iterations = 11
+Final GMRES Relative Residual Norm = 7.241893e-09
+
+# Output file: solvers.out.23
+
+
+BoomerAMG Iterations = 15
+Final Relative Residual Norm = 5.927198e-09
+
+# Output file: solvers.out.24
+
+
+GMRES Iterations = 9
+Final GMRES Relative Residual Norm = 2.177357e-09
+
+# Output file: solvers.out.25
+
+
+Iterations = 9
+Final Relative Residual Norm = 9.023254e-09
+
+# Output file: solvers.out.26
+
+
+Iterations = 18
+Final Relative Residual Norm = 9.578132e-09
+
 # Output file: solvers.out.sysh
  Average Convergence Factor = 0.119746
 
@@ -109,6 +157,22 @@ Final GMRES Relative Residual Norm = 8.225661e-09
                 operator = 2.866563
                    cycle = 5.732747
 
+# Output file: solvers.out.27
+Iterations = 12
+Final Relative Residual Norm = 5.893893e-09
+
+# Output file: solvers.out.28
+Iterations = 18
+Final Relative Residual Norm = 3.448418e-09
+
+# Output file: solvers.out.29
+Iterations = 13
+Final Relative Residual Norm = 4.536558e-09
+
+# Output file: solvers.out.30
+Iterations = 19
+Final Relative Residual Norm = 3.853111e-09
+
 # Output file: solvers.out.101
 LGMRES Iterations = 83
 Final LGMRES Relative Residual Norm = 8.591967e-09
@@ -155,7 +219,7 @@ Final Relative Residual Norm = 8.452076e-09
 
 # Output file: solvers.out.112
 GMRES Iterations = 23
-Final GMRES Relative Residual Norm = 3.979844e-09
+Final GMRES Relative Residual Norm = 3.979845e-09
 
 # Output file: solvers.out.113
 GMRES Iterations = 25
@@ -231,7 +295,7 @@ Final Relative Residual Norm = 7.963764e-09
 
 # Output file: solvers.out.208
 MGR Iterations = 15
-Final Relative Residual Norm = 8.038753e-09
+Final Relative Residual Norm = 7.901013e-09
 
 # Output file: solvers.out.209
 MGR Iterations = 14
@@ -239,7 +303,7 @@ Final Relative Residual Norm = 7.561893e-09
 
 # Output file: solvers.out.210
 MGR Iterations = 22
-Final Relative Residual Norm = 6.502164e-09
+Final Relative Residual Norm = 6.427895e-09
 
 # Output file: solvers.out.211
 MGR Iterations = 29
@@ -253,107 +317,11 @@ Final Relative Residual Norm = 1.371340e-09
 Iterations = 29
 Final Relative Residual Norm = 5.204677e-09
 
-# Output file: solvers.out.300
-hypre_ILU Iterations = 85
-Final Relative Residual Norm = 9.266244e-09
-
-# Output file: solvers.out.301
-hypre_ILU Iterations = 40
-Final Relative Residual Norm = 9.772377e-09
-
-# Output file: solvers.out.302
-hypre_ILU Iterations = 23
-Final Relative Residual Norm = 5.512717e-09
-
-# Output file: solvers.out.303
-hypre_ILU Iterations = 64
-Final Relative Residual Norm = 8.558467e-09
-
-# Output file: solvers.out.304
-hypre_ILU Iterations = 52
-Final Relative Residual Norm = 9.189235e-09
-
-# Output file: solvers.out.305
-hypre_ILU Iterations = 38
-Final Relative Residual Norm = 7.024121e-09
-
-# Output file: solvers.out.306
-hypre_ILU Iterations = 26
-Final Relative Residual Norm = 7.556742e-09
-
-# Output file: solvers.out.307
-hypre_ILU Iterations = 38
-Final Relative Residual Norm = 7.037599e-09
-
-# Output file: solvers.out.308
-hypre_ILU Iterations = 26
-Final Relative Residual Norm = 7.593126e-09
-
-# Output file: solvers.out.309
-hypre_ILU Iterations = 49
-Final Relative Residual Norm = 7.072947e-09
-
-# Output file: solvers.out.310
-hypre_ILU Iterations = 42
-Final Relative Residual Norm = 6.699477e-09
-
-# Output file: solvers.out.311
-hypre_ILU Iterations = 36
-Final Relative Residual Norm = 6.392185e-09
-
-# Output file: solvers.out.312
-hypre_ILU Iterations = 24
-Final Relative Residual Norm = 5.953652e-09
-
-# Output file: solvers.out.313
-GMRES Iterations = 25
-Final GMRES Relative Residual Norm = 3.968804e-09
-
-# Output file: solvers.out.314
-GMRES Iterations = 19
-Final GMRES Relative Residual Norm = 7.026446e-09
-
-# Output file: solvers.out.315
-GMRES Iterations = 20
-Final GMRES Relative Residual Norm = 7.908624e-09
-
-# Output file: solvers.out.316
-GMRES Iterations = 13
-Final GMRES Relative Residual Norm = 7.969372e-09
-
-# Output file: solvers.out.317
-FlexGMRES Iterations = 17
-Final FlexGMRES Relative Residual Norm = 9.152443e-09
-
-# Output file: solvers.out.318
-FlexGMRES Iterations = 9
-Final FlexGMRES Relative Residual Norm = 5.768785e-09
-
-# Output file: solvers.out.319
-FlexGMRES Iterations = 17
-Final FlexGMRES Relative Residual Norm = 9.133102e-09
-
-# Output file: solvers.out.320
-FlexGMRES Iterations = 9
-Final FlexGMRES Relative Residual Norm = 6.299457e-09
-
-# Output file: solvers.out.321
-FlexGMRES Iterations = 17
-Final FlexGMRES Relative Residual Norm = 4.489256e-09
-
-# Output file: solvers.out.322
-FlexGMRES Iterations = 8
-Final FlexGMRES Relative Residual Norm = 3.082447e-09
-
-# Output file: solvers.out.323
-FlexGMRES Iterations = 18
-Final FlexGMRES Relative Residual Norm = 4.133851e-09
-
-# Output file: solvers.out.324
-BoomerAMG Iterations = 8
-Final Relative Residual Norm = 8.380440e-09
+# Output file: solvers.out.404
+Iterations = 30
+Final Relative Residual Norm = 8.259159e-09
 
-# Output file: solvers.out.325
-BoomerAMG Iterations = 7
-Final Relative Residual Norm = 7.074639e-09
+# Output file: solvers.out.405
+Iterations = 24
+Final Relative Residual Norm = 6.793588e-09
 
diff --git a/external/hypre/src/test/TEST_ij/solvers.saved.aurora b/external/hypre/src/test/TEST_ij/solvers.saved.aurora
new file mode 100644
index 00000000..2b988c36
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/solvers.saved.aurora
@@ -0,0 +1,327 @@
+# Output file: solvers.out.0
+Iterations = 11
+Final Relative Residual Norm = 8.313179e-09
+
+# Output file: solvers.out.1
+Iterations = 41
+Final Relative Residual Norm = 6.698760e-09
+
+# Output file: solvers.out.2
+GMRES Iterations = 12
+Final GMRES Relative Residual Norm = 2.591429e-09
+
+# Output file: solvers.out.3
+GMRES Iterations = 93
+Final GMRES Relative Residual Norm = 8.225661e-09
+
+# Output file: solvers.out.4
+Iterations = 9
+Final Relative Residual Norm = 5.357266e-09
+
+# Output file: solvers.out.5
+Iterations = 196
+Final Relative Residual Norm = 9.097622e-09
+
+# Output file: solvers.out.8
+Iterations = 41
+PCG_Iterations = 0
+DSCG_Iterations = 41
+Final Relative Residual Norm = 6.698760e-09
+
+# Output file: solvers.out.9
+Iterations = 11
+PCG_Iterations = 7
+DSCG_Iterations = 4
+Final Relative Residual Norm = 2.051260e-09
+
+# Output file: solvers.out.10
+Iterations = 10
+PCG_Iterations = 8
+DSCG_Iterations = 2
+Final Relative Residual Norm = 7.391720e-10
+
+# Output file: solvers.out.11
+Iterations = 7
+PCG_Iterations = 4
+DSCG_Iterations = 3
+Final Relative Residual Norm = 9.120827e-10
+
+# Output file: solvers.out.12
+
+
+COGMRES Iterations = 12
+Final COGMRES Relative Residual Norm = 2.591429e-09
+
+# Output file: solvers.out.13
+
+
+COGMRES Iterations = 93
+Final COGMRES Relative Residual Norm = 8.225661e-09
+
+# Output file: solvers.out.14
+
+
+COGMRES Iterations = 93
+Final COGMRES Relative Residual Norm = 8.225662e-09
+
+# Output file: solvers.out.15
+
+
+COGMRES Iterations = 93
+Final COGMRES Relative Residual Norm = 8.225662e-09
+
+# Output file: solvers.out.16
+
+
+COGMRES Iterations = 93
+Final COGMRES Relative Residual Norm = 8.225661e-09
+
+# Output file: solvers.out.17
+index 19 value -9.448537e-11
+
+GMRES Iterations = 12
+Final GMRES Relative Residual Norm = 2.591429e-09
+
+# Output file: solvers.out.18
+index 19 value -7.497267e-11
+
+GMRES Iterations = 93
+Final GMRES Relative Residual Norm = 8.225661e-09
+
+# Output file: solvers.out.19
+
+
+Iterations = 8
+Final Relative Residual Norm = 7.973874e-09
+
+# Output file: solvers.out.20
+
+
+GMRES Iterations = 7
+Final GMRES Relative Residual Norm = 1.137542e-09
+
+# Output file: solvers.out.21
+
+
+BoomerAMG Iterations = 25
+Final Relative Residual Norm = 7.040419e-09
+
+# Output file: solvers.out.22
+
+
+GMRES Iterations = 12
+Final GMRES Relative Residual Norm = 5.729132e-09
+
+# Output file: solvers.out.23
+
+
+BoomerAMG Iterations = 17
+Final Relative Residual Norm = 4.244345e-09
+
+# Output file: solvers.out.24
+
+
+GMRES Iterations = 10
+Final GMRES Relative Residual Norm = 1.351898e-09
+
+# Output file: solvers.out.25
+
+
+Iterations = 10
+Final Relative Residual Norm = 1.562615e-09
+
+# Output file: solvers.out.26
+
+
+Iterations = 15
+Final Relative Residual Norm = 4.161298e-09
+
+# Output file: solvers.out.sysh
+ Average Convergence Factor = 0.206046
+
+     Complexity:    grid = 1.388375
+                operator = 2.644981
+                   cycle = 5.289944
+
+# Output file: solvers.out.sysn
+ Average Convergence Factor = 0.537936
+
+     Complexity:    grid = 1.391500
+                operator = 2.082687
+                   cycle = 10.165075
+
+# Output file: solvers.out.sysu
+ Average Convergence Factor = 0.773088
+
+     Complexity:    grid = 1.384375
+                operator = 2.726847
+                   cycle = 5.453526
+
+# Output file: solvers.out.27
+Iterations = 17
+Final Relative Residual Norm = 5.745047e-09
+
+# Output file: solvers.out.28
+Iterations = 23
+Final Relative Residual Norm = 9.165818e-09
+
+# Output file: solvers.out.29
+Iterations = 17
+Final Relative Residual Norm = 9.344808e-09
+
+# Output file: solvers.out.30
+Iterations = 24
+Final Relative Residual Norm = 6.006718e-09
+
+# Output file: solvers.out.101
+LGMRES Iterations = 83
+Final LGMRES Relative Residual Norm = 8.591967e-09
+
+# Output file: solvers.out.102
+LGMRES Iterations = 13
+Final LGMRES Relative Residual Norm = 2.506722e-09
+
+# Output file: solvers.out.103
+FlexGMRES Iterations = 93
+Final FlexGMRES Relative Residual Norm = 8.225661e-09
+
+# Output file: solvers.out.104
+FlexGMRES Iterations = 12
+Final FlexGMRES Relative Residual Norm = 2.591429e-09
+
+# Output file: solvers.out.105
+Iterations = 19
+Final Relative Residual Norm = 3.770440e-09
+
+# Output file: solvers.out.106
+Iterations = 19
+Final Relative Residual Norm = 3.770440e-09
+
+# Output file: solvers.out.107
+Iterations = 29
+Final Relative Residual Norm = 7.980731e-09
+
+# Output file: solvers.out.108
+Iterations = 29
+Final Relative Residual Norm = 7.980731e-09
+
+# Output file: solvers.out.109
+Iterations = 20
+Final Relative Residual Norm = 8.472626e-09
+
+# Output file: solvers.out.110
+Iterations = 20
+Final Relative Residual Norm = 8.472626e-09
+
+# Output file: solvers.out.111
+Iterations = 32
+Final Relative Residual Norm = 7.550239e-09
+
+# Output file: solvers.out.112
+GMRES Iterations = 38
+Final GMRES Relative Residual Norm = 8.733188e-09
+
+# Output file: solvers.out.113
+GMRES Iterations = 27
+Final GMRES Relative Residual Norm = 5.801918e-09
+
+# Output file: solvers.out.114
+BoomerAMG Iterations = 35
+Final Relative Residual Norm = 8.610293e-09
+
+# Output file: solvers.out.115
+BoomerAMG Iterations = 35
+Final Relative Residual Norm = 5.954720e-09
+
+# Output file: solvers.out.116
+GMRES Iterations = 15
+Final GMRES Relative Residual Norm = 3.189139e-09
+
+# Output file: solvers.out.117
+GMRES Iterations = 15
+Final GMRES Relative Residual Norm = 3.189139e-09
+
+# Output file: solvers.out.118
+GMRES Iterations = 27
+Final GMRES Relative Residual Norm = 7.132129e-09
+
+# Output file: solvers.out.119
+GMRES Iterations = 19
+Final GMRES Relative Residual Norm = 9.374280e-09
+
+# Output file: solvers.out.121
+GMRES Iterations = 26
+Final GMRES Relative Residual Norm = 4.243767e-09
+
+# Output file: solvers.out.122
+GMRES Iterations = 19
+Final GMRES Relative Residual Norm = 9.374280e-09
+
+# Output file: solvers.out.120
+GMRES Iterations = 19
+Final GMRES Relative Residual Norm = 9.374304e-09
+
+# Output file: solvers.out.200
+MGR Iterations = 9
+Final Relative Residual Norm = 1.247303e-09
+
+# Output file: solvers.out.201
+MGR Iterations = 9
+Final Relative Residual Norm = 3.708381e-09
+
+# Output file: solvers.out.202
+MGR Iterations = 9
+Final Relative Residual Norm = 1.247303e-09
+
+# Output file: solvers.out.203
+MGR Iterations = 9
+Final Relative Residual Norm = 3.708381e-09
+
+# Output file: solvers.out.204
+MGR Iterations = 74
+Final Relative Residual Norm = 9.572092e-09
+
+# Output file: solvers.out.205
+MGR Iterations = 71
+Final Relative Residual Norm = 8.439033e-09
+
+# Output file: solvers.out.206
+MGR Iterations = 52
+Final Relative Residual Norm = 8.583644e-09
+
+# Output file: solvers.out.207
+MGR Iterations = 50
+Final Relative Residual Norm = 9.909484e-09
+
+# Output file: solvers.out.208
+MGR Iterations = 16
+Final Relative Residual Norm = 4.090193e-09
+
+# Output file: solvers.out.209
+MGR Iterations = 15
+Final Relative Residual Norm = 7.976848e-09
+
+# Output file: solvers.out.210
+MGR Iterations = 22
+Final Relative Residual Norm = 9.412142e-09
+
+# Output file: solvers.out.211
+MGR Iterations = 29
+Final Relative Residual Norm = 9.128075e-09
+
+# Output file: solvers.out.212
+Iterations = 11
+Final Relative Residual Norm = 6.598043e-09
+
+# Output file: solvers.out.213
+Iterations = 28
+Final Relative Residual Norm = 9.579850e-09
+
+# Output file: solvers.out.404
+Iterations = 28
+Final Relative Residual Norm = 8.560163e-09
+
+# Output file: solvers.out.405
+Iterations = 22
+Final Relative Residual Norm = 7.991509e-09
+
diff --git a/external/hypre/src/test/TEST_ij/solvers.saved.lassen b/external/hypre/src/test/TEST_ij/solvers.saved.lassen
index aac47972..65bee4fd 100644
--- a/external/hypre/src/test/TEST_ij/solvers.saved.lassen
+++ b/external/hypre/src/test/TEST_ij/solvers.saved.lassen
@@ -1,22 +1,22 @@
 # Output file: solvers.out.0
 Iterations = 11
-Final Relative Residual Norm = 7.964594e-09
+Final Relative Residual Norm = 5.395554e-09
 
 # Output file: solvers.out.1
 Iterations = 41
 Final Relative Residual Norm = 6.698760e-09
 
 # Output file: solvers.out.2
-GMRES Iterations = 12
-Final GMRES Relative Residual Norm = 2.545775e-09
+GMRES Iterations = 11
+Final GMRES Relative Residual Norm = 8.872614e-09
 
 # Output file: solvers.out.3
 GMRES Iterations = 93
-Final GMRES Relative Residual Norm = 8.225662e-09
+Final GMRES Relative Residual Norm = 8.225661e-09
 
 # Output file: solvers.out.4
-Iterations = 9
-Final Relative Residual Norm = 9.889817e-09
+Iterations = 10
+Final Relative Residual Norm = 1.243936e-09
 
 # Output file: solvers.out.5
 Iterations = 196
@@ -32,31 +32,31 @@ Final Relative Residual Norm = 6.698760e-09
 Iterations = 11
 PCG_Iterations = 7
 DSCG_Iterations = 4
-Final Relative Residual Norm = 1.482757e-09
+Final Relative Residual Norm = 2.361078e-09
 
 # Output file: solvers.out.10
 Iterations = 10
 PCG_Iterations = 8
 DSCG_Iterations = 2
-Final Relative Residual Norm = 6.686412e-10
+Final Relative Residual Norm = 7.996975e-10
 
 # Output file: solvers.out.11
 Iterations = 7
 PCG_Iterations = 4
 DSCG_Iterations = 3
-Final Relative Residual Norm = 8.612722e-10
+Final Relative Residual Norm = 1.374567e-09
 
 # Output file: solvers.out.12
 
 
-COGMRES Iterations = 12
-Final COGMRES Relative Residual Norm = 2.545775e-09
+COGMRES Iterations = 11
+Final COGMRES Relative Residual Norm = 8.872614e-09
 
 # Output file: solvers.out.13
 
 
 COGMRES Iterations = 93
-Final COGMRES Relative Residual Norm = 8.225662e-09
+Final COGMRES Relative Residual Norm = 8.225661e-09
 
 # Output file: solvers.out.14
 
@@ -74,26 +74,74 @@ Final COGMRES Relative Residual Norm = 8.225662e-09
 
 
 COGMRES Iterations = 93
-Final COGMRES Relative Residual Norm = 8.225661e-09
+Final COGMRES Relative Residual Norm = 8.225662e-09
 
 # Output file: solvers.out.17
-index 19 value -1.312642e-11
+index 19 value -8.373864e-12
 
-GMRES Iterations = 12
-Final GMRES Relative Residual Norm = 2.545775e-09
+GMRES Iterations = 11
+Final GMRES Relative Residual Norm = 8.872614e-09
 
 # Output file: solvers.out.18
-index 19 value -7.497266e-11
+index 19 value -7.497267e-11
 
 GMRES Iterations = 93
-Final GMRES Relative Residual Norm = 8.225662e-09
+Final GMRES Relative Residual Norm = 8.225661e-09
+
+# Output file: solvers.out.19
+
+
+Iterations = 8
+Final Relative Residual Norm = 8.565049e-09
+
+# Output file: solvers.out.20
+
+
+GMRES Iterations = 7
+Final GMRES Relative Residual Norm = 1.597168e-09
+
+# Output file: solvers.out.21
+
+
+BoomerAMG Iterations = 25
+Final Relative Residual Norm = 7.139146e-09
+
+# Output file: solvers.out.22
+
+
+GMRES Iterations = 12
+Final GMRES Relative Residual Norm = 5.069641e-09
+
+# Output file: solvers.out.23
+
+
+BoomerAMG Iterations = 17
+Final Relative Residual Norm = 4.412175e-09
+
+# Output file: solvers.out.24
+
+
+GMRES Iterations = 9
+Final GMRES Relative Residual Norm = 9.074692e-09
+
+# Output file: solvers.out.25
+
+
+Iterations = 10
+Final Relative Residual Norm = 2.384986e-09
+
+# Output file: solvers.out.26
+
+
+Iterations = 15
+Final Relative Residual Norm = 7.167937e-09
 
 # Output file: solvers.out.sysh
- Average Convergence Factor = 0.209143
+ Average Convergence Factor = 0.205554
 
-     Complexity:    grid = 1.400375
-                operator = 2.672127
-                   cycle = 5.344235
+     Complexity:    grid = 1.401500
+                operator = 2.689142
+                   cycle = 5.378265
 
 # Output file: solvers.out.sysn
  Average Convergence Factor = 0.537935
@@ -103,43 +151,59 @@ Final GMRES Relative Residual Norm = 8.225662e-09
                    cycle = 10.165075
 
 # Output file: solvers.out.sysu
- Average Convergence Factor = 0.781122
+ Average Convergence Factor = 0.773233
+
+     Complexity:    grid = 1.395375
+                operator = 2.737043
+                   cycle = 5.473918
 
-     Complexity:    grid = 1.395438
-                operator = 2.730089
-                   cycle = 5.460009
+# Output file: solvers.out.27
+Iterations = 17
+Final Relative Residual Norm = 4.472032e-09
+
+# Output file: solvers.out.28
+Iterations = 25
+Final Relative Residual Norm = 4.134529e-09
+
+# Output file: solvers.out.29
+Iterations = 17
+Final Relative Residual Norm = 7.555200e-09
+
+# Output file: solvers.out.30
+Iterations = 23
+Final Relative Residual Norm = 8.408484e-09
 
 # Output file: solvers.out.101
 LGMRES Iterations = 83
 Final LGMRES Relative Residual Norm = 8.591967e-09
 
 # Output file: solvers.out.102
-LGMRES Iterations = 13
-Final LGMRES Relative Residual Norm = 2.815593e-09
+LGMRES Iterations = 12
+Final LGMRES Relative Residual Norm = 9.399192e-09
 
 # Output file: solvers.out.103
 FlexGMRES Iterations = 93
-Final FlexGMRES Relative Residual Norm = 8.225662e-09
+Final FlexGMRES Relative Residual Norm = 8.225661e-09
 
 # Output file: solvers.out.104
-FlexGMRES Iterations = 12
-Final FlexGMRES Relative Residual Norm = 2.545775e-09
+FlexGMRES Iterations = 11
+Final FlexGMRES Relative Residual Norm = 8.872614e-09
 
 # Output file: solvers.out.105
 Iterations = 19
-Final Relative Residual Norm = 4.349071e-09
+Final Relative Residual Norm = 4.250469e-09
 
 # Output file: solvers.out.106
 Iterations = 19
-Final Relative Residual Norm = 4.349071e-09
+Final Relative Residual Norm = 4.250469e-09
 
 # Output file: solvers.out.107
 Iterations = 29
-Final Relative Residual Norm = 7.167010e-09
+Final Relative Residual Norm = 7.512162e-09
 
 # Output file: solvers.out.108
 Iterations = 29
-Final Relative Residual Norm = 7.167601e-09
+Final Relative Residual Norm = 7.512135e-09
 
 # Output file: solvers.out.109
 Iterations = 20
@@ -159,27 +223,27 @@ Final GMRES Relative Residual Norm = 7.222662e-09
 
 # Output file: solvers.out.113
 GMRES Iterations = 26
-Final GMRES Relative Residual Norm = 6.905243e-09
+Final GMRES Relative Residual Norm = 6.954824e-09
 
 # Output file: solvers.out.114
-BoomerAMG Iterations = 33
-Final Relative Residual Norm = 8.651263e-09
+BoomerAMG Iterations = 34
+Final Relative Residual Norm = 7.848170e-09
 
 # Output file: solvers.out.115
-BoomerAMG Iterations = 33
-Final Relative Residual Norm = 7.342374e-09
+BoomerAMG Iterations = 34
+Final Relative Residual Norm = 9.839249e-09
 
 # Output file: solvers.out.116
-GMRES Iterations = 14
-Final GMRES Relative Residual Norm = 7.870943e-09
+GMRES Iterations = 15
+Final GMRES Relative Residual Norm = 2.830234e-09
 
 # Output file: solvers.out.117
-GMRES Iterations = 14
-Final GMRES Relative Residual Norm = 7.870943e-09
+GMRES Iterations = 15
+Final GMRES Relative Residual Norm = 2.830235e-09
 
 # Output file: solvers.out.118
 GMRES Iterations = 27
-Final GMRES Relative Residual Norm = 5.487850e-09
+Final GMRES Relative Residual Norm = 5.532388e-09
 
 # Output file: solvers.out.119
 GMRES Iterations = 19
@@ -195,165 +259,68 @@ Final GMRES Relative Residual Norm = 5.040776e-09
 
 # Output file: solvers.out.120
 GMRES Iterations = 19
-Final GMRES Relative Residual Norm = 5.041387e-09
+Final GMRES Relative Residual Norm = 5.041386e-09
 
 # Output file: solvers.out.200
-MGR Iterations = 6
-Final Relative Residual Norm = 6.980277e-10
+MGR Iterations = 8
+Final Relative Residual Norm = 7.317392e-09
 
 # Output file: solvers.out.201
-MGR Iterations = 6
-Final Relative Residual Norm = 5.136059e-09
+MGR Iterations = 9
+Final Relative Residual Norm = 1.802890e-09
 
 # Output file: solvers.out.202
-MGR Iterations = 6
-Final Relative Residual Norm = 6.980277e-10
+MGR Iterations = 8
+Final Relative Residual Norm = 7.317392e-09
 
 # Output file: solvers.out.203
-MGR Iterations = 6
-Final Relative Residual Norm = 5.136059e-09
+MGR Iterations = 9
+Final Relative Residual Norm = 1.802890e-09
 
 # Output file: solvers.out.204
 MGR Iterations = 74
-Final Relative Residual Norm = 8.553927e-09
+Final Relative Residual Norm = 9.563442e-09
 
 # Output file: solvers.out.205
-MGR Iterations = 70
-Final Relative Residual Norm = 9.518056e-09
+MGR Iterations = 71
+Final Relative Residual Norm = 8.505703e-09
 
 # Output file: solvers.out.206
 MGR Iterations = 52
-Final Relative Residual Norm = 7.229063e-09
+Final Relative Residual Norm = 8.514201e-09
 
 # Output file: solvers.out.207
 MGR Iterations = 50
-Final Relative Residual Norm = 7.963764e-09
+Final Relative Residual Norm = 9.941525e-09
 
 # Output file: solvers.out.208
-MGR Iterations = 15
-Final Relative Residual Norm = 7.901013e-09
+MGR Iterations = 16
+Final Relative Residual Norm = 5.064272e-09
 
 # Output file: solvers.out.209
-MGR Iterations = 14
-Final Relative Residual Norm = 7.032756e-09
+MGR Iterations = 15
+Final Relative Residual Norm = 7.693914e-09
 
 # Output file: solvers.out.210
-MGR Iterations = 22
-Final Relative Residual Norm = 6.427895e-09
+MGR Iterations = 23
+Final Relative Residual Norm = 4.625304e-09
 
 # Output file: solvers.out.211
 MGR Iterations = 29
-Final Relative Residual Norm = 5.774842e-09
+Final Relative Residual Norm = 8.665192e-09
 
 # Output file: solvers.out.212
-Iterations = 5
-Final Relative Residual Norm = 1.371340e-09
+Iterations = 11
+Final Relative Residual Norm = 3.738613e-09
 
 # Output file: solvers.out.213
 Iterations = 29
-Final Relative Residual Norm = 5.199506e-09
-
-# Output file: solvers.out.300
-hypre_ILU Iterations = 85
-Final Relative Residual Norm = 9.266244e-09
-
-# Output file: solvers.out.301
-hypre_ILU Iterations = 40
-Final Relative Residual Norm = 9.772377e-09
-
-# Output file: solvers.out.302
-hypre_ILU Iterations = 23
-Final Relative Residual Norm = 5.512717e-09
-
-# Output file: solvers.out.303
-hypre_ILU Iterations = 64
-Final Relative Residual Norm = 8.558467e-09
-
-# Output file: solvers.out.304
-hypre_ILU Iterations = 52
-Final Relative Residual Norm = 9.189235e-09
-
-# Output file: solvers.out.305
-hypre_ILU Iterations = 39
-Final Relative Residual Norm = 8.838453e-09
-
-# Output file: solvers.out.306
-hypre_ILU Iterations = 27
-Final Relative Residual Norm = 6.194020e-09
-
-# Output file: solvers.out.307
-hypre_ILU Iterations = 39
-Final Relative Residual Norm = 6.866281e-09
-
-# Output file: solvers.out.308
-hypre_ILU Iterations = 27
-Final Relative Residual Norm = 9.107681e-09
-
-# Output file: solvers.out.309
-hypre_ILU Iterations = 49
-Final Relative Residual Norm = 7.072947e-09
-
-# Output file: solvers.out.310
-hypre_ILU Iterations = 42
-Final Relative Residual Norm = 6.699477e-09
-
-# Output file: solvers.out.311
-hypre_ILU Iterations = 35
-Final Relative Residual Norm = 8.236857e-09
-
-# Output file: solvers.out.312
-hypre_ILU Iterations = 23
-Final Relative Residual Norm = 8.226180e-09
-
-# Output file: solvers.out.313
-GMRES Iterations = 25
-Final GMRES Relative Residual Norm = 3.968804e-09
-
-# Output file: solvers.out.314
-GMRES Iterations = 19
-Final GMRES Relative Residual Norm = 7.026445e-09
-
-# Output file: solvers.out.315
-GMRES Iterations = 20
-Final GMRES Relative Residual Norm = 7.908624e-09
-
-# Output file: solvers.out.316
-GMRES Iterations = 13
-Final GMRES Relative Residual Norm = 7.969372e-09
-
-# Output file: solvers.out.317
-FlexGMRES Iterations = 17
-Final FlexGMRES Relative Residual Norm = 7.140004e-09
-
-# Output file: solvers.out.318
-FlexGMRES Iterations = 9
-Final FlexGMRES Relative Residual Norm = 9.362787e-09
-
-# Output file: solvers.out.319
-FlexGMRES Iterations = 17
-Final FlexGMRES Relative Residual Norm = 8.299377e-09
-
-# Output file: solvers.out.320
-FlexGMRES Iterations = 9
-Final FlexGMRES Relative Residual Norm = 3.716965e-09
-
-# Output file: solvers.out.321
-FlexGMRES Iterations = 17
-Final FlexGMRES Relative Residual Norm = 4.489256e-09
-
-# Output file: solvers.out.322
-FlexGMRES Iterations = 9
-Final FlexGMRES Relative Residual Norm = 4.095675e-09
-
-# Output file: solvers.out.323
-FlexGMRES Iterations = 18
-Final FlexGMRES Relative Residual Norm = 3.782082e-09
-
-# Output file: solvers.out.324
-BoomerAMG Iterations = 10
-Final Relative Residual Norm = 9.027250e-09
+Final Relative Residual Norm = 5.268647e-09
 
-# Output file: solvers.out.325
-BoomerAMG Iterations = 9
-Final Relative Residual Norm = 2.499887e-09
+# Output file: solvers.out.404
+Iterations = 28
+Final Relative Residual Norm = 8.548826e-09
 
+# Output file: solvers.out.405
+Iterations = 22
+Final Relative Residual Norm = 7.996427e-09
diff --git a/external/hypre/src/test/TEST_ij/solvers.saved.lassen_cpu b/external/hypre/src/test/TEST_ij/solvers.saved.lassen_cpu
new file mode 100644
index 00000000..8b8f0e6b
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/solvers.saved.lassen_cpu
@@ -0,0 +1,326 @@
+# Output file: solvers.out.0
+Iterations = 7
+Final Relative Residual Norm = 3.087349e-09
+
+# Output file: solvers.out.1
+Iterations = 41
+Final Relative Residual Norm = 6.698760e-09
+
+# Output file: solvers.out.2
+GMRES Iterations = 7
+Final GMRES Relative Residual Norm = 4.829641e-09
+
+# Output file: solvers.out.3
+GMRES Iterations = 93
+Final GMRES Relative Residual Norm = 8.225662e-09
+
+# Output file: solvers.out.4
+Iterations = 9
+Final Relative Residual Norm = 3.697151e-09
+
+# Output file: solvers.out.5
+Iterations = 196
+Final Relative Residual Norm = 9.097622e-09
+
+# Output file: solvers.out.8
+Iterations = 41
+PCG_Iterations = 0
+DSCG_Iterations = 41
+Final Relative Residual Norm = 6.698760e-09
+
+# Output file: solvers.out.9
+Iterations = 11
+PCG_Iterations = 7
+DSCG_Iterations = 4
+Final Relative Residual Norm = 6.766130e-10
+
+# Output file: solvers.out.10
+Iterations = 9
+PCG_Iterations = 7
+DSCG_Iterations = 2
+Final Relative Residual Norm = 4.829641e-09
+
+# Output file: solvers.out.11
+Iterations = 7
+PCG_Iterations = 4
+DSCG_Iterations = 3
+Final Relative Residual Norm = 1.284758e-10
+
+# Output file: solvers.out.12
+
+
+COGMRES Iterations = 7
+Final COGMRES Relative Residual Norm = 4.829641e-09
+
+# Output file: solvers.out.13
+
+
+COGMRES Iterations = 93
+Final COGMRES Relative Residual Norm = 8.225662e-09
+
+# Output file: solvers.out.14
+
+
+COGMRES Iterations = 93
+Final COGMRES Relative Residual Norm = 8.225662e-09
+
+# Output file: solvers.out.15
+
+
+COGMRES Iterations = 93
+Final COGMRES Relative Residual Norm = 8.225662e-09
+
+# Output file: solvers.out.16
+
+
+COGMRES Iterations = 93
+Final COGMRES Relative Residual Norm = 8.225662e-09
+
+# Output file: solvers.out.17
+index 19 value -2.647363e-11
+
+GMRES Iterations = 7
+Final GMRES Relative Residual Norm = 4.829641e-09
+
+# Output file: solvers.out.18
+index 19 value -7.497266e-11
+
+GMRES Iterations = 93
+Final GMRES Relative Residual Norm = 8.225662e-09
+
+# Output file: solvers.out.19
+
+
+Iterations = 8
+Final Relative Residual Norm = 2.463498e-09
+
+# Output file: solvers.out.20
+
+
+GMRES Iterations = 7
+Final GMRES Relative Residual Norm = 5.912905e-10
+
+# Output file: solvers.out.21
+
+
+BoomerAMG Iterations = 23
+Final Relative Residual Norm = 5.119642e-09
+
+# Output file: solvers.out.22
+
+
+GMRES Iterations = 11
+Final GMRES Relative Residual Norm = 7.238674e-09
+
+# Output file: solvers.out.23
+
+
+BoomerAMG Iterations = 15
+Final Relative Residual Norm = 5.926430e-09
+
+# Output file: solvers.out.24
+
+
+GMRES Iterations = 9
+Final GMRES Relative Residual Norm = 2.174161e-09
+
+# Output file: solvers.out.25
+
+
+Iterations = 9
+Final Relative Residual Norm = 9.045045e-09
+
+# Output file: solvers.out.26
+
+
+Iterations = 18
+Final Relative Residual Norm = 9.458475e-09
+
+# Output file: solvers.out.sysh
+ Average Convergence Factor = 0.119752
+
+     Complexity:    grid = 1.613875
+                operator = 2.860093
+                   cycle = 5.719888
+
+# Output file: solvers.out.sysn
+ Average Convergence Factor = 0.232267
+
+     Complexity:    grid = 1.592000
+                operator = 2.633619
+                   cycle = 11.267164
+
+# Output file: solvers.out.sysu
+ Average Convergence Factor = 0.419934
+
+     Complexity:    grid = 1.614875
+                operator = 2.866222
+                   cycle = 5.732066
+
+# Output file: solvers.out.27
+Iterations = 12
+Final Relative Residual Norm = 5.876623e-09
+
+# Output file: solvers.out.28
+Iterations = 18
+Final Relative Residual Norm = 3.457366e-09
+
+# Output file: solvers.out.29
+Iterations = 13
+Final Relative Residual Norm = 4.536558e-09
+
+# Output file: solvers.out.30
+Iterations = 19
+Final Relative Residual Norm = 3.853111e-09
+
+# Output file: solvers.out.101
+LGMRES Iterations = 83
+Final LGMRES Relative Residual Norm = 8.591967e-09
+
+# Output file: solvers.out.102
+LGMRES Iterations = 7
+Final LGMRES Relative Residual Norm = 4.829641e-09
+
+# Output file: solvers.out.103
+FlexGMRES Iterations = 93
+Final FlexGMRES Relative Residual Norm = 8.225662e-09
+
+# Output file: solvers.out.104
+FlexGMRES Iterations = 7
+Final FlexGMRES Relative Residual Norm = 4.829641e-09
+
+# Output file: solvers.out.105
+Iterations = 15
+Final Relative Residual Norm = 2.852019e-09
+
+# Output file: solvers.out.106
+Iterations = 15
+Final Relative Residual Norm = 2.852019e-09
+
+# Output file: solvers.out.107
+Iterations = 22
+Final Relative Residual Norm = 4.376715e-09
+
+# Output file: solvers.out.108
+Iterations = 22
+Final Relative Residual Norm = 4.376715e-09
+
+# Output file: solvers.out.109
+Iterations = 17
+Final Relative Residual Norm = 6.163208e-09
+
+# Output file: solvers.out.110
+Iterations = 17
+Final Relative Residual Norm = 6.163208e-09
+
+# Output file: solvers.out.111
+Iterations = 29
+Final Relative Residual Norm = 8.452076e-09
+
+# Output file: solvers.out.112
+GMRES Iterations = 23
+Final GMRES Relative Residual Norm = 3.979845e-09
+
+# Output file: solvers.out.113
+GMRES Iterations = 25
+Final GMRES Relative Residual Norm = 8.744056e-09
+
+# Output file: solvers.out.114
+BoomerAMG Iterations = 16
+Final Relative Residual Norm = 9.190895e-09
+
+# Output file: solvers.out.115
+BoomerAMG Iterations = 17
+Final Relative Residual Norm = 4.095117e-09
+
+# Output file: solvers.out.116
+GMRES Iterations = 10
+Final GMRES Relative Residual Norm = 8.606250e-10
+
+# Output file: solvers.out.117
+GMRES Iterations = 9
+Final GMRES Relative Residual Norm = 9.119362e-09
+
+# Output file: solvers.out.118
+GMRES Iterations = 25
+Final GMRES Relative Residual Norm = 9.464475e-09
+
+# Output file: solvers.out.119
+GMRES Iterations = 17
+Final GMRES Relative Residual Norm = 3.995718e-09
+
+# Output file: solvers.out.121
+GMRES Iterations = 23
+Final GMRES Relative Residual Norm = 9.269997e-09
+
+# Output file: solvers.out.122
+GMRES Iterations = 17
+Final GMRES Relative Residual Norm = 3.995718e-09
+
+# Output file: solvers.out.120
+GMRES Iterations = 17
+Final GMRES Relative Residual Norm = 3.995717e-09
+
+# Output file: solvers.out.200
+MGR Iterations = 6
+Final Relative Residual Norm = 6.980274e-10
+
+# Output file: solvers.out.201
+MGR Iterations = 6
+Final Relative Residual Norm = 5.136059e-09
+
+# Output file: solvers.out.202
+MGR Iterations = 6
+Final Relative Residual Norm = 6.980274e-10
+
+# Output file: solvers.out.203
+MGR Iterations = 6
+Final Relative Residual Norm = 5.136059e-09
+
+# Output file: solvers.out.204
+MGR Iterations = 74
+Final Relative Residual Norm = 8.553484e-09
+
+# Output file: solvers.out.205
+MGR Iterations = 70
+Final Relative Residual Norm = 9.518056e-09
+
+# Output file: solvers.out.206
+MGR Iterations = 52
+Final Relative Residual Norm = 7.228497e-09
+
+# Output file: solvers.out.207
+MGR Iterations = 50
+Final Relative Residual Norm = 7.963764e-09
+
+# Output file: solvers.out.208
+MGR Iterations = 15
+Final Relative Residual Norm = 7.901013e-09
+
+# Output file: solvers.out.209
+MGR Iterations = 14
+Final Relative Residual Norm = 7.561893e-09
+
+# Output file: solvers.out.210
+MGR Iterations = 22
+Final Relative Residual Norm = 6.427895e-09
+
+# Output file: solvers.out.211
+MGR Iterations = 29
+Final Relative Residual Norm = 5.923832e-09
+
+# Output file: solvers.out.212
+Iterations = 5
+Final Relative Residual Norm = 1.371340e-09
+
+# Output file: solvers.out.213
+Iterations = 29
+Final Relative Residual Norm = 5.204677e-09
+
+# Output file: solvers.out.404
+Iterations = 30
+Final Relative Residual Norm = 8.259159e-09
+
+# Output file: solvers.out.405
+Iterations = 24
+Final Relative Residual Norm = 6.793588e-09
diff --git a/external/hypre/src/test/TEST_ij/solvers.saved.ray b/external/hypre/src/test/TEST_ij/solvers.saved.ray
deleted file mode 100644
index 8d00ee21..00000000
--- a/external/hypre/src/test/TEST_ij/solvers.saved.ray
+++ /dev/null
@@ -1,359 +0,0 @@
-# Output file: solvers.out.0
-Iterations = 11
-Final Relative Residual Norm = 7.964594e-09
-
-# Output file: solvers.out.1
-Iterations = 41
-Final Relative Residual Norm = 6.698760e-09
-
-# Output file: solvers.out.2
-GMRES Iterations = 12
-Final GMRES Relative Residual Norm = 2.545775e-09
-
-# Output file: solvers.out.3
-GMRES Iterations = 93
-Final GMRES Relative Residual Norm = 8.225662e-09
-
-# Output file: solvers.out.4
-Iterations = 9
-Final Relative Residual Norm = 9.889817e-09
-
-# Output file: solvers.out.5
-Iterations = 196
-Final Relative Residual Norm = 9.097622e-09
-
-# Output file: solvers.out.8
-Iterations = 41
-PCG_Iterations = 0
-DSCG_Iterations = 41
-Final Relative Residual Norm = 6.698760e-09
-
-# Output file: solvers.out.9
-Iterations = 11
-PCG_Iterations = 7
-DSCG_Iterations = 4
-Final Relative Residual Norm = 1.482757e-09
-
-# Output file: solvers.out.10
-Iterations = 10
-PCG_Iterations = 8
-DSCG_Iterations = 2
-Final Relative Residual Norm = 6.686412e-10
-
-# Output file: solvers.out.11
-Iterations = 7
-PCG_Iterations = 4
-DSCG_Iterations = 3
-Final Relative Residual Norm = 8.612722e-10
-
-# Output file: solvers.out.12
-
-
-COGMRES Iterations = 12
-Final COGMRES Relative Residual Norm = 2.545775e-09
-
-# Output file: solvers.out.13
-
-
-COGMRES Iterations = 93
-Final COGMRES Relative Residual Norm = 8.225662e-09
-
-# Output file: solvers.out.14
-
-
-COGMRES Iterations = 93
-Final COGMRES Relative Residual Norm = 8.225661e-09
-
-# Output file: solvers.out.15
-
-
-COGMRES Iterations = 93
-Final COGMRES Relative Residual Norm = 8.225662e-09
-
-# Output file: solvers.out.16
-
-
-COGMRES Iterations = 93
-Final COGMRES Relative Residual Norm = 8.225661e-09
-
-# Output file: solvers.out.17
-index 19 value -1.312641e-11
-
-GMRES Iterations = 12
-Final GMRES Relative Residual Norm = 2.545775e-09
-
-# Output file: solvers.out.18
-index 19 value -7.497266e-11
-
-GMRES Iterations = 93
-Final GMRES Relative Residual Norm = 8.225662e-09
-
-# Output file: solvers.out.sysh
- Average Convergence Factor = 0.209293
-
-     Complexity:    grid = 1.400375
-                operator = 2.672276
-                   cycle = 5.344534
-
-# Output file: solvers.out.sysn
- Average Convergence Factor = 0.537935
-
-     Complexity:    grid = 1.391500
-                operator = 2.082687
-                   cycle = 10.165075
-
-# Output file: solvers.out.sysu
- Average Convergence Factor = 0.777642
-
-     Complexity:    grid = 1.395687
-                operator = 2.731768
-                   cycle = 5.463419
-
-# Output file: solvers.out.101
-LGMRES Iterations = 83
-Final LGMRES Relative Residual Norm = 8.591967e-09
-
-# Output file: solvers.out.102
-LGMRES Iterations = 13
-Final LGMRES Relative Residual Norm = 2.815593e-09
-
-# Output file: solvers.out.103
-FlexGMRES Iterations = 93
-Final FlexGMRES Relative Residual Norm = 8.225662e-09
-
-# Output file: solvers.out.104
-FlexGMRES Iterations = 12
-Final FlexGMRES Relative Residual Norm = 2.545775e-09
-
-# Output file: solvers.out.105
-Iterations = 19
-Final Relative Residual Norm = 4.347930e-09
-
-# Output file: solvers.out.106
-Iterations = 19
-Final Relative Residual Norm = 4.347930e-09
-
-# Output file: solvers.out.107
-Iterations = 29
-Final Relative Residual Norm = 7.167010e-09
-
-# Output file: solvers.out.108
-Iterations = 29
-Final Relative Residual Norm = 7.167601e-09
-
-# Output file: solvers.out.109
-Iterations = 20
-Final Relative Residual Norm = 8.005329e-09
-
-# Output file: solvers.out.110
-Iterations = 20
-Final Relative Residual Norm = 8.005329e-09
-
-# Output file: solvers.out.111
-Iterations = 32
-Final Relative Residual Norm = 6.308682e-09
-
-# Output file: solvers.out.112
-GMRES Iterations = 38
-Final GMRES Relative Residual Norm = 7.222663e-09
-
-# Output file: solvers.out.113
-GMRES Iterations = 26
-Final GMRES Relative Residual Norm = 6.905243e-09
-
-# Output file: solvers.out.114
-BoomerAMG Iterations = 34
-Final Relative Residual Norm = 6.453416e-09
-
-# Output file: solvers.out.115
-BoomerAMG Iterations = 34
-Final Relative Residual Norm = 5.870423e-09
-
-# Output file: solvers.out.116
-GMRES Iterations = 14
-Final GMRES Relative Residual Norm = 9.589221e-09
-
-# Output file: solvers.out.117
-GMRES Iterations = 14
-Final GMRES Relative Residual Norm = 9.589221e-09
-
-# Output file: solvers.out.118
-GMRES Iterations = 27
-Final GMRES Relative Residual Norm = 5.487850e-09
-
-# Output file: solvers.out.119
-GMRES Iterations = 19
-Final GMRES Relative Residual Norm = 5.040776e-09
-
-# Output file: solvers.out.121
-GMRES Iterations = 25
-Final GMRES Relative Residual Norm = 7.473980e-09
-
-# Output file: solvers.out.122
-GMRES Iterations = 19
-Final GMRES Relative Residual Norm = 5.040776e-09
-
-# Output file: solvers.out.120
-GMRES Iterations = 19
-Final GMRES Relative Residual Norm = 5.041387e-09
-
-# Output file: solvers.out.200
-MGR Iterations = 6
-Final Relative Residual Norm = 6.980276e-10
-
-# Output file: solvers.out.201
-MGR Iterations = 6
-Final Relative Residual Norm = 5.136059e-09
-
-# Output file: solvers.out.202
-MGR Iterations = 6
-Final Relative Residual Norm = 6.980276e-10
-
-# Output file: solvers.out.203
-MGR Iterations = 6
-Final Relative Residual Norm = 5.136059e-09
-
-# Output file: solvers.out.204
-MGR Iterations = 74
-Final Relative Residual Norm = 8.553927e-09
-
-# Output file: solvers.out.205
-MGR Iterations = 70
-Final Relative Residual Norm = 9.518056e-09
-
-# Output file: solvers.out.206
-MGR Iterations = 52
-Final Relative Residual Norm = 7.229063e-09
-
-# Output file: solvers.out.207
-MGR Iterations = 50
-Final Relative Residual Norm = 7.963764e-09
-
-# Output file: solvers.out.208
-MGR Iterations = 15
-Final Relative Residual Norm = 7.901013e-09
-
-# Output file: solvers.out.209
-MGR Iterations = 14
-Final Relative Residual Norm = 7.032756e-09
-
-# Output file: solvers.out.210
-MGR Iterations = 22
-Final Relative Residual Norm = 6.427895e-09
-
-# Output file: solvers.out.211
-MGR Iterations = 29
-Final Relative Residual Norm = 5.774842e-09
-
-# Output file: solvers.out.212
-Iterations = 5
-Final Relative Residual Norm = 1.371340e-09
-
-# Output file: solvers.out.213
-Iterations = 29
-Final Relative Residual Norm = 5.199506e-09
-
-# Output file: solvers.out.300
-hypre_ILU Iterations = 85
-Final Relative Residual Norm = 9.266244e-09
-
-# Output file: solvers.out.301
-hypre_ILU Iterations = 40
-Final Relative Residual Norm = 9.772377e-09
-
-# Output file: solvers.out.302
-hypre_ILU Iterations = 23
-Final Relative Residual Norm = 5.512717e-09
-
-# Output file: solvers.out.303
-hypre_ILU Iterations = 64
-Final Relative Residual Norm = 8.558467e-09
-
-# Output file: solvers.out.304
-hypre_ILU Iterations = 52
-Final Relative Residual Norm = 9.189235e-09
-
-# Output file: solvers.out.305
-hypre_ILU Iterations = 39
-Final Relative Residual Norm = 8.838453e-09
-
-# Output file: solvers.out.306
-hypre_ILU Iterations = 27
-Final Relative Residual Norm = 6.194020e-09
-
-# Output file: solvers.out.307
-hypre_ILU Iterations = 39
-Final Relative Residual Norm = 6.866281e-09
-
-# Output file: solvers.out.308
-hypre_ILU Iterations = 27
-Final Relative Residual Norm = 9.107681e-09
-
-# Output file: solvers.out.309
-hypre_ILU Iterations = 49
-Final Relative Residual Norm = 7.072947e-09
-
-# Output file: solvers.out.310
-hypre_ILU Iterations = 42
-Final Relative Residual Norm = 6.699477e-09
-
-# Output file: solvers.out.311
-hypre_ILU Iterations = 35
-Final Relative Residual Norm = 8.236857e-09
-
-# Output file: solvers.out.312
-hypre_ILU Iterations = 23
-Final Relative Residual Norm = 8.226180e-09
-
-# Output file: solvers.out.313
-GMRES Iterations = 25
-Final GMRES Relative Residual Norm = 3.968804e-09
-
-# Output file: solvers.out.314
-GMRES Iterations = 19
-Final GMRES Relative Residual Norm = 7.026445e-09
-
-# Output file: solvers.out.315
-GMRES Iterations = 20
-Final GMRES Relative Residual Norm = 7.908624e-09
-
-# Output file: solvers.out.316
-GMRES Iterations = 13
-Final GMRES Relative Residual Norm = 7.969372e-09
-
-# Output file: solvers.out.317
-FlexGMRES Iterations = 17
-Final FlexGMRES Relative Residual Norm = 7.140004e-09
-
-# Output file: solvers.out.318
-FlexGMRES Iterations = 9
-Final FlexGMRES Relative Residual Norm = 9.362787e-09
-
-# Output file: solvers.out.319
-FlexGMRES Iterations = 17
-Final FlexGMRES Relative Residual Norm = 8.299377e-09
-
-# Output file: solvers.out.320
-FlexGMRES Iterations = 9
-Final FlexGMRES Relative Residual Norm = 3.716965e-09
-
-# Output file: solvers.out.321
-FlexGMRES Iterations = 17
-Final FlexGMRES Relative Residual Norm = 4.489256e-09
-
-# Output file: solvers.out.322
-FlexGMRES Iterations = 9
-Final FlexGMRES Relative Residual Norm = 4.095675e-09
-
-# Output file: solvers.out.323
-FlexGMRES Iterations = 18
-Final FlexGMRES Relative Residual Norm = 3.782082e-09
-
-# Output file: solvers.out.324
-BoomerAMG Iterations = 10
-Final Relative Residual Norm = 9.027251e-09
-
-# Output file: solvers.out.325
-BoomerAMG Iterations = 9
-Final Relative Residual Norm = 2.499887e-09
-
diff --git a/external/hypre/src/test/TEST_ij/solvers.sh b/external/hypre/src/test/TEST_ij/solvers.sh
old mode 100644
new mode 100755
index 6231754f..661a0609
--- a/external/hypre/src/test/TEST_ij/solvers.sh
+++ b/external/hypre/src/test/TEST_ij/solvers.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -32,23 +32,6 @@ tail -17 ${TNAME}.out.200 | head -6 > ${TNAME}.mgr_testdata
 tail -17 ${TNAME}.out.202 | head -6 > ${TNAME}.mgr_testdata.temp
 diff ${TNAME}.mgr_testdata ${TNAME}.mgr_testdata.temp >&2
 
-#=============================================================================
-tail -3 ${TNAME}.out.400.p | head -2 > ${TNAME}.testdata
-tail -3 ${TNAME}.out.400.n | head -2 > ${TNAME}.testdata.temp
-diff ${TNAME}.testdata ${TNAME}.testdata.temp >&2
-
-tail -3 ${TNAME}.out.401.p | head -2 > ${TNAME}.testdata
-tail -3 ${TNAME}.out.401.n | head -2 > ${TNAME}.testdata.temp
-diff ${TNAME}.testdata ${TNAME}.testdata.temp >&2
-
-tail -3 ${TNAME}.out.402.p | head -2 > ${TNAME}.testdata
-tail -3 ${TNAME}.out.402.n | head -2 > ${TNAME}.testdata.temp
-diff ${TNAME}.testdata ${TNAME}.testdata.temp >&2
-
-tail -3 ${TNAME}.out.403.p | head -2 > ${TNAME}.testdata
-tail -3 ${TNAME}.out.403.n | head -2 > ${TNAME}.testdata.temp
-diff ${TNAME}.testdata ${TNAME}.testdata.temp >&2
-
 #=============================================================================
 # compare with baseline case
 #=============================================================================
@@ -89,6 +72,14 @@ FILES="\
  ${TNAME}.out.16\
  ${TNAME}.out.17\
  ${TNAME}.out.18\
+ ${TNAME}.out.19\
+ ${TNAME}.out.20\
+ ${TNAME}.out.21\
+ ${TNAME}.out.22\
+ ${TNAME}.out.23\
+ ${TNAME}.out.24\
+ ${TNAME}.out.25\
+ ${TNAME}.out.26
 "
 
 for i in $FILES
@@ -124,6 +115,10 @@ if [ "$OUTCOUNT" != "$RUNCOUNT" ]; then
 fi
 
 FILES="\
+ ${TNAME}.out.27\
+ ${TNAME}.out.28\
+ ${TNAME}.out.29\
+ ${TNAME}.out.30\
  ${TNAME}.out.101\
  ${TNAME}.out.102\
  ${TNAME}.out.103\
@@ -176,6 +171,8 @@ FILES="\
  ${TNAME}.out.211\
  ${TNAME}.out.212\
  ${TNAME}.out.213\
+ ${TNAME}.out.404\
+ ${TNAME}.out.405\
 "
 
 for i in $FILES
@@ -191,48 +188,6 @@ if [ "$OUTCOUNT" != "$RUNCOUNT" ]; then
    echo "Incorrect number of runs in ${TNAME}.out" >&2
 fi
 
-FILES="\
- ${TNAME}.out.300\
- ${TNAME}.out.301\
- ${TNAME}.out.302\
- ${TNAME}.out.303\
- ${TNAME}.out.304\
- ${TNAME}.out.305\
- ${TNAME}.out.306\
- ${TNAME}.out.307\
- ${TNAME}.out.308\
- ${TNAME}.out.309\
- ${TNAME}.out.310\
- ${TNAME}.out.311\
- ${TNAME}.out.312\
- ${TNAME}.out.313\
- ${TNAME}.out.314\
- ${TNAME}.out.315\
- ${TNAME}.out.316\
- ${TNAME}.out.317\
- ${TNAME}.out.318\
- ${TNAME}.out.319\
- ${TNAME}.out.320\
- ${TNAME}.out.321\
- ${TNAME}.out.322\
- ${TNAME}.out.323\
- ${TNAME}.out.324\
- ${TNAME}.out.325\
-"
-
-for i in $FILES
-do
-  echo "# Output file: $i"
-  tail -3 $i
-done > ${TNAME}.out.f
-
-# Make sure that the output file is reasonable
-RUNCOUNT=`echo $FILES | wc -w`
-OUTCOUNT=`grep "Iterations" ${TNAME}.out.f | wc -l`
-if [ "$OUTCOUNT" != "$RUNCOUNT" ]; then
-   echo "Incorrect number of runs in ${TNAME}.out" >&2
-fi
-
 # put all of the output files together
 cat ${TNAME}.out.[a-z] > ${TNAME}.out
 
diff --git a/external/hypre/src/test/TEST_ij/state.jobs b/external/hypre/src/test/TEST_ij/state.jobs
new file mode 100755
index 00000000..c7ab0bc1
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/state.jobs
@@ -0,0 +1,13 @@
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+#=============================================================================
+# Test library initialization (sequential and parallel)
+#=============================================================================
+
+mpirun -np 1 ./ij -test_init > state.out.1
+mpirun -np 4 ./ij -test_init > state.out.100
+
diff --git a/external/hypre/src/test/TEST_ij/state.saved b/external/hypre/src/test/TEST_ij/state.saved
new file mode 100644
index 00000000..911e5e90
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/state.saved
@@ -0,0 +1,13 @@
+# Output file: state.out.1
+hypre library has not been initialized or finalized yet
+hypre library has been initialized
+hypre library has been finalized
+hypre library has been re-initialized
+hypre library has been finalized
+
+# Output file: state.out.100
+hypre library has not been initialized or finalized yet
+hypre library has been initialized
+hypre library has been finalized
+hypre library has been re-initialized
+hypre library has been finalized
diff --git a/external/hypre/src/test/TEST_ij/state.saved.aurora b/external/hypre/src/test/TEST_ij/state.saved.aurora
new file mode 100644
index 00000000..2f62682b
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/state.saved.aurora
@@ -0,0 +1,8 @@
+# Output file: state.out.1
+hypre library has been finalized
+hypre library has been re-initialized
+hypre library has been finalized
+# Output file: state.out.100
+hypre library has been finalized
+hypre library has been re-initialized
+hypre library has been finalized
diff --git a/external/hypre/src/test/TEST_ij/state.saved.lassen b/external/hypre/src/test/TEST_ij/state.saved.lassen
new file mode 100644
index 00000000..911e5e90
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/state.saved.lassen
@@ -0,0 +1,13 @@
+# Output file: state.out.1
+hypre library has not been initialized or finalized yet
+hypre library has been initialized
+hypre library has been finalized
+hypre library has been re-initialized
+hypre library has been finalized
+
+# Output file: state.out.100
+hypre library has not been initialized or finalized yet
+hypre library has been initialized
+hypre library has been finalized
+hypre library has been re-initialized
+hypre library has been finalized
diff --git a/external/hypre/src/test/TEST_ij/state.saved.lassen_cpu b/external/hypre/src/test/TEST_ij/state.saved.lassen_cpu
new file mode 100644
index 00000000..911e5e90
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/state.saved.lassen_cpu
@@ -0,0 +1,13 @@
+# Output file: state.out.1
+hypre library has not been initialized or finalized yet
+hypre library has been initialized
+hypre library has been finalized
+hypre library has been re-initialized
+hypre library has been finalized
+
+# Output file: state.out.100
+hypre library has not been initialized or finalized yet
+hypre library has been initialized
+hypre library has been finalized
+hypre library has been re-initialized
+hypre library has been finalized
diff --git a/external/hypre/src/test/TEST_ij/state.sh b/external/hypre/src/test/TEST_ij/state.sh
new file mode 100755
index 00000000..ea1e7538
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/state.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+TNAME=`basename $0 .sh`
+
+#=============================================================================
+# Compare with baseline case
+#=============================================================================
+
+FILES="\
+ ${TNAME}.out.1\
+ ${TNAME}.out.100\
+"
+
+for i in $FILES
+do
+  echo "# Output file: $i"
+  tail -3 $i
+done > ${TNAME}.out
+
diff --git a/external/hypre/src/test/TEST_ij/tst.00000 b/external/hypre/src/test/TEST_ij/tst.00000
new file mode 100644
index 00000000..63198e18
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/tst.00000
@@ -0,0 +1,21 @@
+0 15 0 15
+0 0 2.0
+1 1 2.0
+2 2 2.0
+2 3 -1.0
+3 2 -1.0
+3 3 2.0
+4 4 2.0
+5 5 2.0
+6 6 2.0
+7 7 2.0
+8 8 2.0
+9 9 2.0
+9 10 -1.0
+10 10 2.0
+11 11 2.0
+12 12 2.0
+13 13 2.0
+14 13 -1.0
+14 14 2.0
+15 15 2.0
diff --git a/external/hypre/src/test/TEST_ij/tst.00001 b/external/hypre/src/test/TEST_ij/tst.00001
new file mode 100644
index 00000000..856a4b76
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/tst.00001
@@ -0,0 +1,20 @@
+16 31 16 31
+16 16 2.0
+17 17 2.0
+18 18 2.0
+18 19 -1.0
+19 18 -1.0
+19 19 2.0
+20 20 2.0
+21 21 2.0
+22 22 2.0
+23 23 2.0
+24 24 2.0
+25 25 2.0
+25 26 -1.0
+26 26 2.0
+27 27 2.0
+28 28 2.0
+29 29 2.0
+30 30 2.0
+31 31 2.0
diff --git a/external/hypre/src/test/TEST_ij/vector.jobs b/external/hypre/src/test/TEST_ij/vector.jobs
new file mode 100755
index 00000000..3b65f7b2
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/vector.jobs
@@ -0,0 +1,51 @@
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+#=============================================================================
+# A. set/get: multi-component vector tests
+#=============================================================================
+
+mpirun -np 1 ./ij -test_multivec 1 -solver -2 -rhsisone -nc 2 > vector.out.A0
+mpirun -np 1 ./ij -test_multivec 1 -solver -2 -rhsisone -nc 4 > vector.out.A1
+mpirun -np 1 ./ij -test_multivec 1 -solver -2 -rhsisone -nc 7 > vector.out.A2
+mpirun -np 2 ./ij -test_multivec 1 -solver -2 -rhsisone -nc 7 > vector.out.A3
+mpirun -np 4 ./ij -test_multivec 1 -solver -2 -rhsisone -nc 7 > vector.out.A4
+mpirun -np 1 ./ij -test_multivec 1 -solver -2 -rhsrand  -nc 3 > vector.out.A5
+mpirun -np 2 ./ij -test_multivec 1 -solver -2 -rhsrand  -nc 3 > vector.out.A6
+mpirun -np 1 ./ij -test_multivec 1 -solver -2 -rhszero  -nc 2 > vector.out.A7
+mpirun -np 2 ./ij -test_multivec 1 -solver -2 -rhszero  -nc 2 > vector.out.A8
+mpirun -np 1 ./ij -test_multivec 1 -solver -2 -xisone   -nc 2 > vector.out.A9
+mpirun -np 2 ./ij -test_multivec 1 -solver -2 -xisone   -nc 2 > vector.out.A10
+
+#=============================================================================
+# B. krylov solvers: multi-component vector tests
+#=============================================================================
+
+# Diagonal scaling (sequential)
+mpirun -np 1 ./ij -n 8 8 8 -solver 2  -rhsisone -nc 4  > vector.out.B0
+mpirun -np 1 ./ij -n 8 8 8 -solver 4  -rhsisone -nc 4  > vector.out.B1
+mpirun -np 1 ./ij -n 8 8 8 -solver 6  -rhsisone -nc 4  > vector.out.B2
+mpirun -np 1 ./ij -n 8 8 8 -solver 10 -rhsisone -nc 4  > vector.out.B3
+mpirun -np 1 ./ij -n 8 8 8 -solver 50 -rhsisone -nc 4  > vector.out.B4
+mpirun -np 1 ./ij -n 8 8 8 -solver 60 -rhsisone -nc 4  > vector.out.B5
+mpirun -np 1 ./ij -n 8 8 8 -solver 2  -rhsisone -nc 3  > vector.out.B6
+mpirun -np 1 ./ij -n 8 8 8 -solver 2  -rhsisone -nc 7  > vector.out.B7
+mpirun -np 1 ./ij -n 8 8 8 -solver 2  -rhsisone -nc 10 > vector.out.B8
+mpirun -np 1 ./ij -n 8 8 8 -solver 2  -rhsisone -nc 15 > vector.out.B9
+mpirun -np 1 ./ij -n 8 8 8 -solver 2  -rhsisone -nc 32 > vector.out.B10
+
+# Diagonal scaling (parallel)
+mpirun -np 4 ./ij -n 8 8 8 -solver 2  -rhsisone -nc 6  > vector.out.B100
+mpirun -np 4 ./ij -n 8 8 8 -solver 4  -rhsisone -nc 6  > vector.out.B101
+mpirun -np 4 ./ij -n 8 8 8 -solver 6  -rhsisone -nc 6  > vector.out.B102
+mpirun -np 4 ./ij -n 8 8 8 -solver 10 -rhsisone -nc 6  > vector.out.B103
+mpirun -np 4 ./ij -n 8 8 8 -solver 50 -rhsisone -nc 6  > vector.out.B104
+mpirun -np 4 ./ij -n 8 8 8 -solver 60 -rhsisone -nc 6  > vector.out.B105
+mpirun -np 4 ./ij -n 8 8 8 -solver 2  -rhsisone -nc 3  > vector.out.B106
+mpirun -np 4 ./ij -n 8 8 8 -solver 2  -rhsisone -nc 7  > vector.out.B107
+mpirun -np 4 ./ij -n 8 8 8 -solver 2  -rhsisone -nc 10 > vector.out.B108
+mpirun -np 4 ./ij -n 8 8 8 -solver 2  -rhsisone -nc 15 > vector.out.B109
+mpirun -np 4 ./ij -n 8 8 8 -solver 2  -rhsisone -nc 32 > vector.out.B110
diff --git a/external/hypre/src/test/TEST_ij/vector.saved b/external/hypre/src/test/TEST_ij/vector.saved
new file mode 100644
index 00000000..1cdae576
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/vector.saved
@@ -0,0 +1,121 @@
+# Output file: vector.out.A0
+Vector/Multivector error = 0.000000e+00
+
+# Output file: vector.out.A1
+Vector/Multivector error = 0.000000e+00
+
+# Output file: vector.out.A2
+Vector/Multivector error = 0.000000e+00
+
+# Output file: vector.out.A3
+Vector/Multivector error = 0.000000e+00
+
+# Output file: vector.out.A4
+Vector/Multivector error = 0.000000e+00
+
+# Output file: vector.out.A5
+Vector/Multivector error = 0.000000e+00
+
+# Output file: vector.out.A6
+Vector/Multivector error = 0.000000e+00
+
+# Output file: vector.out.A7
+Vector/Multivector error = 0.000000e+00
+
+# Output file: vector.out.A8
+Vector/Multivector error = 0.000000e+00
+
+# Output file: vector.out.A9
+Vector/Multivector error = 0.000000e+00
+
+# Output file: vector.out.A10
+Vector/Multivector error = 0.000000e+00
+
+# Output file: vector.out.B0
+Iterations = 18
+Final Relative Residual Norm = 3.923978e-09
+
+# Output file: vector.out.B1
+GMRES Iterations = 54
+Final GMRES Relative Residual Norm = 7.982372e-09
+
+# Output file: vector.out.B2
+Iterations = 202
+Final Relative Residual Norm = 9.657758e-09
+
+# Output file: vector.out.B3
+BiCGSTAB Iterations = 12
+Final BiCGSTAB Relative Residual Norm = 6.282586e-09
+
+# Output file: vector.out.B4
+LGMRES Iterations = 53
+Final LGMRES Relative Residual Norm = 8.975949e-09
+
+# Output file: vector.out.B5
+FlexGMRES Iterations = 54
+Final FlexGMRES Relative Residual Norm = 7.982372e-09
+
+# Output file: vector.out.B6
+Iterations = 18
+Final Relative Residual Norm = 3.923978e-09
+
+# Output file: vector.out.B7
+Iterations = 18
+Final Relative Residual Norm = 3.923978e-09
+
+# Output file: vector.out.B8
+Iterations = 18
+Final Relative Residual Norm = 3.923978e-09
+
+# Output file: vector.out.B9
+Iterations = 18
+Final Relative Residual Norm = 3.923978e-09
+
+# Output file: vector.out.B10
+Iterations = 18
+Final Relative Residual Norm = 3.923978e-09
+
+# Output file: vector.out.B100
+Iterations = 18
+Final Relative Residual Norm = 3.923978e-09
+
+# Output file: vector.out.B101
+GMRES Iterations = 54
+Final GMRES Relative Residual Norm = 7.982371e-09
+
+# Output file: vector.out.B102
+Iterations = 202
+Final Relative Residual Norm = 9.504933e-09
+
+# Output file: vector.out.B103
+BiCGSTAB Iterations = 12
+Final BiCGSTAB Relative Residual Norm = 6.282586e-09
+
+# Output file: vector.out.B104
+LGMRES Iterations = 53
+Final LGMRES Relative Residual Norm = 8.975947e-09
+
+# Output file: vector.out.B105
+FlexGMRES Iterations = 54
+Final FlexGMRES Relative Residual Norm = 7.982371e-09
+
+# Output file: vector.out.B106
+Iterations = 18
+Final Relative Residual Norm = 3.923978e-09
+
+# Output file: vector.out.B107
+Iterations = 18
+Final Relative Residual Norm = 3.923978e-09
+
+# Output file: vector.out.B108
+Iterations = 18
+Final Relative Residual Norm = 3.923978e-09
+
+# Output file: vector.out.B109
+Iterations = 18
+Final Relative Residual Norm = 3.923978e-09
+
+# Output file: vector.out.B110
+Iterations = 18
+Final Relative Residual Norm = 3.923978e-09
+
diff --git a/external/hypre/src/test/TEST_ij/vector.saved.aurora b/external/hypre/src/test/TEST_ij/vector.saved.aurora
new file mode 100644
index 00000000..f214749c
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/vector.saved.aurora
@@ -0,0 +1,121 @@
+# Output file: vector.out.A0
+Vector/Multivector error = 0.000000e+00
+
+# Output file: vector.out.A1
+Vector/Multivector error = 0.000000e+00
+
+# Output file: vector.out.A2
+Vector/Multivector error = 0.000000e+00
+
+# Output file: vector.out.A3
+Vector/Multivector error = 0.000000e+00
+
+# Output file: vector.out.A4
+Vector/Multivector error = 0.000000e+00
+
+# Output file: vector.out.A5
+Vector/Multivector error = 0.000000e+00
+
+# Output file: vector.out.A6
+Vector/Multivector error = 0.000000e+00
+
+# Output file: vector.out.A7
+Vector/Multivector error = 0.000000e+00
+
+# Output file: vector.out.A8
+Vector/Multivector error = 0.000000e+00
+
+# Output file: vector.out.A9
+Vector/Multivector error = 0.000000e+00
+
+# Output file: vector.out.A10
+Vector/Multivector error = 0.000000e+00
+
+# Output file: vector.out.B0
+Iterations = 18
+Final Relative Residual Norm = 3.923978e-09
+
+# Output file: vector.out.B1
+GMRES Iterations = 54
+Final GMRES Relative Residual Norm = 7.982371e-09
+
+# Output file: vector.out.B2
+Iterations = 202
+Final Relative Residual Norm = 9.559932e-09
+
+# Output file: vector.out.B3
+BiCGSTAB Iterations = 12
+Final BiCGSTAB Relative Residual Norm = 6.282586e-09
+
+# Output file: vector.out.B4
+LGMRES Iterations = 53
+Final LGMRES Relative Residual Norm = 8.975949e-09
+
+# Output file: vector.out.B5
+FlexGMRES Iterations = 54
+Final FlexGMRES Relative Residual Norm = 7.982371e-09
+
+# Output file: vector.out.B6
+Iterations = 18
+Final Relative Residual Norm = 3.923978e-09
+
+# Output file: vector.out.B7
+Iterations = 18
+Final Relative Residual Norm = 3.923978e-09
+
+# Output file: vector.out.B8
+Iterations = 18
+Final Relative Residual Norm = 3.923978e-09
+
+# Output file: vector.out.B9
+Iterations = 18
+Final Relative Residual Norm = 3.923978e-09
+
+# Output file: vector.out.B10
+Iterations = 18
+Final Relative Residual Norm = 3.923978e-09
+
+# Output file: vector.out.B100
+Iterations = 18
+Final Relative Residual Norm = 3.923978e-09
+
+# Output file: vector.out.B101
+GMRES Iterations = 54
+Final GMRES Relative Residual Norm = 7.982371e-09
+
+# Output file: vector.out.B102
+Iterations = 202
+Final Relative Residual Norm = 9.508045e-09
+
+# Output file: vector.out.B103
+BiCGSTAB Iterations = 12
+Final BiCGSTAB Relative Residual Norm = 6.282586e-09
+
+# Output file: vector.out.B104
+LGMRES Iterations = 53
+Final LGMRES Relative Residual Norm = 8.975948e-09
+
+# Output file: vector.out.B105
+FlexGMRES Iterations = 54
+Final FlexGMRES Relative Residual Norm = 7.982371e-09
+
+# Output file: vector.out.B106
+Iterations = 18
+Final Relative Residual Norm = 3.923978e-09
+
+# Output file: vector.out.B107
+Iterations = 18
+Final Relative Residual Norm = 3.923978e-09
+
+# Output file: vector.out.B108
+Iterations = 18
+Final Relative Residual Norm = 3.923978e-09
+
+# Output file: vector.out.B109
+Iterations = 18
+Final Relative Residual Norm = 3.923978e-09
+
+# Output file: vector.out.B110
+Iterations = 18
+Final Relative Residual Norm = 3.923978e-09
+
diff --git a/external/hypre/src/test/TEST_ij/vector.saved.lassen b/external/hypre/src/test/TEST_ij/vector.saved.lassen
new file mode 100644
index 00000000..5d1d219e
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/vector.saved.lassen
@@ -0,0 +1,121 @@
+# Output file: vector.out.A0
+Vector/Multivector error = 0.000000e+00
+
+# Output file: vector.out.A1
+Vector/Multivector error = 0.000000e+00
+
+# Output file: vector.out.A2
+Vector/Multivector error = 0.000000e+00
+
+# Output file: vector.out.A3
+Vector/Multivector error = 0.000000e+00
+
+# Output file: vector.out.A4
+Vector/Multivector error = 0.000000e+00
+
+# Output file: vector.out.A5
+Vector/Multivector error = 0.000000e+00
+
+# Output file: vector.out.A6
+Vector/Multivector error = 0.000000e+00
+
+# Output file: vector.out.A7
+Vector/Multivector error = 0.000000e+00
+
+# Output file: vector.out.A8
+Vector/Multivector error = 0.000000e+00
+
+# Output file: vector.out.A9
+Vector/Multivector error = 0.000000e+00
+
+# Output file: vector.out.A10
+Vector/Multivector error = 0.000000e+00
+
+# Output file: vector.out.B0
+Iterations = 18
+Final Relative Residual Norm = 3.923978e-09
+
+# Output file: vector.out.B1
+GMRES Iterations = 54
+Final GMRES Relative Residual Norm = 7.982372e-09
+
+# Output file: vector.out.B2
+Iterations = 202
+Final Relative Residual Norm = 9.613027e-09
+
+# Output file: vector.out.B3
+BiCGSTAB Iterations = 12
+Final BiCGSTAB Relative Residual Norm = 6.282586e-09
+
+# Output file: vector.out.B4
+LGMRES Iterations = 53
+Final LGMRES Relative Residual Norm = 8.975949e-09
+
+# Output file: vector.out.B5
+FlexGMRES Iterations = 54
+Final FlexGMRES Relative Residual Norm = 7.982372e-09
+
+# Output file: vector.out.B6
+Iterations = 18
+Final Relative Residual Norm = 3.923978e-09
+
+# Output file: vector.out.B7
+Iterations = 18
+Final Relative Residual Norm = 3.923978e-09
+
+# Output file: vector.out.B8
+Iterations = 18
+Final Relative Residual Norm = 3.923978e-09
+
+# Output file: vector.out.B9
+Iterations = 18
+Final Relative Residual Norm = 3.923978e-09
+
+# Output file: vector.out.B10
+Iterations = 18
+Final Relative Residual Norm = 3.923978e-09
+
+# Output file: vector.out.B100
+Iterations = 18
+Final Relative Residual Norm = 3.923978e-09
+
+# Output file: vector.out.B101
+GMRES Iterations = 54
+Final GMRES Relative Residual Norm = 7.982371e-09
+
+# Output file: vector.out.B102
+Iterations = 202
+Final Relative Residual Norm = 9.550922e-09
+
+# Output file: vector.out.B103
+BiCGSTAB Iterations = 12
+Final BiCGSTAB Relative Residual Norm = 6.282586e-09
+
+# Output file: vector.out.B104
+LGMRES Iterations = 53
+Final LGMRES Relative Residual Norm = 8.975948e-09
+
+# Output file: vector.out.B105
+FlexGMRES Iterations = 54
+Final FlexGMRES Relative Residual Norm = 7.982371e-09
+
+# Output file: vector.out.B106
+Iterations = 18
+Final Relative Residual Norm = 3.923978e-09
+
+# Output file: vector.out.B107
+Iterations = 18
+Final Relative Residual Norm = 3.923978e-09
+
+# Output file: vector.out.B108
+Iterations = 18
+Final Relative Residual Norm = 3.923978e-09
+
+# Output file: vector.out.B109
+Iterations = 18
+Final Relative Residual Norm = 3.923978e-09
+
+# Output file: vector.out.B110
+Iterations = 18
+Final Relative Residual Norm = 3.923978e-09
+
diff --git a/external/hypre/src/test/TEST_ij/vector.saved.lassen_cpu b/external/hypre/src/test/TEST_ij/vector.saved.lassen_cpu
new file mode 100644
index 00000000..911cdbda
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/vector.saved.lassen_cpu
@@ -0,0 +1,121 @@
+# Output file: vector.out.A0
+Vector/Multivector error = 0.000000e+00
+
+# Output file: vector.out.A1
+Vector/Multivector error = 0.000000e+00
+
+# Output file: vector.out.A2
+Vector/Multivector error = 0.000000e+00
+
+# Output file: vector.out.A3
+Vector/Multivector error = 0.000000e+00
+
+# Output file: vector.out.A4
+Vector/Multivector error = 0.000000e+00
+
+# Output file: vector.out.A5
+Vector/Multivector error = 0.000000e+00
+
+# Output file: vector.out.A6
+Vector/Multivector error = 0.000000e+00
+
+# Output file: vector.out.A7
+Vector/Multivector error = 0.000000e+00
+
+# Output file: vector.out.A8
+Vector/Multivector error = 0.000000e+00
+
+# Output file: vector.out.A9
+Vector/Multivector error = 0.000000e+00
+
+# Output file: vector.out.A10
+Vector/Multivector error = 0.000000e+00
+
+# Output file: vector.out.B0
+Iterations = 18
+Final Relative Residual Norm = 3.923978e-09
+
+# Output file: vector.out.B1
+GMRES Iterations = 54
+Final GMRES Relative Residual Norm = 7.982370e-09
+
+# Output file: vector.out.B2
+Iterations = 202
+Final Relative Residual Norm = 9.611457e-09
+
+# Output file: vector.out.B3
+BiCGSTAB Iterations = 12
+Final BiCGSTAB Relative Residual Norm = 6.282586e-09
+
+# Output file: vector.out.B4
+LGMRES Iterations = 53
+Final LGMRES Relative Residual Norm = 8.975949e-09
+
+# Output file: vector.out.B5
+FlexGMRES Iterations = 54
+Final FlexGMRES Relative Residual Norm = 7.982370e-09
+
+# Output file: vector.out.B6
+Iterations = 18
+Final Relative Residual Norm = 3.923978e-09
+
+# Output file: vector.out.B7
+Iterations = 18
+Final Relative Residual Norm = 3.923978e-09
+
+# Output file: vector.out.B8
+Iterations = 18
+Final Relative Residual Norm = 3.923978e-09
+
+# Output file: vector.out.B9
+Iterations = 18
+Final Relative Residual Norm = 3.923978e-09
+
+# Output file: vector.out.B10
+Iterations = 18
+Final Relative Residual Norm = 3.923978e-09
+
+# Output file: vector.out.B100
+Iterations = 18
+Final Relative Residual Norm = 3.923978e-09
+
+# Output file: vector.out.B101
+GMRES Iterations = 54
+Final GMRES Relative Residual Norm = 7.982371e-09
+
+# Output file: vector.out.B102
+Iterations = 202
+Final Relative Residual Norm = 9.570265e-09
+
+# Output file: vector.out.B103
+BiCGSTAB Iterations = 12
+Final BiCGSTAB Relative Residual Norm = 6.282586e-09
+
+# Output file: vector.out.B104
+LGMRES Iterations = 53
+Final LGMRES Relative Residual Norm = 8.975946e-09
+
+# Output file: vector.out.B105
+FlexGMRES Iterations = 54
+Final FlexGMRES Relative Residual Norm = 7.982371e-09
+
+# Output file: vector.out.B106
+Iterations = 18
+Final Relative Residual Norm = 3.923978e-09
+
+# Output file: vector.out.B107
+Iterations = 18
+Final Relative Residual Norm = 3.923978e-09
+
+# Output file: vector.out.B108
+Iterations = 18
+Final Relative Residual Norm = 3.923978e-09
+
+# Output file: vector.out.B109
+Iterations = 18
+Final Relative Residual Norm = 3.923978e-09
+
+# Output file: vector.out.B110
+Iterations = 18
+Final Relative Residual Norm = 3.923978e-09
+
diff --git a/external/hypre/src/test/TEST_ij/vector.sh b/external/hypre/src/test/TEST_ij/vector.sh
new file mode 100755
index 00000000..c4ad58d3
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/vector.sh
@@ -0,0 +1,85 @@
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+TNAME=`basename $0 .sh`
+RTOL=$1
+ATOL=$2
+
+#=============================================================================
+# A. set/get: multi-component vector tests
+#=============================================================================
+
+FILES="\
+ ${TNAME}.out.A0\
+ ${TNAME}.out.A1\
+ ${TNAME}.out.A2\
+ ${TNAME}.out.A3\
+ ${TNAME}.out.A4\
+ ${TNAME}.out.A5\
+ ${TNAME}.out.A6\
+ ${TNAME}.out.A7\
+ ${TNAME}.out.A8\
+ ${TNAME}.out.A9\
+ ${TNAME}.out.A10
+"
+
+for i in $FILES
+do
+  echo "# Output file: $i"
+  tail -2 $i
+done > ${TNAME}.out.A
+
+# Make sure that the output file is reasonable
+RUNCOUNT=`echo $FILES | wc -w`
+OUTCOUNT=`grep "Vector/Multivector error" ${TNAME}.out.A | wc -l`
+if [ "$OUTCOUNT" != "$RUNCOUNT" ]; then
+   echo "Incorrect number of runs in ${TNAME}.out.A" >&2
+fi
+
+#=============================================================================
+# B. krylov solvers: multi-component vector tests
+#=============================================================================
+
+FILES="\
+ ${TNAME}.out.B0\
+ ${TNAME}.out.B1\
+ ${TNAME}.out.B2\
+ ${TNAME}.out.B3\
+ ${TNAME}.out.B4\
+ ${TNAME}.out.B5\
+ ${TNAME}.out.B6\
+ ${TNAME}.out.B7\
+ ${TNAME}.out.B8\
+ ${TNAME}.out.B9\
+ ${TNAME}.out.B10\
+ ${TNAME}.out.B100\
+ ${TNAME}.out.B101\
+ ${TNAME}.out.B102\
+ ${TNAME}.out.B103\
+ ${TNAME}.out.B104\
+ ${TNAME}.out.B105\
+ ${TNAME}.out.B106\
+ ${TNAME}.out.B107\
+ ${TNAME}.out.B108\
+ ${TNAME}.out.B109\
+ ${TNAME}.out.B110
+"
+
+for i in $FILES
+do
+  echo "# Output file: $i"
+  tail -3 $i
+done > ${TNAME}.out.B
+
+# Make sure that the output file is reasonable
+RUNCOUNT=`echo $FILES | wc -w`
+OUTCOUNT=`grep "Iterations" ${TNAME}.out.B | wc -l`
+if [ "$OUTCOUNT" != "$RUNCOUNT" ]; then
+   echo "Incorrect number of runs in ${TNAME}.out.B" >&2
+fi
+
+# put all of the output files together
+cat ${TNAME}.out.[A-Z] > ${TNAME}.out
diff --git a/external/hypre/src/test/TEST_ij/versioncheck.jobs b/external/hypre/src/test/TEST_ij/versioncheck.jobs
new file mode 100755
index 00000000..3bb0fb88
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/versioncheck.jobs
@@ -0,0 +1,12 @@
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+#=============================================================================
+# Check the version header file variables
+#=============================================================================
+
+mpirun -np 1 ./ij > versioncheck.out.1
+
diff --git a/external/hypre/src/test/TEST_ij/versioncheck.sh b/external/hypre/src/test/TEST_ij/versioncheck.sh
new file mode 100755
index 00000000..87db6aaf
--- /dev/null
+++ b/external/hypre/src/test/TEST_ij/versioncheck.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+TNAME=`basename $0 .sh`
+
+#=============================================================================
+# Check the HYPRE_DEVELOP variables
+#=============================================================================
+
+grep "Using HYPRE_DEVELOP_STRING" ${TNAME}.out.1 > ${TNAME}.testdata
+
+echo -n > ${TNAME}.testdatacheck
+if [ -d ../../../.git ]; then
+  DEVSTRING=`git describe --match 'v*' --long --abbrev=9 2>/dev/null`
+  DEVNUMBER=`echo $DEVSTRING | awk -F- '{print $2}'`
+  DEVBRANCH=`git rev-parse --abbrev-ref HEAD`
+  if [ -n "$DEVSTRING" ]; then
+    if [ "$DEVBRANCH" != "master" ]; then
+      echo "Using HYPRE_DEVELOP_STRING: $DEVSTRING (branch $DEVBRANCH; not the develop branch)" \
+       > ${TNAME}.testdatacheck
+    else
+      echo "Using HYPRE_DEVELOP_STRING: $DEVSTRING (branch $DEVBRANCH; the develop branch)" \
+       > ${TNAME}.testdatacheck
+    fi
+  fi
+fi
+diff ${TNAME}.testdata ${TNAME}.testdatacheck >&2
+
+#=============================================================================
+# remove temporary files
+#=============================================================================
+
+rm -f ${TNAME}.testdata*
diff --git a/external/hypre/src/test/TEST_lobpcg/ijdefault.jobs b/external/hypre/src/test/TEST_lobpcg/ijdefault.jobs
old mode 100644
new mode 100755
index 216b79db..cf8bdd2d
--- a/external/hypre/src/test/TEST_lobpcg/ijdefault.jobs
+++ b/external/hypre/src/test/TEST_lobpcg/ijdefault.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_lobpcg/ijdefault.sh b/external/hypre/src/test/TEST_lobpcg/ijdefault.sh
old mode 100644
new mode 100755
index 2ff52cd4..bbbbedff
--- a/external/hypre/src/test/TEST_lobpcg/ijdefault.sh
+++ b/external/hypre/src/test/TEST_lobpcg/ijdefault.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_lobpcg/ijoptions.jobs b/external/hypre/src/test/TEST_lobpcg/ijoptions.jobs
old mode 100644
new mode 100755
index 7314f530..bdb45845
--- a/external/hypre/src/test/TEST_lobpcg/ijoptions.jobs
+++ b/external/hypre/src/test/TEST_lobpcg/ijoptions.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_lobpcg/ijoptions.sh b/external/hypre/src/test/TEST_lobpcg/ijoptions.sh
old mode 100644
new mode 100755
index fbdc8d2c..64550c34
--- a/external/hypre/src/test/TEST_lobpcg/ijoptions.sh
+++ b/external/hypre/src/test/TEST_lobpcg/ijoptions.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -54,7 +54,7 @@ tail -11 ${TNAME}.out.verb.2      | head -3 >> ${TNAME}.out
 
 # Make sure that the output file is reasonable
 RUNCOUNT=18
-OUTCOUNT=`grep "Eigenvalue" ${TNAME}.out | wc -l`
+OUTCOUNT=`grep "Eigenvalue" ${TNAME}.out | wc -l | sed -e 's/^[[:space:]]*//'`
 if [ "$OUTCOUNT" != "$RUNCOUNT" ]; then
    echo "Incorrect number of runs in ${TNAME}.out" >&2
 fi
diff --git a/external/hypre/src/test/TEST_lobpcg/nonmixedint.jobs b/external/hypre/src/test/TEST_lobpcg/nonmixedint.jobs
old mode 100644
new mode 100755
index 35948dc0..a33a52f3
--- a/external/hypre/src/test/TEST_lobpcg/nonmixedint.jobs
+++ b/external/hypre/src/test/TEST_lobpcg/nonmixedint.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_lobpcg/nonmixedint.sh b/external/hypre/src/test/TEST_lobpcg/nonmixedint.sh
old mode 100644
new mode 100755
index 77e5320f..eafa215f
--- a/external/hypre/src/test/TEST_lobpcg/nonmixedint.sh
+++ b/external/hypre/src/test/TEST_lobpcg/nonmixedint.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_lobpcg/sstruct.in.default b/external/hypre/src/test/TEST_lobpcg/sstruct.in.default
index c1d589cc..6567356c 100644
--- a/external/hypre/src/test/TEST_lobpcg/sstruct.in.default
+++ b/external/hypre/src/test/TEST_lobpcg/sstruct.in.default
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_lobpcg/sstruct.jobs b/external/hypre/src/test/TEST_lobpcg/sstruct.jobs
old mode 100644
new mode 100755
index 62d69324..7910745f
--- a/external/hypre/src/test/TEST_lobpcg/sstruct.jobs
+++ b/external/hypre/src/test/TEST_lobpcg/sstruct.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_lobpcg/sstruct.sh b/external/hypre/src/test/TEST_lobpcg/sstruct.sh
old mode 100644
new mode 100755
index 4a7e10f6..73e14d70
--- a/external/hypre/src/test/TEST_lobpcg/sstruct.sh
+++ b/external/hypre/src/test/TEST_lobpcg/sstruct.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_lobpcg/struct.jobs b/external/hypre/src/test/TEST_lobpcg/struct.jobs
old mode 100644
new mode 100755
index 704faba7..6def4bf5
--- a/external/hypre/src/test/TEST_lobpcg/struct.jobs
+++ b/external/hypre/src/test/TEST_lobpcg/struct.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_lobpcg/struct.sh b/external/hypre/src/test/TEST_lobpcg/struct.sh
old mode 100644
new mode 100755
index c682528b..c4791c7c
--- a/external/hypre/src/test/TEST_lobpcg/struct.sh
+++ b/external/hypre/src/test/TEST_lobpcg/struct.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_longdouble/solvers_ij.jobs b/external/hypre/src/test/TEST_longdouble/solvers_ij.jobs
old mode 100644
new mode 100755
index faf9d120..5026ccae
--- a/external/hypre/src/test/TEST_longdouble/solvers_ij.jobs
+++ b/external/hypre/src/test/TEST_longdouble/solvers_ij.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_longdouble/solvers_ij.saved b/external/hypre/src/test/TEST_longdouble/solvers_ij.saved
index 38e79424..6ba7dcea 100644
--- a/external/hypre/src/test/TEST_longdouble/solvers_ij.saved
+++ b/external/hypre/src/test/TEST_longdouble/solvers_ij.saved
@@ -8,11 +8,11 @@ Final Relative Residual Norm = 5.127733e-17
 
 # Output file: solvers_ij.out.2
 GMRES Iterations = 14
-Final GMRES Relative Residual Norm = 2.081795e-17
+Final GMRES Relative Residual Norm = 2.081367e-17
 
 # Output file: solvers_ij.out.3
 GMRES Iterations = 199
-Final GMRES Relative Residual Norm = 9.120984e-17
+Final GMRES Relative Residual Norm = 9.519631e-17
 
 # Output file: solvers_ij.out.4
 Iterations = 18
@@ -23,8 +23,8 @@ Iterations = 375
 Final Relative Residual Norm = 9.100420e-17
 
 # Output file: solvers_ij.out.6
-GMRES Iterations = 65
-Final GMRES Relative Residual Norm = 9.781815e-17
+GMRES Iterations = 64
+Final GMRES Relative Residual Norm = 8.111594e-17
 
 # Output file: solvers_ij.out.7
 Iterations = 42
@@ -46,20 +46,20 @@ Final Relative Residual Norm = 2.361559e-17
 Iterations = 16
 PCG_Iterations = 14
 DSCG_Iterations = 2
-Final Relative Residual Norm = 2.081795e-17
+Final Relative Residual Norm = 2.081367e-17
 
 # Output file: solvers_ij.out.11
 Iterations = 10
 PCG_Iterations = 7
 DSCG_Iterations = 3
-Final Relative Residual Norm = 1.093762e-17
+Final Relative Residual Norm = 1.095097e-17
 
 # Output file: solvers_ij.out.sysh
- Average Convergence Factor = 0.120646
+ Average Convergence Factor = 0.120656
 
      Complexity:    grid = 1.613875
-                operator = 2.860168
-                   cycle = 5.720037
+                operator = 2.860056
+                   cycle = 5.719813
 
 # Output file: solvers_ij.out.sysn
  Average Convergence Factor = 0.222219
@@ -69,43 +69,43 @@ Final Relative Residual Norm = 1.093762e-17
                    cycle = 11.267164
 
 # Output file: solvers_ij.out.sysu
- Average Convergence Factor = 0.430744
+ Average Convergence Factor = 0.430732
 
      Complexity:    grid = 1.614937
-                operator = 2.866488
-                   cycle = 5.732598
+                operator = 2.866376
+                   cycle = 5.732374
 
 # Output file: solvers_ij.out.101
-LGMRES Iterations = 175
-Final LGMRES Relative Residual Norm = 9.266081e-17
+LGMRES Iterations = 174
+Final LGMRES Relative Residual Norm = 9.552264e-17
 
 # Output file: solvers_ij.out.102
 LGMRES Iterations = 17
-Final LGMRES Relative Residual Norm = 2.722394e-17
+Final LGMRES Relative Residual Norm = 2.723270e-17
 
 # Output file: solvers_ij.out.103
 FlexGMRES Iterations = 199
-Final FlexGMRES Relative Residual Norm = 9.121062e-17
+Final FlexGMRES Relative Residual Norm = 9.519793e-17
 
 # Output file: solvers_ij.out.104
 FlexGMRES Iterations = 14
-Final FlexGMRES Relative Residual Norm = 2.080945e-17
+Final FlexGMRES Relative Residual Norm = 2.080779e-17
 
 # Output file: solvers_ij.out.105
 Iterations = 27
-Final Relative Residual Norm = 4.195866e-17
+Final Relative Residual Norm = 4.117029e-17
 
 # Output file: solvers_ij.out.106
 Iterations = 27
-Final Relative Residual Norm = 4.195866e-17
+Final Relative Residual Norm = 4.117029e-17
 
 # Output file: solvers_ij.out.107
 Iterations = 41
-Final Relative Residual Norm = 5.542245e-17
+Final Relative Residual Norm = 5.530831e-17
 
 # Output file: solvers_ij.out.108
 Iterations = 41
-Final Relative Residual Norm = 5.542245e-17
+Final Relative Residual Norm = 5.530831e-17
 
 # Output file: solvers_ij.out.109
 Iterations = 32
@@ -121,24 +121,25 @@ Final Relative Residual Norm = 8.514971e-17
 
 # Output file: solvers_ij.out.112
 GMRES Iterations = 43
-Final GMRES Relative Residual Norm = 8.429921e-17
+Final GMRES Relative Residual Norm = 8.435563e-17
 
 # Output file: solvers_ij.out.113
 GMRES Iterations = 50
-Final GMRES Relative Residual Norm = 7.072526e-17
+Final GMRES Relative Residual Norm = 7.198289e-17
 
 # Output file: solvers_ij.out.114
 BoomerAMG Iterations = 33
-Final Relative Residual Norm = 3.985038e-17
+Final Relative Residual Norm = 7.715444e-17
 
 # Output file: solvers_ij.out.115
 BoomerAMG Iterations = 33
-Final Relative Residual Norm = 8.090140e-17
+Final Relative Residual Norm = 7.295558e-17
 
 # Output file: solvers_ij.out.116
 GMRES Iterations = 18
-Final GMRES Relative Residual Norm = 3.015970e-17
+Final GMRES Relative Residual Norm = 3.539225e-17
 
 # Output file: solvers_ij.out.117
 GMRES Iterations = 18
-Final GMRES Relative Residual Norm = 3.054189e-17
+Final GMRES Relative Residual Norm = 3.377119e-17
+
diff --git a/external/hypre/src/test/TEST_longdouble/solvers_ij.sh b/external/hypre/src/test/TEST_longdouble/solvers_ij.sh
old mode 100644
new mode 100755
index 03ea5104..6b963ef9
--- a/external/hypre/src/test/TEST_longdouble/solvers_ij.sh
+++ b/external/hypre/src/test/TEST_longdouble/solvers_ij.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_longdouble/solvers_struct.jobs b/external/hypre/src/test/TEST_longdouble/solvers_struct.jobs
index b4a55284..19d8a40e 100644
--- a/external/hypre/src/test/TEST_longdouble/solvers_struct.jobs
+++ b/external/hypre/src/test/TEST_longdouble/solvers_struct.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_longdouble/solvers_struct.saved b/external/hypre/src/test/TEST_longdouble/solvers_struct.saved
index 7991994d..a54b4e7b 100644
--- a/external/hypre/src/test/TEST_longdouble/solvers_struct.saved
+++ b/external/hypre/src/test/TEST_longdouble/solvers_struct.saved
@@ -44,7 +44,7 @@ Final Relative Residual Norm = 4.957736e-17
 
 # Output file: solvers_struct.out.11.lobpcg.1
 Eigenvalue lambda   1.84366453091756e-01
-Residual   5.90808378148735e-08
+Residual   5.90808378148877e-08
 
 # Output file: solvers_struct.out.11.lobpcg.5
 Eigenvalue lambda   1.84366453091753e-01
@@ -52,11 +52,11 @@ Eigenvalue lambda   2.50882493969729e-01
 Eigenvalue lambda   3.60090369737179e-01
 Eigenvalue lambda   4.20845334658427e-01
 Eigenvalue lambda   4.20845334658489e-01
-Residual   3.21720429474277e-08
-Residual   6.44224703495451e-08
-Residual   2.42812454193394e-07
-Residual   3.37502151131599e-07
-Residual   3.28950894745568e-07
+Residual   3.21720429474187e-08
+Residual   6.44224703497146e-08
+Residual   2.42812454193411e-07
+Residual   3.37502154312378e-07
+Residual   3.28950912831126e-07
 
 # Output file: solvers_struct.out.17.lobpcg
 Iterations = 34
diff --git a/external/hypre/src/test/TEST_longdouble/solvers_struct.sh b/external/hypre/src/test/TEST_longdouble/solvers_struct.sh
old mode 100644
new mode 100755
index 4892c63e..467f49f3
--- a/external/hypre/src/test/TEST_longdouble/solvers_struct.sh
+++ b/external/hypre/src/test/TEST_longdouble/solvers_struct.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_single/solvers_ij.jobs b/external/hypre/src/test/TEST_single/solvers_ij.jobs
old mode 100644
new mode 100755
index 7731d3a0..2183a9e3
--- a/external/hypre/src/test/TEST_single/solvers_ij.jobs
+++ b/external/hypre/src/test/TEST_single/solvers_ij.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_single/solvers_ij.saved b/external/hypre/src/test/TEST_single/solvers_ij.saved
index 4422bb2d..97bcf887 100644
--- a/external/hypre/src/test/TEST_single/solvers_ij.saved
+++ b/external/hypre/src/test/TEST_single/solvers_ij.saved
@@ -28,7 +28,7 @@ Final GMRES Relative Residual Norm = 7.132032e-05
 
 # Output file: solvers_ij.out.7
 Iterations = 13
-Final Relative Residual Norm = 7.750608e-05
+Final Relative Residual Norm = 7.750613e-05
 
 # Output file: solvers_ij.out.8
 Iterations = 26
@@ -93,19 +93,19 @@ Final FlexGMRES Relative Residual Norm = 1.566998e-05
 
 # Output file: solvers_ij.out.105
 Iterations = 9
-Final Relative Residual Norm = 2.436061e-05
+Final Relative Residual Norm = 2.436053e-05
 
 # Output file: solvers_ij.out.106
 Iterations = 9
-Final Relative Residual Norm = 2.436061e-05
+Final Relative Residual Norm = 2.436053e-05
 
 # Output file: solvers_ij.out.107
 Iterations = 12
-Final Relative Residual Norm = 6.371655e-05
+Final Relative Residual Norm = 6.371622e-05
 
 # Output file: solvers_ij.out.108
 Iterations = 12
-Final Relative Residual Norm = 6.371655e-05
+Final Relative Residual Norm = 6.371622e-05
 
 # Output file: solvers_ij.out.109
 Iterations = 9
@@ -117,15 +117,15 @@ Final Relative Residual Norm = 8.952637e-05
 
 # Output file: solvers_ij.out.111
 Iterations = 15
-Final Relative Residual Norm = 8.953387e-05
+Final Relative Residual Norm = 8.953385e-05
 
 # Output file: solvers_ij.out.112
 GMRES Iterations = 12
-Final GMRES Relative Residual Norm = 5.901872e-05
+Final GMRES Relative Residual Norm = 5.912302e-05
 
 # Output file: solvers_ij.out.113
 GMRES Iterations = 13
-Final GMRES Relative Residual Norm = 7.924740e-05
+Final GMRES Relative Residual Norm = 7.921693e-05
 
 # Output file: solvers_ij.out.114
 BoomerAMG Iterations = 9
@@ -137,8 +137,9 @@ Final Relative Residual Norm = 3.870274e-05
 
 # Output file: solvers_ij.out.116
 GMRES Iterations = 6
-Final GMRES Relative Residual Norm = 3.056660e-05
+Final GMRES Relative Residual Norm = 3.071691e-05
 
 # Output file: solvers_ij.out.117
 GMRES Iterations = 6
-Final GMRES Relative Residual Norm = 3.009877e-05
+Final GMRES Relative Residual Norm = 3.018834e-05
+
diff --git a/external/hypre/src/test/TEST_single/solvers_ij.saved.lassen b/external/hypre/src/test/TEST_single/solvers_ij.saved.lassen
new file mode 100644
index 00000000..7d429461
--- /dev/null
+++ b/external/hypre/src/test/TEST_single/solvers_ij.saved.lassen
@@ -0,0 +1,145 @@
+# Output file: solvers_ij.out.0
+Iterations = 6
+Final Relative Residual Norm = 3.613604e-05
+
+# Output file: solvers_ij.out.1
+Iterations = 26
+Final Relative Residual Norm = 7.193498e-05
+
+# Output file: solvers_ij.out.2
+GMRES Iterations = 6
+Final GMRES Relative Residual Norm = 4.896985e-05
+
+# Output file: solvers_ij.out.3
+GMRES Iterations = 39
+Final GMRES Relative Residual Norm = 9.047663e-05
+
+# Output file: solvers_ij.out.4
+Iterations = 5
+Final Relative Residual Norm = 1.712172e-05
+
+# Output file: solvers_ij.out.5
+Iterations = 103
+Final Relative Residual Norm = 8.784411e-05
+
+# Output file: solvers_ij.out.6
+GMRES Iterations = 15
+Final GMRES Relative Residual Norm = 7.132540e-05
+
+# Output file: solvers_ij.out.7
+Iterations = 13
+Final Relative Residual Norm = 7.750618e-05
+
+# Output file: solvers_ij.out.8
+Iterations = 26
+PCG_Iterations = 0
+DSCG_Iterations = 26
+Final Relative Residual Norm = 7.193498e-05
+
+# Output file: solvers_ij.out.9
+Iterations = 7
+PCG_Iterations = 3
+DSCG_Iterations = 4
+Final Relative Residual Norm = 7.681886e-05
+
+# Output file: solvers_ij.out.10
+Iterations = 6
+PCG_Iterations = 4
+DSCG_Iterations = 2
+Final Relative Residual Norm = 2.434827e-05
+
+# Output file: solvers_ij.out.11
+Iterations = 5
+PCG_Iterations = 2
+DSCG_Iterations = 3
+Final Relative Residual Norm = 1.167394e-05
+
+# Output file: solvers_ij.out.sysh
+ Average Convergence Factor = 0.203916
+
+     Complexity:    grid = 1.393625
+                operator = 2.648489
+                   cycle = 5.296959
+
+# Output file: solvers_ij.out.sysn
+ Average Convergence Factor = 0.533108
+
+     Complexity:    grid = 1.390750
+                operator = 2.080112
+                   cycle = 10.160150
+
+# Output file: solvers_ij.out.sysu
+ Average Convergence Factor = 0.738350
+
+     Complexity:    grid = 1.392063
+                operator = 2.742309
+                   cycle = 5.484450
+
+# Output file: solvers_ij.out.101
+LGMRES Iterations = 39
+Final LGMRES Relative Residual Norm = 7.221823e-05
+
+# Output file: solvers_ij.out.102
+LGMRES Iterations = 6
+Final LGMRES Relative Residual Norm = 4.896985e-05
+
+# Output file: solvers_ij.out.103
+FlexGMRES Iterations = 39
+Final FlexGMRES Relative Residual Norm = 9.047555e-05
+
+# Output file: solvers_ij.out.104
+FlexGMRES Iterations = 6
+Final FlexGMRES Relative Residual Norm = 4.897068e-05
+
+# Output file: solvers_ij.out.105
+Iterations = 11
+Final Relative Residual Norm = 4.008468e-05
+
+# Output file: solvers_ij.out.106
+Iterations = 11
+Final Relative Residual Norm = 4.008468e-05
+
+# Output file: solvers_ij.out.107
+Iterations = 16
+Final Relative Residual Norm = 6.769229e-05
+
+# Output file: solvers_ij.out.108
+Iterations = 16
+Final Relative Residual Norm = 6.769223e-05
+
+# Output file: solvers_ij.out.109
+Iterations = 11
+Final Relative Residual Norm = 7.168816e-05
+
+# Output file: solvers_ij.out.110
+Iterations = 11
+Final Relative Residual Norm = 7.168804e-05
+
+# Output file: solvers_ij.out.111
+Iterations = 17
+Final Relative Residual Norm = 7.756728e-05
+
+# Output file: solvers_ij.out.112
+GMRES Iterations = 21
+Final GMRES Relative Residual Norm = 7.639248e-05
+
+# Output file: solvers_ij.out.113
+GMRES Iterations = 14
+Final GMRES Relative Residual Norm = 9.875665e-05
+
+# Output file: solvers_ij.out.114
+BoomerAMG Iterations = 17
+Final Relative Residual Norm = 8.243789e-05
+
+# Output file: solvers_ij.out.115
+BoomerAMG Iterations = 17
+Final Relative Residual Norm = 8.901364e-05
+
+# Output file: solvers_ij.out.116
+GMRES Iterations = 8
+Final GMRES Relative Residual Norm = 8.284889e-05
+
+# Output file: solvers_ij.out.117
+GMRES Iterations = 8
+Final GMRES Relative Residual Norm = 8.300778e-05
+
diff --git a/external/hypre/src/test/TEST_single/solvers_ij.sh b/external/hypre/src/test/TEST_single/solvers_ij.sh
old mode 100644
new mode 100755
index 0a09f8ee..0ac7b43c
--- a/external/hypre/src/test/TEST_single/solvers_ij.sh
+++ b/external/hypre/src/test/TEST_single/solvers_ij.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_single/solvers_struct.jobs b/external/hypre/src/test/TEST_single/solvers_struct.jobs
old mode 100644
new mode 100755
index 2a1c71d2..0cd9629e
--- a/external/hypre/src/test/TEST_single/solvers_struct.jobs
+++ b/external/hypre/src/test/TEST_single/solvers_struct.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_single/solvers_struct.saved.lassen b/external/hypre/src/test/TEST_single/solvers_struct.saved.lassen
new file mode 100644
index 00000000..d32a9369
--- /dev/null
+++ b/external/hypre/src/test/TEST_single/solvers_struct.saved.lassen
@@ -0,0 +1,120 @@
+# Output file: solvers_struct.out.0
+Iterations = 3
+Final Relative Residual Norm = 3.246689e-05
+
+# Output file: solvers_struct.out.1
+Iterations = 6
+Final Relative Residual Norm = 2.055851e-05
+
+# Output file: solvers_struct.out.2
+Iterations = 16
+Final Relative Residual Norm = 5.377654e-05
+
+# Output file: solvers_struct.out.3
+Iterations = 16
+Final Relative Residual Norm = 3.718371e-05
+
+# Output file: solvers_struct.out.4
+Iterations = 16
+Final Relative Residual Norm = 3.718370e-05
+
+# Output file: solvers_struct.out.10.lobpcg
+Iterations = 3
+Final Relative Residual Norm = 6.275833e-06
+
+# Output file: solvers_struct.out.10.lobpcg.1
+Eigenvalue lambda   1.84366509318352e-01
+Residual   2.48082087637158e-05
+
+# Output file: solvers_struct.out.10.lobpcg.3
+Iteration 10 	bsize 2 	maxres   4.33511973824352e-04
+Iteration 11 	bsize 1 	maxres   2.04666575882584e-04
+Iteration 12 	bsize 1 	maxres   8.50733777042478e-05
+
+Eigenvalue lambda   1.84366509318352e-01
+Eigenvalue lambda   2.50882238149643e-01
+Eigenvalue lambda   3.60091090202332e-01
+Residual   7.41478434065357e-05
+Residual   4.07401748816483e-05
+Residual   8.50733777042478e-05
+
+# Output file: solvers_struct.out.11.lobpcg
+Iterations = 6
+Final Relative Residual Norm = 2.112819e-05
+
+# Output file: solvers_struct.out.11.lobpcg.1
+Eigenvalue lambda   1.84366583824158e-01
+Residual   3.15948745992500e-05
+
+# Output file: solvers_struct.out.11.lobpcg.3
+Iteration 11 	bsize 2 	maxres   6.90118235070258e-04
+Iteration 12 	bsize 2 	maxres   2.52081663347781e-04
+Iteration 13 	bsize 1 	maxres   7.02887409715913e-05
+
+Eigenvalue lambda   1.84366479516029e-01
+Eigenvalue lambda   2.50883370637894e-01
+Eigenvalue lambda   3.60090911388397e-01
+Residual   5.58231040486135e-05
+Residual   2.60377983067883e-05
+Residual   7.02887409715913e-05
+
+# Output file: solvers_struct.out.17.lobpcg
+Iterations = 17
+Final Relative Residual Norm = 8.241194e-07
+
+# Output file: solvers_struct.out.17.lobpcg.1
+Eigenvalue lambda   1.84366509318352e-01
+Residual   1.95705306396121e-05
+
+# Output file: solvers_struct.out.17.lobpcg.3
+Iteration 10 	bsize 2 	maxres   3.62064485670999e-04
+Iteration 11 	bsize 1 	maxres   1.69921870110556e-04
+Iteration 12 	bsize 1 	maxres   7.11168977431953e-05
+
+Eigenvalue lambda   1.84366405010223e-01
+Eigenvalue lambda   2.50881940126419e-01
+Eigenvalue lambda   3.60090613365173e-01
+Residual   5.52630408492405e-05
+Residual   3.09487622871529e-05
+Residual   7.11168977431953e-05
+
+# Output file: solvers_struct.out.18.lobpcg
+Iterations = 32
+Final Relative Residual Norm = 8.266953e-07
+
+# Output file: solvers_struct.out.18.lobpcg.1
+Eigenvalue lambda   1.84366241097450e-01
+Residual   4.44491524831392e-05
+
+# Output file: solvers_struct.out.18.lobpcg.3
+Iteration 10 	bsize 2 	maxres   5.81342901568860e-04
+Iteration 11 	bsize 1 	maxres   1.98838606593199e-04
+Iteration 12 	bsize 1 	maxres   9.27079236134887e-05
+
+Eigenvalue lambda   1.84366494417191e-01
+Eigenvalue lambda   2.50879585742950e-01
+Eigenvalue lambda   3.60090494155884e-01
+Residual   9.27079236134887e-05
+Residual   8.72101882123388e-05
+Residual   5.49681753909681e-05
+
+# Output file: solvers_struct.out.19.lobpcg
+Iterations = 25
+Final Relative Residual Norm = 7.712439e-05
+
+# Output file: solvers_struct.out.19.lobpcg.1
+Eigenvalue lambda   1.84366539120674e-01
+Residual   4.44510842498858e-05
+
+# Output file: solvers_struct.out.19.lobpcg.3
+Iteration 10 	bsize 2 	maxres   5.81450236495584e-04
+Iteration 11 	bsize 1 	maxres   1.98705645743757e-04
+Iteration 12 	bsize 1 	maxres   9.26581269595772e-05
+
+Eigenvalue lambda   1.84366509318352e-01
+Eigenvalue lambda   2.50874906778336e-01
+Eigenvalue lambda   3.60090017318726e-01
+Residual   9.26581269595772e-05
+Residual   8.80578954820521e-05
+Residual   5.49828182556666e-05
+
diff --git a/external/hypre/src/test/TEST_single/solvers_struct.sh b/external/hypre/src/test/TEST_single/solvers_struct.sh
old mode 100644
new mode 100755
index 9f1bc38f..02697eed
--- a/external/hypre/src/test/TEST_single/solvers_struct.sh
+++ b/external/hypre/src/test/TEST_single/solvers_struct.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/addtovalues.jobs b/external/hypre/src/test/TEST_sstruct/addtovalues.jobs
old mode 100644
new mode 100755
index 38c556cd..0daf8e6d
--- a/external/hypre/src/test/TEST_sstruct/addtovalues.jobs
+++ b/external/hypre/src/test/TEST_sstruct/addtovalues.jobs
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/addtovalues.saved.lassen b/external/hypre/src/test/TEST_sstruct/addtovalues.saved.lassen
index 8ac19bc2..7e261d62 100644
--- a/external/hypre/src/test/TEST_sstruct/addtovalues.saved.lassen
+++ b/external/hypre/src/test/TEST_sstruct/addtovalues.saved.lassen
@@ -8,11 +8,11 @@ Final Relative Residual Norm = 7.226958e-07
 
 # Output file: addtovalues.out.2
 Iterations = 83
-Final Relative Residual Norm = 9.421343e-07
+Final Relative Residual Norm = 9.421346e-07
 
 # Output file: addtovalues.out.3
 Iterations = 83
-Final Relative Residual Norm = 9.421343e-07
+Final Relative Residual Norm = 9.421346e-07
 
 # Output file: addtovalues.out.4
 Iterations = 11
@@ -24,9 +24,9 @@ Final Relative Residual Norm = 9.051371e-07
 
 # Output file: addtovalues.out.6
 Iterations = 92
-Final Relative Residual Norm = 8.612786e-07
+Final Relative Residual Norm = 8.697370e-07
 
 # Output file: addtovalues.out.7
 Iterations = 92
-Final Relative Residual Norm = 8.612786e-07
+Final Relative Residual Norm = 8.697370e-07
 
diff --git a/external/hypre/src/test/TEST_sstruct/addtovalues.saved.ray b/external/hypre/src/test/TEST_sstruct/addtovalues.saved.lassen_cpu
similarity index 68%
rename from external/hypre/src/test/TEST_sstruct/addtovalues.saved.ray
rename to external/hypre/src/test/TEST_sstruct/addtovalues.saved.lassen_cpu
index 46cc6f94..b126689d 100644
--- a/external/hypre/src/test/TEST_sstruct/addtovalues.saved.ray
+++ b/external/hypre/src/test/TEST_sstruct/addtovalues.saved.lassen_cpu
@@ -7,12 +7,12 @@ Iterations = 9
 Final Relative Residual Norm = 7.226958e-07
 
 # Output file: addtovalues.out.2
-Iterations = 83
-Final Relative Residual Norm = 9.421346e-07
+Iterations = 34
+Final Relative Residual Norm = 5.437407e-07
 
 # Output file: addtovalues.out.3
-Iterations = 83
-Final Relative Residual Norm = 9.421346e-07
+Iterations = 34
+Final Relative Residual Norm = 5.437407e-07
 
 # Output file: addtovalues.out.4
 Iterations = 11
@@ -23,10 +23,10 @@ Iterations = 11
 Final Relative Residual Norm = 9.051371e-07
 
 # Output file: addtovalues.out.6
-Iterations = 92
-Final Relative Residual Norm = 8.612847e-07
+Iterations = 44
+Final Relative Residual Norm = 8.778287e-07
 
 # Output file: addtovalues.out.7
-Iterations = 92
-Final Relative Residual Norm = 8.612847e-07
+Iterations = 44
+Final Relative Residual Norm = 8.778287e-07
 
diff --git a/external/hypre/src/test/TEST_sstruct/addtovalues.sh b/external/hypre/src/test/TEST_sstruct/addtovalues.sh
old mode 100644
new mode 100755
index 76420f76..790d1c93
--- a/external/hypre/src/test/TEST_sstruct/addtovalues.sh
+++ b/external/hypre/src/test/TEST_sstruct/addtovalues.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/amr2d.jobs b/external/hypre/src/test/TEST_sstruct/amr2d.jobs
old mode 100644
new mode 100755
index 9e706879..81141db2
--- a/external/hypre/src/test/TEST_sstruct/amr2d.jobs
+++ b/external/hypre/src/test/TEST_sstruct/amr2d.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/amr2d.saved.lassen b/external/hypre/src/test/TEST_sstruct/amr2d.saved.lassen
index 13ef34a9..a544659b 100644
--- a/external/hypre/src/test/TEST_sstruct/amr2d.saved.lassen
+++ b/external/hypre/src/test/TEST_sstruct/amr2d.saved.lassen
@@ -8,11 +8,11 @@ Final Relative Residual Norm = 8.188904e-07
 
 # Output file: amr2d.out.2
 Iterations = 7
-Final Relative Residual Norm = 2.380297e-07
+Final Relative Residual Norm = 2.345061e-07
 
 # Output file: amr2d.out.3
 Iterations = 7
-Final Relative Residual Norm = 4.126143e-07
+Final Relative Residual Norm = 4.180192e-07
 
 # Output file: amr2d.out.4
 Iterations = 20
@@ -24,11 +24,11 @@ Final Relative Residual Norm = 8.510163e-07
 
 # Output file: amr2d.out.6
 Iterations = 7
-Final Relative Residual Norm = 4.984335e-07
+Final Relative Residual Norm = 4.464926e-07
 
 # Output file: amr2d.out.7
 Iterations = 7
-Final Relative Residual Norm = 6.148553e-07
+Final Relative Residual Norm = 5.993784e-07
 
 # Output file: amr2d.out.8
 Iterations = 21
@@ -36,11 +36,11 @@ Final Relative Residual Norm = 5.392338e-07
 
 # Output file: amr2d.out.10
 Iterations = 8
-Final Relative Residual Norm = 6.202045e-07
+Final Relative Residual Norm = 6.330324e-07
 
 # Output file: amr2d.out.11
 Iterations = 8
-Final Relative Residual Norm = 1.996753e-07
+Final Relative Residual Norm = 2.085852e-07
 
 # Output file: amr2d.out.12
 Iterations = 18
diff --git a/external/hypre/src/test/TEST_sstruct/amr2d.saved.ray b/external/hypre/src/test/TEST_sstruct/amr2d.saved.lassen_cpu
similarity index 69%
rename from external/hypre/src/test/TEST_sstruct/amr2d.saved.ray
rename to external/hypre/src/test/TEST_sstruct/amr2d.saved.lassen_cpu
index 13ef34a9..42a57fa5 100644
--- a/external/hypre/src/test/TEST_sstruct/amr2d.saved.ray
+++ b/external/hypre/src/test/TEST_sstruct/amr2d.saved.lassen_cpu
@@ -7,12 +7,12 @@ Iterations = 19
 Final Relative Residual Norm = 8.188904e-07
 
 # Output file: amr2d.out.2
-Iterations = 7
-Final Relative Residual Norm = 2.380297e-07
+Iterations = 5
+Final Relative Residual Norm = 1.746768e-07
 
 # Output file: amr2d.out.3
-Iterations = 7
-Final Relative Residual Norm = 4.126143e-07
+Iterations = 5
+Final Relative Residual Norm = 3.155589e-07
 
 # Output file: amr2d.out.4
 Iterations = 20
@@ -23,24 +23,24 @@ Iterations = 20
 Final Relative Residual Norm = 8.510163e-07
 
 # Output file: amr2d.out.6
-Iterations = 7
-Final Relative Residual Norm = 4.984335e-07
+Iterations = 5
+Final Relative Residual Norm = 1.646222e-07
 
 # Output file: amr2d.out.7
-Iterations = 7
-Final Relative Residual Norm = 6.148553e-07
+Iterations = 5
+Final Relative Residual Norm = 4.675292e-07
 
 # Output file: amr2d.out.8
 Iterations = 21
 Final Relative Residual Norm = 5.392338e-07
 
 # Output file: amr2d.out.10
-Iterations = 8
-Final Relative Residual Norm = 6.202045e-07
+Iterations = 6
+Final Relative Residual Norm = 6.135506e-07
 
 # Output file: amr2d.out.11
-Iterations = 8
-Final Relative Residual Norm = 1.996753e-07
+Iterations = 6
+Final Relative Residual Norm = 1.744213e-07
 
 # Output file: amr2d.out.12
 Iterations = 18
diff --git a/external/hypre/src/test/TEST_sstruct/amr2d.sh b/external/hypre/src/test/TEST_sstruct/amr2d.sh
old mode 100644
new mode 100755
index 040929b8..a0806aa2
--- a/external/hypre/src/test/TEST_sstruct/amr2d.sh
+++ b/external/hypre/src/test/TEST_sstruct/amr2d.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/cube.jobs b/external/hypre/src/test/TEST_sstruct/cube.jobs
old mode 100644
new mode 100755
index b888fa47..5cf47385
--- a/external/hypre/src/test/TEST_sstruct/cube.jobs
+++ b/external/hypre/src/test/TEST_sstruct/cube.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/cube.saved.ray b/external/hypre/src/test/TEST_sstruct/cube.saved.lassen_cpu
similarity index 100%
rename from external/hypre/src/test/TEST_sstruct/cube.saved.ray
rename to external/hypre/src/test/TEST_sstruct/cube.saved.lassen_cpu
diff --git a/external/hypre/src/test/TEST_sstruct/cube.sh b/external/hypre/src/test/TEST_sstruct/cube.sh
old mode 100644
new mode 100755
index fe679022..609a38c4
--- a/external/hypre/src/test/TEST_sstruct/cube.sh
+++ b/external/hypre/src/test/TEST_sstruct/cube.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/cycred.jobs b/external/hypre/src/test/TEST_sstruct/cycred.jobs
old mode 100644
new mode 100755
index 0cfca243..16b4570f
--- a/external/hypre/src/test/TEST_sstruct/cycred.jobs
+++ b/external/hypre/src/test/TEST_sstruct/cycred.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh 
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash 
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/cycred.saved.ray b/external/hypre/src/test/TEST_sstruct/cycred.saved.lassen_cpu
similarity index 100%
rename from external/hypre/src/test/TEST_sstruct/cycred.saved.ray
rename to external/hypre/src/test/TEST_sstruct/cycred.saved.lassen_cpu
diff --git a/external/hypre/src/test/TEST_sstruct/cycred.sh b/external/hypre/src/test/TEST_sstruct/cycred.sh
old mode 100644
new mode 100755
index ec633075..1ace9c2f
--- a/external/hypre/src/test/TEST_sstruct/cycred.sh
+++ b/external/hypre/src/test/TEST_sstruct/cycred.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/default2d.jobs b/external/hypre/src/test/TEST_sstruct/default2d.jobs
old mode 100644
new mode 100755
index bb99e0b2..cb349ea8
--- a/external/hypre/src/test/TEST_sstruct/default2d.jobs
+++ b/external/hypre/src/test/TEST_sstruct/default2d.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/default2d.saved.ray b/external/hypre/src/test/TEST_sstruct/default2d.saved.lassen_cpu
similarity index 100%
rename from external/hypre/src/test/TEST_sstruct/default2d.saved.ray
rename to external/hypre/src/test/TEST_sstruct/default2d.saved.lassen_cpu
diff --git a/external/hypre/src/test/TEST_sstruct/default2d.sh b/external/hypre/src/test/TEST_sstruct/default2d.sh
old mode 100644
new mode 100755
index 0c91fc1e..7356d6a6
--- a/external/hypre/src/test/TEST_sstruct/default2d.sh
+++ b/external/hypre/src/test/TEST_sstruct/default2d.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/default3d.jobs b/external/hypre/src/test/TEST_sstruct/default3d.jobs
old mode 100644
new mode 100755
index 14047b65..a0bf7eb3
--- a/external/hypre/src/test/TEST_sstruct/default3d.jobs
+++ b/external/hypre/src/test/TEST_sstruct/default3d.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/default3d.saved.ray b/external/hypre/src/test/TEST_sstruct/default3d.saved.lassen_cpu
similarity index 100%
rename from external/hypre/src/test/TEST_sstruct/default3d.saved.ray
rename to external/hypre/src/test/TEST_sstruct/default3d.saved.lassen_cpu
diff --git a/external/hypre/src/test/TEST_sstruct/default3d.sh b/external/hypre/src/test/TEST_sstruct/default3d.sh
old mode 100644
new mode 100755
index a6fc0020..0b8dc1da
--- a/external/hypre/src/test/TEST_sstruct/default3d.sh
+++ b/external/hypre/src/test/TEST_sstruct/default3d.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/emptyProc.jobs b/external/hypre/src/test/TEST_sstruct/emptyProc.jobs
old mode 100644
new mode 100755
index 7a98d29e..16af1aa2
--- a/external/hypre/src/test/TEST_sstruct/emptyProc.jobs
+++ b/external/hypre/src/test/TEST_sstruct/emptyProc.jobs
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/emptyProc.saved.lassen b/external/hypre/src/test/TEST_sstruct/emptyProc.saved.lassen
index aa5df5e6..b03b94a9 100644
--- a/external/hypre/src/test/TEST_sstruct/emptyProc.saved.lassen
+++ b/external/hypre/src/test/TEST_sstruct/emptyProc.saved.lassen
@@ -20,7 +20,7 @@ Final Relative Residual Norm = 5.962015e-07
 
 # Output file: emptyProc.out.05
 Iterations = 9
-Final Relative Residual Norm = 4.770573e-07
+Final Relative Residual Norm = 6.100240e-07
 
 # Output file: emptyProc.out.08
 Iterations = 20
@@ -40,7 +40,7 @@ Final Relative Residual Norm = 9.962554e-07
 
 # Output file: emptyProc.out.12
 Iterations = 9
-Final Relative Residual Norm = 6.064748e-07
+Final Relative Residual Norm = 7.982121e-07
 
 # Output file: emptyProc.out.15
 Iterations = 2
@@ -56,7 +56,7 @@ Final Relative Residual Norm = 6.421347e-07
 
 # Output file: emptyProc.out.18
 Iterations = 5
-Final Relative Residual Norm = 2.114640e-07
+Final Relative Residual Norm = 6.241458e-07
 
 # Output file: emptyProc.out.21
 Iterations = 20
diff --git a/external/hypre/src/test/TEST_sstruct/emptyProc.saved.ray b/external/hypre/src/test/TEST_sstruct/emptyProc.saved.lassen_cpu
similarity index 94%
rename from external/hypre/src/test/TEST_sstruct/emptyProc.saved.ray
rename to external/hypre/src/test/TEST_sstruct/emptyProc.saved.lassen_cpu
index aa5df5e6..391ff4dc 100644
--- a/external/hypre/src/test/TEST_sstruct/emptyProc.saved.ray
+++ b/external/hypre/src/test/TEST_sstruct/emptyProc.saved.lassen_cpu
@@ -19,8 +19,8 @@ Iterations = 20
 Final Relative Residual Norm = 5.962015e-07
 
 # Output file: emptyProc.out.05
-Iterations = 9
-Final Relative Residual Norm = 4.770573e-07
+Iterations = 6
+Final Relative Residual Norm = 2.139764e-07
 
 # Output file: emptyProc.out.08
 Iterations = 20
@@ -39,8 +39,8 @@ Iterations = 64
 Final Relative Residual Norm = 9.962554e-07
 
 # Output file: emptyProc.out.12
-Iterations = 9
-Final Relative Residual Norm = 6.064748e-07
+Iterations = 6
+Final Relative Residual Norm = 3.079649e-07
 
 # Output file: emptyProc.out.15
 Iterations = 2
@@ -55,8 +55,8 @@ Iterations = 14
 Final Relative Residual Norm = 6.421347e-07
 
 # Output file: emptyProc.out.18
-Iterations = 5
-Final Relative Residual Norm = 2.114640e-07
+Iterations = 3
+Final Relative Residual Norm = 6.839240e-07
 
 # Output file: emptyProc.out.21
 Iterations = 20
diff --git a/external/hypre/src/test/TEST_sstruct/emptyProc.sh b/external/hypre/src/test/TEST_sstruct/emptyProc.sh
old mode 100644
new mode 100755
index f2665d42..b3a35fa9
--- a/external/hypre/src/test/TEST_sstruct/emptyProc.sh
+++ b/external/hypre/src/test/TEST_sstruct/emptyProc.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/io.jobs b/external/hypre/src/test/TEST_sstruct/io.jobs
new file mode 100644
index 00000000..71aa5657
--- /dev/null
+++ b/external/hypre/src/test/TEST_sstruct/io.jobs
@@ -0,0 +1,61 @@
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+#=============================================================================
+# Sequential I/O tests
+#=============================================================================
+
+mpirun -np 1 ./sstruct -in sstruct.in.block -r 6 6 6 -solver 18 -print > io.out.0P
+mpirun -np 1 ./sstruct -fromfile sstruct.out.A -rhsfromfile sstruct.out.b -x0fromfile sstruct.out.x0 -solver 18 -print > io.out.0R
+
+mpirun -np 1 ./sstruct -in sstruct.in.amr.2D -r 8 8 1 -solver 18 -print > io.out.1P
+mpirun -np 1 ./sstruct -fromfile sstruct.out.A -rhsfromfile sstruct.out.b -x0fromfile sstruct.out.x0 -solver 18 -print > io.out.1R
+
+mpirun -np 1 ./sstruct -in sstruct.in.amr.graphadd -r 3 3 1 -solver 18 -print > io.out.2P
+mpirun -np 1 ./sstruct -fromfile sstruct.out.A -rhsfromfile sstruct.out.b -x0fromfile sstruct.out.x0 -solver 18 -print > io.out.2R
+
+mpirun -np 1 ./sstruct -in sstruct.in.laps -r 4 4 1 -solver 18 -print > io.out.3P
+mpirun -np 1 ./sstruct -fromfile sstruct.out.A -rhsfromfile sstruct.out.b -x0fromfile sstruct.out.x0 -solver 18 -print > io.out.3R
+
+mpirun -np 1 ./sstruct -in sstruct.in.miller_3blk -r 4 4 1 -solver 18 -print > io.out.4P
+mpirun -np 1 ./sstruct -fromfile sstruct.out.A -rhsfromfile sstruct.out.b -x0fromfile sstruct.out.x0 -solver 18 -print > io.out.4R
+
+mpirun -np 1 ./sstruct -in sstruct.in.marinak -solver 18 -tol 1e-3 -print > io.out.5P
+mpirun -np 1 ./sstruct -fromfile sstruct.out.A -rhsfromfile sstruct.out.b -x0fromfile sstruct.out.x0 -solver 18 -print -tol 1e-3 > io.out.5R
+
+mpirun -np 1 ./sstruct -in sstruct.in.p7iso -r 2 2 2 -solver 18 -print > io.out.6P
+mpirun -np 1 ./sstruct -fromfile sstruct.out.A -rhsfromfile sstruct.out.b -x0fromfile sstruct.out.x0 -solver 18 -print > io.out.6R
+
+mpirun -np 1 ./sstruct -in sstruct.in.symm3 -r 4 4 4 -solver 18 -print > io.out.7P
+mpirun -np 1 ./sstruct -fromfile sstruct.out.A -rhsfromfile sstruct.out.b -x0fromfile sstruct.out.x0 -solver 18 -print > io.out.7R
+
+#=============================================================================
+# Parallel I/O tests
+#=============================================================================
+
+mpirun -np 8 ./sstruct -in ../TEST_sstruct/sstruct.in.block -r 3 3 3 -P 2 2 2 -solver 18 -print > io.out.100P
+mpirun -np 8 ./sstruct -fromfile sstruct.out.A -rhsfromfile sstruct.out.b -x0fromfile sstruct.out.x0 -solver 18 -print > io.out.100R
+
+mpirun -np 4 ./sstruct -in sstruct.in.amr.2D -r 4 4 1 -P 2 2 1 -solver 18 -print > io.out.101P
+mpirun -np 4 ./sstruct -fromfile sstruct.out.A -rhsfromfile sstruct.out.b -x0fromfile sstruct.out.x0 -solver 18 -print > io.out.101R
+
+mpirun -np 2 ./sstruct -in sstruct.in.amr.graphadd -r 3 3 1 -pooldist 1 -solver 18 -print > io.out.102P
+mpirun -np 2 ./sstruct -fromfile sstruct.out.A -rhsfromfile sstruct.out.b -x0fromfile sstruct.out.x0 -solver 18 -print > io.out.102R
+
+mpirun -np 4 ./sstruct -in sstruct.in.laps -r 2 2 1 -P 2 2 1 -solver 18 -print > io.out.103P
+mpirun -np 4 ./sstruct -fromfile sstruct.out.A -rhsfromfile sstruct.out.b -x0fromfile sstruct.out.x0 -solver 18 -print > io.out.103R
+
+mpirun -np 4 ./sstruct -in sstruct.in.miller_3blk -r 2 2 1 -P 2 2 1 -solver 18 -print > io.out.104P
+mpirun -np 4 ./sstruct -fromfile sstruct.out.A -rhsfromfile sstruct.out.b -x0fromfile sstruct.out.x0 -solver 18 -print > io.out.104R
+
+mpirun -np 8 ./sstruct -in sstruct.in.marinak -pooldist 1 -solver 18 -tol 1e-3 -print > io.out.105P
+mpirun -np 8 ./sstruct -fromfile sstruct.out.A -rhsfromfile sstruct.out.b -x0fromfile sstruct.out.x0 -solver 18 -print -tol 1e-3 > io.out.105R
+
+mpirun -np 8 ./sstruct -in sstruct.in.p7iso -P 2 2 2 -solver 18 -print > io.out.106P
+mpirun -np 8 ./sstruct -fromfile sstruct.out.A -rhsfromfile sstruct.out.b -x0fromfile sstruct.out.x0 -solver 18 -print > io.out.106R
+
+mpirun -np 8 ./sstruct -in sstruct.in.symm3 -r 2 2 2 -P 2 2 2 -solver 18 -print > io.out.107P
+mpirun -np 8 ./sstruct -fromfile sstruct.out.A -rhsfromfile sstruct.out.b -x0fromfile sstruct.out.x0 -solver 18 -print > io.out.107R
diff --git a/external/hypre/src/test/TEST_sstruct/io.saved b/external/hypre/src/test/TEST_sstruct/io.saved
new file mode 100644
index 00000000..f7ec8177
--- /dev/null
+++ b/external/hypre/src/test/TEST_sstruct/io.saved
@@ -0,0 +1,127 @@
+# Output file: io.out.0P
+Iterations = 40
+Final Relative Residual Norm = 6.360366e-07
+
+# Output file: io.out.0R
+Iterations = 40
+Final Relative Residual Norm = 6.360366e-07
+
+# Output file: io.out.1P
+Iterations = 20
+Final Relative Residual Norm = 8.532200e-07
+
+# Output file: io.out.1R
+Iterations = 20
+Final Relative Residual Norm = 8.532200e-07
+
+# Output file: io.out.2P
+Iterations = 23
+Final Relative Residual Norm = 8.435286e-07
+
+# Output file: io.out.2R
+Iterations = 23
+Final Relative Residual Norm = 8.435286e-07
+
+# Output file: io.out.3P
+Iterations = 92
+Final Relative Residual Norm = 7.654048e-07
+
+# Output file: io.out.3R
+Iterations = 92
+Final Relative Residual Norm = 7.654048e-07
+
+# Output file: io.out.4P
+Iterations = 65
+Final Relative Residual Norm = 9.321074e-07
+
+# Output file: io.out.4R
+Iterations = 65
+Final Relative Residual Norm = 9.321074e-07
+
+# Output file: io.out.5P
+Iterations = 64
+Final Relative Residual Norm = 9.708691e-04
+
+# Output file: io.out.5R
+Iterations = 64
+Final Relative Residual Norm = 9.708691e-04
+
+# Output file: io.out.6P
+Iterations = 60
+Final Relative Residual Norm = 8.657637e-07
+
+# Output file: io.out.6R
+Iterations = 60
+Final Relative Residual Norm = 8.657637e-07
+
+# Output file: io.out.7P
+Iterations = 27
+Final Relative Residual Norm = 4.507162e-07
+
+# Output file: io.out.7R
+Iterations = 27
+Final Relative Residual Norm = 4.507162e-07
+
+# Output file: io.out.100P
+Iterations = 40
+Final Relative Residual Norm = 6.360366e-07
+
+# Output file: io.out.100R
+Iterations = 40
+Final Relative Residual Norm = 6.360366e-07
+
+# Output file: io.out.101P
+Iterations = 20
+Final Relative Residual Norm = 8.532200e-07
+
+# Output file: io.out.101R
+Iterations = 20
+Final Relative Residual Norm = 8.532200e-07
+
+# Output file: io.out.102P
+Iterations = 23
+Final Relative Residual Norm = 8.435286e-07
+
+# Output file: io.out.102R
+Iterations = 23
+Final Relative Residual Norm = 8.435286e-07
+
+# Output file: io.out.103P
+Iterations = 92
+Final Relative Residual Norm = 7.654048e-07
+
+# Output file: io.out.103R
+Iterations = 92
+Final Relative Residual Norm = 7.654048e-07
+
+# Output file: io.out.104P
+Iterations = 65
+Final Relative Residual Norm = 9.321074e-07
+
+# Output file: io.out.104R
+Iterations = 65
+Final Relative Residual Norm = 9.321074e-07
+
+# Output file: io.out.105P
+Iterations = 64
+Final Relative Residual Norm = 9.708691e-04
+
+# Output file: io.out.105R
+Iterations = 64
+Final Relative Residual Norm = 9.708691e-04
+
+# Output file: io.out.106P
+Iterations = 60
+Final Relative Residual Norm = 8.657637e-07
+
+# Output file: io.out.106R
+Iterations = 60
+Final Relative Residual Norm = 8.657637e-07
+
+# Output file: io.out.107P
+Iterations = 27
+Final Relative Residual Norm = 4.507162e-07
+
+# Output file: io.out.107R
+Iterations = 27
+Final Relative Residual Norm = 4.507162e-07
\ No newline at end of file
diff --git a/external/hypre/src/test/TEST_sstruct/io.saved.lassen b/external/hypre/src/test/TEST_sstruct/io.saved.lassen
new file mode 100644
index 00000000..1c44c5aa
--- /dev/null
+++ b/external/hypre/src/test/TEST_sstruct/io.saved.lassen
@@ -0,0 +1,128 @@
+# Output file: io.out.0P
+Iterations = 40
+Final Relative Residual Norm = 6.360366e-07
+
+# Output file: io.out.0R
+Iterations = 40
+Final Relative Residual Norm = 6.360366e-07
+
+# Output file: io.out.1P
+Iterations = 20
+Final Relative Residual Norm = 8.532200e-07
+
+# Output file: io.out.1R
+Iterations = 20
+Final Relative Residual Norm = 8.532200e-07
+
+# Output file: io.out.2P
+Iterations = 23
+Final Relative Residual Norm = 8.435286e-07
+
+# Output file: io.out.2R
+Iterations = 23
+Final Relative Residual Norm = 8.435286e-07
+
+# Output file: io.out.3P
+Iterations = 92
+Final Relative Residual Norm = 7.654048e-07
+
+# Output file: io.out.3R
+Iterations = 92
+Final Relative Residual Norm = 7.654048e-07
+
+# Output file: io.out.4P
+Iterations = 65
+Final Relative Residual Norm = 9.321074e-07
+
+# Output file: io.out.4R
+Iterations = 65
+Final Relative Residual Norm = 9.321074e-07
+
+# Output file: io.out.5P
+Iterations = 64
+Final Relative Residual Norm = 9.708691e-04
+
+# Output file: io.out.5R
+Iterations = 64
+Final Relative Residual Norm = 9.708691e-04
+
+# Output file: io.out.6P
+Iterations = 60
+Final Relative Residual Norm = 8.657637e-07
+
+# Output file: io.out.6R
+Iterations = 60
+Final Relative Residual Norm = 8.657637e-07
+
+# Output file: io.out.7P
+Iterations = 27
+Final Relative Residual Norm = 4.507162e-07
+
+# Output file: io.out.7R
+Iterations = 27
+Final Relative Residual Norm = 4.507162e-07
+
+# Output file: io.out.100P
+Iterations = 40
+Final Relative Residual Norm = 6.360366e-07
+
+# Output file: io.out.100R
+Iterations = 40
+Final Relative Residual Norm = 6.360366e-07
+
+# Output file: io.out.101P
+Iterations = 20
+Final Relative Residual Norm = 8.532200e-07
+
+# Output file: io.out.101R
+Iterations = 20
+Final Relative Residual Norm = 8.532200e-07
+
+# Output file: io.out.102P
+Iterations = 23
+Final Relative Residual Norm = 8.435286e-07
+
+# Output file: io.out.102R
+Iterations = 23
+Final Relative Residual Norm = 8.435286e-07
+
+# Output file: io.out.103P
+Iterations = 92
+Final Relative Residual Norm = 7.654048e-07
+
+# Output file: io.out.103R
+Iterations = 92
+Final Relative Residual Norm = 7.654048e-07
+
+# Output file: io.out.104P
+Iterations = 65
+Final Relative Residual Norm = 9.321074e-07
+
+# Output file: io.out.104R
+Iterations = 65
+Final Relative Residual Norm = 9.321074e-07
+
+# Output file: io.out.105P
+Iterations = 64
+Final Relative Residual Norm = 9.708691e-04
+
+# Output file: io.out.105R
+Iterations = 64
+Final Relative Residual Norm = 9.708691e-04
+
+# Output file: io.out.106P
+Iterations = 60
+Final Relative Residual Norm = 8.657637e-07
+
+# Output file: io.out.106R
+Iterations = 60
+Final Relative Residual Norm = 8.657637e-07
+
+# Output file: io.out.107P
+Iterations = 27
+Final Relative Residual Norm = 4.507162e-07
+
+# Output file: io.out.107R
+Iterations = 27
+Final Relative Residual Norm = 4.507162e-07
+
diff --git a/external/hypre/src/test/TEST_sstruct/io.saved.lassen_cpu b/external/hypre/src/test/TEST_sstruct/io.saved.lassen_cpu
new file mode 100644
index 00000000..1c44c5aa
--- /dev/null
+++ b/external/hypre/src/test/TEST_sstruct/io.saved.lassen_cpu
@@ -0,0 +1,128 @@
+# Output file: io.out.0P
+Iterations = 40
+Final Relative Residual Norm = 6.360366e-07
+
+# Output file: io.out.0R
+Iterations = 40
+Final Relative Residual Norm = 6.360366e-07
+
+# Output file: io.out.1P
+Iterations = 20
+Final Relative Residual Norm = 8.532200e-07
+
+# Output file: io.out.1R
+Iterations = 20
+Final Relative Residual Norm = 8.532200e-07
+
+# Output file: io.out.2P
+Iterations = 23
+Final Relative Residual Norm = 8.435286e-07
+
+# Output file: io.out.2R
+Iterations = 23
+Final Relative Residual Norm = 8.435286e-07
+
+# Output file: io.out.3P
+Iterations = 92
+Final Relative Residual Norm = 7.654048e-07
+
+# Output file: io.out.3R
+Iterations = 92
+Final Relative Residual Norm = 7.654048e-07
+
+# Output file: io.out.4P
+Iterations = 65
+Final Relative Residual Norm = 9.321074e-07
+
+# Output file: io.out.4R
+Iterations = 65
+Final Relative Residual Norm = 9.321074e-07
+
+# Output file: io.out.5P
+Iterations = 64
+Final Relative Residual Norm = 9.708691e-04
+
+# Output file: io.out.5R
+Iterations = 64
+Final Relative Residual Norm = 9.708691e-04
+
+# Output file: io.out.6P
+Iterations = 60
+Final Relative Residual Norm = 8.657637e-07
+
+# Output file: io.out.6R
+Iterations = 60
+Final Relative Residual Norm = 8.657637e-07
+
+# Output file: io.out.7P
+Iterations = 27
+Final Relative Residual Norm = 4.507162e-07
+
+# Output file: io.out.7R
+Iterations = 27
+Final Relative Residual Norm = 4.507162e-07
+
+# Output file: io.out.100P
+Iterations = 40
+Final Relative Residual Norm = 6.360366e-07
+
+# Output file: io.out.100R
+Iterations = 40
+Final Relative Residual Norm = 6.360366e-07
+
+# Output file: io.out.101P
+Iterations = 20
+Final Relative Residual Norm = 8.532200e-07
+
+# Output file: io.out.101R
+Iterations = 20
+Final Relative Residual Norm = 8.532200e-07
+
+# Output file: io.out.102P
+Iterations = 23
+Final Relative Residual Norm = 8.435286e-07
+
+# Output file: io.out.102R
+Iterations = 23
+Final Relative Residual Norm = 8.435286e-07
+
+# Output file: io.out.103P
+Iterations = 92
+Final Relative Residual Norm = 7.654048e-07
+
+# Output file: io.out.103R
+Iterations = 92
+Final Relative Residual Norm = 7.654048e-07
+
+# Output file: io.out.104P
+Iterations = 65
+Final Relative Residual Norm = 9.321074e-07
+
+# Output file: io.out.104R
+Iterations = 65
+Final Relative Residual Norm = 9.321074e-07
+
+# Output file: io.out.105P
+Iterations = 64
+Final Relative Residual Norm = 9.708691e-04
+
+# Output file: io.out.105R
+Iterations = 64
+Final Relative Residual Norm = 9.708691e-04
+
+# Output file: io.out.106P
+Iterations = 60
+Final Relative Residual Norm = 8.657637e-07
+
+# Output file: io.out.106R
+Iterations = 60
+Final Relative Residual Norm = 8.657637e-07
+
+# Output file: io.out.107P
+Iterations = 27
+Final Relative Residual Norm = 4.507162e-07
+
+# Output file: io.out.107R
+Iterations = 27
+Final Relative Residual Norm = 4.507162e-07
+
diff --git a/external/hypre/src/test/TEST_sstruct/io.sh b/external/hypre/src/test/TEST_sstruct/io.sh
new file mode 100755
index 00000000..17c2f998
--- /dev/null
+++ b/external/hypre/src/test/TEST_sstruct/io.sh
@@ -0,0 +1,61 @@
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+TNAME=`basename $0 .sh`
+RTOL=$1
+ATOL=$2
+
+#=============================================================================
+# compare with baseline case
+#=============================================================================
+
+FILES="\
+ ${TNAME}.out.0P\
+ ${TNAME}.out.0R\
+ ${TNAME}.out.1P\
+ ${TNAME}.out.1R\
+ ${TNAME}.out.2P\
+ ${TNAME}.out.2R\
+ ${TNAME}.out.3P\
+ ${TNAME}.out.3R\
+ ${TNAME}.out.4P\
+ ${TNAME}.out.4R\
+ ${TNAME}.out.5P\
+ ${TNAME}.out.5R\
+ ${TNAME}.out.6P\
+ ${TNAME}.out.6R\
+ ${TNAME}.out.7P\
+ ${TNAME}.out.7R\
+ ${TNAME}.out.100P\
+ ${TNAME}.out.100R\
+ ${TNAME}.out.101P\
+ ${TNAME}.out.101R\
+ ${TNAME}.out.102P\
+ ${TNAME}.out.102R\
+ ${TNAME}.out.103P\
+ ${TNAME}.out.103R\
+ ${TNAME}.out.104P\
+ ${TNAME}.out.104R\
+ ${TNAME}.out.105P\
+ ${TNAME}.out.105R\
+ ${TNAME}.out.106P\
+ ${TNAME}.out.106R\
+ ${TNAME}.out.107P\
+ ${TNAME}.out.107R\
+"
+
+for i in $FILES
+do
+  echo "# Output file: $i"
+  tail -3 $i
+done > ${TNAME}.out
+
+# Make sure that the output file is reasonable
+RUNCOUNT=`echo $FILES | wc -w`
+OUTCOUNT=`grep "Iterations" ${TNAME}.out | wc -l`
+if [ "$OUTCOUNT" != "$RUNCOUNT" ]; then
+   echo "Incorrect number of runs in ${TNAME}.out" >&2
+fi
diff --git a/external/hypre/src/test/TEST_sstruct/maxwell.jobs b/external/hypre/src/test/TEST_sstruct/maxwell.jobs
old mode 100644
new mode 100755
index acbb3f5e..d4fa3918
--- a/external/hypre/src/test/TEST_sstruct/maxwell.jobs
+++ b/external/hypre/src/test/TEST_sstruct/maxwell.jobs
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/maxwell.saved.lassen b/external/hypre/src/test/TEST_sstruct/maxwell.saved.lassen
index 6536083d..28eb5624 100644
--- a/external/hypre/src/test/TEST_sstruct/maxwell.saved.lassen
+++ b/external/hypre/src/test/TEST_sstruct/maxwell.saved.lassen
@@ -1,12 +1,12 @@
 # Output file: maxwell.out.0
 Iterations = 10
-Final Relative Residual Norm = 2.480525e-09
+Final Relative Residual Norm = 2.480102e-09
 
 # Output file: maxwell.out.1
 Iterations = 10
-Final Relative Residual Norm = 3.776021e-09
+Final Relative Residual Norm = 3.782219e-09
 
 # Output file: maxwell.out.2
 Iterations = 10
-Final Relative Residual Norm = 7.164237e-09
+Final Relative Residual Norm = 7.164797e-09
 
diff --git a/external/hypre/src/test/TEST_sstruct/maxwell.saved.ray b/external/hypre/src/test/TEST_sstruct/maxwell.saved.lassen_cpu
similarity index 51%
rename from external/hypre/src/test/TEST_sstruct/maxwell.saved.ray
rename to external/hypre/src/test/TEST_sstruct/maxwell.saved.lassen_cpu
index 6536083d..3c0b326e 100644
--- a/external/hypre/src/test/TEST_sstruct/maxwell.saved.ray
+++ b/external/hypre/src/test/TEST_sstruct/maxwell.saved.lassen_cpu
@@ -1,12 +1,12 @@
 # Output file: maxwell.out.0
 Iterations = 10
-Final Relative Residual Norm = 2.480525e-09
+Final Relative Residual Norm = 2.476905e-09
 
 # Output file: maxwell.out.1
 Iterations = 10
-Final Relative Residual Norm = 3.776021e-09
+Final Relative Residual Norm = 3.773173e-09
 
 # Output file: maxwell.out.2
 Iterations = 10
-Final Relative Residual Norm = 7.164237e-09
+Final Relative Residual Norm = 7.155215e-09
 
diff --git a/external/hypre/src/test/TEST_sstruct/maxwell.sh b/external/hypre/src/test/TEST_sstruct/maxwell.sh
old mode 100644
new mode 100755
index c4080171..b5389bd1
--- a/external/hypre/src/test/TEST_sstruct/maxwell.sh
+++ b/external/hypre/src/test/TEST_sstruct/maxwell.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/miller.jobs b/external/hypre/src/test/TEST_sstruct/miller.jobs
old mode 100644
new mode 100755
index 24c2ab40..984fc0df
--- a/external/hypre/src/test/TEST_sstruct/miller.jobs
+++ b/external/hypre/src/test/TEST_sstruct/miller.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/miller.saved.lassen b/external/hypre/src/test/TEST_sstruct/miller.saved.lassen
index 8f3c80ea..3766d36b 100644
--- a/external/hypre/src/test/TEST_sstruct/miller.saved.lassen
+++ b/external/hypre/src/test/TEST_sstruct/miller.saved.lassen
@@ -4,7 +4,7 @@ Final Relative Residual Norm = 8.455333e-07
 
 # Output file: miller.out.1
 Iterations = 7
-Final Relative Residual Norm = 2.927538e-07
+Final Relative Residual Norm = 3.361152e-07
 
 # Output file: miller.out.2
 Iterations = 15
@@ -12,7 +12,7 @@ Final Relative Residual Norm = 6.496892e-07
 
 # Output file: miller.out.3
 Iterations = 9
-Final Relative Residual Norm = 4.153907e-07
+Final Relative Residual Norm = 4.304655e-07
 
 # Output file: miller.out.4
 Iterations = 18
@@ -28,7 +28,7 @@ Final Relative Residual Norm = 6.181674e-07
 
 # Output file: miller.out.7
 Iterations = 7
-Final Relative Residual Norm = 7.676131e-07
+Final Relative Residual Norm = 7.661617e-07
 
 # Output file: miller.out.8
 Iterations = 3
diff --git a/external/hypre/src/test/TEST_sstruct/miller.saved.ray b/external/hypre/src/test/TEST_sstruct/miller.saved.lassen_cpu
similarity index 73%
rename from external/hypre/src/test/TEST_sstruct/miller.saved.ray
rename to external/hypre/src/test/TEST_sstruct/miller.saved.lassen_cpu
index 8f3c80ea..5c7bcc98 100644
--- a/external/hypre/src/test/TEST_sstruct/miller.saved.ray
+++ b/external/hypre/src/test/TEST_sstruct/miller.saved.lassen_cpu
@@ -3,32 +3,32 @@ Iterations = 16
 Final Relative Residual Norm = 8.455333e-07
 
 # Output file: miller.out.1
-Iterations = 7
-Final Relative Residual Norm = 2.927538e-07
+Iterations = 6
+Final Relative Residual Norm = 9.625406e-08
 
 # Output file: miller.out.2
 Iterations = 15
 Final Relative Residual Norm = 6.496892e-07
 
 # Output file: miller.out.3
-Iterations = 9
-Final Relative Residual Norm = 4.153907e-07
+Iterations = 5
+Final Relative Residual Norm = 4.213555e-07
 
 # Output file: miller.out.4
 Iterations = 18
 Final Relative Residual Norm = 3.006677e-07
 
 # Output file: miller.out.5
-Iterations = 7
-Final Relative Residual Norm = 1.958737e-07
+Iterations = 6
+Final Relative Residual Norm = 8.758757e-08
 
 # Output file: miller.out.6
 Iterations = 37
 Final Relative Residual Norm = 6.181674e-07
 
 # Output file: miller.out.7
-Iterations = 7
-Final Relative Residual Norm = 7.676131e-07
+Iterations = 5
+Final Relative Residual Norm = 8.323418e-07
 
 # Output file: miller.out.8
 Iterations = 3
diff --git a/external/hypre/src/test/TEST_sstruct/miller.sh b/external/hypre/src/test/TEST_sstruct/miller.sh
old mode 100644
new mode 100755
index 99537708..fc9015c4
--- a/external/hypre/src/test/TEST_sstruct/miller.sh
+++ b/external/hypre/src/test/TEST_sstruct/miller.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/neighborpart.jobs b/external/hypre/src/test/TEST_sstruct/neighborpart.jobs
old mode 100644
new mode 100755
index fbc14885..d7990fd2
--- a/external/hypre/src/test/TEST_sstruct/neighborpart.jobs
+++ b/external/hypre/src/test/TEST_sstruct/neighborpart.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/neighborpart.saved b/external/hypre/src/test/TEST_sstruct/neighborpart.saved
index a974480e..a071ccf6 100644
--- a/external/hypre/src/test/TEST_sstruct/neighborpart.saved
+++ b/external/hypre/src/test/TEST_sstruct/neighborpart.saved
@@ -64,13 +64,13 @@ Final Relative Residual Norm = 8.604821e-07
 
 # Output file: neighborpart.out.60
 Iterations = 5
-Final Relative Residual Norm = 1.963879e-18
+Final Relative Residual Norm = 5.456678e-18
 
 # Output file: neighborpart.out.61
 Iterations = 5
-Final Relative Residual Norm = 1.963879e-18
+Final Relative Residual Norm = 5.456678e-18
 
 # Output file: neighborpart.out.62
 Iterations = 5
-Final Relative Residual Norm = 1.963879e-18
+Final Relative Residual Norm = 5.456678e-18
 
diff --git a/external/hypre/src/test/TEST_sstruct/neighborpart.saved.lassen b/external/hypre/src/test/TEST_sstruct/neighborpart.saved.lassen
index 9b94a99e..278e7789 100644
--- a/external/hypre/src/test/TEST_sstruct/neighborpart.saved.lassen
+++ b/external/hypre/src/test/TEST_sstruct/neighborpart.saved.lassen
@@ -64,13 +64,13 @@ Final Relative Residual Norm = 8.604821e-07
 
 # Output file: neighborpart.out.60
 Iterations = 5
-Final Relative Residual Norm = 2.116338e-18
+Final Relative Residual Norm = 3.281199e-18
 
 # Output file: neighborpart.out.61
 Iterations = 5
-Final Relative Residual Norm = 2.116338e-18
+Final Relative Residual Norm = 3.281199e-18
 
 # Output file: neighborpart.out.62
 Iterations = 5
-Final Relative Residual Norm = 2.116338e-18
+Final Relative Residual Norm = 3.281199e-18
 
diff --git a/external/hypre/src/test/TEST_sstruct/neighborpart.saved.ray b/external/hypre/src/test/TEST_sstruct/neighborpart.saved.lassen_cpu
similarity index 92%
rename from external/hypre/src/test/TEST_sstruct/neighborpart.saved.ray
rename to external/hypre/src/test/TEST_sstruct/neighborpart.saved.lassen_cpu
index 9b94a99e..4cc800ca 100644
--- a/external/hypre/src/test/TEST_sstruct/neighborpart.saved.ray
+++ b/external/hypre/src/test/TEST_sstruct/neighborpart.saved.lassen_cpu
@@ -64,13 +64,13 @@ Final Relative Residual Norm = 8.604821e-07
 
 # Output file: neighborpart.out.60
 Iterations = 5
-Final Relative Residual Norm = 2.116338e-18
+Final Relative Residual Norm = 6.242460e-18
 
 # Output file: neighborpart.out.61
 Iterations = 5
-Final Relative Residual Norm = 2.116338e-18
+Final Relative Residual Norm = 6.242460e-18
 
 # Output file: neighborpart.out.62
 Iterations = 5
-Final Relative Residual Norm = 2.116338e-18
+Final Relative Residual Norm = 6.242460e-18
 
diff --git a/external/hypre/src/test/TEST_sstruct/neighborpart.sh b/external/hypre/src/test/TEST_sstruct/neighborpart.sh
old mode 100644
new mode 100755
index 20841299..90da9fad
--- a/external/hypre/src/test/TEST_sstruct/neighborpart.sh
+++ b/external/hypre/src/test/TEST_sstruct/neighborpart.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/neumann.jobs b/external/hypre/src/test/TEST_sstruct/neumann.jobs
old mode 100644
new mode 100755
index a166862f..965725d4
--- a/external/hypre/src/test/TEST_sstruct/neumann.jobs
+++ b/external/hypre/src/test/TEST_sstruct/neumann.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/neumann.saved.ray b/external/hypre/src/test/TEST_sstruct/neumann.saved.lassen_cpu
similarity index 100%
rename from external/hypre/src/test/TEST_sstruct/neumann.saved.ray
rename to external/hypre/src/test/TEST_sstruct/neumann.saved.lassen_cpu
diff --git a/external/hypre/src/test/TEST_sstruct/neumann.sh b/external/hypre/src/test/TEST_sstruct/neumann.sh
old mode 100644
new mode 100755
index f360fc73..d4c97e21
--- a/external/hypre/src/test/TEST_sstruct/neumann.sh
+++ b/external/hypre/src/test/TEST_sstruct/neumann.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/nonmixedint.jobs b/external/hypre/src/test/TEST_sstruct/nonmixedint.jobs
old mode 100644
new mode 100755
index a340c2fa..4b9ffe75
--- a/external/hypre/src/test/TEST_sstruct/nonmixedint.jobs
+++ b/external/hypre/src/test/TEST_sstruct/nonmixedint.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/nonmixedint.saved.ray b/external/hypre/src/test/TEST_sstruct/nonmixedint.saved.lassen_cpu
similarity index 100%
rename from external/hypre/src/test/TEST_sstruct/nonmixedint.saved.ray
rename to external/hypre/src/test/TEST_sstruct/nonmixedint.saved.lassen_cpu
diff --git a/external/hypre/src/test/TEST_sstruct/nonmixedint.sh b/external/hypre/src/test/TEST_sstruct/nonmixedint.sh
old mode 100644
new mode 100755
index a9f3efba..f6f64120
--- a/external/hypre/src/test/TEST_sstruct/nonmixedint.sh
+++ b/external/hypre/src/test/TEST_sstruct/nonmixedint.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/periodic.jobs b/external/hypre/src/test/TEST_sstruct/periodic.jobs
old mode 100644
new mode 100755
index fee7125c..71c0c17e
--- a/external/hypre/src/test/TEST_sstruct/periodic.jobs
+++ b/external/hypre/src/test/TEST_sstruct/periodic.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/periodic.saved.ray b/external/hypre/src/test/TEST_sstruct/periodic.saved.lassen_cpu
similarity index 100%
rename from external/hypre/src/test/TEST_sstruct/periodic.saved.ray
rename to external/hypre/src/test/TEST_sstruct/periodic.saved.lassen_cpu
diff --git a/external/hypre/src/test/TEST_sstruct/periodic.sh b/external/hypre/src/test/TEST_sstruct/periodic.sh
old mode 100644
new mode 100755
index 2469045a..74cc37db
--- a/external/hypre/src/test/TEST_sstruct/periodic.sh
+++ b/external/hypre/src/test/TEST_sstruct/periodic.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sharedpart.jobs b/external/hypre/src/test/TEST_sstruct/sharedpart.jobs
old mode 100644
new mode 100755
index 83966a97..8ca0fac4
--- a/external/hypre/src/test/TEST_sstruct/sharedpart.jobs
+++ b/external/hypre/src/test/TEST_sstruct/sharedpart.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sharedpart.saved b/external/hypre/src/test/TEST_sstruct/sharedpart.saved
index 62280643..6c7d245a 100644
--- a/external/hypre/src/test/TEST_sstruct/sharedpart.saved
+++ b/external/hypre/src/test/TEST_sstruct/sharedpart.saved
@@ -24,15 +24,15 @@ Final Relative Residual Norm = 4.922026e-07
 
 # Output file: sharedpart.out.50
 Iterations = 5
-Final Relative Residual Norm = 1.368642e-07
+Final Relative Residual Norm = 1.476647e-07
 
 # Output file: sharedpart.out.51
 Iterations = 5
-Final Relative Residual Norm = 1.549669e-07
+Final Relative Residual Norm = 1.593675e-07
 
 # Output file: sharedpart.out.52
 Iterations = 5
-Final Relative Residual Norm = 1.368642e-07
+Final Relative Residual Norm = 1.482436e-07
 
 # Output file: sharedpart.out.53
 Iterations = 7
diff --git a/external/hypre/src/test/TEST_sstruct/sharedpart.saved.lassen b/external/hypre/src/test/TEST_sstruct/sharedpart.saved.lassen
index b56d1222..f4a08fac 100644
--- a/external/hypre/src/test/TEST_sstruct/sharedpart.saved.lassen
+++ b/external/hypre/src/test/TEST_sstruct/sharedpart.saved.lassen
@@ -24,15 +24,15 @@ Final Relative Residual Norm = 4.922026e-07
 
 # Output file: sharedpart.out.50
 Iterations = 7
-Final Relative Residual Norm = 6.535037e-07
+Final Relative Residual Norm = 6.613426e-07
 
 # Output file: sharedpart.out.51
 Iterations = 7
-Final Relative Residual Norm = 5.648415e-07
+Final Relative Residual Norm = 6.078964e-07
 
 # Output file: sharedpart.out.52
 Iterations = 7
-Final Relative Residual Norm = 6.535037e-07
+Final Relative Residual Norm = 6.613426e-07
 
 # Output file: sharedpart.out.53
 Iterations = 11
diff --git a/external/hypre/src/test/TEST_sstruct/sharedpart.saved.ray b/external/hypre/src/test/TEST_sstruct/sharedpart.saved.lassen_cpu
similarity index 76%
rename from external/hypre/src/test/TEST_sstruct/sharedpart.saved.ray
rename to external/hypre/src/test/TEST_sstruct/sharedpart.saved.lassen_cpu
index b56d1222..292ae5c9 100644
--- a/external/hypre/src/test/TEST_sstruct/sharedpart.saved.ray
+++ b/external/hypre/src/test/TEST_sstruct/sharedpart.saved.lassen_cpu
@@ -23,18 +23,18 @@ Iterations = 18
 Final Relative Residual Norm = 4.922026e-07
 
 # Output file: sharedpart.out.50
-Iterations = 7
-Final Relative Residual Norm = 6.535037e-07
+Iterations = 5
+Final Relative Residual Norm = 1.476576e-07
 
 # Output file: sharedpart.out.51
-Iterations = 7
-Final Relative Residual Norm = 5.648415e-07
+Iterations = 5
+Final Relative Residual Norm = 1.593654e-07
 
 # Output file: sharedpart.out.52
-Iterations = 7
-Final Relative Residual Norm = 6.535037e-07
+Iterations = 5
+Final Relative Residual Norm = 1.482297e-07
 
 # Output file: sharedpart.out.53
-Iterations = 11
-Final Relative Residual Norm = 1.984668e-07
+Iterations = 7
+Final Relative Residual Norm = 2.557686e-07
 
diff --git a/external/hypre/src/test/TEST_sstruct/sharedpart.sh b/external/hypre/src/test/TEST_sstruct/sharedpart.sh
old mode 100644
new mode 100755
index a0309a3a..f72c20c7
--- a/external/hypre/src/test/TEST_sstruct/sharedpart.sh
+++ b/external/hypre/src/test/TEST_sstruct/sharedpart.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/solvers.jobs b/external/hypre/src/test/TEST_sstruct/solvers.jobs
old mode 100644
new mode 100755
index 235a6fe1..01e35154
--- a/external/hypre/src/test/TEST_sstruct/solvers.jobs
+++ b/external/hypre/src/test/TEST_sstruct/solvers.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/solvers.saved.lassen b/external/hypre/src/test/TEST_sstruct/solvers.saved.lassen
index 4d740c04..a27b6238 100644
--- a/external/hypre/src/test/TEST_sstruct/solvers.saved.lassen
+++ b/external/hypre/src/test/TEST_sstruct/solvers.saved.lassen
@@ -16,7 +16,7 @@ Final Relative Residual Norm = 9.124482e-07
 
 # Output file: solvers.out.4
 Iterations = 8
-Final Relative Residual Norm = 3.387495e-07
+Final Relative Residual Norm = 3.394170e-07
 
 # Output file: solvers.out.7
 Iterations = 28
@@ -36,7 +36,7 @@ Final Relative Residual Norm = 9.036190e-07
 
 # Output file: solvers.out.11
 Iterations = 8
-Final Relative Residual Norm = 4.189540e-07
+Final Relative Residual Norm = 4.151604e-07
 
 # Output file: solvers.out.14
 Iterations = 11
@@ -44,7 +44,7 @@ Final Relative Residual Norm = 8.131824e-07
 
 # Output file: solvers.out.15
 Iterations = 9
-Final Relative Residual Norm = 6.163010e-07
+Final Relative Residual Norm = 6.612411e-07
 
 # Output file: solvers.out.16
 Iterations = 28
@@ -60,9 +60,9 @@ Final Relative Residual Norm = 9.036190e-07
 
 # Output file: solvers.out.19
 Iterations = 8
-Final Relative Residual Norm = 4.189540e-07
+Final Relative Residual Norm = 4.151604e-07
 
 # Output file: solvers.out.20
 Iterations = 8
-Final Relative Residual Norm = 3.309270e-07
+Final Relative Residual Norm = 3.335606e-07
 
diff --git a/external/hypre/src/test/TEST_sstruct/solvers.saved.ray b/external/hypre/src/test/TEST_sstruct/solvers.saved.lassen_cpu
similarity index 80%
rename from external/hypre/src/test/TEST_sstruct/solvers.saved.ray
rename to external/hypre/src/test/TEST_sstruct/solvers.saved.lassen_cpu
index 7add4ee9..61d07df1 100644
--- a/external/hypre/src/test/TEST_sstruct/solvers.saved.ray
+++ b/external/hypre/src/test/TEST_sstruct/solvers.saved.lassen_cpu
@@ -15,8 +15,8 @@ Iterations = 25
 Final Relative Residual Norm = 9.124482e-07
 
 # Output file: solvers.out.4
-Iterations = 8
-Final Relative Residual Norm = 3.652576e-07
+Iterations = 4
+Final Relative Residual Norm = 9.533500e-07
 
 # Output file: solvers.out.7
 Iterations = 28
@@ -35,16 +35,16 @@ Iterations = 30
 Final Relative Residual Norm = 9.036190e-07
 
 # Output file: solvers.out.11
-Iterations = 8
-Final Relative Residual Norm = 4.492904e-07
+Iterations = 4
+Final Relative Residual Norm = 9.340843e-07
 
 # Output file: solvers.out.14
 Iterations = 11
 Final Relative Residual Norm = 8.131824e-07
 
 # Output file: solvers.out.15
-Iterations = 9
-Final Relative Residual Norm = 6.163052e-07
+Iterations = 5
+Final Relative Residual Norm = 3.553535e-07
 
 # Output file: solvers.out.16
 Iterations = 28
@@ -59,10 +59,10 @@ Iterations = 30
 Final Relative Residual Norm = 9.036190e-07
 
 # Output file: solvers.out.19
-Iterations = 8
-Final Relative Residual Norm = 4.492904e-07
+Iterations = 4
+Final Relative Residual Norm = 9.340843e-07
 
 # Output file: solvers.out.20
-Iterations = 8
-Final Relative Residual Norm = 3.569281e-07
+Iterations = 4
+Final Relative Residual Norm = 9.340843e-07
 
diff --git a/external/hypre/src/test/TEST_sstruct/solvers.sh b/external/hypre/src/test/TEST_sstruct/solvers.sh
old mode 100644
new mode 100755
index 06d5c34a..a37e3269
--- a/external/hypre/src/test/TEST_sstruct/solvers.sh
+++ b/external/hypre/src/test/TEST_sstruct/solvers.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.19aniso b/external/hypre/src/test/TEST_sstruct/sstruct.in.19aniso
index 18271612..e657e73d 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.19aniso
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.19aniso
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.19iso b/external/hypre/src/test/TEST_sstruct/sstruct.in.19iso
index 61673ed5..8b4d17b0 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.19iso
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.19iso
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.7aniso b/external/hypre/src/test/TEST_sstruct/sstruct.in.7aniso
index 8ed38ea8..88dfc1c7 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.7aniso
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.7aniso
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.7iso b/external/hypre/src/test/TEST_sstruct/sstruct.in.7iso
index 548443c4..e0607696 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.7iso
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.7iso
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.7zero-x b/external/hypre/src/test/TEST_sstruct/sstruct.in.7zero-x
index 2b46e9fc..29853095 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.7zero-x
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.7zero-x
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.7zero-y b/external/hypre/src/test/TEST_sstruct/sstruct.in.7zero-y
index 8d1695c1..b2a07394 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.7zero-y
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.7zero-y
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.7zero-z b/external/hypre/src/test/TEST_sstruct/sstruct.in.7zero-z
index 864d8f23..0fe159ae 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.7zero-z
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.7zero-z
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.addtoval_cellcentre b/external/hypre/src/test/TEST_sstruct/sstruct.in.addtoval_cellcentre
index 1b1abec3..1dcf5ad3 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.addtoval_cellcentre
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.addtoval_cellcentre
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.addtoval_edges b/external/hypre/src/test/TEST_sstruct/sstruct.in.addtoval_edges
index 7e072bb5..792291f3 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.addtoval_edges
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.addtoval_edges
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.amr.2D b/external/hypre/src/test/TEST_sstruct/sstruct.in.amr.2D
index 0cd6853d..6f031dec 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.amr.2D
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.amr.2D
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.amr.2Db b/external/hypre/src/test/TEST_sstruct/sstruct.in.amr.2Db
index aee95371..22eaee46 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.amr.2Db
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.amr.2Db
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.amr.2Dc b/external/hypre/src/test/TEST_sstruct/sstruct.in.amr.2Dc
index 6443d14a..4fd4ead5 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.amr.2Dc
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.amr.2Dc
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.amr.2De b/external/hypre/src/test/TEST_sstruct/sstruct.in.amr.2De
index 6ebb6e1f..d01be0e8 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.amr.2De
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.amr.2De
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.amr.graphadd b/external/hypre/src/test/TEST_sstruct/sstruct.in.amr.graphadd
index 18472535..7a3c371a 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.amr.graphadd
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.amr.graphadd
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.bcube b/external/hypre/src/test/TEST_sstruct/sstruct.in.bcube
index a5ff1ff5..f906fee2 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.bcube
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.bcube
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.bcube-fem b/external/hypre/src/test/TEST_sstruct/sstruct.in.bcube-fem
index 07f2856c..b8869427 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.bcube-fem
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.bcube-fem
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.block b/external/hypre/src/test/TEST_sstruct/sstruct.in.block
index be75d3a5..2bc48d08 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.block
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.block
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.cube b/external/hypre/src/test/TEST_sstruct/sstruct.in.cube
index d9d8c626..255e4af9 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.cube
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.cube
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.cube-fem b/external/hypre/src/test/TEST_sstruct/sstruct.in.cube-fem
new file mode 100644
index 00000000..8d1079cc
--- /dev/null
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.cube-fem
@@ -0,0 +1,45 @@
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+
+###########################################################
+
+# GridCreate: ndim nparts
+GridCreate: 3 1
+
+# GridSetExtents: part ilower(ndim) iupper(ndim)
+GridSetExtents: 0 (1- 1- 1-) (2+ 2+ 2+)
+
+# GridSetVariables: part nvars vartypes[nvars]
+# NODE  = 1
+GridSetVariables: 0 1 [1]
+
+###########################################################
+
+# FEMStencilCreate: size
+FEMStencilCreate: 8
+
+# FEMStencilSetRow: row offset[ndim] var values[size]
+FEMStencilSetRow:  0 [-1 -1 -1] 0 [  4 -1 -1  0 -1  0  0  0  ]
+FEMStencilSetRow:  1 [ 0 -1 -1] 0 [ -1  4  0 -1  0 -1  0  0  ]
+FEMStencilSetRow:  2 [-1  0 -1] 0 [ -1  0  4 -1  0  0 -1  0  ]
+FEMStencilSetRow:  3 [ 0  0 -1] 0 [  0 -1 -1  4  0  0  0 -1  ]
+FEMStencilSetRow:  4 [-1 -1  0] 0 [ -1  0  0  0  4 -1 -1  0  ]
+FEMStencilSetRow:  5 [ 0 -1  0] 0 [  0 -1  0  0 -1  4  0 -1  ]
+FEMStencilSetRow:  6 [-1  0  0] 0 [  0  0 -1  0 -1  0  4 -1  ]
+FEMStencilSetRow:  7 [ 0  0  0] 0 [  0  0  0 -1  0 -1 -1  4  ]
+
+# FEMRhsSet: values[size]
+FEMRhsSet: [ 0.1 0.2 0.3 0.4 0.5 0.6 0.7 0.8 ]
+
+###########################################################
+
+# ProcessPoolCreate: num_pools
+ProcessPoolCreate: 1
+
+# ProcessPoolSetPart: pool part
+ProcessPoolSetPart: 0 0
+
+###########################################################
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.cube21 b/external/hypre/src/test/TEST_sstruct/sstruct.in.cube21
index 0618c7f4..2c842948 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.cube21
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.cube21
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.cubes2_aniso b/external/hypre/src/test/TEST_sstruct/sstruct.in.cubes2_aniso
new file mode 100644
index 00000000..d630f4db
--- /dev/null
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.cubes2_aniso
@@ -0,0 +1,99 @@
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+
+############################################################
+
+# GridCreate: ndim nparts
+GridCreate: 3 2
+
+# GridSetExtents: part ilower(ndim) iupper(ndim)
+GridSetExtents: 0 (0- 0- 0-) (1+ 1+ 1+)
+GridSetExtents: 1 (0- 0- 0-) (1+ 1+ 1+)
+
+# GridSetVariables: part nvars vartypes[nvars]
+GridSetVariables: 0 1 [0]
+GridSetVariables: 1 1 [0]
+
+# GridSetNeighborPart: part      ilower(ndim)      iupper(ndim)
+#                      nbor_part nbor_ilower(ndim) nbor_iupper(ndim)
+#                      index_map[ndim] index_dir[ndim]
+# East neighbors
+GridSetNeighborPart: 0 (1+ 0- 0- :  1 0 0) (1+ 1+ 1+ :  1 0 0) 1 (0- 0- 0-) (0- 1+ 1+) [0 1 2] [1 1 1]
+
+# West neighbors
+GridSetNeighborPart: 1 (0- 0- 0- : -1 0 0) (0- 1+ 1+ : -1 0 0) 0 (1+ 0- 0-) (1+ 1+ 1+) [0 1 2] [1 1 1]
+
+############################################################
+
+# StencilCreate: nstencils sizes[nstencils]
+StencilCreate: 2 [7 7]
+
+# StencilSetEntry: stencil_num entry offset[ndim] var value
+StencilSetEntry: 0  0 [ 0  0  0] 0  24.0
+StencilSetEntry: 0  1 [-1  0  0] 0 -1.0
+StencilSetEntry: 0  2 [ 1  0  0] 0 -1.0
+StencilSetEntry: 0  3 [ 0 -1  0] 0 -10.0
+StencilSetEntry: 0  4 [ 0  1  0] 0 -10.0
+StencilSetEntry: 0  5 [ 0  0 -1] 0 -1.0
+StencilSetEntry: 0  6 [ 0  0  1] 0 -1.0
+
+# StencilSetEntry: stencil_num entry offset[ndim] var value
+StencilSetEntry: 1  0 [ 0  0  0] 0  14.0
+StencilSetEntry: 1  1 [-1  0  0] 0 -1.0
+StencilSetEntry: 1  2 [ 1  0  0] 0 -1.0
+StencilSetEntry: 1  3 [ 0 -1  0] 0 -1.0
+StencilSetEntry: 1  4 [ 0  1  0] 0 -1.0
+StencilSetEntry: 1  5 [ 0  0 -1] 0 -5.0
+StencilSetEntry: 1  6 [ 0  0  1] 0 -5.0
+
+############################################################
+
+# GraphSetStencil: part var stencil_num
+GraphSetStencil: 0 0 0
+GraphSetStencil: 1 0 1
+
+############################################################
+
+# MatrixSetValues: boundary conditions
+#   part ilower(ndim) iupper(ndim) stride[ndim] var entry value
+# Top BCs
+MatrixSetValues: 0 (0- 0- 1+) (1+ 1+ 1+) [1 1 1] 0 6 0.0
+MatrixSetValues: 1 (0- 0- 1+) (1+ 1+ 1+) [1 1 1] 0 6 0.0
+
+# Bottom BCs
+MatrixSetValues: 0 (0- 0- 0-) (1+ 1+ 0-) [1 1 1] 0 5 0.0
+MatrixSetValues: 1 (0- 0- 0-) (1+ 1+ 0-) [1 1 1] 0 5 0.0
+
+# North BCs
+MatrixSetValues: 0 (0- 1+ 0-) (1+ 1+ 1+) [1 1 1] 0 4 0.0
+MatrixSetValues: 1 (0- 1+ 0-) (1+ 1+ 1+) [1 1 1] 0 4 0.0
+
+# South BCs
+MatrixSetValues: 0 (0- 0- 0-) (1+ 0- 1+) [1 1 1] 0 3 0.0
+MatrixSetValues: 1 (0- 0- 0-) (1+ 0- 1+) [1 1 1] 0 3 0.0
+
+# East BCs
+MatrixSetValues: 1 (1+ 0- 0-) (1+ 1+ 1+) [1 1 1] 0 2 0.0
+
+# West BCs
+MatrixSetValues: 0 (0- 0- 0-) (0- 1+ 1+) [1 1 1] 0 1 0.0
+
+############################################################
+
+# ProcessPoolCreate: num_pools
+ProcessPoolCreate: 2
+
+# ProcessPoolSetPart: pool part
+ProcessPoolSetPart: 0 0
+ProcessPoolSetPart: 1 1
+
+# ProcessPoolCreate: num_pools
+ProcessPoolCreate: 1
+
+# ProcessPoolSetPart: pool part
+ProcessPoolSetPart: 0 0
+ProcessPoolSetPart: 0 1
+############################################################
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.cubes4_27pt b/external/hypre/src/test/TEST_sstruct/sstruct.in.cubes4_27pt
new file mode 100644
index 00000000..946dac7d
--- /dev/null
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.cubes4_27pt
@@ -0,0 +1,266 @@
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+
+############################################################
+
+# GridCreate: ndim nparts
+GridCreate: 3 4
+
+# GridSetExtents: part ilower(ndim) iupper(ndim)
+GridSetExtents: 0 (0- 0- 0-) (1+ 1+ 3+)
+GridSetExtents: 1 (0- 0- 0-) (1+ 1+ 3+)
+GridSetExtents: 2 (0- 0- 0-) (1+ 1+ 3+)
+GridSetExtents: 3 (0- 0- 0-) (1+ 1+ 3+)
+
+# GridSetVariables: part nvars vartypes[nvars]
+GridSetVariables: 0 1 [0]
+GridSetVariables: 1 1 [0]
+GridSetVariables: 2 1 [0]
+GridSetVariables: 3 1 [0]
+
+# GridSetNeighborPart: part      ilower(ndim)      iupper(ndim)
+#                      nbor_part nbor_ilower(ndim) nbor_iupper(ndim)
+#                      index_map[ndim] index_dir[ndim]
+# North neighbors
+GridSetNeighborPart: 0 (0- 1+ 0- : 0 1 0) (1+ 1+ 3+ : 0 1 0) 2 (0- 0- 0-) (1+ 0- 3+) [0 1 2] [1 1 1]
+GridSetNeighborPart: 1 (0- 1+ 0- : 0 1 0) (1+ 1+ 3+ : 0 1 0) 3 (0- 0- 0-) (1+ 0- 3+) [0 1 2] [1 1 1]
+
+# South neighbors
+GridSetNeighborPart: 2 (0- 0- 0- : 0 -1 0) (1+ 0- 3+ : 0 -1 0) 0 (0- 1+ 0-) (1+ 1+ 3+) [0 1 2] [1 1 1]
+GridSetNeighborPart: 3 (0- 0- 0- : 0 -1 0) (1+ 0- 3+ : 0 -1 0) 1 (0- 1+ 0-) (1+ 1+ 3+) [0 1 2] [1 1 1]
+
+# East neighbors
+GridSetNeighborPart: 0 (1+ 0- 0- : 1 0 0) (1+ 1+ 3+ : 1 0 0) 1 (0- 0- 0-) (0- 1+ 3+) [0 1 2] [1 1 1]
+GridSetNeighborPart: 2 (1+ 0- 0- : 1 0 0) (1+ 1+ 3+ : 1 0 0) 3 (0- 0- 0-) (0- 1+ 3+) [0 1 2] [1 1 1]
+
+# West neighbors
+GridSetNeighborPart: 1 (0- 0- 0- : -1 0 0) (0- 1+ 3+ : -1 0 0) 0 (1+ 0- 0-) (1+ 1+ 3+) [0 1 2] [1 1 1]
+GridSetNeighborPart: 3 (0- 0- 0- : -1 0 0) (0- 1+ 3+ : -1 0 0) 2 (1+ 0- 0-) (1+ 1+ 3+) [0 1 2] [1 1 1]
+
+############################################################
+
+############################################################
+
+# StencilCreate: nstencils sizes[nstencils]
+StencilCreate: 1 [27]
+
+# StencilSetEntry: stencil_num entry offset[ndim] var value
+StencilSetEntry: 0   0 [ 0  0  0] 0 26.0
+StencilSetEntry: 0   1 [-1  0  0] 0 -1.0
+StencilSetEntry: 0   2 [ 1  0  0] 0 -1.0
+StencilSetEntry: 0   3 [-1 -1  0] 0 -1.0
+StencilSetEntry: 0   4 [ 0 -1  0] 0 -1.0
+StencilSetEntry: 0   5 [ 1 -1  0] 0 -1.0
+StencilSetEntry: 0   6 [-1  1  0] 0 -1.0
+StencilSetEntry: 0   7 [ 0  1  0] 0 -1.0
+StencilSetEntry: 0   8 [ 1  1  0] 0 -1.0
+StencilSetEntry: 0   9 [ 0  0 -1] 0 -1.0
+StencilSetEntry: 0  10 [-1  0 -1] 0 -1.0
+StencilSetEntry: 0  11 [ 1  0 -1] 0 -1.0
+StencilSetEntry: 0  12 [-1 -1 -1] 0 -1.0
+StencilSetEntry: 0  13 [ 0 -1 -1] 0 -1.0
+StencilSetEntry: 0  14 [ 1 -1 -1] 0 -1.0
+StencilSetEntry: 0  15 [-1  1 -1] 0 -1.0
+StencilSetEntry: 0  16 [ 0  1 -1] 0 -1.0
+StencilSetEntry: 0  17 [ 1  1 -1] 0 -1.0
+StencilSetEntry: 0  18 [ 0  0  1] 0 -1.0
+StencilSetEntry: 0  19 [-1  0  1] 0 -1.0
+StencilSetEntry: 0  20 [ 1  0  1] 0 -1.0
+StencilSetEntry: 0  21 [-1 -1  1] 0 -1.0
+StencilSetEntry: 0  22 [ 0 -1  1] 0 -1.0
+StencilSetEntry: 0  23 [ 1 -1  1] 0 -1.0
+StencilSetEntry: 0  24 [-1  1  1] 0 -1.0
+StencilSetEntry: 0  25 [ 0  1  1] 0 -1.0
+StencilSetEntry: 0  26 [ 1  1  1] 0 -1.0
+
+############################################################
+
+# GraphSetStencil: part var stencil_num
+GraphSetStencil: 0 0 0
+GraphSetStencil: 1 0 0
+GraphSetStencil: 2 0 0
+GraphSetStencil: 3 0 0
+
+############################################################
+
+# MatrixSetValues: boundary conditions
+#   part ilower(ndim) iupper(ndim) stride[ndim] var entry value
+# Top BCs
+MatrixSetValues: 0 (0- 0- 3+) (1+ 1+ 3+) [1 1 1] 0 18 0.0
+MatrixSetValues: 0 (0- 0- 3+) (1+ 1+ 3+) [1 1 1] 0 19 0.0
+MatrixSetValues: 0 (0- 0- 3+) (1+ 1+ 3+) [1 1 1] 0 20 0.0
+MatrixSetValues: 0 (0- 0- 3+) (1+ 1+ 3+) [1 1 1] 0 21 0.0
+MatrixSetValues: 0 (0- 0- 3+) (1+ 1+ 3+) [1 1 1] 0 22 0.0
+MatrixSetValues: 0 (0- 0- 3+) (1+ 1+ 3+) [1 1 1] 0 23 0.0
+MatrixSetValues: 0 (0- 0- 3+) (1+ 1+ 3+) [1 1 1] 0 24 0.0
+MatrixSetValues: 0 (0- 0- 3+) (1+ 1+ 3+) [1 1 1] 0 25 0.0
+MatrixSetValues: 0 (0- 0- 3+) (1+ 1+ 3+) [1 1 1] 0 26 0.0
+MatrixSetValues: 1 (0- 0- 3+) (1+ 1+ 3+) [1 1 1] 0 18 0.0
+MatrixSetValues: 1 (0- 0- 3+) (1+ 1+ 3+) [1 1 1] 0 19 0.0
+MatrixSetValues: 1 (0- 0- 3+) (1+ 1+ 3+) [1 1 1] 0 20 0.0
+MatrixSetValues: 1 (0- 0- 3+) (1+ 1+ 3+) [1 1 1] 0 21 0.0
+MatrixSetValues: 1 (0- 0- 3+) (1+ 1+ 3+) [1 1 1] 0 22 0.0
+MatrixSetValues: 1 (0- 0- 3+) (1+ 1+ 3+) [1 1 1] 0 23 0.0
+MatrixSetValues: 1 (0- 0- 3+) (1+ 1+ 3+) [1 1 1] 0 24 0.0
+MatrixSetValues: 1 (0- 0- 3+) (1+ 1+ 3+) [1 1 1] 0 25 0.0
+MatrixSetValues: 1 (0- 0- 3+) (1+ 1+ 3+) [1 1 1] 0 26 0.0
+MatrixSetValues: 2 (0- 0- 3+) (1+ 1+ 3+) [1 1 1] 0 18 0.0
+MatrixSetValues: 2 (0- 0- 3+) (1+ 1+ 3+) [1 1 1] 0 19 0.0
+MatrixSetValues: 2 (0- 0- 3+) (1+ 1+ 3+) [1 1 1] 0 20 0.0
+MatrixSetValues: 2 (0- 0- 3+) (1+ 1+ 3+) [1 1 1] 0 21 0.0
+MatrixSetValues: 2 (0- 0- 3+) (1+ 1+ 3+) [1 1 1] 0 22 0.0
+MatrixSetValues: 2 (0- 0- 3+) (1+ 1+ 3+) [1 1 1] 0 23 0.0
+MatrixSetValues: 2 (0- 0- 3+) (1+ 1+ 3+) [1 1 1] 0 24 0.0
+MatrixSetValues: 2 (0- 0- 3+) (1+ 1+ 3+) [1 1 1] 0 25 0.0
+MatrixSetValues: 2 (0- 0- 3+) (1+ 1+ 3+) [1 1 1] 0 26 0.0
+MatrixSetValues: 3 (0- 0- 3+) (1+ 1+ 3+) [1 1 1] 0 18 0.0
+MatrixSetValues: 3 (0- 0- 3+) (1+ 1+ 3+) [1 1 1] 0 19 0.0
+MatrixSetValues: 3 (0- 0- 3+) (1+ 1+ 3+) [1 1 1] 0 20 0.0
+MatrixSetValues: 3 (0- 0- 3+) (1+ 1+ 3+) [1 1 1] 0 21 0.0
+MatrixSetValues: 3 (0- 0- 3+) (1+ 1+ 3+) [1 1 1] 0 22 0.0
+MatrixSetValues: 3 (0- 0- 3+) (1+ 1+ 3+) [1 1 1] 0 23 0.0
+MatrixSetValues: 3 (0- 0- 3+) (1+ 1+ 3+) [1 1 1] 0 24 0.0
+MatrixSetValues: 3 (0- 0- 3+) (1+ 1+ 3+) [1 1 1] 0 25 0.0
+MatrixSetValues: 3 (0- 0- 3+) (1+ 1+ 3+) [1 1 1] 0 26 0.0
+
+# Bottom BCs
+MatrixSetValues: 0 (0- 0- 0-) (1+ 1+ 0-) [1 1 1] 0  9 0.0
+MatrixSetValues: 0 (0- 0- 0-) (1+ 1+ 0-) [1 1 1] 0 10 0.0
+MatrixSetValues: 0 (0- 0- 0-) (1+ 1+ 0-) [1 1 1] 0 11 0.0
+MatrixSetValues: 0 (0- 0- 0-) (1+ 1+ 0-) [1 1 1] 0 12 0.0
+MatrixSetValues: 0 (0- 0- 0-) (1+ 1+ 0-) [1 1 1] 0 13 0.0
+MatrixSetValues: 0 (0- 0- 0-) (1+ 1+ 0-) [1 1 1] 0 14 0.0
+MatrixSetValues: 0 (0- 0- 0-) (1+ 1+ 0-) [1 1 1] 0 15 0.0
+MatrixSetValues: 0 (0- 0- 0-) (1+ 1+ 0-) [1 1 1] 0 16 0.0
+MatrixSetValues: 0 (0- 0- 0-) (1+ 1+ 0-) [1 1 1] 0 17 0.0
+MatrixSetValues: 1 (0- 0- 0-) (1+ 1+ 0-) [1 1 1] 0  9 0.0
+MatrixSetValues: 1 (0- 0- 0-) (1+ 1+ 0-) [1 1 1] 0 10 0.0
+MatrixSetValues: 1 (0- 0- 0-) (1+ 1+ 0-) [1 1 1] 0 11 0.0
+MatrixSetValues: 1 (0- 0- 0-) (1+ 1+ 0-) [1 1 1] 0 12 0.0
+MatrixSetValues: 1 (0- 0- 0-) (1+ 1+ 0-) [1 1 1] 0 13 0.0
+MatrixSetValues: 1 (0- 0- 0-) (1+ 1+ 0-) [1 1 1] 0 14 0.0
+MatrixSetValues: 1 (0- 0- 0-) (1+ 1+ 0-) [1 1 1] 0 15 0.0
+MatrixSetValues: 1 (0- 0- 0-) (1+ 1+ 0-) [1 1 1] 0 16 0.0
+MatrixSetValues: 1 (0- 0- 0-) (1+ 1+ 0-) [1 1 1] 0 17 0.0
+MatrixSetValues: 2 (0- 0- 0-) (1+ 1+ 0-) [1 1 1] 0  9 0.0
+MatrixSetValues: 2 (0- 0- 0-) (1+ 1+ 0-) [1 1 1] 0 10 0.0
+MatrixSetValues: 2 (0- 0- 0-) (1+ 1+ 0-) [1 1 1] 0 11 0.0
+MatrixSetValues: 2 (0- 0- 0-) (1+ 1+ 0-) [1 1 1] 0 12 0.0
+MatrixSetValues: 2 (0- 0- 0-) (1+ 1+ 0-) [1 1 1] 0 13 0.0
+MatrixSetValues: 2 (0- 0- 0-) (1+ 1+ 0-) [1 1 1] 0 14 0.0
+MatrixSetValues: 2 (0- 0- 0-) (1+ 1+ 0-) [1 1 1] 0 15 0.0
+MatrixSetValues: 2 (0- 0- 0-) (1+ 1+ 0-) [1 1 1] 0 16 0.0
+MatrixSetValues: 2 (0- 0- 0-) (1+ 1+ 0-) [1 1 1] 0 17 0.0
+MatrixSetValues: 3 (0- 0- 0-) (1+ 1+ 0-) [1 1 1] 0  9 0.0
+MatrixSetValues: 3 (0- 0- 0-) (1+ 1+ 0-) [1 1 1] 0 10 0.0
+MatrixSetValues: 3 (0- 0- 0-) (1+ 1+ 0-) [1 1 1] 0 11 0.0
+MatrixSetValues: 3 (0- 0- 0-) (1+ 1+ 0-) [1 1 1] 0 12 0.0
+MatrixSetValues: 3 (0- 0- 0-) (1+ 1+ 0-) [1 1 1] 0 13 0.0
+MatrixSetValues: 3 (0- 0- 0-) (1+ 1+ 0-) [1 1 1] 0 14 0.0
+MatrixSetValues: 3 (0- 0- 0-) (1+ 1+ 0-) [1 1 1] 0 15 0.0
+MatrixSetValues: 3 (0- 0- 0-) (1+ 1+ 0-) [1 1 1] 0 16 0.0
+MatrixSetValues: 3 (0- 0- 0-) (1+ 1+ 0-) [1 1 1] 0 17 0.0
+
+# North BCs
+MatrixSetValues: 2 (0- 1+ 0-) (1+ 1+ 3+) [1 1 1] 0  6 0.0
+MatrixSetValues: 2 (0- 1+ 0-) (1+ 1+ 3+) [1 1 1] 0  7 0.0
+MatrixSetValues: 2 (0- 1+ 0-) (1+ 1+ 3+) [1 1 1] 0  8 0.0
+MatrixSetValues: 2 (0- 1+ 0-) (1+ 1+ 3+) [1 1 1] 0 15 0.0
+MatrixSetValues: 2 (0- 1+ 0-) (1+ 1+ 3+) [1 1 1] 0 16 0.0
+MatrixSetValues: 2 (0- 1+ 0-) (1+ 1+ 3+) [1 1 1] 0 17 0.0
+MatrixSetValues: 2 (0- 1+ 0-) (1+ 1+ 3+) [1 1 1] 0 24 0.0
+MatrixSetValues: 2 (0- 1+ 0-) (1+ 1+ 3+) [1 1 1] 0 25 0.0
+MatrixSetValues: 2 (0- 1+ 0-) (1+ 1+ 3+) [1 1 1] 0 26 0.0
+MatrixSetValues: 3 (0- 1+ 0-) (1+ 1+ 3+) [1 1 1] 0  6 0.0
+MatrixSetValues: 3 (0- 1+ 0-) (1+ 1+ 3+) [1 1 1] 0  7 0.0
+MatrixSetValues: 3 (0- 1+ 0-) (1+ 1+ 3+) [1 1 1] 0  8 0.0
+MatrixSetValues: 3 (0- 1+ 0-) (1+ 1+ 3+) [1 1 1] 0 15 0.0
+MatrixSetValues: 3 (0- 1+ 0-) (1+ 1+ 3+) [1 1 1] 0 16 0.0
+MatrixSetValues: 3 (0- 1+ 0-) (1+ 1+ 3+) [1 1 1] 0 17 0.0
+MatrixSetValues: 3 (0- 1+ 0-) (1+ 1+ 3+) [1 1 1] 0 24 0.0
+MatrixSetValues: 3 (0- 1+ 0-) (1+ 1+ 3+) [1 1 1] 0 25 0.0
+MatrixSetValues: 3 (0- 1+ 0-) (1+ 1+ 3+) [1 1 1] 0 26 0.0
+
+# South BCs
+MatrixSetValues: 0 (0- 0- 0-) (1+ 0- 3+) [1 1 1] 0  3 0.0
+MatrixSetValues: 0 (0- 0- 0-) (1+ 0- 3+) [1 1 1] 0  4 0.0
+MatrixSetValues: 0 (0- 0- 0-) (1+ 0- 3+) [1 1 1] 0  5 0.0
+MatrixSetValues: 0 (0- 0- 0-) (1+ 0- 3+) [1 1 1] 0 12 0.0
+MatrixSetValues: 0 (0- 0- 0-) (1+ 0- 3+) [1 1 1] 0 13 0.0
+MatrixSetValues: 0 (0- 0- 0-) (1+ 0- 3+) [1 1 1] 0 14 0.0
+MatrixSetValues: 0 (0- 0- 0-) (1+ 0- 3+) [1 1 1] 0 21 0.0
+MatrixSetValues: 0 (0- 0- 0-) (1+ 0- 3+) [1 1 1] 0 22 0.0
+MatrixSetValues: 0 (0- 0- 0-) (1+ 0- 3+) [1 1 1] 0 23 0.0
+MatrixSetValues: 1 (0- 0- 0-) (1+ 0- 3+) [1 1 1] 0  3 0.0
+MatrixSetValues: 1 (0- 0- 0-) (1+ 0- 3+) [1 1 1] 0  4 0.0
+MatrixSetValues: 1 (0- 0- 0-) (1+ 0- 3+) [1 1 1] 0  5 0.0
+MatrixSetValues: 1 (0- 0- 0-) (1+ 0- 3+) [1 1 1] 0 12 0.0
+MatrixSetValues: 1 (0- 0- 0-) (1+ 0- 3+) [1 1 1] 0 13 0.0
+MatrixSetValues: 1 (0- 0- 0-) (1+ 0- 3+) [1 1 1] 0 14 0.0
+MatrixSetValues: 1 (0- 0- 0-) (1+ 0- 3+) [1 1 1] 0 21 0.0
+MatrixSetValues: 1 (0- 0- 0-) (1+ 0- 3+) [1 1 1] 0 22 0.0
+MatrixSetValues: 1 (0- 0- 0-) (1+ 0- 3+) [1 1 1] 0 23 0.0
+
+# East BCs
+MatrixSetValues: 1 (1+ 0- 0-) (1+ 1+ 3+) [1 1 1] 0  2 0.0
+MatrixSetValues: 1 (1+ 0- 0-) (1+ 1+ 3+) [1 1 1] 0  5 0.0
+MatrixSetValues: 1 (1+ 0- 0-) (1+ 1+ 3+) [1 1 1] 0  8 0.0
+MatrixSetValues: 1 (1+ 0- 0-) (1+ 1+ 3+) [1 1 1] 0 11 0.0
+MatrixSetValues: 1 (1+ 0- 0-) (1+ 1+ 3+) [1 1 1] 0 14 0.0
+MatrixSetValues: 1 (1+ 0- 0-) (1+ 1+ 3+) [1 1 1] 0 17 0.0
+MatrixSetValues: 1 (1+ 0- 0-) (1+ 1+ 3+) [1 1 1] 0 20 0.0
+MatrixSetValues: 1 (1+ 0- 0-) (1+ 1+ 3+) [1 1 1] 0 23 0.0
+MatrixSetValues: 1 (1+ 0- 0-) (1+ 1+ 3+) [1 1 1] 0 26 0.0
+MatrixSetValues: 3 (1+ 0- 0-) (1+ 1+ 3+) [1 1 1] 0  2 0.0
+MatrixSetValues: 3 (1+ 0- 0-) (1+ 1+ 3+) [1 1 1] 0  5 0.0
+MatrixSetValues: 3 (1+ 0- 0-) (1+ 1+ 3+) [1 1 1] 0  8 0.0
+MatrixSetValues: 3 (1+ 0- 0-) (1+ 1+ 3+) [1 1 1] 0 11 0.0
+MatrixSetValues: 3 (1+ 0- 0-) (1+ 1+ 3+) [1 1 1] 0 14 0.0
+MatrixSetValues: 3 (1+ 0- 0-) (1+ 1+ 3+) [1 1 1] 0 17 0.0
+MatrixSetValues: 3 (1+ 0- 0-) (1+ 1+ 3+) [1 1 1] 0 20 0.0
+MatrixSetValues: 3 (1+ 0- 0-) (1+ 1+ 3+) [1 1 1] 0 23 0.0
+MatrixSetValues: 3 (1+ 0- 0-) (1+ 1+ 3+) [1 1 1] 0 26 0.0
+
+# West BCs
+MatrixSetValues: 0 (0- 0- 0-) (0- 1+ 3+) [1 1 1] 0  1 0.0
+MatrixSetValues: 0 (0- 0- 0-) (0- 1+ 3+) [1 1 1] 0  3 0.0
+MatrixSetValues: 0 (0- 0- 0-) (0- 1+ 3+) [1 1 1] 0  6 0.0
+MatrixSetValues: 0 (0- 0- 0-) (0- 1+ 3+) [1 1 1] 0 10 0.0
+MatrixSetValues: 0 (0- 0- 0-) (0- 1+ 3+) [1 1 1] 0 12 0.0
+MatrixSetValues: 0 (0- 0- 0-) (0- 1+ 3+) [1 1 1] 0 15 0.0
+MatrixSetValues: 0 (0- 0- 0-) (0- 1+ 3+) [1 1 1] 0 19 0.0
+MatrixSetValues: 0 (0- 0- 0-) (0- 1+ 3+) [1 1 1] 0 21 0.0
+MatrixSetValues: 0 (0- 0- 0-) (0- 1+ 3+) [1 1 1] 0 24 0.0
+MatrixSetValues: 2 (0- 0- 0-) (0- 1+ 3+) [1 1 1] 0  1 0.0
+MatrixSetValues: 2 (0- 0- 0-) (0- 1+ 3+) [1 1 1] 0  3 0.0
+MatrixSetValues: 2 (0- 0- 0-) (0- 1+ 3+) [1 1 1] 0  6 0.0
+MatrixSetValues: 2 (0- 0- 0-) (0- 1+ 3+) [1 1 1] 0 10 0.0
+MatrixSetValues: 2 (0- 0- 0-) (0- 1+ 3+) [1 1 1] 0 12 0.0
+MatrixSetValues: 2 (0- 0- 0-) (0- 1+ 3+) [1 1 1] 0 15 0.0
+MatrixSetValues: 2 (0- 0- 0-) (0- 1+ 3+) [1 1 1] 0 19 0.0
+MatrixSetValues: 2 (0- 0- 0-) (0- 1+ 3+) [1 1 1] 0 21 0.0
+MatrixSetValues: 2 (0- 0- 0-) (0- 1+ 3+) [1 1 1] 0 24 0.0
+
+############################################################
+
+# ProcessPoolCreate: num_pools
+ProcessPoolCreate: 4
+
+# ProcessPoolSetPart: pool part
+ProcessPoolSetPart: 0 0
+ProcessPoolSetPart: 1 1
+ProcessPoolSetPart: 2 2
+ProcessPoolSetPart: 3 3
+
+# ProcessPoolCreate: num_pools
+ProcessPoolCreate: 1
+
+# ProcessPoolSetPart: pool part
+ProcessPoolSetPart: 0 0
+ProcessPoolSetPart: 0 1
+ProcessPoolSetPart: 0 2
+ProcessPoolSetPart: 0 3
+############################################################
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.cycred-1Dx b/external/hypre/src/test/TEST_sstruct/sstruct.in.cycred-1Dx
index dcc63f09..a44b5617 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.cycred-1Dx
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.cycred-1Dx
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.cycred-2Dx b/external/hypre/src/test/TEST_sstruct/sstruct.in.cycred-2Dx
index 88d0fb2d..c0b646ea 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.cycred-2Dx
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.cycred-2Dx
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.cycred-2Dy b/external/hypre/src/test/TEST_sstruct/sstruct.in.cycred-2Dy
index 2a5c0773..edd641f3 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.cycred-2Dy
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.cycred-2Dy
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.cycred-3Dx b/external/hypre/src/test/TEST_sstruct/sstruct.in.cycred-3Dx
index 3ef37237..c97699e6 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.cycred-3Dx
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.cycred-3Dx
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.cycred-3Dy b/external/hypre/src/test/TEST_sstruct/sstruct.in.cycred-3Dy
index ed13f629..a9e75179 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.cycred-3Dy
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.cycred-3Dy
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.cycred-3Dz b/external/hypre/src/test/TEST_sstruct/sstruct.in.cycred-3Dz
index 95ebcecf..a1b04235 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.cycred-3Dz
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.cycred-3Dz
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.default b/external/hypre/src/test/TEST_sstruct/sstruct.in.default
index c1d589cc..6567356c 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.default
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.default
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.default_2D b/external/hypre/src/test/TEST_sstruct/sstruct.in.default_2D
index 958052af..6a9ad1d6 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.default_2D
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.default_2D
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.dirichlet b/external/hypre/src/test/TEST_sstruct/sstruct.in.dirichlet
index 3925fcc2..908399b4 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.dirichlet
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.dirichlet
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.emptyProc1 b/external/hypre/src/test/TEST_sstruct/sstruct.in.emptyProc1
index 24ca7c9f..71a67764 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.emptyProc1
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.emptyProc1
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.emptyProc2 b/external/hypre/src/test/TEST_sstruct/sstruct.in.emptyProc2
index 53d5765d..b8ff900a 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.emptyProc2
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.emptyProc2
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.emptyProc3 b/external/hypre/src/test/TEST_sstruct/sstruct.in.emptyProc3
index 00864849..4df2344a 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.emptyProc3
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.emptyProc3
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.enhanced3D b/external/hypre/src/test/TEST_sstruct/sstruct.in.enhanced3D
index bbe05375..60dba8bc 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.enhanced3D
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.enhanced3D
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.fe_all2_2D b/external/hypre/src/test/TEST_sstruct/sstruct.in.fe_all2_2D
index ccf05e8d..ce1879cf 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.fe_all2_2D
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.fe_all2_2D
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.fe_all2_2D_coord b/external/hypre/src/test/TEST_sstruct/sstruct.in.fe_all2_2D_coord
index 9115fcac..55a909cf 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.fe_all2_2D_coord
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.fe_all2_2D_coord
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.fe_all2_2Ds b/external/hypre/src/test/TEST_sstruct/sstruct.in.fe_all2_2Ds
index d8bf6fbe..fe9d535c 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.fe_all2_2Ds
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.fe_all2_2Ds
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.fe_all2_2Dss b/external/hypre/src/test/TEST_sstruct/sstruct.in.fe_all2_2Dss
index 7ce6dc8f..fb811e56 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.fe_all2_2Dss
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.fe_all2_2Dss
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.fe_all2_3D b/external/hypre/src/test/TEST_sstruct/sstruct.in.fe_all2_3D
index 950af876..01b17f34 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.fe_all2_3D
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.fe_all2_3D
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.fe_all2_3D_coord b/external/hypre/src/test/TEST_sstruct/sstruct.in.fe_all2_3D_coord
index 4d0f4a9f..738ca02a 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.fe_all2_3D_coord
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.fe_all2_3D_coord
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.fe_all3_3D b/external/hypre/src/test/TEST_sstruct/sstruct.in.fe_all3_3D
index 8b87a969..2b245a7c 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.fe_all3_3D
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.fe_all3_3D
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.fe_all3_3D_coord b/external/hypre/src/test/TEST_sstruct/sstruct.in.fe_all3_3D_coord
index c7e1f343..6d45ef54 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.fe_all3_3D_coord
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.fe_all3_3D_coord
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.fe_node1_2D b/external/hypre/src/test/TEST_sstruct/sstruct.in.fe_node1_2D
index 4859cca6..56fad2de 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.fe_node1_2D
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.fe_node1_2D
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.fe_node2_2D b/external/hypre/src/test/TEST_sstruct/sstruct.in.fe_node2_2D
index 33a1de5a..ec9bad7b 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.fe_node2_2D
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.fe_node2_2D
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.fe_node2_2D_coord b/external/hypre/src/test/TEST_sstruct/sstruct.in.fe_node2_2D_coord
index 8bb3cdd3..4bf02eac 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.fe_node2_2D_coord
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.fe_node2_2D_coord
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.fe_rhombus5 b/external/hypre/src/test/TEST_sstruct/sstruct.in.fe_rhombus5
index ef7d7873..b880edbd 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.fe_rhombus5
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.fe_rhombus5
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.laps b/external/hypre/src/test/TEST_sstruct/sstruct.in.laps
index d5e1f288..8062ecc5 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.laps
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.laps
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.laps.periodic b/external/hypre/src/test/TEST_sstruct/sstruct.in.laps.periodic
index ac10ddb7..84a9b335 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.laps.periodic
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.laps.periodic
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.marinak b/external/hypre/src/test/TEST_sstruct/sstruct.in.marinak
index 256ebad8..3987d752 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.marinak
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.marinak
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.maxwell3d_unscaled b/external/hypre/src/test/TEST_sstruct/sstruct.in.maxwell3d_unscaled
index 63ddbbef..05d79389 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.maxwell3d_unscaled
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.maxwell3d_unscaled
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.miller_2blk b/external/hypre/src/test/TEST_sstruct/sstruct.in.miller_2blk
index cf55dcb9..83d5173b 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.miller_2blk
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.miller_2blk
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.miller_2blk1 b/external/hypre/src/test/TEST_sstruct/sstruct.in.miller_2blk1
index afc46c04..8087f965 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.miller_2blk1
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.miller_2blk1
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.miller_2stk b/external/hypre/src/test/TEST_sstruct/sstruct.in.miller_2stk
index 6f406278..4cd67b46 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.miller_2stk
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.miller_2stk
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.miller_3blk b/external/hypre/src/test/TEST_sstruct/sstruct.in.miller_3blk
index de25ce04..b8cc9fe2 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.miller_3blk
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.miller_3blk
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -11,13 +11,13 @@
 #   |                         /    |
 #   |       part 1          /      |
 #   |                     /        |
-#   | j                 /          | 
-#   | |               /            | 
+#   | j                 /          |
+#   | |               /            |
 #   | ---i          /              |
-#   ---------------      part 2    | 
+#   ---------------      part 2    |
 #   |             |                |
 #   |   part 0    |                |
-#   |             |                | 
+#   |             |                |
 #   | j           | j              |
 #   | |           | |              |
 #   | ---i        | ---i           |
@@ -125,5 +125,12 @@ ProcessPoolSetPart: 0 0
 ProcessPoolSetPart: 0 1
 ProcessPoolSetPart: 0 2
 
-###########################################################
+# ProcessPoolCreate: num_pools
+ProcessPoolCreate: 3
 
+# ProcessPoolSetPart: pool part
+ProcessPoolSetPart: 0 0
+ProcessPoolSetPart: 1 1
+ProcessPoolSetPart: 2 2
+
+###########################################################
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.miller_diag b/external/hypre/src/test/TEST_sstruct/sstruct.in.miller_diag
index fc356793..fe43561d 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.miller_diag
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.miller_diag
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.neumann b/external/hypre/src/test/TEST_sstruct/sstruct.in.neumann
index b5e7e4a9..a0ac0ed2 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.neumann
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.neumann
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.neumann-yz b/external/hypre/src/test/TEST_sstruct/sstruct.in.neumann-yz
index e93f2029..a3401708 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.neumann-yz
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.neumann-yz
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.noaddtoval_cellcentre b/external/hypre/src/test/TEST_sstruct/sstruct.in.noaddtoval_cellcentre
index a1a8cd83..8dcfc4f3 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.noaddtoval_cellcentre
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.noaddtoval_cellcentre
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.noaddtoval_edges b/external/hypre/src/test/TEST_sstruct/sstruct.in.noaddtoval_edges
index e5f12f33..1352d8e9 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.noaddtoval_edges
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.noaddtoval_edges
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.p19aniso b/external/hypre/src/test/TEST_sstruct/sstruct.in.p19aniso
index 1cc49e46..e8b5d5d4 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.p19aniso
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.p19aniso
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.p19iso b/external/hypre/src/test/TEST_sstruct/sstruct.in.p19iso
index 486b02b4..532bff31 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.p19iso
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.p19iso
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.p7aniso b/external/hypre/src/test/TEST_sstruct/sstruct.in.p7aniso
index 4fb6800a..2dff9f2f 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.p7aniso
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.p7aniso
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.p7iso b/external/hypre/src/test/TEST_sstruct/sstruct.in.p7iso
index 2e366f6a..2c8af134 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.p7iso
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.p7iso
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.pcube b/external/hypre/src/test/TEST_sstruct/sstruct.in.pcube
index 65239e3d..cafccbcc 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.pcube
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.pcube
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.periodic b/external/hypre/src/test/TEST_sstruct/sstruct.in.periodic
index d4a40bfe..5aa79c67 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.periodic
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.periodic
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.periodic.2D b/external/hypre/src/test/TEST_sstruct/sstruct.in.periodic.2D
index 62ab78b4..f1f5c188 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.periodic.2D
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.periodic.2D
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.periodic.add b/external/hypre/src/test/TEST_sstruct/sstruct.in.periodic.add
index 625b0127..7876160f 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.periodic.add
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.periodic.add
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.periodic.bigA b/external/hypre/src/test/TEST_sstruct/sstruct.in.periodic.bigA
index 55c69f90..e6b9bd82 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.periodic.bigA
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.periodic.bigA
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.periodic.bigB b/external/hypre/src/test/TEST_sstruct/sstruct.in.periodic.bigB
index 7838be3f..08450219 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.periodic.bigB
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.periodic.bigB
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.periodic.cellA b/external/hypre/src/test/TEST_sstruct/sstruct.in.periodic.cellA
index 38351de4..3fed8b8d 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.periodic.cellA
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.periodic.cellA
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.periodic.cellB b/external/hypre/src/test/TEST_sstruct/sstruct.in.periodic.cellB
index 8a0c18bc..ff38a73b 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.periodic.cellB
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.periodic.cellB
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.periodic.nodeA b/external/hypre/src/test/TEST_sstruct/sstruct.in.periodic.nodeA
index bd29bc73..cae610ed 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.periodic.nodeA
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.periodic.nodeA
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.periodic.nodeB b/external/hypre/src/test/TEST_sstruct/sstruct.in.periodic.nodeB
index 42477975..b63a7b81 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.periodic.nodeB
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.periodic.nodeB
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.reduced3D b/external/hypre/src/test/TEST_sstruct/sstruct.in.reduced3D
index ecf88c52..da6a5648 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.reduced3D
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.reduced3D
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.reduced3D-4 b/external/hypre/src/test/TEST_sstruct/sstruct.in.reduced3D-4
index c74c88c0..37c01004 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.reduced3D-4
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.reduced3D-4
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.struct b/external/hypre/src/test/TEST_sstruct/sstruct.in.struct
index a36ae048..e0b120b5 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.struct
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.struct
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.symm0 b/external/hypre/src/test/TEST_sstruct/sstruct.in.symm0
index d9d8c626..255e4af9 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.symm0
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.symm0
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.symm0.2D b/external/hypre/src/test/TEST_sstruct/sstruct.in.symm0.2D
index 1efe95c8..f36b363e 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.symm0.2D
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.symm0.2D
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.symm1 b/external/hypre/src/test/TEST_sstruct/sstruct.in.symm1
index 0338e778..8b82ea4b 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.symm1
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.symm1
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.symm1.2D b/external/hypre/src/test/TEST_sstruct/sstruct.in.symm1.2D
index 9de5498d..c985de7f 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.symm1.2D
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.symm1.2D
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.symm2 b/external/hypre/src/test/TEST_sstruct/sstruct.in.symm2
index 89c73cd5..f96a8014 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.symm2
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.symm2
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.symm2.2D b/external/hypre/src/test/TEST_sstruct/sstruct.in.symm2.2D
index 0036f065..a4d52aed 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.symm2.2D
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.symm2.2D
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.symm3 b/external/hypre/src/test/TEST_sstruct/sstruct.in.symm3
index 436d3389..6ce41dfb 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.symm3
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.symm3
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.symm3.2D b/external/hypre/src/test/TEST_sstruct/sstruct.in.symm3.2D
index 641290a8..02583b1f 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.symm3.2D
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.symm3.2D
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct.in.wide.2D b/external/hypre/src/test/TEST_sstruct/sstruct.in.wide.2D
index 2a321a78..0af1c5c5 100644
--- a/external/hypre/src/test/TEST_sstruct/sstruct.in.wide.2D
+++ b/external/hypre/src/test/TEST_sstruct/sstruct.in.wide.2D
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct_struct.jobs b/external/hypre/src/test/TEST_sstruct/sstruct_struct.jobs
old mode 100644
new mode 100755
index 72283e01..ea4b0b77
--- a/external/hypre/src/test/TEST_sstruct/sstruct_struct.jobs
+++ b/external/hypre/src/test/TEST_sstruct/sstruct_struct.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh 
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash 
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct_struct.saved.ray b/external/hypre/src/test/TEST_sstruct/sstruct_struct.saved.lassen_cpu
similarity index 100%
rename from external/hypre/src/test/TEST_sstruct/sstruct_struct.saved.ray
rename to external/hypre/src/test/TEST_sstruct/sstruct_struct.saved.lassen_cpu
diff --git a/external/hypre/src/test/TEST_sstruct/sstruct_struct.sh b/external/hypre/src/test/TEST_sstruct/sstruct_struct.sh
old mode 100644
new mode 100755
index 9bd165a7..8ec64c4c
--- a/external/hypre/src/test/TEST_sstruct/sstruct_struct.sh
+++ b/external/hypre/src/test/TEST_sstruct/sstruct_struct.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/symm.jobs b/external/hypre/src/test/TEST_sstruct/symm.jobs
old mode 100644
new mode 100755
index 60c4b9fe..998603e2
--- a/external/hypre/src/test/TEST_sstruct/symm.jobs
+++ b/external/hypre/src/test/TEST_sstruct/symm.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/symm.saved.ray b/external/hypre/src/test/TEST_sstruct/symm.saved.lassen_cpu
similarity index 100%
rename from external/hypre/src/test/TEST_sstruct/symm.saved.ray
rename to external/hypre/src/test/TEST_sstruct/symm.saved.lassen_cpu
diff --git a/external/hypre/src/test/TEST_sstruct/symm.sh b/external/hypre/src/test/TEST_sstruct/symm.sh
old mode 100644
new mode 100755
index a1b741e6..73f3a8c7
--- a/external/hypre/src/test/TEST_sstruct/symm.sh
+++ b/external/hypre/src/test/TEST_sstruct/symm.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/versioncheck.jobs b/external/hypre/src/test/TEST_sstruct/versioncheck.jobs
new file mode 100755
index 00000000..162dca2c
--- /dev/null
+++ b/external/hypre/src/test/TEST_sstruct/versioncheck.jobs
@@ -0,0 +1,12 @@
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+#=============================================================================
+# Check the version header file variables
+#=============================================================================
+
+mpirun -np 1 ./sstruct > versioncheck.out.1
+
diff --git a/external/hypre/src/test/TEST_sstruct/versioncheck.sh b/external/hypre/src/test/TEST_sstruct/versioncheck.sh
new file mode 100755
index 00000000..87db6aaf
--- /dev/null
+++ b/external/hypre/src/test/TEST_sstruct/versioncheck.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+TNAME=`basename $0 .sh`
+
+#=============================================================================
+# Check the HYPRE_DEVELOP variables
+#=============================================================================
+
+grep "Using HYPRE_DEVELOP_STRING" ${TNAME}.out.1 > ${TNAME}.testdata
+
+echo -n > ${TNAME}.testdatacheck
+if [ -d ../../../.git ]; then
+  DEVSTRING=`git describe --match 'v*' --long --abbrev=9 2>/dev/null`
+  DEVNUMBER=`echo $DEVSTRING | awk -F- '{print $2}'`
+  DEVBRANCH=`git rev-parse --abbrev-ref HEAD`
+  if [ -n "$DEVSTRING" ]; then
+    if [ "$DEVBRANCH" != "master" ]; then
+      echo "Using HYPRE_DEVELOP_STRING: $DEVSTRING (branch $DEVBRANCH; not the develop branch)" \
+       > ${TNAME}.testdatacheck
+    else
+      echo "Using HYPRE_DEVELOP_STRING: $DEVSTRING (branch $DEVBRANCH; the develop branch)" \
+       > ${TNAME}.testdatacheck
+    fi
+  fi
+fi
+diff ${TNAME}.testdata ${TNAME}.testdatacheck >&2
+
+#=============================================================================
+# remove temporary files
+#=============================================================================
+
+rm -f ${TNAME}.testdata*
diff --git a/external/hypre/src/test/TEST_sstruct/wide.jobs b/external/hypre/src/test/TEST_sstruct/wide.jobs
old mode 100644
new mode 100755
index f3ab572c..f3e7598c
--- a/external/hypre/src/test/TEST_sstruct/wide.jobs
+++ b/external/hypre/src/test/TEST_sstruct/wide.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/wide.saved.ray b/external/hypre/src/test/TEST_sstruct/wide.saved.lassen_cpu
similarity index 100%
rename from external/hypre/src/test/TEST_sstruct/wide.saved.ray
rename to external/hypre/src/test/TEST_sstruct/wide.saved.lassen_cpu
diff --git a/external/hypre/src/test/TEST_sstruct/wide.sh b/external/hypre/src/test/TEST_sstruct/wide.sh
old mode 100644
new mode 100755
index f74cde93..888f2386
--- a/external/hypre/src/test/TEST_sstruct/wide.sh
+++ b/external/hypre/src/test/TEST_sstruct/wide.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/zcube.jobs b/external/hypre/src/test/TEST_sstruct/zcube.jobs
old mode 100644
new mode 100755
index b0b55936..1110b231
--- a/external/hypre/src/test/TEST_sstruct/zcube.jobs
+++ b/external/hypre/src/test/TEST_sstruct/zcube.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/zcube.saved.ray b/external/hypre/src/test/TEST_sstruct/zcube.saved.lassen_cpu
similarity index 100%
rename from external/hypre/src/test/TEST_sstruct/zcube.saved.ray
rename to external/hypre/src/test/TEST_sstruct/zcube.saved.lassen_cpu
diff --git a/external/hypre/src/test/TEST_sstruct/zcube.sh b/external/hypre/src/test/TEST_sstruct/zcube.sh
old mode 100644
new mode 100755
index 066009aa..9c14fcd1
--- a/external/hypre/src/test/TEST_sstruct/zcube.sh
+++ b/external/hypre/src/test/TEST_sstruct/zcube.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/zsstruct.in.bcube b/external/hypre/src/test/TEST_sstruct/zsstruct.in.bcube
index d4f7e268..5e93bda3 100644
--- a/external/hypre/src/test/TEST_sstruct/zsstruct.in.bcube
+++ b/external/hypre/src/test/TEST_sstruct/zsstruct.in.bcube
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_sstruct/zsstruct.in.cube b/external/hypre/src/test/TEST_sstruct/zsstruct.in.cube
index e08030a6..7d5870cb 100644
--- a/external/hypre/src/test/TEST_sstruct/zsstruct.in.cube
+++ b/external/hypre/src/test/TEST_sstruct/zsstruct.in.cube
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_struct/cgpfmg3d.jobs b/external/hypre/src/test/TEST_struct/cgpfmg3d.jobs
old mode 100644
new mode 100755
index 8eef3ba1..ec14d94f
--- a/external/hypre/src/test/TEST_struct/cgpfmg3d.jobs
+++ b/external/hypre/src/test/TEST_struct/cgpfmg3d.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_struct/cgpfmg3d.saved.ray b/external/hypre/src/test/TEST_struct/cgpfmg3d.saved.florentia
similarity index 100%
rename from external/hypre/src/test/TEST_struct/cgpfmg3d.saved.ray
rename to external/hypre/src/test/TEST_struct/cgpfmg3d.saved.florentia
diff --git a/external/hypre/src/test/TEST_struct/cgpfmg3d.saved.lassen_cpu b/external/hypre/src/test/TEST_struct/cgpfmg3d.saved.lassen_cpu
new file mode 100644
index 00000000..08802877
--- /dev/null
+++ b/external/hypre/src/test/TEST_struct/cgpfmg3d.saved.lassen_cpu
@@ -0,0 +1,8 @@
+# Output file: cgpfmg3d.out.0
+Iterations = 9
+Final Relative Residual Norm = 4.287624e-07
+
+# Output file: cgpfmg3d.out.1
+Iterations = 9
+Final Relative Residual Norm = 4.287624e-07
+
diff --git a/external/hypre/src/test/TEST_struct/cgpfmg3d.saved.tioga b/external/hypre/src/test/TEST_struct/cgpfmg3d.saved.tioga
new file mode 100644
index 00000000..08802877
--- /dev/null
+++ b/external/hypre/src/test/TEST_struct/cgpfmg3d.saved.tioga
@@ -0,0 +1,8 @@
+# Output file: cgpfmg3d.out.0
+Iterations = 9
+Final Relative Residual Norm = 4.287624e-07
+
+# Output file: cgpfmg3d.out.1
+Iterations = 9
+Final Relative Residual Norm = 4.287624e-07
+
diff --git a/external/hypre/src/test/TEST_struct/cgpfmg3d.sh b/external/hypre/src/test/TEST_struct/cgpfmg3d.sh
old mode 100644
new mode 100755
index eebefa3c..36908e3b
--- a/external/hypre/src/test/TEST_struct/cgpfmg3d.sh
+++ b/external/hypre/src/test/TEST_struct/cgpfmg3d.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_struct/emptyproc.jobs b/external/hypre/src/test/TEST_struct/emptyproc.jobs
old mode 100644
new mode 100755
index 9a07af93..6321e7c8
--- a/external/hypre/src/test/TEST_struct/emptyproc.jobs
+++ b/external/hypre/src/test/TEST_struct/emptyproc.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_struct/emptyproc.saved.ray b/external/hypre/src/test/TEST_struct/emptyproc.saved.florentia
similarity index 100%
rename from external/hypre/src/test/TEST_struct/emptyproc.saved.ray
rename to external/hypre/src/test/TEST_struct/emptyproc.saved.florentia
diff --git a/external/hypre/src/test/TEST_struct/emptyproc.saved.lassen_cpu b/external/hypre/src/test/TEST_struct/emptyproc.saved.lassen_cpu
new file mode 100644
index 00000000..4d3786f5
--- /dev/null
+++ b/external/hypre/src/test/TEST_struct/emptyproc.saved.lassen_cpu
@@ -0,0 +1,68 @@
+# Output file: emptyproc.out.00a
+Iterations = 6
+Final Relative Residual Norm = 1.883632e-07
+
+# Output file: emptyproc.out.01a
+Iterations = 16
+Final Relative Residual Norm = 5.557193e-07
+
+# Output file: emptyproc.out.01b
+Iterations = 17
+Final Relative Residual Norm = 6.926794e-07
+
+# Output file: emptyproc.out.03a
+Iterations = 23
+Final Relative Residual Norm = 9.157321e-07
+
+# Output file: emptyproc.out.03b
+Iterations = 20
+Final Relative Residual Norm = 6.594761e-07
+
+# Output file: emptyproc.out.04a
+Iterations = 15
+Final Relative Residual Norm = 9.712834e-07
+
+# Output file: emptyproc.out.04b
+Iterations = 15
+Final Relative Residual Norm = 9.646051e-07
+
+# Output file: emptyproc.out.11a
+Iterations = 8
+Final Relative Residual Norm = 9.301342e-07
+
+# Output file: emptyproc.out.13a
+Iterations = 11
+Final Relative Residual Norm = 3.054686e-07
+
+# Output file: emptyproc.out.14a
+Iterations = 8
+Final Relative Residual Norm = 6.561630e-07
+
+# Output file: emptyproc.out.17a
+Iterations = 20
+Final Relative Residual Norm = 6.766509e-07
+
+# Output file: emptyproc.out.18a
+Iterations = 42
+Final Relative Residual Norm = 7.820632e-07
+
+# Output file: emptyproc.out.21a
+Iterations = 11
+Final Relative Residual Norm = 5.851154e-07
+
+# Output file: emptyproc.out.31a
+Iterations = 9
+Final Relative Residual Norm = 1.848351e-07
+
+# Output file: emptyproc.out.41a
+Iterations = 5
+Final Relative Residual Norm = 1.853522e-07
+
+# Output file: emptyproc.out.51a
+Iterations = 9
+Final Relative Residual Norm = 1.848351e-07
+
+# Output file: emptyproc.out.61a
+Iterations = 9
+Final Relative Residual Norm = 1.848351e-07
+
diff --git a/external/hypre/src/test/TEST_struct/emptyproc.saved.tioga b/external/hypre/src/test/TEST_struct/emptyproc.saved.tioga
new file mode 100644
index 00000000..4d3786f5
--- /dev/null
+++ b/external/hypre/src/test/TEST_struct/emptyproc.saved.tioga
@@ -0,0 +1,68 @@
+# Output file: emptyproc.out.00a
+Iterations = 6
+Final Relative Residual Norm = 1.883632e-07
+
+# Output file: emptyproc.out.01a
+Iterations = 16
+Final Relative Residual Norm = 5.557193e-07
+
+# Output file: emptyproc.out.01b
+Iterations = 17
+Final Relative Residual Norm = 6.926794e-07
+
+# Output file: emptyproc.out.03a
+Iterations = 23
+Final Relative Residual Norm = 9.157321e-07
+
+# Output file: emptyproc.out.03b
+Iterations = 20
+Final Relative Residual Norm = 6.594761e-07
+
+# Output file: emptyproc.out.04a
+Iterations = 15
+Final Relative Residual Norm = 9.712834e-07
+
+# Output file: emptyproc.out.04b
+Iterations = 15
+Final Relative Residual Norm = 9.646051e-07
+
+# Output file: emptyproc.out.11a
+Iterations = 8
+Final Relative Residual Norm = 9.301342e-07
+
+# Output file: emptyproc.out.13a
+Iterations = 11
+Final Relative Residual Norm = 3.054686e-07
+
+# Output file: emptyproc.out.14a
+Iterations = 8
+Final Relative Residual Norm = 6.561630e-07
+
+# Output file: emptyproc.out.17a
+Iterations = 20
+Final Relative Residual Norm = 6.766509e-07
+
+# Output file: emptyproc.out.18a
+Iterations = 42
+Final Relative Residual Norm = 7.820632e-07
+
+# Output file: emptyproc.out.21a
+Iterations = 11
+Final Relative Residual Norm = 5.851154e-07
+
+# Output file: emptyproc.out.31a
+Iterations = 9
+Final Relative Residual Norm = 1.848351e-07
+
+# Output file: emptyproc.out.41a
+Iterations = 5
+Final Relative Residual Norm = 1.853522e-07
+
+# Output file: emptyproc.out.51a
+Iterations = 9
+Final Relative Residual Norm = 1.848351e-07
+
+# Output file: emptyproc.out.61a
+Iterations = 9
+Final Relative Residual Norm = 1.848351e-07
+
diff --git a/external/hypre/src/test/TEST_struct/emptyproc.sh b/external/hypre/src/test/TEST_struct/emptyproc.sh
old mode 100644
new mode 100755
index 4b8d23cf..8dbfe0a3
--- a/external/hypre/src/test/TEST_struct/emptyproc.sh
+++ b/external/hypre/src/test/TEST_struct/emptyproc.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_struct/hybrid.jobs b/external/hypre/src/test/TEST_struct/hybrid.jobs
old mode 100644
new mode 100755
index 42f6ad5a..7391e0dd
--- a/external/hypre/src/test/TEST_struct/hybrid.jobs
+++ b/external/hypre/src/test/TEST_struct/hybrid.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_struct/hybrid.saved.ray b/external/hypre/src/test/TEST_struct/hybrid.saved.florentia
similarity index 100%
rename from external/hypre/src/test/TEST_struct/hybrid.saved.ray
rename to external/hypre/src/test/TEST_struct/hybrid.saved.florentia
diff --git a/external/hypre/src/test/TEST_struct/hybrid.saved.lassen_cpu b/external/hypre/src/test/TEST_struct/hybrid.saved.lassen_cpu
new file mode 100644
index 00000000..5054c85e
--- /dev/null
+++ b/external/hypre/src/test/TEST_struct/hybrid.saved.lassen_cpu
@@ -0,0 +1,20 @@
+# Output file: hybrid.out.0
+Iterations = 20
+Final Relative Residual Norm = 5.962015e-07
+
+# Output file: hybrid.out.1
+Iterations = 20
+Final Relative Residual Norm = 5.962015e-07
+
+# Output file: hybrid.out.2
+Iterations = 20
+Final Relative Residual Norm = 5.962015e-07
+
+# Output file: hybrid.out.3
+Iterations = 6
+Final Relative Residual Norm = 1.175679e-07
+
+# Output file: hybrid.out.4
+Iterations = 10
+Final Relative Residual Norm = 3.092333e-07
+
diff --git a/external/hypre/src/test/TEST_struct/hybrid.saved.tioga b/external/hypre/src/test/TEST_struct/hybrid.saved.tioga
new file mode 100644
index 00000000..5054c85e
--- /dev/null
+++ b/external/hypre/src/test/TEST_struct/hybrid.saved.tioga
@@ -0,0 +1,20 @@
+# Output file: hybrid.out.0
+Iterations = 20
+Final Relative Residual Norm = 5.962015e-07
+
+# Output file: hybrid.out.1
+Iterations = 20
+Final Relative Residual Norm = 5.962015e-07
+
+# Output file: hybrid.out.2
+Iterations = 20
+Final Relative Residual Norm = 5.962015e-07
+
+# Output file: hybrid.out.3
+Iterations = 6
+Final Relative Residual Norm = 1.175679e-07
+
+# Output file: hybrid.out.4
+Iterations = 10
+Final Relative Residual Norm = 3.092333e-07
+
diff --git a/external/hypre/src/test/TEST_struct/hybrid.sh b/external/hypre/src/test/TEST_struct/hybrid.sh
old mode 100644
new mode 100755
index d7af8d3e..f5961473
--- a/external/hypre/src/test/TEST_struct/hybrid.sh
+++ b/external/hypre/src/test/TEST_struct/hybrid.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_struct/hybridswitch.jobs b/external/hypre/src/test/TEST_struct/hybridswitch.jobs
old mode 100644
new mode 100755
index 8f81fa64..b5f085e6
--- a/external/hypre/src/test/TEST_struct/hybridswitch.jobs
+++ b/external/hypre/src/test/TEST_struct/hybridswitch.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_struct/hybridswitch.saved.ray b/external/hypre/src/test/TEST_struct/hybridswitch.saved.florentia
similarity index 100%
rename from external/hypre/src/test/TEST_struct/hybridswitch.saved.ray
rename to external/hypre/src/test/TEST_struct/hybridswitch.saved.florentia
diff --git a/external/hypre/src/test/TEST_struct/hybridswitch.saved.lassen_cpu b/external/hypre/src/test/TEST_struct/hybridswitch.saved.lassen_cpu
new file mode 100644
index 00000000..c5ef6e03
--- /dev/null
+++ b/external/hypre/src/test/TEST_struct/hybridswitch.saved.lassen_cpu
@@ -0,0 +1,32 @@
+# Output file: hybridswitch.out.0
+Iterations = 6
+Final Relative Residual Norm = 8.777304e-07
+
+# Output file: hybridswitch.out.1
+Iterations = 11
+Final Relative Residual Norm = 4.303572e-07
+
+# Output file: hybridswitch.out.2
+Iterations = 6
+Final Relative Residual Norm = 8.777304e-07
+
+# Output file: hybridswitch.out.3
+Iterations = 4
+Final Relative Residual Norm = 7.591871e-07
+
+# Output file: hybridswitch.out.4
+Iterations = 8
+Final Relative Residual Norm = 7.771813e-07
+
+# Output file: hybridswitch.out.5
+Iterations = 36
+Final Relative Residual Norm = 9.833457e-07
+
+# Output file: hybridswitch.out.6
+Iterations = 64
+Final Relative Residual Norm = 9.962554e-07
+
+# Output file: hybridswitch.out.7
+Iterations = 64
+Final Relative Residual Norm = 9.962554e-07
+
diff --git a/external/hypre/src/test/TEST_struct/hybridswitch.saved.tioga b/external/hypre/src/test/TEST_struct/hybridswitch.saved.tioga
new file mode 100644
index 00000000..c5ef6e03
--- /dev/null
+++ b/external/hypre/src/test/TEST_struct/hybridswitch.saved.tioga
@@ -0,0 +1,32 @@
+# Output file: hybridswitch.out.0
+Iterations = 6
+Final Relative Residual Norm = 8.777304e-07
+
+# Output file: hybridswitch.out.1
+Iterations = 11
+Final Relative Residual Norm = 4.303572e-07
+
+# Output file: hybridswitch.out.2
+Iterations = 6
+Final Relative Residual Norm = 8.777304e-07
+
+# Output file: hybridswitch.out.3
+Iterations = 4
+Final Relative Residual Norm = 7.591871e-07
+
+# Output file: hybridswitch.out.4
+Iterations = 8
+Final Relative Residual Norm = 7.771813e-07
+
+# Output file: hybridswitch.out.5
+Iterations = 36
+Final Relative Residual Norm = 9.833457e-07
+
+# Output file: hybridswitch.out.6
+Iterations = 64
+Final Relative Residual Norm = 9.962554e-07
+
+# Output file: hybridswitch.out.7
+Iterations = 64
+Final Relative Residual Norm = 9.962554e-07
+
diff --git a/external/hypre/src/test/TEST_struct/hybridswitch.sh b/external/hypre/src/test/TEST_struct/hybridswitch.sh
old mode 100644
new mode 100755
index c1776789..0bc8c3e6
--- a/external/hypre/src/test/TEST_struct/hybridswitch.sh
+++ b/external/hypre/src/test/TEST_struct/hybridswitch.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_struct/lazy.jobs b/external/hypre/src/test/TEST_struct/lazy.jobs
new file mode 100644
index 00000000..6a161c7b
--- /dev/null
+++ b/external/hypre/src/test/TEST_struct/lazy.jobs
@@ -0,0 +1,16 @@
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+#=============================================================================
+# Test library lazy initialization (sequential and parallel)
+#=============================================================================
+
+mpirun -np 1 ./struct                         > lazy.out.1.a
+mpirun -np 1 ./struct -lazy_device_init 1     > lazy.out.1.b
+
+mpirun -np 4 ./struct                         > lazy.out.2.a
+mpirun -np 4 ./struct -lazy_device_init 1     > lazy.out.2.b
+
diff --git a/external/hypre/src/test/TEST_struct/lazy.sh b/external/hypre/src/test/TEST_struct/lazy.sh
new file mode 100755
index 00000000..12571909
--- /dev/null
+++ b/external/hypre/src/test/TEST_struct/lazy.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+TNAME=`basename $0 .sh`
+
+tail -3 ${TNAME}.out.1.a | head -2 > ${TNAME}.testdata
+tail -3 ${TNAME}.out.1.b | head -2 > ${TNAME}.testdata.temp
+diff ${TNAME}.testdata ${TNAME}.testdata.temp >&2
+
+tail -3 ${TNAME}.out.2.a | head -2 > ${TNAME}.testdata
+tail -3 ${TNAME}.out.2.b | head -2 > ${TNAME}.testdata.temp
+diff ${TNAME}.testdata ${TNAME}.testdata.temp >&2
+
+#=============================================================================
+# remove temporary files
+#=============================================================================
+
+rm -f ${TNAME}.testdata*
diff --git a/external/hypre/src/test/TEST_struct/migrate.jobs b/external/hypre/src/test/TEST_struct/migrate.jobs
old mode 100644
new mode 100755
index ffca19e1..e44ab387
--- a/external/hypre/src/test/TEST_struct/migrate.jobs
+++ b/external/hypre/src/test/TEST_struct/migrate.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_struct/migrate.saved.ray b/external/hypre/src/test/TEST_struct/migrate.saved.florentia
similarity index 100%
rename from external/hypre/src/test/TEST_struct/migrate.saved.ray
rename to external/hypre/src/test/TEST_struct/migrate.saved.florentia
diff --git a/external/hypre/src/test/TEST_struct/migrate.saved.lassen_cpu b/external/hypre/src/test/TEST_struct/migrate.saved.lassen_cpu
new file mode 100644
index 00000000..c913c5fc
--- /dev/null
+++ b/external/hypre/src/test/TEST_struct/migrate.saved.lassen_cpu
@@ -0,0 +1,27 @@
+# Output file: migrate.out.10
+Check = 0 (success = 0)
+
+# Output file: migrate.out.11
+Check = 0 (success = 0)
+
+# Output file: migrate.out.12
+Check = 0 (success = 0)
+
+# Output file: migrate.out.20
+Check = 0 (success = 0)
+
+# Output file: migrate.out.21
+Check = 0 (success = 0)
+
+# Output file: migrate.out.22
+Check = 0 (success = 0)
+
+# Output file: migrate.out.30
+Check = 0 (success = 0)
+
+# Output file: migrate.out.31
+Check = 0 (success = 0)
+
+# Output file: migrate.out.32
+Check = 0 (success = 0)
+
diff --git a/external/hypre/src/test/TEST_struct/migrate.saved.tioga b/external/hypre/src/test/TEST_struct/migrate.saved.tioga
new file mode 100644
index 00000000..c913c5fc
--- /dev/null
+++ b/external/hypre/src/test/TEST_struct/migrate.saved.tioga
@@ -0,0 +1,27 @@
+# Output file: migrate.out.10
+Check = 0 (success = 0)
+
+# Output file: migrate.out.11
+Check = 0 (success = 0)
+
+# Output file: migrate.out.12
+Check = 0 (success = 0)
+
+# Output file: migrate.out.20
+Check = 0 (success = 0)
+
+# Output file: migrate.out.21
+Check = 0 (success = 0)
+
+# Output file: migrate.out.22
+Check = 0 (success = 0)
+
+# Output file: migrate.out.30
+Check = 0 (success = 0)
+
+# Output file: migrate.out.31
+Check = 0 (success = 0)
+
+# Output file: migrate.out.32
+Check = 0 (success = 0)
+
diff --git a/external/hypre/src/test/TEST_struct/migrate.sh b/external/hypre/src/test/TEST_struct/migrate.sh
old mode 100644
new mode 100755
index 84c6b164..0474569c
--- a/external/hypre/src/test/TEST_struct/migrate.sh
+++ b/external/hypre/src/test/TEST_struct/migrate.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_struct/parflow.jobs b/external/hypre/src/test/TEST_struct/parflow.jobs
old mode 100644
new mode 100755
index ac66797f..2fec62c4
--- a/external/hypre/src/test/TEST_struct/parflow.jobs
+++ b/external/hypre/src/test/TEST_struct/parflow.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_struct/parflow.saved.ray b/external/hypre/src/test/TEST_struct/parflow.saved.florentia
similarity index 100%
rename from external/hypre/src/test/TEST_struct/parflow.saved.ray
rename to external/hypre/src/test/TEST_struct/parflow.saved.florentia
diff --git a/external/hypre/src/test/TEST_struct/parflow.saved.lassen_cpu b/external/hypre/src/test/TEST_struct/parflow.saved.lassen_cpu
new file mode 100644
index 00000000..c3946d0d
--- /dev/null
+++ b/external/hypre/src/test/TEST_struct/parflow.saved.lassen_cpu
@@ -0,0 +1,24 @@
+# Output file: parflow.out.0
+Iterations = 10
+Final Relative Residual Norm = 8.112584e-07
+
+# Output file: parflow.out.1
+Iterations = 10
+Final Relative Residual Norm = 8.112584e-07
+
+# Output file: parflow.out.2
+Iterations = 10
+Final Relative Residual Norm = 8.112584e-07
+
+# Output file: parflow.out.3
+Iterations = 15
+Final Relative Residual Norm = 9.466307e-07
+
+# Output file: parflow.out.4
+Iterations = 15
+Final Relative Residual Norm = 9.466307e-07
+
+# Output file: parflow.out.5
+Iterations = 15
+Final Relative Residual Norm = 9.466307e-07
+
diff --git a/external/hypre/src/test/TEST_struct/parflow.saved.tioga b/external/hypre/src/test/TEST_struct/parflow.saved.tioga
new file mode 100644
index 00000000..c3946d0d
--- /dev/null
+++ b/external/hypre/src/test/TEST_struct/parflow.saved.tioga
@@ -0,0 +1,24 @@
+# Output file: parflow.out.0
+Iterations = 10
+Final Relative Residual Norm = 8.112584e-07
+
+# Output file: parflow.out.1
+Iterations = 10
+Final Relative Residual Norm = 8.112584e-07
+
+# Output file: parflow.out.2
+Iterations = 10
+Final Relative Residual Norm = 8.112584e-07
+
+# Output file: parflow.out.3
+Iterations = 15
+Final Relative Residual Norm = 9.466307e-07
+
+# Output file: parflow.out.4
+Iterations = 15
+Final Relative Residual Norm = 9.466307e-07
+
+# Output file: parflow.out.5
+Iterations = 15
+Final Relative Residual Norm = 9.466307e-07
+
diff --git a/external/hypre/src/test/TEST_struct/parflow.sh b/external/hypre/src/test/TEST_struct/parflow.sh
old mode 100644
new mode 100755
index 58d2c235..4a5527e3
--- a/external/hypre/src/test/TEST_struct/parflow.sh
+++ b/external/hypre/src/test/TEST_struct/parflow.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_struct/periodic.jobs b/external/hypre/src/test/TEST_struct/periodic.jobs
old mode 100644
new mode 100755
index 6bc02581..6aedb579
--- a/external/hypre/src/test/TEST_struct/periodic.jobs
+++ b/external/hypre/src/test/TEST_struct/periodic.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_struct/periodic.saved.florentia b/external/hypre/src/test/TEST_struct/periodic.saved.florentia
new file mode 100644
index 00000000..98abb67a
--- /dev/null
+++ b/external/hypre/src/test/TEST_struct/periodic.saved.florentia
@@ -0,0 +1,67 @@
+# Output file: periodic.out.10
+Iterations = 16
+Final Relative Residual Norm = 5.765014e-07
+
+# Output file: periodic.out.11
+Iterations = 16
+Final Relative Residual Norm = 5.765014e-07
+
+# Output file: periodic.out.12
+Iterations = 16
+Final Relative Residual Norm = 5.765014e-07
+
+# Output file: periodic.out.13
+Iterations = 16
+Final Relative Residual Norm = 5.765014e-07
+
+# Output file: periodic.out.20
+Iterations = 23
+Final Relative Residual Norm = 6.111317e-07
+
+# Output file: periodic.out.21
+Iterations = 23
+Final Relative Residual Norm = 6.111317e-07
+
+# Output file: periodic.out.30
+Iterations = 21
+Final Relative Residual Norm = 4.973134e-07
+
+# Output file: periodic.out.31
+Iterations = 21
+Final Relative Residual Norm = 4.973134e-07
+
+# Output file: periodic.out.32
+Iterations = 21
+Final Relative Residual Norm = 4.973134e-07
+
+# Output file: periodic.out.33
+Iterations = 21
+Final Relative Residual Norm = 4.973134e-07
+
+# Output file: periodic.out.40
+Iterations = 43
+Final Relative Residual Norm = 8.515463e-07
+
+# Output file: periodic.out.41
+Iterations = 43
+Final Relative Residual Norm = 8.515463e-07
+
+# Output file: periodic.out.50
+Iterations = 7
+Final Relative Residual Norm = 3.701014e-07
+
+# Output file: periodic.out.51
+Iterations = 7
+Final Relative Residual Norm = 3.701014e-07
+
+# Output file: periodic.out.52
+Iterations = 7
+Final Relative Residual Norm = 3.701014e-07
+
+# Output file: periodic.out.53
+Iterations = 7
+Final Relative Residual Norm = 3.701014e-07
+
+# Output file: periodic.out.60
+Iterations = 10
+Final Relative Residual Norm = 1.565392e-07
diff --git a/external/hypre/src/test/TEST_struct/periodic.saved.ray b/external/hypre/src/test/TEST_struct/periodic.saved.lassen_cpu
similarity index 100%
rename from external/hypre/src/test/TEST_struct/periodic.saved.ray
rename to external/hypre/src/test/TEST_struct/periodic.saved.lassen_cpu
diff --git a/external/hypre/src/test/TEST_struct/periodic.saved.tioga b/external/hypre/src/test/TEST_struct/periodic.saved.tioga
new file mode 100644
index 00000000..7873f992
--- /dev/null
+++ b/external/hypre/src/test/TEST_struct/periodic.saved.tioga
@@ -0,0 +1,68 @@
+# Output file: periodic.out.10
+Iterations = 16
+Final Relative Residual Norm = 5.765014e-07
+
+# Output file: periodic.out.11
+Iterations = 16
+Final Relative Residual Norm = 5.765014e-07
+
+# Output file: periodic.out.12
+Iterations = 16
+Final Relative Residual Norm = 5.765014e-07
+
+# Output file: periodic.out.13
+Iterations = 16
+Final Relative Residual Norm = 5.765014e-07
+
+# Output file: periodic.out.20
+Iterations = 23
+Final Relative Residual Norm = 6.111317e-07
+
+# Output file: periodic.out.21
+Iterations = 23
+Final Relative Residual Norm = 6.111317e-07
+
+# Output file: periodic.out.30
+Iterations = 21
+Final Relative Residual Norm = 4.973134e-07
+
+# Output file: periodic.out.31
+Iterations = 21
+Final Relative Residual Norm = 4.973134e-07
+
+# Output file: periodic.out.32
+Iterations = 21
+Final Relative Residual Norm = 4.973134e-07
+
+# Output file: periodic.out.33
+Iterations = 21
+Final Relative Residual Norm = 4.973134e-07
+
+# Output file: periodic.out.40
+Iterations = 43
+Final Relative Residual Norm = 8.515463e-07
+
+# Output file: periodic.out.41
+Iterations = 43
+Final Relative Residual Norm = 8.515463e-07
+
+# Output file: periodic.out.50
+Iterations = 7
+Final Relative Residual Norm = 3.701014e-07
+
+# Output file: periodic.out.51
+Iterations = 7
+Final Relative Residual Norm = 3.701014e-07
+
+# Output file: periodic.out.52
+Iterations = 7
+Final Relative Residual Norm = 3.701014e-07
+
+# Output file: periodic.out.53
+Iterations = 7
+Final Relative Residual Norm = 3.701014e-07
+
+# Output file: periodic.out.60
+Iterations = 10
+Final Relative Residual Norm = 1.565392e-07
+
diff --git a/external/hypre/src/test/TEST_struct/periodic.sh b/external/hypre/src/test/TEST_struct/periodic.sh
old mode 100644
new mode 100755
index c5b217ff..cc0eb18d
--- a/external/hypre/src/test/TEST_struct/periodic.sh
+++ b/external/hypre/src/test/TEST_struct/periodic.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_struct/pfmgbase1d.jobs b/external/hypre/src/test/TEST_struct/pfmgbase1d.jobs
old mode 100644
new mode 100755
index 2334b896..3d362466
--- a/external/hypre/src/test/TEST_struct/pfmgbase1d.jobs
+++ b/external/hypre/src/test/TEST_struct/pfmgbase1d.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_struct/pfmgbase1d.saved.ray b/external/hypre/src/test/TEST_struct/pfmgbase1d.saved.florentia
similarity index 100%
rename from external/hypre/src/test/TEST_struct/pfmgbase1d.saved.ray
rename to external/hypre/src/test/TEST_struct/pfmgbase1d.saved.florentia
diff --git a/external/hypre/src/test/TEST_struct/pfmgbase1d.saved.lassen_cpu b/external/hypre/src/test/TEST_struct/pfmgbase1d.saved.lassen_cpu
new file mode 100644
index 00000000..af3f57c4
--- /dev/null
+++ b/external/hypre/src/test/TEST_struct/pfmgbase1d.saved.lassen_cpu
@@ -0,0 +1,8 @@
+# Output file: pfmgbase1d.out.0
+Iterations = 9
+Final Relative Residual Norm = 2.021867e-07
+
+# Output file: pfmgbase1d.out.1
+Iterations = 9
+Final Relative Residual Norm = 2.021867e-07
+
diff --git a/external/hypre/src/test/TEST_struct/pfmgbase1d.saved.tioga b/external/hypre/src/test/TEST_struct/pfmgbase1d.saved.tioga
new file mode 100644
index 00000000..af3f57c4
--- /dev/null
+++ b/external/hypre/src/test/TEST_struct/pfmgbase1d.saved.tioga
@@ -0,0 +1,8 @@
+# Output file: pfmgbase1d.out.0
+Iterations = 9
+Final Relative Residual Norm = 2.021867e-07
+
+# Output file: pfmgbase1d.out.1
+Iterations = 9
+Final Relative Residual Norm = 2.021867e-07
+
diff --git a/external/hypre/src/test/TEST_struct/pfmgbase1d.sh b/external/hypre/src/test/TEST_struct/pfmgbase1d.sh
old mode 100644
new mode 100755
index f8e18dd2..2ca0d05b
--- a/external/hypre/src/test/TEST_struct/pfmgbase1d.sh
+++ b/external/hypre/src/test/TEST_struct/pfmgbase1d.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_struct/pfmgbase2d.jobs b/external/hypre/src/test/TEST_struct/pfmgbase2d.jobs
old mode 100644
new mode 100755
index 68c158e1..072f0a28
--- a/external/hypre/src/test/TEST_struct/pfmgbase2d.jobs
+++ b/external/hypre/src/test/TEST_struct/pfmgbase2d.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_struct/pfmgbase2d.saved.ray b/external/hypre/src/test/TEST_struct/pfmgbase2d.saved.florentia
similarity index 100%
rename from external/hypre/src/test/TEST_struct/pfmgbase2d.saved.ray
rename to external/hypre/src/test/TEST_struct/pfmgbase2d.saved.florentia
diff --git a/external/hypre/src/test/TEST_struct/pfmgbase2d.saved.lassen_cpu b/external/hypre/src/test/TEST_struct/pfmgbase2d.saved.lassen_cpu
new file mode 100644
index 00000000..e4b1c547
--- /dev/null
+++ b/external/hypre/src/test/TEST_struct/pfmgbase2d.saved.lassen_cpu
@@ -0,0 +1,24 @@
+# Output file: pfmgbase2d.out.0
+Iterations = 13
+Final Relative Residual Norm = 3.655647e-07
+
+# Output file: pfmgbase2d.out.1
+Iterations = 13
+Final Relative Residual Norm = 3.655647e-07
+
+# Output file: pfmgbase2d.out.2
+Iterations = 13
+Final Relative Residual Norm = 3.655647e-07
+
+# Output file: pfmgbase2d.out.3
+Iterations = 13
+Final Relative Residual Norm = 3.655647e-07
+
+# Output file: pfmgbase2d.out.4
+Iterations = 13
+Final Relative Residual Norm = 3.655647e-07
+
+# Output file: pfmgbase2d.out.5
+Iterations = 13
+Final Relative Residual Norm = 3.655647e-07
+
diff --git a/external/hypre/src/test/TEST_struct/pfmgbase2d.saved.tioga b/external/hypre/src/test/TEST_struct/pfmgbase2d.saved.tioga
new file mode 100644
index 00000000..e4b1c547
--- /dev/null
+++ b/external/hypre/src/test/TEST_struct/pfmgbase2d.saved.tioga
@@ -0,0 +1,24 @@
+# Output file: pfmgbase2d.out.0
+Iterations = 13
+Final Relative Residual Norm = 3.655647e-07
+
+# Output file: pfmgbase2d.out.1
+Iterations = 13
+Final Relative Residual Norm = 3.655647e-07
+
+# Output file: pfmgbase2d.out.2
+Iterations = 13
+Final Relative Residual Norm = 3.655647e-07
+
+# Output file: pfmgbase2d.out.3
+Iterations = 13
+Final Relative Residual Norm = 3.655647e-07
+
+# Output file: pfmgbase2d.out.4
+Iterations = 13
+Final Relative Residual Norm = 3.655647e-07
+
+# Output file: pfmgbase2d.out.5
+Iterations = 13
+Final Relative Residual Norm = 3.655647e-07
+
diff --git a/external/hypre/src/test/TEST_struct/pfmgbase2d.sh b/external/hypre/src/test/TEST_struct/pfmgbase2d.sh
old mode 100644
new mode 100755
index a2d36b3c..8457c7ad
--- a/external/hypre/src/test/TEST_struct/pfmgbase2d.sh
+++ b/external/hypre/src/test/TEST_struct/pfmgbase2d.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_struct/pfmgbase3d.jobs b/external/hypre/src/test/TEST_struct/pfmgbase3d.jobs
old mode 100644
new mode 100755
index d82bdfa7..207721ea
--- a/external/hypre/src/test/TEST_struct/pfmgbase3d.jobs
+++ b/external/hypre/src/test/TEST_struct/pfmgbase3d.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_struct/pfmgbase3d.saved.ray b/external/hypre/src/test/TEST_struct/pfmgbase3d.saved.florentia
similarity index 100%
rename from external/hypre/src/test/TEST_struct/pfmgbase3d.saved.ray
rename to external/hypre/src/test/TEST_struct/pfmgbase3d.saved.florentia
diff --git a/external/hypre/src/test/TEST_struct/pfmgbase3d.saved.lassen_cpu b/external/hypre/src/test/TEST_struct/pfmgbase3d.saved.lassen_cpu
new file mode 100644
index 00000000..7d0a285c
--- /dev/null
+++ b/external/hypre/src/test/TEST_struct/pfmgbase3d.saved.lassen_cpu
@@ -0,0 +1,32 @@
+# Output file: pfmgbase3d.out.0
+Iterations = 10
+Final Relative Residual Norm = 3.298941e-07
+
+# Output file: pfmgbase3d.out.1
+Iterations = 10
+Final Relative Residual Norm = 3.298941e-07
+
+# Output file: pfmgbase3d.out.2
+Iterations = 10
+Final Relative Residual Norm = 3.298941e-07
+
+# Output file: pfmgbase3d.out.3
+Iterations = 10
+Final Relative Residual Norm = 3.298941e-07
+
+# Output file: pfmgbase3d.out.4
+Iterations = 10
+Final Relative Residual Norm = 3.298941e-07
+
+# Output file: pfmgbase3d.out.5
+Iterations = 10
+Final Relative Residual Norm = 3.298941e-07
+
+# Output file: pfmgbase3d.out.6
+Iterations = 10
+Final Relative Residual Norm = 3.298941e-07
+
+# Output file: pfmgbase3d.out.7
+Iterations = 10
+Final Relative Residual Norm = 3.298941e-07
+
diff --git a/external/hypre/src/test/TEST_struct/pfmgbase3d.saved.tioga b/external/hypre/src/test/TEST_struct/pfmgbase3d.saved.tioga
new file mode 100644
index 00000000..7d0a285c
--- /dev/null
+++ b/external/hypre/src/test/TEST_struct/pfmgbase3d.saved.tioga
@@ -0,0 +1,32 @@
+# Output file: pfmgbase3d.out.0
+Iterations = 10
+Final Relative Residual Norm = 3.298941e-07
+
+# Output file: pfmgbase3d.out.1
+Iterations = 10
+Final Relative Residual Norm = 3.298941e-07
+
+# Output file: pfmgbase3d.out.2
+Iterations = 10
+Final Relative Residual Norm = 3.298941e-07
+
+# Output file: pfmgbase3d.out.3
+Iterations = 10
+Final Relative Residual Norm = 3.298941e-07
+
+# Output file: pfmgbase3d.out.4
+Iterations = 10
+Final Relative Residual Norm = 3.298941e-07
+
+# Output file: pfmgbase3d.out.5
+Iterations = 10
+Final Relative Residual Norm = 3.298941e-07
+
+# Output file: pfmgbase3d.out.6
+Iterations = 10
+Final Relative Residual Norm = 3.298941e-07
+
+# Output file: pfmgbase3d.out.7
+Iterations = 10
+Final Relative Residual Norm = 3.298941e-07
+
diff --git a/external/hypre/src/test/TEST_struct/pfmgbase3d.sh b/external/hypre/src/test/TEST_struct/pfmgbase3d.sh
old mode 100644
new mode 100755
index cbc74df8..96f99a52
--- a/external/hypre/src/test/TEST_struct/pfmgbase3d.sh
+++ b/external/hypre/src/test/TEST_struct/pfmgbase3d.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_struct/pfmgconstcoeffmp.jobs b/external/hypre/src/test/TEST_struct/pfmgconstcoeffmp.jobs
old mode 100644
new mode 100755
index ba523c6e..e29ba34e
--- a/external/hypre/src/test/TEST_struct/pfmgconstcoeffmp.jobs
+++ b/external/hypre/src/test/TEST_struct/pfmgconstcoeffmp.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_struct/pfmgconstcoeffmp.saved.ray b/external/hypre/src/test/TEST_struct/pfmgconstcoeffmp.saved.florentia
similarity index 100%
rename from external/hypre/src/test/TEST_struct/pfmgconstcoeffmp.saved.ray
rename to external/hypre/src/test/TEST_struct/pfmgconstcoeffmp.saved.florentia
diff --git a/external/hypre/src/test/TEST_struct/pfmgconstcoeffmp.saved.lassen_cpu b/external/hypre/src/test/TEST_struct/pfmgconstcoeffmp.saved.lassen_cpu
new file mode 100644
index 00000000..15eade03
--- /dev/null
+++ b/external/hypre/src/test/TEST_struct/pfmgconstcoeffmp.saved.lassen_cpu
@@ -0,0 +1,80 @@
+# Output file: pfmgconstcoeffmp.out.10
+Iterations = 13
+Final Relative Residual Norm = 5.378609e-07
+
+# Output file: pfmgconstcoeffmp.out.11
+Iterations = 13
+Final Relative Residual Norm = 5.378609e-07
+
+# Output file: pfmgconstcoeffmp.out.12
+Iterations = 12
+Final Relative Residual Norm = 3.999260e-07
+
+# Output file: pfmgconstcoeffmp.out.13
+Iterations = 12
+Final Relative Residual Norm = 3.999260e-07
+
+# Output file: pfmgconstcoeffmp.out.20
+Iterations = 19
+Final Relative Residual Norm = 5.033356e-07
+
+# Output file: pfmgconstcoeffmp.out.21
+Iterations = 19
+Final Relative Residual Norm = 5.033356e-07
+
+# Output file: pfmgconstcoeffmp.out.22
+Iterations = 15
+Final Relative Residual Norm = 8.833880e-07
+
+# Output file: pfmgconstcoeffmp.out.23
+Iterations = 15
+Final Relative Residual Norm = 8.833880e-07
+
+# Output file: pfmgconstcoeffmp.out.30
+Iterations = 200
+Final Relative Residual Norm = 1.095973e+00
+
+# Output file: pfmgconstcoeffmp.out.31
+Iterations = 200
+Final Relative Residual Norm = 1.095973e+00
+
+# Output file: pfmgconstcoeffmp.out.32
+Iterations = 43
+Final Relative Residual Norm = 9.925149e-07
+
+# Output file: pfmgconstcoeffmp.out.33
+Iterations = 43
+Final Relative Residual Norm = 9.925149e-07
+
+# Output file: pfmgconstcoeffmp.out.34
+Iterations = 14
+Final Relative Residual Norm = 5.920399e-07
+
+# Output file: pfmgconstcoeffmp.out.35
+Iterations = 14
+Final Relative Residual Norm = 5.920399e-07
+
+# Output file: pfmgconstcoeffmp.out.40
+Iterations = 18
+Final Relative Residual Norm = 8.028630e-07
+
+# Output file: pfmgconstcoeffmp.out.41
+Iterations = 18
+Final Relative Residual Norm = 8.028630e-07
+
+# Output file: pfmgconstcoeffmp.out.42
+Iterations = 16
+Final Relative Residual Norm = 6.371573e-07
+
+# Output file: pfmgconstcoeffmp.out.43
+Iterations = 16
+Final Relative Residual Norm = 6.371573e-07
+
+# Output file: pfmgconstcoeffmp.out.44
+Iterations = 13
+Final Relative Residual Norm = 9.856117e-07
+
+# Output file: pfmgconstcoeffmp.out.45
+Iterations = 13
+Final Relative Residual Norm = 9.856117e-07
+
diff --git a/external/hypre/src/test/TEST_struct/pfmgconstcoeffmp.saved.tioga b/external/hypre/src/test/TEST_struct/pfmgconstcoeffmp.saved.tioga
new file mode 100644
index 00000000..15eade03
--- /dev/null
+++ b/external/hypre/src/test/TEST_struct/pfmgconstcoeffmp.saved.tioga
@@ -0,0 +1,80 @@
+# Output file: pfmgconstcoeffmp.out.10
+Iterations = 13
+Final Relative Residual Norm = 5.378609e-07
+
+# Output file: pfmgconstcoeffmp.out.11
+Iterations = 13
+Final Relative Residual Norm = 5.378609e-07
+
+# Output file: pfmgconstcoeffmp.out.12
+Iterations = 12
+Final Relative Residual Norm = 3.999260e-07
+
+# Output file: pfmgconstcoeffmp.out.13
+Iterations = 12
+Final Relative Residual Norm = 3.999260e-07
+
+# Output file: pfmgconstcoeffmp.out.20
+Iterations = 19
+Final Relative Residual Norm = 5.033356e-07
+
+# Output file: pfmgconstcoeffmp.out.21
+Iterations = 19
+Final Relative Residual Norm = 5.033356e-07
+
+# Output file: pfmgconstcoeffmp.out.22
+Iterations = 15
+Final Relative Residual Norm = 8.833880e-07
+
+# Output file: pfmgconstcoeffmp.out.23
+Iterations = 15
+Final Relative Residual Norm = 8.833880e-07
+
+# Output file: pfmgconstcoeffmp.out.30
+Iterations = 200
+Final Relative Residual Norm = 1.095973e+00
+
+# Output file: pfmgconstcoeffmp.out.31
+Iterations = 200
+Final Relative Residual Norm = 1.095973e+00
+
+# Output file: pfmgconstcoeffmp.out.32
+Iterations = 43
+Final Relative Residual Norm = 9.925149e-07
+
+# Output file: pfmgconstcoeffmp.out.33
+Iterations = 43
+Final Relative Residual Norm = 9.925149e-07
+
+# Output file: pfmgconstcoeffmp.out.34
+Iterations = 14
+Final Relative Residual Norm = 5.920399e-07
+
+# Output file: pfmgconstcoeffmp.out.35
+Iterations = 14
+Final Relative Residual Norm = 5.920399e-07
+
+# Output file: pfmgconstcoeffmp.out.40
+Iterations = 18
+Final Relative Residual Norm = 8.028630e-07
+
+# Output file: pfmgconstcoeffmp.out.41
+Iterations = 18
+Final Relative Residual Norm = 8.028630e-07
+
+# Output file: pfmgconstcoeffmp.out.42
+Iterations = 16
+Final Relative Residual Norm = 6.371573e-07
+
+# Output file: pfmgconstcoeffmp.out.43
+Iterations = 16
+Final Relative Residual Norm = 6.371573e-07
+
+# Output file: pfmgconstcoeffmp.out.44
+Iterations = 13
+Final Relative Residual Norm = 9.856117e-07
+
+# Output file: pfmgconstcoeffmp.out.45
+Iterations = 13
+Final Relative Residual Norm = 9.856117e-07
+
diff --git a/external/hypre/src/test/TEST_struct/pfmgconstcoeffmp.sh b/external/hypre/src/test/TEST_struct/pfmgconstcoeffmp.sh
old mode 100644
new mode 100755
index c025d75d..42255206
--- a/external/hypre/src/test/TEST_struct/pfmgconstcoeffmp.sh
+++ b/external/hypre/src/test/TEST_struct/pfmgconstcoeffmp.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_struct/pfmgorient.jobs b/external/hypre/src/test/TEST_struct/pfmgorient.jobs
old mode 100644
new mode 100755
index 4ea95a29..b4f3de01
--- a/external/hypre/src/test/TEST_struct/pfmgorient.jobs
+++ b/external/hypre/src/test/TEST_struct/pfmgorient.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_struct/pfmgorient.saved.ray b/external/hypre/src/test/TEST_struct/pfmgorient.saved.florentia
similarity index 100%
rename from external/hypre/src/test/TEST_struct/pfmgorient.saved.ray
rename to external/hypre/src/test/TEST_struct/pfmgorient.saved.florentia
diff --git a/external/hypre/src/test/TEST_struct/pfmgorient.saved.lassen_cpu b/external/hypre/src/test/TEST_struct/pfmgorient.saved.lassen_cpu
new file mode 100644
index 00000000..ad4e63f8
--- /dev/null
+++ b/external/hypre/src/test/TEST_struct/pfmgorient.saved.lassen_cpu
@@ -0,0 +1,12 @@
+# Output file: pfmgorient.out.0
+Iterations = 9
+Final Relative Residual Norm = 1.987658e-07
+
+# Output file: pfmgorient.out.1
+Iterations = 9
+Final Relative Residual Norm = 1.987658e-07
+
+# Output file: pfmgorient.out.2
+Iterations = 9
+Final Relative Residual Norm = 1.987658e-07
+
diff --git a/external/hypre/src/test/TEST_struct/pfmgorient.saved.tioga b/external/hypre/src/test/TEST_struct/pfmgorient.saved.tioga
new file mode 100644
index 00000000..ad4e63f8
--- /dev/null
+++ b/external/hypre/src/test/TEST_struct/pfmgorient.saved.tioga
@@ -0,0 +1,12 @@
+# Output file: pfmgorient.out.0
+Iterations = 9
+Final Relative Residual Norm = 1.987658e-07
+
+# Output file: pfmgorient.out.1
+Iterations = 9
+Final Relative Residual Norm = 1.987658e-07
+
+# Output file: pfmgorient.out.2
+Iterations = 9
+Final Relative Residual Norm = 1.987658e-07
+
diff --git a/external/hypre/src/test/TEST_struct/pfmgorient.sh b/external/hypre/src/test/TEST_struct/pfmgorient.sh
old mode 100644
new mode 100755
index f981edd2..5618a138
--- a/external/hypre/src/test/TEST_struct/pfmgorient.sh
+++ b/external/hypre/src/test/TEST_struct/pfmgorient.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_struct/pfmgtest1d.jobs b/external/hypre/src/test/TEST_struct/pfmgtest1d.jobs
old mode 100644
new mode 100755
index 50be58ee..2d34b08f
--- a/external/hypre/src/test/TEST_struct/pfmgtest1d.jobs
+++ b/external/hypre/src/test/TEST_struct/pfmgtest1d.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_struct/pfmgtest1d.saved.ray b/external/hypre/src/test/TEST_struct/pfmgtest1d.saved.florentia
similarity index 100%
rename from external/hypre/src/test/TEST_struct/pfmgtest1d.saved.ray
rename to external/hypre/src/test/TEST_struct/pfmgtest1d.saved.florentia
diff --git a/external/hypre/src/test/TEST_struct/pfmgtest1d.saved.lassen_cpu b/external/hypre/src/test/TEST_struct/pfmgtest1d.saved.lassen_cpu
new file mode 100644
index 00000000..84e6234a
--- /dev/null
+++ b/external/hypre/src/test/TEST_struct/pfmgtest1d.saved.lassen_cpu
@@ -0,0 +1,12 @@
+# Output file: pfmgtest1d.out.0
+Iterations = 9
+Final Relative Residual Norm = 2.021867e-07
+
+# Output file: pfmgtest1d.out.1
+Iterations = 9
+Final Relative Residual Norm = 2.021867e-07
+
+# Output file: pfmgtest1d.out.2
+Iterations = 9
+Final Relative Residual Norm = 2.021867e-07
+
diff --git a/external/hypre/src/test/TEST_struct/pfmgtest1d.saved.tioga b/external/hypre/src/test/TEST_struct/pfmgtest1d.saved.tioga
new file mode 100644
index 00000000..84e6234a
--- /dev/null
+++ b/external/hypre/src/test/TEST_struct/pfmgtest1d.saved.tioga
@@ -0,0 +1,12 @@
+# Output file: pfmgtest1d.out.0
+Iterations = 9
+Final Relative Residual Norm = 2.021867e-07
+
+# Output file: pfmgtest1d.out.1
+Iterations = 9
+Final Relative Residual Norm = 2.021867e-07
+
+# Output file: pfmgtest1d.out.2
+Iterations = 9
+Final Relative Residual Norm = 2.021867e-07
+
diff --git a/external/hypre/src/test/TEST_struct/pfmgtest1d.sh b/external/hypre/src/test/TEST_struct/pfmgtest1d.sh
old mode 100644
new mode 100755
index 3c0d252b..cffd1304
--- a/external/hypre/src/test/TEST_struct/pfmgtest1d.sh
+++ b/external/hypre/src/test/TEST_struct/pfmgtest1d.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_struct/pfmgvcycle.jobs b/external/hypre/src/test/TEST_struct/pfmgvcycle.jobs
old mode 100644
new mode 100755
index 00325c2d..3b2be562
--- a/external/hypre/src/test/TEST_struct/pfmgvcycle.jobs
+++ b/external/hypre/src/test/TEST_struct/pfmgvcycle.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_struct/pfmgvcycle.saved.ray b/external/hypre/src/test/TEST_struct/pfmgvcycle.saved.florentia
similarity index 100%
rename from external/hypre/src/test/TEST_struct/pfmgvcycle.saved.ray
rename to external/hypre/src/test/TEST_struct/pfmgvcycle.saved.florentia
diff --git a/external/hypre/src/test/TEST_struct/pfmgvcycle.saved.lassen_cpu b/external/hypre/src/test/TEST_struct/pfmgvcycle.saved.lassen_cpu
new file mode 100644
index 00000000..f4304e4f
--- /dev/null
+++ b/external/hypre/src/test/TEST_struct/pfmgvcycle.saved.lassen_cpu
@@ -0,0 +1,8 @@
+# Output file: pfmgvcycle.out.0
+Iterations = 30
+Final Relative Residual Norm = 8.360175e-07
+
+# Output file: pfmgvcycle.out.1
+Iterations = 30
+Final Relative Residual Norm = 7.107142e-07
+
diff --git a/external/hypre/src/test/TEST_struct/pfmgvcycle.saved.tioga b/external/hypre/src/test/TEST_struct/pfmgvcycle.saved.tioga
new file mode 100644
index 00000000..f4304e4f
--- /dev/null
+++ b/external/hypre/src/test/TEST_struct/pfmgvcycle.saved.tioga
@@ -0,0 +1,8 @@
+# Output file: pfmgvcycle.out.0
+Iterations = 30
+Final Relative Residual Norm = 8.360175e-07
+
+# Output file: pfmgvcycle.out.1
+Iterations = 30
+Final Relative Residual Norm = 7.107142e-07
+
diff --git a/external/hypre/src/test/TEST_struct/pfmgvcycle.sh b/external/hypre/src/test/TEST_struct/pfmgvcycle.sh
old mode 100644
new mode 100755
index e195dcf5..74720dd7
--- a/external/hypre/src/test/TEST_struct/pfmgvcycle.sh
+++ b/external/hypre/src/test/TEST_struct/pfmgvcycle.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_struct/psmgbase3d.jobs b/external/hypre/src/test/TEST_struct/psmgbase3d.jobs
old mode 100644
new mode 100755
index be5313d4..a2ac00f5
--- a/external/hypre/src/test/TEST_struct/psmgbase3d.jobs
+++ b/external/hypre/src/test/TEST_struct/psmgbase3d.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_struct/psmgbase3d.saved.ray b/external/hypre/src/test/TEST_struct/psmgbase3d.saved.florentia
similarity index 100%
rename from external/hypre/src/test/TEST_struct/psmgbase3d.saved.ray
rename to external/hypre/src/test/TEST_struct/psmgbase3d.saved.florentia
diff --git a/external/hypre/src/test/TEST_struct/psmgbase3d.saved.lassen_cpu b/external/hypre/src/test/TEST_struct/psmgbase3d.saved.lassen_cpu
new file mode 100644
index 00000000..4fb7bfe5
--- /dev/null
+++ b/external/hypre/src/test/TEST_struct/psmgbase3d.saved.lassen_cpu
@@ -0,0 +1,20 @@
+# Output file: psmgbase3d.out.0
+Iterations = 6
+Final Relative Residual Norm = 7.016404e-07
+
+# Output file: psmgbase3d.out.1
+Iterations = 6
+Final Relative Residual Norm = 7.016404e-07
+
+# Output file: psmgbase3d.out.2
+Iterations = 6
+Final Relative Residual Norm = 7.016404e-07
+
+# Output file: psmgbase3d.out.3
+Iterations = 6
+Final Relative Residual Norm = 7.016404e-07
+
+# Output file: psmgbase3d.out.4
+Iterations = 6
+Final Relative Residual Norm = 7.016404e-07
+
diff --git a/external/hypre/src/test/TEST_struct/psmgbase3d.saved.tioga b/external/hypre/src/test/TEST_struct/psmgbase3d.saved.tioga
new file mode 100644
index 00000000..4fb7bfe5
--- /dev/null
+++ b/external/hypre/src/test/TEST_struct/psmgbase3d.saved.tioga
@@ -0,0 +1,20 @@
+# Output file: psmgbase3d.out.0
+Iterations = 6
+Final Relative Residual Norm = 7.016404e-07
+
+# Output file: psmgbase3d.out.1
+Iterations = 6
+Final Relative Residual Norm = 7.016404e-07
+
+# Output file: psmgbase3d.out.2
+Iterations = 6
+Final Relative Residual Norm = 7.016404e-07
+
+# Output file: psmgbase3d.out.3
+Iterations = 6
+Final Relative Residual Norm = 7.016404e-07
+
+# Output file: psmgbase3d.out.4
+Iterations = 6
+Final Relative Residual Norm = 7.016404e-07
+
diff --git a/external/hypre/src/test/TEST_struct/psmgbase3d.sh b/external/hypre/src/test/TEST_struct/psmgbase3d.sh
old mode 100644
new mode 100755
index 69b3ef13..812157e0
--- a/external/hypre/src/test/TEST_struct/psmgbase3d.sh
+++ b/external/hypre/src/test/TEST_struct/psmgbase3d.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_struct/psmgtest3d.jobs b/external/hypre/src/test/TEST_struct/psmgtest3d.jobs
old mode 100644
new mode 100755
index c8dfad97..0dd18154
--- a/external/hypre/src/test/TEST_struct/psmgtest3d.jobs
+++ b/external/hypre/src/test/TEST_struct/psmgtest3d.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_struct/psmgtest3d.saved.ray b/external/hypre/src/test/TEST_struct/psmgtest3d.saved.florentia
similarity index 100%
rename from external/hypre/src/test/TEST_struct/psmgtest3d.saved.ray
rename to external/hypre/src/test/TEST_struct/psmgtest3d.saved.florentia
diff --git a/external/hypre/src/test/TEST_struct/psmgtest3d.saved.lassen_cpu b/external/hypre/src/test/TEST_struct/psmgtest3d.saved.lassen_cpu
new file mode 100644
index 00000000..1f7fa836
--- /dev/null
+++ b/external/hypre/src/test/TEST_struct/psmgtest3d.saved.lassen_cpu
@@ -0,0 +1,8 @@
+# Output file: psmgtest3d.out.0
+Iterations = 5
+Final Relative Residual Norm = 6.944705e-08
+
+# Output file: psmgtest3d.out.1
+Iterations = 5
+Final Relative Residual Norm = 6.944705e-08
+
diff --git a/external/hypre/src/test/TEST_struct/psmgtest3d.saved.tioga b/external/hypre/src/test/TEST_struct/psmgtest3d.saved.tioga
new file mode 100644
index 00000000..1f7fa836
--- /dev/null
+++ b/external/hypre/src/test/TEST_struct/psmgtest3d.saved.tioga
@@ -0,0 +1,8 @@
+# Output file: psmgtest3d.out.0
+Iterations = 5
+Final Relative Residual Norm = 6.944705e-08
+
+# Output file: psmgtest3d.out.1
+Iterations = 5
+Final Relative Residual Norm = 6.944705e-08
+
diff --git a/external/hypre/src/test/TEST_struct/psmgtest3d.sh b/external/hypre/src/test/TEST_struct/psmgtest3d.sh
old mode 100644
new mode 100755
index 241d864e..41d977ec
--- a/external/hypre/src/test/TEST_struct/psmgtest3d.sh
+++ b/external/hypre/src/test/TEST_struct/psmgtest3d.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_struct/smgbase1d.jobs b/external/hypre/src/test/TEST_struct/smgbase1d.jobs
old mode 100644
new mode 100755
index 2f4d2a3a..1e3f1bfb
--- a/external/hypre/src/test/TEST_struct/smgbase1d.jobs
+++ b/external/hypre/src/test/TEST_struct/smgbase1d.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_struct/smgbase1d.saved.ray b/external/hypre/src/test/TEST_struct/smgbase1d.saved.florentia
similarity index 100%
rename from external/hypre/src/test/TEST_struct/smgbase1d.saved.ray
rename to external/hypre/src/test/TEST_struct/smgbase1d.saved.florentia
diff --git a/external/hypre/src/test/TEST_struct/smgbase1d.saved.lassen_cpu b/external/hypre/src/test/TEST_struct/smgbase1d.saved.lassen_cpu
new file mode 100644
index 00000000..5a24e4ac
--- /dev/null
+++ b/external/hypre/src/test/TEST_struct/smgbase1d.saved.lassen_cpu
@@ -0,0 +1,8 @@
+# Output file: smgbase1d.out.0
+Iterations = 1
+Final Relative Residual Norm = 0.000000e+00
+
+# Output file: smgbase1d.out.1
+Iterations = 1
+Final Relative Residual Norm = 0.000000e+00
+
diff --git a/external/hypre/src/test/TEST_struct/smgbase1d.saved.tioga b/external/hypre/src/test/TEST_struct/smgbase1d.saved.tioga
new file mode 100644
index 00000000..5a24e4ac
--- /dev/null
+++ b/external/hypre/src/test/TEST_struct/smgbase1d.saved.tioga
@@ -0,0 +1,8 @@
+# Output file: smgbase1d.out.0
+Iterations = 1
+Final Relative Residual Norm = 0.000000e+00
+
+# Output file: smgbase1d.out.1
+Iterations = 1
+Final Relative Residual Norm = 0.000000e+00
+
diff --git a/external/hypre/src/test/TEST_struct/smgbase1d.sh b/external/hypre/src/test/TEST_struct/smgbase1d.sh
old mode 100644
new mode 100755
index f3a37236..336c76e8
--- a/external/hypre/src/test/TEST_struct/smgbase1d.sh
+++ b/external/hypre/src/test/TEST_struct/smgbase1d.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_struct/smgbase2d.jobs b/external/hypre/src/test/TEST_struct/smgbase2d.jobs
old mode 100644
new mode 100755
index 4d84cbde..e33a2479
--- a/external/hypre/src/test/TEST_struct/smgbase2d.jobs
+++ b/external/hypre/src/test/TEST_struct/smgbase2d.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_struct/smgbase2d.saved.ray b/external/hypre/src/test/TEST_struct/smgbase2d.saved.florentia
similarity index 100%
rename from external/hypre/src/test/TEST_struct/smgbase2d.saved.ray
rename to external/hypre/src/test/TEST_struct/smgbase2d.saved.florentia
diff --git a/external/hypre/src/test/TEST_struct/smgbase2d.saved.lassen_cpu b/external/hypre/src/test/TEST_struct/smgbase2d.saved.lassen_cpu
new file mode 100644
index 00000000..fcde9fd3
--- /dev/null
+++ b/external/hypre/src/test/TEST_struct/smgbase2d.saved.lassen_cpu
@@ -0,0 +1,20 @@
+# Output file: smgbase2d.out.0
+Iterations = 5
+Final Relative Residual Norm = 2.468039e-07
+
+# Output file: smgbase2d.out.1
+Iterations = 5
+Final Relative Residual Norm = 2.468039e-07
+
+# Output file: smgbase2d.out.2
+Iterations = 5
+Final Relative Residual Norm = 2.468039e-07
+
+# Output file: smgbase2d.out.3
+Iterations = 5
+Final Relative Residual Norm = 2.468039e-07
+
+# Output file: smgbase2d.out.4
+Iterations = 5
+Final Relative Residual Norm = 2.468039e-07
+
diff --git a/external/hypre/src/test/TEST_struct/smgbase2d.saved.tioga b/external/hypre/src/test/TEST_struct/smgbase2d.saved.tioga
new file mode 100644
index 00000000..fcde9fd3
--- /dev/null
+++ b/external/hypre/src/test/TEST_struct/smgbase2d.saved.tioga
@@ -0,0 +1,20 @@
+# Output file: smgbase2d.out.0
+Iterations = 5
+Final Relative Residual Norm = 2.468039e-07
+
+# Output file: smgbase2d.out.1
+Iterations = 5
+Final Relative Residual Norm = 2.468039e-07
+
+# Output file: smgbase2d.out.2
+Iterations = 5
+Final Relative Residual Norm = 2.468039e-07
+
+# Output file: smgbase2d.out.3
+Iterations = 5
+Final Relative Residual Norm = 2.468039e-07
+
+# Output file: smgbase2d.out.4
+Iterations = 5
+Final Relative Residual Norm = 2.468039e-07
+
diff --git a/external/hypre/src/test/TEST_struct/smgbase2d.sh b/external/hypre/src/test/TEST_struct/smgbase2d.sh
old mode 100644
new mode 100755
index eea81468..8a50ddd4
--- a/external/hypre/src/test/TEST_struct/smgbase2d.sh
+++ b/external/hypre/src/test/TEST_struct/smgbase2d.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_struct/smgbase3d.jobs b/external/hypre/src/test/TEST_struct/smgbase3d.jobs
old mode 100644
new mode 100755
index fc3c4e89..92cec294
--- a/external/hypre/src/test/TEST_struct/smgbase3d.jobs
+++ b/external/hypre/src/test/TEST_struct/smgbase3d.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_struct/smgbase3d.saved.ray b/external/hypre/src/test/TEST_struct/smgbase3d.saved.florentia
similarity index 100%
rename from external/hypre/src/test/TEST_struct/smgbase3d.saved.ray
rename to external/hypre/src/test/TEST_struct/smgbase3d.saved.florentia
diff --git a/external/hypre/src/test/TEST_struct/smgbase3d.saved.lassen_cpu b/external/hypre/src/test/TEST_struct/smgbase3d.saved.lassen_cpu
new file mode 100644
index 00000000..c697ff44
--- /dev/null
+++ b/external/hypre/src/test/TEST_struct/smgbase3d.saved.lassen_cpu
@@ -0,0 +1,24 @@
+# Output file: smgbase3d.out.0
+Iterations = 4
+Final Relative Residual Norm = 8.971901e-07
+
+# Output file: smgbase3d.out.1
+Iterations = 4
+Final Relative Residual Norm = 8.971901e-07
+
+# Output file: smgbase3d.out.2
+Iterations = 4
+Final Relative Residual Norm = 8.971901e-07
+
+# Output file: smgbase3d.out.3
+Iterations = 4
+Final Relative Residual Norm = 8.971901e-07
+
+# Output file: smgbase3d.out.4
+Iterations = 4
+Final Relative Residual Norm = 8.971901e-07
+
+# Output file: smgbase3d.out.5
+Iterations = 4
+Final Relative Residual Norm = 8.971901e-07
+
diff --git a/external/hypre/src/test/TEST_struct/smgbase3d.saved.tioga b/external/hypre/src/test/TEST_struct/smgbase3d.saved.tioga
new file mode 100644
index 00000000..c697ff44
--- /dev/null
+++ b/external/hypre/src/test/TEST_struct/smgbase3d.saved.tioga
@@ -0,0 +1,24 @@
+# Output file: smgbase3d.out.0
+Iterations = 4
+Final Relative Residual Norm = 8.971901e-07
+
+# Output file: smgbase3d.out.1
+Iterations = 4
+Final Relative Residual Norm = 8.971901e-07
+
+# Output file: smgbase3d.out.2
+Iterations = 4
+Final Relative Residual Norm = 8.971901e-07
+
+# Output file: smgbase3d.out.3
+Iterations = 4
+Final Relative Residual Norm = 8.971901e-07
+
+# Output file: smgbase3d.out.4
+Iterations = 4
+Final Relative Residual Norm = 8.971901e-07
+
+# Output file: smgbase3d.out.5
+Iterations = 4
+Final Relative Residual Norm = 8.971901e-07
+
diff --git a/external/hypre/src/test/TEST_struct/smgbase3d.sh b/external/hypre/src/test/TEST_struct/smgbase3d.sh
old mode 100644
new mode 100755
index ef132596..5396f1bc
--- a/external/hypre/src/test/TEST_struct/smgbase3d.sh
+++ b/external/hypre/src/test/TEST_struct/smgbase3d.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_struct/smgtest1d.jobs b/external/hypre/src/test/TEST_struct/smgtest1d.jobs
old mode 100644
new mode 100755
index 7e5c36fe..c25f00fe
--- a/external/hypre/src/test/TEST_struct/smgtest1d.jobs
+++ b/external/hypre/src/test/TEST_struct/smgtest1d.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_struct/smgtest1d.saved.ray b/external/hypre/src/test/TEST_struct/smgtest1d.saved.florentia
similarity index 100%
rename from external/hypre/src/test/TEST_struct/smgtest1d.saved.ray
rename to external/hypre/src/test/TEST_struct/smgtest1d.saved.florentia
diff --git a/external/hypre/src/test/TEST_struct/smgtest1d.saved.lassen_cpu b/external/hypre/src/test/TEST_struct/smgtest1d.saved.lassen_cpu
new file mode 100644
index 00000000..fdf7e64d
--- /dev/null
+++ b/external/hypre/src/test/TEST_struct/smgtest1d.saved.lassen_cpu
@@ -0,0 +1,12 @@
+# Output file: smgtest1d.out.0
+Iterations = 1
+Final Relative Residual Norm = 0.000000e+00
+
+# Output file: smgtest1d.out.1
+Iterations = 1
+Final Relative Residual Norm = 0.000000e+00
+
+# Output file: smgtest1d.out.2
+Iterations = 1
+Final Relative Residual Norm = 0.000000e+00
+
diff --git a/external/hypre/src/test/TEST_struct/smgtest1d.saved.tioga b/external/hypre/src/test/TEST_struct/smgtest1d.saved.tioga
new file mode 100644
index 00000000..fdf7e64d
--- /dev/null
+++ b/external/hypre/src/test/TEST_struct/smgtest1d.saved.tioga
@@ -0,0 +1,12 @@
+# Output file: smgtest1d.out.0
+Iterations = 1
+Final Relative Residual Norm = 0.000000e+00
+
+# Output file: smgtest1d.out.1
+Iterations = 1
+Final Relative Residual Norm = 0.000000e+00
+
+# Output file: smgtest1d.out.2
+Iterations = 1
+Final Relative Residual Norm = 0.000000e+00
+
diff --git a/external/hypre/src/test/TEST_struct/smgtest1d.sh b/external/hypre/src/test/TEST_struct/smgtest1d.sh
old mode 100644
new mode 100755
index 3c0d252b..cffd1304
--- a/external/hypre/src/test/TEST_struct/smgtest1d.sh
+++ b/external/hypre/src/test/TEST_struct/smgtest1d.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_struct/smgvcycle.jobs b/external/hypre/src/test/TEST_struct/smgvcycle.jobs
old mode 100644
new mode 100755
index d0f724e9..5f6ab6dc
--- a/external/hypre/src/test/TEST_struct/smgvcycle.jobs
+++ b/external/hypre/src/test/TEST_struct/smgvcycle.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_struct/smgvcycle.saved.ray b/external/hypre/src/test/TEST_struct/smgvcycle.saved.florentia
similarity index 100%
rename from external/hypre/src/test/TEST_struct/smgvcycle.saved.ray
rename to external/hypre/src/test/TEST_struct/smgvcycle.saved.florentia
diff --git a/external/hypre/src/test/TEST_struct/smgvcycle.saved.lassen_cpu b/external/hypre/src/test/TEST_struct/smgvcycle.saved.lassen_cpu
new file mode 100644
index 00000000..0e5dfa13
--- /dev/null
+++ b/external/hypre/src/test/TEST_struct/smgvcycle.saved.lassen_cpu
@@ -0,0 +1,4 @@
+# Output file: smgvcycle.out.0
+Iterations = 7
+Final Relative Residual Norm = 3.621850e-07
+
diff --git a/external/hypre/src/test/TEST_struct/smgvcycle.saved.tioga b/external/hypre/src/test/TEST_struct/smgvcycle.saved.tioga
new file mode 100644
index 00000000..0e5dfa13
--- /dev/null
+++ b/external/hypre/src/test/TEST_struct/smgvcycle.saved.tioga
@@ -0,0 +1,4 @@
+# Output file: smgvcycle.out.0
+Iterations = 7
+Final Relative Residual Norm = 3.621850e-07
+
diff --git a/external/hypre/src/test/TEST_struct/smgvcycle.sh b/external/hypre/src/test/TEST_struct/smgvcycle.sh
old mode 100644
new mode 100755
index a42e6027..298c3ab2
--- a/external/hypre/src/test/TEST_struct/smgvcycle.sh
+++ b/external/hypre/src/test/TEST_struct/smgvcycle.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_struct/solvers.jobs b/external/hypre/src/test/TEST_struct/solvers.jobs
old mode 100644
new mode 100755
index 2597b2dc..c53d8961
--- a/external/hypre/src/test/TEST_struct/solvers.jobs
+++ b/external/hypre/src/test/TEST_struct/solvers.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_struct/solvers.saved.ray b/external/hypre/src/test/TEST_struct/solvers.saved.florentia
similarity index 100%
rename from external/hypre/src/test/TEST_struct/solvers.saved.ray
rename to external/hypre/src/test/TEST_struct/solvers.saved.florentia
diff --git a/external/hypre/src/test/TEST_struct/solvers.saved.lassen_cpu b/external/hypre/src/test/TEST_struct/solvers.saved.lassen_cpu
new file mode 100644
index 00000000..9def633b
--- /dev/null
+++ b/external/hypre/src/test/TEST_struct/solvers.saved.lassen_cpu
@@ -0,0 +1,20 @@
+# Output file: solvers.out.0
+Iterations = 4
+Final Relative Residual Norm = 7.846564e-07
+
+# Output file: solvers.out.1
+Iterations = 8
+Final Relative Residual Norm = 5.298596e-07
+
+# Output file: solvers.out.2
+Iterations = 20
+Final Relative Residual Norm = 6.913376e-07
+
+# Output file: solvers.out.3
+Iterations = 20
+Final Relative Residual Norm = 5.962015e-07
+
+# Output file: solvers.out.4
+Iterations = 20
+Final Relative Residual Norm = 5.962015e-07
+
diff --git a/external/hypre/src/test/TEST_struct/solvers.saved.tioga b/external/hypre/src/test/TEST_struct/solvers.saved.tioga
new file mode 100644
index 00000000..9def633b
--- /dev/null
+++ b/external/hypre/src/test/TEST_struct/solvers.saved.tioga
@@ -0,0 +1,20 @@
+# Output file: solvers.out.0
+Iterations = 4
+Final Relative Residual Norm = 7.846564e-07
+
+# Output file: solvers.out.1
+Iterations = 8
+Final Relative Residual Norm = 5.298596e-07
+
+# Output file: solvers.out.2
+Iterations = 20
+Final Relative Residual Norm = 6.913376e-07
+
+# Output file: solvers.out.3
+Iterations = 20
+Final Relative Residual Norm = 5.962015e-07
+
+# Output file: solvers.out.4
+Iterations = 20
+Final Relative Residual Norm = 5.962015e-07
+
diff --git a/external/hypre/src/test/TEST_struct/solvers.sh b/external/hypre/src/test/TEST_struct/solvers.sh
old mode 100644
new mode 100755
index b6f73f39..b563bb85
--- a/external/hypre/src/test/TEST_struct/solvers.sh
+++ b/external/hypre/src/test/TEST_struct/solvers.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_struct/vcpfmgRedBlackGS.jobs b/external/hypre/src/test/TEST_struct/vcpfmgRedBlackGS.jobs
old mode 100644
new mode 100755
index 12f75304..1e599a31
--- a/external/hypre/src/test/TEST_struct/vcpfmgRedBlackGS.jobs
+++ b/external/hypre/src/test/TEST_struct/vcpfmgRedBlackGS.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_struct/vcpfmgRedBlackGS.saved.ray b/external/hypre/src/test/TEST_struct/vcpfmgRedBlackGS.saved.florentia
similarity index 100%
rename from external/hypre/src/test/TEST_struct/vcpfmgRedBlackGS.saved.ray
rename to external/hypre/src/test/TEST_struct/vcpfmgRedBlackGS.saved.florentia
diff --git a/external/hypre/src/test/TEST_struct/vcpfmgRedBlackGS.saved.lassen_cpu b/external/hypre/src/test/TEST_struct/vcpfmgRedBlackGS.saved.lassen_cpu
new file mode 100644
index 00000000..b288a3b4
--- /dev/null
+++ b/external/hypre/src/test/TEST_struct/vcpfmgRedBlackGS.saved.lassen_cpu
@@ -0,0 +1,48 @@
+# Output file: vcpfmgRedBlackGS.out.0
+Iterations = 5
+Final Relative Residual Norm = 3.344527e-07
+
+# Output file: vcpfmgRedBlackGS.out.1
+Iterations = 5
+Final Relative Residual Norm = 3.344527e-07
+
+# Output file: vcpfmgRedBlackGS.out.2
+Iterations = 5
+Final Relative Residual Norm = 3.344527e-07
+
+# Output file: vcpfmgRedBlackGS.out.3
+Iterations = 5
+Final Relative Residual Norm = 3.344527e-07
+
+# Output file: vcpfmgRedBlackGS.out.4
+Iterations = 5
+Final Relative Residual Norm = 3.344527e-07
+
+# Output file: vcpfmgRedBlackGS.out.5
+Iterations = 5
+Final Relative Residual Norm = 3.344527e-07
+
+# Output file: vcpfmgRedBlackGS.out.6
+Iterations = 10
+Final Relative Residual Norm = 5.540991e-07
+
+# Output file: vcpfmgRedBlackGS.out.7
+Iterations = 10
+Final Relative Residual Norm = 5.540991e-07
+
+# Output file: vcpfmgRedBlackGS.out.8
+Iterations = 10
+Final Relative Residual Norm = 5.540991e-07
+
+# Output file: vcpfmgRedBlackGS.out.9
+Iterations = 10
+Final Relative Residual Norm = 5.540991e-07
+
+# Output file: vcpfmgRedBlackGS.out.10
+Iterations = 10
+Final Relative Residual Norm = 5.540991e-07
+
+# Output file: vcpfmgRedBlackGS.out.11
+Iterations = 10
+Final Relative Residual Norm = 5.540991e-07
+
diff --git a/external/hypre/src/test/TEST_struct/vcpfmgRedBlackGS.saved.tioga b/external/hypre/src/test/TEST_struct/vcpfmgRedBlackGS.saved.tioga
new file mode 100644
index 00000000..b288a3b4
--- /dev/null
+++ b/external/hypre/src/test/TEST_struct/vcpfmgRedBlackGS.saved.tioga
@@ -0,0 +1,48 @@
+# Output file: vcpfmgRedBlackGS.out.0
+Iterations = 5
+Final Relative Residual Norm = 3.344527e-07
+
+# Output file: vcpfmgRedBlackGS.out.1
+Iterations = 5
+Final Relative Residual Norm = 3.344527e-07
+
+# Output file: vcpfmgRedBlackGS.out.2
+Iterations = 5
+Final Relative Residual Norm = 3.344527e-07
+
+# Output file: vcpfmgRedBlackGS.out.3
+Iterations = 5
+Final Relative Residual Norm = 3.344527e-07
+
+# Output file: vcpfmgRedBlackGS.out.4
+Iterations = 5
+Final Relative Residual Norm = 3.344527e-07
+
+# Output file: vcpfmgRedBlackGS.out.5
+Iterations = 5
+Final Relative Residual Norm = 3.344527e-07
+
+# Output file: vcpfmgRedBlackGS.out.6
+Iterations = 10
+Final Relative Residual Norm = 5.540991e-07
+
+# Output file: vcpfmgRedBlackGS.out.7
+Iterations = 10
+Final Relative Residual Norm = 5.540991e-07
+
+# Output file: vcpfmgRedBlackGS.out.8
+Iterations = 10
+Final Relative Residual Norm = 5.540991e-07
+
+# Output file: vcpfmgRedBlackGS.out.9
+Iterations = 10
+Final Relative Residual Norm = 5.540991e-07
+
+# Output file: vcpfmgRedBlackGS.out.10
+Iterations = 10
+Final Relative Residual Norm = 5.540991e-07
+
+# Output file: vcpfmgRedBlackGS.out.11
+Iterations = 10
+Final Relative Residual Norm = 5.540991e-07
+
diff --git a/external/hypre/src/test/TEST_struct/vcpfmgRedBlackGS.sh b/external/hypre/src/test/TEST_struct/vcpfmgRedBlackGS.sh
old mode 100644
new mode 100755
index 0cc4dd37..c097512a
--- a/external/hypre/src/test/TEST_struct/vcpfmgRedBlackGS.sh
+++ b/external/hypre/src/test/TEST_struct/vcpfmgRedBlackGS.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_struct/vdpfmgRedBlackGS.jobs b/external/hypre/src/test/TEST_struct/vdpfmgRedBlackGS.jobs
old mode 100644
new mode 100755
index c6f52234..4a7616e1
--- a/external/hypre/src/test/TEST_struct/vdpfmgRedBlackGS.jobs
+++ b/external/hypre/src/test/TEST_struct/vdpfmgRedBlackGS.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_struct/vdpfmgRedBlackGS.saved.ray b/external/hypre/src/test/TEST_struct/vdpfmgRedBlackGS.saved.florentia
similarity index 100%
rename from external/hypre/src/test/TEST_struct/vdpfmgRedBlackGS.saved.ray
rename to external/hypre/src/test/TEST_struct/vdpfmgRedBlackGS.saved.florentia
diff --git a/external/hypre/src/test/TEST_struct/vdpfmgRedBlackGS.saved.lassen_cpu b/external/hypre/src/test/TEST_struct/vdpfmgRedBlackGS.saved.lassen_cpu
new file mode 100644
index 00000000..944a7308
--- /dev/null
+++ b/external/hypre/src/test/TEST_struct/vdpfmgRedBlackGS.saved.lassen_cpu
@@ -0,0 +1,48 @@
+# Output file: vdpfmgRedBlackGS.out.0
+Iterations = 5
+Final Relative Residual Norm = 1.616480e-07
+
+# Output file: vdpfmgRedBlackGS.out.1
+Iterations = 5
+Final Relative Residual Norm = 1.616480e-07
+
+# Output file: vdpfmgRedBlackGS.out.2
+Iterations = 5
+Final Relative Residual Norm = 1.616480e-07
+
+# Output file: vdpfmgRedBlackGS.out.3
+Iterations = 5
+Final Relative Residual Norm = 1.616480e-07
+
+# Output file: vdpfmgRedBlackGS.out.4
+Iterations = 5
+Final Relative Residual Norm = 1.616480e-07
+
+# Output file: vdpfmgRedBlackGS.out.5
+Iterations = 5
+Final Relative Residual Norm = 1.616480e-07
+
+# Output file: vdpfmgRedBlackGS.out.6
+Iterations = 9
+Final Relative Residual Norm = 8.392336e-07
+
+# Output file: vdpfmgRedBlackGS.out.7
+Iterations = 9
+Final Relative Residual Norm = 8.392336e-07
+
+# Output file: vdpfmgRedBlackGS.out.8
+Iterations = 9
+Final Relative Residual Norm = 8.392336e-07
+
+# Output file: vdpfmgRedBlackGS.out.9
+Iterations = 9
+Final Relative Residual Norm = 8.392336e-07
+
+# Output file: vdpfmgRedBlackGS.out.10
+Iterations = 9
+Final Relative Residual Norm = 8.392336e-07
+
+# Output file: vdpfmgRedBlackGS.out.11
+Iterations = 9
+Final Relative Residual Norm = 8.392336e-07
+
diff --git a/external/hypre/src/test/TEST_struct/vdpfmgRedBlackGS.saved.tioga b/external/hypre/src/test/TEST_struct/vdpfmgRedBlackGS.saved.tioga
new file mode 100644
index 00000000..944a7308
--- /dev/null
+++ b/external/hypre/src/test/TEST_struct/vdpfmgRedBlackGS.saved.tioga
@@ -0,0 +1,48 @@
+# Output file: vdpfmgRedBlackGS.out.0
+Iterations = 5
+Final Relative Residual Norm = 1.616480e-07
+
+# Output file: vdpfmgRedBlackGS.out.1
+Iterations = 5
+Final Relative Residual Norm = 1.616480e-07
+
+# Output file: vdpfmgRedBlackGS.out.2
+Iterations = 5
+Final Relative Residual Norm = 1.616480e-07
+
+# Output file: vdpfmgRedBlackGS.out.3
+Iterations = 5
+Final Relative Residual Norm = 1.616480e-07
+
+# Output file: vdpfmgRedBlackGS.out.4
+Iterations = 5
+Final Relative Residual Norm = 1.616480e-07
+
+# Output file: vdpfmgRedBlackGS.out.5
+Iterations = 5
+Final Relative Residual Norm = 1.616480e-07
+
+# Output file: vdpfmgRedBlackGS.out.6
+Iterations = 9
+Final Relative Residual Norm = 8.392336e-07
+
+# Output file: vdpfmgRedBlackGS.out.7
+Iterations = 9
+Final Relative Residual Norm = 8.392336e-07
+
+# Output file: vdpfmgRedBlackGS.out.8
+Iterations = 9
+Final Relative Residual Norm = 8.392336e-07
+
+# Output file: vdpfmgRedBlackGS.out.9
+Iterations = 9
+Final Relative Residual Norm = 8.392336e-07
+
+# Output file: vdpfmgRedBlackGS.out.10
+Iterations = 9
+Final Relative Residual Norm = 8.392336e-07
+
+# Output file: vdpfmgRedBlackGS.out.11
+Iterations = 9
+Final Relative Residual Norm = 8.392336e-07
+
diff --git a/external/hypre/src/test/TEST_struct/vdpfmgRedBlackGS.sh b/external/hypre/src/test/TEST_struct/vdpfmgRedBlackGS.sh
old mode 100644
new mode 100755
index 0cc4dd37..c097512a
--- a/external/hypre/src/test/TEST_struct/vdpfmgRedBlackGS.sh
+++ b/external/hypre/src/test/TEST_struct/vdpfmgRedBlackGS.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_struct/versioncheck.jobs b/external/hypre/src/test/TEST_struct/versioncheck.jobs
new file mode 100755
index 00000000..59920c3b
--- /dev/null
+++ b/external/hypre/src/test/TEST_struct/versioncheck.jobs
@@ -0,0 +1,12 @@
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+#=============================================================================
+# Check the version header file variables
+#=============================================================================
+
+mpirun -np 1 ./struct > versioncheck.out.1
+
diff --git a/external/hypre/src/test/TEST_struct/versioncheck.sh b/external/hypre/src/test/TEST_struct/versioncheck.sh
new file mode 100755
index 00000000..87db6aaf
--- /dev/null
+++ b/external/hypre/src/test/TEST_struct/versioncheck.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+TNAME=`basename $0 .sh`
+
+#=============================================================================
+# Check the HYPRE_DEVELOP variables
+#=============================================================================
+
+grep "Using HYPRE_DEVELOP_STRING" ${TNAME}.out.1 > ${TNAME}.testdata
+
+echo -n > ${TNAME}.testdatacheck
+if [ -d ../../../.git ]; then
+  DEVSTRING=`git describe --match 'v*' --long --abbrev=9 2>/dev/null`
+  DEVNUMBER=`echo $DEVSTRING | awk -F- '{print $2}'`
+  DEVBRANCH=`git rev-parse --abbrev-ref HEAD`
+  if [ -n "$DEVSTRING" ]; then
+    if [ "$DEVBRANCH" != "master" ]; then
+      echo "Using HYPRE_DEVELOP_STRING: $DEVSTRING (branch $DEVBRANCH; not the develop branch)" \
+       > ${TNAME}.testdatacheck
+    else
+      echo "Using HYPRE_DEVELOP_STRING: $DEVSTRING (branch $DEVBRANCH; the develop branch)" \
+       > ${TNAME}.testdatacheck
+    fi
+  fi
+fi
+diff ${TNAME}.testdata ${TNAME}.testdatacheck >&2
+
+#=============================================================================
+# remove temporary files
+#=============================================================================
+
+rm -f ${TNAME}.testdata*
diff --git a/external/hypre/src/test/TEST_superlu/sludist.jobs b/external/hypre/src/test/TEST_superlu/sludist.jobs
old mode 100644
new mode 100755
index f0237268..7b25fee5
--- a/external/hypre/src/test/TEST_superlu/sludist.jobs
+++ b/external/hypre/src/test/TEST_superlu/sludist.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_superlu/sludist.saved b/external/hypre/src/test/TEST_superlu/sludist.saved
index becd6519..da8f6af4 100644
--- a/external/hypre/src/test/TEST_superlu/sludist.saved
+++ b/external/hypre/src/test/TEST_superlu/sludist.saved
@@ -14,5 +14,5 @@ Final Relative Residual Norm = 3.172597e-08
 
 
 GMRES Iterations = 8
-Final GMRES Relative Residual Norm = 5.973547e-08
+Final GMRES Relative Residual Norm = 5.950181e-08
 
diff --git a/external/hypre/src/test/TEST_superlu/sludist.sh b/external/hypre/src/test/TEST_superlu/sludist.sh
old mode 100644
new mode 100755
index 1b60265a..5db3fe8a
--- a/external/hypre/src/test/TEST_superlu/sludist.sh
+++ b/external/hypre/src/test/TEST_superlu/sludist.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_timing/efficiency.jobs b/external/hypre/src/test/TEST_timing/efficiency.jobs
old mode 100644
new mode 100755
index 3e8663ec..22a08e95
--- a/external/hypre/src/test/TEST_timing/efficiency.jobs
+++ b/external/hypre/src/test/TEST_timing/efficiency.jobs
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/TEST_timing/efficiency.sh b/external/hypre/src/test/TEST_timing/efficiency.sh
old mode 100644
new mode 100755
index 4f3fa254..54a294b8
--- a/external/hypre/src/test/TEST_timing/efficiency.sh
+++ b/external/hypre/src/test/TEST_timing/efficiency.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/ams_driver.c b/external/hypre/src/test/ams_driver.c
index 1ec8ca14..78ac7050 100644
--- a/external/hypre/src/test/ams_driver.c
+++ b/external/hypre/src/test/ams_driver.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -18,14 +18,18 @@
 #include "_hypre_parcsr_ls.h"
 #include "_hypre_IJ_mv.h"
 #include "HYPRE.h"
+#if defined(HYPRE_USING_CUSPARSE)
+#define DISABLE_CUSPARSE_DEPRECATED
+#include <cusparse.h>
+#endif
 
 void CheckIfFileExists(char *file)
 {
    FILE *test;
-   if (!(test = fopen(file,"r")))
+   if (!(test = fopen(file, "r")))
    {
       hypre_MPI_Finalize();
-      hypre_printf("Can't find the input file \"%s\"\n",file);
+      hypre_printf("Can't find the input file \"%s\"\n", file);
       exit(1);
    }
    fclose(test);
@@ -35,14 +39,14 @@ void AMSDriverMatrixRead(const char *file, HYPRE_ParCSRMatrix *A)
 {
    FILE *test;
    char file0[100];
-   sprintf(file0,"%s.D.0",file);
-   if (!(test = fopen(file0,"r")))
+   sprintf(file0, "%s.D.0", file);
+   if (!(test = fopen(file0, "r")))
    {
-      sprintf(file0,"%s.00000",file);
-      if (!(test = fopen(file0,"r")))
+      sprintf(file0, "%s.00000", file);
+      if (!(test = fopen(file0, "r")))
       {
          hypre_MPI_Finalize();
-         hypre_printf("Can't find the input file \"%s\"\n",file);
+         hypre_printf("Can't find the input file \"%s\"\n", file);
          exit(1);
       }
       else /* Read in IJ format*/
@@ -67,14 +71,14 @@ void AMSDriverVectorRead(const char *file, HYPRE_ParVector *x)
 {
    FILE *test;
    char file0[100];
-   sprintf(file0,"%s.0",file);
-   if (!(test = fopen(file0,"r")))
+   sprintf(file0, "%s.0", file);
+   if (!(test = fopen(file0, "r")))
    {
-      sprintf(file0,"%s.00000",file);
-      if (!(test = fopen(file0,"r")))
+      sprintf(file0, "%s.00000", file);
+      if (!(test = fopen(file0, "r")))
       {
          hypre_MPI_Finalize();
-         hypre_printf("Can't find the input file \"%s\"\n",file);
+         hypre_printf("Can't find the input file \"%s\"\n", file);
          exit(1);
       }
       else /* Read in IJ format*/
@@ -95,13 +99,15 @@ void AMSDriverVectorRead(const char *file, HYPRE_ParVector *x)
    fclose(test);
 }
 
-hypre_int main (hypre_int argc, char *argv[])
+hypre_int
+main (hypre_int argc,
+      char *argv[])
 {
    HYPRE_Int num_procs, myid;
    HYPRE_Int time_index;
 
    HYPRE_Int solver_id;
-   HYPRE_Int maxit, cycle_type, rlx_type, coarse_rlx_type, rlx_sweeps, dim;
+   HYPRE_Int maxit, pcg_maxit, cycle_type, rlx_type, coarse_rlx_type, rlx_sweeps, dim;
    HYPRE_Real rlx_weight, rlx_omega;
    HYPRE_Int amg_coarsen_type, amg_rlx_type, amg_agg_levels, amg_interp_type, amg_Pmax;
    HYPRE_Int h1_method, singular_problem, coordinates;
@@ -112,12 +118,21 @@ hypre_int main (hypre_int argc, char *argv[])
    HYPRE_Int blockSize;
    HYPRE_Solver solver, precond;
 
-   HYPRE_ParCSRMatrix A=0, G=0, Aalpha=0, Abeta=0, M=0;
-   HYPRE_ParVector x0=0, b=0;
-   HYPRE_ParVector Gx=0, Gy=0, Gz=0;
-   HYPRE_ParVector x=0, y=0, z=0;
+   HYPRE_ParCSRMatrix A = 0, G = 0, Aalpha = 0, Abeta = 0, M = 0;
+   HYPRE_ParVector x0 = 0, b = 0;
+   HYPRE_ParVector Gx = 0, Gy = 0, Gz = 0;
+   HYPRE_ParVector x = 0, y = 0, z = 0;
 
-   HYPRE_ParVector interior_nodes=0;
+   HYPRE_ParVector interior_nodes = 0;
+
+   /* default execution policy and memory space */
+#if defined(HYPRE_TEST_USING_HOST)
+   HYPRE_MemoryLocation memory_location = HYPRE_MEMORY_HOST;
+   HYPRE_ExecutionPolicy default_exec_policy = HYPRE_EXEC_HOST;
+#else
+   HYPRE_MemoryLocation memory_location = HYPRE_MEMORY_DEVICE;
+   HYPRE_ExecutionPolicy default_exec_policy = HYPRE_EXEC_DEVICE;
+#endif
 
    /* Initialize MPI */
    hypre_MPI_Init(&argc, &argv);
@@ -126,28 +141,40 @@ hypre_int main (hypre_int argc, char *argv[])
 
    /*-----------------------------------------------------------------
     * GPU Device binding
-    * Must be done before HYPRE_Init() and should not be changed after
+    * Must be done before HYPRE_Initialize() and should not be changed after
     *-----------------------------------------------------------------*/
-   hypre_bind_device(myid, num_procs, hypre_MPI_COMM_WORLD);
+   hypre_bind_device_id(-1, myid, num_procs, hypre_MPI_COMM_WORLD);
 
    /*-----------------------------------------------------------
     * Initialize : must be the first HYPRE function to call
     *-----------------------------------------------------------*/
-   HYPRE_Init();
+   HYPRE_Initialize();
+   HYPRE_DeviceInitialize();
+
+   /* default memory location */
+   HYPRE_SetMemoryLocation(memory_location);
 
    /* default execution policy */
-   HYPRE_SetExecutionPolicy(HYPRE_EXEC_DEVICE);
+   HYPRE_SetExecutionPolicy(default_exec_policy);
 
 #if defined(HYPRE_USING_GPU)
-   /* use cuSPARSE for SpGEMM */
-   HYPRE_SetSpGemmUseCusparse(0);
+#if defined(HYPRE_USING_CUSPARSE) && CUSPARSE_VERSION >= 11000
+   /* CUSPARSE_SPMV_ALG_DEFAULT doesn't provide deterministic results */
+   HYPRE_SetSpMVUseVendor(0);
+#endif
+   /* use vendor implementation for SpGEMM */
+   HYPRE_SetSpGemmUseVendor(0);
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_SetSpGemmUseVendor(1);
+#endif
    /* use cuRand for PMIS */
    HYPRE_SetUseGpuRand(1);
 #endif
 
    /* Set defaults */
    solver_id = 3;
-   maxit = 100;
+   maxit = 200;
+   pcg_maxit = 50;
    tol = 1e-6;
    dim = 3;
    coordinates = 0;
@@ -155,11 +182,17 @@ hypre_int main (hypre_int argc, char *argv[])
    singular_problem = 0;
    rlx_sweeps = 1;
    rlx_weight = 1.0; rlx_omega = 1.0;
-#if defined(HYPRE_USING_GPU)
-   cycle_type = 1; amg_coarsen_type =  8; amg_agg_levels = 1; amg_rlx_type = 8; coarse_rlx_type = 8, rlx_type = 2; /* PMIS */
-#else
-   cycle_type = 1; amg_coarsen_type = 10; amg_agg_levels = 1; amg_rlx_type = 8; coarse_rlx_type = 8, rlx_type = 2; /* HMIS-1 */
-#endif
+   if (hypre_GetExecPolicy1(memory_location) == HYPRE_EXEC_DEVICE)
+   {
+      cycle_type = 1; amg_coarsen_type = 8; amg_agg_levels = 1; amg_rlx_type = 18;
+      coarse_rlx_type = 18, rlx_type = 1; /* PMIS */
+   }
+   else
+   {
+      cycle_type = 1; amg_coarsen_type = 10; amg_agg_levels = 1; amg_rlx_type = 8;
+      coarse_rlx_type = 8, rlx_type = 2; /* HMIS-1 */
+   }
+
    /* cycle_type = 1; amg_coarsen_type = 10; amg_agg_levels = 0; amg_rlx_type = 3; */ /* HMIS-0 */
    /* cycle_type = 1; amg_coarsen_type = 8; amg_agg_levels = 1; amg_rlx_type = 3;  */ /* PMIS-1 */
    /* cycle_type = 1; amg_coarsen_type = 8; amg_agg_levels = 0; amg_rlx_type = 3;  */ /* PMIS-0 */
@@ -189,10 +222,15 @@ hypre_int main (hypre_int argc, char *argv[])
             arg_index++;
             maxit = atoi(argv[arg_index++]);
          }
+         else if ( strcmp(argv[arg_index], "-pcg_maxit") == 0 )
+         {
+            arg_index++;
+            pcg_maxit = atoi(argv[arg_index++]);
+         }
          else if ( strcmp(argv[arg_index], "-tol") == 0 )
          {
             arg_index++;
-            tol = atof(argv[arg_index++]);
+            tol = (HYPRE_Real)atof(argv[arg_index++]);
          }
          else if ( strcmp(argv[arg_index], "-type") == 0 )
          {
@@ -212,12 +250,12 @@ hypre_int main (hypre_int argc, char *argv[])
          else if ( strcmp(argv[arg_index], "-rlxw") == 0 )
          {
             arg_index++;
-            rlx_weight = atof(argv[arg_index++]);
+            rlx_weight = (HYPRE_Real)atof(argv[arg_index++]);
          }
          else if ( strcmp(argv[arg_index], "-rlxo") == 0 )
          {
             arg_index++;
-            rlx_omega = atof(argv[arg_index++]);
+            rlx_omega = (HYPRE_Real)atof(argv[arg_index++]);
          }
          else if ( strcmp(argv[arg_index], "-ctype") == 0 )
          {
@@ -272,7 +310,7 @@ hypre_int main (hypre_int argc, char *argv[])
          else if ( strcmp(argv[arg_index], "-theta") == 0 )
          {
             arg_index++;
-            theta = atof(argv[arg_index++]);
+            theta = (HYPRE_Real)atof(argv[arg_index++]);
          }
          else if ( strcmp(argv[arg_index], "-bsize") == 0 )
          {
@@ -282,7 +320,7 @@ hypre_int main (hypre_int argc, char *argv[])
          else if ( strcmp(argv[arg_index], "-rtol") == 0 )
          {
             arg_index++;
-            rtol = atof(argv[arg_index++]);
+            rtol = (HYPRE_Real)atof(argv[arg_index++]);
          }
          else if ( strcmp(argv[arg_index], "-rr") == 0 )
          {
@@ -306,44 +344,47 @@ hypre_int main (hypre_int argc, char *argv[])
       }
 
       if (argc == 1)
+      {
          print_usage = 1;
+      }
 
       if ((print_usage) && (myid == 0))
       {
-         hypre_printf("\n");
-         hypre_printf("Usage: mpirun -np <np> %s [<options>]\n", argv[0]);
-         hypre_printf("\n");
-         hypre_printf("  Hypre solvers options:                                       \n");
-         hypre_printf("    -solver <ID>         : solver ID                           \n");
-         hypre_printf("                           0  - AMG                            \n");
-         hypre_printf("                           1  - AMG-PCG                        \n");
-         hypre_printf("                           2  - AMS                            \n");
-         hypre_printf("                           3  - AMS-PCG (default)              \n");
-         hypre_printf("                           4  - DS-PCG                         \n");
-         hypre_printf("                           5  - AME eigensolver                \n");
-         hypre_printf("    -maxit <num>         : maximum number of iterations (100)  \n");
-         hypre_printf("    -tol <num>           : convergence tolerance (1e-6)        \n");
-         hypre_printf("\n");
-         hypre_printf("  AMS solver options:                                          \n");
-         hypre_printf("    -dim <num>           : space dimension                     \n");
-         hypre_printf("    -type <num>          : 3-level cycle type (0-8, 11-14)     \n");
-         hypre_printf("    -theta <num>         : BoomerAMG threshold (0.25)          \n");
-         hypre_printf("    -ctype <num>         : BoomerAMG coarsening type           \n");
-         hypre_printf("    -agg <num>           : Levels of BoomerAMG agg. coarsening \n");
-         hypre_printf("    -amgrlx <num>        : BoomerAMG relaxation type           \n");
-         hypre_printf("    -itype <num>         : BoomerAMG interpolation type        \n");
-         hypre_printf("    -pmax <num>          : BoomerAMG interpolation truncation  \n");
-         hypre_printf("    -rlx <num>           : relaxation type                     \n");
-         hypre_printf("    -rlxn <num>          : number of relaxation sweeps         \n");
-         hypre_printf("    -rlxw <num>          : damping parameter (usually <=1)     \n");
-         hypre_printf("    -rlxo <num>          : SOR parameter (usuallyin (0,2))     \n");
-         hypre_printf("    -coord               : use coordinate vectors              \n");
-         hypre_printf("    -h1                  : use block-diag Poisson solves       \n");
-         hypre_printf("    -sing                : curl-curl only (singular) problem   \n");
-         hypre_printf("\n");
-         hypre_printf("  AME eigensolver options:                                     \n");
-         hypre_printf("    -bsize<num>          : number of eigenvalues to compute    \n");
-         hypre_printf("\n");
+         hypre_printf("                                                                 \n");
+         hypre_printf("Usage: mpirun -np <np> %s [<options>]                            \n", argv[0]);
+         hypre_printf("                                                                 \n");
+         hypre_printf("  Hypre solvers options:                                         \n");
+         hypre_printf("    -solver <ID>         : solver ID                             \n");
+         hypre_printf("                           0  - AMG                              \n");
+         hypre_printf("                           1  - AMG-PCG                          \n");
+         hypre_printf("                           2  - AMS                              \n");
+         hypre_printf("                           3  - AMS-PCG (default)                \n");
+         hypre_printf("                           4  - DS-PCG                           \n");
+         hypre_printf("                           5  - AME eigensolver                  \n");
+         hypre_printf("    -maxit <num>         : maximum number of iterations (200)    \n");
+         hypre_printf("    -pcg_maxit <num>     : maximum number of PCG iterations (50) \n");
+         hypre_printf("    -tol <num>           : convergence tolerance (1e-6)          \n");
+         hypre_printf("                                                                 \n");
+         hypre_printf("  AMS solver options:                                            \n");
+         hypre_printf("    -dim <num>           : space dimension                       \n");
+         hypre_printf("    -type <num>          : 3-level cycle type (0-8, 11-14)       \n");
+         hypre_printf("    -theta <num>         : BoomerAMG threshold (0.25)            \n");
+         hypre_printf("    -ctype <num>         : BoomerAMG coarsening type             \n");
+         hypre_printf("    -agg <num>           : Levels of BoomerAMG agg. coarsening   \n");
+         hypre_printf("    -amgrlx <num>        : BoomerAMG relaxation type             \n");
+         hypre_printf("    -itype <num>         : BoomerAMG interpolation type          \n");
+         hypre_printf("    -pmax <num>          : BoomerAMG interpolation truncation    \n");
+         hypre_printf("    -rlx <num>           : relaxation type                       \n");
+         hypre_printf("    -rlxn <num>          : number of relaxation sweeps           \n");
+         hypre_printf("    -rlxw <num>          : damping parameter (usually <=1)       \n");
+         hypre_printf("    -rlxo <num>          : SOR parameter (usuallyin (0,2))       \n");
+         hypre_printf("    -coord               : use coordinate vectors                \n");
+         hypre_printf("    -h1                  : use block-diag Poisson solves         \n");
+         hypre_printf("    -sing                : curl-curl only (singular) problem     \n");
+         hypre_printf("                                                                 \n");
+         hypre_printf("  AME eigensolver options:                                       \n");
+         hypre_printf("    -bsize<num>          : number of eigenvalues to compute      \n");
+         hypre_printf("                                                                 \n");
       }
 
       if (print_usage)
@@ -353,6 +394,13 @@ hypre_int main (hypre_int argc, char *argv[])
       }
    }
 
+   /* RL: XXX force to use l1-jac for GPU
+    * TODO: change it back when GPU SpTrSV is fixed */
+   if (hypre_GetExecPolicy1(memory_location) == HYPRE_EXEC_DEVICE)
+   {
+      amg_rlx_type = 18;
+   }
+
    AMSDriverMatrixRead("mfem.A", &A);
    AMSDriverVectorRead("mfem.x0", &x0);
    AMSDriverVectorRead("mfem.b", &b);
@@ -364,7 +412,9 @@ hypre_int main (hypre_int argc, char *argv[])
       AMSDriverVectorRead("mfem.Gx", &Gx);
       AMSDriverVectorRead("mfem.Gy", &Gy);
       if (dim == 3)
+      {
          AMSDriverVectorRead("mfem.Gz", &Gz);
+      }
    }
 
    /* Vectors x, y and z */
@@ -373,7 +423,9 @@ hypre_int main (hypre_int argc, char *argv[])
       AMSDriverVectorRead("mfem.x", &x);
       AMSDriverVectorRead("mfem.y", &y);
       if (dim == 3)
+      {
          AMSDriverVectorRead("mfem.z", &z);
+      }
    }
 
    /* Poisson matrices */
@@ -391,7 +443,7 @@ hypre_int main (hypre_int argc, char *argv[])
    if (!myid)
    {
       hypre_printf("Problem size: %d\n\n",
-             hypre_ParCSRMatrixGlobalNumRows((hypre_ParCSRMatrix*)A));
+                   hypre_ParCSRMatrixGlobalNumRows((hypre_ParCSRMatrix*)A));
    }
 
    hypre_ParCSRMatrixMigrate(A,      hypre_HandleMemoryLocation(hypre_handle()));
@@ -490,11 +542,15 @@ hypre_int main (hypre_int argc, char *argv[])
 
       /* Vectors Gx, Gy and Gz */
       if (!coordinates)
-         HYPRE_AMSSetEdgeConstantVectors(solver,Gx,Gy,Gz);
+      {
+         HYPRE_AMSSetEdgeConstantVectors(solver, Gx, Gy, Gz);
+      }
 
       /* Vectors x, y and z */
       if (coordinates)
-         HYPRE_AMSSetCoordinateVectors(solver,x,y,z);
+      {
+         HYPRE_AMSSetCoordinateVectors(solver, x, y, z);
+      }
 
       /* Poisson matrices */
       if (h1_method)
@@ -504,12 +560,16 @@ hypre_int main (hypre_int argc, char *argv[])
       }
 
       if (singular_problem)
+      {
          HYPRE_AMSSetBetaPoissonMatrix(solver, NULL);
+      }
 
       /* Smoothing and AMG options */
       HYPRE_AMSSetSmoothingOptions(solver, rlx_type, rlx_sweeps, rlx_weight, rlx_omega);
-      HYPRE_AMSSetAlphaAMGOptions(solver, amg_coarsen_type, amg_agg_levels, amg_rlx_type, theta, amg_interp_type, amg_Pmax);
-      HYPRE_AMSSetBetaAMGOptions(solver, amg_coarsen_type, amg_agg_levels, amg_rlx_type, theta, amg_interp_type, amg_Pmax);
+      HYPRE_AMSSetAlphaAMGOptions(solver, amg_coarsen_type, amg_agg_levels, amg_rlx_type, theta,
+                                  amg_interp_type, amg_Pmax);
+      HYPRE_AMSSetBetaAMGOptions(solver, amg_coarsen_type, amg_agg_levels, amg_rlx_type, theta,
+                                 amg_interp_type, amg_Pmax);
       HYPRE_AMSSetAlphaAMGCoarseRelaxType(solver, coarse_rlx_type);
       HYPRE_AMSSetBetaAMGCoarseRelaxType(solver, coarse_rlx_type);
 
@@ -546,11 +606,17 @@ hypre_int main (hypre_int argc, char *argv[])
 
       /* Start timing */
       if (solver_id == 1)
+      {
          time_index = hypre_InitializeTiming("BoomerAMG-PCG Setup");
+      }
       else if (solver_id == 3)
+      {
          time_index = hypre_InitializeTiming("AMS-PCG Setup");
+      }
       else if (solver_id == 4)
+      {
          time_index = hypre_InitializeTiming("DS-PCG Setup");
+      }
       hypre_BeginTiming(time_index);
 
       /* Create solver */
@@ -600,16 +666,20 @@ hypre_int main (hypre_int argc, char *argv[])
             HYPRE_AMSSetInteriorNodes(precond, interior_nodes);
             HYPRE_AMSSetProjectionFrequency(precond, 5);
          }
-         HYPRE_PCGSetResidualTol(solver,rtol);
+         HYPRE_PCGSetResidualTol(solver, rtol);
          HYPRE_PCGSetRecomputeResidualP(solver, rr);
 
          /* Vectors Gx, Gy and Gz */
          if (!coordinates)
-            HYPRE_AMSSetEdgeConstantVectors(precond,Gx,Gy,Gz);
+         {
+            HYPRE_AMSSetEdgeConstantVectors(precond, Gx, Gy, Gz);
+         }
 
          /* Vectors x, y and z */
          if (coordinates)
-            HYPRE_AMSSetCoordinateVectors(precond,x,y,z);
+         {
+            HYPRE_AMSSetCoordinateVectors(precond, x, y, z);
+         }
 
          /* Poisson matrices */
          if (h1_method)
@@ -619,12 +689,16 @@ hypre_int main (hypre_int argc, char *argv[])
          }
 
          if (singular_problem)
+         {
             HYPRE_AMSSetBetaPoissonMatrix(precond, NULL);
+         }
 
          /* Smoothing and AMG options */
          HYPRE_AMSSetSmoothingOptions(precond, rlx_type, rlx_sweeps, rlx_weight, rlx_omega);
-         HYPRE_AMSSetAlphaAMGOptions(precond, amg_coarsen_type, amg_agg_levels, amg_rlx_type, theta, amg_interp_type, amg_Pmax);
-         HYPRE_AMSSetBetaAMGOptions(precond, amg_coarsen_type, amg_agg_levels, amg_rlx_type, theta, amg_interp_type, amg_Pmax);
+         HYPRE_AMSSetAlphaAMGOptions(precond, amg_coarsen_type, amg_agg_levels, amg_rlx_type, theta,
+                                     amg_interp_type, amg_Pmax);
+         HYPRE_AMSSetBetaAMGOptions(precond, amg_coarsen_type, amg_agg_levels, amg_rlx_type, theta,
+                                    amg_interp_type, amg_Pmax);
          HYPRE_AMSSetAlphaAMGCoarseRelaxType(precond, coarse_rlx_type);
          HYPRE_AMSSetBetaAMGCoarseRelaxType(precond, coarse_rlx_type);
 
@@ -655,11 +729,17 @@ hypre_int main (hypre_int argc, char *argv[])
 
       /* Start timing again */
       if (solver_id == 1)
+      {
          time_index = hypre_InitializeTiming("BoomerAMG-PCG Solve");
+      }
       else if (solver_id == 3)
+      {
          time_index = hypre_InitializeTiming("AMS-PCG Solve");
+      }
       else if (solver_id == 4)
+      {
          time_index = hypre_InitializeTiming("DS-PCG Solve");
+      }
       hypre_BeginTiming(time_index);
 
       /* Solve */
@@ -685,9 +765,13 @@ hypre_int main (hypre_int argc, char *argv[])
       /* Destroy solver and preconditioner */
       HYPRE_ParCSRPCGDestroy(solver);
       if (solver_id == 1)
+      {
          HYPRE_BoomerAMGDestroy(precond);
+      }
       else if (solver_id == 3)
+      {
          HYPRE_AMSDestroy(precond);
+      }
    }
 
    if (solver_id == 5)
@@ -710,11 +794,15 @@ hypre_int main (hypre_int argc, char *argv[])
 
       /* Vectors Gx, Gy and Gz */
       if (!coordinates)
-         HYPRE_AMSSetEdgeConstantVectors(precond,Gx,Gy,Gz);
+      {
+         HYPRE_AMSSetEdgeConstantVectors(precond, Gx, Gy, Gz);
+      }
 
       /* Vectors x, y and z */
       if (coordinates)
-         HYPRE_AMSSetCoordinateVectors(precond,x,y,z);
+      {
+         HYPRE_AMSSetCoordinateVectors(precond, x, y, z);
+      }
 
       /* Poisson matrices */
       if (h1_method)
@@ -724,12 +812,16 @@ hypre_int main (hypre_int argc, char *argv[])
       }
 
       if (singular_problem)
+      {
          HYPRE_AMSSetBetaPoissonMatrix(precond, NULL);
+      }
 
       /* Smoothing and AMG options */
       HYPRE_AMSSetSmoothingOptions(precond, rlx_type, rlx_sweeps, rlx_weight, rlx_omega);
-      HYPRE_AMSSetAlphaAMGOptions(precond, amg_coarsen_type, amg_agg_levels, amg_rlx_type, theta, amg_interp_type, amg_Pmax);
-      HYPRE_AMSSetBetaAMGOptions(precond, amg_coarsen_type, amg_agg_levels, amg_rlx_type, theta, amg_interp_type, amg_Pmax);
+      HYPRE_AMSSetAlphaAMGOptions(precond, amg_coarsen_type, amg_agg_levels, amg_rlx_type, theta,
+                                  amg_interp_type, amg_Pmax);
+      HYPRE_AMSSetBetaAMGOptions(precond, amg_coarsen_type, amg_agg_levels, amg_rlx_type, theta,
+                                 amg_interp_type, amg_Pmax);
       HYPRE_AMSSetAlphaAMGCoarseRelaxType(precond, coarse_rlx_type);
       HYPRE_AMSSetBetaAMGCoarseRelaxType(precond, coarse_rlx_type);
 
@@ -746,11 +838,16 @@ hypre_int main (hypre_int argc, char *argv[])
 
       /* Set additional parameters */
       HYPRE_AMESetMaxIter(solver, maxit); /* max iterations */
+      HYPRE_AMESetMaxPCGIter(solver, pcg_maxit); /* max iterations */
       HYPRE_AMESetTol(solver, tol); /* conv. tolerance */
       if (myid == 0)
-         HYPRE_AMESetPrintLevel(solver, 1); /* print solve info */
+      {
+         HYPRE_AMESetPrintLevel(solver, 1);   /* print solve info */
+      }
       else
+      {
          HYPRE_AMESetPrintLevel(solver, 0);
+      }
 
       /* Setup */
       HYPRE_AMESetup(solver);
@@ -787,21 +884,23 @@ hypre_int main (hypre_int argc, char *argv[])
    HYPRE_ParVectorDestroy(b);
    HYPRE_ParCSRMatrixDestroy(G);
 
-   if (M) HYPRE_ParCSRMatrixDestroy(M);
+   if (M) { HYPRE_ParCSRMatrixDestroy(M); }
 
-   if (Gx) HYPRE_ParVectorDestroy(Gx);
-   if (Gy) HYPRE_ParVectorDestroy(Gy);
-   if (Gz) HYPRE_ParVectorDestroy(Gz);
+   if (Gx) { HYPRE_ParVectorDestroy(Gx); }
+   if (Gy) { HYPRE_ParVectorDestroy(Gy); }
+   if (Gz) { HYPRE_ParVectorDestroy(Gz); }
 
-   if (x) HYPRE_ParVectorDestroy(x);
-   if (y) HYPRE_ParVectorDestroy(y);
-   if (z) HYPRE_ParVectorDestroy(z);
+   if (x) { HYPRE_ParVectorDestroy(x); }
+   if (y) { HYPRE_ParVectorDestroy(y); }
+   if (z) { HYPRE_ParVectorDestroy(z); }
 
-   if (Aalpha) HYPRE_ParCSRMatrixDestroy(Aalpha);
-   if (Abeta)  HYPRE_ParCSRMatrixDestroy(Abeta);
+   if (Aalpha) { HYPRE_ParCSRMatrixDestroy(Aalpha); }
+   if (Abeta) { HYPRE_ParCSRMatrixDestroy(Abeta); }
 
    if (zero_cond)
+   {
       HYPRE_ParVectorDestroy(interior_nodes);
+   }
 
    /* Finalize Hypre */
    HYPRE_Finalize();
@@ -810,7 +909,9 @@ hypre_int main (hypre_int argc, char *argv[])
    hypre_MPI_Finalize();
 
    if (HYPRE_GetError() && !myid)
-      hypre_fprintf(stderr,"hypre_error_flag = %d\n", HYPRE_GetError());
+   {
+      hypre_fprintf(stderr, "hypre_error_flag = %d\n", HYPRE_GetError());
+   }
 
    return 0;
 }
diff --git a/external/hypre/src/test/checktest.sh b/external/hypre/src/test/checktest.sh
old mode 100644
new mode 100755
index 781cf915..f7ea0ab0
--- a/external/hypre/src/test/checktest.sh
+++ b/external/hypre/src/test/checktest.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -19,6 +19,8 @@ cat <<EOF
    script is being run from within the hypre 'test' directory, and all of the
    'TEST_*' directories are checked.
 
+   Returns 0 if all tests pass, 1 if any test fails.
+
    Example usage: $0 TEST_struct TEST_ij
 
 EOF
@@ -26,16 +28,18 @@ EOF
    ;;
 esac
 
-RESET=`shopt -p nullglob`  # Save current nullglob setting
-shopt -s nullglob          # Return an empty string for failed wildcard matches 
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+RESET=`shopt -p nullglob`                # Save current nullglob setting
+shopt -s nullglob                        # Return an empty string for failed wildcard matches
 if [ "x$1" = "x" ]
 then
-   testdirs=`echo TEST*`   # All TEST directories
+   testdirs=`echo ${SCRIPT_DIR}/TEST*`   # All TEST directories
 else
-   testdirs=`echo $*`      # Only the specified test directories
+   testdirs=`echo $*`                    # Only the specified test directories
 fi
-$RESET                     # Restore nullglob setting
+$RESET                                   # Restore nullglob setting
 
+error_code=0
 echo ""
 for testdir in $testdirs
 do
@@ -45,13 +49,17 @@ do
       for file in $files
       do
          SZ=`ls -l $file | awk '{print $5}'`
+         relative_path=$(echo "$file" | sed 's|.*test/||')
          if [ $SZ != 0 ]
          then
-            echo "FAILED : $file  ($SZ)"
+            echo -e "FAILED : $relative_path  ($SZ)\n"
+            cat $file
+            error_code=1
          else
-            echo "    OK : $file"
+            echo "    OK : $relative_path"
          fi
       done
       echo ""
    fi
 done
+exit $error_code
diff --git a/external/hypre/src/test/cleantest.sh b/external/hypre/src/test/cleantest.sh
old mode 100644
new mode 100755
index f440506e..14f39183
--- a/external/hypre/src/test/cleantest.sh
+++ b/external/hypre/src/test/cleantest.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -26,21 +26,22 @@ EOF
    ;;
 esac
 
-RESET=`shopt -p nullglob`  # Save current nullglob setting
-shopt -s nullglob          # Return an empty string for failed wildcard matches 
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+RESET=`shopt -p nullglob`                # Save current nullglob setting
+shopt -s nullglob                        # Return an empty string for failed wildcard matches
 if [ "x$1" = "x" ]
 then
-   testdirs=`echo TEST*`   # All TEST directories
+   testdirs=`echo ${SCRIPT_DIR}/TEST*`   # All TEST directories
 else
-   testdirs=`echo $*`      # Only the specified test directories
+   testdirs=`echo $*`                    # Only the specified test directories
 fi
-$RESET                     # Restore nullglob setting
+$RESET                                   # Restore nullglob setting
 
 for testdir in $testdirs
 do
-   rm -f $testdir/*err*
-   rm -f $testdir/*out*
-   rm -f $testdir/*log*
+   rm -f $testdir/*.err*
+   rm -f $testdir/*.out*
+   rm -f $testdir/*.log*
    rm -f $testdir/*.fil
    rm -f $testdir/*.core
 done
diff --git a/external/hypre/src/test/driver_commpkg.c b/external/hypre/src/test/driver_commpkg.c
index 08a0c690..a372aec4 100644
--- a/external/hypre/src/test/driver_commpkg.c
+++ b/external/hypre/src/test/driver_commpkg.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -42,11 +42,13 @@
 #define   LOOP2  1
 
 
-HYPRE_Int myBuildParLaplacian (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix *A_ptr, HYPRE_Int parmprint );
-HYPRE_Int myBuildParLaplacian27pt (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix *A_ptr, HYPRE_Int parmprint );
+HYPRE_Int myBuildParLaplacian (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                               HYPRE_ParCSRMatrix *A_ptr, HYPRE_Int parmprint );
+HYPRE_Int myBuildParLaplacian27pt (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                                   HYPRE_ParCSRMatrix *A_ptr, HYPRE_Int parmprint );
 
 
-void stats_mo(HYPRE_Real*, HYPRE_Int, HYPRE_Real *,HYPRE_Real *);
+void stats_mo(HYPRE_Real*, HYPRE_Int, HYPRE_Real *, HYPRE_Real *);
 
 /*==========================================================================*/
 
@@ -76,8 +78,8 @@ main( HYPRE_Int   argc,
 
    HYPRE_Int        num_procs, myid;
    HYPRE_Int        verbose = 0, build_matrix_type = 1;
-   HYPRE_Int        index, matrix_arg_index, commpkg_flag=3;
-   HYPRE_Int        i, k, ierr=0;
+   HYPRE_Int        index, matrix_arg_index, commpkg_flag = 3;
+   HYPRE_Int        i, k, ierr = 0;
    HYPRE_Int        row_start, row_end;
    HYPRE_Int        col_start, col_end, global_num_rows;
    HYPRE_Int       *row_part, *col_part;
@@ -90,7 +92,7 @@ main( HYPRE_Int   argc,
    hypre_ParCSRMatrix    *parcsr_A, *small_A;
    HYPRE_ParCSRMatrix    A_temp, A_temp_small;
    hypre_CSRMatrix       *A_CSR;
-   hypre_ParCSRCommPkg	 *comm_pkg;
+   hypre_ParCSRCommPkg   *comm_pkg;
 
 
    HYPRE_Int                 nx, ny, nz;
@@ -166,13 +168,13 @@ main( HYPRE_Int   argc,
          build_matrix_type      = 4;
          matrix_arg_index = index;
       }
-/*
+#if 0
       else if  ( strcmp(argv[index], "-nopreload") == 0 )
       {
          index++;
          preload = 0;
       }
-*/
+#endif
       else if  ( strcmp(argv[index], "-loop") == 0 )
       {
          index++;
@@ -186,7 +188,7 @@ main( HYPRE_Int   argc,
       }
       else
       {
-	 index++;
+         index++;
          /*hypre_printf("Warning: Unrecogized option '%s'\n",argv[index++] );*/
       }
    }
@@ -197,17 +199,17 @@ main( HYPRE_Int   argc,
     * Setup the Matrix problem
     *-----------------------------------------------------------*/
 
-  /*-----------------------------------------------------------
-    *  Get actual partitioning-
-    *  read in an actual csr matrix.
-    *-----------------------------------------------------------*/
+   /*-----------------------------------------------------------
+     *  Get actual partitioning-
+     *  read in an actual csr matrix.
+     *-----------------------------------------------------------*/
 
 
-   if (build_matrix_type ==1) /*read in a csr matrix from one file */
+   if (build_matrix_type == 1) /*read in a csr matrix from one file */
    {
       if (matrix_arg_index < argc)
       {
-	 csrfilename = argv[matrix_arg_index];
+         csrfilename = argv[matrix_arg_index];
       }
       else
       {
@@ -216,35 +218,35 @@ main( HYPRE_Int   argc,
       }
       if (myid == 0)
       {
-	/*hypre_printf("  FromFile: %s\n", csrfilename);*/
+         /*hypre_printf("  FromFile: %s\n", csrfilename);*/
          A_CSR = hypre_CSRMatrixRead(csrfilename);
       }
       row_part = NULL;
       col_part = NULL;
 
       parcsr_A = hypre_CSRMatrixToParCSRMatrix(hypre_MPI_COMM_WORLD, A_CSR,
-					       row_part, col_part);
+                                               row_part, col_part);
 
-      if (myid == 0) hypre_CSRMatrixDestroy(A_CSR);
+      if (myid == 0) { hypre_CSRMatrixDestroy(A_CSR); }
    }
-   else if (build_matrix_type ==2)
+   else if (build_matrix_type == 2)
    {
 
       myBuildParLaplacian(argc, argv, matrix_arg_index,  &A_temp, !noparmprint);
-     parcsr_A = (hypre_ParCSRMatrix *) A_temp;
+      parcsr_A = (hypre_ParCSRMatrix *) A_temp;
 
    }
-   else if (build_matrix_type ==4)
+   else if (build_matrix_type == 4)
    {
       myBuildParLaplacian27pt(argc, argv, matrix_arg_index, &A_temp, !noparmprint);
-     parcsr_A = (hypre_ParCSRMatrix *) A_temp;
+      parcsr_A = (hypre_ParCSRMatrix *) A_temp;
    }
 
 
-  /*-----------------------------------------------------------
-   * create a small problem so that timings are more accurate -
-   * code gets run twice (small laplace)
-   *-----------------------------------------------------------*/
+   /*-----------------------------------------------------------
+    * create a small problem so that timings are more accurate -
+    * code gets run twice (small laplace)
+    *-----------------------------------------------------------*/
 
    /*this is no longer being used - preload = 0 is set at the beginning */
 
@@ -254,25 +256,25 @@ main( HYPRE_Int   argc,
       /*hypre_printf("preload!\n");*/
 
 
-       values[1] = -1;
-       values[2] = -1;
-       values[3] = -1;
-       values[0] = - 6.0    ;
+      values[1] = -1;
+      values[2] = -1;
+      values[3] = -1;
+      values[0] = - 6.0    ;
 
-       nx = 2;
-       ny = num_procs;
-       nz = 2;
+      nx = 2;
+      ny = num_procs;
+      nz = 2;
 
-       P  = 1;
-       Q  = num_procs;
-       R  = 1;
+      P  = 1;
+      Q  = num_procs;
+      R  = 1;
 
-       p = myid % P;
-       q = (( myid - p)/P) % Q;
-       r = ( myid - p - P*q)/( P*Q );
+      p = myid % P;
+      q = (( myid - p) / P) % Q;
+      r = ( myid - p - P * q) / ( P * Q );
 
       A_temp_small = (HYPRE_ParCSRMatrix) GenerateLaplacian(hypre_MPI_COMM_WORLD, nx, ny, nz,
-				      P, Q, R, p, q, r, values);
+                                                            P, Q, R, p, q, r, values);
       small_A = (hypre_ParCSRMatrix *) A_temp_small;
 
       /*do comm packages*/
@@ -304,8 +306,8 @@ main( HYPRE_Int   argc,
    else
    {
 
-      loop +=1;
-      if (loop < 2) loop = 2;
+      loop += 1;
+      if (loop < 2) { loop = 2; }
    }
 
 
@@ -313,11 +315,11 @@ main( HYPRE_Int   argc,
 
 
 
-/******************************************************************************************/
+   /******************************************************************************************/
 
    hypre_MPI_Barrier(hypre_MPI_COMM_WORLD);
 
-   if (commpkg_flag == 1 || commpkg_flag ==3 )
+   if (commpkg_flag == 1 || commpkg_flag == 3 )
    {
 
       /*-----------------------------------------------------------
@@ -326,13 +328,13 @@ main( HYPRE_Int   argc,
 
 
 
-      if (!myid) hypre_printf("********************************************************\n" );
+      if (!myid) { hypre_printf("********************************************************\n" ); }
 
       /*do loop times*/
-      for (i=0; i< loop; i++)
+      for (i = 0; i < loop; i++)
       {
          loop_times[i] = 0.0;
-         for (k=0; k< loop2; k++)
+         for (k = 0; k < loop2; k++)
          {
 
             hypre_MPI_Barrier(hypre_MPI_COMM_WORLD);
@@ -340,13 +342,13 @@ main( HYPRE_Int   argc,
             start_time = hypre_MPI_Wtime();
 
 #if mpip_on
-            if (i==(loop-1)) hypre_MPI_Pcontrol(1);
+            if (i == (loop - 1)) { hypre_MPI_Pcontrol(1); }
 #endif
 
             hypre_NewCommPkgCreate(parcsr_A);
 
 #if mpip_on
-            if (i==(loop-1)) hypre_MPI_Pcontrol(0);
+            if (i == (loop - 1)) { hypre_MPI_Pcontrol(0); }
 #endif
 
             end_time = hypre_MPI_Wtime();
@@ -354,11 +356,11 @@ main( HYPRE_Int   argc,
             end_time = end_time - start_time;
 
             hypre_MPI_Allreduce(&end_time, &total_time, 1,
-                       HYPRE_MPI_REAL, hypre_MPI_MAX, hypre_MPI_COMM_WORLD);
+                                HYPRE_MPI_REAL, hypre_MPI_MAX, hypre_MPI_COMM_WORLD);
 
             loop_times[i] += total_time;
 
-            if (  !((i+1)== loop  &&  (k+1) == loop2)) hypre_NewCommPkgDestroy(parcsr_A);
+            if (  !((i + 1) == loop  &&  (k + 1) == loop2)) { hypre_NewCommPkgDestroy(parcsr_A); }
 
          }/*end of loop2 */
 
@@ -374,112 +376,112 @@ main( HYPRE_Int   argc,
          /* calculate the avg and std. */
          stats_mo(loop_times, loop, &T_avg, &T_std);
 
-         if (!myid) hypre_printf(" NewCommPkgCreate:  AVG. wall clock time =  %f seconds\n", T_avg);
-         if (!myid) hypre_printf("                    STD. for %d  runs     =  %f\n", loop-1, T_std);
-         if (!myid) hypre_printf("                    (Note: avg./std. timings exclude run 0.)\n");
-         if (!myid) hypre_printf("********************************************************\n" );
-         for (i=0; i< loop; i++)
+         if (!myid) { hypre_printf(" NewCommPkgCreate:  AVG. wall clock time =  %f seconds\n", T_avg); }
+         if (!myid) { hypre_printf("                    STD. for %d  runs     =  %f\n", loop - 1, T_std); }
+         if (!myid) { hypre_printf("                    (Note: avg./std. timings exclude run 0.)\n"); }
+         if (!myid) { hypre_printf("********************************************************\n" ); }
+         for (i = 0; i < loop; i++)
          {
-            if (!myid) hypre_printf("      run %d  =  %f sec.\n", i, loop_times[i]);
+            if (!myid) { hypre_printf("      run %d  =  %f sec.\n", i, loop_times[i]); }
          }
-         if (!myid) hypre_printf("********************************************************\n" );
+         if (!myid) { hypre_printf("********************************************************\n" ); }
 
-       }
-       else
-       {
-         if (!myid) hypre_printf("********************************************************\n" );
-         if (!myid) hypre_printf(" NewCommPkgCreate:\n");
-         if (!myid) hypre_printf("      run time =  %f sec.\n", loop_times[0]);
-         if (!myid) hypre_printf("********************************************************\n" );
-       }
+      }
+      else
+      {
+         if (!myid) { hypre_printf("********************************************************\n" ); }
+         if (!myid) { hypre_printf(" NewCommPkgCreate:\n"); }
+         if (!myid) { hypre_printf("      run time =  %f sec.\n", loop_times[0]); }
+         if (!myid) { hypre_printf("********************************************************\n" ); }
+      }
 
 
-     /*-----------------------------------------------------------
-       *  Verbose printing
-       *-----------------------------------------------------------*/
+      /*-----------------------------------------------------------
+        *  Verbose printing
+        *-----------------------------------------------------------*/
 
       /*some verification*/
 
-       global_num_rows = hypre_ParCSRMatrixGlobalNumRows(parcsr_A);
+      global_num_rows = hypre_ParCSRMatrixGlobalNumRows(parcsr_A);
 
-       if (verbose)
-       {
+      if (verbose)
+      {
 
-	  ierr = hypre_ParCSRMatrixGetLocalRange( parcsr_A,
-                                      &row_start, &row_end ,
-                                       &col_start, &col_end );
+         ierr = hypre_ParCSRMatrixGetLocalRange( parcsr_A,
+                                                 &row_start, &row_end,
+                                                 &col_start, &col_end );
 
 
-	  comm_pkg = hypre_ParCSRMatrixCommPkg(parcsr_A);
+         comm_pkg = hypre_ParCSRMatrixCommPkg(parcsr_A);
 
-          hypre_printf("myid = %i, my ACTUAL local range: [%i, %i]\n", myid,
-		 row_start, row_end);
+         hypre_printf("myid = %i, my ACTUAL local range: [%i, %i]\n", myid,
+                      row_start, row_end);
 
 
-	  ierr = hypre_GetAssumedPartitionRowRange( myid, global_num_rows, &row_start,
-					      &row_end);
+         ierr = hypre_GetAssumedPartitionRowRange( myid, global_num_rows, &row_start,
+                                                   &row_end);
 
 
-	  hypre_printf("myid = %i, my assumed local range: [%i, %i]\n", myid,
-		 row_start, row_end);
+         hypre_printf("myid = %i, my assumed local range: [%i, %i]\n", myid,
+                      row_start, row_end);
 
-          hypre_printf("myid = %d, num_recvs = %d\n", myid,
-		 hypre_ParCSRCommPkgNumRecvs(comm_pkg)  );
+         hypre_printf("myid = %d, num_recvs = %d\n", myid,
+                      hypre_ParCSRCommPkgNumRecvs(comm_pkg)  );
 
 #if mydebug
-	  for (i=0; i < hypre_ParCSRCommPkgNumRecvs(comm_pkg); i++)
-	  {
-              hypre_printf("myid = %d, recv proc = %d, vec_starts = [%d : %d]\n",
-		     myid,  hypre_ParCSRCommPkgRecvProcs(comm_pkg)[i],
-		     hypre_ParCSRCommPkgRecvVecStarts(comm_pkg)[i],
-		     hypre_ParCSRCommPkgRecvVecStarts(comm_pkg)[i+1]-1);
-	   }
+         for (i = 0; i < hypre_ParCSRCommPkgNumRecvs(comm_pkg); i++)
+         {
+            hypre_printf("myid = %d, recv proc = %d, vec_starts = [%d : %d]\n",
+                         myid,  hypre_ParCSRCommPkgRecvProcs(comm_pkg)[i],
+                         hypre_ParCSRCommPkgRecvVecStarts(comm_pkg)[i],
+                         hypre_ParCSRCommPkgRecvVecStarts(comm_pkg)[i + 1] - 1);
+         }
 #endif
-	  hypre_printf("myid = %d, num_sends = %d\n", myid,
-		 hypre_ParCSRCommPkgNumSends(comm_pkg)  );
+         hypre_printf("myid = %d, num_sends = %d\n", myid,
+                      hypre_ParCSRCommPkgNumSends(comm_pkg)  );
 
 #if mydebug
-	  for (i=0; i <hypre_ParCSRCommPkgNumSends(comm_pkg) ; i++)
-          {
-	    tmp_int =  hypre_ParCSRCommPkgSendMapStarts(comm_pkg)[i+1] -
-                     hypre_ParCSRCommPkgSendMapStarts(comm_pkg)[i];
-	    index = hypre_ParCSRCommPkgSendMapStarts(comm_pkg)[i];
-	    for (j=0; j< tmp_int; j++)
-	    {
-	       hypre_printf("myid = %d, send proc = %d, send element = %d\n",myid,
-		      hypre_ParCSRCommPkgSendProcs(comm_pkg)[i],
-		      hypre_ParCSRCommPkgSendMapElmts(comm_pkg)[index+j]);
-	     }
-	  }
+         for (i = 0; i < hypre_ParCSRCommPkgNumSends(comm_pkg) ; i++)
+         {
+            tmp_int =  hypre_ParCSRCommPkgSendMapStarts(comm_pkg)[i + 1] -
+                       hypre_ParCSRCommPkgSendMapStarts(comm_pkg)[i];
+            index = hypre_ParCSRCommPkgSendMapStarts(comm_pkg)[i];
+            for (j = 0; j < tmp_int; j++)
+            {
+               hypre_printf("myid = %d, send proc = %d, send element = %d\n", myid,
+                            hypre_ParCSRCommPkgSendProcs(comm_pkg)[i],
+                            hypre_ParCSRCommPkgSendMapElmts(comm_pkg)[index + j]);
+            }
+         }
 #endif
-       }
-       /*-----------------------------------------------------------
-        *  To verify correctness (if commpkg_flag = 3)
-        *-----------------------------------------------------------*/
+      }
+      /*-----------------------------------------------------------
+       *  To verify correctness (if commpkg_flag = 3)
+       *-----------------------------------------------------------*/
 
-       if (commpkg_flag == 3 )
-       {
-          /*do a matvec - we are assuming a square matrix */
-          row_starts = hypre_ParCSRMatrixRowStarts(parcsr_A);
+      if (commpkg_flag == 3 )
+      {
+         /*do a matvec - we are assuming a square matrix */
+         row_starts = hypre_ParCSRMatrixRowStarts(parcsr_A);
 
-          x_new = hypre_ParVectorCreate(hypre_MPI_COMM_WORLD, global_num_rows, row_starts);
-          hypre_ParVectorInitialize(x_new);
-          hypre_ParVectorSetRandomValues(x_new, 1);
+         x_new = hypre_ParVectorCreate(hypre_MPI_COMM_WORLD, global_num_rows, row_starts);
+         hypre_ParVectorInitialize(x_new);
+         hypre_ParVectorSetRandomValues(x_new, 1);
 
-          y_new = hypre_ParVectorCreate(hypre_MPI_COMM_WORLD, global_num_rows, row_starts);
-          hypre_ParVectorInitialize(y_new);
-          hypre_ParVectorSetConstantValues(y_new, 0.0);
+         y_new = hypre_ParVectorCreate(hypre_MPI_COMM_WORLD, global_num_rows, row_starts);
+         hypre_ParVectorInitialize(y_new);
+         hypre_ParVectorSetConstantValues(y_new, 0.0);
 
-          /*y = 1.0*A*x+1.0*y */
-          hypre_ParCSRMatrixMatvec (1.0, parcsr_A, x_new, 1.0, y_new);
-       }
+         /*y = 1.0*A*x+1.0*y */
+         hypre_ParCSRMatrixMatvec (1.0, parcsr_A, x_new, 1.0, y_new);
+      }
 
-   /*-----------------------------------------------------------
-    *  Clean up after MyComm
-    *-----------------------------------------------------------*/
+      /*-----------------------------------------------------------
+       *  Clean up after MyComm
+       *-----------------------------------------------------------*/
 
 
-       hypre_NewCommPkgDestroy(parcsr_A);
+      hypre_NewCommPkgDestroy(parcsr_A);
 
    }
 
@@ -488,8 +490,8 @@ main( HYPRE_Int   argc,
 
 
 
-/******************************************************************************************/
-/******************************************************************************************/
+   /******************************************************************************************/
+   /******************************************************************************************/
 
    hypre_MPI_Barrier(hypre_MPI_COMM_WORLD);
 
@@ -504,13 +506,13 @@ main( HYPRE_Int   argc,
       bcast_rows[0] = 23;
       bcast_rows[1] = 1789;
 
-      if (!myid) hypre_printf("********************************************************\n" );
+      if (!myid) { hypre_printf("********************************************************\n" ); }
       /*do loop times*/
-      for (i=0; i< loop; i++)
+      for (i = 0; i < loop; i++)
       {
 
          loop_times[i] = 0.0;
-         for (k=0; k< loop2; k++)
+         for (k = 0; k < loop2; k++)
          {
 
 
@@ -535,12 +537,12 @@ main( HYPRE_Int   argc,
             end_time = end_time - start_time;
 
             hypre_MPI_Allreduce(&end_time, &total_time, 1,
-                          HYPRE_MPI_REAL, hypre_MPI_MAX, hypre_MPI_COMM_WORLD);
+                                HYPRE_MPI_REAL, hypre_MPI_MAX, hypre_MPI_COMM_WORLD);
 
             loop_times[i] += total_time;
 
 
-         if (  !((i+1)== loop  &&  (k+1) == loop2))   hypre_MatvecCommPkgDestroy(hypre_ParCSRMatrixCommPkg(parcsr_A));
+            if (  !((i + 1) == loop  &&  (k + 1) == loop2)) { hypre_MatvecCommPkgDestroy(hypre_ParCSRMatrixCommPkg(parcsr_A)); }
 
          }/* end of loop 2*/
 
@@ -552,23 +554,23 @@ main( HYPRE_Int   argc,
       {
 
          stats_mo(loop_times, loop, &T_avg, &T_std);
-         if (!myid) hypre_printf("Current CommPkgCreate:  AVG. wall clock time =  %f seconds\n", T_avg);
-         if (!myid) hypre_printf("                        STD. for %d  runs     =  %f\n", loop-1, T_std);
-         if (!myid) hypre_printf("                        (Note: avg./std. timings exclude run 0.)\n");
-         if (!myid) hypre_printf("********************************************************\n" );
-         for (i=0; i< loop; i++)
+         if (!myid) { hypre_printf("Current CommPkgCreate:  AVG. wall clock time =  %f seconds\n", T_avg); }
+         if (!myid) { hypre_printf("                        STD. for %d  runs     =  %f\n", loop - 1, T_std); }
+         if (!myid) { hypre_printf("                        (Note: avg./std. timings exclude run 0.)\n"); }
+         if (!myid) { hypre_printf("********************************************************\n" ); }
+         for (i = 0; i < loop; i++)
          {
-            if (!myid) hypre_printf("      run %d  =  %f sec.\n", i, loop_times[i]);
+            if (!myid) { hypre_printf("      run %d  =  %f sec.\n", i, loop_times[i]); }
          }
-         if (!myid) hypre_printf("********************************************************\n" );
+         if (!myid) { hypre_printf("********************************************************\n" ); }
 
       }
       else
       {
-         if (!myid) hypre_printf("********************************************************\n" );
-         if (!myid) hypre_printf(" Current CommPkgCreate:\n");
-         if (!myid) hypre_printf("      run time =  %f sec.\n", loop_times[0]);
-         if (!myid) hypre_printf("********************************************************\n" );
+         if (!myid) { hypre_printf("********************************************************\n" ); }
+         if (!myid) { hypre_printf(" Current CommPkgCreate:\n"); }
+         if (!myid) { hypre_printf("      run time =  %f sec.\n", loop_times[0]); }
+         if (!myid) { hypre_printf("********************************************************\n" ); }
       }
 
 
@@ -582,73 +584,73 @@ main( HYPRE_Int   argc,
       /*some verification*/
 
 
-       if (verbose)
-       {
+      if (verbose)
+      {
 
-          ierr = hypre_ParCSRMatrixGetLocalRange( parcsr_A,
-						  &row_start, &row_end ,
-						  &col_start, &col_end );
+         ierr = hypre_ParCSRMatrixGetLocalRange( parcsr_A,
+                                                 &row_start, &row_end,
+                                                 &col_start, &col_end );
 
 
-          comm_pkg = hypre_ParCSRMatrixCommPkg(parcsr_A);
+         comm_pkg = hypre_ParCSRMatrixCommPkg(parcsr_A);
 
-          hypre_printf("myid = %i, std - my local range: [%i, %i]\n", myid,
-		 row_start, row_end);
+         hypre_printf("myid = %i, std - my local range: [%i, %i]\n", myid,
+                      row_start, row_end);
 
-          ierr = hypre_ParCSRMatrixGetLocalRange( parcsr_A,
-						  &row_start, &row_end ,
-						  &col_start, &col_end );
+         ierr = hypre_ParCSRMatrixGetLocalRange( parcsr_A,
+                                                 &row_start, &row_end,
+                                                 &col_start, &col_end );
 
-          hypre_printf("myid = %d, std - num_recvs = %d\n", myid,
-		 hypre_ParCSRCommPkgNumRecvs(comm_pkg)  );
+         hypre_printf("myid = %d, std - num_recvs = %d\n", myid,
+                      hypre_ParCSRCommPkgNumRecvs(comm_pkg)  );
 
 #if mydebug
-	  for (i=0; i < hypre_ParCSRCommPkgNumRecvs(comm_pkg); i++)
-          {
-              hypre_printf("myid = %d, std - recv proc = %d, vec_starts = [%d : %d]\n",
-		     myid,  hypre_ParCSRCommPkgRecvProcs(comm_pkg)[i],
-		     hypre_ParCSRCommPkgRecvVecStarts(comm_pkg)[i],
-		     hypre_ParCSRCommPkgRecvVecStarts(comm_pkg)[i+1]-1);
-	  }
+         for (i = 0; i < hypre_ParCSRCommPkgNumRecvs(comm_pkg); i++)
+         {
+            hypre_printf("myid = %d, std - recv proc = %d, vec_starts = [%d : %d]\n",
+                         myid,  hypre_ParCSRCommPkgRecvProcs(comm_pkg)[i],
+                         hypre_ParCSRCommPkgRecvVecStarts(comm_pkg)[i],
+                         hypre_ParCSRCommPkgRecvVecStarts(comm_pkg)[i + 1] - 1);
+         }
 #endif
-          hypre_printf("myid = %d, std - num_sends = %d\n", myid,
-		 hypre_ParCSRCommPkgNumSends(comm_pkg));
+         hypre_printf("myid = %d, std - num_sends = %d\n", myid,
+                      hypre_ParCSRCommPkgNumSends(comm_pkg));
 
 
 #if mydebug
-          for (i=0; i <hypre_ParCSRCommPkgNumSends(comm_pkg) ; i++)
-          {
-	     tmp_int =  hypre_ParCSRCommPkgSendMapStarts(comm_pkg)[i+1] -
-	                hypre_ParCSRCommPkgSendMapStarts(comm_pkg)[i];
-	     index = hypre_ParCSRCommPkgSendMapStarts(comm_pkg)[i];
-	     for (j=0; j< tmp_int; j++)
-	     {
-	        hypre_printf("myid = %d, std - send proc = %d, send element = %d\n",myid,
-		       hypre_ParCSRCommPkgSendProcs(comm_pkg)[i],
-		       hypre_ParCSRCommPkgSendMapElmts(comm_pkg)[index+j]);
-	     }
-	  }
+         for (i = 0; i < hypre_ParCSRCommPkgNumSends(comm_pkg) ; i++)
+         {
+            tmp_int =  hypre_ParCSRCommPkgSendMapStarts(comm_pkg)[i + 1] -
+                       hypre_ParCSRCommPkgSendMapStarts(comm_pkg)[i];
+            index = hypre_ParCSRCommPkgSendMapStarts(comm_pkg)[i];
+            for (j = 0; j < tmp_int; j++)
+            {
+               hypre_printf("myid = %d, std - send proc = %d, send element = %d\n", myid,
+                            hypre_ParCSRCommPkgSendProcs(comm_pkg)[i],
+                            hypre_ParCSRCommPkgSendMapElmts(comm_pkg)[index + j]);
+            }
+         }
 #endif
-       }
+      }
 
-       /*-----------------------------------------------------------
-        * Verify correctness
-        *-----------------------------------------------------------*/
+      /*-----------------------------------------------------------
+       * Verify correctness
+       *-----------------------------------------------------------*/
 
 
 
-       if (commpkg_flag == 3 )
-       {
-          global_num_rows = hypre_ParCSRMatrixGlobalNumRows(parcsr_A);
-          row_starts = hypre_ParCSRMatrixRowStarts(parcsr_A);
+      if (commpkg_flag == 3 )
+      {
+         global_num_rows = hypre_ParCSRMatrixGlobalNumRows(parcsr_A);
+         row_starts = hypre_ParCSRMatrixRowStarts(parcsr_A);
 
 
-          y = hypre_ParVectorCreate(hypre_MPI_COMM_WORLD, global_num_rows,row_starts);
-          hypre_ParVectorInitialize(y);
-          hypre_ParVectorSetConstantValues(y, 0.0);
+         y = hypre_ParVectorCreate(hypre_MPI_COMM_WORLD, global_num_rows, row_starts);
+         hypre_ParVectorInitialize(y);
+         hypre_ParVectorSetConstantValues(y, 0.0);
 
-          hypre_ParCSRMatrixMatvec (1.0, parcsr_A, x_new, 1.0, y);
-       }
+         hypre_ParCSRMatrixMatvec (1.0, parcsr_A, x_new, 1.0, y);
+      }
    }
 
 
@@ -662,27 +664,27 @@ main( HYPRE_Int   argc,
 
    if (commpkg_flag == 3 )
    {
-     /*make sure that y and y_new are the same  - now y_new should=0*/
-     hypre_ParVectorAxpy( -1.0, y, y_new );
+      /*make sure that y and y_new are the same  - now y_new should=0*/
+      hypre_ParVectorAxpy( -1.0, y, y_new );
 
 
-     hypre_ParVectorSetRandomValues(y, 1);
+      hypre_ParVectorSetRandomValues(y, 1);
 
-     ans = hypre_ParVectorInnerProd( y, y_new );
-     if (!myid)
-     {
+      ans = hypre_ParVectorInnerProd( y, y_new );
+      if (!myid)
+      {
 
-        if ( fabs(ans) > 1e-8 )
-        {
-           hypre_printf("!!!!! WARNING !!!!! should be zero if correct = %6.10f\n",
-                  ans);
-        }
-        else
-        {
-           hypre_printf("Matvecs match ( should be zero = %6.10f )\n",
-                  ans);
-        }
-     }
+         if ( fabs(ans) > 1e-8 )
+         {
+            hypre_printf("!!!!! WARNING !!!!! should be zero if correct = %6.10f\n",
+                         ans);
+         }
+         else
+         {
+            hypre_printf("Matvecs match ( should be zero = %6.10f )\n",
+                         ans);
+         }
+      }
 
 
    }
@@ -698,20 +700,20 @@ main( HYPRE_Int   argc,
                                           ours separately until it is
                                           incorporated */
 
-  if (commpkg_flag == 3 )
-  {
+   if (commpkg_flag == 3 )
+   {
 
       hypre_ParVectorDestroy(x_new);
       hypre_ParVectorDestroy(y);
       hypre_ParVectorDestroy(y_new);
-  }
+   }
 
 
 
 
    hypre_MPI_Finalize();
 
-   return(ierr);
+   return (ierr);
 
 
 }
@@ -725,29 +727,30 @@ main( HYPRE_Int   argc,
  *     throw away 1st timing
  *------------------------------------*/
 
-void stats_mo(HYPRE_Real array[], HYPRE_Int n, HYPRE_Real *Tavg,HYPRE_Real *Tstd)
+void stats_mo(HYPRE_Real array[], HYPRE_Int n, HYPRE_Real *Tavg, HYPRE_Real *Tstd)
 {
 
-    HYPRE_Int i;
-    HYPRE_Real atmp, tmp=0.0;
-    HYPRE_Real avg = 0.0, std;
+   HYPRE_Int i;
+   HYPRE_Real atmp, tmp = 0.0;
+   HYPRE_Real avg = 0.0, std;
 
 
-    for(i=1; i<n; i++) {
-       atmp = array[i];
-       avg += atmp;
-       tmp += atmp*atmp;
-    }
+   for (i = 1; i < n; i++)
+   {
+      atmp = array[i];
+      avg += atmp;
+      tmp += atmp * atmp;
+   }
 
-    n = n-1;
-    avg = avg/(HYPRE_Real) n;
-    tmp = tmp/(HYPRE_Real) n;
+   n = n - 1;
+   avg = avg / (HYPRE_Real) n;
+   tmp = tmp / (HYPRE_Real) n;
 
-    tmp = fabs(tmp - avg*avg);
-    std = sqrt(tmp);
+   tmp = fabs(tmp - avg * avg);
+   std = hypre_sqrt(tmp);
 
-    *Tavg = avg;
-    *Tstd = std;
+   *Tavg = avg;
+   *Tstd = std;
 }
 
 
@@ -762,9 +765,9 @@ void stats_mo(HYPRE_Real array[], HYPRE_Int n, HYPRE_Real *Tavg,HYPRE_Real *Tstd
 
 HYPRE_Int
 myBuildParLaplacian27pt( HYPRE_Int                  argc,
-                       char                *argv[],
-                       HYPRE_Int                  arg_index,
-                         HYPRE_ParCSRMatrix  *A_ptr  , HYPRE_Int parmprint  )
+                         char                *argv[],
+                         HYPRE_Int                  arg_index,
+                         HYPRE_ParCSRMatrix  *A_ptr, HYPRE_Int parmprint  )
 {
    HYPRE_Int                 nx, ny, nz;
    HYPRE_Int                 P, Q, R;
@@ -824,7 +827,7 @@ myBuildParLaplacian27pt( HYPRE_Int                  argc,
     * Check a few things
     *-----------------------------------------------------------*/
 
-   if ((P*Q*R) != num_procs)
+   if ((P * Q * R) != num_procs)
    {
       hypre_printf("Error: Invalid number of processors or processor topology \n");
       exit(1);
@@ -847,8 +850,8 @@ myBuildParLaplacian27pt( HYPRE_Int                  argc,
 
    /* compute p,q,r from P,Q,R and myid */
    p = myid % P;
-   q = (( myid - p)/P) % Q;
-   r = ( myid - p - P*q)/( P*Q );
+   q = (( myid - p) / P) % Q;
+   r = ( myid - p - P * q) / ( P * Q );
 
    /*-----------------------------------------------------------
     * Generate the matrix
@@ -858,13 +861,17 @@ myBuildParLaplacian27pt( HYPRE_Int                  argc,
 
    values[0] = 26.0;
    if (nx == 1 || ny == 1 || nz == 1)
-	values[0] = 8.0;
-   if (nx*ny == 1 || nx*nz == 1 || ny*nz == 1)
-	values[0] = 2.0;
+   {
+      values[0] = 8.0;
+   }
+   if (nx * ny == 1 || nx * nz == 1 || ny * nz == 1)
+   {
+      values[0] = 2.0;
+   }
    values[1] = -1.;
 
    A = (HYPRE_ParCSRMatrix) GenerateLaplacian27pt(hypre_MPI_COMM_WORLD,
-                               nx, ny, nz, P, Q, R, p, q, r, values);
+                                                  nx, ny, nz, P, Q, R, p, q, r, values);
 
    hypre_TFree(values, HYPRE_MEMORY_HOST);
 
@@ -882,9 +889,9 @@ myBuildParLaplacian27pt( HYPRE_Int                  argc,
 
 HYPRE_Int
 myBuildParLaplacian( HYPRE_Int                  argc,
-                   char                *argv[],
-                   HYPRE_Int                  arg_index,
-                     HYPRE_ParCSRMatrix  *A_ptr , HYPRE_Int parmprint    )
+                     char                *argv[],
+                     HYPRE_Int                  arg_index,
+                     HYPRE_ParCSRMatrix  *A_ptr, HYPRE_Int parmprint    )
 {
    HYPRE_Int                 nx, ny, nz;
    HYPRE_Int                 P, Q, R;
@@ -942,9 +949,9 @@ myBuildParLaplacian( HYPRE_Int                  argc,
       else if ( strcmp(argv[arg_index], "-c") == 0 )
       {
          arg_index++;
-         cx = atof(argv[arg_index++]);
-         cy = atof(argv[arg_index++]);
-         cz = atof(argv[arg_index++]);
+         cx = (HYPRE_Real)atof(argv[arg_index++]);
+         cy = (HYPRE_Real)atof(argv[arg_index++]);
+         cz = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else
       {
@@ -956,7 +963,7 @@ myBuildParLaplacian( HYPRE_Int                  argc,
     * Check a few things
     *-----------------------------------------------------------*/
 
-   if ((P*Q*R) != num_procs)
+   if ((P * Q * R) != num_procs)
    {
       hypre_printf("Error: Invalid number of processors or processor topology \n");
       exit(1);
@@ -980,8 +987,8 @@ myBuildParLaplacian( HYPRE_Int                  argc,
 
    /* compute p,q,r from P,Q,R and myid */
    p = myid % P;
-   q = (( myid - p)/P) % Q;
-   r = ( myid - p - P*q)/( P*Q );
+   q = (( myid - p) / P) % Q;
+   r = ( myid - p - P * q) / ( P * Q );
 
    /*-----------------------------------------------------------
     * Generate the matrix
@@ -996,19 +1003,19 @@ myBuildParLaplacian( HYPRE_Int                  argc,
    values[0] = 0.;
    if (nx > 1)
    {
-      values[0] += 2.0*cx;
+      values[0] += 2.0 * cx;
    }
    if (ny > 1)
    {
-      values[0] += 2.0*cy;
+      values[0] += 2.0 * cy;
    }
    if (nz > 1)
    {
-      values[0] += 2.0*cz;
+      values[0] += 2.0 * cz;
    }
 
    A = (HYPRE_ParCSRMatrix) GenerateLaplacian(hypre_MPI_COMM_WORLD, nx, ny, nz,
-					      P, Q, R, p, q, r, values);
+                                              P, Q, R, p, q, r, values);
 
    hypre_TFree(values, HYPRE_MEMORY_HOST);
 
diff --git a/external/hypre/src/test/ex1_for.c b/external/hypre/src/test/ex1_for.c
index 5a9d6972..dd68ebfc 100644
--- a/external/hypre/src/test/ex1_for.c
+++ b/external/hypre/src/test/ex1_for.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -45,11 +45,11 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
    hypre_F90_Obj b;
    hypre_F90_Obj x;
    hypre_F90_Obj solver;
-        HYPRE_Int temp_COMM;
-        HYPRE_Int one = 1;
-        HYPRE_Int two = 2;
-        HYPRE_Int five = 5;
-     HYPRE_Real tol = 1.e-6;
+   HYPRE_Int temp_COMM;
+   HYPRE_Int one = 1;
+   HYPRE_Int two = 2;
+   HYPRE_Int five = 5;
+   HYPRE_Real tol = 1.e-6;
 #else
    HYPRE_StructGrid     grid;
    HYPRE_StructStencil  stencil;
@@ -77,7 +77,7 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
       /* Add boxes to the grid */
       if (myid == 0)
       {
-         HYPRE_Int ilower[2]={-3,1}, iupper[2]={-1,2};
+         HYPRE_Int ilower[2] = {-3, 1}, iupper[2] = {-1, 2};
 #ifdef HYPRE_FORTRAN
          HYPRE_StructGridSetExtents(&grid, &ilower[0], &iupper[0]);
 #else
@@ -86,7 +86,7 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
       }
       else if (myid == 1)
       {
-         HYPRE_Int ilower[2]={0,1}, iupper[2]={2,4};
+         HYPRE_Int ilower[2] = {0, 1}, iupper[2] = {2, 4};
 #ifdef HYPRE_FORTRAN
          HYPRE_StructGridSetExtents(&grid, &ilower[0], &iupper[0]);
 #else
@@ -116,15 +116,19 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
          relative offset (in the index space). */
       {
          HYPRE_Int entry;
-         HYPRE_Int offsets[5][2] = {{0,0}, {-1,0}, {1,0}, {0,-1}, {0,1}};
+         HYPRE_Int offsets[5][2] = {{0, 0}, {-1, 0}, {1, 0}, {0, -1}, {0, 1}};
 
          /* Assign each of the 5 stencil entries */
 #ifdef HYPRE_FORTRAN
          for (entry = 0; entry < 5; entry++)
+         {
             HYPRE_StructStencilSetElement(&stencil, &entry, offsets[entry]);
+         }
 #else
          for (entry = 0; entry < 5; entry++)
+         {
             HYPRE_StructStencilSetElement(stencil, entry, offsets[entry]);
+         }
 #endif
       }
    }
@@ -153,8 +157,8 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
          the boundary. */
       if (myid == 0)
       {
-         HYPRE_Int ilower[2]={-3,1}, iupper[2]={-1,2};
-         HYPRE_Int stencil_indices[5] = {0,1,2,3,4}; /* labels for the stencil entries -
+         HYPRE_Int ilower[2] = {-3, 1}, iupper[2] = {-1, 2};
+         HYPRE_Int stencil_indices[5] = {0, 1, 2, 3, 4}; /* labels for the stencil entries -
                                                   these correspond to the offsets
                                                   defined above */
          HYPRE_Int nentries = 5;
@@ -166,7 +170,9 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
          {
             values[i] = 4.0;
             for (j = 1; j < nentries; j++)
-               values[i+j] = -1.0;
+            {
+               values[i + j] = -1.0;
+            }
          }
 
 #ifdef HYPRE_FORTRAN
@@ -179,8 +185,8 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
       }
       else if (myid == 1)
       {
-         HYPRE_Int ilower[2]={0,1}, iupper[2]={2,4};
-         HYPRE_Int stencil_indices[5] = {0,1,2,3,4};
+         HYPRE_Int ilower[2] = {0, 1}, iupper[2] = {2, 4};
+         HYPRE_Int stencil_indices[5] = {0, 1, 2, 3, 4};
          HYPRE_Int nentries = 5;
          HYPRE_Int nvalues  = 60; /* 12 grid points, each with 5 stencil entries */
          HYPRE_Real values[60];
@@ -189,7 +195,9 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
          {
             values[i] = 4.0;
             for (j = 1; j < nentries; j++)
-               values[i+j] = -1.0;
+            {
+               values[i + j] = -1.0;
+            }
          }
 
 #ifdef HYPRE_FORTRAN
@@ -206,14 +214,16 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
       {
          HYPRE_Real values[3];
          for (i = 0; i < 3; i++)
+         {
             values[i] = 0.0;
+         }
          {
             /* values below our box */
-            HYPRE_Int ilower[2]={-3,1}, iupper[2]={-1,1};
+            HYPRE_Int ilower[2] = {-3, 1}, iupper[2] = {-1, 1};
             HYPRE_Int stencil_indices[1] = {3};
 #ifdef HYPRE_FORTRAN
             HYPRE_StructMatrixSetBoxValues(&A, &ilower[0], &iupper[0], &one,
-                                        &stencil_indices[0], &values[0]);
+                                           &stencil_indices[0], &values[0]);
 #else
             HYPRE_StructMatrixSetBoxValues(A, ilower, iupper, 1,
                                            stencil_indices, values);
@@ -221,11 +231,11 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
          }
          {
             /* values to the left of our box */
-            HYPRE_Int ilower[2]={-3,1}, iupper[2]={-3,2};
+            HYPRE_Int ilower[2] = {-3, 1}, iupper[2] = {-3, 2};
             HYPRE_Int stencil_indices[1] = {1};
 #ifdef HYPRE_FORTRAN
             HYPRE_StructMatrixSetBoxValues(&A, &ilower[0], &iupper[0], &one,
-                                        &stencil_indices[0], &values[0]);
+                                           &stencil_indices[0], &values[0]);
 #else
             HYPRE_StructMatrixSetBoxValues(A, ilower, iupper, 1,
                                            stencil_indices, values);
@@ -233,11 +243,11 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
          }
          {
             /* values above our box */
-            HYPRE_Int ilower[2]={-3,2}, iupper[2]={-1,2};
+            HYPRE_Int ilower[2] = {-3, 2}, iupper[2] = {-1, 2};
             HYPRE_Int stencil_indices[1] = {4};
 #ifdef HYPRE_FORTRAN
             HYPRE_StructMatrixSetBoxValues(&A, &ilower[0], &iupper[0], &one,
-                                        &stencil_indices[0], &values[0]);
+                                           &stencil_indices[0], &values[0]);
 #else
             HYPRE_StructMatrixSetBoxValues(A, ilower, iupper, 1,
                                            stencil_indices, values);
@@ -248,14 +258,16 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
       {
          HYPRE_Real values[4];
          for (i = 0; i < 4; i++)
+         {
             values[i] = 0.0;
+         }
          {
             /* values below our box */
-            HYPRE_Int ilower[2]={0,1}, iupper[2]={2,1};
+            HYPRE_Int ilower[2] = {0, 1}, iupper[2] = {2, 1};
             HYPRE_Int stencil_indices[1] = {3};
 #ifdef HYPRE_FORTRAN
             HYPRE_StructMatrixSetBoxValues(&A, &ilower[0], &iupper[0], &one,
-                                        &stencil_indices[0], &values[0]);
+                                           &stencil_indices[0], &values[0]);
 #else
             HYPRE_StructMatrixSetBoxValues(A, ilower, iupper, 1,
                                            stencil_indices, values);
@@ -264,11 +276,11 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
          {
             /* values to the right of our box
                (that do not border the other box on proc. 0) */
-            HYPRE_Int ilower[2]={2,1}, iupper[2]={2,4};
+            HYPRE_Int ilower[2] = {2, 1}, iupper[2] = {2, 4};
             HYPRE_Int stencil_indices[1] = {2};
 #ifdef HYPRE_FORTRAN
             HYPRE_StructMatrixSetBoxValues(&A, &ilower[0], &iupper[0], &one,
-                                        &stencil_indices[0], &values[0]);
+                                           &stencil_indices[0], &values[0]);
 #else
             HYPRE_StructMatrixSetBoxValues(A, ilower, iupper, 1,
                                            stencil_indices, values);
@@ -276,11 +288,11 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
          }
          {
             /* values above our box */
-            HYPRE_Int ilower[2]={0,4}, iupper[2]={2,4};
+            HYPRE_Int ilower[2] = {0, 4}, iupper[2] = {2, 4};
             HYPRE_Int stencil_indices[1] = {4};
 #ifdef HYPRE_FORTRAN
             HYPRE_StructMatrixSetBoxValues(&A, &ilower[0], &iupper[0], &one,
-                                        &stencil_indices[0], &values[0]);
+                                           &stencil_indices[0], &values[0]);
 #else
             HYPRE_StructMatrixSetBoxValues(A, ilower, iupper, 1,
                                            stencil_indices, values);
@@ -288,11 +300,11 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
          }
          {
             /* values to the left of our box */
-            HYPRE_Int ilower[2]={0,3}, iupper[2]={0,4};
+            HYPRE_Int ilower[2] = {0, 3}, iupper[2] = {0, 4};
             HYPRE_Int stencil_indices[1] = {1};
 #ifdef HYPRE_FORTRAN
             HYPRE_StructMatrixSetBoxValues(&A, &ilower[0], &iupper[0], &one,
-                                        &stencil_indices[0], &values[0]);
+                                           &stencil_indices[0], &values[0]);
 #else
             HYPRE_StructMatrixSetBoxValues(A, ilower, iupper, 1,
                                            stencil_indices, values);
@@ -333,11 +345,13 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
       /* Set the vector coefficients */
       if (myid == 0)
       {
-         HYPRE_Int ilower[2]={-3,1}, iupper[2]={-1,2};
+         HYPRE_Int ilower[2] = {-3, 1}, iupper[2] = {-1, 2};
          HYPRE_Real values[6]; /* 6 grid points */
 
          for (i = 0; i < 6; i ++)
+         {
             values[i] = 1.0;
+         }
 #ifdef HYPRE_FORTRAN
          HYPRE_StructVectorSetBoxValues(&b, &ilower[0], &iupper[0], &values[0]);
 #else
@@ -345,7 +359,9 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
 #endif
 
          for (i = 0; i < 6; i ++)
+         {
             values[i] = 0.0;
+         }
 #ifdef HYPRE_FORTRAN
          HYPRE_StructVectorSetBoxValues(&x, &ilower[0], &iupper[0], &values[0]);
 #else
@@ -354,11 +370,13 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
       }
       else if (myid == 1)
       {
-         HYPRE_Int ilower[2]={0,1}, iupper[2]={2,4};
+         HYPRE_Int ilower[2] = {0, 1}, iupper[2] = {2, 4};
          HYPRE_Real values[12]; /* 12 grid points */
 
          for (i = 0; i < 12; i ++)
+         {
             values[i] = 1.0;
+         }
 #ifdef HYPRE_FORTRAN
          HYPRE_StructVectorSetBoxValues(&b, &ilower[0], &iupper[0], &values[0]);
 #else
@@ -366,7 +384,9 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
 #endif
 
          for (i = 0; i < 12; i ++)
+         {
             values[i] = 0.0;
+         }
 #ifdef HYPRE_FORTRAN
          HYPRE_StructVectorSetBoxValues(&x, &ilower[0], &iupper[0], &values[0]);
 #else
diff --git a/external/hypre/src/test/ex3_for.c b/external/hypre/src/test/ex3_for.c
index 7cb4dcb5..fb76aeaa 100644
--- a/external/hypre/src/test/ex3_for.c
+++ b/external/hypre/src/test/ex3_for.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -74,15 +74,15 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
    hypre_F90_Obj x;
    hypre_F90_Obj solver;
    hypre_F90_Obj precond;
-        HYPRE_Int temp_COMM;
-        HYPRE_Int precond_id;
-        HYPRE_Int zero = 0;
-        HYPRE_Int one = 1;
-        HYPRE_Int two = 2;
-        HYPRE_Int five = 5;
-        HYPRE_Int fifty = 50;
-     HYPRE_Real zero_dot = 0.0;
-     HYPRE_Real tol = 1.e-6;
+   HYPRE_Int temp_COMM;
+   HYPRE_Int precond_id;
+   HYPRE_Int zero = 0;
+   HYPRE_Int one = 1;
+   HYPRE_Int two = 2;
+   HYPRE_Int five = 5;
+   HYPRE_Int fifty = 50;
+   HYPRE_Real zero_dot = 0.0;
+   HYPRE_Real tol = 1.e-6;
 #else
    HYPRE_StructGrid     grid;
    HYPRE_StructStencil  stencil;
@@ -173,19 +173,19 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
    /* Figure out the processor grid (N x N).  The local problem
       size for the interior nodes is indicated by n (n x n).
       pi and pj indicate position in the processor grid. */
-   N  = sqrt(num_procs);
-   h  = 1.0 / (N*n+1); /* note that when calculating h we must
+   N  = hypre_sqrt(num_procs);
+   h  = 1.0 / (N * n + 1); /* note that when calculating h we must
                           remember to count the bounday nodes */
-   h2 = h*h;
+   h2 = h * h;
    pj = myid / N;
-   pi = myid - pj*N;
+   pi = myid - pj * N;
 
-  /* Figure out the extents of each processor's piece of the grid. */
-   ilower[0] = pi*n;
-   ilower[1] = pj*n;
+   /* Figure out the extents of each processor's piece of the grid. */
+   ilower[0] = pi * n;
+   ilower[1] = pj * n;
 
-   iupper[0] = ilower[0] + n-1;
-   iupper[1] = ilower[1] + n-1;
+   iupper[0] = ilower[0] + n - 1;
+   iupper[1] = ilower[1] + n - 1;
 
    /* 1. Set up a grid */
    {
@@ -222,10 +222,12 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
       /* Define the geometry of the stencil */
       {
          HYPRE_Int entry;
-         HYPRE_Int offsets[5][2] = {{0,0}, {-1,0}, {1,0}, {0,-1}, {0,1}};
+         HYPRE_Int offsets[5][2] = {{0, 0}, {-1, 0}, {1, 0}, {0, -1}, {0, 1}};
 
          for (entry = 0; entry < 5; entry++)
+         {
             HYPRE_StructStencilSetElement(&stencil, &entry, offsets[entry]);
+         }
       }
 #else
       /* Create an empty 2D, 5-pt stencil object */
@@ -234,10 +236,12 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
       /* Define the geometry of the stencil */
       {
          HYPRE_Int entry;
-         HYPRE_Int offsets[5][2] = {{0,0}, {-1,0}, {1,0}, {0,-1}, {0,1}};
+         HYPRE_Int offsets[5][2] = {{0, 0}, {-1, 0}, {1, 0}, {0, -1}, {0, 1}};
 
          for (entry = 0; entry < 5; entry++)
+         {
             HYPRE_StructStencilSetElement(stencil, entry, offsets[entry]);
+         }
       }
 #endif
    }
@@ -245,7 +249,7 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
    /* 3. Set up a Struct Matrix */
    {
       HYPRE_Int nentries = 5;
-      HYPRE_Int nvalues = nentries*n*n;
+      HYPRE_Int nvalues = nentries * n * n;
       HYPRE_Real *values;
       HYPRE_Int stencil_indices[5];
 
@@ -260,7 +264,9 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
       values = hypre_CTAlloc(HYPRE_Real, nvalues, HYPRE_MEMORY_HOST);
 
       for (j = 0; j < nentries; j++)
+      {
          stencil_indices[j] = j;
+      }
 
       /* Set the standard stencil at each grid point,
          we will fix the boundaries later */
@@ -268,7 +274,9 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
       {
          values[i] = 4.0;
          for (j = 1; j < nentries; j++)
-            values[i+j] = -1.0;
+         {
+            values[i + j] = -1.0;
+         }
       }
 
       HYPRE_StructMatrixSetBoxValues(&A, ilower, iupper, &nentries,
@@ -285,7 +293,9 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
       values = hypre_CTAlloc(HYPRE_Real, nvalues, HYPRE_MEMORY_HOST);
 
       for (j = 0; j < nentries; j++)
+      {
          stencil_indices[j] = j;
+      }
 
       /* Set the standard stencil at each grid point,
          we will fix the boundaries later */
@@ -293,7 +303,9 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
       {
          values[i] = 4.0;
          for (j = 1; j < nentries; j++)
-            values[i+j] = -1.0;
+         {
+            values[i + j] = -1.0;
+         }
       }
 
       HYPRE_StructMatrixSetBoxValues(A, ilower, iupper, nentries,
@@ -310,23 +322,25 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
       HYPRE_Int bc_ilower[2];
       HYPRE_Int bc_iupper[2];
       HYPRE_Int nentries = 1;
-      HYPRE_Int nvalues  = nentries*n; /*  number of stencil entries times the length
+      HYPRE_Int nvalues  = nentries * n; /*  number of stencil entries times the length
                                      of one side of my grid box */
       HYPRE_Real *values;
       HYPRE_Int stencil_indices[1];
 
       values = hypre_CTAlloc(HYPRE_Real, nvalues, HYPRE_MEMORY_HOST);
       for (j = 0; j < nvalues; j++)
-            values[j] = 0.0;
+      {
+         values[j] = 0.0;
+      }
 
       /* Recall: pi and pj describe position in the processor grid */
       if (pj == 0)
       {
          /* bottom row of grid points */
-         bc_ilower[0] = pi*n;
-         bc_ilower[1] = pj*n;
+         bc_ilower[0] = pi * n;
+         bc_ilower[1] = pj * n;
 
-         bc_iupper[0] = bc_ilower[0] + n-1;
+         bc_iupper[0] = bc_ilower[0] + n - 1;
          bc_iupper[1] = bc_ilower[1];
 
          stencil_indices[0] = 3;
@@ -340,13 +354,13 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
 #endif
       }
 
-      if (pj == N-1)
+      if (pj == N - 1)
       {
          /* upper row of grid points */
-         bc_ilower[0] = pi*n;
-         bc_ilower[1] = pj*n + n-1;
+         bc_ilower[0] = pi * n;
+         bc_ilower[1] = pj * n + n - 1;
 
-         bc_iupper[0] = bc_ilower[0] + n-1;
+         bc_iupper[0] = bc_ilower[0] + n - 1;
          bc_iupper[1] = bc_ilower[1];
 
          stencil_indices[0] = 4;
@@ -363,11 +377,11 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
       if (pi == 0)
       {
          /* left row of grid points */
-         bc_ilower[0] = pi*n;
-         bc_ilower[1] = pj*n;
+         bc_ilower[0] = pi * n;
+         bc_ilower[1] = pj * n;
 
          bc_iupper[0] = bc_ilower[0];
-         bc_iupper[1] = bc_ilower[1] + n-1;
+         bc_iupper[1] = bc_ilower[1] + n - 1;
 
          stencil_indices[0] = 1;
 
@@ -380,14 +394,14 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
 #endif
       }
 
-      if (pi == N-1)
+      if (pi == N - 1)
       {
          /* right row of grid points */
-         bc_ilower[0] = pi*n + n-1;
-         bc_ilower[1] = pj*n;
+         bc_ilower[0] = pi * n + n - 1;
+         bc_ilower[1] = pj * n;
 
          bc_iupper[0] = bc_ilower[0];
-         bc_iupper[1] = bc_ilower[1] + n-1;
+         bc_iupper[1] = bc_ilower[1] + n - 1;
 
          stencil_indices[0] = 2;
 
@@ -413,7 +427,7 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
 
    /* 5. Set up Struct Vectors for b and x */
    {
-      HYPRE_Int    nvalues = n*n;
+      HYPRE_Int    nvalues = n * n;
       HYPRE_Real *values;
 
       values = hypre_CTAlloc(HYPRE_Real, nvalues, HYPRE_MEMORY_HOST);
@@ -437,9 +451,11 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
       HYPRE_StructVectorInitialize(x);
 #endif
 
-     /* Set the values */
+      /* Set the values */
       for (i = 0; i < nvalues; i ++)
+      {
          values[i] = h2;
+      }
 #ifdef HYPRE_FORTRAN
       HYPRE_StructVectorSetBoxValues(&b, ilower, iupper, values);
 #else
@@ -447,7 +463,9 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
 #endif
 
       for (i = 0; i < nvalues; i ++)
+      {
          values[i] = 0.0;
+      }
 #ifdef HYPRE_FORTRAN
       HYPRE_StructVectorSetBoxValues(&x, ilower, iupper, values);
 #else
@@ -522,7 +540,7 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
 
       /* Set the preconditioner and solve */
       HYPRE_StructPCGSetPrecond(solver, HYPRE_StructSMGSolve,
-                                  HYPRE_StructSMGSetup, precond);
+                                HYPRE_StructSMGSetup, precond);
       HYPRE_StructPCGSetup(solver, A, b, x);
       HYPRE_StructPCGSolve(solver, A, b, x);
 
@@ -586,10 +604,14 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
    /* Print the solution and other info */
 #ifdef HYPRE_FORTRAN
    if (print_solution)
+   {
       HYPRE_StructVectorPrint(&x, &zero);
+   }
 #else
    if (print_solution)
+   {
       HYPRE_StructVectorPrint("struct.out.x", x, 0);
+   }
 #endif
 
    if (myid == 0)
diff --git a/external/hypre/src/test/ex5_for.c b/external/hypre/src/test/ex5_for.c
index 824d0267..fedd167c 100644
--- a/external/hypre/src/test/ex5_for.c
+++ b/external/hypre/src/test/ex5_for.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -62,19 +62,19 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
    hypre_F90_Obj solver, precond;
 
    hypre_F90_Obj long_temp_COMM;
-        HYPRE_Int temp_COMM;
-        HYPRE_Int precond_id;
+   HYPRE_Int temp_COMM;
+   HYPRE_Int precond_id;
 
-        HYPRE_Int one = 1;
-        HYPRE_Int two = 2;
-        HYPRE_Int three = 3;
-        HYPRE_Int six = 6;
-        HYPRE_Int twenty = 20;
-        HYPRE_Int thousand = 1000;
-        HYPRE_Int hypre_type = HYPRE_PARCSR;
+   HYPRE_Int one = 1;
+   HYPRE_Int two = 2;
+   HYPRE_Int three = 3;
+   HYPRE_Int six = 6;
+   HYPRE_Int twenty = 20;
+   HYPRE_Int thousand = 1000;
+   HYPRE_Int hypre_type = HYPRE_PARCSR;
 
-     HYPRE_Real oo1 = 1.e-3;
-     HYPRE_Real tol = 1.e-7;
+   HYPRE_Real oo1 = 1.e-3;
+   HYPRE_Real tol = 1.e-7;
 #else
    HYPRE_IJMatrix A;
    HYPRE_ParCSRMatrix parcsr_A;
@@ -152,22 +152,22 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
    }
 
    /* Preliminaries: want at least one processor per row */
-   if (n*n < num_procs) n = sqrt(num_procs) + 1;
-   N = n*n; /* global number of rows */
-   h = 1.0/(n+1); /* mesh size*/
-   h2 = h*h;
+   if (n * n < num_procs) { n = hypre_sqrt(num_procs) + 1; }
+   N = n * n; /* global number of rows */
+   h = 1.0 / (n + 1); /* mesh size*/
+   h2 = h * h;
 
    /* Each processor knows only of its own rows - the range is denoted by ilower
       and upper.  Here we partition the rows. We account for the fact that
       N may not divide evenly by the number of processors. */
-   local_size = N/num_procs;
-   extra = N - local_size*num_procs;
+   local_size = N / num_procs;
+   extra = N - local_size * num_procs;
 
-   ilower = local_size*myid;
+   ilower = local_size * myid;
    ilower += hypre_min(myid, extra);
 
-   iupper = local_size*(myid+1);
-   iupper += hypre_min(myid+1, extra);
+   iupper = local_size * (myid + 1);
+   iupper += hypre_min(myid + 1, extra);
    iupper = iupper - 1;
 
    /* How many rows do I have? */
@@ -217,17 +217,17 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
          nnz = 0;
 
          /* The left identity block:position i-n */
-         if ((i-n)>=0)
+         if ((i - n) >= 0)
          {
-            cols[nnz] = i-n;
+            cols[nnz] = i - n;
             values[nnz] = -1.0;
             nnz++;
          }
 
          /* The left -1: position i-1 */
-         if (i%n)
+         if (i % n)
          {
-            cols[nnz] = i-1;
+            cols[nnz] = i - 1;
             values[nnz] = -1.0;
             nnz++;
          }
@@ -238,17 +238,17 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
          nnz++;
 
          /* The right -1: position i+1 */
-         if ((i+1)%n)
+         if ((i + 1) % n)
          {
-            cols[nnz] = i+1;
+            cols[nnz] = i + 1;
             values[nnz] = -1.0;
             nnz++;
          }
 
          /* The right identity block:position i+n */
-         if ((i+n)< N)
+         if ((i + n) < N)
          {
-            cols[nnz] = i+n;
+            cols[nnz] = i + n;
             values[nnz] = -1.0;
             nnz++;
          }
@@ -283,7 +283,7 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
    HYPRE_IJVectorSetObjectType(&b, &hypre_type);
    HYPRE_IJVectorInitialize(&b);
 #else
-   HYPRE_IJVectorCreate(hypre_MPI_COMM_WORLD, ilower, iupper,&b);
+   HYPRE_IJVectorCreate(hypre_MPI_COMM_WORLD, ilower, iupper, &b);
    HYPRE_IJVectorSetObjectType(b, HYPRE_PARCSR);
    HYPRE_IJVectorInitialize(b);
 #endif
@@ -293,7 +293,7 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
    HYPRE_IJVectorSetObjectType(&x, &hypre_type);
    HYPRE_IJVectorInitialize(&x);
 #else
-   HYPRE_IJVectorCreate(hypre_MPI_COMM_WORLD, ilower, iupper,&x);
+   HYPRE_IJVectorCreate(hypre_MPI_COMM_WORLD, ilower, iupper, &x);
    HYPRE_IJVectorSetObjectType(x, HYPRE_PARCSR);
    HYPRE_IJVectorInitialize(x);
 #endif
@@ -307,7 +307,7 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
       x_values = hypre_CTAlloc(HYPRE_Real, local_size, HYPRE_MEMORY_HOST);
       rows = hypre_CTAlloc(HYPRE_Int, local_size, HYPRE_MEMORY_HOST);
 
-      for (i=0; i<local_size; i++)
+      for (i = 0; i < local_size; i++)
       {
          rhs_values[i] = h2;
          x_values[i] = 0.0;
@@ -650,16 +650,20 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
    }
    else
    {
-      if (myid ==0) hypre_printf("Invalid solver id specified.\n");
+      if (myid == 0) { hypre_printf("Invalid solver id specified.\n"); }
    }
 
    /* Print the solution */
 #ifdef HYPRE_FORTRAN
    if (print_solution)
+   {
       HYPRE_IJVectorPrint(&x, "ij.out.x");
+   }
 #else
    if (print_solution)
+   {
       HYPRE_IJVectorPrint(x, "ij.out.x");
+   }
 #endif
 
    /* Clean up */
@@ -676,5 +680,5 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
    /* Finalize MPI*/
    hypre_MPI_Finalize();
 
-   return(0);
+   return (0);
 }
diff --git a/external/hypre/src/test/ex6_for.c b/external/hypre/src/test/ex6_for.c
index 0af8ac80..0771c772 100644
--- a/external/hypre/src/test/ex6_for.c
+++ b/external/hypre/src/test/ex6_for.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -89,14 +89,14 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
 
    if (num_procs != 2)
    {
-      if (myid ==0) hypre_printf("Must run with 2 processors!\n");
+      if (myid == 0) { hypre_printf("Must run with 2 processors!\n"); }
       hypre_MPI_Finalize();
 
-      return(0);
+      return (0);
    }
 #ifdef HYPRE_FORTRAN
-      temp_COMM = (HYPRE_Int) hypre_MPI_COMM_WORLD;
-      long_temp_COMM = (hypre_F90_Obj) hypre_MPI_COMM_WORLD;
+   temp_COMM = (HYPRE_Int) hypre_MPI_COMM_WORLD;
+   long_temp_COMM = (hypre_F90_Obj) hypre_MPI_COMM_WORLD;
 #endif
 
    /* 1. Set up the 2D grid.  This gives the index space in each part.
@@ -175,7 +175,7 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
          HYPRE_SStructVariable vartypes[1] = {HYPRE_SSTRUCT_VARIABLE_CELL};
 #endif
 
-         for (i = 0; i< nparts; i++)
+         for (i = 0; i < nparts; i++)
 
 #ifdef HYPRE_FORTRAN
             HYPRE_SStructGridSetVariables(&grid, &i, &nvars, &vartypes[0]);
@@ -207,7 +207,7 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
          relative offset (in the index space). */
       {
          HYPRE_Int entry;
-         HYPRE_Int offsets[5][2] = {{0,0}, {-1,0}, {1,0}, {0,-1}, {0,1}};
+         HYPRE_Int offsets[5][2] = {{0, 0}, {-1, 0}, {1, 0}, {0, -1}, {0, 1}};
          HYPRE_Int var = 0;
 
          /* Assign numerical values to the offsets so that we can
@@ -262,7 +262,7 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
 
    /* 4. Set up a SStruct Matrix */
    {
-      HYPRE_Int i,j;
+      HYPRE_Int i, j;
       HYPRE_Int part = 0;
       HYPRE_Int var = 0;
 
@@ -318,13 +318,17 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
             for (j = 0; j < nentries; j++) /* label the stencil indices -
                                               these correspond to the offsets
                                               defined above */
+            {
                stencil_indices[j] = j;
+            }
 
             for (i = 0; i < nvalues; i += nentries)
             {
                values[i] = 4.0;
                for (j = 1; j < nentries; j++)
-                  values[i+j] = -1.0;
+               {
+                  values[i + j] = -1.0;
+               }
             }
 
 
@@ -351,13 +355,17 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
 
             HYPRE_Int stencil_indices[5];
             for (j = 0; j < nentries; j++)
+            {
                stencil_indices[j] = j;
+            }
 
             for (i = 0; i < nvalues; i += nentries)
             {
                values[i] = 4.0;
                for (j = 1; j < nentries; j++)
-                  values[i+j] = -1.0;
+               {
+                  values[i + j] = -1.0;
+               }
             }
 
 
@@ -386,13 +394,17 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
 
             HYPRE_Int stencil_indices[5];
             for (j = 0; j < nentries; j++)
+            {
                stencil_indices[j] = j;
+            }
 
             for (i = 0; i < nvalues; i += nentries)
             {
                values[i] = 4.0;
                for (j = 1; j < nentries; j++)
-                  values[i+j] = -1.0;
+               {
+                  values[i + j] = -1.0;
+               }
             }
 
 
@@ -416,7 +428,9 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
          HYPRE_Real values[6];
 
          for (i = 0; i < maxnvalues; i++)
+         {
             values[i] = 0.0;
+         }
 
          {
             /* Values below our first AND second box */
@@ -519,7 +533,9 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
          HYPRE_Int maxnvalues = 4;
          HYPRE_Real values[4];
          for (i = 0; i < maxnvalues; i++)
+         {
             values[i] = 0.0;
+         }
 
          {
             /* Values below our box */
@@ -641,7 +657,9 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
             HYPRE_Real values[6];
 
             for (i = 0; i < nvalues; i ++)
+            {
                values[i] = 1.0;
+            }
 
 #ifdef HYPRE_FORTRAN
             HYPRE_SStructVectorSetBoxValues(&b, &part, &ilower[0], &iupper[0], &var, &values[0]);
@@ -650,7 +668,9 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
 #endif
 
             for (i = 0; i < nvalues; i ++)
+            {
                values[i] = 0.0;
+            }
 
 #ifdef HYPRE_FORTRAN
             HYPRE_SStructVectorSetBoxValues(&x, &part, &ilower[0], &iupper[0], &var, &values[0]);
@@ -668,7 +688,9 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
             HYPRE_Real values[12];
 
             for (i = 0; i < nvalues; i ++)
+            {
                values[i] = 1.0;
+            }
 
 #ifdef HYPRE_FORTRAN
             HYPRE_SStructVectorSetBoxValues(&b, &part, &ilower[0], &iupper[0], &var, &values[0]);
@@ -677,7 +699,9 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
 #endif
 
             for (i = 0; i < nvalues; i ++)
+            {
                values[i] = 0.0;
+            }
 
 #ifdef HYPRE_FORTRAN
             HYPRE_SStructVectorSetBoxValues(&x, &part, &ilower[0], &iupper[0], &var, &values[0]);
@@ -697,7 +721,9 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
             HYPRE_Real values[16];
 
             for (i = 0; i < nvalues; i ++)
+            {
                values[i] = 1.0;
+            }
 
 #ifdef HYPRE_FORTRAN
             HYPRE_SStructVectorSetBoxValues(&b, &part, &ilower[0], &iupper[0], &var, &values[0]);
@@ -706,7 +732,9 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
 #endif
 
             for (i = 0; i < nvalues; i ++)
+            {
                values[i] = 0.0;
+            }
 
 #ifdef HYPRE_FORTRAN
             HYPRE_SStructVectorSetBoxValues(&x, &part, &ilower[0], &iupper[0], &var, &values[0]);
@@ -809,7 +837,7 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
       HYPRE_StructPCGSolve(&solver, &sA, &sb, &sx);
 #else
       HYPRE_StructPCGSetPrecond(solver, HYPRE_StructSMGSolve,
-                           HYPRE_StructSMGSetup, precond);
+                                HYPRE_StructSMGSetup, precond);
       HYPRE_StructPCGSetup(solver, sA, sb, sx);
       HYPRE_StructPCGSolve(solver, sA, sb, sx);
 #endif
diff --git a/external/hypre/src/test/ex7_for.c b/external/hypre/src/test/ex7_for.c
index 4a1191ef..a0d1f0be 100644
--- a/external/hypre/src/test/ex7_for.c
+++ b/external/hypre/src/test/ex7_for.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -52,9 +52,9 @@
 #include "HYPRE_sstruct_ls.h"
 
 #ifdef M_PI
-  #define PI M_PI
+#define PI M_PI
 #else
-  #define PI 3.14159265358979
+#define PI 3.14159265358979
 #endif
 
 /* Macro to evaluate a function F in the grid point (i,j) */
@@ -77,17 +77,25 @@ HYPRE_Real K(HYPRE_Real x, HYPRE_Real y)
       case 0:
          return 1.0;
       case 1:
-         return x*x+exp(y);
+         return x * x + exp(y);
       case 2:
-         if ((fabs(x-0.5) < 0.25) && (fabs(y-0.5) < 0.25))
+         if ((fabs(x - 0.5) < 0.25) && (fabs(y - 0.5) < 0.25))
+         {
             return 100.0;
+         }
          else
+         {
             return 1.0;
+         }
       case 3:
-         if (((x-0.5)*(x-0.5)+(y-0.5)*(y-0.5)) < 0.0625)
+         if (((x - 0.5) * (x - 0.5) + (y - 0.5) * (y - 0.5)) < 0.0625)
+         {
             return 10.0;
+         }
          else
+         {
             return 1.0;
+         }
       default:
          return 1.0;
    }
@@ -153,9 +161,9 @@ HYPRE_Real U0(HYPRE_Real x, HYPRE_Real y)
       case 0:
          return 0.0;
       case 1:
-         return (x+y)/100;
+         return (x + y) / 100;
       case 2:
-         return (sin(5*PI*x)+sin(5*PI*y))/1000;
+         return (hypre_sin(5 * PI * x) + hypre_sin(5 * PI * y)) / 1000;
       default:
          return 0.0;
    }
@@ -171,17 +179,25 @@ HYPRE_Real F(HYPRE_Real x, HYPRE_Real y)
       case 1:
          return 0.0;
       case 2:
-         return 2*PI*PI*sin(PI*x)*sin(PI*y);
+         return 2 * PI * PI * hypre_sin(PI * x) * hypre_sin(PI * y);
       case 3:
-         if ((fabs(x-0.5) < 0.25) && (fabs(y-0.5) < 0.25))
+         if ((fabs(x - 0.5) < 0.25) && (fabs(y - 0.5) < 0.25))
+         {
             return -1.0;
+         }
          else
+         {
             return 1.0;
+         }
       case 4:
-         if (((x-0.5)*(x-0.5)+(y-0.5)*(y-0.5)) < 0.0625)
+         if (((x - 0.5) * (x - 0.5) + (y - 0.5) * (y - 0.5)) < 0.0625)
+         {
             return -1.0;
+         }
          else
+         {
             return 1.0;
+         }
       default:
          return 1.0;
    }
@@ -403,23 +419,25 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
 
    /* Convection produces non-symmetric matrices */
    if (optionB && sym)
+   {
       optionB = 0;
+   }
 
    /* Figure out the processor grid (N x N).  The local
       problem size is indicated by n (n x n). pi and pj
       indicate position in the processor grid. */
-   N  = sqrt(num_procs);
-   h  = 1.0 / (N*n-1);
-   h2 = h*h;
+   N  = hypre_sqrt(num_procs);
+   h  = 1.0 / (N * n - 1);
+   h2 = h * h;
    pj = myid / N;
-   pi = myid - pj*N;
+   pi = myid - pj * N;
 
    /* Define the nodes owned by the current processor (each processor's
       piece of the global grid) */
-   ilower[0] = pi*n;
-   ilower[1] = pj*n;
-   iupper[0] = ilower[0] + n-1;
-   iupper[1] = ilower[1] + n-1;
+   ilower[0] = pi * n;
+   ilower[1] = pj * n;
+   iupper[0] = ilower[0] + n - 1;
+   iupper[1] = ilower[1] + n - 1;
 
    /* 1. Set up a 2D grid */
    {
@@ -453,7 +471,7 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
          HYPRE_SStructVariable vartypes[1] = {HYPRE_SSTRUCT_VARIABLE_CELL};
 #endif
 
-         for (i = 0; i< nparts; i++)
+         for (i = 0; i < nparts; i++)
 #ifdef HYPRE_FORTRAN
             HYPRE_SStructGridSetVariables(&grid, &i, &nvars, &vartypes[0]);
 #else
@@ -478,7 +496,7 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
       if (sym == 0)
       {
          /* Define the geometry of the stencil */
-         HYPRE_Int offsets[5][2] = {{0,0}, {-1,0}, {1,0}, {0,-1}, {0,1}};
+         HYPRE_Int offsets[5][2] = {{0, 0}, {-1, 0}, {1, 0}, {0, -1}, {0, 1}};
 
          /* Create an empty 2D, 5-pt stencil object */
 #ifdef HYPRE_FORTRAN
@@ -498,7 +516,7 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
       else /* Symmetric storage */
       {
          /* Define the geometry of the stencil */
-         HYPRE_Int offsets[3][2] = {{0,0}, {1,0}, {0,1}};
+         HYPRE_Int offsets[3][2] = {{0, 0}, {1, 0}, {0, 1}};
 
          /* Create an empty 2D, 3-pt stencil object */
 #ifdef HYPRE_FORTRAN
@@ -590,12 +608,14 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
       HYPRE_SStructVectorInitialize(x);
 #endif
 
-      values = hypre_CTAlloc(HYPRE_Real, (n*n), HYPRE_MEMORY_HOST);
+      values = hypre_CTAlloc(HYPRE_Real, (n * n), HYPRE_MEMORY_HOST);
 
       /* Set the values of b in left-to-right, bottom-to-top order */
       for (k = 0, j = 0; j < n; j++)
          for (i = 0; i < n; i++, k++)
-            values[k] = h2 * Eval(F,i,j);
+         {
+            values[k] = h2 * Eval(F, i, j);
+         }
 #ifdef HYPRE_FORTRAN
       HYPRE_SStructVectorSetBoxValues(&b, &part, &ilower[0], &iupper[0], &var, &values[0]);
 #else
@@ -603,8 +623,10 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
 #endif
 
       /* Set x = 0 */
-      for (i = 0; i < (n*n); i ++)
+      for (i = 0; i < (n * n); i ++)
+      {
          values[i] = 0.0;
+      }
 #ifdef HYPRE_FORTRAN
       HYPRE_SStructVectorSetBoxValues(&x, &part, &ilower[0], &iupper[0], &var, &values[0]);
 #else
@@ -661,25 +683,25 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
                                                       to the offsets */
          HYPRE_Real *values;
 
-         values = hypre_CTAlloc(HYPRE_Real, 5*(n*n), HYPRE_MEMORY_HOST);
+         values = hypre_CTAlloc(HYPRE_Real, 5 * (n * n), HYPRE_MEMORY_HOST);
 
          /* The order is left-to-right, bottom-to-top */
          for (k = 0, j = 0; j < n; j++)
-            for (i = 0; i < n; i++, k+=5)
+            for (i = 0; i < n; i++, k += 5)
             {
-               values[k+1] = - Eval(K,i-0.5,j) - Eval(B1,i-0.5,j);
+               values[k + 1] = - Eval(K, i - 0.5, j) - Eval(B1, i - 0.5, j);
 
-               values[k+2] = - Eval(K,i+0.5,j) + Eval(B1,i+0.5,j);
+               values[k + 2] = - Eval(K, i + 0.5, j) + Eval(B1, i + 0.5, j);
 
-               values[k+3] = - Eval(K,i,j-0.5) - Eval(B2,i,j-0.5);
+               values[k + 3] = - Eval(K, i, j - 0.5) - Eval(B2, i, j - 0.5);
 
-               values[k+4] = - Eval(K,i,j+0.5) + Eval(B2,i,j+0.5);
+               values[k + 4] = - Eval(K, i, j + 0.5) + Eval(B2, i, j + 0.5);
 
-               values[k] = h2 * Eval(C,i,j)
-                  + Eval(K ,i-0.5,j) + Eval(K ,i+0.5,j)
-                  + Eval(K ,i,j-0.5) + Eval(K ,i,j+0.5)
-                  - Eval(B1,i-0.5,j) + Eval(B1,i+0.5,j)
-                  - Eval(B2,i,j-0.5) + Eval(B2,i,j+0.5);
+               values[k] = h2 * Eval(C, i, j)
+                           + Eval(K, i - 0.5, j) + Eval(K, i + 0.5, j)
+                           + Eval(K, i, j - 0.5) + Eval(K, i, j + 0.5)
+                           - Eval(B1, i - 0.5, j) + Eval(B1, i + 0.5, j)
+                           - Eval(B2, i, j - 0.5) + Eval(B2, i, j + 0.5);
             }
 
 #ifdef HYPRE_FORTRAN
@@ -699,17 +721,17 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
          HYPRE_Int stencil_indices[3] = {0, 1, 2};
          HYPRE_Real *values;
 
-         values = hypre_CTAlloc(HYPRE_Real, 3*(n*n), HYPRE_MEMORY_HOST);
+         values = hypre_CTAlloc(HYPRE_Real, 3 * (n * n), HYPRE_MEMORY_HOST);
 
          /* The order is left-to-right, bottom-to-top */
          for (k = 0, j = 0; j < n; j++)
-            for (i = 0; i < n; i++, k+=3)
+            for (i = 0; i < n; i++, k += 3)
             {
-               values[k+1] = - Eval(K,i+0.5,j);
-               values[k+2] = - Eval(K,i,j+0.5);
-               values[k] = h2 * Eval(C,i,j)
-                  + Eval(K,i+0.5,j) + Eval(K,i,j+0.5)
-                  + Eval(K,i-0.5,j) + Eval(K,i,j-0.5);
+               values[k + 1] = - Eval(K, i + 0.5, j);
+               values[k + 2] = - Eval(K, i, j + 0.5);
+               values[k] = h2 * Eval(C, i, j)
+                           + Eval(K, i + 0.5, j) + Eval(K, i, j + 0.5)
+                           + Eval(K, i - 0.5, j) + Eval(K, i, j - 0.5);
             }
 
 #ifdef HYPRE_FORTRAN
@@ -743,29 +765,35 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
       HYPRE_Int var = 0;
 
       if (sym == 0)
+      {
          nentries = 5;
+      }
       else
+      {
          nentries = 3;
+      }
 
-      values  = hypre_CTAlloc(HYPRE_Real, nentries*n, HYPRE_MEMORY_HOST);
+      values  = hypre_CTAlloc(HYPRE_Real, nentries * n, HYPRE_MEMORY_HOST);
       bvalues = hypre_CTAlloc(HYPRE_Real, n, HYPRE_MEMORY_HOST);
 
       /* The stencil at the boundary nodes is 1-0-0-0-0. Because
          we have I x_b = u_0; */
-      for (i = 0; i < nentries*n; i += nentries)
+      for (i = 0; i < nentries * n; i += nentries)
       {
          values[i] = 1.0;
          for (j = 1; j < nentries; j++)
-            values[i+j] = 0.0;
+         {
+            values[i + j] = 0.0;
+         }
       }
 
       /* Processors at y = 0 */
       if (pj == 0)
       {
-         bc_ilower[0] = pi*n;
-         bc_ilower[1] = pj*n;
+         bc_ilower[0] = pi * n;
+         bc_ilower[1] = pj * n;
 
-         bc_iupper[0] = bc_ilower[0] + n-1;
+         bc_iupper[0] = bc_ilower[0] + n - 1;
          bc_iupper[1] = bc_ilower[1];
 
          /* Modify the matrix */
@@ -781,7 +809,9 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
 
          /* Put the boundary conditions in b */
          for (i = 0; i < n; i++)
-            bvalues[i] = bcEval(U0,i,0);
+         {
+            bvalues[i] = bcEval(U0, i, 0);
+         }
 
 #ifdef HYPRE_FORTRAN
          HYPRE_SStructVectorSetBoxValues(&b, &part, &bc_ilower[0],
@@ -793,12 +823,12 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
       }
 
       /* Processors at y = 1 */
-      if (pj == N-1)
+      if (pj == N - 1)
       {
-         bc_ilower[0] = pi*n;
-         bc_ilower[1] = pj*n + n-1;
+         bc_ilower[0] = pi * n;
+         bc_ilower[1] = pj * n + n - 1;
 
-         bc_iupper[0] = bc_ilower[0] + n-1;
+         bc_iupper[0] = bc_ilower[0] + n - 1;
          bc_iupper[1] = bc_ilower[1];
 
          /* Modify the matrix */
@@ -814,10 +844,12 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
 
          /* Put the boundary conditions in b */
          for (i = 0; i < n; i++)
-            bvalues[i] = bcEval(U0,i,0);
+         {
+            bvalues[i] = bcEval(U0, i, 0);
+         }
 
 #ifdef HYPRE_FORTRAN
-         HYPRE_SStructVectorSetBoxValues(&b, &part, &bc_ilower[0], 
+         HYPRE_SStructVectorSetBoxValues(&b, &part, &bc_ilower[0],
                                          &bc_iupper[0], &var, &bvalues[0]);
 #else
          HYPRE_SStructVectorSetBoxValues(b, part, bc_ilower, bc_iupper, var, bvalues);
@@ -827,11 +859,11 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
       /* Processors at x = 0 */
       if (pi == 0)
       {
-         bc_ilower[0] = pi*n;
-         bc_ilower[1] = pj*n;
+         bc_ilower[0] = pi * n;
+         bc_ilower[1] = pj * n;
 
          bc_iupper[0] = bc_ilower[0];
-         bc_iupper[1] = bc_ilower[1] + n-1;
+         bc_iupper[1] = bc_ilower[1] + n - 1;
 
          /* Modify the matrix */
 #ifdef HYPRE_FORTRAN
@@ -846,10 +878,12 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
 
          /* Put the boundary conditions in b */
          for (j = 0; j < n; j++)
-            bvalues[j] = bcEval(U0,0,j);
+         {
+            bvalues[j] = bcEval(U0, 0, j);
+         }
 
 #ifdef HYPRE_FORTRAN
-         HYPRE_SStructVectorSetBoxValues(&b, &part, &bc_ilower[0], 
+         HYPRE_SStructVectorSetBoxValues(&b, &part, &bc_ilower[0],
                                          &bc_iupper[0], &var, &bvalues[0]);
 #else
          HYPRE_SStructVectorSetBoxValues(b, part, bc_ilower, bc_iupper,
@@ -858,13 +892,13 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
       }
 
       /* Processors at x = 1 */
-      if (pi == N-1)
+      if (pi == N - 1)
       {
-         bc_ilower[0] = pi*n + n-1;
-         bc_ilower[1] = pj*n;
+         bc_ilower[0] = pi * n + n - 1;
+         bc_ilower[1] = pj * n;
 
          bc_iupper[0] = bc_ilower[0];
-         bc_iupper[1] = bc_ilower[1] + n-1;
+         bc_iupper[1] = bc_ilower[1] + n - 1;
 
          /* Modify the matrix */
 #ifdef HYPRE_FORTRAN
@@ -879,7 +913,9 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
 
          /* Put the boundary conditions in b */
          for (j = 0; j < n; j++)
-            bvalues[j] = bcEval(U0,0,j);
+         {
+            bvalues[j] = bcEval(U0, 0, j);
+         }
 
 #ifdef HYPRE_FORTRAN
          HYPRE_SStructVectorSetBoxValues(&b, &part, &bc_ilower[0], &bc_iupper[0],
@@ -902,17 +938,19 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
       /* Processors at y = 0, neighbors of boundary nodes */
       if (pj == 0)
       {
-         bc_ilower[0] = pi*n;
-         bc_ilower[1] = pj*n + 1;
+         bc_ilower[0] = pi * n;
+         bc_ilower[1] = pj * n + 1;
 
-         bc_iupper[0] = bc_ilower[0] + n-1;
+         bc_iupper[0] = bc_ilower[0] + n - 1;
          bc_iupper[1] = bc_ilower[1];
 
          stencil_indices[0] = 3;
 
          /* Modify the matrix */
          for (i = 0; i < n; i++)
+         {
             bvalues[i] = 0.0;
+         }
 
          if (sym == 0)
 #ifdef HYPRE_FORTRAN
@@ -927,13 +965,19 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
 
          /* Eliminate the boundary conditions in b */
          for (i = 0; i < n; i++)
-            bvalues[i] = bcEval(U0,i,-1) * (bcEval(K,i,-0.5)+bcEval(B2,i,-0.5));
+         {
+            bvalues[i] = bcEval(U0, i, -1) * (bcEval(K, i, -0.5) + bcEval(B2, i, -0.5));
+         }
 
          if (pi == 0)
+         {
             bvalues[0] = 0.0;
+         }
 
-         if (pi == N-1)
-            bvalues[n-1] = 0.0;
+         if (pi == N - 1)
+         {
+            bvalues[n - 1] = 0.0;
+         }
 
          /* Note the use of AddToBoxValues (because we have already set values
             at these nodes) */
@@ -949,17 +993,19 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
       /* Processors at x = 0, neighbors of boundary nodes */
       if (pi == 0)
       {
-         bc_ilower[0] = pi*n + 1;
-         bc_ilower[1] = pj*n;
+         bc_ilower[0] = pi * n + 1;
+         bc_ilower[1] = pj * n;
 
          bc_iupper[0] = bc_ilower[0];
-         bc_iupper[1] = bc_ilower[1] + n-1;
+         bc_iupper[1] = bc_ilower[1] + n - 1;
 
          stencil_indices[0] = 1;
 
          /* Modify the matrix */
          for (j = 0; j < n; j++)
+         {
             bvalues[j] = 0.0;
+         }
 
          if (sym == 0)
 #ifdef HYPRE_FORTRAN
@@ -974,13 +1020,19 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
 
          /* Eliminate the boundary conditions in b */
          for (j = 0; j < n; j++)
-            bvalues[j] = bcEval(U0,-1,j) * (bcEval(K,-0.5,j)+bcEval(B1,-0.5,j));
+         {
+            bvalues[j] = bcEval(U0, -1, j) * (bcEval(K, -0.5, j) + bcEval(B1, -0.5, j));
+         }
 
          if (pj == 0)
+         {
             bvalues[0] = 0.0;
+         }
 
-         if (pj == N-1)
-            bvalues[n-1] = 0.0;
+         if (pj == N - 1)
+         {
+            bvalues[n - 1] = 0.0;
+         }
 
 #ifdef HYPRE_FORTRAN
          HYPRE_SStructVectorAddToBoxValues(&b, &part, &bc_ilower[0], &bc_iupper[0],
@@ -991,25 +1043,31 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
       }
 
       /* Processors at y = 1, neighbors of boundary nodes */
-      if (pj == N-1)
+      if (pj == N - 1)
       {
-         bc_ilower[0] = pi*n;
-         bc_ilower[1] = pj*n + (n-1) -1;
+         bc_ilower[0] = pi * n;
+         bc_ilower[1] = pj * n + (n - 1) - 1;
 
-         bc_iupper[0] = bc_ilower[0] + n-1;
+         bc_iupper[0] = bc_ilower[0] + n - 1;
          bc_iupper[1] = bc_ilower[1];
 
          if (sym == 0)
+         {
             stencil_indices[0] = 4;
+         }
          else
+         {
             stencil_indices[0] = 2;
+         }
 
          /* Modify the matrix */
          for (i = 0; i < n; i++)
+         {
             bvalues[i] = 0.0;
+         }
 
 #ifdef HYPRE_FORTRAN
-         HYPRE_SStructMatrixSetBoxValues(&A, &part, &bc_ilower[0], &bc_iupper[0], 
+         HYPRE_SStructMatrixSetBoxValues(&A, &part, &bc_ilower[0], &bc_iupper[0],
                                          &var, &one,
                                          &stencil_indices[0], &bvalues[0]);
 #else
@@ -1019,13 +1077,19 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
 
          /* Eliminate the boundary conditions in b */
          for (i = 0; i < n; i++)
-            bvalues[i] = bcEval(U0,i,1) * (bcEval(K,i,0.5)+bcEval(B2,i,0.5));
+         {
+            bvalues[i] = bcEval(U0, i, 1) * (bcEval(K, i, 0.5) + bcEval(B2, i, 0.5));
+         }
 
          if (pi == 0)
+         {
             bvalues[0] = 0.0;
+         }
 
-         if (pi == N-1)
-            bvalues[n-1] = 0.0;
+         if (pi == N - 1)
+         {
+            bvalues[n - 1] = 0.0;
+         }
 
 #ifdef HYPRE_FORTRAN
          HYPRE_SStructVectorAddToBoxValues(&b, &part, &bc_ilower[0], &bc_iupper[0],
@@ -1037,22 +1101,28 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
       }
 
       /* Processors at x = 1, neighbors of boundary nodes */
-      if (pi == N-1)
+      if (pi == N - 1)
       {
-         bc_ilower[0] = pi*n + (n-1) - 1;
-         bc_ilower[1] = pj*n;
+         bc_ilower[0] = pi * n + (n - 1) - 1;
+         bc_ilower[1] = pj * n;
 
          bc_iupper[0] = bc_ilower[0];
-         bc_iupper[1] = bc_ilower[1] + n-1;
+         bc_iupper[1] = bc_ilower[1] + n - 1;
 
          if (sym == 0)
+         {
             stencil_indices[0] = 2;
+         }
          else
+         {
             stencil_indices[0] = 1;
+         }
 
          /* Modify the matrix */
          for (j = 0; j < n; j++)
+         {
             bvalues[j] = 0.0;
+         }
 
 #ifdef HYPRE_FORTRAN
          HYPRE_SStructMatrixSetBoxValues(&A, &part, &bc_ilower[0], &bc_iupper[0],
@@ -1066,13 +1136,19 @@ HYPRE_Int main (HYPRE_Int argc, char *argv[])
 
          /* Eliminate the boundary conditions in b */
          for (j = 0; j < n; j++)
-            bvalues[j] = bcEval(U0,1,j) * (bcEval(K,0.5,j)+bcEval(B1,0.5,j));
+         {
+            bvalues[j] = bcEval(U0, 1, j) * (bcEval(K, 0.5, j) + bcEval(B1, 0.5, j));
+         }
 
          if (pj == 0)
+         {
             bvalues[0] = 0.0;
+         }
 
-         if (pj == N-1)
-            bvalues[n-1] = 0.0;
+         if (pj == N - 1)
+         {
+            bvalues[n - 1] = 0.0;
+         }
 
 #ifdef HYPRE_FORTRAN
          HYPRE_SStructVectorAddToBoxValues(&b, &part, &bc_ilower[0], &bc_iupper[0],
diff --git a/external/hypre/src/test/f77_ij.f b/external/hypre/src/test/f77_ij.f
index 8666dd5b..6c61e83f 100644
--- a/external/hypre/src/test/f77_ij.f
+++ b/external/hypre/src/test/f77_ij.f
@@ -1,4 +1,4 @@
-!     Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+!     Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 !     HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 !
 !     SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -6,7 +6,7 @@
 !-----------------------------------------------------------------------
 ! Test driver for unstructured matrix interface (structured storage)
 !-----------------------------------------------------------------------
- 
+
 !-----------------------------------------------------------------------
 ! Standard 7-point laplacian in 3D with grid and anisotropy determined
 ! as user settings.
@@ -52,13 +52,13 @@ program test
       double precision    tol, pc_tol, convtol
       parameter           (pc_tol = 0.0)
       double precision    final_res_norm
-                     
+
 ! parameters for BoomerAMG
       integer             hybrid, coarsen_type, measure_type
       integer             cycle_type
       integer             smooth_num_sweep
       integer*8           num_grid_sweeps
-      integer*8           num_grid_sweeps2(4)
+!      integer*8           num_grid_sweeps2(4)
       integer*8           grid_relax_type
       integer*8           grid_relax_points
       integer*8           relax_weights
@@ -91,7 +91,7 @@ program test
       integer             indices(MAXZONS)
       double precision    vals(MAXZONS)
 
-      integer             dof_func(1000), j
+!      integer             dof_func(1000), j
 
 !-----------------------------------------------------------------------
 !     Initialize MPI
@@ -132,7 +132,7 @@ program test
 !-----------------------------------------------------------------------
 !     Read options
 !-----------------------------------------------------------------------
- 
+
 !     open( 5, file='parcsr_linear_solver.in', status='old')
 !
 !     read( 5, *) dim
@@ -201,7 +201,7 @@ program test
 !       write(6,*) 'What drop tolerance?  <0 do not drop'
         read(5,*) drop_tol
       endif
- 
+
 !     write(6,*) 'What relative residual norm tolerance?'
       read(5,*) tol
 
@@ -327,7 +327,7 @@ program test
       matfile(11) = '.'
       matfile(12) = 'A'
       matfile(13) = char(0)
-   
+
       call HYPRE_IJMatrixPrint(A, matfile, ierr)
 
       call hypre_ParCSRMatrixRowStarts(A_storage, row_starts, ierr)
@@ -374,7 +374,7 @@ program test
         vecfile(11) = '.'
         vecfile(12) = 'b'
         vecfile(13) = char(0)
-   
+
         call HYPRE_IJVectorPrint(b, vecfile, ierr)
 
       endif
@@ -407,7 +407,7 @@ program test
       vecfile(12) = 'x'
       vecfile(13) = '0'
       vecfile(14) = char(0)
-   
+
       call HYPRE_IJVectorPrint(x, vecfile, ierr)
 
 !-----------------------------------------------------------------------
@@ -487,11 +487,11 @@ program test
      &                                   ierr)
         call HYPRE_BoomerAMGSetDebugFlag(solver, debug_flag, ierr)
         call HYPRE_BoomerAMGSetup(solver, A_storage, b_storage,
-     &                         x_storage, ierr)
+     &                            x_storage, ierr)
         call HYPRE_BoomerAMGSolve(solver, A_storage, b_storage,
-     &                         x_storage, ierr)
-        call HYPRE_BoomerAMGGetNumIterations(solver, num_iterations, 
-     &						ierr)
+     &                            x_storage, ierr)
+        call HYPRE_BoomerAMGGetNumIterations(solver, num_iterations,
+     &                                       ierr)
         call HYPRE_BoomerAMGGetFinalReltvRes(solver, final_res_norm,
      &                                       ierr)
         call HYPRE_BoomerAMGDestroy(solver, ierr)
@@ -542,9 +542,9 @@ program test
           call HYPRE_BoomerAMGCreate(precond, ierr)
           call HYPRE_BoomerAMGSetTol(precond, pc_tol, ierr)
           call HYPRE_BoomerAMGSetCoarsenType(precond,
-     &                                    (hybrid*coarsen_type), ierr)
-          call HYPRE_BoomerAMGSetMeasureType(precond, measure_type, 
-     &						ierr)
+     &                                       hybrid*coarsen_type, ierr)
+          call HYPRE_BoomerAMGSetMeasureType(precond, measure_type,
+     &                                       ierr)
           call HYPRE_BoomerAMGSetStrongThrshld(precond,
      &                                        strong_threshold, ierr)
           call HYPRE_BoomerAMGSetTruncFactor(precond, trunc_factor,
@@ -555,11 +555,11 @@ program test
           call HYPRE_BoomerAMGSetMaxIter(precond, maxiter, ierr)
           call HYPRE_BoomerAMGSetCycleType(precond, cycle_type, ierr)
           call HYPRE_BoomerAMGInitGridRelaxatn(num_grid_sweeps,
-     &                                        grid_relax_type,
-     &                                        grid_relax_points,
-     &                                        coarsen_type,
-     &                                        relax_weights,
-     &                                        MAXLEVELS,ierr)
+     &                                         grid_relax_type,
+     &                                         grid_relax_points,
+     &                                         coarsen_type,
+     &                                         relax_weights,
+     &                                         MAXLEVELS,ierr)
           call HYPRE_BoomerAMGSetNumGridSweeps(precond,
      &                                         num_grid_sweeps, ierr)
           call HYPRE_BoomerAMGSetGridRelaxType(precond,
@@ -573,14 +573,14 @@ program test
           call HYPRE_BoomerAMGSetGridRelaxPnts(precond,
      &                                        grid_relax_points, ierr)
           call HYPRE_BoomerAMGSetMaxLevels(precond,
-     &                                  MAXLEVELS, ierr)
+     &                                     MAXLEVELS, ierr)
           call HYPRE_BoomerAMGSetMaxRowSum(precond, max_row_sum,
      &                                     ierr)
           call HYPRE_ParCSRGMRESSetPrecond(solver, precond_id,
      &                                     precond, ierr)
 
           call HYPRE_BoomerAMGSetSetupType(precond,setup_type,ierr)
-          
+
         else if (solver_id .eq. 7) then
 
           print *, 'Solver: Pilut-GMRES'
@@ -588,7 +588,7 @@ program test
           precond_id = 3
 
           call HYPRE_ParCSRPilutCreate(MPI_COMM_WORLD,
-     &                                 precond, ierr) 
+     &                                 precond, ierr)
 
           if (ierr .ne. 0) write(6,*) 'ParCSRPilutCreate error'
 
@@ -662,7 +662,7 @@ program test
         call HYPRE_ParCSRPCGSetTwoNorm(solver, one, ierr)
         call HYPRE_ParCSRPCGSetRelChange(solver, zero, ierr)
         call HYPRE_ParCSRPCGSetPrintLevel(solver, one, ierr)
-  
+
         if (solver_id .eq. 2) then
 
           print *, 'Solver: DS-PCG'
@@ -695,7 +695,7 @@ program test
           call HYPRE_BoomerAMGSetCoarsenType(precond,
      &                                       (hybrid*coarsen_type),
      &                                       ierr)
-          call HYPRE_BoomerAMGSetMeasureType(precond, measure_type, 
+          call HYPRE_BoomerAMGSetMeasureType(precond, measure_type,
      &                                       ierr)
           call HYPRE_BoomerAMGSetStrongThrshld(precond,
      &                                         strong_threshold,
@@ -780,7 +780,7 @@ program test
           call HYPRE_ParCSRCGNRSetPrecond(solver, precond_id,
      &                                    precond, ierr)
 
-        else if (solver_id .eq. 5) then 
+        else if (solver_id .eq. 5) then
 
           print *, 'Solver: AMG-CGNR'
 
@@ -802,7 +802,7 @@ program test
           call HYPRE_BoomerAMGSetCoarsenType(precond,
      &                                       (hybrid*coarsen_type),
      &                                       ierr)
-          call HYPRE_BoomerAMGSetMeasureType(precond, measure_type, 
+          call HYPRE_BoomerAMGSetMeasureType(precond, measure_type,
      &                                       ierr)
           call HYPRE_BoomerAMGSetStrongThrshld(precond,
      &                                         strong_threshold, ierr)
@@ -860,7 +860,7 @@ program test
 
         if (solver_id .eq. 5) then
           call HYPRE_BoomerAMGDestroy(precond, ierr)
-        endif 
+        endif
 
         call HYPRE_ParCSRCGNRDestroy(solver, ierr)
 
@@ -907,7 +907,7 @@ program test
           call HYPRE_BoomerAMGSetCoarsenType(precond,
      &                                       (hybrid*coarsen_type),
      &                                       ierr)
-          call HYPRE_BoomerAMGSetMeasureType(precond, measure_type, 
+          call HYPRE_BoomerAMGSetMeasureType(precond, measure_type,
      &                                       ierr)
           call HYPRE_BoomerAMGSetStrongThrshld(precond,
      &                                         strong_threshold,
@@ -992,7 +992,7 @@ program test
       vecfile(11) = '.'
       vecfile(12) = 'x'
       vecfile(13) = char(0)
-   
+
       call HYPRE_IJVectorPrint(x, vecfile, ierr)
 
       if (myid .eq. 0) then
diff --git a/external/hypre/src/test/f77_ij_mv.f b/external/hypre/src/test/f77_ij_mv.f
deleted file mode 100644
index e8a4f308..00000000
--- a/external/hypre/src/test/f77_ij_mv.f
+++ /dev/null
@@ -1,434 +0,0 @@
-!     Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
-!     HYPRE Project Developers. See the top-level COPYRIGHT file for details.
-!
-!     SPDX-License-Identifier: (Apache-2.0 OR MIT)
-
-!-----------------------------------------------------------------------
-! Test driver for unstructured matrix-vector interface
-!-----------------------------------------------------------------------
- 
-      program test
-
-      implicit none
-
-      include 'mpif.h'
-
-      integer MAXZONS, MAXBLKS, MAXDIM, MAXLEVELS
-      integer HYPRE_PARCSR
-
-      parameter (MAXZONS=4194304)
-      parameter (MAXBLKS=32)
-      parameter (MAXDIM=3)
-      parameter (MAXLEVELS=25)
-      parameter (HYPRE_PARCSR=5555)
-
-      integer             num_procs, myid
-
-      integer             dim
-      integer             nx, ny, nz
-      integer             Px, Py, Pz
-      double precision    cx, cy, cz
-
-      integer             generate_matrix, generate_vec
-      character           matfile(32), vecfile(32)
-      character*32        matfile_str, vecfile_str
-
-      integer*8           A, A_storage
-      integer*8           x, b
-
-      double precision    values(4)
-
-      integer             p, q, r
-
-      integer             ierr
-
-      integer             i
-      integer             first_local_row, last_local_row
-      integer             first_local_col, last_local_col
-      integer             indices(MAXZONS)
-
-      double precision    vals(MAXZONS)
-      double precision    bvals(MAXZONS)
-      double precision    xvals(MAXZONS)
-      double precision    sum
-
-!-----------------------------------------------------------------------
-!     Initialize MPI
-!-----------------------------------------------------------------------
-
-      call MPI_INIT(ierr)
-
-      call MPI_COMM_RANK(MPI_COMM_WORLD, myid, ierr)
-      call MPI_COMM_SIZE(MPI_COMM_WORLD, num_procs, ierr)
-
-!-----------------------------------------------------------------------
-!     Set defaults
-!-----------------------------------------------------------------------
-
-      dim = 3
-
-      nx = 10
-      ny = 10
-      nz = 10
-
-      Px  = num_procs
-      Py  = 1
-      Pz  = 1
-
-      cx = 1.0
-      cy = 1.0
-      cz = 1.0
-
-!-----------------------------------------------------------------------
-!     Read options
-!-----------------------------------------------------------------------
- 
-!     open( 5, file='parcsr_matrix_vector.in', status='old')
-!
-!     read( 5, *) dim
-!
-!     read( 5, *) nx
-!     read( 5, *) ny
-!     read( 5, *) nz
-!
-!     read( 5, *) Px
-!     read( 5, *) Py
-!     read( 5, *) Pz
-!
-!     read( 5, *) cx
-!     read( 5, *) cy
-!     read( 5, *) cz
-!
-!     write(6,*) 'Generate matrix? !0 yes, 0 no (from file)'
-      read(5,*) generate_matrix
-
-      if (generate_matrix .eq. 0) then
-!       write(6,*) 'What file to use for matrix (<= 32 chars)?'
-        read(5,*) matfile_str
-        i = 1
-  100   if (matfile_str(i:i) .ne. ' ') then
-          matfile(i) = matfile_str(i:i)
-        else
-          goto 200
-        endif
-        i = i + 1
-        goto 100
-  200   matfile(i) = char(0)
-      endif
-
-!     write(6,*) 'Generate vector? !0 yes, 0 no (from file)'
-      read(5,*) generate_vec
-
-      if (generate_vec .eq. 0) then
-!       write(6,*)
-!    &    'What file to use for vector (<= 32 chars)?'
-        read(5,*) vecfile_str
-        i = 1
-  300   if (vecfile_str(i:i) .ne. ' ') then
-          vecfile(i) = vecfile_str(i:i)
-        else
-          goto 400
-        endif
-        i = i + 1
-        goto 300
-  400   vecfile(i) = char(0)
-      endif
-
-!     close( 5 )
-
-!-----------------------------------------------------------------------
-!     Check a few things
-!-----------------------------------------------------------------------
-
-      if ((Px*Py*Pz) .ne. num_procs) then
-         print *, 'Error: Invalid number of processors or topology'
-         stop
-      endif
-
-      if ((dim .lt. 1) .or. (dim .gt. 3)) then
-         print *, 'Error: Invalid problem dimension'
-         stop
-      endif
-
-      if ((nx*ny*nz) .gt. MAXZONS) then
-         print *, 'Error: Invalid number of zones'
-         stop
-      endif
-
-!-----------------------------------------------------------------------
-!     Print driver parameters
-!-----------------------------------------------------------------------
-
-      if (myid .eq. 0) then
-         print *, 'Matrix built with these parameters:'
-         print *, '  (nx, ny, nz) = (', nx, ',', ny, ',', nz, ')'
-         print *, '  (Px, Py, Pz) = (',  Px, ',',  Py, ',',  Pz, ')'
-         print *, '  (cx, cy, cz) = (', cx, ',', cy, ',', cz, ')'
-         print *, '  dim          = ', dim
-      endif
-
-!-----------------------------------------------------------------------
-!     Compute some grid and processor information
-!-----------------------------------------------------------------------
-
-      if (dim .eq. 1) then
-
-!        compute p from Px and myid
-         p = mod(myid,Px)
-
-      elseif (dim .eq. 2) then
-
-!        compute p,q from Px, Py and myid
-         p = mod(myid,Px)
-         q = mod(((myid - p)/Px),Py)
-
-      elseif (dim .eq. 3) then
-
-!        compute p,q,r from Px,Py,Pz and myid
-         p = mod(myid,Px)
-         q = mod((( myid - p)/Px),Py)
-         r = (myid - (p + Px*q))/(Px*Py)
-
-      endif
-
-!----------------------------------------------------------------------
-!     Set up the matrix
-!-----------------------------------------------------------------------
-
-      values(2) = -cx
-      values(3) = -cy
-      values(4) = -cz
-
-      values(1) = 0.0
-      if (nx .gt. 1) values(1) = values(1) + 2d0*cx
-      if (ny .gt. 1) values(1) = values(1) + 2d0*cy
-      if (nz .gt. 1) values(1) = values(1) + 2d0*cz
-
-! Generate a Dirichlet Laplacian
-      if (generate_matrix .gt. 0) then
-
-!        Standard 7-point laplacian in 3D with grid and anisotropy
-!        determined as user settings.
-
-         call HYPRE_GenerateLaplacian(MPI_COMM_WORLD, nx, ny, nz,
-     &                                Px, Py, Pz, p, q, r, values,
-     &                                A_storage, ierr)
-
-         call HYPRE_ParCSRMatrixGetLocalRange(A_storage,
-     &             first_local_row, last_local_row,
-     &             first_local_col, last_local_col, ierr)
-
-         call HYPRE_IJMatrixCreate(MPI_COMM_WORLD,
-     &             first_local_row, last_local_row,
-     &             first_local_col, last_local_col, A, ierr)
-
-         call HYPRE_IJMatrixSetObject(A, A_storage, ierr)
-
-         if (ierr .ne. 0) write(6,*) 'Matrix object set failed'
-
-         call HYPRE_IJMatrixSetObjectType(A, HYPRE_PARCSR, ierr)
-
-      else
-
-         call HYPRE_IJMatrixRead(matfile, MPI_COMM_WORLD,
-     &                           HYPRE_PARCSR, A, ierr)
-
-         if (ierr .ne. 0) write(6,*) 'Matrix read failed'
-
-         call HYPRE_IJMatrixGetObject(A, A_storage, ierr)
-
-         if (ierr .ne. 0)
-     &      write(6,*) 'Matrix object retrieval failed'
-
-         call HYPRE_ParCSRMatrixGetLocalRange(A_storage,
-     &             first_local_row, last_local_row,
-     &             first_local_col, last_local_col, ierr)
-
-         if (ierr .ne. 0)
-     &      write(6,*) 'Matrix local range retrieval failed'
-
-      endif
-
-      matfile(1) = 'm'
-      matfile(2) = 'v'
-      matfile(3) = '.'
-      matfile(4) = 'o'
-      matfile(5) = 'u'
-      matfile(6) = 't'
-      matfile(7) = '.'
-      matfile(8) = 'A'
-      matfile(9) = char(0)
-   
-      call HYPRE_IJMatrixPrint(A, matfile, ierr)
-
-      if (ierr .ne. 0) write(6,*) 'Matrix print failed'
-  
-!-----------------------------------------------------------------------
-!     "RHS vector" test
-!-----------------------------------------------------------------------
-      if (generate_vec .gt. 0) then
-        call HYPRE_IJVectorCreate(MPI_COMM_WORLD, first_local_row,
-     &                            last_local_row, b, ierr)
-
-        if (ierr .ne. 0) write(6,*) 'RHS vector creation failed'
-  
-        call HYPRE_IJVectorSetObjectType(b, HYPRE_PARCSR, ierr)
-
-        if (ierr .ne. 0) write(6,*) 'RHS vector object set failed'
-  
-        call HYPRE_IJVectorInitialize(b, ierr)
-
-        if (ierr .ne. 0) write(6,*) 'RHS vector initialization failed'
-  
-! Set up a Dirichlet 0 problem
-        do i = 1, last_local_row - first_local_row + 1
-          indices(i) = first_local_row - 1 + i
-          vals(i) = 0.
-        enddo
-        call HYPRE_IJVectorSetValues(b,
-     &    last_local_row - first_local_row + 1, indices, vals, ierr)
-
-        vecfile(1) = 'm'
-        vecfile(2) = 'v'
-        vecfile(3) = '.'
-        vecfile(4) = 'o'
-        vecfile(5) = 'u'
-        vecfile(6) = 't'
-        vecfile(7) = '.'
-        vecfile(8) = 'b'
-        vecfile(9) = char(0)
-   
-        call HYPRE_IJVectorPrint(b, vecfile, ierr)
-
-        if (ierr .ne. 0) write(6,*) 'RHS vector print failed'
-
-      else
-
-        call HYPRE_IJVectorRead(vecfile, MPI_COMM_WORLD,
-     &                          HYPRE_PARCSR, b, ierr)
-
-        if (ierr .ne. 0) write(6,*) 'RHS vector read failed'
-
-      endif
-
-      do i = 1, last_local_row - first_local_row + 1
-        indices(i) = first_local_row - 1 + i
-      enddo
-
-      call HYPRE_IJVectorGetValues(b,
-     &  last_local_row - first_local_row + 1, indices, bvals, ierr)
-  
-      if (ierr .ne. 0) write(6,*) 'RHS vector value retrieval failed'
-  
-!     Set about to modify every other component of b, by adding the
-!     negative of the component
-
-      do i = 1, last_local_row - first_local_row + 1, 2
-        indices(i) = first_local_row - 1 + i
-        vals(i)    = -bvals(i)
-      enddo
-
-      call HYPRE_IJVectorAddToValues(b,
-     &   1 + (last_local_row - first_local_row)/2, indices, vals, ierr)
-
-      if (ierr .ne. 0) write(6,*) 'RHS vector value addition failed'
-  
-      do i = 1, last_local_row - first_local_row + 1
-        indices(i) = first_local_row - 1 + i
-      enddo
-
-      call HYPRE_IJVectorGetValues(b,
-     &  last_local_row - first_local_row + 1, indices, bvals, ierr)
-
-      if (ierr .ne. 0) write(6,*) 'RHS vector value retrieval failed'
-  
-      sum = 0.
-      do i = 1, last_local_row - first_local_row + 1, 2
-        sum = sum + bvals(i)
-      enddo
-  
-      if (sum .ne. 0.) write(6,*) 'RHS vector value addition error'
-
-!-----------------------------------------------------------------------
-!     "Solution vector" test
-!-----------------------------------------------------------------------
-      call HYPRE_IJVectorCreate(MPI_COMM_WORLD, first_local_col,
-     &                          last_local_col, x, ierr)
-
-      if (ierr .ne. 0) write(6,*) 'Solution vector creation failed'
-  
-      call HYPRE_IJVectorSetObjectType(x, HYPRE_PARCSR, ierr)
-
-      if (ierr .ne. 0) write(6,*) 'Solution vector object set failed'
-  
-      call HYPRE_IJVectorInitialize(x, ierr)
-
-      if (ierr .ne. 0) write(6,*) 'Solution vector initialization',
-     &                            ' failed'
-  
-      do i = 1, last_local_col - first_local_col + 1
-          indices(i) = first_local_col - 1 + i
-          vals(i) = 0.
-      enddo
-
-      call HYPRE_IJVectorSetValues(x,
-     &  last_local_col - first_local_col + 1, indices, vals, ierr)
-
-      if (ierr .ne. 0) write(6,*) 'Solution vector value set failed'
-  
-      vecfile(1)  = 'm'
-      vecfile(2)  = 'v'
-      vecfile(3)  = '.'
-      vecfile(4)  = 'o'
-      vecfile(5)  = 'u'
-      vecfile(6)  = 't'
-      vecfile(7)  = '.'
-      vecfile(8)  = 'x'
-      vecfile(9) = char(0)
-   
-      call HYPRE_IJVectorPrint(x, vecfile, ierr)
-
-      if (ierr .ne. 0) write(6,*) 'Solution vector print failed'
-  
-      indices(1) = last_local_col
-      indices(2) = first_local_col
-      vals(1) = -99.
-      vals(2) = -45.
-
-      call HYPRE_IJVectorAddToValues(x, 2, indices, vals, ierr)
-
-      if (ierr .ne. 0) write(6,*) 'Solution vector value addition',
-     &                            ' failed'
-  
-      do i = 1, last_local_col - first_local_col + 1
-        indices(i) = first_local_col - 1 + i
-      enddo
-
-      call HYPRE_IJVectorGetValues(x,
-     &  last_local_col - first_local_col + 1, indices, xvals, ierr)
-
-      if (ierr .ne. 0) write(6,*) 'Solution vector value retrieval',
-     &                            ' failed'
-  
-      if (xvals(1) .ne. -45.)
-     &   write(6,*) 'Solution vector value addition error,',
-     &              ' first_local_col'
-
-      if (xvals(last_local_col - first_local_col + 1) .ne. -99.)
-     &   write(6,*) 'Solution vector value addition error,',
-     &              ' last_local_col'
-
-!-----------------------------------------------------------------------
-!     Finalize things
-!-----------------------------------------------------------------------
-
-      call HYPRE_ParCSRMatrixDestroy(A_storage, ierr)
-      call HYPRE_IJVectorDestroy(b, ierr)
-      call HYPRE_IJVectorDestroy(x, ierr)
-
-!     Finalize MPI
-
-      call MPI_FINALIZE(ierr)
-
-      stop
-      end
diff --git a/external/hypre/src/test/f77_struct.f b/external/hypre/src/test/f77_struct.f
index e8cb2565..52af7fc9 100644
--- a/external/hypre/src/test/f77_struct.f
+++ b/external/hypre/src/test/f77_struct.f
@@ -1,4 +1,4 @@
-!     Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+!     Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 !     HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 !
 !     SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/fei.cxx b/external/hypre/src/test/fei.cxx
index 3bf35950..b1817d47 100644
--- a/external/hypre/src/test/fei.cxx
+++ b/external/hypre/src/test/fei.cxx
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -32,19 +32,19 @@
 HYPRE_Int setupFEProblem(LLNL_FEI_Impl *feiPtr);
 HYPRE_Int readFERhs(HYPRE_Int nElems, HYPRE_Int elemNNodes, HYPRE_Real *rhs);
 HYPRE_Int readFEMatrix(HYPRE_Int *nElemsOut, HYPRE_Int *elemNNodesOut, HYPRE_Int ***elemConnOut,
-           HYPRE_Real ****elemStiffOut, HYPRE_Int *startRowOut, HYPRE_Int *endRowOut);
-HYPRE_Int readFEMBC(HYPRE_Int *nBCsOut, HYPRE_Int **BCEqnOut, HYPRE_Real ***alphaOut, 
-           HYPRE_Real ***betaOut, HYPRE_Real ***gammaOut);
+                       HYPRE_Real ****elemStiffOut, HYPRE_Int *startRowOut, HYPRE_Int *endRowOut);
+HYPRE_Int readFEMBC(HYPRE_Int *nBCsOut, HYPRE_Int **BCEqnOut, HYPRE_Real ***alphaOut,
+                    HYPRE_Real ***betaOut, HYPRE_Real ***gammaOut);
 HYPRE_Int composeSharedNodes(HYPRE_Int nElems, HYPRE_Int elemNNodes, HYPRE_Int **elemConn,
-           HYPRE_Int *partition, HYPRE_Int *nSharedOut, HYPRE_Int **sharedIDsOut, 
-           HYPRE_Int **sharedLengsOut, HYPRE_Int ***sharedProcsOut);
+                             HYPRE_Int *partition, HYPRE_Int *nSharedOut, HYPRE_Int **sharedIDsOut,
+                             HYPRE_Int **sharedLengsOut, HYPRE_Int ***sharedProcsOut);
 
 /*---------------------------------------------------------------------
- * main 
+ * main
  *---------------------------------------------------------------------*/
 HYPRE_Int main(HYPRE_Int argc, char *argv[])
 {
-   HYPRE_Int  nprocs, mypid, printUsage, argIndex, solverID=0, nParams, i, status;
+   HYPRE_Int  nprocs, mypid, printUsage, argIndex, solverID = 0, nParams, i, status;
    char **paramStrings;
    LLNL_FEI_Impl *feiPtr;
 
@@ -66,9 +66,13 @@ HYPRE_Int main(HYPRE_Int argc, char *argv[])
    while ((argIndex < argc) && (!printUsage))
    {
       if (strcmp(argv[argIndex], "-solver") == 0)
+      {
          solverID = atoi(argv[++argIndex]);
+      }
       else if (strcmp(argv[argIndex], "-help") == 0)
+      {
          printUsage = 1;
+      }
       argIndex++;
    }
 
@@ -97,37 +101,37 @@ HYPRE_Int main(HYPRE_Int argc, char *argv[])
    feiPtr = new LLNL_FEI_Impl(hypre_MPI_COMM_WORLD);
    nParams = 18;
    paramStrings = new char*[nParams];
-   for (i = 0; i < nParams; i++) paramStrings[i] = new char[100];
+   for (i = 0; i < nParams; i++) { paramStrings[i] = new char[100]; }
    strcpy(paramStrings[0], "externalSolver HYPRE");
    strcpy(paramStrings[1], "outputLevel 0");
-   switch(solverID)
+   switch (solverID)
    {
       case 0:  strcpy(paramStrings[2], "solver cg");
-               strcpy(paramStrings[3], "preconditioner diagonal");
-               break;
+         strcpy(paramStrings[3], "preconditioner diagonal");
+         break;
       case 1:  strcpy(paramStrings[2], "solver cg");
-               strcpy(paramStrings[3], "preconditioner parasails");
-               break;
+         strcpy(paramStrings[3], "preconditioner parasails");
+         break;
       case 2:  strcpy(paramStrings[2], "solver cg");
-               strcpy(paramStrings[3], "preconditioner boomeramg");
-               break;
+         strcpy(paramStrings[3], "preconditioner boomeramg");
+         break;
       case 3:  strcpy(paramStrings[2], "solver cg");
-               strcpy(paramStrings[3], "preconditioner mli");
-               break;
+         strcpy(paramStrings[3], "preconditioner mli");
+         break;
       case 4:  strcpy(paramStrings[2], "solver gmres");
-               strcpy(paramStrings[3], "preconditioner diagonal");
-               break;
+         strcpy(paramStrings[3], "preconditioner diagonal");
+         break;
       case 5:  strcpy(paramStrings[2], "solver gmres");
-               strcpy(paramStrings[3], "preconditioner boomeramg");
-               break;
+         strcpy(paramStrings[3], "preconditioner boomeramg");
+         break;
       case 6:  strcpy(paramStrings[2], "solver gmres");
-               strcpy(paramStrings[3], "preconditioner mli");
-               break;
+         strcpy(paramStrings[3], "preconditioner mli");
+         break;
       case 7:  strcpy(paramStrings[0], "outputLevel 0");
-               break;
+         break;
       default: strcpy(paramStrings[2], "solver cg");
-               strcpy(paramStrings[3], "preconditioner diagonal");
-               break;
+         strcpy(paramStrings[3], "preconditioner diagonal");
+         break;
    }
    strcpy(paramStrings[4], "gmresDim 100");
    strcpy(paramStrings[5], "amgNumSweeps 1");
@@ -144,13 +148,13 @@ HYPRE_Int main(HYPRE_Int argc, char *argv[])
    strcpy(paramStrings[16], "MLI outputLevel 0");
    strcpy(paramStrings[17], "parasailsSymmetric outputLevel 0");
    feiPtr->parameters(nParams, paramStrings);
-   for (i = 0; i < nParams; i++) delete [] paramStrings[i];
+   for (i = 0; i < nParams; i++) { delete [] paramStrings[i]; }
    delete [] paramStrings;
 
    /*-----------------------------------------------------------
     * set up the finite element interface
     *-----------------------------------------------------------*/
- 
+
    setupFEProblem(feiPtr);
 
    /*-----------------------------------------------------------
@@ -175,7 +179,7 @@ HYPRE_Int main(HYPRE_Int argc, char *argv[])
 HYPRE_Int setupFEProblem(LLNL_FEI_Impl *feiPtr)
 {
    HYPRE_Int    nprocs, mypid, nElems, elemNNodes, **elemConn, startRow, endRow;
-   HYPRE_Int    *partition, *iArray, i, j, nBCs, *BCEqn, nFields, *fieldSizes; 
+   HYPRE_Int    *partition, *iArray, i, j, nBCs, *BCEqn, nFields, *fieldSizes;
    HYPRE_Int    *fieldIDs, elemBlkID, elemDOF, elemFormat, interleave;
    HYPRE_Int    *nodeNFields, **nodeFieldIDs, nShared, *sharedIDs, *sharedLengs;
    HYPRE_Int    **sharedProcs;
@@ -192,7 +196,7 @@ HYPRE_Int setupFEProblem(LLNL_FEI_Impl *feiPtr)
     * read finite element connectivities and stiffness matrices
     *-----------------------------------------------------------*/
 
-   readFEMatrix(&nElems,&elemNNodes,&elemConn,&elemStiff,&startRow,&endRow);
+   readFEMatrix(&nElems, &elemNNodes, &elemConn, &elemStiff, &startRow, &endRow);
    elemLoad = new HYPRE_Real[nElems * elemNNodes];
    readFERhs(nElems, elemNNodes, elemLoad);
 
@@ -202,10 +206,10 @@ HYPRE_Int setupFEProblem(LLNL_FEI_Impl *feiPtr)
 
    partition = new HYPRE_Int[nprocs];
    iArray = new HYPRE_Int[nprocs];
-   for (i = 0; i < nprocs; i++) iArray[i] = 0;
+   for (i = 0; i < nprocs; i++) { iArray[i] = 0; }
    iArray[mypid] = endRow - startRow + 1;
-   hypre_MPI_Allreduce(iArray,partition,nprocs,HYPRE_MPI_INT,hypre_MPI_SUM,hypre_MPI_COMM_WORLD);
-   for (i = 1; i < nprocs; i++) partition[i] += partition[i-1];
+   hypre_MPI_Allreduce(iArray, partition, nprocs, HYPRE_MPI_INT, hypre_MPI_SUM, hypre_MPI_COMM_WORLD);
+   for (i = 1; i < nprocs; i++) { partition[i] += partition[i - 1]; }
    delete [] iArray;
 
    /*-----------------------------------------------------------
@@ -228,11 +232,11 @@ HYPRE_Int setupFEProblem(LLNL_FEI_Impl *feiPtr)
    elemFormat = 0;
    interleave = 0;
    nodeNFields = new HYPRE_Int[elemNNodes];
-   for (i = 0; i < elemNNodes; i++) nodeNFields[i] = 1; 
+   for (i = 0; i < elemNNodes; i++) { nodeNFields[i] = 1; }
    nodeFieldIDs = new HYPRE_Int*[elemNNodes];
-   for (i = 0; i < elemNNodes; i++) 
+   for (i = 0; i < elemNNodes; i++)
    {
-      nodeFieldIDs[i] = new HYPRE_Int[1]; 
+      nodeFieldIDs[i] = new HYPRE_Int[1];
       nodeFieldIDs[i][0] = 0;
    }
 
@@ -240,7 +244,7 @@ HYPRE_Int setupFEProblem(LLNL_FEI_Impl *feiPtr)
     * compose shared node list
     *-----------------------------------------------------------*/
 
-   composeSharedNodes(nElems,elemNNodes,elemConn,partition,&nShared,
+   composeSharedNodes(nElems, elemNNodes, elemConn, partition, &nShared,
                       &sharedIDs, &sharedLengs, &sharedProcs);
 
    /*-----------------------------------------------------------
@@ -248,35 +252,37 @@ HYPRE_Int setupFEProblem(LLNL_FEI_Impl *feiPtr)
     *-----------------------------------------------------------*/
 
    feiPtr->initFields(nFields, fieldSizes, fieldIDs);
-   feiPtr->initElemBlock(elemBlkID, nElems, elemNNodes, nodeNFields, 
+   feiPtr->initElemBlock(elemBlkID, nElems, elemNNodes, nodeNFields,
                          nodeFieldIDs, elemDOF, NULL, interleave);
-   for (i = 0; i < nElems; i++) feiPtr->initElem(elemBlkID, i, elemConn[i]);
+   for (i = 0; i < nElems; i++) { feiPtr->initElem(elemBlkID, i, elemConn[i]); }
    if (nShared > 0)
+   {
       feiPtr->initSharedNodes(nShared, sharedIDs, sharedLengs, sharedProcs);
+   }
    feiPtr->initComplete();
    feiPtr->loadNodeBCs(nBCs, BCEqn, fieldIDs[0], alpha, beta, gamma);
-   for (i = 0; i < nElems; i++) 
+   for (i = 0; i < nElems; i++)
    {
-      feiPtr->sumInElem(elemBlkID,i,elemConn[i], elemStiff[i], 
-                        &(elemLoad[i*elemNNodes]), elemFormat);
+      feiPtr->sumInElem(elemBlkID, i, elemConn[i], elemStiff[i],
+                        &(elemLoad[i * elemNNodes]), elemFormat);
    }
    feiPtr->loadComplete();
 
    /*-----------------------------------------------------------
     * clean up
     *-----------------------------------------------------------*/
- 
-   for (i = 0; i < nElems; i++) delete [] elemConn[i];
+
+   for (i = 0; i < nElems; i++) { delete [] elemConn[i]; }
    delete [] elemConn;
-   for (i = 0; i < nElems; i++) 
+   for (i = 0; i < nElems; i++)
    {
-      for (j = 0; j < elemNNodes; j++) delete [] elemStiff[i][j];
+      for (j = 0; j < elemNNodes; j++) { delete [] elemStiff[i][j]; }
       delete [] elemStiff[i];
    }
    delete [] elemStiff;
    delete [] partition;
    delete [] BCEqn;
-   for (i = 0; i < nBCs; i++) 
+   for (i = 0; i < nBCs; i++)
    {
       delete [] alpha[i];
       delete [] beta[i];
@@ -286,14 +292,14 @@ HYPRE_Int setupFEProblem(LLNL_FEI_Impl *feiPtr)
    delete [] beta;
    delete [] gamma;
    delete [] nodeNFields;
-   for (i = 0; i < elemNNodes; i++) delete [] nodeFieldIDs[i];
+   for (i = 0; i < elemNNodes; i++) { delete [] nodeFieldIDs[i]; }
    delete [] nodeFieldIDs;
    delete [] elemLoad;
    if (nShared > 0)
    {
       delete [] sharedIDs;
       delete [] sharedLengs;
-      for (i = 0; i < nShared; i++) delete [] sharedProcs[i]; 
+      for (i = 0; i < nShared; i++) { delete [] sharedProcs[i]; }
       delete [] sharedProcs;
    }
    return 0;
@@ -303,7 +309,7 @@ HYPRE_Int setupFEProblem(LLNL_FEI_Impl *feiPtr)
  * read finite element matrices
  *--------------------------------------------------------------------------*/
 HYPRE_Int readFEMatrix(HYPRE_Int *nElemsOut, HYPRE_Int *elemNNodesOut, HYPRE_Int ***elemConnOut,
-                 HYPRE_Real ****elemStiffOut, HYPRE_Int *startRowOut, HYPRE_Int *endRowOut)
+                       HYPRE_Real ****elemStiffOut, HYPRE_Int *startRowOut, HYPRE_Int *endRowOut)
 {
    HYPRE_Int    mypid, nElems, elemNNodes, startRow, endRow, **elemConn, i, j, k;
    HYPRE_Real ***elemStiff;
@@ -316,22 +322,24 @@ HYPRE_Int readFEMatrix(HYPRE_Int *nElemsOut, HYPRE_Int *elemNNodesOut, HYPRE_Int
    fp = fopen(paramString, "r");
    if (fp == NULL)
    {
-      hypre_printf("%3d : feiTest ERROR - sfei file does not exist.\n",mypid);
+      hypre_printf("%3d : feiTest ERROR - sfei file does not exist.\n", mypid);
       exit(1);
    }
-   hypre_fscanf(fp,"%d %d %d %d", &nElems, &elemNNodes, &startRow, &endRow);
+   hypre_fscanf(fp, "%d %d %d %d", &nElems, &elemNNodes, &startRow, &endRow);
    elemConn = new HYPRE_Int*[nElems];
    elemStiff = new HYPRE_Real**[nElems];
-   for (i = 0; i < nElems; i++) 
+   for (i = 0; i < nElems; i++)
    {
       elemConn[i] = new HYPRE_Int[elemNNodes];
       elemStiff[i] = new HYPRE_Real*[elemNNodes];
-      for (j = 0; j < elemNNodes; j++) hypre_fscanf(fp,"%d", &(elemConn[i][j]));
-      for (j = 0; j < elemNNodes; j++) 
+      for (j = 0; j < elemNNodes; j++) { hypre_fscanf(fp, "%d", &(elemConn[i][j])); }
+      for (j = 0; j < elemNNodes; j++)
       {
          elemStiff[i][j] = new HYPRE_Real[elemNNodes];
-         for (k = 0; k < elemNNodes; k++) 
-            hypre_fscanf(fp,"%lg", &(elemStiff[i][j][k]));
+         for (k = 0; k < elemNNodes; k++)
+         {
+            hypre_fscanf(fp, "%lg", &(elemStiff[i][j][k]));
+         }
       }
    }
    fclose(fp);
@@ -360,11 +368,11 @@ HYPRE_Int readFERhs(HYPRE_Int nElems, HYPRE_Int elemNNodes, HYPRE_Real *elemLoad
    fp = fopen(paramString, "r");
    if (fp == NULL)
    {
-      hypre_printf("%3d : feiTest ERROR - rhs file does not exist.\n",mypid);
+      hypre_printf("%3d : feiTest ERROR - rhs file does not exist.\n", mypid);
       exit(1);
    }
    length = nElems * elemNNodes;
-   for (i = 0; i < length; i++) hypre_fscanf(fp,"%lg",&(elemLoad[i]));
+   for (i = 0; i < length; i++) { hypre_fscanf(fp, "%lg", &(elemLoad[i])); }
    fclose(fp);
    delete [] paramString;
    return 0;
@@ -373,10 +381,10 @@ HYPRE_Int readFERhs(HYPRE_Int nElems, HYPRE_Int elemNNodes, HYPRE_Real *elemLoad
 /***************************************************************************
  * read BC from file
  *--------------------------------------------------------------------------*/
-HYPRE_Int readFEMBC(HYPRE_Int *nBCsOut, HYPRE_Int **BCEqnOut, HYPRE_Real ***alphaOut, 
-              HYPRE_Real ***betaOut, HYPRE_Real ***gammaOut)
+HYPRE_Int readFEMBC(HYPRE_Int *nBCsOut, HYPRE_Int **BCEqnOut, HYPRE_Real ***alphaOut,
+                    HYPRE_Real ***betaOut, HYPRE_Real ***gammaOut)
 {
-   HYPRE_Int    mypid, nBCs=0, *BCEqn, i;
+   HYPRE_Int    mypid, nBCs = 0, *BCEqn, i;
    HYPRE_Real **alpha, **beta, **gamma;
    char   *paramString;
    FILE   *fp;
@@ -387,30 +395,30 @@ HYPRE_Int readFEMBC(HYPRE_Int *nBCsOut, HYPRE_Int **BCEqnOut, HYPRE_Real ***alph
    fp = fopen(paramString, "r");
    if (fp == NULL)
    {
-      hypre_printf("%3d : feiTest ERROR - BC file does not exist.\n",mypid);
+      hypre_printf("%3d : feiTest ERROR - BC file does not exist.\n", mypid);
       exit(1);
    }
-   hypre_fscanf(fp,"%d", &nBCs);
+   hypre_fscanf(fp, "%d", &nBCs);
    BCEqn = new HYPRE_Int[nBCs];
    alpha = new HYPRE_Real*[nBCs];
    beta  = new HYPRE_Real*[nBCs];
    gamma = new HYPRE_Real*[nBCs];
-   for (i = 0; i < nBCs; i++) 
+   for (i = 0; i < nBCs; i++)
    {
       alpha[i] = new HYPRE_Real[1];
       beta[i]  = new HYPRE_Real[1];
       gamma[i] = new HYPRE_Real[1];
    }
-   for (i = 0; i < nBCs; i++) 
-      hypre_fscanf(fp,"%d %lg %lg %lg",&(BCEqn[i]),&(alpha[i][0]),
-             &(beta[i][0]),&(gamma[i][0]));
+   for (i = 0; i < nBCs; i++)
+      hypre_fscanf(fp, "%d %lg %lg %lg", &(BCEqn[i]), &(alpha[i][0]),
+                   &(beta[i][0]), &(gamma[i][0]));
    fclose(fp);
    delete [] paramString;
    (*nBCsOut) = nBCs;
    (*BCEqnOut) = BCEqn;
-   (*alphaOut) = alpha; 
-   (*betaOut) = beta; 
-   (*gammaOut) = gamma; 
+   (*alphaOut) = alpha;
+   (*betaOut) = beta;
+   (*gammaOut) = gamma;
    return 0;
 }
 
@@ -419,8 +427,8 @@ HYPRE_Int readFEMBC(HYPRE_Int *nBCsOut, HYPRE_Int **BCEqnOut, HYPRE_Real ***alph
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int composeSharedNodes(HYPRE_Int nElems, HYPRE_Int elemNNodes, HYPRE_Int **elemConn,
-                       HYPRE_Int *partition, HYPRE_Int *nSharedOut, HYPRE_Int **sharedIDsOut, 
-                       HYPRE_Int **sharedLengsOut, HYPRE_Int ***sharedProcsOut)
+                             HYPRE_Int *partition, HYPRE_Int *nSharedOut, HYPRE_Int **sharedIDsOut,
+                             HYPRE_Int **sharedLengsOut, HYPRE_Int ***sharedProcsOut)
 {
    HYPRE_Int nShared, i, j, index, startRow, endRow, mypid, nprocs, ncnt;
    HYPRE_Int *sharedIDs, *iArray1, *iArray2, **iRecvBufs, **iSendBufs;
@@ -432,10 +440,10 @@ HYPRE_Int composeSharedNodes(HYPRE_Int nElems, HYPRE_Int elemNNodes, HYPRE_Int *
 
    hypre_MPI_Comm_size(hypre_MPI_COMM_WORLD, &nprocs);
    hypre_MPI_Comm_rank(hypre_MPI_COMM_WORLD, &mypid);
-   if (mypid == 0) startRow = 0;
-   else            startRow = partition[mypid-1];
+   if (mypid == 0) { startRow = 0; }
+   else { startRow = partition[mypid - 1]; }
    endRow = partition[mypid] - 1;
-   
+
    /* --- get a rough count of nShared --- */
 
    nShared = 0;
@@ -444,13 +452,13 @@ HYPRE_Int composeSharedNodes(HYPRE_Int nElems, HYPRE_Int elemNNodes, HYPRE_Int *
       for (j = 0; j < elemNNodes; j++)
       {
          index = elemConn[i][j];
-         if (index < startRow || index > endRow) nShared++;
+         if (index < startRow || index > endRow) { nShared++; }
       }
    }
 
    /* --- allocate and fill sharedIDs array, then sort and compress --- */
 
-   if (nShared <= 0) sharedIDs = NULL;
+   if (nShared <= 0) { sharedIDs = NULL; }
    else
    {
       sharedIDs = new HYPRE_Int[nShared];
@@ -460,43 +468,47 @@ HYPRE_Int composeSharedNodes(HYPRE_Int nElems, HYPRE_Int elemNNodes, HYPRE_Int *
          for (j = 0; j < elemNNodes; j++)
          {
             index = elemConn[i][j];
-            if (index < startRow || index > endRow) 
+            if (index < startRow || index > endRow)
+            {
                sharedIDs[nShared++] = index;
+            }
          }
       }
-      hypre_qsort0(sharedIDs, 0, nShared-1);
+      hypre_qsort0(sharedIDs, 0, nShared - 1);
       ncnt = 1;
       for (i = 1; i < nShared; i++)
       {
-         if (sharedIDs[i] != sharedIDs[ncnt-1])
+         if (sharedIDs[i] != sharedIDs[ncnt - 1])
+         {
             sharedIDs[ncnt++] = sharedIDs[i];
+         }
       }
       nShared = ncnt;
-   }   
+   }
 
    /* --- tabulate recv processors and send processors --- */
 
    iArray1 = new HYPRE_Int[nprocs];
    iArray2 = new HYPRE_Int[nprocs];
-   for (i = 0; i < nprocs; i++) iArray1[i] = 0;
+   for (i = 0; i < nprocs; i++) { iArray1[i] = 0; }
    for (i = 0; i < nShared; i++)
    {
       for (j = 0; j < nprocs; j++)
-         if (sharedIDs[i] < partition[j]) break;
-      if (j != mypid) iArray1[j] = 1;
-   } 
-   hypre_MPI_Allreduce(iArray1,iArray2,nprocs,HYPRE_MPI_INT,hypre_MPI_SUM,hypre_MPI_COMM_WORLD);
-   for (i = 0; i < nprocs; i++) iArray1[i] = 0;
+         if (sharedIDs[i] < partition[j]) { break; }
+      if (j != mypid) { iArray1[j] = 1; }
+   }
+   hypre_MPI_Allreduce(iArray1, iArray2, nprocs, HYPRE_MPI_INT, hypre_MPI_SUM, hypre_MPI_COMM_WORLD);
+   for (i = 0; i < nprocs; i++) { iArray1[i] = 0; }
    for (i = 0; i < nShared; i++)
    {
       for (j = 0; j < nprocs; j++)
-         if (sharedIDs[i] < partition[j]) break;
-      if (j != mypid) iArray1[j]++;
-   } 
+         if (sharedIDs[i] < partition[j]) { break; }
+      if (j != mypid) { iArray1[j]++; }
+   }
 
    nSends = 0;
    for (i = 0; i < nprocs; i++)
-      if (iArray1[i] != 0) nSends++;
+      if (iArray1[i] != 0) { nSends++; }
    if (nSends > 0)
    {
       sendLengs = new HYPRE_Int[nSends];
@@ -504,7 +516,7 @@ HYPRE_Int composeSharedNodes(HYPRE_Int nElems, HYPRE_Int elemNNodes, HYPRE_Int *
       nSends = 0;
       for (i = 0; i < nprocs; i++)
       {
-         if (iArray1[i] != 0) 
+         if (iArray1[i] != 0)
          {
             sendLengs[nSends] = iArray1[i];
             sendProcs[nSends++] = i;
@@ -520,11 +532,11 @@ HYPRE_Int composeSharedNodes(HYPRE_Int nElems, HYPRE_Int elemNNodes, HYPRE_Int *
    }
 
    for (i = 0; i < nRecvs; i++)
-      hypre_MPI_Irecv(&(recvLengs[i]), 1, HYPRE_MPI_INT, hypre_MPI_ANY_SOURCE, 12233, 
-                hypre_MPI_COMM_WORLD, &(mpiRequests[i]));
+      hypre_MPI_Irecv(&(recvLengs[i]), 1, HYPRE_MPI_INT, hypre_MPI_ANY_SOURCE, 12233,
+                      hypre_MPI_COMM_WORLD, &(mpiRequests[i]));
    for (i = 0; i < nSends; i++)
-      hypre_MPI_Send(&(sendLengs[i]), 1, HYPRE_MPI_INT, sendProcs[i], 12233, 
-                hypre_MPI_COMM_WORLD);
+      hypre_MPI_Send(&(sendLengs[i]), 1, HYPRE_MPI_INT, sendProcs[i], 12233,
+                     hypre_MPI_COMM_WORLD);
    for (i = 0; i < nRecvs; i++)
    {
       hypre_MPI_Wait(&(mpiRequests[i]), &mpiStatus);
@@ -533,14 +545,14 @@ HYPRE_Int composeSharedNodes(HYPRE_Int nElems, HYPRE_Int elemNNodes, HYPRE_Int *
 
    /* get the shared nodes */
 
-   if (nRecvs > 0) iRecvBufs = new HYPRE_Int*[nRecvs];
+   if (nRecvs > 0) { iRecvBufs = new HYPRE_Int*[nRecvs]; }
    for (i = 0; i < nRecvs; i++)
    {
       iRecvBufs[i] = new HYPRE_Int[recvLengs[i]];
-      hypre_MPI_Irecv(iRecvBufs[i], recvLengs[i], HYPRE_MPI_INT, recvProcs[i], 12234, 
-                hypre_MPI_COMM_WORLD, &(mpiRequests[i]));
+      hypre_MPI_Irecv(iRecvBufs[i], recvLengs[i], HYPRE_MPI_INT, recvProcs[i], 12234,
+                      hypre_MPI_COMM_WORLD, &(mpiRequests[i]));
    }
-   if (nSends > 0) iSendBufs = new HYPRE_Int*[nSends];
+   if (nSends > 0) { iSendBufs = new HYPRE_Int*[nSends]; }
    for (i = 0; i < nSends; i++)
    {
       iSendBufs[i] = new HYPRE_Int[sendLengs[i]];
@@ -549,32 +561,32 @@ HYPRE_Int composeSharedNodes(HYPRE_Int nElems, HYPRE_Int elemNNodes, HYPRE_Int *
    for (i = 0; i < nShared; i++)
    {
       for (j = 0; j < nprocs; j++)
-         if (sharedIDs[i] < partition[j]) break;
+         if (sharedIDs[i] < partition[j]) { break; }
       iSendBufs[j][sendLengs[j]++] = sharedIDs[i];
    }
    for (i = 0; i < nSends; i++)
-      hypre_MPI_Send(iSendBufs[i],sendLengs[i],HYPRE_MPI_INT,sendProcs[i],12234,
-               hypre_MPI_COMM_WORLD);
-   for (i = 0; i < nRecvs; i++) hypre_MPI_Wait(&(mpiRequests[i]), &mpiStatus);
+      hypre_MPI_Send(iSendBufs[i], sendLengs[i], HYPRE_MPI_INT, sendProcs[i], 12234,
+                     hypre_MPI_COMM_WORLD);
+   for (i = 0; i < nRecvs; i++) { hypre_MPI_Wait(&(mpiRequests[i]), &mpiStatus); }
 
    /* --- finally construct the shared information --- */
 
    ncnt = nShared;
-   for (i = 0; i < nRecvs; i++) ncnt += recvLengs[i];
+   for (i = 0; i < nRecvs; i++) { ncnt += recvLengs[i]; }
    (*nSharedOut) = ncnt;
    (*sharedIDsOut) = new HYPRE_Int[ncnt];
    (*sharedLengsOut) = new HYPRE_Int[ncnt];
    (*sharedProcsOut) = new HYPRE_Int*[ncnt];
-   for (i = 0; i < ncnt; i++) (*sharedProcsOut)[i] = new HYPRE_Int[2];
+   for (i = 0; i < ncnt; i++) { (*sharedProcsOut)[i] = new HYPRE_Int[2]; }
    for (i = 0; i < nShared; i++)
    {
       (*sharedIDsOut)[i] = sharedIDs[i];
       for (j = 0; j < nprocs; j++)
-         if (sharedIDs[i] < partition[j]) break;
+         if (sharedIDs[i] < partition[j]) { break; }
       (*sharedLengsOut)[i] = 2;
       (*sharedProcsOut)[i][0] = j;
       (*sharedProcsOut)[i][1] = mypid;
-   } 
+   }
    ncnt = nShared;
    for (i = 0; i < nRecvs; i++)
    {
@@ -587,23 +599,23 @@ HYPRE_Int composeSharedNodes(HYPRE_Int nElems, HYPRE_Int elemNNodes, HYPRE_Int *
          (*sharedProcsOut)[ncnt][1] = recvProcs[i];
          ncnt++;
       }
-   }   
+   }
 
    /* --- finally clean up --- */
-   
-   if (nShared > 0) delete [] sharedIDs;
+
+   if (nShared > 0) { delete [] sharedIDs; }
    if (nSends > 0)
    {
       delete [] sendProcs;
       delete [] sendLengs;
-      for (i = 0; i < nSends; i++) delete [] iSendBufs[i];
+      for (i = 0; i < nSends; i++) { delete [] iSendBufs[i]; }
       delete [] iSendBufs;
    }
    if (nRecvs > 0)
    {
       delete [] recvProcs;
       delete [] recvLengs;
-      for (i = 0; i < nRecvs; i++) delete [] iRecvBufs[i];
+      for (i = 0; i < nRecvs; i++) { delete [] iRecvBufs[i]; }
       delete [] iRecvBufs;
       delete [] mpiRequests;
    }
@@ -611,4 +623,4 @@ HYPRE_Int composeSharedNodes(HYPRE_Int nElems, HYPRE_Int elemNNodes, HYPRE_Int *
    delete [] iArray2;
    return 0;
 }
- 
+
diff --git a/external/hypre/src/test/fei_lscore.c b/external/hypre/src/test/fei_lscore.c
index 1d617d27..34bcf17b 100644
--- a/external/hypre/src/test/fei_lscore.c
+++ b/external/hypre/src/test/fei_lscore.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -24,24 +24,24 @@
 #include "HYPRE_parcsr_ls.h"
 #include "HYPRE_LinSysCore.h"
 
-HYPRE_Int BuildParLaplacian27pt (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , 
-                             HYPRE_ParCSRMatrix *A_ptr );
+HYPRE_Int BuildParLaplacian27pt (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                                 HYPRE_ParCSRMatrix *A_ptr );
 
 #define SECOND_TIME 0
- 
+
 HYPRE_Int main( HYPRE_Int   argc, char *argv[] )
 {
    HYPRE_Int                 arg_index;
    HYPRE_Int                 print_usage;
    HYPRE_Int                 build_matrix_arg_index;
    HYPRE_Int                 solver_id;
-   HYPRE_Int                 ierr,i,j; 
-   HYPRE_Int                 num_iterations; 
+   HYPRE_Int                 ierr, i, j;
+   HYPRE_Int                 num_iterations;
 
    HYPRE_ParCSRMatrix  parcsr_A;
    HYPRE_Int                 num_procs, myid;
    HYPRE_Int                 local_row;
-   HYPRE_Int		       time_index;
+   HYPRE_Int             time_index;
    MPI_Comm            comm;
    HYPRE_Int                 M, N;
    HYPRE_Int                 first_local_row, last_local_row;
@@ -51,11 +51,11 @@ HYPRE_Int main( HYPRE_Int   argc, char *argv[] )
 
    /* parameters for BoomerAMG */
    HYPRE_Real          strong_threshold;
-   HYPRE_Int                 num_grid_sweeps;  
-   HYPRE_Real          relax_weight; 
+   HYPRE_Int                 num_grid_sweeps;
+   HYPRE_Real          relax_weight;
 
    /* parameters for GMRES */
-   HYPRE_Int	               k_dim;
+   HYPRE_Int                  k_dim;
 
    char *paramString = new char[100];
 
@@ -70,7 +70,7 @@ HYPRE_Int main( HYPRE_Int   argc, char *argv[] )
    /*-----------------------------------------------------------
     * Set defaults
     *-----------------------------------------------------------*/
- 
+
    build_matrix_arg_index = argc;
    solver_id              = 0;
    strong_threshold       = 0.25;
@@ -81,7 +81,7 @@ HYPRE_Int main( HYPRE_Int   argc, char *argv[] )
    /*-----------------------------------------------------------
     * Parse command line
     *-----------------------------------------------------------*/
- 
+
    print_usage = 0;
    arg_index = 1;
 
@@ -110,7 +110,7 @@ HYPRE_Int main( HYPRE_Int   argc, char *argv[] )
    /*-----------------------------------------------------------
     * Print usage info
     *-----------------------------------------------------------*/
- 
+
    if ( (print_usage) && (myid == 0) )
    {
       hypre_printf("\n");
@@ -119,20 +119,20 @@ HYPRE_Int main( HYPRE_Int   argc, char *argv[] )
       hypre_printf("  -solver <ID>           : solver ID\n");
       hypre_printf("       0=DS-PCG      1=ParaSails-PCG \n");
       hypre_printf("       2=AMG-PCG     3=DS-GMRES     \n");
-      hypre_printf("       4=PILUT-GMRES 5=AMG-GMRES    \n");     
+      hypre_printf("       4=PILUT-GMRES 5=AMG-GMRES    \n");
       hypre_printf("\n");
       hypre_printf("  -rlx <val>             : relaxation type\n");
       hypre_printf("       0=Weighted Jacobi  \n");
       hypre_printf("       1=Gauss-Seidel (very slow!)  \n");
       hypre_printf("       3=Hybrid Jacobi/Gauss-Seidel  \n");
-      hypre_printf("\n");  
+      hypre_printf("\n");
       exit(1);
    }
 
    /*-----------------------------------------------------------
     * Print driver parameters
     *-----------------------------------------------------------*/
- 
+
    if (myid == 0)
    {
       hypre_printf("Running with these driver parameters:\n");
@@ -148,7 +148,7 @@ HYPRE_Int main( HYPRE_Int   argc, char *argv[] )
    hypre_BeginTiming(time_index);
 
    BuildParLaplacian27pt(argc, argv, build_matrix_arg_index, &parcsr_A);
-    
+
    /*-----------------------------------------------------------
     * Copy the parcsr matrix into the LSI through interface calls
     *-----------------------------------------------------------*/
@@ -156,43 +156,43 @@ HYPRE_Int main( HYPRE_Int   argc, char *argv[] )
    ierr = HYPRE_ParCSRMatrixGetComm( parcsr_A, &comm );
    ierr += HYPRE_ParCSRMatrixGetDims( parcsr_A, &M, &N );
    ierr = HYPRE_ParCSRMatrixGetLocalRange( parcsr_A,
-             &first_local_row, &last_local_row ,
-             &first_local_col, &last_local_col );
+                                           &first_local_row, &last_local_row,
+                                           &first_local_col, &last_local_col );
 
    HYPRE_LinSysCore H(hypre_MPI_COMM_WORLD);
    HYPRE_Int numLocalEqns = last_local_row - first_local_row + 1;
-   H.createMatricesAndVectors(M,first_local_row+1,numLocalEqns);
+   H.createMatricesAndVectors(M, first_local_row + 1, numLocalEqns);
 
    HYPRE_Int index;
    HYPRE_Int *rowLengths = new HYPRE_Int[numLocalEqns];
    HYPRE_Int **colIndices = new HYPRE_Int*[numLocalEqns];
 
    local_row = 0;
-   for (i=first_local_row; i<= last_local_row; i++)
+   for (i = first_local_row; i <= last_local_row; i++)
    {
-      ierr += HYPRE_ParCSRMatrixGetRow(parcsr_A,i,&size,&col_ind,&values );
+      ierr += HYPRE_ParCSRMatrixGetRow(parcsr_A, i, &size, &col_ind, &values );
       rowLengths[local_row] = size;
       colIndices[local_row] = new HYPRE_Int[size];
-      for (j=0; j<size; j++) colIndices[local_row][j] = col_ind[j] + 1;
+      for (j = 0; j < size; j++) { colIndices[local_row][j] = col_ind[j] + 1; }
       local_row++;
-      HYPRE_ParCSRMatrixRestoreRow(parcsr_A,i,&size,&col_ind,&values);
+      HYPRE_ParCSRMatrixRestoreRow(parcsr_A, i, &size, &col_ind, &values);
    }
    H.allocateMatrix(colIndices, rowLengths);
    delete [] rowLengths;
-   for (i=0; i< numLocalEqns; i++) delete [] colIndices[i];
+   for (i = 0; i < numLocalEqns; i++) { delete [] colIndices[i]; }
    delete [] colIndices;
 
    HYPRE_Int *newColInd;
 
-   for (i=first_local_row; i<= last_local_row; i++)
+   for (i = first_local_row; i <= last_local_row; i++)
    {
-      ierr += HYPRE_ParCSRMatrixGetRow(parcsr_A,i,&size,&col_ind,&values );
+      ierr += HYPRE_ParCSRMatrixGetRow(parcsr_A, i, &size, &col_ind, &values );
       newColInd = new HYPRE_Int[size];
-      for (j=0; j<size; j++) newColInd[j] = col_ind[j] + 1;
-      H.sumIntoSystemMatrix(i+1,size,(const HYPRE_Real*)values,
-                                     (const HYPRE_Int*)newColInd);
+      for (j = 0; j < size; j++) { newColInd[j] = col_ind[j] + 1; }
+      H.sumIntoSystemMatrix(i + 1, size, (const HYPRE_Real*)values,
+                            (const HYPRE_Int*)newColInd);
       delete [] newColInd;
-      ierr += HYPRE_ParCSRMatrixRestoreRow(parcsr_A,i,&size,&col_ind,&values);
+      ierr += HYPRE_ParCSRMatrixRestoreRow(parcsr_A, i, &size, &col_ind, &values);
    }
    H.matrixLoadComplete();
    HYPRE_ParCSRMatrixDestroy(parcsr_A);
@@ -201,13 +201,13 @@ HYPRE_Int main( HYPRE_Int   argc, char *argv[] )
     * Set up the RHS and initial guess
     *-----------------------------------------------------------*/
 
-   HYPRE_Real ddata=1.0;
+   HYPRE_Real ddata = 1.0;
    HYPRE_Int  status;
 
-   for (i=first_local_row; i<= last_local_row; i++)
+   for (i = first_local_row; i <= last_local_row; i++)
    {
       index = i + 1;
-      H.sumIntoRHSVector(1,(const HYPRE_Real*) &ddata, (const HYPRE_Int*) &index);
+      H.sumIntoRHSVector(1, (const HYPRE_Real*) &ddata, (const HYPRE_Int*) &index);
    }
 
    hypre_EndTiming(time_index);
@@ -215,25 +215,25 @@ HYPRE_Int main( HYPRE_Int   argc, char *argv[] )
    hypre_PrintTiming(paramString, hypre_MPI_COMM_WORLD);
    hypre_FinalizeTiming(time_index);
    hypre_ClearTiming();
- 
+
    /*-----------------------------------------------------------
-    * Solve the system using PCG 
+    * Solve the system using PCG
     *-----------------------------------------------------------*/
 
-   if ( solver_id == 0 ) 
+   if ( solver_id == 0 )
    {
       strcpy(paramString, "solver cg");
       H.parameters(1, &paramString);
-      if (myid == 0) hypre_printf("Solver: DS-PCG\n");
+      if (myid == 0) { hypre_printf("Solver: DS-PCG\n"); }
 
       strcpy(paramString, "preconditioner diagonal");
       H.parameters(1, &paramString);
-   } 
+   }
    else if ( solver_id == 1 )
    {
       strcpy(paramString, "solver cg");
       H.parameters(1, &paramString);
-      if (myid == 0) hypre_printf("Solver: ParaSails-PCG\n");
+      if (myid == 0) { hypre_printf("Solver: ParaSails-PCG\n"); }
 
       strcpy(paramString, "preconditioner parasails");
       H.parameters(1, &paramString);
@@ -246,7 +246,7 @@ HYPRE_Int main( HYPRE_Int   argc, char *argv[] )
    {
       strcpy(paramString, "solver cg");
       H.parameters(1, &paramString);
-      if (myid == 0) hypre_printf("Solver: AMG-PCG\n");
+      if (myid == 0) { hypre_printf("Solver: AMG-PCG\n"); }
 
       strcpy(paramString, "preconditioner boomeramg");
       H.parameters(1, &paramString);
@@ -265,7 +265,7 @@ HYPRE_Int main( HYPRE_Int   argc, char *argv[] )
    {
       strcpy(paramString, "solver cg");
       H.parameters(1, &paramString);
-      if (myid == 0) hypre_printf("Solver: Poly-PCG\n");
+      if (myid == 0) { hypre_printf("Solver: Poly-PCG\n"); }
 
       strcpy(paramString, "preconditioner poly");
       H.parameters(1, &paramString);
@@ -278,18 +278,18 @@ HYPRE_Int main( HYPRE_Int   argc, char *argv[] )
       H.parameters(1, &paramString);
       hypre_sprintf(paramString, "gmresDim %d", k_dim);
       H.parameters(1, &paramString);
-      if (myid == 0) hypre_printf("Solver: DS-GMRES\n");
+      if (myid == 0) { hypre_printf("Solver: DS-GMRES\n"); }
 
       strcpy(paramString, "preconditioner diagonal");
       H.parameters(1, &paramString);
    }
-   else if ( solver_id == 5 ) 
+   else if ( solver_id == 5 )
    {
       strcpy(paramString, "solver gmres");
       H.parameters(1, &paramString);
       hypre_sprintf(paramString, "gmresDim %d", k_dim);
       H.parameters(1, &paramString);
-      if (myid == 0) hypre_printf("Solver: PILUT-GMRES\n");
+      if (myid == 0) { hypre_printf("Solver: PILUT-GMRES\n"); }
 
       strcpy(paramString, "preconditioner pilut");
       H.parameters(1, &paramString);
@@ -304,7 +304,7 @@ HYPRE_Int main( HYPRE_Int   argc, char *argv[] )
       H.parameters(1, &paramString);
       hypre_sprintf(paramString, "gmresDim %d", k_dim);
       H.parameters(1, &paramString);
-      if (myid == 0) hypre_printf("Solver: AMG-GMRES\n");
+      if (myid == 0) { hypre_printf("Solver: AMG-GMRES\n"); }
 
       strcpy(paramString, "preconditioner boomeramg");
       H.parameters(1, &paramString);
@@ -325,7 +325,7 @@ HYPRE_Int main( HYPRE_Int   argc, char *argv[] )
       H.parameters(1, &paramString);
       hypre_sprintf(paramString, "gmresDim %d", k_dim);
       H.parameters(1, &paramString);
-      if (myid == 0) hypre_printf("Solver: DDILUT-GMRES\n");
+      if (myid == 0) { hypre_printf("Solver: DDILUT-GMRES\n"); }
 
       strcpy(paramString, "preconditioner ddilut");
       H.parameters(1, &paramString);
@@ -340,32 +340,32 @@ HYPRE_Int main( HYPRE_Int   argc, char *argv[] )
       H.parameters(1, &paramString);
       hypre_sprintf(paramString, "gmresDim %d", k_dim);
       H.parameters(1, &paramString);
-      if (myid == 0) hypre_printf("Solver: POLY-GMRES\n");
+      if (myid == 0) { hypre_printf("Solver: POLY-GMRES\n"); }
 
       strcpy(paramString, "preconditioner poly");
       H.parameters(1, &paramString);
       strcpy(paramString, "polyOrder 5");
       H.parameters(1, &paramString);
    }
- 
+
    strcpy(paramString, "Krylov Solve");
    time_index = hypre_InitializeTiming(paramString);
    hypre_BeginTiming(time_index);
- 
+
    H.launchSolver(status, num_iterations);
- 
+
    hypre_EndTiming(time_index);
    strcpy(paramString, "Solve phase times");
    hypre_PrintTiming(paramString, hypre_MPI_COMM_WORLD);
    hypre_FinalizeTiming(time_index);
    hypre_ClearTiming();
- 
+
    if (myid == 0)
    {
       hypre_printf("\n Iterations = %d\n", num_iterations);
       hypre_printf("\n");
    }
- 
+
    /*-----------------------------------------------------------
     * Finalize things
     *-----------------------------------------------------------*/
@@ -377,7 +377,7 @@ HYPRE_Int main( HYPRE_Int   argc, char *argv[] )
 }
 
 /*----------------------------------------------------------------------
- * Build 27-point laplacian in 3D, 
+ * Build 27-point laplacian in 3D,
  * Parameters given in command line.
  *----------------------------------------------------------------------*/
 
@@ -406,7 +406,7 @@ BuildParLaplacian27pt( HYPRE_Int                  argc,
    /*-----------------------------------------------------------
     * Set defaults
     *-----------------------------------------------------------*/
- 
+
    nx = 20;
    ny = 20;
    nz = 20;
@@ -419,7 +419,7 @@ BuildParLaplacian27pt( HYPRE_Int                  argc,
     * Check a few things
     *-----------------------------------------------------------*/
 
-   if ((P*Q*R) != num_procs)
+   if ((P * Q * R) != num_procs)
    {
       hypre_printf("Error: Invalid number of processors or processor topology \n");
       exit(1);
@@ -428,7 +428,7 @@ BuildParLaplacian27pt( HYPRE_Int                  argc,
    /*-----------------------------------------------------------
     * Print driver parameters
     *-----------------------------------------------------------*/
- 
+
    if (myid == 0)
    {
       hypre_printf("  Laplacian_27pt:\n");
@@ -442,24 +442,28 @@ BuildParLaplacian27pt( HYPRE_Int                  argc,
 
    /* compute p,q,r from P,Q,R and myid */
    p = myid % P;
-   q = (( myid - p)/P) % Q;
-   r = ( myid - p - P*q)/( P*Q );
+   q = (( myid - p) / P) % Q;
+   r = ( myid - p - P * q) / ( P * Q );
 
    /*-----------------------------------------------------------
-    * Generate the matrix 
+    * Generate the matrix
     *-----------------------------------------------------------*/
- 
+
    values = hypre_CTAlloc(HYPRE_Real,  2, HYPRE_MEMORY_HOST);
 
    values[0] = 26.0;
    if (nx == 1 || ny == 1 || nz == 1)
-	values[0] = 8.0;
-   if (nx*ny == 1 || nx*nz == 1 || ny*nz == 1)
-	values[0] = 2.0;
+   {
+      values[0] = 8.0;
+   }
+   if (nx * ny == 1 || nx * nz == 1 || ny * nz == 1)
+   {
+      values[0] = 2.0;
+   }
    values[1] = -1.0;
 
    A = (HYPRE_ParCSRMatrix) GenerateLaplacian27pt(hypre_MPI_COMM_WORLD,
-                               nx, ny, nz, P, Q, R, p, q, r, values);
+                                                  nx, ny, nz, P, Q, R, p, q, r, values);
 
    hypre_TFree(values, HYPRE_MEMORY_HOST);
 
diff --git a/external/hypre/src/test/fij_mv.f b/external/hypre/src/test/fij_mv.f
index b792698c..303ca694 100644
--- a/external/hypre/src/test/fij_mv.f
+++ b/external/hypre/src/test/fij_mv.f
@@ -1,4 +1,4 @@
-!     Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+!     Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 !     HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 !
 !     SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/for_maxwell.c b/external/hypre/src/test/for_maxwell.c
index fba8598a..d099aad8 100644
--- a/external/hypre/src/test/for_maxwell.c
+++ b/external/hypre/src/test/for_maxwell.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -14,7 +14,7 @@
 #include "HYPRE_krylov.h"
 #include "_hypre_sstruct_mv.h"
 #include "_hypre_sstruct_ls.h"
- 
+
 #define DEBUG 0
 
 /*     include fortran headers                     */
@@ -97,7 +97,7 @@ typedef struct
    Index                  periodic;
 
 } ProblemPartData;
- 
+
 typedef struct
 {
    HYPRE_Int              ndim;
@@ -125,7 +125,7 @@ typedef struct
    HYPRE_Int             *pools;   /* array of size nparts */
 
 } ProblemData;
- 
+
 /*--------------------------------------------------------------------------
  * Read routines
  *--------------------------------------------------------------------------*/
@@ -168,19 +168,19 @@ SScanProblemIndex( char          *sdata_ptr,
    switch (ndim)
    {
       case 1:
-      hypre_sscanf(sdata_ptr, "%d%c",
-             &index[0], &sign[0]);
-      break;
+         hypre_sscanf(sdata_ptr, "%d%c",
+                      &index[0], &sign[0]);
+         break;
 
       case 2:
-      hypre_sscanf(sdata_ptr, "%d%c%d%c",
-             &index[0], &sign[0], &index[1], &sign[1]);
-      break;
+         hypre_sscanf(sdata_ptr, "%d%c%d%c",
+                      &index[0], &sign[0], &index[1], &sign[1]);
+         break;
 
       case 3:
-      hypre_sscanf(sdata_ptr, "%d%c%d%c%d%c",
-             &index[0], &sign[0], &index[1], &sign[1], &index[2], &sign[2]);
-      break;
+         hypre_sscanf(sdata_ptr, "%d%c%d%c%d%c",
+                      &index[0], &sign[0], &index[1], &sign[1], &index[2], &sign[2]);
+         break;
    }
    sdata_ptr += strcspn(sdata_ptr, ":)");
    if ( *sdata_ptr == ':' )
@@ -192,11 +192,11 @@ SScanProblemIndex( char          *sdata_ptr,
          case 1:
             hypre_sscanf(sdata_ptr, "%d", &index[6]);
             break;
-            
+
          case 2:
             hypre_sscanf(sdata_ptr, "%d%d", &index[6], &index[7]);
             break;
-            
+
          case 3:
             hypre_sscanf(sdata_ptr, "%d%d%d", &index[6], &index[7], &index[8]);
             break;
@@ -204,7 +204,7 @@ SScanProblemIndex( char          *sdata_ptr,
       /* pre-shift the index */
       for (i = 0; i < ndim; i++)
       {
-         index[i] += index[i+6];
+         index[i] += index[i + 6];
       }
    }
    sdata_ptr += strcspn(sdata_ptr, ")") + 1;
@@ -213,7 +213,7 @@ SScanProblemIndex( char          *sdata_ptr,
    {
       if (sign[i] == '+')
       {
-         index[i+3] = 1;
+         index[i + 3] = 1;
       }
    }
 
@@ -246,7 +246,7 @@ ReadData( char         *filename,
    /*-----------------------------------------------------------
     * Read data file from process 0, then broadcast
     *-----------------------------------------------------------*/
- 
+
    hypre_MPI_Comm_rank(hypre_MPI_COMM_WORLD, &myid);
 
    if (myid == 0)
@@ -262,7 +262,7 @@ ReadData( char         *filename,
       sdata = hypre_TAlloc(char,  memchunk, HYPRE_MEMORY_HOST);
       sdata_line = fgets(sdata, maxline, file);
 
-      s= 0;
+      s = 0;
       while (sdata_line != NULL)
       {
          sdata_size += strlen(sdata_line) + 1;
@@ -271,9 +271,9 @@ ReadData( char         *filename,
          if ((sdata_size + maxline) > s)
          {
             sdata = hypre_TReAlloc(sdata,  char,  (sdata_size + memchunk), HYPRE_MEMORY_HOST);
-            s= sdata_size + memchunk;
+            s = sdata_size + memchunk;
          }
-         
+
          /* read the next input line */
          sdata_line = fgets((sdata + sdata_size), maxline, file);
       }
@@ -302,7 +302,7 @@ ReadData( char         *filename,
    while (sdata_line < (sdata + sdata_size))
    {
       sdata_ptr = sdata_line;
-      
+
       if ( ( hypre_sscanf(sdata_ptr, "%s", key) > 0 ) && ( sdata_ptr[0] != '#' ) )
       {
          sdata_ptr += strcspn(sdata_ptr, " \t\n");
@@ -336,8 +336,8 @@ ReadData( char         *filename,
             iu = 1;
             for (i = 0; i < data.ndim; i++)
             {
-               il *= pdata.ilowers[pdata.nboxes][i+3];
-               iu *= pdata.iuppers[pdata.nboxes][i+3];
+               il *= pdata.ilowers[pdata.nboxes][i + 3];
+               iu *= pdata.iuppers[pdata.nboxes][i + 3];
             }
             if ( (il != 0) || (iu != 1) )
             {
@@ -456,7 +456,7 @@ ReadData( char         *filename,
                data.stencil_offsets[s][entry][i] = 0;
             }
             data.stencil_vars[s][entry] = strtol(sdata_ptr, &sdata_ptr, 10);
-            data.stencil_values[s][entry] = strtod(sdata_ptr, &sdata_ptr);
+            data.stencil_values[s][entry] = (HYPRE_Real)strtod(sdata_ptr, &sdata_ptr);
          }
          else if ( strcmp(key, "GraphSetStencil:") == 0 )
          {
@@ -551,7 +551,7 @@ ReadData( char         *filename,
             pdata.graph_entries[pdata.graph_nentries] =
                strtol(sdata_ptr, &sdata_ptr, 10);
             pdata.graph_values[pdata.graph_nentries] =
-               strtod(sdata_ptr, &sdata_ptr);
+               (HYPRE_Real)strtod(sdata_ptr, &sdata_ptr);
             pdata.graph_boxsizes[pdata.graph_nentries] = 1;
             for (i = 0; i < 3; i++)
             {
@@ -625,7 +625,7 @@ ReadData( char         *filename,
             pdata.matrix_entries[pdata.matrix_nentries] =
                strtol(sdata_ptr, &sdata_ptr, 10);
             pdata.matrix_values[pdata.matrix_nentries] =
-               strtod(sdata_ptr, &sdata_ptr);
+               (HYPRE_Real)strtod(sdata_ptr, &sdata_ptr);
             pdata.matrix_nentries++;
             data.pdata[part] = pdata;
          }
@@ -633,9 +633,9 @@ ReadData( char         *filename,
          else if ( strcmp(key, "rfactor:") == 0 )
          {
             SScanIntArray(sdata_ptr, &sdata_ptr, data.ndim, data.rfactor);
-            for (i= data.ndim; i< 3; i++)
+            for (i = data.ndim; i < 3; i++)
             {
-               data.rfactor[i]= 1;
+               data.rfactor[i] = 1;
             }
          }
 
@@ -664,10 +664,10 @@ ReadData( char         *filename,
 
    hypre_TFree(sdata, HYPRE_MEMORY_HOST);
 
-   *data_ptr = data; 
+   *data_ptr = data;
    return 0;
 }
- 
+
 /*--------------------------------------------------------------------------
  * Distribute routines
  *--------------------------------------------------------------------------*/
@@ -681,9 +681,9 @@ MapProblemIndex( ProblemIndex index,
    index[1] -= index[7];
    index[2] -= index[8];
    /* map the index */
-   index[0] = m[0]*index[0] + (m[0]-1)*index[3];
-   index[1] = m[1]*index[1] + (m[1]-1)*index[4];
-   index[2] = m[2]*index[2] + (m[2]-1)*index[5];
+   index[0] = m[0] * index[0] + (m[0] - 1) * index[3];
+   index[1] = m[1] * index[1] + (m[1] - 1) * index[4];
+   index[2] = m[2] * index[2] + (m[2] - 1) * index[5];
    /* pre-shift the new mapped index */
    index[0] += index[6];
    index[1] += index[7];
@@ -731,7 +731,7 @@ DistributeData( ProblemData   global_data,
    ProblemIndex     int_ilower, int_iupper;
 
    /* determine first process number in each pool */
-   pool_procs = hypre_CTAlloc(HYPRE_Int,  (data.npools+1), HYPRE_MEMORY_HOST);
+   pool_procs = hypre_CTAlloc(HYPRE_Int,  (data.npools + 1), HYPRE_MEMORY_HOST);
    for (part = 0; part < data.nparts; part++)
    {
       pool = data.pools[part] + 1;
@@ -807,7 +807,7 @@ DistributeData( ProblemData   global_data,
          {
             p = pid % m[0];
             q = ((pid - p) / m[0]) % m[1];
-            r = (pid - p - q*m[0]) / (m[0]*m[1]);
+            r = (pid - p - q * m[0]) / (m[0] * m[1]);
 
             for (box = 0; box < pdata.nboxes; box++)
             {
@@ -821,12 +821,12 @@ DistributeData( ProblemData   global_data,
                pdata.iuppers[box][1] = pdata.ilowers[box][1] + n[1] - 1;
                pdata.iuppers[box][2] = pdata.ilowers[box][2] + n[2] - 1;
 
-               pdata.ilowers[box][0] = pdata.ilowers[box][0] + p*n[0];
-               pdata.ilowers[box][1] = pdata.ilowers[box][1] + q*n[1];
-               pdata.ilowers[box][2] = pdata.ilowers[box][2] + r*n[2];
-               pdata.iuppers[box][0] = pdata.iuppers[box][0] + p*n[0];
-               pdata.iuppers[box][1] = pdata.iuppers[box][1] + q*n[1];
-               pdata.iuppers[box][2] = pdata.iuppers[box][2] + r*n[2];
+               pdata.ilowers[box][0] = pdata.ilowers[box][0] + p * n[0];
+               pdata.ilowers[box][1] = pdata.ilowers[box][1] + q * n[1];
+               pdata.ilowers[box][2] = pdata.ilowers[box][2] + r * n[2];
+               pdata.iuppers[box][0] = pdata.iuppers[box][0] + p * n[0];
+               pdata.iuppers[box][1] = pdata.iuppers[box][1] + q * n[1];
+               pdata.iuppers[box][2] = pdata.iuppers[box][2] + r * n[2];
             }
 
             i = 0;
@@ -939,12 +939,12 @@ DistributeData( ProblemData   global_data,
          m[2] = block[part][2];
          if ( (m[0] * m[1] * m[2]) > 1)
          {
-            pdata.ilowers = hypre_TReAlloc(pdata.ilowers,  ProblemIndex, 
-                                           m[0]*m[1]*m[2]*pdata.nboxes, HYPRE_MEMORY_HOST);
-            pdata.iuppers = hypre_TReAlloc(pdata.iuppers,  ProblemIndex, 
-                                           m[0]*m[1]*m[2]*pdata.nboxes, HYPRE_MEMORY_HOST);
-            pdata.boxsizes = hypre_TReAlloc(pdata.boxsizes,  HYPRE_Int, 
-                                            m[0]*m[1]*m[2]*pdata.nboxes, HYPRE_MEMORY_HOST);
+            pdata.ilowers = hypre_TReAlloc(pdata.ilowers,  ProblemIndex,
+                                           m[0] * m[1] * m[2] * pdata.nboxes, HYPRE_MEMORY_HOST);
+            pdata.iuppers = hypre_TReAlloc(pdata.iuppers,  ProblemIndex,
+                                           m[0] * m[1] * m[2] * pdata.nboxes, HYPRE_MEMORY_HOST);
+            pdata.boxsizes = hypre_TReAlloc(pdata.boxsizes,  HYPRE_Int,
+                                            m[0] * m[1] * m[2] * pdata.nboxes, HYPRE_MEMORY_HOST);
             for (box = 0; box < pdata.nboxes; box++)
             {
                n[0] = pdata.iuppers[box][0] - pdata.ilowers[box][0] + 1;
@@ -965,12 +965,12 @@ DistributeData( ProblemData   global_data,
                   {
                      for (p = 0; p < m[0]; p++)
                      {
-                        pdata.ilowers[i][0] = pdata.ilowers[box][0] + p*n[0];
-                        pdata.ilowers[i][1] = pdata.ilowers[box][1] + q*n[1];
-                        pdata.ilowers[i][2] = pdata.ilowers[box][2] + r*n[2];
-                        pdata.iuppers[i][0] = pdata.iuppers[box][0] + p*n[0];
-                        pdata.iuppers[i][1] = pdata.iuppers[box][1] + q*n[1];
-                        pdata.iuppers[i][2] = pdata.iuppers[box][2] + r*n[2];
+                        pdata.ilowers[i][0] = pdata.ilowers[box][0] + p * n[0];
+                        pdata.ilowers[i][1] = pdata.ilowers[box][1] + q * n[1];
+                        pdata.ilowers[i][2] = pdata.ilowers[box][2] + r * n[2];
+                        pdata.iuppers[i][0] = pdata.iuppers[box][0] + p * n[0];
+                        pdata.iuppers[i][1] = pdata.iuppers[box][1] + q * n[1];
+                        pdata.iuppers[i][2] = pdata.iuppers[box][2] + r * n[2];
                         for (d = 3; d < 9; d++)
                         {
                            pdata.ilowers[i][d] = pdata.ilowers[box][d];
@@ -981,7 +981,7 @@ DistributeData( ProblemData   global_data,
                   }
                }
             }
-            pdata.nboxes *= m[0]*m[1]*m[2];
+            pdata.nboxes *= m[0] * m[1] * m[2];
 
             for (entry = 0; entry < pdata.graph_nentries; entry++)
             {
@@ -1101,7 +1101,7 @@ DistributeData( ProblemData   global_data,
 
    hypre_TFree(pool_procs, HYPRE_MEMORY_HOST);
 
-   *data_ptr = data; 
+   *data_ptr = data;
    return 0;
 }
 
@@ -1232,34 +1232,34 @@ GetVariableBox( Index  cell_ilower,
    var_iupper[1] = cell_iupper[1];
    var_iupper[2] = cell_iupper[2];
 
-   switch(vartype)
+   switch (vartype)
    {
       case HYPRE_SSTRUCT_VARIABLE_CELL:
-      var_ilower[0] -= 0; var_ilower[1] -= 0; var_ilower[2] -= 0;
-      break;
+         var_ilower[0] -= 0; var_ilower[1] -= 0; var_ilower[2] -= 0;
+         break;
       case HYPRE_SSTRUCT_VARIABLE_NODE:
-      var_ilower[0] -= 1; var_ilower[1] -= 1; var_ilower[2] -= 1;
-      break;
+         var_ilower[0] -= 1; var_ilower[1] -= 1; var_ilower[2] -= 1;
+         break;
       case HYPRE_SSTRUCT_VARIABLE_XFACE:
-      var_ilower[0] -= 1; var_ilower[1] -= 0; var_ilower[2] -= 0;
-      break;
+         var_ilower[0] -= 1; var_ilower[1] -= 0; var_ilower[2] -= 0;
+         break;
       case HYPRE_SSTRUCT_VARIABLE_YFACE:
-      var_ilower[0] -= 0; var_ilower[1] -= 1; var_ilower[2] -= 0;
-      break;
+         var_ilower[0] -= 0; var_ilower[1] -= 1; var_ilower[2] -= 0;
+         break;
       case HYPRE_SSTRUCT_VARIABLE_ZFACE:
-      var_ilower[0] -= 0; var_ilower[1] -= 0; var_ilower[2] -= 1;
-      break;
+         var_ilower[0] -= 0; var_ilower[1] -= 0; var_ilower[2] -= 1;
+         break;
       case HYPRE_SSTRUCT_VARIABLE_XEDGE:
-      var_ilower[0] -= 0; var_ilower[1] -= 1; var_ilower[2] -= 1;
-      break;
+         var_ilower[0] -= 0; var_ilower[1] -= 1; var_ilower[2] -= 1;
+         break;
       case HYPRE_SSTRUCT_VARIABLE_YEDGE:
-      var_ilower[0] -= 1; var_ilower[1] -= 0; var_ilower[2] -= 1;
-      break;
+         var_ilower[0] -= 1; var_ilower[1] -= 0; var_ilower[2] -= 1;
+         break;
       case HYPRE_SSTRUCT_VARIABLE_ZEDGE:
-      var_ilower[0] -= 1; var_ilower[1] -= 1; var_ilower[2] -= 0;
-      break;
+         var_ilower[0] -= 1; var_ilower[1] -= 1; var_ilower[2] -= 0;
+         break;
       case HYPRE_SSTRUCT_VARIABLE_UNDEFINED:
-      break;
+         break;
    }
 
    return ierr;
@@ -1278,7 +1278,7 @@ PrintUsage( char *progname,
       hypre_printf("Usage: %s [<options>]\n", progname);
       hypre_printf("\n");
       hypre_printf("  -in <filename> : input file (default is `%s')\n",
-             infile_default);
+                   infile_default);
       hypre_printf("\n");
       hypre_printf("  -pt <pt1> <pt2> ... : set part(s) for subsequent options\n");
       hypre_printf("  -r <rx> <ry> <rz>   : refine part(s)\n");
@@ -1298,7 +1298,7 @@ PrintUsage( char *progname,
 /*--------------------------------------------------------------------------
  * Test driver for semi-structured matrix interface
  *--------------------------------------------------------------------------*/
- 
+
 HYPRE_Int
 main( HYPRE_Int   argc,
       char *argv[] )
@@ -1314,7 +1314,7 @@ main( HYPRE_Int   argc,
    Index                *block;
    HYPRE_Int                   solver_id;
    HYPRE_Int                   print_system;
-                        
+
 #ifdef HYPRE_FORTRAN
    hypre_F90_Obj   grid;
    hypre_F90_Obj  *stencils;
@@ -1352,10 +1352,10 @@ main( HYPRE_Int   argc,
 
    HYPRE_Int                   num_iterations;
    HYPRE_Real            final_res_norm;
-                         
+
    HYPRE_Int                   num_procs, myid;
    HYPRE_Int                   time_index;
-                         
+
    HYPRE_Int                   n_pre, n_post;
 
    HYPRE_Int                   arg_index, part, box, var, entry, s, i, j, k;
@@ -1363,14 +1363,14 @@ main( HYPRE_Int   argc,
 #ifdef HYPRE_FORTRAN
    hypre_F90_Obj  long_temp_COMM;
    HYPRE_Int       temp_COMM;
-   HYPRE_Int zero=0;
-   HYPRE_Int one=1;
-   HYPRE_Int twenty=20;
-   HYPRE_Int for_HYPRE_PARCSR=5555;
+   HYPRE_Int zero = 0;
+   HYPRE_Int one = 1;
+   HYPRE_Int twenty = 20;
+   HYPRE_Int for_HYPRE_PARCSR = 5555;
 
-   HYPRE_Real ftol=1.e-8;
+   HYPRE_Real ftol = 1.e-8;
 #endif
-                        
+
    /*-----------------------------------------------------------
     * Initialize some stuff
     *-----------------------------------------------------------*/
@@ -1636,10 +1636,10 @@ main( HYPRE_Int   argc,
 
 #ifdef HYPRE_FORTRAN
    HYPRE_SStructGraphCreate(&temp_COMM, &grid, &graph);
-   HYPRE_SStructGraphSetObjectType(&graph, &for_HYPRE_PARCSR);  
+   HYPRE_SStructGraphSetObjectType(&graph, &for_HYPRE_PARCSR);
 #else
    HYPRE_SStructGraphCreate(hypre_MPI_COMM_WORLD, grid, &graph);
-   HYPRE_SStructGraphSetObjectType(graph, HYPRE_PARCSR);  
+   HYPRE_SStructGraphSetObjectType(graph, HYPRE_PARCSR);
 #endif
 
    for (part = 0; part < data.nparts; part++)
@@ -1680,7 +1680,7 @@ main( HYPRE_Int   argc,
                      k /= pdata.graph_strides[entry][i];
                      k *= pdata.graph_index_signs[entry][i];
                      to_index[j] = pdata.graph_to_ilowers[entry][j] +
-                        k * pdata.graph_to_strides[entry][j];
+                                   k * pdata.graph_to_strides[entry][j];
                   }
 #ifdef HYPRE_FORTRAN
                   HYPRE_SStructGraphAddEntries(&graph, &part, index,
@@ -1752,19 +1752,19 @@ main( HYPRE_Int   argc,
    for (part = 0; part < data.nparts; part++)
    {
       pdata = data.pdata[part];
-      cell_grid=  hypre_SStructPGridCellSGrid(hypre_SStructGridPGrid(grid, part));
-      bounding_box= hypre_StructGridBoundingBox(cell_grid);
+      cell_grid =  hypre_SStructPGridCellSGrid(hypre_SStructGridPGrid(grid, part));
+      bounding_box = hypre_StructGridBoundingBox(cell_grid);
 
-      h= (HYPRE_Real) (hypre_BoxIMax(bounding_box)[0]- hypre_BoxIMin(bounding_box)[0]);
-      for (i= 1; i< data.ndim; i++)
+      h = (HYPRE_Real) (hypre_BoxIMax(bounding_box)[0] - hypre_BoxIMin(bounding_box)[0]);
+      for (i = 1; i < data.ndim; i++)
       {
-         if ((hypre_BoxIMax(bounding_box)[i]- hypre_BoxIMin(bounding_box)[i]) > h)
+         if ((hypre_BoxIMax(bounding_box)[i] - hypre_BoxIMin(bounding_box)[i]) > h)
          {
-            h= (HYPRE_Real) (hypre_BoxIMax(bounding_box)[i]- hypre_BoxIMin(bounding_box)[i]);
+            h = (HYPRE_Real) (hypre_BoxIMax(bounding_box)[i] - hypre_BoxIMin(bounding_box)[i]);
          }
       }
-      h= 1.0/h;
-         
+      h = 1.0 / h;
+
       /* set stencil values */
       for (var = 0; var < pdata.nvars; var++)
       {
@@ -1773,13 +1773,13 @@ main( HYPRE_Int   argc,
          {
             for (j = 0; j < pdata.max_boxsize; j++)
             {
-               values[j] = h*data.stencil_values[s][i];
+               values[j] = h * data.stencil_values[s][i];
             }
             if (i < 9)
             {
                for (j = 0; j < pdata.max_boxsize; j++)
                {
-                  values[j]+= data.stencil_values[s+data.ndim][i]/h;
+                  values[j] += data.stencil_values[s + data.ndim][i] / h;
                }
             }
 
@@ -1895,20 +1895,20 @@ main( HYPRE_Int   argc,
 
    HYPRE_ParCSRMatrixEliminateRowsCols(parA, bdryRanksCnt[0], bdryRanks[0]);
 #endif
-                                                                                                                                    
+
    {
       hypre_MaxwellOffProcRow **OffProcRows;
       hypre_SStructSharedDOF_ParcsrMatRowsComm(&grid,
                                                (hypre_ParCSRMatrix *) parA,
                                                &i,
                                                &OffProcRows);
-      for (j= 0; j< i; j++)
+      for (j = 0; j < i; j++)
       {
          hypre_MaxwellOffProcRowDestroy((void *) OffProcRows[j]);
       }
       hypre_TFree(OffProcRows, HYPRE_MEMORY_HOST);
-    }
-                                                                                                                                    
+   }
+
    /*-----------------------------------------------------------
     * Set up the linear system
     *-----------------------------------------------------------*/
@@ -1927,9 +1927,9 @@ main( HYPRE_Int   argc,
 
    for (j = 0; j < data.max_boxsize; j++)
    {
-      values[j]= sin((HYPRE_Real)(j+1));
-      values[j]= (HYPRE_Real) hypre_Rand();
-      values[j]= (HYPRE_Real) j;
+      values[j] = hypre_sin((HYPRE_Real)(j + 1));
+      values[j] = (HYPRE_Real) hypre_Rand();
+      values[j] = (HYPRE_Real) j;
    }
    for (part = 0; part < data.nparts; part++)
    {
@@ -1938,7 +1938,7 @@ main( HYPRE_Int   argc,
       {
          for (box = 0; box < pdata.nboxes; box++)
          {
-            GetVariableBox(pdata.ilowers[box], pdata.iuppers[box], 
+            GetVariableBox(pdata.ilowers[box], pdata.iuppers[box],
                            pdata.vartypes[var], ilower, iupper);
 #ifdef HYPRE_FORTRAN
             HYPRE_SStructVectorSetBoxValues(&b, &part, &ilower[0], &iupper[0],
@@ -1979,7 +1979,7 @@ main( HYPRE_Int   argc,
       {
          for (box = 0; box < pdata.nboxes; box++)
          {
-            GetVariableBox(pdata.ilowers[box], pdata.iuppers[box], 
+            GetVariableBox(pdata.ilowers[box], pdata.iuppers[box],
                            pdata.vartypes[var], ilower, iupper);
 #ifdef HYPRE_FORTRAN
             HYPRE_SStructVectorSetBoxValues(&x, &part, &ilower[0], &iupper[0],
@@ -2004,9 +2004,9 @@ main( HYPRE_Int   argc,
 #endif
 
    hypre_ParVectorZeroBCValues((hypre_ParVector *) parx, bdryRanks[0],
-                                                   bdryRanksCnt[0]);
+                               bdryRanksCnt[0]);
    hypre_ParVectorZeroBCValues((hypre_ParVector *) parb, bdryRanks[0],
-                                                   bdryRanksCnt[0]);
+                               bdryRanksCnt[0]);
 
    hypre_TFree(bdryRanks[0], HYPRE_MEMORY_HOST);
    hypre_TFree(bdryRanks, HYPRE_MEMORY_HOST);
@@ -2099,7 +2099,7 @@ main( HYPRE_Int   argc,
 #else
       HYPRE_SStructMaxwellGetNumIterations(solver, &num_iterations);
       HYPRE_SStructMaxwellGetFinalRelativeResidualNorm(
-                                           solver, &final_res_norm);
+         solver, &final_res_norm);
       HYPRE_SStructMaxwellDestroy(solver);
 #endif
    }
diff --git a/external/hypre/src/test/fparcsr_ls.f b/external/hypre/src/test/fparcsr_ls.f
index 14101f9c..d75349e3 100644
--- a/external/hypre/src/test/fparcsr_ls.f
+++ b/external/hypre/src/test/fparcsr_ls.f
@@ -1,4 +1,4 @@
-!     Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+!     Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 !     HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 !
 !     SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/fparcsr_mv.f b/external/hypre/src/test/fparcsr_mv.f
index 5481f779..4a3ddd32 100644
--- a/external/hypre/src/test/fparcsr_mv.f
+++ b/external/hypre/src/test/fparcsr_mv.f
@@ -1,4 +1,4 @@
-!     Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+!     Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 !     HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 !
 !     SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/fsstruct_ls.f b/external/hypre/src/test/fsstruct_ls.f
index 8fda320b..0230cfd7 100644
--- a/external/hypre/src/test/fsstruct_ls.f
+++ b/external/hypre/src/test/fsstruct_ls.f
@@ -1,4 +1,4 @@
-!     Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+!     Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 !     HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 !
 !     SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/fsstruct_mv.f b/external/hypre/src/test/fsstruct_mv.f
index 836aab5c..5e19fcf7 100644
--- a/external/hypre/src/test/fsstruct_mv.f
+++ b/external/hypre/src/test/fsstruct_mv.f
@@ -1,4 +1,4 @@
-!     Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+!     Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 !     HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 !
 !     SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/fstruct_ls.f b/external/hypre/src/test/fstruct_ls.f
index 3599da1a..183748ea 100644
--- a/external/hypre/src/test/fstruct_ls.f
+++ b/external/hypre/src/test/fstruct_ls.f
@@ -1,4 +1,4 @@
-!     Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+!     Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 !     HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 !
 !     SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/fstruct_mv.f b/external/hypre/src/test/fstruct_mv.f
index 0be09d7a..6e71fe34 100644
--- a/external/hypre/src/test/fstruct_mv.f
+++ b/external/hypre/src/test/fstruct_mv.f
@@ -1,4 +1,4 @@
-!     Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+!     Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 !     HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 !
 !     SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/hypre_ij_fortran_test.h b/external/hypre/src/test/hypre_ij_fortran_test.h
index ba546947..2bbe4c1f 100644
--- a/external/hypre/src/test/hypre_ij_fortran_test.h
+++ b/external/hypre/src/test/hypre_ij_fortran_test.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -8,7 +8,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-    
+
 /******************************************************************************
  * Definitions of IJMatrix Fortran interface routines
  *****************************************************************************/
@@ -16,139 +16,139 @@ extern "C" {
 #define HYPRE_IJMatrixCreate \
         hypre_F90_NAME(fhypre_ijmatrixcreate, FHYPRE_IJMATRIXCREATE)
 extern void hypre_F90_NAME(fhypre_ijmatrixcreate, FHYPRE_IJMATRIXCREATE)
-                      (hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, hypre_F90_Obj*);
+(hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, hypre_F90_Obj*);
 
 #define HYPRE_IJMatrixDestroy \
         hypre_F90_NAME(fhypre_ijmatrixdestroy, FHYPRE_IJMATRIXDESTROY)
 extern void hypre_F90_NAME(fhypre_ijmatrixdestroy, FHYPRE_IJMATRIXDESTROY)
-                      (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_IJMatrixInitialize \
         hypre_F90_NAME(fhypre_ijmatrixinitialize, FHYPRE_IJMATRIXINITIALIZE)
 extern void hypre_F90_NAME(fhypre_ijmatrixinitialize, FHYPRE_IJMATRIXINITIALIZE)
-                      (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_IJMatrixAssemble \
         hypre_F90_NAME(fhypre_ijmatrixassemble, FHYPRE_IJMATRIXASSEMBLE)
 extern void hypre_F90_NAME(fhypre_ijmatrixassemble, FHYPRE_IJMATRIXASSEMBLE)
-                      (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_IJMatrixSetRowSizes \
         hypre_F90_NAME(fhypre_ijmatrixsetrowsizes, FHYPRE_IJMATRIXSETROWSIZES)
 extern void hypre_F90_NAME(fhypre_ijmatrixsetrowsizes, FHYPRE_IJMATRIXSETROWSIZES)
-                      (hypre_F90_Obj *, const HYPRE_Int *);
+(hypre_F90_Obj *, const HYPRE_Int *);
 
 #define HYPRE_IJMatrixSetDiagOffdSizes \
         hypre_F90_NAME(fhypre_ijmatrixsetdiagoffdsizes, FHYPRE_IJMATRIXSETDIAGOFFDSIZES)
 extern void hypre_F90_NAME(fhypre_ijmatrixsetdiagoffdsizes, FHYPRE_IJMATRIXSETDIAGOFFDSIZES)
-                      (hypre_F90_Obj *, const HYPRE_Int *, const HYPRE_Int *);
+(hypre_F90_Obj *, const HYPRE_Int *, const HYPRE_Int *);
 
 #define HYPRE_IJMatrixSetValues \
         hypre_F90_NAME(fhypre_ijmatrixsetvalues, FHYPRE_IJMATRIXSETVALUES)
 extern void hypre_F90_NAME(fhypre_ijmatrixsetvalues, FHYPRE_IJMATRIXSETVALUES)
-                      (hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, const HYPRE_Int *, const HYPRE_Int *,
-                       const HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, const HYPRE_Int *, const HYPRE_Int *,
+ const HYPRE_Real *);
 
 #define HYPRE_IJMatrixAddToValues \
         hypre_F90_NAME(fhypre_ijmatrixaddtovalues, FHYPRE_IJMATRIXADDTOVALUES)
 extern void hypre_F90_NAME(fhypre_ijmatrixaddtovalues, FHYPRE_IJMATRIXADDTOVALUES)
-                      (hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, const HYPRE_Int *, const HYPRE_Int *,
-                       const HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, const HYPRE_Int *, const HYPRE_Int *,
+ const HYPRE_Real *);
 
 #define HYPRE_IJMatrixSetObjectType \
         hypre_F90_NAME(fhypre_ijmatrixsetobjecttype, FHYPRE_IJMATRIXSETOBJECTTYPE)
 extern void hypre_F90_NAME(fhypre_ijmatrixsetobjecttype, FHYPRE_IJMATRIXSETOBJECTTYPE)
-                      (hypre_F90_Obj *, const HYPRE_Int *);
+(hypre_F90_Obj *, const HYPRE_Int *);
 
 #define HYPRE_IJMatrixGetObjectType \
         hypre_F90_NAME(fhypre_ijmatrixgetobjecttype, FHYPRE_IJMATRIXGETOBJECTTYPE)
 extern void hypre_F90_NAME(fhypre_ijmatrixgetobjecttype, FHYPRE_IJMATRIXGETOBJECTTYPE)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_IJMatrixGetObject \
         hypre_F90_NAME(fhypre_ijmatrixgetobject, FHYPRE_IJMATRIXGETOBJECT)
 extern void hypre_F90_NAME(fhypre_ijmatrixgetobject, FHYPRE_IJMATRIXGETOBJECT)
-                      (hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_IJMatrixRead \
         hypre_F90_NAME(fhypre_ijmatrixread, FHYPRE_IJMATRIXREAD)
 extern void hypre_F90_NAME(fhypre_ijmatrixread, FHYPRE_IJMATRIXREAD)
-                      (char *, hypre_F90_Obj *, HYPRE_Int *, hypre_F90_Obj *);
+(char *, hypre_F90_Obj *, HYPRE_Int *, hypre_F90_Obj *);
 
 #define HYPRE_IJMatrixPrint \
         hypre_F90_NAME(fhypre_ijmatrixprint, FHYPRE_IJMATRIXPRINT)
 extern void hypre_F90_NAME(fhypre_ijmatrixprint, FHYPRE_IJMATRIXPRINT)
-                      (hypre_F90_Obj *, char *);
+(hypre_F90_Obj *, char *);
 
 
 
 #define hypre_IJMatrixSetObject \
         hypre_F90_NAME(fhypre_ijmatrixsetobject, FHYPRE_IJMATRIXSETOBJECT)
 extern void hypre_F90_NAME(fhypre_ijmatrixsetobject, FHYPRE_IJMATRIXSETOBJECT)
-                      (hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *);
 
 
 
 #define HYPRE_IJVectorCreate \
         hypre_F90_NAME(fhypre_ijvectorcreate, FHYPRE_IJVECTORCREATE)
 extern void hypre_F90_NAME(fhypre_ijvectorcreate, FHYPRE_IJVECTORCREATE)
-                      (HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, hypre_F90_Obj *);
+(HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, hypre_F90_Obj *);
 
 #define HYPRE_IJVectorDestroy \
         hypre_F90_NAME(fhypre_ijvectordestroy, FHYPRE_IJVECTORDESTROY)
 extern void hypre_F90_NAME(fhypre_ijvectordestroy, FHYPRE_IJVECTORDESTROY)
-                      (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_IJVectorInitialize \
         hypre_F90_NAME(fhypre_ijvectorinitialize, FHYPRE_IJVECTORINITIALIZE)
 extern void hypre_F90_NAME(fhypre_ijvectorinitialize, FHYPRE_IJVECTORINITIALIZE)
-                      (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_IJVectorSetValues \
         hypre_F90_NAME(fhypre_ijvectorsetvalues, FHYPRE_IJVECTORSETVALUES)
 extern void hypre_F90_NAME(fhypre_ijvectorsetvalues, FHYPRE_IJVECTORSETVALUES)
-                      (hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Real *);
 
 #define HYPRE_IJVectorAddToValues \
         hypre_F90_NAME(fhypre_ijvectoraddtovalues, FHYPRE_IJVECTORADDTOVALUES)
 extern void hypre_F90_NAME(fhypre_ijvectoraddtovalues, FHYPRE_IJVECTORADDTOVALUES)
-                      (hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Real *);
 
 #define HYPRE_IJVectorAssemble \
         hypre_F90_NAME(fhypre_ijvectorassemble, FHYPRE_IJVECTORASSEMBLE)
 extern void hypre_F90_NAME(fhypre_ijvectorassemble, FHYPRE_IJVECTORASSEMBLE)
-                      (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_IJVectorGetValues \
         hypre_F90_NAME(fhypre_ijvectorgetvalues, FHYPRE_IJVECTORGETVALUES)
 extern void hypre_F90_NAME(fhypre_ijvectorgetvalues, FHYPRE_IJVECTORGETVALUES)
-                      (hypre_F90_Obj *, const HYPRE_Int *, const HYPRE_Int *, HYPRE_Real *);
+(hypre_F90_Obj *, const HYPRE_Int *, const HYPRE_Int *, HYPRE_Real *);
 
 #define HYPRE_IJVectorSetObjectType \
         hypre_F90_NAME(fhypre_ijvectorsetobjecttype, FHYPRE_IJVECTORSETOBJECTTYPE)
 extern void hypre_F90_NAME(fhypre_ijvectorsetobjecttype, FHYPRE_IJVECTORSETOBJECTTYPE)
-                      (hypre_F90_Obj *, const HYPRE_Int *);
+(hypre_F90_Obj *, const HYPRE_Int *);
 
 #define HYPRE_IJVectorGetObjectType \
         hypre_F90_NAME(fhypre_ijvectorgetobjecttype, FHYPRE_IJVECTORGETOBJECTTYPE)
 extern void hypre_F90_NAME(fhypre_ijvectorgetobjecttype, FHYPRE_IJVECTORGETOBJECTTYPE)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_IJVectorGetObject \
         hypre_F90_NAME(fhypre_ijvectorgetobject, FHYPRE_IJVECTORGETOBJECT)
 extern void hypre_F90_NAME(fhypre_ijvectorgetobject, FHYPRE_IJVECTORGETOBJECT)
-                      (hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_IJVectorRead \
         hypre_F90_NAME(fhypre_ijvectorread, FHYPRE_IJVECTORREAD)
 extern void hypre_F90_NAME(fhypre_ijvectorread, FHYPRE_IJVECTORREAD)
-                      (char *, hypre_F90_Obj *, HYPRE_Int *, hypre_F90_Obj *);
+(char *, hypre_F90_Obj *, HYPRE_Int *, hypre_F90_Obj *);
 
 #define HYPRE_IJVectorPrint \
         hypre_F90_NAME(fhypre_ijvectorprint, FHYPRE_IJVECTORPRINT)
 extern void hypre_F90_NAME(fhypre_ijvectorprint, FHYPRE_IJVECTORPRINT)
-                      (hypre_F90_Obj *, const char *);
-    
+(hypre_F90_Obj *, const char *);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/external/hypre/src/test/hypre_parcsr_fortran_test.h b/external/hypre/src/test/hypre_parcsr_fortran_test.h
index 75815aef..afcf34c9 100644
--- a/external/hypre/src/test/hypre_parcsr_fortran_test.h
+++ b/external/hypre/src/test/hypre_parcsr_fortran_test.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -16,1493 +16,1494 @@ extern "C" {
 #define HYPRE_ParCSRMatrixCreate  \
         hypre_F90_NAME(fhypre_parcsrmatrixcreate, FHYPRE_PARCSRMATRIXCREATE)
 extern void hypre_F90_NAME(fhypre_parcsrmatrixcreate, FHYPRE_PARCSRMATRIXCREATE)
-            (HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, hypre_F90_Obj *);
+(HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *,
+ HYPRE_Int *, hypre_F90_Obj *);
 
 #define HYPRE_ParCSRMatrixDestroy  \
         hypre_F90_NAME(fhypre_parcsrmatrixdestroy, FHYPRE_PARCSRMATRIXDESTROY)
 extern void hypre_F90_NAME(fhypre_parcsrmatrixdestroy, FHYPRE_PARCSRMATRIXDESTROY)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRMatrixInitialize  \
         hypre_F90_NAME(fhypre_parcsrmatrixinitialize, FHYPRE_PARCSRMATRIXINITIALIZE)
 extern void hypre_F90_NAME(fhypre_parcsrmatrixinitialize, FHYPRE_PARCSRMATRIXINITIALIZE)
-                      (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_ParCSRMatrixRead  \
         hypre_F90_NAME(fhypre_parcsrmatrixread, FHYPRE_PARCSRMATRIXREAD)
 extern void hypre_F90_NAME(fhypre_parcsrmatrixread, FHYPRE_PARCSRMATRIXREAD)
-                      (HYPRE_Int *, char *, hypre_F90_Obj *);
+(HYPRE_Int *, char *, hypre_F90_Obj *);
 
 #define HYPRE_ParCSRMatrixPrint  \
         hypre_F90_NAME(fhypre_parcsrmatrixprint, FHYPRE_PARCSRMATRIXPRINT)
 extern void hypre_F90_NAME(fhypre_parcsrmatrixprint, FHYPRE_PARCSRMATRIXPRINT)
-                      (hypre_F90_Obj *, char *, HYPRE_Int *);
+(hypre_F90_Obj *, char *, HYPRE_Int *);
 
 #define HYPRE_ParCSRMatrixGetComm  \
         hypre_F90_NAME(fhypre_parcsrmatrixgetcomm, FHYPRE_PARCSRMATRIXGETCOMM)
 extern void hypre_F90_NAME(fhypre_parcsrmatrixgetcomm, FHYPRE_PARCSRMATRIXGETCOMM)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRMatrixGetDims  \
         hypre_F90_NAME(fhypre_parcsrmatrixgetdims, FHYPRE_PARCSRMATRIXGETDIMS)
 extern void hypre_F90_NAME(fhypre_parcsrmatrixgetdims, FHYPRE_PARCSRMATRIXGETDIMS)
-                      (hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *);
 
 #define HYPRE_ParCSRMatrixGetRowPartitioning  \
         hypre_F90_NAME(fhypre_parcsrmatrixgetrowpartit, FHYPRE_PARCSRMATRIXGETROWPARTIT)
 extern void hypre_F90_NAME(fhypre_parcsrmatrixgetrowpartit, FHYPRE_PARCSRMATRIXGETROWPARTIT)
-                      (hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_ParCSRMatrixGetColPartitioning  \
         hypre_F90_NAME(fhypre_parcsrmatrixgetcolpartit, FHYPRE_PARCSRMATRIXGETCOLPARTIT)
 extern void hypre_F90_NAME(fhypre_parcsrmatrixgetcolpartit, FHYPRE_PARCSRMATRIXGETCOLPARTIT)
-                      (hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_ParCSRMatrixGetLocalRange  \
         hypre_F90_NAME(fhypre_parcsrmatrixgetlocalrang, FHYPRE_PARCSRMATRIXGETLOCALRANG)
 extern void hypre_F90_NAME(fhypre_parcsrmatrixgetlocalrang, FHYPRE_PARCSRMATRIXGETLOCALRANG)
-                      (hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *);
 
 #define HYPRE_ParCSRMatrixGetRow  \
         hypre_F90_NAME(fhypre_parcsrmatrixgetrow, FHYPRE_PARCSRMATRIXGETROW)
 extern void hypre_F90_NAME(fhypre_parcsrmatrixgetrow, FHYPRE_PARCSRMATRIXGETROW)
-                      (hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_ParCSRMatrixRestoreRow  \
         hypre_F90_NAME(fhypre_parcsrmatrixrestorerow, FHYPRE_PARCSRMATRIXRESTOREROW)
 extern void hypre_F90_NAME(fhypre_parcsrmatrixrestorerow, FHYPRE_PARCSRMATRIXRESTOREROW)
-                      (hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_CSRMatrixtoParCSRMatrix  \
         hypre_F90_NAME(fhypre_csrmatrixtoparcsrmatrix, FHYPRE_CSRMATRIXTOPARCSRMATRIX)
 extern void hypre_F90_NAME(fhypre_csrmatrixtoparcsrmatrix, FHYPRE_CSRMATRIXTOPARCSRMATRIX)
-                      (HYPRE_Int *, hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, hypre_F90_Obj *);
+(HYPRE_Int *, hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, hypre_F90_Obj *);
 
 #define HYPRE_ParCSRMatrixMatvec  \
         hypre_F90_NAME(fhypre_parcsrmatrixmatvec, FHYPRE_PARCSRMATRIXMATVEC)
 extern void hypre_F90_NAME(fhypre_parcsrmatrixmatvec, FHYPRE_PARCSRMATRIXMATVEC)
-                      (HYPRE_Real *, hypre_F90_Obj *, hypre_F90_Obj *, HYPRE_Real *, hypre_F90_Obj *);
+(HYPRE_Real *, hypre_F90_Obj *, hypre_F90_Obj *, HYPRE_Real *, hypre_F90_Obj *);
 
 #define HYPRE_ParCSRMatrixMatvecT  \
         hypre_F90_NAME(fhypre_parcsrmatrixmatvect, FHYPRE_PARCSRMATRIXMATVECT)
 extern void hypre_F90_NAME(fhypre_parcsrmatrixmatvect, FHYPRE_PARCSRMATRIXMATVECT)
-                      (HYPRE_Real *, hypre_F90_Obj *, hypre_F90_Obj *, HYPRE_Real *, hypre_F90_Obj *);
+(HYPRE_Real *, hypre_F90_Obj *, hypre_F90_Obj *, HYPRE_Real *, hypre_F90_Obj *);
 
 
 
 #define HYPRE_ParVectorCreate  \
         hypre_F90_NAME(fhypre_parvectorcreate, FHYPRE_PARVECTORCREATE)
 extern void hypre_F90_NAME(fhypre_parvectorcreate, FHYPRE_PARVECTORCREATE)
-                      (HYPRE_Int *, HYPRE_Int *, hypre_F90_Obj *, hypre_F90_Obj *);
+(HYPRE_Int *, HYPRE_Int *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_ParMultiVectorCreate  \
         hypre_F90_NAME(fhypre_parmultivectorcreate, FHYPRE_PARMULTIVECTORCREATE)
 extern void hypre_F90_NAME(fhypre_parmultivectorcreate, FHYPRE_PARMULTIVECTORCREATE)
-                      (HYPRE_Int *, HYPRE_Int *, hypre_F90_Obj *, HYPRE_Int *, hypre_F90_Obj *);
+(HYPRE_Int *, HYPRE_Int *, hypre_F90_Obj *, HYPRE_Int *, hypre_F90_Obj *);
 
 #define HYPRE_ParVectorDestroy  \
         hypre_F90_NAME(fhypre_parvectordestroy, FHYPRE_PARVECTORDESTROY)
 extern void hypre_F90_NAME(fhypre_parvectordestroy, FHYPRE_PARVECTORDESTROY)
-                      (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_ParVectorInitialize  \
         hypre_F90_NAME(fhypre_parvectorinitialize, FHYPRE_PARVECTORINITIALIZE)
 extern void hypre_F90_NAME(fhypre_parvectorinitialize, FHYPRE_PARVECTORINITIALIZE)
-                      (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_ParVectorRead  \
         hypre_F90_NAME(fhypre_parvectorread, FHYPRE_PARVECTORREAD)
 extern void hypre_F90_NAME(fhypre_parvectorread, FHYPRE_PARVECTORREAD)
-                      (HYPRE_Int *, hypre_F90_Obj *, char *);
+(HYPRE_Int *, hypre_F90_Obj *, char *);
 
 #define HYPRE_ParVectorPrint  \
         hypre_F90_NAME(fhypre_parvectorprint, FHYPRE_PARVECTORPRINT)
 extern void hypre_F90_NAME(fhypre_parvectorprint, FHYPRE_PARVECTORPRINT)
-                      (hypre_F90_Obj *, char *, HYPRE_Int *);
+(hypre_F90_Obj *, char *, HYPRE_Int *);
 
 #define HYPRE_ParVectorSetConstantValues  \
         hypre_F90_NAME(fhypre_parvectorsetconstantvalu, FHYPRE_PARVECTORSETCONSTANTVALU)
 extern void hypre_F90_NAME(fhypre_parvectorsetconstantvalu, FHYPRE_PARVECTORSETCONSTANTVALU)
-                      (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_ParVectorSetRandomValues  \
         hypre_F90_NAME(fhypre_parvectorsetrandomvalues, FHYPRE_PARVECTORSETRANDOMVALUES)
 extern void hypre_F90_NAME(fhypre_parvectorsetrandomvalues, FHYPRE_PARVECTORSETRANDOMVALUES)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParVectorCopy  \
         hypre_F90_NAME(fhypre_parvectorcopy, FHYPRE_PARVECTORCOPY)
 extern void hypre_F90_NAME(fhypre_parvectorcopy, FHYPRE_PARVECTORCOPY)
-                      (hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_ParVectorCloneShallow  \
         hypre_F90_NAME(fhypre_parvectorcloneshallow, FHYPRE_PARVECTORCLONESHALLOW)
 extern void hypre_F90_NAME(fhypre_parvectorcloneshallow, FHYPRE_PARVECTORCLONESHALLOW)
-                      (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_ParVectorScale  \
         hypre_F90_NAME(fhypre_parvectorscale, FHYPRE_PARVECTORSCALE)
 extern void hypre_F90_NAME(fhypre_parvectorscale, FHYPRE_PARVECTORSCALE)
-                      (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_ParVectorAxpy  \
         hypre_F90_NAME(fhypre_parvectoraxpy, FHYPRE_PARVECTORAXPY)
 extern void hypre_F90_NAME(fhypre_parvectoraxpy, FHYPRE_PARVECTORAXPY)
-                      (HYPRE_Real *, hypre_F90_Obj *, hypre_F90_Obj *);
+(HYPRE_Real *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_ParVectorInnerProd  \
         hypre_F90_NAME(fhypre_parvectorinnerprod, FHYPRE_PARVECTORINNERPROD)
 extern void hypre_F90_NAME(fhypre_parvectorinnerprod, FHYPRE_PARVECTORINNERPROD)
-                      (hypre_F90_Obj *, hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, hypre_F90_Obj *, HYPRE_Real *);
 
 #define hypre_ParCSRMatrixGlobalNumRows  \
         hypre_F90_NAME(fhypre_parcsrmatrixglobalnumrow, FHYPRE_PARCSRMATRIXGLOBALNUMROW)
 extern void hypre_F90_NAME(fhypre_parcsrmatrixglobalnumrow, FHYPRE_PARCSRMATRIXGLOBALNUMROW)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define hypre_ParCSRMatrixRowStarts  \
         hypre_F90_NAME(fhypre_parcsrmatrixrowstarts, FHYPRE_PARCSRMATRIXROWSTARTS)
 extern void hypre_F90_NAME(fhypre_parcsrmatrixrowstarts, FHYPRE_PARCSRMATRIXROWSTARTS)
-                      (hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define hypre_ParVectorSetDataOwner  \
         hypre_F90_NAME(fhypre_setparvectordataowner, FHYPRE_SETPARVECTORDATAOWNER)
 extern void hypre_F90_NAME(fhypre_setparvectordataowner, FHYPRE_SETPARVECTORDATAOWNER)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 
 
 #define GenerateLaplacian  \
         hypre_F90_NAME(fgeneratelaplacian, FHYPRE_GENERATELAPLACIAN)
 extern void hypre_F90_NAME(fgeneratelaplacian, FHYPRE_GENERATELAPLACIAN)
-                      (HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *,
-                       HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Real *, hypre_F90_Obj *);
+(HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *,
+ HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Real *, hypre_F90_Obj *);
 
 
 
 #define HYPRE_BoomerAMGCreate  \
         hypre_F90_NAME(fhypre_boomeramgcreate, FHYPRE_BOOMERAMGCREATE)
 extern void hypre_F90_NAME(fhypre_boomeramgcreate, FHYPRE_BOOMERAMGCREATE)
-                      (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_BoomerAMGDestroy  \
         hypre_F90_NAME(fhypre_boomeramgdestroy, FHYPRE_BOOMERAMGDESTROY)
 extern void hypre_F90_NAME(fhypre_boomeramgdestroy, FHYPRE_BOOMERAMGDESTROY)
-                      (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_BoomerAMGSetup  \
         hypre_F90_NAME(fhypre_boomeramgsetup, FHYPRE_BOOMERAMGSETUP)
 extern void hypre_F90_NAME(fhypre_boomeramgsetup, FHYPRE_BOOMERAMGSETUP)
-                      (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_BoomerAMGSolve  \
         hypre_F90_NAME(fhypre_boomeramgsolve, FHYPRE_BOOMERAMGSOLVE)
 extern void hypre_F90_NAME(fhypre_boomeramgsolve, FHYPRE_BOOMERAMGSOLVE)
-                      (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_BoomerAMGSolveT  \
         hypre_F90_NAME(fhypre_boomeramgsolvet, FHYPRE_BOOMERAMGSOLVET)
 extern void hypre_F90_NAME(fhypre_boomeramgsolvet, FHYPRE_BOOMERAMGSOLVET)
-                      (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_BoomerAMGSetRestriction  \
         hypre_F90_NAME(fhypre_boomeramgsetrestriction, FHYPRE_BOOMERAMGSETRESTRICTION)
 extern void hypre_F90_NAME(fhypre_boomeramgsetrestriction, FHYPRE_BOOMERAMGSETRESTRICTION)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_BoomerAMGSetMaxLevels  \
         hypre_F90_NAME(fhypre_boomeramgsetmaxlevels, FHYPRE_BOOMERAMGSETMAXLEVELS)
 extern void hypre_F90_NAME(fhypre_boomeramgsetmaxlevels, FHYPRE_BOOMERAMGSETMAXLEVELS)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_BoomerAMGGetMaxLevels  \
         hypre_F90_NAME(fhypre_boomeramggetmaxlevels, FHYPRE_BOOMERAMGGETMAXLEVELS)
 extern void hypre_F90_NAME(fhypre_boomeramggetmaxlevels, FHYPRE_BOOMERAMGGETMAXLEVELS)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_BoomerAMGSetCoarsenCutFactor  \
         hypre_F90_NAME(fhypre_boomeramgsetcoarsencutfa, FHYPRE_BOOMERAMGSETCOARSENCUTFAC)
 extern void hypre_F90_NAME(fhypre_boomeramgsetcoarsencutfa, FHYPRE_BOOMERAMGSETCOARSENCUTFAC)
-                      (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_BoomerAMGGetCoarsenCutFactor  \
         hypre_F90_NAME(fhypre_boomeramggetcoarsencutfa, FHYPRE_BOOMERAMGGETCOARSENCUTFAC)
 extern void hypre_F90_NAME(fhypre_boomeramggetcoarsencutfa, FHYPRE_BOOMERAMGGETCOARSENCUTFAC)
-                      (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_BoomerAMGSetStrongThreshold  \
         hypre_F90_NAME(fhypre_boomeramgsetstrongthrshl, FHYPRE_BOOMERAMGSETSTRONGTHRSHL)
 extern void hypre_F90_NAME(fhypre_boomeramgsetstrongthrshl, FHYPRE_BOOMERAMGSETSTRONGTHRSHL)
-                      (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_BoomerAMGGetStrongThreshold  \
         hypre_F90_NAME(fhypre_boomeramggetstrongthrshl, FHYPRE_BOOMERAMGGETSTRONGTHRSHL)
 extern void hypre_F90_NAME(fhypre_boomeramggetstrongthrshl, FHYPRE_BOOMERAMGGETSTRONGTHRSHL)
-                      (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_BoomerAMGSetMaxRowSum  \
         hypre_F90_NAME(fhypre_boomeramgsetmaxrowsum, FHYPRE_BOOMERAMGSETMAXROWSUM)
 extern void hypre_F90_NAME(fhypre_boomeramgsetmaxrowsum, FHYPRE_BOOMERAMGSETMAXROWSUM)
-                      (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_BoomerAMGGetMaxRowSum  \
         hypre_F90_NAME(fhypre_boomeramggetmaxrowsum, FHYPRE_BOOMERAMGGETMAXROWSUM)
 extern void hypre_F90_NAME(fhypre_boomeramggetmaxrowsum, FHYPRE_BOOMERAMGGETMAXROWSUM)
-                      (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_BoomerAMGSetTruncFactor  \
         hypre_F90_NAME(fhypre_boomeramgsettruncfactor, FHYPRE_BOOMERAMGSETTRUNCFACTOR)
 extern void hypre_F90_NAME(fhypre_boomeramgsettruncfactor, FHYPRE_BOOMERAMGSETTRUNCFACTOR)
-                      (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_BoomerAMGGetTruncFactor  \
         hypre_F90_NAME(fhypre_boomeramggettruncfactor, FHYPRE_BOOMERAMGGETTRUNCFACTOR)
 extern void hypre_F90_NAME(fhypre_boomeramggettruncfactor, FHYPRE_BOOMERAMGGETTRUNCFACTOR)
-                      (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_BoomerAMGSetSCommPkgSwitch  \
         hypre_F90_NAME(fhypre_boomeramgsetscommpkgswit, FHYPRE_BOOMERAMGSETSCOMMPKGSWIT)
 extern void hypre_F90_NAME(fhypre_boomeramgsetscommpkgswit, FHYPRE_BOOMERAMGSETSCOMMPKGSWIT)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_BoomerAMGSetInterpType  \
         hypre_F90_NAME(fhypre_boomeramgsetinterptype, FHYPRE_BOOMERAMGSETINTERPTYPE)
 extern void hypre_F90_NAME(fhypre_boomeramgsetinterptype, FHYPRE_BOOMERAMGSETINTERPTYPE)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_BoomerAMGSetMinIter  \
         hypre_F90_NAME(fhypre_boomeramgsetminiter, FHYPRE_BOOMERAMGSETMINITER)
 extern void hypre_F90_NAME(fhypre_boomeramgsetminiter, FHYPRE_BOOMERAMGSETMINITER)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_BoomerAMGSetMaxIter  \
         hypre_F90_NAME(fhypre_boomeramgsetmaxiter, FHYPRE_BOOMERAMGSETMAXITER)
 extern void hypre_F90_NAME(fhypre_boomeramgsetmaxiter, FHYPRE_BOOMERAMGSETMAXITER)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_BoomerAMGGetMaxIter  \
         hypre_F90_NAME(fhypre_boomeramggetmaxiter, FHYPRE_BOOMERAMGGETMAXITER)
 extern void hypre_F90_NAME(fhypre_boomeramggetmaxiter, FHYPRE_BOOMERAMGGETMAXITER)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_BoomerAMGSetCoarsenType  \
         hypre_F90_NAME(fhypre_boomeramgsetcoarsentype, FHYPRE_BOOMERAMGSETCOARSENTYPE)
 extern void hypre_F90_NAME(fhypre_boomeramgsetcoarsentype, FHYPRE_BOOMERAMGSETCOARSENTYPE)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_BoomerAMGGetCoarsenType  \
         hypre_F90_NAME(fhypre_boomeramggetcoarsentype, FHYPRE_BOOMERAMGGETCOARSENTYPE)
 extern void hypre_F90_NAME(fhypre_boomeramggetcoarsentype, FHYPRE_BOOMERAMGGETCOARSENTYPE)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_BoomerAMGSetMeasureType  \
         hypre_F90_NAME(fhypre_boomeramgsetmeasuretype, FHYPRE_BOOMERAMGSETMEASURETYPE)
 extern void hypre_F90_NAME(fhypre_boomeramgsetmeasuretype, FHYPRE_BOOMERAMGSETMEASURETYPE)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_BoomerAMGGetMeasureType  \
         hypre_F90_NAME(fhypre_boomeramggetmeasuretype, FHYPRE_BOOMERAMGGETMEASURETYPE)
 extern void hypre_F90_NAME(fhypre_boomeramggetmeasuretype, FHYPRE_BOOMERAMGGETMEASURETYPE)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_BoomerAMGSetSetupType  \
         hypre_F90_NAME(fhypre_boomeramgsetsetuptype, FHYPRE_BOOMERAMGSETSETUPTYPE)
 extern void hypre_F90_NAME(fhypre_boomeramgsetsetuptype, FHYPRE_BOOMERAMGSETSETUPTYPE)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_BoomerAMGSetCycleType  \
         hypre_F90_NAME(fhypre_boomeramgsetcycletype, FHYPRE_BOOMERAMGSETCYCLETYPE)
 extern void hypre_F90_NAME(fhypre_boomeramgsetcycletype, FHYPRE_BOOMERAMGSETCYCLETYPE)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_BoomerAMGGetCycleType  \
         hypre_F90_NAME(fhypre_boomeramggetcycletype, FHYPRE_BOOMERAMGGETCYCLETYPE)
 extern void hypre_F90_NAME(fhypre_boomeramggetcycletype, FHYPRE_BOOMERAMGGETCYCLETYPE)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_BoomerAMGSetTol  \
         hypre_F90_NAME(fhypre_boomeramgsettol, FHYPRE_BOOMERAMGSETTOL)
 extern void hypre_F90_NAME(fhypre_boomeramgsettol, FHYPRE_BOOMERAMGSETTOL)
-                      (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_BoomerAMGGetTol  \
         hypre_F90_NAME(fhypre_boomeramggettol, FHYPRE_BOOMERAMGGETTOL)
 extern void hypre_F90_NAME(fhypre_boomeramggettol, FHYPRE_BOOMERAMGGETTOL)
-                      (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_BoomerAMGSetNumSweeps  \
         hypre_F90_NAME(fhypre_boomeramgsetnumsweeps, FHYPRE_BOOMERAMGSETNUMSWEEPS)
 extern void hypre_F90_NAME(fhypre_boomeramgsetnumsweeps, FHYPRE_BOOMERAMGSETNUMSWEEPS)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_BoomerAMGSetCycleNumSweeps  \
         hypre_F90_NAME(fhypre_boomeramgsetcyclenumswee, FHYPRE_BOOMERAMGSETCYCLENUMSWEE)
 extern void hypre_F90_NAME(fhypre_boomeramgsetcyclenumswee, FHYPRE_BOOMERAMGSETCYCLENUMSWEE)
-                      (hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *);
 
 #define HYPRE_BoomerAMGGetCycleNumSweeps  \
         hypre_F90_NAME(fhypre_boomeramggetcyclenumswee, FHYPRE_BOOMERAMGGETCYCLENUMSWEE)
 extern void hypre_F90_NAME(fhypre_boomeramggetcyclenumswee, FHYPRE_BOOMERAMGGETCYCLENUMSWEE)
-                      (hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *);
 
 #define HYPRE_BoomerAMGInitGridRelaxation  \
         hypre_F90_NAME(fhypre_boomeramginitgridrelaxat, FHYPRE_BOOMERAMGINITGRIDRELAXAT)
 extern void hypre_F90_NAME(fhypre_boomeramginitgridrelaxat, FHYPRE_BOOMERAMGINITGRIDRELAXAT)
-                      (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, HYPRE_Int *, hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, HYPRE_Int *, hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_BoomerAMGFinalizeGridRelaxation  \
         hypre_F90_NAME(fhypre_boomeramgfingridrelaxatn, FHYPRE_BOOMERAMGFINGRIDRELAXATN)
 extern void hypre_F90_NAME(fhypre_boomeramgfingridrelaxatn, FHYPRE_BOOMERAMGFINGRIDRELAXATN)
-                      (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_BoomerAMGSetRelaxType  \
         hypre_F90_NAME(fhypre_boomeramgsetrelaxtype, FHYPRE_BOOMERAMGSETRELAXTYPE)
 extern void hypre_F90_NAME(fhypre_boomeramgsetrelaxtype, FHYPRE_BOOMERAMGSETRELAXTYPE)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_BoomerAMGSetRelaxType  \
         hypre_F90_NAME(fhypre_boomeramgsetrelaxtype, FHYPRE_BOOMERAMGSETRELAXTYPE)
 extern void hypre_F90_NAME(fhypre_boomeramgsetrelaxtype, FHYPRE_BOOMERAMGSETRELAXTYPE)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_BoomerAMGSetRelaxOrder  \
         hypre_F90_NAME(fhypre_boomeramgsetrelaxorder, FHYPRE_BOOMERAMGSETRELAXORDER)
 extern void hypre_F90_NAME(fhypre_boomeramgsetrelaxorder, FHYPRE_BOOMERAMGSETRELAXORDER)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_BoomerAMGSetRelaxWeight  \
         hypre_F90_NAME(fhypre_boomeramgsetrelaxweight, FHYPRE_BOOMERAMGSETRELAXWEIGHT)
 extern void hypre_F90_NAME(fhypre_boomeramgsetrelaxweight, FHYPRE_BOOMERAMGSETRELAXWEIGHT)
-                      (hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_BoomerAMGSetRelaxWt  \
         hypre_F90_NAME(fhypre_boomeramgsetrelaxwt, FHYPRE_BOOMERAMGSETRELAXWT)
 extern void hypre_F90_NAME(fhypre_boomeramgsetrelaxwt, FHYPRE_BOOMERAMGSETRELAXWT)
-                      (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_BoomerAMGSetLevelRelaxWt  \
         hypre_F90_NAME(fhypre_boomeramgsetlevelrelaxwt, FHYPRE_BOOMERAMGSETLEVELRELAXWT)
 extern void hypre_F90_NAME(fhypre_boomeramgsetlevelrelaxwt, FHYPRE_BOOMERAMGSETLEVELRELAXWT)
-                      (hypre_F90_Obj *, HYPRE_Real *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Real *, HYPRE_Int *);
 
 #define HYPRE_BoomerAMGSetOuterWt  \
         hypre_F90_NAME(fhypre_boomeramgsetouterwt, FHYPRE_BOOMERAMGSETOUTERWT)
 extern void hypre_F90_NAME(fhypre_boomeramgsetouterwt, FHYPRE_BOOMERAMGSETOUTERWT)
-                      (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_BoomerAMGSetLevelOuterWt  \
         hypre_F90_NAME(fhypre_boomeramgsetlevelouterwt, FHYPRE_BOOMERAMGSETLEVELOUTERWT)
 extern void hypre_F90_NAME(fhypre_boomeramgsetlevelouterwt, FHYPRE_BOOMERAMGSETLEVELOUTERWT)
-                      (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_BoomerAMGSetSmoothType  \
         hypre_F90_NAME(fhypre_boomeramgsetsmoothtype, FHYPRE_BOOMERAMGSETSMOOTHTYPE)
 extern void hypre_F90_NAME(fhypre_boomeramgsetsmoothtype, FHYPRE_BOOMERAMGSETSMOOTHTYPE)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_BoomerAMGGetSmoothType  \
         hypre_F90_NAME(fhypre_boomeramggetsmoothtype, FHYPRE_BOOMERAMGGETSMOOTHTYPE)
 extern void hypre_F90_NAME(fhypre_boomeramggetsmoothtype, FHYPRE_BOOMERAMGGETSMOOTHTYPE)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_BoomerAMGSetSmoothNumLvls  \
         hypre_F90_NAME(fhypre_boomeramgsetsmoothnumlvl, FHYPRE_BOOMERAMGSETSMOOTHNUMLVL)
 extern void hypre_F90_NAME(fhypre_boomeramgsetsmoothnumlvl, FHYPRE_BOOMERAMGSETSMOOTHNUMLVL)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_BoomerAMGGetSmoothNumLvls  \
         hypre_F90_NAME(fhypre_boomeramggetsmoothnumlvl, FHYPRE_BOOMERAMGGETSMOOTHNUMLVL)
 extern void hypre_F90_NAME(fhypre_boomeramggetsmoothnumlvl, FHYPRE_BOOMERAMGGETSMOOTHNUMLVL)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_BoomerAMGSetSmoothNumSwps  \
         hypre_F90_NAME(fhypre_boomeramgsetsmoothnumswp, FHYPRE_BOOMERAMGSETSMOOTHNUMSWP)
 extern void hypre_F90_NAME(fhypre_boomeramgsetsmoothnumswp, FHYPRE_BOOMERAMGSETSMOOTHNUMSWP)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_BoomerAMGGetSmoothNumSwps  \
         hypre_F90_NAME(fhypre_boomeramggetsmoothnumswp, FHYPRE_BOOMERAMGGETSMOOTHNUMSWP)
 extern void hypre_F90_NAME(fhypre_boomeramggetsmoothnumswp, FHYPRE_BOOMERAMGGETSMOOTHNUMSWP)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_BoomerAMGSetLogging  \
         hypre_F90_NAME(fhypre_boomeramgsetlogging, FHYPRE_BOOMERAMGSETLOGGING)
 extern void hypre_F90_NAME(fhypre_boomeramgsetlogging, FHYPRE_BOOMERAMGSETLOGGING)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_BoomerAMGGetLogging  \
         hypre_F90_NAME(fhypre_boomeramggetlogging, FHYPRE_BOOMERAMGGETLOGGING)
 extern void hypre_F90_NAME(fhypre_boomeramggetlogging, FHYPRE_BOOMERAMGGETLOGGING)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_BoomerAMGSetPrintLevel  \
         hypre_F90_NAME(fhypre_boomeramgsetprintlevel, FHYPRE_BOOMERAMGSETPRINTLEVEL)
 extern void hypre_F90_NAME(fhypre_boomeramgsetprintlevel, FHYPRE_BOOMERAMGSETPRINTLEVEL)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_BoomerAMGGetPrintLevel  \
         hypre_F90_NAME(fhypre_boomeramggetprintlevel, FHYPRE_BOOMERAMGGETPRINTLEVEL)
 extern void hypre_F90_NAME(fhypre_boomeramggetprintlevel, FHYPRE_BOOMERAMGGETPRINTLEVEL)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_BoomerAMGSetPrintFileName  \
         hypre_F90_NAME(fhypre_boomeramgsetprintfilenam, FHYPRE_BOOMERAMGSETPRINTFILENAM)
 extern void hypre_F90_NAME(fhypre_boomeramgsetprintfilenam, FHYPRE_BOOMERAMGSETPRINTFILENAM)
-                      (hypre_F90_Obj *, char *);
+(hypre_F90_Obj *, char *);
 
 #define HYPRE_BoomerAMGSetDebugFlag  \
         hypre_F90_NAME(fhypre_boomeramgsetdebugflag, FHYPRE_BOOMERAMGSETDEBUGFLAG)
 extern void hypre_F90_NAME(fhypre_boomeramgsetdebugflag, FHYPRE_BOOMERAMGSETDEBUGFLAG)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_BoomerAMGGetDebugFlag  \
         hypre_F90_NAME(fhypre_boomeramggetdebugflag, FHYPRE_BOOMERAMGGETDEBUGFLAG)
 extern void hypre_F90_NAME(fhypre_boomeramggetdebugflag, FHYPRE_BOOMERAMGGETDEBUGFLAG)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_BoomerAMGGetNumIterations  \
         hypre_F90_NAME(fhypre_boomeramggetnumiteration, FHYPRE_BOOMERAMGGETNUMITERATION)
 extern void hypre_F90_NAME(fhypre_boomeramggetnumiteration, FHYPRE_BOOMERAMGGETNUMITERATION)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_BoomerAMGGetCumNumIterations  \
         hypre_F90_NAME(fhypre_boomeramggetcumnumiterat, FHYPRE_BOOMERAMGGETCUMNUMITERAT)
 extern void hypre_F90_NAME(fhypre_boomeramggetcumnumiterat, FHYPRE_BOOMERAMGGETCUMNUMITERAT)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_BoomerAMGGetResidual  \
         hypre_F90_NAME(fhypre_boomeramggetresidual, FHYPRE_BOOMERAMGGETRESIDUAL)
 extern void hypre_F90_NAME(fhypre_boomeramggetresidual, FHYPRE_BOOMERAMGGETRESIDUAL)
-                      (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_BoomerAMGGetFinalRelativeResidualNorm  \
         hypre_F90_NAME(fhypre_boomeramggetfinalreltvre, FHYPRE_BOOMERAMGGETFINALRELTVRE)
 extern void hypre_F90_NAME(fhypre_boomeramggetfinalreltvre, FHYPRE_BOOMERAMGGETFINALRELTVRE)
-                      (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_BoomerAMGSetVariant  \
         hypre_F90_NAME(fhypre_boomeramgsetvariant, FHYPRE_BOOMERAMGSETVARIANT)
 extern void hypre_F90_NAME(fhypre_boomeramgsetvariant, FHYPRE_BOOMERAMGSETVARIANT)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_BoomerAMGGetVariant  \
         hypre_F90_NAME(fhypre_boomeramggetvariant, FHYPRE_BOOMERAMGGETVARIANT)
 extern void hypre_F90_NAME(fhypre_boomeramggetvariant, FHYPRE_BOOMERAMGGETVARIANT)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_BoomerAMGSetOverlap  \
         hypre_F90_NAME(fhypre_boomeramgsetoverlap, FHYPRE_BOOMERAMGSETOVERLAP)
 extern void hypre_F90_NAME(fhypre_boomeramgsetoverlap, FHYPRE_BOOMERAMGSETOVERLAP)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_BoomerAMGGetOverlap  \
         hypre_F90_NAME(fhypre_boomeramggetoverlap, FHYPRE_BOOMERAMGGETOVERLAP)
 extern void hypre_F90_NAME(fhypre_boomeramggetoverlap, FHYPRE_BOOMERAMGGETOVERLAP)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_BoomerAMGSetDomainType  \
         hypre_F90_NAME(fhypre_boomeramgsetdomaintype, FHYPRE_BOOMERAMGSETDOMAINTYPE)
 extern void hypre_F90_NAME(fhypre_boomeramgsetdomaintype, FHYPRE_BOOMERAMGSETDOMAINTYPE)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_BoomerAMGGetDomainType  \
         hypre_F90_NAME(fhypre_boomeramggetdomaintype, FHYPRE_BOOMERAMGGETDOMAINTYPE)
 extern void hypre_F90_NAME(fhypre_boomeramggetdomaintype, FHYPRE_BOOMERAMGGETDOMAINTYPE)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_BoomerAMGSetSchwarzRlxWt  \
         hypre_F90_NAME(fhypre_boomeramgsetschwarzrlxwt, FHYPRE_BOOMERAMGSETSCHWARZRLXWT)
 extern void hypre_F90_NAME(fhypre_boomeramgsetschwarzrlxwt, FHYPRE_BOOMERAMGSETSCHWARZRLXWT)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_BoomerAMGGetSchwarzRlxWt  \
         hypre_F90_NAME(fhypre_boomeramggetschwarzrlxwt, FHYPRE_BOOMERAMGGETSCHWARZRLXWT)
 extern void hypre_F90_NAME(fhypre_boomeramggetschwarzrlxwt, FHYPRE_BOOMERAMGGETSCHWARZRLXWT)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_BoomerAMGSetSym  \
         hypre_F90_NAME(fhypre_boomeramgsetsym, FHYPRE_BOOMERAMGSETSYM)
 extern void hypre_F90_NAME(fhypre_boomeramgsetsym, FHYPRE_BOOMERAMGSETSYM)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_BoomerAMGSetLevel  \
         hypre_F90_NAME(fhypre_boomeramgsetlevel, FHYPRE_BOOMERAMGSETLEVEL)
 extern void hypre_F90_NAME(fhypre_boomeramgsetlevel, FHYPRE_BOOMERAMGSETLEVEL)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_BoomerAMGSetFilter  \
         hypre_F90_NAME(fhypre_boomeramgsetfilter, FHYPRE_BOOMERAMGSETFILTER)
 extern void hypre_F90_NAME(fhypre_boomeramgsetfilter, FHYPRE_BOOMERAMGSETFILTER)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_BoomerAMGSetDropTol  \
         hypre_F90_NAME(fhypre_boomeramgsetdroptol, FHYPRE_BOOMERAMGSETDROPTOL)
 extern void hypre_F90_NAME(fhypre_boomeramgsetdroptol, FHYPRE_BOOMERAMGSETDROPTOL)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_BoomerAMGSetMaxNzPerRow  \
         hypre_F90_NAME(fhypre_boomeramgsetmaxnzperrow, FHYPRE_BOOMERAMGSETMAXNZPERROW)
 extern void hypre_F90_NAME(fhypre_boomeramgsetmaxnzperrow, FHYPRE_BOOMERAMGSETMAXNZPERROW)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_BoomerAMGSetEuclidFile  \
         hypre_F90_NAME(fhypre_boomeramgseteuclidfile, FHYPRE_BOOMERAMGSETEUCLIDFILE)
 extern void hypre_F90_NAME(fhypre_boomeramgseteuclidfile, FHYPRE_BOOMERAMGSETEUCLIDFILE)
-                      (hypre_F90_Obj *, char *);
+(hypre_F90_Obj *, char *);
 
 #define HYPRE_BoomerAMGSetNumFunctions  \
         hypre_F90_NAME(fhypre_boomeramgsetnumfunctions, FHYPRE_BOOMERAMGSETNUMFUNCTIONS)
 extern void hypre_F90_NAME(fhypre_boomeramgsetnumfunctions, FHYPRE_BOOMERAMGSETNUMFUNCTIONS)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_BoomerAMGGetNumFunctions  \
         hypre_F90_NAME(fhypre_boomeramggetnumfunctions, FHYPRE_BOOMERAMGGETNUMFUNCTIONS)
 extern void hypre_F90_NAME(fhypre_boomeramggetnumfunctions, FHYPRE_BOOMERAMGGETNUMFUNCTIONS)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_BoomerAMGSetNodal  \
         hypre_F90_NAME(fhypre_boomeramgsetnodal, FHYPRE_BOOMERAMGSETNODAL)
 extern void hypre_F90_NAME(fhypre_boomeramgsetnodal, FHYPRE_BOOMERAMGSETNODAL)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_BoomerAMGSetDofFunc  \
         hypre_F90_NAME(fhypre_boomeramgsetdoffunc, FHYPRE_BOOMERAMGSETDOFFUNC)
 extern void hypre_F90_NAME(fhypre_boomeramgsetdoffunc, FHYPRE_BOOMERAMGSETDOFFUNC)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_BoomerAMGSetNumPaths  \
         hypre_F90_NAME(fhypre_boomeramgsetnumpaths, FHYPRE_BOOMERAMGSETNUMPATHS)
 extern void hypre_F90_NAME(fhypre_boomeramgsetnumpaths, FHYPRE_BOOMERAMGSETNUMPATHS)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_BoomerAMGSetAggNumLevels  \
         hypre_F90_NAME(fhypre_boomeramgsetaggnumlevels, FHYPRE_BOOMERAMGSETAGGNUMLEVELS)
 extern void hypre_F90_NAME(fhypre_boomeramgsetaggnumlevels, FHYPRE_BOOMERAMGSETAGGNUMLEVELS)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_BoomerAMGSetGSMG  \
         hypre_F90_NAME(fhypre_boomeramgsetgsmg, FHYPRE_BOOMERAMGSETGSMG)
 extern void hypre_F90_NAME(fhypre_boomeramgsetgsmg, FHYPRE_BOOMERAMGSETGSMG)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_BoomerAMGSetNumSamples  \
         hypre_F90_NAME(fhypre_boomeramgsetnumsamples, FHYPRE_BOOMERAMGSETNUMSAMPLES)
 extern void hypre_F90_NAME(fhypre_boomeramgsetsamples, FHYPRE_BOOMERAMGSETNUMSAMPLES)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 
 
 #define HYPRE_ParCSRBiCGSTABCreate  \
         hypre_F90_NAME(fhypre_parcsrbicgstabcreate, FHYPRE_PARCSRBICGSTABCREATE)
 extern void hypre_F90_NAME(fhypre_parcsrbicgstabcreate, FHYPRE_PARCSRBICGSTABCREATE)
-                      (HYPRE_Int *, hypre_F90_Obj *);
+(HYPRE_Int *, hypre_F90_Obj *);
 
 #define HYPRE_ParCSRBiCGSTABDestroy  \
         hypre_F90_NAME(fhypre_parcsrbicgstabdestroy, FHYPRE_PARCSRBICGSTABDESTROY)
 extern void hypre_F90_NAME(fhypre_parcsrbicgstabdestroy, FHYPRE_PARCSRBICGSTABDESTROY)
-                      (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_ParCSRBiCGSTABSetup  \
         hypre_F90_NAME(fhypre_parcsrbicgstabsetup, FHYPRE_PARCSRBICGSTABSETUP)
 extern void hypre_F90_NAME(fhypre_parcsrbicgstabsetup, FHYPRE_PARCSRBICGSTABSETUP)
-                      (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_ParCSRBiCGSTABSolve  \
         hypre_F90_NAME(fhypre_parcsrbicgstabsolve, FHYPRE_PARCSRBICGSTABSOLVE)
 extern void hypre_F90_NAME(fhypre_parcsrbicgstabsolve, FHYPRE_PARCSRBICGSTABSOLVE)
-                      (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_ParCSRBiCGSTABSetTol  \
         hypre_F90_NAME(fhypre_parcsrbicgstabsettol, FHYPRE_PARCSRBICGSTABSETTOL)
 extern void hypre_F90_NAME(fhypre_parcsrbicgstabsettol, FHYPRE_PARCSRBICGSTABSETTOL)
-                      (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_ParCSRBiCGSTABSetMinIter  \
         hypre_F90_NAME(fhypre_parcsrbicgstabsetminiter, FHYPRE_PARCSRBICGSTABSETMINITER)
 extern void hypre_F90_NAME(fhypre_parcsrbicgstabsetminiter, FHYPRE_PARCSRBICGSTABSETMINITER)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRBiCGSTABSetMaxIter  \
         hypre_F90_NAME(fhypre_parcsrbicgstabsetmaxiter, FHYPRE_PARCSRBICGSTABSETMAXITER)
 extern void hypre_F90_NAME(fhypre_parcsrbicgstabsetmaxiter, FHYPRE_PARCSRBICGSTABSETMAXITER)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRBiCGSTABSetStopCrit  \
         hypre_F90_NAME(fhypre_parcsrbicgstabsetstopcri, FHYPRE_PARCSRBICGSTABSETSTOPCRI)
 extern void hypre_F90_NAME(fhypre_parcsrbicgstabsetstopcri, FHYPRE_PARCSRBICGSTABSETSTOPCRI)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRBiCGSTABSetPrecond  \
         hypre_F90_NAME(fhypre_parcsrbicgstabsetprecond, FHYPRE_PARCSRBICGSTABSETPRECOND)
 extern void hypre_F90_NAME(fhypre_parcsrbicgstabsetprecond, FHYPRE_PARCSRBICGSTABSETPRECOND)
-                      (hypre_F90_Obj *, HYPRE_Int *, hypre_F90_Obj *);
+(hypre_F90_Obj *, HYPRE_Int *, hypre_F90_Obj *);
 
 #define HYPRE_ParCSRBiCGSTABGetPrecond  \
         hypre_F90_NAME(fhypre_parcsrbicgstabgetprecond, FHYPRE_PARCSRBICGSTABGETPRECOND)
 extern void hypre_F90_NAME(fhypre_parcsrbicgstabgetprecond, FHYPRE_PARCSRBICGSTABGETPRECOND)
-                      (hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_ParCSRBiCGSTABSetLogging  \
         hypre_F90_NAME(fhypre_parcsrbicgstabsetlogging, FHYPRE_PARCSRBICGSTABSETLOGGING)
 extern void hypre_F90_NAME(fhypre_parcsrbicgstabsetlogging, FHYPRE_PARCSRBICGSTABSETLOGGING)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRBiCGSTABSetPrintLevel  \
         hypre_F90_NAME(fhypre_parcsrbicgstabsetprintle, FHYPRE_PARCSRBICGSTABSETPRINTLE)
 extern void hypre_F90_NAME(fhypre_parcsrbicgstabsetprintle, FHYPRE_PARCSRBICGSTABSETPRINTLE)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRBiCGSTABGetNumIter  \
         hypre_F90_NAME(fhypre_parcsrbicgstabgetnumiter, FHYPRE_PARCSRBICGSTABGETNUMITER)
 extern void hypre_F90_NAME(fhypre_parcsrbicgstabgetnumiter, FHYPRE_PARCSRBICGSTABGETNUMITER)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRBiCGSTABGetFinalRel  \
         hypre_F90_NAME(fhypre_parcsrbicgstabgetfinalre, FHYPRE_PARCSRBICGSTABGETFINALRE)
 extern void hypre_F90_NAME(fhypre_parcsrbicgstabgetfinalre, FHYPRE_PARCSRBICGSTABGETFINALRE)
-                      (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 
 
 #define HYPRE_BlockTridiagCreate  \
-	hypre_F90_NAME(fhypre_blocktridiagcreate, FHYPRE_BLOCKTRIDIAGCREATE)
+   hypre_F90_NAME(fhypre_blocktridiagcreate, FHYPRE_BLOCKTRIDIAGCREATE)
 extern void hypre_F90_NAME(fhypre_blocktridiagcreate, FHYPRE_BLOCKTRIDIAGCREATE)
-                      (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_BlockTridiagDestroy  \
-	hypre_F90_NAME(fhypre_blocktridiagdestroy, FHYPRE_BLOCKTRIDIAGDESTROY)
+   hypre_F90_NAME(fhypre_blocktridiagdestroy, FHYPRE_BLOCKTRIDIAGDESTROY)
 extern void hypre_F90_NAME(fhypre_blocktridiagdestroy, FHYPRE_BLOCKTRIDIAGDESTROY)
-                      (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_BlockTridiagSetup  \
-	hypre_F90_NAME(fhypre_blocktridiagsetup, FHYPRE_BLOCKTRIDIAGSETUP)
+   hypre_F90_NAME(fhypre_blocktridiagsetup, FHYPRE_BLOCKTRIDIAGSETUP)
 extern void hypre_F90_NAME(fhypre_blocktridiagsetup, FHYPRE_BLOCKTRIDIAGSETUP)
-                      (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_BlockTridiagSolve  \
-	hypre_F90_NAME(fhypre_blocktridiagsolve, FHYPRE_BLOCKTRIDIAGSOLVE)
+   hypre_F90_NAME(fhypre_blocktridiagsolve, FHYPRE_BLOCKTRIDIAGSOLVE)
 extern void hypre_F90_NAME(fhypre_blocktridiagsolve, FHYPRE_BLOCKTRIDIAGSOLVE)
-                      (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_BlockTridiagSetIndexSet  \
-	hypre_F90_NAME(fhypre_blocktridiagsetindexset, FHYPRE_BLOCKTRIDIAGSETINDEXSET)
+   hypre_F90_NAME(fhypre_blocktridiagsetindexset, FHYPRE_BLOCKTRIDIAGSETINDEXSET)
 extern void hypre_F90_NAME(fhypre_blocktridiagsetindexset, FHYPRE_BLOCKTRIDIAGSETINDEXSET)
-                      (hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *);
 
 #define HYPRE_BlockTridiagSetAMGStrengthThreshold  \
-	hypre_F90_NAME(fhypre_blocktridiagsetamgstreng, FHYPRE_BLOCKTRIDIAGSETAMGSTRENG)
+   hypre_F90_NAME(fhypre_blocktridiagsetamgstreng, FHYPRE_BLOCKTRIDIAGSETAMGSTRENG)
 extern void hypre_F90_NAME(fhypre_blocktridiagsetamgstreng, FHYPRE_BLOCKTRIDIAGSETAMGSTRENG)
-                      (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_BlockTridiagSetAMGNumSweeps  \
-	hypre_F90_NAME(fhypre_blocktridiagsetamgnumswe, FHYPRE_BLOCKTRIDIAGSETAMGNUMSWE)
+   hypre_F90_NAME(fhypre_blocktridiagsetamgnumswe, FHYPRE_BLOCKTRIDIAGSETAMGNUMSWE)
 extern void hypre_F90_NAME(fhypre_blocktridiagsetamgnumswe, FHYPRE_BLOCKTRIDIAGSETAMGNUMSWE)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_BlockTridiagSetAMGRelaxType  \
-	hypre_F90_NAME(fhypre_blocktridiagsetamgrelaxt, FHYPRE_BLOCKTRIDIAGSETAMGRELAXT)
+   hypre_F90_NAME(fhypre_blocktridiagsetamgrelaxt, FHYPRE_BLOCKTRIDIAGSETAMGRELAXT)
 extern void hypre_F90_NAME(fhypre_blocktridiagsetamgrelaxt, FHYPRE_BLOCKTRIDIAGSETAMGRELAXT)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_BlockTridiagSetPrintLevel  \
-	hypre_F90_NAME(fhypre_blocktridiagsetprintleve, FHYPRE_BLOCKTRIDIAGSETPRINTLEVE)
+   hypre_F90_NAME(fhypre_blocktridiagsetprintleve, FHYPRE_BLOCKTRIDIAGSETPRINTLEVE)
 extern void hypre_F90_NAME(fhypre_blocktridiagsetprintleve, FHYPRE_BLOCKTRIDIAGSETPRINTLEVE)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 
 
 #define HYPRE_ParCSRCGNRCreate  \
-	hypre_F90_NAME(fhypre_parcsrcgnrcreate, FHYPRE_PARCSRCGNRCREATE)
+   hypre_F90_NAME(fhypre_parcsrcgnrcreate, FHYPRE_PARCSRCGNRCREATE)
 extern void hypre_F90_NAME(fhypre_parcsrcgnrcreate, FHYPRE_PARCSRCGNRCREATE)
-                      (HYPRE_Int *, hypre_F90_Obj *);
+(HYPRE_Int *, hypre_F90_Obj *);
 
 #define HYPRE_ParCSRCGNRDestroy  \
         hypre_F90_NAME(fhypre_parcsrcgnrdestroy, FHYPRE_PARCSRCGNRDESTROY)
 extern void hypre_F90_NAME(fhypre_parcsrcgnrdestroy, FHYPRE_PARCSRCGNRDESTROY)
-                      (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_ParCSRCGNRSetup  \
         hypre_F90_NAME(fhypre_parcsrcgnrsetup, FHYPRE_PARCSRCGNRSETUP)
 extern void hypre_F90_NAME(fhypre_parcsrcgnrsetup, FHYPRE_PARCSRCGNRSETUP)
-                      (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_ParCSRCGNRSolve  \
         hypre_F90_NAME(fhypre_parcsrcgnrsolve, FHYPRE_PARCSRCGNRSOLVE)
 extern void hypre_F90_NAME(fhypre_parcsrcgnrsolve, FHYPRE_PARCSRCGNRSOLVE)
-                      (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_ParCSRCGNRSetTol  \
         hypre_F90_NAME(fhypre_parcsrcgnrsettol, FHYPRE_PARCSRCGNRSETTOL)
 extern void hypre_F90_NAME(fhypre_parcsrcgnrsettol, FHYPRE_PARCSRCGNRSETTOL)
-                      (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_ParCSRCGNRSetMinIter  \
         hypre_F90_NAME(fhypre_parcsrcgnrsetminiter, FHYPRE_PARCSRCGNRSETMINITER)
 extern void hypre_F90_NAME(fhypre_parcsrcgnrsetminiter, FHYPRE_PARCSRCGNRSETMINITER)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRCGNRSetMaxIter  \
         hypre_F90_NAME(fhypre_parcsrcgnrsetmaxiter, FHYPRE_PARCSRCGNRSETMAXITER)
 extern void hypre_F90_NAME(fhypre_parcsrcgnrsetmaxiter, FHYPRE_PARCSRCGNRSETMAXITER)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRCGNRSetStopCrit  \
         hypre_F90_NAME(fhypre_parcsrcgnrsetstopcri, FHYPRE_PARCSRCGNRSETSTOPCRI)
 extern void hypre_F90_NAME(fhypre_parcsrcgnrsetstopcri, FHYPRE_PARCSRCGNRSETSTOPCRI)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRCGNRSetPrecond  \
         hypre_F90_NAME(fhypre_parcsrcgnrsetprecond, FHYPRE_PARCSRCGNRSETPRECOND)
 extern void hypre_F90_NAME(fhypre_parcsrcgnrsetprecond, FHYPRE_PARCSRCGNRSETPRECOND)
-                      (hypre_F90_Obj *, HYPRE_Int *, hypre_F90_Obj *);
+(hypre_F90_Obj *, HYPRE_Int *, hypre_F90_Obj *);
 
 #define HYPRE_ParCSRCGNRGetPrecond  \
         hypre_F90_NAME(fhypre_parcsrcgnrgetprecond, FHYPRE_PARCSRCGNRGETPRECOND)
 extern void hypre_F90_NAME(fhypre_parcsrcgnrgetprecond, FHYPRE_PARCSRCGNRGETPRECOND)
-                      (hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_ParCSRCGNRSetLogging  \
         hypre_F90_NAME(fhypre_parcsrcgnrsetlogging, FHYPRE_PARCSRCGNRSETLOGGING)
 extern void hypre_F90_NAME(fhypre_parcsrcgnrsetlogging, FHYPRE_PARCSRCGNRSETLOGGING)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRCGNRGetNumIteration  \
         hypre_F90_NAME(fhypre_parcsrcgnrgetnumiteratio, FHYPRE_PARCSRCGNRGETNUMITERATIO)
 extern void hypre_F90_NAME(fhypre_parcsrcgnrgetnumiteratio, FHYPRE_PARCSRCGNRGETNUMITERATIO)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRCGNRGetFinalRelativeResidualNorm  \
         hypre_F90_NAME(fhypre_parcsrcgnrgetfinalrelati, FHYPRE_PARCSRCGNRGETFINALRELATI)
 extern void hypre_F90_NAME(fhypre_parcsrcgnrgetfinalrelati, FHYPRE_PARCSRCGNRGETFINALRELATI)
-                      (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 
 
 #define HYPRE_EuclidCreate  \
         hypre_F90_NAME(fhypre_euclidcreate, FHYPRE_EUCLIDCREATE)
 extern void hypre_F90_NAME(fhypre_euclidcreate, FHYPRE_EUCLIDCREATE)
-                      (HYPRE_Int *, hypre_F90_Obj *);
+(HYPRE_Int *, hypre_F90_Obj *);
 
 #define HYPRE_EuclidDestroy  \
         hypre_F90_NAME(fhypre_eucliddestroy, FHYPRE_EUCLIDDESTROY)
 extern void hypre_F90_NAME(fhypre_eucliddestroy, FHYPRE_EUCLIDDESTROY)
-                      (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_EuclidSetup  \
         hypre_F90_NAME(fhypre_euclidsetup, FHYPRE_EUCLIDSETUP)
 extern void hypre_F90_NAME(fhypre_euclidsetup, FHYPRE_EUCLIDSETUP)
-                      (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_EuclidSolve  \
         hypre_F90_NAME(fhypre_euclidsolve, FHYPRE_EUCLIDSOLVE)
 extern void hypre_F90_NAME(fhypre_euclidsolve, FHYPRE_EUCLIDSOLVE)
-                      (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_EuclidSetParams  \
         hypre_F90_NAME(fhypre_euclidsetparams, FHYPRE_EUCLIDSETPARAMS)
 extern void hypre_F90_NAME(fhypre_euclidsetparams, FHYPRE_EUCLIDSETPARAMS)
-                      (hypre_F90_Obj *, HYPRE_Int *, char *);
+(hypre_F90_Obj *, HYPRE_Int *, char *);
 
 #define HYPRE_EuclidSetParamsFromFile  \
         hypre_F90_NAME(fhypre_euclidsetparamsfromfile, FHYPRE_EUCLIDSETPARAMSFROMFILE)
 extern void hypre_F90_NAME(fhypre_euclidsetparamsfromfile, FHYPRE_EUCLIDSETPARAMSFROMFILE)
-                      (hypre_F90_Obj *, char *);
+(hypre_F90_Obj *, char *);
 
 
 
 #define HYPRE_ParCSRGMRESCreate  \
         hypre_F90_NAME(fhypre_parcsrgmrescreate, FHYPRE_PARCSRGMRESCREATE)
 extern void hypre_F90_NAME(fhypre_parcsrgmrescreate, FHYPRE_PARCSRGMRESCREATE)
-                      (HYPRE_Int *, hypre_F90_Obj *);
+(HYPRE_Int *, hypre_F90_Obj *);
 
 #define HYPRE_ParCSRGMRESDestroy  \
         hypre_F90_NAME(fhypre_parcsrgmresdestroy, FHYPRE_PARCSRGMRESDESTROY)
 extern void hypre_F90_NAME(fhypre_parcsrgmresdestroy, FHYPRE_PARCSRGMRESDESTROY)
-                      (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_ParCSRGMRESSetup  \
         hypre_F90_NAME(fhypre_parcsrgmressetup, FHYPRE_PARCSRGMRESSETUP)
 extern void hypre_F90_NAME(fhypre_parcsrgmressetup, FHYPRE_PARCSRGMRESSETUP)
-                      (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_ParCSRGMRESSolve  \
         hypre_F90_NAME(fhypre_parcsrgmressolve, FHYPRE_PARCSRGMRESSOLVE)
 extern void hypre_F90_NAME(fhypre_parcsrgmressolve, FHYPRE_PARCSRGMRESSOLVE)
-                      (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_ParCSRGMRESSetKDim  \
         hypre_F90_NAME(fhypre_parcsrgmressetkdim, FHYPRE_PARCSRGMRESSETKDIM)
 extern void hypre_F90_NAME(fhypre_parcsrgmressetkdim, FHYPRE_PARCSRGMRESSETKDIM)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRGMRESSetTol  \
         hypre_F90_NAME(fhypre_parcsrgmressettol, FHYPRE_PARCSRGMRESSETTOL)
 extern void hypre_F90_NAME(fhypre_parcsrgmressettol, FHYPRE_PARCSRGMRESSETTOL)
-                      (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_ParCSRGMRESSetMinIter  \
         hypre_F90_NAME(fhypre_parcsrgmressetminiter, FHYPRE_PARCSRGMRESSETMINITER)
 extern void hypre_F90_NAME(fhypre_parcsrgmressetminiter, FHYPRE_PARCSRGMRESSETMINITER)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRGMRESSetMaxIter  \
         hypre_F90_NAME(fhypre_parcsrgmressetmaxiter, FHYPRE_PARCSRGMRESSETMAXITER)
 extern void hypre_F90_NAME(fhypre_parcsrgmressetmaxiter, FHYPRE_PARCSRGMRESSETMAXITER)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRGMRESSetPrecond  \
         hypre_F90_NAME(fhypre_parcsrgmressetprecond, FHYPRE_PARCSRGMRESSETPRECOND)
 extern void hypre_F90_NAME(fhypre_parcsrgmressetprecond, FHYPRE_PARCSRGMRESSETPRECOND)
-                      (hypre_F90_Obj *, HYPRE_Int *, hypre_F90_Obj *);
+(hypre_F90_Obj *, HYPRE_Int *, hypre_F90_Obj *);
 
 #define HYPRE_ParCSRGMRESGetPrecond  \
         hypre_F90_NAME(fhypre_parcsrgmresgetprecond, FHYPRE_PARCSRGMRESGETPRECOND)
 extern void hypre_F90_NAME(fhypre_parcsrgmresgetprecond, FHYPRE_PARCSRGMRESGETPRECOND)
-                      (hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_ParCSRGMRESSetLogging  \
         hypre_F90_NAME(fhypre_parcsrgmressetlogging, FHYPRE_PARCSRGMRESSETLOGGING)
 extern void hypre_F90_NAME(fhypre_parcsrgmressetlogging, FHYPRE_PARCSRGMRESSETLOGGING)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRGMRESSetPrintLevel  \
         hypre_F90_NAME(fhypre_parcsrgmressetprintlevel, FHYPRE_PARCSRGMRESSETPRINTLEVEL)
 extern void hypre_F90_NAME(fhypre_parcsrgmressetprintlevel, FHYPRE_PARCSRGMRESSETPRINTLEVEL)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRGMRESGetNumIterations  \
         hypre_F90_NAME(fhypre_parcsrgmresgetnumiterati, FHYPRE_PARCSRGMRESGETNUMITERATI)
 extern void hypre_F90_NAME(fhypre_parcsrgmresgetnumiterati, FHYPRE_PARCSRGMRESGETNUMITERATI)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRGMRESGetFinalRelativeResidualNorm  \
         hypre_F90_NAME(fhypre_parcsrgmresgetfinalrelat, FHYPRE_PARCSRGMRESGETFINALRELAT)
 extern void hypre_F90_NAME(fhypre_parcsrgmresgetfinalrelat, FHYPRE_PARCSRGMRESGETFINALRELAT)
-                      (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 
 
 #define HYPRE_ParCSRCOGMRESCreate  \
         hypre_F90_NAME(fhypre_parcsrcogmrescreate, FHYPRE_PARCSRCOGMRESCREATE)
 extern void hypre_F90_NAME(fhypre_parcsrcogmrescreate, FHYPRE_PARCSRCOGMRESCREATE)
-                      (HYPRE_Int *, hypre_F90_Obj *);
+(HYPRE_Int *, hypre_F90_Obj *);
 
 #define HYPRE_ParCSRCOGMRESDestroy  \
         hypre_F90_NAME(fhypre_parcsrcogmresdestroy, FHYPRE_PARCSRCOGMRESDESTROY)
 extern void hypre_F90_NAME(fhypre_parcsrcogmresdestroy, FHYPRE_PARCSRCOGMRESDESTROY)
-                      (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_ParCSRCOGMRESSetup  \
         hypre_F90_NAME(fhypre_parcsrcogmressetup, FHYPRE_PARCSRCOGMRESSETUP)
 extern void hypre_F90_NAME(fhypre_parcsrcogmressetup, FHYPRE_PARCSRCOGMRESSETUP)
-                      (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_ParCSRCOGMRESSolve  \
         hypre_F90_NAME(fhypre_parcsrcogmressolve, FHYPRE_PARCSRCOGMRESSOLVE)
 extern void hypre_F90_NAME(fhypre_parcsrcogmressolve, FHYPRE_PARCSRCOGMRESSOLVE)
-                      (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_ParCSRCOGMRESSetKDim  \
         hypre_F90_NAME(fhypre_parcsrcogmressetkdim, FHYPRE_PARCSRCOGMRESSETKDIM)
 extern void hypre_F90_NAME(fhypre_parcsrcogmressetkdim, FHYPRE_PARCSRCOGMRESSETKDIM)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRCOGMRESSetUnroll  \
         hypre_F90_NAME(fhypre_parcsrcogmressetunroll, FHYPRE_PARCSRCOGMRESSETUNROLL)
 extern void hypre_F90_NAME(fhypre_parcsrcogmressetunroll, FHYPRE_PARCSRCOGMRESSETUNROLL)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRCOGMRESSetCGS  \
         hypre_F90_NAME(fhypre_parcsrcogmressetcgs, FHYPRE_PARCSRCOGMRESSETCGS)
 extern void hypre_F90_NAME(fhypre_parcsrcogmressetcgs, FHYPRE_PARCSRCOGMRESSETCGS)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRCOGMRESSetTol  \
         hypre_F90_NAME(fhypre_parcsrcogmressettol, FHYPRE_PARCSRCOGMRESSETTOL)
 extern void hypre_F90_NAME(fhypre_parcsrcogmressettol, FHYPRE_PARCSRCOGMRESSETTOL)
-                      (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_ParCSRCOGMRESSetAbsoluteTol  \
         hypre_F90_NAME(fhypre_parcsrcogmressetabsolutet, FHYPRE_PARCSRCOGMRESSETABSOLUTET)
 extern void hypre_F90_NAME(fhypre_parcsrcogmressetabsolutet, FHYPRE_PARCSRCOGMRESSETABSOLUTET)
-                      (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_ParCSRCOGMRESSetMinIter  \
         hypre_F90_NAME(fhypre_parcsrcogmressetminiter, FHYPRE_PARCSRCOGMRESSETMINITER)
 extern void hypre_F90_NAME(fhypre_parcsrcogmressetminiter, FHYPRE_PARCSRCOGMRESSETMINITER)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRCOGMRESSetMaxIter  \
         hypre_F90_NAME(fhypre_parcsrcogmressetmaxiter, FHYPRE_PARCSRCOGMRESSETMAXITER)
 extern void hypre_F90_NAME(fhypre_parcsrcogmressetmaxiter, FHYPRE_PARCSRCOGMRESSETMAXITER)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRCOGMRESSetPrecond  \
         hypre_F90_NAME(fhypre_parcsrcogmressetprecond, FHYPRE_PARCSRCOGMRESSETPRECOND)
 extern void hypre_F90_NAME(fhypre_parcsrcogmressetprecond, FHYPRE_PARCSRCOGMRESSETPRECOND)
-                      (hypre_F90_Obj *, HYPRE_Int *, hypre_F90_Obj *);
+(hypre_F90_Obj *, HYPRE_Int *, hypre_F90_Obj *);
 
 #define HYPRE_ParCSRCOGMRESGetPrecond  \
         hypre_F90_NAME(fhypre_parcsrcogmresgetprecond, FHYPRE_PARCSRCOGMRESGETPRECOND)
 extern void hypre_F90_NAME(fhypre_parcsrcogmresgetprecond, FHYPRE_PARCSRCOGMRESGETPRECOND)
-                      (hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_ParCSRCOGMRESSetLogging  \
         hypre_F90_NAME(fhypre_parcsrcogmressetlogging, FHYPRE_PARCSRCOGMRESSETLOGGING)
 extern void hypre_F90_NAME(fhypre_parcsrcogmressetlogging, FHYPRE_PARCSRCOGMRESSETLOGGING)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRCOGMRESSetPrintLevel  \
         hypre_F90_NAME(fhypre_parcsrcogmressetprintlevel, FHYPRE_PARCSRCOGMRESSETPRINTLEVEL)
 extern void hypre_F90_NAME(fhypre_parcsrcogmressetprintlevel, FHYPRE_PARCSRCOGMRESSETPRINTLEVEL)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRCOGMRESGetNumIterations  \
         hypre_F90_NAME(fhypre_parcsrcogmresgetnumiterat, FHYPRE_PARCSRCOGMRESGETNUMITERAT)
 extern void hypre_F90_NAME(fhypre_parcsrcogmresgetnumiterat, FHYPRE_PARCSRCOGMRESGETNUMITERAT)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRCOGMRESGetFinalRelativeResidualNorm  \
         hypre_F90_NAME(fhypre_parcsrcogmresgetfinalrela, FHYPRE_PARCSRCOGMRESGETFINALRELA)
 extern void hypre_F90_NAME(fhypre_parcsrcogmresgetfinalrela, FHYPRE_PARCSRCOGMRESGETFINALRELA)
-                      (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 
 
 #define HYPRE_ParCSRHybridCreate \
         hypre_F90_NAME(fhypre_parcsrhybridcreate, FHYPRE_PARCSRHYBRIDCREATE)
 extern void hypre_F90_NAME(fhypre_parcsrhybridcreate, FHYPRE_PARCSRHYBRIDCREATE)
-                      (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_ParCSRHybridDestroy \
         hypre_F90_NAME(fhypre_parcsrhybriddestroy, FHYPRE_PARCSRHYBRIDDESTROY)
 extern void hypre_F90_NAME(fhypre_parcsrhybriddestroy, FHYPRE_PARCSRHYBRIDDESTROY)
-                      (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_ParCSRHybridSetup \
         hypre_F90_NAME(fhypre_parcsrhybridsetup, FHYPRE_PARCSRHYBRIDSETUP)
 extern void hypre_F90_NAME(fhypre_parcsrhybridsetup, FHYPRE_PARCSRHYBRIDSETUP)
-                      (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_ParCSRHybridSolve \
         hypre_F90_NAME(fhypre_parcsrhybridsolve, FHYPRE_PARCSRHYBRIDSOLVE)
 extern void hypre_F90_NAME(fhypre_parcsrhybridsolve, FHYPRE_PARCSRHYBRIDSOLVE)
-                      (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_ParCSRHybridSetTol \
         hypre_F90_NAME(fhypre_parcsrhybridsettol, FHYPRE_PARCSRHYBRIDSETTOL)
 extern void hypre_F90_NAME(fhypre_parcsrhybridsettol, FHYPRE_PARCSRHYBRIDSETTOL)
-                      (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_ParCSRHybridSetConvergenceTol \
         hypre_F90_NAME(fhypre_parcsrhybridsetconvergen, FHYPRE_PARCSRHYBRIDSETCONVERGEN)
 extern void hypre_F90_NAME(fhypre_parcsrhybridsetconvergen, FHYPRE_PARCSRHYBRIDSETCONVERGEN)
-                      (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_ParCSRHybridSetDSCGMaxIter \
         hypre_F90_NAME(fhypre_parcsrhybridsetdscgmaxit, FHYPRE_PARCSRHYBRIDSETDSCGMAXIT)
 extern void hypre_F90_NAME(fhypre_parcsrhybridsetdscgmaxit, FHYPRE_PARCSRHYBRIDSETDSCGMAXIT)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRHybridSetPCGMaxIter \
         hypre_F90_NAME(fhypre_parcsrhybridsetpcgmaxite, FHYPRE_PARCSRHYBRIDSETPCGMAXITE)
 extern void hypre_F90_NAME(fhypre_parcsrhybridsetpcgmaxite, FHYPRE_PARCSRHYBRIDSETPCGMAXITE)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRHybridSetSolverType \
         hypre_F90_NAME(fhypre_parcsrhybridsetsolvertyp, FHYPRE_PARCSRHYBRIDSETSOLVERTYP)
 extern void hypre_F90_NAME(fhypre_parcsrhybridsetsolvertyp, FHYPRE_PARCSRHYBRIDSETSOLVERTYP)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRHybridSetKDim \
         hypre_F90_NAME(fhypre_parcsrhybridsetkdim, FHYPRE_PARCSRHYBRIDSETKDIM)
 extern void hypre_F90_NAME(fhypre_parcsrhybridsetkdim, FHYPRE_PARCSRHYBRIDSETKDIM)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRHybridSetTwoNorm \
         hypre_F90_NAME(fhypre_parcsrhybridsettwonorm, FHYPRE_PARCSRHYBRIDSETTWONORM)
 extern void hypre_F90_NAME(fhypre_parcsrhybridsettwonorm, FHYPRE_PARCSRHYBRIDSETTWONORM)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRHybridSetStopCrit \
         hypre_F90_NAME(fhypre_parcsrhybridsetstopcrit, FHYPRE_PARCSRSETSTOPCRIT)
 extern void hypre_F90_NAME(fhypre_parcsrhybridsetstopcrit, FHYPRE_PARCSRSETSTOPCRIT)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRHybridSetRelChange \
         hypre_F90_NAME(fhypre_parcsrhybridsetrelchange, FHYPRE_PARCSRHYBRIDSETRELCHANGE)
 extern void hypre_F90_NAME(fhypre_parcsrhybridsetrelchange, FHYPRE_PARCSRHYBRIDSETRELCHANGE)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRHybridSetPrecond \
         hypre_F90_NAME(fhypre_parcsrhybridsetprecond, FHYPRE_PARCSRHYBRIDSETPRECOND)
 extern void hypre_F90_NAME(fhypre_parcsrhybridsetprecond, FHYPRE_PARCSRHYBRIDSETPRECOND)
-                      (hypre_F90_Obj *, HYPRE_Int *, hypre_F90_Obj *);
+(hypre_F90_Obj *, HYPRE_Int *, hypre_F90_Obj *);
 
 #define HYPRE_ParCSRHybridSetLogging \
         hypre_F90_NAME(fhypre_parcsrhybridsetlogging, FHYPRE_PARCSRHYBRIDSETLOGGING)
 extern void hypre_F90_NAME(fhypre_parcsrhybridsetlogging, FHYPRE_PARCSRHYBRIDSETLOGGING)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRHybridSetPrintLevel \
         hypre_F90_NAME(fhypre_parcsrhybridsetprintleve, FHYPRE_PARCSRHYBRIDSETPRINTLEVE)
 extern void hypre_F90_NAME(fhypre_parcsrhybridsetprintleve, FHYPRE_PARCSRHYBRIDSETPRINTLEVE)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRHybridSetStrongThreshold \
         hypre_F90_NAME(fhypre_parcsrhybridsetstrongthr, FHYPRE_PARCSRHYBRIDSETSTRONGTHR)
 extern void hypre_F90_NAME(fhypre_parcsrhybridsetstrongthr, FHYPRE_PARCSRHYBRIDSETSTRONGTHR)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRHybridSetMaxRowSum \
         hypre_F90_NAME(fhypre_parcsrhybridsetmaxrowsum, FHYPRE_PARCSRHYBRIDSETMAXROWSUM)
 extern void hypre_F90_NAME(fhypre_parcsrhybridsetmaxrowsum, FHYPRE_PARCSRHYBRIDSETMAXROWSUM)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRHybridSetTruncFactor \
         hypre_F90_NAME(fhypre_parcsrhybridsettruncfact, FHYPRE_PARCSRHYBRIDSETTRUNCFACT)
 extern void hypre_F90_NAME(fhypre_parcsrhybridsettruncfact, FHYPRE_PARCSRHYBRIDSETTRUNCFACT)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRHybridSetMaxLevels \
         hypre_F90_NAME(fhypre_parcsrhybridsetmaxlevels, FHYPRE_PARCSRHYBRIDSETMAXLEVELS)
 extern void hypre_F90_NAME(fhypre_parcsrhybridsetmaxlevels, FHYPRE_PARCSRHYBRIDSETMAXLEVELS)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRHybridSetMeasureType \
         hypre_F90_NAME(fhypre_parcsrhybridsetmeasurety, FHYPRE_PARCSRHYBRIDSETMEASURETY)
 extern void hypre_F90_NAME(fhypre_parcsrhybridsetmeasurety, FHYPRE_PARCSRHYBRIDSETMEASURETY)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRHybridSetCoarsenType \
         hypre_F90_NAME(fhypre_parcsrhybridsetcoarsenty, FHYPRE_PARCSRHYBRIDSETCOARSENTY)
 extern void hypre_F90_NAME(fhypre_parcsrhybridsetcoarsenty, FHYPRE_PARCSRHYBRIDSETCOARSENTY)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRHybridSetCycleType \
         hypre_F90_NAME(fhypre_parcsrhybridsetcycletype, FHYPRE_PARCSRHYBRIDSETCYCLETYPE)
 extern void hypre_F90_NAME(fhypre_parcsrhybridsetcycletype, FHYPRE_PARCSRHYBRIDSETCYCLETYPE)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRHybridSetNumGridSweeps \
         hypre_F90_NAME(fhypre_parcsrhybridsetnumgridsw, FHYPRE_PARCSRHYBRIDSETNUMGRIDSW)
 extern void hypre_F90_NAME(fhypre_parcsrhybridsetnumgridsw, FHYPRE_PARCSRHYBRIDSETNUMGRIDSW)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRHybridSetGridRelaxType \
         hypre_F90_NAME(fhypre_parcsrhybridsetgridrlxty, FHYPRE_PARCSRHYBRIDSETGRIDRLXTY)
 extern void hypre_F90_NAME(fhypre_parcsrhybridsetgridrlxty, FHYPRE_PARCSRHYBRIDSETGRIDRLXTY)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRHybridSetGridRelaxPoints \
         hypre_F90_NAME(fhypre_parcsrhybridsetgridrlxpt, FHYPRE_PARCSRHYBRIDSETGRIDRLXPT)
 extern void hypre_F90_NAME(fhypre_parcsrhybridsetgridrlxpt, FHYPRE_PARCSRHYBRIDSETGRIDRLXPT)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRHybridSetNumSweeps \
         hypre_F90_NAME(fhypre_parcsrhybridsetnumsweeps, FHYPRE_PARCSRHYBRIDSETNUMSWEEPS)
 extern void hypre_F90_NAME(fhypre_parcsrhybridsetnumsweeps, FHYPRE_PARCSRHYBRIDSETNUMSWEEPS)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRHybridSetCycleNumSweeps \
         hypre_F90_NAME(fhypre_parcsrhybridsetcyclenums, FHYPRE_PARCSRHYBRIDSETCYCLENUMS)
 extern void hypre_F90_NAME(fhypre_parcsrhybridsetcyclenums, FHYPRE_PARCSRHYBRIDSETCYCLENUMS)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRHybridSetRelaxType \
         hypre_F90_NAME(fhypre_parcsrhybridsetrelaxtype, FHYPRE_PARCSRHYBRIDSETRELAXTYPE)
 extern void hypre_F90_NAME(fhypre_parcsrhybridsetrelaxtype, FHYPRE_PARCSRHYBRIDSETRELAXTYPE)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRHybridSetCycleRelaxType \
         hypre_F90_NAME(fhypre_parcsrhybridsetcyclerela, FHYPRE_PARCSRHYBRIDSETCYCLERELA)
 extern void hypre_F90_NAME(fhypre_parcsrhybridsetcyclerela, FHYPRE_PARCSRHYBRIDSETCYCLERELA)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRHybridSetRelaxOrder \
         hypre_F90_NAME(fhypre_parcsrhybridsetrelaxorde, FHYPRE_PARCSRHYBRIDSETRELAXORDE)
 extern void hypre_F90_NAME(fhypre_parcsrhybridsetrelaxorde, FHYPRE_PARCSRHYBRIDSETRELAXORDE)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRHybridSetRelaxWt \
         hypre_F90_NAME(fhypre_parcsrhybridsetrelaxwt, FHYPRE_PARCSRHYBRIDSETRELAXWT)
 extern void hypre_F90_NAME(fhypre_parcsrhybridsetrelaxwt, FHYPRE_PARCSRHYBRIDSETRELAXWT)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRHybridSetLevelRelaxWt \
         hypre_F90_NAME(fhypre_parcsrhybridsetlevelrela, FHYPRE_PARCSRHYBRIDSETLEVELRELA)
 extern void hypre_F90_NAME(fhypre_parcsrhybridsetlevelrela, FHYPRE_PARCSRHYBRIDSETLEVELRELA)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRHybridSetOuterWt \
         hypre_F90_NAME(fhypre_parcsrhybridsetouterwt, FHYPRE_PARCSRHYBRIDSETOUTERWT)
 extern void hypre_F90_NAME(fhypre_parcsrhybridsetouterwt, FHYPRE_PARCSRHYBRIDSETOUTERWT)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRHybridSetLevelOuterWt \
         hypre_F90_NAME(fhypre_parcsrhybridsetleveloute, FHYPRE_PARCSRHYBRIDSETLEVELOUTE)
 extern void hypre_F90_NAME(fhypre_parcsrhybridsetleveloute, FHYPRE_PARCSRHYBRIDSETLEVELOUTE)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRHybridSetRelaxWeight \
         hypre_F90_NAME(fhypre_parcsrhybridsetrelaxweig, FHYPRE_PARCSRHYBRIDSETRELAXWEIG)
 extern void hypre_F90_NAME(fhypre_parcsrhybridsetrelaxweig, FHYPRE_PARCSRHYBRIDSETRELAXWEIG)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRHybridSetOmega \
         hypre_F90_NAME(fhypre_parcsrhybridsetomega, FHYPRE_PARCSRHYBRIDSETOMEGA)
 extern void hypre_F90_NAME(fhypre_parcsrhybridsetomega, FHYPRE_PARCSRHYBRIDSETOMEGA)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRHybridGetNumIterations \
         hypre_F90_NAME(fhypre_parcsrhybridgetnumiterat, FHYPRE_PARCSRHYBRIDGETNUMITERAT)
 extern void hypre_F90_NAME(fhypre_parcsrhybridgetnumiterat, FHYPRE_PARCSRHYBRIDGETNUMITERAT)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRHybridGetDSCGNumIterations \
         hypre_F90_NAME(fhypre_parcsrhybridgetdscgnumit, FHYPRE_PARCSRHYBRIDGETDSCGNUMIT)
 extern void hypre_F90_NAME(fhypre_parcsrhybridgetdscgnumit, FHYPRE_PARCSRHYBRIDGETDSCGNUMIT)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRHybridGetPCGNumIterations \
         hypre_F90_NAME(fhypre_parcsrhybridgetpcgnumite, FHYPRE_PARCSRHYBRIDGETPCGNUMITE)
 extern void hypre_F90_NAME(fhypre_parcsrhybridgetpcgnumite, FHYPRE_PARCSRHYBRIDGETPCGNUMITE)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRHybridGetFinalRelativeResidualNorm \
         hypre_F90_NAME(fhypre_parcsrhybridgetfinalrela, FHYPRE_PARCSRHYBRIDGETFINALRELA)
 extern void hypre_F90_NAME(fhypre_parcsrhybridgetfinalrela, FHYPRE_PARCSRHYBRIDGETFINALRELA)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParSetRandomValues \
         hypre_F90_NAME(fhypre_parsetrandomvalues, FHYPRE_PARSETRANDOMVALUES)
 extern void hypre_F90_NAME(fhypre_parsetrandomvalues, FHYPRE_PARSETRANDOMVALUES)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParPrintVector \
         hypre_F90_NAME(fhypre_parprintvector, FHYPRE_PARPRINTVECTOR)
 extern void hypre_F90_NAME(fhypre_parprintvector, FHYPRE_PARPRINTVECTOR)
-                      (hypre_F90_Obj *, char *);
+(hypre_F90_Obj *, char *);
 
 #define HYPRE_ParReadVector \
         hypre_F90_NAME(fhypre_parreadvector, FHYPRE_PARREADVECTOR)
 extern void hypre_F90_NAME(fhypre_parreadvector, FHYPRE_PARREADVECTOR)
-                      (HYPRE_Int *, char *);
+(HYPRE_Int *, char *);
 
 #define HYPRE_ParVectorSize \
         hypre_F90_NAME(fhypre_parvectorsize, FHYPRE_PARVECTORSIZE)
 extern void hypre_F90_NAME(fhypre_parvectorsize, FHYPRE_PARVECTORSIZE)
-                      (HYPRE_Int *);
+(HYPRE_Int *);
 
 #define HYPRE_ParCSRMultiVectorPrint \
         hypre_F90_NAME(fhypre_parcsrmultivectorprint, FHYPRE_PARCSRMULTIVECTORPRINT)
 extern void hypre_F90_NAME(fhypre_parcsrmultivectorprint, FHYPRE_PARCSRMULTIVECTORPRINT)
-                      (HYPRE_Int *, char *);
+(HYPRE_Int *, char *);
 
 #define HYPRE_ParCSRMultiVectorRead \
         hypre_F90_NAME(fhypre_parcsrmultivectorread, FHYPRE_PARCSRMULTIVECTORREAD)
 extern void hypre_F90_NAME(fhypre_parcsrmultivectorread, FHYPRE_PARCSRMULTIVECTORREAD)
-                      (HYPRE_Int *, hypre_F90_Obj *, char *);
+(HYPRE_Int *, hypre_F90_Obj *, char *);
 
 #define aux_maskCount \
         hypre_F90_NAME(fhypre_aux_maskcount, FHYPRE_AUX_MASKCOUNT)
 extern void hypre_F90_NAME(fhypre_aux_maskcount, FHYPRE_AUX_MASKCOUNT)
-                      (HYPRE_Int *, HYPRE_Int *);
+(HYPRE_Int *, HYPRE_Int *);
 
 #define aux_indexFromMask \
         hypre_F90_NAME(fhypre_auxindexfrommask, FHYPRE_AUXINDEXFROMMASK)
 extern void hypre_F90_NAME(fhypre_auxindexfrommask, FHYPRE_AUXINDEXFROMMASK)
-                      (HYPRE_Int *, HYPRE_Int *, HYPRE_Int *);
+(HYPRE_Int *, HYPRE_Int *, HYPRE_Int *);
 
 #define HYPRE_TempParCSRSetupInterpreter \
         hypre_F90_NAME(fhypre_tempparcsrsetupinterpret, FHYPRE_TEMPPARCSRSETUPINTERPRET)
 extern void hypre_F90_NAME(fhypre_tempparcsrsetupinterpret, FHYPRE_TEMPPARCSRSETUPINTERPRET)
-                      (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_ParCSRSetupInterpreter \
         hypre_F90_NAME(fhypre_parcsrsetupinterpreter, FHYPRE_PARCSRSETUPINTERPRETER)
 extern void hypre_F90_NAME(fhypre_parcsrsetupinterpreter, FHYPRE_PARCSRSETUPINTERPRETER)
-                      (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_ParCSRSetupMatvec \
         hypre_F90_NAME(fhypre_parcsrsetupmatvec, FHYPRE_PARCSRSETUPMATVEC)
 extern void hypre_F90_NAME(fhypre_parcsrsetupmatvec, FHYPRE_PARCSRSETUPMATVEC)
-                      (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 
 
 #define HYPRE_ParaSailsCreate  \
         hypre_F90_NAME(fhypre_parasailscreate, FHYPRE_PARASAILSCREATE)
 extern void hypre_F90_NAME(fhypre_parasailscreate, FHYPRE_PARASAILSCREATE)
-                      (HYPRE_Int *, hypre_F90_Obj *);
+(HYPRE_Int *, hypre_F90_Obj *);
 
 #define HYPRE_ParaSailsDestroy  \
         hypre_F90_NAME(fhypre_parasailsdestroy, FHYPRE_PARASAILSDESTROY)
 extern void hypre_F90_NAME(fhypre_parasailsdestroy, FHYPRE_PARASAILSDESTROY)
-                      (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_ParaSailsSetup  \
         hypre_F90_NAME(fhypre_parasailssetup, FHYPRE_PARASAILSSETUP)
 extern void hypre_F90_NAME(fhypre_parasailssetup, FHYPRE_PARASAILSSETUP)
-                      (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_ParaSailsSolve  \
         hypre_F90_NAME(fhypre_parasailssolve, FHYPRE_PARASAILSSOLVE)
 extern void hypre_F90_NAME(fhypre_parasailssolve, FHYPRE_PARASAILSSOLVE)
-                      (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_ParaSailsSetParams  \
         hypre_F90_NAME(fhypre_parasailssetparams, FHYPRE_PARASAILSSETPARAMS)
 extern void hypre_F90_NAME(fhypre_parasailssetparams, FHYPRE_PARASAILSSETPARAMS)
-                      (hypre_F90_Obj *, HYPRE_Real *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Real *, HYPRE_Int *);
 
 #define HYPRE_ParaSailsSetThresh  \
         hypre_F90_NAME(fhypre_parasailssetthresh, FHYPRE_PARASAILSSETTHRESH)
 extern void hypre_F90_NAME(fhypre_parasailssetthresh, FHYPRE_PARASAILSSETTHRESH)
-                      (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_ParaSailsGetThresh  \
         hypre_F90_NAME(fhypre_parasailsgetthresh, FHYPRE_PARASAILSGETTHRESH)
 extern void hypre_F90_NAME(fhypre_parasailsgetthresh, FHYPRE_PARASAILSGETTHRESH)
-                      (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_ParaSailsSetNlevels  \
         hypre_F90_NAME(fhypre_parasailssetnlevels, FHYPRE_PARASAILSSETNLEVELS)
 extern void hypre_F90_NAME(fhypre_parasailssetnlevels, FHYPRE_PARASAILSSETNLEVELS)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParaSailsGetNlevels  \
         hypre_F90_NAME(fhypre_parasailsgetnlevels, FHYPRE_PARASAILSGETNLEVELS)
 extern void hypre_F90_NAME(fhypre_parasailsgetnlevels, FHYPRE_PARASAILSGETNLEVELS)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParaSailsSetFilter  \
         hypre_F90_NAME(fhypre_parasailssetfilter, FHYPRE_PARASAILSSETFILTER)
 extern void hypre_F90_NAME(fhypre_parasailssetfilter, FHYPRE_PARASAILSSETFILTER)
-                      (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_ParaSailsGetFilter  \
         hypre_F90_NAME(fhypre_parasailsgetfilter, FHYPRE_PARASAILSGETFILTER)
 extern void hypre_F90_NAME(fhypre_parasailsgetfilter, FHYPRE_PARASAILSGETFILTER)
-                      (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_ParaSailsSetSym  \
         hypre_F90_NAME(fhypre_parasailssetsym, FHYPRE_PARASAILSSETSYM)
 extern void hypre_F90_NAME(fhypre_parasailssetsym, FHYPRE_PARASAILSSETSYM)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParaSailsGetSym  \
         hypre_F90_NAME(fhypre_parasailsgetsym, FHYPRE_PARASAILSGETSYM)
 extern void hypre_F90_NAME(fhypre_parasailsgetsym, FHYPRE_PARASAILSGETSYM)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParaSailsSetLoadbal  \
         hypre_F90_NAME(fhypre_parasailssetloadbal, FHYPRE_PARASAILSSETLOADBAL)
 extern void hypre_F90_NAME(fhypre_parasailssetloadbal, FHYPRE_PARASAILSSETLOADBAL)
-                      (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_ParaSailsGetLoadbal  \
         hypre_F90_NAME(fhypre_parasailsgetloadbal, FHYPRE_PARASAILSGETLOADBAL)
 extern void hypre_F90_NAME(fhypre_parasailsgetloadbal, FHYPRE_PARASAILSGETLOADBAL)
-                      (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_ParaSailsSetReuse  \
         hypre_F90_NAME(fhypre_parasailssetreuse, FHYPRE_PARASAILSSETREUSE)
 extern void hypre_F90_NAME(fhypre_parasailssetreuse, FHYPRE_PARASAILSSETREUSE)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParaSailsGetReuse  \
         hypre_F90_NAME(fhypre_parasailsgetreuse, FHYPRE_PARASAILSGETREUSE)
 extern void hypre_F90_NAME(fhypre_parasailsgetreuse, FHYPRE_PARASAILSGETREUSE)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParaSailsSetLogging  \
         hypre_F90_NAME(fhypre_parasailssetlogging, FHYPRE_PARASAILSSETLOGGING)
 extern void hypre_F90_NAME(fhypre_parasailssetlogging, FHYPRE_PARASAILSSETLOGGING)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParaSailsGetLogging  \
         hypre_F90_NAME(fhypre_parasailsgetlogging, FHYPRE_PARASAILSGETLOGGING)
 extern void hypre_F90_NAME(fhypre_parasailsgetlogging, FHYPRE_PARASAILSGETLOGGING)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 
 
 #define HYPRE_ParCSRPCGCreate  \
         hypre_F90_NAME(fhypre_parcsrpcgcreate, FHYPRE_PARCSRPCGCREATE)
 extern void hypre_F90_NAME(fhypre_parcsrpcgcreate, FHYPRE_PARCSRPCGCREATE)
-                      (HYPRE_Int *, hypre_F90_Obj *);
+(HYPRE_Int *, hypre_F90_Obj *);
 
 #define HYPRE_ParCSRPCGDestroy  \
         hypre_F90_NAME(fhypre_parcsrpcgdestroy, FHYPRE_PARCSRPCGDESTROY)
 extern void hypre_F90_NAME(fhypre_parcsrpcgdestroy, FHYPRE_PARCSRPCGDESTROY)
-                      (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_ParCSRPCGSetup  \
         hypre_F90_NAME(fhypre_parcsrpcgsetup, FHYPRE_PARCSRPCGSETUP)
 extern void hypre_F90_NAME(fhypre_parcsrpcgsetup, FHYPRE_PARCSRPCGSETUP)
-                      (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_ParCSRPCGSolve  \
         hypre_F90_NAME(fhypre_parcsrpcgsolve, FHYPRE_PARCSRPCGSOLVE)
 extern void hypre_F90_NAME(fhypre_parcsrpcgsolve, FHYPRE_PARCSRPCGSOLVE)
-                      (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_ParCSRPCGSetTol  \
         hypre_F90_NAME(fhypre_parcsrpcgsettol, FHYPRE_PARCSRPCGSETTOL)
 extern void hypre_F90_NAME(fhypre_parcsrpcgsettol, FHYPRE_PARCSRPCGSETTOL)
-                      (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_ParCSRPCGSetMaxIter  \
         hypre_F90_NAME(fhypre_parcsrpcgsetmaxiter, FHYPRE_PARCSRPCGSETMAXITER)
 extern void hypre_F90_NAME(fhypre_parcsrpcgsetmaxiter, FHYPRE_PARCSRPCGSETMAXITER)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRPCGSetStopCrit  \
         hypre_F90_NAME(fhypre_parcsrpcgsetstopcrit, FHYPRE_PARCSRPCGSETSTOPCRIT)
 extern void hypre_F90_NAME(fhypre_parcsrpcgsetstopcrit, FHYPRE_PARCSRPCGSETSTOPCRIT)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRPCGSetTwoNorm  \
         hypre_F90_NAME(fhypre_parcsrpcgsettwonorm, FHYPRE_PARCSRPCGSETTWONORM)
 extern void hypre_F90_NAME(fhypre_parcsrpcgsettwonorm, FHYPRE_PARCSRPCGSETTWONORM)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRPCGSetRelChange  \
         hypre_F90_NAME(fhypre_parcsrpcgsetrelchange, FHYPRE_PARCSRPCGSETRELCHANGE)
 extern void hypre_F90_NAME(fhypre_parcsrpcgsetrelchange, FHYPRE_PARCSRPCGSETRELCHANGE)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRPCGSetPrecond  \
         hypre_F90_NAME(fhypre_parcsrpcgsetprecond, FHYPRE_PARCSRPCGSETPRECOND)
 extern void hypre_F90_NAME(fhypre_parcsrpcgsetprecond, FHYPRE_PARCSRPCGSETPRECOND)
-                      (hypre_F90_Obj *, HYPRE_Int *, hypre_F90_Obj *);
+(hypre_F90_Obj *, HYPRE_Int *, hypre_F90_Obj *);
 
 #define HYPRE_ParCSRPCGGetPrecond  \
         hypre_F90_NAME(fhypre_parcsrpcggetprecond, FHYPRE_PARCSRPCGGETPRECOND)
 extern void hypre_F90_NAME(fhypre_parcsrpcggetprecond, FHYPRE_PARCSRPCGGETPRECOND)
-                      (hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_ParCSRPCGSetPrintLevel  \
         hypre_F90_NAME(fhypre_parcsrpcgsetprintlevel, FHYPRE_PARCSRPCGSETPRINTLEVEL)
 extern void hypre_F90_NAME(fhypre_parcsrpcgsetprintlevel, FHYPRE_PARCSRPCGSETPRINTLEVEL)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRPCGGetNumIterations  \
         hypre_F90_NAME(fhypre_parcsrpcggetnumiteration, FHYPRE_PARCSRPCGGETNUMITERATION)
 extern void hypre_F90_NAME(fhypre_parcsrpcggetnumiteration, FHYPRE_PARCSRPCGGETNUMITERATION)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRPCGGetFinalRelativeResidualNorm  \
         hypre_F90_NAME(fhypre_parcsrpcggetfinalrelativ, FHYPRE_PARCSRPCGGETFINALRELATIV)
 extern void hypre_F90_NAME(fhypre_parcsrpcggetfinalrelativ, FHYPRE_PARCSRPCGGETFINALRELATIV)
-                      (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 
 
 #define HYPRE_ParCSRDiagScaleSetup  \
         hypre_F90_NAME(fhypre_parcsrdiagscalesetup, FHYPRE_PARCSRDIAGSCALESETUP)
 extern void hypre_F90_NAME(fhypre_parcsrdiagscalesetup, FHYPRE_PARCSRDIAGSCALESETUP)
-                      (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_ParCSRDiagScale  \
         hypre_F90_NAME(fhypre_parcsrdiagscale, FHYPRE_PARCSRDIAGSCALE)
 extern void hypre_F90_NAME(fhypre_parcsrdiagscale, FHYPRE_PARCSRDIAGSCALE)
-                      (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 
 
 #define HYPRE_ParCSRPilutCreate  \
         hypre_F90_NAME(fhypre_parcsrpilutcreate, FHYPRE_PARCSRPILUTCREATE)
 extern void hypre_F90_NAME(fhypre_parcsrpilutcreate, FHYPRE_PARCSRPILUTCREATE)
-                      (HYPRE_Int *, hypre_F90_Obj *);
+(HYPRE_Int *, hypre_F90_Obj *);
 
 #define HYPRE_ParCSRPilutDestroy  \
         hypre_F90_NAME(fhypre_parcsrpilutdestroy, FHYPRE_PARCSRPILUTDESTROY)
 extern void hypre_F90_NAME(fhypre_parcsrpilutdestroy, FHYPRE_PARCSRPILUTDESTROY)
-                      (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_ParCSRPilutSetup  \
         hypre_F90_NAME(fhypre_parcsrpilutsetup, FHYPRE_PARCSRPILUTSETUP)
 extern void hypre_F90_NAME(fhypre_parcsrpilutsetup, FHYPRE_PARCSRPILUTSETUP)
-                      (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_ParCSRPilutSolve  \
         hypre_F90_NAME(fhypre_parcsrpilutsolve, FHYPRE_PARCSRPILUTSOLVE)
 extern void hypre_F90_NAME(fhypre_parcsrpilutsolve, FHYPRE_PARCSRPILUTSOLVE)
-                      (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_ParCSRPilutSetMaxIter  \
         hypre_F90_NAME(fhypre_parcsrpilutsetmaxiter, FHYPRE_PARCSRPILUTSETMAXITER)
 extern void hypre_F90_NAME(fhypre_parcsrpilutsetmaxiter, FHYPRE_PARCSRPILUTSETMAXITER)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_ParCSRPilutSetDropToleran  \
         hypre_F90_NAME(fhypre_parcsrpilutsetdroptolera, FHYPRE_PARCSRPILUTSETDROPTOLERA)
 extern void hypre_F90_NAME(fhypre_parcsrpilutsetdroptolera, FHYPRE_PARCSRPILUTSETDROPTOLERA)
-                      (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_ParCSRPilutSetFacRowSize  \
         hypre_F90_NAME(fhypre_parcsrpilutsetfacrowsize, FHYPRE_PARCSRPILUTSETFACROWSIZE)
 extern void hypre_F90_NAME(fhypre_parcsrpilutsetfacrowsize, FHYPRE_PARCSRPILUTSETFACROWSIZE)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 
 
 #define HYPRE_SchwarzCreate \
         hypre_F90_NAME(fhypre_schwarzcreate, FHYPRE_SCHWARZCREATE)
 extern void hypre_F90_NAME(fhypre_schwarzcreate, FHYPRE_SCHWARZCREATE)
-                      (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_SchwarzDestroy \
         hypre_F90_NAME(fhypre_schwarzdestroy, FHYPRE_SCHWARZDESTROY)
 extern void hypre_F90_NAME(fhypre_schwarzdestroy, FHYPRE_SCHWARZDESTROY)
-                      (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_SchwarzSetup \
         hypre_F90_NAME(fhypre_schwarzsetup, FHYPRE_SCHWARZSETUP)
 extern void hypre_F90_NAME(fhypre_schwarzsetup, FHYPRE_SCHWARZSETUP)
-                      (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj*);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj*);
 
 #define HYPRE_SchwarzSolve \
         hypre_F90_NAME(fhypre_schwarzsolve, FHYPRE_SCHWARZSOLVE)
 extern void hypre_F90_NAME(fhypre_schwarzsolve, FHYPRE_SCHWARZSOLVE)
-                      (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj*);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj*);
 
 #define HYPRE_SchwarzSetVariant \
         hypre_F90_NAME(fhypre_schwarzsetvariant, FHYPRE_SCHWARZVARIANT)
 extern void hypre_F90_NAME(fhypre_schwarzsetvariant, FHYPRE_SCHWARZVARIANT)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_SchwarzSetOverlap \
         hypre_F90_NAME(fhypre_schwarzsetoverlap, FHYPRE_SCHWARZOVERLAP)
 extern void hypre_F90_NAME(fhypre_schwarzsetoverlap, FHYPRE_SCHWARZOVERLAP)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_SchwarzSetDomainType \
         hypre_F90_NAME(fhypre_schwarzsetdomaintype, FHYPRE_SVHWARZSETDOMAINTYPE)
 extern void hypre_F90_NAME(fhypre_schwarzsetdomaintype, FHYPRE_SVHWARZSETDOMAINTYPE)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_SchwarzSetDomainStructure \
         hypre_F90_NAME(fhypre_schwarzsetdomainstructur, FHYPRE_SCHWARZSETDOMAINSTRUCTUR)
 extern void hypre_F90_NAME(fhypre_schwarzsetdomainstructur, FHYPRE_SCHWARZSETDOMAINSTRUCTUR)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_SchwarzSetNumFunctions \
         hypre_F90_NAME(fhypre_schwarzsetnumfunctions, FHYPRE_SCHWARZSETNUMFUNCTIONS)
 extern void hypre_F90_NAME(fhypre_schwarzsetnumfunctions, FHYPRE_SCHWARZSETNUMFUNCTIONS)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_SchwarzSetRelaxWeight \
         hypre_F90_NAME(fhypre_schwarzsetrelaxweight, FHYPRE_SCHWARZSETRELAXWEIGHT)
 extern void hypre_F90_NAME(fhypre_schwarzsetrelaxweight, FHYPRE_SCHWARZSETRELAXWEIGHT)
-                      (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_SchwarzSetDofFunc \
         hypre_F90_NAME(fhypre_schwarzsetdoffunc, FHYPRE_SCHWARZSETDOFFUNC)
 extern void hypre_F90_NAME(fhypre_schwarzsetdoffunc, FHYPRE_SCHWARZSETDOFFUNC)
-                      (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #ifdef __cplusplus
 }
diff --git a/external/hypre/src/test/hypre_set_precond.c b/external/hypre/src/test/hypre_set_precond.c
index fff9b519..3591e69a 100644
--- a/external/hypre/src/test/hypre_set_precond.c
+++ b/external/hypre/src/test/hypre_set_precond.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -12,628 +12,679 @@
 #include "hypre_test.h"
 
 
-HYPRE_Int hypre_set_precond(HYPRE_Int matrix_id, HYPRE_Int solver_id, HYPRE_Int precond_id, void *solver,
-                      void *precond)
+HYPRE_Int hypre_set_precond(HYPRE_Int matrix_id, HYPRE_Int solver_id, HYPRE_Int precond_id,
+                            void *solver,
+                            void *precond)
 {
-  hypre_set_precond_params(precond_id, precond);
+   hypre_set_precond_params(precond_id, precond);
 
 
-/************************************************************************
- * PARCSR MATRIX
- ***********************************************************************/
+   /************************************************************************
+    * PARCSR MATRIX
+    ***********************************************************************/
    if (matrix_id == HYPRE_PARCSR)
-      {
-
-/************************************************************************
- *     PCG Solver
- ***********************************************************************/
-       if (solver_id == HYPRE_PCG)
-          {
-           if (precond_id == HYPRE_BOOMERAMG)
-              {
-               HYPRE_PCGSetPrecond( (HYPRE_Solver) solver,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSolve,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSetup,
-                                    (HYPRE_Solver) precond);
-              }
-           else if (precond_id == HYPRE_DIAGSCALE)
-              {
-               HYPRE_PCGSetPrecond( (HYPRE_Solver) solver,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_ParCSRDiagScale,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_ParCSRDiagScaleSetup,
-                                    (HYPRE_Solver) precond);
-              }
-           else if (precond_id == HYPRE_EUCLID)
-              {
-               HYPRE_PCGSetPrecond( (HYPRE_Solver) solver,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_EuclidSolve,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_EuclidSetup,
-                                    (HYPRE_Solver) precond);
-              }
-           else if (precond_id == HYPRE_PARASAILS)
-              {
-               HYPRE_PCGSetPrecond( (HYPRE_Solver) solver,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_ParCSRParaSailsSolve,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_ParCSRParaSailsSetup,
-                                    (HYPRE_Solver) precond);
-              }
-           else if (precond_id == HYPRE_SCHWARZ)
-              {
-               HYPRE_PCGSetPrecond( (HYPRE_Solver) solver,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_SchwarzSolve,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_SchwarzSetup,
-                                    (HYPRE_Solver) precond);
-              }
-          }
-
-/************************************************************************
- *     GMRES Solver
- ***********************************************************************/
-       if (solver_id == HYPRE_GMRES)
-          {
-           if (precond_id == HYPRE_BOOMERAMG)
-              {
-               HYPRE_GMRESSetPrecond( (HYPRE_Solver) solver,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSolve,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSetup,
-                                    (HYPRE_Solver) precond);
-              }
-           else if (precond_id == HYPRE_DIAGSCALE)
-              {
-               HYPRE_GMRESSetPrecond( (HYPRE_Solver) solver,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_ParCSRDiagScale,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_ParCSRDiagScaleSetup,
-                                    (HYPRE_Solver) precond);
-              }
-           else if (precond_id == HYPRE_EUCLID)
-              {
-               HYPRE_GMRESSetPrecond( (HYPRE_Solver) solver,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_EuclidSolve,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_EuclidSetup,
-                                    (HYPRE_Solver) precond);
-              }
-           else if (precond_id == HYPRE_PARASAILS)
-              {
-               HYPRE_GMRESSetPrecond( (HYPRE_Solver) solver,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_ParCSRParaSailsSolve,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_ParCSRParaSailsSetup,
-                                    (HYPRE_Solver) precond);
-              }
-           else if (precond_id == HYPRE_PILUT)
-              {
-               HYPRE_GMRESSetPrecond( (HYPRE_Solver) solver,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_ParCSRPilutSolve,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_ParCSRPilutSetup,
-                                    (HYPRE_Solver) precond);
-              }
-           else if (precond_id == HYPRE_SCHWARZ)
-              {
-               HYPRE_GMRESSetPrecond( (HYPRE_Solver) solver,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_SchwarzSolve,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_SchwarzSetup,
-                                    (HYPRE_Solver) precond);
-              }
-          }
-
-/************************************************************************
- *     BiCGSTAB Solver
- ***********************************************************************/
-       if (solver_id == HYPRE_BICGSTAB)
-          {
-           if (precond_id == HYPRE_BOOMERAMG)
-              {
-               HYPRE_BiCGSTABSetPrecond( (HYPRE_Solver) solver,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSolve,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSetup,
-                                    (HYPRE_Solver) precond);
-              }
-           else if (precond_id == HYPRE_DIAGSCALE)
-              {
-               HYPRE_BiCGSTABSetPrecond( (HYPRE_Solver) solver,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_ParCSRDiagScale,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_ParCSRDiagScaleSetup,
-                                    (HYPRE_Solver) precond);
-              }
-           else if (precond_id == HYPRE_EUCLID)
-              {
-               HYPRE_BiCGSTABSetPrecond( (HYPRE_Solver) solver,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_EuclidSolve,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_EuclidSetup,
-                                    (HYPRE_Solver) precond);
-              }
-           else if (precond_id == HYPRE_PILUT)
-              {
-               HYPRE_BiCGSTABSetPrecond( (HYPRE_Solver) solver,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_ParCSRPilutSolve,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_ParCSRPilutSetup,
-                                    (HYPRE_Solver) precond);
-              }
-          }
-
-/************************************************************************
- *     CGNR Solver
- ***********************************************************************/
-       if (solver_id == HYPRE_CGNR)
-          {
-           if (precond_id == HYPRE_BOOMERAMG)
-              {
-               HYPRE_CGNRSetPrecond( (HYPRE_Solver) solver,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSolve,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSolveT,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSetup,
-                                    (HYPRE_Solver) precond);
-              }
-           else if (precond_id == HYPRE_DIAGSCALE)
-              {
-               HYPRE_CGNRSetPrecond( (HYPRE_Solver) solver,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_ParCSRDiagScale,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_ParCSRDiagScale,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_ParCSRDiagScaleSetup,
-                                    (HYPRE_Solver) precond);
-              }
-          }
+   {
 
+      /************************************************************************
+       *     PCG Solver
+       ***********************************************************************/
+      if (solver_id == HYPRE_PCG)
+      {
+         if (precond_id == HYPRE_BOOMERAMG)
+         {
+            HYPRE_PCGSetPrecond( (HYPRE_Solver) solver,
+                                 (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSolve,
+                                 (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSetup,
+                                 (HYPRE_Solver) precond);
+         }
+         else if (precond_id == HYPRE_DIAGSCALE)
+         {
+            HYPRE_PCGSetPrecond( (HYPRE_Solver) solver,
+                                 (HYPRE_PtrToSolverFcn) HYPRE_ParCSRDiagScale,
+                                 (HYPRE_PtrToSolverFcn) HYPRE_ParCSRDiagScaleSetup,
+                                 (HYPRE_Solver) precond);
+         }
+         else if (precond_id == HYPRE_EUCLID)
+         {
+            HYPRE_PCGSetPrecond( (HYPRE_Solver) solver,
+                                 (HYPRE_PtrToSolverFcn) HYPRE_EuclidSolve,
+                                 (HYPRE_PtrToSolverFcn) HYPRE_EuclidSetup,
+                                 (HYPRE_Solver) precond);
+         }
+         else if (precond_id == HYPRE_PARASAILS)
+         {
+            HYPRE_PCGSetPrecond( (HYPRE_Solver) solver,
+                                 (HYPRE_PtrToSolverFcn) HYPRE_ParCSRParaSailsSolve,
+                                 (HYPRE_PtrToSolverFcn) HYPRE_ParCSRParaSailsSetup,
+                                 (HYPRE_Solver) precond);
+         }
+         else if (precond_id == HYPRE_SCHWARZ)
+         {
+            HYPRE_PCGSetPrecond( (HYPRE_Solver) solver,
+                                 (HYPRE_PtrToSolverFcn) HYPRE_SchwarzSolve,
+                                 (HYPRE_PtrToSolverFcn) HYPRE_SchwarzSetup,
+                                 (HYPRE_Solver) precond);
+         }
       }
 
-
-/************************************************************************
- * SSTRUCT MATRIX
- ***********************************************************************/
-   if (matrix_id == HYPRE_SSTRUCT)
+      /************************************************************************
+       *     GMRES Solver
+       ***********************************************************************/
+      if (solver_id == HYPRE_GMRES)
       {
-
-/************************************************************************
- *     PCG Solver
- ***********************************************************************/
-       if (solver_id == HYPRE_PCG)
-          {
-           if (precond_id == HYPRE_SPLIT)
-              {
-               HYPRE_PCGSetPrecond( (HYPRE_Solver) solver,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_SStructSplitSolve,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_SStructSplitSetup,
-                                    (HYPRE_Solver) precond);
-              }
-           else if (precond_id == HYPRE_SYSPFMG)
-              {
-               HYPRE_PCGSetPrecond( (HYPRE_Solver) solver,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_SStructSysPFMGSolve,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_SStructSysPFMGSetup,
-                                    (HYPRE_Solver) precond);
-              }
-           else if (precond_id == HYPRE_DIAGSCALE)
-              {
-               HYPRE_PCGSetPrecond( (HYPRE_Solver) solver,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_SStructDiagScale,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_SStructDiagScaleSetup,
-                                    (HYPRE_Solver) precond);
-              }
-          }
-
-/************************************************************************
- * GMRES Solver
- ***********************************************************************/
-       if (solver_id == HYPRE_GMRES)
-          {
-           if (precond_id == HYPRE_DIAGSCALE)
-              {
-               HYPRE_GMRESSetPrecond( (HYPRE_Solver) solver,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_SStructDiagScale,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_SStructDiagScaleSetup,
-                                    (HYPRE_Solver) precond);
-              }
-           else if (precond_id == HYPRE_SPLIT)
-              {
-               HYPRE_GMRESSetPrecond( (HYPRE_Solver) solver,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_SStructSplitSolve,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_SStructSplitSetup,
-                                    (HYPRE_Solver) precond);
-              }
-          }
-
-/************************************************************************
- * BiCGSTAB Solver
- ***********************************************************************/
-       if (solver_id == HYPRE_BICGSTAB)
-          {
-           if (precond_id == HYPRE_DIAGSCALE)
-              {
-               HYPRE_BiCGSTABSetPrecond( (HYPRE_Solver) solver,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_SStructDiagScale,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_SStructDiagScaleSetup,
-                                    (HYPRE_Solver) precond);
-              }
-           else if (precond_id == HYPRE_SPLIT)
-              {
-               HYPRE_BiCGSTABSetPrecond( (HYPRE_Solver) solver,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_SStructSplitSolve,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_SStructSplitSetup,
-                                    (HYPRE_Solver) precond);
-              }
-          }
-
-/************************************************************************
- * CGNR Solver
- ***********************************************************************/
-       if (solver_id == HYPRE_CGNR)
-          {
-           if (precond_id == HYPRE_BOOMERAMG)
-              {
-               HYPRE_CGNRSetPrecond( (HYPRE_Solver) solver,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSolve,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSolveT,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSetup,
-                                    (HYPRE_Solver) precond);
-              }
-           else if (precond_id == HYPRE_DIAGSCALE)
-              {
-               HYPRE_CGNRSetPrecond( (HYPRE_Solver) solver,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_ParCSRDiagScale,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_ParCSRDiagScale,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_ParCSRDiagScaleSetup,
-                                    (HYPRE_Solver) precond);
-              }
-          }
-
+         if (precond_id == HYPRE_BOOMERAMG)
+         {
+            HYPRE_GMRESSetPrecond( (HYPRE_Solver) solver,
+                                   (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSolve,
+                                   (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSetup,
+                                   (HYPRE_Solver) precond);
+         }
+         else if (precond_id == HYPRE_DIAGSCALE)
+         {
+            HYPRE_GMRESSetPrecond( (HYPRE_Solver) solver,
+                                   (HYPRE_PtrToSolverFcn) HYPRE_ParCSRDiagScale,
+                                   (HYPRE_PtrToSolverFcn) HYPRE_ParCSRDiagScaleSetup,
+                                   (HYPRE_Solver) precond);
+         }
+         else if (precond_id == HYPRE_EUCLID)
+         {
+            HYPRE_GMRESSetPrecond( (HYPRE_Solver) solver,
+                                   (HYPRE_PtrToSolverFcn) HYPRE_EuclidSolve,
+                                   (HYPRE_PtrToSolverFcn) HYPRE_EuclidSetup,
+                                   (HYPRE_Solver) precond);
+         }
+         else if (precond_id == HYPRE_PARASAILS)
+         {
+            HYPRE_GMRESSetPrecond( (HYPRE_Solver) solver,
+                                   (HYPRE_PtrToSolverFcn) HYPRE_ParCSRParaSailsSolve,
+                                   (HYPRE_PtrToSolverFcn) HYPRE_ParCSRParaSailsSetup,
+                                   (HYPRE_Solver) precond);
+         }
+         else if (precond_id == HYPRE_PILUT)
+         {
+            HYPRE_GMRESSetPrecond( (HYPRE_Solver) solver,
+                                   (HYPRE_PtrToSolverFcn) HYPRE_ParCSRPilutSolve,
+                                   (HYPRE_PtrToSolverFcn) HYPRE_ParCSRPilutSetup,
+                                   (HYPRE_Solver) precond);
+         }
+         else if (precond_id == HYPRE_SCHWARZ)
+         {
+            HYPRE_GMRESSetPrecond( (HYPRE_Solver) solver,
+                                   (HYPRE_PtrToSolverFcn) HYPRE_SchwarzSolve,
+                                   (HYPRE_PtrToSolverFcn) HYPRE_SchwarzSetup,
+                                   (HYPRE_Solver) precond);
+         }
       }
 
-/************************************************************************
- * STRUCT MATRIX
- ***********************************************************************/
-   if (matrix_id == HYPRE_STRUCT)
+      /************************************************************************
+       *     BiCGSTAB Solver
+       ***********************************************************************/
+      if (solver_id == HYPRE_BICGSTAB)
       {
-
-/************************************************************************
- *     PCG Solver
- ***********************************************************************/
-       if (solver_id == HYPRE_PCG)
-          {
-           if (precond_id == HYPRE_SMG)
-              {
-               HYPRE_PCGSetPrecond( (HYPRE_Solver) solver,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_StructSMGSolve,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_StructSMGSetup,
-                                    (HYPRE_Solver) precond);
-              }
-           else if (precond_id == HYPRE_PFMG)
-              {
-               HYPRE_PCGSetPrecond( (HYPRE_Solver) solver,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_StructPFMGSolve,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_StructPFMGSetup,
-                                    (HYPRE_Solver) precond);
-              }
-           else if (precond_id == HYPRE_SPARSEMSG)
-              {
-               HYPRE_PCGSetPrecond( (HYPRE_Solver) solver,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_StructSparseMSGSolve,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_StructSparseMSGSetup,
-                                    (HYPRE_Solver) precond);
-              }
-           else if (precond_id == HYPRE_JACOBI)
-              {
-               HYPRE_PCGSetPrecond( (HYPRE_Solver) solver,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_StructJacobiSolve,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_StructJacobiSetup,
-                                    (HYPRE_Solver) precond);
-              }
-           else if (precond_id == HYPRE_DIAGSCALE)
-              {
-               HYPRE_PCGSetPrecond( (HYPRE_Solver) solver,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_StructDiagScale,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_StructDiagScaleSetup,
-                                    (HYPRE_Solver) precond);
-              }
-          }
-
-/************************************************************************
- *     HYBRID Solver
- ***********************************************************************/
-       if (solver_id == HYPRE_HYBRID)
-          {
-           if (precond_id == HYPRE_SMG)
-              {
-               HYPRE_StructHybridSetPrecond( (HYPRE_StructSolver) solver,
-                                    (HYPRE_PtrToStructSolverFcn) HYPRE_StructSMGSolve,
-                                    (HYPRE_PtrToStructSolverFcn) HYPRE_StructSMGSetup,
-                                    (HYPRE_StructSolver) precond);
-              }
-           else if (precond_id == HYPRE_PFMG)
-              {
-               HYPRE_StructHybridSetPrecond( (HYPRE_StructSolver) solver,
-                                    (HYPRE_PtrToStructSolverFcn) HYPRE_StructPFMGSolve,
-                                    (HYPRE_PtrToStructSolverFcn) HYPRE_StructPFMGSetup,
-                                    (HYPRE_StructSolver) precond);
-              }
-           else if (precond_id == HYPRE_SPARSEMSG)
-              {
-               HYPRE_StructHybridSetPrecond( (HYPRE_StructSolver) solver,
-                                    (HYPRE_PtrToStructSolverFcn) HYPRE_StructSparseMSGSolve,
-                                    (HYPRE_PtrToStructSolverFcn) HYPRE_StructSparseMSGSetup,
-                                    (HYPRE_StructSolver) precond);
-              }
-          }
-
-/************************************************************************
- *     GMRES Solver
- ***********************************************************************/
-       if (solver_id == HYPRE_GMRES)
-          {
-           if (precond_id == HYPRE_SMG)
-              {
-               HYPRE_GMRESSetPrecond( (HYPRE_Solver) solver,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_StructSMGSolve,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_StructSMGSetup,
-                                    (HYPRE_Solver) precond);
-              }
-           else if (precond_id == HYPRE_PFMG)
-              {
-               HYPRE_GMRESSetPrecond( (HYPRE_Solver) solver,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_StructPFMGSolve,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_StructPFMGSetup,
-                                    (HYPRE_Solver) precond);
-              }
-           else if (precond_id == HYPRE_SPARSEMSG)
-              {
-               HYPRE_GMRESSetPrecond( (HYPRE_Solver) solver,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_StructSparseMSGSolve,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_StructSparseMSGSetup,
-                                    (HYPRE_Solver) precond);
-              }
-           else if (precond_id == HYPRE_JACOBI)
-              {
-               HYPRE_GMRESSetPrecond( (HYPRE_Solver) solver,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_StructJacobiSolve,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_StructJacobiSetup,
-                                    (HYPRE_Solver) precond);
-              }
-           else if (precond_id == HYPRE_DIAGSCALE)
-              {
-               HYPRE_GMRESSetPrecond( (HYPRE_Solver) solver,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_StructDiagScale,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_StructDiagScaleSetup,
-                                    (HYPRE_Solver) precond);
-              }
-          }
-
-/************************************************************************
- *     BICGSTAB Solver
- ***********************************************************************/
-       if (solver_id == HYPRE_BICGSTAB)
-          {
-           if (precond_id == HYPRE_SMG)
-              {
-               HYPRE_BiCGSTABSetPrecond( (HYPRE_Solver) solver,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_StructSMGSolve,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_StructSMGSetup,
-                                    (HYPRE_Solver) precond);
-              }
-           else if (precond_id == HYPRE_PFMG)
-              {
-               HYPRE_BiCGSTABSetPrecond( (HYPRE_Solver) solver,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_StructPFMGSolve,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_StructPFMGSetup,
-                                    (HYPRE_Solver) precond);
-              }
-           else if (precond_id == HYPRE_SPARSEMSG)
-              {
-               HYPRE_BiCGSTABSetPrecond( (HYPRE_Solver) solver,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_StructSparseMSGSolve,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_StructSparseMSGSetup,
-                                    (HYPRE_Solver) precond);
-              }
-           else if (precond_id == HYPRE_JACOBI)
-              {
-               HYPRE_BiCGSTABSetPrecond( (HYPRE_Solver) solver,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_StructJacobiSolve,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_StructJacobiSetup,
-                                    (HYPRE_Solver) precond);
-              }
-           else if (precond_id == HYPRE_DIAGSCALE)
-              {
-               HYPRE_BiCGSTABSetPrecond( (HYPRE_Solver) solver,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_StructDiagScale,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_StructDiagScaleSetup,
-                                    (HYPRE_Solver) precond);
-              }
-          }
+         if (precond_id == HYPRE_BOOMERAMG)
+         {
+            HYPRE_BiCGSTABSetPrecond( (HYPRE_Solver) solver,
+                                      (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSolve,
+                                      (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSetup,
+                                      (HYPRE_Solver) precond);
+         }
+         else if (precond_id == HYPRE_DIAGSCALE)
+         {
+            HYPRE_BiCGSTABSetPrecond( (HYPRE_Solver) solver,
+                                      (HYPRE_PtrToSolverFcn) HYPRE_ParCSRDiagScale,
+                                      (HYPRE_PtrToSolverFcn) HYPRE_ParCSRDiagScaleSetup,
+                                      (HYPRE_Solver) precond);
+         }
+         else if (precond_id == HYPRE_EUCLID)
+         {
+            HYPRE_BiCGSTABSetPrecond( (HYPRE_Solver) solver,
+                                      (HYPRE_PtrToSolverFcn) HYPRE_EuclidSolve,
+                                      (HYPRE_PtrToSolverFcn) HYPRE_EuclidSetup,
+                                      (HYPRE_Solver) precond);
+         }
+         else if (precond_id == HYPRE_PILUT)
+         {
+            HYPRE_BiCGSTABSetPrecond( (HYPRE_Solver) solver,
+                                      (HYPRE_PtrToSolverFcn) HYPRE_ParCSRPilutSolve,
+                                      (HYPRE_PtrToSolverFcn) HYPRE_ParCSRPilutSetup,
+                                      (HYPRE_Solver) precond);
+         }
       }
-}
 
-
-HYPRE_Int hypre_set_precond_params(HYPRE_Int precond_id, void *precond)
-{
-    HYPRE_Int i;
-    HYPRE_Int ierr;
-
-/* use BoomerAMG preconditioner */
-    if (precond_id == HYPRE_BOOMERAMG)
-       {
-        HYPRE_BoomerAMGCreate(precond); 
-        HYPRE_BoomerAMGSetInterpType(precond, interp_type);
-        HYPRE_BoomerAMGSetNumSamples(precond, gsmg_samples);
-        HYPRE_BoomerAMGSetTol(precond, pc_tol);
-        HYPRE_BoomerAMGSetCoarsenType(precond, (hybrid*coarsen_type));
-        HYPRE_BoomerAMGSetMeasureType(precond, measure_type);
-        HYPRE_BoomerAMGSetStrongThreshold(precond, strong_threshold);
-        HYPRE_BoomerAMGSetTruncFactor(precond, trunc_factor);
-        HYPRE_BoomerAMGSetPrintLevel(precond, poutdat);
-        HYPRE_BoomerAMGSetPrintFileName(precond, "driver.out.log");
-        HYPRE_BoomerAMGSetMaxIter(precond, 1);
-        HYPRE_BoomerAMGSetCycleType(precond, cycle_type);
-        HYPRE_BoomerAMGSetNumGridSweeps(precond, num_grid_sweeps);
-        HYPRE_BoomerAMGSetGridRelaxType(precond, grid_relax_type);
-        HYPRE_BoomerAMGSetRelaxWeight(precond, relax_weight);
-        HYPRE_BoomerAMGSetOmega(precond, omega);
-        HYPRE_BoomerAMGSetSmoothType(precond, smooth_type);
-        HYPRE_BoomerAMGSetSmoothNumLevels(precond, smooth_num_levels);
-        HYPRE_BoomerAMGSetSmoothNumSweeps(precond, smooth_num_sweeps);
-        HYPRE_BoomerAMGSetGridRelaxPoints(precond, grid_relax_points);
-        HYPRE_BoomerAMGSetMaxLevels(precond, max_levels);
-        HYPRE_BoomerAMGSetMaxRowSum(precond, max_row_sum);
-        HYPRE_BoomerAMGSetNumFunctions(precond, num_functions);
-        HYPRE_BoomerAMGSetVariant(precond, variant);
-        HYPRE_BoomerAMGSetOverlap(precond, overlap);
-        HYPRE_BoomerAMGSetDomainType(precond, domain_type);
-        HYPRE_BoomerAMGSetSchwarzRlxWeight(precond, schwarz_rlx_weight);
-        if (num_functions > 1)
-           HYPRE_BoomerAMGSetDofFunc(precond, dof_func);
-       }
-/* use DiagScale preconditioner */
-      else if (precond_id == HYPRE_DIAGSCALE)
-         {
-          precond = NULL;
-         }
-/* use ParaSails preconditioner */
-      else if (precond_id == HYPRE_PARASAILS)
-         {
-  	  HYPRE_ParaSailsCreate(hypre_MPI_COMM_WORLD, precond);
-          HYPRE_ParaSailsSetParams(precond, sai_threshold, max_levels);
-          HYPRE_ParaSailsSetFilter(precond, sai_filter);
-          HYPRE_ParaSailsSetLogging(precond, poutdat);
-         }
-/* use Schwarz preconditioner */
-      else if (precond_id == HYPRE_SCHWARZ)
-         {
-	  HYPRE_SchwarzCreate(precond);
-	  HYPRE_SchwarzSetVariant(precond, variant);
-	  HYPRE_SchwarzSetOverlap(precond, overlap);
-	  HYPRE_SchwarzSetDomainType(precond, domain_type);
-          HYPRE_SchwarzSetRelaxWeight(precond, schwarz_rlx_weight);
-         }
-/* use GSMG as preconditioner */
-      else if (precond_id == HYPRE_GSMG)
-         {
-           /* fine grid */
-          num_grid_sweeps[0] = num_sweep;
-          grid_relax_type[0] = relax_default;
-          hypre_TFree(grid_relax_points[0], HYPRE_MEMORY_HOST);
-          grid_relax_points[0] = hypre_CTAlloc(HYPRE_Int,  num_sweep, HYPRE_MEMORY_HOST);
-          for (i=0; i<num_sweep; i++)
-             grid_relax_points[0][i] = 0;
-    
-          /* down cycle */
-          num_grid_sweeps[1] = num_sweep;
-          grid_relax_type[1] = relax_default;
-          hypre_TFree(grid_relax_points[1], HYPRE_MEMORY_HOST);
-          grid_relax_points[1] = hypre_CTAlloc(HYPRE_Int,  num_sweep, HYPRE_MEMORY_HOST);
-          for (i=0; i<num_sweep; i++)
-             grid_relax_points[1][i] = 0;
-    
-          /* up cycle */
-          num_grid_sweeps[2] = num_sweep;
-          grid_relax_type[2] = relax_default;
-          hypre_TFree(grid_relax_points[2], HYPRE_MEMORY_HOST);
-          grid_relax_points[2] = hypre_CTAlloc(HYPRE_Int,  num_sweep, HYPRE_MEMORY_HOST);
-          for (i=0; i<num_sweep; i++)
-             grid_relax_points[2][i] = 0;
-    
-          /* coarsest grid */
-          num_grid_sweeps[3] = 1;
-          grid_relax_type[3] = 9;
-          hypre_TFree(grid_relax_points[3], HYPRE_MEMORY_HOST);
-          grid_relax_points[3] = hypre_CTAlloc(HYPRE_Int,  1, HYPRE_MEMORY_HOST);
-          grid_relax_points[3][0] = 0;
- 
-          HYPRE_BoomerAMGCreate(precond); 
-          HYPRE_BoomerAMGSetGSMG(precond, 4); 
-          HYPRE_BoomerAMGSetInterpType(precond, interp_type);
-          HYPRE_BoomerAMGSetNumSamples(precond, gsmg_samples);
-          HYPRE_BoomerAMGSetTol(precond, pc_tol);
-          HYPRE_BoomerAMGSetCoarsenType(precond, (hybrid*coarsen_type));
-          HYPRE_BoomerAMGSetMeasureType(precond, measure_type);
-          HYPRE_BoomerAMGSetStrongThreshold(precond, strong_threshold);
-          HYPRE_BoomerAMGSetTruncFactor(precond, trunc_factor);
-          HYPRE_BoomerAMGSetPrintLevel(precond, poutdat);
-          HYPRE_BoomerAMGSetPrintFileName(precond, "driver.out.log");
-          HYPRE_BoomerAMGSetMaxIter(precond, 1);
-          HYPRE_BoomerAMGSetCycleType(precond, cycle_type);
-          HYPRE_BoomerAMGSetNumGridSweeps(precond, num_grid_sweeps);
-          HYPRE_BoomerAMGSetGridRelaxType(precond, grid_relax_type);
-          HYPRE_BoomerAMGSetRelaxWeight(precond, relax_weight);
-          HYPRE_BoomerAMGSetOmega(precond, omega);
-          HYPRE_BoomerAMGSetSmoothType(precond, smooth_type);
-          HYPRE_BoomerAMGSetSmoothNumLevels(precond, smooth_num_levels);
-          HYPRE_BoomerAMGSetSmoothNumSweeps(precond, smooth_num_sweeps);
-          HYPRE_BoomerAMGSetVariant(precond, variant);
-          HYPRE_BoomerAMGSetOverlap(precond, overlap);
-          HYPRE_BoomerAMGSetDomainType(precond, domain_type);
-          HYPRE_BoomerAMGSetSchwarzRlxWeight(precond, schwarz_rlx_weight);
-          HYPRE_BoomerAMGSetGridRelaxPoints(precond, grid_relax_points);
-          HYPRE_BoomerAMGSetMaxLevels(precond, max_levels);
-          HYPRE_BoomerAMGSetMaxRowSum(precond, max_row_sum);
-          HYPRE_BoomerAMGSetNumFunctions(precond, num_functions);
-          if (num_functions > 1)
-             HYPRE_BoomerAMGSetDofFunc(precond, dof_func);
-         }
-
-/* use PILUT as preconditioner */
-      else if (precond_id == HYPRE_PILUT)
-         {
-          ierr = HYPRE_ParCSRPilutCreate( hypre_MPI_COMM_WORLD, precond ); 
+      /************************************************************************
+       *     CGNR Solver
+       ***********************************************************************/
+      if (solver_id == HYPRE_CGNR)
+      {
+         if (precond_id == HYPRE_BOOMERAMG)
+         {
+            HYPRE_CGNRSetPrecond( (HYPRE_Solver) solver,
+                                  (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSolve,
+                                  (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSolveT,
+                                  (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSetup,
+                                  (HYPRE_Solver) precond);
          }
-}
+         else if (precond_id == HYPRE_DIAGSCALE)
+         {
+            HYPRE_CGNRSetPrecond( (HYPRE_Solver) solver,
+                                  (HYPRE_PtrToSolverFcn) HYPRE_ParCSRDiagScale,
+                                  (HYPRE_PtrToSolverFcn) HYPRE_ParCSRDiagScale,
+                                  (HYPRE_PtrToSolverFcn) HYPRE_ParCSRDiagScaleSetup,
+                                  (HYPRE_Solver) precond);
+         }
+      }
 
+   }
 
-HYPRE_Int hypre_destroy_precond(HYPRE_Int precond_id, void *precond)
-{
-    
-    if (precond_id == HYPRE_BICGSTAB)
-        HYPRE_BiCGSTABDestroy(precond);
 
-    else if (precond_id == HYPRE_BOOMERAMG)
-        HYPRE_BoomerAMGDestroy(precond);
+   /************************************************************************
+    * SSTRUCT MATRIX
+    ***********************************************************************/
+   if (matrix_id == HYPRE_SSTRUCT)
+   {
 
-    else if (precond_id == HYPRE_CGNR)
-        HYPRE_CGNRDestroy(precond);
+      /************************************************************************
+       *     PCG Solver
+       ***********************************************************************/
+      if (solver_id == HYPRE_PCG)
+      {
+         if (precond_id == HYPRE_SPLIT)
+         {
+            HYPRE_PCGSetPrecond( (HYPRE_Solver) solver,
+                                 (HYPRE_PtrToSolverFcn) HYPRE_SStructSplitSolve,
+                                 (HYPRE_PtrToSolverFcn) HYPRE_SStructSplitSetup,
+                                 (HYPRE_Solver) precond);
+         }
+         else if (precond_id == HYPRE_SYSPFMG)
+         {
+            HYPRE_PCGSetPrecond( (HYPRE_Solver) solver,
+                                 (HYPRE_PtrToSolverFcn) HYPRE_SStructSysPFMGSolve,
+                                 (HYPRE_PtrToSolverFcn) HYPRE_SStructSysPFMGSetup,
+                                 (HYPRE_Solver) precond);
+         }
+         else if (precond_id == HYPRE_DIAGSCALE)
+         {
+            HYPRE_PCGSetPrecond( (HYPRE_Solver) solver,
+                                 (HYPRE_PtrToSolverFcn) HYPRE_SStructDiagScale,
+                                 (HYPRE_PtrToSolverFcn) HYPRE_SStructDiagScaleSetup,
+                                 (HYPRE_Solver) precond);
+         }
+      }
 
-    else if (precond_id == HYPRE_DIAGSCALE)
-        HYPRE_Destroy(precond);
+      /************************************************************************
+       * GMRES Solver
+       ***********************************************************************/
+      if (solver_id == HYPRE_GMRES)
+      {
+         if (precond_id == HYPRE_DIAGSCALE)
+         {
+            HYPRE_GMRESSetPrecond( (HYPRE_Solver) solver,
+                                   (HYPRE_PtrToSolverFcn) HYPRE_SStructDiagScale,
+                                   (HYPRE_PtrToSolverFcn) HYPRE_SStructDiagScaleSetup,
+                                   (HYPRE_Solver) precond);
+         }
+         else if (precond_id == HYPRE_SPLIT)
+         {
+            HYPRE_GMRESSetPrecond( (HYPRE_Solver) solver,
+                                   (HYPRE_PtrToSolverFcn) HYPRE_SStructSplitSolve,
+                                   (HYPRE_PtrToSolverFcn) HYPRE_SStructSplitSetup,
+                                   (HYPRE_Solver) precond);
+         }
+      }
+
+      /************************************************************************
+       * BiCGSTAB Solver
+       ***********************************************************************/
+      if (solver_id == HYPRE_BICGSTAB)
+      {
+         if (precond_id == HYPRE_DIAGSCALE)
+         {
+            HYPRE_BiCGSTABSetPrecond( (HYPRE_Solver) solver,
+                                      (HYPRE_PtrToSolverFcn) HYPRE_SStructDiagScale,
+                                      (HYPRE_PtrToSolverFcn) HYPRE_SStructDiagScaleSetup,
+                                      (HYPRE_Solver) precond);
+         }
+         else if (precond_id == HYPRE_SPLIT)
+         {
+            HYPRE_BiCGSTABSetPrecond( (HYPRE_Solver) solver,
+                                      (HYPRE_PtrToSolverFcn) HYPRE_SStructSplitSolve,
+                                      (HYPRE_PtrToSolverFcn) HYPRE_SStructSplitSetup,
+                                      (HYPRE_Solver) precond);
+         }
+      }
 
-    else if (precond_id == HYPRE_EUCLID)
-        HYPRE_EuclidDestroy(precond);
+      /************************************************************************
+       * CGNR Solver
+       ***********************************************************************/
+      if (solver_id == HYPRE_CGNR)
+      {
+         if (precond_id == HYPRE_BOOMERAMG)
+         {
+            HYPRE_CGNRSetPrecond( (HYPRE_Solver) solver,
+                                  (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSolve,
+                                  (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSolveT,
+                                  (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSetup,
+                                  (HYPRE_Solver) precond);
+         }
+         else if (precond_id == HYPRE_DIAGSCALE)
+         {
+            HYPRE_CGNRSetPrecond( (HYPRE_Solver) solver,
+                                  (HYPRE_PtrToSolverFcn) HYPRE_ParCSRDiagScale,
+                                  (HYPRE_PtrToSolverFcn) HYPRE_ParCSRDiagScale,
+                                  (HYPRE_PtrToSolverFcn) HYPRE_ParCSRDiagScaleSetup,
+                                  (HYPRE_Solver) precond);
+         }
+      }
 
-    else if (precond_id == HYPRE_GMRES)
-        HYPRE_GMRESDestroy(precond);
+   }
 
-    else if (precond_id == HYPRE_GSMG)
-        HYPRE_BoomerAMGDestroy(precond);
+   /************************************************************************
+    * STRUCT MATRIX
+    ***********************************************************************/
+   if (matrix_id == HYPRE_STRUCT)
+   {
 
-    else if (precond_id == HYPRE_HYBRID)
-        HYPRE_HybridDestroy(precond);
+      /************************************************************************
+       *     PCG Solver
+       ***********************************************************************/
+      if (solver_id == HYPRE_PCG)
+      {
+         if (precond_id == HYPRE_SMG)
+         {
+            HYPRE_PCGSetPrecond( (HYPRE_Solver) solver,
+                                 (HYPRE_PtrToSolverFcn) HYPRE_StructSMGSolve,
+                                 (HYPRE_PtrToSolverFcn) HYPRE_StructSMGSetup,
+                                 (HYPRE_Solver) precond);
+         }
+         else if (precond_id == HYPRE_PFMG)
+         {
+            HYPRE_PCGSetPrecond( (HYPRE_Solver) solver,
+                                 (HYPRE_PtrToSolverFcn) HYPRE_StructPFMGSolve,
+                                 (HYPRE_PtrToSolverFcn) HYPRE_StructPFMGSetup,
+                                 (HYPRE_Solver) precond);
+         }
+         else if (precond_id == HYPRE_SPARSEMSG)
+         {
+            HYPRE_PCGSetPrecond( (HYPRE_Solver) solver,
+                                 (HYPRE_PtrToSolverFcn) HYPRE_StructSparseMSGSolve,
+                                 (HYPRE_PtrToSolverFcn) HYPRE_StructSparseMSGSetup,
+                                 (HYPRE_Solver) precond);
+         }
+         else if (precond_id == HYPRE_JACOBI)
+         {
+            HYPRE_PCGSetPrecond( (HYPRE_Solver) solver,
+                                 (HYPRE_PtrToSolverFcn) HYPRE_StructJacobiSolve,
+                                 (HYPRE_PtrToSolverFcn) HYPRE_StructJacobiSetup,
+                                 (HYPRE_Solver) precond);
+         }
+         else if (precond_id == HYPRE_DIAGSCALE)
+         {
+            HYPRE_PCGSetPrecond( (HYPRE_Solver) solver,
+                                 (HYPRE_PtrToSolverFcn) HYPRE_StructDiagScale,
+                                 (HYPRE_PtrToSolverFcn) HYPRE_StructDiagScaleSetup,
+                                 (HYPRE_Solver) precond);
+         }
+      }
 
-    else if (precond_id == HYPRE_JACOBI)
-        HYPRE_JacobiDestroy(precond);
+      /************************************************************************
+       *     HYBRID Solver
+       ***********************************************************************/
+      if (solver_id == HYPRE_HYBRID)
+      {
+         if (precond_id == HYPRE_SMG)
+         {
+            HYPRE_StructHybridSetPrecond( (HYPRE_StructSolver) solver,
+                                          (HYPRE_PtrToStructSolverFcn) HYPRE_StructSMGSolve,
+                                          (HYPRE_PtrToStructSolverFcn) HYPRE_StructSMGSetup,
+                                          (HYPRE_StructSolver) precond);
+         }
+         else if (precond_id == HYPRE_PFMG)
+         {
+            HYPRE_StructHybridSetPrecond( (HYPRE_StructSolver) solver,
+                                          (HYPRE_PtrToStructSolverFcn) HYPRE_StructPFMGSolve,
+                                          (HYPRE_PtrToStructSolverFcn) HYPRE_StructPFMGSetup,
+                                          (HYPRE_StructSolver) precond);
+         }
+         else if (precond_id == HYPRE_SPARSEMSG)
+         {
+            HYPRE_StructHybridSetPrecond( (HYPRE_StructSolver) solver,
+                                          (HYPRE_PtrToStructSolverFcn) HYPRE_StructSparseMSGSolve,
+                                          (HYPRE_PtrToStructSolverFcn) HYPRE_StructSparseMSGSetup,
+                                          (HYPRE_StructSolver) precond);
+         }
+      }
 
-    else if (precond_id == HYPRE_PARASAILS)
-        HYPRE_ParaSailsDestroy(precond);
+      /************************************************************************
+       *     GMRES Solver
+       ***********************************************************************/
+      if (solver_id == HYPRE_GMRES)
+      {
+         if (precond_id == HYPRE_SMG)
+         {
+            HYPRE_GMRESSetPrecond( (HYPRE_Solver) solver,
+                                   (HYPRE_PtrToSolverFcn) HYPRE_StructSMGSolve,
+                                   (HYPRE_PtrToSolverFcn) HYPRE_StructSMGSetup,
+                                   (HYPRE_Solver) precond);
+         }
+         else if (precond_id == HYPRE_PFMG)
+         {
+            HYPRE_GMRESSetPrecond( (HYPRE_Solver) solver,
+                                   (HYPRE_PtrToSolverFcn) HYPRE_StructPFMGSolve,
+                                   (HYPRE_PtrToSolverFcn) HYPRE_StructPFMGSetup,
+                                   (HYPRE_Solver) precond);
+         }
+         else if (precond_id == HYPRE_SPARSEMSG)
+         {
+            HYPRE_GMRESSetPrecond( (HYPRE_Solver) solver,
+                                   (HYPRE_PtrToSolverFcn) HYPRE_StructSparseMSGSolve,
+                                   (HYPRE_PtrToSolverFcn) HYPRE_StructSparseMSGSetup,
+                                   (HYPRE_Solver) precond);
+         }
+         else if (precond_id == HYPRE_JACOBI)
+         {
+            HYPRE_GMRESSetPrecond( (HYPRE_Solver) solver,
+                                   (HYPRE_PtrToSolverFcn) HYPRE_StructJacobiSolve,
+                                   (HYPRE_PtrToSolverFcn) HYPRE_StructJacobiSetup,
+                                   (HYPRE_Solver) precond);
+         }
+         else if (precond_id == HYPRE_DIAGSCALE)
+         {
+            HYPRE_GMRESSetPrecond( (HYPRE_Solver) solver,
+                                   (HYPRE_PtrToSolverFcn) HYPRE_StructDiagScale,
+                                   (HYPRE_PtrToSolverFcn) HYPRE_StructDiagScaleSetup,
+                                   (HYPRE_Solver) precond);
+         }
+      }
 
-    else if (precond_id == HYPRE_PCG)
-        HYPRE_PCGDestroy(precond);
+      /************************************************************************
+       *     BICGSTAB Solver
+       ***********************************************************************/
+      if (solver_id == HYPRE_BICGSTAB)
+      {
+         if (precond_id == HYPRE_SMG)
+         {
+            HYPRE_BiCGSTABSetPrecond( (HYPRE_Solver) solver,
+                                      (HYPRE_PtrToSolverFcn) HYPRE_StructSMGSolve,
+                                      (HYPRE_PtrToSolverFcn) HYPRE_StructSMGSetup,
+                                      (HYPRE_Solver) precond);
+         }
+         else if (precond_id == HYPRE_PFMG)
+         {
+            HYPRE_BiCGSTABSetPrecond( (HYPRE_Solver) solver,
+                                      (HYPRE_PtrToSolverFcn) HYPRE_StructPFMGSolve,
+                                      (HYPRE_PtrToSolverFcn) HYPRE_StructPFMGSetup,
+                                      (HYPRE_Solver) precond);
+         }
+         else if (precond_id == HYPRE_SPARSEMSG)
+         {
+            HYPRE_BiCGSTABSetPrecond( (HYPRE_Solver) solver,
+                                      (HYPRE_PtrToSolverFcn) HYPRE_StructSparseMSGSolve,
+                                      (HYPRE_PtrToSolverFcn) HYPRE_StructSparseMSGSetup,
+                                      (HYPRE_Solver) precond);
+         }
+         else if (precond_id == HYPRE_JACOBI)
+         {
+            HYPRE_BiCGSTABSetPrecond( (HYPRE_Solver) solver,
+                                      (HYPRE_PtrToSolverFcn) HYPRE_StructJacobiSolve,
+                                      (HYPRE_PtrToSolverFcn) HYPRE_StructJacobiSetup,
+                                      (HYPRE_Solver) precond);
+         }
+         else if (precond_id == HYPRE_DIAGSCALE)
+         {
+            HYPRE_BiCGSTABSetPrecond( (HYPRE_Solver) solver,
+                                      (HYPRE_PtrToSolverFcn) HYPRE_StructDiagScale,
+                                      (HYPRE_PtrToSolverFcn) HYPRE_StructDiagScaleSetup,
+                                      (HYPRE_Solver) precond);
+         }
+      }
+   }
+}
 
-    else if (precond_id == HYPRE_PFMG)
-        HYPRE_PFMGDestroy(precond);
 
-    else if (precond_id == HYPRE_PILUT)
-        HYPRE_PilutDestroy(precond);
+HYPRE_Int hypre_set_precond_params(HYPRE_Int precond_id, void *precond)
+{
+   HYPRE_Int i;
+   HYPRE_Int ierr;
+
+   /* use BoomerAMG preconditioner */
+   if (precond_id == HYPRE_BOOMERAMG)
+   {
+      HYPRE_BoomerAMGCreate(precond);
+      HYPRE_BoomerAMGSetInterpType(precond, interp_type);
+      HYPRE_BoomerAMGSetNumSamples(precond, gsmg_samples);
+      HYPRE_BoomerAMGSetTol(precond, pc_tol);
+      HYPRE_BoomerAMGSetCoarsenType(precond, (hybrid * coarsen_type));
+      HYPRE_BoomerAMGSetMeasureType(precond, measure_type);
+      HYPRE_BoomerAMGSetStrongThreshold(precond, strong_threshold);
+      HYPRE_BoomerAMGSetTruncFactor(precond, trunc_factor);
+      HYPRE_BoomerAMGSetPrintLevel(precond, poutdat);
+      HYPRE_BoomerAMGSetPrintFileName(precond, "driver.out.log");
+      HYPRE_BoomerAMGSetMaxIter(precond, 1);
+      HYPRE_BoomerAMGSetCycleType(precond, cycle_type);
+      HYPRE_BoomerAMGSetNumGridSweeps(precond, num_grid_sweeps);
+      HYPRE_BoomerAMGSetGridRelaxType(precond, grid_relax_type);
+      HYPRE_BoomerAMGSetRelaxWeight(precond, relax_weight);
+      HYPRE_BoomerAMGSetOmega(precond, omega);
+      HYPRE_BoomerAMGSetSmoothType(precond, smooth_type);
+      HYPRE_BoomerAMGSetSmoothNumLevels(precond, smooth_num_levels);
+      HYPRE_BoomerAMGSetSmoothNumSweeps(precond, smooth_num_sweeps);
+      HYPRE_BoomerAMGSetGridRelaxPoints(precond, grid_relax_points);
+      HYPRE_BoomerAMGSetMaxLevels(precond, max_levels);
+      HYPRE_BoomerAMGSetMaxRowSum(precond, max_row_sum);
+      HYPRE_BoomerAMGSetNumFunctions(precond, num_functions);
+      HYPRE_BoomerAMGSetVariant(precond, variant);
+      HYPRE_BoomerAMGSetOverlap(precond, overlap);
+      HYPRE_BoomerAMGSetDomainType(precond, domain_type);
+      HYPRE_BoomerAMGSetSchwarzRlxWeight(precond, schwarz_rlx_weight);
+      if (num_functions > 1)
+      {
+         HYPRE_BoomerAMGSetDofFunc(precond, dof_func);
+      }
+   }
+   /* use DiagScale preconditioner */
+   else if (precond_id == HYPRE_DIAGSCALE)
+   {
+      precond = NULL;
+   }
+   /* use ParaSails preconditioner */
+   else if (precond_id == HYPRE_PARASAILS)
+   {
+      HYPRE_ParaSailsCreate(hypre_MPI_COMM_WORLD, precond);
+      HYPRE_ParaSailsSetParams(precond, sai_threshold, max_levels);
+      HYPRE_ParaSailsSetFilter(precond, sai_filter);
+      HYPRE_ParaSailsSetLogging(precond, poutdat);
+   }
+   /* use Schwarz preconditioner */
+   else if (precond_id == HYPRE_SCHWARZ)
+   {
+      HYPRE_SchwarzCreate(precond);
+      HYPRE_SchwarzSetVariant(precond, variant);
+      HYPRE_SchwarzSetOverlap(precond, overlap);
+      HYPRE_SchwarzSetDomainType(precond, domain_type);
+      HYPRE_SchwarzSetRelaxWeight(precond, schwarz_rlx_weight);
+   }
+   /* use GSMG as preconditioner */
+   else if (precond_id == HYPRE_GSMG)
+   {
+      /* fine grid */
+      num_grid_sweeps[0] = num_sweep;
+      grid_relax_type[0] = relax_default;
+      hypre_TFree(grid_relax_points[0], HYPRE_MEMORY_HOST);
+      grid_relax_points[0] = hypre_CTAlloc(HYPRE_Int,  num_sweep, HYPRE_MEMORY_HOST);
+      for (i = 0; i < num_sweep; i++)
+      {
+         grid_relax_points[0][i] = 0;
+      }
 
-    else if (precond_id == HYPRE_SCHWARZ)
-        HYPRE_SchwarzDestroy(precond);
+      /* down cycle */
+      num_grid_sweeps[1] = num_sweep;
+      grid_relax_type[1] = relax_default;
+      hypre_TFree(grid_relax_points[1], HYPRE_MEMORY_HOST);
+      grid_relax_points[1] = hypre_CTAlloc(HYPRE_Int,  num_sweep, HYPRE_MEMORY_HOST);
+      for (i = 0; i < num_sweep; i++)
+      {
+         grid_relax_points[1][i] = 0;
+      }
 
-    else if (precond_id == HYPRE_SMG)
-        HYPRE_SMGDestroy(precond);
+      /* up cycle */
+      num_grid_sweeps[2] = num_sweep;
+      grid_relax_type[2] = relax_default;
+      hypre_TFree(grid_relax_points[2], HYPRE_MEMORY_HOST);
+      grid_relax_points[2] = hypre_CTAlloc(HYPRE_Int,  num_sweep, HYPRE_MEMORY_HOST);
+      for (i = 0; i < num_sweep; i++)
+      {
+         grid_relax_points[2][i] = 0;
+      }
 
-    else if (precond_id == HYPRE_SPARSEMSG)
-        HYPRE_SparseMSGDestroy(precond);
+      /* coarsest grid */
+      num_grid_sweeps[3] = 1;
+      grid_relax_type[3] = 9;
+      hypre_TFree(grid_relax_points[3], HYPRE_MEMORY_HOST);
+      grid_relax_points[3] = hypre_CTAlloc(HYPRE_Int,  1, HYPRE_MEMORY_HOST);
+      grid_relax_points[3][0] = 0;
+
+      HYPRE_BoomerAMGCreate(precond);
+      HYPRE_BoomerAMGSetGSMG(precond, 4);
+      HYPRE_BoomerAMGSetInterpType(precond, interp_type);
+      HYPRE_BoomerAMGSetNumSamples(precond, gsmg_samples);
+      HYPRE_BoomerAMGSetTol(precond, pc_tol);
+      HYPRE_BoomerAMGSetCoarsenType(precond, (hybrid * coarsen_type));
+      HYPRE_BoomerAMGSetMeasureType(precond, measure_type);
+      HYPRE_BoomerAMGSetStrongThreshold(precond, strong_threshold);
+      HYPRE_BoomerAMGSetTruncFactor(precond, trunc_factor);
+      HYPRE_BoomerAMGSetPrintLevel(precond, poutdat);
+      HYPRE_BoomerAMGSetPrintFileName(precond, "driver.out.log");
+      HYPRE_BoomerAMGSetMaxIter(precond, 1);
+      HYPRE_BoomerAMGSetCycleType(precond, cycle_type);
+      HYPRE_BoomerAMGSetNumGridSweeps(precond, num_grid_sweeps);
+      HYPRE_BoomerAMGSetGridRelaxType(precond, grid_relax_type);
+      HYPRE_BoomerAMGSetRelaxWeight(precond, relax_weight);
+      HYPRE_BoomerAMGSetOmega(precond, omega);
+      HYPRE_BoomerAMGSetSmoothType(precond, smooth_type);
+      HYPRE_BoomerAMGSetSmoothNumLevels(precond, smooth_num_levels);
+      HYPRE_BoomerAMGSetSmoothNumSweeps(precond, smooth_num_sweeps);
+      HYPRE_BoomerAMGSetVariant(precond, variant);
+      HYPRE_BoomerAMGSetOverlap(precond, overlap);
+      HYPRE_BoomerAMGSetDomainType(precond, domain_type);
+      HYPRE_BoomerAMGSetSchwarzRlxWeight(precond, schwarz_rlx_weight);
+      HYPRE_BoomerAMGSetGridRelaxPoints(precond, grid_relax_points);
+      HYPRE_BoomerAMGSetMaxLevels(precond, max_levels);
+      HYPRE_BoomerAMGSetMaxRowSum(precond, max_row_sum);
+      HYPRE_BoomerAMGSetNumFunctions(precond, num_functions);
+      if (num_functions > 1)
+      {
+         HYPRE_BoomerAMGSetDofFunc(precond, dof_func);
+      }
+   }
 
-    else if (precond_id == HYPRE_SPLIT)
-        HYPRE_SplitDestroy(precond);
+   /* use PILUT as preconditioner */
+   else if (precond_id == HYPRE_PILUT)
+   {
+      ierr = HYPRE_ParCSRPilutCreate( hypre_MPI_COMM_WORLD, precond );
+   }
+}
 
-    else if (precond_id == HYPRE_SPLITPFMG)
-        HYPRE_SplitDestroy(precond);
 
-    else if (precond_id == HYPRE_SPLITSMG)
-        HYPRE_SplitDestroy(precond);
+HYPRE_Int hypre_destroy_precond(HYPRE_Int precond_id, void *precond)
+{
 
-    else if (precond_id == HYPRE_SYSPFMG)
-        HYPRE_SysPFMGDestroy(precond);
+   if (precond_id == HYPRE_BICGSTAB)
+   {
+      HYPRE_BiCGSTABDestroy(precond);
+   }
+
+   else if (precond_id == HYPRE_BOOMERAMG)
+   {
+      HYPRE_BoomerAMGDestroy(precond);
+   }
+
+   else if (precond_id == HYPRE_CGNR)
+   {
+      HYPRE_CGNRDestroy(precond);
+   }
+
+   else if (precond_id == HYPRE_DIAGSCALE)
+   {
+      HYPRE_Destroy(precond);
+   }
+
+   else if (precond_id == HYPRE_EUCLID)
+   {
+      HYPRE_EuclidDestroy(precond);
+   }
+
+   else if (precond_id == HYPRE_GMRES)
+   {
+      HYPRE_GMRESDestroy(precond);
+   }
+
+   else if (precond_id == HYPRE_GSMG)
+   {
+      HYPRE_BoomerAMGDestroy(precond);
+   }
+
+   else if (precond_id == HYPRE_HYBRID)
+   {
+      HYPRE_HybridDestroy(precond);
+   }
+
+   else if (precond_id == HYPRE_JACOBI)
+   {
+      HYPRE_JacobiDestroy(precond);
+   }
+
+   else if (precond_id == HYPRE_PARASAILS)
+   {
+      HYPRE_ParaSailsDestroy(precond);
+   }
+
+   else if (precond_id == HYPRE_PCG)
+   {
+      HYPRE_PCGDestroy(precond);
+   }
+
+   else if (precond_id == HYPRE_PFMG)
+   {
+      HYPRE_PFMGDestroy(precond);
+   }
+
+   else if (precond_id == HYPRE_PILUT)
+   {
+      HYPRE_PilutDestroy(precond);
+   }
+
+   else if (precond_id == HYPRE_SCHWARZ)
+   {
+      HYPRE_SchwarzDestroy(precond);
+   }
+
+   else if (precond_id == HYPRE_SMG)
+   {
+      HYPRE_SMGDestroy(precond);
+   }
+
+   else if (precond_id == HYPRE_SPARSEMSG)
+   {
+      HYPRE_SparseMSGDestroy(precond);
+   }
+
+   else if (precond_id == HYPRE_SPLIT)
+   {
+      HYPRE_SplitDestroy(precond);
+   }
+
+   else if (precond_id == HYPRE_SPLITPFMG)
+   {
+      HYPRE_SplitDestroy(precond);
+   }
+
+   else if (precond_id == HYPRE_SPLITSMG)
+   {
+      HYPRE_SplitDestroy(precond);
+   }
+
+   else if (precond_id == HYPRE_SYSPFMG)
+   {
+      HYPRE_SysPFMGDestroy(precond);
+   }
 }
diff --git a/external/hypre/src/test/hypre_sstruct_fortran_test.h b/external/hypre/src/test/hypre_sstruct_fortran_test.h
index 504d17b5..1d05b22c 100644
--- a/external/hypre/src/test/hypre_sstruct_fortran_test.h
+++ b/external/hypre/src/test/hypre_sstruct_fortran_test.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -9,7 +9,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-	
+
 /******************************************************************************
  *  Definitions of sstruct fortran interface routines
  *****************************************************************************/
@@ -17,741 +17,745 @@ extern "C" {
 #define HYPRE_SStructGraphCreate \
         hypre_F90_NAME(fhypre_sstructgraphcreate, FHYPRE_SSTRUCTGRAPHCREATE)
 extern void hypre_F90_NAME(fhypre_sstructgraphcreate, FHYPRE_SSTRUCTGRAPHCREATE)
-                          (HYPRE_Int *, hypre_F90_Obj *, hypre_F90_Obj *);
+(HYPRE_Int *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_SStructGraphDestroy \
         hypre_F90_NAME(fhypre_sstructgraphdestroy, FHYPRE_SSTRUCTGRAPHDESTROY)
 extern void hypre_F90_NAME(fhypre_sstructgraphdestroy, FHYPRE_SSTRUCTGRAPHDESTROY)
-                          (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_SStructGraphSetStencil \
         hypre_F90_NAME(fhypre_sstructgraphsetstencil, FHYPRE_SSTRUCTGRAPHSETSTENCIL)
 extern void hypre_F90_NAME(fhypre_sstructgraphsetstencil, FHYPRE_SSTRUCTGRAPHSETSTENCIL)
-                          (hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, hypre_F90_Obj *);
+(hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, hypre_F90_Obj *);
 
 #define HYPRE_SStructGraphAddEntries \
         hypre_F90_NAME(fhypre_sstructgraphaddentries, FHYPRE_SSTRUCTGRAPHADDENTRIES)
 extern void hypre_F90_NAME(fhypre_sstructgraphaddentries, FHYPRE_SSTRUCTGRAPHADDENTRIES)
-                          (hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *);
 
 #define HYPRE_SStructGraphAssemble \
         hypre_F90_NAME(fhypre_sstructgraphassemble, FHYPRE_SSTRUCTGRAPHASSEMBLE)
 extern void hypre_F90_NAME(fhypre_sstructgraphassemble, FHYPRE_SSTRUCTGRAPHASSEMBLE)
-                          (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_SStructGraphSetObjectType \
         hypre_F90_NAME(fhypre_sstructgraphsetobjecttyp, FHYPRE_SSTRUCTGRAPHSETOBJECTTYP)
 
 extern void hypre_F90_NAME(fhypre_sstructgraphsetobjecttyp, FHYPRE_SSTRUCTGRAPHSETOBJECTTYP)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 
 
 #define HYPRE_SStructGridCreate \
         hypre_F90_NAME(fhypre_sstructgridcreate, FHYPRE_SSTRUCTGRIDCREATE)
 extern void hypre_F90_NAME(fhypre_sstructgridcreate, FHYPRE_SSTRUCTGRIDCREATE)
-                          (HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, hypre_F90_Obj *);
+(HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, hypre_F90_Obj *);
 
 #define HYPRE_SStructGridDestroy \
         hypre_F90_NAME(fhypre_sstructgriddestroy, FHYPRE_SSTRUCTGRIDDESTROY)
 extern void hypre_F90_NAME(fhypre_sstructgriddestroy, FHYPRE_SSTRUCTGRIDDESTROY)
-                          (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_SStructGridSetExtents \
         hypre_F90_NAME(fhypre_sstructgridsetextents, FHYPRE_SSTRUCTGRIDSETEXTENTS)
 extern void hypre_F90_NAME(fhypre_sstructgridsetextents, FHYPRE_SSTRUCTGRIDSETEXTENTS)
-                          (hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *);
 
 #define HYPRE_SStructGridSetVariables \
         hypre_F90_NAME(fhypre_sstructgridsetvariables, FHYPRE_SSTRUCTGRIDSETVARIABLES)
 extern void hypre_F90_NAME(fhypre_sstructgridsetvariables, FHYPRE_SSTRUCTGRIDSETVARIABLES)
-                          (hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, hypre_F90_Obj *);
+(hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, hypre_F90_Obj *);
 
 #define HYPRE_SStructGridAddVariables \
         hypre_F90_NAME(fhypre_sstructgridaddvariables, FHYPRE_SSTRUCTGRIDADDVARIABLES)
 extern void hypre_F90_NAME(fhypre_sstructgridaddvariables, FHYPRE_SSTRUCTGRIDADDVARIABLES)
-                          (hypre_F90_Obj  *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, hypre_F90_Obj *);
+(hypre_F90_Obj  *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, hypre_F90_Obj *);
 
 #define HYPRE_SStructGridSetNeighborBox \
         hypre_F90_NAME(fhypre_sstructgridsetneighborbo, FHYPRE_SSTRUCTGRIDSETNEIGHBORBO)
 extern void hypre_F90_NAME(fhypre_sstructgridsetneighborbo, FHYPRE_SSTRUCTGRIDSETNEIGHBORBO)
-                          (hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *,
+ HYPRE_Int *);
 
 #define HYPRE_SStructGridAssemble \
         hypre_F90_NAME(fhypre_sstructgridassemble, FHYPRE_SSTRUCTGRIDASSEMBLE)
 extern void hypre_F90_NAME(fhypre_sstructgridassemble, FHYPRE_SSTRUCTGRIDASSEMBLE)
-                          (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_SStructGridSetPeriodic \
         hypre_F90_NAME(fhypre_sstructgridsetperiodic, FHYPRE_SSTRUCTGRIDSETPERIODIC)
 extern void hypre_F90_NAME(fhypre_sstructgridsetperiodic, FHYPRE_SSTRUCTGRIDSETPERIODIC)
-                          (hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *);
 
 #define HYPRE_SStructGridSetNumGhost \
         hypre_F90_NAME(fhypre_sstructgridsetnumghost, FHYPRE_SSTRUCTGRIDSETNUMGHOST)
 extern void hypre_F90_NAME(fhypre_sstructgridsetnumghost, FHYPRE_SSTRUCTGRIDSETNUMGHOST)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 
 
 #define HYPRE_SStructMatrixCreate \
         hypre_F90_NAME(fhypre_sstructmatrixcreate, FHYPRE_SSTRUCTMATRIXCREATE)
 extern void hypre_F90_NAME(fhypre_sstructmatrixcreate, FHYPRE_SSTRUCTMATRIXCREATE)
-                          (HYPRE_Int *, hypre_F90_Obj *, hypre_F90_Obj *);
+(HYPRE_Int *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_SStructMatrixDestroy \
         hypre_F90_NAME(fhypre_sstructmatrixdestroy, FHYPRE_SSTRUCTMATRIXDESTROY)
 extern void hypre_F90_NAME(fhypre_sstructmatrixdestroy, FHYPRE_SSTRUCTMATRIXDESTROY)
-                          (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_SStructMatrixInitialize \
         hypre_F90_NAME(fhypre_sstructmatrixinitialize, FHYPRE_SSTRUCTMATRIXINITIALIZE)
 extern void hypre_F90_NAME(fhypre_sstructmatrixinitialize, FHYPRE_SSTRUCTMATRIXINITIALIZE)
-                          (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_SStructMatrixSetValues \
         hypre_F90_NAME(fhypre_sstructmatrixsetvalues, FHYPRE_SSTRUCTMATRIXSETVALUES)
 extern void hypre_F90_NAME(fhypre_sstructmatrixsetvalues, FHYPRE_SSTRUCTMATRIXSETVALUES)
-                          (hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Real *);
 
 #define HYPRE_SStructMatrixSetBoxValues \
         hypre_F90_NAME(fhypre_sstructmatrixsetboxvalue, FHYPRE_SSTRUCTMATRIXSETBOXVALUE)
 extern void hypre_F90_NAME(fhypre_sstructmatrixsetboxvalue, FHYPRE_SSTRUCTMATRIXSETBOXVALUE)
-                          (hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *,
+ HYPRE_Real *);
 
 #define HYPRE_SStructMatrixGetValues \
         hypre_F90_NAME(fhypre_sstructmatrixgetvalues, FHYPRE_SSTRUCTMATRIXGETVALUES)
 extern void hypre_F90_NAME(fhypre_sstructmatrixgetvalues, FHYPRE_SSTRUCTMATRIXGETVALUES)
-                          (hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Real *);
 
 #define HYPRE_SStructMatrixGetBoxValues \
         hypre_F90_NAME(fhypre_sstructmatrixgetboxvalue, FHYPRE_SSTRUCTMATRIXGETBOXVALUE)
 extern void hypre_F90_NAME(fhypre_sstructmatrixgetboxvalue, FHYPRE_SSTRUCTMATRIXGETBOXVALUE)
-                          (hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *,
+ HYPRE_Real *);
 
 #define HYPRE_SStructMatrixAddToValues \
         hypre_F90_NAME(fhypre_sstructmatrixaddtovalues, FHYPRE_SSTRUCTMATRIXADDTOVALUES)
 extern void hypre_F90_NAME(fhypre_sstructmatrixaddtovalues, FHYPRE_SSTRUCTMATRIXADDTOVALUES)
-                          (hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Real *);
 
 #define HYPRE_SStructMatrixAddToBoxValues \
         hypre_F90_NAME(fhypre_sstructmatrixaddtoboxval, FHYPRE_SSTRUCTMATRIXADDTOBOXVAL)
 extern void hypre_F90_NAME(fhypre_sstructmatrixaddtoboxval, FHYPRE_SSTRUCTMATRIXADDTOBOXVAL)
-                          (hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *,
+ HYPRE_Real *);
 
 #define HYPRE_SStructMatrixAssemble \
         hypre_F90_NAME(fhypre_sstructmatrixassemble, FHYPRE_SSTRUCTMATRIXASSEMBLE)
 extern void hypre_F90_NAME(fhypre_sstructmatrixassemble, FHYPRE_SSTRUCTMATRIXASSEMBLE)
-                          (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_SStructMatrixSetSymmetric \
         hypre_F90_NAME(fhypre_sstructmatrixsetsymmetri, FHYPRE_SSTRUCTMATRIXSETSYMMETRI)
 extern void hypre_F90_NAME(fhypre_sstructmatrixsetsymmetri, FHYPRE_SSTRUCTMATRIXSETSYMMETRI)
-                          (hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *);
 
 #define HYPRE_SStructMatrixSetNSSymmetric \
         hypre_F90_NAME(fhypre_sstructmatrixsetnssymmet, FHYPRE_SSTRUCTMATRIXSETNSSYMMET)
 extern void hypre_F90_NAME(fhypre_sstructmatrixsetnssymmet, FHYPRE_SSTRUCTMATRIXSETNSSYMMET)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_SStructMatrixSetObjectType \
         hypre_F90_NAME(fhypre_sstructmatrixsetobjectty, FHYPRE_SSTRUCTMATRIXSETOBJECTTY)
 extern void hypre_F90_NAME(fhypre_sstructmatrixsetobjectty, FHYPRE_SSTRUCTMATRIXSETOBJECTTY)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_SStructMatrixGetObject \
         hypre_F90_NAME(fhypre_sstructmatrixgetobject, FHYPRE_SSTRUCTMATRIXGETOBJECT)
 extern void hypre_F90_NAME(fhypre_sstructmatrixgetobject, FHYPRE_SSTRUCTMATRIXGETOBJECT)
-                          (hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_SStructMatrixPrint \
         hypre_F90_NAME(fhypre_sstructmatrixprint, FHYPRE_SSTRUCTMATRIXPRINT)
 extern void hypre_F90_NAME(fhypre_sstructmatrixprint, FHYPRE_SSTRUCTMATRIXPRINT)
-                          (const char *, hypre_F90_Obj *, HYPRE_Int *);
+(const char *, hypre_F90_Obj *, HYPRE_Int *);
 
 
 
 #define HYPRE_SStructStencilCreate \
         hypre_F90_NAME(fhypre_sstructstencilcreate, FHYPRE_SSTRUCTSTENCILCREATE)
 extern void hypre_F90_NAME(fhypre_sstructstencilcreate, FHYPRE_SSTRUCTSTENCILCREATE)
-                          (HYPRE_Int *, HYPRE_Int *, hypre_F90_Obj *);
+(HYPRE_Int *, HYPRE_Int *, hypre_F90_Obj *);
 
 #define HYPRE_SStructStencilDestroy \
         hypre_F90_NAME(fhypre_sstructstencildestroy, FHYPRE_SSTRUCTSTENCILDESTROY)
 extern void hypre_F90_NAME(fhypre_sstructstencildestroy, FHYPRE_SSTRUCTSTENCILDESTROY)
-                          (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_SStructStencilSetEntry \
         hypre_F90_NAME(fhypre_sstructstencilsetentry, FHYPRE_SSTRUCTSTENCILSETENTRY)
 extern void hypre_F90_NAME(fhypre_sstructstencilsetentry, FHYPRE_SSTRUCTSTENCILSETENTRY)
-                          (hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *);
 
 
 
 #define HYPRE_SStructVectorCreate \
         hypre_F90_NAME(fhypre_sstructvectorcreate, FHYPRE_SSTRUCTVECTORCREATE)
 extern void hypre_F90_NAME(fhypre_sstructvectorcreate, FHYPRE_SSTRUCTVECTORCREATE)
-                          (HYPRE_Int *, hypre_F90_Obj *, hypre_F90_Obj *);
+(HYPRE_Int *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_SStructVectorDestroy \
         hypre_F90_NAME(fhypre_sstructvectordestroy, FHYPRE_SSTRUCTVECTORDESTROY)
 extern void hypre_F90_NAME(fhypre_sstructvectordestroy, FHYPRE_SSTRUCTVECTORDESTROY)
-                          (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_SStructVectorInitialize \
         hypre_F90_NAME(fhypre_sstructvectorinitialize, FHYPRE_SSTRUCTVECTORINITIALIZE)
 extern void hypre_F90_NAME(fhypre_sstructvectorinitialize, FHYPRE_SSTRUCTVECTORINITIALIZE)
-                          (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_SStructVectorSetValues \
         hypre_F90_NAME(fhypre_sstructvectorsetvalues, FHYPRE_SSTRUCTVECTORSETVALUES)
 extern void hypre_F90_NAME(fhypre_sstructvectorsetvalues, FHYPRE_SSTRUCTVECTORSETVALUES)
-                          (hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Real *);
 
 #define HYPRE_SStructVectorSetBoxValues \
         hypre_F90_NAME(fhypre_sstructvectorsetboxvalue, FHYPRE_SSTRUCTVECTORSETBOXVALUE)
 extern void hypre_F90_NAME(fhypre_sstructvectorsetboxvalue, FHYPRE_SSTRUCTVECTORSETBOXVALUE)
-                          (hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Real *);
 
 #define HYPRE_SStructVectorAddToValues \
         hypre_F90_NAME(fhypre_sstructvectoraddtovalues, FHYPRE_SSTRUCTVECTORADDTOVALUES)
 extern void hypre_F90_NAME(fhypre_sstructvectoraddtovalues, FHYPRE_SSTRUCTVECTORADDTOVALUES)
-                          (hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Real *);
 
 #define HYPRE_SStructVectorAddToBoxValues \
         hypre_F90_NAME(fhypre_sstructvectoraddtoboxval, FHYPRE_SSTRUCTVECTORADDTOBOXVAL)
 extern void hypre_F90_NAME(fhypre_sstructvectoraddtoboxval, FHYPRE_SSTRUCTVECTORADDTOBOXVAL)
-                          (hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Real *);
 
 #define HYPRE_SStructVectorAssemble \
         hypre_F90_NAME(fhypre_sstructvectorassemble, FHYPRE_SSTRUCTVECTORASSEMBLE)
 extern void hypre_F90_NAME(fhypre_sstructvectorassemble, FHYPRE_SSTRUCTVECTORASSEMBLE)
-                          (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_SStructVectorGather \
         hypre_F90_NAME(fhypre_sstructvectorgather, FHYPRE_SSTRUCTVECTORGATHER)
 extern void hypre_F90_NAME(fhypre_sstructvectorgather, FHYPRE_SSTRUCTVECTORGATHER)
-                          (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_SStructVectorGetValues \
         hypre_F90_NAME(fhypre_sstructvectorgetvalues, FHYPRE_SSTRUCTVECTORGETVALUES)
 extern void hypre_F90_NAME(fhypre_sstructvectorgetvalues, FHYPRE_SSTRUCTVECTORGETVALUES)
-                          (hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Real *);
 
 #define HYPRE_SStructVectorGetBoxValues \
         hypre_F90_NAME(fhypre_sstructvectorgetboxvalue, FHYPRE_SSTRUCTVECTORGETBOXVALUE)
 extern void hypre_F90_NAME(fhypre_sstructvectorgetboxvalue, FHYPRE_SSTRUCTVECTORGETBOXVALUE)
-                          (hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Real *);
 
 #define HYPRE_SStructVectorSetObjectType \
         hypre_F90_NAME(fhypre_sstructvectorsetobjectty, FHYPRE_SSTRUCTVECTORSETOBJECTTY)
 extern void hypre_F90_NAME(fhypre_sstructvectorsetobjectty, FHYPRE_SSTRUCTVECTORSETOBJECTTY)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_SStructVectorGetObject \
         hypre_F90_NAME(fhypre_sstructvectorgetobject, FHYPRE_SSTRUCTVECTORGETOBJECT)
 extern void hypre_F90_NAME(fhypre_sstructvectorgetobject, FHYPRE_SSTRUCTVECTORGETOBJECT)
-                          (hypre_F90_Obj *, void *);
+(hypre_F90_Obj *, void *);
 
 #define HYPRE_SStructVectorPrint \
         hypre_F90_NAME(fhypre_sstructvectorprint, FHYPRE_SSTRUCTVECTORPRINT)
 extern void hypre_F90_NAME(fhypre_sstructvectorprint, FHYPRE_SSTRUCTVECTORPRINT)
-                          (const char *, hypre_F90_Obj *, HYPRE_Int *);
+(const char *, hypre_F90_Obj *, HYPRE_Int *);
 
 
 
 #define HYPRE_SStructBiCGSTABCreate \
         hypre_F90_NAME(fhypre_sstructbicgstabcreate, FHYPRE_SSTRUCTBICGSTABCREATE)
 extern void hypre_F90_NAME(fhypre_sstructbicgstabcreate, FHYPRE_SSTRUCTBICGSTABCREATE)
-                          (HYPRE_Int *, hypre_F90_Obj *);
+(HYPRE_Int *, hypre_F90_Obj *);
 
 #define HYPRE_SStructBiCGSTABDestroy \
         hypre_F90_NAME(fhypre_sstructbicgstabdestroy, FHYPRE_SSTRUCTBICGSTABDESTROY)
 extern void hypre_F90_NAME(fhypre_sstructbicgstabdestroy, FHYPRE_SSTRUCTBICGSTABDESTROY)
-                          (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_SStructBiCGSTABSetup \
         hypre_F90_NAME(fhypre_sstructbicgstabsetup, FHYPRE_SSTRUCTBICGSTABSETUP)
 extern void hypre_F90_NAME(fhypre_sstructbicgstabsetup, FHYPRE_SSTRUCTBICGSTABSETUP)
-                          (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_SStructBiCGSTABSolve \
         hypre_F90_NAME(fhypre_sstructbicgstabsolve, FHYPRE_SSTRUCTBICGSTABSOLVE)
 extern void hypre_F90_NAME(fhypre_sstructbicgstabsolve, FHYPRE_SSTRUCTBICGSTABSOLVE)
-                          (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_SStructBiCGSTABSetTol \
         hypre_F90_NAME(fhypre_sstructbicgstabsettol, FHYPRE_SSTRUCTBICGSTABSETTOL)
 extern void hypre_F90_NAME(fhypre_sstructbicgstabsettol, FHYPRE_SSTRUCTBICGSTABSETTOL)
-                          (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_SStructBiCGSTABSetMinIter \
         hypre_F90_NAME(fhypre_sstructbicgstabsetminite, FHYPRE_SSTRUCTBICGSTABSETMINITE)
 extern void hypre_F90_NAME(fhypre_sstructbicgstabsetminite, FHYPRE_SSTRUCTBICGSTABSETMINITE)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_SStructBiCGSTABSetMaxIter \
         hypre_F90_NAME(fhypre_sstructbicgstabsetmaxite, FHYPRE_SSTRUCTBICGSTABSETMAXITE)
 extern void hypre_F90_NAME(fhypre_sstructbicgstabsetmaxite, FHYPRE_SSTRUCTBICGSTABSETMAXITE)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_SStructBiCGSTABSetStopCrit \
         hypre_F90_NAME(fhypre_sstructbicgstabsetstopcr, FHYPRE_SSTRUCTBICGSTABSETSTOPCR)
 extern void hypre_F90_NAME(fhypre_sstructbicgstabsetstopcr, FHYPRE_SSTRUCTBICGSTABSETSTOPCR)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_SStructBiCGSTABSetPrecond \
         hypre_F90_NAME(fhypre_sstructbicgstabsetprecon, FHYPRE_SSTRUCTBICGSTABSETPRECON)
 extern void hypre_F90_NAME(fhypre_sstructbicgstabsetprecon, FHYPRE_SSTRUCTBICGSTABSETPRECON)
-                          (hypre_F90_Obj *, HYPRE_Int *, hypre_F90_Obj *);
+(hypre_F90_Obj *, HYPRE_Int *, hypre_F90_Obj *);
 
 #define HYPRE_SStructBiCGSTABSetLogging \
         hypre_F90_NAME(fhypre_sstructbicgstabsetloggin, FHYPRE_SSTRUCTBICGSTABSETLOGGIN)
 extern void hypre_F90_NAME(fhypre_sstructbicgstabsetloggin, FHYPRE_SSTRUCTBICGSTABSETLOGGIN)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_SStructBiCGSTABSetPrintLevel \
         hypre_F90_NAME(fhypre_sstructbicgstabsetprintl, FHYPRE_SSTRUCTBICGSTABSETPRINTL)
 extern void hypre_F90_NAME(fhypre_sstructbicgstabsetprintl, FHYPRE_SSTRUCTBICGSTABSETPRINTL)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_SStructBiCGSTABGetNumIterations \
         hypre_F90_NAME(fhypre_sstructbicgstabgetnumite, FHYPRE_SSTRUCTBICGSTABGETNUMITE)
 extern void hypre_F90_NAME(fhypre_sstructbicgstabgetnumite, FHYPRE_SSTRUCTBICGSTABGETNUMITE)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_SStructBiCGSTABGetFinalRelativeResidualNorm \
         hypre_F90_NAME(fhypre_sstructbicgstabgetfinalr, FHYPRE_SSTRUCTBICGSTABGETFINALR)
 extern void hypre_F90_NAME(fhypre_sstructbicgstabgetfinalr, FHYPRE_SSTRUCTBICGSTABGETFINALR)
-                          (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_SStructBiCGSTABGetResidual \
         hypre_F90_NAME(fhypre_sstructbicgstabgetresidu, FHYPRE_SSTRUCTBICGSTABGETRESIDU)
 extern void hypre_F90_NAME(fhypre_sstructbicgstabgetresidu, FHYPRE_SSTRUCTBICGSTABGETRESIDU)
-                          (hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *);
 
 
 
 #define HYPRE_SStructGMRESCreate \
         hypre_F90_NAME(fhypre_sstructgmrescreate, FHYPRE_SSTRUCTGMRESCREATE)
 extern void hypre_F90_NAME(fhypre_sstructgmrescreate, FHYPRE_SSTRUCTGMRESCREATE)
-                          (hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_SStructGMRESDestroy \
         hypre_F90_NAME(fhypre_sstructgmresdestroy, FHYPRE_SSTRUCTGMRESDESTROY)
 extern void hypre_F90_NAME(fhypre_sstructgmresdestroy, FHYPRE_SSTRUCTGMRESDESTROY)
-                          (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_SStructGMRESSetup \
         hypre_F90_NAME(fhypre_sstructgmressetup, FHYPRE_SSTRUCTGMRESSETUP)
 extern void hypre_F90_NAME(fhypre_sstructgmressetup, FHYPRE_SSTRUCTGMRESSETUP)
-                          (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_SStructGMRESSolve \
         hypre_F90_NAME(fhypre_sstructgmressolve, FHYPRE_SSTRUCTGMRESSOLVE)
 extern void hypre_F90_NAME(fhypre_sstructgmressolve, FHYPRE_SSTRUCTGMRESSOLVE)
-                          (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_SStructGMRESSetKDim \
         hypre_F90_NAME(fhypre_sstructgmressetkdim, FHYPRE_SSTRUCTGMRESSETKDIM)
 extern void hypre_F90_NAME(fhypre_sstructgmressetkdim, FHYPRE_SSTRUCTGMRESSETKDIM)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_SStructGMRESSetTol \
         hypre_F90_NAME(fhypre_sstructgmressettol, FHYPRE_SSTRUCTGMRESSETTOL)
 extern void hypre_F90_NAME(fhypre_sstructgmressettol, FHYPRE_SSTRUCTGMRESSETTOL)
-                          (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_SStructGMRESSetMinIter \
         hypre_F90_NAME(fhypre_sstructgmressetminiter, FHYPRE_SSTRUCTGMRESSETMINITER)
 extern void hypre_F90_NAME(fhypre_sstructgmressetminiter, FHYPRE_SSTRUCTGMRESSETMINITER)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_SStructGMRESSetMaxIter \
         hypre_F90_NAME(fhypre_sstructgmressetmaxiter, FHYPRE_SSTRUCTGMRESSETMAXITER)
 extern void hypre_F90_NAME(fhypre_sstructgmressetmaxiter, FHYPRE_SSTRUCTGMRESSETMAXITER)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_SStructGMRESSetStopCrit \
         hypre_F90_NAME(fhypre_sstructgmressetstopcrit, FHYPRE_SSTRUCTGMRESSETSTOPCRIT)
 extern void hypre_F90_NAME(fhypre_sstructgmressetstopcrit, FHYPRE_SSTRUCTGMRESSETSTOPCRIT)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_SStructGMRESSetPrecond \
         hypre_F90_NAME(fhypre_sstructgmressetprecond, FHYPRE_SSTRUCTGMRESSETPRECOND)
 extern void hypre_F90_NAME(fhypre_sstructgmressetprecond, FHYPRE_SSTRUCTGMRESSETPRECOND)
-                          (hypre_F90_Obj *, HYPRE_Int *, hypre_F90_Obj *);
+(hypre_F90_Obj *, HYPRE_Int *, hypre_F90_Obj *);
 
 
 #define HYPRE_SStructGMRESSetLogging \
         hypre_F90_NAME(fhypre_sstructgmressetlogging, FHYPRE_SSTRUCTGMRESSETLOGGING)
 extern void hypre_F90_NAME(fhypre_sstructgmressetlogging, FHYPRE_SSTRUCTGMRESSETLOGGING)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_SStructGMRESSetPrintLevel \
         hypre_F90_NAME(fhypre_sstructgmressetprintleve, FHYPRE_SSTRUCTGMRESSETPRINTLEVE)
 extern void hypre_F90_NAME(fhypre_sstructgmressetprintleve, FHYPRE_SSTRUCTGMRESSETPRINTLEVE)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_SStructGMRESGetNumIterations \
       hypre_F90_NAME(fhypre_sstructgmresgetnumiterati, FHYPRE_SSTRUCTGMRESGETNUMITERATI)
 extern void hypre_F90_NAME(fhypre_sstructgmresgetnumiterati, FHYPRE_SSTRUCTGMRESGETNUMITERATI)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_SStructGMRESGetFinalRelativeResidualNorm \
         hypre_F90_NAME(fhypre_sstructgmresgetfinalrela, FHYPRE_SSTRUCTGMRESGETFINALRELA)
 extern void hypre_F90_NAME(fhypre_sstructgmresgetfinalrela, FHYPRE_SSTRUCTGMRESGETFINALRELA)
-                          (hypre_F90_Obj *, HYPRE_Real  *);
+(hypre_F90_Obj *, HYPRE_Real  *);
 
 #define HYPRE_SStructGMRESGetResidual \
         hypre_F90_NAME(fhypre_sstructgmresgetresidual, FHYPRE_SSTRUCTGMRESGETRESIDUAL)
 extern void hypre_F90_NAME(fhypre_sstructgmresgetresidual, FHYPRE_SSTRUCTGMRESGETRESIDUAL)
-                          (hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *);
 
 
 
 #define HYPRE_SStructPCGCreate \
         hypre_F90_NAME(fhypre_sstructpcgcreate, FHYPRE_SSTRUCTPCGCREATE)
 extern void hypre_F90_NAME(fhypre_sstructpcgcreate, FHYPRE_SSTRUCTPCGCREATE)
-                          (hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_SStructPCGDestroy \
         hypre_F90_NAME(fhypre_sstructpcgdestroy, FHYPRE_SSTRUCTPCGDESTROY)
 extern void hypre_F90_NAME(fhypre_sstructpcgdestroy, FHYPRE_SSTRUCTPCGDESTROY)
-                          (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_SStructPCGSetup \
         hypre_F90_NAME(fhypre_sstructpcgsetup, FHYPRE_SSTRUCTPCGDESTROY)
 extern void hypre_F90_NAME(fhypre_sstructpcgsetup, FHYPRE_SSTRUCTPCGDESTROY)
-                          (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_SStructPCGSolve \
         hypre_F90_NAME(fhypre_sstructpcgsolve, FHYPRE_SSTRUCTPCGSOLVE)
 extern void hypre_F90_NAME(fhypre_sstructpcgsolve, FHYPRE_SSTRUCTPCGSOLVE)
-                          (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_SStructPCGSetTol \
         hypre_F90_NAME(fhypre_sstructpcgsettol, FHYPRE_SSTRUCTPCGSETTOL)
 extern void hypre_F90_NAME(fhypre_sstructpcgsettol, FHYPRE_SSTRUCTPCGSETTOL)
-                          (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_SStructPCGSetMaxIter \
         hypre_F90_NAME(fhypre_sstructpcgsetmaxiter, FHYPRE_SSTRUCTPCGSETMAXITER)
 extern void hypre_F90_NAME(fhypre_sstructpcgsetmaxiter, FHYPRE_SSTRUCTPCGSETMAXITER)
-                          (hypre_F90_Obj *, HYPRE_Int  *);
+(hypre_F90_Obj *, HYPRE_Int  *);
 
 #define HYPRE_SStructPCGSetTwoNorm \
         hypre_F90_NAME(fhypre_sstructpcgsettwonorm, FHYPRE_SSTRUCTPCGSETTWONORM)
 extern void hypre_F90_NAME(fhypre_sstructpcgsettwonorm, FHYPRE_SSTRUCTPCGSETTWONORM)
-                          (hypre_F90_Obj *, HYPRE_Int  *);
+(hypre_F90_Obj *, HYPRE_Int  *);
 
 #define HYPRE_SStructPCGSetRelChange \
         hypre_F90_NAME(fhypre_sstructpcgsetrelchange, FHYPRE_SSTRUCTPCGSETRELCHANGE)
 extern void hypre_F90_NAME(fhypre_sstructpcgsetrelchange, FHYPRE_SSTRUCTPCGSETRELCHANGE)
-                          (hypre_F90_Obj *, HYPRE_Int  *);
+(hypre_F90_Obj *, HYPRE_Int  *);
 
 #define HYPRE_SStructPCGSetPrecond \
         hypre_F90_NAME(fhypre_sstructpcgsetprecond, FHYPRE_SSTRUCTPCGSETPRECOND)
 extern void hypre_F90_NAME(fhypre_sstructpcgsetprecond, FHYPRE_SSTRUCTPCGSETPRECOND)
-                          (hypre_F90_Obj *, HYPRE_Int  *, hypre_F90_Obj *);
+(hypre_F90_Obj *, HYPRE_Int  *, hypre_F90_Obj *);
 
 
 #define HYPRE_SStructPCGSetLogging \
         hypre_F90_NAME(fhypre_sstructpcgsetlogging, FHYPRE_SSTRUCTPCGSETLOGGING)
 extern void hypre_F90_NAME(fhypre_sstructpcgsetlogging, FHYPRE_SSTRUCTPCGSETLOGGING)
-                          (hypre_F90_Obj *, HYPRE_Int  *);
+(hypre_F90_Obj *, HYPRE_Int  *);
 
 #define HYPRE_SStructPCGSetPrintLevel \
         hypre_F90_NAME(fhypre_sstructpcgsetprintlevel, FHYPRE_SSTRUCTPCGSETPRINTLEVEL)
 extern void hypre_F90_NAME(fhypre_sstructpcgsetprintlevel, FHYPRE_SSTRUCTPCGSETPRINTLEVEL)
-                          (hypre_F90_Obj *, HYPRE_Int  *);
+(hypre_F90_Obj *, HYPRE_Int  *);
 
 #define HYPRE_SStructPCGGetNumIterations \
         hypre_F90_NAME(fhypre_sstructpcggetnumiteratio, FHYPRE_SSTRUCTPCGGETNUMITERATIO)
 extern void hypre_F90_NAME(fhypre_sstructpcggetnumiteratio, FHYPRE_SSTRUCTPCGGETNUMITERATIO)
-                          (hypre_F90_Obj *, HYPRE_Int  *);
+(hypre_F90_Obj *, HYPRE_Int  *);
 
 #define HYPRE_SStructPCGGetFinalRelativeResidualNorm \
         hypre_F90_NAME(fhypre_sstructpcggetfinalrelati, FHYPRE_SSTRUCTPCGGETFINALRELATI)
 extern void hypre_F90_NAME(fhypre_sstructpcggetfinalrelati, FHYPRE_SSTRUCTPCGGETFINALRELATI)
-                          (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_SStructPCGGetResidual \
         hypre_F90_NAME(fhypre_sstructpcggetresidual, FHYPRE_SSTRUCTPCGGETRESIDUAL)
 extern void hypre_F90_NAME(fhypre_sstructpcggetresidual, FHYPRE_SSTRUCTPCGGETRESIDUAL)
-                          (hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_SStructDiagScaleSetup \
         hypre_F90_NAME(fhypre_sstructdiagscalesetup, FHYPRE_SSTRUCTDIAGSCALESETUP)
 extern void hypre_F90_NAME(fhypre_sstructdiagscalesetup, FHYPRE_SSTRUCTDIAGSCALESETUP)
-                          (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_SStructDiagScale \
         hypre_F90_NAME(fhypre_sstructdiagscale, FHYPRE_SSTRUCTDIAGSCALE)
 extern void hypre_F90_NAME(fhypre_sstructdiagscale, FHYPRE_SSTRUCTDIAGSCALE)
-                          (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 
 #define HYPRE_SStructSplitCreate \
         hypre_F90_NAME(fhypre_sstructsplitcreate, FHYPRE_SSTRUCTSPLITCREATE)
 extern void hypre_F90_NAME(fhypre_sstructsplitcreate, FHYPRE_SSTRUCTSPLITCREATE)
-                          (hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_SStructSplitDestroy \
         hypre_F90_NAME(fhypre_sstructsplitdestroy, FHYPRE_SSTRUCTSPLITDESTROY)
 extern void hypre_F90_NAME(fhypre_sstructsplitdestroy, FHYPRE_SSTRUCTSPLITDESTROY)
-                          (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_SStructSplitSetup \
         hypre_F90_NAME(fhypre_sstructsplitsetup, FHYPRE_SSTRUCTSPLITSETUP)
 extern void hypre_F90_NAME(fhypre_sstructsplitsetup, FHYPRE_SSTRUCTSPLITSETUP)
-                          (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_SStructSplitSolve \
         hypre_F90_NAME(fhypre_sstructsplitsolve, FHYPRE_SSTRUCTSPLITSOLVE)
 extern void hypre_F90_NAME(fhypre_sstructsplitsolve, FHYPRE_SSTRUCTSPLITSOLVE)
-                          (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_SStructSplitSetTol \
         hypre_F90_NAME(fhypre_sstructsplitsettol, FHYPRE_SSTRUCTSPLITSETTOL)
 extern void hypre_F90_NAME(fhypre_sstructsplitsettol, FHYPRE_SSTRUCTSPLITSETTOL)
-                          (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_SStructSplitSetMaxIter \
         hypre_F90_NAME(fhypre_sstructsplitsetmaxiter, FHYPRE_SSTRUCTSPLITSETMAXITER)
 extern void hypre_F90_NAME(fhypre_sstructsplitsetmaxiter, FHYPRE_SSTRUCTSPLITSETMAXITER)
-                          (hypre_F90_Obj *, HYPRE_Int  *);
+(hypre_F90_Obj *, HYPRE_Int  *);
 
 #define HYPRE_SStructSplitSetZeroGuess \
         hypre_F90_NAME(fhypre_sstructsplitsetzeroguess, FHYPRE_SSTRUCTSPLITSETZEROGUESS)
 extern void hypre_F90_NAME(fhypre_sstructsplitsetzeroguess, FHYPRE_SSTRUCTSPLITSETZEROGUESS)
-                          (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_SStructSplitSetNonZeroGuess \
         hypre_F90_NAME(fhypre_sstructsplitsetnonzerogu, FHYPRE_SSTRUCTSPLITSETNONZEROGU)
 extern void hypre_F90_NAME(fhypre_sstructsplitsetnonzerogu, FHYPRE_SSTRUCTSPLITSETNONZEROGU)
-                          (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_SStructSplitSetStructSolver \
         hypre_F90_NAME(fhypre_sstructsplitsetstructsol, FHYPRE_SSTRUCTSPLITSETSTRUCTSOL)
 extern void hypre_F90_NAME(fhypre_sstructsplitsetstructsol, FHYPRE_SSTRUCTSPLITSETSTRUCTSOL)
-                          (hypre_F90_Obj *, HYPRE_Int  *);
+(hypre_F90_Obj *, HYPRE_Int  *);
 
 #define HYPRE_SStructSplitGetNumIterations \
         hypre_F90_NAME(fhypre_sstructsplitgetnumiterat, FHYPRE_SSTRUCTSPLITGETNUMITERAT)
 extern void hypre_F90_NAME(fhypre_sstructsplitgetnumiterat, FHYPRE_SSTRUCTSPLITGETNUMITERAT)
-                          (hypre_F90_Obj *, HYPRE_Int  *);
+(hypre_F90_Obj *, HYPRE_Int  *);
 
 #define HYPRE_SStructSplitGetFinalRelativeResidualNorm \
         hypre_F90_NAME(fhypre_sstructsplitgetfinalrela, FHYPRE_SSTRUCTSPLITGETFINALRELA)
 extern void hypre_F90_NAME(fhypre_sstructsplitgetfinalrela, FHYPRE_SSTRUCTSPLITGETFINALRELA)
-                          (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 
 
 #define HYPRE_SStructSysPFMGCreate \
         hypre_F90_NAME(fhypre_sstructsyspfmgcreate, FHYPRE_SSTRUCTSYSPFMGCREATE)
 extern void hypre_F90_NAME(fhypre_sstructsyspfmgcreate, FHYPRE_SSTRUCTSYSPFMGCREATE)
-                          (hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_SStructSysPFMGDestroy \
         hypre_F90_NAME(fhypre_sstructsyspfmgdestroy, FHYPRE_SSTRUCTSYSPFMGDESTROY)
 extern void hypre_F90_NAME(fhypre_sstructsyspfmgdestroy, FHYPRE_SSTRUCTSYSPFMGDESTROY)
-                          (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_SStructSysPFMGSetup \
         hypre_F90_NAME(fhypre_sstructsyspfmgsetup, FHYPRE_SSTRUCTSYSPFMGSETUP)
 extern void hypre_F90_NAME(fhypre_sstructsyspfmgsetup, FHYPRE_SSTRUCTSYSPFMGSETUP)
-                          (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_SStructSysPFMGSolve \
         hypre_F90_NAME(fhypre_sstructsyspfmgsolve, FHYPRE_SSTRUCTSYSPFMGSOLVE)
 extern void hypre_F90_NAME(fhypre_sstructsyspfmgsolve, FHYPRE_SSTRUCTSYSPFMGSOLVE)
-                          (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_SStructSysPFMGSetTol \
         hypre_F90_NAME(fhypre_sstructsyspfmgsettol, FHYPRE_SSTRUCTSYSPFMGSETTOL)
 extern void hypre_F90_NAME(fhypre_sstructsyspfmgsettol, FHYPRE_SSTRUCTSYSPFMGSETTOL)
-                          (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_SStructSysPFMGSetMaxIter \
         hypre_F90_NAME(fhypre_sstructsyspfmgsetmaxiter, FHYPRE_SSTRUCTSYSPFMGSETMAXITER)
 extern void hypre_F90_NAME(fhypre_sstructsyspfmgsetmaxiter, FHYPRE_SSTRUCTSYSPFMGSETMAXITER)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_SStructSysPFMGSetRelChange \
         hypre_F90_NAME(fhypre_sstructsyspfmgsetrelchan, FHYPRE_SSTRUCTSYSPFMGSETRELCHAN)
 extern void hypre_F90_NAME(fhypre_sstructsyspfmgsetrelchan, FHYPRE_SSTRUCTSYSPFMGSETRELCHAN)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_SStructSysPFMGSetZeroGuess \
         hypre_F90_NAME(fhypre_sstructsyspfmgsetzerogue, FHYPRE_SSTRUCTSYSPFMGSETZEROGUE)
 extern void hypre_F90_NAME(fhypre_sstructsyspfmgsetzerogue, FHYPRE_SSTRUCTSYSPFMGSETZEROGUE)
-                          (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_SStructSysPFMGSetNonZeroGuess \
         hypre_F90_NAME(fhypre_sstructsyspfmgsetnonzero, FHYPRE_SSTRUCTSYSPFMGSETNONZERO)
 extern void hypre_F90_NAME(fhypre_sstructsyspfmgsetnonzero, FHYPRE_SSTRUCTSYSPFMGSETNONZERO)
-                          (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_SStructSysPFMGSetRelaxType \
         hypre_F90_NAME(fhypre_sstructsyspfmgsetrelaxty, FHYPRE_SSTRUCTSYSPFMGSETRELAXTY)
 extern void hypre_F90_NAME(fhypre_sstructsyspfmgsetrelaxty, FHYPRE_SSTRUCTSYSPFMGSETRELAXTY)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_SStructSysPFMGSetNumPreRelax \
         hypre_F90_NAME(fhypre_sstructsyspfmgsetnumprer, FHYPRE_SSTRUCTSYSPFMGSETNUMPRER)
 extern void hypre_F90_NAME(fhypre_sstructsyspfmgsetnumprer, FHYPRE_SSTRUCTSYSPFMGSETNUMPRER)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_SStructSysPFMGSetNumPostRelax \
         hypre_F90_NAME(fhypre_sstructsyspfmgsetnumpost, FHYPRE_SSTRUCTSYSPFMGSETNUMPOST)
 extern void hypre_F90_NAME(fhypre_sstructsyspfmgsetnumpost, FHYPRE_SSTRUCTSYSPFMGSETNUMPOST)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 
 #define HYPRE_SStructSysPFMGSetSkipRelax \
         hypre_F90_NAME(fhypre_sstructsyspfmgsetskiprel, FHYPRE_SSTRUCTSYSPFMGSETSKIPREL)
 extern void hypre_F90_NAME(fhypre_sstructsyspfmgsetskiprel, FHYPRE_SSTRUCTSYSPFMGSETSKIPREL)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_SStructSysPFMGSetDxyz \
         hypre_F90_NAME(fhypre_sstructsyspfmgsetdxyz, FHYPRE_SSTRUCTSYSPFMGSETDXYZ)
 extern void hypre_F90_NAME(fhypre_sstructsyspfmgsetdxyz, FHYPRE_SSTRUCTSYSPFMGSETDXYZ)
-                          (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_SStructSysPFMGSetLogging \
         hypre_F90_NAME(fhypre_sstructsyspfmgsetlogging, FHYPRE_SSTRUCTSYSPFMGSETLOGGING)
 extern void hypre_F90_NAME(fhypre_sstructsyspfmgsetlogging, FHYPRE_SSTRUCTSYSPFMGSETLOGGING)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_SStructSysPFMGSetPrintLevel \
         hypre_F90_NAME(fhypre_sstructsyspfmgsetprintle, FHYPRE_SSTRUCTSYSPFMGSETPRINTLE)
 extern void hypre_F90_NAME(fhypre_sstructsyspfmgsetprintle, FHYPRE_SSTRUCTSYSPFMGSETPRINTLE)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_SStructSysPFMGGetNumIterations \
         hypre_F90_NAME(fhypre_sstructsyspfmggetnumiter, FHYPRE_SSTRUCTSYSPFMGGETNUMITER)
 extern void hypre_F90_NAME(fhypre_sstructsyspfmggetnumiter, FHYPRE_SSTRUCTSYSPFMGGETNUMITER)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 
 #define HYPRE_SStructSysPFMGGetFinalRelativeResidualNorm \
         hypre_F90_NAME(fhypre_sstructsyspfmggetfinalre, FHYPRE_SSTRUCTSYSPFMGGETFINALRE)
 extern void hypre_F90_NAME(fhypre_sstructsyspfmggetfinalre, FHYPRE_SSTRUCTSYSPFMGGETFINALRE)
-                          (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 
 
 #define HYPRE_SStructMaxwellCreate \
         hypre_F90_NAME(fhypre_sstructmaxwellcreate, FHYPRE_SSTRUCTMAXWELLCREATE)
 extern void hypre_F90_NAME(fhypre_sstructmaxwellcreate, FHYPRE_SSTRUCTMAXWELLCREATE)
-                          (hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_SStructMaxwellDestroy \
         hypre_F90_NAME(fhypre_sstructmaxwelldestroy, FHYPRE_SSTRUCTMAXWELLDESTROY)
 extern void hypre_F90_NAME(fhypre_sstructmaxwelldestroy, FHYPRE_SSTRUCTMAXWELLDESTROY)
-                          (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_SStructMaxwellSetup \
         hypre_F90_NAME(fhypre_sstructmaxwellsetup, FHYPRE_SSTRUCTMAXWELLSETUP)
 extern void hypre_F90_NAME(fhypre_sstructmaxwellsetup, FHYPRE_SSTRUCTMAXWELLSETUP)
-                          (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_SStructMaxwellSolve \
         hypre_F90_NAME(fhypre_sstructmaxwellsolve, FHYPRE_SSTRUCTMAXWELLSOLVE)
 extern void hypre_F90_NAME(fhypre_sstructmaxwellsolve, FHYPRE_SSTRUCTMAXWELLSOLVE)
-                          (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_SStructMaxwellSolve2 \
         hypre_F90_NAME(fhypre_sstructmaxwellsolve2, FHYPRE_SSTRUCTMAXWELLSOLVE2)
 extern void hypre_F90_NAME(fhypre_sstructmaxwellsolve2, FHYPRE_SSTRUCTMAXWELLSOLVE2)
-                          (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_MaxwellGrad \
         hypre_F90_NAME(fhypre_maxwellgrad, FHYPRE_MAXWELLGRAD)
 extern void hypre_F90_NAME(fhypre_maxwellgrad, FHYPRE_MAXWELLGRAD)
-                          (hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_SStructMaxwellSetGrad \
         hypre_F90_NAME(fhypre_sstructmaxwellsetgrad, FHYPRE_SSTRUCTMAXWELLSETGRAD)
 extern void hypre_F90_NAME(fhypre_sstructmaxwellsetgrad, FHYPRE_SSTRUCTMAXWELLSETGRAD)
-                          (hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_SStructMaxwellSetRfactors \
         hypre_F90_NAME(fhypre_sstructmaxwellsetrfactor, FHYPRE_SSTRUCTMAXWELLSETRFACTOR)
 extern void hypre_F90_NAME(fhypre_sstructmaxwellsetrfactor, FHYPRE_SSTRUCTMAXWELLSETRFACTOR)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_SStructMaxwellSetTol \
         hypre_F90_NAME(fhypre_sstructmaxwellsettol, FHYPRE_SSTRUCTMAXWELLSETTOL)
 extern void hypre_F90_NAME(fhypre_sstructmaxwellsettol, FHYPRE_SSTRUCTMAXWELLSETTOL)
-                          (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_SStructMaxwellSetConstantCoef \
         hypre_F90_NAME(fhypre_sstructmaxwellsetconstan, FHYPRE_SSTRUCTMAXWELLSETCONSTAN)
 extern void hypre_F90_NAME(fhypre_sstructmaxwellsetconstan, FHYPRE_SSTRUCTMAXWELLSETCONSTAN)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_SStructMaxwellSetMaxIter \
         hypre_F90_NAME(fhypre_sstructmaxwellsetmaxiter, FHYPRE_SSTRUCTMAXWELLSETMAXITER)
 extern void hypre_F90_NAME(fhypre_sstructmaxwellsetmaxiter, FHYPRE_SSTRUCTMAXWELLSETMAXITER)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_SStructMaxwellSetRelChange \
         hypre_F90_NAME(fhypre_sstructmaxwellsetrelchan, FHYPRE_SSTRUCTMAXWELLSETRELCHAN)
 extern void hypre_F90_NAME(fhypre_sstructmaxwellsetrelchan, FHYPRE_SSTRUCTMAXWELLSETRELCHAN)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_SStructMaxwellSetNumPreRelax \
         hypre_F90_NAME(fhypre_sstructmaxwellsetnumprer, FHYPRE_SSTRUCTMAXWELLSETNUMPRER)
 extern void hypre_F90_NAME(fhypre_sstructmaxwellsetnumprer, FHYPRE_SSTRUCTMAXWELLSETNUMPRER)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_SStructMaxwellSetNumPostRelax \
         hypre_F90_NAME(fhypre_sstructmaxwellsetnumpost, FHYPRE_SSTRUCTMAXWELLSETNUMPOST)
 extern void hypre_F90_NAME(fhypre_sstructmaxwellsetnumpost, FHYPRE_SSTRUCTMAXWELLSETNUMPOST)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_SStructMaxwellSetLogging \
         hypre_F90_NAME(fhypre_sstructmaxwellsetlogging, FHYPRE_SSTRUCTMAXWELLSETLOGGING)
 extern void hypre_F90_NAME(fhypre_sstructmaxwellsetlogging, FHYPRE_SSTRUCTMAXWELLSETLOGGING)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_SStructMaxwellSetPrintLevel \
         hypre_F90_NAME(fhypre_sstructmaxwellsetprintle, FHYPRE_SSTRUCTMAXWELLSETPRINTLE)
 extern void hypre_F90_NAME(fhypre_sstructmaxwellsetprintle, FHYPRE_SSTRUCTMAXWELLSETPRINTLE)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_SStructMaxwellPrintLogging \
         hypre_F90_NAME(fhypre_sstructmaxwellprintloggi, FHYPRE_SSTRUCTMAXWELLPRINTLOGGI)
 extern void hypre_F90_NAME(fhypre_sstructmaxwellprintloggi, FHYPRE_SSTRUCTMAXWELLPRINTLOGGI)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_SStructMaxwellGetNumIterations \
-        hypre_F90_NAME(fhypre_sstructmaxwellgetnumiter, FHYPRE_SSTRUCTMAXWELLGETNUMITER) 
-extern void hypre_F90_NAME(fhypre_sstructmaxwellgetnumiter, FHYPRE_SSTRUCTMAXWELLGETNUMITER) 
-                          (hypre_F90_Obj *, HYPRE_Int *);
+        hypre_F90_NAME(fhypre_sstructmaxwellgetnumiter, FHYPRE_SSTRUCTMAXWELLGETNUMITER)
+extern void hypre_F90_NAME(fhypre_sstructmaxwellgetnumiter, FHYPRE_SSTRUCTMAXWELLGETNUMITER)
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_SStructMaxwellGetFinalRelativeResidualNorm \
-        hypre_F90_NAME(fhypre_sstructmaxwellgetfinalre, FHYPRE_SSTRUCTMAXWELLGETFINALRE) 
-extern void hypre_F90_NAME(fhypre_sstructmaxwellgetfinalre, FHYPRE_SSTRUCTMAXWELLGETFINALRE) 
-                          (hypre_F90_Obj *, HYPRE_Real *);
+        hypre_F90_NAME(fhypre_sstructmaxwellgetfinalre, FHYPRE_SSTRUCTMAXWELLGETFINALRE)
+extern void hypre_F90_NAME(fhypre_sstructmaxwellgetfinalre, FHYPRE_SSTRUCTMAXWELLGETFINALRE)
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_SStructMaxwellPhysBdy \
-        hypre_F90_NAME(fhypre_sstructmaxwellphysbdy, FHYPRE_SSTRUCTMAXWELLPHYSBDY) 
-extern void hypre_F90_NAME(fhypre_sstructmaxwellphysbdy, FHYPRE_SSTRUCTMAXWELLPHYSBDY) 
-                          (hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *);
+        hypre_F90_NAME(fhypre_sstructmaxwellphysbdy, FHYPRE_SSTRUCTMAXWELLPHYSBDY)
+extern void hypre_F90_NAME(fhypre_sstructmaxwellphysbdy, FHYPRE_SSTRUCTMAXWELLPHYSBDY)
+(hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *);
 
 #define HYPRE_SStructMaxwellEliminateRowsCols \
-        hypre_F90_NAME(fhypre_sstructmaxwelleliminater, FHYPRE_SSTRUCTMAXWELLELIMINATER) 
-extern void hypre_F90_NAME(fhypre_sstructmaxwelleliminater, FHYPRE_SSTRUCTMAXWELLELIMINATER) 
-                          (hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *);
+        hypre_F90_NAME(fhypre_sstructmaxwelleliminater, FHYPRE_SSTRUCTMAXWELLELIMINATER)
+extern void hypre_F90_NAME(fhypre_sstructmaxwelleliminater, FHYPRE_SSTRUCTMAXWELLELIMINATER)
+(hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *);
 
 #define HYPRE_SStructMaxwellZeroVector \
-        hypre_F90_NAME(fhypre_sstructmaxwellzerovector, FHYPRE_SSTRUCTMAXWELLZEROVECTOR) 
-extern void hypre_F90_NAME(fhypre_sstructmaxwellzerovector, FHYPRE_SSTRUCTMAXWELLZEROVECTOR) 
-                          (hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *);
+        hypre_F90_NAME(fhypre_sstructmaxwellzerovector, FHYPRE_SSTRUCTMAXWELLZEROVECTOR)
+extern void hypre_F90_NAME(fhypre_sstructmaxwellzerovector, FHYPRE_SSTRUCTMAXWELLZEROVECTOR)
+(hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *);
 
 #ifdef __cplusplus
 }
diff --git a/external/hypre/src/test/hypre_struct_fortran_test.h b/external/hypre/src/test/hypre_struct_fortran_test.h
index 099943d8..a23b9cb4 100644
--- a/external/hypre/src/test/hypre_struct_fortran_test.h
+++ b/external/hypre/src/test/hypre_struct_fortran_test.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -16,1007 +16,1007 @@ extern "C" {
 #define HYPRE_StructStencilCreate \
         hypre_F90_NAME(fhypre_structstencilcreate, FHYPRE_STRUCTSTENCILCREATE)
 extern void hypre_F90_NAME(fhypre_structstencilcreate, FHYPRE_STRUCTSTENCILCREATE)
-                          (HYPRE_Int *, HYPRE_Int *, hypre_F90_Obj *);
+(HYPRE_Int *, HYPRE_Int *, hypre_F90_Obj *);
 
 #define HYPRE_StructStencilDestroy \
         hypre_F90_NAME(fhypre_structstencildestroy, FHYPRE_STRUCTSTENCILDESTROY)
 extern void hypre_F90_NAME(fhypre_structstencildestroy, FHYPRE_STRUCTSTENCILDESTROY)
-                          (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_StructStencilSetElement \
         hypre_F90_NAME(fhypre_structstencilsetelement, FHYPRE_STRUCTSTENCILSETELEMENT)
 extern void hypre_F90_NAME(fhypre_structstencilsetelement, FHYPRE_STRUCTSTENCILSETELEMENT)
-                          (hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *);
 
 
 
 #define HYPRE_StructGridCreate \
         hypre_F90_NAME(fhypre_structgridcreate, FHYPRE_STRUCTGRIDCREATE)
 extern void hypre_F90_NAME(fhypre_structgridcreate, FHYPRE_STRUCTGRIDCREATE)
-                          (HYPRE_Int *, HYPRE_Int *, hypre_F90_Obj *);
+(HYPRE_Int *, HYPRE_Int *, hypre_F90_Obj *);
 
 #define HYPRE_StructGridDestroy \
         hypre_F90_NAME(fhypre_structgriddestroy, FHYPRE_STRUCTGRIDDESTROY)
 extern void hypre_F90_NAME(fhypre_structgriddestroy, FHYPRE_STRUCTGRIDDESTROY)
-                          (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_StructGridSetExtents \
         hypre_F90_NAME(fhypre_structgridsetextents, FHYPRE_STRUCTGRIDSETEXTENTS)
 extern void hypre_F90_NAME(fhypre_structgridsetextents, FHYPRE_STRUCTGRIDSETEXTENTS)
-                          (hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *);
 
 #define HYPRE_StructGridSetPeriodic \
         hypre_F90_NAME(fhypre_structgridsetperiodic, FHYPRE_STRUCTGRIDSETPERIODIC)
 extern void hypre_F90_NAME(fhypre_structgridsetperiodic, fhypre_structsetgridperiodic)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructGridAssemble \
         hypre_F90_NAME(fhypre_structgridassemble, FHYPRE_STRUCTGRIDASSEMBLE)
 extern void hypre_F90_NAME(fhypre_structgridassemble, FHYPRE_STRUCTGRIDASSEMBLE)
-                          (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_StructGridSetNumGhost \
         hypre_F90_NAME(fhypre_structgridsetnumghost, FHYPRE_STRUCTGRIDSETNUMGHOST)
 extern void hypre_F90_NAME(fhypre_structgridsetnumghost, fhypre_structsetgridnumghost)
-                          (hypre_F90_Obj *, HYPRE_Int *);
-        
+(hypre_F90_Obj *, HYPRE_Int *);
+
 
 
 #define HYPRE_StructMatrixCreate \
         hypre_F90_NAME(fhypre_structmatrixcreate, FHYPRE_STRUCTMATRIXCREATE)
 extern void hypre_F90_NAME(fhypre_structmatrixcreate, FHYPRE_STRUCTMATRIXCREATE)
-                          (HYPRE_Int *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(HYPRE_Int *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_StructMatrixDestroy \
         hypre_F90_NAME(fhypre_structmatrixdestroy, FHYPRE_STRUCTMATRIXDESTROY)
 extern void hypre_F90_NAME(fhypre_structmatrixdestroy, FHYPRE_STRUCTMATRIXDESTROY)
-                          (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_StructMatrixInitialize \
         hypre_F90_NAME(fhypre_structmatrixinitialize, FHYPRE_STRUCTMATRIXINITIALIZE)
 extern void hypre_F90_NAME(fhypre_structmatrixinitialize, FHYPRE_STRUCTMATRIXINITIALIZE)
-                          (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_StructMatrixSetValues \
         hypre_F90_NAME(fhypre_structmatrixsetvalues, FHYPRE_STRUCTMATRIXSETVALUES)
 extern void hypre_F90_NAME(fhypre_structmatrixsetvalues, FHYPRE_STRUCTMATRIXSETVALUES)
-                          (hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *);
 
 #define HYPRE_StructMatrixSetBoxValues \
         hypre_F90_NAME(fhypre_structmatrixsetboxvalues, FHYPRE_STRUCTMATRIXSETBOXVALUES)
 extern void hypre_F90_NAME(fhypre_structmatrixsetboxvalues, FHYPRE_STRUCTMATRIXSETBOXVALUES)
-                          (hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Real *);
 
 #define HYPRE_StructMatrixGetBoxValues \
         hypre_F90_NAME(fhypre_structmatrixgetboxvalues, FHYPRE_STRUCTMATRIXGETBOXVALUES)
 extern void hypre_F90_NAME(fhypre_structmatrixgetboxvalues, FHYPRE_STRUCTMATRIXGETBOXVALUES)
-                          (hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Real *);
 
 #define HYPRE_StructMatrixSetConstantEntries \
         hypre_F90_NAME(fhypre_structmatrixsetconstante, FHYPRE_STRUCTMATRIXSETCONSTANTE)
 extern void hypre_F90_NAME(fhypre_structmatrixsetconstante, FHYPRE_STRUCTMATRIXSETCONSTANTE)
-                          (hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *);
 
 #define HYPRE_StructMatrixSetConstantValues \
         hypre_F90_NAME(fhypre_structmatrixsetconstantv, FHYPRE_STRUCTMATRIXSETCONSTANTV)
 extern void hypre_F90_NAME(fhypre_structmatrixsetconstantv, FHYPRE_STRUCTMATRIXSETCONSTANTV)
-                          (hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Real *);
 
 #define HYPRE_StructMatrixAddToValues \
         hypre_F90_NAME(fhypre_structmatrixaddtovalues, FHYPRE_STRUCTMATRIXADDTOVALUES)
 extern void hypre_F90_NAME(fhypre_structmatrixaddtovalues, FHYPRE_STRUCTMATRIXADDTOVALUES)
-                          (hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Real *);
 
 #define HYPRE_StructMatrixAddToBoxValues \
         hypre_F90_NAME(fhypre_structmatrixaddtoboxvalues, FHYPRE_STRUCTMATRIXADDTOBOXVALUES)
 extern void hypre_F90_NAME(fhypre_structmatrixaddtoboxvalues, FHYPRE_STRUCTMATRIXADDTOBOXVALUES)
-                          (hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Int *, HYPRE_Real *);
 
 #define HYPRE_StructMatrixAddToConstantValues \
         hypre_F90_NAME(fhypre_structmatrixaddtoconstant, FHYPRE_STRUCTMATRIXADDTOCONSTANT)
 extern void hypre_F90_NAME(fhypre_structmatrixaddtoconstant, FHYPRE_STRUCTMATRIXADDTOCONSTANT)
-                          (hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Real *);
 
 #define HYPRE_StructMatrixAssemble \
         hypre_F90_NAME(fhypre_structmatrixassemble, FHYPRE_STRUCTMATRIXASSEMBLE)
 extern void hypre_F90_NAME(fhypre_structmatrixassemble, FHYPRE_STRUCTMATRIXASSEMBLE)
-                          (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_StructMatrixSetNumGhost \
         hypre_F90_NAME(fhypre_structmatrixsetnumghost, FHYPRE_STRUCTMATRIXSETNUMGHOST)
 extern void hypre_F90_NAME(fhypre_structmatrixsetnumghost, FHYPRE_STRUCTMATRIXSETNUMGHOST)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructMatrixGetGrid \
         hypre_F90_NAME(fhypre_structmatrixgetgrid, FHYPRE_STRUCTMATRIXGETGRID)
 extern void hypre_F90_NAME(fhypre_structmatrixgetgrid, FHYPRE_STRUCTMATRIXGETGRID)
-                          (hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_StructMatrixSetSymmetric \
         hypre_F90_NAME(fhypre_structmatrixsetsymmetric, FHYPRE_STRUCTMATRIXSETSYMMETRIC)
 extern void hypre_F90_NAME(fhypre_structmatrixsetsymmetric, FHYPRE_STRUCTMATRIXSETSYMMETRIC)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructMatrixPrint \
 hypre_F90_NAME(fhypre_structmatrixprint, FHYPRE_STRUCTMATRIXPRINT)
 extern void hypre_F90_NAME(fhypre_structmatrixprint, FHYPRE_STRUCTMATRIXPRINT)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructMatrixMatvec \
 hypre_F90_NAME(fhypre_structmatrixmatvec, FHYPRE_STRUCTMATRIXMATVEC)
 extern void hypre_F90_NAME(fhypre_structmatrixmatvec, FHYPRE_STRUCTMATRIXMATVEC)
-                          (HYPRE_Int *, hypre_F90_Obj *, hypre_F90_Obj *, HYPRE_Int *, hypre_F90_Obj *);
- 
+(HYPRE_Int *, hypre_F90_Obj *, hypre_F90_Obj *, HYPRE_Int *, hypre_F90_Obj *);
+
 
 
 #define HYPRE_StructVectorCreate \
         hypre_F90_NAME(fhypre_structvectorcreate, FHYPRE_STRUCTVECTORCREATE)
 extern void hypre_F90_NAME(fhypre_structvectorcreate, FHYPRE_STRUCTVECTORCREATE)
-                          (HYPRE_Int *, hypre_F90_Obj *, hypre_F90_Obj *);
+(HYPRE_Int *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_StructVectorDestroy \
         hypre_F90_NAME(fhypre_structvectordestroy, FHYPRE_STRUCTVECTORDESTROY)
-extern void hypre_F90_NAME(fhypre_structvectordestroy, FHYPRE_STRUCTVECTORDESTROY) 
-                          (hypre_F90_Obj *);
+extern void hypre_F90_NAME(fhypre_structvectordestroy, FHYPRE_STRUCTVECTORDESTROY)
+(hypre_F90_Obj *);
 
 #define HYPRE_StructVectorInitialize \
         hypre_F90_NAME(fhypre_structvectorinitialize, FHYPRE_STRUCTVECTORINITIALIZE)
 extern void hypre_F90_NAME(fhypre_structvectorinitialize, FHYPRE_STRUCTVECTORINITIALIZE)
-                          (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_StructVectorSetValues \
         hypre_F90_NAME(fhypre_structvectorsetvalues, FHYPRE_STRUCTVECTORSETVALUES)
 extern void hypre_F90_NAME(fhypre_structvectorsetvalues, FHYPRE_STRUCTVECTORSETVALUES)
-                          (hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *);
 
 #define HYPRE_StructVectorSetBoxValues \
         hypre_F90_NAME(fhypre_structvectorsetboxvalues, FHYPRE_STRUCTVECTORSETBOXVALUES)
 extern void hypre_F90_NAME(fhypre_structvectorsetboxvalues, FHYPRE_STRUCTVECTORSETBOXVALUES)
-                          (hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Real *);
 
 #define HYPRE_StructVectorSetConstantValues \
         hypre_F90_NAME(fhypre_structvectorsetconstantv, FHYPRE_STRUCTVECTORSETCONTANTV)
 extern void hypre_F90_NAME(fhypre_structvectorsetconstantv, FHYPRE_STRUCTVECTORSETCONTANTV)
-                          (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_StructVectorAddToValues \
         hypre_F90_NAME(fhypre_structvectoraddtovalues, FHYPRE_STRUCTVECTORADDTOVALUES)
 extern void hypre_F90_NAME(fhypre_structvectoraddtovalues, FHYPRE_STRUCTVECTORADDTOVALUES)
-                          (hypre_F90_Obj *, HYPRE_Int *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Int *, HYPRE_Real *);
 
 #define HYPRE_StructVectorAddToBoxValues \
         hypre_F90_NAME(fhypre_structvectoraddtoboxvalu, FHYPRE_STRUCTVECTORADDTOBOXVALU)
 extern void hypre_F90_NAME(fhypre_structvectoraddtoboxvalu, FHYPRE_STRUCTVECTORADDTOBOXVALU)
-                          (hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Int *, HYPRE_Int *, HYPRE_Real *);
 
 #define HYPRE_StructVectorScaleValues \
         hypre_F90_NAME(fhypre_structvectorscalevalues, FHYPRE_STRUCTVECTORSCALEVALUES)
 extern void hypre_F90_NAME(fhypre_structvectorscalevalues, FHYPRE_STRUCTVECTORSCALEVALUES)
-                          (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_StructVectorGetValues \
         hypre_F90_NAME(fhypre_structvectorgetvalues, FHYPRE_STRUCTVECTORGETVALUES)
 extern void hypre_F90_NAME(fhypre_structvectorgetvalues, FHYPRE_STRUCTVECTORGETVALUES)
-                          (hypre_F90_Obj *, HYPRE_Int *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Int *, HYPRE_Real *);
 
 #define HYPRE_StructVectorGetBoxValues \
         hypre_F90_NAME(fhypre_structvectorgetboxvalues, FHYPRE_STRUCTVECTORGETBOXVALUES)
 extern void hypre_F90_NAME(fhypre_structvectorgetboxvalues, FHYPRE_STRUCTVECTORGETBOXVALUES)
-                          (hypre_F90_Obj *, HYPRE_Int *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Int *, HYPRE_Real *);
 
 #define HYPRE_StructVectorAssemble \
         hypre_F90_NAME(fhypre_structvectorassemble, FHYPRE_STRUCTVECTORASSEMBLE)
 extern void hypre_F90_NAME(fhypre_structvectorassemble, FHYPRE_STRUCTVECTORASSEMBLE)
-                          (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_StructVectorSetNumGhost \
         hypre_F90_NAME(fhypre_structvectorsetnumghost, FHYPRE_STRUCTVECTORSETNUMGHOST)
 extern void hypre_F90_NAME(fhypre_structvectorsetnumghost, FHYPRE_STRUCTVECTORSETNUMGHOST)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructVectorCopy \
         hypre_F90_NAME(fhypre_structvectorcopy, FHYPRE_STRUCTVECTORCOPY)
 extern void hypre_F90_NAME(fhypre_structvectorcopy, FHYPRE_STRUCTVECTORCOPY)
-                          (hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_StructVectorGetMigrateCommPkg \
         hypre_F90_NAME(fhypre_structvectorgetmigrateco, FHYPRE_STRUCTVECTORGETMIGRATECO)
 extern void hypre_F90_NAME(fhypre_structvectorgetmigrateco, FHYPRE_STRUCTVECTORGETMIGRATECO)
-                          (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_StructVectorMigrate \
         hypre_F90_NAME(fhypre_structvectormigrate, FHYPRE_STRUCTVECTORMIGRATE)
 extern void hypre_F90_NAME(fhypre_structvectormigrate, FHYPRE_STRUCTVECTORMIGRATE)
-                          (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_CommPkgDestroy \
         hypre_F90_NAME(fhypre_commpkgdestroy, FHYPRE_COMMPKGDESTROY)
 extern void hypre_F90_NAME(fhypre_commpkgdestroy, FHYPRE_COMMPKGDESTROY)
-                          (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_StructVectorPrint \
         hypre_F90_NAME(fhypre_structvectorprint, FHYPRE_STRUCTVECTORPRINT)
 extern void hypre_F90_NAME(fhypre_structvectorprint, FHYPRE_STRUCTVECTORPRINT)
-                          (hypre_F90_Obj *, HYPRE_Int *);
- 
+(hypre_F90_Obj *, HYPRE_Int *);
+
 
 #define HYPRE_StructBiCGSTABCreate \
         hypre_F90_NAME(fhypre_structbicgstabcreate, FHYPRE_STRUCTBICGSTABCREATE)
 extern void hypre_F90_NAME(fhypre_structbicgstabcreate, FHYPRE_STRUCTBICGSTABCREATE)
-                          (HYPRE_Int *, hypre_F90_Obj *);
+(HYPRE_Int *, hypre_F90_Obj *);
 
 #define HYPRE_StructBiCGSTABDestroy \
         hypre_F90_NAME(fhypre_structbicgstabdestroy, FHYPRE_STRUCTBICGSTABDESTROY)
 extern void hypre_F90_NAME(fhypre_structbicgstabdestroy, FHYPRE_STRUCTBICGSTABDESTROY)
-                          (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_StructBiCGSTABSetup \
         hypre_F90_NAME(fhypre_structbicgstabsetup, FHYPRE_STRUCTBICGSTABSETUP)
 extern void hypre_F90_NAME(fhypre_structbicgstabsetup, FHYPRE_STRUCTBICGSTABSETUP)
-                          (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_StructBiCGSTABSolve \
         hypre_F90_NAME(fhypre_structbicgstabsolve, FHYPRE_STRUCTBICGSTABSOLVE)
 extern void hypre_F90_NAME(fhypre_structbicgstabsolve, FHYPRE_STRUCTBICGSTABSOLVE)
-                          (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_StructBiCGSTABSetTol \
         hypre_F90_NAME(fhypre_structbicgstabsettol, FHYPRE_STRUCTBICGSTABSETTOL)
 extern void hypre_F90_NAME(fhypre_structbicgstabsettol, FHYPRE_STRUCTBICGSTABSETTOL)
-                          (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_StructBiCGSTABSetMaxIter \
         hypre_F90_NAME(fhypre_structbicgstabsetmaxiter, FHYPRE_STRUCTBICGSTABSETMAXITER)
 extern void hypre_F90_NAME(fhypre_structbicgstabsetmaxiter, FHYPRE_STRUCTBICGSTABSETMAXITER)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructBiCGSTABSetPrecond \
         hypre_F90_NAME(fhypre_structbicgstabsetprecond, FHYPRE_STRUCTBICGSTABSETPRECOND)
 extern void hypre_F90_NAME(fhypre_structbicgstabsetprecond, FHYPRE_STRUCTBICGSTABSETPRECOND)
-                          (hypre_F90_Obj *, HYPRE_Int *, hypre_F90_Obj *);
+(hypre_F90_Obj *, HYPRE_Int *, hypre_F90_Obj *);
 
 #define HYPRE_StructBiCGSTABSetLogging \
         hypre_F90_NAME(fhypre_structbicgstabsetlogging, FHYPRE_STRUCTBICGSTABSETLOGGING)
 extern void hypre_F90_NAME(fhypre_structbicgstabsetlogging, FHYPRE_STRUCTBICGSTABSETLOGGING)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructBiCGSTABSetPrintLevel \
         hypre_F90_NAME(fhypre_structbicgstabsetprintle, FHYPRE_STRUCTBICGSTABPRINTLE)
 extern void hypre_F90_NAME(fhypre_structbicgstabsetprintle, FHYPRE_STRUCTBICGSTABPRINTLE)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructBiCGSTABGetNumIterations \
         hypre_F90_NAME(fhypre_structbicgstabgetnumiter, FHYPRE_STRUCTBICGSTABGETNUMITER)
 extern void hypre_F90_NAME(fhypre_structbicgstabgetnumiter, FHYPRE_STRUCTBICGSTABGETNUMITER)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructBiCGSTABGetResidual \
         hypre_F90_NAME(fhypre_structbicgstabgetresidua, FHYPRE_STRUCTBICGSTABGETRESIDUA)
 extern void hypre_F90_NAME(fhypre_structbicgstabgetresidua, FHYPRE_STRUCTBICGSTABGETRESIDUA)
-                          (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_StructBiCGSTABGetFinalRelativeResidualNorm \
         hypre_F90_NAME(fhypre_structbicgstabgetfinalre, FHYPRE_STRUCTBICGSTABGETFINALRE)
 extern void hypre_F90_NAME(fhypre_structbicgstabgetfinalre, FHYPRE_STRUCTBICGSTABGETFINALRE)
-                          (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 
 
 #define HYPRE_StructGMRESCreate \
         hypre_F90_NAME(fhypre_structgmrescreate, FHYPRE_STRUCTGMRESCREATE)
 extern void hypre_F90_NAME(fhypre_structgmrescreate, FHYPRE_STRUCTGMRESCREATE)
-                          (HYPRE_Int *, hypre_F90_Obj *);
+(HYPRE_Int *, hypre_F90_Obj *);
 
 #define HYPRE_StructGMRESDestroy \
         hypre_F90_NAME(fhypre_structgmresdestroy, FHYPRE_STRUCTGMRESDESTROY)
 extern void hypre_F90_NAME(fhypre_structgmresdestroy, FHYPRE_STRUCTGMRESDESTROY)
-                          (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_StructGMRESSetup \
         hypre_F90_NAME(fhypre_structgmressetup, FHYPRE_STRUCTGMRESSETUP)
 extern void hypre_F90_NAME(fhypre_structgmressetup, FHYPRE_STRUCTGMRESSETUP)
-                          (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_StructGMRESSolve \
         hypre_F90_NAME(fhypre_structgmressolve, FHYPRE_STRUCTGMRESSOLVE)
 extern void hypre_F90_NAME(fhypre_structgmressolve, FHYPRE_STRUCTGMRESSOLVE)
-                          (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_StructGMRESSetTol \
         hypre_F90_NAME(fhypre_structgmressettol, FHYPRE_STRUCTGMRESSETTOL)
 extern void hypre_F90_NAME(fhypre_structgmressettol, FHYPRE_STRUCTGMRESSETTOL)
-                          (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_StructGMRESSetMaxIter \
         hypre_F90_NAME(fhypre_structgmressetmaxiter, FHYPRE_STRUCTGMRESSETMAXITER)
 extern void hypre_F90_NAME(fhypre_structgmressetmaxiter, FHYPRE_STRUCTGMRESSETMAXITER)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructGMRESSetPrecond \
         hypre_F90_NAME(fhypre_structgmressetprecond, FHYPRE_STRUCTGMRESSETPRECOND)
 extern void hypre_F90_NAME(fhypre_structgmressetprecond, FHYPRE_STRUCTGMRESSETPRECOND)
-                          (hypre_F90_Obj *, HYPRE_Int *, hypre_F90_Obj *);
+(hypre_F90_Obj *, HYPRE_Int *, hypre_F90_Obj *);
 
 #define HYPRE_StructGMRESSetLogging \
         hypre_F90_NAME(fhypre_structgmressetlogging, FHYPRE_STRUCTGMRESSETLOGGING)
 extern void hypre_F90_NAME(fhypre_structgmressetlogging, FHYPRE_STRUCTGMRESSETLOGGING)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructGMRESSetPrintLevel \
         hypre_F90_NAME(fhypre_structgmressetprintlevel, FHYPRE_STRUCTGMRESPRINTLEVEL)
 extern void hypre_F90_NAME(fhypre_structgmressetprintlevel, FHYPRE_STRUCTGMRESPRINTLEVEL)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructGMRESGetNumIterations \
         hypre_F90_NAME(fhypre_structgmresgetnumiterati, FHYPRE_STRUCTGMRESGETNUMITERATI)
 extern void hypre_F90_NAME(fhypre_structgmresgetnumiterati, FHYPRE_STRUCTGMRESGETNUMITERATI)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructGMRESGetFinalRelativeResidualNorm \
         hypre_F90_NAME(fhypre_structgmresgetfinalrelat, FHYPRE_STRUCTGMRESGETFINALRELAT)
 extern void hypre_F90_NAME(fhypre_structgmresgetfinalrelat, FHYPRE_STRUCTGMRESGETFINALRELAT)
-                          (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 
 
 #define HYPRE_StructHybridCreate \
         hypre_F90_NAME(fhypre_structhybridcreate, FHYPRE_STRUCTHYBRIDCREATE)
 extern void hypre_F90_NAME(fhypre_structhybridcreate, FHYPRE_STRUCTHYBRIDCREATE)
-                          (HYPRE_Int *, hypre_F90_Obj *);
+(HYPRE_Int *, hypre_F90_Obj *);
 
 #define HYPRE_StructHybridDestroy \
         hypre_F90_NAME(fhypre_structhybriddestroy, FHYPRE_STRUCTHYBRIDDESTROY)
 extern void hypre_F90_NAME(fhypre_structhybriddestroy, FHYPRE_STRUCTHYBRIDDESTROY)
-                          (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_StructHybridSetup \
         hypre_F90_NAME(fhypre_structhybridsetup, FHYPRE_STRUCTHYBRIDSETUP)
 extern void hypre_F90_NAME(fhypre_structhybridsetup, FHYPRE_STRUCTHYBRIDSETUP)
-                          (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_StructHybridSolve \
         hypre_F90_NAME(fhypre_structhybridsolve, FHYPRE_STRUCTHYBRIDSOLVE)
 extern void hypre_F90_NAME(fhypre_structhybridsolve, FHYPRE_STRUCTHYBRIDSOLVE)
-                          (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_StructHybridSetSolverType \
         hypre_F90_NAME(fhypre_structhybridsetsolvertyp, FHYPRE_STRUCTHYBRIDSETSOLVERTYP)
 extern void hypre_F90_NAME(fhypre_structhybridsetsolvertyp, FHYPRE_STRUCTHYBRIDSETSOLVERTYP)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructHybridSetStopCrit \
         hypre_F90_NAME(fhypre_structhybridsetstopcrit, FHYPRE_STRUCTHYBRIDSETSTOPCRIT)
 extern void hypre_F90_NAME(fhypre_structhybridsetstopcrit, FHYPRE_STRUCTHYBRIDSETSTOPCRIT)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructHybridSetKDim \
         hypre_F90_NAME(fhypre_structhybridsetkdim, FHYPRE_STRUCTHYBRIDSETKDIM)
 extern void hypre_F90_NAME(fhypre_structhybridsetkdim, FHYPRE_STRUCTHYBRIDSETKDIM)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructHybridSetTol \
         hypre_F90_NAME(fhypre_structhybridsettol, FHYPRE_STRUCTHYBRIDSETTOL)
 extern void hypre_F90_NAME(fhypre_structhybridsettol, FHYPRE_STRUCTHYBRIDSETTOL)
-                          (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_StructHybridSetConvergenceTol \
         hypre_F90_NAME(fhypre_structhybridsetconvergen, FHYPRE_STRUCTHYBRIDSETCONVERGEN)
 extern void hypre_F90_NAME(fhypre_structhybridsetconvergen, FHYPRE_STRUCTHYBRIDSETCONVERGEN)
-                          (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_StructHybridSetPCGAbsoluteTolFactor \
         hypre_F90_NAME(fhypre_structhybridsetpcgabsolu, FHYPRE_STRUCTHYBRIDSETABSOLU)
 extern void hypre_F90_NAME(fhypre_structhybridsetpcgabsolu, FHYPRE_STRUCTHYBRIDSETABSOLU)
-                          (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_StructHybridSetMaxIter \
         hypre_F90_NAME(fhypre_structhybridsetmaxiter, FHYPRE_STRUCTHYBRIDSETMAXITER)
 extern void hypre_F90_NAME(fhypre_structhybridsetmaxiter, FHYPRE_STRUCTHYBRIDSETMAXITER)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructHybridSetDSCGMaxIter \
         hypre_F90_NAME(fhypre_structhybridsetdscgmaxit, FHYPRE_STRUCTHYBRIDSETDSCGMAXIT)
 extern void hypre_F90_NAME(fhypre_structhybridsetdscgmaxit, FHYPRE_STRUCTHYBRIDSETDSCGMAXIT)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructHybridSetPCGMaxIter \
         hypre_F90_NAME(fhypre_structhybridsetpcgmaxite, FHYPRE_STRUCTHYBRIDSETPCGMAXITE)
 extern void hypre_F90_NAME(fhypre_structhybridsetpcgmaxite, FHYPRE_STRUCTHYBRIDSETPCGMAXITE)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructHybridSetTwoNorm \
         hypre_F90_NAME(fhypre_structhybridsettwonorm, FHYPRE_STRUCTHYBRIDSETTWONORM)
 extern void hypre_F90_NAME(fhypre_structhybridsettwonorm, FHYPRE_STRUCTHYBRIDSETTWONORM)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructHybridSetRelChange \
         hypre_F90_NAME(fhypre_structhybridsetrelchange, FHYPRE_STRUCTHYBRIDSETRELCHANGE)
 extern void hypre_F90_NAME(fhypre_structhybridsetrelchange, FHYPRE_STRUCTHYBRIDSETRELCHANGE)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructHybridSetPrecond \
         hypre_F90_NAME(fhypre_structhybridsetprecond, FHYPRE_STRUCTHYBRIDSETPRECOND)
-extern void hypre_F90_NAME(fhypre_structhybridsetprecond, FHYPRE_STRUCTHYBRIDSETPRECOND) 
-                          (hypre_F90_Obj *, HYPRE_Int *, hypre_F90_Obj *);
+extern void hypre_F90_NAME(fhypre_structhybridsetprecond, FHYPRE_STRUCTHYBRIDSETPRECOND)
+(hypre_F90_Obj *, HYPRE_Int *, hypre_F90_Obj *);
 
 #define HYPRE_StructHybridSetLogging \
         hypre_F90_NAME(fhypre_structhybridsetlogging, FHYPRE_STRUCTHYBRIDSETLOGGING)
 extern void hypre_F90_NAME(fhypre_structhybridsetlogging, FHYPRE_STRUCTHYBRIDSETLOGGING)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructHybridSetPrintLevel \
         hypre_F90_NAME(fhypre_structhybridsetprintleve, FHYPRE_STRUCTHYBRIDSETPRINTLEVE)
 extern void hypre_F90_NAME(fhypre_structhybridsetprintleve, FHYPRE_STRUCTHYBRIDSETPRINTLEVE)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructHybridGetNumIterations \
         hypre_F90_NAME(fhypre_structhybridgetnumiterat, FHYPRE_STRUCTHYBRIDGETNUMITERAT)
 extern void hypre_F90_NAME(fhypre_structhybridgetnumiterat, FHYPRE_STRUCTHYBRIDGETNUMITERAT)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructHybridGetDSCGNumIterations \
         hypre_F90_NAME(fhypre_structhybridgetdscgnumit, FHYPRE_STRUCTHYBRIDGETDSCGNUMIT)
 extern void hypre_F90_NAME(fhypre_structhybridgetdscgnumit, FHYPRE_STRUCTHYBRIDGETDSCGNUMIT)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructHybridGetPCGNumIterations \
         hypre_F90_NAME(fhypre_structhybridgetpcgnumite, FHYPRE_STRUCTHYBRIDGETPCGNUMITE)
 extern void hypre_F90_NAME(fhypre_structhybridgetpcgnumite, FHYPRE_STRUCTHYBRIDGETPCGNUMITE)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructHybridGetFinalRelativeResidualNorm \
         hypre_F90_NAME(fhypre_structhybridgetfinalrela, FHYPRE_STRUCTHYBRIDGETFINALRELA)
 extern void hypre_F90_NAME(fhypre_structhybridgetfinalrela, FHYPRE_STRUCTHYBRIDGETFINALRELA)
-                          (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 
 
 #define HYPRE_StructVectorSetRandomValues \
         hypre_F90_NAME(fhypre_structvectorsetrandomvalu, FHYPRE_STRUCTVECTORSETRANDOMVALU)
 extern void hypre_F90_NAME(fhypre_structvectorsetrandomvalu, FHYPRE_STRUCTVECTORSETRANDOMVALU)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructSetRandomValues \
         hypre_F90_NAME(fhypre_structsetrandomvalues, FHYPRE_STRUCTSETRANDOMVALUES)
 extern void hypre_F90_NAME(fhypre_structsetrandomvalues, FHYPRE_STRUCTSETRANDOMVALUES)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructSetupInterpreter \
         hypre_F90_NAME(fhypre_structsetupinterpreter, FHYPRE_STRUCTSETUPINTERPRETER)
 extern void hypre_F90_NAME(fhypre_structsetupinterpreter, FHYPRE_STRUCTSETUPINTERPRETER)
-                          (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_StructSetupMatvec \
         hypre_F90_NAME(fhypre_structsetupmatvec, FHYPRE_STRUCTSETUPMATVEC)
 extern void hypre_F90_NAME(fhypre_structsetupmatvec, FHYPRE_STRUCTSETUPMATVEC)
-                          (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 
 
 #define HYPRE_StructJacobiCreate \
         hypre_F90_NAME(fhypre_structjacobicreate, FHYPRE_STRUCTJACOBICREATE)
 extern void hypre_F90_NAME(fhypre_structjacobicreate, FHYPRE_STRUCTJACOBICREATE)
-                          (HYPRE_Int *, hypre_F90_Obj *);
+(HYPRE_Int *, hypre_F90_Obj *);
 
 #define HYPRE_StructJacobiDestroy \
         hypre_F90_NAME(fhypre_structjacobidestroy, FHYPRE_STRUCTJACOBIDESTROY)
 extern void hypre_F90_NAME(fhypre_structjacobidestroy, FHYPRE_STRUCTJACOBIDESTROY)
-                          (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_StructJacobiSetup \
         hypre_F90_NAME(fhypre_structjacobisetup, FHYPRE_STRUCTJACOBISETUP)
 extern void hypre_F90_NAME(fhypre_structjacobisetup, FHYPRE_STRUCTJACOBISETUP)
-                          (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_StructJacobiSolve \
         hypre_F90_NAME(fhypre_structjacobisolve, FHYPRE_STRUCTJACOBISOLVE)
 extern void hypre_F90_NAME(fhypre_structjacobisolve, FHYPRE_STRUCTJACOBISOLVE)
-                          (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_StructJacobiSetTol \
         hypre_F90_NAME(fhypre_structjacobisettol, FHYPRE_STRUCTJACOBISETTOL)
 extern void hypre_F90_NAME(fhypre_structjacobisettol, FHYPRE_STRUCTJACOBISETTOL)
-                          (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_StructJacobiGetTol \
         hypre_F90_NAME(fhypre_structjacobigettol, FHYPRE_STRUCTJACOBIGETTOL)
 extern void hypre_F90_NAME(fhypre_structjacobigettol, FHYPRE_STRUCTJACOBIGETTOL)
-                          (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_StructJacobiSetMaxIter \
         hypre_F90_NAME(fhypre_structjacobisetmaxiter, FHYPRE_STRUCTJACOBISETTOL)
 extern void hypre_F90_NAME(fhypre_structjacobisetmaxiter, FHYPRE_STRUCTJACOBISETTOL)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructJacobiGetMaxIter \
         hypre_F90_NAME(fhypre_structjacobigetmaxiter, FHYPRE_STRUCTJACOBIGETTOL)
 extern void hypre_F90_NAME(fhypre_structjacobigetmaxiter, FHYPRE_STRUCTJACOBIGETTOL)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructJacobiSetZeroGuess \
         hypre_F90_NAME(fhypre_structjacobisetzeroguess, FHYPRE_STRUCTJACOBISETZEROGUESS)
 extern void hypre_F90_NAME(fhypre_structjacobisetzeroguess, FHYPRE_STRUCTJACOBISETZEROGUESS)
-                          (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_StructJacobiGetZeroGuess \
         hypre_F90_NAME(fhypre_structjacobigetzeroguess, FHYPRE_STRUCTJACOBIGETZEROGUESS)
 extern void hypre_F90_NAME(fhypre_structjacobigetzeroguess, FHYPRE_STRUCTJACOBIGETZEROGUESS)
-                          (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_StructJacobiSetNonZeroGuess \
         hypre_F90_NAME(fhypre_structjacobisetnonzerogu, FHYPRE_STRUCTJACOBISETNONZEROGU)
 extern void hypre_F90_NAME(fhypre_structjacobisetnonzerogu, FHYPRE_STRUCTJACOBISETNONZEROGU)
-                          (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_StructJacobiGetNumIterations \
         hypre_F90_NAME(fhypre_structjacobigetnumiterati, FHYPRE_STRUCTJACOBIGETNUMITERATI)
 extern void hypre_F90_NAME(fhypre_structjacobigetnumiterati, FHYPRE_STRUCTJACOBIGETNUMITERATI)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructJacobiGetFinalRelativeResidualNorm \
         hypre_F90_NAME(fhypre_structjacobigetfinalrela, FHYPRE_STRUCTJACOBIGETFINALRELA)
 extern void hypre_F90_NAME(fhypre_structjacobigetfinalrela, FHYPRE_STRUCTJACOBIGETFINALRELA)
-                          (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 
 
 #define HYPRE_StructPCGCreate \
         hypre_F90_NAME(fhypre_structpcgcreate, FHYPRE_STRUCTPCGCREATE)
 extern void hypre_F90_NAME(fhypre_structpcgcreate, FHYPRE_STRUCTPCGCREATE)
-                          (HYPRE_Int *, hypre_F90_Obj *);
+(HYPRE_Int *, hypre_F90_Obj *);
 
 #define HYPRE_StructPCGDestroy \
         hypre_F90_NAME(fhypre_structpcgdestroy, FHYPRE_STRUCTPCGDESTROY)
 extern void hypre_F90_NAME(fhypre_structpcgdestroy, FHYPRE_STRUCTPCGDESTROY)
-                          (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_StructPCGSetup \
         hypre_F90_NAME(fhypre_structpcgsetup, FHYPRE_STRUCTPCGSETUP)
-extern void hypre_F90_NAME(fhypre_structpcgsetup, FHYPRE_STRUCTPCGSETUP) 
-                          (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+extern void hypre_F90_NAME(fhypre_structpcgsetup, FHYPRE_STRUCTPCGSETUP)
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_StructPCGSolve \
         hypre_F90_NAME(fhypre_structpcgsolve, FHYPRE_STRUCTPCGSOLVE)
 extern void hypre_F90_NAME(fhypre_structpcgsolve, FHYPRE_STRUCTPCGSOLVE)
-                          (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_StructPCGSetTol \
         hypre_F90_NAME(fhypre_structpcgsettol, FHYPRE_STRUCTPCGSETTOL)
 extern void hypre_F90_NAME(fhypre_structpcgsettol, FHYPRE_STRUCTPCGSETTOL)
-                          (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_StructPCGSetMaxIter \
         hypre_F90_NAME(fhypre_structpcgsetmaxiter, FHYPRE_STRUCTPCGSETMAXITER)
 extern void hypre_F90_NAME(fhypre_structpcgsetmaxiter, FHYPRE_STRUCTPCGSETMAXITER)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructPCGSetTwoNorm \
         hypre_F90_NAME(fhypre_structpcgsettwonorm, FHYRPE_STRUCTPCGSETTWONORM)
 extern void hypre_F90_NAME(fhypre_structpcgsettwonorm, FHYRPE_STRUCTPCGSETTWONORM)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructPCGSetRelChange \
         hypre_F90_NAME(fhypre_structpcgsetrelchange, FHYPRE_STRUCTPCGSETRELCHANGE)
 extern void hypre_F90_NAME(fhypre_structpcgsetrelchange, FHYPRE_STRUCTPCGSETRELCHANGE)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructPCGSetPrecond \
         hypre_F90_NAME(fhypre_structpcgsetprecond, FHYPRE_STRUCTPCGSETPRECOND)
 extern void hypre_F90_NAME(fhypre_structpcgsetprecond, FHYPRE_STRUCTPCGSETPRECOND)
-                          (hypre_F90_Obj *, HYPRE_Int *, hypre_F90_Obj *);
+(hypre_F90_Obj *, HYPRE_Int *, hypre_F90_Obj *);
 
 #define HYPRE_StructPCGSetLogging \
         hypre_F90_NAME(fhypre_structpcgsetlogging, FHYPRES_TRUCTPCFSETLOGGING)
 extern void hypre_F90_NAME(fhypre_structpcgsetlogging, FHYPRES_TRUCTPCFSETLOGGING)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructPCGSetPrintLevel \
         hypre_F90_NAME(fhypre_structpcgsetprintlevel, FHYPRE_STRUCTPCGSETPRINTLEVEL)
 extern void hypre_F90_NAME(fhypre_structpcgsetprintlevel, FHYPRE_STRUCTPCGSETPRINTLEVEL)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructPCGGetNumIterations \
         hypre_F90_NAME(fhypre_structpcggetnumiteration, FHYPRE_STRUCTPCGGETNUMITERATION)
 extern void hypre_F90_NAME(fhypre_structpcggetnumiteration, FHYPRE_STRUCTPCGGETNUMITERATION)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructPCGGetFinalRelativeResidualNorm \
         hypre_F90_NAME(fhypre_structpcggetfinalrelativ, FHYPRE_STRUCTPCGGETFINALRELATIV)
 extern void hypre_F90_NAME(fhypre_structpcggetfinalrelativ, FHYPRE_STRUCTPCGGETFINALRELATIV)
-                          (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 
 
 #define HYPRE_StructDiagScaleSetup \
         hypre_F90_NAME(fhypre_structdiagscalesetup, FHYPRE_STRUCTDIAGSCALESETUP)
 extern void hypre_F90_NAME(fhypre_structdiagscalesetup, FHYPRE_STRUCTDIAGSCALESETUP)
-                          (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_StructDiagScaleSolve \
         hypre_F90_NAME(fhypre_structdiagscalesolve, FHYPRE_STRUCTDIAGSCALESOLVE)
 extern void hypre_F90_NAME(fhypre_structdiagscalesolve, FHYPRE_STRUCTDIAGSCALESOLVE)
-                          (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 
 
 #define HYPRE_StructPFMGCreate \
         hypre_F90_NAME(fhypre_structpfmgcreate, FHYPRE_STRUCTPFMGCREATE)
 extern void hypre_F90_NAME(fhypre_structpfmgcreate, FHYPRE_STRUCTPFMGCREATE)
-                          (HYPRE_Int *, hypre_F90_Obj *);
+(HYPRE_Int *, hypre_F90_Obj *);
 
 #define HYPRE_StructPFMGDestroy \
         hypre_F90_NAME(fhypre_structpfmgdestroy, FHYPRE_STRUCTPFMGDESTROY)
 extern void hypre_F90_NAME(fhypre_structpfmgdestroy, FHYPRE_STRUCTPFMGDESTROY)
-                          (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_StructPFMGSetup \
         hypre_F90_NAME(fhypre_structpfmgsetup, FHYPRE_STRUCTPFMGSETUP)
 extern void hypre_F90_NAME(fhypre_structpfmgsetup, FHYPRE_STRUCTPFMGSETUP)
-                          (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_StructPFMGSolve \
         hypre_F90_NAME(fhypre_structpfmgsolve, FHYPRE_STRUCTPFMGSOLVE)
 extern void hypre_F90_NAME(fhypre_structpfmgsolve, FHYPRE_STRUCTPFMGSOLVE)
-                          (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_StructPFMGSetTol \
         hypre_F90_NAME(fhypre_structpfmgsettol, FHYPRE_STRUCTPFMGSETTOL)
 extern void hypre_F90_NAME(fhypre_structpfmgsettol, FHYPRE_STRUCTPFMGSETTOL)
-                          (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_StructPFMGGetTol \
         hypre_F90_NAME(fhypre_structpfmggettol, FHYPRE_STRUCTPFMGGETTOL)
 extern void hypre_F90_NAME(fhypre_structpfmggettol, FHYPRE_STRUCTPFMGGETTOL)
-                          (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_StructPFMGSetMaxIter \
         hypre_F90_NAME(fhypre_structpfmgsetmaxiter, FHYPRE_STRUCTPFMGSETMAXITER)
 extern void hypre_F90_NAME(fhypre_structpfmgsetmaxiter, FHYPRE_STRUCTPFMGSETMAXITER)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructPFMGGetMaxIter \
         hypre_F90_NAME(fhypre_structpfmggetmaxiter, FHYPRE_STRUCTPFMGGETMAXITER)
 extern void hypre_F90_NAME(fhypre_structpfmggetmaxiter, FHYPRE_STRUCTPFMGGETMAXITER)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructPFMGSetMaxLevels \
         hypre_F90_NAME(fhypre_structpfmgsetmaxlevels, FHYPRE_STRUCTPFMGSETMAXLEVELS)
 extern void hypre_F90_NAME(fhypre_structpfmgsetmaxlevels, FHYPRE_STRUCTPFMGSETMAXLEVELS)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructPFMGGetMaxLevels \
         hypre_F90_NAME(fhypre_structpfmggetmaxlevels, FHYPRE_STRUCTPFMGGETMAXLEVELS)
 extern void hypre_F90_NAME(fhypre_structpfmggetmaxlevels, FHYPRE_STRUCTPFMGGETMAXLEVELS)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructPFMGSetRelChange \
         hypre_F90_NAME(fhypre_structpfmgsetrelchange, FHYPRE_STRUCTPFMGSETRELCHANGE)
 extern void hypre_F90_NAME(fhypre_structpfmgsetrelchange, FHYPRE_STRUCTPFMGSETRELCHANGE)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructPFMGGetRelChange \
         hypre_F90_NAME(fhypre_structpfmggetrelchange, FHYPRE_STRUCTPFMGGETRELCHANGE)
 extern void hypre_F90_NAME(fhypre_structpfmggetrelchange, FHYPRE_STRUCTPFMGGETRELCHANGE)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructPFMGSetZeroGuess \
         hypre_F90_NAME(fhypre_structpfmgsetzeroguess, FHYPRE_STRUCTPFMGSETZEROGUESS)
 extern void hypre_F90_NAME(fhypre_structpfmgsetzeroguess, FHYPRE_STRUCTPFMGSETZEROGUESS)
-                          (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_StructPFMGGetZeroGuess \
         hypre_F90_NAME(fhypre_structpfmggetzeroguess, FHYPRE_STRUCTPFMGGETZEROGUESS)
 extern void hypre_F90_NAME(fhypre_structpfmggetzeroguess, FHYPRE_STRUCTPFMGGETZEROGUESS)
-                          (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_StructPFMGSetNonZeroGuess \
         hypre_F90_NAME(fhypre_structpfmgsetnonzerogues, FHYPRES_TRUCTPFMGSETNONZEROGUES)
 extern void hypre_F90_NAME(fhypre_structpfmgsetnonzerogues, FHYPRES_TRUCTPFMGSETNONZEROGUES)
-                          (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_StructPFMGSetSkipRelax \
         hypre_F90_NAME(fhypre_structpfmgsetskiprelax, FHYPRE_STRUCTPFMGSETSKIPRELAX)
 extern void hypre_F90_NAME(fhypre_structpfmgsetskiprelax, FHYPRE_STRUCTPFMGSETSKIPRELAX)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructPFMGGetSkipRelax \
         hypre_F90_NAME(fhypre_structpfmggetskiprelax, FHYPRE_STRUCTPFMGGETSKIPRELAX)
 extern void hypre_F90_NAME(fhypre_structpfmggetskiprelax, FHYPRE_STRUCTPFMGGETSKIPRELAX)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructPFMGSetRelaxType \
         hypre_F90_NAME(fhypre_structpfmgsetrelaxtype, FHYPRE_STRUCTPFMGSETRELAXTYPE)
 extern void hypre_F90_NAME(fhypre_structpfmgsetrelaxtype, FHYPRE_STRUCTPFMGSETRELAXTYPE)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructPFMGGetRelaxType \
         hypre_F90_NAME(fhypre_structpfmggetrelaxtype, FHYPRE_STRUCTPFMGGETRELAXTYPE)
 extern void hypre_F90_NAME(fhypre_structpfmggetrelaxtype, FHYPRE_STRUCTPFMGGETRELAXTYPE)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructPFMGSetRAPType \
         hypre_F90_NAME(fhypre_structpfmgsetraptype, FHYPRE_STRUCTPFMGSETRAPTYPE)
 extern void hypre_F90_NAME(fhypre_structpfmgsetraptype, FHYPRE_STRUCTPFMGSETRAPTYPE)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructPFMGGetRAPType \
         hypre_F90_NAME(fhypre_structpfmggetraptype, FHYPRE_STRUCTPFMGGETRAPTYPE)
 extern void hypre_F90_NAME(fhypre_structpfmggetraptype, FHYPRE_STRUCTPFMGGETRAPTYPE)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructPFMGSetNumPreRelax \
         hypre_F90_NAME(fhypre_structpfmgsetnumprerelax, FHYPRE_STRUCTPFMGSETNUMPRERELAX)
 extern void hypre_F90_NAME(fhypre_structpfmgsetnumprerelax, FHYPRE_STRUCTPFMGSETNUMPRERELAX)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructPFMGGetNumPreRelax \
         hypre_F90_NAME(fhypre_structpfmggetnumprerelax, FHYPRE_STRUCTPFMGGETNUMPRERELAX)
 extern void hypre_F90_NAME(fhypre_structpfmggetnumprerelax, FHYPRE_STRUCTPFMGGETNUMPRERELAX)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructPFMGSetNumPostRelax \
         hypre_F90_NAME(fhypre_structpfmgsetnumpostrela, FHYPRE_STRUCTPFMGSETNUMPOSTRELA)
 extern void hypre_F90_NAME(fhypre_structpfmgsetnumpostrela, FHYPRE_STRUCTPFMGSETNUMPOSTRELA)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructPFMGGetNumPostRelax \
         hypre_F90_NAME(fhypre_structpfmggetnumpostrela, FHYPRE_STRUCTPFMGGETNUMPOSTRELA)
 extern void hypre_F90_NAME(fhypre_structpfmggetnumpostrela, FHYPRE_STRUCTPFMGGETNUMPOSTRELA)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructPFMGSetDxyz \
         hypre_F90_NAME(fhypre_structpfmgsetdxyz, FHYPRE_STRUCTPFMGSETDXYZ)
 extern void hypre_F90_NAME(fhypre_structpfmgsetdxyz, FHYPRE_STRUCTPFMGSETDXYZ)
-                          (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_StructPFMGSetLogging \
         hypre_F90_NAME(fhypre_structpfmgsetlogging, FHYPRE_STRUCTPFMGSETLOGGING)
 extern void hypre_F90_NAME(fhypre_structpfmgsetlogging, FHYPRE_STRUCTPFMGSETLOGGING)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructPFMGGetLogging \
         hypre_F90_NAME(fhypre_structpfmggetlogging, FHYPRE_STRUCTPFMGGETLOGGING)
 extern void hypre_F90_NAME(fhypre_structpfmggetlogging, FHYPRE_STRUCTPFMGGETLOGGING)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructPFMGSetPrintLevel \
         hypre_F90_NAME(fhypre_structpfmgsetprintlevel, FHYPRE_STRUCTPFMGSETPRINTLEVEL)
 extern void hypre_F90_NAME(fhypre_structpfmgsetprintlevel, FHYPRE_STRUCTPFMGSETPRINTLEVEL)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructPFMGGetPrintLevel \
         hypre_F90_NAME(fhypre_structpfmggetprintlevel, FHYPRE_STRUCTPFMGGETPRINTLEVEL)
 extern void hypre_F90_NAME(fhypre_structpfmggetprintlevel, FHYPRE_STRUCTPFMGGETPRINTLEVEL)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructPFMGGetNumIterations \
         hypre_F90_NAME(fhypre_structpfmggetnumiteratio, FHYPRE_STRUCTPFMGGETNUMITERATIO)
 extern void hypre_F90_NAME(fhypre_structpfmggetnumiteratio, FHYPRE_STRUCTPFMGGETNUMITERATIO)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructPFMGGetFinalRelativeResidualNorm \
         hypre_F90_NAME(fhypre_structpfmggetfinalrelati, FHYPRE_STRUCTPFMGGETFINALRELATI)
 extern void hypre_F90_NAME(fhypre_structpfmggetfinalrelati, FHYPRE_STRUCTPFMGGETFINALRELATI)
-                          (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 
 
 #define HYPRE_StructSMGCreate \
         hypre_F90_NAME(fhypre_structsmgcreate, FHYPRE_STRUCTSMGCREATE)
 extern void hypre_F90_NAME(fhypre_structsmgcreate, FHYPRE_STRUCTSMGCREATE)
-                          (HYPRE_Int *, hypre_F90_Obj *);
+(HYPRE_Int *, hypre_F90_Obj *);
 
 #define HYPRE_StructSMGDestroy \
         hypre_F90_NAME(fhypre_structsmgdestroy, FHYPRE_STRUCTSMGDESTROY)
 extern void hypre_F90_NAME(fhypre_structsmgdestroy, FHYPRE_STRUCTSMGDESTROY)
-                          (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_StructSMGSetup \
         hypre_F90_NAME(fhypre_structsmgsetup, FHYPRE_STRUCTSMGSETUP)
 extern void hypre_F90_NAME(fhypre_structsmgsetup, FHYPRE_STRUCTSMGSETUP)
-                          (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_StructSMGSolve \
         hypre_F90_NAME(fhypre_structsmgsolve, FHYPRE_STRUCTSMGSOLVE)
 extern void hypre_F90_NAME(fhypre_structsmgsolve, FHYPRE_STRUCTSMGSOLVE)
-                          (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_StructSMGSetMemoryUse \
         hypre_F90_NAME(fhypre_structsmgsetmemoryuse, FHYPRE_STRUCTSMGSETMEMORYUSE)
 extern void hypre_F90_NAME(fhypre_structsmgsetmemoryuse, FHYPRE_STRUCTSMGSETMEMORYUSE)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructSMGGetMemoryUse \
         hypre_F90_NAME(fhypre_structsmggetmemoryuse, FHYPRE_STRUCTSMGGETMEMORYUSE)
 extern void hypre_F90_NAME(fhypre_structsmggetmemoryuse, FHYPRE_STRUCTSMGGETMEMORYUSE)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructSMGSetTol \
         hypre_F90_NAME(fhypre_structsmgsettol, FHYPRE_STRUCTSMGSETTOL)
 extern void hypre_F90_NAME(fhypre_structsmgsettol, FHYPRE_STRUCTSMGSETTOL)
-                          (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_StructSMGGetTol \
         hypre_F90_NAME(fhypre_structsmggettol, FHYPRE_STRUCTSMGGETTOL)
 extern void hypre_F90_NAME(fhypre_structsmggettol, FHYPRE_STRUCTSMGGETTOL)
-                          (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_StructSMGSetMaxIter \
         hypre_F90_NAME(fhypre_structsmgsetmaxiter, FHYPRE_STRUCTSMGSETMAXTITER)
 extern void hypre_F90_NAME(fhypre_structsmgsetmaxiter, FHYPRE_STRUCTSMGSETMAXTITER)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructSMGGetMaxIter \
         hypre_F90_NAME(fhypre_structsmggetmaxiter, FHYPRE_STRUCTSMGGETMAXTITER)
 extern void hypre_F90_NAME(fhypre_structsmggetmaxiter, FHYPRE_STRUCTSMGGETMAXTITER)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructSMGSetRelChange \
         hypre_F90_NAME(fhypre_structsmgsetrelchange, FHYPRE_STRUCTSMGSETRELCHANGE)
 extern void hypre_F90_NAME(fhypre_structsmgsetrelchange, FHYPRE_STRUCTSMGSETRELCHANGE)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructSMGGetRelChange \
         hypre_F90_NAME(fhypre_structsmggetrelchange, FHYPRE_STRUCTSMGGETRELCHANGE)
 extern void hypre_F90_NAME(fhypre_structsmggetrelchange, FHYPRE_STRUCTSMGGETRELCHANGE)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructSMGSetZeroGuess \
         hypre_F90_NAME(fhypre_structsmgsetzeroguess, FHYPRE_STRUCTSMGSETZEROGUESS)
 extern void hypre_F90_NAME(fhypre_structsmgsetzeroguess, FHYPRE_STRUCTSMGSETZEROGUESS)
-                          (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_StructSMGGetZeroGuess \
         hypre_F90_NAME(fhypre_structsmggetzeroguess, FHYPRE_STRUCTSMGGETZEROGUESS)
 extern void hypre_F90_NAME(fhypre_structsmggetzeroguess, FHYPRE_STRUCTSMGGETZEROGUESS)
-                          (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_StructSMGSetNonZeroGuess \
         hypre_F90_NAME(fhypre_structsmgsetnonzerogues, FHYPRE_STRUCTSMGSETNONZEROGUES)
 extern void hypre_F90_NAME(fhypre_structsmgsetnonzerogues, FHYPRE_STRUCTSMGSETNONZEROGUES)
-                          (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_StructSMGGetNumIterations \
         hypre_F90_NAME(fhypre_structsmggetnumiteration, FHYPRE_STRUCTSMGGETNUMITERATION)
 extern void hypre_F90_NAME(fhypre_structsmggetnumiteration, FHYPRE_STRUCTSMGGETNUMITERATION)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructSMGGetFinalRelativeResidualNorm \
         hypre_F90_NAME(fhypre_structsmggetfinalrelativ, FHYPRE_STRUCTSMGGETFINALRELATIV)
 extern void hypre_F90_NAME(fhypre_structsmggetfinalrelativ, FHYPRE_STRUCTSMGGETFINALRELATIV)
-                          (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_StructSMGSetNumPreRelax \
         hypre_F90_NAME(fhypre_structsmgsetnumprerelax, FHYPRE_STRUCTSMGSETNUMPRERELAX)
 extern void hypre_F90_NAME(fhypre_structsmgsetnumprerelax, FHYPRE_STRUCTSMGSETNUMPRERELAX)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructSMGGetNumPreRelax \
         hypre_F90_NAME(fhypre_structsmggetnumprerelax, FHYPRE_STRUCTSMGGETNUMPRERELAX)
 extern void hypre_F90_NAME(fhypre_structsmggetnumprerelax, FHYPRE_STRUCTSMGGETNUMPRERELAX)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructSMGSetNumPostRelax \
         hypre_F90_NAME(fhypre_structsmgsetnumpostrelax, FHYPRE_STRUCTSMGSETNUMPOSTRELAX)
 extern void hypre_F90_NAME(fhypre_structsmgsetnumpostrelax, FHYPRE_STRUCTSMGSETNUMPOSTRELAX)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructSMGGetNumPostRelax \
         hypre_F90_NAME(fhypre_structsmggetnumpostrelax, FHYPRE_STRUCTSMGGETNUMPOSTRELAX)
 extern void hypre_F90_NAME(fhypre_structsmggetnumpostrelax, FHYPRE_STRUCTSMGGETNUMPOSTRELAX)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructSMGSetLogging \
         hypre_F90_NAME(fhypre_structsmgsetlogging, FHYPRE_STRUCTSMGSETLOGGING)
 extern void hypre_F90_NAME(fhypre_structsmgsetlogging, FHYPRE_STRUCTSMGSETLOGGING)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructSMGGetLogging \
         hypre_F90_NAME(fhypre_structsmggetlogging, FHYPRE_STRUCTSMGGETLOGGING)
 extern void hypre_F90_NAME(fhypre_structsmggetlogging, FHYPRE_STRUCTSMGGETLOGGING)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructSMGSetPrintLevel \
         hypre_F90_NAME(fhypre_structsmgsetprintlevel, FHYPRE_STRUCTSMGSETPRINTLEVEL)
 extern void hypre_F90_NAME(fhypre_structsmgsetprintlevel, FHYPRE_STRUCTSMGSETPRINTLEVEL)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructSMGGetPrintLevel \
         hypre_F90_NAME(fhypre_structsmggetprintlevel, FHYPRE_STRUCTSMGGETPRINTLEVEL)
 extern void hypre_F90_NAME(fhypre_structsmggetprintlevel, FHYPRE_STRUCTSMGGETPRINTLEVEL)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 
 
 #define HYPRE_StructSparseMSGCreate \
         hypre_F90_NAME(fhypre_structsparsemsgcreate, FHYPRE_STRUCTSPARSEMSGCREATE)
 extern void hypre_F90_NAME(fhypre_structsparsemsgcreate, FHYPRE_STRUCTSPARSEMSGCREATE)
-                          (HYPRE_Int *, hypre_F90_Obj *);
+(HYPRE_Int *, hypre_F90_Obj *);
 
 #define HYPRE_StructSparseMSGDestroy \
         hypre_F90_NAME(fhypre_structsparsemsgdestroy, FHYPRE_STRUCTSPARSEMSGDESTROY)
 extern void hypre_F90_NAME(fhypre_structsparsemsgdestroy, FHYPRE_STRUCTSPARSEMSGDESTROY)
-                          (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_StructSparseMSGSetup \
         hypre_F90_NAME(fhypre_structsparsemsgsetup, FHYRPE_STRUCTSPARSEMSGSETUP)
 extern void hypre_F90_NAME(fhypre_structsparsemsgsetup, FHYRPE_STRUCTSPARSEMSGSETUP)
-                          (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_StructSparseMSGSolve \
         hypre_F90_NAME(fhypre_structsparsemsgsolve, FHYPRE_STRUCTSPARSEMSGSOLVE)
 extern void hypre_F90_NAME(fhypre_structsparsemsgsolve, FHYPRE_STRUCTSPARSEMSGSOLVE)
-                          (hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
+(hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *, hypre_F90_Obj *);
 
 #define HYPRE_StructSparseMSGSetJump \
         hypre_F90_NAME(fhypre_structsparsemsgsetjump, FHYPRE_STRUCTSPARSEMSGSETJUMP)
 extern void hypre_F90_NAME(fhypre_structsparsemsgsetjump, FHYPRE_STRUCTSPARSEMSGSETJUMP)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructSparseMSGSetTol \
         hypre_F90_NAME(fhypre_structsparsemsgsettol, FHYPRE_STRUCTSPARSEMSGSETTOL)
 extern void hypre_F90_NAME(fhypre_structsparsemsgsettol, FHYPRE_STRUCTSPARSEMSGSETTOL)
-                          (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_StructSparseMSGSetMaxIter \
         hypre_F90_NAME(fhypre_structsparsemsgsetmaxite, FHYPRE_STRUCTSPARSEMSGSETMAXITE)
 extern void hypre_F90_NAME(fhypre_structsparsemsgsetmaxite, FHYPRE_STRUCTSPARSEMSGSETMAXITE)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructSparseMSGSetRelChange \
         hypre_F90_NAME(fhypre_structsparsemsgsetrelcha, FHYPRE_STRUCTSPARSEMSGSETRELCHA)
 extern void hypre_F90_NAME(fhypre_structsparsemsgsetrelcha, FHYPRE_STRUCTSPARSEMSGSETRELCHA)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructSparseMSGSetZeroGuess \
         hypre_F90_NAME(fhypre_structsparsemsgsetzerogu, FHYPRE_STRUCTSPARSEMSGSETZEROGU)
 extern void hypre_F90_NAME(fhypre_structsparsemsgsetzerogu, FHYPRE_STRUCTSPARSEMSGSETZEROGU)
-                          (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_StructSparseMSGSetNonZeroGuess \
         hypre_F90_NAME(fhypre_structsparsemsgsetnonzer, FHYPRE_STRUCTSPARSEMSGSETNONZER)
 extern void hypre_F90_NAME(fhypre_structsparsemsgsetnonzer, FHYPRE_STRUCTSPARSEMSGSETNONZER)
-                          (hypre_F90_Obj *);
+(hypre_F90_Obj *);
 
 #define HYPRE_StructSparseMSGGetNumIterations \
         hypre_F90_NAME(fhypre_structsparsemsggetnumite, FHYPRE_STRUCTSPARSEMSGGETNUMITE)
 extern void hypre_F90_NAME(fhypre_structsparsemsggetnumite, FHYPRE_STRUCTSPARSEMSGGETNUMITE)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructSparseMSGGetFinalRelativeResidualNorm \
         hypre_F90_NAME(fhypre_structsparsemsggetfinalr, FHYRPE_STRUCTSPARSEMSGGETFINALR)
 extern void hypre_F90_NAME(fhypre_structsparsemsggetfinalr, FHYRPE_STRUCTSPARSEMSGGETFINALR)
-                          (hypre_F90_Obj *, HYPRE_Real *);
+(hypre_F90_Obj *, HYPRE_Real *);
 
 #define HYPRE_StructSparseMSGSetRelaxType \
         hypre_F90_NAME(fhypre_structsparsemsgsetrelaxt, FHYPRE_STRUCTSPARSEMSGSETRELAXT)
 extern void hypre_F90_NAME(fhypre_structsparsemsgsetrelaxt, FHYPRE_STRUCTSPARSEMSGSETRELAXT)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructSparseMSGSetNumPreRelax \
         hypre_F90_NAME(fhypre_structsparsemsgsetnumpre, FHYPRE_STRUCTSPARSEMSGSETNUMPRE)
 extern void hypre_F90_NAME(fhypre_structsparsemsgsetnumpre, FHYPRE_STRUCTSPARSEMSGSETNUMPRE)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructSparseMSGSetNumPostRelax \
         hypre_F90_NAME(fhypre_structsparsemsgsetnumpos, FHYPRE_STRUCTSPARSEMSGSETNUMPOS)
 extern void hypre_F90_NAME(fhypre_structsparsemsgsetnumpos, FHYPRE_STRUCTSPARSEMSGSETNUMPOS)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructSparseMSGSetNumFineRelax \
         hypre_F90_NAME(fhypre_structsparsemsgsetnumfin, FHYPRE_STRUCTSPARSEMSGSETNUMFIN)
 extern void hypre_F90_NAME(fhypre_structsparsemsgsetnumfin, FHYPRE_STRUCTSPARSEMSGSETNUMFIN)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructSparseMSGSetLogging \
         hypre_F90_NAME(fhypre_structsparsemsgsetloggin, FHYPRE_STRUCTSPARSEMSGSETLOGGIN)
 extern void hypre_F90_NAME(fhypre_structsparsemsgsetloggin, FHYPRE_STRUCTSPARSEMSGSETLOGGIN)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #define HYPRE_StructSparseMSGSetPrintLevel \
         hypre_F90_NAME(fhypre_structsparsemsgsetprintl, FHYPRE_STRUCTSPARSEMSGSETPRINTL)
 extern void hypre_F90_NAME(fhypre_structsparsemsgsetprintl, FHYPRE_STRUCTSPARSEMSGSETPRINTL)
-                          (hypre_F90_Obj *, HYPRE_Int *);
+(hypre_F90_Obj *, HYPRE_Int *);
 
 #ifdef __cplusplus
 }
diff --git a/external/hypre/src/test/hypre_test.h b/external/hypre/src/test/hypre_test.h
index d4e2a473..8976d9b5 100644
--- a/external/hypre/src/test/hypre_test.h
+++ b/external/hypre/src/test/hypre_test.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -21,7 +21,7 @@
 #include "HYPRE_parcsr_ls.h"
 #include "HYPRE_struct_ls.h"
 #include "HYPRE_sstruct_ls.h"
- 
+
 #define HYPRE_BICGSTAB   99100
 #define HYPRE_BOOMERAMG  99110
 #define HYPRE_CGNR       99120
@@ -46,8 +46,8 @@
 /****************************************************************************
  * Prototypes for testing routines
  ***************************************************************************/
-HYPRE_Int hypre_set_precond(HYPRE_Int matrix_id, HYPRE_Int solver_id, HYPRE_Int precond_id, 
-                      void *solver, void *precond);
+HYPRE_Int hypre_set_precond(HYPRE_Int matrix_id, HYPRE_Int solver_id, HYPRE_Int precond_id,
+                            void *solver, void *precond);
 
 HYPRE_Int hypre_set_precond_params(HYPRE_Int precond_id, void *precond);
 
@@ -73,12 +73,12 @@ HYPRE_Int      overlap = 1;
 HYPRE_Int      domain_type = 2;
 HYPRE_Int      nonzeros_to_keep = -1;
 
-HYPRE_Int      interp_type; 
+HYPRE_Int      interp_type;
 HYPRE_Int      cycle_type;
 HYPRE_Int      relax_default;
 HYPRE_Int     *dof_func;
-HYPRE_Int     *num_grid_sweeps;  
-HYPRE_Int     *grid_relax_type;   
+HYPRE_Int     *num_grid_sweeps;
+HYPRE_Int     *grid_relax_type;
 HYPRE_Int    **grid_relax_points;
 
 HYPRE_Real   tol = 1.e-8;
@@ -91,7 +91,7 @@ HYPRE_Real   sai_filter = 0.1;
 
 HYPRE_Real   strong_threshold;
 HYPRE_Real   trunc_factor;
-HYPRE_Real  *relax_weight; 
+HYPRE_Real  *relax_weight;
 HYPRE_Real  *omega;
 
 #endif
diff --git a/external/hypre/src/test/ij.c b/external/hypre/src/test/ij.c
index 923283dc..1fe0d408 100644
--- a/external/hypre/src/test/ij.c
+++ b/external/hypre/src/test/ij.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -26,8 +26,12 @@
 #include "_hypre_parcsr_mv.h"
 #include "HYPRE_krylov.h"
 
-#if defined(HYPRE_USING_UMPIRE)
-#include "umpire/interface/umpire.h"
+#if defined (HYPRE_USING_CUDA)
+#include <cuda_profiler_api.h>
+#endif
+#if defined(HYPRE_USING_CUSPARSE)
+#define DISABLE_CUSPARSE_DEPRECATED
+#include <cusparse.h>
 #endif
 
 /* begin lobpcg */
@@ -49,30 +53,50 @@ BuildParIsoLaplacian( HYPRE_Int argc, char** argv, HYPRE_ParCSRMatrix *A_ptr );
 extern "C" {
 #endif
 
-HYPRE_Int BuildParFromFile (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix *A_ptr );
-HYPRE_Int ReadParVectorFromFile (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParVector *b_ptr );
-
-HYPRE_Int BuildParLaplacian (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix *A_ptr );
-HYPRE_Int BuildParSysLaplacian (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix *A_ptr );
-HYPRE_Int BuildParDifConv (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix *A_ptr);
-HYPRE_Int BuildParFromOneFile (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_Int num_functions , HYPRE_ParCSRMatrix *A_ptr );
-HYPRE_Int BuildFuncsFromFiles (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix A , HYPRE_Int **dof_func_ptr );
-HYPRE_Int BuildFuncsFromOneFile (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix A , HYPRE_Int **dof_func_ptr );
-HYPRE_Int BuildRhsParFromOneFile (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix A , HYPRE_ParVector *b_ptr );
-HYPRE_Int BuildBigArrayFromOneFile (HYPRE_Int argc , char *argv [] , const char *array_name , HYPRE_Int arg_index , HYPRE_BigInt *partitioning , HYPRE_Int *size , HYPRE_BigInt **array_ptr);
-HYPRE_Int BuildParLaplacian9pt (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix *A_ptr );
-HYPRE_Int BuildParLaplacian27pt (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix *A_ptr );
-HYPRE_Int BuildParRotate7pt (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix *A_ptr );
-HYPRE_Int BuildParVarDifConv (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix *A_ptr , HYPRE_ParVector *rhs_ptr );
-HYPRE_ParCSRMatrix GenerateSysLaplacian (MPI_Comm comm, HYPRE_BigInt nx, HYPRE_BigInt ny, HYPRE_BigInt nz,
+HYPRE_Int BuildParFromFile (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                            HYPRE_ParCSRMatrix *A_ptr );
+HYPRE_Int ReadParVectorFromFile (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                                 HYPRE_ParVector *b_ptr );
+
+HYPRE_Int BuildParLaplacian (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                             HYPRE_ParCSRMatrix *A_ptr );
+HYPRE_Int BuildParSysLaplacian (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                                HYPRE_ParCSRMatrix *A_ptr );
+HYPRE_Int BuildParDifConv (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                           HYPRE_ParCSRMatrix *A_ptr);
+HYPRE_Int BuildParFromOneFile (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                               HYPRE_Int num_functions, HYPRE_ParCSRMatrix *A_ptr );
+HYPRE_Int BuildFuncsFromFiles (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                               HYPRE_ParCSRMatrix A, HYPRE_Int **dof_func_ptr );
+HYPRE_Int BuildFuncsFromOneFile (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                                 HYPRE_ParCSRMatrix A, HYPRE_Int **dof_func_ptr );
+HYPRE_Int BuildRhsParFromOneFile (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                                  HYPRE_ParCSRMatrix A, HYPRE_ParVector *b_ptr );
+HYPRE_Int BuildBigArrayFromOneFile (HYPRE_Int argc, char *argv [], const char *array_name,
+                                    HYPRE_Int arg_index, HYPRE_BigInt *partitioning, HYPRE_Int *size, HYPRE_BigInt **array_ptr);
+HYPRE_Int BuildParLaplacian9pt (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                                HYPRE_ParCSRMatrix *A_ptr );
+HYPRE_Int BuildParLaplacian27pt (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                                 HYPRE_ParCSRMatrix *A_ptr );
+HYPRE_Int BuildParLaplacian125pt (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                                  HYPRE_ParCSRMatrix *A_ptr );
+HYPRE_Int BuildParRotate7pt (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                             HYPRE_ParCSRMatrix *A_ptr );
+HYPRE_Int BuildParVarDifConv (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                              HYPRE_ParCSRMatrix *A_ptr, HYPRE_ParVector *rhs_ptr );
+HYPRE_ParCSRMatrix GenerateSysLaplacian (MPI_Comm comm, HYPRE_BigInt nx, HYPRE_BigInt ny,
+                                         HYPRE_BigInt nz,
                                          HYPRE_Int P, HYPRE_Int Q, HYPRE_Int R, HYPRE_Int p, HYPRE_Int q, HYPRE_Int r,
                                          HYPRE_Int num_fun, HYPRE_Real *mtrx, HYPRE_Real *value);
-HYPRE_ParCSRMatrix GenerateSysLaplacianVCoef (MPI_Comm comm, HYPRE_BigInt nx, HYPRE_BigInt ny, HYPRE_BigInt nz,
+HYPRE_ParCSRMatrix GenerateSysLaplacianVCoef (MPI_Comm comm, HYPRE_BigInt nx, HYPRE_BigInt ny,
+                                              HYPRE_BigInt nz,
                                               HYPRE_Int P, HYPRE_Int Q, HYPRE_Int R, HYPRE_Int p, HYPRE_Int q, HYPRE_Int r,
                                               HYPRE_Int num_fun, HYPRE_Real *mtrx, HYPRE_Real *value);
-HYPRE_Int SetSysVcoefValues(HYPRE_Int num_fun, HYPRE_BigInt nx, HYPRE_BigInt ny, HYPRE_BigInt nz, HYPRE_Real vcx, HYPRE_Real vcy, HYPRE_Real vcz, HYPRE_Int mtx_entry, HYPRE_Real *values);
+HYPRE_Int SetSysVcoefValues(HYPRE_Int num_fun, HYPRE_BigInt nx, HYPRE_BigInt ny, HYPRE_BigInt nz,
+                            HYPRE_Real vcx, HYPRE_Real vcy, HYPRE_Real vcz, HYPRE_Int mtx_entry, HYPRE_Real *values);
 
-HYPRE_Int BuildParCoordinates (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_Int *coorddim_ptr , float **coord_ptr );
+HYPRE_Int BuildParCoordinates (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                               HYPRE_Int *coorddim_ptr, float **coord_ptr );
 
 extern HYPRE_Int hypre_FlexGMRESModifyPCAMGExample(void *precond_data, HYPRE_Int iterations,
                                                    HYPRE_Real rel_residual_norm);
@@ -82,7 +106,6 @@ extern HYPRE_Int hypre_FlexGMRESModifyPCDefault(void *precond_data, HYPRE_Int it
 #ifdef __cplusplus
 }
 #endif
-#define SECOND_TIME 0
 
 hypre_int
 main( hypre_int argc,
@@ -90,6 +113,7 @@ main( hypre_int argc,
 {
    HYPRE_Int           arg_index;
    HYPRE_Int           print_usage;
+   HYPRE_Int           log_level = 0;
    HYPRE_Int           sparsity_known = 0;
    HYPRE_Int           add = 0;
    HYPRE_Int           check_constant = 0;
@@ -98,6 +122,8 @@ main( hypre_int argc,
    HYPRE_Int           omp_flag = 0;
    HYPRE_Int           build_matrix_type;
    HYPRE_Int           build_matrix_arg_index;
+   HYPRE_Int           build_matrix_M;
+   HYPRE_Int           build_matrix_M_arg_index;
    HYPRE_Int           build_rhs_type;
    HYPRE_Int           build_rhs_arg_index;
    HYPRE_Int           build_src_type;
@@ -109,14 +135,17 @@ main( hypre_int argc,
    HYPRE_Int           build_fpt_arg_index;
    HYPRE_Int           build_sfpt_arg_index;
    HYPRE_Int           build_cpt_arg_index;
+   HYPRE_Int           num_components = 1;
    HYPRE_Int           solver_id;
    HYPRE_Int           solver_type = 1;
    HYPRE_Int           recompute_res = 0;   /* What should be the default here? */
    HYPRE_Int           ioutdat;
    HYPRE_Int           poutdat;
+   HYPRE_Int           poutusr = 0; /* if user selects pout */
+   HYPRE_Int           print_matrix_info = 0;
    HYPRE_Int           debug_flag;
    HYPRE_Int           ierr = 0;
-   HYPRE_Int           i,j;
+   HYPRE_Int           i, j, c;
    HYPRE_Int           max_levels = 25;
    HYPRE_Int           num_iterations;
    HYPRE_Int           pcg_num_its, dscg_num_its;
@@ -127,15 +156,18 @@ main( hypre_int argc,
    HYPRE_Int           keep_same_sign = 0;
    HYPRE_Real          cf_tol = 0.9;
    HYPRE_Real          norm;
+   HYPRE_Real          b_dot_b;
    HYPRE_Real          final_res_norm;
    void               *object;
 
    HYPRE_IJMatrix      ij_A = NULL;
+   HYPRE_IJMatrix      ij_M = NULL;
    HYPRE_IJVector      ij_b = NULL;
    HYPRE_IJVector      ij_x = NULL;
-   HYPRE_IJVector      *ij_rbm;
+   HYPRE_IJVector      *ij_rbm = NULL;
 
    HYPRE_ParCSRMatrix  parcsr_A = NULL;
+   HYPRE_ParCSRMatrix  parcsr_M = NULL;
    HYPRE_ParVector     b = NULL;
    HYPRE_ParVector     x = NULL;
    HYPRE_ParVector     *interp_vecs = NULL;
@@ -145,14 +177,14 @@ main( hypre_int argc,
    HYPRE_Solver        amg_solver;
    HYPRE_Solver        amgdd_solver;
    HYPRE_Solver        pcg_solver;
-   HYPRE_Solver        amg_precond=NULL;
-   HYPRE_Solver        pcg_precond=NULL;
+   HYPRE_Solver        amg_precond = NULL;
+   HYPRE_Solver        pcg_precond = NULL;
    HYPRE_Solver        pcg_precond_gotten;
 
    HYPRE_Int           check_residual = 0;
    HYPRE_Int           num_procs, myid;
    HYPRE_Int           local_row;
-   HYPRE_Int          *row_sizes;
+   HYPRE_Int          *row_sizes = NULL;
    HYPRE_Int          *diag_sizes;
    HYPRE_Int          *offdiag_sizes;
    HYPRE_BigInt       *rows;
@@ -160,6 +192,7 @@ main( hypre_int argc,
    HYPRE_Int          *ncols;
    HYPRE_BigInt       *col_inds;
    HYPRE_Int          *dof_func;
+   HYPRE_Int           filter_functions = 0;
    HYPRE_Int           num_functions = 1;
    HYPRE_Int           num_paths = 1;
    HYPRE_Int           agg_num_levels = 0;
@@ -177,7 +210,6 @@ main( hypre_int argc,
    HYPRE_Real         *values, val;
 
    HYPRE_Int           use_nonsymm_schwarz = 0;
-   HYPRE_Int           test_ij = 0;
    HYPRE_Int           build_rbm = 0;
    HYPRE_Int           build_rbm_index = 0;
    HYPRE_Int           num_interp_vecs = 0;
@@ -185,6 +217,15 @@ main( hypre_int argc,
    HYPRE_Int           Q_max = 0;
    HYPRE_Real          Q_trunc = 0;
 
+   /* Specific tests */
+   HYPRE_Int           test_init = 0;
+   HYPRE_Int           lazy_device_init = 0;
+   HYPRE_Int           device_id = -1;
+   HYPRE_Int           test_ij = 0;
+   HYPRE_Int           test_multivec = 0;
+   HYPRE_Int           test_scaling = 0;
+   HYPRE_Int           test_error = 0;
+
    const HYPRE_Real    dt_inf = DT_INF;
    HYPRE_Real          dt = dt_inf;
 
@@ -245,13 +286,14 @@ main( hypre_int argc,
 #endif
    HYPRE_Real   relax_wt;
    HYPRE_Real   add_relax_wt = 1.0;
-   HYPRE_Real   relax_wt_level;
+   HYPRE_Real   relax_wt_level = 0.0;
    HYPRE_Real   outer_wt;
-   HYPRE_Real   outer_wt_level;
+   HYPRE_Real   outer_wt_level = 0;
    HYPRE_Real   tol = 1.e-8, pc_tol = 0.;
    HYPRE_Real   atol = 0.0;
    HYPRE_Real   max_row_sum = 1.;
    HYPRE_Int    converge_type = 0;
+   HYPRE_Int    precon_cycles = 1;
 
    HYPRE_Int  cheby_order = 2;
    HYPRE_Int  cheby_eig_est = 10;
@@ -260,20 +302,25 @@ main( hypre_int argc,
    HYPRE_Real cheby_fraction = .3;
 
 #if defined(HYPRE_USING_GPU)
-   keepTranspose = 1;
-   coarsen_type  = 8;
-   mod_rap2      = 1;
-   HYPRE_Int spgemm_use_cusparse = 0;
-   HYPRE_Int use_curand = 1;
-#if defined(HYPRE_USING_HIP)
-   spgemm_use_cusparse = 1;
+#if defined(HYPRE_USING_CUSPARSE) && CUSPARSE_VERSION >= 11000
+   /* CUSPARSE_SPMV_ALG_DEFAULT doesn't provide deterministic results */
+   HYPRE_Int  spmv_use_vendor = 0;
+#else
+   HYPRE_Int  spmv_use_vendor = 1;
+#endif
+   HYPRE_Int  use_curand = 1;
+#if defined(HYPRE_USING_CUDA)
+   HYPRE_Int  spgemm_use_vendor = 0;
+#else
+   HYPRE_Int  spgemm_use_vendor = 1;
 #endif
    HYPRE_Int  spgemm_alg = 1;
+   HYPRE_Int  spgemm_binned = 0;
    HYPRE_Int  spgemm_rowest_mtd = 3;
-   HYPRE_Int  spgemm_rowest_nsamples = 32;
-   HYPRE_Real spgemm_rowest_mult = 1.5;
-   char       spgemm_hash_type = 'L';
+   HYPRE_Int  spgemm_rowest_nsamples = -1; /* default */
+   HYPRE_Real spgemm_rowest_mult = -1.0; /* default */
 #endif
+   HYPRE_Int      nmv = 100;
 
    /* for CGC BM Aug 25, 2006 */
    HYPRE_Int      cgcits = 1;
@@ -322,7 +369,10 @@ main( hypre_int argc,
    HYPRE_Real   agg_P12_trunc_factor  = 0; /* default value */
 
    HYPRE_Int    print_system = 0;
+   HYPRE_Int    print_system_binary = 0;
    HYPRE_Int    rel_change = 0;
+   HYPRE_Int    second_time = 0;
+   HYPRE_Int    benchmark = 0;
 
    /* begin lobpcg */
    HYPRE_Int    hybrid = 1;
@@ -341,6 +391,8 @@ main( hypre_int argc,
    HYPRE_Int  checkOrtho = 0;
    HYPRE_Int  printLevel = 0; /* also c.f. poutdat */
    HYPRE_Int  two_norm = 1;
+   HYPRE_Int  skip_break = 0;
+   HYPRE_Int  flex = 0;
    HYPRE_Int  pcgIterations = 0;
    HYPRE_Int  pcgMode = 1;
    HYPRE_Real pcgTol = 1e-2;
@@ -394,6 +446,14 @@ main( hypre_int argc,
    /* hypre_ILU options */
    HYPRE_Int ilu_type = 0;
    HYPRE_Int ilu_lfil = 0;
+   HYPRE_Int ilu_reordering = 1;
+   HYPRE_Int ilu_tri_solve = 1;
+   HYPRE_Int ilu_ljac_iters = 5;
+   HYPRE_Int ilu_ujac_iters = 5;
+   HYPRE_Int ilu_iter_setup_type = 0;
+   HYPRE_Int ilu_iter_setup_option = 0;
+   HYPRE_Int ilu_iter_setup_max_iter = 100;
+   HYPRE_Real ilu_iter_setup_tolerance = 1.e-6;
    HYPRE_Int ilu_sm_max_iter = 1;
    HYPRE_Real ilu_droptol = 1.0e-02;
    HYPRE_Int ilu_max_row_nnz = 1000;
@@ -401,6 +461,18 @@ main( hypre_int argc,
    HYPRE_Real ilu_nsh_droptol = 1.0e-02;
    /* end hypre ILU options */
 
+   /* hypre_FSAI options */
+   HYPRE_Int  fsai_algo_type = 1;
+   HYPRE_Int  fsai_ls_type = 1;
+   HYPRE_Int  fsai_max_steps = 10;
+   HYPRE_Int  fsai_max_step_size = 1;
+   HYPRE_Int  fsai_max_nnz_row = 10;
+   HYPRE_Int  fsai_num_levels = 2;
+   HYPRE_Real fsai_threshold = 1.0e-02;
+   HYPRE_Int  fsai_eig_max_iters = 5;
+   HYPRE_Real fsai_kap_tolerance = 1.0e-03;
+   /* end hypre FSAI options */
+
    HYPRE_Real     *nongalerk_tol = NULL;
    HYPRE_Int       nongalerk_num_tol = 0;
 
@@ -430,29 +502,173 @@ main( hypre_int argc,
    HYPRE_Int amgdd_fac_cycle_type = 1;
    HYPRE_Int amgdd_num_ghost_layers = 1;
 
+#if defined(HYPRE_USING_MEMORY_TRACKER)
+   HYPRE_Int print_mem_tracker = 0;
+   char mem_tracker_name[HYPRE_MAX_FILE_NAME_LEN] = {0};
+#endif
+
+   HYPRE_Int gpu_aware_mpi = 0;
+
+   /* Initialize MPI */
+   hypre_MPI_Init(&argc, &argv);
+
+   hypre_MPI_Comm_size(hypre_MPI_COMM_WORLD, &num_procs );
+   hypre_MPI_Comm_rank(hypre_MPI_COMM_WORLD, &myid );
+
+   /* Should we test library initialization? */
+   for (arg_index = 1; arg_index < argc; arg_index ++)
+   {
+      if (strcmp(argv[arg_index], "-test_init") == 0)
+      {
+         test_init = 1;
+      }
+      else if (strcmp(argv[arg_index], "-lazy_device_init") == 0)
+      {
+         lazy_device_init = atoi(argv[++arg_index]);
+      }
+      else if (strcmp(argv[arg_index], "-device_id") == 0)
+      {
+         device_id = atoi(argv[++arg_index]);
+      }
+   }
+
+   /*-----------------------------------------------------------------
+    * GPU Device binding
+    * Must be done before HYPRE_Initialize() and should not be changed after
+    *-----------------------------------------------------------------*/
+   hypre_bind_device_id(device_id, myid, num_procs, hypre_MPI_COMM_WORLD);
+
+   /*-----------------------------------------------------------
+    * Initialize : must be the first HYPRE function to call
+    *-----------------------------------------------------------*/
+
+   if (test_init)
+   {
+      /* The library should not be initialized or finalized */
+      if (!HYPRE_Initialized() && !HYPRE_Finalized())
+      {
+         hypre_ParPrintf(hypre_MPI_COMM_WORLD, "hypre library has not been initialized or finalized yet\n");
+      }
+
+      HYPRE_Initialize();
+
+      /* Check if the library is in initialized state */
+      if (HYPRE_Initialized() && !HYPRE_Finalized())
+      {
+         hypre_ParPrintf(hypre_MPI_COMM_WORLD, "hypre library has been initialized\n");
+      }
+
+      HYPRE_Finalize();
+
+      /* Check if the library is in finalized state */
+      if (!HYPRE_Initialized() && HYPRE_Finalized())
+      {
+         hypre_ParPrintf(hypre_MPI_COMM_WORLD, "hypre library has been finalized\n");
+      }
+
+      HYPRE_Initialize();
+
+      /* Check if the library is in initialized state */
+      if (HYPRE_Initialized() && !HYPRE_Finalized())
+      {
+         hypre_ParPrintf(hypre_MPI_COMM_WORLD, "hypre library has been re-initialized\n");
+      }
+
+      HYPRE_Finalize();
+
+      /* Check if the library is in finalized state */
+      if (!HYPRE_Initialized() && HYPRE_Finalized())
+      {
+         hypre_ParPrintf(hypre_MPI_COMM_WORLD, "hypre library has been finalized\n");
+      }
+
+      hypre_MPI_Finalize();
+
+      return 0;
+   }
+
+   time_index = hypre_InitializeTiming("Hypre init");
+   hypre_BeginTiming(time_index);
+
+   HYPRE_Initialize();
+
+   if (!lazy_device_init)
+   {
+      HYPRE_DeviceInitialize();
+   }
+
+   hypre_EndTiming(time_index);
+   hypre_PrintTiming("Hypre init times", hypre_MPI_COMM_WORLD);
+   hypre_FinalizeTiming(time_index);
+   hypre_ClearTiming();
+
    /* default execution policy and memory space */
+#if defined(HYPRE_TEST_USING_HOST)
+   HYPRE_MemoryLocation memory_location = HYPRE_MEMORY_HOST;
+   HYPRE_ExecutionPolicy default_exec_policy = HYPRE_EXEC_HOST;
+   HYPRE_ExecutionPolicy exec2_policy = HYPRE_EXEC_HOST;
+#else
+   HYPRE_MemoryLocation memory_location = HYPRE_MEMORY_DEVICE;
    HYPRE_ExecutionPolicy default_exec_policy = HYPRE_EXEC_DEVICE;
-   HYPRE_MemoryLocation  memory_location     = HYPRE_MEMORY_DEVICE;
+   HYPRE_ExecutionPolicy exec2_policy = HYPRE_EXEC_DEVICE;
+#endif
+
+   for (arg_index = 1; arg_index < argc; arg_index ++)
+   {
+      if ( strcmp(argv[arg_index], "-memory_host") == 0 )
+      {
+         memory_location = HYPRE_MEMORY_HOST;
+      }
+      else if ( strcmp(argv[arg_index], "-memory_device") == 0 )
+      {
+         memory_location = HYPRE_MEMORY_DEVICE;
+      }
+      else if ( strcmp(argv[arg_index], "-exec_host") == 0 )
+      {
+         default_exec_policy = HYPRE_EXEC_HOST;
+      }
+      else if ( strcmp(argv[arg_index], "-exec_device") == 0 )
+      {
+         default_exec_policy = HYPRE_EXEC_DEVICE;
+      }
+      else if ( strcmp(argv[arg_index], "-exec2_host") == 0 )
+      {
+         exec2_policy = HYPRE_EXEC_HOST;
+      }
+      else if ( strcmp(argv[arg_index], "-exec2_device") == 0 )
+      {
+         exec2_policy = HYPRE_EXEC_DEVICE;
+      }
+   }
+
+   if (hypre_GetExecPolicy1(memory_location) == HYPRE_EXEC_DEVICE)
+   {
+      keepTranspose = 1;
+      coarsen_type  = 8;
+      mod_rap2      = 1;
+   }
 
-#ifdef HYPRE_USING_DEVICE_POOL
+#if defined (HYPRE_USING_DEVICE_POOL)
    /* device pool allocator */
    hypre_uint mempool_bin_growth   = 8,
               mempool_min_bin      = 3,
               mempool_max_bin      = 9;
    size_t mempool_max_cached_bytes = 2000LL * 1024 * 1024;
-#endif
-
-   /* Initialize MPI */
-   hypre_MPI_Init(&argc, &argv);
 
-   hypre_MPI_Comm_size(hypre_MPI_COMM_WORLD, &num_procs );
-   hypre_MPI_Comm_rank(hypre_MPI_COMM_WORLD, &myid );
+#elif defined (HYPRE_USING_UMPIRE)
+   size_t umpire_dev_pool_size    = 4294967296; // 4 GiB
+   size_t umpire_uvm_pool_size    = 4294967296; // 4 GiB
+   size_t umpire_pinned_pool_size = 4294967296; // 4 GiB
+   size_t umpire_host_pool_size   = 4294967296; // 4 GiB
+#endif
 
    /*-----------------------------------------------------------
     * Set defaults
     *-----------------------------------------------------------*/
    build_matrix_type = 2;
    build_matrix_arg_index = argc;
+   build_matrix_M = 0;
+   build_matrix_M_arg_index = argc;
    build_rhs_type = 2;
    build_rhs_arg_index = argc;
    build_src_type = -1;
@@ -469,7 +685,7 @@ main( hypre_int argc,
    solver_id = 0;
    ioutdat = 3;
    poutdat = 1;
-   hypre_sprintf (plot_file_name,"AMGgrids.CF.dat");
+   hypre_sprintf (plot_file_name, "AMGgrids.CF.dat");
 
    /*-----------------------------------------------------------
     * Parse command line
@@ -480,12 +696,29 @@ main( hypre_int argc,
 
    while ( (arg_index < argc) && (!print_usage) )
    {
-      if ( strcmp(argv[arg_index], "-fromfile") == 0 )
+      if ( strcmp(argv[arg_index], "-ll") == 0 )
+      {
+         arg_index++;
+         log_level = atoi(argv[arg_index++]);
+      }
+      else if ( strcmp(argv[arg_index], "-frombinfile") == 0 )
+      {
+         arg_index++;
+         build_matrix_type      = -2;
+         build_matrix_arg_index = arg_index;
+      }
+      else if ( strcmp(argv[arg_index], "-fromfile") == 0 )
       {
          arg_index++;
          build_matrix_type      = -1;
          build_matrix_arg_index = arg_index;
       }
+      else if ( strcmp(argv[arg_index], "-auxfromfile") == 0 )
+      {
+         arg_index++;
+         build_matrix_M           = 1;
+         build_matrix_M_arg_index = arg_index;
+      }
       else if ( strcmp(argv[arg_index], "-fromparcsrfile") == 0 )
       {
          arg_index++;
@@ -516,29 +749,50 @@ main( hypre_int argc,
          build_matrix_type      = 4;
          build_matrix_arg_index = arg_index;
       }
-      else if ( strcmp(argv[arg_index], "-difconv") == 0 )
+      else if ( strcmp(argv[arg_index], "-125pt") == 0 )
       {
          arg_index++;
          build_matrix_type      = 5;
          build_matrix_arg_index = arg_index;
       }
-      else if ( strcmp(argv[arg_index], "-vardifconv") == 0 )
+      else if ( strcmp(argv[arg_index], "-difconv") == 0 )
       {
          arg_index++;
          build_matrix_type      = 6;
          build_matrix_arg_index = arg_index;
       }
-      else if ( strcmp(argv[arg_index], "-rotate") == 0 )
+      else if ( strcmp(argv[arg_index], "-vardifconv") == 0 )
       {
          arg_index++;
          build_matrix_type      = 7;
          build_matrix_arg_index = arg_index;
       }
+      else if ( strcmp(argv[arg_index], "-rotate") == 0 )
+      {
+         arg_index++;
+         build_matrix_type      = 8;
+         build_matrix_arg_index = arg_index;
+      }
       else if ( strcmp(argv[arg_index], "-test_ij") == 0 )
       {
          arg_index++;
          test_ij = 1;
       }
+      else if ( strcmp(argv[arg_index], "-test_multivec") == 0 )
+      {
+         arg_index++;
+         test_multivec = 1;
+      }
+      else if ( strcmp(argv[arg_index], "-test_scaling") == 0 )
+      {
+         arg_index++;
+         test_scaling = atoi(argv[arg_index++]);
+      }
+      else if ( strcmp(argv[arg_index], "-test_error") == 0 )
+      {
+         arg_index++;
+         test_error = atoi(argv[arg_index++]);
+      }
       else if ( strcmp(argv[arg_index], "-funcsfromonefile") == 0 )
       {
          arg_index++;
@@ -551,6 +805,11 @@ main( hypre_int argc,
          build_funcs_type      = 2;
          build_funcs_arg_index = arg_index;
       }
+      else if ( strcmp(argv[arg_index], "-mat-info") == 0 )
+      {
+         arg_index++;
+         print_matrix_info = 1;
+      }
       else if ( strcmp(argv[arg_index], "-exact_size") == 0 )
       {
          arg_index++;
@@ -595,7 +854,8 @@ main( hypre_int argc,
       {
          arg_index++;
          /* begin lobpcg */
-         if ( strcmp(argv[arg_index], "none") == 0 ) {
+         if ( strcmp(argv[arg_index], "none") == 0 )
+         {
             solver_id = NO_SOLVER;
             arg_index++;
          }
@@ -611,12 +871,23 @@ main( hypre_int argc,
          num_interp_vecs = atoi(argv[arg_index++]);
          build_rbm_index = arg_index;
       }
+      else if ( strcmp(argv[arg_index], "-nc") == 0 )
+      {
+         arg_index++;
+         num_components = atoi(argv[arg_index++]);
+      }
       else if ( strcmp(argv[arg_index], "-rhsfromfile") == 0 )
       {
          arg_index++;
          build_rhs_type      = 0;
          build_rhs_arg_index = arg_index;
       }
+      else if ( strcmp(argv[arg_index], "-rhsfrombinfile") == 0 )
+      {
+         arg_index++;
+         build_rhs_type      = -2;
+         build_rhs_arg_index = arg_index;
+      }
       else if ( strcmp(argv[arg_index], "-rhsfromonefile") == 0 )
       {
          arg_index++;
@@ -688,6 +959,12 @@ main( hypre_int argc,
          build_rhs_type      = -1;
          build_src_arg_index = arg_index;
       }
+      else if ( strcmp(argv[arg_index], "-x0frombinfile") == 0 )
+      {
+         arg_index++;
+         build_x0_type       = -2;
+         build_x0_arg_index  = arg_index;
+      }
       else if ( strcmp(argv[arg_index], "-x0fromfile") == 0 )
       {
          arg_index++;
@@ -831,12 +1108,12 @@ main( hypre_int argc,
       else if ( strcmp(argv[arg_index], "-crth") == 0 )
       {
          arg_index++;
-         CR_rate = atof(argv[arg_index++]);
+         CR_rate = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-crst") == 0 )
       {
          arg_index++;
-         CR_strong_th = atof(argv[arg_index++]);
+         CR_strong_th = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-rlx") == 0 )
       {
@@ -883,6 +1160,11 @@ main( hypre_int argc,
          arg_index++;
          num_functions = atoi(argv[arg_index++]);
       }
+      else if ( strcmp(argv[arg_index], "-ff") == 0 )
+      {
+         arg_index++;
+         filter_functions = atoi(argv[arg_index++]);
+      }
       else if ( strcmp(argv[arg_index], "-agg_nl") == 0 )
       {
          arg_index++;
@@ -932,9 +1214,9 @@ main( hypre_int argc,
       else if ( strcmp(argv[arg_index], "-dt") == 0 )
       {
          arg_index++;
-         dt = atof(argv[arg_index++]);
+         dt = (HYPRE_Real)atof(argv[arg_index++]);
          build_rhs_type = -1;
-         if ( build_src_type == -1 ) build_src_type = 2;
+         if ( build_src_type == -1 ) { build_src_type = 2; }
       }
       else if ( strcmp(argv[arg_index], "-restritype") == 0 )
       {
@@ -947,196 +1229,335 @@ main( hypre_int argc,
       }
       /* begin lobpcg */
       else if ( strcmp(argv[arg_index], "-lobpcg") == 0 )
-      {                                        /* use lobpcg */
+      {
+         /* use lobpcg */
          arg_index++;
          lobpcgFlag = 1;
       }
       else if ( strcmp(argv[arg_index], "-gen") == 0 )
-      {                                        /* generalized evp */
+      {
+         /* generalized evp */
          arg_index++;
          lobpcgGen = 1;
       }
       else if ( strcmp(argv[arg_index], "-con") == 0 )
-      {                                        /* constrained evp */
+      {
+         /* constrained evp */
          arg_index++;
          constrained = 1;
       }
       else if ( strcmp(argv[arg_index], "-orthchk") == 0 )
-      {                       /* lobpcg: check orthonormality */
+      {
+         /* lobpcg: check orthonormality */
          arg_index++;
          checkOrtho = 1;
       }
       else if ( strcmp(argv[arg_index], "-vfromfile") == 0 )
-      {                /* lobpcg: get initial vectors from file */
+      {
+         /* lobpcg: get initial vectors from file */
          arg_index++;
          vFromFileFlag = 1;
       }
       else if ( strcmp(argv[arg_index], "-vrand") == 0 )
-      {                               /* lobpcg: block size */
+      {
+         /* lobpcg: block size */
          arg_index++;
          blockSize = atoi(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-seed") == 0 )
-      {                          /* lobpcg: seed for srand */
+      {
+         /* lobpcg: seed for srand */
          arg_index++;
          lobpcgSeed = atoi(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-itr") == 0 )
-      {                    /* lobpcg: max # of iterations */
+      {
+         /* lobpcg: max # of iterations */
          arg_index++;
          maxIterations = atoi(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-verb") == 0 )
-      {                         /* lobpcg: verbosity level */
+      {
+         /* lobpcg: verbosity level */
          arg_index++;
          verbosity = atoi(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-vout") == 0 )
-      {                             /* lobpcg: print level */
+      {
+         /* lobpcg: print level */
          arg_index++;
          printLevel = atoi(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-pcgitr") == 0 )
-      {                      /* lobpcg: inner pcg iterations */
+      {
+         /* lobpcg: inner pcg iterations */
          arg_index++;
          pcgIterations = atoi(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-pcgtol") == 0 )
-      {                      /* lobpcg: inner pcg iterations */
+      {
+         /* lobpcg: inner pcg iterations */
          arg_index++;
-         pcgTol = atof(argv[arg_index++]);
+         pcgTol = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-pcgmode") == 0 )
-      {                /* lobpcg: initial guess for inner pcg */
+      {
+         /* lobpcg: initial guess for inner pcg */
          arg_index++;        /* 0: zero, otherwise rhs */
          pcgMode = atoi(argv[arg_index++]);
       }
       /* end lobpcg */
       /* begin mgr options*/
       else if ( strcmp(argv[arg_index], "-mgr_bsize") == 0 )
-      {                /* mgr block size */
+      {
+         /* mgr block size */
          arg_index++;
          mgr_bsize = atoi(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-mgr_nlevels") == 0 )
-      {                /* mgr number of coarsening levels */
+      {
+         /* mgr number of coarsening levels */
          arg_index++;
          mgr_nlevels = atoi(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-mgr_non_c_to_f") == 0 )
-      {                /* mgr intermediate coarse grid strategy */
+      {
+         /* mgr intermediate coarse grid strategy */
          arg_index++;
          mgr_non_c_to_f = atoi(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-mgr_num_reserved_nodes") == 0 )
-      {                /* mgr number of reserved nodes to be put on coarsest grid */
+      {
+         /* mgr number of reserved nodes to be put on coarsest grid */
          arg_index++;
          mgr_num_reserved_nodes = atoi(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-mgr_frelax_method") == 0 )
-      {                /* mgr F-relaxation strategy: single/ multi level */
+      {
+         /* mgr F-relaxation strategy: single/ multi level */
          arg_index++;
          mgr_frelax_method = atoi(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-mgr_relax_type") == 0 )
-      {                /* relax type for "single level" F-relaxation */
+      {
+         /* relax type for "single level" F-relaxation */
          arg_index++;
          mgr_relax_type = atoi(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-mgr_relax_sweeps") == 0 )
-      {                /* number of relaxation sweeps */
+      {
+         /* number of relaxation sweeps */
          arg_index++;
          mgr_num_relax_sweeps = atoi(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-mgr_interp_type") == 0 )
-      {                /* interpolation type */
+      {
+         /* interpolation type */
          arg_index++;
          mgr_interp_type = atoi(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-mgr_interp_sweeps") == 0 )
-      {                /* number of interpolation sweeps*/
+      {
+         /* number of interpolation sweeps*/
          arg_index++;
          mgr_num_interp_sweeps = atoi(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-mgr_gsmooth_type") == 0 )
-      {                /* global smoother type */
+      {
+         /* global smoother type */
          arg_index++;
          mgr_gsmooth_type = atoi(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-mgr_gsmooth_sweeps") == 0 )
-      {                /* number of global smooth sweeps*/
+      {
+         /* number of global smooth sweeps*/
          arg_index++;
          mgr_num_gsmooth_sweeps = atoi(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-mgr_restrict_type") == 0 )
-      {                /* restriction type */
+      {
+         /* restriction type */
          arg_index++;
          mgr_restrict_type = atoi(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-mgr_restrict_sweeps") == 0 )
-      {                /* number of restriction sweeps*/
+      {
+         /* number of restriction sweeps*/
          arg_index++;
          mgr_num_restrict_sweeps = atoi(argv[arg_index++]);
       }
       /* end mgr options */
       /* begin ilu options*/
       else if ( strcmp(argv[arg_index], "-ilu_type") == 0 )
-      {                /* ilu_type */
+      {
+         /* ilu_type */
          arg_index++;
          ilu_type = atoi(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-ilu_sm_max_iter") == 0 )
-      {                /* number of iteration when applied as a smoother */
+      {
+         /* number of iteration when applied as a smoother */
          arg_index++;
          ilu_sm_max_iter = atoi(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-ilu_lfil") == 0 )
-      {                /* level of fill */
+      {
+         /* level of fill */
          arg_index++;
          ilu_lfil = atoi(argv[arg_index++]);
       }
+      else if ( strcmp(argv[arg_index], "-ilu_reordering") == 0 )
+      {
+         /* local reordering type */
+         arg_index++;
+         ilu_reordering = atoi(argv[arg_index++]);
+      }
+      else if ( strcmp(argv[arg_index], "-ilu_trisolve") == 0 )
+      {
+         /* Triangular solver type */
+         arg_index++;
+         ilu_tri_solve = atoi(argv[arg_index++]);
+      }
+      else if ( strcmp(argv[arg_index], "-ilu_ljac_iters") == 0 )
+      {
+         /* Lower Jacobi Iterations */
+         arg_index++;
+         ilu_ljac_iters = atoi(argv[arg_index++]);
+      }
+      else if ( strcmp(argv[arg_index], "-ilu_ujac_iters") == 0 )
+      {
+         /* Upper Jacobi Iterations */
+         arg_index++;
+         ilu_ujac_iters = atoi(argv[arg_index++]);
+      }
+      else if ( strcmp(argv[arg_index], "-ilu_iter_setup_type") == 0 )
+      {
+         /* Iterative setup for ILU (only with rocSPARSE)*/
+         arg_index++;
+         ilu_iter_setup_type = atoi(argv[arg_index++]);
+      }
+      else if ( strcmp(argv[arg_index], "-ilu_iter_setup_option") == 0 )
+      {
+         /* Iterative setup for ILU (only with rocSPARSE)*/
+         arg_index++;
+         ilu_iter_setup_option = atoi(argv[arg_index++]);
+      }
+      else if ( strcmp(argv[arg_index], "-ilu_iter_setup_option") == 0 )
+      {
+         /* Iterative setup for ILU (only with rocSPARSE)*/
+         arg_index++;
+         ilu_iter_setup_option = atoi(argv[arg_index++]);
+      }
+      else if ( strcmp(argv[arg_index], "-ilu_iter_setup_max_iter") == 0 )
+      {
+         /* Iterative setup for ILU (only with rocSPARSE)*/
+         arg_index++;
+         ilu_iter_setup_max_iter = atoi(argv[arg_index++]);
+      }
+      else if ( strcmp(argv[arg_index], "-ilu_iter_setup_tolerance") == 0 )
+      {
+         /* Iterative setup for ILU (only with rocSPARSE)*/
+         arg_index++;
+         ilu_iter_setup_tolerance = atof(argv[arg_index++]);
+      }
       else if ( strcmp(argv[arg_index], "-ilu_droptol") == 0 )
-      {                /* drop tolerance */
+      {
+         /* drop tolerance */
          arg_index++;
-         ilu_droptol = atof(argv[arg_index++]);
+         ilu_droptol = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-ilu_max_row_nnz") == 0 )
-      {                /* Max number of nonzeros to keep per row */
+      {
+         /* Max number of nonzeros to keep per row */
          arg_index++;
          ilu_max_row_nnz = atoi(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-ilu_schur_max_iter") == 0 )
-      {                /* Max number of iterations for schur system solver */
+      {
+         /* Max number of iterations for schur system solver */
          arg_index++;
          ilu_schur_max_iter = atoi(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-ilu_nsh_droptol") == 0 )
-      {                /* Max number of iterations for schur system solver */
+      {
+         /* Max number of iterations for schur system solver */
          arg_index++;
-         ilu_nsh_droptol = atof(argv[arg_index++]);
+         ilu_nsh_droptol = (HYPRE_Real)atof(argv[arg_index++]);
       }
       /* end ilu options */
+      /* begin FSAI options*/
+      else if ( strcmp(argv[arg_index], "-fs_algo_type") == 0 )
+      {
+         arg_index++;
+         fsai_algo_type = atoi(argv[arg_index++]);
+      }
+      else if ( strcmp(argv[arg_index], "-fs_ls_type") == 0 )
+      {
+         arg_index++;
+         fsai_ls_type = atoi(argv[arg_index++]);
+      }
+      else if ( strcmp(argv[arg_index], "-fs_max_steps") == 0 )
+      {
+         arg_index++;
+         fsai_max_steps = atoi(argv[arg_index++]);
+      }
+      else if ( strcmp(argv[arg_index], "-fs_max_step_size") == 0 )
+      {
+         arg_index++;
+         fsai_max_step_size = atoi(argv[arg_index++]);
+      }
+      else if ( strcmp(argv[arg_index], "-fs_max_nnz_row") == 0 )
+      {
+         arg_index++;
+         fsai_max_nnz_row = atoi(argv[arg_index++]);
+      }
+      else if ( strcmp(argv[arg_index], "-fs_num_levels") == 0 )
+      {
+         arg_index++;
+         fsai_num_levels = atoi(argv[arg_index++]);
+      }
+      else if ( strcmp(argv[arg_index], "-fs_threshold") == 0 )
+      {
+         arg_index++;
+         fsai_threshold = atof(argv[arg_index++]);
+      }
+      else if ( strcmp(argv[arg_index], "-fs_eig_max_iters") == 0 )
+      {
+         arg_index++;
+         fsai_eig_max_iters = atoi(argv[arg_index++]);
+      }
+      else if ( strcmp(argv[arg_index], "-fs_kap_tol") == 0 )
+      {
+         arg_index++;
+         fsai_kap_tolerance = (HYPRE_Real)atof(argv[arg_index++]);
+      }
+      /* end FSAI options */
 #if defined(HYPRE_USING_GPU)
-      else if ( strcmp(argv[arg_index], "-exec_host") == 0 )
+      else if ( strcmp(argv[arg_index], "-mm_vendor") == 0 )
       {
          arg_index++;
-         default_exec_policy = HYPRE_EXEC_HOST;
+         spgemm_use_vendor = atoi(argv[arg_index++]);
       }
-      else if ( strcmp(argv[arg_index], "-exec_device") == 0 )
+      else if ( strcmp(argv[arg_index], "-nmv") == 0 )
       {
          arg_index++;
-         default_exec_policy = HYPRE_EXEC_DEVICE;
+         nmv = atoi(argv[arg_index++]);
       }
-      else if ( strcmp(argv[arg_index], "-mm_cusparse") == 0 )
+      else if ( strcmp(argv[arg_index], "-mv_vendor") == 0 )
       {
          arg_index++;
-         spgemm_use_cusparse = atoi(argv[arg_index++]);
+         spmv_use_vendor = atoi(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-spgemm_alg") == 0 )
       {
          arg_index++;
          spgemm_alg  = atoi(argv[arg_index++]);
       }
+      else if ( strcmp(argv[arg_index], "-spgemm_binned") == 0 )
+      {
+         arg_index++;
+         spgemm_binned  = atoi(argv[arg_index++]);
+      }
       else if ( strcmp(argv[arg_index], "-spgemm_rowest") == 0 )
       {
          arg_index++;
@@ -1145,25 +1566,20 @@ main( hypre_int argc,
       else if ( strcmp(argv[arg_index], "-spgemm_rowestmult") == 0 )
       {
          arg_index++;
-         spgemm_rowest_mult  = atof(argv[arg_index++]);
+         spgemm_rowest_mult  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-spgemm_rowestnsamples") == 0 )
       {
          arg_index++;
          spgemm_rowest_nsamples  = atoi(argv[arg_index++]);
       }
-      else if ( strcmp(argv[arg_index], "-spgemm_hash") == 0 )
-      {
-         arg_index++;
-         spgemm_hash_type  = argv[arg_index++][0];
-      }
       else if ( strcmp(argv[arg_index], "-use_curand") == 0 )
       {
          arg_index++;
          use_curand = atoi(argv[arg_index++]);
       }
 #endif
-#ifdef HYPRE_USING_DEVICE_POOL
+#if defined (HYPRE_USING_DEVICE_POOL)
       else if ( strcmp(argv[arg_index], "-mempool_growth") == 0 )
       {
          arg_index++;
@@ -1183,28 +1599,77 @@ main( hypre_int argc,
       {
          // Give maximum cached in Mbytes.
          arg_index++;
-         mempool_max_cached_bytes = atoi(argv[arg_index++])*1024LL*1024LL;
+         mempool_max_cached_bytes = atoi(argv[arg_index++]) * 1024LL * 1024LL;
       }
-#endif
-      else if ( strcmp(argv[arg_index], "-negA") == 0 )
+#elif defined (HYPRE_USING_UMPIRE)
+      else if ( strcmp(argv[arg_index], "-umpire_dev_pool_size") == 0 )
       {
          arg_index++;
-         negA = atoi(argv[arg_index++]);
+         umpire_dev_pool_size = (size_t) 1073741824 * atoi(argv[arg_index++]);
       }
-      else
+      else if ( strcmp(argv[arg_index], "-umpire_uvm_pool_size") == 0 )
       {
          arg_index++;
+         umpire_uvm_pool_size = (size_t) 1073741824 * atoi(argv[arg_index++]);
       }
-   }
-
-   /* begin CGC BM Aug 25, 2006 */
-   if (coarsen_type == 21 || coarsen_type == 22) {
-      arg_index = 0;
-      while ( (arg_index < argc) && (!print_usage) )
+      else if ( strcmp(argv[arg_index], "-umpire_pinned_pool_size") == 0 )
       {
-         if ( strcmp(argv[arg_index], "-cgcits") == 0 )
-         {
-            arg_index++;
+         arg_index++;
+         umpire_pinned_pool_size = (size_t) 1073741824 * atoi(argv[arg_index++]);
+      }
+      else if ( strcmp(argv[arg_index], "-umpire_host_pool_size") == 0 )
+      {
+         arg_index++;
+         umpire_host_pool_size = (size_t) 1073741824 * atoi(argv[arg_index++]);
+      }
+#endif
+      else if ( strcmp(argv[arg_index], "-negA") == 0 )
+      {
+         arg_index++;
+         negA = atoi(argv[arg_index++]);
+      }
+      else if ( strcmp(argv[arg_index], "-second_time") == 0 )
+      {
+         arg_index++;
+         second_time = atoi(argv[arg_index++]);
+      }
+      else if ( strcmp(argv[arg_index], "-benchmark") == 0 )
+      {
+         arg_index++;
+         benchmark = atoi(argv[arg_index++]);
+      }
+#if defined(HYPRE_USING_MEMORY_TRACKER)
+      else if ( strcmp(argv[arg_index], "-print_mem_tracker") == 0 )
+      {
+         arg_index++;
+         print_mem_tracker = atoi(argv[arg_index++]);
+      }
+      else if ( strcmp(argv[arg_index], "-mem_tracker_filename") == 0 )
+      {
+         arg_index++;
+         snprintf(mem_tracker_name, HYPRE_MAX_FILE_NAME_LEN, "%s", argv[arg_index++]);
+      }
+#endif
+      else if ( strcmp(argv[arg_index], "-gpu_mpi") == 0 )
+      {
+         arg_index++;
+         gpu_aware_mpi = atoi(argv[arg_index++]);
+      }
+      else
+      {
+         arg_index++;
+      }
+   }
+
+   /* begin CGC BM Aug 25, 2006 */
+   if (coarsen_type == 21 || coarsen_type == 22)
+   {
+      arg_index = 0;
+      while ( (arg_index < argc) && (!print_usage) )
+      {
+         if ( strcmp(argv[arg_index], "-cgcits") == 0 )
+         {
+            arg_index++;
             cgcits = atoi(argv[arg_index++]);
          }
          else
@@ -1301,59 +1766,59 @@ main( hypre_int argc,
       else if ( strcmp(argv[arg_index], "-w") == 0 )
       {
          arg_index++;
-         relax_wt = atof(argv[arg_index++]);
+         relax_wt = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-wl") == 0 )
       {
          arg_index++;
-         relax_wt_level = atof(argv[arg_index++]);
+         relax_wt_level = (HYPRE_Real)atof(argv[arg_index++]);
          level_w = atoi(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-ow") == 0 )
       {
          arg_index++;
-         outer_wt = atof(argv[arg_index++]);
+         outer_wt = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-owl") == 0 )
       {
          arg_index++;
-         outer_wt_level = atof(argv[arg_index++]);
+         outer_wt_level = (HYPRE_Real)atof(argv[arg_index++]);
          level_ow = atoi(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-sw") == 0 )
       {
          arg_index++;
-         schwarz_rlx_weight = atof(argv[arg_index++]);
-      }
-      else if ( strcmp(argv[arg_index], "-coarse_th") == 0 )
-      {
-         arg_index++;
-         coarse_threshold  = atof(argv[arg_index++]);
+         schwarz_rlx_weight = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-adroptol") == 0 )
       {
          arg_index++;
-         A_drop_tol  = atof(argv[arg_index++]);
+         A_drop_tol  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-adroptype") == 0 )
       {
          arg_index++;
          A_drop_type  = atoi(argv[arg_index++]);
       }
+      else if ( strcmp(argv[arg_index], "-coarse_th") == 0 )
+      {
+         arg_index++;
+         coarse_threshold  = atoi(argv[arg_index++]);
+      }
       else if ( strcmp(argv[arg_index], "-min_cs") == 0 )
       {
          arg_index++;
-         min_coarse_size  = atof(argv[arg_index++]);
+         min_coarse_size  = atoi(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-seq_th") == 0 )
       {
          arg_index++;
-         seq_threshold  = atof(argv[arg_index++]);
+         seq_threshold  = atoi(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-red") == 0 )
       {
          arg_index++;
-         redundant  = atof(argv[arg_index++]);
+         redundant  = atoi(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-cutf") == 0 )
       {
@@ -1363,17 +1828,17 @@ main( hypre_int argc,
       else if ( strcmp(argv[arg_index], "-th") == 0 )
       {
          arg_index++;
-         strong_threshold  = atof(argv[arg_index++]);
+         strong_threshold  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-thR") == 0 )
       {
          arg_index++;
-         strong_thresholdR  = atof(argv[arg_index++]);
+         strong_thresholdR  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-fltr_thR") == 0 )
       {
          arg_index++;
-         filter_thresholdR  = atof(argv[arg_index++]);
+         filter_thresholdR  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-CF") == 0 )
       {
@@ -1383,12 +1848,12 @@ main( hypre_int argc,
       else if ( strcmp(argv[arg_index], "-cf") == 0 )
       {
          arg_index++;
-         cf_tol  = atof(argv[arg_index++]);
+         cf_tol  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-tol") == 0 )
       {
          arg_index++;
-         tol  = atof(argv[arg_index++]);
+         tol  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-conv_type") == 0 )
       {
@@ -1398,27 +1863,27 @@ main( hypre_int argc,
       else if ( strcmp(argv[arg_index], "-atol") == 0 )
       {
          arg_index++;
-         atol  = atof(argv[arg_index++]);
+         atol  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-mxrs") == 0 )
       {
          arg_index++;
-         max_row_sum  = atof(argv[arg_index++]);
+         max_row_sum  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-sai_th") == 0 )
       {
          arg_index++;
-         sai_threshold  = atof(argv[arg_index++]);
+         sai_threshold  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-sai_filt") == 0 )
       {
          arg_index++;
-         sai_filter  = atof(argv[arg_index++]);
+         sai_filter  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-drop_tol") == 0 )
       {
          arg_index++;
-         drop_tol  = atof(argv[arg_index++]);
+         drop_tol  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-nonzeros_to_keep") == 0 )
       {
@@ -1428,12 +1893,12 @@ main( hypre_int argc,
       else if ( strcmp(argv[arg_index], "-ilut") == 0 )
       {
          arg_index++;
-         eu_ilut  = atof(argv[arg_index++]);
+         eu_ilut  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-sparseA") == 0 )
       {
          arg_index++;
-         eu_sparse_A  = atof(argv[arg_index++]);
+         eu_sparse_A  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-rowScale") == 0 )
       {
@@ -1463,7 +1928,7 @@ main( hypre_int argc,
       else if ( strcmp(argv[arg_index], "-tr") == 0 )
       {
          arg_index++;
-         trunc_factor  = atof(argv[arg_index++]);
+         trunc_factor  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-Pmx") == 0 )
       {
@@ -1478,7 +1943,7 @@ main( hypre_int argc,
       else if ( strcmp(argv[arg_index], "-Qtr") == 0 )
       {
          arg_index++;
-         Q_trunc  = atof(argv[arg_index++]);
+         Q_trunc  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-Qmx") == 0 )
       {
@@ -1488,12 +1953,12 @@ main( hypre_int argc,
       else if ( strcmp(argv[arg_index], "-jtr") == 0 )
       {
          arg_index++;
-         jacobi_trunc_threshold  = atof(argv[arg_index++]);
+         jacobi_trunc_threshold  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-Ssw") == 0 )
       {
          arg_index++;
-         S_commpkg_switch = atof(argv[arg_index++]);
+         S_commpkg_switch = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-solver_type") == 0 )
       {
@@ -1514,6 +1979,17 @@ main( hypre_int argc,
       {
          arg_index++;
          poutdat  = atoi(argv[arg_index++]);
+         poutusr = 1;
+      }
+      else if ( strcmp(argv[arg_index], "-skipbreak") == 0 )
+      {
+         arg_index++;
+         skip_break  = atoi(argv[arg_index++]);
+      }
+      else if ( strcmp(argv[arg_index], "-flex") == 0 )
+      {
+         arg_index++;
+         flex  = atoi(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-var") == 0 )
       {
@@ -1581,12 +2057,12 @@ main( hypre_int argc,
       else if ( strcmp(argv[arg_index], "-agg_tr") == 0 )
       {
          arg_index++;
-         agg_trunc_factor  = atof(argv[arg_index++]);
+         agg_trunc_factor  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-agg_P12_tr") == 0 )
       {
          arg_index++;
-         agg_P12_trunc_factor  = atof(argv[arg_index++]);
+         agg_P12_trunc_factor  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-postinterptype") == 0 )
       {
@@ -1636,7 +2112,7 @@ main( hypre_int argc,
       else if ( strcmp(argv[arg_index], "-cheby_fraction") == 0 )
       {
          arg_index++;
-         cheby_fraction = atof(argv[arg_index++]);
+         cheby_fraction = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-additive") == 0 )
       {
@@ -1666,7 +2142,7 @@ main( hypre_int argc,
       else if ( strcmp(argv[arg_index], "-add_tr") == 0 )
       {
          arg_index++;
-         add_trunc_factor  = atof(argv[arg_index++]);
+         add_trunc_factor  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-add_rlx") == 0 )
       {
@@ -1676,7 +2152,7 @@ main( hypre_int argc,
       else if ( strcmp(argv[arg_index], "-add_w") == 0 )
       {
          arg_index++;
-         add_relax_wt = atof(argv[arg_index++]);
+         add_relax_wt = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-rap") == 0 )
       {
@@ -1707,7 +2183,7 @@ main( hypre_int argc,
          nongalerk_tol = hypre_CTAlloc(HYPRE_Real,  nongalerk_num_tol, HYPRE_MEMORY_HOST);
          for (i = 0; i < nongalerk_num_tol; i++)
          {
-            nongalerk_tol[i] = atof(argv[arg_index++]);
+            nongalerk_tol[i] = (HYPRE_Real)atof(argv[arg_index++]);
          }
       }
       else if ( strcmp(argv[arg_index], "-print") == 0 )
@@ -1715,6 +2191,11 @@ main( hypre_int argc,
          arg_index++;
          print_system = 1;
       }
+      else if ( strcmp(argv[arg_index], "-printbin") == 0 )
+      {
+         arg_index++;
+         print_system_binary = 1;
+      }
       /* BM Oct 23, 2006 */
       else if ( strcmp(argv[arg_index], "-plot_grids") == 0 )
       {
@@ -1724,7 +2205,7 @@ main( hypre_int argc,
       else if ( strcmp(argv[arg_index], "-plot_file_name") == 0 )
       {
          arg_index++;
-         hypre_sprintf (plot_file_name,"%s",argv[arg_index++]);
+         hypre_sprintf (plot_file_name, "%s", argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-AIR") == 0 )
       {
@@ -1766,6 +2247,11 @@ main( hypre_int argc,
          arg_index++;
          amgdd_num_ghost_layers = atoi(argv[arg_index++]);
       }
+      else if ( strcmp(argv[arg_index], "-precon_cycles") == 0 )
+      {
+         arg_index++;
+         precon_cycles = atoi(argv[arg_index++]);
+      }
       else
       {
          arg_index++;
@@ -1777,11 +2263,14 @@ main( hypre_int argc,
    {
       restri_type = air;    /* Set Restriction to be AIR */
       interp_type = 100;    /* 1-pt Interp */
-#if defined(HYPRE_USING_GPU)
-      relax_type = 7;
-#else
-      relax_type = 0;
-#endif
+      if (hypre_GetExecPolicy1(memory_location) == HYPRE_EXEC_DEVICE)
+      {
+         relax_type = 7;
+      }
+      else
+      {
+         relax_type = 0;
+      }
       ns_down = 0;
       ns_up = 3;
       /* this is a 2-D 4-by-k array using Double pointers */
@@ -1791,7 +2280,7 @@ main( hypre_int argc,
       grid_relax_points[2] = hypre_CTAlloc(HYPRE_Int, ns_up, HYPRE_MEMORY_HOST);
       grid_relax_points[3] = hypre_CTAlloc(HYPRE_Int, ns_coarse, HYPRE_MEMORY_HOST);
       /* down cycle: C */
-      for (i=0; i<ns_down; i++)
+      for (i = 0; i < ns_down; i++)
       {
          grid_relax_points[1][i] = 0;//1;
       }
@@ -1811,7 +2300,7 @@ main( hypre_int argc,
       }
       //}
       /* coarse: all */
-      for (i=0; i<ns_coarse; i++)
+      for (i = 0; i < ns_coarse; i++)
       {
          grid_relax_points[3][i] = 0;
       }
@@ -1830,18 +2319,27 @@ main( hypre_int argc,
          hypre_printf("\n");
          hypre_printf("Usage: %s [<options>]\n", argv[0]);
          hypre_printf("\n");
+         hypre_printf("  -ll                        : hypre's log level. \n");
+         hypre_printf("      0 = (default) No messaging.\n");
+         hypre_printf("      1 = Display memory usage statistics for each MPI rank.\n");
+         hypre_printf("      2 = Display aggregate memory usage statistics over MPI ranks.\n");
          hypre_printf("  -fromfile <filename>       : ");
          hypre_printf("matrix read from multiple files (IJ format)\n");
+         hypre_printf("  -frombinfile <filename>    : ");
+         hypre_printf("matrix read from multiple binary files (IJ format)\n");
          hypre_printf("  -fromparcsrfile <filename> : ");
          hypre_printf("matrix read from multiple files (ParCSR format)\n");
          hypre_printf("  -fromonecsrfile <filename> : ");
          hypre_printf("matrix read from a single file (CSR format)\n");
          hypre_printf("\n");
-         hypre_printf("  -laplacian [<options>] : build 5pt 2D laplacian problem (default) \n");
+         hypre_printf("  -laplacian             : build 5pt 2D laplacian problem (default) \n");
          hypre_printf("  -sysL <num functions>  : build SYSTEMS laplacian 7pt operator\n");
          hypre_printf("  -9pt [<opts>]          : build 9pt 2D laplacian problem\n");
          hypre_printf("  -27pt [<opts>]         : build 27pt 3D laplacian problem\n");
+         hypre_printf("  -125pt [<opts>]        : build 125pt (27pt squared) 3D laplacian\n");
          hypre_printf("  -difconv [<opts>]      : build convection-diffusion problem\n");
+         hypre_printf("  -vardifconv [<opts>]   : build variable conv.-diffusion problem\n");
+         hypre_printf("  -rotate [<opts>]       : build 7pt rotated laplacian problem\n");
          hypre_printf("    -n <nx> <ny> <nz>    : total problem size \n");
          hypre_printf("    -P <Px> <Py> <Pz>    : processor topology\n");
          hypre_printf("    -c <cx> <cy> <cz>    : diffusion coefficients\n");
@@ -1854,8 +2352,12 @@ main( hypre_int argc,
          hypre_printf("  -storage_low           : allocates not enough storage for aux struct\n");
          hypre_printf("  -concrete_parcsr       : use parcsr matrix type as concrete type\n");
          hypre_printf("\n");
+         hypre_printf("  -rbm <val> <filename>  : rigid body mode vectors\n");
+         hypre_printf("  -nc <val>              : number of components of a vector (multivector)\n");
          hypre_printf("  -rhsfromfile           : ");
          hypre_printf("rhs read from multiple files (IJ format)\n");
+         hypre_printf("  -rhsfrombinfile        : ");
+         hypre_printf("rhs read from multiple binary files (IJ format)\n");
          hypre_printf("  -rhsfromonefile        : ");
          hypre_printf("rhs read from a single file (CSR format)\n");
          hypre_printf("  -rhsparcsrfile        :  ");
@@ -1865,7 +2367,7 @@ main( hypre_int argc,
          hypre_printf("  -SFfromonefile          : ");
          hypre_printf("list of isolated F points from a single file\n");
          hypre_printf("  -rhsrand               : rhs is random vector\n");
-         hypre_printf("  -rhsisone              : rhs is vector with unit components (default)\n");
+         hypre_printf("  -rhsisone              : rhs is vector with unit coefficients (default)\n");
          hypre_printf("  -xisone                : solution of all ones\n");
          hypre_printf("  -rhszero               : rhs is zero vector\n");
          hypre_printf("\n");
@@ -1877,9 +2379,9 @@ main( hypre_int argc,
          hypre_printf("  -srcfromonefile        : ");
          hypre_printf("backward Euler source read from a single file (IJ format)\n");
          hypre_printf("  -srcrand               : ");
-         hypre_printf("backward Euler source is random vector with components in range 0 - 1\n");
+         hypre_printf("backward Euler source is random vector with coefficients in range 0 - 1\n");
          hypre_printf("  -srcisone              : ");
-         hypre_printf("backward Euler source is vector with unit components (default)\n");
+         hypre_printf("backward Euler source is vector with unit coefficients (default)\n");
          hypre_printf("  -srczero               : ");
          hypre_printf("backward Euler source is zero-vector\n");
          hypre_printf("  -x0fromfile           : ");
@@ -1897,6 +2399,7 @@ main( hypre_int argc,
          hypre_printf("       16=AMG-COGMRES     17=DIAG-COGMRES\n");
          hypre_printf("       18=ParaSails-GMRES\n");
          hypre_printf("       20=Hybrid solver/ DiagScale, AMG \n");
+         hypre_printf("       31=FSAI-PCG \n");
          hypre_printf("       43=Euclid-PCG      44=Euclid-GMRES   \n");
          hypre_printf("       45=Euclid-BICGSTAB 46=Euclid-COGMRES\n");
          hypre_printf("       47=Euclid-FlexGMRES\n");
@@ -1905,7 +2408,7 @@ main( hypre_int argc,
          hypre_printf("       70=MGR             71=MGR-PCG  \n");
          hypre_printf("       72=MGR-FlexGMRES   73=MGR-BICGSTAB  \n");
          hypre_printf("       74=MGR-COGMRES  \n");
-         hypre_printf("       80=ILU      81=ILU-GMRES  \n");
+         hypre_printf("       80=ILU             81=ILU-GMRES  \n");
          hypre_printf("       82=ILU-FlexGMRES  \n");
          hypre_printf("       90=AMG-DD          91=AMG-DD-GMRES  \n");
          hypre_printf("\n");
@@ -2010,6 +2513,7 @@ main( hypre_int argc,
          hypre_printf("  -jtr  <val>            : set truncation threshold for Jacobi interpolation = val \n");
          hypre_printf("  -Ssw  <val>            : set S-commpkg-switch = val \n");
          hypre_printf("  -mxrs <val>            : set AMG maximum row sum threshold for dependency weakening \n");
+         hypre_printf("  -ff <0/1>              : set filtering based on functions for systems AMG\n");
          hypre_printf("  -nf <val>              : set number of functions for systems AMG\n");
          hypre_printf("  -numsamp <val>         : set number of sample vectors for GSMG\n");
 
@@ -2165,8 +2669,27 @@ main( hypre_int argc,
          hypre_printf("  -ilu_max_row_nnz   <val>         : set max. num of nonzeros to keep per row = val \n");
          hypre_printf("  -ilu_schur_max_iter   <val>      : set max. num of iteration for GMRES/NSH Schur = val \n");
          hypre_printf("  -ilu_nsh_droptol   <val>         : set drop tolerance threshold for NSH = val \n");
+         hypre_printf("  -ilu_reordering <val>            : 0: no reordering. 1: Reverse Cuthill-McKee.\n");
+         hypre_printf("  -ilu_tri_solve <0/1>             : 0: iterative solve. 1: direct solve.\n");
+         hypre_printf("  -ilu_ljac_iters <val>            : set number of lower Jacobi iterations for the triangular L solves when using iterative solve approach.\n");
+         hypre_printf("  -ilu_ujac_iters <val>            : set number of upper Jacobi iterations for the triangular U solves when using iterative solve approach.\n");
+         hypre_printf("  -ilu_iter_setup_type <val>       : set iterative ILU setup algorithm.\n");
+         hypre_printf("  -ilu_iter_setup_option <val>     : set iterative ILU setup option.\n");
+         hypre_printf("  -ilu_iter_setup_max_iter <val>   : set max. number of iterations for iterative ILU setup.\n");
+         hypre_printf("  -ilu_iter_setup_tolerance <val>  : set stopping tolerance for iterative ILU setup.\n");
          hypre_printf("  -ilu_sm_max_iter   <val>         : set number of iterations when applied as a smmother in AMG = val \n");
          /* end ILU options */
+         /* hypre FSAI options */
+         hypre_printf("  -fs_algo_type <val>              : FSAI algorithm type\n");
+         hypre_printf("  -fs_ls_type <val>                : FSAI local solve type\n");
+         hypre_printf("  -fs_max_steps <val>              : Max. number of steps (adaptive)\n");
+         hypre_printf("  -fs_max_step_size <val>          : Max. step size (adaptive)\n");
+         hypre_printf("  -fs_max_nnz_row <val>            : Max. nonzeros per row (static)\n");
+         hypre_printf("  -fs_num_levels <val>             : Number of levels (static)\n");
+         hypre_printf("  -fs_threshold <val>              : Filtering threshold (static)\n");
+         hypre_printf("  -fs_eig_max_iters <val>          : Max. it. for eig calculation.\n");
+         hypre_printf("  -fs_kap_tol <val>                : Kap. theshold (adaptive)\n");
+         /* end FSAI options */
          /* hypre AMG-DD options */
          hypre_printf("  -amgdd_start_level   <val>       : set AMG-DD start level = val\n");
          hypre_printf("  -amgdd_padding   <val>           : set AMG-DD padding = val\n");
@@ -2183,6 +2706,14 @@ main( hypre_int argc,
          hypre_printf("       2=W-cycle  \n");
          hypre_printf("       3=F-cycle  \n");
          /* end AMG-DD options */
+#if defined (HYPRE_USING_UMPIRE)
+         /* hypre umpire options */
+         hypre_printf("  -umpire_dev_pool_size <val>      : device memory pool size (GiB)\n");
+         hypre_printf("  -umpire_uvm_pool_size <val>      : device unified virtual memory pool size (GiB)\n");
+         hypre_printf("  -umpire_pinned_pool_size <val>   : pinned memory pool size (GiB)\n");
+         hypre_printf("  -umpire_host_pool_size <val>     : host memory pool size (GiB)\n");
+         /* end umpire options */
+#endif
       }
 
       goto final;
@@ -2194,47 +2725,63 @@ main( hypre_int argc,
 
    if (myid == 0)
    {
+#if defined(HYPRE_DEVELOP_STRING) && defined(HYPRE_DEVELOP_BRANCH)
+      hypre_printf("\nUsing HYPRE_DEVELOP_STRING: %s (branch %s; the develop branch)\n\n",
+                   HYPRE_DEVELOP_STRING, HYPRE_DEVELOP_BRANCH);
+
+#elif defined(HYPRE_DEVELOP_STRING) && !defined(HYPRE_DEVELOP_BRANCH)
+      hypre_printf("\nUsing HYPRE_DEVELOP_STRING: %s (branch %s; not the develop branch)\n\n",
+                   HYPRE_DEVELOP_STRING, HYPRE_BRANCH_NAME);
+
+#elif defined(HYPRE_RELEASE_VERSION)
+      hypre_printf("\nUsing HYPRE_RELEASE_VERSION: %s\n\n",
+                   HYPRE_RELEASE_VERSION);
+#endif
+
       hypre_printf("Running with these driver parameters:\n");
       hypre_printf("  solver ID    = %d\n\n", solver_id);
    }
 
-   /*-----------------------------------------------------------------
-    * GPU Device binding
-    * Must be done before HYPRE_Init() and should not be changed after
-    *-----------------------------------------------------------------*/
-   hypre_bind_device(myid, num_procs, hypre_MPI_COMM_WORLD);
-
-   time_index = hypre_InitializeTiming("Hypre init");
-   hypre_BeginTiming(time_index);
-
    /*-----------------------------------------------------------
-    * Initialize : must be the first HYPRE function to call
+    * Set various things
     *-----------------------------------------------------------*/
-   HYPRE_Init();
 
-   hypre_EndTiming(time_index);
-   hypre_PrintTiming("Hypre init times", hypre_MPI_COMM_WORLD);
-   hypre_FinalizeTiming(time_index);
-   hypre_ClearTiming();
+   HYPRE_SetPrintErrorMode(1);
+   if (test_error == 1)
+   {
+      HYPRE_SetPrintErrorVerbosity(-1, 0);                   /* turn all errors off */
+      HYPRE_SetPrintErrorVerbosity(HYPRE_ERROR_GENERIC, 1);  /* turn generic errors on */
+   }
 
-#ifdef HYPRE_USING_DEVICE_POOL
+#if defined(HYPRE_USING_DEVICE_POOL)
    /* To be effective, hypre_SetCubMemPoolSize must immediately follow HYPRE_Init */
    HYPRE_SetGPUMemoryPoolSize( mempool_bin_growth, mempool_min_bin,
                                mempool_max_bin, mempool_max_cached_bytes );
-#endif
 
-#if defined(HYPRE_USING_UMPIRE)
+#elif defined(HYPRE_USING_UMPIRE)
    /* Setup Umpire pools */
    HYPRE_SetUmpireDevicePoolName("HYPRE_DEVICE_POOL_TEST");
    HYPRE_SetUmpireUMPoolName("HYPRE_UM_POOL_TEST");
    HYPRE_SetUmpireHostPoolName("HYPRE_HOST_POOL_TEST");
    HYPRE_SetUmpirePinnedPoolName("HYPRE_PINNED_POOL_TEST");
-   HYPRE_SetUmpireDevicePoolSize(4LL * 1024 * 1024 * 1024);
-   HYPRE_SetUmpireUMPoolSize(4LL * 1024 * 1024 * 1024);
-   HYPRE_SetUmpireHostPoolSize(4LL * 1024 * 1024 * 1024);
-   HYPRE_SetUmpirePinnedPoolSize(4LL * 1024 * 1024 * 1024);
+
+   HYPRE_SetUmpireDevicePoolSize(umpire_dev_pool_size);
+   HYPRE_SetUmpireUMPoolSize(umpire_uvm_pool_size);
+   HYPRE_SetUmpireHostPoolSize(umpire_host_pool_size);
+   HYPRE_SetUmpirePinnedPoolSize(umpire_pinned_pool_size);
+#endif
+
+#if defined(HYPRE_USING_MEMORY_TRACKER)
+   hypre_MemoryTrackerSetPrint(print_mem_tracker);
+   if (mem_tracker_name[0])
+   {
+      hypre_MemoryTrackerSetFileName(mem_tracker_name);
+   }
 #endif
 
+   /* Set log level */
+   HYPRE_SetLogLevel(log_level);
+
    /* default memory location */
    HYPRE_SetMemoryLocation(memory_location);
 
@@ -2242,17 +2789,20 @@ main( hypre_int argc,
    HYPRE_SetExecutionPolicy(default_exec_policy);
 
 #if defined(HYPRE_USING_GPU)
-   /* use cuSPARSE for SpGEMM */
-   ierr = HYPRE_SetSpGemmUseCusparse(spgemm_use_cusparse); hypre_assert(ierr == 0);
+   ierr = HYPRE_SetSpMVUseVendor(spmv_use_vendor); hypre_assert(ierr == 0);
+   /* use vendor implementation for SpGEMM */
+   ierr = HYPRE_SetSpGemmUseVendor(spgemm_use_vendor); hypre_assert(ierr == 0);
    ierr = hypre_SetSpGemmAlgorithm(spgemm_alg); hypre_assert(ierr == 0);
+   ierr = hypre_SetSpGemmBinned(spgemm_binned); hypre_assert(ierr == 0);
    ierr = hypre_SetSpGemmRownnzEstimateMethod(spgemm_rowest_mtd); hypre_assert(ierr == 0);
-   ierr = hypre_SetSpGemmRownnzEstimateNSamples(spgemm_rowest_nsamples); hypre_assert(ierr == 0);
-   ierr = hypre_SetSpGemmRownnzEstimateMultFactor(spgemm_rowest_mult); hypre_assert(ierr == 0);
-   ierr = hypre_SetSpGemmHashType(spgemm_hash_type); hypre_assert(ierr == 0);
+   if (spgemm_rowest_nsamples > 0) { ierr = hypre_SetSpGemmRownnzEstimateNSamples(spgemm_rowest_nsamples); hypre_assert(ierr == 0); }
+   if (spgemm_rowest_mult > 0.0) { ierr = hypre_SetSpGemmRownnzEstimateMultFactor(spgemm_rowest_mult); hypre_assert(ierr == 0); }
    /* use cuRand for PMIS */
    HYPRE_SetUseGpuRand(use_curand);
 #endif
 
+   HYPRE_SetGpuAwareMPI(gpu_aware_mpi);
+
    /*-----------------------------------------------------------
     * Set up matrix
     *-----------------------------------------------------------*/
@@ -2265,14 +2815,24 @@ main( hypre_int argc,
 
    time_index = hypre_InitializeTiming("Spatial Operator");
    hypre_BeginTiming(time_index);
-   if ( build_matrix_type == -1 )
+   if ( build_matrix_type == -2 )
+   {
+      ierr = HYPRE_IJMatrixReadBinary( argv[build_matrix_arg_index], comm,
+                                       HYPRE_PARCSR, &ij_A );
+      if (ierr)
+      {
+         hypre_printf("ERROR: Problem reading in the system matrix!\n");
+         hypre_MPI_Abort(comm, 1);
+      }
+   }
+   else if ( build_matrix_type == -1 )
    {
       ierr = HYPRE_IJMatrixRead( argv[build_matrix_arg_index], comm,
                                  HYPRE_PARCSR, &ij_A );
       if (ierr)
       {
          hypre_printf("ERROR: Problem reading in the system matrix!\n");
-         exit(1);
+         hypre_MPI_Abort(comm, 1);
       }
    }
    else if ( build_matrix_type == 0 )
@@ -2296,45 +2856,57 @@ main( hypre_int argc,
    {
       BuildParLaplacian27pt(argc, argv, build_matrix_arg_index, &parcsr_A);
 
-      hypre_CSRMatrixGpuSpMVAnalysis(hypre_ParCSRMatrixDiag(parcsr_A));
+#if defined(HYPRE_USING_GPU)
+      hypre_CSRMatrixSpMVAnalysisDevice(hypre_ParCSRMatrixDiag(parcsr_A));
+#endif
    }
    else if ( build_matrix_type == 5 )
    {
-      BuildParDifConv(argc, argv, build_matrix_arg_index, &parcsr_A);
+      BuildParLaplacian125pt(argc, argv, build_matrix_arg_index, &parcsr_A);
+
+#if defined(HYPRE_USING_GPU)
+      hypre_CSRMatrixSpMVAnalysisDevice(hypre_ParCSRMatrixDiag(parcsr_A));
+#endif
    }
    else if ( build_matrix_type == 6 )
+   {
+      BuildParDifConv(argc, argv, build_matrix_arg_index, &parcsr_A);
+   }
+   else if ( build_matrix_type == 7 )
    {
       BuildParVarDifConv(argc, argv, build_matrix_arg_index, &parcsr_A, &b);
       build_rhs_type      = 6;
       build_src_type      = 5;
    }
-   else if ( build_matrix_type == 7 )
+   else if ( build_matrix_type == 8 )
    {
       BuildParRotate7pt(argc, argv, build_matrix_arg_index, &parcsr_A);
    }
-
    else
    {
       hypre_printf("You have asked for an unsupported problem with\n");
       hypre_printf("build_matrix_type = %d.\n", build_matrix_type);
-      return(-1);
+
+      hypre_MPI_Abort(comm, 1);
    }
+
    /* BM Oct 23, 2006 */
    if (plot_grids)
    {
-      if (build_matrix_type > 1 &&  build_matrix_type < 8)
+      if (build_matrix_type > 1 &&  build_matrix_type < 9)
          BuildParCoordinates (argc, argv, build_matrix_arg_index,
                               &coord_dim, &coordinates);
       else
       {
-         hypre_printf("Warning: coordinates are not yet printed for build_matrix_type = %d.\n", build_matrix_type);
+         hypre_printf("Warning: coordinates are not yet printed for build_matrix_type = %d.\n",
+                      build_matrix_type);
       }
    }
 
    if (build_matrix_type < 0)
    {
       ierr = HYPRE_IJMatrixGetLocalRange( ij_A,
-                                          &first_local_row, &last_local_row ,
+                                          &first_local_row, &last_local_row,
                                           &first_local_col, &last_local_col );
 
       local_num_rows = (HYPRE_Int)(last_local_row - first_local_row + 1);
@@ -2348,7 +2920,7 @@ main( hypre_int argc,
        * Copy the parcsr matrix into the IJMatrix through interface calls
        *-----------------------------------------------------------*/
       ierr = HYPRE_ParCSRMatrixGetLocalRange( parcsr_A,
-                                              &first_local_row, &last_local_row ,
+                                              &first_local_row, &last_local_row,
                                               &first_local_col, &last_local_col );
 
       local_num_rows = (HYPRE_Int)(last_local_row - first_local_row + 1);
@@ -2359,6 +2931,33 @@ main( hypre_int argc,
    hypre_FinalizeTiming(time_index);
    hypre_ClearTiming();
 
+   /* Read matrix to be passed to the preconditioner */
+   if (build_matrix_M == 1)
+   {
+      time_index = hypre_InitializeTiming("Auxiliary Operator");
+      hypre_BeginTiming(time_index);
+
+      ierr = HYPRE_IJMatrixRead( argv[build_matrix_M_arg_index], comm,
+                                 HYPRE_PARCSR, &ij_M );
+      if (ierr)
+      {
+         hypre_printf("ERROR: Problem reading in the auxiliary matrix B!\n");
+         exit(1);
+      }
+
+      HYPRE_IJMatrixGetObject(ij_M, &object);
+      parcsr_M = (HYPRE_ParCSRMatrix) object;
+
+      hypre_EndTiming(time_index);
+      hypre_PrintTiming("Auxiliary Operator", hypre_MPI_COMM_WORLD);
+      hypre_FinalizeTiming(time_index);
+      hypre_ClearTiming();
+   }
+   else
+   {
+      parcsr_M = parcsr_A;
+   }
+
    /* Check the ij interface - not necessary if one just wants to test solvers */
    if (test_ij && build_matrix_type > -1)
    {
@@ -2377,7 +2976,7 @@ main( hypre_int argc,
       num_rows = local_num_rows;
       if (off_proc)
       {
-         if (myid != num_procs-1)
+         if (myid != num_procs - 1)
          {
             num_rows++;
          }
@@ -2404,14 +3003,18 @@ main( hypre_int argc,
             {
                size = 7;
             }
-            if (build_matrix_type == 3)
+            else if (build_matrix_type == 3)
             {
                size = 9;
             }
-            if (build_matrix_type == 4)
+            else if (build_matrix_type == 4)
             {
                size = 27;
             }
+            else if (build_matrix_type == 5)
+            {
+               size = 125;
+            }
          }
          row_sizes = hypre_CTAlloc(HYPRE_Int, num_rows, HYPRE_MEMORY_HOST);
          for (i = 0; i < num_rows; i++)
@@ -2424,16 +3027,20 @@ main( hypre_int argc,
       {
          mx_size = 7;
       }
-      if (build_matrix_type == 3)
+      else if (build_matrix_type == 3)
       {
          mx_size = 9;
       }
-      if (build_matrix_type == 4)
+      else if (build_matrix_type == 4)
       {
          mx_size = 27;
       }
-      col_nums = hypre_CTAlloc(HYPRE_BigInt, mx_size*num_rows, HYPRE_MEMORY_HOST);
-      data     = hypre_CTAlloc(HYPRE_Real,   mx_size*num_rows, HYPRE_MEMORY_HOST);
+      else if (build_matrix_type == 5)
+      {
+         mx_size = 125;
+      }
+      col_nums = hypre_CTAlloc(HYPRE_BigInt, mx_size * num_rows, HYPRE_MEMORY_HOST);
+      data     = hypre_CTAlloc(HYPRE_Real,   mx_size * num_rows, HYPRE_MEMORY_HOST);
       i_indx = 0;
       j_indx = 0;
 
@@ -2449,15 +3056,16 @@ main( hypre_int argc,
       for (i = 0; i < local_num_rows; i++)
       {
          row_nums[i_indx] = first_local_row + i;
-         ierr += HYPRE_ParCSRMatrixGetRow(parcsr_A, first_local_row+i, &size, &col_inds, &values);
+         ierr += HYPRE_ParCSRMatrixGetRow(parcsr_A, first_local_row + i, &size, &col_inds, &values);
          num_cols[i_indx++] = size;
-         hypre_TMemcpy(&col_nums[j_indx], &col_inds[0], HYPRE_BigInt, size, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
+         hypre_TMemcpy(&col_nums[j_indx], &col_inds[0], HYPRE_BigInt, size, HYPRE_MEMORY_HOST,
+                       HYPRE_MEMORY_HOST);
          hypre_TMemcpy(&data[j_indx], &values[0], HYPRE_Real, size, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
          if (sparsity_known == 1)
          {
             for (j = 0; j < size; j++)
             {
-               if (col_nums[j_indx+j] < first_local_row || col_nums[j_indx+j] > last_local_row)
+               if (col_nums[j_indx + j] < first_local_row || col_nums[j_indx + j] > last_local_row)
                {
                   offdiag_sizes[local_row]++;
                }
@@ -2469,10 +3077,10 @@ main( hypre_int argc,
          }
          j_indx += size;
          local_row++;
-         ierr += HYPRE_ParCSRMatrixRestoreRow(parcsr_A, first_local_row+i, &size, &col_inds, &values);
+         ierr += HYPRE_ParCSRMatrixRestoreRow(parcsr_A, first_local_row + i, &size, &col_inds, &values);
       }
 
-      if (off_proc && myid != num_procs-1)
+      if (off_proc && myid != num_procs - 1)
       {
          num_cols[i_indx]   = 2;
          row_nums[i_indx++] = last_local_row + 1;
@@ -2508,13 +3116,17 @@ main( hypre_int argc,
       {
          num_cols = hypre_TAlloc(HYPRE_Int,    num_rows,         memory_location);
          row_nums = hypre_TAlloc(HYPRE_BigInt, num_rows,         memory_location);
-         col_nums = hypre_TAlloc(HYPRE_BigInt, mx_size*num_rows, memory_location);
-         data     = hypre_TAlloc(HYPRE_Real,   mx_size*num_rows, memory_location);
+         col_nums = hypre_TAlloc(HYPRE_BigInt, mx_size * num_rows, memory_location);
+         data     = hypre_TAlloc(HYPRE_Real,   mx_size * num_rows, memory_location);
 
-         hypre_TMemcpy(num_cols, num_cols_h, HYPRE_Int,    num_rows,         memory_location, HYPRE_MEMORY_HOST);
-         hypre_TMemcpy(row_nums, row_nums_h, HYPRE_BigInt, num_rows,         memory_location, HYPRE_MEMORY_HOST);
-         hypre_TMemcpy(col_nums, col_nums_h, HYPRE_BigInt, mx_size*num_rows, memory_location, HYPRE_MEMORY_HOST);
-         hypre_TMemcpy(data,     data_h,     HYPRE_Real,   mx_size*num_rows, memory_location, HYPRE_MEMORY_HOST);
+         hypre_TMemcpy(num_cols, num_cols_h, HYPRE_Int,    num_rows,         memory_location,
+                       HYPRE_MEMORY_HOST);
+         hypre_TMemcpy(row_nums, row_nums_h, HYPRE_BigInt, num_rows,         memory_location,
+                       HYPRE_MEMORY_HOST);
+         hypre_TMemcpy(col_nums, col_nums_h, HYPRE_BigInt, mx_size * num_rows, memory_location,
+                       HYPRE_MEMORY_HOST);
+         hypre_TMemcpy(data,     data_h,     HYPRE_Real,   mx_size * num_rows, memory_location,
+                       HYPRE_MEMORY_HOST);
       }
 
       if (chunk)
@@ -2535,7 +3147,7 @@ main( hypre_int argc,
       else
       {
          j_indx = 0;
-         for (i=0; i < num_rows; i++)
+         for (i = 0; i < num_rows; i++)
          {
             if (add)
             {
@@ -2584,7 +3196,7 @@ main( hypre_int argc,
       if (ierr)
       {
          hypre_printf("Error in driver building IJMatrix from parcsr matrix. \n");
-         return(-1);
+         return (-1);
       }
 
       /* This is to emphasize that one can IJMatrixAddToValues after an
@@ -2613,7 +3225,7 @@ main( hypre_int argc,
       }
       if (dt < dt_inf)
       {
-         val += 1./dt;
+         val += 1. / dt;
       }
       else
       {
@@ -2641,10 +3253,14 @@ main( hypre_int argc,
          col_inds = hypre_TAlloc(HYPRE_BigInt,  last_local_row - first_local_row + 1, memory_location);
          values   = hypre_TAlloc(HYPRE_Real,    last_local_row - first_local_row + 1, memory_location);
 
-         hypre_TMemcpy(ncols,    ncols_h,    HYPRE_Int,    last_local_row - first_local_row + 1, memory_location, HYPRE_MEMORY_HOST);
-         hypre_TMemcpy(rows,     rows_h,     HYPRE_BigInt, last_local_row - first_local_row + 1, memory_location, HYPRE_MEMORY_HOST);
-         hypre_TMemcpy(col_inds, col_inds_h, HYPRE_BigInt, last_local_row - first_local_row + 1, memory_location, HYPRE_MEMORY_HOST);
-         hypre_TMemcpy(values,   values_h,   HYPRE_Real,   last_local_row - first_local_row + 1, memory_location, HYPRE_MEMORY_HOST);
+         hypre_TMemcpy(ncols,    ncols_h,    HYPRE_Int,    last_local_row - first_local_row + 1,
+                       memory_location, HYPRE_MEMORY_HOST);
+         hypre_TMemcpy(rows,     rows_h,     HYPRE_BigInt, last_local_row - first_local_row + 1,
+                       memory_location, HYPRE_MEMORY_HOST);
+         hypre_TMemcpy(col_inds, col_inds_h, HYPRE_BigInt, last_local_row - first_local_row + 1,
+                       memory_location, HYPRE_MEMORY_HOST);
+         hypre_TMemcpy(values,   values_h,   HYPRE_Real,   last_local_row - first_local_row + 1,
+                       memory_location, HYPRE_MEMORY_HOST);
 
          hypre_TFree(ncols_h,    HYPRE_MEMORY_HOST);
          hypre_TFree(rows_h,     HYPRE_MEMORY_HOST);
@@ -2682,15 +3298,15 @@ main( hypre_int argc,
    /*-----------------------------------------------------------
     * Set up the interp vector
     *-----------------------------------------------------------*/
-   if ( build_rbm)
+   if (build_rbm)
    {
       char new_file_name[80];
       /* RHS */
       interp_vecs = hypre_CTAlloc(HYPRE_ParVector, num_interp_vecs, HYPRE_MEMORY_HOST);
       ij_rbm = hypre_CTAlloc(HYPRE_IJVector, num_interp_vecs, HYPRE_MEMORY_HOST);
-      for (i=0; i < num_interp_vecs; i++)
+      for (i = 0; i < num_interp_vecs; i++)
       {
-         hypre_sprintf(new_file_name, "%s.%d", argv[build_rbm_index],i);
+         hypre_sprintf(new_file_name, "%s.%d", argv[build_rbm_index], i);
          ierr = HYPRE_IJVectorRead( new_file_name, hypre_MPI_COMM_WORLD,
                                     HYPRE_PARCSR, &ij_rbm[i] );
          ierr = HYPRE_IJVectorGetObject( ij_rbm[i], &object );
@@ -2734,13 +3350,60 @@ main( hypre_int argc,
       }
    }
 
+   /* Print matrix information */
+   if (print_matrix_info)
+   {
+      HYPRE_BigInt global_num_rows, global_num_cols, global_num_nonzeros;
+
+      if (parcsr_A)
+      {
+         HYPRE_BigInt ilower, iupper, jlower, jupper;
+
+         HYPRE_ParCSRMatrixGetLocalRange(parcsr_A, &ilower, &iupper, &jlower, &jupper);
+         HYPRE_IJMatrixCreate(comm, ilower, iupper, jlower, jupper, &ij_A);
+         HYPRE_IJMatrixSetObjectType(ij_A, HYPRE_PARCSR);
+         hypre_IJMatrixObject(ij_A) = parcsr_A;
+         hypre_IJMatrixAssembleFlag(ij_A) = 1;
+      }
+
+      HYPRE_IJMatrixGetGlobalInfo(ij_A,
+                                  &global_num_rows,
+                                  &global_num_cols,
+                                  &global_num_nonzeros);
+
+      if (parcsr_A)
+      {
+         hypre_IJMatrixObject(ij_A) = NULL;
+         HYPRE_IJMatrixDestroy(ij_A);
+      }
+
+      if (myid == 0)
+      {
+         hypre_printf("  Matrix Information:\n");
+         hypre_printf("    Global number of rows:     %b\n", global_num_rows);
+         hypre_printf("    Global number of columns:  %b\n", global_num_cols);
+         hypre_printf("    Global number of nonzeros: %b\n", global_num_nonzeros);
+      }
+   }
+
    /*-----------------------------------------------------------
     * Set up the RHS and initial guess
     *-----------------------------------------------------------*/
    time_index = hypre_InitializeTiming("RHS and Initial Guess");
    hypre_BeginTiming(time_index);
 
-   if ( build_rhs_type == 0 )
+   if (myid == 0)
+   {
+      hypre_printf("  Number of vector components: %d\n", num_components);
+   }
+
+   if (num_components > 1 && !(build_rhs_type > 1 && build_rhs_type < 6))
+   {
+      hypre_printf("num_components > 1 not implemented for this RHS choice!\n");
+      hypre_MPI_Abort(comm, 1);
+   }
+
+   if (build_rhs_type == 0 || build_rhs_type == -2)
    {
       if (myid == 0)
       {
@@ -2749,8 +3412,19 @@ main( hypre_int argc,
       }
 
       /* RHS */
-      ierr = HYPRE_IJVectorRead( argv[build_rhs_arg_index], hypre_MPI_COMM_WORLD,
-                                 HYPRE_PARCSR, &ij_b );
+      if (!build_rhs_type)
+      {
+         ierr = HYPRE_IJVectorRead(argv[build_rhs_arg_index],
+                                   hypre_MPI_COMM_WORLD,
+                                   HYPRE_PARCSR, &ij_b);
+      }
+      else
+      {
+         ierr = HYPRE_IJVectorReadBinary(argv[build_rhs_arg_index],
+                                         hypre_MPI_COMM_WORLD,
+                                         HYPRE_PARCSR, &ij_b);
+      }
+
       if (ierr)
       {
          hypre_printf("ERROR: Problem reading in the right-hand-side!\n");
@@ -2768,7 +3442,7 @@ main( hypre_int argc,
       ierr = HYPRE_IJVectorGetObject( ij_x, &object );
       x = (HYPRE_ParVector) object;
    }
-   else if ( build_rhs_type == 1 )
+   else if (build_rhs_type == 1)
    {
       if (myid == 0)
       {
@@ -2788,57 +3462,48 @@ main( hypre_int argc,
       ierr = HYPRE_IJVectorGetObject( ij_x, &object );
       x = (HYPRE_ParVector) object;
    }
-   else if (build_rhs_type == 7)
-   {
-      if (myid == 0)
-      {
-         hypre_printf("  RHS vector read from file %s\n", argv[build_rhs_arg_index]);
-         hypre_printf("  Initial guess is 0\n");
-      }
-
-      ij_b = NULL;
-      ReadParVectorFromFile(argc, argv, build_rhs_arg_index, &b);
-
-      /* initial guess */
-      HYPRE_IJVectorCreate(hypre_MPI_COMM_WORLD, first_local_col, last_local_col, &ij_x);
-      HYPRE_IJVectorSetObjectType(ij_x, HYPRE_PARCSR);
-      HYPRE_IJVectorInitialize(ij_x);
-      HYPRE_IJVectorAssemble(ij_x);
-
-      ierr = HYPRE_IJVectorGetObject( ij_x, &object );
-      x = (HYPRE_ParVector) object;
-   }
-   else if ( build_rhs_type == 2 )
+   else if (build_rhs_type == 2)
    {
       if (myid == 0)
       {
-         hypre_printf("  RHS vector has unit components\n");
+         hypre_printf("  RHS vector has unit coefficients\n");
          hypre_printf("  Initial guess is 0\n");
       }
 
-      HYPRE_Real *values_h = hypre_CTAlloc(HYPRE_Real, local_num_rows, HYPRE_MEMORY_HOST);
-      HYPRE_Real *values_d = hypre_CTAlloc(HYPRE_Real, local_num_rows, memory_location);
+      HYPRE_Complex *values_h = hypre_CTAlloc(HYPRE_Real, local_num_rows, HYPRE_MEMORY_HOST);
+      HYPRE_Complex *values_d = hypre_CTAlloc(HYPRE_Real, local_num_rows, memory_location);
       for (i = 0; i < local_num_rows; i++)
       {
          values_h[i] = 1.0;
       }
-      hypre_TMemcpy(values_d, values_h, HYPRE_Real, local_num_rows, memory_location, HYPRE_MEMORY_HOST);
+      hypre_TMemcpy(values_d, values_h, HYPRE_Complex, local_num_rows,
+                    memory_location, HYPRE_MEMORY_HOST);
 
       /* RHS */
       HYPRE_IJVectorCreate(hypre_MPI_COMM_WORLD, first_local_row, last_local_row, &ij_b);
       HYPRE_IJVectorSetObjectType(ij_b, HYPRE_PARCSR);
+      HYPRE_IJVectorSetNumComponents(ij_b, num_components);
       HYPRE_IJVectorInitialize_v2(ij_b, memory_location);
-      HYPRE_IJVectorSetValues(ij_b, local_num_rows, NULL, values_d);
+      for (c = 0; c < num_components; c++)
+      {
+         HYPRE_IJVectorSetComponent(ij_b, c);
+         HYPRE_IJVectorSetValues(ij_b, local_num_rows, NULL, values_d);
+      }
       HYPRE_IJVectorAssemble(ij_b);
       ierr = HYPRE_IJVectorGetObject( ij_b, &object );
       b = (HYPRE_ParVector) object;
 
-      hypre_Memset(values_d, 0, local_num_rows*sizeof(HYPRE_Real), HYPRE_MEMORY_DEVICE);
       /* Initial guess */
+      hypre_Memset(values_d, 0, local_num_rows * sizeof(HYPRE_Complex), memory_location);
       HYPRE_IJVectorCreate(hypre_MPI_COMM_WORLD, first_local_col, last_local_col, &ij_x);
       HYPRE_IJVectorSetObjectType(ij_x, HYPRE_PARCSR);
+      HYPRE_IJVectorSetNumComponents(ij_x, num_components);
       HYPRE_IJVectorInitialize_v2(ij_x, memory_location);
-      HYPRE_IJVectorSetValues(ij_x, local_num_cols, NULL, values_d);
+      for (c = 0; c < num_components; c++)
+      {
+         HYPRE_IJVectorSetComponent(ij_x, c);
+         HYPRE_IJVectorSetValues(ij_x, local_num_cols, NULL, values_d);
+      }
       HYPRE_IJVectorAssemble(ij_x);
       ierr = HYPRE_IJVectorGetObject( ij_x, &object );
       x = (HYPRE_ParVector) object;
@@ -2846,33 +3511,35 @@ main( hypre_int argc,
       hypre_TFree(values_h, HYPRE_MEMORY_HOST);
       hypre_TFree(values_d, memory_location);
    }
-   else if ( build_rhs_type == 3 )
+   else if (build_rhs_type == 3)
    {
       if (myid == 0)
       {
-         hypre_printf("  RHS vector has random components and unit 2-norm\n");
+         hypre_printf("  RHS vector has random coefficients and unit 2-norm\n");
          hypre_printf("  Initial guess is 0\n");
       }
 
       /* RHS */
       HYPRE_IJVectorCreate(hypre_MPI_COMM_WORLD, first_local_row, last_local_row, &ij_b);
       HYPRE_IJVectorSetObjectType(ij_b, HYPRE_PARCSR);
+      HYPRE_IJVectorSetNumComponents(ij_b, num_components);
       HYPRE_IJVectorInitialize(ij_b);
       ierr = HYPRE_IJVectorGetObject( ij_b, &object );
       b = (HYPRE_ParVector) object;
 
       /* For purposes of this test, HYPRE_ParVector functions are used, but
          these are not necessary.  For a clean use of the interface, the user
-         "should" modify components of ij_x by using functions
+         "should" modify coefficients of ij_x by using functions
          HYPRE_IJVectorSetValues or HYPRE_IJVectorAddToValues */
 
       HYPRE_ParVectorSetRandomValues(b, 22775);
-      HYPRE_ParVectorInnerProd(b,b,&norm);
-      norm = 1./sqrt(norm);
+      HYPRE_ParVectorInnerProd(b, b, &norm);
+      norm = 1. / hypre_sqrt(norm);
       ierr = HYPRE_ParVectorScale(norm, b);
 
       /* Initial guess */
       HYPRE_IJVectorCreate(hypre_MPI_COMM_WORLD, first_local_col, last_local_col, &ij_x);
+      HYPRE_IJVectorSetNumComponents(ij_x, num_components);
       HYPRE_IJVectorSetObjectType(ij_x, HYPRE_PARCSR);
       HYPRE_IJVectorInitialize(ij_x);
       HYPRE_IJVectorAssemble(ij_x);
@@ -2880,38 +3547,44 @@ main( hypre_int argc,
       ierr = HYPRE_IJVectorGetObject( ij_x, &object );
       x = (HYPRE_ParVector) object;
    }
-   else if ( build_rhs_type == 4 )
+   else if (build_rhs_type == 4)
    {
       if (myid == 0)
       {
-         hypre_printf("  RHS vector set for solution with unit components\n");
+         hypre_printf("  RHS vector set for solution with unit coefficients\n");
          hypre_printf("  Initial guess is 0\n");
       }
 
-      /* Temporary use of solution vector */
-      HYPRE_IJVectorCreate(hypre_MPI_COMM_WORLD, first_local_col, last_local_col, &ij_x);
-      HYPRE_IJVectorSetObjectType(ij_x, HYPRE_PARCSR);
-      HYPRE_IJVectorInitialize(ij_x);
-
       HYPRE_Real *values_h = hypre_CTAlloc(HYPRE_Real, local_num_cols, HYPRE_MEMORY_HOST);
       HYPRE_Real *values_d = hypre_CTAlloc(HYPRE_Real, local_num_cols, memory_location);
       for (i = 0; i < local_num_cols; i++)
       {
          values_h[i] = 1.;
       }
-      hypre_TMemcpy(values_d, values_h, HYPRE_Real, local_num_cols, memory_location, HYPRE_MEMORY_HOST);
+      hypre_TMemcpy(values_d, values_h, HYPRE_Real, local_num_cols,
+                    memory_location, HYPRE_MEMORY_HOST);
 
-      HYPRE_IJVectorSetValues(ij_x, local_num_cols, NULL, values_d);
+      /* Temporary use of solution vector */
+      HYPRE_IJVectorCreate(hypre_MPI_COMM_WORLD, first_local_col, last_local_col, &ij_x);
+      HYPRE_IJVectorSetObjectType(ij_x, HYPRE_PARCSR);
+      HYPRE_IJVectorSetNumComponents(ij_x, num_components);
+      HYPRE_IJVectorInitialize(ij_x);
+      for (c = 0; c < num_components; c++)
+      {
+         HYPRE_IJVectorSetComponent(ij_x, c);
+         HYPRE_IJVectorSetValues(ij_x, local_num_cols, NULL, values_d);
+      }
       HYPRE_IJVectorAssemble(ij_x);
-      hypre_TFree(values_h, HYPRE_MEMORY_HOST);
-      hypre_TFree(values_d, memory_location);
-
       ierr = HYPRE_IJVectorGetObject( ij_x, &object );
       x = (HYPRE_ParVector) object;
 
+      hypre_TFree(values_h, HYPRE_MEMORY_HOST);
+      hypre_TFree(values_d, memory_location);
+
       /* RHS */
       HYPRE_IJVectorCreate(hypre_MPI_COMM_WORLD, first_local_row, last_local_row, &ij_b);
       HYPRE_IJVectorSetObjectType(ij_b, HYPRE_PARCSR);
+      HYPRE_IJVectorSetNumComponents(ij_b, num_components);
       HYPRE_IJVectorInitialize(ij_b);
       ierr = HYPRE_IJVectorGetObject( ij_b, &object );
       b = (HYPRE_ParVector) object;
@@ -2921,17 +3594,27 @@ main( hypre_int argc,
       /* Zero initial guess */
       hypre_IJVectorZeroValues(ij_x);
    }
-   else if ( build_rhs_type == 5 )
+   else if (build_rhs_type == 5)
    {
       if (myid == 0)
       {
          hypre_printf("  RHS vector is 0\n");
-         hypre_printf("  Initial guess has unit components\n");
+         hypre_printf("  Initial guess has unit coefficients\n");
+      }
+
+      HYPRE_Real *values_h = hypre_CTAlloc(HYPRE_Real, local_num_cols, HYPRE_MEMORY_HOST);
+      HYPRE_Real *values_d = hypre_CTAlloc(HYPRE_Real, local_num_cols, memory_location);
+      for (i = 0; i < local_num_cols; i++)
+      {
+         values_h[i] = 1.;
       }
+      hypre_TMemcpy(values_d, values_h, HYPRE_Real, local_num_cols,
+                    memory_location, HYPRE_MEMORY_HOST);
 
       /* RHS */
       HYPRE_IJVectorCreate(hypre_MPI_COMM_WORLD, first_local_row, last_local_row, &ij_b);
       HYPRE_IJVectorSetObjectType(ij_b, HYPRE_PARCSR);
+      HYPRE_IJVectorSetNumComponents(ij_b, num_components);
       HYPRE_IJVectorInitialize(ij_b);
       HYPRE_IJVectorAssemble(ij_b);
 
@@ -2940,45 +3623,72 @@ main( hypre_int argc,
 
       /* Initial guess */
       HYPRE_IJVectorCreate(hypre_MPI_COMM_WORLD, first_local_col, last_local_col, &ij_x);
+      HYPRE_IJVectorSetNumComponents(ij_x, num_components);
       HYPRE_IJVectorSetObjectType(ij_x, HYPRE_PARCSR);
       HYPRE_IJVectorInitialize(ij_x);
-
-      HYPRE_Real *values_h = hypre_CTAlloc(HYPRE_Real, local_num_cols, HYPRE_MEMORY_HOST);
-      HYPRE_Real *values_d = hypre_CTAlloc(HYPRE_Real, local_num_cols, memory_location);
-      for (i = 0; i < local_num_cols; i++)
+      for (c = 0; c < num_components; c++)
       {
-         values_h[i] = 1.;
+         HYPRE_IJVectorSetComponent(ij_x, c);
+         HYPRE_IJVectorSetValues(ij_x, local_num_cols, NULL, values_d);
       }
-      hypre_TMemcpy(values_d, values_h, HYPRE_Real, local_num_cols, memory_location, HYPRE_MEMORY_HOST);
-
-      HYPRE_IJVectorSetValues(ij_x, local_num_cols, NULL, values_d);
       HYPRE_IJVectorAssemble(ij_x);
-      hypre_TFree(values_h, HYPRE_MEMORY_HOST);
-      hypre_TFree(values_d, memory_location);
-
       ierr = HYPRE_IJVectorGetObject( ij_x, &object );
       x = (HYPRE_ParVector) object;
+
+      hypre_TFree(values_h, HYPRE_MEMORY_HOST);
+      hypre_TFree(values_d, memory_location);
    }
-   else if ( build_rhs_type == 6)
+   else if (build_rhs_type == 6)
    {
       ij_b = NULL;
    }
-
-   if ( build_src_type == 0)
+   else if (build_rhs_type == 7)
    {
       if (myid == 0)
       {
-         hypre_printf("  Source vector read from file %s\n", argv[build_src_arg_index]);
-         hypre_printf("  Initial unknown vector in evolution is 0\n");
+         hypre_printf("  RHS vector read from file %s\n", argv[build_rhs_arg_index]);
+         hypre_printf("  Initial guess is 0\n");
       }
 
-      ierr = HYPRE_IJVectorRead( argv[build_src_arg_index], hypre_MPI_COMM_WORLD,
-                                 HYPRE_PARCSR, &ij_b );
-      if (ierr)
-      {
-         hypre_printf("ERROR: Problem reading in the right-hand-side!\n");
-         exit(1);
-      }
+      ij_b = NULL;
+      ReadParVectorFromFile(argc, argv, build_rhs_arg_index, &b);
+
+      /* initial guess */
+      HYPRE_IJVectorCreate(hypre_MPI_COMM_WORLD, first_local_col, last_local_col, &ij_x);
+      HYPRE_IJVectorSetObjectType(ij_x, HYPRE_PARCSR);
+      HYPRE_IJVectorInitialize(ij_x);
+      HYPRE_IJVectorAssemble(ij_x);
+
+      ierr = HYPRE_IJVectorGetObject( ij_x, &object );
+      x = (HYPRE_ParVector) object;
+   }
+   else
+   {
+      if (build_rhs_type != -1)
+      {
+         if (myid == 0)
+         {
+            hypre_printf("Error: Invalid build_rhs_type!\n");
+         }
+         hypre_MPI_Abort(comm, 1);
+      }
+   }
+
+   if ( build_src_type == 0)
+   {
+      if (myid == 0)
+      {
+         hypre_printf("  Source vector read from file %s\n", argv[build_src_arg_index]);
+         hypre_printf("  Initial unknown vector in evolution is 0\n");
+      }
+
+      ierr = HYPRE_IJVectorRead( argv[build_src_arg_index], hypre_MPI_COMM_WORLD,
+                                 HYPRE_PARCSR, &ij_b );
+      if (ierr)
+      {
+         hypre_printf("ERROR: Problem reading in the right-hand-side!\n");
+         exit(1);
+      }
       ierr = HYPRE_IJVectorGetObject( ij_b, &object );
       b = (HYPRE_ParVector) object;
 
@@ -3009,7 +3719,7 @@ main( hypre_int argc,
    {
       if (myid == 0)
       {
-         hypre_printf("  Source vector has unit components\n");
+         hypre_printf("  Source vector has unit coefficients\n");
          hypre_printf("  Initial unknown vector is 0\n");
       }
 
@@ -3024,7 +3734,8 @@ main( hypre_int argc,
       {
          values_h[i] = 1.;
       }
-      hypre_TMemcpy(values_d, values_h, HYPRE_Real, local_num_rows, memory_location, HYPRE_MEMORY_HOST);
+      hypre_TMemcpy(values_d, values_h, HYPRE_Real, local_num_rows,
+                    memory_location, HYPRE_MEMORY_HOST);
 
       HYPRE_IJVectorSetValues(ij_b, local_num_rows, NULL, values_d);
       HYPRE_IJVectorAssemble(ij_b);
@@ -3050,7 +3761,7 @@ main( hypre_int argc,
    {
       if (myid == 0)
       {
-         hypre_printf("  Source vector has random components in range 0 - 1\n");
+         hypre_printf("  Source vector has random coefficients in range 0 - 1\n");
          hypre_printf("  Initial unknown vector is 0\n");
       }
 
@@ -3093,7 +3804,7 @@ main( hypre_int argc,
       if (myid == 0)
       {
          hypre_printf("  Source vector is 0 \n");
-         hypre_printf("  Initial unknown vector has random components in range 0 - 1\n");
+         hypre_printf("  Initial unknown vector has random coefficients in range 0 - 1\n");
       }
 
       /* RHS */
@@ -3106,7 +3817,7 @@ main( hypre_int argc,
       hypre_SeedRand(myid);
       for (i = 0; i < local_num_rows; i++)
       {
-         values_h[i] = hypre_Rand()/dt;
+         values_h[i] = hypre_Rand() / dt;
       }
       hypre_TMemcpy(values_d, values_h, HYPRE_Real, local_num_rows, memory_location, HYPRE_MEMORY_HOST);
 
@@ -3158,7 +3869,7 @@ main( hypre_int argc,
          random in 0 - 1 here) is usually used as the initial guess */
       HYPRE_Real *values_h = hypre_CTAlloc(HYPRE_Real, local_num_cols, HYPRE_MEMORY_HOST);
       HYPRE_Real *values_d = hypre_CTAlloc(HYPRE_Real, local_num_cols, memory_location);
-      hypre_SeedRand(myid+2747);
+      hypre_SeedRand(myid + 2747);
       hypre_SeedRand(myid);
       for (i = 0; i < local_num_cols; i++)
       {
@@ -3176,20 +3887,33 @@ main( hypre_int argc,
    }
 
    /* initial guess */
-   if ( build_x0_type == 0 )
+   if (build_x0_type == 0 || build_x0_type == -2)
    {
       /* from file */
       if (myid == 0)
       {
          hypre_printf("  Initial guess vector read from file %s\n", argv[build_x0_arg_index]);
       }
+
       /* x0 */
       if (ij_x)
       {
          HYPRE_IJVectorDestroy(ij_x);
       }
-      ierr = HYPRE_IJVectorRead( argv[build_x0_arg_index], hypre_MPI_COMM_WORLD,
-                                 HYPRE_PARCSR, &ij_x );
+
+      if (!build_x0_type)
+      {
+         ierr = HYPRE_IJVectorRead(argv[build_x0_arg_index],
+                                   hypre_MPI_COMM_WORLD,
+                                   HYPRE_PARCSR, &ij_x);
+      }
+      else
+      {
+         ierr = HYPRE_IJVectorReadBinary(argv[build_x0_arg_index],
+                                         hypre_MPI_COMM_WORLD,
+                                         HYPRE_PARCSR, &ij_x);
+      }
+
       if (ierr)
       {
          hypre_printf("ERROR: Problem reading in x0!\n");
@@ -3198,6 +3922,16 @@ main( hypre_int argc,
       ierr = HYPRE_IJVectorGetObject( ij_x, &object );
       x = (HYPRE_ParVector) object;
    }
+   else if (build_x0_type == 7)
+   {
+      /* from file */
+      if (myid == 0)
+      {
+         hypre_printf("  Initial guess vector read from file %s\n", argv[build_x0_arg_index]);
+      }
+
+      ReadParVectorFromFile(argc, argv, build_x0_arg_index, &x);
+   }
    else if (build_x0_type == 1)
    {
       /* random */
@@ -3236,6 +3970,10 @@ main( hypre_int argc,
       x = (HYPRE_ParVector) object;
    }
 
+   /*-----------------------------------------------------------
+    * Finalize IJVector Setup timings
+    *-----------------------------------------------------------*/
+
    hypre_EndTiming(time_index);
    hypre_PrintTiming("IJ Vector Setup", hypre_MPI_COMM_WORLD);
    hypre_FinalizeTiming(time_index);
@@ -3246,12 +3984,18 @@ main( hypre_int argc,
       dof_func = NULL;
       if (build_funcs_type == 1)
       {
-         hypre_printf("calling BuildFuncsFromOneFile\n");
+         if (myid == 0)
+         {
+            hypre_printf(" Calling BuildFuncsFromOneFile\n");
+         }
          BuildFuncsFromOneFile(argc, argv, build_funcs_arg_index, parcsr_A, &dof_func);
       }
       else if (build_funcs_type == 2)
       {
-         hypre_printf("calling BuildFuncsFromOneFiles\n");
+         if (myid == 0)
+         {
+            hypre_printf(" Calling BuildFuncsFromFiles\n");
+         }
          BuildFuncsFromFiles(argc, argv, build_funcs_arg_index, parcsr_A, &dof_func);
       }
       else
@@ -3282,6 +4026,29 @@ main( hypre_int argc,
       {
          hypre_ParCSRMatrixPrintIJ(parcsr_A, 0, 0, "IJ.out.A");
       }
+      else
+      {
+         if (!myid)
+         {
+            hypre_printf(" Matrix A not found!\n");
+         }
+      }
+
+      if (parcsr_M != parcsr_A)
+      {
+         if (ij_M)
+         {
+            HYPRE_IJMatrixPrint(ij_M, "IJ.out.M");
+         }
+         else
+         {
+            if (!myid)
+            {
+               hypre_printf(" Matrix M not found!\n");
+            }
+         }
+      }
+
       if (ij_b)
       {
          HYPRE_IJVectorPrint(ij_b, "IJ.out.b");
@@ -3293,32 +4060,214 @@ main( hypre_int argc,
       HYPRE_IJVectorPrint(ij_x, "IJ.out.x0");
    }
 
+   if (print_system_binary)
+   {
+      if (ij_A)
+      {
+         HYPRE_IJMatrixPrintBinary(ij_A, "IJ.out.A");
+      }
+      else
+      {
+         hypre_ParCSRMatrixPrintBinaryIJ(parcsr_A, 0, 0, "IJ.out.A");
+      }
+
+      if (ij_b)
+      {
+         HYPRE_IJVectorPrintBinary(ij_b, "IJ.out.b");
+      }
+      else if (b)
+      {
+         HYPRE_ParVectorPrintBinaryIJ(b, "IJ.out.b");
+      }
+
+      if (ij_x)
+      {
+         HYPRE_IJVectorPrintBinary(ij_x, "IJ.out.x0");
+      }
+      else if (x)
+      {
+         HYPRE_ParVectorPrintBinaryIJ(x, "IJ.out.x0");
+      }
+   }
+
    /*-----------------------------------------------------------
     * Migrate the system to the wanted memory space
     *-----------------------------------------------------------*/
+
    hypre_ParCSRMatrixMigrate(parcsr_A, hypre_HandleMemoryLocation(hypre_handle()));
    hypre_ParVectorMigrate(b, hypre_HandleMemoryLocation(hypre_handle()));
    hypre_ParVectorMigrate(x, hypre_HandleMemoryLocation(hypre_handle()));
+   if (build_matrix_M == 1)
+   {
+      hypre_ParCSRMatrixMigrate(parcsr_M, hypre_HandleMemoryLocation(hypre_handle()));
+   }
+
+   if (benchmark)
+   {
+      poutusr = 1;
+      poutdat = 0;
+      second_time = 1;
+   }
 
    /* save the initial guess for the 2nd time */
-#if SECOND_TIME
-   x0_save = hypre_ParVectorCloneDeep_v2(x, hypre_ParVectorMemoryLocation(x));
-#endif
+   if (second_time)
+   {
+      x0_save = hypre_ParVectorCloneDeep_v2(x, hypre_ParVectorMemoryLocation(x));
+   }
+
+   /* Compute RHS squared norm */
+   if (ij_b)
+   {
+      HYPRE_IJVectorInnerProd(ij_b, ij_b, &b_dot_b);
+   }
+   else if (b)
+   {
+      HYPRE_ParVectorInnerProd(b, b, &b_dot_b);
+   }
+   else
+   {
+      if (!myid)
+      {
+         hypre_printf(" Error: Vector b not set!\n");
+      }
+      hypre_MPI_Abort(comm, 1);
+   }
 
    /*-----------------------------------------------------------
-    * Solve the system using the hybrid solver
+    * Test multivector support
+    *-----------------------------------------------------------*/
+
+   if (test_multivec && ij_b && num_components > 1)
+   {
+      HYPRE_IJVector   ij_bf;
+      HYPRE_Complex   *d_data_full;
+      HYPRE_Real       bf_dot_bf, e_dot_e;
+      HYPRE_Int        num_rows_full = local_num_rows * num_components;
+      HYPRE_BigInt     ilower = first_local_row * num_components;
+      HYPRE_BigInt     iupper = ilower + (HYPRE_BigInt) num_rows_full - 1;
+
+      /* Allocate memory */
+      d_data_full = hypre_CTAlloc(HYPRE_Complex, num_rows_full, memory_location);
+
+      /* Get values */
+      for (c = 0; c < num_components; c++)
+      {
+         HYPRE_IJVectorSetComponent(ij_b, c);
+         HYPRE_IJVectorGetValues(ij_b, local_num_rows, NULL,
+                                 &d_data_full[c * local_num_rows]);
+      }
+
+      /* Create a single component vector containing all values of b */
+      HYPRE_IJVectorCreate(comm, ilower, iupper, &ij_bf);
+      HYPRE_IJVectorSetObjectType(ij_bf, HYPRE_PARCSR);
+      HYPRE_IJVectorInitialize(ij_bf);
+      HYPRE_IJVectorSetValues(ij_bf, num_rows_full, NULL, d_data_full);
+      HYPRE_IJVectorAssemble(ij_bf);
+      HYPRE_IJVectorInnerProd(ij_bf, ij_bf, &bf_dot_bf);
+
+      e_dot_e = bf_dot_bf - b_dot_b;
+      if (myid == 0)
+      {
+         hypre_printf("\nVector/Multivector error = %e\n\n", e_dot_e);
+      }
+
+      /* Free memory */
+      hypre_TFree(d_data_full, memory_location);
+      HYPRE_IJVectorDestroy(ij_bf);
+   }
+
+   /*-----------------------------------------------------------
+    * Test matrix scaling: B = diag(ld) * A * diag(rd)
+    *-----------------------------------------------------------*/
+
+   if (test_scaling)
+   {
+      HYPRE_IJVector   ij_ld  = NULL;
+      HYPRE_IJVector   ij_rd  = NULL;
+      HYPRE_ParVector  par_ld = NULL;
+      HYPRE_ParVector  par_rd = NULL;
+      HYPRE_Complex   *d_data;
+      HYPRE_Int        scaling_type;
+
+      time_index = hypre_InitializeTiming("ParCSR scaling");
+      hypre_BeginTiming(time_index);
+
+      /* Allocate memory */
+      d_data = hypre_TAlloc(HYPRE_Complex, local_num_rows, memory_location);
+
+      /* Select scaling type:
+           left  OR right scaling: diag inverse (2)
+           left AND right scaling: diag inverse sqrt (3) */
+      scaling_type = (test_scaling == 1 || test_scaling == 2) ? 2 : 3;
+
+      /* Compute scaling vector */
+      hypre_CSRMatrixExtractDiagonal(hypre_ParCSRMatrixDiag(parcsr_A), d_data, scaling_type);
+
+      /* Create diagonal scaling matrix diag(ld) */
+      if (test_scaling != 2)
+      {
+         HYPRE_IJVectorCreate(comm, first_local_row, last_local_row, &ij_ld);
+         HYPRE_IJVectorSetObjectType(ij_ld, HYPRE_PARCSR);
+         HYPRE_IJVectorInitialize(ij_ld);
+         HYPRE_IJVectorSetValues(ij_ld, local_num_rows, NULL, d_data);
+         HYPRE_IJVectorAssemble(ij_ld);
+         HYPRE_IJVectorGetObject(ij_ld, &object);
+         par_ld = (HYPRE_ParVector) object;
+      }
+
+      /* Create diagonal scaling matrix diag(rd) */
+      if (test_scaling != 1)
+      {
+         HYPRE_IJVectorCreate(comm, first_local_row, last_local_row, &ij_rd);
+         HYPRE_IJVectorSetObjectType(ij_rd, HYPRE_PARCSR);
+         HYPRE_IJVectorInitialize(ij_rd);
+         HYPRE_IJVectorSetValues(ij_rd, local_num_rows, NULL, d_data);
+         HYPRE_IJVectorAssemble(ij_rd);
+         HYPRE_IJVectorGetObject(ij_rd, &object);
+         par_rd = (HYPRE_ParVector) object;
+      }
+
+      /* Compute A = diag(ld) * A * diag(rd) */
+      hypre_ParCSRMatrixDiagScale(parcsr_A, par_ld, par_rd);
+
+      /* Print scaled matrix */
+      if (print_system)
+      {
+         hypre_ParCSRMatrixPrintIJ(parcsr_A, 0, 0, "IJ.out.Ascal");
+         HYPRE_IJVectorPrint(ij_ld, "IJ.out.ld");
+         HYPRE_IJVectorPrint(ij_rd, "IJ.out.rd");
+      }
+
+      /* Free memory */
+      hypre_TFree(d_data, memory_location);
+      if (ij_rd)
+      {
+         HYPRE_IJVectorDestroy(ij_rd);
+      }
+      if (ij_ld)
+      {
+         HYPRE_IJVectorDestroy(ij_ld);
+      }
+
+      hypre_EndTiming(time_index);
+      hypre_PrintTiming("ParCSR scaling", hypre_MPI_COMM_WORLD);
+      hypre_FinalizeTiming(time_index);
+      hypre_ClearTiming();
+   }
+
+   /*-----------------------------------------------------------
+    * Perform sparse matrix/vector multiplication
     *-----------------------------------------------------------*/
 
    if (solver_id == -1)
    {
-      HYPRE_Int nmv = 100;
       HYPRE_Int num_threads = hypre_NumThreads();
 
       if (myid == 0)
       {
          hypre_printf("Running %d matvecs with A\n", nmv);
-         hypre_printf("\n\n Num MPI tasks = %d\n\n",num_procs);
-         hypre_printf(" Num OpenMP threads = %d\n\n",num_threads);
+         hypre_printf("\n\n Num MPI tasks = %d\n\n", num_procs);
+         hypre_printf(" Num OpenMP threads = %d\n\n", num_threads);
       }
 
       HYPRE_Real tt = hypre_MPI_Wtime();
@@ -3331,10 +4280,6 @@ main( hypre_int argc,
          HYPRE_ParCSRMatrixMatvec(1., parcsr_A, x, 0., b);
       }
 
-#if defined(HYPRE_USING_GPU)
-      hypre_SyncCudaDevice(hypre_handle());
-#endif
-
       hypre_EndTiming(time_index);
       hypre_PrintTiming("MatVec Test", hypre_MPI_COMM_WORLD);
       hypre_FinalizeTiming(time_index);
@@ -3344,15 +4289,19 @@ main( hypre_int argc,
 
       if (myid == 0)
       {
-      hypre_printf("Matvec time %.2f (ms)\n", tt*1000.0);
+         hypre_printf("Matvec time %.2f (ms)\n", tt * 1000.0);
       }
 
       goto final;
    }
 
+   /*-----------------------------------------------------------
+    * Solve the system using the hybrid solver
+    *-----------------------------------------------------------*/
+
    if (solver_id == 20)
    {
-      if (myid == 0) hypre_printf("Solver:  AMG\n");
+      if (myid == 0) { hypre_printf("Solver:  AMG\n"); }
       time_index = hypre_InitializeTiming("AMG_hybrid Setup");
       hypre_BeginTiming(time_index);
 
@@ -3375,18 +4324,24 @@ main( hypre_int argc,
       HYPRE_ParCSRHybridSetNumSweeps(amg_solver, num_sweeps);
       HYPRE_ParCSRHybridSetInterpType(amg_solver, interp_type);
 
-      if (relax_type > -1) HYPRE_ParCSRHybridSetRelaxType(amg_solver, relax_type);
+      if (relax_type > -1) { HYPRE_ParCSRHybridSetRelaxType(amg_solver, relax_type); }
       HYPRE_ParCSRHybridSetAggNumLevels(amg_solver, agg_num_levels);
       HYPRE_ParCSRHybridSetAggInterpType(amg_solver, agg_interp_type);
       HYPRE_ParCSRHybridSetNumPaths(amg_solver, num_paths);
       HYPRE_ParCSRHybridSetNumFunctions(amg_solver, num_functions);
       HYPRE_ParCSRHybridSetNodal(amg_solver, nodal);
       if (relax_down > -1)
+      {
          HYPRE_ParCSRHybridSetCycleRelaxType(amg_solver, relax_down, 1);
+      }
       if (relax_up > -1)
+      {
          HYPRE_ParCSRHybridSetCycleRelaxType(amg_solver, relax_up, 2);
+      }
       if (relax_coarse > -1)
+      {
          HYPRE_ParCSRHybridSetCycleRelaxType(amg_solver, relax_coarse, 3);
+      }
       HYPRE_ParCSRHybridSetRelaxOrder(amg_solver, relax_order);
       HYPRE_ParCSRHybridSetKeepTranspose(amg_solver, keepTranspose);
       HYPRE_ParCSRHybridSetMaxCoarseSize(amg_solver, coarse_threshold);
@@ -3395,12 +4350,16 @@ main( hypre_int argc,
       HYPRE_ParCSRHybridSetRelaxWt(amg_solver, relax_wt);
       HYPRE_ParCSRHybridSetOuterWt(amg_solver, outer_wt);
       if (level_w > -1)
+      {
          HYPRE_ParCSRHybridSetLevelRelaxWt(amg_solver, relax_wt_level, level_w);
+      }
       if (level_ow > -1)
+      {
          HYPRE_ParCSRHybridSetLevelOuterWt(amg_solver, outer_wt_level, level_ow);
+      }
       HYPRE_ParCSRHybridSetNonGalerkinTol(amg_solver, nongalerk_num_tol, nongalerk_tol);
 
-      HYPRE_ParCSRHybridSetup(amg_solver, parcsr_A, b, x);
+      HYPRE_ParCSRHybridSetup(amg_solver, parcsr_M, b, x);
 
       hypre_EndTiming(time_index);
       hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
@@ -3417,27 +4376,45 @@ main( hypre_int argc,
       hypre_FinalizeTiming(time_index);
       hypre_ClearTiming();
 
-      HYPRE_ParCSRHybridGetNumIterations(amg_solver, &num_iterations);
-      HYPRE_ParCSRHybridGetPCGNumIterations(amg_solver, &pcg_num_its);
-      HYPRE_ParCSRHybridGetDSCGNumIterations(amg_solver, &dscg_num_its);
-      HYPRE_ParCSRHybridGetFinalRelativeResidualNorm(amg_solver,
-                                                     &final_res_norm);
-
-      if (myid == 0)
+      if (second_time)
       {
-         hypre_printf("\n");
-         hypre_printf("Iterations = %d\n", num_iterations);
-         hypre_printf("PCG_Iterations = %d\n", pcg_num_its);
-         hypre_printf("DSCG_Iterations = %d\n", dscg_num_its);
-         hypre_printf("Final Relative Residual Norm = %e\n", final_res_norm);
-         hypre_printf("\n");
-      }
+         /* run a second time [for timings, to check for memory leaks] */
+         HYPRE_ParVectorSetRandomValues(x, 775);
+#if defined(HYPRE_USING_CURAND) || defined(HYPRE_USING_ROCRAND)
+         hypre_ResetDeviceRandGenerator(1234ULL, 0ULL);
+#endif
+         hypre_ParVectorCopy(x0_save, x);
 
-#if SECOND_TIME
-      /* run a second time to check for memory leaks */
-      hypre_ParVectorCopy(x0_save, x);
-      HYPRE_ParCSRHybridSetup(amg_solver, parcsr_A, b, x);
-      HYPRE_ParCSRHybridSolve(amg_solver, parcsr_A, b, x);
+         if (myid == 0) { hypre_printf("Solver:  AMG\n"); }
+         time_index = hypre_InitializeTiming("AMG_hybrid Setup");
+         hypre_BeginTiming(time_index);
+
+         HYPRE_ParCSRHybridSetup(amg_solver, parcsr_M, b, x);
+
+         hypre_EndTiming(time_index);
+         hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
+         hypre_FinalizeTiming(time_index);
+         hypre_ClearTiming();
+
+         time_index = hypre_InitializeTiming("ParCSR Hybrid Solve");
+         hypre_BeginTiming(time_index);
+
+         HYPRE_ParCSRHybridSolve(amg_solver, parcsr_A, b, x);
+
+         hypre_EndTiming(time_index);
+         hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
+         hypre_FinalizeTiming(time_index);
+         hypre_ClearTiming();
+
+         HYPRE_Real time[4];
+         HYPRE_ParCSRHybridGetSetupSolveTime(amg_solver, time);
+
+         if (myid == 0)
+         {
+            hypre_printf("ParCSRHybrid: Setup-Time1 %f  Solve-Time1 %f  Setup-Time2 %f  Solve-Time2 %f\n",
+                         time[0], time[1], time[2], time[3]);
+         }
+      }
 
       HYPRE_ParCSRHybridGetNumIterations(amg_solver, &num_iterations);
       HYPRE_ParCSRHybridGetPCGNumIterations(amg_solver, &pcg_num_its);
@@ -3454,15 +4431,6 @@ main( hypre_int argc,
          hypre_printf("\n");
       }
 
-      HYPRE_Real time[4];
-      HYPRE_ParCSRHybridGetSetupSolveTime(amg_solver, time);
-      if (myid == 0)
-      {
-         printf("ParCSRHybrid: Setup-Time1 %f  Solve-Time1 %f  Setup-Time2 %f  Solve-Time2 %f\n",
-                time[0], time[1], time[2], time[3]);
-      }
-#endif
-
       HYPRE_ParCSRHybridDestroy(amg_solver);
    }
    /*-----------------------------------------------------------
@@ -3471,9 +4439,11 @@ main( hypre_int argc,
 
    if (solver_id == 0 || solver_id == 90)
    {
+      HYPRE_ANNOTATE_REGION_BEGIN("%s", "Run-1");
+
       if (solver_id == 0)
       {
-         if (myid == 0) hypre_printf("Solver:  AMG\n");
+         if (myid == 0) { hypre_printf("Solver:  AMG\n"); }
          time_index = hypre_InitializeTiming("BoomerAMG Setup");
          hypre_BeginTiming(time_index);
 
@@ -3481,7 +4451,7 @@ main( hypre_int argc,
       }
       else if (solver_id == 90)
       {
-         if (myid == 0) hypre_printf("Solver:  AMG-DD\n");
+         if (myid == 0) { hypre_printf("Solver:  AMG-DD\n"); }
          time_index = hypre_InitializeTiming("BoomerAMGDD Setup");
          hypre_BeginTiming(time_index);
 
@@ -3535,7 +4505,7 @@ main( hypre_int argc,
       HYPRE_BoomerAMGSetJacobiTruncThreshold(amg_solver, jacobi_trunc_threshold);
       HYPRE_BoomerAMGSetSCommPkgSwitch(amg_solver, S_commpkg_switch);
       /* note: log is written to standard output, not to file */
-      HYPRE_BoomerAMGSetPrintLevel(amg_solver, 3);
+      HYPRE_BoomerAMGSetPrintLevel(amg_solver, poutusr ? poutdat : 3);
       //HYPRE_BoomerAMGSetLogging(amg_solver, 2);
       HYPRE_BoomerAMGSetPrintFileName(amg_solver, "driver.out.log");
       HYPRE_BoomerAMGSetCycleType(amg_solver, cycle_type);
@@ -3546,13 +4516,19 @@ main( hypre_int argc,
       HYPRE_BoomerAMGSetCRRate(amg_solver, CR_rate);
       HYPRE_BoomerAMGSetCRStrongTh(amg_solver, CR_strong_th);
       HYPRE_BoomerAMGSetCRUseCG(amg_solver, CR_use_CG);
-      if (relax_type > -1) HYPRE_BoomerAMGSetRelaxType(amg_solver, relax_type);
+      if (relax_type > -1) { HYPRE_BoomerAMGSetRelaxType(amg_solver, relax_type); }
       if (relax_down > -1)
+      {
          HYPRE_BoomerAMGSetCycleRelaxType(amg_solver, relax_down, 1);
+      }
       if (relax_up > -1)
+      {
          HYPRE_BoomerAMGSetCycleRelaxType(amg_solver, relax_up, 2);
+      }
       if (relax_coarse > -1)
+      {
          HYPRE_BoomerAMGSetCycleRelaxType(amg_solver, relax_coarse, 3);
+      }
       HYPRE_BoomerAMGSetAddRelaxType(amg_solver, add_relax_type);
       HYPRE_BoomerAMGSetAddRelaxWt(amg_solver, add_relax_wt);
       HYPRE_BoomerAMGSetChebyOrder(amg_solver, cheby_order);
@@ -3565,9 +4541,13 @@ main( hypre_int argc,
       HYPRE_BoomerAMGSetOuterWt(amg_solver, outer_wt);
       HYPRE_BoomerAMGSetMaxLevels(amg_solver, max_levels);
       if (level_w > -1)
+      {
          HYPRE_BoomerAMGSetLevelRelaxWt(amg_solver, relax_wt_level, level_w);
+      }
       if (level_ow > -1)
+      {
          HYPRE_BoomerAMGSetLevelOuterWt(amg_solver, outer_wt_level, level_ow);
+      }
       HYPRE_BoomerAMGSetSmoothType(amg_solver, smooth_type);
       HYPRE_BoomerAMGSetSmoothNumSweeps(amg_solver, smooth_num_sweeps);
       HYPRE_BoomerAMGSetSmoothNumLevels(amg_solver, smooth_num_levels);
@@ -3579,7 +4559,7 @@ main( hypre_int argc,
       HYPRE_BoomerAMGSetSchwarzUseNonSymm(amg_solver, use_nonsymm_schwarz);
 
       HYPRE_BoomerAMGSetSchwarzRlxWeight(amg_solver, schwarz_rlx_weight);
-      if (eu_level < 0) eu_level = 0;
+      if (eu_level < 0) { eu_level = 0; }
       HYPRE_BoomerAMGSetEuLevel(amg_solver, eu_level);
       HYPRE_BoomerAMGSetEuBJ(amg_solver, eu_bj);
       HYPRE_BoomerAMGSetEuSparseA(amg_solver, eu_sparse_A);
@@ -3588,7 +4568,24 @@ main( hypre_int argc,
       HYPRE_BoomerAMGSetILUDroptol(amg_solver, ilu_droptol);
       HYPRE_BoomerAMGSetILUMaxRowNnz(amg_solver, ilu_max_row_nnz);
       HYPRE_BoomerAMGSetILUMaxIter(amg_solver, ilu_sm_max_iter);
-
+      HYPRE_BoomerAMGSetILUTriSolve(amg_solver, ilu_tri_solve);
+      HYPRE_BoomerAMGSetILULowerJacobiIters(amg_solver, ilu_ljac_iters);
+      HYPRE_BoomerAMGSetILUUpperJacobiIters(amg_solver, ilu_ujac_iters);
+      HYPRE_BoomerAMGSetILULocalReordering(amg_solver, ilu_reordering);
+      HYPRE_BoomerAMGSetILUIterSetupType(amg_solver, ilu_iter_setup_type);
+      HYPRE_BoomerAMGSetILUIterSetupOption(amg_solver, ilu_iter_setup_option);
+      HYPRE_BoomerAMGSetILUIterSetupMaxIter(amg_solver, ilu_iter_setup_max_iter);
+      HYPRE_BoomerAMGSetILUIterSetupTolerance(amg_solver, ilu_iter_setup_tolerance);
+      HYPRE_BoomerAMGSetFSAIAlgoType(amg_solver, fsai_algo_type);
+      HYPRE_BoomerAMGSetFSAILocalSolveType(amg_solver, fsai_ls_type);
+      HYPRE_BoomerAMGSetFSAIMaxSteps(amg_solver, fsai_max_steps);
+      HYPRE_BoomerAMGSetFSAIMaxStepSize(amg_solver, fsai_max_step_size);
+      HYPRE_BoomerAMGSetFSAIMaxNnzRow(amg_solver, fsai_max_nnz_row);
+      HYPRE_BoomerAMGSetFSAINumLevels(amg_solver, fsai_num_levels);
+      HYPRE_BoomerAMGSetFSAIThreshold(amg_solver, fsai_threshold);
+      HYPRE_BoomerAMGSetFSAIEigMaxIters(amg_solver, fsai_eig_max_iters);
+      HYPRE_BoomerAMGSetFSAIKapTolerance(amg_solver, fsai_kap_tolerance);
+      HYPRE_BoomerAMGSetFilterFunctions(amg_solver, filter_functions);
       HYPRE_BoomerAMGSetNumFunctions(amg_solver, num_functions);
       HYPRE_BoomerAMGSetAggNumLevels(amg_solver, agg_num_levels);
       HYPRE_BoomerAMGSetAggInterpType(amg_solver, agg_interp_type);
@@ -3610,7 +4607,9 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetCycleNumSweeps(amg_solver, ns_up,     2);
       }
       if (num_functions > 1)
+      {
          HYPRE_BoomerAMGSetDofFunc(amg_solver, dof_func);
+      }
       HYPRE_BoomerAMGSetAdditive(amg_solver, additive);
       HYPRE_BoomerAMGSetMultAdditive(amg_solver, mult_add);
       HYPRE_BoomerAMGSetSimple(amg_solver, simple);
@@ -3628,9 +4627,11 @@ main( hypre_int argc,
       /*HYPRE_BoomerAMGSetNonGalerkTol(amg_solver, nongalerk_num_tol, nongalerk_tol);*/
       if (nongalerk_tol)
       {
-         HYPRE_BoomerAMGSetNonGalerkinTol(amg_solver, nongalerk_tol[nongalerk_num_tol-1]);
-         for (i=0; i < nongalerk_num_tol-1; i++)
+         HYPRE_BoomerAMGSetNonGalerkinTol(amg_solver, nongalerk_tol[nongalerk_num_tol - 1]);
+         for (i = 0; i < nongalerk_num_tol - 1; i++)
+         {
             HYPRE_BoomerAMGSetLevelNonGalerkinTol(amg_solver, nongalerk_tol[i], i);
+         }
       }
       if (build_rbm)
       {
@@ -3641,34 +4642,25 @@ main( hypre_int argc,
       }
 
       /* BM Oct 23, 2006 */
-      if (plot_grids) {
+      if (plot_grids)
+      {
          HYPRE_BoomerAMGSetPlotGrids (amg_solver, 1);
          HYPRE_BoomerAMGSetPlotFileName (amg_solver, plot_file_name);
          HYPRE_BoomerAMGSetCoordDim (amg_solver, coord_dim);
          HYPRE_BoomerAMGSetCoordinates (amg_solver, coordinates);
       }
 
-      //cudaProfilerStart();
-
-#if defined(HYPRE_USING_NVTX)
       hypre_GpuProfilingPushRange("AMG-Setup-1");
-#endif
       if (solver_id == 0)
       {
-         HYPRE_BoomerAMGSetup(amg_solver, parcsr_A, b, x);
+         HYPRE_BoomerAMGSetup(amg_solver, parcsr_M, b, x);
       }
       else if (solver_id == 90)
       {
-         HYPRE_BoomerAMGDDSetup(amgdd_solver, parcsr_A, b, x);
+         HYPRE_BoomerAMGDDSetup(amgdd_solver, parcsr_M, b, x);
       }
 
-#if defined(HYPRE_USING_NVTX)
       hypre_GpuProfilingPopRange();
-#endif
-
-#if defined(HYPRE_USING_GPU)
-      hypre_SyncCudaDevice(hypre_handle());
-#endif
 
       hypre_EndTiming(time_index);
       hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
@@ -3685,11 +4677,8 @@ main( hypre_int argc,
       }
       hypre_BeginTiming(time_index);
 
-#if defined(HYPRE_USING_NVTX)
       hypre_GpuProfilingPushRange("AMG-Solve-1");
-#endif
 
-      //cudaProfilerStart();
       if (solver_id == 0)
       {
          HYPRE_BoomerAMGSolve(amg_solver, parcsr_A, b, x);
@@ -3698,122 +4687,104 @@ main( hypre_int argc,
       {
          HYPRE_BoomerAMGDDSolve(amgdd_solver, parcsr_A, b, x);
       }
-      //cudaProfilerStop();
 
-#if defined(HYPRE_USING_NVTX)
       hypre_GpuProfilingPopRange();
-#endif
-
-#if defined(HYPRE_USING_GPU)
-      hypre_SyncCudaDevice(hypre_handle());
-#endif
 
       hypre_EndTiming(time_index);
       hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
       hypre_FinalizeTiming(time_index);
       hypre_ClearTiming();
+      HYPRE_ANNOTATE_REGION_END("%s", "Run-1");
 
-      if (solver_id == 0)
+      if (second_time)
       {
-         HYPRE_BoomerAMGGetNumIterations(amg_solver, &num_iterations);
-         HYPRE_BoomerAMGGetFinalRelativeResidualNorm(amg_solver, &final_res_norm);
-      }
-      else if (solver_id == 90)
-      {
-         HYPRE_BoomerAMGDDGetNumIterations(amgdd_solver, &num_iterations);
-         HYPRE_BoomerAMGDDGetFinalRelativeResidualNorm(amgdd_solver, &final_res_norm);
-      }
+         HYPRE_ANNOTATE_REGION_BEGIN("%s", "Run-2");
+         HYPRE_SetExecutionPolicy(exec2_policy);
+
+         /* run a second time [for timings, to check for memory leaks] */
+         HYPRE_ParVectorSetRandomValues(x, 775);
+#if defined(HYPRE_USING_CURAND) || defined(HYPRE_USING_ROCRAND)
+         hypre_ResetDeviceRandGenerator(1234ULL, 0ULL);
+#endif
+         hypre_ParVectorCopy(x0_save, x);
+
+#if defined(HYPRE_USING_CUDA)
+         cudaProfilerStart();
+#endif
+
+         time_index = hypre_InitializeTiming("BoomerAMG/AMG-DD Setup2");
+         hypre_BeginTiming(time_index);
+
+         hypre_GpuProfilingPushRange("AMG-Setup-2");
 
-      if (myid == 0)
-      {
-         hypre_printf("\n");
          if (solver_id == 0)
          {
-            hypre_printf("BoomerAMG Iterations = %d\n", num_iterations);
+            HYPRE_BoomerAMGSetup(amg_solver, parcsr_M, b, x);
          }
          else if (solver_id == 90)
          {
-            hypre_printf("BoomerAMG-DD Iterations = %d\n", num_iterations);
+            HYPRE_BoomerAMGDDSetup(amgdd_solver, parcsr_M, b, x);
          }
-         hypre_printf("Final Relative Residual Norm = %e\n", final_res_norm);
-         hypre_printf("\n");
-      }
-
-#if SECOND_TIME
-      /* run a second time to check for memory leaks */
-      //HYPRE_ParVectorSetRandomValues(x, 775);
-      hypre_ParVectorCopy(x0_save, x);
-
-      HYPRE_Real tt, maxtt = 0.0, tset = 0.0, tsol = 0.0;
-
-      tt = hypre_MPI_Wtime();
 
-#if defined(HYPRE_USING_NVTX)
-      hypre_GpuProfilingPushRange("AMG-Setup-2");
-#endif
-
-      if (solver_id == 0)
-      {
-         HYPRE_BoomerAMGSetup(amg_solver, parcsr_A, b, x);
-      }
-      else if (solver_id == 90)
-      {
-         HYPRE_BoomerAMGDDSetup(amgdd_solver, parcsr_A, b, x);
-      }
+         hypre_GpuProfilingPopRange();
 
-#if defined(HYPRE_USING_NVTX)
-      hypre_GpuProfilingPopRange();
-#endif
+         hypre_EndTiming(time_index);
+         hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
+         hypre_FinalizeTiming(time_index);
+         hypre_ClearTiming();
 
-#if defined(HYPRE_USING_GPU)
-      hypre_SyncCudaDevice(hypre_handle());
-#endif
+         time_index = hypre_InitializeTiming("BoomerAMG/AMG-DD Solve2");
+         hypre_BeginTiming(time_index);
 
-      tt = hypre_MPI_Wtime() - tt;
+         hypre_GpuProfilingPushRange("AMG-Solve-2");
 
-      hypre_MPI_Reduce(&tt, &maxtt, 1, hypre_MPI_REAL, hypre_MPI_MAX, 0, hypre_MPI_COMM_WORLD);
+         if (solver_id == 0)
+         {
+            HYPRE_BoomerAMGSolve(amg_solver, parcsr_A, b, x);
+         }
+         else if (solver_id == 90)
+         {
+            HYPRE_BoomerAMGDDSolve(amgdd_solver, parcsr_A, b, x);
+         }
 
-      if (myid == 0)
-      {
-         tset = maxtt;
-      }
+         hypre_GpuProfilingPopRange();
 
-      tt = hypre_MPI_Wtime();
+         hypre_EndTiming(time_index);
+         hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
+         hypre_FinalizeTiming(time_index);
+         hypre_ClearTiming();
 
-#if defined(HYPRE_USING_NVTX)
-      hypre_GpuProfilingPushRange("AMG-Solve-2");
+         HYPRE_ANNOTATE_REGION_END("%s", "Run-2");
+#if defined(HYPRE_USING_CUDA)
+         cudaProfilerStop();
 #endif
+      }
 
       if (solver_id == 0)
       {
-         HYPRE_BoomerAMGSolve(amg_solver, parcsr_A, b, x);
+         HYPRE_BoomerAMGGetNumIterations(amg_solver, &num_iterations);
+         HYPRE_BoomerAMGGetFinalRelativeResidualNorm(amg_solver, &final_res_norm);
       }
       else if (solver_id == 90)
       {
-         HYPRE_BoomerAMGDDSolve(amgdd_solver, parcsr_A, b, x);
-      }
-
-#if defined(HYPRE_USING_NVTX)
-      hypre_GpuProfilingPopRange();
-#endif
-
-#if defined(HYPRE_USING_GPU)
-      hypre_SyncCudaDevice(hypre_handle());
-#endif
-
-      tt = hypre_MPI_Wtime() - tt;
-
-      hypre_MPI_Reduce(&tt, &maxtt, 1, hypre_MPI_REAL, hypre_MPI_MAX, 0, hypre_MPI_COMM_WORLD);
+         HYPRE_BoomerAMGDDGetNumIterations(amgdd_solver, &num_iterations);
+         HYPRE_BoomerAMGDDGetFinalRelativeResidualNorm(amgdd_solver, &final_res_norm);
+      }
 
       if (myid == 0)
       {
-         tsol = maxtt;
-         hypre_printf("AMG Setup time %.2f (s)\n", tset);
-         hypre_printf("AMG Solve time %.2f (s)\n", tsol);
+         hypre_printf("\n");
+         if (solver_id == 0)
+         {
+            hypre_printf("BoomerAMG Iterations = %d\n", num_iterations);
+         }
+         else if (solver_id == 90)
+         {
+            hypre_printf("BoomerAMG-DD Iterations = %d\n", num_iterations);
+         }
+         hypre_printf("Final Relative Residual Norm = %e\n", final_res_norm);
+         hypre_printf("\n");
       }
-#endif // SECOND_TIME
-
-      //cudaProfilerStop();
 
       if (solver_id == 0)
       {
@@ -3835,7 +4806,7 @@ main( hypre_int argc,
 
       relax_order = 0;
 
-      if (myid == 0) hypre_printf("Solver:  GSMG\n");
+      if (myid == 0) { hypre_printf("Solver:  GSMG\n"); }
       time_index = hypre_InitializeTiming("BoomerAMG Setup");
       hypre_BeginTiming(time_index);
 
@@ -3869,13 +4840,19 @@ main( hypre_int argc,
       HYPRE_BoomerAMGSetCycleType(amg_solver, cycle_type);
       HYPRE_BoomerAMGSetFCycle(amg_solver, fcycle);
       HYPRE_BoomerAMGSetNumSweeps(amg_solver, num_sweeps);
-      if (relax_type > -1) HYPRE_BoomerAMGSetRelaxType(amg_solver, relax_type);
+      if (relax_type > -1) { HYPRE_BoomerAMGSetRelaxType(amg_solver, relax_type); }
       if (relax_down > -1)
+      {
          HYPRE_BoomerAMGSetCycleRelaxType(amg_solver, relax_down, 1);
+      }
       if (relax_up > -1)
+      {
          HYPRE_BoomerAMGSetCycleRelaxType(amg_solver, relax_up, 2);
+      }
       if (relax_coarse > -1)
+      {
          HYPRE_BoomerAMGSetCycleRelaxType(amg_solver, relax_coarse, 3);
+      }
       HYPRE_BoomerAMGSetAddRelaxType(amg_solver, add_relax_type);
       HYPRE_BoomerAMGSetAddRelaxWt(amg_solver, add_relax_wt);
       HYPRE_BoomerAMGSetChebyOrder(amg_solver, cheby_order);
@@ -3887,9 +4864,13 @@ main( hypre_int argc,
       HYPRE_BoomerAMGSetRelaxWt(amg_solver, relax_wt);
       HYPRE_BoomerAMGSetOuterWt(amg_solver, outer_wt);
       if (level_w > -1)
+      {
          HYPRE_BoomerAMGSetLevelRelaxWt(amg_solver, relax_wt_level, level_w);
+      }
       if (level_ow > -1)
+      {
          HYPRE_BoomerAMGSetLevelOuterWt(amg_solver, outer_wt_level, level_ow);
+      }
       HYPRE_BoomerAMGSetSmoothType(amg_solver, smooth_type);
       HYPRE_BoomerAMGSetSmoothNumSweeps(amg_solver, smooth_num_sweeps);
       HYPRE_BoomerAMGSetSmoothNumLevels(amg_solver, smooth_num_levels);
@@ -3901,10 +4882,33 @@ main( hypre_int argc,
       HYPRE_BoomerAMGSetDomainType(amg_solver, domain_type);
       HYPRE_BoomerAMGSetSchwarzUseNonSymm(amg_solver, use_nonsymm_schwarz);
       HYPRE_BoomerAMGSetSchwarzRlxWeight(amg_solver, schwarz_rlx_weight);
-      if (eu_level < 0) eu_level = 0;
+      if (eu_level < 0) { eu_level = 0; }
       HYPRE_BoomerAMGSetEuLevel(amg_solver, eu_level);
       HYPRE_BoomerAMGSetEuBJ(amg_solver, eu_bj);
       HYPRE_BoomerAMGSetEuSparseA(amg_solver, eu_sparse_A);
+      HYPRE_BoomerAMGSetILUType(amg_solver, ilu_type);
+      HYPRE_BoomerAMGSetILULevel(amg_solver, ilu_lfil);
+      HYPRE_BoomerAMGSetILUDroptol(amg_solver, ilu_droptol);
+      HYPRE_BoomerAMGSetILUMaxRowNnz(amg_solver, ilu_max_row_nnz);
+      HYPRE_BoomerAMGSetILUMaxIter(amg_solver, ilu_sm_max_iter);
+      HYPRE_BoomerAMGSetILUTriSolve(amg_solver, ilu_tri_solve);
+      HYPRE_BoomerAMGSetILULowerJacobiIters(amg_solver, ilu_ljac_iters);
+      HYPRE_BoomerAMGSetILUUpperJacobiIters(amg_solver, ilu_ujac_iters);
+      HYPRE_BoomerAMGSetILULocalReordering(amg_solver, ilu_reordering);
+      HYPRE_BoomerAMGSetILUIterSetupType(amg_solver, ilu_iter_setup_type);
+      HYPRE_BoomerAMGSetILUIterSetupOption(amg_solver, ilu_iter_setup_option);
+      HYPRE_BoomerAMGSetILUIterSetupMaxIter(amg_solver, ilu_iter_setup_max_iter);
+      HYPRE_BoomerAMGSetILUIterSetupTolerance(amg_solver, ilu_iter_setup_tolerance);
+      HYPRE_BoomerAMGSetFSAIAlgoType(amg_solver, fsai_algo_type);
+      HYPRE_BoomerAMGSetFSAILocalSolveType(amg_solver, fsai_ls_type);
+      HYPRE_BoomerAMGSetFSAIMaxSteps(amg_solver, fsai_max_steps);
+      HYPRE_BoomerAMGSetFSAIMaxStepSize(amg_solver, fsai_max_step_size);
+      HYPRE_BoomerAMGSetFSAIMaxNnzRow(amg_solver, fsai_max_nnz_row);
+      HYPRE_BoomerAMGSetFSAINumLevels(amg_solver, fsai_num_levels);
+      HYPRE_BoomerAMGSetFSAIThreshold(amg_solver, fsai_threshold);
+      HYPRE_BoomerAMGSetFSAIEigMaxIters(amg_solver, fsai_eig_max_iters);
+      HYPRE_BoomerAMGSetFSAIKapTolerance(amg_solver, fsai_kap_tolerance);
+      HYPRE_BoomerAMGSetFilterFunctions(amg_solver, filter_functions);
       HYPRE_BoomerAMGSetNumFunctions(amg_solver, num_functions);
       HYPRE_BoomerAMGSetAggNumLevels(amg_solver, agg_num_levels);
       HYPRE_BoomerAMGSetAggInterpType(amg_solver, agg_interp_type);
@@ -3916,7 +4920,9 @@ main( hypre_int argc,
       HYPRE_BoomerAMGSetNodal(amg_solver, nodal);
       HYPRE_BoomerAMGSetNodalDiag(amg_solver, nodal_diag);
       if (num_functions > 1)
+      {
          HYPRE_BoomerAMGSetDofFunc(amg_solver, dof_func);
+      }
       HYPRE_BoomerAMGSetAdditive(amg_solver, additive);
       HYPRE_BoomerAMGSetMultAdditive(amg_solver, mult_add);
       HYPRE_BoomerAMGSetSimple(amg_solver, simple);
@@ -3928,12 +4934,14 @@ main( hypre_int argc,
       HYPRE_BoomerAMGSetKeepTranspose(amg_solver, keepTranspose);
       if (nongalerk_tol)
       {
-         HYPRE_BoomerAMGSetNonGalerkinTol(amg_solver, nongalerk_tol[nongalerk_num_tol-1]);
-         for (i=0; i < nongalerk_num_tol-1; i++)
+         HYPRE_BoomerAMGSetNonGalerkinTol(amg_solver, nongalerk_tol[nongalerk_num_tol - 1]);
+         for (i = 0; i < nongalerk_num_tol - 1; i++)
+         {
             HYPRE_BoomerAMGSetLevelNonGalerkinTol(amg_solver, nongalerk_tol[i], i);
+         }
       }
 
-      HYPRE_BoomerAMGSetup(amg_solver, parcsr_A, b, x);
+      HYPRE_BoomerAMGSetup(amg_solver, parcsr_M, b, x);
 
       hypre_EndTiming(time_index);
       hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
@@ -3950,23 +4958,28 @@ main( hypre_int argc,
       hypre_FinalizeTiming(time_index);
       hypre_ClearTiming();
 
-#if SECOND_TIME
-      /* run a second time to check for memory leaks */
-      HYPRE_ParVectorSetRandomValues(x, 775);
-      HYPRE_BoomerAMGSetup(amg_solver, parcsr_A, b, x);
-      HYPRE_BoomerAMGSolve(amg_solver, parcsr_A, b, x);
+      if (second_time)
+      {
+         /* run a second time [for timings, to check for memory leaks] */
+         HYPRE_ParVectorSetRandomValues(x, 775);
+#if defined(HYPRE_USING_CURAND) || defined(HYPRE_USING_ROCRAND)
+         hypre_ResetDeviceRandGenerator(1234ULL, 0ULL);
 #endif
+         hypre_ParVectorCopy(x0_save, x);
+
+         HYPRE_BoomerAMGSetup(amg_solver, parcsr_M, b, x);
+         HYPRE_BoomerAMGSolve(amg_solver, parcsr_A, b, x);
+      }
 
       HYPRE_BoomerAMGDestroy(amg_solver);
    }
 
    if (solver_id == 999)
    {
-      HYPRE_IJMatrix ij_M;
-      HYPRE_ParCSRMatrix  parcsr_mat;
+      HYPRE_IJMatrix ij_N;
 
       /* use ParaSails preconditioner */
-      if (myid == 0) hypre_printf("Test ParaSails Build IJMatrix\n");
+      if (myid == 0) { hypre_printf("Test ParaSails Build IJMatrix\n"); }
 
       HYPRE_IJMatrixPrint(ij_A, "parasails.in");
 
@@ -3975,14 +4988,14 @@ main( hypre_int argc,
       HYPRE_ParaSailsSetFilter(pcg_precond, 0.);
       HYPRE_ParaSailsSetLogging(pcg_precond, ioutdat);
 
-      HYPRE_IJMatrixGetObject( ij_A, &object);
-      parcsr_mat = (HYPRE_ParCSRMatrix) object;
+      HYPRE_IJMatrixGetObject(ij_A, &object);
+      parcsr_A = (HYPRE_ParCSRMatrix) object;
 
-      HYPRE_ParaSailsSetup(pcg_precond, parcsr_mat, NULL, NULL);
-      HYPRE_ParaSailsBuildIJMatrix(pcg_precond, &ij_M);
+      HYPRE_ParaSailsSetup(pcg_precond, parcsr_M, NULL, NULL);
+      HYPRE_ParaSailsBuildIJMatrix(pcg_precond, &ij_N);
       HYPRE_IJMatrixPrint(ij_M, "parasails.out");
 
-      if (myid == 0) hypre_printf("Printed to parasails.out.\n");
+      if (myid == 0) { hypre_printf("Printed to parasails.out.\n"); }
       exit(0);
    }
 
@@ -3992,9 +5005,11 @@ main( hypre_int argc,
 
    /* begin lobpcg */
    if (!lobpcgFlag && (solver_id == 1 || solver_id == 2 || solver_id == 8 ||
-                       solver_id == 12 || solver_id == 14 || solver_id == 43 || solver_id == 71))
+                       solver_id == 12 || solver_id == 14 || solver_id == 31 ||
+                       solver_id == 43 || solver_id == 71))
       /*end lobpcg */
    {
+      HYPRE_ANNOTATE_REGION_BEGIN("%s", "Run-1");
       time_index = hypre_InitializeTiming("PCG Setup");
       hypre_BeginTiming(time_index);
 
@@ -4002,6 +5017,8 @@ main( hypre_int argc,
       HYPRE_PCGSetMaxIter(pcg_solver, max_iter);
       HYPRE_PCGSetTol(pcg_solver, tol);
       HYPRE_PCGSetTwoNorm(pcg_solver, 1);
+      HYPRE_PCGSetFlex(pcg_solver, flex);
+      HYPRE_PCGSetSkipBreak(pcg_solver, skip_break);
       HYPRE_PCGSetRelChange(pcg_solver, rel_change);
       HYPRE_PCGSetPrintLevel(pcg_solver, ioutdat);
       HYPRE_PCGSetAbsoluteTol(pcg_solver, atol);
@@ -4010,7 +5027,7 @@ main( hypre_int argc,
       if (solver_id == 1)
       {
          /* use BoomerAMG as preconditioner */
-         if (myid == 0) hypre_printf("Solver: AMG-PCG\n");
+         if (myid == 0) { hypre_printf("Solver: AMG-PCG\n"); }
          HYPRE_BoomerAMGCreate(&pcg_precond);
          /* BM Aug 25, 2006 */
          HYPRE_BoomerAMGSetCGCIts(pcg_precond, cgcits);
@@ -4035,7 +5052,7 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetSCommPkgSwitch(pcg_precond, S_commpkg_switch);
          HYPRE_BoomerAMGSetPrintLevel(pcg_precond, poutdat);
          HYPRE_BoomerAMGSetPrintFileName(pcg_precond, "driver.out.log");
-         HYPRE_BoomerAMGSetMaxIter(pcg_precond, 1);
+         HYPRE_BoomerAMGSetMaxIter(pcg_precond, precon_cycles);
          HYPRE_BoomerAMGSetCycleType(pcg_precond, cycle_type);
          HYPRE_BoomerAMGSetFCycle(pcg_precond, fcycle);
          HYPRE_BoomerAMGSetNumSweeps(pcg_precond, num_sweeps);
@@ -4044,13 +5061,19 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetCRRate(pcg_precond, CR_rate);
          HYPRE_BoomerAMGSetCRStrongTh(pcg_precond, CR_strong_th);
          HYPRE_BoomerAMGSetCRUseCG(pcg_precond, CR_use_CG);
-         if (relax_type > -1) HYPRE_BoomerAMGSetRelaxType(pcg_precond, relax_type);
+         if (relax_type > -1) { HYPRE_BoomerAMGSetRelaxType(pcg_precond, relax_type); }
          if (relax_down > -1)
+         {
             HYPRE_BoomerAMGSetCycleRelaxType(pcg_precond, relax_down, 1);
+         }
          if (relax_up > -1)
+         {
             HYPRE_BoomerAMGSetCycleRelaxType(pcg_precond, relax_up, 2);
+         }
          if (relax_coarse > -1)
+         {
             HYPRE_BoomerAMGSetCycleRelaxType(pcg_precond, relax_coarse, 3);
+         }
          HYPRE_BoomerAMGSetAddRelaxType(pcg_precond, add_relax_type);
          HYPRE_BoomerAMGSetAddRelaxWt(pcg_precond, add_relax_wt);
          HYPRE_BoomerAMGSetChebyOrder(pcg_precond, cheby_order);
@@ -4062,15 +5085,20 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetRelaxWt(pcg_precond, relax_wt);
          HYPRE_BoomerAMGSetOuterWt(pcg_precond, outer_wt);
          if (level_w > -1)
-            HYPRE_BoomerAMGSetLevelRelaxWt(pcg_precond, relax_wt_level,level_w);
+         {
+            HYPRE_BoomerAMGSetLevelRelaxWt(pcg_precond, relax_wt_level, level_w);
+         }
          if (level_ow > -1)
-            HYPRE_BoomerAMGSetLevelOuterWt(pcg_precond,outer_wt_level,level_ow);
+         {
+            HYPRE_BoomerAMGSetLevelOuterWt(pcg_precond, outer_wt_level, level_ow);
+         }
          HYPRE_BoomerAMGSetSmoothType(pcg_precond, smooth_type);
          HYPRE_BoomerAMGSetSmoothNumLevels(pcg_precond, smooth_num_levels);
          HYPRE_BoomerAMGSetSmoothNumSweeps(pcg_precond, smooth_num_sweeps);
          HYPRE_BoomerAMGSetMaxLevels(pcg_precond, max_levels);
          HYPRE_BoomerAMGSetMaxRowSum(pcg_precond, max_row_sum);
          HYPRE_BoomerAMGSetDebugFlag(pcg_precond, debug_flag);
+         HYPRE_BoomerAMGSetFilterFunctions(pcg_precond, filter_functions);
          HYPRE_BoomerAMGSetNumFunctions(pcg_precond, num_functions);
          HYPRE_BoomerAMGSetAggNumLevels(pcg_precond, agg_num_levels);
          HYPRE_BoomerAMGSetAggInterpType(pcg_precond, agg_interp_type);
@@ -4087,13 +5115,37 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetDomainType(pcg_precond, domain_type);
          HYPRE_BoomerAMGSetSchwarzUseNonSymm(pcg_precond, use_nonsymm_schwarz);
          HYPRE_BoomerAMGSetSchwarzRlxWeight(pcg_precond, schwarz_rlx_weight);
-         if (eu_level < 0) eu_level = 0;
+         if (eu_level < 0) { eu_level = 0; }
          HYPRE_BoomerAMGSetEuLevel(pcg_precond, eu_level);
          HYPRE_BoomerAMGSetEuBJ(pcg_precond, eu_bj);
          HYPRE_BoomerAMGSetEuSparseA(pcg_precond, eu_sparse_A);
+         HYPRE_BoomerAMGSetILUType(pcg_precond, ilu_type);
+         HYPRE_BoomerAMGSetILULevel(pcg_precond, ilu_lfil);
+         HYPRE_BoomerAMGSetILUDroptol(pcg_precond, ilu_droptol);
+         HYPRE_BoomerAMGSetILUMaxRowNnz(pcg_precond, ilu_max_row_nnz);
+         HYPRE_BoomerAMGSetILUMaxIter(pcg_precond, ilu_sm_max_iter);
+         HYPRE_BoomerAMGSetILUTriSolve(pcg_precond, ilu_tri_solve);
+         HYPRE_BoomerAMGSetILULowerJacobiIters(pcg_precond, ilu_ljac_iters);
+         HYPRE_BoomerAMGSetILUUpperJacobiIters(pcg_precond, ilu_ujac_iters);
+         HYPRE_BoomerAMGSetILULocalReordering(pcg_precond, ilu_reordering);
+         HYPRE_BoomerAMGSetILUIterSetupType(pcg_precond, ilu_iter_setup_type);
+         HYPRE_BoomerAMGSetILUIterSetupOption(pcg_precond, ilu_iter_setup_option);
+         HYPRE_BoomerAMGSetILUIterSetupMaxIter(pcg_precond, ilu_iter_setup_max_iter);
+         HYPRE_BoomerAMGSetILUIterSetupTolerance(pcg_precond, ilu_iter_setup_tolerance);
+         HYPRE_BoomerAMGSetFSAIAlgoType(pcg_precond, fsai_algo_type);
+         HYPRE_BoomerAMGSetFSAILocalSolveType(pcg_precond, fsai_ls_type);
+         HYPRE_BoomerAMGSetFSAIMaxSteps(pcg_precond, fsai_max_steps);
+         HYPRE_BoomerAMGSetFSAIMaxStepSize(pcg_precond, fsai_max_step_size);
+         HYPRE_BoomerAMGSetFSAIMaxNnzRow(pcg_precond, fsai_max_nnz_row);
+         HYPRE_BoomerAMGSetFSAINumLevels(pcg_precond, fsai_num_levels);
+         HYPRE_BoomerAMGSetFSAIEigMaxIters(pcg_precond, fsai_eig_max_iters);
+         HYPRE_BoomerAMGSetFSAIThreshold(pcg_precond, fsai_threshold);
+         HYPRE_BoomerAMGSetFSAIKapTolerance(pcg_precond, fsai_kap_tolerance);
          HYPRE_BoomerAMGSetCycleNumSweeps(pcg_precond, ns_coarse, 3);
          if (num_functions > 1)
+         {
             HYPRE_BoomerAMGSetDofFunc(pcg_precond, dof_func);
+         }
          HYPRE_BoomerAMGSetAdditive(pcg_precond, additive);
          HYPRE_BoomerAMGSetMultAdditive(pcg_precond, mult_add);
          HYPRE_BoomerAMGSetSimple(pcg_precond, simple);
@@ -4108,9 +5160,11 @@ main( hypre_int argc,
 #endif
          if (nongalerk_tol)
          {
-            HYPRE_BoomerAMGSetNonGalerkinTol(pcg_precond, nongalerk_tol[nongalerk_num_tol-1]);
-            for (i=0; i < nongalerk_num_tol-1; i++)
+            HYPRE_BoomerAMGSetNonGalerkinTol(pcg_precond, nongalerk_tol[nongalerk_num_tol - 1]);
+            for (i = 0; i < nongalerk_num_tol - 1; i++)
+            {
                HYPRE_BoomerAMGSetLevelNonGalerkinTol(pcg_precond, nongalerk_tol[i], i);
+            }
          }
          if (build_rbm)
          {
@@ -4120,16 +5174,13 @@ main( hypre_int argc,
             HYPRE_BoomerAMGSetInterpVecAbsQTrunc(pcg_precond, Q_trunc);
          }
          HYPRE_PCGSetMaxIter(pcg_solver, mg_max_iter);
-         HYPRE_PCGSetPrecond(pcg_solver,
-                             (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSolve,
-                             (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSetup,
-                             pcg_precond);
+         HYPRE_PCGSetPreconditioner(pcg_solver, pcg_precond);
       }
       else if (solver_id == 2)
       {
 
          /* use diagonal scaling as preconditioner */
-         if (myid == 0) hypre_printf("Solver: DS-PCG\n");
+         if (myid == 0) { hypre_printf("Solver: DS-PCG\n"); }
          pcg_precond = NULL;
 
          HYPRE_PCGSetPrecond(pcg_solver,
@@ -4140,7 +5191,7 @@ main( hypre_int argc,
       else if (solver_id == 8)
       {
          /* use ParaSails preconditioner */
-         if (myid == 0) hypre_printf("Solver: ParaSails-PCG\n");
+         if (myid == 0) { hypre_printf("Solver: ParaSails-PCG\n"); }
 
          HYPRE_ParaSailsCreate(hypre_MPI_COMM_WORLD, &pcg_precond);
          HYPRE_ParaSailsSetParams(pcg_precond, sai_threshold, max_levels);
@@ -4155,7 +5206,7 @@ main( hypre_int argc,
       else if (solver_id == 12)
       {
          /* use Schwarz preconditioner */
-         if (myid == 0) hypre_printf("Solver: Schwarz-PCG\n");
+         if (myid == 0) { hypre_printf("Solver: Schwarz-PCG\n"); }
 
          HYPRE_SchwarzCreate(&pcg_precond);
          HYPRE_SchwarzSetVariant(pcg_precond, variant);
@@ -4177,7 +5228,7 @@ main( hypre_int argc,
          /* fine grid */
          relax_order = 0;
 
-         if (myid == 0) hypre_printf("Solver: GSMG-PCG\n");
+         if (myid == 0) { hypre_printf("Solver: GSMG-PCG\n"); }
          HYPRE_BoomerAMGCreate(&pcg_precond);
          HYPRE_BoomerAMGSetGSMG(pcg_precond, 4);
          /* BM Aug 25, 2006 */
@@ -4203,7 +5254,7 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetSCommPkgSwitch(pcg_precond, S_commpkg_switch);
          HYPRE_BoomerAMGSetPrintLevel(pcg_precond, poutdat);
          HYPRE_BoomerAMGSetPrintFileName(pcg_precond, "driver.out.log");
-         HYPRE_BoomerAMGSetMaxIter(pcg_precond, 1);
+         HYPRE_BoomerAMGSetMaxIter(pcg_precond, precon_cycles);
          HYPRE_BoomerAMGSetCycleType(pcg_precond, cycle_type);
          HYPRE_BoomerAMGSetFCycle(pcg_precond, fcycle);
          HYPRE_BoomerAMGSetNumSweeps(pcg_precond, num_sweeps);
@@ -4212,13 +5263,19 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetCRRate(pcg_precond, CR_rate);
          HYPRE_BoomerAMGSetCRStrongTh(pcg_precond, CR_strong_th);
          HYPRE_BoomerAMGSetCRUseCG(pcg_precond, CR_use_CG);
-         if (relax_type > -1) HYPRE_BoomerAMGSetRelaxType(pcg_precond, relax_type);
+         if (relax_type > -1) { HYPRE_BoomerAMGSetRelaxType(pcg_precond, relax_type); }
          if (relax_down > -1)
+         {
             HYPRE_BoomerAMGSetCycleRelaxType(pcg_precond, relax_down, 1);
+         }
          if (relax_up > -1)
+         {
             HYPRE_BoomerAMGSetCycleRelaxType(pcg_precond, relax_up, 2);
+         }
          if (relax_coarse > -1)
+         {
             HYPRE_BoomerAMGSetCycleRelaxType(pcg_precond, relax_coarse, 3);
+         }
          HYPRE_BoomerAMGSetAddRelaxType(pcg_precond, add_relax_type);
          HYPRE_BoomerAMGSetAddRelaxWt(pcg_precond, add_relax_wt);
          HYPRE_BoomerAMGSetRelaxOrder(pcg_precond, relax_order);
@@ -4230,9 +5287,13 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetRelaxWt(pcg_precond, relax_wt);
          HYPRE_BoomerAMGSetOuterWt(pcg_precond, outer_wt);
          if (level_w > -1)
-            HYPRE_BoomerAMGSetLevelRelaxWt(pcg_precond, relax_wt_level,level_w);
+         {
+            HYPRE_BoomerAMGSetLevelRelaxWt(pcg_precond, relax_wt_level, level_w);
+         }
          if (level_ow > -1)
-            HYPRE_BoomerAMGSetLevelOuterWt(pcg_precond,outer_wt_level,level_ow);
+         {
+            HYPRE_BoomerAMGSetLevelOuterWt(pcg_precond, outer_wt_level, level_ow);
+         }
          HYPRE_BoomerAMGSetSmoothType(pcg_precond, smooth_type);
          HYPRE_BoomerAMGSetSmoothNumLevels(pcg_precond, smooth_num_levels);
          HYPRE_BoomerAMGSetSmoothNumSweeps(pcg_precond, smooth_num_sweeps);
@@ -4240,13 +5301,36 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetOverlap(pcg_precond, overlap);
          HYPRE_BoomerAMGSetDomainType(pcg_precond, domain_type);
          HYPRE_BoomerAMGSetSchwarzRlxWeight(pcg_precond, schwarz_rlx_weight);
-         if (eu_level < 0) eu_level = 0;
+         if (eu_level < 0) { eu_level = 0; }
          HYPRE_BoomerAMGSetEuLevel(pcg_precond, eu_level);
          HYPRE_BoomerAMGSetEuBJ(pcg_precond, eu_bj);
          HYPRE_BoomerAMGSetEuSparseA(pcg_precond, eu_sparse_A);
+         HYPRE_BoomerAMGSetILUType(pcg_precond, ilu_type);
+         HYPRE_BoomerAMGSetILULevel(pcg_precond, ilu_lfil);
+         HYPRE_BoomerAMGSetILUDroptol(pcg_precond, ilu_droptol);
+         HYPRE_BoomerAMGSetILUMaxRowNnz(pcg_precond, ilu_max_row_nnz);
+         HYPRE_BoomerAMGSetILUMaxIter(pcg_precond, ilu_sm_max_iter);
+         HYPRE_BoomerAMGSetILUTriSolve(pcg_precond, ilu_tri_solve);
+         HYPRE_BoomerAMGSetILULowerJacobiIters(pcg_precond, ilu_ljac_iters);
+         HYPRE_BoomerAMGSetILUUpperJacobiIters(pcg_precond, ilu_ujac_iters);
+         HYPRE_BoomerAMGSetILULocalReordering(pcg_precond, ilu_reordering);
+         HYPRE_BoomerAMGSetILUIterSetupType(pcg_precond, ilu_iter_setup_type);
+         HYPRE_BoomerAMGSetILUIterSetupOption(pcg_precond, ilu_iter_setup_option);
+         HYPRE_BoomerAMGSetILUIterSetupMaxIter(pcg_precond, ilu_iter_setup_max_iter);
+         HYPRE_BoomerAMGSetILUIterSetupTolerance(pcg_precond, ilu_iter_setup_tolerance);
+         HYPRE_BoomerAMGSetFSAIAlgoType(pcg_precond, fsai_algo_type);
+         HYPRE_BoomerAMGSetFSAILocalSolveType(pcg_precond, fsai_ls_type);
+         HYPRE_BoomerAMGSetFSAIMaxSteps(pcg_precond, fsai_max_steps);
+         HYPRE_BoomerAMGSetFSAIMaxStepSize(pcg_precond, fsai_max_step_size);
+         HYPRE_BoomerAMGSetFSAIMaxNnzRow(pcg_precond, fsai_max_nnz_row);
+         HYPRE_BoomerAMGSetFSAINumLevels(pcg_precond, fsai_num_levels);
+         HYPRE_BoomerAMGSetFSAIThreshold(pcg_precond, fsai_threshold);
+         HYPRE_BoomerAMGSetFSAIEigMaxIters(pcg_precond, fsai_eig_max_iters);
+         HYPRE_BoomerAMGSetFSAIKapTolerance(pcg_precond, fsai_kap_tolerance);
          HYPRE_BoomerAMGSetMaxLevels(pcg_precond, max_levels);
          HYPRE_BoomerAMGSetMaxRowSum(pcg_precond, max_row_sum);
          HYPRE_BoomerAMGSetDebugFlag(pcg_precond, debug_flag);
+         HYPRE_BoomerAMGSetFilterFunctions(pcg_precond, filter_functions);
          HYPRE_BoomerAMGSetNumFunctions(pcg_precond, num_functions);
          HYPRE_BoomerAMGSetAggNumLevels(pcg_precond, agg_num_levels);
          HYPRE_BoomerAMGSetAggInterpType(pcg_precond, agg_interp_type);
@@ -4259,7 +5343,9 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetNodalDiag(pcg_precond, nodal_diag);
          HYPRE_BoomerAMGSetCycleNumSweeps(pcg_precond, ns_coarse, 3);
          if (num_functions > 1)
+         {
             HYPRE_BoomerAMGSetDofFunc(pcg_precond, dof_func);
+         }
          HYPRE_BoomerAMGSetAdditive(pcg_precond, additive);
          HYPRE_BoomerAMGSetMultAdditive(pcg_precond, mult_add);
          HYPRE_BoomerAMGSetSimple(pcg_precond, simple);
@@ -4274,9 +5360,11 @@ main( hypre_int argc,
 #endif
          if (nongalerk_tol)
          {
-            HYPRE_BoomerAMGSetNonGalerkinTol(pcg_precond, nongalerk_tol[nongalerk_num_tol-1]);
-            for (i=0; i < nongalerk_num_tol-1; i++)
+            HYPRE_BoomerAMGSetNonGalerkinTol(pcg_precond, nongalerk_tol[nongalerk_num_tol - 1]);
+            for (i = 0; i < nongalerk_num_tol - 1; i++)
+            {
                HYPRE_BoomerAMGSetLevelNonGalerkinTol(pcg_precond, nongalerk_tol[i], i);
+            }
          }
          HYPRE_PCGSetMaxIter(pcg_solver, mg_max_iter);
          HYPRE_PCGSetPrecond(pcg_solver,
@@ -4284,10 +5372,35 @@ main( hypre_int argc,
                              (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSetup,
                              pcg_precond);
       }
+      else if (solver_id == 31)
+      {
+         /* use FSAI preconditioning */
+         if (myid == 0) { hypre_printf("Solver: FSAI-PCG\n"); }
+
+         HYPRE_FSAICreate(&pcg_precond);
+
+         HYPRE_FSAISetAlgoType(pcg_precond, fsai_algo_type);
+         HYPRE_FSAISetLocalSolveType(pcg_precond, fsai_ls_type);
+         HYPRE_FSAISetMaxSteps(pcg_precond, fsai_max_steps);
+         HYPRE_FSAISetMaxStepSize(pcg_precond, fsai_max_step_size);
+         HYPRE_FSAISetMaxNnzRow(pcg_precond, fsai_max_nnz_row);
+         HYPRE_FSAISetNumLevels(pcg_precond, fsai_num_levels);
+         HYPRE_FSAISetThreshold(pcg_precond, fsai_threshold);
+         HYPRE_FSAISetKapTolerance(pcg_precond, fsai_kap_tolerance);
+         HYPRE_FSAISetMaxIterations(pcg_precond, 1);
+         HYPRE_FSAISetTolerance(pcg_precond, 0.0);
+         HYPRE_FSAISetZeroGuess(pcg_precond, 1);
+         HYPRE_FSAISetPrintLevel(pcg_precond, poutdat);
+
+         HYPRE_PCGSetPrecond(pcg_solver,
+                             (HYPRE_PtrToSolverFcn) HYPRE_FSAISolve,
+                             (HYPRE_PtrToSolverFcn) HYPRE_FSAISetup,
+                             pcg_precond);
+      }
       else if (solver_id == 43)
       {
          /* use Euclid preconditioning */
-         if (myid == 0) hypre_printf("Solver: Euclid-PCG\n");
+         if (myid == 0) { hypre_printf("Solver: Euclid-PCG\n"); }
 
          HYPRE_EuclidCreate(hypre_MPI_COMM_WORLD, &pcg_precond);
 
@@ -4296,11 +5409,11 @@ main( hypre_int argc,
             we'll use what I think is simplest: let Euclid internally
             parse the command line.
          */
-         if (eu_level > -1) HYPRE_EuclidSetLevel(pcg_precond, eu_level);
-         if (eu_ilut) HYPRE_EuclidSetILUT(pcg_precond, eu_ilut);
-         if (eu_sparse_A) HYPRE_EuclidSetSparseA(pcg_precond, eu_sparse_A);
-         if (eu_row_scale) HYPRE_EuclidSetRowScale(pcg_precond, eu_row_scale);
-         if (eu_bj) HYPRE_EuclidSetBJ(pcg_precond, eu_bj);
+         if (eu_level > -1) { HYPRE_EuclidSetLevel(pcg_precond, eu_level); }
+         if (eu_ilut) { HYPRE_EuclidSetILUT(pcg_precond, eu_ilut); }
+         if (eu_sparse_A) { HYPRE_EuclidSetSparseA(pcg_precond, eu_sparse_A); }
+         if (eu_row_scale) { HYPRE_EuclidSetRowScale(pcg_precond, eu_row_scale); }
+         if (eu_bj) { HYPRE_EuclidSetBJ(pcg_precond, eu_bj); }
          HYPRE_EuclidSetStats(pcg_precond, eu_stats);
          HYPRE_EuclidSetMem(pcg_precond, eu_mem);
 
@@ -4311,37 +5424,41 @@ main( hypre_int argc,
                              (HYPRE_PtrToSolverFcn) HYPRE_EuclidSetup,
                              pcg_precond);
       }
-      else if( solver_id == 71 )
+      else if ( solver_id == 71 )
       {
          /* use MGR preconditioning */
-         if (myid == 0) hypre_printf("Solver:  MGR-PCG\n");
+         if (myid == 0) { hypre_printf("Solver:  MGR-PCG\n"); }
 
          HYPRE_MGRCreate(&pcg_precond);
 
          mgr_num_cindexes = hypre_CTAlloc(HYPRE_Int,  mgr_nlevels, HYPRE_MEMORY_HOST);
-         for(i=0; i<mgr_nlevels; i++)
-         { /* assume 1 coarse index per level */
+         for (i = 0; i < mgr_nlevels; i++)
+         {
+            /* assume 1 coarse index per level */
             mgr_num_cindexes[i] = 1;
          }
          mgr_cindexes = hypre_CTAlloc(HYPRE_Int*,  mgr_nlevels, HYPRE_MEMORY_HOST);
-         for(i=0; i<mgr_nlevels; i++)
+         for (i = 0; i < mgr_nlevels; i++)
          {
             mgr_cindexes[i] = hypre_CTAlloc(HYPRE_Int,  mgr_num_cindexes[i], HYPRE_MEMORY_HOST);
          }
-         for(i=0; i<mgr_nlevels; i++)
-         { /* assume coarse point is at index 0 */
+         for (i = 0; i < mgr_nlevels; i++)
+         {
+            /* assume coarse point is at index 0 */
             mgr_cindexes[i][0] = 0;
          }
-         mgr_reserved_coarse_indexes = hypre_CTAlloc(HYPRE_BigInt,  mgr_num_reserved_nodes, HYPRE_MEMORY_HOST);
-         for(i=0; i<mgr_num_reserved_nodes; i++)
-         { /* generate artificial reserved nodes */
+         mgr_reserved_coarse_indexes = hypre_CTAlloc(HYPRE_BigInt,  mgr_num_reserved_nodes,
+                                                     HYPRE_MEMORY_HOST);
+         for (i = 0; i < mgr_num_reserved_nodes; i++)
+         {
+            /* generate artificial reserved nodes */
             mgr_reserved_coarse_indexes[i] = last_local_row - (HYPRE_BigInt) i; //2*i+1;
          }
 
          /* set MGR data by block */
-         HYPRE_MGRSetCpointsByBlock( pcg_precond, mgr_bsize, mgr_nlevels, mgr_num_cindexes,mgr_cindexes);
+         HYPRE_MGRSetCpointsByBlock( pcg_precond, mgr_bsize, mgr_nlevels, mgr_num_cindexes, mgr_cindexes);
          /* set reserved coarse nodes */
-         if(mgr_num_reserved_nodes)HYPRE_MGRSetReservedCoarseNodes(pcg_precond, mgr_num_reserved_nodes, mgr_reserved_coarse_indexes);
+         if (mgr_num_reserved_nodes) { HYPRE_MGRSetReservedCoarseNodes(pcg_precond, mgr_num_reserved_nodes, mgr_reserved_coarse_indexes); }
 
          /* set intermediate coarse grid strategy */
          HYPRE_MGRSetNonCpointsToFpoints(pcg_precond, mgr_non_c_to_f);
@@ -4351,10 +5468,14 @@ main( hypre_int argc,
          HYPRE_MGRSetRelaxType(pcg_precond, 0);
          HYPRE_MGRSetNumRelaxSweeps(pcg_precond, 2);
          /* set interpolation type */
-         HYPRE_MGRSetInterpType(pcg_precond, 2);
+         HYPRE_MGRSetRestrictType(pcg_precond, mgr_restrict_type);
+         HYPRE_MGRSetInterpType(pcg_precond, mgr_interp_type);
          HYPRE_MGRSetNumInterpSweeps(pcg_precond, 2);
+         /* set global smoother */
+         HYPRE_MGRSetGlobalSmoothType(pcg_precond, mgr_gsmooth_type);
+         HYPRE_MGRSetMaxGlobalSmoothIters( pcg_precond, mgr_num_gsmooth_sweeps );
          /* set print level */
-         HYPRE_MGRSetPrintLevel(pcg_precond, 1);
+         HYPRE_MGRSetPrintLevel(pcg_precond, ioutdat);
          /* set max iterations */
          HYPRE_MGRSetMaxIter(pcg_precond, 1);
          HYPRE_MGRSetTol(pcg_precond, pc_tol);
@@ -4362,30 +5483,44 @@ main( hypre_int argc,
          /* create AMG coarse grid solver */
 
          HYPRE_BoomerAMGCreate(&amg_solver);
-         /* BM Aug 25, 2006 */
+
+         if (hypre_GetExecPolicy1(memory_location) == HYPRE_EXEC_DEVICE)
+         {
+            HYPRE_BoomerAMGSetInterpType(amg_solver, 18);
+            HYPRE_BoomerAMGSetCoarsenType(amg_solver, 8);
+            HYPRE_BoomerAMGSetRelaxType(amg_solver, 3);
+         }
+         else
+         {
+            HYPRE_BoomerAMGSetInterpType(amg_solver, 0);
+            HYPRE_BoomerAMGSetPostInterpType(amg_solver, post_interp_type);
+            HYPRE_BoomerAMGSetCoarsenType(amg_solver, 6);
+            HYPRE_BoomerAMGSetCycleType(amg_solver, cycle_type);
+            HYPRE_BoomerAMGSetFCycle(amg_solver, fcycle);
+            HYPRE_BoomerAMGSetRelaxType(amg_solver, 3);
+            if (relax_down > -1)
+            {
+               HYPRE_BoomerAMGSetCycleRelaxType(amg_solver, relax_down, 1);
+            }
+            if (relax_up > -1)
+            {
+               HYPRE_BoomerAMGSetCycleRelaxType(amg_solver, relax_up, 2);
+            }
+            if (relax_coarse > -1)
+            {
+               HYPRE_BoomerAMGSetCycleRelaxType(amg_solver, relax_coarse, 3);
+            }
+            HYPRE_BoomerAMGSetSmoothType(amg_solver, smooth_type);
+            HYPRE_BoomerAMGSetSmoothNumSweeps(amg_solver, smooth_num_sweeps);
+         }
          HYPRE_BoomerAMGSetCGCIts(amg_solver, cgcits);
-         HYPRE_BoomerAMGSetInterpType(amg_solver, 0);
-         HYPRE_BoomerAMGSetPostInterpType(amg_solver, post_interp_type);
-         HYPRE_BoomerAMGSetCoarsenType(amg_solver, 6);
+         HYPRE_BoomerAMGSetTol(amg_solver, 0.0);
          HYPRE_BoomerAMGSetPMaxElmts(amg_solver, 0);
-         /* note: log is written to standard output, not to file */
-         HYPRE_BoomerAMGSetPrintLevel(amg_solver, 1);
-         HYPRE_BoomerAMGSetCycleType(amg_solver, cycle_type);
-         HYPRE_BoomerAMGSetFCycle(amg_solver, fcycle);
          HYPRE_BoomerAMGSetNumSweeps(amg_solver, num_sweeps);
-         HYPRE_BoomerAMGSetRelaxType(amg_solver, 3);
-         if (relax_down > -1)
-            HYPRE_BoomerAMGSetCycleRelaxType(amg_solver, relax_down, 1);
-         if (relax_up > -1)
-            HYPRE_BoomerAMGSetCycleRelaxType(amg_solver, relax_up, 2);
-         if (relax_coarse > -1)
-            HYPRE_BoomerAMGSetCycleRelaxType(amg_solver, relax_coarse, 3);
          HYPRE_BoomerAMGSetRelaxOrder(amg_solver, 1);
          HYPRE_BoomerAMGSetMaxLevels(amg_solver, max_levels);
-         HYPRE_BoomerAMGSetSmoothType(amg_solver, smooth_type);
-         HYPRE_BoomerAMGSetSmoothNumSweeps(amg_solver, smooth_num_sweeps);
-         HYPRE_BoomerAMGSetMaxIter(amg_solver, 1);
-         HYPRE_BoomerAMGSetTol(amg_solver, 0.0);
+         HYPRE_BoomerAMGSetMaxIter(amg_solver, precon_cycles);
+         HYPRE_BoomerAMGSetPrintLevel(amg_solver, 1);
 
          /* set the MGR coarse solver. Comment out to use default CG solver in MGR */
          HYPRE_MGRSetCoarseSolver( pcg_precond, HYPRE_BoomerAMGSolve, HYPRE_BoomerAMGSetup, amg_solver);
@@ -4402,14 +5537,17 @@ main( hypre_int argc,
       if (pcg_precond_gotten !=  pcg_precond)
       {
          hypre_printf("HYPRE_ParCSRPCGGetPrecond got bad precond\n");
-         return(-1);
+         return (-1);
+      }
+      else if (myid == 0)
+      {
+         hypre_printf("HYPRE_ParCSRPCGGetPrecond got good precond\n");
       }
-      else
-         if (myid == 0)
-            hypre_printf("HYPRE_ParCSRPCGGetPrecond got good precond\n");
 
-      HYPRE_PCGSetup(pcg_solver, (HYPRE_Matrix)parcsr_A,
-                     (HYPRE_Vector)b, (HYPRE_Vector)x);
+      hypre_GpuProfilingPushRange("PCG-Setup-1");
+      HYPRE_PCGSetup(pcg_solver, (HYPRE_Matrix) parcsr_M,
+                     (HYPRE_Vector) b, (HYPRE_Vector) x);
+      hypre_GpuProfilingPopRange();
       hypre_EndTiming(time_index);
       hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
       hypre_FinalizeTiming(time_index);
@@ -4417,43 +5555,70 @@ main( hypre_int argc,
 
       time_index = hypre_InitializeTiming("PCG Solve");
       hypre_BeginTiming(time_index);
-
+      hypre_GpuProfilingPushRange("PCG-Solve-1");
       HYPRE_PCGSolve(pcg_solver, (HYPRE_Matrix)parcsr_A,
                      (HYPRE_Vector)b, (HYPRE_Vector)x);
-
+      hypre_GpuProfilingPopRange();
       hypre_EndTiming(time_index);
       hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
       hypre_FinalizeTiming(time_index);
       hypre_ClearTiming();
+      HYPRE_ANNOTATE_REGION_END("%s", "Run-1");
 
-      HYPRE_PCGGetNumIterations(pcg_solver, &num_iterations);
-      HYPRE_PCGGetFinalRelativeResidualNorm(pcg_solver, &final_res_norm);
+      if (second_time)
+      {
+         HYPRE_ANNOTATE_REGION_BEGIN("%s", "Run-2");
+         HYPRE_SetExecutionPolicy(exec2_policy);
 
-#if SECOND_TIME
-      /* run a second time to check for memory leaks */
-      HYPRE_ParVectorSetRandomValues(x, 775);
-      time_index = hypre_InitializeTiming("PCG Setup");
-      hypre_BeginTiming(time_index);
+         /* run a second time [for timings, to check for memory leaks] */
+         HYPRE_ParVectorSetRandomValues(x, 775);
+#if defined(HYPRE_USING_CURAND) || defined(HYPRE_USING_ROCRAND)
+         hypre_ResetDeviceRandGenerator(1234ULL, 0ULL);
+#endif
+         hypre_ParVectorCopy(x0_save, x);
 
-      HYPRE_PCGSetup(pcg_solver, (HYPRE_Matrix)parcsr_A,
-                     (HYPRE_Vector)b, (HYPRE_Vector)x);
+#if defined(HYPRE_USING_CUDA)
+         cudaProfilerStart();
+#endif
 
-      hypre_EndTiming(time_index);
-      hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
-      hypre_FinalizeTiming(time_index);
-      hypre_ClearTiming();
+         time_index = hypre_InitializeTiming("PCG Setup");
+         hypre_BeginTiming(time_index);
 
-      time_index = hypre_InitializeTiming("PCG Solve");
-      hypre_BeginTiming(time_index);
+         hypre_GpuProfilingPushRange("PCG-Setup-2");
 
-      HYPRE_PCGSolve(pcg_solver, (HYPRE_Matrix)parcsr_A,
-                     (HYPRE_Vector)b, (HYPRE_Vector)x);
+         HYPRE_PCGSetup(pcg_solver, (HYPRE_Matrix) parcsr_M,
+                        (HYPRE_Vector) b, (HYPRE_Vector) x);
 
-      hypre_EndTiming(time_index);
-      hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
-      hypre_FinalizeTiming(time_index);
-      hypre_ClearTiming();
+         hypre_GpuProfilingPopRange();
+
+         hypre_EndTiming(time_index);
+         hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
+         hypre_FinalizeTiming(time_index);
+         hypre_ClearTiming();
+
+         time_index = hypre_InitializeTiming("PCG Solve");
+         hypre_BeginTiming(time_index);
+
+         hypre_GpuProfilingPushRange("PCG-Solve-2");
+
+         HYPRE_PCGSolve(pcg_solver, (HYPRE_Matrix)parcsr_A,
+                        (HYPRE_Vector)b, (HYPRE_Vector)x);
+
+         hypre_GpuProfilingPopRange();
+
+         hypre_EndTiming(time_index);
+         hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
+         hypre_FinalizeTiming(time_index);
+         hypre_ClearTiming();
+
+         HYPRE_ANNOTATE_REGION_END("%s", "Run-2");
+#if defined(HYPRE_USING_CUDA)
+         cudaProfilerStop();
 #endif
+      }
+
+      HYPRE_PCGGetNumIterations(pcg_solver, &num_iterations);
+      HYPRE_PCGGetFinalRelativeResidualNorm(pcg_solver, &final_res_norm);
 
       HYPRE_ParCSRPCGDestroy(pcg_solver);
 
@@ -4473,27 +5638,37 @@ main( hypre_int argc,
       {
          HYPRE_BoomerAMGDestroy(pcg_precond);
       }
+      else if (solver_id == 31)
+      {
+         HYPRE_FSAIDestroy(pcg_precond);
+      }
       else if (solver_id == 43)
       {
          HYPRE_EuclidDestroy(pcg_precond);
       }
-      else if(solver_id == 71)
+      else if (solver_id == 71)
       {
          /* free memory */
-         if(mgr_num_cindexes)
+         if (mgr_num_cindexes)
+         {
             hypre_TFree(mgr_num_cindexes, HYPRE_MEMORY_HOST);
+         }
          mgr_num_cindexes = NULL;
 
-         if(mgr_reserved_coarse_indexes)
+         if (mgr_reserved_coarse_indexes)
+         {
             hypre_TFree(mgr_reserved_coarse_indexes, HYPRE_MEMORY_HOST);
+         }
          mgr_reserved_coarse_indexes = NULL;
 
-         if(mgr_cindexes)
+         if (mgr_cindexes)
          {
-            for( i=0; i<mgr_nlevels; i++)
+            for ( i = 0; i < mgr_nlevels; i++)
             {
-               if(mgr_cindexes[i])
+               if (mgr_cindexes[i])
+               {
                   hypre_TFree(mgr_cindexes[i], HYPRE_MEMORY_HOST);
+               }
             }
             hypre_TFree(mgr_cindexes, HYPRE_MEMORY_HOST);
             mgr_cindexes = NULL;
@@ -4526,13 +5701,16 @@ main( hypre_int argc,
       HYPRE_ParCSRSetupMatvec(&matvec_fn);
 
       if (myid != 0)
+      {
          verbosity = 0;
+      }
 
-      if ( lobpcgGen ) {
+      if ( lobpcgGen )
+      {
          BuildParIsoLaplacian(argc, argv, &parcsr_B);
 
          ierr = HYPRE_ParCSRMatrixGetLocalRange( parcsr_B,
-                                                 &first_local_row, &last_local_row ,
+                                                 &first_local_row, &last_local_row,
                                                  &first_local_col, &last_local_col );
 
          local_num_rows = (HYPRE_Int)(last_local_row - first_local_row + 1);
@@ -4545,19 +5723,25 @@ main( hypre_int argc,
 
          ierr += HYPRE_IJMatrixSetObjectType( ij_B, HYPRE_PARCSR );
 
-         if (sparsity_known == 1) {
+         if (sparsity_known == 1)
+         {
             diag_sizes = hypre_CTAlloc(HYPRE_Int,  local_num_rows, HYPRE_MEMORY_HOST);
             offdiag_sizes = hypre_CTAlloc(HYPRE_Int,  local_num_rows, HYPRE_MEMORY_HOST);
             local_row = 0;
-            for (big_i=first_local_row; big_i<= last_local_row; big_i++) {
+            for (big_i = first_local_row; big_i <= last_local_row; big_i++)
+            {
                ierr += HYPRE_ParCSRMatrixGetRow( parcsr_B, big_i, &size,
                                                  &col_inds, &values );
-               for (j=0; j < size; j++)
+               for (j = 0; j < size; j++)
                {
                   if (col_inds[j] < first_local_row || col_inds[j] > last_local_row)
+                  {
                      offdiag_sizes[local_row]++;
+                  }
                   else
+                  {
                      diag_sizes[local_row]++;
+                  }
                }
                local_row++;
                ierr += HYPRE_ParCSRMatrixRestoreRow( parcsr_B, big_i, &size,
@@ -4571,7 +5755,7 @@ main( hypre_int argc,
 
             ierr = HYPRE_IJMatrixInitialize( ij_B );
 
-            for (big_i=first_local_row; big_i<= last_local_row; big_i++)
+            for (big_i = first_local_row; big_i <= last_local_row; big_i++)
             {
                ierr += HYPRE_ParCSRMatrixGetRow( parcsr_B, big_i, &size,
                                                  &col_inds, &values );
@@ -4594,13 +5778,28 @@ main( hypre_int argc,
             if (sparsity_known == 0) /* tries a more accurate estimate of the
                                         storage */
             {
-               if (build_matrix_type == 2) size = 7;
-               if (build_matrix_type == 3) size = 9;
-               if (build_matrix_type == 4) size = 27;
+               if (build_matrix_type == 2)
+               {
+                  size = 7;
+               }
+               else if (build_matrix_type == 3)
+               {
+                  size = 9;
+               }
+               else if (build_matrix_type == 4)
+               {
+                  size = 27;
+               }
+               else if (build_matrix_type == 5)
+               {
+                  size = 125;
+               }
             }
 
-            for (i=0; i < local_num_rows; i++)
+            for (i = 0; i < local_num_rows; i++)
+            {
                row_sizes[i] = size;
+            }
 
             ierr = HYPRE_IJMatrixSetRowSizes ( ij_B, (const HYPRE_Int *) row_sizes );
 
@@ -4609,7 +5808,7 @@ main( hypre_int argc,
             ierr = HYPRE_IJMatrixInitialize( ij_B );
 
             /* Loop through all locally stored rows and insert them into ij_matrix */
-            for (big_i=first_local_row; big_i<= last_local_row; big_i++)
+            for (big_i = first_local_row; big_i <= last_local_row; big_i++)
             {
                ierr += HYPRE_ParCSRMatrixGetRow( parcsr_B, big_i, &size,
                                                  &col_inds, &values );
@@ -4651,14 +5850,14 @@ main( hypre_int argc,
          if (solver_id == 1)
          {
             /* use BoomerAMG as preconditioner */
-            if (myid == 0) hypre_printf("Solver: AMG-PCG\n");
+            if (myid == 0) { hypre_printf("Solver: AMG-PCG\n"); }
             HYPRE_BoomerAMGCreate(&pcg_precond);
             /* BM Aug 25, 2006 */
             HYPRE_BoomerAMGSetCGCIts(pcg_precond, cgcits);
             HYPRE_BoomerAMGSetInterpType(pcg_precond, interp_type);
             HYPRE_BoomerAMGSetNumSamples(pcg_precond, gsmg_samples);
             HYPRE_BoomerAMGSetTol(pcg_precond, pc_tol);
-            HYPRE_BoomerAMGSetCoarsenType(pcg_precond, (hybrid*coarsen_type));
+            HYPRE_BoomerAMGSetCoarsenType(pcg_precond, (hybrid * coarsen_type));
             HYPRE_BoomerAMGSetCoarsenCutFactor(pcg_precond, coarsen_cut_factor);
             HYPRE_BoomerAMGSetCPoints(pcg_precond, max_levels, num_cpt, cpt_index);
             HYPRE_BoomerAMGSetFPoints(pcg_precond, num_fpt, fpt_index);
@@ -4671,17 +5870,23 @@ main( hypre_int argc,
             HYPRE_BoomerAMGSetJacobiTruncThreshold(pcg_precond, jacobi_trunc_threshold);
             HYPRE_BoomerAMGSetPrintLevel(pcg_precond, poutdat);
             HYPRE_BoomerAMGSetPrintFileName(pcg_precond, "driver.out.log");
-            HYPRE_BoomerAMGSetMaxIter(pcg_precond, 1);
+            HYPRE_BoomerAMGSetMaxIter(pcg_precond, precon_cycles);
             HYPRE_BoomerAMGSetCycleType(pcg_precond, cycle_type);
             HYPRE_BoomerAMGSetFCycle(pcg_precond, fcycle);
             HYPRE_BoomerAMGSetNumSweeps(pcg_precond, num_sweeps);
-            if (relax_type > -1) HYPRE_BoomerAMGSetRelaxType(pcg_precond, relax_type);
+            if (relax_type > -1) { HYPRE_BoomerAMGSetRelaxType(pcg_precond, relax_type); }
             if (relax_down > -1)
+            {
                HYPRE_BoomerAMGSetCycleRelaxType(pcg_precond, relax_down, 1);
+            }
             if (relax_up > -1)
+            {
                HYPRE_BoomerAMGSetCycleRelaxType(pcg_precond, relax_up, 2);
+            }
             if (relax_coarse > -1)
+            {
                HYPRE_BoomerAMGSetCycleRelaxType(pcg_precond, relax_coarse, 3);
+            }
             HYPRE_BoomerAMGSetAddRelaxType(pcg_precond, add_relax_type);
             HYPRE_BoomerAMGSetAddRelaxWt(pcg_precond, add_relax_wt);
             HYPRE_BoomerAMGSetRelaxWt(pcg_precond, relax_wt);
@@ -4693,6 +5898,7 @@ main( hypre_int argc,
             HYPRE_BoomerAMGSetMaxLevels(pcg_precond, max_levels);
             HYPRE_BoomerAMGSetMaxRowSum(pcg_precond, max_row_sum);
             HYPRE_BoomerAMGSetDebugFlag(pcg_precond, debug_flag);
+            HYPRE_BoomerAMGSetFilterFunctions(pcg_precond, filter_functions);
             HYPRE_BoomerAMGSetNumFunctions(pcg_precond, num_functions);
             HYPRE_BoomerAMGSetNumPaths(pcg_precond, num_paths);
             HYPRE_BoomerAMGSetAggNumLevels(pcg_precond, agg_num_levels);
@@ -4701,7 +5907,9 @@ main( hypre_int argc,
             HYPRE_BoomerAMGSetDomainType(pcg_precond, domain_type);
             HYPRE_BoomerAMGSetSchwarzRlxWeight(pcg_precond, schwarz_rlx_weight);
             if (num_functions > 1)
+            {
                HYPRE_BoomerAMGSetDofFunc(pcg_precond, dof_func);
+            }
             HYPRE_PCGSetPrecond(pcg_solver,
                                 (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSolve,
                                 (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSetup,
@@ -4710,7 +5918,7 @@ main( hypre_int argc,
          else if (solver_id == 2)
          {
             /* use diagonal scaling as preconditioner */
-            if (myid == 0) hypre_printf("Solver: DS-PCG\n");
+            if (myid == 0) { hypre_printf("Solver: DS-PCG\n"); }
             pcg_precond = NULL;
 
             HYPRE_PCGSetPrecond(pcg_solver,
@@ -4721,7 +5929,7 @@ main( hypre_int argc,
          else if (solver_id == 8)
          {
             /* use ParaSails preconditioner */
-            if (myid == 0) hypre_printf("Solver: ParaSails-PCG\n");
+            if (myid == 0) { hypre_printf("Solver: ParaSails-PCG\n"); }
 
             HYPRE_ParaSailsCreate(hypre_MPI_COMM_WORLD, &pcg_precond);
             HYPRE_ParaSailsSetParams(pcg_precond, sai_threshold, max_levels);
@@ -4736,7 +5944,7 @@ main( hypre_int argc,
          else if (solver_id == 12)
          {
             /* use Schwarz preconditioner */
-            if (myid == 0) hypre_printf("Solver: Schwarz-PCG\n");
+            if (myid == 0) { hypre_printf("Solver: Schwarz-PCG\n"); }
 
             HYPRE_SchwarzCreate(&pcg_precond);
             HYPRE_SchwarzSetVariant(pcg_precond, variant);
@@ -4759,7 +5967,7 @@ main( hypre_int argc,
             relax_type = relax_default;
             relax_order = 0;
 
-            if (myid == 0) hypre_printf("Solver: GSMG-PCG\n");
+            if (myid == 0) { hypre_printf("Solver: GSMG-PCG\n"); }
             HYPRE_BoomerAMGCreate(&pcg_precond);
             /* BM Aug 25, 2006 */
             HYPRE_BoomerAMGSetCGCIts(pcg_precond, cgcits);
@@ -4767,7 +5975,7 @@ main( hypre_int argc,
             HYPRE_BoomerAMGSetInterpType(pcg_precond, interp_type);
             HYPRE_BoomerAMGSetNumSamples(pcg_precond, gsmg_samples);
             HYPRE_BoomerAMGSetTol(pcg_precond, pc_tol);
-            HYPRE_BoomerAMGSetCoarsenType(pcg_precond, (hybrid*coarsen_type));
+            HYPRE_BoomerAMGSetCoarsenType(pcg_precond, (hybrid * coarsen_type));
             HYPRE_BoomerAMGSetCoarsenCutFactor(pcg_precond, coarsen_cut_factor);
             HYPRE_BoomerAMGSetCPoints(pcg_precond, max_levels, num_cpt, cpt_index);
             HYPRE_BoomerAMGSetFPoints(pcg_precond, num_fpt, fpt_index);
@@ -4780,7 +5988,7 @@ main( hypre_int argc,
             HYPRE_BoomerAMGSetJacobiTruncThreshold(pcg_precond, jacobi_trunc_threshold);
             HYPRE_BoomerAMGSetPrintLevel(pcg_precond, poutdat);
             HYPRE_BoomerAMGSetPrintFileName(pcg_precond, "driver.out.log");
-            HYPRE_BoomerAMGSetMaxIter(pcg_precond, 1);
+            HYPRE_BoomerAMGSetMaxIter(pcg_precond, precon_cycles);
             HYPRE_BoomerAMGSetCycleType(pcg_precond, cycle_type);
             HYPRE_BoomerAMGSetFCycle(pcg_precond, fcycle);
             HYPRE_BoomerAMGSetNumSweeps(pcg_precond, num_sweeps);
@@ -4800,11 +6008,14 @@ main( hypre_int argc,
             HYPRE_BoomerAMGSetMaxLevels(pcg_precond, max_levels);
             HYPRE_BoomerAMGSetMaxRowSum(pcg_precond, max_row_sum);
             HYPRE_BoomerAMGSetDebugFlag(pcg_precond, debug_flag);
+            HYPRE_BoomerAMGSetFilterFunctions(pcg_precond, filter_functions);
             HYPRE_BoomerAMGSetNumFunctions(pcg_precond, num_functions);
             HYPRE_BoomerAMGSetNumPaths(pcg_precond, num_paths);
             HYPRE_BoomerAMGSetAggNumLevels(pcg_precond, agg_num_levels);
             if (num_functions > 1)
+            {
                HYPRE_BoomerAMGSetDofFunc(pcg_precond, dof_func);
+            }
             HYPRE_PCGSetPrecond(pcg_solver,
                                 (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSolve,
                                 (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSetup,
@@ -4813,7 +6024,7 @@ main( hypre_int argc,
          else if (solver_id == 43)
          {
             /* use Euclid preconditioning */
-            if (myid == 0) hypre_printf("Solver: Euclid-PCG\n");
+            if (myid == 0) { hypre_printf("Solver: Euclid-PCG\n"); }
 
             HYPRE_EuclidCreate(hypre_MPI_COMM_WORLD, &pcg_precond);
 
@@ -4832,20 +6043,23 @@ main( hypre_int argc,
          else if (solver_id != NO_SOLVER )
          {
             if ( verbosity )
+            {
                hypre_printf("Solver ID not recognized - running inner PCG iterations without preconditioner\n\n");
+            }
          }
 
          HYPRE_PCGGetPrecond(pcg_solver, &pcg_precond_gotten);
          if (pcg_precond_gotten !=  pcg_precond)
          {
             hypre_printf("HYPRE_ParCSRPCGGetPrecond got bad precond\n");
-            return(-1);
+            return (-1);
+         }
+         else if (myid == 0)
+         {
+            hypre_printf("HYPRE_ParCSRPCGGetPrecond got good precond\n");
          }
-         else
-            if (myid == 0)
-               hypre_printf("HYPRE_ParCSRPCGGetPrecond got good precond\n");
 
-         /*      HYPRE_PCGSetup(pcg_solver, (HYPRE_Matrix)parcsr_A,
+         /*      HYPRE_PCGSetup(pcg_solver, (HYPRE_Matrix)parcsr_M,
           *                     (HYPRE_Vector)b, (HYPRE_Vector)x); */
 
          hypre_EndTiming(time_index);
@@ -4875,29 +6089,36 @@ main( hypre_int argc,
             HYPRE_LOBPCGSetupB(lobpcg_solver, (HYPRE_Matrix)parcsr_B,
                                (HYPRE_Vector)x);
 
-         if ( vFromFileFlag ) {
+         if ( vFromFileFlag )
+         {
             eigenvectors = mv_MultiVectorWrap( interpreter,
                                                HYPRE_ParCSRMultiVectorRead(hypre_MPI_COMM_WORLD,
                                                                            interpreter,
-                                                                           "vectors" ),1);
+                                                                           "vectors" ), 1);
             hypre_assert( eigenvectors != NULL );
             blockSize = mv_MultiVectorWidth( eigenvectors );
          }
-         else {
+         else
+         {
             eigenvectors = mv_MultiVectorCreateFromSampleVector( interpreter,
                                                                  blockSize,
                                                                  x );
             if ( lobpcgSeed )
+            {
                mv_MultiVectorSetRandom( eigenvectors, lobpcgSeed );
+            }
             else
+            {
                mv_MultiVectorSetRandom( eigenvectors, (HYPRE_Int)time(0) );
+            }
          }
 
-         if ( constrained ) {
+         if ( constrained )
+         {
             constraints = mv_MultiVectorWrap( interpreter,
                                               HYPRE_ParCSRMultiVectorRead(hypre_MPI_COMM_WORLD,
                                                                           interpreter,
-                                                                          "vectors" ),1);
+                                                                          "vectors" ), 1);
             hypre_assert( constraints != NULL );
          }
 
@@ -4914,7 +6135,8 @@ main( hypre_int argc,
          hypre_ClearTiming();
 
 
-         if ( checkOrtho ) {
+         if ( checkOrtho )
+         {
 
             gramXX = utilities_FortranMatrixCreate();
             identity = utilities_FortranMatrixCreate();
@@ -4922,7 +6144,8 @@ main( hypre_int argc,
             utilities_FortranMatrixAllocateData( blockSize, blockSize, gramXX );
             utilities_FortranMatrixAllocateData( blockSize, blockSize, identity );
 
-            if ( lobpcgGen ) {
+            if ( lobpcgGen )
+            {
                workspace = mv_MultiVectorCreateCopy( eigenvectors, 0 );
                hypre_LOBPCGMultiOperatorB( lobpcg_solver,
                                            mv_MultiVectorGetData(eigenvectors),
@@ -4930,40 +6153,53 @@ main( hypre_int argc,
                lobpcg_MultiVectorByMultiVector( eigenvectors, workspace, gramXX );
             }
             else
+            {
                lobpcg_MultiVectorByMultiVector( eigenvectors, eigenvectors, gramXX );
+            }
 
             utilities_FortranMatrixSetToIdentity( identity );
             utilities_FortranMatrixAdd( -1, identity, gramXX, gramXX );
             nonOrthF = utilities_FortranMatrixFNorm( gramXX );
             if ( myid == 0 )
+            {
                hypre_printf("Non-orthonormality of eigenvectors: %12.5e\n", nonOrthF);
+            }
 
             utilities_FortranMatrixDestroy( gramXX );
             utilities_FortranMatrixDestroy( identity );
 
          }
 
-         if ( printLevel ) {
+         if ( printLevel )
+         {
             HYPRE_ParCSRMultiVectorPrint( mv_MultiVectorGetData(eigenvectors), "vectors" );
 
-            if ( myid == 0 ) {
-               if ( (filePtr = fopen("values.txt", "w")) ) {
+            if ( myid == 0 )
+            {
+               if ( (filePtr = fopen("values.txt", "w")) )
+               {
                   hypre_fprintf(filePtr, "%d\n", blockSize);
                   for ( i = 0; i < blockSize; i++ )
+                  {
                      hypre_fprintf(filePtr, "%22.14e\n", eigenvalues[i]);
+                  }
                   fclose(filePtr);
                }
 
-               if ( (filePtr = fopen("residuals.txt", "w")) ) {
+               if ( (filePtr = fopen("residuals.txt", "w")) )
+               {
                   residualNorms = HYPRE_LOBPCGResidualNorms( lobpcg_solver );
                   residuals = utilities_FortranMatrixValues( residualNorms );
                   hypre_fprintf(filePtr, "%d\n", blockSize);
                   for ( i = 0; i < blockSize; i++ )
+                  {
                      hypre_fprintf(filePtr, "%22.14e\n", residuals[i]);
+                  }
                   fclose(filePtr);
                }
 
-               if ( printLevel > 1 ) {
+               if ( printLevel > 1 )
+               {
 
                   printBuffer = utilities_FortranMatrixCreate();
 
@@ -4986,9 +6222,13 @@ main( hypre_int argc,
          HYPRE_LOBPCGDestroy(lobpcg_solver);
          mv_MultiVectorDestroy( eigenvectors );
          if ( constrained )
+         {
             mv_MultiVectorDestroy( constraints );
+         }
          if ( lobpcgGen )
+         {
             mv_MultiVectorDestroy( workspace );
+         }
          hypre_TFree(eigenvalues, HYPRE_MEMORY_HOST);
 
          HYPRE_ParCSRPCGDestroy(pcg_solver);
@@ -5015,12 +6255,15 @@ main( hypre_int argc,
          }
 
       }
-      else { /* pcgIterations <= 0 --> use the preconditioner directly */
+      else   /* pcgIterations <= 0 --> use the preconditioner directly */
+      {
 
          time_index = hypre_InitializeTiming("LOBPCG Setup");
          hypre_BeginTiming(time_index);
          if (myid != 0)
+         {
             verbosity = 0;
+         }
          HYPRE_LOBPCGCreate(interpreter, &matvec_fn, &pcg_solver);
          HYPRE_LOBPCGSetMaxIter(pcg_solver, maxIterations);
          HYPRE_LOBPCGSetTol(pcg_solver, tol);
@@ -5032,7 +6275,9 @@ main( hypre_int argc,
          {
             /* use BoomerAMG as preconditioner */
             if (myid == 0)
+            {
                hypre_printf("Solver: AMG-PCG\n");
+            }
 
             HYPRE_BoomerAMGCreate(&pcg_precond);
             /* BM Aug 25, 2006 */
@@ -5040,7 +6285,7 @@ main( hypre_int argc,
             HYPRE_BoomerAMGSetInterpType(pcg_precond, interp_type);
             HYPRE_BoomerAMGSetNumSamples(pcg_precond, gsmg_samples);
             HYPRE_BoomerAMGSetTol(pcg_precond, pc_tol);
-            HYPRE_BoomerAMGSetCoarsenType(pcg_precond, (hybrid*coarsen_type));
+            HYPRE_BoomerAMGSetCoarsenType(pcg_precond, (hybrid * coarsen_type));
             HYPRE_BoomerAMGSetCoarsenCutFactor(pcg_precond, coarsen_cut_factor);
             HYPRE_BoomerAMGSetCPoints(pcg_precond, max_levels, num_cpt, cpt_index);
             HYPRE_BoomerAMGSetFPoints(pcg_precond, num_fpt, fpt_index);
@@ -5053,17 +6298,23 @@ main( hypre_int argc,
             HYPRE_BoomerAMGSetJacobiTruncThreshold(pcg_precond, jacobi_trunc_threshold);
             HYPRE_BoomerAMGSetPrintLevel(pcg_precond, poutdat);
             HYPRE_BoomerAMGSetPrintFileName(pcg_precond, "driver.out.log");
-            HYPRE_BoomerAMGSetMaxIter(pcg_precond, 1);
+            HYPRE_BoomerAMGSetMaxIter(pcg_precond, precon_cycles);
             HYPRE_BoomerAMGSetCycleType(pcg_precond, cycle_type);
             HYPRE_BoomerAMGSetFCycle(pcg_precond, fcycle);
             HYPRE_BoomerAMGSetNumSweeps(pcg_precond, num_sweeps);
-            if (relax_type > -1) HYPRE_BoomerAMGSetRelaxType(pcg_precond, relax_type);
+            if (relax_type > -1) { HYPRE_BoomerAMGSetRelaxType(pcg_precond, relax_type); }
             if (relax_down > -1)
+            {
                HYPRE_BoomerAMGSetCycleRelaxType(pcg_precond, relax_down, 1);
+            }
             if (relax_up > -1)
+            {
                HYPRE_BoomerAMGSetCycleRelaxType(pcg_precond, relax_up, 2);
+            }
             if (relax_coarse > -1)
+            {
                HYPRE_BoomerAMGSetCycleRelaxType(pcg_precond, relax_coarse, 3);
+            }
             HYPRE_BoomerAMGSetAddRelaxType(pcg_precond, add_relax_type);
             HYPRE_BoomerAMGSetAddRelaxWt(pcg_precond, add_relax_wt);
             HYPRE_BoomerAMGSetRelaxWt(pcg_precond, relax_wt);
@@ -5075,6 +6326,7 @@ main( hypre_int argc,
             HYPRE_BoomerAMGSetMaxLevels(pcg_precond, max_levels);
             HYPRE_BoomerAMGSetMaxRowSum(pcg_precond, max_row_sum);
             HYPRE_BoomerAMGSetDebugFlag(pcg_precond, debug_flag);
+            HYPRE_BoomerAMGSetFilterFunctions(pcg_precond, filter_functions);
             HYPRE_BoomerAMGSetNumFunctions(pcg_precond, num_functions);
             HYPRE_BoomerAMGSetNumPaths(pcg_precond, num_paths);
             HYPRE_BoomerAMGSetAggNumLevels(pcg_precond, agg_num_levels);
@@ -5083,7 +6335,9 @@ main( hypre_int argc,
             HYPRE_BoomerAMGSetDomainType(pcg_precond, domain_type);
             HYPRE_BoomerAMGSetSchwarzRlxWeight(pcg_precond, schwarz_rlx_weight);
             if (num_functions > 1)
+            {
                HYPRE_BoomerAMGSetDofFunc(pcg_precond, dof_func);
+            }
             HYPRE_LOBPCGSetPrecond(pcg_solver,
                                    (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSolve,
                                    (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSetup,
@@ -5094,7 +6348,9 @@ main( hypre_int argc,
 
             /* use diagonal scaling as preconditioner */
             if (myid == 0)
+            {
                hypre_printf("Solver: DS-PCG\n");
+            }
 
             pcg_precond = NULL;
 
@@ -5107,7 +6363,9 @@ main( hypre_int argc,
          {
             /* use ParaSails preconditioner */
             if (myid == 0)
+            {
                hypre_printf("Solver: ParaSails-PCG\n");
+            }
 
             HYPRE_ParaSailsCreate(hypre_MPI_COMM_WORLD, &pcg_precond);
             HYPRE_ParaSailsSetParams(pcg_precond, sai_threshold, max_levels);
@@ -5123,7 +6381,9 @@ main( hypre_int argc,
          {
             /* use Schwarz preconditioner */
             if (myid == 0)
+            {
                hypre_printf("Solver: Schwarz-PCG\n");
+            }
 
             HYPRE_SchwarzCreate(&pcg_precond);
             HYPRE_SchwarzSetVariant(pcg_precond, variant);
@@ -5146,7 +6406,7 @@ main( hypre_int argc,
             relax_type = relax_default;
             relax_order = 0;
 
-            if (myid == 0) hypre_printf("Solver: GSMG-PCG\n");
+            if (myid == 0) { hypre_printf("Solver: GSMG-PCG\n"); }
             HYPRE_BoomerAMGCreate(&pcg_precond);
             /* BM Aug 25, 2006 */
             HYPRE_BoomerAMGSetCGCIts(pcg_precond, cgcits);
@@ -5154,7 +6414,7 @@ main( hypre_int argc,
             HYPRE_BoomerAMGSetInterpType(pcg_precond, interp_type);
             HYPRE_BoomerAMGSetNumSamples(pcg_precond, gsmg_samples);
             HYPRE_BoomerAMGSetTol(pcg_precond, pc_tol);
-            HYPRE_BoomerAMGSetCoarsenType(pcg_precond, (hybrid*coarsen_type));
+            HYPRE_BoomerAMGSetCoarsenType(pcg_precond, (hybrid * coarsen_type));
             HYPRE_BoomerAMGSetCoarsenCutFactor(pcg_precond, coarsen_cut_factor);
             HYPRE_BoomerAMGSetCPoints(pcg_precond, max_levels, num_cpt, cpt_index);
             HYPRE_BoomerAMGSetFPoints(pcg_precond, num_fpt, fpt_index);
@@ -5167,7 +6427,7 @@ main( hypre_int argc,
             HYPRE_BoomerAMGSetJacobiTruncThreshold(pcg_precond, jacobi_trunc_threshold);
             HYPRE_BoomerAMGSetPrintLevel(pcg_precond, poutdat);
             HYPRE_BoomerAMGSetPrintFileName(pcg_precond, "driver.out.log");
-            HYPRE_BoomerAMGSetMaxIter(pcg_precond, 1);
+            HYPRE_BoomerAMGSetMaxIter(pcg_precond, precon_cycles);
             HYPRE_BoomerAMGSetCycleType(pcg_precond, cycle_type);
             HYPRE_BoomerAMGSetFCycle(pcg_precond, fcycle);
             HYPRE_BoomerAMGSetNumSweeps(pcg_precond, num_sweeps);
@@ -5187,11 +6447,14 @@ main( hypre_int argc,
             HYPRE_BoomerAMGSetMaxLevels(pcg_precond, max_levels);
             HYPRE_BoomerAMGSetMaxRowSum(pcg_precond, max_row_sum);
             HYPRE_BoomerAMGSetDebugFlag(pcg_precond, debug_flag);
+            HYPRE_BoomerAMGSetFilterFunctions(pcg_precond, filter_functions);
             HYPRE_BoomerAMGSetNumFunctions(pcg_precond, num_functions);
             HYPRE_BoomerAMGSetNumPaths(pcg_precond, num_paths);
             HYPRE_BoomerAMGSetAggNumLevels(pcg_precond, agg_num_levels);
             if (num_functions > 1)
+            {
                HYPRE_BoomerAMGSetDofFunc(pcg_precond, dof_func);
+            }
 
             HYPRE_LOBPCGSetPrecond(pcg_solver,
                                    (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSolve,
@@ -5202,7 +6465,9 @@ main( hypre_int argc,
          {
             /* use Euclid preconditioning */
             if (myid == 0)
+            {
                hypre_printf("Solver: Euclid-PCG\n");
+            }
 
             HYPRE_EuclidCreate(hypre_MPI_COMM_WORLD, &pcg_precond);
 
@@ -5220,18 +6485,21 @@ main( hypre_int argc,
          else if (solver_id != NO_SOLVER )
          {
             if ( verbosity )
+            {
                hypre_printf("Solver ID not recognized - running LOBPCG without preconditioner\n\n");
+            }
          }
 
          HYPRE_LOBPCGGetPrecond(pcg_solver, &pcg_precond_gotten);
          if (pcg_precond_gotten !=  pcg_precond && pcgIterations)
          {
             hypre_printf("HYPRE_ParCSRLOBPCGGetPrecond got bad precond\n");
-            return(-1);
+            return (-1);
+         }
+         else if (myid == 0)
+         {
+            hypre_printf("HYPRE_ParCSRLOBPCGGetPrecond got good precond\n");
          }
-         else
-            if (myid == 0)
-               hypre_printf("HYPRE_ParCSRLOBPCGGetPrecond got good precond\n");
 
          HYPRE_LOBPCGSetup(pcg_solver, (HYPRE_Matrix)parcsr_A,
                            (HYPRE_Vector)b, (HYPRE_Vector)x);
@@ -5245,29 +6513,36 @@ main( hypre_int argc,
          hypre_FinalizeTiming(time_index);
          hypre_ClearTiming();
 
-         if ( vFromFileFlag ) {
+         if ( vFromFileFlag )
+         {
             eigenvectors = mv_MultiVectorWrap( interpreter,
                                                HYPRE_ParCSRMultiVectorRead(hypre_MPI_COMM_WORLD,
                                                                            interpreter,
-                                                                           "vectors" ),1);
+                                                                           "vectors" ), 1);
             hypre_assert( eigenvectors != NULL );
             blockSize = mv_MultiVectorWidth( eigenvectors );
          }
-         else {
+         else
+         {
             eigenvectors = mv_MultiVectorCreateFromSampleVector( interpreter,
                                                                  blockSize,
                                                                  x );
             if ( lobpcgSeed )
+            {
                mv_MultiVectorSetRandom( eigenvectors, lobpcgSeed );
+            }
             else
+            {
                mv_MultiVectorSetRandom( eigenvectors, (HYPRE_Int)time(0) );
+            }
          }
 
-         if ( constrained ) {
+         if ( constrained )
+         {
             constraints = mv_MultiVectorWrap( interpreter,
                                               HYPRE_ParCSRMultiVectorRead(hypre_MPI_COMM_WORLD,
                                                                           interpreter,
-                                                                          "vectors" ),1);
+                                                                          "vectors" ), 1);
             hypre_assert( constraints != NULL );
          }
 
@@ -5283,7 +6558,8 @@ main( hypre_int argc,
          hypre_FinalizeTiming(time_index);
          hypre_ClearTiming();
 
-         if ( checkOrtho ) {
+         if ( checkOrtho )
+         {
 
             gramXX = utilities_FortranMatrixCreate();
             identity = utilities_FortranMatrixCreate();
@@ -5291,7 +6567,8 @@ main( hypre_int argc,
             utilities_FortranMatrixAllocateData( blockSize, blockSize, gramXX );
             utilities_FortranMatrixAllocateData( blockSize, blockSize, identity );
 
-            if ( lobpcgGen ) {
+            if ( lobpcgGen )
+            {
                workspace = mv_MultiVectorCreateCopy( eigenvectors, 0 );
                hypre_LOBPCGMultiOperatorB( pcg_solver,
                                            mv_MultiVectorGetData(eigenvectors),
@@ -5299,40 +6576,53 @@ main( hypre_int argc,
                lobpcg_MultiVectorByMultiVector( eigenvectors, workspace, gramXX );
             }
             else
+            {
                lobpcg_MultiVectorByMultiVector( eigenvectors, eigenvectors, gramXX );
+            }
 
             utilities_FortranMatrixSetToIdentity( identity );
             utilities_FortranMatrixAdd( -1, identity, gramXX, gramXX );
             nonOrthF = utilities_FortranMatrixFNorm( gramXX );
             if ( myid == 0 )
+            {
                hypre_printf("Non-orthonormality of eigenvectors: %12.5e\n", nonOrthF);
+            }
 
             utilities_FortranMatrixDestroy( gramXX );
             utilities_FortranMatrixDestroy( identity );
 
          }
 
-         if ( printLevel ) {
+         if ( printLevel )
+         {
             HYPRE_ParCSRMultiVectorPrint( mv_MultiVectorGetData(eigenvectors), "vectors" );
 
-            if ( myid == 0 ) {
-               if ( (filePtr = fopen("values.txt", "w")) ) {
+            if ( myid == 0 )
+            {
+               if ( (filePtr = fopen("values.txt", "w")) )
+               {
                   hypre_fprintf(filePtr, "%d\n", blockSize);
                   for ( i = 0; i < blockSize; i++ )
+                  {
                      hypre_fprintf(filePtr, "%22.14e\n", eigenvalues[i]);
+                  }
                   fclose(filePtr);
                }
 
-               if ( (filePtr = fopen("residuals.txt", "w")) ) {
+               if ( (filePtr = fopen("residuals.txt", "w")) )
+               {
                   residualNorms = HYPRE_LOBPCGResidualNorms( pcg_solver );
                   residuals = utilities_FortranMatrixValues( residualNorms );
                   hypre_fprintf(filePtr, "%d\n", blockSize);
                   for ( i = 0; i < blockSize; i++ )
+                  {
                      hypre_fprintf(filePtr, "%22.14e\n", residuals[i]);
+                  }
                   fclose(filePtr);
                }
 
-               if ( printLevel > 1 ) {
+               if ( printLevel > 1 )
+               {
 
                   printBuffer = utilities_FortranMatrixCreate();
 
@@ -5353,13 +6643,19 @@ main( hypre_int argc,
             }
          }
 
-#if SECOND_TIME
-         /* run a second time to check for memory leaks */
-         mv_MultiVectorSetRandom( eigenvectors, 775 );
-         HYPRE_LOBPCGSetup(pcg_solver, (HYPRE_Matrix)parcsr_A,
-                           (HYPRE_Vector)b, (HYPRE_Vector)x);
-         HYPRE_LOBPCGSolve(pcg_solver, constraints, eigenvectors, eigenvalues );
+         if (second_time)
+         {
+            /* run a second time [for timings, to check for memory leaks] */
+            mv_MultiVectorSetRandom( eigenvectors, 775 );
+#if defined(HYPRE_USING_CURAND) || defined(HYPRE_USING_ROCRAND)
+            hypre_ResetDeviceRandGenerator(1234ULL, 0ULL);
 #endif
+            hypre_ParVectorCopy(x0_save, x);
+
+            HYPRE_LOBPCGSetup(pcg_solver, (HYPRE_Matrix)parcsr_A,
+                              (HYPRE_Vector)b, (HYPRE_Vector)x);
+            HYPRE_LOBPCGSolve(pcg_solver, constraints, eigenvectors, eigenvalues );
+         }
 
          HYPRE_LOBPCGDestroy(pcg_solver);
 
@@ -5386,16 +6682,22 @@ main( hypre_int argc,
 
          mv_MultiVectorDestroy( eigenvectors );
          if ( constrained )
+         {
             mv_MultiVectorDestroy( constraints );
+         }
          if ( lobpcgGen )
+         {
             mv_MultiVectorDestroy( workspace );
+         }
          hypre_TFree(eigenvalues, HYPRE_MEMORY_HOST);
       } /* if ( pcgIterations > 0 ) */
 
-      hypre_TFree( interpreter , HYPRE_MEMORY_HOST);
+      hypre_TFree( interpreter, HYPRE_MEMORY_HOST);
 
       if ( lobpcgGen )
+      {
          HYPRE_IJMatrixDestroy(ij_B);
+      }
 
    } /* if ( lobpcgFlag ) */
 
@@ -5409,6 +6711,7 @@ main( hypre_int argc,
        solver_id == 15 || solver_id == 18 || solver_id == 44 ||
        solver_id == 81 || solver_id == 91)
    {
+      HYPRE_ANNOTATE_REGION_BEGIN("%s", "Run-1");
       time_index = hypre_InitializeTiming("GMRES Setup");
       hypre_BeginTiming(time_index);
 
@@ -5426,13 +6729,13 @@ main( hypre_int argc,
          if (solver_id == 3)
          {
             /* use BoomerAMG as preconditioner */
-            if (myid == 0) hypre_printf("Solver: AMG-GMRES\n");
+            if (myid == 0) { hypre_printf("Solver: AMG-GMRES\n"); }
             HYPRE_BoomerAMGCreate(&amg_precond);
          }
          else
          {
             /* use BoomerAMG-DD as preconditioner */
-            if (myid == 0) hypre_printf("Solver: AMG-DD-GMRES\n");
+            if (myid == 0) { hypre_printf("Solver: AMG-DD-GMRES\n"); }
 
             HYPRE_BoomerAMGDDCreate(&pcg_precond);
             HYPRE_BoomerAMGDDGetAMG(pcg_precond, &amg_precond);
@@ -5480,7 +6783,7 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetSCommPkgSwitch(amg_precond, S_commpkg_switch);
          HYPRE_BoomerAMGSetPrintLevel(amg_precond, poutdat);
          HYPRE_BoomerAMGSetPrintFileName(amg_precond, "driver.out.log");
-         HYPRE_BoomerAMGSetMaxIter(amg_precond, 1);
+         HYPRE_BoomerAMGSetMaxIter(amg_precond, precon_cycles);
          HYPRE_BoomerAMGSetCycleType(amg_precond, cycle_type);
          HYPRE_BoomerAMGSetFCycle(amg_precond, fcycle);
          HYPRE_BoomerAMGSetNumSweeps(amg_precond, num_sweeps);
@@ -5489,13 +6792,19 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetCRRate(amg_precond, CR_rate);
          HYPRE_BoomerAMGSetCRStrongTh(amg_precond, CR_strong_th);
          HYPRE_BoomerAMGSetCRUseCG(amg_precond, CR_use_CG);
-         if (relax_type > -1) HYPRE_BoomerAMGSetRelaxType(amg_precond, relax_type);
+         if (relax_type > -1) { HYPRE_BoomerAMGSetRelaxType(amg_precond, relax_type); }
          if (relax_down > -1)
+         {
             HYPRE_BoomerAMGSetCycleRelaxType(amg_precond, relax_down, 1);
+         }
          if (relax_up > -1)
+         {
             HYPRE_BoomerAMGSetCycleRelaxType(amg_precond, relax_up, 2);
+         }
          if (relax_coarse > -1)
+         {
             HYPRE_BoomerAMGSetCycleRelaxType(amg_precond, relax_coarse, 3);
+         }
          HYPRE_BoomerAMGSetAddRelaxType(amg_precond, add_relax_type);
          HYPRE_BoomerAMGSetAddRelaxWt(amg_precond, add_relax_wt);
          HYPRE_BoomerAMGSetChebyOrder(amg_precond, cheby_order);
@@ -5507,15 +6816,20 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetRelaxWt(amg_precond, relax_wt);
          HYPRE_BoomerAMGSetOuterWt(amg_precond, outer_wt);
          if (level_w > -1)
-            HYPRE_BoomerAMGSetLevelRelaxWt(amg_precond, relax_wt_level,level_w);
+         {
+            HYPRE_BoomerAMGSetLevelRelaxWt(amg_precond, relax_wt_level, level_w);
+         }
          if (level_ow > -1)
-            HYPRE_BoomerAMGSetLevelOuterWt(amg_precond,outer_wt_level,level_ow);
+         {
+            HYPRE_BoomerAMGSetLevelOuterWt(amg_precond, outer_wt_level, level_ow);
+         }
          HYPRE_BoomerAMGSetSmoothType(amg_precond, smooth_type);
          HYPRE_BoomerAMGSetSmoothNumLevels(amg_precond, smooth_num_levels);
          HYPRE_BoomerAMGSetSmoothNumSweeps(amg_precond, smooth_num_sweeps);
          HYPRE_BoomerAMGSetMaxLevels(amg_precond, max_levels);
          HYPRE_BoomerAMGSetMaxRowSum(amg_precond, max_row_sum);
          HYPRE_BoomerAMGSetDebugFlag(amg_precond, debug_flag);
+         HYPRE_BoomerAMGSetFilterFunctions(amg_precond, filter_functions);
          HYPRE_BoomerAMGSetNumFunctions(amg_precond, num_functions);
          HYPRE_BoomerAMGSetAggNumLevels(amg_precond, agg_num_levels);
          HYPRE_BoomerAMGSetAggInterpType(amg_precond, agg_interp_type);
@@ -5531,10 +6845,32 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetDomainType(amg_precond, domain_type);
          HYPRE_BoomerAMGSetSchwarzUseNonSymm(amg_precond, use_nonsymm_schwarz);
          HYPRE_BoomerAMGSetSchwarzRlxWeight(amg_precond, schwarz_rlx_weight);
-         if (eu_level < 0) eu_level = 0;
+         if (eu_level < 0) { eu_level = 0; }
          HYPRE_BoomerAMGSetEuLevel(amg_precond, eu_level);
          HYPRE_BoomerAMGSetEuBJ(amg_precond, eu_bj);
          HYPRE_BoomerAMGSetEuSparseA(amg_precond, eu_sparse_A);
+         HYPRE_BoomerAMGSetILUType(amg_precond, ilu_type);
+         HYPRE_BoomerAMGSetILULevel(amg_precond, ilu_lfil);
+         HYPRE_BoomerAMGSetILUDroptol(amg_precond, ilu_droptol);
+         HYPRE_BoomerAMGSetILUMaxRowNnz(amg_precond, ilu_max_row_nnz);
+         HYPRE_BoomerAMGSetILUMaxIter(amg_precond, ilu_sm_max_iter);
+         HYPRE_BoomerAMGSetILUTriSolve(amg_precond, ilu_tri_solve);
+         HYPRE_BoomerAMGSetILULowerJacobiIters(amg_precond, ilu_ljac_iters);
+         HYPRE_BoomerAMGSetILUUpperJacobiIters(amg_precond, ilu_ujac_iters);
+         HYPRE_BoomerAMGSetILULocalReordering(amg_precond, ilu_reordering);
+         HYPRE_BoomerAMGSetILUIterSetupType(amg_precond, ilu_iter_setup_type);
+         HYPRE_BoomerAMGSetILUIterSetupOption(amg_precond, ilu_iter_setup_option);
+         HYPRE_BoomerAMGSetILUIterSetupMaxIter(amg_precond, ilu_iter_setup_max_iter);
+         HYPRE_BoomerAMGSetILUIterSetupTolerance(amg_precond, ilu_iter_setup_tolerance);
+         HYPRE_BoomerAMGSetFSAIAlgoType(amg_precond, fsai_algo_type);
+         HYPRE_BoomerAMGSetFSAILocalSolveType(amg_precond, fsai_ls_type);
+         HYPRE_BoomerAMGSetFSAIMaxSteps(amg_precond, fsai_max_steps);
+         HYPRE_BoomerAMGSetFSAIMaxStepSize(amg_precond, fsai_max_step_size);
+         HYPRE_BoomerAMGSetFSAIMaxNnzRow(amg_precond, fsai_max_nnz_row);
+         HYPRE_BoomerAMGSetFSAINumLevels(amg_precond, fsai_num_levels);
+         HYPRE_BoomerAMGSetFSAIThreshold(amg_precond, fsai_threshold);
+         HYPRE_BoomerAMGSetFSAIEigMaxIters(amg_precond, fsai_eig_max_iters);
+         HYPRE_BoomerAMGSetFSAIKapTolerance(amg_precond, fsai_kap_tolerance);
          HYPRE_BoomerAMGSetCycleNumSweeps(amg_precond, ns_coarse, 3);
          if (ns_down > -1)
          {
@@ -5545,7 +6881,9 @@ main( hypre_int argc,
             HYPRE_BoomerAMGSetCycleNumSweeps(amg_precond, ns_up,     2);
          }
          if (num_functions > 1)
+         {
             HYPRE_BoomerAMGSetDofFunc(amg_precond, dof_func);
+         }
          HYPRE_BoomerAMGSetAdditive(amg_precond, additive);
          HYPRE_BoomerAMGSetMultAdditive(amg_precond, mult_add);
          HYPRE_BoomerAMGSetSimple(amg_precond, simple);
@@ -5560,9 +6898,11 @@ main( hypre_int argc,
 #endif
          if (nongalerk_tol)
          {
-            HYPRE_BoomerAMGSetNonGalerkinTol(amg_precond, nongalerk_tol[nongalerk_num_tol-1]);
-            for (i=0; i < nongalerk_num_tol-1; i++)
+            HYPRE_BoomerAMGSetNonGalerkinTol(amg_precond, nongalerk_tol[nongalerk_num_tol - 1]);
+            for (i = 0; i < nongalerk_num_tol - 1; i++)
+            {
                HYPRE_BoomerAMGSetLevelNonGalerkinTol(amg_precond, nongalerk_tol[i], i);
+            }
          }
          if (build_rbm)
          {
@@ -5592,7 +6932,7 @@ main( hypre_int argc,
       else if (solver_id == 4)
       {
          /* use diagonal scaling as preconditioner */
-         if (myid == 0) hypre_printf("Solver: DS-GMRES\n");
+         if (myid == 0) { hypre_printf("Solver: DS-GMRES\n"); }
          pcg_precond = NULL;
 
          HYPRE_GMRESSetPrecond(pcg_solver,
@@ -5603,10 +6943,11 @@ main( hypre_int argc,
       else if (solver_id == 7)
       {
          /* use PILUT as preconditioner */
-         if (myid == 0) hypre_printf("Solver: PILUT-GMRES\n");
+         if (myid == 0) { hypre_printf("Solver: PILUT-GMRES\n"); }
 
          ierr = HYPRE_ParCSRPilutCreate( hypre_MPI_COMM_WORLD, &pcg_precond );
-         if (ierr) {
+         if (ierr)
+         {
             hypre_printf("Error in ParPilutCreate\n");
          }
 
@@ -5631,7 +6972,7 @@ main( hypre_int argc,
 
          relax_order = 0;
 
-         if (myid == 0) hypre_printf("Solver: GSMG-GMRES\n");
+         if (myid == 0) { hypre_printf("Solver: GSMG-GMRES\n"); }
          HYPRE_BoomerAMGCreate(&pcg_precond);
          HYPRE_BoomerAMGSetGSMG(pcg_precond, 4);
          HYPRE_BoomerAMGSetCGCIts(pcg_precond, cgcits);
@@ -5656,7 +6997,7 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetSCommPkgSwitch(pcg_precond, S_commpkg_switch);
          HYPRE_BoomerAMGSetPrintLevel(pcg_precond, poutdat);
          HYPRE_BoomerAMGSetPrintFileName(pcg_precond, "driver.out.log");
-         HYPRE_BoomerAMGSetMaxIter(pcg_precond, 1);
+         HYPRE_BoomerAMGSetMaxIter(pcg_precond, precon_cycles);
          HYPRE_BoomerAMGSetCycleType(pcg_precond, cycle_type);
          HYPRE_BoomerAMGSetFCycle(pcg_precond, fcycle);
          HYPRE_BoomerAMGSetNumSweeps(pcg_precond, num_sweeps);
@@ -5665,13 +7006,19 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetCRRate(pcg_precond, CR_rate);
          HYPRE_BoomerAMGSetCRStrongTh(pcg_precond, CR_strong_th);
          HYPRE_BoomerAMGSetCRUseCG(pcg_precond, CR_use_CG);
-         if (relax_type > -1) HYPRE_BoomerAMGSetRelaxType(pcg_precond, relax_type);
+         if (relax_type > -1) { HYPRE_BoomerAMGSetRelaxType(pcg_precond, relax_type); }
          if (relax_down > -1)
+         {
             HYPRE_BoomerAMGSetCycleRelaxType(pcg_precond, relax_down, 1);
+         }
          if (relax_up > -1)
+         {
             HYPRE_BoomerAMGSetCycleRelaxType(pcg_precond, relax_up, 2);
+         }
          if (relax_coarse > -1)
+         {
             HYPRE_BoomerAMGSetCycleRelaxType(pcg_precond, relax_coarse, 3);
+         }
          HYPRE_BoomerAMGSetAddRelaxType(pcg_precond, add_relax_type);
          HYPRE_BoomerAMGSetAddRelaxWt(pcg_precond, add_relax_wt);
          HYPRE_BoomerAMGSetChebyOrder(pcg_precond, cheby_order);
@@ -5683,9 +7030,13 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetRelaxWt(pcg_precond, relax_wt);
          HYPRE_BoomerAMGSetOuterWt(pcg_precond, outer_wt);
          if (level_w > -1)
-            HYPRE_BoomerAMGSetLevelRelaxWt(pcg_precond, relax_wt_level,level_w);
+         {
+            HYPRE_BoomerAMGSetLevelRelaxWt(pcg_precond, relax_wt_level, level_w);
+         }
          if (level_ow > -1)
-            HYPRE_BoomerAMGSetLevelOuterWt(pcg_precond,outer_wt_level,level_ow);
+         {
+            HYPRE_BoomerAMGSetLevelOuterWt(pcg_precond, outer_wt_level, level_ow);
+         }
          HYPRE_BoomerAMGSetSmoothType(pcg_precond, smooth_type);
          HYPRE_BoomerAMGSetSmoothNumLevels(pcg_precond, smooth_num_levels);
          HYPRE_BoomerAMGSetSmoothNumSweeps(pcg_precond, smooth_num_sweeps);
@@ -5694,13 +7045,36 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetDomainType(pcg_precond, domain_type);
          HYPRE_BoomerAMGSetSchwarzUseNonSymm(pcg_precond, use_nonsymm_schwarz);
          HYPRE_BoomerAMGSetSchwarzRlxWeight(pcg_precond, schwarz_rlx_weight);
-         if (eu_level < 0) eu_level = 0;
+         if (eu_level < 0) { eu_level = 0; }
          HYPRE_BoomerAMGSetEuLevel(pcg_precond, eu_level);
          HYPRE_BoomerAMGSetEuBJ(pcg_precond, eu_bj);
          HYPRE_BoomerAMGSetEuSparseA(pcg_precond, eu_sparse_A);
+         HYPRE_BoomerAMGSetILUType(pcg_precond, ilu_type);
+         HYPRE_BoomerAMGSetILULevel(pcg_precond, ilu_lfil);
+         HYPRE_BoomerAMGSetILUDroptol(pcg_precond, ilu_droptol);
+         HYPRE_BoomerAMGSetILUMaxRowNnz(pcg_precond, ilu_max_row_nnz);
+         HYPRE_BoomerAMGSetILUMaxIter(pcg_precond, ilu_sm_max_iter);
+         HYPRE_BoomerAMGSetILUTriSolve(pcg_precond, ilu_tri_solve);
+         HYPRE_BoomerAMGSetILULowerJacobiIters(pcg_precond, ilu_ljac_iters);
+         HYPRE_BoomerAMGSetILUUpperJacobiIters(pcg_precond, ilu_ujac_iters);
+         HYPRE_BoomerAMGSetILULocalReordering(pcg_precond, ilu_reordering);
+         HYPRE_BoomerAMGSetILUIterSetupType(pcg_precond, ilu_iter_setup_type);
+         HYPRE_BoomerAMGSetILUIterSetupOption(pcg_precond, ilu_iter_setup_option);
+         HYPRE_BoomerAMGSetILUIterSetupMaxIter(pcg_precond, ilu_iter_setup_max_iter);
+         HYPRE_BoomerAMGSetILUIterSetupTolerance(pcg_precond, ilu_iter_setup_tolerance);
+         HYPRE_BoomerAMGSetFSAIAlgoType(pcg_precond, fsai_algo_type);
+         HYPRE_BoomerAMGSetFSAILocalSolveType(pcg_precond, fsai_ls_type);
+         HYPRE_BoomerAMGSetFSAIMaxSteps(pcg_precond, fsai_max_steps);
+         HYPRE_BoomerAMGSetFSAIMaxStepSize(pcg_precond, fsai_max_step_size);
+         HYPRE_BoomerAMGSetFSAIMaxNnzRow(pcg_precond, fsai_max_nnz_row);
+         HYPRE_BoomerAMGSetFSAINumLevels(pcg_precond, fsai_num_levels);
+         HYPRE_BoomerAMGSetFSAIThreshold(pcg_precond, fsai_threshold);
+         HYPRE_BoomerAMGSetFSAIEigMaxIters(pcg_precond, fsai_eig_max_iters);
+         HYPRE_BoomerAMGSetFSAIKapTolerance(pcg_precond, fsai_kap_tolerance);
          HYPRE_BoomerAMGSetMaxLevels(pcg_precond, max_levels);
          HYPRE_BoomerAMGSetMaxRowSum(pcg_precond, max_row_sum);
          HYPRE_BoomerAMGSetDebugFlag(pcg_precond, debug_flag);
+         HYPRE_BoomerAMGSetFilterFunctions(pcg_precond, filter_functions);
          HYPRE_BoomerAMGSetNumFunctions(pcg_precond, num_functions);
          HYPRE_BoomerAMGSetAggNumLevels(pcg_precond, agg_num_levels);
          HYPRE_BoomerAMGSetAggInterpType(pcg_precond, agg_interp_type);
@@ -5713,7 +7087,9 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetNodalDiag(pcg_precond, nodal_diag);
          HYPRE_BoomerAMGSetCycleNumSweeps(pcg_precond, ns_coarse, 3);
          if (num_functions > 1)
+         {
             HYPRE_BoomerAMGSetDofFunc(pcg_precond, dof_func);
+         }
          HYPRE_BoomerAMGSetAdditive(pcg_precond, additive);
          HYPRE_BoomerAMGSetMultAdditive(pcg_precond, mult_add);
          HYPRE_BoomerAMGSetSimple(pcg_precond, simple);
@@ -5728,9 +7104,11 @@ main( hypre_int argc,
 #endif
          if (nongalerk_tol)
          {
-            HYPRE_BoomerAMGSetNonGalerkinTol(pcg_precond, nongalerk_tol[nongalerk_num_tol-1]);
-            for (i=0; i < nongalerk_num_tol-1; i++)
+            HYPRE_BoomerAMGSetNonGalerkinTol(pcg_precond, nongalerk_tol[nongalerk_num_tol - 1]);
+            for (i = 0; i < nongalerk_num_tol - 1; i++)
+            {
                HYPRE_BoomerAMGSetLevelNonGalerkinTol(pcg_precond, nongalerk_tol[i], i);
+            }
          }
          HYPRE_GMRESSetMaxIter(pcg_solver, mg_max_iter);
          HYPRE_GMRESSetPrecond(pcg_solver,
@@ -5741,7 +7119,7 @@ main( hypre_int argc,
       else if (solver_id == 18)
       {
          /* use ParaSails preconditioner */
-         if (myid == 0) hypre_printf("Solver: ParaSails-GMRES\n");
+         if (myid == 0) { hypre_printf("Solver: ParaSails-GMRES\n"); }
 
          HYPRE_ParaSailsCreate(hypre_MPI_COMM_WORLD, &pcg_precond);
          HYPRE_ParaSailsSetParams(pcg_precond, sai_threshold, max_levels);
@@ -5757,15 +7135,15 @@ main( hypre_int argc,
       else if (solver_id == 44)
       {
          /* use Euclid preconditioning */
-         if (myid == 0) hypre_printf("Solver: Euclid-GMRES\n");
+         if (myid == 0) { hypre_printf("Solver: Euclid-GMRES\n"); }
 
          HYPRE_EuclidCreate(hypre_MPI_COMM_WORLD, &pcg_precond);
 
-         if (eu_level > -1) HYPRE_EuclidSetLevel(pcg_precond, eu_level);
-         if (eu_ilut) HYPRE_EuclidSetILUT(pcg_precond, eu_ilut);
-         if (eu_sparse_A) HYPRE_EuclidSetSparseA(pcg_precond, eu_sparse_A);
-         if (eu_row_scale) HYPRE_EuclidSetRowScale(pcg_precond, eu_row_scale);
-         if (eu_bj) HYPRE_EuclidSetBJ(pcg_precond, eu_bj);
+         if (eu_level > -1) { HYPRE_EuclidSetLevel(pcg_precond, eu_level); }
+         if (eu_ilut) { HYPRE_EuclidSetILUT(pcg_precond, eu_ilut); }
+         if (eu_sparse_A) { HYPRE_EuclidSetSparseA(pcg_precond, eu_sparse_A); }
+         if (eu_row_scale) { HYPRE_EuclidSetRowScale(pcg_precond, eu_row_scale); }
+         if (eu_bj) { HYPRE_EuclidSetBJ(pcg_precond, eu_bj); }
          HYPRE_EuclidSetStats(pcg_precond, eu_stats);
          HYPRE_EuclidSetMem(pcg_precond, eu_mem);
          /*HYPRE_EuclidSetParams(pcg_precond, argc, argv);*/
@@ -5778,24 +7156,32 @@ main( hypre_int argc,
       else if (solver_id == 81)
       {
          /* use hypre_ILU preconditioning */
-         if (myid == 0) hypre_printf("Solver:  ILU-GMRES\n");
+         if (myid == 0) { hypre_printf("Solver:  ILU-GMRES\n"); }
 
          /* create precon */
          HYPRE_ILUCreate(&pcg_precond);
          HYPRE_ILUSetType(pcg_precond, ilu_type);
          HYPRE_ILUSetLevelOfFill(pcg_precond, ilu_lfil);
+         HYPRE_ILUSetLocalReordering(pcg_precond, ilu_reordering);
+         HYPRE_ILUSetTriSolve(pcg_precond, ilu_tri_solve);
+         HYPRE_ILUSetLowerJacobiIters(pcg_precond, ilu_ljac_iters);
+         HYPRE_ILUSetUpperJacobiIters(pcg_precond, ilu_ujac_iters);
+         HYPRE_ILUSetIterativeSetupType(pcg_precond, ilu_iter_setup_type);
+         HYPRE_ILUSetIterativeSetupOption(pcg_precond, ilu_iter_setup_option);
+         HYPRE_ILUSetIterativeSetupMaxIter(pcg_precond, ilu_iter_setup_max_iter);
+         HYPRE_ILUSetIterativeSetupTolerance(pcg_precond, ilu_iter_setup_tolerance);
          /* set print level */
-         HYPRE_ILUSetPrintLevel(pcg_precond, 1);
+         HYPRE_ILUSetPrintLevel(pcg_precond, poutdat);
          /* set max iterations */
          HYPRE_ILUSetMaxIter(pcg_precond, 1);
          HYPRE_ILUSetTol(pcg_precond, pc_tol);
          /* set max number of nonzeros per row */
-         HYPRE_ILUSetMaxNnzPerRow(pcg_precond,ilu_max_row_nnz);
+         HYPRE_ILUSetMaxNnzPerRow(pcg_precond, ilu_max_row_nnz);
          /* set the droptol */
-         HYPRE_ILUSetDropThreshold(pcg_precond,ilu_droptol);
+         HYPRE_ILUSetDropThreshold(pcg_precond, ilu_droptol);
          /* set max iterations for Schur system solve */
          HYPRE_ILUSetSchurMaxIter( pcg_precond, ilu_schur_max_iter );
-         if(ilu_type == 20 || ilu_type == 21)
+         if (ilu_type == 20 || ilu_type == 21)
          {
             HYPRE_ILUSetNSHDropThreshold( pcg_precond, ilu_nsh_droptol);
          }
@@ -5812,7 +7198,7 @@ main( hypre_int argc,
       if (pcg_precond_gotten != ((solver_id == 3) ? amg_precond : pcg_precond))
       {
          hypre_printf("HYPRE_GMRESGetPrecond got bad precond\n");
-         return(-1);
+         return (-1);
       }
       else
       {
@@ -5821,7 +7207,7 @@ main( hypre_int argc,
             hypre_printf("HYPRE_GMRESGetPrecond got good precond\n");
          }
       }
-      HYPRE_GMRESSetup(pcg_solver, (HYPRE_Matrix)parcsr_A, (HYPRE_Vector)b, (HYPRE_Vector)x);
+      HYPRE_GMRESSetup(pcg_solver, (HYPRE_Matrix)parcsr_M, (HYPRE_Vector)b, (HYPRE_Vector)x);
 
       hypre_EndTiming(time_index);
       hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
@@ -5838,9 +7224,6 @@ main( hypre_int argc,
       hypre_FinalizeTiming(time_index);
       hypre_ClearTiming();
 
-      HYPRE_GMRESGetNumIterations(pcg_solver, &num_iterations);
-      HYPRE_GMRESGetFinalRelativeResidualNorm(pcg_solver,&final_res_norm);
-
       if (check_residual)
       {
          HYPRE_BigInt *indices_h, *indices_d;
@@ -5848,7 +7231,7 @@ main( hypre_int argc,
          HYPRE_Int num_values = 20;
          HYPRE_ParCSRGMRESGetResidual(pcg_solver, &residual);
          HYPRE_ParCSRMatrixGetLocalRange( parcsr_A,
-                                          &first_local_row, &last_local_row ,
+                                          &first_local_row, &last_local_row,
                                           &first_local_col, &last_local_col );
          local_num_rows = (HYPRE_Int)(last_local_row - first_local_row + 1);
          if (local_num_rows < 20)
@@ -5857,17 +7240,19 @@ main( hypre_int argc,
          }
          indices_h = hypre_TAlloc(HYPRE_BigInt, num_values, HYPRE_MEMORY_HOST);
          values_h = hypre_TAlloc(HYPRE_Complex, num_values, HYPRE_MEMORY_HOST);
-         indices_d = hypre_TAlloc(HYPRE_BigInt, num_values, HYPRE_MEMORY_DEVICE);
-         values_d = hypre_TAlloc(HYPRE_Complex, num_values, HYPRE_MEMORY_DEVICE);
+         indices_d = hypre_TAlloc(HYPRE_BigInt, num_values, memory_location);
+         values_d = hypre_TAlloc(HYPRE_Complex, num_values, memory_location);
          for (i = 0; i < num_values; i++)
          {
             indices_h[i] = first_local_row + i;
          }
-         hypre_TMemcpy(indices_d, indices_h, HYPRE_BigInt, num_values, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
+         hypre_TMemcpy(indices_d, indices_h, HYPRE_BigInt, num_values, memory_location,
+                       HYPRE_MEMORY_HOST);
 
          HYPRE_ParVectorGetValues((HYPRE_ParVector) residual, num_values, indices_d, values_d);
 
-         hypre_TMemcpy(values_h, values_d, HYPRE_Complex, num_values, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
+         hypre_TMemcpy(values_h, values_d, HYPRE_Complex, num_values, HYPRE_MEMORY_HOST,
+                       memory_location);
 
          for (i = 0; i < num_values; i++)
          {
@@ -5878,18 +7263,34 @@ main( hypre_int argc,
          }
          hypre_TFree(indices_h, HYPRE_MEMORY_HOST);
          hypre_TFree(values_h, HYPRE_MEMORY_HOST);
-         hypre_TFree(indices_d, HYPRE_MEMORY_DEVICE);
-         hypre_TFree(values_d, HYPRE_MEMORY_DEVICE);
+         hypre_TFree(indices_d, memory_location);
+         hypre_TFree(values_d, memory_location);
       }
+      HYPRE_ANNOTATE_REGION_END("%s", "Run-1");
 
-#if SECOND_TIME
-      /* run a second time to check for memory leaks */
-      HYPRE_ParVectorSetRandomValues(x, 775);
-      HYPRE_GMRESSetup(pcg_solver, (HYPRE_Matrix)parcsr_A, (HYPRE_Vector)b,
-                       (HYPRE_Vector)x);
-      HYPRE_GMRESSolve(pcg_solver, (HYPRE_Matrix)parcsr_A, (HYPRE_Vector)b,
-                       (HYPRE_Vector)x);
+      if (second_time)
+      {
+         HYPRE_ANNOTATE_REGION_BEGIN("%s", "Run-2");
+         /* run a second time [for timings, to check for memory leaks] */
+         HYPRE_ParVectorSetRandomValues(x, 775);
+#if defined(HYPRE_USING_CURAND) || defined(HYPRE_USING_ROCRAND)
+         hypre_ResetDeviceRandGenerator(1234ULL, 0ULL);
 #endif
+         hypre_ParVectorCopy(x0_save, x);
+
+         HYPRE_GMRESSetup(pcg_solver,
+                          (HYPRE_Matrix) parcsr_M,
+                          (HYPRE_Vector) b,
+                          (HYPRE_Vector) x);
+         HYPRE_GMRESSolve(pcg_solver,
+                          (HYPRE_Matrix) parcsr_A,
+                          (HYPRE_Vector) b,
+                          (HYPRE_Vector) x);
+         HYPRE_ANNOTATE_REGION_END("%s", "Run-2");
+      }
+
+      HYPRE_GMRESGetNumIterations(pcg_solver, &num_iterations);
+      HYPRE_GMRESGetFinalRelativeResidualNorm(pcg_solver, &final_res_norm);
 
       HYPRE_ParCSRGMRESDestroy(pcg_solver);
 
@@ -5930,12 +7331,13 @@ main( hypre_int argc,
          hypre_printf("\n");
       }
    }
-/*-----------------------------------------------------------
- * Solve the system using LGMRES
- *-----------------------------------------------------------*/
+   /*-----------------------------------------------------------
+    * Solve the system using LGMRES
+    *-----------------------------------------------------------*/
 
    if (solver_id == 50 || solver_id == 51 )
    {
+      HYPRE_ANNOTATE_REGION_BEGIN("%s", "Run-1");
       time_index = hypre_InitializeTiming("LGMRES Setup");
       hypre_BeginTiming(time_index);
 
@@ -5951,7 +7353,7 @@ main( hypre_int argc,
       if (solver_id == 51)
       {
          /* use BoomerAMG as preconditioner */
-         if (myid == 0) hypre_printf("Solver: AMG-LGMRES\n");
+         if (myid == 0) { hypre_printf("Solver: AMG-LGMRES\n"); }
 
          HYPRE_BoomerAMGCreate(&pcg_precond);
          HYPRE_BoomerAMGSetCGCIts(pcg_precond, cgcits);
@@ -5976,7 +7378,7 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetSCommPkgSwitch(pcg_precond, S_commpkg_switch);
          HYPRE_BoomerAMGSetPrintLevel(pcg_precond, poutdat);
          HYPRE_BoomerAMGSetPrintFileName(pcg_precond, "driver.out.log");
-         HYPRE_BoomerAMGSetMaxIter(pcg_precond, 1);
+         HYPRE_BoomerAMGSetMaxIter(pcg_precond, precon_cycles);
          HYPRE_BoomerAMGSetCycleType(pcg_precond, cycle_type);
          HYPRE_BoomerAMGSetFCycle(pcg_precond, fcycle);
          HYPRE_BoomerAMGSetNumSweeps(pcg_precond, num_sweeps);
@@ -5985,13 +7387,19 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetCRRate(pcg_precond, CR_rate);
          HYPRE_BoomerAMGSetCRStrongTh(pcg_precond, CR_strong_th);
          HYPRE_BoomerAMGSetCRUseCG(pcg_precond, CR_use_CG);
-         if (relax_type > -1) HYPRE_BoomerAMGSetRelaxType(pcg_precond, relax_type);
+         if (relax_type > -1) { HYPRE_BoomerAMGSetRelaxType(pcg_precond, relax_type); }
          if (relax_down > -1)
+         {
             HYPRE_BoomerAMGSetCycleRelaxType(pcg_precond, relax_down, 1);
+         }
          if (relax_up > -1)
+         {
             HYPRE_BoomerAMGSetCycleRelaxType(pcg_precond, relax_up, 2);
+         }
          if (relax_coarse > -1)
+         {
             HYPRE_BoomerAMGSetCycleRelaxType(pcg_precond, relax_coarse, 3);
+         }
          HYPRE_BoomerAMGSetAddRelaxType(pcg_precond, add_relax_type);
          HYPRE_BoomerAMGSetAddRelaxWt(pcg_precond, add_relax_wt);
          HYPRE_BoomerAMGSetChebyOrder(pcg_precond, cheby_order);
@@ -6003,15 +7411,20 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetRelaxWt(pcg_precond, relax_wt);
          HYPRE_BoomerAMGSetOuterWt(pcg_precond, outer_wt);
          if (level_w > -1)
-            HYPRE_BoomerAMGSetLevelRelaxWt(pcg_precond, relax_wt_level,level_w);
+         {
+            HYPRE_BoomerAMGSetLevelRelaxWt(pcg_precond, relax_wt_level, level_w);
+         }
          if (level_ow > -1)
-            HYPRE_BoomerAMGSetLevelOuterWt(pcg_precond,outer_wt_level,level_ow);
+         {
+            HYPRE_BoomerAMGSetLevelOuterWt(pcg_precond, outer_wt_level, level_ow);
+         }
          HYPRE_BoomerAMGSetSmoothType(pcg_precond, smooth_type);
          HYPRE_BoomerAMGSetSmoothNumLevels(pcg_precond, smooth_num_levels);
          HYPRE_BoomerAMGSetSmoothNumSweeps(pcg_precond, smooth_num_sweeps);
          HYPRE_BoomerAMGSetMaxLevels(pcg_precond, max_levels);
          HYPRE_BoomerAMGSetMaxRowSum(pcg_precond, max_row_sum);
          HYPRE_BoomerAMGSetDebugFlag(pcg_precond, debug_flag);
+         HYPRE_BoomerAMGSetFilterFunctions(pcg_precond, filter_functions);
          HYPRE_BoomerAMGSetNumFunctions(pcg_precond, num_functions);
          HYPRE_BoomerAMGSetAggNumLevels(pcg_precond, agg_num_levels);
          HYPRE_BoomerAMGSetAggInterpType(pcg_precond, agg_interp_type);
@@ -6027,13 +7440,37 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetDomainType(pcg_precond, domain_type);
          HYPRE_BoomerAMGSetSchwarzUseNonSymm(pcg_precond, use_nonsymm_schwarz);
          HYPRE_BoomerAMGSetSchwarzRlxWeight(pcg_precond, schwarz_rlx_weight);
-         if (eu_level < 0) eu_level = 0;
+         if (eu_level < 0) { eu_level = 0; }
          HYPRE_BoomerAMGSetEuLevel(pcg_precond, eu_level);
          HYPRE_BoomerAMGSetEuBJ(pcg_precond, eu_bj);
          HYPRE_BoomerAMGSetEuSparseA(pcg_precond, eu_sparse_A);
+         HYPRE_BoomerAMGSetILUType(pcg_precond, ilu_type);
+         HYPRE_BoomerAMGSetILULevel(pcg_precond, ilu_lfil);
+         HYPRE_BoomerAMGSetILUDroptol(pcg_precond, ilu_droptol);
+         HYPRE_BoomerAMGSetILUMaxRowNnz(pcg_precond, ilu_max_row_nnz);
+         HYPRE_BoomerAMGSetILUMaxIter(pcg_precond, ilu_sm_max_iter);
+         HYPRE_BoomerAMGSetILUTriSolve(pcg_precond, ilu_tri_solve);
+         HYPRE_BoomerAMGSetILULowerJacobiIters(pcg_precond, ilu_ljac_iters);
+         HYPRE_BoomerAMGSetILUUpperJacobiIters(pcg_precond, ilu_ujac_iters);
+         HYPRE_BoomerAMGSetILULocalReordering(pcg_precond, ilu_reordering);
+         HYPRE_BoomerAMGSetILUIterSetupType(pcg_precond, ilu_iter_setup_type);
+         HYPRE_BoomerAMGSetILUIterSetupOption(pcg_precond, ilu_iter_setup_option);
+         HYPRE_BoomerAMGSetILUIterSetupMaxIter(pcg_precond, ilu_iter_setup_max_iter);
+         HYPRE_BoomerAMGSetILUIterSetupTolerance(pcg_precond, ilu_iter_setup_tolerance);
+         HYPRE_BoomerAMGSetFSAIAlgoType(pcg_precond, fsai_algo_type);
+         HYPRE_BoomerAMGSetFSAILocalSolveType(pcg_precond, fsai_ls_type);
+         HYPRE_BoomerAMGSetFSAIMaxSteps(pcg_precond, fsai_max_steps);
+         HYPRE_BoomerAMGSetFSAIMaxStepSize(pcg_precond, fsai_max_step_size);
+         HYPRE_BoomerAMGSetFSAIMaxNnzRow(pcg_precond, fsai_max_nnz_row);
+         HYPRE_BoomerAMGSetFSAINumLevels(pcg_precond, fsai_num_levels);
+         HYPRE_BoomerAMGSetFSAIThreshold(pcg_precond, fsai_threshold);
+         HYPRE_BoomerAMGSetFSAIEigMaxIters(pcg_precond, fsai_eig_max_iters);
+         HYPRE_BoomerAMGSetFSAIKapTolerance(pcg_precond, fsai_kap_tolerance);
          HYPRE_BoomerAMGSetCycleNumSweeps(pcg_precond, ns_coarse, 3);
          if (num_functions > 1)
+         {
             HYPRE_BoomerAMGSetDofFunc(pcg_precond, dof_func);
+         }
          HYPRE_BoomerAMGSetAdditive(pcg_precond, additive);
          HYPRE_BoomerAMGSetMultAdditive(pcg_precond, mult_add);
          HYPRE_BoomerAMGSetSimple(pcg_precond, simple);
@@ -6048,9 +7485,11 @@ main( hypre_int argc,
 #endif
          if (nongalerk_tol)
          {
-            HYPRE_BoomerAMGSetNonGalerkinTol(pcg_precond, nongalerk_tol[nongalerk_num_tol-1]);
-            for (i=0; i < nongalerk_num_tol-1; i++)
+            HYPRE_BoomerAMGSetNonGalerkinTol(pcg_precond, nongalerk_tol[nongalerk_num_tol - 1]);
+            for (i = 0; i < nongalerk_num_tol - 1; i++)
+            {
                HYPRE_BoomerAMGSetLevelNonGalerkinTol(pcg_precond, nongalerk_tol[i], i);
+            }
          }
          HYPRE_LGMRESSetMaxIter(pcg_solver, mg_max_iter);
          HYPRE_LGMRESSetPrecond(pcg_solver,
@@ -6061,7 +7500,7 @@ main( hypre_int argc,
       else if (solver_id == 50)
       {
          /* use diagonal scaling as preconditioner */
-         if (myid == 0) hypre_printf("Solver: DS-LGMRES\n");
+         if (myid == 0) { hypre_printf("Solver: DS-LGMRES\n"); }
          pcg_precond = NULL;
 
          HYPRE_LGMRESSetPrecond(pcg_solver,
@@ -6074,13 +7513,14 @@ main( hypre_int argc,
       if (pcg_precond_gotten != pcg_precond)
       {
          hypre_printf("HYPRE_LGMRESGetPrecond got bad precond\n");
-         return(-1);
+         return (-1);
+      }
+      else if (myid == 0)
+      {
+         hypre_printf("HYPRE_LGMRESGetPrecond got good precond\n");
       }
-      else
-         if (myid == 0)
-            hypre_printf("HYPRE_LGMRESGetPrecond got good precond\n");
       HYPRE_LGMRESSetup
-         (pcg_solver, (HYPRE_Matrix)parcsr_A, (HYPRE_Vector)b, (HYPRE_Vector)x);
+      (pcg_solver, (HYPRE_Matrix)parcsr_M, (HYPRE_Vector)b, (HYPRE_Vector)x);
 
       hypre_EndTiming(time_index);
       hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
@@ -6091,7 +7531,7 @@ main( hypre_int argc,
       hypre_BeginTiming(time_index);
 
       HYPRE_LGMRESSolve
-         (pcg_solver, (HYPRE_Matrix)parcsr_A, (HYPRE_Vector)b, (HYPRE_Vector)x);
+      (pcg_solver, (HYPRE_Matrix)parcsr_A, (HYPRE_Vector)b, (HYPRE_Vector)x);
 
       hypre_EndTiming(time_index);
       hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
@@ -6099,7 +7539,7 @@ main( hypre_int argc,
       hypre_ClearTiming();
 
       HYPRE_LGMRESGetNumIterations(pcg_solver, &num_iterations);
-      HYPRE_LGMRESGetFinalRelativeResidualNorm(pcg_solver,&final_res_norm);
+      HYPRE_LGMRESGetFinalRelativeResidualNorm(pcg_solver, &final_res_norm);
 
       HYPRE_ParCSRLGMRESDestroy(pcg_solver);
 
@@ -6115,6 +7555,7 @@ main( hypre_int argc,
          hypre_printf("Final LGMRES Relative Residual Norm = %e\n", final_res_norm);
          hypre_printf("\n");
       }
+      HYPRE_ANNOTATE_REGION_END("%s", "Run-1");
    }
 
    /*-----------------------------------------------------------
@@ -6123,6 +7564,7 @@ main( hypre_int argc,
 
    if (solver_id == 60 || solver_id == 61 || solver_id == 72 || solver_id == 82 || solver_id == 47)
    {
+      HYPRE_ANNOTATE_REGION_BEGIN("%s", "Run-1");
       time_index = hypre_InitializeTiming("FlexGMRES Setup");
       hypre_BeginTiming(time_index);
 
@@ -6137,7 +7579,7 @@ main( hypre_int argc,
       if (solver_id == 61)
       {
          /* use BoomerAMG as preconditioner */
-         if (myid == 0) hypre_printf("Solver: AMG-FlexGMRES\n");
+         if (myid == 0) { hypre_printf("Solver: AMG-FlexGMRES\n"); }
 
          HYPRE_BoomerAMGCreate(&pcg_precond);
          HYPRE_BoomerAMGSetCGCIts(pcg_precond, cgcits);
@@ -6162,7 +7604,7 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetSCommPkgSwitch(pcg_precond, S_commpkg_switch);
          HYPRE_BoomerAMGSetPrintLevel(pcg_precond, poutdat);
          HYPRE_BoomerAMGSetPrintFileName(pcg_precond, "driver.out.log");
-         HYPRE_BoomerAMGSetMaxIter(pcg_precond, 1);
+         HYPRE_BoomerAMGSetMaxIter(pcg_precond, precon_cycles);
          HYPRE_BoomerAMGSetCycleType(pcg_precond, cycle_type);
          HYPRE_BoomerAMGSetFCycle(pcg_precond, fcycle);
          HYPRE_BoomerAMGSetNumSweeps(pcg_precond, num_sweeps);
@@ -6171,13 +7613,19 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetCRRate(pcg_precond, CR_rate);
          HYPRE_BoomerAMGSetCRStrongTh(pcg_precond, CR_strong_th);
          HYPRE_BoomerAMGSetCRUseCG(pcg_precond, CR_use_CG);
-         if (relax_type > -1) HYPRE_BoomerAMGSetRelaxType(pcg_precond, relax_type);
+         if (relax_type > -1) { HYPRE_BoomerAMGSetRelaxType(pcg_precond, relax_type); }
          if (relax_down > -1)
+         {
             HYPRE_BoomerAMGSetCycleRelaxType(pcg_precond, relax_down, 1);
+         }
          if (relax_up > -1)
+         {
             HYPRE_BoomerAMGSetCycleRelaxType(pcg_precond, relax_up, 2);
+         }
          if (relax_coarse > -1)
+         {
             HYPRE_BoomerAMGSetCycleRelaxType(pcg_precond, relax_coarse, 3);
+         }
          HYPRE_BoomerAMGSetAddRelaxType(pcg_precond, add_relax_type);
          HYPRE_BoomerAMGSetAddRelaxWt(pcg_precond, add_relax_wt);
          HYPRE_BoomerAMGSetChebyOrder(pcg_precond, cheby_order);
@@ -6189,15 +7637,20 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetRelaxWt(pcg_precond, relax_wt);
          HYPRE_BoomerAMGSetOuterWt(pcg_precond, outer_wt);
          if (level_w > -1)
-            HYPRE_BoomerAMGSetLevelRelaxWt(pcg_precond, relax_wt_level,level_w);
+         {
+            HYPRE_BoomerAMGSetLevelRelaxWt(pcg_precond, relax_wt_level, level_w);
+         }
          if (level_ow > -1)
-            HYPRE_BoomerAMGSetLevelOuterWt(pcg_precond,outer_wt_level,level_ow);
+         {
+            HYPRE_BoomerAMGSetLevelOuterWt(pcg_precond, outer_wt_level, level_ow);
+         }
          HYPRE_BoomerAMGSetSmoothType(pcg_precond, smooth_type);
          HYPRE_BoomerAMGSetSmoothNumLevels(pcg_precond, smooth_num_levels);
          HYPRE_BoomerAMGSetSmoothNumSweeps(pcg_precond, smooth_num_sweeps);
          HYPRE_BoomerAMGSetMaxLevels(pcg_precond, max_levels);
          HYPRE_BoomerAMGSetMaxRowSum(pcg_precond, max_row_sum);
          HYPRE_BoomerAMGSetDebugFlag(pcg_precond, debug_flag);
+         HYPRE_BoomerAMGSetFilterFunctions(pcg_precond, filter_functions);
          HYPRE_BoomerAMGSetNumFunctions(pcg_precond, num_functions);
          HYPRE_BoomerAMGSetAggNumLevels(pcg_precond, agg_num_levels);
          HYPRE_BoomerAMGSetAggInterpType(pcg_precond, agg_interp_type);
@@ -6213,13 +7666,37 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetDomainType(pcg_precond, domain_type);
          HYPRE_BoomerAMGSetSchwarzUseNonSymm(pcg_precond, use_nonsymm_schwarz);
          HYPRE_BoomerAMGSetSchwarzRlxWeight(pcg_precond, schwarz_rlx_weight);
-         if (eu_level < 0) eu_level = 0;
+         if (eu_level < 0) { eu_level = 0; }
          HYPRE_BoomerAMGSetEuLevel(pcg_precond, eu_level);
          HYPRE_BoomerAMGSetEuBJ(pcg_precond, eu_bj);
          HYPRE_BoomerAMGSetEuSparseA(pcg_precond, eu_sparse_A);
+         HYPRE_BoomerAMGSetILUType(pcg_precond, ilu_type);
+         HYPRE_BoomerAMGSetILULevel(pcg_precond, ilu_lfil);
+         HYPRE_BoomerAMGSetILUDroptol(pcg_precond, ilu_droptol);
+         HYPRE_BoomerAMGSetILUMaxRowNnz(pcg_precond, ilu_max_row_nnz);
+         HYPRE_BoomerAMGSetILUMaxIter(pcg_precond, ilu_sm_max_iter);
+         HYPRE_BoomerAMGSetILUTriSolve(pcg_precond, ilu_tri_solve);
+         HYPRE_BoomerAMGSetILULowerJacobiIters(pcg_precond, ilu_ljac_iters);
+         HYPRE_BoomerAMGSetILUUpperJacobiIters(pcg_precond, ilu_ujac_iters);
+         HYPRE_BoomerAMGSetILULocalReordering(pcg_precond, ilu_reordering);
+         HYPRE_BoomerAMGSetILUIterSetupType(pcg_precond, ilu_iter_setup_type);
+         HYPRE_BoomerAMGSetILUIterSetupOption(pcg_precond, ilu_iter_setup_option);
+         HYPRE_BoomerAMGSetILUIterSetupMaxIter(pcg_precond, ilu_iter_setup_max_iter);
+         HYPRE_BoomerAMGSetILUIterSetupTolerance(pcg_precond, ilu_iter_setup_tolerance);
+         HYPRE_BoomerAMGSetFSAIAlgoType(pcg_precond, fsai_algo_type);
+         HYPRE_BoomerAMGSetFSAILocalSolveType(pcg_precond, fsai_ls_type);
+         HYPRE_BoomerAMGSetFSAIMaxSteps(pcg_precond, fsai_max_steps);
+         HYPRE_BoomerAMGSetFSAIMaxStepSize(pcg_precond, fsai_max_step_size);
+         HYPRE_BoomerAMGSetFSAIMaxNnzRow(pcg_precond, fsai_max_nnz_row);
+         HYPRE_BoomerAMGSetFSAINumLevels(pcg_precond, fsai_num_levels);
+         HYPRE_BoomerAMGSetFSAIThreshold(pcg_precond, fsai_threshold);
+         HYPRE_BoomerAMGSetFSAIEigMaxIters(pcg_precond, fsai_eig_max_iters);
+         HYPRE_BoomerAMGSetFSAIKapTolerance(pcg_precond, fsai_kap_tolerance);
          HYPRE_BoomerAMGSetCycleNumSweeps(pcg_precond, ns_coarse, 3);
          if (num_functions > 1)
+         {
             HYPRE_BoomerAMGSetDofFunc(pcg_precond, dof_func);
+         }
          HYPRE_BoomerAMGSetAdditive(pcg_precond, additive);
          HYPRE_BoomerAMGSetMultAdditive(pcg_precond, mult_add);
          HYPRE_BoomerAMGSetSimple(pcg_precond, simple);
@@ -6234,9 +7711,11 @@ main( hypre_int argc,
 #endif
          if (nongalerk_tol)
          {
-            HYPRE_BoomerAMGSetNonGalerkinTol(pcg_precond, nongalerk_tol[nongalerk_num_tol-1]);
-            for (i=0; i < nongalerk_num_tol-1; i++)
+            HYPRE_BoomerAMGSetNonGalerkinTol(pcg_precond, nongalerk_tol[nongalerk_num_tol - 1]);
+            for (i = 0; i < nongalerk_num_tol - 1; i++)
+            {
                HYPRE_BoomerAMGSetLevelNonGalerkinTol(pcg_precond, nongalerk_tol[i], i);
+            }
          }
          HYPRE_FlexGMRESSetMaxIter(pcg_solver, mg_max_iter);
          HYPRE_FlexGMRESSetPrecond(pcg_solver,
@@ -6244,37 +7723,41 @@ main( hypre_int argc,
                                    (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSetup,
                                    pcg_precond);
       }
-      else if( solver_id == 72 )
+      else if ( solver_id == 72 )
       {
          /* use MGR preconditioning */
-         if (myid == 0) hypre_printf("Solver:  MGR-FlexGMRES\n");
+         if (myid == 0) { hypre_printf("Solver:  MGR-FlexGMRES\n"); }
 
          HYPRE_MGRCreate(&pcg_precond);
 
          mgr_num_cindexes = hypre_CTAlloc(HYPRE_Int,  mgr_nlevels, HYPRE_MEMORY_HOST);
-         for(i=0; i<mgr_nlevels; i++)
-         { /* assume 1 coarse index per level */
+         for (i = 0; i < mgr_nlevels; i++)
+         {
+            /* assume 1 coarse index per level */
             mgr_num_cindexes[i] = 1;
          }
          mgr_cindexes = hypre_CTAlloc(HYPRE_Int*,  mgr_nlevels, HYPRE_MEMORY_HOST);
-         for(i=0; i<mgr_nlevels; i++)
+         for (i = 0; i < mgr_nlevels; i++)
          {
             mgr_cindexes[i] = hypre_CTAlloc(HYPRE_Int,  mgr_num_cindexes[i], HYPRE_MEMORY_HOST);
          }
-         for(i=0; i<mgr_nlevels; i++)
-         { /* assume coarse point is at index 0 */
+         for (i = 0; i < mgr_nlevels; i++)
+         {
+            /* assume coarse point is at index 0 */
             mgr_cindexes[i][0] = 0;
          }
-         mgr_reserved_coarse_indexes = hypre_CTAlloc(HYPRE_BigInt,  mgr_num_reserved_nodes, HYPRE_MEMORY_HOST);
-         for(i=0; i<mgr_num_reserved_nodes; i++)
-         { /* generate artificial reserved nodes */
+         mgr_reserved_coarse_indexes = hypre_CTAlloc(HYPRE_BigInt,  mgr_num_reserved_nodes,
+                                                     HYPRE_MEMORY_HOST);
+         for (i = 0; i < mgr_num_reserved_nodes; i++)
+         {
+            /* generate artificial reserved nodes */
             mgr_reserved_coarse_indexes[i] = last_local_row - (HYPRE_BigInt) i; //2*i+1;
          }
 
          /* set MGR data by block */
-         HYPRE_MGRSetCpointsByBlock( pcg_precond, mgr_bsize, mgr_nlevels, mgr_num_cindexes,mgr_cindexes);
+         HYPRE_MGRSetCpointsByBlock( pcg_precond, mgr_bsize, mgr_nlevels, mgr_num_cindexes, mgr_cindexes);
          /* set reserved coarse nodes */
-         if(mgr_num_reserved_nodes)HYPRE_MGRSetReservedCoarseNodes(pcg_precond, mgr_num_reserved_nodes, mgr_reserved_coarse_indexes);
+         if (mgr_num_reserved_nodes) { HYPRE_MGRSetReservedCoarseNodes(pcg_precond, mgr_num_reserved_nodes, mgr_reserved_coarse_indexes); }
 
          /* set intermediate coarse grid strategy */
          HYPRE_MGRSetNonCpointsToFpoints(pcg_precond, mgr_non_c_to_f);
@@ -6287,41 +7770,54 @@ main( hypre_int argc,
          HYPRE_MGRSetInterpType(pcg_precond, mgr_interp_type);
          HYPRE_MGRSetNumInterpSweeps(pcg_precond, mgr_num_interp_sweeps);
          /* set print level */
-         HYPRE_MGRSetPrintLevel(pcg_precond, 1);
+         HYPRE_MGRSetPrintLevel(pcg_precond, ioutdat);
          /* set max iterations */
          HYPRE_MGRSetMaxIter(pcg_precond, 1);
          HYPRE_MGRSetTol(pcg_precond, pc_tol);
-
-         HYPRE_MGRSetGlobalsmoothType(pcg_precond, mgr_gsmooth_type);
-         HYPRE_MGRSetMaxGlobalsmoothIters( pcg_precond, mgr_num_gsmooth_sweeps );
+         /* set global smoother */
+         HYPRE_MGRSetGlobalSmoothType(pcg_precond, mgr_gsmooth_type);
+         HYPRE_MGRSetMaxGlobalSmoothIters( pcg_precond, mgr_num_gsmooth_sweeps );
 
          /* create AMG coarse grid solver */
 
          HYPRE_BoomerAMGCreate(&amg_solver);
-         /* BM Aug 25, 2006 */
+         if (hypre_GetExecPolicy1(memory_location) == HYPRE_EXEC_DEVICE)
+         {
+            HYPRE_BoomerAMGSetInterpType(amg_solver, 18);
+            HYPRE_BoomerAMGSetCoarsenType(amg_solver, 8);
+            HYPRE_BoomerAMGSetRelaxType(amg_solver, 3);
+         }
+         else
+         {
+            HYPRE_BoomerAMGSetInterpType(amg_solver, 0);
+            HYPRE_BoomerAMGSetPostInterpType(amg_solver, post_interp_type);
+            HYPRE_BoomerAMGSetCoarsenType(amg_solver, 6);
+            HYPRE_BoomerAMGSetCycleType(amg_solver, cycle_type);
+            HYPRE_BoomerAMGSetFCycle(amg_solver, fcycle);
+            HYPRE_BoomerAMGSetRelaxType(amg_solver, 3);
+            if (relax_down > -1)
+            {
+               HYPRE_BoomerAMGSetCycleRelaxType(amg_solver, relax_down, 1);
+            }
+            if (relax_up > -1)
+            {
+               HYPRE_BoomerAMGSetCycleRelaxType(amg_solver, relax_up, 2);
+            }
+            if (relax_coarse > -1)
+            {
+               HYPRE_BoomerAMGSetCycleRelaxType(amg_solver, relax_coarse, 3);
+            }
+            HYPRE_BoomerAMGSetSmoothType(amg_solver, smooth_type);
+            HYPRE_BoomerAMGSetSmoothNumSweeps(amg_solver, smooth_num_sweeps);
+         }
          HYPRE_BoomerAMGSetCGCIts(amg_solver, cgcits);
-         HYPRE_BoomerAMGSetInterpType(amg_solver, 0);
-         HYPRE_BoomerAMGSetPostInterpType(amg_solver, post_interp_type);
-         HYPRE_BoomerAMGSetCoarsenType(amg_solver, 6);
+         HYPRE_BoomerAMGSetTol(amg_solver, 0.0);
          HYPRE_BoomerAMGSetPMaxElmts(amg_solver, 0);
-         /* note: log is written to standard output, not to file */
-         HYPRE_BoomerAMGSetPrintLevel(amg_solver, 1);
-         HYPRE_BoomerAMGSetCycleType(amg_solver, cycle_type);
-         HYPRE_BoomerAMGSetFCycle(amg_solver, fcycle);
          HYPRE_BoomerAMGSetNumSweeps(amg_solver, num_sweeps);
-         HYPRE_BoomerAMGSetRelaxType(amg_solver, 3);
-         if (relax_down > -1)
-            HYPRE_BoomerAMGSetCycleRelaxType(amg_solver, relax_down, 1);
-         if (relax_up > -1)
-            HYPRE_BoomerAMGSetCycleRelaxType(amg_solver, relax_up, 2);
-         if (relax_coarse > -1)
-            HYPRE_BoomerAMGSetCycleRelaxType(amg_solver, relax_coarse, 3);
          HYPRE_BoomerAMGSetRelaxOrder(amg_solver, 1);
          HYPRE_BoomerAMGSetMaxLevels(amg_solver, max_levels);
-         HYPRE_BoomerAMGSetSmoothType(amg_solver, smooth_type);
-         HYPRE_BoomerAMGSetSmoothNumSweeps(amg_solver, smooth_num_sweeps);
-         HYPRE_BoomerAMGSetMaxIter(amg_solver, 1);
-         HYPRE_BoomerAMGSetTol(amg_solver, 0.0);
+         HYPRE_BoomerAMGSetMaxIter(amg_solver, precon_cycles);
+         HYPRE_BoomerAMGSetPrintLevel(amg_solver, 1);
 
          /* set the MGR coarse solver. Comment out to use default CG solver in MGR */
          HYPRE_MGRSetCoarseSolver( pcg_precond, HYPRE_BoomerAMGSolve, HYPRE_BoomerAMGSetup, amg_solver);
@@ -6336,15 +7832,15 @@ main( hypre_int argc,
       else if (solver_id == 47)
       {
          /* use Euclid preconditioning */
-         if (myid == 0) hypre_printf("Solver: Euclid-FlexGMRES\n");
+         if (myid == 0) { hypre_printf("Solver: Euclid-FlexGMRES\n"); }
 
          HYPRE_EuclidCreate(hypre_MPI_COMM_WORLD, &pcg_precond);
 
-         if (eu_level > -1) HYPRE_EuclidSetLevel(pcg_precond, eu_level);
-         if (eu_ilut) HYPRE_EuclidSetILUT(pcg_precond, eu_ilut);
-         if (eu_sparse_A) HYPRE_EuclidSetSparseA(pcg_precond, eu_sparse_A);
-         if (eu_row_scale) HYPRE_EuclidSetRowScale(pcg_precond, eu_row_scale);
-         if (eu_bj) HYPRE_EuclidSetBJ(pcg_precond, eu_bj);
+         if (eu_level > -1) { HYPRE_EuclidSetLevel(pcg_precond, eu_level); }
+         if (eu_ilut) { HYPRE_EuclidSetILUT(pcg_precond, eu_ilut); }
+         if (eu_sparse_A) { HYPRE_EuclidSetSparseA(pcg_precond, eu_sparse_A); }
+         if (eu_row_scale) { HYPRE_EuclidSetRowScale(pcg_precond, eu_row_scale); }
+         if (eu_bj) { HYPRE_EuclidSetBJ(pcg_precond, eu_bj); }
          HYPRE_EuclidSetStats(pcg_precond, eu_stats);
          HYPRE_EuclidSetMem(pcg_precond, eu_mem);
          /*HYPRE_EuclidSetParams(pcg_precond, argc, argv);*/
@@ -6359,21 +7855,29 @@ main( hypre_int argc,
       else if (solver_id == 82)
       {
          /* use hypre_ILU preconditioning */
-         if (myid == 0) hypre_printf("Solver:  ILU-FlexGMRES\n");
+         if (myid == 0) { hypre_printf("Solver:  ILU-FlexGMRES\n"); }
 
          /* create precon */
          HYPRE_ILUCreate(&pcg_precond);
          HYPRE_ILUSetType(pcg_precond, ilu_type);
          HYPRE_ILUSetLevelOfFill(pcg_precond, ilu_lfil);
+         HYPRE_ILUSetLocalReordering(pcg_precond, ilu_reordering);
+         HYPRE_ILUSetTriSolve(pcg_precond, ilu_tri_solve);
+         HYPRE_ILUSetLowerJacobiIters(pcg_precond, ilu_ljac_iters);
+         HYPRE_ILUSetUpperJacobiIters(pcg_precond, ilu_ujac_iters);
+         HYPRE_ILUSetIterativeSetupType(pcg_precond, ilu_iter_setup_type);
+         HYPRE_ILUSetIterativeSetupOption(pcg_precond, ilu_iter_setup_option);
+         HYPRE_ILUSetIterativeSetupMaxIter(pcg_precond, ilu_iter_setup_max_iter);
+         HYPRE_ILUSetIterativeSetupTolerance(pcg_precond, ilu_iter_setup_tolerance);
          /* set print level */
-         HYPRE_ILUSetPrintLevel(pcg_precond, 1);
+         HYPRE_ILUSetPrintLevel(pcg_precond, poutdat);
          /* set max iterations */
          HYPRE_ILUSetMaxIter(pcg_precond, 1);
          HYPRE_ILUSetTol(pcg_precond, pc_tol);
          /* set max number of nonzeros per row */
-         HYPRE_ILUSetMaxNnzPerRow(pcg_precond,ilu_max_row_nnz);
+         HYPRE_ILUSetMaxNnzPerRow(pcg_precond, ilu_max_row_nnz);
          /* set the droptol */
-         HYPRE_ILUSetDropThreshold(pcg_precond,ilu_droptol);
+         HYPRE_ILUSetDropThreshold(pcg_precond, ilu_droptol);
          /* set max iterations for Schur system solve */
          HYPRE_ILUSetSchurMaxIter( pcg_precond, ilu_schur_max_iter );
          HYPRE_ILUSetNSHDropThreshold( pcg_precond, ilu_nsh_droptol);
@@ -6388,7 +7892,7 @@ main( hypre_int argc,
       else if (solver_id == 60)
       {
          /* use diagonal scaling as preconditioner */
-         if (myid == 0) hypre_printf("Solver: DS-FlexGMRES\n");
+         if (myid == 0) { hypre_printf("Solver: DS-FlexGMRES\n"); }
          pcg_precond = NULL;
 
          HYPRE_FlexGMRESSetPrecond(pcg_solver,
@@ -6401,11 +7905,12 @@ main( hypre_int argc,
       if (pcg_precond_gotten != pcg_precond)
       {
          hypre_printf("HYPRE_FlexGMRESGetPrecond got bad precond\n");
-         return(-1);
+         return (-1);
+      }
+      else if (myid == 0)
+      {
+         hypre_printf("HYPRE_FlexGMRESGetPrecond got good precond\n");
       }
-      else
-         if (myid == 0)
-            hypre_printf("HYPRE_FlexGMRESGetPrecond got good precond\n");
 
 
       /* this is optional - could be a user defined one instead (see ex5.c)*/
@@ -6414,7 +7919,7 @@ main( hypre_int argc,
 
 
       HYPRE_FlexGMRESSetup
-         (pcg_solver, (HYPRE_Matrix)parcsr_A, (HYPRE_Vector)b, (HYPRE_Vector)x);
+      (pcg_solver, (HYPRE_Matrix)parcsr_M, (HYPRE_Vector)b, (HYPRE_Vector)x);
 
       hypre_EndTiming(time_index);
       hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
@@ -6425,7 +7930,7 @@ main( hypre_int argc,
       hypre_BeginTiming(time_index);
 
       HYPRE_FlexGMRESSolve
-         (pcg_solver, (HYPRE_Matrix)parcsr_A, (HYPRE_Vector)b, (HYPRE_Vector)x);
+      (pcg_solver, (HYPRE_Matrix)parcsr_A, (HYPRE_Vector)b, (HYPRE_Vector)x);
 
       hypre_EndTiming(time_index);
       hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
@@ -6433,7 +7938,7 @@ main( hypre_int argc,
       hypre_ClearTiming();
 
       HYPRE_FlexGMRESGetNumIterations(pcg_solver, &num_iterations);
-      HYPRE_FlexGMRESGetFinalRelativeResidualNorm(pcg_solver,&final_res_norm);
+      HYPRE_FlexGMRESGetFinalRelativeResidualNorm(pcg_solver, &final_res_norm);
 
       HYPRE_ParCSRFlexGMRESDestroy(pcg_solver);
 
@@ -6441,23 +7946,29 @@ main( hypre_int argc,
       {
          HYPRE_BoomerAMGDestroy(pcg_precond);
       }
-      else if(solver_id == 72)
+      else if (solver_id == 72)
       {
          /* free memory */
-         if(mgr_num_cindexes)
+         if (mgr_num_cindexes)
+         {
             hypre_TFree(mgr_num_cindexes, HYPRE_MEMORY_HOST);
+         }
          mgr_num_cindexes = NULL;
 
-         if(mgr_reserved_coarse_indexes)
+         if (mgr_reserved_coarse_indexes)
+         {
             hypre_TFree(mgr_reserved_coarse_indexes, HYPRE_MEMORY_HOST);
+         }
          mgr_reserved_coarse_indexes = NULL;
 
-         if(mgr_cindexes)
+         if (mgr_cindexes)
          {
-            for( i=0; i<mgr_nlevels; i++)
+            for ( i = 0; i < mgr_nlevels; i++)
             {
-               if(mgr_cindexes[i])
+               if (mgr_cindexes[i])
+               {
                   hypre_TFree(mgr_cindexes[i], HYPRE_MEMORY_HOST);
+               }
             }
             hypre_TFree(mgr_cindexes, HYPRE_MEMORY_HOST);
             mgr_cindexes = NULL;
@@ -6470,7 +7981,7 @@ main( hypre_int argc,
       {
          HYPRE_EuclidDestroy(pcg_precond);
       }
-      else if(solver_id == 82)
+      else if (solver_id == 82)
       {
          HYPRE_ILUDestroy(pcg_precond);
       }
@@ -6481,6 +7992,7 @@ main( hypre_int argc,
          hypre_printf("Final FlexGMRES Relative Residual Norm = %e\n", final_res_norm);
          hypre_printf("\n");
       }
+      HYPRE_ANNOTATE_REGION_END("%s", "Run-1");
    }
 
    /*-----------------------------------------------------------
@@ -6489,6 +8001,7 @@ main( hypre_int argc,
 
    if (solver_id == 9 || solver_id == 10 || solver_id == 11 || solver_id == 45 || solver_id == 73)
    {
+      HYPRE_ANNOTATE_REGION_BEGIN("%s", "Run-1");
       time_index = hypre_InitializeTiming("BiCGSTAB Setup");
       hypre_BeginTiming(time_index);
 
@@ -6502,7 +8015,7 @@ main( hypre_int argc,
       if (solver_id == 9)
       {
          /* use BoomerAMG as preconditioner */
-         if (myid == 0) hypre_printf("Solver: AMG-BiCGSTAB\n");
+         if (myid == 0) { hypre_printf("Solver: AMG-BiCGSTAB\n"); }
          HYPRE_BoomerAMGCreate(&pcg_precond);
          HYPRE_BoomerAMGSetCGCIts(pcg_precond, cgcits);
          HYPRE_BoomerAMGSetInterpType(pcg_precond, interp_type);
@@ -6526,7 +8039,7 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetSCommPkgSwitch(pcg_precond, S_commpkg_switch);
          HYPRE_BoomerAMGSetPrintLevel(pcg_precond, poutdat);
          HYPRE_BoomerAMGSetPrintFileName(pcg_precond, "driver.out.log");
-         HYPRE_BoomerAMGSetMaxIter(pcg_precond, 1);
+         HYPRE_BoomerAMGSetMaxIter(pcg_precond, precon_cycles);
          HYPRE_BoomerAMGSetCycleType(pcg_precond, cycle_type);
          HYPRE_BoomerAMGSetFCycle(pcg_precond, fcycle);
          HYPRE_BoomerAMGSetNumSweeps(pcg_precond, num_sweeps);
@@ -6535,13 +8048,19 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetCRRate(pcg_precond, CR_rate);
          HYPRE_BoomerAMGSetCRStrongTh(pcg_precond, CR_strong_th);
          HYPRE_BoomerAMGSetCRUseCG(pcg_precond, CR_use_CG);
-         if (relax_type > -1) HYPRE_BoomerAMGSetRelaxType(pcg_precond, relax_type);
+         if (relax_type > -1) { HYPRE_BoomerAMGSetRelaxType(pcg_precond, relax_type); }
          if (relax_down > -1)
+         {
             HYPRE_BoomerAMGSetCycleRelaxType(pcg_precond, relax_down, 1);
+         }
          if (relax_up > -1)
+         {
             HYPRE_BoomerAMGSetCycleRelaxType(pcg_precond, relax_up, 2);
+         }
          if (relax_coarse > -1)
+         {
             HYPRE_BoomerAMGSetCycleRelaxType(pcg_precond, relax_coarse, 3);
+         }
          HYPRE_BoomerAMGSetAddRelaxType(pcg_precond, add_relax_type);
          HYPRE_BoomerAMGSetAddRelaxWt(pcg_precond, add_relax_wt);
          HYPRE_BoomerAMGSetChebyOrder(pcg_precond, cheby_order);
@@ -6553,15 +8072,20 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetRelaxWt(pcg_precond, relax_wt);
          HYPRE_BoomerAMGSetOuterWt(pcg_precond, outer_wt);
          if (level_w > -1)
-            HYPRE_BoomerAMGSetLevelRelaxWt(pcg_precond, relax_wt_level,level_w);
+         {
+            HYPRE_BoomerAMGSetLevelRelaxWt(pcg_precond, relax_wt_level, level_w);
+         }
          if (level_ow > -1)
-            HYPRE_BoomerAMGSetLevelOuterWt(pcg_precond,outer_wt_level,level_ow);
+         {
+            HYPRE_BoomerAMGSetLevelOuterWt(pcg_precond, outer_wt_level, level_ow);
+         }
          HYPRE_BoomerAMGSetSmoothType(pcg_precond, smooth_type);
          HYPRE_BoomerAMGSetSmoothNumLevels(pcg_precond, smooth_num_levels);
          HYPRE_BoomerAMGSetSmoothNumSweeps(pcg_precond, smooth_num_sweeps);
          HYPRE_BoomerAMGSetMaxLevels(pcg_precond, max_levels);
          HYPRE_BoomerAMGSetMaxRowSum(pcg_precond, max_row_sum);
          HYPRE_BoomerAMGSetDebugFlag(pcg_precond, debug_flag);
+         HYPRE_BoomerAMGSetFilterFunctions(pcg_precond, filter_functions);
          HYPRE_BoomerAMGSetNumFunctions(pcg_precond, num_functions);
          HYPRE_BoomerAMGSetAggNumLevels(pcg_precond, agg_num_levels);
          HYPRE_BoomerAMGSetAggInterpType(pcg_precond, agg_interp_type);
@@ -6578,13 +8102,37 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetSchwarzUseNonSymm(pcg_precond, use_nonsymm_schwarz);
 
          HYPRE_BoomerAMGSetSchwarzRlxWeight(pcg_precond, schwarz_rlx_weight);
-         if (eu_level < 0) eu_level = 0;
+         if (eu_level < 0) { eu_level = 0; }
          HYPRE_BoomerAMGSetEuLevel(pcg_precond, eu_level);
          HYPRE_BoomerAMGSetEuBJ(pcg_precond, eu_bj);
          HYPRE_BoomerAMGSetEuSparseA(pcg_precond, eu_sparse_A);
+         HYPRE_BoomerAMGSetILUType(pcg_precond, ilu_type);
+         HYPRE_BoomerAMGSetILULevel(pcg_precond, ilu_lfil);
+         HYPRE_BoomerAMGSetILUDroptol(pcg_precond, ilu_droptol);
+         HYPRE_BoomerAMGSetILUMaxRowNnz(pcg_precond, ilu_max_row_nnz);
+         HYPRE_BoomerAMGSetILUMaxIter(pcg_precond, ilu_sm_max_iter);
+         HYPRE_BoomerAMGSetILUTriSolve(pcg_precond, ilu_tri_solve);
+         HYPRE_BoomerAMGSetILULowerJacobiIters(pcg_precond, ilu_ljac_iters);
+         HYPRE_BoomerAMGSetILUUpperJacobiIters(pcg_precond, ilu_ujac_iters);
+         HYPRE_BoomerAMGSetILULocalReordering(pcg_precond, ilu_reordering);
+         HYPRE_BoomerAMGSetILUIterSetupType(pcg_precond, ilu_iter_setup_type);
+         HYPRE_BoomerAMGSetILUIterSetupOption(pcg_precond, ilu_iter_setup_option);
+         HYPRE_BoomerAMGSetILUIterSetupMaxIter(pcg_precond, ilu_iter_setup_max_iter);
+         HYPRE_BoomerAMGSetILUIterSetupTolerance(pcg_precond, ilu_iter_setup_tolerance);
+         HYPRE_BoomerAMGSetFSAIAlgoType(pcg_precond, fsai_algo_type);
+         HYPRE_BoomerAMGSetFSAILocalSolveType(pcg_precond, fsai_ls_type);
+         HYPRE_BoomerAMGSetFSAIMaxSteps(pcg_precond, fsai_max_steps);
+         HYPRE_BoomerAMGSetFSAIMaxStepSize(pcg_precond, fsai_max_step_size);
+         HYPRE_BoomerAMGSetFSAIMaxNnzRow(pcg_precond, fsai_max_nnz_row);
+         HYPRE_BoomerAMGSetFSAINumLevels(pcg_precond, fsai_num_levels);
+         HYPRE_BoomerAMGSetFSAIEigMaxIters(pcg_precond, fsai_eig_max_iters);
+         HYPRE_BoomerAMGSetFSAIThreshold(pcg_precond, fsai_threshold);
+         HYPRE_BoomerAMGSetFSAIKapTolerance(pcg_precond, fsai_kap_tolerance);
          HYPRE_BoomerAMGSetCycleNumSweeps(pcg_precond, ns_coarse, 3);
          if (num_functions > 1)
+         {
             HYPRE_BoomerAMGSetDofFunc(pcg_precond, dof_func);
+         }
          HYPRE_BoomerAMGSetAdditive(pcg_precond, additive);
          HYPRE_BoomerAMGSetMultAdditive(pcg_precond, mult_add);
          HYPRE_BoomerAMGSetSimple(pcg_precond, simple);
@@ -6599,9 +8147,11 @@ main( hypre_int argc,
 #endif
          if (nongalerk_tol)
          {
-            HYPRE_BoomerAMGSetNonGalerkinTol(pcg_precond, nongalerk_tol[nongalerk_num_tol-1]);
-            for (i=0; i < nongalerk_num_tol-1; i++)
+            HYPRE_BoomerAMGSetNonGalerkinTol(pcg_precond, nongalerk_tol[nongalerk_num_tol - 1]);
+            for (i = 0; i < nongalerk_num_tol - 1; i++)
+            {
                HYPRE_BoomerAMGSetLevelNonGalerkinTol(pcg_precond, nongalerk_tol[i], i);
+            }
          }
          HYPRE_BiCGSTABSetMaxIter(pcg_solver, mg_max_iter);
          HYPRE_BiCGSTABSetPrecond(pcg_solver,
@@ -6612,7 +8162,7 @@ main( hypre_int argc,
       else if (solver_id == 10)
       {
          /* use diagonal scaling as preconditioner */
-         if (myid == 0) hypre_printf("Solver: DS-BiCGSTAB\n");
+         if (myid == 0) { hypre_printf("Solver: DS-BiCGSTAB\n"); }
          pcg_precond = NULL;
 
          HYPRE_BiCGSTABSetPrecond(pcg_solver,
@@ -6623,10 +8173,11 @@ main( hypre_int argc,
       else if (solver_id == 11)
       {
          /* use PILUT as preconditioner */
-         if (myid == 0) hypre_printf("Solver: PILUT-BiCGSTAB\n");
+         if (myid == 0) { hypre_printf("Solver: PILUT-BiCGSTAB\n"); }
 
          ierr = HYPRE_ParCSRPilutCreate( hypre_MPI_COMM_WORLD, &pcg_precond );
-         if (ierr) {
+         if (ierr)
+         {
             hypre_printf("Error in ParPilutCreate\n");
          }
 
@@ -6648,7 +8199,7 @@ main( hypre_int argc,
       else if (solver_id == 45)
       {
          /* use Euclid preconditioning */
-         if (myid == 0) hypre_printf("Solver: Euclid-BICGSTAB\n");
+         if (myid == 0) { hypre_printf("Solver: Euclid-BICGSTAB\n"); }
 
          HYPRE_EuclidCreate(hypre_MPI_COMM_WORLD, &pcg_precond);
 
@@ -6657,11 +8208,11 @@ main( hypre_int argc,
             we'll use what I think is simplest: let Euclid internally
             parse the command line.
          */
-         if (eu_level > -1) HYPRE_EuclidSetLevel(pcg_precond, eu_level);
-         if (eu_ilut) HYPRE_EuclidSetILUT(pcg_precond, eu_ilut);
-         if (eu_sparse_A) HYPRE_EuclidSetSparseA(pcg_precond, eu_sparse_A);
-         if (eu_row_scale) HYPRE_EuclidSetRowScale(pcg_precond, eu_row_scale);
-         if (eu_bj) HYPRE_EuclidSetBJ(pcg_precond, eu_bj);
+         if (eu_level > -1) { HYPRE_EuclidSetLevel(pcg_precond, eu_level); }
+         if (eu_ilut) { HYPRE_EuclidSetILUT(pcg_precond, eu_ilut); }
+         if (eu_sparse_A) { HYPRE_EuclidSetSparseA(pcg_precond, eu_sparse_A); }
+         if (eu_row_scale) { HYPRE_EuclidSetRowScale(pcg_precond, eu_row_scale); }
+         if (eu_bj) { HYPRE_EuclidSetBJ(pcg_precond, eu_bj); }
          HYPRE_EuclidSetStats(pcg_precond, eu_stats);
          HYPRE_EuclidSetMem(pcg_precond, eu_mem);
 
@@ -6675,37 +8226,40 @@ main( hypre_int argc,
       else if (solver_id == 73)
       {
          /* use MGR preconditioning */
-         if (myid == 0) hypre_printf("Solver:  MGR-BICGSTAB\n");
+         if (myid == 0) { hypre_printf("Solver:  MGR-BICGSTAB\n"); }
 
          HYPRE_MGRCreate(&pcg_precond);
 
          mgr_num_cindexes = hypre_CTAlloc(HYPRE_Int, mgr_nlevels, HYPRE_MEMORY_HOST);
-         for(i=0; i<mgr_nlevels; i++)
-         { /* assume 1 coarse index per level */
+         for (i = 0; i < mgr_nlevels; i++)
+         {
+            /* assume 1 coarse index per level */
             mgr_num_cindexes[i] = 1;
          }
          mgr_cindexes = hypre_CTAlloc(HYPRE_Int*, mgr_nlevels, HYPRE_MEMORY_HOST);
-         for(i=0; i<mgr_nlevels; i++)
+         for (i = 0; i < mgr_nlevels; i++)
          {
             mgr_cindexes[i] = hypre_CTAlloc(HYPRE_Int, mgr_num_cindexes[i], HYPRE_MEMORY_HOST);
          }
-         for(i=0; i<mgr_nlevels; i++)
-         { /* assume coarse point is at index 0 */
+         for (i = 0; i < mgr_nlevels; i++)
+         {
+            /* assume coarse point is at index 0 */
             mgr_cindexes[i][0] = 2;
          }
 
-         mgr_reserved_coarse_indexes = hypre_CTAlloc(HYPRE_BigInt, mgr_num_reserved_nodes, HYPRE_MEMORY_HOST);
-         for(i=0; i<mgr_num_reserved_nodes; i++)
+         mgr_reserved_coarse_indexes = hypre_CTAlloc(HYPRE_BigInt, mgr_num_reserved_nodes,
+                                                     HYPRE_MEMORY_HOST);
+         for (i = 0; i < mgr_num_reserved_nodes; i++)
          {
             /* Generate 'artificial' reserved nodes. Assumes these are ordered last in the system */
             mgr_reserved_coarse_indexes[i] = last_local_row - (HYPRE_BigInt) i; //2*i+1;
-//            hypre_printf("mgr_reserved_coarse_indexes[i] = %b \n", mgr_reserved_coarse_indexes[i]);
+            //            hypre_printf("mgr_reserved_coarse_indexes[i] = %b \n", mgr_reserved_coarse_indexes[i]);
          }
 
          /* set MGR data by block */
-         HYPRE_MGRSetCpointsByBlock( pcg_precond, mgr_bsize, mgr_nlevels, mgr_num_cindexes,mgr_cindexes);
+         HYPRE_MGRSetCpointsByBlock( pcg_precond, mgr_bsize, mgr_nlevels, mgr_num_cindexes, mgr_cindexes);
          /* set reserved coarse nodes */
-         if(mgr_num_reserved_nodes)HYPRE_MGRSetReservedCoarseNodes(pcg_precond, mgr_num_reserved_nodes, mgr_reserved_coarse_indexes);
+         if (mgr_num_reserved_nodes) { HYPRE_MGRSetReservedCoarseNodes(pcg_precond, mgr_num_reserved_nodes, mgr_reserved_coarse_indexes); }
 
          /* set intermediate coarse grid strategy */
          HYPRE_MGRSetNonCpointsToFpoints(pcg_precond, mgr_non_c_to_f);
@@ -6720,27 +8274,41 @@ main( hypre_int argc,
          HYPRE_MGRSetInterpType(pcg_precond, mgr_interp_type);
          HYPRE_MGRSetNumInterpSweeps(pcg_precond, mgr_num_interp_sweeps);
          /* set print level */
-         HYPRE_MGRSetPrintLevel(pcg_precond, 1);
+         HYPRE_MGRSetPrintLevel(pcg_precond, ioutdat);
          /* set max iterations */
          HYPRE_MGRSetMaxIter(pcg_precond, 1);
          HYPRE_MGRSetTol(pcg_precond, pc_tol);
-
-         HYPRE_MGRSetGlobalsmoothType(pcg_precond, mgr_gsmooth_type);
-         HYPRE_MGRSetMaxGlobalsmoothIters( pcg_precond, mgr_num_gsmooth_sweeps );
+         /* set global smoother */
+         HYPRE_MGRSetGlobalSmoothType(pcg_precond, mgr_gsmooth_type);
+         HYPRE_MGRSetMaxGlobalSmoothIters( pcg_precond, mgr_num_gsmooth_sweeps );
 
          /* create AMG coarse grid solver */
 
          HYPRE_BoomerAMGCreate(&amg_solver);
+
+         if (hypre_GetExecPolicy1(memory_location) == HYPRE_EXEC_DEVICE)
+         {
+            HYPRE_BoomerAMGSetInterpType(amg_solver, 18);
+            HYPRE_BoomerAMGSetCoarsenType(amg_solver, 8);
+            HYPRE_BoomerAMGSetRelaxType(amg_solver, 3);
+         }
+         else
+         {
+            HYPRE_BoomerAMGSetInterpType(amg_solver, 0);
+            HYPRE_BoomerAMGSetCoarsenType(amg_solver, 6);
+            HYPRE_BoomerAMGSetCycleType(amg_solver, 1);
+            HYPRE_BoomerAMGSetCycleRelaxType(amg_solver, 14, 1);
+            HYPRE_BoomerAMGSetCycleRelaxType(amg_solver, 14, 2);
+            HYPRE_BoomerAMGSetCycleRelaxType(amg_solver, 9, 3);
+         }
          HYPRE_BoomerAMGSetTol(amg_solver, pc_tol);
+         HYPRE_BoomerAMGSetPMaxElmts(amg_solver, 0);
+         HYPRE_BoomerAMGSetNumSweeps(amg_solver, 1);
+         HYPRE_BoomerAMGSetRelaxOrder(amg_solver, 1);
+         HYPRE_BoomerAMGSetMaxLevels(amg_solver, max_levels);
+         HYPRE_BoomerAMGSetMaxIter(amg_solver, precon_cycles);
          HYPRE_BoomerAMGSetPrintLevel(amg_solver, 1);
 
-         HYPRE_BoomerAMGSetMaxIter(amg_solver, 1);
-
-         HYPRE_BoomerAMGSetCycleType(amg_solver, 1);
-         HYPRE_BoomerAMGSetNumSweeps(amg_solver, 1);
-         HYPRE_BoomerAMGSetCycleRelaxType(amg_solver, 14, 1);
-         HYPRE_BoomerAMGSetCycleRelaxType(amg_solver, 14, 2);
-         HYPRE_BoomerAMGSetCycleRelaxType(amg_solver, 9, 3);
          /* set the MGR coarse solver. Comment out to use default CG solver in MGR */
          HYPRE_MGRSetCoarseSolver( pcg_precond, HYPRE_BoomerAMGSolve, HYPRE_BoomerAMGSetup, amg_solver);
 
@@ -6752,8 +8320,9 @@ main( hypre_int argc,
                                   (HYPRE_PtrToSolverFcn) HYPRE_MGRSetup,
                                   pcg_precond);
       }
-      HYPRE_BiCGSTABSetup(pcg_solver, (HYPRE_Matrix)parcsr_A,
-                          (HYPRE_Vector)b, (HYPRE_Vector)x);
+
+      HYPRE_BiCGSTABSetup(pcg_solver, (HYPRE_Matrix) parcsr_M,
+                          (HYPRE_Vector) b, (HYPRE_Vector) x);
 
       hypre_EndTiming(time_index);
       hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
@@ -6770,18 +8339,31 @@ main( hypre_int argc,
       hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
       hypre_FinalizeTiming(time_index);
       hypre_ClearTiming();
+      HYPRE_ANNOTATE_REGION_END("%s", "Run-1");
 
-      HYPRE_BiCGSTABGetNumIterations(pcg_solver, &num_iterations);
-      HYPRE_BiCGSTABGetFinalRelativeResidualNorm(pcg_solver,&final_res_norm);
-#if SECOND_TIME
-      /* run a second time to check for memory leaks */
-      HYPRE_ParVectorSetRandomValues(x, 775);
-      HYPRE_BiCGSTABSetup(pcg_solver, (HYPRE_Matrix)parcsr_A,
-                          (HYPRE_Vector)b, (HYPRE_Vector)x);
-      HYPRE_BiCGSTABSolve(pcg_solver, (HYPRE_Matrix)parcsr_A,
-                          (HYPRE_Vector)b, (HYPRE_Vector)x);
+      if (second_time)
+      {
+         /* run a second time [for timings, to check for memory leaks] */
+         HYPRE_ANNOTATE_REGION_BEGIN("%s", "Run-2");
+         HYPRE_ParVectorSetRandomValues(x, 775);
+#if defined(HYPRE_USING_CURAND) || defined(HYPRE_USING_ROCRAND)
+         hypre_ResetDeviceRandGenerator(1234ULL, 0ULL);
 #endif
+         hypre_ParVectorCopy(x0_save, x);
+
+         HYPRE_BiCGSTABSetup(pcg_solver,
+                             (HYPRE_Matrix) parcsr_M,
+                             (HYPRE_Vector) b,
+                             (HYPRE_Vector) x);
+         HYPRE_BiCGSTABSolve(pcg_solver,
+                             (HYPRE_Matrix) parcsr_A,
+                             (HYPRE_Vector) b,
+                             (HYPRE_Vector) x);
+         HYPRE_ANNOTATE_REGION_END("%s", "Run-2");
+      }
 
+      HYPRE_BiCGSTABGetNumIterations(pcg_solver, &num_iterations);
+      HYPRE_BiCGSTABGetFinalRelativeResidualNorm(pcg_solver, &final_res_norm);
       HYPRE_ParCSRBiCGSTABDestroy(pcg_solver);
 
       if (solver_id == 9)
@@ -6797,23 +8379,29 @@ main( hypre_int argc,
       {
          HYPRE_EuclidDestroy(pcg_precond);
       }
-      else if(solver_id == 73)
+      else if (solver_id == 73)
       {
          /* free memory */
-         if(mgr_num_cindexes)
+         if (mgr_num_cindexes)
+         {
             hypre_TFree(mgr_num_cindexes, HYPRE_MEMORY_HOST);
+         }
          mgr_num_cindexes = NULL;
 
-         if(mgr_reserved_coarse_indexes)
+         if (mgr_reserved_coarse_indexes)
+         {
             hypre_TFree(mgr_reserved_coarse_indexes, HYPRE_MEMORY_HOST);
+         }
          mgr_reserved_coarse_indexes = NULL;
 
-         if(mgr_cindexes)
+         if (mgr_cindexes)
          {
-            for( i=0; i<mgr_nlevels; i++)
+            for ( i = 0; i < mgr_nlevels; i++)
             {
-               if(mgr_cindexes[i])
+               if (mgr_cindexes[i])
+               {
                   hypre_TFree(mgr_cindexes[i], HYPRE_MEMORY_HOST);
+               }
             }
             hypre_TFree(mgr_cindexes, HYPRE_MEMORY_HOST);
             mgr_cindexes = NULL;
@@ -6837,6 +8425,7 @@ main( hypre_int argc,
 
    if (solver_id == 16 || solver_id == 17 || solver_id == 46 || solver_id == 74)
    {
+      HYPRE_ANNOTATE_REGION_BEGIN("%s", "Run-1");
       time_index = hypre_InitializeTiming("COGMRES Setup");
       hypre_BeginTiming(time_index);
 
@@ -6853,7 +8442,7 @@ main( hypre_int argc,
       if (solver_id == 16)
       {
          /* use BoomerAMG as preconditioner */
-         if (myid == 0) hypre_printf("Solver: AMG-COGMRES\n");
+         if (myid == 0) { hypre_printf("Solver: AMG-COGMRES\n"); }
          HYPRE_BoomerAMGCreate(&pcg_precond);
          HYPRE_BoomerAMGSetCGCIts(pcg_precond, cgcits);
          HYPRE_BoomerAMGSetInterpType(pcg_precond, interp_type);
@@ -6877,7 +8466,7 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetSCommPkgSwitch(pcg_precond, S_commpkg_switch);
          HYPRE_BoomerAMGSetPrintLevel(pcg_precond, poutdat);
          HYPRE_BoomerAMGSetPrintFileName(pcg_precond, "driver.out.log");
-         HYPRE_BoomerAMGSetMaxIter(pcg_precond, 1);
+         HYPRE_BoomerAMGSetMaxIter(pcg_precond, precon_cycles);
          HYPRE_BoomerAMGSetCycleType(pcg_precond, cycle_type);
          HYPRE_BoomerAMGSetFCycle(pcg_precond, fcycle);
          HYPRE_BoomerAMGSetNumSweeps(pcg_precond, num_sweeps);
@@ -6886,13 +8475,19 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetCRRate(pcg_precond, CR_rate);
          HYPRE_BoomerAMGSetCRStrongTh(pcg_precond, CR_strong_th);
          HYPRE_BoomerAMGSetCRUseCG(pcg_precond, CR_use_CG);
-         if (relax_type > -1) HYPRE_BoomerAMGSetRelaxType(pcg_precond, relax_type);
+         if (relax_type > -1) { HYPRE_BoomerAMGSetRelaxType(pcg_precond, relax_type); }
          if (relax_down > -1)
+         {
             HYPRE_BoomerAMGSetCycleRelaxType(pcg_precond, relax_down, 1);
+         }
          if (relax_up > -1)
+         {
             HYPRE_BoomerAMGSetCycleRelaxType(pcg_precond, relax_up, 2);
+         }
          if (relax_coarse > -1)
+         {
             HYPRE_BoomerAMGSetCycleRelaxType(pcg_precond, relax_coarse, 3);
+         }
          HYPRE_BoomerAMGSetAddRelaxType(pcg_precond, add_relax_type);
          HYPRE_BoomerAMGSetAddRelaxWt(pcg_precond, add_relax_wt);
          HYPRE_BoomerAMGSetChebyOrder(pcg_precond, cheby_order);
@@ -6904,15 +8499,20 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetRelaxWt(pcg_precond, relax_wt);
          HYPRE_BoomerAMGSetOuterWt(pcg_precond, outer_wt);
          if (level_w > -1)
-            HYPRE_BoomerAMGSetLevelRelaxWt(pcg_precond, relax_wt_level,level_w);
+         {
+            HYPRE_BoomerAMGSetLevelRelaxWt(pcg_precond, relax_wt_level, level_w);
+         }
          if (level_ow > -1)
-            HYPRE_BoomerAMGSetLevelOuterWt(pcg_precond,outer_wt_level,level_ow);
+         {
+            HYPRE_BoomerAMGSetLevelOuterWt(pcg_precond, outer_wt_level, level_ow);
+         }
          HYPRE_BoomerAMGSetSmoothType(pcg_precond, smooth_type);
          HYPRE_BoomerAMGSetSmoothNumLevels(pcg_precond, smooth_num_levels);
          HYPRE_BoomerAMGSetSmoothNumSweeps(pcg_precond, smooth_num_sweeps);
          HYPRE_BoomerAMGSetMaxLevels(pcg_precond, max_levels);
          HYPRE_BoomerAMGSetMaxRowSum(pcg_precond, max_row_sum);
          HYPRE_BoomerAMGSetDebugFlag(pcg_precond, debug_flag);
+         HYPRE_BoomerAMGSetFilterFunctions(pcg_precond, filter_functions);
          HYPRE_BoomerAMGSetNumFunctions(pcg_precond, num_functions);
          HYPRE_BoomerAMGSetAggNumLevels(pcg_precond, agg_num_levels);
          HYPRE_BoomerAMGSetAggInterpType(pcg_precond, agg_interp_type);
@@ -6929,13 +8529,37 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetSchwarzUseNonSymm(pcg_precond, use_nonsymm_schwarz);
 
          HYPRE_BoomerAMGSetSchwarzRlxWeight(pcg_precond, schwarz_rlx_weight);
-         if (eu_level < 0) eu_level = 0;
+         if (eu_level < 0) { eu_level = 0; }
          HYPRE_BoomerAMGSetEuLevel(pcg_precond, eu_level);
          HYPRE_BoomerAMGSetEuBJ(pcg_precond, eu_bj);
          HYPRE_BoomerAMGSetEuSparseA(pcg_precond, eu_sparse_A);
+         HYPRE_BoomerAMGSetILUType(pcg_precond, ilu_type);
+         HYPRE_BoomerAMGSetILULevel(pcg_precond, ilu_lfil);
+         HYPRE_BoomerAMGSetILUDroptol(pcg_precond, ilu_droptol);
+         HYPRE_BoomerAMGSetILUMaxRowNnz(pcg_precond, ilu_max_row_nnz);
+         HYPRE_BoomerAMGSetILUMaxIter(pcg_precond, ilu_sm_max_iter);
+         HYPRE_BoomerAMGSetILUTriSolve(pcg_precond, ilu_tri_solve);
+         HYPRE_BoomerAMGSetILULowerJacobiIters(pcg_precond, ilu_ljac_iters);
+         HYPRE_BoomerAMGSetILUUpperJacobiIters(pcg_precond, ilu_ujac_iters);
+         HYPRE_BoomerAMGSetILULocalReordering(pcg_precond, ilu_reordering);
+         HYPRE_BoomerAMGSetILUIterSetupType(pcg_precond, ilu_iter_setup_type);
+         HYPRE_BoomerAMGSetILUIterSetupOption(pcg_precond, ilu_iter_setup_option);
+         HYPRE_BoomerAMGSetILUIterSetupMaxIter(pcg_precond, ilu_iter_setup_max_iter);
+         HYPRE_BoomerAMGSetILUIterSetupTolerance(pcg_precond, ilu_iter_setup_tolerance);
+         HYPRE_BoomerAMGSetFSAIAlgoType(pcg_precond, fsai_algo_type);
+         HYPRE_BoomerAMGSetFSAILocalSolveType(pcg_precond, fsai_ls_type);
+         HYPRE_BoomerAMGSetFSAIMaxSteps(pcg_precond, fsai_max_steps);
+         HYPRE_BoomerAMGSetFSAIMaxStepSize(pcg_precond, fsai_max_step_size);
+         HYPRE_BoomerAMGSetFSAIMaxNnzRow(pcg_precond, fsai_max_nnz_row);
+         HYPRE_BoomerAMGSetFSAINumLevels(pcg_precond, fsai_num_levels);
+         HYPRE_BoomerAMGSetFSAIThreshold(pcg_precond, fsai_threshold);
+         HYPRE_BoomerAMGSetFSAIEigMaxIters(pcg_precond, fsai_eig_max_iters);
+         HYPRE_BoomerAMGSetFSAIKapTolerance(pcg_precond, fsai_kap_tolerance);
          HYPRE_BoomerAMGSetCycleNumSweeps(pcg_precond, ns_coarse, 3);
          if (num_functions > 1)
+         {
             HYPRE_BoomerAMGSetDofFunc(pcg_precond, dof_func);
+         }
          HYPRE_BoomerAMGSetAdditive(pcg_precond, additive);
          HYPRE_BoomerAMGSetMultAdditive(pcg_precond, mult_add);
          HYPRE_BoomerAMGSetSimple(pcg_precond, simple);
@@ -6950,9 +8574,11 @@ main( hypre_int argc,
 #endif
          if (nongalerk_tol)
          {
-            HYPRE_BoomerAMGSetNonGalerkinTol(pcg_precond, nongalerk_tol[nongalerk_num_tol-1]);
-            for (i=0; i < nongalerk_num_tol-1; i++)
+            HYPRE_BoomerAMGSetNonGalerkinTol(pcg_precond, nongalerk_tol[nongalerk_num_tol - 1]);
+            for (i = 0; i < nongalerk_num_tol - 1; i++)
+            {
                HYPRE_BoomerAMGSetLevelNonGalerkinTol(pcg_precond, nongalerk_tol[i], i);
+            }
          }
          HYPRE_COGMRESSetMaxIter(pcg_solver, mg_max_iter);
          HYPRE_COGMRESSetPrecond(pcg_solver,
@@ -6963,7 +8589,7 @@ main( hypre_int argc,
       else if (solver_id == 17)
       {
          /* use diagonal scaling as preconditioner */
-         if (myid == 0) hypre_printf("Solver: DS-COGMRES\n");
+         if (myid == 0) { hypre_printf("Solver: DS-COGMRES\n"); }
          pcg_precond = NULL;
 
          HYPRE_COGMRESSetPrecond(pcg_solver,
@@ -6974,7 +8600,7 @@ main( hypre_int argc,
       else if (solver_id == 46)
       {
          /* use Euclid preconditioning */
-         if (myid == 0) hypre_printf("Solver: Euclid-BICGSTAB\n");
+         if (myid == 0) { hypre_printf("Solver: Euclid-BICGSTAB\n"); }
 
          HYPRE_EuclidCreate(hypre_MPI_COMM_WORLD, &pcg_precond);
 
@@ -6983,11 +8609,11 @@ main( hypre_int argc,
             we'll use what I think is simplest: let Euclid internally
             parse the command line.
          */
-         if (eu_level > -1) HYPRE_EuclidSetLevel(pcg_precond, eu_level);
-         if (eu_ilut) HYPRE_EuclidSetILUT(pcg_precond, eu_ilut);
-         if (eu_sparse_A) HYPRE_EuclidSetSparseA(pcg_precond, eu_sparse_A);
-         if (eu_row_scale) HYPRE_EuclidSetRowScale(pcg_precond, eu_row_scale);
-         if (eu_bj) HYPRE_EuclidSetBJ(pcg_precond, eu_bj);
+         if (eu_level > -1) { HYPRE_EuclidSetLevel(pcg_precond, eu_level); }
+         if (eu_ilut) { HYPRE_EuclidSetILUT(pcg_precond, eu_ilut); }
+         if (eu_sparse_A) { HYPRE_EuclidSetSparseA(pcg_precond, eu_sparse_A); }
+         if (eu_row_scale) { HYPRE_EuclidSetRowScale(pcg_precond, eu_row_scale); }
+         if (eu_bj) { HYPRE_EuclidSetBJ(pcg_precond, eu_bj); }
          HYPRE_EuclidSetStats(pcg_precond, eu_stats);
          HYPRE_EuclidSetMem(pcg_precond, eu_mem);
 
@@ -7001,37 +8627,40 @@ main( hypre_int argc,
       else if (solver_id == 74)
       {
          /* use MGR preconditioning */
-         if (myid == 0) hypre_printf("Solver:  MGR-BICGSTAB\n");
+         if (myid == 0) { hypre_printf("Solver:  MGR-BICGSTAB\n"); }
 
          HYPRE_MGRCreate(&pcg_precond);
 
          mgr_num_cindexes = hypre_CTAlloc(HYPRE_Int, mgr_nlevels, HYPRE_MEMORY_HOST);
-         for(i=0; i<mgr_nlevels; i++)
-         { /* assume 1 coarse index per level */
+         for (i = 0; i < mgr_nlevels; i++)
+         {
+            /* assume 1 coarse index per level */
             mgr_num_cindexes[i] = 1;
          }
          mgr_cindexes = hypre_CTAlloc(HYPRE_Int*, mgr_nlevels, HYPRE_MEMORY_HOST);
-         for(i=0; i<mgr_nlevels; i++)
+         for (i = 0; i < mgr_nlevels; i++)
          {
             mgr_cindexes[i] = hypre_CTAlloc(HYPRE_Int, mgr_num_cindexes[i], HYPRE_MEMORY_HOST);
          }
-         for(i=0; i<mgr_nlevels; i++)
-         { /* assume coarse point is at index 0 */
+         for (i = 0; i < mgr_nlevels; i++)
+         {
+            /* assume coarse point is at index 0 */
             mgr_cindexes[i][0] = 2;
          }
 
-         mgr_reserved_coarse_indexes = hypre_CTAlloc(HYPRE_BigInt, mgr_num_reserved_nodes, HYPRE_MEMORY_HOST);
-         for(i=0; i<mgr_num_reserved_nodes; i++)
+         mgr_reserved_coarse_indexes = hypre_CTAlloc(HYPRE_BigInt, mgr_num_reserved_nodes,
+                                                     HYPRE_MEMORY_HOST);
+         for (i = 0; i < mgr_num_reserved_nodes; i++)
          {
             /* Generate 'artificial' reserved nodes. Assumes these are ordered last in the system */
             mgr_reserved_coarse_indexes[i] = last_local_row - (HYPRE_BigInt) i; //2*i+1;
-//            hypre_printf("mgr_reserved_coarse_indexes[i] = %b \n", mgr_reserved_coarse_indexes[i]);
+            //            hypre_printf("mgr_reserved_coarse_indexes[i] = %b \n", mgr_reserved_coarse_indexes[i]);
          }
 
          /* set MGR data by block */
-         HYPRE_MGRSetCpointsByBlock( pcg_precond, mgr_bsize, mgr_nlevels, mgr_num_cindexes,mgr_cindexes);
+         HYPRE_MGRSetCpointsByBlock( pcg_precond, mgr_bsize, mgr_nlevels, mgr_num_cindexes, mgr_cindexes);
          /* set reserved coarse nodes */
-         if(mgr_num_reserved_nodes)HYPRE_MGRSetReservedCoarseNodes(pcg_precond, mgr_num_reserved_nodes, mgr_reserved_coarse_indexes);
+         if (mgr_num_reserved_nodes) { HYPRE_MGRSetReservedCoarseNodes(pcg_precond, mgr_num_reserved_nodes, mgr_reserved_coarse_indexes); }
 
          /* set intermediate coarse grid strategy */
          HYPRE_MGRSetNonCpointsToFpoints(pcg_precond, mgr_non_c_to_f);
@@ -7046,13 +8675,13 @@ main( hypre_int argc,
          HYPRE_MGRSetInterpType(pcg_precond, mgr_interp_type);
          HYPRE_MGRSetNumInterpSweeps(pcg_precond, mgr_num_interp_sweeps);
          /* set print level */
-         HYPRE_MGRSetPrintLevel(pcg_precond, 1);
+         HYPRE_MGRSetPrintLevel(pcg_precond, ioutdat);
          /* set max iterations */
          HYPRE_MGRSetMaxIter(pcg_precond, 1);
          HYPRE_MGRSetTol(pcg_precond, pc_tol);
-
-         HYPRE_MGRSetGlobalsmoothType(pcg_precond, mgr_gsmooth_type);
-         HYPRE_MGRSetMaxGlobalsmoothIters( pcg_precond, mgr_num_gsmooth_sweeps );
+         /* set global smoother */
+         HYPRE_MGRSetGlobalSmoothType(pcg_precond, mgr_gsmooth_type);
+         HYPRE_MGRSetMaxGlobalSmoothIters( pcg_precond, mgr_num_gsmooth_sweeps );
 
          /* create AMG coarse grid solver */
 
@@ -7060,7 +8689,7 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetTol(amg_solver, pc_tol);
          HYPRE_BoomerAMGSetPrintLevel(amg_solver, 1);
 
-         HYPRE_BoomerAMGSetMaxIter(amg_solver, 1);
+         HYPRE_BoomerAMGSetMaxIter(amg_solver, precon_cycles);
 
          HYPRE_BoomerAMGSetCycleType(amg_solver, 1);
          HYPRE_BoomerAMGSetNumSweeps(amg_solver, 1);
@@ -7078,8 +8707,8 @@ main( hypre_int argc,
                                  (HYPRE_PtrToSolverFcn) HYPRE_MGRSetup,
                                  pcg_precond);
       }
-      HYPRE_COGMRESSetup(pcg_solver, (HYPRE_Matrix)parcsr_A,
-                         (HYPRE_Vector)b, (HYPRE_Vector)x);
+      HYPRE_COGMRESSetup(pcg_solver, (HYPRE_Matrix) parcsr_M,
+                         (HYPRE_Vector) b, (HYPRE_Vector) x);
 
       hypre_EndTiming(time_index);
       hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
@@ -7096,17 +8725,31 @@ main( hypre_int argc,
       hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
       hypre_FinalizeTiming(time_index);
       hypre_ClearTiming();
+      HYPRE_ANNOTATE_REGION_END("%s", "Run-1");
 
-      HYPRE_COGMRESGetNumIterations(pcg_solver, &num_iterations);
-      HYPRE_COGMRESGetFinalRelativeResidualNorm(pcg_solver,&final_res_norm);
-#if SECOND_TIME
-      /* run a second time to check for memory leaks */
-      HYPRE_ParVectorSetRandomValues(x, 775);
-      HYPRE_COGMRESSetup(pcg_solver, (HYPRE_Matrix)parcsr_A,
-                         (HYPRE_Vector)b, (HYPRE_Vector)x);
-      HYPRE_COGMRESSolve(pcg_solver, (HYPRE_Matrix)parcsr_A,
-                         (HYPRE_Vector)b, (HYPRE_Vector)x);
+      if (second_time)
+      {
+         /* run a second time [for timings, to check for memory leaks] */
+         HYPRE_ANNOTATE_REGION_BEGIN("%s", "Run-2");
+         HYPRE_ParVectorSetRandomValues(x, 775);
+#if defined(HYPRE_USING_CURAND) || defined(HYPRE_USING_ROCRAND)
+         hypre_ResetDeviceRandGenerator(1234ULL, 0ULL);
 #endif
+         hypre_ParVectorCopy(x0_save, x);
+
+         HYPRE_COGMRESSetup(pcg_solver,
+                            (HYPRE_Matrix) parcsr_M,
+                            (HYPRE_Vector) b,
+                            (HYPRE_Vector) x);
+         HYPRE_COGMRESSolve(pcg_solver,
+                            (HYPRE_Matrix) parcsr_A,
+                            (HYPRE_Vector) b,
+                            (HYPRE_Vector) x);
+         HYPRE_ANNOTATE_REGION_END("%s", "Run-2");
+      }
+
+      HYPRE_COGMRESGetNumIterations(pcg_solver, &num_iterations);
+      HYPRE_COGMRESGetFinalRelativeResidualNorm(pcg_solver, &final_res_norm);
 
       HYPRE_ParCSRCOGMRESDestroy(pcg_solver);
 
@@ -7118,23 +8761,29 @@ main( hypre_int argc,
       {
          HYPRE_EuclidDestroy(pcg_precond);
       }
-      else if(solver_id == 74)
+      else if (solver_id == 74)
       {
          /* free memory */
-         if(mgr_num_cindexes)
+         if (mgr_num_cindexes)
+         {
             hypre_TFree(mgr_num_cindexes, HYPRE_MEMORY_HOST);
+         }
          mgr_num_cindexes = NULL;
 
-         if(mgr_reserved_coarse_indexes)
+         if (mgr_reserved_coarse_indexes)
+         {
             hypre_TFree(mgr_reserved_coarse_indexes, HYPRE_MEMORY_HOST);
+         }
          mgr_reserved_coarse_indexes = NULL;
 
-         if(mgr_cindexes)
+         if (mgr_cindexes)
          {
-            for( i=0; i<mgr_nlevels; i++)
+            for ( i = 0; i < mgr_nlevels; i++)
             {
-               if(mgr_cindexes[i])
+               if (mgr_cindexes[i])
+               {
                   hypre_TFree(mgr_cindexes[i], HYPRE_MEMORY_HOST);
+               }
             }
             hypre_TFree(mgr_cindexes, HYPRE_MEMORY_HOST);
             mgr_cindexes = NULL;
@@ -7157,6 +8806,7 @@ main( hypre_int argc,
 
    if (solver_id == 5 || solver_id == 6)
    {
+      HYPRE_ANNOTATE_REGION_BEGIN("%s", "Run-1");
       time_index = hypre_InitializeTiming("CGNR Setup");
       hypre_BeginTiming(time_index);
 
@@ -7168,7 +8818,7 @@ main( hypre_int argc,
       if (solver_id == 5)
       {
          /* use BoomerAMG as preconditioner */
-         if (myid == 0) hypre_printf("Solver: AMG-CGNR\n");
+         if (myid == 0) { hypre_printf("Solver: AMG-CGNR\n"); }
          HYPRE_BoomerAMGCreate(&pcg_precond);
          HYPRE_BoomerAMGSetCGCIts(pcg_precond, cgcits);
          HYPRE_BoomerAMGSetInterpType(pcg_precond, interp_type);
@@ -7192,17 +8842,23 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetSCommPkgSwitch(pcg_precond, S_commpkg_switch);
          HYPRE_BoomerAMGSetPrintLevel(pcg_precond, poutdat);
          HYPRE_BoomerAMGSetPrintFileName(pcg_precond, "driver.out.log");
-         HYPRE_BoomerAMGSetMaxIter(pcg_precond, 1);
+         HYPRE_BoomerAMGSetMaxIter(pcg_precond, precon_cycles);
          HYPRE_BoomerAMGSetCycleType(pcg_precond, cycle_type);
          HYPRE_BoomerAMGSetFCycle(pcg_precond, fcycle);
          HYPRE_BoomerAMGSetNumSweeps(pcg_precond, num_sweeps);
-         if (relax_type > -1) HYPRE_BoomerAMGSetRelaxType(pcg_precond, relax_type);
+         if (relax_type > -1) { HYPRE_BoomerAMGSetRelaxType(pcg_precond, relax_type); }
          if (relax_down > -1)
+         {
             HYPRE_BoomerAMGSetCycleRelaxType(pcg_precond, relax_down, 1);
+         }
          if (relax_up > -1)
+         {
             HYPRE_BoomerAMGSetCycleRelaxType(pcg_precond, relax_up, 2);
+         }
          if (relax_coarse > -1)
+         {
             HYPRE_BoomerAMGSetCycleRelaxType(pcg_precond, relax_coarse, 3);
+         }
          HYPRE_BoomerAMGSetAddRelaxType(pcg_precond, add_relax_type);
          HYPRE_BoomerAMGSetAddRelaxWt(pcg_precond, add_relax_wt);
          HYPRE_BoomerAMGSetChebyOrder(pcg_precond, cheby_order);
@@ -7214,15 +8870,20 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetRelaxWt(pcg_precond, relax_wt);
          HYPRE_BoomerAMGSetOuterWt(pcg_precond, outer_wt);
          if (level_w > -1)
-            HYPRE_BoomerAMGSetLevelRelaxWt(pcg_precond, relax_wt_level,level_w);
+         {
+            HYPRE_BoomerAMGSetLevelRelaxWt(pcg_precond, relax_wt_level, level_w);
+         }
          if (level_ow > -1)
-            HYPRE_BoomerAMGSetLevelOuterWt(pcg_precond,outer_wt_level,level_ow);
+         {
+            HYPRE_BoomerAMGSetLevelOuterWt(pcg_precond, outer_wt_level, level_ow);
+         }
          HYPRE_BoomerAMGSetSmoothType(pcg_precond, smooth_type);
          HYPRE_BoomerAMGSetSmoothNumLevels(pcg_precond, smooth_num_levels);
          HYPRE_BoomerAMGSetSmoothNumSweeps(pcg_precond, smooth_num_sweeps);
          HYPRE_BoomerAMGSetMaxLevels(pcg_precond, max_levels);
          HYPRE_BoomerAMGSetMaxRowSum(pcg_precond, max_row_sum);
          HYPRE_BoomerAMGSetDebugFlag(pcg_precond, debug_flag);
+         HYPRE_BoomerAMGSetFilterFunctions(pcg_precond, filter_functions);
          HYPRE_BoomerAMGSetNumFunctions(pcg_precond, num_functions);
          HYPRE_BoomerAMGSetAggNumLevels(pcg_precond, agg_num_levels);
          HYPRE_BoomerAMGSetAggInterpType(pcg_precond, agg_interp_type);
@@ -7237,7 +8898,9 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetOverlap(pcg_precond, overlap);
          HYPRE_BoomerAMGSetDomainType(pcg_precond, domain_type);
          if (num_functions > 1)
+         {
             HYPRE_BoomerAMGSetDofFunc(pcg_precond, dof_func);
+         }
          HYPRE_BoomerAMGSetAdditive(pcg_precond, additive);
          HYPRE_BoomerAMGSetMultAdditive(pcg_precond, mult_add);
          HYPRE_BoomerAMGSetSimple(pcg_precond, simple);
@@ -7252,9 +8915,11 @@ main( hypre_int argc,
 #endif
          if (nongalerk_tol)
          {
-            HYPRE_BoomerAMGSetNonGalerkinTol(pcg_precond, nongalerk_tol[nongalerk_num_tol-1]);
-            for (i=0; i < nongalerk_num_tol-1; i++)
+            HYPRE_BoomerAMGSetNonGalerkinTol(pcg_precond, nongalerk_tol[nongalerk_num_tol - 1]);
+            for (i = 0; i < nongalerk_num_tol - 1; i++)
+            {
                HYPRE_BoomerAMGSetLevelNonGalerkinTol(pcg_precond, nongalerk_tol[i], i);
+            }
          }
          HYPRE_CGNRSetMaxIter(pcg_solver, mg_max_iter);
          HYPRE_CGNRSetPrecond(pcg_solver,
@@ -7266,7 +8931,7 @@ main( hypre_int argc,
       else if (solver_id == 6)
       {
          /* use diagonal scaling as preconditioner */
-         if (myid == 0) hypre_printf("Solver: DS-CGNR\n");
+         if (myid == 0) { hypre_printf("Solver: DS-CGNR\n"); }
          pcg_precond = NULL;
 
          HYPRE_CGNRSetPrecond(pcg_solver,
@@ -7280,13 +8945,14 @@ main( hypre_int argc,
       if (pcg_precond_gotten != pcg_precond)
       {
          hypre_printf("HYPRE_ParCSRCGNRGetPrecond got bad precond\n");
-         return(-1);
+         return (-1);
       }
-      else
-         if (myid == 0)
-            hypre_printf("HYPRE_ParCSRCGNRGetPrecond got good precond\n");
-      HYPRE_CGNRSetup(pcg_solver, (HYPRE_Matrix)parcsr_A, (HYPRE_Vector)b,
-                      (HYPRE_Vector)x);
+      else if (myid == 0)
+      {
+         hypre_printf("HYPRE_ParCSRCGNRGetPrecond got good precond\n");
+      }
+      HYPRE_CGNRSetup(pcg_solver, (HYPRE_Matrix) parcsr_M,
+                      (HYPRE_Vector) b, (HYPRE_Vector) x);
 
       hypre_EndTiming(time_index);
       hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
@@ -7303,19 +8969,31 @@ main( hypre_int argc,
       hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
       hypre_FinalizeTiming(time_index);
       hypre_ClearTiming();
+      HYPRE_ANNOTATE_REGION_END("%s", "Run-1");
 
-      HYPRE_CGNRGetNumIterations(pcg_solver, &num_iterations);
-      HYPRE_CGNRGetFinalRelativeResidualNorm(pcg_solver,&final_res_norm);
-
-#if SECOND_TIME
-      /* run a second time to check for memory leaks */
-      HYPRE_ParVectorSetRandomValues(x, 775);
-      HYPRE_CGNRSetup(pcg_solver, (HYPRE_Matrix)parcsr_A, (HYPRE_Vector)b,
-                      (HYPRE_Vector)x);
-      HYPRE_CGNRSolve(pcg_solver, (HYPRE_Matrix)parcsr_A, (HYPRE_Vector)b,
-                      (HYPRE_Vector)x);
+      if (second_time)
+      {
+         /* run a second time [for timings, to check for memory leaks] */
+         HYPRE_ANNOTATE_REGION_BEGIN("%s", "Run-2");
+         HYPRE_ParVectorSetRandomValues(x, 775);
+#if defined(HYPRE_USING_CURAND) || defined(HYPRE_USING_ROCRAND)
+         hypre_ResetDeviceRandGenerator(1234ULL, 0ULL);
 #endif
+         hypre_ParVectorCopy(x0_save, x);
+
+         HYPRE_CGNRSetup(pcg_solver,
+                         (HYPRE_Matrix) parcsr_M,
+                         (HYPRE_Vector) b,
+                         (HYPRE_Vector) x);
+         HYPRE_CGNRSolve(pcg_solver,
+                         (HYPRE_Matrix) parcsr_A,
+                         (HYPRE_Vector) b,
+                         (HYPRE_Vector) x);
+         HYPRE_ANNOTATE_REGION_END("%s", "Run-2");
+      }
 
+      HYPRE_CGNRGetNumIterations(pcg_solver, &num_iterations);
+      HYPRE_CGNRGetFinalRelativeResidualNorm(pcg_solver, &final_res_norm);
       HYPRE_ParCSRCGNRDestroy(pcg_solver);
 
       if (solver_id == 5)
@@ -7337,7 +9015,7 @@ main( hypre_int argc,
 
    if (solver_id == 70)
    {
-      if (myid == 0) hypre_printf("Solver:  MGR\n");
+      if (myid == 0) { hypre_printf("Solver:  MGR\n"); }
       time_index = hypre_InitializeTiming("MGR Setup");
       hypre_BeginTiming(time_index);
 
@@ -7345,29 +9023,33 @@ main( hypre_int argc,
       HYPRE_MGRCreate(&mgr_solver);
 
       mgr_num_cindexes = hypre_CTAlloc(HYPRE_Int,  mgr_nlevels, HYPRE_MEMORY_HOST);
-      for(i=0; i<mgr_nlevels; i++)
-      { /* assume 1 coarse index per level */
+      for (i = 0; i < mgr_nlevels; i++)
+      {
+         /* assume 1 coarse index per level */
          mgr_num_cindexes[i] = 1;
       }
       mgr_cindexes = hypre_CTAlloc(HYPRE_Int*,  mgr_nlevels, HYPRE_MEMORY_HOST);
-      for(i=0; i<mgr_nlevels; i++)
+      for (i = 0; i < mgr_nlevels; i++)
       {
          mgr_cindexes[i] = hypre_CTAlloc(HYPRE_Int,  mgr_num_cindexes[i], HYPRE_MEMORY_HOST);
       }
-      for(i=0; i<mgr_nlevels; i++)
-      { /* assume coarse point is at index 0 */
+      for (i = 0; i < mgr_nlevels; i++)
+      {
+         /* assume coarse point is at index 0 */
          mgr_cindexes[i][0] = 0;
       }
-      mgr_reserved_coarse_indexes = hypre_CTAlloc(HYPRE_BigInt,  mgr_num_reserved_nodes, HYPRE_MEMORY_HOST);
-      for(i=0; i<mgr_num_reserved_nodes; i++)
-      { /* generate artificial reserved nodes */
+      mgr_reserved_coarse_indexes = hypre_CTAlloc(HYPRE_BigInt,  mgr_num_reserved_nodes,
+                                                  HYPRE_MEMORY_HOST);
+      for (i = 0; i < mgr_num_reserved_nodes; i++)
+      {
+         /* generate artificial reserved nodes */
          mgr_reserved_coarse_indexes[i] = last_local_row - (HYPRE_BigInt) i; //2*i+1;
       }
 
       /* set MGR data by block */
-      HYPRE_MGRSetCpointsByBlock( mgr_solver, mgr_bsize, mgr_nlevels, mgr_num_cindexes,mgr_cindexes);
+      HYPRE_MGRSetCpointsByBlock( mgr_solver, mgr_bsize, mgr_nlevels, mgr_num_cindexes, mgr_cindexes);
       /* set reserved coarse nodes */
-      if(mgr_num_reserved_nodes)HYPRE_MGRSetReservedCoarseNodes(mgr_solver, mgr_num_reserved_nodes, mgr_reserved_coarse_indexes);
+      if (mgr_num_reserved_nodes) { HYPRE_MGRSetReservedCoarseNodes(mgr_solver, mgr_num_reserved_nodes, mgr_reserved_coarse_indexes); }
 
       /* set intermediate coarse grid strategy */
       HYPRE_MGRSetNonCpointsToFpoints(mgr_solver, mgr_non_c_to_f);
@@ -7382,46 +9064,60 @@ main( hypre_int argc,
       HYPRE_MGRSetInterpType(mgr_solver, mgr_interp_type);
       HYPRE_MGRSetNumInterpSweeps(mgr_solver, mgr_num_interp_sweeps);
       /* set print level */
-      HYPRE_MGRSetPrintLevel(mgr_solver, 3);
+      HYPRE_MGRSetPrintLevel(mgr_solver, ioutdat);
       /* set max iterations */
       HYPRE_MGRSetMaxIter(mgr_solver, max_iter);
       HYPRE_MGRSetTol(mgr_solver, tol);
-
-      HYPRE_MGRSetGlobalsmoothType(mgr_solver, mgr_gsmooth_type);
-      HYPRE_MGRSetMaxGlobalsmoothIters( mgr_solver, mgr_num_gsmooth_sweeps );
+      /* set global smoother */
+      HYPRE_MGRSetGlobalSmoothType(mgr_solver, mgr_gsmooth_type);
+      HYPRE_MGRSetMaxGlobalSmoothIters( mgr_solver, mgr_num_gsmooth_sweeps );
 
       /* create AMG coarse grid solver */
 
       HYPRE_BoomerAMGCreate(&amg_solver);
-      /* BM Aug 25, 2006 */
+      if (hypre_GetExecPolicy1(memory_location) == HYPRE_EXEC_DEVICE)
+      {
+         HYPRE_BoomerAMGSetInterpType(amg_solver, 18);
+         HYPRE_BoomerAMGSetCoarsenType(amg_solver, 8);
+         HYPRE_BoomerAMGSetRelaxType(amg_solver, 3);
+      }
+      else
+      {
+         HYPRE_BoomerAMGSetInterpType(amg_solver, 0);
+         HYPRE_BoomerAMGSetPostInterpType(amg_solver, post_interp_type);
+         HYPRE_BoomerAMGSetCoarsenType(amg_solver, 6);
+         HYPRE_BoomerAMGSetCycleType(amg_solver, cycle_type);
+         HYPRE_BoomerAMGSetFCycle(amg_solver, fcycle);
+         HYPRE_BoomerAMGSetRelaxType(amg_solver, 3);
+         if (relax_down > -1)
+         {
+            HYPRE_BoomerAMGSetCycleRelaxType(amg_solver, relax_down, 1);
+         }
+         if (relax_up > -1)
+         {
+            HYPRE_BoomerAMGSetCycleRelaxType(amg_solver, relax_up, 2);
+         }
+         if (relax_coarse > -1)
+         {
+            HYPRE_BoomerAMGSetCycleRelaxType(amg_solver, relax_coarse, 3);
+         }
+         HYPRE_BoomerAMGSetSmoothType(amg_solver, smooth_type);
+         HYPRE_BoomerAMGSetSmoothNumSweeps(amg_solver, smooth_num_sweeps);
+      }
       HYPRE_BoomerAMGSetCGCIts(amg_solver, cgcits);
-      HYPRE_BoomerAMGSetInterpType(amg_solver, 0);
-      HYPRE_BoomerAMGSetPostInterpType(amg_solver, post_interp_type);
-      HYPRE_BoomerAMGSetCoarsenType(amg_solver, 6);
       HYPRE_BoomerAMGSetTol(amg_solver, tol);
       HYPRE_BoomerAMGSetPMaxElmts(amg_solver, 0);
-      HYPRE_BoomerAMGSetCycleType(amg_solver, cycle_type);
-      HYPRE_BoomerAMGSetFCycle(amg_solver, fcycle);
       HYPRE_BoomerAMGSetNumSweeps(amg_solver, num_sweeps);
-      HYPRE_BoomerAMGSetRelaxType(amg_solver, 3);
-      if (relax_down > -1)
-         HYPRE_BoomerAMGSetCycleRelaxType(amg_solver, relax_down, 1);
-      if (relax_up > -1)
-         HYPRE_BoomerAMGSetCycleRelaxType(amg_solver, relax_up, 2);
-      if (relax_coarse > -1)
-         HYPRE_BoomerAMGSetCycleRelaxType(amg_solver, relax_coarse, 3);
       HYPRE_BoomerAMGSetRelaxOrder(amg_solver, 1);
       HYPRE_BoomerAMGSetMaxLevels(amg_solver, max_levels);
-      HYPRE_BoomerAMGSetSmoothType(amg_solver, smooth_type);
-      HYPRE_BoomerAMGSetSmoothNumSweeps(amg_solver, smooth_num_sweeps);
-      if(mgr_nlevels < 1 || mgr_bsize < 2)
+      if (mgr_nlevels < 1 || mgr_bsize < 2)
       {
          HYPRE_BoomerAMGSetMaxIter(amg_solver, max_iter);
          HYPRE_BoomerAMGSetPrintLevel(amg_solver, 3);
       }
       else
       {
-         HYPRE_BoomerAMGSetMaxIter(amg_solver, 1);
+         HYPRE_BoomerAMGSetMaxIter(amg_solver, precon_cycles);
          HYPRE_BoomerAMGSetTol(amg_solver, 0.0);
          HYPRE_BoomerAMGSetPrintLevel(amg_solver, 1);
       }
@@ -7429,7 +9125,7 @@ main( hypre_int argc,
       HYPRE_MGRSetCoarseSolver( mgr_solver, HYPRE_BoomerAMGSolve, HYPRE_BoomerAMGSetup, amg_solver);
 
       /* setup MGR solver */
-      HYPRE_MGRSetup(mgr_solver, parcsr_A, b, x);
+      HYPRE_MGRSetup(mgr_solver, parcsr_M, b, x);
 
       hypre_EndTiming(time_index);
       hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
@@ -7447,6 +9143,19 @@ main( hypre_int argc,
       hypre_FinalizeTiming(time_index);
       hypre_ClearTiming();
 
+      if (second_time)
+      {
+         /* run a second time [for timings, to check for memory leaks] */
+         HYPRE_ParVectorSetRandomValues(x, 775);
+#if defined(HYPRE_USING_CURAND) || defined(HYPRE_USING_ROCRAND)
+         hypre_ResetDeviceRandGenerator(1234ULL, 0ULL);
+#endif
+         hypre_ParVectorCopy(x0_save, x);
+
+         HYPRE_MGRSetup(mgr_solver, parcsr_M, b, x);
+         HYPRE_MGRSolve(mgr_solver, parcsr_A, b, x);
+      }
+
       HYPRE_MGRGetNumIterations(mgr_solver, &num_iterations);
       HYPRE_MGRGetFinalRelativeResidualNorm(mgr_solver, &final_res_norm);
 
@@ -7458,28 +9167,27 @@ main( hypre_int argc,
          hypre_printf("\n");
       }
 
-#if SECOND_TIME
-      /* run a second time to check for memory leaks */
-      HYPRE_ParVectorSetRandomValues(x, 775);
-      HYPRE_MGRSetup(mgr_solver, parcsr_A, b, x);
-      HYPRE_MGRSolve(mgr_solver, parcsr_A, b, x);
-#endif
-
       /* free memory */
-      if(mgr_num_cindexes)
+      if (mgr_num_cindexes)
+      {
          hypre_TFree(mgr_num_cindexes, HYPRE_MEMORY_HOST);
+      }
       mgr_num_cindexes = NULL;
 
-      if(mgr_reserved_coarse_indexes)
+      if (mgr_reserved_coarse_indexes)
+      {
          hypre_TFree(mgr_reserved_coarse_indexes, HYPRE_MEMORY_HOST);
+      }
       mgr_reserved_coarse_indexes = NULL;
 
-      if(mgr_cindexes)
+      if (mgr_cindexes)
       {
-         for( i=0; i<mgr_nlevels; i++)
+         for ( i = 0; i < mgr_nlevels; i++)
          {
-            if(mgr_cindexes[i])
+            if (mgr_cindexes[i])
+            {
                hypre_TFree(mgr_cindexes[i], HYPRE_MEMORY_HOST);
+            }
          }
          hypre_TFree(mgr_cindexes, HYPRE_MEMORY_HOST);
          mgr_cindexes = NULL;
@@ -7495,7 +9203,7 @@ main( hypre_int argc,
 
    if (solver_id == 80)
    {
-      if (myid == 0) hypre_printf("Solver:  hypre_ILU\n");
+      if (myid == 0) { hypre_printf("Solver:  hypre_ILU\n"); }
       time_index = hypre_InitializeTiming("hypre_ILU Setup");
       hypre_BeginTiming(time_index);
 
@@ -7506,27 +9214,32 @@ main( hypre_int argc,
       HYPRE_ILUSetType(ilu_solver, ilu_type);
       /* set level of fill */
       HYPRE_ILUSetLevelOfFill(ilu_solver, ilu_lfil);
+      /* set local reordering type */
+      HYPRE_ILUSetLocalReordering(ilu_solver, ilu_reordering);
       /* set print level */
       HYPRE_ILUSetPrintLevel(ilu_solver, 2);
       /* set max iterations */
       HYPRE_ILUSetMaxIter(ilu_solver, max_iter);
       /* set max number of nonzeros per row */
-      HYPRE_ILUSetMaxNnzPerRow(ilu_solver,ilu_max_row_nnz);
+      HYPRE_ILUSetMaxNnzPerRow(ilu_solver, ilu_max_row_nnz);
       /* set the droptol */
-      HYPRE_ILUSetDropThreshold(ilu_solver,ilu_droptol);
+      HYPRE_ILUSetDropThreshold(ilu_solver, ilu_droptol);
       HYPRE_ILUSetTol(ilu_solver, tol);
       /* set max iterations for Schur system solve */
-      HYPRE_ILUSetSchurMaxIter( ilu_solver, ilu_schur_max_iter );
-
+      HYPRE_ILUSetSchurMaxIter(ilu_solver, ilu_schur_max_iter);
+      HYPRE_ILUSetIterativeSetupType(ilu_solver, ilu_iter_setup_type);
+      HYPRE_ILUSetIterativeSetupOption(ilu_solver, ilu_iter_setup_option);
+      HYPRE_ILUSetIterativeSetupMaxIter(ilu_solver, ilu_iter_setup_max_iter);
+      HYPRE_ILUSetIterativeSetupTolerance(ilu_solver, ilu_iter_setup_tolerance);
       /* setting for NSH */
-      if(ilu_type == 20 || ilu_type == 21)
+      if (ilu_type == 20 || ilu_type == 21)
       {
          HYPRE_ILUSetNSHDropThreshold( ilu_solver, ilu_nsh_droptol);
       }
 
 
       /* setup hypre_ILU solver */
-      HYPRE_ILUSetup(ilu_solver, parcsr_A, b, x);
+      HYPRE_ILUSetup(ilu_solver, parcsr_M, b, x);
 
       hypre_EndTiming(time_index);
       hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
@@ -7544,6 +9257,19 @@ main( hypre_int argc,
       hypre_FinalizeTiming(time_index);
       hypre_ClearTiming();
 
+      if (second_time)
+      {
+         /* run a second time [for timings, to check for memory leaks] */
+         HYPRE_ParVectorSetRandomValues(x, 775);
+#if defined(HYPRE_USING_CURAND) || defined(HYPRE_USING_ROCRAND)
+         hypre_ResetDeviceRandGenerator(1234ULL, 0ULL);
+#endif
+         hypre_ParVectorCopy(x0_save, x);
+
+         HYPRE_ILUSetup(ilu_solver, parcsr_M, b, x);
+         HYPRE_ILUSolve(ilu_solver, parcsr_A, b, x);
+      }
+
       HYPRE_ILUGetNumIterations(ilu_solver, &num_iterations);
       HYPRE_ILUGetFinalRelativeResidualNorm(ilu_solver, &final_res_norm);
 
@@ -7555,13 +9281,6 @@ main( hypre_int argc,
          hypre_printf("\n");
       }
 
-#if SECOND_TIME
-      /* run a second time to check for memory leaks */
-      HYPRE_ParVectorSetRandomValues(x, 775);
-      HYPRE_ILUSetup(ilu_solver, parcsr_A, b, x);
-      HYPRE_ILUSolve(ilu_solver, parcsr_A, b, x);
-#endif
-
       /* free memory */
       HYPRE_ILUDestroy(ilu_solver);
    }
@@ -7575,23 +9294,43 @@ main( hypre_int argc,
       HYPRE_IJVectorPrint(ij_x, "IJ.out.x");
    }
 
+   if (print_system_binary)
+   {
+      if (ij_x)
+      {
+         HYPRE_IJVectorPrintBinary(ij_x, "IJ.out.x");
+      }
+      else if (x)
+      {
+         HYPRE_ParVectorPrintBinaryIJ(x, "IJ.out.x");
+      }
+   }
+
    /*-----------------------------------------------------------
     * Finalize things
     *-----------------------------------------------------------*/
 
-  final:
+final:
 
    HYPRE_ParVectorDestroy(x0_save);
 
-   if (test_ij || build_matrix_type == -1)
+   if (test_ij || build_matrix_type == -1 || build_matrix_type == -2)
    {
-      HYPRE_IJMatrixDestroy(ij_A);
+      if (ij_A)
+      {
+         HYPRE_IJMatrixDestroy(ij_A);
+      }
    }
    else
    {
       HYPRE_ParCSRMatrixDestroy(parcsr_A);
    }
 
+   if (build_matrix_M == 1)
+   {
+      HYPRE_IJMatrixDestroy(ij_M);
+   }
+
    /* for build_rhs_type = 1, 6 or 7, we did not create ij_b  - just b*/
    if (build_rhs_type == 1 || build_rhs_type == 6 || build_rhs_type == 7)
    {
@@ -7599,16 +9338,19 @@ main( hypre_int argc,
    }
    else
    {
-      HYPRE_IJVectorDestroy(ij_b);
+      if (ij_b) { HYPRE_IJVectorDestroy(ij_b); }
    }
 
-   HYPRE_IJVectorDestroy(ij_x);
+   if (ij_x) { HYPRE_IJVectorDestroy(ij_x); }
 
    if (build_rbm)
    {
-      for (i = 0; i < num_interp_vecs; i++)
+      if (ij_rbm)
       {
-         HYPRE_IJVectorDestroy(ij_rbm[i]);
+         for (i = 0; i < num_interp_vecs; i++)
+         {
+            if (ij_rbm[i]) { HYPRE_IJVectorDestroy(ij_rbm[i]); }
+         }
       }
       hypre_TFree(ij_rbm, HYPRE_MEMORY_HOST);
       hypre_TFree(interp_vecs, HYPRE_MEMORY_HOST);
@@ -7635,7 +9377,30 @@ main( hypre_int argc,
       hypre_FinalizeMemoryDebug();
    */
 
-   //hypre_PrintMemoryTracker();
+   if (test_error == 1)
+   {
+      /* Test GetErrorMessages() */
+      char      *buffer, *msg;
+      HYPRE_Int  bufsz;
+      HYPRE_GetErrorMessages(&buffer, &bufsz);
+      hypre_MPI_Barrier(comm);
+      for (msg = buffer; msg < (buffer + bufsz); msg += strlen(msg) + 1)
+      {
+         hypre_fprintf(stderr, "%d: %s", myid, msg);
+      }
+      hypre_TFree(buffer, HYPRE_MEMORY_HOST);
+   }
+   else
+   {
+      if (myid == 0)
+      {
+         HYPRE_PrintErrorMessages(comm);
+      }
+   }
+
+   /* Free the memory buffer allocated for storing error messages when using mode 1 for printing errors
+      Note: This call is redundant since the cleanup is already handled in HYPRE_Finalize. */
+   HYPRE_ClearErrorMessages();
 
    /* Finalize Hypre */
    HYPRE_Finalize();
@@ -7643,9 +9408,20 @@ main( hypre_int argc,
    /* Finalize MPI */
    hypre_MPI_Finalize();
 
+#if defined(HYPRE_USING_MEMORY_TRACKER)
+   if (memory_location == HYPRE_MEMORY_HOST)
+   {
+      if (hypre_total_bytes[hypre_MEMORY_DEVICE] || hypre_total_bytes[hypre_MEMORY_UNIFIED])
+      {
+         hypre_printf("Error: nonzero GPU memory allocated with the HOST mode\n");
+         hypre_assert(0);
+      }
+   }
+#endif
+
    /* when using cuda-memcheck --leak-check full, uncomment this */
 #if defined(HYPRE_USING_GPU)
-   hypre_ResetCudaDevice(hypre_handle());
+   hypre_ResetDevice();
 #endif
 
    return (0);
@@ -7705,7 +9481,7 @@ BuildParFromFile( HYPRE_Int                  argc,
     * Generate the matrix
     *-----------------------------------------------------------*/
 
-   HYPRE_ParCSRMatrixRead(hypre_MPI_COMM_WORLD, filename,&A);
+   HYPRE_ParCSRMatrixRead(hypre_MPI_COMM_WORLD, filename, &A);
 
    *A_ptr = A;
 
@@ -7748,7 +9524,7 @@ ReadParVectorFromFile( HYPRE_Int            argc,
    }
    else
    {
-      hypre_printf("Error: No filename specified \n");
+      hypre_printf("  Error: No filename specified \n");
       exit(1);
    }
 
@@ -7758,7 +9534,7 @@ ReadParVectorFromFile( HYPRE_Int            argc,
 
    if (myid == 0)
    {
-      hypre_printf(" From ParFile: %s\n", filename);
+      hypre_printf("  From ParFile: %s\n", filename);
    }
 
    /*-----------------------------------------------------------
@@ -7851,9 +9627,9 @@ BuildParLaplacian( HYPRE_Int                  argc,
       else if ( strcmp(argv[arg_index], "-c") == 0 )
       {
          arg_index++;
-         cx = atof(argv[arg_index++]);
-         cy = atof(argv[arg_index++]);
-         cz = atof(argv[arg_index++]);
+         cx = (HYPRE_Real)atof(argv[arg_index++]);
+         cy = (HYPRE_Real)atof(argv[arg_index++]);
+         cz = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-sysL") == 0 )
       {
@@ -7879,7 +9655,7 @@ BuildParLaplacian( HYPRE_Int                  argc,
       else if ( strcmp(argv[arg_index], "-ep") == 0 )
       {
          arg_index++;
-         ep = atof(argv[arg_index++]);
+         ep = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else
       {
@@ -7891,7 +9667,7 @@ BuildParLaplacian( HYPRE_Int                  argc,
     * Check a few things
     *-----------------------------------------------------------*/
 
-   if ((P*Q*R) != num_procs)
+   if ((P * Q * R) != num_procs)
    {
       hypre_printf("Error: Invalid number of processors or processor topology \n");
       exit(1);
@@ -7915,8 +9691,8 @@ BuildParLaplacian( HYPRE_Int                  argc,
 
    /* compute p,q,r from P,Q,R and myid */
    p = myid % P;
-   q = (( myid - p)/P) % Q;
-   r = ( myid - p - P*q)/( P*Q );
+   q = (( myid - p) / P) % Q;
+   r = ( myid - p - P * q) / ( P * Q );
 
    /*-----------------------------------------------------------
     * Generate the matrix
@@ -7931,15 +9707,15 @@ BuildParLaplacian( HYPRE_Int                  argc,
    values[0] = 0.;
    if (nx > 1)
    {
-      values[0] += 2.0*cx;
+      values[0] += 2.0 * cx;
    }
    if (ny > 1)
    {
-      values[0] += 2.0*cy;
+      values[0] += 2.0 * cy;
    }
    if (nz > 1)
    {
-      values[0] += 2.0*cz;
+      values[0] += 2.0 * cz;
    }
 
    if (num_fun == 1)
@@ -7947,46 +9723,46 @@ BuildParLaplacian( HYPRE_Int                  argc,
                                                  nx, ny, nz, P, Q, R, p, q, r, values);
    else
    {
-      mtrx = hypre_CTAlloc(HYPRE_Real,  num_fun*num_fun, HYPRE_MEMORY_HOST);
+      mtrx = hypre_CTAlloc(HYPRE_Real,  num_fun * num_fun, HYPRE_MEMORY_HOST);
 
       if (num_fun == 2)
       {
-         if (sys_opt ==1) /* identity  */
+         if (sys_opt == 1) /* identity  */
          {
             mtrx[0] = 1.0;
             mtrx[1] = 0.0;
             mtrx[2] = 0.0;
             mtrx[3] = 1.0;
          }
-         else if (sys_opt ==2)
+         else if (sys_opt == 2)
          {
             mtrx[0] = 1.0;
             mtrx[1] = 0.0;
             mtrx[2] = 0.0;
             mtrx[3] = 20.0;
          }
-         else if (sys_opt ==3) /* similar to barry's talk - ex1 */
+         else if (sys_opt == 3) /* similar to barry's talk - ex1 */
          {
             mtrx[0] = 1.0;
             mtrx[1] = 2.0;
             mtrx[2] = 2.0;
             mtrx[3] = 1.0;
          }
-         else if (sys_opt ==4) /* can use with vcoef to get barry's ex*/
+         else if (sys_opt == 4) /* can use with vcoef to get barry's ex*/
          {
             mtrx[0] = 1.0;
             mtrx[1] = 1.0;
             mtrx[2] = 1.0;
             mtrx[3] = 1.0;
          }
-         else if (sys_opt ==5) /* barry's talk - ex1 */
+         else if (sys_opt == 5) /* barry's talk - ex1 */
          {
             mtrx[0] = 1.0;
             mtrx[1] = 1.1;
             mtrx[2] = 1.1;
             mtrx[3] = 1.0;
          }
-         else if (sys_opt ==6) /*  */
+         else if (sys_opt == 6) /*  */
          {
             mtrx[0] = 1.1;
             mtrx[1] = 1.0;
@@ -8004,7 +9780,7 @@ BuildParLaplacian( HYPRE_Int                  argc,
       }
       else if (num_fun == 3)
       {
-         if (sys_opt ==1)
+         if (sys_opt == 1)
          {
             mtrx[0] = 1.0;
             mtrx[1] = 0.0;
@@ -8016,7 +9792,7 @@ BuildParLaplacian( HYPRE_Int                  argc,
             mtrx[7] = 0.0;
             mtrx[8] = 1.0;
          }
-         else if (sys_opt ==2)
+         else if (sys_opt == 2)
          {
             mtrx[0] = 1.0;
             mtrx[1] = 0.0;
@@ -8026,9 +9802,9 @@ BuildParLaplacian( HYPRE_Int                  argc,
             mtrx[5] = 0.0;
             mtrx[6] = 0.0;
             mtrx[7] = 0.0;
-            mtrx[8] =.01;
+            mtrx[8] = .01;
          }
-         else if (sys_opt ==3)
+         else if (sys_opt == 3)
          {
             mtrx[0] = 1.01;
             mtrx[1] = 1;
@@ -8040,7 +9816,7 @@ BuildParLaplacian( HYPRE_Int                  argc,
             mtrx[7] = 1;
             mtrx[8] = 1.01;
          }
-         else if (sys_opt ==4) /* barry ex4 */
+         else if (sys_opt == 4) /* barry ex4 */
          {
             mtrx[0] = 3;
             mtrx[1] = 1;
@@ -8096,7 +9872,7 @@ BuildParLaplacian( HYPRE_Int                  argc,
       {
          HYPRE_Real *mtrx_values;
 
-         mtrx_values = hypre_CTAlloc(HYPRE_Real,  num_fun*num_fun*4, HYPRE_MEMORY_HOST);
+         mtrx_values = hypre_CTAlloc(HYPRE_Real,  num_fun * num_fun * 4, HYPRE_MEMORY_HOST);
 
          if (num_fun == 2)
          {
@@ -8134,13 +9910,13 @@ BuildParLaplacian( HYPRE_Int                  argc,
             {
 
                /* mtrx[0] */
-               SetSysVcoefValues(num_fun, nx, ny, nz, ep*1.0, 1.0, 1.0, 0, mtrx_values);
+               SetSysVcoefValues(num_fun, nx, ny, nz, ep * 1.0, 1.0, 1.0, 0, mtrx_values);
 
                /* mtrx[1] */
                SetSysVcoefValues(num_fun, nx, ny, nz, 1.0, 1.0, 1.0, 1, mtrx_values);
 
                /* mtrx[2] */
-               SetSysVcoefValues(num_fun, nx, ny, nz, ep*1.0, 1.0, 1.0, 2, mtrx_values);
+               SetSysVcoefValues(num_fun, nx, ny, nz, ep * 1.0, 1.0, 1.0, 2, mtrx_values);
 
                /* mtrx[3] */
                SetSysVcoefValues(num_fun, nx, ny, nz, 1.0, 1.0, 1.0, 3, mtrx_values);
@@ -8150,16 +9926,16 @@ BuildParLaplacian( HYPRE_Int                  argc,
                HYPRE_Real ep2 = ep;
 
                /* mtrx[0] */
-               SetSysVcoefValues(num_fun, nx, ny, nz, ep*1.0, 1.0, 1.0, 0, mtrx_values);
+               SetSysVcoefValues(num_fun, nx, ny, nz, ep * 1.0, 1.0, 1.0, 0, mtrx_values);
 
                /* mtrx[1] */
-               SetSysVcoefValues(num_fun, nx, ny, nz, 1.0, ep*1.0, 1.0, 1, mtrx_values);
+               SetSysVcoefValues(num_fun, nx, ny, nz, 1.0, ep * 1.0, 1.0, 1, mtrx_values);
 
                /* mtrx[2] */
-               SetSysVcoefValues(num_fun, nx, ny, nz, ep*1.0, 1.0, 1.0, 2, mtrx_values);
+               SetSysVcoefValues(num_fun, nx, ny, nz, ep * 1.0, 1.0, 1.0, 2, mtrx_values);
 
                /* mtrx[3] */
-               SetSysVcoefValues(num_fun, nx, ny, nz, 1.0, ep2*1.0, 1.0, 3, mtrx_values);
+               SetSysVcoefValues(num_fun, nx, ny, nz, 1.0, ep2 * 1.0, 1.0, 3, mtrx_values);
             }
             else if (vcoef_opt == 5) /* use with default sys_opt  - */
             {
@@ -8168,16 +9944,16 @@ BuildParLaplacian( HYPRE_Int                  argc,
                beta = 10;
 
                /* mtrx[0] */
-               SetSysVcoefValues(num_fun, nx, ny, nz, alp*1.0, 1.0, 1.0, 0, mtrx_values);
+               SetSysVcoefValues(num_fun, nx, ny, nz, alp * 1.0, 1.0, 1.0, 0, mtrx_values);
 
                /* mtrx[1] */
-               SetSysVcoefValues(num_fun, nx, ny, nz, 1.0, beta*1.0, 1.0, 1, mtrx_values);
+               SetSysVcoefValues(num_fun, nx, ny, nz, 1.0, beta * 1.0, 1.0, 1, mtrx_values);
 
                /* mtrx[2] */
-               SetSysVcoefValues(num_fun, nx, ny, nz, alp*1.0, 1.0, 1.0, 2, mtrx_values);
+               SetSysVcoefValues(num_fun, nx, ny, nz, alp * 1.0, 1.0, 1.0, 2, mtrx_values);
 
                /* mtrx[3] */
-               SetSysVcoefValues(num_fun, nx, ny, nz, 1.0, beta*1.0, 1.0, 3, mtrx_values);
+               SetSysVcoefValues(num_fun, nx, ny, nz, 1.0, beta * 1.0, 1.0, 3, mtrx_values);
             }
             else  /* = 0 */
             {
@@ -8271,7 +10047,7 @@ BuildParDifConv( HYPRE_Int                  argc,
    HYPRE_Int           P, Q, R;
    HYPRE_Real          cx, cy, cz;
    HYPRE_Real          ax, ay, az, atype;
-   HYPRE_Real          hinx,hiny,hinz;
+   HYPRE_Real          hinx, hiny, hinz;
    HYPRE_Int           sign_prod;
 
    HYPRE_ParCSRMatrix  A;
@@ -8332,16 +10108,16 @@ BuildParDifConv( HYPRE_Int                  argc,
       else if ( strcmp(argv[arg_index], "-c") == 0 )
       {
          arg_index++;
-         cx = atof(argv[arg_index++]);
-         cy = atof(argv[arg_index++]);
-         cz = atof(argv[arg_index++]);
+         cx = (HYPRE_Real)atof(argv[arg_index++]);
+         cy = (HYPRE_Real)atof(argv[arg_index++]);
+         cz = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-a") == 0 )
       {
          arg_index++;
-         ax = atof(argv[arg_index++]);
-         ay = atof(argv[arg_index++]);
-         az = atof(argv[arg_index++]);
+         ax = (HYPRE_Real)atof(argv[arg_index++]);
+         ay = (HYPRE_Real)atof(argv[arg_index++]);
+         az = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-atype") == 0 )
       {
@@ -8358,7 +10134,7 @@ BuildParDifConv( HYPRE_Int                  argc,
     * Check a few things
     *-----------------------------------------------------------*/
 
-   if ((P*Q*R) != num_procs)
+   if ((P * Q * R) != num_procs)
    {
       hypre_printf("Error: Invalid number of processors or processor topology \n");
       exit(1);
@@ -8384,12 +10160,12 @@ BuildParDifConv( HYPRE_Int                  argc,
 
    /* compute p,q,r from P,Q,R and myid */
    p = myid % P;
-   q = (( myid - p)/P) % Q;
-   r = ( myid - p - P*q)/( P*Q );
+   q = (( myid - p) / P) % Q;
+   r = ( myid - p - P * q) / ( P * Q );
 
-   hinx = 1./(HYPRE_Real)(nx+1);
-   hiny = 1./(HYPRE_Real)(ny+1);
-   hinz = 1./(HYPRE_Real)(nz+1);
+   hinx = 1. / (HYPRE_Real)(nx + 1);
+   hiny = 1. / (HYPRE_Real)(ny + 1);
+   hinz = 1. / (HYPRE_Real)(nz + 1);
 
    /*-----------------------------------------------------------
     * Generate the matrix
@@ -8409,46 +10185,46 @@ BuildParDifConv( HYPRE_Int                  argc,
 
    if (0 == atype) /* forward scheme for conv */
    {
-      values[1] = -cx/(hinx*hinx);
-      values[2] = -cy/(hiny*hiny);
-      values[3] = -cz/(hinz*hinz);
-      values[4] = -cx/(hinx*hinx) + ax/hinx;
-      values[5] = -cy/(hiny*hiny) + ay/hiny;
-      values[6] = -cz/(hinz*hinz) + az/hinz;
+      values[1] = -cx / (hinx * hinx);
+      values[2] = -cy / (hiny * hiny);
+      values[3] = -cz / (hinz * hinz);
+      values[4] = -cx / (hinx * hinx) + ax / hinx;
+      values[5] = -cy / (hiny * hiny) + ay / hiny;
+      values[6] = -cz / (hinz * hinz) + az / hinz;
 
       if (nx > 1)
       {
-         values[0] += 2.0*cx/(hinx*hinx) - 1.*ax/hinx;
+         values[0] += 2.0 * cx / (hinx * hinx) - 1.*ax / hinx;
       }
       if (ny > 1)
       {
-         values[0] += 2.0*cy/(hiny*hiny) - 1.*ay/hiny;
+         values[0] += 2.0 * cy / (hiny * hiny) - 1.*ay / hiny;
       }
       if (nz > 1)
       {
-         values[0] += 2.0*cz/(hinz*hinz) - 1.*az/hinz;
+         values[0] += 2.0 * cz / (hinz * hinz) - 1.*az / hinz;
       }
    }
    else if (1 == atype) /* backward scheme for conv */
    {
-      values[1] = -cx/(hinx*hinx) - ax/hinx;
-      values[2] = -cy/(hiny*hiny) - ay/hiny;
-      values[3] = -cz/(hinz*hinz) - az/hinz;
-      values[4] = -cx/(hinx*hinx);
-      values[5] = -cy/(hiny*hiny);
-      values[6] = -cz/(hinz*hinz);
+      values[1] = -cx / (hinx * hinx) - ax / hinx;
+      values[2] = -cy / (hiny * hiny) - ay / hiny;
+      values[3] = -cz / (hinz * hinz) - az / hinz;
+      values[4] = -cx / (hinx * hinx);
+      values[5] = -cy / (hiny * hiny);
+      values[6] = -cz / (hinz * hinz);
 
       if (nx > 1)
       {
-         values[0] += 2.0*cx/(hinx*hinx) + 1.*ax/hinx;
+         values[0] += 2.0 * cx / (hinx * hinx) + 1.*ax / hinx;
       }
       if (ny > 1)
       {
-         values[0] += 2.0*cy/(hiny*hiny) + 1.*ay/hiny;
+         values[0] += 2.0 * cy / (hiny * hiny) + 1.*ay / hiny;
       }
       if (nz > 1)
       {
-         values[0] += 2.0*cz/(hinz*hinz) + 1.*az/hinz;
+         values[0] += 2.0 * cz / (hinz * hinz) + 1.*az / hinz;
       }
    }
    else if (3 == atype) /* upwind scheme */
@@ -8456,83 +10232,83 @@ BuildParDifConv( HYPRE_Int                  argc,
       sign_prod = sign_double(cx) * sign_double(ax);
       if (sign_prod == 1) /* same sign use back scheme */
       {
-         values[1] = -cx/(hinx*hinx) - ax/hinx;
-         values[4] = -cx/(hinx*hinx);
+         values[1] = -cx / (hinx * hinx) - ax / hinx;
+         values[4] = -cx / (hinx * hinx);
          if (nx > 1)
          {
-            values[0] += 2.0*cx/(hinx*hinx) + 1.*ax/hinx;
+            values[0] += 2.0 * cx / (hinx * hinx) + 1.*ax / hinx;
          }
       }
       else /* diff sign use forward scheme */
       {
-         values[1] = -cx/(hinx*hinx);
-         values[4] = -cx/(hinx*hinx) + ax/hinx;
+         values[1] = -cx / (hinx * hinx);
+         values[4] = -cx / (hinx * hinx) + ax / hinx;
          if (nx > 1)
          {
-            values[0] += 2.0*cx/(hinx*hinx) - 1.*ax/hinx;
+            values[0] += 2.0 * cx / (hinx * hinx) - 1.*ax / hinx;
          }
       }
 
       sign_prod = sign_double(cy) * sign_double(ay);
       if (sign_prod == 1) /* same sign use back scheme */
       {
-         values[2] = -cy/(hiny*hiny) - ay/hiny;
-         values[5] = -cy/(hiny*hiny);
+         values[2] = -cy / (hiny * hiny) - ay / hiny;
+         values[5] = -cy / (hiny * hiny);
          if (ny > 1)
          {
-            values[0] += 2.0*cy/(hiny*hiny) + 1.*ay/hiny;
+            values[0] += 2.0 * cy / (hiny * hiny) + 1.*ay / hiny;
          }
       }
       else /* diff sign use forward scheme */
       {
-         values[2] = -cy/(hiny*hiny);
-         values[5] = -cy/(hiny*hiny) + ay/hiny;
+         values[2] = -cy / (hiny * hiny);
+         values[5] = -cy / (hiny * hiny) + ay / hiny;
          if (ny > 1)
          {
-            values[0] += 2.0*cy/(hiny*hiny) - 1.*ay/hiny;
+            values[0] += 2.0 * cy / (hiny * hiny) - 1.*ay / hiny;
          }
       }
 
       sign_prod = sign_double(cz) * sign_double(az);
       if (sign_prod == 1) /* same sign use back scheme */
       {
-         values[3] = -cz/(hinz*hinz) - az/hinz;
-         values[6] = -cz/(hinz*hinz);
+         values[3] = -cz / (hinz * hinz) - az / hinz;
+         values[6] = -cz / (hinz * hinz);
          if (nz > 1)
          {
-            values[0] += 2.0*cz/(hinz*hinz) + 1.*az/hinz;
+            values[0] += 2.0 * cz / (hinz * hinz) + 1.*az / hinz;
          }
       }
       else /* diff sign use forward scheme */
       {
-         values[3] = -cz/(hinz*hinz);
-         values[6] = -cz/(hinz*hinz) + az/hinz;
+         values[3] = -cz / (hinz * hinz);
+         values[6] = -cz / (hinz * hinz) + az / hinz;
          if (nz > 1)
          {
-            values[0] += 2.0*cz/(hinz*hinz) - 1.*az/hinz;
+            values[0] += 2.0 * cz / (hinz * hinz) - 1.*az / hinz;
          }
       }
    }
    else /* centered difference scheme */
    {
-      values[1] = -cx/(hinx*hinx) - ax/(2.*hinx);
-      values[2] = -cy/(hiny*hiny) - ay/(2.*hiny);
-      values[3] = -cz/(hinz*hinz) - az/(2.*hinz);
-      values[4] = -cx/(hinx*hinx) + ax/(2.*hinx);
-      values[5] = -cy/(hiny*hiny) + ay/(2.*hiny);
-      values[6] = -cz/(hinz*hinz) + az/(2.*hinz);
+      values[1] = -cx / (hinx * hinx) - ax / (2.*hinx);
+      values[2] = -cy / (hiny * hiny) - ay / (2.*hiny);
+      values[3] = -cz / (hinz * hinz) - az / (2.*hinz);
+      values[4] = -cx / (hinx * hinx) + ax / (2.*hinx);
+      values[5] = -cy / (hiny * hiny) + ay / (2.*hiny);
+      values[6] = -cz / (hinz * hinz) + az / (2.*hinz);
 
       if (nx > 1)
       {
-         values[0] += 2.0*cx/(hinx*hinx);
+         values[0] += 2.0 * cx / (hinx * hinx);
       }
       if (ny > 1)
       {
-         values[0] += 2.0*cy/(hiny*hiny);
+         values[0] += 2.0 * cy / (hiny * hiny);
       }
       if (nz > 1)
       {
-         values[0] += 2.0*cz/(hinz*hinz);
+         values[0] += 2.0 * cz / (hinz * hinz);
       }
    }
 
@@ -8608,21 +10384,21 @@ BuildParFromOneFile( HYPRE_Int                  argc,
    if (myid == 0 && num_functions > 1)
    {
       HYPRE_CSRMatrixGetNumRows(A_CSR, &num_dofs);
-      num_nodes = num_dofs/num_functions;
-      if (num_dofs == num_functions*num_nodes)
+      num_nodes = num_dofs / num_functions;
+      if (num_dofs == num_functions * num_nodes)
       {
-         row_part = hypre_CTAlloc(HYPRE_BigInt,  numprocs+1, HYPRE_MEMORY_HOST);
+         row_part = hypre_CTAlloc(HYPRE_BigInt,  numprocs + 1, HYPRE_MEMORY_HOST);
 
          row_part[0] = 0;
-         size = num_nodes/numprocs;
-         rest = num_nodes-size*numprocs;
+         size = num_nodes / numprocs;
+         rest = num_nodes - size * numprocs;
          for (i = 0; i < rest; i++)
          {
-            row_part[i+1] = row_part[i] + (size + 1)*num_functions;
+            row_part[i + 1] = row_part[i] + (size + 1) * num_functions;
          }
          for (i = rest; i < numprocs; i++)
          {
-            row_part[i+1] = row_part[i]+size*num_functions;
+            row_part[i + 1] = row_part[i] + size * num_functions;
          }
 
          col_part = row_part;
@@ -8644,19 +10420,24 @@ BuildParFromOneFile( HYPRE_Int                  argc,
  *----------------------------------------------------------------------*/
 
 HYPRE_Int
-BuildFuncsFromFiles(    HYPRE_Int                  argc,
-                        char                *argv[],
-                        HYPRE_Int                  arg_index,
-                        HYPRE_ParCSRMatrix   parcsr_A,
-                        HYPRE_Int                **dof_func_ptr     )
+BuildFuncsFromFiles( HYPRE_Int            argc,
+                     char                *argv[],
+                     HYPRE_Int            arg_index,
+                     HYPRE_ParCSRMatrix   parcsr_A,
+                     HYPRE_Int          **dof_func_ptr )
 {
-/*----------------------------------------------------------------------
- * Build Function array from files on different processors
- *----------------------------------------------------------------------*/
+   HYPRE_UNUSED_VAR(argc);
+   HYPRE_UNUSED_VAR(argv);
+   HYPRE_UNUSED_VAR(arg_index);
+   HYPRE_UNUSED_VAR(parcsr_A);
+   HYPRE_UNUSED_VAR(dof_func_ptr);
 
-   hypre_printf (" Feature is not implemented yet!\n");
-   return(0);
+   /*----------------------------------------------------------------------
+    * Build Function array from files on different processors
+    *----------------------------------------------------------------------*/
 
+   hypre_printf("Feature is not implemented yet!\n");
+   return (0);
 }
 
 /*----------------------------------------------------------------------
@@ -8664,19 +10445,19 @@ BuildFuncsFromFiles(    HYPRE_Int                  argc,
  *----------------------------------------------------------------------*/
 
 HYPRE_Int
-BuildFuncsFromOneFile(  HYPRE_Int                  argc,
-                        char                *argv[],
-                        HYPRE_Int                  arg_index,
-                        HYPRE_ParCSRMatrix   parcsr_A,
-                        HYPRE_Int                **dof_func_ptr     )
+BuildFuncsFromOneFile( HYPRE_Int            argc,
+                       char                *argv[],
+                       HYPRE_Int            arg_index,
+                       HYPRE_ParCSRMatrix   parcsr_A,
+                       HYPRE_Int          **dof_func_ptr )
 {
-   char           *filename;
+   char                 *filename;
 
    HYPRE_Int             myid, num_procs;
    HYPRE_Int             first_row_index;
    HYPRE_Int             last_row_index;
    HYPRE_BigInt         *partitioning;
-   HYPRE_Int            *dof_func;
+   HYPRE_Int            *dof_func = NULL;
    HYPRE_Int            *dof_func_local;
    HYPRE_Int             i, j;
    HYPRE_Int             local_size;
@@ -8736,35 +10517,35 @@ BuildFuncsFromOneFile(  HYPRE_Int                  argc,
    first_row_index = hypre_ParCSRMatrixFirstRowIndex(parcsr_A);
    last_row_index  = hypre_ParCSRMatrixLastRowIndex(parcsr_A);
    local_size      = last_row_index - first_row_index + 1;
-   dof_func_local = hypre_CTAlloc(HYPRE_Int, local_size, HYPRE_MEMORY_HOST);
+   dof_func_local  = hypre_CTAlloc(HYPRE_Int, local_size, HYPRE_MEMORY_HOST);
    if (myid == 0)
    {
-      requests = hypre_CTAlloc(hypre_MPI_Request, num_procs-1, HYPRE_MEMORY_HOST);
-      status = hypre_CTAlloc(hypre_MPI_Status, num_procs-1, HYPRE_MEMORY_HOST);
-      for (i=1; i < num_procs; i++)
+      requests = hypre_CTAlloc(hypre_MPI_Request, num_procs - 1, HYPRE_MEMORY_HOST);
+      status = hypre_CTAlloc(hypre_MPI_Status, num_procs - 1, HYPRE_MEMORY_HOST);
+      for (i = 1; i < num_procs; i++)
       {
          hypre_MPI_Isend(&dof_func[partitioning[i]],
-                         (partitioning[i+1] - partitioning[i]),
-                         HYPRE_MPI_INT, i, 0, comm, &requests[i-1]);
+                         (partitioning[i + 1] - partitioning[i]),
+                         HYPRE_MPI_INT, i, 0, comm, &requests[i - 1]);
       }
-      for (i=0; i < local_size; i++)
+      for (i = 0; i < local_size; i++)
       {
          dof_func_local[i] = dof_func[i];
       }
-      hypre_MPI_Waitall(num_procs-1,requests, status);
+      hypre_MPI_Waitall(num_procs - 1, requests, status);
       hypre_TFree(requests, HYPRE_MEMORY_HOST);
       hypre_TFree(status, HYPRE_MEMORY_HOST);
    }
    else
    {
-      hypre_MPI_Recv(dof_func_local,local_size,HYPRE_MPI_INT,0,0,comm,&status0);
+      hypre_MPI_Recv(dof_func_local, local_size, HYPRE_MPI_INT, 0, 0, comm, &status0);
    }
 
    *dof_func_ptr = dof_func_local;
 
-   if (myid == 0) hypre_TFree(dof_func, HYPRE_MEMORY_HOST);
+   if (myid == 0) { hypre_TFree(dof_func, HYPRE_MEMORY_HOST); }
 
-   if (partitioning) hypre_TFree(partitioning, HYPRE_MEMORY_HOST);
+   if (partitioning) { hypre_TFree(partitioning, HYPRE_MEMORY_HOST); }
 
    return (0);
 }
@@ -8785,7 +10566,7 @@ BuildRhsParFromOneFile( HYPRE_Int                  argc,
    HYPRE_Int       myid;
    HYPRE_BigInt   *partitioning;
    HYPRE_ParVector b;
-   HYPRE_Vector    b_CSR=NULL;
+   HYPRE_Vector    b_CSR = NULL;
 
    /*-----------------------------------------------------------
     * Initialize some stuff
@@ -8822,7 +10603,7 @@ BuildRhsParFromOneFile( HYPRE_Int                  argc,
 
       b_CSR = HYPRE_VectorRead(filename);
    }
-   HYPRE_VectorToParVector(hypre_MPI_COMM_WORLD, b_CSR, partitioning,&b);
+   HYPRE_VectorToParVector(hypre_MPI_COMM_WORLD, b_CSR, partitioning, &b);
 
    *b_ptr = b;
 
@@ -8846,17 +10627,17 @@ BuildBigArrayFromOneFile( HYPRE_Int            argc,
                           HYPRE_BigInt       **array_ptr )
 {
    MPI_Comm        comm = hypre_MPI_COMM_WORLD;
-   char           *filename;
+   char           *filename = NULL;
    FILE           *fp;
    HYPRE_Int       myid;
    HYPRE_Int       num_procs;
    HYPRE_Int       global_size;
-   HYPRE_BigInt   *global_array;
-   HYPRE_BigInt   *array;
-   HYPRE_BigInt   *send_buffer;
-   HYPRE_Int      *send_counts = NULL;
-   HYPRE_Int      *displs;
-   HYPRE_Int      *array_procs;
+   HYPRE_BigInt   *global_array = NULL;
+   HYPRE_BigInt   *array        = NULL;
+   HYPRE_BigInt   *send_buffer  = NULL;
+   HYPRE_Int      *send_counts  = NULL;
+   HYPRE_Int      *displs       = NULL;
+   HYPRE_Int      *array_procs  = NULL;
    HYPRE_Int       j, jj, proc;
 
    /*-----------------------------------------------------------
@@ -8935,7 +10716,7 @@ BuildBigArrayFromOneFile( HYPRE_Int            argc,
 
       for (proc = 0; proc < (num_procs - 1); proc++)
       {
-         displs[proc+1] = displs[proc] + send_counts[proc];
+         displs[proc + 1] = displs[proc] + send_counts[proc];
       }
    }
    hypre_MPI_Scatter(send_counts, 1, HYPRE_MPI_INT, size, 1, HYPRE_MPI_INT, 0, comm);
@@ -9042,7 +10823,7 @@ BuildParLaplacian9pt( HYPRE_Int            argc,
     * Check a few things
     *-----------------------------------------------------------*/
 
-   if ((P*Q) != num_procs)
+   if ((P * Q) != num_procs)
    {
       hypre_printf("Error: Invalid number of processors or processor topology \n");
       exit(1);
@@ -9065,7 +10846,7 @@ BuildParLaplacian9pt( HYPRE_Int            argc,
 
    /* compute p,q from P,Q and myid */
    p = myid % P;
-   q = ( myid - p)/P;
+   q = ( myid - p) / P;
 
    /*-----------------------------------------------------------
     * Generate the matrix
@@ -9098,6 +10879,7 @@ BuildParLaplacian9pt( HYPRE_Int            argc,
 
    return (0);
 }
+
 /*----------------------------------------------------------------------
  * Build 27-point laplacian in 3D,
  * Parameters given in command line.
@@ -9167,7 +10949,7 @@ BuildParLaplacian27pt( HYPRE_Int            argc,
     * Check a few things
     *-----------------------------------------------------------*/
 
-   if ((P*Q*R) != num_procs)
+   if ((P * Q * R) != num_procs)
    {
       hypre_printf("Error: Invalid number of processors or processor topology \n");
       exit(1);
@@ -9190,8 +10972,8 @@ BuildParLaplacian27pt( HYPRE_Int            argc,
 
    /* compute p,q,r from P,Q,R and myid */
    p = myid % P;
-   q = (( myid - p)/P) % Q;
-   r = ( myid - p - P*q)/( P*Q );
+   q = (( myid - p) / P) % Q;
+   r = ( myid - p - P * q) / ( P * Q );
 
    /*-----------------------------------------------------------
     * Generate the matrix
@@ -9201,9 +10983,13 @@ BuildParLaplacian27pt( HYPRE_Int            argc,
 
    values[0] = 26.0;
    if (nx == 1 || ny == 1 || nz == 1)
+   {
       values[0] = 8.0;
-   if (nx*ny == 1 || nx*nz == 1 || ny*nz == 1)
+   }
+   if (nx * ny == 1 || nx * nz == 1 || ny * nz == 1)
+   {
       values[0] = 2.0;
+   }
    values[1] = -1.;
 
    A = (HYPRE_ParCSRMatrix) GenerateLaplacian27pt(hypre_MPI_COMM_WORLD,
@@ -9216,6 +11002,129 @@ BuildParLaplacian27pt( HYPRE_Int            argc,
    return (0);
 }
 
+/*----------------------------------------------------------------------
+ * Build 125-point laplacian in 3D (27-pt squared)
+ * Parameters given in command line.
+ *----------------------------------------------------------------------*/
+
+HYPRE_Int
+BuildParLaplacian125pt( HYPRE_Int            argc,
+                        char                *argv[],
+                        HYPRE_Int            arg_index,
+                        HYPRE_ParCSRMatrix  *A_ptr     )
+{
+   HYPRE_BigInt              nx, ny, nz;
+   HYPRE_Int                 P, Q, R;
+
+   HYPRE_ParCSRMatrix        A, B;
+
+   HYPRE_Int                 num_procs, myid;
+   HYPRE_Int                 p, q, r;
+   HYPRE_Real               *values;
+
+   /*-----------------------------------------------------------
+    * Initialize some stuff
+    *-----------------------------------------------------------*/
+
+   hypre_MPI_Comm_size(hypre_MPI_COMM_WORLD, &num_procs );
+   hypre_MPI_Comm_rank(hypre_MPI_COMM_WORLD, &myid );
+
+   /*-----------------------------------------------------------
+    * Set defaults
+    *-----------------------------------------------------------*/
+
+   nx = 10;
+   ny = 10;
+   nz = 10;
+
+   P  = 1;
+   Q  = num_procs;
+   R  = 1;
+
+   /*-----------------------------------------------------------
+    * Parse command line
+    *-----------------------------------------------------------*/
+   arg_index = 0;
+   while (arg_index < argc)
+   {
+      if ( strcmp(argv[arg_index], "-n") == 0 )
+      {
+         arg_index++;
+         nx = atoi(argv[arg_index++]);
+         ny = atoi(argv[arg_index++]);
+         nz = atoi(argv[arg_index++]);
+      }
+      else if ( strcmp(argv[arg_index], "-P") == 0 )
+      {
+         arg_index++;
+         P  = atoi(argv[arg_index++]);
+         Q  = atoi(argv[arg_index++]);
+         R  = atoi(argv[arg_index++]);
+      }
+      else
+      {
+         arg_index++;
+      }
+   }
+
+   /*-----------------------------------------------------------
+    * Check a few things
+    *-----------------------------------------------------------*/
+
+   if ((P * Q * R) != num_procs)
+   {
+      hypre_printf("Error: Invalid number of processors or processor topology \n");
+      exit(1);
+   }
+
+   /*-----------------------------------------------------------
+    * Print driver parameters
+    *-----------------------------------------------------------*/
+
+   if (myid == 0)
+   {
+      hypre_printf("  Laplacian_125pt:\n");
+      hypre_printf("    (nx, ny, nz) = (%b, %b, %b)\n", nx, ny, nz);
+      hypre_printf("    (Px, Py, Pz) = (%d, %d, %d)\n\n", P,  Q,  R);
+   }
+
+   /*-----------------------------------------------------------
+    * Set up the grid structure
+    *-----------------------------------------------------------*/
+
+   /* compute p,q,r from P,Q,R and myid */
+   p = myid % P;
+   q = (( myid - p) / P) % Q;
+   r = ( myid - p - P * q) / ( P * Q );
+
+   /*-----------------------------------------------------------
+    * Generate the matrix
+    *-----------------------------------------------------------*/
+
+   values = hypre_CTAlloc(HYPRE_Real,  2, HYPRE_MEMORY_HOST);
+
+   values[0] = 26.0;
+   if (nx == 1 || ny == 1 || nz == 1)
+   {
+      values[0] = 8.0;
+   }
+   if (nx * ny == 1 || nx * nz == 1 || ny * nz == 1)
+   {
+      values[0] = 2.0;
+   }
+   values[1] = -1.;
+
+   B = (HYPRE_ParCSRMatrix) GenerateLaplacian27pt(hypre_MPI_COMM_WORLD,
+                                                  nx, ny, nz, P, Q, R, p, q, r, values);
+   A = (HYPRE_ParCSRMatrix) hypre_ParCSRMatMat(B, B);
+
+   HYPRE_ParCSRMatrixDestroy(B);
+   hypre_TFree(values, HYPRE_MEMORY_HOST);
+
+   *A_ptr = A;
+
+   return (0);
+}
 
 /*----------------------------------------------------------------------
  * Build 7-point in 2D
@@ -9228,14 +11137,14 @@ BuildParRotate7pt( HYPRE_Int            argc,
                    HYPRE_Int            arg_index,
                    HYPRE_ParCSRMatrix  *A_ptr     )
 {
-   HYPRE_BigInt              nx, ny;
-   HYPRE_Int                 P, Q;
+   HYPRE_BigInt        nx, ny;
+   HYPRE_Int           P, Q;
 
    HYPRE_ParCSRMatrix  A;
 
-   HYPRE_Int                 num_procs, myid;
-   HYPRE_Int                 p, q;
-   HYPRE_Real          eps, alpha;
+   HYPRE_Int           num_procs, myid;
+   HYPRE_Int           p, q;
+   HYPRE_Real          eps = 0.0, alpha = 1.0;
 
    /*-----------------------------------------------------------
     * Initialize some stuff
@@ -9275,12 +11184,12 @@ BuildParRotate7pt( HYPRE_Int            argc,
       else if ( strcmp(argv[arg_index], "-alpha") == 0 )
       {
          arg_index++;
-         alpha  = atof(argv[arg_index++]);
+         alpha  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-eps") == 0 )
       {
          arg_index++;
-         eps  = atof(argv[arg_index++]);
+         eps  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else
       {
@@ -9292,7 +11201,7 @@ BuildParRotate7pt( HYPRE_Int            argc,
     * Check a few things
     *-----------------------------------------------------------*/
 
-   if ((P*Q) != num_procs)
+   if ((P * Q) != num_procs)
    {
       hypre_printf("Error: Invalid number of processors or processor topology \n");
       exit(1);
@@ -9305,7 +11214,7 @@ BuildParRotate7pt( HYPRE_Int            argc,
    if (myid == 0)
    {
       hypre_printf("  Rotate 7pt:\n");
-      hypre_printf("    alpha = %f, eps = %f\n", alpha,eps);
+      hypre_printf("    alpha = %f, eps = %f\n", alpha, eps);
       hypre_printf("    (nx, ny) = (%b, %b)\n", nx, ny);
       hypre_printf("    (Px, Py) = (%d, %d)\n", P,  Q);
    }
@@ -9316,7 +11225,7 @@ BuildParRotate7pt( HYPRE_Int            argc,
 
    /* compute p,q from P,Q and myid */
    p = myid % P;
-   q = ( myid - p)/P;
+   q = ( myid - p) / P;
 
    /*-----------------------------------------------------------
     * Generate the matrix
@@ -9404,7 +11313,7 @@ BuildParVarDifConv( HYPRE_Int            argc,
       else if ( strcmp(argv[arg_index], "-eps") == 0 )
       {
          arg_index++;
-         eps  = atof(argv[arg_index++]);
+         eps  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-vardifconvRS") == 0 )
       {
@@ -9421,7 +11330,7 @@ BuildParVarDifConv( HYPRE_Int            argc,
     * Check a few things
     *-----------------------------------------------------------*/
 
-   if ((P*Q*R) != num_procs)
+   if ((P * Q * R) != num_procs)
    {
       hypre_printf("Error: Invalid number of processors or processor topology \n");
       exit(1);
@@ -9444,8 +11353,8 @@ BuildParVarDifConv( HYPRE_Int            argc,
 
    /* compute p,q,r from P,Q,R and myid */
    p = myid % P;
-   q = (( myid - p)/P) % Q;
-   r = ( myid - p - P*q)/( P*Q );
+   q = (( myid - p) / P) % Q;
+   r = ( myid - p - P * q) / ( P * Q );
 
    /*-----------------------------------------------------------
     * Generate the matrix
@@ -9471,29 +11380,30 @@ BuildParVarDifConv( HYPRE_Int            argc,
 
 /**************************************************************************/
 
-HYPRE_Int SetSysVcoefValues(HYPRE_Int num_fun, HYPRE_BigInt nx, HYPRE_BigInt ny, HYPRE_BigInt nz, HYPRE_Real vcx,
+HYPRE_Int SetSysVcoefValues(HYPRE_Int num_fun, HYPRE_BigInt nx, HYPRE_BigInt ny, HYPRE_BigInt nz,
+                            HYPRE_Real vcx,
                             HYPRE_Real vcy, HYPRE_Real vcz, HYPRE_Int mtx_entry, HYPRE_Real *values)
 {
 
 
-   HYPRE_Int sz = num_fun*num_fun;
+   HYPRE_Int sz = num_fun * num_fun;
 
-   values[1*sz + mtx_entry] = -vcx;
-   values[2*sz + mtx_entry] = -vcy;
-   values[3*sz + mtx_entry] = -vcz;
-   values[0*sz + mtx_entry] = 0.0;
+   values[1 * sz + mtx_entry] = -vcx;
+   values[2 * sz + mtx_entry] = -vcy;
+   values[3 * sz + mtx_entry] = -vcz;
+   values[0 * sz + mtx_entry] = 0.0;
 
    if (nx > 1)
    {
-      values[0*sz + mtx_entry] += 2.0*vcx;
+      values[0 * sz + mtx_entry] += 2.0 * vcx;
    }
    if (ny > 1)
    {
-      values[0*sz + mtx_entry] += 2.0*vcy;
+      values[0 * sz + mtx_entry] += 2.0 * vcy;
    }
    if (nz > 1)
    {
-      values[0*sz + mtx_entry] += 2.0*vcz;
+      values[0 * sz + mtx_entry] += 2.0 * vcz;
    }
 
    return 0;
@@ -9567,23 +11477,27 @@ BuildParCoordinates( HYPRE_Int            argc,
 
    /* compute p,q,r from P,Q,R and myid */
    p = myid % P;
-   q = (( myid - p)/P) % Q;
-   r = ( myid - p - P*q)/( P*Q );
+   q = (( myid - p) / P) % Q;
+   r = ( myid - p - P * q) / ( P * Q );
 
    /*-----------------------------------------------------------
     * Generate the coordinates
     *-----------------------------------------------------------*/
 
    coorddim = 3;
-   if (nx<2) coorddim--;
-   if (ny<2) coorddim--;
-   if (nz<2) coorddim--;
+   if (nx < 2) { coorddim--; }
+   if (ny < 2) { coorddim--; }
+   if (nz < 2) { coorddim--; }
 
-   if (coorddim>0)
-      coordinates = GenerateCoordinates (hypre_MPI_COMM_WORLD,
-                                         nx, ny, nz, P, Q, R, p, q, r, coorddim);
+   if (coorddim > 0)
+   {
+      coordinates = hypre_GenerateCoordinates(hypre_MPI_COMM_WORLD,
+                                              nx, ny, nz, P, Q, R, p, q, r, coorddim);
+   }
    else
-      coordinates=NULL;
+   {
+      coordinates = NULL;
+   }
 
    *coorddim_ptr = coorddim;
    *coord_ptr = coordinates;
@@ -9672,8 +11586,8 @@ BuildParIsoLaplacian( HYPRE_Int argc, char** argv, HYPRE_ParCSRMatrix *A_ptr )
 
    /* compute p,q,r from P,Q,R and myid */
    p = myid % P;
-   q = (( myid - p)/P) % Q;
-   r = ( myid - p - P*q)/( P*Q );
+   q = (( myid - p) / P) % Q;
+   r = ( myid - p - P * q) / ( P * Q );
 
    /*-----------------------------------------------------------
     * Generate the matrix
@@ -9688,15 +11602,15 @@ BuildParIsoLaplacian( HYPRE_Int argc, char** argv, HYPRE_ParCSRMatrix *A_ptr )
    values[0] = 0.;
    if (nx > 1)
    {
-      values[0] += 2.0*cx;
+      values[0] += 2.0 * cx;
    }
    if (ny > 1)
    {
-      values[0] += 2.0*cy;
+      values[0] += 2.0 * cy;
    }
    if (nz > 1)
    {
-      values[0] += 2.0*cz;
+      values[0] += 2.0 * cz;
    }
 
    A = (HYPRE_ParCSRMatrix) GenerateLaplacian(hypre_MPI_COMM_WORLD,
diff --git a/external/hypre/src/test/ij_assembly.c b/external/hypre/src/test/ij_assembly.c
index 798a85a7..febf3632 100644
--- a/external/hypre/src/test/ij_assembly.c
+++ b/external/hypre/src/test/ij_assembly.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -16,57 +16,33 @@
 #include "_hypre_IJ_mv.h"
 #include "_hypre_parcsr_mv.h"
 #include "HYPRE_parcsr_ls.h"
+#include "_hypre_utilities.h"
 //#include "_hypre_utilities.hpp"
 
 HYPRE_Int buildMatrixEntries(MPI_Comm comm,
                              HYPRE_Int nx, HYPRE_Int ny, HYPRE_Int nz,
                              HYPRE_Int Px, HYPRE_Int Py, HYPRE_Int Pz,
-                             HYPRE_Int cx, HYPRE_Int cy, HYPRE_Int cz,
+                             HYPRE_Real cx, HYPRE_Real cy, HYPRE_Real cz, HYPRE_Int base,
                              HYPRE_BigInt *ilower, HYPRE_BigInt *iupper,
                              HYPRE_BigInt *jlower, HYPRE_BigInt *jupper,
                              HYPRE_Int *nrows, HYPRE_BigInt *num_nonzeros,
                              HYPRE_Int **nnzrow_ptr, HYPRE_BigInt **rows_ptr,
-                             HYPRE_BigInt **rows2_ptr, HYPRE_BigInt **cols_ptr,
+                             HYPRE_BigInt **rows_coo_ptr, HYPRE_BigInt **cols_ptr,
                              HYPRE_Real **coefs_ptr, HYPRE_Int stencil, HYPRE_ParCSRMatrix *parcsr_ptr);
 
-HYPRE_Int getParCSRMatrixData(HYPRE_ParCSRMatrix  A, HYPRE_Int *nrows_ptr, HYPRE_BigInt *num_nonzeros_ptr,
-                              HYPRE_Int **nnzrow_ptr, HYPRE_BigInt **rows_ptr, HYPRE_BigInt **rows2_ptr,
+HYPRE_Int getParCSRMatrixData(HYPRE_ParCSRMatrix  A, HYPRE_Int base, HYPRE_Int *nrows_ptr,
+                              HYPRE_BigInt *num_nonzeros_ptr,
+                              HYPRE_Int **nnzrow_ptr, HYPRE_BigInt **rows_ptr, HYPRE_BigInt **rows_coo_ptr,
                               HYPRE_BigInt **cols_ptr, HYPRE_Real **coefs_ptr);
 
-HYPRE_Int checkMatrix(HYPRE_ParCSRMatrix parcsr_ref, HYPRE_IJMatrix ij_A);
-
-HYPRE_Int test_Set(MPI_Comm comm, HYPRE_MemoryLocation memory_location, HYPRE_Int option,
-                   HYPRE_BigInt ilower, HYPRE_BigInt iupper,
-                   HYPRE_Int nrows, HYPRE_BigInt num_nonzeros,
-                   HYPRE_Int nchunks, HYPRE_Int *h_nnzrow, HYPRE_Int *nnzrow,
-                   HYPRE_BigInt *rows, HYPRE_BigInt *cols,
-                   HYPRE_Real *coefs, HYPRE_IJMatrix *ij_A_ptr);
-
-HYPRE_Int test_SetOffProc(HYPRE_ParCSRMatrix parcsr_A, HYPRE_MemoryLocation memory_location,
-                          HYPRE_Int nchunks, HYPRE_Int option, HYPRE_IJMatrix *ij_AT_ptr);
-
-HYPRE_Int test_SetSet(MPI_Comm comm, HYPRE_MemoryLocation memory_location, HYPRE_Int option,
-                      HYPRE_BigInt ilower, HYPRE_BigInt iupper,
-                      HYPRE_Int nrows, HYPRE_BigInt num_nonzeros,
-                      HYPRE_Int nchunks, HYPRE_Int *h_nnzrow, HYPRE_Int *nnzrow,
-                      HYPRE_BigInt *rows, HYPRE_BigInt *cols,
-                      HYPRE_Real *coefs, HYPRE_IJMatrix *ij_A_ptr);
-
-HYPRE_Int test_AddSet(MPI_Comm comm, HYPRE_MemoryLocation memory_location, HYPRE_Int option,
-                      HYPRE_BigInt ilower, HYPRE_BigInt iupper,
-                      HYPRE_Int nrows, HYPRE_BigInt num_nonzeros,
-                      HYPRE_Int nchunks, HYPRE_Int *h_nnzrow, HYPRE_Int *nnzrow,
-                      HYPRE_BigInt *rows, HYPRE_BigInt *cols,
-                      HYPRE_Real *coefs, HYPRE_IJMatrix *ij_A_ptr);
-
-HYPRE_Int test_SetAddSet(MPI_Comm comm, HYPRE_MemoryLocation memory_location, HYPRE_Int option,
-                         HYPRE_BigInt ilower, HYPRE_BigInt iupper,
-                         HYPRE_Int nrows, HYPRE_BigInt num_nonzeros,
-                         HYPRE_Int nchunks, HYPRE_Int *h_nnzrow, HYPRE_Int *nnzrow,
-                         HYPRE_BigInt *rows, HYPRE_BigInt *cols,
-                         HYPRE_Real *coefs, HYPRE_IJMatrix *ij_A_ptr);
-
-//#define CUDA_PROFILER
+HYPRE_Real checkMatrix(HYPRE_ParCSRMatrix parcsr_ref, HYPRE_IJMatrix ij_A);
+
+HYPRE_Int test_all(MPI_Comm comm, const char *test_name, HYPRE_MemoryLocation memory_location,
+                   HYPRE_Int option, const char *cmd_sequence, HYPRE_BigInt ilower, HYPRE_BigInt iupper,
+                   HYPRE_BigInt jlower, HYPRE_BigInt jupper, HYPRE_Int nrows, HYPRE_BigInt num_nonzeros,
+                   HYPRE_Int nchunks, HYPRE_Int init_alloc, HYPRE_Int early_assemble, HYPRE_Real grow_factor,
+                   HYPRE_Int *h_nnzrow, HYPRE_Int *nnzrow, HYPRE_BigInt *rows, HYPRE_BigInt *cols, HYPRE_Real *coefs,
+                   HYPRE_IJMatrix *ij_A_ptr);
 
 hypre_int
 main( hypre_int  argc,
@@ -79,33 +55,34 @@ main( hypre_int  argc,
    HYPRE_Int                 time_index;
    HYPRE_Int                 print_usage;
    HYPRE_MemoryLocation      memory_location;
-#if defined(HYPRE_USING_GPU)
-   HYPRE_ExecutionPolicy    default_exec_policy;
+#if defined(HYPRE_USING_GPU) || defined(HYPRE_USING_DEVICE_OPENMP)
+   HYPRE_ExecutionPolicy     default_exec_policy;
 #endif
    char                      memory_location_name[8];
-
    HYPRE_Int                 nrows;
    HYPRE_BigInt              num_nonzeros;
    HYPRE_BigInt              ilower, iupper;
    HYPRE_BigInt              jlower, jupper;
-   HYPRE_Int                *nnzrow, *h_nnzrow, *d_nnzrow;
-   HYPRE_BigInt             *rows,   *h_rows,   *d_rows;
-   HYPRE_BigInt             *rows2,  *h_rows2,  *d_rows2;
-   HYPRE_BigInt             *cols,   *h_cols,   *d_cols;
-   HYPRE_Real               *coefs,  *h_coefs,  *d_coefs;
-   HYPRE_IJMatrix            ij_A;
-   HYPRE_IJMatrix            ij_AT;
-   HYPRE_ParCSRMatrix        parcsr_ref;
-
+   HYPRE_Int                *nnzrow = NULL, *h_nnzrow, *d_nnzrow = NULL;
+   HYPRE_BigInt             *rows = NULL,   *h_rows,   *d_rows = NULL;
+   HYPRE_BigInt             *rows_coo = NULL,  *h_rows_coo,  *d_rows_coo = NULL;
+   HYPRE_BigInt             *cols = NULL,   *h_cols,   *d_cols = NULL;
+   HYPRE_Real               *coefs = NULL,  *h_coefs,  *d_coefs = NULL;
+   HYPRE_IJMatrix            ij_A, ij_AT;
+   HYPRE_ParCSRMatrix        parcsr_ref = NULL, parcsr_trans = NULL;
    // Driver input parameters
    HYPRE_Int                 Px, Py, Pz;
    HYPRE_Int                 nx, ny, nz;
    HYPRE_Real                cx, cy, cz;
    HYPRE_Int                 nchunks;
-   HYPRE_Int                 mode;
-   HYPRE_Int                 option;
+   HYPRE_Int                 mode, ierr = 0;
+   HYPRE_Real                tol = HYPRE_REAL_EPSILON;
+   HYPRE_Int                 option, base;
    HYPRE_Int                 stencil;
    HYPRE_Int                 print_matrix;
+   HYPRE_Int                 init_alloc = -1;
+   HYPRE_Int                 early_assemble = 0;
+   HYPRE_Real                grow_factor = -1.0;
 
    /* Initialize MPI */
    hypre_MPI_Init(&argc, &argv);
@@ -114,15 +91,16 @@ main( hypre_int  argc,
 
    /*-----------------------------------------------------------------
     * GPU Device binding
-    * Must be done before HYPRE_Init() and should not be changed after
+    * Must be done before HYPRE_Initialize() and should not be changed after
     *-----------------------------------------------------------------*/
-   hypre_bind_device(myid, num_procs, hypre_MPI_COMM_WORLD);
+   hypre_bind_device_id(-1, myid, num_procs, hypre_MPI_COMM_WORLD);
 
    /* Initialize Hypre */
    /* Initialize Hypre: must be the first Hypre function to call */
    time_index = hypre_InitializeTiming("Hypre init");
    hypre_BeginTiming(time_index);
-   HYPRE_Init();
+   HYPRE_Initialize();
+   HYPRE_DeviceInitialize();
    hypre_EndTiming(time_index);
    hypre_PrintTiming("Hypre init times", hypre_MPI_COMM_WORLD);
    hypre_FinalizeTiming(time_index);
@@ -143,13 +121,14 @@ main( hypre_int  argc,
    cy = 2.0;
    cz = 3.0;
 
-#if defined(HYPRE_USING_GPU)
+#if defined(HYPRE_USING_GPU) || defined(HYPRE_USING_DEVICE_OPENMP)
    default_exec_policy = HYPRE_EXEC_DEVICE;
 #endif
    memory_location     = HYPRE_MEMORY_DEVICE;
-   mode                = 1;
+   mode                = (1 << 7) - 1;
    option              = 1;
-   nchunks             = 1;
+   nchunks             = 3;
+   base                = 0;
    print_matrix        = 0;
    stencil             = 7;
 
@@ -182,9 +161,9 @@ main( hypre_int  argc,
       else if ( strcmp(argv[arg_index], "-c") == 0 )
       {
          arg_index++;
-         cx = atof(argv[arg_index++]);
-         cy = atof(argv[arg_index++]);
-         cz = atof(argv[arg_index++]);
+         cx = (HYPRE_Real)atof(argv[arg_index++]);
+         cy = (HYPRE_Real)atof(argv[arg_index++]);
+         cz = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-mode") == 0 )
       {
@@ -211,6 +190,26 @@ main( hypre_int  argc,
          arg_index++;
          nchunks = atoi(argv[arg_index++]);
       }
+      else if ( strcmp(argv[arg_index], "-base") == 0 )
+      {
+         arg_index++;
+         base = atoi(argv[arg_index++]);
+      }
+      else if ( strcmp(argv[arg_index], "-init") == 0 )
+      {
+         arg_index++;
+         init_alloc = atoi(argv[arg_index++]);
+      }
+      else if ( strcmp(argv[arg_index], "-early") == 0 )
+      {
+         arg_index++;
+         early_assemble = atoi(argv[arg_index++]);
+      }
+      else if ( strcmp(argv[arg_index], "-grow") == 0 )
+      {
+         arg_index++;
+         grow_factor = (HYPRE_Real) atof(argv[arg_index++]);
+      }
       else if ( strcmp(argv[arg_index], "-print") == 0 )
       {
          arg_index++;
@@ -225,7 +224,7 @@ main( hypre_int  argc,
    /*-----------------------------------------------------------
     * Safety checks
     *-----------------------------------------------------------*/
-   if (Px*Py*Pz != num_procs)
+   if (Px * Py * Pz != num_procs)
    {
       hypre_printf("Px x Py x Pz is different than the number of MPI processes");
       return (-1);
@@ -248,6 +247,7 @@ main( hypre_int  argc,
          hypre_printf("             0 = HOST\n");
          hypre_printf("             1 = DEVICE (default)\n");
          hypre_printf("      -nchunks <val>         : number of chunks passed to Set/AddValues\n");
+         hypre_printf("      -base <val>            : matrix index base\n");
          hypre_printf("      -mode <val>            : tests to be performed\n");
          hypre_printf("             1 = Set (default)\n");
          hypre_printf("             2 = SetOffProc\n");
@@ -264,6 +264,10 @@ main( hypre_int  argc,
       return (0);
    }
 
+#if defined(HYPRE_USING_MEMORY_TRACKER)
+   hypre_MemoryTrackerSetPrint(1);
+#endif
+
    /*-----------------------------------------------------------
     * Print driver parameters
     *-----------------------------------------------------------*/
@@ -288,35 +292,47 @@ main( hypre_int  argc,
       hypre_printf("\n");
    }
 
-#if defined(HYPRE_USING_GPU)
+#if defined(HYPRE_USING_GPU) || defined(HYPRE_USING_DEVICE_OPENMP)
    hypre_HandleDefaultExecPolicy(hypre_handle()) = default_exec_policy;
 #endif
 
+#if defined(HYPRE_USING_OPENMP)
+   if (hypre_GetExecPolicy1(memory_location) == HYPRE_EXEC_HOST)
+   {
+      mode = mode & ~2; /* skip AddTranspose with OMP */
+   }
+#endif
+
    /*-----------------------------------------------------------
     * Build matrix entries
     *-----------------------------------------------------------*/
-   buildMatrixEntries(comm, nx, ny, nz, Px, Py, Pz, cx, cy, cz,
+   buildMatrixEntries(comm, nx, ny, nz, Px, Py, Pz, cx, cy, cz, base,
                       &ilower, &iupper, &jlower, &jupper, &nrows, &num_nonzeros,
-                      &h_nnzrow, &h_rows, &h_rows2, &h_cols, &h_coefs, stencil, &parcsr_ref);
+                      &h_nnzrow, &h_rows, &h_rows_coo, &h_cols, &h_coefs, stencil, &parcsr_ref);
 
    switch (memory_location)
    {
       case HYPRE_MEMORY_DEVICE:
          d_nnzrow = hypre_TAlloc(HYPRE_Int,    nrows,        HYPRE_MEMORY_DEVICE);
          d_rows   = hypre_TAlloc(HYPRE_BigInt, nrows,        HYPRE_MEMORY_DEVICE);
-         d_rows2  = hypre_TAlloc(HYPRE_BigInt, num_nonzeros, HYPRE_MEMORY_DEVICE);
+         d_rows_coo  = hypre_TAlloc(HYPRE_BigInt, num_nonzeros, HYPRE_MEMORY_DEVICE);
          d_cols   = hypre_TAlloc(HYPRE_BigInt, num_nonzeros, HYPRE_MEMORY_DEVICE);
          d_coefs  = hypre_TAlloc(HYPRE_Real,   num_nonzeros, HYPRE_MEMORY_DEVICE);
 
-         hypre_TMemcpy(d_nnzrow, h_nnzrow, HYPRE_Int,    nrows,        HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
-         hypre_TMemcpy(d_rows,   h_rows,   HYPRE_BigInt, nrows,        HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
-         hypre_TMemcpy(d_rows2,  h_rows2,  HYPRE_BigInt, num_nonzeros, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
-         hypre_TMemcpy(d_cols,   h_cols,   HYPRE_BigInt, num_nonzeros, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
-         hypre_TMemcpy(d_coefs,  h_coefs,  HYPRE_Real,   num_nonzeros, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
+         hypre_TMemcpy(d_nnzrow, h_nnzrow, HYPRE_Int,    nrows,        HYPRE_MEMORY_DEVICE,
+                       HYPRE_MEMORY_HOST);
+         hypre_TMemcpy(d_rows,   h_rows,   HYPRE_BigInt, nrows,        HYPRE_MEMORY_DEVICE,
+                       HYPRE_MEMORY_HOST);
+         hypre_TMemcpy(d_rows_coo,  h_rows_coo,  HYPRE_BigInt, num_nonzeros, HYPRE_MEMORY_DEVICE,
+                       HYPRE_MEMORY_HOST);
+         hypre_TMemcpy(d_cols,   h_cols,   HYPRE_BigInt, num_nonzeros, HYPRE_MEMORY_DEVICE,
+                       HYPRE_MEMORY_HOST);
+         hypre_TMemcpy(d_coefs,  h_coefs,  HYPRE_Real,   num_nonzeros, HYPRE_MEMORY_DEVICE,
+                       HYPRE_MEMORY_HOST);
 
          nnzrow = d_nnzrow;
          rows   = d_rows;
-         rows2  = d_rows2;
+         rows_coo  = d_rows_coo;
          cols   = d_cols;
          coefs  = d_coefs;
          break;
@@ -324,7 +340,7 @@ main( hypre_int  argc,
       case HYPRE_MEMORY_HOST:
          nnzrow = h_nnzrow;
          rows   = h_rows;
-         rows2  = h_rows2;
+         rows_coo  = h_rows_coo;
          cols   = h_cols;
          coefs  = h_coefs;
          break;
@@ -339,10 +355,12 @@ main( hypre_int  argc,
    /* Test Set */
    if (mode & 1)
    {
-      test_Set(comm, memory_location, option, ilower, iupper, nrows, num_nonzeros,
-               nchunks, h_nnzrow, nnzrow, option == 1 ? rows : rows2, cols, coefs, &ij_A);
+      test_all(comm, "set", memory_location, option, "sA", ilower, iupper, jlower, jupper, nrows,
+               num_nonzeros,
+               nchunks, init_alloc, early_assemble, grow_factor, h_nnzrow, nnzrow, option == 1 ? rows : rows_coo,
+               cols, coefs, &ij_A);
 
-      checkMatrix(parcsr_ref, ij_A);
+      ierr += checkMatrix(parcsr_ref, ij_A) > tol;
       if (print_matrix)
       {
          HYPRE_IJMatrixPrint(ij_A, "ij_Set");
@@ -350,25 +368,37 @@ main( hypre_int  argc,
       HYPRE_IJMatrixDestroy(ij_A);
    }
 
-   /* Test SetOffProc */
+   /* Test AddTranspose
+    * set values with (row, col) reversed, i.e., the transpose of A
+    * in this way, we can test off-proc add to values
+    */
    if (mode & 2)
    {
-      test_SetOffProc(parcsr_ref, memory_location, nchunks, option, &ij_AT);
-      checkMatrix(parcsr_ref, ij_AT);
+      test_all(comm, "addtrans", memory_location, 2, "aaaaaA", ilower, iupper, jlower, jupper, nrows,
+               num_nonzeros,
+               nchunks, init_alloc, early_assemble, grow_factor, h_nnzrow, nnzrow, cols, rows_coo, coefs, &ij_AT);
+
+      hypre_ParCSRMatrixTranspose(parcsr_ref, &parcsr_trans, 1);
+      hypre_ParCSRMatrixScale(parcsr_trans, 5.0);
+
+      ierr += checkMatrix(parcsr_trans, ij_AT) > tol;
       if (print_matrix)
       {
-         HYPRE_IJMatrixPrint(ij_A, "ij_SetOffProc");
+         HYPRE_IJMatrixPrint(ij_AT, "ij_AddTrans");
       }
       HYPRE_IJMatrixDestroy(ij_AT);
+      HYPRE_ParCSRMatrixDestroy(parcsr_trans);
    }
 
    /* Test Set/Set */
    if (mode & 4)
    {
-      test_SetSet(comm, memory_location, option, ilower, iupper, nrows, num_nonzeros,
-                  nchunks, h_nnzrow, nnzrow, option == 1 ? rows : rows2, cols, coefs, &ij_A);
+      test_all(comm, "set/set", memory_location, option, "ssA", ilower, iupper, jlower, jupper, nrows,
+               num_nonzeros,
+               nchunks, init_alloc, early_assemble, grow_factor, h_nnzrow, nnzrow, option == 1 ? rows : rows_coo,
+               cols, coefs, &ij_A);
 
-      checkMatrix(parcsr_ref, ij_A);
+      ierr += checkMatrix(parcsr_ref, ij_A) > tol;
       if (print_matrix)
       {
          HYPRE_IJMatrixPrint(ij_A, "ij_SetSet");
@@ -379,10 +409,12 @@ main( hypre_int  argc,
    /* Test Add/Set */
    if (mode & 8)
    {
-      test_AddSet(comm, memory_location, option, ilower, iupper, nrows, num_nonzeros,
-                  nchunks, h_nnzrow, nnzrow, option == 1 ? rows : rows2, cols, coefs, &ij_A);
+      test_all(comm, "add/set", memory_location, option, "asA", ilower, iupper, jlower, jupper, nrows,
+               num_nonzeros,
+               nchunks, init_alloc, early_assemble, grow_factor, h_nnzrow, nnzrow, option == 1 ? rows : rows_coo,
+               cols, coefs, &ij_A);
 
-      checkMatrix(parcsr_ref, ij_A);
+      ierr += checkMatrix(parcsr_ref, ij_A) > tol;
       if (print_matrix)
       {
          HYPRE_IJMatrixPrint(ij_A, "ij_AddSet");
@@ -390,20 +422,65 @@ main( hypre_int  argc,
       HYPRE_IJMatrixDestroy(ij_A);
    }
 
-   /* Test Set/Add/Set */
+   /* Test Set/Add */
    if (mode & 16)
    {
-      test_SetAddSet(comm, memory_location, option, ilower, iupper, nrows, num_nonzeros,
-                     nchunks, h_nnzrow, nnzrow, option == 1 ? rows : rows2, cols, coefs, &ij_A);
+      test_all(comm, "set/add", memory_location, option, "saA", ilower, iupper, jlower, jupper, nrows,
+               num_nonzeros,
+               nchunks, init_alloc, early_assemble, grow_factor, h_nnzrow, nnzrow, option == 1 ? rows : rows_coo,
+               cols, coefs, &ij_A);
+
+      hypre_ParCSRMatrix *parcsr_ref2 = hypre_ParCSRMatrixClone(parcsr_ref, 1);
+      hypre_ParCSRMatrixScale(parcsr_ref2, 2.0);
+
+      ierr += checkMatrix(parcsr_ref2, ij_A) > tol;
+      if (print_matrix)
+      {
+         HYPRE_IJMatrixPrint(ij_A, "ij_SetAdd");
+      }
+      HYPRE_IJMatrixDestroy(ij_A);
+      HYPRE_ParCSRMatrixDestroy(parcsr_ref2);
+   }
+
+   /* Test Set/Add/Assemble/Set */
+   if (mode & 32)
+   {
+      test_all(comm, "set/add/assemble/set", memory_location, option, "saAsA", ilower, iupper, jlower,
+               jupper, nrows, num_nonzeros,
+               nchunks, init_alloc, early_assemble, grow_factor, h_nnzrow, nnzrow, option == 1 ? rows : rows_coo,
+               cols, coefs, &ij_A);
 
-      checkMatrix(parcsr_ref, ij_A);
+      ierr += checkMatrix(parcsr_ref, ij_A) > tol;
       if (print_matrix)
       {
-         HYPRE_IJMatrixPrint(ij_A, "ij_SetAddSet");
+         HYPRE_IJMatrixPrint(ij_A, "ij_SetAddAssembleSet");
       }
       HYPRE_IJMatrixDestroy(ij_A);
    }
 
+   /* Test Adds */
+   if (mode & 64)
+   {
+      test_all(comm, "5adds/set", memory_location, option, "aaaaasA", ilower, iupper, jlower, jupper,
+               nrows, num_nonzeros,
+               nchunks, init_alloc, early_assemble, grow_factor, h_nnzrow, nnzrow, option == 1 ? rows : rows_coo,
+               cols, coefs, &ij_A);
+
+      hypre_ParCSRMatrix *parcsr_ref2 = hypre_ParCSRMatrixClone(parcsr_ref, 1);
+      hypre_ParCSRMatrixScale(parcsr_ref2, 1.);
+
+      ierr += checkMatrix(parcsr_ref2, ij_A) > tol;
+      if (print_matrix)
+      {
+         HYPRE_IJMatrixPrint(ij_A, "ij_5AddsSet");
+      }
+      HYPRE_IJMatrixDestroy(ij_A);
+      HYPRE_ParCSRMatrixDestroy(parcsr_ref2);
+   }
+
+   /* Print the error code */
+   hypre_ParPrintf(comm, "Test error code = %d\n", ierr);
+
    /*-----------------------------------------------------------
     * Free memory
     *-----------------------------------------------------------*/
@@ -411,13 +488,13 @@ main( hypre_int  argc,
    {
       hypre_TFree(d_nnzrow, HYPRE_MEMORY_DEVICE);
       hypre_TFree(d_rows,   HYPRE_MEMORY_DEVICE);
-      hypre_TFree(d_rows2,  HYPRE_MEMORY_DEVICE);
+      hypre_TFree(d_rows_coo,  HYPRE_MEMORY_DEVICE);
       hypre_TFree(d_cols,   HYPRE_MEMORY_DEVICE);
       hypre_TFree(d_coefs,  HYPRE_MEMORY_DEVICE);
    }
    hypre_TFree(h_nnzrow, HYPRE_MEMORY_HOST);
    hypre_TFree(h_rows,   HYPRE_MEMORY_HOST);
-   hypre_TFree(h_rows2,  HYPRE_MEMORY_HOST);
+   hypre_TFree(h_rows_coo,  HYPRE_MEMORY_HOST);
    hypre_TFree(h_cols,   HYPRE_MEMORY_HOST);
    hypre_TFree(h_coefs,  HYPRE_MEMORY_HOST);
 
@@ -431,7 +508,7 @@ main( hypre_int  argc,
 
    /* when using cuda-memcheck --leak-check full, uncomment this */
 #if defined(HYPRE_USING_GPU)
-   hypre_ResetCudaDevice(hypre_handle());
+   hypre_ResetDevice();
 #endif
 
    return (0);
@@ -445,9 +522,10 @@ buildMatrixEntries(MPI_Comm            comm,
                    HYPRE_Int           Px,
                    HYPRE_Int           Py,
                    HYPRE_Int           Pz,
-                   HYPRE_Int           cx,
-                   HYPRE_Int           cy,
-                   HYPRE_Int           cz,
+                   HYPRE_Real          cx,
+                   HYPRE_Real          cy,
+                   HYPRE_Real          cz,
+                   HYPRE_Int           base,
                    HYPRE_BigInt       *ilower_ptr,
                    HYPRE_BigInt       *iupper_ptr,
                    HYPRE_BigInt       *jlower_ptr,
@@ -456,23 +534,23 @@ buildMatrixEntries(MPI_Comm            comm,
                    HYPRE_BigInt       *num_nonzeros_ptr,
                    HYPRE_Int         **nnzrow_ptr,
                    HYPRE_BigInt      **rows_ptr,   /* row indices of length nrows */
-                   HYPRE_BigInt      **rows2_ptr,  /* row indices of length nnz */
+                   HYPRE_BigInt      **rows_coo_ptr,  /* row indices of length nnz */
                    HYPRE_BigInt      **cols_ptr,   /* col indices of length nnz */
                    HYPRE_Real        **coefs_ptr,  /* values of length nnz */
                    HYPRE_Int           stencil,
                    HYPRE_ParCSRMatrix *parcsr_ptr)
 {
-   HYPRE_Int        num_procs;
-   HYPRE_Int        myid;
-   HYPRE_Real       values[4];
-   HYPRE_ParCSRMatrix A;
+   HYPRE_Int          num_procs;
+   HYPRE_Int          myid;
+   HYPRE_Real         values[4];
+   HYPRE_ParCSRMatrix A = NULL;
 
    hypre_MPI_Comm_size(comm, &num_procs );
    hypre_MPI_Comm_rank(comm, &myid );
 
    HYPRE_Int ip = myid % Px;
-   HYPRE_Int iq = (( myid - ip)/Px) % Py;
-   HYPRE_Int ir = ( myid - ip - Px*iq)/( Px*Py );
+   HYPRE_Int iq = (( myid - ip) / Px) % Py;
+   HYPRE_Int ir = ( myid - ip - Px * iq) / ( Px * Py );
 
    values[0] = 0;
    values[1] = -cx;
@@ -497,13 +575,52 @@ buildMatrixEntries(MPI_Comm            comm,
    }
 
    hypre_ParCSRMatrixMigrate(A, HYPRE_MEMORY_HOST);
-   getParCSRMatrixData(A, nrows_ptr, num_nonzeros_ptr, nnzrow_ptr, rows_ptr, rows2_ptr, cols_ptr, coefs_ptr);
+
+   /* modify the upper triangular part to A nonsymmetric */
+   HYPRE_Int           i, j;
+   HYPRE_Int           nrows    = hypre_ParCSRMatrixNumRows(A);
+   hypre_CSRMatrix    *A_diag   = hypre_ParCSRMatrixDiag(A);
+   hypre_CSRMatrix    *A_offd   = hypre_ParCSRMatrixOffd(A);
+   HYPRE_Int          *A_diag_i = hypre_CSRMatrixI(A_diag);
+   HYPRE_Int          *A_diag_j = hypre_CSRMatrixJ(A_diag);
+   HYPRE_Int          *A_offd_i = hypre_CSRMatrixI(A_offd);
+   HYPRE_Int          *A_offd_j = hypre_CSRMatrixJ(A_offd);
+   HYPRE_BigInt       *col_map_offd_A = hypre_ParCSRMatrixColMapOffd(A);
+   HYPRE_BigInt       ilower = hypre_ParCSRMatrixFirstRowIndex(A);
+   HYPRE_BigInt       jlower = hypre_ParCSRMatrixFirstColDiag(A);
+
+   for (i = 0; i < nrows; i++)
+   {
+      for (j = A_diag_i[i]; j < A_diag_i[i + 1]; j++)
+      {
+         HYPRE_BigInt row = ilower + (HYPRE_BigInt) i;
+         HYPRE_BigInt col = jlower + (HYPRE_BigInt) A_diag_j[j];
+         if (row < col)
+         {
+            hypre_CSRMatrixData(A_diag)[j] += myid + .89;
+         }
+      }
+      for (j = A_offd_i[i]; j < A_offd_i[i + 1]; j++)
+      {
+         HYPRE_BigInt row = ilower + (HYPRE_BigInt) i;
+         HYPRE_BigInt col = col_map_offd_A[A_offd_j[j]];
+         if (row < col)
+         {
+            hypre_CSRMatrixData(A_offd)[j] += myid + .64;
+         }
+      }
+   }
+
+   /* get I, J, data from A */
+   getParCSRMatrixData(A, base, nrows_ptr, num_nonzeros_ptr, nnzrow_ptr, rows_ptr, rows_coo_ptr,
+                       cols_ptr,
+                       coefs_ptr);
 
    // Set pointers
-   *ilower_ptr = hypre_ParCSRMatrixFirstRowIndex(A);
-   *iupper_ptr = hypre_ParCSRMatrixLastRowIndex(A);
-   *jlower_ptr = hypre_ParCSRMatrixFirstColDiag(A);
-   *jupper_ptr = hypre_ParCSRMatrixLastColDiag(A);
+   *ilower_ptr = hypre_ParCSRMatrixFirstRowIndex(A) + base;
+   *iupper_ptr = hypre_ParCSRMatrixLastRowIndex(A) + base;
+   *jlower_ptr = hypre_ParCSRMatrixFirstColDiag(A) + base;
+   *jupper_ptr = hypre_ParCSRMatrixLastColDiag(A) + base;
    *parcsr_ptr = A;
 
    return hypre_error_flag;
@@ -511,11 +628,12 @@ buildMatrixEntries(MPI_Comm            comm,
 
 HYPRE_Int
 getParCSRMatrixData(HYPRE_ParCSRMatrix  A,
+                    HYPRE_Int           base,
                     HYPRE_Int          *nrows_ptr,
                     HYPRE_BigInt       *num_nonzeros_ptr,
                     HYPRE_Int         **nnzrow_ptr,
                     HYPRE_BigInt      **rows_ptr,
-                    HYPRE_BigInt      **rows2_ptr,
+                    HYPRE_BigInt      **rows_coo_ptr,
                     HYPRE_BigInt      **cols_ptr,
                     HYPRE_Real        **coefs_ptr)
 {
@@ -527,14 +645,14 @@ getParCSRMatrixData(HYPRE_ParCSRMatrix  A,
    HYPRE_Int          *A_offd_j = hypre_CSRMatrixJ(A_offd);
    HYPRE_BigInt       *col_map_offd_A = hypre_ParCSRMatrixColMapOffd(A);
 
-   HYPRE_Int          ilower = hypre_ParCSRMatrixFirstRowIndex(A);
-   HYPRE_Int          jlower = hypre_ParCSRMatrixFirstColDiag(A);
+   HYPRE_BigInt       ilower = hypre_ParCSRMatrixFirstRowIndex(A);
+   HYPRE_BigInt       jlower = hypre_ParCSRMatrixFirstColDiag(A);
 
    HYPRE_Int          nrows;
    HYPRE_BigInt       num_nonzeros;
    HYPRE_Int         *nnzrow;
    HYPRE_BigInt      *rows;
-   HYPRE_BigInt      *rows2;
+   HYPRE_BigInt      *rows_coo;
    HYPRE_BigInt      *cols;
    HYPRE_Real        *coefs;
    HYPRE_Int          i, j, k;
@@ -543,7 +661,7 @@ getParCSRMatrixData(HYPRE_ParCSRMatrix  A,
    num_nonzeros = hypre_CSRMatrixNumNonzeros(A_diag) + hypre_CSRMatrixNumNonzeros(A_offd);
    nnzrow = hypre_CTAlloc(HYPRE_Int,    nrows,        HYPRE_MEMORY_HOST);
    rows   = hypre_CTAlloc(HYPRE_BigInt, nrows,        HYPRE_MEMORY_HOST);
-   rows2  = hypre_CTAlloc(HYPRE_BigInt, num_nonzeros, HYPRE_MEMORY_HOST);
+   rows_coo  = hypre_CTAlloc(HYPRE_BigInt, num_nonzeros, HYPRE_MEMORY_HOST);
    cols   = hypre_CTAlloc(HYPRE_BigInt, num_nonzeros, HYPRE_MEMORY_HOST);
    coefs  = hypre_CTAlloc(HYPRE_Real,   num_nonzeros, HYPRE_MEMORY_HOST);
 
@@ -551,40 +669,40 @@ getParCSRMatrixData(HYPRE_ParCSRMatrix  A,
 #if 0
    for (i = 0; i < nrows; i++)
    {
-      nnzrow[i] = A_diag_i[i+1] - A_diag_i[i] +
-                  A_offd_i[i+1] - A_offd_i[i];
+      nnzrow[i] = A_diag_i[i + 1] - A_diag_i[i] +
+                  A_offd_i[i + 1] - A_offd_i[i];
       rows[i]   = ilower + i;
 
-      for (j = A_diag_i[i]; j < A_diag_i[i+1]; j++)
+      for (j = A_diag_i[i]; j < A_diag_i[i + 1]; j++)
       {
-         rows2[k]   = ilower + (HYPRE_BigInt) i;
+         rows_coo[k]   = ilower + (HYPRE_BigInt) i;
          cols[k]    = jlower + (HYPRE_BigInt) A_diag_j[j];
          coefs[k++] = hypre_CSRMatrixData(A_diag)[j];
       }
-      for (j = A_offd_i[i]; j < A_offd_i[i+1]; j++)
+      for (j = A_offd_i[i]; j < A_offd_i[i + 1]; j++)
       {
-         rows2[k]   = ilower + (HYPRE_BigInt) i;
+         rows_coo[k]   = ilower + (HYPRE_BigInt) i;
          cols[k]    = hypre_ParCSRMatrixColMapOffd(A)[A_offd_j[j]];
          coefs[k++] = hypre_CSRMatrixData(A_offd)[j];
       }
    }
 #else
-   for (i = nrows-1; i >= 0; i--)
+   for (i = nrows - 1; i >= 0; i--)
    {
-      nnzrow[nrows-1-i] = A_diag_i[i+1] - A_diag_i[i] +
-                          A_offd_i[i+1] - A_offd_i[i];
-      rows[nrows-1-i]   = ilower + i;
+      nnzrow[nrows - 1 - i] = A_diag_i[i + 1] - A_diag_i[i] +
+                              A_offd_i[i + 1] - A_offd_i[i];
+      rows[nrows - 1 - i]   = ilower + i + base;
 
-      for (j = A_diag_i[i]; j < A_diag_i[i+1]; j++)
+      for (j = A_diag_i[i]; j < A_diag_i[i + 1]; j++)
       {
-         rows2[k]   = ilower + (HYPRE_BigInt) i;
-         cols[k]    = jlower + (HYPRE_BigInt) A_diag_j[j];
+         rows_coo[k]   = ilower + (HYPRE_BigInt) i + base;
+         cols[k]    = jlower + (HYPRE_BigInt) A_diag_j[j] + base;
          coefs[k++] = hypre_CSRMatrixData(A_diag)[j];
       }
-      for (j = A_offd_i[i]; j < A_offd_i[i+1]; j++)
+      for (j = A_offd_i[i]; j < A_offd_i[i + 1]; j++)
       {
-         rows2[k]   = ilower + (HYPRE_BigInt) i;
-         cols[k]    = col_map_offd_A[A_offd_j[j]];
+         rows_coo[k]   = ilower + (HYPRE_BigInt) i + base;
+         cols[k]    = col_map_offd_A[A_offd_j[j]] + base;
          coefs[k++] = hypre_CSRMatrixData(A_offd)[j];
       }
    }
@@ -597,7 +715,7 @@ getParCSRMatrixData(HYPRE_ParCSRMatrix  A,
    *num_nonzeros_ptr = num_nonzeros;
    *nnzrow_ptr       = nnzrow;
    *rows_ptr         = rows;
-   *rows2_ptr        = rows2;
+   *rows_coo_ptr     = rows_coo;
    *cols_ptr         = cols;
    *coefs_ptr        = coefs;
 
@@ -605,506 +723,148 @@ getParCSRMatrixData(HYPRE_ParCSRMatrix  A,
 }
 
 
-HYPRE_Int
+HYPRE_Real
 checkMatrix(HYPRE_ParCSRMatrix h_parcsr_ref, HYPRE_IJMatrix ij_A)
 {
    MPI_Comm            comm         = hypre_IJMatrixComm(ij_A);
    HYPRE_ParCSRMatrix  parcsr_A     = (HYPRE_ParCSRMatrix) hypre_IJMatrixObject(ij_A);
    HYPRE_ParCSRMatrix  h_parcsr_A;
    HYPRE_ParCSRMatrix  parcsr_error;
-   HYPRE_Int           myid;
-   HYPRE_Real          fnorm;
-
-   hypre_MPI_Comm_rank(comm, &myid);
+   HYPRE_Real          fnorm_err, fnorm_ref, rel_err;
 
    h_parcsr_A = hypre_ParCSRMatrixClone_v2(parcsr_A, 1, HYPRE_MEMORY_HOST);
 
    // Check norm of (parcsr_ref - parcsr_A)
    hypre_ParCSRMatrixAdd(1.0, h_parcsr_ref, -1.0, h_parcsr_A, &parcsr_error);
-   fnorm = hypre_ParCSRMatrixFnorm(parcsr_error);
+   fnorm_err = hypre_ParCSRMatrixFnorm(parcsr_error);
+   fnorm_ref = hypre_ParCSRMatrixFnorm(h_parcsr_ref);
+   rel_err = fnorm_err / fnorm_ref;
 
-   if (myid == 0)
-   {
-      hypre_printf("Frobenius norm of (A_ref - A): %e\n", fnorm);
-   }
+   hypre_ParPrintf(comm, "||A_ref - A||_F / ||A_ref||_F: %e\n", rel_err);
 
    HYPRE_ParCSRMatrixDestroy(h_parcsr_A);
    HYPRE_ParCSRMatrixDestroy(parcsr_error);
 
-   return hypre_error_flag;
+   return rel_err;
 }
 
+/* ---------------------------------- *
+ * All test functions for assembly    *
+ * option = 1: length of nrows,       *
+ *        = 2: length of num_nonzeros *
+ * ---------------------------------- */
+
+/* set values */
 HYPRE_Int
-test_Set(MPI_Comm             comm,
+test_all(MPI_Comm             comm,
+         const char          *test_name,
          HYPRE_MemoryLocation memory_location,
-         HYPRE_Int            option,           /* 1 or 2 */
+         HYPRE_Int            option,
+         const char          *cmd_sequence,
          HYPRE_BigInt         ilower,
          HYPRE_BigInt         iupper,
+         HYPRE_BigInt         jlower,
+         HYPRE_BigInt         jupper,
          HYPRE_Int            nrows,
          HYPRE_BigInt         num_nonzeros,
          HYPRE_Int            nchunks,
+         HYPRE_Int            init_alloc,
+         HYPRE_Int            early_assemble,
+         HYPRE_Real           grow_factor,
          HYPRE_Int           *h_nnzrow,
          HYPRE_Int           *nnzrow,
-         HYPRE_BigInt        *rows,             /* option = 1: length of nrows, = 2: length of num_nonzeros */
+         HYPRE_BigInt        *rows,
          HYPRE_BigInt        *cols,
          HYPRE_Real          *coefs,
          HYPRE_IJMatrix      *ij_A_ptr)
 {
    HYPRE_IJMatrix  ij_A;
-   HYPRE_Int       i, chunk, chunk_size;
+   HYPRE_Int       i, j, chunk, chunk_size;
    HYPRE_Int       time_index;
-   HYPRE_Int      *h_rowptr;
-
-   HYPRE_IJMatrixCreate(comm, ilower, iupper, ilower, iupper, &ij_A);
-   HYPRE_IJMatrixSetObjectType(ij_A, HYPRE_PARCSR);
-   HYPRE_IJMatrixInitialize_v2(ij_A, memory_location);
-   HYPRE_IJMatrixSetOMPFlag(ij_A, 1);
-
-   h_rowptr = hypre_CTAlloc(HYPRE_Int, nrows+1, HYPRE_MEMORY_HOST);
-   for (i = 1; i < nrows + 1; i++)
-   {
-      h_rowptr[i] = h_rowptr[i-1] + h_nnzrow[i-1];
-   }
-   hypre_assert(h_rowptr[nrows] == num_nonzeros);
-
-   chunk_size = nrows / nchunks;
+   HYPRE_Int      *h_rowptr = hypre_CTAlloc(HYPRE_Int, nrows + 1, HYPRE_MEMORY_HOST);
+   HYPRE_Int       cmd_len = strlen(cmd_sequence);
+   HYPRE_Int       myid;
 
-#if defined(HYPRE_USING_GPU)
-   hypre_SyncCudaDevice(hypre_handle());
-#if defined(CUDA_PROFILER)
-   cudaProfilerStart();
-#endif
-#endif
-
-   time_index = hypre_InitializeTiming("Test SetValues");
-   hypre_BeginTiming(time_index);
-   for (chunk = 0; chunk < nrows; chunk += chunk_size)
-   {
-      chunk_size = hypre_min(chunk_size, nrows-chunk);
-
-      if (1 == option)
-      {
-         HYPRE_IJMatrixSetValues(ij_A, chunk_size, &nnzrow[chunk], &rows[chunk],
-                                 &cols[h_rowptr[chunk]], &coefs[h_rowptr[chunk]]);
-      }
-      else
-      {
-         HYPRE_IJMatrixSetValues(ij_A, h_rowptr[chunk+chunk_size]-h_rowptr[chunk],
-                                 NULL, &rows[h_rowptr[chunk]],
-                                 &cols[h_rowptr[chunk]], &coefs[h_rowptr[chunk]]);
-      }
-   }
-
-   // Assemble matrix
-   HYPRE_IJMatrixAssemble(ij_A);
-
-#if defined(HYPRE_USING_GPU)
-   hypre_SyncCudaDevice(hypre_handle());
-#if defined(CUDA_PROFILER)
-   cudaProfilerStop();
-#endif
-#endif
-
-   // Finalize timer
-   hypre_EndTiming(time_index);
-   hypre_PrintTiming("Test SetValues", hypre_MPI_COMM_WORLD);
-   hypre_FinalizeTiming(time_index);
-   hypre_ClearTiming();
-
-   // Free memory
-   hypre_TFree(h_rowptr, HYPRE_MEMORY_HOST);
-
-   // Set pointer to matrix
-   *ij_A_ptr = ij_A;
-
-   return hypre_error_flag;
-}
-
-HYPRE_Int
-test_SetOffProc(HYPRE_ParCSRMatrix    parcsr_A,
-                HYPRE_MemoryLocation  memory_location,
-                HYPRE_Int             nchunks,
-                HYPRE_Int             option,           /* 1 or 2 */
-                HYPRE_IJMatrix       *ij_AT_ptr)
-{
-   MPI_Comm            comm = hypre_ParCSRMatrixComm(parcsr_A);
-   HYPRE_ParCSRMatrix  parcsr_AT;
-   HYPRE_IJMatrix      ij_AT;
-
-   HYPRE_Int           nrows;
-   HYPRE_BigInt        num_nonzeros;
-   HYPRE_BigInt        ilower, iupper;
-
-   HYPRE_Int          *h_nnzrow;
-   HYPRE_BigInt       *h_rows1;
-   HYPRE_BigInt       *h_rows2;
-   HYPRE_BigInt       *h_cols;
-   HYPRE_Real         *h_coefs;
-
-   HYPRE_Int          *d_nnzrow;
-   HYPRE_BigInt       *d_rows;
-   HYPRE_BigInt       *d_cols;
-   HYPRE_Real         *d_coefs;
-
-   HYPRE_Int          *nnzrow;
-   HYPRE_BigInt       *rows;
-   HYPRE_BigInt       *cols;
-   HYPRE_Real         *coefs;
-
-   HYPRE_Int          *h_rowptr;
-
-   HYPRE_Int           time_index;
-   HYPRE_Int           chunk_size;
-   HYPRE_Int           chunk;
-   HYPRE_Int           i;
-
-   hypre_ParCSRMatrixTranspose(parcsr_A, &parcsr_AT, 1);
-   ilower = hypre_ParCSRMatrixFirstRowIndex(parcsr_AT);
-   iupper = hypre_ParCSRMatrixLastRowIndex(parcsr_AT);
-   getParCSRMatrixData(parcsr_AT, &nrows, &num_nonzeros, &h_nnzrow, &h_rows1, &h_rows2, &h_cols, &h_coefs);
-   HYPRE_ParCSRMatrixDestroy(parcsr_AT);
-
-   switch (memory_location)
-   {
-      case HYPRE_MEMORY_DEVICE:
-         d_nnzrow = hypre_TAlloc(HYPRE_Int,    nrows,        HYPRE_MEMORY_DEVICE);
-         d_cols   = hypre_TAlloc(HYPRE_BigInt, num_nonzeros, HYPRE_MEMORY_DEVICE);
-         d_coefs  = hypre_TAlloc(HYPRE_Real,   num_nonzeros, HYPRE_MEMORY_DEVICE);
-         if (option == 1)
-         {
-            d_rows  = hypre_TAlloc(HYPRE_BigInt, nrows,        HYPRE_MEMORY_DEVICE);
-            hypre_TMemcpy(d_rows,  h_rows1,  HYPRE_BigInt, nrows,        HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
-         }
-         else
-         {
-            d_rows  = hypre_TAlloc(HYPRE_BigInt, num_nonzeros, HYPRE_MEMORY_DEVICE);
-            hypre_TMemcpy(d_rows,  h_rows2,  HYPRE_BigInt, num_nonzeros, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
-         }
-         hypre_TMemcpy(d_nnzrow, h_nnzrow, HYPRE_Int,    nrows,        HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
-         hypre_TMemcpy(d_cols,   h_cols,   HYPRE_BigInt, num_nonzeros, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
-         hypre_TMemcpy(d_coefs,  h_coefs,  HYPRE_Real,   num_nonzeros, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
-
-         nnzrow = d_nnzrow;
-         rows   = d_rows;
-         cols   = d_cols;
-         coefs  = d_coefs;
-         break;
-
-      case HYPRE_MEMORY_HOST:
-         nnzrow = h_nnzrow;
-         rows   = (option == 1) ? h_rows1 : h_rows2;
-         cols   = h_cols;
-         coefs  = h_coefs;
-         break;
-
-      case HYPRE_MEMORY_UNDEFINED:
-         return -1;
-   }
-
-   // Create transpose with SetValues
-   HYPRE_IJMatrixCreate(comm, ilower, iupper, ilower, iupper, &ij_AT);
-   HYPRE_IJMatrixSetObjectType(ij_AT, HYPRE_PARCSR);
-   HYPRE_IJMatrixInitialize_v2(ij_AT, memory_location);
-   HYPRE_IJMatrixSetOMPFlag(ij_AT, 1);
+   hypre_MPI_Comm_rank(comm, &myid);
 
-   h_rowptr = hypre_CTAlloc(HYPRE_Int, nrows+1, HYPRE_MEMORY_HOST);
    for (i = 1; i < nrows + 1; i++)
    {
-      h_rowptr[i] = h_rowptr[i-1] + h_nnzrow[i-1];
+      h_rowptr[i] = h_rowptr[i - 1] + h_nnzrow[i - 1];
    }
    hypre_assert(h_rowptr[nrows] == num_nonzeros);
 
-   chunk_size = nrows / nchunks;
-
-#if defined(HYPRE_USING_GPU)
-   hypre_SyncCudaDevice(hypre_handle());
-#endif
-
-   time_index = hypre_InitializeTiming("Test SetValues OffProc");
-   hypre_BeginTiming(time_index);
-
-   //cudaProfilerStart();
-
-   for (chunk = 0; chunk < nrows; chunk += chunk_size)
-   {
-      chunk_size = hypre_min(chunk_size, nrows-chunk);
-
-      if (1 == option)
-      {
-         HYPRE_IJMatrixSetValues(ij_AT, chunk_size, &nnzrow[chunk], &rows[chunk],
-                                 &cols[h_rowptr[chunk]], &coefs[h_rowptr[chunk]]);
-      }
-      else
-      {
-         HYPRE_IJMatrixSetValues(ij_AT, h_rowptr[chunk+chunk_size]-h_rowptr[chunk],
-                                 NULL, &rows[h_rowptr[chunk]],
-                                 &cols[h_rowptr[chunk]], &coefs[h_rowptr[chunk]]);
-      }
-   }
-
-   // Assemble matrix
-   HYPRE_IJMatrixAssemble(ij_AT);
-
-   //cudaProfilerStop();
-
-#if defined(HYPRE_USING_GPU)
-   hypre_SyncCudaDevice(hypre_handle());
-#endif
-
-   hypre_EndTiming(time_index);
-   hypre_PrintTiming("Test SetValues OffProc", hypre_MPI_COMM_WORLD);
-   hypre_FinalizeTiming(time_index);
-   hypre_ClearTiming();
-
-   // Set pointer to output
-   *ij_AT_ptr = ij_AT;
-
-   // Free memory
-   hypre_TFree(h_rowptr, HYPRE_MEMORY_HOST);
-   if (memory_location == HYPRE_MEMORY_DEVICE)
-   {
-      hypre_TFree(d_nnzrow, HYPRE_MEMORY_DEVICE);
-      hypre_TFree(d_rows,   HYPRE_MEMORY_DEVICE);
-      hypre_TFree(d_cols,   HYPRE_MEMORY_DEVICE);
-      hypre_TFree(d_coefs,  HYPRE_MEMORY_DEVICE);
-   }
-   hypre_TFree(h_nnzrow, HYPRE_MEMORY_HOST);
-   hypre_TFree(h_rows1,  HYPRE_MEMORY_HOST);
-   hypre_TFree(h_rows2,  HYPRE_MEMORY_HOST);
-   hypre_TFree(h_cols,   HYPRE_MEMORY_HOST);
-   hypre_TFree(h_coefs,  HYPRE_MEMORY_HOST);
-
-   return hypre_error_flag;
-}
-
-HYPRE_Int
-test_SetSet(MPI_Comm             comm,
-            HYPRE_MemoryLocation memory_location,
-            HYPRE_Int            option,           /* 1 or 2 */
-            HYPRE_BigInt         ilower,
-            HYPRE_BigInt         iupper,
-            HYPRE_Int            nrows,
-            HYPRE_BigInt         num_nonzeros,
-            HYPRE_Int            nchunks,
-            HYPRE_Int           *h_nnzrow,
-            HYPRE_Int           *nnzrow,
-            HYPRE_BigInt        *rows,             /* option = 1: length of nrows, = 2: length of num_nonzeros */
-            HYPRE_BigInt        *cols,
-            HYPRE_Real          *coefs,
-            HYPRE_IJMatrix      *ij_A_ptr)
-{
-   HYPRE_IJMatrix  ij_A;
-   HYPRE_Int       i, chunk, chunk_size;
-   HYPRE_Int       time_index;
-   HYPRE_Int      *h_rowptr;
-   HYPRE_Real     *new_coefs;
-
-   HYPRE_IJMatrixCreate(comm, ilower, iupper, ilower, iupper, &ij_A);
+   HYPRE_IJMatrixCreate(comm, ilower, iupper, jlower, jupper, &ij_A);
    HYPRE_IJMatrixSetObjectType(ij_A, HYPRE_PARCSR);
    HYPRE_IJMatrixInitialize_v2(ij_A, memory_location);
    HYPRE_IJMatrixSetOMPFlag(ij_A, 1);
-
-   h_rowptr = hypre_CTAlloc(HYPRE_Int, nrows+1, HYPRE_MEMORY_HOST);
-   for (i = 1; i < nrows + 1; i++)
+   grow_factor = myid ? grow_factor : 2 * grow_factor;
+   if (init_alloc >= 0)
    {
-      h_rowptr[i] = h_rowptr[i-1] + h_nnzrow[i-1];
+      HYPRE_IJMatrixSetInitAllocation(ij_A, init_alloc);
    }
-   hypre_assert(h_rowptr[nrows] == num_nonzeros);
-
-   chunk_size = nrows / nchunks;
-   new_coefs = hypre_TAlloc(HYPRE_Real, num_nonzeros, memory_location);
-
-   if (hypre_GetActualMemLocation(memory_location) == hypre_MEMORY_HOST)
-   {
-      for (i = 0; i < num_nonzeros; i++)
-      {
-         new_coefs[i] = 2.0*coefs[i];
-      }
-   }
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-   else
+   HYPRE_IJMatrixSetEarlyAssemble(ij_A, early_assemble);
+   if (grow_factor > 0)
    {
-      hypre_TMemcpy(new_coefs, coefs, HYPRE_Real, num_nonzeros, memory_location, memory_location);
-      hypreDevice_Scalen(new_coefs, num_nonzeros, 2.0);
+      HYPRE_IJMatrixSetGrowFactor(ij_A, grow_factor);
    }
-#endif
-
-#if defined(HYPRE_USING_GPU)
-   hypre_SyncCudaDevice(hypre_handle());
-#if defined(CUDA_PROFILER)
-   cudaProfilerStart();
-#endif
-#endif
-
-   // First Set
-   time_index = hypre_InitializeTiming("Test Set/Set");
-   hypre_BeginTiming(time_index);
-   for (chunk = 0; chunk < nrows; chunk += chunk_size)
-   {
-      chunk_size = hypre_min(chunk_size, nrows-chunk);
-
-      if (1 == option)
-      {
-         HYPRE_IJMatrixSetValues(ij_A, chunk_size, &nnzrow[chunk], &rows[chunk],
-                                 &cols[h_rowptr[chunk]], &new_coefs[h_rowptr[chunk]]);
-      }
-      else
-      {
-         HYPRE_IJMatrixSetValues(ij_A, h_rowptr[chunk+chunk_size]-h_rowptr[chunk],
-                                 NULL, &rows[h_rowptr[chunk]],
-                                 &cols[h_rowptr[chunk]], &new_coefs[h_rowptr[chunk]]);
-      }
-   }
-
-   // Assemble matrix
-   HYPRE_IJMatrixAssemble(ij_A);
-
-   // Second set
-   for (chunk = 0; chunk < nrows; chunk += chunk_size)
-   {
-      chunk_size = hypre_min(chunk_size, nrows-chunk);
-
-      if (1 == option)
-      {
-         HYPRE_IJMatrixSetValues(ij_A, chunk_size, &nnzrow[chunk], &rows[chunk],
-                                 &cols[h_rowptr[chunk]], &coefs[h_rowptr[chunk]]);
-      }
-      else
-      {
-         HYPRE_IJMatrixSetValues(ij_A, h_rowptr[chunk+chunk_size]-h_rowptr[chunk],
-                                 NULL, &rows[h_rowptr[chunk]],
-                                 &cols[h_rowptr[chunk]], &coefs[h_rowptr[chunk]]);
-      }
-   }
-
-   // Assemble matrix
-   HYPRE_IJMatrixAssemble(ij_A);
-
-#if defined(HYPRE_USING_GPU)
-   hypre_SyncCudaDevice(hypre_handle());
-#if defined(CUDA_PROFILER)
-   cudaProfilerStop();
-#endif
-#endif
-
-   // Finalize timer
-   hypre_EndTiming(time_index);
-   hypre_PrintTiming("Test Set/Set", hypre_MPI_COMM_WORLD);
-   hypre_FinalizeTiming(time_index);
-   hypre_ClearTiming();
-
-   // Free memory
-   hypre_TFree(h_rowptr, HYPRE_MEMORY_HOST);
-   hypre_TFree(new_coefs, memory_location);
-
-   // Set pointer to matrix
-   *ij_A_ptr = ij_A;
-
-   return hypre_error_flag;
-}
-
-HYPRE_Int
-test_AddSet(MPI_Comm             comm,
-            HYPRE_MemoryLocation memory_location,
-            HYPRE_Int            option,           /* 1 or 2 */
-            HYPRE_BigInt         ilower,
-            HYPRE_BigInt         iupper,
-            HYPRE_Int            nrows,
-            HYPRE_BigInt         num_nonzeros,
-            HYPRE_Int            nchunks,
-            HYPRE_Int           *h_nnzrow,
-            HYPRE_Int           *nnzrow,
-            HYPRE_BigInt        *rows,             /* option = 1: length of nrows, = 2: length of num_nonzeros */
-            HYPRE_BigInt        *cols,
-            HYPRE_Real          *coefs,
-            HYPRE_IJMatrix      *ij_A_ptr)
-{
-   HYPRE_IJMatrix  ij_A;
-   HYPRE_Int       i, chunk, chunk_size;
-   HYPRE_Int       time_index;
-   HYPRE_Int      *h_rowptr;
-   HYPRE_Real     *new_coefs;
-
-   HYPRE_IJMatrixCreate(comm, ilower, iupper, ilower, iupper, &ij_A);
-   HYPRE_IJMatrixSetObjectType(ij_A, HYPRE_PARCSR);
-   HYPRE_IJMatrixInitialize_v2(ij_A, memory_location);
-   HYPRE_IJMatrixSetOMPFlag(ij_A, 1);
-
-   h_rowptr = hypre_CTAlloc(HYPRE_Int, nrows+1, HYPRE_MEMORY_HOST);
-   for (i = 1; i < nrows + 1; i++)
-   {
-      h_rowptr[i] = h_rowptr[i-1] + h_nnzrow[i-1];
-   }
-   hypre_assert(h_rowptr[nrows] == num_nonzeros);
 
    chunk_size = nrows / nchunks;
-   new_coefs = hypre_TAlloc(HYPRE_Real, num_nonzeros, memory_location);
-
-   if (hypre_GetActualMemLocation(memory_location) == hypre_MEMORY_HOST)
-   {
-      for (i = 0; i < num_nonzeros; i++)
-      {
-         new_coefs[i] = 2.0*coefs[i];
-      }
-   }
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-   else
-   {
-      hypre_TMemcpy(new_coefs, coefs, HYPRE_Real, num_nonzeros, memory_location, memory_location);
-      hypreDevice_Scalen(new_coefs, num_nonzeros, 2.0);
-   }
-#endif
 
 #if defined(HYPRE_USING_GPU)
-   hypre_SyncCudaDevice(hypre_handle());
+   hypre_SyncDevice();
 #if defined(CUDA_PROFILER)
    cudaProfilerStart();
 #endif
 #endif
 
-   // First Add
-   time_index = hypre_InitializeTiming("Test Add/Set");
+   time_index = hypre_InitializeTiming(test_name);
    hypre_BeginTiming(time_index);
-   for (chunk = 0; chunk < nrows; chunk += chunk_size)
-   {
-      chunk_size = hypre_min(chunk_size, nrows-chunk);
 
-      if (1 == option)
-      {
-         HYPRE_IJMatrixAddToValues(ij_A, chunk_size, &nnzrow[chunk], &rows[chunk],
-                                   &cols[h_rowptr[chunk]], &new_coefs[h_rowptr[chunk]]);
-      }
-      else
-      {
-         HYPRE_IJMatrixAddToValues(ij_A, h_rowptr[chunk+chunk_size]-h_rowptr[chunk],
-                                   NULL, &rows[h_rowptr[chunk]],
-                                   &cols[h_rowptr[chunk]], &new_coefs[h_rowptr[chunk]]);
-      }
-   }
-
-   // Then Set
-   for (chunk = 0; chunk < nrows; chunk += chunk_size)
+   for (j = 0; j < cmd_len; j++)
    {
-      chunk_size = hypre_min(chunk_size, nrows-chunk);
-
-      if (1 == option)
+      if (cmd_sequence[j] == 's' || cmd_sequence[j] == 'a')
       {
-         HYPRE_IJMatrixSetValues(ij_A, chunk_size, &nnzrow[chunk], &rows[chunk],
-                                 &cols[h_rowptr[chunk]], &coefs[h_rowptr[chunk]]);
+         for (chunk = 0; chunk < nrows; chunk += chunk_size)
+         {
+            chunk_size = hypre_min(chunk_size, nrows - chunk);
+            if (1 == option)
+            {
+               if (cmd_sequence[j] == 's')
+               {
+                  HYPRE_IJMatrixSetValues(ij_A, chunk_size, &nnzrow[chunk], &rows[chunk],
+                                          &cols[h_rowptr[chunk]], &coefs[h_rowptr[chunk]]);
+               }
+               else
+               {
+                  HYPRE_IJMatrixAddToValues(ij_A, chunk_size, &nnzrow[chunk], &rows[chunk],
+                                            &cols[h_rowptr[chunk]], &coefs[h_rowptr[chunk]]);
+               }
+            }
+            else
+            {
+               if (cmd_sequence[j] == 's')
+               {
+                  HYPRE_IJMatrixSetValues(ij_A, h_rowptr[chunk + chunk_size] - h_rowptr[chunk],
+                                          NULL, &rows[h_rowptr[chunk]],
+                                          &cols[h_rowptr[chunk]], &coefs[h_rowptr[chunk]]);
+               }
+               else
+               {
+                  HYPRE_IJMatrixAddToValues(ij_A, h_rowptr[chunk + chunk_size] - h_rowptr[chunk],
+                                            NULL, &rows[h_rowptr[chunk]],
+                                            &cols[h_rowptr[chunk]], &coefs[h_rowptr[chunk]]);
+               }
+            }
+         }
       }
-      else
+      else if (cmd_sequence[j] == 'A')
       {
-         HYPRE_IJMatrixSetValues(ij_A, h_rowptr[chunk+chunk_size]-h_rowptr[chunk],
-                                 NULL, &rows[h_rowptr[chunk]],
-                                 &cols[h_rowptr[chunk]], &coefs[h_rowptr[chunk]]);
+         HYPRE_IJMatrixAssemble(ij_A);
       }
    }
 
-   // Assemble matrix
-   HYPRE_IJMatrixAssemble(ij_A);
-
 #if defined(HYPRE_USING_GPU)
-   hypre_SyncCudaDevice(hypre_handle());
+   hypre_SyncDevice();
 #if defined(CUDA_PROFILER)
    cudaProfilerStop();
 #endif
@@ -1112,13 +872,12 @@ test_AddSet(MPI_Comm             comm,
 
    // Finalize timer
    hypre_EndTiming(time_index);
-   hypre_PrintTiming("Test Add/Set", hypre_MPI_COMM_WORLD);
+   hypre_PrintTiming(test_name, hypre_MPI_COMM_WORLD);
    hypre_FinalizeTiming(time_index);
    hypre_ClearTiming();
 
    // Free memory
    hypre_TFree(h_rowptr, HYPRE_MEMORY_HOST);
-   hypre_TFree(new_coefs, memory_location);
 
    // Set pointer to matrix
    *ij_A_ptr = ij_A;
@@ -1126,124 +885,7 @@ test_AddSet(MPI_Comm             comm,
    return hypre_error_flag;
 }
 
-HYPRE_Int
-test_SetAddSet(MPI_Comm             comm,
-               HYPRE_MemoryLocation memory_location,
-               HYPRE_Int            option,           /* 1 or 2 */
-               HYPRE_BigInt         ilower,
-               HYPRE_BigInt         iupper,
-               HYPRE_Int            nrows,
-               HYPRE_BigInt         num_nonzeros,
-               HYPRE_Int            nchunks,
-               HYPRE_Int           *h_nnzrow,
-               HYPRE_Int           *nnzrow,
-               HYPRE_BigInt        *rows,             /* option = 1: length of nrows, = 2: length of num_nonzeros */
-               HYPRE_BigInt        *cols,
-               HYPRE_Real          *coefs,
-               HYPRE_IJMatrix      *ij_A_ptr)
-{
-   HYPRE_IJMatrix  ij_A;
-   HYPRE_Int       i, chunk, chunk_size;
-   HYPRE_Int       time_index;
-   HYPRE_Int      *h_rowptr;
-
-   HYPRE_IJMatrixCreate(comm, ilower, iupper, ilower, iupper, &ij_A);
-   HYPRE_IJMatrixSetObjectType(ij_A, HYPRE_PARCSR);
-   HYPRE_IJMatrixInitialize_v2(ij_A, memory_location);
-   HYPRE_IJMatrixSetOMPFlag(ij_A, 1);
-
-   h_rowptr = hypre_CTAlloc(HYPRE_Int, nrows+1, HYPRE_MEMORY_HOST);
-   for (i = 1; i < nrows + 1; i++)
-   {
-      h_rowptr[i] = h_rowptr[i-1] + h_nnzrow[i-1];
-   }
-   hypre_assert(h_rowptr[nrows] == num_nonzeros);
-   chunk_size = nrows / nchunks;
-
-#if defined(HYPRE_USING_GPU)
-   hypre_SyncCudaDevice(hypre_handle());
-#if defined(CUDA_PROFILER)
-   cudaProfilerStart();
-#endif
-#endif
-
-   // First Set
-   time_index = hypre_InitializeTiming("Test Set/Add/Set");
-   hypre_BeginTiming(time_index);
-   for (chunk = 0; chunk < nrows; chunk += chunk_size)
-   {
-      chunk_size = hypre_min(chunk_size, nrows-chunk);
 
-      if (1 == option)
-      {
-         HYPRE_IJMatrixSetValues(ij_A, chunk_size, &nnzrow[chunk], &rows[chunk],
-                                 &cols[h_rowptr[chunk]], &coefs[h_rowptr[chunk]]);
-      }
-      else
-      {
-         HYPRE_IJMatrixSetValues(ij_A, h_rowptr[chunk+chunk_size]-h_rowptr[chunk],
-                                 NULL, &rows[h_rowptr[chunk]],
-                                 &cols[h_rowptr[chunk]], &coefs[h_rowptr[chunk]]);
-      }
-   }
 
-   // Then Add
-   for (chunk = 0; chunk < nrows; chunk += chunk_size)
-   {
-      chunk_size = hypre_min(chunk_size, nrows-chunk);
 
-      if (1 == option)
-      {
-         HYPRE_IJMatrixAddToValues(ij_A, chunk_size, &nnzrow[chunk], &rows[chunk],
-                                   &cols[h_rowptr[chunk]], &coefs[h_rowptr[chunk]]);
-      }
-      else
-      {
-         HYPRE_IJMatrixAddToValues(ij_A, h_rowptr[chunk+chunk_size]-h_rowptr[chunk],
-                                   NULL, &rows[h_rowptr[chunk]],
-                                   &cols[h_rowptr[chunk]], &coefs[h_rowptr[chunk]]);
-      }
-   }
-
-   // Then Set
-   for (chunk = 0; chunk < nrows; chunk += chunk_size)
-   {
-      chunk_size = hypre_min(chunk_size, nrows-chunk);
 
-      if (1 == option)
-      {
-         HYPRE_IJMatrixSetValues(ij_A, chunk_size, &nnzrow[chunk], &rows[chunk],
-                                 &cols[h_rowptr[chunk]], &coefs[h_rowptr[chunk]]);
-      }
-      else
-      {
-         HYPRE_IJMatrixSetValues(ij_A, h_rowptr[chunk+chunk_size]-h_rowptr[chunk],
-                                 NULL, &rows[h_rowptr[chunk]],
-                                 &cols[h_rowptr[chunk]], &coefs[h_rowptr[chunk]]);
-      }
-   }
-
-   // Assemble matrix
-   HYPRE_IJMatrixAssemble(ij_A);
-
-#if defined(HYPRE_USING_GPU)
-   hypre_SyncCudaDevice(hypre_handle());
-#if defined(CUDA_PROFILER)
-   cudaProfilerStop();
-#endif
-#endif
-
-   // Finalize timer
-   hypre_EndTiming(time_index);
-   hypre_PrintTiming("Test Set/Add/Set", hypre_MPI_COMM_WORLD);
-   hypre_FinalizeTiming(time_index);
-   hypre_ClearTiming();
-
-   // Free memory
-   hypre_TFree(h_rowptr, HYPRE_MEMORY_HOST);
-
-   // Set pointer to matrix
-   *ij_A_ptr = ij_A;
-
-   return hypre_error_flag;
-}
diff --git a/external/hypre/src/test/ij_device.c b/external/hypre/src/test/ij_device.c
index bdc98f66..a1fd59fe 100644
--- a/external/hypre/src/test/ij_device.c
+++ b/external/hypre/src/test/ij_device.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -34,27 +34,41 @@ extern "C" {
 
 
 
-HYPRE_Int BuildParFromFile (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix *A_ptr );
-HYPRE_Int BuildParRhsFromFile (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParVector *b_ptr );
-
-HYPRE_Int BuildParLaplacian (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix *A_ptr );
-HYPRE_Int BuildParSysLaplacian (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix *A_ptr );
-HYPRE_Int BuildParDifConv (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix *A_ptr);
-HYPRE_Int BuildFuncsFromFiles (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix A , HYPRE_Int **dof_func_ptr );
-HYPRE_Int BuildFuncsFromOneFile (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix A , HYPRE_Int **dof_func_ptr );
-HYPRE_Int BuildParLaplacian9pt (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix *A_ptr );
-HYPRE_Int BuildParLaplacian27pt (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix *A_ptr );
-HYPRE_Int BuildParRotate7pt (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix *A_ptr );
-HYPRE_Int BuildParVarDifConv (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix *A_ptr , HYPRE_ParVector *rhs_ptr );
+HYPRE_Int BuildParFromFile (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                            HYPRE_ParCSRMatrix *A_ptr );
+HYPRE_Int BuildParRhsFromFile (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                               HYPRE_ParVector *b_ptr );
+
+HYPRE_Int BuildParLaplacian (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                             HYPRE_ParCSRMatrix *A_ptr );
+HYPRE_Int BuildParSysLaplacian (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                                HYPRE_ParCSRMatrix *A_ptr );
+HYPRE_Int BuildParDifConv (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                           HYPRE_ParCSRMatrix *A_ptr);
+HYPRE_Int BuildFuncsFromFiles (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                               HYPRE_ParCSRMatrix A, HYPRE_Int **dof_func_ptr );
+HYPRE_Int BuildFuncsFromOneFile (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                                 HYPRE_ParCSRMatrix A, HYPRE_Int **dof_func_ptr );
+HYPRE_Int BuildParLaplacian9pt (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                                HYPRE_ParCSRMatrix *A_ptr );
+HYPRE_Int BuildParLaplacian27pt (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                                 HYPRE_ParCSRMatrix *A_ptr );
+HYPRE_Int BuildParRotate7pt (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                             HYPRE_ParCSRMatrix *A_ptr );
+HYPRE_Int BuildParVarDifConv (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                              HYPRE_ParCSRMatrix *A_ptr, HYPRE_ParVector *rhs_ptr );
 HYPRE_ParCSRMatrix GenerateSysLaplacian (MPI_Comm comm, HYPRE_Int nx, HYPRE_Int ny, HYPRE_Int nz,
                                          HYPRE_Int P, HYPRE_Int Q, HYPRE_Int R, HYPRE_Int p, HYPRE_Int q, HYPRE_Int r,
                                          HYPRE_Int num_fun, HYPRE_Real *mtrx, HYPRE_Real *value);
-HYPRE_ParCSRMatrix GenerateSysLaplacianVCoef (MPI_Comm comm, HYPRE_Int nx, HYPRE_Int ny, HYPRE_Int nz,
+HYPRE_ParCSRMatrix GenerateSysLaplacianVCoef (MPI_Comm comm, HYPRE_Int nx, HYPRE_Int ny,
+                                              HYPRE_Int nz,
                                               HYPRE_Int P, HYPRE_Int Q, HYPRE_Int R, HYPRE_Int p, HYPRE_Int q, HYPRE_Int r,
                                               HYPRE_Int num_fun, HYPRE_Real *mtrx, HYPRE_Real *value);
-HYPRE_Int SetSysVcoefValues(HYPRE_Int num_fun, HYPRE_Int nx, HYPRE_Int ny, HYPRE_Int nz, HYPRE_Real vcx, HYPRE_Real vcy, HYPRE_Real vcz, HYPRE_Int mtx_entry, HYPRE_Real *values);
+HYPRE_Int SetSysVcoefValues(HYPRE_Int num_fun, HYPRE_Int nx, HYPRE_Int ny, HYPRE_Int nz,
+                            HYPRE_Real vcx, HYPRE_Real vcy, HYPRE_Real vcz, HYPRE_Int mtx_entry, HYPRE_Real *values);
 
-HYPRE_Int BuildParCoordinates (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_Int *coorddim_ptr , float **coord_ptr );
+HYPRE_Int BuildParCoordinates (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                               HYPRE_Int *coorddim_ptr, float **coord_ptr );
 
 void testPMIS(HYPRE_ParCSRMatrix parcsr_A);
 void testPMIS2(HYPRE_ParCSRMatrix parcsr_A);
@@ -102,14 +116,14 @@ main( hypre_int argc,
 
    /*-----------------------------------------------------------------
     * GPU Device binding
-    * Must be done before HYPRE_Init() and should not be changed after
+    * Must be done before HYPRE_Initialize() and should not be changed after
     *-----------------------------------------------------------------*/
-   hypre_bind_device(myid, num_procs, hypre_MPI_COMM_WORLD);
+   hypre_bind_device_id(myid, num_procs, hypre_MPI_COMM_WORLD);
 
    /*-----------------------------------------------------------
     * Initialize : must be the first HYPRE function to call
     *-----------------------------------------------------------*/
-   HYPRE_Init();
+   HYPRE_Initialize();
 
    hypre_SetNumThreads(5);
    hypre_printf("CPU #OMP THREADS %d\n", hypre_NumThreads());
@@ -210,7 +224,7 @@ main( hypre_int argc,
     * Print driver parameters
     *-----------------------------------------------------------*/
 
-   HYPRE_SetSpGemmUseCusparse(0);
+   HYPRE_SetSpGemmUseVendor(0);
    /* use cuRand for PMIS */
    HYPRE_SetUseGpuRand(1);
 
@@ -257,7 +271,7 @@ main( hypre_int argc,
    {
       hypre_printf("You have asked for an unsupported problem with\n");
       hypre_printf("build_matrix_type = %d.\n", build_matrix_type);
-      return(-1);
+      return (-1);
    }
 
    if (build_matrix_type < 0)
@@ -312,7 +326,7 @@ main( hypre_int argc,
       HYPRE_ParCSRMatrixDestroy(parcsr_A);
    }
 
- final:
+final:
 
    /* Finalize Hypre */
    HYPRE_Finalize();
@@ -322,7 +336,7 @@ main( hypre_int argc,
 
    /* when using cuda-memcheck --leak-check full, uncomment this */
 #if defined(HYPRE_USING_GPU)
-   hypre_ResetCudaDevice(hypre_handle());
+   hypre_ResetDevice();
 #endif
 
    return (0);
@@ -382,7 +396,7 @@ BuildParFromFile( HYPRE_Int            argc,
     * Generate the matrix
     *-----------------------------------------------------------*/
 
-   HYPRE_ParCSRMatrixRead(hypre_MPI_COMM_WORLD, filename,&A);
+   HYPRE_ParCSRMatrixRead(hypre_MPI_COMM_WORLD, filename, &A);
 
    *A_ptr = A;
 
@@ -442,7 +456,7 @@ BuildParRhsFromFile( HYPRE_Int            argc,
     * Generate the matrix
     *-----------------------------------------------------------*/
 
-   HYPRE_ParVectorRead(hypre_MPI_COMM_WORLD, filename,&b);
+   HYPRE_ParVectorRead(hypre_MPI_COMM_WORLD, filename, &b);
 
    *b_ptr = b;
 
@@ -528,9 +542,9 @@ BuildParLaplacian( HYPRE_Int            argc,
       else if ( strcmp(argv[arg_index], "-c") == 0 )
       {
          arg_index++;
-         cx = atof(argv[arg_index++]);
-         cy = atof(argv[arg_index++]);
-         cz = atof(argv[arg_index++]);
+         cx = (HYPRE_Real)atof(argv[arg_index++]);
+         cy = (HYPRE_Real)atof(argv[arg_index++]);
+         cz = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-sysL") == 0 )
       {
@@ -556,7 +570,7 @@ BuildParLaplacian( HYPRE_Int            argc,
       else if ( strcmp(argv[arg_index], "-ep") == 0 )
       {
          arg_index++;
-         ep = atof(argv[arg_index++]);
+         ep = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else
       {
@@ -568,7 +582,7 @@ BuildParLaplacian( HYPRE_Int            argc,
     * Check a few things
     *-----------------------------------------------------------*/
 
-   if ((P*Q*R) != num_procs)
+   if ((P * Q * R) != num_procs)
    {
       hypre_printf("Error: Invalid number of processors or processor topology \n");
       exit(1);
@@ -592,8 +606,8 @@ BuildParLaplacian( HYPRE_Int            argc,
 
    /* compute p,q,r from P,Q,R and myid */
    p = myid % P;
-   q = (( myid - p)/P) % Q;
-   r = ( myid - p - P*q)/( P*Q );
+   q = (( myid - p) / P) % Q;
+   r = ( myid - p - P * q) / ( P * Q );
 
    /*-----------------------------------------------------------
     * Generate the matrix
@@ -608,15 +622,15 @@ BuildParLaplacian( HYPRE_Int            argc,
    values[0] = 0.;
    if (nx > 1)
    {
-      values[0] += 2.0*cx;
+      values[0] += 2.0 * cx;
    }
    if (ny > 1)
    {
-      values[0] += 2.0*cy;
+      values[0] += 2.0 * cy;
    }
    if (nz > 1)
    {
-      values[0] += 2.0*cz;
+      values[0] += 2.0 * cz;
    }
 
    if (num_fun == 1)
@@ -624,46 +638,46 @@ BuildParLaplacian( HYPRE_Int            argc,
                                                  nx, ny, nz, P, Q, R, p, q, r, values);
    else
    {
-      mtrx = hypre_CTAlloc(HYPRE_Real,  num_fun*num_fun, HYPRE_MEMORY_HOST);
+      mtrx = hypre_CTAlloc(HYPRE_Real,  num_fun * num_fun, HYPRE_MEMORY_HOST);
 
       if (num_fun == 2)
       {
-         if (sys_opt ==1) /* identity  */
+         if (sys_opt == 1) /* identity  */
          {
             mtrx[0] = 1.0;
             mtrx[1] = 0.0;
             mtrx[2] = 0.0;
             mtrx[3] = 1.0;
          }
-         else if (sys_opt ==2)
+         else if (sys_opt == 2)
          {
             mtrx[0] = 1.0;
             mtrx[1] = 0.0;
             mtrx[2] = 0.0;
             mtrx[3] = 20.0;
          }
-         else if (sys_opt ==3) /* similar to barry's talk - ex1 */
+         else if (sys_opt == 3) /* similar to barry's talk - ex1 */
          {
             mtrx[0] = 1.0;
             mtrx[1] = 2.0;
             mtrx[2] = 2.0;
             mtrx[3] = 1.0;
          }
-         else if (sys_opt ==4) /* can use with vcoef to get barry's ex*/
+         else if (sys_opt == 4) /* can use with vcoef to get barry's ex*/
          {
             mtrx[0] = 1.0;
             mtrx[1] = 1.0;
             mtrx[2] = 1.0;
             mtrx[3] = 1.0;
          }
-         else if (sys_opt ==5) /* barry's talk - ex1 */
+         else if (sys_opt == 5) /* barry's talk - ex1 */
          {
             mtrx[0] = 1.0;
             mtrx[1] = 1.1;
             mtrx[2] = 1.1;
             mtrx[3] = 1.0;
          }
-         else if (sys_opt ==6) /*  */
+         else if (sys_opt == 6) /*  */
          {
             mtrx[0] = 1.1;
             mtrx[1] = 1.0;
@@ -681,7 +695,7 @@ BuildParLaplacian( HYPRE_Int            argc,
       }
       else if (num_fun == 3)
       {
-         if (sys_opt ==1)
+         if (sys_opt == 1)
          {
             mtrx[0] = 1.0;
             mtrx[1] = 0.0;
@@ -693,7 +707,7 @@ BuildParLaplacian( HYPRE_Int            argc,
             mtrx[7] = 0.0;
             mtrx[8] = 1.0;
          }
-         else if (sys_opt ==2)
+         else if (sys_opt == 2)
          {
             mtrx[0] = 1.0;
             mtrx[1] = 0.0;
@@ -703,9 +717,9 @@ BuildParLaplacian( HYPRE_Int            argc,
             mtrx[5] = 0.0;
             mtrx[6] = 0.0;
             mtrx[7] = 0.0;
-            mtrx[8] =.01;
+            mtrx[8] = .01;
          }
-         else if (sys_opt ==3)
+         else if (sys_opt == 3)
          {
             mtrx[0] = 1.01;
             mtrx[1] = 1;
@@ -717,7 +731,7 @@ BuildParLaplacian( HYPRE_Int            argc,
             mtrx[7] = 1;
             mtrx[8] = 1.01;
          }
-         else if (sys_opt ==4) /* barry ex4 */
+         else if (sys_opt == 4) /* barry ex4 */
          {
             mtrx[0] = 3;
             mtrx[1] = 1;
@@ -778,7 +792,7 @@ BuildParLaplacian( HYPRE_Int            argc,
 
          HYPRE_Real *mtrx_values;
 
-         mtrx_values = hypre_CTAlloc(HYPRE_Real,  num_fun*num_fun*4, HYPRE_MEMORY_HOST);
+         mtrx_values = hypre_CTAlloc(HYPRE_Real,  num_fun * num_fun * 4, HYPRE_MEMORY_HOST);
 
          if (num_fun == 2)
          {
@@ -818,13 +832,13 @@ BuildParLaplacian( HYPRE_Int            argc,
             {
 
                /* mtrx[0] */
-               SetSysVcoefValues(num_fun, nx, ny, nz, ep*1.0, 1.0, 1.0, 0, mtrx_values);
+               SetSysVcoefValues(num_fun, nx, ny, nz, ep * 1.0, 1.0, 1.0, 0, mtrx_values);
 
                /* mtrx[1] */
                SetSysVcoefValues(num_fun, nx, ny, nz, 1.0, 1.0, 1.0, 1, mtrx_values);
 
                /* mtrx[2] */
-               SetSysVcoefValues(num_fun, nx, ny, nz, ep*1.0, 1.0, 1.0, 2, mtrx_values);
+               SetSysVcoefValues(num_fun, nx, ny, nz, ep * 1.0, 1.0, 1.0, 2, mtrx_values);
 
                /* mtrx[3] */
                SetSysVcoefValues(num_fun, nx, ny, nz, 1.0, 1.0, 1.0, 3, mtrx_values);
@@ -834,16 +848,16 @@ BuildParLaplacian( HYPRE_Int            argc,
                HYPRE_Real ep2 = ep;
 
                /* mtrx[0] */
-               SetSysVcoefValues(num_fun, nx, ny, nz, ep*1.0, 1.0, 1.0, 0, mtrx_values);
+               SetSysVcoefValues(num_fun, nx, ny, nz, ep * 1.0, 1.0, 1.0, 0, mtrx_values);
 
                /* mtrx[1] */
-               SetSysVcoefValues(num_fun, nx, ny, nz, 1.0, ep*1.0, 1.0, 1, mtrx_values);
+               SetSysVcoefValues(num_fun, nx, ny, nz, 1.0, ep * 1.0, 1.0, 1, mtrx_values);
 
                /* mtrx[2] */
-               SetSysVcoefValues(num_fun, nx, ny, nz, ep*1.0, 1.0, 1.0, 2, mtrx_values);
+               SetSysVcoefValues(num_fun, nx, ny, nz, ep * 1.0, 1.0, 1.0, 2, mtrx_values);
 
                /* mtrx[3] */
-               SetSysVcoefValues(num_fun, nx, ny, nz, 1.0, ep2*1.0, 1.0, 3, mtrx_values);
+               SetSysVcoefValues(num_fun, nx, ny, nz, 1.0, ep2 * 1.0, 1.0, 3, mtrx_values);
             }
             else if (vcoef_opt == 5) /* use with default sys_opt  - */
             {
@@ -852,16 +866,16 @@ BuildParLaplacian( HYPRE_Int            argc,
                beta = 10;
 
                /* mtrx[0] */
-               SetSysVcoefValues(num_fun, nx, ny, nz, alp*1.0, 1.0, 1.0, 0, mtrx_values);
+               SetSysVcoefValues(num_fun, nx, ny, nz, alp * 1.0, 1.0, 1.0, 0, mtrx_values);
 
                /* mtrx[1] */
-               SetSysVcoefValues(num_fun, nx, ny, nz, 1.0, beta*1.0, 1.0, 1, mtrx_values);
+               SetSysVcoefValues(num_fun, nx, ny, nz, 1.0, beta * 1.0, 1.0, 1, mtrx_values);
 
                /* mtrx[2] */
-               SetSysVcoefValues(num_fun, nx, ny, nz, alp*1.0, 1.0, 1.0, 2, mtrx_values);
+               SetSysVcoefValues(num_fun, nx, ny, nz, alp * 1.0, 1.0, 1.0, 2, mtrx_values);
 
                /* mtrx[3] */
-               SetSysVcoefValues(num_fun, nx, ny, nz, 1.0, beta*1.0, 1.0, 3, mtrx_values);
+               SetSysVcoefValues(num_fun, nx, ny, nz, 1.0, beta * 1.0, 1.0, 3, mtrx_values);
             }
             else  /* = 0 */
             {
@@ -961,7 +975,7 @@ BuildParDifConv( HYPRE_Int            argc,
    HYPRE_Int           P, Q, R;
    HYPRE_Real          cx, cy, cz;
    HYPRE_Real          ax, ay, az, atype;
-   HYPRE_Real          hinx,hiny,hinz;
+   HYPRE_Real          hinx, hiny, hinz;
    HYPRE_Int           sign_prod;
 
    HYPRE_ParCSRMatrix  A;
@@ -1022,16 +1036,16 @@ BuildParDifConv( HYPRE_Int            argc,
       else if ( strcmp(argv[arg_index], "-c") == 0 )
       {
          arg_index++;
-         cx = atof(argv[arg_index++]);
-         cy = atof(argv[arg_index++]);
-         cz = atof(argv[arg_index++]);
+         cx = (HYPRE_Real)atof(argv[arg_index++]);
+         cy = (HYPRE_Real)atof(argv[arg_index++]);
+         cz = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-a") == 0 )
       {
          arg_index++;
-         ax = atof(argv[arg_index++]);
-         ay = atof(argv[arg_index++]);
-         az = atof(argv[arg_index++]);
+         ax = (HYPRE_Real)atof(argv[arg_index++]);
+         ay = (HYPRE_Real)atof(argv[arg_index++]);
+         az = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-atype") == 0 )
       {
@@ -1048,7 +1062,7 @@ BuildParDifConv( HYPRE_Int            argc,
     * Check a few things
     *-----------------------------------------------------------*/
 
-   if ((P*Q*R) != num_procs)
+   if ((P * Q * R) != num_procs)
    {
       hypre_printf("Error: Invalid number of processors or processor topology \n");
       exit(1);
@@ -1074,12 +1088,12 @@ BuildParDifConv( HYPRE_Int            argc,
 
    /* compute p,q,r from P,Q,R and myid */
    p = myid % P;
-   q = (( myid - p)/P) % Q;
-   r = ( myid - p - P*q)/( P*Q );
+   q = (( myid - p) / P) % Q;
+   r = ( myid - p - P * q) / ( P * Q );
 
-   hinx = 1./(nx+1);
-   hiny = 1./(ny+1);
-   hinz = 1./(nz+1);
+   hinx = 1. / (nx + 1);
+   hiny = 1. / (ny + 1);
+   hinz = 1. / (nz + 1);
 
    /*-----------------------------------------------------------
     * Generate the matrix
@@ -1099,46 +1113,46 @@ BuildParDifConv( HYPRE_Int            argc,
 
    if (0 == atype) /* forward scheme for conv */
    {
-      values[1] = -cx/(hinx*hinx);
-      values[2] = -cy/(hiny*hiny);
-      values[3] = -cz/(hinz*hinz);
-      values[4] = -cx/(hinx*hinx) + ax/hinx;
-      values[5] = -cy/(hiny*hiny) + ay/hiny;
-      values[6] = -cz/(hinz*hinz) + az/hinz;
+      values[1] = -cx / (hinx * hinx);
+      values[2] = -cy / (hiny * hiny);
+      values[3] = -cz / (hinz * hinz);
+      values[4] = -cx / (hinx * hinx) + ax / hinx;
+      values[5] = -cy / (hiny * hiny) + ay / hiny;
+      values[6] = -cz / (hinz * hinz) + az / hinz;
 
       if (nx > 1)
       {
-         values[0] += 2.0*cx/(hinx*hinx) - 1.*ax/hinx;
+         values[0] += 2.0 * cx / (hinx * hinx) - 1.*ax / hinx;
       }
       if (ny > 1)
       {
-         values[0] += 2.0*cy/(hiny*hiny) - 1.*ay/hiny;
+         values[0] += 2.0 * cy / (hiny * hiny) - 1.*ay / hiny;
       }
       if (nz > 1)
       {
-         values[0] += 2.0*cz/(hinz*hinz) - 1.*az/hinz;
+         values[0] += 2.0 * cz / (hinz * hinz) - 1.*az / hinz;
       }
    }
    else if (1 == atype) /* backward scheme for conv */
    {
-      values[1] = -cx/(hinx*hinx) - ax/hinx;
-      values[2] = -cy/(hiny*hiny) - ay/hiny;
-      values[3] = -cz/(hinz*hinz) - az/hinz;
-      values[4] = -cx/(hinx*hinx);
-      values[5] = -cy/(hiny*hiny);
-      values[6] = -cz/(hinz*hinz);
+      values[1] = -cx / (hinx * hinx) - ax / hinx;
+      values[2] = -cy / (hiny * hiny) - ay / hiny;
+      values[3] = -cz / (hinz * hinz) - az / hinz;
+      values[4] = -cx / (hinx * hinx);
+      values[5] = -cy / (hiny * hiny);
+      values[6] = -cz / (hinz * hinz);
 
       if (nx > 1)
       {
-         values[0] += 2.0*cx/(hinx*hinx) + 1.*ax/hinx;
+         values[0] += 2.0 * cx / (hinx * hinx) + 1.*ax / hinx;
       }
       if (ny > 1)
       {
-         values[0] += 2.0*cy/(hiny*hiny) + 1.*ay/hiny;
+         values[0] += 2.0 * cy / (hiny * hiny) + 1.*ay / hiny;
       }
       if (nz > 1)
       {
-         values[0] += 2.0*cz/(hinz*hinz) + 1.*az/hinz;
+         values[0] += 2.0 * cz / (hinz * hinz) + 1.*az / hinz;
       }
    }
    else if (3 == atype) /* upwind scheme */
@@ -1146,83 +1160,83 @@ BuildParDifConv( HYPRE_Int            argc,
       sign_prod = sign_double(cx) * sign_double(ax);
       if (sign_prod == 1) /* same sign use back scheme */
       {
-         values[1] = -cx/(hinx*hinx) - ax/hinx;
-         values[4] = -cx/(hinx*hinx);
+         values[1] = -cx / (hinx * hinx) - ax / hinx;
+         values[4] = -cx / (hinx * hinx);
          if (nx > 1)
          {
-            values[0] += 2.0*cx/(hinx*hinx) + 1.*ax/hinx;
+            values[0] += 2.0 * cx / (hinx * hinx) + 1.*ax / hinx;
          }
       }
       else /* diff sign use forward scheme */
       {
-         values[1] = -cx/(hinx*hinx);
-         values[4] = -cx/(hinx*hinx) + ax/hinx;
+         values[1] = -cx / (hinx * hinx);
+         values[4] = -cx / (hinx * hinx) + ax / hinx;
          if (nx > 1)
          {
-            values[0] += 2.0*cx/(hinx*hinx) - 1.*ax/hinx;
+            values[0] += 2.0 * cx / (hinx * hinx) - 1.*ax / hinx;
          }
       }
 
       sign_prod = sign_double(cy) * sign_double(ay);
       if (sign_prod == 1) /* same sign use back scheme */
       {
-         values[2] = -cy/(hiny*hiny) - ay/hiny;
-         values[5] = -cy/(hiny*hiny);
+         values[2] = -cy / (hiny * hiny) - ay / hiny;
+         values[5] = -cy / (hiny * hiny);
          if (ny > 1)
          {
-            values[0] += 2.0*cy/(hiny*hiny) + 1.*ay/hiny;
+            values[0] += 2.0 * cy / (hiny * hiny) + 1.*ay / hiny;
          }
       }
       else /* diff sign use forward scheme */
       {
-         values[2] = -cy/(hiny*hiny);
-         values[5] = -cy/(hiny*hiny) + ay/hiny;
+         values[2] = -cy / (hiny * hiny);
+         values[5] = -cy / (hiny * hiny) + ay / hiny;
          if (ny > 1)
          {
-            values[0] += 2.0*cy/(hiny*hiny) - 1.*ay/hiny;
+            values[0] += 2.0 * cy / (hiny * hiny) - 1.*ay / hiny;
          }
       }
 
       sign_prod = sign_double(cz) * sign_double(az);
       if (sign_prod == 1) /* same sign use back scheme */
       {
-         values[3] = -cz/(hinz*hinz) - az/hinz;
-         values[6] = -cz/(hinz*hinz);
+         values[3] = -cz / (hinz * hinz) - az / hinz;
+         values[6] = -cz / (hinz * hinz);
          if (nz > 1)
          {
-            values[0] += 2.0*cz/(hinz*hinz) + 1.*az/hinz;
+            values[0] += 2.0 * cz / (hinz * hinz) + 1.*az / hinz;
          }
       }
       else /* diff sign use forward scheme */
       {
-         values[3] = -cz/(hinz*hinz);
-         values[6] = -cz/(hinz*hinz) + az/hinz;
+         values[3] = -cz / (hinz * hinz);
+         values[6] = -cz / (hinz * hinz) + az / hinz;
          if (nz > 1)
          {
-            values[0] += 2.0*cz/(hinz*hinz) - 1.*az/hinz;
+            values[0] += 2.0 * cz / (hinz * hinz) - 1.*az / hinz;
          }
       }
    }
    else /* centered difference scheme */
    {
-      values[1] = -cx/(hinx*hinx) - ax/(2.*hinx);
-      values[2] = -cy/(hiny*hiny) - ay/(2.*hiny);
-      values[3] = -cz/(hinz*hinz) - az/(2.*hinz);
-      values[4] = -cx/(hinx*hinx) + ax/(2.*hinx);
-      values[5] = -cy/(hiny*hiny) + ay/(2.*hiny);
-      values[6] = -cz/(hinz*hinz) + az/(2.*hinz);
+      values[1] = -cx / (hinx * hinx) - ax / (2.*hinx);
+      values[2] = -cy / (hiny * hiny) - ay / (2.*hiny);
+      values[3] = -cz / (hinz * hinz) - az / (2.*hinz);
+      values[4] = -cx / (hinx * hinx) + ax / (2.*hinx);
+      values[5] = -cy / (hiny * hiny) + ay / (2.*hiny);
+      values[6] = -cz / (hinz * hinz) + az / (2.*hinz);
 
       if (nx > 1)
       {
-         values[0] += 2.0*cx/(hinx*hinx);
+         values[0] += 2.0 * cx / (hinx * hinx);
       }
       if (ny > 1)
       {
-         values[0] += 2.0*cy/(hiny*hiny);
+         values[0] += 2.0 * cy / (hiny * hiny);
       }
       if (nz > 1)
       {
-         values[0] += 2.0*cz/(hinz*hinz);
+         values[0] += 2.0 * cz / (hinz * hinz);
       }
    }
 
@@ -1301,7 +1315,7 @@ BuildParLaplacian9pt( HYPRE_Int                  argc,
     * Check a few things
     *-----------------------------------------------------------*/
 
-   if ((P*Q) != num_procs)
+   if ((P * Q) != num_procs)
    {
       hypre_printf("Error: Invalid number of processors or processor topology \n");
       exit(1);
@@ -1324,7 +1338,7 @@ BuildParLaplacian9pt( HYPRE_Int                  argc,
 
    /* compute p,q from P,Q and myid */
    p = myid % P;
-   q = ( myid - p)/P;
+   q = ( myid - p) / P;
 
    /*-----------------------------------------------------------
     * Generate the matrix
@@ -1426,7 +1440,7 @@ BuildParLaplacian27pt( HYPRE_Int                  argc,
     * Check a few things
     *-----------------------------------------------------------*/
 
-   if ((P*Q*R) != num_procs)
+   if ((P * Q * R) != num_procs)
    {
       hypre_printf("Error: Invalid number of processors or processor topology \n");
       exit(1);
@@ -1449,8 +1463,8 @@ BuildParLaplacian27pt( HYPRE_Int                  argc,
 
    /* compute p,q,r from P,Q,R and myid */
    p = myid % P;
-   q = (( myid - p)/P) % Q;
-   r = ( myid - p - P*q)/( P*Q );
+   q = (( myid - p) / P) % Q;
+   r = ( myid - p - P * q) / ( P * Q );
 
    /*-----------------------------------------------------------
     * Generate the matrix
@@ -1460,9 +1474,13 @@ BuildParLaplacian27pt( HYPRE_Int                  argc,
 
    values[0] = 26.0;
    if (nx == 1 || ny == 1 || nz == 1)
+   {
       values[0] = 8.0;
-   if (nx*ny == 1 || nx*nz == 1 || ny*nz == 1)
+   }
+   if (nx * ny == 1 || nx * nz == 1 || ny * nz == 1)
+   {
       values[0] = 2.0;
+   }
    values[1] = -1.;
 
    A = (HYPRE_ParCSRMatrix) GenerateLaplacian27pt(hypre_MPI_COMM_WORLD,
@@ -1534,12 +1552,12 @@ BuildParRotate7pt( HYPRE_Int                  argc,
       else if ( strcmp(argv[arg_index], "-alpha") == 0 )
       {
          arg_index++;
-         alpha  = atof(argv[arg_index++]);
+         alpha  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-eps") == 0 )
       {
          arg_index++;
-         eps  = atof(argv[arg_index++]);
+         eps  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else
       {
@@ -1551,7 +1569,7 @@ BuildParRotate7pt( HYPRE_Int                  argc,
     * Check a few things
     *-----------------------------------------------------------*/
 
-   if ((P*Q) != num_procs)
+   if ((P * Q) != num_procs)
    {
       hypre_printf("Error: Invalid number of processors or processor topology \n");
       exit(1);
@@ -1564,7 +1582,7 @@ BuildParRotate7pt( HYPRE_Int                  argc,
    if (myid == 0)
    {
       hypre_printf("  Rotate 7pt:\n");
-      hypre_printf("    alpha = %f, eps = %f\n", alpha,eps);
+      hypre_printf("    alpha = %f, eps = %f\n", alpha, eps);
       hypre_printf("    (nx, ny) = (%d, %d)\n", nx, ny);
       hypre_printf("    (Px, Py) = (%d, %d)\n", P,  Q);
    }
@@ -1575,7 +1593,7 @@ BuildParRotate7pt( HYPRE_Int                  argc,
 
    /* compute p,q from P,Q and myid */
    p = myid % P;
-   q = ( myid - p)/P;
+   q = ( myid - p) / P;
 
    /*-----------------------------------------------------------
     * Generate the matrix
@@ -1603,7 +1621,7 @@ HYPRE_Int
 BuildParVarDifConv( HYPRE_Int                  argc,
                     char                *argv[],
                     HYPRE_Int                  arg_index,
-                    HYPRE_ParCSRMatrix  *A_ptr    ,
+                    HYPRE_ParCSRMatrix  *A_ptr,
                     HYPRE_ParVector  *rhs_ptr     )
 {
    HYPRE_Int                 nx, ny, nz;
@@ -1663,7 +1681,7 @@ BuildParVarDifConv( HYPRE_Int                  argc,
       else if ( strcmp(argv[arg_index], "-eps") == 0 )
       {
          arg_index++;
-         eps  = atof(argv[arg_index++]);
+         eps  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-vardifconvRS") == 0 )
       {
@@ -1680,7 +1698,7 @@ BuildParVarDifConv( HYPRE_Int                  argc,
     * Check a few things
     *-----------------------------------------------------------*/
 
-   if ((P*Q*R) != num_procs)
+   if ((P * Q * R) != num_procs)
    {
       hypre_printf("Error: Invalid number of processors or processor topology \n");
       exit(1);
@@ -1703,8 +1721,8 @@ BuildParVarDifConv( HYPRE_Int                  argc,
 
    /* compute p,q,r from P,Q,R and myid */
    p = myid % P;
-   q = (( myid - p)/P) % Q;
-   r = ( myid - p - P*q)/( P*Q );
+   q = (( myid - p) / P) % Q;
+   r = ( myid - p - P * q) / ( P * Q );
 
    /*-----------------------------------------------------------
     * Generate the matrix
@@ -1731,29 +1749,30 @@ BuildParVarDifConv( HYPRE_Int                  argc,
 /**************************************************************************/
 
 
-HYPRE_Int SetSysVcoefValues(HYPRE_Int num_fun, HYPRE_Int nx, HYPRE_Int ny, HYPRE_Int nz, HYPRE_Real vcx,
+HYPRE_Int SetSysVcoefValues(HYPRE_Int num_fun, HYPRE_Int nx, HYPRE_Int ny, HYPRE_Int nz,
+                            HYPRE_Real vcx,
                             HYPRE_Real vcy, HYPRE_Real vcz, HYPRE_Int mtx_entry, HYPRE_Real *values)
 {
 
 
-   HYPRE_Int sz = num_fun*num_fun;
+   HYPRE_Int sz = num_fun * num_fun;
 
-   values[1*sz + mtx_entry] = -vcx;
-   values[2*sz + mtx_entry] = -vcy;
-   values[3*sz + mtx_entry] = -vcz;
-   values[0*sz + mtx_entry] = 0.0;
+   values[1 * sz + mtx_entry] = -vcx;
+   values[2 * sz + mtx_entry] = -vcy;
+   values[3 * sz + mtx_entry] = -vcz;
+   values[0 * sz + mtx_entry] = 0.0;
 
    if (nx > 1)
    {
-      values[0*sz + mtx_entry] += 2.0*vcx;
+      values[0 * sz + mtx_entry] += 2.0 * vcx;
    }
    if (ny > 1)
    {
-      values[0*sz + mtx_entry] += 2.0*vcy;
+      values[0 * sz + mtx_entry] += 2.0 * vcy;
    }
    if (nz > 1)
    {
-      values[0*sz + mtx_entry] += 2.0*vcz;
+      values[0 * sz + mtx_entry] += 2.0 * vcz;
    }
 
    return 0;
@@ -1827,23 +1846,27 @@ BuildParCoordinates( HYPRE_Int                  argc,
 
    /* compute p,q,r from P,Q,R and myid */
    p = myid % P;
-   q = (( myid - p)/P) % Q;
-   r = ( myid - p - P*q)/( P*Q );
+   q = (( myid - p) / P) % Q;
+   r = ( myid - p - P * q) / ( P * Q );
 
    /*-----------------------------------------------------------
     * Generate the coordinates
     *-----------------------------------------------------------*/
 
    coorddim = 3;
-   if (nx<2) coorddim--;
-   if (ny<2) coorddim--;
-   if (nz<2) coorddim--;
+   if (nx < 2) { coorddim--; }
+   if (ny < 2) { coorddim--; }
+   if (nz < 2) { coorddim--; }
 
-   if (coorddim>0)
-      coordinates = GenerateCoordinates (hypre_MPI_COMM_WORLD,
-                                         nx, ny, nz, P, Q, R, p, q, r, coorddim);
+   if (coorddim > 0)
+   {
+      coordinates = hypre_GenerateCoordinates(hypre_MPI_COMM_WORLD,
+                                              nx, ny, nz, P, Q, R, p, q, r, coorddim);
+   }
    else
-      coordinates=NULL;
+   {
+      coordinates = NULL;
+   }
 
    *coorddim_ptr = coorddim;
    *coord_ptr = coordinates;
@@ -1873,7 +1896,7 @@ testPMIS(HYPRE_ParCSRMatrix parcsr_A)
    hypre_MPI_Comm_rank(hypre_MPI_COMM_WORLD, &myid );
 
    HYPRE_ParCSRMatrixGetLocalRange( parcsr_A,
-                                    &first_local_row, &last_local_row ,
+                                    &first_local_row, &last_local_row,
                                     &first_local_col, &last_local_col );
 
    local_num_rows = last_local_row - first_local_row + 1;
@@ -1923,7 +1946,8 @@ testPMIS(HYPRE_ParCSRMatrix parcsr_A)
          nC1++;
       }
 
-      hypre_assert(hypre_IntArrayData(h_CF_marker2)[i] == 1 || hypre_IntArrayData(h_CF_marker2)[i] == -1 || hypre_IntArrayData(h_CF_marker2)[i] == -3);
+      hypre_assert(hypre_IntArrayData(h_CF_marker2)[i] == 1 ||
+                   hypre_IntArrayData(h_CF_marker2)[i] == -1 || hypre_IntArrayData(h_CF_marker2)[i] == -3);
 
       //hypre_assert(h_CF_marker[i] == h_CF_marker2[i]);
 
@@ -1967,7 +1991,7 @@ testPMIS3(HYPRE_ParCSRMatrix parcsr_A)
    hypre_MPI_Comm_rank(hypre_MPI_COMM_WORLD, &myid );
 
    HYPRE_ParCSRMatrixGetLocalRange( parcsr_A,
-                                    &first_local_row, &last_local_row ,
+                                    &first_local_row, &last_local_row,
                                     &first_local_col, &last_local_col );
 
    local_num_rows = last_local_row - first_local_row + 1;
@@ -1984,7 +2008,8 @@ testPMIS3(HYPRE_ParCSRMatrix parcsr_A)
 
    for (i = 0; i < local_num_rows; i++)
    {
-      hypre_assert(hypre_IntArrayData(h_CF_marker2)[i] == 1 || hypre_IntArrayData(h_CF_marker2)[i] == -1 || hypre_IntArrayData(h_CF_marker2)[i] == -3);
+      hypre_assert(hypre_IntArrayData(h_CF_marker2)[i] == 1 ||
+                   hypre_IntArrayData(h_CF_marker2)[i] == -1 || hypre_IntArrayData(h_CF_marker2)[i] == -3);
 
       if (hypre_IntArrayData(h_CF_marker2)[i] > 0)
       {
@@ -2023,7 +2048,7 @@ testPMIS2(HYPRE_ParCSRMatrix parcsr_A)
    hypre_MPI_Comm_rank(comm, &myid );
 
    HYPRE_ParCSRMatrixGetLocalRange( parcsr_A,
-                                    &first_local_row, &last_local_row ,
+                                    &first_local_row, &last_local_row,
                                     &first_local_col, &last_local_col );
 
    local_num_rows = last_local_row - first_local_row + 1;
@@ -2038,9 +2063,9 @@ testPMIS2(HYPRE_ParCSRMatrix parcsr_A)
    hypre_IntArrayInitialize(h_CF_marker);
    hypre_BoomerAMGCoarsenPMISDevice(parcsr_S_device, parcsr_A, 2, debug_flag, &h_CF_marker);
 
-   HYPRE_Int *coarse_pnts_global = NULL;
+   HYPRE_Int coarse_pnts_global[2];
    hypre_BoomerAMGCoarseParms(comm, local_num_rows, 1, NULL, h_CF_marker, NULL,
-         &coarse_pnts_global);
+                              coarse_pnts_global);
 
    /* interp */
    hypre_ParCSRMatrix *P;
@@ -2068,7 +2093,8 @@ testPMIS2(HYPRE_ParCSRMatrix parcsr_A)
 
    for (i = 0; i < local_num_rows2; i++)
    {
-      hypre_assert(hypre_IntArrayData(h_CF_marker2)[i] == 1 || hypre_IntArrayData(h_CF_marker2)[i] == -1 || hypre_IntArrayData(h_CF_marker2)[i] == -3);
+      hypre_assert(hypre_IntArrayData(h_CF_marker2)[i] == 1 ||
+                   hypre_IntArrayData(h_CF_marker2)[i] == -1 || hypre_IntArrayData(h_CF_marker2)[i] == -3);
 
       if (hypre_IntArrayData(h_CF_marker2)[i] > 0)
       {
@@ -2127,7 +2153,7 @@ testTranspose(HYPRE_ParCSRMatrix parcsr_A)
    HYPRE_Int    first_local_row, last_local_row;
    HYPRE_Int    first_local_col, last_local_col;
    HYPRE_ParCSRMatrixGetLocalRange( parcsr_A,
-                                    &first_local_row, &last_local_row ,
+                                    &first_local_row, &last_local_row,
                                     &first_local_col, &last_local_col );
    HYPRE_Int local_num_rows = last_local_row - first_local_row + 1;
    HYPRE_ParCSRMatrix parcsr_S_device  = NULL;
@@ -2136,9 +2162,9 @@ testTranspose(HYPRE_ParCSRMatrix parcsr_A)
    hypre_IntArrayInitialize(h_CF_marker);
    hypre_BoomerAMGCoarsenPMISDevice(parcsr_S_device, parcsr_A, 2, 0, &h_CF_marker);
    hypre_ParCSRMatrix *P, *PT, *P_h, *PT_h, *P2;
-   HYPRE_Int *coarse_pnts_global = NULL;
+   HYPRE_Int coarse_pnts_global[2];
    MPI_Comm comm = hypre_ParCSRMatrixComm(parcsr_A);
-   hypre_BoomerAMGCoarseParms(comm, local_num_rows, 1, NULL, h_CF_marker, NULL, &coarse_pnts_global);
+   hypre_BoomerAMGCoarseParms(comm, local_num_rows, 1, NULL, h_CF_marker, NULL, coarse_pnts_global);
    hypre_BoomerAMGBuildDirInterpDevice(parcsr_A, hypre_IntArrayData(h_CF_marker), parcsr_S_device,
                                        coarse_pnts_global, 1, NULL,
                                        0, 0.0, 0, 3, &P);
@@ -2172,7 +2198,7 @@ testAdd(HYPRE_ParCSRMatrix parcsr_A)
 
    HYPRE_Real tol = 1e-14;
    HYPRE_Int  ierr = 0;
-   HYPRE_Real alpha = 3.141592654, beta = 2.718281828*9.9;
+   HYPRE_Real alpha = 3.141592654, beta = 2.718281828 * 9.9;
 
    HYPRE_ParCSRMatrix parcsr_A2 = hypre_ParCSRMatMatDevice(parcsr_A, parcsr_A);
    HYPRE_ParCSRMatrix parcsr_C;
@@ -2194,7 +2220,7 @@ testAdd(HYPRE_ParCSRMatrix parcsr_A)
    HYPRE_Int    first_local_row, last_local_row;
    HYPRE_Int    first_local_col, last_local_col;
    HYPRE_ParCSRMatrixGetLocalRange( parcsr_A,
-                                    &first_local_row, &last_local_row ,
+                                    &first_local_row, &last_local_row,
                                     &first_local_col, &last_local_col );
    HYPRE_Int local_num_rows = last_local_row - first_local_row + 1;
    HYPRE_ParCSRMatrix parcsr_S_device  = NULL;
@@ -2203,9 +2229,9 @@ testAdd(HYPRE_ParCSRMatrix parcsr_A)
    hypre_IntArrayInitialize(h_CF_marker);
    hypre_BoomerAMGCoarsenPMISDevice(parcsr_S_device, parcsr_A, 2, 0, &h_CF_marker);
    hypre_ParCSRMatrix *P, *AP, *P_h, *AP_h;
-   HYPRE_Int *coarse_pnts_global = NULL;
+   HYPRE_Int coarse_pnts_global[2];
    MPI_Comm comm = hypre_ParCSRMatrixComm(parcsr_A);
-   hypre_BoomerAMGCoarseParms(comm, local_num_rows, 1, NULL, h_CF_marker, NULL, &coarse_pnts_global);
+   hypre_BoomerAMGCoarseParms(comm, local_num_rows, 1, NULL, h_CF_marker, NULL, coarse_pnts_global);
    hypre_BoomerAMGBuildDirInterpDevice(parcsr_A, hypre_IntArrayData(h_CF_marker), parcsr_S_device,
                                        coarse_pnts_global, 1, NULL,
                                        0, 0.0, 0, 3, &P);
@@ -2243,8 +2269,7 @@ testFFFC(HYPRE_ParCSRMatrix parcsr_A)
    HYPRE_Int         local_num_rows;
    HYPRE_Int         first_local_row, last_local_row;
    HYPRE_Int         first_local_col, last_local_col;
-   HYPRE_Int         *coarse_dof_func = NULL;
-   HYPRE_BigInt      *coarse_pnts_global = NULL;
+   HYPRE_BigInt      coarse_pnts_global[2];
    HYPRE_Int         ierr = 0;
    HYPRE_Int         myid;
 
@@ -2255,27 +2280,30 @@ testFFFC(HYPRE_ParCSRMatrix parcsr_A)
    HYPRE_ParCSRMatrix parcsr_S_h, parcsr_S_device;
 
    HYPRE_ParCSRMatrixGetLocalRange( parcsr_A,
-                                    &first_local_row, &last_local_row ,
+                                    &first_local_row, &last_local_row,
                                     &first_local_col, &last_local_col );
 
    local_num_rows = last_local_row - first_local_row + 1;
 
    /* Soc on DEVICE */
-   hypre_BoomerAMGCreateSDevice(parcsr_A, strong_threshold, max_row_sum, num_functions, NULL, &parcsr_S_device);
+   hypre_BoomerAMGCreateSDevice(parcsr_A, strong_threshold, max_row_sum, num_functions, NULL,
+                                &parcsr_S_device);
    h_CF_marker = hypre_IntArrayCreate(local_num_rows);
    hypre_IntArrayInitialize(h_CF_marker);
    hypre_BoomerAMGCoarsenPMISDevice(parcsr_S_device, parcsr_A, 0, debug_flag, &h_CF_marker);
    hypre_BoomerAMGCoarseParms(hypre_ParCSRMatrixComm(parcsr_A), local_num_rows, num_functions, NULL,
-                              h_CF_marker, &coarse_dof_func, &coarse_pnts_global);
+                              h_CF_marker, NULL, coarse_pnts_global);
 
    /* FFFC on Device */
-   hypre_ParCSRMatrixGenerateFFFCDevice(parcsr_A, hypre_IntArrayData(h_CF_marker), coarse_pnts_global, parcsr_S_device, &AFC, &AFF);
+   hypre_ParCSRMatrixGenerateFFFCDevice(parcsr_A, hypre_IntArrayData(h_CF_marker), coarse_pnts_global,
+                                        parcsr_S_device, &AFC, &AFF);
 
    /* FFFC on Host */
    parcsr_A_h = hypre_ParCSRMatrixClone_v2(parcsr_A, 1, HYPRE_MEMORY_HOST);
    parcsr_S_h = hypre_ParCSRMatrixClone_v2(parcsr_S_device, 0, HYPRE_MEMORY_HOST);
    hypre_MatvecCommPkgCreate(parcsr_A_h);
-   hypre_ParCSRMatrixGenerateFFFC(parcsr_A_h, hypre_IntArrayData(h_CF_marker), coarse_pnts_global, parcsr_S_h, &AFC_h, &AFF_h);
+   hypre_ParCSRMatrixGenerateFFFCHost(parcsr_A_h, hypre_IntArrayData(h_CF_marker),
+                                      coarse_pnts_global, parcsr_S_h, &AFC_h, &AFF_h);
 
    /* AFF * AFC */
    W_h = hypre_ParCSRMatMatHost(AFF_h, AFC_h);
@@ -2321,11 +2349,13 @@ CompareParCSRDH(HYPRE_ParCSRMatrix hmat, HYPRE_ParCSRMatrix dmat, HYPRE_Real tol
    {
       ecode ++;
    }
-   if (hypre_CSRMatrixNumRows(hypre_ParCSRMatrixOffd(hmat)) != hypre_CSRMatrixNumRows(hypre_ParCSRMatrixOffd(hmat2)))
+   if (hypre_CSRMatrixNumRows(hypre_ParCSRMatrixOffd(hmat)) != hypre_CSRMatrixNumRows(
+          hypre_ParCSRMatrixOffd(hmat2)))
    {
       ecode ++;
    }
-   if (hypre_CSRMatrixNumCols(hypre_ParCSRMatrixOffd(hmat)) != hypre_CSRMatrixNumCols(hypre_ParCSRMatrixOffd(hmat2)))
+   if (hypre_CSRMatrixNumCols(hypre_ParCSRMatrixOffd(hmat)) != hypre_CSRMatrixNumCols(
+          hypre_ParCSRMatrixOffd(hmat2)))
    {
       ecode ++;
    }
@@ -2337,11 +2367,13 @@ CompareParCSRDH(HYPRE_ParCSRMatrix hmat, HYPRE_ParCSRMatrix dmat, HYPRE_Real tol
          break;
       }
    }
-   if (hypre_CSRMatrixNumNonzeros(hypre_ParCSRMatrixDiag(hmat)) != hypre_CSRMatrixNumNonzeros(hypre_ParCSRMatrixDiag(hmat2)))
+   if (hypre_CSRMatrixNumNonzeros(hypre_ParCSRMatrixDiag(hmat)) != hypre_CSRMatrixNumNonzeros(
+          hypre_ParCSRMatrixDiag(hmat2)))
    {
       ecode ++;
    }
-   if (hypre_CSRMatrixNumNonzeros(hypre_ParCSRMatrixOffd(hmat)) != hypre_CSRMatrixNumNonzeros(hypre_ParCSRMatrixOffd(hmat2)))
+   if (hypre_CSRMatrixNumNonzeros(hypre_ParCSRMatrixOffd(hmat)) != hypre_CSRMatrixNumNonzeros(
+          hypre_ParCSRMatrixOffd(hmat2)))
    {
       ecode ++;
    }
diff --git a/external/hypre/src/test/ij_mm.c b/external/hypre/src/test/ij_mm.c
index a3a1af9b..1d273fd5 100644
--- a/external/hypre/src/test/ij_mm.c
+++ b/external/hypre/src/test/ij_mm.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -34,27 +34,34 @@
 extern "C" {
 #endif
 
-HYPRE_Int BuildParFromFile (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix *A_ptr );
-HYPRE_Int BuildParRhsFromFile (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParVector *b_ptr );
-
-HYPRE_Int BuildParLaplacian (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix *A_ptr );
-HYPRE_Int BuildParSysLaplacian (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix *A_ptr );
-HYPRE_Int BuildParDifConv (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix *A_ptr);
-HYPRE_Int BuildFuncsFromFiles (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix A , HYPRE_Int **dof_func_ptr );
-HYPRE_Int BuildFuncsFromOneFile (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix A , HYPRE_Int **dof_func_ptr );
-HYPRE_Int BuildParLaplacian9pt (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix *A_ptr );
-HYPRE_Int BuildParLaplacian27pt (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix *A_ptr );
-HYPRE_Int BuildParRotate7pt (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix *A_ptr );
-HYPRE_Int BuildParVarDifConv (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix *A_ptr , HYPRE_ParVector *rhs_ptr );
-HYPRE_ParCSRMatrix GenerateSysLaplacian (MPI_Comm comm, HYPRE_Int nx, HYPRE_Int ny, HYPRE_Int nz,
-                                         HYPRE_Int P, HYPRE_Int Q, HYPRE_Int R, HYPRE_Int p, HYPRE_Int q, HYPRE_Int r,
-                                         HYPRE_Int num_fun, HYPRE_Real *mtrx, HYPRE_Real *value);
-HYPRE_ParCSRMatrix GenerateSysLaplacianVCoef (MPI_Comm comm, HYPRE_Int nx, HYPRE_Int ny, HYPRE_Int nz,
-                                              HYPRE_Int P, HYPRE_Int Q, HYPRE_Int R, HYPRE_Int p, HYPRE_Int q, HYPRE_Int r,
-                                              HYPRE_Int num_fun, HYPRE_Real *mtrx, HYPRE_Real *value);
-HYPRE_Int SetSysVcoefValues(HYPRE_Int num_fun, HYPRE_Int nx, HYPRE_Int ny, HYPRE_Int nz, HYPRE_Real vcx, HYPRE_Real vcy, HYPRE_Real vcz, HYPRE_Int mtx_entry, HYPRE_Real *values);
-
-HYPRE_Int BuildParCoordinates (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_Int *coorddim_ptr , float **coord_ptr );
+HYPRE_Int BuildParFromFile (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                            HYPRE_ParCSRMatrix *A_ptr );
+HYPRE_Int BuildParRhsFromFile (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                               HYPRE_ParVector *b_ptr );
+
+HYPRE_Int BuildParLaplacian (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                             HYPRE_ParCSRMatrix *A_ptr );
+HYPRE_Int BuildParSysLaplacian (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                                HYPRE_ParCSRMatrix *A_ptr );
+HYPRE_Int BuildParDifConv (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                           HYPRE_ParCSRMatrix *A_ptr);
+HYPRE_Int BuildFuncsFromFiles (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                               HYPRE_ParCSRMatrix A, HYPRE_Int **dof_func_ptr );
+HYPRE_Int BuildFuncsFromOneFile (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                                 HYPRE_ParCSRMatrix A, HYPRE_Int **dof_func_ptr );
+HYPRE_Int BuildParLaplacian9pt (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                                HYPRE_ParCSRMatrix *A_ptr );
+HYPRE_Int BuildParLaplacian27pt (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                                 HYPRE_ParCSRMatrix *A_ptr );
+HYPRE_Int BuildParRotate7pt (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                             HYPRE_ParCSRMatrix *A_ptr );
+HYPRE_Int BuildParVarDifConv (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                              HYPRE_ParCSRMatrix *A_ptr, HYPRE_ParVector *rhs_ptr );
+HYPRE_Int SetSysVcoefValues(HYPRE_Int num_fun, HYPRE_BigInt nx, HYPRE_BigInt ny, HYPRE_BigInt nz,
+                            HYPRE_Real vcx, HYPRE_Real vcy, HYPRE_Real vcz, HYPRE_Int mtx_entry, HYPRE_Real *values);
+
+HYPRE_Int BuildParCoordinates (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                               HYPRE_Int *coorddim_ptr, float **coord_ptr );
 
 #ifdef __cplusplus
 }
@@ -77,33 +84,39 @@ void gpu_alloc(void **ptr, size_t size)
 
 void gpu_free(void *ptr)
 {
+   HYPRE_UNUSED_VAR(ptr);
    return;
 }
 
+char file_dir[] = "./";
 
 void runjob1( HYPRE_ParCSRMatrix parcsr_A,
               HYPRE_Int          print_system,
+              HYPRE_Int          rep,
               HYPRE_Int          verify)
 {
-   HYPRE_Int          num_procs, myid, i;
+   HYPRE_Int          i;
    HYPRE_ParCSRMatrix parcsr_A_host  = NULL;
    HYPRE_ParCSRMatrix parcsr_B_host  = NULL;
    HYPRE_ParCSRMatrix parcsr_B_host2 = NULL;
    HYPRE_ParCSRMatrix parcsr_B       = NULL;
    HYPRE_ParCSRMatrix parcsr_error_host = NULL;
    HYPRE_Real         fnorm, rfnorm, fnorm0;
-   HYPRE_Int          time_index, rep = 2;
+   HYPRE_Int          time_index;
+   char               fname[1024];
 
-   hypre_MPI_Comm_size(hypre_MPI_COMM_WORLD, &num_procs );
-   hypre_MPI_Comm_rank(hypre_MPI_COMM_WORLD, &myid );
+   MPI_Comm comm = hypre_ParCSRMatrixComm(parcsr_A);
 
-   if (myid == 0)
-   {
-      hypre_printf("A %d x %d\n", hypre_ParCSRMatrixGlobalNumRows(parcsr_A), hypre_ParCSRMatrixGlobalNumCols(parcsr_A));
-   }
+   hypre_ParPrintf(comm, "A %d x %d, NNZ %d, RNZ %d\n", hypre_ParCSRMatrixGlobalNumRows(parcsr_A),
+                   hypre_ParCSRMatrixGlobalNumCols(parcsr_A),
+                   hypre_ParCSRMatrixNumNonzeros(parcsr_A),
+                   hypre_ParCSRMatrixNumNonzeros(parcsr_A) / hypre_ParCSRMatrixGlobalNumRows(parcsr_A));
 
    hypre_assert(hypre_ParCSRMatrixMemoryLocation(parcsr_A) == HYPRE_MEMORY_DEVICE);
 
+   hypre_MatvecCommPkgCreate(parcsr_A);
+   hypre_ParCSRMatrixCopyColMapOffdToDevice(parcsr_A);
+
    if (verify)
    {
       parcsr_A_host = hypre_ParCSRMatrixClone_v2(parcsr_A, 1, HYPRE_MEMORY_HOST);
@@ -113,22 +126,29 @@ void runjob1( HYPRE_ParCSRMatrix parcsr_A,
 
       hypre_BeginTiming(time_index);
 
-      parcsr_B_host  = hypre_ParCSRMatMat(parcsr_A_host, parcsr_A_host);
+      parcsr_B_host = hypre_ParCSRMatMat(parcsr_A_host, parcsr_A_host);
 
       hypre_EndTiming(time_index);
       hypre_PrintTiming("Host Parcsr Matrix-by-Matrix, A*A", hypre_MPI_COMM_WORLD);
       hypre_FinalizeTiming(time_index);
       hypre_ClearTiming();
+
+      hypre_ParCSRMatrixSetNumNonzeros(parcsr_B_host);
    }
 
    if (print_system)
    {
-      hypre_CSRMatrixPrintMM(hypre_ParCSRMatrixDiag(parcsr_A_host), 1, 1, 0, "/p/gpfs1/li50/A.mtx");
+      sprintf(fname, "%s/%s", file_dir, "IJ.out.A");
+      hypre_ParCSRMatrixPrintIJ(parcsr_A, 0, 0, fname);
+
+      //hypre_CSRMatrixPrintMM(hypre_ParCSRMatrixDiag(parcsr_A_host), 1, 1, 0, "A.mtx");
    }
 
    for (i = 0 ; i < rep; i++)
    {
-      if (i == rep-1)
+      hypre_ParPrintf(comm, "--- rep %d (out of %d) ---\n", i, rep);
+
+      if (i == rep - 1)
       {
          time_index = hypre_InitializeTiming("Device Parcsr Matrix-by-Matrix, A*A");
          hypre_BeginTiming(time_index);
@@ -137,9 +157,11 @@ void runjob1( HYPRE_ParCSRMatrix parcsr_A,
 
       parcsr_B = hypre_ParCSRMatMat(parcsr_A, parcsr_A);
 
-      if (i == rep-1)
+      if (i == rep - 1)
       {
-         hypre_SyncCudaDevice(hypre_handle());
+#if defined(HYPRE_USING_GPU)
+         hypre_SyncDevice();
+#endif
          //cudaProfilerStop();
          hypre_EndTiming(time_index);
          hypre_PrintTiming("Device Parcsr Matrix-by-Matrix, A*A", hypre_MPI_COMM_WORLD);
@@ -147,7 +169,7 @@ void runjob1( HYPRE_ParCSRMatrix parcsr_A,
          hypre_ClearTiming();
       }
 
-      if (i < rep-1)
+      if (i < rep - 1)
       {
          hypre_ParCSRMatrixDestroy(parcsr_B);
       }
@@ -163,41 +185,182 @@ void runjob1( HYPRE_ParCSRMatrix parcsr_A,
       fnorm0 = hypre_ParCSRMatrixFnorm(parcsr_B_host);
       rfnorm = fnorm0 > 0 ? fnorm / fnorm0 : fnorm;
 
-      if (myid == 0)
+      hypre_ParPrintf(comm, "A^2: %d x %d, nnz [CPU %d, GPU %d], CPU-GPU err %e\n",
+                      hypre_ParCSRMatrixGlobalNumRows(parcsr_B_host2),
+                      hypre_ParCSRMatrixGlobalNumCols(parcsr_B_host2),
+                      hypre_ParCSRMatrixNumNonzeros(parcsr_B_host),
+                      hypre_ParCSRMatrixNumNonzeros(parcsr_B_host2),
+                      rfnorm);
+   }
+
+   if (print_system)
+   {
+      if (!parcsr_B_host2)
       {
-         printf("A^2: %d x %d, nnz %d, CPU-GPU err %e\n", hypre_ParCSRMatrixGlobalNumRows(parcsr_B_host2),
-               hypre_ParCSRMatrixGlobalNumCols(parcsr_B_host2),
-               hypre_ParCSRMatrixNumNonzeros(parcsr_B_host2),
-               rfnorm);
+         parcsr_B_host2 = hypre_ParCSRMatrixClone_v2(parcsr_B, 1, HYPRE_MEMORY_HOST);
       }
+      sprintf(fname, "%s/%s", file_dir, "IJ.out.B");
+      hypre_ParCSRMatrixPrintIJ(parcsr_B_host2, 0, 0, fname);
+      sprintf(fname, "%s/%s", file_dir, "IJ.out.B.CPU");
+      hypre_ParCSRMatrixPrintIJ(parcsr_B_host, 0, 0, fname);
    }
 
+   hypre_ParCSRMatrixSetNumNonzeros(parcsr_B);
+
+   hypre_ParPrintf(comm, "B %d x %d, NNZ %d, RNZ %d\n", hypre_ParCSRMatrixGlobalNumRows(parcsr_B),
+                   hypre_ParCSRMatrixGlobalNumCols(parcsr_B),
+                   hypre_ParCSRMatrixNumNonzeros(parcsr_B),
+                   hypre_ParCSRMatrixNumNonzeros(parcsr_B) / hypre_ParCSRMatrixGlobalNumRows(parcsr_B));
+
    hypre_ParCSRMatrixDestroy(parcsr_B);
+   hypre_ParCSRMatrixDestroy(parcsr_A_host);
+   hypre_ParCSRMatrixDestroy(parcsr_B_host);
+   hypre_ParCSRMatrixDestroy(parcsr_B_host2);
+   hypre_ParCSRMatrixDestroy(parcsr_error_host);
 }
 
 void runjob2( HYPRE_ParCSRMatrix parcsr_A,
               HYPRE_Int          print_system,
+              HYPRE_Int          rep,
+              HYPRE_Int          verify)
+{
+   HYPRE_Int          i;
+   HYPRE_ParCSRMatrix parcsr_A_host  = NULL;
+   HYPRE_ParCSRMatrix parcsr_B_host  = NULL;
+   HYPRE_ParCSRMatrix parcsr_B_host2 = NULL;
+   HYPRE_ParCSRMatrix parcsr_B       = NULL;
+   HYPRE_ParCSRMatrix parcsr_error_host = NULL;
+   HYPRE_Real         fnorm, rfnorm, fnorm0;
+   HYPRE_Int          time_index;
+   char               fname[1024];
+
+   MPI_Comm comm = hypre_ParCSRMatrixComm(parcsr_A);
+
+   hypre_ParPrintf(comm, "A %d x %d, NNZ %d, RNZ %d\n", hypre_ParCSRMatrixGlobalNumRows(parcsr_A),
+                   hypre_ParCSRMatrixGlobalNumCols(parcsr_A),
+                   hypre_ParCSRMatrixNumNonzeros(parcsr_A),
+                   hypre_ParCSRMatrixNumNonzeros(parcsr_A) / hypre_ParCSRMatrixGlobalNumRows(parcsr_A));
+
+   hypre_assert(hypre_ParCSRMatrixMemoryLocation(parcsr_A) == HYPRE_MEMORY_DEVICE);
+
+   hypre_MatvecCommPkgCreate(parcsr_A);
+   hypre_ParCSRMatrixCopyColMapOffdToDevice(parcsr_A);
+
+   if (verify)
+   {
+      parcsr_A_host = hypre_ParCSRMatrixClone_v2(parcsr_A, 1, HYPRE_MEMORY_HOST);
+      hypre_MatvecCommPkgCreate(parcsr_A_host);
+
+      time_index = hypre_InitializeTiming("Host Parcsr Matrix-by-Matrix, AT*A");
+
+      hypre_BeginTiming(time_index);
+
+      parcsr_B_host = hypre_ParCSRTMatMat(parcsr_A_host, parcsr_A_host);
+
+      hypre_EndTiming(time_index);
+      hypre_PrintTiming("Host Parcsr Matrix-by-Matrix, AT*A", hypre_MPI_COMM_WORLD);
+      hypre_FinalizeTiming(time_index);
+      hypre_ClearTiming();
+
+      hypre_ParCSRMatrixSetNumNonzeros(parcsr_B_host);
+   }
+
+   if (print_system)
+   {
+      if (!parcsr_A_host)
+      {
+         parcsr_A_host = hypre_ParCSRMatrixClone_v2(parcsr_A, 1, HYPRE_MEMORY_HOST);
+      }
+      sprintf(fname, "%s/%s", file_dir, "IJ.out.A");
+      hypre_ParCSRMatrixPrintIJ(parcsr_A_host, 0, 0, fname);
+   }
+
+   for (i = 0 ; i < rep; i++)
+   {
+      hypre_ParPrintf(comm, "--- rep %d (out of %d) ---\n", i, rep);
+
+      if (i == rep - 1)
+      {
+         time_index = hypre_InitializeTiming("Device Parcsr Matrix-by-Matrix, AT*A");
+         hypre_BeginTiming(time_index);
+         //cudaProfilerStart();
+      }
+
+      parcsr_B = hypre_ParCSRTMatMatKT(parcsr_A, parcsr_A, 0);
+
+      if (i == rep - 1)
+      {
+#if defined(HYPRE_USING_GPU)
+         hypre_SyncDevice();
+#endif
+         //cudaProfilerStop();
+         hypre_EndTiming(time_index);
+         hypre_PrintTiming("Device Parcsr Matrix-by-Matrix, AT*A", hypre_MPI_COMM_WORLD);
+         hypre_FinalizeTiming(time_index);
+         hypre_ClearTiming();
+      }
+
+      if (i < rep - 1)
+      {
+         hypre_ParCSRMatrixDestroy(parcsr_B);
+      }
+   }
+
+   if (verify)
+   {
+      parcsr_B_host2 = hypre_ParCSRMatrixClone_v2(parcsr_B, 1, HYPRE_MEMORY_HOST);
+      hypre_ParCSRMatrixSetNumNonzeros(parcsr_B_host2);
+
+      hypre_ParCSRMatrixAdd(1.0, parcsr_B_host, -1.0, parcsr_B_host2, &parcsr_error_host);
+      fnorm = hypre_ParCSRMatrixFnorm(parcsr_error_host);
+      fnorm0 = hypre_ParCSRMatrixFnorm(parcsr_B_host);
+      rfnorm = fnorm0 > 0 ? fnorm / fnorm0 : fnorm;
+
+      hypre_ParPrintf(comm, "A^T*A: %d x %d, nnz [CPU %d, GPU %d], CPU-GPU err %e\n",
+                      hypre_ParCSRMatrixGlobalNumRows(parcsr_B_host2),
+                      hypre_ParCSRMatrixGlobalNumCols(parcsr_B_host2),
+                      hypre_ParCSRMatrixNumNonzeros(parcsr_B_host),
+                      hypre_ParCSRMatrixNumNonzeros(parcsr_B_host2),
+                      rfnorm);
+   }
+
+   if (print_system)
+   {
+      sprintf(fname, "%s/%s", file_dir, "IJ.out.B");
+      hypre_ParCSRMatrixPrintIJ(parcsr_B, 0, 0, fname);
+      sprintf(fname, "%s/%s", file_dir, "IJ.out.B.CPU");
+      hypre_ParCSRMatrixPrintIJ(parcsr_B_host, 0, 0, fname);
+   }
+
+   hypre_ParCSRMatrixSetNumNonzeros(parcsr_B);
+
+   hypre_ParPrintf(comm, "B %d x %d, NNZ %d, RNZ %d\n", hypre_ParCSRMatrixGlobalNumRows(parcsr_B),
+                   hypre_ParCSRMatrixGlobalNumCols(parcsr_B),
+                   hypre_ParCSRMatrixNumNonzeros(parcsr_B),
+                   hypre_ParCSRMatrixNumNonzeros(parcsr_B) / hypre_ParCSRMatrixGlobalNumRows(parcsr_B));
+
+   hypre_ParCSRMatrixDestroy(parcsr_B);
+   hypre_ParCSRMatrixDestroy(parcsr_A_host);
+   hypre_ParCSRMatrixDestroy(parcsr_B_host);
+   hypre_ParCSRMatrixDestroy(parcsr_B_host2);
+   hypre_ParCSRMatrixDestroy(parcsr_error_host);
+}
+
+void runjob3( HYPRE_ParCSRMatrix parcsr_A,
+              HYPRE_ParCSRMatrix parcsr_P,
+              HYPRE_Int          boolean_P,
+              HYPRE_Int          print_system,
+              HYPRE_Int          rap2,
               HYPRE_Int          mult_order,
+              HYPRE_Int          rep,
               HYPRE_Int          verify)
 {
-   HYPRE_Int    measure_type = 0;
-   HYPRE_Real   trunc_factor = 0.0;
-   HYPRE_Int    P_max_elmts = 8;
-   HYPRE_Int    debug_flag = 0;
-   HYPRE_Int    rap2=1;
-   HYPRE_Int    keepTranspose = 0;
-   HYPRE_Int    num_functions = 1;
-   HYPRE_Real   strong_threshold = 0.25;
-   HYPRE_Real   max_row_sum = 1.0;
-   HYPRE_Real   fnorm, rfnorm, fnorm0;
-   HYPRE_Int    local_num_vars, *coarse_pnts_global;
-   HYPRE_Int    num_procs, myid;
-   HYPRE_Int    time_index, i;
+   HYPRE_Int          i;
+   char               fname[1024];
+   HYPRE_Int          time_index;
+   HYPRE_Int          keepTranspose = 0;
+   HYPRE_Real         fnorm, rfnorm, fnorm0;
 
-   hypre_IntArray    *CF_marker         = NULL;
-   hypre_IntArray    *coarse_dof_func   = NULL; 
-   HYPRE_ParCSRMatrix parcsr_S          = NULL;
-   HYPRE_ParCSRMatrix parcsr_P          = NULL;
    HYPRE_ParCSRMatrix parcsr_Q          = NULL;
    HYPRE_ParCSRMatrix parcsr_AH         = NULL;
    HYPRE_ParCSRMatrix parcsr_A_host     = NULL;
@@ -207,49 +370,42 @@ void runjob2( HYPRE_ParCSRMatrix parcsr_A,
    HYPRE_ParCSRMatrix parcsr_AH_host_2  = NULL;
    HYPRE_ParCSRMatrix parcsr_error_host = NULL;
 
-   hypre_MPI_Comm_size(hypre_MPI_COMM_WORLD, &num_procs );
-   hypre_MPI_Comm_rank(hypre_MPI_COMM_WORLD, &myid );
+   MPI_Comm comm = hypre_ParCSRMatrixComm(parcsr_A);
 
-   /* coarsening */
-   hypre_BoomerAMGCreateS(parcsr_A, strong_threshold, max_row_sum, num_functions, NULL, &parcsr_S);
-
-   hypre_BoomerAMGCoarsenPMIS(parcsr_S, parcsr_A, measure_type, debug_flag, &CF_marker);
+   hypre_ParPrintf(comm, "A %d x %d, NNZ %d\n", hypre_ParCSRMatrixGlobalNumRows(parcsr_A),
+                   hypre_ParCSRMatrixGlobalNumCols(parcsr_A), hypre_ParCSRMatrixNumNonzeros(parcsr_A));
+   hypre_ParPrintf(comm, "P %d x %d, NNZ %d\n", hypre_ParCSRMatrixGlobalNumRows(parcsr_P),
+                   hypre_ParCSRMatrixGlobalNumCols(parcsr_P), hypre_ParCSRMatrixNumNonzeros(parcsr_P));
 
-   local_num_vars = hypre_ParCSRMatrixNumRows(parcsr_A);
-   coarse_dof_func = NULL;
-   coarse_pnts_global = NULL;
-
-   hypre_BoomerAMGCoarseParms(hypre_ParCSRMatrixComm(parcsr_A), local_num_vars, num_functions, NULL,
-                              CF_marker, &coarse_dof_func, &coarse_pnts_global);
+   /* !!! */
+   hypre_assert(hypre_ParCSRMatrixMemoryLocation(parcsr_A) == HYPRE_MEMORY_DEVICE);
+   hypre_assert(hypre_ParCSRMatrixMemoryLocation(parcsr_P) == HYPRE_MEMORY_DEVICE);
 
-   /* generate P */
-   hypre_BoomerAMGBuildExtPIInterp(parcsr_A, hypre_IntArrayData(CF_marker), parcsr_S, coarse_pnts_global,
-                                   num_functions, NULL, debug_flag, trunc_factor, P_max_elmts,
-                                   &parcsr_P);
+   if (!hypre_ParCSRMatrixCommPkg(parcsr_A))
+   {
+      hypre_MatvecCommPkgCreate(parcsr_A);
+   }
 
-   if (myid == 0)
+   if (!hypre_ParCSRMatrixCommPkg(parcsr_P))
    {
-      hypre_printf("A %d x %d\n", hypre_ParCSRMatrixGlobalNumRows(parcsr_A), hypre_ParCSRMatrixGlobalNumCols(parcsr_A));
-      hypre_printf("P %d x %d\n", hypre_ParCSRMatrixGlobalNumRows(parcsr_P), hypre_ParCSRMatrixGlobalNumCols(parcsr_P));
+      hypre_MatvecCommPkgCreate(parcsr_P);
    }
 
-   /* !!! */
-   hypre_assert(hypre_ParCSRMatrixMemoryLocation(parcsr_A) == HYPRE_MEMORY_DEVICE);
-   hypre_assert(hypre_ParCSRMatrixMemoryLocation(parcsr_P) == HYPRE_MEMORY_DEVICE);
+   hypre_ParCSRMatrixSetPatternOnly(parcsr_P, boolean_P);
 
    /*-----------------------------------------------------------
     * Matrix-by-Matrix on host
     *-----------------------------------------------------------*/
    if (verify)
    {
-      hypre_printf("Clone matrices to the host\n");
+      //hypre_ParPrintf("Clone matrices to the host\n");
       parcsr_A_host = hypre_ParCSRMatrixClone_v2(parcsr_A, 1, HYPRE_MEMORY_HOST);
       parcsr_P_host = hypre_ParCSRMatrixClone_v2(parcsr_P, 1, HYPRE_MEMORY_HOST);
 
       hypre_MatvecCommPkgCreate(parcsr_A_host);
       hypre_MatvecCommPkgCreate(parcsr_P_host);
 
-      time_index = hypre_InitializeTiming("Host Parcsr Matrix-by-Matrix, RAP2");
+      time_index = hypre_InitializeTiming("Host Parcsr Matrix-by-Matrix, RAP");
       hypre_BeginTiming(time_index);
 
       if (mult_order == 0)
@@ -263,9 +419,11 @@ void runjob2( HYPRE_ParCSRMatrix parcsr_A,
          parcsr_AH_host = hypre_ParCSRMatMat(parcsr_Q_host, parcsr_P_host);
       }
       hypre_EndTiming(time_index);
-      hypre_PrintTiming("Host Parcsr Matrix-by-Matrix, RAP2", hypre_MPI_COMM_WORLD);
+      hypre_PrintTiming("Host Parcsr Matrix-by-Matrix, RAP", hypre_MPI_COMM_WORLD);
       hypre_FinalizeTiming(time_index);
       hypre_ClearTiming();
+
+      hypre_ParCSRMatrixSetNumNonzeros(parcsr_AH_host);
    }
 
    /*-----------------------------------------------------------
@@ -273,8 +431,10 @@ void runjob2( HYPRE_ParCSRMatrix parcsr_A,
     *-----------------------------------------------------------*/
    if (print_system)
    {
-      hypre_CSRMatrixPrintMM(hypre_ParCSRMatrixDiag(parcsr_A_host), 1, 1, 0, "/p/gpfs1/li50/A.mtx");
-      hypre_CSRMatrixPrintMM(hypre_ParCSRMatrixDiag(parcsr_P_host), 1, 1, 0, "/p/gpfs1/li50/P.mtx");
+      sprintf(fname, "%s/%s", file_dir, "IJ.out.A");
+      hypre_ParCSRMatrixPrintIJ(parcsr_A_host, 0, 0, fname);
+      sprintf(fname, "%s/%s", file_dir, "IJ.out.P");
+      hypre_ParCSRMatrixPrintIJ(parcsr_P_host, 0, 0, fname);
    }
 
    /*-----------------------------------------------------------
@@ -283,11 +443,13 @@ void runjob2( HYPRE_ParCSRMatrix parcsr_A,
 
    /* run for the first time without timing [some allocation is done] */
    /* run for a second time for timing */
-   for (i = 0 ; i < 2; i++)
+   for (i = 0 ; i < rep; i++)
    {
-      if (i == 1)
+      hypre_ParPrintf(comm, "--- rep %d (out of %d) ---\n", i, rep);
+
+      if (i == rep - 1)
       {
-         time_index = hypre_InitializeTiming("Device Parcsr Matrix-by-Matrix, RAP2");
+         time_index = hypre_InitializeTiming("Device Parcsr Matrix-by-Matrix, RAP");
          hypre_BeginTiming(time_index);
          //cudaProfilerStart();
       }
@@ -310,17 +472,19 @@ void runjob2( HYPRE_ParCSRMatrix parcsr_A,
          parcsr_AH = hypre_ParCSRMatrixRAPKT(parcsr_P, parcsr_A, parcsr_P, keepTranspose);
       }
 
-      if (i == 1)
+      if (i == rep - 1)
       {
-         hypre_SyncCudaDevice(hypre_handle());
+#if defined(HYPRE_USING_GPU)
+         hypre_SyncDevice();
+#endif
          //cudaProfilerStop();
          hypre_EndTiming(time_index);
-         hypre_PrintTiming("Device Parcsr Matrix-by-Matrix, RAP2", hypre_MPI_COMM_WORLD);
+         hypre_PrintTiming("Device Parcsr Matrix-by-Matrix, RAP", hypre_MPI_COMM_WORLD);
          hypre_FinalizeTiming(time_index);
          hypre_ClearTiming();
       }
 
-      if (i == 0)
+      if (i < rep - 1)
       {
          hypre_ParCSRMatrixDestroy(parcsr_Q);
          hypre_ParCSRMatrixDestroy(parcsr_AH);
@@ -340,23 +504,23 @@ void runjob2( HYPRE_ParCSRMatrix parcsr_A,
       fnorm0 = hypre_ParCSRMatrixFnorm(parcsr_AH_host);
       rfnorm = fnorm0 > 0 ? fnorm / fnorm0 : fnorm;
 
-      if (myid == 0)
-      {
-         printf("AH: %d x %d, nnz %d, CPU-GPU err %e\n", hypre_ParCSRMatrixGlobalNumRows(parcsr_AH_host_2),
-                                                         hypre_ParCSRMatrixGlobalNumCols(parcsr_AH_host_2),
-                                                         hypre_ParCSRMatrixNumNonzeros(parcsr_AH_host_2),
-                                                         rfnorm);
-      }
+      hypre_ParPrintf(comm, "AH: %d x %d, nnz [CPU %d, GPU %d], CPU-GPU err %e\n",
+                      hypre_ParCSRMatrixGlobalNumRows(parcsr_AH_host_2),
+                      hypre_ParCSRMatrixGlobalNumCols(parcsr_AH_host_2),
+                      hypre_ParCSRMatrixNumNonzeros(parcsr_AH_host),
+                      hypre_ParCSRMatrixNumNonzeros(parcsr_AH_host_2),
+                      rfnorm);
    }
 
-   hypre_IntArrayDestroy(CF_marker);
-   hypre_TFree(coarse_dof_func, HYPRE_MEMORY_HOST);
+   hypre_ParCSRMatrixSetNumNonzeros(parcsr_AH);
+
+   hypre_ParPrintf(comm, "AH %d x %d, NNZ %d, RNZ %d\n", hypre_ParCSRMatrixGlobalNumRows(parcsr_AH),
+                   hypre_ParCSRMatrixGlobalNumCols(parcsr_AH),
+                   hypre_ParCSRMatrixNumNonzeros(parcsr_AH),
+                   hypre_ParCSRMatrixNumNonzeros(parcsr_AH) / hypre_ParCSRMatrixGlobalNumRows(parcsr_AH));
 
-   hypre_ParCSRMatrixDestroy(parcsr_S);
-   hypre_ParCSRMatrixDestroy(parcsr_P);
    hypre_ParCSRMatrixDestroy(parcsr_Q);
    hypre_ParCSRMatrixDestroy(parcsr_AH);
-
    hypre_ParCSRMatrixDestroy(parcsr_A_host);
    hypre_ParCSRMatrixDestroy(parcsr_P_host);
    hypre_ParCSRMatrixDestroy(parcsr_Q_host);
@@ -365,6 +529,225 @@ void runjob2( HYPRE_ParCSRMatrix parcsr_A,
    hypre_ParCSRMatrixDestroy(parcsr_error_host);
 }
 
+void runjob4( HYPRE_ParCSRMatrix parcsr_A,
+              HYPRE_Int          print_system,
+              HYPRE_Int          rap2,
+              HYPRE_Int          mult_order,
+              HYPRE_Int          rep,
+              HYPRE_Int          verify)
+{
+   HYPRE_Int    measure_type = 0;
+   HYPRE_Real   trunc_factor = 0.0;
+   HYPRE_Int    P_max_elmts = 8;
+   HYPRE_Int    debug_flag = 0;
+   HYPRE_Int    num_functions = 1;
+   HYPRE_Real   strong_threshold = 0.25;
+   HYPRE_Real   max_row_sum = 1.0;
+   HYPRE_Int    local_num_vars;
+   HYPRE_BigInt coarse_pnts_global[2];
+
+   hypre_IntArray    *CF_marker         = NULL;
+   HYPRE_ParCSRMatrix parcsr_S          = NULL;
+   HYPRE_ParCSRMatrix parcsr_P          = NULL;
+
+   /* coarsening */
+   hypre_BoomerAMGCreateS(parcsr_A, strong_threshold, max_row_sum, num_functions, NULL, &parcsr_S);
+
+   hypre_BoomerAMGCoarsenPMIS(parcsr_S, parcsr_A, measure_type, debug_flag, &CF_marker);
+
+   local_num_vars = hypre_ParCSRMatrixNumRows(parcsr_A);
+
+   hypre_BoomerAMGCoarseParms(hypre_ParCSRMatrixComm(parcsr_A), local_num_vars, num_functions, NULL,
+                              CF_marker, NULL, coarse_pnts_global);
+
+   /* generate P */
+   hypre_BoomerAMGBuildExtPIInterp(parcsr_A, hypre_IntArrayData(CF_marker), parcsr_S,
+                                   coarse_pnts_global,
+                                   num_functions, NULL, debug_flag, trunc_factor, P_max_elmts,
+                                   &parcsr_P);
+
+   runjob3(parcsr_A, parcsr_P, 0, print_system, rap2, mult_order, rep, verify);
+
+   hypre_IntArrayDestroy(CF_marker);
+   hypre_ParCSRMatrixDestroy(parcsr_S);
+   hypre_ParCSRMatrixDestroy(parcsr_P);
+}
+
+void runjob5( HYPRE_ParCSRMatrix parcsr_A,
+              HYPRE_Int          print_system,
+              HYPRE_Int          rep,
+              HYPRE_Int          verify)
+{
+#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+   HYPRE_Int          i;
+   HYPRE_ParCSRMatrix parcsr_B          = NULL;
+   HYPRE_ParCSRMatrix parcsr_A_host     = NULL;
+   HYPRE_ParCSRMatrix parcsr_B_host     = NULL;
+   HYPRE_ParCSRMatrix parcsr_error_host = NULL;
+   HYPRE_Real         fnorm, rfnorm, fnorm0;
+   HYPRE_Int          time_index;
+   char               fname[1024];
+
+   MPI_Comm comm = hypre_ParCSRMatrixComm(parcsr_A);
+
+   hypre_ParPrintf(comm, "A %d x %d, NNZ %d, RNZ %d\n", hypre_ParCSRMatrixGlobalNumRows(parcsr_A),
+                   hypre_ParCSRMatrixGlobalNumCols(parcsr_A),
+                   hypre_ParCSRMatrixNumNonzeros(parcsr_A),
+                   hypre_ParCSRMatrixNumNonzeros(parcsr_A) / hypre_ParCSRMatrixGlobalNumRows(parcsr_A));
+
+   hypre_assert(hypre_ParCSRMatrixMemoryLocation(parcsr_A) == HYPRE_MEMORY_DEVICE);
+
+   // D = diag(diag(A))
+   HYPRE_ParCSRMatrix parcsr_D = hypre_ParCSRMatrixCreate(hypre_ParCSRMatrixComm(parcsr_A),
+                                                          hypre_ParCSRMatrixGlobalNumRows(parcsr_A),
+                                                          hypre_ParCSRMatrixGlobalNumCols(parcsr_A),
+                                                          hypre_ParCSRMatrixRowStarts(parcsr_A),
+                                                          hypre_ParCSRMatrixColStarts(parcsr_A),
+                                                          0,
+                                                          hypre_ParCSRMatrixNumRows(parcsr_A),
+                                                          0);
+   hypre_CSRMatrixDestroy(hypre_ParCSRMatrixDiag(parcsr_D));
+   hypre_ParCSRMatrixDiag(parcsr_D) = hypre_CSRMatrixDiagMatrixFromMatrixDevice(hypre_ParCSRMatrixDiag(
+                                                                                   parcsr_A), 0);
+
+   // Diag Scale on host
+   if (verify)
+   {
+      parcsr_A_host = hypre_ParCSRMatrixClone_v2(parcsr_A, 1, HYPRE_MEMORY_HOST);
+      hypre_Vector *vec_d_host = hypre_SeqVectorCreate(hypre_ParCSRMatrixNumRows(parcsr_A_host));
+      hypre_SeqVectorInitialize_v2(vec_d_host, HYPRE_MEMORY_HOST);
+
+      hypre_CSRMatrixExtractDiagonal(hypre_ParCSRMatrixDiag(parcsr_A_host),
+                                     hypre_VectorData(vec_d_host), 0);
+
+      time_index = hypre_InitializeTiming("Host Parcsr DiagScale Matrix, Diag(A)*A");
+      hypre_BeginTiming(time_index);
+
+      hypre_CSRMatrixDiagScale(hypre_ParCSRMatrixDiag(parcsr_A_host), vec_d_host, NULL);
+      hypre_CSRMatrixDiagScale(hypre_ParCSRMatrixOffd(parcsr_A_host), vec_d_host, NULL);
+
+      hypre_EndTiming(time_index);
+      hypre_PrintTiming("Host Parcsr DiagScale Matrix, Diag(A)*A", hypre_MPI_COMM_WORLD);
+      hypre_FinalizeTiming(time_index);
+      hypre_ClearTiming();
+
+      hypre_SeqVectorDestroy(vec_d_host);
+   }
+
+   // [FAST] diag scale using vector
+   {
+      HYPRE_ParCSRMatrix parcsr_C = hypre_ParCSRMatrixClone_v2(parcsr_A, 1, HYPRE_MEMORY_DEVICE);
+      hypre_Vector *vec_d = hypre_SeqVectorCreate(hypre_ParCSRMatrixNumRows(parcsr_C));
+      hypre_SeqVectorInitialize_v2(vec_d, HYPRE_MEMORY_DEVICE);
+
+      hypre_CSRMatrixExtractDiagonal(hypre_ParCSRMatrixDiag(parcsr_C),
+                                     hypre_VectorData(vec_d), 0);
+
+      for (i = 0 ; i < rep; i++)
+      {
+         if (i == rep - 1)
+         {
+            time_index = hypre_InitializeTiming("Device Parcsr DiagScale Matrix");
+            hypre_BeginTiming(time_index);
+         }
+
+         hypre_CSRMatrixDiagScale(hypre_ParCSRMatrixDiag(parcsr_C), vec_d, NULL);
+         hypre_CSRMatrixDiagScale(hypre_ParCSRMatrixOffd(parcsr_C), vec_d, NULL);
+
+         if (i == rep - 1)
+         {
+#if defined(HYPRE_USING_GPU)
+            hypre_SyncDevice();
+#endif
+            hypre_EndTiming(time_index);
+            hypre_PrintTiming("Device Parcsr DiagScale Matrix", hypre_MPI_COMM_WORLD);
+            hypre_FinalizeTiming(time_index);
+            hypre_ClearTiming();
+         }
+      }
+
+      hypre_ParCSRMatrixDestroy(parcsr_C);
+      hypre_SeqVectorDestroy(vec_d);
+   }
+
+   // [SLOW] Diag-by-Matrix
+   for (i = 0 ; i < rep; i++)
+   {
+      hypre_ParPrintf(comm, "--- rep %d (out of %d) ---\n", i, rep);
+
+      if (i == rep - 1)
+      {
+         time_index = hypre_InitializeTiming("Device Parcsr Matrix-by-Matrix, Diag(A)*A");
+         hypre_BeginTiming(time_index);
+      }
+
+      parcsr_B = hypre_ParCSRMatMat(parcsr_D, parcsr_A);
+
+      if (i == rep - 1)
+      {
+#if defined(HYPRE_USING_GPU)
+         hypre_SyncDevice();
+#endif
+         hypre_EndTiming(time_index);
+         hypre_PrintTiming("Device Parcsr Matrix-by-Matrix, Diag(A)*A", hypre_MPI_COMM_WORLD);
+         hypre_FinalizeTiming(time_index);
+         hypre_ClearTiming();
+      }
+
+      if (i < rep - 1)
+      {
+         hypre_ParCSRMatrixDestroy(parcsr_B);
+      }
+   }
+
+   if (verify)
+   {
+      parcsr_B_host = hypre_ParCSRMatrixClone_v2(parcsr_B, 1, HYPRE_MEMORY_HOST);
+      hypre_ParCSRMatrixSetNumNonzeros(parcsr_B_host);
+
+      hypre_ParCSRMatrixAdd(1.0, parcsr_A_host, -1.0, parcsr_B_host, &parcsr_error_host);
+      fnorm = hypre_ParCSRMatrixFnorm(parcsr_error_host);
+      fnorm0 = hypre_ParCSRMatrixFnorm(parcsr_B_host);
+      rfnorm = fnorm0 > 0 ? fnorm / fnorm0 : fnorm;
+
+      hypre_ParPrintf(comm, "Diag(A)*A: %d x %d, nnz [CPU %d, GPU %d], CPU-GPU err %e\n",
+                      hypre_ParCSRMatrixGlobalNumRows(parcsr_B_host),
+                      hypre_ParCSRMatrixGlobalNumCols(parcsr_B_host),
+                      hypre_ParCSRMatrixNumNonzeros(parcsr_A_host),
+                      hypre_ParCSRMatrixNumNonzeros(parcsr_B_host),
+                      rfnorm);
+   }
+
+   if (print_system)
+   {
+      if (!parcsr_B_host)
+      {
+         parcsr_B_host = hypre_ParCSRMatrixClone_v2(parcsr_B, 1, HYPRE_MEMORY_HOST);
+      }
+      sprintf(fname, "%s/%s", file_dir, "IJ.out.B");
+      hypre_ParCSRMatrixPrintIJ(parcsr_B_host, 0, 0, fname);
+   }
+
+   hypre_ParCSRMatrixSetNumNonzeros(parcsr_B);
+
+   hypre_ParPrintf(comm, "B %d x %d, NNZ %d, RNZ %d\n", hypre_ParCSRMatrixGlobalNumRows(parcsr_B),
+                   hypre_ParCSRMatrixGlobalNumCols(parcsr_B),
+                   hypre_ParCSRMatrixNumNonzeros(parcsr_B),
+                   hypre_ParCSRMatrixNumNonzeros(parcsr_B) / hypre_ParCSRMatrixGlobalNumRows(parcsr_B));
+
+   hypre_ParCSRMatrixDestroy(parcsr_B);
+   hypre_ParCSRMatrixDestroy(parcsr_A_host);
+   hypre_ParCSRMatrixDestroy(parcsr_B_host);
+   hypre_ParCSRMatrixDestroy(parcsr_D);
+   hypre_ParCSRMatrixDestroy(parcsr_error_host);
+#else
+   HYPRE_UNUSED_VAR(parcsr_A);
+   HYPRE_UNUSED_VAR(print_system);
+   HYPRE_UNUSED_VAR(rep);
+   HYPRE_UNUSED_VAR(verify);
+#endif
+}
+
 hypre_int
 main( hypre_int argc,
       char *argv[] )
@@ -375,25 +758,29 @@ main( hypre_int argc,
    HYPRE_Int           build_matrix_arg_index;
    HYPRE_Int           ierr = 0;
    void               *object;
-   HYPRE_IJMatrix     ij_A = NULL;
-   HYPRE_ParCSRMatrix parcsr_A   = NULL;
-   HYPRE_Int          errcode, job = 2;
-   HYPRE_Int          num_procs, myid;
-   HYPRE_Int          time_index;
-   MPI_Comm           comm = hypre_MPI_COMM_WORLD;
-   HYPRE_Int          first_local_row, last_local_row;//, local_num_rows;
-   HYPRE_Int          first_local_col, last_local_col;//, local_num_cols;
-   HYPRE_Int          mult_order = 0;
-
-   HYPRE_Int          print_system = 0;
-   HYPRE_Int          verify       = 0;
-   HYPRE_Int          use_cusparse = 0;
-   HYPRE_Int          spgemm_alg = 1;
-   HYPRE_Int          rowest_mtd = 3;
-   HYPRE_Int          rowest_nsamples = 32;
-   HYPRE_Real         rowest_mult = 1.0;
-   HYPRE_Int          zero_mem_cost = 0;
-   char               hash_type = 'L';
+   HYPRE_IJMatrix      ij_A = NULL;
+   HYPRE_IJMatrix      ij_P = NULL;
+   HYPRE_ParCSRMatrix  parcsr_A  = NULL;
+   HYPRE_ParCSRMatrix  parcsr_P  = NULL;
+   HYPRE_Int           errcode, job = 1;
+   HYPRE_Int           num_procs, myid;
+   HYPRE_Int           time_index;
+   MPI_Comm            comm = hypre_MPI_COMM_WORLD;
+   HYPRE_BigInt        first_local_row, last_local_row;
+   HYPRE_BigInt        first_local_col, last_local_col;
+   HYPRE_Int           rap2 = 0;
+   HYPRE_Int           mult_order = 0;
+   HYPRE_Int           print_system = 0;
+   HYPRE_Int           verify       = 0;
+   HYPRE_Int           use_vendor = 0;
+   HYPRE_Int           spgemm_alg = 1;
+   HYPRE_Int           spgemm_binned = 0;
+   HYPRE_Int           rowest_mtd = 3;
+   HYPRE_Int           rowest_nsamples = -1; /* default */
+   HYPRE_Real          rowest_mult = -1.0; /* default */
+   HYPRE_Int           zero_mem_cost = 0;
+   HYPRE_Int           boolean_P = 1;
+   HYPRE_Int           rep = 10;
 
    /*-----------------------------------------------------------
     * Initialize some stuff
@@ -406,24 +793,33 @@ main( hypre_int argc,
 
    /*-----------------------------------------------------------------
     * GPU Device binding
-    * Must be done before HYPRE_Init() and should not be changed after
+    * Must be done before HYPRE_Initialize() and should not be changed after
     *-----------------------------------------------------------------*/
-   hypre_bind_device(myid, num_procs, hypre_MPI_COMM_WORLD);
+   hypre_bind_device_id(-1, myid, num_procs, hypre_MPI_COMM_WORLD);
 
    /*-----------------------------------------------------------
     * Initialize : must be the first HYPRE function to call
     *-----------------------------------------------------------*/
-   HYPRE_Init();
+   HYPRE_Initialize();
+   HYPRE_DeviceInitialize();
+
+   if (myid == 0)
+   {
+      HYPRE_PrintDeviceInfo();
+   }
 
    /* for timing, sync after kernels */
+#if defined(HYPRE_USING_GPU)
    hypre_SetSyncCudaCompute(1);
-
-#if defined(HYPRE_USING_CUDA)
-   hypre_HandleDefaultExecPolicy(hypre_handle()) = HYPRE_EXEC_DEVICE;
 #endif
 
+   HYPRE_SetExecutionPolicy(HYPRE_EXEC_DEVICE);
+
    //hypre_SetNumThreads(20);
-   hypre_printf("CPU #OMP THREADS %d\n", hypre_NumThreads());
+   if (myid == 0)
+   {
+      hypre_printf("CPU #OMP THREADS %d\n", hypre_NumThreads());
+   }
 
    /*-----------------------------------------------------------
     * Set defaults
@@ -440,7 +836,13 @@ main( hypre_int argc,
 
    while ( (arg_index < argc) && (!print_usage) )
    {
-      if ( strcmp(argv[arg_index], "-fromfile") == 0 )
+      if ( strcmp(argv[arg_index], "-fromMMfile") == 0 )
+      {
+         arg_index++;
+         build_matrix_type      = -2;
+         build_matrix_arg_index = arg_index;
+      }
+      else if ( strcmp(argv[arg_index], "-fromfile") == 0 )
       {
          arg_index++;
          build_matrix_type      = -1;
@@ -452,11 +854,12 @@ main( hypre_int argc,
          build_matrix_type      = 0;
          build_matrix_arg_index = arg_index;
       }
-      else if ( strcmp(argv[arg_index], "-fromonecsrfile") == 0 )
+      else if ( strcmp(argv[arg_index], "-from2files") == 0 )
       {
          arg_index++;
          build_matrix_type      = 1;
          build_matrix_arg_index = arg_index;
+         arg_index++;
       }
       else if ( strcmp(argv[arg_index], "-laplacian") == 0 )
       {
@@ -509,21 +912,31 @@ main( hypre_int argc,
          arg_index++;
          verify = atoi(argv[arg_index++]);
       }
+      else if ( strcmp(argv[arg_index], "-rap2") == 0 )
+      {
+         arg_index++;
+         rap2 = atoi(argv[arg_index++]);
+      }
       else if ( strcmp(argv[arg_index], "-order") == 0 )
       {
          arg_index++;
          mult_order = atoi(argv[arg_index++]);
       }
-      else if ( strcmp(argv[arg_index], "-cusparse") == 0 )
+      else if ( strcmp(argv[arg_index], "-vendor") == 0 )
       {
          arg_index++;
-         use_cusparse = 1;
+         use_vendor = atoi(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-spgemmalg") == 0 )
       {
          arg_index++;
          spgemm_alg = atoi(argv[arg_index++]);
       }
+      else if ( strcmp(argv[arg_index], "-spgemm_binned") == 0 )
+      {
+         arg_index++;
+         spgemm_binned  = atoi(argv[arg_index++]);
+      }
       else if ( strcmp(argv[arg_index], "-rowest") == 0 )
       {
          arg_index++;
@@ -532,7 +945,7 @@ main( hypre_int argc,
       else if ( strcmp(argv[arg_index], "-rowestmult") == 0 )
       {
          arg_index++;
-         rowest_mult = atof(argv[arg_index++]);
+         rowest_mult = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-rowestnsamples") == 0 )
       {
@@ -544,16 +957,20 @@ main( hypre_int argc,
          arg_index++;
          job  = atoi(argv[arg_index++]);
       }
-      else if ( strcmp(argv[arg_index], "-hash") == 0 )
+      else if ( strcmp(argv[arg_index], "-rep") == 0 )
       {
          arg_index++;
-         hash_type = argv[arg_index++][0];
+         rep  = atoi(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-zeromemcost") == 0 )
       {
          arg_index++;
          zero_mem_cost = atoi(argv[arg_index++]);
       }
+      else if ( strcmp(argv[arg_index], "-help") == 0 )
+      {
+         print_usage = 1;
+      }
       else
       {
          arg_index++;
@@ -565,7 +982,7 @@ main( hypre_int argc,
 #ifdef HYPRE_USING_CUDA
       total_size = 15LL * 1024 * 1024 * 1024;
 #elif defined(HYPRE_USING_HIP)
-      total_size = 31LL * 1024 * 1024 * 1024;
+      total_size = 20LL * 1024 * 1024 * 1024;
 #endif
       gpu_ptr = hypre_TAlloc(char, total_size, HYPRE_MEMORY_DEVICE);
       hypre_SetUserDeviceMalloc(gpu_alloc);
@@ -604,12 +1021,11 @@ main( hypre_int argc,
          hypre_printf("           0=Forward (default)       1=Backward\n");
          hypre_printf("           2=Centered                3=Upwind\n");
          hypre_printf("\n");
-         hypre_printf("  -exact_size            : inserts immediately into ParCSR structure\n");
-         hypre_printf("  -storage_low           : allocates not enough storage for aux struct\n");
          hypre_printf("  -concrete_parcsr       : use parcsr matrix type as concrete type\n");
          hypre_printf("\n");
-
-         hypre_printf("  -Pmx  <val>            : set maximal no. of elmts per row for AMG interpolation (default: 4)\n");
+         hypre_printf("  -job                   : 1. A^2  2. A^T*A  3. P^T*A*P\n");
+         hypre_printf("                           4. P^T*A*P (P is AMG Interp from A)\n");
+         hypre_printf("                           5. Diag(A) * A\n");
       }
       goto final;
    }
@@ -619,23 +1035,39 @@ main( hypre_int argc,
     *-----------------------------------------------------------*/
    errcode = hypre_SetSpGemmRownnzEstimateMethod(rowest_mtd);
    hypre_assert(errcode == 0);
-   errcode = hypre_SetSpGemmRownnzEstimateNSamples(rowest_nsamples);
-   hypre_assert(errcode == 0);
-   errcode = hypre_SetSpGemmRownnzEstimateMultFactor(rowest_mult);
-   hypre_assert(errcode == 0);
-   errcode = hypre_SetSpGemmHashType(hash_type);
-   hypre_assert(errcode == 0);
-   errcode = HYPRE_SetSpGemmUseCusparse(use_cusparse);
+   if (rowest_nsamples > 0)
+   {
+      errcode = hypre_SetSpGemmRownnzEstimateNSamples(rowest_nsamples);
+      hypre_assert(errcode == 0);
+   }
+   if (rowest_mult > 0.0)
+   {
+      errcode = hypre_SetSpGemmRownnzEstimateMultFactor(rowest_mult);
+      hypre_assert(errcode == 0);
+   }
+   errcode = HYPRE_SetSpGemmUseVendor(use_vendor);
    hypre_assert(errcode == 0);
    errcode = hypre_SetSpGemmAlgorithm(spgemm_alg);
    hypre_assert(errcode == 0);
+   ierr = hypre_SetSpGemmBinned(spgemm_binned);
+   hypre_assert(ierr == 0);
 
    /*-----------------------------------------------------------
     * Set up matrix
     *-----------------------------------------------------------*/
-   time_index = hypre_InitializeTiming("Generate Matrix A");
+   time_index = hypre_InitializeTiming("Generate Matrices");
    hypre_BeginTiming(time_index);
-   if ( build_matrix_type == -1 )
+   if ( build_matrix_type == -2 )
+   {
+      ierr = HYPRE_IJMatrixReadMM( argv[build_matrix_arg_index], comm,
+                                   HYPRE_PARCSR, &ij_A );
+      if (ierr)
+      {
+         hypre_printf("ERROR: Problem reading in the system matrix in MM format!\n");
+         exit(1);
+      }
+   }
+   else if ( build_matrix_type == -1 )
    {
       ierr = HYPRE_IJMatrixRead( argv[build_matrix_arg_index], comm,
                                  HYPRE_PARCSR, &ij_A );
@@ -649,6 +1081,18 @@ main( hypre_int argc,
    {
       BuildParFromFile(argc, argv, build_matrix_arg_index, &parcsr_A);
    }
+   else if ( build_matrix_type == 1 )
+   {
+      HYPRE_Int ierr1 = HYPRE_IJMatrixRead( argv[build_matrix_arg_index], comm,
+                                            HYPRE_PARCSR, &ij_A );
+      HYPRE_Int ierr2 = HYPRE_IJMatrixRead( argv[build_matrix_arg_index + 1], comm,
+                                            HYPRE_PARCSR, &ij_P );
+      if (ierr1 || ierr2)
+      {
+         hypre_printf("ERROR: Problem reading in the system matrix!\n");
+         exit(1);
+      }
+   }
    else if ( build_matrix_type == 2 )
    {
       BuildParLaplacian(argc, argv, build_matrix_arg_index, &parcsr_A);
@@ -673,13 +1117,14 @@ main( hypre_int argc,
    {
       hypre_printf("You have asked for an unsupported problem with\n");
       hypre_printf("build_matrix_type = %d.\n", build_matrix_type);
-      return(-1);
+      return (-1);
    }
 
-   if (build_matrix_type < 0)
+   /* first matrix */
+   if (ij_A)
    {
       ierr = HYPRE_IJMatrixGetLocalRange( ij_A,
-                                          &first_local_row, &last_local_row ,
+                                          &first_local_row, &last_local_row,
                                           &first_local_col, &last_local_col );
 
       ierr += HYPRE_IJMatrixGetObject( ij_A, &object);
@@ -691,31 +1136,60 @@ main( hypre_int argc,
        * Copy the parcsr matrix into the IJMatrix through interface calls
        *-----------------------------------------------------------*/
       ierr = HYPRE_ParCSRMatrixGetLocalRange( parcsr_A,
-                                              &first_local_row, &last_local_row ,
+                                              &first_local_row, &last_local_row,
                                               &first_local_col, &last_local_col );
+   }
+
+   hypre_ParCSRMatrixSetNumNonzeros(parcsr_A);
 
-      //local_num_rows = last_local_row - first_local_row + 1;
-      //local_num_cols = last_local_col - first_local_col + 1;
+   /* [optional] second matrix */
+   if (ij_P)
+   {
+      ierr += HYPRE_IJMatrixGetObject( ij_P, &object);
+      parcsr_P = (HYPRE_ParCSRMatrix) object;
+   }
+
+   if (parcsr_P)
+   {
+      hypre_ParCSRMatrixSetNumNonzeros(parcsr_P);
    }
 
    hypre_EndTiming(time_index);
-   hypre_PrintTiming("Generate Matrix A", hypre_MPI_COMM_WORLD);
+   hypre_PrintTiming("Generate Matrices", hypre_MPI_COMM_WORLD);
    hypre_FinalizeTiming(time_index);
    hypre_ClearTiming();
 
+   hypre_ParCSRMatrixMigrate(parcsr_A, hypre_HandleMemoryLocation(hypre_handle()));
+   if (parcsr_P)
+   {
+      hypre_ParCSRMatrixMigrate(parcsr_P, hypre_HandleMemoryLocation(hypre_handle()));
+   }
+
    if (job == 1)
    {
-      runjob1(parcsr_A, print_system, verify);
+      runjob1(parcsr_A, print_system, rep, verify);
    }
    else if (job == 2)
    {
-      runjob2(parcsr_A, print_system, mult_order, verify);
+      runjob2(parcsr_A, print_system, rep, verify);
+   }
+   else if (job == 3)
+   {
+      runjob3(parcsr_A, parcsr_P, boolean_P, print_system, rap2, mult_order, rep, verify);
+   }
+   else if (job == 4)
+   {
+      runjob4(parcsr_A, print_system, rap2, mult_order, rep, verify);
+   }
+   else if (job == 5)
+   {
+      runjob5(parcsr_A, print_system, rep, verify);
    }
 
    /*-----------------------------------------------------------
     * Finalize things
     *-----------------------------------------------------------*/
-   if (build_matrix_type == -1)
+   if (ij_A)
    {
       HYPRE_IJMatrixDestroy(ij_A);
    }
@@ -724,7 +1198,14 @@ main( hypre_int argc,
       HYPRE_ParCSRMatrixDestroy(parcsr_A);
    }
 
- final:
+   if (ij_P)
+   {
+      HYPRE_IJMatrixDestroy(ij_P);
+   }
+
+final:
+
+   hypre_TFree(gpu_ptr, HYPRE_MEMORY_DEVICE);
 
    /* Finalize Hypre */
    HYPRE_Finalize();
@@ -732,10 +1213,6 @@ main( hypre_int argc,
    /* Finalize MPI */
    hypre_MPI_Finalize();
 
-   hypre_printf("Done ...\n");
-
-   hypre_TFree(gpu_ptr, HYPRE_MEMORY_DEVICE);
-
    return (0);
 }
 
@@ -793,7 +1270,7 @@ BuildParFromFile( HYPRE_Int            argc,
     * Generate the matrix
     *-----------------------------------------------------------*/
 
-   HYPRE_ParCSRMatrixRead(hypre_MPI_COMM_WORLD, filename,&A);
+   HYPRE_ParCSRMatrixRead(hypre_MPI_COMM_WORLD, filename, &A);
 
    *A_ptr = A;
 
@@ -853,7 +1330,7 @@ BuildParRhsFromFile( HYPRE_Int            argc,
     * Generate the matrix
     *-----------------------------------------------------------*/
 
-   HYPRE_ParVectorRead(hypre_MPI_COMM_WORLD, filename,&b);
+   HYPRE_ParVectorRead(hypre_MPI_COMM_WORLD, filename, &b);
 
    *b_ptr = b;
 
@@ -939,9 +1416,9 @@ BuildParLaplacian( HYPRE_Int            argc,
       else if ( strcmp(argv[arg_index], "-c") == 0 )
       {
          arg_index++;
-         cx = atof(argv[arg_index++]);
-         cy = atof(argv[arg_index++]);
-         cz = atof(argv[arg_index++]);
+         cx = (HYPRE_Real)atof(argv[arg_index++]);
+         cy = (HYPRE_Real)atof(argv[arg_index++]);
+         cz = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-sysL") == 0 )
       {
@@ -967,7 +1444,7 @@ BuildParLaplacian( HYPRE_Int            argc,
       else if ( strcmp(argv[arg_index], "-ep") == 0 )
       {
          arg_index++;
-         ep = atof(argv[arg_index++]);
+         ep = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else
       {
@@ -979,7 +1456,7 @@ BuildParLaplacian( HYPRE_Int            argc,
     * Check a few things
     *-----------------------------------------------------------*/
 
-   if ((P*Q*R) != num_procs)
+   if ((P * Q * R) != num_procs)
    {
       hypre_printf("Error: Invalid number of processors or processor topology \n");
       exit(1);
@@ -1003,8 +1480,8 @@ BuildParLaplacian( HYPRE_Int            argc,
 
    /* compute p,q,r from P,Q,R and myid */
    p = myid % P;
-   q = (( myid - p)/P) % Q;
-   r = ( myid - p - P*q)/( P*Q );
+   q = (( myid - p) / P) % Q;
+   r = ( myid - p - P * q) / ( P * Q );
 
    /*-----------------------------------------------------------
     * Generate the matrix
@@ -1019,15 +1496,15 @@ BuildParLaplacian( HYPRE_Int            argc,
    values[0] = 0.;
    if (nx > 1)
    {
-      values[0] += 2.0*cx;
+      values[0] += 2.0 * cx;
    }
    if (ny > 1)
    {
-      values[0] += 2.0*cy;
+      values[0] += 2.0 * cy;
    }
    if (nz > 1)
    {
-      values[0] += 2.0*cz;
+      values[0] += 2.0 * cz;
    }
 
    if (num_fun == 1)
@@ -1035,46 +1512,46 @@ BuildParLaplacian( HYPRE_Int            argc,
                                                  nx, ny, nz, P, Q, R, p, q, r, values);
    else
    {
-      mtrx = hypre_CTAlloc(HYPRE_Real,  num_fun*num_fun, HYPRE_MEMORY_HOST);
+      mtrx = hypre_CTAlloc(HYPRE_Real,  num_fun * num_fun, HYPRE_MEMORY_HOST);
 
       if (num_fun == 2)
       {
-         if (sys_opt ==1) /* identity  */
+         if (sys_opt == 1) /* identity  */
          {
             mtrx[0] = 1.0;
             mtrx[1] = 0.0;
             mtrx[2] = 0.0;
             mtrx[3] = 1.0;
          }
-         else if (sys_opt ==2)
+         else if (sys_opt == 2)
          {
             mtrx[0] = 1.0;
             mtrx[1] = 0.0;
             mtrx[2] = 0.0;
             mtrx[3] = 20.0;
          }
-         else if (sys_opt ==3) /* similar to barry's talk - ex1 */
+         else if (sys_opt == 3) /* similar to barry's talk - ex1 */
          {
             mtrx[0] = 1.0;
             mtrx[1] = 2.0;
             mtrx[2] = 2.0;
             mtrx[3] = 1.0;
          }
-         else if (sys_opt ==4) /* can use with vcoef to get barry's ex*/
+         else if (sys_opt == 4) /* can use with vcoef to get barry's ex*/
          {
             mtrx[0] = 1.0;
             mtrx[1] = 1.0;
             mtrx[2] = 1.0;
             mtrx[3] = 1.0;
          }
-         else if (sys_opt ==5) /* barry's talk - ex1 */
+         else if (sys_opt == 5) /* barry's talk - ex1 */
          {
             mtrx[0] = 1.0;
             mtrx[1] = 1.1;
             mtrx[2] = 1.1;
             mtrx[3] = 1.0;
          }
-         else if (sys_opt ==6) /*  */
+         else if (sys_opt == 6) /*  */
          {
             mtrx[0] = 1.1;
             mtrx[1] = 1.0;
@@ -1092,7 +1569,7 @@ BuildParLaplacian( HYPRE_Int            argc,
       }
       else if (num_fun == 3)
       {
-         if (sys_opt ==1)
+         if (sys_opt == 1)
          {
             mtrx[0] = 1.0;
             mtrx[1] = 0.0;
@@ -1104,7 +1581,7 @@ BuildParLaplacian( HYPRE_Int            argc,
             mtrx[7] = 0.0;
             mtrx[8] = 1.0;
          }
-         else if (sys_opt ==2)
+         else if (sys_opt == 2)
          {
             mtrx[0] = 1.0;
             mtrx[1] = 0.0;
@@ -1114,9 +1591,9 @@ BuildParLaplacian( HYPRE_Int            argc,
             mtrx[5] = 0.0;
             mtrx[6] = 0.0;
             mtrx[7] = 0.0;
-            mtrx[8] =.01;
+            mtrx[8] = .01;
          }
-         else if (sys_opt ==3)
+         else if (sys_opt == 3)
          {
             mtrx[0] = 1.01;
             mtrx[1] = 1;
@@ -1128,7 +1605,7 @@ BuildParLaplacian( HYPRE_Int            argc,
             mtrx[7] = 1;
             mtrx[8] = 1.01;
          }
-         else if (sys_opt ==4) /* barry ex4 */
+         else if (sys_opt == 4) /* barry ex4 */
          {
             mtrx[0] = 3;
             mtrx[1] = 1;
@@ -1189,7 +1666,7 @@ BuildParLaplacian( HYPRE_Int            argc,
 
          HYPRE_Real *mtrx_values;
 
-         mtrx_values = hypre_CTAlloc(HYPRE_Real,  num_fun*num_fun*4, HYPRE_MEMORY_HOST);
+         mtrx_values = hypre_CTAlloc(HYPRE_Real,  num_fun * num_fun * 4, HYPRE_MEMORY_HOST);
 
          if (num_fun == 2)
          {
@@ -1229,13 +1706,13 @@ BuildParLaplacian( HYPRE_Int            argc,
             {
 
                /* mtrx[0] */
-               SetSysVcoefValues(num_fun, nx, ny, nz, ep*1.0, 1.0, 1.0, 0, mtrx_values);
+               SetSysVcoefValues(num_fun, nx, ny, nz, ep * 1.0, 1.0, 1.0, 0, mtrx_values);
 
                /* mtrx[1] */
                SetSysVcoefValues(num_fun, nx, ny, nz, 1.0, 1.0, 1.0, 1, mtrx_values);
 
                /* mtrx[2] */
-               SetSysVcoefValues(num_fun, nx, ny, nz, ep*1.0, 1.0, 1.0, 2, mtrx_values);
+               SetSysVcoefValues(num_fun, nx, ny, nz, ep * 1.0, 1.0, 1.0, 2, mtrx_values);
 
                /* mtrx[3] */
                SetSysVcoefValues(num_fun, nx, ny, nz, 1.0, 1.0, 1.0, 3, mtrx_values);
@@ -1245,16 +1722,16 @@ BuildParLaplacian( HYPRE_Int            argc,
                HYPRE_Real ep2 = ep;
 
                /* mtrx[0] */
-               SetSysVcoefValues(num_fun, nx, ny, nz, ep*1.0, 1.0, 1.0, 0, mtrx_values);
+               SetSysVcoefValues(num_fun, nx, ny, nz, ep * 1.0, 1.0, 1.0, 0, mtrx_values);
 
                /* mtrx[1] */
-               SetSysVcoefValues(num_fun, nx, ny, nz, 1.0, ep*1.0, 1.0, 1, mtrx_values);
+               SetSysVcoefValues(num_fun, nx, ny, nz, 1.0, ep * 1.0, 1.0, 1, mtrx_values);
 
                /* mtrx[2] */
-               SetSysVcoefValues(num_fun, nx, ny, nz, ep*1.0, 1.0, 1.0, 2, mtrx_values);
+               SetSysVcoefValues(num_fun, nx, ny, nz, ep * 1.0, 1.0, 1.0, 2, mtrx_values);
 
                /* mtrx[3] */
-               SetSysVcoefValues(num_fun, nx, ny, nz, 1.0, ep2*1.0, 1.0, 3, mtrx_values);
+               SetSysVcoefValues(num_fun, nx, ny, nz, 1.0, ep2 * 1.0, 1.0, 3, mtrx_values);
             }
             else if (vcoef_opt == 5) /* use with default sys_opt  - */
             {
@@ -1263,16 +1740,16 @@ BuildParLaplacian( HYPRE_Int            argc,
                beta = 10;
 
                /* mtrx[0] */
-               SetSysVcoefValues(num_fun, nx, ny, nz, alp*1.0, 1.0, 1.0, 0, mtrx_values);
+               SetSysVcoefValues(num_fun, nx, ny, nz, alp * 1.0, 1.0, 1.0, 0, mtrx_values);
 
                /* mtrx[1] */
-               SetSysVcoefValues(num_fun, nx, ny, nz, 1.0, beta*1.0, 1.0, 1, mtrx_values);
+               SetSysVcoefValues(num_fun, nx, ny, nz, 1.0, beta * 1.0, 1.0, 1, mtrx_values);
 
                /* mtrx[2] */
-               SetSysVcoefValues(num_fun, nx, ny, nz, alp*1.0, 1.0, 1.0, 2, mtrx_values);
+               SetSysVcoefValues(num_fun, nx, ny, nz, alp * 1.0, 1.0, 1.0, 2, mtrx_values);
 
                /* mtrx[3] */
-               SetSysVcoefValues(num_fun, nx, ny, nz, 1.0, beta*1.0, 1.0, 3, mtrx_values);
+               SetSysVcoefValues(num_fun, nx, ny, nz, 1.0, beta * 1.0, 1.0, 3, mtrx_values);
             }
             else  /* = 0 */
             {
@@ -1372,7 +1849,7 @@ BuildParDifConv( HYPRE_Int            argc,
    HYPRE_Int           P, Q, R;
    HYPRE_Real          cx, cy, cz;
    HYPRE_Real          ax, ay, az, atype;
-   HYPRE_Real          hinx,hiny,hinz;
+   HYPRE_Real          hinx, hiny, hinz;
    HYPRE_Int           sign_prod;
 
    HYPRE_ParCSRMatrix  A;
@@ -1433,16 +1910,16 @@ BuildParDifConv( HYPRE_Int            argc,
       else if ( strcmp(argv[arg_index], "-c") == 0 )
       {
          arg_index++;
-         cx = atof(argv[arg_index++]);
-         cy = atof(argv[arg_index++]);
-         cz = atof(argv[arg_index++]);
+         cx = (HYPRE_Real)atof(argv[arg_index++]);
+         cy = (HYPRE_Real)atof(argv[arg_index++]);
+         cz = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-a") == 0 )
       {
          arg_index++;
-         ax = atof(argv[arg_index++]);
-         ay = atof(argv[arg_index++]);
-         az = atof(argv[arg_index++]);
+         ax = (HYPRE_Real)atof(argv[arg_index++]);
+         ay = (HYPRE_Real)atof(argv[arg_index++]);
+         az = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-atype") == 0 )
       {
@@ -1459,7 +1936,7 @@ BuildParDifConv( HYPRE_Int            argc,
     * Check a few things
     *-----------------------------------------------------------*/
 
-   if ((P*Q*R) != num_procs)
+   if ((P * Q * R) != num_procs)
    {
       hypre_printf("Error: Invalid number of processors or processor topology \n");
       exit(1);
@@ -1485,12 +1962,12 @@ BuildParDifConv( HYPRE_Int            argc,
 
    /* compute p,q,r from P,Q,R and myid */
    p = myid % P;
-   q = (( myid - p)/P) % Q;
-   r = ( myid - p - P*q)/( P*Q );
+   q = (( myid - p) / P) % Q;
+   r = ( myid - p - P * q) / ( P * Q );
 
-   hinx = 1./(nx+1);
-   hiny = 1./(ny+1);
-   hinz = 1./(nz+1);
+   hinx = 1. / (nx + 1);
+   hiny = 1. / (ny + 1);
+   hinz = 1. / (nz + 1);
 
    /*-----------------------------------------------------------
     * Generate the matrix
@@ -1510,46 +1987,46 @@ BuildParDifConv( HYPRE_Int            argc,
 
    if (0 == atype) /* forward scheme for conv */
    {
-      values[1] = -cx/(hinx*hinx);
-      values[2] = -cy/(hiny*hiny);
-      values[3] = -cz/(hinz*hinz);
-      values[4] = -cx/(hinx*hinx) + ax/hinx;
-      values[5] = -cy/(hiny*hiny) + ay/hiny;
-      values[6] = -cz/(hinz*hinz) + az/hinz;
+      values[1] = -cx / (hinx * hinx);
+      values[2] = -cy / (hiny * hiny);
+      values[3] = -cz / (hinz * hinz);
+      values[4] = -cx / (hinx * hinx) + ax / hinx;
+      values[5] = -cy / (hiny * hiny) + ay / hiny;
+      values[6] = -cz / (hinz * hinz) + az / hinz;
 
       if (nx > 1)
       {
-         values[0] += 2.0*cx/(hinx*hinx) - 1.*ax/hinx;
+         values[0] += 2.0 * cx / (hinx * hinx) - 1.*ax / hinx;
       }
       if (ny > 1)
       {
-         values[0] += 2.0*cy/(hiny*hiny) - 1.*ay/hiny;
+         values[0] += 2.0 * cy / (hiny * hiny) - 1.*ay / hiny;
       }
       if (nz > 1)
       {
-         values[0] += 2.0*cz/(hinz*hinz) - 1.*az/hinz;
+         values[0] += 2.0 * cz / (hinz * hinz) - 1.*az / hinz;
       }
    }
    else if (1 == atype) /* backward scheme for conv */
    {
-      values[1] = -cx/(hinx*hinx) - ax/hinx;
-      values[2] = -cy/(hiny*hiny) - ay/hiny;
-      values[3] = -cz/(hinz*hinz) - az/hinz;
-      values[4] = -cx/(hinx*hinx);
-      values[5] = -cy/(hiny*hiny);
-      values[6] = -cz/(hinz*hinz);
+      values[1] = -cx / (hinx * hinx) - ax / hinx;
+      values[2] = -cy / (hiny * hiny) - ay / hiny;
+      values[3] = -cz / (hinz * hinz) - az / hinz;
+      values[4] = -cx / (hinx * hinx);
+      values[5] = -cy / (hiny * hiny);
+      values[6] = -cz / (hinz * hinz);
 
       if (nx > 1)
       {
-         values[0] += 2.0*cx/(hinx*hinx) + 1.*ax/hinx;
+         values[0] += 2.0 * cx / (hinx * hinx) + 1.*ax / hinx;
       }
       if (ny > 1)
       {
-         values[0] += 2.0*cy/(hiny*hiny) + 1.*ay/hiny;
+         values[0] += 2.0 * cy / (hiny * hiny) + 1.*ay / hiny;
       }
       if (nz > 1)
       {
-         values[0] += 2.0*cz/(hinz*hinz) + 1.*az/hinz;
+         values[0] += 2.0 * cz / (hinz * hinz) + 1.*az / hinz;
       }
    }
    else if (3 == atype) /* upwind scheme */
@@ -1557,83 +2034,83 @@ BuildParDifConv( HYPRE_Int            argc,
       sign_prod = sign_double(cx) * sign_double(ax);
       if (sign_prod == 1) /* same sign use back scheme */
       {
-         values[1] = -cx/(hinx*hinx) - ax/hinx;
-         values[4] = -cx/(hinx*hinx);
+         values[1] = -cx / (hinx * hinx) - ax / hinx;
+         values[4] = -cx / (hinx * hinx);
          if (nx > 1)
          {
-            values[0] += 2.0*cx/(hinx*hinx) + 1.*ax/hinx;
+            values[0] += 2.0 * cx / (hinx * hinx) + 1.*ax / hinx;
          }
       }
       else /* diff sign use forward scheme */
       {
-         values[1] = -cx/(hinx*hinx);
-         values[4] = -cx/(hinx*hinx) + ax/hinx;
+         values[1] = -cx / (hinx * hinx);
+         values[4] = -cx / (hinx * hinx) + ax / hinx;
          if (nx > 1)
          {
-            values[0] += 2.0*cx/(hinx*hinx) - 1.*ax/hinx;
+            values[0] += 2.0 * cx / (hinx * hinx) - 1.*ax / hinx;
          }
       }
 
       sign_prod = sign_double(cy) * sign_double(ay);
       if (sign_prod == 1) /* same sign use back scheme */
       {
-         values[2] = -cy/(hiny*hiny) - ay/hiny;
-         values[5] = -cy/(hiny*hiny);
+         values[2] = -cy / (hiny * hiny) - ay / hiny;
+         values[5] = -cy / (hiny * hiny);
          if (ny > 1)
          {
-            values[0] += 2.0*cy/(hiny*hiny) + 1.*ay/hiny;
+            values[0] += 2.0 * cy / (hiny * hiny) + 1.*ay / hiny;
          }
       }
       else /* diff sign use forward scheme */
       {
-         values[2] = -cy/(hiny*hiny);
-         values[5] = -cy/(hiny*hiny) + ay/hiny;
+         values[2] = -cy / (hiny * hiny);
+         values[5] = -cy / (hiny * hiny) + ay / hiny;
          if (ny > 1)
          {
-            values[0] += 2.0*cy/(hiny*hiny) - 1.*ay/hiny;
+            values[0] += 2.0 * cy / (hiny * hiny) - 1.*ay / hiny;
          }
       }
 
       sign_prod = sign_double(cz) * sign_double(az);
       if (sign_prod == 1) /* same sign use back scheme */
       {
-         values[3] = -cz/(hinz*hinz) - az/hinz;
-         values[6] = -cz/(hinz*hinz);
+         values[3] = -cz / (hinz * hinz) - az / hinz;
+         values[6] = -cz / (hinz * hinz);
          if (nz > 1)
          {
-            values[0] += 2.0*cz/(hinz*hinz) + 1.*az/hinz;
+            values[0] += 2.0 * cz / (hinz * hinz) + 1.*az / hinz;
          }
       }
       else /* diff sign use forward scheme */
       {
-         values[3] = -cz/(hinz*hinz);
-         values[6] = -cz/(hinz*hinz) + az/hinz;
+         values[3] = -cz / (hinz * hinz);
+         values[6] = -cz / (hinz * hinz) + az / hinz;
          if (nz > 1)
          {
-            values[0] += 2.0*cz/(hinz*hinz) - 1.*az/hinz;
+            values[0] += 2.0 * cz / (hinz * hinz) - 1.*az / hinz;
          }
       }
    }
    else /* centered difference scheme */
    {
-      values[1] = -cx/(hinx*hinx) - ax/(2.*hinx);
-      values[2] = -cy/(hiny*hiny) - ay/(2.*hiny);
-      values[3] = -cz/(hinz*hinz) - az/(2.*hinz);
-      values[4] = -cx/(hinx*hinx) + ax/(2.*hinx);
-      values[5] = -cy/(hiny*hiny) + ay/(2.*hiny);
-      values[6] = -cz/(hinz*hinz) + az/(2.*hinz);
+      values[1] = -cx / (hinx * hinx) - ax / (2.*hinx);
+      values[2] = -cy / (hiny * hiny) - ay / (2.*hiny);
+      values[3] = -cz / (hinz * hinz) - az / (2.*hinz);
+      values[4] = -cx / (hinx * hinx) + ax / (2.*hinx);
+      values[5] = -cy / (hiny * hiny) + ay / (2.*hiny);
+      values[6] = -cz / (hinz * hinz) + az / (2.*hinz);
 
       if (nx > 1)
       {
-         values[0] += 2.0*cx/(hinx*hinx);
+         values[0] += 2.0 * cx / (hinx * hinx);
       }
       if (ny > 1)
       {
-         values[0] += 2.0*cy/(hiny*hiny);
+         values[0] += 2.0 * cy / (hiny * hiny);
       }
       if (nz > 1)
       {
-         values[0] += 2.0*cz/(hinz*hinz);
+         values[0] += 2.0 * cz / (hinz * hinz);
       }
    }
 
@@ -1712,7 +2189,7 @@ BuildParLaplacian9pt( HYPRE_Int                  argc,
     * Check a few things
     *-----------------------------------------------------------*/
 
-   if ((P*Q) != num_procs)
+   if ((P * Q) != num_procs)
    {
       hypre_printf("Error: Invalid number of processors or processor topology \n");
       exit(1);
@@ -1735,7 +2212,7 @@ BuildParLaplacian9pt( HYPRE_Int                  argc,
 
    /* compute p,q from P,Q and myid */
    p = myid % P;
-   q = ( myid - p)/P;
+   q = ( myid - p) / P;
 
    /*-----------------------------------------------------------
     * Generate the matrix
@@ -1837,7 +2314,7 @@ BuildParLaplacian27pt( HYPRE_Int                  argc,
     * Check a few things
     *-----------------------------------------------------------*/
 
-   if ((P*Q*R) != num_procs)
+   if ((P * Q * R) != num_procs)
    {
       hypre_printf("Error: Invalid number of processors or processor topology \n");
       exit(1);
@@ -1860,8 +2337,8 @@ BuildParLaplacian27pt( HYPRE_Int                  argc,
 
    /* compute p,q,r from P,Q,R and myid */
    p = myid % P;
-   q = (( myid - p)/P) % Q;
-   r = ( myid - p - P*q)/( P*Q );
+   q = (( myid - p) / P) % Q;
+   r = ( myid - p - P * q) / ( P * Q );
 
    /*-----------------------------------------------------------
     * Generate the matrix
@@ -1871,9 +2348,13 @@ BuildParLaplacian27pt( HYPRE_Int                  argc,
 
    values[0] = 26.0;
    if (nx == 1 || ny == 1 || nz == 1)
+   {
       values[0] = 8.0;
-   if (nx*ny == 1 || nx*nz == 1 || ny*nz == 1)
+   }
+   if (nx * ny == 1 || nx * nz == 1 || ny * nz == 1)
+   {
       values[0] = 2.0;
+   }
    values[1] = -1.;
 
    A = (HYPRE_ParCSRMatrix) GenerateLaplacian27pt(hypre_MPI_COMM_WORLD,
@@ -1893,19 +2374,19 @@ BuildParLaplacian27pt( HYPRE_Int                  argc,
  *----------------------------------------------------------------------*/
 
 HYPRE_Int
-BuildParRotate7pt( HYPRE_Int                  argc,
+BuildParRotate7pt( HYPRE_Int            argc,
                    char                *argv[],
-                   HYPRE_Int                  arg_index,
+                   HYPRE_Int            arg_index,
                    HYPRE_ParCSRMatrix  *A_ptr     )
 {
    HYPRE_Int                 nx, ny;
    HYPRE_Int                 P, Q;
 
-   HYPRE_ParCSRMatrix  A;
+   HYPRE_ParCSRMatrix        A;
 
    HYPRE_Int                 num_procs, myid;
    HYPRE_Int                 p, q;
-   HYPRE_Real          eps, alpha;
+   HYPRE_Real                eps = 0.0, alpha = 1.0;
 
    /*-----------------------------------------------------------
     * Initialize some stuff
@@ -1945,12 +2426,12 @@ BuildParRotate7pt( HYPRE_Int                  argc,
       else if ( strcmp(argv[arg_index], "-alpha") == 0 )
       {
          arg_index++;
-         alpha  = atof(argv[arg_index++]);
+         alpha  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-eps") == 0 )
       {
          arg_index++;
-         eps  = atof(argv[arg_index++]);
+         eps  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else
       {
@@ -1962,7 +2443,7 @@ BuildParRotate7pt( HYPRE_Int                  argc,
     * Check a few things
     *-----------------------------------------------------------*/
 
-   if ((P*Q) != num_procs)
+   if ((P * Q) != num_procs)
    {
       hypre_printf("Error: Invalid number of processors or processor topology \n");
       exit(1);
@@ -1975,7 +2456,7 @@ BuildParRotate7pt( HYPRE_Int                  argc,
    if (myid == 0)
    {
       hypre_printf("  Rotate 7pt:\n");
-      hypre_printf("    alpha = %f, eps = %f\n", alpha,eps);
+      hypre_printf("    alpha = %f, eps = %f\n", alpha, eps);
       hypre_printf("    (nx, ny) = (%d, %d)\n", nx, ny);
       hypre_printf("    (Px, Py) = (%d, %d)\n", P,  Q);
    }
@@ -1986,7 +2467,7 @@ BuildParRotate7pt( HYPRE_Int                  argc,
 
    /* compute p,q from P,Q and myid */
    p = myid % P;
-   q = ( myid - p)/P;
+   q = ( myid - p) / P;
 
    /*-----------------------------------------------------------
     * Generate the matrix
@@ -2014,7 +2495,7 @@ HYPRE_Int
 BuildParVarDifConv( HYPRE_Int                  argc,
                     char                *argv[],
                     HYPRE_Int                  arg_index,
-                    HYPRE_ParCSRMatrix  *A_ptr    ,
+                    HYPRE_ParCSRMatrix  *A_ptr,
                     HYPRE_ParVector  *rhs_ptr     )
 {
    HYPRE_Int                 nx, ny, nz;
@@ -2074,7 +2555,7 @@ BuildParVarDifConv( HYPRE_Int                  argc,
       else if ( strcmp(argv[arg_index], "-eps") == 0 )
       {
          arg_index++;
-         eps  = atof(argv[arg_index++]);
+         eps  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-vardifconvRS") == 0 )
       {
@@ -2091,7 +2572,7 @@ BuildParVarDifConv( HYPRE_Int                  argc,
     * Check a few things
     *-----------------------------------------------------------*/
 
-   if ((P*Q*R) != num_procs)
+   if ((P * Q * R) != num_procs)
    {
       hypre_printf("Error: Invalid number of processors or processor topology \n");
       exit(1);
@@ -2114,8 +2595,8 @@ BuildParVarDifConv( HYPRE_Int                  argc,
 
    /* compute p,q,r from P,Q,R and myid */
    p = myid % P;
-   q = (( myid - p)/P) % Q;
-   r = ( myid - p - P*q)/( P*Q );
+   q = (( myid - p) / P) % Q;
+   r = ( myid - p - P * q) / ( P * Q );
 
    /*-----------------------------------------------------------
     * Generate the matrix
@@ -2141,30 +2622,30 @@ BuildParVarDifConv( HYPRE_Int                  argc,
 
 /**************************************************************************/
 
-
-HYPRE_Int SetSysVcoefValues(HYPRE_Int num_fun, HYPRE_Int nx, HYPRE_Int ny, HYPRE_Int nz, HYPRE_Real vcx,
+HYPRE_Int SetSysVcoefValues(HYPRE_Int num_fun, HYPRE_BigInt nx, HYPRE_BigInt ny, HYPRE_BigInt nz,
+                            HYPRE_Real vcx,
                             HYPRE_Real vcy, HYPRE_Real vcz, HYPRE_Int mtx_entry, HYPRE_Real *values)
 {
 
 
-   HYPRE_Int sz = num_fun*num_fun;
+   HYPRE_Int sz = num_fun * num_fun;
 
-   values[1*sz + mtx_entry] = -vcx;
-   values[2*sz + mtx_entry] = -vcy;
-   values[3*sz + mtx_entry] = -vcz;
-   values[0*sz + mtx_entry] = 0.0;
+   values[1 * sz + mtx_entry] = -vcx;
+   values[2 * sz + mtx_entry] = -vcy;
+   values[3 * sz + mtx_entry] = -vcz;
+   values[0 * sz + mtx_entry] = 0.0;
 
    if (nx > 1)
    {
-      values[0*sz + mtx_entry] += 2.0*vcx;
+      values[0 * sz + mtx_entry] += 2.0 * vcx;
    }
    if (ny > 1)
    {
-      values[0*sz + mtx_entry] += 2.0*vcy;
+      values[0 * sz + mtx_entry] += 2.0 * vcy;
    }
    if (nz > 1)
    {
-      values[0*sz + mtx_entry] += 2.0*vcz;
+      values[0 * sz + mtx_entry] += 2.0 * vcz;
    }
 
    return 0;
@@ -2177,10 +2658,10 @@ HYPRE_Int SetSysVcoefValues(HYPRE_Int num_fun, HYPRE_Int nx, HYPRE_Int ny, HYPRE
 
 HYPRE_Int
 BuildParCoordinates( HYPRE_Int                  argc,
-                     char                *argv[],
+                     char                      *argv[],
                      HYPRE_Int                  arg_index,
                      HYPRE_Int                 *coorddim_ptr,
-                     float               **coord_ptr     )
+                     float                    **coord_ptr     )
 {
    HYPRE_Int                 nx, ny, nz;
    HYPRE_Int                 P, Q, R;
@@ -2238,23 +2719,27 @@ BuildParCoordinates( HYPRE_Int                  argc,
 
    /* compute p,q,r from P,Q,R and myid */
    p = myid % P;
-   q = (( myid - p)/P) % Q;
-   r = ( myid - p - P*q)/( P*Q );
+   q = (( myid - p) / P) % Q;
+   r = ( myid - p - P * q) / ( P * Q );
 
    /*-----------------------------------------------------------
     * Generate the coordinates
     *-----------------------------------------------------------*/
 
    coorddim = 3;
-   if (nx<2) coorddim--;
-   if (ny<2) coorddim--;
-   if (nz<2) coorddim--;
+   if (nx < 2) { coorddim--; }
+   if (ny < 2) { coorddim--; }
+   if (nz < 2) { coorddim--; }
 
-   if (coorddim>0)
-      coordinates = GenerateCoordinates (hypre_MPI_COMM_WORLD,
-                                         nx, ny, nz, P, Q, R, p, q, r, coorddim);
+   if (coorddim > 0)
+   {
+      coordinates = hypre_GenerateCoordinates(hypre_MPI_COMM_WORLD,
+                                              nx, ny, nz, P, Q, R, p, q, r, coorddim);
+   }
    else
-      coordinates=NULL;
+   {
+      coordinates = NULL;
+   }
 
    *coorddim_ptr = coorddim;
    *coord_ptr = coordinates;
diff --git a/external/hypre/src/test/ij_mv.c b/external/hypre/src/test/ij_mv.c
deleted file mode 100644
index 315bd8c3..00000000
--- a/external/hypre/src/test/ij_mv.c
+++ /dev/null
@@ -1,1527 +0,0 @@
-/******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
- * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
- *
- * SPDX-License-Identifier: (Apache-2.0 OR MIT)
- ******************************************************************************/
-
-/*--------------------------------------------------------------------------
- * Test driver for unstructured matrix-vector interface.
- * Do `driver -help' for usage info.
- * This driver started from the driver for parcsr_linear_solvers, and it
- * works by first building a parcsr matrix as before and then "copying"
- * that matrix row-by-row into the IJMatrix interface.
- *--------------------------------------------------------------------------*/
-#include <stdlib.h>
-#include <stdio.h>
-#include <math.h>
-
-#include "_hypre_utilities.h"
-#include "HYPRE.h"
-#include "HYPRE_parcsr_mv.h"
-
-#include "HYPRE_IJ_mv.h"
-#include "HYPRE_parcsr_ls.h"
-#include "HYPRE_krylov.h"
-
-HYPRE_Int BuildParFromFile (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix *A_ptr );
-HYPRE_Int BuildParLaplacian (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix *A_ptr );
-HYPRE_Int BuildParDifConv (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix *A_ptr );
-HYPRE_Int BuildParFromOneFile (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix *A_ptr );
-HYPRE_Int BuildRhsParFromOneFile (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_BigInt *partitioning , HYPRE_ParVector *b_ptr );
-HYPRE_Int BuildParLaplacian9pt (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix *A_ptr );
-HYPRE_Int BuildParLaplacian27pt (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix *A_ptr );
-
-#define SECOND_TIME 0
-
-hypre_int
-main( hypre_int argc,
-      char *argv[] )
-{
-   HYPRE_Int           arg_index;
-   HYPRE_Int           print_usage;
-   HYPRE_Int           sparsity_known = 0;
-   HYPRE_Int           build_matrix_type;
-   HYPRE_Int           build_matrix_arg_index;
-   HYPRE_Int           build_rhs_type;
-   HYPRE_Int           build_rhs_arg_index;
-   HYPRE_Real          norm;
-   void               *object;
-
-   HYPRE_IJMatrix      ij_A;
-   HYPRE_IJVector      ij_b=NULL;
-   HYPRE_IJVector      ij_x=NULL;
-   HYPRE_IJVector      ij_v;
-
-   HYPRE_ParCSRMatrix  parcsr_A;
-   HYPRE_ParVector     b;
-   HYPRE_ParVector     x;
-
-   HYPRE_Int           num_procs, myid;
-   HYPRE_Int           local_row;
-   HYPRE_BigInt       *indices;
-   HYPRE_Int          *row_sizes;
-   HYPRE_Int          *diag_sizes;
-   HYPRE_Int          *offdiag_sizes;
-   HYPRE_BigInt       *rows;
-   HYPRE_Int           size;
-   HYPRE_Int          *ncols;
-   HYPRE_BigInt       *col_inds;
-
-   MPI_Comm            comm = hypre_MPI_COMM_WORLD;
-   HYPRE_Int           time_index;
-   HYPRE_Int           ierr = 0;
-   HYPRE_BigInt        M, N, big_i;
-   HYPRE_Int           i, j;
-   HYPRE_Int           local_num_rows, local_num_cols;
-   HYPRE_BigInt        first_local_row, last_local_row;
-   HYPRE_BigInt        first_local_col, last_local_col;
-   HYPRE_Real         *values;
-
-   /*-----------------------------------------------------------
-    * Initialize some stuff
-    *-----------------------------------------------------------*/
-
-   /* Initialize MPI */
-   hypre_MPI_Init(&argc, &argv);
-
-   hypre_MPI_Comm_size(hypre_MPI_COMM_WORLD, &num_procs );
-   hypre_MPI_Comm_rank(hypre_MPI_COMM_WORLD, &myid );
-
-   /*-----------------------------------------------------------
-    * Set defaults
-    *-----------------------------------------------------------*/
-
-   build_matrix_type = 2;
-   build_matrix_arg_index = argc;
-   build_rhs_type = 2;
-   build_rhs_arg_index = argc;
-
-   /*-----------------------------------------------------------
-    * Parse command line
-    *-----------------------------------------------------------*/
-
-   print_usage = 0;
-   arg_index = 1;
-
-   while ( (arg_index < argc) && (!print_usage) )
-   {
-      if ( strcmp(argv[arg_index], "-fromijfile") == 0 )
-      {
-         arg_index++;
-         build_matrix_type      = -1;
-         build_matrix_arg_index = arg_index;
-      }
-      else if ( strcmp(argv[arg_index], "-fromparcsrfile") == 0 )
-      {
-         arg_index++;
-         build_matrix_type      = 0;
-         build_matrix_arg_index = arg_index;
-      }
-      else if ( strcmp(argv[arg_index], "-fromonecsrfile") == 0 )
-      {
-         arg_index++;
-         build_matrix_type      = 1;
-         build_matrix_arg_index = arg_index;
-      }
-      else if ( strcmp(argv[arg_index], "-laplacian") == 0 )
-      {
-         arg_index++;
-         build_matrix_type      = 2;
-         build_matrix_arg_index = arg_index;
-      }
-      else if ( strcmp(argv[arg_index], "-9pt") == 0 )
-      {
-         arg_index++;
-         build_matrix_type      = 3;
-         build_matrix_arg_index = arg_index;
-      }
-      else if ( strcmp(argv[arg_index], "-27pt") == 0 )
-      {
-         arg_index++;
-         build_matrix_type      = 4;
-         build_matrix_arg_index = arg_index;
-      }
-      else if ( strcmp(argv[arg_index], "-difconv") == 0 )
-      {
-         arg_index++;
-         build_matrix_type      = 5;
-         build_matrix_arg_index = arg_index;
-      }
-      else if ( strcmp(argv[arg_index], "-exact_size") == 0 )
-      {
-         arg_index++;
-         sparsity_known = 1;
-      }
-      else if ( strcmp(argv[arg_index], "-storage_low") == 0 )
-      {
-         arg_index++;
-         sparsity_known = 2;
-      }
-      else if ( strcmp(argv[arg_index], "-concrete_parcsr") == 0 )
-      {
-         arg_index++;
-         build_matrix_arg_index = arg_index;
-      }
-      else if ( strcmp(argv[arg_index], "-rhsfromfile") == 0 )
-      {
-         arg_index++;
-         build_rhs_type      = 0;
-         build_rhs_arg_index = arg_index;
-      }
-      else if ( strcmp(argv[arg_index], "-rhsfromonefile") == 0 )
-      {
-         arg_index++;
-         build_rhs_type      = 1;
-         build_rhs_arg_index = arg_index;
-      }
-      else if ( strcmp(argv[arg_index], "-rhsisone") == 0 )
-      {
-         arg_index++;
-         build_rhs_type      = 2;
-         build_rhs_arg_index = arg_index;
-      }
-      else if ( strcmp(argv[arg_index], "-rhsrand") == 0 )
-      {
-         arg_index++;
-         build_rhs_type      = 3;
-         build_rhs_arg_index = arg_index;
-      }
-      else if ( strcmp(argv[arg_index], "-xisone") == 0 )
-      {
-         arg_index++;
-         build_rhs_type      = 4;
-         build_rhs_arg_index = arg_index;
-      }
-      else if ( strcmp(argv[arg_index], "-rhszero") == 0 )
-      {
-         arg_index++;
-         build_rhs_type      = 5;
-         build_rhs_arg_index = arg_index;
-      }
-      else if ( strcmp(argv[arg_index], "-help") == 0 )
-      {
-         print_usage = 1;
-      }
-      else
-      {
-         arg_index++;
-      }
-   }
-
-   /*-----------------------------------------------------------
-    * Print usage info
-    *-----------------------------------------------------------*/
-
-   if ( (print_usage) && (myid == 0) )
-   {
-      hypre_printf("\n");
-      hypre_printf("Usage: %s [<options>]\n", argv[0]);
-      hypre_printf("\n");
-      hypre_printf("  -fromijfile <filename>     : ");
-      hypre_printf("matrix read in IJ format from distributed files\n");
-      hypre_printf("  -fromparcsrfile <filename> : ");
-      hypre_printf("matrix read in ParCSR format from distributed files\n");
-      hypre_printf("  -fromonecsrfile <filename> : ");
-      hypre_printf("matrix read in CSR format from a file on one processor\n");
-      hypre_printf("\n");
-      hypre_printf("  -laplacian [<options>] : build laplacian problem\n");
-      hypre_printf("  -9pt [<opts>] : build 9pt 2D laplacian problem\n");
-      hypre_printf("  -27pt [<opts>] : build 27pt 3D laplacian problem\n");
-      hypre_printf("  -difconv [<opts>]      : build convection-diffusion problem\n");
-      hypre_printf("    -n <nx> <ny> <nz>    : total problem size \n");
-      hypre_printf("    -P <Px> <Py> <Pz>    : processor topology\n");
-      hypre_printf("    -c <cx> <cy> <cz>    : diffusion coefficients\n");
-      hypre_printf("    -a <ax> <ay> <az>    : convection coefficients\n");
-      hypre_printf("\n");
-      hypre_printf("  -exact_size           : inserts immediately into ParCSR structure\n");
-      hypre_printf("  -storage_low          : allocates not enough storage for aux struct\n");
-      hypre_printf("  -concrete_parcsr      : use parcsr matrix type as concrete type\n");
-      hypre_printf("\n");
-      hypre_printf("  -rhsfromfile           : rhs read in IJ form from distributed files\n");
-      hypre_printf("  -rhsfromonefile        : rhs read from a file one one processor\n");
-      hypre_printf("  -rhsrand               : rhs is random vector\n");
-      hypre_printf("  -rhsisone              : rhs is vector with unit components (default)\n");
-      hypre_printf("  -xisone                : solution of all ones\n");
-      hypre_printf("  -rhszero               : rhs is zero vector\n");
-      exit(1);
-   }
-
-   /*-----------------------------------------------------------
-    * Print driver parameters
-    *-----------------------------------------------------------*/
-
-   if (myid == 0)
-   {
-      hypre_printf("Running with these driver parameters:\n");
-   }
-
-   /*-----------------------------------------------------------
-    * Set up matrix
-    *-----------------------------------------------------------*/
-
-   if ( build_matrix_type == -1 )
-   {
-      HYPRE_IJMatrixRead( argv[build_matrix_arg_index], comm,
-            HYPRE_PARCSR, &ij_A );
-   }
-   else if ( build_matrix_type == 0 )
-   {
-      BuildParFromFile(argc, argv, build_matrix_arg_index, &parcsr_A);
-   }
-   else if ( build_matrix_type == 1 )
-   {
-      BuildParFromOneFile(argc, argv, build_matrix_arg_index, &parcsr_A);
-   }
-   else if ( build_matrix_type == 2 )
-   {
-      BuildParLaplacian(argc, argv, build_matrix_arg_index, &parcsr_A);
-   }
-   else if ( build_matrix_type == 3 )
-   {
-      BuildParLaplacian9pt(argc, argv, build_matrix_arg_index, &parcsr_A);
-   }
-   else if ( build_matrix_type == 4 )
-   {
-      BuildParLaplacian27pt(argc, argv, build_matrix_arg_index, &parcsr_A);
-   }
-   else if ( build_matrix_type == 5 )
-   {
-      BuildParDifConv(argc, argv, build_matrix_arg_index, &parcsr_A);
-   }
-   else
-   {
-      hypre_printf("You have asked for an unsupported test with\n");
-      hypre_printf("build_matrix_type = %d.\n", build_matrix_type);
-      return(-1);
-   }
-
-   time_index = hypre_InitializeTiming("Spatial Operator");
-   hypre_BeginTiming(time_index);
-
-   if (build_matrix_type < 2)
-   {
-      ierr += HYPRE_IJMatrixGetObject( ij_A, &object);
-      parcsr_A = (HYPRE_ParCSRMatrix) object;
-
-      ierr = HYPRE_ParCSRMatrixGetLocalRange( parcsr_A,
-            &first_local_row, &last_local_row ,
-            &first_local_col, &last_local_col );
-
-      local_num_rows = last_local_row - first_local_row + 1;
-      local_num_cols = last_local_col - first_local_col + 1;
-
-      ierr = HYPRE_IJMatrixInitialize( ij_A );
-   }
-   else
-   {
-      /*--------------------------------------------------------------------
-       * Copy the parcsr matrix into the IJMatrix through interface calls
-       *--------------------------------------------------------------------*/
-
-      ierr = HYPRE_ParCSRMatrixGetLocalRange( parcsr_A,
-            &first_local_row, &last_local_row ,
-            &first_local_col, &last_local_col );
-
-      local_num_rows = (HYPRE_Int)(last_local_row - first_local_row + 1);
-      local_num_cols = (HYPRE_Int)(last_local_col - first_local_col + 1);
-
-      ierr += HYPRE_ParCSRMatrixGetDims( parcsr_A, &M, &N );
-
-      ierr += HYPRE_IJMatrixCreate( comm, first_local_row, last_local_row,
-            first_local_col, last_local_col,
-            &ij_A );
-
-      ierr += HYPRE_IJMatrixSetObjectType( ij_A, HYPRE_PARCSR );
-
-
-      /* the following shows how to build an IJMatrix if one has only an
-         estimate for the row sizes */
-      if (sparsity_known == 1)
-      {
-         /*  build IJMatrix using exact row_sizes for diag and offdiag */
-
-         diag_sizes = hypre_CTAlloc(HYPRE_Int,  local_num_rows, HYPRE_MEMORY_HOST);
-         offdiag_sizes = hypre_CTAlloc(HYPRE_Int,  local_num_rows, HYPRE_MEMORY_HOST);
-         local_row = 0;
-         for (big_i=first_local_row; big_i<= last_local_row; big_i++)
-         {
-            ierr += HYPRE_ParCSRMatrixGetRow( parcsr_A, big_i, &size,
-                  &col_inds, &values );
-
-            for (j=0; j < size; j++)
-            {
-               if (col_inds[j] < first_local_row || col_inds[j] > last_local_row)
-                  offdiag_sizes[local_row]++;
-               else
-                  diag_sizes[local_row]++;
-            }
-            local_row++;
-            ierr += HYPRE_ParCSRMatrixRestoreRow( parcsr_A, big_i, &size,
-                  &col_inds, &values );
-         }
-         ierr += HYPRE_IJMatrixSetDiagOffdSizes( ij_A,
-               (const HYPRE_Int *) diag_sizes,
-               (const HYPRE_Int *) offdiag_sizes );
-         hypre_TFree(diag_sizes, HYPRE_MEMORY_HOST);
-         hypre_TFree(offdiag_sizes, HYPRE_MEMORY_HOST);
-
-         ierr = HYPRE_IJMatrixInitialize( ij_A );
-
-         for (big_i=first_local_row; big_i<= last_local_row; big_i++)
-         {
-            ierr += HYPRE_ParCSRMatrixGetRow( parcsr_A, big_i, &size,
-                  &col_inds, &values );
-
-            ierr += HYPRE_IJMatrixSetValues( ij_A, 1, &size, &big_i,
-                  (const HYPRE_BigInt *) col_inds,
-                  (const HYPRE_Real *) values );
-
-            ierr += HYPRE_ParCSRMatrixRestoreRow( parcsr_A, big_i, &size,
-                  &col_inds, &values );
-         }
-      }
-      else
-      {
-         row_sizes = hypre_CTAlloc(HYPRE_Int,  local_num_rows, HYPRE_MEMORY_HOST);
-
-         size = 5; /* this is in general too low, and supposed to test
-                      the capability of the reallocation of the interface */
-
-         if (sparsity_known == 0) /* tries a more accurate estimate of the
-                                     storage */
-         {
-            if (build_matrix_type == 2) size = 7;
-            if (build_matrix_type == 3) size = 9;
-            if (build_matrix_type == 4) size = 27;
-         }
-
-         for (i=0; i < local_num_rows; i++)
-            row_sizes[i] = size;
-
-         ierr = HYPRE_IJMatrixSetRowSizes ( ij_A, (const HYPRE_Int *) row_sizes );
-
-         hypre_TFree(row_sizes, HYPRE_MEMORY_HOST);
-
-         ierr = HYPRE_IJMatrixInitialize( ij_A );
-
-         /* Loop through all locally stored rows and insert them into ij_matrix */
-         for (big_i=first_local_row; big_i<= last_local_row; big_i++)
-         {
-            ierr += HYPRE_ParCSRMatrixGetRow( parcsr_A, big_i, &size,
-                  &col_inds, &values );
-
-            ierr += HYPRE_IJMatrixSetValues( ij_A, 1, &size, &big_i,
-                  (const HYPRE_BigInt *) col_inds,
-                  (const HYPRE_Real *) values );
-
-            ierr += HYPRE_ParCSRMatrixRestoreRow( parcsr_A, big_i, &size,
-                  &col_inds, &values );
-         }
-      }
-
-      ierr += HYPRE_IJMatrixAssemble( ij_A );
-
-   }
-
-   hypre_EndTiming(time_index);
-   hypre_PrintTiming("Initial IJ Matrix Setup", hypre_MPI_COMM_WORLD);
-   hypre_FinalizeTiming(time_index);
-   hypre_ClearTiming();
-
-   if (ierr)
-   {
-      hypre_printf("Error in driver building IJMatrix from parcsr matrix. \n");
-      return(-1);
-   }
-
-   time_index = hypre_InitializeTiming("Backward Euler Time Step");
-   hypre_BeginTiming(time_index);
-
-   /* This is to emphasize that one can IJMatrixAddToValues after an
-      IJMatrixRead or an IJMatrixAssemble.  After an IJMatrixRead,
-      assembly is unnecessary if the sparsity pattern of the matrix is
-      not changed somehow.  If one has not used IJMatrixRead, one has
-      the opportunity to IJMatrixAddTo before a IJMatrixAssemble. */
-
-   ncols    = hypre_CTAlloc(HYPRE_Int,  last_local_row - first_local_row + 1, HYPRE_MEMORY_HOST);
-   rows     = hypre_CTAlloc(HYPRE_BigInt,  last_local_row - first_local_row + 1, HYPRE_MEMORY_HOST);
-   col_inds = hypre_CTAlloc(HYPRE_BigInt,  last_local_row - first_local_row + 1, HYPRE_MEMORY_HOST);
-   values   = hypre_CTAlloc(HYPRE_Real,  last_local_row - first_local_row + 1, HYPRE_MEMORY_HOST);
-
-   for (big_i = first_local_row; big_i <= last_local_row; big_i++)
-   {
-      j = (HYPRE_Int)(big_i - first_local_row);
-      rows[j] = big_i;
-      ncols[j] = 1;
-      col_inds[j] = big_i;
-      values[j] = -27.8;
-   }
-
-   ierr += HYPRE_IJMatrixAddToValues( ij_A,
-         local_num_rows,
-         ncols, rows,
-         (const HYPRE_BigInt *) col_inds,
-         (const HYPRE_Real *) values );
-
-   hypre_TFree(values, HYPRE_MEMORY_HOST);
-   hypre_TFree(col_inds, HYPRE_MEMORY_HOST);
-   hypre_TFree(rows, HYPRE_MEMORY_HOST);
-   hypre_TFree(ncols, HYPRE_MEMORY_HOST);
-
-   /* If sparsity pattern is not changed since last IJMatrixAssemble call,
-      this should be a no-op */
-
-   ierr += HYPRE_IJMatrixAssemble( ij_A );
-
-   hypre_EndTiming(time_index);
-   hypre_PrintTiming("IJ Matrix Diagonal Augmentation", hypre_MPI_COMM_WORLD);
-   hypre_FinalizeTiming(time_index);
-   hypre_ClearTiming();
-
-   /*-----------------------------------------------------------
-    * Fetch the resulting underlying matrix out
-    *-----------------------------------------------------------*/
-
-   if (build_matrix_type > 1)
-      ierr += HYPRE_ParCSRMatrixDestroy(parcsr_A);
-
-   ierr += HYPRE_IJMatrixGetObject( ij_A, &object);
-   parcsr_A = (HYPRE_ParCSRMatrix) object;
-
-   HYPRE_IJVectorCreate(hypre_MPI_COMM_WORLD, first_local_col, last_local_col, &ij_v);
-   HYPRE_IJVectorSetObjectType(ij_v, HYPRE_PARCSR );
-   HYPRE_IJVectorInitialize(ij_v);
-
-   values  = hypre_CTAlloc(HYPRE_Real,  local_num_cols, HYPRE_MEMORY_HOST);
-
-   /*-------------------------------------------------------------------
-    * Check HYPRE_IJVectorSet(Get)Values calls
-    *
-    * All local components changed -- NULL indices
-    *-------------------------------------------------------------------*/
-
-   for (i = 0; i < local_num_cols; i++)
-      values[i] = 1.;
-
-   HYPRE_IJVectorSetValues(ij_v, local_num_cols, NULL, values);
-
-   for (i = 0; i < local_num_cols; i++)
-      values[i] = (HYPRE_Real)i;
-
-   HYPRE_IJVectorAddToValues(ij_v, local_num_cols/2, NULL, values);
-
-   HYPRE_IJVectorGetValues(ij_v, local_num_cols, NULL, values);
-
-   ierr = 0;
-   for (i = 0; i < local_num_cols/2; i++)
-      if (values[i] != (HYPRE_Real)i + 1.) ++ierr;
-   for (i = local_num_cols/2; i < local_num_cols; i++)
-      if (values[i] != 1.) ++ierr;
-   if (ierr)
-   {
-      hypre_printf("One of HYPRE_IJVectorSet(AddTo,Get)Values\n");
-      hypre_printf("calls with NULL indices bad\n");
-      hypre_printf("IJVector Error 1 with ierr = %d\n", ierr);
-      exit(1);
-   }
-
-   /*-------------------------------------------------------------------
-    * All local components changed, assigned reverse-ordered values
-    *   as specified by indices
-    *-------------------------------------------------------------------*/
-
-   indices = hypre_CTAlloc(HYPRE_BigInt,  local_num_cols, HYPRE_MEMORY_HOST);
-
-   for (big_i = first_local_col; big_i <= last_local_col; big_i++)
-   {
-      j = (HYPRE_Int)(big_i - first_local_col);
-      values[j] = (HYPRE_Real)big_i;
-      indices[j] = last_local_col - big_i;
-   }
-
-   HYPRE_IJVectorSetValues(ij_v, local_num_cols, indices, values);
-
-   for (big_i = first_local_col; big_i <= last_local_col; big_i++)
-   {
-      j = (HYPRE_Int)(big_i - first_local_col);
-      values[j] = (HYPRE_Real)big_i*big_i;
-   }
-
-   HYPRE_IJVectorAddToValues(ij_v, local_num_cols, indices, values);
-
-   HYPRE_IJVectorGetValues(ij_v, local_num_cols, indices, values);
-
-   hypre_TFree(indices, HYPRE_MEMORY_HOST);
-
-   ierr = 0;
-   for (big_i = first_local_col; big_i <= last_local_col; big_i++)
-   {
-      j = (HYPRE_Int)(big_i - first_local_col);
-      if (values[j] != (HYPRE_Real)(big_i*big_i + big_i)) ++ierr;
-   }
-
-   if (ierr)
-   {
-      hypre_printf("One of HYPRE_IJVectorSet(Get)Values\n");
-      hypre_printf("calls bad\n");
-      hypre_printf("IJVector Error 2 with ierr = %d\n", ierr);
-      exit(1);
-   }
-
-   HYPRE_IJVectorDestroy(ij_v);
-
-   /*-----------------------------------------------------------
-    * Set up the RHS and initial guess
-    *-----------------------------------------------------------*/
-
-   time_index = hypre_InitializeTiming("RHS and Initial Guess");
-   hypre_BeginTiming(time_index);
-
-   if ( build_rhs_type == 0 )
-   {
-      if (myid == 0)
-      {
-         hypre_printf("  RHS vector read from file %s\n", argv[build_rhs_arg_index]);
-         hypre_printf("  Initial guess is 0\n");
-      }
-
-      /* RHS */
-      ierr = HYPRE_IJVectorRead( argv[build_rhs_arg_index], hypre_MPI_COMM_WORLD,
-            HYPRE_PARCSR, &ij_b );
-      ierr = HYPRE_IJVectorGetObject( ij_b, &object );
-      b = (HYPRE_ParVector) object;
-
-      /* Initial guess */
-      HYPRE_IJVectorCreate(hypre_MPI_COMM_WORLD, first_local_col, last_local_col, &ij_x);
-      HYPRE_IJVectorSetObjectType(ij_x, HYPRE_PARCSR);
-      HYPRE_IJVectorInitialize(ij_x);
-
-      values = hypre_CTAlloc(HYPRE_Real,  local_num_cols, HYPRE_MEMORY_HOST);
-      for (i = 0; i < local_num_cols; i++)
-         values[i] = 0.;
-      HYPRE_IJVectorSetValues(ij_x, local_num_cols, NULL, values);
-      hypre_TFree(values, HYPRE_MEMORY_HOST);
-
-      ierr = HYPRE_IJVectorGetObject( ij_x, &object );
-      x = (HYPRE_ParVector) object;
-   }
-   else if ( build_rhs_type == 1 )
-   {
-      hypre_printf("build_rhs_type == 1 not currently implemented\n");
-      return(-1);
-
-#if 0
-      /* RHS */
-      BuildRhsParFromOneFile(argc, argv, build_rhs_arg_index, part_b, &b);
-#endif
-   }
-   else if ( build_rhs_type == 2 )
-   {
-      if (myid == 0)
-      {
-         hypre_printf("  RHS vector has unit components\n");
-         hypre_printf("  Initial guess is 0\n");
-      }
-
-      /* RHS */
-      HYPRE_IJVectorCreate(hypre_MPI_COMM_WORLD, first_local_row, last_local_row, &ij_b);
-      HYPRE_IJVectorSetObjectType(ij_b, HYPRE_PARCSR);
-      HYPRE_IJVectorInitialize(ij_b);
-
-      values = hypre_CTAlloc(HYPRE_Real,  local_num_rows, HYPRE_MEMORY_HOST);
-      for (i = 0; i < local_num_rows; i++)
-         values[i] = 1.;
-      HYPRE_IJVectorSetValues(ij_b, local_num_rows, NULL, values);
-      hypre_TFree(values, HYPRE_MEMORY_HOST);
-      ierr = HYPRE_IJVectorGetObject( ij_b, &object );
-      b = (HYPRE_ParVector) object;
-
-      /* Initial guess */
-      HYPRE_IJVectorCreate(hypre_MPI_COMM_WORLD, first_local_col, last_local_col, &ij_x);
-      HYPRE_IJVectorSetObjectType(ij_x, HYPRE_PARCSR);
-      HYPRE_IJVectorInitialize(ij_x);
-
-      values = hypre_CTAlloc(HYPRE_Real,  local_num_cols, HYPRE_MEMORY_HOST);
-      for (i = 0; i < local_num_cols; i++)
-         values[i] = 0.;
-      HYPRE_IJVectorSetValues(ij_x, local_num_cols, NULL, values);
-      hypre_TFree(values, HYPRE_MEMORY_HOST);
-
-      ierr = HYPRE_IJVectorGetObject( ij_x, &object );
-      x = (HYPRE_ParVector) object;
-   }
-   else if ( build_rhs_type == 3 )
-   {
-      if (myid == 0)
-      {
-         hypre_printf("  RHS vector has random components and unit 2-norm\n");
-         hypre_printf("  Initial guess is 0\n");
-      }
-
-      /* RHS */
-      HYPRE_IJVectorCreate(hypre_MPI_COMM_WORLD, first_local_row, last_local_row, &ij_b);
-      HYPRE_IJVectorSetObjectType(ij_b, HYPRE_PARCSR);
-      HYPRE_IJVectorInitialize(ij_b);
-      ierr = HYPRE_IJVectorGetObject( ij_b, &object );
-      b = (HYPRE_ParVector) object;
-
-      /* For purposes of this test, HYPRE_ParVector functions are used, but these are
-         not necessary.  For a clean use of the interface, the user "should"
-         modify components of ij_x by using functions HYPRE_IJVectorSetValues or
-         HYPRE_IJVectorAddToValues */
-
-      HYPRE_ParVectorSetRandomValues(b, 22775);
-      HYPRE_ParVectorInnerProd(b,b,&norm);
-      norm = 1./sqrt(norm);
-      ierr = HYPRE_ParVectorScale(norm, b);
-
-      /* Initial guess */
-      HYPRE_IJVectorCreate(hypre_MPI_COMM_WORLD, first_local_col, last_local_col, &ij_x);
-      HYPRE_IJVectorSetObjectType(ij_x, HYPRE_PARCSR);
-      HYPRE_IJVectorInitialize(ij_x);
-
-      values = hypre_CTAlloc(HYPRE_Real,  local_num_cols, HYPRE_MEMORY_HOST);
-      for (i = 0; i < local_num_cols; i++)
-         values[i] = 0.;
-      HYPRE_IJVectorSetValues(ij_x, local_num_cols, NULL, values);
-      hypre_TFree(values, HYPRE_MEMORY_HOST);
-
-      ierr = HYPRE_IJVectorGetObject( ij_x, &object );
-      x = (HYPRE_ParVector) object;
-   }
-   else if ( build_rhs_type == 4 )
-   {
-      if (myid == 0)
-      {
-         hypre_printf("  RHS vector set for solution with unit components\n");
-         hypre_printf("  Initial guess is 0\n");
-      }
-
-      /* Temporary use of solution vector */
-      HYPRE_IJVectorCreate(hypre_MPI_COMM_WORLD, first_local_col, last_local_col, &ij_x);
-      HYPRE_IJVectorSetObjectType(ij_x, HYPRE_PARCSR);
-      HYPRE_IJVectorInitialize(ij_x);
-
-      values = hypre_CTAlloc(HYPRE_Real,  local_num_cols, HYPRE_MEMORY_HOST);
-      for (i = 0; i < local_num_cols; i++)
-         values[i] = 1.;
-      HYPRE_IJVectorSetValues(ij_x, local_num_cols, NULL, values);
-      hypre_TFree(values, HYPRE_MEMORY_HOST);
-
-      ierr = HYPRE_IJVectorGetObject( ij_x, &object );
-      x = (HYPRE_ParVector) object;
-
-      /* RHS */
-      HYPRE_IJVectorCreate(hypre_MPI_COMM_WORLD, first_local_row, last_local_row, &ij_b);
-      HYPRE_IJVectorSetObjectType(ij_b, HYPRE_PARCSR);
-      HYPRE_IJVectorInitialize(ij_b);
-      ierr = HYPRE_IJVectorGetObject( ij_b, &object );
-      b = (HYPRE_ParVector) object;
-
-      HYPRE_ParCSRMatrixMatvec(1.,parcsr_A,x,0.,b);
-
-      /* Initial guess */
-      values = hypre_CTAlloc(HYPRE_Real,  local_num_cols, HYPRE_MEMORY_HOST);
-      for (i = 0; i < local_num_cols; i++)
-         values[i] = 0.;
-      HYPRE_IJVectorSetValues(ij_x, local_num_cols, NULL, values);
-      hypre_TFree(values, HYPRE_MEMORY_HOST);
-   }
-   else if ( build_rhs_type == 5 )
-   {
-      if (myid == 0)
-      {
-         hypre_printf("  RHS vector is 0\n");
-         hypre_printf("  Initial guess has unit components\n");
-      }
-
-      /* RHS */
-      HYPRE_IJVectorCreate(hypre_MPI_COMM_WORLD, first_local_row, last_local_row, &ij_b);
-      HYPRE_IJVectorSetObjectType(ij_b, HYPRE_PARCSR);
-      HYPRE_IJVectorInitialize(ij_b);
-
-      values = hypre_CTAlloc(HYPRE_Real,  local_num_rows, HYPRE_MEMORY_HOST);
-      for (i = 0; i < local_num_rows; i++)
-         values[i] = 0.;
-      HYPRE_IJVectorSetValues(ij_b, local_num_rows, NULL, values);
-      hypre_TFree(values, HYPRE_MEMORY_HOST);
-
-      ierr = HYPRE_IJVectorGetObject( ij_b, &object );
-      b = (HYPRE_ParVector) object;
-
-      /* Initial guess */
-      HYPRE_IJVectorCreate(hypre_MPI_COMM_WORLD, first_local_col, last_local_col, &ij_x);
-      HYPRE_IJVectorSetObjectType(ij_x, HYPRE_PARCSR);
-      HYPRE_IJVectorInitialize(ij_x);
-
-      values = hypre_CTAlloc(HYPRE_Real,  local_num_cols, HYPRE_MEMORY_HOST);
-      for (i = 0; i < local_num_cols; i++)
-         values[i] = 1.;
-      HYPRE_IJVectorSetValues(ij_x, local_num_cols, NULL, values);
-      hypre_TFree(values, HYPRE_MEMORY_HOST);
-
-      ierr = HYPRE_IJVectorGetObject( ij_x, &object );
-      x = (HYPRE_ParVector) object;
-   }
-
-   hypre_EndTiming(time_index);
-   hypre_PrintTiming("IJ Vector Setup", hypre_MPI_COMM_WORLD);
-   hypre_FinalizeTiming(time_index);
-   hypre_ClearTiming();
-
-   /*-----------------------------------------------------------
-    * Print the solution and other info
-    *-----------------------------------------------------------*/
-
-   HYPRE_IJVectorGetObjectType(ij_b, &j);
-   HYPRE_IJVectorPrint(ij_b, "driver.out.b");
-   HYPRE_IJVectorPrint(ij_x, "driver.out.x");
-
-   /*-----------------------------------------------------------
-    * Finalize things
-    *-----------------------------------------------------------*/
-
-   HYPRE_IJMatrixDestroy(ij_A);
-   HYPRE_IJVectorDestroy(ij_b);
-   HYPRE_IJVectorDestroy(ij_x);
-
-   hypre_MPI_Finalize();
-
-   return (0);
-}
-
-/*----------------------------------------------------------------------
- * Build matrix from file. Expects three files on each processor.
- * filename.D.n contains the diagonal part, filename.O.n contains
- * the offdiagonal part and filename.INFO.n contains global row
- * and column numbers, number of columns of offdiagonal matrix
- * and the mapping of offdiagonal column numbers to global column numbers.
- * Parameters given in command line.
- *----------------------------------------------------------------------*/
-
-HYPRE_Int
-BuildParFromFile( HYPRE_Int                  argc,
-                  char                *argv[],
-                  HYPRE_Int                  arg_index,
-                  HYPRE_ParCSRMatrix  *A_ptr     )
-{
-   char               *filename;
-
-   HYPRE_ParCSRMatrix A;
-
-   HYPRE_Int                 myid;
-
-   /*-----------------------------------------------------------
-    * Initialize some stuff
-    *-----------------------------------------------------------*/
-
-   hypre_MPI_Comm_rank(hypre_MPI_COMM_WORLD, &myid );
-
-   /*-----------------------------------------------------------
-    * Parse command line
-    *-----------------------------------------------------------*/
-
-   if (arg_index < argc)
-   {
-      filename = argv[arg_index];
-   }
-   else
-   {
-      hypre_printf("Error: No filename specified \n");
-      exit(1);
-   }
-
-   /*-----------------------------------------------------------
-    * Print driver parameters
-    *-----------------------------------------------------------*/
-
-   if (myid == 0)
-   {
-      hypre_printf("  FromFile: %s\n", filename);
-   }
-
-   /*-----------------------------------------------------------
-    * Generate the matrix
-    *-----------------------------------------------------------*/
-
-   HYPRE_ParCSRMatrixRead(hypre_MPI_COMM_WORLD, filename,&A);
-
-   *A_ptr = A;
-
-   return (0);
-}
-
-/*----------------------------------------------------------------------
- * Build standard 7-point laplacian in 3D with grid and anisotropy.
- * Parameters given in command line.
- *----------------------------------------------------------------------*/
-
-HYPRE_Int
-BuildParLaplacian( HYPRE_Int                  argc,
-                   char                *argv[],
-                   HYPRE_Int                  arg_index,
-                   HYPRE_ParCSRMatrix  *A_ptr     )
-{
-   HYPRE_BigInt              nx, ny, nz;
-   HYPRE_Int                 P, Q, R;
-   HYPRE_Real          cx, cy, cz;
-
-   HYPRE_ParCSRMatrix  A;
-
-   HYPRE_Int                 num_procs, myid;
-   HYPRE_Int                 p, q, r;
-   HYPRE_Real         *values;
-
-   /*-----------------------------------------------------------
-    * Initialize some stuff
-    *-----------------------------------------------------------*/
-
-   hypre_MPI_Comm_size(hypre_MPI_COMM_WORLD, &num_procs );
-   hypre_MPI_Comm_rank(hypre_MPI_COMM_WORLD, &myid );
-
-   /*-----------------------------------------------------------
-    * Set defaults
-    *-----------------------------------------------------------*/
-
-   nx = 10;
-   ny = 10;
-   nz = 10;
-
-   P  = 1;
-   Q  = num_procs;
-   R  = 1;
-
-   cx = 1.0;
-   cy = 1.0;
-   cz = 1.0;
-
-   /*-----------------------------------------------------------
-    * Parse command line
-    *-----------------------------------------------------------*/
-   arg_index = 0;
-   while (arg_index < argc)
-   {
-      if ( strcmp(argv[arg_index], "-n") == 0 )
-      {
-         arg_index++;
-         nx = atoi(argv[arg_index++]);
-         ny = atoi(argv[arg_index++]);
-         nz = atoi(argv[arg_index++]);
-      }
-      else if ( strcmp(argv[arg_index], "-P") == 0 )
-      {
-         arg_index++;
-         P  = atoi(argv[arg_index++]);
-         Q  = atoi(argv[arg_index++]);
-         R  = atoi(argv[arg_index++]);
-      }
-      else if ( strcmp(argv[arg_index], "-c") == 0 )
-      {
-         arg_index++;
-         cx = atof(argv[arg_index++]);
-         cy = atof(argv[arg_index++]);
-         cz = atof(argv[arg_index++]);
-      }
-      else
-      {
-         arg_index++;
-      }
-   }
-
-   /*-----------------------------------------------------------
-    * Check a few things
-    *-----------------------------------------------------------*/
-
-   if ((P*Q*R) != num_procs)
-   {
-      hypre_printf("Error: Invalid number of processors or processor topology \n");
-      exit(1);
-   }
-
-   /*-----------------------------------------------------------
-    * Print driver parameters
-    *-----------------------------------------------------------*/
-
-   if (myid == 0)
-   {
-      hypre_printf("  Laplacian:\n");
-      hypre_printf("    (nx, ny, nz) = (%b, %b, %b)\n", nx, ny, nz);
-      hypre_printf("    (Px, Py, Pz) = (%d, %d, %d)\n", P,  Q,  R);
-      hypre_printf("    (cx, cy, cz) = (%f, %f, %f)\n\n", cx, cy, cz);
-   }
-
-   /*-----------------------------------------------------------
-    * Set up the grid structure
-    *-----------------------------------------------------------*/
-
-   /* compute p,q,r from P,Q,R and myid */
-   p = myid % P;
-   q = (( myid - p)/P) % Q;
-   r = ( myid - p - P*q)/( P*Q );
-
-   /*-----------------------------------------------------------
-    * Generate the matrix
-    *-----------------------------------------------------------*/
-
-   values = hypre_CTAlloc(HYPRE_Real,  4, HYPRE_MEMORY_HOST);
-
-   values[1] = -cx;
-   values[2] = -cy;
-   values[3] = -cz;
-
-   values[0] = 0.0;
-   if (nx > 1)
-   {
-      values[0] += 2.0*cx;
-   }
-   if (ny > 1)
-   {
-      values[0] += 2.0*cy;
-   }
-   if (nz > 1)
-   {
-      values[0] += 2.0*cz;
-   }
-
-   A = (HYPRE_ParCSRMatrix) GenerateLaplacian(hypre_MPI_COMM_WORLD,
-         nx, ny, nz, P, Q, R, p, q, r, values);
-
-   hypre_TFree(values, HYPRE_MEMORY_HOST);
-
-   *A_ptr = A;
-
-   return (0);
-}
-
-/*----------------------------------------------------------------------
- * Build standard 7-point convection-diffusion operator
- * Parameters given in command line.
- * Operator:
- *
- *  -cx Dxx - cy Dyy - cz Dzz + ax Dx + ay Dy + az Dz = f
- *
- *----------------------------------------------------------------------*/
-
-HYPRE_Int
-BuildParDifConv( HYPRE_Int                  argc,
-                 char                *argv[],
-                 HYPRE_Int                  arg_index,
-                 HYPRE_ParCSRMatrix  *A_ptr     )
-{
-   HYPRE_BigInt              nx, ny, nz;
-   HYPRE_Int                 P, Q, R;
-   HYPRE_Real          cx, cy, cz;
-   HYPRE_Real          ax, ay, az;
-   HYPRE_Real          hinx,hiny,hinz;
-
-   HYPRE_ParCSRMatrix  A;
-
-   HYPRE_Int                 num_procs, myid;
-   HYPRE_Int                 p, q, r;
-   HYPRE_Real         *values;
-
-   /*-----------------------------------------------------------
-    * Initialize some stuff
-    *-----------------------------------------------------------*/
-
-   hypre_MPI_Comm_size(hypre_MPI_COMM_WORLD, &num_procs );
-   hypre_MPI_Comm_rank(hypre_MPI_COMM_WORLD, &myid );
-
-   /*-----------------------------------------------------------
-    * Set defaults
-    *-----------------------------------------------------------*/
-
-   nx = 10;
-   ny = 10;
-   nz = 10;
-
-   hinx = 1.0/(nx+1);
-   hiny = 1.0/(ny+1);
-   hinz = 1.0/(nz+1);
-
-   P  = 1;
-   Q  = num_procs;
-   R  = 1;
-
-   cx = 1.0;
-   cy = 1.0;
-   cz = 1.0;
-
-   ax = 1.0;
-   ay = 1.0;
-   az = 1.0;
-
-   /*-----------------------------------------------------------
-    * Parse command line
-    *-----------------------------------------------------------*/
-   arg_index = 0;
-   while (arg_index < argc)
-   {
-      if ( strcmp(argv[arg_index], "-n") == 0 )
-      {
-         arg_index++;
-         nx = atoi(argv[arg_index++]);
-         ny = atoi(argv[arg_index++]);
-         nz = atoi(argv[arg_index++]);
-      }
-      else if ( strcmp(argv[arg_index], "-P") == 0 )
-      {
-         arg_index++;
-         P  = atoi(argv[arg_index++]);
-         Q  = atoi(argv[arg_index++]);
-         R  = atoi(argv[arg_index++]);
-      }
-      else if ( strcmp(argv[arg_index], "-c") == 0 )
-      {
-         arg_index++;
-         cx = atof(argv[arg_index++]);
-         cy = atof(argv[arg_index++]);
-         cz = atof(argv[arg_index++]);
-      }
-      else if ( strcmp(argv[arg_index], "-a") == 0 )
-      {
-         arg_index++;
-         ax = atof(argv[arg_index++]);
-         ay = atof(argv[arg_index++]);
-         az = atof(argv[arg_index++]);
-      }
-      else
-      {
-         arg_index++;
-      }
-   }
-
-   /*-----------------------------------------------------------
-    * Check a few things
-    *-----------------------------------------------------------*/
-
-   if ((P*Q*R) != num_procs)
-   {
-      hypre_printf("Error: Invalid number of processors or processor topology \n");
-      exit(1);
-   }
-
-   /*-----------------------------------------------------------
-    * Print driver parameters
-    *-----------------------------------------------------------*/
-
-   if (myid == 0)
-   {
-      hypre_printf("  Convection-Diffusion: \n");
-      hypre_printf("    -cx Dxx - cy Dyy - cz Dzz + ax Dx + ay Dy + az Dz = f\n");
-      hypre_printf("    (nx, ny, nz) = (%b, %b, %b)\n", nx, ny, nz);
-      hypre_printf("    (Px, Py, Pz) = (%d, %d, %d)\n", P,  Q,  R);
-      hypre_printf("    (cx, cy, cz) = (%f, %f, %f)\n", cx, cy, cz);
-      hypre_printf("    (ax, ay, az) = (%f, %f, %f)\n\n", ax, ay, az);
-   }
-
-   /*-----------------------------------------------------------
-    * Set up the grid structure
-    *-----------------------------------------------------------*/
-
-   /* compute p,q,r from P,Q,R and myid */
-   p = myid % P;
-   q = (( myid - p)/P) % Q;
-   r = ( myid - p - P*q)/( P*Q );
-
-   /*-----------------------------------------------------------
-    * Generate the matrix
-    *-----------------------------------------------------------*/
-
-   values = hypre_CTAlloc(HYPRE_Real,  7, HYPRE_MEMORY_HOST);
-
-   values[1] = -cx/(hinx*hinx);
-   values[2] = -cy/(hiny*hiny);
-   values[3] = -cz/(hinz*hinz);
-   values[4] = -cx/(hinx*hinx) + ax/hinx;
-   values[5] = -cy/(hiny*hiny) + ay/hiny;
-   values[6] = -cz/(hinz*hinz) + az/hinz;
-
-   values[0] = 0.0;
-   if (nx > 1)
-   {
-      values[0] += 2.0*cx/(hinx*hinx) - 1.0*ax/hinx;
-   }
-   if (ny > 1)
-   {
-      values[0] += 2.0*cy/(hiny*hiny) - 1.0*ay/hiny;
-   }
-   if (nz > 1)
-   {
-      values[0] += 2.0*cz/(hinz*hinz) - 1.0*az/hinz;
-   }
-
-   A = (HYPRE_ParCSRMatrix) GenerateDifConv(hypre_MPI_COMM_WORLD,
-                               nx, ny, nz, P, Q, R, p, q, r, values);
-
-   hypre_TFree(values, HYPRE_MEMORY_HOST);
-
-   *A_ptr = A;
-
-   return (0);
-}
-
-/*----------------------------------------------------------------------
- * Build matrix from one file on Proc. 0. Expects matrix to be in
- * CSR format. Distributes matrix across processors giving each about
- * the same number of rows.
- * Parameters given in command line.
- *----------------------------------------------------------------------*/
-
-HYPRE_Int
-BuildParFromOneFile( HYPRE_Int                  argc,
-                     char                *argv[],
-                     HYPRE_Int                  arg_index,
-                     HYPRE_ParCSRMatrix  *A_ptr     )
-{
-   char               *filename;
-
-   HYPRE_ParCSRMatrix  A;
-   HYPRE_CSRMatrix  A_CSR = NULL;
-
-   HYPRE_Int                 myid;
-
-   /*-----------------------------------------------------------
-    * Initialize some stuff
-    *-----------------------------------------------------------*/
-
-   hypre_MPI_Comm_rank(hypre_MPI_COMM_WORLD, &myid );
-
-   /*-----------------------------------------------------------
-    * Parse command line
-    *-----------------------------------------------------------*/
-
-   if (arg_index < argc)
-   {
-      filename = argv[arg_index];
-   }
-   else
-   {
-      hypre_printf("Error: No filename specified \n");
-      exit(1);
-   }
-
-   /*-----------------------------------------------------------
-    * Print driver parameters
-    *-----------------------------------------------------------*/
-
-   if (myid == 0)
-   {
-      hypre_printf("  FromFile: %s\n", filename);
-
-      /*-----------------------------------------------------------
-       * Generate the matrix
-       *-----------------------------------------------------------*/
-
-      A_CSR = HYPRE_CSRMatrixRead(filename);
-   }
-   HYPRE_CSRMatrixToParCSRMatrix(hypre_MPI_COMM_WORLD, A_CSR, NULL, NULL, &A);
-
-   *A_ptr = A;
-
-   if (myid == 0) HYPRE_CSRMatrixDestroy(A_CSR);
-
-   return (0);
-}
-
-/*----------------------------------------------------------------------
- * Build Rhs from one file on Proc. 0. Distributes vector across processors
- * giving each about using the distribution of the matrix A.
- *----------------------------------------------------------------------*/
-
-HYPRE_Int
-BuildRhsParFromOneFile( HYPRE_Int            argc,
-                        char                *argv[],
-                        HYPRE_Int            arg_index,
-                        HYPRE_BigInt        *partitioning,
-                        HYPRE_ParVector     *b_ptr     )
-{
-   char           *filename;
-
-   HYPRE_ParVector b;
-   HYPRE_Vector    b_CSR=NULL;
-
-   HYPRE_Int             myid;
-
-   /*-----------------------------------------------------------
-    * Initialize some stuff
-    *-----------------------------------------------------------*/
-
-   hypre_MPI_Comm_rank(hypre_MPI_COMM_WORLD, &myid );
-
-   /*-----------------------------------------------------------
-    * Parse command line
-    *-----------------------------------------------------------*/
-
-   if (arg_index < argc)
-   {
-      filename = argv[arg_index];
-   }
-   else
-   {
-      hypre_printf("Error: No filename specified \n");
-      exit(1);
-   }
-
-   /*-----------------------------------------------------------
-    * Print driver parameters
-    *-----------------------------------------------------------*/
-
-   if (myid == 0)
-   {
-      hypre_printf("  Rhs FromFile: %s\n", filename);
-
-      /*-----------------------------------------------------------
-       * Generate the matrix
-       *-----------------------------------------------------------*/
-
-      b_CSR = HYPRE_VectorRead(filename);
-   }
-   HYPRE_VectorToParVector(hypre_MPI_COMM_WORLD, b_CSR, partitioning,&b);
-
-   *b_ptr = b;
-
-   HYPRE_VectorDestroy(b_CSR);
-
-   return (0);
-}
-
-/*----------------------------------------------------------------------
- * Build standard 9-point laplacian in 2D with grid and anisotropy.
- * Parameters given in command line.
- *----------------------------------------------------------------------*/
-
-HYPRE_Int
-BuildParLaplacian9pt( HYPRE_Int            argc,
-                      char                *argv[],
-                      HYPRE_Int            arg_index,
-                      HYPRE_ParCSRMatrix  *A_ptr     )
-{
-   HYPRE_BigInt              nx, ny;
-   HYPRE_Int                 P, Q;
-
-   HYPRE_ParCSRMatrix  A;
-
-   HYPRE_Int                 num_procs, myid;
-   HYPRE_Int                 p, q;
-   HYPRE_Real         *values;
-
-   /*-----------------------------------------------------------
-    * Initialize some stuff
-    *-----------------------------------------------------------*/
-
-   hypre_MPI_Comm_size(hypre_MPI_COMM_WORLD, &num_procs );
-   hypre_MPI_Comm_rank(hypre_MPI_COMM_WORLD, &myid );
-
-   /*-----------------------------------------------------------
-    * Set defaults
-    *-----------------------------------------------------------*/
-
-   nx = 10;
-   ny = 10;
-
-   P  = 1;
-   Q  = num_procs;
-
-   /*-----------------------------------------------------------
-    * Parse command line
-    *-----------------------------------------------------------*/
-   arg_index = 0;
-   while (arg_index < argc)
-   {
-      if ( strcmp(argv[arg_index], "-n") == 0 )
-      {
-         arg_index++;
-         nx = atoi(argv[arg_index++]);
-         ny = atoi(argv[arg_index++]);
-      }
-      else if ( strcmp(argv[arg_index], "-P") == 0 )
-      {
-         arg_index++;
-         P  = atoi(argv[arg_index++]);
-         Q  = atoi(argv[arg_index++]);
-      }
-      else
-      {
-         arg_index++;
-      }
-   }
-
-   /*-----------------------------------------------------------
-    * Check a few things
-    *-----------------------------------------------------------*/
-
-   if ((P*Q) != num_procs)
-   {
-      hypre_printf("Error: Invalid number of processors or processor topology \n");
-      exit(1);
-   }
-
-   /*-----------------------------------------------------------
-    * Print driver parameters
-    *-----------------------------------------------------------*/
-
-   if (myid == 0)
-   {
-      hypre_printf("  Laplacian 9pt:\n");
-      hypre_printf("    (nx, ny) = (%b, %b)\n", nx, ny);
-      hypre_printf("    (Px, Py) = (%d, %d)\n", P,  Q);
-   }
-
-   /*-----------------------------------------------------------
-    * Set up the grid structure
-    *-----------------------------------------------------------*/
-
-   /* compute p,q from P,Q and myid */
-   p = myid % P;
-   q = ( myid - p)/P;
-
-   /*-----------------------------------------------------------
-    * Generate the matrix
-    *-----------------------------------------------------------*/
-
-   values = hypre_CTAlloc(HYPRE_Real,  2, HYPRE_MEMORY_HOST);
-
-   values[1] = -1.0;
-
-   values[0] = 0.0;
-   if (nx > 1)
-   {
-      values[0] += 2.0;
-   }
-   if (ny > 1)
-   {
-      values[0] += 2.0;
-   }
-   if (nx > 1 && ny > 1)
-   {
-      values[0] += 4.0;
-   }
-
-   A = (HYPRE_ParCSRMatrix) GenerateLaplacian9pt(hypre_MPI_COMM_WORLD,
-                                  nx, ny, P, Q, p, q, values);
-
-   hypre_TFree(values, HYPRE_MEMORY_HOST);
-
-   *A_ptr = A;
-
-   return (0);
-}
-/*----------------------------------------------------------------------
- * Build 27-point laplacian in 3D,
- * Parameters given in command line.
- *----------------------------------------------------------------------*/
-
-HYPRE_Int
-BuildParLaplacian27pt( HYPRE_Int                  argc,
-                       char                *argv[],
-                       HYPRE_Int                  arg_index,
-                       HYPRE_ParCSRMatrix  *A_ptr     )
-{
-   HYPRE_Int                 nx, ny, nz;
-   HYPRE_Int                 P, Q, R;
-
-   HYPRE_ParCSRMatrix  A;
-
-   HYPRE_Int                 num_procs, myid;
-   HYPRE_Int                 p, q, r;
-   HYPRE_Real         *values;
-
-   /*-----------------------------------------------------------
-    * Initialize some stuff
-    *-----------------------------------------------------------*/
-
-   hypre_MPI_Comm_size(hypre_MPI_COMM_WORLD, &num_procs );
-   hypre_MPI_Comm_rank(hypre_MPI_COMM_WORLD, &myid );
-
-   /*-----------------------------------------------------------
-    * Set defaults
-    *-----------------------------------------------------------*/
-
-   nx = 10;
-   ny = 10;
-   nz = 10;
-
-   P  = 1;
-   Q  = num_procs;
-   R  = 1;
-
-   /*-----------------------------------------------------------
-    * Parse command line
-    *-----------------------------------------------------------*/
-   arg_index = 0;
-   while (arg_index < argc)
-   {
-      if ( strcmp(argv[arg_index], "-n") == 0 )
-      {
-         arg_index++;
-         nx = atoi(argv[arg_index++]);
-         ny = atoi(argv[arg_index++]);
-         nz = atoi(argv[arg_index++]);
-      }
-      else if ( strcmp(argv[arg_index], "-P") == 0 )
-      {
-         arg_index++;
-         P  = atoi(argv[arg_index++]);
-         Q  = atoi(argv[arg_index++]);
-         R  = atoi(argv[arg_index++]);
-      }
-      else
-      {
-         arg_index++;
-      }
-   }
-
-   /*-----------------------------------------------------------
-    * Check a few things
-    *-----------------------------------------------------------*/
-
-   if ((P*Q*R) != num_procs)
-   {
-      hypre_printf("Error: Invalid number of processors or processor topology \n");
-      exit(1);
-   }
-
-   /*-----------------------------------------------------------
-    * Print driver parameters
-    *-----------------------------------------------------------*/
-
-   if (myid == 0)
-   {
-      hypre_printf("  Laplacian_27pt:\n");
-      hypre_printf("    (nx, ny, nz) = (%b, %b, %b)\n", nx, ny, nz);
-      hypre_printf("    (Px, Py, Pz) = (%d, %d, %d)\n\n", P,  Q,  R);
-   }
-
-   /*-----------------------------------------------------------
-    * Set up the grid structure
-    *-----------------------------------------------------------*/
-
-   /* compute p,q,r from P,Q,R and myid */
-   p = myid % P;
-   q = (( myid - p)/P) % Q;
-   r = ( myid - p - P*q)/( P*Q );
-
-   /*-----------------------------------------------------------
-    * Generate the matrix
-    *-----------------------------------------------------------*/
-
-   values = hypre_CTAlloc(HYPRE_Real,  2, HYPRE_MEMORY_HOST);
-
-   values[0] = 26.0;
-   if (nx == 1 || ny == 1 || nz == 1)
-      values[0] = 8.0;
-   if (nx*ny == 1 || nx*nz == 1 || ny*nz == 1)
-      values[0] = 2.0;
-   values[1] = -1.0;
-
-   A = (HYPRE_ParCSRMatrix) GenerateLaplacian27pt(hypre_MPI_COMM_WORLD,
-                               nx, ny, nz, P, Q, R, p, q, r, values);
-
-   hypre_TFree(values, HYPRE_MEMORY_HOST);
-
-   *A_ptr = A;
-
-   return (0);
-}
diff --git a/external/hypre/src/test/maxwell_unscaled.c b/external/hypre/src/test/maxwell_unscaled.c
index 940fcb6e..933133fb 100644
--- a/external/hypre/src/test/maxwell_unscaled.c
+++ b/external/hypre/src/test/maxwell_unscaled.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -96,6 +96,8 @@ typedef struct
    ProblemPartData       *pdata;
    HYPRE_Int              max_boxsize;
 
+   HYPRE_MemoryLocation   memory_location;
+
    HYPRE_Int              nstencils;
    HYPRE_Int             *stencil_sizes;
    Index                **stencil_offsets;
@@ -159,19 +161,19 @@ SScanProblemIndex( char          *sdata_ptr,
    switch (ndim)
    {
       case 1:
-      hypre_sscanf(sdata_ptr, "%d%c",
-             &index[0], &sign[0]);
-      break;
+         hypre_sscanf(sdata_ptr, "%d%c",
+                      &index[0], &sign[0]);
+         break;
 
       case 2:
-      hypre_sscanf(sdata_ptr, "%d%c%d%c",
-             &index[0], &sign[0], &index[1], &sign[1]);
-      break;
+         hypre_sscanf(sdata_ptr, "%d%c%d%c",
+                      &index[0], &sign[0], &index[1], &sign[1]);
+         break;
 
       case 3:
-      hypre_sscanf(sdata_ptr, "%d%c%d%c%d%c",
-             &index[0], &sign[0], &index[1], &sign[1], &index[2], &sign[2]);
-      break;
+         hypre_sscanf(sdata_ptr, "%d%c%d%c%d%c",
+                      &index[0], &sign[0], &index[1], &sign[1], &index[2], &sign[2]);
+         break;
    }
    sdata_ptr += strcspn(sdata_ptr, ":)");
    if ( *sdata_ptr == ':' )
@@ -195,7 +197,7 @@ SScanProblemIndex( char          *sdata_ptr,
       /* pre-shift the index */
       for (i = 0; i < ndim; i++)
       {
-         index[i] += index[i+6];
+         index[i] += index[i + 6];
       }
    }
    sdata_ptr += strcspn(sdata_ptr, ")") + 1;
@@ -204,7 +206,7 @@ SScanProblemIndex( char          *sdata_ptr,
    {
       if (sign[i] == '+')
       {
-         index[i+3] = 1;
+         index[i + 3] = 1;
       }
    }
 
@@ -234,6 +236,8 @@ ReadData( char         *filename,
 
    HYPRE_Int          part, var, entry, s, i, il, iu;
 
+   HYPRE_MemoryLocation memory_location = data_ptr -> memory_location;
+
    /*-----------------------------------------------------------
     * Read data file from process 0, then broadcast
     *-----------------------------------------------------------*/
@@ -253,7 +257,7 @@ ReadData( char         *filename,
       sdata = hypre_TAlloc(char,  memchunk, HYPRE_MEMORY_HOST);
       sdata_line = fgets(sdata, maxline, file);
 
-      s= 0;
+      s = 0;
       while (sdata_line != NULL)
       {
          sdata_size += strlen(sdata_line) + 1;
@@ -262,12 +266,14 @@ ReadData( char         *filename,
          if ((sdata_size + maxline) > s)
          {
             sdata = hypre_TReAlloc(sdata,  char,  (sdata_size + memchunk), HYPRE_MEMORY_HOST);
-            s= sdata_size + memchunk;
+            s = sdata_size + memchunk;
          }
 
          /* read the next input line */
          sdata_line = fgets((sdata + sdata_size), maxline, file);
       }
+
+      fclose(file);
    }
 
    /* broadcast the data size */
@@ -281,6 +287,7 @@ ReadData( char         *filename,
     * Parse the data and fill ProblemData structure
     *-----------------------------------------------------------*/
 
+   data.memory_location = memory_location;
    data.max_boxsize = 0;
    data.symmetric_nentries = 0;
    data.symmetric_parts    = NULL;
@@ -327,8 +334,8 @@ ReadData( char         *filename,
             iu = 1;
             for (i = 0; i < data.ndim; i++)
             {
-               il *= pdata.ilowers[pdata.nboxes][i+3];
-               iu *= pdata.iuppers[pdata.nboxes][i+3];
+               il *= pdata.ilowers[pdata.nboxes][i + 3];
+               iu *= pdata.iuppers[pdata.nboxes][i + 3];
             }
             if ( (il != 0) || (iu != 1) )
             {
@@ -443,7 +450,7 @@ ReadData( char         *filename,
                data.stencil_offsets[s][entry][i] = 0;
             }
             data.stencil_vars[s][entry] = strtol(sdata_ptr, &sdata_ptr, 10);
-            data.stencil_values[s][entry] = strtod(sdata_ptr, &sdata_ptr);
+            data.stencil_values[s][entry] = (HYPRE_Real)strtod(sdata_ptr, &sdata_ptr);
          }
          else if ( strcmp(key, "GraphSetStencil:") == 0 )
          {
@@ -493,7 +500,7 @@ ReadData( char         *filename,
                   hypre_TReAlloc(pdata.graph_values,  HYPRE_Real,  size, HYPRE_MEMORY_HOST);
                pdata.d_graph_values =
                   hypre_TReAlloc_v2(pdata.d_graph_values, HYPRE_Real, pdata.graph_values_size,
-                                    HYPRE_Real, size, HYPRE_MEMORY_DEVICE);
+                                    HYPRE_Real, size, memory_location);
                pdata.graph_values_size = size;
                pdata.graph_boxsizes =
                   hypre_TReAlloc(pdata.graph_boxsizes,  HYPRE_Int,  size, HYPRE_MEMORY_HOST);
@@ -542,7 +549,7 @@ ReadData( char         *filename,
             pdata.graph_entries[pdata.graph_nentries] =
                strtol(sdata_ptr, &sdata_ptr, 10);
             pdata.graph_values[pdata.graph_nentries] =
-               strtod(sdata_ptr, &sdata_ptr);
+               (HYPRE_Real)strtod(sdata_ptr, &sdata_ptr);
             pdata.graph_boxsizes[pdata.graph_nentries] = 1;
             for (i = 0; i < 3; i++)
             {
@@ -602,7 +609,7 @@ ReadData( char         *filename,
                   hypre_TReAlloc(pdata.matrix_values,  HYPRE_Real,  size, HYPRE_MEMORY_HOST);
                pdata.d_matrix_values =
                   hypre_TReAlloc_v2(pdata.d_matrix_values, HYPRE_Real, pdata.matrix_values_size,
-                                    HYPRE_Real, size, HYPRE_MEMORY_DEVICE);
+                                    HYPRE_Real, size, memory_location);
                pdata.matrix_values_size = size;
             }
             SScanProblemIndex(sdata_ptr, &sdata_ptr, data.ndim,
@@ -620,7 +627,7 @@ ReadData( char         *filename,
             pdata.matrix_entries[pdata.matrix_nentries] =
                strtol(sdata_ptr, &sdata_ptr, 10);
             pdata.matrix_values[pdata.matrix_nentries] =
-               strtod(sdata_ptr, &sdata_ptr);
+               (HYPRE_Real)strtod(sdata_ptr, &sdata_ptr);
             pdata.matrix_nentries++;
             data.pdata[part] = pdata;
          }
@@ -628,9 +635,9 @@ ReadData( char         *filename,
          else if ( strcmp(key, "rfactor:") == 0 )
          {
             SScanIntArray(sdata_ptr, &sdata_ptr, data.ndim, data.rfactor);
-            for (i= data.ndim; i< 3; i++)
+            for (i = data.ndim; i < 3; i++)
             {
-               data.rfactor[i]= 1;
+               data.rfactor[i] = 1;
             }
          }
 
@@ -676,9 +683,9 @@ MapProblemIndex( ProblemIndex index,
    index[1] -= index[7];
    index[2] -= index[8];
    /* map the index */
-   index[0] = m[0]*index[0] + (m[0]-1)*index[3];
-   index[1] = m[1]*index[1] + (m[1]-1)*index[4];
-   index[2] = m[2]*index[2] + (m[2]-1)*index[5];
+   index[0] = m[0] * index[0] + (m[0] - 1) * index[3];
+   index[1] = m[1] * index[1] + (m[1] - 1) * index[4];
+   index[2] = m[2] * index[2] + (m[2] - 1) * index[5];
    /* pre-shift the new mapped index */
    index[0] += index[6];
    index[1] += index[7];
@@ -717,6 +724,7 @@ DistributeData( ProblemData   global_data,
                 HYPRE_Int     myid,
                 ProblemData  *data_ptr )
 {
+   HYPRE_MemoryLocation memory_location = global_data.memory_location;
    ProblemData      data = global_data;
    ProblemPartData  pdata;
    HYPRE_Int       *pool_procs;
@@ -726,7 +734,7 @@ DistributeData( ProblemData   global_data,
    ProblemIndex     int_ilower, int_iupper;
 
    /* determine first process number in each pool */
-   pool_procs = hypre_CTAlloc(HYPRE_Int,  (data.npools+1), HYPRE_MEMORY_HOST);
+   pool_procs = hypre_CTAlloc(HYPRE_Int,  (data.npools + 1), HYPRE_MEMORY_HOST);
    for (part = 0; part < data.nparts; part++)
    {
       pool = data.pools[part] + 1;
@@ -802,7 +810,7 @@ DistributeData( ProblemData   global_data,
          {
             p = pid % m[0];
             q = ((pid - p) / m[0]) % m[1];
-            r = (pid - p - q*m[0]) / (m[0]*m[1]);
+            r = (pid - p - q * m[0]) / (m[0] * m[1]);
 
             for (box = 0; box < pdata.nboxes; box++)
             {
@@ -816,12 +824,12 @@ DistributeData( ProblemData   global_data,
                pdata.iuppers[box][1] = pdata.ilowers[box][1] + n[1] - 1;
                pdata.iuppers[box][2] = pdata.ilowers[box][2] + n[2] - 1;
 
-               pdata.ilowers[box][0] = pdata.ilowers[box][0] + p*n[0];
-               pdata.ilowers[box][1] = pdata.ilowers[box][1] + q*n[1];
-               pdata.ilowers[box][2] = pdata.ilowers[box][2] + r*n[2];
-               pdata.iuppers[box][0] = pdata.iuppers[box][0] + p*n[0];
-               pdata.iuppers[box][1] = pdata.iuppers[box][1] + q*n[1];
-               pdata.iuppers[box][2] = pdata.iuppers[box][2] + r*n[2];
+               pdata.ilowers[box][0] = pdata.ilowers[box][0] + p * n[0];
+               pdata.ilowers[box][1] = pdata.ilowers[box][1] + q * n[1];
+               pdata.ilowers[box][2] = pdata.ilowers[box][2] + r * n[2];
+               pdata.iuppers[box][0] = pdata.iuppers[box][0] + p * n[0];
+               pdata.iuppers[box][1] = pdata.iuppers[box][1] + q * n[1];
+               pdata.iuppers[box][2] = pdata.iuppers[box][2] + r * n[2];
             }
 
             i = 0;
@@ -935,11 +943,11 @@ DistributeData( ProblemData   global_data,
          if ( (m[0] * m[1] * m[2]) > 1)
          {
             pdata.ilowers = hypre_TReAlloc(pdata.ilowers,  ProblemIndex,
-                                           m[0]*m[1]*m[2]*pdata.nboxes, HYPRE_MEMORY_HOST);
+                                           m[0] * m[1] * m[2] * pdata.nboxes, HYPRE_MEMORY_HOST);
             pdata.iuppers = hypre_TReAlloc(pdata.iuppers,  ProblemIndex,
-                                           m[0]*m[1]*m[2]*pdata.nboxes, HYPRE_MEMORY_HOST);
+                                           m[0] * m[1] * m[2] * pdata.nboxes, HYPRE_MEMORY_HOST);
             pdata.boxsizes = hypre_TReAlloc(pdata.boxsizes,  HYPRE_Int,
-                                            m[0]*m[1]*m[2]*pdata.nboxes, HYPRE_MEMORY_HOST);
+                                            m[0] * m[1] * m[2] * pdata.nboxes, HYPRE_MEMORY_HOST);
             for (box = 0; box < pdata.nboxes; box++)
             {
                n[0] = pdata.iuppers[box][0] - pdata.ilowers[box][0] + 1;
@@ -960,12 +968,12 @@ DistributeData( ProblemData   global_data,
                   {
                      for (p = 0; p < m[0]; p++)
                      {
-                        pdata.ilowers[i][0] = pdata.ilowers[box][0] + p*n[0];
-                        pdata.ilowers[i][1] = pdata.ilowers[box][1] + q*n[1];
-                        pdata.ilowers[i][2] = pdata.ilowers[box][2] + r*n[2];
-                        pdata.iuppers[i][0] = pdata.iuppers[box][0] + p*n[0];
-                        pdata.iuppers[i][1] = pdata.iuppers[box][1] + q*n[1];
-                        pdata.iuppers[i][2] = pdata.iuppers[box][2] + r*n[2];
+                        pdata.ilowers[i][0] = pdata.ilowers[box][0] + p * n[0];
+                        pdata.ilowers[i][1] = pdata.ilowers[box][1] + q * n[1];
+                        pdata.ilowers[i][2] = pdata.ilowers[box][2] + r * n[2];
+                        pdata.iuppers[i][0] = pdata.iuppers[box][0] + p * n[0];
+                        pdata.iuppers[i][1] = pdata.iuppers[box][1] + q * n[1];
+                        pdata.iuppers[i][2] = pdata.iuppers[box][2] + r * n[2];
                         for (d = 3; d < 9; d++)
                         {
                            pdata.ilowers[i][d] = pdata.ilowers[box][d];
@@ -976,7 +984,7 @@ DistributeData( ProblemData   global_data,
                   }
                }
             }
-            pdata.nboxes *= m[0]*m[1]*m[2];
+            pdata.nboxes *= m[0] * m[1] * m[2];
 
             for (entry = 0; entry < pdata.graph_nentries; entry++)
             {
@@ -1072,7 +1080,7 @@ DistributeData( ProblemData   global_data,
          hypre_TFree(pdata.graph_entries, HYPRE_MEMORY_HOST);
          pdata.graph_values_size = 0;
          hypre_TFree(pdata.graph_values, HYPRE_MEMORY_HOST);
-         hypre_TFree(pdata.d_graph_values, HYPRE_MEMORY_DEVICE);
+         hypre_TFree(pdata.d_graph_values, memory_location);
          hypre_TFree(pdata.graph_boxsizes, HYPRE_MEMORY_HOST);
       }
 
@@ -1085,7 +1093,7 @@ DistributeData( ProblemData   global_data,
          hypre_TFree(pdata.matrix_entries, HYPRE_MEMORY_HOST);
          pdata.matrix_values_size = 0;
          hypre_TFree(pdata.matrix_values, HYPRE_MEMORY_HOST);
-         hypre_TFree(pdata.d_matrix_values, HYPRE_MEMORY_DEVICE);
+         hypre_TFree(pdata.d_matrix_values, memory_location);
       }
 
       data.pdata[part] = pdata;
@@ -1111,6 +1119,7 @@ DistributeData( ProblemData   global_data,
 HYPRE_Int
 DestroyData( ProblemData   data )
 {
+   HYPRE_MemoryLocation memory_location = data.memory_location;
    ProblemPartData  pdata;
    HYPRE_Int        part, s;
 
@@ -1166,7 +1175,7 @@ DestroyData( ProblemData   data )
          hypre_TFree(pdata.graph_index_signs, HYPRE_MEMORY_HOST);
          hypre_TFree(pdata.graph_entries, HYPRE_MEMORY_HOST);
          hypre_TFree(pdata.graph_values, HYPRE_MEMORY_HOST);
-         hypre_TFree(pdata.d_graph_values, HYPRE_MEMORY_DEVICE);
+         hypre_TFree(pdata.d_graph_values, memory_location);
          hypre_TFree(pdata.graph_boxsizes, HYPRE_MEMORY_HOST);
       }
 
@@ -1178,7 +1187,7 @@ DestroyData( ProblemData   data )
          hypre_TFree(pdata.matrix_vars, HYPRE_MEMORY_HOST);
          hypre_TFree(pdata.matrix_entries, HYPRE_MEMORY_HOST);
          hypre_TFree(pdata.matrix_values, HYPRE_MEMORY_HOST);
-         hypre_TFree(pdata.d_matrix_values, HYPRE_MEMORY_DEVICE);
+         hypre_TFree(pdata.d_matrix_values, memory_location);
       }
 
    }
@@ -1229,34 +1238,34 @@ GetVariableBox( Index        cell_ilower,
    var_iupper[1] = cell_iupper[1];
    var_iupper[2] = cell_iupper[2];
 
-   switch(vartype)
+   switch (vartype)
    {
       case HYPRE_SSTRUCT_VARIABLE_CELL:
-      var_ilower[0] -= 0; var_ilower[1] -= 0; var_ilower[2] -= 0;
-      break;
+         var_ilower[0] -= 0; var_ilower[1] -= 0; var_ilower[2] -= 0;
+         break;
       case HYPRE_SSTRUCT_VARIABLE_NODE:
-      var_ilower[0] -= 1; var_ilower[1] -= 1; var_ilower[2] -= 1;
-      break;
+         var_ilower[0] -= 1; var_ilower[1] -= 1; var_ilower[2] -= 1;
+         break;
       case HYPRE_SSTRUCT_VARIABLE_XFACE:
-      var_ilower[0] -= 1; var_ilower[1] -= 0; var_ilower[2] -= 0;
-      break;
+         var_ilower[0] -= 1; var_ilower[1] -= 0; var_ilower[2] -= 0;
+         break;
       case HYPRE_SSTRUCT_VARIABLE_YFACE:
-      var_ilower[0] -= 0; var_ilower[1] -= 1; var_ilower[2] -= 0;
-      break;
+         var_ilower[0] -= 0; var_ilower[1] -= 1; var_ilower[2] -= 0;
+         break;
       case HYPRE_SSTRUCT_VARIABLE_ZFACE:
-      var_ilower[0] -= 0; var_ilower[1] -= 0; var_ilower[2] -= 1;
-      break;
+         var_ilower[0] -= 0; var_ilower[1] -= 0; var_ilower[2] -= 1;
+         break;
       case HYPRE_SSTRUCT_VARIABLE_XEDGE:
-      var_ilower[0] -= 0; var_ilower[1] -= 1; var_ilower[2] -= 1;
-      break;
+         var_ilower[0] -= 0; var_ilower[1] -= 1; var_ilower[2] -= 1;
+         break;
       case HYPRE_SSTRUCT_VARIABLE_YEDGE:
-      var_ilower[0] -= 1; var_ilower[1] -= 0; var_ilower[2] -= 1;
-      break;
+         var_ilower[0] -= 1; var_ilower[1] -= 0; var_ilower[2] -= 1;
+         break;
       case HYPRE_SSTRUCT_VARIABLE_ZEDGE:
-      var_ilower[0] -= 1; var_ilower[1] -= 1; var_ilower[2] -= 0;
-      break;
+         var_ilower[0] -= 1; var_ilower[1] -= 1; var_ilower[2] -= 0;
+         break;
       case HYPRE_SSTRUCT_VARIABLE_UNDEFINED:
-      break;
+         break;
    }
 
    return ierr;
@@ -1275,7 +1284,7 @@ PrintUsage( char       *progname,
       hypre_printf("Usage: %s [<options>]\n", progname);
       hypre_printf("\n");
       hypre_printf("  -in <filename> : input file (default is `%s')\n",
-             infile_default);
+                   infile_default);
       hypre_printf("\n");
       hypre_printf("  -pt <pt1> <pt2> ... : set part(s) for subsequent options\n");
       hypre_printf("  -r <rx> <ry> <rz>   : refine part(s)\n");
@@ -1340,11 +1349,24 @@ main( hypre_int argc,
 
    HYPRE_Int             arg_index, part, box, var, entry, s, i, j, k;
 
+#if defined(HYPRE_USING_MEMORY_TRACKER)
+   HYPRE_Int print_mem_tracker = 0;
+   char mem_tracker_name[HYPRE_MAX_FILE_NAME_LEN] = {0};
+#endif
+
 #if defined(HYPRE_USING_GPU)
-   HYPRE_Int spgemm_use_cusparse = 0;
+   HYPRE_Int spgemm_use_vendor = 0;
 #endif
+
+#if defined(HYPRE_TEST_USING_HOST)
+   HYPRE_MemoryLocation memory_location = HYPRE_MEMORY_HOST;
    HYPRE_ExecutionPolicy default_exec_policy = HYPRE_EXEC_HOST;
+#else
    HYPRE_MemoryLocation memory_location = HYPRE_MEMORY_DEVICE;
+   HYPRE_ExecutionPolicy default_exec_policy = HYPRE_EXEC_DEVICE;
+#endif
+
+   global_data.memory_location = memory_location;
 
    /*-----------------------------------------------------------
     * Initialize some stuff
@@ -1357,14 +1379,15 @@ main( hypre_int argc,
 
    /*-----------------------------------------------------------------
     * GPU Device binding
-    * Must be done before HYPRE_Init() and should not be changed after
+    * Must be done before HYPRE_Initialize() and should not be changed after
     *-----------------------------------------------------------------*/
-   hypre_bind_device(myid, num_procs, hypre_MPI_COMM_WORLD);
+   hypre_bind_device_id(-1, myid, num_procs, hypre_MPI_COMM_WORLD);
 
    /*-----------------------------------------------------------
     * Initialize : must be the first HYPRE function to call
     *-----------------------------------------------------------*/
-   HYPRE_Init();
+   HYPRE_Initialize();
+   HYPRE_DeviceInitialize();
 
    /*-----------------------------------------------------------
     * Read input file
@@ -1406,6 +1429,7 @@ main( hypre_int argc,
       }
    }
 
+   solver_id = 0;
    print_system = 0;
 
    /*-----------------------------------------------------------
@@ -1475,7 +1499,6 @@ main( hypre_int argc,
          arg_index++;
          print_system = 1;
       }
-#if defined(HYPRE_USING_GPU)
       else if ( strcmp(argv[arg_index], "-exec_host") == 0 )
       {
          arg_index++;
@@ -1486,10 +1509,23 @@ main( hypre_int argc,
          arg_index++;
          default_exec_policy = HYPRE_EXEC_DEVICE;
       }
-      else if ( strcmp(argv[arg_index], "-mm_cusparse") == 0 )
+#if defined(HYPRE_USING_GPU)
+      else if ( strcmp(argv[arg_index], "-mm_vendor") == 0 )
+      {
+         arg_index++;
+         spgemm_use_vendor = atoi(argv[arg_index++]);
+      }
+#endif
+#if defined(HYPRE_USING_MEMORY_TRACKER)
+      else if ( strcmp(argv[arg_index], "-print_mem_tracker") == 0 )
+      {
+         arg_index++;
+         print_mem_tracker = atoi(argv[arg_index++]);
+      }
+      else if ( strcmp(argv[arg_index], "-mem_tracker_filename") == 0 )
       {
          arg_index++;
-         spgemm_use_cusparse = atoi(argv[arg_index++]);
+         snprintf(mem_tracker_name, HYPRE_MAX_FILE_NAME_LEN, "%s", argv[arg_index++]);
       }
 #endif
       else if ( strcmp(argv[arg_index], "-help") == 0 )
@@ -1504,6 +1540,11 @@ main( hypre_int argc,
       }
    }
 
+#if defined(HYPRE_USING_MEMORY_TRACKER)
+   hypre_MemoryTrackerSetPrint(print_mem_tracker);
+   if (mem_tracker_name[0]) { hypre_MemoryTrackerSetFileName(mem_tracker_name); }
+#endif
+
    /* default memory location */
    HYPRE_SetMemoryLocation(memory_location);
 
@@ -1511,10 +1552,9 @@ main( hypre_int argc,
    HYPRE_SetExecutionPolicy(default_exec_policy);
 
 #if defined(HYPRE_USING_GPU)
-   HYPRE_SetSpGemmUseCusparse(spgemm_use_cusparse);
+   HYPRE_SetSpGemmUseVendor(spgemm_use_vendor);
 #endif
 
-
    /*-----------------------------------------------------------
     * Distribute data
     *-----------------------------------------------------------*/
@@ -1625,7 +1665,7 @@ main( hypre_int argc,
                      k /= pdata.graph_strides[entry][i];
                      k *= pdata.graph_index_signs[entry][i];
                      to_index[j] = pdata.graph_to_ilowers[entry][j] +
-                        k * pdata.graph_to_strides[entry][j];
+                                   k * pdata.graph_to_strides[entry][j];
                   }
                   HYPRE_SStructGraphAddEntries(graph, part, index,
                                                pdata.graph_vars[entry],
@@ -1645,7 +1685,7 @@ main( hypre_int argc,
     *-----------------------------------------------------------*/
 
    values = hypre_CTAlloc(HYPRE_Real, data.max_boxsize, HYPRE_MEMORY_HOST);
-   d_values = hypre_TAlloc(HYPRE_Real, data.max_boxsize, HYPRE_MEMORY_DEVICE);
+   d_values = hypre_TAlloc(HYPRE_Real, data.max_boxsize, memory_location);
 
    HYPRE_SStructMatrixCreate(hypre_MPI_COMM_WORLD, graph, &A);
 
@@ -1669,10 +1709,10 @@ main( hypre_int argc,
       cell_grid = hypre_SStructPGridCellSGrid(hypre_SStructGridPGrid(grid, part));
       bounding_box = hypre_StructGridBoundingBox(cell_grid);
 
-      h = (HYPRE_Real) (hypre_BoxIMax(bounding_box)[0]- hypre_BoxIMin(bounding_box)[0]);
+      h = (HYPRE_Real) (hypre_BoxIMax(bounding_box)[0] - hypre_BoxIMin(bounding_box)[0]);
       for (i = 1; i < data.ndim; i++)
       {
-         if ((hypre_BoxIMax(bounding_box)[i]- hypre_BoxIMin(bounding_box)[i]) > h)
+         if ((hypre_BoxIMax(bounding_box)[i] - hypre_BoxIMin(bounding_box)[i]) > h)
          {
             h = (HYPRE_Real) (hypre_BoxIMax(bounding_box)[i] - hypre_BoxIMin(bounding_box)[i]);
          }
@@ -1687,18 +1727,18 @@ main( hypre_int argc,
          {
             for (j = 0; j < pdata.max_boxsize; j++)
             {
-               values[j] = h*data.stencil_values[s][i];
+               values[j] = h * data.stencil_values[s][i];
             }
             if (i < 9)
             {
                for (j = 0; j < pdata.max_boxsize; j++)
                {
-                  values[j] += data.stencil_values[s+data.ndim][i] / h;
+                  values[j] += data.stencil_values[s + data.ndim][i] / h;
                }
             }
 
             hypre_TMemcpy(d_values, values, HYPRE_Real, data.max_boxsize,
-                          HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
+                          memory_location, HYPRE_MEMORY_HOST);
 
             for (box = 0; box < pdata.nboxes; box++)
             {
@@ -1711,7 +1751,7 @@ main( hypre_int argc,
       }
 
       hypre_TMemcpy(pdata.d_graph_values, pdata.graph_values, HYPRE_Real, pdata.graph_values_size,
-                    HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
+                    memory_location, HYPRE_MEMORY_HOST);
 
       /* set non-stencil entries */
       for (entry = 0; entry < pdata.graph_nentries; entry++)
@@ -1748,7 +1788,7 @@ main( hypre_int argc,
       pdata = data.pdata[part];
 
       hypre_TMemcpy(pdata.d_matrix_values, pdata.matrix_values, HYPRE_Real, pdata.matrix_values_size,
-                    HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
+                    memory_location, HYPRE_MEMORY_HOST);
 
       for (entry = 0; entry < pdata.matrix_nentries; entry++)
       {
@@ -1807,13 +1847,13 @@ main( hypre_int argc,
    HYPRE_SStructVectorInitialize(b);
    for (j = 0; j < data.max_boxsize; j++)
    {
-      values[j]= sin((HYPRE_Real)(j+1));
-      values[j]= (HYPRE_Real) hypre_Rand();
-      values[j]= (HYPRE_Real) j;
+      values[j] = hypre_sin((HYPRE_Real)(j + 1));
+      values[j] = (HYPRE_Real) hypre_Rand();
+      values[j] = (HYPRE_Real) j;
    }
 
    hypre_TMemcpy(d_values, values, HYPRE_Real, data.max_boxsize,
-                 HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
+                 memory_location, HYPRE_MEMORY_HOST);
 
    for (part = 0; part < data.nparts; part++)
    {
@@ -1841,7 +1881,7 @@ main( hypre_int argc,
    }
 
    hypre_TMemcpy(d_values, values, HYPRE_Real, data.max_boxsize,
-                 HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
+                 memory_location, HYPRE_MEMORY_HOST);
 
    for (part = 0; part < data.nparts; part++)
    {
@@ -1889,7 +1929,7 @@ main( hypre_int argc,
     *-----------------------------------------------------------*/
 
    hypre_TFree(values, HYPRE_MEMORY_HOST);
-   hypre_TFree(d_values, HYPRE_MEMORY_DEVICE);
+   hypre_TFree(d_values, memory_location);
 
    if (solver_id == 1)
    {
@@ -1926,7 +1966,7 @@ main( hypre_int argc,
 
       HYPRE_SStructMaxwellGetNumIterations(solver, &num_iterations);
       HYPRE_SStructMaxwellGetFinalRelativeResidualNorm(
-                                           solver, &final_res_norm);
+         solver, &final_res_norm);
       HYPRE_SStructMaxwellDestroy(solver);
    }
 
@@ -1979,6 +2019,16 @@ main( hypre_int argc,
    /* Finalize MPI */
    hypre_MPI_Finalize();
 
+#if defined(HYPRE_USING_MEMORY_TRACKER)
+   if (memory_location == HYPRE_MEMORY_HOST)
+   {
+      if (hypre_total_bytes[hypre_MEMORY_DEVICE] || hypre_total_bytes[hypre_MEMORY_UNIFIED])
+      {
+         hypre_printf("Error: nonzero GPU memory allocated with the HOST mode\n");
+         hypre_assert(0);
+      }
+   }
+#endif
+
    return (0);
 }
-
diff --git a/external/hypre/src/test/new_ij.c b/external/hypre/src/test/new_ij.c
index b6674a2c..e786b6f1 100644
--- a/external/hypre/src/test/new_ij.c
+++ b/external/hypre/src/test/new_ij.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -29,41 +29,57 @@
 extern "C" {
 #endif
 
-HYPRE_Int BuildParFromFile (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix *A_ptr );
-HYPRE_Int BuildParRhsFromFile (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParVector *b_ptr );
-
-HYPRE_Int BuildParLaplacian (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix *A_ptr );
-HYPRE_Int BuildParSysLaplacian (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix *A_ptr );
-HYPRE_Int BuildParDifConv (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix *A_ptr );
-HYPRE_Int BuildParFromOneFile (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_Int num_functions , HYPRE_ParCSRMatrix *A_ptr );
-HYPRE_Int BuildFuncsFromFiles (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix A , HYPRE_Int **dof_func_ptr );
-HYPRE_Int BuildFuncsFromOneFile (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix A , HYPRE_Int **dof_func_ptr );
-HYPRE_Int BuildRhsParFromOneFile (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_Int *partitioning , HYPRE_ParVector *b_ptr );
-HYPRE_Int BuildParLaplacian9pt (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix *A_ptr );
-HYPRE_Int BuildParLaplacian27pt (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix *A_ptr );
-HYPRE_Int BuildParRotate7pt (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix *A_ptr );
-HYPRE_Int BuildParVarDifConv (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix *A_ptr , HYPRE_ParVector *rhs_ptr );
-HYPRE_ParCSRMatrix GenerateSysLaplacian (MPI_Comm comm, HYPRE_Int nx, HYPRE_Int ny, HYPRE_Int nz, 
+HYPRE_Int BuildParFromFile (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                            HYPRE_ParCSRMatrix *A_ptr );
+HYPRE_Int BuildParRhsFromFile (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                               HYPRE_ParVector *b_ptr );
+
+HYPRE_Int BuildParLaplacian (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                             HYPRE_ParCSRMatrix *A_ptr );
+HYPRE_Int BuildParSysLaplacian (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                                HYPRE_ParCSRMatrix *A_ptr );
+HYPRE_Int BuildParDifConv (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                           HYPRE_ParCSRMatrix *A_ptr );
+HYPRE_Int BuildParFromOneFile (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                               HYPRE_Int num_functions, HYPRE_ParCSRMatrix *A_ptr );
+HYPRE_Int BuildFuncsFromFiles (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                               HYPRE_ParCSRMatrix A, HYPRE_Int **dof_func_ptr );
+HYPRE_Int BuildFuncsFromOneFile (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                                 HYPRE_ParCSRMatrix A, HYPRE_Int **dof_func_ptr );
+HYPRE_Int BuildRhsParFromOneFile (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                                  HYPRE_Int *partitioning, HYPRE_ParVector *b_ptr );
+HYPRE_Int BuildParLaplacian9pt (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                                HYPRE_ParCSRMatrix *A_ptr );
+HYPRE_Int BuildParLaplacian27pt (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                                 HYPRE_ParCSRMatrix *A_ptr );
+HYPRE_Int BuildParRotate7pt (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                             HYPRE_ParCSRMatrix *A_ptr );
+HYPRE_Int BuildParVarDifConv (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                              HYPRE_ParCSRMatrix *A_ptr, HYPRE_ParVector *rhs_ptr );
+HYPRE_ParCSRMatrix GenerateSysLaplacian (MPI_Comm comm, HYPRE_Int nx, HYPRE_Int ny, HYPRE_Int nz,
                                          HYPRE_Int P, HYPRE_Int Q, HYPRE_Int R, HYPRE_Int p, HYPRE_Int q, HYPRE_Int r,
                                          HYPRE_Int num_fun, HYPRE_Real *mtrx, HYPRE_Real *value);
-HYPRE_ParCSRMatrix GenerateSysLaplacianVCoef (MPI_Comm comm, HYPRE_Int nx, HYPRE_Int ny, HYPRE_Int nz, 
+HYPRE_ParCSRMatrix GenerateSysLaplacianVCoef (MPI_Comm comm, HYPRE_Int nx, HYPRE_Int ny,
+                                              HYPRE_Int nz,
                                               HYPRE_Int P, HYPRE_Int Q, HYPRE_Int R, HYPRE_Int p, HYPRE_Int q, HYPRE_Int r,
                                               HYPRE_Int num_fun, HYPRE_Real *mtrx, HYPRE_Real *value);
-HYPRE_Int SetSysVcoefValues(HYPRE_Int num_fun, HYPRE_Int nx, HYPRE_Int ny, HYPRE_Int nz, HYPRE_Real vcx, HYPRE_Real vcy, HYPRE_Real vcz, HYPRE_Int mtx_entry, HYPRE_Real *values);
+HYPRE_Int SetSysVcoefValues(HYPRE_Int num_fun, HYPRE_Int nx, HYPRE_Int ny, HYPRE_Int nz,
+                            HYPRE_Real vcx, HYPRE_Real vcy, HYPRE_Real vcz, HYPRE_Int mtx_entry, HYPRE_Real *values);
 
-HYPRE_Int BuildParCoordinates (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_Int *coorddim_ptr , float **coord_ptr );
-                                                                                
-extern HYPRE_Int hypre_FlexGMRESModifyPCAMGExample(void *precond_data, HYPRE_Int iterations, 
+HYPRE_Int BuildParCoordinates (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                               HYPRE_Int *coorddim_ptr, float **coord_ptr );
+
+extern HYPRE_Int hypre_FlexGMRESModifyPCAMGExample(void *precond_data, HYPRE_Int iterations,
                                                    HYPRE_Real rel_residual_norm);
 
-extern HYPRE_Int hypre_FlexGMRESModifyPCDefault(void *precond_data, HYPRE_Int iteration, 
+extern HYPRE_Int hypre_FlexGMRESModifyPCDefault(void *precond_data, HYPRE_Int iteration,
                                                 HYPRE_Real rel_residual_norm);
 
 #ifdef __cplusplus
 }
 #endif
 #define SECOND_TIME 0
- 
+
 hypre_int
 main( hypre_int argc,
       char *argv[] )
@@ -89,7 +105,7 @@ main( hypre_int argc,
    HYPRE_Int                 poutdat;
    HYPRE_Int                 debug_flag;
    HYPRE_Int                 ierr = 0;
-   HYPRE_Int                 i,j; 
+   HYPRE_Int                 i, j;
    HYPRE_Int                 max_levels = 25;
    HYPRE_Int                 num_iterations;
    HYPRE_Int                 pcg_num_its, dscg_num_its;
@@ -102,7 +118,7 @@ main( hypre_int argc,
    HYPRE_Real          final_res_norm;
    void               *object;
 
-   HYPRE_IJMatrix      ij_A; 
+   HYPRE_IJMatrix      ij_A;
    HYPRE_IJVector      ij_b;
    HYPRE_IJVector      ij_x;
    HYPRE_IJVector      *ij_rbm;
@@ -114,7 +130,7 @@ main( hypre_int argc,
 
    HYPRE_Solver        amg_solver;
    HYPRE_Solver        pcg_solver;
-   HYPRE_Solver        pcg_precond=NULL, pcg_precond_gotten;
+   HYPRE_Solver        pcg_precond = NULL, pcg_precond_gotten;
 
    HYPRE_Int                 num_procs, myid;
    HYPRE_Int                 local_row;
@@ -126,12 +142,12 @@ main( hypre_int argc,
    HYPRE_Int                *ncols;
    HYPRE_Int                *col_inds;
    HYPRE_Int                *dof_func;
-   HYPRE_Int		       num_functions = 1;
-   HYPRE_Int		       num_paths = 1;
-   HYPRE_Int		       agg_num_levels = 0;
-   HYPRE_Int		       ns_coarse = 1;
+   HYPRE_Int             num_functions = 1;
+   HYPRE_Int             num_paths = 1;
+   HYPRE_Int             agg_num_levels = 0;
+   HYPRE_Int             ns_coarse = 1;
 
-   HYPRE_Int		       time_index;
+   HYPRE_Int             time_index;
    MPI_Comm            comm = hypre_MPI_COMM_WORLD;
    HYPRE_Int M, N;
    HYPRE_Int first_local_row, last_local_row, local_num_rows;
@@ -164,37 +180,37 @@ main( hypre_int argc,
    HYPRE_Int      cycle_type;
    HYPRE_Int      coarsen_type = 6;
    HYPRE_Int      measure_type = 0;
-   HYPRE_Int      num_sweeps = 1;  
-   HYPRE_Int      IS_type;   
-   HYPRE_Int      num_CR_relax_steps = 2;   
-   HYPRE_Int      relax_type;   
-   HYPRE_Int      relax_coarse = -1;   
-   HYPRE_Int      relax_up = -1;   
-   HYPRE_Int      relax_down = -1;   
-   HYPRE_Int      relax_order = 1;   
+   HYPRE_Int      num_sweeps = 1;
+   HYPRE_Int      IS_type;
+   HYPRE_Int      num_CR_relax_steps = 2;
+   HYPRE_Int      relax_type;
+   HYPRE_Int      relax_coarse = -1;
+   HYPRE_Int      relax_up = -1;
+   HYPRE_Int      relax_down = -1;
+   HYPRE_Int      relax_order = 1;
    HYPRE_Int      level_w = -1;
    HYPRE_Int      level_ow = -1;
-/* HYPRE_Int	    smooth_lev; */
-/* HYPRE_Int	    smooth_rlx = 8; */
-   HYPRE_Int	    smooth_type = 6;
-   HYPRE_Int	    smooth_num_levels = 0;
+   /* HYPRE_Int       smooth_lev; */
+   /* HYPRE_Int       smooth_rlx = 8; */
+   HYPRE_Int       smooth_type = 6;
+   HYPRE_Int       smooth_num_levels = 0;
    HYPRE_Int      smooth_num_sweeps = 1;
    HYPRE_Int      coarse_threshold = 9;
    HYPRE_Int      min_coarse_size = 0;
-/* redundant coarse grid solve */
+   /* redundant coarse grid solve */
    HYPRE_Int      seq_threshold = 0;
    HYPRE_Int      redundant = 0;
-/* additive versions */
+   /* additive versions */
    HYPRE_Int additive = -1;
    HYPRE_Int mult_add = -1;
    HYPRE_Int simple = -1;
    HYPRE_Int add_P_max_elmts = 0;
    HYPRE_Real add_trunc_factor = 0;
 
-   HYPRE_Int    rap2=0;
+   HYPRE_Int    rap2 = 0;
    HYPRE_Int    keepTranspose = 0;
-   HYPRE_Real   relax_wt; 
-   HYPRE_Real   relax_wt_level; 
+   HYPRE_Real   relax_wt;
+   HYPRE_Real   relax_wt_level;
    HYPRE_Real   outer_wt;
    HYPRE_Real   outer_wt_level;
    HYPRE_Real   tol = 1.e-8, pc_tol = 0.;
@@ -211,7 +227,7 @@ main( hypre_int argc,
    HYPRE_Int      coord_dim  = 3;
    float    *coordinates = NULL;
    char    plot_file_name[256];
-   
+
    /* parameters for ParaSAILS */
    HYPRE_Real   sai_threshold = 0.1;
    HYPRE_Real   sai_filter = 0.1;
@@ -223,16 +239,16 @@ main( hypre_int argc,
    /* parameters for Euclid or ILU smoother in AMG */
    HYPRE_Real   eu_ilut = 0.0;
    HYPRE_Real   eu_sparse_A = 0.0;
-   HYPRE_Int	    eu_bj = 0;
-   HYPRE_Int	    eu_level = -1;
-   HYPRE_Int	    eu_stats = 0;
-   HYPRE_Int	    eu_mem = 0;
-   HYPRE_Int	    eu_row_scale = 0; /* Euclid only */
+   HYPRE_Int       eu_bj = 0;
+   HYPRE_Int       eu_level = -1;
+   HYPRE_Int       eu_stats = 0;
+   HYPRE_Int       eu_mem = 0;
+   HYPRE_Int       eu_row_scale = 0; /* Euclid only */
 
    /* parameters for GMRES */
-   HYPRE_Int	    k_dim;
+   HYPRE_Int       k_dim;
    /* parameters for LGMRES */
-   HYPRE_Int	    aug_dim;
+   HYPRE_Int       aug_dim;
    /* parameters for GSMG */
    HYPRE_Int      gsmg_samples = 5;
    /* interpolation */
@@ -271,7 +287,7 @@ main( hypre_int argc,
    /*-----------------------------------------------------------
     * Set defaults
     *-----------------------------------------------------------*/
- 
+
    build_matrix_type = 2;
    build_matrix_arg_index = argc;
    build_rhs_type = 2;
@@ -289,12 +305,12 @@ main( hypre_int argc,
    ioutdat = 3;
    poutdat = 1;
 
-   hypre_sprintf (plot_file_name,"AMGgrids.CF.dat");
+   hypre_sprintf (plot_file_name, "AMGgrids.CF.dat");
 
    /*-----------------------------------------------------------
     * Parse command line
     *-----------------------------------------------------------*/
- 
+
    print_usage = 0;
    arg_index = 1;
 
@@ -353,7 +369,7 @@ main( hypre_int argc,
          arg_index++;
          build_matrix_type      = 7;
          build_matrix_arg_index = arg_index;
-      } 
+      }
       else if ( strcmp(argv[arg_index], "-test_ij") == 0 )
       {
          arg_index++;
@@ -429,13 +445,13 @@ main( hypre_int argc,
          arg_index++;
          build_rhs_type      = 1;
          build_rhs_arg_index = arg_index;
-      }      
+      }
       else if ( strcmp(argv[arg_index], "-rhsparcsrfile") == 0 )
       {
          arg_index++;
          build_rhs_type      = 7;
          build_rhs_arg_index = arg_index;
-      }      
+      }
       else if ( strcmp(argv[arg_index], "-rhsisone") == 0 )
       {
          arg_index++;
@@ -447,7 +463,7 @@ main( hypre_int argc,
          arg_index++;
          build_rhs_type      = 3;
          build_rhs_arg_index = arg_index;
-      }    
+      }
       else if ( strcmp(argv[arg_index], "-xisone") == 0 )
       {
          arg_index++;
@@ -459,7 +475,7 @@ main( hypre_int argc,
          arg_index++;
          build_rhs_type      = 5;
          build_rhs_arg_index = arg_index;
-      }    
+      }
       else if ( strcmp(argv[arg_index], "-srcfromfile") == 0 )
       {
          arg_index++;
@@ -499,12 +515,12 @@ main( hypre_int argc,
       {
          arg_index++;
          coarsen_type      = 0;
-      }    
+      }
       else if ( strcmp(argv[arg_index], "-cljp1") == 0 )
       {
          arg_index++;
          coarsen_type      = 7;
-      }    
+      }
       else if ( strcmp(argv[arg_index], "-cgc") == 0 )
       {
          arg_index++;
@@ -521,72 +537,72 @@ main( hypre_int argc,
       {
          arg_index++;
          coarsen_type      = 8;
-      }    
+      }
       else if ( strcmp(argv[arg_index], "-pmis1") == 0 )
       {
          arg_index++;
          coarsen_type      = 9;
-      }    
+      }
       else if ( strcmp(argv[arg_index], "-cr1") == 0 )
       {
          arg_index++;
          coarsen_type      = 98;
-      }    
+      }
       else if ( strcmp(argv[arg_index], "-cr") == 0 )
       {
          arg_index++;
          coarsen_type      = 99;
-      }    
+      }
       else if ( strcmp(argv[arg_index], "-crcg") == 0 )
       {
          arg_index++;
          CR_use_CG = atoi(argv[arg_index++]);
-      }    
+      }
       else if ( strcmp(argv[arg_index], "-hmis") == 0 )
       {
          arg_index++;
          coarsen_type      = 10;
-      }    
+      }
       else if ( strcmp(argv[arg_index], "-ruge") == 0 )
       {
          arg_index++;
          coarsen_type      = 1;
-      }    
+      }
       else if ( strcmp(argv[arg_index], "-ruge1p") == 0 )
       {
          arg_index++;
          coarsen_type      = 11;
-      }    
+      }
       else if ( strcmp(argv[arg_index], "-ruge2b") == 0 )
       {
          arg_index++;
          coarsen_type      = 2;
-      }    
+      }
       else if ( strcmp(argv[arg_index], "-ruge3") == 0 )
       {
          arg_index++;
          coarsen_type      = 3;
-      }    
+      }
       else if ( strcmp(argv[arg_index], "-ruge3c") == 0 )
       {
          arg_index++;
          coarsen_type      = 4;
-      }    
+      }
       else if ( strcmp(argv[arg_index], "-rugerlx") == 0 )
       {
          arg_index++;
          coarsen_type      = 5;
-      }    
+      }
       else if ( strcmp(argv[arg_index], "-falgout") == 0 )
       {
          arg_index++;
          coarsen_type      = 6;
-      }    
+      }
       else if ( strcmp(argv[arg_index], "-gm") == 0 )
       {
          arg_index++;
          measure_type      = 1;
-      }    
+      }
       else if ( strcmp(argv[arg_index], "-is") == 0 )
       {
          arg_index++;
@@ -600,12 +616,12 @@ main( hypre_int argc,
       else if ( strcmp(argv[arg_index], "-crth") == 0 )
       {
          arg_index++;
-         CR_rate = atof(argv[arg_index++]);
+         CR_rate = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-crst") == 0 )
       {
          arg_index++;
-         CR_strong_th = atof(argv[arg_index++]);
+         CR_strong_th = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-rlx") == 0 )
       {
@@ -691,9 +707,9 @@ main( hypre_int argc,
       else if ( strcmp(argv[arg_index], "-dt") == 0 )
       {
          arg_index++;
-         dt = atof(argv[arg_index++]);
+         dt = (HYPRE_Real)atof(argv[arg_index++]);
          build_rhs_type = -1;
-         if ( build_src_type == -1 ) build_src_type = 2;
+         if ( build_src_type == -1 ) { build_src_type = 2; }
       }
       else if ( strcmp(argv[arg_index], "-help") == 0 )
       {
@@ -706,7 +722,8 @@ main( hypre_int argc,
    }
 
    /* begin CGC BM Aug 25, 2006 */
-   if (coarsen_type == 21 || coarsen_type == 22) {
+   if (coarsen_type == 21 || coarsen_type == 22)
+   {
       arg_index = 0;
       while ( (arg_index < argc) && (!print_usage) )
       {
@@ -742,8 +759,8 @@ main( hypre_int argc,
       /* for CGNR preconditioned with Boomeramg, only relaxation scheme 0 is
          implemented, i.e. Jacobi relaxation, and needs to be used without CF
          ordering */
-      if (solver_id == 5) 
-      {     
+      if (solver_id == 5)
+      {
          relax_type = 0;
          relax_order = 0;
       }
@@ -779,54 +796,54 @@ main( hypre_int argc,
       else if ( strcmp(argv[arg_index], "-w") == 0 )
       {
          arg_index++;
-         relax_wt = atof(argv[arg_index++]);
+         relax_wt = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-wl") == 0 )
       {
          arg_index++;
-         relax_wt_level = atof(argv[arg_index++]);
+         relax_wt_level = (HYPRE_Real)atof(argv[arg_index++]);
          level_w = atoi(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-ow") == 0 )
       {
          arg_index++;
-         outer_wt = atof(argv[arg_index++]);
+         outer_wt = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-owl") == 0 )
       {
          arg_index++;
-         outer_wt_level = atof(argv[arg_index++]);
+         outer_wt_level = (HYPRE_Real)atof(argv[arg_index++]);
          level_ow = atoi(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-sw") == 0 )
       {
          arg_index++;
-         schwarz_rlx_weight = atof(argv[arg_index++]);
+         schwarz_rlx_weight = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-coarse_th") == 0 )
       {
          arg_index++;
-         coarse_threshold  = atof(argv[arg_index++]);
+         coarse_threshold  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-min_cs") == 0 )
       {
          arg_index++;
-         min_coarse_size  = atof(argv[arg_index++]);
+         min_coarse_size  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-seq_th") == 0 )
       {
          arg_index++;
-         seq_threshold  = atof(argv[arg_index++]);
+         seq_threshold  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-red") == 0 )
       {
          arg_index++;
-         redundant  = atof(argv[arg_index++]);
+         redundant  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-th") == 0 )
       {
          arg_index++;
-         strong_threshold  = atof(argv[arg_index++]);
+         strong_threshold  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-CF") == 0 )
       {
@@ -836,37 +853,37 @@ main( hypre_int argc,
       else if ( strcmp(argv[arg_index], "-cf") == 0 )
       {
          arg_index++;
-         cf_tol  = atof(argv[arg_index++]);
+         cf_tol  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-tol") == 0 )
       {
          arg_index++;
-         tol  = atof(argv[arg_index++]);
+         tol  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-atol") == 0 )
       {
          arg_index++;
-         atol  = atof(argv[arg_index++]);
+         atol  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-mxrs") == 0 )
       {
          arg_index++;
-         max_row_sum  = atof(argv[arg_index++]);
+         max_row_sum  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-sai_th") == 0 )
       {
          arg_index++;
-         sai_threshold  = atof(argv[arg_index++]);
+         sai_threshold  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-sai_filt") == 0 )
       {
          arg_index++;
-         sai_filter  = atof(argv[arg_index++]);
+         sai_filter  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-drop_tol") == 0 )
       {
          arg_index++;
-         drop_tol  = atof(argv[arg_index++]);
+         drop_tol  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-nonzeros_to_keep") == 0 )
       {
@@ -876,12 +893,12 @@ main( hypre_int argc,
       else if ( strcmp(argv[arg_index], "-ilut") == 0 )
       {
          arg_index++;
-         eu_ilut  = atof(argv[arg_index++]);
+         eu_ilut  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-sparseA") == 0 )
       {
          arg_index++;
-         eu_sparse_A  = atof(argv[arg_index++]);
+         eu_sparse_A  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-rowScale") == 0 )
       {
@@ -911,7 +928,7 @@ main( hypre_int argc,
       else if ( strcmp(argv[arg_index], "-tr") == 0 )
       {
          arg_index++;
-         trunc_factor  = atof(argv[arg_index++]);
+         trunc_factor  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-Pmx") == 0 )
       {
@@ -926,7 +943,7 @@ main( hypre_int argc,
       else if ( strcmp(argv[arg_index], "-Qtr") == 0 )
       {
          arg_index++;
-         Q_trunc  = atof(argv[arg_index++]);
+         Q_trunc  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-Qmx") == 0 )
       {
@@ -936,12 +953,12 @@ main( hypre_int argc,
       else if ( strcmp(argv[arg_index], "-jtr") == 0 )
       {
          arg_index++;
-         jacobi_trunc_threshold  = atof(argv[arg_index++]);
+         jacobi_trunc_threshold  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-Ssw") == 0 )
       {
          arg_index++;
-         S_commpkg_switch = atof(argv[arg_index++]);
+         S_commpkg_switch = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-solver_type") == 0 )
       {
@@ -1019,12 +1036,12 @@ main( hypre_int argc,
       else if ( strcmp(argv[arg_index], "-agg_tr") == 0 )
       {
          arg_index++;
-         agg_trunc_factor  = atof(argv[arg_index++]);
+         agg_trunc_factor  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-agg_P12_tr") == 0 )
       {
          arg_index++;
-         agg_P12_trunc_factor  = atof(argv[arg_index++]);
+         agg_P12_trunc_factor  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-postinterptype") == 0 )
       {
@@ -1054,7 +1071,7 @@ main( hypre_int argc,
       else if ( strcmp(argv[arg_index], "-cheby_fraction") == 0 )
       {
          arg_index++;
-         cheby_fraction = atof(argv[arg_index++]);
+         cheby_fraction = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-additive") == 0 )
       {
@@ -1079,7 +1096,7 @@ main( hypre_int argc,
       else if ( strcmp(argv[arg_index], "-add_tr") == 0 )
       {
          arg_index++;
-         add_trunc_factor  = atof(argv[arg_index++]);
+         add_trunc_factor  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-rap") == 0 )
       {
@@ -1097,7 +1114,9 @@ main( hypre_int argc,
          nongalerk_num_tol = atoi(argv[arg_index++]);
          nongalerk_tol = hypre_CTAlloc(HYPRE_Real,  nongalerk_num_tol, HYPRE_MEMORY_HOST);
          for (i = 0; i < nongalerk_num_tol; i++)
-            nongalerk_tol[i] = atof(argv[arg_index++]);
+         {
+            nongalerk_tol[i] = (HYPRE_Real)atof(argv[arg_index++]);
+         }
       }
       else if ( strcmp(argv[arg_index], "-print") == 0 )
       {
@@ -1113,7 +1132,7 @@ main( hypre_int argc,
       else if ( strcmp(argv[arg_index], "-plot_file_name") == 0 )
       {
          arg_index++;
-	 hypre_sprintf (plot_file_name,"%s",argv[arg_index++]);
+         hypre_sprintf (plot_file_name, "%s", argv[arg_index++]);
       }
       else
       {
@@ -1124,7 +1143,7 @@ main( hypre_int argc,
    /*-----------------------------------------------------------
     * Print usage info
     *-----------------------------------------------------------*/
- 
+
    if ( (print_usage) && (myid == 0) )
    {
       hypre_printf("\n");
@@ -1179,13 +1198,13 @@ main( hypre_int argc,
       hypre_printf("  -solver <ID>           : solver ID\n");
       hypre_printf("       0=AMG               1=AMG-PCG        \n");
       hypre_printf("       2=DS-PCG            3=AMG-GMRES      \n");
-      hypre_printf("       4=DS-GMRES          5=AMG-CGNR       \n");     
-      hypre_printf("       6=DS-CGNR           7=PILUT-GMRES    \n");     
+      hypre_printf("       4=DS-GMRES          5=AMG-CGNR       \n");
+      hypre_printf("       6=DS-CGNR           7=PILUT-GMRES    \n");
       hypre_printf("       8=ParaSails-PCG     9=AMG-BiCGSTAB   \n");
       hypre_printf("       10=DS-BiCGSTAB     11=PILUT-BiCGSTAB \n");
-      hypre_printf("       12=Schwarz-PCG     13=GSMG           \n");     
-      hypre_printf("       14=GSMG-PCG        15=GSMG-GMRES\n");     
-      hypre_printf("       18=ParaSails-GMRES\n");     
+      hypre_printf("       12=Schwarz-PCG     13=GSMG           \n");
+      hypre_printf("       14=GSMG-PCG        15=GSMG-GMRES\n");
+      hypre_printf("       18=ParaSails-GMRES\n");
       hypre_printf("       20=Hybrid solver/ DiagScale, AMG \n");
       hypre_printf("       43=Euclid-PCG      44=Euclid-GMRES   \n");
       hypre_printf("       45=Euclid-BICGSTAB\n");
@@ -1219,12 +1238,12 @@ main( hypre_int argc,
       hypre_printf("       9=standard interpolation with separation of weights  \n");
       hypre_printf("      12=FF interpolation  \n");
       hypre_printf("      13=FF1 interpolation  \n");
- 
+
       hypre_printf("      16=use modified unknown interpolation for a system (w/unknown or hybrid approach) \n");
       hypre_printf("      17=use non-systems interp = 6 for a system (w/unknown or hybrid approach) \n");
       hypre_printf("      18=use non-systems interp = 8 for a system (w/unknown or hybrid approach) \n");
       hypre_printf("      19=use non-systems interp = 0 for a system (w/unknown or hybrid approach) \n");
-      
+
 
       hypre_printf("      10=classical block interpolation for nodal systems AMG\n");
       hypre_printf("      11=classical block interpolation with diagonal blocks for nodal systems AMG\n");
@@ -1235,7 +1254,7 @@ main( hypre_int argc,
       hypre_printf("      24=direct block interpolation for nodal systems AMG\n");
 
 
-     
+
       hypre_printf("\n");
       hypre_printf("  -rlx  <val>            : relaxation type\n");
       hypre_printf("       0=Weighted Jacobi  \n");
@@ -1278,8 +1297,8 @@ main( hypre_int argc,
       hypre_printf("  -ns_coarse  <val>       : set no. of sweeps for coarsest grid\n");
       hypre_printf("  -ns_down    <val>       : set no. of sweeps for down cycle\n");
       hypre_printf("  -ns_up      <val>       : set no. of sweeps for up cycle\n");
-      hypre_printf("\n"); 
-      hypre_printf("  -mu   <val>            : set AMG cycles (1=V, 2=W, etc.)\n"); 
+      hypre_printf("\n");
+      hypre_printf("  -mu   <val>            : set AMG cycles (1=V, 2=W, etc.)\n");
       hypre_printf("  -th   <val>            : set AMG threshold Theta = val \n");
       hypre_printf("  -tr   <val>            : set AMG interpolation truncation factor = val \n");
       hypre_printf("  -Pmx  <val>            : set maximal no. of elmts per row for AMG interpolation \n");
@@ -1288,7 +1307,7 @@ main( hypre_int argc,
       hypre_printf("  -mxrs <val>            : set AMG maximum row sum threshold for dependency weakening \n");
       hypre_printf("  -nf <val>              : set number of functions for systems AMG\n");
       hypre_printf("  -numsamp <val>         : set number of sample vectors for GSMG\n");
-    
+
       hypre_printf("  -postinterptype <val>  : invokes <val> no. of Jacobi interpolation steps after main interpolation\n");
       hypre_printf("\n");
       hypre_printf("  -cgcitr <val>          : set maximal number of coarsening iterations for CGC\n");
@@ -1296,7 +1315,7 @@ main( hypre_int argc,
       hypre_printf("                         : 1  PCG  (default)\n");
       hypre_printf("                         : 2  GMRES\n");
       hypre_printf("                         : 3  BiCGSTAB\n");
-     
+
       hypre_printf("  -w   <val>             : set Jacobi relax weight = val\n");
       hypre_printf("  -k   <val>             : dimension Krylov space for GMRES\n");
       hypre_printf("  -aug   <val>           : number of augmentation vectors for LGMRES (-k indicates total approx space size)\n");
@@ -1318,14 +1337,14 @@ main( hypre_int argc,
       hypre_printf("                           Note ILUT is sequential only!\n");
       hypre_printf("  -sparseA <val>         : set drop tolerance in ILU(k) for Euclid \n");
       hypre_printf("  -rowScale <val>        : enable row scaling in Euclid \n");
-      hypre_printf("\n");  
+      hypre_printf("\n");
       hypre_printf("  -drop_tol  <val>       : set threshold for dropping in PILUT\n");
       hypre_printf("  -nonzeros_to_keep <val>: number of nonzeros in each row to keep\n");
-      hypre_printf("\n");  
+      hypre_printf("\n");
       hypre_printf("  -iout <val>            : set output flag\n");
-      hypre_printf("       0=no output    1=matrix stats\n"); 
-      hypre_printf("       2=cycle stats  3=matrix & cycle stats\n"); 
-      hypre_printf("\n");  
+      hypre_printf("       0=no output    1=matrix stats\n");
+      hypre_printf("       2=cycle stats  3=matrix & cycle stats\n");
+      hypre_printf("\n");
       hypre_printf("  -dbg <val>             : set debug flag\n");
       hypre_printf("       0=no debugging\n       1=internal timing\n       2=interpolation truncation\n       3=more detailed timing in coarsening routine\n");
       hypre_printf("\n");
@@ -1350,7 +1369,7 @@ main( hypre_int argc,
    /*-----------------------------------------------------------
     * Print driver parameters
     *-----------------------------------------------------------*/
- 
+
    if (myid == 0)
    {
       hypre_printf("Running with these driver parameters:\n");
@@ -1418,24 +1437,25 @@ main( hypre_int argc,
    {
       hypre_printf("You have asked for an unsupported problem with\n");
       hypre_printf("build_matrix_type = %d.\n", build_matrix_type);
-      return(-1);
+      return (-1);
    }
    /* BM Oct 23, 2006 */
    if (plot_grids)
    {
       if (build_matrix_type > 1 &&  build_matrix_type < 8)
-         BuildParCoordinates (argc, argv, build_matrix_arg_index, 
+         BuildParCoordinates (argc, argv, build_matrix_arg_index,
                               &coord_dim, &coordinates);
       else
       {
-         hypre_printf("Warning: coordinates are not yet printed for build_matrix_type = %d.\n", build_matrix_type);
+         hypre_printf("Warning: coordinates are not yet printed for build_matrix_type = %d.\n",
+                      build_matrix_type);
       }
    }
 
    if (build_matrix_type < 0)
    {
       ierr = HYPRE_IJMatrixGetLocalRange( ij_A,
-                                          &first_local_row, &last_local_row ,
+                                          &first_local_row, &last_local_row,
                                           &first_local_col, &last_local_col );
 
       local_num_rows = last_local_row - first_local_row + 1;
@@ -1449,7 +1469,7 @@ main( hypre_int argc,
        * Copy the parcsr matrix into the IJMatrix through interface calls
        *-----------------------------------------------------------*/
       ierr = HYPRE_ParCSRMatrixGetLocalRange( parcsr_A,
-                                              &first_local_row, &last_local_row ,
+                                              &first_local_row, &last_local_row,
                                               &first_local_col, &last_local_col );
 
       local_num_rows = last_local_row - first_local_row + 1;
@@ -1463,7 +1483,7 @@ main( hypre_int argc,
    /* Check the ij interface - not necessary if one just wants to test solvers */
    if (test_ij && build_matrix_type > -1)
    {
-      HYPRE_Int mx_size = 5; 
+      HYPRE_Int mx_size = 5;
       time_index = hypre_InitializeTiming("Generate IJ matrix");
       hypre_BeginTiming(time_index);
 
@@ -1477,54 +1497,56 @@ main( hypre_int argc,
       num_rows = local_num_rows;
       if (off_proc)
       {
-	 if (myid != num_procs-1) num_rows++;
-	 if (myid) num_rows++;
+         if (myid != num_procs - 1) { num_rows++; }
+         if (myid) { num_rows++; }
       }
       /* The following shows how to build an IJMatrix if one has only an
          estimate for the row sizes */
-     row_nums = hypre_CTAlloc(HYPRE_Int,  num_rows, HYPRE_MEMORY_HOST);
-     num_cols = hypre_CTAlloc(HYPRE_Int,  num_rows, HYPRE_MEMORY_HOST);
-     if (sparsity_known == 1)
-     {   
+      row_nums = hypre_CTAlloc(HYPRE_Int,  num_rows, HYPRE_MEMORY_HOST);
+      num_cols = hypre_CTAlloc(HYPRE_Int,  num_rows, HYPRE_MEMORY_HOST);
+      if (sparsity_known == 1)
+      {
          diag_sizes = hypre_CTAlloc(HYPRE_Int,  local_num_rows, HYPRE_MEMORY_HOST);
          offdiag_sizes = hypre_CTAlloc(HYPRE_Int,  local_num_rows, HYPRE_MEMORY_HOST);
-     }   
-     else
-     {   
+      }
+      else
+      {
          size = 5;
          if (sparsity_known == 0)
          {
-            if (build_matrix_type == 2) size = 7;
-            if (build_matrix_type == 3) size = 9;
-            if (build_matrix_type == 4) size = 27;
+            if (build_matrix_type == 2) { size = 7; }
+            if (build_matrix_type == 3) { size = 9; }
+            if (build_matrix_type == 4) { size = 27; }
          }
-	 row_sizes = hypre_CTAlloc(HYPRE_Int,  num_rows, HYPRE_MEMORY_HOST);
-	 for (i=0; i < num_rows; i++)
-	    row_sizes[i] = size;
-     }   
-     local_row = 0;
-     if (build_matrix_type == 2) mx_size = 7;
-     if (build_matrix_type == 3) mx_size = 9;
-     if (build_matrix_type == 4) mx_size = 27;
-     col_nums = hypre_CTAlloc(HYPRE_Int,  mx_size*num_rows, HYPRE_MEMORY_HOST);
-     data = hypre_CTAlloc(HYPRE_Real,  mx_size*num_rows, HYPRE_MEMORY_HOST);
-     i_indx = 0;
-     j_indx = 0;
-     if (off_proc && myid)
-     {
-	 num_cols[i_indx] = 2;
-	 row_nums[i_indx++] = first_local_row-1;
-         col_nums[j_indx] = first_local_row-1;
+         row_sizes = hypre_CTAlloc(HYPRE_Int,  num_rows, HYPRE_MEMORY_HOST);
+         for (i = 0; i < num_rows; i++)
+         {
+            row_sizes[i] = size;
+         }
+      }
+      local_row = 0;
+      if (build_matrix_type == 2) { mx_size = 7; }
+      if (build_matrix_type == 3) { mx_size = 9; }
+      if (build_matrix_type == 4) { mx_size = 27; }
+      col_nums = hypre_CTAlloc(HYPRE_Int,  mx_size * num_rows, HYPRE_MEMORY_HOST);
+      data = hypre_CTAlloc(HYPRE_Real,  mx_size * num_rows, HYPRE_MEMORY_HOST);
+      i_indx = 0;
+      j_indx = 0;
+      if (off_proc && myid)
+      {
+         num_cols[i_indx] = 2;
+         row_nums[i_indx++] = first_local_row - 1;
+         col_nums[j_indx] = first_local_row - 1;
          data[j_indx++] = 6.;
-         col_nums[j_indx] = first_local_row-2;
+         col_nums[j_indx] = first_local_row - 2;
          data[j_indx++] = -1;
-     }
-     for (i=0; i < local_num_rows; i++)
-     {
-         row_nums[i_indx] = first_local_row +i;
-         ierr += HYPRE_ParCSRMatrixGetRow( parcsr_A, first_local_row+i, &size, 
-                                             &col_inds, &values);
-	 num_cols[i_indx++] = size;
+      }
+      for (i = 0; i < local_num_rows; i++)
+      {
+         row_nums[i_indx] = first_local_row + i;
+         ierr += HYPRE_ParCSRMatrixGetRow( parcsr_A, first_local_row + i, &size,
+                                           &col_inds, &values);
+         num_cols[i_indx++] = size;
          for (j = 0; j < size; j++)
          {
             col_nums[j_indx] = col_inds[j];
@@ -1532,74 +1554,82 @@ main( hypre_int argc,
             if (sparsity_known == 1)
             {
                if (col_inds[j] < first_local_row || col_inds[j] > last_local_row)
+               {
                   offdiag_sizes[local_row]++;
+               }
                else
+               {
                   diag_sizes[local_row]++;
+               }
             }
          }
          local_row++;
-         ierr += HYPRE_ParCSRMatrixRestoreRow( parcsr_A, first_local_row+i, &size, 
-                                                 &col_inds, &values );
-     }
-     if (off_proc && myid != num_procs-1)
-     {
-	 num_cols[i_indx] = 2;
-	 row_nums[i_indx++] = last_local_row+1;
-         col_nums[j_indx] = last_local_row+2;
+         ierr += HYPRE_ParCSRMatrixRestoreRow( parcsr_A, first_local_row + i, &size,
+                                               &col_inds, &values );
+      }
+      if (off_proc && myid != num_procs - 1)
+      {
+         num_cols[i_indx] = 2;
+         row_nums[i_indx++] = last_local_row + 1;
+         col_nums[j_indx] = last_local_row + 2;
          data[j_indx++] = -1.;
-         col_nums[j_indx] = last_local_row+1;
+         col_nums[j_indx] = last_local_row + 1;
          data[j_indx++] = 6;
-     }
+      }
 
-         /*ierr += HYPRE_IJMatrixSetRowSizes ( ij_A, (const HYPRE_Int *) num_cols );*/
-     if (sparsity_known == 1)
-        ierr += HYPRE_IJMatrixSetDiagOffdSizes( ij_A, (const HYPRE_Int *) diag_sizes,
-                                            (const HYPRE_Int *) offdiag_sizes );
-     else
-        ierr = HYPRE_IJMatrixSetRowSizes ( ij_A, (const HYPRE_Int *) row_sizes );
+      /*ierr += HYPRE_IJMatrixSetRowSizes ( ij_A, (const HYPRE_Int *) num_cols );*/
+      if (sparsity_known == 1)
+         ierr += HYPRE_IJMatrixSetDiagOffdSizes( ij_A, (const HYPRE_Int *) diag_sizes,
+                                                 (const HYPRE_Int *) offdiag_sizes );
+      else
+      {
+         ierr = HYPRE_IJMatrixSetRowSizes ( ij_A, (const HYPRE_Int *) row_sizes );
+      }
 
-     ierr += HYPRE_IJMatrixInitialize( ij_A );
+      ierr += HYPRE_IJMatrixInitialize( ij_A );
 
-     if (omp_flag) HYPRE_IJMatrixSetOMPFlag(ij_A, 1);
+      if (omp_flag) { HYPRE_IJMatrixSetOMPFlag(ij_A, 1); }
 
-     if (chunk)
-     {
+      if (chunk)
+      {
          if (add)
-	    ierr += HYPRE_IJMatrixAddToValues(ij_A, num_rows, num_cols, row_nums, 
-					(const HYPRE_Int *) col_nums, 
-					(const HYPRE_Real *) data);
+            ierr += HYPRE_IJMatrixAddToValues(ij_A, num_rows, num_cols, row_nums,
+                                              (const HYPRE_Int *) col_nums,
+                                              (const HYPRE_Real *) data);
          else
-            ierr += HYPRE_IJMatrixSetValues(ij_A, num_rows, num_cols, row_nums, 
-					(const HYPRE_Int *) col_nums, 
-					(const HYPRE_Real *) data);
-     }
-     else 
-     {
+            ierr += HYPRE_IJMatrixSetValues(ij_A, num_rows, num_cols, row_nums,
+                                            (const HYPRE_Int *) col_nums,
+                                            (const HYPRE_Real *) data);
+      }
+      else
+      {
          j_indx = 0;
-         for (i=0; i < num_rows; i++)
+         for (i = 0; i < num_rows; i++)
          {
             if (add)
                ierr += HYPRE_IJMatrixAddToValues( ij_A, 1, &num_cols[i], &row_nums[i],
-                                             (const HYPRE_Int *) &col_nums[j_indx],
-                                             (const HYPRE_Real *) &data[j_indx] );
+                                                  (const HYPRE_Int *) &col_nums[j_indx],
+                                                  (const HYPRE_Real *) &data[j_indx] );
             else
                ierr += HYPRE_IJMatrixSetValues( ij_A, 1, &num_cols[i], &row_nums[i],
-                                             (const HYPRE_Int *) &col_nums[j_indx],
-                                             (const HYPRE_Real *) &data[j_indx] );
+                                                (const HYPRE_Int *) &col_nums[j_indx],
+                                                (const HYPRE_Real *) &data[j_indx] );
             j_indx += num_cols[i];
          }
-     }
-     hypre_TFree(col_nums, HYPRE_MEMORY_HOST);
-     hypre_TFree(data, HYPRE_MEMORY_HOST);
-     hypre_TFree(row_nums, HYPRE_MEMORY_HOST);
-     hypre_TFree(num_cols, HYPRE_MEMORY_HOST); 
-     if (sparsity_known == 1)
-     {
+      }
+      hypre_TFree(col_nums, HYPRE_MEMORY_HOST);
+      hypre_TFree(data, HYPRE_MEMORY_HOST);
+      hypre_TFree(row_nums, HYPRE_MEMORY_HOST);
+      hypre_TFree(num_cols, HYPRE_MEMORY_HOST);
+      if (sparsity_known == 1)
+      {
          hypre_TFree(diag_sizes, HYPRE_MEMORY_HOST);
          hypre_TFree(offdiag_sizes, HYPRE_MEMORY_HOST);
-     }
-     else
+      }
+      else
+      {
          hypre_TFree(row_sizes, HYPRE_MEMORY_HOST);
+      }
 
       ierr += HYPRE_IJMatrixAssemble( ij_A );
 
@@ -1607,18 +1637,18 @@ main( hypre_int argc,
       hypre_PrintTiming("IJ Matrix Setup", hypre_MPI_COMM_WORLD);
       hypre_FinalizeTiming(time_index);
       hypre_ClearTiming();
-   
+
       if (ierr)
       {
          hypre_printf("Error in driver building IJMatrix from parcsr matrix. \n");
-         return(-1); 
+         return (-1);
       }
 
-   /* This is to emphasize that one can IJMatrixAddToValues after an
-      IJMatrixRead or an IJMatrixAssemble.  After an IJMatrixRead,
-      assembly is unnecessary if the sparsity pattern of the matrix is
-      not changed somehow.  If one has not used IJMatrixRead, one has
-      the opportunity to IJMatrixAddTo before a IJMatrixAssemble. */
+      /* This is to emphasize that one can IJMatrixAddToValues after an
+         IJMatrixRead or an IJMatrixAssemble.  After an IJMatrixRead,
+         assembly is unnecessary if the sparsity pattern of the matrix is
+         not changed somehow.  If one has not used IJMatrixRead, one has
+         the opportunity to IJMatrixAddTo before a IJMatrixAssemble. */
 
       ncols    = hypre_CTAlloc(HYPRE_Int,  last_local_row - first_local_row + 1, HYPRE_MEMORY_HOST);
       rows     = hypre_CTAlloc(HYPRE_Int,  last_local_row - first_local_row + 1, HYPRE_MEMORY_HOST);
@@ -1626,9 +1656,13 @@ main( hypre_int argc,
       values   = hypre_CTAlloc(HYPRE_Real,  last_local_row - first_local_row + 1, HYPRE_MEMORY_HOST);
 
       if (dt < dt_inf)
-         val = 1./dt;
-      else 
+      {
+         val = 1. / dt;
+      }
+      else
+      {
          val = 0.;   /* Use zero to avoid unintentional loss of significance */
+      }
 
       for (i = first_local_row; i <= last_local_row; i++)
       {
@@ -1638,31 +1672,33 @@ main( hypre_int argc,
          col_inds[j] = i;
          values[j] = val;
       }
-      
+
       ierr += HYPRE_IJMatrixAddToValues( ij_A,
-                                      local_num_rows,
-                                      ncols, rows,
-                                      (const HYPRE_Int *) col_inds,
-                                      (const HYPRE_Real *) values );
+                                         local_num_rows,
+                                         ncols, rows,
+                                         (const HYPRE_Int *) col_inds,
+                                         (const HYPRE_Real *) values );
 
       hypre_TFree(values, HYPRE_MEMORY_HOST);
       hypre_TFree(col_inds, HYPRE_MEMORY_HOST);
       hypre_TFree(rows, HYPRE_MEMORY_HOST);
       hypre_TFree(ncols, HYPRE_MEMORY_HOST);
 
-   /* If sparsity pattern is not changed since last IJMatrixAssemble call,
-      this should be a no-op */
+      /* If sparsity pattern is not changed since last IJMatrixAssemble call,
+         this should be a no-op */
 
       ierr += HYPRE_IJMatrixAssemble( ij_A );
 
-   /*-----------------------------------------------------------
-    * Fetch the resulting underlying matrix out
-    *-----------------------------------------------------------*/
-     if (build_matrix_type > -1)
+      /*-----------------------------------------------------------
+       * Fetch the resulting underlying matrix out
+       *-----------------------------------------------------------*/
+      if (build_matrix_type > -1)
+      {
          ierr += HYPRE_ParCSRMatrixDestroy(parcsr_A);
+      }
 
-     ierr += HYPRE_IJMatrixGetObject( ij_A, &object);
-     parcsr_A = (HYPRE_ParCSRMatrix) object;
+      ierr += HYPRE_IJMatrixGetObject( ij_A, &object);
+      parcsr_A = (HYPRE_ParCSRMatrix) object;
 
    }
 
@@ -1676,11 +1712,11 @@ main( hypre_int argc,
       /* RHS */
       interp_vecs = hypre_CTAlloc(HYPRE_ParVector, num_interp_vecs, HYPRE_MEMORY_HOST);
       ij_rbm = hypre_CTAlloc(HYPRE_IJVector, num_interp_vecs, HYPRE_MEMORY_HOST);
-      for (i=0; i < num_interp_vecs; i++)
+      for (i = 0; i < num_interp_vecs; i++)
       {
-         hypre_sprintf(new_file_name, "%s.%d", argv[build_rbm_index],i);
-         ierr = HYPRE_IJVectorRead( new_file_name, hypre_MPI_COMM_WORLD, 
-                                 HYPRE_PARCSR, &ij_rbm[i] );
+         hypre_sprintf(new_file_name, "%s.%d", argv[build_rbm_index], i);
+         ierr = HYPRE_IJVectorRead( new_file_name, hypre_MPI_COMM_WORLD,
+                                    HYPRE_PARCSR, &ij_rbm[i] );
          ierr = HYPRE_IJVectorGetObject( ij_rbm[i], &object );
          interp_vecs[i] = (HYPRE_ParVector) object;
       }
@@ -1706,7 +1742,7 @@ main( hypre_int argc,
       }
 
       /* RHS */
-      ierr = HYPRE_IJVectorRead( argv[build_rhs_arg_index], hypre_MPI_COMM_WORLD, 
+      ierr = HYPRE_IJVectorRead( argv[build_rhs_arg_index], hypre_MPI_COMM_WORLD,
                                  HYPRE_PARCSR, &ij_b );
       if (ierr)
       {
@@ -1723,7 +1759,9 @@ main( hypre_int argc,
 
       values = hypre_CTAlloc(HYPRE_Real,  local_num_cols, HYPRE_MEMORY_HOST);
       for (i = 0; i < local_num_cols; i++)
+      {
          values[i] = 0.;
+      }
       HYPRE_IJVectorSetValues(ij_x, local_num_cols, NULL, values);
       hypre_TFree(values, HYPRE_MEMORY_HOST);
 
@@ -1735,7 +1773,7 @@ main( hypre_int argc,
 
 #if 0
       hypre_printf("build_rhs_type == 1 not currently implemented\n");
-      return(-1);
+      return (-1);
 #else
       /* RHS - this has not been tested for multiple processors*/
       BuildRhsParFromOneFile(argc, argv, build_rhs_arg_index, NULL, &b);
@@ -1744,17 +1782,19 @@ main( hypre_int argc,
 
       ij_b = NULL;
 
-      /* initial guess */ 
+      /* initial guess */
       HYPRE_IJVectorCreate(hypre_MPI_COMM_WORLD, first_local_col, last_local_col, &ij_x);
       HYPRE_IJVectorSetObjectType(ij_x, HYPRE_PARCSR);
       HYPRE_IJVectorInitialize(ij_x);
-      
+
       values = hypre_CTAlloc(HYPRE_Real,  local_num_cols, HYPRE_MEMORY_HOST);
       for (i = 0; i < local_num_cols; i++)
+      {
          values[i] = 0.;
+      }
       HYPRE_IJVectorSetValues(ij_x, local_num_cols, NULL, values);
       hypre_TFree(values, HYPRE_MEMORY_HOST);
-      
+
       ierr = HYPRE_IJVectorGetObject( ij_x, &object );
       x = (HYPRE_ParVector) object;
 
@@ -1763,24 +1803,26 @@ main( hypre_int argc,
    else if ( build_rhs_type == 7 )
    {
 
-      /* rhs */ 
+      /* rhs */
       BuildParRhsFromFile(argc, argv, build_rhs_arg_index, &b);
 
       hypre_printf("  Initial guess is 0\n");
 
       ij_b = NULL;
 
-      /* initial guess */ 
+      /* initial guess */
       HYPRE_IJVectorCreate(hypre_MPI_COMM_WORLD, first_local_col, last_local_col, &ij_x);
       HYPRE_IJVectorSetObjectType(ij_x, HYPRE_PARCSR);
       HYPRE_IJVectorInitialize(ij_x);
-      
+
       values = hypre_CTAlloc(HYPRE_Real,  local_num_cols, HYPRE_MEMORY_HOST);
       for (i = 0; i < local_num_cols; i++)
+      {
          values[i] = 0.;
+      }
       HYPRE_IJVectorSetValues(ij_x, local_num_cols, NULL, values);
       hypre_TFree(values, HYPRE_MEMORY_HOST);
-      
+
       ierr = HYPRE_IJVectorGetObject( ij_x, &object );
       x = (HYPRE_ParVector) object;
    }
@@ -1800,7 +1842,9 @@ main( hypre_int argc,
 
       values = hypre_CTAlloc(HYPRE_Real,  local_num_rows, HYPRE_MEMORY_HOST);
       for (i = 0; i < local_num_rows; i++)
+      {
          values[i] = 1.0;
+      }
       HYPRE_IJVectorSetValues(ij_b, local_num_rows, NULL, values);
       hypre_TFree(values, HYPRE_MEMORY_HOST);
 
@@ -1814,7 +1858,9 @@ main( hypre_int argc,
 
       values = hypre_CTAlloc(HYPRE_Real,  local_num_cols, HYPRE_MEMORY_HOST);
       for (i = 0; i < local_num_cols; i++)
+      {
          values[i] = 0.;
+      }
       HYPRE_IJVectorSetValues(ij_x, local_num_cols, NULL, values);
       hypre_TFree(values, HYPRE_MEMORY_HOST);
 
@@ -1830,7 +1876,7 @@ main( hypre_int argc,
       }
 
       /* RHS */
-      HYPRE_IJVectorCreate(hypre_MPI_COMM_WORLD, first_local_row, last_local_row, &ij_b); 
+      HYPRE_IJVectorCreate(hypre_MPI_COMM_WORLD, first_local_row, last_local_row, &ij_b);
       HYPRE_IJVectorSetObjectType(ij_b, HYPRE_PARCSR);
       HYPRE_IJVectorInitialize(ij_b);
       ierr = HYPRE_IJVectorGetObject( ij_b, &object );
@@ -1842,9 +1888,9 @@ main( hypre_int argc,
          HYPRE_IJVectorSetValues or HYPRE_IJVectorAddToValues */
 
       HYPRE_ParVectorSetRandomValues(b, 22775);
-      HYPRE_ParVectorInnerProd(b,b,&norm);
-      norm = 1./sqrt(norm);
-      ierr = HYPRE_ParVectorScale(norm, b);      
+      HYPRE_ParVectorInnerProd(b, b, &norm);
+      norm = 1. / hypre_sqrt(norm);
+      ierr = HYPRE_ParVectorScale(norm, b);
 
       /* Initial guess */
       HYPRE_IJVectorCreate(hypre_MPI_COMM_WORLD, first_local_col, last_local_col, &ij_x);
@@ -1853,7 +1899,9 @@ main( hypre_int argc,
 
       values = hypre_CTAlloc(HYPRE_Real,  local_num_cols, HYPRE_MEMORY_HOST);
       for (i = 0; i < local_num_cols; i++)
+      {
          values[i] = 0.;
+      }
       HYPRE_IJVectorSetValues(ij_x, local_num_cols, NULL, values);
       hypre_TFree(values, HYPRE_MEMORY_HOST);
 
@@ -1875,7 +1923,9 @@ main( hypre_int argc,
 
       values = hypre_CTAlloc(HYPRE_Real,  local_num_cols, HYPRE_MEMORY_HOST);
       for (i = 0; i < local_num_cols; i++)
+      {
          values[i] = 1.;
+      }
       HYPRE_IJVectorSetValues(ij_x, local_num_cols, NULL, values);
       hypre_TFree(values, HYPRE_MEMORY_HOST);
 
@@ -1883,18 +1933,20 @@ main( hypre_int argc,
       x = (HYPRE_ParVector) object;
 
       /* RHS */
-      HYPRE_IJVectorCreate(hypre_MPI_COMM_WORLD, first_local_row, last_local_row, &ij_b); 
+      HYPRE_IJVectorCreate(hypre_MPI_COMM_WORLD, first_local_row, last_local_row, &ij_b);
       HYPRE_IJVectorSetObjectType(ij_b, HYPRE_PARCSR);
       HYPRE_IJVectorInitialize(ij_b);
       ierr = HYPRE_IJVectorGetObject( ij_b, &object );
       b = (HYPRE_ParVector) object;
 
-      HYPRE_ParCSRMatrixMatvec(1.,parcsr_A,x,0.,b);
+      HYPRE_ParCSRMatrixMatvec(1., parcsr_A, x, 0., b);
 
       /* Initial guess */
       values = hypre_CTAlloc(HYPRE_Real,  local_num_cols, HYPRE_MEMORY_HOST);
       for (i = 0; i < local_num_cols; i++)
+      {
          values[i] = 0.;
+      }
       HYPRE_IJVectorSetValues(ij_x, local_num_cols, NULL, values);
       hypre_TFree(values, HYPRE_MEMORY_HOST);
    }
@@ -1913,7 +1965,9 @@ main( hypre_int argc,
 
       values = hypre_CTAlloc(HYPRE_Real,  local_num_rows, HYPRE_MEMORY_HOST);
       for (i = 0; i < local_num_rows; i++)
+      {
          values[i] = 0.;
+      }
       HYPRE_IJVectorSetValues(ij_b, local_num_rows, NULL, values);
       hypre_TFree(values, HYPRE_MEMORY_HOST);
 
@@ -1927,7 +1981,9 @@ main( hypre_int argc,
 
       values = hypre_CTAlloc(HYPRE_Real,  local_num_cols, HYPRE_MEMORY_HOST);
       for (i = 0; i < local_num_cols; i++)
+      {
          values[i] = 1.;
+      }
       HYPRE_IJVectorSetValues(ij_x, local_num_cols, NULL, values);
       hypre_TFree(values, HYPRE_MEMORY_HOST);
 
@@ -1948,7 +2004,7 @@ main( hypre_int argc,
          hypre_printf("  Initial unknown vector in evolution is 0\n");
       }
 
-      ierr = HYPRE_IJVectorRead( argv[build_src_arg_index], hypre_MPI_COMM_WORLD, 
+      ierr = HYPRE_IJVectorRead( argv[build_src_arg_index], hypre_MPI_COMM_WORLD,
                                  HYPRE_PARCSR, &ij_b );
       if (ierr)
       {
@@ -1965,7 +2021,9 @@ main( hypre_int argc,
 
       values = hypre_CTAlloc(HYPRE_Real,  local_num_cols, HYPRE_MEMORY_HOST);
       for (i = 0; i < local_num_cols; i++)
+      {
          values[i] = 0.;
+      }
       HYPRE_IJVectorSetValues(ij_x, local_num_cols, NULL, values);
       hypre_TFree(values, HYPRE_MEMORY_HOST);
 
@@ -1975,7 +2033,7 @@ main( hypre_int argc,
    else if ( build_src_type == 1 )
    {
       hypre_printf("build_src_type == 1 not currently implemented\n");
-      return(-1);
+      return (-1);
 
 #if 0
       BuildRhsParFromOneFile(argc, argv, build_src_arg_index, part_b, &b);
@@ -1996,7 +2054,9 @@ main( hypre_int argc,
 
       values = hypre_CTAlloc(HYPRE_Real,  local_num_rows, HYPRE_MEMORY_HOST);
       for (i = 0; i < local_num_rows; i++)
+      {
          values[i] = 1.;
+      }
       HYPRE_IJVectorSetValues(ij_b, local_num_rows, NULL, values);
       hypre_TFree(values, HYPRE_MEMORY_HOST);
 
@@ -2012,7 +2072,9 @@ main( hypre_int argc,
          0 here) is usually used as the initial guess */
       values = hypre_CTAlloc(HYPRE_Real,  local_num_cols, HYPRE_MEMORY_HOST);
       for (i = 0; i < local_num_cols; i++)
+      {
          values[i] = 0.;
+      }
       HYPRE_IJVectorSetValues(ij_x, local_num_cols, NULL, values);
       hypre_TFree(values, HYPRE_MEMORY_HOST);
 
@@ -2035,7 +2097,9 @@ main( hypre_int argc,
 
       hypre_SeedRand(myid);
       for (i = 0; i < local_num_rows; i++)
+      {
          values[i] = hypre_Rand();
+      }
 
       HYPRE_IJVectorSetValues(ij_b, local_num_rows, NULL, values);
       hypre_TFree(values, HYPRE_MEMORY_HOST);
@@ -2052,7 +2116,9 @@ main( hypre_int argc,
          0 here) is usually used as the initial guess */
       values = hypre_CTAlloc(HYPRE_Real,  local_num_cols, HYPRE_MEMORY_HOST);
       for (i = 0; i < local_num_cols; i++)
+      {
          values[i] = 0.;
+      }
       HYPRE_IJVectorSetValues(ij_x, local_num_cols, NULL, values);
       hypre_TFree(values, HYPRE_MEMORY_HOST);
 
@@ -2075,7 +2141,9 @@ main( hypre_int argc,
       values = hypre_CTAlloc(HYPRE_Real,  local_num_rows, HYPRE_MEMORY_HOST);
       hypre_SeedRand(myid);
       for (i = 0; i < local_num_rows; i++)
-         values[i] = hypre_Rand()/dt;
+      {
+         values[i] = hypre_Rand() / dt;
+      }
       HYPRE_IJVectorSetValues(ij_b, local_num_rows, NULL, values);
       hypre_TFree(values, HYPRE_MEMORY_HOST);
 
@@ -2092,7 +2160,9 @@ main( hypre_int argc,
       values = hypre_CTAlloc(HYPRE_Real,  local_num_cols, HYPRE_MEMORY_HOST);
       hypre_SeedRand(myid);
       for (i = 0; i < local_num_cols; i++)
+      {
          values[i] = hypre_Rand();
+      }
       HYPRE_IJVectorSetValues(ij_x, local_num_cols, NULL, values);
       hypre_TFree(values, HYPRE_MEMORY_HOST);
 
@@ -2104,25 +2174,27 @@ main( hypre_int argc,
    hypre_PrintTiming("IJ Vector Setup", hypre_MPI_COMM_WORLD);
    hypre_FinalizeTiming(time_index);
    hypre_ClearTiming();
-   
+
    if (num_functions > 1)
    {
       dof_func = NULL;
       if (build_funcs_type == 1)
       {
-	 BuildFuncsFromOneFile(argc, argv, build_funcs_arg_index, parcsr_A, &dof_func);
+         BuildFuncsFromOneFile(argc, argv, build_funcs_arg_index, parcsr_A, &dof_func);
       }
       else if (build_funcs_type == 2)
       {
-	 BuildFuncsFromFiles(argc, argv, build_funcs_arg_index, parcsr_A, &dof_func);
+         BuildFuncsFromFiles(argc, argv, build_funcs_arg_index, parcsr_A, &dof_func);
       }
       else
       {
          if (myid == 0)
-	    hypre_printf (" Number of functions = %d \n", num_functions);
+         {
+            hypre_printf (" Number of functions = %d \n", num_functions);
+         }
       }
    }
- 
+
    /*-----------------------------------------------------------
     * Print out the system and initial guess
     *-----------------------------------------------------------*/
@@ -2142,7 +2214,7 @@ main( hypre_int argc,
 
    if (solver_id == 20)
    {
-      if (myid == 0) hypre_printf("Solver:  AMG\n");
+      if (myid == 0) { hypre_printf("Solver:  AMG\n"); }
       time_index = hypre_InitializeTiming("AMG_hybrid Setup");
       hypre_BeginTiming(time_index);
 
@@ -2168,11 +2240,17 @@ main( hypre_int argc,
       HYPRE_ParCSRHybridSetNumFunctions(amg_solver, num_functions);
       HYPRE_ParCSRHybridSetNodal(amg_solver, nodal);
       if (relax_down > -1)
+      {
          HYPRE_ParCSRHybridSetCycleRelaxType(amg_solver, relax_down, 1);
+      }
       if (relax_up > -1)
+      {
          HYPRE_ParCSRHybridSetCycleRelaxType(amg_solver, relax_up, 2);
+      }
       if (relax_coarse > -1)
+      {
          HYPRE_ParCSRHybridSetCycleRelaxType(amg_solver, relax_coarse, 3);
+      }
       HYPRE_ParCSRHybridSetRelaxOrder(amg_solver, relax_order);
       HYPRE_ParCSRHybridSetMaxCoarseSize(amg_solver, coarse_threshold);
       HYPRE_ParCSRHybridSetMinCoarseSize(amg_solver, min_coarse_size);
@@ -2180,17 +2258,21 @@ main( hypre_int argc,
       HYPRE_ParCSRHybridSetRelaxWt(amg_solver, relax_wt);
       HYPRE_ParCSRHybridSetOuterWt(amg_solver, outer_wt);
       if (level_w > -1)
+      {
          HYPRE_ParCSRHybridSetLevelRelaxWt(amg_solver, relax_wt_level, level_w);
+      }
       if (level_ow > -1)
+      {
          HYPRE_ParCSRHybridSetLevelOuterWt(amg_solver, outer_wt_level, level_ow);
-  
+      }
+
       HYPRE_ParCSRHybridSetup(amg_solver, parcsr_A, b, x);
 
       hypre_EndTiming(time_index);
       hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
       hypre_FinalizeTiming(time_index);
       hypre_ClearTiming();
- 
+
       time_index = hypre_InitializeTiming("ParCSR Hybrid Solve");
       hypre_BeginTiming(time_index);
 
@@ -2204,7 +2286,7 @@ main( hypre_int argc,
       HYPRE_ParCSRHybridGetNumIterations(amg_solver, &num_iterations);
       HYPRE_ParCSRHybridGetPCGNumIterations(amg_solver, &pcg_num_its);
       HYPRE_ParCSRHybridGetDSCGNumIterations(amg_solver, &dscg_num_its);
-      HYPRE_ParCSRHybridGetFinalRelativeResidualNorm(amg_solver, 
+      HYPRE_ParCSRHybridGetFinalRelativeResidualNorm(amg_solver,
                                                      &final_res_norm);
 
       if (myid == 0)
@@ -2225,11 +2307,11 @@ main( hypre_int argc,
 
    if (solver_id == 0)
    {
-      if (myid == 0) hypre_printf("Solver:  AMG\n");
+      if (myid == 0) { hypre_printf("Solver:  AMG\n"); }
       time_index = hypre_InitializeTiming("BoomerAMG Setup");
       hypre_BeginTiming(time_index);
 
-      HYPRE_BoomerAMGCreate(&amg_solver); 
+      HYPRE_BoomerAMGCreate(&amg_solver);
       /* BM Aug 25, 2006 */
       HYPRE_BoomerAMGSetCGCIts(amg_solver, cgcits);
       HYPRE_BoomerAMGSetInterpType(amg_solver, interp_type);
@@ -2247,9 +2329,9 @@ main( hypre_int argc,
       HYPRE_BoomerAMGSetPMaxElmts(amg_solver, P_max_elmts);
       HYPRE_BoomerAMGSetJacobiTruncThreshold(amg_solver, jacobi_trunc_threshold);
       HYPRE_BoomerAMGSetSCommPkgSwitch(amg_solver, S_commpkg_switch);
-/* note: log is written to standard output, not to file */
+      /* note: log is written to standard output, not to file */
       HYPRE_BoomerAMGSetPrintLevel(amg_solver, 3);
-      HYPRE_BoomerAMGSetPrintFileName(amg_solver, "driver.out.log"); 
+      HYPRE_BoomerAMGSetPrintFileName(amg_solver, "driver.out.log");
       HYPRE_BoomerAMGSetCycleType(amg_solver, cycle_type);
       HYPRE_BoomerAMGSetNumSweeps(amg_solver, num_sweeps);
       HYPRE_BoomerAMGSetISType(amg_solver, IS_type);
@@ -2259,11 +2341,17 @@ main( hypre_int argc,
       HYPRE_BoomerAMGSetCRUseCG(amg_solver, CR_use_CG);
       HYPRE_BoomerAMGSetRelaxType(amg_solver, relax_type);
       if (relax_down > -1)
+      {
          HYPRE_BoomerAMGSetCycleRelaxType(amg_solver, relax_down, 1);
+      }
       if (relax_up > -1)
+      {
          HYPRE_BoomerAMGSetCycleRelaxType(amg_solver, relax_up, 2);
+      }
       if (relax_coarse > -1)
+      {
          HYPRE_BoomerAMGSetCycleRelaxType(amg_solver, relax_coarse, 3);
+      }
       HYPRE_BoomerAMGSetChebyOrder(amg_solver, cheby_order);
       HYPRE_BoomerAMGSetChebyFraction(amg_solver, cheby_fraction);
       HYPRE_BoomerAMGSetRelaxOrder(amg_solver, relax_order);
@@ -2271,9 +2359,13 @@ main( hypre_int argc,
       HYPRE_BoomerAMGSetOuterWt(amg_solver, outer_wt);
       HYPRE_BoomerAMGSetMaxLevels(amg_solver, max_levels);
       if (level_w > -1)
+      {
          HYPRE_BoomerAMGSetLevelRelaxWt(amg_solver, relax_wt_level, level_w);
+      }
       if (level_ow > -1)
+      {
          HYPRE_BoomerAMGSetLevelOuterWt(amg_solver, outer_wt_level, level_ow);
+      }
       HYPRE_BoomerAMGSetSmoothType(amg_solver, smooth_type);
       HYPRE_BoomerAMGSetSmoothNumSweeps(amg_solver, smooth_num_sweeps);
       HYPRE_BoomerAMGSetSmoothNumLevels(amg_solver, smooth_num_levels);
@@ -2283,9 +2375,9 @@ main( hypre_int argc,
       HYPRE_BoomerAMGSetOverlap(amg_solver, overlap);
       HYPRE_BoomerAMGSetDomainType(amg_solver, domain_type);
       HYPRE_BoomerAMGSetSchwarzUseNonSymm(amg_solver, use_nonsymm_schwarz);
-     
+
       HYPRE_BoomerAMGSetSchwarzRlxWeight(amg_solver, schwarz_rlx_weight);
-      if (eu_level < 0) eu_level = 0;
+      if (eu_level < 0) { eu_level = 0; }
       HYPRE_BoomerAMGSetEuLevel(amg_solver, eu_level);
       HYPRE_BoomerAMGSetEuBJ(amg_solver, eu_bj);
       HYPRE_BoomerAMGSetEuSparseA(amg_solver, eu_sparse_A);
@@ -2301,7 +2393,9 @@ main( hypre_int argc,
       HYPRE_BoomerAMGSetNodalDiag(amg_solver, nodal_diag);
       HYPRE_BoomerAMGSetCycleNumSweeps(amg_solver, ns_coarse, 3);
       if (num_functions > 1)
-	 HYPRE_BoomerAMGSetDofFunc(amg_solver, dof_func);
+      {
+         HYPRE_BoomerAMGSetDofFunc(amg_solver, dof_func);
+      }
       HYPRE_BoomerAMGSetAdditive(amg_solver, additive);
       HYPRE_BoomerAMGSetMultAdditive(amg_solver, mult_add);
       HYPRE_BoomerAMGSetSimple(amg_solver, simple);
@@ -2314,9 +2408,11 @@ main( hypre_int argc,
       /*HYPRE_BoomerAMGSetNonGalerkTol(amg_solver, nongalerk_num_tol, nongalerk_tol);*/
       if (nongalerk_tol)
       {
-         HYPRE_BoomerAMGSetNonGalerkinTol(amg_solver, nongalerk_tol[nongalerk_num_tol-1]);
-         for (i=0; i < nongalerk_num_tol-1; i++)
+         HYPRE_BoomerAMGSetNonGalerkinTol(amg_solver, nongalerk_tol[nongalerk_num_tol - 1]);
+         for (i = 0; i < nongalerk_num_tol - 1; i++)
+         {
             HYPRE_BoomerAMGSetLevelNonGalerkinTol(amg_solver, nongalerk_tol[i], i);
+         }
       }
       if (build_rbm)
       {
@@ -2327,7 +2423,8 @@ main( hypre_int argc,
       }
 
       /* BM Oct 23, 2006 */
-      if (plot_grids) {
+      if (plot_grids)
+      {
          HYPRE_BoomerAMGSetPlotGrids (amg_solver, 1);
          HYPRE_BoomerAMGSetPlotFileName (amg_solver, plot_file_name);
          HYPRE_BoomerAMGSetCoordDim (amg_solver, coord_dim);
@@ -2340,7 +2437,7 @@ main( hypre_int argc,
       hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
       hypre_FinalizeTiming(time_index);
       hypre_ClearTiming();
- 
+
       time_index = hypre_InitializeTiming("BoomerAMG Solve");
       hypre_BeginTiming(time_index);
 
@@ -2379,13 +2476,13 @@ main( hypre_int argc,
    if (solver_id == 13)
    {
       /* reset some smoother parameters */
- 
+
       relax_order = 0;
- 
-      if (myid == 0) hypre_printf("Solver:  GSMG\n");
+
+      if (myid == 0) { hypre_printf("Solver:  GSMG\n"); }
       time_index = hypre_InitializeTiming("BoomerAMG Setup");
       hypre_BeginTiming(time_index);
- 
+
       HYPRE_BoomerAMGCreate(&amg_solver);
       HYPRE_BoomerAMGSetGSMG(amg_solver, 4); /* specify GSMG */
       /* BM Aug 25, 2006 */
@@ -2413,20 +2510,30 @@ main( hypre_int argc,
       HYPRE_BoomerAMGSetNumSweeps(amg_solver, num_sweeps);
       HYPRE_BoomerAMGSetRelaxType(amg_solver, relax_type);
       if (relax_down > -1)
+      {
          HYPRE_BoomerAMGSetCycleRelaxType(amg_solver, relax_down, 1);
+      }
       if (relax_up > -1)
+      {
          HYPRE_BoomerAMGSetCycleRelaxType(amg_solver, relax_up, 2);
+      }
       if (relax_coarse > -1)
+      {
          HYPRE_BoomerAMGSetCycleRelaxType(amg_solver, relax_coarse, 3);
+      }
       HYPRE_BoomerAMGSetChebyOrder(amg_solver, cheby_order);
       HYPRE_BoomerAMGSetChebyFraction(amg_solver, cheby_fraction);
       HYPRE_BoomerAMGSetRelaxOrder(amg_solver, relax_order);
       HYPRE_BoomerAMGSetRelaxWt(amg_solver, relax_wt);
       HYPRE_BoomerAMGSetOuterWt(amg_solver, outer_wt);
       if (level_w > -1)
+      {
          HYPRE_BoomerAMGSetLevelRelaxWt(amg_solver, relax_wt_level, level_w);
+      }
       if (level_ow > -1)
+      {
          HYPRE_BoomerAMGSetLevelOuterWt(amg_solver, outer_wt_level, level_ow);
+      }
       HYPRE_BoomerAMGSetSmoothType(amg_solver, smooth_type);
       HYPRE_BoomerAMGSetSmoothNumSweeps(amg_solver, smooth_num_sweeps);
       HYPRE_BoomerAMGSetSmoothNumLevels(amg_solver, smooth_num_levels);
@@ -2438,7 +2545,7 @@ main( hypre_int argc,
       HYPRE_BoomerAMGSetDomainType(amg_solver, domain_type);
       HYPRE_BoomerAMGSetSchwarzUseNonSymm(amg_solver, use_nonsymm_schwarz);
       HYPRE_BoomerAMGSetSchwarzRlxWeight(amg_solver, schwarz_rlx_weight);
-      if (eu_level < 0) eu_level = 0;
+      if (eu_level < 0) { eu_level = 0; }
       HYPRE_BoomerAMGSetEuLevel(amg_solver, eu_level);
       HYPRE_BoomerAMGSetEuBJ(amg_solver, eu_bj);
       HYPRE_BoomerAMGSetEuSparseA(amg_solver, eu_sparse_A);
@@ -2453,7 +2560,9 @@ main( hypre_int argc,
       HYPRE_BoomerAMGSetNodal(amg_solver, nodal);
       HYPRE_BoomerAMGSetNodalDiag(amg_solver, nodal_diag);
       if (num_functions > 1)
+      {
          HYPRE_BoomerAMGSetDofFunc(amg_solver, dof_func);
+      }
       HYPRE_BoomerAMGSetAdditive(amg_solver, additive);
       HYPRE_BoomerAMGSetMultAdditive(amg_solver, mult_add);
       HYPRE_BoomerAMGSetSimple(amg_solver, simple);
@@ -2463,23 +2572,25 @@ main( hypre_int argc,
       HYPRE_BoomerAMGSetKeepTranspose(amg_solver, keepTranspose);
       if (nongalerk_tol)
       {
-         HYPRE_BoomerAMGSetNonGalerkinTol(amg_solver, nongalerk_tol[nongalerk_num_tol-1]);
-         for (i=0; i < nongalerk_num_tol-1; i++)
+         HYPRE_BoomerAMGSetNonGalerkinTol(amg_solver, nongalerk_tol[nongalerk_num_tol - 1]);
+         for (i = 0; i < nongalerk_num_tol - 1; i++)
+         {
             HYPRE_BoomerAMGSetLevelNonGalerkinTol(amg_solver, nongalerk_tol[i], i);
+         }
       }
- 
+
       HYPRE_BoomerAMGSetup(amg_solver, parcsr_A, b, x);
- 
+
       hypre_EndTiming(time_index);
       hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
       hypre_FinalizeTiming(time_index);
       hypre_ClearTiming();
- 
+
       time_index = hypre_InitializeTiming("BoomerAMG Solve");
       hypre_BeginTiming(time_index);
- 
+
       HYPRE_BoomerAMGSolve(amg_solver, parcsr_A, b, x);
- 
+
       hypre_EndTiming(time_index);
       hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
       hypre_FinalizeTiming(time_index);
@@ -2491,7 +2602,7 @@ main( hypre_int argc,
       HYPRE_BoomerAMGSetup(amg_solver, parcsr_A, b, x);
       HYPRE_BoomerAMGSolve(amg_solver, parcsr_A, b, x);
 #endif
- 
+
       HYPRE_BoomerAMGDestroy(amg_solver);
    }
 
@@ -2501,7 +2612,7 @@ main( hypre_int argc,
       HYPRE_ParCSRMatrix  parcsr_mat;
 
       /* use ParaSails preconditioner */
-      if (myid == 0) hypre_printf("Test ParaSails Build IJMatrix\n");
+      if (myid == 0) { hypre_printf("Test ParaSails Build IJMatrix\n"); }
 
       HYPRE_IJMatrixPrint(ij_A, "parasails.in");
 
@@ -2517,20 +2628,20 @@ main( hypre_int argc,
       HYPRE_ParaSailsBuildIJMatrix(pcg_precond, &ij_M);
       HYPRE_IJMatrixPrint(ij_M, "parasails.out");
 
-      if (myid == 0) hypre_printf("Printed to parasails.out.\n");
+      if (myid == 0) { hypre_printf("Printed to parasails.out.\n"); }
       exit(0);
    }
 
    /*-----------------------------------------------------------
-    * Solve the system using PCG 
+    * Solve the system using PCG
     *-----------------------------------------------------------*/
 
-   if (solver_id == 1 || solver_id == 2 || solver_id == 8 || 
+   if (solver_id == 1 || solver_id == 2 || solver_id == 8 ||
        solver_id == 12 || solver_id == 14 || solver_id == 43)
    {
       time_index = hypre_InitializeTiming("PCG Setup");
       hypre_BeginTiming(time_index);
- 
+
       HYPRE_ParCSRPCGCreate(hypre_MPI_COMM_WORLD, &pcg_solver);
       HYPRE_PCGSetMaxIter(pcg_solver, max_iter);
       HYPRE_PCGSetTol(pcg_solver, tol);
@@ -2542,8 +2653,8 @@ main( hypre_int argc,
       if (solver_id == 1)
       {
          /* use BoomerAMG as preconditioner */
-         if (myid == 0) hypre_printf("Solver: AMG-PCG\n");
-         HYPRE_BoomerAMGCreate(&pcg_precond); 
+         if (myid == 0) { hypre_printf("Solver: AMG-PCG\n"); }
+         HYPRE_BoomerAMGCreate(&pcg_precond);
          /* BM Aug 25, 2006 */
          HYPRE_BoomerAMGSetCGCIts(pcg_precond, cgcits);
          HYPRE_BoomerAMGSetInterpType(pcg_precond, interp_type);
@@ -2573,20 +2684,30 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetCRUseCG(pcg_precond, CR_use_CG);
          HYPRE_BoomerAMGSetRelaxType(pcg_precond, relax_type);
          if (relax_down > -1)
+         {
             HYPRE_BoomerAMGSetCycleRelaxType(pcg_precond, relax_down, 1);
+         }
          if (relax_up > -1)
+         {
             HYPRE_BoomerAMGSetCycleRelaxType(pcg_precond, relax_up, 2);
+         }
          if (relax_coarse > -1)
+         {
             HYPRE_BoomerAMGSetCycleRelaxType(pcg_precond, relax_coarse, 3);
+         }
          HYPRE_BoomerAMGSetChebyOrder(pcg_precond, cheby_order);
          HYPRE_BoomerAMGSetChebyFraction(pcg_precond, cheby_fraction);
          HYPRE_BoomerAMGSetRelaxOrder(pcg_precond, relax_order);
          HYPRE_BoomerAMGSetRelaxWt(pcg_precond, relax_wt);
          HYPRE_BoomerAMGSetOuterWt(pcg_precond, outer_wt);
          if (level_w > -1)
-            HYPRE_BoomerAMGSetLevelRelaxWt(pcg_precond, relax_wt_level,level_w);
+         {
+            HYPRE_BoomerAMGSetLevelRelaxWt(pcg_precond, relax_wt_level, level_w);
+         }
          if (level_ow > -1)
-            HYPRE_BoomerAMGSetLevelOuterWt(pcg_precond,outer_wt_level,level_ow);
+         {
+            HYPRE_BoomerAMGSetLevelOuterWt(pcg_precond, outer_wt_level, level_ow);
+         }
          HYPRE_BoomerAMGSetSmoothType(pcg_precond, smooth_type);
          HYPRE_BoomerAMGSetSmoothNumLevels(pcg_precond, smooth_num_levels);
          HYPRE_BoomerAMGSetSmoothNumSweeps(pcg_precond, smooth_num_sweeps);
@@ -2607,13 +2728,15 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetDomainType(pcg_precond, domain_type);
          HYPRE_BoomerAMGSetSchwarzUseNonSymm(pcg_precond, use_nonsymm_schwarz);
          HYPRE_BoomerAMGSetSchwarzRlxWeight(pcg_precond, schwarz_rlx_weight);
-         if (eu_level < 0) eu_level = 0;
+         if (eu_level < 0) { eu_level = 0; }
          HYPRE_BoomerAMGSetEuLevel(pcg_precond, eu_level);
          HYPRE_BoomerAMGSetEuBJ(pcg_precond, eu_bj);
          HYPRE_BoomerAMGSetEuSparseA(pcg_precond, eu_sparse_A);
          HYPRE_BoomerAMGSetCycleNumSweeps(pcg_precond, ns_coarse, 3);
          if (num_functions > 1)
+         {
             HYPRE_BoomerAMGSetDofFunc(pcg_precond, dof_func);
+         }
          HYPRE_BoomerAMGSetAdditive(pcg_precond, additive);
          HYPRE_BoomerAMGSetMultAdditive(pcg_precond, mult_add);
          HYPRE_BoomerAMGSetSimple(pcg_precond, simple);
@@ -2623,9 +2746,11 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetKeepTranspose(pcg_precond, keepTranspose);
          if (nongalerk_tol)
          {
-            HYPRE_BoomerAMGSetNonGalerkinTol(pcg_precond, nongalerk_tol[nongalerk_num_tol-1]);
-            for (i=0; i < nongalerk_num_tol-1; i++)
+            HYPRE_BoomerAMGSetNonGalerkinTol(pcg_precond, nongalerk_tol[nongalerk_num_tol - 1]);
+            for (i = 0; i < nongalerk_num_tol - 1; i++)
+            {
                HYPRE_BoomerAMGSetLevelNonGalerkinTol(pcg_precond, nongalerk_tol[i], i);
+            }
          }
          if (build_rbm)
          {
@@ -2642,9 +2767,9 @@ main( hypre_int argc,
       }
       else if (solver_id == 2)
       {
-         
+
          /* use diagonal scaling as preconditioner */
-         if (myid == 0) hypre_printf("Solver: DS-PCG\n");
+         if (myid == 0) { hypre_printf("Solver: DS-PCG\n"); }
          pcg_precond = NULL;
 
          HYPRE_PCGSetPrecond(pcg_solver,
@@ -2655,9 +2780,9 @@ main( hypre_int argc,
       else if (solver_id == 8)
       {
          /* use ParaSails preconditioner */
-         if (myid == 0) hypre_printf("Solver: ParaSails-PCG\n");
+         if (myid == 0) { hypre_printf("Solver: ParaSails-PCG\n"); }
 
-	 HYPRE_ParaSailsCreate(hypre_MPI_COMM_WORLD, &pcg_precond);
+         HYPRE_ParaSailsCreate(hypre_MPI_COMM_WORLD, &pcg_precond);
          HYPRE_ParaSailsSetParams(pcg_precond, sai_threshold, max_levels);
          HYPRE_ParaSailsSetFilter(pcg_precond, sai_filter);
          HYPRE_ParaSailsSetLogging(pcg_precond, poutdat);
@@ -2670,12 +2795,12 @@ main( hypre_int argc,
       else if (solver_id == 12)
       {
          /* use Schwarz preconditioner */
-         if (myid == 0) hypre_printf("Solver: Schwarz-PCG\n");
+         if (myid == 0) { hypre_printf("Solver: Schwarz-PCG\n"); }
 
-	 HYPRE_SchwarzCreate(&pcg_precond);
-	 HYPRE_SchwarzSetVariant(pcg_precond, variant);
-	 HYPRE_SchwarzSetOverlap(pcg_precond, overlap);
-	 HYPRE_SchwarzSetDomainType(pcg_precond, domain_type);
+         HYPRE_SchwarzCreate(&pcg_precond);
+         HYPRE_SchwarzSetVariant(pcg_precond, variant);
+         HYPRE_SchwarzSetOverlap(pcg_precond, overlap);
+         HYPRE_SchwarzSetDomainType(pcg_precond, domain_type);
          HYPRE_SchwarzSetRelaxWeight(pcg_precond, schwarz_rlx_weight);
          HYPRE_SchwarzSetNonSymm(pcg_precond, use_nonsymm_schwarz);
          HYPRE_PCGSetPrecond(pcg_solver,
@@ -2688,13 +2813,13 @@ main( hypre_int argc,
          /* use GSMG as preconditioner */
 
          /* reset some smoother parameters */
-    
+
          /* fine grid */
          relax_order = 0;
- 
-         if (myid == 0) hypre_printf("Solver: GSMG-PCG\n");
-         HYPRE_BoomerAMGCreate(&pcg_precond); 
-         HYPRE_BoomerAMGSetGSMG(pcg_precond, 4); 
+
+         if (myid == 0) { hypre_printf("Solver: GSMG-PCG\n"); }
+         HYPRE_BoomerAMGCreate(&pcg_precond);
+         HYPRE_BoomerAMGSetGSMG(pcg_precond, 4);
          /* BM Aug 25, 2006 */
          HYPRE_BoomerAMGSetCGCIts(pcg_precond, cgcits);
          HYPRE_BoomerAMGSetInterpType(pcg_precond, interp_type);
@@ -2724,20 +2849,30 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetCRUseCG(pcg_precond, CR_use_CG);
          HYPRE_BoomerAMGSetRelaxType(pcg_precond, relax_type);
          if (relax_down > -1)
+         {
             HYPRE_BoomerAMGSetCycleRelaxType(pcg_precond, relax_down, 1);
+         }
          if (relax_up > -1)
+         {
             HYPRE_BoomerAMGSetCycleRelaxType(pcg_precond, relax_up, 2);
+         }
          if (relax_coarse > -1)
+         {
             HYPRE_BoomerAMGSetCycleRelaxType(pcg_precond, relax_coarse, 3);
+         }
          HYPRE_BoomerAMGSetRelaxOrder(pcg_precond, relax_order);
          HYPRE_BoomerAMGSetChebyOrder(pcg_precond, cheby_order);
          HYPRE_BoomerAMGSetChebyFraction(pcg_precond, cheby_fraction);
          HYPRE_BoomerAMGSetRelaxWt(pcg_precond, relax_wt);
          HYPRE_BoomerAMGSetOuterWt(pcg_precond, outer_wt);
          if (level_w > -1)
-            HYPRE_BoomerAMGSetLevelRelaxWt(pcg_precond, relax_wt_level,level_w);
+         {
+            HYPRE_BoomerAMGSetLevelRelaxWt(pcg_precond, relax_wt_level, level_w);
+         }
          if (level_ow > -1)
-            HYPRE_BoomerAMGSetLevelOuterWt(pcg_precond,outer_wt_level,level_ow);
+         {
+            HYPRE_BoomerAMGSetLevelOuterWt(pcg_precond, outer_wt_level, level_ow);
+         }
          HYPRE_BoomerAMGSetSmoothType(pcg_precond, smooth_type);
          HYPRE_BoomerAMGSetSmoothNumLevels(pcg_precond, smooth_num_levels);
          HYPRE_BoomerAMGSetSmoothNumSweeps(pcg_precond, smooth_num_sweeps);
@@ -2745,7 +2880,7 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetOverlap(pcg_precond, overlap);
          HYPRE_BoomerAMGSetDomainType(pcg_precond, domain_type);
          HYPRE_BoomerAMGSetSchwarzRlxWeight(pcg_precond, schwarz_rlx_weight);
-         if (eu_level < 0) eu_level = 0;
+         if (eu_level < 0) { eu_level = 0; }
          HYPRE_BoomerAMGSetEuLevel(pcg_precond, eu_level);
          HYPRE_BoomerAMGSetEuBJ(pcg_precond, eu_bj);
          HYPRE_BoomerAMGSetEuSparseA(pcg_precond, eu_sparse_A);
@@ -2763,7 +2898,9 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetNodalDiag(pcg_precond, nodal_diag);
          HYPRE_BoomerAMGSetCycleNumSweeps(pcg_precond, ns_coarse, 3);
          if (num_functions > 1)
+         {
             HYPRE_BoomerAMGSetDofFunc(pcg_precond, dof_func);
+         }
          HYPRE_BoomerAMGSetAdditive(pcg_precond, additive);
          HYPRE_BoomerAMGSetMultAdditive(pcg_precond, mult_add);
          HYPRE_BoomerAMGSetSimple(pcg_precond, simple);
@@ -2773,9 +2910,11 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetKeepTranspose(pcg_precond, keepTranspose);
          if (nongalerk_tol)
          {
-            HYPRE_BoomerAMGSetNonGalerkinTol(pcg_precond, nongalerk_tol[nongalerk_num_tol-1]);
-            for (i=0; i < nongalerk_num_tol-1; i++)
+            HYPRE_BoomerAMGSetNonGalerkinTol(pcg_precond, nongalerk_tol[nongalerk_num_tol - 1]);
+            for (i = 0; i < nongalerk_num_tol - 1; i++)
+            {
                HYPRE_BoomerAMGSetLevelNonGalerkinTol(pcg_precond, nongalerk_tol[i], i);
+            }
          }
          HYPRE_PCGSetMaxIter(pcg_solver, mg_max_iter);
          HYPRE_PCGSetPrecond(pcg_solver,
@@ -2786,20 +2925,20 @@ main( hypre_int argc,
       else if (solver_id == 43)
       {
          /* use Euclid preconditioning */
-         if (myid == 0) hypre_printf("Solver: Euclid-PCG\n");
+         if (myid == 0) { hypre_printf("Solver: Euclid-PCG\n"); }
 
          HYPRE_EuclidCreate(hypre_MPI_COMM_WORLD, &pcg_precond);
 
-         /* note: There are three three methods of setting run-time 
+         /* note: There are three three methods of setting run-time
             parameters for Euclid: (see HYPRE_parcsr_ls.h); here
-            we'll use what I think is simplest: let Euclid internally 
+            we'll use what I think is simplest: let Euclid internally
             parse the command line.
-         */   
-         if (eu_level > -1) HYPRE_EuclidSetLevel(pcg_precond, eu_level);
-         if (eu_ilut) HYPRE_EuclidSetILUT(pcg_precond, eu_ilut);
-         if (eu_sparse_A) HYPRE_EuclidSetSparseA(pcg_precond, eu_sparse_A);
-         if (eu_row_scale) HYPRE_EuclidSetRowScale(pcg_precond, eu_row_scale);
-         if (eu_bj) HYPRE_EuclidSetBJ(pcg_precond, eu_bj);
+         */
+         if (eu_level > -1) { HYPRE_EuclidSetLevel(pcg_precond, eu_level); }
+         if (eu_ilut) { HYPRE_EuclidSetILUT(pcg_precond, eu_ilut); }
+         if (eu_sparse_A) { HYPRE_EuclidSetSparseA(pcg_precond, eu_sparse_A); }
+         if (eu_row_scale) { HYPRE_EuclidSetRowScale(pcg_precond, eu_row_scale); }
+         if (eu_bj) { HYPRE_EuclidSetBJ(pcg_precond, eu_bj); }
          HYPRE_EuclidSetStats(pcg_precond, eu_stats);
          HYPRE_EuclidSetMem(pcg_precond, eu_mem);
 
@@ -2810,65 +2949,66 @@ main( hypre_int argc,
                              (HYPRE_PtrToSolverFcn) HYPRE_EuclidSetup,
                              pcg_precond);
       }
- 
+
       HYPRE_PCGGetPrecond(pcg_solver, &pcg_precond_gotten);
       if (pcg_precond_gotten !=  pcg_precond)
       {
          hypre_printf("HYPRE_ParCSRPCGGetPrecond got bad precond\n");
-         return(-1);
+         return (-1);
+      }
+      else if (myid == 0)
+      {
+         hypre_printf("HYPRE_ParCSRPCGGetPrecond got good precond\n");
       }
-      else 
-         if (myid == 0)
-            hypre_printf("HYPRE_ParCSRPCGGetPrecond got good precond\n");
 
-      HYPRE_PCGSetup(pcg_solver, (HYPRE_Matrix)parcsr_A, 
+      HYPRE_PCGSetup(pcg_solver, (HYPRE_Matrix)parcsr_A,
                      (HYPRE_Vector)b, (HYPRE_Vector)x);
- 
+
       hypre_EndTiming(time_index);
       hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
       hypre_FinalizeTiming(time_index);
       hypre_ClearTiming();
-   
+
       time_index = hypre_InitializeTiming("PCG Solve");
       hypre_BeginTiming(time_index);
- 
-      HYPRE_PCGSolve(pcg_solver, (HYPRE_Matrix)parcsr_A, 
+
+      HYPRE_PCGSolve(pcg_solver, (HYPRE_Matrix)parcsr_A,
                      (HYPRE_Vector)b, (HYPRE_Vector)x);
- 
+
       hypre_EndTiming(time_index);
       hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
       hypre_FinalizeTiming(time_index);
       hypre_ClearTiming();
- 
+
       HYPRE_PCGGetNumIterations(pcg_solver, &num_iterations);
       HYPRE_PCGGetFinalRelativeResidualNorm(pcg_solver, &final_res_norm);
 
 #if SECOND_TIME
       /* run a second time to check for memory leaks */
       HYPRE_ParVectorSetRandomValues(x, 775);
-      HYPRE_PCGSetup(pcg_solver, (HYPRE_Matrix)parcsr_A, 
+      HYPRE_PCGSetup(pcg_solver, (HYPRE_Matrix)parcsr_A,
                      (HYPRE_Vector)b, (HYPRE_Vector)x);
-      HYPRE_PCGSolve(pcg_solver, (HYPRE_Matrix)parcsr_A, 
+      HYPRE_PCGSolve(pcg_solver, (HYPRE_Matrix)parcsr_A,
                      (HYPRE_Vector)b, (HYPRE_Vector)x);
 #endif
 
       HYPRE_ParCSRPCGDestroy(pcg_solver);
- 
+
       if (solver_id == 1)
       {
          HYPRE_BoomerAMGDestroy(pcg_precond);
       }
       else if (solver_id == 8)
       {
-	 HYPRE_ParaSailsDestroy(pcg_precond);
+         HYPRE_ParaSailsDestroy(pcg_precond);
       }
       else if (solver_id == 12)
       {
-	 HYPRE_SchwarzDestroy(pcg_precond);
+         HYPRE_SchwarzDestroy(pcg_precond);
       }
       else if (solver_id == 14)
       {
-	 HYPRE_BoomerAMGDestroy(pcg_precond);
+         HYPRE_BoomerAMGDestroy(pcg_precond);
       }
       else if (solver_id == 43)
       {
@@ -2882,11 +3022,11 @@ main( hypre_int argc,
          hypre_printf("Final Relative Residual Norm = %e\n", final_res_norm);
          hypre_printf("\n");
       }
- 
+
    }
 
    /*-----------------------------------------------------------
-    * Solve the system using GMRES 
+    * Solve the system using GMRES
     *-----------------------------------------------------------*/
 
    if (solver_id == 3 || solver_id == 4 || solver_id == 7 ||
@@ -2894,7 +3034,7 @@ main( hypre_int argc,
    {
       time_index = hypre_InitializeTiming("GMRES Setup");
       hypre_BeginTiming(time_index);
- 
+
       HYPRE_ParCSRGMRESCreate(hypre_MPI_COMM_WORLD, &pcg_solver);
       HYPRE_GMRESSetKDim(pcg_solver, k_dim);
       HYPRE_GMRESSetMaxIter(pcg_solver, max_iter);
@@ -2907,9 +3047,9 @@ main( hypre_int argc,
       if (solver_id == 3)
       {
          /* use BoomerAMG as preconditioner */
-         if (myid == 0) hypre_printf("Solver: AMG-GMRES\n");
+         if (myid == 0) { hypre_printf("Solver: AMG-GMRES\n"); }
 
-         HYPRE_BoomerAMGCreate(&pcg_precond); 
+         HYPRE_BoomerAMGCreate(&pcg_precond);
          HYPRE_BoomerAMGSetCGCIts(pcg_precond, cgcits);
          HYPRE_BoomerAMGSetInterpType(pcg_precond, interp_type);
          HYPRE_BoomerAMGSetPostInterpType(pcg_precond, post_interp_type);
@@ -2938,20 +3078,30 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetCRUseCG(pcg_precond, CR_use_CG);
          HYPRE_BoomerAMGSetRelaxType(pcg_precond, relax_type);
          if (relax_down > -1)
+         {
             HYPRE_BoomerAMGSetCycleRelaxType(pcg_precond, relax_down, 1);
+         }
          if (relax_up > -1)
+         {
             HYPRE_BoomerAMGSetCycleRelaxType(pcg_precond, relax_up, 2);
+         }
          if (relax_coarse > -1)
+         {
             HYPRE_BoomerAMGSetCycleRelaxType(pcg_precond, relax_coarse, 3);
+         }
          HYPRE_BoomerAMGSetChebyOrder(pcg_precond, cheby_order);
          HYPRE_BoomerAMGSetChebyFraction(pcg_precond, cheby_fraction);
          HYPRE_BoomerAMGSetRelaxOrder(pcg_precond, relax_order);
          HYPRE_BoomerAMGSetRelaxWt(pcg_precond, relax_wt);
          HYPRE_BoomerAMGSetOuterWt(pcg_precond, outer_wt);
          if (level_w > -1)
-            HYPRE_BoomerAMGSetLevelRelaxWt(pcg_precond, relax_wt_level,level_w);
+         {
+            HYPRE_BoomerAMGSetLevelRelaxWt(pcg_precond, relax_wt_level, level_w);
+         }
          if (level_ow > -1)
-            HYPRE_BoomerAMGSetLevelOuterWt(pcg_precond,outer_wt_level,level_ow);
+         {
+            HYPRE_BoomerAMGSetLevelOuterWt(pcg_precond, outer_wt_level, level_ow);
+         }
          HYPRE_BoomerAMGSetSmoothType(pcg_precond, smooth_type);
          HYPRE_BoomerAMGSetSmoothNumLevels(pcg_precond, smooth_num_levels);
          HYPRE_BoomerAMGSetSmoothNumSweeps(pcg_precond, smooth_num_sweeps);
@@ -2972,13 +3122,15 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetDomainType(pcg_precond, domain_type);
          HYPRE_BoomerAMGSetSchwarzUseNonSymm(pcg_precond, use_nonsymm_schwarz);
          HYPRE_BoomerAMGSetSchwarzRlxWeight(pcg_precond, schwarz_rlx_weight);
-         if (eu_level < 0) eu_level = 0;
+         if (eu_level < 0) { eu_level = 0; }
          HYPRE_BoomerAMGSetEuLevel(pcg_precond, eu_level);
          HYPRE_BoomerAMGSetEuBJ(pcg_precond, eu_bj);
          HYPRE_BoomerAMGSetEuSparseA(pcg_precond, eu_sparse_A);
          HYPRE_BoomerAMGSetCycleNumSweeps(pcg_precond, ns_coarse, 3);
          if (num_functions > 1)
+         {
             HYPRE_BoomerAMGSetDofFunc(pcg_precond, dof_func);
+         }
          HYPRE_BoomerAMGSetAdditive(pcg_precond, additive);
          HYPRE_BoomerAMGSetMultAdditive(pcg_precond, mult_add);
          HYPRE_BoomerAMGSetSimple(pcg_precond, simple);
@@ -2988,9 +3140,11 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetKeepTranspose(pcg_precond, keepTranspose);
          if (nongalerk_tol)
          {
-            HYPRE_BoomerAMGSetNonGalerkinTol(pcg_precond, nongalerk_tol[nongalerk_num_tol-1]);
-            for (i=0; i < nongalerk_num_tol-1; i++)
+            HYPRE_BoomerAMGSetNonGalerkinTol(pcg_precond, nongalerk_tol[nongalerk_num_tol - 1]);
+            for (i = 0; i < nongalerk_num_tol - 1; i++)
+            {
                HYPRE_BoomerAMGSetLevelNonGalerkinTol(pcg_precond, nongalerk_tol[i], i);
+            }
          }
          if (build_rbm)
          {
@@ -3008,7 +3162,7 @@ main( hypre_int argc,
       else if (solver_id == 4)
       {
          /* use diagonal scaling as preconditioner */
-         if (myid == 0) hypre_printf("Solver: DS-GMRES\n");
+         if (myid == 0) { hypre_printf("Solver: DS-GMRES\n"); }
          pcg_precond = NULL;
 
          HYPRE_GMRESSetPrecond(pcg_solver,
@@ -3019,10 +3173,11 @@ main( hypre_int argc,
       else if (solver_id == 7)
       {
          /* use PILUT as preconditioner */
-         if (myid == 0) hypre_printf("Solver: PILUT-GMRES\n");
+         if (myid == 0) { hypre_printf("Solver: PILUT-GMRES\n"); }
 
-         ierr = HYPRE_ParCSRPilutCreate( hypre_MPI_COMM_WORLD, &pcg_precond ); 
-         if (ierr) {
+         ierr = HYPRE_ParCSRPilutCreate( hypre_MPI_COMM_WORLD, &pcg_precond );
+         if (ierr)
+         {
             hypre_printf("Error in ParPilutCreate\n");
          }
 
@@ -3044,12 +3199,12 @@ main( hypre_int argc,
          /* use GSMG as preconditioner */
 
          /* reset some smoother parameters */
-    
+
          relax_order = 0;
- 
-         if (myid == 0) hypre_printf("Solver: GSMG-GMRES\n");
-         HYPRE_BoomerAMGCreate(&pcg_precond); 
-         HYPRE_BoomerAMGSetGSMG(pcg_precond, 4); 
+
+         if (myid == 0) { hypre_printf("Solver: GSMG-GMRES\n"); }
+         HYPRE_BoomerAMGCreate(&pcg_precond);
+         HYPRE_BoomerAMGSetGSMG(pcg_precond, 4);
          HYPRE_BoomerAMGSetCGCIts(pcg_precond, cgcits);
          HYPRE_BoomerAMGSetInterpType(pcg_precond, interp_type);
          HYPRE_BoomerAMGSetPostInterpType(pcg_precond, post_interp_type);
@@ -3078,20 +3233,30 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetCRUseCG(pcg_precond, CR_use_CG);
          HYPRE_BoomerAMGSetRelaxType(pcg_precond, relax_type);
          if (relax_down > -1)
+         {
             HYPRE_BoomerAMGSetCycleRelaxType(pcg_precond, relax_down, 1);
+         }
          if (relax_up > -1)
+         {
             HYPRE_BoomerAMGSetCycleRelaxType(pcg_precond, relax_up, 2);
+         }
          if (relax_coarse > -1)
+         {
             HYPRE_BoomerAMGSetCycleRelaxType(pcg_precond, relax_coarse, 3);
+         }
          HYPRE_BoomerAMGSetChebyOrder(pcg_precond, cheby_order);
          HYPRE_BoomerAMGSetChebyFraction(pcg_precond, cheby_fraction);
          HYPRE_BoomerAMGSetRelaxOrder(pcg_precond, relax_order);
          HYPRE_BoomerAMGSetRelaxWt(pcg_precond, relax_wt);
          HYPRE_BoomerAMGSetOuterWt(pcg_precond, outer_wt);
          if (level_w > -1)
-            HYPRE_BoomerAMGSetLevelRelaxWt(pcg_precond, relax_wt_level,level_w);
+         {
+            HYPRE_BoomerAMGSetLevelRelaxWt(pcg_precond, relax_wt_level, level_w);
+         }
          if (level_ow > -1)
-            HYPRE_BoomerAMGSetLevelOuterWt(pcg_precond,outer_wt_level,level_ow);
+         {
+            HYPRE_BoomerAMGSetLevelOuterWt(pcg_precond, outer_wt_level, level_ow);
+         }
          HYPRE_BoomerAMGSetSmoothType(pcg_precond, smooth_type);
          HYPRE_BoomerAMGSetSmoothNumLevels(pcg_precond, smooth_num_levels);
          HYPRE_BoomerAMGSetSmoothNumSweeps(pcg_precond, smooth_num_sweeps);
@@ -3100,7 +3265,7 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetDomainType(pcg_precond, domain_type);
          HYPRE_BoomerAMGSetSchwarzUseNonSymm(pcg_precond, use_nonsymm_schwarz);
          HYPRE_BoomerAMGSetSchwarzRlxWeight(pcg_precond, schwarz_rlx_weight);
-         if (eu_level < 0) eu_level = 0;
+         if (eu_level < 0) { eu_level = 0; }
          HYPRE_BoomerAMGSetEuLevel(pcg_precond, eu_level);
          HYPRE_BoomerAMGSetEuBJ(pcg_precond, eu_bj);
          HYPRE_BoomerAMGSetEuSparseA(pcg_precond, eu_sparse_A);
@@ -3118,7 +3283,9 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetNodalDiag(pcg_precond, nodal_diag);
          HYPRE_BoomerAMGSetCycleNumSweeps(pcg_precond, ns_coarse, 3);
          if (num_functions > 1)
+         {
             HYPRE_BoomerAMGSetDofFunc(pcg_precond, dof_func);
+         }
          HYPRE_BoomerAMGSetAdditive(pcg_precond, additive);
          HYPRE_BoomerAMGSetMultAdditive(pcg_precond, mult_add);
          HYPRE_BoomerAMGSetSimple(pcg_precond, simple);
@@ -3128,9 +3295,11 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetKeepTranspose(pcg_precond, keepTranspose);
          if (nongalerk_tol)
          {
-            HYPRE_BoomerAMGSetNonGalerkinTol(pcg_precond, nongalerk_tol[nongalerk_num_tol-1]);
-            for (i=0; i < nongalerk_num_tol-1; i++)
+            HYPRE_BoomerAMGSetNonGalerkinTol(pcg_precond, nongalerk_tol[nongalerk_num_tol - 1]);
+            for (i = 0; i < nongalerk_num_tol - 1; i++)
+            {
                HYPRE_BoomerAMGSetLevelNonGalerkinTol(pcg_precond, nongalerk_tol[i], i);
+            }
          }
          HYPRE_GMRESSetMaxIter(pcg_solver, mg_max_iter);
          HYPRE_GMRESSetPrecond(pcg_solver,
@@ -3141,13 +3310,13 @@ main( hypre_int argc,
       else if (solver_id == 18)
       {
          /* use ParaSails preconditioner */
-         if (myid == 0) hypre_printf("Solver: ParaSails-GMRES\n");
+         if (myid == 0) { hypre_printf("Solver: ParaSails-GMRES\n"); }
 
-	 HYPRE_ParaSailsCreate(hypre_MPI_COMM_WORLD, &pcg_precond);
-	 HYPRE_ParaSailsSetParams(pcg_precond, sai_threshold, max_levels);
+         HYPRE_ParaSailsCreate(hypre_MPI_COMM_WORLD, &pcg_precond);
+         HYPRE_ParaSailsSetParams(pcg_precond, sai_threshold, max_levels);
          HYPRE_ParaSailsSetFilter(pcg_precond, sai_filter);
          HYPRE_ParaSailsSetLogging(pcg_precond, poutdat);
-	 HYPRE_ParaSailsSetSym(pcg_precond, 0);
+         HYPRE_ParaSailsSetSym(pcg_precond, 0);
 
          HYPRE_GMRESSetPrecond(pcg_solver,
                                (HYPRE_PtrToSolverFcn) HYPRE_ParaSailsSolve,
@@ -3157,15 +3326,15 @@ main( hypre_int argc,
       else if (solver_id == 44)
       {
          /* use Euclid preconditioning */
-         if (myid == 0) hypre_printf("Solver: Euclid-GMRES\n");
+         if (myid == 0) { hypre_printf("Solver: Euclid-GMRES\n"); }
 
          HYPRE_EuclidCreate(hypre_MPI_COMM_WORLD, &pcg_precond);
 
-         if (eu_level > -1) HYPRE_EuclidSetLevel(pcg_precond, eu_level);
-         if (eu_ilut) HYPRE_EuclidSetILUT(pcg_precond, eu_ilut);
-         if (eu_sparse_A) HYPRE_EuclidSetSparseA(pcg_precond, eu_sparse_A);
-         if (eu_row_scale) HYPRE_EuclidSetRowScale(pcg_precond, eu_row_scale);
-         if (eu_bj) HYPRE_EuclidSetBJ(pcg_precond, eu_bj);
+         if (eu_level > -1) { HYPRE_EuclidSetLevel(pcg_precond, eu_level); }
+         if (eu_ilut) { HYPRE_EuclidSetILUT(pcg_precond, eu_ilut); }
+         if (eu_sparse_A) { HYPRE_EuclidSetSparseA(pcg_precond, eu_sparse_A); }
+         if (eu_row_scale) { HYPRE_EuclidSetRowScale(pcg_precond, eu_row_scale); }
+         if (eu_bj) { HYPRE_EuclidSetBJ(pcg_precond, eu_bj); }
          HYPRE_EuclidSetStats(pcg_precond, eu_stats);
          HYPRE_EuclidSetMem(pcg_precond, eu_mem);
          /*HYPRE_EuclidSetParams(pcg_precond, argc, argv);*/
@@ -3175,48 +3344,49 @@ main( hypre_int argc,
                                 (HYPRE_PtrToSolverFcn) HYPRE_EuclidSetup,
                                 pcg_precond);
       }
- 
+
       HYPRE_GMRESGetPrecond(pcg_solver, &pcg_precond_gotten);
       if (pcg_precond_gotten != pcg_precond)
       {
          hypre_printf("HYPRE_GMRESGetPrecond got bad precond\n");
-         return(-1);
+         return (-1);
+      }
+      else if (myid == 0)
+      {
+         hypre_printf("HYPRE_GMRESGetPrecond got good precond\n");
       }
-      else
-         if (myid == 0)
-            hypre_printf("HYPRE_GMRESGetPrecond got good precond\n");
       HYPRE_GMRESSetup
-         (pcg_solver, (HYPRE_Matrix)parcsr_A, (HYPRE_Vector)b, (HYPRE_Vector)x);
- 
+      (pcg_solver, (HYPRE_Matrix)parcsr_A, (HYPRE_Vector)b, (HYPRE_Vector)x);
+
       hypre_EndTiming(time_index);
       hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
       hypre_FinalizeTiming(time_index);
       hypre_ClearTiming();
-   
+
       time_index = hypre_InitializeTiming("GMRES Solve");
       hypre_BeginTiming(time_index);
- 
+
       HYPRE_GMRESSolve
-         (pcg_solver, (HYPRE_Matrix)parcsr_A, (HYPRE_Vector)b, (HYPRE_Vector)x);
- 
+      (pcg_solver, (HYPRE_Matrix)parcsr_A, (HYPRE_Vector)b, (HYPRE_Vector)x);
+
       hypre_EndTiming(time_index);
       hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
       hypre_FinalizeTiming(time_index);
       hypre_ClearTiming();
- 
+
       HYPRE_GMRESGetNumIterations(pcg_solver, &num_iterations);
-      HYPRE_GMRESGetFinalRelativeResidualNorm(pcg_solver,&final_res_norm);
+      HYPRE_GMRESGetFinalRelativeResidualNorm(pcg_solver, &final_res_norm);
 #if SECOND_TIME
       /* run a second time to check for memory leaks */
       HYPRE_ParVectorSetRandomValues(x, 775);
-      HYPRE_GMRESSetup(pcg_solver, (HYPRE_Matrix)parcsr_A, (HYPRE_Vector)b, 
+      HYPRE_GMRESSetup(pcg_solver, (HYPRE_Matrix)parcsr_A, (HYPRE_Vector)b,
                        (HYPRE_Vector)x);
-      HYPRE_GMRESSolve(pcg_solver, (HYPRE_Matrix)parcsr_A, (HYPRE_Vector)b, 
+      HYPRE_GMRESSolve(pcg_solver, (HYPRE_Matrix)parcsr_A, (HYPRE_Vector)b,
                        (HYPRE_Vector)x);
 #endif
 
       HYPRE_ParCSRGMRESDestroy(pcg_solver);
- 
+
       if (solver_id == 3 || solver_id == 15)
       {
          HYPRE_BoomerAMGDestroy(pcg_precond);
@@ -3228,7 +3398,7 @@ main( hypre_int argc,
       }
       else if (solver_id == 18)
       {
-	 HYPRE_ParaSailsDestroy(pcg_precond);
+         HYPRE_ParaSailsDestroy(pcg_precond);
       }
       else if (solver_id == 44)
       {
@@ -3243,15 +3413,15 @@ main( hypre_int argc,
          hypre_printf("\n");
       }
    }
-/*-----------------------------------------------------------
- * Solve the system using LGMRES 
- *-----------------------------------------------------------*/
+   /*-----------------------------------------------------------
+    * Solve the system using LGMRES
+    *-----------------------------------------------------------*/
 
    if (solver_id == 50 || solver_id == 51 )
    {
       time_index = hypre_InitializeTiming("LGMRES Setup");
       hypre_BeginTiming(time_index);
- 
+
       HYPRE_ParCSRLGMRESCreate(hypre_MPI_COMM_WORLD, &pcg_solver);
       HYPRE_LGMRESSetKDim(pcg_solver, k_dim);
       HYPRE_LGMRESSetAugDim(pcg_solver, aug_dim);
@@ -3260,13 +3430,13 @@ main( hypre_int argc,
       HYPRE_LGMRESSetAbsoluteTol(pcg_solver, atol);
       HYPRE_LGMRESSetLogging(pcg_solver, 1);
       HYPRE_LGMRESSetPrintLevel(pcg_solver, ioutdat);
- 
+
       if (solver_id == 51)
       {
          /* use BoomerAMG as preconditioner */
-         if (myid == 0) hypre_printf("Solver: AMG-LGMRES\n");
+         if (myid == 0) { hypre_printf("Solver: AMG-LGMRES\n"); }
 
-         HYPRE_BoomerAMGCreate(&pcg_precond); 
+         HYPRE_BoomerAMGCreate(&pcg_precond);
          HYPRE_BoomerAMGSetCGCIts(pcg_precond, cgcits);
          HYPRE_BoomerAMGSetInterpType(pcg_precond, interp_type);
          HYPRE_BoomerAMGSetPostInterpType(pcg_precond, post_interp_type);
@@ -3295,20 +3465,30 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetCRUseCG(pcg_precond, CR_use_CG);
          HYPRE_BoomerAMGSetRelaxType(pcg_precond, relax_type);
          if (relax_down > -1)
+         {
             HYPRE_BoomerAMGSetCycleRelaxType(pcg_precond, relax_down, 1);
+         }
          if (relax_up > -1)
+         {
             HYPRE_BoomerAMGSetCycleRelaxType(pcg_precond, relax_up, 2);
+         }
          if (relax_coarse > -1)
+         {
             HYPRE_BoomerAMGSetCycleRelaxType(pcg_precond, relax_coarse, 3);
+         }
          HYPRE_BoomerAMGSetChebyOrder(pcg_precond, cheby_order);
          HYPRE_BoomerAMGSetChebyFraction(pcg_precond, cheby_fraction);
          HYPRE_BoomerAMGSetRelaxOrder(pcg_precond, relax_order);
          HYPRE_BoomerAMGSetRelaxWt(pcg_precond, relax_wt);
          HYPRE_BoomerAMGSetOuterWt(pcg_precond, outer_wt);
          if (level_w > -1)
-            HYPRE_BoomerAMGSetLevelRelaxWt(pcg_precond, relax_wt_level,level_w);
+         {
+            HYPRE_BoomerAMGSetLevelRelaxWt(pcg_precond, relax_wt_level, level_w);
+         }
          if (level_ow > -1)
-            HYPRE_BoomerAMGSetLevelOuterWt(pcg_precond,outer_wt_level,level_ow);
+         {
+            HYPRE_BoomerAMGSetLevelOuterWt(pcg_precond, outer_wt_level, level_ow);
+         }
          HYPRE_BoomerAMGSetSmoothType(pcg_precond, smooth_type);
          HYPRE_BoomerAMGSetSmoothNumLevels(pcg_precond, smooth_num_levels);
          HYPRE_BoomerAMGSetSmoothNumSweeps(pcg_precond, smooth_num_sweeps);
@@ -3329,13 +3509,15 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetDomainType(pcg_precond, domain_type);
          HYPRE_BoomerAMGSetSchwarzUseNonSymm(pcg_precond, use_nonsymm_schwarz);
          HYPRE_BoomerAMGSetSchwarzRlxWeight(pcg_precond, schwarz_rlx_weight);
-         if (eu_level < 0) eu_level = 0;
+         if (eu_level < 0) { eu_level = 0; }
          HYPRE_BoomerAMGSetEuLevel(pcg_precond, eu_level);
          HYPRE_BoomerAMGSetEuBJ(pcg_precond, eu_bj);
          HYPRE_BoomerAMGSetEuSparseA(pcg_precond, eu_sparse_A);
          HYPRE_BoomerAMGSetCycleNumSweeps(pcg_precond, ns_coarse, 3);
          if (num_functions > 1)
+         {
             HYPRE_BoomerAMGSetDofFunc(pcg_precond, dof_func);
+         }
          HYPRE_BoomerAMGSetAdditive(pcg_precond, additive);
          HYPRE_BoomerAMGSetMultAdditive(pcg_precond, mult_add);
          HYPRE_BoomerAMGSetSimple(pcg_precond, simple);
@@ -3345,9 +3527,11 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetKeepTranspose(pcg_precond, keepTranspose);
          if (nongalerk_tol)
          {
-            HYPRE_BoomerAMGSetNonGalerkinTol(pcg_precond, nongalerk_tol[nongalerk_num_tol-1]);
-            for (i=0; i < nongalerk_num_tol-1; i++)
+            HYPRE_BoomerAMGSetNonGalerkinTol(pcg_precond, nongalerk_tol[nongalerk_num_tol - 1]);
+            for (i = 0; i < nongalerk_num_tol - 1; i++)
+            {
                HYPRE_BoomerAMGSetLevelNonGalerkinTol(pcg_precond, nongalerk_tol[i], i);
+            }
          }
          HYPRE_LGMRESSetMaxIter(pcg_solver, mg_max_iter);
          HYPRE_LGMRESSetPrecond(pcg_solver,
@@ -3358,7 +3542,7 @@ main( hypre_int argc,
       else if (solver_id == 50)
       {
          /* use diagonal scaling as preconditioner */
-         if (myid == 0) hypre_printf("Solver: DS-LGMRES\n");
+         if (myid == 0) { hypre_printf("Solver: DS-LGMRES\n"); }
          pcg_precond = NULL;
 
          HYPRE_LGMRESSetPrecond(pcg_solver,
@@ -3371,35 +3555,36 @@ main( hypre_int argc,
       if (pcg_precond_gotten != pcg_precond)
       {
          hypre_printf("HYPRE_LGMRESGetPrecond got bad precond\n");
-         return(-1);
+         return (-1);
+      }
+      else if (myid == 0)
+      {
+         hypre_printf("HYPRE_LGMRESGetPrecond got good precond\n");
       }
-      else
-         if (myid == 0)
-            hypre_printf("HYPRE_LGMRESGetPrecond got good precond\n");
       HYPRE_LGMRESSetup
-         (pcg_solver, (HYPRE_Matrix)parcsr_A, (HYPRE_Vector)b, (HYPRE_Vector)x);
- 
+      (pcg_solver, (HYPRE_Matrix)parcsr_A, (HYPRE_Vector)b, (HYPRE_Vector)x);
+
       hypre_EndTiming(time_index);
       hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
       hypre_FinalizeTiming(time_index);
       hypre_ClearTiming();
-   
+
       time_index = hypre_InitializeTiming("LGMRES Solve");
       hypre_BeginTiming(time_index);
- 
+
       HYPRE_LGMRESSolve
-         (pcg_solver, (HYPRE_Matrix)parcsr_A, (HYPRE_Vector)b, (HYPRE_Vector)x);
- 
+      (pcg_solver, (HYPRE_Matrix)parcsr_A, (HYPRE_Vector)b, (HYPRE_Vector)x);
+
       hypre_EndTiming(time_index);
       hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
       hypre_FinalizeTiming(time_index);
       hypre_ClearTiming();
- 
+
       HYPRE_LGMRESGetNumIterations(pcg_solver, &num_iterations);
-      HYPRE_LGMRESGetFinalRelativeResidualNorm(pcg_solver,&final_res_norm);
+      HYPRE_LGMRESGetFinalRelativeResidualNorm(pcg_solver, &final_res_norm);
 
       HYPRE_ParCSRLGMRESDestroy(pcg_solver);
- 
+
       if (solver_id == 51)
       {
          HYPRE_BoomerAMGDestroy(pcg_precond);
@@ -3415,14 +3600,14 @@ main( hypre_int argc,
    }
 
    /*-----------------------------------------------------------
-    * Solve the system using FlexGMRES 
+    * Solve the system using FlexGMRES
     *-----------------------------------------------------------*/
 
    if (solver_id == 60 || solver_id == 61 )
    {
       time_index = hypre_InitializeTiming("FlexGMRES Setup");
       hypre_BeginTiming(time_index);
- 
+
       HYPRE_ParCSRFlexGMRESCreate(hypre_MPI_COMM_WORLD, &pcg_solver);
       HYPRE_FlexGMRESSetKDim(pcg_solver, k_dim);
       HYPRE_FlexGMRESSetMaxIter(pcg_solver, max_iter);
@@ -3430,13 +3615,13 @@ main( hypre_int argc,
       HYPRE_FlexGMRESSetAbsoluteTol(pcg_solver, atol);
       HYPRE_FlexGMRESSetLogging(pcg_solver, 1);
       HYPRE_FlexGMRESSetPrintLevel(pcg_solver, ioutdat);
- 
+
       if (solver_id == 61)
       {
          /* use BoomerAMG as preconditioner */
-         if (myid == 0) hypre_printf("Solver: AMG-FlexGMRES\n");
+         if (myid == 0) { hypre_printf("Solver: AMG-FlexGMRES\n"); }
 
-         HYPRE_BoomerAMGCreate(&pcg_precond); 
+         HYPRE_BoomerAMGCreate(&pcg_precond);
          HYPRE_BoomerAMGSetCGCIts(pcg_precond, cgcits);
          HYPRE_BoomerAMGSetInterpType(pcg_precond, interp_type);
          HYPRE_BoomerAMGSetPostInterpType(pcg_precond, post_interp_type);
@@ -3465,20 +3650,30 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetCRUseCG(pcg_precond, CR_use_CG);
          HYPRE_BoomerAMGSetRelaxType(pcg_precond, relax_type);
          if (relax_down > -1)
+         {
             HYPRE_BoomerAMGSetCycleRelaxType(pcg_precond, relax_down, 1);
+         }
          if (relax_up > -1)
+         {
             HYPRE_BoomerAMGSetCycleRelaxType(pcg_precond, relax_up, 2);
+         }
          if (relax_coarse > -1)
+         {
             HYPRE_BoomerAMGSetCycleRelaxType(pcg_precond, relax_coarse, 3);
+         }
          HYPRE_BoomerAMGSetChebyOrder(pcg_precond, cheby_order);
          HYPRE_BoomerAMGSetChebyFraction(pcg_precond, cheby_fraction);
          HYPRE_BoomerAMGSetRelaxOrder(pcg_precond, relax_order);
          HYPRE_BoomerAMGSetRelaxWt(pcg_precond, relax_wt);
          HYPRE_BoomerAMGSetOuterWt(pcg_precond, outer_wt);
          if (level_w > -1)
-            HYPRE_BoomerAMGSetLevelRelaxWt(pcg_precond, relax_wt_level,level_w);
+         {
+            HYPRE_BoomerAMGSetLevelRelaxWt(pcg_precond, relax_wt_level, level_w);
+         }
          if (level_ow > -1)
-            HYPRE_BoomerAMGSetLevelOuterWt(pcg_precond,outer_wt_level,level_ow);
+         {
+            HYPRE_BoomerAMGSetLevelOuterWt(pcg_precond, outer_wt_level, level_ow);
+         }
          HYPRE_BoomerAMGSetSmoothType(pcg_precond, smooth_type);
          HYPRE_BoomerAMGSetSmoothNumLevels(pcg_precond, smooth_num_levels);
          HYPRE_BoomerAMGSetSmoothNumSweeps(pcg_precond, smooth_num_sweeps);
@@ -3499,13 +3694,15 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetDomainType(pcg_precond, domain_type);
          HYPRE_BoomerAMGSetSchwarzUseNonSymm(pcg_precond, use_nonsymm_schwarz);
          HYPRE_BoomerAMGSetSchwarzRlxWeight(pcg_precond, schwarz_rlx_weight);
-         if (eu_level < 0) eu_level = 0;
+         if (eu_level < 0) { eu_level = 0; }
          HYPRE_BoomerAMGSetEuLevel(pcg_precond, eu_level);
          HYPRE_BoomerAMGSetEuBJ(pcg_precond, eu_bj);
          HYPRE_BoomerAMGSetEuSparseA(pcg_precond, eu_sparse_A);
          HYPRE_BoomerAMGSetCycleNumSweeps(pcg_precond, ns_coarse, 3);
          if (num_functions > 1)
+         {
             HYPRE_BoomerAMGSetDofFunc(pcg_precond, dof_func);
+         }
          HYPRE_BoomerAMGSetAdditive(pcg_precond, additive);
          HYPRE_BoomerAMGSetMultAdditive(pcg_precond, mult_add);
          HYPRE_BoomerAMGSetSimple(pcg_precond, simple);
@@ -3515,9 +3712,11 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetKeepTranspose(pcg_precond, keepTranspose);
          if (nongalerk_tol)
          {
-            HYPRE_BoomerAMGSetNonGalerkinTol(pcg_precond, nongalerk_tol[nongalerk_num_tol-1]);
-            for (i=0; i < nongalerk_num_tol-1; i++)
+            HYPRE_BoomerAMGSetNonGalerkinTol(pcg_precond, nongalerk_tol[nongalerk_num_tol - 1]);
+            for (i = 0; i < nongalerk_num_tol - 1; i++)
+            {
                HYPRE_BoomerAMGSetLevelNonGalerkinTol(pcg_precond, nongalerk_tol[i], i);
+            }
          }
          HYPRE_FlexGMRESSetMaxIter(pcg_solver, mg_max_iter);
          HYPRE_FlexGMRESSetPrecond(pcg_solver,
@@ -3528,7 +3727,7 @@ main( hypre_int argc,
       else if (solver_id == 60)
       {
          /* use diagonal scaling as preconditioner */
-         if (myid == 0) hypre_printf("Solver: DS-FlexGMRES\n");
+         if (myid == 0) { hypre_printf("Solver: DS-FlexGMRES\n"); }
          pcg_precond = NULL;
 
          HYPRE_FlexGMRESSetPrecond(pcg_solver,
@@ -3541,42 +3740,43 @@ main( hypre_int argc,
       if (pcg_precond_gotten != pcg_precond)
       {
          hypre_printf("HYPRE_FlexGMRESGetPrecond got bad precond\n");
-         return(-1);
+         return (-1);
+      }
+      else if (myid == 0)
+      {
+         hypre_printf("HYPRE_FlexGMRESGetPrecond got good precond\n");
       }
-      else
-         if (myid == 0)
-            hypre_printf("HYPRE_FlexGMRESGetPrecond got good precond\n");
 
 
       /* this is optional - could be a user defined one instead (see ex5.c)*/
-      HYPRE_FlexGMRESSetModifyPC( pcg_solver, 
+      HYPRE_FlexGMRESSetModifyPC( pcg_solver,
                                   (HYPRE_PtrToModifyPCFcn) hypre_FlexGMRESModifyPCDefault);
 
 
       HYPRE_FlexGMRESSetup
-         (pcg_solver, (HYPRE_Matrix)parcsr_A, (HYPRE_Vector)b, (HYPRE_Vector)x);
- 
+      (pcg_solver, (HYPRE_Matrix)parcsr_A, (HYPRE_Vector)b, (HYPRE_Vector)x);
+
       hypre_EndTiming(time_index);
       hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
       hypre_FinalizeTiming(time_index);
       hypre_ClearTiming();
-   
+
       time_index = hypre_InitializeTiming("FlexGMRES Solve");
       hypre_BeginTiming(time_index);
- 
+
       HYPRE_FlexGMRESSolve
-         (pcg_solver, (HYPRE_Matrix)parcsr_A, (HYPRE_Vector)b, (HYPRE_Vector)x);
- 
+      (pcg_solver, (HYPRE_Matrix)parcsr_A, (HYPRE_Vector)b, (HYPRE_Vector)x);
+
       hypre_EndTiming(time_index);
       hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
       hypre_FinalizeTiming(time_index);
       hypre_ClearTiming();
- 
+
       HYPRE_FlexGMRESGetNumIterations(pcg_solver, &num_iterations);
-      HYPRE_FlexGMRESGetFinalRelativeResidualNorm(pcg_solver,&final_res_norm);
+      HYPRE_FlexGMRESGetFinalRelativeResidualNorm(pcg_solver, &final_res_norm);
 
       HYPRE_ParCSRFlexGMRESDestroy(pcg_solver);
- 
+
       if (solver_id == 61)
       {
          HYPRE_BoomerAMGDestroy(pcg_precond);
@@ -3592,26 +3792,26 @@ main( hypre_int argc,
    }
 
    /*-----------------------------------------------------------
-    * Solve the system using BiCGSTAB 
+    * Solve the system using BiCGSTAB
     *-----------------------------------------------------------*/
 
    if (solver_id == 9 || solver_id == 10 || solver_id == 11 || solver_id == 45)
    {
       time_index = hypre_InitializeTiming("BiCGSTAB Setup");
       hypre_BeginTiming(time_index);
- 
+
       HYPRE_ParCSRBiCGSTABCreate(hypre_MPI_COMM_WORLD, &pcg_solver);
       HYPRE_BiCGSTABSetMaxIter(pcg_solver, max_iter);
       HYPRE_BiCGSTABSetTol(pcg_solver, tol);
       HYPRE_BiCGSTABSetAbsoluteTol(pcg_solver, atol);
       HYPRE_BiCGSTABSetLogging(pcg_solver, ioutdat);
       HYPRE_BiCGSTABSetPrintLevel(pcg_solver, ioutdat);
- 
+
       if (solver_id == 9)
       {
          /* use BoomerAMG as preconditioner */
-         if (myid == 0) hypre_printf("Solver: AMG-BiCGSTAB\n");
-         HYPRE_BoomerAMGCreate(&pcg_precond); 
+         if (myid == 0) { hypre_printf("Solver: AMG-BiCGSTAB\n"); }
+         HYPRE_BoomerAMGCreate(&pcg_precond);
          HYPRE_BoomerAMGSetCGCIts(pcg_precond, cgcits);
          HYPRE_BoomerAMGSetInterpType(pcg_precond, interp_type);
          HYPRE_BoomerAMGSetPostInterpType(pcg_precond, post_interp_type);
@@ -3640,20 +3840,30 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetCRUseCG(pcg_precond, CR_use_CG);
          HYPRE_BoomerAMGSetRelaxType(pcg_precond, relax_type);
          if (relax_down > -1)
+         {
             HYPRE_BoomerAMGSetCycleRelaxType(pcg_precond, relax_down, 1);
+         }
          if (relax_up > -1)
+         {
             HYPRE_BoomerAMGSetCycleRelaxType(pcg_precond, relax_up, 2);
+         }
          if (relax_coarse > -1)
+         {
             HYPRE_BoomerAMGSetCycleRelaxType(pcg_precond, relax_coarse, 3);
+         }
          HYPRE_BoomerAMGSetChebyOrder(pcg_precond, cheby_order);
          HYPRE_BoomerAMGSetChebyFraction(pcg_precond, cheby_fraction);
          HYPRE_BoomerAMGSetRelaxOrder(pcg_precond, relax_order);
          HYPRE_BoomerAMGSetRelaxWt(pcg_precond, relax_wt);
          HYPRE_BoomerAMGSetOuterWt(pcg_precond, outer_wt);
          if (level_w > -1)
-            HYPRE_BoomerAMGSetLevelRelaxWt(pcg_precond, relax_wt_level,level_w);
+         {
+            HYPRE_BoomerAMGSetLevelRelaxWt(pcg_precond, relax_wt_level, level_w);
+         }
          if (level_ow > -1)
-            HYPRE_BoomerAMGSetLevelOuterWt(pcg_precond,outer_wt_level,level_ow);
+         {
+            HYPRE_BoomerAMGSetLevelOuterWt(pcg_precond, outer_wt_level, level_ow);
+         }
          HYPRE_BoomerAMGSetSmoothType(pcg_precond, smooth_type);
          HYPRE_BoomerAMGSetSmoothNumLevels(pcg_precond, smooth_num_levels);
          HYPRE_BoomerAMGSetSmoothNumSweeps(pcg_precond, smooth_num_sweeps);
@@ -3673,15 +3883,17 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetOverlap(pcg_precond, overlap);
          HYPRE_BoomerAMGSetDomainType(pcg_precond, domain_type);
          HYPRE_BoomerAMGSetSchwarzUseNonSymm(pcg_precond, use_nonsymm_schwarz);
-       
+
          HYPRE_BoomerAMGSetSchwarzRlxWeight(pcg_precond, schwarz_rlx_weight);
-         if (eu_level < 0) eu_level = 0;
+         if (eu_level < 0) { eu_level = 0; }
          HYPRE_BoomerAMGSetEuLevel(pcg_precond, eu_level);
          HYPRE_BoomerAMGSetEuBJ(pcg_precond, eu_bj);
          HYPRE_BoomerAMGSetEuSparseA(pcg_precond, eu_sparse_A);
          HYPRE_BoomerAMGSetCycleNumSweeps(pcg_precond, ns_coarse, 3);
          if (num_functions > 1)
+         {
             HYPRE_BoomerAMGSetDofFunc(pcg_precond, dof_func);
+         }
          HYPRE_BoomerAMGSetAdditive(pcg_precond, additive);
          HYPRE_BoomerAMGSetMultAdditive(pcg_precond, mult_add);
          HYPRE_BoomerAMGSetSimple(pcg_precond, simple);
@@ -3691,9 +3903,11 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetKeepTranspose(pcg_precond, keepTranspose);
          if (nongalerk_tol)
          {
-            HYPRE_BoomerAMGSetNonGalerkinTol(pcg_precond, nongalerk_tol[nongalerk_num_tol-1]);
-            for (i=0; i < nongalerk_num_tol-1; i++)
+            HYPRE_BoomerAMGSetNonGalerkinTol(pcg_precond, nongalerk_tol[nongalerk_num_tol - 1]);
+            for (i = 0; i < nongalerk_num_tol - 1; i++)
+            {
                HYPRE_BoomerAMGSetLevelNonGalerkinTol(pcg_precond, nongalerk_tol[i], i);
+            }
          }
          HYPRE_BiCGSTABSetMaxIter(pcg_solver, mg_max_iter);
          HYPRE_BiCGSTABSetPrecond(pcg_solver,
@@ -3704,7 +3918,7 @@ main( hypre_int argc,
       else if (solver_id == 10)
       {
          /* use diagonal scaling as preconditioner */
-         if (myid == 0) hypre_printf("Solver: DS-BiCGSTAB\n");
+         if (myid == 0) { hypre_printf("Solver: DS-BiCGSTAB\n"); }
          pcg_precond = NULL;
 
          HYPRE_BiCGSTABSetPrecond(pcg_solver,
@@ -3715,10 +3929,11 @@ main( hypre_int argc,
       else if (solver_id == 11)
       {
          /* use PILUT as preconditioner */
-         if (myid == 0) hypre_printf("Solver: PILUT-BiCGSTAB\n");
+         if (myid == 0) { hypre_printf("Solver: PILUT-BiCGSTAB\n"); }
 
-         ierr = HYPRE_ParCSRPilutCreate( hypre_MPI_COMM_WORLD, &pcg_precond ); 
-         if (ierr) {
+         ierr = HYPRE_ParCSRPilutCreate( hypre_MPI_COMM_WORLD, &pcg_precond );
+         if (ierr)
+         {
             hypre_printf("Error in ParPilutCreate\n");
          }
 
@@ -3738,20 +3953,20 @@ main( hypre_int argc,
       else if (solver_id == 45)
       {
          /* use Euclid preconditioning */
-         if (myid == 0) hypre_printf("Solver: Euclid-BICGSTAB\n");
+         if (myid == 0) { hypre_printf("Solver: Euclid-BICGSTAB\n"); }
 
          HYPRE_EuclidCreate(hypre_MPI_COMM_WORLD, &pcg_precond);
 
-         /* note: There are three three methods of setting run-time 
+         /* note: There are three three methods of setting run-time
             parameters for Euclid: (see HYPRE_parcsr_ls.h); here
-            we'll use what I think is simplest: let Euclid internally 
+            we'll use what I think is simplest: let Euclid internally
             parse the command line.
-         */   
-         if (eu_level > -1) HYPRE_EuclidSetLevel(pcg_precond, eu_level);
-         if (eu_ilut) HYPRE_EuclidSetILUT(pcg_precond, eu_ilut);
-         if (eu_sparse_A) HYPRE_EuclidSetSparseA(pcg_precond, eu_sparse_A);
-         if (eu_row_scale) HYPRE_EuclidSetRowScale(pcg_precond, eu_row_scale);
-         if (eu_bj) HYPRE_EuclidSetBJ(pcg_precond, eu_bj);
+         */
+         if (eu_level > -1) { HYPRE_EuclidSetLevel(pcg_precond, eu_level); }
+         if (eu_ilut) { HYPRE_EuclidSetILUT(pcg_precond, eu_ilut); }
+         if (eu_sparse_A) { HYPRE_EuclidSetSparseA(pcg_precond, eu_sparse_A); }
+         if (eu_row_scale) { HYPRE_EuclidSetRowScale(pcg_precond, eu_row_scale); }
+         if (eu_bj) { HYPRE_EuclidSetBJ(pcg_precond, eu_bj); }
          HYPRE_EuclidSetStats(pcg_precond, eu_stats);
          HYPRE_EuclidSetMem(pcg_precond, eu_mem);
 
@@ -3762,39 +3977,39 @@ main( hypre_int argc,
                                   (HYPRE_PtrToSolverFcn) HYPRE_EuclidSetup,
                                   pcg_precond);
       }
- 
-      HYPRE_BiCGSTABSetup(pcg_solver, (HYPRE_Matrix)parcsr_A, 
+
+      HYPRE_BiCGSTABSetup(pcg_solver, (HYPRE_Matrix)parcsr_A,
                           (HYPRE_Vector)b, (HYPRE_Vector)x);
- 
+
       hypre_EndTiming(time_index);
       hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
       hypre_FinalizeTiming(time_index);
       hypre_ClearTiming();
-   
+
       time_index = hypre_InitializeTiming("BiCGSTAB Solve");
       hypre_BeginTiming(time_index);
- 
-      HYPRE_BiCGSTABSolve(pcg_solver, (HYPRE_Matrix)parcsr_A, 
+
+      HYPRE_BiCGSTABSolve(pcg_solver, (HYPRE_Matrix)parcsr_A,
                           (HYPRE_Vector)b, (HYPRE_Vector)x);
- 
+
       hypre_EndTiming(time_index);
       hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
       hypre_FinalizeTiming(time_index);
       hypre_ClearTiming();
- 
+
       HYPRE_BiCGSTABGetNumIterations(pcg_solver, &num_iterations);
-      HYPRE_BiCGSTABGetFinalRelativeResidualNorm(pcg_solver,&final_res_norm);
+      HYPRE_BiCGSTABGetFinalRelativeResidualNorm(pcg_solver, &final_res_norm);
 #if SECOND_TIME
       /* run a second time to check for memory leaks */
       HYPRE_ParVectorSetRandomValues(x, 775);
-      HYPRE_BiCGSTABSetup(pcg_solver, (HYPRE_Matrix)parcsr_A, 
+      HYPRE_BiCGSTABSetup(pcg_solver, (HYPRE_Matrix)parcsr_A,
                           (HYPRE_Vector)b, (HYPRE_Vector)x);
-      HYPRE_BiCGSTABSolve(pcg_solver, (HYPRE_Matrix)parcsr_A, 
+      HYPRE_BiCGSTABSolve(pcg_solver, (HYPRE_Matrix)parcsr_A,
                           (HYPRE_Vector)b, (HYPRE_Vector)x);
 #endif
 
       HYPRE_ParCSRBiCGSTABDestroy(pcg_solver);
- 
+
       if (solver_id == 9)
       {
          HYPRE_BoomerAMGDestroy(pcg_precond);
@@ -3818,24 +4033,24 @@ main( hypre_int argc,
       }
    }
    /*-----------------------------------------------------------
-    * Solve the system using CGNR 
+    * Solve the system using CGNR
     *-----------------------------------------------------------*/
 
    if (solver_id == 5 || solver_id == 6)
    {
       time_index = hypre_InitializeTiming("CGNR Setup");
       hypre_BeginTiming(time_index);
- 
+
       HYPRE_ParCSRCGNRCreate(hypre_MPI_COMM_WORLD, &pcg_solver);
       HYPRE_CGNRSetMaxIter(pcg_solver, max_iter);
       HYPRE_CGNRSetTol(pcg_solver, tol);
       HYPRE_CGNRSetLogging(pcg_solver, ioutdat);
- 
+
       if (solver_id == 5)
       {
          /* use BoomerAMG as preconditioner */
-         if (myid == 0) hypre_printf("Solver: AMG-CGNR\n");
-         HYPRE_BoomerAMGCreate(&pcg_precond); 
+         if (myid == 0) { hypre_printf("Solver: AMG-CGNR\n"); }
+         HYPRE_BoomerAMGCreate(&pcg_precond);
          HYPRE_BoomerAMGSetCGCIts(pcg_precond, cgcits);
          HYPRE_BoomerAMGSetInterpType(pcg_precond, interp_type);
          HYPRE_BoomerAMGSetPostInterpType(pcg_precond, post_interp_type);
@@ -3859,20 +4074,30 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetNumSweeps(pcg_precond, num_sweeps);
          HYPRE_BoomerAMGSetRelaxType(pcg_precond, relax_type);
          if (relax_down > -1)
+         {
             HYPRE_BoomerAMGSetCycleRelaxType(pcg_precond, relax_down, 1);
+         }
          if (relax_up > -1)
+         {
             HYPRE_BoomerAMGSetCycleRelaxType(pcg_precond, relax_up, 2);
+         }
          if (relax_coarse > -1)
+         {
             HYPRE_BoomerAMGSetCycleRelaxType(pcg_precond, relax_coarse, 3);
+         }
          HYPRE_BoomerAMGSetChebyOrder(pcg_precond, cheby_order);
          HYPRE_BoomerAMGSetChebyFraction(pcg_precond, cheby_fraction);
          HYPRE_BoomerAMGSetRelaxOrder(pcg_precond, relax_order);
          HYPRE_BoomerAMGSetRelaxWt(pcg_precond, relax_wt);
          HYPRE_BoomerAMGSetOuterWt(pcg_precond, outer_wt);
          if (level_w > -1)
-            HYPRE_BoomerAMGSetLevelRelaxWt(pcg_precond, relax_wt_level,level_w);
+         {
+            HYPRE_BoomerAMGSetLevelRelaxWt(pcg_precond, relax_wt_level, level_w);
+         }
          if (level_ow > -1)
-            HYPRE_BoomerAMGSetLevelOuterWt(pcg_precond,outer_wt_level,level_ow);
+         {
+            HYPRE_BoomerAMGSetLevelOuterWt(pcg_precond, outer_wt_level, level_ow);
+         }
          HYPRE_BoomerAMGSetSmoothType(pcg_precond, smooth_type);
          HYPRE_BoomerAMGSetSmoothNumLevels(pcg_precond, smooth_num_levels);
          HYPRE_BoomerAMGSetSmoothNumSweeps(pcg_precond, smooth_num_sweeps);
@@ -3892,7 +4117,9 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetOverlap(pcg_precond, overlap);
          HYPRE_BoomerAMGSetDomainType(pcg_precond, domain_type);
          if (num_functions > 1)
+         {
             HYPRE_BoomerAMGSetDofFunc(pcg_precond, dof_func);
+         }
          HYPRE_BoomerAMGSetAdditive(pcg_precond, additive);
          HYPRE_BoomerAMGSetMultAdditive(pcg_precond, mult_add);
          HYPRE_BoomerAMGSetSimple(pcg_precond, simple);
@@ -3902,9 +4129,11 @@ main( hypre_int argc,
          HYPRE_BoomerAMGSetKeepTranspose(pcg_precond, keepTranspose);
          if (nongalerk_tol)
          {
-            HYPRE_BoomerAMGSetNonGalerkinTol(pcg_precond, nongalerk_tol[nongalerk_num_tol-1]);
-            for (i=0; i < nongalerk_num_tol-1; i++)
+            HYPRE_BoomerAMGSetNonGalerkinTol(pcg_precond, nongalerk_tol[nongalerk_num_tol - 1]);
+            for (i = 0; i < nongalerk_num_tol - 1; i++)
+            {
                HYPRE_BoomerAMGSetLevelNonGalerkinTol(pcg_precond, nongalerk_tol[i], i);
+            }
          }
          HYPRE_CGNRSetMaxIter(pcg_solver, mg_max_iter);
          HYPRE_CGNRSetPrecond(pcg_solver,
@@ -3916,7 +4145,7 @@ main( hypre_int argc,
       else if (solver_id == 6)
       {
          /* use diagonal scaling as preconditioner */
-         if (myid == 0) hypre_printf("Solver: DS-CGNR\n");
+         if (myid == 0) { hypre_printf("Solver: DS-CGNR\n"); }
          pcg_precond = NULL;
 
          HYPRE_CGNRSetPrecond(pcg_solver,
@@ -3925,49 +4154,50 @@ main( hypre_int argc,
                               (HYPRE_PtrToSolverFcn) HYPRE_ParCSRDiagScaleSetup,
                               pcg_precond);
       }
- 
+
       HYPRE_CGNRGetPrecond(pcg_solver, &pcg_precond_gotten);
       if (pcg_precond_gotten != pcg_precond)
       {
          hypre_printf("HYPRE_ParCSRCGNRGetPrecond got bad precond\n");
-         return(-1);
+         return (-1);
       }
-      else
-         if (myid == 0)
-            hypre_printf("HYPRE_ParCSRCGNRGetPrecond got good precond\n");
-      HYPRE_CGNRSetup(pcg_solver, (HYPRE_Matrix)parcsr_A, (HYPRE_Vector)b, 
+      else if (myid == 0)
+      {
+         hypre_printf("HYPRE_ParCSRCGNRGetPrecond got good precond\n");
+      }
+      HYPRE_CGNRSetup(pcg_solver, (HYPRE_Matrix)parcsr_A, (HYPRE_Vector)b,
                       (HYPRE_Vector)x);
- 
+
       hypre_EndTiming(time_index);
       hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
       hypre_FinalizeTiming(time_index);
       hypre_ClearTiming();
-   
+
       time_index = hypre_InitializeTiming("CGNR Solve");
       hypre_BeginTiming(time_index);
- 
-      HYPRE_CGNRSolve(pcg_solver, (HYPRE_Matrix)parcsr_A, (HYPRE_Vector)b, 
+
+      HYPRE_CGNRSolve(pcg_solver, (HYPRE_Matrix)parcsr_A, (HYPRE_Vector)b,
                       (HYPRE_Vector)x);
- 
+
       hypre_EndTiming(time_index);
       hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
       hypre_FinalizeTiming(time_index);
       hypre_ClearTiming();
- 
+
       HYPRE_CGNRGetNumIterations(pcg_solver, &num_iterations);
-      HYPRE_CGNRGetFinalRelativeResidualNorm(pcg_solver,&final_res_norm);
+      HYPRE_CGNRGetFinalRelativeResidualNorm(pcg_solver, &final_res_norm);
 
 #if SECOND_TIME
       /* run a second time to check for memory leaks */
       HYPRE_ParVectorSetRandomValues(x, 775);
-      HYPRE_CGNRSetup(pcg_solver, (HYPRE_Matrix)parcsr_A, (HYPRE_Vector)b, 
+      HYPRE_CGNRSetup(pcg_solver, (HYPRE_Matrix)parcsr_A, (HYPRE_Vector)b,
                       (HYPRE_Vector)x);
-      HYPRE_CGNRSolve(pcg_solver, (HYPRE_Matrix)parcsr_A, (HYPRE_Vector)b, 
+      HYPRE_CGNRSolve(pcg_solver, (HYPRE_Matrix)parcsr_A, (HYPRE_Vector)b,
                       (HYPRE_Vector)x);
 #endif
 
       HYPRE_ParCSRCGNRDestroy(pcg_solver);
- 
+
       if (solver_id == 5)
       {
          HYPRE_BoomerAMGDestroy(pcg_precond);
@@ -3986,8 +4216,10 @@ main( hypre_int argc,
     *-----------------------------------------------------------*/
 
    /* RDF: Why is this here? */
-   if (!(build_rhs_type ==1 || build_rhs_type ==7))
+   if (!(build_rhs_type == 1 || build_rhs_type == 7))
+   {
       HYPRE_IJVectorGetObjectType(ij_b, &j);
+   }
 
    if (print_system)
    {
@@ -3998,25 +4230,31 @@ main( hypre_int argc,
     * Finalize things
     *-----------------------------------------------------------*/
 
-   if (test_ij || build_matrix_type == -1) HYPRE_IJMatrixDestroy(ij_A);
-   else HYPRE_ParCSRMatrixDestroy(parcsr_A);
+   if (test_ij || build_matrix_type == -1) { HYPRE_IJMatrixDestroy(ij_A); }
+   else { HYPRE_ParCSRMatrixDestroy(parcsr_A); }
 
    /* for build_rhs_type = 1 or 7, we did not create ij_b  - just b*/
-   if (build_rhs_type ==1 || build_rhs_type ==7)
+   if (build_rhs_type == 1 || build_rhs_type == 7)
+   {
       HYPRE_ParVectorDestroy(b);
+   }
    else
+   {
       HYPRE_IJVectorDestroy(ij_b);
+   }
 
    HYPRE_IJVectorDestroy(ij_x);
 
-   if (build_rbm) 
+   if (build_rbm)
    {
-      for (i=0; i< num_interp_vecs; i++) 
+      for (i = 0; i < num_interp_vecs; i++)
+      {
          HYPRE_IJVectorDestroy(ij_rbm[i]);
+      }
       hypre_TFree(ij_rbm, HYPRE_MEMORY_HOST);
       hypre_TFree(interp_vecs, HYPRE_MEMORY_HOST);
    }
-   if (nongalerk_tol) hypre_TFree(nongalerk_tol, HYPRE_MEMORY_HOST);
+   if (nongalerk_tol) { hypre_TFree(nongalerk_tol, HYPRE_MEMORY_HOST); }
 
    hypre_MPI_Finalize();
 
@@ -4067,17 +4305,17 @@ BuildParFromFile( HYPRE_Int                  argc,
    /*-----------------------------------------------------------
     * Print driver parameters
     *-----------------------------------------------------------*/
- 
+
    if (myid == 0)
    {
       hypre_printf("  FromFile: %s\n", filename);
    }
 
    /*-----------------------------------------------------------
-    * Generate the matrix 
+    * Generate the matrix
     *-----------------------------------------------------------*/
- 
-   HYPRE_ParCSRMatrixRead(hypre_MPI_COMM_WORLD, filename,&A);
+
+   HYPRE_ParCSRMatrixRead(hypre_MPI_COMM_WORLD, filename, &A);
 
    *A_ptr = A;
 
@@ -4127,17 +4365,17 @@ BuildParRhsFromFile( HYPRE_Int                  argc,
    /*-----------------------------------------------------------
     * Print driver parameters
     *-----------------------------------------------------------*/
- 
+
    if (myid == 0)
    {
       hypre_printf("  RhsFromParFile: %s\n", filename);
    }
 
    /*-----------------------------------------------------------
-    * Generate the matrix 
+    * Generate the matrix
     *-----------------------------------------------------------*/
- 
-   HYPRE_ParVectorRead(hypre_MPI_COMM_WORLD, filename,&b);
+
+   HYPRE_ParVectorRead(hypre_MPI_COMM_WORLD, filename, &b);
 
    *b_ptr = b;
 
@@ -4171,12 +4409,12 @@ BuildParLaplacian( HYPRE_Int                  argc,
    HYPRE_Real         *mtrx;
 
    HYPRE_Real          ep = .1;
-   
+
    HYPRE_Int                 system_vcoef = 0;
    HYPRE_Int                 sys_opt = 0;
    HYPRE_Int                 vcoef_opt = 0;
-   
-   
+
+
    /*-----------------------------------------------------------
     * Initialize some stuff
     *-----------------------------------------------------------*/
@@ -4187,7 +4425,7 @@ BuildParLaplacian( HYPRE_Int                  argc,
    /*-----------------------------------------------------------
     * Set defaults
     *-----------------------------------------------------------*/
- 
+
    nx = 10;
    ny = 10;
    nz = 10;
@@ -4223,9 +4461,9 @@ BuildParLaplacian( HYPRE_Int                  argc,
       else if ( strcmp(argv[arg_index], "-c") == 0 )
       {
          arg_index++;
-         cx = atof(argv[arg_index++]);
-         cy = atof(argv[arg_index++]);
-         cz = atof(argv[arg_index++]);
+         cx = (HYPRE_Real)atof(argv[arg_index++]);
+         cy = (HYPRE_Real)atof(argv[arg_index++]);
+         cz = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-sysL") == 0 )
       {
@@ -4246,12 +4484,12 @@ BuildParLaplacian( HYPRE_Int                  argc,
       else if ( strcmp(argv[arg_index], "-sys_vcoef_opt") == 0 )
       {
          arg_index++;
-         vcoef_opt = atoi(argv[arg_index++]); 
+         vcoef_opt = atoi(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-ep") == 0 )
       {
          arg_index++;
-         ep = atof(argv[arg_index++]); 
+         ep = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else
       {
@@ -4263,7 +4501,7 @@ BuildParLaplacian( HYPRE_Int                  argc,
     * Check a few things
     *-----------------------------------------------------------*/
 
-   if ((P*Q*R) != num_procs)
+   if ((P * Q * R) != num_procs)
    {
       hypre_printf("Error: Invalid number of processors or processor topology \n");
       exit(1);
@@ -4272,7 +4510,7 @@ BuildParLaplacian( HYPRE_Int                  argc,
    /*-----------------------------------------------------------
     * Print driver parameters
     *-----------------------------------------------------------*/
- 
+
    if (myid == 0)
    {
       hypre_printf("  Laplacian:   num_fun = %d\n", num_fun);
@@ -4287,13 +4525,13 @@ BuildParLaplacian( HYPRE_Int                  argc,
 
    /* compute p,q,r from P,Q,R and myid */
    p = myid % P;
-   q = (( myid - p)/P) % Q;
-   r = ( myid - p - P*q)/( P*Q );
+   q = (( myid - p) / P) % Q;
+   r = ( myid - p - P * q) / ( P * Q );
 
    /*-----------------------------------------------------------
-    * Generate the matrix 
+    * Generate the matrix
     *-----------------------------------------------------------*/
- 
+
    values = hypre_CTAlloc(HYPRE_Real,  4, HYPRE_MEMORY_HOST);
 
    values[1] = -cx;
@@ -4303,67 +4541,67 @@ BuildParLaplacian( HYPRE_Int                  argc,
    values[0] = 0.;
    if (nx > 1)
    {
-      values[0] += 2.0*cx;
+      values[0] += 2.0 * cx;
    }
    if (ny > 1)
    {
-      values[0] += 2.0*cy;
+      values[0] += 2.0 * cy;
    }
    if (nz > 1)
    {
-      values[0] += 2.0*cz;
+      values[0] += 2.0 * cz;
    }
 
    if (num_fun == 1)
-      A = (HYPRE_ParCSRMatrix) GenerateLaplacian(hypre_MPI_COMM_WORLD, 
+      A = (HYPRE_ParCSRMatrix) GenerateLaplacian(hypre_MPI_COMM_WORLD,
                                                  nx, ny, nz, P, Q, R, p, q, r, values);
    else
    {
-      mtrx = hypre_CTAlloc(HYPRE_Real,  num_fun*num_fun, HYPRE_MEMORY_HOST);
+      mtrx = hypre_CTAlloc(HYPRE_Real,  num_fun * num_fun, HYPRE_MEMORY_HOST);
 
       if (num_fun == 2)
       {
-         if (sys_opt ==1) /* identity  */
+         if (sys_opt == 1) /* identity  */
          {
             mtrx[0] = 1.0;
-            mtrx[1] = 0.0; 
+            mtrx[1] = 0.0;
             mtrx[2] = 0.0;
-            mtrx[3] = 1.0; 
+            mtrx[3] = 1.0;
          }
-         else if (sys_opt ==2)
+         else if (sys_opt == 2)
          {
             mtrx[0] = 1.0;
-            mtrx[1] = 0.0; 
+            mtrx[1] = 0.0;
             mtrx[2] = 0.0;
-            mtrx[3] = 20.0; 
+            mtrx[3] = 20.0;
          }
-         else if (sys_opt ==3) /* similar to barry's talk - ex1 */
+         else if (sys_opt == 3) /* similar to barry's talk - ex1 */
          {
             mtrx[0] = 1.0;
-            mtrx[1] = 2.0; 
+            mtrx[1] = 2.0;
             mtrx[2] = 2.0;
-            mtrx[3] = 1.0; 
+            mtrx[3] = 1.0;
          }
-         else if (sys_opt ==4) /* can use with vcoef to get barry's ex*/
+         else if (sys_opt == 4) /* can use with vcoef to get barry's ex*/
          {
             mtrx[0] = 1.0;
-            mtrx[1] = 1.0; 
+            mtrx[1] = 1.0;
             mtrx[2] = 1.0;
-            mtrx[3] = 1.0; 
+            mtrx[3] = 1.0;
          }
-         else if (sys_opt ==5) /* barry's talk - ex1 */
+         else if (sys_opt == 5) /* barry's talk - ex1 */
          {
             mtrx[0] = 1.0;
-            mtrx[1] = 1.1; 
+            mtrx[1] = 1.1;
             mtrx[2] = 1.1;
-            mtrx[3] = 1.0; 
+            mtrx[3] = 1.0;
          }
-         else if (sys_opt ==6) /*  */
+         else if (sys_opt == 6) /*  */
          {
             mtrx[0] = 1.1;
-            mtrx[1] = 1.0; 
+            mtrx[1] = 1.0;
             mtrx[2] = 1.0;
-            mtrx[3] = 1.1; 
+            mtrx[3] = 1.1;
          }
 
          else /* == 0 */
@@ -4376,7 +4614,7 @@ BuildParLaplacian( HYPRE_Int                  argc,
       }
       else if (num_fun == 3)
       {
-         if (sys_opt ==1)
+         if (sys_opt == 1)
          {
             mtrx[0] = 1.0;
             mtrx[1] = 0.0;
@@ -4388,7 +4626,7 @@ BuildParLaplacian( HYPRE_Int                  argc,
             mtrx[7] = 0.0;
             mtrx[8] = 1.0;
          }
-         else if (sys_opt ==2)
+         else if (sys_opt == 2)
          {
             mtrx[0] = 1.0;
             mtrx[1] = 0.0;
@@ -4398,9 +4636,9 @@ BuildParLaplacian( HYPRE_Int                  argc,
             mtrx[5] = 0.0;
             mtrx[6] = 0.0;
             mtrx[7] = 0.0;
-            mtrx[8] =.01;
+            mtrx[8] = .01;
          }
-         else if (sys_opt ==3)
+         else if (sys_opt == 3)
          {
             mtrx[0] = 1.01;
             mtrx[1] = 1;
@@ -4410,9 +4648,9 @@ BuildParLaplacian( HYPRE_Int                  argc,
             mtrx[5] = 1;
             mtrx[6] = 0.0;
             mtrx[7] = 1;
-            mtrx[8] = 1.01;  
+            mtrx[8] = 1.01;
          }
-         else if (sys_opt ==4) /* barry ex4 */
+         else if (sys_opt == 4) /* barry ex4 */
          {
             mtrx[0] = 3;
             mtrx[1] = 1;
@@ -4422,7 +4660,7 @@ BuildParLaplacian( HYPRE_Int                  argc,
             mtrx[5] = 2;
             mtrx[6] = 0.0;
             mtrx[7] = 2;
-            mtrx[8] = .25;  
+            mtrx[8] = .25;
          }
          else /* == 0 */
          {
@@ -4437,7 +4675,7 @@ BuildParLaplacian( HYPRE_Int                  argc,
             mtrx[8] = 2.0;
          }
 
-      } 
+      }
       else if (num_fun == 4)
       {
          mtrx[0] = 1.01;
@@ -4456,24 +4694,24 @@ BuildParLaplacian( HYPRE_Int                  argc,
          mtrx[13] = 1;
          mtrx[14] = 0.0;
          mtrx[15] = 1;
-      } 
+      }
 
 
 
 
       if (!system_vcoef)
       {
-         A = (HYPRE_ParCSRMatrix) GenerateSysLaplacian(hypre_MPI_COMM_WORLD, 
-                                                       nx, ny, nz, P, Q, 
+         A = (HYPRE_ParCSRMatrix) GenerateSysLaplacian(hypre_MPI_COMM_WORLD,
+                                                       nx, ny, nz, P, Q,
                                                        R, p, q, r, num_fun, mtrx, values);
       }
       else
       {
-       
-    
+
+
          HYPRE_Real *mtrx_values;
 
-         mtrx_values = hypre_CTAlloc(HYPRE_Real,  num_fun*num_fun*4, HYPRE_MEMORY_HOST);
+         mtrx_values = hypre_CTAlloc(HYPRE_Real,  num_fun * num_fun * 4, HYPRE_MEMORY_HOST);
 
          if (num_fun == 2)
          {
@@ -4482,93 +4720,93 @@ BuildParLaplacian( HYPRE_Int                  argc,
                /* Barry's talk * - must also have sys_opt = 4, all fail */
                mtrx[0] = 1.0;
                SetSysVcoefValues(num_fun, nx, ny, nz, 1.0, .10, 1.0, 0, mtrx_values);
-               
+
                mtrx[1]  = 1.0;
                SetSysVcoefValues(num_fun, nx, ny, nz, .1, 1.0, 1.0, 1, mtrx_values);
-               
+
                mtrx[2] = 1.0;
                SetSysVcoefValues(num_fun, nx, ny, nz, .01, 1.0, 1.0, 2, mtrx_values);
-               
+
                mtrx[3] = 1.0;
                SetSysVcoefValues(num_fun, nx, ny, nz, 2.0, .02, 1.0, 3, mtrx_values);
-               
+
             }
             else if (vcoef_opt == 2)
             {
                /* Barry's talk * - ex2 - if have sys-opt = 4*/
                mtrx[0] = 1.0;
                SetSysVcoefValues(num_fun, nx, ny, nz, 1.0, .010, 1.0, 0, mtrx_values);
-               
+
                mtrx[1]  = 200.0;
                SetSysVcoefValues(num_fun, nx, ny, nz, 1.0, 1.0, 1.0, 1, mtrx_values);
 
                mtrx[2] = 200.0;
                SetSysVcoefValues(num_fun, nx, ny, nz, 1.0, 1.0, 1.0, 2, mtrx_values);
-               
+
                mtrx[3] = 1.0;
                SetSysVcoefValues(num_fun, nx, ny, nz, 2.0, .02, 1.0, 3, mtrx_values);
-               
+
             }
             else if (vcoef_opt == 3) /* use with default sys_opt  - ulrike ex 3*/
             {
-               
+
                /* mtrx[0] */
-               SetSysVcoefValues(num_fun, nx, ny, nz, ep*1.0, 1.0, 1.0, 0, mtrx_values);
-               
+               SetSysVcoefValues(num_fun, nx, ny, nz, ep * 1.0, 1.0, 1.0, 0, mtrx_values);
+
                /* mtrx[1] */
                SetSysVcoefValues(num_fun, nx, ny, nz, 1.0, 1.0, 1.0, 1, mtrx_values);
-               
+
                /* mtrx[2] */
-               SetSysVcoefValues(num_fun, nx, ny, nz, ep*1.0, 1.0, 1.0, 2, mtrx_values);
-               
+               SetSysVcoefValues(num_fun, nx, ny, nz, ep * 1.0, 1.0, 1.0, 2, mtrx_values);
+
                /* mtrx[3] */
                SetSysVcoefValues(num_fun, nx, ny, nz, 1.0, 1.0, 1.0, 3, mtrx_values);
             }
             else if (vcoef_opt == 4) /* use with default sys_opt  - ulrike ex 4*/
             {
                HYPRE_Real ep2 = ep;
-               
+
                /* mtrx[0] */
-               SetSysVcoefValues(num_fun, nx, ny, nz, ep*1.0, 1.0, 1.0, 0, mtrx_values);
-               
+               SetSysVcoefValues(num_fun, nx, ny, nz, ep * 1.0, 1.0, 1.0, 0, mtrx_values);
+
                /* mtrx[1] */
-               SetSysVcoefValues(num_fun, nx, ny, nz, 1.0, ep*1.0, 1.0, 1, mtrx_values);
-               
+               SetSysVcoefValues(num_fun, nx, ny, nz, 1.0, ep * 1.0, 1.0, 1, mtrx_values);
+
                /* mtrx[2] */
-               SetSysVcoefValues(num_fun, nx, ny, nz, ep*1.0, 1.0, 1.0, 2, mtrx_values);
-               
+               SetSysVcoefValues(num_fun, nx, ny, nz, ep * 1.0, 1.0, 1.0, 2, mtrx_values);
+
                /* mtrx[3] */
-               SetSysVcoefValues(num_fun, nx, ny, nz, 1.0, ep2*1.0, 1.0, 3, mtrx_values);
+               SetSysVcoefValues(num_fun, nx, ny, nz, 1.0, ep2 * 1.0, 1.0, 3, mtrx_values);
             }
             else if (vcoef_opt == 5) /* use with default sys_opt  - */
             {
                HYPRE_Real  alp, beta;
                alp = .001;
                beta = 10;
-               
+
                /* mtrx[0] */
-               SetSysVcoefValues(num_fun, nx, ny, nz, alp*1.0, 1.0, 1.0, 0, mtrx_values);
-               
+               SetSysVcoefValues(num_fun, nx, ny, nz, alp * 1.0, 1.0, 1.0, 0, mtrx_values);
+
                /* mtrx[1] */
-               SetSysVcoefValues(num_fun, nx, ny, nz, 1.0, beta*1.0, 1.0, 1, mtrx_values);
-               
+               SetSysVcoefValues(num_fun, nx, ny, nz, 1.0, beta * 1.0, 1.0, 1, mtrx_values);
+
                /* mtrx[2] */
-               SetSysVcoefValues(num_fun, nx, ny, nz, alp*1.0, 1.0, 1.0, 2, mtrx_values);
-               
+               SetSysVcoefValues(num_fun, nx, ny, nz, alp * 1.0, 1.0, 1.0, 2, mtrx_values);
+
                /* mtrx[3] */
-               SetSysVcoefValues(num_fun, nx, ny, nz, 1.0, beta*1.0, 1.0, 3, mtrx_values);
+               SetSysVcoefValues(num_fun, nx, ny, nz, 1.0, beta * 1.0, 1.0, 3, mtrx_values);
             }
             else  /* = 0 */
             {
                /* mtrx[0] */
                SetSysVcoefValues(num_fun, nx, ny, nz, 1.0, 1.0, 1.0, 0, mtrx_values);
-               
+
                /* mtrx[1] */
                SetSysVcoefValues(num_fun, nx, ny, nz, 1.0, 2.0, 1.0, 1, mtrx_values);
-               
+
                /* mtrx[2] */
                SetSysVcoefValues(num_fun, nx, ny, nz, 2.0, 1.0, 0.0, 2, mtrx_values);
-               
+
                /* mtrx[3] */
                SetSysVcoefValues(num_fun, nx, ny, nz, 1.0, 3.0, 1.0, 3, mtrx_values);
             }
@@ -4605,8 +4843,8 @@ BuildParLaplacian( HYPRE_Int                  argc,
 
          }
 
-         A = (HYPRE_ParCSRMatrix) GenerateSysLaplacianVCoef(hypre_MPI_COMM_WORLD, 
-                                                            nx, ny, nz, P, Q, 
+         A = (HYPRE_ParCSRMatrix) GenerateSysLaplacianVCoef(hypre_MPI_COMM_WORLD,
+                                                            nx, ny, nz, P, Q,
                                                             R, p, q, r, num_fun, mtrx, mtrx_values);
 
 
@@ -4627,7 +4865,7 @@ BuildParLaplacian( HYPRE_Int                  argc,
 }
 
 /*----------------------------------------------------------------------
- * Build standard 7-point convection-diffusion operator 
+ * Build standard 7-point convection-diffusion operator
  * Parameters given in command line.
  * Operator:
  *
@@ -4645,7 +4883,7 @@ BuildParDifConv( HYPRE_Int                  argc,
    HYPRE_Int                 P, Q, R;
    HYPRE_Real          cx, cy, cz;
    HYPRE_Real          ax, ay, az;
-   HYPRE_Real          hinx,hiny,hinz;
+   HYPRE_Real          hinx, hiny, hinz;
 
    HYPRE_ParCSRMatrix  A;
 
@@ -4663,7 +4901,7 @@ BuildParDifConv( HYPRE_Int                  argc,
    /*-----------------------------------------------------------
     * Set defaults
     *-----------------------------------------------------------*/
- 
+
    nx = 10;
    ny = 10;
    nz = 10;
@@ -4703,16 +4941,16 @@ BuildParDifConv( HYPRE_Int                  argc,
       else if ( strcmp(argv[arg_index], "-c") == 0 )
       {
          arg_index++;
-         cx = atof(argv[arg_index++]);
-         cy = atof(argv[arg_index++]);
-         cz = atof(argv[arg_index++]);
+         cx = (HYPRE_Real)atof(argv[arg_index++]);
+         cy = (HYPRE_Real)atof(argv[arg_index++]);
+         cz = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-a") == 0 )
       {
          arg_index++;
-         ax = atof(argv[arg_index++]);
-         ay = atof(argv[arg_index++]);
-         az = atof(argv[arg_index++]);
+         ax = (HYPRE_Real)atof(argv[arg_index++]);
+         ay = (HYPRE_Real)atof(argv[arg_index++]);
+         az = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else
       {
@@ -4724,7 +4962,7 @@ BuildParDifConv( HYPRE_Int                  argc,
     * Check a few things
     *-----------------------------------------------------------*/
 
-   if ((P*Q*R) != num_procs)
+   if ((P * Q * R) != num_procs)
    {
       hypre_printf("Error: Invalid number of processors or processor topology \n");
       exit(1);
@@ -4733,11 +4971,11 @@ BuildParDifConv( HYPRE_Int                  argc,
    /*-----------------------------------------------------------
     * Print driver parameters
     *-----------------------------------------------------------*/
- 
+
    if (myid == 0)
    {
       hypre_printf("  Convection-Diffusion: \n");
-      hypre_printf("    -cx Dxx - cy Dyy - cz Dzz + ax Dx + ay Dy + az Dz = f\n");  
+      hypre_printf("    -cx Dxx - cy Dyy - cz Dzz + ax Dx + ay Dy + az Dz = f\n");
       hypre_printf("    (nx, ny, nz) = (%d, %d, %d)\n", nx, ny, nz);
       hypre_printf("    (Px, Py, Pz) = (%d, %d, %d)\n", P,  Q,  R);
       hypre_printf("    (cx, cy, cz) = (%f, %f, %f)\n", cx, cy, cz);
@@ -4750,38 +4988,38 @@ BuildParDifConv( HYPRE_Int                  argc,
 
    /* compute p,q,r from P,Q,R and myid */
    p = myid % P;
-   q = (( myid - p)/P) % Q;
-   r = ( myid - p - P*q)/( P*Q );
+   q = (( myid - p) / P) % Q;
+   r = ( myid - p - P * q) / ( P * Q );
 
-   hinx = 1./(nx+1);
-   hiny = 1./(ny+1);
-   hinz = 1./(nz+1);
+   hinx = 1. / (nx + 1);
+   hiny = 1. / (ny + 1);
+   hinz = 1. / (nz + 1);
 
    /*-----------------------------------------------------------
-    * Generate the matrix 
+    * Generate the matrix
     *-----------------------------------------------------------*/
- 
+
    values = hypre_CTAlloc(HYPRE_Real,  7, HYPRE_MEMORY_HOST);
 
-   values[1] = -cx/(hinx*hinx);
-   values[2] = -cy/(hiny*hiny);
-   values[3] = -cz/(hinz*hinz);
-   values[4] = -cx/(hinx*hinx) + ax/hinx;
-   values[5] = -cy/(hiny*hiny) + ay/hiny;
-   values[6] = -cz/(hinz*hinz) + az/hinz;
+   values[1] = -cx / (hinx * hinx);
+   values[2] = -cy / (hiny * hiny);
+   values[3] = -cz / (hinz * hinz);
+   values[4] = -cx / (hinx * hinx) + ax / hinx;
+   values[5] = -cy / (hiny * hiny) + ay / hiny;
+   values[6] = -cz / (hinz * hinz) + az / hinz;
 
    values[0] = 0.;
    if (nx > 1)
    {
-      values[0] += 2.0*cx/(hinx*hinx) - 1.*ax/hinx;
+      values[0] += 2.0 * cx / (hinx * hinx) - 1.*ax / hinx;
    }
    if (ny > 1)
    {
-      values[0] += 2.0*cy/(hiny*hiny) - 1.*ay/hiny;
+      values[0] += 2.0 * cy / (hiny * hiny) - 1.*ay / hiny;
    }
    if (nz > 1)
    {
-      values[0] += 2.0*cz/(hinz*hinz) - 1.*az/hinz;
+      values[0] += 2.0 * cz / (hinz * hinz) - 1.*az / hinz;
    }
 
    A = (HYPRE_ParCSRMatrix) GenerateDifConv(hypre_MPI_COMM_WORLD,
@@ -4815,8 +5053,8 @@ BuildParFromOneFile( HYPRE_Int                  argc,
 
    HYPRE_Int                 myid, numprocs;
    HYPRE_Int                 i, rest, size, num_nodes, num_dofs;
-   HYPRE_Int		      *row_part;
-   HYPRE_Int		      *col_part;
+   HYPRE_Int            *row_part;
+   HYPRE_Int            *col_part;
 
    /*-----------------------------------------------------------
     * Initialize some stuff
@@ -4842,15 +5080,15 @@ BuildParFromOneFile( HYPRE_Int                  argc,
    /*-----------------------------------------------------------
     * Print driver parameters
     *-----------------------------------------------------------*/
- 
+
    if (myid == 0)
    {
       hypre_printf("  FromFile: %s\n", filename);
 
       /*-----------------------------------------------------------
-       * Generate the matrix 
+       * Generate the matrix
        *-----------------------------------------------------------*/
- 
+
       A_CSR = HYPRE_CSRMatrixRead(filename);
    }
 
@@ -4859,22 +5097,22 @@ BuildParFromOneFile( HYPRE_Int                  argc,
    if (myid == 0 && num_functions > 1)
    {
       HYPRE_CSRMatrixGetNumRows(A_CSR, &num_dofs);
-      num_nodes = num_dofs/num_functions;
-      if (num_dofs != num_functions*num_nodes)
+      num_nodes = num_dofs / num_functions;
+      if (num_dofs != num_functions * num_nodes)
       {
-	 row_part = NULL;
-	 col_part = NULL;
+         row_part = NULL;
+         col_part = NULL;
       }
       else
       {
-         row_part = hypre_CTAlloc(HYPRE_Int,  numprocs+1, HYPRE_MEMORY_HOST);
-	 row_part[0] = 0;
-	 size = num_nodes/numprocs;
-	 rest = num_nodes-size*numprocs;
-	 for (i=0; i < numprocs; i++)
-	 {
-	    row_part[i+1] = row_part[i]+size*num_functions;
-	    if (i < rest) row_part[i+1] += num_functions;
+         row_part = hypre_CTAlloc(HYPRE_Int,  numprocs + 1, HYPRE_MEMORY_HOST);
+         row_part[0] = 0;
+         size = num_nodes / numprocs;
+         rest = num_nodes - size * numprocs;
+         for (i = 0; i < numprocs; i++)
+         {
+            row_part[i + 1] = row_part[i] + size * num_functions;
+            if (i < rest) { row_part[i + 1] += num_functions; }
          }
          col_part = row_part;
       }
@@ -4884,7 +5122,7 @@ BuildParFromOneFile( HYPRE_Int                  argc,
 
    *A_ptr = A;
 
-   if (myid == 0) HYPRE_CSRMatrixDestroy(A_CSR);
+   if (myid == 0) { HYPRE_CSRMatrixDestroy(A_CSR); }
 
    return (0);
 }
@@ -4900,12 +5138,12 @@ BuildFuncsFromFiles(    HYPRE_Int                  argc,
                         HYPRE_ParCSRMatrix   parcsr_A,
                         HYPRE_Int                **dof_func_ptr     )
 {
-/*----------------------------------------------------------------------
- * Build Function array from files on different processors
- *----------------------------------------------------------------------*/
+   /*----------------------------------------------------------------------
+    * Build Function array from files on different processors
+    *----------------------------------------------------------------------*/
 
-   hypre_printf (" Feature is not implemented yet!\n");	
-   return(0);
+   hypre_printf (" Feature is not implemented yet!\n");
+   return (0);
 
 }
 
@@ -4925,9 +5163,9 @@ BuildFuncsFromOneFile(  HYPRE_Int                  argc,
    HYPRE_Int            *dof_func_local;
    HYPRE_Int             i, j;
    HYPRE_Int             local_size, global_size;
-   hypre_MPI_Request	  *requests;
-   hypre_MPI_Status	  *status, status0;
-   MPI_Comm	   comm;
+   hypre_MPI_Request   *requests;
+   hypre_MPI_Status    *status, status0;
+   MPI_Comm    comm;
 
    /*-----------------------------------------------------------
     * Initialize some stuff
@@ -4954,7 +5192,7 @@ BuildFuncsFromOneFile(  HYPRE_Int                  argc,
    /*-----------------------------------------------------------
     * Print driver parameters
     *-----------------------------------------------------------*/
- 
+
    if (myid == 0)
    {
       FILE *fp;
@@ -4974,41 +5212,43 @@ BuildFuncsFromOneFile(  HYPRE_Int                  argc,
       }
 
       fclose(fp);
- 
+
    }
    HYPRE_ParCSRMatrixGetRowPartitioning(parcsr_A, &partitioning);
-   local_size = partitioning[myid+1]-partitioning[myid];
+   local_size = partitioning[myid + 1] - partitioning[myid];
    dof_func_local = hypre_CTAlloc(HYPRE_Int, local_size, HYPRE_MEMORY_HOST);
 
    if (myid == 0)
    {
-      requests = hypre_CTAlloc(hypre_MPI_Request, num_procs-1, HYPRE_MEMORY_HOST);
-      status = hypre_CTAlloc(hypre_MPI_Status, num_procs-1, HYPRE_MEMORY_HOST);
+      requests = hypre_CTAlloc(hypre_MPI_Request, num_procs - 1, HYPRE_MEMORY_HOST);
+      status = hypre_CTAlloc(hypre_MPI_Status, num_procs - 1, HYPRE_MEMORY_HOST);
       j = 0;
-      for (i=1; i < num_procs; i++)
+      for (i = 1; i < num_procs; i++)
          hypre_MPI_Isend(&dof_func[partitioning[i]],
-                         partitioning[i+1]-partitioning[i],
+                         partitioning[i + 1] - partitioning[i],
                          HYPRE_MPI_INT, i, 0, comm, &requests[j++]);
-      for (i=0; i < local_size; i++)
+      for (i = 0; i < local_size; i++)
+      {
          dof_func_local[i] = dof_func[i];
-      hypre_MPI_Waitall(num_procs-1,requests, status);
+      }
+      hypre_MPI_Waitall(num_procs - 1, requests, status);
       hypre_TFree(requests, HYPRE_MEMORY_HOST);
       hypre_TFree(status, HYPRE_MEMORY_HOST);
    }
    else
    {
-      hypre_MPI_Recv(dof_func_local,local_size,HYPRE_MPI_INT,0,0,comm,&status0);
+      hypre_MPI_Recv(dof_func_local, local_size, HYPRE_MPI_INT, 0, 0, comm, &status0);
    }
 
    *dof_func_ptr = dof_func_local;
 
-   if (myid == 0) hypre_TFree(dof_func, HYPRE_MEMORY_HOST);
+   if (myid == 0) { hypre_TFree(dof_func, HYPRE_MEMORY_HOST); }
 
    return (0);
 }
 
 /*----------------------------------------------------------------------
- * Build Rhs from one file on Proc. 0. Distributes vector across processors 
+ * Build Rhs from one file on Proc. 0. Distributes vector across processors
  * giving each about using the distribution of the matrix A.
  *----------------------------------------------------------------------*/
 
@@ -5022,7 +5262,7 @@ BuildRhsParFromOneFile( HYPRE_Int                  argc,
    char           *filename;
 
    HYPRE_ParVector b;
-   HYPRE_Vector    b_CSR=NULL;
+   HYPRE_Vector    b_CSR = NULL;
 
    HYPRE_Int             myid;
 
@@ -5049,18 +5289,18 @@ BuildRhsParFromOneFile( HYPRE_Int                  argc,
    /*-----------------------------------------------------------
     * Print driver parameters
     *-----------------------------------------------------------*/
- 
+
    if (myid == 0)
    {
       hypre_printf("  Rhs FromFile: %s\n", filename);
 
       /*-----------------------------------------------------------
-       * Generate the matrix 
+       * Generate the matrix
        *-----------------------------------------------------------*/
- 
+
       b_CSR = HYPRE_VectorRead(filename);
    }
-   HYPRE_VectorToParVector(hypre_MPI_COMM_WORLD, b_CSR, partitioning,&b); 
+   HYPRE_VectorToParVector(hypre_MPI_COMM_WORLD, b_CSR, partitioning, &b);
 
    *b_ptr = b;
 
@@ -5099,7 +5339,7 @@ BuildParLaplacian9pt( HYPRE_Int                  argc,
    /*-----------------------------------------------------------
     * Set defaults
     *-----------------------------------------------------------*/
- 
+
    nx = 10;
    ny = 10;
 
@@ -5134,7 +5374,7 @@ BuildParLaplacian9pt( HYPRE_Int                  argc,
     * Check a few things
     *-----------------------------------------------------------*/
 
-   if ((P*Q) != num_procs)
+   if ((P * Q) != num_procs)
    {
       hypre_printf("Error: Invalid number of processors or processor topology \n");
       exit(1);
@@ -5143,7 +5383,7 @@ BuildParLaplacian9pt( HYPRE_Int                  argc,
    /*-----------------------------------------------------------
     * Print driver parameters
     *-----------------------------------------------------------*/
- 
+
    if (myid == 0)
    {
       hypre_printf("  Laplacian 9pt:\n");
@@ -5157,12 +5397,12 @@ BuildParLaplacian9pt( HYPRE_Int                  argc,
 
    /* compute p,q from P,Q and myid */
    p = myid % P;
-   q = ( myid - p)/P;
+   q = ( myid - p) / P;
 
    /*-----------------------------------------------------------
-    * Generate the matrix 
+    * Generate the matrix
     *-----------------------------------------------------------*/
- 
+
    values = hypre_CTAlloc(HYPRE_Real,  2, HYPRE_MEMORY_HOST);
 
    values[1] = -1.;
@@ -5220,7 +5460,7 @@ BuildParLaplacian27pt( HYPRE_Int                  argc,
    /*-----------------------------------------------------------
     * Set defaults
     *-----------------------------------------------------------*/
- 
+
    nx = 10;
    ny = 10;
    nz = 10;
@@ -5259,7 +5499,7 @@ BuildParLaplacian27pt( HYPRE_Int                  argc,
     * Check a few things
     *-----------------------------------------------------------*/
 
-   if ((P*Q*R) != num_procs)
+   if ((P * Q * R) != num_procs)
    {
       hypre_printf("Error: Invalid number of processors or processor topology \n");
       exit(1);
@@ -5268,7 +5508,7 @@ BuildParLaplacian27pt( HYPRE_Int                  argc,
    /*-----------------------------------------------------------
     * Print driver parameters
     *-----------------------------------------------------------*/
- 
+
    if (myid == 0)
    {
       hypre_printf("  Laplacian_27pt:\n");
@@ -5282,20 +5522,24 @@ BuildParLaplacian27pt( HYPRE_Int                  argc,
 
    /* compute p,q,r from P,Q,R and myid */
    p = myid % P;
-   q = (( myid - p)/P) % Q;
-   r = ( myid - p - P*q)/( P*Q );
+   q = (( myid - p) / P) % Q;
+   r = ( myid - p - P * q) / ( P * Q );
 
    /*-----------------------------------------------------------
-    * Generate the matrix 
+    * Generate the matrix
     *-----------------------------------------------------------*/
- 
+
    values = hypre_CTAlloc(HYPRE_Real,  2, HYPRE_MEMORY_HOST);
 
    values[0] = 26.0;
    if (nx == 1 || ny == 1 || nz == 1)
+   {
       values[0] = 8.0;
-   if (nx*ny == 1 || nx*nz == 1 || ny*nz == 1)
+   }
+   if (nx * ny == 1 || nx * nz == 1 || ny * nz == 1)
+   {
       values[0] = 2.0;
+   }
    values[1] = -1.;
 
    A = (HYPRE_ParCSRMatrix) GenerateLaplacian27pt(hypre_MPI_COMM_WORLD,
@@ -5310,7 +5554,7 @@ BuildParLaplacian27pt( HYPRE_Int                  argc,
 
 
 /*----------------------------------------------------------------------
- * Build 7-point in 2D 
+ * Build 7-point in 2D
  * Parameters given in command line.
  *----------------------------------------------------------------------*/
 
@@ -5367,12 +5611,12 @@ BuildParRotate7pt( HYPRE_Int                  argc,
       else if ( strcmp(argv[arg_index], "-alpha") == 0 )
       {
          arg_index++;
-         alpha  = atof(argv[arg_index++]);
+         alpha  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-eps") == 0 )
       {
          arg_index++;
-         eps  = atof(argv[arg_index++]);
+         eps  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else
       {
@@ -5384,7 +5628,7 @@ BuildParRotate7pt( HYPRE_Int                  argc,
     * Check a few things
     *-----------------------------------------------------------*/
 
-   if ((P*Q) != num_procs)
+   if ((P * Q) != num_procs)
    {
       hypre_printf("Error: Invalid number of processors or processor topology \n");
       exit(1);
@@ -5397,7 +5641,7 @@ BuildParRotate7pt( HYPRE_Int                  argc,
    if (myid == 0)
    {
       hypre_printf("  Rotate 7pt:\n");
-      hypre_printf("    alpha = %f, eps = %f\n", alpha,eps);
+      hypre_printf("    alpha = %f, eps = %f\n", alpha, eps);
       hypre_printf("    (nx, ny) = (%d, %d)\n", nx, ny);
       hypre_printf("    (Px, Py) = (%d, %d)\n", P,  Q);
    }
@@ -5408,10 +5652,10 @@ BuildParRotate7pt( HYPRE_Int                  argc,
 
    /* compute p,q from P,Q and myid */
    p = myid % P;
-   q = ( myid - p)/P;
+   q = ( myid - p) / P;
 
    /*-----------------------------------------------------------
-    * Generate the matrix 
+    * Generate the matrix
     *-----------------------------------------------------------*/
 
    A = (HYPRE_ParCSRMatrix) GenerateRotate7pt(hypre_MPI_COMM_WORLD,
@@ -5425,7 +5669,7 @@ BuildParRotate7pt( HYPRE_Int                  argc,
 /*----------------------------------------------------------------------
  * Build standard 7-point difference operator using centered differences
  *
- *  eps*(a(x,y,z) ux)x + (b(x,y,z) uy)y + (c(x,y,z) uz)z 
+ *  eps*(a(x,y,z) ux)x + (b(x,y,z) uy)y + (c(x,y,z) uz)z
  *  d(x,y,z) ux + e(x,y,z) uy + f(x,y,z) uz + g(x,y,z) u
  *
  *  functions a,b,c,d,e,f,g need to be defined inside par_vardifconv.c
@@ -5436,7 +5680,7 @@ HYPRE_Int
 BuildParVarDifConv( HYPRE_Int                  argc,
                     char                *argv[],
                     HYPRE_Int                  arg_index,
-                    HYPRE_ParCSRMatrix  *A_ptr    ,
+                    HYPRE_ParCSRMatrix  *A_ptr,
                     HYPRE_ParVector  *rhs_ptr     )
 {
    HYPRE_Int                 nx, ny, nz;
@@ -5490,7 +5734,7 @@ BuildParVarDifConv( HYPRE_Int                  argc,
       else if ( strcmp(argv[arg_index], "-eps") == 0 )
       {
          arg_index++;
-         eps  = atof(argv[arg_index++]);
+         eps  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else
       {
@@ -5502,7 +5746,7 @@ BuildParVarDifConv( HYPRE_Int                  argc,
     * Check a few things
     *-----------------------------------------------------------*/
 
-   if ((P*Q*R) != num_procs)
+   if ((P * Q * R) != num_procs)
    {
       hypre_printf("Error: Invalid number of processors or processor topology \n");
       exit(1);
@@ -5525,8 +5769,8 @@ BuildParVarDifConv( HYPRE_Int                  argc,
 
    /* compute p,q,r from P,Q,R and myid */
    p = myid % P;
-   q = (( myid - p)/P) % Q;
-   r = ( myid - p - P*q)/( P*Q );
+   q = (( myid - p) / P) % Q;
+   r = ( myid - p - P * q) / ( P * Q );
 
    /*-----------------------------------------------------------
     * Generate the matrix
@@ -5544,39 +5788,40 @@ BuildParVarDifConv( HYPRE_Int                  argc,
 /**************************************************************************/
 
 
-HYPRE_Int SetSysVcoefValues(HYPRE_Int num_fun, HYPRE_Int nx, HYPRE_Int ny, HYPRE_Int nz, HYPRE_Real vcx, 
+HYPRE_Int SetSysVcoefValues(HYPRE_Int num_fun, HYPRE_Int nx, HYPRE_Int ny, HYPRE_Int nz,
+                            HYPRE_Real vcx,
                             HYPRE_Real vcy, HYPRE_Real vcz, HYPRE_Int mtx_entry, HYPRE_Real *values)
 {
 
 
-   HYPRE_Int sz = num_fun*num_fun;
+   HYPRE_Int sz = num_fun * num_fun;
 
-   values[1*sz + mtx_entry] = -vcx;
-   values[2*sz + mtx_entry] = -vcy;
-   values[3*sz + mtx_entry] = -vcz;
-   values[0*sz + mtx_entry] = 0.0;
+   values[1 * sz + mtx_entry] = -vcx;
+   values[2 * sz + mtx_entry] = -vcy;
+   values[3 * sz + mtx_entry] = -vcz;
+   values[0 * sz + mtx_entry] = 0.0;
 
    if (nx > 1)
    {
-      values[0*sz + mtx_entry] += 2.0*vcx;
+      values[0 * sz + mtx_entry] += 2.0 * vcx;
    }
    if (ny > 1)
    {
-      values[0*sz + mtx_entry] += 2.0*vcy;
+      values[0 * sz + mtx_entry] += 2.0 * vcy;
    }
    if (nz > 1)
    {
-      values[0*sz + mtx_entry] += 2.0*vcz;
+      values[0 * sz + mtx_entry] += 2.0 * vcz;
    }
 
    return 0;
-   
+
 }
-                                                                                
+
 /*----------------------------------------------------------------------
  * Build coordinates for 1D/2D/3D
  *----------------------------------------------------------------------*/
-                                                                                
+
 HYPRE_Int
 BuildParCoordinates( HYPRE_Int                  argc,
                      char                *argv[],
@@ -5586,32 +5831,32 @@ BuildParCoordinates( HYPRE_Int                  argc,
 {
    HYPRE_Int                 nx, ny, nz;
    HYPRE_Int                 P, Q, R;
-                                                                                
+
    HYPRE_Int                 num_procs, myid;
    HYPRE_Int                 p, q, r;
-                                                                                
+
    HYPRE_Int                 coorddim;
    float               *coordinates;
-                                                                                
+
    /*-----------------------------------------------------------
     * Initialize some stuff
     *-----------------------------------------------------------*/
-                                                                                
+
    hypre_MPI_Comm_size(hypre_MPI_COMM_WORLD, &num_procs );
    hypre_MPI_Comm_rank(hypre_MPI_COMM_WORLD, &myid );
-                                                                                
+
    /*-----------------------------------------------------------
     * Set defaults
     *-----------------------------------------------------------*/
-                                                                                
+
    nx = 10;
    ny = 10;
    nz = 10;
-                                                                                
+
    P  = 1;
    Q  = num_procs;
    R  = 1;
-                                                                                
+
    /*-----------------------------------------------------------
     * Parse command line
     *-----------------------------------------------------------*/
@@ -5637,31 +5882,32 @@ BuildParCoordinates( HYPRE_Int                  argc,
          arg_index++;
       }
    }
-                                                                                
+
    /* compute p,q,r from P,Q,R and myid */
    p = myid % P;
-   q = (( myid - p)/P) % Q;
-   r = ( myid - p - P*q)/( P*Q );
-                                                                                
+   q = (( myid - p) / P) % Q;
+   r = ( myid - p - P * q) / ( P * Q );
+
    /*-----------------------------------------------------------
     * Generate the coordinates
     *-----------------------------------------------------------*/
-                                                                                
+
    coorddim = 3;
-   if (nx<2) coorddim--;
-   if (ny<2) coorddim--;
-   if (nz<2) coorddim--;
-                                                                                
-   if (coorddim>0)
-      coordinates = GenerateCoordinates (hypre_MPI_COMM_WORLD,
-                                         nx, ny, nz, P, Q, R, p, q, r, coorddim);
+   if (nx < 2) { coorddim--; }
+   if (ny < 2) { coorddim--; }
+   if (nz < 2) { coorddim--; }
+
+   if (coorddim > 0)
+   {
+      coordinates = hypre_GenerateCoordinates(hypre_MPI_COMM_WORLD,
+                                              nx, ny, nz, P, Q, R, p, q, r, coorddim);
+   }
    else
-      coordinates=NULL;
-                                                                                
+   {
+      coordinates = NULL;
+   }
+
    *coorddim_ptr = coorddim;
    *coord_ptr = coordinates;
    return (0);
 }
-
-
-
diff --git a/external/hypre/src/test/runcheck.sh b/external/hypre/src/test/runcheck.sh
old mode 100644
new mode 100755
index f8ef362b..e08a2cc4
--- a/external/hypre/src/test/runcheck.sh
+++ b/external/hypre/src/test/runcheck.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/runtest.sh b/external/hypre/src/test/runtest.sh
old mode 100644
new mode 100755
index 31efb61d..37a3d393
--- a/external/hypre/src/test/runtest.sh
+++ b/external/hypre/src/test/runtest.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -19,10 +19,13 @@ TestDirNames=""            # string of names of TEST_* directories used
 HOST=`hostname`
 NumThreads=0               # number of OpenMP threads to use if > 0
 Valgrind=""                # string to add to MpirunString when using valgrind
+cudamemcheck=""            # string to add to MpirunString when using cudamemcheck
 mpibind=""                 # string to add to MpirunString when using mpibind
+script=""                  # string to add to MpirunString when using script
 SaveExt="saved"            # saved file extension
 RTOL=0
 ATOL=0
+RTOL_PERF=0.15
 
 function usage
 {
@@ -40,7 +43,9 @@ function usage
    printf "    -atol <tol>    use absolute tolerance 'tol' to compare numeric test values\n"
    printf "    -save <ext>    use '<test>.saved.<ext> for the saved-file extension\n"
    printf "    -valgrind      use valgrind memory checker\n"
+   printf "    -cudamemcheck  use CUDA memory checker\n"
    printf "    -mpibind       use mpibind\n"
+   printf "    -script <sh>   use a script before the command\n"
    printf "    -n|-norun      turn off execute mode, echo what would be run\n"
    printf "    -t|-trace      echo each command\n"
    printf "    -D <var>       define <var> when running tests\n"
@@ -69,6 +74,8 @@ function usage
 # generate default command based on the first 4 characters of the platform name
 function MpirunString
 {
+   NumArgs1=$#
+
    case $HOST in
       *bgl*)
          BatchMode=1
@@ -94,40 +101,38 @@ function MpirunString
          # RunString="${RunString} -nodes $POE_NUM_NODES $MY_ARGS"
          RunString="poe $MY_ARGS -rmpool pdebug -procs $POE_NUM_PROCS -nodes $POE_NUM_NODES"
          ;;
-      rztopaz*|aztec*|cab*|quartz*|sierra*|syrah*|vulcan*)
+      rzhound*|aztec*|cab*|quartz*|sierra*|syrah*|vulcan*)
          shift
          if [ $NumThreads -gt 0 ] ; then
             export OMP_NUM_THREADS=$NumThreads
-            RunString="srun -p pdebug -c $NumThreads -n$*"
+            RunString="srun -p pdebug -c $NumThreads -n$1"
          else
-            RunString="srun -p pdebug -n$*"
+            RunString="srun -p pdebug -n$1"
          fi
          ;;
       surface*)
          shift
-         RunString="srun -n$*"
+         RunString="srun -n$1"
          ;;
       pascal*)
          shift
-         RunString="srun -n$*"
+         RunString="srun -n$1"
          ;;
       rzansel*)
          shift
-         RunString="lrun -T$*"
+         RunString="lrun -T$1"
          ;;
-      ray*)
+      lassen*)
          shift
-         #RunString="mpirun -n $*"
-         RunString="lrun -n$*"
+         RunString="lrun -n$1"
          ;;
-      lassen*)
+      tioga*)
          shift
-         #RunString="mpirun -n $*"
-         RunString="lrun -n$*"
+         RunString="srun -n$1"
          ;;
-      redwood*)
+      node*)
          shift
-         RunString="srun -n$*"
+         RunString="srun -n$1"
          ;;
       *)
          shift
@@ -135,10 +140,15 @@ function MpirunString
             export OMP_NUM_THREADS=$NumThreads
          fi
          RunString="$RunPrefix $1"
-         shift
-         RunString="$RunString $mpibind $Valgrind $*"
          ;;
    esac
+
+   NumArgs2=$(($#+1))
+   if [ "$NumArgs1" -eq "$NumArgs2" ] ; then
+      shift
+      RunString="$RunString $script $mpibind $cudamemcheck $Valgrind $*"
+      #echo $RunString
+   fi
 }
 
 # determine the "number of nodes" desired by dividing the "number of processes"
@@ -306,8 +316,8 @@ function ExecuteJobs
             ;;
 
          *mpirun*)
-            RunCmd=`echo $InputLine| sed -e 's/^[ \t]*mpirun[ \t]*//'` # remove 'mpirun'
-            RunCmd=`echo $RunCmd | sed -e 's/[ \t]*>.*$//'`            # remove output redirect
+            RunCmd=`echo $InputLine| sed -e 's/^[[:space:]]*mpirun[[:space:]]*//'` # remove 'mpirun'
+            RunCmd=`echo $RunCmd | sed -e 's/[[:space:]]*>.*$//'`            # remove output redirect
             OutFile=`echo $InputLine | sed -e 's/^.*>//'`           # set output file
             OutFile=`echo $OutFile | sed -e 's/ //g'`               # remove extra space
             ErrFile=`echo $OutFile | sed -e 's/\.out\./.err./'`  # set error file
@@ -405,6 +415,14 @@ function ExecuteTest
          # diff -U3 -bI"time" ${TestName}.saved ${TestName}.out   # old way of diffing
          (../runcheck.sh $TestName.out $SaveName $RTOL $ATOL >> $TestName.err 2>&1)
       fi
+      # check performance
+      PerfTestName=$TestName.perf.out
+      PerfSaveName=$TestName.perf.$SaveExt
+      if [ -f $PerfTestName ]; then
+         if [ -f $PerfSaveName ]; then
+            (../runcheck.sh $PerfTestName $PerfSaveName $RTOL_PERF >> $TestName.err 2>&1)
+         fi
+      fi
    fi
    cd $SavePWD
 }
@@ -504,12 +522,21 @@ do
          ;;
       -valgrind)
          shift
-         Valgrind="valgrind -q --suppressions=`pwd`/runtest.valgrind --leak-check=yes --track-origins=yes"
+         Valgrind="valgrind -q --suppressions=`pwd`/runtest.valgrind --track-origins=yes --leak-check=full --show-leak-kinds=all"
+         ;;
+      -cudamemcheck)
+         shift
+         cudamemcheck="cuda-memcheck --leak-check full"
          ;;
       -mpibind)
          shift
          mpibind="mpibind"
          ;;
+      -script)
+         shift
+         script=$1
+         shift
+         ;;
       -n|-norun)
          NoRun=1
          RunEcho="echo"
@@ -579,7 +606,10 @@ CleanUp $TestDirNames $ExecFileNames
 
 # Filter misleading error messages
 cat > runtest.filters <<EOF
+PMIX ERROR: PMIX_ERR_NOT_FOUND in file dstore_base.c at line 1567
+PMIX ERROR: PMIX_ERROR in file dstore_base.c at line 2334
 lrun warning: default mapping forced to idle
+srun: Warning: can't run 1 processes on 2 nodes, setting nnodes to 1
 hypre_MPI_Init
 job [0-9]* queued and waiting for resources
 job [0-9]* has been allocated resources
diff --git a/external/hypre/src/test/sstruct.c b/external/hypre/src/test/sstruct.c
index d327f709..a0346e15 100644
--- a/external/hypre/src/test/sstruct.c
+++ b/external/hypre/src/test/sstruct.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -191,6 +191,8 @@ typedef struct
    ProblemPartData *pdata;
    HYPRE_Int        max_boxsize;
 
+   HYPRE_MemoryLocation memory_location;
+
    /* for GridSetNumGhost */
    HYPRE_Int       *numghost;
 
@@ -254,7 +256,7 @@ GetVariableBox( Index  cell_ilower,
    var_iupper[1] = cell_iupper[1];
    var_iupper[2] = cell_iupper[2];
 
-   switch(vartype)
+   switch (vartype)
    {
       case HYPRE_SSTRUCT_VARIABLE_CELL:
          var_ilower[0] -= 0; var_ilower[1] -= 0; var_ilower[2] -= 0;
@@ -321,7 +323,7 @@ SScanDblArray( char   *sdata_ptr,
    sdata_ptr += strspn(sdata_ptr, " \t\n[");
    for (i = 0; i < size; i++)
    {
-      array[i] = strtod(sdata_ptr, &sdata_ptr);
+      array[i] = (HYPRE_Real)strtod(sdata_ptr, &sdata_ptr);
    }
    sdata_ptr += strcspn(sdata_ptr, "]") + 1;
 
@@ -384,7 +386,7 @@ SScanProblemIndex( char          *sdata_ptr,
       /* pre-shift the index */
       for (i = 0; i < ndim; i++)
       {
-         index[i] += index[i+6];
+         index[i] += index[i + 6];
       }
    }
    sdata_ptr += strcspn(sdata_ptr, ")") + 1;
@@ -393,7 +395,7 @@ SScanProblemIndex( char          *sdata_ptr,
    {
       if (sign[i] == '+')
       {
-         index[i+3] = 1;
+         index[i + 3] = 1;
       }
    }
 
@@ -420,9 +422,10 @@ ReadData( char         *filename,
    HYPRE_Int          maxline  = 250;
 
    char               key[250];
-
    HYPRE_Int          part, var, s, entry, i, j, k, il, iu;
 
+   HYPRE_MemoryLocation memory_location = data_ptr -> memory_location;
+
    /*-----------------------------------------------------------
     * Read data file from process 0, then broadcast
     *-----------------------------------------------------------*/
@@ -442,7 +445,7 @@ ReadData( char         *filename,
       sdata = hypre_TAlloc(char,  memchunk, HYPRE_MEMORY_HOST);
       sdata_line = fgets(sdata, maxline, file);
 
-      s= 0;
+      s = 0;
       while (sdata_line != NULL)
       {
          sdata_size += strlen(sdata_line) + 1;
@@ -451,12 +454,15 @@ ReadData( char         *filename,
          if ((sdata_size + maxline) > s)
          {
             sdata = hypre_TReAlloc(sdata,  char,  (sdata_size + memchunk), HYPRE_MEMORY_HOST);
-            s= sdata_size + memchunk;
+            s = sdata_size + memchunk;
          }
 
          /* read the next input line */
          sdata_line = fgets((sdata + sdata_size), maxline, file);
       }
+
+      /* Close file handle */
+      fclose(file);
    }
    /* broadcast the data size */
    hypre_MPI_Bcast(&sdata_size, 1, HYPRE_MPI_INT, 0, hypre_MPI_COMM_WORLD);
@@ -469,6 +475,7 @@ ReadData( char         *filename,
     * Parse the data and fill ProblemData structure
     *-----------------------------------------------------------*/
 
+   data.memory_location = memory_location;
    data.max_boxsize = 0;
    data.numghost = NULL;
    data.nstencils = 0;
@@ -505,8 +512,8 @@ ReadData( char         *filename,
          {
             // # GridSetNumGhost: numghost[2*ndim]
             // GridSetNumGhost: [3 3 3 3]
-            data.numghost = hypre_CTAlloc(HYPRE_Int,  2*data.ndim, HYPRE_MEMORY_HOST);
-            SScanIntArray(sdata_ptr, &sdata_ptr, 2*data.ndim, data.numghost);
+            data.numghost = hypre_CTAlloc(HYPRE_Int,  2 * data.ndim, HYPRE_MEMORY_HOST);
+            SScanIntArray(sdata_ptr, &sdata_ptr, 2 * data.ndim, data.numghost);
          }
          else if ( strcmp(key, "GridSetExtents:") == 0 )
          {
@@ -531,8 +538,8 @@ ReadData( char         *filename,
             iu = 1;
             for (i = 0; i < data.ndim; i++)
             {
-               il *= pdata.ilowers[pdata.nboxes][i+3];
-               iu *= pdata.iuppers[pdata.nboxes][i+3];
+               il *= pdata.ilowers[pdata.nboxes][i + 3];
+               iu *= pdata.iuppers[pdata.nboxes][i + 3];
             }
             if ( (il != 0) || (iu != 1) )
             {
@@ -696,7 +703,7 @@ ReadData( char         *filename,
                data.stencil_offsets[s][entry][i] = 0;
             }
             data.stencil_vars[s][entry] = strtol(sdata_ptr, &sdata_ptr, 10);
-            data.stencil_values[s][entry] = strtod(sdata_ptr, &sdata_ptr);
+            data.stencil_values[s][entry] = (HYPRE_Real)strtod(sdata_ptr, &sdata_ptr);
          }
          else if ( strcmp(key, "RhsSet:") == 0 )
          {
@@ -704,7 +711,7 @@ ReadData( char         *filename,
             {
                data.rhs_true = 1;
             }
-            data.rhs_value = strtod(sdata_ptr, &sdata_ptr);
+            data.rhs_value = (HYPRE_Real)strtod(sdata_ptr, &sdata_ptr);
          }
          else if ( strcmp(key, "FEMStencilCreate:") == 0 )
          {
@@ -741,7 +748,7 @@ ReadData( char         *filename,
             {
                data.fem_rhs_true = 1;
                data.fem_rhs_values = hypre_CTAlloc(HYPRE_Real, data.fem_nvars, HYPRE_MEMORY_HOST);
-               data.d_fem_rhs_values = hypre_CTAlloc(HYPRE_Real, data.fem_nvars, HYPRE_MEMORY_DEVICE);
+               data.d_fem_rhs_values = hypre_CTAlloc(HYPRE_Real, data.fem_nvars, memory_location);
             }
             SScanDblArray(sdata_ptr, &sdata_ptr,
                           data.fem_nvars, data.fem_rhs_values);
@@ -794,7 +801,7 @@ ReadData( char         *filename,
                   hypre_TReAlloc(pdata.graph_values,  HYPRE_Real,  size, HYPRE_MEMORY_HOST);
                pdata.d_graph_values =
                   hypre_TReAlloc_v2(pdata.d_graph_values, HYPRE_Real, pdata.graph_values_size,
-                                    HYPRE_Real, size, HYPRE_MEMORY_DEVICE);
+                                    HYPRE_Real, size, memory_location);
                pdata.graph_values_size = size;
                pdata.graph_boxsizes =
                   hypre_TReAlloc(pdata.graph_boxsizes,  HYPRE_Int,  size, HYPRE_MEMORY_HOST);
@@ -843,7 +850,7 @@ ReadData( char         *filename,
             pdata.graph_entries[pdata.graph_nboxes] =
                strtol(sdata_ptr, &sdata_ptr, 10);
             pdata.graph_values[pdata.graph_nboxes] =
-               strtod(sdata_ptr, &sdata_ptr);
+               (HYPRE_Real)strtod(sdata_ptr, &sdata_ptr);
             pdata.graph_boxsizes[pdata.graph_nboxes] = 1;
             for (i = 0; i < 3; i++)
             {
@@ -917,7 +924,7 @@ ReadData( char         *filename,
             pdata.matset_entries[pdata.matset_nboxes] =
                strtol(sdata_ptr, &sdata_ptr, 10);
             pdata.matset_values[pdata.matset_nboxes] =
-               strtod(sdata_ptr, &sdata_ptr);
+               (HYPRE_Real)strtod(sdata_ptr, &sdata_ptr);
             pdata.matset_nboxes++;
             data.pdata[part] = pdata;
          }
@@ -925,30 +932,30 @@ ReadData( char         *filename,
          {
             part = strtol(sdata_ptr, &sdata_ptr, 10);
             pdata = data.pdata[part];
-            if ((pdata.matadd_nboxes% 10) == 0)
+            if ((pdata.matadd_nboxes % 10) == 0)
             {
-               size = pdata.matadd_nboxes+10;
-               pdata.matadd_ilowers=
+               size = pdata.matadd_nboxes + 10;
+               pdata.matadd_ilowers =
                   hypre_TReAlloc(pdata.matadd_ilowers,  ProblemIndex,  size, HYPRE_MEMORY_HOST);
-               pdata.matadd_iuppers=
+               pdata.matadd_iuppers =
                   hypre_TReAlloc(pdata.matadd_iuppers,  ProblemIndex,  size, HYPRE_MEMORY_HOST);
-               pdata.matadd_vars=
+               pdata.matadd_vars =
                   hypre_TReAlloc(pdata.matadd_vars,  HYPRE_Int,  size, HYPRE_MEMORY_HOST);
-               pdata.matadd_nentries=
+               pdata.matadd_nentries =
                   hypre_TReAlloc(pdata.matadd_nentries,  HYPRE_Int,  size, HYPRE_MEMORY_HOST);
-               pdata.matadd_entries=
+               pdata.matadd_entries =
                   hypre_TReAlloc(pdata.matadd_entries,  HYPRE_Int *,  size, HYPRE_MEMORY_HOST);
-               pdata.matadd_values=
+               pdata.matadd_values =
                   hypre_TReAlloc(pdata.matadd_values,  HYPRE_Real *,  size, HYPRE_MEMORY_HOST);
             }
             SScanProblemIndex(sdata_ptr, &sdata_ptr, data.ndim,
                               pdata.matadd_ilowers[pdata.matadd_nboxes]);
             SScanProblemIndex(sdata_ptr, &sdata_ptr, data.ndim,
                               pdata.matadd_iuppers[pdata.matadd_nboxes]);
-            pdata.matadd_vars[pdata.matadd_nboxes]=
+            pdata.matadd_vars[pdata.matadd_nboxes] =
                strtol(sdata_ptr, &sdata_ptr, 10);
-            i= strtol(sdata_ptr, &sdata_ptr, 10);
-            pdata.matadd_nentries[pdata.matadd_nboxes]= i;
+            i = strtol(sdata_ptr, &sdata_ptr, 10);
+            pdata.matadd_nentries[pdata.matadd_nboxes] = i;
             pdata.matadd_entries[pdata.matadd_nboxes] =
                hypre_TAlloc(HYPRE_Int,  i, HYPRE_MEMORY_HOST);
             SScanIntArray(sdata_ptr, &sdata_ptr, i,
@@ -964,41 +971,41 @@ ReadData( char         *filename,
          {
             part = strtol(sdata_ptr, &sdata_ptr, 10);
             pdata = data.pdata[part];
-            if ((pdata.fem_matadd_nboxes% 10) == 0)
+            if ((pdata.fem_matadd_nboxes % 10) == 0)
             {
-               size = pdata.fem_matadd_nboxes+10;
-               pdata.fem_matadd_ilowers=
+               size = pdata.fem_matadd_nboxes + 10;
+               pdata.fem_matadd_ilowers =
                   hypre_TReAlloc(pdata.fem_matadd_ilowers,  ProblemIndex,  size, HYPRE_MEMORY_HOST);
-               pdata.fem_matadd_iuppers=
+               pdata.fem_matadd_iuppers =
                   hypre_TReAlloc(pdata.fem_matadd_iuppers,  ProblemIndex,  size, HYPRE_MEMORY_HOST);
-               pdata.fem_matadd_nrows=
+               pdata.fem_matadd_nrows =
                   hypre_TReAlloc(pdata.fem_matadd_nrows,  HYPRE_Int,  size, HYPRE_MEMORY_HOST);
-               pdata.fem_matadd_rows=
+               pdata.fem_matadd_rows =
                   hypre_TReAlloc(pdata.fem_matadd_rows,  HYPRE_Int *,  size, HYPRE_MEMORY_HOST);
-               pdata.fem_matadd_ncols=
+               pdata.fem_matadd_ncols =
                   hypre_TReAlloc(pdata.fem_matadd_ncols,  HYPRE_Int,  size, HYPRE_MEMORY_HOST);
-               pdata.fem_matadd_cols=
+               pdata.fem_matadd_cols =
                   hypre_TReAlloc(pdata.fem_matadd_cols,  HYPRE_Int *,  size, HYPRE_MEMORY_HOST);
-               pdata.fem_matadd_values=
+               pdata.fem_matadd_values =
                   hypre_TReAlloc(pdata.fem_matadd_values,  HYPRE_Real *,  size, HYPRE_MEMORY_HOST);
             }
             SScanProblemIndex(sdata_ptr, &sdata_ptr, data.ndim,
                               pdata.fem_matadd_ilowers[pdata.fem_matadd_nboxes]);
             SScanProblemIndex(sdata_ptr, &sdata_ptr, data.ndim,
                               pdata.fem_matadd_iuppers[pdata.fem_matadd_nboxes]);
-            i= strtol(sdata_ptr, &sdata_ptr, 10);
-            pdata.fem_matadd_nrows[pdata.fem_matadd_nboxes]= i;
+            i = strtol(sdata_ptr, &sdata_ptr, 10);
+            pdata.fem_matadd_nrows[pdata.fem_matadd_nboxes] = i;
             pdata.fem_matadd_rows[pdata.fem_matadd_nboxes] = hypre_TAlloc(HYPRE_Int,  i, HYPRE_MEMORY_HOST);
             SScanIntArray(sdata_ptr, &sdata_ptr, i,
                           (HYPRE_Int*) pdata.fem_matadd_rows[pdata.fem_matadd_nboxes]);
-            j= strtol(sdata_ptr, &sdata_ptr, 10);
-            pdata.fem_matadd_ncols[pdata.fem_matadd_nboxes]= j;
+            j = strtol(sdata_ptr, &sdata_ptr, 10);
+            pdata.fem_matadd_ncols[pdata.fem_matadd_nboxes] = j;
             pdata.fem_matadd_cols[pdata.fem_matadd_nboxes] = hypre_TAlloc(HYPRE_Int,  j, HYPRE_MEMORY_HOST);
             SScanIntArray(sdata_ptr, &sdata_ptr, j,
                           (HYPRE_Int*) pdata.fem_matadd_cols[pdata.fem_matadd_nboxes]);
             pdata.fem_matadd_values[pdata.fem_matadd_nboxes] =
-               hypre_TAlloc(HYPRE_Real,  i*j, HYPRE_MEMORY_HOST);
-            SScanDblArray(sdata_ptr, &sdata_ptr, i*j,
+               hypre_TAlloc(HYPRE_Real,  i * j, HYPRE_MEMORY_HOST);
+            SScanDblArray(sdata_ptr, &sdata_ptr, i * j,
                           (HYPRE_Real *) pdata.fem_matadd_values[pdata.fem_matadd_nboxes]);
             pdata.fem_matadd_nboxes++;
             data.pdata[part] = pdata;
@@ -1007,26 +1014,26 @@ ReadData( char         *filename,
          {
             part = strtol(sdata_ptr, &sdata_ptr, 10);
             pdata = data.pdata[part];
-            if ((pdata.rhsadd_nboxes% 10) == 0)
+            if ((pdata.rhsadd_nboxes % 10) == 0)
             {
-               size = pdata.rhsadd_nboxes+10;
-               pdata.rhsadd_ilowers=
+               size = pdata.rhsadd_nboxes + 10;
+               pdata.rhsadd_ilowers =
                   hypre_TReAlloc(pdata.rhsadd_ilowers,  ProblemIndex,  size, HYPRE_MEMORY_HOST);
-               pdata.rhsadd_iuppers=
+               pdata.rhsadd_iuppers =
                   hypre_TReAlloc(pdata.rhsadd_iuppers,  ProblemIndex,  size, HYPRE_MEMORY_HOST);
-               pdata.rhsadd_vars=
+               pdata.rhsadd_vars =
                   hypre_TReAlloc(pdata.rhsadd_vars,  HYPRE_Int,  size, HYPRE_MEMORY_HOST);
-               pdata.rhsadd_values=
+               pdata.rhsadd_values =
                   hypre_TReAlloc(pdata.rhsadd_values,  HYPRE_Real,  size, HYPRE_MEMORY_HOST);
             }
             SScanProblemIndex(sdata_ptr, &sdata_ptr, data.ndim,
                               pdata.rhsadd_ilowers[pdata.rhsadd_nboxes]);
             SScanProblemIndex(sdata_ptr, &sdata_ptr, data.ndim,
                               pdata.rhsadd_iuppers[pdata.rhsadd_nboxes]);
-            pdata.rhsadd_vars[pdata.rhsadd_nboxes]=
+            pdata.rhsadd_vars[pdata.rhsadd_nboxes] =
                strtol(sdata_ptr, &sdata_ptr, 10);
             pdata.rhsadd_values[pdata.rhsadd_nboxes] =
-               strtod(sdata_ptr, &sdata_ptr);
+               (HYPRE_Real)strtod(sdata_ptr, &sdata_ptr);
             pdata.rhsadd_nboxes++;
             data.pdata[part] = pdata;
          }
@@ -1034,14 +1041,14 @@ ReadData( char         *filename,
          {
             part = strtol(sdata_ptr, &sdata_ptr, 10);
             pdata = data.pdata[part];
-            if ((pdata.fem_rhsadd_nboxes% 10) == 0)
+            if ((pdata.fem_rhsadd_nboxes % 10) == 0)
             {
-               size = pdata.fem_rhsadd_nboxes+10;
-               pdata.fem_rhsadd_ilowers=
+               size = pdata.fem_rhsadd_nboxes + 10;
+               pdata.fem_rhsadd_ilowers =
                   hypre_TReAlloc(pdata.fem_rhsadd_ilowers,  ProblemIndex,  size, HYPRE_MEMORY_HOST);
-               pdata.fem_rhsadd_iuppers=
+               pdata.fem_rhsadd_iuppers =
                   hypre_TReAlloc(pdata.fem_rhsadd_iuppers,  ProblemIndex,  size, HYPRE_MEMORY_HOST);
-               pdata.fem_rhsadd_values=
+               pdata.fem_rhsadd_values =
                   hypre_TReAlloc(pdata.fem_rhsadd_values,  HYPRE_Real *,  size, HYPRE_MEMORY_HOST);
             }
             SScanProblemIndex(sdata_ptr, &sdata_ptr, data.ndim,
@@ -1058,10 +1065,10 @@ ReadData( char         *filename,
          else if ( strcmp(key, "ProcessPoolCreate:") == 0 )
          {
             data.ndists++;
-            data.dist_npools= hypre_TReAlloc(data.dist_npools,  HYPRE_Int,  data.ndists, HYPRE_MEMORY_HOST);
-            data.dist_pools= hypre_TReAlloc(data.dist_pools,  HYPRE_Int *,  data.ndists, HYPRE_MEMORY_HOST);
-            data.dist_npools[data.ndists-1] = strtol(sdata_ptr, &sdata_ptr, 10);
-            data.dist_pools[data.ndists-1] = hypre_CTAlloc(HYPRE_Int,  data.nparts, HYPRE_MEMORY_HOST);
+            data.dist_npools = hypre_TReAlloc(data.dist_npools,  HYPRE_Int,  data.ndists, HYPRE_MEMORY_HOST);
+            data.dist_pools = hypre_TReAlloc(data.dist_pools,  HYPRE_Int *,  data.ndists, HYPRE_MEMORY_HOST);
+            data.dist_npools[data.ndists - 1] = strtol(sdata_ptr, &sdata_ptr, 10);
+            data.dist_pools[data.ndists - 1] = hypre_CTAlloc(HYPRE_Int,  data.nparts, HYPRE_MEMORY_HOST);
 #if 0
             data.npools = strtol(sdata_ptr, &sdata_ptr, 10);
             data.pools = hypre_CTAlloc(HYPRE_Int,  data.nparts, HYPRE_MEMORY_HOST);
@@ -1071,7 +1078,7 @@ ReadData( char         *filename,
          {
             i = strtol(sdata_ptr, &sdata_ptr, 10);
             part = strtol(sdata_ptr, &sdata_ptr, 10);
-            data.dist_pools[data.ndists-1][part] = i;
+            data.dist_pools[data.ndists - 1][part] = i;
          }
          else if ( strcmp(key, "GridSetNeighborBox:") == 0 )
          {
@@ -1095,27 +1102,28 @@ ReadData( char         *filename,
       HYPRE_Int d;
 
       data.fem_ivalues_full = hypre_CTAlloc(HYPRE_Int *, data.fem_nvars, HYPRE_MEMORY_HOST);
-      data.fem_ordering = hypre_CTAlloc(HYPRE_Int, (1+data.ndim)*data.fem_nvars, HYPRE_MEMORY_HOST);
-      data.fem_sparsity = hypre_CTAlloc(HYPRE_Int, 2*data.fem_nvars*data.fem_nvars, HYPRE_MEMORY_HOST);
-      data.fem_values   = hypre_CTAlloc(HYPRE_Real, data.fem_nvars*data.fem_nvars, HYPRE_MEMORY_HOST);
-      data.d_fem_values = hypre_TAlloc(HYPRE_Real, data.fem_nvars*data.fem_nvars, HYPRE_MEMORY_DEVICE);
+      data.fem_ordering = hypre_CTAlloc(HYPRE_Int, (1 + data.ndim) * data.fem_nvars, HYPRE_MEMORY_HOST);
+      data.fem_sparsity = hypre_CTAlloc(HYPRE_Int, 2 * data.fem_nvars * data.fem_nvars,
+                                        HYPRE_MEMORY_HOST);
+      data.fem_values   = hypre_CTAlloc(HYPRE_Real, data.fem_nvars * data.fem_nvars, HYPRE_MEMORY_HOST);
+      data.d_fem_values = hypre_TAlloc(HYPRE_Real, data.fem_nvars * data.fem_nvars, memory_location);
 
       for (i = 0; i < data.fem_nvars; i++)
       {
          data.fem_ivalues_full[i] = hypre_CTAlloc(HYPRE_Int,  data.fem_nvars, HYPRE_MEMORY_HOST);
-         k = (1+data.ndim)*i;
+         k = (1 + data.ndim) * i;
          data.fem_ordering[k] = data.fem_vars[i];
          for (d = 0; d < data.ndim; d++)
          {
-            data.fem_ordering[k+1+d] = data.fem_offsets[i][d];
+            data.fem_ordering[k + 1 + d] = data.fem_offsets[i][d];
          }
          for (j = 0; j < data.fem_nvars; j++)
          {
             if (data.fem_values_full[i][j] != 0.0)
             {
-               k = 2*data.fem_nsparse;
+               k = 2 * data.fem_nsparse;
                data.fem_sparsity[k]   = i;
-               data.fem_sparsity[k+1] = j;
+               data.fem_sparsity[k + 1] = j;
                data.fem_values[data.fem_nsparse] = data.fem_values_full[i][j];
                data.fem_ivalues_full[i][j] = data.fem_nsparse;
                data.fem_nsparse ++;
@@ -1143,9 +1151,9 @@ MapProblemIndex( ProblemIndex index,
    index[1] -= index[7];
    index[2] -= index[8];
    /* map the index */
-   index[0] = m[0]*index[0] + (m[0]-1)*index[3];
-   index[1] = m[1]*index[1] + (m[1]-1)*index[4];
-   index[2] = m[2]*index[2] + (m[2]-1)*index[5];
+   index[0] = m[0] * index[0] + (m[0] - 1) * index[3];
+   index[1] = m[1] * index[1] + (m[1] - 1) * index[4];
+   index[2] = m[2] * index[2] + (m[2] - 1) * index[5];
    /* pre-shift the new mapped index */
    index[0] += index[6];
    index[1] += index[7];
@@ -1185,6 +1193,7 @@ DistributeData( ProblemData   global_data,
                 HYPRE_Int     myid,
                 ProblemData  *data_ptr )
 {
+   HYPRE_MemoryLocation memory_location = global_data.memory_location;
    ProblemData      data = global_data;
    ProblemPartData  pdata;
    HYPRE_Int       *pool_procs;
@@ -1201,7 +1210,7 @@ DistributeData( ProblemData   global_data,
    data.pools  = data.dist_pools[pooldist];
 
    /* determine first process number in each pool */
-   pool_procs = hypre_CTAlloc(HYPRE_Int,  (data.npools+1), HYPRE_MEMORY_HOST);
+   pool_procs = hypre_CTAlloc(HYPRE_Int,  (data.npools + 1), HYPRE_MEMORY_HOST);
    for (part = 0; part < data.nparts; part++)
    {
       pool = data.pools[part] + 1;
@@ -1218,7 +1227,7 @@ DistributeData( ProblemData   global_data,
    /* check number of processes */
    if (pool_procs[data.npools] != num_procs)
    {
-      hypre_printf("%d,  %d \n",pool_procs[data.npools],num_procs);
+      hypre_printf("%d,  %d \n", pool_procs[data.npools], num_procs);
       hypre_printf("Error: Invalid number of processes or process topology \n");
       exit(1);
    }
@@ -1319,7 +1328,7 @@ DistributeData( ProblemData   global_data,
          {
             p = pid % m[0];
             q = ((pid - p) / m[0]) % m[1];
-            r = (pid - p - q*m[0]) / (m[0]*m[1]);
+            r = (pid - p - q * m[0]) / (m[0] * m[1]);
 
             for (box = 0; box < pdata.nboxes; box++)
             {
@@ -1333,12 +1342,12 @@ DistributeData( ProblemData   global_data,
                pdata.iuppers[box][1] = pdata.ilowers[box][1] + n[1] - 1;
                pdata.iuppers[box][2] = pdata.ilowers[box][2] + n[2] - 1;
 
-               pdata.ilowers[box][0] = pdata.ilowers[box][0] + p*n[0];
-               pdata.ilowers[box][1] = pdata.ilowers[box][1] + q*n[1];
-               pdata.ilowers[box][2] = pdata.ilowers[box][2] + r*n[2];
-               pdata.iuppers[box][0] = pdata.iuppers[box][0] + p*n[0];
-               pdata.iuppers[box][1] = pdata.iuppers[box][1] + q*n[1];
-               pdata.iuppers[box][2] = pdata.iuppers[box][2] + r*n[2];
+               pdata.ilowers[box][0] = pdata.ilowers[box][0] + p * n[0];
+               pdata.ilowers[box][1] = pdata.ilowers[box][1] + q * n[1];
+               pdata.ilowers[box][2] = pdata.ilowers[box][2] + r * n[2];
+               pdata.iuppers[box][0] = pdata.iuppers[box][0] + p * n[0];
+               pdata.iuppers[box][1] = pdata.iuppers[box][1] + q * n[1];
+               pdata.iuppers[box][2] = pdata.iuppers[box][2] + r * n[2];
             }
 
             i = 0;
@@ -1648,11 +1657,11 @@ DistributeData( ProblemData   global_data,
          if ( (m[0] * m[1] * m[2]) > 1)
          {
             pdata.ilowers = hypre_TReAlloc(pdata.ilowers,  ProblemIndex,
-                                           m[0]*m[1]*m[2]*pdata.nboxes, HYPRE_MEMORY_HOST);
+                                           m[0] * m[1] * m[2] * pdata.nboxes, HYPRE_MEMORY_HOST);
             pdata.iuppers = hypre_TReAlloc(pdata.iuppers,  ProblemIndex,
-                                           m[0]*m[1]*m[2]*pdata.nboxes, HYPRE_MEMORY_HOST);
+                                           m[0] * m[1] * m[2] * pdata.nboxes, HYPRE_MEMORY_HOST);
             pdata.boxsizes = hypre_TReAlloc(pdata.boxsizes,  HYPRE_Int,
-                                            m[0]*m[1]*m[2]*pdata.nboxes, HYPRE_MEMORY_HOST);
+                                            m[0] * m[1] * m[2] * pdata.nboxes, HYPRE_MEMORY_HOST);
             for (box = 0; box < pdata.nboxes; box++)
             {
                n[0] = pdata.iuppers[box][0] - pdata.ilowers[box][0] + 1;
@@ -1673,12 +1682,12 @@ DistributeData( ProblemData   global_data,
                   {
                      for (p = 0; p < m[0]; p++)
                      {
-                        pdata.ilowers[i][0] = pdata.ilowers[box][0] + p*n[0];
-                        pdata.ilowers[i][1] = pdata.ilowers[box][1] + q*n[1];
-                        pdata.ilowers[i][2] = pdata.ilowers[box][2] + r*n[2];
-                        pdata.iuppers[i][0] = pdata.iuppers[box][0] + p*n[0];
-                        pdata.iuppers[i][1] = pdata.iuppers[box][1] + q*n[1];
-                        pdata.iuppers[i][2] = pdata.iuppers[box][2] + r*n[2];
+                        pdata.ilowers[i][0] = pdata.ilowers[box][0] + p * n[0];
+                        pdata.ilowers[i][1] = pdata.ilowers[box][1] + q * n[1];
+                        pdata.ilowers[i][2] = pdata.ilowers[box][2] + r * n[2];
+                        pdata.iuppers[i][0] = pdata.iuppers[box][0] + p * n[0];
+                        pdata.iuppers[i][1] = pdata.iuppers[box][1] + q * n[1];
+                        pdata.iuppers[i][2] = pdata.iuppers[box][2] + r * n[2];
                         for (d = 3; d < 9; d++)
                         {
                            pdata.ilowers[i][d] = pdata.ilowers[box][d];
@@ -1689,7 +1698,7 @@ DistributeData( ProblemData   global_data,
                   }
                }
             }
-            pdata.nboxes *= m[0]*m[1]*m[2];
+            pdata.nboxes *= m[0] * m[1] * m[2];
 
             for (box = 0; box < pdata.graph_nboxes; box++)
             {
@@ -1774,8 +1783,8 @@ DistributeData( ProblemData   global_data,
             size = 1;
             for (i = 0; i < 3; i++)
             {
-               size*= (pdata.matset_iuppers[box][i] -
-                       pdata.matset_ilowers[box][i] + 1);
+               size *= (pdata.matset_iuppers[box][i] -
+                        pdata.matset_ilowers[box][i] + 1);
             }
             pdata.max_boxsize = hypre_max(pdata.max_boxsize, size);
          }
@@ -1784,8 +1793,8 @@ DistributeData( ProblemData   global_data,
             size = 1;
             for (i = 0; i < 3; i++)
             {
-               size*= (pdata.matadd_iuppers[box][i] -
-                       pdata.matadd_ilowers[box][i] + 1);
+               size *= (pdata.matadd_iuppers[box][i] -
+                        pdata.matadd_ilowers[box][i] + 1);
             }
             pdata.max_boxsize = hypre_max(pdata.max_boxsize, size);
          }
@@ -1794,8 +1803,8 @@ DistributeData( ProblemData   global_data,
             size = 1;
             for (i = 0; i < 3; i++)
             {
-               size*= (pdata.fem_matadd_iuppers[box][i] -
-                       pdata.fem_matadd_ilowers[box][i] + 1);
+               size *= (pdata.fem_matadd_iuppers[box][i] -
+                        pdata.fem_matadd_ilowers[box][i] + 1);
             }
             pdata.max_boxsize = hypre_max(pdata.max_boxsize, size);
          }
@@ -1804,8 +1813,8 @@ DistributeData( ProblemData   global_data,
             size = 1;
             for (i = 0; i < 3; i++)
             {
-               size*= (pdata.rhsadd_iuppers[box][i] -
-                       pdata.rhsadd_ilowers[box][i] + 1);
+               size *= (pdata.rhsadd_iuppers[box][i] -
+                        pdata.rhsadd_ilowers[box][i] + 1);
             }
             pdata.max_boxsize = hypre_max(pdata.max_boxsize, size);
          }
@@ -1814,16 +1823,16 @@ DistributeData( ProblemData   global_data,
             size = 1;
             for (i = 0; i < 3; i++)
             {
-               size*= (pdata.fem_rhsadd_iuppers[box][i] -
-                       pdata.fem_rhsadd_ilowers[box][i] + 1);
+               size *= (pdata.fem_rhsadd_iuppers[box][i] -
+                        pdata.fem_rhsadd_ilowers[box][i] + 1);
             }
             pdata.max_boxsize = hypre_max(pdata.max_boxsize, size);
          }
 
          /* refine periodicity */
-         pdata.periodic[0] *= refine[part][0]*block[part][0]*distribute[part][0];
-         pdata.periodic[1] *= refine[part][1]*block[part][1]*distribute[part][1];
-         pdata.periodic[2] *= refine[part][2]*block[part][2]*distribute[part][2];
+         pdata.periodic[0] *= refine[part][0] * block[part][0] * distribute[part][0];
+         pdata.periodic[1] *= refine[part][1] * block[part][1] * distribute[part][1];
+         pdata.periodic[2] *= refine[part][2] * block[part][2] * distribute[part][2];
       }
 
       if (pdata.nboxes == 0)
@@ -1865,7 +1874,7 @@ DistributeData( ProblemData   global_data,
          hypre_TFree(pdata.graph_entries, HYPRE_MEMORY_HOST);
          pdata.graph_values_size = 0;
          hypre_TFree(pdata.graph_values, HYPRE_MEMORY_HOST);
-         hypre_TFree(pdata.d_graph_values, HYPRE_MEMORY_DEVICE);
+         hypre_TFree(pdata.d_graph_values, memory_location);
          hypre_TFree(pdata.graph_boxsizes, HYPRE_MEMORY_HOST);
       }
 
@@ -1938,6 +1947,7 @@ DistributeData( ProblemData   global_data,
 HYPRE_Int
 DestroyData( ProblemData   data )
 {
+   HYPRE_MemoryLocation memory_location = data.memory_location;
    ProblemPartData  pdata;
    HYPRE_Int        part, box, s, i;
 
@@ -1999,7 +2009,7 @@ DestroyData( ProblemData   data )
          hypre_TFree(pdata.graph_entries, HYPRE_MEMORY_HOST);
          pdata.graph_values_size = 0;
          hypre_TFree(pdata.graph_values, HYPRE_MEMORY_HOST);
-         hypre_TFree(pdata.d_graph_values, HYPRE_MEMORY_DEVICE);
+         hypre_TFree(pdata.d_graph_values, memory_location);
          hypre_TFree(pdata.graph_boxsizes, HYPRE_MEMORY_HOST);
       }
 
@@ -2096,13 +2106,13 @@ DestroyData( ProblemData   data )
       hypre_TFree(data.fem_ordering, HYPRE_MEMORY_HOST);
       hypre_TFree(data.fem_sparsity, HYPRE_MEMORY_HOST);
       hypre_TFree(data.fem_values, HYPRE_MEMORY_HOST);
-      hypre_TFree(data.d_fem_values, HYPRE_MEMORY_DEVICE);
+      hypre_TFree(data.d_fem_values, memory_location);
    }
 
    if (data.fem_rhs_true > 0)
    {
       hypre_TFree(data.fem_rhs_values, HYPRE_MEMORY_HOST);
-      hypre_TFree(data.d_fem_rhs_values, HYPRE_MEMORY_DEVICE);
+      hypre_TFree(data.d_fem_rhs_values, memory_location);
    }
 
    if (data.symmetric_num > 0)
@@ -2142,13 +2152,13 @@ SetCosineVector(HYPRE_Real  scale,
       {
          for (i = ilower[0]; i <= iupper[0]; i++)
          {
-            values[count] = scale * cos((i+j+k)/10.0);
+            values[count] = scale * hypre_cos((i + j + k) / 10.0);
             count++;
          }
       }
    }
 
-   return(0);
+   return (0);
 }
 
 /*--------------------------------------------------------------------------
@@ -2167,6 +2177,7 @@ PrintUsage( char *progname,
       hypre_printf("\n");
       hypre_printf("  -in <filename> : input file (default is `%s')\n",
                    infile_default);
+      hypre_printf("  -fromfile <filename> : read SStructMatrix from file\n");
       hypre_printf("\n");
       hypre_printf("  -pt <pt1> <pt2> ... : set part(s) for subsequent options\n");
       hypre_printf("  -pooldist <p>       : pool distribution to use\n");
@@ -2236,6 +2247,13 @@ PrintUsage( char *progname,
       hypre_printf("                        247- Struct BiCGSTAB with 2-step Jacobi\n");
       hypre_printf("                        248- Struct BiCGSTAB with diagonal scaling\n");
       hypre_printf("                        249- Struct BiCGSTAB\n");
+      hypre_printf("  -repeats <r>       : number of times to repeat\n");
+      hypre_printf("  -pout <val>        : print level for the preconditioner\n");
+      hypre_printf("  -sout <val>        : print level for the solver\n");
+      hypre_printf("  -ll <val>          : hypre's log level\n");
+      hypre_printf("                        0 - (default) No messaging.\n");
+      hypre_printf("                        1 - Display memory usage statistics for each MPI rank.\n");
+      hypre_printf("                        2 - Display aggregate memory usage statistics over MPI ranks.\n");
       hypre_printf("  -print             : print out the system\n");
       hypre_printf("  -rhsfromcosine     : solution is cosine function (default)\n");
       hypre_printf("  -rhsone            : rhs is vector with unit components\n");
@@ -2317,27 +2335,39 @@ hypre_int
 main( hypre_int argc,
       char *argv[] )
 {
+   MPI_Comm              comm = hypre_MPI_COMM_WORLD;
+
    char                 *infile;
    ProblemData           global_data;
    ProblemData           data;
    ProblemPartData       pdata;
-   HYPRE_Int             nparts;
+   HYPRE_Int             nparts = 0;
    HYPRE_Int             pooldist;
-   HYPRE_Int            *parts;
-   Index                *refine;
-   Index                *distribute;
-   Index                *block;
+   HYPRE_Int            *parts = NULL;
+   Index                *refine = NULL;
+   Index                *distribute = NULL;
+   Index                *block = NULL;
    HYPRE_Int             solver_id, object_type;
+   HYPRE_Int             repeats, rep;
+   HYPRE_Int             prec_print_level;
+   HYPRE_Int             solver_print_level;
+   HYPRE_Int             log_level;
    HYPRE_Int             print_system;
    HYPRE_Int             cosine;
    HYPRE_Real            scale;
-
-   HYPRE_SStructGrid     grid, G_grid;
-   HYPRE_SStructStencil *stencils, *G_stencils;
-   HYPRE_SStructGraph    graph, G_graph;
-   HYPRE_SStructMatrix   A, G;
-   HYPRE_SStructVector   b;
-   HYPRE_SStructVector   x;
+   HYPRE_Int             read_fromfile_flag = 0;
+   HYPRE_Int             read_fromfile_index[3] = {-1, -1, -1};
+
+   HYPRE_SStructGrid     grid = NULL;
+   HYPRE_SStructGrid     G_grid = NULL;
+   HYPRE_SStructStencil *stencils = NULL;
+   HYPRE_SStructStencil *G_stencils = NULL;
+   HYPRE_SStructGraph    graph = NULL;
+   HYPRE_SStructGraph    G_graph = NULL;
+   HYPRE_SStructMatrix   A = NULL;
+   HYPRE_SStructMatrix   G = NULL;
+   HYPRE_SStructVector   b = NULL;
+   HYPRE_SStructVector   x = NULL;
    HYPRE_SStructSolver   solver;
    HYPRE_SStructSolver   precond;
 
@@ -2356,14 +2386,16 @@ main( hypre_int argc,
    Index                 ilower, iupper;
    Index                 index, to_index;
 
-   HYPRE_Int             values_size;
-   HYPRE_Real           *values;
-   HYPRE_Real           *d_values;
+   HYPRE_Int             values_size = 0;
+   HYPRE_Real           *values = NULL;
+   HYPRE_Real           *d_values = NULL;
 
    HYPRE_Int             num_iterations;
    HYPRE_Real            final_res_norm;
 
    HYPRE_Int             num_procs, myid;
+   HYPRE_Int             device_id = -1;
+   HYPRE_Int             lazy_device_init = 0;
    HYPRE_Int             time_index;
 
    HYPRE_Int             n_pre, n_post;
@@ -2423,11 +2455,26 @@ main( hypre_int argc,
 
    /* end lobpcg */
 
+#if defined(HYPRE_USING_MEMORY_TRACKER)
+   HYPRE_Int print_mem_tracker = 0;
+   char mem_tracker_name[HYPRE_MAX_FILE_NAME_LEN] = {0};
+#endif
+
 #if defined(HYPRE_USING_GPU)
-   HYPRE_Int spgemm_use_cusparse = 0;
+   HYPRE_Int spgemm_use_vendor = 0;
 #endif
-   HYPRE_ExecutionPolicy default_exec_policy = HYPRE_EXEC_DEVICE;
+
+#if defined(HYPRE_TEST_USING_HOST)
+   HYPRE_MemoryLocation memory_location = HYPRE_MEMORY_HOST;
+   HYPRE_ExecutionPolicy default_exec_policy = HYPRE_EXEC_HOST;
+#else
    HYPRE_MemoryLocation memory_location = HYPRE_MEMORY_DEVICE;
+   HYPRE_ExecutionPolicy default_exec_policy = HYPRE_EXEC_DEVICE;
+#endif
+
+   global_data.memory_location = memory_location;
+
+   HYPRE_Int gpu_aware_mpi = 0;
 
    /*-----------------------------------------------------------
     * Initialize some stuff
@@ -2435,19 +2482,72 @@ main( hypre_int argc,
 
    /* Initialize MPI */
    hypre_MPI_Init(&argc, &argv);
-   hypre_MPI_Comm_size(hypre_MPI_COMM_WORLD, &num_procs);
-   hypre_MPI_Comm_rank(hypre_MPI_COMM_WORLD, &myid);
+   hypre_MPI_Comm_size(comm, &num_procs);
+   hypre_MPI_Comm_rank(comm, &myid);
 
    /*-----------------------------------------------------------------
     * GPU Device binding
-    * Must be done before HYPRE_Init() and should not be changed after
+    * Must be done before HYPRE_Initialize() and should not be changed after
     *-----------------------------------------------------------------*/
-   hypre_bind_device(myid, num_procs, hypre_MPI_COMM_WORLD);
+   for (arg_index = 1; arg_index < argc; arg_index ++)
+   {
+      if (strcmp(argv[arg_index], "-lazy_device_init") == 0)
+      {
+         lazy_device_init = atoi(argv[++arg_index]);
+      }
+      else if (strcmp(argv[arg_index], "-device_id") == 0)
+      {
+         device_id = atoi(argv[++arg_index]);
+      }
+   }
+
+   hypre_bind_device_id(device_id, myid, num_procs, comm);
 
    /*-----------------------------------------------------------
     * Initialize : must be the first HYPRE function to call
     *-----------------------------------------------------------*/
-   HYPRE_Init();
+   HYPRE_Initialize();
+
+   if (!lazy_device_init)
+   {
+      HYPRE_DeviceInitialize();
+   }
+
+   /*-----------------------------------------------------------
+    * Set defaults
+    *-----------------------------------------------------------*/
+
+   skip  = 0;
+   rap   = 0;
+   relax = 1;
+   jacobi_weight = 1.0;
+   usr_jacobi_weight = 0;
+   jump  = 0;
+   gradient_matrix = 0;
+   object_type = HYPRE_SSTRUCT;
+   solver_type = 1;
+   recompute_res = 0;   /* What should be the default here? */
+   cf_tol = 0.90;
+   pooldist = 0;
+   cycred_tdim = 0;
+   for (i = 0; i < 3; i++)
+   {
+      cycred_index[i]  = 0;
+      cycred_stride[i] = 1;
+   }
+
+   solver_id = 39;
+   repeats = 1;
+   prec_print_level = 0;
+   solver_print_level = 0;
+   log_level = 0;
+   print_system = 0;
+   cosine = 1;
+   skip = 0;
+   n_pre  = 1;
+   n_post = 1;
+
+   old_default = 0;
 
    /*-----------------------------------------------------------
     * Read input file
@@ -2456,13 +2556,31 @@ main( hypre_int argc,
 
    /* parse command line for input file name */
    infile = infile_default;
-   if (argc > 1)
+   while (arg_index < argc)
    {
       if ( strcmp(argv[arg_index], "-in") == 0 )
       {
          arg_index++;
          infile = argv[arg_index++];
       }
+      else if (strcmp(argv[arg_index], "-fromfile") == 0 )
+      {
+         arg_index++;
+         read_fromfile_flag += 1;
+         read_fromfile_index[0] = arg_index++;
+      }
+      else if (strcmp(argv[arg_index], "-rhsfromfile") == 0 )
+      {
+         arg_index++;
+         read_fromfile_flag += 2;
+         read_fromfile_index[1] = arg_index++;
+      }
+      else if (strcmp(argv[arg_index], "-x0fromfile") == 0 )
+      {
+         arg_index++;
+         read_fromfile_flag += 4;
+         read_fromfile_index[2] = arg_index++;
+      }
       else if ( strcmp(argv[arg_index], "-help") == 0 )
       {
          PrintUsage(argv[0], myid);
@@ -2484,61 +2602,55 @@ main( hypre_int argc,
          hypre_printf("HYPRE Single = %d\n", single);
          exit(1);
       }
+      else
+      {
+         break;
+      }
    }
 
-   ReadData(infile, &global_data);
-
    /*-----------------------------------------------------------
-    * Set defaults
+    * Are we reading matrices/vectors directly from file?
     *-----------------------------------------------------------*/
 
-   skip  = 0;
-   rap   = 0;
-   relax = 1;
-   usr_jacobi_weight= 0;
-   jump  = 0;
-   solver_type = 1;
-   recompute_res = 0;   /* What should be the default here? */
-   cf_tol = 0.90;
+   if (read_fromfile_index[0] == -1 &&
+       read_fromfile_index[1] == -1 &&
+       read_fromfile_index[2] == -1)
+   {
+      ReadData(infile, &global_data);
 
-   nparts = global_data.nparts;
-   pooldist = 0;
+      nparts = global_data.nparts;
+      parts      = hypre_TAlloc(HYPRE_Int,  nparts, HYPRE_MEMORY_HOST);
+      refine     = hypre_TAlloc(Index,  nparts, HYPRE_MEMORY_HOST);
+      distribute = hypre_TAlloc(Index,  nparts, HYPRE_MEMORY_HOST);
+      block      = hypre_TAlloc(Index,  nparts, HYPRE_MEMORY_HOST);
+      for (part = 0; part < nparts; part++)
+      {
+         parts[part] = part;
+         for (j = 0; j < 3; j++)
+         {
+            refine[part][j]     = 1;
+            distribute[part][j] = 1;
+            block[part][j]      = 1;
+         }
+      }
 
-   parts      = hypre_TAlloc(HYPRE_Int,  nparts, HYPRE_MEMORY_HOST);
-   refine     = hypre_TAlloc(Index,  nparts, HYPRE_MEMORY_HOST);
-   distribute = hypre_TAlloc(Index,  nparts, HYPRE_MEMORY_HOST);
-   block      = hypre_TAlloc(Index,  nparts, HYPRE_MEMORY_HOST);
-   for (part = 0; part < nparts; part++)
-   {
-      parts[part] = part;
-      for (j = 0; j < 3; j++)
+      if (global_data.rhs_true || global_data.fem_rhs_true)
       {
-         refine[part][j]     = 1;
-         distribute[part][j] = 1;
-         block[part][j]      = 1;
+         cosine = 0;
       }
    }
-   cycred_tdim = 0;
-   for (i = 0; i < 3; i++)
-   {
-      cycred_index[i]  = 0;
-      cycred_stride[i] = 1;
-   }
-
-   solver_id = 39;
-   print_system = 0;
-   cosine = 1;
-   if (global_data.rhs_true || global_data.fem_rhs_true)
+   else
    {
-      cosine = 0;
+      if (read_fromfile_flag < 7)
+      {
+         if (!myid)
+         {
+            hypre_printf("Error: Must read A, b, and x from file! \n");
+         }
+         exit(1);
+      }
    }
 
-   skip = 0;
-   n_pre  = 1;
-   n_post = 1;
-
-   old_default = 0;
-
    /*-----------------------------------------------------------
     * Parse command line
     *-----------------------------------------------------------*/
@@ -2606,12 +2718,35 @@ main( hypre_int argc,
          arg_index++;
 
          /* begin lobpcg */
-         if ( strcmp(argv[arg_index], "none") == 0 ) {
+         if ( strcmp(argv[arg_index], "none") == 0 )
+         {
             solver_id = NO_SOLVER;
             arg_index++;
          }
          else /* end lobpcg */
+         {
             solver_id = atoi(argv[arg_index++]);
+         }
+      }
+      else if ( strcmp(argv[arg_index], "-repeats") == 0 )
+      {
+         arg_index++;
+         repeats = atoi(argv[arg_index++]);
+      }
+      else if ( strcmp(argv[arg_index], "-pout") == 0 )
+      {
+         arg_index++;
+         prec_print_level = atoi(argv[arg_index++]);
+      }
+      else if ( strcmp(argv[arg_index], "-sout") == 0 )
+      {
+         arg_index++;
+         solver_print_level = atoi(argv[arg_index++]);
+      }
+      else if ( strcmp(argv[arg_index], "-ll") == 0 )
+      {
+         arg_index++;
+         log_level = atoi(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-print") == 0 )
       {
@@ -2631,7 +2766,7 @@ main( hypre_int argc,
       else if ( strcmp(argv[arg_index], "-tol") == 0 )
       {
          arg_index++;
-         tol = atof(argv[arg_index++]);
+         tol = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-v") == 0 )
       {
@@ -2657,8 +2792,8 @@ main( hypre_int argc,
       else if ( strcmp(argv[arg_index], "-w") == 0 )
       {
          arg_index++;
-         jacobi_weight= atof(argv[arg_index++]);
-         usr_jacobi_weight= 1; /* flag user weight */
+         jacobi_weight = (HYPRE_Real)atof(argv[arg_index++]);
+         usr_jacobi_weight = 1; /* flag user weight */
       }
       else if ( strcmp(argv[arg_index], "-jump") == 0 )
       {
@@ -2678,12 +2813,12 @@ main( hypre_int argc,
       else if ( strcmp(argv[arg_index], "-cf") == 0 )
       {
          arg_index++;
-         cf_tol = atof(argv[arg_index++]);
+         cf_tol = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-crtdim") == 0 )
       {
          arg_index++;
-         cycred_tdim = atof(argv[arg_index++]);
+         cycred_tdim = atoi(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-cri") == 0 )
       {
@@ -2727,7 +2862,8 @@ main( hypre_int argc,
          verbosity = atoi(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-vrand") == 0 )
-      {                         /* lobpcg: block size */
+      {
+         /* lobpcg: block size */
          arg_index++;
          blockSize = atoi(argv[arg_index++]);
       }
@@ -2753,7 +2889,7 @@ main( hypre_int argc,
       {
          /* lobpcg: inner pcg iterations tolerance */
          arg_index++;
-         pcgTol = atof(argv[arg_index++]);
+         pcgTol = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-pcgmode") == 0 )
       {
@@ -2768,7 +2904,16 @@ main( hypre_int argc,
          arg_index++;
          printLevel = atoi(argv[arg_index++]);
       }
-#if defined(HYPRE_USING_GPU)
+      else if ( strcmp(argv[arg_index], "-memory_host") == 0 )
+      {
+         arg_index++;
+         memory_location = HYPRE_MEMORY_HOST;
+      }
+      else if ( strcmp(argv[arg_index], "-memory_device") == 0 )
+      {
+         arg_index++;
+         memory_location = HYPRE_MEMORY_DEVICE;
+      }
       else if ( strcmp(argv[arg_index], "-exec_host") == 0 )
       {
          arg_index++;
@@ -2779,1195 +2924,1206 @@ main( hypre_int argc,
          arg_index++;
          default_exec_policy = HYPRE_EXEC_DEVICE;
       }
-      else if ( strcmp(argv[arg_index], "-mm_cusparse") == 0 )
+#if defined(HYPRE_USING_GPU)
+      else if ( strcmp(argv[arg_index], "-mm_vendor") == 0 )
+      {
+         arg_index++;
+         spgemm_use_vendor = atoi(argv[arg_index++]);
+      }
+#endif
+#if defined(HYPRE_USING_MEMORY_TRACKER)
+      else if ( strcmp(argv[arg_index], "-print_mem_tracker") == 0 )
+      {
+         arg_index++;
+         print_mem_tracker = atoi(argv[arg_index++]);
+      }
+      else if ( strcmp(argv[arg_index], "-mem_tracker_filename") == 0 )
       {
          arg_index++;
-         spgemm_use_cusparse = atoi(argv[arg_index++]);
+         snprintf(mem_tracker_name, HYPRE_MAX_FILE_NAME_LEN, "%s", argv[arg_index++]);
       }
 #endif
+      else if ( strcmp(argv[arg_index], "-gpu_mpi") == 0 )
+      {
+         arg_index++;
+         gpu_aware_mpi = atoi(argv[arg_index++]);
+      }
       else
       {
          arg_index++;
-         /*break;*/
       }
    }
 
+#if defined(HYPRE_USING_MEMORY_TRACKER)
+   hypre_MemoryTrackerSetPrint(print_mem_tracker);
+   if (mem_tracker_name[0]) { hypre_MemoryTrackerSetFileName(mem_tracker_name); }
+#endif
+
+   /* Set library log level */
+   HYPRE_SetLogLevel(log_level);
+
    /* default memory location */
    HYPRE_SetMemoryLocation(memory_location);
 
    /* default execution policy */
    HYPRE_SetExecutionPolicy(default_exec_policy);
 
-   HYPRE_SetStructExecutionPolicy(HYPRE_EXEC_DEVICE);
-
 #if defined(HYPRE_USING_GPU)
-   HYPRE_SetSpGemmUseCusparse(spgemm_use_cusparse);
+   HYPRE_SetSpGemmUseVendor(spgemm_use_vendor);
 #endif
 
+   HYPRE_SetGpuAwareMPI(gpu_aware_mpi);
+
    if ( solver_id == 39 && lobpcgFlag )
+   {
       solver_id = 10;
+   }
 
    /* end lobpcg */
 
    /*-----------------------------------------------------------
     * Print driver parameters TODO
     *-----------------------------------------------------------*/
+
    if (myid == 0)
    {
+#if defined(HYPRE_DEVELOP_STRING) && defined(HYPRE_DEVELOP_BRANCH)
+      hypre_printf("\nUsing HYPRE_DEVELOP_STRING: %s (branch %s; the develop branch)\n\n",
+                   HYPRE_DEVELOP_STRING, HYPRE_DEVELOP_BRANCH);
+
+#elif defined(HYPRE_DEVELOP_STRING) && !defined(HYPRE_DEVELOP_BRANCH)
+      hypre_printf("\nUsing HYPRE_DEVELOP_STRING: %s (branch %s; not the develop branch)\n\n",
+                   HYPRE_DEVELOP_STRING, HYPRE_BRANCH_NAME);
+
+#elif defined(HYPRE_RELEASE_VERSION)
+      hypre_printf("\nUsing HYPRE_RELEASE_VERSION: %s\n\n",
+                   HYPRE_RELEASE_VERSION);
+#endif
    }
 
    /*-----------------------------------------------------------
-    * Distribute data
+    * Synchronize so that timings make sense
     *-----------------------------------------------------------*/
 
-   DistributeData(global_data, pooldist, refine, distribute, block,
-                  num_procs, myid, &data);
+   hypre_MPI_Barrier(comm);
 
-   /*-----------------------------------------------------------
-    * Check a few things
-    *-----------------------------------------------------------*/
-   if (solver_id >= 200)
+   for (rep = 0; rep < repeats; rep++)
    {
-      pdata = data.pdata[0];
-      if (nparts > 1)
+
+      /*-----------------------------------------------------------
+       * Set up the grid
+       *-----------------------------------------------------------*/
+
+      time_index = hypre_InitializeTiming("SStruct Interface");
+      hypre_BeginTiming(time_index);
+
+      if (read_fromfile_flag & 0x1)
       {
          if (!myid)
          {
-            hypre_printf("Warning: Invalid number of parts for Struct Solver. Part 0 taken. \n");
+            hypre_printf("Reading SStructMatrix A from file: %s\n", argv[read_fromfile_index[0]]);
          }
-      }
 
-      if (pdata.nvars > 1)
+         HYPRE_SStructMatrixRead(comm, argv[read_fromfile_index[0]], &A);
+      }
+      else
       {
-         if (!myid)
+         /*-----------------------------------------------------------
+          * Distribute data
+          *-----------------------------------------------------------*/
+
+         DistributeData(global_data, pooldist, refine, distribute, block,
+                        num_procs, myid, &data);
+
+         /*-----------------------------------------------------------
+          * Check a few things
+          *-----------------------------------------------------------*/
+         if (solver_id >= 200)
          {
-            hypre_printf("Error: Invalid number of nvars for Struct Solver \n");
-         }
-         exit(1);
-      }
-   }
+            pdata = data.pdata[0];
+            if (nparts > 1)
+            {
+               if (!myid)
+               {
+                  hypre_printf("Warning: Invalid number of parts for Struct Solver. Part 0 taken.\n");
+               }
+            }
 
-   /*-----------------------------------------------------------
-    * Synchronize so that timings make sense
-    *-----------------------------------------------------------*/
+            if (pdata.nvars > 1)
+            {
+               if (!myid)
+               {
+                  hypre_printf("Error: Invalid number of nvars for Struct Solver \n");
+               }
+               exit(1);
+            }
+         }
 
-   hypre_MPI_Barrier(hypre_MPI_COMM_WORLD);
+         HYPRE_SStructGridCreate(comm, data.ndim, data.nparts, &grid);
+         if (data.numghost != NULL)
+         {
+            HYPRE_SStructGridSetNumGhost(grid, data.numghost);
+         }
+         for (part = 0; part < data.nparts; part++)
+         {
+            pdata = data.pdata[part];
+            for (box = 0; box < pdata.nboxes; box++)
+            {
+               HYPRE_SStructGridSetExtents(grid, part,
+                                           pdata.ilowers[box], pdata.iuppers[box]);
+            }
 
-   /*-----------------------------------------------------------
-    * Set up the grid
-    *-----------------------------------------------------------*/
+            HYPRE_SStructGridSetVariables(grid, part, pdata.nvars, pdata.vartypes);
 
-   time_index = hypre_InitializeTiming("SStruct Interface");
-   hypre_BeginTiming(time_index);
+            /* GridAddVariabes */
 
-   HYPRE_SStructGridCreate(hypre_MPI_COMM_WORLD, data.ndim, data.nparts, &grid);
-   if (data.numghost != NULL)
-   {
-      HYPRE_SStructGridSetNumGhost(grid, data.numghost);
-   }
-   for (part = 0; part < data.nparts; part++)
-   {
-      pdata = data.pdata[part];
-      for (box = 0; box < pdata.nboxes; box++)
-      {
-         HYPRE_SStructGridSetExtents(grid, part,
-                                     pdata.ilowers[box], pdata.iuppers[box]);
-      }
+            if (data.fem_nvars > 0)
+            {
+               HYPRE_SStructGridSetFEMOrdering(grid, part, data.fem_ordering);
+            }
 
-      HYPRE_SStructGridSetVariables(grid, part, pdata.nvars, pdata.vartypes);
+            /* GridSetNeighborPart and GridSetSharedPart */
+            for (box = 0; box < pdata.glue_nboxes; box++)
+            {
+               if (pdata.glue_shared[box])
+               {
+                  HYPRE_SStructGridSetSharedPart(grid, part,
+                                                 pdata.glue_ilowers[box],
+                                                 pdata.glue_iuppers[box],
+                                                 pdata.glue_offsets[box],
+                                                 pdata.glue_nbor_parts[box],
+                                                 pdata.glue_nbor_ilowers[box],
+                                                 pdata.glue_nbor_iuppers[box],
+                                                 pdata.glue_nbor_offsets[box],
+                                                 pdata.glue_index_maps[box],
+                                                 pdata.glue_index_dirs[box]);
+               }
+               else
+               {
+                  HYPRE_SStructGridSetNeighborPart(grid, part,
+                                                   pdata.glue_ilowers[box],
+                                                   pdata.glue_iuppers[box],
+                                                   pdata.glue_nbor_parts[box],
+                                                   pdata.glue_nbor_ilowers[box],
+                                                   pdata.glue_nbor_iuppers[box],
+                                                   pdata.glue_index_maps[box],
+                                                   pdata.glue_index_dirs[box]);
+               }
+            }
 
-      /* GridAddVariabes */
+            HYPRE_SStructGridSetPeriodic(grid, part, pdata.periodic);
+         }
+         HYPRE_SStructGridAssemble(grid);
 
-      if (data.fem_nvars > 0)
-      {
-         HYPRE_SStructGridSetFEMOrdering(grid, part, data.fem_ordering);
-      }
+         /*-----------------------------------------------------------
+          * Set up the stencils
+          *-----------------------------------------------------------*/
 
-      /* GridSetNeighborPart and GridSetSharedPart */
-      for (box = 0; box < pdata.glue_nboxes; box++)
-      {
-         if (pdata.glue_shared[box])
+         stencils = hypre_CTAlloc(HYPRE_SStructStencil,  data.nstencils, HYPRE_MEMORY_HOST);
+         for (s = 0; s < data.nstencils; s++)
          {
-            HYPRE_SStructGridSetSharedPart(grid, part,
-                                           pdata.glue_ilowers[box],
-                                           pdata.glue_iuppers[box],
-                                           pdata.glue_offsets[box],
-                                           pdata.glue_nbor_parts[box],
-                                           pdata.glue_nbor_ilowers[box],
-                                           pdata.glue_nbor_iuppers[box],
-                                           pdata.glue_nbor_offsets[box],
-                                           pdata.glue_index_maps[box],
-                                           pdata.glue_index_dirs[box]);
+            HYPRE_SStructStencilCreate(data.ndim, data.stencil_sizes[s],
+                                       &stencils[s]);
+            for (entry = 0; entry < data.stencil_sizes[s]; entry++)
+            {
+               HYPRE_SStructStencilSetEntry(stencils[s], entry,
+                                            data.stencil_offsets[s][entry],
+                                            data.stencil_vars[s][entry]);
+            }
          }
-         else
+
+         /*-----------------------------------------------------------
+          * Set object type
+          *-----------------------------------------------------------*/
+         /* determine if we build a gradient matrix */
+         if (solver_id == 150)
          {
-            HYPRE_SStructGridSetNeighborPart(grid, part,
-                                             pdata.glue_ilowers[box],
-                                             pdata.glue_iuppers[box],
-                                             pdata.glue_nbor_parts[box],
-                                             pdata.glue_nbor_ilowers[box],
-                                             pdata.glue_nbor_iuppers[box],
-                                             pdata.glue_index_maps[box],
-                                             pdata.glue_index_dirs[box]);
+            gradient_matrix = 1;
+            /* for now, change solver 150 to solver 28 */
+            solver_id = 28;
          }
-      }
 
-      HYPRE_SStructGridSetPeriodic(grid, part, pdata.periodic);
-   }
-   HYPRE_SStructGridAssemble(grid);
+         if ( ((solver_id >= 20) && (solver_id < 30)) ||
+              ((solver_id >= 40) && (solver_id < 50)) ||
+              ((solver_id >= 60) && (solver_id < 70)) ||
+              ((solver_id >= 80) && (solver_id < 90)) ||
+              ((solver_id >= 90) && (solver_id < 100)) ||
+              (solver_id == 120) )
+         {
+            object_type = HYPRE_PARCSR;
+         }
 
-   /*-----------------------------------------------------------
-    * Set up the stencils
-    *-----------------------------------------------------------*/
+         if (solver_id >= 200)
+         {
+            object_type = HYPRE_STRUCT;
+         }
 
-   stencils = hypre_CTAlloc(HYPRE_SStructStencil,  data.nstencils, HYPRE_MEMORY_HOST);
-   for (s = 0; s < data.nstencils; s++)
-   {
-      HYPRE_SStructStencilCreate(data.ndim, data.stencil_sizes[s],
-                                 &stencils[s]);
-      for (entry = 0; entry < data.stencil_sizes[s]; entry++)
-      {
-         HYPRE_SStructStencilSetEntry(stencils[s], entry,
-                                      data.stencil_offsets[s][entry],
-                                      data.stencil_vars[s][entry]);
-      }
-   }
+         /*-----------------------------------------------------------
+          * Set up the graph
+          *-----------------------------------------------------------*/
 
-   /*-----------------------------------------------------------
-    * Set object type
-    *-----------------------------------------------------------*/
+         HYPRE_SStructGraphCreate(comm, grid, &graph);
 
-   object_type = HYPRE_SSTRUCT;
+         /* HYPRE_SSTRUCT is the default, so we don't have to call SetObjectType */
+         if ( object_type != HYPRE_SSTRUCT )
+         {
+            HYPRE_SStructGraphSetObjectType(graph, object_type);
+         }
 
-   /* determine if we build a gradient matrix */
-   gradient_matrix = 0;
-   if (solver_id == 150)
-   {
-      gradient_matrix = 1;
-      /* for now, change solver 150 to solver 28 */
-      solver_id = 28;
-   }
+         for (part = 0; part < data.nparts; part++)
+         {
+            pdata = data.pdata[part];
 
-   if ( ((solver_id >= 20) && (solver_id < 30)) ||
-        ((solver_id >= 40) && (solver_id < 50)) ||
-        ((solver_id >= 60) && (solver_id < 70)) ||
-        ((solver_id >= 80) && (solver_id < 90)) ||
-        ((solver_id >= 90) && (solver_id < 100)) ||
-        (solver_id == 120) )
-   {
-      object_type = HYPRE_PARCSR;
-   }
+            if (data.nstencils > 0)
+            {
+               /* set stencils */
+               for (var = 0; var < pdata.nvars; var++)
+               {
+                  HYPRE_SStructGraphSetStencil(graph, part, var,
+                                               stencils[pdata.stencil_num[var]]);
+               }
+            }
+            else if (data.fem_nvars > 0)
+            {
+               /* indicate FEM approach */
+               HYPRE_SStructGraphSetFEM(graph, part);
 
-   if (solver_id >= 200)
-   {
-      object_type = HYPRE_STRUCT;
-   }
+               /* set sparsity */
+               HYPRE_SStructGraphSetFEMSparsity(graph, part,
+                                                data.fem_nsparse, data.fem_sparsity);
+            }
 
-   /*-----------------------------------------------------------
-    * Set up the graph
-    *-----------------------------------------------------------*/
-
-   HYPRE_SStructGraphCreate(hypre_MPI_COMM_WORLD, grid, &graph);
-
-   /* HYPRE_SSTRUCT is the default, so we don't have to call SetObjectType */
-   if ( object_type != HYPRE_SSTRUCT )
-   {
-      HYPRE_SStructGraphSetObjectType(graph, object_type);
-   }
-
-   for (part = 0; part < data.nparts; part++)
-   {
-      pdata = data.pdata[part];
-
-      if (data.nstencils > 0)
-      {
-         /* set stencils */
-         for (var = 0; var < pdata.nvars; var++)
-         {
-            HYPRE_SStructGraphSetStencil(graph, part, var,
-                                         stencils[pdata.stencil_num[var]]);
-         }
-      }
-      else if (data.fem_nvars > 0)
-      {
-         /* indicate FEM approach */
-         HYPRE_SStructGraphSetFEM(graph, part);
-
-         /* set sparsity */
-         HYPRE_SStructGraphSetFEMSparsity(graph, part,
-                                          data.fem_nsparse, data.fem_sparsity);
-      }
-
-      /* add entries */
-      for (box = 0; box < pdata.graph_nboxes; box++)
-      {
-         for (index[2] = pdata.graph_ilowers[box][2];
-              index[2] <= pdata.graph_iuppers[box][2];
-              index[2] += pdata.graph_strides[box][2])
-         {
-            for (index[1] = pdata.graph_ilowers[box][1];
-                 index[1] <= pdata.graph_iuppers[box][1];
-                 index[1] += pdata.graph_strides[box][1])
+            /* add entries */
+            for (box = 0; box < pdata.graph_nboxes; box++)
             {
-               for (index[0] = pdata.graph_ilowers[box][0];
-                    index[0] <= pdata.graph_iuppers[box][0];
-                    index[0] += pdata.graph_strides[box][0])
+               for (index[2] = pdata.graph_ilowers[box][2];
+                    index[2] <= pdata.graph_iuppers[box][2];
+                    index[2] += pdata.graph_strides[box][2])
                {
-                  for (i = 0; i < 3; i++)
+                  for (index[1] = pdata.graph_ilowers[box][1];
+                       index[1] <= pdata.graph_iuppers[box][1];
+                       index[1] += pdata.graph_strides[box][1])
                   {
-                     j = pdata.graph_index_maps[box][i];
-                     k = index[i] - pdata.graph_ilowers[box][i];
-                     k /= pdata.graph_strides[box][i];
-                     k *= pdata.graph_index_signs[box][i];
+                     for (index[0] = pdata.graph_ilowers[box][0];
+                          index[0] <= pdata.graph_iuppers[box][0];
+                          index[0] += pdata.graph_strides[box][0])
+                     {
+                        for (i = 0; i < 3; i++)
+                        {
+                           j = pdata.graph_index_maps[box][i];
+                           k = index[i] - pdata.graph_ilowers[box][i];
+                           k /= pdata.graph_strides[box][i];
+                           k *= pdata.graph_index_signs[box][i];
 #if 0 /* the following does not work with some Intel compilers with -O2 */
-                     to_index[j] = pdata.graph_to_ilowers[box][j] +
-                        k * pdata.graph_to_strides[box][j];
+                           to_index[j] = pdata.graph_to_ilowers[box][j] +
+                                         k * pdata.graph_to_strides[box][j];
 #else
-                     to_index[j] = pdata.graph_to_ilowers[box][j];
-                     to_index[j] += k * pdata.graph_to_strides[box][j];
+                           to_index[j] = pdata.graph_to_ilowers[box][j];
+                           to_index[j] += k * pdata.graph_to_strides[box][j];
 #endif
+                        }
+                        HYPRE_SStructGraphAddEntries(graph, part, index,
+                                                     pdata.graph_vars[box],
+                                                     pdata.graph_to_parts[box],
+                                                     to_index,
+                                                     pdata.graph_to_vars[box]);
+                     }
                   }
-                  HYPRE_SStructGraphAddEntries(graph, part, index,
-                                               pdata.graph_vars[box],
-                                               pdata.graph_to_parts[box],
-                                               to_index,
-                                               pdata.graph_to_vars[box]);
                }
             }
          }
-      }
-   }
 
-   HYPRE_SStructGraphAssemble(graph);
+         HYPRE_SStructGraphAssemble(graph);
 
-   /*-----------------------------------------------------------
-    * Set up the matrix
-    *-----------------------------------------------------------*/
+         /*-----------------------------------------------------------
+          * Set up the matrix
+          *-----------------------------------------------------------*/
 
-   values_size = hypre_max(data.max_boxsize, data.fem_nsparse);
-   values   = hypre_TAlloc(HYPRE_Real, values_size, HYPRE_MEMORY_HOST);
-   d_values = hypre_TAlloc(HYPRE_Real, values_size, HYPRE_MEMORY_DEVICE);
+         values_size = hypre_max(data.max_boxsize, data.max_boxsize * data.fem_nsparse);
 
-   HYPRE_SStructMatrixCreate(hypre_MPI_COMM_WORLD, graph, &A);
+         values   = hypre_TAlloc(HYPRE_Real, values_size, HYPRE_MEMORY_HOST);
+         d_values = hypre_TAlloc(HYPRE_Real, values_size, memory_location);
 
-   /* TODO HYPRE_SStructMatrixSetSymmetric(A, 1); */
-   for (i = 0; i < data.symmetric_num; i++)
-   {
-      HYPRE_SStructMatrixSetSymmetric(A, data.symmetric_parts[i],
-                                      data.symmetric_vars[i],
-                                      data.symmetric_to_vars[i],
-                                      data.symmetric_booleans[i]);
-   }
-   HYPRE_SStructMatrixSetNSSymmetric(A, data.ns_symmetric);
+         HYPRE_SStructMatrixCreate(comm, graph, &A);
 
-   /* HYPRE_SSTRUCT is the default, so we don't have to call SetObjectType */
-   if ( object_type != HYPRE_SSTRUCT )
-   {
-      HYPRE_SStructMatrixSetObjectType(A, object_type);
-   }
+         /* TODO HYPRE_SStructMatrixSetSymmetric(A, 1); */
+         for (i = 0; i < data.symmetric_num; i++)
+         {
+            HYPRE_SStructMatrixSetSymmetric(A, data.symmetric_parts[i],
+                                            data.symmetric_vars[i],
+                                            data.symmetric_to_vars[i],
+                                            data.symmetric_booleans[i]);
+         }
+         HYPRE_SStructMatrixSetNSSymmetric(A, data.ns_symmetric);
 
-   HYPRE_SStructMatrixInitialize(A);
+         /* HYPRE_SSTRUCT is the default, so we don't have to call SetObjectType */
+         if ( object_type != HYPRE_SSTRUCT )
+         {
+            HYPRE_SStructMatrixSetObjectType(A, object_type);
+         }
 
-   if (data.nstencils > 0)
-   {
-      /* StencilSetEntry: set stencil values */
-      for (part = 0; part < data.nparts; part++)
-      {
-         pdata = data.pdata[part];
-         for (var = 0; var < pdata.nvars; var++)
+         HYPRE_SStructMatrixInitialize(A);
+
+         if (data.nstencils > 0)
          {
-            s = pdata.stencil_num[var];
-            for (i = 0; i < data.stencil_sizes[s]; i++)
+            /* StencilSetEntry: set stencil values */
+            for (part = 0; part < data.nparts; part++)
             {
-               for (j = 0; j < pdata.max_boxsize; j++)
+               pdata = data.pdata[part];
+               for (var = 0; var < pdata.nvars; var++)
                {
-                  values[j] = data.stencil_values[s][i];
-               }
+                  s = pdata.stencil_num[var];
+                  for (i = 0; i < data.stencil_sizes[s]; i++)
+                  {
+                     for (j = 0; j < pdata.max_boxsize; j++)
+                     {
+                        values[j] = data.stencil_values[s][i];
+                     }
+
+                     hypre_TMemcpy(d_values, values, HYPRE_Real, values_size,
+                                   memory_location, HYPRE_MEMORY_HOST);
 
-               hypre_TMemcpy(d_values, values, HYPRE_Real, values_size, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
+                     for (box = 0; box < pdata.nboxes; box++)
+                     {
+                        GetVariableBox(pdata.ilowers[box], pdata.iuppers[box],
+                                       pdata.vartypes[var], ilower, iupper);
+
+                        HYPRE_SStructMatrixSetBoxValues(A, part, ilower, iupper,
+                                                        var, 1, &i, d_values);
+                     }
+                  }
+               }
+            }
+         }
+         else if (data.fem_nvars > 0)
+         {
+            /* FEMStencilSetRow: add to stencil values */
+#if 0    // Use AddFEMValues
+            hypre_TMemcpy(data.d_fem_values, data.fem_values, HYPRE_Real,
+                          data.fem_nsparse, memory_location, HYPRE_MEMORY_HOST);
 
+            for (part = 0; part < data.nparts; part++)
+            {
+               pdata = data.pdata[part];
                for (box = 0; box < pdata.nboxes; box++)
                {
-                  GetVariableBox(pdata.ilowers[box], pdata.iuppers[box],
-                                 pdata.vartypes[var], ilower, iupper);
-
-                  HYPRE_SStructMatrixSetBoxValues(A, part, ilower, iupper,
-                                                  var, 1, &i, d_values);
+                  for (index[2] = pdata.ilowers[box][2];
+                       index[2] <= pdata.iuppers[box][2]; index[2]++)
+                  {
+                     for (index[1] = pdata.ilowers[box][1];
+                          index[1] <= pdata.iuppers[box][1]; index[1]++)
+                     {
+                        for (index[0] = pdata.ilowers[box][0];
+                             index[0] <= pdata.iuppers[box][0]; index[0]++)
+                        {
+                           HYPRE_SStructMatrixAddFEMValues(A, part, index,
+                                                           data.d_fem_values);
+                        }
+                     }
+                  }
+               }
+            }
+#else    // Use AddFEMBoxValues
+            /* TODO: There is probably a smarter way to do this copy */
+            for (i = 0; i < data.max_boxsize; i++)
+            {
+               j = i * data.fem_nsparse;
+               hypre_TMemcpy(&d_values[j], data.fem_values, HYPRE_Real,
+                             data.fem_nsparse, memory_location, HYPRE_MEMORY_HOST);
+            }
+            for (part = 0; part < data.nparts; part++)
+            {
+               pdata = data.pdata[part];
+               for (box = 0; box < pdata.nboxes; box++)
+               {
+                  HYPRE_SStructMatrixAddFEMBoxValues(
+                     A, part, pdata.ilowers[box], pdata.iuppers[box], d_values);
                }
             }
+#endif
          }
-      }
-   }
-   else if (data.fem_nvars > 0)
-   {
-      hypre_TMemcpy(data.d_fem_values, data.fem_values, HYPRE_Real, data.fem_nvars * data.fem_nvars,
-                    HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
 
-      /* FEMStencilSetRow: add to stencil values */
-      for (part = 0; part < data.nparts; part++)
-      {
-         pdata = data.pdata[part];
-         for (box = 0; box < pdata.nboxes; box++)
+         /* GraphAddEntries: set non-stencil entries */
+         for (part = 0; part < data.nparts; part++)
          {
-            for (index[2] = pdata.ilowers[box][2];
-                 index[2] <= pdata.iuppers[box][2]; index[2]++)
+            pdata = data.pdata[part];
+
+            hypre_TMemcpy(pdata.d_graph_values, pdata.graph_values,
+                          HYPRE_Real, pdata.graph_values_size,
+                          memory_location, HYPRE_MEMORY_HOST);
+
+            for (box = 0; box < pdata.graph_nboxes; box++)
             {
-               for (index[1] = pdata.ilowers[box][1];
-                    index[1] <= pdata.iuppers[box][1]; index[1]++)
+               /*
+                * RDF NOTE: Add a separate interface routine for setting non-stencil
+                * entries.  It would be more efficient to set boundary values a box
+                * at a time, but AMR may require striding, and some codes may already
+                * have a natural values array to pass in, but can't because it uses
+                * ghost values.
+                *
+                * Example new interface routine:
+                *   SetNSBoxValues(matrix, part, ilower, iupper, stride, entry
+                *                  values_ilower, values_iupper, values);
+                */
+
+               /* since we have already tested SetBoxValues above, use SetValues here */
+#if 0
+               for (j = 0; j < pdata.graph_boxsizes[box]; j++)
+               {
+                  values[j] = pdata.graph_values[box];
+               }
+               HYPRE_SStructMatrixSetBoxValues(A, part,
+                                               pdata.graph_ilowers[box],
+                                               pdata.graph_iuppers[box],
+                                               pdata.graph_vars[box],
+                                               1, &pdata.graph_entries[box],
+                                               values);
+#else
+               for (index[2] = pdata.graph_ilowers[box][2];
+                    index[2] <= pdata.graph_iuppers[box][2];
+                    index[2] += pdata.graph_strides[box][2])
                {
-                  for (index[0] = pdata.ilowers[box][0];
-                       index[0] <= pdata.iuppers[box][0]; index[0]++)
+                  for (index[1] = pdata.graph_ilowers[box][1];
+                       index[1] <= pdata.graph_iuppers[box][1];
+                       index[1] += pdata.graph_strides[box][1])
                   {
-                     HYPRE_SStructMatrixAddFEMValues(A, part, index,
-                                                     data.d_fem_values);
+                     for (index[0] = pdata.graph_ilowers[box][0];
+                          index[0] <= pdata.graph_iuppers[box][0];
+                          index[0] += pdata.graph_strides[box][0])
+                     {
+                        HYPRE_SStructMatrixSetValues(A, part, index,
+                                                     pdata.graph_vars[box],
+                                                     1, &pdata.graph_entries[box],
+                                                     &pdata.d_graph_values[box]);
+                     }
                   }
                }
+#endif
             }
          }
-      }
-   }
 
-   /* GraphAddEntries: set non-stencil entries */
-   for (part = 0; part < data.nparts; part++)
-   {
-      pdata = data.pdata[part];
+         /* MatrixSetValues: reset some matrix values */
+         for (part = 0; part < data.nparts; part++)
+         {
+            pdata = data.pdata[part];
+            for (box = 0; box < pdata.matset_nboxes; box++)
+            {
+               size = 1;
+               for (j = 0; j < 3; j++)
+               {
+                  size *= (pdata.matset_iuppers[box][j] -
+                           pdata.matset_ilowers[box][j] + 1);
+               }
+               for (j = 0; j < size; j++)
+               {
+                  values[j] = pdata.matset_values[box];
+               }
 
-      hypre_TMemcpy(pdata.d_graph_values, pdata.graph_values, HYPRE_Real, pdata.graph_values_size,
-                    HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
+               hypre_TMemcpy(d_values, values, HYPRE_Real, values_size,
+                             memory_location, HYPRE_MEMORY_HOST);
 
-      for (box = 0; box < pdata.graph_nboxes; box++)
-      {
-         /*
-          * RDF NOTE: Add a separate interface routine for setting non-stencil
-          * entries.  It would be more efficient to set boundary values a box
-          * at a time, but AMR may require striding, and some codes may already
-          * have a natural values array to pass in, but can't because it uses
-          * ghost values.
-          *
-          * Example new interface routine:
-          *   SetNSBoxValues(matrix, part, ilower, iupper, stride, entry
-          *                  values_ilower, values_iupper, values);
-          */
+               HYPRE_SStructMatrixSetBoxValues(A, part,
+                                               pdata.matset_ilowers[box],
+                                               pdata.matset_iuppers[box],
+                                               pdata.matset_vars[box],
+                                               1, &pdata.matset_entries[box],
+                                               d_values);
+            }
+         }
 
-         /* since we have already tested SetBoxValues above, use SetValues here */
-#if 0
-         for (j = 0; j < pdata.graph_boxsizes[box]; j++)
+         /* MatrixAddToValues: add to some matrix values */
+         for (part = 0; part < data.nparts; part++)
          {
-            values[j] = pdata.graph_values[box];
+            pdata = data.pdata[part];
+            for (box = 0; box < pdata.matadd_nboxes; box++)
+            {
+               size = 1;
+               for (j = 0; j < 3; j++)
+               {
+                  size *= (pdata.matadd_iuppers[box][j] -
+                           pdata.matadd_ilowers[box][j] + 1);
+               }
+
+               for (entry = 0; entry < pdata.matadd_nentries[box]; entry++)
+               {
+                  for (j = 0; j < size; j++)
+                  {
+                     values[j] = pdata.matadd_values[box][entry];
+                  }
+
+                  hypre_TMemcpy(d_values, values, HYPRE_Real, values_size,
+                                memory_location, HYPRE_MEMORY_HOST);
+
+                  HYPRE_SStructMatrixAddToBoxValues(A, part,
+                                                    pdata.matadd_ilowers[box],
+                                                    pdata.matadd_iuppers[box],
+                                                    pdata.matadd_vars[box],
+                                                    1, &pdata.matadd_entries[box][entry],
+                                                    d_values);
+               }
+            }
          }
-         HYPRE_SStructMatrixSetBoxValues(A, part,
-                                         pdata.graph_ilowers[box],
-                                         pdata.graph_iuppers[box],
-                                         pdata.graph_vars[box],
-                                         1, &pdata.graph_entries[box],
-                                         values);
-#else
-         for (index[2] = pdata.graph_ilowers[box][2];
-              index[2] <= pdata.graph_iuppers[box][2];
-              index[2] += pdata.graph_strides[box][2])
+
+         /* FEMMatrixAddToValues: add to some matrix values */
+         for (part = 0; part < data.nparts; part++)
          {
-            for (index[1] = pdata.graph_ilowers[box][1];
-                 index[1] <= pdata.graph_iuppers[box][1];
-                 index[1] += pdata.graph_strides[box][1])
+            pdata = data.pdata[part];
+            for (box = 0; box < pdata.fem_matadd_nboxes; box++)
             {
-               for (index[0] = pdata.graph_ilowers[box][0];
-                    index[0] <= pdata.graph_iuppers[box][0];
-                    index[0] += pdata.graph_strides[box][0])
+               for (i = 0; i < data.fem_nsparse; i++)
                {
-                  HYPRE_SStructMatrixSetValues(A, part, index,
-                                               pdata.graph_vars[box],
-                                               1, &pdata.graph_entries[box],
-                                               &pdata.d_graph_values[box]);
+                  values[i] = 0.0;
+               }
+               s = 0;
+               for (i = 0; i < pdata.fem_matadd_nrows[box]; i++)
+               {
+                  row = pdata.fem_matadd_rows[box][i];
+                  for (j = 0; j < pdata.fem_matadd_ncols[box]; j++)
+                  {
+                     col = pdata.fem_matadd_cols[box][j];
+                     values[data.fem_ivalues_full[row][col]] =
+                        pdata.fem_matadd_values[box][s];
+                     s++;
+                  }
+               }
+
+               hypre_TMemcpy(d_values, values, HYPRE_Real, values_size,
+                             memory_location, HYPRE_MEMORY_HOST);
+
+               for (index[2] = pdata.fem_matadd_ilowers[box][2];
+                    index[2] <= pdata.fem_matadd_iuppers[box][2]; index[2]++)
+               {
+                  for (index[1] = pdata.fem_matadd_ilowers[box][1];
+                       index[1] <= pdata.fem_matadd_iuppers[box][1]; index[1]++)
+                  {
+                     for (index[0] = pdata.fem_matadd_ilowers[box][0];
+                          index[0] <= pdata.fem_matadd_iuppers[box][0]; index[0]++)
+                     {
+                        HYPRE_SStructMatrixAddFEMValues(A, part, index, d_values);
+                     }
+                  }
                }
             }
          }
-#endif
+
+         HYPRE_SStructMatrixAssemble(A);
       }
-   }
 
-   /* MatrixSetValues: reset some matrix values */
-   for (part = 0; part < data.nparts; part++)
-   {
-      pdata = data.pdata[part];
-      for (box = 0; box < pdata.matset_nboxes; box++)
+      /*-----------------------------------------------------------
+       * Set up the RHS vector
+       *-----------------------------------------------------------*/
+
+      if (read_fromfile_flag & 0x2)
       {
-         size = 1;
-         for (j = 0; j < 3; j++)
-         {
-            size *= (pdata.matset_iuppers[box][j] -
-                     pdata.matset_ilowers[box][j] + 1);
-         }
-         for (j = 0; j < size; j++)
+         if (!myid)
          {
-            values[j] = pdata.matset_values[box];
+            hypre_printf("Reading SStructVector b from file: %s\n", argv[read_fromfile_index[1]]);
          }
+         cosine = 0;
 
-         hypre_TMemcpy(d_values, values, HYPRE_Real, values_size, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
-
-         HYPRE_SStructMatrixSetBoxValues(A, part,
-                                         pdata.matset_ilowers[box],
-                                         pdata.matset_iuppers[box],
-                                         pdata.matset_vars[box],
-                                         1, &pdata.matset_entries[box],
-                                         d_values);
+         HYPRE_SStructVectorRead(comm, argv[read_fromfile_index[1]], &b);
       }
-   }
-
-   /* MatrixAddToValues: add to some matrix values */
-   for (part = 0; part < data.nparts; part++)
-   {
-      pdata = data.pdata[part];
-      for (box = 0; box < pdata.matadd_nboxes; box++)
+      else
       {
-         size = 1;
-         for (j = 0; j < 3; j++)
+         HYPRE_SStructVectorCreate(comm, grid, &b);
+
+         /* HYPRE_SSTRUCT is the default, so we don't have to call SetObjectType */
+         if ( object_type != HYPRE_SSTRUCT )
          {
-            size *= (pdata.matadd_iuppers[box][j] -
-                     pdata.matadd_ilowers[box][j] + 1);
+            HYPRE_SStructVectorSetObjectType(b, object_type);
          }
 
-         for (entry = 0; entry < pdata.matadd_nentries[box]; entry++)
+         HYPRE_SStructVectorInitialize(b);
+
+         /* Initialize the rhs values */
+         if (data.rhs_true)
          {
-            for (j = 0; j < size; j++)
+            for (j = 0; j < data.max_boxsize; j++)
             {
-               values[j] = pdata.matadd_values[box][entry];
+               values[j] = data.rhs_value;
             }
-
-            hypre_TMemcpy(d_values, values, HYPRE_Real, values_size, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
-
-            HYPRE_SStructMatrixAddToBoxValues(A, part,
-                                              pdata.matadd_ilowers[box],
-                                              pdata.matadd_iuppers[box],
-                                              pdata.matadd_vars[box],
-                                              1, &pdata.matadd_entries[box][entry],
-                                              d_values);
          }
-      }
-   }
-
-   /* FEMMatrixAddToValues: add to some matrix values */
-   for (part = 0; part < data.nparts; part++)
-   {
-      pdata = data.pdata[part];
-      for (box = 0; box < pdata.fem_matadd_nboxes; box++)
-      {
-         for (i = 0; i < data.fem_nsparse; i++)
+         else if (data.fem_rhs_true)
          {
-            values[i] = 0.0;
+            for (j = 0; j < data.max_boxsize; j++)
+            {
+               values[j] = 0.0;
+            }
          }
-         s = 0;
-         for (i = 0; i < pdata.fem_matadd_nrows[box]; i++)
+         else /* rhs=1 is the default */
          {
-            row = pdata.fem_matadd_rows[box][i];
-            for (j = 0; j < pdata.fem_matadd_ncols[box]; j++)
+            for (j = 0; j < data.max_boxsize; j++)
             {
-               col = pdata.fem_matadd_cols[box][j];
-               values[data.fem_ivalues_full[row][col]] =
-                  pdata.fem_matadd_values[box][s];
-               s++;
+               values[j] = 1.0;
             }
          }
 
-         hypre_TMemcpy(d_values, values, HYPRE_Real, values_size, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
+         hypre_TMemcpy(d_values, values, HYPRE_Real, values_size,
+                       memory_location, HYPRE_MEMORY_HOST);
 
-         for (index[2] = pdata.fem_matadd_ilowers[box][2];
-              index[2] <= pdata.fem_matadd_iuppers[box][2]; index[2]++)
+         for (part = 0; part < data.nparts; part++)
          {
-            for (index[1] = pdata.fem_matadd_ilowers[box][1];
-                 index[1] <= pdata.fem_matadd_iuppers[box][1]; index[1]++)
+            pdata = data.pdata[part];
+            for (var = 0; var < pdata.nvars; var++)
             {
-               for (index[0] = pdata.fem_matadd_ilowers[box][0];
-                    index[0] <= pdata.fem_matadd_iuppers[box][0]; index[0]++)
+               for (box = 0; box < pdata.nboxes; box++)
                {
-                  HYPRE_SStructMatrixAddFEMValues(A, part, index, d_values);
+                  GetVariableBox(pdata.ilowers[box], pdata.iuppers[box],
+                                 pdata.vartypes[var], ilower, iupper);
+                  HYPRE_SStructVectorSetBoxValues(b, part, ilower, iupper,
+                                                  var, d_values);
                }
             }
          }
-      }
-   }
-
-   HYPRE_SStructMatrixAssemble(A);
-
-   /*-----------------------------------------------------------
-    * Set up the linear system
-    *-----------------------------------------------------------*/
 
-   HYPRE_SStructVectorCreate(hypre_MPI_COMM_WORLD, grid, &b);
+         /* Add values for FEMRhsSet */
+         if (data.fem_rhs_true)
+         {
+#if 0    // Use AddFEMValues
+            hypre_TMemcpy(data.d_fem_rhs_values, data.fem_rhs_values, HYPRE_Real,
+                          data.fem_nvars, memory_location, HYPRE_MEMORY_HOST);
 
-   /* HYPRE_SSTRUCT is the default, so we don't have to call SetObjectType */
-   if ( object_type != HYPRE_SSTRUCT )
-   {
-      HYPRE_SStructVectorSetObjectType(b, object_type);
-   }
+            for (part = 0; part < data.nparts; part++)
+            {
+               pdata = data.pdata[part];
+               for (box = 0; box < pdata.nboxes; box++)
+               {
+                  for (index[2] = pdata.ilowers[box][2];
+                       index[2] <= pdata.iuppers[box][2]; index[2]++)
+                  {
+                     for (index[1] = pdata.ilowers[box][1];
+                          index[1] <= pdata.iuppers[box][1]; index[1]++)
+                     {
+                        for (index[0] = pdata.ilowers[box][0];
+                             index[0] <= pdata.iuppers[box][0]; index[0]++)
+                        {
+                           HYPRE_SStructVectorAddFEMValues(b, part, index,
+                                                           data.d_fem_rhs_values);
+                        }
+                     }
+                  }
+               }
+            }
+#else    // Use AddFEMBoxValues
+            /* TODO: There is probably a smarter way to do this copy */
+            for (i = 0; i < data.max_boxsize; i++)
+            {
+               j = i * data.fem_nvars;
+               hypre_TMemcpy(&d_values[j], data.fem_rhs_values, HYPRE_Real,
+                             data.fem_nvars, memory_location, HYPRE_MEMORY_HOST);
+            }
+            for (part = 0; part < data.nparts; part++)
+            {
+               pdata = data.pdata[part];
+               for (box = 0; box < pdata.nboxes; box++)
+               {
+                  HYPRE_SStructVectorAddFEMBoxValues(
+                     b, part, pdata.ilowers[box], pdata.iuppers[box], d_values);
+               }
+            }
+#endif
+         }
 
-   HYPRE_SStructVectorInitialize(b);
+         /* RhsAddToValues: add to some RHS values */
+         for (part = 0; part < data.nparts; part++)
+         {
+            pdata = data.pdata[part];
+            for (box = 0; box < pdata.rhsadd_nboxes; box++)
+            {
+               size = 1;
+               for (j = 0; j < 3; j++)
+               {
+                  size *= (pdata.rhsadd_iuppers[box][j] -
+                           pdata.rhsadd_ilowers[box][j] + 1);
+               }
 
-   /* Initialize the rhs values */
-   if (data.rhs_true)
-   {
-      for (j = 0; j < data.max_boxsize; j++)
-      {
-         values[j] = data.rhs_value;
-      }
-   }
-   else if (data.fem_rhs_true)
-   {
-      for (j = 0; j < data.max_boxsize; j++)
-      {
-         values[j] = 0.0;
-      }
-   }
-   else /* rhs=1 is the default */
-   {
-      for (j = 0; j < data.max_boxsize; j++)
-      {
-         values[j] = 1.0;
-      }
-   }
+               for (j = 0; j < size; j++)
+               {
+                  values[j] = pdata.rhsadd_values[box];
+               }
 
-   hypre_TMemcpy(d_values, values, HYPRE_Real, values_size, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
+               hypre_TMemcpy(d_values, values, HYPRE_Real, values_size,
+                             memory_location, HYPRE_MEMORY_HOST);
 
-   for (part = 0; part < data.nparts; part++)
-   {
-      pdata = data.pdata[part];
-      for (var = 0; var < pdata.nvars; var++)
-      {
-         for (box = 0; box < pdata.nboxes; box++)
-         {
-            GetVariableBox(pdata.ilowers[box], pdata.iuppers[box],
-                           pdata.vartypes[var], ilower, iupper);
-            HYPRE_SStructVectorSetBoxValues(b, part, ilower, iupper,
-                                            var, d_values);
+               HYPRE_SStructVectorAddToBoxValues(b, part,
+                                                 pdata.rhsadd_ilowers[box],
+                                                 pdata.rhsadd_iuppers[box],
+                                                 pdata.rhsadd_vars[box], d_values);
+            }
          }
-      }
-   }
-
-   /* Add values for FEMRhsSet */
-   if (data.fem_rhs_true)
-   {
-      hypre_TMemcpy(data.d_fem_rhs_values, data.fem_rhs_values, HYPRE_Real, data.fem_nvars,
-                    HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
 
-      for (part = 0; part < data.nparts; part++)
-      {
-         pdata = data.pdata[part];
-         for (box = 0; box < pdata.nboxes; box++)
+         /* FEMRhsAddToValues: add to some RHS values */
+         for (part = 0; part < data.nparts; part++)
          {
-            for (index[2] = pdata.ilowers[box][2];
-                 index[2] <= pdata.iuppers[box][2]; index[2]++)
+            pdata = data.pdata[part];
+            for (box = 0; box < pdata.fem_rhsadd_nboxes; box++)
             {
-               for (index[1] = pdata.ilowers[box][1];
-                    index[1] <= pdata.iuppers[box][1]; index[1]++)
+               for (index[2] = pdata.fem_rhsadd_ilowers[box][2];
+                    index[2] <= pdata.fem_rhsadd_iuppers[box][2]; index[2]++)
                {
-                  for (index[0] = pdata.ilowers[box][0];
-                       index[0] <= pdata.iuppers[box][0]; index[0]++)
+                  for (index[1] = pdata.fem_rhsadd_ilowers[box][1];
+                       index[1] <= pdata.fem_rhsadd_iuppers[box][1]; index[1]++)
                   {
-                     HYPRE_SStructVectorAddFEMValues(b, part, index,
-                                                     data.d_fem_rhs_values);
+                     for (index[0] = pdata.fem_rhsadd_ilowers[box][0];
+                          index[0] <= pdata.fem_rhsadd_iuppers[box][0]; index[0]++)
+                     {
+                        HYPRE_SStructVectorAddFEMValues(b, part, index,
+                                                        pdata.fem_rhsadd_values[box]);
+                     }
                   }
                }
             }
          }
+
+         HYPRE_SStructVectorAssemble(b);
       }
-   }
 
-   /* RhsAddToValues: add to some RHS values */
-   for (part = 0; part < data.nparts; part++)
-   {
-      pdata = data.pdata[part];
-      for (box = 0; box < pdata.rhsadd_nboxes; box++)
+      /*-----------------------------------------------------------
+       * Set up the initial solution vector
+       *-----------------------------------------------------------*/
+
+      if (read_fromfile_flag & 0x4)
       {
-         size = 1;
-         for (j = 0; j < 3; j++)
+         if (!myid)
          {
-            size *= (pdata.rhsadd_iuppers[box][j] -
-                     pdata.rhsadd_ilowers[box][j] + 1);
+            hypre_printf("Reading SStructVector x0 from file: %s\n", argv[read_fromfile_index[2]]);
          }
 
-         for (j = 0; j < size; j++)
+         HYPRE_SStructVectorRead(comm, argv[read_fromfile_index[2]], &x);
+      }
+      else
+      {
+         HYPRE_SStructVectorCreate(comm, grid, &x);
+
+         /* HYPRE_SSTRUCT is the default, so we don't have to call SetObjectType */
+         if ( object_type != HYPRE_SSTRUCT )
          {
-            values[j] = pdata.rhsadd_values[box];
+            HYPRE_SStructVectorSetObjectType(x, object_type);
          }
 
-         hypre_TMemcpy(d_values, values, HYPRE_Real, values_size, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
+         HYPRE_SStructVectorInitialize(x);
 
-         HYPRE_SStructVectorAddToBoxValues(b, part,
-                                           pdata.rhsadd_ilowers[box],
-                                           pdata.rhsadd_iuppers[box],
-                                           pdata.rhsadd_vars[box], d_values);
-      }
-   }
+         /*-----------------------------------------------------------
+          * If requested, reset linear system so that it has
+          * exact solution:
+          *
+          *   u(part,var,i,j,k) = (part+1)*(var+1)*cosine[(i+j+k)/10]
+          *
+          *-----------------------------------------------------------*/
 
-   /* FEMRhsAddToValues: add to some RHS values */
-   for (part = 0; part < data.nparts; part++)
-   {
-      pdata = data.pdata[part];
-      for (box = 0; box < pdata.fem_rhsadd_nboxes; box++)
-      {
-         for (index[2] = pdata.fem_rhsadd_ilowers[box][2];
-              index[2] <= pdata.fem_rhsadd_iuppers[box][2]; index[2]++)
+         if (cosine)
          {
-            for (index[1] = pdata.fem_rhsadd_ilowers[box][1];
-                 index[1] <= pdata.fem_rhsadd_iuppers[box][1]; index[1]++)
+            for (part = 0; part < data.nparts; part++)
             {
-               for (index[0] = pdata.fem_rhsadd_ilowers[box][0];
-                    index[0] <= pdata.fem_rhsadd_iuppers[box][0]; index[0]++)
+               pdata = data.pdata[part];
+               for (var = 0; var < pdata.nvars; var++)
                {
-                  HYPRE_SStructVectorAddFEMValues(b, part, index,
-                                                  pdata.fem_rhsadd_values[box]);
+                  scale = (part + 1.0) * (var + 1.0);
+                  for (box = 0; box < pdata.nboxes; box++)
+                  {
+                     /*
+                        GetVariableBox(pdata.ilowers[box], pdata.iuppers[box],
+                        pdata.vartypes[var], ilower, iupper);
+                     */
+                     GetVariableBox(pdata.ilowers[box], pdata.iuppers[box],
+                                    var, ilower, iupper);
+                     SetCosineVector(scale, ilower, iupper, values);
+
+                     hypre_TMemcpy(d_values, values, HYPRE_Real, values_size,
+                                   memory_location, HYPRE_MEMORY_HOST);
+
+                     HYPRE_SStructVectorSetBoxValues(x, part, ilower, iupper,
+                                                     var, d_values);
+                  }
                }
             }
          }
-      }
-   }
-
-   HYPRE_SStructVectorAssemble(b);
-
-   HYPRE_SStructVectorCreate(hypre_MPI_COMM_WORLD, grid, &x);
-
-   /* HYPRE_SSTRUCT is the default, so we don't have to call SetObjectType */
-   if ( object_type != HYPRE_SSTRUCT )
-   {
-      HYPRE_SStructVectorSetObjectType(x, object_type);
-   }
-
-   HYPRE_SStructVectorInitialize(x);
-
-   /*-----------------------------------------------------------
-    * If requested, reset linear system so that it has
-    * exact solution:
-    *
-    *   u(part,var,i,j,k) = (part+1)*(var+1)*cosine[(i+j+k)/10]
-    *
-    *-----------------------------------------------------------*/
-
-   if (cosine)
-   {
-      for (part = 0; part < data.nparts; part++)
-      {
-         pdata = data.pdata[part];
-         for (var = 0; var < pdata.nvars; var++)
-         {
-            scale = (part+1.0)*(var+1.0);
-            for (box = 0; box < pdata.nboxes; box++)
-            {
-               /*
-                  GetVariableBox(pdata.ilowers[box], pdata.iuppers[box],
-                  pdata.vartypes[var], ilower, iupper);
-               */
-               GetVariableBox(pdata.ilowers[box], pdata.iuppers[box],
-                              var, ilower, iupper);
-               SetCosineVector(scale, ilower, iupper, values);
 
-               hypre_TMemcpy(d_values, values, HYPRE_Real, values_size, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
-
-               HYPRE_SStructVectorSetBoxValues(x, part, ilower, iupper,
-                                               var, d_values);
-            }
-         }
+         HYPRE_SStructVectorAssemble(x);
       }
-   }
 
-   HYPRE_SStructVectorAssemble(x);
-
-   hypre_EndTiming(time_index);
-   hypre_PrintTiming("SStruct Interface", hypre_MPI_COMM_WORLD);
-   hypre_FinalizeTiming(time_index);
-   hypre_ClearTiming();
-
-   /*-----------------------------------------------------------
-    * Get the objects out
-    * NOTE: This should go after the cosine part, but for the bug
-    *-----------------------------------------------------------*/
-
-   if (object_type == HYPRE_PARCSR)
-   {
-      HYPRE_SStructMatrixGetObject(A, (void **) &par_A);
-      HYPRE_SStructVectorGetObject(b, (void **) &par_b);
-      HYPRE_SStructVectorGetObject(x, (void **) &par_x);
-   }
-   else if (object_type == HYPRE_STRUCT)
-   {
-      HYPRE_SStructMatrixGetObject(A, (void **) &sA);
-      HYPRE_SStructVectorGetObject(b, (void **) &sb);
-      HYPRE_SStructVectorGetObject(x, (void **) &sx);
-   }
+      hypre_EndTiming(time_index);
+      hypre_PrintTiming("SStruct Interface", comm);
+      hypre_FinalizeTiming(time_index);
+      hypre_ClearTiming();
 
-   /*-----------------------------------------------------------
-    * Finish resetting the linear system
-    *-----------------------------------------------------------*/
+      /*-----------------------------------------------------------
+       * Get the objects out
+       * NOTE: This should go after the cosine part, but for the bug
+       *-----------------------------------------------------------*/
 
-   if (cosine)
-   {
-      /* This if/else is due to a bug in SStructMatvec */
-      if (object_type == HYPRE_SSTRUCT)
-      {
-         /* Apply A to cosine vector to yield righthand side */
-         hypre_SStructMatvec(1.0, A, x, 0.0, b);
-         /* Reset initial guess to zero */
-         hypre_SStructMatvec(0.0, A, b, 0.0, x);
-      }
-      else if (object_type == HYPRE_PARCSR)
+      if (object_type == HYPRE_PARCSR)
       {
-         /* Apply A to cosine vector to yield righthand side */
-         HYPRE_ParCSRMatrixMatvec(1.0, par_A, par_x, 0.0, par_b );
-         /* Reset initial guess to zero */
-         HYPRE_ParCSRMatrixMatvec(0.0, par_A, par_b, 0.0, par_x );
+         HYPRE_SStructMatrixGetObject(A, (void **) &par_A);
+         HYPRE_SStructVectorGetObject(b, (void **) &par_b);
+         HYPRE_SStructVectorGetObject(x, (void **) &par_x);
       }
       else if (object_type == HYPRE_STRUCT)
       {
-         /* Apply A to cosine vector to yield righthand side */
-         hypre_StructMatvec(1.0, sA, sx, 0.0, sb);
-         /* Reset initial guess to zero */
-         hypre_StructMatvec(0.0, sA, sb, 0.0, sx);
+         HYPRE_SStructMatrixGetObject(A, (void **) &sA);
+         HYPRE_SStructVectorGetObject(b, (void **) &sb);
+         HYPRE_SStructVectorGetObject(x, (void **) &sx);
       }
-   }
-
-   /*-----------------------------------------------------------
-    * Set up a gradient matrix G
-    *-----------------------------------------------------------*/
-
-   if (gradient_matrix)
-   {
-      HYPRE_SStructVariable vartypes[1] = {HYPRE_SSTRUCT_VARIABLE_NODE};
-      HYPRE_Int offsets[3][2][3] = { {{0,0,0}, {-1,0,0}},
-                                     {{0,0,0}, {0,-1,0}},
-                                     {{0,0,0}, {0,0,-1}} };
-      HYPRE_Real stencil_values[2] = {1.0, -1.0};
 
-      /* Set up the domain grid */
+      /*-----------------------------------------------------------
+       * Finish resetting the linear system
+       *-----------------------------------------------------------*/
 
-      HYPRE_SStructGridCreate(hypre_MPI_COMM_WORLD, data.ndim, data.nparts, &G_grid);
-      for (part = 0; part < data.nparts; part++)
+      if (cosine)
       {
-         pdata = data.pdata[part];
-         for (box = 0; box < pdata.nboxes; box++)
+         /* This if/else is due to a bug in SStructMatvec */
+         if (object_type == HYPRE_SSTRUCT)
          {
-            HYPRE_SStructGridSetExtents(G_grid, part,
-                                        pdata.ilowers[box], pdata.iuppers[box]);
+            /* Apply A to cosine vector to yield righthand side */
+            hypre_SStructMatvec(1.0, A, x, 0.0, b);
+            /* Reset initial guess to zero */
+            hypre_SStructMatvec(0.0, A, b, 0.0, x);
          }
-         HYPRE_SStructGridSetVariables(G_grid, part, 1, vartypes);
-         for (box = 0; box < pdata.glue_nboxes; box++)
+         else if (object_type == HYPRE_PARCSR)
          {
-            if (pdata.glue_shared[box])
+            /* Apply A to cosine vector to yield righthand side */
+            HYPRE_ParCSRMatrixMatvec(1.0, par_A, par_x, 0.0, par_b );
+            /* Reset initial guess to zero */
+            HYPRE_ParCSRMatrixMatvec(0.0, par_A, par_b, 0.0, par_x );
+         }
+         else if (object_type == HYPRE_STRUCT)
+         {
+            /* Apply A to cosine vector to yield righthand side */
+            hypre_StructMatvec(1.0, sA, sx, 0.0, sb);
+            /* Reset initial guess to zero */
+            hypre_StructMatvec(0.0, sA, sb, 0.0, sx);
+         }
+      }
+
+      /*-----------------------------------------------------------
+       * Set up a gradient matrix G
+       *-----------------------------------------------------------*/
+
+      if (gradient_matrix)
+      {
+         HYPRE_SStructVariable vartypes[1] = {HYPRE_SSTRUCT_VARIABLE_NODE};
+         HYPRE_Int offsets[3][2][3] = { {{0, 0, 0}, {-1, 0, 0}},
+            {{0, 0, 0}, {0, -1, 0}},
+            {{0, 0, 0}, {0, 0, -1}}
+         };
+         HYPRE_Real stencil_values[2] = {1.0, -1.0};
+
+         /* Set up the domain grid */
+
+         HYPRE_SStructGridCreate(comm, data.ndim, data.nparts, &G_grid);
+         for (part = 0; part < data.nparts; part++)
+         {
+            pdata = data.pdata[part];
+            for (box = 0; box < pdata.nboxes; box++)
             {
-               HYPRE_SStructGridSetSharedPart(G_grid, part,
-                                              pdata.glue_ilowers[box],
-                                              pdata.glue_iuppers[box],
-                                              pdata.glue_offsets[box],
-                                              pdata.glue_nbor_parts[box],
-                                              pdata.glue_nbor_ilowers[box],
-                                              pdata.glue_nbor_iuppers[box],
-                                              pdata.glue_nbor_offsets[box],
-                                              pdata.glue_index_maps[box],
-                                              pdata.glue_index_dirs[box]);
+               HYPRE_SStructGridSetExtents(G_grid, part,
+                                           pdata.ilowers[box], pdata.iuppers[box]);
             }
-            else
+            HYPRE_SStructGridSetVariables(G_grid, part, 1, vartypes);
+            for (box = 0; box < pdata.glue_nboxes; box++)
             {
-               HYPRE_SStructGridSetNeighborPart(G_grid, part,
-                                                pdata.glue_ilowers[box],
-                                                pdata.glue_iuppers[box],
-                                                pdata.glue_nbor_parts[box],
-                                                pdata.glue_nbor_ilowers[box],
-                                                pdata.glue_nbor_iuppers[box],
-                                                pdata.glue_index_maps[box],
-                                                pdata.glue_index_dirs[box]);
+               if (pdata.glue_shared[box])
+               {
+                  HYPRE_SStructGridSetSharedPart(G_grid, part,
+                                                 pdata.glue_ilowers[box],
+                                                 pdata.glue_iuppers[box],
+                                                 pdata.glue_offsets[box],
+                                                 pdata.glue_nbor_parts[box],
+                                                 pdata.glue_nbor_ilowers[box],
+                                                 pdata.glue_nbor_iuppers[box],
+                                                 pdata.glue_nbor_offsets[box],
+                                                 pdata.glue_index_maps[box],
+                                                 pdata.glue_index_dirs[box]);
+               }
+               else
+               {
+                  HYPRE_SStructGridSetNeighborPart(G_grid, part,
+                                                   pdata.glue_ilowers[box],
+                                                   pdata.glue_iuppers[box],
+                                                   pdata.glue_nbor_parts[box],
+                                                   pdata.glue_nbor_ilowers[box],
+                                                   pdata.glue_nbor_iuppers[box],
+                                                   pdata.glue_index_maps[box],
+                                                   pdata.glue_index_dirs[box]);
+               }
             }
          }
-      }
-      HYPRE_SStructGridAssemble(G_grid);
+         HYPRE_SStructGridAssemble(G_grid);
 
-      /* Set up the gradient stencils */
+         /* Set up the gradient stencils */
 
-      G_stencils = hypre_CTAlloc(HYPRE_SStructStencil,  data.ndim, HYPRE_MEMORY_HOST);
-      for (s = 0; s < data.ndim; s++)
-      {
-         HYPRE_SStructStencilCreate(data.ndim, 2, &G_stencils[s]);
-         for (entry = 0; entry < 2; entry++)
+         G_stencils = hypre_CTAlloc(HYPRE_SStructStencil,  data.ndim, HYPRE_MEMORY_HOST);
+         for (s = 0; s < data.ndim; s++)
          {
-            HYPRE_SStructStencilSetEntry(
-               G_stencils[s], entry, offsets[s][entry], 0);
+            HYPRE_SStructStencilCreate(data.ndim, 2, &G_stencils[s]);
+            for (entry = 0; entry < 2; entry++)
+            {
+               HYPRE_SStructStencilSetEntry(
+                  G_stencils[s], entry, offsets[s][entry], 0);
+            }
          }
-      }
 
-      /* Set up the gradient graph */
+         /* Set up the gradient graph */
 
-      HYPRE_SStructGraphCreate(hypre_MPI_COMM_WORLD, grid, &G_graph);
-      HYPRE_SStructGraphSetDomainGrid(G_graph, G_grid);
-      HYPRE_SStructGraphSetObjectType(G_graph, HYPRE_PARCSR);
-      for (part = 0; part < data.nparts; part++)
-      {
-         pdata = data.pdata[part];
-         for (var = 0; var < data.ndim; var++)
+         HYPRE_SStructGraphCreate(comm, grid, &G_graph);
+         HYPRE_SStructGraphSetDomainGrid(G_graph, G_grid);
+         HYPRE_SStructGraphSetObjectType(G_graph, HYPRE_PARCSR);
+         for (part = 0; part < data.nparts; part++)
          {
-            HYPRE_SStructGraphSetStencil(G_graph, part, var, G_stencils[var]);
+            pdata = data.pdata[part];
+            for (var = 0; var < data.ndim; var++)
+            {
+               HYPRE_SStructGraphSetStencil(G_graph, part, var, G_stencils[var]);
+            }
          }
-      }
-      HYPRE_SStructGraphAssemble(G_graph);
+         HYPRE_SStructGraphAssemble(G_graph);
 
-      /* Set up the matrix */
+         /* Set up the matrix */
 
-      HYPRE_SStructMatrixCreate(hypre_MPI_COMM_WORLD, G_graph, &G);
-      HYPRE_SStructMatrixSetObjectType(G, HYPRE_PARCSR);
-      HYPRE_SStructMatrixInitialize(G);
-      for (part = 0; part < data.nparts; part++)
-      {
-         pdata = data.pdata[part];
-         for (var = 0; var < data.ndim; var++)
+         HYPRE_SStructMatrixCreate(comm, G_graph, &G);
+         HYPRE_SStructMatrixSetObjectType(G, HYPRE_PARCSR);
+         HYPRE_SStructMatrixInitialize(G);
+         for (part = 0; part < data.nparts; part++)
          {
-            for (i = 0; i < 2; i++)
+            pdata = data.pdata[part];
+            for (var = 0; var < data.ndim; var++)
             {
-               for (j = 0; j < pdata.max_boxsize; j++)
+               for (i = 0; i < 2; i++)
                {
-                  values[j] = stencil_values[i];
-               }
+                  for (j = 0; j < pdata.max_boxsize; j++)
+                  {
+                     values[j] = stencil_values[i];
+                  }
 
-               hypre_TMemcpy(d_values, values, HYPRE_Real, values_size, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
+                  hypre_TMemcpy(d_values, values, HYPRE_Real, values_size, memory_location, HYPRE_MEMORY_HOST);
 
-               for (box = 0; box < pdata.nboxes; box++)
-               {
-                  GetVariableBox(pdata.ilowers[box], pdata.iuppers[box],
-                                 pdata.vartypes[var], ilower, iupper);
-                  HYPRE_SStructMatrixSetBoxValues(G, part, ilower, iupper,
-                                                  var, 1, &i, d_values);
+                  for (box = 0; box < pdata.nboxes; box++)
+                  {
+                     GetVariableBox(pdata.ilowers[box], pdata.iuppers[box],
+                                    pdata.vartypes[var], ilower, iupper);
+                     HYPRE_SStructMatrixSetBoxValues(G, part, ilower, iupper,
+                                                     var, 1, &i, d_values);
+                  }
                }
             }
          }
-      }
-
-      HYPRE_SStructMatrixAssemble(G);
-   }
 
-   /*-----------------------------------------------------------
-    * Print out the system and initial guess
-    *-----------------------------------------------------------*/
+         HYPRE_SStructMatrixAssemble(G);
+      }
 
-   if (print_system)
-   {
-      HYPRE_SStructVectorGather(b);
-      HYPRE_SStructVectorGather(x);
-      HYPRE_SStructMatrixPrint("sstruct.out.A",  A, 0);
-      HYPRE_SStructVectorPrint("sstruct.out.b",  b, 0);
-      HYPRE_SStructVectorPrint("sstruct.out.x0", x, 0);
+      /*-----------------------------------------------------------
+       * Print out the system and initial guess
+       *-----------------------------------------------------------*/
 
-      if (gradient_matrix)
+      if (print_system)
       {
-         HYPRE_SStructMatrixPrint("sstruct.out.G",  G, 0);
+         HYPRE_SStructVectorGather(b);
+         HYPRE_SStructVectorGather(x);
+         HYPRE_SStructMatrixPrint("sstruct.out.A",  A, 0);
+         HYPRE_SStructVectorPrint("sstruct.out.b",  b, 0);
+         HYPRE_SStructVectorPrint("sstruct.out.x0", x, 0);
+
+         if (gradient_matrix)
+         {
+            HYPRE_SStructMatrixPrint("sstruct.out.G",  G, 0);
+         }
       }
-   }
 
-   /*-----------------------------------------------------------
-    * Debugging code
-    *-----------------------------------------------------------*/
+      /*-----------------------------------------------------------
+       * Debugging code
+       *-----------------------------------------------------------*/
 
 #if DEBUG
-   {
-      FILE *file;
-      char  filename[255];
+      {
+         FILE *file;
+         char  filename[255];
 
-      /* result is 1's on the interior of the grid */
-      hypre_SStructMatvec(1.0, A, b, 0.0, x);
-      HYPRE_SStructVectorPrint("sstruct.out.matvec", x, 0);
+         /* result is 1's on the interior of the grid */
+         hypre_SStructMatvec(1.0, A, b, 0.0, x);
+         HYPRE_SStructVectorPrint("sstruct.out.matvec", x, 0);
 
-      /* result is all 1's */
-      hypre_SStructCopy(b, x);
-      HYPRE_SStructVectorPrint("sstruct.out.copy", x, 0);
+         /* result is all 1's */
+         hypre_SStructCopy(b, x);
+         HYPRE_SStructVectorPrint("sstruct.out.copy", x, 0);
 
-      /* result is all 2's */
-      hypre_SStructScale(2.0, x);
-      HYPRE_SStructVectorPrint("sstruct.out.scale", x, 0);
+         /* result is all 2's */
+         hypre_SStructScale(2.0, x);
+         HYPRE_SStructVectorPrint("sstruct.out.scale", x, 0);
 
-      /* result is all 0's */
-      hypre_SStructAxpy(-2.0, b, x);
-      HYPRE_SStructVectorPrint("sstruct.out.axpy", x, 0);
+         /* result is all 0's */
+         hypre_SStructAxpy(-2.0, b, x);
+         HYPRE_SStructVectorPrint("sstruct.out.axpy", x, 0);
 
-      /* result is 1's with 0's on some boundaries */
-      hypre_SStructCopy(b, x);
-      hypre_sprintf(filename, "sstruct.out.gatherpre.%05d", myid);
-      file = fopen(filename, "w");
-      for (part = 0; part < data.nparts; part++)
-      {
-         pdata = data.pdata[part];
-         for (var = 0; var < pdata.nvars; var++)
+         /* result is 1's with 0's on some boundaries */
+         hypre_SStructCopy(b, x);
+         hypre_sprintf(filename, "sstruct.out.gatherpre.%05d", myid);
+         file = fopen(filename, "w");
+         for (part = 0; part < data.nparts; part++)
          {
-            for (box = 0; box < pdata.nboxes; box++)
+            pdata = data.pdata[part];
+            for (var = 0; var < pdata.nvars; var++)
             {
-               GetVariableBox(pdata.ilowers[box], pdata.iuppers[box],
-                              pdata.vartypes[var], ilower, iupper);
-               HYPRE_SStructVectorGetBoxValues(x, part, ilower, iupper,
-                                               var, values);
-               hypre_fprintf(file, "\nPart %d, var %d, box %d:\n", part, var, box);
-               for (i = 0; i < pdata.boxsizes[box]; i++)
+               for (box = 0; box < pdata.nboxes; box++)
                {
-                  hypre_fprintf(file, "%e\n", values[i]);
+                  GetVariableBox(pdata.ilowers[box], pdata.iuppers[box],
+                                 pdata.vartypes[var], ilower, iupper);
+                  HYPRE_SStructVectorGetBoxValues(x, part, ilower, iupper,
+                                                  var, values);
+                  hypre_fprintf(file, "\nPart %d, var %d, box %d:\n", part, var, box);
+                  for (i = 0; i < pdata.boxsizes[box]; i++)
+                  {
+                     hypre_fprintf(file, "%e\n", values[i]);
+                  }
                }
             }
          }
-      }
-      fclose(file);
+         fclose(file);
 
-      /* result is all 1's */
-      HYPRE_SStructVectorGather(x);
-      hypre_sprintf(filename, "sstruct.out.gatherpost.%05d", myid);
-      file = fopen(filename, "w");
-      for (part = 0; part < data.nparts; part++)
-      {
-         pdata = data.pdata[part];
-         for (var = 0; var < pdata.nvars; var++)
+         /* result is all 1's */
+         HYPRE_SStructVectorGather(x);
+         hypre_sprintf(filename, "sstruct.out.gatherpost.%05d", myid);
+         file = fopen(filename, "w");
+         for (part = 0; part < data.nparts; part++)
          {
-            for (box = 0; box < pdata.nboxes; box++)
+            pdata = data.pdata[part];
+            for (var = 0; var < pdata.nvars; var++)
             {
-               GetVariableBox(pdata.ilowers[box], pdata.iuppers[box],
-                              pdata.vartypes[var], ilower, iupper);
-               HYPRE_SStructVectorGetBoxValues(x, part, ilower, iupper,
-                                               var, values);
-               hypre_fprintf(file, "\nPart %d, var %d, box %d:\n", part, var, box);
-               for (i = 0; i < pdata.boxsizes[box]; i++)
+               for (box = 0; box < pdata.nboxes; box++)
                {
-                  hypre_fprintf(file, "%e\n", values[i]);
+                  GetVariableBox(pdata.ilowers[box], pdata.iuppers[box],
+                                 pdata.vartypes[var], ilower, iupper);
+                  HYPRE_SStructVectorGetBoxValues(x, part, ilower, iupper,
+                                                  var, values);
+                  hypre_fprintf(file, "\nPart %d, var %d, box %d:\n", part, var, box);
+                  for (i = 0; i < pdata.boxsizes[box]; i++)
+                  {
+                     hypre_fprintf(file, "%e\n", values[i]);
+                  }
                }
             }
          }
-      }
+         fclose(file);
 
-      /* re-initializes x to 0 */
-      hypre_SStructAxpy(-1.0, b, x);
-   }
+         /* re-initializes x to 0 */
+         hypre_SStructAxpy(-1.0, b, x);
+      }
 #endif
 
-   hypre_TFree(values, HYPRE_MEMORY_HOST);
-   hypre_TFree(d_values, HYPRE_MEMORY_DEVICE);
-
-   /*-----------------------------------------------------------
-    * Solve the system using SysPFMG or Split
-    *-----------------------------------------------------------*/
+      hypre_TFree(values, HYPRE_MEMORY_HOST);
+      hypre_TFree(d_values, memory_location);
 
-   if (solver_id == 3)
-   {
-      time_index = hypre_InitializeTiming("SysPFMG Setup");
-      hypre_BeginTiming(time_index);
+      /*-----------------------------------------------------------
+       * Solve the system using SysPFMG or Split
+       *-----------------------------------------------------------*/
 
-      HYPRE_SStructSysPFMGCreate(hypre_MPI_COMM_WORLD, &solver);
-      HYPRE_SStructSysPFMGSetMaxIter(solver, 100);
-      HYPRE_SStructSysPFMGSetTol(solver, tol);
-      HYPRE_SStructSysPFMGSetRelChange(solver, 0);
-      /* weighted Jacobi = 1; red-black GS = 2 */
-      HYPRE_SStructSysPFMGSetRelaxType(solver, relax);
-      if (usr_jacobi_weight)
+      if (solver_id == 3)
       {
-         HYPRE_SStructSysPFMGSetJacobiWeight(solver, jacobi_weight);
-      }
-      HYPRE_SStructSysPFMGSetNumPreRelax(solver, n_pre);
-      HYPRE_SStructSysPFMGSetNumPostRelax(solver, n_post);
-      HYPRE_SStructSysPFMGSetSkipRelax(solver, skip);
-      /*HYPRE_StructPFMGSetDxyz(solver, dxyz);*/
-      HYPRE_SStructSysPFMGSetPrintLevel(solver, 1);
-      HYPRE_SStructSysPFMGSetLogging(solver, 1);
-      HYPRE_SStructSysPFMGSetup(solver, A, b, x);
-
-      hypre_EndTiming(time_index);
-      hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
-      hypre_FinalizeTiming(time_index);
-      hypre_ClearTiming();
+         time_index = hypre_InitializeTiming("SysPFMG Setup");
+         hypre_BeginTiming(time_index);
 
-      time_index = hypre_InitializeTiming("SysPFMG Solve");
-      hypre_BeginTiming(time_index);
+         HYPRE_SStructSysPFMGCreate(comm, &solver);
+         HYPRE_SStructSysPFMGSetMaxIter(solver, 100);
+         HYPRE_SStructSysPFMGSetTol(solver, tol);
+         HYPRE_SStructSysPFMGSetRelChange(solver, 0);
+         /* weighted Jacobi = 1; red-black GS = 2 */
+         HYPRE_SStructSysPFMGSetRelaxType(solver, relax);
+         if (usr_jacobi_weight)
+         {
+            HYPRE_SStructSysPFMGSetJacobiWeight(solver, jacobi_weight);
+         }
+         HYPRE_SStructSysPFMGSetNumPreRelax(solver, n_pre);
+         HYPRE_SStructSysPFMGSetNumPostRelax(solver, n_post);
+         HYPRE_SStructSysPFMGSetSkipRelax(solver, skip);
+         /*HYPRE_StructPFMGSetDxyz(solver, dxyz);*/
+         HYPRE_SStructSysPFMGSetPrintLevel(solver, prec_print_level);
+         HYPRE_SStructSysPFMGSetLogging(solver, 1);
+         HYPRE_SStructSysPFMGSetup(solver, A, b, x);
 
-      HYPRE_SStructSysPFMGSolve(solver, A, b, x);
+         hypre_EndTiming(time_index);
+         hypre_PrintTiming("Setup phase times", comm);
+         hypre_FinalizeTiming(time_index);
+         hypre_ClearTiming();
 
-      hypre_EndTiming(time_index);
-      hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
-      hypre_FinalizeTiming(time_index);
-      hypre_ClearTiming();
+         time_index = hypre_InitializeTiming("SysPFMG Solve");
+         hypre_BeginTiming(time_index);
 
-      HYPRE_SStructSysPFMGGetNumIterations(solver, &num_iterations);
-      HYPRE_SStructSysPFMGGetFinalRelativeResidualNorm(solver, &final_res_norm);
+         HYPRE_SStructSysPFMGSolve(solver, A, b, x);
 
-      HYPRE_SStructSysPFMGDestroy(solver);
-   }
+         hypre_EndTiming(time_index);
+         hypre_PrintTiming("Solve phase times", comm);
+         hypre_FinalizeTiming(time_index);
+         hypre_ClearTiming();
 
-   else if ((solver_id >= 0) && (solver_id < 10) && (solver_id != 3))
-   {
-      time_index = hypre_InitializeTiming("Split Setup");
-      hypre_BeginTiming(time_index);
+         HYPRE_SStructSysPFMGGetNumIterations(solver, &num_iterations);
+         HYPRE_SStructSysPFMGGetFinalRelativeResidualNorm(solver, &final_res_norm);
 
-      HYPRE_SStructSplitCreate(hypre_MPI_COMM_WORLD, &solver);
-      HYPRE_SStructSplitSetMaxIter(solver, 100);
-      HYPRE_SStructSplitSetTol(solver, tol);
-      if (solver_id == 0)
-      {
-         HYPRE_SStructSplitSetStructSolver(solver, HYPRE_SMG);
-      }
-      else if (solver_id == 1)
-      {
-         HYPRE_SStructSplitSetStructSolver(solver, HYPRE_PFMG);
+         HYPRE_SStructSysPFMGDestroy(solver);
       }
-      else if (solver_id == 8)
-      {
-         HYPRE_SStructSplitSetStructSolver(solver, HYPRE_Jacobi);
-      }
-      HYPRE_SStructSplitSetup(solver, A, b, x);
-
-      hypre_EndTiming(time_index);
-      hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
-      hypre_FinalizeTiming(time_index);
-      hypre_ClearTiming();
-
-      time_index = hypre_InitializeTiming("Split Solve");
-      hypre_BeginTiming(time_index);
-
-      HYPRE_SStructSplitSolve(solver, A, b, x);
-
-      hypre_EndTiming(time_index);
-      hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
-      hypre_FinalizeTiming(time_index);
-      hypre_ClearTiming();
-
-      HYPRE_SStructSplitGetNumIterations(solver, &num_iterations);
-      HYPRE_SStructSplitGetFinalRelativeResidualNorm(solver, &final_res_norm);
-
-      HYPRE_SStructSplitDestroy(solver);
-   }
 
-   /*-----------------------------------------------------------
-    * Solve the system using PCG
-    *-----------------------------------------------------------*/
-
-   if ((solver_id >= 10) && (solver_id < 20))
-   {
-      time_index = hypre_InitializeTiming("PCG Setup");
-      hypre_BeginTiming(time_index);
-
-      HYPRE_SStructPCGCreate(hypre_MPI_COMM_WORLD, &solver);
-      HYPRE_PCGSetMaxIter( (HYPRE_Solver) solver, 100 );
-      HYPRE_PCGSetTol( (HYPRE_Solver) solver, tol );
-      HYPRE_PCGSetTwoNorm( (HYPRE_Solver) solver, 1 );
-      HYPRE_PCGSetRelChange( (HYPRE_Solver) solver, 0 );
-      HYPRE_PCGSetPrintLevel( (HYPRE_Solver) solver, 1 );
-      HYPRE_PCGSetRecomputeResidual( (HYPRE_Solver) solver, recompute_res);
-
-      if ((solver_id == 10) || (solver_id == 11))
+      else if ((solver_id >= 0) && (solver_id < 10) && (solver_id != 3))
       {
-         /* use Split solver as preconditioner */
-         HYPRE_SStructSplitCreate(hypre_MPI_COMM_WORLD, &precond);
-         HYPRE_SStructSplitSetMaxIter(precond, 1);
-         HYPRE_SStructSplitSetTol(precond, 0.0);
-         HYPRE_SStructSplitSetZeroGuess(precond);
-         if (solver_id == 10)
+         time_index = hypre_InitializeTiming("Split Setup");
+         hypre_BeginTiming(time_index);
+
+         HYPRE_SStructSplitCreate(comm, &solver);
+         HYPRE_SStructSplitSetMaxIter(solver, 100);
+         HYPRE_SStructSplitSetTol(solver, tol);
+         if (solver_id == 0)
          {
-            HYPRE_SStructSplitSetStructSolver(precond, HYPRE_SMG);
+            HYPRE_SStructSplitSetStructSolver(solver, HYPRE_SMG);
          }
-         else if (solver_id == 11)
+         else if (solver_id == 1)
          {
-            HYPRE_SStructSplitSetStructSolver(precond, HYPRE_PFMG);
+            HYPRE_SStructSplitSetStructSolver(solver, HYPRE_PFMG);
          }
-         HYPRE_PCGSetPrecond( (HYPRE_Solver) solver,
-                              (HYPRE_PtrToSolverFcn) HYPRE_SStructSplitSolve,
-                              (HYPRE_PtrToSolverFcn) HYPRE_SStructSplitSetup,
-                              (HYPRE_Solver) precond);
-      }
-
-      else if (solver_id == 13)
-      {
-         /* use SysPFMG solver as preconditioner */
-         HYPRE_SStructSysPFMGCreate(hypre_MPI_COMM_WORLD, &precond);
-         HYPRE_SStructSysPFMGSetMaxIter(precond, 1);
-         HYPRE_SStructSysPFMGSetTol(precond, 0.0);
-         HYPRE_SStructSysPFMGSetZeroGuess(precond);
-         /* weighted Jacobi = 1; red-black GS = 2 */
-         HYPRE_SStructSysPFMGSetRelaxType(precond, relax);
-         if (usr_jacobi_weight)
+         else if (solver_id == 8)
          {
-            HYPRE_SStructSysPFMGSetJacobiWeight(precond, jacobi_weight);
+            HYPRE_SStructSplitSetStructSolver(solver, HYPRE_Jacobi);
          }
-         HYPRE_SStructSysPFMGSetNumPreRelax(precond, n_pre);
-         HYPRE_SStructSysPFMGSetNumPostRelax(precond, n_post);
-         HYPRE_SStructSysPFMGSetSkipRelax(precond, skip);
-         /*HYPRE_StructPFMGSetDxyz(precond, dxyz);*/
-         HYPRE_PCGSetPrecond( (HYPRE_Solver) solver,
-                              (HYPRE_PtrToSolverFcn) HYPRE_SStructSysPFMGSolve,
-                              (HYPRE_PtrToSolverFcn) HYPRE_SStructSysPFMGSetup,
-                              (HYPRE_Solver) precond);
-
-      }
-      else if (solver_id == 18)
-      {
-         /* use diagonal scaling as preconditioner */
-         precond = NULL;
-         HYPRE_PCGSetPrecond( (HYPRE_Solver) solver,
-                              (HYPRE_PtrToSolverFcn) HYPRE_SStructDiagScale,
-                              (HYPRE_PtrToSolverFcn) HYPRE_SStructDiagScaleSetup,
-                              (HYPRE_Solver) precond);
-      }
+         HYPRE_SStructSplitSetup(solver, A, b, x);
 
-      HYPRE_PCGSetup( (HYPRE_Solver) solver, (HYPRE_Matrix) A,
-                      (HYPRE_Vector) b, (HYPRE_Vector) x);
-
-      hypre_EndTiming(time_index);
-      hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
-      hypre_FinalizeTiming(time_index);
-      hypre_ClearTiming();
+         hypre_EndTiming(time_index);
+         hypre_PrintTiming("Setup phase times", comm);
+         hypre_FinalizeTiming(time_index);
+         hypre_ClearTiming();
 
-      time_index = hypre_InitializeTiming("PCG Solve");
-      hypre_BeginTiming(time_index);
+         time_index = hypre_InitializeTiming("Split Solve");
+         hypre_BeginTiming(time_index);
 
-      HYPRE_PCGSolve( (HYPRE_Solver) solver, (HYPRE_Matrix) A,
-                      (HYPRE_Vector) b, (HYPRE_Vector) x);
+         HYPRE_SStructSplitSolve(solver, A, b, x);
 
-      hypre_EndTiming(time_index);
-      hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
-      hypre_FinalizeTiming(time_index);
-      hypre_ClearTiming();
+         hypre_EndTiming(time_index);
+         hypre_PrintTiming("Solve phase times", comm);
+         hypre_FinalizeTiming(time_index);
+         hypre_ClearTiming();
 
-      HYPRE_PCGGetNumIterations( (HYPRE_Solver) solver, &num_iterations );
-      HYPRE_PCGGetFinalRelativeResidualNorm( (HYPRE_Solver) solver, &final_res_norm );
-      HYPRE_SStructPCGDestroy(solver);
+         HYPRE_SStructSplitGetNumIterations(solver, &num_iterations);
+         HYPRE_SStructSplitGetFinalRelativeResidualNorm(solver, &final_res_norm);
 
-      if ((solver_id == 10) || (solver_id == 11))
-      {
-         HYPRE_SStructSplitDestroy(precond);
-      }
-      else if (solver_id == 13)
-      {
-         HYPRE_SStructSysPFMGDestroy(precond);
+         HYPRE_SStructSplitDestroy(solver);
       }
-   }
-
-   /* begin lobpcg */
-
-   /*-----------------------------------------------------------
-    * Solve the eigenvalue problem using LOBPCG
-    *-----------------------------------------------------------*/
-
-   if ( lobpcgFlag && ( solver_id < 10 || solver_id >= 20 ) && verbosity )
-      hypre_printf("\nLOBPCG works with solvers 10, 11, 13 and 18 only\n");
-
-   if ( lobpcgFlag && (solver_id >= 10) && (solver_id < 20) ) {
 
-      interpreter = hypre_CTAlloc(mv_InterfaceInterpreter, 1, HYPRE_MEMORY_HOST);
-
-      HYPRE_SStructSetupInterpreter( interpreter );
-      HYPRE_SStructSetupMatvec(&matvec_fn);
-
-      if (myid != 0)
-         verbosity = 0;
-
-      if ( pcgIterations > 0 ) {
+      /*-----------------------------------------------------------
+       * Solve the system using PCG
+       *-----------------------------------------------------------*/
 
+      if ((solver_id >= 10) && (solver_id < 20))
+      {
          time_index = hypre_InitializeTiming("PCG Setup");
          hypre_BeginTiming(time_index);
 
-         HYPRE_SStructPCGCreate(hypre_MPI_COMM_WORLD, &solver);
-         HYPRE_PCGSetMaxIter( (HYPRE_Solver) solver, pcgIterations );
-         HYPRE_PCGSetTol( (HYPRE_Solver) solver, pcgTol );
+         HYPRE_SStructPCGCreate(comm, &solver);
+         HYPRE_PCGSetMaxIter( (HYPRE_Solver) solver, 100 );
+         HYPRE_PCGSetTol( (HYPRE_Solver) solver, tol );
          HYPRE_PCGSetTwoNorm( (HYPRE_Solver) solver, 1 );
          HYPRE_PCGSetRelChange( (HYPRE_Solver) solver, 0 );
-         HYPRE_PCGSetPrintLevel( (HYPRE_Solver) solver, 0 );
+         HYPRE_PCGSetPrintLevel( (HYPRE_Solver) solver, solver_print_level );
+         HYPRE_PCGSetRecomputeResidual( (HYPRE_Solver) solver, recompute_res);
 
          if ((solver_id == 10) || (solver_id == 11))
          {
             /* use Split solver as preconditioner */
-            HYPRE_SStructSplitCreate(hypre_MPI_COMM_WORLD, &precond);
+            HYPRE_SStructSplitCreate(comm, &precond);
             HYPRE_SStructSplitSetMaxIter(precond, 1);
             HYPRE_SStructSplitSetTol(precond, 0.0);
             HYPRE_SStructSplitSetZeroGuess(precond);
@@ -3988,12 +4144,16 @@ main( hypre_int argc,
          else if (solver_id == 13)
          {
             /* use SysPFMG solver as preconditioner */
-            HYPRE_SStructSysPFMGCreate(hypre_MPI_COMM_WORLD, &precond);
+            HYPRE_SStructSysPFMGCreate(comm, &precond);
             HYPRE_SStructSysPFMGSetMaxIter(precond, 1);
             HYPRE_SStructSysPFMGSetTol(precond, 0.0);
             HYPRE_SStructSysPFMGSetZeroGuess(precond);
             /* weighted Jacobi = 1; red-black GS = 2 */
-            HYPRE_SStructSysPFMGSetRelaxType(precond, 1);
+            HYPRE_SStructSysPFMGSetRelaxType(precond, relax);
+            if (usr_jacobi_weight)
+            {
+               HYPRE_SStructSysPFMGSetJacobiWeight(precond, jacobi_weight);
+            }
             HYPRE_SStructSysPFMGSetNumPreRelax(precond, n_pre);
             HYPRE_SStructSysPFMGSetNumPostRelax(precond, n_post);
             HYPRE_SStructSysPFMGSetSkipRelax(precond, skip);
@@ -4013,114 +4173,29 @@ main( hypre_int argc,
                                  (HYPRE_PtrToSolverFcn) HYPRE_SStructDiagScaleSetup,
                                  (HYPRE_Solver) precond);
          }
-         else if (solver_id != NO_SOLVER )
-         {
-            if ( verbosity )
-               hypre_printf("Solver ID not recognized - running inner PCG iterations without preconditioner\n\n");
-         }
 
+         HYPRE_PCGSetup( (HYPRE_Solver) solver, (HYPRE_Matrix) A,
+                         (HYPRE_Vector) b, (HYPRE_Vector) x);
 
          hypre_EndTiming(time_index);
-         hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
+         hypre_PrintTiming("Setup phase times", comm);
          hypre_FinalizeTiming(time_index);
          hypre_ClearTiming();
 
-         HYPRE_LOBPCGCreate(interpreter, &matvec_fn, (HYPRE_Solver*)&lobpcg_solver);
-         HYPRE_LOBPCGSetMaxIter((HYPRE_Solver)lobpcg_solver, maxIterations);
-         HYPRE_LOBPCGSetPrecondUsageMode((HYPRE_Solver)lobpcg_solver, pcgMode);
-         HYPRE_LOBPCGSetTol((HYPRE_Solver)lobpcg_solver, tol);
-         HYPRE_LOBPCGSetPrintLevel((HYPRE_Solver)lobpcg_solver, verbosity);
-
-         HYPRE_LOBPCGSetPrecond((HYPRE_Solver)lobpcg_solver,
-                                (HYPRE_PtrToSolverFcn) HYPRE_PCGSolve,
-                                (HYPRE_PtrToSolverFcn) HYPRE_PCGSetup,
-                                (HYPRE_Solver)solver);
-
-         HYPRE_LOBPCGSetup((HYPRE_Solver)lobpcg_solver, (HYPRE_Matrix)A,
-                           (HYPRE_Vector)b, (HYPRE_Vector)x);
-
-         eigenvectors = mv_MultiVectorCreateFromSampleVector( interpreter,
-                                                              blockSize,
-                                                              x );
-         eigenvalues = hypre_CTAlloc(HYPRE_Real,  blockSize, HYPRE_MEMORY_HOST);
-
-         if ( lobpcgSeed )
-            mv_MultiVectorSetRandom( eigenvectors, lobpcgSeed );
-         else
-            mv_MultiVectorSetRandom( eigenvectors, (HYPRE_Int)time(0) );
-
          time_index = hypre_InitializeTiming("PCG Solve");
          hypre_BeginTiming(time_index);
 
-         HYPRE_LOBPCGSolve((HYPRE_Solver)lobpcg_solver, constrains,
-                           eigenvectors, eigenvalues );
+         HYPRE_PCGSolve( (HYPRE_Solver) solver, (HYPRE_Matrix) A,
+                         (HYPRE_Vector) b, (HYPRE_Vector) x);
 
          hypre_EndTiming(time_index);
-         hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
+         hypre_PrintTiming("Solve phase times", comm);
          hypre_FinalizeTiming(time_index);
          hypre_ClearTiming();
 
-         if ( checkOrtho ) {
-
-            gramXX = utilities_FortranMatrixCreate();
-            identity = utilities_FortranMatrixCreate();
-
-            utilities_FortranMatrixAllocateData( blockSize, blockSize, gramXX );
-            utilities_FortranMatrixAllocateData( blockSize, blockSize, identity );
-
-            lobpcg_MultiVectorByMultiVector( eigenvectors, eigenvectors, gramXX );
-            utilities_FortranMatrixSetToIdentity( identity );
-            utilities_FortranMatrixAdd( -1, identity, gramXX, gramXX );
-            nonOrthF = utilities_FortranMatrixFNorm( gramXX );
-            if ( myid == 0 )
-               hypre_printf("Non-orthonormality of eigenvectors: %12.5e\n", nonOrthF);
-
-            utilities_FortranMatrixDestroy( gramXX );
-            utilities_FortranMatrixDestroy( identity );
-
-         }
-
-         if ( printLevel ) {
-
-            if ( myid == 0 ) {
-               if ( (filePtr = fopen("values.txt", "w")) ) {
-                  hypre_fprintf(filePtr, "%d\n", blockSize);
-                  for ( i = 0; i < blockSize; i++ )
-                     hypre_fprintf(filePtr, "%22.14e\n", eigenvalues[i]);
-                  fclose(filePtr);
-               }
-
-               if ( (filePtr = fopen("residuals.txt", "w")) ) {
-                  residualNorms = HYPRE_LOBPCGResidualNorms( (HYPRE_Solver)lobpcg_solver );
-                  residuals = utilities_FortranMatrixValues( residualNorms );
-                  hypre_fprintf(filePtr, "%d\n", blockSize);
-                  for ( i = 0; i < blockSize; i++ )
-                     hypre_fprintf(filePtr, "%22.14e\n", residuals[i]);
-                  fclose(filePtr);
-               }
-
-               if ( printLevel > 1 ) {
-
-                  printBuffer = utilities_FortranMatrixCreate();
-
-                  iterations = HYPRE_LOBPCGIterations( (HYPRE_Solver)lobpcg_solver );
-
-                  eigenvaluesHistory = HYPRE_LOBPCGEigenvaluesHistory( (HYPRE_Solver)lobpcg_solver );
-                  utilities_FortranMatrixSelectBlock( eigenvaluesHistory,
-                                                      1, blockSize, 1, iterations + 1, printBuffer );
-                  utilities_FortranMatrixPrint( printBuffer, "val_hist.txt" );
-
-                  residualNormsHistory = HYPRE_LOBPCGResidualNormsHistory( (HYPRE_Solver)lobpcg_solver );
-                  utilities_FortranMatrixSelectBlock(residualNormsHistory,
-                                                     1, blockSize, 1, iterations + 1, printBuffer );
-                  utilities_FortranMatrixPrint( printBuffer, "res_hist.txt" );
-
-                  utilities_FortranMatrixDestroy( printBuffer );
-               }
-            }
-         }
-
-         HYPRE_SStructPCGDestroy(solver);
+         HYPRE_PCGGetNumIterations( (HYPRE_Solver) solver, &num_iterations );
+         HYPRE_PCGGetFinalRelativeResidualNorm( (HYPRE_Solver) solver, &final_res_norm );
+         HYPRE_SStructPCGDestroy(solver);
 
          if ((solver_id == 10) || (solver_id == 11))
          {
@@ -4130,1858 +4205,2115 @@ main( hypre_int argc,
          {
             HYPRE_SStructSysPFMGDestroy(precond);
          }
+      }
+
+      /* begin lobpcg */
 
-         HYPRE_LOBPCGDestroy((HYPRE_Solver)lobpcg_solver);
-         mv_MultiVectorDestroy( eigenvectors );
-         hypre_TFree(eigenvalues, HYPRE_MEMORY_HOST);
+      /*-----------------------------------------------------------
+       * Solve the eigenvalue problem using LOBPCG
+       *-----------------------------------------------------------*/
+
+      if ( lobpcgFlag && ( solver_id < 10 || solver_id >= 20 ) && verbosity )
+      {
+         hypre_printf("\nLOBPCG works with solvers 10, 11, 13 and 18 only\n");
       }
-      else {
 
-         time_index = hypre_InitializeTiming("LOBPCG Setup");
-         hypre_BeginTiming(time_index);
+      if ( lobpcgFlag && (solver_id >= 10) && (solver_id < 20) )
+      {
 
-         HYPRE_LOBPCGCreate(interpreter, &matvec_fn, (HYPRE_Solver*)&solver);
-         HYPRE_LOBPCGSetMaxIter( (HYPRE_Solver) solver, maxIterations );
-         HYPRE_LOBPCGSetTol( (HYPRE_Solver) solver, tol );
-         HYPRE_LOBPCGSetPrintLevel( (HYPRE_Solver) solver, verbosity );
+         interpreter = hypre_CTAlloc(mv_InterfaceInterpreter, 1, HYPRE_MEMORY_HOST);
 
-         if ((solver_id == 10) || (solver_id == 11))
+         HYPRE_SStructSetupInterpreter( interpreter );
+         HYPRE_SStructSetupMatvec(&matvec_fn);
+
+         if (myid != 0)
          {
-            /* use Split solver as preconditioner */
-            HYPRE_SStructSplitCreate(hypre_MPI_COMM_WORLD, &precond);
-            HYPRE_SStructSplitSetMaxIter(precond, 1);
-            HYPRE_SStructSplitSetTol(precond, 0.0);
-            HYPRE_SStructSplitSetZeroGuess(precond);
-            if (solver_id == 10)
-            {
-               HYPRE_SStructSplitSetStructSolver(precond, HYPRE_SMG);
-            }
-            else if (solver_id == 11)
+            verbosity = 0;
+         }
+
+         if ( pcgIterations > 0 )
+         {
+
+            time_index = hypre_InitializeTiming("PCG Setup");
+            hypre_BeginTiming(time_index);
+
+            HYPRE_SStructPCGCreate(comm, &solver);
+            HYPRE_PCGSetMaxIter( (HYPRE_Solver) solver, pcgIterations );
+            HYPRE_PCGSetTol( (HYPRE_Solver) solver, pcgTol );
+            HYPRE_PCGSetTwoNorm( (HYPRE_Solver) solver, 1 );
+            HYPRE_PCGSetRelChange( (HYPRE_Solver) solver, 0 );
+            HYPRE_PCGSetPrintLevel( (HYPRE_Solver) solver, solver_print_level );
+
+            if ((solver_id == 10) || (solver_id == 11))
             {
-               HYPRE_SStructSplitSetStructSolver(precond, HYPRE_PFMG);
-            }
-            HYPRE_LOBPCGSetPrecond( (HYPRE_Solver) solver,
+               /* use Split solver as preconditioner */
+               HYPRE_SStructSplitCreate(comm, &precond);
+               HYPRE_SStructSplitSetMaxIter(precond, 1);
+               HYPRE_SStructSplitSetTol(precond, 0.0);
+               HYPRE_SStructSplitSetZeroGuess(precond);
+               if (solver_id == 10)
+               {
+                  HYPRE_SStructSplitSetStructSolver(precond, HYPRE_SMG);
+               }
+               else if (solver_id == 11)
+               {
+                  HYPRE_SStructSplitSetStructSolver(precond, HYPRE_PFMG);
+               }
+               HYPRE_PCGSetPrecond( (HYPRE_Solver) solver,
                                     (HYPRE_PtrToSolverFcn) HYPRE_SStructSplitSolve,
                                     (HYPRE_PtrToSolverFcn) HYPRE_SStructSplitSetup,
                                     (HYPRE_Solver) precond);
-         }
+            }
 
-         else if (solver_id == 13)
-         {
-            /* use SysPFMG solver as preconditioner */
-            HYPRE_SStructSysPFMGCreate(hypre_MPI_COMM_WORLD, &precond);
-            HYPRE_SStructSysPFMGSetMaxIter(precond, 1);
-            HYPRE_SStructSysPFMGSetTol(precond, 0.0);
-            HYPRE_SStructSysPFMGSetZeroGuess(precond);
-            /* weighted Jacobi = 1; red-black GS = 2 */
-            HYPRE_SStructSysPFMGSetRelaxType(precond, 1);
-            HYPRE_SStructSysPFMGSetNumPreRelax(precond, n_pre);
-            HYPRE_SStructSysPFMGSetNumPostRelax(precond, n_post);
-            HYPRE_SStructSysPFMGSetSkipRelax(precond, skip);
-            /*HYPRE_StructPFMGSetDxyz(precond, dxyz);*/
-            HYPRE_LOBPCGSetPrecond( (HYPRE_Solver) solver,
+            else if (solver_id == 13)
+            {
+               /* use SysPFMG solver as preconditioner */
+               HYPRE_SStructSysPFMGCreate(comm, &precond);
+               HYPRE_SStructSysPFMGSetMaxIter(precond, 1);
+               HYPRE_SStructSysPFMGSetTol(precond, 0.0);
+               HYPRE_SStructSysPFMGSetZeroGuess(precond);
+               /* weighted Jacobi = 1; red-black GS = 2 */
+               HYPRE_SStructSysPFMGSetRelaxType(precond, 1);
+               HYPRE_SStructSysPFMGSetNumPreRelax(precond, n_pre);
+               HYPRE_SStructSysPFMGSetNumPostRelax(precond, n_post);
+               HYPRE_SStructSysPFMGSetSkipRelax(precond, skip);
+               /*HYPRE_StructPFMGSetDxyz(precond, dxyz);*/
+               HYPRE_PCGSetPrecond( (HYPRE_Solver) solver,
                                     (HYPRE_PtrToSolverFcn) HYPRE_SStructSysPFMGSolve,
                                     (HYPRE_PtrToSolverFcn) HYPRE_SStructSysPFMGSetup,
                                     (HYPRE_Solver) precond);
 
-         }
-         else if (solver_id == 18)
-         {
-            /* use diagonal scaling as preconditioner */
-            precond = NULL;
-            HYPRE_LOBPCGSetPrecond( (HYPRE_Solver) solver,
+            }
+            else if (solver_id == 18)
+            {
+               /* use diagonal scaling as preconditioner */
+               precond = NULL;
+               HYPRE_PCGSetPrecond( (HYPRE_Solver) solver,
                                     (HYPRE_PtrToSolverFcn) HYPRE_SStructDiagScale,
                                     (HYPRE_PtrToSolverFcn) HYPRE_SStructDiagScaleSetup,
                                     (HYPRE_Solver) precond);
-         }
-         else if (solver_id != NO_SOLVER )
-         {
-            if ( verbosity )
-               hypre_printf("Solver ID not recognized - running LOBPCG without preconditioner\n\n");
-         }
-
-         HYPRE_LOBPCGSetup( (HYPRE_Solver) solver, (HYPRE_Matrix) A,
-                            (HYPRE_Vector) b, (HYPRE_Vector) x);
+            }
+            else if (solver_id != NO_SOLVER )
+            {
+               if ( verbosity )
+               {
+                  hypre_printf("Solver ID not recognized - running inner PCG iterations without preconditioner\n\n");
+               }
+            }
 
-         hypre_EndTiming(time_index);
-         hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
-         hypre_FinalizeTiming(time_index);
-         hypre_ClearTiming();
 
-         eigenvectors = mv_MultiVectorCreateFromSampleVector( interpreter,
-                                                              blockSize,
-                                                              x );
-         eigenvalues = hypre_CTAlloc(HYPRE_Real,  blockSize, HYPRE_MEMORY_HOST);
+            hypre_EndTiming(time_index);
+            hypre_PrintTiming("Setup phase times", comm);
+            hypre_FinalizeTiming(time_index);
+            hypre_ClearTiming();
 
-         if ( lobpcgSeed )
-            mv_MultiVectorSetRandom( eigenvectors, lobpcgSeed );
-         else
-            mv_MultiVectorSetRandom( eigenvectors, (HYPRE_Int)time(0) );
+            HYPRE_LOBPCGCreate(interpreter, &matvec_fn, (HYPRE_Solver*)&lobpcg_solver);
+            HYPRE_LOBPCGSetMaxIter((HYPRE_Solver)lobpcg_solver, maxIterations);
+            HYPRE_LOBPCGSetPrecondUsageMode((HYPRE_Solver)lobpcg_solver, pcgMode);
+            HYPRE_LOBPCGSetTol((HYPRE_Solver)lobpcg_solver, tol);
+            HYPRE_LOBPCGSetPrintLevel((HYPRE_Solver)lobpcg_solver, verbosity);
 
-         time_index = hypre_InitializeTiming("LOBPCG Solve");
-         hypre_BeginTiming(time_index);
+            HYPRE_LOBPCGSetPrecond((HYPRE_Solver)lobpcg_solver,
+                                   (HYPRE_PtrToSolverFcn) HYPRE_PCGSolve,
+                                   (HYPRE_PtrToSolverFcn) HYPRE_PCGSetup,
+                                   (HYPRE_Solver)solver);
 
-         HYPRE_LOBPCGSolve
-            ( (HYPRE_Solver) solver, constrains, eigenvectors, eigenvalues );
+            HYPRE_LOBPCGSetup((HYPRE_Solver)lobpcg_solver, (HYPRE_Matrix)A,
+                              (HYPRE_Vector)b, (HYPRE_Vector)x);
 
-         hypre_EndTiming(time_index);
-         hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
-         hypre_FinalizeTiming(time_index);
-         hypre_ClearTiming();
+            eigenvectors = mv_MultiVectorCreateFromSampleVector( interpreter,
+                                                                 blockSize,
+                                                                 x );
+            eigenvalues = hypre_CTAlloc(HYPRE_Real,  blockSize, HYPRE_MEMORY_HOST);
 
-         if ( checkOrtho ) {
+            if ( lobpcgSeed )
+            {
+               mv_MultiVectorSetRandom( eigenvectors, lobpcgSeed );
+            }
+            else
+            {
+               mv_MultiVectorSetRandom( eigenvectors, (HYPRE_Int)time(0) );
+            }
 
-            gramXX = utilities_FortranMatrixCreate();
-            identity = utilities_FortranMatrixCreate();
+            time_index = hypre_InitializeTiming("PCG Solve");
+            hypre_BeginTiming(time_index);
 
-            utilities_FortranMatrixAllocateData( blockSize, blockSize, gramXX );
-            utilities_FortranMatrixAllocateData( blockSize, blockSize, identity );
+            HYPRE_LOBPCGSolve((HYPRE_Solver)lobpcg_solver, constrains,
+                              eigenvectors, eigenvalues );
 
-            lobpcg_MultiVectorByMultiVector( eigenvectors, eigenvectors, gramXX );
-            utilities_FortranMatrixSetToIdentity( identity );
-            utilities_FortranMatrixAdd( -1, identity, gramXX, gramXX );
-            nonOrthF = utilities_FortranMatrixFNorm( gramXX );
-            if ( myid == 0 )
-               hypre_printf("Non-orthonormality of eigenvectors: %12.5e\n", nonOrthF);
+            hypre_EndTiming(time_index);
+            hypre_PrintTiming("Solve phase times", comm);
+            hypre_FinalizeTiming(time_index);
+            hypre_ClearTiming();
 
-            utilities_FortranMatrixDestroy( gramXX );
-            utilities_FortranMatrixDestroy( identity );
+            if ( checkOrtho )
+            {
 
-         }
+               gramXX = utilities_FortranMatrixCreate();
+               identity = utilities_FortranMatrixCreate();
 
-         if ( printLevel ) {
+               utilities_FortranMatrixAllocateData( blockSize, blockSize, gramXX );
+               utilities_FortranMatrixAllocateData( blockSize, blockSize, identity );
 
-            if ( myid == 0 ) {
-               if ( (filePtr = fopen("values.txt", "w")) ) {
-                  hypre_fprintf(filePtr, "%d\n", blockSize);
-                  for ( i = 0; i < blockSize; i++ )
-                     hypre_fprintf(filePtr, "%22.14e\n", eigenvalues[i]);
-                  fclose(filePtr);
+               lobpcg_MultiVectorByMultiVector( eigenvectors, eigenvectors, gramXX );
+               utilities_FortranMatrixSetToIdentity( identity );
+               utilities_FortranMatrixAdd( -1, identity, gramXX, gramXX );
+               nonOrthF = utilities_FortranMatrixFNorm( gramXX );
+               if ( myid == 0 )
+               {
+                  hypre_printf("Non-orthonormality of eigenvectors: %12.5e\n", nonOrthF);
                }
 
-               if ( (filePtr = fopen("residuals.txt", "w")) ) {
-                  residualNorms = HYPRE_LOBPCGResidualNorms( (HYPRE_Solver)solver );
-                  residuals = utilities_FortranMatrixValues( residualNorms );
-                  hypre_fprintf(filePtr, "%d\n", blockSize);
-                  for ( i = 0; i < blockSize; i++ )
-                     hypre_fprintf(filePtr, "%22.14e\n", residuals[i]);
-                  fclose(filePtr);
-               }
+               utilities_FortranMatrixDestroy( gramXX );
+               utilities_FortranMatrixDestroy( identity );
+
+            }
+
+            if ( printLevel )
+            {
+
+               if ( myid == 0 )
+               {
+                  if ( (filePtr = fopen("values.txt", "w")) )
+                  {
+                     hypre_fprintf(filePtr, "%d\n", blockSize);
+                     for ( i = 0; i < blockSize; i++ )
+                     {
+                        hypre_fprintf(filePtr, "%22.14e\n", eigenvalues[i]);
+                     }
+                     fclose(filePtr);
+                  }
+
+                  if ( (filePtr = fopen("residuals.txt", "w")) )
+                  {
+                     residualNorms = HYPRE_LOBPCGResidualNorms( (HYPRE_Solver)lobpcg_solver );
+                     residuals = utilities_FortranMatrixValues( residualNorms );
+                     hypre_fprintf(filePtr, "%d\n", blockSize);
+                     for ( i = 0; i < blockSize; i++ )
+                     {
+                        hypre_fprintf(filePtr, "%22.14e\n", residuals[i]);
+                     }
+                     fclose(filePtr);
+                  }
 
-               if ( printLevel > 1 ) {
+                  if ( printLevel > 1 )
+                  {
 
-                  printBuffer = utilities_FortranMatrixCreate();
+                     printBuffer = utilities_FortranMatrixCreate();
 
-                  iterations = HYPRE_LOBPCGIterations( (HYPRE_Solver)solver );
+                     iterations = HYPRE_LOBPCGIterations( (HYPRE_Solver)lobpcg_solver );
 
-                  eigenvaluesHistory = HYPRE_LOBPCGEigenvaluesHistory( (HYPRE_Solver)solver );
-                  utilities_FortranMatrixSelectBlock( eigenvaluesHistory,
-                                                      1, blockSize, 1, iterations + 1, printBuffer );
-                  utilities_FortranMatrixPrint( printBuffer, "val_hist.txt" );
+                     eigenvaluesHistory = HYPRE_LOBPCGEigenvaluesHistory( (HYPRE_Solver)lobpcg_solver );
+                     utilities_FortranMatrixSelectBlock( eigenvaluesHistory,
+                                                         1, blockSize, 1, iterations + 1, printBuffer );
+                     utilities_FortranMatrixPrint( printBuffer, "val_hist.txt" );
 
-                  residualNormsHistory = HYPRE_LOBPCGResidualNormsHistory( (HYPRE_Solver)solver );
-                  utilities_FortranMatrixSelectBlock(residualNormsHistory,
-                                                     1, blockSize, 1, iterations + 1, printBuffer );
-                  utilities_FortranMatrixPrint( printBuffer, "res_hist.txt" );
+                     residualNormsHistory = HYPRE_LOBPCGResidualNormsHistory( (HYPRE_Solver)lobpcg_solver );
+                     utilities_FortranMatrixSelectBlock(residualNormsHistory,
+                                                        1, blockSize, 1, iterations + 1, printBuffer );
+                     utilities_FortranMatrixPrint( printBuffer, "res_hist.txt" );
 
-                  utilities_FortranMatrixDestroy( printBuffer );
+                     utilities_FortranMatrixDestroy( printBuffer );
+                  }
                }
             }
-         }
 
-         HYPRE_LOBPCGDestroy((HYPRE_Solver)solver);
+            HYPRE_SStructPCGDestroy(solver);
 
-         if ((solver_id == 10) || (solver_id == 11))
-         {
-            HYPRE_SStructSplitDestroy(precond);
+            if ((solver_id == 10) || (solver_id == 11))
+            {
+               HYPRE_SStructSplitDestroy(precond);
+            }
+            else if (solver_id == 13)
+            {
+               HYPRE_SStructSysPFMGDestroy(precond);
+            }
+
+            HYPRE_LOBPCGDestroy((HYPRE_Solver)lobpcg_solver);
+            mv_MultiVectorDestroy( eigenvectors );
+            hypre_TFree(eigenvalues, HYPRE_MEMORY_HOST);
          }
-         else if (solver_id == 13)
+         else
          {
-            HYPRE_SStructSysPFMGDestroy(precond);
-         }
 
-         mv_MultiVectorDestroy( eigenvectors );
-         hypre_TFree(eigenvalues, HYPRE_MEMORY_HOST);
-      }
+            time_index = hypre_InitializeTiming("LOBPCG Setup");
+            hypre_BeginTiming(time_index);
 
-      hypre_TFree( interpreter , HYPRE_MEMORY_HOST);
+            HYPRE_LOBPCGCreate(interpreter, &matvec_fn, (HYPRE_Solver*)&solver);
+            HYPRE_LOBPCGSetMaxIter( (HYPRE_Solver) solver, maxIterations );
+            HYPRE_LOBPCGSetTol( (HYPRE_Solver) solver, tol );
+            HYPRE_LOBPCGSetPrintLevel( (HYPRE_Solver) solver, verbosity );
 
-   }
+            if ((solver_id == 10) || (solver_id == 11))
+            {
+               /* use Split solver as preconditioner */
+               HYPRE_SStructSplitCreate(comm, &precond);
+               HYPRE_SStructSplitSetMaxIter(precond, 1);
+               HYPRE_SStructSplitSetTol(precond, 0.0);
+               HYPRE_SStructSplitSetZeroGuess(precond);
+               if (solver_id == 10)
+               {
+                  HYPRE_SStructSplitSetStructSolver(precond, HYPRE_SMG);
+               }
+               else if (solver_id == 11)
+               {
+                  HYPRE_SStructSplitSetStructSolver(precond, HYPRE_PFMG);
+               }
+               HYPRE_LOBPCGSetPrecond( (HYPRE_Solver) solver,
+                                       (HYPRE_PtrToSolverFcn) HYPRE_SStructSplitSolve,
+                                       (HYPRE_PtrToSolverFcn) HYPRE_SStructSplitSetup,
+                                       (HYPRE_Solver) precond);
+            }
 
-   /* end lobpcg */
+            else if (solver_id == 13)
+            {
+               /* use SysPFMG solver as preconditioner */
+               HYPRE_SStructSysPFMGCreate(comm, &precond);
+               HYPRE_SStructSysPFMGSetMaxIter(precond, 1);
+               HYPRE_SStructSysPFMGSetTol(precond, 0.0);
+               HYPRE_SStructSysPFMGSetZeroGuess(precond);
+               /* weighted Jacobi = 1; red-black GS = 2 */
+               HYPRE_SStructSysPFMGSetRelaxType(precond, 1);
+               HYPRE_SStructSysPFMGSetNumPreRelax(precond, n_pre);
+               HYPRE_SStructSysPFMGSetNumPostRelax(precond, n_post);
+               HYPRE_SStructSysPFMGSetSkipRelax(precond, skip);
+               /*HYPRE_StructPFMGSetDxyz(precond, dxyz);*/
+               HYPRE_LOBPCGSetPrecond( (HYPRE_Solver) solver,
+                                       (HYPRE_PtrToSolverFcn) HYPRE_SStructSysPFMGSolve,
+                                       (HYPRE_PtrToSolverFcn) HYPRE_SStructSysPFMGSetup,
+                                       (HYPRE_Solver) precond);
 
-   /*-----------------------------------------------------------
-    * Solve the system using ParCSR version of PCG
-    *-----------------------------------------------------------*/
+            }
+            else if (solver_id == 18)
+            {
+               /* use diagonal scaling as preconditioner */
+               precond = NULL;
+               HYPRE_LOBPCGSetPrecond( (HYPRE_Solver) solver,
+                                       (HYPRE_PtrToSolverFcn) HYPRE_SStructDiagScale,
+                                       (HYPRE_PtrToSolverFcn) HYPRE_SStructDiagScaleSetup,
+                                       (HYPRE_Solver) precond);
+            }
+            else if (solver_id != NO_SOLVER )
+            {
+               if ( verbosity )
+               {
+                  hypre_printf("Solver ID not recognized - running LOBPCG without preconditioner\n\n");
+               }
+            }
 
-   if ((solver_id >= 20) && (solver_id < 30))
-   {
-      time_index = hypre_InitializeTiming("PCG Setup");
-      hypre_BeginTiming(time_index);
+            HYPRE_LOBPCGSetup( (HYPRE_Solver) solver, (HYPRE_Matrix) A,
+                               (HYPRE_Vector) b, (HYPRE_Vector) x);
 
-      HYPRE_ParCSRPCGCreate(hypre_MPI_COMM_WORLD, &par_solver);
-      HYPRE_PCGSetMaxIter( par_solver, 100 );
-      HYPRE_PCGSetTol( par_solver, tol );
-      HYPRE_PCGSetTwoNorm( par_solver, 1 );
-      HYPRE_PCGSetRelChange( par_solver, 0 );
-      HYPRE_PCGSetPrintLevel( par_solver, 1 );
-      HYPRE_PCGSetRecomputeResidual( (HYPRE_Solver) par_solver, recompute_res);
-
-      if (solver_id == 20)
-      {
-         /* use BoomerAMG as preconditioner */
-         HYPRE_BoomerAMGCreate(&par_precond);
-         if (old_default) HYPRE_BoomerAMGSetOldDefault(par_precond);
-         HYPRE_BoomerAMGSetStrongThreshold(par_precond, 0.25);
-         HYPRE_BoomerAMGSetTol(par_precond, 0.0);
-         HYPRE_BoomerAMGSetPrintLevel(par_precond, 1);
-         HYPRE_BoomerAMGSetPrintFileName(par_precond, "sstruct.out.log");
-         HYPRE_BoomerAMGSetMaxIter(par_precond, 1);
-         HYPRE_PCGSetPrecond( par_solver,
-                              (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSolve,
-                              (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSetup,
-                              par_precond );
-      }
-      else if (solver_id == 21)
-      {
-         /* use Euclid as preconditioner */
-         HYPRE_EuclidCreate(hypre_MPI_COMM_WORLD, &par_precond);
-         HYPRE_EuclidSetParams(par_precond, argc, argv);
-         HYPRE_PCGSetPrecond(par_solver,
-                             (HYPRE_PtrToSolverFcn) HYPRE_EuclidSolve,
-                             (HYPRE_PtrToSolverFcn) HYPRE_EuclidSetup,
-                             par_precond);
-      }
-      else if (solver_id == 22)
-      {
-         /* use ParaSails as preconditioner */
-         HYPRE_ParCSRParaSailsCreate(hypre_MPI_COMM_WORLD, &par_precond );
-         HYPRE_ParCSRParaSailsSetParams(par_precond, 0.1, 1);
-         HYPRE_PCGSetPrecond( par_solver,
-                              (HYPRE_PtrToSolverFcn) HYPRE_ParCSRParaSailsSolve,
-                              (HYPRE_PtrToSolverFcn) HYPRE_ParCSRParaSailsSetup,
-                              par_precond );
-      }
-
-      else if (solver_id == 28)
-      {
-         /* use diagonal scaling as preconditioner */
-         par_precond = NULL;
-         HYPRE_PCGSetPrecond(  par_solver,
-                               (HYPRE_PtrToSolverFcn) HYPRE_ParCSRDiagScale,
-                               (HYPRE_PtrToSolverFcn) HYPRE_ParCSRDiagScaleSetup,
-                               par_precond );
-      }
-
-      HYPRE_PCGSetup( par_solver, (HYPRE_Matrix) par_A,
-                      (HYPRE_Vector) par_b, (HYPRE_Vector) par_x );
+            hypre_EndTiming(time_index);
+            hypre_PrintTiming("Setup phase times", comm);
+            hypre_FinalizeTiming(time_index);
+            hypre_ClearTiming();
 
-      hypre_EndTiming(time_index);
-      hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
-      hypre_FinalizeTiming(time_index);
-      hypre_ClearTiming();
+            eigenvectors = mv_MultiVectorCreateFromSampleVector( interpreter,
+                                                                 blockSize,
+                                                                 x );
+            eigenvalues = hypre_CTAlloc(HYPRE_Real,  blockSize, HYPRE_MEMORY_HOST);
 
-      time_index = hypre_InitializeTiming("PCG Solve");
-      hypre_BeginTiming(time_index);
+            if ( lobpcgSeed )
+            {
+               mv_MultiVectorSetRandom( eigenvectors, lobpcgSeed );
+            }
+            else
+            {
+               mv_MultiVectorSetRandom( eigenvectors, (HYPRE_Int)time(0) );
+            }
 
-      HYPRE_PCGSolve( par_solver, (HYPRE_Matrix) par_A,
-                      (HYPRE_Vector) par_b, (HYPRE_Vector) par_x );
+            time_index = hypre_InitializeTiming("LOBPCG Solve");
+            hypre_BeginTiming(time_index);
 
-      hypre_EndTiming(time_index);
-      hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
-      hypre_FinalizeTiming(time_index);
-      hypre_ClearTiming();
+            HYPRE_LOBPCGSolve
+            ( (HYPRE_Solver) solver, constrains, eigenvectors, eigenvalues );
 
-      HYPRE_PCGGetNumIterations( par_solver, &num_iterations );
-      HYPRE_PCGGetFinalRelativeResidualNorm( par_solver, &final_res_norm );
-      HYPRE_ParCSRPCGDestroy(par_solver);
+            hypre_EndTiming(time_index);
+            hypre_PrintTiming("Solve phase times", comm);
+            hypre_FinalizeTiming(time_index);
+            hypre_ClearTiming();
 
-      if (solver_id == 20)
-      {
-         HYPRE_BoomerAMGDestroy(par_precond);
-      }
-      else if (solver_id == 21)
-      {
-         HYPRE_EuclidDestroy(par_precond);
-      }
-      else if (solver_id == 22)
-      {
-         HYPRE_ParCSRParaSailsDestroy(par_precond);
-      }
-   }
+            if ( checkOrtho )
+            {
 
-   /*-----------------------------------------------------------
-    * Solve the system using GMRES
-    *-----------------------------------------------------------*/
+               gramXX = utilities_FortranMatrixCreate();
+               identity = utilities_FortranMatrixCreate();
 
-   if ((solver_id >= 30) && (solver_id < 40))
-   {
-      time_index = hypre_InitializeTiming("GMRES Setup");
-      hypre_BeginTiming(time_index);
+               utilities_FortranMatrixAllocateData( blockSize, blockSize, gramXX );
+               utilities_FortranMatrixAllocateData( blockSize, blockSize, identity );
 
-      HYPRE_SStructGMRESCreate(hypre_MPI_COMM_WORLD, &solver);
-      HYPRE_GMRESSetKDim( (HYPRE_Solver) solver, 5 );
-      HYPRE_GMRESSetMaxIter( (HYPRE_Solver) solver, 100 );
-      HYPRE_GMRESSetTol( (HYPRE_Solver) solver, tol );
-      HYPRE_GMRESSetPrintLevel( (HYPRE_Solver) solver, 1 );
-      HYPRE_GMRESSetLogging( (HYPRE_Solver) solver, 1 );
+               lobpcg_MultiVectorByMultiVector( eigenvectors, eigenvectors, gramXX );
+               utilities_FortranMatrixSetToIdentity( identity );
+               utilities_FortranMatrixAdd( -1, identity, gramXX, gramXX );
+               nonOrthF = utilities_FortranMatrixFNorm( gramXX );
+               if ( myid == 0 )
+               {
+                  hypre_printf("Non-orthonormality of eigenvectors: %12.5e\n", nonOrthF);
+               }
 
-      if ((solver_id == 30) || (solver_id == 31))
-      {
-         /* use Split solver as preconditioner */
-         HYPRE_SStructSplitCreate(hypre_MPI_COMM_WORLD, &precond);
-         HYPRE_SStructSplitSetMaxIter(precond, 1);
-         HYPRE_SStructSplitSetTol(precond, 0.0);
-         HYPRE_SStructSplitSetZeroGuess(precond);
-         if (solver_id == 30)
-         {
-            HYPRE_SStructSplitSetStructSolver(precond, HYPRE_SMG);
-         }
-         else if (solver_id == 31)
-         {
-            HYPRE_SStructSplitSetStructSolver(precond, HYPRE_PFMG);
-         }
-         HYPRE_GMRESSetPrecond( (HYPRE_Solver) solver,
-                                (HYPRE_PtrToSolverFcn) HYPRE_SStructSplitSolve,
-                                (HYPRE_PtrToSolverFcn) HYPRE_SStructSplitSetup,
-                                (HYPRE_Solver) precond );
-      }
+               utilities_FortranMatrixDestroy( gramXX );
+               utilities_FortranMatrixDestroy( identity );
 
-      else if (solver_id == 38)
-      {
-         /* use diagonal scaling as preconditioner */
-         precond = NULL;
-         HYPRE_GMRESSetPrecond( (HYPRE_Solver) solver,
-                                (HYPRE_PtrToSolverFcn) HYPRE_SStructDiagScale,
-                                (HYPRE_PtrToSolverFcn) HYPRE_SStructDiagScaleSetup,
-                                (HYPRE_Solver) precond );
-      }
+            }
 
-      HYPRE_GMRESSetup( (HYPRE_Solver) solver, (HYPRE_Matrix) A,
-                        (HYPRE_Vector) b, (HYPRE_Vector) x );
+            if ( printLevel )
+            {
 
-      hypre_EndTiming(time_index);
-      hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
-      hypre_FinalizeTiming(time_index);
-      hypre_ClearTiming();
+               if ( myid == 0 )
+               {
+                  if ( (filePtr = fopen("values.txt", "w")) )
+                  {
+                     hypre_fprintf(filePtr, "%d\n", blockSize);
+                     for ( i = 0; i < blockSize; i++ )
+                     {
+                        hypre_fprintf(filePtr, "%22.14e\n", eigenvalues[i]);
+                     }
+                     fclose(filePtr);
+                  }
 
-      time_index = hypre_InitializeTiming("GMRES Solve");
-      hypre_BeginTiming(time_index);
+                  if ( (filePtr = fopen("residuals.txt", "w")) )
+                  {
+                     residualNorms = HYPRE_LOBPCGResidualNorms( (HYPRE_Solver)solver );
+                     residuals = utilities_FortranMatrixValues( residualNorms );
+                     hypre_fprintf(filePtr, "%d\n", blockSize);
+                     for ( i = 0; i < blockSize; i++ )
+                     {
+                        hypre_fprintf(filePtr, "%22.14e\n", residuals[i]);
+                     }
+                     fclose(filePtr);
+                  }
 
-      HYPRE_GMRESSolve( (HYPRE_Solver) solver, (HYPRE_Matrix) A,
-                        (HYPRE_Vector) b, (HYPRE_Vector) x );
+                  if ( printLevel > 1 )
+                  {
 
-      hypre_EndTiming(time_index);
-      hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
-      hypre_FinalizeTiming(time_index);
-      hypre_ClearTiming();
+                     printBuffer = utilities_FortranMatrixCreate();
 
-      HYPRE_GMRESGetNumIterations( (HYPRE_Solver) solver, &num_iterations );
-      HYPRE_GMRESGetFinalRelativeResidualNorm( (HYPRE_Solver) solver, &final_res_norm );
-      HYPRE_SStructGMRESDestroy(solver);
+                     iterations = HYPRE_LOBPCGIterations( (HYPRE_Solver)solver );
 
-      if ((solver_id == 30) || (solver_id == 31))
-      {
-         HYPRE_SStructSplitDestroy(precond);
-      }
-   }
+                     eigenvaluesHistory = HYPRE_LOBPCGEigenvaluesHistory( (HYPRE_Solver)solver );
+                     utilities_FortranMatrixSelectBlock( eigenvaluesHistory,
+                                                         1, blockSize, 1, iterations + 1, printBuffer );
+                     utilities_FortranMatrixPrint( printBuffer, "val_hist.txt" );
 
-   /*-----------------------------------------------------------
-    * Solve the system using ParCSR version of GMRES
-    *-----------------------------------------------------------*/
+                     residualNormsHistory = HYPRE_LOBPCGResidualNormsHistory( (HYPRE_Solver)solver );
+                     utilities_FortranMatrixSelectBlock(residualNormsHistory,
+                                                        1, blockSize, 1, iterations + 1, printBuffer );
+                     utilities_FortranMatrixPrint( printBuffer, "res_hist.txt" );
 
-   if ((solver_id >= 40) && (solver_id < 50))
-   {
-      time_index = hypre_InitializeTiming("GMRES Setup");
-      hypre_BeginTiming(time_index);
+                     utilities_FortranMatrixDestroy( printBuffer );
+                  }
+               }
+            }
 
-      HYPRE_ParCSRGMRESCreate(hypre_MPI_COMM_WORLD, &par_solver);
-      HYPRE_GMRESSetKDim(par_solver, 5);
-      HYPRE_GMRESSetMaxIter(par_solver, 100);
-      HYPRE_GMRESSetTol(par_solver, tol);
-      HYPRE_GMRESSetPrintLevel(par_solver, 1);
-      HYPRE_GMRESSetLogging(par_solver, 1);
-
-      if (solver_id == 40)
-      {
-         /* use BoomerAMG as preconditioner */
-         HYPRE_BoomerAMGCreate(&par_precond);
-         if (old_default) HYPRE_BoomerAMGSetOldDefault(par_precond);
-         HYPRE_BoomerAMGSetStrongThreshold(par_precond, 0.25);
-         HYPRE_BoomerAMGSetTol(par_precond, 0.0);
-         HYPRE_BoomerAMGSetPrintLevel(par_precond, 1);
-         HYPRE_BoomerAMGSetPrintFileName(par_precond, "sstruct.out.log");
-         HYPRE_BoomerAMGSetMaxIter(par_precond, 1);
-         HYPRE_GMRESSetPrecond( par_solver,
-                                (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSolve,
-                                (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSetup,
-                                par_precond);
-      }
-      else if (solver_id == 41)
-      {
-         /* use Euclid as preconditioner */
-         HYPRE_EuclidCreate(hypre_MPI_COMM_WORLD, &par_precond);
-         HYPRE_EuclidSetParams(par_precond, argc, argv);
-         HYPRE_GMRESSetPrecond(par_solver,
-                               (HYPRE_PtrToSolverFcn) HYPRE_EuclidSolve,
-                               (HYPRE_PtrToSolverFcn) HYPRE_EuclidSetup,
-                               par_precond);
-      }
-      else if (solver_id == 42)
-      {
-         /* use ParaSails as preconditioner */
-         HYPRE_ParCSRParaSailsCreate(hypre_MPI_COMM_WORLD, &par_precond );
-         HYPRE_ParCSRParaSailsSetParams(par_precond, 0.1, 1);
-         HYPRE_ParCSRParaSailsSetSym(par_precond, 0);
-         HYPRE_GMRESSetPrecond( par_solver,
-                                (HYPRE_PtrToSolverFcn) HYPRE_ParCSRParaSailsSolve,
-                                (HYPRE_PtrToSolverFcn) HYPRE_ParCSRParaSailsSetup,
-                                par_precond);
-      }
+            HYPRE_LOBPCGDestroy((HYPRE_Solver)solver);
 
-      HYPRE_GMRESSetup( par_solver, (HYPRE_Matrix) par_A,
-                        (HYPRE_Vector) par_b, (HYPRE_Vector) par_x);
+            if ((solver_id == 10) || (solver_id == 11))
+            {
+               HYPRE_SStructSplitDestroy(precond);
+            }
+            else if (solver_id == 13)
+            {
+               HYPRE_SStructSysPFMGDestroy(precond);
+            }
 
-      hypre_EndTiming(time_index);
-      hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
-      hypre_FinalizeTiming(time_index);
-      hypre_ClearTiming();
+            mv_MultiVectorDestroy( eigenvectors );
+            hypre_TFree(eigenvalues, HYPRE_MEMORY_HOST);
+         }
 
-      time_index = hypre_InitializeTiming("GMRES Solve");
-      hypre_BeginTiming(time_index);
+         hypre_TFree( interpreter, HYPRE_MEMORY_HOST);
 
-      HYPRE_GMRESSolve( par_solver, (HYPRE_Matrix) par_A,
-                        (HYPRE_Vector) par_b, (HYPRE_Vector) par_x);
+      }
 
-      hypre_EndTiming(time_index);
-      hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
-      hypre_FinalizeTiming(time_index);
-      hypre_ClearTiming();
+      /* end lobpcg */
 
-      HYPRE_GMRESGetNumIterations( par_solver, &num_iterations);
-      HYPRE_GMRESGetFinalRelativeResidualNorm( par_solver, &final_res_norm);
-      HYPRE_ParCSRGMRESDestroy(par_solver);
+      /*-----------------------------------------------------------
+       * Solve the system using ParCSR version of PCG
+       *-----------------------------------------------------------*/
 
-      if (solver_id == 40)
-      {
-         HYPRE_BoomerAMGDestroy(par_precond);
-      }
-      else if (solver_id == 41)
-      {
-         HYPRE_EuclidDestroy(par_precond);
-      }
-      else if (solver_id == 42)
+      if ((solver_id >= 20) && (solver_id < 30))
       {
-         HYPRE_ParCSRParaSailsDestroy(par_precond);
-      }
-   }
-
-   /*-----------------------------------------------------------
-    * Solve the system using BiCGSTAB
-    *-----------------------------------------------------------*/
-
-   if ((solver_id >= 50) && (solver_id < 60))
-   {
-      time_index = hypre_InitializeTiming("BiCGSTAB Setup");
-      hypre_BeginTiming(time_index);
+         time_index = hypre_InitializeTiming("PCG Setup");
+         hypre_BeginTiming(time_index);
 
-      HYPRE_SStructBiCGSTABCreate(hypre_MPI_COMM_WORLD, &solver);
-      HYPRE_BiCGSTABSetMaxIter( (HYPRE_Solver) solver, 100 );
-      HYPRE_BiCGSTABSetTol( (HYPRE_Solver) solver, tol );
-      HYPRE_BiCGSTABSetPrintLevel( (HYPRE_Solver) solver, 1 );
-      HYPRE_BiCGSTABSetLogging( (HYPRE_Solver) solver, 1 );
+         HYPRE_ParCSRPCGCreate(comm, &par_solver);
+         HYPRE_PCGSetMaxIter( par_solver, 100 );
+         HYPRE_PCGSetTol( par_solver, tol );
+         HYPRE_PCGSetTwoNorm( par_solver, 1 );
+         HYPRE_PCGSetRelChange( par_solver, 0 );
+         HYPRE_PCGSetPrintLevel( par_solver, solver_print_level );
+         HYPRE_PCGSetRecomputeResidual( (HYPRE_Solver) par_solver, recompute_res);
 
-      if ((solver_id == 50) || (solver_id == 51))
-      {
-         /* use Split solver as preconditioner */
-         HYPRE_SStructSplitCreate(hypre_MPI_COMM_WORLD, &precond);
-         HYPRE_SStructSplitSetMaxIter(precond, 1);
-         HYPRE_SStructSplitSetTol(precond, 0.0);
-         HYPRE_SStructSplitSetZeroGuess(precond);
-         if (solver_id == 50)
+         if (solver_id == 20)
          {
-            HYPRE_SStructSplitSetStructSolver(precond, HYPRE_SMG);
+            /* use BoomerAMG as preconditioner */
+            HYPRE_BoomerAMGCreate(&par_precond);
+            if (old_default) { HYPRE_BoomerAMGSetOldDefault(par_precond); }
+            HYPRE_BoomerAMGSetStrongThreshold(par_precond, 0.25);
+            HYPRE_BoomerAMGSetTol(par_precond, 0.0);
+            HYPRE_BoomerAMGSetPrintLevel(par_precond, prec_print_level);
+            HYPRE_BoomerAMGSetPrintFileName(par_precond, "sstruct.out.log");
+            HYPRE_BoomerAMGSetMaxIter(par_precond, 1);
+            HYPRE_PCGSetPrecond( par_solver,
+                                 (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSolve,
+                                 (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSetup,
+                                 par_precond );
          }
-         else if (solver_id == 51)
+         else if (solver_id == 21)
          {
-            HYPRE_SStructSplitSetStructSolver(precond, HYPRE_PFMG);
+            /* use Euclid as preconditioner */
+            HYPRE_EuclidCreate(comm, &par_precond);
+            HYPRE_EuclidSetParams(par_precond, argc, argv);
+            HYPRE_PCGSetPrecond(par_solver,
+                                (HYPRE_PtrToSolverFcn) HYPRE_EuclidSolve,
+                                (HYPRE_PtrToSolverFcn) HYPRE_EuclidSetup,
+                                par_precond);
+         }
+         else if (solver_id == 22)
+         {
+            /* use ParaSails as preconditioner */
+            HYPRE_ParCSRParaSailsCreate(comm, &par_precond );
+            HYPRE_ParCSRParaSailsSetParams(par_precond, 0.1, 1);
+            HYPRE_PCGSetPrecond( par_solver,
+                                 (HYPRE_PtrToSolverFcn) HYPRE_ParCSRParaSailsSolve,
+                                 (HYPRE_PtrToSolverFcn) HYPRE_ParCSRParaSailsSetup,
+                                 par_precond );
          }
-         HYPRE_BiCGSTABSetPrecond( (HYPRE_Solver) solver,
-                                   (HYPRE_PtrToSolverFcn) HYPRE_SStructSplitSolve,
-                                   (HYPRE_PtrToSolverFcn) HYPRE_SStructSplitSetup,
-                                   (HYPRE_Solver) precond );
-      }
 
-      else if (solver_id == 58)
-      {
-         /* use diagonal scaling as preconditioner */
-         precond = NULL;
-         HYPRE_BiCGSTABSetPrecond( (HYPRE_Solver) solver,
-                                   (HYPRE_PtrToSolverFcn) HYPRE_SStructDiagScale,
-                                   (HYPRE_PtrToSolverFcn) HYPRE_SStructDiagScaleSetup,
-                                   (HYPRE_Solver) precond );
+         else if (solver_id == 28)
+         {
+            /* use diagonal scaling as preconditioner */
+            par_precond = NULL;
+            HYPRE_PCGSetPrecond(  par_solver,
+                                  (HYPRE_PtrToSolverFcn) HYPRE_ParCSRDiagScale,
+                                  (HYPRE_PtrToSolverFcn) HYPRE_ParCSRDiagScaleSetup,
+                                  par_precond );
+         }
+
+         HYPRE_PCGSetup( par_solver, (HYPRE_Matrix) par_A,
+                         (HYPRE_Vector) par_b, (HYPRE_Vector) par_x );
+
+         hypre_EndTiming(time_index);
+         hypre_PrintTiming("Setup phase times", comm);
+         hypre_FinalizeTiming(time_index);
+         hypre_ClearTiming();
+
+         time_index = hypre_InitializeTiming("PCG Solve");
+         hypre_BeginTiming(time_index);
+
+         HYPRE_PCGSolve( par_solver, (HYPRE_Matrix) par_A,
+                         (HYPRE_Vector) par_b, (HYPRE_Vector) par_x );
+
+         hypre_EndTiming(time_index);
+         hypre_PrintTiming("Solve phase times", comm);
+         hypre_FinalizeTiming(time_index);
+         hypre_ClearTiming();
+
+         HYPRE_PCGGetNumIterations( par_solver, &num_iterations );
+         HYPRE_PCGGetFinalRelativeResidualNorm( par_solver, &final_res_norm );
+         HYPRE_ParCSRPCGDestroy(par_solver);
+
+         if (solver_id == 20)
+         {
+            HYPRE_BoomerAMGDestroy(par_precond);
+         }
+         else if (solver_id == 21)
+         {
+            HYPRE_EuclidDestroy(par_precond);
+         }
+         else if (solver_id == 22)
+         {
+            HYPRE_ParCSRParaSailsDestroy(par_precond);
+         }
       }
 
-      HYPRE_BiCGSTABSetup( (HYPRE_Solver) solver, (HYPRE_Matrix) A,
+      /*-----------------------------------------------------------
+       * Solve the system using GMRES
+       *-----------------------------------------------------------*/
+
+      if ((solver_id >= 30) && (solver_id < 40))
+      {
+         time_index = hypre_InitializeTiming("GMRES Setup");
+         hypre_BeginTiming(time_index);
+
+         HYPRE_SStructGMRESCreate(comm, &solver);
+         HYPRE_GMRESSetKDim( (HYPRE_Solver) solver, 5 );
+         HYPRE_GMRESSetMaxIter( (HYPRE_Solver) solver, 100 );
+         HYPRE_GMRESSetTol( (HYPRE_Solver) solver, tol );
+         HYPRE_GMRESSetPrintLevel( (HYPRE_Solver) solver, solver_print_level );
+         HYPRE_GMRESSetLogging( (HYPRE_Solver) solver, 1 );
+
+         if ((solver_id == 30) || (solver_id == 31))
+         {
+            /* use Split solver as preconditioner */
+            HYPRE_SStructSplitCreate(comm, &precond);
+            HYPRE_SStructSplitSetMaxIter(precond, 1);
+            HYPRE_SStructSplitSetTol(precond, 0.0);
+            HYPRE_SStructSplitSetZeroGuess(precond);
+            if (solver_id == 30)
+            {
+               HYPRE_SStructSplitSetStructSolver(precond, HYPRE_SMG);
+            }
+            else if (solver_id == 31)
+            {
+               HYPRE_SStructSplitSetStructSolver(precond, HYPRE_PFMG);
+            }
+            HYPRE_GMRESSetPrecond( (HYPRE_Solver) solver,
+                                   (HYPRE_PtrToSolverFcn) HYPRE_SStructSplitSolve,
+                                   (HYPRE_PtrToSolverFcn) HYPRE_SStructSplitSetup,
+                                   (HYPRE_Solver) precond );
+         }
+
+         else if (solver_id == 38)
+         {
+            /* use diagonal scaling as preconditioner */
+            precond = NULL;
+            HYPRE_GMRESSetPrecond( (HYPRE_Solver) solver,
+                                   (HYPRE_PtrToSolverFcn) HYPRE_SStructDiagScale,
+                                   (HYPRE_PtrToSolverFcn) HYPRE_SStructDiagScaleSetup,
+                                   (HYPRE_Solver) precond );
+         }
+
+         HYPRE_GMRESSetup( (HYPRE_Solver) solver, (HYPRE_Matrix) A,
                            (HYPRE_Vector) b, (HYPRE_Vector) x );
 
-      hypre_EndTiming(time_index);
-      hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
-      hypre_FinalizeTiming(time_index);
-      hypre_ClearTiming();
+         hypre_EndTiming(time_index);
+         hypre_PrintTiming("Setup phase times", comm);
+         hypre_FinalizeTiming(time_index);
+         hypre_ClearTiming();
 
-      time_index = hypre_InitializeTiming("BiCGSTAB Solve");
-      hypre_BeginTiming(time_index);
+         time_index = hypre_InitializeTiming("GMRES Solve");
+         hypre_BeginTiming(time_index);
 
-      HYPRE_BiCGSTABSolve( (HYPRE_Solver) solver, (HYPRE_Matrix) A,
+         HYPRE_GMRESSolve( (HYPRE_Solver) solver, (HYPRE_Matrix) A,
                            (HYPRE_Vector) b, (HYPRE_Vector) x );
 
-      hypre_EndTiming(time_index);
-      hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
-      hypre_FinalizeTiming(time_index);
-      hypre_ClearTiming();
+         hypre_EndTiming(time_index);
+         hypre_PrintTiming("Solve phase times", comm);
+         hypre_FinalizeTiming(time_index);
+         hypre_ClearTiming();
 
-      HYPRE_BiCGSTABGetNumIterations( (HYPRE_Solver) solver, &num_iterations );
-      HYPRE_BiCGSTABGetFinalRelativeResidualNorm( (HYPRE_Solver) solver, &final_res_norm );
-      HYPRE_SStructBiCGSTABDestroy(solver);
+         HYPRE_GMRESGetNumIterations( (HYPRE_Solver) solver, &num_iterations );
+         HYPRE_GMRESGetFinalRelativeResidualNorm( (HYPRE_Solver) solver, &final_res_norm );
+         HYPRE_SStructGMRESDestroy(solver);
 
-      if ((solver_id == 50) || (solver_id == 51))
-      {
-         HYPRE_SStructSplitDestroy(precond);
+         if ((solver_id == 30) || (solver_id == 31))
+         {
+            HYPRE_SStructSplitDestroy(precond);
+         }
       }
-   }
 
-   /*-----------------------------------------------------------
-    * Solve the system using ParCSR version of BiCGSTAB
-    *-----------------------------------------------------------*/
+      /*-----------------------------------------------------------
+       * Solve the system using ParCSR version of GMRES
+       *-----------------------------------------------------------*/
 
-   if ((solver_id >= 60) && (solver_id < 70))
-   {
-      time_index = hypre_InitializeTiming("BiCGSTAB Setup");
-      hypre_BeginTiming(time_index);
+      if ((solver_id >= 40) && (solver_id < 50))
+      {
+         time_index = hypre_InitializeTiming("GMRES Setup");
+         hypre_BeginTiming(time_index);
+
+         HYPRE_ParCSRGMRESCreate(comm, &par_solver);
+         HYPRE_GMRESSetKDim(par_solver, 5);
+         HYPRE_GMRESSetMaxIter(par_solver, 100);
+         HYPRE_GMRESSetTol(par_solver, tol);
+         HYPRE_GMRESSetPrintLevel(par_solver, solver_print_level);
+         HYPRE_GMRESSetLogging(par_solver, 1);
 
-      HYPRE_ParCSRBiCGSTABCreate(hypre_MPI_COMM_WORLD, &par_solver);
-      HYPRE_BiCGSTABSetMaxIter(par_solver, 100);
-      HYPRE_BiCGSTABSetTol(par_solver, tol);
-      HYPRE_BiCGSTABSetPrintLevel(par_solver, 1);
-      HYPRE_BiCGSTABSetLogging(par_solver, 1);
-
-      if (solver_id == 60)
-      {
-         /* use BoomerAMG as preconditioner */
-         HYPRE_BoomerAMGCreate(&par_precond);
-         if (old_default) HYPRE_BoomerAMGSetOldDefault(par_precond);
-         HYPRE_BoomerAMGSetStrongThreshold(par_precond, 0.25);
-         HYPRE_BoomerAMGSetTol(par_precond, 0.0);
-         HYPRE_BoomerAMGSetPrintLevel(par_precond, 1);
-         HYPRE_BoomerAMGSetPrintFileName(par_precond, "sstruct.out.log");
-         HYPRE_BoomerAMGSetMaxIter(par_precond, 1);
-         HYPRE_BiCGSTABSetPrecond( par_solver,
+         if (solver_id == 40)
+         {
+            /* use BoomerAMG as preconditioner */
+            HYPRE_BoomerAMGCreate(&par_precond);
+            if (old_default) { HYPRE_BoomerAMGSetOldDefault(par_precond); }
+            HYPRE_BoomerAMGSetStrongThreshold(par_precond, 0.25);
+            HYPRE_BoomerAMGSetTol(par_precond, 0.0);
+            HYPRE_BoomerAMGSetPrintLevel(par_precond, prec_print_level);
+            HYPRE_BoomerAMGSetPrintFileName(par_precond, "sstruct.out.log");
+            HYPRE_BoomerAMGSetMaxIter(par_precond, 1);
+            HYPRE_GMRESSetPrecond( par_solver,
                                    (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSolve,
                                    (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSetup,
                                    par_precond);
-      }
-      else if (solver_id == 61)
-      {
-         /* use Euclid as preconditioner */
-         HYPRE_EuclidCreate(hypre_MPI_COMM_WORLD, &par_precond);
-         HYPRE_EuclidSetParams(par_precond, argc, argv);
-         HYPRE_BiCGSTABSetPrecond(par_solver,
+         }
+         else if (solver_id == 41)
+         {
+            /* use Euclid as preconditioner */
+            HYPRE_EuclidCreate(comm, &par_precond);
+            HYPRE_EuclidSetParams(par_precond, argc, argv);
+            HYPRE_GMRESSetPrecond(par_solver,
                                   (HYPRE_PtrToSolverFcn) HYPRE_EuclidSolve,
                                   (HYPRE_PtrToSolverFcn) HYPRE_EuclidSetup,
                                   par_precond);
-      }
-
-      else if (solver_id == 62)
-      {
-         /* use ParaSails as preconditioner */
-         HYPRE_ParCSRParaSailsCreate(hypre_MPI_COMM_WORLD, &par_precond );
-         HYPRE_ParCSRParaSailsSetParams(par_precond, 0.1, 1);
-         HYPRE_ParCSRParaSailsSetSym(par_precond, 0);
-         HYPRE_BiCGSTABSetPrecond( par_solver,
+         }
+         else if (solver_id == 42)
+         {
+            /* use ParaSails as preconditioner */
+            HYPRE_ParCSRParaSailsCreate(comm, &par_precond );
+            HYPRE_ParCSRParaSailsSetParams(par_precond, 0.1, 1);
+            HYPRE_ParCSRParaSailsSetSym(par_precond, 0);
+            HYPRE_GMRESSetPrecond( par_solver,
                                    (HYPRE_PtrToSolverFcn) HYPRE_ParCSRParaSailsSolve,
                                    (HYPRE_PtrToSolverFcn) HYPRE_ParCSRParaSailsSetup,
                                    par_precond);
-      }
+         }
 
-      HYPRE_BiCGSTABSetup( par_solver, (HYPRE_Matrix) par_A,
+         HYPRE_GMRESSetup( par_solver, (HYPRE_Matrix) par_A,
                            (HYPRE_Vector) par_b, (HYPRE_Vector) par_x);
 
-      hypre_EndTiming(time_index);
-      hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
-      hypre_FinalizeTiming(time_index);
-      hypre_ClearTiming();
+         hypre_EndTiming(time_index);
+         hypre_PrintTiming("Setup phase times", comm);
+         hypre_FinalizeTiming(time_index);
+         hypre_ClearTiming();
 
-      time_index = hypre_InitializeTiming("BiCGSTAB Solve");
-      hypre_BeginTiming(time_index);
+         time_index = hypre_InitializeTiming("GMRES Solve");
+         hypre_BeginTiming(time_index);
 
-      HYPRE_BiCGSTABSolve( par_solver, (HYPRE_Matrix) par_A,
+         HYPRE_GMRESSolve( par_solver, (HYPRE_Matrix) par_A,
                            (HYPRE_Vector) par_b, (HYPRE_Vector) par_x);
 
-      hypre_EndTiming(time_index);
-      hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
-      hypre_FinalizeTiming(time_index);
-      hypre_ClearTiming();
+         hypre_EndTiming(time_index);
+         hypre_PrintTiming("Solve phase times", comm);
+         hypre_FinalizeTiming(time_index);
+         hypre_ClearTiming();
 
-      HYPRE_BiCGSTABGetNumIterations( par_solver, &num_iterations);
-      HYPRE_BiCGSTABGetFinalRelativeResidualNorm( par_solver, &final_res_norm);
-      HYPRE_ParCSRBiCGSTABDestroy(par_solver);
+         HYPRE_GMRESGetNumIterations( par_solver, &num_iterations);
+         HYPRE_GMRESGetFinalRelativeResidualNorm( par_solver, &final_res_norm);
+         HYPRE_ParCSRGMRESDestroy(par_solver);
 
-      if (solver_id == 60)
-      {
-         HYPRE_BoomerAMGDestroy(par_precond);
+         if (solver_id == 40)
+         {
+            HYPRE_BoomerAMGDestroy(par_precond);
+         }
+         else if (solver_id == 41)
+         {
+            HYPRE_EuclidDestroy(par_precond);
+         }
+         else if (solver_id == 42)
+         {
+            HYPRE_ParCSRParaSailsDestroy(par_precond);
+         }
       }
-      else if (solver_id == 61)
+
+      /*-----------------------------------------------------------
+       * Solve the system using BiCGSTAB
+       *-----------------------------------------------------------*/
+
+      if ((solver_id >= 50) && (solver_id < 60))
       {
-         HYPRE_EuclidDestroy(par_precond);
+         time_index = hypre_InitializeTiming("BiCGSTAB Setup");
+         hypre_BeginTiming(time_index);
+
+         HYPRE_SStructBiCGSTABCreate(comm, &solver);
+         HYPRE_BiCGSTABSetMaxIter( (HYPRE_Solver) solver, 100 );
+         HYPRE_BiCGSTABSetTol( (HYPRE_Solver) solver, tol );
+         HYPRE_BiCGSTABSetPrintLevel( (HYPRE_Solver) solver, solver_print_level );
+         HYPRE_BiCGSTABSetLogging( (HYPRE_Solver) solver, 1 );
+
+         if ((solver_id == 50) || (solver_id == 51))
+         {
+            /* use Split solver as preconditioner */
+            HYPRE_SStructSplitCreate(comm, &precond);
+            HYPRE_SStructSplitSetMaxIter(precond, 1);
+            HYPRE_SStructSplitSetTol(precond, 0.0);
+            HYPRE_SStructSplitSetZeroGuess(precond);
+            if (solver_id == 50)
+            {
+               HYPRE_SStructSplitSetStructSolver(precond, HYPRE_SMG);
+            }
+            else if (solver_id == 51)
+            {
+               HYPRE_SStructSplitSetStructSolver(precond, HYPRE_PFMG);
+            }
+            HYPRE_BiCGSTABSetPrecond( (HYPRE_Solver) solver,
+                                      (HYPRE_PtrToSolverFcn) HYPRE_SStructSplitSolve,
+                                      (HYPRE_PtrToSolverFcn) HYPRE_SStructSplitSetup,
+                                      (HYPRE_Solver) precond );
+         }
+
+         else if (solver_id == 58)
+         {
+            /* use diagonal scaling as preconditioner */
+            precond = NULL;
+            HYPRE_BiCGSTABSetPrecond( (HYPRE_Solver) solver,
+                                      (HYPRE_PtrToSolverFcn) HYPRE_SStructDiagScale,
+                                      (HYPRE_PtrToSolverFcn) HYPRE_SStructDiagScaleSetup,
+                                      (HYPRE_Solver) precond );
+         }
+
+         HYPRE_BiCGSTABSetup( (HYPRE_Solver) solver, (HYPRE_Matrix) A,
+                              (HYPRE_Vector) b, (HYPRE_Vector) x );
+
+         hypre_EndTiming(time_index);
+         hypre_PrintTiming("Setup phase times", comm);
+         hypre_FinalizeTiming(time_index);
+         hypre_ClearTiming();
+
+         time_index = hypre_InitializeTiming("BiCGSTAB Solve");
+         hypre_BeginTiming(time_index);
+
+         HYPRE_BiCGSTABSolve( (HYPRE_Solver) solver, (HYPRE_Matrix) A,
+                              (HYPRE_Vector) b, (HYPRE_Vector) x );
+
+         hypre_EndTiming(time_index);
+         hypre_PrintTiming("Solve phase times", comm);
+         hypre_FinalizeTiming(time_index);
+         hypre_ClearTiming();
+
+         HYPRE_BiCGSTABGetNumIterations( (HYPRE_Solver) solver, &num_iterations );
+         HYPRE_BiCGSTABGetFinalRelativeResidualNorm( (HYPRE_Solver) solver, &final_res_norm );
+         HYPRE_SStructBiCGSTABDestroy(solver);
+
+         if ((solver_id == 50) || (solver_id == 51))
+         {
+            HYPRE_SStructSplitDestroy(precond);
+         }
       }
-      else if (solver_id == 62)
+
+      /*-----------------------------------------------------------
+       * Solve the system using ParCSR version of BiCGSTAB
+       *-----------------------------------------------------------*/
+
+      if ((solver_id >= 60) && (solver_id < 70))
       {
-         HYPRE_ParCSRParaSailsDestroy(par_precond);
-      }
-   }
+         time_index = hypre_InitializeTiming("BiCGSTAB Setup");
+         hypre_BeginTiming(time_index);
 
-   /*-----------------------------------------------------------
-    * Solve the system using Flexible GMRES
-    *-----------------------------------------------------------*/
+         HYPRE_ParCSRBiCGSTABCreate(comm, &par_solver);
+         HYPRE_BiCGSTABSetMaxIter(par_solver, 100);
+         HYPRE_BiCGSTABSetTol(par_solver, tol);
+         HYPRE_BiCGSTABSetPrintLevel(par_solver, solver_print_level);
+         HYPRE_BiCGSTABSetLogging(par_solver, 1);
 
-   if ((solver_id >= 70) && (solver_id < 80))
-   {
-      time_index = hypre_InitializeTiming("FlexGMRES Setup");
-      hypre_BeginTiming(time_index);
+         if (solver_id == 60)
+         {
+            /* use BoomerAMG as preconditioner */
+            HYPRE_BoomerAMGCreate(&par_precond);
+            if (old_default) { HYPRE_BoomerAMGSetOldDefault(par_precond); }
+            HYPRE_BoomerAMGSetStrongThreshold(par_precond, 0.25);
+            HYPRE_BoomerAMGSetTol(par_precond, 0.0);
+            HYPRE_BoomerAMGSetPrintLevel(par_precond, prec_print_level);
+            HYPRE_BoomerAMGSetPrintFileName(par_precond, "sstruct.out.log");
+            HYPRE_BoomerAMGSetMaxIter(par_precond, 1);
+            HYPRE_BiCGSTABSetPrecond( par_solver,
+                                      (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSolve,
+                                      (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSetup,
+                                      par_precond);
+         }
+         else if (solver_id == 61)
+         {
+            /* use Euclid as preconditioner */
+            HYPRE_EuclidCreate(comm, &par_precond);
+            HYPRE_EuclidSetParams(par_precond, argc, argv);
+            HYPRE_BiCGSTABSetPrecond(par_solver,
+                                     (HYPRE_PtrToSolverFcn) HYPRE_EuclidSolve,
+                                     (HYPRE_PtrToSolverFcn) HYPRE_EuclidSetup,
+                                     par_precond);
+         }
 
-      HYPRE_SStructFlexGMRESCreate(hypre_MPI_COMM_WORLD, &solver);
-      HYPRE_FlexGMRESSetKDim( (HYPRE_Solver) solver, 5 );
-      HYPRE_FlexGMRESSetMaxIter( (HYPRE_Solver) solver, 100 );
-      HYPRE_FlexGMRESSetTol( (HYPRE_Solver) solver, tol );
-      HYPRE_FlexGMRESSetPrintLevel( (HYPRE_Solver) solver, 1 );
-      HYPRE_FlexGMRESSetLogging( (HYPRE_Solver) solver, 1 );
+         else if (solver_id == 62)
+         {
+            /* use ParaSails as preconditioner */
+            HYPRE_ParCSRParaSailsCreate(comm, &par_precond );
+            HYPRE_ParCSRParaSailsSetParams(par_precond, 0.1, 1);
+            HYPRE_ParCSRParaSailsSetSym(par_precond, 0);
+            HYPRE_BiCGSTABSetPrecond( par_solver,
+                                      (HYPRE_PtrToSolverFcn) HYPRE_ParCSRParaSailsSolve,
+                                      (HYPRE_PtrToSolverFcn) HYPRE_ParCSRParaSailsSetup,
+                                      par_precond);
+         }
 
-      if ((solver_id == 70) || (solver_id == 71))
-      {
-         /* use Split solver as preconditioner */
-         HYPRE_SStructSplitCreate(hypre_MPI_COMM_WORLD, &precond);
-         HYPRE_SStructSplitSetMaxIter(precond, 1);
-         HYPRE_SStructSplitSetTol(precond, 0.0);
-         HYPRE_SStructSplitSetZeroGuess(precond);
-         if (solver_id == 70)
+         HYPRE_BiCGSTABSetup( par_solver, (HYPRE_Matrix) par_A,
+                              (HYPRE_Vector) par_b, (HYPRE_Vector) par_x);
+
+         hypre_EndTiming(time_index);
+         hypre_PrintTiming("Setup phase times", comm);
+         hypre_FinalizeTiming(time_index);
+         hypre_ClearTiming();
+
+         time_index = hypre_InitializeTiming("BiCGSTAB Solve");
+         hypre_BeginTiming(time_index);
+
+         HYPRE_BiCGSTABSolve( par_solver, (HYPRE_Matrix) par_A,
+                              (HYPRE_Vector) par_b, (HYPRE_Vector) par_x);
+
+         hypre_EndTiming(time_index);
+         hypre_PrintTiming("Solve phase times", comm);
+         hypre_FinalizeTiming(time_index);
+         hypre_ClearTiming();
+
+         HYPRE_BiCGSTABGetNumIterations( par_solver, &num_iterations);
+         HYPRE_BiCGSTABGetFinalRelativeResidualNorm( par_solver, &final_res_norm);
+         HYPRE_ParCSRBiCGSTABDestroy(par_solver);
+
+         if (solver_id == 60)
          {
-            HYPRE_SStructSplitSetStructSolver(precond, HYPRE_SMG);
+            HYPRE_BoomerAMGDestroy(par_precond);
          }
-         else if (solver_id == 71)
+         else if (solver_id == 61)
          {
-            HYPRE_SStructSplitSetStructSolver(precond, HYPRE_PFMG);
+            HYPRE_EuclidDestroy(par_precond);
+         }
+         else if (solver_id == 62)
+         {
+            HYPRE_ParCSRParaSailsDestroy(par_precond);
          }
-         HYPRE_FlexGMRESSetPrecond( (HYPRE_Solver) solver,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_SStructSplitSolve,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_SStructSplitSetup,
-                                    (HYPRE_Solver) precond );
       }
 
-      else if (solver_id == 78)
+      /*-----------------------------------------------------------
+       * Solve the system using Flexible GMRES
+       *-----------------------------------------------------------*/
+
+      if ((solver_id >= 70) && (solver_id < 80))
       {
-         /* use diagonal scaling as preconditioner */
-         precond = NULL;
-         HYPRE_FlexGMRESSetPrecond( (HYPRE_Solver) solver,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_SStructDiagScale,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_SStructDiagScaleSetup,
-                                    (HYPRE_Solver) precond );
-      }
+         time_index = hypre_InitializeTiming("FlexGMRES Setup");
+         hypre_BeginTiming(time_index);
 
-      HYPRE_FlexGMRESSetup( (HYPRE_Solver) solver, (HYPRE_Matrix) A,
-                            (HYPRE_Vector) b, (HYPRE_Vector) x );
+         HYPRE_SStructFlexGMRESCreate(comm, &solver);
+         HYPRE_FlexGMRESSetKDim( (HYPRE_Solver) solver, 5 );
+         HYPRE_FlexGMRESSetMaxIter( (HYPRE_Solver) solver, 100 );
+         HYPRE_FlexGMRESSetTol( (HYPRE_Solver) solver, tol );
+         HYPRE_FlexGMRESSetPrintLevel( (HYPRE_Solver) solver, solver_print_level );
+         HYPRE_FlexGMRESSetLogging( (HYPRE_Solver) solver, 1 );
 
-      hypre_EndTiming(time_index);
-      hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
-      hypre_FinalizeTiming(time_index);
-      hypre_ClearTiming();
+         if ((solver_id == 70) || (solver_id == 71))
+         {
+            /* use Split solver as preconditioner */
+            HYPRE_SStructSplitCreate(comm, &precond);
+            HYPRE_SStructSplitSetMaxIter(precond, 1);
+            HYPRE_SStructSplitSetTol(precond, 0.0);
+            HYPRE_SStructSplitSetZeroGuess(precond);
+            if (solver_id == 70)
+            {
+               HYPRE_SStructSplitSetStructSolver(precond, HYPRE_SMG);
+            }
+            else if (solver_id == 71)
+            {
+               HYPRE_SStructSplitSetStructSolver(precond, HYPRE_PFMG);
+            }
+            HYPRE_FlexGMRESSetPrecond( (HYPRE_Solver) solver,
+                                       (HYPRE_PtrToSolverFcn) HYPRE_SStructSplitSolve,
+                                       (HYPRE_PtrToSolverFcn) HYPRE_SStructSplitSetup,
+                                       (HYPRE_Solver) precond );
+         }
 
-      time_index = hypre_InitializeTiming("FlexGMRES Solve");
-      hypre_BeginTiming(time_index);
+         else if (solver_id == 78)
+         {
+            /* use diagonal scaling as preconditioner */
+            precond = NULL;
+            HYPRE_FlexGMRESSetPrecond( (HYPRE_Solver) solver,
+                                       (HYPRE_PtrToSolverFcn) HYPRE_SStructDiagScale,
+                                       (HYPRE_PtrToSolverFcn) HYPRE_SStructDiagScaleSetup,
+                                       (HYPRE_Solver) precond );
+         }
 
-      HYPRE_FlexGMRESSolve( (HYPRE_Solver) solver, (HYPRE_Matrix) A,
-                            (HYPRE_Vector) b, (HYPRE_Vector) x );
+         HYPRE_FlexGMRESSetup( (HYPRE_Solver) solver, (HYPRE_Matrix) A,
+                               (HYPRE_Vector) b, (HYPRE_Vector) x );
 
-      hypre_EndTiming(time_index);
-      hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
-      hypre_FinalizeTiming(time_index);
-      hypre_ClearTiming();
+         hypre_EndTiming(time_index);
+         hypre_PrintTiming("Setup phase times", comm);
+         hypre_FinalizeTiming(time_index);
+         hypre_ClearTiming();
 
-      HYPRE_FlexGMRESGetNumIterations( (HYPRE_Solver) solver, &num_iterations );
-      HYPRE_FlexGMRESGetFinalRelativeResidualNorm( (HYPRE_Solver) solver, &final_res_norm );
-      HYPRE_SStructFlexGMRESDestroy(solver);
+         time_index = hypre_InitializeTiming("FlexGMRES Solve");
+         hypre_BeginTiming(time_index);
 
-      if ((solver_id == 70) || (solver_id == 71))
-      {
-         HYPRE_SStructSplitDestroy(precond);
-      }
-   }
+         HYPRE_FlexGMRESSolve( (HYPRE_Solver) solver, (HYPRE_Matrix) A,
+                               (HYPRE_Vector) b, (HYPRE_Vector) x );
 
-   /*-----------------------------------------------------------
-    * Solve the system using ParCSR version of Flexible GMRES
-    *-----------------------------------------------------------*/
+         hypre_EndTiming(time_index);
+         hypre_PrintTiming("Solve phase times", comm);
+         hypre_FinalizeTiming(time_index);
+         hypre_ClearTiming();
 
-   if ((solver_id >= 80) && (solver_id < 90))
-   {
-      time_index = hypre_InitializeTiming("FlexGMRES Setup");
-      hypre_BeginTiming(time_index);
+         HYPRE_FlexGMRESGetNumIterations( (HYPRE_Solver) solver, &num_iterations );
+         HYPRE_FlexGMRESGetFinalRelativeResidualNorm( (HYPRE_Solver) solver, &final_res_norm );
+         HYPRE_SStructFlexGMRESDestroy(solver);
 
-      HYPRE_ParCSRFlexGMRESCreate(hypre_MPI_COMM_WORLD, &par_solver);
-      HYPRE_FlexGMRESSetKDim(par_solver, 5);
-      HYPRE_FlexGMRESSetMaxIter(par_solver, 100);
-      HYPRE_FlexGMRESSetTol(par_solver, tol);
-      HYPRE_FlexGMRESSetPrintLevel(par_solver, 1);
-      HYPRE_FlexGMRESSetLogging(par_solver, 1);
-
-      if (solver_id == 80)
-      {
-         /* use BoomerAMG as preconditioner */
-         HYPRE_BoomerAMGCreate(&par_precond);
-         if (old_default) HYPRE_BoomerAMGSetOldDefault(par_precond);
-         HYPRE_BoomerAMGSetStrongThreshold(par_precond, 0.25);
-         HYPRE_BoomerAMGSetTol(par_precond, 0.0);
-         HYPRE_BoomerAMGSetPrintLevel(par_precond, 1);
-         HYPRE_BoomerAMGSetPrintFileName(par_precond, "sstruct.out.log");
-         HYPRE_BoomerAMGSetMaxIter(par_precond, 1);
-         HYPRE_FlexGMRESSetPrecond( par_solver,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSolve,
-                                    (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSetup,
-                                    par_precond);
+         if ((solver_id == 70) || (solver_id == 71))
+         {
+            HYPRE_SStructSplitDestroy(precond);
+         }
       }
 
-      HYPRE_FlexGMRESSetup( par_solver, (HYPRE_Matrix) par_A,
-                            (HYPRE_Vector) par_b, (HYPRE_Vector) par_x);
+      /*-----------------------------------------------------------
+       * Solve the system using ParCSR version of Flexible GMRES
+       *-----------------------------------------------------------*/
 
-      hypre_EndTiming(time_index);
-      hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
-      hypre_FinalizeTiming(time_index);
-      hypre_ClearTiming();
+      if ((solver_id >= 80) && (solver_id < 90))
+      {
+         time_index = hypre_InitializeTiming("FlexGMRES Setup");
+         hypre_BeginTiming(time_index);
 
-      time_index = hypre_InitializeTiming("FlexGMRES Solve");
-      hypre_BeginTiming(time_index);
+         HYPRE_ParCSRFlexGMRESCreate(comm, &par_solver);
+         HYPRE_FlexGMRESSetKDim(par_solver, 5);
+         HYPRE_FlexGMRESSetMaxIter(par_solver, 100);
+         HYPRE_FlexGMRESSetTol(par_solver, tol);
+         HYPRE_FlexGMRESSetPrintLevel(par_solver, solver_print_level);
+         HYPRE_FlexGMRESSetLogging(par_solver, 1);
 
-      HYPRE_FlexGMRESSolve( par_solver, (HYPRE_Matrix) par_A,
-                            (HYPRE_Vector) par_b, (HYPRE_Vector) par_x);
+         if (solver_id == 80)
+         {
+            /* use BoomerAMG as preconditioner */
+            HYPRE_BoomerAMGCreate(&par_precond);
+            if (old_default) { HYPRE_BoomerAMGSetOldDefault(par_precond); }
+            HYPRE_BoomerAMGSetStrongThreshold(par_precond, 0.25);
+            HYPRE_BoomerAMGSetTol(par_precond, 0.0);
+            HYPRE_BoomerAMGSetPrintLevel(par_precond, prec_print_level);
+            HYPRE_BoomerAMGSetPrintFileName(par_precond, "sstruct.out.log");
+            HYPRE_BoomerAMGSetMaxIter(par_precond, 1);
+            HYPRE_FlexGMRESSetPrecond( par_solver,
+                                       (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSolve,
+                                       (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSetup,
+                                       par_precond);
+         }
 
-      hypre_EndTiming(time_index);
-      hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
-      hypre_FinalizeTiming(time_index);
-      hypre_ClearTiming();
+         HYPRE_FlexGMRESSetup( par_solver, (HYPRE_Matrix) par_A,
+                               (HYPRE_Vector) par_b, (HYPRE_Vector) par_x);
 
-      HYPRE_FlexGMRESGetNumIterations( par_solver, &num_iterations);
-      HYPRE_FlexGMRESGetFinalRelativeResidualNorm( par_solver, &final_res_norm);
-      HYPRE_ParCSRFlexGMRESDestroy(par_solver);
+         hypre_EndTiming(time_index);
+         hypre_PrintTiming("Setup phase times", comm);
+         hypre_FinalizeTiming(time_index);
+         hypre_ClearTiming();
 
-      if (solver_id == 80)
-      {
-         HYPRE_BoomerAMGDestroy(par_precond);
-      }
-   }
+         time_index = hypre_InitializeTiming("FlexGMRES Solve");
+         hypre_BeginTiming(time_index);
 
-   /*-----------------------------------------------------------
-    * Solve the system using ParCSR version of LGMRES
-    *-----------------------------------------------------------*/
+         HYPRE_FlexGMRESSolve( par_solver, (HYPRE_Matrix) par_A,
+                               (HYPRE_Vector) par_b, (HYPRE_Vector) par_x);
 
-   if ((solver_id >= 90) && (solver_id < 100))
-   {
-      time_index = hypre_InitializeTiming("LGMRES Setup");
-      hypre_BeginTiming(time_index);
+         hypre_EndTiming(time_index);
+         hypre_PrintTiming("Solve phase times", comm);
+         hypre_FinalizeTiming(time_index);
+         hypre_ClearTiming();
 
-      HYPRE_ParCSRLGMRESCreate(hypre_MPI_COMM_WORLD, &par_solver);
-      HYPRE_LGMRESSetKDim(par_solver, 10);
-      HYPRE_LGMRESSetAugDim(par_solver, 2);
-      HYPRE_LGMRESSetMaxIter(par_solver, 100);
-      HYPRE_LGMRESSetTol(par_solver, tol);
-      HYPRE_LGMRESSetPrintLevel(par_solver, 1);
-      HYPRE_LGMRESSetLogging(par_solver, 1);
-
-      if (solver_id == 90)
-      {
-         /* use BoomerAMG as preconditioner */
-         HYPRE_BoomerAMGCreate(&par_precond);
-         if (old_default) HYPRE_BoomerAMGSetOldDefault(par_precond);
-         HYPRE_BoomerAMGSetStrongThreshold(par_precond, 0.25);
-         HYPRE_BoomerAMGSetTol(par_precond, 0.0);
-         HYPRE_BoomerAMGSetPrintLevel(par_precond, 1);
-         HYPRE_BoomerAMGSetPrintFileName(par_precond, "sstruct.out.log");
-         HYPRE_BoomerAMGSetMaxIter(par_precond, 1);
-         HYPRE_LGMRESSetPrecond( par_solver,
-                                 (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSolve,
-                                 (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSetup,
-                                 par_precond);
+         HYPRE_FlexGMRESGetNumIterations( par_solver, &num_iterations);
+         HYPRE_FlexGMRESGetFinalRelativeResidualNorm( par_solver, &final_res_norm);
+         HYPRE_ParCSRFlexGMRESDestroy(par_solver);
+
+         if (solver_id == 80)
+         {
+            HYPRE_BoomerAMGDestroy(par_precond);
+         }
       }
 
-      HYPRE_LGMRESSetup( par_solver, (HYPRE_Matrix) par_A,
-                         (HYPRE_Vector) par_b, (HYPRE_Vector) par_x);
+      /*-----------------------------------------------------------
+       * Solve the system using ParCSR version of LGMRES
+       *-----------------------------------------------------------*/
 
-      hypre_EndTiming(time_index);
-      hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
-      hypre_FinalizeTiming(time_index);
-      hypre_ClearTiming();
+      if ((solver_id >= 90) && (solver_id < 100))
+      {
+         time_index = hypre_InitializeTiming("LGMRES Setup");
+         hypre_BeginTiming(time_index);
 
-      time_index = hypre_InitializeTiming("LGMRES Solve");
-      hypre_BeginTiming(time_index);
+         HYPRE_ParCSRLGMRESCreate(comm, &par_solver);
+         HYPRE_LGMRESSetKDim(par_solver, 10);
+         HYPRE_LGMRESSetAugDim(par_solver, 2);
+         HYPRE_LGMRESSetMaxIter(par_solver, 100);
+         HYPRE_LGMRESSetTol(par_solver, tol);
+         HYPRE_LGMRESSetPrintLevel(par_solver, solver_print_level);
+         HYPRE_LGMRESSetLogging(par_solver, 1);
 
-      HYPRE_LGMRESSolve( par_solver, (HYPRE_Matrix) par_A,
-                         (HYPRE_Vector) par_b, (HYPRE_Vector) par_x);
+         if (solver_id == 90)
+         {
+            /* use BoomerAMG as preconditioner */
+            HYPRE_BoomerAMGCreate(&par_precond);
+            if (old_default) { HYPRE_BoomerAMGSetOldDefault(par_precond); }
+            HYPRE_BoomerAMGSetStrongThreshold(par_precond, 0.25);
+            HYPRE_BoomerAMGSetTol(par_precond, 0.0);
+            HYPRE_BoomerAMGSetPrintLevel(par_precond, prec_print_level);
+            HYPRE_BoomerAMGSetPrintFileName(par_precond, "sstruct.out.log");
+            HYPRE_BoomerAMGSetMaxIter(par_precond, 1);
+            HYPRE_LGMRESSetPrecond( par_solver,
+                                    (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSolve,
+                                    (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSetup,
+                                    par_precond);
+         }
 
-      hypre_EndTiming(time_index);
-      hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
-      hypre_FinalizeTiming(time_index);
-      hypre_ClearTiming();
+         HYPRE_LGMRESSetup( par_solver, (HYPRE_Matrix) par_A,
+                            (HYPRE_Vector) par_b, (HYPRE_Vector) par_x);
+
+         hypre_EndTiming(time_index);
+         hypre_PrintTiming("Setup phase times", comm);
+         hypre_FinalizeTiming(time_index);
+         hypre_ClearTiming();
+
+         time_index = hypre_InitializeTiming("LGMRES Solve");
+         hypre_BeginTiming(time_index);
+
+         HYPRE_LGMRESSolve( par_solver, (HYPRE_Matrix) par_A,
+                            (HYPRE_Vector) par_b, (HYPRE_Vector) par_x);
+
+         hypre_EndTiming(time_index);
+         hypre_PrintTiming("Solve phase times", comm);
+         hypre_FinalizeTiming(time_index);
+         hypre_ClearTiming();
 
-      HYPRE_LGMRESGetNumIterations( par_solver, &num_iterations);
-      HYPRE_LGMRESGetFinalRelativeResidualNorm( par_solver, &final_res_norm);
-      HYPRE_ParCSRLGMRESDestroy(par_solver);
+         HYPRE_LGMRESGetNumIterations( par_solver, &num_iterations);
+         HYPRE_LGMRESGetFinalRelativeResidualNorm( par_solver, &final_res_norm);
+         HYPRE_ParCSRLGMRESDestroy(par_solver);
 
-      if (solver_id == 90)
-      {
-         HYPRE_BoomerAMGDestroy(par_precond);
+         if (solver_id == 90)
+         {
+            HYPRE_BoomerAMGDestroy(par_precond);
+         }
       }
-   }
 
-   /*-----------------------------------------------------------
-    * Solve the system using ParCSR hybrid DSCG/BoomerAMG
-    *-----------------------------------------------------------*/
+      /*-----------------------------------------------------------
+       * Solve the system using ParCSR hybrid DSCG/BoomerAMG
+       *-----------------------------------------------------------*/
 
-   if (solver_id == 120)
-   {
-      time_index = hypre_InitializeTiming("Hybrid Setup");
-      hypre_BeginTiming(time_index);
+      if (solver_id == 120)
+      {
+         time_index = hypre_InitializeTiming("Hybrid Setup");
+         hypre_BeginTiming(time_index);
 
-      HYPRE_ParCSRHybridCreate(&par_solver);
-      HYPRE_ParCSRHybridSetTol(par_solver, tol);
-      HYPRE_ParCSRHybridSetTwoNorm(par_solver, 1);
-      HYPRE_ParCSRHybridSetRelChange(par_solver, 0);
-      HYPRE_ParCSRHybridSetPrintLevel(par_solver,1); //13
-      HYPRE_ParCSRHybridSetLogging(par_solver,1);
-      HYPRE_ParCSRHybridSetSolverType(par_solver, solver_type);
-      HYPRE_ParCSRHybridSetRecomputeResidual(par_solver, recompute_res);
+         HYPRE_ParCSRHybridCreate(&par_solver);
+         HYPRE_ParCSRHybridSetTol(par_solver, tol);
+         HYPRE_ParCSRHybridSetTwoNorm(par_solver, 1);
+         HYPRE_ParCSRHybridSetRelChange(par_solver, 0);
+         HYPRE_ParCSRHybridSetPrintLevel(par_solver, prec_print_level); //13
+         HYPRE_ParCSRHybridSetLogging(par_solver, 1);
+         HYPRE_ParCSRHybridSetSolverType(par_solver, solver_type);
+         HYPRE_ParCSRHybridSetRecomputeResidual(par_solver, recompute_res);
 
 #if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_DEVICE_OPENMP)
-      /*
-      HYPRE_ParCSRHybridSetPMaxElmts(par_solver, 8);
-      HYPRE_ParCSRHybridSetRelaxType(par_solver, 18);
-      HYPRE_ParCSRHybridSetCycleRelaxType(par_solver, 9, 3);
-      HYPRE_ParCSRHybridSetCoarsenType(par_solver, 8);
-      HYPRE_ParCSRHybridSetInterpType(par_solver, 3);
-      HYPRE_ParCSRHybridSetMaxCoarseSize(par_solver, 20);
-      */
+         /*
+         HYPRE_ParCSRHybridSetPMaxElmts(par_solver, 8);
+         HYPRE_ParCSRHybridSetRelaxType(par_solver, 18);
+         HYPRE_ParCSRHybridSetCycleRelaxType(par_solver, 9, 3);
+         HYPRE_ParCSRHybridSetCoarsenType(par_solver, 8);
+         HYPRE_ParCSRHybridSetInterpType(par_solver, 3);
+         HYPRE_ParCSRHybridSetMaxCoarseSize(par_solver, 20);
+         */
 #endif
 
 #if SECOND_TIME
-      hypre_ParVector *par_x2 =
-         hypre_ParVectorCreate(hypre_ParVectorComm(par_x), hypre_ParVectorGlobalSize(par_x),
-                               hypre_ParVectorPartitioning(par_x));
-      hypre_ParVectorInitialize(par_x2);
-      hypre_ParVectorCopy(par_x, par_x2);
+         hypre_ParVector *par_x2 =
+            hypre_ParVectorCreate(hypre_ParVectorComm(par_x), hypre_ParVectorGlobalSize(par_x),
+                                  hypre_ParVectorPartitioning(par_x));
+         hypre_ParVectorInitialize(par_x2);
+         hypre_ParVectorCopy(par_x, par_x2);
 
-      HYPRE_ParCSRHybridSetup(par_solver,par_A,par_b,par_x);
-      HYPRE_ParCSRHybridSolve(par_solver,par_A,par_b,par_x);
+         HYPRE_ParCSRHybridSetup(par_solver, par_A, par_b, par_x);
+         HYPRE_ParCSRHybridSolve(par_solver, par_A, par_b, par_x);
 
-      hypre_ParVectorCopy(par_x2, par_x);
+         hypre_ParVectorCopy(par_x2, par_x);
 #endif
 
-#if defined(HYPRE_USING_NVTX)
-      hypre_GpuProfilingPushRange("HybridSolve");
-#endif
-      //cudaProfilerStart();
+         hypre_GpuProfilingPushRange("HybridSolve");
+         //cudaProfilerStart();
 
-      HYPRE_ParCSRHybridSetup(par_solver,par_A,par_b,par_x);
+         HYPRE_ParCSRHybridSetup(par_solver, par_A, par_b, par_x);
 
-      hypre_EndTiming(time_index);
-      hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
-      hypre_FinalizeTiming(time_index);
-      hypre_ClearTiming();
+         hypre_EndTiming(time_index);
+         hypre_PrintTiming("Setup phase times", comm);
+         hypre_FinalizeTiming(time_index);
+         hypre_ClearTiming();
 
-      time_index = hypre_InitializeTiming("Hybrid Solve");
-      hypre_BeginTiming(time_index);
+         time_index = hypre_InitializeTiming("Hybrid Solve");
+         hypre_BeginTiming(time_index);
 
-      HYPRE_ParCSRHybridSolve(par_solver,par_A,par_b,par_x);
+         HYPRE_ParCSRHybridSolve(par_solver, par_A, par_b, par_x);
 
-      hypre_EndTiming(time_index);
-      hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
-      hypre_FinalizeTiming(time_index);
-      hypre_ClearTiming();
+         hypre_EndTiming(time_index);
+         hypre_PrintTiming("Solve phase times", comm);
+         hypre_FinalizeTiming(time_index);
+         hypre_ClearTiming();
 
-      HYPRE_ParCSRHybridGetNumIterations(par_solver, &num_iterations);
-      HYPRE_ParCSRHybridGetFinalRelativeResidualNorm(par_solver, &final_res_norm);
+         HYPRE_ParCSRHybridGetNumIterations(par_solver, &num_iterations);
+         HYPRE_ParCSRHybridGetFinalRelativeResidualNorm(par_solver, &final_res_norm);
 
-      /*
-      HYPRE_Real time[4];
-      HYPRE_ParCSRHybridGetSetupSolveTime(par_solver, time);
-      if (myid == 0)
-      {
-         printf("ParCSRHybrid: Setup-Time1 %f, Solve-Time1 %f, Setup-Time2 %f, Solve-Time2 %f\n",
-                time[0], time[1], time[2], time[3]);
-      }
-      */
+         /*
+         HYPRE_Real time[4];
+         HYPRE_ParCSRHybridGetSetupSolveTime(par_solver, time);
+         if (myid == 0)
+         {
+            printf("ParCSRHybrid: Setup-Time1 %f, Solve-Time1 %f, Setup-Time2 %f, Solve-Time2 %f\n",
+                   time[0], time[1], time[2], time[3]);
+         }
+         */
 
-      HYPRE_ParCSRHybridDestroy(par_solver);
+         HYPRE_ParCSRHybridDestroy(par_solver);
 
-#if defined(HYPRE_USING_NVTX)
-      hypre_GpuProfilingPopRange();
-#endif
-      //cudaProfilerStop();
+         hypre_GpuProfilingPopRange();
+         //cudaProfilerStop();
 
 #if SECOND_TIME
-      hypre_ParVectorDestroy(par_x2);
+         hypre_ParVectorDestroy(par_x2);
 #endif
-   }
-
-   /*-----------------------------------------------------------
-    * Solve the system using Struct solvers
-    *-----------------------------------------------------------*/
+      }
 
-   if (solver_id == 200)
-   {
-      time_index = hypre_InitializeTiming("SMG Setup");
-      hypre_BeginTiming(time_index);
+      /*-----------------------------------------------------------
+       * Solve the system using Struct solvers
+       *-----------------------------------------------------------*/
 
-      HYPRE_StructSMGCreate(hypre_MPI_COMM_WORLD, &struct_solver);
-      HYPRE_StructSMGSetMemoryUse(struct_solver, 0);
-      HYPRE_StructSMGSetMaxIter(struct_solver, 50);
-      HYPRE_StructSMGSetTol(struct_solver, tol);
-      HYPRE_StructSMGSetRelChange(struct_solver, 0);
-      HYPRE_StructSMGSetNumPreRelax(struct_solver, n_pre);
-      HYPRE_StructSMGSetNumPostRelax(struct_solver, n_post);
-      HYPRE_StructSMGSetPrintLevel(struct_solver, 1);
-      HYPRE_StructSMGSetLogging(struct_solver, 1);
-      HYPRE_StructSMGSetup(struct_solver, sA, sb, sx);
+      if (solver_id == 200)
+      {
+         time_index = hypre_InitializeTiming("SMG Setup");
+         hypre_BeginTiming(time_index);
 
-      hypre_EndTiming(time_index);
-      hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
-      hypre_FinalizeTiming(time_index);
-      hypre_ClearTiming();
+         HYPRE_StructSMGCreate(comm, &struct_solver);
+         HYPRE_StructSMGSetMemoryUse(struct_solver, 0);
+         HYPRE_StructSMGSetMaxIter(struct_solver, 50);
+         HYPRE_StructSMGSetTol(struct_solver, tol);
+         HYPRE_StructSMGSetRelChange(struct_solver, 0);
+         HYPRE_StructSMGSetNumPreRelax(struct_solver, n_pre);
+         HYPRE_StructSMGSetNumPostRelax(struct_solver, n_post);
+         HYPRE_StructSMGSetPrintLevel(struct_solver, prec_print_level);
+         HYPRE_StructSMGSetLogging(struct_solver, 1);
+         HYPRE_StructSMGSetup(struct_solver, sA, sb, sx);
 
-      time_index = hypre_InitializeTiming("SMG Solve");
-      hypre_BeginTiming(time_index);
+         hypre_EndTiming(time_index);
+         hypre_PrintTiming("Setup phase times", comm);
+         hypre_FinalizeTiming(time_index);
+         hypre_ClearTiming();
 
-      HYPRE_StructSMGSolve(struct_solver, sA, sb, sx);
+         time_index = hypre_InitializeTiming("SMG Solve");
+         hypre_BeginTiming(time_index);
 
-      hypre_EndTiming(time_index);
-      hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
-      hypre_FinalizeTiming(time_index);
-      hypre_ClearTiming();
+         HYPRE_StructSMGSolve(struct_solver, sA, sb, sx);
 
-      HYPRE_StructSMGGetNumIterations(struct_solver, &num_iterations);
-      HYPRE_StructSMGGetFinalRelativeResidualNorm(struct_solver, &final_res_norm);
-      HYPRE_StructSMGDestroy(struct_solver);
-   }
+         hypre_EndTiming(time_index);
+         hypre_PrintTiming("Solve phase times", comm);
+         hypre_FinalizeTiming(time_index);
+         hypre_ClearTiming();
 
-   else if ( solver_id == 201 || solver_id == 203 || solver_id == 204 )
-   {
-      time_index = hypre_InitializeTiming("PFMG Setup");
-      hypre_BeginTiming(time_index);
+         HYPRE_StructSMGGetNumIterations(struct_solver, &num_iterations);
+         HYPRE_StructSMGGetFinalRelativeResidualNorm(struct_solver, &final_res_norm);
+         HYPRE_StructSMGDestroy(struct_solver);
+      }
 
-      HYPRE_StructPFMGCreate(hypre_MPI_COMM_WORLD, &struct_solver);
-      HYPRE_StructPFMGSetMaxIter(struct_solver, 50);
-      HYPRE_StructPFMGSetTol(struct_solver, tol);
-      HYPRE_StructPFMGSetRelChange(struct_solver, 0);
-      HYPRE_StructPFMGSetRAPType(struct_solver, rap);
-      HYPRE_StructPFMGSetRelaxType(struct_solver, relax);
-      if (usr_jacobi_weight)
+      else if ( solver_id == 201 || solver_id == 203 || solver_id == 204 )
       {
-         HYPRE_StructPFMGSetJacobiWeight(struct_solver, jacobi_weight);
-      }
-      HYPRE_StructPFMGSetNumPreRelax(struct_solver, n_pre);
-      HYPRE_StructPFMGSetNumPostRelax(struct_solver, n_post);
-      HYPRE_StructPFMGSetSkipRelax(struct_solver, skip);
-      /*HYPRE_StructPFMGSetDxyz(struct_solver, dxyz);*/
-      HYPRE_StructPFMGSetPrintLevel(struct_solver, 1);
-      HYPRE_StructPFMGSetLogging(struct_solver, 1);
-      HYPRE_StructPFMGSetup(struct_solver, sA, sb, sx);
+         time_index = hypre_InitializeTiming("PFMG Setup");
+         hypre_BeginTiming(time_index);
 
-      hypre_EndTiming(time_index);
-      hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
-      hypre_FinalizeTiming(time_index);
-      hypre_ClearTiming();
+         HYPRE_StructPFMGCreate(comm, &struct_solver);
+         HYPRE_StructPFMGSetMaxIter(struct_solver, 50);
+         HYPRE_StructPFMGSetTol(struct_solver, tol);
+         HYPRE_StructPFMGSetRelChange(struct_solver, 0);
+         HYPRE_StructPFMGSetRAPType(struct_solver, rap);
+         HYPRE_StructPFMGSetRelaxType(struct_solver, relax);
+         if (usr_jacobi_weight)
+         {
+            HYPRE_StructPFMGSetJacobiWeight(struct_solver, jacobi_weight);
+         }
+         HYPRE_StructPFMGSetNumPreRelax(struct_solver, n_pre);
+         HYPRE_StructPFMGSetNumPostRelax(struct_solver, n_post);
+         HYPRE_StructPFMGSetSkipRelax(struct_solver, skip);
+         /*HYPRE_StructPFMGSetDxyz(struct_solver, dxyz);*/
+         HYPRE_StructPFMGSetPrintLevel(struct_solver, prec_print_level);
+         HYPRE_StructPFMGSetLogging(struct_solver, 1);
+         HYPRE_StructPFMGSetup(struct_solver, sA, sb, sx);
 
-      time_index = hypre_InitializeTiming("PFMG Solve");
-      hypre_BeginTiming(time_index);
+         hypre_EndTiming(time_index);
+         hypre_PrintTiming("Setup phase times", comm);
+         hypre_FinalizeTiming(time_index);
+         hypre_ClearTiming();
 
-      HYPRE_StructPFMGSolve(struct_solver, sA, sb, sx);
+         time_index = hypre_InitializeTiming("PFMG Solve");
+         hypre_BeginTiming(time_index);
 
-      hypre_EndTiming(time_index);
-      hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
-      hypre_FinalizeTiming(time_index);
-      hypre_ClearTiming();
+         HYPRE_StructPFMGSolve(struct_solver, sA, sb, sx);
 
-      HYPRE_StructPFMGGetNumIterations(struct_solver, &num_iterations);
-      HYPRE_StructPFMGGetFinalRelativeResidualNorm(struct_solver, &final_res_norm);
-      HYPRE_StructPFMGDestroy(struct_solver);
-   }
+         hypre_EndTiming(time_index);
+         hypre_PrintTiming("Solve phase times", comm);
+         hypre_FinalizeTiming(time_index);
+         hypre_ClearTiming();
 
-   /*-----------------------------------------------------------
-    * Solve the system using Cyclic Reduction
-    *-----------------------------------------------------------*/
+         HYPRE_StructPFMGGetNumIterations(struct_solver, &num_iterations);
+         HYPRE_StructPFMGGetFinalRelativeResidualNorm(struct_solver, &final_res_norm);
+         HYPRE_StructPFMGDestroy(struct_solver);
+      }
 
-   else if ( solver_id == 205 )
-   {
-      HYPRE_StructVector  sr;
+      /*-----------------------------------------------------------
+       * Solve the system using Cyclic Reduction
+       *-----------------------------------------------------------*/
 
-      time_index = hypre_InitializeTiming("CycRed Setup");
-      hypre_BeginTiming(time_index);
+      else if ( solver_id == 205 )
+      {
+         HYPRE_StructVector  sr;
 
-      HYPRE_StructCycRedCreate(hypre_MPI_COMM_WORLD, &struct_solver);
-      HYPRE_StructCycRedSetTDim(struct_solver, cycred_tdim);
-      HYPRE_StructCycRedSetBase(struct_solver, data.ndim,
-                                cycred_index, cycred_stride);
-      HYPRE_StructCycRedSetup(struct_solver, sA, sb, sx);
+         time_index = hypre_InitializeTiming("CycRed Setup");
+         hypre_BeginTiming(time_index);
 
-      hypre_EndTiming(time_index);
-      hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
-      hypre_FinalizeTiming(time_index);
-      hypre_ClearTiming();
+         HYPRE_StructCycRedCreate(comm, &struct_solver);
+         HYPRE_StructCycRedSetTDim(struct_solver, cycred_tdim);
+         HYPRE_StructCycRedSetBase(struct_solver, data.ndim,
+                                   cycred_index, cycred_stride);
+         HYPRE_StructCycRedSetup(struct_solver, sA, sb, sx);
 
-      time_index = hypre_InitializeTiming("CycRed Solve");
-      hypre_BeginTiming(time_index);
+         hypre_EndTiming(time_index);
+         hypre_PrintTiming("Setup phase times", comm);
+         hypre_FinalizeTiming(time_index);
+         hypre_ClearTiming();
 
-      HYPRE_StructCycRedSolve(struct_solver, sA, sb, sx);
+         time_index = hypre_InitializeTiming("CycRed Solve");
+         hypre_BeginTiming(time_index);
 
-      hypre_EndTiming(time_index);
-      hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
-      hypre_FinalizeTiming(time_index);
-      hypre_ClearTiming();
+         HYPRE_StructCycRedSolve(struct_solver, sA, sb, sx);
 
-      num_iterations = 1;
-      HYPRE_StructVectorCreate(hypre_MPI_COMM_WORLD,
-                               hypre_StructVectorGrid(sb), &sr);
-      HYPRE_StructVectorInitialize(sr);
-      HYPRE_StructVectorAssemble(sr);
-      HYPRE_StructVectorCopy(sb, sr);
-      hypre_StructMatvec(-1.0, sA, sx, 1.0, sr);
-      /* Using an inner product instead of a norm to help with testing */
-      final_res_norm = hypre_StructInnerProd(sr, sr);
-      if (final_res_norm < 1.0e-20)
-      {
-         final_res_norm = 0.0;
-      }
-      HYPRE_StructVectorDestroy(sr);
+         hypre_EndTiming(time_index);
+         hypre_PrintTiming("Solve phase times", comm);
+         hypre_FinalizeTiming(time_index);
+         hypre_ClearTiming();
 
-      HYPRE_StructCycRedDestroy(struct_solver);
-   }
+         num_iterations = 1;
+         HYPRE_StructVectorCreate(comm,
+                                  hypre_StructVectorGrid(sb), &sr);
+         HYPRE_StructVectorInitialize(sr);
+         HYPRE_StructVectorAssemble(sr);
+         HYPRE_StructVectorCopy(sb, sr);
+         hypre_StructMatvec(-1.0, sA, sx, 1.0, sr);
+         /* Using an inner product instead of a norm to help with testing */
+         final_res_norm = hypre_StructInnerProd(sr, sr);
+         if (final_res_norm < 1.0e-20)
+         {
+            final_res_norm = 0.0;
+         }
+         HYPRE_StructVectorDestroy(sr);
 
-   /*-----------------------------------------------------------
-    * Solve the system using SparseMSG
-    *-----------------------------------------------------------*/
+         HYPRE_StructCycRedDestroy(struct_solver);
+      }
 
-   else if (solver_id == 202)
-   {
-      time_index = hypre_InitializeTiming("SparseMSG Setup");
-      hypre_BeginTiming(time_index);
+      /*-----------------------------------------------------------
+       * Solve the system using SparseMSG
+       *-----------------------------------------------------------*/
 
-      HYPRE_StructSparseMSGCreate(hypre_MPI_COMM_WORLD, &struct_solver);
-      HYPRE_StructSparseMSGSetMaxIter(struct_solver, 50);
-      HYPRE_StructSparseMSGSetJump(struct_solver, jump);
-      HYPRE_StructSparseMSGSetTol(struct_solver, tol);
-      HYPRE_StructSparseMSGSetRelChange(struct_solver, 0);
-      HYPRE_StructSparseMSGSetRelaxType(struct_solver, relax);
-      if (usr_jacobi_weight)
+      else if (solver_id == 202)
       {
-         HYPRE_StructSparseMSGSetJacobiWeight(struct_solver, jacobi_weight);
-      }
-      HYPRE_StructSparseMSGSetNumPreRelax(struct_solver, n_pre);
-      HYPRE_StructSparseMSGSetNumPostRelax(struct_solver, n_post);
-      HYPRE_StructSparseMSGSetPrintLevel(struct_solver, 1);
-      HYPRE_StructSparseMSGSetLogging(struct_solver, 1);
-      HYPRE_StructSparseMSGSetup(struct_solver, sA, sb, sx);
+         time_index = hypre_InitializeTiming("SparseMSG Setup");
+         hypre_BeginTiming(time_index);
 
-      hypre_EndTiming(time_index);
-      hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
-      hypre_FinalizeTiming(time_index);
-      hypre_ClearTiming();
+         HYPRE_StructSparseMSGCreate(comm, &struct_solver);
+         HYPRE_StructSparseMSGSetMaxIter(struct_solver, 50);
+         HYPRE_StructSparseMSGSetJump(struct_solver, jump);
+         HYPRE_StructSparseMSGSetTol(struct_solver, tol);
+         HYPRE_StructSparseMSGSetRelChange(struct_solver, 0);
+         HYPRE_StructSparseMSGSetRelaxType(struct_solver, relax);
+         if (usr_jacobi_weight)
+         {
+            HYPRE_StructSparseMSGSetJacobiWeight(struct_solver, jacobi_weight);
+         }
+         HYPRE_StructSparseMSGSetNumPreRelax(struct_solver, n_pre);
+         HYPRE_StructSparseMSGSetNumPostRelax(struct_solver, n_post);
+         HYPRE_StructSparseMSGSetPrintLevel(struct_solver, prec_print_level);
+         HYPRE_StructSparseMSGSetLogging(struct_solver, 1);
+         HYPRE_StructSparseMSGSetup(struct_solver, sA, sb, sx);
 
-      time_index = hypre_InitializeTiming("SparseMSG Solve");
-      hypre_BeginTiming(time_index);
+         hypre_EndTiming(time_index);
+         hypre_PrintTiming("Setup phase times", comm);
+         hypre_FinalizeTiming(time_index);
+         hypre_ClearTiming();
+
+         time_index = hypre_InitializeTiming("SparseMSG Solve");
+         hypre_BeginTiming(time_index);
 
-      HYPRE_StructSparseMSGSolve(struct_solver, sA, sb, sx);
+         HYPRE_StructSparseMSGSolve(struct_solver, sA, sb, sx);
 
-      hypre_EndTiming(time_index);
-      hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
-      hypre_FinalizeTiming(time_index);
-      hypre_ClearTiming();
+         hypre_EndTiming(time_index);
+         hypre_PrintTiming("Solve phase times", comm);
+         hypre_FinalizeTiming(time_index);
+         hypre_ClearTiming();
 
-      HYPRE_StructSparseMSGGetNumIterations(struct_solver, &num_iterations);
-      HYPRE_StructSparseMSGGetFinalRelativeResidualNorm(struct_solver,
-                                                        &final_res_norm);
-      HYPRE_StructSparseMSGDestroy(struct_solver);
-   }
+         HYPRE_StructSparseMSGGetNumIterations(struct_solver, &num_iterations);
+         HYPRE_StructSparseMSGGetFinalRelativeResidualNorm(struct_solver,
+                                                           &final_res_norm);
+         HYPRE_StructSparseMSGDestroy(struct_solver);
+      }
 
-   /*-----------------------------------------------------------
-    * Solve the system using Jacobi
-    *-----------------------------------------------------------*/
+      /*-----------------------------------------------------------
+       * Solve the system using Jacobi
+       *-----------------------------------------------------------*/
 
-   else if ( solver_id == 208 )
-   {
-      time_index = hypre_InitializeTiming("Jacobi Setup");
-      hypre_BeginTiming(time_index);
+      else if ( solver_id == 208 )
+      {
+         time_index = hypre_InitializeTiming("Jacobi Setup");
+         hypre_BeginTiming(time_index);
 
-      HYPRE_StructJacobiCreate(hypre_MPI_COMM_WORLD, &struct_solver);
-      HYPRE_StructJacobiSetMaxIter(struct_solver, 100);
-      HYPRE_StructJacobiSetTol(struct_solver, tol);
-      HYPRE_StructJacobiSetup(struct_solver, sA, sb, sx);
+         HYPRE_StructJacobiCreate(comm, &struct_solver);
+         HYPRE_StructJacobiSetMaxIter(struct_solver, 100);
+         HYPRE_StructJacobiSetTol(struct_solver, tol);
+         HYPRE_StructJacobiSetup(struct_solver, sA, sb, sx);
 
-      hypre_EndTiming(time_index);
-      hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
-      hypre_FinalizeTiming(time_index);
-      hypre_ClearTiming();
+         hypre_EndTiming(time_index);
+         hypre_PrintTiming("Setup phase times", comm);
+         hypre_FinalizeTiming(time_index);
+         hypre_ClearTiming();
 
-      time_index = hypre_InitializeTiming("Jacobi Solve");
-      hypre_BeginTiming(time_index);
+         time_index = hypre_InitializeTiming("Jacobi Solve");
+         hypre_BeginTiming(time_index);
 
-      HYPRE_StructJacobiSolve(struct_solver, sA, sb, sx);
+         HYPRE_StructJacobiSolve(struct_solver, sA, sb, sx);
 
-      hypre_EndTiming(time_index);
-      hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
-      hypre_FinalizeTiming(time_index);
-      hypre_ClearTiming();
+         hypre_EndTiming(time_index);
+         hypre_PrintTiming("Solve phase times", comm);
+         hypre_FinalizeTiming(time_index);
+         hypre_ClearTiming();
 
-      HYPRE_StructJacobiGetNumIterations(struct_solver, &num_iterations);
-      HYPRE_StructJacobiGetFinalRelativeResidualNorm(struct_solver,
-                                                     &final_res_norm);
-      HYPRE_StructJacobiDestroy(struct_solver);
-   }
+         HYPRE_StructJacobiGetNumIterations(struct_solver, &num_iterations);
+         HYPRE_StructJacobiGetFinalRelativeResidualNorm(struct_solver,
+                                                        &final_res_norm);
+         HYPRE_StructJacobiDestroy(struct_solver);
+      }
 
-   /*-----------------------------------------------------------
-    * Solve the system using CG
-    *-----------------------------------------------------------*/
+      /*-----------------------------------------------------------
+       * Solve the system using CG
+       *-----------------------------------------------------------*/
 
-   if ((solver_id > 209) && (solver_id < 220))
-   {
-      time_index = hypre_InitializeTiming("PCG Setup");
-      hypre_BeginTiming(time_index);
+      if ((solver_id > 209) && (solver_id < 220))
+      {
+         time_index = hypre_InitializeTiming("PCG Setup");
+         hypre_BeginTiming(time_index);
 
-      HYPRE_StructPCGCreate(hypre_MPI_COMM_WORLD, &struct_solver);
-      HYPRE_PCGSetMaxIter( (HYPRE_Solver)struct_solver, 100 );
-      HYPRE_PCGSetTol( (HYPRE_Solver)struct_solver, tol );
-      HYPRE_PCGSetTwoNorm( (HYPRE_Solver)struct_solver, 1 );
-      HYPRE_PCGSetRelChange( (HYPRE_Solver)struct_solver, 0 );
-      HYPRE_PCGSetPrintLevel( (HYPRE_Solver)struct_solver, 1 );
-      HYPRE_PCGSetRecomputeResidual( (HYPRE_Solver)struct_solver, recompute_res);
-
-      if (solver_id == 210)
-      {
-         /* use symmetric SMG as preconditioner */
-         HYPRE_StructSMGCreate(hypre_MPI_COMM_WORLD, &struct_precond);
-         HYPRE_StructSMGSetMemoryUse(struct_precond, 0);
-         HYPRE_StructSMGSetMaxIter(struct_precond, 1);
-         HYPRE_StructSMGSetTol(struct_precond, 0.0);
-         HYPRE_StructSMGSetZeroGuess(struct_precond);
-         HYPRE_StructSMGSetNumPreRelax(struct_precond, n_pre);
-         HYPRE_StructSMGSetNumPostRelax(struct_precond, n_post);
-         HYPRE_StructSMGSetPrintLevel(struct_precond, 0);
-         HYPRE_StructSMGSetLogging(struct_precond, 0);
-         HYPRE_PCGSetPrecond( (HYPRE_Solver) struct_solver,
-                              (HYPRE_PtrToSolverFcn) HYPRE_StructSMGSolve,
-                              (HYPRE_PtrToSolverFcn) HYPRE_StructSMGSetup,
-                              (HYPRE_Solver) struct_precond);
-      }
-
-      else if (solver_id == 211)
-      {
-         /* use symmetric PFMG as preconditioner */
-         HYPRE_StructPFMGCreate(hypre_MPI_COMM_WORLD, &struct_precond);
-         HYPRE_StructPFMGSetMaxIter(struct_precond, 1);
-         HYPRE_StructPFMGSetTol(struct_precond, 0.0);
-         HYPRE_StructPFMGSetZeroGuess(struct_precond);
-         HYPRE_StructPFMGSetRAPType(struct_precond, rap);
-         HYPRE_StructPFMGSetRelaxType(struct_precond, relax);
-         if (usr_jacobi_weight)
+         HYPRE_StructPCGCreate(comm, &struct_solver);
+         HYPRE_PCGSetMaxIter( (HYPRE_Solver)struct_solver, 100 );
+         HYPRE_PCGSetTol( (HYPRE_Solver)struct_solver, tol );
+         HYPRE_PCGSetTwoNorm( (HYPRE_Solver)struct_solver, 1 );
+         HYPRE_PCGSetRelChange( (HYPRE_Solver)struct_solver, 0 );
+         HYPRE_PCGSetPrintLevel( (HYPRE_Solver)struct_solver, solver_print_level );
+         HYPRE_PCGSetRecomputeResidual( (HYPRE_Solver)struct_solver, recompute_res);
+
+         if (solver_id == 210)
          {
-            HYPRE_StructPFMGSetJacobiWeight(struct_precond, jacobi_weight);
-         }
-         HYPRE_StructPFMGSetNumPreRelax(struct_precond, n_pre);
-         HYPRE_StructPFMGSetNumPostRelax(struct_precond, n_post);
-         HYPRE_StructPFMGSetSkipRelax(struct_precond, skip);
-         /*HYPRE_StructPFMGSetDxyz(struct_precond, dxyz);*/
-         HYPRE_StructPFMGSetPrintLevel(struct_precond, 0);
-         HYPRE_StructPFMGSetLogging(struct_precond, 0);
-         HYPRE_PCGSetPrecond( (HYPRE_Solver) struct_solver,
-                              (HYPRE_PtrToSolverFcn) HYPRE_StructPFMGSolve,
-                              (HYPRE_PtrToSolverFcn) HYPRE_StructPFMGSetup,
-                              (HYPRE_Solver) struct_precond);
-      }
-
-      else if (solver_id == 212)
-      {
-         /* use symmetric SparseMSG as preconditioner */
-         HYPRE_StructSparseMSGCreate(hypre_MPI_COMM_WORLD, &struct_precond);
-         HYPRE_StructSparseMSGSetMaxIter(struct_precond, 1);
-         HYPRE_StructSparseMSGSetJump(struct_precond, jump);
-         HYPRE_StructSparseMSGSetTol(struct_precond, 0.0);
-         HYPRE_StructSparseMSGSetZeroGuess(struct_precond);
-         HYPRE_StructSparseMSGSetRelaxType(struct_precond, relax);
-         if (usr_jacobi_weight)
+            /* use symmetric SMG as preconditioner */
+            HYPRE_StructSMGCreate(comm, &struct_precond);
+            HYPRE_StructSMGSetMemoryUse(struct_precond, 0);
+            HYPRE_StructSMGSetMaxIter(struct_precond, 1);
+            HYPRE_StructSMGSetTol(struct_precond, 0.0);
+            HYPRE_StructSMGSetZeroGuess(struct_precond);
+            HYPRE_StructSMGSetNumPreRelax(struct_precond, n_pre);
+            HYPRE_StructSMGSetNumPostRelax(struct_precond, n_post);
+            HYPRE_StructSMGSetPrintLevel(struct_precond, prec_print_level);
+            HYPRE_StructSMGSetLogging(struct_precond, 0);
+            HYPRE_PCGSetPrecond( (HYPRE_Solver) struct_solver,
+                                 (HYPRE_PtrToSolverFcn) HYPRE_StructSMGSolve,
+                                 (HYPRE_PtrToSolverFcn) HYPRE_StructSMGSetup,
+                                 (HYPRE_Solver) struct_precond);
+         }
+
+         else if (solver_id == 211)
          {
-            HYPRE_StructSparseMSGSetJacobiWeight(struct_precond, jacobi_weight);
+            /* use symmetric PFMG as preconditioner */
+            HYPRE_StructPFMGCreate(comm, &struct_precond);
+            HYPRE_StructPFMGSetMaxIter(struct_precond, 1);
+            HYPRE_StructPFMGSetTol(struct_precond, 0.0);
+            HYPRE_StructPFMGSetZeroGuess(struct_precond);
+            HYPRE_StructPFMGSetRAPType(struct_precond, rap);
+            HYPRE_StructPFMGSetRelaxType(struct_precond, relax);
+            if (usr_jacobi_weight)
+            {
+               HYPRE_StructPFMGSetJacobiWeight(struct_precond, jacobi_weight);
+            }
+            HYPRE_StructPFMGSetNumPreRelax(struct_precond, n_pre);
+            HYPRE_StructPFMGSetNumPostRelax(struct_precond, n_post);
+            HYPRE_StructPFMGSetSkipRelax(struct_precond, skip);
+            /*HYPRE_StructPFMGSetDxyz(struct_precond, dxyz);*/
+            HYPRE_StructPFMGSetPrintLevel(struct_precond, prec_print_level);
+            HYPRE_StructPFMGSetLogging(struct_precond, 0);
+            HYPRE_PCGSetPrecond( (HYPRE_Solver) struct_solver,
+                                 (HYPRE_PtrToSolverFcn) HYPRE_StructPFMGSolve,
+                                 (HYPRE_PtrToSolverFcn) HYPRE_StructPFMGSetup,
+                                 (HYPRE_Solver) struct_precond);
          }
-         HYPRE_StructSparseMSGSetNumPreRelax(struct_precond, n_pre);
-         HYPRE_StructSparseMSGSetNumPostRelax(struct_precond, n_post);
-         HYPRE_StructSparseMSGSetPrintLevel(struct_precond, 0);
-         HYPRE_StructSparseMSGSetLogging(struct_precond, 0);
-         HYPRE_PCGSetPrecond( (HYPRE_Solver) struct_solver,
-                              (HYPRE_PtrToSolverFcn) HYPRE_StructSparseMSGSolve,
-                              (HYPRE_PtrToSolverFcn) HYPRE_StructSparseMSGSetup,
-                              (HYPRE_Solver) struct_precond);
-      }
 
-      else if (solver_id == 217)
-      {
-         /* use two-step Jacobi as preconditioner */
-         HYPRE_StructJacobiCreate(hypre_MPI_COMM_WORLD, &struct_precond);
-         HYPRE_StructJacobiSetMaxIter(struct_precond, 2);
-         HYPRE_StructJacobiSetTol(struct_precond, 0.0);
-         HYPRE_StructJacobiSetZeroGuess(struct_precond);
-         HYPRE_PCGSetPrecond( (HYPRE_Solver) struct_solver,
-                              (HYPRE_PtrToSolverFcn) HYPRE_StructJacobiSolve,
-                              (HYPRE_PtrToSolverFcn) HYPRE_StructJacobiSetup,
-                              (HYPRE_Solver) struct_precond);
-      }
+         else if (solver_id == 212)
+         {
+            /* use symmetric SparseMSG as preconditioner */
+            HYPRE_StructSparseMSGCreate(comm, &struct_precond);
+            HYPRE_StructSparseMSGSetMaxIter(struct_precond, 1);
+            HYPRE_StructSparseMSGSetJump(struct_precond, jump);
+            HYPRE_StructSparseMSGSetTol(struct_precond, 0.0);
+            HYPRE_StructSparseMSGSetZeroGuess(struct_precond);
+            HYPRE_StructSparseMSGSetRelaxType(struct_precond, relax);
+            if (usr_jacobi_weight)
+            {
+               HYPRE_StructSparseMSGSetJacobiWeight(struct_precond, jacobi_weight);
+            }
+            HYPRE_StructSparseMSGSetNumPreRelax(struct_precond, n_pre);
+            HYPRE_StructSparseMSGSetNumPostRelax(struct_precond, n_post);
+            HYPRE_StructSparseMSGSetPrintLevel(struct_precond, prec_print_level);
+            HYPRE_StructSparseMSGSetLogging(struct_precond, 0);
+            HYPRE_PCGSetPrecond( (HYPRE_Solver) struct_solver,
+                                 (HYPRE_PtrToSolverFcn) HYPRE_StructSparseMSGSolve,
+                                 (HYPRE_PtrToSolverFcn) HYPRE_StructSparseMSGSetup,
+                                 (HYPRE_Solver) struct_precond);
+         }
 
-      else if (solver_id == 218)
-      {
-         /* use diagonal scaling as preconditioner */
-         struct_precond = NULL;
-         HYPRE_PCGSetPrecond( (HYPRE_Solver) struct_solver,
-                              (HYPRE_PtrToSolverFcn) HYPRE_StructDiagScale,
-                              (HYPRE_PtrToSolverFcn) HYPRE_StructDiagScaleSetup,
-                              (HYPRE_Solver) struct_precond);
-      }
+         else if (solver_id == 217)
+         {
+            /* use two-step Jacobi as preconditioner */
+            HYPRE_StructJacobiCreate(comm, &struct_precond);
+            HYPRE_StructJacobiSetMaxIter(struct_precond, 2);
+            HYPRE_StructJacobiSetTol(struct_precond, 0.0);
+            HYPRE_StructJacobiSetZeroGuess(struct_precond);
+            HYPRE_PCGSetPrecond( (HYPRE_Solver) struct_solver,
+                                 (HYPRE_PtrToSolverFcn) HYPRE_StructJacobiSolve,
+                                 (HYPRE_PtrToSolverFcn) HYPRE_StructJacobiSetup,
+                                 (HYPRE_Solver) struct_precond);
+         }
+
+         else if (solver_id == 218)
+         {
+            /* use diagonal scaling as preconditioner */
+            struct_precond = NULL;
+            HYPRE_PCGSetPrecond( (HYPRE_Solver) struct_solver,
+                                 (HYPRE_PtrToSolverFcn) HYPRE_StructDiagScale,
+                                 (HYPRE_PtrToSolverFcn) HYPRE_StructDiagScaleSetup,
+                                 (HYPRE_Solver) struct_precond);
+         }
 
-      HYPRE_PCGSetup
+         HYPRE_PCGSetup
          ( (HYPRE_Solver)struct_solver, (HYPRE_Matrix)sA, (HYPRE_Vector)sb,
            (HYPRE_Vector)sx );
 
-      hypre_EndTiming(time_index);
-      hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
-      hypre_FinalizeTiming(time_index);
-      hypre_ClearTiming();
+         hypre_EndTiming(time_index);
+         hypre_PrintTiming("Setup phase times", comm);
+         hypre_FinalizeTiming(time_index);
+         hypre_ClearTiming();
 
-      time_index = hypre_InitializeTiming("PCG Solve");
-      hypre_BeginTiming(time_index);
+         time_index = hypre_InitializeTiming("PCG Solve");
+         hypre_BeginTiming(time_index);
 
-      HYPRE_PCGSolve
+         HYPRE_PCGSolve
          ( (HYPRE_Solver) struct_solver, (HYPRE_Matrix)sA, (HYPRE_Vector)sb,
            (HYPRE_Vector)sx);
 
-      hypre_EndTiming(time_index);
-      hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
-      hypre_FinalizeTiming(time_index);
-      hypre_ClearTiming();
-
-      HYPRE_PCGGetNumIterations( (HYPRE_Solver)struct_solver, &num_iterations );
-      HYPRE_PCGGetFinalRelativeResidualNorm( (HYPRE_Solver)struct_solver, &final_res_norm );
-      HYPRE_StructPCGDestroy(struct_solver);
-
-      if (solver_id == 210)
-      {
-         HYPRE_StructSMGDestroy(struct_precond);
-      }
-      else if (solver_id == 211)
-      {
-         HYPRE_StructPFMGDestroy(struct_precond);
-      }
-      else if (solver_id == 212)
-      {
-         HYPRE_StructSparseMSGDestroy(struct_precond);
-      }
-      else if (solver_id == 217)
-      {
-         HYPRE_StructJacobiDestroy(struct_precond);
-      }
-   }
-
-   /*-----------------------------------------------------------
-    * Solve the system using Hybrid
-    *-----------------------------------------------------------*/
+         hypre_EndTiming(time_index);
+         hypre_PrintTiming("Solve phase times", comm);
+         hypre_FinalizeTiming(time_index);
+         hypre_ClearTiming();
 
-   if ((solver_id > 219) && (solver_id < 230))
-   {
-      time_index = hypre_InitializeTiming("Hybrid Setup");
-      hypre_BeginTiming(time_index);
+         HYPRE_PCGGetNumIterations( (HYPRE_Solver)struct_solver, &num_iterations );
+         HYPRE_PCGGetFinalRelativeResidualNorm( (HYPRE_Solver)struct_solver, &final_res_norm );
+         HYPRE_StructPCGDestroy(struct_solver);
 
-      HYPRE_StructHybridCreate(hypre_MPI_COMM_WORLD, &struct_solver);
-      HYPRE_StructHybridSetDSCGMaxIter(struct_solver, 100);
-      HYPRE_StructHybridSetPCGMaxIter(struct_solver, 100);
-      HYPRE_StructHybridSetTol(struct_solver, tol);
-      /*HYPRE_StructHybridSetPCGAbsoluteTolFactor(struct_solver, 1.0e-200);*/
-      HYPRE_StructHybridSetConvergenceTol(struct_solver, cf_tol);
-      HYPRE_StructHybridSetTwoNorm(struct_solver, 1);
-      HYPRE_StructHybridSetRelChange(struct_solver, 0);
-      if (solver_type == 2) /* for use with GMRES */
-      {
-         HYPRE_StructHybridSetStopCrit(struct_solver, 0);
-         HYPRE_StructHybridSetKDim(struct_solver, 10);
-      }
-      HYPRE_StructHybridSetPrintLevel(struct_solver, 1);
-      HYPRE_StructHybridSetLogging(struct_solver, 1);
-      HYPRE_StructHybridSetSolverType(struct_solver, solver_type);
-      HYPRE_StructHybridSetRecomputeResidual(struct_solver, recompute_res);
-
-      if (solver_id == 220)
-      {
-         /* use symmetric SMG as preconditioner */
-         HYPRE_StructSMGCreate(hypre_MPI_COMM_WORLD, &struct_precond);
-         HYPRE_StructSMGSetMemoryUse(struct_precond, 0);
-         HYPRE_StructSMGSetMaxIter(struct_precond, 1);
-         HYPRE_StructSMGSetTol(struct_precond, 0.0);
-         HYPRE_StructSMGSetZeroGuess(struct_precond);
-         HYPRE_StructSMGSetNumPreRelax(struct_precond, n_pre);
-         HYPRE_StructSMGSetNumPostRelax(struct_precond, n_post);
-         HYPRE_StructSMGSetPrintLevel(struct_precond, 0);
-         HYPRE_StructSMGSetLogging(struct_precond, 0);
-         HYPRE_StructHybridSetPrecond(struct_solver,
-                                      HYPRE_StructSMGSolve,
-                                      HYPRE_StructSMGSetup,
-                                      struct_precond);
-      }
-
-      else if (solver_id == 221)
-      {
-         /* use symmetric PFMG as preconditioner */
-         HYPRE_StructPFMGCreate(hypre_MPI_COMM_WORLD, &struct_precond);
-         HYPRE_StructPFMGSetMaxIter(struct_precond, 1);
-         HYPRE_StructPFMGSetTol(struct_precond, 0.0);
-         HYPRE_StructPFMGSetZeroGuess(struct_precond);
-         HYPRE_StructPFMGSetRAPType(struct_precond, rap);
-         HYPRE_StructPFMGSetRelaxType(struct_precond, relax);
-         if (usr_jacobi_weight)
+         if (solver_id == 210)
          {
-            HYPRE_StructPFMGSetJacobiWeight(struct_precond, jacobi_weight);
-         }
-         HYPRE_StructPFMGSetNumPreRelax(struct_precond, n_pre);
-         HYPRE_StructPFMGSetNumPostRelax(struct_precond, n_post);
-         HYPRE_StructPFMGSetSkipRelax(struct_precond, skip);
-         /*HYPRE_StructPFMGSetDxyz(struct_precond, dxyz);*/
-         HYPRE_StructPFMGSetPrintLevel(struct_precond, 0);
-         HYPRE_StructPFMGSetLogging(struct_precond, 0);
-         HYPRE_StructHybridSetPrecond(struct_solver,
-                                      HYPRE_StructPFMGSolve,
-                                      HYPRE_StructPFMGSetup,
-                                      struct_precond);
-      }
-
-      else if (solver_id == 222)
-      {
-         /* use symmetric SparseMSG as preconditioner */
-         HYPRE_StructSparseMSGCreate(hypre_MPI_COMM_WORLD, &struct_precond);
-         HYPRE_StructSparseMSGSetJump(struct_precond, jump);
-         HYPRE_StructSparseMSGSetMaxIter(struct_precond, 1);
-         HYPRE_StructSparseMSGSetTol(struct_precond, 0.0);
-         HYPRE_StructSparseMSGSetZeroGuess(struct_precond);
-         HYPRE_StructSparseMSGSetRelaxType(struct_precond, relax);
-         if (usr_jacobi_weight)
+            HYPRE_StructSMGDestroy(struct_precond);
+         }
+         else if (solver_id == 211)
          {
-            HYPRE_StructSparseMSGSetJacobiWeight(struct_precond, jacobi_weight);
+            HYPRE_StructPFMGDestroy(struct_precond);
          }
-         HYPRE_StructSparseMSGSetNumPreRelax(struct_precond, n_pre);
-         HYPRE_StructSparseMSGSetNumPostRelax(struct_precond, n_post);
-         HYPRE_StructSparseMSGSetPrintLevel(struct_precond, 0);
-         HYPRE_StructSparseMSGSetLogging(struct_precond, 0);
-         HYPRE_StructHybridSetPrecond(struct_solver,
-                                      HYPRE_StructSparseMSGSolve,
-                                      HYPRE_StructSparseMSGSetup,
-                                      struct_precond);
-      }
-
-      HYPRE_StructHybridSetup(struct_solver, sA, sb, sx);
-
-      hypre_EndTiming(time_index);
-      hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
-      hypre_FinalizeTiming(time_index);
-      hypre_ClearTiming();
-
-      time_index = hypre_InitializeTiming("Hybrid Solve");
-      hypre_BeginTiming(time_index);
-
-      HYPRE_StructHybridSolve(struct_solver, sA, sb, sx);
-
-      hypre_EndTiming(time_index);
-      hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
-      hypre_FinalizeTiming(time_index);
-      hypre_ClearTiming();
-
-      HYPRE_StructHybridGetNumIterations(struct_solver, &num_iterations);
-      HYPRE_StructHybridGetFinalRelativeResidualNorm(struct_solver, &final_res_norm);
-      HYPRE_StructHybridDestroy(struct_solver);
-
-      if (solver_id == 220)
-      {
-         HYPRE_StructSMGDestroy(struct_precond);
-      }
-      else if (solver_id == 221)
-      {
-         HYPRE_StructPFMGDestroy(struct_precond);
-      }
-      else if (solver_id == 222)
-      {
-         HYPRE_StructSparseMSGDestroy(struct_precond);
-      }
-   }
-
-   /*-----------------------------------------------------------
-    * Solve the system using GMRES
-    *-----------------------------------------------------------*/
-
-   if ((solver_id > 229) && (solver_id < 240))
-   {
-      time_index = hypre_InitializeTiming("GMRES Setup");
-      hypre_BeginTiming(time_index);
-
-      HYPRE_StructGMRESCreate(hypre_MPI_COMM_WORLD, &struct_solver);
-      HYPRE_GMRESSetMaxIter( (HYPRE_Solver)struct_solver, 100 );
-      HYPRE_GMRESSetTol( (HYPRE_Solver)struct_solver, tol );
-      HYPRE_GMRESSetRelChange( (HYPRE_Solver)struct_solver, 0 );
-      HYPRE_GMRESSetPrintLevel( (HYPRE_Solver)struct_solver, 1 );
-      HYPRE_GMRESSetLogging( (HYPRE_Solver)struct_solver, 1 );
-
-      if (solver_id == 230)
-      {
-         /* use symmetric SMG as preconditioner */
-         HYPRE_StructSMGCreate(hypre_MPI_COMM_WORLD, &struct_precond);
-         HYPRE_StructSMGSetMemoryUse(struct_precond, 0);
-         HYPRE_StructSMGSetMaxIter(struct_precond, 1);
-         HYPRE_StructSMGSetTol(struct_precond, 0.0);
-         HYPRE_StructSMGSetZeroGuess(struct_precond);
-         HYPRE_StructSMGSetNumPreRelax(struct_precond, n_pre);
-         HYPRE_StructSMGSetNumPostRelax(struct_precond, n_post);
-         HYPRE_StructSMGSetPrintLevel(struct_precond, 0);
-         HYPRE_StructSMGSetLogging(struct_precond, 0);
-         HYPRE_GMRESSetPrecond( (HYPRE_Solver)struct_solver,
-                                (HYPRE_PtrToSolverFcn) HYPRE_StructSMGSolve,
-                                (HYPRE_PtrToSolverFcn) HYPRE_StructSMGSetup,
-                                (HYPRE_Solver)struct_precond);
-      }
-
-      else if (solver_id == 231)
-      {
-         /* use symmetric PFMG as preconditioner */
-         HYPRE_StructPFMGCreate(hypre_MPI_COMM_WORLD, &struct_precond);
-         HYPRE_StructPFMGSetMaxIter(struct_precond, 1);
-         HYPRE_StructPFMGSetTol(struct_precond, 0.0);
-         HYPRE_StructPFMGSetZeroGuess(struct_precond);
-         HYPRE_StructPFMGSetRAPType(struct_precond, rap);
-         HYPRE_StructPFMGSetRelaxType(struct_precond, relax);
-         if (usr_jacobi_weight)
+         else if (solver_id == 212)
          {
-            HYPRE_StructPFMGSetJacobiWeight(struct_precond, jacobi_weight);
-         }
-         HYPRE_StructPFMGSetNumPreRelax(struct_precond, n_pre);
-         HYPRE_StructPFMGSetNumPostRelax(struct_precond, n_post);
-         HYPRE_StructPFMGSetSkipRelax(struct_precond, skip);
-         /*HYPRE_StructPFMGSetDxyz(struct_precond, dxyz);*/
-         HYPRE_StructPFMGSetPrintLevel(struct_precond, 0);
-         HYPRE_StructPFMGSetLogging(struct_precond, 0);
-         HYPRE_GMRESSetPrecond( (HYPRE_Solver)struct_solver,
-                                (HYPRE_PtrToSolverFcn) HYPRE_StructPFMGSolve,
-                                (HYPRE_PtrToSolverFcn) HYPRE_StructPFMGSetup,
-                                (HYPRE_Solver)struct_precond);
-      }
-      else if (solver_id == 232)
-      {
-         /* use symmetric SparseMSG as preconditioner */
-         HYPRE_StructSparseMSGCreate(hypre_MPI_COMM_WORLD, &struct_precond);
-         HYPRE_StructSparseMSGSetMaxIter(struct_precond, 1);
-         HYPRE_StructSparseMSGSetJump(struct_precond, jump);
-         HYPRE_StructSparseMSGSetTol(struct_precond, 0.0);
-         HYPRE_StructSparseMSGSetZeroGuess(struct_precond);
-         HYPRE_StructSparseMSGSetRelaxType(struct_precond, relax);
-         if (usr_jacobi_weight)
+            HYPRE_StructSparseMSGDestroy(struct_precond);
+         }
+         else if (solver_id == 217)
          {
-            HYPRE_StructSparseMSGSetJacobiWeight(struct_precond, jacobi_weight);
+            HYPRE_StructJacobiDestroy(struct_precond);
          }
-         HYPRE_StructSparseMSGSetNumPreRelax(struct_precond, n_pre);
-         HYPRE_StructSparseMSGSetNumPostRelax(struct_precond, n_post);
-         HYPRE_StructSparseMSGSetPrintLevel(struct_precond, 0);
-         HYPRE_StructSparseMSGSetLogging(struct_precond, 0);
-         HYPRE_GMRESSetPrecond( (HYPRE_Solver)struct_solver,
-                                (HYPRE_PtrToSolverFcn) HYPRE_StructSparseMSGSolve,
-                                (HYPRE_PtrToSolverFcn) HYPRE_StructSparseMSGSetup,
-                                (HYPRE_Solver)struct_precond);
       }
 
-      else if (solver_id == 237)
-      {
-         /* use two-step Jacobi as preconditioner */
-         HYPRE_StructJacobiCreate(hypre_MPI_COMM_WORLD, &struct_precond);
-         HYPRE_StructJacobiSetMaxIter(struct_precond, 2);
-         HYPRE_StructJacobiSetTol(struct_precond, 0.0);
-         HYPRE_StructJacobiSetZeroGuess(struct_precond);
-         HYPRE_GMRESSetPrecond( (HYPRE_Solver)struct_solver,
-                                (HYPRE_PtrToSolverFcn) HYPRE_StructJacobiSolve,
-                                (HYPRE_PtrToSolverFcn) HYPRE_StructJacobiSetup,
-                                (HYPRE_Solver)struct_precond);
-      }
+      /*-----------------------------------------------------------
+       * Solve the system using Hybrid
+       *-----------------------------------------------------------*/
 
-      else if (solver_id == 238)
+      if ((solver_id > 219) && (solver_id < 230))
       {
-         /* use diagonal scaling as preconditioner */
-         struct_precond = NULL;
-         HYPRE_GMRESSetPrecond( (HYPRE_Solver)struct_solver,
-                                (HYPRE_PtrToSolverFcn) HYPRE_StructDiagScale,
-                                (HYPRE_PtrToSolverFcn) HYPRE_StructDiagScaleSetup,
-                                (HYPRE_Solver)struct_precond);
-      }
+         time_index = hypre_InitializeTiming("Hybrid Setup");
+         hypre_BeginTiming(time_index);
 
-      HYPRE_GMRESSetup
-         ( (HYPRE_Solver)struct_solver, (HYPRE_Matrix)sA, (HYPRE_Vector)sb,
-           (HYPRE_Vector)sx );
+         HYPRE_StructHybridCreate(comm, &struct_solver);
+         HYPRE_StructHybridSetDSCGMaxIter(struct_solver, 100);
+         HYPRE_StructHybridSetPCGMaxIter(struct_solver, 100);
+         HYPRE_StructHybridSetTol(struct_solver, tol);
+         /*HYPRE_StructHybridSetPCGAbsoluteTolFactor(struct_solver, 1.0e-200);*/
+         HYPRE_StructHybridSetConvergenceTol(struct_solver, cf_tol);
+         HYPRE_StructHybridSetTwoNorm(struct_solver, 1);
+         HYPRE_StructHybridSetRelChange(struct_solver, 0);
+         if (solver_type == 2) /* for use with GMRES */
+         {
+            HYPRE_StructHybridSetStopCrit(struct_solver, 0);
+            HYPRE_StructHybridSetKDim(struct_solver, 10);
+         }
+         HYPRE_StructHybridSetPrintLevel(struct_solver, solver_print_level);
+         HYPRE_StructHybridSetLogging(struct_solver, 1);
+         HYPRE_StructHybridSetSolverType(struct_solver, solver_type);
+         HYPRE_StructHybridSetRecomputeResidual(struct_solver, recompute_res);
 
-      hypre_EndTiming(time_index);
-      hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
-      hypre_FinalizeTiming(time_index);
-      hypre_ClearTiming();
+         if (solver_id == 220)
+         {
+            /* use symmetric SMG as preconditioner */
+            HYPRE_StructSMGCreate(comm, &struct_precond);
+            HYPRE_StructSMGSetMemoryUse(struct_precond, 0);
+            HYPRE_StructSMGSetMaxIter(struct_precond, 1);
+            HYPRE_StructSMGSetTol(struct_precond, 0.0);
+            HYPRE_StructSMGSetZeroGuess(struct_precond);
+            HYPRE_StructSMGSetNumPreRelax(struct_precond, n_pre);
+            HYPRE_StructSMGSetNumPostRelax(struct_precond, n_post);
+            HYPRE_StructSMGSetPrintLevel(struct_precond, prec_print_level);
+            HYPRE_StructSMGSetLogging(struct_precond, 0);
+            HYPRE_StructHybridSetPrecond(struct_solver,
+                                         HYPRE_StructSMGSolve,
+                                         HYPRE_StructSMGSetup,
+                                         struct_precond);
+         }
 
-      time_index = hypre_InitializeTiming("GMRES Solve");
-      hypre_BeginTiming(time_index);
+         else if (solver_id == 221)
+         {
+            /* use symmetric PFMG as preconditioner */
+            HYPRE_StructPFMGCreate(comm, &struct_precond);
+            HYPRE_StructPFMGSetMaxIter(struct_precond, 1);
+            HYPRE_StructPFMGSetTol(struct_precond, 0.0);
+            HYPRE_StructPFMGSetZeroGuess(struct_precond);
+            HYPRE_StructPFMGSetRAPType(struct_precond, rap);
+            HYPRE_StructPFMGSetRelaxType(struct_precond, relax);
+            if (usr_jacobi_weight)
+            {
+               HYPRE_StructPFMGSetJacobiWeight(struct_precond, jacobi_weight);
+            }
+            HYPRE_StructPFMGSetNumPreRelax(struct_precond, n_pre);
+            HYPRE_StructPFMGSetNumPostRelax(struct_precond, n_post);
+            HYPRE_StructPFMGSetSkipRelax(struct_precond, skip);
+            /*HYPRE_StructPFMGSetDxyz(struct_precond, dxyz);*/
+            HYPRE_StructPFMGSetPrintLevel(struct_precond, prec_print_level);
+            HYPRE_StructPFMGSetLogging(struct_precond, 0);
+            HYPRE_StructHybridSetPrecond(struct_solver,
+                                         HYPRE_StructPFMGSolve,
+                                         HYPRE_StructPFMGSetup,
+                                         struct_precond);
+         }
 
-      HYPRE_GMRESSolve
-         ( (HYPRE_Solver)struct_solver, (HYPRE_Matrix)sA, (HYPRE_Vector)sb,
-           (HYPRE_Vector)sx);
+         else if (solver_id == 222)
+         {
+            /* use symmetric SparseMSG as preconditioner */
+            HYPRE_StructSparseMSGCreate(comm, &struct_precond);
+            HYPRE_StructSparseMSGSetJump(struct_precond, jump);
+            HYPRE_StructSparseMSGSetMaxIter(struct_precond, 1);
+            HYPRE_StructSparseMSGSetTol(struct_precond, 0.0);
+            HYPRE_StructSparseMSGSetZeroGuess(struct_precond);
+            HYPRE_StructSparseMSGSetRelaxType(struct_precond, relax);
+            if (usr_jacobi_weight)
+            {
+               HYPRE_StructSparseMSGSetJacobiWeight(struct_precond, jacobi_weight);
+            }
+            HYPRE_StructSparseMSGSetNumPreRelax(struct_precond, n_pre);
+            HYPRE_StructSparseMSGSetNumPostRelax(struct_precond, n_post);
+            HYPRE_StructSparseMSGSetPrintLevel(struct_precond, prec_print_level);
+            HYPRE_StructSparseMSGSetLogging(struct_precond, 0);
+            HYPRE_StructHybridSetPrecond(struct_solver,
+                                         HYPRE_StructSparseMSGSolve,
+                                         HYPRE_StructSparseMSGSetup,
+                                         struct_precond);
+         }
 
-      hypre_EndTiming(time_index);
-      hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
-      hypre_FinalizeTiming(time_index);
-      hypre_ClearTiming();
+         HYPRE_StructHybridSetup(struct_solver, sA, sb, sx);
 
-      HYPRE_GMRESGetNumIterations( (HYPRE_Solver)struct_solver, &num_iterations);
-      HYPRE_GMRESGetFinalRelativeResidualNorm( (HYPRE_Solver)struct_solver, &final_res_norm);
-      HYPRE_StructGMRESDestroy(struct_solver);
+         hypre_EndTiming(time_index);
+         hypre_PrintTiming("Setup phase times", comm);
+         hypre_FinalizeTiming(time_index);
+         hypre_ClearTiming();
 
-      if (solver_id == 230)
-      {
-         HYPRE_StructSMGDestroy(struct_precond);
-      }
-      else if (solver_id == 231)
-      {
-         HYPRE_StructPFMGDestroy(struct_precond);
-      }
-      else if (solver_id == 232)
-      {
-         HYPRE_StructSparseMSGDestroy(struct_precond);
+         time_index = hypre_InitializeTiming("Hybrid Solve");
+         hypre_BeginTiming(time_index);
+
+         HYPRE_StructHybridSolve(struct_solver, sA, sb, sx);
+
+         hypre_EndTiming(time_index);
+         hypre_PrintTiming("Solve phase times", comm);
+         hypre_FinalizeTiming(time_index);
+         hypre_ClearTiming();
+
+         HYPRE_StructHybridGetNumIterations(struct_solver, &num_iterations);
+         HYPRE_StructHybridGetFinalRelativeResidualNorm(struct_solver, &final_res_norm);
+         HYPRE_StructHybridDestroy(struct_solver);
+
+         if (solver_id == 220)
+         {
+            HYPRE_StructSMGDestroy(struct_precond);
+         }
+         else if (solver_id == 221)
+         {
+            HYPRE_StructPFMGDestroy(struct_precond);
+         }
+         else if (solver_id == 222)
+         {
+            HYPRE_StructSparseMSGDestroy(struct_precond);
+         }
       }
-      else if (solver_id == 237)
+
+      /*-----------------------------------------------------------
+       * Solve the system using GMRES
+       *-----------------------------------------------------------*/
+
+      if ((solver_id > 229) && (solver_id < 240))
       {
-         HYPRE_StructJacobiDestroy(struct_precond);
-      }
-   }
-   /*-----------------------------------------------------------
-    * Solve the system using BiCGTAB
-    *-----------------------------------------------------------*/
+         time_index = hypre_InitializeTiming("GMRES Setup");
+         hypre_BeginTiming(time_index);
 
-   if ((solver_id > 239) && (solver_id < 250))
-   {
-      time_index = hypre_InitializeTiming("BiCGSTAB Setup");
-      hypre_BeginTiming(time_index);
+         HYPRE_StructGMRESCreate(comm, &struct_solver);
+         HYPRE_GMRESSetMaxIter( (HYPRE_Solver)struct_solver, 100 );
+         HYPRE_GMRESSetTol( (HYPRE_Solver)struct_solver, tol );
+         HYPRE_GMRESSetRelChange( (HYPRE_Solver)struct_solver, 0 );
+         HYPRE_GMRESSetPrintLevel( (HYPRE_Solver)struct_solver, solver_print_level );
+         HYPRE_GMRESSetLogging( (HYPRE_Solver)struct_solver, 1 );
 
-      HYPRE_StructBiCGSTABCreate(hypre_MPI_COMM_WORLD, &struct_solver);
-      HYPRE_BiCGSTABSetMaxIter( (HYPRE_Solver)struct_solver, 100 );
-      HYPRE_BiCGSTABSetTol( (HYPRE_Solver)struct_solver, tol );
-      HYPRE_BiCGSTABSetPrintLevel( (HYPRE_Solver)struct_solver, 1 );
-      HYPRE_BiCGSTABSetLogging( (HYPRE_Solver)struct_solver, 1 );
-
-      if (solver_id == 240)
-      {
-         /* use symmetric SMG as preconditioner */
-         HYPRE_StructSMGCreate(hypre_MPI_COMM_WORLD, &struct_precond);
-         HYPRE_StructSMGSetMemoryUse(struct_precond, 0);
-         HYPRE_StructSMGSetMaxIter(struct_precond, 1);
-         HYPRE_StructSMGSetTol(struct_precond, 0.0);
-         HYPRE_StructSMGSetZeroGuess(struct_precond);
-         HYPRE_StructSMGSetNumPreRelax(struct_precond, n_pre);
-         HYPRE_StructSMGSetNumPostRelax(struct_precond, n_post);
-         HYPRE_StructSMGSetPrintLevel(struct_precond, 0);
-         HYPRE_StructSMGSetLogging(struct_precond, 0);
-         HYPRE_BiCGSTABSetPrecond( (HYPRE_Solver)struct_solver,
+         if (solver_id == 230)
+         {
+            /* use symmetric SMG as preconditioner */
+            HYPRE_StructSMGCreate(comm, &struct_precond);
+            HYPRE_StructSMGSetMemoryUse(struct_precond, 0);
+            HYPRE_StructSMGSetMaxIter(struct_precond, 1);
+            HYPRE_StructSMGSetTol(struct_precond, 0.0);
+            HYPRE_StructSMGSetZeroGuess(struct_precond);
+            HYPRE_StructSMGSetNumPreRelax(struct_precond, n_pre);
+            HYPRE_StructSMGSetNumPostRelax(struct_precond, n_post);
+            HYPRE_StructSMGSetPrintLevel(struct_precond, prec_print_level);
+            HYPRE_StructSMGSetLogging(struct_precond, 0);
+            HYPRE_GMRESSetPrecond( (HYPRE_Solver)struct_solver,
                                    (HYPRE_PtrToSolverFcn) HYPRE_StructSMGSolve,
                                    (HYPRE_PtrToSolverFcn) HYPRE_StructSMGSetup,
                                    (HYPRE_Solver)struct_precond);
-      }
+         }
 
-      else if (solver_id == 241)
-      {
-         /* use symmetric PFMG as preconditioner */
-         HYPRE_StructPFMGCreate(hypre_MPI_COMM_WORLD, &struct_precond);
-         HYPRE_StructPFMGSetMaxIter(struct_precond, 1);
-         HYPRE_StructPFMGSetTol(struct_precond, 0.0);
-         HYPRE_StructPFMGSetZeroGuess(struct_precond);
-         HYPRE_StructPFMGSetRAPType(struct_precond, rap);
-         HYPRE_StructPFMGSetRelaxType(struct_precond, relax);
-         if (usr_jacobi_weight)
+         else if (solver_id == 231)
          {
-            HYPRE_StructPFMGSetJacobiWeight(struct_precond, jacobi_weight);
-         }
-         HYPRE_StructPFMGSetNumPreRelax(struct_precond, n_pre);
-         HYPRE_StructPFMGSetNumPostRelax(struct_precond, n_post);
-         HYPRE_StructPFMGSetSkipRelax(struct_precond, skip);
-         /*HYPRE_StructPFMGSetDxyz(struct_precond, dxyz);*/
-         HYPRE_StructPFMGSetPrintLevel(struct_precond, 0);
-         HYPRE_StructPFMGSetLogging(struct_precond, 0);
-         HYPRE_BiCGSTABSetPrecond( (HYPRE_Solver)struct_solver,
+            /* use symmetric PFMG as preconditioner */
+            HYPRE_StructPFMGCreate(comm, &struct_precond);
+            HYPRE_StructPFMGSetMaxIter(struct_precond, 1);
+            HYPRE_StructPFMGSetTol(struct_precond, 0.0);
+            HYPRE_StructPFMGSetZeroGuess(struct_precond);
+            HYPRE_StructPFMGSetRAPType(struct_precond, rap);
+            HYPRE_StructPFMGSetRelaxType(struct_precond, relax);
+            if (usr_jacobi_weight)
+            {
+               HYPRE_StructPFMGSetJacobiWeight(struct_precond, jacobi_weight);
+            }
+            HYPRE_StructPFMGSetNumPreRelax(struct_precond, n_pre);
+            HYPRE_StructPFMGSetNumPostRelax(struct_precond, n_post);
+            HYPRE_StructPFMGSetSkipRelax(struct_precond, skip);
+            /*HYPRE_StructPFMGSetDxyz(struct_precond, dxyz);*/
+            HYPRE_StructPFMGSetPrintLevel(struct_precond, prec_print_level);
+            HYPRE_StructPFMGSetLogging(struct_precond, 0);
+            HYPRE_GMRESSetPrecond( (HYPRE_Solver)struct_solver,
                                    (HYPRE_PtrToSolverFcn) HYPRE_StructPFMGSolve,
                                    (HYPRE_PtrToSolverFcn) HYPRE_StructPFMGSetup,
                                    (HYPRE_Solver)struct_precond);
-      }
-
-      else if (solver_id == 242)
-      {
-         /* use symmetric SparseMSG as preconditioner */
-         HYPRE_StructSparseMSGCreate(hypre_MPI_COMM_WORLD, &struct_precond);
-         HYPRE_StructSparseMSGSetMaxIter(struct_precond, 1);
-         HYPRE_StructSparseMSGSetJump(struct_precond, jump);
-         HYPRE_StructSparseMSGSetTol(struct_precond, 0.0);
-         HYPRE_StructSparseMSGSetZeroGuess(struct_precond);
-         HYPRE_StructSparseMSGSetRelaxType(struct_precond, relax);
-         if (usr_jacobi_weight)
-         {
-            HYPRE_StructSparseMSGSetJacobiWeight(struct_precond, jacobi_weight);
          }
-         HYPRE_StructSparseMSGSetNumPreRelax(struct_precond, n_pre);
-         HYPRE_StructSparseMSGSetNumPostRelax(struct_precond, n_post);
-         HYPRE_StructSparseMSGSetPrintLevel(struct_precond, 0);
-         HYPRE_StructSparseMSGSetLogging(struct_precond, 0);
-         HYPRE_BiCGSTABSetPrecond( (HYPRE_Solver)struct_solver,
+         else if (solver_id == 232)
+         {
+            /* use symmetric SparseMSG as preconditioner */
+            HYPRE_StructSparseMSGCreate(comm, &struct_precond);
+            HYPRE_StructSparseMSGSetMaxIter(struct_precond, 1);
+            HYPRE_StructSparseMSGSetJump(struct_precond, jump);
+            HYPRE_StructSparseMSGSetTol(struct_precond, 0.0);
+            HYPRE_StructSparseMSGSetZeroGuess(struct_precond);
+            HYPRE_StructSparseMSGSetRelaxType(struct_precond, relax);
+            if (usr_jacobi_weight)
+            {
+               HYPRE_StructSparseMSGSetJacobiWeight(struct_precond, jacobi_weight);
+            }
+            HYPRE_StructSparseMSGSetNumPreRelax(struct_precond, n_pre);
+            HYPRE_StructSparseMSGSetNumPostRelax(struct_precond, n_post);
+            HYPRE_StructSparseMSGSetPrintLevel(struct_precond, prec_print_level);
+            HYPRE_StructSparseMSGSetLogging(struct_precond, 0);
+            HYPRE_GMRESSetPrecond( (HYPRE_Solver)struct_solver,
                                    (HYPRE_PtrToSolverFcn) HYPRE_StructSparseMSGSolve,
                                    (HYPRE_PtrToSolverFcn) HYPRE_StructSparseMSGSetup,
                                    (HYPRE_Solver)struct_precond);
-      }
+         }
 
-      else if (solver_id == 247)
-      {
-         /* use two-step Jacobi as preconditioner */
-         HYPRE_StructJacobiCreate(hypre_MPI_COMM_WORLD, &struct_precond);
-         HYPRE_StructJacobiSetMaxIter(struct_precond, 2);
-         HYPRE_StructJacobiSetTol(struct_precond, 0.0);
-         HYPRE_StructJacobiSetZeroGuess(struct_precond);
-         HYPRE_BiCGSTABSetPrecond( (HYPRE_Solver)struct_solver,
+         else if (solver_id == 237)
+         {
+            /* use two-step Jacobi as preconditioner */
+            HYPRE_StructJacobiCreate(comm, &struct_precond);
+            HYPRE_StructJacobiSetMaxIter(struct_precond, 2);
+            HYPRE_StructJacobiSetTol(struct_precond, 0.0);
+            HYPRE_StructJacobiSetZeroGuess(struct_precond);
+            HYPRE_GMRESSetPrecond( (HYPRE_Solver)struct_solver,
                                    (HYPRE_PtrToSolverFcn) HYPRE_StructJacobiSolve,
                                    (HYPRE_PtrToSolverFcn) HYPRE_StructJacobiSetup,
                                    (HYPRE_Solver)struct_precond);
-      }
+         }
 
-      else if (solver_id == 248)
-      {
-         /* use diagonal scaling as preconditioner */
-         struct_precond = NULL;
-         HYPRE_BiCGSTABSetPrecond( (HYPRE_Solver)struct_solver,
+         else if (solver_id == 238)
+         {
+            /* use diagonal scaling as preconditioner */
+            struct_precond = NULL;
+            HYPRE_GMRESSetPrecond( (HYPRE_Solver)struct_solver,
                                    (HYPRE_PtrToSolverFcn) HYPRE_StructDiagScale,
                                    (HYPRE_PtrToSolverFcn) HYPRE_StructDiagScaleSetup,
                                    (HYPRE_Solver)struct_precond);
-      }
+         }
 
-      HYPRE_BiCGSTABSetup
+         HYPRE_GMRESSetup
          ( (HYPRE_Solver)struct_solver, (HYPRE_Matrix)sA, (HYPRE_Vector)sb,
            (HYPRE_Vector)sx );
 
-      hypre_EndTiming(time_index);
-      hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
-      hypre_FinalizeTiming(time_index);
-      hypre_ClearTiming();
+         hypre_EndTiming(time_index);
+         hypre_PrintTiming("Setup phase times", comm);
+         hypre_FinalizeTiming(time_index);
+         hypre_ClearTiming();
 
-      time_index = hypre_InitializeTiming("BiCGSTAB Solve");
-      hypre_BeginTiming(time_index);
+         time_index = hypre_InitializeTiming("GMRES Solve");
+         hypre_BeginTiming(time_index);
 
-      HYPRE_BiCGSTABSolve
+         HYPRE_GMRESSolve
          ( (HYPRE_Solver)struct_solver, (HYPRE_Matrix)sA, (HYPRE_Vector)sb,
            (HYPRE_Vector)sx);
 
-      hypre_EndTiming(time_index);
-      hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
-      hypre_FinalizeTiming(time_index);
-      hypre_ClearTiming();
+         hypre_EndTiming(time_index);
+         hypre_PrintTiming("Solve phase times", comm);
+         hypre_FinalizeTiming(time_index);
+         hypre_ClearTiming();
 
-      HYPRE_BiCGSTABGetNumIterations( (HYPRE_Solver)struct_solver, &num_iterations);
-      HYPRE_BiCGSTABGetFinalRelativeResidualNorm( (HYPRE_Solver)struct_solver, &final_res_norm);
-      HYPRE_StructBiCGSTABDestroy(struct_solver);
+         HYPRE_GMRESGetNumIterations( (HYPRE_Solver)struct_solver, &num_iterations);
+         HYPRE_GMRESGetFinalRelativeResidualNorm( (HYPRE_Solver)struct_solver, &final_res_norm);
+         HYPRE_StructGMRESDestroy(struct_solver);
 
-      if (solver_id == 240)
-      {
-         HYPRE_StructSMGDestroy(struct_precond);
-      }
-      else if (solver_id == 241)
-      {
-         HYPRE_StructPFMGDestroy(struct_precond);
-      }
-      else if (solver_id == 242)
-      {
-         HYPRE_StructSparseMSGDestroy(struct_precond);
+         if (solver_id == 230)
+         {
+            HYPRE_StructSMGDestroy(struct_precond);
+         }
+         else if (solver_id == 231)
+         {
+            HYPRE_StructPFMGDestroy(struct_precond);
+         }
+         else if (solver_id == 232)
+         {
+            HYPRE_StructSparseMSGDestroy(struct_precond);
+         }
+         else if (solver_id == 237)
+         {
+            HYPRE_StructJacobiDestroy(struct_precond);
+         }
       }
-      else if (solver_id == 247)
+      /*-----------------------------------------------------------
+       * Solve the system using BiCGTAB
+       *-----------------------------------------------------------*/
+
+      if ((solver_id > 239) && (solver_id < 250))
       {
-         HYPRE_StructJacobiDestroy(struct_precond);
-      }
-   }
+         time_index = hypre_InitializeTiming("BiCGSTAB Setup");
+         hypre_BeginTiming(time_index);
 
-   /*-----------------------------------------------------------
-    * Gather the solution vector
-    *-----------------------------------------------------------*/
+         HYPRE_StructBiCGSTABCreate(comm, &struct_solver);
+         HYPRE_BiCGSTABSetMaxIter( (HYPRE_Solver)struct_solver, 100 );
+         HYPRE_BiCGSTABSetTol( (HYPRE_Solver)struct_solver, tol );
+         HYPRE_BiCGSTABSetPrintLevel( (HYPRE_Solver)struct_solver, solver_print_level );
+         HYPRE_BiCGSTABSetLogging( (HYPRE_Solver)struct_solver, 1 );
 
-   HYPRE_SStructVectorGather(x);
+         if (solver_id == 240)
+         {
+            /* use symmetric SMG as preconditioner */
+            HYPRE_StructSMGCreate(comm, &struct_precond);
+            HYPRE_StructSMGSetMemoryUse(struct_precond, 0);
+            HYPRE_StructSMGSetMaxIter(struct_precond, 1);
+            HYPRE_StructSMGSetTol(struct_precond, 0.0);
+            HYPRE_StructSMGSetZeroGuess(struct_precond);
+            HYPRE_StructSMGSetNumPreRelax(struct_precond, n_pre);
+            HYPRE_StructSMGSetNumPostRelax(struct_precond, n_post);
+            HYPRE_StructSMGSetPrintLevel(struct_precond, prec_print_level);
+            HYPRE_StructSMGSetLogging(struct_precond, 0);
+            HYPRE_BiCGSTABSetPrecond( (HYPRE_Solver)struct_solver,
+                                      (HYPRE_PtrToSolverFcn) HYPRE_StructSMGSolve,
+                                      (HYPRE_PtrToSolverFcn) HYPRE_StructSMGSetup,
+                                      (HYPRE_Solver)struct_precond);
+         }
 
-   /*-----------------------------------------------------------
-    * Print the solution and other info
-    *-----------------------------------------------------------*/
+         else if (solver_id == 241)
+         {
+            /* use symmetric PFMG as preconditioner */
+            HYPRE_StructPFMGCreate(comm, &struct_precond);
+            HYPRE_StructPFMGSetMaxIter(struct_precond, 1);
+            HYPRE_StructPFMGSetTol(struct_precond, 0.0);
+            HYPRE_StructPFMGSetZeroGuess(struct_precond);
+            HYPRE_StructPFMGSetRAPType(struct_precond, rap);
+            HYPRE_StructPFMGSetRelaxType(struct_precond, relax);
+            if (usr_jacobi_weight)
+            {
+               HYPRE_StructPFMGSetJacobiWeight(struct_precond, jacobi_weight);
+            }
+            HYPRE_StructPFMGSetNumPreRelax(struct_precond, n_pre);
+            HYPRE_StructPFMGSetNumPostRelax(struct_precond, n_post);
+            HYPRE_StructPFMGSetSkipRelax(struct_precond, skip);
+            /*HYPRE_StructPFMGSetDxyz(struct_precond, dxyz);*/
+            HYPRE_StructPFMGSetPrintLevel(struct_precond, prec_print_level);
+            HYPRE_StructPFMGSetLogging(struct_precond, 0);
+            HYPRE_BiCGSTABSetPrecond( (HYPRE_Solver)struct_solver,
+                                      (HYPRE_PtrToSolverFcn) HYPRE_StructPFMGSolve,
+                                      (HYPRE_PtrToSolverFcn) HYPRE_StructPFMGSetup,
+                                      (HYPRE_Solver)struct_precond);
+         }
 
-   if (print_system)
-   {
-      FILE *file;
-      char  filename[255];
+         else if (solver_id == 242)
+         {
+            /* use symmetric SparseMSG as preconditioner */
+            HYPRE_StructSparseMSGCreate(comm, &struct_precond);
+            HYPRE_StructSparseMSGSetMaxIter(struct_precond, 1);
+            HYPRE_StructSparseMSGSetJump(struct_precond, jump);
+            HYPRE_StructSparseMSGSetTol(struct_precond, 0.0);
+            HYPRE_StructSparseMSGSetZeroGuess(struct_precond);
+            HYPRE_StructSparseMSGSetRelaxType(struct_precond, relax);
+            if (usr_jacobi_weight)
+            {
+               HYPRE_StructSparseMSGSetJacobiWeight(struct_precond, jacobi_weight);
+            }
+            HYPRE_StructSparseMSGSetNumPreRelax(struct_precond, n_pre);
+            HYPRE_StructSparseMSGSetNumPostRelax(struct_precond, n_post);
+            HYPRE_StructSparseMSGSetPrintLevel(struct_precond, prec_print_level);
+            HYPRE_StructSparseMSGSetLogging(struct_precond, 0);
+            HYPRE_BiCGSTABSetPrecond( (HYPRE_Solver)struct_solver,
+                                      (HYPRE_PtrToSolverFcn) HYPRE_StructSparseMSGSolve,
+                                      (HYPRE_PtrToSolverFcn) HYPRE_StructSparseMSGSetup,
+                                      (HYPRE_Solver)struct_precond);
+         }
+
+         else if (solver_id == 247)
+         {
+            /* use two-step Jacobi as preconditioner */
+            HYPRE_StructJacobiCreate(comm, &struct_precond);
+            HYPRE_StructJacobiSetMaxIter(struct_precond, 2);
+            HYPRE_StructJacobiSetTol(struct_precond, 0.0);
+            HYPRE_StructJacobiSetZeroGuess(struct_precond);
+            HYPRE_BiCGSTABSetPrecond( (HYPRE_Solver)struct_solver,
+                                      (HYPRE_PtrToSolverFcn) HYPRE_StructJacobiSolve,
+                                      (HYPRE_PtrToSolverFcn) HYPRE_StructJacobiSetup,
+                                      (HYPRE_Solver)struct_precond);
+         }
+
+         else if (solver_id == 248)
+         {
+            /* use diagonal scaling as preconditioner */
+            struct_precond = NULL;
+            HYPRE_BiCGSTABSetPrecond( (HYPRE_Solver)struct_solver,
+                                      (HYPRE_PtrToSolverFcn) HYPRE_StructDiagScale,
+                                      (HYPRE_PtrToSolverFcn) HYPRE_StructDiagScaleSetup,
+                                      (HYPRE_Solver)struct_precond);
+         }
+
+         HYPRE_BiCGSTABSetup
+         ( (HYPRE_Solver)struct_solver, (HYPRE_Matrix)sA, (HYPRE_Vector)sb,
+           (HYPRE_Vector)sx );
+
+         hypre_EndTiming(time_index);
+         hypre_PrintTiming("Setup phase times", comm);
+         hypre_FinalizeTiming(time_index);
+         hypre_ClearTiming();
+
+         time_index = hypre_InitializeTiming("BiCGSTAB Solve");
+         hypre_BeginTiming(time_index);
+
+         HYPRE_BiCGSTABSolve
+         ( (HYPRE_Solver)struct_solver, (HYPRE_Matrix)sA, (HYPRE_Vector)sb,
+           (HYPRE_Vector)sx);
+
+         hypre_EndTiming(time_index);
+         hypre_PrintTiming("Solve phase times", comm);
+         hypre_FinalizeTiming(time_index);
+         hypre_ClearTiming();
+
+         HYPRE_BiCGSTABGetNumIterations( (HYPRE_Solver)struct_solver, &num_iterations);
+         HYPRE_BiCGSTABGetFinalRelativeResidualNorm( (HYPRE_Solver)struct_solver, &final_res_norm);
+         HYPRE_StructBiCGSTABDestroy(struct_solver);
+
+         if (solver_id == 240)
+         {
+            HYPRE_StructSMGDestroy(struct_precond);
+         }
+         else if (solver_id == 241)
+         {
+            HYPRE_StructPFMGDestroy(struct_precond);
+         }
+         else if (solver_id == 242)
+         {
+            HYPRE_StructSparseMSGDestroy(struct_precond);
+         }
+         else if (solver_id == 247)
+         {
+            HYPRE_StructJacobiDestroy(struct_precond);
+         }
+      }
+
+      /*-----------------------------------------------------------
+       * Gather the solution vector
+       *-----------------------------------------------------------*/
+
+      HYPRE_SStructVectorGather(x);
 
-      HYPRE_SStructVectorPrint("sstruct.out.x", x, 0);
+      /*-----------------------------------------------------------
+       * Print the solution and other info
+       *-----------------------------------------------------------*/
 
-      /* print out with shared data replicated */
-      values = hypre_TAlloc(HYPRE_Real,  data.max_boxsize, HYPRE_MEMORY_HOST);
-      for (part = 0; part < data.nparts; part++)
+      if (print_system)
       {
-         pdata = data.pdata[part];
-         for (var = 0; var < pdata.nvars; var++)
+         FILE *file;
+         char  filename[255];
+
+         HYPRE_SStructVectorPrint("sstruct.out.x", x, 0);
+
+         /* print out with shared data replicated */
+         if (!read_fromfile_flag)
          {
-            hypre_sprintf(filename, "sstruct.out.xx.%02d.%02d.%05d", part, var, myid);
-            if ((file = fopen(filename, "w")) == NULL)
-            {
-               hypre_printf("Error: can't open output file %s\n", filename);
-               exit(1);
-            }
-            for (box = 0; box < pdata.nboxes; box++)
+            values   = hypre_TAlloc(HYPRE_Real, data.max_boxsize, HYPRE_MEMORY_HOST);
+            d_values = hypre_TAlloc(HYPRE_Real, data.max_boxsize, memory_location);
+            for (part = 0; part < data.nparts; part++)
             {
-               GetVariableBox(pdata.ilowers[box], pdata.iuppers[box],
-                              pdata.vartypes[var], ilower, iupper);
-               HYPRE_SStructVectorGetBoxValues(x, part, ilower, iupper,
-                                               var, values);
-               hypre_fprintf(file, "\nBox %d:\n\n", box);
-               size = 1;
-               for (j = 0; j < data.ndim; j++)
-               {
-                  size*= (iupper[j] - ilower[j] + 1);
-               }
-               for (j = 0; j < size; j++)
+               pdata = data.pdata[part];
+               for (var = 0; var < pdata.nvars; var++)
                {
-                  hypre_fprintf(file, "%.14e\n", values[j]);
+                  hypre_sprintf(filename, "sstruct.out.xx.%02d.%02d.%05d", part, var, myid);
+                  if ((file = fopen(filename, "w")) == NULL)
+                  {
+                     hypre_printf("Error: can't open output file %s\n", filename);
+                     exit(1);
+                  }
+                  for (box = 0; box < pdata.nboxes; box++)
+                  {
+                     GetVariableBox(pdata.ilowers[box], pdata.iuppers[box],
+                                    pdata.vartypes[var], ilower, iupper);
+                     HYPRE_SStructVectorGetBoxValues(x, part, ilower, iupper,
+                                                     var, d_values);
+                     hypre_TMemcpy(values, d_values, HYPRE_Real, data.max_boxsize,
+                                   HYPRE_MEMORY_HOST, memory_location);
+                     hypre_fprintf(file, "\nBox %d:\n\n", box);
+                     size = 1;
+                     for (j = 0; j < data.ndim; j++)
+                     {
+                        size *= (iupper[j] - ilower[j] + 1);
+                     }
+                     for (j = 0; j < size; j++)
+                     {
+                        hypre_fprintf(file, "%.14e\n", values[j]);
+                     }
+                  }
+                  fflush(file);
+                  fclose(file);
                }
             }
-            fflush(file);
-            fclose(file);
+            hypre_TFree(values, HYPRE_MEMORY_HOST);
+            hypre_TFree(d_values, memory_location);
          }
       }
-      hypre_TFree(values, HYPRE_MEMORY_HOST);
-   }
 
-   if (myid == 0 /* begin lobpcg */ && !lobpcgFlag /* end lobpcg */)
-   {
-      hypre_printf("\n");
-      hypre_printf("Iterations = %d\n", num_iterations);
-      hypre_printf("Final Relative Residual Norm = %e\n", final_res_norm);
-      hypre_printf("\n");
-   }
+      if (myid == 0 && rep == repeats - 1 /* begin lobpcg */ && !lobpcgFlag /* end lobpcg */)
+      {
+         hypre_printf("\n");
+         hypre_printf("Iterations = %d\n", num_iterations);
+         hypre_printf("Final Relative Residual Norm = %e\n", final_res_norm);
+         hypre_printf("\n");
+      }
 
-   /*-----------------------------------------------------------
-    * Verify GetBoxValues()
-    *-----------------------------------------------------------*/
+      /*-----------------------------------------------------------
+       * Verify GetBoxValues()
+       *-----------------------------------------------------------*/
 
 #if 0
-   {
-      HYPRE_SStructVector   xnew;
-      HYPRE_ParVector       par_xnew;
-      HYPRE_StructVector    sxnew;
-      HYPRE_Real            rnorm, bnorm;
+      {
+         HYPRE_SStructVector   xnew;
+         HYPRE_ParVector       par_xnew;
+         HYPRE_StructVector    sxnew;
+         HYPRE_Real            rnorm, bnorm;
 
-      HYPRE_SStructVectorCreate(hypre_MPI_COMM_WORLD, grid, &xnew);
-      HYPRE_SStructVectorSetObjectType(xnew, object_type);
-      HYPRE_SStructVectorInitialize(xnew);
+         HYPRE_SStructVectorCreate(comm, grid, &xnew);
+         HYPRE_SStructVectorSetObjectType(xnew, object_type);
+         HYPRE_SStructVectorInitialize(xnew);
 
-      /* get/set replicated shared data */
-      values = hypre_TAlloc(HYPRE_Real,  data.max_boxsize, HYPRE_MEMORY_HOST);
-      for (part = 0; part < data.nparts; part++)
-      {
-         pdata = data.pdata[part];
-         for (var = 0; var < pdata.nvars; var++)
+         /* get/set replicated shared data */
+         values = hypre_TAlloc(HYPRE_Real,  data.max_boxsize, HYPRE_MEMORY_HOST);
+         for (part = 0; part < data.nparts; part++)
          {
-            for (box = 0; box < pdata.nboxes; box++)
+            pdata = data.pdata[part];
+            for (var = 0; var < pdata.nvars; var++)
             {
-               GetVariableBox(pdata.ilowers[box], pdata.iuppers[box],
-                              pdata.vartypes[var], ilower, iupper);
-               HYPRE_SStructVectorGetBoxValues(x, part, ilower, iupper,
-                                               var, values);
-               HYPRE_SStructVectorSetBoxValues(xnew, part, ilower, iupper,
-                                               var, values);
+               for (box = 0; box < pdata.nboxes; box++)
+               {
+                  GetVariableBox(pdata.ilowers[box], pdata.iuppers[box],
+                                 pdata.vartypes[var], ilower, iupper);
+                  HYPRE_SStructVectorGetBoxValues(x, part, ilower, iupper,
+                                                  var, values);
+                  HYPRE_SStructVectorSetBoxValues(xnew, part, ilower, iupper,
+                                                  var, values);
+               }
             }
          }
-      }
-      hypre_TFree(values, HYPRE_MEMORY_HOST);
+         hypre_TFree(values, HYPRE_MEMORY_HOST);
 
-      HYPRE_SStructVectorAssemble(xnew);
+         HYPRE_SStructVectorAssemble(xnew);
 
-      /* Compute residual norm - this if/else is due to a bug in SStructMatvec */
-      if (object_type == HYPRE_SSTRUCT)
-      {
-         HYPRE_SStructInnerProd(b, b, &bnorm);
-         hypre_SStructMatvec(-1.0, A, xnew, 1.0, b);
-         HYPRE_SStructInnerProd(b, b, &rnorm);
-      }
-      else if (object_type == HYPRE_PARCSR)
-      {
-         bnorm = hypre_ParVectorInnerProd(par_b, par_b);
-         HYPRE_SStructVectorGetObject(xnew, (void **) &par_xnew);
-         HYPRE_ParCSRMatrixMatvec(-1.0, par_A, par_xnew, 1.0, par_b );
-         rnorm = hypre_ParVectorInnerProd(par_b, par_b);
-      }
-      else if (object_type == HYPRE_STRUCT)
-      {
-         bnorm = hypre_StructInnerProd(sb, sb);
-         HYPRE_SStructVectorGetObject(xnew, (void **) &sxnew);
-         hypre_StructMatvec(-1.0, sA, sxnew, 1.0, sb);
-         rnorm = hypre_StructInnerProd(sb, sb);
-      }
-      bnorm = sqrt(bnorm);
-      rnorm = sqrt(rnorm);
+         /* Compute residual norm - this if/else is due to a bug in SStructMatvec */
+         if (object_type == HYPRE_SSTRUCT)
+         {
+            HYPRE_SStructInnerProd(b, b, &bnorm);
+            hypre_SStructMatvec(-1.0, A, xnew, 1.0, b);
+            HYPRE_SStructInnerProd(b, b, &rnorm);
+         }
+         else if (object_type == HYPRE_PARCSR)
+         {
+            bnorm = hypre_ParVectorInnerProd(par_b, par_b);
+            HYPRE_SStructVectorGetObject(xnew, (void **) &par_xnew);
+            HYPRE_ParCSRMatrixMatvec(-1.0, par_A, par_xnew, 1.0, par_b );
+            rnorm = hypre_ParVectorInnerProd(par_b, par_b);
+         }
+         else if (object_type == HYPRE_STRUCT)
+         {
+            bnorm = hypre_StructInnerProd(sb, sb);
+            HYPRE_SStructVectorGetObject(xnew, (void **) &sxnew);
+            hypre_StructMatvec(-1.0, sA, sxnew, 1.0, sb);
+            rnorm = hypre_StructInnerProd(sb, sb);
+         }
+         bnorm = hypre_sqrt(bnorm);
+         rnorm = hypre_sqrt(rnorm);
 
-      if (myid == 0)
-      {
-         hypre_printf("\n");
-         hypre_printf("solver relnorm = %16.14e\n", final_res_norm);
-         hypre_printf("check  relnorm = %16.14e, bnorm = %16.14e, rnorm = %16.14e\n",
-                      (rnorm/bnorm), bnorm, rnorm);
-         hypre_printf("\n");
-      }
+         if (myid == 0)
+         {
+            hypre_printf("\n");
+            hypre_printf("solver relnorm = %16.14e\n", final_res_norm);
+            hypre_printf("check  relnorm = %16.14e, bnorm = %16.14e, rnorm = %16.14e\n",
+                         (rnorm / bnorm), bnorm, rnorm);
+            hypre_printf("\n");
+         }
 
-      HYPRE_SStructVectorDestroy(xnew);
-   }
+         HYPRE_SStructVectorDestroy(xnew);
+      }
 #endif
 
-   /*-----------------------------------------------------------
-    * Finalize things
-    *-----------------------------------------------------------*/
+      /*-----------------------------------------------------------
+       * Finalize things
+       *-----------------------------------------------------------*/
 
-   HYPRE_SStructGridDestroy(grid);
-   for (s = 0; s < data.nstencils; s++)
-   {
-      HYPRE_SStructStencilDestroy(stencils[s]);
-   }
-   hypre_TFree(stencils, HYPRE_MEMORY_HOST);
-   HYPRE_SStructGraphDestroy(graph);
-   HYPRE_SStructMatrixDestroy(A);
-   HYPRE_SStructVectorDestroy(b);
-   HYPRE_SStructVectorDestroy(x);
-   if (gradient_matrix)
-   {
-      for (s = 0; s < data.ndim; s++)
+      HYPRE_SStructMatrixDestroy(A);
+      HYPRE_SStructVectorDestroy(b);
+      HYPRE_SStructVectorDestroy(x);
+      if (gradient_matrix)
       {
-         HYPRE_SStructStencilDestroy(G_stencils[s]);
+         for (s = 0; s < data.ndim; s++)
+         {
+            HYPRE_SStructStencilDestroy(G_stencils[s]);
+         }
+         hypre_TFree(G_stencils, HYPRE_MEMORY_HOST);
+         HYPRE_SStructGraphDestroy(G_graph);
+         HYPRE_SStructGridDestroy(G_grid);
+         HYPRE_SStructMatrixDestroy(G);
       }
-      hypre_TFree(G_stencils, HYPRE_MEMORY_HOST);
-      HYPRE_SStructGraphDestroy(G_graph);
-      HYPRE_SStructGridDestroy(G_grid);
-      HYPRE_SStructMatrixDestroy(G);
-   }
 
-   DestroyData(data);
+      if (!read_fromfile_flag)
+      {
+         HYPRE_SStructGridDestroy(grid);
+         HYPRE_SStructGraphDestroy(graph);
+
+         for (s = 0; s < data.nstencils; s++)
+         {
+            HYPRE_SStructStencilDestroy(stencils[s]);
+         }
+         hypre_TFree(stencils, HYPRE_MEMORY_HOST);
 
-   hypre_TFree(parts, HYPRE_MEMORY_HOST);
-   hypre_TFree(refine, HYPRE_MEMORY_HOST);
-   hypre_TFree(distribute, HYPRE_MEMORY_HOST);
-   hypre_TFree(block, HYPRE_MEMORY_HOST);
-   /*hypre_FinalizeMemoryDebug(); */
+         DestroyData(data);
+         if (rep == repeats - 1)
+         {
+            hypre_TFree(parts, HYPRE_MEMORY_HOST);
+            hypre_TFree(refine, HYPRE_MEMORY_HOST);
+            hypre_TFree(distribute, HYPRE_MEMORY_HOST);
+            hypre_TFree(block, HYPRE_MEMORY_HOST);
+         }
+         if (rep < repeats - 1)
+         {
+            ReadData(infile, &global_data);
+         }
+      }
+      /*hypre_FinalizeMemoryDebug(); */
+   }
 
    /* Finalize Hypre */
    HYPRE_Finalize();
@@ -5989,5 +6321,16 @@ main( hypre_int argc,
    /* Finalize MPI */
    hypre_MPI_Finalize();
 
+#if defined(HYPRE_USING_MEMORY_TRACKER)
+   if (memory_location == HYPRE_MEMORY_HOST)
+   {
+      if (hypre_total_bytes[hypre_MEMORY_DEVICE] || hypre_total_bytes[hypre_MEMORY_UNIFIED])
+      {
+         hypre_printf("Error: nonzero GPU memory allocated with the HOST mode\n");
+         hypre_assert(0);
+      }
+   }
+#endif
+
    return (0);
 }
diff --git a/external/hypre/src/test/sstruct.in.README b/external/hypre/src/test/sstruct.in.README
index 56f974f4..6bd90688 100644
--- a/external/hypre/src/test/sstruct.in.README
+++ b/external/hypre/src/test/sstruct.in.README
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/test/sstruct_fac.c b/external/hypre/src/test/sstruct_fac.c
index 6af83a44..6eb0ca28 100644
--- a/external/hypre/src/test/sstruct_fac.c
+++ b/external/hypre/src/test/sstruct_fac.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -134,34 +134,34 @@ GetVariableBox( Index  cell_ilower,
    var_iupper[1] = cell_iupper[1];
    var_iupper[2] = cell_iupper[2];
 
-   switch(vartype)
+   switch (vartype)
    {
       case HYPRE_SSTRUCT_VARIABLE_CELL:
-      var_ilower[0] -= 0; var_ilower[1] -= 0; var_ilower[2] -= 0;
-      break;
+         var_ilower[0] -= 0; var_ilower[1] -= 0; var_ilower[2] -= 0;
+         break;
       case HYPRE_SSTRUCT_VARIABLE_NODE:
-      var_ilower[0] -= 1; var_ilower[1] -= 1; var_ilower[2] -= 1;
-      break;
+         var_ilower[0] -= 1; var_ilower[1] -= 1; var_ilower[2] -= 1;
+         break;
       case HYPRE_SSTRUCT_VARIABLE_XFACE:
-      var_ilower[0] -= 1; var_ilower[1] -= 0; var_ilower[2] -= 0;
-      break;
+         var_ilower[0] -= 1; var_ilower[1] -= 0; var_ilower[2] -= 0;
+         break;
       case HYPRE_SSTRUCT_VARIABLE_YFACE:
-      var_ilower[0] -= 0; var_ilower[1] -= 1; var_ilower[2] -= 0;
-      break;
+         var_ilower[0] -= 0; var_ilower[1] -= 1; var_ilower[2] -= 0;
+         break;
       case HYPRE_SSTRUCT_VARIABLE_ZFACE:
-      var_ilower[0] -= 0; var_ilower[1] -= 0; var_ilower[2] -= 1;
-      break;
+         var_ilower[0] -= 0; var_ilower[1] -= 0; var_ilower[2] -= 1;
+         break;
       case HYPRE_SSTRUCT_VARIABLE_XEDGE:
-      var_ilower[0] -= 0; var_ilower[1] -= 1; var_ilower[2] -= 1;
-      break;
+         var_ilower[0] -= 0; var_ilower[1] -= 1; var_ilower[2] -= 1;
+         break;
       case HYPRE_SSTRUCT_VARIABLE_YEDGE:
-      var_ilower[0] -= 1; var_ilower[1] -= 0; var_ilower[2] -= 1;
-      break;
+         var_ilower[0] -= 1; var_ilower[1] -= 0; var_ilower[2] -= 1;
+         break;
       case HYPRE_SSTRUCT_VARIABLE_ZEDGE:
-      var_ilower[0] -= 1; var_ilower[1] -= 1; var_ilower[2] -= 0;
-      break;
+         var_ilower[0] -= 1; var_ilower[1] -= 1; var_ilower[2] -= 0;
+         break;
       case HYPRE_SSTRUCT_VARIABLE_UNDEFINED:
-      break;
+         break;
    }
 
    return ierr;
@@ -209,19 +209,19 @@ SScanProblemIndex( char          *sdata_ptr,
    switch (ndim)
    {
       case 1:
-      hypre_sscanf(sdata_ptr, "%d%c",
-             &index[0], &sign[0]);
-      break;
+         hypre_sscanf(sdata_ptr, "%d%c",
+                      &index[0], &sign[0]);
+         break;
 
       case 2:
-      hypre_sscanf(sdata_ptr, "%d%c%d%c",
-             &index[0], &sign[0], &index[1], &sign[1]);
-      break;
+         hypre_sscanf(sdata_ptr, "%d%c%d%c",
+                      &index[0], &sign[0], &index[1], &sign[1]);
+         break;
 
       case 3:
-      hypre_sscanf(sdata_ptr, "%d%c%d%c%d%c",
-             &index[0], &sign[0], &index[1], &sign[1], &index[2], &sign[2]);
-      break;
+         hypre_sscanf(sdata_ptr, "%d%c%d%c%d%c",
+                      &index[0], &sign[0], &index[1], &sign[1], &index[2], &sign[2]);
+         break;
    }
    sdata_ptr += strcspn(sdata_ptr, ":)");
    if ( *sdata_ptr == ':' )
@@ -245,7 +245,7 @@ SScanProblemIndex( char          *sdata_ptr,
       /* pre-shift the index */
       for (i = 0; i < ndim; i++)
       {
-         index[i] += index[i+6];
+         index[i] += index[i + 6];
       }
    }
    sdata_ptr += strcspn(sdata_ptr, ")") + 1;
@@ -254,7 +254,7 @@ SScanProblemIndex( char          *sdata_ptr,
    {
       if (sign[i] == '+')
       {
-         index[i+3] = 1;
+         index[i + 3] = 1;
       }
    }
 
@@ -303,7 +303,7 @@ ReadData( char         *filename,
       sdata = hypre_TAlloc(char,  memchunk, HYPRE_MEMORY_HOST);
       sdata_line = fgets(sdata, maxline, file);
 
-      s= memchunk;
+      s = memchunk;
       while (sdata_line != NULL)
       {
          sdata_size += strlen(sdata_line) + 1;
@@ -312,7 +312,7 @@ ReadData( char         *filename,
          if ((sdata_size + maxline) > s)
          {
             sdata = hypre_TReAlloc(sdata,  char,  (sdata_size + memchunk), HYPRE_MEMORY_HOST);
-            s= sdata_size + memchunk;
+            s = sdata_size + memchunk;
          }
 
          /* read the next input line */
@@ -470,7 +470,7 @@ ReadData( char         *filename,
             SScanIntArray(sdata_ptr, &sdata_ptr,
                           data.ndim, data.stencil_offsets[s][entry]);
             data.stencil_vars[s][entry] = strtol(sdata_ptr, &sdata_ptr, 10);
-            data.stencil_values[s][entry] = strtod(sdata_ptr, &sdata_ptr);
+            data.stencil_values[s][entry] = (HYPRE_Real)strtod(sdata_ptr, &sdata_ptr);
          }
          else if ( strcmp(key, "GraphSetStencil:") == 0 )
          {
@@ -565,7 +565,7 @@ ReadData( char         *filename,
             pdata.graph_entries[pdata.graph_nentries] =
                strtol(sdata_ptr, &sdata_ptr, 10);
             pdata.graph_values[pdata.graph_nentries] =
-               strtod(sdata_ptr, &sdata_ptr);
+               (HYPRE_Real)strtod(sdata_ptr, &sdata_ptr);
             pdata.graph_boxsizes[pdata.graph_nentries] = 1;
             for (i = 0; i < 3; i++)
             {
@@ -611,7 +611,7 @@ ReadData( char         *filename,
             pdata.matrix_entries[pdata.matrix_nentries] =
                strtol(sdata_ptr, &sdata_ptr, 10);
             pdata.matrix_values[pdata.matrix_nentries] =
-               strtod(sdata_ptr, &sdata_ptr);
+               (HYPRE_Real)strtod(sdata_ptr, &sdata_ptr);
             pdata.matrix_nentries++;
             data.pdata[part] = pdata;
          }
@@ -620,7 +620,7 @@ ReadData( char         *filename,
          {
             part = strtol(sdata_ptr, &sdata_ptr, 10);
             pdata = data.pdata[part];
-            pdata.fac_plevel= strtol(sdata_ptr, &sdata_ptr, 10);
+            pdata.fac_plevel = strtol(sdata_ptr, &sdata_ptr, 10);
             SScanIntArray(sdata_ptr, &sdata_ptr, data.ndim, pdata.fac_prefinement);
             data.pdata[part] = pdata;
          }
@@ -663,9 +663,9 @@ MapProblemIndex( ProblemIndex index,
    index[1] -= index[7];
    index[2] -= index[8];
    /* map the index */
-   index[0] = m[0]*index[0] + (m[0]-1)*index[3];
-   index[1] = m[1]*index[1] + (m[1]-1)*index[4];
-   index[2] = m[2]*index[2] + (m[2]-1)*index[5];
+   index[0] = m[0] * index[0] + (m[0] - 1) * index[3];
+   index[1] = m[1] * index[1] + (m[1] - 1) * index[4];
+   index[2] = m[2] * index[2] + (m[2] - 1) * index[5];
    /* pre-shift the new mapped index */
    index[0] += index[6];
    index[1] += index[7];
@@ -715,7 +715,7 @@ DistributeData( ProblemData   global_data,
    ProblemIndex     ilower, iupper, int_ilower, int_iupper;
 
    /* determine first process number in each pool */
-   pool_procs = hypre_CTAlloc(HYPRE_Int,  (data.npools+1), HYPRE_MEMORY_HOST);
+   pool_procs = hypre_CTAlloc(HYPRE_Int,  (data.npools + 1), HYPRE_MEMORY_HOST);
    for (part = 0; part < data.nparts; part++)
    {
       pool = data.pools[part] + 1;
@@ -791,7 +791,7 @@ DistributeData( ProblemData   global_data,
          {
             p = pid % m[0];
             q = ((pid - p) / m[0]) % m[1];
-            r = (pid - p - q*m[0]) / (m[0]*m[1]);
+            r = (pid - p - q * m[0]) / (m[0] * m[1]);
 
             for (box = 0; box < pdata.nboxes; box++)
             {
@@ -805,12 +805,12 @@ DistributeData( ProblemData   global_data,
                pdata.iuppers[box][1] = pdata.ilowers[box][1] + n[1] - 1;
                pdata.iuppers[box][2] = pdata.ilowers[box][2] + n[2] - 1;
 
-               pdata.ilowers[box][0] = pdata.ilowers[box][0] + p*n[0];
-               pdata.ilowers[box][1] = pdata.ilowers[box][1] + q*n[1];
-               pdata.ilowers[box][2] = pdata.ilowers[box][2] + r*n[2];
-               pdata.iuppers[box][0] = pdata.iuppers[box][0] + p*n[0];
-               pdata.iuppers[box][1] = pdata.iuppers[box][1] + q*n[1];
-               pdata.iuppers[box][2] = pdata.iuppers[box][2] + r*n[2];
+               pdata.ilowers[box][0] = pdata.ilowers[box][0] + p * n[0];
+               pdata.ilowers[box][1] = pdata.ilowers[box][1] + q * n[1];
+               pdata.ilowers[box][2] = pdata.ilowers[box][2] + r * n[2];
+               pdata.iuppers[box][0] = pdata.iuppers[box][0] + p * n[0];
+               pdata.iuppers[box][1] = pdata.iuppers[box][1] + q * n[1];
+               pdata.iuppers[box][2] = pdata.iuppers[box][2] + r * n[2];
             }
 
             i = 0;
@@ -824,9 +824,9 @@ DistributeData( ProblemData   global_data,
                MapProblemIndex(pdata.graph_to_ilowers[entry], mmap);
                MapProblemIndex(pdata.graph_to_iuppers[entry], mmap);
 
-               for (d= 0; d< 3; d++)
+               for (d = 0; d < 3; d++)
                {
-                  mod_graph[d]= pdata.graph_ilowers[entry][d] % pdata.graph_strides[entry][d];
+                  mod_graph[d] = pdata.graph_ilowers[entry][d] % pdata.graph_strides[entry][d];
                }
 
                for (box = 0; box < pdata.nboxes; box++)
@@ -843,32 +843,32 @@ DistributeData( ProblemData   global_data,
                      correctly */
                   if (size > 0)
                   {
-                     for (d= 0; d< 3; d++)
+                     for (d = 0; d < 3; d++)
                      {
-                        mod_lower= int_ilower[d] % pdata.graph_strides[entry][d];
+                        mod_lower = int_ilower[d] % pdata.graph_strides[entry][d];
                         if (mod_graph[d] >= mod_lower)
                         {
-                           int_ilower[d]+= (mod_graph[d] - mod_lower);
+                           int_ilower[d] += (mod_graph[d] - mod_lower);
                         }
                         else
                         {
-                           int_ilower[d]+= pdata.graph_strides[entry][d] + (mod_graph[d] - mod_lower);
+                           int_ilower[d] += pdata.graph_strides[entry][d] + (mod_graph[d] - mod_lower);
                         }
-                        mod_lower= mod_graph[d];
+                        mod_lower = mod_graph[d];
 
-                        mod_upper= int_iupper[d] % pdata.graph_strides[entry][d];
+                        mod_upper = int_iupper[d] % pdata.graph_strides[entry][d];
                         if (mod_lower >= mod_upper)
                         {
-                           int_iupper[d]-= (mod_lower-mod_upper);
+                           int_iupper[d] -= (mod_lower - mod_upper);
                         }
                         else
                         {
-                           int_iupper[d]+= (mod_upper-mod_lower) - pdata.graph_strides[entry][d];
+                           int_iupper[d] += (mod_upper - mod_lower) - pdata.graph_strides[entry][d];
                         }
 
                         if (int_iupper[d] - int_ilower[d] < 0)
                         {
-                           size= -1;
+                           size = -1;
                            break;
                         }
                      }
@@ -881,16 +881,16 @@ DistributeData( ProblemData   global_data,
                      {
                         dmap = pdata.graph_index_maps[entry][d];
                         sign = pdata.graph_index_signs[entry][d];
-                        size =(int_iupper[d] - pdata.graph_iuppers[entry][d])/
+                        size = (int_iupper[d] - pdata.graph_iuppers[entry][d]) /
                                pdata.graph_strides[entry][d];
                         pdata.graph_to_iuppers[i][dmap] =
-                           pdata.graph_to_ilowers[entry][dmap] + sign*
-                           size*pdata.graph_to_strides[entry][d];
-                        size= (int_ilower[d] - pdata.graph_ilowers[entry][d])/
+                           pdata.graph_to_ilowers[entry][dmap] + sign *
+                           size * pdata.graph_to_strides[entry][d];
+                        size = (int_ilower[d] - pdata.graph_ilowers[entry][d]) /
                                pdata.graph_strides[entry][d];
                         pdata.graph_to_ilowers[i][dmap] =
                            pdata.graph_to_ilowers[entry][dmap] + sign *
-                           size*pdata.graph_to_strides[entry][d];
+                           size * pdata.graph_to_strides[entry][d];
                         pdata.graph_ilowers[i][d] = int_ilower[d];
                         pdata.graph_iuppers[i][d] = int_iupper[d];
                         pdata.graph_strides[i][d] =
@@ -974,11 +974,11 @@ DistributeData( ProblemData   global_data,
          if ( (m[0] * m[1] * m[2]) > 1)
          {
             pdata.ilowers = hypre_TReAlloc(pdata.ilowers,  ProblemIndex,
-                                           m[0]*m[1]*m[2]*pdata.nboxes, HYPRE_MEMORY_HOST);
+                                           m[0] * m[1] * m[2] * pdata.nboxes, HYPRE_MEMORY_HOST);
             pdata.iuppers = hypre_TReAlloc(pdata.iuppers,  ProblemIndex,
-                                           m[0]*m[1]*m[2]*pdata.nboxes, HYPRE_MEMORY_HOST);
+                                           m[0] * m[1] * m[2] * pdata.nboxes, HYPRE_MEMORY_HOST);
             pdata.boxsizes = hypre_TReAlloc(pdata.boxsizes,  HYPRE_Int,
-                                            m[0]*m[1]*m[2]*pdata.nboxes, HYPRE_MEMORY_HOST);
+                                            m[0] * m[1] * m[2] * pdata.nboxes, HYPRE_MEMORY_HOST);
             for (box = 0; box < pdata.nboxes; box++)
             {
                n[0] = pdata.iuppers[box][0] - pdata.ilowers[box][0] + 1;
@@ -999,12 +999,12 @@ DistributeData( ProblemData   global_data,
                   {
                      for (p = 0; p < m[0]; p++)
                      {
-                        pdata.ilowers[i][0] = pdata.ilowers[box][0] + p*n[0];
-                        pdata.ilowers[i][1] = pdata.ilowers[box][1] + q*n[1];
-                        pdata.ilowers[i][2] = pdata.ilowers[box][2] + r*n[2];
-                        pdata.iuppers[i][0] = pdata.iuppers[box][0] + p*n[0];
-                        pdata.iuppers[i][1] = pdata.iuppers[box][1] + q*n[1];
-                        pdata.iuppers[i][2] = pdata.iuppers[box][2] + r*n[2];
+                        pdata.ilowers[i][0] = pdata.ilowers[box][0] + p * n[0];
+                        pdata.ilowers[i][1] = pdata.ilowers[box][1] + q * n[1];
+                        pdata.ilowers[i][2] = pdata.ilowers[box][2] + r * n[2];
+                        pdata.iuppers[i][0] = pdata.iuppers[box][0] + p * n[0];
+                        pdata.iuppers[i][1] = pdata.iuppers[box][1] + q * n[1];
+                        pdata.iuppers[i][2] = pdata.iuppers[box][2] + r * n[2];
                         for (d = 3; d < 9; d++)
                         {
                            pdata.ilowers[i][d] = pdata.ilowers[box][d];
@@ -1015,7 +1015,7 @@ DistributeData( ProblemData   global_data,
                   }
                }
             }
-            pdata.nboxes *= m[0]*m[1]*m[2];
+            pdata.nboxes *= m[0] * m[1] * m[2];
 
             for (entry = 0; entry < pdata.graph_nentries; entry++)
             {
@@ -1206,12 +1206,12 @@ DestroyData( ProblemData   data )
 
       if (pdata.matrix_nentries > 0)
       {
-            hypre_TFree(pdata.matrix_ilowers, HYPRE_MEMORY_HOST);
-            hypre_TFree(pdata.matrix_iuppers, HYPRE_MEMORY_HOST);
-            hypre_TFree(pdata.matrix_strides, HYPRE_MEMORY_HOST);
-            hypre_TFree(pdata.matrix_vars, HYPRE_MEMORY_HOST);
-            hypre_TFree(pdata.matrix_entries, HYPRE_MEMORY_HOST);
-            hypre_TFree(pdata.matrix_values, HYPRE_MEMORY_HOST);
+         hypre_TFree(pdata.matrix_ilowers, HYPRE_MEMORY_HOST);
+         hypre_TFree(pdata.matrix_iuppers, HYPRE_MEMORY_HOST);
+         hypre_TFree(pdata.matrix_strides, HYPRE_MEMORY_HOST);
+         hypre_TFree(pdata.matrix_vars, HYPRE_MEMORY_HOST);
+         hypre_TFree(pdata.matrix_entries, HYPRE_MEMORY_HOST);
+         hypre_TFree(pdata.matrix_values, HYPRE_MEMORY_HOST);
       }
 
    }
@@ -1299,14 +1299,15 @@ main( hypre_int argc,
 
    /*-----------------------------------------------------------------
     * GPU Device binding
-    * Must be done before HYPRE_Init() and should not be changed after
+    * Must be done before HYPRE_Initialize() and should not be changed after
     *-----------------------------------------------------------------*/
-   hypre_bind_device(myid, num_procs, hypre_MPI_COMM_WORLD);
+   hypre_bind_device_id(-1, myid, num_procs, hypre_MPI_COMM_WORLD);
 
    /*-----------------------------------------------------------
     * Initialize : must be the first HYPRE function to call
     *-----------------------------------------------------------*/
-   HYPRE_Init();
+   HYPRE_Initialize();
+   HYPRE_DeviceInitialize();
 
    /*-----------------------------------------------------------
     * Read input file
@@ -1505,19 +1506,19 @@ main( hypre_int argc,
     * Set up the amr structure
     *-----------------------------------------------------------*/
    plevels     = hypre_TAlloc(HYPRE_Int,  data.nparts, HYPRE_MEMORY_HOST);
-   prefinements= hypre_TAlloc(Index,  data.nparts, HYPRE_MEMORY_HOST);
+   prefinements = hypre_TAlloc(Index,  data.nparts, HYPRE_MEMORY_HOST);
    for (part = 0; part < data.nparts; part++)
    {
       pdata = data.pdata[part];
-      plevels[part]= pdata.fac_plevel;
-      for (i= 0; i< data.ndim; i++)
+      plevels[part] = pdata.fac_plevel;
+      for (i = 0; i < data.ndim; i++)
       {
-         prefinements[part][i]= pdata.fac_prefinement[i];
+         prefinements[part][i] = pdata.fac_prefinement[i];
       }
    }
 
-   n_pre  = prefinements[data.nparts-1][0]-1;
-   n_post = prefinements[data.nparts-1][0]-1;
+   n_pre  = prefinements[data.nparts - 1][0] - 1;
+   n_post = prefinements[data.nparts - 1][0] - 1;
    /*-----------------------------------------------------------
     * Set up the graph
     *-----------------------------------------------------------*/
@@ -1526,7 +1527,7 @@ main( hypre_int argc,
    if ( ((solver_id >= 20) && (solver_id <= 30)) ||
         ((solver_id >= 40) && (solver_id < 60)) )
    {
-       HYPRE_SStructGraphSetObjectType(graph, HYPRE_PARCSR);
+      HYPRE_SStructGraphSetObjectType(graph, HYPRE_PARCSR);
    }
 
    for (part = 0; part < data.nparts; part++)
@@ -1562,7 +1563,7 @@ main( hypre_int argc,
                      k /= pdata.graph_strides[entry][i];
                      k *= pdata.graph_index_signs[entry][i];
                      to_index[j] = pdata.graph_to_ilowers[entry][j] +
-                        k * pdata.graph_to_strides[entry][j];
+                                   k * pdata.graph_to_strides[entry][j];
                   }
                   HYPRE_SStructGraphAddEntries(graph, part, index,
                                                pdata.graph_vars[entry],
@@ -1660,9 +1661,9 @@ main( hypre_int argc,
                        index[0] <= pdata.graph_iuppers[entry][0];
                        index[0] += pdata.graph_strides[entry][0])
                   {
-                      HYPRE_SStructMatrixSetValues(A_amg, part, index,
-                                                   pdata.graph_vars[entry],
-                                                   1, &pdata.graph_entries[entry],
+                     HYPRE_SStructMatrixSetValues(A_amg, part, index,
+                                                  pdata.graph_vars[entry],
+                                                  1, &pdata.graph_entries[entry],
                                                   &pdata.graph_values[entry]);
                   }
                }
@@ -1701,7 +1702,7 @@ main( hypre_int argc,
    }
 
    /* reset matrix values so that stencil connections between two parts are zeroed */
-   for (part= data.nparts-1; part> 0; part--)
+   for (part = data.nparts - 1; part > 0; part--)
    {
       /*hypre_FacZeroCFSten(hypre_SStructMatrixPMatrix(A, part),
                           hypre_SStructMatrixPMatrix(A, part-1),
@@ -1717,7 +1718,7 @@ main( hypre_int argc,
       HYPRE_SStructFACZeroFCSten(A,
                                  grid,
                                  part);
-      HYPRE_SStructFACZeroAMRMatrixData(A, part-1, prefinements[part]);
+      HYPRE_SStructFACZeroAMRMatrixData(A, part - 1, prefinements[part]);
    }
 
    HYPRE_SStructMatrixAssemble(A);
@@ -1725,24 +1726,24 @@ main( hypre_int argc,
    if ( ((solver_id >= 20) && (solver_id <= 30)) ||
         ((solver_id >= 40) && (solver_id < 60)) )
    {
-      for (part= data.nparts-1; part>= 0; part--)
+      for (part = data.nparts - 1; part >= 0; part--)
       {
          pdata = data.pdata[part];
 
          for (var = 0; var < pdata.nvars; var++)
          {
-            sA= hypre_SStructPMatrixSMatrix(hypre_SStructMatrixPMatrix(A, part),
-                                            var, var);
+            sA = hypre_SStructPMatrixSMatrix(hypre_SStructMatrixPMatrix(A, part),
+                                             var, var);
             s = pdata.stencil_num[var];
             for (i = 0; i < data.stencil_sizes[s]; i++)
             {
                for (box = 0; box < pdata.nboxes; box++)
                {
-                  box_values= hypre_TAlloc(HYPRE_Real,  data.max_boxsize, HYPRE_MEMORY_HOST);
+                  box_values = hypre_TAlloc(HYPRE_Real,  data.max_boxsize, HYPRE_MEMORY_HOST);
                   GetVariableBox(pdata.ilowers[box], pdata.iuppers[box],
                                  pdata.vartypes[var], ilower, iupper);
                   HYPRE_StructMatrixGetBoxValues(sA, ilower, iupper, 1,
-                                                &i, box_values);
+                                                 &i, box_values);
 
                   HYPRE_SStructMatrixSetBoxValues(A_amg, part, ilower, iupper,
                                                   var, 1, &i, box_values);
@@ -1802,11 +1803,11 @@ main( hypre_int argc,
          pdata = data.pdata[part];
          for (var = 0; var < pdata.nvars; var++)
          {
-            sx= hypre_SStructPVectorSVector(hypre_SStructVectorPVector(b, part),
-                                            var);
+            sx = hypre_SStructPVectorSVector(hypre_SStructVectorPVector(b, part),
+                                             var);
             for (box = 0; box < pdata.nboxes; box++)
             {
-               box_values= hypre_TAlloc(HYPRE_Real,  data.max_boxsize, HYPRE_MEMORY_HOST);
+               box_values = hypre_TAlloc(HYPRE_Real,  data.max_boxsize, HYPRE_MEMORY_HOST);
                GetVariableBox(pdata.ilowers[box], pdata.iuppers[box], var,
                               ilower, iupper);
                HYPRE_StructVectorGetBoxValues(sx, ilower, iupper, box_values);
@@ -1865,11 +1866,11 @@ main( hypre_int argc,
          pdata = data.pdata[part];
          for (var = 0; var < pdata.nvars; var++)
          {
-            sx= hypre_SStructPVectorSVector(hypre_SStructVectorPVector(x, part),
-                                            var);
+            sx = hypre_SStructPVectorSVector(hypre_SStructVectorPVector(x, part),
+                                             var);
             for (box = 0; box < pdata.nboxes; box++)
             {
-               box_values= hypre_TAlloc(HYPRE_Real,  data.max_boxsize, HYPRE_MEMORY_HOST);
+               box_values = hypre_TAlloc(HYPRE_Real,  data.max_boxsize, HYPRE_MEMORY_HOST);
                GetVariableBox(pdata.ilowers[box], pdata.iuppers[box], var,
                               ilower, iupper);
                HYPRE_StructVectorGetBoxValues(sx, ilower, iupper, box_values);
@@ -1984,12 +1985,12 @@ main( hypre_int argc,
     * Solve the system using FAC
     *-----------------------------------------------------------*/
 
-   if ((solver_id >=50) && (solver_id <100))
+   if ((solver_id >= 50) && (solver_id < 100))
    {
       if (solver_id < 100)
       {
-        /* n_pre+= n_post;*/
-        /* n_post= 0;*/
+         /* n_pre+= n_post;*/
+         /* n_post= 0;*/
       }
       time_index = hypre_InitializeTiming("FAC Setup");
       hypre_BeginTiming(time_index);
@@ -2039,7 +2040,7 @@ main( hypre_int argc,
 
       HYPRE_SStructFACGetNumIterations(solver, &num_iterations);
       HYPRE_SStructFACGetFinalRelativeResidualNorm(
-                                           solver, &final_res_norm);
+         solver, &final_res_norm);
       HYPRE_SStructFACDestroy2(solver);
    }
 
@@ -2072,9 +2073,9 @@ main( hypre_int argc,
          /*HYPRE_BoomerAMGSetLogging(par_precond, 1, "sstruct.out.log");*/
          HYPRE_BoomerAMGSetMaxIter(par_precond, 1);
          HYPRE_PCGSetPrecond( par_solver,
-                             (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSolve,
-                             (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSetup,
-                             par_precond );
+                              (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSolve,
+                              (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSetup,
+                              par_precond );
       }
       HYPRE_PCGSetup( par_solver, (HYPRE_Matrix) par_A,
                       (HYPRE_Vector) par_b, (HYPRE_Vector) par_x );
@@ -2199,7 +2200,7 @@ main( hypre_int argc,
 
       HYPRE_BoomerAMGGetNumIterations(par_solver, &num_iterations);
       HYPRE_BoomerAMGGetFinalRelativeResidualNorm(par_solver,
-                                                 &final_res_norm);
+                                                  &final_res_norm);
 
       HYPRE_BoomerAMGDestroy(par_solver);
    }
diff --git a/external/hypre/src/test/struct.c b/external/hypre/src/test/struct.c
index 2d6ad28c..5968fb24 100644
--- a/external/hypre/src/test/struct.c
+++ b/external/hypre/src/test/struct.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -20,7 +20,6 @@
 
 /* RDF: Why is this include here? */
 #include "_hypre_struct_mv.h"
-#include "_hypre_struct_mv.hpp"
 
 #ifdef HYPRE_DEBUG
 /*#include <cegdb.h>*/
@@ -36,9 +35,9 @@
 
 /* end lobpcg */
 
-HYPRE_Int  SetStencilBndry(HYPRE_StructMatrix A,HYPRE_StructGrid gridmatrix,HYPRE_Int* period);
+HYPRE_Int  SetStencilBndry(HYPRE_StructMatrix A, HYPRE_StructGrid gridmatrix, HYPRE_Int* period);
 
-HYPRE_Int  AddValuesMatrix(HYPRE_StructMatrix A,HYPRE_StructGrid gridmatrix,
+HYPRE_Int  AddValuesMatrix(HYPRE_StructMatrix A, HYPRE_StructGrid gridmatrix,
                            HYPRE_Real        cx,
                            HYPRE_Real        cy,
                            HYPRE_Real        cz,
@@ -94,11 +93,13 @@ main( hypre_int argc,
    HYPRE_Real          cf_tol;
 
    HYPRE_Int           num_procs, myid;
+   HYPRE_Int           device_id = -1;
+   HYPRE_Int           lazy_device_init = 0;
 
    HYPRE_Int           p, q, r;
    HYPRE_Int           dim;
    HYPRE_Int           n_pre, n_post;
-   HYPRE_Int           nblocks ;
+   HYPRE_Int           nblocks = 0;
    HYPRE_Int           skip;
    HYPRE_Int           sym;
    HYPRE_Int           rap;
@@ -133,11 +134,18 @@ main( hypre_int argc,
    HYPRE_Int           read_rhsfromfile_index;
    HYPRE_Int           read_x0fromfile_param;
    HYPRE_Int           read_x0fromfile_index;
-   HYPRE_Int           periodx0[3] = {0,0,0};
+   HYPRE_Int           periodx0[3] = {0, 0, 0};
    HYPRE_Int          *readperiodic;
    HYPRE_Int           sum;
 
+   HYPRE_Int           prec_print_level = 0;
+   HYPRE_Int           solver_print_level = 0;
+   HYPRE_Int           log_level = 0;
    HYPRE_Int           print_system = 0;
+#if defined(HYPRE_USING_MEMORY_TRACKER)
+   HYPRE_Int           print_mem_tracker = 0;
+   char                mem_tracker_name[HYPRE_MAX_FILE_NAME_LEN] = {0};
+#endif
 
    /* begin lobpcg */
 
@@ -175,7 +183,18 @@ main( hypre_int argc,
    HYPRE_MatvecFunctions matvec_fn;
    /* end lobpcg */
 
+   /* default execution policy and memory space */
+#if defined(HYPRE_TEST_USING_HOST)
+   HYPRE_MemoryLocation memory_location = HYPRE_MEMORY_HOST;
+   HYPRE_ExecutionPolicy default_exec_policy = HYPRE_EXEC_HOST;
+#else
+   HYPRE_MemoryLocation memory_location = HYPRE_MEMORY_DEVICE;
+   HYPRE_ExecutionPolicy default_exec_policy = HYPRE_EXEC_DEVICE;
+#endif
+   HYPRE_Int gpu_aware_mpi = 0;
+
    //HYPRE_Int device_level = -2;
+
    /*-----------------------------------------------------------
     * Initialize some stuff
     *-----------------------------------------------------------*/
@@ -186,14 +205,31 @@ main( hypre_int argc,
 
    /*-----------------------------------------------------------------
     * GPU Device binding
-    * Must be done before HYPRE_Init() and should not be changed after
+    * Must be done before HYPRE_Initialize() and should not be changed after
     *-----------------------------------------------------------------*/
-   hypre_bind_device(myid, num_procs, hypre_MPI_COMM_WORLD);
+   for (arg_index = 1; arg_index < argc; arg_index ++)
+   {
+      if (strcmp(argv[arg_index], "-lazy_device_init") == 0)
+      {
+         lazy_device_init = atoi(argv[++arg_index]);
+      }
+      else if (strcmp(argv[arg_index], "-device_id") == 0)
+      {
+         device_id = atoi(argv[++arg_index]);
+      }
+   }
+
+   hypre_bind_device_id(device_id, myid, num_procs, hypre_MPI_COMM_WORLD);
 
    /*-----------------------------------------------------------
     * Initialize : must be the first HYPRE function to call
     *-----------------------------------------------------------*/
-   HYPRE_Init();
+   HYPRE_Initialize();
+
+   if (!lazy_device_init)
+   {
+      HYPRE_DeviceInitialize();
+   }
 
 #if defined(HYPRE_USING_KOKKOS)
    Kokkos::initialize (argc, argv);
@@ -213,7 +249,8 @@ main( hypre_int argc,
    sym  = 1;
    rap = 0;
    relax = 1;
-   usr_jacobi_weight= 0;
+   jacobi_weight = 1.0;
+   usr_jacobi_weight = 0;
    jump  = 0;
    reps = 1;
 
@@ -263,7 +300,7 @@ main( hypre_int argc,
    sum = 0;
 
    /* ghost defaults */
-   for (i = 0; i < 2*dim; i++)
+   for (i = 0; i < 2 * dim; i++)
    {
       num_ghost[i]   = 1;
       A_num_ghost[i] = num_ghost[i];
@@ -318,16 +355,16 @@ main( hypre_int argc,
       else if ( strcmp(argv[arg_index], "-c") == 0 )
       {
          arg_index++;
-         cx = atof(argv[arg_index++]);
-         cy = atof(argv[arg_index++]);
-         cz = atof(argv[arg_index++]);
+         cx = (HYPRE_Real)atof(argv[arg_index++]);
+         cy = (HYPRE_Real)atof(argv[arg_index++]);
+         cz = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-convect") == 0 )
       {
          arg_index++;
-         conx = atof(argv[arg_index++]);
-         cony = atof(argv[arg_index++]);
-         conz = atof(argv[arg_index++]);
+         conx = (HYPRE_Real)atof(argv[arg_index++]);
+         cony = (HYPRE_Real)atof(argv[arg_index++]);
+         conz = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-d") == 0 )
       {
@@ -362,12 +399,15 @@ main( hypre_int argc,
          arg_index++;
 
          /* begin lobpcg */
-         if ( strcmp(argv[arg_index], "none") == 0 ) {
+         if ( strcmp(argv[arg_index], "none") == 0 )
+         {
             solver_id = NO_SOLVER;
             arg_index++;
          }
          else /* end lobpcg */
+         {
             solver_id = atoi(argv[arg_index++]);
+         }
       }
       else if ( strcmp(argv[arg_index], "-v") == 0 )
       {
@@ -388,8 +428,8 @@ main( hypre_int argc,
       else if ( strcmp(argv[arg_index], "-w") == 0 )
       {
          arg_index++;
-         jacobi_weight= atof(argv[arg_index++]);
-         usr_jacobi_weight= 1; /* flag user weight */
+         jacobi_weight = (HYPRE_Real)atof(argv[arg_index++]);
+         usr_jacobi_weight = 1; /* flag user weight */
       }
       else if ( strcmp(argv[arg_index], "-sym") == 0 )
       {
@@ -419,13 +459,28 @@ main( hypre_int argc,
       else if ( strcmp(argv[arg_index], "-cf") == 0 )
       {
          arg_index++;
-         cf_tol = atof(argv[arg_index++]);
+         cf_tol = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-print") == 0 )
       {
          arg_index++;
          print_system = 1;
       }
+      else if ( strcmp(argv[arg_index], "-pout") == 0 )
+      {
+         arg_index++;
+         prec_print_level = atoi(argv[arg_index++]);
+      }
+      else if ( strcmp(argv[arg_index], "-sout") == 0 )
+      {
+         arg_index++;
+         solver_print_level = atoi(argv[arg_index++]);
+      }
+      else if ( strcmp(argv[arg_index], "-ll") == 0 )
+      {
+         arg_index++;
+         log_level = atoi(argv[arg_index++]);
+      }
       else if ( strcmp(argv[arg_index], "-help") == 0 )
       {
          print_usage = 1;
@@ -451,7 +506,8 @@ main( hypre_int argc,
          verbosity = atoi(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-vrand") == 0 )
-      {                         /* lobpcg: block size */
+      {
+         /* lobpcg: block size */
          arg_index++;
          blockSize = atoi(argv[arg_index++]);
       }
@@ -471,7 +527,7 @@ main( hypre_int argc,
       {
          /* lobpcg: tolerance */
          arg_index++;
-         tol = atof(argv[arg_index++]);
+         tol = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-pcgitr") == 0 )
       {
@@ -483,7 +539,7 @@ main( hypre_int argc,
       {
          /* lobpcg: inner pcg iterations tolerance */
          arg_index++;
-         pcgTol = atof(argv[arg_index++]);
+         pcgTol = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-pcgmode") == 0 )
       {
@@ -497,13 +553,43 @@ main( hypre_int argc,
          arg_index++;
          printLevel = atoi(argv[arg_index++]);
       }
-      /*
-      else if ( strcmp(argv[arg_index], "-devicelevel") == 0 )
+      else if ( strcmp(argv[arg_index], "-memory_host") == 0 )
+      {
+         arg_index++;
+         memory_location = HYPRE_MEMORY_HOST;
+      }
+      else if ( strcmp(argv[arg_index], "-memory_device") == 0 )
       {
          arg_index++;
-         device_level = atoi(argv[arg_index++]);
+         memory_location = HYPRE_MEMORY_DEVICE;
+      }
+      else if ( strcmp(argv[arg_index], "-exec_host") == 0 )
+      {
+         arg_index++;
+         default_exec_policy = HYPRE_EXEC_HOST;
+      }
+      else if ( strcmp(argv[arg_index], "-exec_device") == 0 )
+      {
+         arg_index++;
+         default_exec_policy = HYPRE_EXEC_DEVICE;
+      }
+#if defined(HYPRE_USING_MEMORY_TRACKER)
+      else if ( strcmp(argv[arg_index], "-print_mem_tracker") == 0 )
+      {
+         arg_index++;
+         print_mem_tracker = atoi(argv[arg_index++]);
+      }
+      else if ( strcmp(argv[arg_index], "-mem_tracker_filename") == 0 )
+      {
+         arg_index++;
+         snprintf(mem_tracker_name, HYPRE_MAX_FILE_NAME_LEN, "%s", argv[arg_index++]);
+      }
+#endif
+      else if ( strcmp(argv[arg_index], "-gpu_mpi") == 0 )
+      {
+         arg_index++;
+         gpu_aware_mpi = atoi(argv[arg_index++]);
       }
-      */
       /* end lobpcg */
       else
       {
@@ -511,10 +597,28 @@ main( hypre_int argc,
       }
    }
 
+#if defined(HYPRE_USING_MEMORY_TRACKER)
+   hypre_MemoryTrackerSetPrint(print_mem_tracker);
+   if (mem_tracker_name[0]) { hypre_MemoryTrackerSetFileName(mem_tracker_name); }
+#endif
+
+   /* Set library log level */
+   HYPRE_SetLogLevel(log_level);
+
+   /* default memory location */
+   HYPRE_SetMemoryLocation(memory_location);
+
+   /* default execution policy */
+   HYPRE_SetExecutionPolicy(default_exec_policy);
+
+   HYPRE_SetGpuAwareMPI(gpu_aware_mpi);
+
    /* begin lobpcg */
 
    if ( solver_id == 0 && lobpcgFlag )
+   {
       solver_id = 10;
+   }
 
    /*end lobpcg */
 
@@ -596,6 +700,13 @@ main( hypre_int argc,
       hypre_printf("                        2 - GMRES\n");
       hypre_printf("  -recompute <bool>   : Recompute residual in PCG?\n");
       hypre_printf("  -cf <cf>            : convergence factor for Hybrid\n");
+      hypre_printf("  -print              : print out the system\n");
+      hypre_printf("  -pout <val>         : print level for the preconditioner\n");
+      hypre_printf("  -sout <val>         : print level for the solver\n");
+      hypre_printf("  -ll <val>           : hypre's log level\n");
+      hypre_printf("                        0 - (default) No messaging.\n");
+      hypre_printf("                        1 - Display memory usage statistics for each MPI rank.\n");
+      hypre_printf("                        2 - Display aggregate memory usage statistics over MPI ranks.\n");
       hypre_printf("\n");
 
       /* begin lobpcg */
@@ -650,7 +761,7 @@ main( hypre_int argc,
     * Check a few things
     *-----------------------------------------------------------*/
 
-   if ((P*Q*R) > num_procs)
+   if ((P * Q * R) > num_procs)
    {
       if (myid == 0)
       {
@@ -658,7 +769,7 @@ main( hypre_int argc,
       }
       exit(1);
    }
-   else if ((P*Q*R) < num_procs)
+   else if ((P * Q * R) < num_procs)
    {
       if (myid == 0)
       {
@@ -666,7 +777,7 @@ main( hypre_int argc,
       }
    }
 
-   if ((conx != 0.0 || cony !=0 || conz != 0) && sym == 1 )
+   if ((conx != 0.0 || cony != 0 || conz != 0) && sym == 1 )
    {
       if (myid == 0)
       {
@@ -681,10 +792,23 @@ main( hypre_int argc,
 
    if (myid == 0 && sum == 0)
    {
+#if defined(HYPRE_DEVELOP_STRING) && defined(HYPRE_DEVELOP_BRANCH)
+      hypre_printf("\nUsing HYPRE_DEVELOP_STRING: %s (branch %s; the develop branch)\n\n",
+                   HYPRE_DEVELOP_STRING, HYPRE_DEVELOP_BRANCH);
+
+#elif defined(HYPRE_DEVELOP_STRING) && !defined(HYPRE_DEVELOP_BRANCH)
+      hypre_printf("\nUsing HYPRE_DEVELOP_STRING: %s (branch %s; not the develop branch)\n\n",
+                   HYPRE_DEVELOP_STRING, HYPRE_BRANCH_NAME);
+
+#elif defined(HYPRE_RELEASE_VERSION)
+      hypre_printf("\nUsing HYPRE_RELEASE_VERSION: %s\n\n",
+                   HYPRE_RELEASE_VERSION);
+#endif
+
       hypre_printf("Running with these driver parameters:\n");
       hypre_printf("  (nx, ny, nz)    = (%d, %d, %d)\n", nx, ny, nz);
       hypre_printf("  (istart[0],istart[1],istart[2]) = (%d, %d, %d)\n", \
-                   istart[0],istart[1],istart[2]);
+                   istart[0], istart[1], istart[2]);
       hypre_printf("  (Px, Py, Pz)    = (%d, %d, %d)\n", P,  Q,  R);
       hypre_printf("  (bx, by, bz)    = (%d, %d, %d)\n", bx, by, bz);
       hypre_printf("  (px, py, pz)    = (%d, %d, %d)\n", px, py, pz);
@@ -724,7 +848,7 @@ main( hypre_int argc,
 
    hypre_MPI_Barrier(hypre_MPI_COMM_WORLD);
 
-   for ( rep=0; rep<reps; ++rep )
+   for ( rep = 0; rep < reps; ++rep )
    {
       time_index = hypre_InitializeTiming("Struct Interface");
       hypre_BeginTiming(time_index);
@@ -738,7 +862,7 @@ main( hypre_int argc,
       {
          case 1:
             nblocks = bx;
-            if(sym)
+            if (sym)
             {
                offsets = hypre_CTAlloc(HYPRE_Int*,  2, HYPRE_MEMORY_HOST);
                offsets[0] = hypre_CTAlloc(HYPRE_Int,  1, HYPRE_MEMORY_HOST);
@@ -761,8 +885,8 @@ main( hypre_int argc,
             break;
 
          case 2:
-            nblocks = bx*by;
-            if(sym)
+            nblocks = bx * by;
+            if (sym)
             {
                offsets = hypre_CTAlloc(HYPRE_Int*,  3, HYPRE_MEMORY_HOST);
                offsets[0] = hypre_CTAlloc(HYPRE_Int,  2, HYPRE_MEMORY_HOST);
@@ -796,12 +920,12 @@ main( hypre_int argc,
             }
             /* compute p,q from P,Q and myid */
             p = myid % P;
-            q = (( myid - p)/P) % Q;
+            q = (( myid - p) / P) % Q;
             break;
 
          case 3:
-            nblocks = bx*by*bz;
-            if(sym)
+            nblocks = bx * by * bz;
+            if (sym)
             {
                offsets = hypre_CTAlloc(HYPRE_Int*,  4, HYPRE_MEMORY_HOST);
                offsets[0] = hypre_CTAlloc(HYPRE_Int,  3, HYPRE_MEMORY_HOST);
@@ -855,12 +979,12 @@ main( hypre_int argc,
             }
             /* compute p,q,r from P,Q,R and myid */
             p = myid % P;
-            q = (( myid - p)/P) % Q;
-            r = ( myid - p - P*q)/( P*Q );
+            q = (( myid - p) / P) % Q;
+            r = ( myid - p - P * q) / ( P * Q );
             break;
       }
 
-      if (myid >= (P*Q*R))
+      if (myid >= (P * Q * R))
       {
          /* My processor has no data on it */
          nblocks = bx = by = bz = 0;
@@ -871,8 +995,8 @@ main( hypre_int argc,
        * which is always the case for read_fromfile_param == 0
        *-----------------------------------------------------------*/
 
-      HYPRE_StructStencilCreate(dim, (2-sym)*dim + 1, &stencil);
-      for (s = 0; s < (2-sym)*dim + 1; s++)
+      HYPRE_StructStencilCreate(dim, (2 - sym)*dim + 1, &stencil);
+      for (s = 0; s < (2 - sym)*dim + 1; s++)
       {
          HYPRE_StructStencilSetElement(stencil, s, offsets[s]);
       }
@@ -895,46 +1019,46 @@ main( hypre_int argc,
       dxyz[2] = 1.0e+123;
       if (cx > 0)
       {
-         dxyz[0] = sqrt(1.0 / cx);
+         dxyz[0] = hypre_sqrt(1.0 / cx);
       }
       if (cy > 0)
       {
-         dxyz[1] = sqrt(1.0 / cy);
+         dxyz[1] = hypre_sqrt(1.0 / cy);
       }
       if (cz > 0)
       {
-         dxyz[2] = sqrt(1.0 / cz);
+         dxyz[2] = hypre_sqrt(1.0 / cz);
       }
 #endif
 
       /* We do the extreme cases first reading everything from files => sum = 3
        * building things from scratch (grid,stencils,extents) sum = 0 */
 
-      if ( (read_fromfile_param ==1) &&
-           (read_x0fromfile_param ==1) &&
-           (read_rhsfromfile_param ==1)
+      if ( (read_fromfile_param == 1) &&
+           (read_x0fromfile_param == 1) &&
+           (read_rhsfromfile_param == 1)
          )
       {
          /* ghost selection for reading the matrix and vectors */
          for (i = 0; i < dim; i++)
          {
-            A_num_ghost[2*i] = 1;
-            A_num_ghost[2*i + 1] = 1;
-            v_num_ghost[2*i] = 1;
-            v_num_ghost[2*i + 1] = 1;
+            A_num_ghost[2 * i] = 1;
+            A_num_ghost[2 * i + 1] = 1;
+            v_num_ghost[2 * i] = 1;
+            v_num_ghost[2 * i + 1] = 1;
          }
 
-         A = (HYPRE_StructMatrix)
-            hypre_StructMatrixRead(hypre_MPI_COMM_WORLD,
-                                   argv[read_fromfile_index],A_num_ghost);
+         HYPRE_StructMatrixRead(hypre_MPI_COMM_WORLD,
+                                argv[read_fromfile_index],
+                                A_num_ghost, &A);
 
-         b = (HYPRE_StructVector)
-            hypre_StructVectorRead(hypre_MPI_COMM_WORLD,
-                                   argv[read_rhsfromfile_index],v_num_ghost);
+         HYPRE_StructVectorRead(hypre_MPI_COMM_WORLD,
+                                argv[read_rhsfromfile_index],
+                                v_num_ghost, &b);
 
-         x = (HYPRE_StructVector)
-            hypre_StructVectorRead(hypre_MPI_COMM_WORLD,
-                                   argv[read_x0fromfile_index],v_num_ghost);
+         HYPRE_StructVectorRead(hypre_MPI_COMM_WORLD,
+                                argv[read_x0fromfile_index],
+                                v_num_ghost, &x);
       }
 
       /* beginning of sum == 0  */
@@ -959,8 +1083,8 @@ main( hypre_int argc,
             case 1:
                for (ix = 0; ix < bx; ix++)
                {
-                  ilower[ib][0] = istart[0]+ nx*(bx*p+ix);
-                  iupper[ib][0] = istart[0]+ nx*(bx*p+ix+1) - 1;
+                  ilower[ib][0] = istart[0] + nx * (bx * p + ix);
+                  iupper[ib][0] = istart[0] + nx * (bx * p + ix + 1) - 1;
                   ib++;
                }
                break;
@@ -968,10 +1092,10 @@ main( hypre_int argc,
                for (iy = 0; iy < by; iy++)
                   for (ix = 0; ix < bx; ix++)
                   {
-                     ilower[ib][0] = istart[0]+ nx*(bx*p+ix);
-                     iupper[ib][0] = istart[0]+ nx*(bx*p+ix+1) - 1;
-                     ilower[ib][1] = istart[1]+ ny*(by*q+iy);
-                     iupper[ib][1] = istart[1]+ ny*(by*q+iy+1) - 1;
+                     ilower[ib][0] = istart[0] + nx * (bx * p + ix);
+                     iupper[ib][0] = istart[0] + nx * (bx * p + ix + 1) - 1;
+                     ilower[ib][1] = istart[1] + ny * (by * q + iy);
+                     iupper[ib][1] = istart[1] + ny * (by * q + iy + 1) - 1;
                      ib++;
                   }
                break;
@@ -980,12 +1104,12 @@ main( hypre_int argc,
                   for (iy = 0; iy < by; iy++)
                      for (ix = 0; ix < bx; ix++)
                      {
-                        ilower[ib][0] = istart[0]+ nx*(bx*p+ix);
-                        iupper[ib][0] = istart[0]+ nx*(bx*p+ix+1) - 1;
-                        ilower[ib][1] = istart[1]+ ny*(by*q+iy);
-                        iupper[ib][1] = istart[1]+ ny*(by*q+iy+1) - 1;
-                        ilower[ib][2] = istart[2]+ nz*(bz*r+iz);
-                        iupper[ib][2] = istart[2]+ nz*(bz*r+iz+1) - 1;
+                        ilower[ib][0] = istart[0] + nx * (bx * p + ix);
+                        iupper[ib][0] = istart[0] + nx * (bx * p + ix + 1) - 1;
+                        ilower[ib][1] = istart[1] + ny * (by * q + iy);
+                        iupper[ib][1] = istart[1] + ny * (by * q + iy + 1) - 1;
+                        ilower[ib][2] = istart[2] + nz * (bz * r + iz);
+                        iupper[ib][2] = istart[2] + nz * (bz * r + iz + 1) - 1;
                         ib++;
                      }
                break;
@@ -1001,30 +1125,6 @@ main( hypre_int argc,
          HYPRE_StructGridSetNumGhost(grid, num_ghost);
          HYPRE_StructGridAssemble(grid);
 
-#if 0// defined(HYPRE_USING_CUDA)
-         HYPRE_StructGridSetDataLocation(grid, HYPRE_MEMORY_DEVICE);
-         /*
-         if (device_level == 0)
-         {
-         HYPRE_StructGridSetDataLocation(grid, HYPRE_MEMORY_HOST);
-         hypre_SetDeviceOff();
-         }
-         else
-         {
-         HYPRE_Int max_box_size = hypre_StructGridGetMaxBoxSize(grid);
-         if (max_box_size < 0)//HYPRE_MIN_GPU_SIZE)
-         {
-         HYPRE_StructGridSetDataLocation(grid, HYPRE_MEMORY_HOST);
-         hypre_SetDeviceOff();
-         }
-         else
-         {
-         HYPRE_StructGridSetDataLocation(grid, HYPRE_MEMORY_DEVICE);
-         }
-         }
-         */
-#endif
-
          /*-----------------------------------------------------------
           * Set up the matrix structure
           *-----------------------------------------------------------*/
@@ -1038,38 +1138,38 @@ main( hypre_int argc,
             stencil_entries = hypre_CTAlloc(HYPRE_Int,  stencil_size, HYPRE_MEMORY_HOST);
             if ( solver_id == 3 || solver_id == 13)
             {
-               for ( i=0; i<stencil_size; ++i )
+               for ( i = 0; i < stencil_size; ++i )
                {
-                  stencil_entries[i]=i;
+                  stencil_entries[i] = i;
                }
                hypre_StructMatrixSetConstantEntries( A, stencil_size, stencil_entries );
                /* ... note: SetConstantEntries is where the constant_coefficient
                   flag is set in A */
-               hypre_TFree( stencil_entries , HYPRE_MEMORY_HOST);
+               hypre_TFree( stencil_entries, HYPRE_MEMORY_HOST);
                constant_coefficient = 1;
             }
             if ( solver_id == 4 || solver_id == 14)
             {
                hypre_SetIndex3(diag_index, 0, 0, 0);
                diag_rank = hypre_StructStencilElementRank( stencil, diag_index );
-               hypre_assert( stencil_size>=1 );
-               if ( diag_rank==0 )
+               hypre_assert( stencil_size >= 1 );
+               if ( diag_rank == 0 )
                {
-                  stencil_entries[diag_rank]=1;
+                  stencil_entries[diag_rank] = 1;
                }
                else
                {
-                  stencil_entries[diag_rank]=0;
+                  stencil_entries[diag_rank] = 0;
                }
-               for ( i=0; i<stencil_size; ++i )
+               for ( i = 0; i < stencil_size; ++i )
                {
-                  if ( i!= diag_rank )
+                  if ( i != diag_rank )
                   {
-                     stencil_entries[i]=i;
+                     stencil_entries[i] = i;
                   }
                }
                hypre_StructMatrixSetConstantEntries( A, stencil_size, stencil_entries );
-               hypre_TFree( stencil_entries , HYPRE_MEMORY_HOST);
+               hypre_TFree( stencil_entries, HYPRE_MEMORY_HOST);
                constant_coefficient = 2;
             }
          }
@@ -1081,14 +1181,14 @@ main( hypre_int argc,
           * Fill in the matrix elements
           *-----------------------------------------------------------*/
 
-         AddValuesMatrix(A,grid,cx,cy,cz,conx,cony,conz);
+         AddValuesMatrix(A, grid, cx, cy, cz, conx, cony, conz);
 
          /* Zero out stencils reaching to real boundary */
          /* But in constant coefficient case, no special stencils! */
 
          if ( constant_coefficient == 0 )
          {
-            SetStencilBndry(A,grid,periodic);
+            SetStencilBndry(A, grid, periodic);
          }
          HYPRE_StructMatrixAssemble(A);
          /*-----------------------------------------------------------
@@ -1104,13 +1204,13 @@ main( hypre_int argc,
           *  sink of equal strength.  All other problems have rhs = 1.
           *-----------------------------------------------------------*/
 
-         AddValuesVector(grid,b,periodic,1.0);
+         AddValuesVector(grid, b, periodic, 1.0);
          HYPRE_StructVectorAssemble(b);
 
          HYPRE_StructVectorCreate(hypre_MPI_COMM_WORLD, grid, &x);
          HYPRE_StructVectorInitialize(x);
 
-         AddValuesVector(grid,x,periodx0,0.0);
+         AddValuesVector(grid, x, periodx0, 0.0);
          HYPRE_StructVectorAssemble(x);
 
          HYPRE_StructGridDestroy(grid);
@@ -1139,10 +1239,9 @@ main( hypre_int argc,
                hypre_printf("\ninitial rhs from file prefix :%s\n",
                             argv[read_rhsfromfile_index]);
 
-               b = (HYPRE_StructVector)
-                  hypre_StructVectorRead(hypre_MPI_COMM_WORLD,
-                                         argv[read_rhsfromfile_index],
-                                         v_num_ghost);
+               HYPRE_StructVectorRead(hypre_MPI_COMM_WORLD,
+                                      argv[read_rhsfromfile_index],
+                                      v_num_ghost, &b);
 
                readgrid = hypre_StructVectorGrid(b) ;
                readperiodic = hypre_StructGridPeriodic(readgrid);
@@ -1150,7 +1249,7 @@ main( hypre_int argc,
                HYPRE_StructVectorCreate(hypre_MPI_COMM_WORLD, readgrid, &x);
                HYPRE_StructVectorInitialize(x);
 
-               AddValuesVector(readgrid,x,periodx0,0.0);
+               AddValuesVector(readgrid, x, periodx0, 0.0);
                HYPRE_StructVectorAssemble(x);
 
                HYPRE_StructMatrixCreate(hypre_MPI_COMM_WORLD,
@@ -1162,12 +1261,14 @@ main( hypre_int argc,
                 * Fill in the matrix elements
                 *-----------------------------------------------------------*/
 
-               AddValuesMatrix(A,readgrid,cx,cy,cz,conx,cony,conz);
+               AddValuesMatrix(A, readgrid, cx, cy, cz, conx, cony, conz);
 
                /* Zero out stencils reaching to real boundary */
 
-               if ( constant_coefficient==0 )
-                  SetStencilBndry(A,readgrid,readperiodic);
+               if ( constant_coefficient == 0 )
+               {
+                  SetStencilBndry(A, readgrid, readperiodic);
+               }
                HYPRE_StructMatrixAssemble(A);
             }
             /* done with one case rhs=1 x0 = 0 */
@@ -1181,16 +1282,16 @@ main( hypre_int argc,
                hypre_printf("\ninitial x0 from file prefix :%s\n",
                             argv[read_x0fromfile_index]);
 
-               x = (HYPRE_StructVector)
-                  hypre_StructVectorRead(hypre_MPI_COMM_WORLD,
-                                         argv[read_x0fromfile_index],v_num_ghost);
+               HYPRE_StructVectorRead(hypre_MPI_COMM_WORLD,
+                                      argv[read_x0fromfile_index],
+                                      v_num_ghost, &x);
 
                readgrid = hypre_StructVectorGrid(x) ;
                readperiodic = hypre_StructGridPeriodic(readgrid);
 
                HYPRE_StructVectorCreate(hypre_MPI_COMM_WORLD, readgrid, &b);
                HYPRE_StructVectorInitialize(b);
-               AddValuesVector(readgrid,b,readperiodic,1.0);
+               AddValuesVector(readgrid, b, readperiodic, 1.0);
 
                HYPRE_StructVectorAssemble(b);
 
@@ -1203,12 +1304,14 @@ main( hypre_int argc,
                 * Fill in the matrix elements
                 *-----------------------------------------------------------*/
 
-               AddValuesMatrix(A,readgrid,cx,cy,cz,conx,cony,conz);
+               AddValuesMatrix(A, readgrid, cx, cy, cz, conx, cony, conz);
 
                /* Zero out stencils reaching to real boundary */
 
                if ( constant_coefficient == 0 )
-                  SetStencilBndry(A,readgrid,readperiodic);
+               {
+                  SetStencilBndry(A, readgrid, readperiodic);
+               }
                HYPRE_StructMatrixAssemble(A);
             }
             /* done with one case rhs=0 x0 = 1  */
@@ -1224,17 +1327,15 @@ main( hypre_int argc,
                hypre_printf("\ninitial x0  from file prefix :%s\n",
                             argv[read_x0fromfile_index]);
 
-               b = (HYPRE_StructVector)
-                  hypre_StructVectorRead(hypre_MPI_COMM_WORLD,
-                                         argv[read_rhsfromfile_index],
-                                         v_num_ghost);
+               HYPRE_StructVectorRead(hypre_MPI_COMM_WORLD,
+                                      argv[read_rhsfromfile_index],
+                                      v_num_ghost, &b);
 
-               x = (HYPRE_StructVector)
-                  hypre_StructVectorRead(hypre_MPI_COMM_WORLD,
-                                         argv[read_x0fromfile_index],
-                                         v_num_ghost);
+               HYPRE_StructVectorRead(hypre_MPI_COMM_WORLD,
+                                      argv[read_x0fromfile_index],
+                                      v_num_ghost, &x);
 
-               readgrid= hypre_StructVectorGrid(b) ;
+               readgrid = hypre_StructVectorGrid(b) ;
                readperiodic = hypre_StructGridPeriodic(readgrid);
 
                HYPRE_StructMatrixCreate(hypre_MPI_COMM_WORLD,
@@ -1246,12 +1347,14 @@ main( hypre_int argc,
                 * Fill in the matrix elements
                 *-----------------------------------------------------------*/
 
-               AddValuesMatrix(A,readgrid,cx,cy,cz,conx,cony,conz);
+               AddValuesMatrix(A, readgrid, cx, cy, cz, conx, cony, conz);
 
                /* Zero out stencils reaching to real boundary */
 
                if ( constant_coefficient == 0 )
-                  SetStencilBndry(A,readgrid,readperiodic);
+               {
+                  SetStencilBndry(A, readgrid, readperiodic);
+               }
                HYPRE_StructMatrixAssemble(A);
             }
             /* done with one case rhs=1 x0 = 1  */
@@ -1263,9 +1366,9 @@ main( hypre_int argc,
             hypre_printf("\nreading matrix from file:%s\n",
                          argv[read_fromfile_index]);
 
-            A = (HYPRE_StructMatrix)
-               hypre_StructMatrixRead(hypre_MPI_COMM_WORLD,
-                                      argv[read_fromfile_index], A_num_ghost);
+            HYPRE_StructMatrixRead(hypre_MPI_COMM_WORLD,
+                                   argv[read_fromfile_index],
+                                   A_num_ghost, &A);
 
             readgrid = hypre_StructMatrixGrid(A);
             readperiodic  =  hypre_StructGridPeriodic(readgrid);
@@ -1276,14 +1379,13 @@ main( hypre_int argc,
                hypre_printf("\ninitial rhs from file prefix :%s\n",
                             argv[read_rhsfromfile_index]);
 
-               b = (HYPRE_StructVector)
-                  hypre_StructVectorRead(hypre_MPI_COMM_WORLD,
-                                         argv[read_rhsfromfile_index],
-                                         v_num_ghost);
+               HYPRE_StructVectorRead(hypre_MPI_COMM_WORLD,
+                                      argv[read_rhsfromfile_index],
+                                      v_num_ghost, &b);
 
-               HYPRE_StructVectorCreate(hypre_MPI_COMM_WORLD, readgrid,&x);
+               HYPRE_StructVectorCreate(hypre_MPI_COMM_WORLD, readgrid, &x);
                HYPRE_StructVectorInitialize(x);
-               AddValuesVector(readgrid,x,periodx0,0.0);
+               AddValuesVector(readgrid, x, periodx0, 0.0);
                HYPRE_StructVectorAssemble(x);
             }
 
@@ -1293,14 +1395,13 @@ main( hypre_int argc,
                hypre_printf("\ninitial x0 from file prefix :%s\n",
                             argv[read_x0fromfile_index]);
 
-               x = (HYPRE_StructVector)
-                  hypre_StructVectorRead(hypre_MPI_COMM_WORLD,
-                                         argv[read_x0fromfile_index],
-                                         v_num_ghost);
+               HYPRE_StructVectorRead(hypre_MPI_COMM_WORLD,
+                                      argv[read_x0fromfile_index],
+                                      v_num_ghost, &x);
 
                HYPRE_StructVectorCreate(hypre_MPI_COMM_WORLD, readgrid, &b);
                HYPRE_StructVectorInitialize(b);
-               AddValuesVector(readgrid,b,readperiodic,1.0);
+               AddValuesVector(readgrid, b, readperiodic, 1.0);
                HYPRE_StructVectorAssemble(b);
             }
 
@@ -1309,13 +1410,13 @@ main( hypre_int argc,
                /* construct x0 , construct b*/
                HYPRE_StructVectorCreate(hypre_MPI_COMM_WORLD, readgrid, &b);
                HYPRE_StructVectorInitialize(b);
-               AddValuesVector(readgrid,b,readperiodic,1.0);
+               AddValuesVector(readgrid, b, readperiodic, 1.0);
                HYPRE_StructVectorAssemble(b);
 
 
                HYPRE_StructVectorCreate(hypre_MPI_COMM_WORLD, readgrid, &x);
                HYPRE_StructVectorInitialize(x);
-               AddValuesVector(readgrid,x,periodx0,0.0);
+               AddValuesVector(readgrid, x, periodx0, 0.0);
                HYPRE_StructVectorAssemble(x);
             }
          }
@@ -1326,12 +1427,14 @@ main( hypre_int argc,
       /* linear system complete  */
 
       hypre_EndTiming(time_index);
-      if ( reps==1 ) {
+      if ( reps == 1 || (solver_id != 0 && solver_id != 1 && solver_id != 3 && solver_id != 4) )
+      {
          hypre_PrintTiming("Struct Interface", hypre_MPI_COMM_WORLD);
          hypre_FinalizeTiming(time_index);
          hypre_ClearTiming();
       }
-      else if ( rep==reps-1 ) {
+      else if ( rep == reps - 1 )
+      {
          hypre_FinalizeTiming(time_index);
       }
 
@@ -1364,10 +1467,10 @@ main( hypre_int argc,
          HYPRE_StructSMGSetRelChange(solver, 0);
          HYPRE_StructSMGSetNumPreRelax(solver, n_pre);
          HYPRE_StructSMGSetNumPostRelax(solver, n_post);
-         HYPRE_StructSMGSetPrintLevel(solver, 1);
+         HYPRE_StructSMGSetPrintLevel(solver, solver_print_level);
          HYPRE_StructSMGSetLogging(solver, 1);
 #if 0//defined(HYPRE_USING_CUDA)
-         HYPRE_StructSMGSetDeviceLevel(solver,device_level);
+         HYPRE_StructSMGSetDeviceLevel(solver, device_level);
 #endif
 
 #if 0//defined(HYPRE_USING_CUDA)
@@ -1380,12 +1483,14 @@ main( hypre_int argc,
 #endif
 
          hypre_EndTiming(time_index);
-         if ( reps==1 ) {
+         if ( reps == 1 )
+         {
             hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
             hypre_FinalizeTiming(time_index);
             hypre_ClearTiming();
          }
-         else if ( rep==reps-1 ) {
+         else if ( rep == reps - 1 )
+         {
             hypre_FinalizeTiming(time_index);
          }
 
@@ -1395,12 +1500,14 @@ main( hypre_int argc,
          HYPRE_StructSMGSolve(solver, A, b, x);
 
          hypre_EndTiming(time_index);
-         if ( reps==1 ) {
+         if ( reps == 1 )
+         {
             hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
             hypre_FinalizeTiming(time_index);
             hypre_ClearTiming();
          }
-         else if ( rep==reps-1 ) {
+         else if ( rep == reps - 1 )
+         {
             hypre_PrintTiming("Interface, Setup, and Solve times:",
                               hypre_MPI_COMM_WORLD );
             hypre_FinalizeTiming(time_index);
@@ -1436,22 +1543,24 @@ main( hypre_int argc,
          HYPRE_StructPFMGSetNumPostRelax(solver, n_post);
          HYPRE_StructPFMGSetSkipRelax(solver, skip);
          /*HYPRE_StructPFMGSetDxyz(solver, dxyz);*/
-         HYPRE_StructPFMGSetPrintLevel(solver, 1);
+         HYPRE_StructPFMGSetPrintLevel(solver, solver_print_level);
          HYPRE_StructPFMGSetLogging(solver, 1);
 
 #if 0//defined(HYPRE_USING_CUDA)
-         HYPRE_StructPFMGSetDeviceLevel(solver,device_level);
+         HYPRE_StructPFMGSetDeviceLevel(solver, device_level);
 #endif
 
          HYPRE_StructPFMGSetup(solver, A, b, x);
 
          hypre_EndTiming(time_index);
-         if ( reps==1 ) {
+         if ( reps == 1 )
+         {
             hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
             hypre_FinalizeTiming(time_index);
             hypre_ClearTiming();
          }
-         else if ( rep==reps-1 ) {
+         else if ( rep == reps - 1 )
+         {
             hypre_FinalizeTiming(time_index);
          }
 
@@ -1462,12 +1571,14 @@ main( hypre_int argc,
          HYPRE_StructPFMGSolve(solver, A, b, x);
 
          hypre_EndTiming(time_index);
-         if ( reps==1 ) {
+         if ( reps == 1 )
+         {
             hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
             hypre_FinalizeTiming(time_index);
             hypre_ClearTiming();
          }
-         else if ( rep==reps-1 ) {
+         else if ( rep == reps - 1 )
+         {
             hypre_PrintTiming("Interface, Setup, and Solve times",
                               hypre_MPI_COMM_WORLD);
             hypre_FinalizeTiming(time_index);
@@ -1500,7 +1611,7 @@ main( hypre_int argc,
          }
          HYPRE_StructSparseMSGSetNumPreRelax(solver, n_pre);
          HYPRE_StructSparseMSGSetNumPostRelax(solver, n_post);
-         HYPRE_StructSparseMSGSetPrintLevel(solver, 1);
+         HYPRE_StructSparseMSGSetPrintLevel(solver, solver_print_level);
          HYPRE_StructSparseMSGSetLogging(solver, 1);
          HYPRE_StructSparseMSGSetup(solver, A, b, x);
 
@@ -1573,7 +1684,7 @@ main( hypre_int argc,
          HYPRE_PCGSetTol( (HYPRE_Solver)solver, tol );
          HYPRE_PCGSetTwoNorm( (HYPRE_Solver)solver, 1 );
          HYPRE_PCGSetRelChange( (HYPRE_Solver)solver, 0 );
-         HYPRE_PCGSetPrintLevel( (HYPRE_Solver)solver, 1 );
+         HYPRE_PCGSetPrintLevel( (HYPRE_Solver)solver, solver_print_level );
 
          if (solver_id == 10)
          {
@@ -1585,7 +1696,7 @@ main( hypre_int argc,
             HYPRE_StructSMGSetZeroGuess(precond);
             HYPRE_StructSMGSetNumPreRelax(precond, n_pre);
             HYPRE_StructSMGSetNumPostRelax(precond, n_post);
-            HYPRE_StructSMGSetPrintLevel(precond, 0);
+            HYPRE_StructSMGSetPrintLevel(precond, prec_print_level);
             HYPRE_StructSMGSetLogging(precond, 0);
 
 #if 0//defined(HYPRE_USING_CUDA)
@@ -1614,10 +1725,10 @@ main( hypre_int argc,
             HYPRE_StructPFMGSetNumPostRelax(precond, n_post);
             HYPRE_StructPFMGSetSkipRelax(precond, skip);
             /*HYPRE_StructPFMGSetDxyz(precond, dxyz);*/
-            HYPRE_StructPFMGSetPrintLevel(precond, 0);
+            HYPRE_StructPFMGSetPrintLevel(precond, prec_print_level);
             HYPRE_StructPFMGSetLogging(precond, 0);
 #if 0//defined(HYPRE_USING_CUDA)
-            HYPRE_StructPFMGSetDeviceLevel(precond,device_level);
+            HYPRE_StructPFMGSetDeviceLevel(precond, device_level);
 #endif
             HYPRE_PCGSetPrecond( (HYPRE_Solver) solver,
                                  (HYPRE_PtrToSolverFcn) HYPRE_StructPFMGSolve,
@@ -1640,7 +1751,7 @@ main( hypre_int argc,
             }
             HYPRE_StructSparseMSGSetNumPreRelax(precond, n_pre);
             HYPRE_StructSparseMSGSetNumPostRelax(precond, n_post);
-            HYPRE_StructSparseMSGSetPrintLevel(precond, 0);
+            HYPRE_StructSparseMSGSetPrintLevel(precond, prec_print_level);
             HYPRE_StructSparseMSGSetLogging(precond, 0);
             HYPRE_PCGSetPrecond( (HYPRE_Solver) solver,
                                  (HYPRE_PtrToSolverFcn) HYPRE_StructSparseMSGSolve,
@@ -1719,7 +1830,8 @@ main( hypre_int argc,
        * Solve the system using LOBPCG
        *-----------------------------------------------------------*/
 
-      if ( lobpcgFlag ) {
+      if ( lobpcgFlag )
+      {
 
          interpreter = hypre_CTAlloc(mv_InterfaceInterpreter, 1, HYPRE_MEMORY_HOST);
 
@@ -1727,9 +1839,12 @@ main( hypre_int argc,
          HYPRE_StructSetupMatvec(&matvec_fn);
 
          if (myid != 0)
+         {
             verbosity = 0;
+         }
 
-         if ( pcgIterations > 0 ) {
+         if ( pcgIterations > 0 )
+         {
 
             time_index = hypre_InitializeTiming("PCG Setup");
             hypre_BeginTiming(time_index);
@@ -1739,7 +1854,7 @@ main( hypre_int argc,
             HYPRE_PCGSetTol( (HYPRE_Solver)solver, pcgTol );
             HYPRE_PCGSetTwoNorm( (HYPRE_Solver)solver, 1 );
             HYPRE_PCGSetRelChange( (HYPRE_Solver)solver, 0 );
-            HYPRE_PCGSetPrintLevel( (HYPRE_Solver)solver, 0 );
+            HYPRE_PCGSetPrintLevel( (HYPRE_Solver)solver, solver_print_level );
 
             if (solver_id == 10)
             {
@@ -1751,7 +1866,7 @@ main( hypre_int argc,
                HYPRE_StructSMGSetZeroGuess(precond);
                HYPRE_StructSMGSetNumPreRelax(precond, n_pre);
                HYPRE_StructSMGSetNumPostRelax(precond, n_post);
-               HYPRE_StructSMGSetPrintLevel(precond, 0);
+               HYPRE_StructSMGSetPrintLevel(precond, prec_print_level);
                HYPRE_StructSMGSetLogging(precond, 0);
 #if 0 //defined(HYPRE_USING_CUDA)
                HYPRE_StructSMGSetDeviceLevel(precond, device_level);
@@ -1779,7 +1894,7 @@ main( hypre_int argc,
                HYPRE_StructPFMGSetNumPostRelax(precond, n_post);
                HYPRE_StructPFMGSetSkipRelax(precond, skip);
                /*HYPRE_StructPFMGSetDxyz(precond, dxyz);*/
-               HYPRE_StructPFMGSetPrintLevel(precond, 0);
+               HYPRE_StructPFMGSetPrintLevel(precond, prec_print_level);
                HYPRE_StructPFMGSetLogging(precond, 0);
 #if 0 //defined(HYPRE_USING_CUDA)
                HYPRE_StructPFMGSetDeviceLevel(precond, device_level);
@@ -1805,7 +1920,7 @@ main( hypre_int argc,
                }
                HYPRE_StructSparseMSGSetNumPreRelax(precond, n_pre);
                HYPRE_StructSparseMSGSetNumPostRelax(precond, n_post);
-               HYPRE_StructSparseMSGSetPrintLevel(precond, 0);
+               HYPRE_StructSparseMSGSetPrintLevel(precond, prec_print_level);
                HYPRE_StructSparseMSGSetLogging(precond, 0);
                HYPRE_PCGSetPrecond( (HYPRE_Solver) solver,
                                     (HYPRE_PtrToSolverFcn) HYPRE_StructSparseMSGSolve,
@@ -1838,7 +1953,9 @@ main( hypre_int argc,
             else if (solver_id != NO_SOLVER )
             {
                if ( verbosity )
+               {
                   hypre_printf("Solver ID not recognized - running inner PCG iterations without preconditioner\n\n");
+               }
             }
 
             hypre_EndTiming(time_index);
@@ -1866,9 +1983,13 @@ main( hypre_int argc,
             eigenvalues = hypre_CTAlloc(HYPRE_Real,  blockSize, HYPRE_MEMORY_HOST);
 
             if ( lobpcgSeed )
+            {
                mv_MultiVectorSetRandom( eigenvectors, lobpcgSeed );
+            }
             else
+            {
                mv_MultiVectorSetRandom( eigenvectors, (HYPRE_Int)time(0) );
+            }
 
             time_index = hypre_InitializeTiming("LOBPCG Solve");
             hypre_BeginTiming(time_index);
@@ -1881,7 +2002,8 @@ main( hypre_int argc,
             hypre_FinalizeTiming(time_index);
             hypre_ClearTiming();
 
-            if ( checkOrtho ) {
+            if ( checkOrtho )
+            {
 
                gramXX = utilities_FortranMatrixCreate();
                identity = utilities_FortranMatrixCreate();
@@ -1894,33 +2016,44 @@ main( hypre_int argc,
                utilities_FortranMatrixAdd( -1, identity, gramXX, gramXX );
                nonOrthF = utilities_FortranMatrixFNorm( gramXX );
                if ( myid == 0 )
+               {
                   hypre_printf("Non-orthonormality of eigenvectors: %12.5e\n", nonOrthF);
+               }
 
                utilities_FortranMatrixDestroy( gramXX );
                utilities_FortranMatrixDestroy( identity );
 
             }
 
-            if ( printLevel ) {
+            if ( printLevel )
+            {
 
-               if ( myid == 0 ) {
-                  if ( (filePtr = fopen("values.txt", "w")) ) {
+               if ( myid == 0 )
+               {
+                  if ( (filePtr = fopen("values.txt", "w")) )
+                  {
                      hypre_fprintf(filePtr, "%d\n", blockSize);
                      for ( i = 0; i < blockSize; i++ )
+                     {
                         hypre_fprintf(filePtr, "%22.14e\n", eigenvalues[i]);
+                     }
                      fclose(filePtr);
                   }
 
-                  if ( (filePtr = fopen("residuals.txt", "w")) ) {
+                  if ( (filePtr = fopen("residuals.txt", "w")) )
+                  {
                      residualNorms = HYPRE_LOBPCGResidualNorms( (HYPRE_Solver)lobpcg_solver );
                      residuals = utilities_FortranMatrixValues( residualNorms );
                      hypre_fprintf(filePtr, "%d\n", blockSize);
                      for ( i = 0; i < blockSize; i++ )
+                     {
                         hypre_fprintf(filePtr, "%22.14e\n", residuals[i]);
+                     }
                      fclose(filePtr);
                   }
 
-                  if ( printLevel > 1 ) {
+                  if ( printLevel > 1 )
+                  {
 
                      printBuffer = utilities_FortranMatrixCreate();
 
@@ -1984,7 +2117,7 @@ main( hypre_int argc,
                HYPRE_StructSMGSetZeroGuess(precond);
                HYPRE_StructSMGSetNumPreRelax(precond, n_pre);
                HYPRE_StructSMGSetNumPostRelax(precond, n_post);
-               HYPRE_StructSMGSetPrintLevel(precond, 0);
+               HYPRE_StructSMGSetPrintLevel(precond, prec_print_level);
                HYPRE_StructSMGSetLogging(precond, 0);
 #if 0 //defined(HYPRE_USING_CUDA)
                HYPRE_StructSMGSetDeviceLevel(precond, device_level);
@@ -2012,7 +2145,7 @@ main( hypre_int argc,
                HYPRE_StructPFMGSetNumPostRelax(precond, n_post);
                HYPRE_StructPFMGSetSkipRelax(precond, skip);
                /*HYPRE_StructPFMGSetDxyz(precond, dxyz);*/
-               HYPRE_StructPFMGSetPrintLevel(precond, 0);
+               HYPRE_StructPFMGSetPrintLevel(precond, prec_print_level);
                HYPRE_StructPFMGSetLogging(precond, 0);
 #if 0 //defined(HYPRE_USING_CUDA)
                HYPRE_StructPFMGSetDeviceLevel(precond, device_level);
@@ -2038,7 +2171,7 @@ main( hypre_int argc,
                }
                HYPRE_StructSparseMSGSetNumPreRelax(precond, n_pre);
                HYPRE_StructSparseMSGSetNumPostRelax(precond, n_post);
-               HYPRE_StructSparseMSGSetPrintLevel(precond, 0);
+               HYPRE_StructSparseMSGSetPrintLevel(precond, prec_print_level);
                HYPRE_StructSparseMSGSetLogging(precond, 0);
                HYPRE_LOBPCGSetPrecond( (HYPRE_Solver) solver,
                                        (HYPRE_PtrToSolverFcn) HYPRE_StructSparseMSGSolve,
@@ -2071,11 +2204,13 @@ main( hypre_int argc,
             else if (solver_id != NO_SOLVER )
             {
                if ( verbosity )
+               {
                   hypre_printf("Solver ID not recognized - running LOBPCG without preconditioner\n\n");
+               }
             }
 
             HYPRE_LOBPCGSetup
-               ( (HYPRE_Solver)solver, (HYPRE_Matrix)A, (HYPRE_Vector)b, (HYPRE_Vector)x );
+            ( (HYPRE_Solver)solver, (HYPRE_Matrix)A, (HYPRE_Vector)b, (HYPRE_Vector)x );
 
             hypre_EndTiming(time_index);
             hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
@@ -2088,22 +2223,27 @@ main( hypre_int argc,
             eigenvalues = hypre_CTAlloc(HYPRE_Real,  blockSize, HYPRE_MEMORY_HOST);
 
             if ( lobpcgSeed )
+            {
                mv_MultiVectorSetRandom( eigenvectors, lobpcgSeed );
+            }
             else
+            {
                mv_MultiVectorSetRandom( eigenvectors, (HYPRE_Int)time(0) );
+            }
 
             time_index = hypre_InitializeTiming("PCG Solve");
             hypre_BeginTiming(time_index);
 
             HYPRE_LOBPCGSolve
-               ( (HYPRE_Solver)solver, constrains, eigenvectors, eigenvalues );
+            ( (HYPRE_Solver)solver, constrains, eigenvectors, eigenvalues );
 
             hypre_EndTiming(time_index);
             hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
             hypre_FinalizeTiming(time_index);
             hypre_ClearTiming();
 
-            if ( checkOrtho ) {
+            if ( checkOrtho )
+            {
 
                gramXX = utilities_FortranMatrixCreate();
                identity = utilities_FortranMatrixCreate();
@@ -2116,33 +2256,44 @@ main( hypre_int argc,
                utilities_FortranMatrixAdd( -1, identity, gramXX, gramXX );
                nonOrthF = utilities_FortranMatrixFNorm( gramXX );
                if ( myid == 0 )
+               {
                   hypre_printf("Non-orthonormality of eigenvectors: %12.5e\n", nonOrthF);
+               }
 
                utilities_FortranMatrixDestroy( gramXX );
                utilities_FortranMatrixDestroy( identity );
 
             }
 
-            if ( printLevel ) {
+            if ( printLevel )
+            {
 
-               if ( myid == 0 ) {
-                  if ( (filePtr = fopen("values.txt", "w")) ) {
+               if ( myid == 0 )
+               {
+                  if ( (filePtr = fopen("values.txt", "w")) )
+                  {
                      hypre_fprintf(filePtr, "%d\n", blockSize);
                      for ( i = 0; i < blockSize; i++ )
+                     {
                         hypre_fprintf(filePtr, "%22.14e\n", eigenvalues[i]);
+                     }
                      fclose(filePtr);
                   }
 
-                  if ( (filePtr = fopen("residuals.txt", "w")) ) {
+                  if ( (filePtr = fopen("residuals.txt", "w")) )
+                  {
                      residualNorms = HYPRE_LOBPCGResidualNorms( (HYPRE_Solver)solver );
                      residuals = utilities_FortranMatrixValues( residualNorms );
                      hypre_fprintf(filePtr, "%d\n", blockSize);
                      for ( i = 0; i < blockSize; i++ )
+                     {
                         hypre_fprintf(filePtr, "%22.14e\n", residuals[i]);
+                     }
                      fclose(filePtr);
                   }
 
-                  if ( printLevel > 1 ) {
+                  if ( printLevel > 1 )
+                  {
 
                      printBuffer = utilities_FortranMatrixCreate();
 
@@ -2186,7 +2337,7 @@ main( hypre_int argc,
             hypre_TFree(eigenvalues, HYPRE_MEMORY_HOST);
          }
 
-         hypre_TFree( interpreter , HYPRE_MEMORY_HOST);
+         hypre_TFree( interpreter, HYPRE_MEMORY_HOST);
 
       }
 
@@ -2214,7 +2365,7 @@ main( hypre_int argc,
             HYPRE_StructHybridSetStopCrit(solver, 0);
             HYPRE_StructHybridSetKDim(solver, 10);
          }
-         HYPRE_StructHybridSetPrintLevel(solver, 1);
+         HYPRE_StructHybridSetPrintLevel(solver, solver_print_level);
          HYPRE_StructHybridSetLogging(solver, 1);
          HYPRE_StructHybridSetSolverType(solver, solver_type);
          HYPRE_StructHybridSetRecomputeResidual(solver, recompute_res);
@@ -2229,7 +2380,7 @@ main( hypre_int argc,
             HYPRE_StructSMGSetZeroGuess(precond);
             HYPRE_StructSMGSetNumPreRelax(precond, n_pre);
             HYPRE_StructSMGSetNumPostRelax(precond, n_post);
-            HYPRE_StructSMGSetPrintLevel(precond, 0);
+            HYPRE_StructSMGSetPrintLevel(precond, prec_print_level);
             HYPRE_StructSMGSetLogging(precond, 0);
 #if 0 //defined(HYPRE_USING_CUDA)
             HYPRE_StructSMGSetDeviceLevel(precond, device_level);
@@ -2257,7 +2408,7 @@ main( hypre_int argc,
             HYPRE_StructPFMGSetNumPostRelax(precond, n_post);
             HYPRE_StructPFMGSetSkipRelax(precond, skip);
             /*HYPRE_StructPFMGSetDxyz(precond, dxyz);*/
-            HYPRE_StructPFMGSetPrintLevel(precond, 0);
+            HYPRE_StructPFMGSetPrintLevel(precond, prec_print_level);
             HYPRE_StructPFMGSetLogging(precond, 0);
 #if 0 //defined(HYPRE_USING_CUDA)
             HYPRE_StructPFMGSetDeviceLevel(precond, device_level);
@@ -2283,7 +2434,7 @@ main( hypre_int argc,
             }
             HYPRE_StructSparseMSGSetNumPreRelax(precond, n_pre);
             HYPRE_StructSparseMSGSetNumPostRelax(precond, n_post);
-            HYPRE_StructSparseMSGSetPrintLevel(precond, 0);
+            HYPRE_StructSparseMSGSetPrintLevel(precond, prec_print_level);
             HYPRE_StructSparseMSGSetLogging(precond, 0);
             HYPRE_StructHybridSetPrecond(solver,
                                          HYPRE_StructSparseMSGSolve,
@@ -2340,7 +2491,7 @@ main( hypre_int argc,
          HYPRE_GMRESSetMaxIter( (HYPRE_Solver)solver, 100 );
          HYPRE_GMRESSetTol( (HYPRE_Solver)solver, tol );
          HYPRE_GMRESSetRelChange( (HYPRE_Solver)solver, 0 );
-         HYPRE_GMRESSetPrintLevel( (HYPRE_Solver)solver, 1 );
+         HYPRE_GMRESSetPrintLevel( (HYPRE_Solver)solver, solver_print_level );
          HYPRE_GMRESSetLogging( (HYPRE_Solver)solver, 1 );
 
          if (solver_id == 30)
@@ -2353,7 +2504,7 @@ main( hypre_int argc,
             HYPRE_StructSMGSetZeroGuess(precond);
             HYPRE_StructSMGSetNumPreRelax(precond, n_pre);
             HYPRE_StructSMGSetNumPostRelax(precond, n_post);
-            HYPRE_StructSMGSetPrintLevel(precond, 0);
+            HYPRE_StructSMGSetPrintLevel(precond, prec_print_level);
             HYPRE_StructSMGSetLogging(precond, 0);
 #if 0 //defined(HYPRE_USING_CUDA)
             HYPRE_StructSMGSetDeviceLevel(precond, device_level);
@@ -2381,7 +2532,7 @@ main( hypre_int argc,
             HYPRE_StructPFMGSetNumPostRelax(precond, n_post);
             HYPRE_StructPFMGSetSkipRelax(precond, skip);
             /*HYPRE_StructPFMGSetDxyz(precond, dxyz);*/
-            HYPRE_StructPFMGSetPrintLevel(precond, 0);
+            HYPRE_StructPFMGSetPrintLevel(precond, prec_print_level);
             HYPRE_StructPFMGSetLogging(precond, 0);
 #if 0 //defined(HYPRE_USING_CUDA)
             HYPRE_StructPFMGSetDeviceLevel(precond, device_level);
@@ -2407,7 +2558,7 @@ main( hypre_int argc,
             }
             HYPRE_StructSparseMSGSetNumPreRelax(precond, n_pre);
             HYPRE_StructSparseMSGSetNumPostRelax(precond, n_post);
-            HYPRE_StructSparseMSGSetPrintLevel(precond, 0);
+            HYPRE_StructSparseMSGSetPrintLevel(precond, prec_print_level);
             HYPRE_StructSparseMSGSetLogging(precond, 0);
             HYPRE_GMRESSetPrecond( (HYPRE_Solver)solver,
                                    (HYPRE_PtrToSolverFcn) HYPRE_StructSparseMSGSolve,
@@ -2439,7 +2590,7 @@ main( hypre_int argc,
          }
 
          HYPRE_GMRESSetup
-            ( (HYPRE_Solver)solver, (HYPRE_Matrix)A, (HYPRE_Vector)b, (HYPRE_Vector)x );
+         ( (HYPRE_Solver)solver, (HYPRE_Matrix)A, (HYPRE_Vector)b, (HYPRE_Vector)x );
 
          hypre_EndTiming(time_index);
          hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
@@ -2450,7 +2601,7 @@ main( hypre_int argc,
          hypre_BeginTiming(time_index);
 
          HYPRE_GMRESSolve
-            ( (HYPRE_Solver)solver, (HYPRE_Matrix)A, (HYPRE_Vector)b, (HYPRE_Vector)x);
+         ( (HYPRE_Solver)solver, (HYPRE_Matrix)A, (HYPRE_Vector)b, (HYPRE_Vector)x);
 
          hypre_EndTiming(time_index);
          hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
@@ -2491,7 +2642,7 @@ main( hypre_int argc,
          HYPRE_StructBiCGSTABCreate(hypre_MPI_COMM_WORLD, &solver);
          HYPRE_BiCGSTABSetMaxIter( (HYPRE_Solver)solver, 100 );
          HYPRE_BiCGSTABSetTol( (HYPRE_Solver)solver, tol );
-         HYPRE_BiCGSTABSetPrintLevel( (HYPRE_Solver)solver, 1 );
+         HYPRE_BiCGSTABSetPrintLevel( (HYPRE_Solver)solver, solver_print_level );
          HYPRE_BiCGSTABSetLogging( (HYPRE_Solver)solver, 1 );
 
          if (solver_id == 40)
@@ -2504,7 +2655,7 @@ main( hypre_int argc,
             HYPRE_StructSMGSetZeroGuess(precond);
             HYPRE_StructSMGSetNumPreRelax(precond, n_pre);
             HYPRE_StructSMGSetNumPostRelax(precond, n_post);
-            HYPRE_StructSMGSetPrintLevel(precond, 0);
+            HYPRE_StructSMGSetPrintLevel(precond, prec_print_level);
             HYPRE_StructSMGSetLogging(precond, 0);
 #if 0 //defined(HYPRE_USING_CUDA)
             HYPRE_StructSMGSetDeviceLevel(precond, device_level);
@@ -2532,7 +2683,7 @@ main( hypre_int argc,
             HYPRE_StructPFMGSetNumPostRelax(precond, n_post);
             HYPRE_StructPFMGSetSkipRelax(precond, skip);
             /*HYPRE_StructPFMGSetDxyz(precond, dxyz);*/
-            HYPRE_StructPFMGSetPrintLevel(precond, 0);
+            HYPRE_StructPFMGSetPrintLevel(precond, prec_print_level);
             HYPRE_StructPFMGSetLogging(precond, 0);
 #if 0 //defined(HYPRE_USING_CUDA)
             HYPRE_StructPFMGSetDeviceLevel(precond, device_level);
@@ -2558,7 +2709,7 @@ main( hypre_int argc,
             }
             HYPRE_StructSparseMSGSetNumPreRelax(precond, n_pre);
             HYPRE_StructSparseMSGSetNumPostRelax(precond, n_post);
-            HYPRE_StructSparseMSGSetPrintLevel(precond, 0);
+            HYPRE_StructSparseMSGSetPrintLevel(precond, prec_print_level);
             HYPRE_StructSparseMSGSetLogging(precond, 0);
             HYPRE_BiCGSTABSetPrecond( (HYPRE_Solver)solver,
                                       (HYPRE_PtrToSolverFcn) HYPRE_StructSparseMSGSolve,
@@ -2590,7 +2741,7 @@ main( hypre_int argc,
          }
 
          HYPRE_BiCGSTABSetup
-            ( (HYPRE_Solver)solver, (HYPRE_Matrix)A, (HYPRE_Vector)b, (HYPRE_Vector)x );
+         ( (HYPRE_Solver)solver, (HYPRE_Matrix)A, (HYPRE_Vector)b, (HYPRE_Vector)x );
 
          hypre_EndTiming(time_index);
          hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
@@ -2601,7 +2752,7 @@ main( hypre_int argc,
          hypre_BeginTiming(time_index);
 
          HYPRE_BiCGSTABSolve
-            ( (HYPRE_Solver)solver, (HYPRE_Matrix)A, (HYPRE_Vector)b, (HYPRE_Vector)x);
+         ( (HYPRE_Solver)solver, (HYPRE_Matrix)A, (HYPRE_Vector)b, (HYPRE_Vector)x);
 
          hypre_EndTiming(time_index);
          hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
@@ -2642,7 +2793,7 @@ main( hypre_int argc,
          HYPRE_LGMRESSetKDim( (HYPRE_Solver) solver, 5 );
          HYPRE_LGMRESSetMaxIter( (HYPRE_Solver)solver, 100 );
          HYPRE_LGMRESSetTol( (HYPRE_Solver)solver, tol );
-         HYPRE_LGMRESSetPrintLevel( (HYPRE_Solver)solver, 1 );
+         HYPRE_LGMRESSetPrintLevel( (HYPRE_Solver)solver, solver_print_level );
          HYPRE_LGMRESSetLogging( (HYPRE_Solver)solver, 1 );
 
          if (solver_id == 50)
@@ -2655,7 +2806,7 @@ main( hypre_int argc,
             HYPRE_StructSMGSetZeroGuess(precond);
             HYPRE_StructSMGSetNumPreRelax(precond, n_pre);
             HYPRE_StructSMGSetNumPostRelax(precond, n_post);
-            HYPRE_StructSMGSetPrintLevel(precond, 0);
+            HYPRE_StructSMGSetPrintLevel(precond, prec_print_level);
             HYPRE_StructSMGSetLogging(precond, 0);
 #if 0 //defined(HYPRE_USING_CUDA)
             HYPRE_StructSMGSetDeviceLevel(precond, device_level);
@@ -2683,7 +2834,7 @@ main( hypre_int argc,
             HYPRE_StructPFMGSetNumPostRelax(precond, n_post);
             HYPRE_StructPFMGSetSkipRelax(precond, skip);
             /*HYPRE_StructPFMGSetDxyz(precond, dxyz);*/
-            HYPRE_StructPFMGSetPrintLevel(precond, 0);
+            HYPRE_StructPFMGSetPrintLevel(precond, prec_print_level);
             HYPRE_StructPFMGSetLogging(precond, 0);
 #if 0 //defined(HYPRE_USING_CUDA)
             HYPRE_StructPFMGSetDeviceLevel(precond, device_level);
@@ -2695,7 +2846,7 @@ main( hypre_int argc,
          }
 
          HYPRE_LGMRESSetup
-            ( (HYPRE_Solver)solver, (HYPRE_Matrix)A, (HYPRE_Vector)b, (HYPRE_Vector)x );
+         ( (HYPRE_Solver)solver, (HYPRE_Matrix)A, (HYPRE_Vector)b, (HYPRE_Vector)x );
 
          hypre_EndTiming(time_index);
          hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
@@ -2706,7 +2857,7 @@ main( hypre_int argc,
          hypre_BeginTiming(time_index);
 
          HYPRE_LGMRESSolve
-            ( (HYPRE_Solver)solver, (HYPRE_Matrix)A, (HYPRE_Vector)b, (HYPRE_Vector)x);
+         ( (HYPRE_Solver)solver, (HYPRE_Matrix)A, (HYPRE_Vector)b, (HYPRE_Vector)x);
 
          hypre_EndTiming(time_index);
          hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
@@ -2740,7 +2891,7 @@ main( hypre_int argc,
          HYPRE_FlexGMRESSetKDim( (HYPRE_Solver) solver, 5 );
          HYPRE_FlexGMRESSetMaxIter( (HYPRE_Solver)solver, 100 );
          HYPRE_FlexGMRESSetTol( (HYPRE_Solver)solver, tol );
-         HYPRE_FlexGMRESSetPrintLevel( (HYPRE_Solver)solver, 1 );
+         HYPRE_FlexGMRESSetPrintLevel( (HYPRE_Solver)solver, solver_print_level );
          HYPRE_FlexGMRESSetLogging( (HYPRE_Solver)solver, 1 );
 
          if (solver_id == 60)
@@ -2753,7 +2904,7 @@ main( hypre_int argc,
             HYPRE_StructSMGSetZeroGuess(precond);
             HYPRE_StructSMGSetNumPreRelax(precond, n_pre);
             HYPRE_StructSMGSetNumPostRelax(precond, n_post);
-            HYPRE_StructSMGSetPrintLevel(precond, 0);
+            HYPRE_StructSMGSetPrintLevel(precond, prec_print_level);
             HYPRE_StructSMGSetLogging(precond, 0);
 #if 0 //defined(HYPRE_USING_CUDA)
             HYPRE_StructSMGSetDeviceLevel(precond, device_level);
@@ -2781,7 +2932,7 @@ main( hypre_int argc,
             HYPRE_StructPFMGSetNumPostRelax(precond, n_post);
             HYPRE_StructPFMGSetSkipRelax(precond, skip);
             /*HYPRE_StructPFMGSetDxyz(precond, dxyz);*/
-            HYPRE_StructPFMGSetPrintLevel(precond, 0);
+            HYPRE_StructPFMGSetPrintLevel(precond, prec_print_level);
             HYPRE_StructPFMGSetLogging(precond, 0);
 #if 0 //defined(HYPRE_USING_CUDA)
             HYPRE_StructPFMGSetDeviceLevel(precond, device_level);
@@ -2793,7 +2944,7 @@ main( hypre_int argc,
          }
 
          HYPRE_FlexGMRESSetup
-            ( (HYPRE_Solver)solver, (HYPRE_Matrix)A, (HYPRE_Vector)b, (HYPRE_Vector)x );
+         ( (HYPRE_Solver)solver, (HYPRE_Matrix)A, (HYPRE_Vector)b, (HYPRE_Vector)x );
 
          hypre_EndTiming(time_index);
          hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
@@ -2804,7 +2955,7 @@ main( hypre_int argc,
          hypre_BeginTiming(time_index);
 
          HYPRE_FlexGMRESSolve
-            ( (HYPRE_Solver)solver, (HYPRE_Matrix)A, (HYPRE_Vector)b, (HYPRE_Vector)x);
+         ( (HYPRE_Solver)solver, (HYPRE_Matrix)A, (HYPRE_Vector)b, (HYPRE_Vector)x);
 
          hypre_EndTiming(time_index);
          hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
@@ -2823,7 +2974,6 @@ main( hypre_int argc,
          {
             HYPRE_StructPFMGDestroy(precond);
          }
-
       }
 
       /*-----------------------------------------------------------
@@ -2835,7 +2985,7 @@ main( hypre_int argc,
          HYPRE_StructVectorPrint("struct.out.x", x, 0);
       }
 
-      if (myid == 0 && rep==reps-1 /* begin lobpcg */ && !lobpcgFlag /* end lobpcg */)
+      if (myid == 0 && rep == reps - 1 /* begin lobpcg */ && !lobpcgFlag /* end lobpcg */)
       {
          hypre_printf("\n");
          hypre_printf("Iterations = %d\n", num_iterations);
@@ -2855,8 +3005,8 @@ main( hypre_int argc,
          HYPRE_Int   i, imax, N;
 
          /* compute imax */
-         N = (P*nx)*(Q*ny)*(R*nz);
-         imax = (5*1000000) / N;
+         N = (P * nx) * (Q * ny) * (R * nz);
+         imax = (5 * 1000000) / N;
 
          matvec_data = hypre_StructMatvecCreate();
          hypre_StructMatvecSetup(matvec_data, A, x);
@@ -2869,7 +3019,7 @@ main( hypre_int argc,
             hypre_StructMatvecCompute(matvec_data, 1.0, A, x, 1.0, b);
          }
          /* this counts mult-adds */
-         hypre_IncFLOPCount(7*N*imax);
+         hypre_IncFLOPCount(7 * N * imax);
 
          hypre_EndTiming(time_index);
          hypre_PrintTiming("Matvec time", hypre_MPI_COMM_WORLD);
@@ -2890,7 +3040,9 @@ main( hypre_int argc,
       HYPRE_StructVectorDestroy(x);
 
       for ( i = 0; i < (dim + 1); i++)
+      {
          hypre_TFree(offsets[i], HYPRE_MEMORY_HOST);
+      }
       hypre_TFree(offsets, HYPRE_MEMORY_HOST);
    }
 
@@ -2904,6 +3056,17 @@ main( hypre_int argc,
    /* Finalize MPI */
    hypre_MPI_Finalize();
 
+#if defined(HYPRE_USING_MEMORY_TRACKER)
+   if (memory_location == HYPRE_MEMORY_HOST)
+   {
+      if (hypre_total_bytes[hypre_MEMORY_DEVICE] || hypre_total_bytes[hypre_MEMORY_UNIFIED])
+      {
+         hypre_printf("Error: nonzero GPU memory allocated with the HOST mode\n");
+         hypre_assert(0);
+      }
+   }
+#endif
+
 #if defined(HYPRE_USING_DEVICE_OPENMP)
    /* use this for the stats of the offloading counts */
    //HYPRE_OMPOffloadStatPrint();
@@ -2918,90 +3081,63 @@ main( hypre_int argc,
  *-------------------------------------------------------------------------*/
 
 HYPRE_Int
-AddValuesVector( hypre_StructGrid  *gridvector,
+AddValuesVector( hypre_StructGrid   *gridvector,
                  hypre_StructVector *zvector,
                  HYPRE_Int          *period,
-                 HYPRE_Real         value  )
+                 HYPRE_Real          value  )
 {
-/* #include  "_hypre_struct_mv.h" */
-   HYPRE_Int ierr = 0;
-   hypre_BoxArray     *gridboxes;
-   HYPRE_Int          ib;
-   hypre_IndexRef     ilower;
-   hypre_IndexRef     iupper;
-   hypre_Box          *box;
-   HYPRE_Real         *values;
-   HYPRE_Int          volume,dim;
-#if 0 //defined(HYPRE_USING_CUDA)
-   HYPRE_Int          data_location = hypre_StructGridDataLocation(hypre_StructVectorGrid(zvector));
-#endif
+   /* #include  "_hypre_struct_mv.h" */
+   HYPRE_Int            i, ierr = 0;
+   hypre_BoxArray      *gridboxes;
+   HYPRE_Int            ib;
+   hypre_IndexRef       ilower;
+   hypre_IndexRef       iupper;
+   hypre_Box           *box;
+   HYPRE_Real          *values;
+   HYPRE_Real          *values_h;
+   HYPRE_Int            volume, dim;
+   HYPRE_MemoryLocation memory_location = hypre_StructVectorMemoryLocation(zvector);
 
    gridboxes =  hypre_StructGridBoxes(gridvector);
    dim       =  hypre_StructGridNDim(gridvector);
 
-   ib=0;
+   ib = 0;
    hypre_ForBoxI(ib, gridboxes)
    {
       box      = hypre_BoxArrayBox(gridboxes, ib);
-      volume   =  hypre_BoxVolume(box);
-#if 0 //defined(HYPRE_USING_CUDA)
-      if (data_location != HYPRE_MEMORY_HOST)
-      {
-         values   = hypre_CTAlloc(HYPRE_Real, volume,HYPRE_MEMORY_DEVICE);
-      }
-      else
-      {
-         values   = hypre_CTAlloc(HYPRE_Real, volume,HYPRE_MEMORY_HOST);
-      }
-#else
-      values   = hypre_CTAlloc(HYPRE_Real, volume,HYPRE_MEMORY_DEVICE);
-#endif
+      volume   = hypre_BoxVolume(box);
+      values   = hypre_CTAlloc(HYPRE_Real, volume, memory_location);
+      values_h = hypre_CTAlloc(HYPRE_Real, volume, HYPRE_MEMORY_HOST);
+
       /*-----------------------------------------------------------
        * For periodic b.c. in all directions, need rhs to satisfy
        * compatibility condition. Achieved by setting a source and
        *  sink of equal strength.  All other problems have rhs = 1.
        *-----------------------------------------------------------*/
 
-#define DEVICE_VAR is_device_ptr(values)
       if ((dim == 2 && period[0] != 0 && period[1] != 0) ||
           (dim == 3 && period[0] != 0 && period[1] != 0 && period[2] != 0))
       {
-         hypre_LoopBegin(volume,i)
-         {
-            values[i] = 0.0;
-            values[0]         =  value;
-            values[volume - 1] = -value;
-
-         }
-         hypre_LoopEnd()
+         values_h[0] = value;
+         values_h[volume - 1] = -value;
       }
       else
       {
-         hypre_LoopBegin(volume,i)
+         for (i = 0; i < volume; i++)
          {
-            values[i] = value;
+            values_h[i] = value;
          }
-         hypre_LoopEnd()
       }
-#undef DEVICE_VAR
+
+      hypre_TMemcpy(values, values_h, HYPRE_Real, volume, memory_location, HYPRE_MEMORY_HOST);
 
       ilower = hypre_BoxIMin(box);
       iupper = hypre_BoxIMax(box);
 
       HYPRE_StructVectorSetBoxValues(zvector, ilower, iupper, values);
 
-#if 0 //defined(HYPRE_USING_CUDA)
-      if (data_location != HYPRE_MEMORY_HOST)
-      {
-          hypre_TFree(values,HYPRE_MEMORY_DEVICE);
-      }
-      else
-      {
-          hypre_TFree(values,HYPRE_MEMORY_HOST);
-      }
-#else
-      hypre_TFree(values,HYPRE_MEMORY_DEVICE);
-#endif
+      hypre_TFree(values, memory_location);
+      hypre_TFree(values_h, HYPRE_MEMORY_HOST);
    }
 
    return ierr;
@@ -3025,31 +3161,30 @@ AddValuesMatrix(HYPRE_StructMatrix A,
                 HYPRE_Real         conz)
 {
 
-   HYPRE_Int ierr=0;
-   hypre_BoxArray     *gridboxes;
-   HYPRE_Int           s,bi;
-   hypre_IndexRef      ilower;
-   hypre_IndexRef      iupper;
-   hypre_Box          *box;
-   HYPRE_Real         *values;
-   HYPRE_Real          east,west;
-   HYPRE_Real          north,south;
-   HYPRE_Real          top,bottom;
-   HYPRE_Real          center;
-   HYPRE_Int           volume,dim,sym;
-   HYPRE_Int          *stencil_indices;
-   HYPRE_Int           stencil_size;
-   HYPRE_Int           constant_coefficient;
-#if 0 //defined(HYPRE_USING_CUDA)
-   HYPRE_Int           data_location = hypre_StructGridDataLocation(hypre_StructMatrixGrid(A));
-#endif
-
-   gridboxes =  hypre_StructGridBoxes(gridmatrix);
-   dim       =  hypre_StructGridNDim(gridmatrix);
-   sym       =  hypre_StructMatrixSymmetric(A);
+   HYPRE_Int            d, ierr = 0;
+   hypre_BoxArray      *gridboxes;
+   HYPRE_Int            s, bi;
+   hypre_IndexRef       ilower;
+   hypre_IndexRef       iupper;
+   hypre_Box           *box;
+   HYPRE_Real          *values;
+   HYPRE_Real          *values_h;
+   HYPRE_Real           east, west;
+   HYPRE_Real           north, south;
+   HYPRE_Real           top, bottom;
+   HYPRE_Real           center;
+   HYPRE_Int            volume, dim, sym;
+   HYPRE_Int           *stencil_indices;
+   HYPRE_Int            stencil_size;
+   HYPRE_Int            constant_coefficient;
+   HYPRE_MemoryLocation memory_location = hypre_StructMatrixMemoryLocation(A);
+
+   gridboxes = hypre_StructGridBoxes(gridmatrix);
+   dim       = hypre_StructGridNDim(gridmatrix);
+   sym       = hypre_StructMatrixSymmetric(A);
    constant_coefficient = hypre_StructMatrixConstantCoefficient(A);
 
-   bi=0;
+   bi = 0;
 
    east = -cx;
    west = -cx;
@@ -3057,9 +3192,9 @@ AddValuesMatrix(HYPRE_StructMatrix A,
    south = -cy;
    top = -cz;
    bottom = -cz;
-   center = 2.0*cx;
-   if (dim > 1) center += 2.0*cy;
-   if (dim > 2) center += 2.0*cz;
+   center = 2.0 * cx;
+   if (dim > 1) { center += 2.0 * cy; }
+   if (dim > 2) { center += 2.0 * cz; }
 
    stencil_size = 1 + (2 - sym) * dim;
    stencil_indices = hypre_CTAlloc(HYPRE_Int,  stencil_size, HYPRE_MEMORY_HOST);
@@ -3068,56 +3203,50 @@ AddValuesMatrix(HYPRE_StructMatrix A,
       stencil_indices[s] = s;
    }
 
-   if(sym)
+   if (sym)
    {
-      if ( constant_coefficient==0 )
+      if ( constant_coefficient == 0 )
       {
          hypre_ForBoxI(bi, gridboxes)
          {
-            box      = hypre_BoxArrayBox(gridboxes, bi);
-            volume   =  hypre_BoxVolume(box);
-#if 0 //defined(HYPRE_USING_CUDA)
-            if (data_location != HYPRE_MEMORY_HOST)
-            {
-               values = hypre_CTAlloc(HYPRE_Real, stencil_size*volume, HYPRE_MEMORY_DEVICE);
-            }
-            else
-            {
-               values = hypre_CTAlloc(HYPRE_Real, stencil_size*volume, HYPRE_MEMORY_HOST);
-            }
-#else
-            values = hypre_CTAlloc(HYPRE_Real, stencil_size*volume, HYPRE_MEMORY_DEVICE);
-#endif
+            box    = hypre_BoxArrayBox(gridboxes, bi);
+            volume = hypre_BoxVolume(box);
+            values = hypre_CTAlloc(HYPRE_Real, stencil_size * volume, memory_location);
+            values_h = hypre_CTAlloc(HYPRE_Real, stencil_size * volume, HYPRE_MEMORY_HOST);
 
-#define DEVICE_VAR is_device_ptr(values)
             if (dim == 1)
             {
-               hypre_LoopBegin(volume, d)
+               for (d = 0; d < volume; d++)
+               {
                   HYPRE_Int i = stencil_size * d;
-                  values[i    ] = west;
-                  values[i + 1] = center;
-               hypre_LoopEnd()
+                  values_h[i] = west;
+                  values_h[i + 1] = center;
+               }
             }
             else if (dim == 2)
             {
-               hypre_LoopBegin(volume, d)
+               for (d = 0; d < volume; d++)
+               {
                   HYPRE_Int i = stencil_size * d;
-                  values[i    ] = west;
-                  values[i + 1] = south;
-                  values[i + 2] = center;
-               hypre_LoopEnd()
+                  values_h[i] = west;
+                  values_h[i + 1] = south;
+                  values_h[i + 2] = center;
+               }
             }
             else if (dim == 3)
             {
-               hypre_LoopBegin(volume, d)
+               for (d = 0; d < volume; d++)
+               {
                   HYPRE_Int i = stencil_size * d;
-                  values[i    ] = west;
-                  values[i + 1] = south;
-                  values[i + 2] = bottom;
-                  values[i + 3] = center;
-               hypre_LoopEnd()
+                  values_h[i] = west;
+                  values_h[i + 1] = south;
+                  values_h[i + 2] = bottom;
+                  values_h[i + 3] = center;
+               }
             }
-#undef DEVICE_VAR
+
+            hypre_TMemcpy(values, values_h, HYPRE_Real, stencil_size * volume, memory_location,
+                          HYPRE_MEMORY_HOST);
 
             ilower = hypre_BoxIMin(box);
             iupper = hypre_BoxIMax(box);
@@ -3125,23 +3254,13 @@ AddValuesMatrix(HYPRE_StructMatrix A,
             HYPRE_StructMatrixSetBoxValues(A, ilower, iupper, stencil_size,
                                            stencil_indices, values);
 
-#if 0 //defined(HYPRE_USING_CUDA)
-            if (data_location != HYPRE_MEMORY_HOST)
-            {
-               hypre_TFree(values,HYPRE_MEMORY_DEVICE);
-            }
-            else
-            {
-               hypre_TFree(values,HYPRE_MEMORY_HOST);
-            }
-#else
-            hypre_TFree(values,HYPRE_MEMORY_DEVICE);
-#endif
+            hypre_TFree(values, memory_location);
+            hypre_TFree(values_h, HYPRE_MEMORY_HOST);
          }
       }
-      else if ( constant_coefficient==1 )
+      else if ( constant_coefficient == 1 )
       {
-         values = hypre_CTAlloc(HYPRE_Real,  stencil_size, HYPRE_MEMORY_HOST);
+         values = hypre_CTAlloc(HYPRE_Real, stencil_size, HYPRE_MEMORY_HOST);
          switch (dim)
          {
             case 1:
@@ -3169,10 +3288,10 @@ AddValuesMatrix(HYPRE_StructMatrix A,
       }
       else
       {
-         hypre_assert( constant_coefficient==2 );
+         hypre_assert( constant_coefficient == 2 );
 
          /* stencil index for the center equals dim, so it's easy to leave out */
-         values   =  hypre_CTAlloc(HYPRE_Real,  stencil_size-1, HYPRE_MEMORY_HOST);
+         values = hypre_CTAlloc(HYPRE_Real, stencil_size - 1, HYPRE_MEMORY_HOST);
          switch (dim)
          {
             case 1:
@@ -3190,53 +3309,32 @@ AddValuesMatrix(HYPRE_StructMatrix A,
          }
          if (hypre_BoxArraySize(gridboxes) > 0)
          {
-            HYPRE_StructMatrixSetConstantValues(A, stencil_size-1,
+            HYPRE_StructMatrixSetConstantValues(A, stencil_size - 1,
                                                 stencil_indices, values);
          }
          hypre_TFree(values, HYPRE_MEMORY_HOST);
 
-
          hypre_ForBoxI(bi, gridboxes)
          {
-            box      = hypre_BoxArrayBox(gridboxes, bi);
-            volume   =  hypre_BoxVolume(box);
-#if 0 //defined(HYPRE_USING_CUDA)
-            if (data_location != HYPRE_MEMORY_HOST)
-            {
-               values   = hypre_CTAlloc(HYPRE_Real, volume,HYPRE_MEMORY_DEVICE);
-            }
-            else
-            {
-               values   = hypre_CTAlloc(HYPRE_Real, volume,HYPRE_MEMORY_HOST);
-            }
-#else
-            values   = hypre_CTAlloc(HYPRE_Real, volume,HYPRE_MEMORY_DEVICE);
-#endif
+            box    = hypre_BoxArrayBox(gridboxes, bi);
+            volume = hypre_BoxVolume(box);
+            values = hypre_CTAlloc(HYPRE_Real, volume, memory_location);
+            values_h = hypre_CTAlloc(HYPRE_Real, volume, HYPRE_MEMORY_HOST);
+            HYPRE_Int i;
 
-#define DEVICE_VAR is_device_ptr(values)
-            hypre_LoopBegin(volume,i)
+            for (i = 0; i < volume; i++)
             {
-               values[i] = center;
+               values_h[i] = center;
             }
-            hypre_LoopEnd()
-#undef DEVICE_VAR
+
+            hypre_TMemcpy(values, values_h, HYPRE_Real, volume, memory_location, HYPRE_MEMORY_HOST);
 
             ilower = hypre_BoxIMin(box);
             iupper = hypre_BoxIMax(box);
             HYPRE_StructMatrixSetBoxValues(A, ilower, iupper, 1,
-                                           stencil_indices+dim, values);
-#if 0 //defined(HYPRE_USING_CUDA)
-            if (data_location == HYPRE_MEMORY_DEVICE)
-            {
-               hypre_TFree(values,HYPRE_MEMORY_DEVICE);
-            }
-            else
-            {
-               hypre_TFree(values,HYPRE_MEMORY_HOST);
-            }
-#else
-            hypre_TFree(values,HYPRE_MEMORY_DEVICE);
-#endif
+                                           stencil_indices + dim, values);
+            hypre_TFree(values, memory_location);
+            hypre_TFree(values_h, HYPRE_MEMORY_HOST);
          }
       }
    }
@@ -3273,79 +3371,59 @@ AddValuesMatrix(HYPRE_StructMatrix A,
          center -= conz;
       }
 
-      if ( constant_coefficient==0 )
+      if ( constant_coefficient == 0 )
       {
          hypre_ForBoxI(bi, gridboxes)
          {
-            box      = hypre_BoxArrayBox(gridboxes, bi);
-            volume   =  hypre_BoxVolume(box);
-#if 0 //defined(HYPRE_USING_CUDA)
-            if (data_location == HYPRE_MEMORY_DEVICE)
-            {
-               values   = hypre_CTAlloc(HYPRE_Real, stencil_size*volume,HYPRE_MEMORY_DEVICE);
-            }
-            else
-            {
-               values   = hypre_CTAlloc(HYPRE_Real, stencil_size*volume,HYPRE_MEMORY_HOST);
-            }
-#else
-            values   = hypre_CTAlloc(HYPRE_Real, stencil_size*volume,HYPRE_MEMORY_DEVICE);
-#endif
+            box    = hypre_BoxArrayBox(gridboxes, bi);
+            volume = hypre_BoxVolume(box);
+            values = hypre_CTAlloc(HYPRE_Real, stencil_size * volume, memory_location);
+            values_h = hypre_CTAlloc(HYPRE_Real, stencil_size * volume, HYPRE_MEMORY_HOST);
 
-#define DEVICE_VAR is_device_ptr(values)
-            hypre_LoopBegin(volume,d)
+            for (d = 0; d < volume; d++)
             {
-               HYPRE_Int i = stencil_size*d;
+               HYPRE_Int i = stencil_size * d;
                switch (dim)
                {
                   case 1:
-                     values[i  ] = west;
-                     values[i+1] = center;
-                     values[i+2] = east;
+                     values_h[i] = west;
+                     values_h[i + 1] = center;
+                     values_h[i + 2] = east;
                      break;
                   case 2:
-                     values[i  ] = west;
-                     values[i+1] = south;
-                     values[i+2] = center;
-                     values[i+3] = east;
-                     values[i+4] = north;
+                     values_h[i] = west;
+                     values_h[i + 1] = south;
+                     values_h[i + 2] = center;
+                     values_h[i + 3] = east;
+                     values_h[i + 4] = north;
                      break;
                   case 3:
-                     values[i  ] = west;
-                     values[i+1] = south;
-                     values[i+2] = bottom;
-                     values[i+3] = center;
-                     values[i+4] = east;
-                     values[i+5] = north;
-                     values[i+6] = top;
+                     values_h[i] = west;
+                     values_h[i + 1] = south;
+                     values_h[i + 2] = bottom;
+                     values_h[i + 3] = center;
+                     values_h[i + 4] = east;
+                     values_h[i + 5] = north;
+                     values_h[i + 6] = top;
                      break;
                }
             }
-            hypre_LoopEnd()
-#undef DEVICE_VAR
+
+            hypre_TMemcpy(values, values_h, HYPRE_Real, stencil_size * volume, memory_location,
+                          HYPRE_MEMORY_HOST);
 
             ilower = hypre_BoxIMin(box);
             iupper = hypre_BoxIMax(box);
             HYPRE_StructMatrixSetBoxValues(A, ilower, iupper, stencil_size,
                                            stencil_indices, values);
 
-#if 0 //defined(HYPRE_USING_CUDA)
-            if (data_location == HYPRE_MEMORY_DEVICE)
-            {
-               hypre_TFree(values,HYPRE_MEMORY_DEVICE);
-            }
-            else
-            {
-               hypre_TFree(values,HYPRE_MEMORY_HOST);
-            }
-#else
-            hypre_TFree(values,HYPRE_MEMORY_DEVICE);
-#endif
+            hypre_TFree(values, memory_location);
+            hypre_TFree(values_h, HYPRE_MEMORY_HOST);
          }
       }
-      else if ( constant_coefficient==1 )
+      else if ( constant_coefficient == 1 )
       {
-         values = hypre_CTAlloc( HYPRE_Real,  stencil_size , HYPRE_MEMORY_HOST);
+         values = hypre_CTAlloc( HYPRE_Real,  stencil_size, HYPRE_MEMORY_HOST);
 
          switch (dim)
          {
@@ -3382,10 +3460,11 @@ AddValuesMatrix(HYPRE_StructMatrix A,
       }
       else
       {
-         hypre_assert( constant_coefficient==2 );
-         values =  hypre_CTAlloc( HYPRE_Real,  stencil_size-1 , HYPRE_MEMORY_HOST);
+         hypre_assert( constant_coefficient == 2 );
+         values =  hypre_CTAlloc( HYPRE_Real,  stencil_size - 1, HYPRE_MEMORY_HOST);
          switch (dim)
-         {  /* no center in stencil_indices and values */
+         {
+            /* no center in stencil_indices and values */
             case 1:
                stencil_indices[0] = 0;
                stencil_indices[1] = 2;
@@ -3430,46 +3509,25 @@ AddValuesMatrix(HYPRE_StructMatrix A,
          stencil_indices[0] = dim; /* refers to center */
          hypre_ForBoxI(bi, gridboxes)
          {
-            box      = hypre_BoxArrayBox(gridboxes, bi);
-            volume   = hypre_BoxVolume(box);
-#if 0 //defined(HYPRE_USING_CUDA)
-            if (data_location == HYPRE_MEMORY_DEVICE)
-            {
-               values   = hypre_CTAlloc(HYPRE_Real, volume,HYPRE_MEMORY_DEVICE);
-            }
-            else
-            {
-               values   = hypre_CTAlloc(HYPRE_Real, volume,HYPRE_MEMORY_HOST);
-            }
-#else
-            values   = hypre_CTAlloc(HYPRE_Real, volume,HYPRE_MEMORY_DEVICE);
-#endif
-
+            box    = hypre_BoxArrayBox(gridboxes, bi);
+            volume = hypre_BoxVolume(box);
+            values = hypre_CTAlloc(HYPRE_Real, volume, memory_location);
+            values_h = hypre_CTAlloc(HYPRE_Real, volume, HYPRE_MEMORY_HOST);
+            HYPRE_Int i;
 
-#define DEVICE_VAR is_device_ptr(values)
-            hypre_LoopBegin(volume,i)
+            for (i = 0; i < volume; i++)
             {
-               values[i] = center;
+               values_h[i] = center;
             }
-            hypre_LoopEnd()
-#undef DEVICE_VAR
+
+            hypre_TMemcpy(values, values_h, HYPRE_Real, volume, memory_location, HYPRE_MEMORY_HOST);
 
             ilower = hypre_BoxIMin(box);
             iupper = hypre_BoxIMax(box);
             HYPRE_StructMatrixSetBoxValues(A, ilower, iupper, 1,
                                            stencil_indices, values);
-#if 0 //defined(HYPRE_USING_CUDA)
-            if (data_location == HYPRE_MEMORY_DEVICE)
-            {
-               hypre_TFree(values,HYPRE_MEMORY_DEVICE);
-            }
-            else
-            {
-               hypre_TFree(values,HYPRE_MEMORY_HOST);
-            }
-#else
-            hypre_TFree(values,HYPRE_MEMORY_DEVICE);
-#endif
+            hypre_TFree(values, memory_location);
+            hypre_TFree(values_h, HYPRE_MEMORY_HOST);
          }
       }
    }
@@ -3485,26 +3543,26 @@ AddValuesMatrix(HYPRE_StructMatrix A,
  *********************************************************************************/
 
 HYPRE_Int
-SetStencilBndry(HYPRE_StructMatrix A,HYPRE_StructGrid gridmatrix,HYPRE_Int* period)
+SetStencilBndry(HYPRE_StructMatrix A,
+                HYPRE_StructGrid   gridmatrix,
+                HYPRE_Int         *period)
 {
+   HYPRE_Int            ierr = 0;
+   hypre_BoxArray      *gridboxes;
+   HYPRE_Int            size, i, j, d, ib;
+   HYPRE_Int          **ilower;
+   HYPRE_Int          **iupper;
+   HYPRE_Int           *vol;
+   HYPRE_Int           *istart, *iend;
+   hypre_Box           *box;
+   hypre_Box           *dummybox;
+   hypre_Box           *boundingbox;
+   HYPRE_Real          *values;
+   HYPRE_Int            volume, dim;
+   HYPRE_Int           *stencil_indices;
+   HYPRE_Int            constant_coefficient;
+   HYPRE_MemoryLocation memory_location = hypre_StructMatrixMemoryLocation(A);
 
-   HYPRE_Int ierr=0;
-   hypre_BoxArray    *gridboxes;
-   HYPRE_Int          size,i,j,d,ib;
-   HYPRE_Int        **ilower;
-   HYPRE_Int        **iupper;
-   HYPRE_Int         *vol;
-   HYPRE_Int         *istart, *iend;
-   hypre_Box         *box;
-   hypre_Box         *dummybox;
-   hypre_Box         *boundingbox;
-   HYPRE_Real        *values;
-   HYPRE_Int          volume, dim;
-   HYPRE_Int         *stencil_indices;
-   HYPRE_Int          constant_coefficient;
-#if 0 //defined(HYPRE_USING_CUDA)
-   HYPRE_Int          data_location = hypre_StructGridDataLocation(hypre_StructMatrixGrid(A));
-#endif
    gridboxes       = hypre_StructGridBoxes(gridmatrix);
    boundingbox     = hypre_StructGridBoundingBox(gridmatrix);
    istart          = hypre_BoxIMin(boundingbox);
@@ -3514,7 +3572,7 @@ SetStencilBndry(HYPRE_StructMatrix A,HYPRE_StructGrid gridmatrix,HYPRE_Int* peri
    stencil_indices = hypre_CTAlloc(HYPRE_Int,  1, HYPRE_MEMORY_HOST);
 
    constant_coefficient = hypre_StructMatrixConstantCoefficient(A);
-   if ( constant_coefficient>0 ) return 1;
+   if ( constant_coefficient > 0 ) { return 1; }
    /*...no space dependence if constant_coefficient==1,
      and space dependence only for diagonal if constant_coefficient==2 --
      and this function only touches off-diagonal entries */
@@ -3536,45 +3594,25 @@ SetStencilBndry(HYPRE_StructMatrix A,HYPRE_StructGrid gridmatrix,HYPRE_Int* peri
       box      = hypre_BoxArrayBox(gridboxes, i);
       volume   =  hypre_BoxVolume(box);
       vol[i]   = volume;
-      hypre_CopyBox(box,dummybox);
+      hypre_CopyBox(box, dummybox);
       for (d = 0; d < dim; d++)
       {
-         ilower[ib][d] = hypre_BoxIMinD(dummybox,d);
-         iupper[ib][d] = hypre_BoxIMaxD(dummybox,d);
+         ilower[ib][d] = hypre_BoxIMinD(dummybox, d);
+         iupper[ib][d] = hypre_BoxIMaxD(dummybox, d);
       }
       ib++ ;
       hypre_BoxDestroy(dummybox);
    }
 
-   if ( constant_coefficient==0 )
+   if ( constant_coefficient == 0 )
    {
       for (d = 0; d < dim; d++)
       {
          for (ib = 0; ib < size; ib++)
          {
-#if 0 //defined(HYPRE_USING_CUDA)
-            if (data_location == HYPRE_MEMORY_DEVICE)
-            {
-               values = hypre_CTAlloc(HYPRE_Real, vol[ib],HYPRE_MEMORY_DEVICE);
-            }
-            else
-            {
-               values = hypre_CTAlloc(HYPRE_Real, vol[ib],HYPRE_MEMORY_HOST);
-            }
-#else
-            values = hypre_CTAlloc(HYPRE_Real, vol[ib],HYPRE_MEMORY_DEVICE);
-#endif
+            values = hypre_CTAlloc(HYPRE_Real, vol[ib], memory_location);
 
-            /* RL: if used CTAlloc, then don't need to set 0.0 */
-#define DEVICE_VAR is_device_ptr(values)
-            hypre_LoopBegin(vol[ib],i)
-            {
-               values[i] = 0.0;
-            }
-            hypre_LoopEnd()
-#undef DEVICE_VAR
-
-            if( ilower[ib][d] == istart[d] && period[d] == 0 )
+            if ( ilower[ib][d] == istart[d] && period[d] == 0 )
             {
                j = iupper[ib][d];
                iupper[ib][d] = istart[d];
@@ -3584,7 +3622,7 @@ SetStencilBndry(HYPRE_StructMatrix A,HYPRE_StructGrid gridmatrix,HYPRE_Int* peri
                iupper[ib][d] = j;
             }
 
-            if( iupper[ib][d] == iend[d] && period[d] == 0 )
+            if ( iupper[ib][d] == iend[d] && period[d] == 0 )
             {
                j = ilower[ib][d];
                ilower[ib][d] = iend[d];
@@ -3594,25 +3632,14 @@ SetStencilBndry(HYPRE_StructMatrix A,HYPRE_StructGrid gridmatrix,HYPRE_Int* peri
                ilower[ib][d] = j;
             }
 
-#if 0 //defined(HYPRE_USING_CUDA)
-            if (data_location == HYPRE_MEMORY_DEVICE)
-            {
-               hypre_TFree(values,HYPRE_MEMORY_DEVICE);
-            }
-            else
-            {
-               hypre_TFree(values,HYPRE_MEMORY_HOST);
-            }
-#else
-            hypre_TFree(values,HYPRE_MEMORY_DEVICE);
-#endif
+            hypre_TFree(values, memory_location);
          }
       }
    }
 
    hypre_TFree(vol, HYPRE_MEMORY_HOST);
    hypre_TFree(stencil_indices, HYPRE_MEMORY_HOST);
-   for (ib =0 ; ib < size ; ib++)
+   for (ib = 0 ; ib < size ; ib++)
    {
       hypre_TFree(ilower[ib], HYPRE_MEMORY_HOST);
       hypre_TFree(iupper[ib], HYPRE_MEMORY_HOST);
@@ -3622,4 +3649,3 @@ SetStencilBndry(HYPRE_StructMatrix A,HYPRE_StructGrid gridmatrix,HYPRE_Int* peri
 
    return ierr;
 }
-
diff --git a/external/hypre/src/test/struct_migrate.c b/external/hypre/src/test/struct_migrate.c
index e26b26f1..66f44c62 100644
--- a/external/hypre/src/test/struct_migrate.c
+++ b/external/hypre/src/test/struct_migrate.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -13,7 +13,6 @@
 #include "HYPRE_struct_mv.h"
 /* RDF: This include is only needed for AddValuesVector() */
 #include "_hypre_struct_mv.h"
-#include "_hypre_struct_mv.hpp"
 
 HYPRE_Int AddValuesVector( hypre_StructGrid   *grid,
                            hypre_StructVector *vector,
@@ -47,7 +46,7 @@ main( hypre_int argc,
 
    HYPRE_Int           p, q, r;
    HYPRE_Int           dim;
-   HYPRE_Int           nblocks ;
+   HYPRE_Int           nblocks = 0;
    HYPRE_Int         **ilower, **iupper, **iupper2;
    HYPRE_Int           istart[3];
    HYPRE_Int           i, ix, iy, iz, ib;
@@ -66,14 +65,19 @@ main( hypre_int argc,
 
    /*-----------------------------------------------------------------
     * GPU Device binding
-    * Must be done before HYPRE_Init() and should not be changed after
+    * Must be done before HYPRE_Initialize() and should not be changed after
     *-----------------------------------------------------------------*/
-   hypre_bind_device(myid, num_procs, hypre_MPI_COMM_WORLD);
+   hypre_bind_device_id(-1, myid, num_procs, hypre_MPI_COMM_WORLD);
 
    /*-----------------------------------------------------------
     * Initialize : must be the first HYPRE function to call
     *-----------------------------------------------------------*/
-   HYPRE_Init();
+   HYPRE_Initialize();
+   HYPRE_DeviceInitialize();
+
+#if defined(HYPRE_USING_KOKKOS)
+   Kokkos::initialize (argc, argv);
+#endif
 
    /*-----------------------------------------------------------
     * Set defaults
@@ -89,6 +93,8 @@ main( hypre_int argc,
    Q  = 1;
    R  = 1;
 
+   p = q = r = 1;
+
    bx = 1;
    by = 1;
    bz = 1;
@@ -181,7 +187,7 @@ main( hypre_int argc,
     * Check a few things
     *-----------------------------------------------------------*/
 
-   if ((P*Q*R) > num_procs)
+   if ((P * Q * R) > num_procs)
    {
       if (myid == 0)
       {
@@ -189,7 +195,7 @@ main( hypre_int argc,
       }
       exit(1);
    }
-   else if ((P*Q*R) < num_procs)
+   else if ((P * Q * R) < num_procs)
    {
       if (myid == 0)
       {
@@ -206,7 +212,7 @@ main( hypre_int argc,
       hypre_printf("Running with these driver parameters:\n");
       hypre_printf("  (nx, ny, nz)    = (%d, %d, %d)\n", nx, ny, nz);
       hypre_printf("  (ix, iy, iz)    = (%d, %d, %d)\n",
-                   istart[0],istart[1],istart[2]);
+                   istart[0], istart[1], istart[2]);
       hypre_printf("  (Px, Py, Pz)    = (%d, %d, %d)\n", P,  Q,  R);
       hypre_printf("  (bx, by, bz)    = (%d, %d, %d)\n", bx, by, bz);
       hypre_printf("  dim             = %d\n", dim);
@@ -225,20 +231,20 @@ main( hypre_int argc,
          break;
 
       case 2:
-         nblocks = bx*by;
+         nblocks = bx * by;
          p = myid % P;
-         q = (( myid - p)/P) % Q;
+         q = (( myid - p) / P) % Q;
          break;
 
       case 3:
-         nblocks = bx*by*bz;
+         nblocks = bx * by * bz;
          p = myid % P;
-         q = (( myid - p)/P) % Q;
-         r = ( myid - p - P*q)/( P*Q );
+         q = (( myid - p) / P) % Q;
+         r = ( myid - p - P * q) / ( P * Q );
          break;
    }
 
-   if (myid >= (P*Q*R))
+   if (myid >= (P * Q * R))
    {
       /* My processor has no data on it */
       nblocks = bx = by = bz = 0;
@@ -264,11 +270,13 @@ main( hypre_int argc,
       case 1:
          for (ix = 0; ix < bx; ix++)
          {
-            ilower[ib][0] = istart[0]+ nx*(bx*p+ix);
-            iupper[ib][0] = istart[0]+ nx*(bx*p+ix+1) - 1;
+            ilower[ib][0] = istart[0] + nx * (bx * p + ix);
+            iupper[ib][0] = istart[0] + nx * (bx * p + ix + 1) - 1;
             iupper2[ib][0] = iupper[ib][0];
-            if ( (ix == (bx-1)) && (p < (P-1)) )
+            if ( (ix == (bx - 1)) && (p < (P - 1)) )
+            {
                iupper2[ib][0] = iupper[ib][0] + 1;
+            }
             ib++;
          }
          break;
@@ -276,16 +284,20 @@ main( hypre_int argc,
          for (iy = 0; iy < by; iy++)
             for (ix = 0; ix < bx; ix++)
             {
-               ilower[ib][0] = istart[0]+ nx*(bx*p+ix);
-               iupper[ib][0] = istart[0]+ nx*(bx*p+ix+1) - 1;
-               ilower[ib][1] = istart[1]+ ny*(by*q+iy);
-               iupper[ib][1] = istart[1]+ ny*(by*q+iy+1) - 1;
+               ilower[ib][0] = istart[0] + nx * (bx * p + ix);
+               iupper[ib][0] = istart[0] + nx * (bx * p + ix + 1) - 1;
+               ilower[ib][1] = istart[1] + ny * (by * q + iy);
+               iupper[ib][1] = istart[1] + ny * (by * q + iy + 1) - 1;
                iupper2[ib][0] = iupper[ib][0];
                iupper2[ib][1] = iupper[ib][1];
-               if ( (ix == (bx-1)) && (p < (P-1)) )
+               if ( (ix == (bx - 1)) && (p < (P - 1)) )
+               {
                   iupper2[ib][0] = iupper[ib][0] + 1;
-               if ( (iy == (by-1)) && (q < (Q-1)) )
+               }
+               if ( (iy == (by - 1)) && (q < (Q - 1)) )
+               {
                   iupper2[ib][1] = iupper[ib][1] + 1;
+               }
                ib++;
             }
          break;
@@ -294,21 +306,27 @@ main( hypre_int argc,
             for (iy = 0; iy < by; iy++)
                for (ix = 0; ix < bx; ix++)
                {
-                  ilower[ib][0] = istart[0]+ nx*(bx*p+ix);
-                  iupper[ib][0] = istart[0]+ nx*(bx*p+ix+1) - 1;
-                  ilower[ib][1] = istart[1]+ ny*(by*q+iy);
-                  iupper[ib][1] = istart[1]+ ny*(by*q+iy+1) - 1;
-                  ilower[ib][2] = istart[2]+ nz*(bz*r+iz);
-                  iupper[ib][2] = istart[2]+ nz*(bz*r+iz+1) - 1;
+                  ilower[ib][0] = istart[0] + nx * (bx * p + ix);
+                  iupper[ib][0] = istart[0] + nx * (bx * p + ix + 1) - 1;
+                  ilower[ib][1] = istart[1] + ny * (by * q + iy);
+                  iupper[ib][1] = istart[1] + ny * (by * q + iy + 1) - 1;
+                  ilower[ib][2] = istart[2] + nz * (bz * r + iz);
+                  iupper[ib][2] = istart[2] + nz * (bz * r + iz + 1) - 1;
                   iupper2[ib][0] = iupper[ib][0];
                   iupper2[ib][1] = iupper[ib][1];
                   iupper2[ib][2] = iupper[ib][2];
-                  if ( (ix == (bx-1)) && (p < (P-1)) )
+                  if ( (ix == (bx - 1)) && (p < (P - 1)) )
+                  {
                      iupper2[ib][0] = iupper[ib][0] + 1;
-                  if ( (iy == (by-1)) && (q < (Q-1)) )
+                  }
+                  if ( (iy == (by - 1)) && (q < (Q - 1)) )
+                  {
                      iupper2[ib][1] = iupper[ib][1] + 1;
-                  if ( (iz == (bz-1)) && (r < (R-1)) )
+                  }
+                  if ( (iz == (bz - 1)) && (r < (R - 1)) )
+                  {
                      iupper2[ib][2] = iupper[ib][2] + 1;
+                  }
                   ib++;
                }
          break;
@@ -402,6 +420,10 @@ main( hypre_int argc,
    HYPRE_StructVectorDestroy(to_vector);
    HYPRE_StructVectorDestroy(check_vector);
 
+#if defined(HYPRE_USING_KOKKOS)
+   Kokkos::finalize ();
+#endif
+
    /* Finalize Hypre */
    HYPRE_Finalize();
 
@@ -420,38 +442,41 @@ AddValuesVector( hypre_StructGrid   *grid,
                  hypre_StructVector *vector,
                  HYPRE_Real          value )
 {
-   HYPRE_Int          ierr = 0;
+   HYPRE_Int          i, ierr = 0;
    hypre_BoxArray    *gridboxes;
    HYPRE_Int          ib;
    hypre_IndexRef     ilower;
    hypre_IndexRef     iupper;
    hypre_Box         *box;
    HYPRE_Real        *values;
+   HYPRE_Real        *values_h;
    HYPRE_Int          volume;
 
-   gridboxes =  hypre_StructGridBoxes(grid);
+   HYPRE_MemoryLocation memory_location = hypre_StructVectorMemoryLocation(vector);
+
+   gridboxes = hypre_StructGridBoxes(grid);
 
-   ib=0;
+   ib = 0;
    hypre_ForBoxI(ib, gridboxes)
    {
-      box      = hypre_BoxArrayBox(gridboxes, ib);
-      volume   = hypre_BoxVolume(box);
-      values   =  hypre_CTAlloc(HYPRE_Real,  volume, HYPRE_MEMORY_DEVICE);
+      box    = hypre_BoxArrayBox(gridboxes, ib);
+      volume = hypre_BoxVolume(box);
+      values = hypre_CTAlloc(HYPRE_Real, volume, memory_location);
+      values_h = hypre_CTAlloc(HYPRE_Real, volume, HYPRE_MEMORY_HOST);
 
-#define DEVICE_VAR is_device_ptr(values)
-      hypre_LoopBegin(volume,i)
+      for (i = 0; i < volume; i++)
       {
-         values[i] = value;
+         values_h[i] = value;
       }
-      hypre_LoopEnd();
-#undef DEVICE_VAR
+
+      hypre_TMemcpy(values, values_h, HYPRE_Real, volume, memory_location, HYPRE_MEMORY_HOST);
 
       ilower = hypre_BoxIMin(box);
       iupper = hypre_BoxIMax(box);
       HYPRE_StructVectorSetBoxValues(vector, ilower, iupper, values);
-      hypre_TFree(values, HYPRE_MEMORY_DEVICE);
+      hypre_TFree(values, memory_location);
+      hypre_TFree(values_h, HYPRE_MEMORY_HOST);
    }
 
    return ierr;
 }
-
diff --git a/external/hypre/src/test/struct_newboxloop.c b/external/hypre/src/test/struct_newboxloop.c
index a88e3a35..3dac60be 100644
--- a/external/hypre/src/test/struct_newboxloop.c
+++ b/external/hypre/src/test/struct_newboxloop.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -41,9 +41,9 @@
 
 /* end lobpcg */
 
-HYPRE_Int  SetStencilBndry(HYPRE_StructMatrix A,HYPRE_StructGrid gridmatrix,HYPRE_Int* period);
+HYPRE_Int  SetStencilBndry(HYPRE_StructMatrix A, HYPRE_StructGrid gridmatrix, HYPRE_Int* period);
 
-HYPRE_Int  AddValuesMatrix(HYPRE_StructMatrix A,HYPRE_StructGrid gridmatrix,
+HYPRE_Int  AddValuesMatrix(HYPRE_StructMatrix A, HYPRE_StructGrid gridmatrix,
                            HYPRE_Real        cx,
                            HYPRE_Real        cy,
                            HYPRE_Real        cz,
@@ -125,7 +125,7 @@ main( hypre_int argc,
    HYPRE_Int           i, s;
    HYPRE_Int           ix, iy, iz, ib;
 
-   HYPRE_Int           periodx0[3] = {0,0,0};
+   HYPRE_Int           periodx0[3] = {0, 0, 0};
    HYPRE_Int           sum;
    HYPRE_Real          inner;
 
@@ -219,8 +219,8 @@ main( hypre_int argc,
    /* ghosts for the building of matrix: default  */
    for (i = 0; i < dim; i++)
    {
-      A_num_ghost[2*i] = 1;
-      A_num_ghost[2*i + 1] = 1;
+      A_num_ghost[2 * i] = 1;
+      A_num_ghost[2 * i + 1] = 1;
    }
 
    /*-----------------------------------------------------------
@@ -269,16 +269,16 @@ main( hypre_int argc,
       else if ( strcmp(argv[arg_index], "-c") == 0 )
       {
          arg_index++;
-         cx = atof(argv[arg_index++]);
-         cy = atof(argv[arg_index++]);
-         cz = atof(argv[arg_index++]);
+         cx = (HYPRE_Real)atof(argv[arg_index++]);
+         cy = (HYPRE_Real)atof(argv[arg_index++]);
+         cz = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-convect") == 0 )
       {
          arg_index++;
-         conx = atof(argv[arg_index++]);
-         cony = atof(argv[arg_index++]);
-         conz = atof(argv[arg_index++]);
+         conx = (HYPRE_Real)atof(argv[arg_index++]);
+         cony = (HYPRE_Real)atof(argv[arg_index++]);
+         conz = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-d") == 0 )
       {
@@ -295,12 +295,15 @@ main( hypre_int argc,
          arg_index++;
 
          /* begin lobpcg */
-         if ( strcmp(argv[arg_index], "none") == 0 ) {
+         if ( strcmp(argv[arg_index], "none") == 0 )
+         {
             solver_id = NO_SOLVER;
             arg_index++;
          }
          else /* end lobpcg */
+         {
             solver_id = atoi(argv[arg_index++]);
+         }
       }
       else if ( strcmp(argv[arg_index], "-v") == 0 )
       {
@@ -362,7 +365,9 @@ main( hypre_int argc,
    /* begin lobpcg */
 
    if ( solver_id == 0 && lobpcgFlag )
+   {
       solver_id = 10;
+   }
 
    /*end lobpcg */
 
@@ -410,7 +415,7 @@ main( hypre_int argc,
     * Check a few things
     *-----------------------------------------------------------*/
 
-   if ((P*Q*R) > num_procs)
+   if ((P * Q * R) > num_procs)
    {
       if (myid == 0)
       {
@@ -418,7 +423,7 @@ main( hypre_int argc,
       }
       exit(1);
    }
-   else if ((P*Q*R) < num_procs)
+   else if ((P * Q * R) < num_procs)
    {
       if (myid == 0)
       {
@@ -426,7 +431,7 @@ main( hypre_int argc,
       }
    }
 
-   if ((conx != 0.0 || cony !=0 || conz != 0) && sym == 1 )
+   if ((conx != 0.0 || cony != 0 || conz != 0) && sym == 1 )
    {
       if (myid == 0)
       {
@@ -457,7 +462,7 @@ main( hypre_int argc,
       hypre_printf("Running with these driver parameters:\n");
       hypre_printf("  (nx, ny, nz)    = (%d, %d, %d)\n", nx, ny, nz);
       hypre_printf("  (istart[0],istart[1],istart[2]) = (%d, %d, %d)\n", \
-                   istart[0],istart[1],istart[2]);
+                   istart[0], istart[1], istart[2]);
       hypre_printf("  (Px, Py, Pz)    = (%d, %d, %d)\n", P,  Q,  R);
       hypre_printf("  (bx, by, bz)    = (%d, %d, %d)\n", bx, by, bz);
       hypre_printf("  (px, py, pz)    = (%d, %d, %d)\n", px, py, pz);
@@ -497,131 +502,131 @@ main( hypre_int argc,
 
    switch (dim)
    {
-   case 1:
-      nblocks = bx;
-      if(sym)
-      {
-         offsets = hypre_CTAlloc(HYPRE_Int*,  2, HYPRE_MEMORY_HOST);
-         offsets[0] = hypre_CTAlloc(HYPRE_Int,  1, HYPRE_MEMORY_HOST);
-         offsets[0][0] = -1;
-         offsets[1] = hypre_CTAlloc(HYPRE_Int,  1, HYPRE_MEMORY_HOST);
-         offsets[1][0] = 0;
-      }
-      else
-      {
-         offsets = hypre_CTAlloc(HYPRE_Int*,  3, HYPRE_MEMORY_HOST);
-         offsets[0] = hypre_CTAlloc(HYPRE_Int,  1, HYPRE_MEMORY_HOST);
-         offsets[0][0] = -1;
-         offsets[1] = hypre_CTAlloc(HYPRE_Int,  1, HYPRE_MEMORY_HOST);
-         offsets[1][0] = 0;
-         offsets[2] = hypre_CTAlloc(HYPRE_Int,  1, HYPRE_MEMORY_HOST);
-         offsets[2][0] = 1;
-      }
-      /* compute p from P and myid */
-      p = myid % P;
-      break;
+      case 1:
+         nblocks = bx;
+         if (sym)
+         {
+            offsets = hypre_CTAlloc(HYPRE_Int*,  2, HYPRE_MEMORY_HOST);
+            offsets[0] = hypre_CTAlloc(HYPRE_Int,  1, HYPRE_MEMORY_HOST);
+            offsets[0][0] = -1;
+            offsets[1] = hypre_CTAlloc(HYPRE_Int,  1, HYPRE_MEMORY_HOST);
+            offsets[1][0] = 0;
+         }
+         else
+         {
+            offsets = hypre_CTAlloc(HYPRE_Int*,  3, HYPRE_MEMORY_HOST);
+            offsets[0] = hypre_CTAlloc(HYPRE_Int,  1, HYPRE_MEMORY_HOST);
+            offsets[0][0] = -1;
+            offsets[1] = hypre_CTAlloc(HYPRE_Int,  1, HYPRE_MEMORY_HOST);
+            offsets[1][0] = 0;
+            offsets[2] = hypre_CTAlloc(HYPRE_Int,  1, HYPRE_MEMORY_HOST);
+            offsets[2][0] = 1;
+         }
+         /* compute p from P and myid */
+         p = myid % P;
+         break;
 
-   case 2:
-      nblocks = bx*by;
-      if(sym)
-      {
-         offsets = hypre_CTAlloc(HYPRE_Int*,  3, HYPRE_MEMORY_HOST);
-         offsets[0] = hypre_CTAlloc(HYPRE_Int,  2, HYPRE_MEMORY_HOST);
-         offsets[0][0] = -1;
-         offsets[0][1] = 0;
-         offsets[1] = hypre_CTAlloc(HYPRE_Int,  2, HYPRE_MEMORY_HOST);
-         offsets[1][0] = 0;
-         offsets[1][1] = -1;
-         offsets[2] = hypre_CTAlloc(HYPRE_Int,  2, HYPRE_MEMORY_HOST);
-         offsets[2][0] = 0;
-         offsets[2][1] = 0;
-      }
-      else
-      {
-         offsets = hypre_CTAlloc(HYPRE_Int*,  5, HYPRE_MEMORY_HOST);
-         offsets[0] = hypre_CTAlloc(HYPRE_Int,  2, HYPRE_MEMORY_HOST);
-         offsets[0][0] = -1;
-         offsets[0][1] = 0;
-         offsets[1] = hypre_CTAlloc(HYPRE_Int,  2, HYPRE_MEMORY_HOST);
-         offsets[1][0] = 0;
-         offsets[1][1] = -1;
-         offsets[2] = hypre_CTAlloc(HYPRE_Int,  2, HYPRE_MEMORY_HOST);
-         offsets[2][0] = 0;
-         offsets[2][1] = 0;
-         offsets[3] = hypre_CTAlloc(HYPRE_Int,  2, HYPRE_MEMORY_HOST);
-         offsets[3][0] = 1;
-         offsets[3][1] = 0;
-         offsets[4] = hypre_CTAlloc(HYPRE_Int,  2, HYPRE_MEMORY_HOST);
-         offsets[4][0] = 0;
-         offsets[4][1] = 1;
-      }
-      /* compute p,q from P,Q and myid */
-      p = myid % P;
-      q = (( myid - p)/P) % Q;
-      break;
-
-   case 3:
-      nblocks = bx*by*bz;
-      if(sym)
-      {
-         offsets = hypre_CTAlloc(HYPRE_Int*,  4, HYPRE_MEMORY_HOST);
-         offsets[0] = hypre_CTAlloc(HYPRE_Int,  3, HYPRE_MEMORY_HOST);
-         offsets[0][0] = -1;
-         offsets[0][1] = 0;
-         offsets[0][2] = 0;
-         offsets[1] = hypre_CTAlloc(HYPRE_Int,  3, HYPRE_MEMORY_HOST);
-         offsets[1][0] = 0;
-         offsets[1][1] = -1;
-         offsets[1][2] = 0;
-         offsets[2] = hypre_CTAlloc(HYPRE_Int,  3, HYPRE_MEMORY_HOST);
-         offsets[2][0] = 0;
-         offsets[2][1] = 0;
-         offsets[2][2] = -1;
-         offsets[3] = hypre_CTAlloc(HYPRE_Int,  3, HYPRE_MEMORY_HOST);
-         offsets[3][0] = 0;
-         offsets[3][1] = 0;
-         offsets[3][2] = 0;
-      }
-      else
-      {
-         offsets = hypre_CTAlloc(HYPRE_Int*,  7, HYPRE_MEMORY_HOST);
-         offsets[0] = hypre_CTAlloc(HYPRE_Int,  3, HYPRE_MEMORY_HOST);
-         offsets[0][0] = -1;
-         offsets[0][1] = 0;
-         offsets[0][2] = 0;
-         offsets[1] = hypre_CTAlloc(HYPRE_Int,  3, HYPRE_MEMORY_HOST);
-         offsets[1][0] = 0;
-         offsets[1][1] = -1;
-         offsets[1][2] = 0;
-         offsets[2] = hypre_CTAlloc(HYPRE_Int,  3, HYPRE_MEMORY_HOST);
-         offsets[2][0] = 0;
-         offsets[2][1] = 0;
-         offsets[2][2] = -1;
-         offsets[3] = hypre_CTAlloc(HYPRE_Int,  3, HYPRE_MEMORY_HOST);
-         offsets[3][0] = 0;
-         offsets[3][1] = 0;
-         offsets[3][2] = 0;
-         offsets[4] = hypre_CTAlloc(HYPRE_Int,  3, HYPRE_MEMORY_HOST);
-         offsets[4][0] = 1;
-         offsets[4][1] = 0;
-         offsets[4][2] = 0;
-         offsets[5] = hypre_CTAlloc(HYPRE_Int,  3, HYPRE_MEMORY_HOST);
-         offsets[5][0] = 0;
-         offsets[5][1] = 1;
-         offsets[5][2] = 0;
-         offsets[6] = hypre_CTAlloc(HYPRE_Int,  3, HYPRE_MEMORY_HOST);
-         offsets[6][0] = 0;
-         offsets[6][1] = 0;
-         offsets[6][2] = 1;
-      }
-      /* compute p,q,r from P,Q,R and myid */
-      p = myid % P;
-      q = (( myid - p)/P) % Q;
-      r = ( myid - p - P*q)/( P*Q );
-      break;
+      case 2:
+         nblocks = bx * by;
+         if (sym)
+         {
+            offsets = hypre_CTAlloc(HYPRE_Int*,  3, HYPRE_MEMORY_HOST);
+            offsets[0] = hypre_CTAlloc(HYPRE_Int,  2, HYPRE_MEMORY_HOST);
+            offsets[0][0] = -1;
+            offsets[0][1] = 0;
+            offsets[1] = hypre_CTAlloc(HYPRE_Int,  2, HYPRE_MEMORY_HOST);
+            offsets[1][0] = 0;
+            offsets[1][1] = -1;
+            offsets[2] = hypre_CTAlloc(HYPRE_Int,  2, HYPRE_MEMORY_HOST);
+            offsets[2][0] = 0;
+            offsets[2][1] = 0;
+         }
+         else
+         {
+            offsets = hypre_CTAlloc(HYPRE_Int*,  5, HYPRE_MEMORY_HOST);
+            offsets[0] = hypre_CTAlloc(HYPRE_Int,  2, HYPRE_MEMORY_HOST);
+            offsets[0][0] = -1;
+            offsets[0][1] = 0;
+            offsets[1] = hypre_CTAlloc(HYPRE_Int,  2, HYPRE_MEMORY_HOST);
+            offsets[1][0] = 0;
+            offsets[1][1] = -1;
+            offsets[2] = hypre_CTAlloc(HYPRE_Int,  2, HYPRE_MEMORY_HOST);
+            offsets[2][0] = 0;
+            offsets[2][1] = 0;
+            offsets[3] = hypre_CTAlloc(HYPRE_Int,  2, HYPRE_MEMORY_HOST);
+            offsets[3][0] = 1;
+            offsets[3][1] = 0;
+            offsets[4] = hypre_CTAlloc(HYPRE_Int,  2, HYPRE_MEMORY_HOST);
+            offsets[4][0] = 0;
+            offsets[4][1] = 1;
+         }
+         /* compute p,q from P,Q and myid */
+         p = myid % P;
+         q = (( myid - p) / P) % Q;
+         break;
+
+      case 3:
+         nblocks = bx * by * bz;
+         if (sym)
+         {
+            offsets = hypre_CTAlloc(HYPRE_Int*,  4, HYPRE_MEMORY_HOST);
+            offsets[0] = hypre_CTAlloc(HYPRE_Int,  3, HYPRE_MEMORY_HOST);
+            offsets[0][0] = -1;
+            offsets[0][1] = 0;
+            offsets[0][2] = 0;
+            offsets[1] = hypre_CTAlloc(HYPRE_Int,  3, HYPRE_MEMORY_HOST);
+            offsets[1][0] = 0;
+            offsets[1][1] = -1;
+            offsets[1][2] = 0;
+            offsets[2] = hypre_CTAlloc(HYPRE_Int,  3, HYPRE_MEMORY_HOST);
+            offsets[2][0] = 0;
+            offsets[2][1] = 0;
+            offsets[2][2] = -1;
+            offsets[3] = hypre_CTAlloc(HYPRE_Int,  3, HYPRE_MEMORY_HOST);
+            offsets[3][0] = 0;
+            offsets[3][1] = 0;
+            offsets[3][2] = 0;
+         }
+         else
+         {
+            offsets = hypre_CTAlloc(HYPRE_Int*,  7, HYPRE_MEMORY_HOST);
+            offsets[0] = hypre_CTAlloc(HYPRE_Int,  3, HYPRE_MEMORY_HOST);
+            offsets[0][0] = -1;
+            offsets[0][1] = 0;
+            offsets[0][2] = 0;
+            offsets[1] = hypre_CTAlloc(HYPRE_Int,  3, HYPRE_MEMORY_HOST);
+            offsets[1][0] = 0;
+            offsets[1][1] = -1;
+            offsets[1][2] = 0;
+            offsets[2] = hypre_CTAlloc(HYPRE_Int,  3, HYPRE_MEMORY_HOST);
+            offsets[2][0] = 0;
+            offsets[2][1] = 0;
+            offsets[2][2] = -1;
+            offsets[3] = hypre_CTAlloc(HYPRE_Int,  3, HYPRE_MEMORY_HOST);
+            offsets[3][0] = 0;
+            offsets[3][1] = 0;
+            offsets[3][2] = 0;
+            offsets[4] = hypre_CTAlloc(HYPRE_Int,  3, HYPRE_MEMORY_HOST);
+            offsets[4][0] = 1;
+            offsets[4][1] = 0;
+            offsets[4][2] = 0;
+            offsets[5] = hypre_CTAlloc(HYPRE_Int,  3, HYPRE_MEMORY_HOST);
+            offsets[5][0] = 0;
+            offsets[5][1] = 1;
+            offsets[5][2] = 0;
+            offsets[6] = hypre_CTAlloc(HYPRE_Int,  3, HYPRE_MEMORY_HOST);
+            offsets[6][0] = 0;
+            offsets[6][1] = 0;
+            offsets[6][2] = 1;
+         }
+         /* compute p,q,r from P,Q,R and myid */
+         p = myid % P;
+         q = (( myid - p) / P) % Q;
+         r = ( myid - p - P * q) / ( P * Q );
+         break;
    }
 
-   if (myid >= (P*Q*R))
+   if (myid >= (P * Q * R))
    {
       /* My processor has no data on it */
       nblocks = bx = by = bz = 0;
@@ -632,8 +637,8 @@ main( hypre_int argc,
     * which is always the case for read_fromfile_param == 0
     *-----------------------------------------------------------*/
 
-   HYPRE_StructStencilCreate(dim, (2-sym)*dim + 1, &stencil);
-   for (s = 0; s < (2-sym)*dim + 1; s++)
+   HYPRE_StructStencilCreate(dim, (2 - sym)*dim + 1, &stencil);
+   for (s = 0; s < (2 - sym)*dim + 1; s++)
    {
       HYPRE_StructStencilSetElement(stencil, s, offsets[s]);
    }
@@ -672,8 +677,8 @@ main( hypre_int argc,
          case 1:
             for (ix = 0; ix < bx; ix++)
             {
-               ilower[ib][0] = istart[0]+ nx*(bx*p+ix);
-               iupper[ib][0] = istart[0]+ nx*(bx*p+ix+1) - 1;
+               ilower[ib][0] = istart[0] + nx * (bx * p + ix);
+               iupper[ib][0] = istart[0] + nx * (bx * p + ix + 1) - 1;
                ib++;
             }
             break;
@@ -681,10 +686,10 @@ main( hypre_int argc,
             for (iy = 0; iy < by; iy++)
                for (ix = 0; ix < bx; ix++)
                {
-                  ilower[ib][0] = istart[0]+ nx*(bx*p+ix);
-                  iupper[ib][0] = istart[0]+ nx*(bx*p+ix+1) - 1;
-                  ilower[ib][1] = istart[1]+ ny*(by*q+iy);
-                  iupper[ib][1] = istart[1]+ ny*(by*q+iy+1) - 1;
+                  ilower[ib][0] = istart[0] + nx * (bx * p + ix);
+                  iupper[ib][0] = istart[0] + nx * (bx * p + ix + 1) - 1;
+                  ilower[ib][1] = istart[1] + ny * (by * q + iy);
+                  iupper[ib][1] = istart[1] + ny * (by * q + iy + 1) - 1;
                   ib++;
                }
             break;
@@ -693,12 +698,12 @@ main( hypre_int argc,
                for (iy = 0; iy < by; iy++)
                   for (ix = 0; ix < bx; ix++)
                   {
-                     ilower[ib][0] = istart[0]+ nx*(bx*p+ix);
-                     iupper[ib][0] = istart[0]+ nx*(bx*p+ix+1) - 1;
-                     ilower[ib][1] = istart[1]+ ny*(by*q+iy);
-                     iupper[ib][1] = istart[1]+ ny*(by*q+iy+1) - 1;
-                     ilower[ib][2] = istart[2]+ nz*(bz*r+iz);
-                     iupper[ib][2] = istart[2]+ nz*(bz*r+iz+1) - 1;
+                     ilower[ib][0] = istart[0] + nx * (bx * p + ix);
+                     iupper[ib][0] = istart[0] + nx * (bx * p + ix + 1) - 1;
+                     ilower[ib][1] = istart[1] + ny * (by * q + iy);
+                     iupper[ib][1] = istart[1] + ny * (by * q + iy + 1) - 1;
+                     ilower[ib][2] = istart[2] + nz * (bz * r + iz);
+                     iupper[ib][2] = istart[2] + nz * (bz * r + iz + 1) - 1;
                      ib++;
                   }
             break;
@@ -719,41 +724,41 @@ main( hypre_int argc,
 
       for (i = 0; i < dim; i++)
       {
-         A_num_ghost[2*i] = 1;
-         A_num_ghost[2*i + 1] = 1;
+         A_num_ghost[2 * i] = 1;
+         A_num_ghost[2 * i + 1] = 1;
       }
 
       HYPRE_StructMatrixCreate(hypre_MPI_COMM_WORLD, grid, stencil, &A);
       if ( solver_id == 3 || solver_id == 4 ||
-            solver_id == 13 || solver_id == 14 )
+           solver_id == 13 || solver_id == 14 )
       {
          stencil_size  = hypre_StructStencilSize(stencil);
          stencil_entries = hypre_CTAlloc(HYPRE_Int,  stencil_size, HYPRE_MEMORY_HOST);
          if ( solver_id == 3 || solver_id == 13)
          {
-               for ( i=0; i<stencil_size; ++i ) stencil_entries[i]=i;
-               hypre_StructMatrixSetConstantEntries(
-                     A, stencil_size, stencil_entries );
-               /* ... note: SetConstantEntries is where the constant_coefficient
-                  flag is set in A */
-               hypre_TFree( stencil_entries , HYPRE_MEMORY_HOST);
-               constant_coefficient = 1;
+            for ( i = 0; i < stencil_size; ++i ) { stencil_entries[i] = i; }
+            hypre_StructMatrixSetConstantEntries(
+               A, stencil_size, stencil_entries );
+            /* ... note: SetConstantEntries is where the constant_coefficient
+               flag is set in A */
+            hypre_TFree( stencil_entries, HYPRE_MEMORY_HOST);
+            constant_coefficient = 1;
          }
          if ( solver_id == 4 || solver_id == 14)
          {
-               hypre_SetIndex3(diag_index, 0, 0, 0);
-               diag_rank = hypre_StructStencilElementRank( stencil, diag_index );
-               hypre_assert( stencil_size>=1 );
-               if ( diag_rank==0 ) stencil_entries[diag_rank]=1;
-               else stencil_entries[diag_rank]=0;
-               for ( i=0; i<stencil_size; ++i )
-               {
-                  if ( i!= diag_rank ) stencil_entries[i]=i;
-               }
-               hypre_StructMatrixSetConstantEntries(
-                  A, stencil_size, stencil_entries );
-               hypre_TFree( stencil_entries , HYPRE_MEMORY_HOST);
-               constant_coefficient = 2;
+            hypre_SetIndex3(diag_index, 0, 0, 0);
+            diag_rank = hypre_StructStencilElementRank( stencil, diag_index );
+            hypre_assert( stencil_size >= 1 );
+            if ( diag_rank == 0 ) { stencil_entries[diag_rank] = 1; }
+            else { stencil_entries[diag_rank] = 0; }
+            for ( i = 0; i < stencil_size; ++i )
+            {
+               if ( i != diag_rank ) { stencil_entries[i] = i; }
+            }
+            hypre_StructMatrixSetConstantEntries(
+               A, stencil_size, stencil_entries );
+            hypre_TFree( stencil_entries, HYPRE_MEMORY_HOST);
+            constant_coefficient = 2;
          }
       }
       HYPRE_StructMatrixSetSymmetric(A, sym);
@@ -775,12 +780,12 @@ main( hypre_int argc,
        * Fill in the matrix elements
        *-----------------------------------------------------------*/
 
-      AddValuesMatrix(A,grid,cx,cy,cz,conx,cony,conz);
+      AddValuesMatrix(A, grid, cx, cy, cz, conx, cony, conz);
 
       /* Zero out stencils reaching to real boundary */
       /* But in constant coefficient case, no special stencils! */
 
-      if ( constant_coefficient == 0 ) SetStencilBndry(A,grid,periodic);
+      if ( constant_coefficient == 0 ) { SetStencilBndry(A, grid, periodic); }
       HYPRE_StructMatrixAssemble(A);
 
       /*-----------------------------------------------------------
@@ -796,13 +801,13 @@ main( hypre_int argc,
        *  sink of equal strength.  All other problems have rhs = 1.
        *-----------------------------------------------------------*/
 
-      AddValuesVector(grid,b,periodic,1.0);
+      AddValuesVector(grid, b, periodic, 1.0);
       HYPRE_StructVectorAssemble(b);
 
       HYPRE_StructVectorCreate(hypre_MPI_COMM_WORLD, grid, &x);
       HYPRE_StructVectorInitialize(x);
 
-      AddValuesVector(grid,x,periodx0,1.0);
+      AddValuesVector(grid, x, periodx0, 1.0);
       HYPRE_StructVectorAssemble(x);
 
       HYPRE_StructGridDestroy(grid);
@@ -837,12 +842,12 @@ main( hypre_int argc,
 
    if (solver_id == 0)
    {
-     //timeval tstart,tstop;
+      //timeval tstart,tstop;
       time_index = hypre_InitializeTiming("axpy");
       hypre_BeginTiming(time_index);
       //gettimeofday(&tstart,NULL);
 
-      for ( rep=0; rep<reps; ++rep )
+      for ( rep = 0; rep < reps; ++rep )
       {
          hypre_StructAxpy(2.0, b, x);
       }
@@ -851,9 +856,9 @@ main( hypre_int argc,
 
       //HYPRE_Real telapsed = (tstop.tv_sec - tstart.tv_sec) + (tstop.tv_usec - tstart.tv_usec)/1e6 ;
       //hypre_printf("axpy, \t %d, \t %f\n",nx*ny*nz,telapsed/reps);
-      HYPRE_Real innerb = hypre_StructInnerProd(b,b);
-      HYPRE_Real innerx = hypre_StructInnerProd(x,x);
-      hypre_printf("inner, \t %f, \t %f\n",innerb,innerx);
+      HYPRE_Real innerb = hypre_StructInnerProd(b, b);
+      HYPRE_Real innerx = hypre_StructInnerProd(x, x);
+      hypre_printf("inner, \t %f, \t %f\n", innerb, innerx);
 
       hypre_PrintTiming("Time for axpy", hypre_MPI_COMM_WORLD);
       hypre_FinalizeTiming(time_index);
@@ -866,7 +871,7 @@ main( hypre_int argc,
 
    else if ( solver_id == 1 || solver_id == 3 || solver_id == 4 )
    {
-     //timeval tstart,tstop;
+      //timeval tstart,tstop;
       void *matvec_data;
 
       matvec_data = hypre_StructMatvecCreate();
@@ -876,15 +881,15 @@ main( hypre_int argc,
       hypre_BeginTiming(time_index);
       //gettimeofday(&tstart,NULL);
 
-      for ( rep=0; rep<reps; ++rep )
+      for ( rep = 0; rep < reps; ++rep )
       {
          hypre_StructMatvecCompute(matvec_data, 1.0, A, x, 1.0, b);
       }
       //gettimeofday(&tstop,NULL);
       hypre_EndTiming(time_index);
-      HYPRE_Real innerb = hypre_StructInnerProd(b,b);
-      HYPRE_Real innerx = hypre_StructInnerProd(x,x);
-      hypre_printf("inner, \t %f, \t %f\n",innerb,innerx);
+      HYPRE_Real innerb = hypre_StructInnerProd(b, b);
+      HYPRE_Real innerx = hypre_StructInnerProd(x, x);
+      hypre_printf("inner, \t %f, \t %f\n", innerb, innerx);
       //HYPRE_Real telapsed = (tstop.tv_sec - tstart.tv_sec) + (tstop.tv_usec - tstart.tv_usec)/1e6 ;
       //hypre_printf("Mat-Vec, \t %d, \t %f\n",nx*ny*nz,telapsed/reps);
 
@@ -899,20 +904,20 @@ main( hypre_int argc,
 
    else if (solver_id == 2)
    {
-     //timeval tstart,tstop;
+      //timeval tstart,tstop;
       time_index = hypre_InitializeTiming("inner");
       hypre_BeginTiming(time_index);
       //gettimeofday(&tstart,NULL);
-      for ( rep=0; rep<reps; ++rep )
+      for ( rep = 0; rep < reps; ++rep )
       {
-         inner = hypre_StructInnerProd(x,b);
+         inner = hypre_StructInnerProd(x, b);
       }
       //gettimeofday(&tstop,NULL);
       hypre_EndTiming(time_index);
       //HYPRE_Real telapsed = (tstop.tv_sec - tstart.tv_sec) + (tstop.tv_usec - tstart.tv_usec)/1e6 ;
       //hypre_printf("inner, \t %d, \t %f\n",nx*ny*nz,telapsed/reps);
 
-      hypre_printf("inner = %f\n",inner);
+      hypre_printf("inner = %f\n", inner);
 
       hypre_PrintTiming("Time for inner product", hypre_MPI_COMM_WORLD);
       hypre_FinalizeTiming(time_index);
@@ -980,8 +985,8 @@ main( hypre_int argc,
       HYPRE_Int   i, imax, N;
 
       /* compute imax */
-      N = (P*nx)*(Q*ny)*(R*nz);
-      imax = (5*1000000) / N;
+      N = (P * nx) * (Q * ny) * (R * nz);
+      imax = (5 * 1000000) / N;
 
       matvec_data = hypre_StructMatvecCreate();
       hypre_StructMatvecSetup(matvec_data, A, x);
@@ -994,7 +999,7 @@ main( hypre_int argc,
          hypre_StructMatvecCompute(matvec_data, 1.0, A, x, 1.0, b);
       }
       /* this counts mult-adds */
-      hypre_IncFLOPCount(7*N*imax);
+      hypre_IncFLOPCount(7 * N * imax);
 
       hypre_EndTiming(time_index);
       hypre_PrintTiming("Matvec time", hypre_MPI_COMM_WORLD);
@@ -1015,7 +1020,9 @@ main( hypre_int argc,
    HYPRE_StructVectorDestroy(x);
 
    for ( i = 0; i < (dim + 1); i++)
+   {
       hypre_TFree(offsets[i], HYPRE_MEMORY_HOST);
+   }
    hypre_TFree(offsets, HYPRE_MEMORY_HOST);
 
    /* Finalize MPI */
@@ -1037,7 +1044,7 @@ AddValuesVector( hypre_StructGrid  *gridvector,
                  HYPRE_Int          *period,
                  HYPRE_Real         value  )
 {
-/* #include  "_hypre_struct_mv.h" */
+   /* #include  "_hypre_struct_mv.h" */
    HYPRE_Int ierr = 0;
    hypre_BoxArray     *gridboxes;
    HYPRE_Int          ib;
@@ -1045,7 +1052,7 @@ AddValuesVector( hypre_StructGrid  *gridvector,
    hypre_IndexRef     iupper;
    hypre_Box          *box;
    HYPRE_Real         *values;
-   HYPRE_Int          volume,dim;
+   HYPRE_Int          volume, dim;
 #if 0 //defined(HYPRE_USING_CUDA)
    HYPRE_Int          data_location = hypre_StructGridDataLocation(hypre_StructVectorGrid(zvector));
 #endif
@@ -1053,7 +1060,7 @@ AddValuesVector( hypre_StructGrid  *gridvector,
    gridboxes =  hypre_StructGridBoxes(gridvector);
    dim       =  hypre_StructGridNDim(gridvector);
 
-   ib=0;
+   ib = 0;
    hypre_ForBoxI(ib, gridboxes)
    {
       box      = hypre_BoxArrayBox(gridboxes, ib);
@@ -1061,14 +1068,14 @@ AddValuesVector( hypre_StructGrid  *gridvector,
 #if 0 //defined(HYPRE_USING_CUDA)
       if (data_location != HYPRE_MEMORY_HOST)
       {
-         values   = hypre_CTAlloc(HYPRE_Real, volume,HYPRE_MEMORY_DEVICE);
+         values   = hypre_CTAlloc(HYPRE_Real, volume, HYPRE_MEMORY_DEVICE);
       }
       else
       {
-         values   = hypre_CTAlloc(HYPRE_Real, volume,HYPRE_MEMORY_HOST);
+         values   = hypre_CTAlloc(HYPRE_Real, volume, HYPRE_MEMORY_HOST);
       }
 #else
-      values   = hypre_CTAlloc(HYPRE_Real, volume,HYPRE_MEMORY_DEVICE);
+      values   = hypre_CTAlloc(HYPRE_Real, volume, HYPRE_MEMORY_DEVICE);
 #endif
       /*-----------------------------------------------------------
        * For periodic b.c. in all directions, need rhs to satisfy
@@ -1105,14 +1112,14 @@ AddValuesVector( hypre_StructGrid  *gridvector,
 #if 0 //defined(HYPRE_USING_CUDA)
       if (data_location < 1)
       {
-          hypre_TFree(values,HYPRE_MEMORY_DEVICE);
+         hypre_TFree(values, HYPRE_MEMORY_DEVICE);
       }
       else
       {
-          hypre_TFree(values,HYPRE_MEMORY_HOST);
+         hypre_TFree(values, HYPRE_MEMORY_HOST);
       }
 #else
-      hypre_TFree(values,HYPRE_MEMORY_DEVICE);
+      hypre_TFree(values, HYPRE_MEMORY_DEVICE);
 #endif
 
    }
@@ -1128,7 +1135,7 @@ AddValuesVector( hypre_StructGrid  *gridvector,
  ******************************************************************************/
 
 HYPRE_Int
-AddValuesMatrix(HYPRE_StructMatrix A,HYPRE_StructGrid gridmatrix,
+AddValuesMatrix(HYPRE_StructMatrix A, HYPRE_StructGrid gridmatrix,
                 HYPRE_Real        cx,
                 HYPRE_Real        cy,
                 HYPRE_Real        cz,
@@ -1137,18 +1144,18 @@ AddValuesMatrix(HYPRE_StructMatrix A,HYPRE_StructGrid gridmatrix,
                 HYPRE_Real        conz)
 {
 
-   HYPRE_Int ierr=0;
+   HYPRE_Int ierr = 0;
    hypre_BoxArray     *gridboxes;
-   HYPRE_Int           s,bi;
+   HYPRE_Int           s, bi;
    hypre_IndexRef      ilower;
    hypre_IndexRef      iupper;
    hypre_Box          *box;
    HYPRE_Real         *values;
-   HYPRE_Real          east,west;
-   HYPRE_Real          north,south;
-   HYPRE_Real          top,bottom;
+   HYPRE_Real          east, west;
+   HYPRE_Real          north, south;
+   HYPRE_Real          top, bottom;
    HYPRE_Real          center;
-   HYPRE_Int           volume,dim,sym;
+   HYPRE_Int           volume, dim, sym;
    HYPRE_Int          *stencil_indices;
    HYPRE_Int           stencil_size;
    HYPRE_Int           constant_coefficient;
@@ -1161,7 +1168,7 @@ AddValuesMatrix(HYPRE_StructMatrix A,HYPRE_StructGrid gridmatrix,
    sym       =  hypre_StructMatrixSymmetric(A);
    constant_coefficient = hypre_StructMatrixConstantCoefficient(A);
 
-   bi=0;
+   bi = 0;
 
    east = -cx;
    west = -cx;
@@ -1169,9 +1176,9 @@ AddValuesMatrix(HYPRE_StructMatrix A,HYPRE_StructGrid gridmatrix,
    south = -cy;
    top = -cz;
    bottom = -cz;
-   center = 2.0*cx;
-   if (dim > 1) center += 2.0*cy;
-   if (dim > 2) center += 2.0*cz;
+   center = 2.0 * cx;
+   if (dim > 1) { center += 2.0 * cy; }
+   if (dim > 2) { center += 2.0 * cz; }
 
    stencil_size = 1 + (2 - sym) * dim;
    stencil_indices = hypre_CTAlloc(HYPRE_Int,  stencil_size, HYPRE_MEMORY_HOST);
@@ -1180,9 +1187,9 @@ AddValuesMatrix(HYPRE_StructMatrix A,HYPRE_StructGrid gridmatrix,
       stencil_indices[s] = s;
    }
 
-   if(sym)
+   if (sym)
    {
-      if ( constant_coefficient==0 )
+      if ( constant_coefficient == 0 )
       {
          hypre_ForBoxI(bi, gridboxes)
          {
@@ -1191,34 +1198,34 @@ AddValuesMatrix(HYPRE_StructMatrix A,HYPRE_StructGrid gridmatrix,
 #if 0 //defined(HYPRE_USING_CUDA)
             if (data_location != HYPRE_MEMORY_HOST)
             {
-               values     = hypre_CTAlloc(HYPRE_Real, stencil_size*volume,HYPRE_MEMORY_DEVICE);
+               values     = hypre_CTAlloc(HYPRE_Real, stencil_size * volume, HYPRE_MEMORY_DEVICE);
             }
             else
             {
-               values     = hypre_CTAlloc(HYPRE_Real, stencil_size*volume,HYPRE_MEMORY_HOST);
+               values     = hypre_CTAlloc(HYPRE_Real, stencil_size * volume, HYPRE_MEMORY_HOST);
             }
 #else
-            values     = hypre_CTAlloc(HYPRE_Real, stencil_size*volume,HYPRE_MEMORY_DEVICE);
+            values     = hypre_CTAlloc(HYPRE_Real, stencil_size * volume, HYPRE_MEMORY_DEVICE);
 #endif
-            hypre_LoopBegin(volume,d)
+            hypre_LoopBegin(volume, d)
             {
-               HYPRE_Int i = stencil_size*d;
+               HYPRE_Int i = stencil_size * d;
                switch (dim)
                {
                   case 1:
                      values[i  ] = west;
-                     values[i+1] = center;
+                     values[i + 1] = center;
                      break;
                   case 2:
                      values[i  ] = west;
-                     values[i+1] = south;
-                     values[i+2] = center;
+                     values[i + 1] = south;
+                     values[i + 2] = center;
                      break;
                   case 3:
                      values[i  ] = west;
-                     values[i+1] = south;
-                     values[i+2] = bottom;
-                     values[i+3] = center;
+                     values[i + 1] = south;
+                     values[i + 2] = bottom;
+                     values[i + 3] = center;
                      break;
                }
             }
@@ -1231,18 +1238,18 @@ AddValuesMatrix(HYPRE_StructMatrix A,HYPRE_StructGrid gridmatrix,
 #if 0 //defined(HYPRE_USING_CUDA)
             if (data_location != HYPRE_MEMORY_HOST)
             {
-               hypre_TFree(values,HYPRE_MEMORY_DEVICE);
+               hypre_TFree(values, HYPRE_MEMORY_DEVICE);
             }
             else
             {
-               hypre_TFree(values,HYPRE_MEMORY_HOST);
+               hypre_TFree(values, HYPRE_MEMORY_HOST);
             }
 #else
-            hypre_TFree(values,HYPRE_MEMORY_DEVICE);
+            hypre_TFree(values, HYPRE_MEMORY_DEVICE);
 #endif
          }
       }
-      else if ( constant_coefficient==1 )
+      else if ( constant_coefficient == 1 )
       {
          values   = hypre_CTAlloc(HYPRE_Real,  stencil_size, HYPRE_MEMORY_HOST);
          switch (dim)
@@ -1272,10 +1279,10 @@ AddValuesMatrix(HYPRE_StructMatrix A,HYPRE_StructGrid gridmatrix,
       }
       else
       {
-         hypre_assert( constant_coefficient==2 );
+         hypre_assert( constant_coefficient == 2 );
 
          /* stencil index for the center equals dim, so it's easy to leave out */
-         values   = hypre_CTAlloc(HYPRE_Real,  stencil_size-1, HYPRE_MEMORY_HOST);
+         values   = hypre_CTAlloc(HYPRE_Real,  stencil_size - 1, HYPRE_MEMORY_HOST);
          switch (dim)
          {
             case 1:
@@ -1293,7 +1300,7 @@ AddValuesMatrix(HYPRE_StructMatrix A,HYPRE_StructGrid gridmatrix,
          }
          if (hypre_BoxArraySize(gridboxes) > 0)
          {
-            HYPRE_StructMatrixSetConstantValues(A, stencil_size-1,
+            HYPRE_StructMatrixSetConstantValues(A, stencil_size - 1,
                                                 stencil_indices, values);
          }
          hypre_TFree(values, HYPRE_MEMORY_HOST);
@@ -1305,16 +1312,16 @@ AddValuesMatrix(HYPRE_StructMatrix A,HYPRE_StructGrid gridmatrix,
 #if 0 //defined(HYPRE_USING_CUDA)
             if (data_location != HYPRE_MEMORY_HOST)
             {
-               values   = hypre_CTAlloc(HYPRE_Real, volume,HYPRE_MEMORY_DEVICE);
+               values   = hypre_CTAlloc(HYPRE_Real, volume, HYPRE_MEMORY_DEVICE);
             }
             else
             {
-               values   = hypre_CTAlloc(HYPRE_Real, volume,HYPRE_MEMORY_HOST);
+               values   = hypre_CTAlloc(HYPRE_Real, volume, HYPRE_MEMORY_HOST);
             }
 #else
-            values   = hypre_CTAlloc(HYPRE_Real, volume,HYPRE_MEMORY_DEVICE);
+            values   = hypre_CTAlloc(HYPRE_Real, volume, HYPRE_MEMORY_DEVICE);
 #endif
-            hypre_LoopBegin(volume,i)
+            hypre_LoopBegin(volume, i)
             {
                values[i] = center;
             }
@@ -1323,18 +1330,18 @@ AddValuesMatrix(HYPRE_StructMatrix A,HYPRE_StructGrid gridmatrix,
             ilower = hypre_BoxIMin(box);
             iupper = hypre_BoxIMax(box);
             HYPRE_StructMatrixSetBoxValues(A, ilower, iupper, 1,
-                                           stencil_indices+dim, values);
+                                           stencil_indices + dim, values);
 #if 0 //defined(HYPRE_USING_CUDA)
             if (data_location == HYPRE_MEMORY_DEVICE)
             {
-               hypre_TFree(values,HYPRE_MEMORY_DEVICE);
+               hypre_TFree(values, HYPRE_MEMORY_DEVICE);
             }
             else
             {
-               hypre_TFree(values,HYPRE_MEMORY_HOST);
+               hypre_TFree(values, HYPRE_MEMORY_HOST);
             }
 #else
-            hypre_TFree(values,HYPRE_MEMORY_DEVICE);
+            hypre_TFree(values, HYPRE_MEMORY_DEVICE);
 #endif
          }
       }
@@ -1372,7 +1379,7 @@ AddValuesMatrix(HYPRE_StructMatrix A,HYPRE_StructGrid gridmatrix,
          center -= conz;
       }
 
-      if ( constant_coefficient==0 )
+      if ( constant_coefficient == 0 )
       {
          hypre_ForBoxI(bi, gridboxes)
          {
@@ -1381,40 +1388,40 @@ AddValuesMatrix(HYPRE_StructMatrix A,HYPRE_StructGrid gridmatrix,
 #if 0 //defined(HYPRE_USING_CUDA)
             if (data_location < 1)
             {
-               values   = hypre_CTAlloc(HYPRE_Real, stencil_size*volume,HYPRE_MEMORY_DEVICE);
+               values   = hypre_CTAlloc(HYPRE_Real, stencil_size * volume, HYPRE_MEMORY_DEVICE);
             }
             else
             {
-               values   = hypre_CTAlloc(HYPRE_Real, stencil_size*volume,HYPRE_MEMORY_HOST);
+               values   = hypre_CTAlloc(HYPRE_Real, stencil_size * volume, HYPRE_MEMORY_HOST);
             }
 #else
-            values   = hypre_CTAlloc(HYPRE_Real, stencil_size*volume,HYPRE_MEMORY_DEVICE);
+            values   = hypre_CTAlloc(HYPRE_Real, stencil_size * volume, HYPRE_MEMORY_DEVICE);
 #endif
-            hypre_LoopBegin(volume,d)
+            hypre_LoopBegin(volume, d)
             {
-               HYPRE_Int i = stencil_size*d;
+               HYPRE_Int i = stencil_size * d;
                switch (dim)
                {
                   case 1:
                      values[i  ] = west;
-                     values[i+1] = center;
-                     values[i+2] = east;
+                     values[i + 1] = center;
+                     values[i + 2] = east;
                      break;
                   case 2:
                      values[i  ] = west;
-                     values[i+1] = south;
-                     values[i+2] = center;
-                     values[i+3] = east;
-                     values[i+4] = north;
+                     values[i + 1] = south;
+                     values[i + 2] = center;
+                     values[i + 3] = east;
+                     values[i + 4] = north;
                      break;
                   case 3:
                      values[i  ] = west;
-                     values[i+1] = south;
-                     values[i+2] = bottom;
-                     values[i+3] = center;
-                     values[i+4] = east;
-                     values[i+5] = north;
-                     values[i+6] = top;
+                     values[i + 1] = south;
+                     values[i + 2] = bottom;
+                     values[i + 3] = center;
+                     values[i + 4] = east;
+                     values[i + 5] = north;
+                     values[i + 6] = top;
                      break;
                }
             }
@@ -1428,20 +1435,20 @@ AddValuesMatrix(HYPRE_StructMatrix A,HYPRE_StructGrid gridmatrix,
 #if 0 //defined(HYPRE_USING_CUDA)
             if (data_location < 1)
             {
-               hypre_TFree(values,HYPRE_MEMORY_DEVICE);
+               hypre_TFree(values, HYPRE_MEMORY_DEVICE);
             }
             else
             {
-               hypre_TFree(values,HYPRE_MEMORY_HOST);
+               hypre_TFree(values, HYPRE_MEMORY_HOST);
             }
 #else
-            hypre_TFree(values,HYPRE_MEMORY_DEVICE);
+            hypre_TFree(values, HYPRE_MEMORY_DEVICE);
 #endif
          }
       }
-      else if ( constant_coefficient==1 )
+      else if ( constant_coefficient == 1 )
       {
-         values = hypre_CTAlloc( HYPRE_Real,  stencil_size , HYPRE_MEMORY_HOST);
+         values = hypre_CTAlloc( HYPRE_Real,  stencil_size, HYPRE_MEMORY_HOST);
 
          switch (dim)
          {
@@ -1478,10 +1485,11 @@ AddValuesMatrix(HYPRE_StructMatrix A,HYPRE_StructGrid gridmatrix,
       }
       else
       {
-         hypre_assert( constant_coefficient==2 );
-         values = hypre_CTAlloc( HYPRE_Real,  stencil_size-1 , HYPRE_MEMORY_HOST);
+         hypre_assert( constant_coefficient == 2 );
+         values = hypre_CTAlloc( HYPRE_Real,  stencil_size - 1, HYPRE_MEMORY_HOST);
          switch (dim)
-         {  /* no center in stencil_indices and values */
+         {
+            /* no center in stencil_indices and values */
             case 1:
                stencil_indices[0] = 0;
                stencil_indices[1] = 2;
@@ -1531,16 +1539,16 @@ AddValuesMatrix(HYPRE_StructMatrix A,HYPRE_StructGrid gridmatrix,
 #if 0 //defined(HYPRE_USING_CUDA)
             if (data_location < 1)
             {
-               values   = hypre_CTAlloc(HYPRE_Real, volume,HYPRE_MEMORY_DEVICE);
+               values   = hypre_CTAlloc(HYPRE_Real, volume, HYPRE_MEMORY_DEVICE);
             }
             else
             {
-               values   = hypre_CTAlloc(HYPRE_Real, volume,HYPRE_MEMORY_HOST);
+               values   = hypre_CTAlloc(HYPRE_Real, volume, HYPRE_MEMORY_HOST);
             }
 #else
-            values   = hypre_CTAlloc(HYPRE_Real, volume,HYPRE_MEMORY_DEVICE);
+            values   = hypre_CTAlloc(HYPRE_Real, volume, HYPRE_MEMORY_DEVICE);
 #endif
-            hypre_LoopBegin(volume,i)
+            hypre_LoopBegin(volume, i)
             {
                values[i] = center;
             }
@@ -1553,14 +1561,14 @@ AddValuesMatrix(HYPRE_StructMatrix A,HYPRE_StructGrid gridmatrix,
 #if 0 //defined(HYPRE_USING_CUDA)
             if (data_location < 1)
             {
-               hypre_TFree(values,HYPRE_MEMORY_DEVICE);
+               hypre_TFree(values, HYPRE_MEMORY_DEVICE);
             }
             else
             {
-               hypre_TFree(values,HYPRE_MEMORY_HOST);
+               hypre_TFree(values, HYPRE_MEMORY_HOST);
             }
 #else
-            hypre_TFree(values,HYPRE_MEMORY_DEVICE);
+            hypre_TFree(values, HYPRE_MEMORY_DEVICE);
 #endif
          }
       }
@@ -1577,12 +1585,12 @@ AddValuesMatrix(HYPRE_StructMatrix A,HYPRE_StructGrid gridmatrix,
  *********************************************************************************/
 
 HYPRE_Int
-SetStencilBndry(HYPRE_StructMatrix A,HYPRE_StructGrid gridmatrix,HYPRE_Int* period)
+SetStencilBndry(HYPRE_StructMatrix A, HYPRE_StructGrid gridmatrix, HYPRE_Int* period)
 {
 
-   HYPRE_Int ierr=0;
+   HYPRE_Int ierr = 0;
    hypre_BoxArray    *gridboxes;
-   HYPRE_Int          size,i,j,d,ib;
+   HYPRE_Int          size, i, j, d, ib;
    HYPRE_Int        **ilower;
    HYPRE_Int        **iupper;
    HYPRE_Int         *vol;
@@ -1606,7 +1614,7 @@ SetStencilBndry(HYPRE_StructMatrix A,HYPRE_StructGrid gridmatrix,HYPRE_Int* peri
    stencil_indices = hypre_CTAlloc(HYPRE_Int,  1, HYPRE_MEMORY_HOST);
 
    constant_coefficient = hypre_StructMatrixConstantCoefficient(A);
-   if ( constant_coefficient>0 ) return 1;
+   if ( constant_coefficient > 0 ) { return 1; }
    /*...no space dependence if constant_coefficient==1,
      and space dependence only for diagonal if constant_coefficient==2 --
      and this function only touches off-diagonal entries */
@@ -1628,17 +1636,17 @@ SetStencilBndry(HYPRE_StructMatrix A,HYPRE_StructGrid gridmatrix,HYPRE_Int* peri
       box      = hypre_BoxArrayBox(gridboxes, i);
       volume   =  hypre_BoxVolume(box);
       vol[i]   = volume;
-      hypre_CopyBox(box,dummybox);
+      hypre_CopyBox(box, dummybox);
       for (d = 0; d < dim; d++)
       {
-         ilower[ib][d] = hypre_BoxIMinD(dummybox,d);
-         iupper[ib][d] = hypre_BoxIMaxD(dummybox,d);
+         ilower[ib][d] = hypre_BoxIMinD(dummybox, d);
+         iupper[ib][d] = hypre_BoxIMaxD(dummybox, d);
       }
       ib++ ;
       hypre_BoxDestroy(dummybox);
    }
 
-   if ( constant_coefficient==0 )
+   if ( constant_coefficient == 0 )
    {
       for (d = 0; d < dim; d++)
       {
@@ -1647,22 +1655,22 @@ SetStencilBndry(HYPRE_StructMatrix A,HYPRE_StructGrid gridmatrix,HYPRE_Int* peri
 #if 0 //defined(HYPRE_USING_CUDA)
             if (data_location < 1)
             {
-               values = hypre_CTAlloc(HYPRE_Real, vol[ib],HYPRE_MEMORY_DEVICE);
+               values = hypre_CTAlloc(HYPRE_Real, vol[ib], HYPRE_MEMORY_DEVICE);
             }
             else
             {
-               values = hypre_CTAlloc(HYPRE_Real, vol[ib],HYPRE_MEMORY_HOST);
+               values = hypre_CTAlloc(HYPRE_Real, vol[ib], HYPRE_MEMORY_HOST);
             }
 #else
-            values = hypre_CTAlloc(HYPRE_Real, vol[ib],HYPRE_MEMORY_DEVICE);
+            values = hypre_CTAlloc(HYPRE_Real, vol[ib], HYPRE_MEMORY_DEVICE);
 #endif
-            hypre_LoopBegin(vol[ib],i)
+            hypre_LoopBegin(vol[ib], i)
             {
                values[i] = 0.0;
             }
             hypre_LoopEnd()
 
-            if( ilower[ib][d] == istart[d] && period[d] == 0 )
+            if ( ilower[ib][d] == istart[d] && period[d] == 0 )
             {
                j = iupper[ib][d];
                iupper[ib][d] = istart[d];
@@ -1672,7 +1680,7 @@ SetStencilBndry(HYPRE_StructMatrix A,HYPRE_StructGrid gridmatrix,HYPRE_Int* peri
                iupper[ib][d] = j;
             }
 
-            if( iupper[ib][d] == iend[d] && period[d] == 0 )
+            if ( iupper[ib][d] == iend[d] && period[d] == 0 )
             {
                j = ilower[ib][d];
                ilower[ib][d] = iend[d];
@@ -1684,14 +1692,14 @@ SetStencilBndry(HYPRE_StructMatrix A,HYPRE_StructGrid gridmatrix,HYPRE_Int* peri
 #if 0 //defined(HYPRE_USING_CUDA)
             if (data_location < 1)
             {
-               hypre_TFree(values,HYPRE_MEMORY_DEVICE);
+               hypre_TFree(values, HYPRE_MEMORY_DEVICE);
             }
             else
             {
-               hypre_TFree(values,HYPRE_MEMORY_HOST);
+               hypre_TFree(values, HYPRE_MEMORY_HOST);
             }
 #else
-            hypre_TFree(values,HYPRE_MEMORY_DEVICE);
+            hypre_TFree(values, HYPRE_MEMORY_DEVICE);
 #endif
          }
       }
@@ -1699,7 +1707,7 @@ SetStencilBndry(HYPRE_StructMatrix A,HYPRE_StructGrid gridmatrix,HYPRE_Int* peri
 
    hypre_TFree(vol, HYPRE_MEMORY_HOST);
    hypre_TFree(stencil_indices, HYPRE_MEMORY_HOST);
-   for (ib =0 ; ib < size ; ib++)
+   for (ib = 0 ; ib < size ; ib++)
    {
       hypre_TFree(ilower[ib], HYPRE_MEMORY_HOST);
       hypre_TFree(iupper[ib], HYPRE_MEMORY_HOST);
diff --git a/external/hypre/src/test/test_ij.c b/external/hypre/src/test/test_ij.c
index 4ee3487d..fb94b12e 100644
--- a/external/hypre/src/test/test_ij.c
+++ b/external/hypre/src/test/test_ij.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -41,15 +41,24 @@ BuildParIsoLaplacian( HYPRE_Int argc, char** argv, HYPRE_ParCSRMatrix *A_ptr );
 
 /* end lobpcg */
 
-HYPRE_Int BuildParFromFile (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix *A_ptr );
-HYPRE_Int BuildParLaplacian (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix *A_ptr );
-HYPRE_Int BuildParDifConv (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix *A_ptr );
-HYPRE_Int BuildParFromOneFile2(HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_Int num_functions , HYPRE_ParCSRMatrix *A_ptr );
-HYPRE_Int BuildFuncsFromFiles (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix A , HYPRE_Int **dof_func_ptr );
-HYPRE_Int BuildFuncsFromOneFile (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix A , HYPRE_Int **dof_func_ptr );
-HYPRE_Int BuildRhsParFromOneFile2(HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_Int *partitioning , HYPRE_ParVector *b_ptr );
-HYPRE_Int BuildParLaplacian9pt (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix *A_ptr );
-HYPRE_Int BuildParLaplacian27pt (HYPRE_Int argc , char *argv [], HYPRE_Int arg_index , HYPRE_ParCSRMatrix *A_ptr );
+HYPRE_Int BuildParFromFile (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                            HYPRE_ParCSRMatrix *A_ptr );
+HYPRE_Int BuildParLaplacian (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                             HYPRE_ParCSRMatrix *A_ptr );
+HYPRE_Int BuildParDifConv (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                           HYPRE_ParCSRMatrix *A_ptr );
+HYPRE_Int BuildParFromOneFile2(HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                               HYPRE_Int num_functions, HYPRE_ParCSRMatrix *A_ptr );
+HYPRE_Int BuildFuncsFromFiles (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                               HYPRE_ParCSRMatrix A, HYPRE_Int **dof_func_ptr );
+HYPRE_Int BuildFuncsFromOneFile (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                                 HYPRE_ParCSRMatrix A, HYPRE_Int **dof_func_ptr );
+HYPRE_Int BuildRhsParFromOneFile2(HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                                  HYPRE_Int *partitioning, HYPRE_ParVector *b_ptr );
+HYPRE_Int BuildParLaplacian9pt (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                                HYPRE_ParCSRMatrix *A_ptr );
+HYPRE_Int BuildParLaplacian27pt (HYPRE_Int argc, char *argv [], HYPRE_Int arg_index,
+                                 HYPRE_ParCSRMatrix *A_ptr );
 
 #define SECOND_TIME 0
 
@@ -76,7 +85,7 @@ main( HYPRE_Int   argc,
    HYPRE_Int                 poutdat;
    HYPRE_Int                 debug_flag;
    HYPRE_Int                 ierr = 0;
-   HYPRE_Int                 i,j,k;
+   HYPRE_Int                 i, j, k;
    HYPRE_Int                 indx, rest, tms;
    HYPRE_Int                 max_levels = 25;
    HYPRE_Int                 num_iterations;
@@ -283,17 +292,17 @@ main( HYPRE_Int   argc,
       {
          arg_index++;
          if ( strcmp(argv[arg_index], "parcsr") == 0 )
-            {
-               matrix_id = HYPRE_PARCSR;
-            }
+         {
+            matrix_id = HYPRE_PARCSR;
+         }
          else if ( strcmp(argv[arg_index], "sstruct") == 0 )
-            {
-               matrix_id = HYPRE_SSTRUCT;
-            }
+         {
+            matrix_id = HYPRE_SSTRUCT;
+         }
          else if ( strcmp(argv[arg_index], "struct") == 0 )
-            {
-               matrix_id = HYPRE_STRUCT;
-            };
+         {
+            matrix_id = HYPRE_STRUCT;
+         };
          arg_index++;
       }
       else if ( strcmp(argv[arg_index], "-solver") == 0 )
@@ -302,90 +311,90 @@ main( HYPRE_Int   argc,
 
          /* begin lobpcg */
          if ( strcmp(argv[arg_index], "none") == 0 )
-            {
-               solver_id = NO_SOLVER;
-            }                          /* end lobpcg */
+         {
+            solver_id = NO_SOLVER;
+         }                          /* end lobpcg */
          else if ( strcmp(argv[arg_index], "boomeramg") == 0  ||
                    strcmp(argv[arg_index], "amg") == 0 )
-            {
-               solver_id = HYPRE_BOOMERAMG;
-            }
+         {
+            solver_id = HYPRE_BOOMERAMG;
+         }
          else if ( strcmp(argv[arg_index], "bicgstab") == 0 )
-            {
-               solver_id = HYPRE_BICGSTAB;
-            }
+         {
+            solver_id = HYPRE_BICGSTAB;
+         }
          else if ( strcmp(argv[arg_index], "cgnr") == 0 )
-            {
-               solver_id = HYPRE_CGNR;
-            }
+         {
+            solver_id = HYPRE_CGNR;
+         }
          else if ( strcmp(argv[arg_index], "diagscale") == 0 )
-            {
-               solver_id = HYPRE_DIAGSCALE;
-            }
+         {
+            solver_id = HYPRE_DIAGSCALE;
+         }
          else if ( strcmp(argv[arg_index], "euclid") == 0 )
-            {
-               solver_id = HYPRE_EUCLID;
-            }
+         {
+            solver_id = HYPRE_EUCLID;
+         }
          else if ( strcmp(argv[arg_index], "gmres") == 0 )
-            {
-               solver_id = HYPRE_GMRES;
-            }
+         {
+            solver_id = HYPRE_GMRES;
+         }
          else if ( strcmp(argv[arg_index], "gsmg") == 0 )
-            {
-               solver_id = HYPRE_GSMG;
-            }
+         {
+            solver_id = HYPRE_GSMG;
+         }
          else if ( strcmp(argv[arg_index], "hybrid") == 0 )
-            {
-               solver_id = HYPRE_HYBRID;
-            }
+         {
+            solver_id = HYPRE_HYBRID;
+         }
          else if ( strcmp(argv[arg_index], "jacobi") == 0 )
-            {
-               solver_id = HYPRE_JACOBI;
-            }
+         {
+            solver_id = HYPRE_JACOBI;
+         }
          else if ( strcmp(argv[arg_index], "parasails") == 0 )
-            {
-               solver_id = HYPRE_PARASAILS;
-            }
+         {
+            solver_id = HYPRE_PARASAILS;
+         }
          else if ( strcmp(argv[arg_index], "pcg") == 0 )
-            {
-               solver_id = HYPRE_PCG;
-            }
+         {
+            solver_id = HYPRE_PCG;
+         }
          else if ( strcmp(argv[arg_index], "pfmg") == 0 )
-            {
-               solver_id = HYPRE_PFMG;
-            }
+         {
+            solver_id = HYPRE_PFMG;
+         }
          else if ( strcmp(argv[arg_index], "pilut") == 0 )
-            {
-               solver_id = HYPRE_PILUT;
-            }
+         {
+            solver_id = HYPRE_PILUT;
+         }
          else if ( strcmp(argv[arg_index], "schwarz") == 0 )
-            {
-               solver_id = HYPRE_SCHWARZ;
-            }
+         {
+            solver_id = HYPRE_SCHWARZ;
+         }
          else if ( strcmp(argv[arg_index], "smg") == 0 )
-            {
-               solver_id = HYPRE_SMG;
-            }
+         {
+            solver_id = HYPRE_SMG;
+         }
          else if ( strcmp(argv[arg_index], "sparsemsg") == 0 )
-            {
-               solver_id = HYPRE_SPARSEMSG;
-            }
+         {
+            solver_id = HYPRE_SPARSEMSG;
+         }
          else if ( strcmp(argv[arg_index], "split") == 0 )
-            {
-               solver_id = HYPRE_SPLIT;
-            }
+         {
+            solver_id = HYPRE_SPLIT;
+         }
          else if ( strcmp(argv[arg_index], "splitpfmg") == 0 )
-            {
-               solver_id = HYPRE_SPLITPFMG;
-            }
+         {
+            solver_id = HYPRE_SPLITPFMG;
+         }
          else if ( strcmp(argv[arg_index], "splitsmg") == 0 )
-            {
-               solver_id = HYPRE_SPLITSMG;
-            }
+         {
+            solver_id = HYPRE_SPLITSMG;
+         }
          else if ( strcmp(argv[arg_index], "syspfmg") == 0 )
-            {
-               solver_id = HYPRE_SYSPFMG;
-            };
+         {
+            solver_id = HYPRE_SYSPFMG;
+         };
          arg_index++;
       }
       else if ( strcmp(argv[arg_index], "-precond") == 0 )
@@ -394,90 +403,90 @@ main( HYPRE_Int   argc,
 
          /* begin lobpcg */
          if ( strcmp(argv[arg_index], "none") == 0 )
-            {
-               precond_id = NO_SOLVER;
-            }                          /* end lobpcg */
+         {
+            precond_id = NO_SOLVER;
+         }                          /* end lobpcg */
          else if ( strcmp(argv[arg_index], "boomeramg") == 0  ||
                    strcmp(argv[arg_index], "amg") == 0 )
-            {
-               precond_id = HYPRE_BOOMERAMG;
-            }
+         {
+            precond_id = HYPRE_BOOMERAMG;
+         }
          else if ( strcmp(argv[arg_index], "bicgstab") == 0 )
-            {
-               precond_id = HYPRE_BICGSTAB;
-            }
+         {
+            precond_id = HYPRE_BICGSTAB;
+         }
          else if ( strcmp(argv[arg_index], "cgnr") == 0 )
-            {
-               precond_id = HYPRE_CGNR;
-            }
+         {
+            precond_id = HYPRE_CGNR;
+         }
          else if ( strcmp(argv[arg_index], "diagscale") == 0 )
-            {
-               precond_id = HYPRE_DIAGSCALE;
-            }
+         {
+            precond_id = HYPRE_DIAGSCALE;
+         }
          else if ( strcmp(argv[arg_index], "euclid") == 0 )
-            {
-               precond_id = HYPRE_EUCLID;
-            }
+         {
+            precond_id = HYPRE_EUCLID;
+         }
          else if ( strcmp(argv[arg_index], "gmres") == 0 )
-            {
-               precond_id = HYPRE_GMRES;
-            }
+         {
+            precond_id = HYPRE_GMRES;
+         }
          else if ( strcmp(argv[arg_index], "gsmg") == 0 )
-            {
-               precond_id = HYPRE_GSMG;
-            }
+         {
+            precond_id = HYPRE_GSMG;
+         }
          else if ( strcmp(argv[arg_index], "hybrid") == 0 )
-            {
-               precond_id = HYPRE_HYBRID;
-            }
+         {
+            precond_id = HYPRE_HYBRID;
+         }
          else if ( strcmp(argv[arg_index], "jacobi") == 0 )
-            {
-               precond_id = HYPRE_JACOBI;
-            }
+         {
+            precond_id = HYPRE_JACOBI;
+         }
          else if ( strcmp(argv[arg_index], "parasails") == 0 )
-            {
-               precond_id = HYPRE_PARASAILS;
-            }
+         {
+            precond_id = HYPRE_PARASAILS;
+         }
          else if ( strcmp(argv[arg_index], "pcg") == 0 )
-            {
-               precond_id = HYPRE_PCG;
-            }
+         {
+            precond_id = HYPRE_PCG;
+         }
          else if ( strcmp(argv[arg_index], "pfmg") == 0 )
-            {
-               precond_id = HYPRE_PFMG;
-            }
+         {
+            precond_id = HYPRE_PFMG;
+         }
          else if ( strcmp(argv[arg_index], "pilut") == 0 )
-            {
-               precond_id = HYPRE_PILUT;
-            }
+         {
+            precond_id = HYPRE_PILUT;
+         }
          else if ( strcmp(argv[arg_index], "schwarz") == 0 )
-            {
-               precond_id = HYPRE_SCHWARZ;
-            }
+         {
+            precond_id = HYPRE_SCHWARZ;
+         }
          else if ( strcmp(argv[arg_index], "smg") == 0 )
-            {
-               precond_id = HYPRE_SMG;
-            }
+         {
+            precond_id = HYPRE_SMG;
+         }
          else if ( strcmp(argv[arg_index], "sparsemsg") == 0 )
-            {
-               precond_id = HYPRE_SPARSEMSG;
-            }
+         {
+            precond_id = HYPRE_SPARSEMSG;
+         }
          else if ( strcmp(argv[arg_index], "split") == 0 )
-            {
-               precond_id = HYPRE_SPLIT;
-            }
+         {
+            precond_id = HYPRE_SPLIT;
+         }
          else if ( strcmp(argv[arg_index], "splitpfmg") == 0 )
-            {
-               precond_id = HYPRE_SPLITPFMG;
-            }
+         {
+            precond_id = HYPRE_SPLITPFMG;
+         }
          else if ( strcmp(argv[arg_index], "splitsmg") == 0 )
-            {
-               precond_id = HYPRE_SPLITSMG;
-            }
+         {
+            precond_id = HYPRE_SPLITSMG;
+         }
          else if ( strcmp(argv[arg_index], "syspfmg") == 0 )
-            {
-               precond_id = HYPRE_SYSPFMG;
-            };
+         {
+            precond_id = HYPRE_SYSPFMG;
+         };
          arg_index++;
       }
       else if ( strcmp(argv[arg_index], "-rhsfromfile") == 0 )
@@ -644,9 +653,9 @@ main( HYPRE_Int   argc,
       else if ( strcmp(argv[arg_index], "-dt") == 0 )
       {
          arg_index++;
-         dt = atof(argv[arg_index++]);
+         dt = (HYPRE_Real)atof(argv[arg_index++]);
          build_rhs_type = -1;
-         if ( build_src_type == -1 ) build_src_type = 2;
+         if ( build_src_type == -1 ) { build_src_type = 2; }
       }
       else if ( strcmp(argv[arg_index], "-help") == 0 )
       {
@@ -723,7 +732,7 @@ main( HYPRE_Int   argc,
       {
          /* lobpcg: inner pcg iterations */
          arg_index++;
-         pcgTol = atof(argv[arg_index++]);
+         pcgTol = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-pcgmode") == 0 )
       {
@@ -741,152 +750,153 @@ main( HYPRE_Int   argc,
    /* begin lobpcg */
 
    if ( solver_id == HYPRE_BOOMERAMG && lobpcgFlag )
-      {solver_id = HYPRE_BOOMERAMG;
-       precond_id = HYPRE_PCG;
-      };
+   {
+      solver_id = HYPRE_BOOMERAMG;
+      precond_id = HYPRE_PCG;
+   };
 
    /* end lobpcg */
 
    if (solver_id == HYPRE_PARASAILS)
    {
-     max_levels = 1;
+      max_levels = 1;
    }
 
    /* defaults for BoomerAMG */
    if (solver_id == HYPRE_BOOMERAMG)
    {
-   strong_threshold = 0.25;
-   trunc_factor = 0.;
-   cycle_type = 1;
-
-   num_grid_sweeps   = hypre_CTAlloc(HYPRE_Int, 4, HYPRE_MEMORY_HOST);
-   grid_relax_type   = hypre_CTAlloc(HYPRE_Int, 4, HYPRE_MEMORY_HOST);
-   grid_relax_points = hypre_CTAlloc(HYPRE_Int *, 4, HYPRE_MEMORY_HOST);
-   relax_weight      = hypre_CTAlloc(HYPRE_Real,  max_levels, HYPRE_MEMORY_HOST);
-   omega      = hypre_CTAlloc(HYPRE_Real,  max_levels, HYPRE_MEMORY_HOST);
+      strong_threshold = 0.25;
+      trunc_factor = 0.;
+      cycle_type = 1;
 
-   for (i=0; i < max_levels; i++)
-   {
-      relax_weight[i] = 1.;
-      omega[i] = 1.;
-   }
+      num_grid_sweeps   = hypre_CTAlloc(HYPRE_Int, 4, HYPRE_MEMORY_HOST);
+      grid_relax_type   = hypre_CTAlloc(HYPRE_Int, 4, HYPRE_MEMORY_HOST);
+      grid_relax_points = hypre_CTAlloc(HYPRE_Int *, 4, HYPRE_MEMORY_HOST);
+      relax_weight      = hypre_CTAlloc(HYPRE_Real,  max_levels, HYPRE_MEMORY_HOST);
+      omega      = hypre_CTAlloc(HYPRE_Real,  max_levels, HYPRE_MEMORY_HOST);
 
-   /* for CGNR preconditioned with Boomeramg, only relaxation scheme 0 is
-      implemented, i.e. Jacobi relaxation */
-   if (precond_id == HYPRE_CGNR)
-   {
-      /* fine grid */
-      relax_default = 7;
-      grid_relax_type[0] = relax_default;
-      num_grid_sweeps[0] = num_sweep;
-      grid_relax_points[0] = hypre_CTAlloc(HYPRE_Int,  num_sweep, HYPRE_MEMORY_HOST);
-      for (i=0; i<num_sweep; i++)
+      for (i = 0; i < max_levels; i++)
       {
-         grid_relax_points[0][i] = 0;
+         relax_weight[i] = 1.;
+         omega[i] = 1.;
       }
-      /* down cycle */
-      grid_relax_type[1] = relax_default;
-       num_grid_sweeps[1] = num_sweep;
-      grid_relax_points[1] = hypre_CTAlloc(HYPRE_Int,  num_sweep, HYPRE_MEMORY_HOST);
-      for (i=0; i<num_sweep; i++)
+
+      /* for CGNR preconditioned with Boomeramg, only relaxation scheme 0 is
+         implemented, i.e. Jacobi relaxation */
+      if (precond_id == HYPRE_CGNR)
       {
-         grid_relax_points[1][i] = 0;
+         /* fine grid */
+         relax_default = 7;
+         grid_relax_type[0] = relax_default;
+         num_grid_sweeps[0] = num_sweep;
+         grid_relax_points[0] = hypre_CTAlloc(HYPRE_Int,  num_sweep, HYPRE_MEMORY_HOST);
+         for (i = 0; i < num_sweep; i++)
+         {
+            grid_relax_points[0][i] = 0;
+         }
+         /* down cycle */
+         grid_relax_type[1] = relax_default;
+         num_grid_sweeps[1] = num_sweep;
+         grid_relax_points[1] = hypre_CTAlloc(HYPRE_Int,  num_sweep, HYPRE_MEMORY_HOST);
+         for (i = 0; i < num_sweep; i++)
+         {
+            grid_relax_points[1][i] = 0;
+         }
+         /* up cycle */
+         grid_relax_type[2] = relax_default;
+         num_grid_sweeps[2] = num_sweep;
+         grid_relax_points[2] = hypre_CTAlloc(HYPRE_Int,  num_sweep, HYPRE_MEMORY_HOST);
+         for (i = 0; i < num_sweep; i++)
+         {
+            grid_relax_points[2][i] = 0;
+         }
       }
-      /* up cycle */
-      grid_relax_type[2] = relax_default;
-      num_grid_sweeps[2] = num_sweep;
-      grid_relax_points[2] = hypre_CTAlloc(HYPRE_Int,  num_sweep, HYPRE_MEMORY_HOST);
-      for (i=0; i<num_sweep; i++)
+      else if (coarsen_type == 5)
       {
-         grid_relax_points[2][i] = 0;
-      }
-   }
-   else if (coarsen_type == 5)
-   {
-      /* fine grid */
-      num_grid_sweeps[0] = 3;
-      grid_relax_type[0] = relax_default;
-      grid_relax_points[0] = hypre_CTAlloc(HYPRE_Int,  3, HYPRE_MEMORY_HOST);
-      grid_relax_points[0][0] = -2;
-      grid_relax_points[0][1] = -1;
-      grid_relax_points[0][2] = 1;
+         /* fine grid */
+         num_grid_sweeps[0] = 3;
+         grid_relax_type[0] = relax_default;
+         grid_relax_points[0] = hypre_CTAlloc(HYPRE_Int,  3, HYPRE_MEMORY_HOST);
+         grid_relax_points[0][0] = -2;
+         grid_relax_points[0][1] = -1;
+         grid_relax_points[0][2] = 1;
 
-      /* down cycle */
-      num_grid_sweeps[1] = 4;
-      grid_relax_type[1] = relax_default;
-      grid_relax_points[1] = hypre_CTAlloc(HYPRE_Int,  4, HYPRE_MEMORY_HOST);
-      grid_relax_points[1][0] = -1;
-      grid_relax_points[1][1] = 1;
-      grid_relax_points[1][2] = -2;
-      grid_relax_points[1][3] = -2;
+         /* down cycle */
+         num_grid_sweeps[1] = 4;
+         grid_relax_type[1] = relax_default;
+         grid_relax_points[1] = hypre_CTAlloc(HYPRE_Int,  4, HYPRE_MEMORY_HOST);
+         grid_relax_points[1][0] = -1;
+         grid_relax_points[1][1] = 1;
+         grid_relax_points[1][2] = -2;
+         grid_relax_points[1][3] = -2;
 
-      /* up cycle */
-      num_grid_sweeps[2] = 4;
-      grid_relax_type[2] = relax_default;
-      grid_relax_points[2] = hypre_CTAlloc(HYPRE_Int,  4, HYPRE_MEMORY_HOST);
-      grid_relax_points[2][0] = -2;
-      grid_relax_points[2][1] = -2;
-      grid_relax_points[2][2] = 1;
-      grid_relax_points[2][3] = -1;
-   }
-   else
-   {
-      /* fine grid */
-      grid_relax_type[0] = relax_default;
-      /*num_grid_sweeps[0] = num_sweep;
-      grid_relax_points[0] = hypre_CTAlloc(HYPRE_Int,  num_sweep, HYPRE_MEMORY_HOST);
-      for (i=0; i<num_sweep; i++)
-      {
-         grid_relax_points[0][i] = 0;
-      } */
-      num_grid_sweeps[0] = 2*num_sweep;
-      grid_relax_points[0] = hypre_CTAlloc(HYPRE_Int,  2*num_sweep, HYPRE_MEMORY_HOST);
-      for (i=0; i<2*num_sweep; i+=2)
-      {
-         grid_relax_points[0][i] = 1;
-         grid_relax_points[0][i+1] = -1;
+         /* up cycle */
+         num_grid_sweeps[2] = 4;
+         grid_relax_type[2] = relax_default;
+         grid_relax_points[2] = hypre_CTAlloc(HYPRE_Int,  4, HYPRE_MEMORY_HOST);
+         grid_relax_points[2][0] = -2;
+         grid_relax_points[2][1] = -2;
+         grid_relax_points[2][2] = 1;
+         grid_relax_points[2][3] = -1;
       }
-
-      /* down cycle */
-      grid_relax_type[1] = relax_default;
-      /* num_grid_sweeps[1] = num_sweep;
-      grid_relax_points[1] = hypre_CTAlloc(HYPRE_Int,  num_sweep, HYPRE_MEMORY_HOST);
-      for (i=0; i<num_sweep; i++)
-      {
-         grid_relax_points[1][i] = 0;
-      } */
-      num_grid_sweeps[1] = 2*num_sweep;
-      grid_relax_type[1] = relax_default;
-      grid_relax_points[1] = hypre_CTAlloc(HYPRE_Int,  2*num_sweep, HYPRE_MEMORY_HOST);
-      for (i=0; i<2*num_sweep; i+=2)
+      else
       {
-         grid_relax_points[1][i] = 1;
-         grid_relax_points[1][i+1] = -1;
-      }
+         /* fine grid */
+         grid_relax_type[0] = relax_default;
+         /*num_grid_sweeps[0] = num_sweep;
+         grid_relax_points[0] = hypre_CTAlloc(HYPRE_Int,  num_sweep, HYPRE_MEMORY_HOST);
+         for (i=0; i<num_sweep; i++)
+         {
+            grid_relax_points[0][i] = 0;
+         } */
+         num_grid_sweeps[0] = 2 * num_sweep;
+         grid_relax_points[0] = hypre_CTAlloc(HYPRE_Int,  2 * num_sweep, HYPRE_MEMORY_HOST);
+         for (i = 0; i < 2 * num_sweep; i += 2)
+         {
+            grid_relax_points[0][i] = 1;
+            grid_relax_points[0][i + 1] = -1;
+         }
 
-      /* up cycle */
-      grid_relax_type[2] = relax_default;
-      /* num_grid_sweeps[2] = num_sweep;
-      grid_relax_points[2] = hypre_CTAlloc(HYPRE_Int,  num_sweep, HYPRE_MEMORY_HOST);
-      for (i=0; i<num_sweep; i++)
-      {
-         grid_relax_points[2][i] = 0;
-      } */
-      num_grid_sweeps[2] = 2*num_sweep;
-      grid_relax_type[2] = relax_default;
-      grid_relax_points[2] = hypre_CTAlloc(HYPRE_Int,  2*num_sweep, HYPRE_MEMORY_HOST);
-      for (i=0; i<2*num_sweep; i+=2)
-      {
-         grid_relax_points[2][i] = -1;
-         grid_relax_points[2][i+1] = 1;
+         /* down cycle */
+         grid_relax_type[1] = relax_default;
+         /* num_grid_sweeps[1] = num_sweep;
+         grid_relax_points[1] = hypre_CTAlloc(HYPRE_Int,  num_sweep, HYPRE_MEMORY_HOST);
+         for (i=0; i<num_sweep; i++)
+         {
+            grid_relax_points[1][i] = 0;
+         } */
+         num_grid_sweeps[1] = 2 * num_sweep;
+         grid_relax_type[1] = relax_default;
+         grid_relax_points[1] = hypre_CTAlloc(HYPRE_Int,  2 * num_sweep, HYPRE_MEMORY_HOST);
+         for (i = 0; i < 2 * num_sweep; i += 2)
+         {
+            grid_relax_points[1][i] = 1;
+            grid_relax_points[1][i + 1] = -1;
+         }
+
+         /* up cycle */
+         grid_relax_type[2] = relax_default;
+         /* num_grid_sweeps[2] = num_sweep;
+         grid_relax_points[2] = hypre_CTAlloc(HYPRE_Int,  num_sweep, HYPRE_MEMORY_HOST);
+         for (i=0; i<num_sweep; i++)
+         {
+            grid_relax_points[2][i] = 0;
+         } */
+         num_grid_sweeps[2] = 2 * num_sweep;
+         grid_relax_type[2] = relax_default;
+         grid_relax_points[2] = hypre_CTAlloc(HYPRE_Int,  2 * num_sweep, HYPRE_MEMORY_HOST);
+         for (i = 0; i < 2 * num_sweep; i += 2)
+         {
+            grid_relax_points[2][i] = -1;
+            grid_relax_points[2][i + 1] = 1;
+         }
       }
-   }
 
-   /* coarsest grid */
-   num_grid_sweeps[3] = 1;
-   grid_relax_type[3] = 9;
-   grid_relax_points[3] = hypre_CTAlloc(HYPRE_Int,  1, HYPRE_MEMORY_HOST);
-   grid_relax_points[3][0] = 0;
+      /* coarsest grid */
+      num_grid_sweeps[3] = 1;
+      grid_relax_type[3] = 9;
+      grid_relax_points[3] = hypre_CTAlloc(HYPRE_Int,  1, HYPRE_MEMORY_HOST);
+      grid_relax_points[3][0] = 0;
    }
 
    /* defaults for Schwarz */
@@ -908,65 +918,69 @@ main( HYPRE_Int   argc,
       }
       else if ( strcmp(argv[arg_index], "-w") == 0 )
       {
-        arg_index++;
-        if (solver_id == HYPRE_BOOMERAMG || solver_id == HYPRE_GSMG ||
+         arg_index++;
+         if (solver_id == HYPRE_BOOMERAMG || solver_id == HYPRE_GSMG ||
              (solver_id == HYPRE_HYBRID && precond_id == HYPRE_BOOMERAMG))
-        {
-         relax_weight[0] = atof(argv[arg_index++]);
-         for (i=1; i < max_levels; i++)
-            relax_weight[i] = relax_weight[0];
-        }
+         {
+            relax_weight[0] = (HYPRE_Real)atof(argv[arg_index++]);
+            for (i = 1; i < max_levels; i++)
+            {
+               relax_weight[i] = relax_weight[0];
+            }
+         }
       }
       else if ( strcmp(argv[arg_index], "-om") == 0 )
       {
-        arg_index++;
-        if (solver_id == HYPRE_BOOMERAMG || solver_id == HYPRE_GSMG ||
+         arg_index++;
+         if (solver_id == HYPRE_BOOMERAMG || solver_id == HYPRE_GSMG ||
              (solver_id == HYPRE_HYBRID && precond_id == HYPRE_BOOMERAMG))
-        {
-         omega[0] = atof(argv[arg_index++]);
-         for (i=1; i < max_levels; i++)
-            omega[i] = omega[0];
-        }
+         {
+            omega[0] = (HYPRE_Real)atof(argv[arg_index++]);
+            for (i = 1; i < max_levels; i++)
+            {
+               omega[i] = omega[0];
+            }
+         }
       }
       else if ( strcmp(argv[arg_index], "-sw") == 0 )
       {
          arg_index++;
-         schwarz_rlx_weight = atof(argv[arg_index++]);
+         schwarz_rlx_weight = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-th") == 0 )
       {
          arg_index++;
-         strong_threshold  = atof(argv[arg_index++]);
+         strong_threshold  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-cf") == 0 )
       {
          arg_index++;
-         cf_tol  = atof(argv[arg_index++]);
+         cf_tol  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-tol") == 0 )
       {
          arg_index++;
-         tol  = atof(argv[arg_index++]);
+         tol  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-mxrs") == 0 )
       {
          arg_index++;
-         max_row_sum  = atof(argv[arg_index++]);
+         max_row_sum  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-sai_th") == 0 )
       {
          arg_index++;
-         sai_threshold  = atof(argv[arg_index++]);
+         sai_threshold  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-sai_filt") == 0 )
       {
          arg_index++;
-         sai_filter  = atof(argv[arg_index++]);
+         sai_filter  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-drop_tol") == 0 )
       {
          arg_index++;
-         drop_tol  = atof(argv[arg_index++]);
+         drop_tol  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-nonzeros_to_keep") == 0 )
       {
@@ -976,7 +990,7 @@ main( HYPRE_Int   argc,
       else if ( strcmp(argv[arg_index], "-tr") == 0 )
       {
          arg_index++;
-         trunc_factor  = atof(argv[arg_index++]);
+         trunc_factor  = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-solver_type") == 0 )
       {
@@ -1290,7 +1304,7 @@ main( HYPRE_Int   argc,
    else if ( build_matrix_type == 1 )
    {
       BuildParFromOneFile2(argc, argv, build_matrix_arg_index, num_functions,
-            &parcsr_A);
+                           &parcsr_A);
    }
    else if ( build_matrix_type == 2 )
    {
@@ -1312,7 +1326,7 @@ main( HYPRE_Int   argc,
    {
       hypre_printf("You have asked for an unsupported problem with\n");
       hypre_printf("build_matrix_type = %d.\n", build_matrix_type);
-      return(-1);
+      return (-1);
    }
 
    time_index = hypre_InitializeTiming("Spatial operator");
@@ -1320,124 +1334,130 @@ main( HYPRE_Int   argc,
 
    if (build_matrix_type < 0)
    {
-     ierr += HYPRE_IJMatrixGetObject( ij_A, &object);
-     parcsr_A = (HYPRE_ParCSRMatrix) object;
+      ierr += HYPRE_IJMatrixGetObject( ij_A, &object);
+      parcsr_A = (HYPRE_ParCSRMatrix) object;
 
-     ierr = HYPRE_ParCSRMatrixGetLocalRange( parcsr_A,
-               &first_local_row, &last_local_row ,
-               &first_local_col, &last_local_col );
+      ierr = HYPRE_ParCSRMatrixGetLocalRange( parcsr_A,
+                                              &first_local_row, &last_local_row,
+                                              &first_local_col, &last_local_col );
 
-     local_num_rows = last_local_row - first_local_row + 1;
-     local_num_cols = last_local_col - first_local_col + 1;
+      local_num_rows = last_local_row - first_local_row + 1;
+      local_num_cols = last_local_col - first_local_col + 1;
    }
    else
    {
 
-     /*-----------------------------------------------------------
-      * Copy the parcsr matrix into the IJMatrix through interface calls
-      *-----------------------------------------------------------*/
+      /*-----------------------------------------------------------
+       * Copy the parcsr matrix into the IJMatrix through interface calls
+       *-----------------------------------------------------------*/
+
+      ierr = HYPRE_ParCSRMatrixGetLocalRange( parcsr_A,
+                                              &first_local_row, &last_local_row,
+                                              &first_local_col, &last_local_col );
+
+      local_num_rows = last_local_row - first_local_row + 1;
+      local_num_cols = last_local_col - first_local_col + 1;
+      ierr += HYPRE_ParCSRMatrixGetDims( parcsr_A, &M, &N );
 
-     ierr = HYPRE_ParCSRMatrixGetLocalRange( parcsr_A,
-               &first_local_row, &last_local_row ,
-               &first_local_col, &last_local_col );
+      ierr += HYPRE_IJMatrixCreate( comm, first_local_row, last_local_row,
+                                    first_local_col, last_local_col,
+                                    &ij_A );
 
-     local_num_rows = last_local_row - first_local_row + 1;
-     local_num_cols = last_local_col - first_local_col + 1;
-     ierr += HYPRE_ParCSRMatrixGetDims( parcsr_A, &M, &N );
+      ierr += HYPRE_IJMatrixSetObjectType( ij_A, HYPRE_PARCSR );
 
-     ierr += HYPRE_IJMatrixCreate( comm, first_local_row, last_local_row,
-                                   first_local_col, last_local_col,
-                                   &ij_A );
 
-     ierr += HYPRE_IJMatrixSetObjectType( ij_A, HYPRE_PARCSR );
+      /* the following shows how to build an IJMatrix if one has only an
+         estimate for the row sizes */
+      if (sparsity_known == 1)
+      {
+         /*  build IJMatrix using exact row_sizes for diag and offdiag */
 
+         diag_sizes = hypre_CTAlloc(HYPRE_Int,  local_num_rows, HYPRE_MEMORY_HOST);
+         offdiag_sizes = hypre_CTAlloc(HYPRE_Int,  local_num_rows, HYPRE_MEMORY_HOST);
+         local_row = 0;
+         for (i = first_local_row; i <= last_local_row; i++)
+         {
+            ierr += HYPRE_ParCSRMatrixGetRow( parcsr_A, i, &size,
+                                              &col_inds, &values );
 
-/* the following shows how to build an IJMatrix if one has only an
-   estimate for the row sizes */
-     if (sparsity_known == 1)
-     {
-/*  build IJMatrix using exact row_sizes for diag and offdiag */
+            for (j = 0; j < size; j++)
+            {
+               if (col_inds[j] < first_local_row || col_inds[j] > last_local_row)
+               {
+                  offdiag_sizes[local_row]++;
+               }
+               else
+               {
+                  diag_sizes[local_row]++;
+               }
+            }
+            local_row++;
+            ierr += HYPRE_ParCSRMatrixRestoreRow( parcsr_A, i, &size,
+                                                  &col_inds, &values );
+         }
+         ierr += HYPRE_IJMatrixSetDiagOffdSizes( ij_A,
+                                                 (const HYPRE_Int *) diag_sizes,
+                                                 (const HYPRE_Int *) offdiag_sizes );
+         hypre_TFree(diag_sizes, HYPRE_MEMORY_HOST);
+         hypre_TFree(offdiag_sizes, HYPRE_MEMORY_HOST);
 
-       diag_sizes = hypre_CTAlloc(HYPRE_Int,  local_num_rows, HYPRE_MEMORY_HOST);
-       offdiag_sizes = hypre_CTAlloc(HYPRE_Int,  local_num_rows, HYPRE_MEMORY_HOST);
-       local_row = 0;
-       for (i=first_local_row; i<= last_local_row; i++)
-       {
-         ierr += HYPRE_ParCSRMatrixGetRow( parcsr_A, i, &size,
-                                           &col_inds, &values );
+         ierr = HYPRE_IJMatrixInitialize( ij_A );
 
-         for (j=0; j < size; j++)
+         for (i = first_local_row; i <= last_local_row; i++)
          {
-           if (col_inds[j] < first_local_row || col_inds[j] > last_local_row)
-             offdiag_sizes[local_row]++;
-           else
-             diag_sizes[local_row]++;
+            ierr += HYPRE_ParCSRMatrixGetRow( parcsr_A, i, &size,
+                                              &col_inds, &values );
+
+            ierr += HYPRE_IJMatrixSetValues( ij_A, 1, &size, &i,
+                                             (const HYPRE_Int *) col_inds,
+                                             (const HYPRE_Real *) values );
+
+            ierr += HYPRE_ParCSRMatrixRestoreRow( parcsr_A, i, &size,
+                                                  &col_inds, &values );
          }
-         local_row++;
-         ierr += HYPRE_ParCSRMatrixRestoreRow( parcsr_A, i, &size,
-                                               &col_inds, &values );
-       }
-       ierr += HYPRE_IJMatrixSetDiagOffdSizes( ij_A,
-                                        (const HYPRE_Int *) diag_sizes,
-                                        (const HYPRE_Int *) offdiag_sizes );
-       hypre_TFree(diag_sizes, HYPRE_MEMORY_HOST);
-       hypre_TFree(offdiag_sizes, HYPRE_MEMORY_HOST);
-
-       ierr = HYPRE_IJMatrixInitialize( ij_A );
-
-       for (i=first_local_row; i<= last_local_row; i++)
-       {
-         ierr += HYPRE_ParCSRMatrixGetRow( parcsr_A, i, &size,
-                                           &col_inds, &values );
-
-         ierr += HYPRE_IJMatrixSetValues( ij_A, 1, &size, &i,
-                                          (const HYPRE_Int *) col_inds,
-                                          (const HYPRE_Real *) values );
-
-         ierr += HYPRE_ParCSRMatrixRestoreRow( parcsr_A, i, &size,
-                                               &col_inds, &values );
-       }
-     }
-     else
-     {
-       row_sizes = hypre_CTAlloc(HYPRE_Int,  local_num_rows, HYPRE_MEMORY_HOST);
-
-       size = 5; /* this is in general too low, and supposed to test
+      }
+      else
+      {
+         row_sizes = hypre_CTAlloc(HYPRE_Int,  local_num_rows, HYPRE_MEMORY_HOST);
+
+         size = 5; /* this is in general too low, and supposed to test
                     the capability of the reallocation of the interface */
 
-       if (sparsity_known == 0) /* tries a more accurate estimate of the
+         if (sparsity_known == 0) /* tries a more accurate estimate of the
                                     storage */
-       {
-         if (build_matrix_type == 2) size = 7;
-         if (build_matrix_type == 3) size = 9;
-         if (build_matrix_type == 4) size = 27;
-       }
+         {
+            if (build_matrix_type == 2) { size = 7; }
+            if (build_matrix_type == 3) { size = 9; }
+            if (build_matrix_type == 4) { size = 27; }
+         }
 
-       for (i=0; i < local_num_rows; i++)
-         row_sizes[i] = size;
+         for (i = 0; i < local_num_rows; i++)
+         {
+            row_sizes[i] = size;
+         }
 
-       ierr = HYPRE_IJMatrixSetRowSizes ( ij_A, (const HYPRE_Int *) row_sizes );
+         ierr = HYPRE_IJMatrixSetRowSizes ( ij_A, (const HYPRE_Int *) row_sizes );
 
-       hypre_TFree(row_sizes, HYPRE_MEMORY_HOST);
+         hypre_TFree(row_sizes, HYPRE_MEMORY_HOST);
 
-       ierr = HYPRE_IJMatrixInitialize( ij_A );
+         ierr = HYPRE_IJMatrixInitialize( ij_A );
 
-       /* Loop through all locally stored rows and insert them into ij_matrix */
-       for (i=first_local_row; i<= last_local_row; i++)
-       {
-         ierr += HYPRE_ParCSRMatrixGetRow( parcsr_A, i, &size,
-                                           &col_inds, &values );
+         /* Loop through all locally stored rows and insert them into ij_matrix */
+         for (i = first_local_row; i <= last_local_row; i++)
+         {
+            ierr += HYPRE_ParCSRMatrixGetRow( parcsr_A, i, &size,
+                                              &col_inds, &values );
 
-         ierr += HYPRE_IJMatrixSetValues( ij_A, 1, &size, &i,
-                                          (const HYPRE_Int *) col_inds,
-                                          (const HYPRE_Real *) values );
+            ierr += HYPRE_IJMatrixSetValues( ij_A, 1, &size, &i,
+                                             (const HYPRE_Int *) col_inds,
+                                             (const HYPRE_Real *) values );
 
-         ierr += HYPRE_ParCSRMatrixRestoreRow( parcsr_A, i, &size,
-                                               &col_inds, &values );
-       }
-     }
+            ierr += HYPRE_ParCSRMatrixRestoreRow( parcsr_A, i, &size,
+                                                  &col_inds, &values );
+         }
+      }
 
-     ierr += HYPRE_IJMatrixAssemble( ij_A );
+      ierr += HYPRE_IJMatrixAssemble( ij_A );
 
    }
 
@@ -1448,8 +1468,8 @@ main( HYPRE_Int   argc,
 
    if (ierr)
    {
-     hypre_printf("Error in driver building IJMatrix from parcsr matrix. \n");
-     return(-1);
+      hypre_printf("Error in driver building IJMatrix from parcsr matrix. \n");
+      return (-1);
    }
 
    /* This is to emphasize that one can IJMatrixAddToValues after an
@@ -1459,21 +1479,21 @@ main( HYPRE_Int   argc,
       the opportunity to IJMatrixAddTo before a IJMatrixAssemble. */
 
 
-       ierr = HYPRE_IJMatrixInitialize( ij_A );
+   ierr = HYPRE_IJMatrixInitialize( ij_A );
 
-       /* Loop through all locally stored rows and insert them into ij_matrix */
-       for (i=first_local_row; i<= last_local_row; i++)
-       {
-         ierr += HYPRE_ParCSRMatrixGetRow( parcsr_A, i, &size,
-                                           &col_inds, &values );
+   /* Loop through all locally stored rows and insert them into ij_matrix */
+   for (i = first_local_row; i <= last_local_row; i++)
+   {
+      ierr += HYPRE_ParCSRMatrixGetRow( parcsr_A, i, &size,
+                                        &col_inds, &values );
 
-         ierr += HYPRE_IJMatrixSetValues( ij_A, 1, &size, &i,
-                                          (const HYPRE_Int *) col_inds,
-                                          (const HYPRE_Real *) values );
+      ierr += HYPRE_IJMatrixSetValues( ij_A, 1, &size, &i,
+                                       (const HYPRE_Int *) col_inds,
+                                       (const HYPRE_Real *) values );
 
-         ierr += HYPRE_ParCSRMatrixRestoreRow( parcsr_A, i, &size,
-                                               &col_inds, &values );
-       }
+      ierr += HYPRE_ParCSRMatrixRestoreRow( parcsr_A, i, &size,
+                                            &col_inds, &values );
+   }
 
    /* If sparsity pattern is not changed since last IJMatrixAssemble call,
       this should be a no-op */
@@ -1485,7 +1505,9 @@ main( HYPRE_Int   argc,
     *-----------------------------------------------------------*/
 
    if (build_matrix_type > -1)
-     ierr += HYPRE_ParCSRMatrixDestroy(parcsr_A);
+   {
+      ierr += HYPRE_ParCSRMatrixDestroy(parcsr_A);
+   }
 
    ierr += HYPRE_IJMatrixGetObject( ij_A, &object);
    parcsr_A = (HYPRE_ParCSRMatrix) object;
@@ -1501,24 +1523,26 @@ main( HYPRE_Int   argc,
    {
       if (myid == 0)
       {
-        hypre_printf("  RHS vector read from file %s\n", argv[build_rhs_arg_index]);
-        hypre_printf("  Initial guess is 0\n");
+         hypre_printf("  RHS vector read from file %s\n", argv[build_rhs_arg_index]);
+         hypre_printf("  Initial guess is 0\n");
       }
 
-/* RHS */
+      /* RHS */
       ierr = HYPRE_IJVectorRead( argv[build_rhs_arg_index], hypre_MPI_COMM_WORLD,
                                  HYPRE_PARCSR, &ij_b );
       ierr = HYPRE_IJVectorGetObject( ij_b, &object );
       b = (HYPRE_ParVector) object;
 
-/* Initial guess */
+      /* Initial guess */
       HYPRE_IJVectorCreate(hypre_MPI_COMM_WORLD, first_local_col, last_local_col, &ij_x);
       HYPRE_IJVectorSetObjectType(ij_x, HYPRE_PARCSR);
       HYPRE_IJVectorInitialize(ij_x);
 
       values = hypre_CTAlloc(HYPRE_Real,  local_num_cols, HYPRE_MEMORY_HOST);
       for (i = 0; i < local_num_cols; i++)
+      {
          values[i] = 0.;
+      }
       HYPRE_IJVectorSetValues(ij_x, local_num_cols, NULL, values);
       hypre_TFree(values, HYPRE_MEMORY_HOST);
 
@@ -1528,10 +1552,10 @@ main( HYPRE_Int   argc,
    else if ( build_rhs_type == 1 )
    {
       hypre_printf("build_rhs_type == 1 not currently implemented\n");
-      return(-1);
+      return (-1);
 
 #if 0
-/* RHS */
+      /* RHS */
       BuildRhsParFromOneFile2(argc, argv, build_rhs_arg_index, part_b, &b);
 #endif
    }
@@ -1539,32 +1563,36 @@ main( HYPRE_Int   argc,
    {
       if (myid == 0)
       {
-        hypre_printf("  RHS vector has unit components\n");
-        hypre_printf("  Initial guess is 0\n");
+         hypre_printf("  RHS vector has unit components\n");
+         hypre_printf("  Initial guess is 0\n");
       }
 
-/* RHS */
+      /* RHS */
       HYPRE_IJVectorCreate(hypre_MPI_COMM_WORLD, first_local_row, last_local_row, &ij_b);
       HYPRE_IJVectorSetObjectType(ij_b, HYPRE_PARCSR);
       HYPRE_IJVectorInitialize(ij_b);
 
       values = hypre_CTAlloc(HYPRE_Real,  local_num_rows, HYPRE_MEMORY_HOST);
       for (i = 0; i < local_num_rows; i++)
+      {
          values[i] = 1.0;
+      }
       HYPRE_IJVectorSetValues(ij_b, local_num_rows, NULL, values);
       hypre_TFree(values, HYPRE_MEMORY_HOST);
 
       ierr = HYPRE_IJVectorGetObject( ij_b, &object );
       b = (HYPRE_ParVector) object;
 
-/* Initial guess */
+      /* Initial guess */
       HYPRE_IJVectorCreate(hypre_MPI_COMM_WORLD, first_local_col, last_local_col, &ij_x);
       HYPRE_IJVectorSetObjectType(ij_x, HYPRE_PARCSR);
       HYPRE_IJVectorInitialize(ij_x);
 
       values = hypre_CTAlloc(HYPRE_Real,  local_num_cols, HYPRE_MEMORY_HOST);
       for (i = 0; i < local_num_cols; i++)
+      {
          values[i] = 0.;
+      }
       HYPRE_IJVectorSetValues(ij_x, local_num_cols, NULL, values);
       hypre_TFree(values, HYPRE_MEMORY_HOST);
 
@@ -1575,35 +1603,37 @@ main( HYPRE_Int   argc,
    {
       if (myid == 0)
       {
-        hypre_printf("  RHS vector has random components and unit 2-norm\n");
-        hypre_printf("  Initial guess is 0\n");
+         hypre_printf("  RHS vector has random components and unit 2-norm\n");
+         hypre_printf("  Initial guess is 0\n");
       }
 
-/* RHS */
+      /* RHS */
       HYPRE_IJVectorCreate(hypre_MPI_COMM_WORLD, first_local_row, last_local_row, &ij_b);
       HYPRE_IJVectorSetObjectType(ij_b, HYPRE_PARCSR);
       HYPRE_IJVectorInitialize(ij_b);
       ierr = HYPRE_IJVectorGetObject( ij_b, &object );
       b = (HYPRE_ParVector) object;
 
-/* For purposes of this test, HYPRE_ParVector functions are used, but these are
-   not necessary.  For a clean use of the interface, the user "should"
-   modify components of ij_x by using functions HYPRE_IJVectorSetValues or
-   HYPRE_IJVectorAddToValues */
+      /* For purposes of this test, HYPRE_ParVector functions are used, but these are
+         not necessary.  For a clean use of the interface, the user "should"
+         modify components of ij_x by using functions HYPRE_IJVectorSetValues or
+         HYPRE_IJVectorAddToValues */
 
       HYPRE_ParVectorSetRandomValues(b, 22775);
-      HYPRE_ParVectorInnerProd(b,b,&norm);
-      norm = 1./sqrt(norm);
+      HYPRE_ParVectorInnerProd(b, b, &norm);
+      norm = 1. / hypre_sqrt(norm);
       ierr = HYPRE_ParVectorScale(norm, b);
 
-/* Initial guess */
+      /* Initial guess */
       HYPRE_IJVectorCreate(hypre_MPI_COMM_WORLD, first_local_col, last_local_col, &ij_x);
       HYPRE_IJVectorSetObjectType(ij_x, HYPRE_PARCSR);
       HYPRE_IJVectorInitialize(ij_x);
 
       values = hypre_CTAlloc(HYPRE_Real,  local_num_cols, HYPRE_MEMORY_HOST);
       for (i = 0; i < local_num_cols; i++)
+      {
          values[i] = 0.;
+      }
       HYPRE_IJVectorSetValues(ij_x, local_num_cols, NULL, values);
       hypre_TFree(values, HYPRE_MEMORY_HOST);
 
@@ -1614,37 +1644,41 @@ main( HYPRE_Int   argc,
    {
       if (myid == 0)
       {
-        hypre_printf("  RHS vector set for solution with unit components\n");
-        hypre_printf("  Initial guess is 0\n");
+         hypre_printf("  RHS vector set for solution with unit components\n");
+         hypre_printf("  Initial guess is 0\n");
       }
 
-/* Temporary use of solution vector */
+      /* Temporary use of solution vector */
       HYPRE_IJVectorCreate(hypre_MPI_COMM_WORLD, first_local_col, last_local_col, &ij_x);
       HYPRE_IJVectorSetObjectType(ij_x, HYPRE_PARCSR);
       HYPRE_IJVectorInitialize(ij_x);
 
       values = hypre_CTAlloc(HYPRE_Real,  local_num_cols, HYPRE_MEMORY_HOST);
       for (i = 0; i < local_num_cols; i++)
+      {
          values[i] = 1.;
+      }
       HYPRE_IJVectorSetValues(ij_x, local_num_cols, NULL, values);
       hypre_TFree(values, HYPRE_MEMORY_HOST);
 
       ierr = HYPRE_IJVectorGetObject( ij_x, &object );
       x = (HYPRE_ParVector) object;
 
-/* RHS */
+      /* RHS */
       HYPRE_IJVectorCreate(hypre_MPI_COMM_WORLD, first_local_row, last_local_row, &ij_b);
       HYPRE_IJVectorSetObjectType(ij_b, HYPRE_PARCSR);
       HYPRE_IJVectorInitialize(ij_b);
       ierr = HYPRE_IJVectorGetObject( ij_b, &object );
       b = (HYPRE_ParVector) object;
 
-      HYPRE_ParCSRMatrixMatvec(1.,parcsr_A,x,0.,b);
+      HYPRE_ParCSRMatrixMatvec(1., parcsr_A, x, 0., b);
 
-/* Initial guess */
+      /* Initial guess */
       values = hypre_CTAlloc(HYPRE_Real,  local_num_cols, HYPRE_MEMORY_HOST);
       for (i = 0; i < local_num_cols; i++)
+      {
          values[i] = 0.;
+      }
       HYPRE_IJVectorSetValues(ij_x, local_num_cols, NULL, values);
       hypre_TFree(values, HYPRE_MEMORY_HOST);
    }
@@ -1652,32 +1686,36 @@ main( HYPRE_Int   argc,
    {
       if (myid == 0)
       {
-        hypre_printf("  RHS vector is 0\n");
-        hypre_printf("  Initial guess has unit components\n");
+         hypre_printf("  RHS vector is 0\n");
+         hypre_printf("  Initial guess has unit components\n");
       }
 
-/* RHS */
+      /* RHS */
       HYPRE_IJVectorCreate(hypre_MPI_COMM_WORLD, first_local_row, last_local_row, &ij_b);
       HYPRE_IJVectorSetObjectType(ij_b, HYPRE_PARCSR);
       HYPRE_IJVectorInitialize(ij_b);
 
       values = hypre_CTAlloc(HYPRE_Real,  local_num_rows, HYPRE_MEMORY_HOST);
       for (i = 0; i < local_num_rows; i++)
+      {
          values[i] = 0.;
+      }
       HYPRE_IJVectorSetValues(ij_b, local_num_rows, NULL, values);
       hypre_TFree(values, HYPRE_MEMORY_HOST);
 
       ierr = HYPRE_IJVectorGetObject( ij_b, &object );
       b = (HYPRE_ParVector) object;
 
-/* Initial guess */
+      /* Initial guess */
       HYPRE_IJVectorCreate(hypre_MPI_COMM_WORLD, first_local_col, last_local_col, &ij_x);
       HYPRE_IJVectorSetObjectType(ij_x, HYPRE_PARCSR);
       HYPRE_IJVectorInitialize(ij_x);
 
       values = hypre_CTAlloc(HYPRE_Real,  local_num_cols, HYPRE_MEMORY_HOST);
       for (i = 0; i < local_num_cols; i++)
+      {
          values[i] = 1.;
+      }
       HYPRE_IJVectorSetValues(ij_x, local_num_cols, NULL, values);
       hypre_TFree(values, HYPRE_MEMORY_HOST);
 
@@ -1688,14 +1726,14 @@ main( HYPRE_Int   argc,
    if ( build_src_type == 0 )
    {
 #if 0
-/* RHS */
+      /* RHS */
       BuildRhsParFromFile(argc, argv, build_src_arg_index, &b);
 #endif
 
       if (myid == 0)
       {
-        hypre_printf("  Source vector read from file %s\n", argv[build_src_arg_index]);
-        hypre_printf("  Initial unknown vector in evolution is 0\n");
+         hypre_printf("  Source vector read from file %s\n", argv[build_src_arg_index]);
+         hypre_printf("  Initial unknown vector in evolution is 0\n");
       }
 
       ierr = HYPRE_IJVectorRead( argv[build_src_arg_index], hypre_MPI_COMM_WORLD,
@@ -1704,14 +1742,16 @@ main( HYPRE_Int   argc,
       ierr = HYPRE_IJVectorGetObject( ij_b, &object );
       b = (HYPRE_ParVector) object;
 
-/* Initial unknown vector */
+      /* Initial unknown vector */
       HYPRE_IJVectorCreate(hypre_MPI_COMM_WORLD, first_local_col, last_local_col, &ij_x);
       HYPRE_IJVectorSetObjectType(ij_x, HYPRE_PARCSR);
       HYPRE_IJVectorInitialize(ij_x);
 
       values = hypre_CTAlloc(HYPRE_Real,  local_num_cols, HYPRE_MEMORY_HOST);
       for (i = 0; i < local_num_cols; i++)
+      {
          values[i] = 0.;
+      }
       HYPRE_IJVectorSetValues(ij_x, local_num_cols, NULL, values);
       hypre_TFree(values, HYPRE_MEMORY_HOST);
 
@@ -1721,7 +1761,7 @@ main( HYPRE_Int   argc,
    else if ( build_src_type == 1 )
    {
       hypre_printf("build_src_type == 1 not currently implemented\n");
-      return(-1);
+      return (-1);
 
 #if 0
       BuildRhsParFromOneFile2(argc, argv, build_src_arg_index, part_b, &b);
@@ -1731,34 +1771,38 @@ main( HYPRE_Int   argc,
    {
       if (myid == 0)
       {
-        hypre_printf("  Source vector has unit components\n");
-        hypre_printf("  Initial unknown vector is 0\n");
+         hypre_printf("  Source vector has unit components\n");
+         hypre_printf("  Initial unknown vector is 0\n");
       }
 
-/* RHS */
+      /* RHS */
       HYPRE_IJVectorCreate(hypre_MPI_COMM_WORLD, first_local_row, last_local_row, &ij_b);
       HYPRE_IJVectorSetObjectType(ij_b, HYPRE_PARCSR);
       HYPRE_IJVectorInitialize(ij_b);
 
       values = hypre_CTAlloc(HYPRE_Real,  local_num_rows, HYPRE_MEMORY_HOST);
       for (i = 0; i < local_num_rows; i++)
+      {
          values[i] = 1.;
+      }
       HYPRE_IJVectorSetValues(ij_b, local_num_rows, NULL, values);
       hypre_TFree(values, HYPRE_MEMORY_HOST);
 
       ierr = HYPRE_IJVectorGetObject( ij_b, &object );
       b = (HYPRE_ParVector) object;
 
-/* Initial guess */
+      /* Initial guess */
       HYPRE_IJVectorCreate(hypre_MPI_COMM_WORLD, first_local_col, last_local_col, &ij_x);
       HYPRE_IJVectorSetObjectType(ij_x, HYPRE_PARCSR);
       HYPRE_IJVectorInitialize(ij_x);
 
-/* For backward Euler the previous backward Euler iterate (assumed
-   0 here) is usually used as the initial guess */
+      /* For backward Euler the previous backward Euler iterate (assumed
+         0 here) is usually used as the initial guess */
       values = hypre_CTAlloc(HYPRE_Real,  local_num_cols, HYPRE_MEMORY_HOST);
       for (i = 0; i < local_num_cols; i++)
+      {
          values[i] = 0.;
+      }
       HYPRE_IJVectorSetValues(ij_x, local_num_cols, NULL, values);
       hypre_TFree(values, HYPRE_MEMORY_HOST);
 
@@ -1769,11 +1813,11 @@ main( HYPRE_Int   argc,
    {
       if (myid == 0)
       {
-        hypre_printf("  Source vector has random components in range 0 - 1\n");
-        hypre_printf("  Initial unknown vector is 0\n");
+         hypre_printf("  Source vector has random components in range 0 - 1\n");
+         hypre_printf("  Initial unknown vector is 0\n");
       }
 
-/* RHS */
+      /* RHS */
       HYPRE_IJVectorCreate(hypre_MPI_COMM_WORLD, first_local_row, last_local_row, &ij_b);
       HYPRE_IJVectorSetObjectType(ij_b, HYPRE_PARCSR);
       HYPRE_IJVectorInitialize(ij_b);
@@ -1781,7 +1825,9 @@ main( HYPRE_Int   argc,
 
       hypre_SeedRand(myid);
       for (i = 0; i < local_num_rows; i++)
+      {
          values[i] = hypre_Rand();
+      }
 
       HYPRE_IJVectorSetValues(ij_b, local_num_rows, NULL, values);
       hypre_TFree(values, HYPRE_MEMORY_HOST);
@@ -1789,16 +1835,18 @@ main( HYPRE_Int   argc,
       ierr = HYPRE_IJVectorGetObject( ij_b, &object );
       b = (HYPRE_ParVector) object;
 
-/* Initial guess */
+      /* Initial guess */
       HYPRE_IJVectorCreate(hypre_MPI_COMM_WORLD, first_local_col, last_local_col, &ij_x);
       HYPRE_IJVectorSetObjectType(ij_x, HYPRE_PARCSR);
       HYPRE_IJVectorInitialize(ij_x);
 
-/* For backward Euler the previous backward Euler iterate (assumed
-   0 here) is usually used as the initial guess */
+      /* For backward Euler the previous backward Euler iterate (assumed
+         0 here) is usually used as the initial guess */
       values = hypre_CTAlloc(HYPRE_Real,  local_num_cols, HYPRE_MEMORY_HOST);
       for (i = 0; i < local_num_cols; i++)
+      {
          values[i] = 0.;
+      }
       HYPRE_IJVectorSetValues(ij_x, local_num_cols, NULL, values);
       hypre_TFree(values, HYPRE_MEMORY_HOST);
 
@@ -1809,11 +1857,11 @@ main( HYPRE_Int   argc,
    {
       if (myid == 0)
       {
-        hypre_printf("  Source vector is 0 \n");
-        hypre_printf("  Initial unknown vector has random components in range 0 - 1\n");
+         hypre_printf("  Source vector is 0 \n");
+         hypre_printf("  Initial unknown vector has random components in range 0 - 1\n");
       }
 
-/* RHS */
+      /* RHS */
       HYPRE_IJVectorCreate(hypre_MPI_COMM_WORLD, first_local_row, last_local_row, &ij_b);
       HYPRE_IJVectorSetObjectType(ij_b, HYPRE_PARCSR);
       HYPRE_IJVectorInitialize(ij_b);
@@ -1821,24 +1869,28 @@ main( HYPRE_Int   argc,
       values = hypre_CTAlloc(HYPRE_Real,  local_num_rows, HYPRE_MEMORY_HOST);
       hypre_SeedRand(myid);
       for (i = 0; i < local_num_rows; i++)
-         values[i] = hypre_Rand()/dt;
+      {
+         values[i] = hypre_Rand() / dt;
+      }
       HYPRE_IJVectorSetValues(ij_b, local_num_rows, NULL, values);
       hypre_TFree(values, HYPRE_MEMORY_HOST);
 
       ierr = HYPRE_IJVectorGetObject( ij_b, &object );
       b = (HYPRE_ParVector) object;
 
-/* Initial guess */
+      /* Initial guess */
       HYPRE_IJVectorCreate(hypre_MPI_COMM_WORLD, first_local_col, last_local_col, &ij_x);
       HYPRE_IJVectorSetObjectType(ij_x, HYPRE_PARCSR);
       HYPRE_IJVectorInitialize(ij_x);
 
-/* For backward Euler the previous backward Euler iterate (assumed
-   random in 0 - 1 here) is usually used as the initial guess */
+      /* For backward Euler the previous backward Euler iterate (assumed
+         random in 0 - 1 here) is usually used as the initial guess */
       values = hypre_CTAlloc(HYPRE_Real,  local_num_cols, HYPRE_MEMORY_HOST);
       hypre_SeedRand(myid);
       for (i = 0; i < local_num_cols; i++)
+      {
          values[i] = hypre_Rand();
+      }
       HYPRE_IJVectorSetValues(ij_x, local_num_cols, NULL, values);
       hypre_TFree(values, HYPRE_MEMORY_HOST);
 
@@ -1870,23 +1922,31 @@ main( HYPRE_Int   argc,
          local_num_vars = local_num_rows;
          dof_func = hypre_CTAlloc(HYPRE_Int, local_num_vars, HYPRE_MEMORY_HOST);
          if (myid == 0)
+         {
             hypre_printf (" Number of unknown functions = %d \n", num_functions);
-         rest = first_local_row-((first_local_row/num_functions)*num_functions);
-         indx = num_functions-rest;
-         if (rest == 0) indx = 0;
+         }
+         rest = first_local_row - ((first_local_row / num_functions) * num_functions);
+         indx = num_functions - rest;
+         if (rest == 0) { indx = 0; }
          k = num_functions - 1;
-         for (j = indx-1; j > -1; j--)
+         for (j = indx - 1; j > -1; j--)
+         {
             dof_func[j] = k--;
-         tms = local_num_vars/num_functions;
-         if (tms*num_functions+indx > local_num_vars) tms--;
-         for (j=0; j < tms; j++)
+         }
+         tms = local_num_vars / num_functions;
+         if (tms * num_functions + indx > local_num_vars) { tms--; }
+         for (j = 0; j < tms; j++)
          {
-            for (k=0; k < num_functions; k++)
+            for (k = 0; k < num_functions; k++)
+            {
                dof_func[indx++] = k;
+            }
          }
          k = 0;
          while (indx < local_num_vars)
+         {
             dof_func[indx++] = k++;
+         }
       }
    }
 
@@ -1909,7 +1969,7 @@ main( HYPRE_Int   argc,
    {
       dscg_max_its = 1000;
       pcg_max_its = 200;
-      if (myid == 0) hypre_printf("Solver:  AMG_Hybrid\n");
+      if (myid == 0) { hypre_printf("Solver:  AMG_Hybrid\n"); }
       time_index = hypre_InitializeTiming("AMG_hybrid Setup");
       hypre_BeginTiming(time_index);
 
@@ -1921,7 +1981,7 @@ main( HYPRE_Int   argc,
       HYPRE_ParCSRHybridSetPrintLevel(amg_solver, poutdat);
       HYPRE_ParCSRHybridSetDSCGMaxIter(amg_solver, dscg_max_its );
       HYPRE_ParCSRHybridSetPCGMaxIter(amg_solver, pcg_max_its );
-      HYPRE_ParCSRHybridSetCoarsenType(amg_solver, (hybrid*coarsen_type));
+      HYPRE_ParCSRHybridSetCoarsenType(amg_solver, (hybrid * coarsen_type));
       HYPRE_ParCSRHybridSetStrongThreshold(amg_solver, strong_threshold);
       HYPRE_ParCSRHybridSetTruncFactor(amg_solver, trunc_factor);
       HYPRE_ParCSRHybridSetNumGridSweeps(amg_solver, num_grid_sweeps);
@@ -1953,7 +2013,7 @@ main( HYPRE_Int   argc,
       HYPRE_ParCSRHybridGetPCGNumIterations(amg_solver, &pcg_num_its);
       HYPRE_ParCSRHybridGetDSCGNumIterations(amg_solver, &dscg_num_its);
       HYPRE_ParCSRHybridGetFinalRelativeResidualNorm(amg_solver,
-            &final_res_norm);
+                                                     &final_res_norm);
 
       if (myid == 0)
       {
@@ -1972,19 +2032,19 @@ main( HYPRE_Int   argc,
 
    if (solver_id == HYPRE_BOOMERAMG)
    {
-      if (myid == 0) hypre_printf("Solver:  AMG\n");
+      if (myid == 0) { hypre_printf("Solver:  AMG\n"); }
       time_index = hypre_InitializeTiming("BoomerAMG Setup");
       hypre_BeginTiming(time_index);
 
       HYPRE_BoomerAMGCreate(&amg_solver);
       HYPRE_BoomerAMGSetInterpType(amg_solver, interp_type);
       HYPRE_BoomerAMGSetNumSamples(amg_solver, gsmg_samples);
-      HYPRE_BoomerAMGSetCoarsenType(amg_solver, (hybrid*coarsen_type));
+      HYPRE_BoomerAMGSetCoarsenType(amg_solver, (hybrid * coarsen_type));
       HYPRE_BoomerAMGSetMeasureType(amg_solver, measure_type);
       HYPRE_BoomerAMGSetTol(amg_solver, tol);
       HYPRE_BoomerAMGSetStrongThreshold(amg_solver, strong_threshold);
       HYPRE_BoomerAMGSetTruncFactor(amg_solver, trunc_factor);
-/* note: log is written to standard output, not to file */
+      /* note: log is written to standard output, not to file */
       HYPRE_BoomerAMGSetPrintLevel(amg_solver, 3);
       HYPRE_BoomerAMGSetPrintFileName(amg_solver, "driver.out.log");
       HYPRE_BoomerAMGSetCycleType(amg_solver, cycle_type);
@@ -2005,7 +2065,9 @@ main( HYPRE_Int   argc,
       HYPRE_BoomerAMGSetSchwarzRlxWeight(amg_solver, schwarz_rlx_weight);
       HYPRE_BoomerAMGSetNumFunctions(amg_solver, num_functions);
       if (num_functions > 1)
+      {
          HYPRE_BoomerAMGSetDofFunc(amg_solver, dof_func);
+      }
 
       HYPRE_BoomerAMGSetup(amg_solver, parcsr_A, b, x);
 
@@ -2047,24 +2109,30 @@ main( HYPRE_Int   argc,
       grid_relax_type[0] = relax_default;
       hypre_TFree(grid_relax_points[0], HYPRE_MEMORY_HOST);
       grid_relax_points[0] = hypre_CTAlloc(HYPRE_Int,  num_sweep, HYPRE_MEMORY_HOST);
-      for (i=0; i<num_sweep; i++)
+      for (i = 0; i < num_sweep; i++)
+      {
          grid_relax_points[0][i] = 0;
+      }
 
       /* down cycle */
       num_grid_sweeps[1] = num_sweep;
       grid_relax_type[1] = relax_default;
       hypre_TFree(grid_relax_points[1], HYPRE_MEMORY_HOST);
       grid_relax_points[1] = hypre_CTAlloc(HYPRE_Int,  num_sweep, HYPRE_MEMORY_HOST);
-      for (i=0; i<num_sweep; i++)
+      for (i = 0; i < num_sweep; i++)
+      {
          grid_relax_points[1][i] = 0;
+      }
 
       /* up cycle */
       num_grid_sweeps[2] = num_sweep;
       grid_relax_type[2] = relax_default;
       hypre_TFree(grid_relax_points[2], HYPRE_MEMORY_HOST);
       grid_relax_points[2] = hypre_CTAlloc(HYPRE_Int,  num_sweep, HYPRE_MEMORY_HOST);
-      for (i=0; i<num_sweep; i++)
+      for (i = 0; i < num_sweep; i++)
+      {
          grid_relax_points[2][i] = 0;
+      }
 
       /* coarsest grid */
       num_grid_sweeps[3] = 1;
@@ -2073,7 +2141,7 @@ main( HYPRE_Int   argc,
       grid_relax_points[3] = hypre_CTAlloc(HYPRE_Int,  1, HYPRE_MEMORY_HOST);
       grid_relax_points[3][0] = 0;
 
-      if (myid == 0) hypre_printf("Solver:  GSMG\n");
+      if (myid == 0) { hypre_printf("Solver:  GSMG\n"); }
       time_index = hypre_InitializeTiming("BoomerAMG Setup");
       hypre_BeginTiming(time_index);
 
@@ -2081,12 +2149,12 @@ main( HYPRE_Int   argc,
       HYPRE_BoomerAMGSetGSMG(amg_solver, 4); /* specify GSMG */
       HYPRE_BoomerAMGSetInterpType(amg_solver, interp_type);
       HYPRE_BoomerAMGSetNumSamples(amg_solver, gsmg_samples);
-      HYPRE_BoomerAMGSetCoarsenType(amg_solver, (hybrid*coarsen_type));
+      HYPRE_BoomerAMGSetCoarsenType(amg_solver, (hybrid * coarsen_type));
       HYPRE_BoomerAMGSetMeasureType(amg_solver, measure_type);
       HYPRE_BoomerAMGSetTol(amg_solver, tol);
       HYPRE_BoomerAMGSetStrongThreshold(amg_solver, strong_threshold);
       HYPRE_BoomerAMGSetTruncFactor(amg_solver, trunc_factor);
-/* note: log is written to standard output, not to file */
+      /* note: log is written to standard output, not to file */
       HYPRE_BoomerAMGSetPrintLevel(amg_solver, 3);
       HYPRE_BoomerAMGSetPrintFileName(amg_solver, "driver.out.log");
       HYPRE_BoomerAMGSetCycleType(amg_solver, cycle_type);
@@ -2107,1029 +2175,1140 @@ main( HYPRE_Int   argc,
       HYPRE_BoomerAMGSetSchwarzRlxWeight(amg_solver, schwarz_rlx_weight);
       HYPRE_BoomerAMGSetNumFunctions(amg_solver, num_functions);
       if (num_functions > 1)
+      {
          HYPRE_BoomerAMGSetDofFunc(amg_solver, dof_func);
+      }
+
+      HYPRE_BoomerAMGSetup(amg_solver, parcsr_A, b, x);
+
+      hypre_EndTiming(time_index);
+      hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
+      hypre_FinalizeTiming(time_index);
+      hypre_ClearTiming();
+
+      time_index = hypre_InitializeTiming("BoomerAMG Solve");
+      hypre_BeginTiming(time_index);
+
+      HYPRE_BoomerAMGSolve(amg_solver, parcsr_A, b, x);
+
+      hypre_EndTiming(time_index);
+      hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
+      hypre_FinalizeTiming(time_index);
+      hypre_ClearTiming();
+
+#if SECOND_TIME
+      /* run a second time to check for memory leaks */
+      HYPRE_ParVectorSetRandomValues(x, 775);
+      HYPRE_BoomerAMGSetup(amg_solver, parcsr_A, b, x);
+      HYPRE_BoomerAMGSolve(amg_solver, parcsr_A, b, x);
+#endif
+
+      HYPRE_BoomerAMGDestroy(amg_solver);
+   }
+
+   if (solver_id == HYPRE_PARASAILS)
+   {
+      HYPRE_IJMatrix ij_M;
+      HYPRE_ParCSRMatrix  parcsr_mat;
+
+      /* use ParaSails preconditioner */
+      if (myid == 0) { hypre_printf("Test ParaSails Build IJMatrix\n"); }
+
+      HYPRE_IJMatrixPrint(ij_A, "parasails.in");
+
+      HYPRE_ParaSailsCreate(hypre_MPI_COMM_WORLD, &pcg_precond);
+      HYPRE_ParaSailsSetParams(pcg_precond, 0., 0);
+      HYPRE_ParaSailsSetFilter(pcg_precond, 0.);
+      HYPRE_ParaSailsSetLogging(pcg_precond, ioutdat);
+
+      HYPRE_IJMatrixGetObject( ij_A, &object);
+      parcsr_mat = (HYPRE_ParCSRMatrix) object;
+
+      HYPRE_ParaSailsSetup(pcg_precond, parcsr_mat, NULL, NULL);
+      HYPRE_ParaSailsBuildIJMatrix(pcg_precond, &ij_M);
+      HYPRE_IJMatrixPrint(ij_M, "parasails.out");
+
+      if (myid == 0) { hypre_printf("Printed to parasails.out.\n"); }
+      exit(0);
+   }
+
+   /*-----------------------------------------------------------
+    * Solve the system using PCG
+    *-----------------------------------------------------------*/
+
+   /* begin lobpcg */
+   if ( !lobpcgFlag && ( solver_id == HYPRE_PCG) )
+      /*end lobpcg */
+   {
+      time_index = hypre_InitializeTiming("PCG Setup");
+      hypre_BeginTiming(time_index);
+      ioutdat = 2;
+
+      HYPRE_ParCSRPCGCreate(hypre_MPI_COMM_WORLD, &pcg_solver);
+      HYPRE_PCGSetMaxIter(pcg_solver, 1000);
+      HYPRE_PCGSetTol(pcg_solver, tol);
+      HYPRE_PCGSetTwoNorm(pcg_solver, 1);
+      HYPRE_PCGSetRelChange(pcg_solver, 0);
+      HYPRE_PCGSetPrintLevel(pcg_solver, ioutdat);
+
+      if (precond_id == HYPRE_EUCLID)
+      {
+         /* use Euclid preconditioning */
+         if (myid == 0) { hypre_printf("Solver: Euclid-PCG\n"); }
+
+         HYPRE_EuclidCreate(hypre_MPI_COMM_WORLD, &pcg_precond);
+
+         /* note: There are three methods of setting run-time
+            parameters for Euclid: (see HYPRE_parcsr_ls.h); here
+            we'll use what I think is simplest: let Euclid internally
+            parse the command line.
+         */
+         HYPRE_EuclidSetParams(pcg_precond, argc, argv);
+
+         HYPRE_PCGSetPrecond(pcg_solver,
+                             (HYPRE_PtrToSolverFcn) HYPRE_EuclidSolve,
+                             (HYPRE_PtrToSolverFcn) HYPRE_EuclidSetup,
+                             pcg_precond);
+      }
+      else
+      {
+         hypre_set_precond(matrix_id, solver_id, precond_id, pcg_solver, pcg_precond);
+      }
+
+      HYPRE_PCGGetPrecond(pcg_solver, &pcg_precond_gotten);
+      if (pcg_precond_gotten !=  pcg_precond)
+      {
+         hypre_printf("HYPRE_ParCSRPCGGetPrecond got bad precond\n");
+         return (-1);
+      }
+      else if (myid == 0)
+      {
+         hypre_printf("HYPRE_ParCSRPCGGetPrecond got good precond\n");
+      }
+
+      HYPRE_PCGSetup(pcg_solver, (HYPRE_Matrix)parcsr_A,
+                     (HYPRE_Vector)b, (HYPRE_Vector)x);
+
+      hypre_EndTiming(time_index);
+      hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
+      hypre_FinalizeTiming(time_index);
+      hypre_ClearTiming();
+
+      time_index = hypre_InitializeTiming("PCG Solve");
+      hypre_BeginTiming(time_index);
+
+      HYPRE_PCGSolve(pcg_solver, (HYPRE_Matrix)parcsr_A,
+                     (HYPRE_Vector)b, (HYPRE_Vector)x);
+
+      hypre_EndTiming(time_index);
+      hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
+      hypre_FinalizeTiming(time_index);
+      hypre_ClearTiming();
+
+      HYPRE_PCGGetNumIterations(pcg_solver, &num_iterations);
+      HYPRE_PCGGetFinalRelativeResidualNorm(pcg_solver, &final_res_norm);
+
+#if SECOND_TIME
+      /* run a second time to check for memory leaks */
+      HYPRE_ParVectorSetRandomValues(x, 775);
+      HYPRE_PCGSetup(pcg_solver, (HYPRE_Matrix)parcsr_A,
+                     (HYPRE_Vector)b, (HYPRE_Vector)x);
+      HYPRE_PCGSolve(pcg_solver, (HYPRE_Matrix)parcsr_A,
+                     (HYPRE_Vector)b, (HYPRE_Vector)x);
+#endif
+
+      HYPRE_ParCSRPCGDestroy(pcg_solver);
+
+      hypre_destroy_precond(precond_id, pcg_precond);
+
+
+      if (myid == 0)
+      {
+         hypre_printf("\n");
+         hypre_printf("Iterations = %d\n", num_iterations);
+         hypre_printf("Final Relative Residual Norm = %e\n", final_res_norm);
+         hypre_printf("\n");
+      }
+
+   }
+
+   /* begin lobpcg */
+
+   /*-----------------------------------------------------------
+    * Solve the eigenvalue problem using LOBPCG
+    *-----------------------------------------------------------*/
+
+   if ( lobpcgFlag )
+   {
+
+      interpreter = hypre_CTAlloc(mv_InterfaceInterpreter, 1, HYPRE_MEMORY_HOST);
+
+      HYPRE_ParCSRSetupInterpreter( interpreter );
+      HYPRE_ParCSRSetupMatvec(&matvec_fn);
+
+      if (myid != 0)
+      {
+         verbosity = 0;
+      }
+
+      if ( lobpcgGen )
+      {
+         BuildParIsoLaplacian(argc, argv, &parcsr_B);
+
+         ierr = HYPRE_ParCSRMatrixGetLocalRange( parcsr_B,
+                                                 &first_local_row, &last_local_row,
+                                                 &first_local_col, &last_local_col );
+
+         local_num_rows = last_local_row - first_local_row + 1;
+         local_num_cols = last_local_col - first_local_col + 1;
+         ierr += HYPRE_ParCSRMatrixGetDims( parcsr_B, &M, &N );
+
+         ierr += HYPRE_IJMatrixCreate( comm, first_local_row, last_local_row,
+                                       first_local_col, last_local_col,
+                                       &ij_B );
+
+         ierr += HYPRE_IJMatrixSetObjectType( ij_B, HYPRE_PARCSR );
+
+         if (sparsity_known == 1)
+         {
+            diag_sizes = hypre_CTAlloc(HYPRE_Int,  local_num_rows, HYPRE_MEMORY_HOST);
+            offdiag_sizes = hypre_CTAlloc(HYPRE_Int,  local_num_rows, HYPRE_MEMORY_HOST);
+            local_row = 0;
+            for (i = first_local_row; i <= last_local_row; i++)
+            {
+               ierr += HYPRE_ParCSRMatrixGetRow( parcsr_B, i, &size,
+                                                 &col_inds, &values );
+               for (j = 0; j < size; j++)
+               {
+                  if (col_inds[j] < first_local_row || col_inds[j] > last_local_row)
+                  {
+                     offdiag_sizes[local_row]++;
+                  }
+                  else
+                  {
+                     diag_sizes[local_row]++;
+                  }
+               }
+               local_row++;
+               ierr += HYPRE_ParCSRMatrixRestoreRow( parcsr_B, i, &size,
+                                                     &col_inds, &values );
+            }
+            ierr += HYPRE_IJMatrixSetDiagOffdSizes( ij_B,
+                                                    (const HYPRE_Int *) diag_sizes,
+                                                    (const HYPRE_Int *) offdiag_sizes );
+            hypre_TFree(diag_sizes, HYPRE_MEMORY_HOST);
+            hypre_TFree(offdiag_sizes, HYPRE_MEMORY_HOST);
+
+            ierr = HYPRE_IJMatrixInitialize( ij_B );
+
+            for (i = first_local_row; i <= last_local_row; i++)
+            {
+               ierr += HYPRE_ParCSRMatrixGetRow( parcsr_B, i, &size,
+                                                 &col_inds, &values );
+
+               ierr += HYPRE_IJMatrixSetValues( ij_B, 1, &size, &i,
+                                                (const HYPRE_Int *) col_inds,
+                                                (const HYPRE_Real *) values );
+
+               ierr += HYPRE_ParCSRMatrixRestoreRow( parcsr_B, i, &size,
+                                                     &col_inds, &values );
+            }
+         }
+         else
+         {
+            row_sizes = hypre_CTAlloc(HYPRE_Int,  local_num_rows, HYPRE_MEMORY_HOST);
+
+            size = 5; /* this is in general too low, and supposed to test
+                       the capability of the reallocation of the interface */
+
+            if (sparsity_known == 0) /* tries a more accurate estimate of the
+                                      storage */
+            {
+               if (build_matrix_type == 2) { size = 7; }
+               if (build_matrix_type == 3) { size = 9; }
+               if (build_matrix_type == 4) { size = 27; }
+            }
+
+            for (i = 0; i < local_num_rows; i++)
+            {
+               row_sizes[i] = size;
+            }
+
+            ierr = HYPRE_IJMatrixSetRowSizes ( ij_B, (const HYPRE_Int *) row_sizes );
+
+            hypre_TFree(row_sizes, HYPRE_MEMORY_HOST);
+
+            ierr = HYPRE_IJMatrixInitialize( ij_B );
+
+            /* Loop through all locally stored rows and insert them into ij_matrix */
+            for (i = first_local_row; i <= last_local_row; i++)
+            {
+               ierr += HYPRE_ParCSRMatrixGetRow( parcsr_B, i, &size,
+                                                 &col_inds, &values );
+
+               ierr += HYPRE_IJMatrixSetValues( ij_B, 1, &size, &i,
+                                                (const HYPRE_Int *) col_inds,
+                                                (const HYPRE_Real *) values );
+
+               ierr += HYPRE_ParCSRMatrixRestoreRow( parcsr_B, i, &size,
+                                                     &col_inds, &values );
+            }
+         }
+
+         ierr += HYPRE_IJMatrixAssemble( ij_B );
+
+         ierr += HYPRE_ParCSRMatrixDestroy(parcsr_B);
+
+         ierr += HYPRE_IJMatrixGetObject( ij_B, &object);
+         parcsr_B = (HYPRE_ParCSRMatrix) object;
+
+      } /* if ( lobpcgGen ) */
+
+      if ( pcgIterations > 0 )   /* do inner pcg iterations */
+      {
+
+         time_index = hypre_InitializeTiming("PCG Setup");
+         hypre_BeginTiming(time_index);
+
+         HYPRE_ParCSRPCGCreate(hypre_MPI_COMM_WORLD, &pcg_solver);
+         HYPRE_PCGSetMaxIter(pcg_solver, pcgIterations);
+         HYPRE_PCGSetTol(pcg_solver, pcgTol);
+         HYPRE_PCGSetTwoNorm(pcg_solver, 1);
+         HYPRE_PCGSetRelChange(pcg_solver, 0);
+         HYPRE_PCGSetPrintLevel(pcg_solver, 0);
+
+         HYPRE_PCGGetPrecond(pcg_solver, &pcg_precond);
+
+         if (solver_id == 1)
+         {
+            /* use BoomerAMG as preconditioner */
+            if (myid == 0) { hypre_printf("Solver: AMG-PCG\n"); }
+            HYPRE_BoomerAMGCreate(&pcg_precond);
+            HYPRE_BoomerAMGSetInterpType(pcg_precond, interp_type);
+            HYPRE_BoomerAMGSetNumSamples(pcg_precond, gsmg_samples);
+            HYPRE_BoomerAMGSetTol(pcg_precond, pc_tol);
+            HYPRE_BoomerAMGSetCoarsenType(pcg_precond, (hybrid * coarsen_type));
+            HYPRE_BoomerAMGSetMeasureType(pcg_precond, measure_type);
+            HYPRE_BoomerAMGSetStrongThreshold(pcg_precond, strong_threshold);
+            HYPRE_BoomerAMGSetTruncFactor(pcg_precond, trunc_factor);
+            HYPRE_BoomerAMGSetPrintLevel(pcg_precond, poutdat);
+            HYPRE_BoomerAMGSetPrintFileName(pcg_precond, "driver.out.log");
+            HYPRE_BoomerAMGSetMaxIter(pcg_precond, 1);
+            HYPRE_BoomerAMGSetCycleType(pcg_precond, cycle_type);
+            HYPRE_BoomerAMGSetNumGridSweeps(pcg_precond, num_grid_sweeps);
+            HYPRE_BoomerAMGSetGridRelaxType(pcg_precond, grid_relax_type);
+            HYPRE_BoomerAMGSetRelaxWeight(pcg_precond, relax_weight);
+            HYPRE_BoomerAMGSetOmega(pcg_precond, omega);
+            HYPRE_BoomerAMGSetSmoothType(pcg_precond, smooth_type);
+            HYPRE_BoomerAMGSetSmoothNumLevels(pcg_precond, smooth_num_levels);
+            HYPRE_BoomerAMGSetSmoothNumSweeps(pcg_precond, smooth_num_sweeps);
+            HYPRE_BoomerAMGSetGridRelaxPoints(pcg_precond, grid_relax_points);
+            HYPRE_BoomerAMGSetMaxLevels(pcg_precond, max_levels);
+            HYPRE_BoomerAMGSetMaxRowSum(pcg_precond, max_row_sum);
+            HYPRE_BoomerAMGSetNumFunctions(pcg_precond, num_functions);
+            HYPRE_BoomerAMGSetVariant(pcg_precond, variant);
+            HYPRE_BoomerAMGSetOverlap(pcg_precond, overlap);
+            HYPRE_BoomerAMGSetDomainType(pcg_precond, domain_type);
+            HYPRE_BoomerAMGSetSchwarzRlxWeight(pcg_precond, schwarz_rlx_weight);
+            if (num_functions > 1)
+            {
+               HYPRE_BoomerAMGSetDofFunc(pcg_precond, dof_func);
+            }
+            HYPRE_PCGSetPrecond(pcg_solver,
+                                (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSolve,
+                                (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSetup,
+                                pcg_precond);
+         }
+         else if (solver_id == 2)
+         {
+
+            /* use diagonal scaling as preconditioner */
+            if (myid == 0) { hypre_printf("Solver: DS-PCG\n"); }
+            pcg_precond = NULL;
+
+            HYPRE_PCGSetPrecond(pcg_solver,
+                                (HYPRE_PtrToSolverFcn) HYPRE_ParCSRDiagScale,
+                                (HYPRE_PtrToSolverFcn) HYPRE_ParCSRDiagScaleSetup,
+                                pcg_precond);
+         }
+         else if (solver_id == 8)
+         {
+            /* use ParaSails preconditioner */
+            if (myid == 0) { hypre_printf("Solver: ParaSails-PCG\n"); }
+
+            HYPRE_ParaSailsCreate(hypre_MPI_COMM_WORLD, &pcg_precond);
+            HYPRE_ParaSailsSetParams(pcg_precond, sai_threshold, max_levels);
+            HYPRE_ParaSailsSetFilter(pcg_precond, sai_filter);
+            HYPRE_ParaSailsSetLogging(pcg_precond, poutdat);
+
+            HYPRE_PCGSetPrecond(pcg_solver,
+                                (HYPRE_PtrToSolverFcn) HYPRE_ParaSailsSolve,
+                                (HYPRE_PtrToSolverFcn) HYPRE_ParaSailsSetup,
+                                pcg_precond);
+         }
+         else if (solver_id == 12)
+         {
+            /* use Schwarz preconditioner */
+            if (myid == 0) { hypre_printf("Solver: Schwarz-PCG\n"); }
+
+            HYPRE_SchwarzCreate(&pcg_precond);
+            HYPRE_SchwarzSetVariant(pcg_precond, variant);
+            HYPRE_SchwarzSetOverlap(pcg_precond, overlap);
+            HYPRE_SchwarzSetDomainType(pcg_precond, domain_type);
+            HYPRE_SchwarzSetRelaxWeight(pcg_precond, schwarz_rlx_weight);
+
+            HYPRE_PCGSetPrecond(pcg_solver,
+                                (HYPRE_PtrToSolverFcn) HYPRE_SchwarzSolve,
+                                (HYPRE_PtrToSolverFcn) HYPRE_SchwarzSetup,
+                                pcg_precond);
+         }
+         else if (solver_id == 14)
+         {
+            /* use GSMG as preconditioner */
+
+            /* reset some smoother parameters */
+
+            /* fine grid */
+            num_grid_sweeps[0] = num_sweep;
+            grid_relax_type[0] = relax_default;
+            hypre_TFree(grid_relax_points[0], HYPRE_MEMORY_HOST);
+            grid_relax_points[0] = hypre_CTAlloc(HYPRE_Int,  num_sweep, HYPRE_MEMORY_HOST);
+            for (i = 0; i < num_sweep; i++)
+            {
+               grid_relax_points[0][i] = 0;
+            }
+
+            /* down cycle */
+            num_grid_sweeps[1] = num_sweep;
+            grid_relax_type[1] = relax_default;
+            hypre_TFree(grid_relax_points[1], HYPRE_MEMORY_HOST);
+            grid_relax_points[1] = hypre_CTAlloc(HYPRE_Int,  num_sweep, HYPRE_MEMORY_HOST);
+            for (i = 0; i < num_sweep; i++)
+            {
+               grid_relax_points[1][i] = 0;
+            }
+
+            /* up cycle */
+            num_grid_sweeps[2] = num_sweep;
+            grid_relax_type[2] = relax_default;
+            hypre_TFree(grid_relax_points[2], HYPRE_MEMORY_HOST);
+            grid_relax_points[2] = hypre_CTAlloc(HYPRE_Int,  num_sweep, HYPRE_MEMORY_HOST);
+            for (i = 0; i < num_sweep; i++)
+            {
+               grid_relax_points[2][i] = 0;
+            }
+
+            /* coarsest grid */
+            num_grid_sweeps[3] = 1;
+            grid_relax_type[3] = 9;
+            hypre_TFree(grid_relax_points[3], HYPRE_MEMORY_HOST);
+            grid_relax_points[3] = hypre_CTAlloc(HYPRE_Int,  1, HYPRE_MEMORY_HOST);
+            grid_relax_points[3][0] = 0;
+
+            if (myid == 0) { hypre_printf("Solver: GSMG-PCG\n"); }
+            HYPRE_BoomerAMGCreate(&pcg_precond);
+            HYPRE_BoomerAMGSetGSMG(pcg_precond, 4);
+            HYPRE_BoomerAMGSetInterpType(pcg_precond, interp_type);
+            HYPRE_BoomerAMGSetNumSamples(pcg_precond, gsmg_samples);
+            HYPRE_BoomerAMGSetTol(pcg_precond, pc_tol);
+            HYPRE_BoomerAMGSetCoarsenType(pcg_precond, (hybrid * coarsen_type));
+            HYPRE_BoomerAMGSetMeasureType(pcg_precond, measure_type);
+            HYPRE_BoomerAMGSetStrongThreshold(pcg_precond, strong_threshold);
+            HYPRE_BoomerAMGSetTruncFactor(pcg_precond, trunc_factor);
+            HYPRE_BoomerAMGSetPrintLevel(pcg_precond, poutdat);
+            HYPRE_BoomerAMGSetPrintFileName(pcg_precond, "driver.out.log");
+            HYPRE_BoomerAMGSetMaxIter(pcg_precond, 1);
+            HYPRE_BoomerAMGSetCycleType(pcg_precond, cycle_type);
+            HYPRE_BoomerAMGSetNumGridSweeps(pcg_precond, num_grid_sweeps);
+            HYPRE_BoomerAMGSetGridRelaxType(pcg_precond, grid_relax_type);
+            HYPRE_BoomerAMGSetRelaxWeight(pcg_precond, relax_weight);
+            HYPRE_BoomerAMGSetOmega(pcg_precond, omega);
+            HYPRE_BoomerAMGSetSmoothType(pcg_precond, smooth_type);
+            HYPRE_BoomerAMGSetSmoothNumLevels(pcg_precond, smooth_num_levels);
+            HYPRE_BoomerAMGSetSmoothNumSweeps(pcg_precond, smooth_num_sweeps);
+            HYPRE_BoomerAMGSetVariant(pcg_precond, variant);
+            HYPRE_BoomerAMGSetOverlap(pcg_precond, overlap);
+            HYPRE_BoomerAMGSetDomainType(pcg_precond, domain_type);
+            HYPRE_BoomerAMGSetSchwarzRlxWeight(pcg_precond, schwarz_rlx_weight);
+            HYPRE_BoomerAMGSetGridRelaxPoints(pcg_precond, grid_relax_points);
+            HYPRE_BoomerAMGSetMaxLevels(pcg_precond, max_levels);
+            HYPRE_BoomerAMGSetMaxRowSum(pcg_precond, max_row_sum);
+            HYPRE_BoomerAMGSetNumFunctions(pcg_precond, num_functions);
+            if (num_functions > 1)
+            {
+               HYPRE_BoomerAMGSetDofFunc(pcg_precond, dof_func);
+            }
+            HYPRE_PCGSetPrecond(pcg_solver,
+                                (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSolve,
+                                (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSetup,
+                                pcg_precond);
+         }
+         else if (solver_id == 43)
+         {
+            /* use Euclid preconditioning */
+            if (myid == 0) { hypre_printf("Solver: Euclid-PCG\n"); }
+
+            HYPRE_EuclidCreate(hypre_MPI_COMM_WORLD, &pcg_precond);
+
+            /* note: There are three methods of setting run-time
+               parameters for Euclid: (see HYPRE_parcsr_ls.h); here
+               we'll use what I think is simplest: let Euclid internally
+               parse the command line.
+               */
+            HYPRE_EuclidSetParams(pcg_precond, argc, argv);
+
+            HYPRE_PCGSetPrecond(pcg_solver,
+                                (HYPRE_PtrToSolverFcn) HYPRE_EuclidSolve,
+                                (HYPRE_PtrToSolverFcn) HYPRE_EuclidSetup,
+                                pcg_precond);
+         }
+         else if (solver_id != NO_SOLVER )
+         {
+            if ( verbosity )
+            {
+               hypre_printf("Solver ID not recognized - running inner PCG iterations without preconditioner\n\n");
+            }
+         }
+
+         HYPRE_PCGGetPrecond(pcg_solver, &pcg_precond_gotten);
+         if (pcg_precond_gotten !=  pcg_precond)
+         {
+            hypre_printf("HYPRE_ParCSRPCGGetPrecond got bad precond\n");
+            return (-1);
+         }
+         else if (myid == 0)
+         {
+            hypre_printf("HYPRE_ParCSRPCGGetPrecond got good precond\n");
+         }
+
+         /*      HYPRE_PCGSetup(pcg_solver, (HYPRE_Matrix)parcsr_A,
+                 (HYPRE_Vector)b, (HYPRE_Vector)x); */
+
+         hypre_EndTiming(time_index);
+         hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
+         hypre_FinalizeTiming(time_index);
+         hypre_ClearTiming();
+
+         HYPRE_LOBPCGCreate(interpreter, &matvec_fn, &lobpcg_solver);
+
+         HYPRE_LOBPCGSetMaxIter(lobpcg_solver, maxIterations);
+         HYPRE_LOBPCGSetPrecondUsageMode(lobpcg_solver, pcgMode);
+         HYPRE_LOBPCGSetTol(lobpcg_solver, tol);
+         HYPRE_LOBPCGSetPrintLevel(lobpcg_solver, verbosity);
+
+         HYPRE_LOBPCGSetPrecond(lobpcg_solver,
+                                (HYPRE_PtrToSolverFcn) HYPRE_PCGSolve,
+                                (HYPRE_PtrToSolverFcn) HYPRE_PCGSetup,
+                                pcg_solver);
+
+         HYPRE_LOBPCGSetupT(lobpcg_solver, (HYPRE_Matrix)parcsr_A,
+                            (HYPRE_Vector)x);
+
+         HYPRE_LOBPCGSetup(lobpcg_solver, (HYPRE_Matrix)parcsr_A,
+                           (HYPRE_Vector)b, (HYPRE_Vector)x);
+
+         if ( lobpcgGen )
+            HYPRE_LOBPCGSetupB(lobpcg_solver, (HYPRE_Matrix)parcsr_B,
+                               (HYPRE_Vector)x);
+
+         if ( vFromFileFlag )
+         {
+            eigenvectors = mv_MultiVectorWrap( interpreter,
+                                               hypre_ParCSRMultiVectorRead(hypre_MPI_COMM_WORLD,
+                                                                           interpreter,
+                                                                           "vectors" ), 1);
+            hypre_assert( eigenvectors != NULL );
+            blockSize = mv_MultiVectorWidth( eigenvectors );
+         }
+         else
+         {
+            eigenvectors = mv_MultiVectorCreateFromSampleVector( interpreter,
+                                                                 blockSize,
+                                                                 x );
+            if ( lobpcgSeed )
+            {
+               mv_MultiVectorSetRandom( eigenvectors, lobpcgSeed );
+            }
+            else
+            {
+               mv_MultiVectorSetRandom( eigenvectors, (HYPRE_Int)time(0) );
+            }
+         }
+
+         if ( constrained )
+         {
+            constraints = mv_MultiVectorWrap( interpreter,
+                                              hypre_ParCSRMultiVectorRead(hypre_MPI_COMM_WORLD,
+                                                                          interpreter,
+                                                                          "vectors" ), 1);
+            hypre_assert( constraints != NULL );
+         }
+
+         eigenvalues = hypre_CTAlloc(HYPRE_Real,  blockSize, HYPRE_MEMORY_HOST);
+
+         time_index = hypre_InitializeTiming("LOBPCG Solve");
+         hypre_BeginTiming(time_index);
+
+         HYPRE_LOBPCGSolve(lobpcg_solver, constraints, eigenvectors, eigenvalues );
+
+         hypre_EndTiming(time_index);
+         hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
+         hypre_FinalizeTiming(time_index);
+         hypre_ClearTiming();
+
+
+         if ( checkOrtho )
+         {
+
+            gramXX = utilities_FortranMatrixCreate();
+            identity = utilities_FortranMatrixCreate();
+
+            utilities_FortranMatrixAllocateData( blockSize, blockSize, gramXX );
+            utilities_FortranMatrixAllocateData( blockSize, blockSize, identity );
+
+            if ( lobpcgGen )
+            {
+               workspace = mv_MultiVectorCreateCopy( eigenvectors, 0 );
+               hypre_LOBPCGMultiOperatorB( lobpcg_solver,
+                                           mv_MultiVectorGetData(eigenvectors),
+                                           mv_MultiVectorGetData(workspace) );
+               lobpcg_MultiVectorByMultiVector( eigenvectors, workspace, gramXX );
+            }
+            else
+            {
+               lobpcg_MultiVectorByMultiVector( eigenvectors, eigenvectors, gramXX );
+            }
+
+            utilities_FortranMatrixSetToIdentity( identity );
+            utilities_FortranMatrixAdd( -1, identity, gramXX, gramXX );
+            nonOrthF = utilities_FortranMatrixFNorm( gramXX );
+            if ( myid == 0 )
+            {
+               hypre_printf("Non-orthonormality of eigenvectors: %12.5e\n", nonOrthF);
+            }
+
+            utilities_FortranMatrixDestroy( gramXX );
+            utilities_FortranMatrixDestroy( identity );
+
+         }
+
+         if ( printLevel )
+         {
 
-      HYPRE_BoomerAMGSetup(amg_solver, parcsr_A, b, x);
+            hypre_ParCSRMultiVectorPrint( mv_MultiVectorGetData(eigenvectors), "vectors" );
 
-      hypre_EndTiming(time_index);
-      hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
-      hypre_FinalizeTiming(time_index);
-      hypre_ClearTiming();
+            if ( myid == 0 )
+            {
+               if ( (filePtr = fopen("values.txt", "w")) )
+               {
+                  hypre_fprintf(filePtr, "%d\n", blockSize);
+                  for ( i = 0; i < blockSize; i++ )
+                  {
+                     hypre_fprintf(filePtr, "%22.14e\n", eigenvalues[i]);
+                  }
+                  fclose(filePtr);
+               }
+
+               if ( (filePtr = fopen("residuals.txt", "w")) )
+               {
+                  residualNorms = HYPRE_LOBPCGResidualNorms( lobpcg_solver );
+                  residuals = utilities_FortranMatrixValues( residualNorms );
+                  hypre_fprintf(filePtr, "%d\n", blockSize);
+                  for ( i = 0; i < blockSize; i++ )
+                  {
+                     hypre_fprintf(filePtr, "%22.14e\n", residuals[i]);
+                  }
+                  fclose(filePtr);
+               }
+
+               if ( printLevel > 1 )
+               {
+
+                  printBuffer = utilities_FortranMatrixCreate();
+
+                  iterations = HYPRE_LOBPCGIterations( lobpcg_solver );
+
+                  eigenvaluesHistory = HYPRE_LOBPCGEigenvaluesHistory( lobpcg_solver );
+                  utilities_FortranMatrixSelectBlock( eigenvaluesHistory,
+                                                      1, blockSize, 1, iterations + 1, printBuffer );
+                  utilities_FortranMatrixPrint( printBuffer, "val_hist.txt" );
+
+                  residualNormsHistory = HYPRE_LOBPCGResidualNormsHistory( lobpcg_solver );
+                  utilities_FortranMatrixSelectBlock(residualNormsHistory,
+                                                     1, blockSize, 1, iterations + 1, printBuffer );
+                  utilities_FortranMatrixPrint( printBuffer, "res_hist.txt" );
+
+                  utilities_FortranMatrixDestroy( printBuffer );
+               }
+            }
+         }
 
-      time_index = hypre_InitializeTiming("BoomerAMG Solve");
-      hypre_BeginTiming(time_index);
+         HYPRE_LOBPCGDestroy(lobpcg_solver);
+         mv_MultiVectorDestroy( eigenvectors );
+         if ( constrained )
+         {
+            mv_MultiVectorDestroy( constraints );
+         }
+         if ( lobpcgGen )
+         {
+            mv_MultiVectorDestroy( workspace );
+         }
+         hypre_TFree(eigenvalues, HYPRE_MEMORY_HOST);
 
-      HYPRE_BoomerAMGSolve(amg_solver, parcsr_A, b, x);
+         HYPRE_ParCSRPCGDestroy(pcg_solver);
 
-      hypre_EndTiming(time_index);
-      hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
-      hypre_FinalizeTiming(time_index);
-      hypre_ClearTiming();
+         if (solver_id == 1)
+         {
+            HYPRE_BoomerAMGDestroy(pcg_precond);
+         }
+         else if (solver_id == 8)
+         {
+            HYPRE_ParaSailsDestroy(pcg_precond);
+         }
+         else if (solver_id == 12)
+         {
+            HYPRE_SchwarzDestroy(pcg_precond);
+         }
+         else if (solver_id == 14)
+         {
+            HYPRE_BoomerAMGDestroy(pcg_precond);
+         }
+         else if (solver_id == 43)
+         {
+            HYPRE_EuclidDestroy(pcg_precond);
+         }
 
-#if SECOND_TIME
-      /* run a second time to check for memory leaks */
-      HYPRE_ParVectorSetRandomValues(x, 775);
-      HYPRE_BoomerAMGSetup(amg_solver, parcsr_A, b, x);
-      HYPRE_BoomerAMGSolve(amg_solver, parcsr_A, b, x);
-#endif
+      }
+      else   /* pcgIterations <= 0 --> use the preconditioner directly */
+      {
 
-      HYPRE_BoomerAMGDestroy(amg_solver);
-   }
+         time_index = hypre_InitializeTiming("LOBPCG Setup");
+         hypre_BeginTiming(time_index);
+         if (myid != 0)
+         {
+            verbosity = 0;
+         }
 
-   if (solver_id == HYPRE_PARASAILS)
-   {
-      HYPRE_IJMatrix ij_M;
-      HYPRE_ParCSRMatrix  parcsr_mat;
+         HYPRE_LOBPCGCreate(interpreter, &matvec_fn, &pcg_solver);
+         HYPRE_LOBPCGSetMaxIter(pcg_solver, maxIterations);
+         HYPRE_LOBPCGSetTol(pcg_solver, tol);
+         HYPRE_LOBPCGSetPrintLevel(pcg_solver, verbosity);
 
-      /* use ParaSails preconditioner */
-      if (myid == 0) hypre_printf("Test ParaSails Build IJMatrix\n");
+         HYPRE_LOBPCGGetPrecond(pcg_solver, &pcg_precond);
 
-      HYPRE_IJMatrixPrint(ij_A, "parasails.in");
+         if (solver_id == 1)
+         {
+            /* use BoomerAMG as preconditioner */
+            if (myid == 0)
+            {
+               hypre_printf("Solver: AMG-PCG\n");
+            }
 
-      HYPRE_ParaSailsCreate(hypre_MPI_COMM_WORLD, &pcg_precond);
-      HYPRE_ParaSailsSetParams(pcg_precond, 0., 0);
-      HYPRE_ParaSailsSetFilter(pcg_precond, 0.);
-      HYPRE_ParaSailsSetLogging(pcg_precond, ioutdat);
+            HYPRE_BoomerAMGCreate(&pcg_precond);
+            HYPRE_BoomerAMGSetInterpType(pcg_precond, interp_type);
+            HYPRE_BoomerAMGSetNumSamples(pcg_precond, gsmg_samples);
+            HYPRE_BoomerAMGSetTol(pcg_precond, pc_tol);
+            HYPRE_BoomerAMGSetCoarsenType(pcg_precond, (hybrid * coarsen_type));
+            HYPRE_BoomerAMGSetMeasureType(pcg_precond, measure_type);
+            HYPRE_BoomerAMGSetStrongThreshold(pcg_precond, strong_threshold);
+            HYPRE_BoomerAMGSetTruncFactor(pcg_precond, trunc_factor);
+            HYPRE_BoomerAMGSetPrintLevel(pcg_precond, poutdat);
+            HYPRE_BoomerAMGSetPrintFileName(pcg_precond, "driver.out.log");
+            HYPRE_BoomerAMGSetMaxIter(pcg_precond, 1);
+            HYPRE_BoomerAMGSetCycleType(pcg_precond, cycle_type);
+            HYPRE_BoomerAMGSetNumGridSweeps(pcg_precond, num_grid_sweeps);
+            HYPRE_BoomerAMGSetGridRelaxType(pcg_precond, grid_relax_type);
+            HYPRE_BoomerAMGSetRelaxWeight(pcg_precond, relax_weight);
+            HYPRE_BoomerAMGSetOmega(pcg_precond, omega);
+            HYPRE_BoomerAMGSetSmoothType(pcg_precond, smooth_type);
+            HYPRE_BoomerAMGSetSmoothNumLevels(pcg_precond, smooth_num_levels);
+            HYPRE_BoomerAMGSetSmoothNumSweeps(pcg_precond, smooth_num_sweeps);
+            HYPRE_BoomerAMGSetGridRelaxPoints(pcg_precond, grid_relax_points);
+            HYPRE_BoomerAMGSetMaxLevels(pcg_precond, max_levels);
+            HYPRE_BoomerAMGSetMaxRowSum(pcg_precond, max_row_sum);
+            HYPRE_BoomerAMGSetNumFunctions(pcg_precond, num_functions);
+            HYPRE_BoomerAMGSetVariant(pcg_precond, variant);
+            HYPRE_BoomerAMGSetOverlap(pcg_precond, overlap);
+            HYPRE_BoomerAMGSetDomainType(pcg_precond, domain_type);
+            HYPRE_BoomerAMGSetSchwarzRlxWeight(pcg_precond, schwarz_rlx_weight);
+            if (num_functions > 1)
+            {
+               HYPRE_BoomerAMGSetDofFunc(pcg_precond, dof_func);
+            }
 
-      HYPRE_IJMatrixGetObject( ij_A, &object);
-      parcsr_mat = (HYPRE_ParCSRMatrix) object;
+            HYPRE_LOBPCGSetPrecond(pcg_solver,
+                                   (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSolve,
+                                   (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSetup,
+                                   pcg_precond);
+         }
+         else if (solver_id == 2)
+         {
 
-      HYPRE_ParaSailsSetup(pcg_precond, parcsr_mat, NULL, NULL);
-      HYPRE_ParaSailsBuildIJMatrix(pcg_precond, &ij_M);
-      HYPRE_IJMatrixPrint(ij_M, "parasails.out");
+            /* use diagonal scaling as preconditioner */
+            if (myid == 0)
+            {
+               hypre_printf("Solver: DS-PCG\n");
+            }
 
-      if (myid == 0) hypre_printf("Printed to parasails.out.\n");
-      exit(0);
-   }
+            pcg_precond = NULL;
 
-   /*-----------------------------------------------------------
-    * Solve the system using PCG
-    *-----------------------------------------------------------*/
+            HYPRE_LOBPCGSetPrecond(pcg_solver,
+                                   (HYPRE_PtrToSolverFcn) HYPRE_ParCSRDiagScale,
+                                   (HYPRE_PtrToSolverFcn) HYPRE_ParCSRDiagScaleSetup,
+                                   pcg_precond);
+         }
+         else if (solver_id == 8)
+         {
+            /* use ParaSails preconditioner */
+            if (myid == 0)
+            {
+               hypre_printf("Solver: ParaSails-PCG\n");
+            }
 
-   /* begin lobpcg */
-   if ( !lobpcgFlag && ( solver_id == HYPRE_PCG) )
-   /*end lobpcg */
-   {
-      time_index = hypre_InitializeTiming("PCG Setup");
-      hypre_BeginTiming(time_index);
-      ioutdat = 2;
+            HYPRE_ParaSailsCreate(hypre_MPI_COMM_WORLD, &pcg_precond);
+            HYPRE_ParaSailsSetParams(pcg_precond, sai_threshold, max_levels);
+            HYPRE_ParaSailsSetFilter(pcg_precond, sai_filter);
+            HYPRE_ParaSailsSetLogging(pcg_precond, poutdat);
 
-      HYPRE_ParCSRPCGCreate(hypre_MPI_COMM_WORLD, &pcg_solver);
-      HYPRE_PCGSetMaxIter(pcg_solver, 1000);
-      HYPRE_PCGSetTol(pcg_solver, tol);
-      HYPRE_PCGSetTwoNorm(pcg_solver, 1);
-      HYPRE_PCGSetRelChange(pcg_solver, 0);
-      HYPRE_PCGSetPrintLevel(pcg_solver, ioutdat);
+            HYPRE_LOBPCGSetPrecond(pcg_solver,
+                                   (HYPRE_PtrToSolverFcn) HYPRE_ParaSailsSolve,
+                                   (HYPRE_PtrToSolverFcn) HYPRE_ParaSailsSetup,
+                                   pcg_precond);
+         }
+         else if (solver_id == 12)
+         {
+            /* use Schwarz preconditioner */
+            if (myid == 0)
+            {
+               hypre_printf("Solver: Schwarz-PCG\n");
+            }
 
-      if (precond_id == HYPRE_EUCLID)
-      {
-         /* use Euclid preconditioning */
-         if (myid == 0) hypre_printf("Solver: Euclid-PCG\n");
+            HYPRE_SchwarzCreate(&pcg_precond);
+            HYPRE_SchwarzSetVariant(pcg_precond, variant);
+            HYPRE_SchwarzSetOverlap(pcg_precond, overlap);
+            HYPRE_SchwarzSetDomainType(pcg_precond, domain_type);
+            HYPRE_SchwarzSetRelaxWeight(pcg_precond, schwarz_rlx_weight);
 
-         HYPRE_EuclidCreate(hypre_MPI_COMM_WORLD, &pcg_precond);
+            HYPRE_LOBPCGSetPrecond(pcg_solver,
+                                   (HYPRE_PtrToSolverFcn) HYPRE_SchwarzSolve,
+                                   (HYPRE_PtrToSolverFcn) HYPRE_SchwarzSetup,
+                                   pcg_precond);
+         }
+         else if (solver_id == 14)
+         {
+            /* use GSMG as preconditioner */
 
-         /* note: There are three three methods of setting run-time
-            parameters for Euclid: (see HYPRE_parcsr_ls.h); here
-            we'll use what I think is simplest: let Euclid internally
-            parse the command line.
-         */
-         HYPRE_EuclidSetParams(pcg_precond, argc, argv);
+            /* reset some smoother parameters */
 
-         HYPRE_PCGSetPrecond(pcg_solver,
-                             (HYPRE_PtrToSolverFcn) HYPRE_EuclidSolve,
-                             (HYPRE_PtrToSolverFcn) HYPRE_EuclidSetup,
-                             pcg_precond);
-      }
-      else
-         hypre_set_precond(matrix_id, solver_id, precond_id, pcg_solver, pcg_precond);
+            /* fine grid */
+            num_grid_sweeps[0] = num_sweep;
+            grid_relax_type[0] = relax_default;
+            hypre_TFree(grid_relax_points[0], HYPRE_MEMORY_HOST);
+            grid_relax_points[0] = hypre_CTAlloc(HYPRE_Int,  num_sweep, HYPRE_MEMORY_HOST);
+            for (i = 0; i < num_sweep; i++)
+            {
+               grid_relax_points[0][i] = 0;
+            }
 
-      HYPRE_PCGGetPrecond(pcg_solver, &pcg_precond_gotten);
-      if (pcg_precond_gotten !=  pcg_precond)
-      {
-        hypre_printf("HYPRE_ParCSRPCGGetPrecond got bad precond\n");
-        return(-1);
-      }
-      else
-        if (myid == 0)
-          hypre_printf("HYPRE_ParCSRPCGGetPrecond got good precond\n");
+            /* down cycle */
+            num_grid_sweeps[1] = num_sweep;
+            grid_relax_type[1] = relax_default;
+            hypre_TFree(grid_relax_points[1], HYPRE_MEMORY_HOST);
+            grid_relax_points[1] = hypre_CTAlloc(HYPRE_Int,  num_sweep, HYPRE_MEMORY_HOST);
+            for (i = 0; i < num_sweep; i++)
+            {
+               grid_relax_points[1][i] = 0;
+            }
 
-      HYPRE_PCGSetup(pcg_solver, (HYPRE_Matrix)parcsr_A,
-            (HYPRE_Vector)b, (HYPRE_Vector)x);
+            /* up cycle */
+            num_grid_sweeps[2] = num_sweep;
+            grid_relax_type[2] = relax_default;
+            hypre_TFree(grid_relax_points[2], HYPRE_MEMORY_HOST);
+            grid_relax_points[2] = hypre_CTAlloc(HYPRE_Int,  num_sweep, HYPRE_MEMORY_HOST);
+            for (i = 0; i < num_sweep; i++)
+            {
+               grid_relax_points[2][i] = 0;
+            }
 
-      hypre_EndTiming(time_index);
-      hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
-      hypre_FinalizeTiming(time_index);
-      hypre_ClearTiming();
+            /* coarsest grid */
+            num_grid_sweeps[3] = 1;
+            grid_relax_type[3] = 9;
+            hypre_TFree(grid_relax_points[3], HYPRE_MEMORY_HOST);
+            grid_relax_points[3] = hypre_CTAlloc(HYPRE_Int,  1, HYPRE_MEMORY_HOST);
+            grid_relax_points[3][0] = 0;
+
+            if (myid == 0) { hypre_printf("Solver: GSMG-PCG\n"); }
+            HYPRE_BoomerAMGCreate(&pcg_precond);
+            HYPRE_BoomerAMGSetGSMG(pcg_precond, 4);
+            HYPRE_BoomerAMGSetInterpType(pcg_precond, interp_type);
+            HYPRE_BoomerAMGSetNumSamples(pcg_precond, gsmg_samples);
+            HYPRE_BoomerAMGSetTol(pcg_precond, pc_tol);
+            HYPRE_BoomerAMGSetCoarsenType(pcg_precond, (hybrid * coarsen_type));
+            HYPRE_BoomerAMGSetMeasureType(pcg_precond, measure_type);
+            HYPRE_BoomerAMGSetStrongThreshold(pcg_precond, strong_threshold);
+            HYPRE_BoomerAMGSetTruncFactor(pcg_precond, trunc_factor);
+            HYPRE_BoomerAMGSetPrintLevel(pcg_precond, poutdat);
+            HYPRE_BoomerAMGSetPrintFileName(pcg_precond, "driver.out.log");
+            HYPRE_BoomerAMGSetMaxIter(pcg_precond, 1);
+            HYPRE_BoomerAMGSetCycleType(pcg_precond, cycle_type);
+            HYPRE_BoomerAMGSetNumGridSweeps(pcg_precond, num_grid_sweeps);
+            HYPRE_BoomerAMGSetGridRelaxType(pcg_precond, grid_relax_type);
+            HYPRE_BoomerAMGSetRelaxWeight(pcg_precond, relax_weight);
+            HYPRE_BoomerAMGSetOmega(pcg_precond, omega);
+            HYPRE_BoomerAMGSetSmoothType(pcg_precond, smooth_type);
+            HYPRE_BoomerAMGSetSmoothNumLevels(pcg_precond, smooth_num_levels);
+            HYPRE_BoomerAMGSetSmoothNumSweeps(pcg_precond, smooth_num_sweeps);
+            HYPRE_BoomerAMGSetVariant(pcg_precond, variant);
+            HYPRE_BoomerAMGSetOverlap(pcg_precond, overlap);
+            HYPRE_BoomerAMGSetDomainType(pcg_precond, domain_type);
+            HYPRE_BoomerAMGSetSchwarzRlxWeight(pcg_precond, schwarz_rlx_weight);
+            HYPRE_BoomerAMGSetGridRelaxPoints(pcg_precond, grid_relax_points);
+            HYPRE_BoomerAMGSetMaxLevels(pcg_precond, max_levels);
+            HYPRE_BoomerAMGSetMaxRowSum(pcg_precond, max_row_sum);
+            HYPRE_BoomerAMGSetNumFunctions(pcg_precond, num_functions);
+            if (num_functions > 1)
+            {
+               HYPRE_BoomerAMGSetDofFunc(pcg_precond, dof_func);
+            }
 
-      time_index = hypre_InitializeTiming("PCG Solve");
-      hypre_BeginTiming(time_index);
+            HYPRE_LOBPCGSetPrecond(pcg_solver,
+                                   (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSolve,
+                                   (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSetup,
+                                   pcg_precond);
+         }
+         else if (solver_id == 43)
+         {
+            /* use Euclid preconditioning */
+            if (myid == 0)
+            {
+               hypre_printf("Solver: Euclid-PCG\n");
+            }
 
-      HYPRE_PCGSolve(pcg_solver, (HYPRE_Matrix)parcsr_A,
-            (HYPRE_Vector)b, (HYPRE_Vector)x);
+            HYPRE_EuclidCreate(hypre_MPI_COMM_WORLD, &pcg_precond);
 
-      hypre_EndTiming(time_index);
-      hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
-      hypre_FinalizeTiming(time_index);
-      hypre_ClearTiming();
+            /* note: There are three methods of setting run-time
+               parameters for Euclid: (see HYPRE_parcsr_ls.h); here
+               we'll use what I think is simplest: let Euclid internally
+               parse the command line.
+               */
+            HYPRE_EuclidSetParams(pcg_precond, argc, argv);
 
-      HYPRE_PCGGetNumIterations(pcg_solver, &num_iterations);
-      HYPRE_PCGGetFinalRelativeResidualNorm(pcg_solver, &final_res_norm);
+            HYPRE_LOBPCGSetPrecond(pcg_solver,
+                                   (HYPRE_PtrToSolverFcn) HYPRE_EuclidSolve,
+                                   (HYPRE_PtrToSolverFcn) HYPRE_EuclidSetup,
+                                   pcg_precond);
+         }
+         else if (solver_id != NO_SOLVER )
+         {
+            if ( verbosity )
+            {
+               hypre_printf("Solver ID not recognized - running LOBPCG without preconditioner\n\n");
+            }
+         }
 
-#if SECOND_TIME
-      /* run a second time to check for memory leaks */
-      HYPRE_ParVectorSetRandomValues(x, 775);
-      HYPRE_PCGSetup(pcg_solver, (HYPRE_Matrix)parcsr_A,
-            (HYPRE_Vector)b, (HYPRE_Vector)x);
-      HYPRE_PCGSolve(pcg_solver, (HYPRE_Matrix)parcsr_A,
-            (HYPRE_Vector)b, (HYPRE_Vector)x);
-#endif
+         HYPRE_LOBPCGGetPrecond(pcg_solver, &pcg_precond_gotten);
+         if (pcg_precond_gotten !=  pcg_precond && pcgIterations)
+         {
+            hypre_printf("HYPRE_ParCSRLOBPCGGetPrecond got bad precond\n");
+            return (-1);
+         }
+         else if (myid == 0)
+         {
+            hypre_printf("HYPRE_ParCSRLOBPCGGetPrecond got good precond\n");
+         }
 
-      HYPRE_ParCSRPCGDestroy(pcg_solver);
+         HYPRE_LOBPCGSetup(pcg_solver, (HYPRE_Matrix)parcsr_A,
+                           (HYPRE_Vector)b, (HYPRE_Vector)x);
 
-      hypre_destroy_precond(precond_id, pcg_precond);
+         if ( lobpcgGen )
+            HYPRE_LOBPCGSetupB(pcg_solver, (HYPRE_Matrix)parcsr_B,
+                               (HYPRE_Vector)x);
 
+         hypre_EndTiming(time_index);
+         hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
+         hypre_FinalizeTiming(time_index);
+         hypre_ClearTiming();
 
-      if (myid == 0)
-      {
-         hypre_printf("\n");
-         hypre_printf("Iterations = %d\n", num_iterations);
-         hypre_printf("Final Relative Residual Norm = %e\n", final_res_norm);
-         hypre_printf("\n");
-      }
+         if ( vFromFileFlag )
+         {
+            eigenvectors = mv_MultiVectorWrap( interpreter,
+                                               hypre_ParCSRMultiVectorRead(hypre_MPI_COMM_WORLD,
+                                                                           interpreter,
+                                                                           "vectors" ), 1);
+            hypre_assert( eigenvectors != NULL );
+            blockSize = mv_MultiVectorWidth( eigenvectors );
+         }
+         else
+         {
+            eigenvectors = mv_MultiVectorCreateFromSampleVector( interpreter,
+                                                                 blockSize,
+                                                                 x );
+            if ( lobpcgSeed )
+            {
+               mv_MultiVectorSetRandom( eigenvectors, lobpcgSeed );
+            }
+            else
+            {
+               mv_MultiVectorSetRandom( eigenvectors, (HYPRE_Int)time(0) );
+            }
+         }
 
-   }
+         if ( constrained )
+         {
+            constraints = mv_MultiVectorWrap( interpreter,
+                                              hypre_ParCSRMultiVectorRead(hypre_MPI_COMM_WORLD,
+                                                                          interpreter,
+                                                                          "vectors" ), 1);
+            hypre_assert( constraints != NULL );
+         }
 
-   /* begin lobpcg */
+         eigenvalues = hypre_CTAlloc(HYPRE_Real,  blockSize, HYPRE_MEMORY_HOST);
 
-   /*-----------------------------------------------------------
-    * Solve the eigenvalue problem using LOBPCG
-    *-----------------------------------------------------------*/
+         time_index = hypre_InitializeTiming("LOBPCG Solve");
+         hypre_BeginTiming(time_index);
 
-   if ( lobpcgFlag ) {
-
-     interpreter = hypre_CTAlloc(mv_InterfaceInterpreter, 1, HYPRE_MEMORY_HOST);
-
-     HYPRE_ParCSRSetupInterpreter( interpreter );
-     HYPRE_ParCSRSetupMatvec(&matvec_fn);
-
-     if (myid != 0)
-       verbosity = 0;
-
-     if ( lobpcgGen ) {
-       BuildParIsoLaplacian(argc, argv, &parcsr_B);
-
-       ierr = HYPRE_ParCSRMatrixGetLocalRange( parcsr_B,
-             &first_local_row, &last_local_row ,
-             &first_local_col, &last_local_col );
-
-       local_num_rows = last_local_row - first_local_row + 1;
-       local_num_cols = last_local_col - first_local_col + 1;
-       ierr += HYPRE_ParCSRMatrixGetDims( parcsr_B, &M, &N );
-
-       ierr += HYPRE_IJMatrixCreate( comm, first_local_row, last_local_row,
-             first_local_col, last_local_col,
-             &ij_B );
-
-       ierr += HYPRE_IJMatrixSetObjectType( ij_B, HYPRE_PARCSR );
-
-       if (sparsity_known == 1) {
-          diag_sizes = hypre_CTAlloc(HYPRE_Int,  local_num_rows, HYPRE_MEMORY_HOST);
-          offdiag_sizes = hypre_CTAlloc(HYPRE_Int,  local_num_rows, HYPRE_MEMORY_HOST);
-          local_row = 0;
-          for (i=first_local_row; i<= last_local_row; i++) {
-             ierr += HYPRE_ParCSRMatrixGetRow( parcsr_B, i, &size,
-                   &col_inds, &values );
-             for (j=0; j < size; j++)
-             {
-                if (col_inds[j] < first_local_row || col_inds[j] > last_local_row)
-                   offdiag_sizes[local_row]++;
-                else
-                   diag_sizes[local_row]++;
-             }
-             local_row++;
-             ierr += HYPRE_ParCSRMatrixRestoreRow( parcsr_B, i, &size,
-                   &col_inds, &values );
-          }
-          ierr += HYPRE_IJMatrixSetDiagOffdSizes( ij_B,
-                (const HYPRE_Int *) diag_sizes,
-                (const HYPRE_Int *) offdiag_sizes );
-          hypre_TFree(diag_sizes, HYPRE_MEMORY_HOST);
-          hypre_TFree(offdiag_sizes, HYPRE_MEMORY_HOST);
-
-          ierr = HYPRE_IJMatrixInitialize( ij_B );
-
-          for (i=first_local_row; i<= last_local_row; i++)
-          {
-             ierr += HYPRE_ParCSRMatrixGetRow( parcsr_B, i, &size,
-                   &col_inds, &values );
-
-             ierr += HYPRE_IJMatrixSetValues( ij_B, 1, &size, &i,
-                   (const HYPRE_Int *) col_inds,
-                   (const HYPRE_Real *) values );
-
-             ierr += HYPRE_ParCSRMatrixRestoreRow( parcsr_B, i, &size,
-                   &col_inds, &values );
-          }
-       }
-       else
-       {
-          row_sizes = hypre_CTAlloc(HYPRE_Int,  local_num_rows, HYPRE_MEMORY_HOST);
-
-          size = 5; /* this is in general too low, and supposed to test
-                       the capability of the reallocation of the interface */
+         HYPRE_LOBPCGSolve(pcg_solver, constraints, eigenvectors, eigenvalues);
 
-          if (sparsity_known == 0) /* tries a more accurate estimate of the
-                                      storage */
-          {
-             if (build_matrix_type == 2) size = 7;
-             if (build_matrix_type == 3) size = 9;
-             if (build_matrix_type == 4) size = 27;
-          }
-
-          for (i=0; i < local_num_rows; i++)
-             row_sizes[i] = size;
-
-          ierr = HYPRE_IJMatrixSetRowSizes ( ij_B, (const HYPRE_Int *) row_sizes );
-
-          hypre_TFree(row_sizes, HYPRE_MEMORY_HOST);
-
-          ierr = HYPRE_IJMatrixInitialize( ij_B );
-
-          /* Loop through all locally stored rows and insert them into ij_matrix */
-          for (i=first_local_row; i<= last_local_row; i++)
-          {
-             ierr += HYPRE_ParCSRMatrixGetRow( parcsr_B, i, &size,
-                   &col_inds, &values );
-
-             ierr += HYPRE_IJMatrixSetValues( ij_B, 1, &size, &i,
-                   (const HYPRE_Int *) col_inds,
-                   (const HYPRE_Real *) values );
-
-             ierr += HYPRE_ParCSRMatrixRestoreRow( parcsr_B, i, &size,
-                   &col_inds, &values );
-          }
-       }
-
-       ierr += HYPRE_IJMatrixAssemble( ij_B );
-
-       ierr += HYPRE_ParCSRMatrixDestroy(parcsr_B);
-
-       ierr += HYPRE_IJMatrixGetObject( ij_B, &object);
-       parcsr_B = (HYPRE_ParCSRMatrix) object;
-
-     } /* if ( lobpcgGen ) */
-
-     if ( pcgIterations > 0 ) { /* do inner pcg iterations */
-
-       time_index = hypre_InitializeTiming("PCG Setup");
-       hypre_BeginTiming(time_index);
-
-       HYPRE_ParCSRPCGCreate(hypre_MPI_COMM_WORLD, &pcg_solver);
-       HYPRE_PCGSetMaxIter(pcg_solver, pcgIterations);
-       HYPRE_PCGSetTol(pcg_solver, pcgTol);
-       HYPRE_PCGSetTwoNorm(pcg_solver, 1);
-       HYPRE_PCGSetRelChange(pcg_solver, 0);
-       HYPRE_PCGSetPrintLevel(pcg_solver, 0);
-
-       HYPRE_PCGGetPrecond(pcg_solver, &pcg_precond);
-
-       if (solver_id == 1)
-       {
-          /* use BoomerAMG as preconditioner */
-          if (myid == 0) hypre_printf("Solver: AMG-PCG\n");
-          HYPRE_BoomerAMGCreate(&pcg_precond);
-          HYPRE_BoomerAMGSetInterpType(pcg_precond, interp_type);
-          HYPRE_BoomerAMGSetNumSamples(pcg_precond, gsmg_samples);
-          HYPRE_BoomerAMGSetTol(pcg_precond, pc_tol);
-          HYPRE_BoomerAMGSetCoarsenType(pcg_precond, (hybrid*coarsen_type));
-          HYPRE_BoomerAMGSetMeasureType(pcg_precond, measure_type);
-          HYPRE_BoomerAMGSetStrongThreshold(pcg_precond, strong_threshold);
-          HYPRE_BoomerAMGSetTruncFactor(pcg_precond, trunc_factor);
-          HYPRE_BoomerAMGSetPrintLevel(pcg_precond, poutdat);
-          HYPRE_BoomerAMGSetPrintFileName(pcg_precond, "driver.out.log");
-          HYPRE_BoomerAMGSetMaxIter(pcg_precond, 1);
-          HYPRE_BoomerAMGSetCycleType(pcg_precond, cycle_type);
-          HYPRE_BoomerAMGSetNumGridSweeps(pcg_precond, num_grid_sweeps);
-          HYPRE_BoomerAMGSetGridRelaxType(pcg_precond, grid_relax_type);
-          HYPRE_BoomerAMGSetRelaxWeight(pcg_precond, relax_weight);
-          HYPRE_BoomerAMGSetOmega(pcg_precond, omega);
-          HYPRE_BoomerAMGSetSmoothType(pcg_precond, smooth_type);
-          HYPRE_BoomerAMGSetSmoothNumLevels(pcg_precond, smooth_num_levels);
-          HYPRE_BoomerAMGSetSmoothNumSweeps(pcg_precond, smooth_num_sweeps);
-          HYPRE_BoomerAMGSetGridRelaxPoints(pcg_precond, grid_relax_points);
-          HYPRE_BoomerAMGSetMaxLevels(pcg_precond, max_levels);
-          HYPRE_BoomerAMGSetMaxRowSum(pcg_precond, max_row_sum);
-          HYPRE_BoomerAMGSetNumFunctions(pcg_precond, num_functions);
-          HYPRE_BoomerAMGSetVariant(pcg_precond, variant);
-          HYPRE_BoomerAMGSetOverlap(pcg_precond, overlap);
-          HYPRE_BoomerAMGSetDomainType(pcg_precond, domain_type);
-          HYPRE_BoomerAMGSetSchwarzRlxWeight(pcg_precond, schwarz_rlx_weight);
-          if (num_functions > 1)
-             HYPRE_BoomerAMGSetDofFunc(pcg_precond, dof_func);
-          HYPRE_PCGSetPrecond(pcg_solver,
-                (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSolve,
-                (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSetup,
-                pcg_precond);
-       }
-       else if (solver_id == 2)
-       {
-
-          /* use diagonal scaling as preconditioner */
-          if (myid == 0) hypre_printf("Solver: DS-PCG\n");
-          pcg_precond = NULL;
-
-          HYPRE_PCGSetPrecond(pcg_solver,
-                (HYPRE_PtrToSolverFcn) HYPRE_ParCSRDiagScale,
-                (HYPRE_PtrToSolverFcn) HYPRE_ParCSRDiagScaleSetup,
-                pcg_precond);
-       }
-       else if (solver_id == 8)
-       {
-          /* use ParaSails preconditioner */
-          if (myid == 0) hypre_printf("Solver: ParaSails-PCG\n");
-
-          HYPRE_ParaSailsCreate(hypre_MPI_COMM_WORLD, &pcg_precond);
-          HYPRE_ParaSailsSetParams(pcg_precond, sai_threshold, max_levels);
-          HYPRE_ParaSailsSetFilter(pcg_precond, sai_filter);
-          HYPRE_ParaSailsSetLogging(pcg_precond, poutdat);
-
-          HYPRE_PCGSetPrecond(pcg_solver,
-                (HYPRE_PtrToSolverFcn) HYPRE_ParaSailsSolve,
-                (HYPRE_PtrToSolverFcn) HYPRE_ParaSailsSetup,
-                pcg_precond);
-       }
-       else if (solver_id == 12)
-       {
-          /* use Schwarz preconditioner */
-          if (myid == 0) hypre_printf("Solver: Schwarz-PCG\n");
-
-          HYPRE_SchwarzCreate(&pcg_precond);
-          HYPRE_SchwarzSetVariant(pcg_precond, variant);
-          HYPRE_SchwarzSetOverlap(pcg_precond, overlap);
-          HYPRE_SchwarzSetDomainType(pcg_precond, domain_type);
-          HYPRE_SchwarzSetRelaxWeight(pcg_precond, schwarz_rlx_weight);
-
-          HYPRE_PCGSetPrecond(pcg_solver,
-                (HYPRE_PtrToSolverFcn) HYPRE_SchwarzSolve,
-                (HYPRE_PtrToSolverFcn) HYPRE_SchwarzSetup,
-                pcg_precond);
-       }
-       else if (solver_id == 14)
-       {
-          /* use GSMG as preconditioner */
-
-          /* reset some smoother parameters */
-
-          /* fine grid */
-          num_grid_sweeps[0] = num_sweep;
-          grid_relax_type[0] = relax_default;
-          hypre_TFree(grid_relax_points[0], HYPRE_MEMORY_HOST);
-          grid_relax_points[0] = hypre_CTAlloc(HYPRE_Int,  num_sweep, HYPRE_MEMORY_HOST);
-          for (i=0; i<num_sweep; i++)
-             grid_relax_points[0][i] = 0;
-
-          /* down cycle */
-          num_grid_sweeps[1] = num_sweep;
-          grid_relax_type[1] = relax_default;
-          hypre_TFree(grid_relax_points[1], HYPRE_MEMORY_HOST);
-          grid_relax_points[1] = hypre_CTAlloc(HYPRE_Int,  num_sweep, HYPRE_MEMORY_HOST);
-          for (i=0; i<num_sweep; i++)
-             grid_relax_points[1][i] = 0;
-
-          /* up cycle */
-          num_grid_sweeps[2] = num_sweep;
-          grid_relax_type[2] = relax_default;
-          hypre_TFree(grid_relax_points[2], HYPRE_MEMORY_HOST);
-          grid_relax_points[2] = hypre_CTAlloc(HYPRE_Int,  num_sweep, HYPRE_MEMORY_HOST);
-          for (i=0; i<num_sweep; i++)
-             grid_relax_points[2][i] = 0;
-
-          /* coarsest grid */
-          num_grid_sweeps[3] = 1;
-          grid_relax_type[3] = 9;
-          hypre_TFree(grid_relax_points[3], HYPRE_MEMORY_HOST);
-          grid_relax_points[3] = hypre_CTAlloc(HYPRE_Int,  1, HYPRE_MEMORY_HOST);
-          grid_relax_points[3][0] = 0;
-
-          if (myid == 0) hypre_printf("Solver: GSMG-PCG\n");
-          HYPRE_BoomerAMGCreate(&pcg_precond);
-          HYPRE_BoomerAMGSetGSMG(pcg_precond, 4);
-          HYPRE_BoomerAMGSetInterpType(pcg_precond, interp_type);
-          HYPRE_BoomerAMGSetNumSamples(pcg_precond, gsmg_samples);
-          HYPRE_BoomerAMGSetTol(pcg_precond, pc_tol);
-          HYPRE_BoomerAMGSetCoarsenType(pcg_precond, (hybrid*coarsen_type));
-          HYPRE_BoomerAMGSetMeasureType(pcg_precond, measure_type);
-          HYPRE_BoomerAMGSetStrongThreshold(pcg_precond, strong_threshold);
-          HYPRE_BoomerAMGSetTruncFactor(pcg_precond, trunc_factor);
-          HYPRE_BoomerAMGSetPrintLevel(pcg_precond, poutdat);
-          HYPRE_BoomerAMGSetPrintFileName(pcg_precond, "driver.out.log");
-          HYPRE_BoomerAMGSetMaxIter(pcg_precond, 1);
-          HYPRE_BoomerAMGSetCycleType(pcg_precond, cycle_type);
-          HYPRE_BoomerAMGSetNumGridSweeps(pcg_precond, num_grid_sweeps);
-          HYPRE_BoomerAMGSetGridRelaxType(pcg_precond, grid_relax_type);
-          HYPRE_BoomerAMGSetRelaxWeight(pcg_precond, relax_weight);
-          HYPRE_BoomerAMGSetOmega(pcg_precond, omega);
-          HYPRE_BoomerAMGSetSmoothType(pcg_precond, smooth_type);
-          HYPRE_BoomerAMGSetSmoothNumLevels(pcg_precond, smooth_num_levels);
-          HYPRE_BoomerAMGSetSmoothNumSweeps(pcg_precond, smooth_num_sweeps);
-          HYPRE_BoomerAMGSetVariant(pcg_precond, variant);
-          HYPRE_BoomerAMGSetOverlap(pcg_precond, overlap);
-          HYPRE_BoomerAMGSetDomainType(pcg_precond, domain_type);
-          HYPRE_BoomerAMGSetSchwarzRlxWeight(pcg_precond, schwarz_rlx_weight);
-          HYPRE_BoomerAMGSetGridRelaxPoints(pcg_precond, grid_relax_points);
-          HYPRE_BoomerAMGSetMaxLevels(pcg_precond, max_levels);
-          HYPRE_BoomerAMGSetMaxRowSum(pcg_precond, max_row_sum);
-          HYPRE_BoomerAMGSetNumFunctions(pcg_precond, num_functions);
-          if (num_functions > 1)
-             HYPRE_BoomerAMGSetDofFunc(pcg_precond, dof_func);
-          HYPRE_PCGSetPrecond(pcg_solver,
-                (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSolve,
-                (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSetup,
-                pcg_precond);
-       }
-       else if (solver_id == 43)
-       {
-          /* use Euclid preconditioning */
-          if (myid == 0) hypre_printf("Solver: Euclid-PCG\n");
-
-          HYPRE_EuclidCreate(hypre_MPI_COMM_WORLD, &pcg_precond);
-
-          /* note: There are three three methods of setting run-time
-             parameters for Euclid: (see HYPRE_parcsr_ls.h); here
-             we'll use what I think is simplest: let Euclid internally
-             parse the command line.
-             */
-          HYPRE_EuclidSetParams(pcg_precond, argc, argv);
-
-          HYPRE_PCGSetPrecond(pcg_solver,
-                (HYPRE_PtrToSolverFcn) HYPRE_EuclidSolve,
-                (HYPRE_PtrToSolverFcn) HYPRE_EuclidSetup,
-                pcg_precond);
-       }
-       else if (solver_id != NO_SOLVER )
-       {
-          if ( verbosity )
-             hypre_printf("Solver ID not recognized - running inner PCG iterations without preconditioner\n\n");
-       }
-
-       HYPRE_PCGGetPrecond(pcg_solver, &pcg_precond_gotten);
-       if (pcg_precond_gotten !=  pcg_precond)
-       {
-          hypre_printf("HYPRE_ParCSRPCGGetPrecond got bad precond\n");
-          return(-1);
-       }
-       else
-          if (myid == 0)
-             hypre_printf("HYPRE_ParCSRPCGGetPrecond got good precond\n");
-
-       /*      HYPRE_PCGSetup(pcg_solver, (HYPRE_Matrix)parcsr_A,
-               (HYPRE_Vector)b, (HYPRE_Vector)x); */
-
-       hypre_EndTiming(time_index);
-       hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
-       hypre_FinalizeTiming(time_index);
-       hypre_ClearTiming();
-
-       HYPRE_LOBPCGCreate(interpreter, &matvec_fn, &lobpcg_solver);
-
-       HYPRE_LOBPCGSetMaxIter(lobpcg_solver, maxIterations);
-       HYPRE_LOBPCGSetPrecondUsageMode(lobpcg_solver, pcgMode);
-       HYPRE_LOBPCGSetTol(lobpcg_solver, tol);
-       HYPRE_LOBPCGSetPrintLevel(lobpcg_solver, verbosity);
-
-       HYPRE_LOBPCGSetPrecond(lobpcg_solver,
-             (HYPRE_PtrToSolverFcn) HYPRE_PCGSolve,
-             (HYPRE_PtrToSolverFcn) HYPRE_PCGSetup,
-             pcg_solver);
-
-       HYPRE_LOBPCGSetupT(lobpcg_solver, (HYPRE_Matrix)parcsr_A,
-             (HYPRE_Vector)x);
-
-       HYPRE_LOBPCGSetup(lobpcg_solver, (HYPRE_Matrix)parcsr_A,
-             (HYPRE_Vector)b, (HYPRE_Vector)x);
-
-       if ( lobpcgGen )
-          HYPRE_LOBPCGSetupB(lobpcg_solver, (HYPRE_Matrix)parcsr_B,
-                (HYPRE_Vector)x);
-
-       if ( vFromFileFlag ) {
-          eigenvectors = mv_MultiVectorWrap( interpreter,
-                         hypre_ParCSRMultiVectorRead(hypre_MPI_COMM_WORLD,
-                            interpreter,
-                            "vectors" ),1);
-          hypre_assert( eigenvectors != NULL );
-          blockSize = mv_MultiVectorWidth( eigenvectors );
-       }
-       else {
-          eigenvectors = mv_MultiVectorCreateFromSampleVector( interpreter,
-                blockSize,
-                x );
-          if ( lobpcgSeed )
-             mv_MultiVectorSetRandom( eigenvectors, lobpcgSeed );
-          else
-             mv_MultiVectorSetRandom( eigenvectors, (HYPRE_Int)time(0) );
-       }
-
-       if ( constrained ) {
-          constraints = mv_MultiVectorWrap( interpreter,
-                         hypre_ParCSRMultiVectorRead(hypre_MPI_COMM_WORLD,
-                                                     interpreter,
-                                                     "vectors" ),1);
-          hypre_assert( constraints != NULL );
-       }
-
-       eigenvalues = hypre_CTAlloc(HYPRE_Real,  blockSize, HYPRE_MEMORY_HOST);
-
-       time_index = hypre_InitializeTiming("LOBPCG Solve");
-       hypre_BeginTiming(time_index);
-
-       HYPRE_LOBPCGSolve(lobpcg_solver, constraints, eigenvectors, eigenvalues );
-
-       hypre_EndTiming(time_index);
-       hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
-       hypre_FinalizeTiming(time_index);
-       hypre_ClearTiming();
-
-
-       if ( checkOrtho ) {
-
-          gramXX = utilities_FortranMatrixCreate();
-          identity = utilities_FortranMatrixCreate();
-
-          utilities_FortranMatrixAllocateData( blockSize, blockSize, gramXX );
-          utilities_FortranMatrixAllocateData( blockSize, blockSize, identity );
-
-          if ( lobpcgGen ) {
-             workspace = mv_MultiVectorCreateCopy( eigenvectors, 0 );
-             hypre_LOBPCGMultiOperatorB( lobpcg_solver,
-                   mv_MultiVectorGetData(eigenvectors),
-                   mv_MultiVectorGetData(workspace) );
-             lobpcg_MultiVectorByMultiVector( eigenvectors, workspace, gramXX );
-          }
-          else
-             lobpcg_MultiVectorByMultiVector( eigenvectors, eigenvectors, gramXX );
-
-          utilities_FortranMatrixSetToIdentity( identity );
-          utilities_FortranMatrixAdd( -1, identity, gramXX, gramXX );
-          nonOrthF = utilities_FortranMatrixFNorm( gramXX );
-          if ( myid == 0 )
-             hypre_printf("Non-orthonormality of eigenvectors: %12.5e\n", nonOrthF);
-
-          utilities_FortranMatrixDestroy( gramXX );
-          utilities_FortranMatrixDestroy( identity );
-
-       }
-
-       if ( printLevel ) {
-
-          hypre_ParCSRMultiVectorPrint( mv_MultiVectorGetData(eigenvectors), "vectors" );
-
-          if ( myid == 0 ) {
-             if ( (filePtr = fopen("values.txt", "w")) ) {
-                hypre_fprintf(filePtr, "%d\n", blockSize);
-                for ( i = 0; i < blockSize; i++ )
-                   hypre_fprintf(filePtr, "%22.14e\n", eigenvalues[i]);
-                fclose(filePtr);
-             }
-
-             if ( (filePtr = fopen("residuals.txt", "w")) ) {
-                residualNorms = HYPRE_LOBPCGResidualNorms( lobpcg_solver );
-                residuals = utilities_FortranMatrixValues( residualNorms );
-                hypre_fprintf(filePtr, "%d\n", blockSize);
-                for ( i = 0; i < blockSize; i++ )
-                   hypre_fprintf(filePtr, "%22.14e\n", residuals[i]);
-                fclose(filePtr);
-             }
-
-             if ( printLevel > 1 ) {
-
-                printBuffer = utilities_FortranMatrixCreate();
-
-                iterations = HYPRE_LOBPCGIterations( lobpcg_solver );
-
-                eigenvaluesHistory = HYPRE_LOBPCGEigenvaluesHistory( lobpcg_solver );
-                utilities_FortranMatrixSelectBlock( eigenvaluesHistory,
-                      1, blockSize, 1, iterations + 1, printBuffer );
-                utilities_FortranMatrixPrint( printBuffer, "val_hist.txt" );
-
-                residualNormsHistory = HYPRE_LOBPCGResidualNormsHistory( lobpcg_solver );
-                utilities_FortranMatrixSelectBlock(residualNormsHistory,
-                      1, blockSize, 1, iterations + 1, printBuffer );
-                utilities_FortranMatrixPrint( printBuffer, "res_hist.txt" );
-
-                utilities_FortranMatrixDestroy( printBuffer );
-             }
-          }
-       }
-
-       HYPRE_LOBPCGDestroy(lobpcg_solver);
-       mv_MultiVectorDestroy( eigenvectors );
-       if ( constrained )
-          mv_MultiVectorDestroy( constraints );
-       if ( lobpcgGen )
-          mv_MultiVectorDestroy( workspace );
-       hypre_TFree(eigenvalues, HYPRE_MEMORY_HOST);
-
-       HYPRE_ParCSRPCGDestroy(pcg_solver);
-
-       if (solver_id == 1)
-       {
-          HYPRE_BoomerAMGDestroy(pcg_precond);
-       }
-       else if (solver_id == 8)
-       {
-          HYPRE_ParaSailsDestroy(pcg_precond);
-       }
-       else if (solver_id == 12)
-       {
-          HYPRE_SchwarzDestroy(pcg_precond);
-       }
-       else if (solver_id == 14)
-       {
-          HYPRE_BoomerAMGDestroy(pcg_precond);
-       }
-       else if (solver_id == 43)
-       {
-          HYPRE_EuclidDestroy(pcg_precond);
-       }
-
-     }
-     else { /* pcgIterations <= 0 --> use the preconditioner directly */
-
-       time_index = hypre_InitializeTiming("LOBPCG Setup");
-       hypre_BeginTiming(time_index);
-       if (myid != 0)
-          verbosity = 0;
-
-       HYPRE_LOBPCGCreate(interpreter, &matvec_fn, &pcg_solver);
-       HYPRE_LOBPCGSetMaxIter(pcg_solver, maxIterations);
-       HYPRE_LOBPCGSetTol(pcg_solver, tol);
-       HYPRE_LOBPCGSetPrintLevel(pcg_solver, verbosity);
-
-       HYPRE_LOBPCGGetPrecond(pcg_solver, &pcg_precond);
-
-       if (solver_id == 1)
-       {
-          /* use BoomerAMG as preconditioner */
-          if (myid == 0)
-             hypre_printf("Solver: AMG-PCG\n");
-
-          HYPRE_BoomerAMGCreate(&pcg_precond);
-          HYPRE_BoomerAMGSetInterpType(pcg_precond, interp_type);
-          HYPRE_BoomerAMGSetNumSamples(pcg_precond, gsmg_samples);
-          HYPRE_BoomerAMGSetTol(pcg_precond, pc_tol);
-          HYPRE_BoomerAMGSetCoarsenType(pcg_precond, (hybrid*coarsen_type));
-          HYPRE_BoomerAMGSetMeasureType(pcg_precond, measure_type);
-          HYPRE_BoomerAMGSetStrongThreshold(pcg_precond, strong_threshold);
-          HYPRE_BoomerAMGSetTruncFactor(pcg_precond, trunc_factor);
-          HYPRE_BoomerAMGSetPrintLevel(pcg_precond, poutdat);
-          HYPRE_BoomerAMGSetPrintFileName(pcg_precond, "driver.out.log");
-          HYPRE_BoomerAMGSetMaxIter(pcg_precond, 1);
-          HYPRE_BoomerAMGSetCycleType(pcg_precond, cycle_type);
-          HYPRE_BoomerAMGSetNumGridSweeps(pcg_precond, num_grid_sweeps);
-          HYPRE_BoomerAMGSetGridRelaxType(pcg_precond, grid_relax_type);
-          HYPRE_BoomerAMGSetRelaxWeight(pcg_precond, relax_weight);
-          HYPRE_BoomerAMGSetOmega(pcg_precond, omega);
-          HYPRE_BoomerAMGSetSmoothType(pcg_precond, smooth_type);
-          HYPRE_BoomerAMGSetSmoothNumLevels(pcg_precond, smooth_num_levels);
-          HYPRE_BoomerAMGSetSmoothNumSweeps(pcg_precond, smooth_num_sweeps);
-          HYPRE_BoomerAMGSetGridRelaxPoints(pcg_precond, grid_relax_points);
-          HYPRE_BoomerAMGSetMaxLevels(pcg_precond, max_levels);
-          HYPRE_BoomerAMGSetMaxRowSum(pcg_precond, max_row_sum);
-          HYPRE_BoomerAMGSetNumFunctions(pcg_precond, num_functions);
-          HYPRE_BoomerAMGSetVariant(pcg_precond, variant);
-          HYPRE_BoomerAMGSetOverlap(pcg_precond, overlap);
-          HYPRE_BoomerAMGSetDomainType(pcg_precond, domain_type);
-          HYPRE_BoomerAMGSetSchwarzRlxWeight(pcg_precond, schwarz_rlx_weight);
-          if (num_functions > 1)
-             HYPRE_BoomerAMGSetDofFunc(pcg_precond, dof_func);
-
-          HYPRE_LOBPCGSetPrecond(pcg_solver,
-                (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSolve,
-                (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSetup,
-                pcg_precond);
-       }
-       else if (solver_id == 2)
-       {
-
-          /* use diagonal scaling as preconditioner */
-          if (myid == 0)
-             hypre_printf("Solver: DS-PCG\n");
-
-          pcg_precond = NULL;
-
-          HYPRE_LOBPCGSetPrecond(pcg_solver,
-                (HYPRE_PtrToSolverFcn) HYPRE_ParCSRDiagScale,
-                (HYPRE_PtrToSolverFcn) HYPRE_ParCSRDiagScaleSetup,
-                pcg_precond);
-       }
-       else if (solver_id == 8)
-       {
-          /* use ParaSails preconditioner */
-          if (myid == 0)
-             hypre_printf("Solver: ParaSails-PCG\n");
-
-          HYPRE_ParaSailsCreate(hypre_MPI_COMM_WORLD, &pcg_precond);
-          HYPRE_ParaSailsSetParams(pcg_precond, sai_threshold, max_levels);
-          HYPRE_ParaSailsSetFilter(pcg_precond, sai_filter);
-          HYPRE_ParaSailsSetLogging(pcg_precond, poutdat);
-
-          HYPRE_LOBPCGSetPrecond(pcg_solver,
-                (HYPRE_PtrToSolverFcn) HYPRE_ParaSailsSolve,
-                (HYPRE_PtrToSolverFcn) HYPRE_ParaSailsSetup,
-                pcg_precond);
-       }
-       else if (solver_id == 12)
-       {
-          /* use Schwarz preconditioner */
-          if (myid == 0)
-             hypre_printf("Solver: Schwarz-PCG\n");
-
-          HYPRE_SchwarzCreate(&pcg_precond);
-          HYPRE_SchwarzSetVariant(pcg_precond, variant);
-          HYPRE_SchwarzSetOverlap(pcg_precond, overlap);
-          HYPRE_SchwarzSetDomainType(pcg_precond, domain_type);
-          HYPRE_SchwarzSetRelaxWeight(pcg_precond, schwarz_rlx_weight);
-
-          HYPRE_LOBPCGSetPrecond(pcg_solver,
-                (HYPRE_PtrToSolverFcn) HYPRE_SchwarzSolve,
-                (HYPRE_PtrToSolverFcn) HYPRE_SchwarzSetup,
-                pcg_precond);
-       }
-       else if (solver_id == 14)
-       {
-          /* use GSMG as preconditioner */
-
-          /* reset some smoother parameters */
-
-          /* fine grid */
-          num_grid_sweeps[0] = num_sweep;
-          grid_relax_type[0] = relax_default;
-          hypre_TFree(grid_relax_points[0], HYPRE_MEMORY_HOST);
-          grid_relax_points[0] = hypre_CTAlloc(HYPRE_Int,  num_sweep, HYPRE_MEMORY_HOST);
-          for (i=0; i<num_sweep; i++)
-             grid_relax_points[0][i] = 0;
-
-          /* down cycle */
-          num_grid_sweeps[1] = num_sweep;
-          grid_relax_type[1] = relax_default;
-          hypre_TFree(grid_relax_points[1], HYPRE_MEMORY_HOST);
-          grid_relax_points[1] = hypre_CTAlloc(HYPRE_Int,  num_sweep, HYPRE_MEMORY_HOST);
-          for (i=0; i<num_sweep; i++)
-             grid_relax_points[1][i] = 0;
-
-          /* up cycle */
-          num_grid_sweeps[2] = num_sweep;
-          grid_relax_type[2] = relax_default;
-          hypre_TFree(grid_relax_points[2], HYPRE_MEMORY_HOST);
-          grid_relax_points[2] = hypre_CTAlloc(HYPRE_Int,  num_sweep, HYPRE_MEMORY_HOST);
-          for (i=0; i<num_sweep; i++)
-             grid_relax_points[2][i] = 0;
-
-          /* coarsest grid */
-          num_grid_sweeps[3] = 1;
-          grid_relax_type[3] = 9;
-          hypre_TFree(grid_relax_points[3], HYPRE_MEMORY_HOST);
-          grid_relax_points[3] = hypre_CTAlloc(HYPRE_Int,  1, HYPRE_MEMORY_HOST);
-          grid_relax_points[3][0] = 0;
-
-          if (myid == 0) hypre_printf("Solver: GSMG-PCG\n");
-          HYPRE_BoomerAMGCreate(&pcg_precond);
-          HYPRE_BoomerAMGSetGSMG(pcg_precond, 4);
-          HYPRE_BoomerAMGSetInterpType(pcg_precond, interp_type);
-          HYPRE_BoomerAMGSetNumSamples(pcg_precond, gsmg_samples);
-          HYPRE_BoomerAMGSetTol(pcg_precond, pc_tol);
-          HYPRE_BoomerAMGSetCoarsenType(pcg_precond, (hybrid*coarsen_type));
-          HYPRE_BoomerAMGSetMeasureType(pcg_precond, measure_type);
-          HYPRE_BoomerAMGSetStrongThreshold(pcg_precond, strong_threshold);
-          HYPRE_BoomerAMGSetTruncFactor(pcg_precond, trunc_factor);
-          HYPRE_BoomerAMGSetPrintLevel(pcg_precond, poutdat);
-          HYPRE_BoomerAMGSetPrintFileName(pcg_precond, "driver.out.log");
-          HYPRE_BoomerAMGSetMaxIter(pcg_precond, 1);
-          HYPRE_BoomerAMGSetCycleType(pcg_precond, cycle_type);
-          HYPRE_BoomerAMGSetNumGridSweeps(pcg_precond, num_grid_sweeps);
-          HYPRE_BoomerAMGSetGridRelaxType(pcg_precond, grid_relax_type);
-          HYPRE_BoomerAMGSetRelaxWeight(pcg_precond, relax_weight);
-          HYPRE_BoomerAMGSetOmega(pcg_precond, omega);
-          HYPRE_BoomerAMGSetSmoothType(pcg_precond, smooth_type);
-          HYPRE_BoomerAMGSetSmoothNumLevels(pcg_precond, smooth_num_levels);
-          HYPRE_BoomerAMGSetSmoothNumSweeps(pcg_precond, smooth_num_sweeps);
-          HYPRE_BoomerAMGSetVariant(pcg_precond, variant);
-          HYPRE_BoomerAMGSetOverlap(pcg_precond, overlap);
-          HYPRE_BoomerAMGSetDomainType(pcg_precond, domain_type);
-          HYPRE_BoomerAMGSetSchwarzRlxWeight(pcg_precond, schwarz_rlx_weight);
-          HYPRE_BoomerAMGSetGridRelaxPoints(pcg_precond, grid_relax_points);
-          HYPRE_BoomerAMGSetMaxLevels(pcg_precond, max_levels);
-          HYPRE_BoomerAMGSetMaxRowSum(pcg_precond, max_row_sum);
-          HYPRE_BoomerAMGSetNumFunctions(pcg_precond, num_functions);
-          if (num_functions > 1)
-             HYPRE_BoomerAMGSetDofFunc(pcg_precond, dof_func);
-
-          HYPRE_LOBPCGSetPrecond(pcg_solver,
-                (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSolve,
-                (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSetup,
-                pcg_precond);
-       }
-       else if (solver_id == 43)
-       {
-          /* use Euclid preconditioning */
-          if (myid == 0)
-             hypre_printf("Solver: Euclid-PCG\n");
-
-          HYPRE_EuclidCreate(hypre_MPI_COMM_WORLD, &pcg_precond);
-
-          /* note: There are three three methods of setting run-time
-             parameters for Euclid: (see HYPRE_parcsr_ls.h); here
-             we'll use what I think is simplest: let Euclid internally
-             parse the command line.
-             */
-          HYPRE_EuclidSetParams(pcg_precond, argc, argv);
-
-          HYPRE_LOBPCGSetPrecond(pcg_solver,
-                (HYPRE_PtrToSolverFcn) HYPRE_EuclidSolve,
-                (HYPRE_PtrToSolverFcn) HYPRE_EuclidSetup,
-                pcg_precond);
-       }
-       else if (solver_id != NO_SOLVER )
-       {
-          if ( verbosity )
-             hypre_printf("Solver ID not recognized - running LOBPCG without preconditioner\n\n");
-       }
-
-       HYPRE_LOBPCGGetPrecond(pcg_solver, &pcg_precond_gotten);
-       if (pcg_precond_gotten !=  pcg_precond && pcgIterations)
-       {
-          hypre_printf("HYPRE_ParCSRLOBPCGGetPrecond got bad precond\n");
-          return(-1);
-       }
-       else
-          if (myid == 0)
-             hypre_printf("HYPRE_ParCSRLOBPCGGetPrecond got good precond\n");
-
-       HYPRE_LOBPCGSetup(pcg_solver, (HYPRE_Matrix)parcsr_A,
-             (HYPRE_Vector)b, (HYPRE_Vector)x);
-
-       if ( lobpcgGen )
-          HYPRE_LOBPCGSetupB(pcg_solver, (HYPRE_Matrix)parcsr_B,
-                (HYPRE_Vector)x);
-
-       hypre_EndTiming(time_index);
-       hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
-       hypre_FinalizeTiming(time_index);
-       hypre_ClearTiming();
-
-       if ( vFromFileFlag ) {
-         eigenvectors = mv_MultiVectorWrap( interpreter,
-                         hypre_ParCSRMultiVectorRead(hypre_MPI_COMM_WORLD,
-                                                     interpreter,
-                                                     "vectors" ),1);
-         hypre_assert( eigenvectors != NULL );
-         blockSize = mv_MultiVectorWidth( eigenvectors );
-       }
-       else {
-          eigenvectors = mv_MultiVectorCreateFromSampleVector( interpreter,
-                blockSize,
-                x );
-          if ( lobpcgSeed )
-             mv_MultiVectorSetRandom( eigenvectors, lobpcgSeed );
-          else
-             mv_MultiVectorSetRandom( eigenvectors, (HYPRE_Int)time(0) );
-       }
-
-       if ( constrained ) {
-         constraints = mv_MultiVectorWrap( interpreter,
-                         hypre_ParCSRMultiVectorRead(hypre_MPI_COMM_WORLD,
-                                                     interpreter,
-                                                     "vectors" ),1);
-         hypre_assert( constraints != NULL );
-       }
-
-       eigenvalues = hypre_CTAlloc(HYPRE_Real,  blockSize, HYPRE_MEMORY_HOST);
-
-       time_index = hypre_InitializeTiming("LOBPCG Solve");
-       hypre_BeginTiming(time_index);
-
-       HYPRE_LOBPCGSolve(pcg_solver, constraints, eigenvectors, eigenvalues);
-
-       hypre_EndTiming(time_index);
-       hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
-       hypre_FinalizeTiming(time_index);
-       hypre_ClearTiming();
-
-       if ( checkOrtho ) {
-
-          gramXX = utilities_FortranMatrixCreate();
-          identity = utilities_FortranMatrixCreate();
-
-          utilities_FortranMatrixAllocateData( blockSize, blockSize, gramXX );
-          utilities_FortranMatrixAllocateData( blockSize, blockSize, identity );
-
-          if ( lobpcgGen ) {
-             workspace = mv_MultiVectorCreateCopy( eigenvectors, 0 );
-           hypre_LOBPCGMultiOperatorB( pcg_solver,
-                                       mv_MultiVectorGetData(eigenvectors),
-                                       mv_MultiVectorGetData(workspace) );
-           lobpcg_MultiVectorByMultiVector( eigenvectors, workspace, gramXX );
-          }
-          else
-             lobpcg_MultiVectorByMultiVector( eigenvectors, eigenvectors, gramXX );
-
-          utilities_FortranMatrixSetToIdentity( identity );
-          utilities_FortranMatrixAdd( -1, identity, gramXX, gramXX );
-          nonOrthF = utilities_FortranMatrixFNorm( gramXX );
-          if ( myid == 0 )
-             hypre_printf("Non-orthonormality of eigenvectors: %12.5e\n", nonOrthF);
-
-          utilities_FortranMatrixDestroy( gramXX );
-          utilities_FortranMatrixDestroy( identity );
-
-       }
-
-       if ( printLevel ) {
-
-         hypre_ParCSRMultiVectorPrint( mv_MultiVectorGetData(eigenvectors), "vectors" );
-
-         if ( myid == 0 ) {
-            if ( (filePtr = fopen("values.txt", "w")) ) {
-               hypre_fprintf(filePtr, "%d\n", blockSize);
-               for ( i = 0; i < blockSize; i++ )
-                  hypre_fprintf(filePtr, "%22.14e\n", eigenvalues[i]);
-               fclose(filePtr);
-            }
+         hypre_EndTiming(time_index);
+         hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
+         hypre_FinalizeTiming(time_index);
+         hypre_ClearTiming();
+
+         if ( checkOrtho )
+         {
+
+            gramXX = utilities_FortranMatrixCreate();
+            identity = utilities_FortranMatrixCreate();
 
-            if ( (filePtr = fopen("residuals.txt", "w")) ) {
-               residualNorms = HYPRE_LOBPCGResidualNorms( pcg_solver );
-               residuals = utilities_FortranMatrixValues( residualNorms );
-               hypre_fprintf(filePtr, "%d\n", blockSize);
-               for ( i = 0; i < blockSize; i++ )
-                  hypre_fprintf(filePtr, "%22.14e\n", residuals[i]);
-               fclose(filePtr);
+            utilities_FortranMatrixAllocateData( blockSize, blockSize, gramXX );
+            utilities_FortranMatrixAllocateData( blockSize, blockSize, identity );
+
+            if ( lobpcgGen )
+            {
+               workspace = mv_MultiVectorCreateCopy( eigenvectors, 0 );
+               hypre_LOBPCGMultiOperatorB( pcg_solver,
+                                           mv_MultiVectorGetData(eigenvectors),
+                                           mv_MultiVectorGetData(workspace) );
+               lobpcg_MultiVectorByMultiVector( eigenvectors, workspace, gramXX );
+            }
+            else
+            {
+               lobpcg_MultiVectorByMultiVector( eigenvectors, eigenvectors, gramXX );
             }
 
-            if ( printLevel > 1 ) {
+            utilities_FortranMatrixSetToIdentity( identity );
+            utilities_FortranMatrixAdd( -1, identity, gramXX, gramXX );
+            nonOrthF = utilities_FortranMatrixFNorm( gramXX );
+            if ( myid == 0 )
+            {
+               hypre_printf("Non-orthonormality of eigenvectors: %12.5e\n", nonOrthF);
+            }
 
-               printBuffer = utilities_FortranMatrixCreate();
+            utilities_FortranMatrixDestroy( gramXX );
+            utilities_FortranMatrixDestroy( identity );
 
-               iterations = HYPRE_LOBPCGIterations( pcg_solver );
+         }
 
-               eigenvaluesHistory = HYPRE_LOBPCGEigenvaluesHistory( pcg_solver );
-               utilities_FortranMatrixSelectBlock( eigenvaluesHistory,
-                     1, blockSize, 1, iterations + 1, printBuffer );
-               utilities_FortranMatrixPrint( printBuffer, "val_hist.txt" );
+         if ( printLevel )
+         {
 
-               residualNormsHistory = HYPRE_LOBPCGResidualNormsHistory( pcg_solver );
-               utilities_FortranMatrixSelectBlock(residualNormsHistory,
-                     1, blockSize, 1, iterations + 1, printBuffer );
-               utilities_FortranMatrixPrint( printBuffer, "res_hist.txt" );
+            hypre_ParCSRMultiVectorPrint( mv_MultiVectorGetData(eigenvectors), "vectors" );
 
-               utilities_FortranMatrixDestroy( printBuffer );
+            if ( myid == 0 )
+            {
+               if ( (filePtr = fopen("values.txt", "w")) )
+               {
+                  hypre_fprintf(filePtr, "%d\n", blockSize);
+                  for ( i = 0; i < blockSize; i++ )
+                  {
+                     hypre_fprintf(filePtr, "%22.14e\n", eigenvalues[i]);
+                  }
+                  fclose(filePtr);
+               }
+
+               if ( (filePtr = fopen("residuals.txt", "w")) )
+               {
+                  residualNorms = HYPRE_LOBPCGResidualNorms( pcg_solver );
+                  residuals = utilities_FortranMatrixValues( residualNorms );
+                  hypre_fprintf(filePtr, "%d\n", blockSize);
+                  for ( i = 0; i < blockSize; i++ )
+                  {
+                     hypre_fprintf(filePtr, "%22.14e\n", residuals[i]);
+                  }
+                  fclose(filePtr);
+               }
+
+               if ( printLevel > 1 )
+               {
+
+                  printBuffer = utilities_FortranMatrixCreate();
+
+                  iterations = HYPRE_LOBPCGIterations( pcg_solver );
+
+                  eigenvaluesHistory = HYPRE_LOBPCGEigenvaluesHistory( pcg_solver );
+                  utilities_FortranMatrixSelectBlock( eigenvaluesHistory,
+                                                      1, blockSize, 1, iterations + 1, printBuffer );
+                  utilities_FortranMatrixPrint( printBuffer, "val_hist.txt" );
+
+                  residualNormsHistory = HYPRE_LOBPCGResidualNormsHistory( pcg_solver );
+                  utilities_FortranMatrixSelectBlock(residualNormsHistory,
+                                                     1, blockSize, 1, iterations + 1, printBuffer );
+                  utilities_FortranMatrixPrint( printBuffer, "res_hist.txt" );
+
+                  utilities_FortranMatrixDestroy( printBuffer );
+               }
             }
          }
-       }
 
 #if SECOND_TIME
-       /* run a second time to check for memory leaks */
-       mv_MultiVectorSetRandom( eigenvectors, 775 );
-       HYPRE_LOBPCGSetup(pcg_solver, (HYPRE_Matrix)parcsr_A,
-             (HYPRE_Vector)b, (HYPRE_Vector)x);
-       HYPRE_LOBPCGSolve(pcg_solver, constraints, eigenvectors, eigenvalues );
+         /* run a second time to check for memory leaks */
+         mv_MultiVectorSetRandom( eigenvectors, 775 );
+         HYPRE_LOBPCGSetup(pcg_solver, (HYPRE_Matrix)parcsr_A,
+                           (HYPRE_Vector)b, (HYPRE_Vector)x);
+         HYPRE_LOBPCGSolve(pcg_solver, constraints, eigenvectors, eigenvalues );
 #endif
 
-       HYPRE_LOBPCGDestroy(pcg_solver);
-
-       if (solver_id == 1)
-       {
-          HYPRE_BoomerAMGDestroy(pcg_precond);
-       }
-       else if (solver_id == 8)
-       {
-          HYPRE_ParaSailsDestroy(pcg_precond);
-       }
-       else if (solver_id == 12)
-       {
-          HYPRE_SchwarzDestroy(pcg_precond);
-       }
-       else if (solver_id == 14)
-       {
-          HYPRE_BoomerAMGDestroy(pcg_precond);
-       }
-       else if (solver_id == 43)
-       {
-          HYPRE_EuclidDestroy(pcg_precond);
-       }
-
-       mv_MultiVectorDestroy( eigenvectors );
-       if ( constrained )
-          mv_MultiVectorDestroy( constraints );
-       if ( lobpcgGen )
-          mv_MultiVectorDestroy( workspace );
-       hypre_TFree(eigenvalues, HYPRE_MEMORY_HOST);
-     } /* if ( pcgIterations > 0 ) */
-
-     hypre_TFree( interpreter , HYPRE_MEMORY_HOST);
-
-     if ( lobpcgGen )
-       HYPRE_IJMatrixDestroy(ij_B);
+         HYPRE_LOBPCGDestroy(pcg_solver);
+
+         if (solver_id == 1)
+         {
+            HYPRE_BoomerAMGDestroy(pcg_precond);
+         }
+         else if (solver_id == 8)
+         {
+            HYPRE_ParaSailsDestroy(pcg_precond);
+         }
+         else if (solver_id == 12)
+         {
+            HYPRE_SchwarzDestroy(pcg_precond);
+         }
+         else if (solver_id == 14)
+         {
+            HYPRE_BoomerAMGDestroy(pcg_precond);
+         }
+         else if (solver_id == 43)
+         {
+            HYPRE_EuclidDestroy(pcg_precond);
+         }
+
+         mv_MultiVectorDestroy( eigenvectors );
+         if ( constrained )
+         {
+            mv_MultiVectorDestroy( constraints );
+         }
+         if ( lobpcgGen )
+         {
+            mv_MultiVectorDestroy( workspace );
+         }
+         hypre_TFree(eigenvalues, HYPRE_MEMORY_HOST);
+      } /* if ( pcgIterations > 0 ) */
+
+      hypre_TFree( interpreter, HYPRE_MEMORY_HOST);
+
+      if ( lobpcgGen )
+      {
+         HYPRE_IJMatrixDestroy(ij_B);
+      }
 
    } /* if ( lobpcgFlag ) */
 
@@ -3156,13 +3335,13 @@ main( HYPRE_Int   argc,
       if (solver_id == 3)
       {
          /* use BoomerAMG as preconditioner */
-         if (myid == 0) hypre_printf("Solver: AMG-GMRES\n");
+         if (myid == 0) { hypre_printf("Solver: AMG-GMRES\n"); }
 
          HYPRE_BoomerAMGCreate(&pcg_precond);
          HYPRE_BoomerAMGSetInterpType(pcg_precond, interp_type);
          HYPRE_BoomerAMGSetNumSamples(pcg_precond, gsmg_samples);
          HYPRE_BoomerAMGSetTol(pcg_precond, pc_tol);
-         HYPRE_BoomerAMGSetCoarsenType(pcg_precond, (hybrid*coarsen_type));
+         HYPRE_BoomerAMGSetCoarsenType(pcg_precond, (hybrid * coarsen_type));
          HYPRE_BoomerAMGSetMeasureType(pcg_precond, measure_type);
          HYPRE_BoomerAMGSetStrongThreshold(pcg_precond, strong_threshold);
          HYPRE_BoomerAMGSetTruncFactor(pcg_precond, trunc_factor);
@@ -3185,7 +3364,9 @@ main( HYPRE_Int   argc,
          HYPRE_BoomerAMGSetOverlap(pcg_precond, overlap);
          HYPRE_BoomerAMGSetDomainType(pcg_precond, domain_type);
          if (num_functions > 1)
+         {
             HYPRE_BoomerAMGSetDofFunc(pcg_precond, dof_func);
+         }
          HYPRE_GMRESSetPrecond(pcg_solver,
                                (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSolve,
                                (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSetup,
@@ -3194,7 +3375,7 @@ main( HYPRE_Int   argc,
       else if (solver_id == 4)
       {
          /* use diagonal scaling as preconditioner */
-         if (myid == 0) hypre_printf("Solver: DS-GMRES\n");
+         if (myid == 0) { hypre_printf("Solver: DS-GMRES\n"); }
          pcg_precond = NULL;
 
          HYPRE_GMRESSetPrecond(pcg_solver,
@@ -3205,10 +3386,11 @@ main( HYPRE_Int   argc,
       else if (solver_id == 7)
       {
          /* use PILUT as preconditioner */
-         if (myid == 0) hypre_printf("Solver: PILUT-GMRES\n");
+         if (myid == 0) { hypre_printf("Solver: PILUT-GMRES\n"); }
 
          ierr = HYPRE_ParCSRPilutCreate( hypre_MPI_COMM_WORLD, &pcg_precond );
-         if (ierr) {
+         if (ierr)
+         {
             hypre_printf("Error in ParPilutCreate\n");
          }
 
@@ -3219,11 +3401,11 @@ main( HYPRE_Int   argc,
 
          if (drop_tol >= 0 )
             HYPRE_ParCSRPilutSetDropTolerance( pcg_precond,
-               drop_tol );
+                                               drop_tol );
 
          if (nonzeros_to_keep >= 0 )
             HYPRE_ParCSRPilutSetFactorRowSize( pcg_precond,
-               nonzeros_to_keep );
+                                               nonzeros_to_keep );
       }
       else if (solver_id == 15)
       {
@@ -3236,24 +3418,30 @@ main( HYPRE_Int   argc,
          grid_relax_type[0] = relax_default;
          hypre_TFree(grid_relax_points[0], HYPRE_MEMORY_HOST);
          grid_relax_points[0] = hypre_CTAlloc(HYPRE_Int,  num_sweep, HYPRE_MEMORY_HOST);
-         for (i=0; i<num_sweep; i++)
+         for (i = 0; i < num_sweep; i++)
+         {
             grid_relax_points[0][i] = 0;
+         }
 
          /* down cycle */
          num_grid_sweeps[1] = num_sweep;
          grid_relax_type[1] = relax_default;
          hypre_TFree(grid_relax_points[1], HYPRE_MEMORY_HOST);
          grid_relax_points[1] = hypre_CTAlloc(HYPRE_Int,  num_sweep, HYPRE_MEMORY_HOST);
-         for (i=0; i<num_sweep; i++)
+         for (i = 0; i < num_sweep; i++)
+         {
             grid_relax_points[1][i] = 0;
+         }
 
          /* up cycle */
          num_grid_sweeps[2] = num_sweep;
          grid_relax_type[2] = relax_default;
          hypre_TFree(grid_relax_points[2], HYPRE_MEMORY_HOST);
          grid_relax_points[2] = hypre_CTAlloc(HYPRE_Int,  num_sweep, HYPRE_MEMORY_HOST);
-         for (i=0; i<num_sweep; i++)
+         for (i = 0; i < num_sweep; i++)
+         {
             grid_relax_points[2][i] = 0;
+         }
 
          /* coarsest grid */
          num_grid_sweeps[3] = 1;
@@ -3262,13 +3450,13 @@ main( HYPRE_Int   argc,
          grid_relax_points[3] = hypre_CTAlloc(HYPRE_Int,  1, HYPRE_MEMORY_HOST);
          grid_relax_points[3][0] = 0;
 
-         if (myid == 0) hypre_printf("Solver: GSMG-GMRES\n");
+         if (myid == 0) { hypre_printf("Solver: GSMG-GMRES\n"); }
          HYPRE_BoomerAMGCreate(&pcg_precond);
          HYPRE_BoomerAMGSetGSMG(pcg_precond, 4);
          HYPRE_BoomerAMGSetInterpType(pcg_precond, interp_type);
          HYPRE_BoomerAMGSetNumSamples(pcg_precond, gsmg_samples);
          HYPRE_BoomerAMGSetTol(pcg_precond, pc_tol);
-         HYPRE_BoomerAMGSetCoarsenType(pcg_precond, (hybrid*coarsen_type));
+         HYPRE_BoomerAMGSetCoarsenType(pcg_precond, (hybrid * coarsen_type));
          HYPRE_BoomerAMGSetMeasureType(pcg_precond, measure_type);
          HYPRE_BoomerAMGSetStrongThreshold(pcg_precond, strong_threshold);
          HYPRE_BoomerAMGSetTruncFactor(pcg_precond, trunc_factor);
@@ -3292,16 +3480,18 @@ main( HYPRE_Int   argc,
          HYPRE_BoomerAMGSetMaxRowSum(pcg_precond, max_row_sum);
          HYPRE_BoomerAMGSetNumFunctions(pcg_precond, num_functions);
          if (num_functions > 1)
+         {
             HYPRE_BoomerAMGSetDofFunc(pcg_precond, dof_func);
+         }
          HYPRE_GMRESSetPrecond(pcg_solver,
-                             (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSolve,
-                             (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSetup,
-                                   pcg_precond);
+                               (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSolve,
+                               (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSetup,
+                               pcg_precond);
       }
       else if (solver_id == 18)
       {
          /* use ParaSails preconditioner */
-         if (myid == 0) hypre_printf("Solver: ParaSails-GMRES\n");
+         if (myid == 0) { hypre_printf("Solver: ParaSails-GMRES\n"); }
 
          HYPRE_ParaSailsCreate(hypre_MPI_COMM_WORLD, &pcg_precond);
          HYPRE_ParaSailsSetParams(pcg_precond, sai_threshold, max_levels);
@@ -3317,11 +3507,11 @@ main( HYPRE_Int   argc,
       else if (solver_id == 44)
       {
          /* use Euclid preconditioning */
-         if (myid == 0) hypre_printf("Solver: Euclid-GMRES\n");
+         if (myid == 0) { hypre_printf("Solver: Euclid-GMRES\n"); }
 
          HYPRE_EuclidCreate(hypre_MPI_COMM_WORLD, &pcg_precond);
 
-         /* note: There are three three methods of setting run-time
+         /* note: There are three methods of setting run-time
             parameters for Euclid: (see HYPRE_parcsr_ls.h); here
             we'll use what I think is simplest: let Euclid internally
             parse the command line.
@@ -3337,14 +3527,15 @@ main( HYPRE_Int   argc,
       HYPRE_GMRESGetPrecond(pcg_solver, &pcg_precond_gotten);
       if (pcg_precond_gotten != pcg_precond)
       {
-        hypre_printf("HYPRE_GMRESGetPrecond got bad precond\n");
-        return(-1);
+         hypre_printf("HYPRE_GMRESGetPrecond got bad precond\n");
+         return (-1);
+      }
+      else if (myid == 0)
+      {
+         hypre_printf("HYPRE_GMRESGetPrecond got good precond\n");
       }
-      else
-        if (myid == 0)
-          hypre_printf("HYPRE_GMRESGetPrecond got good precond\n");
       HYPRE_GMRESSetup
-         (pcg_solver, (HYPRE_Matrix)parcsr_A, (HYPRE_Vector)b, (HYPRE_Vector)x);
+      (pcg_solver, (HYPRE_Matrix)parcsr_A, (HYPRE_Vector)b, (HYPRE_Vector)x);
 
       hypre_EndTiming(time_index);
       hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
@@ -3355,7 +3546,7 @@ main( HYPRE_Int   argc,
       hypre_BeginTiming(time_index);
 
       HYPRE_GMRESSolve
-         (pcg_solver, (HYPRE_Matrix)parcsr_A, (HYPRE_Vector)b, (HYPRE_Vector)x);
+      (pcg_solver, (HYPRE_Matrix)parcsr_A, (HYPRE_Vector)b, (HYPRE_Vector)x);
 
       hypre_EndTiming(time_index);
       hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
@@ -3363,14 +3554,14 @@ main( HYPRE_Int   argc,
       hypre_ClearTiming();
 
       HYPRE_GMRESGetNumIterations(pcg_solver, &num_iterations);
-      HYPRE_GMRESGetFinalRelativeResidualNorm(pcg_solver,&final_res_norm);
+      HYPRE_GMRESGetFinalRelativeResidualNorm(pcg_solver, &final_res_norm);
 #if SECOND_TIME
       /* run a second time to check for memory leaks */
       HYPRE_ParVectorSetRandomValues(x, 775);
       HYPRE_GMRESSetup(pcg_solver, (HYPRE_Matrix)parcsr_A, (HYPRE_Vector)b,
-            (HYPRE_Vector)x);
+                       (HYPRE_Vector)x);
       HYPRE_GMRESSolve(pcg_solver, (HYPRE_Matrix)parcsr_A, (HYPRE_Vector)b,
-            (HYPRE_Vector)x);
+                       (HYPRE_Vector)x);
 #endif
 
       HYPRE_ParCSRGMRESDestroy(pcg_solver);
@@ -3390,7 +3581,7 @@ main( HYPRE_Int   argc,
       }
       else if (solver_id == 44)
       {
-        HYPRE_EuclidDestroy(pcg_precond);
+         HYPRE_EuclidDestroy(pcg_precond);
       }
 
       if (myid == 0)
@@ -3420,12 +3611,12 @@ main( HYPRE_Int   argc,
       if (solver_id == 9)
       {
          /* use BoomerAMG as preconditioner */
-         if (myid == 0) hypre_printf("Solver: AMG-BiCGSTAB\n");
+         if (myid == 0) { hypre_printf("Solver: AMG-BiCGSTAB\n"); }
          HYPRE_BoomerAMGCreate(&pcg_precond);
          HYPRE_BoomerAMGSetInterpType(pcg_precond, interp_type);
          HYPRE_BoomerAMGSetNumSamples(pcg_precond, gsmg_samples);
          HYPRE_BoomerAMGSetTol(pcg_precond, pc_tol);
-         HYPRE_BoomerAMGSetCoarsenType(pcg_precond, (hybrid*coarsen_type));
+         HYPRE_BoomerAMGSetCoarsenType(pcg_precond, (hybrid * coarsen_type));
          HYPRE_BoomerAMGSetMeasureType(pcg_precond, measure_type);
          HYPRE_BoomerAMGSetStrongThreshold(pcg_precond, strong_threshold);
          HYPRE_BoomerAMGSetTruncFactor(pcg_precond, trunc_factor);
@@ -3448,7 +3639,9 @@ main( HYPRE_Int   argc,
          HYPRE_BoomerAMGSetOverlap(pcg_precond, overlap);
          HYPRE_BoomerAMGSetDomainType(pcg_precond, domain_type);
          if (num_functions > 1)
+         {
             HYPRE_BoomerAMGSetDofFunc(pcg_precond, dof_func);
+         }
          HYPRE_BiCGSTABSetPrecond(pcg_solver,
                                   (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSolve,
                                   (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSetup,
@@ -3457,21 +3650,22 @@ main( HYPRE_Int   argc,
       else if (solver_id == 10)
       {
          /* use diagonal scaling as preconditioner */
-         if (myid == 0) hypre_printf("Solver: DS-BiCGSTAB\n");
+         if (myid == 0) { hypre_printf("Solver: DS-BiCGSTAB\n"); }
          pcg_precond = NULL;
 
          HYPRE_BiCGSTABSetPrecond(pcg_solver,
-                          (HYPRE_PtrToSolverFcn) HYPRE_ParCSRDiagScale,
-                          (HYPRE_PtrToSolverFcn) HYPRE_ParCSRDiagScaleSetup,
+                                  (HYPRE_PtrToSolverFcn) HYPRE_ParCSRDiagScale,
+                                  (HYPRE_PtrToSolverFcn) HYPRE_ParCSRDiagScaleSetup,
                                   pcg_precond);
       }
       else if (solver_id == 11)
       {
          /* use PILUT as preconditioner */
-         if (myid == 0) hypre_printf("Solver: PILUT-BiCGSTAB\n");
+         if (myid == 0) { hypre_printf("Solver: PILUT-BiCGSTAB\n"); }
 
          ierr = HYPRE_ParCSRPilutCreate( hypre_MPI_COMM_WORLD, &pcg_precond );
-         if (ierr) {
+         if (ierr)
+         {
             hypre_printf("Error in ParPilutCreate\n");
          }
 
@@ -3482,20 +3676,20 @@ main( HYPRE_Int   argc,
 
          if (drop_tol >= 0 )
             HYPRE_ParCSRPilutSetDropTolerance( pcg_precond,
-               drop_tol );
+                                               drop_tol );
 
          if (nonzeros_to_keep >= 0 )
             HYPRE_ParCSRPilutSetFactorRowSize( pcg_precond,
-               nonzeros_to_keep );
+                                               nonzeros_to_keep );
       }
       else if (solver_id == 45)
       {
          /* use Euclid preconditioning */
-         if (myid == 0) hypre_printf("Solver: Euclid-BICGSTAB\n");
+         if (myid == 0) { hypre_printf("Solver: Euclid-BICGSTAB\n"); }
 
          HYPRE_EuclidCreate(hypre_MPI_COMM_WORLD, &pcg_precond);
 
-         /* note: There are three three methods of setting run-time
+         /* note: There are three methods of setting run-time
             parameters for Euclid: (see HYPRE_parcsr_ls.h); here
             we'll use what I think is simplest: let Euclid internally
             parse the command line.
@@ -3509,7 +3703,7 @@ main( HYPRE_Int   argc,
       }
 
       HYPRE_BiCGSTABSetup(pcg_solver, (HYPRE_Matrix)parcsr_A,
-            (HYPRE_Vector)b, (HYPRE_Vector)x);
+                          (HYPRE_Vector)b, (HYPRE_Vector)x);
 
       hypre_EndTiming(time_index);
       hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
@@ -3520,7 +3714,7 @@ main( HYPRE_Int   argc,
       hypre_BeginTiming(time_index);
 
       HYPRE_BiCGSTABSolve(pcg_solver, (HYPRE_Matrix)parcsr_A,
-            (HYPRE_Vector)b, (HYPRE_Vector)x);
+                          (HYPRE_Vector)b, (HYPRE_Vector)x);
 
       hypre_EndTiming(time_index);
       hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
@@ -3528,14 +3722,14 @@ main( HYPRE_Int   argc,
       hypre_ClearTiming();
 
       HYPRE_BiCGSTABGetNumIterations(pcg_solver, &num_iterations);
-      HYPRE_BiCGSTABGetFinalRelativeResidualNorm(pcg_solver,&final_res_norm);
+      HYPRE_BiCGSTABGetFinalRelativeResidualNorm(pcg_solver, &final_res_norm);
 #if SECOND_TIME
       /* run a second time to check for memory leaks */
       HYPRE_ParVectorSetRandomValues(x, 775);
       HYPRE_BiCGSTABSetup(pcg_solver, (HYPRE_Matrix)parcsr_A,
-            (HYPRE_Vector)b, (HYPRE_Vector)x);
+                          (HYPRE_Vector)b, (HYPRE_Vector)x);
       HYPRE_BiCGSTABSolve(pcg_solver, (HYPRE_Matrix)parcsr_A,
-            (HYPRE_Vector)b, (HYPRE_Vector)x);
+                          (HYPRE_Vector)b, (HYPRE_Vector)x);
 #endif
 
       HYPRE_ParCSRBiCGSTABDestroy(pcg_solver);
@@ -3551,7 +3745,7 @@ main( HYPRE_Int   argc,
       }
       else if (solver_id == 45)
       {
-        HYPRE_EuclidDestroy(pcg_precond);
+         HYPRE_EuclidDestroy(pcg_precond);
       }
 
       if (myid == 0)
@@ -3580,12 +3774,12 @@ main( HYPRE_Int   argc,
       if (solver_id == 5)
       {
          /* use BoomerAMG as preconditioner */
-         if (myid == 0) hypre_printf("Solver: AMG-CGNR\n");
+         if (myid == 0) { hypre_printf("Solver: AMG-CGNR\n"); }
          HYPRE_BoomerAMGCreate(&pcg_precond);
          HYPRE_BoomerAMGSetInterpType(pcg_precond, interp_type);
          HYPRE_BoomerAMGSetNumSamples(pcg_precond, gsmg_samples);
          HYPRE_BoomerAMGSetTol(pcg_precond, pc_tol);
-         HYPRE_BoomerAMGSetCoarsenType(pcg_precond, (hybrid*coarsen_type));
+         HYPRE_BoomerAMGSetCoarsenType(pcg_precond, (hybrid * coarsen_type));
          HYPRE_BoomerAMGSetMeasureType(pcg_precond, measure_type);
          HYPRE_BoomerAMGSetStrongThreshold(pcg_precond, strong_threshold);
          HYPRE_BoomerAMGSetTruncFactor(pcg_precond, trunc_factor);
@@ -3608,7 +3802,9 @@ main( HYPRE_Int   argc,
          HYPRE_BoomerAMGSetOverlap(pcg_precond, overlap);
          HYPRE_BoomerAMGSetDomainType(pcg_precond, domain_type);
          if (num_functions > 1)
+         {
             HYPRE_BoomerAMGSetDofFunc(pcg_precond, dof_func);
+         }
          HYPRE_CGNRSetPrecond(pcg_solver,
                               (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSolve,
                               (HYPRE_PtrToSolverFcn) HYPRE_BoomerAMGSolveT,
@@ -3618,7 +3814,7 @@ main( HYPRE_Int   argc,
       else if (solver_id == 6)
       {
          /* use diagonal scaling as preconditioner */
-         if (myid == 0) hypre_printf("Solver: DS-CGNR\n");
+         if (myid == 0) { hypre_printf("Solver: DS-CGNR\n"); }
          pcg_precond = NULL;
 
          HYPRE_CGNRSetPrecond(pcg_solver,
@@ -3631,14 +3827,15 @@ main( HYPRE_Int   argc,
       HYPRE_CGNRGetPrecond(pcg_solver, &pcg_precond_gotten);
       if (pcg_precond_gotten != pcg_precond)
       {
-        hypre_printf("HYPRE_ParCSRCGNRGetPrecond got bad precond\n");
-        return(-1);
+         hypre_printf("HYPRE_ParCSRCGNRGetPrecond got bad precond\n");
+         return (-1);
+      }
+      else if (myid == 0)
+      {
+         hypre_printf("HYPRE_ParCSRCGNRGetPrecond got good precond\n");
       }
-      else
-        if (myid == 0)
-          hypre_printf("HYPRE_ParCSRCGNRGetPrecond got good precond\n");
       HYPRE_CGNRSetup(pcg_solver, (HYPRE_Matrix)parcsr_A, (HYPRE_Vector)b,
-            (HYPRE_Vector)x);
+                      (HYPRE_Vector)x);
 
       hypre_EndTiming(time_index);
       hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
@@ -3649,7 +3846,7 @@ main( HYPRE_Int   argc,
       hypre_BeginTiming(time_index);
 
       HYPRE_CGNRSolve(pcg_solver, (HYPRE_Matrix)parcsr_A, (HYPRE_Vector)b,
-            (HYPRE_Vector)x);
+                      (HYPRE_Vector)x);
 
       hypre_EndTiming(time_index);
       hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
@@ -3657,15 +3854,15 @@ main( HYPRE_Int   argc,
       hypre_ClearTiming();
 
       HYPRE_CGNRGetNumIterations(pcg_solver, &num_iterations);
-      HYPRE_CGNRGetFinalRelativeResidualNorm(pcg_solver,&final_res_norm);
+      HYPRE_CGNRGetFinalRelativeResidualNorm(pcg_solver, &final_res_norm);
 
 #if SECOND_TIME
       /* run a second time to check for memory leaks */
       HYPRE_ParVectorSetRandomValues(x, 775);
       HYPRE_CGNRSetup(pcg_solver, (HYPRE_Matrix)parcsr_A, (HYPRE_Vector)b,
-            (HYPRE_Vector)x);
+                      (HYPRE_Vector)x);
       HYPRE_CGNRSolve(pcg_solver, (HYPRE_Matrix)parcsr_A, (HYPRE_Vector)b,
-            (HYPRE_Vector)x);
+                      (HYPRE_Vector)x);
 #endif
 
       HYPRE_ParCSRCGNRDestroy(pcg_solver);
@@ -3758,7 +3955,7 @@ BuildParFromFile( HYPRE_Int                  argc,
     * Generate the matrix
     *-----------------------------------------------------------*/
 
-   HYPRE_ParCSRMatrixRead(hypre_MPI_COMM_WORLD, filename,&A);
+   HYPRE_ParCSRMatrixRead(hypre_MPI_COMM_WORLD, filename, &A);
 
    *A_ptr = A;
 
@@ -3832,9 +4029,9 @@ BuildParLaplacian( HYPRE_Int                  argc,
       else if ( strcmp(argv[arg_index], "-c") == 0 )
       {
          arg_index++;
-         cx = atof(argv[arg_index++]);
-         cy = atof(argv[arg_index++]);
-         cz = atof(argv[arg_index++]);
+         cx = (HYPRE_Real)atof(argv[arg_index++]);
+         cy = (HYPRE_Real)atof(argv[arg_index++]);
+         cz = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else
       {
@@ -3846,7 +4043,7 @@ BuildParLaplacian( HYPRE_Int                  argc,
     * Check a few things
     *-----------------------------------------------------------*/
 
-   if ((P*Q*R) != num_procs)
+   if ((P * Q * R) != num_procs)
    {
       hypre_printf("Error: Invalid number of processors or processor topology \n");
       exit(1);
@@ -3870,8 +4067,8 @@ BuildParLaplacian( HYPRE_Int                  argc,
 
    /* compute p,q,r from P,Q,R and myid */
    p = myid % P;
-   q = (( myid - p)/P) % Q;
-   r = ( myid - p - P*q)/( P*Q );
+   q = (( myid - p) / P) % Q;
+   r = ( myid - p - P * q) / ( P * Q );
 
    /*-----------------------------------------------------------
     * Generate the matrix
@@ -3886,19 +4083,19 @@ BuildParLaplacian( HYPRE_Int                  argc,
    values[0] = 0.;
    if (nx > 1)
    {
-      values[0] += 2.0*cx;
+      values[0] += 2.0 * cx;
    }
    if (ny > 1)
    {
-      values[0] += 2.0*cy;
+      values[0] += 2.0 * cy;
    }
    if (nz > 1)
    {
-      values[0] += 2.0*cz;
+      values[0] += 2.0 * cz;
    }
 
    A = (HYPRE_ParCSRMatrix) GenerateLaplacian(hypre_MPI_COMM_WORLD,
-         nx, ny, nz, P, Q, R, p, q, r, values);
+                                              nx, ny, nz, P, Q, R, p, q, r, values);
 
    hypre_TFree(values, HYPRE_MEMORY_HOST);
 
@@ -3926,7 +4123,7 @@ BuildParDifConv( HYPRE_Int                  argc,
    HYPRE_Int                 P, Q, R;
    HYPRE_Real          cx, cy, cz;
    HYPRE_Real          ax, ay, az;
-   HYPRE_Real          hinx,hiny,hinz;
+   HYPRE_Real          hinx, hiny, hinz;
 
    HYPRE_ParCSRMatrix  A;
 
@@ -3984,16 +4181,16 @@ BuildParDifConv( HYPRE_Int                  argc,
       else if ( strcmp(argv[arg_index], "-c") == 0 )
       {
          arg_index++;
-         cx = atof(argv[arg_index++]);
-         cy = atof(argv[arg_index++]);
-         cz = atof(argv[arg_index++]);
+         cx = (HYPRE_Real)atof(argv[arg_index++]);
+         cy = (HYPRE_Real)atof(argv[arg_index++]);
+         cz = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else if ( strcmp(argv[arg_index], "-a") == 0 )
       {
          arg_index++;
-         ax = atof(argv[arg_index++]);
-         ay = atof(argv[arg_index++]);
-         az = atof(argv[arg_index++]);
+         ax = (HYPRE_Real)atof(argv[arg_index++]);
+         ay = (HYPRE_Real)atof(argv[arg_index++]);
+         az = (HYPRE_Real)atof(argv[arg_index++]);
       }
       else
       {
@@ -4005,7 +4202,7 @@ BuildParDifConv( HYPRE_Int                  argc,
     * Check a few things
     *-----------------------------------------------------------*/
 
-   if ((P*Q*R) != num_procs)
+   if ((P * Q * R) != num_procs)
    {
       hypre_printf("Error: Invalid number of processors or processor topology \n");
       exit(1);
@@ -4031,12 +4228,12 @@ BuildParDifConv( HYPRE_Int                  argc,
 
    /* compute p,q,r from P,Q,R and myid */
    p = myid % P;
-   q = (( myid - p)/P) % Q;
-   r = ( myid - p - P*q)/( P*Q );
+   q = (( myid - p) / P) % Q;
+   r = ( myid - p - P * q) / ( P * Q );
 
-   hinx = 1./(nx+1);
-   hiny = 1./(ny+1);
-   hinz = 1./(nz+1);
+   hinx = 1. / (nx + 1);
+   hiny = 1. / (ny + 1);
+   hinz = 1. / (nz + 1);
 
    /*-----------------------------------------------------------
     * Generate the matrix
@@ -4044,29 +4241,29 @@ BuildParDifConv( HYPRE_Int                  argc,
 
    values = hypre_CTAlloc(HYPRE_Real,  7, HYPRE_MEMORY_HOST);
 
-   values[1] = -cx/(hinx*hinx);
-   values[2] = -cy/(hiny*hiny);
-   values[3] = -cz/(hinz*hinz);
-   values[4] = -cx/(hinx*hinx) + ax/hinx;
-   values[5] = -cy/(hiny*hiny) + ay/hiny;
-   values[6] = -cz/(hinz*hinz) + az/hinz;
+   values[1] = -cx / (hinx * hinx);
+   values[2] = -cy / (hiny * hiny);
+   values[3] = -cz / (hinz * hinz);
+   values[4] = -cx / (hinx * hinx) + ax / hinx;
+   values[5] = -cy / (hiny * hiny) + ay / hiny;
+   values[6] = -cz / (hinz * hinz) + az / hinz;
 
    values[0] = 0.;
    if (nx > 1)
    {
-      values[0] += 2.0*cx/(hinx*hinx) - 1.*ax/hinx;
+      values[0] += 2.0 * cx / (hinx * hinx) - 1.*ax / hinx;
    }
    if (ny > 1)
    {
-      values[0] += 2.0*cy/(hiny*hiny) - 1.*ay/hiny;
+      values[0] += 2.0 * cy / (hiny * hiny) - 1.*ay / hiny;
    }
    if (nz > 1)
    {
-      values[0] += 2.0*cz/(hinz*hinz) - 1.*az/hinz;
+      values[0] += 2.0 * cz / (hinz * hinz) - 1.*az / hinz;
    }
 
    A = (HYPRE_ParCSRMatrix) GenerateDifConv(hypre_MPI_COMM_WORLD,
-                               nx, ny, nz, P, Q, R, p, q, r, values);
+                                            nx, ny, nz, P, Q, R, p, q, r, values);
 
    hypre_TFree(values, HYPRE_MEMORY_HOST);
 
@@ -4140,22 +4337,22 @@ BuildParFromOneFile2(HYPRE_Int                  argc,
    if (myid == 0 && num_functions > 1)
    {
       HYPRE_CSRMatrixGetNumRows(A_CSR, &num_dofs);
-      num_nodes = num_dofs/num_functions;
-      if (num_dofs != num_functions*num_nodes)
+      num_nodes = num_dofs / num_functions;
+      if (num_dofs != num_functions * num_nodes)
       {
          row_part = NULL;
          col_part = NULL;
       }
       else
       {
-         row_part = hypre_CTAlloc(HYPRE_Int,  numprocs+1, HYPRE_MEMORY_HOST);
+         row_part = hypre_CTAlloc(HYPRE_Int,  numprocs + 1, HYPRE_MEMORY_HOST);
          row_part[0] = 0;
-         size = num_nodes/numprocs;
-         rest = num_nodes-size*numprocs;
-         for (i=0; i < numprocs; i++)
+         size = num_nodes / numprocs;
+         rest = num_nodes - size * numprocs;
+         for (i = 0; i < numprocs; i++)
          {
-            row_part[i+1] = row_part[i]+size*num_functions;
-            if (i < rest) row_part[i+1] += num_functions;
+            row_part[i + 1] = row_part[i] + size * num_functions;
+            if (i < rest) { row_part[i + 1] += num_functions; }
          }
          col_part = row_part;
       }
@@ -4165,7 +4362,7 @@ BuildParFromOneFile2(HYPRE_Int                  argc,
 
    *A_ptr = A;
 
-   if (myid == 0) HYPRE_CSRMatrixDestroy(A_CSR);
+   if (myid == 0) { HYPRE_CSRMatrixDestroy(A_CSR); }
 
    return (0);
 }
@@ -4181,12 +4378,12 @@ BuildFuncsFromFiles(    HYPRE_Int                  argc,
                         HYPRE_ParCSRMatrix   parcsr_A,
                         HYPRE_Int                **dof_func_ptr     )
 {
-/*----------------------------------------------------------------------
- * Build Function array from files on different processors
- *----------------------------------------------------------------------*/
+   /*----------------------------------------------------------------------
+    * Build Function array from files on different processors
+    *----------------------------------------------------------------------*/
 
    hypre_printf (" Feature is not implemented yet!\n");
-   return(0);
+   return (0);
 
 }
 
@@ -4258,32 +4455,34 @@ BuildFuncsFromOneFile(  HYPRE_Int                  argc,
 
    }
    HYPRE_ParCSRMatrixGetRowPartitioning(parcsr_A, &partitioning);
-   local_size = partitioning[myid+1]-partitioning[myid];
+   local_size = partitioning[myid + 1] - partitioning[myid];
    dof_func_local = hypre_CTAlloc(HYPRE_Int, local_size, HYPRE_MEMORY_HOST);
 
    if (myid == 0)
    {
-        requests = hypre_CTAlloc(hypre_MPI_Request, num_procs-1, HYPRE_MEMORY_HOST);
-        status = hypre_CTAlloc(hypre_MPI_Status, num_procs-1, HYPRE_MEMORY_HOST);
-        j = 0;
-        for (i=1; i < num_procs; i++)
-                hypre_MPI_Isend(&dof_func[partitioning[i]],
-                      partitioning[i+1]-partitioning[i],
-                HYPRE_MPI_INT, i, 0, comm, &requests[j++]);
-        for (i=0; i < local_size; i++)
-                dof_func_local[i] = dof_func[i];
-        hypre_MPI_Waitall(num_procs-1,requests, status);
-        hypre_TFree(requests, HYPRE_MEMORY_HOST);
-        hypre_TFree(status, HYPRE_MEMORY_HOST);
+      requests = hypre_CTAlloc(hypre_MPI_Request, num_procs - 1, HYPRE_MEMORY_HOST);
+      status = hypre_CTAlloc(hypre_MPI_Status, num_procs - 1, HYPRE_MEMORY_HOST);
+      j = 0;
+      for (i = 1; i < num_procs; i++)
+         hypre_MPI_Isend(&dof_func[partitioning[i]],
+                         partitioning[i + 1] - partitioning[i],
+                         HYPRE_MPI_INT, i, 0, comm, &requests[j++]);
+      for (i = 0; i < local_size; i++)
+      {
+         dof_func_local[i] = dof_func[i];
+      }
+      hypre_MPI_Waitall(num_procs - 1, requests, status);
+      hypre_TFree(requests, HYPRE_MEMORY_HOST);
+      hypre_TFree(status, HYPRE_MEMORY_HOST);
    }
    else
    {
-        hypre_MPI_Recv(dof_func_local,local_size,HYPRE_MPI_INT,0,0,comm,&status0);
+      hypre_MPI_Recv(dof_func_local, local_size, HYPRE_MPI_INT, 0, 0, comm, &status0);
    }
 
    *dof_func_ptr = dof_func_local;
 
-   if (myid == 0) hypre_TFree(dof_func, HYPRE_MEMORY_HOST);
+   if (myid == 0) { hypre_TFree(dof_func, HYPRE_MEMORY_HOST); }
 
    return (0);
 }
@@ -4341,7 +4540,7 @@ BuildRhsParFromOneFile2(HYPRE_Int                  argc,
 
       b_CSR = HYPRE_VectorRead(filename);
    }
-   HYPRE_VectorToParVector(hypre_MPI_COMM_WORLD, b_CSR, partitioning,&b);
+   HYPRE_VectorToParVector(hypre_MPI_COMM_WORLD, b_CSR, partitioning, &b);
 
    *b_ptr = b;
 
@@ -4415,7 +4614,7 @@ BuildParLaplacian9pt( HYPRE_Int                  argc,
     * Check a few things
     *-----------------------------------------------------------*/
 
-   if ((P*Q) != num_procs)
+   if ((P * Q) != num_procs)
    {
       hypre_printf("Error: Invalid number of processors or processor topology \n");
       exit(1);
@@ -4438,7 +4637,7 @@ BuildParLaplacian9pt( HYPRE_Int                  argc,
 
    /* compute p,q from P,Q and myid */
    p = myid % P;
-   q = ( myid - p)/P;
+   q = ( myid - p) / P;
 
    /*-----------------------------------------------------------
     * Generate the matrix
@@ -4463,7 +4662,7 @@ BuildParLaplacian9pt( HYPRE_Int                  argc,
    }
 
    A = (HYPRE_ParCSRMatrix) GenerateLaplacian9pt(hypre_MPI_COMM_WORLD,
-                                  nx, ny, P, Q, p, q, values);
+                                                 nx, ny, P, Q, p, q, values);
 
    hypre_TFree(values, HYPRE_MEMORY_HOST);
 
@@ -4540,7 +4739,7 @@ BuildParLaplacian27pt( HYPRE_Int                  argc,
     * Check a few things
     *-----------------------------------------------------------*/
 
-   if ((P*Q*R) != num_procs)
+   if ((P * Q * R) != num_procs)
    {
       hypre_printf("Error: Invalid number of processors or processor topology \n");
       exit(1);
@@ -4563,8 +4762,8 @@ BuildParLaplacian27pt( HYPRE_Int                  argc,
 
    /* compute p,q,r from P,Q,R and myid */
    p = myid % P;
-   q = (( myid - p)/P) % Q;
-   r = ( myid - p - P*q)/( P*Q );
+   q = (( myid - p) / P) % Q;
+   r = ( myid - p - P * q) / ( P * Q );
 
    /*-----------------------------------------------------------
     * Generate the matrix
@@ -4574,13 +4773,17 @@ BuildParLaplacian27pt( HYPRE_Int                  argc,
 
    values[0] = 26.0;
    if (nx == 1 || ny == 1 || nz == 1)
+   {
       values[0] = 8.0;
-   if (nx*ny == 1 || nx*nz == 1 || ny*nz == 1)
+   }
+   if (nx * ny == 1 || nx * nz == 1 || ny * nz == 1)
+   {
       values[0] = 2.0;
+   }
    values[1] = -1.;
 
    A = (HYPRE_ParCSRMatrix) GenerateLaplacian27pt(hypre_MPI_COMM_WORLD,
-                               nx, ny, nz, P, Q, R, p, q, r, values);
+                                                  nx, ny, nz, P, Q, R, p, q, r, values);
 
    hypre_TFree(values, HYPRE_MEMORY_HOST);
 
@@ -4670,8 +4873,8 @@ BuildParIsoLaplacian( HYPRE_Int argc, char** argv, HYPRE_ParCSRMatrix *A_ptr )
 
    /* compute p,q,r from P,Q,R and myid */
    p = myid % P;
-   q = (( myid - p)/P) % Q;
-   r = ( myid - p - P*q)/( P*Q );
+   q = (( myid - p) / P) % Q;
+   r = ( myid - p - P * q) / ( P * Q );
 
    /*-----------------------------------------------------------
     * Generate the matrix
@@ -4686,19 +4889,19 @@ BuildParIsoLaplacian( HYPRE_Int argc, char** argv, HYPRE_ParCSRMatrix *A_ptr )
    values[0] = 0.;
    if (nx > 1)
    {
-      values[0] += 2.0*cx;
+      values[0] += 2.0 * cx;
    }
    if (ny > 1)
    {
-      values[0] += 2.0*cy;
+      values[0] += 2.0 * cy;
    }
    if (nz > 1)
    {
-      values[0] += 2.0*cz;
+      values[0] += 2.0 * cz;
    }
 
    A = (HYPRE_ParCSRMatrix) GenerateLaplacian(hypre_MPI_COMM_WORLD,
-         nx, ny, nz, P, Q, R, p, q, r, values);
+                                              nx, ny, nz, P, Q, R, p, q, r, values);
 
    hypre_TFree(values, HYPRE_MEMORY_HOST);
 
diff --git a/external/hypre/src/test/test_mgr.c b/external/hypre/src/test/test_mgr.c
deleted file mode 100644
index 396cbad2..00000000
--- a/external/hypre/src/test/test_mgr.c
+++ /dev/null
@@ -1,1313 +0,0 @@
-/******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
- * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
- *
- * SPDX-License-Identifier: (Apache-2.0 OR MIT)
- ******************************************************************************/
-
-/*--------------------------------------------------------------------------
- * Test driver for unstructured matrix interface (IJ_matrix interface).
- * Do `driver -help' for usage info.
- * This driver started from the driver for parcsr_linear_solvers, and it
- * works by first building a parcsr matrix as before and then "copying"
- * that matrix row-by-row into the IJMatrix interface. AJC 7/99.
- *--------------------------------------------------------------------------*/
-#include <stdlib.h>
-#include <stdio.h>
-#include <math.h>
-
-#include "_hypre_utilities.h"
-#include "HYPRE.h"
-#include "HYPRE_parcsr_mv.h"
-
-#include "HYPRE_IJ_mv.h"
-#include "HYPRE_parcsr_ls.h"
-#include "_hypre_parcsr_mv.h"
-#include "HYPRE_krylov.h"
-
-#ifdef HAVE_DSUPERLU
-#include "superlu_ddefs.h"
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#define SECOND_TIME 0
-
-
-hypre_int
-main( hypre_int argc,
-    char *argv[] )
-{
-  HYPRE_Int                 arg_index;
-  HYPRE_Int                 print_usage;
-  HYPRE_Int                 build_matrix_type;
-  HYPRE_Int                 build_matrix_arg_index;
-  HYPRE_Int                 build_precond_type;
-  HYPRE_Int                 build_precond_arg_index;
-  HYPRE_Int                 build_rhs_type;
-  HYPRE_Int                 build_rhs_arg_index;
-  HYPRE_Int                 use_block_cf = 0;
-  HYPRE_Int                 use_point_marker_array = 0;
-  HYPRE_Int                 use_reserved_coarse_grid;
-  HYPRE_Int                 build_block_cf_arg_index;
-  HYPRE_Int                 build_marker_array_arg_index;
-  HYPRE_Int                 solver_id;
-  HYPRE_Int                 print_system = 0;
-  HYPRE_Int                 poutdat;
-  HYPRE_Int                 debug_flag;
-  HYPRE_Int                 ierr = 0;
-  HYPRE_Int                 i,j;
-  HYPRE_Int                 max_levels = 25;
-  HYPRE_Int                 num_iterations;
-  HYPRE_Real          final_res_norm;
-  void                *object;
-
-  HYPRE_IJMatrix      ij_A = NULL;
-  HYPRE_IJMatrix      ij_M = NULL;
-  HYPRE_IJVector      ij_b = NULL;
-  HYPRE_IJVector      ij_x = NULL;
-
-  HYPRE_ParCSRMatrix  parcsr_A = NULL;
-  HYPRE_ParCSRMatrix  parcsr_M = NULL;
-  HYPRE_ParCSRMatrix  parcsr_C = NULL;
-  HYPRE_ParVector     b = NULL;
-  HYPRE_ParVector     x = NULL;
-
-  HYPRE_Solver        aux_precond = NULL, aux_solver = NULL;
-  HYPRE_Solver        amg_solver = NULL;
-  HYPRE_Solver        pcg_solver = NULL;
-  HYPRE_Solver        pcg_precond=NULL, pcg_precond_gotten = NULL;
-
-  HYPRE_Int           num_procs, myid;
-
-  HYPRE_Int           time_index;
-  MPI_Comm            comm = hypre_MPI_COMM_WORLD;
-
-  HYPRE_Real          *values = NULL;
-
-  HYPRE_BigInt first_local_row, last_local_row, local_num_rows;
-  HYPRE_BigInt first_local_col, last_local_col, local_num_cols;
-#ifdef HAVE_DSUPERLU
-  HYPRE_Int    dslu_threshold = -1;
-#endif
-
-  /* parameters for GMRES */
-  HYPRE_Int     k_dim = 100;
-  HYPRE_Real    tol = 1e-6;
-  HYPRE_Real    atol = 1e-12;
-  HYPRE_Real    pc_tol = 0.0;
-  HYPRE_Int     max_iter = 400;
-  HYPRE_Int     pc_max_iter = 1;
-
-  /* mgr options */
-  HYPRE_Int mgr_bsize = 7;
-  HYPRE_Int mgr_nlevels = 3;
-  HYPRE_Int mgr_num_reserved_nodes = 0;
-  HYPRE_Int mgr_non_c_to_f = 1;
-  HYPRE_Int P_max_elmts = 0;
-
-  HYPRE_Int     *mgr_frelax_num_functions= NULL;
-  HYPRE_BigInt  *mgr_idx_array = NULL;
-  HYPRE_Int     *mgr_point_marker_array = NULL;
-  HYPRE_Int     *mgr_num_cindexes = NULL;
-  HYPRE_Int     **mgr_cindexes = NULL;
-  HYPRE_BigInt  *mgr_reserved_coarse_indexes = NULL;
-
-  HYPRE_Int mgr_relax_type = 0;
-  HYPRE_Int mgr_num_relax_sweeps = 1;
-
-  HYPRE_Int mgr_gsmooth_type = 16;
-  HYPRE_Int mgr_num_gsmooth_sweeps = 0;
-
-  HYPRE_Int mgr_restrict_type = 0;
-  HYPRE_Int mgr_num_restrict_sweeps = 0;
-  HYPRE_Int *mgr_level_restrict_type = hypre_CTAlloc(HYPRE_Int, mgr_nlevels, HYPRE_MEMORY_HOST);
-  mgr_level_restrict_type[0] = 0;
-  mgr_level_restrict_type[1] = 0;
-  mgr_level_restrict_type[2] = 0;
-
-  HYPRE_Int mgr_interp_type = 2;
-  HYPRE_Int mgr_num_interp_sweeps = 0;
-  HYPRE_Int *mgr_level_interp_type = hypre_CTAlloc(HYPRE_Int, mgr_nlevels, HYPRE_MEMORY_HOST);
-  mgr_level_interp_type[0] = 2;
-  mgr_level_interp_type[1] = 2;
-  mgr_level_interp_type[2] = 2;
-
-  HYPRE_Int *mgr_coarse_grid_method = hypre_CTAlloc(HYPRE_Int, mgr_nlevels, HYPRE_MEMORY_HOST);
-  mgr_coarse_grid_method[0] = 0;
-  mgr_coarse_grid_method[1] = 0;
-  mgr_coarse_grid_method[2] = 0;
-
-  mgr_cindexes = hypre_CTAlloc(HYPRE_Int*, mgr_nlevels, HYPRE_MEMORY_HOST);
-  HYPRE_Int *lv1 = hypre_CTAlloc(HYPRE_Int, mgr_bsize, HYPRE_MEMORY_HOST);
-  HYPRE_Int *lv2 = hypre_CTAlloc(HYPRE_Int, mgr_bsize, HYPRE_MEMORY_HOST);
-  HYPRE_Int *lv3 = hypre_CTAlloc(HYPRE_Int, mgr_bsize, HYPRE_MEMORY_HOST);
-  lv1[0] = 0;
-  lv1[1] = 1;
-  lv1[2] = 3;
-  lv1[3] = 4;
-  lv1[4] = 5;
-  lv1[5] = 6;
-  lv2[0] = 0;
-  lv2[1] = 3;
-  lv2[2] = 4;
-  lv2[3] = 5;
-  lv2[4] = 6;
-  lv3[0] = 3;
-  lv3[1] = 4;
-  lv3[2] = 5;
-  lv3[3] = 6;
-  mgr_cindexes[0] = lv1;
-  mgr_cindexes[1] = lv2;
-  mgr_cindexes[2] = lv3;
-
-  mgr_num_cindexes = hypre_CTAlloc(HYPRE_Int, mgr_nlevels, HYPRE_MEMORY_HOST);
-  mgr_num_cindexes[0] = 6;
-  mgr_num_cindexes[1] = 5;
-  mgr_num_cindexes[2] = 4;
-
-  HYPRE_Int mgr_frelax_method = 0;
-  HYPRE_Int *mgr_level_frelax_method = hypre_CTAlloc(HYPRE_Int, mgr_nlevels, HYPRE_MEMORY_HOST);
-  mgr_level_frelax_method[0] = 0;
-  mgr_level_frelax_method[1] = 0;
-  mgr_level_frelax_method[2] = 2;
-
-  char* indexList = NULL;
-  /* end mgr options */
-
-  /*-----------------------------------------------------------
-   * Initialize some stuff
-   *-----------------------------------------------------------*/
-
-  /* Initialize MPI */
-  hypre_MPI_Init(&argc, &argv);
-
-  hypre_MPI_Comm_size(hypre_MPI_COMM_WORLD, &num_procs );
-  hypre_MPI_Comm_rank(hypre_MPI_COMM_WORLD, &myid );
-
-  /*-----------------------------------------------------------
-   * Set defaults
-   *-----------------------------------------------------------*/
-
-  build_matrix_type = -1;
-  build_matrix_arg_index = argc;
-  build_precond_type = 0;
-  build_precond_arg_index = argc;
-  build_rhs_type = 2;
-  build_rhs_arg_index = argc;
-  debug_flag = 0;
-
-  solver_id = 72;
-
-  poutdat = 1;
-
-  /*-----------------------------------------------------------
-   * Parse command line
-   *-----------------------------------------------------------*/
-
-  print_usage = 0;
-  arg_index = 1;
-
-  while ( (arg_index < argc) && (!print_usage) )
-  {
-    if ( strcmp(argv[arg_index], "-fromfile") == 0 )
-    {
-      arg_index++;
-      build_matrix_type      = -1;
-      build_matrix_arg_index = arg_index;
-    }
-    if ( strcmp(argv[arg_index], "-precondfromfile") == 0 )
-    {
-      arg_index++;
-      build_precond_type      = -1;
-      build_precond_arg_index = arg_index;
-    }
-    else if ( strcmp(argv[arg_index], "-solver") == 0 )
-    {
-      arg_index++;
-      solver_id = atoi(argv[arg_index++]);
-    }
-    else if ( strcmp(argv[arg_index], "-print") == 0 )
-    {
-      arg_index++;
-      print_system = 1;
-    }
-    else if ( strcmp(argv[arg_index], "-rhsfromfile") == 0 )
-    {
-      arg_index++;
-      build_rhs_type      = 0;
-      build_rhs_arg_index = arg_index;
-    }
-    else if ( strcmp(argv[arg_index], "-indexList") == 0)
-    {
-      arg_index++;
-      use_reserved_coarse_grid = 1;
-      indexList = (argv[arg_index++]);
-    }
-    else if ( strcmp(argv[arg_index], "-blockCF") == 0)
-    {
-      arg_index++;
-      use_block_cf = 1;
-      build_block_cf_arg_index = arg_index;
-    }
-    else if ( strcmp(argv[arg_index], "-markerArray") == 0)
-    {
-      arg_index++;
-      use_point_marker_array = 1;
-      build_marker_array_arg_index = arg_index;
-    }
-    else
-    {
-      arg_index++;
-    }
-  }
-
-  if (myid == 0)
-  {
-    hypre_printf("Reading the system matrix\n");
-  }
-  ierr = HYPRE_IJMatrixRead( argv[build_matrix_arg_index], comm,
-                    HYPRE_PARCSR, &ij_A );
-  if (ierr)
-  {
-    hypre_printf("ERROR: Problem reading in the system matrix!\n");
-    exit(1);
-  }
-
-  if (build_matrix_type < 0)
-  {
-    ierr = HYPRE_IJMatrixGetLocalRange( ij_A,
-                            &first_local_row, &last_local_row ,
-                            &first_local_col, &last_local_col );
-
-    local_num_rows = last_local_row - first_local_row + 1;
-    local_num_cols = last_local_col - first_local_col + 1;
-    ierr += HYPRE_IJMatrixGetObject( ij_A, &object);
-    parcsr_A = (HYPRE_ParCSRMatrix) object;
-  }
-
-
-
-  if (build_precond_type < 0)
-  {
-    ierr = HYPRE_IJMatrixRead( argv[build_precond_arg_index], comm,
-                      HYPRE_PARCSR, &ij_M );
-    if (ierr)
-    {
-      hypre_printf("ERROR: Problem reading in the preconditioning matrix!\n");
-      exit(1);
-    }
-    ierr = HYPRE_IJMatrixGetLocalRange( ij_M,
-                            &first_local_row, &last_local_row ,
-                            &first_local_col, &last_local_col );
-
-    local_num_rows = last_local_row - first_local_row + 1;
-    local_num_cols = last_local_col - first_local_col + 1;
-    ierr += HYPRE_IJMatrixGetObject( ij_M, &object);
-    parcsr_M = (HYPRE_ParCSRMatrix) object;
-  }
-  else
-  {
-    parcsr_M = parcsr_A;
-  }
-
-  if ( build_rhs_type == 0 )
-  {
-    if (myid == 0)
-    {
-      hypre_printf("  RHS vector read from file %s\n", argv[build_rhs_arg_index]);
-      hypre_printf("  Initial guess is 0\n");
-    }
-
-    /* RHS */
-    ierr = HYPRE_IJVectorRead( argv[build_rhs_arg_index], hypre_MPI_COMM_WORLD,
-                      HYPRE_PARCSR, &ij_b );
-    if (ierr)
-    {
-      hypre_printf("ERROR: Problem reading in the right-hand-side!\n");
-      exit(1);
-    }
-    ierr = HYPRE_IJVectorGetObject( ij_b, &object );
-    b = (HYPRE_ParVector) object;
-
-    /* Initial guess */
-    HYPRE_IJVectorCreate(hypre_MPI_COMM_WORLD, first_local_col, last_local_col, &ij_x);
-    HYPRE_IJVectorSetObjectType(ij_x, HYPRE_PARCSR);
-    HYPRE_IJVectorInitialize(ij_x);
-
-    values = hypre_CTAlloc(HYPRE_Real, local_num_cols, HYPRE_MEMORY_HOST);
-    for (i = 0; i < local_num_cols; i++)
-      values[i] = 0.;
-    HYPRE_IJVectorSetValues(ij_x, local_num_cols, NULL, values);
-    hypre_TFree(values, HYPRE_MEMORY_HOST);
-
-    ierr = HYPRE_IJVectorGetObject( ij_x, &object );
-    x = (HYPRE_ParVector) object;
-  }
-  else if ( build_rhs_type == 2 )
-  {
-    if (myid == 0)
-    {
-      hypre_printf("  RHS vector has unit components\n");
-      hypre_printf("  Initial guess is 0\n");
-    }
-
-    /* RHS */
-    HYPRE_IJVectorCreate(hypre_MPI_COMM_WORLD, first_local_row, last_local_row, &ij_b);
-    HYPRE_IJVectorSetObjectType(ij_b, HYPRE_PARCSR);
-    HYPRE_IJVectorInitialize(ij_b);
-
-    values = hypre_CTAlloc(HYPRE_Real,  local_num_rows, HYPRE_MEMORY_HOST);
-    for (i = 0; i < local_num_rows; i++)
-      values[i] = 1.0;
-    HYPRE_IJVectorSetValues(ij_b, local_num_rows, NULL, values);
-    hypre_TFree(values, HYPRE_MEMORY_HOST);
-
-    ierr = HYPRE_IJVectorGetObject( ij_b, &object );
-    b = (HYPRE_ParVector) object;
-
-    /* Initial guess */
-    HYPRE_IJVectorCreate(hypre_MPI_COMM_WORLD, first_local_col, last_local_col, &ij_x);
-    HYPRE_IJVectorSetObjectType(ij_x, HYPRE_PARCSR);
-    HYPRE_IJVectorInitialize(ij_x);
-
-    values = hypre_CTAlloc(HYPRE_Real,  local_num_cols, HYPRE_MEMORY_HOST);
-    for (i = 0; i < local_num_cols; i++)
-      values[i] = 0.;
-    HYPRE_IJVectorSetValues(ij_x, local_num_cols, NULL, values);
-    hypre_TFree(values, HYPRE_MEMORY_HOST);
-
-    ierr = HYPRE_IJVectorGetObject( ij_x, &object );
-    x = (HYPRE_ParVector) object;
-  }
-
-
-  if (indexList != NULL)
-  {
-    mgr_reserved_coarse_indexes = hypre_CTAlloc(HYPRE_BigInt, mgr_num_reserved_nodes, HYPRE_MEMORY_HOST);
-    FILE* ifp;
-    ifp = fopen(indexList,"r");
-    if (ifp == NULL)
-    {
-      fprintf(stderr, "Can't open input file for index list!\n");
-      exit(1);
-    }
-    fscanf(ifp, "%d", &mgr_num_reserved_nodes);
-    fprintf(stderr, "There are %d additional indices\n", mgr_num_reserved_nodes);
-    for (i = 0; i < mgr_num_reserved_nodes; i++) {
-      fscanf(ifp, "%d", &mgr_reserved_coarse_indexes[i]);
-    }
-  }
-  else
-  {
-    mgr_num_reserved_nodes = 0;
-    mgr_reserved_coarse_indexes = NULL;
-  }
-
-  if (use_block_cf)
-  {
-    mgr_idx_array = hypre_CTAlloc(HYPRE_BigInt, mgr_bsize, HYPRE_MEMORY_HOST);
-    FILE *ifp;
-    char fname[80];
-    hypre_sprintf(fname, "%s.%05i", argv[build_block_cf_arg_index],myid);
-    hypre_printf("Reading block CF indices from %s \n", fname);
-    ifp = fopen(fname,"r");
-    if (ifp == NULL)
-    {
-      fprintf(stderr, "Can't open input file for block CF indices!\n");
-      exit(1);
-    }
-    for (i = 0; i < mgr_bsize; i++)
-    {
-      fscanf(ifp, "%d", &mgr_idx_array[i]);
-    }
-  }
-
-  mgr_point_marker_array = hypre_CTAlloc(HYPRE_Int, local_num_rows, HYPRE_MEMORY_HOST);
-  if (use_point_marker_array)
-  {
-    FILE *ifp;
-    char fname[80];
-    hypre_sprintf(fname, "%s.%05i", argv[build_marker_array_arg_index], myid);
-    hypre_printf("Reading marker array from %s \n", fname);
-    ifp = fopen(fname,"r");
-    if (ifp == NULL)
-    {
-      fprintf(stderr, "Can't open input file for block CF indices!\n");
-      exit(1);
-    }
-    for (i = 0; i < local_num_rows; i++)
-    {
-      fscanf(ifp, "%d", &mgr_point_marker_array[i]);
-    }
-  }
-
-  if ( solver_id == 72 )
-  {
-    time_index = hypre_InitializeTiming("FlexGMRES Setup");
-    hypre_BeginTiming(time_index);
-
-    HYPRE_ParCSRFlexGMRESCreate(hypre_MPI_COMM_WORLD, &pcg_solver);
-    HYPRE_FlexGMRESSetKDim(pcg_solver, k_dim);
-    HYPRE_FlexGMRESSetMaxIter(pcg_solver, max_iter);
-    HYPRE_FlexGMRESSetTol(pcg_solver, tol);
-    HYPRE_FlexGMRESSetAbsoluteTol(pcg_solver, atol);
-    HYPRE_FlexGMRESSetLogging(pcg_solver, 1);
-    HYPRE_FlexGMRESSetPrintLevel(pcg_solver, 2);
-
-    /*
-    ierr = HYPRE_ILUCreate(&aux_precond);
-    HYPRE_ILUSetType(aux_precond, 0);
-    HYPRE_ILUSetMaxIter(aux_precond, pc_max_iter);
-    HYPRE_ILUSetTol(aux_precond, pc_tol);
-    HYPRE_ILUSetLevelOfFill(aux_precond, 0);
-
-    HYPRE_ParCSRGMRESCreate(hypre_MPI_COMM_WORLD, &aux_solver);
-    HYPRE_GMRESSetMaxIter(aux_solver, 1);
-    HYPRE_GMRESSetTol(aux_solver, 1e-09);
-    HYPRE_GMRESSetPrintLevel(aux_solver, 0);
-    HYPRE_GMRESSetPrecond(aux_solver,
-                (HYPRE_PtrToSolverFcn)HYPRE_ILUSolve,
-                (HYPRE_PtrToSolverFcn)HYPRE_ILUSetup,
-                 aux_precond);
-
-    HYPRE_BoomerAMGCreate(&aux_precond);
-    HYPRE_BoomerAMGSetPrintLevel(aux_precond, 0);
-    HYPRE_BoomerAMGSetRelaxOrder(aux_precond, 1);
-    HYPRE_BoomerAMGSetMaxIter(aux_precond, 1);
-    HYPRE_BoomerAMGSetNumSweeps(aux_precond, 1);
-    HYPRE_BoomerAMGSetNumFunctions(aux_precond, 3);
-    HYPRE_BoomerAMGSetAggNumLevels(aux_precond, 1);
-
-    HYPRE_ParCSRGMRESCreate(hypre_MPI_COMM_WORLD, &aux_solver);
-    HYPRE_GMRESSetMaxIter(aux_solver, 10);
-    HYPRE_GMRESSetPrecond(aux_solver,
-                (HYPRE_PtrToSolverFcn)HYPRE_BoomerAMGSolve,
-                (HYPRE_PtrToSolverFcn)HYPRE_BoomerAMGSetup,
-                 aux_precond);
-    */
-
-    /* use MGR preconditioning */
-    if (myid == 0) hypre_printf("Solver:  MGR-FlexGMRES\n");
-
-    HYPRE_MGRCreate(&pcg_precond);
-
-    /* set MGR data by block */
-    if (use_block_cf)
-    {
-      HYPRE_MGRSetCpointsByContiguousBlock( pcg_precond, mgr_bsize, mgr_nlevels, mgr_idx_array, mgr_num_cindexes, mgr_cindexes);
-    }
-    else if (use_point_marker_array)
-    {
-      HYPRE_MGRSetCpointsByPointMarkerArray( pcg_precond, mgr_bsize, mgr_nlevels, mgr_num_cindexes, mgr_cindexes, mgr_point_marker_array);
-    }
-    else
-    {
-      HYPRE_MGRSetCpointsByBlock( pcg_precond, mgr_bsize, mgr_nlevels, mgr_num_cindexes,mgr_cindexes);
-    }
-    /* set reserved coarse nodes */
-    if (mgr_num_reserved_nodes) HYPRE_MGRSetReservedCoarseNodes(pcg_precond, mgr_num_reserved_nodes, mgr_reserved_coarse_indexes);
-
-    /* set intermediate coarse grid strategy */
-    HYPRE_MGRSetNonCpointsToFpoints(pcg_precond, mgr_non_c_to_f);
-    /* set F relaxation strategy */
-    HYPRE_MGRSetLevelFRelaxMethod(pcg_precond, mgr_level_frelax_method);
-    /* set F relaxation number of functions*/
-    //HYPRE_MGRSetLevelFRelaxNumFunctions(pcg_precond, mgr_frelax_num_functions);
-    /* set relax type for single level F-relaxation and post-relaxation */
-    HYPRE_MGRSetRelaxType(pcg_precond, mgr_relax_type);
-    HYPRE_MGRSetNumRelaxSweeps(pcg_precond, mgr_num_relax_sweeps);
-    /* set restrict type */
-    //HYPRE_MGRSetRestrictType(pcg_precond, mgr_restrict_type);
-    HYPRE_MGRSetLevelRestrictType(pcg_precond, mgr_level_restrict_type);
-    HYPRE_MGRSetNumRestrictSweeps(pcg_precond, mgr_num_restrict_sweeps);
-    /* set interpolation type */
-    //HYPRE_MGRSetInterpType(pcg_precond, mgr_interp_type);
-    HYPRE_MGRSetLevelInterpType(pcg_precond, mgr_level_interp_type);
-    HYPRE_MGRSetNumInterpSweeps(pcg_precond, mgr_num_interp_sweeps);
-    /* set P_max_elmts for coarse grid */
-    HYPRE_MGRSetPMaxElmts(pcg_precond, P_max_elmts);
-    /* set print level */
-    HYPRE_MGRSetPrintLevel(pcg_precond, poutdat);
-    /* set max iterations */
-    HYPRE_MGRSetMaxIter(pcg_precond, pc_max_iter);
-    HYPRE_MGRSetTol(pcg_precond, pc_tol);
-    HYPRE_MGRSetCoarseGridMethod(pcg_precond, mgr_coarse_grid_method);
-    HYPRE_MGRSetReservedCpointsLevelToKeep(pcg_precond, 0);
-
-    HYPRE_MGRSetGlobalsmoothType(pcg_precond, mgr_gsmooth_type);
-    HYPRE_MGRSetMaxGlobalsmoothIters( pcg_precond, mgr_num_gsmooth_sweeps );
-    if (print_system) hypre_MGRPrintCoarseSystem( pcg_precond, 1 );
-
-    /* create AMG coarse grid solver */
-
-    /*
-    HYPRE_BoomerAMGCreate(&amg_solver);
-    HYPRE_BoomerAMGSetRelaxOrder(amg_solver, 1);
-    HYPRE_BoomerAMGSetMaxIter(amg_solver, 1);
-    HYPRE_BoomerAMGSetNumFunctions(amg_solver, 1);
-    //HYPRE_BoomerAMGSetMaxLevels(amg_solver, 1);
-    //HYPRE_BoomerAMGSetRelaxType(amg_solver, 3);
-    HYPRE_BoomerAMGSetNumSweeps(amg_solver, 3);
-    //HYPRE_BoomerAMGSetMaxCoarseSize(amg_solver, 104);
-    HYPRE_BoomerAMGSetSmoothType(amg_solver, 9);
-    HYPRE_BoomerAMGSetEuLevel(amg_solver, 5);
-    HYPRE_BoomerAMGSetSmoothNumLevels(amg_solver, 4);
-    HYPRE_BoomerAMGSetSmoothNumSweeps(amg_solver, 1);
-    */
-
-    /* set the MGR coarse solver. Comment out to use default CG solver in MGR */
-    //HYPRE_MGRSetCoarseSolver( pcg_precond, HYPRE_BoomerAMGSolve, HYPRE_BoomerAMGSetup, amg_solver);
-    //HYPRE_MGRSetCoarseSolver( pcg_precond, (HYPRE_PtrToParSolverFcn)HYPRE_GMRESSolve, (HYPRE_PtrToParSolverFcn)HYPRE_GMRESSetup, aux_solver);
-    //HYPRE_MGRSetCoarseSolver( pcg_precond, (HYPRE_PtrToParSolverFcn)HYPRE_ILUSolve, (HYPRE_PtrToParSolverFcn)HYPRE_ILUSetup, aux_precond);
-#ifdef HYPRE_USING_DSUPERLU
-    HYPRE_MGRDirectSolverCreate(&aux_solver);
-    HYPRE_MGRSetCoarseSolver( pcg_precond, (HYPRE_PtrToParSolverFcn)HYPRE_MGRDirectSolverSolve, (HYPRE_PtrToParSolverFcn)HYPRE_MGRDirectSolverSetup, aux_solver);
-#endif
-
-    // set fine grid solver
-    //HYPRE_MGRSetFSolver(pcg_precond, (HYPRE_PtrToParSolverFcn)HYPRE_BoomerAMGSolve, (HYPRE_PtrToParSolverFcn)HYPRE_BoomerAMGSetup, aux_precond);
-
-    /* setup MGR-PCG solver */
-    HYPRE_FlexGMRESSetPrecond(pcg_solver,
-        (HYPRE_PtrToSolverFcn) HYPRE_MGRSolve,
-        (HYPRE_PtrToSolverFcn) HYPRE_MGRSetup,
-                      pcg_precond);
-
-
-    HYPRE_FlexGMRESGetPrecond(pcg_solver, &pcg_precond_gotten);
-    if (pcg_precond_gotten != pcg_precond)
-    {
-      hypre_printf("HYPRE_FlexGMRESGetPrecond got bad precond\n");
-      return(-1);
-    }
-    else
-      if (myid == 0)
-        hypre_printf("HYPRE_FlexGMRESGetPrecond got good precond\n");
-
-
-    HYPRE_FlexGMRESSetup
-      (pcg_solver, (HYPRE_Matrix)parcsr_M, (HYPRE_Vector)b, (HYPRE_Vector)x);
-
-    hypre_EndTiming(time_index);
-    hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
-    hypre_FinalizeTiming(time_index);
-    hypre_ClearTiming();
-
-    time_index = hypre_InitializeTiming("FlexGMRES Solve");
-    hypre_BeginTiming(time_index);
-
-    hypre_ParVectorSetConstantValues(x, 0.0);
-    HYPRE_FlexGMRESSolve
-      (pcg_solver, (HYPRE_Matrix)parcsr_A, (HYPRE_Vector)b, (HYPRE_Vector)x);
-
-    hypre_EndTiming(time_index);
-    hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
-    hypre_FinalizeTiming(time_index);
-    hypre_ClearTiming();
-
-    if (print_system)
-    {
-      hypre_ParVectorPrintIJ((HYPRE_Vector)x, 1, "x.out");
-    }
-
-    HYPRE_FlexGMRESGetNumIterations(pcg_solver, &num_iterations);
-    HYPRE_FlexGMRESGetFinalRelativeResidualNorm(pcg_solver,&final_res_norm);
-
-    // free memory for flex FlexGMRES
-    if (pcg_solver) HYPRE_ParCSRFlexGMRESDestroy(pcg_solver);
-    if (pcg_precond) HYPRE_MGRDestroy(pcg_precond);
-    if (amg_solver) HYPRE_BoomerAMGDestroy(amg_solver);
-#ifdef HYPRE_USING_DSUPERLU
-    if (aux_solver) HYPRE_MGRDirectSolverDestroy(aux_solver);
-#endif
-
-    // Print out solver summary
-    if (myid == 0)
-    {
-      hypre_printf("\n");
-      hypre_printf("FlexGMRES Iterations = %d\n", num_iterations);
-      hypre_printf("Final FlexGMRES Relative Residual Norm = %e\n", final_res_norm);
-      hypre_printf("\n");
-    }
-  }
-  else if (solver_id == 73)
-  {
-    HYPRE_Solver mgr_solver_flow;
-
-    // setup A_ff block
-    hypre_ParCSRMatrix *A_ff = NULL;
-    hypre_ParVector *F_vector = NULL;
-    hypre_ParVector *U_vector = NULL;
-    HYPRE_Solver aff_solver;
-    HYPRE_Int nloc = hypre_CSRMatrixNumRows(hypre_ParCSRMatrixDiag(parcsr_A));
-    HYPRE_Int *CF_marker = hypre_CTAlloc(HYPRE_Int, nloc, HYPRE_MEMORY_HOST);
-    HYPRE_Int i;
-    for (i = 0; i < nloc; i++)
-    {
-      if (i < (mgr_idx_array[1] - mgr_idx_array[0]))
-      {
-        CF_marker[i] = -1;
-      }
-      else
-      {
-        CF_marker[i] = 1;
-      }
-    }
-    HYPRE_MGRBuildAff(parcsr_A, CF_marker, 0, &A_ff);
-    hypre_TFree(CF_marker, HYPRE_MEMORY_HOST);
-    //time_index = hypre_InitializeTiming("Compute A_ff_inv");
-    //hypre_BeginTiming(time_index);
-    //hypre_ParCSRMatrix *A_ff_inv = NULL;
-    //hypre_MGRApproximateInverse(A_ff, &A_ff_inv);
-    //hypre_EndTiming(time_index);
-    //hypre_PrintTiming("Compute A_ff_inv times", hypre_MPI_COMM_WORLD);
-    hypre_FinalizeTiming(time_index);
-    hypre_ClearTiming();
-
-    time_index = hypre_InitializeTiming("AMG setup for UU block");
-    hypre_BeginTiming(time_index);
-    HYPRE_BoomerAMGCreate(&aff_solver);
-    HYPRE_BoomerAMGSetPrintLevel(aff_solver, 0);
-    HYPRE_BoomerAMGSetRelaxOrder(aff_solver, 1);
-    HYPRE_BoomerAMGSetMaxIter(aff_solver, 1);
-    HYPRE_BoomerAMGSetNumFunctions(aff_solver, 3);
-    HYPRE_BoomerAMGSetAggNumLevels(aff_solver, 1);
-
-    // setup
-    HYPRE_BoomerAMGSetup(aff_solver, A_ff, F_vector, U_vector);
-
-    hypre_EndTiming(time_index);
-    hypre_PrintTiming("Setup A_uu times", hypre_MPI_COMM_WORLD);
-    hypre_FinalizeTiming(time_index);
-    hypre_ClearTiming();
-
-    time_index = hypre_InitializeTiming("FlexGMRES Setup");
-    hypre_BeginTiming(time_index);
-
-    HYPRE_ParCSRFlexGMRESCreate(hypre_MPI_COMM_WORLD, &pcg_solver);
-    HYPRE_FlexGMRESSetKDim(pcg_solver, k_dim);
-    HYPRE_FlexGMRESSetMaxIter(pcg_solver, max_iter);
-    HYPRE_FlexGMRESSetTol(pcg_solver, tol);
-    HYPRE_FlexGMRESSetAbsoluteTol(pcg_solver, atol);
-    HYPRE_FlexGMRESSetLogging(pcg_solver, 1);
-    HYPRE_FlexGMRESSetPrintLevel(pcg_solver, 2);
-
-    /* use MGR preconditioning */
-    if (myid == 0) hypre_printf("Solver:  MGR-FlexGMRES\n");
-
-    HYPRE_MGRCreate(&pcg_precond);
-
-    // MGR parameters for special case
-    mgr_bsize = 2;
-    mgr_nlevels = 1;
-    mgr_num_reserved_nodes = 0;
-    mgr_non_c_to_f = 1;
-    mgr_frelax_method = 99;
-    //mgr_idx_array = NULL;
-    hypre_TFree(mgr_num_cindexes, HYPRE_MEMORY_HOST);
-    mgr_num_cindexes = NULL;
-    hypre_TFree(mgr_cindexes, HYPRE_MEMORY_HOST);
-    mgr_cindexes = NULL;
-    mgr_reserved_coarse_indexes = NULL;
-    mgr_relax_type = 0;
-    mgr_num_relax_sweeps = 1;
-    mgr_num_interp_sweeps = 0;
-    mgr_gsmooth_type = 0;
-    mgr_num_gsmooth_sweeps = 0;
-    mgr_restrict_type = 0;
-    mgr_num_restrict_sweeps = 0;
-    mgr_interp_type = 2;
-
-    mgr_cindexes = hypre_CTAlloc(HYPRE_Int*, mgr_nlevels, HYPRE_MEMORY_HOST);
-    hypre_TFree(lv1, HYPRE_MEMORY_HOST);
-    lv1 = hypre_CTAlloc(HYPRE_Int, mgr_bsize, HYPRE_MEMORY_HOST);
-    lv1[0] = 1;
-    mgr_cindexes[0] = lv1;
-
-    mgr_num_cindexes = hypre_CTAlloc(HYPRE_Int, mgr_nlevels, HYPRE_MEMORY_HOST);
-    mgr_num_cindexes[0] = 1;
-
-    hypre_TFree(mgr_coarse_grid_method, HYPRE_MEMORY_HOST);
-    mgr_coarse_grid_method = hypre_CTAlloc(HYPRE_Int, mgr_nlevels, HYPRE_MEMORY_HOST);
-    mgr_coarse_grid_method[0] = 1;
-
-    //hypre_TFree(mgr_idx_array, HYPRE_MEMORY_HOST);
-    HYPRE_Int *mgr_outer_idx_array = hypre_CTAlloc(HYPRE_Int, mgr_bsize, HYPRE_MEMORY_HOST);
-    HYPRE_Int ilower = hypre_ParCSRMatrixFirstRowIndex(parcsr_A);
-    mgr_outer_idx_array[0] = ilower;
-    for (i = 0; i < mgr_bsize; i++)
-    {
-      mgr_outer_idx_array[i] = mgr_idx_array[i];
-    }
-    use_block_cf = 1;
-
-    /* set MGR data by block */
-    if (use_block_cf) {
-       HYPRE_MGRSetCpointsByContiguousBlock( pcg_precond, mgr_bsize, mgr_nlevels, mgr_outer_idx_array, mgr_num_cindexes, mgr_cindexes);
-    } else {
-       HYPRE_MGRSetCpointsByBlock( pcg_precond, mgr_bsize, mgr_nlevels, mgr_num_cindexes,mgr_cindexes);
-    }
-    /* set reserved coarse nodes */
-    if(mgr_num_reserved_nodes)HYPRE_MGRSetReservedCoarseNodes(pcg_precond, mgr_num_reserved_nodes, mgr_reserved_coarse_indexes);
-
-    /* set intermediate coarse grid strategy */
-    HYPRE_MGRSetNonCpointsToFpoints(pcg_precond, mgr_non_c_to_f);
-    /* set F relaxation strategy */
-    HYPRE_MGRSetFRelaxMethod(pcg_precond, mgr_frelax_method);
-    /* set F relaxation number of functions*/
-    //HYPRE_MGRSetLevelFRelaxNumFunctions(pcg_precond, mgr_frelax_num_functions);
-    /* set relax type for single level F-relaxation and post-relaxation */
-    HYPRE_MGRSetRelaxType(pcg_precond, mgr_relax_type);
-    HYPRE_MGRSetNumRelaxSweeps(pcg_precond, mgr_num_relax_sweeps);
-    /* set restrict type */
-    HYPRE_MGRSetRestrictType(pcg_precond, mgr_restrict_type);
-    HYPRE_MGRSetNumRestrictSweeps(pcg_precond, mgr_num_restrict_sweeps);
-    /* set interpolation type */
-    HYPRE_MGRSetInterpType(pcg_precond, mgr_interp_type);
-    HYPRE_MGRSetNumInterpSweeps(pcg_precond, mgr_num_interp_sweeps);
-    /* set P_max_elmts for coarse grid */
-    HYPRE_MGRSetPMaxElmts(pcg_precond, P_max_elmts);
-    /* set print level */
-    HYPRE_MGRSetPrintLevel(pcg_precond, 0);
-    /* set max iterations */
-    HYPRE_MGRSetMaxIter(pcg_precond, pc_max_iter);
-    HYPRE_MGRSetTol(pcg_precond, pc_tol);
-    HYPRE_MGRSetCoarseGridMethod(pcg_precond, mgr_coarse_grid_method);
-
-    HYPRE_MGRSetGlobalsmoothType(pcg_precond, mgr_gsmooth_type);
-    HYPRE_MGRSetMaxGlobalsmoothIters( pcg_precond, mgr_num_gsmooth_sweeps );
-    if (print_system) hypre_MGRPrintCoarseSystem( pcg_precond, 1 );
-
-    // set fine grid solver, already setup above
-    //HYPRE_MGRSetFSolver(pcg_precond, HYPRE_BoomerAMGSolve, HYPRE_BoomerAMGSetup, aff_solver);
-
-    // Set the A_ff_inv for constructing P
-    //hypre_MGRSetAffInv(pcg_precond, A_ff_inv);
-
-    /* create MGR coarse grid solver */
-    HYPRE_Solver gmres_flow;
-    HYPRE_ParCSRGMRESCreate(hypre_MPI_COMM_WORLD, &gmres_flow);
-    HYPRE_GMRESSetKDim(gmres_flow, 100);
-    HYPRE_GMRESSetMaxIter(gmres_flow, 100);
-    HYPRE_GMRESSetTol(gmres_flow, 1e-6);
-    HYPRE_GMRESSetAbsoluteTol(gmres_flow, 1e-12);
-    HYPRE_GMRESSetLogging(gmres_flow, 1);
-    HYPRE_GMRESSetPrintLevel(gmres_flow, 2);
-
-    HYPRE_MGRCreate(&mgr_solver_flow);
-
-    mgr_gsmooth_type = 16;
-    mgr_num_gsmooth_sweeps = 1;
-    mgr_frelax_method = 0;
-    mgr_num_relax_sweeps = 1;
-    mgr_interp_type = 2;
-    use_block_cf = 0;
-    mgr_non_c_to_f = 0;
-
-    HYPRE_Int flow_size = 2*(mgr_idx_array[2] - mgr_idx_array[1]);
-    HYPRE_Int *flow_size_array = hypre_CTAlloc(HYPRE_Int, num_procs, HYPRE_MEMORY_HOST);
-    hypre_MPI_Allgather(&flow_size, 1, HYPRE_MPI_INT, flow_size_array, 1, HYPRE_MPI_INT, hypre_MPI_COMM_WORLD);
-    HYPRE_Int flow_ibegin = 0;
-    for (HYPRE_Int i = 0; i < myid; i++)
-    {
-      //printf("My_id = %d, flow size = %d\n", myid, *(flow_size_array+i));
-      flow_ibegin += flow_size_array[i];
-    }
-    HYPRE_Int *mgr_flow_idx_array = hypre_CTAlloc(HYPRE_Int, 2, HYPRE_MEMORY_HOST);
-    mgr_flow_idx_array[0] = flow_ibegin;
-    mgr_flow_idx_array[1] = flow_ibegin + flow_size_array[myid]/2;
-
-    /* set MGR data by block */
-    if (use_block_cf) {
-       HYPRE_MGRSetCpointsByContiguousBlock( mgr_solver_flow, mgr_bsize, mgr_nlevels, mgr_flow_idx_array, mgr_num_cindexes, mgr_cindexes);
-    } else {
-       HYPRE_MGRSetCpointsByBlock( mgr_solver_flow, mgr_bsize, mgr_nlevels, mgr_num_cindexes,mgr_cindexes);
-    }
-    /* set reserved coarse nodes */
-    if(mgr_num_reserved_nodes)HYPRE_MGRSetReservedCoarseNodes(mgr_solver_flow, mgr_num_reserved_nodes, mgr_reserved_coarse_indexes);
-
-    /* set intermediate coarse grid strategy */
-    HYPRE_MGRSetNonCpointsToFpoints(mgr_solver_flow, mgr_non_c_to_f);
-    /* set F relaxation strategy */
-    HYPRE_MGRSetFRelaxMethod(mgr_solver_flow, mgr_frelax_method);
-    /* set F relaxation number of functions*/
-    //HYPRE_MGRSetLevelFRelaxNumFunctions(mgr_solver_flow, mgr_frelax_num_functions);
-    /* set relax type for single level F-relaxation and post-relaxation */
-    HYPRE_MGRSetRelaxType(mgr_solver_flow, mgr_relax_type);
-    HYPRE_MGRSetNumRelaxSweeps(mgr_solver_flow, mgr_num_relax_sweeps);
-    /* set restrict type */
-    HYPRE_MGRSetRestrictType(mgr_solver_flow, mgr_restrict_type);
-    HYPRE_MGRSetNumRestrictSweeps(mgr_solver_flow, mgr_num_restrict_sweeps);
-    /* set interpolation type */
-    HYPRE_MGRSetInterpType(mgr_solver_flow, mgr_interp_type);
-    HYPRE_MGRSetNumInterpSweeps(mgr_solver_flow, mgr_num_interp_sweeps);
-    /* set P_max_elmts for coarse grid */
-    HYPRE_MGRSetPMaxElmts(mgr_solver_flow, P_max_elmts);
-    /* set print level */
-    HYPRE_MGRSetPrintLevel(mgr_solver_flow, 1);
-    /* set max iterations */
-    HYPRE_MGRSetMaxIter(mgr_solver_flow, pc_max_iter);
-    HYPRE_MGRSetTol(mgr_solver_flow, pc_tol);
-    /* set coarse grid method, non-Galerkin will keep the stencil for interleaved ordering */
-    //HYPRE_MGRSetCoarseGridMethod(mgr_solver_flow, mgr_coarse_grid_method);
-
-    HYPRE_MGRSetGlobalsmoothType(mgr_solver_flow, mgr_gsmooth_type);
-    HYPRE_MGRSetMaxGlobalsmoothIters( mgr_solver_flow, mgr_num_gsmooth_sweeps );
-    hypre_MGRPrintCoarseSystem( mgr_solver_flow, 0 );
-
-    HYPRE_BoomerAMGCreate(&amg_solver);
-    // BM Aug 25, 2006
-    HYPRE_BoomerAMGSetPrintLevel(amg_solver, 0);
-    HYPRE_BoomerAMGSetRelaxOrder(amg_solver, 1);
-    HYPRE_BoomerAMGSetMaxIter(amg_solver, 1);
-    //HYPRE_BoomerAMGSetSmoothType(amg_solver, 9);
-    //HYPRE_BoomerAMGSetEuLevel(amg_solver, 1);
-    //HYPRE_BoomerAMGSetSmoothNumLevels(amg_solver, 1);
-    //HYPRE_BoomerAMGSetSmoothNumSweeps(amg_solver, 1);
-
-    // set the MGR coarse solver. Comment out to use default CG solver in MGR
-    HYPRE_MGRSetCoarseSolver( mgr_solver_flow, HYPRE_BoomerAMGSolve, HYPRE_BoomerAMGSetup, amg_solver);
-
-    HYPRE_GMRESSetPrecond(gmres_flow,
-        (HYPRE_PtrToSolverFcn) HYPRE_MGRSolve,
-        (HYPRE_PtrToSolverFcn) HYPRE_MGRSetup,
-                      mgr_solver_flow);
-
-    /* set the MGR coarse solver. Comment out to use default CG solver in MGR */
-    //HYPRE_MGRSetCoarseSolver( pcg_precond, (HYPRE_PtrToParSolverFcn)HYPRE_GMRESSolve, (HYPRE_PtrToParSolverFcn)HYPRE_GMRESSetup, gmres_flow);
-    HYPRE_MGRSetCoarseSolver( pcg_precond, (HYPRE_PtrToParSolverFcn)HYPRE_MGRSolve, (HYPRE_PtrToParSolverFcn)HYPRE_MGRSetup, mgr_solver_flow);
-
-    /* setup MGR-PCG solver */
-    HYPRE_FlexGMRESSetMaxIter(pcg_solver, max_iter);
-    HYPRE_FlexGMRESSetPrecond(pcg_solver,
-        (HYPRE_PtrToSolverFcn) HYPRE_MGRSolve,
-        (HYPRE_PtrToSolverFcn) HYPRE_MGRSetup,
-                      pcg_precond);
-
-
-    HYPRE_FlexGMRESGetPrecond(pcg_solver, &pcg_precond_gotten);
-    if (pcg_precond_gotten != pcg_precond)
-    {
-      hypre_printf("HYPRE_FlexGMRESGetPrecond got bad precond\n");
-      return(-1);
-    }
-    else
-      if (myid == 0)
-        hypre_printf("HYPRE_FlexGMRESGetPrecond got good precond\n");
-
-
-    HYPRE_FlexGMRESSetup
-      (pcg_solver, (HYPRE_Matrix)parcsr_A, (HYPRE_Vector)b, (HYPRE_Vector)x);
-
-    hypre_EndTiming(time_index);
-    hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
-    hypre_FinalizeTiming(time_index);
-    hypre_ClearTiming();
-
-    time_index = hypre_InitializeTiming("FlexGMRES Solve");
-    hypre_BeginTiming(time_index);
-
-    HYPRE_FlexGMRESSolve
-      (pcg_solver, (HYPRE_Matrix)parcsr_A, (HYPRE_Vector)b, (HYPRE_Vector)x);
-
-    hypre_EndTiming(time_index);
-    hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
-    hypre_FinalizeTiming(time_index);
-    hypre_ClearTiming();
-
-    if (print_system)
-    {
-      hypre_ParVectorPrintIJ(x, 1, "x.out");
-    }
-
-    HYPRE_FlexGMRESGetNumIterations(pcg_solver, &num_iterations);
-    HYPRE_FlexGMRESGetFinalRelativeResidualNorm(pcg_solver,&final_res_norm);
-    //HYPRE_FlexGMRESGetPrecondLogData(pcg_solver, &cg_conv_factor);
-    //hypre_printf("Average coarse grid convergence factor: %1.6f\n", cg_conv_factor);
-
-    // free memory for flex FlexGMRES
-    HYPRE_ParCSRFlexGMRESDestroy(pcg_solver);
-
-    /* free memory for MGR */
-    /*
-    if(mgr_num_cindexes)
-      hypre_TFree(mgr_num_cindexes, HYPRE_MEMORY_HOST);
-    mgr_num_cindexes = NULL;
-
-    if(mgr_reserved_coarse_indexes)
-      hypre_TFree(mgr_reserved_coarse_indexes, HYPRE_MEMORY_HOST);
-    mgr_reserved_coarse_indexes = NULL;
-
-    if(mgr_cindexes)
-    {
-      for( i=0; i<mgr_nlevels; i++)
-      {
-      if(mgr_cindexes[i])
-        hypre_TFree(mgr_cindexes[i], HYPRE_MEMORY_HOST);
-      }
-      hypre_TFree(mgr_cindexes, HYPRE_MEMORY_HOST);
-      mgr_cindexes = NULL;
-    }
-    */
-    HYPRE_BoomerAMGDestroy(aff_solver);
-    HYPRE_BoomerAMGDestroy(amg_solver);
-    HYPRE_MGRDestroy(mgr_solver_flow);
-    HYPRE_MGRDestroy(pcg_precond);
-    HYPRE_ParCSRGMRESDestroy(gmres_flow);
-    HYPRE_ParCSRMatrixDestroy(A_ff);
-
-    // Print out solver summary
-    if (myid == 0)
-    {
-      hypre_printf("\n");
-      hypre_printf("FlexGMRES Iterations = %d\n", num_iterations);
-      hypre_printf("Final FlexGMRES Relative Residual Norm = %e\n", final_res_norm);
-      hypre_printf("\n");
-    }
-    hypre_TFree(mgr_outer_idx_array, HYPRE_MEMORY_HOST);
-    hypre_TFree(mgr_flow_idx_array, HYPRE_MEMORY_HOST);
-    hypre_TFree(flow_size_array, HYPRE_MEMORY_HOST);
-  }
-  else if (solver_id == 70)
-  {
-    if (myid == 0) hypre_printf("Solver:  MGR\n");
-    time_index = hypre_InitializeTiming("MGR Setup");
-    hypre_BeginTiming(time_index);
-
-    HYPRE_Solver mgr_solver;
-    HYPRE_MGRCreate(&mgr_solver);
-
-    /* set MGR data by block */
-    if (use_block_cf) {
-       HYPRE_MGRSetCpointsByContiguousBlock( pcg_precond, mgr_bsize, mgr_nlevels, mgr_idx_array, mgr_num_cindexes, mgr_cindexes);
-    } else {
-       HYPRE_MGRSetCpointsByBlock( pcg_precond, mgr_bsize, mgr_nlevels, mgr_num_cindexes,mgr_cindexes);
-    }
-
-    /* set reserved coarse nodes */
-    if(mgr_num_reserved_nodes)HYPRE_MGRSetReservedCoarseNodes(mgr_solver, mgr_num_reserved_nodes, mgr_reserved_coarse_indexes);
-
-    /* set intermediate coarse grid strategy */
-    HYPRE_MGRSetNonCpointsToFpoints(mgr_solver, mgr_non_c_to_f);
-    /* set F relaxation strategy */
-    HYPRE_MGRSetFRelaxMethod(mgr_solver, mgr_frelax_method);
-    /* set relax type for single level F-relaxation and post-relaxation */
-    HYPRE_MGRSetRelaxType(mgr_solver, mgr_relax_type);
-    HYPRE_MGRSetNumRelaxSweeps(mgr_solver, mgr_num_relax_sweeps);
-    /* set interpolation type */
-    HYPRE_MGRSetRestrictType(mgr_solver, mgr_restrict_type);
-    HYPRE_MGRSetNumRestrictSweeps(mgr_solver, mgr_num_restrict_sweeps);
-    HYPRE_MGRSetInterpType(mgr_solver, mgr_interp_type);
-    HYPRE_MGRSetNumInterpSweeps(mgr_solver, mgr_num_interp_sweeps);
-    /* set print level */
-    HYPRE_MGRSetPrintLevel(mgr_solver, poutdat);
-    /* set max iterations */
-    HYPRE_MGRSetMaxIter(mgr_solver, pc_max_iter);
-    HYPRE_MGRSetTol(mgr_solver, pc_tol);
-
-    HYPRE_MGRSetGlobalsmoothType(mgr_solver, mgr_gsmooth_type);
-    HYPRE_MGRSetMaxGlobalsmoothIters( mgr_solver, mgr_num_gsmooth_sweeps );
-
-    /* create AMG coarse grid solver */
-
-    HYPRE_BoomerAMGCreate(&amg_solver);
-    HYPRE_BoomerAMGSetPrintLevel(amg_solver, 2);
-    HYPRE_BoomerAMGSetRelaxOrder(amg_solver, 1);
-    HYPRE_BoomerAMGSetMaxIter(amg_solver, 1);
-    /*
-    HYPRE_BoomerAMGSetSmoothType(amg_solver, 5);
-    HYPRE_BoomerAMGSetEuLevel(amg_solver, 1);
-    HYPRE_BoomerAMGSetSmoothNumLevels(amg_solver, 1);
-    HYPRE_BoomerAMGSetSmoothNumSweeps(amg_solver, 1);
-    */
-
-    /* set the MGR coarse solver. Comment out to use default CG solver in MGR */
-    HYPRE_MGRSetCoarseSolver( mgr_solver, HYPRE_BoomerAMGSolve, HYPRE_BoomerAMGSetup, amg_solver);
-
-    /* setup MGR solver */
-    HYPRE_MGRSetup(mgr_solver, parcsr_A, b, x);
-
-    hypre_EndTiming(time_index);
-    hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
-    hypre_FinalizeTiming(time_index);
-    hypre_ClearTiming();
-
-    time_index = hypre_InitializeTiming("MGR Solve");
-    hypre_BeginTiming(time_index);
-
-    /* MGR solve */
-    HYPRE_MGRSolve(mgr_solver, parcsr_A, b, x);
-
-    hypre_EndTiming(time_index);
-    hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
-    hypre_FinalizeTiming(time_index);
-    hypre_ClearTiming();
-
-    HYPRE_MGRGetNumIterations(mgr_solver, &num_iterations);
-    HYPRE_MGRGetFinalRelativeResidualNorm(mgr_solver, &final_res_norm);
-
-    if (myid == 0)
-    {
-      hypre_printf("\n");
-      hypre_printf("MGR Iterations = %d\n", num_iterations);
-      hypre_printf("Final Relative Residual Norm = %e\n", final_res_norm);
-      hypre_printf("\n");
-    }
-
-#if SECOND_TIME
-    /* run a second time to check for memory leaks */
-    HYPRE_ParVectorSetRandomValues(x, 775);
-    HYPRE_MGRSetup(mgr_solver, parcsr_A, b, x);
-    HYPRE_MGRSolve(mgr_solver, parcsr_A, b, x);
-#endif
-
-    /* free memory */
-    if(mgr_num_cindexes)
-      hypre_TFree(mgr_num_cindexes, HYPRE_MEMORY_HOST);
-    mgr_num_cindexes = NULL;
-
-    if(mgr_reserved_coarse_indexes)
-      hypre_TFree(mgr_reserved_coarse_indexes, HYPRE_MEMORY_HOST);
-    mgr_reserved_coarse_indexes = NULL;
-
-    if(mgr_cindexes)
-    {
-      for( i=0; i<mgr_nlevels; i++)
-      {
-        if(mgr_cindexes[i])
-          hypre_TFree(mgr_cindexes[i], HYPRE_MEMORY_HOST);
-      }
-      hypre_TFree(mgr_cindexes, HYPRE_MEMORY_HOST);
-      mgr_cindexes = NULL;
-    }
-
-    HYPRE_BoomerAMGDestroy(amg_solver);
-    HYPRE_MGRDestroy(mgr_solver);
-  }
-  else if (solver_id == 99)
-  {
-    ierr = HYPRE_ILUCreate(&aux_precond);
-    HYPRE_ILUSetType(aux_precond, 30);
-    HYPRE_ILUSetLevelOfFill(aux_precond, 0);
-    HYPRE_ILUSetMaxIter(aux_precond, 1);
-
-    HYPRE_ParCSRGMRESCreate(hypre_MPI_COMM_WORLD, &pcg_solver);
-    HYPRE_GMRESSetKDim(pcg_solver, k_dim);
-    HYPRE_GMRESSetMaxIter(pcg_solver, max_iter);
-    HYPRE_GMRESSetTol(pcg_solver, tol);
-    HYPRE_GMRESSetAbsoluteTol(pcg_solver, atol);
-    HYPRE_GMRESSetLogging(pcg_solver, 1);
-    HYPRE_GMRESSetPrintLevel(pcg_solver, 2);
-
-    HYPRE_GMRESSetPrecond(pcg_solver,
-        (HYPRE_PtrToSolverFcn) HYPRE_ILUSolve,
-        (HYPRE_PtrToSolverFcn) HYPRE_ILUSetup,
-                      aux_precond);
-
-
-    HYPRE_GMRESGetPrecond(pcg_solver, &pcg_precond_gotten);
-    if (pcg_precond_gotten != aux_precond)
-    {
-      hypre_printf("HYPRE_GMRESGetPrecond got bad precond\n");
-      return(-1);
-    }
-    else
-      if (myid == 0)
-        hypre_printf("HYPRE_GMRESGetPrecond got good precond\n");
-
-
-    HYPRE_GMRESSetup
-      (pcg_solver, (HYPRE_Matrix)parcsr_M, (HYPRE_Vector)b, (HYPRE_Vector)x);
-
-    hypre_EndTiming(time_index);
-    hypre_PrintTiming("Setup phase times", hypre_MPI_COMM_WORLD);
-    hypre_FinalizeTiming(time_index);
-    hypre_ClearTiming();
-
-    time_index = hypre_InitializeTiming("GMRES Solve");
-    hypre_BeginTiming(time_index);
-
-    hypre_ParVectorSetConstantValues(x, 0.0);
-    HYPRE_GMRESSolve
-      (pcg_solver, (HYPRE_Matrix)parcsr_A, (HYPRE_Vector)b, (HYPRE_Vector)x);
-
-    hypre_EndTiming(time_index);
-    hypre_PrintTiming("Solve phase times", hypre_MPI_COMM_WORLD);
-    hypre_FinalizeTiming(time_index);
-    hypre_ClearTiming();
-
-    if (print_system)
-    {
-      hypre_ParVectorPrintIJ((HYPRE_Vector)x, 1, "x.out");
-    }
-
-    HYPRE_GMRESGetNumIterations(pcg_solver, &num_iterations);
-    HYPRE_GMRESGetFinalRelativeResidualNorm(pcg_solver,&final_res_norm);
-
-    // free memory for flex GMRES
-    HYPRE_ParCSRGMRESDestroy(pcg_solver);
-
-    /*
-    HYPRE_ParCSRMatrix A_h;
-    HYPRE_Int nloc = hypre_CSRMatrixNumRows(hypre_ParCSRMatrixDiag(parcsr_A));
-    HYPRE_Int *CF_marker = hypre_CTAlloc(HYPRE_Int, nloc, HYPRE_MEMORY_HOST);
-    HYPRE_Int i;
-    for (i = 0; i < nloc; i++)
-    {
-      if (i < (mgr_idx_array[1] - mgr_idx_array[0]))
-      {
-        CF_marker[i] = -1;
-      }
-      else
-      {
-        CF_marker[i] = 1;
-      }
-    }
-    hypre_MGRComputeNonGalerkinCoarseGrid(parcsr_A, CF_marker, &A_h);
-    hypre_ParCSRMatrixPrintIJ(A_h,1,1,"new_coarse_grid");
-
-    // test adding two matrices with different sparsity patterns
-    hypre_ParCSRMatrixAdd(1.0, parcsr_A, 1.0, parcsr_M, &parcsr_C);
-    hypre_ParCSRMatrixPrintIJ(parcsr_C,0,0,"MatrixSum");
-    */
-
-    /*
-    // test algebraic computation of fixed stress
-    // setup A_ff block
-    hypre_ParCSRMatrix *A_ff;
-    hypre_ParVector *F_vector;
-    hypre_ParVector *U_vector;
-    HYPRE_Solver aff_solver;
-    HYPRE_Int nloc = hypre_CSRMatrixNumRows(hypre_ParCSRMatrixDiag(parcsr_A));
-    HYPRE_Int *CF_marker = hypre_CTAlloc(HYPRE_Int, nloc, HYPRE_MEMORY_HOST);
-    HYPRE_Int i;
-    for (i = 0; i < nloc; i++)
-    {
-      if (i < (mgr_idx_array[1] - mgr_idx_array[0]))
-      {
-        CF_marker[i] = -1;
-      }
-      else
-      {
-        CF_marker[i] = 1;
-      }
-    }
-    HYPRE_MGRBuildAffNew(parcsr_A, CF_marker, 0, &A_ff);
-
-    F_vector = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A_ff),
-                    hypre_ParCSRMatrixGlobalNumRows(A_ff),
-                    hypre_ParCSRMatrixRowStarts(A_ff));
-    hypre_ParVectorInitialize(F_vector);
-
-    U_vector = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(A_ff),
-                    hypre_ParCSRMatrixGlobalNumRows(A_ff),
-                    hypre_ParCSRMatrixRowStarts(A_ff));
-    hypre_ParVectorInitialize(U_vector);
-
-    time_index = hypre_InitializeTiming("AMG for UU block");
-    hypre_BeginTiming(time_index);
-    HYPRE_BoomerAMGCreate(&aff_solver);
-    HYPRE_BoomerAMGSetPrintLevel(aff_solver, 0);
-    //HYPRE_BoomerAMGSetRelaxOrder(aff_solver, 1);
-    HYPRE_BoomerAMGSetMaxIter(aff_solver, 1);
-    HYPRE_BoomerAMGSetNumFunctions(aff_solver, 3);
-    //HYPRE_BoomerAMGSetAggNumLevels(aff_solver, 1);
-
-    // setup
-    HYPRE_BoomerAMGSetup(aff_solver, A_ff, F_vector, U_vector);
-
-    hypre_MGRComputeAlgebraicFixedStress(parcsr_A, mgr_idx_array, aff_solver);
-    */
-
-    /*
-    // test diagonal correction
-    hypre_ParVector *diag;
-    diag = hypre_ParVectorCreate(hypre_ParCSRMatrixComm(parcsr_A),
-                    hypre_ParCSRMatrixGlobalNumRows(parcsr_A),
-                    hypre_ParCSRMatrixRowStarts(parcsr_A));
-    hypre_ParVectorInitialize(diag);
-    hypre_ParVectorSetConstantValues(diag, 1.0);
-
-    hypre_MGRAddDiagonalCorrection(parcsr_A, diag);
-    hypre_ParCSRMatrixPrintIJ(parcsr_A, 1, 1, "test_A");
-    */
-
-    /*
-    // test approximate inverse
-    HYPRE_Int *row_cf_marker;
-    HYPRE_Int *col_cf_marker;
-    HYPRE_Int n_local_rows = hypre_CSRMatrixNumRows(hypre_ParCSRMatrixDiag(parcsr_A));
-    HYPRE_Int ilower =  hypre_ParCSRMatrixFirstRowIndex(parcsr_A);
-    row_cf_marker = hypre_CTAlloc(HYPRE_Int, n_local_rows, HYPRE_MEMORY_HOST);
-    col_cf_marker = hypre_CTAlloc(HYPRE_Int, n_local_rows, HYPRE_MEMORY_HOST);
-    HYPRE_Int begin_idx = mgr_idx_array[mgr_bsize - 1];
-    //hypre_printf("my_id = %d, first_row_index = %d, begin_idx = %d, n_local_rows == %d\n", myid, ilower, begin_idx, n_local_rows);
-    for (i = 0; i < n_local_rows; i++)
-    {
-      if (i < (begin_idx - ilower))
-      {
-        row_cf_marker[i] = 1;
-        col_cf_marker[i] = 1;
-      } else
-      {
-        row_cf_marker[i] = -1;
-        col_cf_marker[i] = -1;
-      }
-    }
-    HYPRE_ParCSRMatrix A_uu;
-    HYPRE_ParCSRMatrix A_uu_inv;
-    HYPRE_ParCSRMatrix A_uf;
-    hypre_MGRGetSubBlock(parcsr_A, row_cf_marker, col_cf_marker, 0, &A_uu);
-    hypre_MGRApproximateInverse(A_uu, &A_uu_inv);
-    hypre_ParCSRMatrixPrintIJ(A_uu_inv, 1, 1, "A_uu_inv");
-    for (i = 0; i < n_local_rows; i++)
-    {
-      if (i < (begin_idx - ilower))
-      {
-        row_cf_marker[i] = 1;
-        col_cf_marker[i] = -1;
-      } else
-      {
-        row_cf_marker[i] = -1;
-        col_cf_marker[i] = 1;
-      }
-    }
-    hypre_MGRGetSubBlock(parcsr_A, row_cf_marker, col_cf_marker, 0, &A_uf);
-    HYPRE_ParCSRMatrix *C;
-    C = hypre_ParMatmul(A_uu_inv, A_uf);
-    hypre_ParCSRMatrixPrintIJ(C,1,1,"Wp");
-    */
-  }
-
-  /*-----------------------------------------------------------
-   * Finalize things
-   *-----------------------------------------------------------*/
-  // free the matrix, the rhs and the initial guess
-  HYPRE_IJMatrixDestroy(ij_A);
-  HYPRE_IJVectorDestroy(ij_b);
-  HYPRE_IJVectorDestroy(ij_x);
-
-  hypre_TFree(mgr_num_cindexes, HYPRE_MEMORY_HOST);
-  hypre_TFree(mgr_level_frelax_method, HYPRE_MEMORY_HOST);
-  hypre_TFree(mgr_frelax_num_functions, HYPRE_MEMORY_HOST);
-  hypre_TFree(mgr_idx_array, HYPRE_MEMORY_HOST);
-  hypre_TFree(mgr_point_marker_array, HYPRE_MEMORY_HOST);
-  hypre_TFree(mgr_coarse_grid_method, HYPRE_MEMORY_HOST);
-  hypre_TFree(lv1, HYPRE_MEMORY_HOST);
-  hypre_TFree(lv2, HYPRE_MEMORY_HOST);
-  hypre_TFree(lv3, HYPRE_MEMORY_HOST);
-  hypre_TFree(mgr_cindexes, HYPRE_MEMORY_HOST);
-  hypre_TFree(mgr_level_interp_type, HYPRE_MEMORY_HOST);
-  hypre_TFree(mgr_level_restrict_type, HYPRE_MEMORY_HOST);
-  if (mgr_num_reserved_nodes > 0) hypre_TFree(mgr_reserved_coarse_indexes, HYPRE_MEMORY_HOST);
-
-  hypre_MPI_Finalize();
-
-  return (0);
-}
diff --git a/external/hypre/src/test/zboxloop.c b/external/hypre/src/test/zboxloop.c
index f506d7f4..b4c697b7 100644
--- a/external/hypre/src/test/zboxloop.c
+++ b/external/hypre/src/test/zboxloop.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -20,8 +20,6 @@
  * Test driver to time new boxloops and compare to the old ones
  *--------------------------------------------------------------------------*/
 
-#define DEVICE_VAR
-
 hypre_int
 main( hypre_int argc,
       char *argv[] )
@@ -39,6 +37,7 @@ main( hypre_int argc,
    //HYPRE_Int         xi1, xi2, xi3, xi4;
    HYPRE_Int         xi1;
    HYPRE_Real       *xp1, *xp2, *xp3, *xp4;
+   HYPRE_Real       *d_xp1, *d_xp2, *d_xp3, *d_xp4;
    hypre_Index       loop_size, start, unit_stride, index;
 
    /*-----------------------------------------------------------
@@ -51,6 +50,12 @@ main( hypre_int argc,
    hypre_MPI_Comm_size(hypre_MPI_COMM_WORLD, &num_procs );
    hypre_MPI_Comm_rank(hypre_MPI_COMM_WORLD, &myid );
 
+   HYPRE_Initialize();
+
+#if defined(HYPRE_USING_KOKKOS)
+   Kokkos::initialize (argc, argv);
+#endif
+
    /*-----------------------------------------------------------
     * Set defaults
     *-----------------------------------------------------------*/
@@ -65,6 +70,8 @@ main( hypre_int argc,
    Q  = 1;
    R  = 1;
 
+   reps = -1;
+
    /*-----------------------------------------------------------
     * Parse command line
     *-----------------------------------------------------------*/
@@ -92,6 +99,11 @@ main( hypre_int argc,
          arg_index++;
          dim = atoi(argv[arg_index++]);
       }
+      else if ( strcmp(argv[arg_index], "-reps") == 0 )
+      {
+         arg_index++;
+         reps = atoi(argv[arg_index++]);
+      }
       else if ( strcmp(argv[arg_index], "-help") == 0 )
       {
          print_usage = 1;
@@ -127,7 +139,7 @@ main( hypre_int argc,
     * Check a few things
     *-----------------------------------------------------------*/
 
-   if ((P*Q*R) > num_procs)
+   if ((P * Q * R) > num_procs)
    {
       if (myid == 0)
       {
@@ -135,7 +147,7 @@ main( hypre_int argc,
       }
       exit(1);
    }
-   else if ((P*Q*R) < num_procs)
+   else if ((P * Q * R) < num_procs)
    {
       if (myid == 0)
       {
@@ -156,18 +168,26 @@ main( hypre_int argc,
    x3_data_box = hypre_BoxCreate(dim);
    x4_data_box = hypre_BoxCreate(dim);
    hypre_SetIndex3(hypre_BoxIMin(x1_data_box), 0, 0, 0);
-   hypre_SetIndex3(hypre_BoxIMax(x1_data_box), nx+1, ny+1, nz+1);
+   hypre_SetIndex3(hypre_BoxIMax(x1_data_box), nx + 1, ny + 1, nz + 1);
    hypre_CopyBox(x1_data_box, x2_data_box);
    hypre_CopyBox(x1_data_box, x3_data_box);
    hypre_CopyBox(x1_data_box, x4_data_box);
 
-   size = (nx+2)*(ny+2)*(nz+2);
-   xp1 = hypre_CTAlloc(HYPRE_Real,  size, HYPRE_MEMORY_HOST);
-   xp2 = hypre_CTAlloc(HYPRE_Real,  size, HYPRE_MEMORY_HOST);
-   xp3 = hypre_CTAlloc(HYPRE_Real,  size, HYPRE_MEMORY_HOST);
-   xp4 = hypre_CTAlloc(HYPRE_Real,  size, HYPRE_MEMORY_HOST);
+   size = (nx + 2) * (ny + 2) * (nz + 2);
+   xp1 = hypre_CTAlloc(HYPRE_Real, size, HYPRE_MEMORY_HOST);
+   xp2 = hypre_CTAlloc(HYPRE_Real, size, HYPRE_MEMORY_HOST);
+   xp3 = hypre_CTAlloc(HYPRE_Real, size, HYPRE_MEMORY_HOST);
+   xp4 = hypre_CTAlloc(HYPRE_Real, size, HYPRE_MEMORY_HOST);
+
+   d_xp1 = hypre_CTAlloc(HYPRE_Real, size, HYPRE_MEMORY_DEVICE);
+   d_xp2 = hypre_CTAlloc(HYPRE_Real, size, HYPRE_MEMORY_DEVICE);
+   d_xp3 = hypre_CTAlloc(HYPRE_Real, size, HYPRE_MEMORY_DEVICE);
+   d_xp4 = hypre_CTAlloc(HYPRE_Real, size, HYPRE_MEMORY_DEVICE);
 
-   reps = 1000000000/(nx*ny*nz+1000);
+   if (reps < 0)
+   {
+      reps = 1000000000 / (nx * ny * nz + 1000);
+   }
 
    /*-----------------------------------------------------------
     * Print driver parameters
@@ -190,7 +210,6 @@ main( hypre_int argc,
 
    zypre_BoxLoop1Begin(dim, loop_size,
                        x1_data_box, start, unit_stride, xi1);
-   zypre_BoxLoop1For(xi1)
    {
       xp1[xi1] ++;
    }
@@ -202,7 +221,7 @@ main( hypre_int argc,
    hypre_SerialBoxLoop1Begin(3, loop_size,
                              x1_data_box, start, unit_stride, xi1);
    {
-      sum += xp1[xi1];
+      sum += (HYPRE_Int)xp1[xi1];
       if (xp1[xi1] != 1)
       {
          zypre_BoxLoopGetIndex(index);
@@ -213,7 +232,7 @@ main( hypre_int argc,
    }
    hypre_SerialBoxLoop1End(xi1);
 
-   if (sum != (nx*ny*nz))
+   if (sum != (nx * ny * nz))
    {
       hypre_printf("*sum = %d\n", sum);
       fail = 1;
@@ -230,7 +249,7 @@ main( hypre_int argc,
    hypre_MPI_Barrier(hypre_MPI_COMM_WORLD);
 
    /*-----------------------------------------------------------
-    * Time old boxloops
+    * Time (device) boxloops
     *-----------------------------------------------------------*/
 
    /* Time BoxLoop0 */
@@ -239,12 +258,14 @@ main( hypre_int argc,
    for (rep = 0; rep < reps; rep++)
    {
       xi1 = 0;
+#define DEVICE_VAR is_device_ptr(d_xp1)
       hypre_BoxLoop0Begin(3, loop_size);
       {
-         xp1[xi1] += xp1[xi1];
+         d_xp1[xi1] += d_xp1[xi1];
          //xi1++;
       }
       hypre_BoxLoop0End();
+#undef DEVICE_VAR
    }
    hypre_EndTiming(time_index);
 
@@ -253,12 +274,14 @@ main( hypre_int argc,
    hypre_BeginTiming(time_index);
    for (rep = 0; rep < reps; rep++)
    {
+#define DEVICE_VAR is_device_ptr(d_xp1)
       hypre_BoxLoop1Begin(3, loop_size,
                           x1_data_box, start, unit_stride, xi1);
       {
-         xp1[xi1] += xp1[xi1];
+         d_xp1[xi1] += d_xp1[xi1];
       }
       hypre_BoxLoop1End(xi1);
+#undef DEVICE_VAR
    }
    hypre_EndTiming(time_index);
 
@@ -267,13 +290,15 @@ main( hypre_int argc,
    hypre_BeginTiming(time_index);
    for (rep = 0; rep < reps; rep++)
    {
+#define DEVICE_VAR is_device_ptr(d_xp1,d_xp2)
       hypre_BoxLoop2Begin(3, loop_size,
                           x1_data_box, start, unit_stride, xi1,
                           x2_data_box, start, unit_stride, xi2);
       {
-         xp1[xi1] += xp1[xi1] + xp2[xi2];
+         d_xp1[xi1] += d_xp1[xi1] + d_xp2[xi2];
       }
       hypre_BoxLoop2End(xi1, xi2);
+#undef DEVICE_VAR
    }
    hypre_EndTiming(time_index);
 
@@ -282,14 +307,16 @@ main( hypre_int argc,
    hypre_BeginTiming(time_index);
    for (rep = 0; rep < reps; rep++)
    {
+#define DEVICE_VAR is_device_ptr(d_xp1,d_xp2,d_xp3)
       hypre_BoxLoop3Begin(3, loop_size,
                           x1_data_box, start, unit_stride, xi1,
                           x2_data_box, start, unit_stride, xi2,
                           x3_data_box, start, unit_stride, xi3);
       {
-         xp1[xi1] += xp1[xi1] + xp2[xi2] + xp3[xi3];
+         d_xp1[xi1] += d_xp1[xi1] + d_xp2[xi2] + d_xp3[xi3];
       }
       hypre_BoxLoop3End(xi1, xi2, xi3);
+#undef DEVICE_VAR
    }
    hypre_EndTiming(time_index);
 
@@ -298,24 +325,26 @@ main( hypre_int argc,
    hypre_BeginTiming(time_index);
    for (rep = 0; rep < reps; rep++)
    {
+#define DEVICE_VAR is_device_ptr(d_xp1,d_xp2,d_xp3,d_xp4)
       hypre_BoxLoop4Begin(3, loop_size,
                           x1_data_box, start, unit_stride, xi1,
                           x2_data_box, start, unit_stride, xi2,
                           x3_data_box, start, unit_stride, xi3,
                           x4_data_box, start, unit_stride, xi4);
       {
-         xp1[xi1] += xp1[xi1] + xp2[xi2] + xp3[xi3] + xp4[xi4];
+         d_xp1[xi1] += d_xp1[xi1] + d_xp2[xi2] + d_xp3[xi3] + d_xp4[xi4];
       }
       hypre_BoxLoop4End(xi1, xi2, xi3, xi4);
+#undef DEVICE_VAR
    }
    hypre_EndTiming(time_index);
 
-   hypre_PrintTiming("Old BoxLoop times", hypre_MPI_COMM_WORLD);
-   hypre_FinalizeTiming(time_index);
+   hypre_PrintTiming("BoxLoop times [DEVICE]", hypre_MPI_COMM_WORLD);
+   hypre_FinalizeAllTimings();
    hypre_ClearTiming();
 
    /*-----------------------------------------------------------
-    * Time new boxloops
+    * Time host boxloops
     *-----------------------------------------------------------*/
 
    /* Time BoxLoop0 */
@@ -324,11 +353,9 @@ main( hypre_int argc,
    for (rep = 0; rep < reps; rep++)
    {
       xi1 = 0;
+#undef HYPRE_OMP_CLAUSE
+#define HYPRE_OMP_CLAUSE firstprivate(xi1)
       zypre_BoxLoop0Begin(dim, loop_size);
-#ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(ZYPRE_BOX_PRIVATE) firstprivate(xi1) HYPRE_SMP_SCHEDULE
-#endif
-      zypre_BoxLoop0For()
       {
          xp1[xi1] += xp1[xi1];
          xi1++;
@@ -344,10 +371,6 @@ main( hypre_int argc,
    {
       zypre_BoxLoop1Begin(dim, loop_size,
                           x1_data_box, start, unit_stride, xi1);
-#ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(ZYPRE_BOX_PRIVATE) HYPRE_SMP_SCHEDULE
-#endif
-      zypre_BoxLoop1For(xi1)
       {
          xp1[xi1] += xp1[xi1];
       }
@@ -363,10 +386,6 @@ main( hypre_int argc,
       zypre_BoxLoop2Begin(dim, loop_size,
                           x1_data_box, start, unit_stride, xi1,
                           x2_data_box, start, unit_stride, xi2);
-#ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(ZYPRE_BOX_PRIVATE) HYPRE_SMP_SCHEDULE
-#endif
-      zypre_BoxLoop2For(xi1, xi2)
       {
          xp1[xi1] += xp1[xi1] + xp2[xi2];
       }
@@ -383,10 +402,6 @@ main( hypre_int argc,
                           x1_data_box, start, unit_stride, xi1,
                           x2_data_box, start, unit_stride, xi2,
                           x3_data_box, start, unit_stride, xi3);
-#ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(ZYPRE_BOX_PRIVATE) HYPRE_SMP_SCHEDULE
-#endif
-      zypre_BoxLoop3For(xi1, xi2, xi3)
       {
          xp1[xi1] += xp1[xi1] + xp2[xi2] + xp3[xi3];
       }
@@ -404,10 +419,6 @@ main( hypre_int argc,
                           x2_data_box, start, unit_stride, xi2,
                           x3_data_box, start, unit_stride, xi3,
                           x4_data_box, start, unit_stride, xi4);
-#ifdef HYPRE_USING_OPENMP
-#pragma omp parallel for private(ZYPRE_BOX_PRIVATE) HYPRE_SMP_SCHEDULE
-#endif
-      zypre_BoxLoop4For(xi1, xi2, xi3, xi4)
       {
          xp1[xi1] += xp1[xi1] + xp2[xi2] + xp3[xi3] + xp4[xi4];
       }
@@ -415,10 +426,134 @@ main( hypre_int argc,
    }
    hypre_EndTiming(time_index);
 
-   hypre_PrintTiming("New BoxLoop times", hypre_MPI_COMM_WORLD);
-   hypre_FinalizeTiming(time_index);
+   hypre_PrintTiming("BoxLoop times [HOST]", hypre_MPI_COMM_WORLD);
+   hypre_FinalizeAllTimings();
+   hypre_ClearTiming();
+
+   /*-----------------------------------------------------------
+    * Reduction Loops
+    *-----------------------------------------------------------*/
+   {
+      HYPRE_Int i;
+      for (i = 0; i < size; i++)
+      {
+         xp1[i] = hypre_cos(i + 1.0);
+         xp2[i] = hypre_sin(i + 2.0);
+      }
+      hypre_TMemcpy(d_xp1, xp1, HYPRE_Real, size, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
+      hypre_TMemcpy(d_xp2, xp2, HYPRE_Real, size, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
+   }
+
+#if defined(HYPRE_USING_KOKKOS)
+   HYPRE_Real reducer = 0.0;
+#elif defined(HYPRE_USING_RAJA)
+   ReduceSum<hypre_raja_reduce_policy, HYPRE_Real> reducer(0.0);
+#elif defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+   ReduceSum<HYPRE_Real> reducer(0.0);
+#else
+   HYPRE_Real reducer = 0.0;
+#endif
+   HYPRE_Real box_sum1 = 0.0, box_sum2 = 0.0;
+
+#undef HYPRE_BOX_REDUCTION
+#if defined(HYPRE_USING_DEVICE_OPENMP)
+#define HYPRE_BOX_REDUCTION map(tofrom:reducer) reduction(+:reducer)
+#else
+#define HYPRE_BOX_REDUCTION reduction(+:reducer)
+#endif
+
+   /*-----------------------------------------------------------
+    * Time (device) boxloops
+    *-----------------------------------------------------------*/
+
+   /* Time BoxLoop1Reduction */
+   time_index = hypre_InitializeTiming("BoxLoopReduction1");
+   hypre_BeginTiming(time_index);
+   for (rep = 0; rep < reps; rep++)
+   {
+      reducer = 0.0;
+#define DEVICE_VAR is_device_ptr(d_xp1)
+      hypre_BoxLoop1ReductionBegin(3, loop_size,
+                                   x1_data_box, start, unit_stride, xi1,
+                                   reducer);
+      {
+         reducer += 1.0 / d_xp1[xi1];
+      }
+      hypre_BoxLoop1ReductionEnd(xi1, reducer);
+#undef DEVICE_VAR
+      box_sum1 += (HYPRE_Real) reducer;
+   }
+   hypre_EndTiming(time_index);
+
+   /* Time BoxLoop2Reduction */
+   time_index = hypre_InitializeTiming("BoxLoopReduction2");
+   hypre_BeginTiming(time_index);
+   for (rep = 0; rep < reps; rep++)
+   {
+      reducer = 0.0;
+#define DEVICE_VAR is_device_ptr(d_xp1,d_xp2)
+      hypre_BoxLoop2ReductionBegin(3, loop_size,
+                                   x1_data_box, start, unit_stride, xi1,
+                                   x2_data_box, start, unit_stride, xi2,
+                                   reducer);
+      {
+         reducer += 1.0 / d_xp1[xi1] + d_xp2[xi2] * 3.1415926;
+      }
+      hypre_BoxLoop2ReductionEnd(xi1, xi2, reducer);
+#undef DEVICE_VAR
+      box_sum2 += (HYPRE_Real) reducer;
+   }
+   hypre_EndTiming(time_index);
+
+   hypre_PrintTiming("BoxLoopReduction times [DEVICE]", hypre_MPI_COMM_WORLD);
+   hypre_FinalizeAllTimings();
    hypre_ClearTiming();
 
+   /*-----------------------------------------------------------
+    * Time host boxloops
+    *-----------------------------------------------------------*/
+   HYPRE_Real zbox_sum1 = 0.0, zbox_sum2 = 0.0;
+
+   /* Time BoxLoop1 */
+   time_index = hypre_InitializeTiming("BoxLoopReduction1");
+   hypre_BeginTiming(time_index);
+   for (rep = 0; rep < reps; rep++)
+   {
+#undef HYPRE_BOX_REDUCTION
+#define HYPRE_BOX_REDUCTION reduction(+:zbox_sum1)
+      zypre_BoxLoop1Begin(dim, loop_size,
+                          x1_data_box, start, unit_stride, xi1);
+      {
+         zbox_sum1 += 1.0 / xp1[xi1];
+      }
+      zypre_BoxLoop1End(xi1);
+   }
+   hypre_EndTiming(time_index);
+
+   /* Time BoxLoop2 */
+   time_index = hypre_InitializeTiming("BoxLoopReduction2");
+   hypre_BeginTiming(time_index);
+   for (rep = 0; rep < reps; rep++)
+   {
+#undef HYPRE_BOX_REDUCTION
+#define HYPRE_BOX_REDUCTION reduction(+:zbox_sum2)
+      zypre_BoxLoop2Begin(dim, loop_size,
+                          x1_data_box, start, unit_stride, xi1,
+                          x2_data_box, start, unit_stride, xi2);
+      {
+         zbox_sum2 += 1.0 / xp1[xi1] + xp2[xi2] * 3.1415926;
+      }
+      zypre_BoxLoop2End(xi1, xi2);
+   }
+   hypre_EndTiming(time_index);
+
+   hypre_PrintTiming("BoxLoopReduction times [HOST]", hypre_MPI_COMM_WORLD);
+   hypre_FinalizeAllTimings();
+   hypre_ClearTiming();
+
+   hypre_printf("BoxLoopReduction1, error %e\n", hypre_abs((zbox_sum1 - box_sum1) / zbox_sum1));
+   hypre_printf("BoxLoopReduction2, error %e\n", hypre_abs((zbox_sum2 - box_sum2) / zbox_sum2));
+
    /*-----------------------------------------------------------
     * Finalize things
     *-----------------------------------------------------------*/
@@ -427,14 +562,25 @@ main( hypre_int argc,
    hypre_BoxDestroy(x2_data_box);
    hypre_BoxDestroy(x3_data_box);
    hypre_BoxDestroy(x4_data_box);
+
    hypre_TFree(xp1, HYPRE_MEMORY_HOST);
    hypre_TFree(xp2, HYPRE_MEMORY_HOST);
    hypre_TFree(xp3, HYPRE_MEMORY_HOST);
    hypre_TFree(xp4, HYPRE_MEMORY_HOST);
 
+   hypre_TFree(d_xp1, HYPRE_MEMORY_DEVICE);
+   hypre_TFree(d_xp2, HYPRE_MEMORY_DEVICE);
+   hypre_TFree(d_xp3, HYPRE_MEMORY_DEVICE);
+   hypre_TFree(d_xp4, HYPRE_MEMORY_DEVICE);
+
+#if defined(HYPRE_USING_KOKKOS)
+   Kokkos::finalize ();
+#endif
+
+   HYPRE_Finalize();
+
    /* Finalize MPI */
    hypre_MPI_Finalize();
 
    return (0);
 }
-
diff --git a/external/hypre/src/utilities/CMakeLists.txt b/external/hypre/src/utilities/CMakeLists.txt
index 50213231..27af9d86 100644
--- a/external/hypre/src/utilities/CMakeLists.txt
+++ b/external/hypre/src/utilities/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -6,6 +6,7 @@
 set(HDRS
   HYPRE_utilities.h
   _hypre_utilities.h
+  _hypre_utilities.hpp
   HYPRE_error_f.h
   fortran.h
   fortran_matrix.h
@@ -23,14 +24,19 @@ set(SRCS
   ap.c
   log.c
   complex.c
-  cuda_utils.c
+  device_utils.c
   error.c
   general.c
   handle.c
   int_array.c
+  int_array_device.c
   hopscotch_hash.c
+  matrix_stats.c
+  magma.c
   memory.c
+  memory_tracker.c
   merge_sort.c
+  mmio.c
   mpi_comm_f2c.c
   nvtx.c
   omp_device.c
@@ -41,6 +47,8 @@ set(SRCS
   mpistubs.c
   qsplit.c
   random.c
+  state.c
+  stl_ops.c
   threading.c
   timer.c
   timing.c
@@ -51,19 +59,21 @@ target_sources(${PROJECT_NAME}
           ${HDRS}
 )
 
-if (HYPRE_USING_CUDA)
-  set(CUDA_SRCS
-    HYPRE_handle.c
-    cuda_utils.c
-    handle.c
-    int_array.c
+if (HYPRE_USING_GPU)
+  set(GPU_SRCS
+    device_utils.c
     general.c
+    handle.c
+    int_array_device.c
     memory.c
-    omp_device.c
+    memory_tracker.c
     nvtx.c
+    omp_device.c
+    stl_ops.c
+    HYPRE_handle.c
   )
-  convert_filenames_to_full_paths(CUDA_SRCS)
-  set(HYPRE_CUDA_SOURCES ${HYPRE_CUDA_SOURCES} ${CUDA_SRCS} PARENT_SCOPE)
+  convert_filenames_to_full_paths(GPU_SRCS)
+  set(HYPRE_GPU_SOURCES ${HYPRE_GPU_SOURCES} ${GPU_SRCS} PARENT_SCOPE)
 endif ()
 
 convert_filenames_to_full_paths(HDRS)
diff --git a/external/hypre/src/utilities/F90_HYPRE_error.c b/external/hypre/src/utilities/F90_HYPRE_error.c
index 49f58d43..4047faf4 100644
--- a/external/hypre/src/utilities/F90_HYPRE_error.c
+++ b/external/hypre/src/utilities/F90_HYPRE_error.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -14,43 +14,43 @@ extern "C" {
 
 void
 hypre_F90_IFACE(hypre_geterror, HYPRE_GETERROR)
-   (hypre_F90_Int *result)
+(hypre_F90_Int *result)
 {
    *result = (hypre_F90_Int) HYPRE_GetError();
 }
 
 void
 hypre_F90_IFACE(hypre_checkerror, HYPRE_CHECKERROR)
-   (hypre_F90_Int *ierr,
-    hypre_F90_Int *hypre_error_code,
-    hypre_F90_Int *result)
+(hypre_F90_Int *ierr,
+ hypre_F90_Int *hypre_error_code,
+ hypre_F90_Int *result)
 {
    *result = (hypre_F90_Int) HYPRE_CheckError(
-      hypre_F90_PassInt(ierr),
-      hypre_F90_PassInt(hypre_error_code));
+                hypre_F90_PassInt(ierr),
+                hypre_F90_PassInt(hypre_error_code));
 }
 
 void
 hypre_F90_IFACE(hypre_geterrorarg, HYPRE_GETERRORARG)
-   (hypre_F90_Int *result)
+(hypre_F90_Int *result)
 {
    *result = (hypre_F90_Int) HYPRE_GetErrorArg();
 }
 
 void
 hypre_F90_IFACE(hypre_clearallerrors, HYPRE_CLEARALLERRORS)
-   (hypre_F90_Int *result)
+(hypre_F90_Int *result)
 {
    *result = HYPRE_ClearAllErrors();
 }
 
 void
 hypre_F90_IFACE(hypre_clearerror, HYPRE_CLEARERROR)
-   (hypre_F90_Int *hypre_error_code,
-    hypre_F90_Int *result)
+(hypre_F90_Int *hypre_error_code,
+ hypre_F90_Int *result)
 {
    *result = (hypre_F90_Int) HYPRE_ClearError(
-      hypre_F90_PassInt(hypre_error_code));
+                hypre_F90_PassInt(hypre_error_code));
 }
 
 #ifdef __cplusplus
diff --git a/external/hypre/src/utilities/F90_HYPRE_general.c b/external/hypre/src/utilities/F90_HYPRE_general.c
index 571aa009..9ad6bf93 100644
--- a/external/hypre/src/utilities/F90_HYPRE_general.c
+++ b/external/hypre/src/utilities/F90_HYPRE_general.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -14,18 +14,49 @@ extern "C" {
 
 void
 hypre_F90_IFACE(hypre_init, HYPRE_INIT)
-   (hypre_F90_Int *ierr)
+(hypre_F90_Int *ierr)
 {
-   *ierr = (hypre_F90_Int) HYPRE_Init();
+   *ierr = (hypre_F90_Int) HYPRE_Initialize();
+}
+
+void
+hypre_F90_IFACE(hypre_initialize, HYPRE_INITIALIZE)
+(hypre_F90_Int *ierr)
+{
+   *ierr = (hypre_F90_Int) HYPRE_Initialize();
 }
 
 void
 hypre_F90_IFACE(hypre_finalize, HYPRE_FINALIZE)
-   (hypre_F90_Int *ierr)
+(hypre_F90_Int *ierr)
 {
    *ierr = (hypre_F90_Int) HYPRE_Finalize();
 }
 
+void
+hypre_F90_IFACE(hypre_setmemorylocation, HYPRE_SETMEMORYLOCATION)
+(hypre_F90_Int *memory_location, hypre_F90_Int *ierr)
+{
+   HYPRE_MemoryLocation loc = (HYPRE_MemoryLocation) * memory_location;
+   *ierr = (hypre_F90_Int) HYPRE_SetMemoryLocation(loc);
+}
+
+void
+hypre_F90_IFACE(hypre_setexecutionpolicy, HYPRE_SETEXECUTIONPOLICY)
+(hypre_F90_Int *exec_policy, hypre_F90_Int *ierr)
+{
+   HYPRE_ExecutionPolicy exec = (HYPRE_ExecutionPolicy) * exec_policy;
+
+   *ierr = (hypre_F90_Int) HYPRE_SetExecutionPolicy(exec);
+}
+
+void
+hypre_F90_IFACE(hypre_setspgemmusevendor, HYPRE_SETSPGEMMUSEVENDOR)
+(hypre_F90_Int *use_vendor, hypre_F90_Int *ierr)
+{
+   *ierr = (hypre_F90_Int) HYPRE_SetSpGemmUseVendor(*use_vendor);
+}
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/external/hypre/src/utilities/HYPRE_error_f.h b/external/hypre/src/utilities/HYPRE_error_f.h
index 0985a9ae..83f3d8a0 100644
--- a/external/hypre/src/utilities/HYPRE_error_f.h
+++ b/external/hypre/src/utilities/HYPRE_error_f.h
@@ -1,4 +1,4 @@
-!     Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+!     Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 !     HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 !
 !     SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/utilities/HYPRE_handle.c b/external/hypre/src/utilities/HYPRE_handle.c
index d8c69a24..c052dc4c 100644
--- a/external/hypre/src/utilities/HYPRE_handle.c
+++ b/external/hypre/src/utilities/HYPRE_handle.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -14,20 +14,61 @@
 #include "_hypre_utilities.h"
 
 /*--------------------------------------------------------------------------
- * HYPRE_SetSpGemmUseCusparse
+ * HYPRE_SetLogLevel
  *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_SetLogLevel( HYPRE_Int log_level )
+{
+   return hypre_SetLogLevel(log_level);
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_SetSpTransUseVendor
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_SetSpTransUseVendor( HYPRE_Int use_vendor )
+{
+   return hypre_SetSpTransUseVendor(use_vendor);
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_SetSpMVUseVendor
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-HYPRE_SetSpGemmUseCusparse( HYPRE_Int use_cusparse )
+HYPRE_SetSpMVUseVendor( HYPRE_Int use_vendor )
 {
-   return hypre_SetSpGemmUseCusparse(use_cusparse);
+   return hypre_SetSpMVUseVendor(use_vendor);
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_SetSpGemmUseVendor
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_SetSpGemmUseVendor( HYPRE_Int use_vendor )
+{
+   return hypre_SetSpGemmUseVendor(use_vendor);
 }
 
 /*--------------------------------------------------------------------------
  * HYPRE_SetUseGpuRand
  *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-HYPRE_SetUseGpuRand( HYPRE_Int use_curand )
+HYPRE_SetUseGpuRand( HYPRE_Int use_gpu_rand )
 {
-   return hypre_SetUseGpuRand(use_curand);
+   return hypre_SetUseGpuRand(use_gpu_rand);
 }
 
+/*--------------------------------------------------------------------------
+ * HYPRE_SetGPUAwareMPI
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_SetGpuAwareMPI( HYPRE_Int use_gpu_aware_mpi )
+{
+   return hypre_SetGpuAwareMPI(use_gpu_aware_mpi);
+}
diff --git a/external/hypre/src/utilities/HYPRE_utilities.h b/external/hypre/src/utilities/HYPRE_utilities.h
index 106e70ae..0dd1b70f 100644
--- a/external/hypre/src/utilities/HYPRE_utilities.h
+++ b/external/hypre/src/utilities/HYPRE_utilities.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -35,18 +35,36 @@ extern "C" {
 #if defined(HYPRE_BIGINT)
 typedef long long int HYPRE_BigInt;
 typedef long long int HYPRE_Int;
+
+#define HYPRE_BIG_INT_MAX LLONG_MAX
+#define HYPRE_BIG_INT_MIN LLONG_MIN
+#define HYPRE_INT_MAX LLONG_MAX
+#define HYPRE_INT_MIN LLONG_MIN
+
 #define HYPRE_MPI_BIG_INT MPI_LONG_LONG_INT
 #define HYPRE_MPI_INT MPI_LONG_LONG_INT
 
 #elif defined(HYPRE_MIXEDINT)
 typedef long long int HYPRE_BigInt;
 typedef int HYPRE_Int;
+
+#define HYPRE_BIG_INT_MAX LLONG_MAX
+#define HYPRE_BIG_INT_MIN LLONG_MIN
+#define HYPRE_INT_MAX INT_MAX
+#define HYPRE_INT_MIN INT_MIN
+
 #define HYPRE_MPI_BIG_INT MPI_LONG_LONG_INT
 #define HYPRE_MPI_INT MPI_INT
 
 #else /* default */
 typedef int HYPRE_BigInt;
 typedef int HYPRE_Int;
+
+#define HYPRE_BIG_INT_MAX INT_MAX
+#define HYPRE_BIG_INT_MIN INT_MIN
+#define HYPRE_INT_MAX INT_MAX
+#define HYPRE_INT_MIN INT_MIN
+
 #define HYPRE_MPI_BIG_INT MPI_INT
 #define HYPRE_MPI_INT MPI_INT
 #endif
@@ -61,6 +79,11 @@ typedef int HYPRE_Int;
 typedef float HYPRE_Real;
 #define HYPRE_REAL_MAX FLT_MAX
 #define HYPRE_REAL_MIN FLT_MIN
+#if defined(FLT_TRUE_MIN)
+#define HYPRE_REAL_TRUE_MIN FLT_TRUE_MIN
+#else
+#define HYPRE_REAL_TRUE_MIN FLT_MIN
+#endif
 #define HYPRE_REAL_EPSILON FLT_EPSILON
 #define HYPRE_REAL_MIN_EXP FLT_MIN_EXP
 #define HYPRE_MPI_REAL MPI_FLOAT
@@ -69,6 +92,11 @@ typedef float HYPRE_Real;
 typedef long double HYPRE_Real;
 #define HYPRE_REAL_MAX LDBL_MAX
 #define HYPRE_REAL_MIN LDBL_MIN
+#if defined(LDBL_TRUE_MIN)
+#define HYPRE_REAL_TRUE_MIN LDBL_TRUE_MIN
+#else
+#define HYPRE_REAL_TRUE_MIN LDBL_MIN
+#endif
 #define HYPRE_REAL_EPSILON LDBL_EPSILON
 #define HYPRE_REAL_MIN_EXP DBL_MIN_EXP
 #define HYPRE_MPI_REAL MPI_LONG_DOUBLE
@@ -77,15 +105,28 @@ typedef long double HYPRE_Real;
 typedef double HYPRE_Real;
 #define HYPRE_REAL_MAX DBL_MAX
 #define HYPRE_REAL_MIN DBL_MIN
+#if defined(DBL_TRUE_MIN)
+#define HYPRE_REAL_TRUE_MIN DBL_TRUE_MIN
+#else
+#define HYPRE_REAL_TRUE_MIN DBL_MIN
+#endif
 #define HYPRE_REAL_EPSILON DBL_EPSILON
 #define HYPRE_REAL_MIN_EXP DBL_MIN_EXP
 #define HYPRE_MPI_REAL MPI_DOUBLE
 #endif
 
 #if defined(HYPRE_COMPLEX)
+/* support for float double and long double complex types */
+#if defined(HYPRE_SINGLE)
+typedef float _Complex HYPRE_Complex;
+#define HYPRE_MPI_COMPLEX MPI_C_FLOAT_COMPLEX
+#elif defined(HYPRE_LONG_DOUBLE)
+typedef long double _Complex HYPRE_Complex;
+#define HYPRE_MPI_COMPLEX MPI_C_LONG_DOUBLE_COMPLEX
+#else /* default */
 typedef double _Complex HYPRE_Complex;
 #define HYPRE_MPI_COMPLEX MPI_C_DOUBLE_COMPLEX  /* or MPI_LONG_DOUBLE ? */
-
+#endif
 #else  /* default */
 typedef HYPRE_Real HYPRE_Complex;
 #define HYPRE_MPI_COMPLEX HYPRE_MPI_REAL
@@ -108,39 +149,132 @@ typedef HYPRE_Int MPI_Comm;
 #define HYPRE_ERROR_ARG             4   /* argument error */
 /* bits 4-8 are reserved for the index of the argument error */
 #define HYPRE_ERROR_CONV          256   /* method did not converge as expected */
+#define HYPRE_MAX_FILE_NAME_LEN  1024   /* longest filename length used in hypre */
+#define HYPRE_MAX_MSG_LEN        2048   /* longest message length */
 
 /*--------------------------------------------------------------------------
  * HYPRE init/finalize
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int HYPRE_Init();
-HYPRE_Int HYPRE_Finalize();
+/**
+ * (Required) Initializes the hypre library.
+ **/
+
+HYPRE_Int HYPRE_Initialize(void);
+
+/**
+ * (Required) Initializes the hypre library. This function is provided for backward compatibility.
+ * Please, use HYPRE_Initialize instead.
+ **/
+
+#define HYPRE_Init() HYPRE_Initialize()
+
+/**
+ * (Optional) Initializes GPU features in the hypre library.
+ **/
+
+HYPRE_Int HYPRE_DeviceInitialize(void);
+
+/**
+ * (Required) Finalizes the hypre library.
+ **/
+
+HYPRE_Int HYPRE_Finalize(void);
+
+/**
+ * (Optional) Returns true if the hypre library has been initialized but not finalized yet.
+ **/
+
+HYPRE_Int HYPRE_Initialized(void);
+
+/**
+ * (Optional) Returns true if the hypre library has been finalized but not re-initialized yet.
+ **/
+
+HYPRE_Int HYPRE_Finalized(void);
 
 /*--------------------------------------------------------------------------
  * HYPRE error user functions
  *--------------------------------------------------------------------------*/
 
+/* Return an aggregate error code representing the collective status of all ranks */
+HYPRE_Int HYPRE_GetGlobalError(MPI_Comm comm);
+
 /* Return the current hypre error flag */
-HYPRE_Int HYPRE_GetError();
+HYPRE_Int HYPRE_GetError(void);
 
 /* Check if the given error flag contains the given error code */
 HYPRE_Int HYPRE_CheckError(HYPRE_Int hypre_ierr, HYPRE_Int hypre_error_code);
 
 /* Return the index of the argument (counting from 1) where
    argument error (HYPRE_ERROR_ARG) has occured */
-HYPRE_Int HYPRE_GetErrorArg();
+HYPRE_Int HYPRE_GetErrorArg(void);
 
 /* Describe the given error flag in the given string */
 void HYPRE_DescribeError(HYPRE_Int hypre_ierr, char *descr);
 
 /* Clears the hypre error flag */
-HYPRE_Int HYPRE_ClearAllErrors();
+HYPRE_Int HYPRE_ClearAllErrors(void);
 
 /* Clears the given error code from the hypre error flag */
 HYPRE_Int HYPRE_ClearError(HYPRE_Int hypre_error_code);
 
+/* Set behavior for printing errors: mode 0 = stderr, mode 1 = memory buffer */
+HYPRE_Int HYPRE_SetPrintErrorMode(HYPRE_Int mode);
+
+/* Set which error code messages to record for printing: code is an error code
+ * such as HYPRE_ERROR_CONV, code -1 = all codes, verbosity 0 = do not record */
+HYPRE_Int HYPRE_SetPrintErrorVerbosity(HYPRE_Int code, HYPRE_Int verbosity);
+
+/* Return a buffer of error messages and clear them in hypre */
+HYPRE_Int HYPRE_GetErrorMessages(char **buffer, HYPRE_Int *bufsz);
+
+/* Print the error messages and clear them in hypre */
+HYPRE_Int HYPRE_PrintErrorMessages(MPI_Comm comm);
+
+/* Clear the error messages in hypre and free any related memory allocated */
+HYPRE_Int HYPRE_ClearErrorMessages(void);
+
 /* Print GPU information */
-HYPRE_Int HYPRE_PrintDeviceInfo();
+HYPRE_Int HYPRE_PrintDeviceInfo(void);
+
+/**
+ * @brief Prints the memory usage of the current process.
+ *
+ * This function prints the memory usage details of the process to standard output.
+ * It provides information such as the virtual memory size, resident set size,
+ * and other related statistics including GPU memory usage for device builds.
+ *
+ * @param[in] comm      The MPI communicator. This parameter allows the function
+ *                      to print memory usage information for the process within
+ *                      the context of an MPI program.
+ *
+ * @param[in] level     The level of detail in the memory statistics output.
+ *                        - 1 : Display memory usage statistics for each MPI rank.
+ *                        - 2 : Display aggregate memory usage statistics over MPI ranks.
+ *
+ * @param[in] function  The name of the function from which `HYPRE_MemoryPrintUsage`
+ *                      is called. This is typically set to `__func__`, which
+ *                      automatically captures the name of the calling function.
+ *                      This variable can also be used to denote a region name.
+ *
+ * @param[in] line      The line number in the source file where `HYPRE_MemoryPrintUsage`
+ *                      is called. This is typically set to `__LINE__`, which
+ *                      automatically captures the line number. The line number can be
+ *                      omitted by passing a negative value to this variable.
+ *
+ * @return              Returns an integer status code. `0` indicates success, while
+ *                      a non-zero value indicates an error occurred.
+ *
+ * @note                The function is designed to be platform-independent but
+ *                      may provide different levels of detail depending on the
+ *                      underlying operating system (e.g., Linux, macOS). However,
+ *                      this function does not lead to correct memory usage statistics
+ *                      on Windows platforms.
+ */
+
+HYPRE_Int HYPRE_MemoryPrintUsage(MPI_Comm comm, HYPRE_Int level, const char *function,
+                                 HYPRE_Int line);
 
 /*--------------------------------------------------------------------------
  * HYPRE Version routines
@@ -170,8 +304,10 @@ HYPRE_VersionNumber( HYPRE_Int  *major_ptr,
  * HYPRE AP user functions
  *--------------------------------------------------------------------------*/
 
-/*Checks whether the AP is on */
-HYPRE_Int HYPRE_AssumedPartitionCheck();
+/* Checks whether the AP is on */
+/* TODO (VPM): this function is provided for backwards compatibility
+   and will be removed in a future release */
+HYPRE_Int HYPRE_AssumedPartitionCheck(void);
 
 /*--------------------------------------------------------------------------
  * HYPRE memory location
@@ -180,11 +316,20 @@ HYPRE_Int HYPRE_AssumedPartitionCheck();
 typedef enum _HYPRE_MemoryLocation
 {
    HYPRE_MEMORY_UNDEFINED = -1,
-   HYPRE_MEMORY_HOST          ,
+   HYPRE_MEMORY_HOST,
    HYPRE_MEMORY_DEVICE
 } HYPRE_MemoryLocation;
 
+/**
+ * (Optional) Sets the default (abstract) memory location.
+ **/
+
 HYPRE_Int HYPRE_SetMemoryLocation(HYPRE_MemoryLocation memory_location);
+
+/**
+ * (Optional) Gets a pointer to the default (abstract) memory location.
+ **/
+
 HYPRE_Int HYPRE_GetMemoryLocation(HYPRE_MemoryLocation *memory_location);
 
 #include <stdlib.h>
@@ -196,41 +341,255 @@ HYPRE_Int HYPRE_GetMemoryLocation(HYPRE_MemoryLocation *memory_location);
 typedef enum _HYPRE_ExecutionPolicy
 {
    HYPRE_EXEC_UNDEFINED = -1,
-   HYPRE_EXEC_HOST          ,
+   HYPRE_EXEC_HOST,
    HYPRE_EXEC_DEVICE
 } HYPRE_ExecutionPolicy;
 
+/**
+ * (Optional) Sets the default execution policy.
+ **/
+
 HYPRE_Int HYPRE_SetExecutionPolicy(HYPRE_ExecutionPolicy exec_policy);
+
+/**
+ * (Optional) Gets a pointer to the default execution policy.
+ **/
+
 HYPRE_Int HYPRE_GetExecutionPolicy(HYPRE_ExecutionPolicy *exec_policy);
-HYPRE_Int HYPRE_SetStructExecutionPolicy(HYPRE_ExecutionPolicy exec_policy);
-HYPRE_Int HYPRE_GetStructExecutionPolicy(HYPRE_ExecutionPolicy *exec_policy);
+
+/**
+ * (Optional) Returns a string denoting the execution policy passed as input.
+ **/
+
+const char* HYPRE_GetExecutionPolicyName(HYPRE_ExecutionPolicy exec_policy);
 
 /*--------------------------------------------------------------------------
  * HYPRE UMPIRE
  *--------------------------------------------------------------------------*/
 
+/**
+ * @brief Sets the size of the Umpire device memory pool.
+ *
+ * @param[in] nbytes The size of the device memory pool in bytes.
+ *
+ * @return Returns hypre's global error code, where 0 indicates success.
+ **/
 HYPRE_Int HYPRE_SetUmpireDevicePoolSize(size_t nbytes);
+
+/**
+ * @brief Sets the size of the Umpire unified memory pool.
+ *
+ * @param[in] nbytes The size of the unified memory pool in bytes.
+ *
+ * @return Returns hypre's global error code, where 0 indicates success.
+ **/
 HYPRE_Int HYPRE_SetUmpireUMPoolSize(size_t nbytes);
+
+/**
+ * @brief Sets the size of the Umpire host memory pool.
+ *
+ * @param[in] nbytes The size of the host memory pool in bytes.
+ *
+ * @return Returns hypre's global error code, where 0 indicates success.
+ **/
 HYPRE_Int HYPRE_SetUmpireHostPoolSize(size_t nbytes);
+
+/**
+ * @brief Sets the size of the Umpire pinned memory pool.
+ *
+ * @param[in] nbytes The size of the pinned memory pool in bytes.
+ *
+ * @return Returns hypre's global error code, where 0 indicates success.
+ **/
 HYPRE_Int HYPRE_SetUmpirePinnedPoolSize(size_t nbytes);
+
+/**
+ * @brief Sets the name of the Umpire device memory pool.
+ *
+ * @param[in] pool_name The name to assign to the device memory pool.
+ *
+ * @return Returns hypre's global error code, where 0 indicates success.
+ **/
 HYPRE_Int HYPRE_SetUmpireDevicePoolName(const char *pool_name);
+
+/**
+ * @brief Sets the name of the Umpire unified memory pool.
+ *
+ * @param[in] pool_name The name to assign to the unified memory pool.
+ *
+ * @return Returns hypre's global error code, where 0 indicates success.
+ **/
 HYPRE_Int HYPRE_SetUmpireUMPoolName(const char *pool_name);
+
+/**
+ * @brief Sets the name of the Umpire host memory pool.
+ *
+ * @param[in] pool_name The name to assign to the host memory pool.
+ *
+ * @return Returns hypre's global error code, where 0 indicates success.
+ **/
 HYPRE_Int HYPRE_SetUmpireHostPoolName(const char *pool_name);
+
+/**
+ * @brief Sets the name of the Umpire pinned memory pool.
+ *
+ * @param[in] pool_name The name to assign to the pinned memory pool.
+ *
+ * @return Returns hypre's global error code, where 0 indicates success.
+ **/
 HYPRE_Int HYPRE_SetUmpirePinnedPoolName(const char *pool_name);
 
 /*--------------------------------------------------------------------------
  * HYPRE GPU memory pool
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int HYPRE_SetGPUMemoryPoolSize(HYPRE_Int bin_growth, HYPRE_Int min_bin, HYPRE_Int max_bin, size_t max_cached_bytes);
+HYPRE_Int HYPRE_SetGPUMemoryPoolSize(HYPRE_Int bin_growth, HYPRE_Int min_bin, HYPRE_Int max_bin,
+                                     size_t max_cached_bytes);
 
 /*--------------------------------------------------------------------------
  * HYPRE handle
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int HYPRE_SetSpGemmUseCusparse( HYPRE_Int use_cusparse );
+/**
+ * Sets the logging level for the HYPRE library.
+ *
+ * The following options are available for \e log_level:
+ *
+ *    - 0 : (default) No messaging.
+ *    - 1 : Display memory usage statistics for each MPI rank.
+ *    - 2 : Display aggregate memory usage statistics over MPI ranks.
+ *
+ * @note Log level codes can be combined using bitwise OR to enable multiple
+ *       logging behaviors simultaneously.
+ *
+ * @param log_level The logging level to set.
+ *
+ * @return Returns hypre's global error code, where 0 indicates success.
+ **/
+HYPRE_Int HYPRE_SetLogLevel(HYPRE_Int log_level);
+
+/**
+ * Specifies the algorithm used for sparse matrix transposition in device builds.
+ *
+ * The following options are available for \e use_vendor:
+ *
+ *    - 0 : Use hypre's internal implementation.
+ *    - 1 : (default) Use the vendor library's implementation. This includes:
+ *          - cuSPARSE for CUDA (HYPRE_USING_CUSPARSE)
+ *          - rocSPARSE for HIP (HYPRE_USING_ROCSPARSE)
+ *          - oneMKL for SYCL   (HYPRE_USING_ONEMKLSPARSE)
+ *
+ * @param use_vendor Indicates whether to use the internal or vendor-provided implementation.
+ *
+ * @return Returns hypre's global error code, where 0 indicates success.
+ **/
+HYPRE_Int HYPRE_SetSpTransUseVendor(HYPRE_Int use_vendor);
+
+/**
+ * Specifies the algorithm used for sparse matrix/vector multiplication in device builds.
+ *
+ * The following options are available for \e use_vendor:
+ *
+ *    - 0 : Use hypre's internal implementation.
+ *    - 1 : (default) Use the vendor library's implementation. This includes:
+ *          - cuSPARSE for CUDA (HYPRE_USING_CUSPARSE)
+ *          - rocSPARSE for HIP (HYPRE_USING_ROCSPARSE)
+ *          - oneMKL for SYCL   (HYPRE_USING_ONEMKLSPARSE)
+ *
+ * @param use_vendor Indicates whether to use the internal or vendor-provided implementation.
+ *
+ * @return Returns hypre's global error code, where 0 indicates success.
+ **/
+HYPRE_Int HYPRE_SetSpMVUseVendor(HYPRE_Int use_vendor);
+
+/**
+ * Specifies the algorithm used for sparse matrix/matrix multiplication in device builds.
+ *
+ * The following options are available for \e use_vendor:
+ *
+ *    - 0 : Use hypre's internal implementation.
+ *    - 1 : Use the vendor library's implementation. This includes:
+ *          - cuSPARSE for CUDA (HYPRE_USING_CUSPARSE)
+ *          - rocSPARSE for HIP (HYPRE_USING_ROCSPARSE)
+ *          - oneMKL for SYCL   (HYPRE_USING_ONEMKLSPARSE)
+ *
+ * @param use_vendor Indicates whether to use the internal or vendor-provided implementation.
+ *
+ * @note The default value is 1, except for CUDA builds, which is zero.
+ *
+ * @return Returns hypre's global error code, where 0 indicates success.
+ **/
+HYPRE_Int HYPRE_SetSpGemmUseVendor( HYPRE_Int use_vendor );
+/* Backwards compatibility with HYPRE_SetSpGemmUseCusparse() */
+#define HYPRE_SetSpGemmUseCusparse(use_vendor) HYPRE_SetSpGemmUseVendor(use_vendor)
+
+/**
+ * Specifies the algorithm used for generating random numbers in device builds.
+ *
+ * The following options are available for \e use_curand:
+ *
+ *    - 0 : random numbers are generated on the host and copied to device memory.
+ *    - 1 : (default) Use the vendor library's implementation. This includes:
+ *          - cuSPARSE for CUDA (HYPRE_USING_CUSPARSE)
+ *          - rocSPARSE for HIP (HYPRE_USING_ROCSPARSE)
+ *          - oneMKL for SYCL   (HYPRE_USING_ONEMKLSPARSE)
+ *
+ * @param use_curand Indicates whether to use the vendor-provided implementation or not.
+ *
+ * @return Returns hypre's global error code, where 0 indicates success.
+ **/
+
 HYPRE_Int HYPRE_SetUseGpuRand( HYPRE_Int use_curand );
 
+/**
+ * Configures the usage of GPU-aware MPI for communication in device builds.
+ *
+ * The following options are available for \e use_gpu_aware_mpi:
+ *
+ *    - 0 : MPI buffers are transferred between device and host memory. Communication occurs on the host.
+ *    - 1 : MPI communication is performed directly from the device using device-resident buffers.
+ *
+ * @param use_gpu_aware_mpi Specifies whether to enable GPU-aware MPI communication or not.
+ *
+ * @note This option requires hypre to be configured with GPU-aware MPI support for it to take effect.
+ *
+ * @return Returns hypre's global error code, where 0 indicates success.
+ **/
+HYPRE_Int HYPRE_SetGpuAwareMPI( HYPRE_Int use_gpu_aware_mpi );
+
+/*--------------------------------------------------------------------------
+ * Base objects
+ *--------------------------------------------------------------------------*/
+
+/* RDF: How should we provide reference documentation for this (and above)? */
+
+/* Base public solver struct */
+struct hypre_Solver_struct;
+typedef struct hypre_Solver_struct *HYPRE_Solver;
+
+/* Base public matrix struct */
+struct hypre_Matrix_struct;
+typedef struct hypre_Matrix_struct *HYPRE_Matrix;
+
+/* Base public vector struct */
+struct hypre_Vector_struct;
+typedef struct hypre_Vector_struct *HYPRE_Vector;
+
+/* Base function pointers */
+
+/* RDF: Note that only PtrToSolverFcn is needed at the user level right now to
+ * keep backward compatibility with SetPrecond().  In general, do we want these
+ * at the user level?  I guess it doesn't hurt. */
+
+/* RDF: Also note that PtrToSolverFcn is defined again in 'HYPRE_krylov.h' and
+ * probably needs to be for the reference manual. */
+
+typedef HYPRE_Int (*HYPRE_PtrToSolverFcn)(HYPRE_Solver,
+                                          HYPRE_Matrix,
+                                          HYPRE_Vector,
+                                          HYPRE_Vector);
+typedef HYPRE_Int (*HYPRE_PtrToDestroyFcn)(HYPRE_Solver);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/external/hypre/src/utilities/HYPRE_version.c b/external/hypre/src/utilities/HYPRE_version.c
index e22ab923..734c70d6 100644
--- a/external/hypre/src/utilities/HYPRE_version.c
+++ b/external/hypre/src/utilities/HYPRE_version.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/utilities/_hypre_onedpl.hpp b/external/hypre/src/utilities/_hypre_onedpl.hpp
new file mode 100644
index 00000000..a0e8f36c
--- /dev/null
+++ b/external/hypre/src/utilities/_hypre_onedpl.hpp
@@ -0,0 +1,284 @@
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+#ifndef HYPRE_ONEDPL_H
+#define HYPRE_ONEDPL_H
+
+#include "HYPRE_config.h"
+
+#if defined(HYPRE_USING_SYCL)
+
+/* oneAPI DPL headers */
+/* NOTE: these must be included before standard C++ headers */
+
+/* WM: this is a workaround for a bug in oneDPL reduce by segment */
+#define ONEDPL_WORKAROUND_FOR_IGPU_64BIT_REDUCTION 1
+
+#include <oneapi/dpl/execution>
+#include <oneapi/dpl/algorithm>
+#include <oneapi/dpl/numeric>
+#include <oneapi/dpl/iterator>
+#include <oneapi/dpl/functional>
+#include "_hypre_utilities.h"
+#include "_hypre_utilities.hpp"
+
+/* WM: dpct below currently needed for constant iterators */
+#include <dpct/dpl_extras/iterators.h>
+
+//[pred, op](Ref1 a, Ref2 s) { return pred(s) ? op(a) : a; });
+template <typename T, typename Predicate, typename Operator>
+struct hypreSycl_transform_if_unary_zip_mask_fun
+{
+   hypreSycl_transform_if_unary_zip_mask_fun(Predicate _pred, Operator _op) : pred(_pred), op(_op) {}
+   template <typename _T>
+   void operator()(_T&& t) const
+   {
+      using std::get;
+      if (pred(get<1>(t)))
+      {
+         get<2>(t) = op(get<0>(t));
+      }
+   }
+
+private:
+   Predicate pred;
+   Operator op;
+};
+
+template <class Iter1, class Iter2, class Iter3,
+          class UnaryOperation, class Pred>
+Iter3 hypreSycl_transform_if(Iter1 first, Iter1 last, Iter2 mask,
+                             Iter3 result, UnaryOperation unary_op, Pred pred)
+{
+   static_assert(
+      std::is_same<typename std::iterator_traits<Iter1>::iterator_category,
+      std::random_access_iterator_tag>::value &&
+      std::is_same<typename std::iterator_traits<Iter2>::iterator_category,
+      std::random_access_iterator_tag>::value &&
+      std::is_same<typename std::iterator_traits<Iter3>::iterator_category,
+      std::random_access_iterator_tag>::value,
+      "Iterators passed to algorithms must be random-access iterators.");
+   using T = typename std::iterator_traits<Iter1>::value_type;
+   const auto n = std::distance(first, last);
+   auto begin_for_each = oneapi::dpl::make_zip_iterator(first, mask, result);
+   HYPRE_ONEDPL_CALL( std::for_each,
+                      begin_for_each, begin_for_each + n,
+                      hypreSycl_transform_if_unary_zip_mask_fun<T, Pred, UnaryOperation>(pred, unary_op) );
+   return result + n;
+}
+
+// Functor evaluates second element of tied sequence with predicate.
+// Used by: copy_if
+template <typename Predicate> struct hypreSycl_predicate_key_fun
+{
+   hypreSycl_predicate_key_fun(Predicate _pred) : pred(_pred) {}
+
+   template <typename _T1> bool operator()(_T1 &&a) const
+   {
+      return pred(std::get<1>(a));
+   }
+
+private:
+   Predicate pred;
+};
+
+// Need custom version of copy_if when predicate operates on a mask
+// instead of the data being copied (natively suppored in thrust, but
+// not supported in oneDPL)
+template <typename Iter1, typename Iter2, typename Iter3, typename Pred>
+Iter3 hypreSycl_copy_if(Iter1 first, Iter1 last, Iter2 mask,
+                        Iter3 result, Pred pred)
+{
+   static_assert(
+      std::is_same<typename std::iterator_traits<Iter1>::iterator_category,
+      std::random_access_iterator_tag>::value &&
+      std::is_same<typename std::iterator_traits<Iter2>::iterator_category,
+      std::random_access_iterator_tag>::value &&
+      std::is_same<typename std::iterator_traits<Iter3>::iterator_category,
+      std::random_access_iterator_tag>::value,
+      "Iterators passed to algorithms must be random-access iterators.");
+   auto ret_val = HYPRE_ONEDPL_CALL( std::copy_if,
+                                     oneapi::dpl::make_zip_iterator(first, mask),
+                                     oneapi::dpl::make_zip_iterator(last, mask + std::distance(first, last)),
+                                     oneapi::dpl::make_zip_iterator(result, oneapi::dpl::discard_iterator()),
+                                     hypreSycl_predicate_key_fun<Pred>(pred));
+   return std::get<0>(ret_val.base());
+}
+
+// Similar to above, need mask version of remove_if
+// NOTE: We copy the mask below because this implementation also
+// remove elements from the mask in addition to the input.
+template <typename Iter1, typename Iter2, typename Pred>
+Iter1 hypreSycl_remove_if(Iter1 first, Iter1 last, Iter2 mask, Pred pred)
+{
+   static_assert(
+      std::is_same<typename std::iterator_traits<Iter1>::iterator_category,
+      std::random_access_iterator_tag>::value &&
+      std::is_same<typename std::iterator_traits<Iter2>::iterator_category,
+      std::random_access_iterator_tag>::value,
+      "Iterators passed to algorithms must be random-access iterators.");
+   using ValueType = typename std::iterator_traits<Iter2>::value_type;
+   Iter2 mask_cpy = hypre_CTAlloc(ValueType, std::distance(first, last), HYPRE_MEMORY_DEVICE);
+   hypre_TMemcpy(mask_cpy, mask, ValueType, std::distance(first, last), HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+   auto ret_val = HYPRE_ONEDPL_CALL( std::remove_if,
+                                     oneapi::dpl::make_zip_iterator(first, mask_cpy),
+                                     oneapi::dpl::make_zip_iterator(last, mask_cpy + std::distance(first, last)),
+                                     hypreSycl_predicate_key_fun<Pred>(pred));
+   hypre_TFree(mask_cpy, HYPRE_MEMORY_DEVICE);
+   return std::get<0>(ret_val.base());
+}
+
+// Similar to above, need mask version of remove_copy_if
+template <typename Iter1, typename Iter2, typename Iter3, typename Pred>
+Iter3 hypreSycl_remove_copy_if(Iter1 first, Iter1 last, Iter2 mask, Iter3 result, Pred pred)
+{
+   static_assert(
+      std::is_same<typename std::iterator_traits<Iter1>::iterator_category,
+      std::random_access_iterator_tag>::value &&
+      std::is_same<typename std::iterator_traits<Iter2>::iterator_category,
+      std::random_access_iterator_tag>::value,
+      "Iterators passed to algorithms must be random-access iterators.");
+   auto ret_val = HYPRE_ONEDPL_CALL( std::remove_copy_if,
+                                     oneapi::dpl::make_zip_iterator(first, mask),
+                                     oneapi::dpl::make_zip_iterator(last, mask + std::distance(first, last)),
+                                     oneapi::dpl::make_zip_iterator(result, oneapi::dpl::discard_iterator()),
+                                     hypreSycl_predicate_key_fun<Pred>(pred));
+   return std::get<0>(ret_val.base());
+}
+
+// Equivalent of thrust::scatter_if
+template <typename InputIter1, typename InputIter2,
+          typename InputIter3, typename OutputIter, typename Predicate>
+void hypreSycl_scatter_if(InputIter1 first, InputIter1 last,
+                          InputIter2 map, InputIter3 mask, OutputIter result,
+                          Predicate pred)
+{
+   static_assert(
+      std::is_same<typename std::iterator_traits<InputIter1>::iterator_category,
+      std::random_access_iterator_tag>::value &&
+      std::is_same <
+      typename std::iterator_traits<InputIter2>::iterator_category,
+      std::random_access_iterator_tag >::value &&
+      std::is_same <
+      typename std::iterator_traits<InputIter3>::iterator_category,
+      std::random_access_iterator_tag >::value &&
+      std::is_same <
+      typename std::iterator_traits<OutputIter>::iterator_category,
+      std::random_access_iterator_tag >::value,
+      "Iterators passed to algorithms must be random-access iterators.");
+   hypreSycl_transform_if(first, last, mask,
+                          oneapi::dpl::make_permutation_iterator(result, map),
+   [ = ](auto &&v) { return v; }, [ = ](auto &&m) { return pred(m); });
+}
+
+// Equivalent of thrust::scatter
+template <typename InputIter1, typename InputIter2,
+          typename OutputIter>
+void hypreSycl_scatter(InputIter1 first, InputIter1 last,
+                             InputIter2 map, OutputIter result)
+{
+   static_assert(
+      std::is_same<typename std::iterator_traits<InputIter1>::iterator_category,
+      std::random_access_iterator_tag>::value &&
+      std::is_same <
+      typename std::iterator_traits<InputIter2>::iterator_category,
+      std::random_access_iterator_tag >::value &&
+      std::is_same <
+      typename std::iterator_traits<OutputIter>::iterator_category,
+      std::random_access_iterator_tag >::value,
+      "Iterators passed to algorithms must be random-access iterators.");
+   auto perm_result =
+      oneapi::dpl::make_permutation_iterator(result, map);
+   HYPRE_ONEDPL_CALL( oneapi::dpl::copy, first, last, perm_result);
+}
+
+// Equivalent of thrust::gather_if
+template <typename InputIter1, typename InputIter2,
+          typename InputIter3, typename OutputIter, typename Predicate>
+void hypreSycl_gather_if(InputIter1 map_first, InputIter1 map_last,
+                          InputIter2 mask, InputIter3 input_first, OutputIter result,
+                          Predicate pred)
+{
+   static_assert(
+      std::is_same<typename std::iterator_traits<InputIter1>::iterator_category,
+      std::random_access_iterator_tag>::value &&
+      std::is_same <
+      typename std::iterator_traits<InputIter2>::iterator_category,
+      std::random_access_iterator_tag >::value &&
+      std::is_same <
+      typename std::iterator_traits<InputIter3>::iterator_category,
+      std::random_access_iterator_tag >::value &&
+      std::is_same <
+      typename std::iterator_traits<OutputIter>::iterator_category,
+      std::random_access_iterator_tag >::value,
+      "Iterators passed to algorithms must be random-access iterators.");
+   auto perm_begin =
+      oneapi::dpl::make_permutation_iterator(input_first, map_first);
+   const auto n = std::distance(map_first, map_last);
+   hypreSycl_copy_if(perm_begin, perm_begin + n, mask, result,
+   [ = ](auto &&m) { return pred(m); } );
+}
+
+// Equivalent of thrust::gather
+template <typename InputIter1, typename InputIter2,
+          typename OutputIter>
+OutputIter hypreSycl_gather(InputIter1 map_first, InputIter1 map_last,
+                            InputIter2 input_first, OutputIter result)
+{
+   static_assert(
+      std::is_same<typename std::iterator_traits<InputIter1>::iterator_category,
+      std::random_access_iterator_tag>::value &&
+      std::is_same <
+      typename std::iterator_traits<InputIter2>::iterator_category,
+      std::random_access_iterator_tag >::value &&
+      std::is_same <
+      typename std::iterator_traits<OutputIter>::iterator_category,
+      std::random_access_iterator_tag >::value,
+      "Iterators passed to algorithms must be random-access iterators.");
+   auto perm_begin =
+      oneapi::dpl::make_permutation_iterator(input_first, map_first);
+   const auto n = std::distance(map_first, map_last);
+   return HYPRE_ONEDPL_CALL( oneapi::dpl::copy, perm_begin, perm_begin + n, result);
+}
+
+// Equivalent of thrust::sequence (with step=1)
+template <class Iter, class T>
+void hypreSycl_sequence(Iter first, Iter last, T init = 0)
+{
+   static_assert(
+      std::is_same<typename std::iterator_traits<Iter>::iterator_category,
+      std::random_access_iterator_tag>::value,
+      "Iterators passed to algorithms must be random-access iterators.");
+   using DiffType = typename std::iterator_traits<Iter>::difference_type;
+   HYPRE_ONEDPL_CALL( std::transform,
+                      oneapi::dpl::counting_iterator<DiffType>(init),
+                      oneapi::dpl::counting_iterator<DiffType>(init + std::distance(first, last)),
+                      first,
+                      [](auto i) { return i; });
+}
+
+// Equivalent of thrust::stable_sort_by_key
+template <class Iter1, class Iter2>
+void hypreSycl_stable_sort_by_key(Iter1 keys_first, Iter1 keys_last, Iter2 values_first)
+{
+   static_assert(
+      std::is_same<typename std::iterator_traits<Iter1>::iterator_category,
+      std::random_access_iterator_tag>::value &&
+      std::is_same<typename std::iterator_traits<Iter2>::iterator_category,
+      std::random_access_iterator_tag>::value,
+      "Iterators passed to algorithms must be random-access iterators.");
+   const auto n = std::distance(keys_first, keys_last);
+   auto zipped_begin = oneapi::dpl::make_zip_iterator(keys_first, values_first);
+   HYPRE_ONEDPL_CALL( std::stable_sort,
+                      zipped_begin,
+                      zipped_begin + n,
+   [](auto lhs, auto rhs) { return std::get<0>(lhs) < std::get<0>(rhs); } );
+}
+
+#endif
+
+#endif
diff --git a/external/hypre/src/utilities/_hypre_utilities.h b/external/hypre/src/utilities/_hypre_utilities.h
index 07ccf9a7..731f95fc 100644
--- a/external/hypre/src/utilities/_hypre_utilities.h
+++ b/external/hypre/src/utilities/_hypre_utilities.h
@@ -15,7 +15,179 @@ extern "C" {
 #endif
 
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ * General structures and values
+ *
+ *****************************************************************************/
+
+#ifndef HYPRE_HANDLE_H
+#define HYPRE_HANDLE_H
+
+#if defined(HYPRE_USING_UMPIRE)
+#include "umpire/config.hpp"
+#if UMPIRE_VERSION_MAJOR >= 2022
+#include "umpire/interface/c_fortran/umpire.h"
+#define hypre_umpire_resourcemanager_make_allocator_pool umpire_resourcemanager_make_allocator_quick_pool
+#else
+#include "umpire/interface/umpire.h"
+#define hypre_umpire_resourcemanager_make_allocator_pool umpire_resourcemanager_make_allocator_pool
+#endif /* UMPIRE_VERSION_MAJOR >= 2022 */
+#define HYPRE_UMPIRE_POOL_NAME_MAX_LEN 1024
+#endif /* defined(HYPRE_USING_UMPIRE) */
+
+struct hypre_DeviceData;
+typedef struct hypre_DeviceData hypre_DeviceData;
+typedef void (*GPUMallocFunc)(void **, size_t);
+typedef void (*GPUMfreeFunc)(void *);
+
+typedef struct
+{
+   HYPRE_Int              log_level;
+   HYPRE_Int              hypre_error;
+   HYPRE_MemoryLocation   memory_location;
+   HYPRE_ExecutionPolicy  default_exec_policy;
+
+   /* the device buffers needed to do MPI communication for struct comm */
+   HYPRE_Complex         *struct_comm_recv_buffer;
+   HYPRE_Complex         *struct_comm_send_buffer;
+   HYPRE_Int              struct_comm_recv_buffer_size;
+   HYPRE_Int              struct_comm_send_buffer_size;
+
+   /* GPU MPI */
+#if defined(HYPRE_USING_GPU) || defined(HYPRE_USING_DEVICE_OPENMP)
+   HYPRE_Int              use_gpu_aware_mpi;
+#endif
+
+#if defined(HYPRE_USING_GPU)
+   hypre_DeviceData      *device_data;
+   HYPRE_Int              device_gs_method; /* device G-S options */
+#endif
+
+   /* user malloc/free function pointers */
+   GPUMallocFunc          user_device_malloc;
+   GPUMfreeFunc           user_device_free;
+
+#if defined(HYPRE_USING_UMPIRE)
+   char                   umpire_device_pool_name[HYPRE_UMPIRE_POOL_NAME_MAX_LEN];
+   char                   umpire_um_pool_name[HYPRE_UMPIRE_POOL_NAME_MAX_LEN];
+   char                   umpire_host_pool_name[HYPRE_UMPIRE_POOL_NAME_MAX_LEN];
+   char                   umpire_pinned_pool_name[HYPRE_UMPIRE_POOL_NAME_MAX_LEN];
+   size_t                 umpire_device_pool_size;
+   size_t                 umpire_um_pool_size;
+   size_t                 umpire_host_pool_size;
+   size_t                 umpire_pinned_pool_size;
+   size_t                 umpire_block_size;
+   HYPRE_Int              own_umpire_device_pool;
+   HYPRE_Int              own_umpire_um_pool;
+   HYPRE_Int              own_umpire_host_pool;
+   HYPRE_Int              own_umpire_pinned_pool;
+   umpire_resourcemanager umpire_rm;
+#endif
+
+#if defined(HYPRE_USING_MAGMA)
+   magma_queue_t          magma_queue;
+#endif
+} hypre_Handle;
+
+/* accessor macros to hypre_Handle */
+#define hypre_HandleLogLevel(hypre_handle)                       ((hypre_handle) -> log_level)
+#define hypre_HandleMemoryLocation(hypre_handle)                 ((hypre_handle) -> memory_location)
+#define hypre_HandleDefaultExecPolicy(hypre_handle)              ((hypre_handle) -> default_exec_policy)
+
+#define hypre_HandleStructCommRecvBuffer(hypre_handle)           ((hypre_handle) -> struct_comm_recv_buffer)
+#define hypre_HandleStructCommSendBuffer(hypre_handle)           ((hypre_handle) -> struct_comm_send_buffer)
+#define hypre_HandleStructCommRecvBufferSize(hypre_handle)       ((hypre_handle) -> struct_comm_recv_buffer_size)
+#define hypre_HandleStructCommSendBufferSize(hypre_handle)       ((hypre_handle) -> struct_comm_send_buffer_size)
+
+#define hypre_HandleDeviceData(hypre_handle)                     ((hypre_handle) -> device_data)
+#define hypre_HandleDeviceGSMethod(hypre_handle)                 ((hypre_handle) -> device_gs_method)
+#define hypre_HandleUseGpuAwareMPI(hypre_handle)                 ((hypre_handle) -> use_gpu_aware_mpi)
+
+#define hypre_HandleCurandGenerator(hypre_handle)                hypre_DeviceDataCurandGenerator(hypre_HandleDeviceData(hypre_handle))
+#define hypre_HandleCublasHandle(hypre_handle)                   hypre_DeviceDataCublasHandle(hypre_HandleDeviceData(hypre_handle))
+#define hypre_HandleCusparseHandle(hypre_handle)                 hypre_DeviceDataCusparseHandle(hypre_HandleDeviceData(hypre_handle))
+#define hypre_HandleVendorSolverHandle(hypre_handle)             hypre_DeviceDataVendorSolverHandle(hypre_HandleDeviceData(hypre_handle))
+#define hypre_HandleComputeStream(hypre_handle)                  hypre_DeviceDataComputeStream(hypre_HandleDeviceData(hypre_handle))
+#define hypre_HandleCubBinGrowth(hypre_handle)                   hypre_DeviceDataCubBinGrowth(hypre_HandleDeviceData(hypre_handle))
+#define hypre_HandleCubMinBin(hypre_handle)                      hypre_DeviceDataCubMinBin(hypre_HandleDeviceData(hypre_handle))
+#define hypre_HandleCubMaxBin(hypre_handle)                      hypre_DeviceDataCubMaxBin(hypre_HandleDeviceData(hypre_handle))
+#define hypre_HandleCubMaxCachedBytes(hypre_handle)              hypre_DeviceDataCubMaxCachedBytes(hypre_HandleDeviceData(hypre_handle))
+#define hypre_HandleCubDevAllocator(hypre_handle)                hypre_DeviceDataCubDevAllocator(hypre_HandleDeviceData(hypre_handle))
+#define hypre_HandleCubUvmAllocator(hypre_handle)                hypre_DeviceDataCubUvmAllocator(hypre_HandleDeviceData(hypre_handle))
+#define hypre_HandleDevice(hypre_handle)                         hypre_DeviceDataDevice(hypre_HandleDeviceData(hypre_handle))
+#define hypre_HandleDeviceMaxWorkGroupSize(hypre_handle)         hypre_DeviceDataDeviceMaxWorkGroupSize(hypre_HandleDeviceData(hypre_handle))
+#define hypre_HandleDeviceMaxShmemPerBlock(hypre_handle)         hypre_DeviceDataDeviceMaxShmemPerBlock(hypre_HandleDeviceData(hypre_handle))
+#define hypre_HandleDeviceMaxShmemPerBlockInited(hypre_handle)   hypre_DeviceDataDeviceMaxShmemPerBlockInited(hypre_HandleDeviceData(hypre_handle))
+#define hypre_HandleComputeStreamNum(hypre_handle)               hypre_DeviceDataComputeStreamNum(hypre_HandleDeviceData(hypre_handle))
+#define hypre_HandleReduceBuffer(hypre_handle)                   hypre_DeviceDataReduceBuffer(hypre_HandleDeviceData(hypre_handle))
+#define hypre_HandleSpgemmUseVendor(hypre_handle)                hypre_DeviceDataSpgemmUseVendor(hypre_HandleDeviceData(hypre_handle))
+#define hypre_HandleSpMVUseVendor(hypre_handle)                  hypre_DeviceDataSpMVUseVendor(hypre_HandleDeviceData(hypre_handle))
+#define hypre_HandleSpTransUseVendor(hypre_handle)               hypre_DeviceDataSpTransUseVendor(hypre_HandleDeviceData(hypre_handle))
+#define hypre_HandleSpgemmAlgorithm(hypre_handle)                hypre_DeviceDataSpgemmAlgorithm(hypre_HandleDeviceData(hypre_handle))
+#define hypre_HandleSpgemmBinned(hypre_handle)                   hypre_DeviceDataSpgemmBinned(hypre_HandleDeviceData(hypre_handle))
+#define hypre_HandleSpgemmNumBin(hypre_handle)                   hypre_DeviceDataSpgemmNumBin(hypre_HandleDeviceData(hypre_handle))
+#define hypre_HandleSpgemmHighestBin(hypre_handle)               hypre_DeviceDataSpgemmHighestBin(hypre_HandleDeviceData(hypre_handle))
+#define hypre_HandleSpgemmBlockNumDim(hypre_handle)              hypre_DeviceDataSpgemmBlockNumDim(hypre_HandleDeviceData(hypre_handle))
+#define hypre_HandleSpgemmRownnzEstimateMethod(hypre_handle)     hypre_DeviceDataSpgemmRownnzEstimateMethod(hypre_HandleDeviceData(hypre_handle))
+#define hypre_HandleSpgemmRownnzEstimateNsamples(hypre_handle)   hypre_DeviceDataSpgemmRownnzEstimateNsamples(hypre_HandleDeviceData(hypre_handle))
+#define hypre_HandleSpgemmRownnzEstimateMultFactor(hypre_handle) hypre_DeviceDataSpgemmRownnzEstimateMultFactor(hypre_HandleDeviceData(hypre_handle))
+#define hypre_HandleDeviceAllocator(hypre_handle)                hypre_DeviceDataDeviceAllocator(hypre_HandleDeviceData(hypre_handle))
+#define hypre_HandleUseGpuRand(hypre_handle)                     hypre_DeviceDataUseGpuRand(hypre_HandleDeviceData(hypre_handle))
+
+#define hypre_HandleUserDeviceMalloc(hypre_handle)               ((hypre_handle) -> user_device_malloc)
+#define hypre_HandleUserDeviceMfree(hypre_handle)                ((hypre_handle) -> user_device_free)
+
+#define hypre_HandleUmpireResourceMan(hypre_handle)              ((hypre_handle) -> umpire_rm)
+#define hypre_HandleUmpireDevicePoolSize(hypre_handle)           ((hypre_handle) -> umpire_device_pool_size)
+#define hypre_HandleUmpireUMPoolSize(hypre_handle)               ((hypre_handle) -> umpire_um_pool_size)
+#define hypre_HandleUmpireHostPoolSize(hypre_handle)             ((hypre_handle) -> umpire_host_pool_size)
+#define hypre_HandleUmpirePinnedPoolSize(hypre_handle)           ((hypre_handle) -> umpire_pinned_pool_size)
+#define hypre_HandleUmpireBlockSize(hypre_handle)                ((hypre_handle) -> umpire_block_size)
+#define hypre_HandleUmpireDevicePoolName(hypre_handle)           ((hypre_handle) -> umpire_device_pool_name)
+#define hypre_HandleUmpireUMPoolName(hypre_handle)               ((hypre_handle) -> umpire_um_pool_name)
+#define hypre_HandleUmpireHostPoolName(hypre_handle)             ((hypre_handle) -> umpire_host_pool_name)
+#define hypre_HandleUmpirePinnedPoolName(hypre_handle)           ((hypre_handle) -> umpire_pinned_pool_name)
+#define hypre_HandleOwnUmpireDevicePool(hypre_handle)            ((hypre_handle) -> own_umpire_device_pool)
+#define hypre_HandleOwnUmpireUMPool(hypre_handle)                ((hypre_handle) -> own_umpire_um_pool)
+#define hypre_HandleOwnUmpireHostPool(hypre_handle)              ((hypre_handle) -> own_umpire_host_pool)
+#define hypre_HandleOwnUmpirePinnedPool(hypre_handle)            ((hypre_handle) -> own_umpire_pinned_pool)
+
+#define hypre_HandleMagmaQueue(hypre_handle)                     ((hypre_handle) -> magma_queue)
+
+#endif
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+#ifndef hypre_STATE_HEADER
+#define hypre_STATE_HEADER
+
+/*--------------------------------------------------------------------------
+ * hypre library state
+ *--------------------------------------------------------------------------*/
+
+typedef enum hypre_State_enum
+{
+   HYPRE_STATE_NONE        = 0,
+   HYPRE_STATE_INITIALIZED = 1,
+   HYPRE_STATE_FINALIZED   = 2
+} hypre_State;
+
+extern hypre_State hypre__global_state;
+
+#endif /* hypre_STATE_HEADER */
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -30,16 +202,48 @@ extern "C" {
 #ifndef hypre_GENERAL_HEADER
 #define hypre_GENERAL_HEADER
 
+/* #include <stdio.h> */
+/* #include <stdlib.h> */
+#include <stdint.h>
+#include <limits.h>
+#include <math.h>
+
+/*--------------------------------------------------------------------------
+ * typedefs
+ *--------------------------------------------------------------------------*/
+
 /* This allows us to consistently avoid 'int' throughout hypre */
 typedef int                    hypre_int;
 typedef long int               hypre_longint;
 typedef unsigned int           hypre_uint;
 typedef unsigned long int      hypre_ulongint;
 typedef unsigned long long int hypre_ulonglongint;
+typedef uint32_t               hypre_uint32;
+typedef uint64_t               hypre_uint64;
 
-/* This allows us to consistently avoid 'double' throughout hypre */
+/* This allows us to consistently avoid 'float' and 'double' throughout hypre */
+typedef float                  hypre_float;
 typedef double                 hypre_double;
 
+/*--------------------------------------------------------------------------
+ * Define macros
+ *--------------------------------------------------------------------------*/
+
+/* Macro for silencing unused function warning */
+#if defined(__GNUC__) || defined(__clang__)
+#define HYPRE_MAYBE_UNUSED_FUNC __attribute__((unused))
+#elif defined(_MSC_VER)
+#define HYPRE_MAYBE_UNUSED_FUNC
+#else
+#define HYPRE_MAYBE_UNUSED_FUNC
+#endif
+
+/* Macro for silencing unused variable warning */
+#define HYPRE_UNUSED_VAR(var) ((void) var)
+
+/* Macro for marking deprecated functions */
+#define HYPRE_DEPRECATED(reason) _Pragma(reason)
+
 /*--------------------------------------------------------------------------
  * Define various functions
  *--------------------------------------------------------------------------*/
@@ -63,10 +267,353 @@ typedef double                 hypre_double;
 #define hypre_pow2(i)  ( 1 << (i) )
 #endif
 
+#ifndef hypre_squared
+#define hypre_squared(i)  ((i) * (i))
+#endif
+
+#ifndef hypre_sqrt
+#if defined(HYPRE_SINGLE)
+#define hypre_sqrt sqrtf
+#elif defined(HYPRE_LONG_DOUBLE)
+#define hypre_sqrt sqrtl
+#else
+#define hypre_sqrt sqrt
+#endif
+#endif
+
+#ifndef hypre_pow
+#if defined(HYPRE_SINGLE)
+#define hypre_pow powf
+#elif defined(HYPRE_LONG_DOUBLE)
+#define hypre_pow powl
+#else
+#define hypre_pow pow
+#endif
+#endif
+
+/* Macro for ceiling division. It assumes non-negative dividend and positive divisor.
+   The result of this macro might need to be casted to an integer type depending on the use case */
+#ifndef hypre_ceildiv
+#define hypre_ceildiv(a, b) (((a) + (b) - 1) / (b))
+#endif
+
+#ifndef hypre_ceil
+#if defined(HYPRE_SINGLE)
+#define hypre_ceil ceilf
+#elif defined(HYPRE_LONG_DOUBLE)
+#define hypre_ceil ceill
+#else
+#define hypre_ceil ceil
+#endif
+#endif
+
+#ifndef hypre_floor
+#if defined(HYPRE_SINGLE)
+#define hypre_floor floorf
+#elif defined(HYPRE_LONG_DOUBLE)
+#define hypre_floor floorl
+#else
+#define hypre_floor floor
+#endif
+#endif
+
+#ifndef hypre_log
+#if defined(HYPRE_SINGLE)
+#define hypre_log logf
+#elif defined(HYPRE_LONG_DOUBLE)
+#define hypre_log logl
+#else
+#define hypre_log log
+#endif
+#endif
+
+#ifndef hypre_exp
+#if defined(HYPRE_SINGLE)
+#define hypre_exp expf
+#elif defined(HYPRE_LONG_DOUBLE)
+#define hypre_exp expl
+#else
+#define hypre_exp exp
+#endif
+#endif
+
+#ifndef hypre_sin
+#if defined(HYPRE_SINGLE)
+#define hypre_sin sinf
+#elif defined(HYPRE_LONG_DOUBLE)
+#define hypre_sin sinl
+#else
+#define hypre_sin sin
+#endif
+#endif
+
+#ifndef hypre_cos
+#if defined(HYPRE_SINGLE)
+#define hypre_cos cosf
+#elif defined(HYPRE_LONG_DOUBLE)
+#define hypre_cos cosl
+#else
+#define hypre_cos cos
+#endif
+#endif
+
+#ifndef hypre_atan
+#if defined(HYPRE_SINGLE)
+#define hypre_atan atanf
+#elif defined(HYPRE_LONG_DOUBLE)
+#define hypre_atan atanl
+#else
+#define hypre_atan atan
+#endif
+#endif
+
+#ifndef hypre_fmod
+#if defined(HYPRE_SINGLE)
+#define hypre_fmod fmodf
+#elif defined(HYPRE_LONG_DOUBLE)
+#define hypre_fmod fmodl
+#else
+#define hypre_fmod fmod
+#endif
+#endif
+
 #endif /* hypre_GENERAL_HEADER */
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+#ifndef HYPRE_BASE_HEADER
+#define HYPRE_BASE_HEADER
+
+/******************************************************************************
+ *
+ * Base private solver struct
+ *
+ *****************************************************************************/
+
+typedef struct
+{
+   HYPRE_PtrToSolverFcn   setup;
+   HYPRE_PtrToSolverFcn   solve;
+   HYPRE_PtrToDestroyFcn  destroy;
+
+} hypre_Solver;
 
+/*--------------------------------------------------------------------------
+ * Accessor functions for the hypre_Solver structure
+ *--------------------------------------------------------------------------*/
+
+#define hypre_SolverSetup(data)       ((data) -> setup)
+#define hypre_SolverSolve(data)       ((data) -> solve)
+#define hypre_SolverDestroy(data)     ((data) -> destroy)
+
+#endif /* HYPRE_BASE_HEADER */
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+#ifndef HYPRE_MAGMA_HEADER
+#define HYPRE_MAGMA_HEADER
+
+#include "HYPRE_config.h"
+
+#if defined(HYPRE_USING_MAGMA)
+
+#include "error.h"
+
+#ifdef __cplusplus
+extern "C++"
+{
+#endif
+
+#if !defined(MAGMA_GLOBAL)
+#define ADD_
+#endif
+#include <magma_v2.h>
+
+#ifdef __cplusplus
+}
+#endif
+
+/*--------------------------------------------------------------------------
+ * Wrappers to MAGMA functions according to hypre's precision
+ *--------------------------------------------------------------------------*/
+
+#if defined(HYPRE_COMPLEX) || defined(HYPRE_LONG_DOUBLE)
+#error "MAGMA interface does not support (yet) HYPRE_COMPLEX and HYPRE_LONG_DOUBLE"
+
+#elif defined(HYPRE_SINGLE)
+#define hypre_magma_getrf_gpu              magma_sgetrf_gpu
+#define hypre_magma_getrf_nat              magma_sgetrf_native
+#define hypre_magma_getrs_gpu              magma_sgetrs_gpu
+#define hypre_magma_getri_gpu              magma_sgetri_gpu
+#define hypre_magma_getri_nb               magma_get_dgetri_nb
+#define hypre_magma_gemv                   magma_sgemv
+
+#else /* Double precision */
+#define hypre_magma_getrf_gpu              magma_dgetrf_gpu
+#define hypre_magma_getrf_nat              magma_dgetrf_native
+#define hypre_magma_getrs_gpu              magma_dgetrs_gpu
+#define hypre_magma_getri_gpu              magma_dgetri_gpu
+#define hypre_magma_getri_nb               magma_get_sgetri_nb
+#define hypre_magma_gemv                   magma_dgemv
+
+#endif
+
+/*--------------------------------------------------------------------------
+ * General wrapper call to MAGMA functions
+ *--------------------------------------------------------------------------*/
+
+#define HYPRE_MAGMA_CALL(call) do {                   \
+   magma_int_t err = call;                            \
+   if (MAGMA_SUCCESS != err) {                        \
+      printf("MAGMA ERROR (code = %d) at %s:%d\n",    \
+            err, __FILE__, __LINE__);                 \
+      hypre_assert(0);                                \
+   } } while(0)
+
+#define HYPRE_MAGMA_VCALL(call) call
+
+#endif /* HYPRE_USING_MAGMA */
+#endif /* HYPRE_MAGMA_HEADER */
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+#ifndef hypre_MATRIX_STATS_HEADER
+#define hypre_MATRIX_STATS_HEADER
+
+/******************************************************************************
+ *
+ * Header info for (generic) matrix statistics data structure
+ *
+ *****************************************************************************/
+
+typedef struct hypre_MatrixStats_struct
+{
+   /* General info */
+   HYPRE_BigInt        num_rows;
+   HYPRE_BigInt        num_cols;
+   hypre_ulonglongint  num_nonzeros;
+
+   /* Actual nonzeros statistics */
+   hypre_ulonglongint  actual_nonzeros;
+   HYPRE_Real          actual_threshold;
+   HYPRE_Real          sparsity;
+
+   /* Nonzeros per row statistics */
+   HYPRE_Int           nnzrow_min;
+   HYPRE_Int           nnzrow_max;
+   HYPRE_Real          nnzrow_avg;
+   HYPRE_Real          nnzrow_stdev;
+   HYPRE_Real          nnzrow_sqsum;
+
+   /* Row sum statistics */
+   HYPRE_Real          rowsum_min;
+   HYPRE_Real          rowsum_max;
+   HYPRE_Real          rowsum_avg;
+   HYPRE_Real          rowsum_stdev;
+   HYPRE_Real          rowsum_sqsum;
+} hypre_MatrixStats;
+
+/*--------------------------------------------------------------------------
+ * Accessor macros
+ *--------------------------------------------------------------------------*/
+
+#define hypre_MatrixStatsNumRows(data)               ((data) -> num_rows)
+#define hypre_MatrixStatsNumCols(data)               ((data) -> num_cols)
+#define hypre_MatrixStatsNumNonzeros(data)           ((data) -> num_nonzeros)
+
+#define hypre_MatrixStatsSparsity(data)              ((data) -> sparsity)
+#define hypre_MatrixStatsActualNonzeros(data)        ((data) -> actual_nonzeros)
+#define hypre_MatrixStatsActualThreshold(data)       ((data) -> actual_threshold)
+
+#define hypre_MatrixStatsNnzrowMin(data)             ((data) -> nnzrow_min)
+#define hypre_MatrixStatsNnzrowMax(data)             ((data) -> nnzrow_max)
+#define hypre_MatrixStatsNnzrowAvg(data)             ((data) -> nnzrow_avg)
+#define hypre_MatrixStatsNnzrowStDev(data)           ((data) -> nnzrow_stdev)
+#define hypre_MatrixStatsNnzrowSqsum(data)           ((data) -> nnzrow_sqsum)
+
+#define hypre_MatrixStatsRowsumMin(data)             ((data) -> rowsum_min)
+#define hypre_MatrixStatsRowsumMax(data)             ((data) -> rowsum_max)
+#define hypre_MatrixStatsRowsumAvg(data)             ((data) -> rowsum_avg)
+#define hypre_MatrixStatsRowsumStDev(data)           ((data) -> rowsum_stdev)
+#define hypre_MatrixStatsRowsumSqsum(data)           ((data) -> rowsum_sqsum)
+
+/******************************************************************************
+ *
+ * Header info for array of (generic) matrix statistics data structure
+ *
+ *****************************************************************************/
+
+typedef struct hypre_MatrixStatsArray_struct
+{
+   HYPRE_Int             capacity;
+   hypre_MatrixStats   **entries;
+} hypre_MatrixStatsArray;
+
+/*--------------------------------------------------------------------------
+ * Accessor macros
+ *--------------------------------------------------------------------------*/
+
+#define hypre_MatrixStatsArrayCapacity(data)         ((data) -> capacity)
+#define hypre_MatrixStatsArrayEntries(data)          ((data) -> entries)
+#define hypre_MatrixStatsArrayEntry(data, i)         ((data) -> entries[i])
+
+/*--------------------------------------------------------------------------
+ * Helper macros for table formatting
+ *--------------------------------------------------------------------------*/
+
+#define HYPRE_PRINT_TOP_DIVISOR(m, d)               \
+   for (HYPRE_Int __i = 0; __i < m; __i++)          \
+   {                                                \
+      for (HYPRE_Int __j = 0; __j < d[__i]; __j++)  \
+      {                                             \
+         hypre_printf("%s", "=");                   \
+      }                                             \
+      if (__i < m - 1)                              \
+      {                                             \
+         hypre_printf("+");                         \
+      }                                             \
+   }                                                \
+   hypre_printf("\n");
+
+#define HYPRE_PRINT_MID_DIVISOR(m, d, msg)          \
+   for (HYPRE_Int __i = 0; __i < m; __i++)          \
+   {                                                \
+      for (HYPRE_Int __j = 0; __j < d[__i]; __j++)  \
+      {                                             \
+         hypre_printf("%s", "-");                   \
+      }                                             \
+      if (__i < m - 1)                              \
+      {                                             \
+         hypre_printf("+");                         \
+      }                                             \
+   }                                                \
+   hypre_printf(" %s\n", msg);
+
+#define HYPRE_PRINT_INDENT(n)                       \
+   hypre_printf("%*s", (n > 0) ? n : 0, "");
+
+
+#define HYPRE_PRINT_SHIFTED_PARAM(n, ...)           \
+   HYPRE_PRINT_INDENT(n)                            \
+   hypre_printf(__VA_ARGS__)
+
+#define HYPRE_NDIGITS_SIZE 12
+
+#endif /* hypre_MATRIX_STATS_HEADER */
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -80,12 +627,14 @@ typedef double                 hypre_double;
 /* printf.c */
 // #ifdef HYPRE_BIGINT
 HYPRE_Int hypre_ndigits( HYPRE_BigInt number );
-HYPRE_Int hypre_printf( const char *format , ... );
-HYPRE_Int hypre_fprintf( FILE *stream , const char *format, ... );
-HYPRE_Int hypre_sprintf( char *s , const char *format, ... );
-HYPRE_Int hypre_scanf( const char *format , ... );
-HYPRE_Int hypre_fscanf( FILE *stream , const char *format, ... );
-HYPRE_Int hypre_sscanf( char *s , const char *format, ... );
+HYPRE_Int hypre_printf( const char *format, ... );
+HYPRE_Int hypre_fprintf( FILE *stream, const char *format, ... );
+HYPRE_Int hypre_sprintf( char *s, const char *format, ... );
+HYPRE_Int hypre_snprintf( char *s, size_t size, const char *format, ...);
+HYPRE_Int hypre_scanf( const char *format, ... );
+HYPRE_Int hypre_fscanf( FILE *stream, const char *format, ... );
+HYPRE_Int hypre_sscanf( char *s, const char *format, ... );
+HYPRE_Int hypre_ParPrintf(MPI_Comm comm, const char *format, ...);
 // #else
 // #define hypre_printf  printf
 // #define hypre_fprintf fprintf
@@ -97,7 +646,7 @@ HYPRE_Int hypre_sscanf( char *s , const char *format, ... );
 
 #endif
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -106,24 +655,49 @@ HYPRE_Int hypre_sscanf( char *s , const char *format, ... );
 #ifndef hypre_ERROR_HEADER
 #define hypre_ERROR_HEADER
 
+#ifdef __cplusplus
+extern "C++"
+{
+#endif
+
 #include <assert.h>
 
+#ifdef __cplusplus
+}
+#endif
+
 /*--------------------------------------------------------------------------
  * Global variable used in hypre error checking
  *--------------------------------------------------------------------------*/
 
-extern HYPRE_Int hypre__global_error;
-#define hypre_error_flag  hypre__global_error
+typedef struct
+{
+   HYPRE_Int  error_flag;
+   HYPRE_Int  temp_error_flag;
+   HYPRE_Int  print_to_memory;
+   HYPRE_Int  verbosity;
+   char      *memory;
+   HYPRE_Int  mem_sz;
+   HYPRE_Int  msg_sz;
+
+} hypre_Error;
+
+extern hypre_Error hypre__global_error;
+#define hypre_error_flag  hypre__global_error.error_flag
+#define hypre_error_temp_flag  hypre__global_error.temp_error_flag
 
 /*--------------------------------------------------------------------------
  * HYPRE error macros
  *--------------------------------------------------------------------------*/
 
 void hypre_error_handler(const char *filename, HYPRE_Int line, HYPRE_Int ierr, const char *msg);
+void hypre_error_handler_clear_messages(void);
+void hypre_error_code_save(void);
+void hypre_error_code_restore(void);
 
-#define hypre_error(IERR)  hypre_error_handler(__FILE__, __LINE__, IERR, NULL)
-#define hypre_error_w_msg(IERR, msg)  hypre_error_handler(__FILE__, __LINE__, IERR, msg)
-#define hypre_error_in_arg(IARG)  hypre_error(HYPRE_ERROR_ARG | IARG<<3)
+#define hypre_error(IERR) hypre_error_handler(__FILE__, __LINE__, IERR, NULL)
+#define hypre_error_w_msg(IERR, msg) hypre_error_handler(__FILE__, __LINE__, IERR, msg)
+#define hypre_error_in_arg(IARG) hypre_error(HYPRE_ERROR_ARG | IARG<<3)
 
 #if defined(HYPRE_DEBUG)
 /* host assert */
@@ -133,7 +707,9 @@ void hypre_error_handler(const char *filename, HYPRE_Int line, HYPRE_Int ierr, c
 #define hypre_device_assert(EX) assert(EX)
 #elif defined(HYPRE_USING_HIP)
 /* FIXME: Currently, asserts in device kernels in HIP do not behave well */
-#define hypre_device_assert(EX)
+#define hypre_device_assert(EX) do { if (0) { static_cast<void> (EX); } } while (0)
+#elif defined(HYPRE_USING_SYCL)
+#define hypre_device_assert(EX) assert(EX)
 #endif
 #else /* #ifdef HYPRE_DEBUG */
 /* this is to silence compiler's unused variable warnings */
@@ -146,9 +722,8 @@ void hypre_error_handler(const char *filename, HYPRE_Int line, HYPRE_Int ierr, c
 #endif
 
 #endif /* hypre_ERROR_HEADER */
-
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -194,16 +769,19 @@ extern "C" {
 #define MPI_COMM_SELF        hypre_MPI_COMM_SELF
 #define MPI_COMM_TYPE_SHARED hypre_MPI_COMM_TYPE_SHARED
 
-#define MPI_BOTTOM  	    hypre_MPI_BOTTOM
+#define MPI_BOTTOM          hypre_MPI_BOTTOM
 
 #define MPI_FLOAT           hypre_MPI_FLOAT
 #define MPI_DOUBLE          hypre_MPI_DOUBLE
 #define MPI_LONG_DOUBLE     hypre_MPI_LONG_DOUBLE
 #define MPI_INT             hypre_MPI_INT
-#define MPI_LONG_LONG_INT   hypre_MPI_INT
+#define MPI_LONG_LONG_INT   hypre_MPI_LONG_LONG_INT
 #define MPI_CHAR            hypre_MPI_CHAR
 #define MPI_LONG            hypre_MPI_LONG
 #define MPI_BYTE            hypre_MPI_BYTE
+
+#define MPI_C_FLOAT_COMPLEX hypre_MPI_COMPLEX
+#define MPI_C_LONG_DOUBLE_COMPLEX hypre_MPI_COMPLEX
 #define MPI_C_DOUBLE_COMPLEX hypre_MPI_COMPLEX
 
 #define MPI_SUM             hypre_MPI_SUM
@@ -211,6 +789,7 @@ extern "C" {
 #define MPI_MAX             hypre_MPI_MAX
 #define MPI_LOR             hypre_MPI_LOR
 #define MPI_LAND            hypre_MPI_LAND
+#define MPI_BOR             hypre_MPI_BOR
 #define MPI_SUCCESS         hypre_MPI_SUCCESS
 #define MPI_STATUSES_IGNORE hypre_MPI_STATUSES_IGNORE
 
@@ -288,7 +867,7 @@ typedef HYPRE_Int hypre_MPI_Comm;
 typedef HYPRE_Int hypre_MPI_Group;
 typedef HYPRE_Int hypre_MPI_Request;
 typedef HYPRE_Int hypre_MPI_Datatype;
-typedef void (hypre_MPI_User_function) ();
+typedef void (hypre_MPI_User_function) (void);
 
 typedef struct
 {
@@ -317,12 +896,14 @@ typedef HYPRE_Int  hypre_MPI_Info;
 #define  hypre_MPI_BYTE 6
 #define  hypre_MPI_REAL 7
 #define  hypre_MPI_COMPLEX 8
+#define  hypre_MPI_LONG_LONG_INT 9
 
 #define  hypre_MPI_SUM 0
 #define  hypre_MPI_MIN 1
 #define  hypre_MPI_MAX 2
 #define  hypre_MPI_LOR 3
 #define  hypre_MPI_LAND 4
+#define  hypre_MPI_BOR 5
 #define  hypre_MPI_SUCCESS 0
 #define  hypre_MPI_STATUSES_IGNORE 0
 
@@ -371,6 +952,7 @@ typedef MPI_User_function    hypre_MPI_User_function;
 #define  hypre_MPI_MIN MPI_MIN
 #define  hypre_MPI_MAX MPI_MAX
 #define  hypre_MPI_LOR MPI_LOR
+#define  hypre_MPI_BOR MPI_BOR
 #define  hypre_MPI_SUCCESS MPI_SUCCESS
 #define  hypre_MPI_STATUSES_IGNORE MPI_STATUSES_IGNORE
 
@@ -394,61 +976,100 @@ typedef MPI_User_function    hypre_MPI_User_function;
  *--------------------------------------------------------------------------*/
 
 /* mpistubs.c */
-HYPRE_Int hypre_MPI_Init( hypre_int *argc , char ***argv );
+HYPRE_Int hypre_MPI_Init( hypre_int *argc, char ***argv );
 HYPRE_Int hypre_MPI_Finalize( void );
-HYPRE_Int hypre_MPI_Abort( hypre_MPI_Comm comm , HYPRE_Int errorcode );
+HYPRE_Int hypre_MPI_Abort( hypre_MPI_Comm comm, HYPRE_Int errorcode );
 HYPRE_Real hypre_MPI_Wtime( void );
 HYPRE_Real hypre_MPI_Wtick( void );
 HYPRE_Int hypre_MPI_Barrier( hypre_MPI_Comm comm );
-HYPRE_Int hypre_MPI_Comm_create( hypre_MPI_Comm comm , hypre_MPI_Group group , hypre_MPI_Comm *newcomm );
-HYPRE_Int hypre_MPI_Comm_dup( hypre_MPI_Comm comm , hypre_MPI_Comm *newcomm );
+HYPRE_Int hypre_MPI_Comm_create( hypre_MPI_Comm comm, hypre_MPI_Group group,
+                                 hypre_MPI_Comm *newcomm );
+HYPRE_Int hypre_MPI_Comm_dup( hypre_MPI_Comm comm, hypre_MPI_Comm *newcomm );
 hypre_MPI_Comm hypre_MPI_Comm_f2c( hypre_int comm );
-HYPRE_Int hypre_MPI_Comm_size( hypre_MPI_Comm comm , HYPRE_Int *size );
-HYPRE_Int hypre_MPI_Comm_rank( hypre_MPI_Comm comm , HYPRE_Int *rank );
+HYPRE_Int hypre_MPI_Comm_size( hypre_MPI_Comm comm, HYPRE_Int *size );
+HYPRE_Int hypre_MPI_Comm_rank( hypre_MPI_Comm comm, HYPRE_Int *rank );
 HYPRE_Int hypre_MPI_Comm_free( hypre_MPI_Comm *comm );
-HYPRE_Int hypre_MPI_Comm_group( hypre_MPI_Comm comm , hypre_MPI_Group *group );
-HYPRE_Int hypre_MPI_Comm_split( hypre_MPI_Comm comm, HYPRE_Int n, HYPRE_Int m, hypre_MPI_Comm * comms );
-HYPRE_Int hypre_MPI_Group_incl( hypre_MPI_Group group , HYPRE_Int n , HYPRE_Int *ranks , hypre_MPI_Group *newgroup );
+HYPRE_Int hypre_MPI_Comm_group( hypre_MPI_Comm comm, hypre_MPI_Group *group );
+HYPRE_Int hypre_MPI_Comm_split( hypre_MPI_Comm comm, HYPRE_Int n, HYPRE_Int m,
+                                hypre_MPI_Comm * comms );
+HYPRE_Int hypre_MPI_Group_incl( hypre_MPI_Group group, HYPRE_Int n, HYPRE_Int *ranks,
+                                hypre_MPI_Group *newgroup );
 HYPRE_Int hypre_MPI_Group_free( hypre_MPI_Group *group );
-HYPRE_Int hypre_MPI_Address( void *location , hypre_MPI_Aint *address );
-HYPRE_Int hypre_MPI_Get_count( hypre_MPI_Status *status , hypre_MPI_Datatype datatype , HYPRE_Int *count );
-HYPRE_Int hypre_MPI_Alltoall( void *sendbuf , HYPRE_Int sendcount , hypre_MPI_Datatype sendtype , void *recvbuf , HYPRE_Int recvcount , hypre_MPI_Datatype recvtype , hypre_MPI_Comm comm );
-HYPRE_Int hypre_MPI_Allgather( void *sendbuf , HYPRE_Int sendcount , hypre_MPI_Datatype sendtype , void *recvbuf , HYPRE_Int recvcount , hypre_MPI_Datatype recvtype , hypre_MPI_Comm comm );
-HYPRE_Int hypre_MPI_Allgatherv( void *sendbuf , HYPRE_Int sendcount , hypre_MPI_Datatype sendtype , void *recvbuf , HYPRE_Int *recvcounts , HYPRE_Int *displs , hypre_MPI_Datatype recvtype , hypre_MPI_Comm comm );
-HYPRE_Int hypre_MPI_Gather( void *sendbuf , HYPRE_Int sendcount , hypre_MPI_Datatype sendtype , void *recvbuf , HYPRE_Int recvcount , hypre_MPI_Datatype recvtype , HYPRE_Int root , hypre_MPI_Comm comm );
-HYPRE_Int hypre_MPI_Gatherv( void *sendbuf , HYPRE_Int sendcount , hypre_MPI_Datatype sendtype , void *recvbuf , HYPRE_Int *recvcounts , HYPRE_Int *displs , hypre_MPI_Datatype recvtype , HYPRE_Int root , hypre_MPI_Comm comm );
-HYPRE_Int hypre_MPI_Scatter( void *sendbuf , HYPRE_Int sendcount , hypre_MPI_Datatype sendtype , void *recvbuf , HYPRE_Int recvcount , hypre_MPI_Datatype recvtype , HYPRE_Int root , hypre_MPI_Comm comm );
-HYPRE_Int hypre_MPI_Scatterv( void *sendbuf , HYPRE_Int *sendcounts , HYPRE_Int *displs, hypre_MPI_Datatype sendtype , void *recvbuf , HYPRE_Int recvcount , hypre_MPI_Datatype recvtype , HYPRE_Int root , hypre_MPI_Comm comm );
-HYPRE_Int hypre_MPI_Bcast( void *buffer , HYPRE_Int count , hypre_MPI_Datatype datatype , HYPRE_Int root , hypre_MPI_Comm comm );
-HYPRE_Int hypre_MPI_Send( void *buf , HYPRE_Int count , hypre_MPI_Datatype datatype , HYPRE_Int dest , HYPRE_Int tag , hypre_MPI_Comm comm );
-HYPRE_Int hypre_MPI_Recv( void *buf , HYPRE_Int count , hypre_MPI_Datatype datatype , HYPRE_Int source , HYPRE_Int tag , hypre_MPI_Comm comm , hypre_MPI_Status *status );
-HYPRE_Int hypre_MPI_Isend( void *buf , HYPRE_Int count , hypre_MPI_Datatype datatype , HYPRE_Int dest , HYPRE_Int tag , hypre_MPI_Comm comm , hypre_MPI_Request *request );
-HYPRE_Int hypre_MPI_Irecv( void *buf , HYPRE_Int count , hypre_MPI_Datatype datatype , HYPRE_Int source , HYPRE_Int tag , hypre_MPI_Comm comm , hypre_MPI_Request *request );
-HYPRE_Int hypre_MPI_Send_init( void *buf , HYPRE_Int count , hypre_MPI_Datatype datatype , HYPRE_Int dest , HYPRE_Int tag , hypre_MPI_Comm comm , hypre_MPI_Request *request );
-HYPRE_Int hypre_MPI_Recv_init( void *buf , HYPRE_Int count , hypre_MPI_Datatype datatype , HYPRE_Int dest , HYPRE_Int tag , hypre_MPI_Comm comm , hypre_MPI_Request *request );
-HYPRE_Int hypre_MPI_Irsend( void *buf , HYPRE_Int count , hypre_MPI_Datatype datatype , HYPRE_Int dest , HYPRE_Int tag , hypre_MPI_Comm comm , hypre_MPI_Request *request );
-HYPRE_Int hypre_MPI_Startall( HYPRE_Int count , hypre_MPI_Request *array_of_requests );
-HYPRE_Int hypre_MPI_Probe( HYPRE_Int source , HYPRE_Int tag , hypre_MPI_Comm comm , hypre_MPI_Status *status );
-HYPRE_Int hypre_MPI_Iprobe( HYPRE_Int source , HYPRE_Int tag , hypre_MPI_Comm comm , HYPRE_Int *flag , hypre_MPI_Status *status );
-HYPRE_Int hypre_MPI_Test( hypre_MPI_Request *request , HYPRE_Int *flag , hypre_MPI_Status *status );
-HYPRE_Int hypre_MPI_Testall( HYPRE_Int count , hypre_MPI_Request *array_of_requests , HYPRE_Int *flag , hypre_MPI_Status *array_of_statuses );
-HYPRE_Int hypre_MPI_Wait( hypre_MPI_Request *request , hypre_MPI_Status *status );
-HYPRE_Int hypre_MPI_Waitall( HYPRE_Int count , hypre_MPI_Request *array_of_requests , hypre_MPI_Status *array_of_statuses );
-HYPRE_Int hypre_MPI_Waitany( HYPRE_Int count , hypre_MPI_Request *array_of_requests , HYPRE_Int *index , hypre_MPI_Status *status );
-HYPRE_Int hypre_MPI_Allreduce( void *sendbuf , void *recvbuf , HYPRE_Int count , hypre_MPI_Datatype datatype , hypre_MPI_Op op , hypre_MPI_Comm comm );
-HYPRE_Int hypre_MPI_Reduce( void *sendbuf , void *recvbuf , HYPRE_Int count , hypre_MPI_Datatype datatype , hypre_MPI_Op op , HYPRE_Int root , hypre_MPI_Comm comm );
-HYPRE_Int hypre_MPI_Scan( void *sendbuf , void *recvbuf , HYPRE_Int count , hypre_MPI_Datatype datatype , hypre_MPI_Op op , hypre_MPI_Comm comm );
+HYPRE_Int hypre_MPI_Address( void *location, hypre_MPI_Aint *address );
+HYPRE_Int hypre_MPI_Get_count( hypre_MPI_Status *status, hypre_MPI_Datatype datatype,
+                               HYPRE_Int *count );
+HYPRE_Int hypre_MPI_Alltoall( void *sendbuf, HYPRE_Int sendcount, hypre_MPI_Datatype sendtype,
+                              void *recvbuf, HYPRE_Int recvcount, hypre_MPI_Datatype recvtype, hypre_MPI_Comm comm );
+HYPRE_Int hypre_MPI_Allgather( void *sendbuf, HYPRE_Int sendcount, hypre_MPI_Datatype sendtype,
+                               void *recvbuf, HYPRE_Int recvcount, hypre_MPI_Datatype recvtype, hypre_MPI_Comm comm );
+HYPRE_Int hypre_MPI_Allgatherv( void *sendbuf, HYPRE_Int sendcount, hypre_MPI_Datatype sendtype,
+                                void *recvbuf, HYPRE_Int *recvcounts, HYPRE_Int *displs, hypre_MPI_Datatype recvtype,
+                                hypre_MPI_Comm comm );
+HYPRE_Int hypre_MPI_Gather( void *sendbuf, HYPRE_Int sendcount, hypre_MPI_Datatype sendtype,
+                            void *recvbuf, HYPRE_Int recvcount, hypre_MPI_Datatype recvtype, HYPRE_Int root,
+                            hypre_MPI_Comm comm );
+HYPRE_Int hypre_MPI_Gatherv( void *sendbuf, HYPRE_Int sendcount, hypre_MPI_Datatype sendtype,
+                             void *recvbuf, HYPRE_Int *recvcounts, HYPRE_Int *displs, hypre_MPI_Datatype recvtype,
+                             HYPRE_Int root, hypre_MPI_Comm comm );
+HYPRE_Int hypre_MPI_Scatter( void *sendbuf, HYPRE_Int sendcount, hypre_MPI_Datatype sendtype,
+                             void *recvbuf, HYPRE_Int recvcount, hypre_MPI_Datatype recvtype, HYPRE_Int root,
+                             hypre_MPI_Comm comm );
+HYPRE_Int hypre_MPI_Scatterv( void *sendbuf, HYPRE_Int *sendcounts, HYPRE_Int *displs,
+                              hypre_MPI_Datatype sendtype, void *recvbuf, HYPRE_Int recvcount, hypre_MPI_Datatype recvtype,
+                              HYPRE_Int root, hypre_MPI_Comm comm );
+HYPRE_Int hypre_MPI_Bcast( void *buffer, HYPRE_Int count, hypre_MPI_Datatype datatype,
+                           HYPRE_Int root, hypre_MPI_Comm comm );
+HYPRE_Int hypre_MPI_Send( void *buf, HYPRE_Int count, hypre_MPI_Datatype datatype, HYPRE_Int dest,
+                          HYPRE_Int tag, hypre_MPI_Comm comm );
+HYPRE_Int hypre_MPI_Recv( void *buf, HYPRE_Int count, hypre_MPI_Datatype datatype, HYPRE_Int source,
+                          HYPRE_Int tag, hypre_MPI_Comm comm, hypre_MPI_Status *status );
+HYPRE_Int hypre_MPI_Isend( void *buf, HYPRE_Int count, hypre_MPI_Datatype datatype, HYPRE_Int dest,
+                           HYPRE_Int tag, hypre_MPI_Comm comm, hypre_MPI_Request *request );
+HYPRE_Int hypre_MPI_Irecv( void *buf, HYPRE_Int count, hypre_MPI_Datatype datatype,
+                           HYPRE_Int source, HYPRE_Int tag, hypre_MPI_Comm comm, hypre_MPI_Request *request );
+HYPRE_Int hypre_MPI_Send_init( void *buf, HYPRE_Int count, hypre_MPI_Datatype datatype,
+                               HYPRE_Int dest, HYPRE_Int tag, hypre_MPI_Comm comm, hypre_MPI_Request *request );
+HYPRE_Int hypre_MPI_Recv_init( void *buf, HYPRE_Int count, hypre_MPI_Datatype datatype,
+                               HYPRE_Int dest, HYPRE_Int tag, hypre_MPI_Comm comm, hypre_MPI_Request *request );
+HYPRE_Int hypre_MPI_Irsend( void *buf, HYPRE_Int count, hypre_MPI_Datatype datatype, HYPRE_Int dest,
+                            HYPRE_Int tag, hypre_MPI_Comm comm, hypre_MPI_Request *request );
+HYPRE_Int hypre_MPI_Startall( HYPRE_Int count, hypre_MPI_Request *array_of_requests );
+HYPRE_Int hypre_MPI_Probe( HYPRE_Int source, HYPRE_Int tag, hypre_MPI_Comm comm,
+                           hypre_MPI_Status *status );
+HYPRE_Int hypre_MPI_Iprobe( HYPRE_Int source, HYPRE_Int tag, hypre_MPI_Comm comm, HYPRE_Int *flag,
+                            hypre_MPI_Status *status );
+HYPRE_Int hypre_MPI_Test( hypre_MPI_Request *request, HYPRE_Int *flag, hypre_MPI_Status *status );
+HYPRE_Int hypre_MPI_Testall( HYPRE_Int count, hypre_MPI_Request *array_of_requests, HYPRE_Int *flag,
+                             hypre_MPI_Status *array_of_statuses );
+HYPRE_Int hypre_MPI_Wait( hypre_MPI_Request *request, hypre_MPI_Status *status );
+HYPRE_Int hypre_MPI_Waitall( HYPRE_Int count, hypre_MPI_Request *array_of_requests,
+                             hypre_MPI_Status *array_of_statuses );
+HYPRE_Int hypre_MPI_Waitany( HYPRE_Int count, hypre_MPI_Request *array_of_requests,
+                             HYPRE_Int *index, hypre_MPI_Status *status );
+HYPRE_Int hypre_MPI_Allreduce( void *sendbuf, void *recvbuf, HYPRE_Int count,
+                               hypre_MPI_Datatype datatype, hypre_MPI_Op op, hypre_MPI_Comm comm );
+HYPRE_Int hypre_MPI_Reduce( void *sendbuf, void *recvbuf, HYPRE_Int count,
+                            hypre_MPI_Datatype datatype, hypre_MPI_Op op, HYPRE_Int root, hypre_MPI_Comm comm );
+HYPRE_Int hypre_MPI_Scan( void *sendbuf, void *recvbuf, HYPRE_Int count,
+                          hypre_MPI_Datatype datatype, hypre_MPI_Op op, hypre_MPI_Comm comm );
 HYPRE_Int hypre_MPI_Request_free( hypre_MPI_Request *request );
-HYPRE_Int hypre_MPI_Type_contiguous( HYPRE_Int count , hypre_MPI_Datatype oldtype , hypre_MPI_Datatype *newtype );
-HYPRE_Int hypre_MPI_Type_vector( HYPRE_Int count , HYPRE_Int blocklength , HYPRE_Int stride , hypre_MPI_Datatype oldtype , hypre_MPI_Datatype *newtype );
-HYPRE_Int hypre_MPI_Type_hvector( HYPRE_Int count , HYPRE_Int blocklength , hypre_MPI_Aint stride , hypre_MPI_Datatype oldtype , hypre_MPI_Datatype *newtype );
-HYPRE_Int hypre_MPI_Type_struct( HYPRE_Int count , HYPRE_Int *array_of_blocklengths , hypre_MPI_Aint *array_of_displacements , hypre_MPI_Datatype *array_of_types , hypre_MPI_Datatype *newtype );
+HYPRE_Int hypre_MPI_Type_contiguous( HYPRE_Int count, hypre_MPI_Datatype oldtype,
+                                     hypre_MPI_Datatype *newtype );
+HYPRE_Int hypre_MPI_Type_vector( HYPRE_Int count, HYPRE_Int blocklength, HYPRE_Int stride,
+                                 hypre_MPI_Datatype oldtype, hypre_MPI_Datatype *newtype );
+HYPRE_Int hypre_MPI_Type_hvector( HYPRE_Int count, HYPRE_Int blocklength, hypre_MPI_Aint stride,
+                                  hypre_MPI_Datatype oldtype, hypre_MPI_Datatype *newtype );
+HYPRE_Int hypre_MPI_Type_struct( HYPRE_Int count, HYPRE_Int *array_of_blocklengths,
+                                 hypre_MPI_Aint *array_of_displacements, hypre_MPI_Datatype *array_of_types,
+                                 hypre_MPI_Datatype *newtype );
 HYPRE_Int hypre_MPI_Type_commit( hypre_MPI_Datatype *datatype );
 HYPRE_Int hypre_MPI_Type_free( hypre_MPI_Datatype *datatype );
 HYPRE_Int hypre_MPI_Op_free( hypre_MPI_Op *op );
-HYPRE_Int hypre_MPI_Op_create( hypre_MPI_User_function *function , hypre_int commute , hypre_MPI_Op *op );
-#if defined(HYPRE_USING_GPU)
-HYPRE_Int hypre_MPI_Comm_split_type(hypre_MPI_Comm comm, HYPRE_Int split_type, HYPRE_Int key, hypre_MPI_Info info, hypre_MPI_Comm *newcomm);
+HYPRE_Int hypre_MPI_Op_create( hypre_MPI_User_function *function, hypre_int commute,
+                               hypre_MPI_Op *op );
+#if defined(HYPRE_USING_GPU) || defined(HYPRE_USING_DEVICE_OPENMP)
+HYPRE_Int hypre_MPI_Comm_split_type(hypre_MPI_Comm comm, HYPRE_Int split_type, HYPRE_Int key,
+                                    hypre_MPI_Info info, hypre_MPI_Comm *newcomm);
 HYPRE_Int hypre_MPI_Info_create(hypre_MPI_Info *info);
 HYPRE_Int hypre_MPI_Info_free( hypre_MPI_Info *info );
 #endif
@@ -459,7 +1080,7 @@ HYPRE_Int hypre_MPI_Info_free( hypre_MPI_Info *info );
 
 #endif
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -472,7 +1093,7 @@ HYPRE_Int hypre_MPI_Info_free( hypre_MPI_Info *info );
 #define HYPRE_SMP_SCHEDULE schedule(static)
 
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -544,9 +1165,8 @@ HYPRE_Int hypre_MPI_Info_free( hypre_MPI_Info *info );
 #include <stdio.h>
 #include <stdlib.h>
 
-#if defined(HYPRE_USING_UMPIRE)
-#include "umpire/interface/umpire.h"
-#define HYPRE_UMPIRE_POOL_NAME_MAX_LEN 1024
+#if defined(HYPRE_USING_UNIFIED_MEMORY) && defined(HYPRE_USING_DEVICE_OPENMP)
+//#pragma omp requires unified_shared_memory
 #endif
 
 /* stringification:
@@ -564,17 +1184,18 @@ extern "C" {
 typedef enum _hypre_MemoryLocation
 {
    hypre_MEMORY_UNDEFINED = -1,
-   hypre_MEMORY_HOST          ,
-   hypre_MEMORY_HOST_PINNED   ,
-   hypre_MEMORY_DEVICE        ,
-   hypre_MEMORY_UNIFIED
+   hypre_MEMORY_HOST,
+   hypre_MEMORY_HOST_PINNED,
+   hypre_MEMORY_DEVICE,
+   hypre_MEMORY_UNIFIED,
+   hypre_NUM_MEMORY_LOCATION
 } hypre_MemoryLocation;
 
 /*-------------------------------------------------------
  * hypre_GetActualMemLocation
  *   return actual location based on the selected memory model
  *-------------------------------------------------------*/
-static inline hypre_MemoryLocation
+static inline HYPRE_MAYBE_UNUSED_FUNC hypre_MemoryLocation
 hypre_GetActualMemLocation(HYPRE_MemoryLocation location)
 {
    if (location == HYPRE_MEMORY_HOST)
@@ -598,102 +1219,8 @@ hypre_GetActualMemLocation(HYPRE_MemoryLocation location)
    return hypre_MEMORY_UNDEFINED;
 }
 
-#ifdef HYPRE_USING_MEMORY_TRACKER
-
-typedef struct
-{
-   char                  _action[16];
-   void                 *_ptr;
-   size_t                _nbytes;
-   hypre_MemoryLocation  _memory_location;
-   char                  _filename[256];
-   char                  _function[256];
-   HYPRE_Int             _line;
-   size_t                _pair;
-} hypre_MemoryTrackerEntry;
-
-typedef struct
-{
-   size_t actual_size;
-   size_t alloced_size;
-   size_t prev_end;
-   hypre_MemoryTrackerEntry *data;
-} hypre_MemoryTracker;
-
-/* These Allocs are with memory tracker, for debug */
-#define hypre_TAlloc(type, count, location)                                                                                           \
-(                                                                                                                                     \
-{                                                                                                                                     \
-   void *ptr = hypre_MAlloc((size_t)(sizeof(type) * (count)), location);                                                              \
-   hypre_MemoryTrackerInsert("malloc", ptr, sizeof(type)*(count), hypre_GetActualMemLocation(location), __FILE__, __func__, __LINE__);\
-   (type *) ptr;                                                                                                                      \
-}                                                                                                                                     \
-)
-
-#define _hypre_TAlloc(type, count, location)                                                                                          \
-(                                                                                                                                     \
-{                                                                                                                                     \
-   void *ptr = _hypre_MAlloc((size_t)(sizeof(type) * (count)), location);                                                             \
-   hypre_MemoryTrackerInsert("malloc", ptr, sizeof(type)*(count), location, __FILE__, __func__, __LINE__);                            \
-   (type *) ptr;                                                                                                                      \
-}                                                                                                                                     \
-)
-
-#define hypre_CTAlloc(type, count, location)                                                                                          \
-(                                                                                                                                     \
-{                                                                                                                                     \
-   void *ptr = hypre_CAlloc((size_t)(count), (size_t)sizeof(type), location);                                                         \
-   hypre_MemoryTrackerInsert("calloc", ptr, sizeof(type)*(count), hypre_GetActualMemLocation(location), __FILE__, __func__, __LINE__);\
-   (type *) ptr;                                                                                                                      \
-}                                                                                                                                     \
-)
-
-#define hypre_TReAlloc(ptr, type, count, location)                                                                                         \
-(                                                                                                                                          \
-{                                                                                                                                          \
-   hypre_MemoryTrackerInsert("rfree", ptr, (size_t) -1, hypre_GetActualMemLocation(location), __FILE__, __func__, __LINE__);               \
-   void *new_ptr = hypre_ReAlloc((char *)ptr, (size_t)(sizeof(type) * (count)), location);                                                 \
-   hypre_MemoryTrackerInsert("rmalloc", new_ptr, sizeof(type)*(count), hypre_GetActualMemLocation(location), __FILE__, __func__, __LINE__);\
-   (type *) new_ptr;                                                                                                                       \
-}                                                                                                                                          \
-)
-
-#define hypre_TReAlloc_v2(ptr, old_type, old_count, new_type, new_count, location)                                                                 \
-(                                                                                                                                                  \
-{                                                                                                                                                  \
-   hypre_MemoryTrackerInsert("rfree", ptr, sizeof(old_type)*(old_count), hypre_GetActualMemLocation(location), __FILE__, __func__, __LINE__);      \
-   void *new_ptr = hypre_ReAlloc_v2((char *)ptr, (size_t)(sizeof(old_type)*(old_count)), (size_t)(sizeof(new_type)*(new_count)), location);        \
-   hypre_MemoryTrackerInsert("rmalloc", new_ptr, sizeof(new_type)*(new_count), hypre_GetActualMemLocation(location), __FILE__, __func__, __LINE__);\
-   (new_type *) new_ptr;                                                                                                                           \
-}                                                                                                                                                  \
-)
-
-#define hypre_TMemcpy(dst, src, type, count, locdst, locsrc)                                     \
-(                                                                                                \
-{                                                                                                \
-   hypre_Memcpy((void *)(dst), (void *)(src), (size_t)(sizeof(type) * (count)), locdst, locsrc); \
-}                                                                                                \
-)
-
-#define hypre_TFree(ptr, location)                                                                                          \
-(                                                                                                                           \
-{                                                                                                                           \
-   hypre_MemoryTrackerInsert("free", ptr, (size_t) -1, hypre_GetActualMemLocation(location), __FILE__, __func__, __LINE__); \
-   hypre_Free((void *)ptr, location);                                                                                       \
-   ptr = NULL;                                                                                                              \
-}                                                                                                                           \
-)
-
-#define _hypre_TFree(ptr, location)                                                                             \
-(                                                                                                               \
-{                                                                                                               \
-   hypre_MemoryTrackerInsert("free", ptr, (size_t) -1, location, __FILE__, __func__, __LINE__);                 \
-   _hypre_Free((void *)ptr, location);                                                                          \
-   ptr = NULL;                                                                                                  \
-}                                                                                                               \
-)
 
-#else /* #ifdef HYPRE_USING_MEMORY_TRACKER */
+#if !defined(HYPRE_USING_MEMORY_TRACKER)
 
 #define hypre_TAlloc(type, count, location) \
 ( (type *) hypre_MAlloc((size_t)(sizeof(type) * (count)), location) )
@@ -719,7 +1246,7 @@ typedef struct
 #define _hypre_TFree(ptr, location) \
 ( _hypre_Free((void *)ptr, location), ptr = NULL )
 
-#endif /* #ifdef HYPRE_USING_MEMORY_TRACKER */
+#endif /* #if !defined(HYPRE_USING_MEMORY_TRACKER) */
 
 
 /*--------------------------------------------------------------------------
@@ -727,12 +1254,16 @@ typedef struct
  *--------------------------------------------------------------------------*/
 
 /* memory.c */
+HYPRE_Int hypre_GetMemoryLocationName(hypre_MemoryLocation memory_location,
+                                      char *memory_location_name);
+void   hypre_CheckMemoryLocation(void *ptr, hypre_MemoryLocation location);
 void * hypre_Memset(void *ptr, HYPRE_Int value, size_t num, HYPRE_MemoryLocation location);
 void   hypre_MemPrefetch(void *ptr, size_t size, HYPRE_MemoryLocation location);
 void * hypre_MAlloc(size_t size, HYPRE_MemoryLocation location);
 void * hypre_CAlloc( size_t count, size_t elt_size, HYPRE_MemoryLocation location);
 void   hypre_Free(void *ptr, HYPRE_MemoryLocation location);
-void   hypre_Memcpy(void *dst, void *src, size_t size, HYPRE_MemoryLocation loc_dst, HYPRE_MemoryLocation loc_src);
+void   hypre_Memcpy(void *dst, void *src, size_t size, HYPRE_MemoryLocation loc_dst,
+                    HYPRE_MemoryLocation loc_src);
 void * hypre_ReAlloc(void *ptr, size_t size, HYPRE_MemoryLocation location);
 void * hypre_ReAlloc_v2(void *ptr, size_t old_size, size_t new_size, HYPRE_MemoryLocation location);
 
@@ -740,11 +1271,12 @@ void * _hypre_MAlloc(size_t size, hypre_MemoryLocation location);
 void   _hypre_Free(void *ptr, hypre_MemoryLocation location);
 
 HYPRE_ExecutionPolicy hypre_GetExecPolicy1(HYPRE_MemoryLocation location);
-HYPRE_ExecutionPolicy hypre_GetExecPolicy2(HYPRE_MemoryLocation location1, HYPRE_MemoryLocation location2);
+HYPRE_ExecutionPolicy hypre_GetExecPolicy2(HYPRE_MemoryLocation location1,
+                                           HYPRE_MemoryLocation location2);
 
 HYPRE_Int hypre_GetPointerLocation(const void *ptr, hypre_MemoryLocation *memory_location);
-HYPRE_Int hypre_PrintMemoryTracker();
-HYPRE_Int hypre_SetCubMemPoolSize( hypre_uint bin_growth, hypre_uint min_bin, hypre_uint max_bin, size_t max_cached_bytes );
+HYPRE_Int hypre_SetCubMemPoolSize( hypre_uint bin_growth, hypre_uint min_bin, hypre_uint max_bin,
+                                   size_t max_cached_bytes );
 HYPRE_Int hypre_umpire_host_pooled_allocate(void **ptr, size_t nbytes);
 HYPRE_Int hypre_umpire_host_pooled_free(void *ptr);
 void *hypre_umpire_host_pooled_realloc(void *ptr, size_t size);
@@ -754,34 +1286,208 @@ HYPRE_Int hypre_umpire_um_pooled_allocate(void **ptr, size_t nbytes);
 HYPRE_Int hypre_umpire_um_pooled_free(void *ptr);
 HYPRE_Int hypre_umpire_pinned_pooled_allocate(void **ptr, size_t nbytes);
 HYPRE_Int hypre_umpire_pinned_pooled_free(void *ptr);
-
-#ifdef HYPRE_USING_MEMORY_TRACKER
-hypre_MemoryTracker * hypre_MemoryTrackerCreate();
-void hypre_MemoryTrackerDestroy(hypre_MemoryTracker *tracker);
-void hypre_MemoryTrackerInsert(const char *action, void *ptr, size_t nbytes, hypre_MemoryLocation memory_location, const char *filename, const char *function, HYPRE_Int line);
-HYPRE_Int hypre_PrintMemoryTracker();
-#endif
-
+HYPRE_Int hypre_UmpireInit(hypre_Handle *hypre_handle_);
+HYPRE_Int hypre_UmpireFinalize(hypre_Handle *hypre_handle_);
+HYPRE_Int hypre_UmpireGetCurrentMemoryUsage(MPI_Comm comm, HYPRE_Real *current);
+HYPRE_Int hypre_UmpireMemoryGetUsage(HYPRE_Real *memory);
+HYPRE_Int hypre_HostMemoryGetUsage(HYPRE_Real *mem);
+HYPRE_Int hypre_MemoryPrintUsage(MPI_Comm comm, HYPRE_Int level,
+                                 const char *function, HYPRE_Int line);
+#define HYPRE_PRINT_MEMORY_USAGE(comm) hypre_MemoryPrintUsage(comm,\
+                                                              hypre_HandleLogLevel(hypre_handle()),\
+                                                              __func__,\
+                                                              __LINE__)
 /* memory_dmalloc.c */
 HYPRE_Int hypre_InitMemoryDebugDML( HYPRE_Int id );
 HYPRE_Int hypre_FinalizeMemoryDebugDML( void );
-char *hypre_MAllocDML( HYPRE_Int size , char *file , HYPRE_Int line );
-char *hypre_CAllocDML( HYPRE_Int count , HYPRE_Int elt_size , char *file , HYPRE_Int line );
-char *hypre_ReAllocDML( char *ptr , HYPRE_Int size , char *file , HYPRE_Int line );
-void hypre_FreeDML( char *ptr , char *file , HYPRE_Int line );
-
-/* GPU malloc prototype */
-typedef void (*GPUMallocFunc)(void **, size_t);
-typedef void (*GPUMfreeFunc)(void *);
+char *hypre_MAllocDML( HYPRE_Int size, char *file, HYPRE_Int line );
+char *hypre_CAllocDML( HYPRE_Int count, HYPRE_Int elt_size, char *file, HYPRE_Int line );
+char *hypre_ReAllocDML( char *ptr, HYPRE_Int size, char *file, HYPRE_Int line );
+void hypre_FreeDML( char *ptr, char *file, HYPRE_Int line );
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif
+#endif /* hypre_MEMORY_HEADER */
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+#ifndef hypre_MEMORY_TRACKER_HEADER
+#define hypre_MEMORY_TRACKER_HEADER
+
+#if defined(HYPRE_USING_MEMORY_TRACKER)
+
+extern size_t hypre_total_bytes[hypre_MEMORY_UNIFIED + 1];
+extern size_t hypre_peak_bytes[hypre_MEMORY_UNIFIED + 1];
+extern size_t hypre_current_bytes[hypre_MEMORY_UNIFIED + 1];
+extern HYPRE_Int hypre_memory_tracker_print;
+extern char hypre_memory_tracker_filename[HYPRE_MAX_FILE_NAME_LEN];
+
+typedef enum _hypre_MemoryTrackerEvent
+{
+   HYPRE_MEMORY_EVENT_ALLOC = 0,
+   HYPRE_MEMORY_EVENT_FREE,
+   HYPRE_MEMORY_EVENT_COPY,
+   HYPRE_MEMORY_NUM_EVENTS,
+} hypre_MemoryTrackerEvent;
+
+typedef enum _hypre_MemcpyType
+{
+   hypre_MEMCPY_H2H = 0,
+   hypre_MEMCPY_D2H,
+   hypre_MEMCPY_H2D,
+   hypre_MEMCPY_D2D,
+   hypre_MEMCPY_NUM_TYPES,
+} hypre_MemcpyType;
+
+typedef struct
+{
+   size_t                index;
+   size_t                time_step;
+   char                  action[16];
+   void                 *ptr;
+   void                 *ptr2;
+   size_t                nbytes;
+   hypre_MemoryLocation  memory_location;
+   hypre_MemoryLocation  memory_location2;
+   char                  filename[HYPRE_MAX_FILE_NAME_LEN];
+   char                  function[256];
+   HYPRE_Int             line;
+   size_t                pair;
+} hypre_MemoryTrackerEntry;
+
+typedef struct
+{
+   size_t                     head;
+   size_t                     actual_size;
+   size_t                     alloced_size;
+   hypre_MemoryTrackerEntry  *data;
+   /* Free Queue is sorted based on (ptr, time_step) ascendingly */
+   hypre_MemoryTrackerEntry  *sorted_data;
+   /* compressed sorted_data with the same ptr */
+   size_t                     sorted_data_compressed_len;
+   size_t                    *sorted_data_compressed_offset;
+   hypre_MemoryTrackerEntry **sorted_data_compressed;
+} hypre_MemoryTrackerQueue;
+
+typedef struct
+{
+   size_t                   curr_time_step;
+   hypre_MemoryTrackerQueue queue[HYPRE_MEMORY_NUM_EVENTS];
+} hypre_MemoryTracker;
+
+extern hypre_MemoryTracker *_hypre_memory_tracker;
+
+#define hypre_TAlloc(type, count, location)                                                         \
+(                                                                                                   \
+{                                                                                                   \
+   void *ptr = hypre_MAlloc((size_t)(sizeof(type) * (count)), location);                            \
+                                                                                                    \
+   hypre_MemoryLocation alocation = hypre_GetActualMemLocation(location);                           \
+   hypre_MemoryTrackerInsert1("malloc", ptr, sizeof(type)*(count), alocation,                       \
+                              __FILE__, __func__, __LINE__);                                        \
+   (type *) ptr;                                                                                    \
+}                                                                                                   \
+)
+
+#define hypre_CTAlloc(type, count, location)                                                        \
+(                                                                                                   \
+{                                                                                                   \
+   void *ptr = hypre_CAlloc((size_t)(count), (size_t)sizeof(type), location);                       \
+                                                                                                    \
+   hypre_MemoryLocation alocation = hypre_GetActualMemLocation(location);                           \
+   hypre_MemoryTrackerInsert1("calloc", ptr, sizeof(type)*(count), alocation,                       \
+                              __FILE__, __func__, __LINE__);                                        \
+   (type *) ptr;                                                                                    \
+}                                                                                                   \
+)
+
+#define hypre_TReAlloc(ptr, type, count, location)                                                  \
+(                                                                                                   \
+{                                                                                                   \
+   void *new_ptr = hypre_ReAlloc((char *)ptr, (size_t)(sizeof(type) * (count)), location);          \
+                                                                                                    \
+   hypre_MemoryLocation alocation = hypre_GetActualMemLocation(location);                           \
+   hypre_MemoryTrackerInsert1("rfree", ptr, (size_t) -1, alocation,                                 \
+                              __FILE__, __func__, __LINE__);                                        \
+   hypre_MemoryTrackerInsert1("rmalloc", new_ptr, sizeof(type)*(count), alocation,                  \
+                              __FILE__, __func__, __LINE__);                                        \
+   (type *) new_ptr;                                                                                \
+}                                                                                                   \
+)
+
+#define hypre_TReAlloc_v2(ptr, old_type, old_count, new_type, new_count, location)                  \
+(                                                                                                   \
+{                                                                                                   \
+   void *new_ptr = hypre_ReAlloc_v2((char *)ptr, (size_t)(sizeof(old_type)*(old_count)),            \
+                                    (size_t)(sizeof(new_type)*(new_count)), location);              \
+                                                                                                    \
+   hypre_MemoryLocation alocation = hypre_GetActualMemLocation(location);                           \
+   hypre_MemoryTrackerInsert1("rfree", ptr, sizeof(old_type)*(old_count), alocation,                \
+                              __FILE__, __func__, __LINE__);                                        \
+   hypre_MemoryTrackerInsert1("rmalloc", new_ptr, sizeof(new_type)*(new_count), alocation,          \
+                              __FILE__, __func__, __LINE__);                                        \
+   (new_type *) new_ptr;                                                                            \
+}                                                                                                   \
+)
+
+#define hypre_TMemcpy(dst, src, type, count, locdst, locsrc)                                        \
+(                                                                                                   \
+{                                                                                                   \
+   hypre_Memcpy((void *)(dst), (void *)(src), (size_t)(sizeof(type) * (count)), locdst, locsrc);    \
+                                                                                                    \
+   hypre_MemoryLocation alocation_dst = hypre_GetActualMemLocation(locdst);                         \
+   hypre_MemoryLocation alocation_src = hypre_GetActualMemLocation(locsrc);                         \
+   hypre_MemoryTrackerInsert2("memcpy", (void *) (dst), (void *) (src), sizeof(type)*(count),       \
+                              alocation_dst, alocation_src,                                         \
+                              __FILE__, __func__, __LINE__);                                        \
+}                                                                                                   \
+)
+
+#define hypre_TFree(ptr, location)                                                                  \
+(                                                                                                   \
+{                                                                                                   \
+   hypre_Free((void *)ptr, location);                                                               \
+                                                                                                    \
+   hypre_MemoryLocation alocation = hypre_GetActualMemLocation(location);                           \
+   hypre_MemoryTrackerInsert1("free", ptr, (size_t) -1, alocation,                                  \
+                              __FILE__, __func__, __LINE__);                                        \
+   ptr = NULL;                                                                                      \
+}                                                                                                   \
+)
+
+#define _hypre_TAlloc(type, count, location)                                                        \
+(                                                                                                   \
+{                                                                                                   \
+   void *ptr = _hypre_MAlloc((size_t)(sizeof(type) * (count)), location);                           \
+                                                                                                    \
+   hypre_MemoryTrackerInsert1("malloc", ptr, sizeof(type)*(count), location,                        \
+                              __FILE__, __func__, __LINE__);                                        \
+   (type *) ptr;                                                                                    \
+}                                                                                                   \
+)
+
+#define _hypre_TFree(ptr, location)                                                                 \
+(                                                                                                   \
+{                                                                                                   \
+   _hypre_Free((void *)ptr, location);                                                              \
+                                                                                                    \
+   hypre_MemoryTrackerInsert1("free", ptr, (size_t) -1, location,                                   \
+                             __FILE__, __func__, __LINE__);                                         \
+   ptr = NULL;                                                                                      \
+}                                                                                                   \
+)
+
+#endif /* #if defined(HYPRE_USING_MEMORY_TRACKER) */
+#endif /* #ifndef hypre_MEMORY_TRACKER_HEADER */
 
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -884,17 +1590,18 @@ extern size_t hypre__target_dtoh_bytes;
    } \
 }
 
-HYPRE_Int HYPRE_OMPOffload(HYPRE_Int device, void *ptr, size_t num, const char *type1, const char *type2);
+HYPRE_Int HYPRE_OMPOffload(HYPRE_Int device, void *ptr, size_t num, const char *type1,
+                           const char *type2);
 HYPRE_Int HYPRE_OMPPtrIsMapped(void *p, HYPRE_Int device_num);
-HYPRE_Int HYPRE_OMPOffloadOn();
-HYPRE_Int HYPRE_OMPOffloadOff();
-HYPRE_Int HYPRE_OMPOffloadStatPrint();
+HYPRE_Int HYPRE_OMPOffloadOn(void);
+HYPRE_Int HYPRE_OMPOffloadOff(void);
+HYPRE_Int HYPRE_OMPOffloadStatPrint(void);
 
 #endif /* HYPRE_USING_DEVICE_OPENMP */
 #endif /* HYPRE_OMP_DEVICE_H */
 
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -924,7 +1631,7 @@ void hypre_GetSimpleThreadPartition( HYPRE_Int *begin, HYPRE_Int *end, HYPRE_Int
 #endif
 
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -965,11 +1672,13 @@ HYPRE_Real time_get_cpu_seconds_( void );
 
 #define hypre_InitializeTiming(name) 0
 #define hypre_FinalizeTiming(index)
+#define hypre_FinalizeAllTimings()
 #define hypre_IncFLOPCount(inc)
 #define hypre_BeginTiming(i)
 #define hypre_EndTiming(i)
 #define hypre_PrintTiming(heading, comm)
 #define hypre_ClearTiming()
+#define hypre_GetTiming(heading, comm, time)
 
 /*--------------------------------------------------------------------------
  * With timing on
@@ -1026,11 +1735,13 @@ extern hypre_TimingType *hypre_global_timing;
 /* timing.c */
 HYPRE_Int hypre_InitializeTiming( const char *name );
 HYPRE_Int hypre_FinalizeTiming( HYPRE_Int time_index );
+HYPRE_Int hypre_FinalizeAllTimings( void );
 HYPRE_Int hypre_IncFLOPCount( HYPRE_BigInt inc );
 HYPRE_Int hypre_BeginTiming( HYPRE_Int time_index );
 HYPRE_Int hypre_EndTiming( HYPRE_Int time_index );
 HYPRE_Int hypre_ClearTiming( void );
-HYPRE_Int hypre_PrintTiming( const char *heading , MPI_Comm comm );
+HYPRE_Int hypre_PrintTiming( const char *heading, MPI_Comm comm );
+HYPRE_Int hypre_GetTiming( const char *heading, HYPRE_Real *wall_time_ptr, MPI_Comm comm );
 
 #endif
 
@@ -1041,7 +1752,7 @@ HYPRE_Int hypre_PrintTiming( const char *heading , MPI_Comm comm );
 #endif
 
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -1083,7 +1794,7 @@ typedef hypre_ListElement *hypre_LinkList;
 #endif
 
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -1115,9 +1826,9 @@ typedef struct
 typedef struct
 {
    HYPRE_Int    (*fill_response)(void* recv_buf, HYPRE_Int contact_size,
-                           HYPRE_Int contact_proc, void* response_obj,
-                           MPI_Comm comm, void** response_buf,
-                           HYPRE_Int* response_message_size);
+                                 HYPRE_Int contact_proc, void* response_obj,
+                                 MPI_Comm comm, void** response_buf,
+                                 HYPRE_Int* response_message_size);
    HYPRE_Int     send_response_overhead; /*set by exchange data */
    HYPRE_Int     send_response_storage;  /*storage allocated for send_response_buf*/
    void    *data1;                 /*data fields user may want to access in fill_response */
@@ -1125,14 +1836,16 @@ typedef struct
 
 } hypre_DataExchangeResponse;
 
-HYPRE_Int hypre_CreateBinaryTree(HYPRE_Int, HYPRE_Int, hypre_BinaryTree*);
+HYPRE_Int hypre_CreateBinaryTree(HYPRE_Int, HYPRE_Int, hypre_BinaryTree**);
 HYPRE_Int hypre_DestroyBinaryTree(hypre_BinaryTree*);
-HYPRE_Int hypre_DataExchangeList(HYPRE_Int num_contacts, HYPRE_Int *contact_proc_list, void *contact_send_buf, HYPRE_Int *contact_send_buf_starts, HYPRE_Int contact_obj_size, HYPRE_Int response_obj_size, hypre_DataExchangeResponse *response_obj, HYPRE_Int max_response_size, HYPRE_Int rnum, MPI_Comm comm, void **p_response_recv_buf, HYPRE_Int **p_response_recv_buf_starts);
+HYPRE_Int hypre_DataExchangeList(HYPRE_Int num_contacts, HYPRE_Int *contact_proc_list,
+                                 void *contact_send_buf, HYPRE_Int *contact_send_buf_starts, HYPRE_Int contact_obj_size,
+                                 HYPRE_Int response_obj_size, hypre_DataExchangeResponse *response_obj, HYPRE_Int max_response_size,
+                                 HYPRE_Int rnum, MPI_Comm comm, void **p_response_recv_buf, HYPRE_Int **p_response_recv_buf_starts);
 
 #endif /* end of header */
-
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -1152,7 +1865,8 @@ HYPRE_Int hypre_DataExchangeList(HYPRE_Int num_contacts, HYPRE_Int *contact_proc
 #ifdef HYPRE_USING_CALIPER
 
 #ifdef __cplusplus
-extern "C++" {
+extern "C++"
+{
 #endif
 
 #include <caliper/cali.h>
@@ -1161,9 +1875,6 @@ extern "C++" {
 }
 #endif
 
-static char hypre__levelname[16];
-static char hypre__markname[1024];
-
 #define HYPRE_ANNOTATE_FUNC_BEGIN          CALI_MARK_FUNCTION_BEGIN
 #define HYPRE_ANNOTATE_FUNC_END            CALI_MARK_FUNCTION_END
 #define HYPRE_ANNOTATE_LOOP_BEGIN(id, str) CALI_MARK_LOOP_BEGIN(id, str)
@@ -1172,21 +1883,25 @@ static char hypre__markname[1024];
 #define HYPRE_ANNOTATE_ITER_END(id)        CALI_MARK_ITERATION_END(id)
 #define HYPRE_ANNOTATE_REGION_BEGIN(...)\
 {\
+   char hypre__markname[1024];\
    hypre_sprintf(hypre__markname, __VA_ARGS__);\
    CALI_MARK_BEGIN(hypre__markname);\
 }
 #define HYPRE_ANNOTATE_REGION_END(...)\
 {\
+   char hypre__markname[1024];\
    hypre_sprintf(hypre__markname, __VA_ARGS__);\
    CALI_MARK_END(hypre__markname);\
 }
 #define HYPRE_ANNOTATE_MGLEVEL_BEGIN(lvl)\
 {\
+   char hypre__levelname[16];\
    hypre_sprintf(hypre__levelname, "MG level %d", lvl);\
    CALI_MARK_BEGIN(hypre__levelname);\
 }
 #define HYPRE_ANNOTATE_MGLEVEL_END(lvl)\
 {\
+   char hypre__levelname[16];\
    hypre_sprintf(hypre__levelname, "MG level %d", lvl);\
    CALI_MARK_END(hypre__levelname);\
 }
@@ -1209,110 +1924,7 @@ static char hypre__markname[1024];
 
 #endif /* CALIPER_INSTRUMENTATION_HEADER */
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
- * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
- *
- * SPDX-License-Identifier: (Apache-2.0 OR MIT)
- ******************************************************************************/
-
-/******************************************************************************
- *
- * General structures and values
- *
- *****************************************************************************/
-
-#ifndef HYPRE_HANDLE_H
-#define HYPRE_HANDLE_H
-
-struct hypre_CudaData;
-typedef struct hypre_CudaData hypre_CudaData;
-
-typedef struct
-{
-   HYPRE_Int              hypre_error;
-   HYPRE_MemoryLocation   memory_location;
-   HYPRE_ExecutionPolicy  default_exec_policy;
-   HYPRE_ExecutionPolicy  struct_exec_policy;
-#if defined(HYPRE_USING_GPU)
-   hypre_CudaData        *cuda_data;
-   /* device G-S options */
-   HYPRE_Int              device_gs_method;
-#endif
-#if defined(HYPRE_USING_UMPIRE)
-   char                   umpire_device_pool_name[HYPRE_UMPIRE_POOL_NAME_MAX_LEN];
-   char                   umpire_um_pool_name[HYPRE_UMPIRE_POOL_NAME_MAX_LEN];
-   char                   umpire_host_pool_name[HYPRE_UMPIRE_POOL_NAME_MAX_LEN];
-   char                   umpire_pinned_pool_name[HYPRE_UMPIRE_POOL_NAME_MAX_LEN];
-   size_t                 umpire_device_pool_size;
-   size_t                 umpire_um_pool_size;
-   size_t                 umpire_host_pool_size;
-   size_t                 umpire_pinned_pool_size;
-   size_t                 umpire_block_size;
-   HYPRE_Int              own_umpire_device_pool;
-   HYPRE_Int              own_umpire_um_pool;
-   HYPRE_Int              own_umpire_host_pool;
-   HYPRE_Int              own_umpire_pinned_pool;
-   umpire_resourcemanager umpire_rm;
-#endif
-   /* user malloc/free function pointers */
-   GPUMallocFunc          user_device_malloc;
-   GPUMfreeFunc           user_device_free;
-} hypre_Handle;
-
-/* accessor macros to hypre_Handle */
-#define hypre_HandleMemoryLocation(hypre_handle)                 ((hypre_handle) -> memory_location)
-#define hypre_HandleDefaultExecPolicy(hypre_handle)              ((hypre_handle) -> default_exec_policy)
-#define hypre_HandleStructExecPolicy(hypre_handle)               ((hypre_handle) -> struct_exec_policy)
-#define hypre_HandleCudaData(hypre_handle)                       ((hypre_handle) -> cuda_data)
-#define hypre_HandleDeviceGSMethod(hypre_handle)                 ((hypre_handle) -> device_gs_method)
-
-#define hypre_HandleCurandGenerator(hypre_handle)                hypre_CudaDataCurandGenerator(hypre_HandleCudaData(hypre_handle))
-#define hypre_HandleCublasHandle(hypre_handle)                   hypre_CudaDataCublasHandle(hypre_HandleCudaData(hypre_handle))
-#define hypre_HandleCusparseHandle(hypre_handle)                 hypre_CudaDataCusparseHandle(hypre_HandleCudaData(hypre_handle))
-#define hypre_HandleCudaComputeStream(hypre_handle)              hypre_CudaDataCudaComputeStream(hypre_HandleCudaData(hypre_handle))
-#define hypre_HandleCubBinGrowth(hypre_handle)                   hypre_CudaDataCubBinGrowth(hypre_HandleCudaData(hypre_handle))
-#define hypre_HandleCubMinBin(hypre_handle)                      hypre_CudaDataCubMinBin(hypre_HandleCudaData(hypre_handle))
-#define hypre_HandleCubMaxBin(hypre_handle)                      hypre_CudaDataCubMaxBin(hypre_HandleCudaData(hypre_handle))
-#define hypre_HandleCubMaxCachedBytes(hypre_handle)              hypre_CudaDataCubMaxCachedBytes(hypre_HandleCudaData(hypre_handle))
-#define hypre_HandleCubDevAllocator(hypre_handle)                hypre_CudaDataCubDevAllocator(hypre_HandleCudaData(hypre_handle))
-#define hypre_HandleCubUvmAllocator(hypre_handle)                hypre_CudaDataCubUvmAllocator(hypre_HandleCudaData(hypre_handle))
-#define hypre_HandleCudaDevice(hypre_handle)                     hypre_CudaDataCudaDevice(hypre_HandleCudaData(hypre_handle))
-#define hypre_HandleCudaComputeStreamNum(hypre_handle)           hypre_CudaDataCudaComputeStreamNum(hypre_HandleCudaData(hypre_handle))
-#define hypre_HandleCudaReduceBuffer(hypre_handle)               hypre_CudaDataCudaReduceBuffer(hypre_HandleCudaData(hypre_handle))
-#define hypre_HandleStructCommRecvBuffer(hypre_handle)           hypre_CudaDataStructCommRecvBuffer(hypre_HandleCudaData(hypre_handle))
-#define hypre_HandleStructCommSendBuffer(hypre_handle)           hypre_CudaDataStructCommSendBuffer(hypre_HandleCudaData(hypre_handle))
-#define hypre_HandleStructCommRecvBufferSize(hypre_handle)       hypre_CudaDataStructCommRecvBufferSize(hypre_HandleCudaData(hypre_handle))
-#define hypre_HandleStructCommSendBufferSize(hypre_handle)       hypre_CudaDataStructCommSendBufferSize(hypre_HandleCudaData(hypre_handle))
-#define hypre_HandleSpgemmUseCusparse(hypre_handle)              hypre_CudaDataSpgemmUseCusparse(hypre_HandleCudaData(hypre_handle))
-#define hypre_HandleSpgemmAlgorithm(hypre_handle)                hypre_CudaDataSpgemmAlgorithm(hypre_HandleCudaData(hypre_handle))
-#define hypre_HandleSpgemmRownnzEstimateMethod(hypre_handle)     hypre_CudaDataSpgemmRownnzEstimateMethod(hypre_HandleCudaData(hypre_handle))
-#define hypre_HandleSpgemmRownnzEstimateNsamples(hypre_handle)   hypre_CudaDataSpgemmRownnzEstimateNsamples(hypre_HandleCudaData(hypre_handle))
-#define hypre_HandleSpgemmRownnzEstimateMultFactor(hypre_handle) hypre_CudaDataSpgemmRownnzEstimateMultFactor(hypre_HandleCudaData(hypre_handle))
-#define hypre_HandleSpgemmHashType(hypre_handle)                 hypre_CudaDataSpgemmHashType(hypre_HandleCudaData(hypre_handle))
-#define hypre_HandleDeviceAllocator(hypre_handle)                hypre_CudaDataDeviceAllocator(hypre_HandleCudaData(hypre_handle))
-#define hypre_HandleUseGpuRand(hypre_handle)                     hypre_CudaDataUseGpuRand(hypre_HandleCudaData(hypre_handle))
-
-#define hypre_HandleUserDeviceMalloc(hypre_handle)               ((hypre_handle) -> user_device_malloc)
-#define hypre_HandleUserDeviceMfree(hypre_handle)                ((hypre_handle) -> user_device_free)
-
-#define hypre_HandleUmpireResourceMan(hypre_handle)              ((hypre_handle) -> umpire_rm)
-#define hypre_HandleUmpireDevicePoolSize(hypre_handle)           ((hypre_handle) -> umpire_device_pool_size)
-#define hypre_HandleUmpireUMPoolSize(hypre_handle)               ((hypre_handle) -> umpire_um_pool_size)
-#define hypre_HandleUmpireHostPoolSize(hypre_handle)             ((hypre_handle) -> umpire_host_pool_size)
-#define hypre_HandleUmpirePinnedPoolSize(hypre_handle)           ((hypre_handle) -> umpire_pinned_pool_size)
-#define hypre_HandleUmpireBlockSize(hypre_handle)                ((hypre_handle) -> umpire_block_size)
-#define hypre_HandleUmpireDevicePoolName(hypre_handle)           ((hypre_handle) -> umpire_device_pool_name)
-#define hypre_HandleUmpireUMPoolName(hypre_handle)               ((hypre_handle) -> umpire_um_pool_name)
-#define hypre_HandleUmpireHostPoolName(hypre_handle)             ((hypre_handle) -> umpire_host_pool_name)
-#define hypre_HandleUmpirePinnedPoolName(hypre_handle)           ((hypre_handle) -> umpire_pinned_pool_name)
-#define hypre_HandleOwnUmpireDevicePool(hypre_handle)            ((hypre_handle) -> own_umpire_device_pool)
-#define hypre_HandleOwnUmpireUMPool(hypre_handle)                ((hypre_handle) -> own_umpire_um_pool)
-#define hypre_HandleOwnUmpireHostPool(hypre_handle)              ((hypre_handle) -> own_umpire_host_pool)
-#define hypre_HandleOwnUmpirePinnedPool(hypre_handle)            ((hypre_handle) -> own_umpire_pinned_pool)
-
-#endif
-/******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -1381,7 +1993,7 @@ typedef struct
 #endif /* #ifndef HYPRE_GSELIM_H */
 
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -1400,9 +2012,9 @@ typedef struct
  * hypre_IntArray
  *--------------------------------------------------------------------------*/
 
-typedef struct 
+typedef struct
 {
-   /* pointer to data and size of data */ 
+   /* pointer to data and size of data */
    HYPRE_Int            *data;
    HYPRE_Int             size;
 
@@ -1415,12 +2027,39 @@ typedef struct
  *--------------------------------------------------------------------------*/
 
 #define hypre_IntArrayData(array)                  ((array) -> data)
+#define hypre_IntArrayDataI(array, i)              ((array) -> data[i])
 #define hypre_IntArraySize(array)                  ((array) -> size)
 #define hypre_IntArrayMemoryLocation(array)        ((array) -> memory_location)
 
+/******************************************************************************
+ *
+ * hypre_IntArrayArray: struct for holding an array of hypre_IntArray
+ *
+ *****************************************************************************/
+
+/*--------------------------------------------------------------------------
+ * hypre_IntArrayArray
+ *--------------------------------------------------------------------------*/
+
+typedef struct
+{
+   hypre_IntArray       **entries;
+   HYPRE_Int              size;
+} hypre_IntArrayArray;
+
+/*--------------------------------------------------------------------------
+ * Accessor functions for the IntArrayArray structure
+ *--------------------------------------------------------------------------*/
+
+#define hypre_IntArrayArrayEntries(array)           ((array) -> entries)
+#define hypre_IntArrayArrayEntryI(array, i)         ((array) -> entries[i])
+#define hypre_IntArrayArrayEntryIData(array, i)     ((array) -> entries[i] -> data)
+#define hypre_IntArrayArrayEntryIDataJ(array, i, j) ((array) -> entries[i] -> data[j])
+#define hypre_IntArrayArraySize(array)              ((array) -> size)
+
 #endif
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -1428,14 +2067,17 @@ typedef struct
 
 /* amg_linklist.c */
 void hypre_dispose_elt ( hypre_LinkList element_ptr );
-void hypre_remove_point ( hypre_LinkList *LoL_head_ptr , hypre_LinkList *LoL_tail_ptr , HYPRE_Int measure , HYPRE_Int index , HYPRE_Int *lists , HYPRE_Int *where );
+void hypre_remove_point ( hypre_LinkList *LoL_head_ptr, hypre_LinkList *LoL_tail_ptr,
+                          HYPRE_Int measure, HYPRE_Int index, HYPRE_Int *lists, HYPRE_Int *where );
 hypre_LinkList hypre_create_elt ( HYPRE_Int Item );
-void hypre_enter_on_lists ( hypre_LinkList *LoL_head_ptr , hypre_LinkList *LoL_tail_ptr , HYPRE_Int measure , HYPRE_Int index , HYPRE_Int *lists , HYPRE_Int *where );
+void hypre_enter_on_lists ( hypre_LinkList *LoL_head_ptr, hypre_LinkList *LoL_tail_ptr,
+                            HYPRE_Int measure, HYPRE_Int index, HYPRE_Int *lists, HYPRE_Int *where );
 
 /* binsearch.c */
-HYPRE_Int hypre_BinarySearch ( HYPRE_Int *list , HYPRE_Int value , HYPRE_Int list_length );
-HYPRE_Int hypre_BigBinarySearch ( HYPRE_BigInt *list , HYPRE_BigInt value , HYPRE_Int list_length );
-HYPRE_Int hypre_BinarySearch2 ( HYPRE_Int *list , HYPRE_Int value , HYPRE_Int low , HYPRE_Int high , HYPRE_Int *spot );
+HYPRE_Int hypre_BinarySearch ( HYPRE_Int *list, HYPRE_Int value, HYPRE_Int list_length );
+HYPRE_Int hypre_BigBinarySearch ( HYPRE_BigInt *list, HYPRE_BigInt value, HYPRE_Int list_length );
+HYPRE_Int hypre_BinarySearch2 ( HYPRE_Int *list, HYPRE_Int value, HYPRE_Int low, HYPRE_Int high,
+                                HYPRE_Int *spot );
 HYPRE_Int *hypre_LowerBound( HYPRE_Int *first, HYPRE_Int *last, HYPRE_Int value );
 HYPRE_BigInt *hypre_BigLowerBound( HYPRE_BigInt *first, HYPRE_BigInt *last, HYPRE_BigInt value );
 
@@ -1448,65 +2090,87 @@ HYPRE_Complex hypre_conj( HYPRE_Complex value );
 HYPRE_Real    hypre_cabs( HYPRE_Complex value );
 HYPRE_Real    hypre_creal( HYPRE_Complex value );
 HYPRE_Real    hypre_cimag( HYPRE_Complex value );
+HYPRE_Complex hypre_csqrt( HYPRE_Complex value );
 #else
 #define hypre_conj(value)  value
-#define hypre_cabs(value)  fabs(value)
+#define hypre_cabs(value)  hypre_abs(value)
 #define hypre_creal(value) value
 #define hypre_cimag(value) 0.0
+#define hypre_csqrt(value) hypre_sqrt(value)
 #endif
 
+/* state.c */
+HYPRE_Int hypre_Initialized( void );
+HYPRE_Int hypre_Finalized( void );
+HYPRE_Int hypre_SetInitialized( void );
+HYPRE_Int hypre_SetFinalized( void );
+
 /* general.c */
-#ifdef HYPRE_USING_MEMORY_TRACKER
-hypre_MemoryTracker* hypre_memory_tracker();
-#endif
-hypre_Handle* hypre_handle();
-hypre_Handle* hypre_HandleCreate();
+hypre_Handle* hypre_handle(void);
+hypre_Handle* hypre_HandleCreate(void);
 HYPRE_Int hypre_HandleDestroy(hypre_Handle *hypre_handle_);
 HYPRE_Int hypre_SetDevice(hypre_int device_id, hypre_Handle *hypre_handle_);
 HYPRE_Int hypre_GetDevice(hypre_int *device_id);
 HYPRE_Int hypre_GetDeviceCount(hypre_int *device_count);
-HYPRE_Int hypre_GetDeviceLastError();
-HYPRE_Int hypre_UmpireInit(hypre_Handle *hypre_handle_);
-HYPRE_Int hypre_UmpireFinalize(hypre_Handle *hypre_handle_);
+HYPRE_Int hypre_GetDeviceLastError(void);
+HYPRE_Int hypre_GetDeviceMaxShmemSize(hypre_int device_id, hypre_int *max_size_ptr,
+                                      hypre_int *max_size_optin_ptr);
+
+/* matrix_stats.h */
+hypre_MatrixStats* hypre_MatrixStatsCreate( void );
+HYPRE_Int hypre_MatrixStatsDestroy( hypre_MatrixStats *stats );
+hypre_MatrixStatsArray* hypre_MatrixStatsArrayCreate( HYPRE_Int capacity );
+HYPRE_Int hypre_MatrixStatsArrayDestroy( hypre_MatrixStatsArray *stats_array );
+HYPRE_Int hypre_MatrixStatsArrayPrint( HYPRE_Int num_hierarchies, HYPRE_Int *num_levels,
+                                       HYPRE_Int use_divisors, HYPRE_Int shift,
+                                       const char **messages,
+                                       hypre_MatrixStatsArray *stats_array );
 
 /* qsort.c */
-void hypre_swap ( HYPRE_Int *v , HYPRE_Int i , HYPRE_Int j );
-void hypre_swap_c ( HYPRE_Complex *v , HYPRE_Int i , HYPRE_Int j );
-void hypre_swap2 ( HYPRE_Int *v , HYPRE_Real *w , HYPRE_Int i , HYPRE_Int j );
-void hypre_BigSwap2 ( HYPRE_BigInt *v , HYPRE_Real *w , HYPRE_Int i , HYPRE_Int j );
-void hypre_swap2i ( HYPRE_Int *v , HYPRE_Int *w , HYPRE_Int i , HYPRE_Int j );
-void hypre_BigSwap2i ( HYPRE_BigInt *v , HYPRE_Int *w , HYPRE_Int i , HYPRE_Int j );
-void hypre_swap3i ( HYPRE_Int *v , HYPRE_Int *w , HYPRE_Int *z , HYPRE_Int i , HYPRE_Int j );
-void hypre_swap3_d ( HYPRE_Real *v , HYPRE_Int *w , HYPRE_Int *z , HYPRE_Int i , HYPRE_Int j );
+void hypre_swap ( HYPRE_Int *v, HYPRE_Int i, HYPRE_Int j );
+void hypre_swap_c ( HYPRE_Complex *v, HYPRE_Int i, HYPRE_Int j );
+void hypre_swap2 ( HYPRE_Int *v, HYPRE_Real *w, HYPRE_Int i, HYPRE_Int j );
+void hypre_BigSwap2 ( HYPRE_BigInt *v, HYPRE_Real *w, HYPRE_Int i, HYPRE_Int j );
+void hypre_swap2i ( HYPRE_Int *v, HYPRE_Int *w, HYPRE_Int i, HYPRE_Int j );
+void hypre_BigSwap2i ( HYPRE_BigInt *v, HYPRE_Int *w, HYPRE_Int i, HYPRE_Int j );
+void hypre_swap3i ( HYPRE_Int *v, HYPRE_Int *w, HYPRE_Int *z, HYPRE_Int i, HYPRE_Int j );
+void hypre_swap3_d ( HYPRE_Real *v, HYPRE_Int *w, HYPRE_Int *z, HYPRE_Int i, HYPRE_Int j );
 void hypre_swap3_d_perm(HYPRE_Int  *v, HYPRE_Real  *w, HYPRE_Int  *z, HYPRE_Int  i, HYPRE_Int  j );
-void hypre_BigSwap4_d ( HYPRE_Real *v , HYPRE_BigInt *w , HYPRE_Int *z , HYPRE_Int *y , HYPRE_Int i , HYPRE_Int j );
-void hypre_swap_d ( HYPRE_Real *v , HYPRE_Int i , HYPRE_Int j );
-void hypre_qsort0 ( HYPRE_Int *v , HYPRE_Int left , HYPRE_Int right );
-void hypre_qsort1 ( HYPRE_Int *v , HYPRE_Real *w , HYPRE_Int left , HYPRE_Int right );
-void hypre_BigQsort1 ( HYPRE_BigInt *v , HYPRE_Real *w , HYPRE_Int left , HYPRE_Int right );
-void hypre_qsort2i ( HYPRE_Int *v , HYPRE_Int *w , HYPRE_Int left , HYPRE_Int right );
+void hypre_BigSwap4_d ( HYPRE_Real *v, HYPRE_BigInt *w, HYPRE_Int *z, HYPRE_Int *y, HYPRE_Int i,
+                        HYPRE_Int j );
+void hypre_swap_d ( HYPRE_Real *v, HYPRE_Int i, HYPRE_Int j );
+void hypre_qsort0 ( HYPRE_Int *v, HYPRE_Int left, HYPRE_Int right );
+void hypre_qsort1 ( HYPRE_Int *v, HYPRE_Real *w, HYPRE_Int left, HYPRE_Int right );
+void hypre_BigQsort1 ( HYPRE_BigInt *v, HYPRE_Real *w, HYPRE_Int left, HYPRE_Int right );
+void hypre_qsort2i ( HYPRE_Int *v, HYPRE_Int *w, HYPRE_Int left, HYPRE_Int right );
 void hypre_BigQsort2i( HYPRE_BigInt *v, HYPRE_Int *w, HYPRE_Int  left, HYPRE_Int  right );
-void hypre_qsort2 ( HYPRE_Int *v , HYPRE_Real *w , HYPRE_Int left , HYPRE_Int right );
-void hypre_qsort2_abs ( HYPRE_Int *v , HYPRE_Real *w , HYPRE_Int left , HYPRE_Int right );
-void hypre_qsort3i ( HYPRE_Int *v , HYPRE_Int *w , HYPRE_Int *z , HYPRE_Int left , HYPRE_Int right );
-void hypre_qsort3ir ( HYPRE_Int *v , HYPRE_Real *w , HYPRE_Int *z , HYPRE_Int left , HYPRE_Int right );
+void hypre_qsort2 ( HYPRE_Int *v, HYPRE_Real *w, HYPRE_Int left, HYPRE_Int right );
+void hypre_qsort2_abs ( HYPRE_Int *v, HYPRE_Real *w, HYPRE_Int left, HYPRE_Int right );
+void hypre_qsort3i ( HYPRE_Int *v, HYPRE_Int *w, HYPRE_Int *z, HYPRE_Int left, HYPRE_Int right );
+void hypre_qsort3ir ( HYPRE_Int *v, HYPRE_Real *w, HYPRE_Int *z, HYPRE_Int left, HYPRE_Int right );
 void hypre_qsort3( HYPRE_Real *v, HYPRE_Int *w, HYPRE_Int *z, HYPRE_Int  left, HYPRE_Int  right );
-void hypre_qsort3_abs ( HYPRE_Real *v , HYPRE_Int *w , HYPRE_Int *z , HYPRE_Int left , HYPRE_Int right );
-void hypre_BigQsort4_abs ( HYPRE_Real *v , HYPRE_BigInt *w , HYPRE_Int *z , HYPRE_Int *y , HYPRE_Int left , HYPRE_Int right );
-void hypre_qsort_abs ( HYPRE_Real *w , HYPRE_Int left , HYPRE_Int right );
+void hypre_qsort3_abs ( HYPRE_Real *v, HYPRE_Int *w, HYPRE_Int *z, HYPRE_Int left,
+                        HYPRE_Int right );
+void hypre_BigQsort4_abs ( HYPRE_Real *v, HYPRE_BigInt *w, HYPRE_Int *z, HYPRE_Int *y,
+                           HYPRE_Int left, HYPRE_Int right );
+void hypre_qsort_abs ( HYPRE_Real *w, HYPRE_Int left, HYPRE_Int right );
 void hypre_BigSwapbi(HYPRE_BigInt  *v, HYPRE_Int  *w, HYPRE_Int  i, HYPRE_Int  j );
 void hypre_BigQsortbi( HYPRE_BigInt *v, HYPRE_Int *w, HYPRE_Int  left, HYPRE_Int  right );
 void hypre_BigSwapLoc(HYPRE_BigInt  *v, HYPRE_Int  *w, HYPRE_Int  i, HYPRE_Int  j );
 void hypre_BigQsortbLoc( HYPRE_BigInt *v, HYPRE_Int *w, HYPRE_Int  left, HYPRE_Int  right );
 void hypre_BigSwapb2i(HYPRE_BigInt  *v, HYPRE_Int  *w, HYPRE_Int  *z, HYPRE_Int  i, HYPRE_Int  j );
-void hypre_BigQsortb2i( HYPRE_BigInt *v, HYPRE_Int *w, HYPRE_Int *z, HYPRE_Int  left, HYPRE_Int  right );
+void hypre_BigQsortb2i( HYPRE_BigInt *v, HYPRE_Int *w, HYPRE_Int *z, HYPRE_Int  left,
+                        HYPRE_Int  right );
 void hypre_BigSwap( HYPRE_BigInt *v, HYPRE_Int  i, HYPRE_Int  j );
 void hypre_BigQsort0( HYPRE_BigInt *v, HYPRE_Int  left, HYPRE_Int  right );
-void hypre_topo_sort(const HYPRE_Int *row_ptr, const HYPRE_Int *col_inds, const HYPRE_Complex *data, HYPRE_Int *ordering, HYPRE_Int n);
-void hypre_dense_topo_sort(const HYPRE_Complex *L, HYPRE_Int *ordering, HYPRE_Int n, HYPRE_Int is_col_major);
+void hypre_topo_sort(const HYPRE_Int *row_ptr, const HYPRE_Int *col_inds, const HYPRE_Complex *data,
+                     HYPRE_Int *ordering, HYPRE_Int n);
+void hypre_dense_topo_sort(const HYPRE_Complex *L, HYPRE_Int *ordering, HYPRE_Int n,
+                           HYPRE_Int is_col_major);
 
 /* qsplit.c */
-HYPRE_Int hypre_DoubleQuickSplit ( HYPRE_Real *values , HYPRE_Int *indices , HYPRE_Int list_length , HYPRE_Int NumberKept );
+HYPRE_Int hypre_DoubleQuickSplit ( HYPRE_Real *values, HYPRE_Int *indices, HYPRE_Int list_length,
+                                   HYPRE_Int NumberKept );
 
 /* random.c */
 /* HYPRE_CUDA_GLOBAL */ void hypre_SeedRand ( HYPRE_Int seed );
@@ -1534,12 +2198,14 @@ void hypre_prefix_sum(HYPRE_Int *in_out, HYPRE_Int *sum, HYPRE_Int *workspace);
  *                  workspace[2*tid] and workspace[2*tid+1] will contain results for tid
  *                  workspace[3*nthreads] and workspace[3*nthreads + 1] will contain sums
  */
-void hypre_prefix_sum_pair(HYPRE_Int *in_out1, HYPRE_Int *sum1, HYPRE_Int *in_out2, HYPRE_Int *sum2, HYPRE_Int *workspace);
+void hypre_prefix_sum_pair(HYPRE_Int *in_out1, HYPRE_Int *sum1, HYPRE_Int *in_out2, HYPRE_Int *sum2,
+                           HYPRE_Int *workspace);
 /**
  * @param workspace at least with length 3*(nthreads+1)
  *                  workspace[3*tid:3*tid+3) will contain results for tid
  */
-void hypre_prefix_sum_triple(HYPRE_Int *in_out1, HYPRE_Int *sum1, HYPRE_Int *in_out2, HYPRE_Int *sum2, HYPRE_Int *in_out3, HYPRE_Int *sum3, HYPRE_Int *workspace);
+void hypre_prefix_sum_triple(HYPRE_Int *in_out1, HYPRE_Int *sum1, HYPRE_Int *in_out2,
+                             HYPRE_Int *sum2, HYPRE_Int *in_out3, HYPRE_Int *sum3, HYPRE_Int *workspace);
 
 /**
  * n prefix-sums together.
@@ -1548,7 +2214,8 @@ void hypre_prefix_sum_triple(HYPRE_Int *in_out1, HYPRE_Int *sum1, HYPRE_Int *in_
  *
  * @param workspace at least with length n*(nthreads+1)
  */
-void hypre_prefix_sum_multiple(HYPRE_Int *in_out, HYPRE_Int *sum, HYPRE_Int n, HYPRE_Int *workspace);
+void hypre_prefix_sum_multiple(HYPRE_Int *in_out, HYPRE_Int *sum, HYPRE_Int n,
+                               HYPRE_Int *workspace);
 
 /* hopscotch_hash.c */
 
@@ -1567,7 +2234,7 @@ void hypre_prefix_sum_multiple(HYPRE_Int *in_out, HYPRE_Int *sum, HYPRE_Int n, H
 
 #endif // HYPRE_USING_OPENMP
 
-#ifdef HYPRE_HOPSCOTCH
+#ifdef HYPRE_USING_HOPSCOTCH
 #ifdef HYPRE_USING_ATOMIC
 // concurrent hopscotch hashing is possible only with atomic supports
 #define HYPRE_CONCURRENT_HOPSCOTCH
@@ -1577,8 +2244,8 @@ void hypre_prefix_sum_multiple(HYPRE_Int *in_out, HYPRE_Int *sum, HYPRE_Int n, H
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
 typedef struct
 {
-  HYPRE_Int volatile timestamp;
-  omp_lock_t         lock;
+   HYPRE_Int volatile timestamp;
+   omp_lock_t         lock;
 } hypre_HopscotchSegment;
 #endif
 
@@ -1618,18 +2285,18 @@ typedef struct
 
 typedef struct
 {
-  hypre_uint volatile hopInfo;
-  HYPRE_Int  volatile hash;
-  HYPRE_Int  volatile key;
-  HYPRE_Int  volatile data;
+   hypre_uint volatile hopInfo;
+   HYPRE_Int  volatile hash;
+   HYPRE_Int  volatile key;
+   HYPRE_Int  volatile data;
 } hypre_HopscotchBucket;
 
 typedef struct
 {
-  hypre_uint volatile hopInfo;
-  HYPRE_BigInt  volatile hash;
-  HYPRE_BigInt  volatile key;
-  HYPRE_Int  volatile data;
+   hypre_uint volatile hopInfo;
+   HYPRE_BigInt  volatile hash;
+   HYPRE_BigInt  volatile key;
+   HYPRE_Int  volatile data;
 } hypre_BigHopscotchBucket;
 
 /**
@@ -1664,49 +2331,124 @@ typedef struct
  * 1) Merge sort can take advantage of eliminating duplicates.
  * 2) Merge sort is more efficiently parallelizable than qsort
  */
-HYPRE_Int hypre_MergeOrderedArrays( HYPRE_Int size1 , HYPRE_Int *array1 , HYPRE_Int size2 , HYPRE_Int *array2 , HYPRE_Int *size3_ptr , HYPRE_Int **array3_ptr);
-void hypre_union2(HYPRE_Int n1, HYPRE_BigInt *arr1, HYPRE_Int n2, HYPRE_BigInt *arr2, HYPRE_Int *n3, HYPRE_BigInt *arr3, HYPRE_Int *map1, HYPRE_Int *map2);
+HYPRE_Int hypre_IntArrayMergeOrdered( hypre_IntArray *array1, hypre_IntArray *array2,
+                                      hypre_IntArray *array3 );
+void hypre_union2(HYPRE_Int n1, HYPRE_BigInt *arr1, HYPRE_Int n2, HYPRE_BigInt *arr2, HYPRE_Int *n3,
+                  HYPRE_BigInt *arr3, HYPRE_Int *map1, HYPRE_Int *map2);
 void hypre_merge_sort(HYPRE_Int *in, HYPRE_Int *temp, HYPRE_Int len, HYPRE_Int **sorted);
-void hypre_big_merge_sort(HYPRE_BigInt *in, HYPRE_BigInt *temp, HYPRE_Int len, HYPRE_BigInt **sorted);
-void hypre_sort_and_create_inverse_map(HYPRE_Int *in, HYPRE_Int len, HYPRE_Int **out, hypre_UnorderedIntMap *inverse_map);
-void hypre_big_sort_and_create_inverse_map(HYPRE_BigInt *in, HYPRE_Int len, HYPRE_BigInt **out, hypre_UnorderedBigIntMap *inverse_map);
-
+void hypre_big_merge_sort(HYPRE_BigInt *in, HYPRE_BigInt *temp, HYPRE_Int len,
+                          HYPRE_BigInt **sorted);
+void hypre_sort_and_create_inverse_map(HYPRE_Int *in, HYPRE_Int len, HYPRE_Int **out,
+                                       hypre_UnorderedIntMap *inverse_map);
+void hypre_big_sort_and_create_inverse_map(HYPRE_BigInt *in, HYPRE_Int len, HYPRE_BigInt **out,
+                                           hypre_UnorderedBigIntMap *inverse_map);
+
+/* device_utils.c */
 #if defined(HYPRE_USING_GPU)
-HYPRE_Int hypre_SyncCudaComputeStream(hypre_Handle *hypre_handle);
-HYPRE_Int hypre_SyncCudaDevice(hypre_Handle *hypre_handle);
-HYPRE_Int hypre_ResetCudaDevice(hypre_Handle *hypre_handle);
-HYPRE_Int hypreDevice_DiagScaleVector(HYPRE_Int n, HYPRE_Int *A_i, HYPRE_Complex *A_data, HYPRE_Complex *x, HYPRE_Complex beta, HYPRE_Complex *y);
-HYPRE_Int hypreDevice_DiagScaleVector2(HYPRE_Int n, HYPRE_Int *A_i, HYPRE_Complex *A_data, HYPRE_Complex *x, HYPRE_Complex beta, HYPRE_Complex *y, HYPRE_Complex *z);
+HYPRE_Int hypre_DeviceMemoryGetUsage(HYPRE_Real *mem);
+HYPRE_Int hypre_ForceSyncComputeStream();
+HYPRE_Int hypre_SyncComputeStream();
+HYPRE_Int hypre_SyncDevice();
+HYPRE_Int hypre_ResetDevice();
+
+HYPRE_Int hypreDevice_DiagScaleVector(HYPRE_Int num_vectors, HYPRE_Int num_rows,
+                                      HYPRE_Int *A_i, HYPRE_Complex *A_data,
+                                      HYPRE_Complex *x, HYPRE_Complex beta,
+                                      HYPRE_Complex *y);
+HYPRE_Int hypreDevice_DiagScaleVector2(HYPRE_Int num_vectors, HYPRE_Int num_rows,
+                                       HYPRE_Complex *diag, HYPRE_Complex *x,
+                                       HYPRE_Complex beta, HYPRE_Complex *y,
+                                       HYPRE_Complex *z, HYPRE_Int computeY);
+HYPRE_Int hypreDevice_ComplexArrayToArrayOfPtrs(HYPRE_Int n, HYPRE_Int m,
+                                                HYPRE_Complex *data, HYPRE_Complex **data_aop);
+HYPRE_Int hypreDevice_zeqxmydd(HYPRE_Int n, HYPRE_Complex *x, HYPRE_Complex alpha,
+                               HYPRE_Complex *y, HYPRE_Complex *z, HYPRE_Complex *d);
 HYPRE_Int hypreDevice_IVAXPY(HYPRE_Int n, HYPRE_Complex *a, HYPRE_Complex *x, HYPRE_Complex *y);
-HYPRE_Int hypreDevice_IVAXPYMarked(HYPRE_Int n, HYPRE_Complex *a, HYPRE_Complex *x, HYPRE_Complex *y, HYPRE_Int *marker, HYPRE_Int marker_val);
+HYPRE_Int hypreDevice_IVAXPYMarked(HYPRE_Int n, HYPRE_Complex *a, HYPRE_Complex *x,
+                                   HYPRE_Complex *y, HYPRE_Int *marker, HYPRE_Int marker_val);
+HYPRE_Int hypreDevice_IVAMXPMY(HYPRE_Int m, HYPRE_Int n, HYPRE_Complex *a,
+                               HYPRE_Complex *x, HYPRE_Complex *y);
+HYPRE_Int hypreDevice_IntFilln(HYPRE_Int *d_x, size_t n, HYPRE_Int v);
 HYPRE_Int hypreDevice_BigIntFilln(HYPRE_BigInt *d_x, size_t n, HYPRE_BigInt v);
-HYPRE_Int hypreDevice_Filln(HYPRE_Complex *d_x, size_t n, HYPRE_Complex v);
-HYPRE_Int hypreDevice_Scalen(HYPRE_Complex *d_x, size_t n, HYPRE_Complex v);
-#endif
-
-HYPRE_Int hypre_CurandUniform( HYPRE_Int n, HYPRE_Real *urand, HYPRE_Int set_seed, hypre_ulonglongint seed, HYPRE_Int set_offset, hypre_ulonglongint offset);
-HYPRE_Int hypre_CurandUniformSingle( HYPRE_Int n, float *urand, HYPRE_Int set_seed, hypre_ulonglongint seed, HYPRE_Int set_offset, hypre_ulonglongint offset);
-
+HYPRE_Int hypreDevice_ComplexFilln(HYPRE_Complex *d_x, size_t n, HYPRE_Complex v);
+HYPRE_Int hypreDevice_CharFilln(char *d_x, size_t n, char v);
+HYPRE_Int hypreDevice_IntStridedCopy ( HYPRE_Int size, HYPRE_Int stride,
+                                       HYPRE_Int *in, HYPRE_Int *out );
+HYPRE_Int hypreDevice_ComplexStridedCopy ( HYPRE_Int size, HYPRE_Int stride,
+                                           HYPRE_Complex *in, HYPRE_Complex *out );
+HYPRE_Int hypreDevice_IntScalen(HYPRE_Int *d_x, size_t n, HYPRE_Int *d_y, HYPRE_Int v);
+HYPRE_Int hypreDevice_ComplexScalen(HYPRE_Complex *d_x, size_t n, HYPRE_Complex *d_y,
+                                    HYPRE_Complex v);
+HYPRE_Int hypreDevice_ComplexAxpyn(HYPRE_Complex *d_x, size_t n, HYPRE_Complex *d_y,
+                                   HYPRE_Complex *d_z, HYPRE_Complex a);
+HYPRE_Int hypreDevice_ComplexAxpyzn(HYPRE_Int n, HYPRE_Complex *d_x, HYPRE_Complex *d_y,
+                                    HYPRE_Complex *d_z, HYPRE_Complex a, HYPRE_Complex b);
+HYPRE_Int hypreDevice_IntAxpyn(HYPRE_Int *d_x, size_t n, HYPRE_Int *d_y, HYPRE_Int *d_z,
+                               HYPRE_Int a);
+HYPRE_Int hypreDevice_BigIntAxpyn(HYPRE_BigInt *d_x, size_t n, HYPRE_BigInt *d_y,
+                                  HYPRE_BigInt *d_z, HYPRE_BigInt a);
+HYPRE_Int* hypreDevice_CsrRowPtrsToIndices(HYPRE_Int nrows, HYPRE_Int nnz, HYPRE_Int *d_row_ptr);
+HYPRE_Int hypreDevice_CsrRowPtrsToIndices_v2(HYPRE_Int nrows, HYPRE_Int nnz, HYPRE_Int *d_row_ptr,
+                                             HYPRE_Int *d_row_ind);
+HYPRE_Int* hypreDevice_CsrRowIndicesToPtrs(HYPRE_Int nrows, HYPRE_Int nnz, HYPRE_Int *d_row_ind);
+HYPRE_Int hypreDevice_CsrRowIndicesToPtrs_v2(HYPRE_Int nrows, HYPRE_Int nnz, HYPRE_Int *d_row_ind,
+                                             HYPRE_Int *d_row_ptr);
+HYPRE_Int hypreDevice_GetRowNnz(HYPRE_Int nrows, HYPRE_Int *d_row_indices, HYPRE_Int *d_diag_ia,
+                                HYPRE_Int *d_offd_ia, HYPRE_Int *d_rownnz);
+HYPRE_Int hypreDevice_CopyParCSRRows(HYPRE_Int nrows, HYPRE_Int *d_row_indices, HYPRE_Int job,
+                                     HYPRE_Int has_offd, HYPRE_BigInt first_col,
+                                     HYPRE_BigInt *d_col_map_offd_A, HYPRE_Int *d_diag_i,
+                                     HYPRE_Int *d_diag_j, HYPRE_Complex *d_diag_a,
+                                     HYPRE_Int *d_offd_i, HYPRE_Int *d_offd_j,
+                                     HYPRE_Complex *d_offd_a, HYPRE_Int *d_ib,
+                                     HYPRE_BigInt *d_jb, HYPRE_Complex *d_ab);
+HYPRE_Int hypreDevice_IntegerReduceSum(HYPRE_Int m, HYPRE_Int *d_i);
+HYPRE_Complex hypreDevice_ComplexReduceSum(HYPRE_Int m, HYPRE_Complex *d_x);
+HYPRE_Int hypreDevice_IntegerInclusiveScan(HYPRE_Int n, HYPRE_Int *d_i);
+HYPRE_Int hypreDevice_IntegerExclusiveScan(HYPRE_Int n, HYPRE_Int *d_i);
+HYPRE_Int hypre_CudaCompileFlagCheck(void);
+#endif
+
+HYPRE_Int hypre_CurandUniform( HYPRE_Int n, HYPRE_Real *urand, HYPRE_Int set_seed,
+                               hypre_ulonglongint seed, HYPRE_Int set_offset, hypre_ulonglongint offset);
+HYPRE_Int hypre_CurandUniformSingle( HYPRE_Int n, float *urand, HYPRE_Int set_seed,
+                                     hypre_ulonglongint seed, HYPRE_Int set_offset, hypre_ulonglongint offset);
+
+HYPRE_Int hypre_ResetDeviceRandGenerator( hypre_ulonglongint seed, hypre_ulonglongint offset );
+
+HYPRE_Int hypre_bind_device_id(HYPRE_Int device_id_in, HYPRE_Int myid,
+                               HYPRE_Int nproc, MPI_Comm comm);
 HYPRE_Int hypre_bind_device(HYPRE_Int myid, HYPRE_Int nproc, MPI_Comm comm);
 
+/* stl_ops.c */
+HYPRE_Int hypre_IntSequence(HYPRE_MemoryLocation memory_location, HYPRE_Int size, HYPRE_Int *data);
+
 /* nvtx.c */
 void hypre_GpuProfilingPushRangeColor(const char *name, HYPRE_Int cid);
 void hypre_GpuProfilingPushRange(const char *name);
-void hypre_GpuProfilingPopRange();
+void hypre_GpuProfilingPopRange(void);
 
 /* utilities.c */
 HYPRE_Int hypre_multmod(HYPRE_Int a, HYPRE_Int b, HYPRE_Int mod);
 void hypre_partition1D(HYPRE_Int n, HYPRE_Int p, HYPRE_Int j, HYPRE_Int *s, HYPRE_Int *e);
 char *hypre_strcpy(char *destination, const char *source);
+HYPRE_Int hypre_CheckDirExists(const char *path);
+HYPRE_Int hypre_CreateDir(const char *path);
+HYPRE_Int hypre_CreateNextDirOfSequence(const char *basepath, const char *prefix,
+                                        char **fullpath_ptr);
+char* hypre_ConvertIndicesToString(HYPRE_Int size, HYPRE_Int *indices);
 
 HYPRE_Int hypre_SetSyncCudaCompute(HYPRE_Int action);
-HYPRE_Int hypre_RestoreSyncCudaCompute();
+HYPRE_Int hypre_RestoreSyncCudaCompute(void);
 HYPRE_Int hypre_GetSyncCudaCompute(HYPRE_Int *cuda_compute_stream_sync_ptr);
-HYPRE_Int hypre_SyncCudaComputeStream(hypre_Handle *hypre_handle);
 
 /* handle.c */
-HYPRE_Int hypre_SetSpGemmUseCusparse( HYPRE_Int use_cusparse );
+HYPRE_Int hypre_SetLogLevel( HYPRE_Int log_level );
+HYPRE_Int hypre_SetSpTransUseVendor( HYPRE_Int use_vendor );
+HYPRE_Int hypre_SetSpMVUseVendor( HYPRE_Int use_vendor );
+HYPRE_Int hypre_SetSpGemmUseVendor( HYPRE_Int use_vendor );
 HYPRE_Int hypre_SetSpGemmAlgorithm( HYPRE_Int value );
+HYPRE_Int hypre_SetSpGemmBinned( HYPRE_Int value );
 HYPRE_Int hypre_SetSpGemmRownnzEstimateMethod( HYPRE_Int value );
 HYPRE_Int hypre_SetSpGemmRownnzEstimateNSamples( HYPRE_Int value );
 HYPRE_Int hypre_SetSpGemmRownnzEstimateMultFactor( HYPRE_Real value );
@@ -1715,18 +2457,81 @@ HYPRE_Int hypre_SetUseGpuRand( HYPRE_Int use_gpurand );
 HYPRE_Int hypre_SetGaussSeidelMethod( HYPRE_Int gs_method );
 HYPRE_Int hypre_SetUserDeviceMalloc(GPUMallocFunc func);
 HYPRE_Int hypre_SetUserDeviceMfree(GPUMfreeFunc func);
+HYPRE_Int hypre_SetGpuAwareMPI( HYPRE_Int use_gpu_aware_mpi );
+HYPRE_Int hypre_GetGpuAwareMPI(void);
 
 /* int_array.c */
 hypre_IntArray* hypre_IntArrayCreate( HYPRE_Int size );
 HYPRE_Int hypre_IntArrayDestroy( hypre_IntArray *array );
-HYPRE_Int hypre_IntArrayInitialize_v2( hypre_IntArray *array, HYPRE_MemoryLocation memory_location );
+HYPRE_Int hypre_IntArrayInitialize_v2( hypre_IntArray *array,
+                                       HYPRE_MemoryLocation memory_location );
 HYPRE_Int hypre_IntArrayInitialize( hypre_IntArray *array );
 HYPRE_Int hypre_IntArrayCopy( hypre_IntArray *x, hypre_IntArray *y );
-hypre_IntArray* hypre_IntArrayCloneDeep_v2( hypre_IntArray *x, HYPRE_MemoryLocation memory_location );
+hypre_IntArray* hypre_IntArrayCloneDeep_v2( hypre_IntArray *x,
+                                            HYPRE_MemoryLocation memory_location );
 hypre_IntArray* hypre_IntArrayCloneDeep( hypre_IntArray *x );
+HYPRE_Int hypre_IntArrayMigrate( hypre_IntArray *v, HYPRE_MemoryLocation memory_location );
+HYPRE_Int hypre_IntArrayPrint( MPI_Comm comm, hypre_IntArray *array, const char *filename );
+HYPRE_Int hypre_IntArrayRead( MPI_Comm comm, const char *filename, hypre_IntArray **array_ptr );
+HYPRE_Int hypre_IntArraySetConstantValuesHost( hypre_IntArray *v, HYPRE_Int value );
 HYPRE_Int hypre_IntArraySetConstantValues( hypre_IntArray *v, HYPRE_Int value );
+HYPRE_Int hypre_IntArraySetInterleavedValues( hypre_IntArray *v, HYPRE_Int cycle );
+HYPRE_Int hypre_IntArrayCountHost( hypre_IntArray *v, HYPRE_Int value,
+                                   HYPRE_Int *num_values_ptr );
+HYPRE_Int hypre_IntArrayCount( hypre_IntArray *v, HYPRE_Int value,
+                               HYPRE_Int *num_values_ptr );
+HYPRE_Int hypre_IntArrayInverseMapping( hypre_IntArray *v, hypre_IntArray **w_ptr );
+HYPRE_Int hypre_IntArrayNegate( hypre_IntArray *v );
+HYPRE_Int hypre_IntArraySeparateByValue( HYPRE_Int num_values, HYPRE_Int *values,
+                                         HYPRE_Int *sizes, hypre_IntArray *v,
+                                         hypre_IntArrayArray **w_ptr );
+hypre_IntArrayArray* hypre_IntArrayArrayCreate( HYPRE_Int num_entries, HYPRE_Int *sizes );
+HYPRE_Int hypre_IntArrayArrayDestroy( hypre_IntArrayArray *w );
+HYPRE_Int hypre_IntArrayArrayInitializeIn( hypre_IntArrayArray *w,
+                                           HYPRE_MemoryLocation  memory_location );
+HYPRE_Int hypre_IntArrayArrayInitialize( hypre_IntArrayArray *w );
+HYPRE_Int hypre_IntArrayArrayMigrate( hypre_IntArrayArray *w,
+                                      HYPRE_MemoryLocation memory_location );
+
+/* int_array_device.c */
+#if defined(HYPRE_USING_GPU) || defined(HYPRE_USING_DEVICE_OPENMP)
+HYPRE_Int hypre_IntArraySetConstantValuesDevice( hypre_IntArray *v, HYPRE_Int value );
+HYPRE_Int hypre_IntArrayCountDevice ( hypre_IntArray *v, HYPRE_Int value,
+                                      HYPRE_Int *num_values_ptr );
+HYPRE_Int hypre_IntArrayInverseMappingDevice( hypre_IntArray *v, hypre_IntArray *w );
+HYPRE_Int hypre_IntArrayNegateDevice( hypre_IntArray *v );
+HYPRE_Int hypre_IntArraySetInterleavedValuesDevice( hypre_IntArray *v, HYPRE_Int cycle );
+HYPRE_Int hypre_IntArraySeparateByValueDevice( HYPRE_Int num_values, HYPRE_Int *values,
+                                               HYPRE_Int *sizes, hypre_IntArray *v,
+                                               hypre_IntArrayArray *w );
+#endif
+
+/* memory_tracker.c */
+#ifdef HYPRE_USING_MEMORY_TRACKER
+hypre_MemoryTracker* hypre_memory_tracker(void);
+hypre_MemoryTracker * hypre_MemoryTrackerCreate(void);
+void hypre_MemoryTrackerDestroy(hypre_MemoryTracker *tracker);
+void hypre_MemoryTrackerInsert1(const char *action, void *ptr, size_t nbytes,
+                                hypre_MemoryLocation memory_location, const char *filename,
+                                const char *function, HYPRE_Int line);
+void hypre_MemoryTrackerInsert2(const char *action, void *ptr, void *ptr2, size_t nbytes,
+                                hypre_MemoryLocation memory_location,
+                                hypre_MemoryLocation memory_location2,
+                                const char *filename,
+                                const char *function, HYPRE_Int line);
+HYPRE_Int hypre_PrintMemoryTracker( size_t *totl_bytes_o, size_t *peak_bytes_o,
+                                    size_t *curr_bytes_o, HYPRE_Int do_print, const char *fname );
+HYPRE_Int hypre_MemoryTrackerSetPrint(HYPRE_Int do_print);
+HYPRE_Int hypre_MemoryTrackerSetFileName(const char *file_name);
+#endif
+
+/* magma.c */
+#if defined(HYPRE_USING_MAGMA)
+HYPRE_Int hypre_MagmaInitialize(void);
+HYPRE_Int hypre_MagmaFinalize(void);
+#endif
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -1774,13 +2579,13 @@ HYPRE_Int hypre_IntArraySetConstantValues( hypre_IntArray *v, HYPRE_Int value );
 #include <string.h>
 #include <stdio.h>
 #include <limits.h>
-#include <math.h>
+//#include <math.h>
 
 #ifdef HYPRE_USING_OPENMP
 #include <omp.h>
 #endif
 
-#include "_hypre_utilities.h"
+//#include "_hypre_utilities.h"
 
 // Potentially architecture specific features used here:
 // __sync_val_compare_and_swap
@@ -1797,36 +2602,36 @@ extern "C" {
  ******************************************************************************/
 
 #ifdef HYPRE_USING_ATOMIC
-static inline HYPRE_Int
+static inline HYPRE_MAYBE_UNUSED_FUNC HYPRE_Int
 hypre_compare_and_swap( HYPRE_Int *ptr, HYPRE_Int oldval, HYPRE_Int newval )
 {
 #if defined(__GNUC__) && defined(__GNUC_MINOR__) && defined(__GNUC_PATCHLEVEL__) && (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) > 40100
-  return __sync_val_compare_and_swap(ptr, oldval, newval);
-//#elif defind _MSC_VER
-  //return _InterlockedCompareExchange((long *)ptr, newval, oldval);
-//#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L && !defined(__STDC_NO_ATOMICS__)
-// JSP: not many compilers have implemented this, so comment out for now
-  //_Atomic HYPRE_Int *atomic_ptr = ptr;
-  //atomic_compare_exchange_strong(atomic_ptr, &oldval, newval);
-  //return oldval;
+   return __sync_val_compare_and_swap(ptr, oldval, newval);
+   //#elif defind _MSC_VER
+   //return _InterlockedCompareExchange((long *)ptr, newval, oldval);
+   //#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L && !defined(__STDC_NO_ATOMICS__)
+   // JSP: not many compilers have implemented this, so comment out for now
+   //_Atomic HYPRE_Int *atomic_ptr = ptr;
+   //atomic_compare_exchange_strong(atomic_ptr, &oldval, newval);
+   //return oldval;
 #endif
 }
 
-static inline HYPRE_Int
+static inline HYPRE_MAYBE_UNUSED_FUNC HYPRE_Int
 hypre_fetch_and_add( HYPRE_Int *ptr, HYPRE_Int value )
 {
 #if defined(__GNUC__) && defined(__GNUC_MINOR__) && defined(__GNUC_PATCHLEVEL__) && (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) > 40100
-  return __sync_fetch_and_add(ptr, value);
-//#elif defined _MSC_VER
-  //return _InterlockedExchangeAdd((long *)ptr, value);
-//#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L && !defined(__STDC_NO_ATOMICS__)
-// JSP: not many compilers have implemented this, so comment out for now
-  //_Atomic HYPRE_Int *atomic_ptr = ptr;
-  //return atomic_fetch_add(atomic_ptr, value);
+   return __sync_fetch_and_add(ptr, value);
+   //#elif defined _MSC_VER
+   //return _InterlockedExchangeAdd((long *)ptr, value);
+   //#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L && !defined(__STDC_NO_ATOMICS__)
+   // JSP: not many compilers have implemented this, so comment out for now
+   //_Atomic HYPRE_Int *atomic_ptr = ptr;
+   //return atomic_fetch_add(atomic_ptr, value);
 #endif
 }
 #else // !HYPRE_USING_ATOMIC
-static inline HYPRE_Int
+static inline HYPRE_MAYBE_UNUSED_FUNC HYPRE_Int
 hypre_compare_and_swap( HYPRE_Int *ptr, HYPRE_Int oldval, HYPRE_Int newval )
 {
    if (*ptr == oldval)
@@ -1834,10 +2639,10 @@ hypre_compare_and_swap( HYPRE_Int *ptr, HYPRE_Int oldval, HYPRE_Int newval )
       *ptr = newval;
       return oldval;
    }
-   else return *ptr;
+   else { return *ptr; }
 }
 
-static inline HYPRE_Int
+static inline HYPRE_MAYBE_UNUSED_FUNC HYPRE_Int
 hypre_fetch_and_add( HYPRE_Int *ptr, HYPRE_Int value )
 {
    HYPRE_Int oldval = *ptr;
@@ -1856,7 +2661,7 @@ hypre_fetch_and_add( HYPRE_Int *ptr, HYPRE_Int value )
 #define HYPRE_HOPSCOTCH_HASH_BUSY  (1)
 
 // Small Utilities ..........................................................
-static inline HYPRE_Int
+static inline HYPRE_MAYBE_UNUSED_FUNC HYPRE_Int
 first_lsb_bit_indx( hypre_uint x )
 {
    HYPRE_Int pos;
@@ -1933,181 +2738,189 @@ first_lsb_bit_indx( hypre_uint x )
 #define HYPRE_XXH_rotl64(x,r) ((x << r) | (x >> (64 - r)))
 
 #if defined(HYPRE_MIXEDINT) || defined(HYPRE_BIGINT)
-static inline HYPRE_BigInt
+static inline HYPRE_MAYBE_UNUSED_FUNC HYPRE_BigInt
 hypre_BigHash( HYPRE_BigInt input )
 {
-    hypre_ulongint h64 = HYPRE_XXH_PRIME64_5 + sizeof(input);
+   hypre_ulonglongint h64 = HYPRE_XXH_PRIME64_5 + sizeof(input);
 
-    hypre_ulongint k1 = input;
-    k1 *= HYPRE_XXH_PRIME64_2;
-    k1 = HYPRE_XXH_rotl64(k1, 31);
-    k1 *= HYPRE_XXH_PRIME64_1;
-    h64 ^= k1;
-    h64 = HYPRE_XXH_rotl64(h64, 27)*HYPRE_XXH_PRIME64_1 + HYPRE_XXH_PRIME64_4;
+   hypre_ulonglongint k1 = input;
+   k1 *= HYPRE_XXH_PRIME64_2;
+   k1 = HYPRE_XXH_rotl64(k1, 31);
+   k1 *= HYPRE_XXH_PRIME64_1;
+   h64 ^= k1;
+   h64 = HYPRE_XXH_rotl64(h64, 27) * HYPRE_XXH_PRIME64_1 + HYPRE_XXH_PRIME64_4;
 
-    h64 ^= h64 >> 33;
-    h64 *= HYPRE_XXH_PRIME64_2;
-    h64 ^= h64 >> 29;
-    h64 *= HYPRE_XXH_PRIME64_3;
-    h64 ^= h64 >> 32;
+   h64 ^= h64 >> 33;
+   h64 *= HYPRE_XXH_PRIME64_2;
+   h64 ^= h64 >> 29;
+   h64 *= HYPRE_XXH_PRIME64_3;
+   h64 ^= h64 >> 32;
 
 #ifndef NDEBUG
-    if (HYPRE_HOPSCOTCH_HASH_EMPTY == h64) {
+   if (HYPRE_HOPSCOTCH_HASH_EMPTY == h64)
+   {
       hypre_printf("hash(%lld) = %d\n", h64, HYPRE_HOPSCOTCH_HASH_EMPTY);
       hypre_assert(HYPRE_HOPSCOTCH_HASH_EMPTY != h64);
-    }
+   }
 #endif
 
-    return h64;
+   return h64;
 }
 
 #else
-static inline HYPRE_Int
+static inline HYPRE_MAYBE_UNUSED_FUNC HYPRE_Int
 hypre_BigHash(HYPRE_Int input)
 {
-    hypre_uint h32 = HYPRE_XXH_PRIME32_5 + sizeof(input);
+   hypre_uint h32 = HYPRE_XXH_PRIME32_5 + sizeof(input);
 
-    // 1665863975 is added to input so that
-    // only -1073741824 gives HYPRE_HOPSCOTCH_HASH_EMPTY.
-    // Hence, we're fine as long as key is non-negative.
-    h32 += (input + 1665863975)*HYPRE_XXH_PRIME32_3;
-    h32 = HYPRE_XXH_rotl32(h32, 17)*HYPRE_XXH_PRIME32_4;
+   // 1665863975 is added to input so that
+   // only -1073741824 gives HYPRE_HOPSCOTCH_HASH_EMPTY.
+   // Hence, we're fine as long as key is non-negative.
+   h32 += (input + 1665863975) * HYPRE_XXH_PRIME32_3;
+   h32 = HYPRE_XXH_rotl32(h32, 17) * HYPRE_XXH_PRIME32_4;
 
-    h32 ^= h32 >> 15;
-    h32 *= HYPRE_XXH_PRIME32_2;
-    h32 ^= h32 >> 13;
-    h32 *= HYPRE_XXH_PRIME32_3;
-    h32 ^= h32 >> 16;
+   h32 ^= h32 >> 15;
+   h32 *= HYPRE_XXH_PRIME32_2;
+   h32 ^= h32 >> 13;
+   h32 *= HYPRE_XXH_PRIME32_3;
+   h32 ^= h32 >> 16;
 
-    //hypre_assert(HYPRE_HOPSCOTCH_HASH_EMPTY != h32);
+   //hypre_assert(HYPRE_HOPSCOTCH_HASH_EMPTY != h32);
 
-    return h32;
+   return h32;
 }
 #endif
 
 #ifdef HYPRE_BIGINT
-static inline HYPRE_Int
+static inline HYPRE_MAYBE_UNUSED_FUNC HYPRE_Int
 hypre_Hash(HYPRE_Int input)
 {
-    hypre_ulongint h64 = HYPRE_XXH_PRIME64_5 + sizeof(input);
+   hypre_ulonglongint h64 = HYPRE_XXH_PRIME64_5 + sizeof(input);
 
-    hypre_ulongint k1 = input;
-    k1 *= HYPRE_XXH_PRIME64_2;
-    k1 = HYPRE_XXH_rotl64(k1, 31);
-    k1 *= HYPRE_XXH_PRIME64_1;
-    h64 ^= k1;
-    h64 = HYPRE_XXH_rotl64(h64, 27)*HYPRE_XXH_PRIME64_1 + HYPRE_XXH_PRIME64_4;
+   hypre_ulonglongint k1 = input;
+   k1 *= HYPRE_XXH_PRIME64_2;
+   k1 = HYPRE_XXH_rotl64(k1, 31);
+   k1 *= HYPRE_XXH_PRIME64_1;
+   h64 ^= k1;
+   h64 = HYPRE_XXH_rotl64(h64, 27) * HYPRE_XXH_PRIME64_1 + HYPRE_XXH_PRIME64_4;
 
-    h64 ^= h64 >> 33;
-    h64 *= HYPRE_XXH_PRIME64_2;
-    h64 ^= h64 >> 29;
-    h64 *= HYPRE_XXH_PRIME64_3;
-    h64 ^= h64 >> 32;
+   h64 ^= h64 >> 33;
+   h64 *= HYPRE_XXH_PRIME64_2;
+   h64 ^= h64 >> 29;
+   h64 *= HYPRE_XXH_PRIME64_3;
+   h64 ^= h64 >> 32;
 
 #ifndef NDEBUG
-    if (HYPRE_HOPSCOTCH_HASH_EMPTY == h64) {
+   if (HYPRE_HOPSCOTCH_HASH_EMPTY == h64)
+   {
       hypre_printf("hash(%lld) = %d\n", h64, HYPRE_HOPSCOTCH_HASH_EMPTY);
       hypre_assert(HYPRE_HOPSCOTCH_HASH_EMPTY != h64);
-    }
+   }
 #endif
 
-    return h64;
+   return h64;
 }
 
 #else
-static inline HYPRE_Int
+static inline HYPRE_MAYBE_UNUSED_FUNC HYPRE_Int
 hypre_Hash(HYPRE_Int input)
 {
-    hypre_uint h32 = HYPRE_XXH_PRIME32_5 + sizeof(input);
+   hypre_uint h32 = HYPRE_XXH_PRIME32_5 + sizeof(input);
 
-    // 1665863975 is added to input so that
-    // only -1073741824 gives HYPRE_HOPSCOTCH_HASH_EMPTY.
-    // Hence, we're fine as long as key is non-negative.
-    h32 += (input + 1665863975)*HYPRE_XXH_PRIME32_3;
-    h32 = HYPRE_XXH_rotl32(h32, 17)*HYPRE_XXH_PRIME32_4;
+   // 1665863975 is added to input so that
+   // only -1073741824 gives HYPRE_HOPSCOTCH_HASH_EMPTY.
+   // Hence, we're fine as long as key is non-negative.
+   h32 += (input + 1665863975) * HYPRE_XXH_PRIME32_3;
+   h32 = HYPRE_XXH_rotl32(h32, 17) * HYPRE_XXH_PRIME32_4;
 
-    h32 ^= h32 >> 15;
-    h32 *= HYPRE_XXH_PRIME32_2;
-    h32 ^= h32 >> 13;
-    h32 *= HYPRE_XXH_PRIME32_3;
-    h32 ^= h32 >> 16;
+   h32 ^= h32 >> 15;
+   h32 *= HYPRE_XXH_PRIME32_2;
+   h32 ^= h32 >> 13;
+   h32 *= HYPRE_XXH_PRIME32_3;
+   h32 ^= h32 >> 16;
 
-    //hypre_assert(HYPRE_HOPSCOTCH_HASH_EMPTY != h32);
+   //hypre_assert(HYPRE_HOPSCOTCH_HASH_EMPTY != h32);
 
-    return h32;
+   return h32;
 }
 #endif
 
-static inline void
- hypre_UnorderedIntSetFindCloserFreeBucket( hypre_UnorderedIntSet *s,
+static inline HYPRE_MAYBE_UNUSED_FUNC void
+hypre_UnorderedIntSetFindCloserFreeBucket( hypre_UnorderedIntSet *s,
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-                                            hypre_HopscotchSegment *start_seg,
+                                           hypre_HopscotchSegment *start_seg,
 #endif
-                                            HYPRE_Int *free_bucket,
-                                            HYPRE_Int *free_dist )
+                                           HYPRE_Int *free_bucket,
+                                           HYPRE_Int *free_dist )
 {
-  HYPRE_Int move_bucket = *free_bucket - (HYPRE_HOPSCOTCH_HASH_HOP_RANGE - 1);
-  HYPRE_Int move_free_dist;
-  for (move_free_dist = HYPRE_HOPSCOTCH_HASH_HOP_RANGE - 1; move_free_dist > 0; --move_free_dist)
-  {
-    hypre_uint start_hop_info = s->hopInfo[move_bucket];
-    HYPRE_Int move_new_free_dist = -1;
-    hypre_uint mask = 1;
-    HYPRE_Int i;
-    for (i = 0; i < move_free_dist; ++i, mask <<= 1)
-    {
-      if (mask & start_hop_info)
+   HYPRE_Int move_bucket = *free_bucket - (HYPRE_HOPSCOTCH_HASH_HOP_RANGE - 1);
+   HYPRE_Int move_free_dist;
+   for (move_free_dist = HYPRE_HOPSCOTCH_HASH_HOP_RANGE - 1; move_free_dist > 0; --move_free_dist)
+   {
+      hypre_uint start_hop_info = s->hopInfo[move_bucket];
+      HYPRE_Int move_new_free_dist = -1;
+      hypre_uint mask = 1;
+      HYPRE_Int i;
+      for (i = 0; i < move_free_dist; ++i, mask <<= 1)
       {
-        move_new_free_dist = i;
-        break;
+         if (mask & start_hop_info)
+         {
+            move_new_free_dist = i;
+            break;
+         }
       }
-    }
-    if (-1 != move_new_free_dist)
-    {
+      if (-1 != move_new_free_dist)
+      {
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-      hypre_HopscotchSegment*  move_segment = &(s->segments[move_bucket & s->segmentMask]);
+         hypre_HopscotchSegment*  move_segment = &(s->segments[move_bucket & s->segmentMask]);
 
-      if(start_seg != move_segment)
-        omp_set_lock(&move_segment->lock);
+         if (start_seg != move_segment)
+         {
+            omp_set_lock(&move_segment->lock);
+         }
 #endif
 
-      if (start_hop_info == s->hopInfo[move_bucket])
-      {
-        // new_free_bucket -> free_bucket and empty new_free_bucket
-        HYPRE_Int new_free_bucket = move_bucket + move_new_free_dist;
-        s->key[*free_bucket]  = s->key[new_free_bucket];
-        s->hash[*free_bucket] = s->hash[new_free_bucket];
+         if (start_hop_info == s->hopInfo[move_bucket])
+         {
+            // new_free_bucket -> free_bucket and empty new_free_bucket
+            HYPRE_Int new_free_bucket = move_bucket + move_new_free_dist;
+            s->key[*free_bucket]  = s->key[new_free_bucket];
+            s->hash[*free_bucket] = s->hash[new_free_bucket];
 
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-        ++move_segment->timestamp;
-#pragma omp flush
+            ++move_segment->timestamp;
+            #pragma omp flush
 #endif
 
-        s->hopInfo[move_bucket] |= (1U << move_free_dist);
-        s->hopInfo[move_bucket] &= ~(1U << move_new_free_dist);
+            s->hopInfo[move_bucket] |= (1U << move_free_dist);
+            s->hopInfo[move_bucket] &= ~(1U << move_new_free_dist);
 
-        *free_bucket = new_free_bucket;
-        *free_dist -= move_free_dist - move_new_free_dist;
+            *free_bucket = new_free_bucket;
+            *free_dist -= move_free_dist - move_new_free_dist;
 
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-        if(start_seg != move_segment)
-          omp_unset_lock(&move_segment->lock);
+            if (start_seg != move_segment)
+            {
+               omp_unset_lock(&move_segment->lock);
+            }
 #endif
 
-        return;
-      }
+            return;
+         }
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-      if(start_seg != move_segment)
-        omp_unset_lock(&move_segment->lock);
-#endif
-    }
-    ++move_bucket;
-  }
-  *free_bucket = -1;
-  *free_dist = 0;
+         if (start_seg != move_segment)
+         {
+            omp_unset_lock(&move_segment->lock);
+         }
+#endif
+      }
+      ++move_bucket;
+   }
+   *free_bucket = -1;
+   *free_dist = 0;
 }
 
-static inline void
+static inline HYPRE_MAYBE_UNUSED_FUNC void
 hypre_UnorderedBigIntSetFindCloserFreeBucket( hypre_UnorderedBigIntSet *s,
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
                                               hypre_HopscotchSegment   *start_seg,
@@ -2115,68 +2928,74 @@ hypre_UnorderedBigIntSetFindCloserFreeBucket( hypre_UnorderedBigIntSet *s,
                                               HYPRE_Int *free_bucket,
                                               HYPRE_Int *free_dist )
 {
-  HYPRE_Int move_bucket = *free_bucket - (HYPRE_HOPSCOTCH_HASH_HOP_RANGE - 1);
-  HYPRE_Int move_free_dist;
-  for (move_free_dist = HYPRE_HOPSCOTCH_HASH_HOP_RANGE - 1; move_free_dist > 0; --move_free_dist)
-  {
-    hypre_uint start_hop_info = s->hopInfo[move_bucket];
-    HYPRE_Int move_new_free_dist = -1;
-    hypre_uint mask = 1;
-    HYPRE_Int i;
-    for (i = 0; i < move_free_dist; ++i, mask <<= 1)
-    {
-      if (mask & start_hop_info)
+   HYPRE_Int move_bucket = *free_bucket - (HYPRE_HOPSCOTCH_HASH_HOP_RANGE - 1);
+   HYPRE_Int move_free_dist;
+   for (move_free_dist = HYPRE_HOPSCOTCH_HASH_HOP_RANGE - 1; move_free_dist > 0; --move_free_dist)
+   {
+      hypre_uint start_hop_info = s->hopInfo[move_bucket];
+      HYPRE_Int move_new_free_dist = -1;
+      hypre_uint mask = 1;
+      HYPRE_Int i;
+      for (i = 0; i < move_free_dist; ++i, mask <<= 1)
       {
-        move_new_free_dist = i;
-        break;
+         if (mask & start_hop_info)
+         {
+            move_new_free_dist = i;
+            break;
+         }
       }
-    }
-    if (-1 != move_new_free_dist)
-    {
+      if (-1 != move_new_free_dist)
+      {
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-      hypre_HopscotchSegment*  move_segment = &(s->segments[move_bucket & s->segmentMask]);
+         hypre_HopscotchSegment*  move_segment = &(s->segments[move_bucket & s->segmentMask]);
 
-      if(start_seg != move_segment)
-        omp_set_lock(&move_segment->lock);
+         if (start_seg != move_segment)
+         {
+            omp_set_lock(&move_segment->lock);
+         }
 #endif
 
-      if (start_hop_info == s->hopInfo[move_bucket])
-      {
-        // new_free_bucket -> free_bucket and empty new_free_bucket
-        HYPRE_Int new_free_bucket = move_bucket + move_new_free_dist;
-        s->key[*free_bucket]  = s->key[new_free_bucket];
-        s->hash[*free_bucket] = s->hash[new_free_bucket];
+         if (start_hop_info == s->hopInfo[move_bucket])
+         {
+            // new_free_bucket -> free_bucket and empty new_free_bucket
+            HYPRE_Int new_free_bucket = move_bucket + move_new_free_dist;
+            s->key[*free_bucket]  = s->key[new_free_bucket];
+            s->hash[*free_bucket] = s->hash[new_free_bucket];
 
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-        ++move_segment->timestamp;
-#pragma omp flush
+            ++move_segment->timestamp;
+            #pragma omp flush
 #endif
 
-        s->hopInfo[move_bucket] |= (1U << move_free_dist);
-        s->hopInfo[move_bucket] &= ~(1U << move_new_free_dist);
+            s->hopInfo[move_bucket] |= (1U << move_free_dist);
+            s->hopInfo[move_bucket] &= ~(1U << move_new_free_dist);
 
-        *free_bucket = new_free_bucket;
-        *free_dist -= move_free_dist - move_new_free_dist;
+            *free_bucket = new_free_bucket;
+            *free_dist -= move_free_dist - move_new_free_dist;
 
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-        if(start_seg != move_segment)
-          omp_unset_lock(&move_segment->lock);
+            if (start_seg != move_segment)
+            {
+               omp_unset_lock(&move_segment->lock);
+            }
 #endif
 
-        return;
-      }
+            return;
+         }
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-      if(start_seg != move_segment)
-        omp_unset_lock(&move_segment->lock);
-#endif
-    }
-    ++move_bucket;
-  }
-  *free_bucket = -1;
-  *free_dist = 0;
+         if (start_seg != move_segment)
+         {
+            omp_unset_lock(&move_segment->lock);
+         }
+#endif
+      }
+      ++move_bucket;
+   }
+   *free_bucket = -1;
+   *free_dist = 0;
 }
 
-static inline void
+static inline HYPRE_MAYBE_UNUSED_FUNC void
 hypre_UnorderedIntMapFindCloserFreeBucket( hypre_UnorderedIntMap  *m,
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
                                            hypre_HopscotchSegment *start_seg,
@@ -2184,69 +3003,77 @@ hypre_UnorderedIntMapFindCloserFreeBucket( hypre_UnorderedIntMap  *m,
                                            hypre_HopscotchBucket **free_bucket,
                                            HYPRE_Int *free_dist)
 {
-  hypre_HopscotchBucket* move_bucket = *free_bucket - (HYPRE_HOPSCOTCH_HASH_HOP_RANGE - 1);
-  HYPRE_Int move_free_dist;
-  for (move_free_dist = HYPRE_HOPSCOTCH_HASH_HOP_RANGE - 1; move_free_dist > 0; --move_free_dist)
-  {
-    hypre_uint start_hop_info = move_bucket->hopInfo;
-    HYPRE_Int move_new_free_dist = -1;
-    hypre_uint mask = 1;
-    HYPRE_Int i;
-    for (i = 0; i < move_free_dist; ++i, mask <<= 1)
-    {
-      if (mask & start_hop_info)
+   HYPRE_UNUSED_VAR(m);
+
+   hypre_HopscotchBucket* move_bucket = *free_bucket - (HYPRE_HOPSCOTCH_HASH_HOP_RANGE - 1);
+   HYPRE_Int move_free_dist;
+   for (move_free_dist = HYPRE_HOPSCOTCH_HASH_HOP_RANGE - 1; move_free_dist > 0; --move_free_dist)
+   {
+      hypre_uint start_hop_info = move_bucket->hopInfo;
+      HYPRE_Int move_new_free_dist = -1;
+      hypre_uint mask = 1;
+      HYPRE_Int i;
+      for (i = 0; i < move_free_dist; ++i, mask <<= 1)
       {
-        move_new_free_dist = i;
-        break;
+         if (mask & start_hop_info)
+         {
+            move_new_free_dist = i;
+            break;
+         }
       }
-    }
-    if (-1 != move_new_free_dist)
-    {
+      if (-1 != move_new_free_dist)
+      {
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-      hypre_HopscotchSegment* move_segment = &(m->segments[(move_bucket - m->table) & m->segmentMask]);
+         hypre_HopscotchSegment* move_segment = &(m->segments[(move_bucket - m->table) & m->segmentMask]);
 
-      if (start_seg != move_segment)
-        omp_set_lock(&move_segment->lock);
+         if (start_seg != move_segment)
+         {
+            omp_set_lock(&move_segment->lock);
+         }
 #endif
 
-      if (start_hop_info == move_bucket->hopInfo)
-      {
-        // new_free_bucket -> free_bucket and empty new_free_bucket
-        hypre_HopscotchBucket* new_free_bucket = move_bucket + move_new_free_dist;
-        (*free_bucket)->data = new_free_bucket->data;
-        (*free_bucket)->key  = new_free_bucket->key;
-        (*free_bucket)->hash = new_free_bucket->hash;
+         if (start_hop_info == move_bucket->hopInfo)
+         {
+            // new_free_bucket -> free_bucket and empty new_free_bucket
+            hypre_HopscotchBucket* new_free_bucket = move_bucket + move_new_free_dist;
+            (*free_bucket)->data = new_free_bucket->data;
+            (*free_bucket)->key  = new_free_bucket->key;
+            (*free_bucket)->hash = new_free_bucket->hash;
 
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-        ++move_segment->timestamp;
+            ++move_segment->timestamp;
 
-#pragma omp flush
+            #pragma omp flush
 #endif
 
-        move_bucket->hopInfo |= (1U << move_free_dist);
-        move_bucket->hopInfo &= ~(1U << move_new_free_dist);
+            move_bucket->hopInfo = move_bucket->hopInfo | (1U << move_free_dist);
+            move_bucket->hopInfo = move_bucket->hopInfo & ~(1U << move_new_free_dist);
 
-        *free_bucket = new_free_bucket;
-        *free_dist -= move_free_dist - move_new_free_dist;
+            *free_bucket = new_free_bucket;
+            *free_dist -= move_free_dist - move_new_free_dist;
 
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-        if(start_seg != move_segment)
-          omp_unset_lock(&move_segment->lock);
+            if (start_seg != move_segment)
+            {
+               omp_unset_lock(&move_segment->lock);
+            }
 #endif
-        return;
-      }
+            return;
+         }
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-      if(start_seg != move_segment)
-        omp_unset_lock(&move_segment->lock);
-#endif
-    }
-    ++move_bucket;
-  }
-  *free_bucket = NULL;
-  *free_dist = 0;
+         if (start_seg != move_segment)
+         {
+            omp_unset_lock(&move_segment->lock);
+         }
+#endif
+      }
+      ++move_bucket;
+   }
+   *free_bucket = NULL;
+   *free_dist = 0;
 }
 
-static inline void
+static inline HYPRE_MAYBE_UNUSED_FUNC void
 hypre_UnorderedBigIntMapFindCloserFreeBucket( hypre_UnorderedBigIntMap   *m,
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
                                               hypre_HopscotchSegment     *start_seg,
@@ -2254,80 +3081,88 @@ hypre_UnorderedBigIntMapFindCloserFreeBucket( hypre_UnorderedBigIntMap   *m,
                                               hypre_BigHopscotchBucket **free_bucket,
                                               HYPRE_Int *free_dist)
 {
-  hypre_BigHopscotchBucket* move_bucket = *free_bucket - (HYPRE_HOPSCOTCH_HASH_HOP_RANGE - 1);
-  HYPRE_Int move_free_dist;
-  for (move_free_dist = HYPRE_HOPSCOTCH_HASH_HOP_RANGE - 1; move_free_dist > 0; --move_free_dist)
-  {
-    hypre_uint start_hop_info = move_bucket->hopInfo;
-    HYPRE_Int move_new_free_dist = -1;
-    hypre_uint mask = 1;
-    HYPRE_Int i;
-    for (i = 0; i < move_free_dist; ++i, mask <<= 1)
-    {
-      if (mask & start_hop_info)
+   HYPRE_UNUSED_VAR(m);
+
+   hypre_BigHopscotchBucket* move_bucket = *free_bucket - (HYPRE_HOPSCOTCH_HASH_HOP_RANGE - 1);
+   HYPRE_Int move_free_dist;
+   for (move_free_dist = HYPRE_HOPSCOTCH_HASH_HOP_RANGE - 1; move_free_dist > 0; --move_free_dist)
+   {
+      hypre_uint start_hop_info = move_bucket->hopInfo;
+      HYPRE_Int move_new_free_dist = -1;
+      hypre_uint mask = 1;
+      HYPRE_Int i;
+      for (i = 0; i < move_free_dist; ++i, mask <<= 1)
       {
-        move_new_free_dist = i;
-        break;
+         if (mask & start_hop_info)
+         {
+            move_new_free_dist = i;
+            break;
+         }
       }
-    }
-    if (-1 != move_new_free_dist)
-    {
+      if (-1 != move_new_free_dist)
+      {
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-      hypre_HopscotchSegment* move_segment = &(m->segments[(move_bucket - m->table) & m->segmentMask]);
+         hypre_HopscotchSegment* move_segment = &(m->segments[(move_bucket - m->table) & m->segmentMask]);
 
-      if (start_seg != move_segment)
-        omp_set_lock(&move_segment->lock);
+         if (start_seg != move_segment)
+         {
+            omp_set_lock(&move_segment->lock);
+         }
 #endif
 
-      if (start_hop_info == move_bucket->hopInfo)
-      {
-        // new_free_bucket -> free_bucket and empty new_free_bucket
-        hypre_BigHopscotchBucket* new_free_bucket = move_bucket + move_new_free_dist;
-        (*free_bucket)->data = new_free_bucket->data;
-        (*free_bucket)->key  = new_free_bucket->key;
-        (*free_bucket)->hash = new_free_bucket->hash;
+         if (start_hop_info == move_bucket->hopInfo)
+         {
+            // new_free_bucket -> free_bucket and empty new_free_bucket
+            hypre_BigHopscotchBucket* new_free_bucket = move_bucket + move_new_free_dist;
+            (*free_bucket)->data = new_free_bucket->data;
+            (*free_bucket)->key  = new_free_bucket->key;
+            (*free_bucket)->hash = new_free_bucket->hash;
 
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-        ++move_segment->timestamp;
+            ++move_segment->timestamp;
 
-#pragma omp flush
+            #pragma omp flush
 #endif
 
-        move_bucket->hopInfo |= (1U << move_free_dist);
-        move_bucket->hopInfo &= ~(1U << move_new_free_dist);
+            move_bucket->hopInfo = move_bucket->hopInfo | (1U << move_free_dist);
+            move_bucket->hopInfo = move_bucket->hopInfo & ~(1U << move_new_free_dist);
 
-        *free_bucket = new_free_bucket;
-        *free_dist -= move_free_dist - move_new_free_dist;
+            *free_bucket = new_free_bucket;
+            *free_dist -= move_free_dist - move_new_free_dist;
 
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-        if(start_seg != move_segment)
-          omp_unset_lock(&move_segment->lock);
+            if (start_seg != move_segment)
+            {
+               omp_unset_lock(&move_segment->lock);
+            }
 #endif
-        return;
-      }
+            return;
+         }
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-      if(start_seg != move_segment)
-        omp_unset_lock(&move_segment->lock);
-#endif
-    }
-    ++move_bucket;
-  }
-  *free_bucket = NULL;
-  *free_dist = 0;
+         if (start_seg != move_segment)
+         {
+            omp_unset_lock(&move_segment->lock);
+         }
+#endif
+      }
+      ++move_bucket;
+   }
+   *free_bucket = NULL;
+   *free_dist = 0;
 }
 
 void hypre_UnorderedIntSetCreate( hypre_UnorderedIntSet *s,
                                   HYPRE_Int inCapacity,
                                   HYPRE_Int concurrencyLevel);
 void hypre_UnorderedBigIntSetCreate( hypre_UnorderedBigIntSet *s,
-                                  HYPRE_Int inCapacity,
-                                  HYPRE_Int concurrencyLevel);
+                                     HYPRE_Int inCapacity,
+                                     HYPRE_Int concurrencyLevel);
 void hypre_UnorderedIntMapCreate( hypre_UnorderedIntMap *m,
                                   HYPRE_Int inCapacity,
                                   HYPRE_Int concurrencyLevel);
 void hypre_UnorderedBigIntMapCreate( hypre_UnorderedBigIntMap *m,
-                                  HYPRE_Int inCapacity,
-                                  HYPRE_Int concurrencyLevel);
+                                     HYPRE_Int inCapacity,
+                                     HYPRE_Int concurrencyLevel);
 
 void hypre_UnorderedIntSetDestroy( hypre_UnorderedIntSet *s );
 void hypre_UnorderedBigIntSetDestroy( hypre_UnorderedBigIntSet *s );
@@ -2335,606 +3170,658 @@ void hypre_UnorderedIntMapDestroy( hypre_UnorderedIntMap *m );
 void hypre_UnorderedBigIntMapDestroy( hypre_UnorderedBigIntMap *m );
 
 // Query Operations .........................................................
-static inline HYPRE_Int
+static inline HYPRE_MAYBE_UNUSED_FUNC HYPRE_Int
 hypre_UnorderedIntSetContains( hypre_UnorderedIntSet *s,
                                HYPRE_Int              key )
 {
-  //CALCULATE HASH ..........................
+   //CALCULATE HASH ..........................
 #ifdef HYPRE_BIGINT
-  HYPRE_Int hash = hypre_BigHash(key);
+   HYPRE_Int hash = hypre_BigHash(key);
 #else
-  HYPRE_Int hash = hypre_Hash(key);
+   HYPRE_Int hash = hypre_Hash(key);
 #endif
 
-  //CHECK IF ALREADY CONTAIN ................
+   //CHECK IF ALREADY CONTAIN ................
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-  hypre_HopscotchSegment *segment = &s->segments[hash & s->segmentMask];
+   hypre_HopscotchSegment *segment = &s->segments[hash & s->segmentMask];
 #endif
-  HYPRE_Int bucket = hash & s->bucketMask;
-  hypre_uint hopInfo = s->hopInfo[bucket];
+   HYPRE_Int bucket = hash & s->bucketMask;
+   hypre_uint hopInfo = s->hopInfo[bucket];
 
-  if (0 == hopInfo)
-    return 0;
-  else if (1 == hopInfo )
-  {
-    if (hash == s->hash[bucket] && key == s->key[bucket])
-      return 1;
-    else return 0;
-  }
+   if (0 == hopInfo)
+   {
+      return 0;
+   }
+   else if (1 == hopInfo )
+   {
+      if (hash == s->hash[bucket] && key == s->key[bucket])
+      {
+         return 1;
+      }
+      else { return 0; }
+   }
 
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-  HYPRE_Int startTimestamp = segment->timestamp;
+   HYPRE_Int startTimestamp = segment->timestamp;
 #endif
-  while (0 != hopInfo)
-  {
-    HYPRE_Int i = first_lsb_bit_indx(hopInfo);
-    HYPRE_Int currElm = bucket + i;
+   while (0 != hopInfo)
+   {
+      HYPRE_Int i = first_lsb_bit_indx(hopInfo);
+      HYPRE_Int currElm = bucket + i;
 
-    if (hash == s->hash[currElm] && key == s->key[currElm])
-      return 1;
-    hopInfo &= ~(1U << i);
-  }
+      if (hash == s->hash[currElm] && key == s->key[currElm])
+      {
+         return 1;
+      }
+      hopInfo &= ~(1U << i);
+   }
 
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-  if (segment->timestamp == startTimestamp)
-    return 0;
+   if (segment->timestamp == startTimestamp)
+   {
+      return 0;
+   }
 #endif
 
-  HYPRE_Int i;
-  for (i = 0; i< HYPRE_HOPSCOTCH_HASH_HOP_RANGE; ++i)
-  {
-    if (hash == s->hash[bucket + i] && key == s->key[bucket + i])
-      return 1;
-  }
-  return 0;
+   HYPRE_Int i;
+   for (i = 0; i < HYPRE_HOPSCOTCH_HASH_HOP_RANGE; ++i)
+   {
+      if (hash == s->hash[bucket + i] && key == s->key[bucket + i])
+      {
+         return 1;
+      }
+   }
+   return 0;
 }
 
-static inline HYPRE_Int
+static inline HYPRE_MAYBE_UNUSED_FUNC HYPRE_Int
 hypre_UnorderedBigIntSetContains( hypre_UnorderedBigIntSet *s,
                                   HYPRE_BigInt key )
 {
-  //CALCULATE HASH ..........................
+   //CALCULATE HASH ..........................
 #if defined(HYPRE_BIGINT) || defined(HYPRE_MIXEDINT)
-  HYPRE_BigInt hash = hypre_BigHash(key);
+   HYPRE_BigInt hash = hypre_BigHash(key);
 #else
-  HYPRE_BigInt hash = hypre_Hash(key);
+   HYPRE_BigInt hash = hypre_Hash(key);
 #endif
 
-  //CHECK IF ALREADY CONTAIN ................
+   //CHECK IF ALREADY CONTAIN ................
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-  hypre_HopscotchSegment *segment = &s->segments[(HYPRE_Int)(hash & s->segmentMask)];
+   hypre_HopscotchSegment *segment = &s->segments[(HYPRE_Int)(hash & s->segmentMask)];
 #endif
-  HYPRE_Int bucket = (HYPRE_Int)(hash & s->bucketMask);
-  hypre_uint hopInfo = s->hopInfo[bucket];
+   HYPRE_Int bucket = (HYPRE_Int)(hash & s->bucketMask);
+   hypre_uint hopInfo = s->hopInfo[bucket];
 
-  if (0 == hopInfo)
-    return 0;
-  else if (1 == hopInfo )
-  {
-    if (hash == s->hash[bucket] && key == s->key[bucket])
-      return 1;
-    else return 0;
-  }
+   if (0 == hopInfo)
+   {
+      return 0;
+   }
+   else if (1 == hopInfo )
+   {
+      if (hash == s->hash[bucket] && key == s->key[bucket])
+      {
+         return 1;
+      }
+      else { return 0; }
+   }
 
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-  HYPRE_Int startTimestamp = segment->timestamp;
+   HYPRE_Int startTimestamp = segment->timestamp;
 #endif
-  while (0 != hopInfo)
-  {
-    HYPRE_Int i = first_lsb_bit_indx(hopInfo);
-    HYPRE_Int currElm = bucket + i;
+   while (0 != hopInfo)
+   {
+      HYPRE_Int i = first_lsb_bit_indx(hopInfo);
+      HYPRE_Int currElm = bucket + i;
 
-    if (hash == s->hash[currElm] && key == s->key[currElm])
-      return 1;
-    hopInfo &= ~(1U << i);
-  }
+      if (hash == s->hash[currElm] && key == s->key[currElm])
+      {
+         return 1;
+      }
+      hopInfo &= ~(1U << i);
+   }
 
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-  if (segment->timestamp == startTimestamp)
-    return 0;
+   if (segment->timestamp == startTimestamp)
+   {
+      return 0;
+   }
 #endif
 
-  HYPRE_Int i;
-  for (i = 0; i< HYPRE_HOPSCOTCH_HASH_HOP_RANGE; ++i)
-  {
-    if (hash == s->hash[bucket + i] && key == s->key[bucket + i])
-      return 1;
-  }
-  return 0;
+   HYPRE_Int i;
+   for (i = 0; i < HYPRE_HOPSCOTCH_HASH_HOP_RANGE; ++i)
+   {
+      if (hash == s->hash[bucket + i] && key == s->key[bucket + i])
+      {
+         return 1;
+      }
+   }
+   return 0;
 }
 
 /**
  * @ret -1 if key doesn't exist
  */
-static inline HYPRE_Int
+static inline HYPRE_MAYBE_UNUSED_FUNC HYPRE_Int
 hypre_UnorderedIntMapGet( hypre_UnorderedIntMap *m,
                           HYPRE_Int key )
 {
-  //CALCULATE HASH ..........................
+   //CALCULATE HASH ..........................
 #ifdef HYPRE_BIGINT
-  HYPRE_Int hash = hypre_BigHash(key);
+   HYPRE_Int hash = hypre_BigHash(key);
 #else
-  HYPRE_Int hash = hypre_Hash(key);
+   HYPRE_Int hash = hypre_Hash(key);
 #endif
 
-  //CHECK IF ALREADY CONTAIN ................
+   //CHECK IF ALREADY CONTAIN ................
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-  hypre_HopscotchSegment *segment = &m->segments[hash & m->segmentMask];
-#endif
-  hypre_HopscotchBucket *elmAry = &(m->table[hash & m->bucketMask]);
-  hypre_uint hopInfo = elmAry->hopInfo;
-  if (0 == hopInfo)
-    return -1;
-  else if (1 == hopInfo )
-  {
-    if (hash == elmAry->hash && key == elmAry->key)
-      return elmAry->data;
-    else return -1;
-  }
+   hypre_HopscotchSegment *segment = &m->segments[hash & m->segmentMask];
+#endif
+   hypre_HopscotchBucket *elmAry = &(m->table[hash & m->bucketMask]);
+   hypre_uint hopInfo = elmAry->hopInfo;
+   if (0 == hopInfo)
+   {
+      return -1;
+   }
+   else if (1 == hopInfo )
+   {
+      if (hash == elmAry->hash && key == elmAry->key)
+      {
+         return elmAry->data;
+      }
+      else { return -1; }
+   }
 
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-  HYPRE_Int startTimestamp = segment->timestamp;
+   HYPRE_Int startTimestamp = segment->timestamp;
 #endif
-  while (0 != hopInfo)
-  {
-    HYPRE_Int i = first_lsb_bit_indx(hopInfo);
-    hypre_HopscotchBucket* currElm = elmAry + i;
-    if (hash == currElm->hash && key == currElm->key)
-      return currElm->data;
-    hopInfo &= ~(1U << i);
-  }
+   while (0 != hopInfo)
+   {
+      HYPRE_Int i = first_lsb_bit_indx(hopInfo);
+      hypre_HopscotchBucket* currElm = elmAry + i;
+      if (hash == currElm->hash && key == currElm->key)
+      {
+         return currElm->data;
+      }
+      hopInfo &= ~(1U << i);
+   }
 
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-  if (segment->timestamp == startTimestamp)
-    return -1;
-#endif
-
-  hypre_HopscotchBucket *currBucket = &(m->table[hash & m->bucketMask]);
-  HYPRE_Int i;
-  for (i = 0; i< HYPRE_HOPSCOTCH_HASH_HOP_RANGE; ++i, ++currBucket)
-  {
-    if (hash == currBucket->hash && key == currBucket->key)
-      return currBucket->data;
-  }
-  return -1;
+   if (segment->timestamp == startTimestamp)
+   {
+      return -1;
+   }
+#endif
+
+   hypre_HopscotchBucket *currBucket = &(m->table[hash & m->bucketMask]);
+   HYPRE_Int i;
+   for (i = 0; i < HYPRE_HOPSCOTCH_HASH_HOP_RANGE; ++i, ++currBucket)
+   {
+      if (hash == currBucket->hash && key == currBucket->key)
+      {
+         return currBucket->data;
+      }
+   }
+   return -1;
 }
 
-static inline
+static inline HYPRE_MAYBE_UNUSED_FUNC
 HYPRE_Int hypre_UnorderedBigIntMapGet( hypre_UnorderedBigIntMap *m,
                                        HYPRE_BigInt key )
 {
-  //CALCULATE HASH ..........................
+   //CALCULATE HASH ..........................
 #if defined(HYPRE_BIGINT) || defined(HYPRE_MIXEDINT)
-  HYPRE_BigInt hash = hypre_BigHash(key);
+   HYPRE_BigInt hash = hypre_BigHash(key);
 #else
-  HYPRE_BigInt hash = hypre_Hash(key);
+   HYPRE_BigInt hash = hypre_Hash(key);
 #endif
 
-  //CHECK IF ALREADY CONTAIN ................
+   //CHECK IF ALREADY CONTAIN ................
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-  hypre_HopscotchSegment *segment = &m->segments[(HYPRE_Int)(hash & m->segmentMask)];
-#endif
-  hypre_BigHopscotchBucket *elmAry = &(m->table[(HYPRE_Int)(hash & m->bucketMask)]);
-  hypre_uint hopInfo = elmAry->hopInfo;
-  if (0 == hopInfo)
-    return -1;
-  else if (1 == hopInfo )
-  {
-    if (hash == elmAry->hash && key == elmAry->key)
-      return elmAry->data;
-    else return -1;
-  }
+   hypre_HopscotchSegment *segment = &m->segments[(HYPRE_Int)(hash & m->segmentMask)];
+#endif
+   hypre_BigHopscotchBucket *elmAry = &(m->table[(HYPRE_Int)(hash & m->bucketMask)]);
+   hypre_uint hopInfo = elmAry->hopInfo;
+   if (0 == hopInfo)
+   {
+      return -1;
+   }
+   else if (1 == hopInfo )
+   {
+      if (hash == elmAry->hash && key == elmAry->key)
+      {
+         return elmAry->data;
+      }
+      else { return -1; }
+   }
 
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-  HYPRE_Int startTimestamp = segment->timestamp;
+   HYPRE_Int startTimestamp = segment->timestamp;
 #endif
-  while (0 != hopInfo)
-  {
-    HYPRE_Int i = first_lsb_bit_indx(hopInfo);
-    hypre_BigHopscotchBucket* currElm = elmAry + i;
-    if (hash == currElm->hash && key == currElm->key)
-      return currElm->data;
-    hopInfo &= ~(1U << i);
-  }
+   while (0 != hopInfo)
+   {
+      HYPRE_Int i = first_lsb_bit_indx(hopInfo);
+      hypre_BigHopscotchBucket* currElm = elmAry + i;
+      if (hash == currElm->hash && key == currElm->key)
+      {
+         return currElm->data;
+      }
+      hopInfo &= ~(1U << i);
+   }
 
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-  if (segment->timestamp == startTimestamp)
-    return -1;
-#endif
-
-  hypre_BigHopscotchBucket *currBucket = &(m->table[hash & m->bucketMask]);
-  HYPRE_Int i;
-  for (i = 0; i< HYPRE_HOPSCOTCH_HASH_HOP_RANGE; ++i, ++currBucket)
-  {
-    if (hash == currBucket->hash && key == currBucket->key)
-      return currBucket->data;
-  }
-  return -1;
+   if (segment->timestamp == startTimestamp)
+   {
+      return -1;
+   }
+#endif
+
+   hypre_BigHopscotchBucket *currBucket = &(m->table[hash & m->bucketMask]);
+   HYPRE_Int i;
+   for (i = 0; i < HYPRE_HOPSCOTCH_HASH_HOP_RANGE; ++i, ++currBucket)
+   {
+      if (hash == currBucket->hash && key == currBucket->key)
+      {
+         return currBucket->data;
+      }
+   }
+   return -1;
 }
 
 //status Operations .........................................................
-static inline
+static inline HYPRE_MAYBE_UNUSED_FUNC
 HYPRE_Int hypre_UnorderedIntSetSize( hypre_UnorderedIntSet *s )
 {
-  HYPRE_Int counter = 0;
-  HYPRE_Int n = s->bucketMask + HYPRE_HOPSCOTCH_HASH_INSERT_RANGE;
-  HYPRE_Int i;
-  for (i = 0; i < n; ++i)
-  {
-    if (HYPRE_HOPSCOTCH_HASH_EMPTY != s->hash[i])
-    {
-      ++counter;
-    }
-  }
-  return counter;
+   HYPRE_Int counter = 0;
+   HYPRE_Int n = s->bucketMask + HYPRE_HOPSCOTCH_HASH_INSERT_RANGE;
+   HYPRE_Int i;
+   for (i = 0; i < n; ++i)
+   {
+      if (HYPRE_HOPSCOTCH_HASH_EMPTY != s->hash[i])
+      {
+         ++counter;
+      }
+   }
+   return counter;
 }
 
-static inline
+static inline HYPRE_MAYBE_UNUSED_FUNC
 HYPRE_Int hypre_UnorderedBigIntSetSize( hypre_UnorderedBigIntSet *s )
 {
-  HYPRE_Int counter = 0;
-  HYPRE_BigInt n = s->bucketMask + HYPRE_HOPSCOTCH_HASH_INSERT_RANGE;
-  HYPRE_Int i;
-  for (i = 0; i < n; ++i)
-  {
-    if (HYPRE_HOPSCOTCH_HASH_EMPTY != s->hash[i])
-    {
-      ++counter;
-    }
-  }
-  return counter;
+   HYPRE_Int counter = 0;
+   HYPRE_BigInt n = s->bucketMask + HYPRE_HOPSCOTCH_HASH_INSERT_RANGE;
+   HYPRE_Int i;
+   for (i = 0; i < n; ++i)
+   {
+      if (HYPRE_HOPSCOTCH_HASH_EMPTY != s->hash[i])
+      {
+         ++counter;
+      }
+   }
+   return counter;
 }
 
-static inline HYPRE_Int
+static inline HYPRE_MAYBE_UNUSED_FUNC HYPRE_Int
 hypre_UnorderedIntMapSize( hypre_UnorderedIntMap *m )
 {
-  HYPRE_Int counter = 0;
-  HYPRE_Int n = m->bucketMask + HYPRE_HOPSCOTCH_HASH_INSERT_RANGE;
-  HYPRE_Int i;
-  for (i = 0; i < n; ++i)
-  {
-    if( HYPRE_HOPSCOTCH_HASH_EMPTY != m->table[i].hash )
-    {
-      ++counter;
-    }
-  }
-  return counter;
+   HYPRE_Int counter = 0;
+   HYPRE_Int n = m->bucketMask + HYPRE_HOPSCOTCH_HASH_INSERT_RANGE;
+   HYPRE_Int i;
+   for (i = 0; i < n; ++i)
+   {
+      if ( HYPRE_HOPSCOTCH_HASH_EMPTY != m->table[i].hash )
+      {
+         ++counter;
+      }
+   }
+   return counter;
 }
 
-static inline HYPRE_Int
+static inline HYPRE_MAYBE_UNUSED_FUNC HYPRE_Int
 hypre_UnorderedBigIntMapSize( hypre_UnorderedBigIntMap *m )
 {
-  HYPRE_Int counter = 0;
-  HYPRE_Int n = m->bucketMask + HYPRE_HOPSCOTCH_HASH_INSERT_RANGE;
-  HYPRE_Int i;
-  for (i = 0; i < n; ++i)
-  {
-    if( HYPRE_HOPSCOTCH_HASH_EMPTY != m->table[i].hash )
-    {
-      ++counter;
-    }
-  }
-  return counter;
+   HYPRE_Int counter = 0;
+   HYPRE_Int n = m->bucketMask + HYPRE_HOPSCOTCH_HASH_INSERT_RANGE;
+   HYPRE_Int i;
+   for (i = 0; i < n; ++i)
+   {
+      if ( HYPRE_HOPSCOTCH_HASH_EMPTY != m->table[i].hash )
+      {
+         ++counter;
+      }
+   }
+   return counter;
 }
 
 HYPRE_Int *hypre_UnorderedIntSetCopyToArray( hypre_UnorderedIntSet *s, HYPRE_Int *len );
 HYPRE_BigInt *hypre_UnorderedBigIntSetCopyToArray( hypre_UnorderedBigIntSet *s, HYPRE_Int *len );
 
 //modification Operations ...................................................
-static inline void
+static inline HYPRE_MAYBE_UNUSED_FUNC void
 hypre_UnorderedIntSetPut( hypre_UnorderedIntSet *s,
                           HYPRE_Int key )
 {
-  //CALCULATE HASH ..........................
+   //CALCULATE HASH ..........................
 #ifdef HYPRE_BIGINT
-  HYPRE_Int hash = hypre_BigHash(key);
+   HYPRE_Int hash = hypre_BigHash(key);
 #else
-  HYPRE_Int hash = hypre_Hash(key);
+   HYPRE_Int hash = hypre_Hash(key);
 #endif
 
-  //LOCK KEY HASH ENTERY ....................
+   //LOCK KEY HASH ENTERY ....................
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-  hypre_HopscotchSegment  *segment = &s->segments[hash & s->segmentMask];
-  omp_set_lock(&segment->lock);
+   hypre_HopscotchSegment  *segment = &s->segments[hash & s->segmentMask];
+   omp_set_lock(&segment->lock);
 #endif
-  HYPRE_Int bucket = hash&s->bucketMask;
+   HYPRE_Int bucket = hash & s->bucketMask;
 
-  //CHECK IF ALREADY CONTAIN ................
-  hypre_uint hopInfo = s->hopInfo[bucket];
-  while (0 != hopInfo)
-  {
-    HYPRE_Int i = first_lsb_bit_indx(hopInfo);
-    HYPRE_Int currElm = bucket + i;
+   //CHECK IF ALREADY CONTAIN ................
+   hypre_uint hopInfo = s->hopInfo[bucket];
+   while (0 != hopInfo)
+   {
+      HYPRE_Int i = first_lsb_bit_indx(hopInfo);
+      HYPRE_Int currElm = bucket + i;
 
-    if(hash == s->hash[currElm] && key == s->key[currElm])
-    {
+      if (hash == s->hash[currElm] && key == s->key[currElm])
+      {
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-      omp_unset_lock(&segment->lock);
-#endif
-      return;
-    }
-    hopInfo &= ~(1U << i);
-  }
-
-  //LOOK FOR FREE BUCKET ....................
-  HYPRE_Int free_bucket = bucket;
-  HYPRE_Int free_dist = 0;
-  for ( ; free_dist < HYPRE_HOPSCOTCH_HASH_INSERT_RANGE; ++free_dist, ++free_bucket)
-  {
-    if( (HYPRE_HOPSCOTCH_HASH_EMPTY == s->hash[free_bucket]) &&
-        (HYPRE_HOPSCOTCH_HASH_EMPTY ==
-           hypre_compare_and_swap((HYPRE_Int *)&s->hash[free_bucket],
-                                  (HYPRE_Int)HYPRE_HOPSCOTCH_HASH_EMPTY,
-                                  (HYPRE_Int)HYPRE_HOPSCOTCH_HASH_BUSY)) )
-      break;
-  }
-
-  //PLACE THE NEW KEY .......................
-  if (free_dist < HYPRE_HOPSCOTCH_HASH_INSERT_RANGE)
-  {
-    do
-    {
-      if (free_dist < HYPRE_HOPSCOTCH_HASH_HOP_RANGE)
+         omp_unset_lock(&segment->lock);
+#endif
+         return;
+      }
+      hopInfo &= ~(1U << i);
+   }
+
+   //LOOK FOR FREE BUCKET ....................
+   HYPRE_Int free_bucket = bucket;
+   HYPRE_Int free_dist = 0;
+   for ( ; free_dist < HYPRE_HOPSCOTCH_HASH_INSERT_RANGE; ++free_dist, ++free_bucket)
+   {
+      if ( (HYPRE_HOPSCOTCH_HASH_EMPTY == s->hash[free_bucket]) &&
+           (HYPRE_HOPSCOTCH_HASH_EMPTY ==
+            hypre_compare_and_swap((HYPRE_Int *)&s->hash[free_bucket],
+                                   (HYPRE_Int)HYPRE_HOPSCOTCH_HASH_EMPTY,
+                                   (HYPRE_Int)HYPRE_HOPSCOTCH_HASH_BUSY)) )
+      {
+         break;
+      }
+   }
+
+   //PLACE THE NEW KEY .......................
+   if (free_dist < HYPRE_HOPSCOTCH_HASH_INSERT_RANGE)
+   {
+      do
       {
-        s->key[free_bucket]  = key;
-        s->hash[free_bucket] = hash;
-        s->hopInfo[bucket]  |= 1U << free_dist;
+         if (free_dist < HYPRE_HOPSCOTCH_HASH_HOP_RANGE)
+         {
+            s->key[free_bucket]  = key;
+            s->hash[free_bucket] = hash;
+            s->hopInfo[bucket]  |= 1U << free_dist;
 
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-        omp_unset_lock(&segment->lock);
+            omp_unset_lock(&segment->lock);
 #endif
-        return;
-      }
-      hypre_UnorderedIntSetFindCloserFreeBucket(s,
+            return;
+         }
+         hypre_UnorderedIntSetFindCloserFreeBucket(s,
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-                                                segment,
+                                                   segment,
 #endif
-                                                &free_bucket, &free_dist);
-    } while (-1 != free_bucket);
-  }
+                                                   &free_bucket, &free_dist);
+      }
+      while (-1 != free_bucket);
+   }
 
-  //NEED TO RESIZE ..........................
-  hypre_error_w_msg(HYPRE_ERROR_GENERIC,"ERROR - RESIZE is not implemented\n");
-  /*fprintf(stderr, "ERROR - RESIZE is not implemented\n");*/
-  exit(1);
-  return;
+   //NEED TO RESIZE ..........................
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "ERROR - RESIZE is not implemented\n");
+   /*fprintf(stderr, "ERROR - RESIZE is not implemented\n");*/
+   exit(1);
+   return;
 }
 
-static inline void
+static inline HYPRE_MAYBE_UNUSED_FUNC void
 hypre_UnorderedBigIntSetPut( hypre_UnorderedBigIntSet *s,
                              HYPRE_BigInt key )
 {
-  //CALCULATE HASH ..........................
+   //CALCULATE HASH ..........................
 #if defined(HYPRE_BIGINT) || defined(HYPRE_MIXEDINT)
-  HYPRE_BigInt hash = hypre_BigHash(key);
+   HYPRE_BigInt hash = hypre_BigHash(key);
 #else
-  HYPRE_BigInt hash = hypre_Hash(key);
+   HYPRE_BigInt hash = hypre_Hash(key);
 #endif
 
-  //LOCK KEY HASH ENTERY ....................
+   //LOCK KEY HASH ENTERY ....................
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-  hypre_HopscotchSegment  *segment = &s->segments[hash & s->segmentMask];
-  omp_set_lock(&segment->lock);
+   hypre_HopscotchSegment  *segment = &s->segments[hash & s->segmentMask];
+   omp_set_lock(&segment->lock);
 #endif
-  HYPRE_Int bucket = (HYPRE_Int)(hash&s->bucketMask);
+   HYPRE_Int bucket = (HYPRE_Int)(hash & s->bucketMask);
 
-  //CHECK IF ALREADY CONTAIN ................
-  hypre_uint hopInfo = s->hopInfo[bucket];
-  while (0 != hopInfo)
-  {
-    HYPRE_Int i = first_lsb_bit_indx(hopInfo);
-    HYPRE_Int currElm = bucket + i;
+   //CHECK IF ALREADY CONTAIN ................
+   hypre_uint hopInfo = s->hopInfo[bucket];
+   while (0 != hopInfo)
+   {
+      HYPRE_Int i = first_lsb_bit_indx(hopInfo);
+      HYPRE_Int currElm = bucket + i;
 
-    if(hash == s->hash[currElm] && key == s->key[currElm])
-    {
+      if (hash == s->hash[currElm] && key == s->key[currElm])
+      {
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-      omp_unset_lock(&segment->lock);
-#endif
-      return;
-    }
-    hopInfo &= ~(1U << i);
-  }
-
-  //LOOK FOR FREE BUCKET ....................
-  HYPRE_Int free_bucket = bucket;
-  HYPRE_Int free_dist = 0;
-  for ( ; free_dist < HYPRE_HOPSCOTCH_HASH_INSERT_RANGE; ++free_dist, ++free_bucket)
-  {
-    if( (HYPRE_HOPSCOTCH_HASH_EMPTY == s->hash[free_bucket]) &&
-        (HYPRE_HOPSCOTCH_HASH_EMPTY ==
-           hypre_compare_and_swap((HYPRE_Int *)&s->hash[free_bucket],
-                                  (HYPRE_Int)HYPRE_HOPSCOTCH_HASH_EMPTY,
-                                  (HYPRE_Int)HYPRE_HOPSCOTCH_HASH_BUSY)) )
-      break;
-  }
-
-  //PLACE THE NEW KEY .......................
-  if (free_dist < HYPRE_HOPSCOTCH_HASH_INSERT_RANGE)
-  {
-    do
-    {
-      if (free_dist < HYPRE_HOPSCOTCH_HASH_HOP_RANGE)
+         omp_unset_lock(&segment->lock);
+#endif
+         return;
+      }
+      hopInfo &= ~(1U << i);
+   }
+
+   //LOOK FOR FREE BUCKET ....................
+   HYPRE_Int free_bucket = bucket;
+   HYPRE_Int free_dist = 0;
+   for ( ; free_dist < HYPRE_HOPSCOTCH_HASH_INSERT_RANGE; ++free_dist, ++free_bucket)
+   {
+      if ( (HYPRE_HOPSCOTCH_HASH_EMPTY == s->hash[free_bucket]) &&
+           (HYPRE_HOPSCOTCH_HASH_EMPTY ==
+            hypre_compare_and_swap((HYPRE_Int *)&s->hash[free_bucket],
+                                   (HYPRE_Int)HYPRE_HOPSCOTCH_HASH_EMPTY,
+                                   (HYPRE_Int)HYPRE_HOPSCOTCH_HASH_BUSY)) )
+      {
+         break;
+      }
+   }
+
+   //PLACE THE NEW KEY .......................
+   if (free_dist < HYPRE_HOPSCOTCH_HASH_INSERT_RANGE)
+   {
+      do
       {
-        s->key[free_bucket]  = key;
-        s->hash[free_bucket] = hash;
-        s->hopInfo[bucket]  |= 1U << free_dist;
+         if (free_dist < HYPRE_HOPSCOTCH_HASH_HOP_RANGE)
+         {
+            s->key[free_bucket]  = key;
+            s->hash[free_bucket] = hash;
+            s->hopInfo[bucket]  |= 1U << free_dist;
 
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-        omp_unset_lock(&segment->lock);
+            omp_unset_lock(&segment->lock);
 #endif
-        return;
-      }
-      hypre_UnorderedBigIntSetFindCloserFreeBucket(s,
+            return;
+         }
+         hypre_UnorderedBigIntSetFindCloserFreeBucket(s,
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-                                                   segment,
+                                                      segment,
 #endif
-                                                   &free_bucket, &free_dist);
-    } while (-1 != free_bucket);
-  }
-
-  //NEED TO RESIZE ..........................
-  hypre_error_w_msg(HYPRE_ERROR_GENERIC,"ERROR - RESIZE is not implemented\n");
-  /*fprintf(stderr, "ERROR - RESIZE is not implemented\n");*/
-  exit(1);
-  return;
+                                                      &free_bucket, &free_dist);
+      }
+      while (-1 != free_bucket);
+   }
+
+   //NEED TO RESIZE ..........................
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "ERROR - RESIZE is not implemented\n");
+   /*fprintf(stderr, "ERROR - RESIZE is not implemented\n");*/
+   exit(1);
+   return;
 }
 
-static inline HYPRE_Int
+static inline HYPRE_MAYBE_UNUSED_FUNC HYPRE_Int
 hypre_UnorderedIntMapPutIfAbsent( hypre_UnorderedIntMap *m,
                                   HYPRE_Int key, HYPRE_Int data )
 {
-  //CALCULATE HASH ..........................
+   //CALCULATE HASH ..........................
 #ifdef HYPRE_BIGINT
-  HYPRE_Int hash = hypre_BigHash(key);
+   HYPRE_Int hash = hypre_BigHash(key);
 #else
-  HYPRE_Int hash = hypre_Hash(key);
+   HYPRE_Int hash = hypre_Hash(key);
 #endif
 
-  //LOCK KEY HASH ENTERY ....................
+   //LOCK KEY HASH ENTERY ....................
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-  hypre_HopscotchSegment *segment = &m->segments[hash & m->segmentMask];
-  omp_set_lock(&segment->lock);
-#endif
-  hypre_HopscotchBucket* startBucket = &(m->table[hash & m->bucketMask]);
-
-  //CHECK IF ALREADY CONTAIN ................
-  hypre_uint hopInfo = startBucket->hopInfo;
-  while (0 != hopInfo)
-  {
-    HYPRE_Int i = first_lsb_bit_indx(hopInfo);
-    hypre_HopscotchBucket* currElm = startBucket + i;
-    if (hash == currElm->hash && key == currElm->key)
-    {
-      HYPRE_Int rc = currElm->data;
+   hypre_HopscotchSegment *segment = &m->segments[hash & m->segmentMask];
+   omp_set_lock(&segment->lock);
+#endif
+   hypre_HopscotchBucket* startBucket = &(m->table[hash & m->bucketMask]);
+
+   //CHECK IF ALREADY CONTAIN ................
+   hypre_uint hopInfo = startBucket->hopInfo;
+   while (0 != hopInfo)
+   {
+      HYPRE_Int i = first_lsb_bit_indx(hopInfo);
+      hypre_HopscotchBucket* currElm = startBucket + i;
+      if (hash == currElm->hash && key == currElm->key)
+      {
+         HYPRE_Int rc = currElm->data;
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-      omp_unset_lock(&segment->lock);
-#endif
-      return rc;
-    }
-    hopInfo &= ~(1U << i);
-  }
-
-  //LOOK FOR FREE BUCKET ....................
-  hypre_HopscotchBucket* free_bucket = startBucket;
-  HYPRE_Int free_dist = 0;
-  for ( ; free_dist < HYPRE_HOPSCOTCH_HASH_INSERT_RANGE; ++free_dist, ++free_bucket)
-  {
-    if( (HYPRE_HOPSCOTCH_HASH_EMPTY == free_bucket->hash) &&
-        (HYPRE_HOPSCOTCH_HASH_EMPTY ==
+         omp_unset_lock(&segment->lock);
+#endif
+         return rc;
+      }
+      hopInfo &= ~(1U << i);
+   }
+
+   //LOOK FOR FREE BUCKET ....................
+   hypre_HopscotchBucket* free_bucket = startBucket;
+   HYPRE_Int free_dist = 0;
+   for ( ; free_dist < HYPRE_HOPSCOTCH_HASH_INSERT_RANGE; ++free_dist, ++free_bucket)
+   {
+      if ( (HYPRE_HOPSCOTCH_HASH_EMPTY == free_bucket->hash) &&
+           (HYPRE_HOPSCOTCH_HASH_EMPTY ==
             hypre_compare_and_swap((HYPRE_Int *)&free_bucket->hash,
                                    (HYPRE_Int)HYPRE_HOPSCOTCH_HASH_EMPTY,
                                    (HYPRE_Int)HYPRE_HOPSCOTCH_HASH_BUSY)) )
-      break;
-  }
-
-  //PLACE THE NEW KEY .......................
-  if (free_dist < HYPRE_HOPSCOTCH_HASH_INSERT_RANGE)
-  {
-    do
-    {
-      if (free_dist < HYPRE_HOPSCOTCH_HASH_HOP_RANGE)
       {
-        free_bucket->data     = data;
-        free_bucket->key      = key;
-        free_bucket->hash     = hash;
-        startBucket->hopInfo |= 1U << free_dist;
+         break;
+      }
+   }
+
+   //PLACE THE NEW KEY .......................
+   if (free_dist < HYPRE_HOPSCOTCH_HASH_INSERT_RANGE)
+   {
+      do
+      {
+         if (free_dist < HYPRE_HOPSCOTCH_HASH_HOP_RANGE)
+         {
+            free_bucket->data    = data;
+            free_bucket->key     = key;
+            free_bucket->hash    = hash;
+            startBucket->hopInfo = startBucket->hopInfo | (1U << free_dist);
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-        omp_unset_lock(&segment->lock);
+            omp_unset_lock(&segment->lock);
 #endif
-        return HYPRE_HOPSCOTCH_HASH_EMPTY;
-      }
-      hypre_UnorderedIntMapFindCloserFreeBucket(m,
+            return HYPRE_HOPSCOTCH_HASH_EMPTY;
+         }
+         hypre_UnorderedIntMapFindCloserFreeBucket(m,
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-                                                segment,
+                                                   segment,
 #endif
-                                                &free_bucket, &free_dist);
-    } while (NULL != free_bucket);
-  }
+                                                   &free_bucket, &free_dist);
+      }
+      while (NULL != free_bucket);
+   }
 
-  //NEED TO RESIZE ..........................
-  hypre_error_w_msg(HYPRE_ERROR_GENERIC,"ERROR - RESIZE is not implemented\n");
-  /*fprintf(stderr, "ERROR - RESIZE is not implemented\n");*/
-  exit(1);
-  return HYPRE_HOPSCOTCH_HASH_EMPTY;
+   //NEED TO RESIZE ..........................
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "ERROR - RESIZE is not implemented\n");
+   /*fprintf(stderr, "ERROR - RESIZE is not implemented\n");*/
+   exit(1);
+   return HYPRE_HOPSCOTCH_HASH_EMPTY;
 }
 
-static inline HYPRE_Int
+static inline HYPRE_MAYBE_UNUSED_FUNC HYPRE_Int
 hypre_UnorderedBigIntMapPutIfAbsent( hypre_UnorderedBigIntMap *m,
                                      HYPRE_BigInt key, HYPRE_Int data)
 {
-  //CALCULATE HASH ..........................
+   //CALCULATE HASH ..........................
 #if defined(HYPRE_BIGINT) || defined(HYPRE_MIXEDINT)
-  HYPRE_BigInt hash = hypre_BigHash(key);
+   HYPRE_BigInt hash = hypre_BigHash(key);
 #else
-  HYPRE_BigInt hash = hypre_Hash(key);
+   HYPRE_BigInt hash = hypre_Hash(key);
 #endif
 
-  //LOCK KEY HASH ENTERY ....................
-#ifdef HYPRE_CONCURRENT_HOPSCOTCH
-  hypre_HopscotchSegment *segment = &m->segments[hash & m->segmentMask];
-  omp_set_lock(&segment->lock);
-#endif
-  hypre_BigHopscotchBucket* startBucket = &(m->table[hash & m->bucketMask]);
-
-  //CHECK IF ALREADY CONTAIN ................
-  hypre_uint hopInfo = startBucket->hopInfo;
-  while (0 != hopInfo)
-  {
-    HYPRE_Int i = first_lsb_bit_indx(hopInfo);
-    hypre_BigHopscotchBucket* currElm = startBucket + i;
-    if (hash == currElm->hash && key == currElm->key)
-    {
-      HYPRE_Int rc = currElm->data;
+   //LOCK KEY HASH ENTERY ....................
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-      omp_unset_lock(&segment->lock);
-#endif
-      return rc;
-    }
-    hopInfo &= ~(1U << i);
-  }
-
-  //LOOK FOR FREE BUCKET ....................
-  hypre_BigHopscotchBucket* free_bucket = startBucket;
-  HYPRE_Int free_dist = 0;
-  for ( ; free_dist < HYPRE_HOPSCOTCH_HASH_INSERT_RANGE; ++free_dist, ++free_bucket)
-  {
-    if( (HYPRE_HOPSCOTCH_HASH_EMPTY == free_bucket->hash) &&
-        (HYPRE_HOPSCOTCH_HASH_EMPTY ==
-           hypre_compare_and_swap((HYPRE_Int *)&free_bucket->hash,
-                                  (HYPRE_Int)HYPRE_HOPSCOTCH_HASH_EMPTY,
-                                  (HYPRE_Int)HYPRE_HOPSCOTCH_HASH_BUSY)) )
-      break;
-  }
-
-  //PLACE THE NEW KEY .......................
-  if (free_dist < HYPRE_HOPSCOTCH_HASH_INSERT_RANGE)
-  {
-    do
-    {
-      if (free_dist < HYPRE_HOPSCOTCH_HASH_HOP_RANGE)
+   hypre_HopscotchSegment *segment = &m->segments[hash & m->segmentMask];
+   omp_set_lock(&segment->lock);
+#endif
+   hypre_BigHopscotchBucket* startBucket = &(m->table[hash & m->bucketMask]);
+
+   //CHECK IF ALREADY CONTAIN ................
+   hypre_uint hopInfo = startBucket->hopInfo;
+   while (0 != hopInfo)
+   {
+      HYPRE_Int i = first_lsb_bit_indx(hopInfo);
+      hypre_BigHopscotchBucket* currElm = startBucket + i;
+      if (hash == currElm->hash && key == currElm->key)
       {
-        free_bucket->data     = data;
-        free_bucket->key      = key;
-        free_bucket->hash     = hash;
-        startBucket->hopInfo |= 1U << free_dist;
+         HYPRE_Int rc = currElm->data;
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-        omp_unset_lock(&segment->lock);
+         omp_unset_lock(&segment->lock);
 #endif
-        return HYPRE_HOPSCOTCH_HASH_EMPTY;
+         return rc;
+      }
+      hopInfo &= ~(1U << i);
+   }
+
+   //LOOK FOR FREE BUCKET ....................
+   hypre_BigHopscotchBucket* free_bucket = startBucket;
+   HYPRE_Int free_dist = 0;
+   for ( ; free_dist < HYPRE_HOPSCOTCH_HASH_INSERT_RANGE; ++free_dist, ++free_bucket)
+   {
+      if ( (HYPRE_HOPSCOTCH_HASH_EMPTY == free_bucket->hash) &&
+           (HYPRE_HOPSCOTCH_HASH_EMPTY ==
+            hypre_compare_and_swap((HYPRE_Int *)&free_bucket->hash,
+                                   (HYPRE_Int)HYPRE_HOPSCOTCH_HASH_EMPTY,
+                                   (HYPRE_Int)HYPRE_HOPSCOTCH_HASH_BUSY)) )
+      {
+         break;
       }
-      hypre_UnorderedBigIntMapFindCloserFreeBucket(m,
+   }
+
+   //PLACE THE NEW KEY .......................
+   if (free_dist < HYPRE_HOPSCOTCH_HASH_INSERT_RANGE)
+   {
+      do
+      {
+         if (free_dist < HYPRE_HOPSCOTCH_HASH_HOP_RANGE)
+         {
+            free_bucket->data    = data;
+            free_bucket->key     = key;
+            free_bucket->hash    = hash;
+            startBucket->hopInfo = startBucket->hopInfo | (1U << free_dist);
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-                                                   segment,
+            omp_unset_lock(&segment->lock);
 #endif
-                                                   &free_bucket, &free_dist);
-    } while (NULL != free_bucket);
-  }
-
-  //NEED TO RESIZE ..........................
-  hypre_error_w_msg(HYPRE_ERROR_GENERIC,"ERROR - RESIZE is not implemented\n");
-  /*fprintf(stderr, "ERROR - RESIZE is not implemented\n");*/
-  exit(1);
-  return HYPRE_HOPSCOTCH_HASH_EMPTY;
+            return HYPRE_HOPSCOTCH_HASH_EMPTY;
+         }
+         hypre_UnorderedBigIntMapFindCloserFreeBucket(m,
+#ifdef HYPRE_CONCURRENT_HOPSCOTCH
+                                                      segment,
+#endif
+                                                      &free_bucket, &free_dist);
+      }
+      while (NULL != free_bucket);
+   }
+
+   //NEED TO RESIZE ..........................
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "ERROR - RESIZE is not implemented\n");
+   /*fprintf(stderr, "ERROR - RESIZE is not implemented\n");*/
+   exit(1);
+   return HYPRE_HOPSCOTCH_HASH_EMPTY;
 }
 
 #ifdef __cplusplus
@@ -2942,6 +3829,126 @@ hypre_UnorderedBigIntMapPutIfAbsent( hypre_UnorderedBigIntMap *m,
 #endif
 
 #endif // hypre_HOPSCOTCH_HASH_HEADER
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+/*
+*   Matrix Market I/O library for ANSI C
+*
+*   See http://math.nist.gov/MatrixMarket for details.
+*
+*
+*/
+
+#ifndef MM_IO_H
+#define MM_IO_H
+
+#define MM_MAX_LINE_LENGTH 1025
+#define MatrixMarketBanner "%%MatrixMarket"
+#define MM_MAX_TOKEN_LENGTH 64
+
+typedef char MM_typecode[4];
+
+HYPRE_Int hypre_mm_is_valid(MM_typecode matcode); /* too complex for a macro */
+HYPRE_Int hypre_mm_read_banner(FILE *f, MM_typecode *matcode);
+HYPRE_Int hypre_mm_read_mtx_crd_size(FILE *f, HYPRE_Int *M, HYPRE_Int *N, HYPRE_Int *nz);
+
+/********************* MM_typecode query fucntions ***************************/
+
+#define hypre_mm_is_matrix(typecode)    ((typecode)[0]=='M')
+
+#define hypre_mm_is_sparse(typecode)    ((typecode)[1]=='C')
+#define hypre_mm_is_coordinate(typecode)((typecode)[1]=='C')
+#define hypre_mm_is_dense(typecode)   ((typecode)[1]=='A')
+#define hypre_mm_is_array(typecode)   ((typecode)[1]=='A')
+
+#define hypre_mm_is_complex(typecode) ((typecode)[2]=='C')
+#define hypre_mm_is_real(typecode)    ((typecode)[2]=='R')
+#define hypre_mm_is_pattern(typecode) ((typecode)[2]=='P')
+#define hypre_mm_is_integer(typecode) ((typecode)[2]=='I')
+
+#define hypre_mm_is_symmetric(typecode)((typecode)[3]=='S')
+#define hypre_mm_is_general(typecode) ((typecode)[3]=='G')
+#define hypre_mm_is_skew(typecode) ((typecode)[3]=='K')
+#define hypre_mm_is_hermitian(typecode)((typecode)[3]=='H')
+
+
+
+/********************* MM_typecode modify fucntions ***************************/
+
+#define hypre_mm_set_matrix(typecode) ((*typecode)[0]='M')
+#define hypre_mm_set_coordinate(typecode) ((*typecode)[1]='C')
+#define hypre_mm_set_array(typecode)  ((*typecode)[1]='A')
+#define hypre_mm_set_dense(typecode)  hypre_mm_set_array(typecode)
+#define hypre_mm_set_sparse(typecode) hypre_mm_set_coordinate(typecode)
+
+#define hypre_mm_set_complex(typecode)((*typecode)[2]='C')
+#define hypre_mm_set_real(typecode)   ((*typecode)[2]='R')
+#define hypre_mm_set_pattern(typecode)((*typecode)[2]='P')
+#define hypre_mm_set_integer(typecode)((*typecode)[2]='I')
+
+
+#define hypre_mm_set_symmetric(typecode)((*typecode)[3]='S')
+#define hypre_mm_set_general(typecode)  ((*typecode)[3]='G')
+#define hypre_mm_set_skew(typecode)     ((*typecode)[3]='K')
+#define hypre_mm_set_hermitian(typecode)((*typecode)[3]='H')
+
+#define hypre_mm_clear_typecode(typecode) ((*typecode)[0]=(*typecode)[1]= \
+      (*typecode)[2]=' ',(*typecode)[3]='G')
+
+#define hypre_mm_initialize_typecode(typecode) hypre_mm_clear_typecode(typecode)
+
+
+/********************* Matrix Market error codes ***************************/
+
+
+#define MM_COULD_NOT_READ_FILE  11
+#define MM_PREMATURE_EOF        12
+#define MM_NOT_MTX              13
+#define MM_NO_HEADER            14
+#define MM_UNSUPPORTED_TYPE     15
+#define MM_LINE_TOO_LONG        16
+#define MM_COULD_NOT_WRITE_FILE 17
+
+
+/******************** Matrix Market internal definitions ********************
+
+   MM_matrix_typecode: 4-character sequence
+
+   object sparse/data        storage
+   dense  type        scheme
+
+   string position: [0]        [1] [2]         [3]
+
+   Matrix typecode:  M(atrix)  C(oord) R(eal)   G(eneral)
+   A(array)    C(omplex)   H(ermitian)
+   P(attern)   S(ymmetric)
+   I(nteger)   K(kew)
+
+ ***********************************************************************/
+
+#define MM_MTX_STR        "matrix"
+#define MM_ARRAY_STR      "array"
+#define MM_DENSE_STR      "array"
+#define MM_COORDINATE_STR "coordinate"
+#define MM_SPARSE_STR     "coordinate"
+#define MM_COMPLEX_STR    "complex"
+#define MM_REAL_STR       "real"
+#define MM_INT_STR        "integer"
+#define MM_GENERAL_STR    "general"
+#define MM_SYMM_STR       "symmetric"
+#define MM_HERM_STR       "hermitian"
+#define MM_SKEW_STR       "skew-symmetric"
+#define MM_PATTERN_STR    "pattern"
+
+
+/*  high level routines */
+
+#endif
 
 #ifdef __cplusplus
 }
diff --git a/external/hypre/src/utilities/_hypre_utilities.hpp b/external/hypre/src/utilities/_hypre_utilities.hpp
index 22c302d8..43df71f6 100644
--- a/external/hypre/src/utilities/_hypre_utilities.hpp
+++ b/external/hypre/src/utilities/_hypre_utilities.hpp
@@ -4,62 +4,247 @@
 #ifndef hypre_UTILITIES_HPP
 #define hypre_UTILITIES_HPP
 
+
 #ifdef __cplusplus
 extern "C++" {
 #endif
 
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
  ******************************************************************************/
 
-#ifndef DEVICE_ALLOCATOR_H
-#define DEVICE_ALLOCATOR_H
+#ifndef HYPRE_FUNCTORS_H
+#define HYPRE_FUNCTORS_H
 
 #if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
 
-/* C++ style memory allocator for GPU **device** memory
- * Just wraps _hypre_TAlloc and _hypre_TFree */
-struct hypre_device_allocator {
-    typedef char value_type;
+/*--------------------------------------------------------------------------
+ * hypreFunctor_DenseMatrixIdentity
+ *
+ * Functor for generating a dense identity matrix.
+ * This assumes that the input array "a" is zeros everywhere
+ *--------------------------------------------------------------------------*/
+
+struct hypreFunctor_DenseMatrixIdentity
+{
+   HYPRE_Int   n_;
+   HYPRE_Real *a_;
+
+   hypreFunctor_DenseMatrixIdentity(HYPRE_Int n, HYPRE_Real *a)
+   {
+      n_ = n;
+      a_ = a;
+   }
+
+   __host__ __device__ void operator()(HYPRE_Int i)
+   {
+      a_[i * n_ + i] = 1.0;
+   }
+};
 
-    hypre_device_allocator() {
-        // constructor
-    }
+/*--------------------------------------------------------------------------
+ * hypreFunctor_ArrayStridedAccess
+ *
+ * Functor for performing strided data access on a templated array.
+ *
+ * The stride interval "s_" is used to access every "s_"-th element
+ * from the source array "a_".
+ *
+ * It is templated to support various data types for the array.
+ *--------------------------------------------------------------------------*/
 
-    ~hypre_device_allocator() {
-        // destructor
-    }
+template <typename T>
+struct hypreFunctor_ArrayStridedAccess
+{
+   HYPRE_Int  s_;
+   T         *a_;
+
+   hypreFunctor_ArrayStridedAccess(HYPRE_Int s, T *a) : s_(s), a_(a) {}
+
+   __host__ __device__ T operator()(HYPRE_Int i)
+   {
+      return a_[i * s_];
+   }
+};
+
+/*--------------------------------------------------------------------------
+ * hypreFunctor_IndexStrided
+ *
+ * This functor multiplies a given index "i" by a specified stride "s_".
+ *
+ * It is templated to support various data types for the index and stride.
+ *--------------------------------------------------------------------------*/
+
+template <typename T>
+struct hypreFunctor_IndexStrided
+{
+   T s_;
 
-    char *allocate(std::ptrdiff_t num_bytes) { return _hypre_TAlloc(char, num_bytes, hypre_MEMORY_DEVICE); }
+   hypreFunctor_IndexStrided(T s) : s_(s) {}
 
-    void deallocate(char *ptr, size_t n) { _hypre_TFree(ptr, hypre_MEMORY_DEVICE); }
+   __host__ __device__ T operator()(const T i) const
+   {
+      return i * s_;
+   }
+};
+
+/*--------------------------------------------------------------------------
+ * hypreFunctor_IndexCycle
+ *--------------------------------------------------------------------------*/
+
+struct hypreFunctor_IndexCycle
+{
+   HYPRE_Int cycle_length;
+
+   hypreFunctor_IndexCycle(HYPRE_Int _cycle_length) : cycle_length(_cycle_length) {}
+
+   __host__ __device__ HYPRE_Int operator()(HYPRE_Int i) const
+   {
+      return i % cycle_length;
+   }
+};
+
+#endif /* if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP) */
+#endif /* ifndef HYPRE_FUNCTORS_H */
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+#ifndef HYPRE_PREDICATES_H
+#define HYPRE_PREDICATES_H
+
+/******************************************************************************
+ *
+ * Header file defining predicates for thrust used throughout hypre
+ *
+ *****************************************************************************/
+
+#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+
+/*--------------------------------------------------------------------------
+ * hyprePred_StridedAccess
+ *
+ * This struct defines a predicate for strided access in array-like data.
+ *
+ * It is used to determine if an element at a given index should be processed
+ * or not, based on a specified stride. The operator() returns true when the
+ * index is a multiple of the stride, indicating the element at that index
+ * is part of the strided subset.
+ *--------------------------------------------------------------------------*/
+
+struct hyprePred_StridedAccess
+{
+   HYPRE_Int  s_;
+
+   hyprePred_StridedAccess(HYPRE_Int s) : s_(s) {}
+
+   __host__ __device__ HYPRE_Int operator()(const HYPRE_Int i) const
+   {
+      return (!(i % s_));
+   }
+};
+
+#endif /* if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP) */
+#endif /* ifndef HYPRE_PREDICATES_H */
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+#ifndef DEVICE_ALLOCATOR_H
+#define DEVICE_ALLOCATOR_H
+
+#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+
+/* C++ style memory allocator for the device using the abstract memory model */
+struct hypre_device_allocator
+{
+   typedef char value_type;
+
+   hypre_device_allocator()
+   {
+      // constructor
+   }
+
+   ~hypre_device_allocator()
+   {
+      // destructor
+   }
+
+   char *allocate(std::ptrdiff_t num_bytes)
+   {
+      return hypre_TAlloc(char, num_bytes, HYPRE_MEMORY_DEVICE);
+   }
+
+   void deallocate(char *ptr, size_t n)
+   {
+      HYPRE_UNUSED_VAR(n);
+      hypre_TFree(ptr, HYPRE_MEMORY_DEVICE);
+   }
 };
 
 #endif /* #if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP) */
 
 #endif
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
  ******************************************************************************/
 
-#ifndef HYPRE_CUDA_UTILS_H
-#define HYPRE_CUDA_UTILS_H
+#ifndef HYPRE_DEVICE_UTILS_H
+#define HYPRE_DEVICE_UTILS_H
 
 #if defined(HYPRE_USING_GPU)
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_DEVICE_OPENMP)
-#include <cublas_v2.h>
+/* Data types depending on GPU architecture */
+#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_SYCL)
+typedef hypre_uint          hypre_mask;
+#define hypre_mask_one      1U
+
+#elif defined(HYPRE_USING_HIP)
+typedef hypre_ulonglongint  hypre_mask;
+#define hypre_mask_one      1ULL
+
+#endif
+
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ *                          cuda includes
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#if defined(HYPRE_USING_CUDA)
+using hypre_DeviceItem = void*;
 #include <cuda.h>
-#include <cuda_profiler_api.h>
 #include <cuda_runtime.h>
+#include <cuda_profiler_api.h>
+
+#if defined(HYPRE_USING_CURAND)
 #include <curand.h>
+#endif
+
+#if defined(HYPRE_USING_CUBLAS)
+#include <cublas_v2.h>
+#endif
+
+#if defined(HYPRE_USING_CUSPARSE)
+/* Note (VPM) : As of cuSPARSE 12, ILU functionalities have been marked as deprecated.
+   The following definition avoids compilation warnings regarding the use of ILU routines */
+#define DISABLE_CUSPARSE_DEPRECATED
 #include <cusparse.h>
+#endif
+
+#if defined(HYPRE_USING_CUSOLVER)
+#include <cusolverDn.h>
+#endif
 
 #ifndef CUDART_VERSION
 #error CUDART_VERSION Undefined!
@@ -76,767 +261,1972 @@ struct hypre_device_allocator {
 #define CUB_IGNORE_DEPRECATED_CPP_DIALECT
 #endif
 
+#ifndef CUSPARSE_VERSION
+#if defined(CUSPARSE_VER_MAJOR) && defined(CUSPARSE_VER_MINOR) && defined(CUSPARSE_VER_PATCH)
+#define CUSPARSE_VERSION (CUSPARSE_VER_MAJOR * 1000 + CUSPARSE_VER_MINOR *  100 + CUSPARSE_VER_PATCH)
+#else
+#define CUSPARSE_VERSION CUDA_VERSION
+#endif
+#endif
+
 #define CUSPARSE_NEWAPI_VERSION 11000
+#define CUSPARSE_NEWSPMM_VERSION 11401
+#define CUDA_MALLOCASYNC_VERSION 11020
+#define CUDA_THRUST_NOSYNC_VERSION 12000
+
+#define CUSPARSE_SPSV_VERSION 11600
+#if CUSPARSE_VERSION >= CUSPARSE_SPSV_VERSION
+#define hypre_cusparseSpSVDescr         cusparseSpSVDescr_t
+#define hypre_cusparseSpSV_createDescr  cusparseSpSV_createDescr
+#define hypre_cusparseSpSV_destroyDescr cusparseSpSV_destroyDescr
+#else
+#define hypre_cusparseSpSVDescr         csrsv2Info_t
+#define hypre_cusparseSpSV_createDescr  cusparseCreateCsrsv2Info
+#define hypre_cusparseSpSV_destroyDescr cusparseDestroyCsrsv2Info
+#endif
 
-#elif defined(HYPRE_USING_HIP)
+#define CUSPARSE_SPSM_VERSION 11600
+#if CUSPARSE_VERSION >= CUSPARSE_SPSM_VERSION
+#define hypre_cusparseSpSMDescr         cusparseSpSMDescr_t
+#define hypre_cusparseSpSM_createDescr  cusparseSpSM_createDescr
+#define hypre_cusparseSpSM_destroyDescr cusparseSpSM_destroyDescr
+#else
+#define hypre_cusparseSpSMDescr         csrsm2Info_t
+#define hypre_cusparseSpSM_createDescr  cusparseCreateCsrsm2Info
+#define hypre_cusparseSpSM_destroyDescr cusparseDestroyCsrsm2Info
+#endif
+
+#if defined(HYPRE_USING_DEVICE_MALLOC_ASYNC)
+#if CUDA_VERSION < CUDA_MALLOCASYNC_VERSION
+#error cudaMalloc/FreeAsync needs CUDA 11.2
+#endif
+#endif
+
+#if defined(HYPRE_USING_THRUST_NOSYNC)
+#if CUDA_VERSION < CUDA_THRUST_NOSYNC_VERSION
+#error thrust::cuda::par_nosync needs CUDA 12
+#endif
+#define HYPRE_THRUST_EXECUTION thrust::cuda::par_nosync
+#else
+#define HYPRE_THRUST_EXECUTION thrust::cuda::par
+#endif
+
+#endif /* defined(HYPRE_USING_CUDA) */
+
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ *                          hip includes
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
+#if defined(HYPRE_USING_HIP)
+
+using hypre_DeviceItem = void*;
 #include <hip/hip_runtime.h>
 
-#endif// defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_DEVICE_OPENMP)
+#if defined(HYPRE_USING_ROCBLAS)
+#include <rocblas/rocblas.h>
+#endif
 
 #if defined(HYPRE_USING_ROCSPARSE)
-#include <rocsparse.h>
+#include <rocsparse/rocsparse.h>
+#if !defined(ROCSPARSE_VERSION)
+#define ROCSPARSE_VERSION (ROCSPARSE_VERSION_MAJOR * 100000 + ROCSPARSE_VERSION_MINOR * 100 + ROCSPARSE_VERSION_PATCH)
+#endif
+#endif
+
+#if defined(HYPRE_USING_ROCSOLVER)
+#include <rocsolver/rocsolver.h>
 #endif
 
 #if defined(HYPRE_USING_ROCRAND)
-#include <rocrand.h>
+#include <rocrand/rocrand.h>
 #endif
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_DEVICE_OPENMP)
-#define HYPRE_CUDA_CALL(call)                                                                                \
-    do {                                                                                                     \
-        cudaError_t err = call;                                                                              \
-        if (cudaSuccess != err) {                                                                            \
-            printf("CUDA ERROR (code = %d, %s) at %s:%d\n", err, cudaGetErrorString(err), __FILE__,          \
-                   __LINE__);                                                                                \
-            hypre_assert(0);                                                                                 \
-            exit(1);                                                                                         \
-        }                                                                                                    \
-    } while (0)
+#endif /* defined(HYPRE_USING_HIP) */
 
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ *                          thrust includes
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+
+#include <thrust/execution_policy.h>
+#if defined(HYPRE_USING_CUDA)
+#include <thrust/system/cuda/execution_policy.h>
 #elif defined(HYPRE_USING_HIP)
-#define HYPRE_HIP_CALL(call)                                                                                 \
-    do {                                                                                                     \
-        hipError_t err = call;                                                                               \
-        if (hipSuccess != err) {                                                                             \
-            printf("HIP ERROR (code = %d, %s) at %s:%d\n", err, hipGetErrorString(err), __FILE__, __LINE__); \
-            hypre_assert(0);                                                                                 \
-            exit(1);                                                                                         \
-        }                                                                                                    \
-    } while (0)
-
-#endif// defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_DEVICE_OPENMP)
-
-#define HYPRE_CUBLAS_CALL(call)                                                                              \
-    do {                                                                                                     \
-        cublasStatus_t err = call;                                                                           \
-        if (CUBLAS_STATUS_SUCCESS != err) {                                                                  \
-            printf("CUBLAS ERROR (code = %d, %d) at %s:%d\n", err, err == CUBLAS_STATUS_EXECUTION_FAILED,    \
-                   __FILE__, __LINE__);                                                                      \
-            hypre_assert(0);                                                                                 \
-            exit(1);                                                                                         \
-        }                                                                                                    \
-    } while (0)
-
-#define HYPRE_CUSPARSE_CALL(call)                                                                            \
-    do {                                                                                                     \
-        cusparseStatus_t err = call;                                                                         \
-        if (CUSPARSE_STATUS_SUCCESS != err) {                                                                \
-            printf("CUSPARSE ERROR (code = %d, %s) at %s:%d\n", err, cusparseGetErrorString(err), __FILE__,  \
-                   __LINE__);                                                                                \
-            hypre_assert(0);                                                                                 \
-            exit(1);                                                                                         \
-        }                                                                                                    \
-    } while (0)
-
-#define HYPRE_ROCSPARSE_CALL(call)                                                                           \
-    do {                                                                                                     \
-        rocsparse_status err = call;                                                                         \
-        if (rocsparse_status_success != err) {                                                               \
-            printf("rocSPARSE ERROR (code = %d) at %s:%d\n", err, __FILE__, __LINE__);                       \
-            assert(0);                                                                                       \
-            exit(1);                                                                                         \
-        }                                                                                                    \
-    } while (0)
-
-#define HYPRE_CURAND_CALL(call)                                                                              \
-    do {                                                                                                     \
-        curandStatus_t err = call;                                                                           \
-        if (CURAND_STATUS_SUCCESS != err) {                                                                  \
-            printf("CURAND ERROR (code = %d) at %s:%d\n", err, __FILE__, __LINE__);                          \
-            hypre_assert(0);                                                                                 \
-            exit(1);                                                                                         \
-        }                                                                                                    \
-    } while (0)
-
-#define HYPRE_ROCRAND_CALL(call)                                                                             \
-    do {                                                                                                     \
-        rocrand_status err = call;                                                                           \
-        if (ROCRAND_STATUS_SUCCESS != err) {                                                                 \
-            printf("ROCRAND ERROR (code = %d) at %s:%d\n", err, __FILE__, __LINE__);                         \
-            hypre_assert(0);                                                                                 \
-            exit(1);                                                                                         \
-        }                                                                                                    \
-    } while (0)
+#include <thrust/system/hip/execution_policy.h>
+#endif
+#include <thrust/count.h>
+#include <thrust/device_ptr.h>
+#include <thrust/unique.h>
+#include <thrust/sort.h>
+#include <thrust/binary_search.h>
+#include <thrust/iterator/constant_iterator.h>
+#include <thrust/iterator/counting_iterator.h>
+#include <thrust/iterator/zip_iterator.h>
+#include <thrust/transform.h>
+#include <thrust/functional.h>
+#include <thrust/gather.h>
+#include <thrust/scan.h>
+#include <thrust/fill.h>
+#include <thrust/adjacent_difference.h>
+#include <thrust/inner_product.h>
+#include <thrust/logical.h>
+#include <thrust/replace.h>
+#include <thrust/sequence.h>
+#include <thrust/for_each.h>
+#include <thrust/remove.h>
+#include <thrust/version.h>
 
-struct hypre_cub_CachingDeviceAllocator;
-typedef struct hypre_cub_CachingDeviceAllocator hypre_cub_CachingDeviceAllocator;
+/* VPM: this is needed to support cuda 10. not_fn is the correct replacement going forward. */
+#define THRUST_VERSION_NOTFN 200700
+#if (defined(THRUST_VERSION) && THRUST_VERSION < THRUST_VERSION_NOTFN)
+#define HYPRE_THRUST_NOT(pred) thrust::not1(pred)
+#else
+#define HYPRE_THRUST_NOT(pred) thrust::not_fn(pred)
+#endif
+
+using namespace thrust::placeholders;
+#endif /* defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP) */
+
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ *                          sycl includes
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#if defined(HYPRE_USING_SYCL)
+
+#include <sycl/sycl.hpp>
+#include <dpct/dpct.hpp>
+#if defined(HYPRE_USING_ONEMKLSPARSE)
+#include <oneapi/mkl/spblas.hpp>
+#endif
+#if defined(HYPRE_USING_ONEMKLBLAS)
+#include <oneapi/mkl/blas.hpp>
+#include <oneapi/mkl/lapack.hpp>
+#endif
+#if defined(HYPRE_USING_ONEMKLRAND)
+#include <oneapi/mkl/rng.hpp>
+#endif
+
+/* The following definitions facilitate code reuse and limits
+ * if/def-ing when unifying cuda/hip code with sycl code */
+using dim3 = sycl::range<3>;
+using hypre_DeviceItem = sycl::nd_item<3>;
+#define __global__
+#define __host__
+#define __device__
+#define __forceinline__ __inline__ __attribute__((always_inline))
+
+#endif /* defined(HYPRE_USING_SYCL) */
+
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ *      device defined values
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#define HYPRE_MAX_NTHREADS_BLOCK 1024
 
 // HYPRE_WARP_BITSHIFT is just log2 of HYPRE_WARP_SIZE
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_DEVICE_OPENMP)
-#define HYPRE_WARP_SIZE 32
-#define HYPRE_WARP_BITSHIFT 5
+#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_SYCL)
+#define HYPRE_WARP_SIZE       32
+#define HYPRE_WARP_BITSHIFT   5
+#define HYPRE_WARP_FULL_MASK  0xFFFFFFFF
 #elif defined(HYPRE_USING_HIP)
-#define HYPRE_WARP_SIZE 64
-#define HYPRE_WARP_BITSHIFT 6
+#define HYPRE_WARP_SIZE       64
+#define HYPRE_WARP_BITSHIFT   6
+#define HYPRE_WARP_FULL_MASK  0xFFFFFFFFFFFFFFF
 #endif
 
-#define HYPRE_WARP_FULL_MASK 0xFFFFFFFF
-#define HYPRE_MAX_NUM_WARPS (64 * 64 * 32)
-#define HYPRE_FLT_LARGE 1e30
-#define HYPRE_1D_BLOCK_SIZE 512
+#define HYPRE_MAX_NUM_WARPS   (64 * 64 * 32)
+#define HYPRE_FLT_LARGE       1e30
+#define HYPRE_1D_BLOCK_SIZE   512
 #define HYPRE_MAX_NUM_STREAMS 10
+#define HYPRE_SPGEMM_MAX_NBIN 10
+
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ *       macro for launching GPU kernels
+ *       NOTE: IN HYPRE'S DEFAULT STREAM
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#if defined(HYPRE_DEBUG)
+#define GPU_LAUNCH_SYNC { hypre_SyncComputeStream(); hypre_GetDeviceLastError(); }
+#else
+#define GPU_LAUNCH_SYNC
+#endif
+
+/* cuda/hip version */
+#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#define HYPRE_GPU_LAUNCH2(kernel_name, gridsize, blocksize, shmem_size, ...)                                                        \
+{                                                                                                                                   \
+   if ( gridsize.x  == 0 || gridsize.y  == 0 || gridsize.z  == 0 ||                                                                 \
+        blocksize.x == 0 || blocksize.y == 0 || blocksize.z == 0 )                                                                  \
+   {                                                                                                                                \
+      /* printf("Warning %s %d: Zero CUDA grid/block (%d %d %d) (%d %d %d)\n",                                                      \
+                 __FILE__, __LINE__,                                                                                                \
+                 gridsize.x, gridsize.y, gridsize.z, blocksize.x, blocksize.y, blocksize.z); */                                     \
+   }                                                                                                                                \
+   else                                                                                                                             \
+   {                                                                                                                                \
+      hypre_DeviceItem item = NULL;                                                                                                 \
+      (kernel_name) <<< (gridsize), (blocksize), shmem_size, hypre_HandleComputeStream(hypre_handle()) >>> (item, __VA_ARGS__);     \
+      GPU_LAUNCH_SYNC;                                                                                                              \
+   }                                                                                                                                \
+}
+
+#define HYPRE_GPU_LAUNCH(kernel_name, gridsize, blocksize, ...) HYPRE_GPU_LAUNCH2(kernel_name, gridsize, blocksize, 0, __VA_ARGS__)
+#endif /* defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP) */
+
+/* sycl version */
+#if defined(HYPRE_USING_SYCL)
+
+#define HYPRE_GPU_LAUNCH(kernel_name, gridsize, blocksize, ...)                              \
+{                                                                                            \
+   if ( gridsize[2] == 0 || blocksize[2] == 0 )                                              \
+   {                                                                                         \
+     /* hypre_printf("Warning %s %d: Zero SYCL 1D launch parameters grid/block (%d) (%d)\n", \
+                  __FILE__, __LINE__,                                                        \
+                  gridsize[0], blocksize[0]); */                                             \
+   }                                                                                         \
+   else                                                                                      \
+   {                                                                                         \
+      hypre_HandleComputeStream(hypre_handle())->submit([&] (sycl::handler& cgh) {           \
+         cgh.parallel_for(sycl::nd_range<3>(gridsize*blocksize, blocksize),                  \
+            [=] (hypre_DeviceItem item) [[intel::reqd_sub_group_size(HYPRE_WARP_SIZE)]]      \
+               { (kernel_name)(item, __VA_ARGS__);                                           \
+         });                                                                                 \
+      }).wait_and_throw();                                                                   \
+   }                                                                                         \
+}
+
+#define HYPRE_CPU_LAUNCH(kernel_name, gridsize, blocksize, ...)                              \
+{                                                                                            \
+   if ( gridsize[2] == 0 || blocksize[2] == 0 )                                              \
+   {                                                                                         \
+     /* hypre_printf("Warning %s %d: Zero SYCL 1D launch parameters grid/block (%d) (%d)\n", \
+                  __FILE__, __LINE__,                                                        \
+                  gridsize[0], blocksize[0]); */                                             \
+   }                                                                                         \
+   else                                                                                      \
+   {                                                                                         \
+      HPYRE_Int compute_stream = hypre_HandleComputeStreamNum(hypre_handle());               \
+      hypre_HandleComputeStreamNum(hypre_handle) = HYPRE_MAX_NUM_STREAMS - 1;                \
+      hypre_HandleComputeStream(hypre_handle())->submit([&] (sycl::handler& cgh) {           \
+         cgh.parallel_for(sycl::nd_range<3>(gridsize*blocksize, blocksize),                  \
+            [=] (hypre_DeviceItem item) [[intel::reqd_sub_group_size(HYPRE_WARP_SIZE)]]      \
+               { (kernel_name)(item, __VA_ARGS__);                                           \
+         });                                                                                 \
+      }).wait_and_throw();                                                                   \
+      hypre_HandleComputeStreamNum(hypre_handle) = compute_stream;                           \
+   }                                                                                         \
+}
+
+#define HYPRE_GPU_LAUNCH2(kernel_name, gridsize, blocksize, shmem_size, ...)                 \
+{                                                                                            \
+   if ( gridsize[2] == 0 || blocksize[2] == 0 )                                              \
+   {                                                                                         \
+     /* hypre_printf("Warning %s %d: Zero SYCL 1D launch parameters grid/block (%d) (%d)\n", \
+                  __FILE__, __LINE__,                                                        \
+                  gridsize[0], blocksize[0]); */                                             \
+   }                                                                                         \
+   else                                                                                      \
+   {                                                                                         \
+      hypre_HandleComputeStream(hypre_handle())->submit([&] (sycl::handler& cgh) {           \
+         sycl::range<1> shmem_range(shmem_size);                                             \
+         sycl::local_accessor<char, 1> shmem_accessor(shmem_range, cgh);                     \
+         cgh.parallel_for(sycl::nd_range<3>(gridsize*blocksize, blocksize),                  \
+            [=] (hypre_DeviceItem item) [[intel::reqd_sub_group_size(HYPRE_WARP_SIZE)]]      \
+               { (kernel_name)(item,                                                         \
+                  shmem_accessor.get_multi_ptr<sycl::access::decorated::yes>(), __VA_ARGS__);\
+         });                                                                                 \
+      }).wait_and_throw();                                                                   \
+   }                                                                                         \
+}
+
+#define HYPRE_GPU_DEBUG_LAUNCH(kernel_name, gridsize, blocksize, ...)                        \
+{                                                                                            \
+   if ( gridsize[2] == 0 || blocksize[2] == 0 )                                              \
+   {                                                                                         \
+     /* hypre_printf("Warning %s %d: Zero SYCL 1D launch parameters grid/block (%d) (%d)\n", \
+                  __FILE__, __LINE__,                                                        \
+                  gridsize[0], blocksize[0]); */                                             \
+   }                                                                                         \
+   else                                                                                      \
+   {                                                                                         \
+      hypre_HandleComputeStream(hypre_handle())->submit([&] (sycl::handler& cgh) {           \
+         auto debug_stream = sycl::stream(4096, 1024, cgh);                                  \
+         cgh.parallel_for(sycl::nd_range<3>(gridsize*blocksize, blocksize),                  \
+            [=] (hypre_DeviceItem item) [[intel::reqd_sub_group_size(HYPRE_WARP_SIZE)]]      \
+               { (kernel_name)(item, debug_stream, __VA_ARGS__);                             \
+         });                                                                                 \
+      }).wait_and_throw();                                                                   \
+   }                                                                                         \
+}
+
+#define HYPRE_GPU_DEBUG_LAUNCH2(kernel_name, gridsize, blocksize, shmem_size, ...)           \
+{                                                                                            \
+   if ( gridsize[2] == 0 || blocksize[2] == 0 )                                              \
+   {                                                                                         \
+     /* hypre_printf("Warning %s %d: Zero SYCL 1D launch parameters grid/block (%d) (%d)\n", \
+                  __FILE__, __LINE__,                                                        \
+                  gridsize[0], blocksize[0]); */                                             \
+   }                                                                                         \
+   else                                                                                      \
+   {                                                                                         \
+      hypre_HandleComputeStream(hypre_handle())->submit([&] (sycl::handler& cgh) {           \
+         auto debug_stream = sycl::stream(4096, 1024, cgh);                                  \
+         sycl::range<1> shmem_range(shmem_size);                                             \
+         sycl::accessor<char, 1, sycl::access_mode::read_write,                              \
+            sycl::target::local> shmem_accessor(shmem_range, cgh);                           \
+         cgh.parallel_for(sycl::nd_range<3>(gridsize*blocksize, blocksize),                  \
+            [=] (hypre_DeviceItem item) [[intel::reqd_sub_group_size(HYPRE_WARP_SIZE)]]      \
+               { (kernel_name)(item, debug_stream,                                           \
+                  shmem_accessor.get_multi_ptr<sycl::access::decorated::yes>(), __VA_ARGS__);\
+         });                                                                                 \
+      }).wait_and_throw();                                                                   \
+   }                                                                                         \
+}
+#endif /* defined(HYPRE_USING_SYCL) */
+
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ *      macros for wrapping cuda/hip/sycl calls for error reporting
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#if defined(HYPRE_USING_CUDA)
+#define HYPRE_CUDA_CALL(call) do {                                                           \
+   cudaError_t err = call;                                                                   \
+   if (cudaSuccess != err) {                                                                 \
+      printf("CUDA ERROR (code = %d, %s) at %s:%d\n", err, cudaGetErrorString(err),          \
+                   __FILE__, __LINE__);                                                      \
+      hypre_assert(0);                                                                       \
+   } } while(0)
+
+#elif defined(HYPRE_USING_HIP)
+#define HYPRE_HIP_CALL(call) do {                                                            \
+   hipError_t err = call;                                                                    \
+   if (hipSuccess != err) {                                                                  \
+      printf("HIP ERROR (code = %d, %s) at %s:%d\n", err, hipGetErrorString(err),            \
+                   __FILE__, __LINE__);                                                      \
+      hypre_assert(0);                                                                       \
+   } } while(0)
+
+#elif defined(HYPRE_USING_SYCL)
+#define HYPRE_SYCL_CALL(call)                                                                \
+   try                                                                                       \
+   {                                                                                         \
+      call;                                                                                  \
+   }                                                                                         \
+   catch (sycl::exception const &ex)                                                         \
+   {                                                                                         \
+      hypre_printf("SYCL ERROR (code = %s) at %s:%d\n", ex.what(),                           \
+                     __FILE__, __LINE__);                                                    \
+      assert(0);                                                                             \
+   }                                                                                         \
+   catch(std::runtime_error const& ex)                                                       \
+   {                                                                                         \
+      hypre_printf("STD ERROR (code = %s) at %s:%d\n", ex.what(),                            \
+                   __FILE__, __LINE__);                                                      \
+      assert(0);                                                                             \
+   }
+#endif
 
-struct hypre_CudaData {
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ *      macros for wrapping vendor library calls for error reporting
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#if defined(HYPRE_COMPLEX) /* Double Complex */
+#error "GPU build does not support complex numbers!"
+
+#elif defined(HYPRE_SINGLE) /* Single */
+#if defined(HYPRE_USING_CUDA)
+/* cuBLAS */
+#define hypre_cublas_scal                      cublasSscal
+#define hypre_cublas_axpy                      cublasSaxpy
+#define hypre_cublas_dot                       cublasSdot
+#define hypre_cublas_gemv                      cublasSgemv
+#define hypre_cublas_getrfBatched              cublasSgetrfBatched
+#define hypre_cublas_getriBatched              cublasSgetriBatched
+
+/* cuSPARSE */
+#define hypre_cusparse_csru2csr_bufferSizeExt  cusparseScsru2csr_bufferSizeExt
+#define hypre_cusparse_csru2csr                cusparseScsru2csr
+#define hypre_cusparse_csrsv2_bufferSize       cusparseScsrsv2_bufferSize
+#define hypre_cusparse_csrsv2_analysis         cusparseScsrsv2_analysis
+#define hypre_cusparse_csrsv2_solve            cusparseScsrsv2_solve
+#define hypre_cusparse_csrmv                   cusparseScsrmv
+#define hypre_cusparse_csrgemm                 cusparseScsrgemm
+#define hypre_cusparse_csr2csc                 cusparseScsr2csc
+#define hypre_cusparse_csrilu02_bufferSize     cusparseScsrilu02_bufferSize
+#define hypre_cusparse_csrilu02_analysis       cusparseScsrilu02_analysis
+#define hypre_cusparse_csrilu02                cusparseScsrilu02
+#define hypre_cusparse_csrsm2_bufferSizeExt    cusparseScsrsm2_bufferSizeExt
+#define hypre_cusparse_csrsm2_analysis         cusparseScsrsm2_analysis
+#define hypre_cusparse_csrsm2_solve            cusparseScsrsm2_solve
+
+/* cuSOLVER */
+#define hypre_cusolver_dngetrf                 cusolverDnSgetrf
+#define hypre_cusolver_dngetrf_bs              cusolverDnSgetrf_bufferSize
+#define hypre_cusolver_dngetrs                 cusolverDnSgetrs
+
+#elif defined(HYPRE_USING_HIP)
+/* rocSPARSE */
+#define hypre_rocsparse_csrsv_buffer_size      rocsparse_scsrsv_buffer_size
+#define hypre_rocsparse_csrsv_analysis         rocsparse_scsrsv_analysis
+#define hypre_rocsparse_csrsv_solve            rocsparse_scsrsv_solve
+#define hypre_rocsparse_gthr                   rocsparse_sgthr
+#define hypre_rocsparse_csrmv_analysis         rocsparse_scsrmv_analysis
+#define hypre_rocsparse_csrmv                  rocsparse_scsrmv
+#define hypre_rocsparse_csrgemm_buffer_size    rocsparse_scsrgemm_buffer_size
+#define hypre_rocsparse_csrgemm                rocsparse_scsrgemm
+#define hypre_rocsparse_csr2csc                rocsparse_scsr2csc
+#define hypre_rocsparse_csrilu0_buffer_size    rocsparse_scsrilu0_buffer_size
+#define hypre_rocsparse_csrilu0_analysis       rocsparse_scsrilu0_analysis
+#define hypre_rocsparse_csrilu0                rocsparse_scsrilu0
+#define hypre_rocsparse_csritilu0_compute      rocsparse_scsritilu0_compute
+#define hypre_rocsparse_csritilu0_history      rocsparse_scsritilu0_history
+
+/* rocSOLVER */
+
+/**************
+ * TODO (VPM) *
+ **************/
+
+#endif /* if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP) */
+
+#elif defined(HYPRE_LONG_DOUBLE) /* Long Double */
+#error "GPU build does not support Long Double numbers!"
+
+#else /* Double */
+#if defined(HYPRE_USING_CUDA)
+/* cuBLAS */
+#define hypre_cublas_scal                      cublasDscal
+#define hypre_cublas_axpy                      cublasDaxpy
+#define hypre_cublas_dot                       cublasDdot
+#define hypre_cublas_gemv                      cublasDgemv
+#define hypre_cublas_getrfBatched              cublasDgetrfBatched
+#define hypre_cublas_getriBatched              cublasDgetriBatched
+
+/* cuSPARSE */
+#define hypre_cusparse_csru2csr_bufferSizeExt  cusparseDcsru2csr_bufferSizeExt
+#define hypre_cusparse_csru2csr                cusparseDcsru2csr
+#define hypre_cusparse_csrsv2_bufferSize       cusparseDcsrsv2_bufferSize
+#define hypre_cusparse_csrsv2_analysis         cusparseDcsrsv2_analysis
+#define hypre_cusparse_csrsv2_solve            cusparseDcsrsv2_solve
+#define hypre_cusparse_csrmv                   cusparseDcsrmv
+#define hypre_cusparse_csrgemm                 cusparseDcsrgemm
+#define hypre_cusparse_csr2csc                 cusparseDcsr2csc
+#define hypre_cusparse_csrilu02_bufferSize     cusparseDcsrilu02_bufferSize
+#define hypre_cusparse_csrilu02_analysis       cusparseDcsrilu02_analysis
+#define hypre_cusparse_csrilu02                cusparseDcsrilu02
+#define hypre_cusparse_csrsm2_bufferSizeExt    cusparseDcsrsm2_bufferSizeExt
+#define hypre_cusparse_csrsm2_analysis         cusparseDcsrsm2_analysis
+#define hypre_cusparse_csrsm2_solve            cusparseDcsrsm2_solve
+
+/* cuSOLVER */
+#define hypre_cusolver_dngetrf                 cusolverDnDgetrf
+#define hypre_cusolver_dngetrf_bs              cusolverDnDgetrf_bufferSize
+#define hypre_cusolver_dngetrs                 cusolverDnDgetrs
+
+#elif defined(HYPRE_USING_HIP)
+/* rocSPARSE */
+#define hypre_rocsparse_csrsv_buffer_size      rocsparse_dcsrsv_buffer_size
+#define hypre_rocsparse_csrsv_analysis         rocsparse_dcsrsv_analysis
+#define hypre_rocsparse_csrsv_solve            rocsparse_dcsrsv_solve
+#define hypre_rocsparse_gthr                   rocsparse_dgthr
+#define hypre_rocsparse_csrmv_analysis         rocsparse_dcsrmv_analysis
+#define hypre_rocsparse_csrmv                  rocsparse_dcsrmv
+#define hypre_rocsparse_csrgemm_buffer_size    rocsparse_dcsrgemm_buffer_size
+#define hypre_rocsparse_csrgemm                rocsparse_dcsrgemm
+#define hypre_rocsparse_csr2csc                rocsparse_dcsr2csc
+#define hypre_rocsparse_csrilu0_buffer_size    rocsparse_dcsrilu0_buffer_size
+#define hypre_rocsparse_csrilu0_analysis       rocsparse_dcsrilu0_analysis
+#define hypre_rocsparse_csrilu0                rocsparse_dcsrilu0
+#define hypre_rocsparse_csritilu0_compute      rocsparse_dcsritilu0_compute
+#define hypre_rocsparse_csritilu0_history      rocsparse_dcsritilu0_history
+
+/* rocSOLVER */
+
+/**************
+ * TODO (VPM) *
+ **************/
+
+#endif /* #if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)*/
+#endif /* #if defined(HYPRE_COMPLEX) || defined(HYPRE_SINGLE) || defined(HYPRE_LONG_DOUBLE) */
+
+#define HYPRE_CUBLAS_CALL(call) do {                                                         \
+   cublasStatus_t err = call;                                                                \
+   if (CUBLAS_STATUS_SUCCESS != err) {                                                       \
+      printf("CUBLAS ERROR (code = %d, %d) at %s:%d\n",                                      \
+            err, err == CUBLAS_STATUS_EXECUTION_FAILED, __FILE__, __LINE__);                 \
+      hypre_assert(0); exit(1);                                                              \
+   } } while(0)
+
+#define HYPRE_ROCBLAS_CALL(call) do {                                                        \
+   rocblas_status err = call;                                                                \
+   if (rocblas_status_success != err) {                                                      \
+      printf("rocBLAS ERROR (code = %d, %s) at %s:%d\n",                                     \
+             err, rocblas_status_to_string(err), __FILE__, __LINE__);                        \
+      hypre_assert(0); exit(1);                                                              \
+   } } while(0)
+
+#if CUSPARSE_VERSION >= 10300
+#define HYPRE_CUSPARSE_CALL(call) do {                                                       \
+   cusparseStatus_t err = call;                                                              \
+   if (CUSPARSE_STATUS_SUCCESS != err) {                                                     \
+      printf("CUSPARSE ERROR (code = %d, %s) at %s:%d\n",                                    \
+            err, cusparseGetErrorString(err), __FILE__, __LINE__);                           \
+      hypre_assert(0); exit(1);                                                              \
+   } } while(0)
+#else
+#define HYPRE_CUSPARSE_CALL(call) do {                                                       \
+   cusparseStatus_t err = call;                                                              \
+   if (CUSPARSE_STATUS_SUCCESS != err) {                                                     \
+      printf("CUSPARSE ERROR (code = %d) at %s:%d\n",                                        \
+            err, __FILE__, __LINE__);                                                        \
+      hypre_assert(0); exit(1);                                                              \
+   } } while(0)
+#endif
+
+#define HYPRE_ROCSPARSE_CALL(call) do {                                                      \
+   rocsparse_status err = call;                                                              \
+   if (rocsparse_status_success != err) {                                                    \
+      printf("rocSPARSE ERROR (code = %d) at %s:%d\n",                                       \
+            err, __FILE__, __LINE__);                                                        \
+      assert(0); exit(1);                                                                    \
+   } } while(0)
+
+#define HYPRE_CUSOLVER_CALL(call) do {                                                       \
+   cusolverStatus_t err = call;                                                              \
+   if (CUSOLVER_STATUS_SUCCESS != err) {                                                     \
+      printf("cuSOLVER ERROR (code = %d) at %s:%d\n",                                        \
+            err, __FILE__, __LINE__);                                                        \
+      hypre_assert(0);                                                                       \
+   } } while(0)
+
+#define HYPRE_ROCSOLVER_CALL(call) do {                                                      \
+   rocblas_status err = call;                                                                \
+   if (rocblas_status_success != err) {                                                      \
+      printf("rocSOLVER ERROR (code = %d, %s) at %s:%d\n",                                   \
+             err, rocblas_status_to_string(err), __FILE__, __LINE__);                        \
+   } } while(0)
+
+#define HYPRE_CURAND_CALL(call) do {                                                         \
+   curandStatus_t err = call;                                                                \
+   if (CURAND_STATUS_SUCCESS != err) {                                                       \
+      printf("CURAND ERROR (code = %d) at %s:%d\n", err, __FILE__, __LINE__);                \
+      hypre_assert(0); exit(1);                                                              \
+   } } while(0)
+
+#define HYPRE_ROCRAND_CALL(call) do {                                                        \
+   rocrand_status err = call;                                                                \
+   if (ROCRAND_STATUS_SUCCESS != err) {                                                      \
+      printf("ROCRAND ERROR (code = %d) at %s:%d\n", err, __FILE__, __LINE__);               \
+      hypre_assert(0); exit(1);                                                              \
+   } } while(0)
+
+#define HYPRE_ONEMKL_CALL(call)                                                              \
+   try                                                                                       \
+   {                                                                                         \
+      call;                                                                                  \
+   }                                                                                         \
+   catch (oneapi::mkl::exception const &ex)                                                  \
+   {                                                                                         \
+      hypre_printf("ONEMKL ERROR (code = %s) at %s:%d\n", ex.what(),                         \
+                   __FILE__, __LINE__);                                                      \
+      assert(0); exit(1);                                                                    \
+   }
+
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ *      macros for wrapping thrust/oneDPL calls for error reporting
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+/* RL: TODO Want macro HYPRE_THRUST_CALL to return value but I don't know how to do it right
+ * The following one works OK for now */
+
+#if defined(HYPRE_USING_CUDA)
+#define HYPRE_THRUST_CALL(func_name, ...) \
+   thrust::func_name(HYPRE_THRUST_EXECUTION(hypre_HandleDeviceAllocator(hypre_handle())).on(hypre_HandleComputeStream(hypre_handle())), __VA_ARGS__);
+#elif defined(HYPRE_USING_HIP)
+#define HYPRE_THRUST_CALL(func_name, ...) \
+   thrust::func_name(thrust::hip::par(hypre_HandleDeviceAllocator(hypre_handle())).on(hypre_HandleComputeStream(hypre_handle())), __VA_ARGS__);
+
+#elif defined(HYPRE_USING_SYCL)
+
+#define HYPRE_ONEDPL_CALL(func_name, ...)                                                    \
+  func_name(oneapi::dpl::execution::make_device_policy(                                      \
+           *hypre_HandleComputeStream(hypre_handle())), __VA_ARGS__);
+
+#define HYPRE_ONEDPL_CPU_CALL(func_name, ...)                                                \
+   func_name(oneapi::dpl::execution::make_device_policy(                                     \
+             *hypre_DeviceDataStream(hypre_HandleDeviceData(hypre_handle()), HYPRE_MAX_NUM_STREAMS - 1)), __VA_ARGS__);
+
+#endif
+
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ *      device info data structures
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+struct hypre_cub_CachingDeviceAllocator;
+typedef struct hypre_cub_CachingDeviceAllocator hypre_cub_CachingDeviceAllocator;
+
+#if defined(HYPRE_USING_CUSOLVER)
+typedef cusolverDnHandle_t vendorSolverHandle_t;
+#elif defined(HYPRE_USING_ROCSOLVER)
+typedef rocblas_handle     vendorSolverHandle_t;
+#endif
+
+struct hypre_DeviceData
+{
 #if defined(HYPRE_USING_CURAND)
-    curandGenerator_t curand_generator;
+   curandGenerator_t                 curand_generator;
 #endif
 
 #if defined(HYPRE_USING_ROCRAND)
-    rocrand_generator curand_generator;
+   rocrand_generator                 curand_generator;
 #endif
 
 #if defined(HYPRE_USING_CUBLAS)
-    cublasHandle_t cublas_handle;
+   cublasHandle_t                    cublas_handle;
 #endif
 
 #if defined(HYPRE_USING_CUSPARSE)
-    cusparseHandle_t cusparse_handle;
+   cusparseHandle_t                  cusparse_handle;
 #endif
 
 #if defined(HYPRE_USING_ROCSPARSE)
-    rocsparse_handle cusparse_handle;
+   rocsparse_handle                  cusparse_handle;
 #endif
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_DEVICE_OPENMP)
-    cudaStream_t cuda_streams[HYPRE_MAX_NUM_STREAMS];
+#if defined(HYPRE_USING_CUSOLVER) || defined(HYPRE_USING_ROCSOLVER)
+   vendorSolverHandle_t              vendor_solver_handle;
+#endif
+
+   /* TODO (VPM): Change to HYPRE_USING_GPU_STREAMS*/
+#if defined(HYPRE_USING_CUDA_STREAMS)
+#if defined(HYPRE_USING_CUDA)
+   cudaStream_t                      streams[HYPRE_MAX_NUM_STREAMS];
 #elif defined(HYPRE_USING_HIP)
-    hipStream_t cuda_streams[HYPRE_MAX_NUM_STREAMS];
+   hipStream_t                       streams[HYPRE_MAX_NUM_STREAMS];
+#elif defined(HYPRE_USING_SYCL)
+   sycl::queue*                      streams[HYPRE_MAX_NUM_STREAMS] = {NULL};
+#endif
 #endif
 
-#ifdef HYPRE_USING_DEVICE_POOL
-    hypre_uint cub_bin_growth;
-    hypre_uint cub_min_bin;
-    hypre_uint cub_max_bin;
-    size_t cub_max_cached_bytes;
-    hypre_cub_CachingDeviceAllocator *cub_dev_allocator;
-    hypre_cub_CachingDeviceAllocator *cub_uvm_allocator;
+#if defined(HYPRE_USING_DEVICE_POOL)
+   hypre_uint                        cub_bin_growth;
+   hypre_uint                        cub_min_bin;
+   hypre_uint                        cub_max_bin;
+   size_t                            cub_max_cached_bytes;
+   hypre_cub_CachingDeviceAllocator *cub_dev_allocator;
+   hypre_cub_CachingDeviceAllocator *cub_uvm_allocator;
 #endif
 
 #if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-    hypre_device_allocator device_allocator;
-#endif
-
-    HYPRE_Int cuda_device;
-    /* by default, hypre puts GPU computations in this stream
-    * Do not be confused with the default (null) CUDA stream */
-    HYPRE_Int cuda_compute_stream_num;
-    /* work space for hypre's CUDA reducer */
-    void *cuda_reduce_buffer;
-    /* the device buffers needed to do MPI communication for struct comm */
-    HYPRE_Complex *struct_comm_recv_buffer;
-    HYPRE_Complex *struct_comm_send_buffer;
-    HYPRE_Int struct_comm_recv_buffer_size;
-    HYPRE_Int struct_comm_send_buffer_size;
-    /* device spgemm options */
-    HYPRE_Int spgemm_use_cusparse;
-    HYPRE_Int spgemm_algorithm;
-    HYPRE_Int spgemm_rownnz_estimate_method;
-    HYPRE_Int spgemm_rownnz_estimate_nsamples;
-    float spgemm_rownnz_estimate_mult_factor;
-    char spgemm_hash_type;
-    /* PMIS */
-    HYPRE_Int use_gpu_rand;
+   hypre_device_allocator            device_allocator;
+#endif
+#if defined(HYPRE_USING_SYCL)
+   sycl::device                     *device;
+   HYPRE_Int                         device_max_work_group_size;
+#else
+   HYPRE_Int                         device;
+#endif
+   hypre_int                         device_max_shmem_per_block[3];
+   /* by default, hypre puts GPU computations in this stream
+    * Do not be confused with the default (null) stream */
+   HYPRE_Int                         compute_stream_num;
+   /* work space for hypre's device reducer */
+   void                             *reduce_buffer;
+   /* device spgemm options */
+   HYPRE_Int                         spgemm_algorithm;
+   HYPRE_Int                         spgemm_binned;
+   HYPRE_Int                         spgemm_num_bin;
+   /* the highest bins for symbl [0] and numer [1]
+    * which are not necessary to be `spgemm_num_bin' due to shmem limit on GPUs */
+   HYPRE_Int                         spgemm_highest_bin[2];
+   /* for bin i: ([0][i], [2][i]) = (max #block to launch, block dimension) for symbl
+    *            ([1][i], [3][i]) = (max #block to launch, block dimension) for numer */
+   HYPRE_Int                         spgemm_block_num_dim[4][HYPRE_SPGEMM_MAX_NBIN + 1];
+   HYPRE_Int                         spgemm_rownnz_estimate_method;
+   HYPRE_Int                         spgemm_rownnz_estimate_nsamples;
+   float                             spgemm_rownnz_estimate_mult_factor;
+   /* cusparse */
+   HYPRE_Int                         spmv_use_vendor;
+   HYPRE_Int                         sptrans_use_vendor;
+   HYPRE_Int                         spgemm_use_vendor;
+   /* PMIS RNG */
+   HYPRE_Int                         use_gpu_rand;
 };
 
-#define hypre_CudaDataCubBinGrowth(data) ((data)->cub_bin_growth)
-#define hypre_CudaDataCubMinBin(data) ((data)->cub_min_bin)
-#define hypre_CudaDataCubMaxBin(data) ((data)->cub_max_bin)
-#define hypre_CudaDataCubMaxCachedBytes(data) ((data)->cub_max_cached_bytes)
-#define hypre_CudaDataCubDevAllocator(data) ((data)->cub_dev_allocator)
-#define hypre_CudaDataCubUvmAllocator(data) ((data)->cub_uvm_allocator)
-#define hypre_CudaDataCudaDevice(data) ((data)->cuda_device)
-#define hypre_CudaDataCudaComputeStreamNum(data) ((data)->cuda_compute_stream_num)
-#define hypre_CudaDataCudaReduceBuffer(data) ((data)->cuda_reduce_buffer)
-#define hypre_CudaDataStructCommRecvBuffer(data) ((data)->struct_comm_recv_buffer)
-#define hypre_CudaDataStructCommSendBuffer(data) ((data)->struct_comm_send_buffer)
-#define hypre_CudaDataStructCommRecvBufferSize(data) ((data)->struct_comm_recv_buffer_size)
-#define hypre_CudaDataStructCommSendBufferSize(data) ((data)->struct_comm_send_buffer_size)
-#define hypre_CudaDataSpgemmUseCusparse(data) ((data)->spgemm_use_cusparse)
-#define hypre_CudaDataSpgemmAlgorithm(data) ((data)->spgemm_algorithm)
-#define hypre_CudaDataSpgemmRownnzEstimateMethod(data) ((data)->spgemm_rownnz_estimate_method)
-#define hypre_CudaDataSpgemmRownnzEstimateNsamples(data) ((data)->spgemm_rownnz_estimate_nsamples)
-#define hypre_CudaDataSpgemmRownnzEstimateMultFactor(data) ((data)->spgemm_rownnz_estimate_mult_factor)
-#define hypre_CudaDataSpgemmHashType(data) ((data)->spgemm_hash_type)
-#define hypre_CudaDataDeviceAllocator(data) ((data)->device_allocator)
-#define hypre_CudaDataUseGpuRand(data) ((data)->use_gpu_rand)
-
-hypre_CudaData *hypre_CudaDataCreate();
-void hypre_CudaDataDestroy(hypre_CudaData *data);
+#define hypre_DeviceDataCubBinGrowth(data)                   ((data) -> cub_bin_growth)
+#define hypre_DeviceDataCubMinBin(data)                      ((data) -> cub_min_bin)
+#define hypre_DeviceDataCubMaxBin(data)                      ((data) -> cub_max_bin)
+#define hypre_DeviceDataCubMaxCachedBytes(data)              ((data) -> cub_max_cached_bytes)
+#define hypre_DeviceDataCubDevAllocator(data)                ((data) -> cub_dev_allocator)
+#define hypre_DeviceDataCubUvmAllocator(data)                ((data) -> cub_uvm_allocator)
+#define hypre_DeviceDataDevice(data)                         ((data) -> device)
+#define hypre_DeviceDataDeviceMaxWorkGroupSize(data)         ((data) -> device_max_work_group_size)
+#define hypre_DeviceDataDeviceMaxShmemPerBlock(data)         ((data) -> device_max_shmem_per_block)
+#define hypre_DeviceDataDeviceMaxShmemPerBlockInited(data)  (((data) -> device_max_shmem_per_block)[2])
+#define hypre_DeviceDataComputeStreamNum(data)               ((data) -> compute_stream_num)
+#define hypre_DeviceDataReduceBuffer(data)                   ((data) -> reduce_buffer)
+#define hypre_DeviceDataSpgemmUseVendor(data)                ((data) -> spgemm_use_vendor)
+#define hypre_DeviceDataSpMVUseVendor(data)                  ((data) -> spmv_use_vendor)
+#define hypre_DeviceDataSpTransUseVendor(data)               ((data) -> sptrans_use_vendor)
+#define hypre_DeviceDataSpgemmAlgorithm(data)                ((data) -> spgemm_algorithm)
+#define hypre_DeviceDataSpgemmBinned(data)                   ((data) -> spgemm_binned)
+#define hypre_DeviceDataSpgemmNumBin(data)                   ((data) -> spgemm_num_bin)
+#define hypre_DeviceDataSpgemmHighestBin(data)               ((data) -> spgemm_highest_bin)
+#define hypre_DeviceDataSpgemmBlockNumDim(data)              ((data) -> spgemm_block_num_dim)
+#define hypre_DeviceDataSpgemmRownnzEstimateMethod(data)     ((data) -> spgemm_rownnz_estimate_method)
+#define hypre_DeviceDataSpgemmRownnzEstimateNsamples(data)   ((data) -> spgemm_rownnz_estimate_nsamples)
+#define hypre_DeviceDataSpgemmRownnzEstimateMultFactor(data) ((data) -> spgemm_rownnz_estimate_mult_factor)
+#define hypre_DeviceDataDeviceAllocator(data)                ((data) -> device_allocator)
+#define hypre_DeviceDataUseGpuRand(data)                     ((data) -> use_gpu_rand)
+
+hypre_DeviceData*     hypre_DeviceDataCreate();
+void                  hypre_DeviceDataDestroy(hypre_DeviceData* data);
 
 #if defined(HYPRE_USING_CURAND)
-curandGenerator_t hypre_CudaDataCurandGenerator(hypre_CudaData *data);
+curandGenerator_t     hypre_DeviceDataCurandGenerator(hypre_DeviceData *data);
 #endif
 
 #if defined(HYPRE_USING_ROCRAND)
-rocrand_generator hypre_CudaDataCurandGenerator(hypre_CudaData *data);
+rocrand_generator     hypre_DeviceDataCurandGenerator(hypre_DeviceData *data);
 #endif
 
 #if defined(HYPRE_USING_CUBLAS)
-cublasHandle_t hypre_CudaDataCublasHandle(hypre_CudaData *data);
+cublasHandle_t        hypre_DeviceDataCublasHandle(hypre_DeviceData *data);
 #endif
 
 #if defined(HYPRE_USING_CUSPARSE)
-cusparseHandle_t hypre_CudaDataCusparseHandle(hypre_CudaData *data);
+cusparseHandle_t      hypre_DeviceDataCusparseHandle(hypre_DeviceData *data);
 #endif
 
 #if defined(HYPRE_USING_ROCSPARSE)
-rocsparse_handle hypre_CudaDataCusparseHandle(hypre_CudaData *data);
+rocsparse_handle      hypre_DeviceDataCusparseHandle(hypre_DeviceData *data);
 #endif
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_DEVICE_OPENMP)
-cudaStream_t hypre_CudaDataCudaStream(hypre_CudaData *data, HYPRE_Int i);
-cudaStream_t hypre_CudaDataCudaComputeStream(hypre_CudaData *data);
+#if defined(HYPRE_USING_CUSOLVER) || defined(HYPRE_USING_ROCSOLVER)
+vendorSolverHandle_t  hypre_DeviceDataVendorSolverHandle(hypre_DeviceData *data);
+#endif
+
+/* TODO (VPM): Create a deviceStream_t to encapsulate all stream types below */
+#if defined(HYPRE_USING_CUDA)
+cudaStream_t          hypre_DeviceDataStream(hypre_DeviceData *data, HYPRE_Int i);
+cudaStream_t          hypre_DeviceDataComputeStream(hypre_DeviceData *data);
 #elif defined(HYPRE_USING_HIP)
-hipStream_t hypre_CudaDataCudaStream(hypre_CudaData *data, HYPRE_Int i);
-hipStream_t hypre_CudaDataCudaComputeStream(hypre_CudaData *data);
+hipStream_t           hypre_DeviceDataStream(hypre_DeviceData *data, HYPRE_Int i);
+hipStream_t           hypre_DeviceDataComputeStream(hypre_DeviceData *data);
+#elif defined(HYPRE_USING_SYCL)
+sycl::queue*          hypre_DeviceDataStream(hypre_DeviceData *data, HYPRE_Int i);
+sycl::queue*          hypre_DeviceDataComputeStream(hypre_DeviceData *data);
 #endif
 
-// Data structure and accessor routines for Cuda Sparse Triangular Matrices
-struct hypre_CsrsvData {
+/* Data structure and accessor routines for Sparse Triangular Matrices */
+struct hypre_CsrsvData
+{
 #if defined(HYPRE_USING_CUSPARSE)
-    csrsv2Info_t info_L;
-    csrsv2Info_t info_U;
+   hypre_cusparseSpSVDescr   info_L;
+   hypre_cusparseSpSVDescr   info_U;
+   cusparseSolvePolicy_t     analysis_policy;
+   cusparseSolvePolicy_t     solve_policy;
 #elif defined(HYPRE_USING_ROCSPARSE)
-    rocsparse_mat_info info_L;
-    rocsparse_mat_info info_U;
+   rocsparse_mat_info        info_L;
+   rocsparse_mat_info        info_U;
+   rocsparse_analysis_policy analysis_policy;
+   rocsparse_solve_policy    solve_policy;
 #endif
-    hypre_int BufferSize;
-    char *Buffer;
+
+#if defined(HYPRE_USING_CUSPARSE) && (CUSPARSE_VERSION >= CUSPARSE_SPSV_VERSION)
+   size_t                    buffer_size_L;
+   size_t                    buffer_size_U;
+   char                     *buffer_L;
+   char                     *buffer_U;
+#else
+   hypre_int                 buffer_size;
+   char                     *buffer;
+#endif
+
+   /* Temporary array to save matrix values with modified diagonal */
+   HYPRE_Complex            *mat_data;
+
+   /* Flags for checking whether the analysis phase has been executed or not */
+   HYPRE_Int                 analyzed_L;
+   HYPRE_Int                 analyzed_U;
 };
 
-#define hypre_CsrsvDataInfoL(data) ((data)->info_L)
-#define hypre_CsrsvDataInfoU(data) ((data)->info_U)
-#define hypre_CsrsvDataBufferSize(data) ((data)->BufferSize)
-#define hypre_CsrsvDataBuffer(data) ((data)->Buffer)
+#define hypre_CsrsvDataInfoL(data)          ((data) -> info_L)
+#define hypre_CsrsvDataInfoU(data)          ((data) -> info_U)
+#define hypre_CsrsvDataAnalyzedL(data)      ((data) -> analyzed_L)
+#define hypre_CsrsvDataAnalyzedU(data)      ((data) -> analyzed_U)
+#define hypre_CsrsvDataSolvePolicy(data)    ((data) -> solve_policy)
+#define hypre_CsrsvDataAnalysisPolicy(data) ((data) -> analysis_policy)
+#if defined(HYPRE_USING_CUSPARSE) && (CUSPARSE_VERSION >= CUSPARSE_SPSV_VERSION)
+#define hypre_CsrsvDataBufferSizeL(data)    ((data) -> buffer_size_L)
+#define hypre_CsrsvDataBufferSizeU(data)    ((data) -> buffer_size_U)
+#define hypre_CsrsvDataBufferL(data)        ((data) -> buffer_L)
+#define hypre_CsrsvDataBufferU(data)        ((data) -> buffer_U)
+#else
+#define hypre_CsrsvDataBufferSize(data)     ((data) -> buffer_size)
+#define hypre_CsrsvDataBuffer(data)         ((data) -> buffer)
+#endif
+#define hypre_CsrsvDataMatData(data)        ((data) -> mat_data)
 
-struct hypre_GpuMatData {
+struct hypre_GpuMatData
+{
 #if defined(HYPRE_USING_CUSPARSE)
-    cusparseMatDescr_t mat_descr;
-#endif
+   cusparseMatDescr_t                   mat_descr;
+   char                                *spmv_buffer;
 
-#if defined(HYPRE_USING_ROCSPARSE)
-    rocsparse_mat_descr mat_descr;
-    rocsparse_mat_info mat_info;
+#elif defined(HYPRE_USING_ROCSPARSE)
+   rocsparse_mat_descr                  mat_descr;
+   rocsparse_mat_info                   mat_info;
+
+#elif defined(HYPRE_USING_ONEMKLSPARSE)
+   oneapi::mkl::sparse::matrix_handle_t mat_handle;
 #endif
 };
 
-#define hypre_GpuMatDataMatDecsr(data) ((data)->mat_descr)
-#define hypre_GpuMatDataMatInfo(data) ((data)->mat_info)
+#define hypre_GpuMatDataMatDescr(data)    ((data) -> mat_descr)
+#define hypre_GpuMatDataMatInfo(data)     ((data) -> mat_info)
+#define hypre_GpuMatDataMatHandle(data)   ((data) -> mat_handle)
+#define hypre_GpuMatDataSpMVBuffer(data)  ((data) -> spmv_buffer)
 
-#endif//#if defined(HYPRE_USING_GPU)
+#endif /* if defined(HYPRE_USING_GPU) */
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ *      generic device functions (cuda/hip/sycl)
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#include <thrust/execution_policy.h>
-#if defined(HYPRE_USING_CUDA)
-#include <thrust/system/cuda/execution_policy.h>
-#elif defined(HYPRE_USING_HIP)
-#include <thrust/system/hip/execution_policy.h>
+#if defined(HYPRE_USING_GPU)
+template <typename T>
+static __device__ __forceinline__
+T read_only_load( const T *ptr )
+{
+#if defined(__CUDA_ARCH__) && __CUDA_ARCH__ >= 350
+   return __ldg( ptr );
+#else
+   return *ptr;
 #endif
-#include <thrust/adjacent_difference.h>
-#include <thrust/binary_search.h>
-#include <thrust/count.h>
-#include <thrust/device_ptr.h>
-#include <thrust/fill.h>
-#include <thrust/for_each.h>
-#include <thrust/functional.h>
-#include <thrust/gather.h>
-#include <thrust/inner_product.h>
-#include <thrust/iterator/constant_iterator.h>
-#include <thrust/iterator/counting_iterator.h>
-#include <thrust/iterator/zip_iterator.h>
-#include <thrust/logical.h>
-#include <thrust/replace.h>
-#include <thrust/scan.h>
-#include <thrust/sequence.h>
-#include <thrust/sort.h>
-#include <thrust/transform.h>
-#include <thrust/unique.h>
+}
 
-using namespace thrust::placeholders;
+static __device__ __forceinline__
+hypre_int next_power_of_2(hypre_int n)
+{
+   if (n <= 0)
+   {
+      return 0;
+   }
+
+   /* if n is power of 2, return itself */
+   if ( (n & (n - 1)) == 0 )
+   {
+      return n;
+   }
+
+   n |= (n >>  1);
+   n |= (n >>  2);
+   n |= (n >>  4);
+   n |= (n >>  8);
+   n |= (n >> 16);
+   n ^= (n >>  1);
+   n  = (n <<  1);
+
+   return n;
+}
+
+/* Flip n-th bit of bitmask (0 becomes 1. 1 becomes 0) */
+static __device__ __forceinline__
+hypre_mask hypre_mask_flip_at(hypre_mask bitmask, hypre_int n)
+{
+   return bitmask ^ (hypre_mask_one << n);
+}
+
+#endif // defined(HYPRE_USING_GPU)
 
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- * macro for launching CUDA kernels, CUDA, Thrust, Cusparse, Curand calls
- *                    NOTE: IN HYPRE'S DEFAULT STREAM
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- */
+ *      cuda/hip functions
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(HYPRE_DEBUG)
-#if defined(HYPRE_USING_CUDA)
-#define GPU_LAUNCH_SYNC                                                                                      \
-    {                                                                                                        \
-        hypre_SyncCudaComputeStream(hypre_handle());                                                         \
-        HYPRE_CUDA_CALL(cudaGetLastError());                                                                 \
-    }
-#elif defined(HYPRE_USING_HIP)
-#define GPU_LAUNCH_SYNC                                                                                      \
-    {                                                                                                        \
-        hypre_SyncCudaComputeStream(hypre_handle());                                                         \
-        HYPRE_HIP_CALL(hipGetLastError());                                                                   \
-    }
+#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+
+/* return the number of threads in block */
+template <hypre_int dim>
+static __device__ __forceinline__
+hypre_int hypre_gpu_get_num_threads(hypre_DeviceItem &item)
+{
+   switch (dim)
+   {
+      case 1:
+         return (blockDim.x);
+      case 2:
+         return (blockDim.x * blockDim.y);
+      case 3:
+         return (blockDim.x * blockDim.y * blockDim.z);
+   }
+
+   return -1;
+}
+
+/* return the flattened thread id in block */
+template <hypre_int dim>
+static __device__ __forceinline__
+hypre_int hypre_gpu_get_thread_id(hypre_DeviceItem &item)
+{
+   switch (dim)
+   {
+      case 1:
+         return (threadIdx.x);
+      case 2:
+         return (threadIdx.y * blockDim.x + threadIdx.x);
+      case 3:
+         return (threadIdx.z * blockDim.x * blockDim.y + threadIdx.y * blockDim.x +
+                 threadIdx.x);
+   }
+
+   return -1;
+}
+
+/* return the number of warps in block */
+template <hypre_int dim>
+static __device__ __forceinline__
+hypre_int hypre_gpu_get_num_warps(hypre_DeviceItem &item)
+{
+   return hypre_gpu_get_num_threads<dim>(item) >> HYPRE_WARP_BITSHIFT;
+}
+
+/* return the warp id in block */
+template <hypre_int dim>
+static __device__ __forceinline__
+hypre_int hypre_gpu_get_warp_id(hypre_DeviceItem &item)
+{
+   return hypre_gpu_get_thread_id<dim>(item) >> HYPRE_WARP_BITSHIFT;
+}
+
+/* return the thread lane id in warp */
+template <hypre_int dim>
+static __device__ __forceinline__
+hypre_int hypre_gpu_get_lane_id(hypre_DeviceItem &item)
+{
+   return hypre_gpu_get_thread_id<dim>(item) & (HYPRE_WARP_SIZE - 1);
+}
+
+/* return the num of blocks in grid */
+template <hypre_int dim>
+static __device__ __forceinline__
+hypre_int hypre_gpu_get_num_blocks()
+{
+   switch (dim)
+   {
+      case 1:
+         return (gridDim.x);
+      case 2:
+         return (gridDim.x * gridDim.y);
+      case 3:
+         return (gridDim.x * gridDim.y * gridDim.z);
+   }
+
+   return -1;
+}
+
+/* return the flattened block id in grid */
+template <hypre_int dim>
+static __device__ __forceinline__
+hypre_int hypre_gpu_get_block_id(hypre_DeviceItem &item)
+{
+   switch (dim)
+   {
+      case 1:
+         return (blockIdx.x);
+      case 2:
+         return (blockIdx.y * gridDim.x + blockIdx.x);
+      case 3:
+         return (blockIdx.z * gridDim.x * gridDim.y + blockIdx.y * gridDim.x +
+                 blockIdx.x);
+   }
+
+   return -1;
+}
+
+/* return the number of threads in grid */
+template <hypre_int bdim, hypre_int gdim>
+static __device__ __forceinline__
+hypre_int hypre_gpu_get_grid_num_threads(hypre_DeviceItem &item)
+{
+   return hypre_gpu_get_num_blocks<gdim>() * hypre_gpu_get_num_threads<bdim>(item);
+}
+
+/* return the flattened thread id in grid */
+template <hypre_int bdim, hypre_int gdim>
+static __device__ __forceinline__
+hypre_int hypre_gpu_get_grid_thread_id(hypre_DeviceItem &item)
+{
+   return hypre_gpu_get_block_id<gdim>(item) * hypre_gpu_get_num_threads<bdim>(item) +
+          hypre_gpu_get_thread_id<bdim>(item);
+}
+
+/* return the number of warps in grid */
+template <hypre_int bdim, hypre_int gdim>
+static __device__ __forceinline__
+hypre_int hypre_gpu_get_grid_num_warps(hypre_DeviceItem &item)
+{
+   return hypre_gpu_get_num_blocks<gdim>() * hypre_gpu_get_num_warps<bdim>(item);
+}
+
+/* return the flattened warp id in grid */
+template <hypre_int bdim, hypre_int gdim>
+static __device__ __forceinline__
+hypre_int hypre_gpu_get_grid_warp_id(hypre_DeviceItem &item)
+{
+   return hypre_gpu_get_block_id<gdim>(item) * hypre_gpu_get_num_warps<bdim>(item) +
+          hypre_gpu_get_warp_id<bdim>(item);
+}
+
+#if defined(__CUDA_ARCH__) && __CUDA_ARCH__ < 600
+static __device__ __forceinline__
+hypre_double atomicAdd(hypre_double* address, hypre_double val)
+{
+   hypre_ulonglongint* address_as_ull = (hypre_ulonglongint*) address;
+   hypre_ulonglongint old = *address_as_ull, assumed;
+
+   do
+   {
+      assumed = old;
+      old = atomicCAS(address_as_ull, assumed,
+                      __double_as_longlong(val +
+                                           __longlong_as_double(assumed)));
+
+      // Note: uses integer comparison to avoid hang in case of NaN (since NaN != NaN)
+   }
+   while (assumed != old);
+
+   return __longlong_as_double(old);
+}
 #endif
-#else// #if defined(HYPRE_DEBUG)
-#define GPU_LAUNCH_SYNC
-#endif// defined(HYPRE_DEBUG)
-
-#define HYPRE_CUDA_LAUNCH2(kernel_name, gridsize, blocksize, shmem_size, ...)                                                         \
-    {                                                                                                                                 \
-        if (gridsize.x == 0 || gridsize.y == 0 || gridsize.z == 0 || blocksize.x == 0 || blocksize.y == 0                             \
-            || blocksize.z == 0) {                                                                                                    \
-            /* printf("Warning %s %d: Zero CUDA grid/block (%d %d %d) (%d %d %d)\n",                                                \
-                 __FILE__, __LINE__,                                                                                          \
-                 gridsize.x, gridsize.y, gridsize.z, blocksize.x, blocksize.y, blocksize.z); */ \
-        } else {                                                                                                                      \
-            (kernel_name)<<<(gridsize), (blocksize), shmem_size,                                                                      \
-                            hypre_HandleCudaComputeStream(hypre_handle())>>>(__VA_ARGS__);                                            \
-            GPU_LAUNCH_SYNC;                                                                                                          \
-        }                                                                                                                             \
-    }
 
-#define HYPRE_CUDA_LAUNCH(kernel_name, gridsize, blocksize, ...)                                             \
-    HYPRE_CUDA_LAUNCH2(kernel_name, gridsize, blocksize, 0, __VA_ARGS__)
+// There are no *_sync functions in HIP
+#if defined(HYPRE_USING_HIP) || (CUDA_VERSION < 9000)
+
+template <typename T>
+static __device__ __forceinline__
+T __shfl_sync(hypre_mask mask, T val, hypre_int src_line, hypre_int width = HYPRE_WARP_SIZE)
+{
+   return __shfl(val, src_line, width);
+}
 
-/* RL: TODO Want macro HYPRE_THRUST_CALL to return value but I don't know how to do it right
- * The following one works OK for now */
+template <typename T>
+static __device__ __forceinline__
+T __shfl_up_sync(hypre_mask mask, T val, hypre_uint delta, hypre_int width = HYPRE_WARP_SIZE)
+{
+   return __shfl_up(val, delta, width);
+}
 
+template <typename T>
+static __device__ __forceinline__
+T __shfl_down_sync(hypre_mask mask, T val, hypre_uint delta, hypre_int width = HYPRE_WARP_SIZE)
+{
+   return __shfl_down(val, delta, width);
+}
+
+template <typename T>
+static __device__ __forceinline__
+T __shfl_xor_sync(hypre_mask mask, T val, hypre_int lanemask, hypre_int width = HYPRE_WARP_SIZE)
+{
+   return __shfl_xor(val, lanemask, width);
+}
+
+static __device__ __forceinline__
+void __syncwarp()
+{
+}
+
+#endif // #if defined(HYPRE_USING_HIP) || (CUDA_VERSION < 9000)
+
+static __device__ __forceinline__
+hypre_mask hypre_ballot_sync(hypre_DeviceItem &item, hypre_mask mask, hypre_int predicate)
+{
 #if defined(HYPRE_USING_CUDA)
-#define HYPRE_THRUST_CALL(func_name, ...)                                                                    \
-    thrust::func_name(thrust::cuda::par(hypre_HandleDeviceAllocator(hypre_handle()))                         \
-                              .on(hypre_HandleCudaComputeStream(hypre_handle())),                            \
-                      __VA_ARGS__);
-#elif defined(HYPRE_USING_HIP)
-#define HYPRE_THRUST_CALL(func_name, ...)                                                                    \
-    thrust::func_name(thrust::hip::par(hypre_HandleDeviceAllocator(hypre_handle()))                          \
-                              .on(hypre_HandleCudaComputeStream(hypre_handle())),                            \
-                      __VA_ARGS__);
+   return __ballot_sync(mask, predicate);
+#else
+   return __ballot(predicate);
+#endif
+}
+
+static __device__ __forceinline__
+HYPRE_Int hypre_popc(hypre_mask mask)
+{
+#if defined(HYPRE_USING_CUDA)
+   return (HYPRE_Int) __popc(mask);
+#else
+   return (HYPRE_Int) __popcll(mask);
 #endif
+}
+
+static __device__ __forceinline__
+HYPRE_Int hypre_ffs(hypre_mask mask)
+{
+#if defined(HYPRE_USING_CUDA)
+   return (HYPRE_Int) __ffs(mask);
+#else
+   return (HYPRE_Int) __ffsll(mask);
+#endif
+}
+
+#if defined(HYPRE_USING_HIP)
+static __device__ __forceinline__
+hypre_int __any_sync(unsigned mask, hypre_int predicate)
+{
+   return __any(predicate);
+}
+#endif
+
+/* sync the thread block */
+static __device__ __forceinline__
+void block_sync(hypre_DeviceItem &item)
+{
+   __syncthreads();
+}
+
+/* sync the warp */
+static __device__ __forceinline__
+void warp_sync(hypre_DeviceItem &item)
+{
+   __syncwarp();
+}
+
+/* exclusive prefix scan */
+template <typename T>
+static __device__ __forceinline__
+T warp_prefix_sum(hypre_DeviceItem &item, hypre_int lane_id, T in, T &all_sum)
+{
+#pragma unroll
+   for (hypre_int d = 2; d <= HYPRE_WARP_SIZE; d <<= 1)
+   {
+      T t = __shfl_up_sync(HYPRE_WARP_FULL_MASK, in, d >> 1);
+      if ( (lane_id & (d - 1)) == (d - 1) )
+      {
+         in += t;
+      }
+   }
+
+   all_sum = __shfl_sync(HYPRE_WARP_FULL_MASK, in, HYPRE_WARP_SIZE - 1);
+
+   if (lane_id == HYPRE_WARP_SIZE - 1)
+   {
+      in = 0;
+   }
+
+#pragma unroll
+   for (hypre_int d = HYPRE_WARP_SIZE >> 1; d > 0; d >>= 1)
+   {
+      T t = __shfl_xor_sync(HYPRE_WARP_FULL_MASK, in, d);
+
+      if ( (lane_id & (d - 1)) == (d - 1))
+      {
+         if ( (lane_id & ((d << 1) - 1)) == ((d << 1) - 1) )
+         {
+            in += t;
+         }
+         else
+         {
+            in = t;
+         }
+      }
+   }
+   return in;
+}
+
+static __device__ __forceinline__
+hypre_int warp_any_sync(hypre_DeviceItem &item, hypre_mask mask, hypre_int predicate)
+{
+   return __any_sync(mask, predicate);
+}
+
+template <typename T>
+static __device__ __forceinline__
+T warp_shuffle_sync(hypre_DeviceItem &item, hypre_mask mask, T val, hypre_int src_line,
+                    hypre_int width = HYPRE_WARP_SIZE)
+{
+   return __shfl_sync(mask, val, src_line, width);
+}
+
+template <typename T>
+static __device__ __forceinline__
+T warp_shuffle_up_sync(hypre_DeviceItem &item, hypre_mask mask, T val, hypre_uint delta,
+                       hypre_int width = HYPRE_WARP_SIZE)
+{
+   return __shfl_up_sync(mask, val, delta, width);
+}
+
+template <typename T>
+static __device__ __forceinline__
+T warp_shuffle_down_sync(hypre_DeviceItem &item, hypre_mask mask, T val, hypre_uint delta,
+                         hypre_int width = HYPRE_WARP_SIZE)
+{
+   return __shfl_down_sync(mask, val, delta, width);
+}
+
+template <typename T>
+static __device__ __forceinline__
+T warp_shuffle_xor_sync(hypre_DeviceItem &item, hypre_mask mask, T val, hypre_int lane_mask,
+                        hypre_int width = HYPRE_WARP_SIZE)
+{
+   return __shfl_xor_sync(mask, val, lane_mask, width);
+}
+
+template <typename T>
+static __device__ __forceinline__
+T warp_reduce_sum(hypre_DeviceItem &item, T in)
+{
+#pragma unroll
+   for (hypre_int d = HYPRE_WARP_SIZE >> 1; d > 0; d >>= 1)
+   {
+      in += __shfl_down_sync(HYPRE_WARP_FULL_MASK, in, d);
+   }
+   return in;
+}
+
+template <typename T>
+static __device__ __forceinline__
+T warp_allreduce_sum(hypre_DeviceItem &item, T in)
+{
+#pragma unroll
+   for (hypre_int d = HYPRE_WARP_SIZE >> 1; d > 0; d >>= 1)
+   {
+      in += __shfl_xor_sync(HYPRE_WARP_FULL_MASK, in, d);
+   }
+   return in;
+}
+
+template <typename T>
+static __device__ __forceinline__
+T warp_reduce_max(hypre_DeviceItem &item, T in)
+{
+#pragma unroll
+   for (hypre_int d = HYPRE_WARP_SIZE >> 1; d > 0; d >>= 1)
+   {
+      in = max(in, __shfl_down_sync(HYPRE_WARP_FULL_MASK, in, d));
+   }
+   return in;
+}
+
+template <typename T>
+static __device__ __forceinline__
+T warp_allreduce_max(hypre_DeviceItem &item, T in)
+{
+#pragma unroll
+   for (hypre_int d = HYPRE_WARP_SIZE >> 1; d > 0; d >>= 1)
+   {
+      in = max(in, __shfl_xor_sync(HYPRE_WARP_FULL_MASK, in, d));
+   }
+   return in;
+}
+
+template <typename T>
+static __device__ __forceinline__
+T warp_reduce_min(hypre_DeviceItem &item, T in)
+{
+#pragma unroll
+   for (hypre_int d = HYPRE_WARP_SIZE >> 1; d > 0; d >>= 1)
+   {
+      in = min(in, __shfl_down_sync(HYPRE_WARP_FULL_MASK, in, d));
+   }
+   return in;
+}
+
+template <typename T>
+static __device__ __forceinline__
+T warp_allreduce_min(hypre_DeviceItem &item, T in)
+{
+#pragma unroll
+   for (hypre_int d = HYPRE_WARP_SIZE >> 1; d > 0; d >>= 1)
+   {
+      in = min(in, __shfl_xor_sync(HYPRE_WARP_FULL_MASK, in, d));
+   }
+   return in;
+}
+
+template<typename T1, typename T2>
+#if (defined(THRUST_VERSION) && THRUST_VERSION < THRUST_VERSION_NOTFN)
+struct type_cast : public thrust::unary_function<T1, T2>
+#else
+struct type_cast
+#endif
+{
+   __host__ __device__ T2 operator()(const T1 &x) const
+   {
+      return (T2) x;
+   }
+};
+
+template<typename T>
+#if (defined(THRUST_VERSION) && THRUST_VERSION < THRUST_VERSION_NOTFN)
+struct absolute_value : public thrust::unary_function<T, T>
+#else
+struct absolute_value
+#endif
+{
+   __host__ __device__ T operator()(const T &x) const
+   {
+      return x < T(0) ? -x : x;
+   }
+};
+
+template<typename T1, typename T2>
+struct TupleComp2
+{
+   typedef thrust::tuple<T1, T2> Tuple;
+
+   __host__ __device__ bool operator()(const Tuple& t1, const Tuple& t2)
+   {
+      if (thrust::get<0>(t1) < thrust::get<0>(t2))
+      {
+         return true;
+      }
+      if (thrust::get<0>(t1) > thrust::get<0>(t2))
+      {
+         return false;
+      }
+      return hypre_abs(thrust::get<1>(t1)) > hypre_abs(thrust::get<1>(t2));
+   }
+};
+
+template<typename T1, typename T2>
+struct TupleComp3
+{
+   typedef thrust::tuple<T1, T2> Tuple;
+
+   __host__ __device__ bool operator()(const Tuple& t1, const Tuple& t2)
+   {
+      if (thrust::get<0>(t1) < thrust::get<0>(t2))
+      {
+         return true;
+      }
+      if (thrust::get<0>(t1) > thrust::get<0>(t2))
+      {
+         return false;
+      }
+      if (thrust::get<0>(t2) == thrust::get<1>(t2))
+      {
+         return false;
+      }
+      return thrust::get<0>(t1) == thrust::get<1>(t1) || thrust::get<1>(t1) < thrust::get<1>(t2);
+   }
+};
+
+template<typename T>
+#if (defined(THRUST_VERSION) && THRUST_VERSION < THRUST_VERSION_NOTFN)
+struct is_negative : public thrust::unary_function<T, bool>
+#else
+struct is_negative
+#endif
+{
+   __host__ __device__ bool operator()(const T &x)
+   {
+      return (x < 0);
+   }
+};
+
+template<typename T>
+#if (defined(THRUST_VERSION) && THRUST_VERSION < THRUST_VERSION_NOTFN)
+struct is_positive : public thrust::unary_function<T, bool>
+#else
+struct is_positive
+#endif
+{
+   __host__ __device__ bool operator()(const T &x)
+   {
+      return (x > 0);
+   }
+};
+
+template<typename T>
+#if (defined(THRUST_VERSION) && THRUST_VERSION < THRUST_VERSION_NOTFN)
+struct is_nonnegative : public thrust::unary_function<T, bool>
+#else
+struct is_nonnegative
+#endif
+{
+   __host__ __device__ bool operator()(const T &x)
+   {
+      return (x >= 0);
+   }
+};
+
+template<typename T>
+#if (defined(THRUST_VERSION) && THRUST_VERSION < THRUST_VERSION_NOTFN)
+struct in_range : public thrust::unary_function<T, bool>
+#else
+struct in_range
+#endif
+{
+   T low, up;
+
+   in_range(T low_, T up_) { low = low_; up = up_; }
+
+   __host__ __device__ bool operator()(const T &x)
+   {
+      return (x >= low && x <= up);
+   }
+};
+
+template<typename T>
+#if (defined(THRUST_VERSION) && THRUST_VERSION < THRUST_VERSION_NOTFN)
+struct out_of_range : public thrust::unary_function<T, bool>
+#else
+struct out_of_range
+#endif
+{
+   T low, up;
+
+   out_of_range(T low_, T up_) { low = low_; up = up_; }
+
+   __host__ __device__ bool operator()(const T &x)
+   {
+      return (x < low || x > up);
+   }
+};
+
+template<typename T>
+#if (defined(THRUST_VERSION) && THRUST_VERSION < THRUST_VERSION_NOTFN)
+struct less_than : public thrust::unary_function<T, bool>
+#else
+struct less_than
+#endif
+{
+   T val;
+
+   less_than(T val_) { val = val_; }
+
+   __host__ __device__ bool operator()(const T &x)
+   {
+      return (x < val);
+   }
+};
+
+template<typename T>
+#if (defined(THRUST_VERSION) && THRUST_VERSION < THRUST_VERSION_NOTFN)
+struct modulo : public thrust::unary_function<T, T>
+#else
+struct modulo
+#endif
+{
+   T val;
+
+   modulo(T val_) { val = val_; }
+
+   __host__ __device__ T operator()(const T &x)
+   {
+      return (x % val);
+   }
+};
+
+template<typename T>
+#if (defined(THRUST_VERSION) && THRUST_VERSION < THRUST_VERSION_NOTFN)
+struct equal : public thrust::unary_function<T, bool>
+#else
+struct equal
+#endif
+{
+   T val;
+
+   equal(T val_) { val = val_; }
+
+   __host__ __device__ bool operator()(const T &x)
+   {
+      return (x == val);
+   }
+};
+
+struct print_functor
+{
+   __host__ __device__ void operator()(HYPRE_Real val)
+   {
+      printf("%f\n", val);
+   }
+};
+
+#endif // defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ *      sycl functions
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#if defined(HYPRE_USING_SYCL)
 
 /* return the number of threads in block */
 template <hypre_int dim>
-static __device__ __forceinline__ hypre_int hypre_cuda_get_num_threads() {
-    switch (dim) {
-        case 1:
-            return (blockDim.x);
-        case 2:
-            return (blockDim.x * blockDim.y);
-        case 3:
-            return (blockDim.x * blockDim.y * blockDim.z);
-    }
-
-    return -1;
+static __device__ __forceinline__
+hypre_int hypre_gpu_get_num_threads(hypre_DeviceItem &item)
+{
+   return static_cast<hypre_int>(item.get_local_range().size());
 }
 
 /* return the flattened thread id in block */
 template <hypre_int dim>
-static __device__ __forceinline__ hypre_int hypre_cuda_get_thread_id() {
-    switch (dim) {
-        case 1:
-            return (threadIdx.x);
-        case 2:
-            return (threadIdx.y * blockDim.x + threadIdx.x);
-        case 3:
-            return (threadIdx.z * blockDim.x * blockDim.y + threadIdx.y * blockDim.x + threadIdx.x);
-    }
-
-    return -1;
+static __device__ __forceinline__
+hypre_int hypre_gpu_get_thread_id(hypre_DeviceItem &item)
+{
+   return static_cast<hypre_int>(item.get_local_linear_id());
 }
 
 /* return the number of warps in block */
 template <hypre_int dim>
-static __device__ __forceinline__ hypre_int hypre_cuda_get_num_warps() {
-    return hypre_cuda_get_num_threads<dim>() >> HYPRE_WARP_BITSHIFT;
+static __device__ __forceinline__
+hypre_int hypre_gpu_get_num_warps(hypre_DeviceItem &item)
+{
+   return hypre_gpu_get_num_threads<dim>(item) >> HYPRE_WARP_BITSHIFT;
 }
 
 /* return the warp id in block */
 template <hypre_int dim>
-static __device__ __forceinline__ hypre_int hypre_cuda_get_warp_id() {
-    return hypre_cuda_get_thread_id<dim>() >> HYPRE_WARP_BITSHIFT;
+static __device__ __forceinline__
+hypre_int hypre_gpu_get_warp_id(hypre_DeviceItem &item)
+{
+   return hypre_gpu_get_thread_id<dim>(item) >> HYPRE_WARP_BITSHIFT;
 }
 
 /* return the thread lane id in warp */
 template <hypre_int dim>
-static __device__ __forceinline__ hypre_int hypre_cuda_get_lane_id() {
-    return hypre_cuda_get_thread_id<dim>() & (HYPRE_WARP_SIZE - 1);
+static __device__ __forceinline__
+hypre_int hypre_gpu_get_lane_id(hypre_DeviceItem &item)
+{
+   return static_cast<hypre_int>(item.get_sub_group().get_local_linear_id());
 }
 
 /* return the num of blocks in grid */
 template <hypre_int dim>
-static __device__ __forceinline__ hypre_int hypre_cuda_get_num_blocks() {
-    switch (dim) {
-        case 1:
-            return (gridDim.x);
-        case 2:
-            return (gridDim.x * gridDim.y);
-        case 3:
-            return (gridDim.x * gridDim.y * gridDim.z);
-    }
-
-    return -1;
+static __device__ __forceinline__
+hypre_int hypre_gpu_get_num_blocks(hypre_DeviceItem &item)
+{
+   return static_cast<hypre_int>(item.get_group_range().size());
 }
 
 /* return the flattened block id in grid */
 template <hypre_int dim>
-static __device__ __forceinline__ hypre_int hypre_cuda_get_block_id() {
-    switch (dim) {
-        case 1:
-            return (blockIdx.x);
-        case 2:
-            return (blockIdx.y * gridDim.x + blockIdx.x);
-        case 3:
-            return (blockIdx.z * gridDim.x * gridDim.y + blockIdx.y * gridDim.x + blockIdx.x);
-    }
-
-    return -1;
+static __device__ __forceinline__
+hypre_int hypre_gpu_get_block_id(hypre_DeviceItem &item)
+{
+   return item.get_group_linear_id();
 }
 
 /* return the number of threads in grid */
 template <hypre_int bdim, hypre_int gdim>
-static __device__ __forceinline__ hypre_int hypre_cuda_get_grid_num_threads() {
-    return hypre_cuda_get_num_blocks<gdim>() * hypre_cuda_get_num_threads<bdim>();
+static __device__ __forceinline__
+hypre_int hypre_gpu_get_grid_num_threads(hypre_DeviceItem &item)
+{
+   return hypre_gpu_get_num_blocks<gdim>(item) * hypre_gpu_get_num_threads<bdim>(item);
 }
 
 /* return the flattened thread id in grid */
 template <hypre_int bdim, hypre_int gdim>
-static __device__ __forceinline__ hypre_int hypre_cuda_get_grid_thread_id() {
-    return hypre_cuda_get_block_id<gdim>() * hypre_cuda_get_num_threads<bdim>()
-           + hypre_cuda_get_thread_id<bdim>();
+static __device__ __forceinline__
+hypre_int hypre_gpu_get_grid_thread_id(hypre_DeviceItem &item)
+{
+   return hypre_gpu_get_block_id<gdim>(item) * hypre_gpu_get_num_threads<bdim>(item) +
+          hypre_gpu_get_thread_id<bdim>(item);
 }
 
 /* return the number of warps in grid */
 template <hypre_int bdim, hypre_int gdim>
-static __device__ __forceinline__ hypre_int hypre_cuda_get_grid_num_warps() {
-    return hypre_cuda_get_num_blocks<gdim>() * hypre_cuda_get_num_warps<bdim>();
+static __device__ __forceinline__
+hypre_int hypre_gpu_get_grid_num_warps(hypre_DeviceItem &item)
+{
+   return hypre_gpu_get_num_blocks<gdim>(item) * hypre_gpu_get_num_warps<bdim>(item);
 }
 
-/* return the flattened warp id in grid */
+/* return the flattened warp id in nd_range */
 template <hypre_int bdim, hypre_int gdim>
-static __device__ __forceinline__ hypre_int hypre_cuda_get_grid_warp_id() {
-    return hypre_cuda_get_block_id<gdim>() * hypre_cuda_get_num_warps<bdim>()
-           + hypre_cuda_get_warp_id<bdim>();
+static __device__ __forceinline__
+hypre_int hypre_gpu_get_grid_warp_id(hypre_DeviceItem &item)
+{
+   return hypre_gpu_get_block_id<gdim>(item) * hypre_gpu_get_num_warps<bdim>(item) +
+          hypre_gpu_get_warp_id<bdim>(item);
 }
 
-#if defined(__CUDA_ARCH__) && __CUDA_ARCH__ < 600
-static __device__ __forceinline__ hypre_double atomicAdd(hypre_double *address, hypre_double val) {
-    hypre_ulonglongint *address_as_ull = (hypre_ulonglongint *) address;
-    hypre_ulonglongint old = *address_as_ull, assumed;
+/* sync the thread block */
+static __device__ __forceinline__
+void block_sync(hypre_DeviceItem &item)
+{
+   sycl::group_barrier(item.get_group());
+}
 
-    do {
-        assumed = old;
-        old = atomicCAS(address_as_ull, assumed, __double_as_longlong(val + __longlong_as_double(assumed)));
+/* sync the warp */
+static __device__ __forceinline__
+void warp_sync(hypre_DeviceItem &item)
+{
+   sycl::group_barrier(item.get_sub_group());
+}
 
-        // Note: uses integer comparison to avoid hang in case of NaN (since NaN != NaN)
-    } while (assumed != old);
+/* exclusive prefix scan */
+template <typename T>
+static __device__ __forceinline__
+T warp_prefix_sum(hypre_DeviceItem &item, hypre_int lane_id, T in, T &all_sum)
+{
+#pragma unroll
+   for (hypre_int d = 2; d <= HYPRE_WARP_SIZE; d <<= 1)
+   {
+      T t = sycl::shift_group_right(item.get_sub_group(), in, d >> 1);
+      if ( (lane_id & (d - 1)) == (d - 1) )
+      {
+         in += t;
+      }
+   }
+
+   all_sum = sycl::group_broadcast(item.get_sub_group(), in, HYPRE_WARP_SIZE - 1);
+
+   if (lane_id == HYPRE_WARP_SIZE - 1)
+   {
+      in = 0;
+   }
 
-    return __longlong_as_double(old);
+#pragma unroll
+   for (hypre_int d = HYPRE_WARP_SIZE >> 1; d > 0; d >>= 1)
+   {
+      T t = sycl::permute_group_by_xor(item.get_sub_group(), in, d);
+
+      if ( (lane_id & (d - 1)) == (d - 1))
+      {
+         if ( (lane_id & ((d << 1) - 1)) == ((d << 1) - 1) )
+         {
+            in += t;
+         }
+         else
+         {
+            in = t;
+         }
+      }
+   }
+   return in;
 }
-#endif
 
-// There are no *_sync functions in HIP
-#if defined(HYPRE_USING_HIP) || (CUDA_VERSION < 9000)
+static __device__ __forceinline__
+hypre_mask hypre_ballot_sync(hypre_DeviceItem &item, hypre_mask mask, hypre_int predicate)
+{
+   return sycl::reduce_over_group(
+             item.get_sub_group(),
+             (mask & (0x1 << item.get_sub_group().get_local_linear_id())) &&
+             predicate ? (0x1 << item.get_sub_group().get_local_linear_id()) : 0,
+             sycl::ext::oneapi::plus<>());
+}
 
-template <typename T>
-static __device__ __forceinline__ T __shfl_sync(unsigned mask, T val, hypre_int src_line,
-                                                hypre_int width = HYPRE_WARP_SIZE) {
-    return __shfl(val, src_line, width);
+static __device__ __forceinline__
+HYPRE_Int hypre_popc(hypre_mask mask)
+{
+   return (HYPRE_Int) sycl::popcount(mask);
 }
 
-template <typename T>
-static __device__ __forceinline__ T __shfl_down_sync(unsigned mask, T val, unsigned delta,
-                                                     hypre_int width = HYPRE_WARP_SIZE) {
-    return __shfl_down(val, delta, width);
+static __device__ __forceinline__
+HYPRE_Int hypre_ffs(hypre_mask mask)
+{
+   return (HYPRE_Int)dpct::ffs<HYPRE_Int>(mask);
 }
 
-template <typename T>
-static __device__ __forceinline__ T __shfl_xor_sync(unsigned mask, T val, unsigned lanemask,
-                                                    hypre_int width = HYPRE_WARP_SIZE) {
-    return __shfl_xor(val, lanemask, width);
+static __device__ __forceinline__
+hypre_int warp_any_sync(hypre_DeviceItem &item, hypre_mask mask, hypre_int predicate)
+{
+   return sycl::any_of_group(item.get_sub_group(), predicate);
 }
 
 template <typename T>
-static __device__ __forceinline__ T __shfl_up_sync(unsigned mask, T val, unsigned delta,
-                                                   hypre_int width = HYPRE_WARP_SIZE) {
-    return __shfl_up(val, delta, width);
+static __device__ __forceinline__
+T warp_shuffle_sync(hypre_DeviceItem &item, hypre_mask mask, T val, hypre_int src_line)
+{
+   return sycl::group_broadcast(item.get_sub_group(), val, src_line);
 }
 
-static __device__ __forceinline__ void __syncwarp() {}
-
-#endif// #if defined(HYPRE_USING_HIP) || (CUDA_VERSION < 9000)
-
-// __any was technically deprecated in CUDA 7 so we don't bother
-// with this overload for CUDA, just for HIP.
-#if defined(HYPRE_USING_HIP)
-static __device__ __forceinline__ hypre_int __any_sync(unsigned mask, hypre_int predicate) {
-    return __any(predicate);
+template <typename T>
+static __device__ __forceinline__
+T warp_shuffle_sync(hypre_DeviceItem &item, hypre_mask mask, T val, hypre_int src_line,
+                    hypre_int width)
+{
+   hypre_int lane_id = hypre_gpu_get_lane_id<1>(item);
+   hypre_int group_start = (lane_id / width) * width;
+   hypre_int src_in_warp = group_start + (src_line % width);
+   return sycl::select_from_group(item.get_sub_group(), val, src_in_warp);
 }
-#endif
 
 template <typename T>
-static __device__ __forceinline__ T read_only_load(const T *ptr) {
-    return __ldg(ptr);
+static __device__ __forceinline__
+T warp_shuffle_up_sync(hypre_DeviceItem &item, hypre_mask mask, T val, hypre_uint delta)
+{
+   return sycl::shift_group_right(item.get_sub_group(), val, delta);
 }
 
-/* exclusive prefix scan */
 template <typename T>
-static __device__ __forceinline__ T warp_prefix_sum(hypre_int lane_id, T in, T &all_sum) {
-#pragma unroll
-    for (hypre_int d = 2; d <= HYPRE_WARP_SIZE; d <<= 1) {
-        T t = __shfl_up_sync(HYPRE_WARP_FULL_MASK, in, d >> 1);
-        if ((lane_id & (d - 1)) == (d - 1)) { in += t; }
-    }
-
-    all_sum = __shfl_sync(HYPRE_WARP_FULL_MASK, in, HYPRE_WARP_SIZE - 1);
-
-    if (lane_id == HYPRE_WARP_SIZE - 1) { in = 0; }
-
-#pragma unroll
-    for (hypre_int d = HYPRE_WARP_SIZE / 2; d > 0; d >>= 1) {
-        T t = __shfl_xor_sync(HYPRE_WARP_FULL_MASK, in, d);
-
-        if ((lane_id & (d - 1)) == (d - 1)) {
-            if ((lane_id & ((d << 1) - 1)) == ((d << 1) - 1)) {
-                in += t;
-            } else {
-                in = t;
-            }
-        }
-    }
-    return in;
+static __device__ __forceinline__
+T warp_shuffle_up_sync(hypre_DeviceItem &item, hypre_mask mask, T val, hypre_uint delta,
+                       hypre_int width)
+{
+   hypre_int lane_id = hypre_gpu_get_lane_id<1>(item);
+   hypre_int group_start = (lane_id / width) * width;
+   hypre_int src_in_warp = lane_id - delta >= group_start ? lane_id - delta : lane_id;
+   return sycl::select_from_group(item.get_sub_group(), val, src_in_warp);
 }
 
 template <typename T>
-static __device__ __forceinline__ T warp_reduce_sum(T in) {
-#pragma unroll
-    for (hypre_int d = HYPRE_WARP_SIZE / 2; d > 0; d >>= 1) {
-        in += __shfl_down_sync(HYPRE_WARP_FULL_MASK, in, d);
-    }
-    return in;
+static __device__ __forceinline__
+T warp_shuffle_down_sync(hypre_DeviceItem &item, hypre_mask mask, T val, hypre_uint delta)
+{
+   return sycl::shift_group_left(item.get_sub_group(), val, delta);
 }
 
 template <typename T>
-static __device__ __forceinline__ T warp_allreduce_sum(T in) {
-#pragma unroll
-    for (hypre_int d = HYPRE_WARP_SIZE / 2; d > 0; d >>= 1) {
-        in += __shfl_xor_sync(HYPRE_WARP_FULL_MASK, in, d);
-    }
-    return in;
+static __device__ __forceinline__
+T warp_shuffle_down_sync(hypre_DeviceItem &item, hypre_mask mask, T val, hypre_uint delta,
+                         hypre_int width)
+{
+   hypre_int lane_id = hypre_gpu_get_lane_id<1>(item);
+   hypre_int group_end = ((lane_id / width) + 1) * width - 1;
+   hypre_int src_in_warp = lane_id + delta <= group_end ? lane_id + delta : lane_id;
+   return sycl::select_from_group(item.get_sub_group(), val, src_in_warp);
 }
 
 template <typename T>
-static __device__ __forceinline__ T warp_reduce_max(T in) {
-#pragma unroll
-    for (hypre_int d = HYPRE_WARP_SIZE / 2; d > 0; d >>= 1) {
-        in = max(in, __shfl_down_sync(HYPRE_WARP_FULL_MASK, in, d));
-    }
-    return in;
+static __device__ __forceinline__
+T warp_shuffle_xor_sync(hypre_DeviceItem &item, hypre_mask mask, T val, hypre_int lane_mask)
+{
+   return sycl::permute_group_by_xor(item.get_sub_group(), val, lane_mask);
 }
 
 template <typename T>
-static __device__ __forceinline__ T warp_allreduce_max(T in) {
-#pragma unroll
-    for (hypre_int d = HYPRE_WARP_SIZE / 2; d > 0; d >>= 1) {
-        in = max(in, __shfl_xor_sync(HYPRE_WARP_FULL_MASK, in, d));
-    }
-    return in;
+static __device__ __forceinline__
+T warp_shuffle_xor_sync(hypre_DeviceItem &item, hypre_mask mask, T val, hypre_int lane_mask,
+                        hypre_int width)
+{
+   hypre_int lane_id = hypre_gpu_get_lane_id<1>(item);
+   hypre_int group_end = ((lane_id / width) + 1) * width - 1;
+   hypre_int src_in_warp = lane_id ^ lane_mask;
+   src_in_warp = src_in_warp > group_end ? lane_id : src_in_warp;
+   return sycl::select_from_group(item.get_sub_group(), val, src_in_warp);
 }
 
 template <typename T>
-static __device__ __forceinline__ T warp_reduce_min(T in) {
-#pragma unroll
-    for (hypre_int d = HYPRE_WARP_SIZE / 2; d > 0; d >>= 1) {
-        in = min(in, __shfl_down_sync(HYPRE_WARP_FULL_MASK, in, d));
-    }
-    return in;
+static __forceinline__
+T warp_reduce_sum(hypre_DeviceItem &item, T in)
+{
+   for (hypre_int d = HYPRE_WARP_SIZE >> 1; d > 0; d >>= 1)
+   {
+      in += sycl::shift_group_left(item.get_sub_group(), in, d);
+   }
+   return in;
 }
 
 template <typename T>
-static __device__ __forceinline__ T warp_allreduce_min(T in) {
-#pragma unroll
-    for (hypre_int d = HYPRE_WARP_SIZE / 2; d > 0; d >>= 1) {
-        in = min(in, __shfl_xor_sync(HYPRE_WARP_FULL_MASK, in, d));
-    }
-    return in;
+static __forceinline__
+T warp_allreduce_sum(hypre_DeviceItem &item, T in)
+{
+   for (hypre_int d = HYPRE_WARP_SIZE >> 1; d > 0; d >>= 1)
+   {
+      in += sycl::permute_group_by_xor(item.get_sub_group(), in, d);
+   }
+   return in;
 }
 
-static __device__ __forceinline__ hypre_int next_power_of_2(hypre_int n) {
-    if (n <= 0) { return 0; }
-
-    /* if n is power of 2, return itself */
-    if ((n & (n - 1)) == 0) { return n; }
+template <typename T>
+static __forceinline__
+T warp_reduce_max(hypre_DeviceItem &item, T in)
+{
+   for (hypre_int d = HYPRE_WARP_SIZE >> 1; d > 0; d >>= 1)
+   {
+      in = std::max(in, sycl::shift_group_left(item.get_sub_group(), in, d));
+   }
+   return in;
+}
 
-    n |= (n >> 1);
-    n |= (n >> 2);
-    n |= (n >> 4);
-    n |= (n >> 8);
-    n |= (n >> 16);
-    n ^= (n >> 1);
-    n = (n << 1);
+template <typename T>
+static __forceinline__
+T warp_allreduce_max(hypre_DeviceItem &item, T in)
+{
+   for (hypre_int d = HYPRE_WARP_SIZE >> 1; d > 0; d >>= 1)
+   {
+      in = std::max(in, sycl::permute_group_by_xor(item.get_sub_group(), in, d));
+   }
+   return in;
+}
 
-    return n;
+template <typename T>
+static __forceinline__
+T warp_reduce_min(hypre_DeviceItem &item, T in)
+{
+   for (hypre_int d = HYPRE_WARP_SIZE >> 1; d > 0; d >>= 1)
+   {
+      in = std::min(in, sycl::shift_group_left(item.get_sub_group(), in, d));
+   }
+   return in;
 }
 
 template <typename T>
-struct absolute_value : public thrust::unary_function<T, T> {
-    __host__ __device__ T operator()(const T &x) const { return x < T(0) ? -x : x; }
-};
+static __forceinline__
+T warp_allreduce_min(hypre_DeviceItem &item, T in)
+{
+   for (hypre_int d = HYPRE_WARP_SIZE >> 1; d > 0; d >>= 1)
+   {
+      in = std::min(in, sycl::permute_group_by_xor(item.get_sub_group(), in, d));
+   }
+   return in;
+}
 
-template <typename T1, typename T2>
-struct TupleComp2 {
-    typedef thrust::tuple<T1, T2> Tuple;
+template<typename T>
+struct is_negative
+{
+   is_negative() {}
 
-    __host__ __device__ bool operator()(const Tuple &t1, const Tuple &t2) {
-        if (thrust::get<0>(t1) < thrust::get<0>(t2)) { return true; }
-        if (thrust::get<0>(t1) > thrust::get<0>(t2)) { return false; }
-        return hypre_abs(thrust::get<1>(t1)) > hypre_abs(thrust::get<1>(t2));
-    }
+   constexpr bool operator()(const T &x = T()) const { return (x < 0); }
 };
 
-template <typename T1, typename T2>
-struct TupleComp3 {
-    typedef thrust::tuple<T1, T2> Tuple;
+template<typename T>
+struct is_positive
+{
+   is_positive() {}
 
-    __host__ __device__ bool operator()(const Tuple &t1, const Tuple &t2) {
-        if (thrust::get<0>(t1) < thrust::get<0>(t2)) { return true; }
-        if (thrust::get<0>(t1) > thrust::get<0>(t2)) { return false; }
-        if (thrust::get<0>(t2) == thrust::get<1>(t2)) { return false; }
-        return thrust::get<0>(t1) == thrust::get<1>(t1) || thrust::get<1>(t1) < thrust::get<1>(t2);
-    }
+   constexpr bool operator()(const T &x = T()) const { return (x > 0); }
 };
 
-template <typename T>
-struct is_negative : public thrust::unary_function<T, bool> {
-    __host__ __device__ bool operator()(const T &x) { return (x < 0); }
-};
+template<typename T>
+struct is_nonnegative
+{
+   is_nonnegative() {}
 
-template <typename T>
-struct is_positive : public thrust::unary_function<T, bool> {
-    __host__ __device__ bool operator()(const T &x) { return (x > 0); }
+   constexpr bool operator()(const T &x = T()) const { return (x >= 0); }
 };
 
-template <typename T>
-struct is_nonnegative : public thrust::unary_function<T, bool> {
-    __host__ __device__ bool operator()(const T &x) { return (x >= 0); }
-};
+template<typename T>
+struct in_range
+{
+   T low, high;
+   in_range(T low_ = T(), T high_ = T()) { low = low_; high = high_; }
 
-template <typename T>
-struct in_range : public thrust::unary_function<T, bool> {
-    T low, up;
+   constexpr bool operator()(const T &x) const { return (x >= low && x <= high); }
+};
 
-    in_range(T low_, T up_) {
-        low = low_;
-        up = up_;
-    }
+template<typename T>
+struct out_of_range
+{
+   T low, high;
+   out_of_range(T low_ = T(), T high_ = T()) { low = low_; high = high_; }
 
-    __host__ __device__ bool operator()(const T &x) { return (x >= low && x <= up); }
+   constexpr bool operator()(const T &x) const { return (x < low || x > high); }
 };
 
-template <typename T>
-struct out_of_range : public thrust::unary_function<T, bool> {
-    T low, up;
-
-    out_of_range(T low_, T up_) {
-        low = low_;
-        up = up_;
-    }
+template<typename T>
+struct less_than
+{
+   T val;
+   less_than(T val_ = T()) { val = val_; }
 
-    __host__ __device__ bool operator()(const T &x) { return (x < low || x > up); }
+   constexpr bool operator()(const T &x) const { return (x < val); }
 };
 
-template <typename T>
-struct less_than : public thrust::unary_function<T, bool> {
-    T val;
-
-    less_than(T val_) { val = val_; }
+template<typename T>
+struct modulo
+{
+   T val;
+   modulo(T val_ = T()) { val = val_; }
 
-    __host__ __device__ bool operator()(const T &x) { return (x < val); }
+   constexpr T operator()(const T &x) const { return (x % val); }
 };
 
-template <typename T>
-struct modulo : public thrust::unary_function<T, T> {
-    T val;
-
-    modulo(T val_) { val = val_; }
+template<typename T>
+struct equal
+{
+   T val;
+   equal(T val_ = T()) { val = val_; }
 
-    __host__ __device__ T operator()(const T &x) { return (x % val); }
+   constexpr bool operator()(const T &x) const { return (x == val); }
 };
 
-template <typename T>
-struct equal : public thrust::unary_function<T, bool> {
-    T val;
+template<typename T1, typename T2>
+struct type_cast
+{
+   constexpr T2 operator()(const T1 &x = T1()) const { return (T2) x; }
+};
 
-    equal(T val_) { val = val_; }
+template<typename T>
+struct absolute_value
+{
+   constexpr T operator()(const T &x) const { return x < T(0) ? -x : x; }
+};
 
-    __host__ __device__ bool operator()(const T &x) { return (x == val); }
+template<typename... T>
+struct TupleComp2
+{
+   typedef std::tuple<T...> Tuple;
+   bool operator()(const Tuple& t1, const Tuple& t2)
+   {
+      if (std::get<0>(t1) < std::get<0>(t2))
+      {
+         return true;
+      }
+      if (std::get<0>(t1) > std::get<0>(t2))
+      {
+         return false;
+      }
+      return hypre_abs(std::get<1>(t1)) > hypre_abs(std::get<1>(t2));
+   }
 };
 
-struct print_functor {
-    __host__ __device__ void operator()(HYPRE_Real val) { printf("%f\n", val); }
+template<typename... T>
+struct TupleComp3
+{
+   typedef std::tuple<T...> Tuple;
+   bool operator()(const Tuple& t1, const Tuple& t2)
+   {
+      if (std::get<0>(t1) < std::get<0>(t2))
+      {
+         return true;
+      }
+      if (std::get<0>(t1) > std::get<0>(t2))
+      {
+         return false;
+      }
+      if (std::get<0>(t2) == std::get<1>(t2))
+      {
+         return false;
+      }
+      return std::get<0>(t1) == std::get<1>(t1) || std::get<1>(t1) < std::get<1>(t2);
+   }
 };
 
-/* cuda_utils.c */
-dim3 hypre_GetDefaultCUDABlockDimension();
+#endif // #if defined(HYPRE_USING_SYCL)
+
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ *      end of functions defined here
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+/* device_utils.c */
+#if defined(HYPRE_USING_GPU)
+dim3 hypre_GetDefaultDeviceBlockDimension();
+
+dim3 hypre_GetDefaultDeviceGridDimension( HYPRE_Int n, const char *granularity, dim3 bDim );
 
-dim3 hypre_GetDefaultCUDAGridDimension(HYPRE_Int n, const char *granularity, dim3 bDim);
+dim3 hypre_dim3(HYPRE_Int x);
+dim3 hypre_dim3(HYPRE_Int x, HYPRE_Int y);
+dim3 hypre_dim3(HYPRE_Int x, HYPRE_Int y, HYPRE_Int z);
 
 template <typename T1, typename T2, typename T3>
-HYPRE_Int hypreDevice_StableSortByTupleKey(HYPRE_Int N, T1 *keys1, T2 *keys2, T3 *vals, HYPRE_Int opt);
+HYPRE_Int hypreDevice_StableSortByTupleKey(HYPRE_Int N, T1 *keys1, T2 *keys2,
+                                           T3 *vals, HYPRE_Int opt);
 
 template <typename T1, typename T2, typename T3, typename T4>
-HYPRE_Int hypreDevice_StableSortTupleByTupleKey(HYPRE_Int N, T1 *keys1, T2 *keys2, T3 *vals1, T4 *vals2,
-                                                HYPRE_Int opt);
+HYPRE_Int hypreDevice_StableSortTupleByTupleKey(HYPRE_Int N, T1 *keys1, T2 *keys2,
+                                                T3 *vals1, T4 *vals2, HYPRE_Int opt);
 
 template <typename T1, typename T2, typename T3>
-HYPRE_Int hypreDevice_ReduceByTupleKey(HYPRE_Int N, T1 *keys1_in, T2 *keys2_in, T3 *vals_in, T1 *keys1_out,
-                                       T2 *keys2_out, T3 *vals_out);
-
-template <typename T>
-HYPRE_Int hypreDevice_CsrRowPtrsToIndicesWithRowNum(HYPRE_Int nrows, HYPRE_Int nnz, HYPRE_Int *d_row_ptr,
-                                                    T *d_row_num, T *d_row_ind);
+HYPRE_Int hypreDevice_ReduceByTupleKey(HYPRE_Int N, T1 *keys1_in, T2 *keys2_in,
+                                       T3 *vals_in, T1 *keys1_out, T2 *keys2_out,
+                                       T3 *vals_out);
 
 template <typename T>
 HYPRE_Int hypreDevice_ScatterConstant(T *x, HYPRE_Int n, HYPRE_Int *map, T v);
 
-HYPRE_Int hypreDevice_GetRowNnz(HYPRE_Int nrows, HYPRE_Int *d_row_indices, HYPRE_Int *d_diag_ia,
-                                HYPRE_Int *d_offd_ia, HYPRE_Int *d_rownnz);
-
-HYPRE_Int hypreDevice_CopyParCSRRows(HYPRE_Int nrows, HYPRE_Int *d_row_indices, HYPRE_Int job,
-                                     HYPRE_Int has_offd, HYPRE_BigInt first_col,
-                                     HYPRE_BigInt *d_col_map_offd_A, HYPRE_Int *d_diag_i, HYPRE_Int *d_diag_j,
-                                     HYPRE_Complex *d_diag_a, HYPRE_Int *d_offd_i, HYPRE_Int *d_offd_j,
-                                     HYPRE_Complex *d_offd_a, HYPRE_Int *d_ib, HYPRE_BigInt *d_jb,
-                                     HYPRE_Complex *d_ab);
-
-HYPRE_Int hypreDevice_IntegerReduceSum(HYPRE_Int m, HYPRE_Int *d_i);
-
-HYPRE_Int hypreDevice_IntegerInclusiveScan(HYPRE_Int n, HYPRE_Int *d_i);
-
-HYPRE_Int hypreDevice_IntegerExclusiveScan(HYPRE_Int n, HYPRE_Int *d_i);
-
-HYPRE_Int *hypreDevice_CsrRowPtrsToIndices(HYPRE_Int nrows, HYPRE_Int nnz, HYPRE_Int *d_row_ptr);
+HYPRE_Int hypreDevice_GenScatterAdd(HYPRE_Real *x, HYPRE_Int ny, HYPRE_Int *map,
+                                    HYPRE_Real *y, char *work);
 
-HYPRE_Int hypreDevice_CsrRowPtrsToIndices_v2(HYPRE_Int nrows, HYPRE_Int nnz, HYPRE_Int *d_row_ptr,
-                                             HYPRE_Int *d_row_ind);
-
-HYPRE_Int *hypreDevice_CsrRowIndicesToPtrs(HYPRE_Int nrows, HYPRE_Int nnz, HYPRE_Int *d_row_ind);
-
-HYPRE_Int hypreDevice_CsrRowIndicesToPtrs_v2(HYPRE_Int nrows, HYPRE_Int nnz, HYPRE_Int *d_row_ind,
-                                             HYPRE_Int *d_row_ptr);
-
-HYPRE_Int hypreDevice_GenScatterAdd(HYPRE_Real *x, HYPRE_Int ny, HYPRE_Int *map, HYPRE_Real *y, char *work);
+template <typename T>
+HYPRE_Int hypreDevice_CsrRowPtrsToIndicesWithRowNum(HYPRE_Int nrows, HYPRE_Int nnz,
+                                                    HYPRE_Int *d_row_ptr, T *d_row_num, T *d_row_ind);
 
-HYPRE_Int hypreDevice_BigToSmallCopy(HYPRE_Int *tgt, const HYPRE_BigInt *src, HYPRE_Int size);
+#endif
 
-void hypre_CudaCompileFlagCheck();
+#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
 
 #if defined(HYPRE_USING_CUDA)
 cudaError_t hypre_CachingMallocDevice(void **ptr, size_t nbytes);
@@ -848,26 +2238,27 @@ cudaError_t hypre_CachingFreeDevice(void *ptr);
 cudaError_t hypre_CachingFreeManaged(void *ptr);
 #endif
 
-hypre_cub_CachingDeviceAllocator *
-hypre_CudaDataCubCachingAllocatorCreate(hypre_uint bin_growth, hypre_uint min_bin, hypre_uint max_bin,
-                                        size_t max_cached_bytes, bool skip_cleanup, bool debug,
-                                        bool use_managed_memory);
+hypre_cub_CachingDeviceAllocator * hypre_DeviceDataCubCachingAllocatorCreate(hypre_uint bin_growth,
+                                                                             hypre_uint min_bin, hypre_uint max_bin, size_t max_cached_bytes, bool skip_cleanup, bool debug,
+                                                                             bool use_managed_memory);
 
-void hypre_CudaDataCubCachingAllocatorDestroy(hypre_CudaData *data);
+void hypre_DeviceDataCubCachingAllocatorDestroy(hypre_DeviceData *data);
 
-#endif// #if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#endif // #if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
 
 #if defined(HYPRE_USING_CUSPARSE)
 
 cudaDataType hypre_HYPREComplexToCudaDataType();
 
+#if CUSPARSE_VERSION >= CUSPARSE_NEWAPI_VERSION
 cusparseIndexType_t hypre_HYPREIntToCusparseIndexType();
+#endif
 
-#endif// #if defined(HYPRE_USING_CUSPARSE)
+#endif // #if defined(HYPRE_USING_CUSPARSE)
 
 #endif /* #ifndef HYPRE_CUDA_UTILS_H */
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -881,203 +2272,285 @@ cusparseIndexType_t hypre_HYPREIntToCusparseIndexType();
 #if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
 #if !defined(HYPRE_USING_RAJA) && !defined(HYPRE_USING_KOKKOS)
 
-template <typename T>
-void OneBlockReduce(T *d_arr, HYPRE_Int N, T *h_out);
-
-struct HYPRE_double4 {
-    HYPRE_Real x, y, z, w;
-
-    __host__ __device__ HYPRE_double4() {}
-
-    __host__ __device__ HYPRE_double4(HYPRE_Real x1, HYPRE_Real x2, HYPRE_Real x3, HYPRE_Real x4) {
-        x = x1;
-        y = x2;
-        z = x3;
-        w = x4;
-    }
-
-    __host__ __device__ void operator=(HYPRE_Real val) { x = y = z = w = val; }
+template<typename T> void OneBlockReduce(T *d_arr, HYPRE_Int N, T *h_out);
+
+struct HYPRE_double4
+{
+   HYPRE_Real x, y, z, w;
+
+   __host__ __device__
+   HYPRE_double4() {}
+
+   __host__ __device__
+   HYPRE_double4(HYPRE_Real x1, HYPRE_Real x2, HYPRE_Real x3, HYPRE_Real x4)
+   {
+      x = x1;
+      y = x2;
+      z = x3;
+      w = x4;
+   }
+
+   __host__ __device__
+   void operator=(HYPRE_Real val)
+   {
+      x = y = z = w = val;
+   }
+
+   __host__ __device__
+   void operator+=(HYPRE_double4 rhs)
+   {
+      x += rhs.x;
+      y += rhs.y;
+      z += rhs.z;
+      w += rhs.w;
+   }
 
-    __host__ __device__ void operator+=(HYPRE_double4 rhs) {
-        x += rhs.x;
-        y += rhs.y;
-        z += rhs.z;
-        w += rhs.w;
-    }
 };
 
-struct HYPRE_double6 {
-    HYPRE_Real x, y, z, w, u, v;
-
-    __host__ __device__ HYPRE_double6() {}
-
-    __host__ __device__ HYPRE_double6(HYPRE_Real x1, HYPRE_Real x2, HYPRE_Real x3, HYPRE_Real x4,
-                                      HYPRE_Real x5, HYPRE_Real x6) {
-        x = x1;
-        y = x2;
-        z = x3;
-        w = x4;
-        u = x5;
-        v = x6;
-    }
-
-    __host__ __device__ void operator=(HYPRE_Real val) { x = y = z = w = u = v = val; }
+struct HYPRE_double6
+{
+   HYPRE_Real x, y, z, w, u, v;
+
+   __host__ __device__
+   HYPRE_double6() {}
+
+   __host__ __device__
+   HYPRE_double6(HYPRE_Real x1, HYPRE_Real x2, HYPRE_Real x3, HYPRE_Real x4,
+                 HYPRE_Real x5, HYPRE_Real x6)
+   {
+      x = x1;
+      y = x2;
+      z = x3;
+      w = x4;
+      u = x5;
+      v = x6;
+   }
+
+   __host__ __device__
+   void operator=(HYPRE_Real val)
+   {
+      x = y = z = w = u = v = val;
+   }
+
+   __host__ __device__
+   void operator+=(HYPRE_double6 rhs)
+   {
+      x += rhs.x;
+      y += rhs.y;
+      z += rhs.z;
+      w += rhs.w;
+      u += rhs.u;
+      v += rhs.v;
+   }
 
-    __host__ __device__ void operator+=(HYPRE_double6 rhs) {
-        x += rhs.x;
-        y += rhs.y;
-        z += rhs.z;
-        w += rhs.w;
-        u += rhs.u;
-        v += rhs.v;
-    }
 };
 
 /* reduction within a warp */
-__inline__ __host__ __device__ HYPRE_Real warpReduceSum(HYPRE_Real val) {
+__inline__ __host__ __device__
+HYPRE_Real warpReduceSum(HYPRE_Real val)
+{
 #if defined(__CUDA_ARCH__) || defined(__HIP_DEVICE_COMPILE__)
-    for (HYPRE_Int offset = warpSize / 2; offset > 0; offset /= 2) {
-        val += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val, offset);
-    }
+   for (HYPRE_Int offset = warpSize / 2; offset > 0; offset /= 2)
+   {
+      val += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val, offset);
+   }
 #endif
-    return val;
+   return val;
 }
 
-__inline__ __host__ __device__ HYPRE_double4 warpReduceSum(HYPRE_double4 val) {
+__inline__ __host__ __device__
+HYPRE_double4 warpReduceSum(HYPRE_double4 val)
+{
 #if defined(__CUDA_ARCH__) || defined(__HIP_DEVICE_COMPILE__)
-    for (HYPRE_Int offset = warpSize / 2; offset > 0; offset /= 2) {
-        val.x += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.x, offset);
-        val.y += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.y, offset);
-        val.z += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.z, offset);
-        val.w += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.w, offset);
-    }
+   for (HYPRE_Int offset = warpSize / 2; offset > 0; offset /= 2)
+   {
+      val.x += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.x, offset);
+      val.y += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.y, offset);
+      val.z += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.z, offset);
+      val.w += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.w, offset);
+   }
 #endif
-    return val;
+   return val;
 }
 
-__inline__ __host__ __device__ HYPRE_double6 warpReduceSum(HYPRE_double6 val) {
+__inline__ __host__ __device__
+HYPRE_double6 warpReduceSum(HYPRE_double6 val)
+{
 #if defined(__CUDA_ARCH__) || defined(__HIP_DEVICE_COMPILE__)
-    for (HYPRE_Int offset = warpSize / 2; offset > 0; offset /= 2) {
-        val.x += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.x, offset);
-        val.y += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.y, offset);
-        val.z += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.z, offset);
-        val.w += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.w, offset);
-        val.u += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.u, offset);
-        val.v += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.v, offset);
-    }
+   for (HYPRE_Int offset = warpSize / 2; offset > 0; offset /= 2)
+   {
+      val.x += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.x, offset);
+      val.y += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.y, offset);
+      val.z += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.z, offset);
+      val.w += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.w, offset);
+      val.u += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.u, offset);
+      val.v += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.v, offset);
+   }
 #endif
-    return val;
+   return val;
 }
 
 /* reduction within a block */
 template <typename T>
-__inline__ __host__ __device__ T blockReduceSum(T val) {
+__inline__ __host__ __device__
+T blockReduceSum(T val)
+{
 #if defined(__CUDA_ARCH__) || defined(__HIP_DEVICE_COMPILE__)
-    //static __shared__ T shared[HYPRE_WARP_SIZE]; // Shared mem for HYPRE_WARP_SIZE partial sums
-
-    __shared__ T shared[HYPRE_WARP_SIZE];// Shared mem for HYPRE_WARP_SIZE partial sums
-
-    //HYPRE_Int lane = threadIdx.x % warpSize;
-    //HYPRE_Int wid  = threadIdx.x / warpSize;
-    HYPRE_Int lane = threadIdx.x & (warpSize - 1);
-    HYPRE_Int wid = threadIdx.x >> HYPRE_WARP_BITSHIFT;
+   // Shared mem for HYPRE_WARP_SIZE partial sums
+   __shared__ T shared[HYPRE_WARP_SIZE];
+
+   HYPRE_Int lane = threadIdx.x & (warpSize - 1);
+   HYPRE_Int wid  = threadIdx.x >> HYPRE_WARP_BITSHIFT;
+
+   // Each warp performs partial reduction
+   val = warpReduceSum(val);
+
+   // Write reduced value to shared memory
+   if (lane == 0)
+   {
+      shared[wid] = val;
+   }
+
+   // Wait for all partial reductions
+   __syncthreads();
+
+   // read from shared memory only if that warp existed
+   if (threadIdx.x < (blockDim.x >> HYPRE_WARP_BITSHIFT))
+   {
+      val = shared[lane];
+   }
+   else
+   {
+      val = 0.0;
+   }
+
+   // Final reduce within first warp
+   if (wid == 0)
+   {
+      val = warpReduceSum(val);
+   }
 
-    val = warpReduceSum(val);// Each warp performs partial reduction
-
-    if (lane == 0) {
-        shared[wid] = val;// Write reduced value to shared memory
-    }
+#endif
+   return val;
+}
 
-    __syncthreads();// Wait for all partial reductions
+template<typename T>
+__global__ void
+OneBlockReduceKernel(hypre_DeviceItem &item,
+                     T                *arr,
+                     HYPRE_Int         N)
+{
+   T sum;
 
-    //read from shared memory only if that warp existed
-    if (threadIdx.x < blockDim.x / warpSize) {
-        val = shared[lane];
-    } else {
-        val = 0.0;
-    }
+   sum = 0.0;
 
-    if (wid == 0) {
-        val = warpReduceSum(val);//Final reduce within first warp
-    }
+   if (threadIdx.x < N)
+   {
+      sum = arr[threadIdx.x];
+   }
 
-#endif
-    return val;
-}
+   sum = blockReduceSum(sum);
 
-template <typename T>
-__global__ void OneBlockReduceKernel(T *arr, HYPRE_Int N) {
-    T sum;
-    sum = 0.0;
-    if (threadIdx.x < N) { sum = arr[threadIdx.x]; }
-    sum = blockReduceSum(sum);
-    if (threadIdx.x == 0) { arr[0] = sum; }
+   if (threadIdx.x == 0)
+   {
+      arr[0] = sum;
+   }
 }
 
 /* Reducer class */
 template <typename T>
-struct ReduceSum {
-    using value_type = T;
+struct ReduceSum
+{
+   using value_type = T;
 
-    T init;                 /* initial value passed in */
-    mutable T __thread_sum; /* place to hold local sum of a thread,
+   T init;                    /* initial value passed in */
+   mutable T __thread_sum;    /* place to hold local sum of a thread,
                                  and partial sum of a block */
-    T *d_buf;               /* place to store partial sum within blocks
+   T *d_buf;                  /* place to store partial sum within blocks
                                  in the 1st round, used in the 2nd round */
-    HYPRE_Int nblocks;      /* number of blocks used in the 1st round */
+   HYPRE_Int nblocks;         /* number of blocks used in the 1st round */
 
-    /* constructor
+   /* constructor
     * val is the initial value (added to the reduced sum) */
-    __host__ ReduceSum(T val) {
-        init = val;
-        __thread_sum = 0.0;
-        nblocks = -1;
-
-        if (hypre_HandleCudaReduceBuffer(hypre_handle()) == NULL) {
-            /* allocate for the max size for reducing double6 type */
-            hypre_HandleCudaReduceBuffer(hypre_handle())
-                    = hypre_TAlloc(HYPRE_double6, 1024, HYPRE_MEMORY_DEVICE);
-        }
-
-        d_buf = (T *) hypre_HandleCudaReduceBuffer(hypre_handle());
-    }
-
-    /* copy constructor */
-    __host__ __device__ ReduceSum(const ReduceSum<T> &other) { *this = other; }
-
-    /* reduction within blocks */
-    __host__ __device__ void BlockReduce() const {
+   __host__
+   ReduceSum(T val)
+   {
+      init = val;
+      __thread_sum = 0.0;
+      nblocks = -1;
+   }
+
+   /* copy constructor */
+   __host__ __device__
+   ReduceSum(const ReduceSum<T>& other)
+   {
+      *this = other;
+   }
+
+   __host__ void
+   Allocate2ndPhaseBuffer()
+   {
+      if (hypre_HandleReduceBuffer(hypre_handle()) == NULL)
+      {
+         /* allocate for the max size for reducing double6 type */
+         hypre_HandleReduceBuffer(hypre_handle()) =
+            hypre_TAlloc(HYPRE_double6, HYPRE_MAX_NTHREADS_BLOCK, HYPRE_MEMORY_DEVICE);
+      }
+
+      d_buf = (T*) hypre_HandleReduceBuffer(hypre_handle());
+   }
+
+   /* reduction within blocks */
+   __host__ __device__
+   void BlockReduce() const
+   {
 #if defined(__CUDA_ARCH__) || defined(__HIP_DEVICE_COMPILE__)
-        __thread_sum = blockReduceSum(__thread_sum);
-        if (threadIdx.x == 0) { d_buf[blockIdx.x] = __thread_sum; }
+      __thread_sum = blockReduceSum(__thread_sum);
+      if (threadIdx.x == 0)
+      {
+         d_buf[blockIdx.x] = __thread_sum;
+      }
 #endif
-    }
-
-    __host__ __device__ void operator+=(T val) const { __thread_sum += val; }
-
-    /* invoke the 2nd reduction at the time want the sum from the reducer */
-    __host__ operator T() {
-        T val;
-
-        HYPRE_ExecutionPolicy exec_policy = hypre_HandleStructExecPolicy(hypre_handle());
-
-        if (exec_policy == HYPRE_EXEC_HOST) {
-            val = __thread_sum;
-            val += init;
-        } else {
-            /* 2nd reduction with only *one* block */
-            hypre_assert(nblocks >= 0 && nblocks <= 1024);
-            const dim3 gDim(1), bDim(1024);
-            HYPRE_CUDA_LAUNCH(OneBlockReduceKernel, gDim, bDim, d_buf, nblocks);
-            hypre_TMemcpy(&val, d_buf, T, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
-            val += init;
-        }
-
-        return val;
-    }
-
-    /* destructor */
-    __host__ __device__ ~ReduceSum<T>() {}
+   }
+
+   __host__ __device__
+   void operator+=(T val) const
+   {
+      __thread_sum += val;
+   }
+
+   /* invoke the 2nd reduction at the time want the sum from the reducer */
+   __host__
+   operator T()
+   {
+      T val;
+
+      const HYPRE_MemoryLocation memory_location = hypre_HandleMemoryLocation(hypre_handle());
+      const HYPRE_ExecutionPolicy exec_policy = hypre_GetExecPolicy1(memory_location);
+
+      if (exec_policy == HYPRE_EXEC_HOST)
+      {
+         val = __thread_sum;
+         val += init;
+      }
+      else
+      {
+         /* 2nd reduction with only *one* block */
+         hypre_assert(nblocks >= 0 && nblocks <= HYPRE_MAX_NTHREADS_BLOCK);
+         const dim3 gDim(1), bDim(HYPRE_MAX_NTHREADS_BLOCK);
+         HYPRE_GPU_LAUNCH( OneBlockReduceKernel, gDim, bDim, d_buf, nblocks );
+         hypre_TMemcpy(&val, d_buf, T, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
+         val += init;
+      }
+
+      return val;
+   }
+
+   /* destructor */
+   __host__ __device__
+   ~ReduceSum<T>()
+   {
+   }
 };
 
 #endif /* #if !defined(HYPRE_USING_RAJA) && !defined(HYPRE_USING_KOKKOS) */
@@ -1121,27 +2594,27 @@ struct ReduceSum {
 
 #if defined(HYPRE_USING_CUDA) && defined(HYPRE_USING_DEVICE_POOL)
 
-#include <map>
 #include <set>
+#include <map>
 
 #if (__cplusplus > 199711L) || (defined(_MSC_VER) && _MSC_VER >= 1800)
-#include <mutex>
+    #include <mutex>
 #else
-#if defined(_WIN32) || defined(_WIN64)
-#include <intrin.h>
+    #if defined(_WIN32) || defined(_WIN64)
+        #include <intrin.h>
 
-#define WIN32_LEAN_AND_MEAN
-#define NOMINMAX
-#include <windows.h>
-#undef WIN32_LEAN_AND_MEAN
-#undef NOMINMAX
+        #define WIN32_LEAN_AND_MEAN
+        #define NOMINMAX
+        #include <windows.h>
+        #undef WIN32_LEAN_AND_MEAN
+        #undef NOMINMAX
 
-/**
+        /**
          * Compiler read/write barrier
          */
-#pragma intrinsic(_ReadWriteBarrier)
+        #pragma intrinsic(_ReadWriteBarrier)
 
-#endif
+    #endif
 #endif
 
 /**
@@ -1149,78 +2622,98 @@ struct ReduceSum {
  *   - Wraps std::mutex when compiled with C++11 or newer (supported on all platforms)
  *   - Uses GNU/Windows spinlock mechanisms for pre C++11 (supported on x86/x64 when compiled with cl.exe or g++)
  */
-struct hypre_cub_Mutex {
+struct hypre_cub_Mutex
+{
 #if (__cplusplus > 199711L) || (defined(_MSC_VER) && _MSC_VER >= 1800)
 
     std::mutex mtx;
 
-    void Lock() { mtx.lock(); }
+    void Lock()
+    {
+        mtx.lock();
+    }
 
-    void Unlock() { mtx.unlock(); }
+    void Unlock()
+    {
+        mtx.unlock();
+    }
 
-    void TryLock() { mtx.try_lock(); }
+    void TryLock()
+    {
+        mtx.try_lock();
+    }
 
-#else//__cplusplus > 199711L
+#else       //__cplusplus > 199711L
 
-#if defined(_MSC_VER)
+    #if defined(_MSC_VER)
 
-    // Microsoft VC++
-    typedef hypre_longint Spinlock;
+        // Microsoft VC++
+        typedef hypre_longint Spinlock;
 
-#else
+    #else
 
-    // GNU g++
-    typedef hypre_int Spinlock;
+        // GNU g++
+        typedef hypre_int Spinlock;
 
-    /**
+        /**
          * Compiler read/write barrier
          */
-    __forceinline__ void _ReadWriteBarrier() { __sync_synchronize(); }
+        __forceinline__ void _ReadWriteBarrier()
+        {
+            __sync_synchronize();
+        }
 
-    /**
+        /**
          * Atomic exchange
          */
-    __forceinline__ hypre_longint _InterlockedExchange(volatile hypre_int *const Target,
-                                                       const hypre_int Value) {
-        // NOTE: __sync_lock_test_and_set would be an acquire barrier, so we force a full barrier
-        _ReadWriteBarrier();
-        return __sync_lock_test_and_set(Target, Value);
-    }
+        __forceinline__ hypre_longint _InterlockedExchange(volatile hypre_int * const Target, const hypre_int Value)
+        {
+            // NOTE: __sync_lock_test_and_set would be an acquire barrier, so we force a full barrier
+            _ReadWriteBarrier();
+            return __sync_lock_test_and_set(Target, Value);
+        }
 
-    /**
+        /**
          * Pause instruction to prevent excess processor bus usage
          */
-    __forceinline__ void YieldProcessor() {}
+        __forceinline__ void YieldProcessor()
+        {
+        }
 
-#endif// defined(_MSC_VER)
+    #endif  // defined(_MSC_VER)
 
-    /// Lock member
-    volatile Spinlock lock;
+        /// Lock member
+        volatile Spinlock lock;
 
-    /**
+        /**
          * Constructor
          */
-    hypre_cub_Mutex() : lock(0) {}
+        hypre_cub_Mutex() : lock(0) {}
 
-    /**
+        /**
          * Return when the specified spinlock has been acquired
          */
-    __forceinline__ void Lock() {
-        while (1) {
-            if (!_InterlockedExchange(&lock, 1)) return;
-            while (lock) YieldProcessor();
+        __forceinline__ void Lock()
+        {
+            while (1)
+            {
+                if (!_InterlockedExchange(&lock, 1)) return;
+                while (lock) YieldProcessor();
+            }
         }
-    }
 
-    /**
+
+        /**
          * Release the specified spinlock
          */
-    __forceinline__ void Unlock() {
-        _ReadWriteBarrier();
-        lock = 0;
-    }
+        __forceinline__ void Unlock()
+        {
+            _ReadWriteBarrier();
+            lock = 0;
+        }
+
+#endif      // __cplusplus > 199711L
 
-#endif// __cplusplus > 199711L
 };
 
 #include <math.h>
@@ -1268,169 +2761,204 @@ struct hypre_cub_Mutex {
  * and sets a maximum of 6,291,455 cached bytes per device
  *
  */
-struct hypre_cub_CachingDeviceAllocator {
-    typedef char value_type;
+struct hypre_cub_CachingDeviceAllocator
+{
+   typedef char value_type;
 
-    //---------------------------------------------------------------------
-    // Constants
-    //---------------------------------------------------------------------
+   //---------------------------------------------------------------------
+   // Constants
+   //---------------------------------------------------------------------
 
-    /// Out-of-bounds bin
-    static const hypre_uint INVALID_BIN = (hypre_uint) -1;
+   /// Out-of-bounds bin
+   static const hypre_uint INVALID_BIN = (hypre_uint) -1;
 
-    /// Invalid size
-    static const size_t INVALID_SIZE = (size_t) -1;
+   /// Invalid size
+   static const size_t INVALID_SIZE = (size_t) -1;
 
-    /// Invalid device ordinal
-    static const hypre_int INVALID_DEVICE_ORDINAL = -1;
+   /// Invalid device ordinal
+   static const hypre_int INVALID_DEVICE_ORDINAL = -1;
 
-    //---------------------------------------------------------------------
-    // Type definitions and helper types
-    //---------------------------------------------------------------------
+   //---------------------------------------------------------------------
+   // Type definitions and helper types
+   //---------------------------------------------------------------------
 
-    /**
+   /**
     * Descriptor for device memory allocations
     */
-    struct BlockDescriptor {
-        void *d_ptr;                   // Device pointer
-        size_t bytes;                  // Size of allocation in bytes
-        hypre_uint bin;                // Bin enumeration
-        hypre_int device;              // device ordinal
-        cudaStream_t associated_stream;// Associated associated_stream
-        cudaEvent_t
-                ready_event;// Signal when associated stream has run to the point at which this block was freed
-
-        // Constructor (suitable for searching maps for a specific block, given its pointer and device)
-        BlockDescriptor(void *d_ptr, hypre_int device)
-            : d_ptr(d_ptr), bytes(0), bin(INVALID_BIN), device(device), associated_stream(0), ready_event(0) {
-        }
-
-        // Constructor (suitable for searching maps for a range of suitable blocks, given a device)
-        BlockDescriptor(hypre_int device)
-            : d_ptr(NULL), bytes(0), bin(INVALID_BIN), device(device), associated_stream(0), ready_event(0) {}
-
-        // Comparison functor for comparing device pointers
-        static bool PtrCompare(const BlockDescriptor &a, const BlockDescriptor &b) {
-            if (a.device == b.device) return (a.d_ptr < b.d_ptr);
-            else
-                return (a.device < b.device);
-        }
-
-        // Comparison functor for comparing allocation sizes
-        static bool SizeCompare(const BlockDescriptor &a, const BlockDescriptor &b) {
-            if (a.device == b.device) return (a.bytes < b.bytes);
-            else
-                return (a.device < b.device);
-        }
-    };
-
-    /// BlockDescriptor comparator function interface
-    typedef bool (*Compare)(const BlockDescriptor &, const BlockDescriptor &);
-
-    class TotalBytes {
-    public:
-        size_t free;
-        size_t live;
-        TotalBytes() { free = live = 0; }
-    };
-
-    /// Set type for cached blocks (ordered by size)
-    typedef std::multiset<BlockDescriptor, Compare> CachedBlocks;
-
-    /// Set type for live blocks (ordered by ptr)
-    typedef std::multiset<BlockDescriptor, Compare> BusyBlocks;
-
-    /// Map type of device ordinals to the number of cached bytes cached by each device
-    typedef std::map<hypre_int, TotalBytes> GpuCachedBytes;
-
-    //---------------------------------------------------------------------
-    // Utility functions
-    //---------------------------------------------------------------------
-
-    /**
+   struct BlockDescriptor
+   {
+      void*           d_ptr;              // Device pointer
+      size_t          bytes;              // Size of allocation in bytes
+      hypre_uint      bin;                // Bin enumeration
+      hypre_int       device;             // device ordinal
+      cudaStream_t    associated_stream;  // Associated associated_stream
+      cudaEvent_t     ready_event;        // Signal when associated stream has run to the point at which this block was freed
+
+      // Constructor (suitable for searching maps for a specific block, given its pointer and device)
+      BlockDescriptor(void *d_ptr, hypre_int device) :
+         d_ptr(d_ptr),
+         bytes(0),
+         bin(INVALID_BIN),
+         device(device),
+         associated_stream(0),
+         ready_event(0)
+      {}
+
+      // Constructor (suitable for searching maps for a range of suitable blocks, given a device)
+      BlockDescriptor(hypre_int device) :
+         d_ptr(NULL),
+         bytes(0),
+         bin(INVALID_BIN),
+         device(device),
+         associated_stream(0),
+         ready_event(0)
+      {}
+
+      // Comparison functor for comparing device pointers
+      static bool PtrCompare(const BlockDescriptor &a, const BlockDescriptor &b)
+      {
+         if (a.device == b.device)
+            return (a.d_ptr < b.d_ptr);
+         else
+            return (a.device < b.device);
+      }
+
+      // Comparison functor for comparing allocation sizes
+      static bool SizeCompare(const BlockDescriptor &a, const BlockDescriptor &b)
+      {
+         if (a.device == b.device)
+            return (a.bytes < b.bytes);
+         else
+            return (a.device < b.device);
+      }
+   };
+
+   /// BlockDescriptor comparator function interface
+   typedef bool (*Compare)(const BlockDescriptor &, const BlockDescriptor &);
+
+   class TotalBytes {
+      public:
+         size_t free;
+         size_t live;
+         TotalBytes() { free = live = 0; }
+   };
+
+   /// Set type for cached blocks (ordered by size)
+   typedef std::multiset<BlockDescriptor, Compare> CachedBlocks;
+
+   /// Set type for live blocks (ordered by ptr)
+   typedef std::multiset<BlockDescriptor, Compare> BusyBlocks;
+
+   /// Map type of device ordinals to the number of cached bytes cached by each device
+   typedef std::map<hypre_int, TotalBytes> GpuCachedBytes;
+
+
+   //---------------------------------------------------------------------
+   // Utility functions
+   //---------------------------------------------------------------------
+
+   /**
     * Integer pow function for unsigned base and exponent
     */
-    static hypre_uint IntPow(hypre_uint base, hypre_uint exp) {
-        hypre_uint retval = 1;
-        while (exp > 0) {
-            if (exp & 1) {
-                retval = retval * base;// multiply the result by the current base
-            }
-            base = base * base;// square the base
-            exp = exp >> 1;    // divide the exponent in half
-        }
-        return retval;
-    }
-
-    /**
+   static hypre_uint IntPow(
+         hypre_uint base,
+         hypre_uint exp)
+   {
+      hypre_uint retval = 1;
+      while (exp > 0)
+      {
+         if (exp & 1) {
+            retval = retval * base;        // multiply the result by the current base
+         }
+         base = base * base;                // square the base
+         exp = exp >> 1;                    // divide the exponent in half
+      }
+      return retval;
+   }
+
+
+   /**
     * Round up to the nearest power-of
     */
-    void NearestPowerOf(hypre_uint &power, size_t &rounded_bytes, hypre_uint base, size_t value) {
-        power = 0;
-        rounded_bytes = 1;
-
-        if (value * base < value) {
-            // Overflow
-            power = sizeof(size_t) * 8;
-            rounded_bytes = size_t(0) - 1;
-            return;
-        }
-
-        while (rounded_bytes < value) {
-            rounded_bytes *= base;
-            power++;
-        }
-    }
-
-    //---------------------------------------------------------------------
-    // Fields
-    //---------------------------------------------------------------------
-
-    hypre_cub_Mutex mutex;/// Mutex for thread-safety
-
-    hypre_uint bin_growth;/// Geometric growth factor for bin-sizes
-    hypre_uint min_bin;   /// Minimum bin enumeration
-    hypre_uint max_bin;   /// Maximum bin enumeration
-
-    size_t min_bin_bytes;   /// Minimum bin size
-    size_t max_bin_bytes;   /// Maximum bin size
-    size_t max_cached_bytes;/// Maximum aggregate cached bytes per device
-
-    const bool
-            skip_cleanup;/// Whether or not to skip a call to FreeAllCached() when destructor is called.  (The CUDA runtime may have already shut down for statically declared allocators)
-    bool debug;          /// Whether or not to print (de)allocation events to stdout
-
-    GpuCachedBytes cached_bytes;/// Map of device ordinal to aggregate cached bytes on that device
-    CachedBlocks cached_blocks; /// Set of cached device allocations available for reuse
-    BusyBlocks live_blocks;     /// Set of live device allocations currently in use
-
-    bool use_managed_memory;/// Whether to use managed memory or device memory
-
-    //---------------------------------------------------------------------
-    // Methods
-    //---------------------------------------------------------------------
-
-    /**
+   void NearestPowerOf(
+         hypre_uint      &power,
+         size_t          &rounded_bytes,
+         hypre_uint       base,
+         size_t           value)
+   {
+      power = 0;
+      rounded_bytes = 1;
+
+      if (value * base < value)
+      {
+         // Overflow
+         power = sizeof(size_t) * 8;
+         rounded_bytes = size_t(0) - 1;
+         return;
+      }
+
+      while (rounded_bytes < value)
+      {
+         rounded_bytes *= base;
+         power++;
+      }
+   }
+
+
+   //---------------------------------------------------------------------
+   // Fields
+   //---------------------------------------------------------------------
+
+   hypre_cub_Mutex mutex;              /// Mutex for thread-safety
+
+   hypre_uint      bin_growth;         /// Geometric growth factor for bin-sizes
+   hypre_uint      min_bin;            /// Minimum bin enumeration
+   hypre_uint      max_bin;            /// Maximum bin enumeration
+
+   size_t          min_bin_bytes;      /// Minimum bin size
+   size_t          max_bin_bytes;      /// Maximum bin size
+   size_t          max_cached_bytes;   /// Maximum aggregate cached bytes per device
+
+   const bool      skip_cleanup;       /// Whether or not to skip a call to FreeAllCached() when destructor is called.  (The CUDA runtime may have already shut down for statically declared allocators)
+   bool            debug;              /// Whether or not to print (de)allocation events to stdout
+
+   GpuCachedBytes  cached_bytes;       /// Map of device ordinal to aggregate cached bytes on that device
+   CachedBlocks    cached_blocks;      /// Set of cached device allocations available for reuse
+   BusyBlocks      live_blocks;        /// Set of live device allocations currently in use
+
+   bool            use_managed_memory; /// Whether to use managed memory or device memory
+
+   //---------------------------------------------------------------------
+   // Methods
+   //---------------------------------------------------------------------
+
+   /**
     * \brief Constructor.
     */
-    hypre_cub_CachingDeviceAllocator(
-            hypre_uint bin_growth,           ///< Geometric growth factor for bin-sizes
-            hypre_uint min_bin = 1,          ///< Minimum bin (default is bin_growth ^ 1)
-            hypre_uint max_bin = INVALID_BIN,///< Maximum bin (default is no max bin)
-            size_t max_cached_bytes
-            = INVALID_SIZE,///< Maximum aggregate cached bytes per device (default is no limit)
-            bool skip_cleanup
-            = false,///< Whether or not to skip a call to \p FreeAllCached() when the destructor is called (default is to deallocate)
-            bool debug
-            = false,///< Whether or not to print (de)allocation events to stdout (default is no stderr output)
-            bool use_managed_memory = false)///< Whether to use managed memory or device memory
-        : bin_growth(bin_growth), min_bin(min_bin), max_bin(max_bin),
-          min_bin_bytes(IntPow(bin_growth, min_bin)), max_bin_bytes(IntPow(bin_growth, max_bin)),
-          max_cached_bytes(max_cached_bytes), skip_cleanup(skip_cleanup), debug(debug),
-          use_managed_memory(use_managed_memory), cached_blocks(BlockDescriptor::SizeCompare),
-          live_blocks(BlockDescriptor::PtrCompare) {}
-
-    /**
+   hypre_cub_CachingDeviceAllocator(
+         hypre_uint      bin_growth,                             ///< Geometric growth factor for bin-sizes
+         hypre_uint      min_bin             = 1,                ///< Minimum bin (default is bin_growth ^ 1)
+         hypre_uint      max_bin             = INVALID_BIN,      ///< Maximum bin (default is no max bin)
+         size_t          max_cached_bytes    = INVALID_SIZE,     ///< Maximum aggregate cached bytes per device (default is no limit)
+         bool            skip_cleanup        = false,            ///< Whether or not to skip a call to \p FreeAllCached() when the destructor is called (default is to deallocate)
+         bool            debug               = false,            ///< Whether or not to print (de)allocation events to stdout (default is no stderr output)
+         bool            use_managed_memory  = false)            ///< Whether to use managed memory or device memory
+      :
+         bin_growth(bin_growth),
+         min_bin(min_bin),
+         max_bin(max_bin),
+         min_bin_bytes(IntPow(bin_growth, min_bin)),
+         max_bin_bytes(IntPow(bin_growth, max_bin)),
+         max_cached_bytes(max_cached_bytes),
+         skip_cleanup(skip_cleanup),
+         debug(debug),
+         use_managed_memory(use_managed_memory),
+         cached_blocks(BlockDescriptor::SizeCompare),
+         live_blocks(BlockDescriptor::PtrCompare)
+   {}
+
+
+   /**
     * \brief Default constructor.
     *
     * Configured with:
@@ -1443,391 +2971,435 @@ struct hypre_cub_CachingDeviceAllocator {
     * which delineates five bin-sizes: 512B, 4KB, 32KB, 256KB, and 2MB and
     * sets a maximum of 6,291,455 cached bytes per device
     */
-    hypre_cub_CachingDeviceAllocator(bool skip_cleanup = false, bool debug = false,
-                                     bool use_managed_memory = false)
-        : bin_growth(8), min_bin(3), max_bin(7), min_bin_bytes(IntPow(bin_growth, min_bin)),
-          max_bin_bytes(IntPow(bin_growth, max_bin)), max_cached_bytes((max_bin_bytes * 3) - 1),
-          skip_cleanup(skip_cleanup), debug(debug), use_managed_memory(use_managed_memory),
-          cached_blocks(BlockDescriptor::SizeCompare), live_blocks(BlockDescriptor::PtrCompare) {}
-
-    /**
+   hypre_cub_CachingDeviceAllocator(
+         bool skip_cleanup = false,
+         bool debug = false,
+         bool use_managed_memory = false)
+      :
+         bin_growth(8),
+         min_bin(3),
+         max_bin(7),
+         min_bin_bytes(IntPow(bin_growth, min_bin)),
+         max_bin_bytes(IntPow(bin_growth, max_bin)),
+         max_cached_bytes((max_bin_bytes * 3) - 1),
+         skip_cleanup(skip_cleanup),
+         debug(debug),
+         use_managed_memory(use_managed_memory),
+         cached_blocks(BlockDescriptor::SizeCompare),
+         live_blocks(BlockDescriptor::PtrCompare)
+   {}
+
+
+   /**
     * \brief Sets the limit on the number bytes this allocator is allowed to cache per device.
     *
     * Changing the ceiling of cached bytes does not cause any allocations (in-use or
     * cached-in-reserve) to be freed.  See \p FreeAllCached().
     */
-    cudaError_t SetMaxCachedBytes(size_t max_cached_bytes) {
-        // Lock
-        mutex.Lock();
+   cudaError_t SetMaxCachedBytes(
+         size_t max_cached_bytes)
+   {
+      // Lock
+      mutex.Lock();
 
-        if (debug)
-            printf("Changing max_cached_bytes (%zu -> %zu)\n", this->max_cached_bytes, max_cached_bytes);
+      if (debug) printf("Changing max_cached_bytes (%zu -> %zu)\n", this->max_cached_bytes, max_cached_bytes);
 
-        this->max_cached_bytes = max_cached_bytes;
+      this->max_cached_bytes = max_cached_bytes;
 
-        // Unlock
-        mutex.Unlock();
+      // Unlock
+      mutex.Unlock();
+
+      return cudaSuccess;
+   }
 
-        return cudaSuccess;
-    }
 
-    /**
+   /**
     * \brief Provides a suitable allocation of device memory for the given size on the specified device.
     *
     * Once freed, the allocation becomes available immediately for reuse within the \p active_stream
     * with which it was associated with during allocation, and it becomes available for reuse within other
     * streams when all prior work submitted to \p active_stream has completed.
     */
-    cudaError_t DeviceAllocate(hypre_int device,///< [in] Device on which to place the allocation
-                               void **d_ptr,    ///< [out] Reference to pointer to the allocation
-                               size_t bytes,    ///< [in] Minimum number of bytes for the allocation
-                               cudaStream_t active_stream
-                               = 0)///< [in] The stream to be associated with this allocation
-    {
-        *d_ptr = NULL;
-        hypre_int entrypoint_device = INVALID_DEVICE_ORDINAL;
-        cudaError_t error = cudaSuccess;
-
-        if (device == INVALID_DEVICE_ORDINAL) {
+   cudaError_t DeviceAllocate(
+         hypre_int       device,             ///< [in] Device on which to place the allocation
+         void            **d_ptr,            ///< [out] Reference to pointer to the allocation
+         size_t          bytes,              ///< [in] Minimum number of bytes for the allocation
+         cudaStream_t    active_stream = 0)  ///< [in] The stream to be associated with this allocation
+   {
+      *d_ptr                          = NULL;
+      hypre_int entrypoint_device     = INVALID_DEVICE_ORDINAL;
+      cudaError_t error               = cudaSuccess;
+
+      if (device == INVALID_DEVICE_ORDINAL)
+      {
+         if ((error = cudaGetDevice(&entrypoint_device))) return error;
+         device = entrypoint_device;
+      }
+
+      // Create a block descriptor for the requested allocation
+      bool found = false;
+      BlockDescriptor search_key(device);
+      search_key.associated_stream = active_stream;
+      NearestPowerOf(search_key.bin, search_key.bytes, bin_growth, bytes);
+
+      if (search_key.bin > max_bin)
+      {
+         // Bin is greater than our maximum bin: allocate the request
+         // exactly and give out-of-bounds bin.  It will not be cached
+         // for reuse when returned.
+         search_key.bin      = INVALID_BIN;
+         search_key.bytes    = bytes;
+      }
+      else
+      {
+         // Search for a suitable cached allocation: lock
+         mutex.Lock();
+
+         if (search_key.bin < min_bin)
+         {
+            // Bin is less than minimum bin: round up
+            search_key.bin      = min_bin;
+            search_key.bytes    = min_bin_bytes;
+         }
+
+         // Iterate through the range of cached blocks on the same device in the same bin
+         CachedBlocks::iterator block_itr = cached_blocks.lower_bound(search_key);
+         while ((block_itr != cached_blocks.end())
+               && (block_itr->device == device)
+               && (block_itr->bin == search_key.bin))
+         {
+            // To prevent races with reusing blocks returned by the host but still
+            // in use by the device, only consider cached blocks that are
+            // either (from the active stream) or (from an idle stream)
+            if ((active_stream == block_itr->associated_stream) ||
+                  (cudaEventQuery(block_itr->ready_event) != cudaErrorNotReady))
+            {
+               // Reuse existing cache block.  Insert into live blocks.
+               found = true;
+               search_key = *block_itr;
+               search_key.associated_stream = active_stream;
+               live_blocks.insert(search_key);
+
+               // Remove from free blocks
+               cached_bytes[device].free -= search_key.bytes;
+               cached_bytes[device].live += search_key.bytes;
+
+               if (debug) printf("\tDevice %d reused cached block at %p (%zu bytes) for stream %p (previously associated with stream %p).\n",
+                     device, search_key.d_ptr, search_key.bytes, search_key.associated_stream, block_itr->associated_stream);
+
+               cached_blocks.erase(block_itr);
+
+               break;
+            }
+            block_itr++;
+         }
+
+         // Done searching: unlock
+         mutex.Unlock();
+      }
+
+      // Allocate the block if necessary
+      if (!found)
+      {
+         // Set runtime's current device to specified device (entrypoint may not be set)
+         if (device != entrypoint_device)
+         {
             if ((error = cudaGetDevice(&entrypoint_device))) return error;
-            device = entrypoint_device;
-        }
-
-        // Create a block descriptor for the requested allocation
-        bool found = false;
-        BlockDescriptor search_key(device);
-        search_key.associated_stream = active_stream;
-        NearestPowerOf(search_key.bin, search_key.bytes, bin_growth, bytes);
-
-        if (search_key.bin > max_bin) {
-            // Bin is greater than our maximum bin: allocate the request
-            // exactly and give out-of-bounds bin.  It will not be cached
-            // for reuse when returned.
-            search_key.bin = INVALID_BIN;
-            search_key.bytes = bytes;
-        } else {
-            // Search for a suitable cached allocation: lock
+            if ((error = cudaSetDevice(device))) return error;
+         }
+
+         // Attempt to allocate
+
+         if (use_managed_memory)
+         {
+            error = cudaMallocManaged(&search_key.d_ptr, search_key.bytes);
+         }
+         else
+         {
+            error = cudaMalloc(&search_key.d_ptr, search_key.bytes);
+         }
+         if ((error) == cudaErrorMemoryAllocation)
+         {
+            // The allocation attempt failed: free all cached blocks on device and retry
+            if (debug) printf("\tDevice %d failed to allocate %zu bytes for stream %p, retrying after freeing cached allocations",
+                  device, search_key.bytes, search_key.associated_stream);
+
+            error = cudaSuccess;    // Reset the error we will return
+            cudaGetLastError();     // Reset CUDART's error
+
+            // Lock
             mutex.Lock();
 
-            if (search_key.bin < min_bin) {
-                // Bin is less than minimum bin: round up
-                search_key.bin = min_bin;
-                search_key.bytes = min_bin_bytes;
-            }
-
-            // Iterate through the range of cached blocks on the same device in the same bin
-            CachedBlocks::iterator block_itr = cached_blocks.lower_bound(search_key);
-            while ((block_itr != cached_blocks.end()) && (block_itr->device == device)
-                   && (block_itr->bin == search_key.bin)) {
-                // To prevent races with reusing blocks returned by the host but still
-                // in use by the device, only consider cached blocks that are
-                // either (from the active stream) or (from an idle stream)
-                if ((active_stream == block_itr->associated_stream)
-                    || (cudaEventQuery(block_itr->ready_event) != cudaErrorNotReady)) {
-                    // Reuse existing cache block.  Insert into live blocks.
-                    found = true;
-                    search_key = *block_itr;
-                    search_key.associated_stream = active_stream;
-                    live_blocks.insert(search_key);
-
-                    // Remove from free blocks
-                    cached_bytes[device].free -= search_key.bytes;
-                    cached_bytes[device].live += search_key.bytes;
-
-                    if (debug)
-                        printf("\tDevice %d reused cached block at %p (%zu bytes) for stream %p (previously "
-                               "associated with stream %p).\n",
-                               device, search_key.d_ptr, search_key.bytes, search_key.associated_stream,
-                               block_itr->associated_stream);
-
-                    cached_blocks.erase(block_itr);
-
-                    break;
-                }
-                block_itr++;
-            }
-
-            // Done searching: unlock
-            mutex.Unlock();
-        }
-
-        // Allocate the block if necessary
-        if (!found) {
-            // Set runtime's current device to specified device (entrypoint may not be set)
-            if (device != entrypoint_device) {
-                if ((error = cudaGetDevice(&entrypoint_device))) return error;
-                if ((error = cudaSetDevice(device))) return error;
-            }
-
-            // Attempt to allocate
-
-            if (use_managed_memory) {
-                error = cudaMallocManaged(&search_key.d_ptr, search_key.bytes);
-            } else {
-                error = cudaMalloc(&search_key.d_ptr, search_key.bytes);
-            }
-            if ((error) == cudaErrorMemoryAllocation) {
-                // The allocation attempt failed: free all cached blocks on device and retry
-                if (debug)
-                    printf("\tDevice %d failed to allocate %zu bytes for stream %p, retrying after freeing "
-                           "cached allocations",
-                           device, search_key.bytes, search_key.associated_stream);
-
-                error = cudaSuccess;// Reset the error we will return
-                cudaGetLastError(); // Reset CUDART's error
+            // Iterate the range of free blocks on the same device
+            BlockDescriptor free_key(device);
+            CachedBlocks::iterator block_itr = cached_blocks.lower_bound(free_key);
 
-                // Lock
-                mutex.Lock();
+            while ((block_itr != cached_blocks.end()) && (block_itr->device == device))
+            {
+               // No need to worry about synchronization with the device: cudaFree is
+               // blocking and will synchronize across all kernels executing
+               // on the current device
 
-                // Iterate the range of free blocks on the same device
-                BlockDescriptor free_key(device);
-                CachedBlocks::iterator block_itr = cached_blocks.lower_bound(free_key);
+               // Free device memory and destroy stream event.
+               if ((error = cudaFree(block_itr->d_ptr))) break;
+               if ((error = cudaEventDestroy(block_itr->ready_event))) break;
 
-                while ((block_itr != cached_blocks.end()) && (block_itr->device == device)) {
-                    // No need to worry about synchronization with the device: cudaFree is
-                    // blocking and will synchronize across all kernels executing
-                    // on the current device
+               // Reduce balance and erase entry
+               cached_bytes[device].free -= block_itr->bytes;
 
-                    // Free device memory and destroy stream event.
-                    if ((error = cudaFree(block_itr->d_ptr))) break;
-                    if ((error = cudaEventDestroy(block_itr->ready_event))) break;
+               if (debug) printf("\tDevice %d freed %zu bytes.\n\t\t  %zu available blocks cached (%zu bytes), %zu live blocks (%zu bytes) outstanding.\n",
+                     device, block_itr->bytes, cached_blocks.size(), cached_bytes[device].free, live_blocks.size(), cached_bytes[device].live);
 
-                    // Reduce balance and erase entry
-                    cached_bytes[device].free -= block_itr->bytes;
+               cached_blocks.erase(block_itr);
 
-                    if (debug)
-                        printf("\tDevice %d freed %zu bytes.\n\t\t  %zu available blocks cached (%zu bytes), "
-                               "%zu live blocks (%zu bytes) outstanding.\n",
-                               device, block_itr->bytes, cached_blocks.size(), cached_bytes[device].free,
-                               live_blocks.size(), cached_bytes[device].live);
-
-                    cached_blocks.erase(block_itr);
-
-                    block_itr++;
-                }
+               block_itr++;
+            }
 
-                // Unlock
-                mutex.Unlock();
+            // Unlock
+            mutex.Unlock();
 
-                // Return under error
-                if (error) return error;
+            // Return under error
+            if (error) return error;
 
-                // Try to allocate again
+            // Try to allocate again
 
-                if (use_managed_memory) {
-                    error = cudaMallocManaged(&search_key.d_ptr, search_key.bytes);
-                } else {
-                    error = cudaMalloc(&search_key.d_ptr, search_key.bytes);
-                }
-                if ((error)) return error;
+            if (use_managed_memory)
+            {
+               error = cudaMallocManaged(&search_key.d_ptr, search_key.bytes);
             }
+            else
+            {
+               error = cudaMalloc(&search_key.d_ptr, search_key.bytes);
+            }
+            if ((error)) return error;
+         }
 
-            // Create ready event
-            if ((error = cudaEventCreateWithFlags(&search_key.ready_event, cudaEventDisableTiming)))
-                return error;
+         // Create ready event
+         if ((error = cudaEventCreateWithFlags(&search_key.ready_event, cudaEventDisableTiming)))
+            return error;
 
-            // Insert into live blocks
-            mutex.Lock();
-            live_blocks.insert(search_key);
-            cached_bytes[device].live += search_key.bytes;
-            mutex.Unlock();
+         // Insert into live blocks
+         mutex.Lock();
+         live_blocks.insert(search_key);
+         cached_bytes[device].live += search_key.bytes;
+         mutex.Unlock();
 
-            if (debug)
-                printf("\tDevice %d allocated new device block at %p (%zu bytes associated with stream "
-                       "%p).\n",
-                       device, search_key.d_ptr, search_key.bytes, search_key.associated_stream);
+         if (debug) printf("\tDevice %d allocated new device block at %p (%zu bytes associated with stream %p).\n",
+               device, search_key.d_ptr, search_key.bytes, search_key.associated_stream);
 
-            // Attempt to revert back to previous device if necessary
-            if ((entrypoint_device != INVALID_DEVICE_ORDINAL) && (entrypoint_device != device)) {
-                if ((error = cudaSetDevice(entrypoint_device))) return error;
-            }
-        }
+         // Attempt to revert back to previous device if necessary
+         if ((entrypoint_device != INVALID_DEVICE_ORDINAL) && (entrypoint_device != device))
+         {
+            if ((error = cudaSetDevice(entrypoint_device))) return error;
+         }
+      }
 
-        // Copy device pointer to output parameter
-        *d_ptr = search_key.d_ptr;
+      // Copy device pointer to output parameter
+      *d_ptr = search_key.d_ptr;
 
-        if (debug)
-            printf("\t\t%zu available blocks cached (%zu bytes), %zu live blocks outstanding(%zu bytes).\n",
-                   cached_blocks.size(), cached_bytes[device].free, live_blocks.size(),
-                   cached_bytes[device].live);
+      if (debug) printf("\t\t%zu available blocks cached (%zu bytes), %zu live blocks outstanding(%zu bytes).\n",
+            cached_blocks.size(), cached_bytes[device].free, live_blocks.size(), cached_bytes[device].live);
 
-        return error;
-    }
+      return error;
+   }
 
-    /**
+
+   /**
     * \brief Provides a suitable allocation of device memory for the given size on the current device.
     *
     * Once freed, the allocation becomes available immediately for reuse within the \p active_stream
     * with which it was associated with during allocation, and it becomes available for reuse within other
     * streams when all prior work submitted to \p active_stream has completed.
     */
-    cudaError_t DeviceAllocate(void **d_ptr,///< [out] Reference to pointer to the allocation
-                               size_t bytes,///< [in] Minimum number of bytes for the allocation
-                               cudaStream_t active_stream
-                               = 0)///< [in] The stream to be associated with this allocation
-    {
-        return DeviceAllocate(INVALID_DEVICE_ORDINAL, d_ptr, bytes, active_stream);
-    }
+   cudaError_t DeviceAllocate(
+         void            **d_ptr,            ///< [out] Reference to pointer to the allocation
+         size_t          bytes,              ///< [in] Minimum number of bytes for the allocation
+         cudaStream_t    active_stream = 0)  ///< [in] The stream to be associated with this allocation
+   {
+      return DeviceAllocate(INVALID_DEVICE_ORDINAL, d_ptr, bytes, active_stream);
+   }
 
-    char *allocate(size_t bytes) {
-        char *ptr;
-        DeviceAllocate((void **) &ptr, bytes);
+   char * allocate(size_t bytes)
+   {
+      char *ptr;
+      DeviceAllocate((void **) &ptr, bytes);
 
-        return ptr;
-    }
+      return ptr;
+   }
 
-    /**
+
+   /**
     * \brief Frees a live allocation of device memory on the specified device, returning it to the allocator.
     *
     * Once freed, the allocation becomes available immediately for reuse within the \p active_stream
     * with which it was associated with during allocation, and it becomes available for reuse within other
     * streams when all prior work submitted to \p active_stream has completed.
     */
-    cudaError_t DeviceFree(hypre_int device, void *d_ptr) {
-        hypre_int entrypoint_device = INVALID_DEVICE_ORDINAL;
-        cudaError_t error = cudaSuccess;
-
-        if (device == INVALID_DEVICE_ORDINAL) {
-            if ((error = cudaGetDevice(&entrypoint_device))) return error;
-            device = entrypoint_device;
-        }
-
-        // Lock
-        mutex.Lock();
-
-        // Find corresponding block descriptor
-        bool recached = false;
-        BlockDescriptor search_key(d_ptr, device);
-        BusyBlocks::iterator block_itr = live_blocks.find(search_key);
-        if (block_itr != live_blocks.end()) {
-            // Remove from live blocks
-            search_key = *block_itr;
-            live_blocks.erase(block_itr);
-            cached_bytes[device].live -= search_key.bytes;
-
-            // Keep the returned allocation if bin is valid and we won't exceed the max cached threshold
-            if ((search_key.bin != INVALID_BIN)
-                && (cached_bytes[device].free + search_key.bytes <= max_cached_bytes)) {
-                // Insert returned allocation into free blocks
-                recached = true;
-                cached_blocks.insert(search_key);
-                cached_bytes[device].free += search_key.bytes;
-
-                if (debug)
-                    printf("\tDevice %d returned %zu bytes from associated stream %p.\n\t\t %zu available "
-                           "blocks cached (%zu bytes), %zu live blocks outstanding. (%zu bytes)\n",
-                           device, search_key.bytes, search_key.associated_stream, cached_blocks.size(),
-                           cached_bytes[device].free, live_blocks.size(), cached_bytes[device].live);
-            }
-        }
-
-        // Unlock
-        mutex.Unlock();
-
-        // First set to specified device (entrypoint may not be set)
-        if (device != entrypoint_device) {
-            if ((error = cudaGetDevice(&entrypoint_device))) return error;
-            if ((error = cudaSetDevice(device))) return error;
-        }
-
-        if (recached) {
-            // Insert the ready event in the associated stream (must have current device set properly)
-            if ((error = cudaEventRecord(search_key.ready_event, search_key.associated_stream))) return error;
-        } else {
-            // Free the allocation from the runtime and cleanup the event.
-            if ((error = cudaFree(d_ptr))) return error;
-            if ((error = cudaEventDestroy(search_key.ready_event))) return error;
-
-            if (debug)
-                printf("\tDevice %d freed %zu bytes from associated stream %p.\n\t\t  %zu available blocks "
-                       "cached (%zu bytes), %zu live blocks (%zu bytes) outstanding.\n",
-                       device, search_key.bytes, search_key.associated_stream, cached_blocks.size(),
-                       cached_bytes[device].free, live_blocks.size(), cached_bytes[device].live);
-        }
-
-        // Reset device
-        if ((entrypoint_device != INVALID_DEVICE_ORDINAL) && (entrypoint_device != device)) {
-            if ((error = cudaSetDevice(entrypoint_device))) return error;
-        }
-
-        return error;
-    }
-
-    /**
+   cudaError_t DeviceFree(
+         hypre_int       device,
+         void*           d_ptr)
+   {
+      hypre_int entrypoint_device     = INVALID_DEVICE_ORDINAL;
+      cudaError_t error               = cudaSuccess;
+
+      if (device == INVALID_DEVICE_ORDINAL)
+      {
+         if ((error = cudaGetDevice(&entrypoint_device)))
+            return error;
+         device = entrypoint_device;
+      }
+
+      // Lock
+      mutex.Lock();
+
+      // Find corresponding block descriptor
+      bool recached = false;
+      BlockDescriptor search_key(d_ptr, device);
+      BusyBlocks::iterator block_itr = live_blocks.find(search_key);
+      if (block_itr != live_blocks.end())
+      {
+         // Remove from live blocks
+         search_key = *block_itr;
+         live_blocks.erase(block_itr);
+         cached_bytes[device].live -= search_key.bytes;
+
+         // Keep the returned allocation if bin is valid and we won't exceed the max cached threshold
+         if ((search_key.bin != INVALID_BIN) && (cached_bytes[device].free + search_key.bytes <= max_cached_bytes))
+         {
+            // Insert returned allocation into free blocks
+            recached = true;
+            cached_blocks.insert(search_key);
+            cached_bytes[device].free += search_key.bytes;
+
+            if (debug) printf("\tDevice %d returned %zu bytes from associated stream %p.\n\t\t %zu available blocks cached (%zu bytes), %zu live blocks outstanding. (%zu bytes)\n",
+                  device, search_key.bytes, search_key.associated_stream, cached_blocks.size(),
+                  cached_bytes[device].free, live_blocks.size(), cached_bytes[device].live);
+         }
+      }
+
+      // Unlock
+      mutex.Unlock();
+
+      // First set to specified device (entrypoint may not be set)
+      if (device != entrypoint_device)
+      {
+         if ((error = cudaGetDevice(&entrypoint_device))) return error;
+         if ((error = cudaSetDevice(device))) return error;
+      }
+
+      if (recached)
+      {
+         // Insert the ready event in the associated stream (must have current device set properly)
+         if ((error = cudaEventRecord(search_key.ready_event, search_key.associated_stream))) return error;
+      }
+      else
+      {
+         // Free the allocation from the runtime and cleanup the event.
+         if ((error = cudaFree(d_ptr))) return error;
+         if ((error = cudaEventDestroy(search_key.ready_event))) return error;
+
+         if (debug) printf("\tDevice %d freed %zu bytes from associated stream %p.\n\t\t  %zu available blocks cached (%zu bytes), %zu live blocks (%zu bytes) outstanding.\n",
+               device, search_key.bytes, search_key.associated_stream, cached_blocks.size(), cached_bytes[device].free, live_blocks.size(), cached_bytes[device].live);
+      }
+
+      // Reset device
+      if ((entrypoint_device != INVALID_DEVICE_ORDINAL) && (entrypoint_device != device))
+      {
+         if ((error = cudaSetDevice(entrypoint_device))) return error;
+      }
+
+      return error;
+   }
+
+   /**
     * \brief Frees a live allocation of device memory on the current device, returning it to the allocator.
     *
     * Once freed, the allocation becomes available immediately for reuse within the \p active_stream
     * with which it was associated with during allocation, and it becomes available for reuse within other
     * streams when all prior work submitted to \p active_stream has completed.
     */
-    cudaError_t DeviceFree(void *d_ptr) { return DeviceFree(INVALID_DEVICE_ORDINAL, d_ptr); }
-
-    void deallocate(char *ptr, size_t) { DeviceFree((void *) ptr); }
-
-    /**
+   cudaError_t DeviceFree(
+         void*           d_ptr)
+   {
+      return DeviceFree(INVALID_DEVICE_ORDINAL, d_ptr);
+   }
+
+   void deallocate(char *ptr, size_t)
+   {
+      DeviceFree((void *) ptr);
+   }
+
+   /**
     * \brief Frees all cached device allocations on all devices
     */
-    cudaError_t FreeAllCached() {
-        cudaError_t error = cudaSuccess;
-        hypre_int entrypoint_device = INVALID_DEVICE_ORDINAL;
-        hypre_int current_device = INVALID_DEVICE_ORDINAL;
+   cudaError_t FreeAllCached()
+   {
+      cudaError_t error           = cudaSuccess;
+      hypre_int entrypoint_device = INVALID_DEVICE_ORDINAL;
+      hypre_int current_device    = INVALID_DEVICE_ORDINAL;
 
-        mutex.Lock();
+      mutex.Lock();
 
-        while (!cached_blocks.empty()) {
-            // Get first block
-            CachedBlocks::iterator begin = cached_blocks.begin();
+      while (!cached_blocks.empty())
+      {
+         // Get first block
+         CachedBlocks::iterator begin = cached_blocks.begin();
 
-            // Get entry-point device ordinal if necessary
-            if (entrypoint_device == INVALID_DEVICE_ORDINAL) {
-                if ((error = cudaGetDevice(&entrypoint_device))) break;
-            }
+         // Get entry-point device ordinal if necessary
+         if (entrypoint_device == INVALID_DEVICE_ORDINAL)
+         {
+            if ((error = cudaGetDevice(&entrypoint_device))) break;
+         }
 
-            // Set current device ordinal if necessary
-            if (begin->device != current_device) {
-                if ((error = cudaSetDevice(begin->device))) break;
-                current_device = begin->device;
-            }
+         // Set current device ordinal if necessary
+         if (begin->device != current_device)
+         {
+            if ((error = cudaSetDevice(begin->device))) break;
+            current_device = begin->device;
+         }
 
-            // Free device memory
-            if ((error = cudaFree(begin->d_ptr))) break;
-            if ((error = cudaEventDestroy(begin->ready_event))) break;
+         // Free device memory
+         if ((error = cudaFree(begin->d_ptr))) break;
+         if ((error = cudaEventDestroy(begin->ready_event))) break;
 
-            // Reduce balance and erase entry
-            cached_bytes[current_device].free -= begin->bytes;
+         // Reduce balance and erase entry
+         cached_bytes[current_device].free -= begin->bytes;
 
-            if (debug)
-                printf("\tDevice %d freed %zu bytes.\n\t\t  %zu available blocks cached (%zu bytes), %zu "
-                       "live blocks (%zu bytes) outstanding.\n",
-                       current_device, begin->bytes, cached_blocks.size(), cached_bytes[current_device].free,
-                       live_blocks.size(), cached_bytes[current_device].live);
+         if (debug) printf("\tDevice %d freed %zu bytes.\n\t\t  %zu available blocks cached (%zu bytes), %zu live blocks (%zu bytes) outstanding.\n",
+               current_device, begin->bytes, cached_blocks.size(), cached_bytes[current_device].free, live_blocks.size(), cached_bytes[current_device].live);
 
-            cached_blocks.erase(begin);
-        }
+         cached_blocks.erase(begin);
+      }
 
-        mutex.Unlock();
+      mutex.Unlock();
 
-        // Attempt to revert back to entry-point device if necessary
-        if (entrypoint_device != INVALID_DEVICE_ORDINAL) {
-            if ((error = cudaSetDevice(entrypoint_device))) return error;
-        }
+      // Attempt to revert back to entry-point device if necessary
+      if (entrypoint_device != INVALID_DEVICE_ORDINAL)
+      {
+         if ((error = cudaSetDevice(entrypoint_device))) return error;
+      }
 
-        return error;
-    }
+      return error;
+   }
 
-    /**
+
+   /**
     * \brief Destructor
     */
-    virtual ~hypre_cub_CachingDeviceAllocator() {
-        if (!skip_cleanup) FreeAllCached();
-    }
+   virtual ~hypre_cub_CachingDeviceAllocator()
+   {
+      if (!skip_cleanup)
+         FreeAllCached();
+   }
 };
 
-#endif// #if defined(HYPRE_USING_CUDA) && defined(HYPRE_USING_DEVICE_POOL)
-#endif// #ifndef HYPRE_CUB_ALLOCATOR_HEADER
+#endif // #if defined(HYPRE_USING_CUDA) && defined(HYPRE_USING_DEVICE_POOL)
+#endif // #ifndef HYPRE_CUB_ALLOCATOR_HEADER
+
 
 #ifdef __cplusplus
 }
 #endif
 
 #endif
+
diff --git a/external/hypre/src/utilities/amg_linklist.c b/external/hypre/src/utilities/amg_linklist.c
index 8a66fd21..1b89f014 100644
--- a/external/hypre/src/utilities/amg_linklist.c
+++ b/external/hypre/src/utilities/amg_linklist.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -32,17 +32,17 @@ void hypre_dispose_elt ( hypre_LinkList element_ptr )
 
 
 /*****************************************************************
- * 
+ *
  * remove_point:   removes a point from the lists
  *
  ****************************************************************/
-void 
-hypre_remove_point(hypre_LinkList   *LoL_head_ptr, 
-             hypre_LinkList         *LoL_tail_ptr, 
-             HYPRE_Int               measure,
-             HYPRE_Int               index, 
-             HYPRE_Int              *lists, 
-             HYPRE_Int              *where)
+void
+hypre_remove_point(hypre_LinkList   *LoL_head_ptr,
+                   hypre_LinkList         *LoL_tail_ptr,
+                   HYPRE_Int               measure,
+                   HYPRE_Int               index,
+                   HYPRE_Int              *lists,
+                   HYPRE_Int              *where)
 
 {
    hypre_LinkList  LoL_head = *LoL_head_ptr;
@@ -122,9 +122,10 @@ hypre_remove_point(hypre_LinkList   *LoL_head_ptr,
          }
       }
       list_ptr = list_ptr -> next_elt;
-   } while (list_ptr != NULL);
+   }
+   while (list_ptr != NULL);
 
-   hypre_error_w_msg(HYPRE_ERROR_GENERIC,"No such list!\n");
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "No such list!\n");
 
    return ;
 }
@@ -138,14 +139,14 @@ hypre_LinkList hypre_create_elt( HYPRE_Int Item )
 {
    hypre_LinkList   new_elt_ptr;
 
-   /* Allocate memory space for the new node. 
+   /* Allocate memory space for the new node.
     * return with error if no space available
     */
    if ( (new_elt_ptr = hypre_TAlloc(hypre_ListElement, 1, HYPRE_MEMORY_HOST)) == NULL)
    {
-      hypre_error_w_msg(HYPRE_ERROR_GENERIC,"\n create_elt: malloc failed \n\n");
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "\n create_elt: malloc failed \n\n");
    }
-   else 
+   else
       /* new_elt_ptr = hypre_CTAlloc(hypre_LinkList, 1); */
    {
       new_elt_ptr -> data = Item;
@@ -159,16 +160,16 @@ hypre_LinkList hypre_create_elt( HYPRE_Int Item )
 }
 
 /*****************************************************************
- * 
+ *
  * enter_on_lists  places point in new list
  *
  ****************************************************************/
-void 
-hypre_enter_on_lists(hypre_LinkList   *LoL_head_ptr, 
-                     hypre_LinkList   *LoL_tail_ptr, 
+void
+hypre_enter_on_lists(hypre_LinkList   *LoL_head_ptr,
+                     hypre_LinkList   *LoL_tail_ptr,
                      HYPRE_Int         measure,
-                     HYPRE_Int         index, 
-                     HYPRE_Int        *lists, 
+                     HYPRE_Int         index,
+                     HYPRE_Int        *lists,
                      HYPRE_Int        *where)
 {
    hypre_LinkList   LoL_head = *LoL_head_ptr;
@@ -187,7 +188,7 @@ hypre_enter_on_lists(hypre_LinkList   *LoL_head_ptr,
       new_ptr->head = index;
       new_ptr->tail = index;
       lists[index] = hypre_LIST_TAIL;
-      where[index] = hypre_LIST_HEAD; 
+      where[index] = hypre_LIST_HEAD;
       LoL_head = new_ptr;
       LoL_tail = new_ptr;
 
@@ -208,9 +209,9 @@ hypre_enter_on_lists(hypre_LinkList   *LoL_head_ptr,
             where[index] = hypre_LIST_HEAD;
 
             if ( list_ptr->prev_elt != NULL)
-            { 
+            {
                new_ptr->prev_elt            = list_ptr->prev_elt;
-               list_ptr->prev_elt->next_elt = new_ptr;   
+               list_ptr->prev_elt->next_elt = new_ptr;
                list_ptr->prev_elt           = new_ptr;
                new_ptr->next_elt            = list_ptr;
             }
@@ -223,7 +224,7 @@ hypre_enter_on_lists(hypre_LinkList   *LoL_head_ptr,
             }
 
             *LoL_head_ptr = LoL_head;
-            *LoL_tail_ptr = LoL_tail; 
+            *LoL_tail_ptr = LoL_tail;
             return;
          }
          else if (measure == list_ptr->data)
@@ -237,9 +238,10 @@ hypre_enter_on_lists(hypre_LinkList   *LoL_head_ptr,
          }
 
          list_ptr = list_ptr->next_elt;
-      } while (list_ptr != NULL);
+      }
+      while (list_ptr != NULL);
 
-      new_ptr = hypre_create_elt(measure);   
+      new_ptr = hypre_create_elt(measure);
       new_ptr->head = index;
       new_ptr->tail = index;
       lists[index] = hypre_LIST_TAIL;
diff --git a/external/hypre/src/utilities/amg_linklist.h b/external/hypre/src/utilities/amg_linklist.h
index 3a4b608d..ebce87ad 100644
--- a/external/hypre/src/utilities/amg_linklist.h
+++ b/external/hypre/src/utilities/amg_linklist.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/utilities/ap.c b/external/hypre/src/utilities/ap.c
index 9ca8ed12..c1e2ab35 100644
--- a/external/hypre/src/utilities/ap.c
+++ b/external/hypre/src/utilities/ap.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -13,7 +13,7 @@
 
 
 /* returns 1 if the assumed partition is in use */
-HYPRE_Int HYPRE_AssumedPartitionCheck()
+HYPRE_Int HYPRE_AssumedPartitionCheck(void)
 {
    return 1;
 }
diff --git a/external/hypre/src/utilities/base.h b/external/hypre/src/utilities/base.h
new file mode 100644
index 00000000..0877c3f3
--- /dev/null
+++ b/external/hypre/src/utilities/base.h
@@ -0,0 +1,33 @@
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+#ifndef HYPRE_BASE_HEADER
+#define HYPRE_BASE_HEADER
+
+/******************************************************************************
+ *
+ * Base private solver struct
+ *
+ *****************************************************************************/
+
+typedef struct
+{
+   HYPRE_PtrToSolverFcn   setup;
+   HYPRE_PtrToSolverFcn   solve;
+   HYPRE_PtrToDestroyFcn  destroy;
+
+} hypre_Solver;
+
+/*--------------------------------------------------------------------------
+ * Accessor functions for the hypre_Solver structure
+ *--------------------------------------------------------------------------*/
+
+#define hypre_SolverSetup(data)       ((data) -> setup)
+#define hypre_SolverSolve(data)       ((data) -> solve)
+#define hypre_SolverDestroy(data)     ((data) -> destroy)
+
+#endif /* HYPRE_BASE_HEADER */
diff --git a/external/hypre/src/utilities/binsearch.c b/external/hypre/src/utilities/binsearch.c
index 34932528..786d2db4 100644
--- a/external/hypre/src/utilities/binsearch.c
+++ b/external/hypre/src/utilities/binsearch.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -20,7 +20,7 @@ HYPRE_Int hypre_BinarySearch(HYPRE_Int *list, HYPRE_Int value, HYPRE_Int list_le
    HYPRE_Int not_found = 1;
 
    low = 0;
-   high = list_length-1;
+   high = list_length - 1;
    while (not_found && low <= high)
    {
       m = (low + high) / 2;
@@ -30,12 +30,12 @@ HYPRE_Int hypre_BinarySearch(HYPRE_Int *list, HYPRE_Int value, HYPRE_Int list_le
       }
       else if (value > list[m])
       {
-        low = m + 1;
+         low = m + 1;
       }
       else
       {
-        not_found = 0;
-        return m;
+         not_found = 0;
+         return m;
       }
    }
    return -1;
@@ -54,22 +54,22 @@ HYPRE_Int hypre_BigBinarySearch(HYPRE_BigInt *list, HYPRE_BigInt value, HYPRE_In
    HYPRE_Int not_found = 1;
 
    low = 0;
-   high = list_length-1;
+   high = list_length - 1;
    while (not_found && low <= high)
    {
-      m = low + (high-low) / 2;
+      m = low + (high - low) / 2;
       if (value < list[m])
       {
          high = m - 1;
       }
       else if (value > list[m])
       {
-        low = m + 1;
+         low = m + 1;
       }
       else
       {
-        not_found = 0;
-        return m;
+         not_found = 0;
+         return m;
       }
    }
    return -1;
@@ -85,19 +85,24 @@ HYPRE_Int hypre_BigBinarySearch(HYPRE_BigInt *list, HYPRE_BigInt value, HYPRE_In
 
  *--------------------------------------------------------------------------*/
 
-HYPRE_Int hypre_BinarySearch2(HYPRE_Int *list, HYPRE_Int value, HYPRE_Int low, HYPRE_Int high, HYPRE_Int *spot)
+HYPRE_Int hypre_BinarySearch2(HYPRE_Int *list, HYPRE_Int value, HYPRE_Int low, HYPRE_Int high,
+                              HYPRE_Int *spot)
 {
 
    HYPRE_Int m;
 
    while (low <= high)
    {
-      m = low + (high - low)/2;
+      m = low + (high - low) / 2;
 
       if (value < list[m])
+      {
          high = m - 1;
+      }
       else if (value > list[m])
+      {
          low = m + 1;
+      }
       else
       {
          *spot = m;
@@ -120,13 +125,15 @@ HYPRE_Int *hypre_LowerBound( HYPRE_Int *first, HYPRE_Int *last, HYPRE_Int value
    HYPRE_Int *it;
    HYPRE_Int count = last - first, step;
 
-   while (count > 0) {
-      it = first; step = count/2; it += step;
-      if (*it < value) {
+   while (count > 0)
+   {
+      it = first; step = count / 2; it += step;
+      if (*it < value)
+      {
          first = ++it;
          count -= step + 1;
       }
-      else count = step;
+      else { count = step; }
    }
    return first;
 }
@@ -139,13 +146,15 @@ HYPRE_BigInt *hypre_BigLowerBound( HYPRE_BigInt *first, HYPRE_BigInt *last, HYPR
    HYPRE_BigInt *it;
    HYPRE_BigInt count = last - first, step;
 
-   while (count > 0) {
-      it = first; step = count/2; it += step;
-      if (*it < value) {
+   while (count > 0)
+   {
+      it = first; step = count / 2; it += step;
+      if (*it < value)
+      {
          first = ++it;
          count -= step + 1;
       }
-      else count = step;
+      else { count = step; }
    }
    return first;
 }
diff --git a/external/hypre/src/utilities/caliper_instrumentation.h b/external/hypre/src/utilities/caliper_instrumentation.h
index cf59c757..57fdcbcc 100644
--- a/external/hypre/src/utilities/caliper_instrumentation.h
+++ b/external/hypre/src/utilities/caliper_instrumentation.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -19,7 +19,8 @@
 #ifdef HYPRE_USING_CALIPER
 
 #ifdef __cplusplus
-extern "C++" {
+extern "C++"
+{
 #endif
 
 #include <caliper/cali.h>
@@ -28,9 +29,6 @@ extern "C++" {
 }
 #endif
 
-static char hypre__levelname[16];
-static char hypre__markname[1024];
-
 #define HYPRE_ANNOTATE_FUNC_BEGIN          CALI_MARK_FUNCTION_BEGIN
 #define HYPRE_ANNOTATE_FUNC_END            CALI_MARK_FUNCTION_END
 #define HYPRE_ANNOTATE_LOOP_BEGIN(id, str) CALI_MARK_LOOP_BEGIN(id, str)
@@ -39,21 +37,25 @@ static char hypre__markname[1024];
 #define HYPRE_ANNOTATE_ITER_END(id)        CALI_MARK_ITERATION_END(id)
 #define HYPRE_ANNOTATE_REGION_BEGIN(...)\
 {\
+   char hypre__markname[1024];\
    hypre_sprintf(hypre__markname, __VA_ARGS__);\
    CALI_MARK_BEGIN(hypre__markname);\
 }
 #define HYPRE_ANNOTATE_REGION_END(...)\
 {\
+   char hypre__markname[1024];\
    hypre_sprintf(hypre__markname, __VA_ARGS__);\
    CALI_MARK_END(hypre__markname);\
 }
 #define HYPRE_ANNOTATE_MGLEVEL_BEGIN(lvl)\
 {\
+   char hypre__levelname[16];\
    hypre_sprintf(hypre__levelname, "MG level %d", lvl);\
    CALI_MARK_BEGIN(hypre__levelname);\
 }
 #define HYPRE_ANNOTATE_MGLEVEL_END(lvl)\
 {\
+   char hypre__levelname[16];\
    hypre_sprintf(hypre__levelname, "MG level %d", lvl);\
    CALI_MARK_END(hypre__levelname);\
 }
diff --git a/external/hypre/src/utilities/complex.c b/external/hypre/src/utilities/complex.c
index eb8dca4f..a53b7c2a 100644
--- a/external/hypre/src/utilities/complex.c
+++ b/external/hypre/src/utilities/complex.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -14,25 +14,61 @@
 HYPRE_Complex
 hypre_conj( HYPRE_Complex value )
 {
+#if defined(HYPRE_SINGLE)
+   return conjf(value);
+#elif defined(HYPRE_LONG_DOUBLE)
+   return conjl(value);
+#else
    return conj(value);
+#endif
 }
 
 HYPRE_Real
 hypre_cabs( HYPRE_Complex value )
 {
+#if defined(HYPRE_SINGLE)
+   return cabsf(value);
+#elif defined(HYPRE_LONG_DOUBLE)
+   return cabsl(value);
+#else
    return cabs(value);
+#endif
 }
 
 HYPRE_Real
 hypre_creal( HYPRE_Complex value )
 {
+#if defined(HYPRE_SINGLE)
+   return crealf(value);
+#elif defined(HYPRE_LONG_DOUBLE)
+   return creall(value);
+#else
    return creal(value);
+#endif
 }
 
 HYPRE_Real
 hypre_cimag( HYPRE_Complex value )
 {
+#if defined(HYPRE_SINGLE)
+   return cimagf(value);
+#elif defined(HYPRE_LONG_DOUBLE)
+   return cimagl(value);
+#else
    return cimag(value);
+#endif
+}
+
+HYPRE_Complex
+hypre_csqrt( HYPRE_Complex value )
+{
+#if defined(HYPRE_SINGLE)
+   return csqrtf(value);
+#elif defined(HYPRE_LONG_DOUBLE)
+   return csqrtl(value);
+#else
+   return csqrt(value);
+#endif
 }
 
 #endif
diff --git a/external/hypre/src/utilities/cuda_utils.c b/external/hypre/src/utilities/cuda_utils.c
deleted file mode 100644
index 14ff64e8..00000000
--- a/external/hypre/src/utilities/cuda_utils.c
+++ /dev/null
@@ -1,1420 +0,0 @@
-/******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
- * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
- *
- * SPDX-License-Identifier: (Apache-2.0 OR MIT)
- ******************************************************************************/
-
-#include "_hypre_utilities.h"
-#include "_hypre_utilities.hpp"
-
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-
-/*
- * The architecture identification macro __CUDA_ARCH__ is assigned a three-digit value string xy0
- * (ending in a literal 0) during each nvcc compilation stage 1 that compiles for compute_xy.
- * This macro can be used in the implementation of GPU functions for determining the virtual architecture
- * for which it is currently being compiled. The host code (the non-GPU code) must not depend on it.
- * Note that compute_XX refers to a PTX version and sm_XX refers to a cubin version.
-*/
-__global__ void
-hypreCUDAKernel_CompileFlagSafetyCheck(hypre_int *cuda_arch_compile)
-{
-#if defined(__CUDA_ARCH__)
-   cuda_arch_compile[0] = __CUDA_ARCH__;
-#endif
-}
-
-/*
- * Assume this function is called inside HYPRE_Init(), at a place where we do not want to
- * activate memory pooling, so we do not use hypre's memory model to Alloc and Free.
- * See commented out code below (and do not delete)
-*/
-void hypre_CudaCompileFlagCheck()
-{
-  // This is really only defined for CUDA and not for HIP
-#if defined(HYPRE_USING_CUDA)
-
-   HYPRE_Int device = hypre_HandleCudaDevice(hypre_handle());
-
-   struct cudaDeviceProp props;
-   cudaGetDeviceProperties(&props, device);
-   hypre_int cuda_arch_actual = props.major*100 + props.minor*10;
-   hypre_int cuda_arch_compile = -1;
-   dim3 gDim(1,1,1), bDim(1,1,1);
-
-   hypre_int *cuda_arch_compile_d = NULL;
-   //cuda_arch_compile_d = hypre_TAlloc(hypre_int, 1, HYPRE_MEMORY_DEVICE);
-   HYPRE_CUDA_CALL( cudaMalloc(&cuda_arch_compile_d, sizeof(hypre_int)) );
-   hypre_TMemcpy(cuda_arch_compile_d, &cuda_arch_compile, hypre_int, 1, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);
-   HYPRE_CUDA_LAUNCH( hypreCUDAKernel_CompileFlagSafetyCheck, gDim, bDim, cuda_arch_compile_d );
-   hypre_TMemcpy(&cuda_arch_compile, cuda_arch_compile_d, hypre_int, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
-   //hypre_TFree(cuda_arch_compile_d, HYPRE_MEMORY_DEVICE);
-   HYPRE_CUDA_CALL( cudaFree(cuda_arch_compile_d) );
-
-   /* HYPRE_CUDA_CALL(cudaDeviceSynchronize()); */
-
-   if (-1 == cuda_arch_compile)
-   {
-      hypre_error_w_msg(1, "hypre error: no proper cuda_arch found");
-   }
-   else if (cuda_arch_actual != cuda_arch_compile)
-   {
-      char msg[256];
-      hypre_sprintf(msg, "hypre warning: Compile 'arch=compute_' does not match device arch %d", cuda_arch_actual);
-      hypre_error_w_msg(1, msg);
-      /*
-      hypre_printf("%s\n", msg);
-      hypre_MPI_Abort(hypre_MPI_COMM_WORLD, -1);
-      */
-   }
-
-#endif // defined(HYPRE_USING_CUDA)
-}
-
-dim3
-hypre_GetDefaultCUDABlockDimension()
-{
-   dim3 bDim(512, 1, 1);
-
-   return bDim;
-}
-
-dim3
-hypre_GetDefaultCUDAGridDimension( HYPRE_Int n,
-                                   const char *granularity,
-                                   dim3 bDim )
-{
-   HYPRE_Int num_blocks = 0;
-   HYPRE_Int num_threads_per_block = bDim.x * bDim.y * bDim.z;
-
-   if (granularity[0] == 't')
-   {
-      num_blocks = (n + num_threads_per_block - 1) / num_threads_per_block;
-   }
-   else if (granularity[0] == 'w')
-   {
-      HYPRE_Int num_warps_per_block = num_threads_per_block >> HYPRE_WARP_BITSHIFT;
-
-      hypre_assert(num_warps_per_block * HYPRE_WARP_SIZE == num_threads_per_block);
-
-      num_blocks = (n + num_warps_per_block - 1) / num_warps_per_block;
-   }
-   else
-   {
-      hypre_printf("Error %s %d: Unknown granularity !\n", __FILE__, __LINE__);
-      hypre_assert(0);
-   }
-
-   dim3 gDim(num_blocks, 1, 1);
-
-   return gDim;
-}
-
-/**
- * Get NNZ of each row in d_row_indices and stored the results in d_rownnz
- * All pointers are device pointers.
- * d_rownnz can be the same as d_row_indices
- */
-__global__ void
-hypreCUDAKernel_GetRowNnz(HYPRE_Int nrows, HYPRE_Int *d_row_indices, HYPRE_Int *d_diag_ia, HYPRE_Int *d_offd_ia,
-                          HYPRE_Int *d_rownnz)
-{
-   const HYPRE_Int global_thread_id = hypre_cuda_get_grid_thread_id<1,1>();
-
-   if (global_thread_id < nrows)
-   {
-      HYPRE_Int i;
-
-      if (d_row_indices)
-      {
-         i = read_only_load(&d_row_indices[global_thread_id]);
-      }
-      else
-      {
-         i = global_thread_id;
-      }
-
-      d_rownnz[global_thread_id] = read_only_load(&d_diag_ia[i+1]) - read_only_load(&d_diag_ia[i]) +
-                                   read_only_load(&d_offd_ia[i+1]) - read_only_load(&d_offd_ia[i]);
-   }
-}
-
-/* special case: if d_row_indices == NULL, it means d_row_indices=[0,1,...,nrows-1] */
-HYPRE_Int
-hypreDevice_GetRowNnz(HYPRE_Int nrows, HYPRE_Int *d_row_indices, HYPRE_Int *d_diag_ia, HYPRE_Int *d_offd_ia,
-                      HYPRE_Int *d_rownnz)
-{
-   const dim3 bDim = hypre_GetDefaultCUDABlockDimension();
-   const dim3 gDim = hypre_GetDefaultCUDAGridDimension(nrows, "thread", bDim);
-
-   /* trivial case */
-   if (nrows <= 0)
-   {
-      return hypre_error_flag;
-   }
-
-   HYPRE_CUDA_LAUNCH( hypreCUDAKernel_GetRowNnz, gDim, bDim, nrows, d_row_indices, d_diag_ia, d_offd_ia, d_rownnz );
-
-   return hypre_error_flag;
-}
-
-__global__ void
-hypreCUDAKernel_CopyParCSRRows(HYPRE_Int      nrows,
-                               HYPRE_Int     *d_row_indices,
-                               HYPRE_Int      has_offd,
-                               HYPRE_BigInt   first_col,
-                               HYPRE_BigInt  *d_col_map_offd_A,
-                               HYPRE_Int     *d_diag_i,
-                               HYPRE_Int     *d_diag_j,
-                               HYPRE_Complex *d_diag_a,
-                               HYPRE_Int     *d_offd_i,
-                               HYPRE_Int     *d_offd_j,
-                               HYPRE_Complex *d_offd_a,
-                               HYPRE_Int     *d_ib,
-                               HYPRE_BigInt  *d_jb,
-                               HYPRE_Complex *d_ab)
-{
-   const HYPRE_Int global_warp_id = hypre_cuda_get_grid_warp_id<1,1>();
-
-   if (global_warp_id >= nrows)
-   {
-      return;
-   }
-
-   /* lane id inside the warp */
-   const HYPRE_Int lane_id = hypre_cuda_get_lane_id<1>();
-   HYPRE_Int i, j, k, p, row, istart, iend, bstart;
-
-   /* diag part */
-   if (lane_id < 2)
-   {
-      /* row index to work on */
-      if (d_row_indices)
-      {
-         row = read_only_load(d_row_indices + global_warp_id);
-      }
-      else
-      {
-         row = global_warp_id;
-      }
-      /* start/end position of the row */
-      j = read_only_load(d_diag_i + row + lane_id);
-      /* start position of b */
-      k = d_ib ? read_only_load(d_ib + global_warp_id) : 0;
-   }
-   istart = __shfl_sync(HYPRE_WARP_FULL_MASK, j, 0);
-   iend   = __shfl_sync(HYPRE_WARP_FULL_MASK, j, 1);
-   bstart = __shfl_sync(HYPRE_WARP_FULL_MASK, k, 0);
-
-   p = bstart - istart;
-   for (i = istart + lane_id; i < iend; i += HYPRE_WARP_SIZE)
-   {
-      d_jb[p+i] = read_only_load(d_diag_j + i) + first_col;
-      if (d_ab)
-      {
-         d_ab[p+i] = read_only_load(d_diag_a + i);
-      }
-   }
-
-   if (!has_offd)
-   {
-      return;
-   }
-
-   /* offd part */
-   if (lane_id < 2)
-   {
-      j = read_only_load(d_offd_i + row + lane_id);
-   }
-   bstart += iend - istart;
-   istart = __shfl_sync(HYPRE_WARP_FULL_MASK, j, 0);
-   iend   = __shfl_sync(HYPRE_WARP_FULL_MASK, j, 1);
-
-   p = bstart - istart;
-   for (i = istart + lane_id; i < iend; i += HYPRE_WARP_SIZE)
-   {
-      if (d_col_map_offd_A)
-      {
-         d_jb[p+i] = d_col_map_offd_A[read_only_load(d_offd_j + i)];
-      }
-      else
-      {
-         d_jb[p+i] = -1 - read_only_load(d_offd_j + i);
-      }
-
-      if (d_ab)
-      {
-         d_ab[p+i] = read_only_load(d_offd_a + i);
-      }
-   }
-}
-
-/* B = A(row_indices, :) */
-/* Note: d_ib is an input vector that contains row ptrs,
- *       i.e., start positions where to put the rows in d_jb and d_ab.
- *       The col indices in B are global indices, i.e., BigJ
- *       of length (nrows + 1) or nrow (without the last entry, nnz) */
-/* Special cases:
- *    if d_row_indices == NULL, it means d_row_indices=[0,1,...,nrows-1]
- *    If col_map_offd_A == NULL, use (-1 - d_offd_j) as column id
- *    If nrows == 1 and d_ib == NULL, it means d_ib[0] = 0 */
-HYPRE_Int
-hypreDevice_CopyParCSRRows(HYPRE_Int      nrows,
-                           HYPRE_Int     *d_row_indices,
-                           HYPRE_Int      job,
-                           HYPRE_Int      has_offd,
-                           HYPRE_BigInt   first_col,
-                           HYPRE_BigInt  *d_col_map_offd_A,
-                           HYPRE_Int     *d_diag_i,
-                           HYPRE_Int     *d_diag_j,
-                           HYPRE_Complex *d_diag_a,
-                           HYPRE_Int     *d_offd_i,
-                           HYPRE_Int     *d_offd_j,
-                           HYPRE_Complex *d_offd_a,
-                           HYPRE_Int     *d_ib,
-                           HYPRE_BigInt  *d_jb,
-                           HYPRE_Complex *d_ab)
-{
-   /* trivial case */
-   if (nrows <= 0)
-   {
-      return hypre_error_flag;
-   }
-
-   hypre_assert(!(nrows > 1 && d_ib == NULL));
-
-   const dim3 bDim = hypre_GetDefaultCUDABlockDimension();
-   const dim3 gDim = hypre_GetDefaultCUDAGridDimension(nrows, "warp", bDim);
-
-   /*
-   if (job == 2)
-   {
-   }
-   */
-
-   HYPRE_CUDA_LAUNCH( hypreCUDAKernel_CopyParCSRRows, gDim, bDim,
-                      nrows, d_row_indices, has_offd, first_col, d_col_map_offd_A,
-                      d_diag_i, d_diag_j, d_diag_a,
-                      d_offd_i, d_offd_j, d_offd_a,
-                      d_ib, d_jb, d_ab );
-
-   return hypre_error_flag;
-}
-
-HYPRE_Int
-hypreDevice_IntegerReduceSum(HYPRE_Int n, HYPRE_Int *d_i)
-{
-   return HYPRE_THRUST_CALL(reduce, d_i, d_i + n);
-}
-
-HYPRE_Int
-hypreDevice_IntegerInclusiveScan(HYPRE_Int n, HYPRE_Int *d_i)
-{
-   HYPRE_THRUST_CALL(inclusive_scan, d_i, d_i + n, d_i);
-
-   return hypre_error_flag;
-}
-
-HYPRE_Int
-hypreDevice_IntegerExclusiveScan(HYPRE_Int n, HYPRE_Int *d_i)
-{
-   HYPRE_THRUST_CALL(exclusive_scan, d_i, d_i + n, d_i);
-
-   return hypre_error_flag;
-}
-
-HYPRE_Int
-hypreDevice_Scalen(HYPRE_Complex *d_x, size_t n, HYPRE_Complex v)
-{
-   HYPRE_THRUST_CALL( transform, d_x, d_x + n, d_x, v * _1 );
-
-   return hypre_error_flag;
-}
-
-HYPRE_Int
-hypreDevice_Filln(HYPRE_Complex *d_x, size_t n, HYPRE_Complex v)
-{
-   HYPRE_THRUST_CALL( fill_n, d_x, n, v);
-
-   return hypre_error_flag;
-}
-
-HYPRE_Int
-hypreDevice_BigIntFilln(HYPRE_BigInt *d_x, size_t n, HYPRE_BigInt v)
-{
-   HYPRE_THRUST_CALL( fill_n, d_x, n, v);
-
-   return hypre_error_flag;
-}
-
-struct hypre_empty_row_functor
-{
-   // This is needed for clang
-   typedef bool result_type;
-
-   __device__
-   bool operator()(const thrust::tuple<HYPRE_Int, HYPRE_Int>& t) const
-   {
-      const HYPRE_Int a = thrust::get<0>(t);
-      const HYPRE_Int b = thrust::get<1>(t);
-
-      return a != b;
-   }
-};
-
-HYPRE_Int*
-hypreDevice_CsrRowPtrsToIndices(HYPRE_Int nrows, HYPRE_Int nnz, HYPRE_Int *d_row_ptr)
-{
-   /* trivial case */
-   if (nrows <= 0 || nnz <= 0)
-   {
-      return NULL;
-   }
-
-   HYPRE_Int *d_row_ind = hypre_TAlloc(HYPRE_Int, nnz, HYPRE_MEMORY_DEVICE);
-
-   hypreDevice_CsrRowPtrsToIndices_v2(nrows, nnz, d_row_ptr, d_row_ind);
-
-   return d_row_ind;
-}
-
-HYPRE_Int
-hypreDevice_CsrRowPtrsToIndices_v2(HYPRE_Int nrows, HYPRE_Int nnz, HYPRE_Int *d_row_ptr, HYPRE_Int *d_row_ind)
-{
-   /* trivial case */
-   if (nrows <= 0 || nnz <= 0)
-   {
-      return hypre_error_flag;
-   }
-
-   HYPRE_THRUST_CALL( fill, d_row_ind, d_row_ind + nnz, 0 );
-
-   HYPRE_THRUST_CALL( scatter_if,
-                      thrust::counting_iterator<HYPRE_Int>(0),
-                      thrust::counting_iterator<HYPRE_Int>(nrows),
-                      d_row_ptr,
-                      thrust::make_transform_iterator( thrust::make_zip_iterator(thrust::make_tuple(d_row_ptr, d_row_ptr+1)),
-                                                       hypre_empty_row_functor() ),
-                      d_row_ind );
-
-   HYPRE_THRUST_CALL( inclusive_scan, d_row_ind, d_row_ind + nnz, d_row_ind, thrust::maximum<HYPRE_Int>());
-
-   return hypre_error_flag;
-}
-
-/* Input: d_row_num, of size nrows, contains the rows indices that can be BigInt or Int
- * Output: d_row_ind */
-template <typename T>
-HYPRE_Int
-hypreDevice_CsrRowPtrsToIndicesWithRowNum(HYPRE_Int nrows, HYPRE_Int nnz, HYPRE_Int *d_row_ptr, T *d_row_num, T *d_row_ind)
-{
-   /* trivial case */
-   if (nrows <= 0)
-   {
-      return hypre_error_flag;
-   }
-
-   HYPRE_Int *map = hypre_TAlloc(HYPRE_Int, nnz, HYPRE_MEMORY_DEVICE);
-
-   hypreDevice_CsrRowPtrsToIndices_v2(nrows, nnz, d_row_ptr, map);
-
-   HYPRE_THRUST_CALL(gather, map, map + nnz, d_row_num, d_row_ind);
-
-   hypre_TFree(map, HYPRE_MEMORY_DEVICE);
-
-   return hypre_error_flag;
-}
-
-template HYPRE_Int hypreDevice_CsrRowPtrsToIndicesWithRowNum(HYPRE_Int nrows, HYPRE_Int nnz, HYPRE_Int *d_row_ptr, HYPRE_Int *d_row_num, HYPRE_Int *d_row_ind);
-#if defined(HYPRE_MIXEDINT)
-template HYPRE_Int hypreDevice_CsrRowPtrsToIndicesWithRowNum(HYPRE_Int nrows, HYPRE_Int nnz, HYPRE_Int *d_row_ptr, HYPRE_BigInt *d_row_num, HYPRE_BigInt *d_row_ind);
-#endif
-
-HYPRE_Int*
-hypreDevice_CsrRowIndicesToPtrs(HYPRE_Int nrows, HYPRE_Int nnz, HYPRE_Int *d_row_ind)
-{
-   HYPRE_Int *d_row_ptr = hypre_TAlloc(HYPRE_Int, nrows+1, HYPRE_MEMORY_DEVICE);
-
-   HYPRE_THRUST_CALL( lower_bound,
-                      d_row_ind, d_row_ind + nnz,
-                      thrust::counting_iterator<HYPRE_Int>(0),
-                      thrust::counting_iterator<HYPRE_Int>(nrows+1),
-                      d_row_ptr);
-
-   return d_row_ptr;
-}
-
-HYPRE_Int
-hypreDevice_CsrRowIndicesToPtrs_v2(HYPRE_Int nrows, HYPRE_Int nnz, HYPRE_Int *d_row_ind, HYPRE_Int *d_row_ptr)
-{
-   HYPRE_THRUST_CALL( lower_bound,
-                      d_row_ind, d_row_ind + nnz,
-                      thrust::counting_iterator<HYPRE_Int>(0),
-                      thrust::counting_iterator<HYPRE_Int>(nrows+1),
-                      d_row_ptr);
-
-   return hypre_error_flag;
-}
-
-__global__ void
-hypreCUDAKernel_ScatterAddTrivial(HYPRE_Int n, HYPRE_Real *x, HYPRE_Int *map, HYPRE_Real *y)
-{
-   for (HYPRE_Int i = 0; i < n; i++)
-   {
-      x[map[i]] += y[i];
-   }
-}
-
-/* x[map[i]] += y[i], same index cannot appear more than once in map */
-__global__ void
-hypreCUDAKernel_ScatterAdd(HYPRE_Int n, HYPRE_Real *x, HYPRE_Int *map, HYPRE_Real *y)
-{
-   HYPRE_Int global_thread_id = hypre_cuda_get_grid_thread_id<1,1>();
-
-   if (global_thread_id < n)
-   {
-      x[map[global_thread_id]] += y[global_thread_id];
-   }
-}
-
-/* Generalized Scatter-and-Add
- * for i = 0 : ny-1, x[map[i]] += y[i];
- * Note: An index is allowed to appear more than once in map
- *       Content in y will be destroyed
- *       When work != NULL, work is at least of size [2*sizeof(HYPRE_Int)+sizeof(HYPRE_Complex)]*ny
- */
-HYPRE_Int
-hypreDevice_GenScatterAdd(HYPRE_Real *x, HYPRE_Int ny, HYPRE_Int *map, HYPRE_Real *y, char *work)
-{
-   if (ny <= 0)
-   {
-      return hypre_error_flag;
-   }
-
-   if (ny <= 2)
-   {
-      /* trivial cases, n = 1, 2 */
-      dim3 bDim = 1;
-      dim3 gDim = 1;
-      HYPRE_CUDA_LAUNCH( hypreCUDAKernel_ScatterAddTrivial, gDim, bDim, ny, x, map, y );
-   }
-   else
-   {
-      /* general cases */
-      HYPRE_Int *map2, *reduced_map, reduced_n;
-      HYPRE_Real *reduced_y;
-
-      if (work)
-      {
-         map2 = (HYPRE_Int *) work;
-         reduced_map = map2 + ny;
-         reduced_y = (HYPRE_Real *) (reduced_map + ny);
-      }
-      else
-      {
-         map2        = hypre_TAlloc(HYPRE_Int,  ny, HYPRE_MEMORY_DEVICE);
-         reduced_map = hypre_TAlloc(HYPRE_Int,  ny, HYPRE_MEMORY_DEVICE);
-         reduced_y   = hypre_TAlloc(HYPRE_Real, ny, HYPRE_MEMORY_DEVICE);
-      }
-
-      hypre_TMemcpy(map2, map, HYPRE_Int, ny, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
-
-      HYPRE_THRUST_CALL(sort_by_key, map2, map2 + ny, y);
-
-      thrust::pair<HYPRE_Int*, HYPRE_Real*> new_end = HYPRE_THRUST_CALL( reduce_by_key,
-                                                                         map2,
-                                                                         map2 + ny,
-                                                                         y,
-                                                                         reduced_map,
-                                                                         reduced_y );
-
-      reduced_n = new_end.first - reduced_map;
-
-      hypre_assert(reduced_n == new_end.second - reduced_y);
-
-      dim3 bDim = hypre_GetDefaultCUDABlockDimension();
-      dim3 gDim = hypre_GetDefaultCUDAGridDimension(reduced_n, "thread", bDim);
-
-      HYPRE_CUDA_LAUNCH( hypreCUDAKernel_ScatterAdd, gDim, bDim,
-                         reduced_n, x, reduced_map, reduced_y );
-
-      if (!work)
-      {
-         hypre_TFree(map2, HYPRE_MEMORY_DEVICE);
-         hypre_TFree(reduced_map, HYPRE_MEMORY_DEVICE);
-         hypre_TFree(reduced_y, HYPRE_MEMORY_DEVICE);
-      }
-   }
-
-   return hypre_error_flag;
-}
-
-/* x[map[i]] = v */
-template <typename T>
-__global__ void
-hypreCUDAKernel_ScatterConstant(T *x, HYPRE_Int n, HYPRE_Int *map, T v)
-{
-   HYPRE_Int global_thread_id = hypre_cuda_get_grid_thread_id<1,1>();
-
-   if (global_thread_id < n)
-   {
-      x[map[global_thread_id]] = v;
-   }
-}
-
-/* x[map[i]] = v
- * n is length of map
- * TODO: thrust? */
-template <typename T>
-HYPRE_Int
-hypreDevice_ScatterConstant(T *x, HYPRE_Int n, HYPRE_Int *map, T v)
-{
-   /* trivial case */
-   if (n <= 0)
-   {
-      return hypre_error_flag;
-   }
-
-   dim3 bDim = hypre_GetDefaultCUDABlockDimension();
-   dim3 gDim = hypre_GetDefaultCUDAGridDimension(n, "thread", bDim);
-
-   HYPRE_CUDA_LAUNCH( hypreCUDAKernel_ScatterConstant, gDim, bDim, x, n, map, v );
-
-   return hypre_error_flag;
-}
-
-template HYPRE_Int hypreDevice_ScatterConstant(HYPRE_Int     *x, HYPRE_Int n, HYPRE_Int *map, HYPRE_Int     v);
-template HYPRE_Int hypreDevice_ScatterConstant(HYPRE_Complex *x, HYPRE_Int n, HYPRE_Int *map, HYPRE_Complex v);
-
-__global__ void
-hypreCUDAKernel_IVAXPY(HYPRE_Int n, HYPRE_Complex *a, HYPRE_Complex *x, HYPRE_Complex *y)
-{
-   HYPRE_Int i = hypre_cuda_get_grid_thread_id<1,1>();
-
-   if (i < n)
-   {
-      y[i] += x[i] / a[i];
-   }
-}
-
-/* Inverse Vector AXPY: y[i] = x[i] / a[i] + y[i] */
-HYPRE_Int
-hypreDevice_IVAXPY(HYPRE_Int n, HYPRE_Complex *a, HYPRE_Complex *x, HYPRE_Complex *y)
-{
-   /* trivial case */
-   if (n <= 0)
-   {
-      return hypre_error_flag;
-   }
-
-   dim3 bDim = hypre_GetDefaultCUDABlockDimension();
-   dim3 gDim = hypre_GetDefaultCUDAGridDimension(n, "thread", bDim);
-
-   HYPRE_CUDA_LAUNCH( hypreCUDAKernel_IVAXPY, gDim, bDim, n, a, x, y );
-
-   return hypre_error_flag;
-}
-
-__global__ void
-hypreCUDAKernel_IVAXPYMarked(HYPRE_Int n, HYPRE_Complex *a, HYPRE_Complex *x, HYPRE_Complex *y, HYPRE_Int *marker, HYPRE_Int marker_val)
-{
-   HYPRE_Int i = hypre_cuda_get_grid_thread_id<1,1>();
-
-   if (i < n)
-   {
-      if (marker[i] == marker_val)
-      {
-         y[i] += x[i] / a[i];
-      }         
-   }
-}
-
-/* Inverse Vector AXPY: y[i] = x[i] / a[i] + y[i] */
-HYPRE_Int
-hypreDevice_IVAXPYMarked(HYPRE_Int n, HYPRE_Complex *a, HYPRE_Complex *x, HYPRE_Complex *y, HYPRE_Int *marker, HYPRE_Int marker_val)
-{
-   /* trivial case */
-   if (n <= 0)
-   {
-      return hypre_error_flag;
-   }
-
-   dim3 bDim = hypre_GetDefaultCUDABlockDimension();
-   dim3 gDim = hypre_GetDefaultCUDAGridDimension(n, "thread", bDim);
-
-   HYPRE_CUDA_LAUNCH( hypreCUDAKernel_IVAXPYMarked, gDim, bDim, n, a, x, y, marker, marker_val );
-
-   return hypre_error_flag;
-}
-
-__global__ void
-hypreCUDAKernel_DiagScaleVector(HYPRE_Int n, HYPRE_Int *A_i, HYPRE_Complex *A_data, HYPRE_Complex *x, HYPRE_Complex beta, HYPRE_Complex *y)
-{
-   HYPRE_Int i = hypre_cuda_get_grid_thread_id<1,1>();
-
-   if (i < n)
-   {
-      if (beta != 0.0)
-      {
-         y[i] = x[i] / A_data[A_i[i]] + beta * y[i];
-      }
-      else
-      {
-         y[i] = x[i] / A_data[A_i[i]];
-      }
-   }
-}
-
-/* y = diag(A) \ x + beta y
- * Note: Assume A_i[i] points to the ith diagonal entry of A */
-HYPRE_Int
-hypreDevice_DiagScaleVector(HYPRE_Int n, HYPRE_Int *A_i, HYPRE_Complex *A_data, HYPRE_Complex *x, HYPRE_Complex beta, HYPRE_Complex *y)
-{
-   /* trivial case */
-   if (n <= 0)
-   {
-      return hypre_error_flag;
-   }
-
-   dim3 bDim = hypre_GetDefaultCUDABlockDimension();
-   dim3 gDim = hypre_GetDefaultCUDAGridDimension(n, "thread", bDim);
-
-   HYPRE_CUDA_LAUNCH( hypreCUDAKernel_DiagScaleVector, gDim, bDim, n, A_i, A_data, x, beta, y );
-
-   return hypre_error_flag;
-}
-
-__global__ void
-hypreCUDAKernel_DiagScaleVector2(HYPRE_Int n, HYPRE_Int *A_i, HYPRE_Complex *A_data, HYPRE_Complex *x, HYPRE_Complex beta, HYPRE_Complex *y, HYPRE_Complex *z)
-{
-   HYPRE_Int i = hypre_cuda_get_grid_thread_id<1,1>();
-
-   if (i < n)
-   {
-      HYPRE_Complex t = x[i] / A_data[A_i[i]];
-      y[i] = t;
-      z[i] += beta*t;
-   }
-}
-
-/* y = diag(A) \ x
- * z = beta * (diag(A) \ x) + z
- * Note: Assume A_i[i] points to the ith diagonal entry of A */
-HYPRE_Int
-hypreDevice_DiagScaleVector2(HYPRE_Int n, HYPRE_Int *A_i, HYPRE_Complex *A_data, HYPRE_Complex *x, HYPRE_Complex beta, HYPRE_Complex *y, HYPRE_Complex *z)
-{
-   /* trivial case */
-   if (n <= 0)
-   {
-      return hypre_error_flag;
-   }
-
-   dim3 bDim = hypre_GetDefaultCUDABlockDimension();
-   dim3 gDim = hypre_GetDefaultCUDAGridDimension(n, "thread", bDim);
-
-   HYPRE_CUDA_LAUNCH( hypreCUDAKernel_DiagScaleVector2, gDim, bDim, n, A_i, A_data, x, beta, y, z );
-
-   return hypre_error_flag;
-}
-
-__global__ void
-hypreCUDAKernel_BigToSmallCopy(      HYPRE_Int*    __restrict__ tgt,
-                               const HYPRE_BigInt* __restrict__ src,
-                                     HYPRE_Int                  size)
-{
-   HYPRE_Int i = hypre_cuda_get_grid_thread_id<1,1>();
-
-   if (i < size)
-   {
-      tgt[i] = src[i];
-   }
-}
-
-HYPRE_Int
-hypreDevice_BigToSmallCopy(HYPRE_Int *tgt, const HYPRE_BigInt *src, HYPRE_Int size)
-{
-   dim3 bDim = hypre_GetDefaultCUDABlockDimension();
-   dim3 gDim = hypre_GetDefaultCUDAGridDimension(size, "thread", bDim);
-
-   HYPRE_CUDA_LAUNCH( hypreCUDAKernel_BigToSmallCopy, gDim, bDim, tgt, src, size);
-
-   return hypre_error_flag;
-}
-
-
-/* https://github.com/OrangeOwlSolutions/Thrust/blob/master/Sort_by_key_with_tuple_key.cu */
-/* opt: 0, (a,b) < (a',b') iff a < a' or (a = a' and  b  <  b')  [normal tupe comp]
- *      1, (a,b) < (a',b') iff a < a' or (a = a' and |b| > |b'|) [used in dropping small entries]
- *      2, (a,b) < (a',b') iff a < a' or (a = a' and (b == a or b < b') and b' != a') [used in putting diagonal first]
- */
-template <typename T1, typename T2, typename T3>
-HYPRE_Int
-hypreDevice_StableSortByTupleKey(HYPRE_Int N, T1 *keys1, T2 *keys2, T3 *vals, HYPRE_Int opt)
-{
-   auto begin_keys = thrust::make_zip_iterator(thrust::make_tuple(keys1,     keys2));
-   auto end_keys   = thrust::make_zip_iterator(thrust::make_tuple(keys1 + N, keys2 + N));
-
-   if (opt == 0)
-   {
-      HYPRE_THRUST_CALL(stable_sort_by_key, begin_keys, end_keys, vals, thrust::less< thrust::tuple<T1, T2> >());
-   }
-   else if (opt == 1)
-   {
-      HYPRE_THRUST_CALL(stable_sort_by_key, begin_keys, end_keys, vals, TupleComp2<T1,T2>());
-   }
-   else if (opt == 2)
-   {
-      HYPRE_THRUST_CALL(stable_sort_by_key, begin_keys, end_keys, vals, TupleComp3<T1,T2>());
-   }
-
-   return hypre_error_flag;
-}
-
-template HYPRE_Int hypreDevice_StableSortByTupleKey(HYPRE_Int N, HYPRE_Int *keys1, HYPRE_Int  *keys2, HYPRE_Int     *vals, HYPRE_Int opt);
-template HYPRE_Int hypreDevice_StableSortByTupleKey(HYPRE_Int N, HYPRE_Int *keys1, HYPRE_Real *keys2, HYPRE_Int     *vals, HYPRE_Int opt);
-template HYPRE_Int hypreDevice_StableSortByTupleKey(HYPRE_Int N, HYPRE_Int *keys1, HYPRE_Int  *keys2, HYPRE_Complex *vals, HYPRE_Int opt);
-
-/* opt:
- *      0, (a,b) < (a',b') iff a < a' or (a = a' and  b  <  b')                       [normal tupe comp]
- *      2, (a,b) < (a',b') iff a < a' or (a = a' and (b == a or b < b') and b' != a') [used in assembly to put diagonal first]
- */
-template <typename T1, typename T2, typename T3, typename T4>
-HYPRE_Int
-hypreDevice_StableSortTupleByTupleKey(HYPRE_Int N, T1 *keys1, T2 *keys2, T3 *vals1, T4 *vals2, HYPRE_Int opt)
-{
-   auto begin_keys = thrust::make_zip_iterator(thrust::make_tuple(keys1,     keys2));
-   auto end_keys   = thrust::make_zip_iterator(thrust::make_tuple(keys1 + N, keys2 + N));
-   auto begin_vals = thrust::make_zip_iterator(thrust::make_tuple(vals1,     vals2));
-
-   if (opt == 0)
-   {
-      HYPRE_THRUST_CALL(stable_sort_by_key, begin_keys, end_keys, begin_vals, thrust::less< thrust::tuple<T1, T2> >());
-   }
-   else if (opt == 2)
-   {
-      HYPRE_THRUST_CALL(stable_sort_by_key, begin_keys, end_keys, begin_vals, TupleComp3<T1,T2>());
-   }
-
-   return hypre_error_flag;
-}
-
-template HYPRE_Int hypreDevice_StableSortTupleByTupleKey(HYPRE_Int N, HYPRE_Int *keys1, HYPRE_Int *keys2, char *vals1, HYPRE_Complex *vals2, HYPRE_Int opt);
-#if defined(HYPRE_MIXEDINT)
-template HYPRE_Int hypreDevice_StableSortTupleByTupleKey(HYPRE_Int N, HYPRE_BigInt *keys1, HYPRE_BigInt *keys2, char *vals1, HYPRE_Complex *vals2, HYPRE_Int opt);
-#endif
-
-template <typename T1, typename T2, typename T3>
-HYPRE_Int
-hypreDevice_ReduceByTupleKey(HYPRE_Int N, T1 *keys1_in,  T2 *keys2_in,  T3 *vals_in,
-                                          T1 *keys1_out, T2 *keys2_out, T3 *vals_out)
-{
-   auto begin_keys_in  = thrust::make_zip_iterator(thrust::make_tuple(keys1_in,     keys2_in    ));
-   auto end_keys_in    = thrust::make_zip_iterator(thrust::make_tuple(keys1_in + N, keys2_in + N));
-   auto begin_keys_out = thrust::make_zip_iterator(thrust::make_tuple(keys1_out,    keys2_out   ));
-   thrust::equal_to< thrust::tuple<T1, T2> > pred;
-   thrust::plus<T3> func;
-
-   auto new_end = HYPRE_THRUST_CALL(reduce_by_key, begin_keys_in, end_keys_in, vals_in, begin_keys_out, vals_out, pred, func);
-
-   return new_end.second - vals_out;
-}
-
-template HYPRE_Int hypreDevice_ReduceByTupleKey(HYPRE_Int N, HYPRE_Int *keys1_in, HYPRE_Int *keys2_in, HYPRE_Complex *vals_in, HYPRE_Int *keys1_out, HYPRE_Int *keys2_out, HYPRE_Complex *vals_out);
-
-#endif // #if defined(HYPRE_USING_CUDA)  || defined(HYPRE_USING_HIP)
-
-#if defined(HYPRE_USING_CUSPARSE)
-/*
- * @brief Determines the associated CudaDataType for the HYPRE_Complex typedef
- * @return Returns cuda data type corresponding with HYPRE_Complex
- *
- * @todo Should be known compile time
- * @todo Support more sizes
- * @todo Support complex
- * @warning Only works for Single and Double precision
- * @note Perhaps some typedefs should be added where HYPRE_Complex is typedef'd
- */
-cudaDataType
-hypre_HYPREComplexToCudaDataType()
-{
-   /*
-   if (sizeof(char)*CHAR_BIT != 8)
-   {
-      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "ERROR:  Unsupported char size");
-      hypre_assert(false);
-   }
-   */
-#if defined(HYPRE_COMPLEX)
-   return CUDA_C_64F;
-#else
-#if defined(HYPRE_SINGLE)
-   hypre_assert(sizeof(HYPRE_Complex) == 4);
-   return CUDA_R_32F;
-#elif defined(HYPRE_LONG_DOUBLE)
-#error "Long Double is not supported on GPUs"
-#else
-   hypre_assert(sizeof(HYPRE_Complex) == 8);
-   return CUDA_R_64F;
-#endif
-#endif // #if defined(HYPRE_COMPLEX)
-}
-
-/*
- * @brief Determines the associated cusparseIndexType_t for the HYPRE_Int typedef
- */
-cusparseIndexType_t
-hypre_HYPREIntToCusparseIndexType()
-{
-   /*
-   if(sizeof(char)*CHAR_BIT!=8)
-   {
-      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "ERROR:  Unsupported char size");
-      hypre_assert(false);
-   }
-   */
-
-#if defined(HYPRE_BIGINT)
-   hypre_assert(sizeof(HYPRE_Int) == 8);
-   return CUSPARSE_INDEX_64I;
-#else
-   hypre_assert(sizeof(HYPRE_Int) == 4);
-   return CUSPARSE_INDEX_32I;
-#endif
-}
-#endif // #if defined(HYPRE_USING_CUSPARSE)
-
-#if defined(HYPRE_USING_GPU)
-
-#if defined(HYPRE_USING_DEVICE_OPENMP)
-cudaStream_t
-#elif defined(HYPRE_USING_CUDA)
-cudaStream_t
-#elif defined(HYPRE_USING_HIP)
-hipStream_t
-#endif
-hypre_CudaDataCudaStream(hypre_CudaData *data, HYPRE_Int i)
-{
-#if defined(HYPRE_USING_DEVICE_OPENMP)
-   cudaStream_t stream = 0;
-#elif defined(HYPRE_USING_CUDA)
-   cudaStream_t stream = 0;
-#elif defined(HYPRE_USING_HIP)
-   hipStream_t stream = 0;
-#endif
-
-#if defined(HYPRE_USING_CUDA_STREAMS)
-   if (i >= HYPRE_MAX_NUM_STREAMS)
-   {
-      /* return the default stream, i.e., the NULL stream */
-      /*
-      hypre_printf("CUDA stream %d exceeds the max number %d\n",
-                   i, HYPRE_MAX_NUM_STREAMS);
-      */
-      return NULL;
-   }
-
-   if (data->cuda_streams[i])
-   {
-      return data->cuda_streams[i];
-   }
-
-#if defined(HYPRE_USING_DEVICE_OPENMP)
-   HYPRE_CUDA_CALL(cudaStreamCreateWithFlags(&stream, cudaStreamDefault));
-#elif defined(HYPRE_USING_CUDA)
-   //HYPRE_CUDA_CALL(cudaStreamCreateWithFlags(&stream,cudaStreamNonBlocking));
-   HYPRE_CUDA_CALL(cudaStreamCreateWithFlags(&stream, cudaStreamDefault));
-#elif defined(HYPRE_USING_HIP)
-   HYPRE_HIP_CALL(hipStreamCreateWithFlags(&stream, hipStreamDefault));
-#endif
-
-   data->cuda_streams[i] = stream;
-#endif
-
-   return stream;
-}
-
-#if defined(HYPRE_USING_DEVICE_OPENMP)
-cudaStream_t
-#elif defined(HYPRE_USING_CUDA)
-cudaStream_t
-#elif defined(HYPRE_USING_HIP)
-hipStream_t
-#endif
-hypre_CudaDataCudaComputeStream(hypre_CudaData *data)
-{
-   return hypre_CudaDataCudaStream(data,
-                                   hypre_CudaDataCudaComputeStreamNum(data));
-}
-
-#if defined(HYPRE_USING_CURAND)
-curandGenerator_t
-hypre_CudaDataCurandGenerator(hypre_CudaData *data)
-{
-   if (data->curand_generator)
-   {
-      return data->curand_generator;
-   }
-
-   curandGenerator_t gen;
-   HYPRE_CURAND_CALL( curandCreateGenerator(&gen, CURAND_RNG_PSEUDO_DEFAULT) );
-   HYPRE_CURAND_CALL( curandSetPseudoRandomGeneratorSeed(gen, 1234ULL) );
-   HYPRE_CURAND_CALL( curandSetStream(gen, hypre_CudaDataCudaComputeStream(data)) );
-
-   data->curand_generator = gen;
-
-   return gen;
-}
-
-/* T = float or hypre_double */
-template <typename T>
-HYPRE_Int
-hypre_CurandUniform_core( HYPRE_Int          n,
-                          T                 *urand,
-                          HYPRE_Int          set_seed,
-                          hypre_ulonglongint seed,
-                          HYPRE_Int          set_offset,
-                          hypre_ulonglongint offset)
-{
-   curandGenerator_t gen = hypre_HandleCurandGenerator(hypre_handle());
-
-   if (set_seed)
-   {
-      HYPRE_CURAND_CALL( curandSetPseudoRandomGeneratorSeed(gen, seed) );
-   }
-
-   if (set_offset)
-   {
-      HYPRE_CURAND_CALL( curandSetGeneratorOffset(gen, offset) );
-   }
-
-   if (sizeof(T) == sizeof(hypre_double))
-   {
-      HYPRE_CURAND_CALL( curandGenerateUniformDouble(gen, (hypre_double *) urand, n) );
-   }
-   else if (sizeof(T) == sizeof(float))
-   {
-      HYPRE_CURAND_CALL( curandGenerateUniform(gen, (float *) urand, n) );
-   }
-
-   return hypre_error_flag;
-}
-#endif /* #if defined(HYPRE_USING_CURAND) */
-
-#if defined(HYPRE_USING_ROCRAND)
-rocrand_generator
-hypre_CudaDataCurandGenerator(hypre_CudaData *data)
-{
-   if (data->curand_generator)
-   {
-      return data->curand_generator;
-   }
-
-   rocrand_generator gen;
-   HYPRE_ROCRAND_CALL( rocrand_create_generator(&gen, ROCRAND_RNG_PSEUDO_DEFAULT) );
-   HYPRE_ROCRAND_CALL( rocrand_set_seed(gen, 1234ULL) );
-   HYPRE_ROCRAND_CALL( rocrand_set_stream(gen, hypre_CudaDataCudaComputeStream(data)) );
-
-   data->curand_generator = gen;
-
-   return gen;
-}
-
-template <typename T>
-HYPRE_Int
-hypre_CurandUniform_core( HYPRE_Int          n,
-                          T                 *urand,
-                          HYPRE_Int          set_seed,
-                          hypre_ulonglongint seed,
-                          HYPRE_Int          set_offset,
-                          hypre_ulonglongint offset)
-{
-   hypre_GpuProfilingPushRange("hypre_CurandUniform_core");
-
-   rocrand_generator gen = hypre_HandleCurandGenerator(hypre_handle());
-
-   if (set_seed)
-   {
-      HYPRE_ROCRAND_CALL( rocrand_set_seed(gen, seed) );
-   }
-
-   if (set_offset)
-   {
-      HYPRE_ROCRAND_CALL( rocrand_set_offset(gen, offset) );
-   }
-
-   if (sizeof(T) == sizeof(hypre_double))
-   {
-      HYPRE_ROCRAND_CALL( rocrand_generate_uniform_double(gen, (hypre_double *) urand, n) );
-   }
-   else if (sizeof(T) == sizeof(float))
-   {
-      HYPRE_ROCRAND_CALL( rocrand_generate_uniform(gen, (float *) urand, n) );
-   }
-
-   hypre_GpuProfilingPopRange();
-
-   return hypre_error_flag;
-}
-#endif /* #if defined(HYPRE_USING_ROCRAND) */
-
-#if defined(HYPRE_USING_CURAND) || defined(HYPRE_USING_ROCRAND)
-
-HYPRE_Int
-hypre_CurandUniform( HYPRE_Int          n,
-                     HYPRE_Real        *urand,
-                     HYPRE_Int          set_seed,
-                     hypre_ulonglongint seed,
-                     HYPRE_Int          set_offset,
-                     hypre_ulonglongint offset)
-{
-   return hypre_CurandUniform_core(n, urand, set_seed, seed, set_offset, offset);
-}
-
-HYPRE_Int
-hypre_CurandUniformSingle( HYPRE_Int          n,
-                           float             *urand,
-                           HYPRE_Int          set_seed,
-                           hypre_ulonglongint seed,
-                           HYPRE_Int          set_offset,
-                           hypre_ulonglongint offset)
-{
-   return hypre_CurandUniform_core(n, urand, set_seed, seed, set_offset, offset);
-}
-
-#endif /* #if defined(HYPRE_USING_CURAND) || defined(HYPRE_USING_ROCRAND) */
-
-#if defined(HYPRE_USING_CUBLAS)
-cublasHandle_t
-hypre_CudaDataCublasHandle(hypre_CudaData *data)
-{
-   if (data->cublas_handle)
-   {
-      return data->cublas_handle;
-   }
-
-   cublasHandle_t handle;
-   HYPRE_CUBLAS_CALL( cublasCreate(&handle) );
-
-   HYPRE_CUBLAS_CALL( cublasSetStream(handle, hypre_CudaDataCudaComputeStream(data)) );
-
-   data->cublas_handle = handle;
-
-   return handle;
-}
-#endif
-
-#if defined(HYPRE_USING_CUSPARSE)
-cusparseHandle_t
-hypre_CudaDataCusparseHandle(hypre_CudaData *data)
-{
-   if (data->cusparse_handle)
-   {
-      return data->cusparse_handle;
-   }
-
-   cusparseHandle_t handle;
-   HYPRE_CUSPARSE_CALL( cusparseCreate(&handle) );
-
-   HYPRE_CUSPARSE_CALL( cusparseSetStream(handle, hypre_CudaDataCudaComputeStream(data)) );
-
-   data->cusparse_handle = handle;
-
-   return handle;
-}
-#endif // defined(HYPRE_USING_CUSPARSE)
-
-
-#if defined(HYPRE_USING_ROCSPARSE)
-rocsparse_handle
-hypre_CudaDataCusparseHandle(hypre_CudaData *data)
-{
-   if (data->cusparse_handle)
-   {
-      return data->cusparse_handle;
-   }
-
-   rocsparse_handle handle;
-   HYPRE_ROCSPARSE_CALL( rocsparse_create_handle(&handle) );
-
-   HYPRE_ROCSPARSE_CALL( rocsparse_set_stream(handle, hypre_CudaDataCudaComputeStream(data)) );
-
-   data->cusparse_handle = handle;
-
-   return handle;
-}
-#endif // defined(HYPRE_USING_ROCSPARSE)
-
-
-
-hypre_CudaData*
-hypre_CudaDataCreate()
-{
-   hypre_CudaData *data = hypre_CTAlloc(hypre_CudaData, 1, HYPRE_MEMORY_HOST);
-
-   hypre_CudaDataCudaDevice(data)            = 0;
-   hypre_CudaDataCudaComputeStreamNum(data)  = 0;
-
-   /* SpGeMM */
-#if defined(HYPRE_USING_CUSPARSE) || defined(HYPRE_USING_ROCSPARSE)
-   hypre_CudaDataSpgemmUseCusparse(data) = 1;
-#else
-   hypre_CudaDataSpgemmUseCusparse(data) = 0;
-#endif
-
-   hypre_CudaDataSpgemmAlgorithm(data)                = 1;
-   /* 1: naive overestimate, 2: naive underestimate, 3: Cohen's algorithm */
-   hypre_CudaDataSpgemmRownnzEstimateMethod(data)     = 3;
-   hypre_CudaDataSpgemmRownnzEstimateNsamples(data)   = 32;
-   hypre_CudaDataSpgemmRownnzEstimateMultFactor(data) = 1.5;
-   hypre_CudaDataSpgemmHashType(data)                 = 'D';
-
-   /* pmis */
-#if defined(HYPRE_USING_CURAND) || defined(HYPRE_USING_ROCRAND)
-   hypre_CudaDataUseGpuRand(data) = 1;
-#else
-   hypre_CudaDataUseGpuRand(data) = 0;
-#endif
-
-   /* device pool */
-#ifdef HYPRE_USING_DEVICE_POOL
-   hypre_CudaDataCubBinGrowth(data)      = 8u;
-   hypre_CudaDataCubMinBin(data)         = 1u;
-   hypre_CudaDataCubMaxBin(data)         = (hypre_uint) -1;
-   hypre_CudaDataCubMaxCachedBytes(data) = (size_t) -1;
-   hypre_CudaDataCubDevAllocator(data)   = NULL;
-   hypre_CudaDataCubUvmAllocator(data)   = NULL;
-#endif
-
-   return data;
-}
-
-void
-hypre_CudaDataDestroy(hypre_CudaData *data)
-{
-   if (!data)
-   {
-      return;
-   }
-
-   hypre_TFree(hypre_CudaDataCudaReduceBuffer(data),     HYPRE_MEMORY_DEVICE);
-   hypre_TFree(hypre_CudaDataStructCommRecvBuffer(data), HYPRE_MEMORY_DEVICE);
-   hypre_TFree(hypre_CudaDataStructCommSendBuffer(data), HYPRE_MEMORY_DEVICE);
-
-#if defined(HYPRE_USING_CURAND)
-   if (data->curand_generator)
-   {
-      HYPRE_CURAND_CALL( curandDestroyGenerator(data->curand_generator) );
-   }
-#endif
-
-#if defined(HYPRE_USING_ROCRAND)
-   if (data->curand_generator)
-   {
-      HYPRE_ROCRAND_CALL( rocrand_destroy_generator(data->curand_generator) );
-   }
-#endif
-
-#if defined(HYPRE_USING_CUBLAS)
-   if (data->cublas_handle)
-   {
-      HYPRE_CUBLAS_CALL( cublasDestroy(data->cublas_handle) );
-   }
-#endif
-
-#if defined(HYPRE_USING_CUSPARSE) || defined(HYPRE_USING_ROCSPARSE)
-   if (data->cusparse_handle)
-   {
-#if defined(HYPRE_USING_CUSPARSE)
-      HYPRE_CUSPARSE_CALL( cusparseDestroy(data->cusparse_handle) );
-#elif defined(HYPRE_USING_ROCSPARSE)
-      HYPRE_ROCSPARSE_CALL( rocsparse_destroy_handle(data->cusparse_handle) );
-#endif
-   }
-#endif // #if defined(HYPRE_USING_CUSPARSE) || defined(HYPRE_USING_ROCSPARSE)
-
-   for (HYPRE_Int i = 0; i < HYPRE_MAX_NUM_STREAMS; i++)
-   {
-      if (data->cuda_streams[i])
-      {
-#if defined(HYPRE_USING_DEVICE_OPENMP)
-         HYPRE_CUDA_CALL( cudaStreamDestroy(data->cuda_streams[i]) );
-#elif defined(HYPRE_USING_CUDA)
-         HYPRE_CUDA_CALL( cudaStreamDestroy(data->cuda_streams[i]) );
-#elif defined(HYPRE_USING_HIP)
-         HYPRE_HIP_CALL( hipStreamDestroy(data->cuda_streams[i]) );
-#endif
-      }
-   }
-
-#ifdef HYPRE_USING_DEVICE_POOL
-   hypre_CudaDataCubCachingAllocatorDestroy(data);
-#endif
-
-   hypre_TFree(data, HYPRE_MEMORY_HOST);
-}
-
-HYPRE_Int
-hypre_SyncCudaDevice(hypre_Handle *hypre_handle)
-{
-#if defined(HYPRE_USING_DEVICE_OPENMP)
-   HYPRE_CUDA_CALL( cudaDeviceSynchronize() );
-#elif defined(HYPRE_USING_CUDA)
-   HYPRE_CUDA_CALL( cudaDeviceSynchronize() );
-#elif defined(HYPRE_USING_HIP)
-   HYPRE_HIP_CALL( hipDeviceSynchronize() );
-#endif
-   return hypre_error_flag;
-}
-
-HYPRE_Int
-hypre_ResetCudaDevice(hypre_Handle *hypre_handle)
-{
-#if defined(HYPRE_USING_CUDA)
-   cudaDeviceReset();
-#elif defined(HYPRE_USING_HIP)
-   hipDeviceReset();
-#endif
-   return hypre_error_flag;
-}
-
-/* synchronize the Hypre compute stream
- * action: 0: set sync stream to false
- *         1: set sync stream to true
- *         2: restore sync stream to default
- *         3: return the current value of cuda_compute_stream_sync
- *         4: sync stream based on cuda_compute_stream_sync
- */
-HYPRE_Int
-hypre_SyncCudaComputeStream_core(HYPRE_Int     action,
-                                 hypre_Handle *hypre_handle,
-                                 HYPRE_Int    *cuda_compute_stream_sync_ptr)
-{
-   /* with UVM the default is to sync at kernel completions, since host is also able to
-    * touch GPU memory */
-#if defined(HYPRE_USING_UNIFIED_MEMORY)
-   static const HYPRE_Int cuda_compute_stream_sync_default = 1;
-#else
-   static const HYPRE_Int cuda_compute_stream_sync_default = 0;
-#endif
-
-   /* this controls if synchronize the stream after computations */
-   static HYPRE_Int cuda_compute_stream_sync = cuda_compute_stream_sync_default;
-
-   switch (action)
-   {
-      case 0:
-         cuda_compute_stream_sync = 0;
-         break;
-      case 1:
-         cuda_compute_stream_sync = 1;
-         break;
-      case 2:
-         cuda_compute_stream_sync = cuda_compute_stream_sync_default;
-         break;
-      case 3:
-         *cuda_compute_stream_sync_ptr = cuda_compute_stream_sync;
-         break;
-      case 4:
-#if defined(HYPRE_USING_DEVICE_OPENMP)
-         HYPRE_CUDA_CALL( cudaDeviceSynchronize() );
-#else
-         if (cuda_compute_stream_sync)
-         {
-#if defined(HYPRE_USING_CUDA)
-            HYPRE_CUDA_CALL( cudaStreamSynchronize(hypre_HandleCudaComputeStream(hypre_handle)) );
-#elif defined(HYPRE_USING_HIP)
-            HYPRE_HIP_CALL( hipStreamSynchronize(hypre_HandleCudaComputeStream(hypre_handle)) );
-#endif
-         }
-#endif
-         break;
-      default:
-         hypre_printf("hypre_SyncCudaComputeStream_core invalid action\n");
-         hypre_error_in_arg(1);
-   }
-
-   return hypre_error_flag;
-}
-
-HYPRE_Int
-hypre_SetSyncCudaCompute(HYPRE_Int action)
-{
-   /* convert to 1/0 */
-   action = action != 0;
-   hypre_SyncCudaComputeStream_core(action, NULL, NULL);
-
-   return hypre_error_flag;
-}
-
-HYPRE_Int
-hypre_RestoreSyncCudaCompute()
-{
-   hypre_SyncCudaComputeStream_core(2, NULL, NULL);
-
-   return hypre_error_flag;
-}
-
-HYPRE_Int
-hypre_GetSyncCudaCompute(HYPRE_Int *cuda_compute_stream_sync_ptr)
-{
-   hypre_SyncCudaComputeStream_core(3, NULL, cuda_compute_stream_sync_ptr);
-
-   return hypre_error_flag;
-}
-
-HYPRE_Int
-hypre_SyncCudaComputeStream(hypre_Handle *hypre_handle)
-{
-   hypre_SyncCudaComputeStream_core(4, hypre_handle, NULL);
-
-   return hypre_error_flag;
-}
-
-#endif // #if defined(HYPRE_USING_GPU)
-
-
-/* This function is supposed to be used in the test drivers to mimic
- * users' GPU binding approaches
- * It is supposed to be called before HYPRE_Init,
- * so that HYPRE_Init can get the wanted device id
- */
-HYPRE_Int
-hypre_bind_device( HYPRE_Int myid,
-                   HYPRE_Int nproc,
-                   MPI_Comm  comm )
-{
-#ifdef HYPRE_USING_GPU
-   /* proc id (rank) on the running node */
-   HYPRE_Int myNodeid;
-   /* num of procs (size) on the node */
-   HYPRE_Int NodeSize;
-   /* num of devices seen */
-   hypre_int nDevices;
-   /* device id that want to bind */
-   hypre_int device_id;
-
-   hypre_MPI_Comm node_comm;
-   hypre_MPI_Comm_split_type( comm, hypre_MPI_COMM_TYPE_SHARED,
-                              myid, hypre_MPI_INFO_NULL, &node_comm );
-   hypre_MPI_Comm_rank(node_comm, &myNodeid);
-   hypre_MPI_Comm_size(node_comm, &NodeSize);
-   hypre_MPI_Comm_free(&node_comm);
-
-   /* get number of devices on this node */
-   hypre_GetDeviceCount(&nDevices);
-
-   /* set device */
-   device_id = myNodeid % nDevices;
-   hypre_SetDevice(device_id, NULL);
-
-#if defined(HYPRE_DEBUG) && defined(HYPRE_PRINT_ERRORS)
-   hypre_printf("Proc [global %d/%d, local %d/%d] can see %d GPUs and is running on %d\n",
-                myid, nproc, myNodeid, NodeSize, nDevices, device_id);
-#endif
-
-#endif /* #ifdef HYPRE_USING_GPU */
-
-   return hypre_error_flag;
-}
-
diff --git a/external/hypre/src/utilities/cuda_utils.h b/external/hypre/src/utilities/cuda_utils.h
deleted file mode 100644
index 155fdd0c..00000000
--- a/external/hypre/src/utilities/cuda_utils.h
+++ /dev/null
@@ -1,919 +0,0 @@
-/******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
- * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
- *
- * SPDX-License-Identifier: (Apache-2.0 OR MIT)
- ******************************************************************************/
-
-#ifndef HYPRE_CUDA_UTILS_H
-#define HYPRE_CUDA_UTILS_H
-
-#if defined(HYPRE_USING_GPU)
-
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_DEVICE_OPENMP)
-#include <cuda.h>
-#include <cuda_runtime.h>
-#include <cuda_profiler_api.h>
-#include <curand.h>
-#include <cublas_v2.h>
-#include <cusparse.h>
-
-#ifndef CUDART_VERSION
-#error CUDART_VERSION Undefined!
-#endif
-
-#ifndef CUDA_VERSION
-#error CUDA_VERSION Undefined!
-#endif
-
-#if CUDA_VERSION >= 11000
-#define THRUST_IGNORE_DEPRECATED_CPP11
-#define CUB_IGNORE_DEPRECATED_CPP11
-#define THRUST_IGNORE_DEPRECATED_CPP_DIALECT
-#define CUB_IGNORE_DEPRECATED_CPP_DIALECT
-#endif
-
-#define CUSPARSE_NEWAPI_VERSION 11000
-
-#elif defined(HYPRE_USING_HIP)
-
-#include <hip/hip_runtime.h>
-
-#endif // defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_DEVICE_OPENMP)
-
-#if defined(HYPRE_USING_ROCSPARSE)
-#include <rocsparse.h>
-#endif
-
-#if defined(HYPRE_USING_ROCRAND)
-#include <rocrand.h>
-#endif
-
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_DEVICE_OPENMP)
-#define HYPRE_CUDA_CALL(call) do {                                                           \
-   cudaError_t err = call;                                                                   \
-   if (cudaSuccess != err) {                                                                 \
-      printf("CUDA ERROR (code = %d, %s) at %s:%d\n", err, cudaGetErrorString(err),          \
-                   __FILE__, __LINE__);                                                      \
-      hypre_assert(0); exit(1);                                                              \
-   } } while(0)
-
-#elif defined(HYPRE_USING_HIP)
-#define HYPRE_HIP_CALL(call) do {                                                            \
-   hipError_t err = call;                                                                    \
-   if (hipSuccess != err) {                                                                  \
-      printf("HIP ERROR (code = %d, %s) at %s:%d\n", err, hipGetErrorString(err),            \
-                   __FILE__, __LINE__);                                                      \
-      hypre_assert(0); exit(1);                                                              \
-   } } while(0)
-
-#endif // defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_DEVICE_OPENMP)
-
-#define HYPRE_CUBLAS_CALL(call) do {                                                         \
-   cublasStatus_t err = call;                                                                \
-   if (CUBLAS_STATUS_SUCCESS != err) {                                                       \
-      printf("CUBLAS ERROR (code = %d, %d) at %s:%d\n",                                      \
-            err, err == CUBLAS_STATUS_EXECUTION_FAILED, __FILE__, __LINE__);                 \
-      hypre_assert(0); exit(1);                                                              \
-   } } while(0)
-
-#define HYPRE_CUSPARSE_CALL(call) do {                                                       \
-   cusparseStatus_t err = call;                                                              \
-   if (CUSPARSE_STATUS_SUCCESS != err) {                                                     \
-      printf("CUSPARSE ERROR (code = %d, %s) at %s:%d\n",                                    \
-            err, cusparseGetErrorString(err), __FILE__, __LINE__);                           \
-      hypre_assert(0); exit(1);                                                              \
-   } } while(0)
-
-#define HYPRE_ROCSPARSE_CALL(call) do {                                                      \
-   rocsparse_status err = call;                                                              \
-   if (rocsparse_status_success != err) {                                                    \
-      printf("rocSPARSE ERROR (code = %d) at %s:%d\n",                                       \
-            err, __FILE__, __LINE__);                                                        \
-      assert(0); exit(1);                                                                    \
-   } } while(0)
-
-#define HYPRE_CURAND_CALL(call) do {                                                         \
-   curandStatus_t err = call;                                                                \
-   if (CURAND_STATUS_SUCCESS != err) {                                                       \
-      printf("CURAND ERROR (code = %d) at %s:%d\n", err, __FILE__, __LINE__);                \
-      hypre_assert(0); exit(1);                                                              \
-   } } while(0)
-
-#define HYPRE_ROCRAND_CALL(call) do {                                                        \
-   rocrand_status err = call;                                                                \
-   if (ROCRAND_STATUS_SUCCESS != err) {                                                      \
-      printf("ROCRAND ERROR (code = %d) at %s:%d\n", err, __FILE__, __LINE__);               \
-      hypre_assert(0); exit(1);                                                              \
-   } } while(0)
-
-struct hypre_cub_CachingDeviceAllocator;
-typedef struct hypre_cub_CachingDeviceAllocator hypre_cub_CachingDeviceAllocator;
-
-// HYPRE_WARP_BITSHIFT is just log2 of HYPRE_WARP_SIZE
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_DEVICE_OPENMP)
-#define HYPRE_WARP_SIZE       32
-#define HYPRE_WARP_BITSHIFT   5
-#elif defined(HYPRE_USING_HIP)
-#define HYPRE_WARP_SIZE       64
-#define HYPRE_WARP_BITSHIFT   6
-#endif
-
-#define HYPRE_WARP_FULL_MASK  0xFFFFFFFF
-#define HYPRE_MAX_NUM_WARPS   (64 * 64 * 32)
-#define HYPRE_FLT_LARGE       1e30
-#define HYPRE_1D_BLOCK_SIZE   512
-#define HYPRE_MAX_NUM_STREAMS 10
-
-struct hypre_CudaData
-{
-#if defined(HYPRE_USING_CURAND)
-   curandGenerator_t                 curand_generator;
-#endif
-
-#if defined(HYPRE_USING_ROCRAND)
-   rocrand_generator                 curand_generator;
-#endif
-
-#if defined(HYPRE_USING_CUBLAS)
-   cublasHandle_t                    cublas_handle;
-#endif
-
-#if defined(HYPRE_USING_CUSPARSE)
-   cusparseHandle_t                  cusparse_handle;
-#endif
-
-#if defined(HYPRE_USING_ROCSPARSE)
-   rocsparse_handle                  cusparse_handle;
-#endif
-
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_DEVICE_OPENMP)
-   cudaStream_t                      cuda_streams[HYPRE_MAX_NUM_STREAMS];
-#elif defined(HYPRE_USING_HIP)
-   hipStream_t                       cuda_streams[HYPRE_MAX_NUM_STREAMS];
-#endif
-
-#ifdef HYPRE_USING_DEVICE_POOL
-   hypre_uint                        cub_bin_growth;
-   hypre_uint                        cub_min_bin;
-   hypre_uint                        cub_max_bin;
-   size_t                            cub_max_cached_bytes;
-   hypre_cub_CachingDeviceAllocator *cub_dev_allocator;
-   hypre_cub_CachingDeviceAllocator *cub_uvm_allocator;
-#endif
-
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-   hypre_device_allocator            device_allocator;
-#endif
-
-   HYPRE_Int                         cuda_device;
-   /* by default, hypre puts GPU computations in this stream
-    * Do not be confused with the default (null) CUDA stream */
-   HYPRE_Int                         cuda_compute_stream_num;
-   /* work space for hypre's CUDA reducer */
-   void                             *cuda_reduce_buffer;
-   /* the device buffers needed to do MPI communication for struct comm */
-   HYPRE_Complex*                    struct_comm_recv_buffer;
-   HYPRE_Complex*                    struct_comm_send_buffer;
-   HYPRE_Int                         struct_comm_recv_buffer_size;
-   HYPRE_Int                         struct_comm_send_buffer_size;
-   /* device spgemm options */
-   HYPRE_Int                         spgemm_use_cusparse;
-   HYPRE_Int                         spgemm_algorithm;
-   HYPRE_Int                         spgemm_rownnz_estimate_method;
-   HYPRE_Int                         spgemm_rownnz_estimate_nsamples;
-   float                             spgemm_rownnz_estimate_mult_factor;
-   char                              spgemm_hash_type;
-   /* PMIS */
-   HYPRE_Int                         use_gpu_rand;
-};
-
-#define hypre_CudaDataCubBinGrowth(data)                   ((data) -> cub_bin_growth)
-#define hypre_CudaDataCubMinBin(data)                      ((data) -> cub_min_bin)
-#define hypre_CudaDataCubMaxBin(data)                      ((data) -> cub_max_bin)
-#define hypre_CudaDataCubMaxCachedBytes(data)              ((data) -> cub_max_cached_bytes)
-#define hypre_CudaDataCubDevAllocator(data)                ((data) -> cub_dev_allocator)
-#define hypre_CudaDataCubUvmAllocator(data)                ((data) -> cub_uvm_allocator)
-#define hypre_CudaDataCudaDevice(data)                     ((data) -> cuda_device)
-#define hypre_CudaDataCudaComputeStreamNum(data)           ((data) -> cuda_compute_stream_num)
-#define hypre_CudaDataCudaReduceBuffer(data)               ((data) -> cuda_reduce_buffer)
-#define hypre_CudaDataStructCommRecvBuffer(data)           ((data) -> struct_comm_recv_buffer)
-#define hypre_CudaDataStructCommSendBuffer(data)           ((data) -> struct_comm_send_buffer)
-#define hypre_CudaDataStructCommRecvBufferSize(data)       ((data) -> struct_comm_recv_buffer_size)
-#define hypre_CudaDataStructCommSendBufferSize(data)       ((data) -> struct_comm_send_buffer_size)
-#define hypre_CudaDataSpgemmUseCusparse(data)              ((data) -> spgemm_use_cusparse)
-#define hypre_CudaDataSpgemmAlgorithm(data)                ((data) -> spgemm_algorithm)
-#define hypre_CudaDataSpgemmRownnzEstimateMethod(data)     ((data) -> spgemm_rownnz_estimate_method)
-#define hypre_CudaDataSpgemmRownnzEstimateNsamples(data)   ((data) -> spgemm_rownnz_estimate_nsamples)
-#define hypre_CudaDataSpgemmRownnzEstimateMultFactor(data) ((data) -> spgemm_rownnz_estimate_mult_factor)
-#define hypre_CudaDataSpgemmHashType(data)                 ((data) -> spgemm_hash_type)
-#define hypre_CudaDataDeviceAllocator(data)                ((data) -> device_allocator)
-#define hypre_CudaDataUseGpuRand(data)                     ((data) -> use_gpu_rand)
-
-hypre_CudaData*     hypre_CudaDataCreate();
-void                hypre_CudaDataDestroy(hypre_CudaData* data);
-
-#if defined(HYPRE_USING_CURAND)
-curandGenerator_t   hypre_CudaDataCurandGenerator(hypre_CudaData *data);
-#endif
-
-#if defined(HYPRE_USING_ROCRAND)
-rocrand_generator   hypre_CudaDataCurandGenerator(hypre_CudaData *data);
-#endif
-
-#if defined(HYPRE_USING_CUBLAS)
-cublasHandle_t      hypre_CudaDataCublasHandle(hypre_CudaData *data);
-#endif
-
-#if defined(HYPRE_USING_CUSPARSE)
-cusparseHandle_t    hypre_CudaDataCusparseHandle(hypre_CudaData *data);
-#endif
-
-#if defined(HYPRE_USING_ROCSPARSE)
-rocsparse_handle    hypre_CudaDataCusparseHandle(hypre_CudaData *data);
-#endif
-
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_DEVICE_OPENMP)
-cudaStream_t        hypre_CudaDataCudaStream(hypre_CudaData *data, HYPRE_Int i);
-cudaStream_t        hypre_CudaDataCudaComputeStream(hypre_CudaData *data);
-#elif defined(HYPRE_USING_HIP)
-hipStream_t         hypre_CudaDataCudaStream(hypre_CudaData *data, HYPRE_Int i);
-hipStream_t         hypre_CudaDataCudaComputeStream(hypre_CudaData *data);
-#endif
-
-// Data structure and accessor routines for Cuda Sparse Triangular Matrices
-struct hypre_CsrsvData
-{
-#if defined(HYPRE_USING_CUSPARSE)
-   csrsv2Info_t info_L;
-   csrsv2Info_t info_U;
-#elif defined(HYPRE_USING_ROCSPARSE)
-   rocsparse_mat_info info_L;
-   rocsparse_mat_info info_U;
-#endif
-   hypre_int    BufferSize;
-   char        *Buffer;
-};
-
-#define hypre_CsrsvDataInfoL(data)      ((data) -> info_L)
-#define hypre_CsrsvDataInfoU(data)      ((data) -> info_U)
-#define hypre_CsrsvDataBufferSize(data) ((data) -> BufferSize)
-#define hypre_CsrsvDataBuffer(data)     ((data) -> Buffer)
-
-struct hypre_GpuMatData
-{
-#if defined(HYPRE_USING_CUSPARSE)
-   cusparseMatDescr_t    mat_descr;
-#endif
-
-#if defined(HYPRE_USING_ROCSPARSE)
-   rocsparse_mat_descr   mat_descr;
-   rocsparse_mat_info    mat_info;
-#endif
-};
-
-#define hypre_GpuMatDataMatDecsr(data) ((data) -> mat_descr)
-#define hypre_GpuMatDataMatInfo(data)  ((data) -> mat_info)
-
-#endif //#if defined(HYPRE_USING_GPU)
-
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-
-#include <thrust/execution_policy.h>
-#if defined(HYPRE_USING_CUDA)
-#include <thrust/system/cuda/execution_policy.h>
-#elif defined(HYPRE_USING_HIP)
-#include <thrust/system/hip/execution_policy.h>
-#endif
-#include <thrust/count.h>
-#include <thrust/device_ptr.h>
-#include <thrust/unique.h>
-#include <thrust/sort.h>
-#include <thrust/binary_search.h>
-#include <thrust/iterator/constant_iterator.h>
-#include <thrust/iterator/counting_iterator.h>
-#include <thrust/iterator/zip_iterator.h>
-#include <thrust/transform.h>
-#include <thrust/functional.h>
-#include <thrust/gather.h>
-#include <thrust/scan.h>
-#include <thrust/fill.h>
-#include <thrust/adjacent_difference.h>
-#include <thrust/inner_product.h>
-#include <thrust/logical.h>
-#include <thrust/replace.h>
-#include <thrust/sequence.h>
-#include <thrust/for_each.h>
-
-using namespace thrust::placeholders;
-
-/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- * macro for launching CUDA kernels, CUDA, Thrust, Cusparse, Curand calls
- *                    NOTE: IN HYPRE'S DEFAULT STREAM
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- */
-
-#if defined(HYPRE_DEBUG)
-#if defined(HYPRE_USING_CUDA)
-#define GPU_LAUNCH_SYNC { hypre_SyncCudaComputeStream(hypre_handle()); HYPRE_CUDA_CALL( cudaGetLastError() ); }
-#elif defined(HYPRE_USING_HIP)
-#define GPU_LAUNCH_SYNC { hypre_SyncCudaComputeStream(hypre_handle()); HYPRE_HIP_CALL( hipGetLastError() );  }
-#endif
-#else // #if defined(HYPRE_DEBUG)
-#define GPU_LAUNCH_SYNC
-#endif // defined(HYPRE_DEBUG)
-
-#define HYPRE_CUDA_LAUNCH2(kernel_name, gridsize, blocksize, shmem_size, ...)                                                 \
-{                                                                                                                             \
-   if ( gridsize.x  == 0 || gridsize.y  == 0 || gridsize.z  == 0 ||                                                           \
-        blocksize.x == 0 || blocksize.y == 0 || blocksize.z == 0 )                                                            \
-   {                                                                                                                          \
-      /* printf("Warning %s %d: Zero CUDA grid/block (%d %d %d) (%d %d %d)\n",                                                \
-                 __FILE__, __LINE__,                                                                                          \
-                 gridsize.x, gridsize.y, gridsize.z, blocksize.x, blocksize.y, blocksize.z); */                               \
-   }                                                                                                                          \
-   else                                                                                                                       \
-   {                                                                                                                          \
-      (kernel_name) <<< (gridsize), (blocksize), shmem_size, hypre_HandleCudaComputeStream(hypre_handle()) >>> (__VA_ARGS__); \
-      GPU_LAUNCH_SYNC;                                                                                                        \
-   }                                                                                                                          \
-}
-
-#define HYPRE_CUDA_LAUNCH(kernel_name, gridsize, blocksize, ...) HYPRE_CUDA_LAUNCH2(kernel_name, gridsize, blocksize, 0, __VA_ARGS__)
-
-/* RL: TODO Want macro HYPRE_THRUST_CALL to return value but I don't know how to do it right
- * The following one works OK for now */
-
-#if defined(HYPRE_USING_CUDA)
-#define HYPRE_THRUST_CALL(func_name, ...) \
-   thrust::func_name(thrust::cuda::par(hypre_HandleDeviceAllocator(hypre_handle())).on(hypre_HandleCudaComputeStream(hypre_handle())), __VA_ARGS__);
-#elif defined(HYPRE_USING_HIP)
-#define HYPRE_THRUST_CALL(func_name, ...) \
-   thrust::func_name(thrust::hip::par(hypre_HandleDeviceAllocator(hypre_handle())).on(hypre_HandleCudaComputeStream(hypre_handle())), __VA_ARGS__);
-#endif
-
-/* return the number of threads in block */
-template <hypre_int dim>
-static __device__ __forceinline__
-hypre_int hypre_cuda_get_num_threads()
-{
-   switch (dim)
-   {
-      case 1:
-         return (blockDim.x);
-      case 2:
-         return (blockDim.x * blockDim.y);
-      case 3:
-         return (blockDim.x * blockDim.y * blockDim.z);
-   }
-
-   return -1;
-}
-
-/* return the flattened thread id in block */
-template <hypre_int dim>
-static __device__ __forceinline__
-hypre_int hypre_cuda_get_thread_id()
-{
-   switch (dim)
-   {
-      case 1:
-         return (threadIdx.x);
-      case 2:
-         return (threadIdx.y * blockDim.x + threadIdx.x);
-      case 3:
-         return (threadIdx.z * blockDim.x * blockDim.y + threadIdx.y * blockDim.x +
-                 threadIdx.x);
-   }
-
-   return -1;
-}
-
-/* return the number of warps in block */
-template <hypre_int dim>
-static __device__ __forceinline__
-hypre_int hypre_cuda_get_num_warps()
-{
-   return hypre_cuda_get_num_threads<dim>() >> HYPRE_WARP_BITSHIFT;
-}
-
-/* return the warp id in block */
-template <hypre_int dim>
-static __device__ __forceinline__
-hypre_int hypre_cuda_get_warp_id()
-{
-   return hypre_cuda_get_thread_id<dim>() >> HYPRE_WARP_BITSHIFT;
-}
-
-/* return the thread lane id in warp */
-template <hypre_int dim>
-static __device__ __forceinline__
-hypre_int hypre_cuda_get_lane_id()
-{
-   return hypre_cuda_get_thread_id<dim>() & (HYPRE_WARP_SIZE-1);
-}
-
-/* return the num of blocks in grid */
-template <hypre_int dim>
-static __device__ __forceinline__
-hypre_int hypre_cuda_get_num_blocks()
-{
-   switch (dim)
-   {
-      case 1:
-         return (gridDim.x);
-      case 2:
-         return (gridDim.x * gridDim.y);
-      case 3:
-         return (gridDim.x * gridDim.y * gridDim.z);
-   }
-
-   return -1;
-}
-
-/* return the flattened block id in grid */
-template <hypre_int dim>
-static __device__ __forceinline__
-hypre_int hypre_cuda_get_block_id()
-{
-   switch (dim)
-   {
-      case 1:
-         return (blockIdx.x);
-      case 2:
-         return (blockIdx.y * gridDim.x + blockIdx.x);
-      case 3:
-         return (blockIdx.z * gridDim.x * gridDim.y + blockIdx.y * gridDim.x +
-                 blockIdx.x);
-   }
-
-   return -1;
-}
-
-/* return the number of threads in grid */
-template <hypre_int bdim, hypre_int gdim>
-static __device__ __forceinline__
-hypre_int hypre_cuda_get_grid_num_threads()
-{
-   return hypre_cuda_get_num_blocks<gdim>() * hypre_cuda_get_num_threads<bdim>();
-}
-
-/* return the flattened thread id in grid */
-template <hypre_int bdim, hypre_int gdim>
-static __device__ __forceinline__
-hypre_int hypre_cuda_get_grid_thread_id()
-{
-   return hypre_cuda_get_block_id<gdim>() * hypre_cuda_get_num_threads<bdim>() +
-          hypre_cuda_get_thread_id<bdim>();
-}
-
-/* return the number of warps in grid */
-template <hypre_int bdim, hypre_int gdim>
-static __device__ __forceinline__
-hypre_int hypre_cuda_get_grid_num_warps()
-{
-   return hypre_cuda_get_num_blocks<gdim>() * hypre_cuda_get_num_warps<bdim>();
-}
-
-/* return the flattened warp id in grid */
-template <hypre_int bdim, hypre_int gdim>
-static __device__ __forceinline__
-hypre_int hypre_cuda_get_grid_warp_id()
-{
-   return hypre_cuda_get_block_id<gdim>() * hypre_cuda_get_num_warps<bdim>() +
-          hypre_cuda_get_warp_id<bdim>();
-}
-
-#if defined(__CUDA_ARCH__) && __CUDA_ARCH__ < 600
-static __device__ __forceinline__
-hypre_double atomicAdd(hypre_double* address, hypre_double val)
-{
-    hypre_ulonglongint* address_as_ull = (hypre_ulonglongint*) address;
-    hypre_ulonglongint old = *address_as_ull, assumed;
-
-    do {
-        assumed = old;
-        old = atomicCAS(address_as_ull, assumed,
-                        __double_as_longlong(val +
-                               __longlong_as_double(assumed)));
-
-    // Note: uses integer comparison to avoid hang in case of NaN (since NaN != NaN)
-    } while (assumed != old);
-
-    return __longlong_as_double(old);
-}
-#endif
-
-// There are no *_sync functions in HIP
-#if defined(HYPRE_USING_HIP) || (CUDA_VERSION < 9000)
-
-template <typename T>
-static __device__ __forceinline__
-T __shfl_sync(unsigned mask, T val, hypre_int src_line, hypre_int width=HYPRE_WARP_SIZE)
-{
-   return __shfl(val, src_line, width);
-}
-
-template <typename T>
-static __device__ __forceinline__
-T __shfl_down_sync(unsigned mask, T val, unsigned delta, hypre_int width=HYPRE_WARP_SIZE)
-{
-   return __shfl_down(val, delta, width);
-}
-
-template <typename T>
-static __device__ __forceinline__
-T __shfl_xor_sync(unsigned mask, T val, unsigned lanemask, hypre_int width=HYPRE_WARP_SIZE)
-{
-   return __shfl_xor(val, lanemask, width);
-}
-
-template <typename T>
-static __device__ __forceinline__
-T __shfl_up_sync(unsigned mask, T val, unsigned delta, hypre_int width=HYPRE_WARP_SIZE)
-{
-   return __shfl_up(val, delta, width);
-}
-
-static __device__ __forceinline__
-void __syncwarp()
-{
-}
-
-#endif // #if defined(HYPRE_USING_HIP) || (CUDA_VERSION < 9000)
-
-
-// __any was technically deprecated in CUDA 7 so we don't bother
-// with this overload for CUDA, just for HIP.
-#if defined(HYPRE_USING_HIP)
-static __device__ __forceinline__
-hypre_int __any_sync(unsigned mask, hypre_int predicate)
-{
-  return __any(predicate);
-}
-#endif
-
-
-template <typename T>
-static __device__ __forceinline__
-T read_only_load( const T *ptr )
-{
-   return __ldg( ptr );
-}
-
-/* exclusive prefix scan */
-template <typename T>
-static __device__ __forceinline__
-T warp_prefix_sum(hypre_int lane_id, T in, T &all_sum)
-{
-#pragma unroll
-   for (hypre_int d = 2; d <=HYPRE_WARP_SIZE; d <<= 1)
-   {
-      T t = __shfl_up_sync(HYPRE_WARP_FULL_MASK, in, d >> 1);
-      if ( (lane_id & (d - 1)) == (d - 1) )
-      {
-         in += t;
-      }
-   }
-
-   all_sum = __shfl_sync(HYPRE_WARP_FULL_MASK, in, HYPRE_WARP_SIZE-1);
-
-   if (lane_id == HYPRE_WARP_SIZE-1)
-   {
-      in = 0;
-   }
-
-#pragma unroll
-   for (hypre_int d = HYPRE_WARP_SIZE/2; d > 0; d >>= 1)
-   {
-      T t = __shfl_xor_sync(HYPRE_WARP_FULL_MASK, in, d);
-
-      if ( (lane_id & (d - 1)) == (d - 1))
-      {
-        if ( (lane_id & ((d << 1) - 1)) == ((d << 1) - 1) )
-         {
-            in += t;
-         }
-         else
-         {
-            in = t;
-         }
-      }
-   }
-   return in;
-}
-
-template <typename T>
-static __device__ __forceinline__
-T warp_reduce_sum(T in)
-{
-#pragma unroll
-  for (hypre_int d = HYPRE_WARP_SIZE/2; d > 0; d >>= 1)
-  {
-    in += __shfl_down_sync(HYPRE_WARP_FULL_MASK, in, d);
-  }
-  return in;
-}
-
-template <typename T>
-static __device__ __forceinline__
-T warp_allreduce_sum(T in)
-{
-#pragma unroll
-  for (hypre_int d = HYPRE_WARP_SIZE/2; d > 0; d >>= 1)
-  {
-    in += __shfl_xor_sync(HYPRE_WARP_FULL_MASK, in, d);
-  }
-  return in;
-}
-
-template <typename T>
-static __device__ __forceinline__
-T warp_reduce_max(T in)
-{
-#pragma unroll
-  for (hypre_int d = HYPRE_WARP_SIZE/2; d > 0; d >>= 1)
-  {
-    in = max(in, __shfl_down_sync(HYPRE_WARP_FULL_MASK, in, d));
-  }
-  return in;
-}
-
-template <typename T>
-static __device__ __forceinline__
-T warp_allreduce_max(T in)
-{
-#pragma unroll
-  for (hypre_int d = HYPRE_WARP_SIZE/2; d > 0; d >>= 1)
-  {
-    in = max(in, __shfl_xor_sync(HYPRE_WARP_FULL_MASK, in, d));
-  }
-  return in;
-}
-
-template <typename T>
-static __device__ __forceinline__
-T warp_reduce_min(T in)
-{
-#pragma unroll
-  for (hypre_int d = HYPRE_WARP_SIZE/2; d > 0; d >>= 1)
-  {
-    in = min(in, __shfl_down_sync(HYPRE_WARP_FULL_MASK, in, d));
-  }
-  return in;
-}
-
-template <typename T>
-static __device__ __forceinline__
-T warp_allreduce_min(T in)
-{
-#pragma unroll
-  for (hypre_int d = HYPRE_WARP_SIZE/2; d > 0; d >>= 1)
-  {
-    in = min(in, __shfl_xor_sync(HYPRE_WARP_FULL_MASK, in, d));
-  }
-  return in;
-}
-
-static __device__ __forceinline__
-hypre_int next_power_of_2(hypre_int n)
-{
-   if (n <= 0)
-   {
-      return 0;
-   }
-
-   /* if n is power of 2, return itself */
-   if ( (n & (n - 1)) == 0 )
-   {
-      return n;
-   }
-
-   n |= (n >>  1);
-   n |= (n >>  2);
-   n |= (n >>  4);
-   n |= (n >>  8);
-   n |= (n >> 16);
-   n ^= (n >>  1);
-   n  = (n <<  1);
-
-   return n;
-}
-
-template<typename T>
-struct absolute_value : public thrust::unary_function<T,T>
-{
-  __host__ __device__ T operator()(const T &x) const
-  {
-    return x < T(0) ? -x : x;
-  }
-};
-
-template<typename T1, typename T2>
-struct TupleComp2
-{
-   typedef thrust::tuple<T1, T2> Tuple;
-
-   __host__ __device__ bool operator()(const Tuple& t1, const Tuple& t2)
-   {
-      if (thrust::get<0>(t1) < thrust::get<0>(t2))
-      {
-         return true;
-      }
-      if (thrust::get<0>(t1) > thrust::get<0>(t2))
-      {
-         return false;
-      }
-      return hypre_abs(thrust::get<1>(t1)) > hypre_abs(thrust::get<1>(t2));
-   }
-};
-
-template<typename T1, typename T2>
-struct TupleComp3
-{
-   typedef thrust::tuple<T1, T2> Tuple;
-
-   __host__ __device__ bool operator()(const Tuple& t1, const Tuple& t2)
-   {
-      if (thrust::get<0>(t1) < thrust::get<0>(t2))
-      {
-         return true;
-      }
-      if (thrust::get<0>(t1) > thrust::get<0>(t2))
-      {
-         return false;
-      }
-      if (thrust::get<0>(t2) == thrust::get<1>(t2))
-      {
-         return false;
-      }
-      return thrust::get<0>(t1) == thrust::get<1>(t1) || thrust::get<1>(t1) < thrust::get<1>(t2);
-   }
-};
-
-template<typename T>
-struct is_negative : public thrust::unary_function<T,bool>
-{
-   __host__ __device__ bool operator()(const T &x)
-   {
-      return (x < 0);
-   }
-};
-
-template<typename T>
-struct is_positive : public thrust::unary_function<T,bool>
-{
-   __host__ __device__ bool operator()(const T &x)
-   {
-      return (x > 0);
-   }
-};
-
-template<typename T>
-struct is_nonnegative : public thrust::unary_function<T,bool>
-{
-   __host__ __device__ bool operator()(const T &x)
-   {
-      return (x >= 0);
-   }
-};
-
-template<typename T>
-struct in_range : public thrust::unary_function<T, bool>
-{
-   T low, up;
-
-   in_range(T low_, T up_) { low = low_; up = up_; }
-
-   __host__ __device__ bool operator()(const T &x)
-   {
-      return (x >= low && x <= up);
-   }
-};
-
-template<typename T>
-struct out_of_range : public thrust::unary_function<T,bool>
-{
-   T low, up;
-
-   out_of_range(T low_, T up_) { low = low_; up = up_; }
-
-   __host__ __device__ bool operator()(const T &x)
-   {
-      return (x < low || x > up);
-   }
-};
-
-template<typename T>
-struct less_than : public thrust::unary_function<T,bool>
-{
-   T val;
-
-   less_than(T val_) { val = val_; }
-
-   __host__ __device__ bool operator()(const T &x)
-   {
-      return (x < val);
-   }
-};
-
-template<typename T>
-struct modulo : public thrust::unary_function<T,T>
-{
-   T val;
-
-   modulo(T val_) { val = val_; }
-
-   __host__ __device__ T operator()(const T &x)
-   {
-      return (x % val);
-   }
-};
-
-template<typename T>
-struct equal : public thrust::unary_function<T,bool>
-{
-   T val;
-
-   equal(T val_) { val = val_; }
-
-   __host__ __device__ bool operator()(const T &x)
-   {
-      return (x == val);
-   }
-};
-
-struct print_functor
-{
-   __host__ __device__ void operator()(HYPRE_Real val)
-   {
-      printf("%f\n", val);
-   }
-};
-
-/* cuda_utils.c */
-dim3 hypre_GetDefaultCUDABlockDimension();
-
-dim3 hypre_GetDefaultCUDAGridDimension( HYPRE_Int n, const char *granularity, dim3 bDim );
-
-template <typename T1, typename T2, typename T3> HYPRE_Int hypreDevice_StableSortByTupleKey(HYPRE_Int N, T1 *keys1, T2 *keys2, T3 *vals, HYPRE_Int opt);
-
-template <typename T1, typename T2, typename T3, typename T4> HYPRE_Int hypreDevice_StableSortTupleByTupleKey(HYPRE_Int N, T1 *keys1, T2 *keys2, T3 *vals1, T4 *vals2, HYPRE_Int opt);
-
-template <typename T1, typename T2, typename T3> HYPRE_Int hypreDevice_ReduceByTupleKey(HYPRE_Int N, T1 *keys1_in,  T2 *keys2_in,  T3 *vals_in, T1 *keys1_out, T2 *keys2_out, T3 *vals_out);
-
-template <typename T>
-HYPRE_Int hypreDevice_CsrRowPtrsToIndicesWithRowNum(HYPRE_Int nrows, HYPRE_Int nnz, HYPRE_Int *d_row_ptr, T *d_row_num, T *d_row_ind);
-
-template <typename T>
-HYPRE_Int hypreDevice_ScatterConstant(T *x, HYPRE_Int n, HYPRE_Int *map, T v);
-
-HYPRE_Int hypreDevice_GetRowNnz(HYPRE_Int nrows, HYPRE_Int *d_row_indices, HYPRE_Int *d_diag_ia, HYPRE_Int *d_offd_ia, HYPRE_Int *d_rownnz);
-
-HYPRE_Int hypreDevice_CopyParCSRRows(HYPRE_Int nrows, HYPRE_Int *d_row_indices, HYPRE_Int job, HYPRE_Int has_offd, HYPRE_BigInt first_col, HYPRE_BigInt *d_col_map_offd_A, HYPRE_Int *d_diag_i, HYPRE_Int *d_diag_j, HYPRE_Complex *d_diag_a, HYPRE_Int *d_offd_i, HYPRE_Int *d_offd_j, HYPRE_Complex *d_offd_a, HYPRE_Int *d_ib, HYPRE_BigInt *d_jb, HYPRE_Complex *d_ab);
-
-HYPRE_Int hypreDevice_IntegerReduceSum(HYPRE_Int m, HYPRE_Int *d_i);
-
-HYPRE_Int hypreDevice_IntegerInclusiveScan(HYPRE_Int n, HYPRE_Int *d_i);
-
-HYPRE_Int hypreDevice_IntegerExclusiveScan(HYPRE_Int n, HYPRE_Int *d_i);
-
-HYPRE_Int* hypreDevice_CsrRowPtrsToIndices(HYPRE_Int nrows, HYPRE_Int nnz, HYPRE_Int *d_row_ptr);
-
-HYPRE_Int hypreDevice_CsrRowPtrsToIndices_v2(HYPRE_Int nrows, HYPRE_Int nnz, HYPRE_Int *d_row_ptr, HYPRE_Int *d_row_ind);
-
-HYPRE_Int* hypreDevice_CsrRowIndicesToPtrs(HYPRE_Int nrows, HYPRE_Int nnz, HYPRE_Int *d_row_ind);
-
-HYPRE_Int hypreDevice_CsrRowIndicesToPtrs_v2(HYPRE_Int nrows, HYPRE_Int nnz, HYPRE_Int *d_row_ind, HYPRE_Int *d_row_ptr);
-
-HYPRE_Int hypreDevice_GenScatterAdd(HYPRE_Real *x, HYPRE_Int ny, HYPRE_Int *map, HYPRE_Real *y, char *work);
-
-HYPRE_Int hypreDevice_BigToSmallCopy(HYPRE_Int *tgt, const HYPRE_BigInt *src, HYPRE_Int size);
-
-void hypre_CudaCompileFlagCheck();
-
-#if defined(HYPRE_USING_CUDA)
-cudaError_t hypre_CachingMallocDevice(void **ptr, size_t nbytes);
-
-cudaError_t hypre_CachingMallocManaged(void **ptr, size_t nbytes);
-
-cudaError_t hypre_CachingFreeDevice(void *ptr);
-
-cudaError_t hypre_CachingFreeManaged(void *ptr);
-#endif
-
-hypre_cub_CachingDeviceAllocator * hypre_CudaDataCubCachingAllocatorCreate(hypre_uint bin_growth, hypre_uint min_bin, hypre_uint max_bin, size_t max_cached_bytes, bool skip_cleanup, bool debug, bool use_managed_memory);
-
-void hypre_CudaDataCubCachingAllocatorDestroy(hypre_CudaData *data);
-
-#endif // #if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-
-#if defined(HYPRE_USING_CUSPARSE)
-
-cudaDataType hypre_HYPREComplexToCudaDataType();
-
-cusparseIndexType_t hypre_HYPREIntToCusparseIndexType();
-
-#endif // #if defined(HYPRE_USING_CUSPARSE)
-
-#endif /* #ifndef HYPRE_CUDA_UTILS_H */
diff --git a/external/hypre/src/utilities/device_allocator.h b/external/hypre/src/utilities/device_allocator.h
index f8307f72..e38e26fb 100644
--- a/external/hypre/src/utilities/device_allocator.h
+++ b/external/hypre/src/utilities/device_allocator.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -10,8 +10,7 @@
 
 #if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
 
-/* C++ style memory allocator for GPU **device** memory
- * Just wraps _hypre_TAlloc and _hypre_TFree */
+/* C++ style memory allocator for the device using the abstract memory model */
 struct hypre_device_allocator
 {
    typedef char value_type;
@@ -28,12 +27,13 @@ struct hypre_device_allocator
 
    char *allocate(std::ptrdiff_t num_bytes)
    {
-      return _hypre_TAlloc(char, num_bytes, hypre_MEMORY_DEVICE);
+      return hypre_TAlloc(char, num_bytes, HYPRE_MEMORY_DEVICE);
    }
 
    void deallocate(char *ptr, size_t n)
    {
-      _hypre_TFree(ptr, hypre_MEMORY_DEVICE);
+      HYPRE_UNUSED_VAR(n);
+      hypre_TFree(ptr, HYPRE_MEMORY_DEVICE);
    }
 };
 
diff --git a/external/hypre/src/utilities/cuda_reducer.h b/external/hypre/src/utilities/device_reducer.h
similarity index 64%
rename from external/hypre/src/utilities/cuda_reducer.h
rename to external/hypre/src/utilities/device_reducer.h
index d489bb58..5bd14dc8 100644
--- a/external/hypre/src/utilities/cuda_reducer.h
+++ b/external/hypre/src/utilities/device_reducer.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -17,7 +17,7 @@ template<typename T> void OneBlockReduce(T *d_arr, HYPRE_Int N, T *h_out);
 
 struct HYPRE_double4
 {
-   HYPRE_Real x,y,z,w;
+   HYPRE_Real x, y, z, w;
 
    __host__ __device__
    HYPRE_double4() {}
@@ -50,7 +50,7 @@ struct HYPRE_double4
 
 struct HYPRE_double6
 {
-   HYPRE_Real x,y,z,w,u,v;
+   HYPRE_Real x, y, z, w, u, v;
 
    __host__ __device__
    HYPRE_double6() {}
@@ -91,42 +91,44 @@ __inline__ __host__ __device__
 HYPRE_Real warpReduceSum(HYPRE_Real val)
 {
 #if defined(__CUDA_ARCH__) || defined(__HIP_DEVICE_COMPILE__)
-  for (HYPRE_Int offset = warpSize/2; offset > 0; offset /= 2)
-  {
-    val += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val, offset);
-  }
+   for (HYPRE_Int offset = warpSize / 2; offset > 0; offset /= 2)
+   {
+      val += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val, offset);
+   }
 #endif
-  return val;
+   return val;
 }
 
 __inline__ __host__ __device__
-HYPRE_double4 warpReduceSum(HYPRE_double4 val) {
+HYPRE_double4 warpReduceSum(HYPRE_double4 val)
+{
 #if defined(__CUDA_ARCH__) || defined(__HIP_DEVICE_COMPILE__)
-  for (HYPRE_Int offset = warpSize / 2; offset > 0; offset /= 2)
-  {
-    val.x += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.x, offset);
-    val.y += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.y, offset);
-    val.z += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.z, offset);
-    val.w += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.w, offset);
-  }
+   for (HYPRE_Int offset = warpSize / 2; offset > 0; offset /= 2)
+   {
+      val.x += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.x, offset);
+      val.y += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.y, offset);
+      val.z += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.z, offset);
+      val.w += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.w, offset);
+   }
 #endif
-  return val;
+   return val;
 }
 
 __inline__ __host__ __device__
-HYPRE_double6 warpReduceSum(HYPRE_double6 val) {
+HYPRE_double6 warpReduceSum(HYPRE_double6 val)
+{
 #if defined(__CUDA_ARCH__) || defined(__HIP_DEVICE_COMPILE__)
-  for (HYPRE_Int offset = warpSize / 2; offset > 0; offset /= 2)
-  {
-    val.x += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.x, offset);
-    val.y += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.y, offset);
-    val.z += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.z, offset);
-    val.w += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.w, offset);
-    val.u += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.u, offset);
-    val.v += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.v, offset);
-  }
+   for (HYPRE_Int offset = warpSize / 2; offset > 0; offset /= 2)
+   {
+      val.x += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.x, offset);
+      val.y += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.y, offset);
+      val.z += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.z, offset);
+      val.w += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.w, offset);
+      val.u += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.u, offset);
+      val.v += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.v, offset);
+   }
 #endif
-  return val;
+   return val;
 }
 
 /* reduction within a block */
@@ -135,26 +137,26 @@ __inline__ __host__ __device__
 T blockReduceSum(T val)
 {
 #if defined(__CUDA_ARCH__) || defined(__HIP_DEVICE_COMPILE__)
-   //static __shared__ T shared[HYPRE_WARP_SIZE]; // Shared mem for HYPRE_WARP_SIZE partial sums
+   // Shared mem for HYPRE_WARP_SIZE partial sums
+   __shared__ T shared[HYPRE_WARP_SIZE];
 
-   __shared__ T shared[HYPRE_WARP_SIZE];        // Shared mem for HYPRE_WARP_SIZE partial sums
-
-   //HYPRE_Int lane = threadIdx.x % warpSize;
-   //HYPRE_Int wid  = threadIdx.x / warpSize;
    HYPRE_Int lane = threadIdx.x & (warpSize - 1);
    HYPRE_Int wid  = threadIdx.x >> HYPRE_WARP_BITSHIFT;
 
-   val = warpReduceSum(val);       // Each warp performs partial reduction
+   // Each warp performs partial reduction
+   val = warpReduceSum(val);
 
+   // Write reduced value to shared memory
    if (lane == 0)
    {
-      shared[wid] = val;          // Write reduced value to shared memory
+      shared[wid] = val;
    }
 
-   __syncthreads();               // Wait for all partial reductions
+   // Wait for all partial reductions
+   __syncthreads();
 
-   //read from shared memory only if that warp existed
-   if (threadIdx.x < blockDim.x / warpSize)
+   // read from shared memory only if that warp existed
+   if (threadIdx.x < (blockDim.x >> HYPRE_WARP_BITSHIFT))
    {
       val = shared[lane];
    }
@@ -163,9 +165,10 @@ T blockReduceSum(T val)
       val = 0.0;
    }
 
+   // Final reduce within first warp
    if (wid == 0)
    {
-      val = warpReduceSum(val); //Final reduce within first warp
+      val = warpReduceSum(val);
    }
 
 #endif
@@ -174,15 +177,21 @@ T blockReduceSum(T val)
 
 template<typename T>
 __global__ void
-OneBlockReduceKernel(T *arr, HYPRE_Int N)
+OneBlockReduceKernel(hypre_DeviceItem &item,
+                     T                *arr,
+                     HYPRE_Int         N)
 {
    T sum;
+
    sum = 0.0;
+
    if (threadIdx.x < N)
    {
       sum = arr[threadIdx.x];
    }
+
    sum = blockReduceSum(sum);
+
    if (threadIdx.x == 0)
    {
       arr[0] = sum;
@@ -210,14 +219,6 @@ struct ReduceSum
       init = val;
       __thread_sum = 0.0;
       nblocks = -1;
-
-      if (hypre_HandleCudaReduceBuffer(hypre_handle()) == NULL)
-      {
-         /* allocate for the max size for reducing double6 type */
-         hypre_HandleCudaReduceBuffer(hypre_handle()) = hypre_TAlloc(HYPRE_double6, 1024, HYPRE_MEMORY_DEVICE);
-      }
-
-      d_buf = (T*) hypre_HandleCudaReduceBuffer(hypre_handle());
    }
 
    /* copy constructor */
@@ -227,6 +228,19 @@ struct ReduceSum
       *this = other;
    }
 
+   __host__ void
+   Allocate2ndPhaseBuffer()
+   {
+      if (hypre_HandleReduceBuffer(hypre_handle()) == NULL)
+      {
+         /* allocate for the max size for reducing double6 type */
+         hypre_HandleReduceBuffer(hypre_handle()) =
+            hypre_TAlloc(HYPRE_double6, HYPRE_MAX_NTHREADS_BLOCK, HYPRE_MEMORY_DEVICE);
+      }
+
+      d_buf = (T*) hypre_HandleReduceBuffer(hypre_handle());
+   }
+
    /* reduction within blocks */
    __host__ __device__
    void BlockReduce() const
@@ -252,7 +266,8 @@ struct ReduceSum
    {
       T val;
 
-      HYPRE_ExecutionPolicy exec_policy = hypre_HandleStructExecPolicy(hypre_handle());
+      const HYPRE_MemoryLocation memory_location = hypre_HandleMemoryLocation(hypre_handle());
+      const HYPRE_ExecutionPolicy exec_policy = hypre_GetExecPolicy1(memory_location);
 
       if (exec_policy == HYPRE_EXEC_HOST)
       {
@@ -262,9 +277,9 @@ struct ReduceSum
       else
       {
          /* 2nd reduction with only *one* block */
-         hypre_assert(nblocks >= 0 && nblocks <= 1024);
-         const dim3 gDim(1), bDim(1024);
-         HYPRE_CUDA_LAUNCH( OneBlockReduceKernel, gDim, bDim, d_buf, nblocks );
+         hypre_assert(nblocks >= 0 && nblocks <= HYPRE_MAX_NTHREADS_BLOCK);
+         const dim3 gDim(1), bDim(HYPRE_MAX_NTHREADS_BLOCK);
+         HYPRE_GPU_LAUNCH( OneBlockReduceKernel, gDim, bDim, d_buf, nblocks );
          hypre_TMemcpy(&val, d_buf, T, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
          val += init;
       }
diff --git a/external/hypre/src/utilities/device_utils.c b/external/hypre/src/utilities/device_utils.c
new file mode 100644
index 00000000..569290c5
--- /dev/null
+++ b/external/hypre/src/utilities/device_utils.c
@@ -0,0 +1,3078 @@
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+#include "_hypre_onedpl.hpp"
+#include "_hypre_utilities.h"
+#include "_hypre_utilities.hpp"
+#include <math.h>
+
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ *      generic device functions (HYPRE_USING_GPU)
+ *      NOTE: This includes device openmp for now
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+#if defined(HYPRE_USING_GPU)
+
+/*--------------------------------------------------------------------
+ * hypre_DeviceDataCreate
+ *--------------------------------------------------------------------*/
+
+hypre_DeviceData*
+hypre_DeviceDataCreate()
+{
+   /* Note: this allocation is done directly with calloc in order to
+      avoid a segmentation fault when building with HYPRE_USING_UMPIRE_HOST */
+   hypre_DeviceData *data = (hypre_DeviceData*) calloc(1, sizeof(hypre_DeviceData));
+
+#if defined(HYPRE_USING_SYCL)
+   hypre_DeviceDataDevice(data)           = nullptr;
+#else
+   hypre_DeviceDataDevice(data)           = 0;
+#endif
+   hypre_DeviceDataComputeStreamNum(data) = 0;
+
+   /* SpMV, SpGeMM, SpTrans: use vendor's lib by default */
+#if defined(HYPRE_USING_CUSPARSE) || defined(HYPRE_USING_ROCSPARSE) || defined(HYPRE_USING_ONEMKLSPARSE)
+   hypre_DeviceDataSpgemmUseVendor(data)  = 1;
+   hypre_DeviceDataSpMVUseVendor(data)    = 1;
+   hypre_DeviceDataSpTransUseVendor(data) = 1;
+#else
+   hypre_DeviceDataSpgemmUseVendor(data)  = 0;
+   hypre_DeviceDataSpMVUseVendor(data)    = 0;
+   hypre_DeviceDataSpTransUseVendor(data) = 0;
+#endif
+   /* for CUDA, it seems cusparse is slow due to memory allocation inside the transposition */
+#if defined(HYPRE_USING_CUDA)
+   hypre_DeviceDataSpTransUseVendor(data) = 0;
+#endif
+
+   /* hypre SpGEMM parameters */
+   const HYPRE_Int  Nsamples   = 64;
+   const HYPRE_Real sigma      = 1.0 / hypre_sqrt((HYPRE_Real)(Nsamples - 2.0));
+   const HYPRE_Real multfactor = 1.0 / (1.0 - 3.0 * sigma);
+
+   hypre_DeviceDataSpgemmAlgorithm(data)                = 1;
+   hypre_DeviceDataSpgemmBinned(data)                   = 0;
+   hypre_DeviceDataSpgemmNumBin(data)                   = 0;
+   hypre_DeviceDataSpgemmHighestBin(data)[0]            = 0;
+   hypre_DeviceDataSpgemmHighestBin(data)[1]            = 0;
+   /* 1: naive overestimate, 2: naive underestimate, 3: Cohen's algorithm */
+   hypre_DeviceDataSpgemmRownnzEstimateMethod(data)     = 3;
+   hypre_DeviceDataSpgemmRownnzEstimateNsamples(data)   = Nsamples;
+   hypre_DeviceDataSpgemmRownnzEstimateMultFactor(data) = multfactor;
+
+   /* pmis */
+#if defined(HYPRE_USING_CURAND) || defined(HYPRE_USING_ROCRAND) || defined(HYPRE_USING_ONEMKLRAND)
+   hypre_DeviceDataUseGpuRand(data) = 1;
+#else
+   hypre_DeviceDataUseGpuRand(data) = 0;
+#endif
+
+   /* device pool */
+#ifdef HYPRE_USING_DEVICE_POOL
+   hypre_DeviceDataCubBinGrowth(data)      = 8u;
+   hypre_DeviceDataCubMinBin(data)         = 1u;
+   hypre_DeviceDataCubMaxBin(data)         = (hypre_uint) - 1;
+   hypre_DeviceDataCubMaxCachedBytes(data) = (size_t) -1;
+   hypre_DeviceDataCubDevAllocator(data)   = NULL;
+   hypre_DeviceDataCubUvmAllocator(data)   = NULL;
+#endif
+
+   return data;
+}
+
+/*--------------------------------------------------------------------
+ * hypre_DeviceDataDestroy
+ *--------------------------------------------------------------------*/
+
+void
+hypre_DeviceDataDestroy(hypre_DeviceData *data)
+{
+   if (!data)
+   {
+      return;
+   }
+
+   hypre_TFree(hypre_DeviceDataReduceBuffer(data),         HYPRE_MEMORY_DEVICE);
+
+#if defined(HYPRE_USING_CURAND)
+   if (data->curand_generator)
+   {
+      HYPRE_CURAND_CALL( curandDestroyGenerator(data->curand_generator) );
+   }
+#endif
+
+#if defined(HYPRE_USING_ROCRAND)
+   if (data->curand_generator)
+   {
+      HYPRE_ROCRAND_CALL( rocrand_destroy_generator(data->curand_generator) );
+   }
+#endif
+
+#if defined(HYPRE_USING_CUBLAS)
+   if (data->cublas_handle)
+   {
+      HYPRE_CUBLAS_CALL( cublasDestroy(data->cublas_handle) );
+   }
+#endif
+
+#if defined(HYPRE_USING_CUSPARSE) || defined(HYPRE_USING_ROCSPARSE)
+   if (data->cusparse_handle)
+   {
+#if defined(HYPRE_USING_CUSPARSE)
+      HYPRE_CUSPARSE_CALL( cusparseDestroy(data->cusparse_handle) );
+#elif defined(HYPRE_USING_ROCSPARSE)
+      HYPRE_ROCSPARSE_CALL( rocsparse_destroy_handle(data->cusparse_handle) );
+#endif
+   }
+#endif // #if defined(HYPRE_USING_CUSPARSE) || defined(HYPRE_USING_ROCSPARSE)
+
+#if defined(HYPRE_USING_CUSOLVER) || defined(HYPRE_USING_ROCSOLVER)
+   if (data->vendor_solver_handle)
+   {
+#if defined(HYPRE_USING_CUSOLVER)
+      HYPRE_CUSOLVER_CALL(cusolverDnDestroy(data->vendor_solver_handle));
+#else
+      HYPRE_ROCBLAS_CALL(rocblas_destroy_handle(data->vendor_solver_handle));
+#endif
+   }
+#endif // #if defined(HYPRE_USING_CUSOLVER) || defined(HYPRE_USING_ROCSOLVER)
+
+#if defined(HYPRE_USING_CUDA_STREAMS)
+   for (HYPRE_Int i = 0; i < HYPRE_MAX_NUM_STREAMS; i++)
+   {
+      if (data->streams[i])
+      {
+#if defined(HYPRE_USING_CUDA)
+         HYPRE_CUDA_CALL( cudaStreamDestroy(data->streams[i]) );
+#elif defined(HYPRE_USING_HIP)
+         HYPRE_HIP_CALL( hipStreamDestroy(data->streams[i]) );
+#elif defined(HYPRE_USING_SYCL)
+         delete data->streams[i];
+         data->streams[i] = nullptr;
+#endif
+      }
+   }
+#endif
+
+#ifdef HYPRE_USING_DEVICE_POOL
+   hypre_DeviceDataCubCachingAllocatorDestroy(data);
+#endif
+
+#if defined(HYPRE_USING_SYCL)
+   delete data->device;
+   data->device = nullptr;
+#endif
+
+   /* Note: Directly using free since this variable was allocated with calloc */
+   free((void*) data);
+}
+
+/*--------------------------------------------------------------------
+ * hypre_SyncDevice
+ *--------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_SyncDevice()
+{
+#if defined(HYPRE_USING_CUDA)
+   HYPRE_CUDA_CALL( cudaDeviceSynchronize() );
+#elif defined(HYPRE_USING_HIP)
+   HYPRE_HIP_CALL( hipDeviceSynchronize() );
+#elif defined(HYPRE_USING_SYCL)
+   try
+   {
+      HYPRE_SYCL_CALL( hypre_HandleComputeStream(hypre_handle())->wait_and_throw() );
+   }
+   catch (sycl::exception const &exc)
+   {
+      std::cerr << exc.what() << "Exception caught at file:" << __FILE__
+                << ", line:" << __LINE__ << std::endl;
+      std::exit(1);
+   }
+#endif
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------
+ * hypre_ResetDevice
+ *--------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ResetDevice()
+{
+#if defined(HYPRE_USING_CUDA)
+   HYPRE_CUDA_CALL(cudaDeviceReset());
+
+#elif defined(HYPRE_USING_HIP)
+   HYPRE_HIP_CALL(hipDeviceReset());
+#endif
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------
+ * hypre_SyncComputeStream_core
+ *
+ * Synchronize the Hypre compute stream
+ *
+ * action: 0: set sync stream to false
+ *         1: set sync stream to true
+ *         2: restore sync stream to default
+ *         3: return the current value of cuda_compute_stream_sync
+ *         4: sync stream based on cuda_compute_stream_sync
+ *--------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_SyncComputeStream_core(HYPRE_Int     action,
+                             hypre_Handle *hypre_handle,
+                             HYPRE_Int    *cuda_compute_stream_sync_ptr)
+{
+   /* with UVM the default is to sync at kernel completions, since host is also able to
+    * touch GPU memory */
+#if defined(HYPRE_USING_UNIFIED_MEMORY)
+   static const HYPRE_Int cuda_compute_stream_sync_default = 1;
+#else
+   static const HYPRE_Int cuda_compute_stream_sync_default = 0;
+#endif
+
+   /* this controls if synchronize the stream after computations */
+   static HYPRE_Int cuda_compute_stream_sync = cuda_compute_stream_sync_default;
+
+   switch (action)
+   {
+      case 0:
+         cuda_compute_stream_sync = 0;
+         break;
+      case 1:
+         cuda_compute_stream_sync = 1;
+         break;
+      case 2:
+         cuda_compute_stream_sync = cuda_compute_stream_sync_default;
+         break;
+      case 3:
+         *cuda_compute_stream_sync_ptr = cuda_compute_stream_sync;
+         break;
+      case 4:
+         if (hypre_HandleDefaultExecPolicy(hypre_handle) == HYPRE_EXEC_DEVICE && cuda_compute_stream_sync)
+         {
+#if defined(HYPRE_USING_CUDA)
+            HYPRE_CUDA_CALL( cudaStreamSynchronize(hypre_HandleComputeStream(hypre_handle)) );
+#elif defined(HYPRE_USING_HIP)
+            HYPRE_HIP_CALL( hipStreamSynchronize(hypre_HandleComputeStream(hypre_handle)) );
+#elif defined(HYPRE_USING_SYCL)
+            HYPRE_SYCL_CALL( hypre_HandleComputeStream(hypre_handle)->ext_oneapi_submit_barrier() );
+#endif
+         }
+         break;
+      default:
+         hypre_printf("hypre_SyncComputeStream_core invalid action\n");
+         hypre_error_in_arg(1);
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------
+ * hypre_SetSyncCudaCompute
+ *--------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_SetSyncCudaCompute(HYPRE_Int action)
+{
+   /* convert to 1/0 */
+   action = action != 0;
+   hypre_SyncComputeStream_core(action, NULL, NULL);
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------
+ * hypre_RestoreSyncCudaCompute
+ *--------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_RestoreSyncCudaCompute()
+{
+   hypre_SyncComputeStream_core(2, NULL, NULL);
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------
+ * hypre_GetSyncCudaCompute
+ *--------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_GetSyncCudaCompute(HYPRE_Int *cuda_compute_stream_sync_ptr)
+{
+   hypre_SyncComputeStream_core(3, NULL, cuda_compute_stream_sync_ptr);
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------
+ * hypre_SyncComputeStream
+ *--------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_SyncComputeStream()
+{
+   hypre_SyncComputeStream_core(4, hypre_handle(), NULL);
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------
+ * hypre_ForceSyncComputeStream
+ *--------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ForceSyncComputeStream()
+{
+   HYPRE_Int sync_stream;
+   hypre_GetSyncCudaCompute(&sync_stream);
+   hypre_SetSyncCudaCompute(1);
+   hypre_SyncComputeStream_core(4, hypre_handle(), NULL);
+   hypre_SetSyncCudaCompute(sync_stream);
+
+   return hypre_error_flag;
+}
+
+#endif // #if defined(HYPRE_USING_GPU)
+
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ *      generic device functions (cuda/hip/sycl)
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#if defined(HYPRE_USING_GPU)
+
+/*--------------------------------------------------------------------------
+ * hypre_DeviceMemoryGetUsage
+ *
+ * Retrieves memory usage statistics for the current GPU device. The function
+ * fills an array with memory data, converted to gibibytes (GiB):
+ *
+ *    - mem[0]: Current memory usage (allocated by the process).
+ *    - mem[1]: Total device memory available on the GPU.
+ *
+ * This implementation supports NVIDIA GPUs using CUDA and AMD GPUs using HIP.
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_DeviceMemoryGetUsage(HYPRE_Real *mem)
+{
+   size_t       free_mem  = 0;
+   size_t       total_mem = 0;
+   HYPRE_Real   b_to_gib  = (HYPRE_Real)(1 << 30);
+
+   /* Sanity check */
+   if (!mem)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Mem is a NULL pointer!");
+      return hypre_error_flag;
+   }
+
+   /* Get free and total memory available on the device */
+#if defined(HYPRE_USING_CUDA)
+   HYPRE_CUDA_CALL(cudaMemGetInfo(&free_mem, &total_mem));
+
+#elif defined(HYPRE_USING_HIP)
+   HYPRE_HIP_CALL(hipMemGetInfo(&free_mem, &total_mem));
+
+#else
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "No supported GPU backend found!");
+   return hypre_error_flag;
+#endif
+
+   /* Convert data from bytes to GiB (HYPRE_Real) */
+   mem[0] = (total_mem - free_mem) / b_to_gib;
+   mem[1] = total_mem / b_to_gib;
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------
+ * hypre_DeviceDataComputeStream
+ *--------------------------------------------------------------------*/
+
+/* CUDA/HIP stream */
+#if defined(HYPRE_USING_CUDA)
+cudaStream_t
+#elif defined(HYPRE_USING_HIP)
+hipStream_t
+#elif defined(HYPRE_USING_SYCL)
+sycl::queue*
+#endif
+hypre_DeviceDataComputeStream(hypre_DeviceData *data)
+{
+   return hypre_DeviceDataStream(data, hypre_DeviceDataComputeStreamNum(data));
+}
+
+/*--------------------------------------------------------------------
+ * hypre_DeviceDataStream
+ *--------------------------------------------------------------------*/
+
+#if defined(HYPRE_USING_CUDA)
+cudaStream_t
+#elif defined(HYPRE_USING_HIP)
+hipStream_t
+#elif defined(HYPRE_USING_SYCL)
+sycl::queue*
+#endif
+hypre_DeviceDataStream(hypre_DeviceData *data, HYPRE_Int i)
+{
+#if defined(HYPRE_USING_CUDA)
+   cudaStream_t stream = 0;
+#elif defined(HYPRE_USING_HIP)
+   hipStream_t stream = 0;
+#elif defined(HYPRE_USING_SYCL)
+   sycl::queue *stream = NULL;
+#endif
+
+#if defined(HYPRE_USING_CUDA_STREAMS)
+   if (i >= HYPRE_MAX_NUM_STREAMS)
+   {
+      /* return the default stream, i.e., the NULL stream */
+      /*
+      hypre_printf("device stream %d exceeds the max number %d\n",
+                   i, HYPRE_MAX_NUM_STREAMS);
+      */
+      return NULL;
+   }
+
+   if (data->streams[i])
+   {
+      return data->streams[i];
+   }
+
+#if defined(HYPRE_USING_CUDA)
+   //HYPRE_CUDA_CALL(cudaStreamCreateWithFlags(&stream,cudaStreamNonBlocking));
+   HYPRE_CUDA_CALL(cudaStreamCreateWithFlags(&stream, cudaStreamDefault));
+#elif defined(HYPRE_USING_HIP)
+   HYPRE_HIP_CALL(hipStreamCreateWithFlags(&stream, hipStreamDefault));
+#elif defined(HYPRE_USING_SYCL)
+   /* Reserve the last stream as a debugging stream on the CPU */
+   if (i == HYPRE_MAX_NUM_STREAMS - 1)
+   {
+      stream = new sycl::queue(sycl::cpu_selector_v, sycl::property_list{sycl::property::queue::in_order{}});
+   }
+   else
+   {
+      auto sycl_asynchandler = [] (sycl::exception_list exceptions)
+      {
+         for (std::exception_ptr const& e : exceptions)
+         {
+            try
+            {
+               std::rethrow_exception(e);
+            }
+            catch (sycl::exception const& ex)
+            {
+               std::cout << "Caught asynchronous SYCL exception:" << std::endl
+                         << ex.what() << ", SYCL code: " << ex.code() << std::endl;
+            }
+         }
+      };
+
+      if (!data->device)
+      {
+         HYPRE_DeviceInitialize();
+      }
+      sycl::device* sycl_device = data->device;
+      sycl::context sycl_ctxt   = sycl::context(*sycl_device, sycl_asynchandler);
+      stream = new sycl::queue(sycl_ctxt, *sycl_device, sycl::property_list{sycl::property::queue::in_order{}});
+   }
+#endif
+
+   data->streams[i] = stream;
+#endif
+
+   return stream;
+}
+
+/*--------------------------------------------------------------------
+ * hypre_GetDefaultDeviceBlockDimension
+ *--------------------------------------------------------------------*/
+
+dim3
+hypre_GetDefaultDeviceBlockDimension()
+{
+#if defined(HYPRE_USING_SYCL)
+   dim3 bDim(1, 1, hypre_HandleDeviceMaxWorkGroupSize(hypre_handle()));
+#else
+   dim3 bDim(HYPRE_1D_BLOCK_SIZE, 1, 1);
+#endif
+
+   return bDim;
+}
+
+/*--------------------------------------------------------------------
+ * hypre_GetDefaultDeviceGridDimension
+ *--------------------------------------------------------------------*/
+
+dim3
+hypre_GetDefaultDeviceGridDimension( HYPRE_Int   n,
+                                     const char *granularity,
+                                     dim3        bDim )
+{
+   HYPRE_Int num_blocks = 0;
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_Int num_threads_per_block = bDim.get(0) * bDim.get(1) * bDim.get(2);
+#else
+   HYPRE_Int num_threads_per_block = bDim.x * bDim.y * bDim.z;
+#endif
+
+   if (granularity[0] == 't')
+   {
+      num_blocks = (n + num_threads_per_block - 1) / num_threads_per_block;
+   }
+   else if (granularity[0] == 'w')
+   {
+      HYPRE_Int num_warps_per_block = num_threads_per_block >> HYPRE_WARP_BITSHIFT;
+
+      hypre_assert(num_warps_per_block * HYPRE_WARP_SIZE == num_threads_per_block);
+
+      num_blocks = (n + num_warps_per_block - 1) / num_warps_per_block;
+   }
+   else
+   {
+      hypre_printf("Error %s %d: Unknown granularity !\n", __FILE__, __LINE__);
+      hypre_assert(0);
+   }
+
+   dim3 gDim = hypre_dim3(num_blocks);
+
+   return gDim;
+}
+
+/*--------------------------------------------------------------------
+ * hypre_dim3
+ * NOTE: these functions are necessary due to different linearization
+ * procedures between cuda/hip and sycl
+ *--------------------------------------------------------------------*/
+
+dim3
+hypre_dim3(HYPRE_Int x)
+{
+#if defined(HYPRE_USING_SYCL)
+   dim3 d(1, 1, x);
+#else
+   dim3 d(x);
+#endif
+   return d;
+}
+
+dim3
+hypre_dim3(HYPRE_Int x, HYPRE_Int y)
+{
+#if defined(HYPRE_USING_SYCL)
+   dim3 d(1, y, x);
+#else
+   dim3 d(x, y);
+#endif
+   return d;
+}
+
+dim3
+hypre_dim3(HYPRE_Int x, HYPRE_Int y, HYPRE_Int z)
+{
+#if defined(HYPRE_USING_SYCL)
+   dim3 d(z, y, x);
+#else
+   dim3 d(x, y, z);
+#endif
+   return d;
+}
+
+/*--------------------------------------------------------------------------
+ * hypreGPUKernel_ArrayToArrayOfPtrs
+ *--------------------------------------------------------------------------*/
+
+template <typename T>
+__global__ void
+hypreGPUKernel_ArrayToArrayOfPtrs( hypre_DeviceItem  &item,
+                                   HYPRE_Int          n,
+                                   HYPRE_Int          m,
+                                   T                 *data,
+                                   T                **data_aop )
+{
+   HYPRE_Int i = hypre_gpu_get_grid_thread_id<1, 1>(item);
+
+   if (i < n)
+   {
+      data_aop[i] = &data[i * m];
+   }
+}
+
+/*--------------------------------------------------------------------
+ * hypreDevice_ArrayToArrayOfPtrs
+ *--------------------------------------------------------------------*/
+
+template <typename T>
+HYPRE_Int
+hypreDevice_ArrayToArrayOfPtrs(HYPRE_Int n, HYPRE_Int m, T *data, T **data_aop)
+{
+   /* Trivial case */
+   if (n <= 0)
+   {
+      return hypre_error_flag;
+   }
+
+   dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+   dim3 gDim = hypre_GetDefaultDeviceGridDimension(n, "thread", bDim);
+
+   HYPRE_GPU_LAUNCH( hypreGPUKernel_ArrayToArrayOfPtrs, gDim, bDim, n, m, data, data_aop);
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------
+ * hypreDevice_ComplexArrayToArrayOfPtrs
+ *--------------------------------------------------------------------*/
+
+HYPRE_Int
+hypreDevice_ComplexArrayToArrayOfPtrs(HYPRE_Int       n,
+                                      HYPRE_Int       m,
+                                      HYPRE_Complex  *data,
+                                      HYPRE_Complex **data_aop)
+{
+   return hypreDevice_ArrayToArrayOfPtrs(n, m, data, data_aop);
+}
+
+/*--------------------------------------------------------------------
+ * hypreGPUKernel_IVAXPY
+ *--------------------------------------------------------------------*/
+
+__global__ void
+hypreGPUKernel_IVAXPY( hypre_DeviceItem &item, HYPRE_Int n, HYPRE_Complex *a, HYPRE_Complex *x,
+                       HYPRE_Complex *y)
+{
+   HYPRE_Int i = hypre_gpu_get_grid_thread_id<1, 1>(item);
+   if (i < n)
+   {
+      y[i] += x[i] / a[i];
+   }
+}
+
+/*--------------------------------------------------------------------
+ * hypreDevice_IVAXPY
+ *
+ * Inverse Vector AXPY: y[i] = x[i] / a[i] + y[i]
+ *--------------------------------------------------------------------*/
+
+HYPRE_Int
+hypreDevice_IVAXPY(HYPRE_Int n, HYPRE_Complex *a, HYPRE_Complex *x, HYPRE_Complex *y)
+{
+   /* trivial case */
+   if (n <= 0)
+   {
+      return hypre_error_flag;
+   }
+
+   dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+   dim3 gDim = hypre_GetDefaultDeviceGridDimension(n, "thread", bDim);
+
+   HYPRE_GPU_LAUNCH( hypreGPUKernel_IVAXPY, gDim, bDim, n, a, x, y );
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------
+ * hypreGPUKernel_IVAXPYMarked
+ *--------------------------------------------------------------------*/
+
+__global__ void
+hypreGPUKernel_IVAXPYMarked( hypre_DeviceItem &item,
+                             HYPRE_Int         n,
+                             HYPRE_Complex    *a,
+                             HYPRE_Complex    *x,
+                             HYPRE_Complex    *y,
+                             HYPRE_Int        *marker,
+                             HYPRE_Int         marker_val)
+{
+   HYPRE_Int i = hypre_gpu_get_grid_thread_id<1, 1>(item);
+   if (i < n)
+   {
+      if (marker[i] == marker_val)
+      {
+         y[i] += x[i] / a[i];
+      }
+   }
+}
+
+/*--------------------------------------------------------------------
+ * hypreDevice_IVAXPYMarked
+ *
+ * Inverse Vector AXPY: y[i] = x[i] / a[i] + y[i]
+ *--------------------------------------------------------------------*/
+
+HYPRE_Int
+hypreDevice_IVAXPYMarked( HYPRE_Int      n,
+                          HYPRE_Complex *a,
+                          HYPRE_Complex *x,
+                          HYPRE_Complex *y,
+                          HYPRE_Int     *marker,
+                          HYPRE_Int      marker_val )
+{
+   /* trivial case */
+   if (n <= 0)
+   {
+      return hypre_error_flag;
+   }
+
+   dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+   dim3 gDim = hypre_GetDefaultDeviceGridDimension(n, "thread", bDim);
+
+   HYPRE_GPU_LAUNCH( hypreGPUKernel_IVAXPYMarked, gDim, bDim, n, a, x, y, marker, marker_val );
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypreGPUKernel_IVAMXPMY
+ *
+ * Device kernel for hypreDevice_IVAMXPMY. The template argument MM tells
+ * the maximum number of vectors in the unrolled loop
+ *--------------------------------------------------------------------------*/
+
+template <HYPRE_Int MM>
+__global__ void
+hypreGPUKernel_IVAMXPMY( hypre_DeviceItem &item,
+                         HYPRE_Int         m,
+                         HYPRE_Int         n,
+                         HYPRE_Complex    *a,
+                         HYPRE_Complex    *x,
+                         HYPRE_Complex    *y)
+{
+   HYPRE_Int     i = hypre_gpu_get_grid_thread_id<1, 1>(item);
+   HYPRE_Int     j;
+   HYPRE_Complex val;
+
+   if (i < n)
+   {
+      val = 1.0 / a[i];
+
+      if (MM > 0)
+      {
+#pragma unroll
+         for (j = 0; j < MM; j++)
+         {
+            y[i + j * n] += x[i + j * n] * val;
+         }
+      }
+      else
+      {
+         /* Generic case */
+         for (j = 0; j < m; j++)
+         {
+            y[i + j * n] += x[i + j * n] * val;
+         }
+      }
+   }
+}
+
+/*--------------------------------------------------------------------------
+ * hypreDevice_IVAMXPMY
+ *
+ * Inverse Vector AXPY for m vectors x and y of size n stored column-wise:
+ *
+ *   y[i +       0] += x[i +       0] / a[i]
+ *   y[i +       n] += x[i +       n] / a[i]
+ *     ...           ...
+ *   y[i + (m-1)*n] += x[i + (m-1)*n] / a[i]
+ *
+ * Note: does not work for row-wise multivectors
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypreDevice_IVAMXPMY( HYPRE_Int       m,
+                      HYPRE_Int       n,
+                      HYPRE_Complex  *a,
+                      HYPRE_Complex  *x,
+                      HYPRE_Complex  *y)
+{
+   /* trivial case */
+   if (n <= 0)
+   {
+      return hypre_error_flag;
+   }
+
+   dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+   dim3 gDim = hypre_GetDefaultDeviceGridDimension(n, "thread", bDim);
+
+   switch (m)
+   {
+      case 1:
+         HYPRE_GPU_LAUNCH( hypreGPUKernel_IVAXPY, gDim, bDim, n, a, x, y );
+         break;
+
+      case 2:
+         HYPRE_GPU_LAUNCH( hypreGPUKernel_IVAMXPMY<2>, gDim, bDim, m, n, a, x, y );
+         break;
+
+      case 3:
+         HYPRE_GPU_LAUNCH( hypreGPUKernel_IVAMXPMY<3>, gDim, bDim, m, n, a, x, y );
+         break;
+
+      case 4:
+         HYPRE_GPU_LAUNCH( hypreGPUKernel_IVAMXPMY<4>, gDim, bDim, m, n, a, x, y );
+         break;
+
+      default:
+         HYPRE_GPU_LAUNCH( hypreGPUKernel_IVAMXPMY<0>, gDim, bDim, m, n, a, x, y );
+         break;
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------
+ * hypreDevice_CsrRowPtrsToIndices
+ *--------------------------------------------------------------------*/
+
+HYPRE_Int*
+hypreDevice_CsrRowPtrsToIndices( HYPRE_Int  nrows,
+                                 HYPRE_Int  nnz,
+                                 HYPRE_Int *d_row_ptr )
+{
+   /* trivial case */
+   if (nrows <= 0 || nnz <= 0)
+   {
+      return NULL;
+   }
+
+   HYPRE_Int *d_row_ind = hypre_TAlloc(HYPRE_Int, nnz, HYPRE_MEMORY_DEVICE);
+
+   hypreDevice_CsrRowPtrsToIndices_v2(nrows, nnz, d_row_ptr, d_row_ind);
+
+   return d_row_ind;
+}
+
+#if defined(HYPRE_USING_SYCL)
+
+/*--------------------------------------------------------------------
+ * hypreSYCLKernel_ScatterRowPtr
+ *--------------------------------------------------------------------*/
+
+void
+hypreSYCLKernel_ScatterRowPtr( hypre_DeviceItem &item,
+                               HYPRE_Int         nrows,
+                               HYPRE_Int        *d_row_ptr,
+                               HYPRE_Int        *d_row_ind )
+{
+   HYPRE_Int i = (HYPRE_Int) item.get_global_linear_id();
+
+   if (i < nrows)
+   {
+      HYPRE_Int row_start = d_row_ptr[i];
+      HYPRE_Int row_end = d_row_ptr[i + 1];
+      if (row_start != row_end)
+      {
+         d_row_ind[row_start] = i;
+      }
+   }
+}
+#endif
+
+#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+struct hypre_empty_row_functor
+{
+   // This is needed for clang
+   typedef bool result_type;
+
+   __device__
+   bool operator()(const thrust::tuple<HYPRE_Int, HYPRE_Int>& t) const
+   {
+      const HYPRE_Int a = thrust::get<0>(t);
+      const HYPRE_Int b = thrust::get<1>(t);
+
+      return a != b;
+   }
+};
+#endif
+
+/*--------------------------------------------------------------------
+ * hypreDevice_CsrRowPtrsToIndices_v2
+ *--------------------------------------------------------------------*/
+
+HYPRE_Int
+hypreDevice_CsrRowPtrsToIndices_v2( HYPRE_Int  nrows,
+                                    HYPRE_Int  nnz,
+                                    HYPRE_Int *d_row_ptr,
+                                    HYPRE_Int *d_row_ind )
+{
+   /* trivial case */
+   if (nrows <= 0 || nnz <= 0)
+   {
+      return hypre_error_flag;
+   }
+#if defined(HYPRE_USING_SYCL)
+   dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+   dim3 gDim = hypre_GetDefaultDeviceGridDimension(nrows, "thread", bDim);
+   HYPRE_ONEDPL_CALL( std::fill, d_row_ind, d_row_ind + nnz, 0 );
+   HYPRE_GPU_LAUNCH( hypreSYCLKernel_ScatterRowPtr, gDim, bDim, nrows, d_row_ptr, d_row_ind );
+   HYPRE_ONEDPL_CALL( std::inclusive_scan, d_row_ind, d_row_ind + nnz, d_row_ind,
+                      oneapi::dpl::maximum<HYPRE_Int>());
+#else
+
+   hypre_GpuProfilingPushRange("CsrRowPtrsToIndices");
+   HYPRE_THRUST_CALL( fill, d_row_ind, d_row_ind + nnz, 0 );
+   HYPRE_THRUST_CALL( scatter_if,
+                      thrust::counting_iterator<HYPRE_Int>(0),
+                      thrust::counting_iterator<HYPRE_Int>(nrows),
+                      d_row_ptr,
+                      thrust::make_transform_iterator( thrust::make_zip_iterator(thrust::make_tuple(d_row_ptr,
+                                                                                                    d_row_ptr + 1)),
+                                                       hypre_empty_row_functor() ),
+                      d_row_ind );
+   HYPRE_THRUST_CALL( inclusive_scan, d_row_ind, d_row_ind + nnz, d_row_ind,
+                      thrust::maximum<HYPRE_Int>());
+   hypre_GpuProfilingPopRange();
+#endif
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------
+ * hypreDevice_CsrRowIndicesToPtrs
+ *--------------------------------------------------------------------*/
+
+HYPRE_Int*
+hypreDevice_CsrRowIndicesToPtrs( HYPRE_Int  nrows,
+                                 HYPRE_Int  nnz,
+                                 HYPRE_Int *d_row_ind )
+{
+   HYPRE_Int *d_row_ptr = hypre_TAlloc(HYPRE_Int, nrows + 1, HYPRE_MEMORY_DEVICE);
+
+   hypreDevice_CsrRowIndicesToPtrs_v2(nrows, nnz, d_row_ind, d_row_ptr);
+
+   return d_row_ptr;
+}
+
+/*--------------------------------------------------------------------
+ * hypreDevice_CsrRowIndicesToPtrs_v2
+ *--------------------------------------------------------------------*/
+
+HYPRE_Int
+hypreDevice_CsrRowIndicesToPtrs_v2( HYPRE_Int  nrows,
+                                    HYPRE_Int  nnz,
+                                    HYPRE_Int *d_row_ind,
+                                    HYPRE_Int *d_row_ptr )
+{
+#if defined(HYPRE_USING_SYCL)
+   /* Note: if nnz <= 0, then dpl::lower_bound is a no-op, which means we still need to zero out the row pointer */
+   /* Note that this is different from thrust's behavior, where lower_bound zeros out the row pointer when nnz = 0 */
+   if (nnz <= 0)
+   {
+      hypre_Memset(d_row_ptr, 0, (nrows + 1) * sizeof(HYPRE_Int), HYPRE_MEMORY_DEVICE);
+      return hypre_error_flag;
+   }
+   oneapi::dpl::counting_iterator<HYPRE_Int> count(0);
+   HYPRE_ONEDPL_CALL( oneapi::dpl::lower_bound,
+                      d_row_ind, d_row_ind + nnz,
+                      count,
+                      count + nrows + 1,
+                      d_row_ptr);
+#else
+   hypre_GpuProfilingPushRange("CSRIndicesToPtrs");
+   HYPRE_THRUST_CALL( lower_bound,
+                      d_row_ind, d_row_ind + nnz,
+                      thrust::counting_iterator<HYPRE_Int>(0),
+                      thrust::counting_iterator<HYPRE_Int>(nrows + 1),
+                      d_row_ptr);
+   hypre_GpuProfilingPopRange();
+#endif
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------
+ * hypreGPUKernel_GetRowNnz
+ *
+ * Get NNZ of each row in d_row_indices and store the results in d_rownnz
+ * All pointers are device pointers.
+ * d_rownnz can be the same as d_row_indices.
+ *--------------------------------------------------------------------*/
+
+__global__ void
+hypreGPUKernel_GetRowNnz( hypre_DeviceItem &item,
+                          HYPRE_Int         nrows,
+                          HYPRE_Int        *d_row_indices,
+                          HYPRE_Int        *d_diag_ia,
+                          HYPRE_Int        *d_offd_ia,
+                          HYPRE_Int        *d_rownnz )
+{
+   const HYPRE_Int global_thread_id = hypre_gpu_get_grid_thread_id<1, 1>(item);
+
+   if (global_thread_id < nrows)
+   {
+      HYPRE_Int i;
+
+      if (d_row_indices)
+      {
+         i = read_only_load(&d_row_indices[global_thread_id]);
+      }
+      else
+      {
+         i = global_thread_id;
+      }
+
+      d_rownnz[global_thread_id] =
+         read_only_load(&d_diag_ia[i + 1]) - read_only_load(&d_diag_ia[i]) +
+         read_only_load(&d_offd_ia[i + 1]) - read_only_load(&d_offd_ia[i]);
+   }
+}
+
+/*--------------------------------------------------------------------
+ * hypreDevice_GetRowNnz
+ *
+ * Note: (d_row_indices == NULL) means d_row_indices = [0,1,...,nrows-1]
+ *--------------------------------------------------------------------*/
+
+HYPRE_Int
+hypreDevice_GetRowNnz( HYPRE_Int  nrows,
+                       HYPRE_Int *d_row_indices,
+                       HYPRE_Int *d_diag_ia,
+                       HYPRE_Int *d_offd_ia,
+                       HYPRE_Int *d_rownnz )
+{
+   const dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+   const dim3 gDim = hypre_GetDefaultDeviceGridDimension(nrows, "thread", bDim);
+
+   /* trivial case */
+   if (nrows <= 0)
+   {
+      return hypre_error_flag;
+   }
+
+   HYPRE_GPU_LAUNCH( hypreGPUKernel_GetRowNnz, gDim, bDim, nrows, d_row_indices,
+                     d_diag_ia, d_offd_ia, d_rownnz );
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------
+ * hypreDevice_IntegerInclusiveScan
+ *--------------------------------------------------------------------*/
+
+HYPRE_Int
+hypreDevice_IntegerInclusiveScan( HYPRE_Int  n,
+                                  HYPRE_Int *d_i )
+{
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_ONEDPL_CALL(std::inclusive_scan, d_i, d_i + n, d_i);
+#else
+   HYPRE_THRUST_CALL(inclusive_scan, d_i, d_i + n, d_i);
+#endif
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------
+ * hypreGPUKernel_CopyParCSRRows
+ *--------------------------------------------------------------------*/
+
+__global__ void
+hypreGPUKernel_CopyParCSRRows( hypre_DeviceItem  &item,
+                               HYPRE_Int          nrows,
+                               HYPRE_Int         *d_row_indices,
+                               HYPRE_Int          has_offd,
+                               HYPRE_BigInt       first_col,
+                               HYPRE_BigInt      *d_col_map_offd_A,
+                               HYPRE_Int         *d_diag_i,
+                               HYPRE_Int         *d_diag_j,
+                               HYPRE_Complex     *d_diag_a,
+                               HYPRE_Int         *d_offd_i,
+                               HYPRE_Int         *d_offd_j,
+                               HYPRE_Complex     *d_offd_a,
+                               HYPRE_Int         *d_ib,
+                               HYPRE_BigInt      *d_jb,
+                               HYPRE_Complex     *d_ab )
+{
+   const HYPRE_Int global_warp_id = hypre_gpu_get_grid_warp_id<1, 1>(item);
+
+   if (global_warp_id >= nrows)
+   {
+      return;
+   }
+
+   /* lane id inside the warp */
+   const HYPRE_Int lane_id = hypre_gpu_get_lane_id<1>(item);
+   HYPRE_Int i, j = 0, k = 0, p, row, istart, iend, bstart;
+
+   /* diag part */
+   if (lane_id < 2)
+   {
+      /* row index to work on */
+      if (d_row_indices)
+      {
+         row = read_only_load(d_row_indices + global_warp_id);
+      }
+      else
+      {
+         row = global_warp_id;
+      }
+      /* start/end position of the row */
+      j = read_only_load(d_diag_i + row + lane_id);
+      /* start position of b */
+      k = d_ib ? read_only_load(d_ib + global_warp_id) : 0;
+   }
+   istart = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, j, 0);
+   iend   = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, j, 1);
+   bstart = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, k, 0);
+
+   p = bstart - istart;
+   for (i = istart + lane_id; i < iend; i += HYPRE_WARP_SIZE)
+   {
+      d_jb[p + i] = read_only_load(d_diag_j + i) + first_col;
+      if (d_ab)
+      {
+         d_ab[p + i] = read_only_load(d_diag_a + i);
+      }
+   }
+
+   if (!has_offd)
+   {
+      return;
+   }
+
+   /* offd part */
+   if (lane_id < 2)
+   {
+      j = read_only_load(d_offd_i + row + lane_id);
+   }
+   bstart += iend - istart;
+   istart = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, j, 0);
+   iend   = warp_shuffle_sync(item, HYPRE_WARP_FULL_MASK, j, 1);
+
+   p = bstart - istart;
+   for (i = istart + lane_id; i < iend; i += HYPRE_WARP_SIZE)
+   {
+      if (d_col_map_offd_A)
+      {
+         d_jb[p + i] = d_col_map_offd_A[read_only_load(d_offd_j + i)];
+      }
+      else
+      {
+         d_jb[p + i] = -1 - read_only_load(d_offd_j + i);
+      }
+
+      if (d_ab)
+      {
+         d_ab[p + i] = read_only_load(d_offd_a + i);
+      }
+   }
+}
+
+/*--------------------------------------------------------------------
+ * hypreDevice_CopyParCSRRows
+ *
+ * B = A(row_indices, :)
+ * Note: d_ib is an input vector that contains row ptrs,
+ *       i.e., start positions where to put the rows in d_jb and d_ab.
+ *       The col indices in B are global indices, i.e., BigJ
+ *       of length (nrows + 1) or nrow (without the last entry, nnz)
+ * Special cases:
+ *    if d_row_indices == NULL, it means d_row_indices=[0,1,...,nrows-1]
+ *    If col_map_offd_A == NULL, use (-1 - d_offd_j) as column id
+ *    If nrows == 1 and d_ib == NULL, it means d_ib[0] = 0
+ *--------------------------------------------------------------------*/
+
+HYPRE_Int
+hypreDevice_CopyParCSRRows( HYPRE_Int      nrows,
+                            HYPRE_Int     *d_row_indices,
+                            HYPRE_Int      job,
+                            HYPRE_Int      has_offd,
+                            HYPRE_BigInt   first_col,
+                            HYPRE_BigInt  *d_col_map_offd_A,
+                            HYPRE_Int     *d_diag_i,
+                            HYPRE_Int     *d_diag_j,
+                            HYPRE_Complex *d_diag_a,
+                            HYPRE_Int     *d_offd_i,
+                            HYPRE_Int     *d_offd_j,
+                            HYPRE_Complex *d_offd_a,
+                            HYPRE_Int     *d_ib,
+                            HYPRE_BigInt  *d_jb,
+                            HYPRE_Complex *d_ab )
+{
+   HYPRE_UNUSED_VAR(job);
+
+   /* trivial case */
+   if (nrows <= 0)
+   {
+      return hypre_error_flag;
+   }
+
+   hypre_assert(!(nrows > 1 && d_ib == NULL));
+
+   const dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+   const dim3 gDim = hypre_GetDefaultDeviceGridDimension(nrows, "warp", bDim);
+
+   /*
+   if (job == 2)
+   {
+   }
+   */
+
+   HYPRE_GPU_LAUNCH( hypreGPUKernel_CopyParCSRRows, gDim, bDim,
+                     nrows, d_row_indices, has_offd, first_col, d_col_map_offd_A,
+                     d_diag_i, d_diag_j, d_diag_a,
+                     d_offd_i, d_offd_j, d_offd_a,
+                     d_ib, d_jb, d_ab );
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------
+ * hypreDevice_IntegerExclusiveScan
+ *--------------------------------------------------------------------*/
+
+HYPRE_Int
+hypreDevice_IntegerExclusiveScan( HYPRE_Int  n,
+                                  HYPRE_Int *d_i )
+{
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_ONEDPL_CALL(std::exclusive_scan, d_i, d_i + n, d_i, 0);
+#else
+   HYPRE_THRUST_CALL(exclusive_scan, d_i, d_i + n, d_i);
+#endif
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------
+ * hypreDevice_StableSortByTupleKey
+ *
+ * https://github.com/OrangeOwlSolutions/Thrust/blob/master/Sort_by_key_with_tuple_key.cu
+ *
+ * opt: 0, (a,b) < (a',b') iff a < a' or (a = a' and  b  <  b') [normal tupe comp]
+ *      1, (a,b) < (a',b') iff a < a' or (a = a' and |b| > |b'|) [used in dropping small entries]
+ *      2, (a,b) < (a',b') iff a < a' or (a = a' and (b == a or b < b') and b' != a') [used in putting diagonal first]
+ *--------------------------------------------------------------------*/
+
+template <typename T1, typename T2, typename T3>
+HYPRE_Int
+hypreDevice_StableSortByTupleKey( HYPRE_Int N,
+                                  T1 *keys1, T2 *keys2, T3 *vals,
+                                  HYPRE_Int opt )
+{
+#if defined(HYPRE_USING_SYCL)
+   auto zipped_begin = oneapi::dpl::make_zip_iterator(keys1, keys2, vals);
+
+   if (opt == 0)
+   {
+      HYPRE_ONEDPL_CALL(std::stable_sort,
+                        zipped_begin,
+                        zipped_begin + N,
+                        std::less< std::tuple<T1, T2, T3> >());
+   }
+   else if (opt == 1)
+   {
+      HYPRE_ONEDPL_CALL(std::stable_sort,
+                        zipped_begin,
+                        zipped_begin + N,
+                        TupleComp2<T1, T2, T3>());
+   }
+   else if (opt == 2)
+   {
+      HYPRE_ONEDPL_CALL(std::stable_sort,
+                        zipped_begin,
+                        zipped_begin + N,
+                        TupleComp3<T1, T2, T3>());
+   }
+#else
+   hypre_GpuProfilingPushRange("StableSortByTupleKey");
+   auto begin_keys = thrust::make_zip_iterator(thrust::make_tuple(keys1,     keys2));
+   auto end_keys   = thrust::make_zip_iterator(thrust::make_tuple(keys1 + N, keys2 + N));
+
+   if (opt == 0)
+   {
+      HYPRE_THRUST_CALL(stable_sort_by_key,
+                        begin_keys,
+                        end_keys,
+                        vals,
+                        thrust::less< thrust::tuple<T1, T2> >());
+   }
+   else if (opt == 1)
+   {
+      HYPRE_THRUST_CALL(stable_sort_by_key,
+                        begin_keys,
+                        end_keys,
+                        vals,
+                        TupleComp2<T1, T2>());
+   }
+   else if (opt == 2)
+   {
+      HYPRE_THRUST_CALL(stable_sort_by_key,
+                        begin_keys,
+                        end_keys,
+                        vals,
+                        TupleComp3<T1, T2>());
+   }
+   hypre_GpuProfilingPopRange();
+#endif
+   return hypre_error_flag;
+}
+
+template HYPRE_Int hypreDevice_StableSortByTupleKey(HYPRE_Int N,
+                                                    HYPRE_Int *keys1, HYPRE_Int *keys2,
+                                                    HYPRE_Int *vals, HYPRE_Int opt);
+template HYPRE_Int hypreDevice_StableSortByTupleKey(HYPRE_Int N,
+                                                    HYPRE_Int *keys1, HYPRE_Real *keys2,
+                                                    HYPRE_Int *vals, HYPRE_Int opt);
+template HYPRE_Int hypreDevice_StableSortByTupleKey(HYPRE_Int N,
+                                                    HYPRE_Int *keys1, HYPRE_Int *keys2,
+                                                    HYPRE_Complex *vals, HYPRE_Int opt);
+
+/*--------------------------------------------------------------------
+ * hypreDevice_ReduceByTupleKey
+ *--------------------------------------------------------------------*/
+
+template <typename T1, typename T2, typename T3>
+HYPRE_Int
+hypreDevice_ReduceByTupleKey( HYPRE_Int N,
+                              T1 *keys1_in,  T2 *keys2_in,  T3 *vals_in,
+                              T1 *keys1_out, T2 *keys2_out, T3 *vals_out )
+{
+#if defined(HYPRE_USING_SYCL)
+   auto begin_keys_in  = oneapi::dpl::make_zip_iterator(keys1_in,  keys2_in );
+   auto begin_keys_out = oneapi::dpl::make_zip_iterator(keys1_out, keys2_out);
+   std::equal_to< std::tuple<T1, T2> > pred;
+   std::plus<T3> func;
+
+   auto new_end = HYPRE_ONEDPL_CALL(oneapi::dpl::reduce_by_segment,
+                                    begin_keys_in,
+                                    begin_keys_in + N,
+                                    vals_in,
+                                    begin_keys_out,
+                                    vals_out,
+                                    pred,
+                                    func);
+#else
+   auto begin_keys_in  = thrust::make_zip_iterator(thrust::make_tuple(keys1_in,     keys2_in    ));
+   auto end_keys_in    = thrust::make_zip_iterator(thrust::make_tuple(keys1_in + N, keys2_in + N));
+   auto begin_keys_out = thrust::make_zip_iterator(thrust::make_tuple(keys1_out,    keys2_out   ));
+   thrust::equal_to< thrust::tuple<T1, T2> > pred;
+   thrust::plus<T3> func;
+
+   auto new_end = HYPRE_THRUST_CALL(reduce_by_key,
+                                    begin_keys_in,
+                                    end_keys_in,
+                                    vals_in,
+                                    begin_keys_out,
+                                    vals_out,
+                                    pred,
+                                    func);
+#endif
+
+   return new_end.second - vals_out;
+}
+
+template HYPRE_Int hypreDevice_ReduceByTupleKey(HYPRE_Int      N,
+                                                HYPRE_Int     *keys1_in,
+                                                HYPRE_Int     *keys2_in,
+                                                HYPRE_Complex *vals_in,
+                                                HYPRE_Int     *keys1_out,
+                                                HYPRE_Int     *keys2_out,
+                                                HYPRE_Complex *vals_out);
+
+/*--------------------------------------------------------------------
+ * hypreGPUKernel_ScatterConstant
+ *--------------------------------------------------------------------*/
+
+template <typename T>
+__global__ void
+hypreGPUKernel_ScatterConstant(hypre_DeviceItem &item,
+                               T                *x,
+                               HYPRE_Int         n,
+                               HYPRE_Int        *map,
+                               T                 v)
+{
+   HYPRE_Int global_thread_id = hypre_gpu_get_grid_thread_id<1, 1>(item);
+
+   if (global_thread_id < n)
+   {
+      x[map[global_thread_id]] = v;
+   }
+}
+
+/*--------------------------------------------------------------------
+ * hypreDevice_ScatterConstant
+ *
+ * x[map[i]] = v
+ * n is length of map
+ * TODO: thrust?
+ *--------------------------------------------------------------------*/
+
+template <typename T>
+HYPRE_Int
+hypreDevice_ScatterConstant(T *x, HYPRE_Int n, HYPRE_Int *map, T v)
+{
+   /* trivial case */
+   if (n <= 0)
+   {
+      return hypre_error_flag;
+   }
+
+   dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+   dim3 gDim = hypre_GetDefaultDeviceGridDimension(n, "thread", bDim);
+
+   HYPRE_GPU_LAUNCH( hypreGPUKernel_ScatterConstant, gDim, bDim, x, n, map, v );
+
+   return hypre_error_flag;
+}
+
+template HYPRE_Int hypreDevice_ScatterConstant(HYPRE_Int     *x, HYPRE_Int n, HYPRE_Int *map,
+                                               HYPRE_Int     v);
+template HYPRE_Int hypreDevice_ScatterConstant(HYPRE_Complex *x, HYPRE_Int n, HYPRE_Int *map,
+                                               HYPRE_Complex v);
+
+/*--------------------------------------------------------------------
+ * hypreGPUKernel_ScatterAddTrivial
+ *--------------------------------------------------------------------*/
+
+__global__ void
+hypreGPUKernel_ScatterAddTrivial(hypre_DeviceItem &item,
+                                 HYPRE_Int         n,
+                                 HYPRE_Real       *x,
+                                 HYPRE_Int        *map,
+                                 HYPRE_Real       *y)
+{
+   for (HYPRE_Int i = 0; i < n; i++)
+   {
+      x[map[i]] += y[i];
+   }
+}
+
+/*--------------------------------------------------------------------
+ * hypreGPUKernel_ScatterAdd
+ *
+ * x[map[i]] += y[i], same index cannot appear more than once in map
+ *--------------------------------------------------------------------*/
+
+__global__ void
+hypreGPUKernel_ScatterAdd(hypre_DeviceItem &item,
+                          HYPRE_Int         n,
+                          HYPRE_Real       *x,
+                          HYPRE_Int        *map,
+                          HYPRE_Real       *y)
+{
+   HYPRE_Int global_thread_id = hypre_gpu_get_grid_thread_id<1, 1>(item);
+
+   if (global_thread_id < n)
+   {
+      x[map[global_thread_id]] += y[global_thread_id];
+   }
+}
+
+/*--------------------------------------------------------------------
+ * hypreDevice_GenScatterAdd
+ *
+ * Generalized Scatter-and-Add
+ *
+ * for i = 0 : ny-1, x[map[i]] += y[i];
+ *
+ * Note: An index is allowed to appear more than once in map
+ *       Content in y will be destroyed
+ *       When work != NULL, work is at least of size
+ *          [2 * sizeof(HYPRE_Int) + sizeof(HYPRE_Complex)] * ny
+ *--------------------------------------------------------------------*/
+
+HYPRE_Int
+hypreDevice_GenScatterAdd( HYPRE_Real  *x,
+                           HYPRE_Int    ny,
+                           HYPRE_Int   *map,
+                           HYPRE_Real  *y,
+                           char        *work)
+{
+   if (ny <= 0)
+   {
+      return hypre_error_flag;
+   }
+
+   if (ny <= 2)
+   {
+      /* trivial cases, n = 1, 2 */
+      dim3 bDim = hypre_dim3(1);
+      dim3 gDim = hypre_dim3(1);
+      HYPRE_GPU_LAUNCH( hypreGPUKernel_ScatterAddTrivial, gDim, bDim, ny, x, map, y );
+   }
+   else
+   {
+      /* general cases */
+      HYPRE_Int *map2, *reduced_map, reduced_n;
+      HYPRE_Real *reduced_y;
+
+      if (work)
+      {
+         map2 = (HYPRE_Int *) work;
+         reduced_map = map2 + ny;
+         reduced_y = (HYPRE_Real *) (reduced_map + ny);
+      }
+      else
+      {
+         map2        = hypre_TAlloc(HYPRE_Int,  ny, HYPRE_MEMORY_DEVICE);
+         reduced_map = hypre_TAlloc(HYPRE_Int,  ny, HYPRE_MEMORY_DEVICE);
+         reduced_y   = hypre_TAlloc(HYPRE_Real, ny, HYPRE_MEMORY_DEVICE);
+      }
+
+      hypre_TMemcpy(map2, map, HYPRE_Int, ny, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+
+#if defined(HYPRE_USING_SYCL)
+      auto zipped_begin = oneapi::dpl::make_zip_iterator(map2, y);
+      HYPRE_ONEDPL_CALL(std::sort, zipped_begin, zipped_begin + ny,
+      [](auto lhs, auto rhs) {return std::get<0>(lhs) < std::get<0>(rhs);});
+
+      auto new_end = HYPRE_ONEDPL_CALL( oneapi::dpl::reduce_by_segment,
+                                        map2,
+                                        map2 + ny,
+                                        y,
+                                        reduced_map,
+                                        reduced_y );
+#else
+      HYPRE_THRUST_CALL(sort_by_key, map2, map2 + ny, y);
+
+      thrust::pair<HYPRE_Int*, HYPRE_Real*> new_end = HYPRE_THRUST_CALL( reduce_by_key,
+                                                                         map2,
+                                                                         map2 + ny,
+                                                                         y,
+                                                                         reduced_map,
+                                                                         reduced_y );
+#endif
+
+      reduced_n = new_end.first - reduced_map;
+
+      hypre_assert(reduced_n == new_end.second - reduced_y);
+
+      dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+      dim3 gDim = hypre_GetDefaultDeviceGridDimension(reduced_n, "thread", bDim);
+
+      HYPRE_GPU_LAUNCH( hypreGPUKernel_ScatterAdd, gDim, bDim,
+                        reduced_n, x, reduced_map, reduced_y );
+
+      if (!work)
+      {
+         hypre_TFree(map2, HYPRE_MEMORY_DEVICE);
+         hypre_TFree(reduced_map, HYPRE_MEMORY_DEVICE);
+         hypre_TFree(reduced_y, HYPRE_MEMORY_DEVICE);
+      }
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------
+ * hypreGPUKernel_Axpyzn
+ *--------------------------------------------------------------------*/
+
+template<typename T>
+__global__ void
+hypreGPUKernel_Axpyzn( hypre_DeviceItem &item,
+                       HYPRE_Int         n,
+                       T                *x,
+                       T                *y,
+                       T                *z,
+                       T                 a,
+                       T                 b )
+{
+   HYPRE_Int i = hypre_gpu_get_grid_thread_id<1, 1>(item);
+
+   if (i < n)
+   {
+      z[i] = a * x[i] + b * y[i];
+   }
+}
+
+/*--------------------------------------------------------------------
+ * hypreDevice_Axpyzn
+ *--------------------------------------------------------------------*/
+
+template<typename T>
+HYPRE_Int
+hypreDevice_Axpyzn(HYPRE_Int n, T *d_x, T *d_y, T *d_z, T a, T b)
+{
+   if (n <= 0)
+   {
+      return hypre_error_flag;
+   }
+
+   dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+   dim3 gDim = hypre_GetDefaultDeviceGridDimension(n, "thread", bDim);
+
+   HYPRE_GPU_LAUNCH( hypreGPUKernel_Axpyzn, gDim, bDim, n, d_x, d_y, d_z, a, b );
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------
+ * hypreDevice_ComplexAxpyn
+ *--------------------------------------------------------------------*/
+
+HYPRE_Int
+hypreDevice_ComplexAxpyn( HYPRE_Complex  *d_x,
+                          size_t          n,
+                          HYPRE_Complex  *d_y,
+                          HYPRE_Complex  *d_z,
+                          HYPRE_Complex   a )
+{
+   return hypreDevice_Axpyzn((HYPRE_Int) n, d_x, d_y, d_z, a, (HYPRE_Complex) 1.0);
+}
+
+/*--------------------------------------------------------------------
+ * hypreDevice_IntAxpyn
+ *--------------------------------------------------------------------*/
+
+HYPRE_Int
+hypreDevice_IntAxpyn( HYPRE_Int *d_x,
+                      size_t     n,
+                      HYPRE_Int *d_y,
+                      HYPRE_Int *d_z,
+                      HYPRE_Int  a )
+{
+   return hypreDevice_Axpyzn((HYPRE_Int) n, d_x, d_y, d_z, a, (HYPRE_Int) 1);
+}
+
+/*--------------------------------------------------------------------
+ * hypreDevice_BigIntAxpyn
+ *--------------------------------------------------------------------*/
+
+HYPRE_Int
+hypreDevice_BigIntAxpyn( HYPRE_BigInt *d_x,
+                         size_t        n,
+                         HYPRE_BigInt *d_y,
+                         HYPRE_BigInt *d_z,
+                         HYPRE_BigInt  a )
+{
+   return hypreDevice_Axpyzn((HYPRE_Int) n, d_x, d_y, d_z, a, (HYPRE_BigInt) 1);
+}
+
+/*--------------------------------------------------------------------
+ * hypreDevice_ComplexAxpyzn
+ *--------------------------------------------------------------------*/
+
+HYPRE_Int
+hypreDevice_ComplexAxpyzn( HYPRE_Int       n,
+                           HYPRE_Complex  *d_x,
+                           HYPRE_Complex  *d_y,
+                           HYPRE_Complex  *d_z,
+                           HYPRE_Complex   a,
+                           HYPRE_Complex   b )
+{
+   return hypreDevice_Axpyzn(n, d_x, d_y, d_z, a, b);
+}
+
+#if defined(HYPRE_USING_CURAND)
+
+/*--------------------------------------------------------------------
+ * hypre_DeviceDataCurandGenerator
+ *--------------------------------------------------------------------*/
+
+curandGenerator_t
+hypre_DeviceDataCurandGenerator(hypre_DeviceData *data)
+{
+   if (data->curand_generator)
+   {
+      return data->curand_generator;
+   }
+
+   curandGenerator_t gen;
+   HYPRE_CURAND_CALL( curandCreateGenerator(&gen, CURAND_RNG_PSEUDO_DEFAULT) );
+   HYPRE_CURAND_CALL( curandSetPseudoRandomGeneratorSeed(gen, 1234ULL) );
+   HYPRE_CURAND_CALL( curandSetGeneratorOffset(gen, 0) );
+   HYPRE_CURAND_CALL( curandSetStream(gen, hypre_DeviceDataComputeStream(data)) );
+
+   data->curand_generator = gen;
+
+   return gen;
+}
+
+/*--------------------------------------------------------------------
+ * hypre_CurandUniform_core
+ *
+ * T = float or hypre_double
+ *--------------------------------------------------------------------*/
+
+template <typename T>
+HYPRE_Int
+hypre_CurandUniform_core( HYPRE_Int          n,
+                          T                 *urand,
+                          HYPRE_Int          set_seed,
+                          hypre_ulonglongint seed,
+                          HYPRE_Int          set_offset,
+                          hypre_ulonglongint offset)
+{
+   curandGenerator_t gen = hypre_HandleCurandGenerator(hypre_handle());
+
+   hypre_GpuProfilingPushRange("RandGen");
+
+   if (set_seed)
+   {
+      HYPRE_CURAND_CALL( curandSetPseudoRandomGeneratorSeed(gen, seed) );
+   }
+
+   if (set_offset)
+   {
+      HYPRE_CURAND_CALL( curandSetGeneratorOffset(gen, offset) );
+   }
+
+   if (sizeof(T) == sizeof(hypre_double))
+   {
+      HYPRE_CURAND_CALL( curandGenerateUniformDouble(gen, (hypre_double *) urand, n) );
+   }
+   else if (sizeof(T) == sizeof(float))
+   {
+      HYPRE_CURAND_CALL( curandGenerateUniform(gen, (float *) urand, n) );
+   }
+
+   hypre_GpuProfilingPopRange();
+
+   return hypre_error_flag;
+}
+#endif /* #if defined(HYPRE_USING_CURAND) */
+
+#if defined(HYPRE_USING_ROCRAND)
+
+/*--------------------------------------------------------------------
+ * hypre_DeviceDataCurandGenerator
+ *--------------------------------------------------------------------*/
+
+rocrand_generator
+hypre_DeviceDataCurandGenerator(hypre_DeviceData *data)
+{
+   if (data->curand_generator)
+   {
+      return data->curand_generator;
+   }
+
+   rocrand_generator gen;
+   HYPRE_ROCRAND_CALL( rocrand_create_generator(&gen, ROCRAND_RNG_PSEUDO_DEFAULT) );
+   HYPRE_ROCRAND_CALL( rocrand_set_seed(gen, 1234ULL) );
+   HYPRE_ROCRAND_CALL( rocrand_set_offset(gen, 0) );
+   HYPRE_ROCRAND_CALL( rocrand_set_stream(gen, hypre_DeviceDataComputeStream(data)) );
+
+   data->curand_generator = gen;
+
+   return gen;
+}
+
+/*--------------------------------------------------------------------
+ * hypre_CurandUniform_core
+ *--------------------------------------------------------------------*/
+
+template <typename T>
+HYPRE_Int
+hypre_CurandUniform_core( HYPRE_Int          n,
+                          T                 *urand,
+                          HYPRE_Int          set_seed,
+                          hypre_ulonglongint seed,
+                          HYPRE_Int          set_offset,
+                          hypre_ulonglongint offset)
+{
+   hypre_GpuProfilingPushRange("hypre_CurandUniform_core");
+
+   rocrand_generator gen = hypre_HandleCurandGenerator(hypre_handle());
+
+   if (set_seed)
+   {
+      HYPRE_ROCRAND_CALL( rocrand_set_seed(gen, seed) );
+   }
+
+   if (set_offset)
+   {
+      HYPRE_ROCRAND_CALL( rocrand_set_offset(gen, offset) );
+   }
+
+   if (sizeof(T) == sizeof(hypre_double))
+   {
+      HYPRE_ROCRAND_CALL( rocrand_generate_uniform_double(gen, (hypre_double *) urand, n) );
+   }
+   else if (sizeof(T) == sizeof(float))
+   {
+      HYPRE_ROCRAND_CALL( rocrand_generate_uniform(gen, (float *) urand, n) );
+   }
+
+   hypre_GpuProfilingPopRange();
+
+   return hypre_error_flag;
+}
+#endif /* #if defined(HYPRE_USING_ROCRAND) */
+
+#if defined(HYPRE_USING_ONEMKLRAND)
+
+/*--------------------------------------------------------------------
+ * hypre_CurandUniform_core
+ *
+ * T = float or hypre_double
+ *--------------------------------------------------------------------*/
+
+template <typename T>
+HYPRE_Int
+hypre_CurandUniform_core( HYPRE_Int          n,
+                          T                 *urand,
+                          HYPRE_Int          set_seed,
+                          hypre_ulonglongint seed,
+                          HYPRE_Int          set_offset,
+                          hypre_ulonglongint offset)
+{
+   /* Note: if n is zero, onemkl rand throws an error */
+   if (n <= 0)
+   {
+      return hypre_error_flag;
+   }
+
+   static_assert(std::is_same_v<T, float> || std::is_same_v<T, hypre_double>,
+                 "oneMKL: rng/uniform: T is not supported");
+
+   oneapi::mkl::rng::default_engine engine(*hypre_HandleComputeStream(hypre_handle()), seed);
+   oneapi::mkl::rng::uniform<T> distribution(0.0 + offset, 1.0 + offset);
+   oneapi::mkl::rng::generate(distribution, engine, n, urand).wait_and_throw();
+
+   return hypre_error_flag;
+}
+#endif /* #if defined(HYPRE_USING_ONEMKLRAND) */
+
+#if defined(HYPRE_USING_CURAND) || defined(HYPRE_USING_ROCRAND) || defined(HYPRE_USING_ONEMKLRAND)
+
+/*--------------------------------------------------------------------
+ * hypre_CurandUniform
+ *--------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_CurandUniform( HYPRE_Int          n,
+                     HYPRE_Real        *urand,
+                     HYPRE_Int          set_seed,
+                     hypre_ulonglongint seed,
+                     HYPRE_Int          set_offset,
+                     hypre_ulonglongint offset)
+{
+   return hypre_CurandUniform_core(n, urand, set_seed, seed, set_offset, offset);
+}
+
+/*--------------------------------------------------------------------
+ * hypre_CurandUniformSingle
+ *--------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_CurandUniformSingle( HYPRE_Int          n,
+                           float             *urand,
+                           HYPRE_Int          set_seed,
+                           hypre_ulonglongint seed,
+                           HYPRE_Int          set_offset,
+                           hypre_ulonglongint offset)
+{
+   return hypre_CurandUniform_core(n, urand, set_seed, seed, set_offset, offset);
+}
+
+/*--------------------------------------------------------------------
+ * hypre_ResetDeviceRandGenerator
+ *--------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_ResetDeviceRandGenerator( hypre_ulonglongint seed,
+                                hypre_ulonglongint offset )
+{
+#if defined(HYPRE_USING_CURAND)
+   curandGenerator_t gen = hypre_HandleCurandGenerator(hypre_handle());
+   HYPRE_CURAND_CALL( curandSetPseudoRandomGeneratorSeed(gen, seed) );
+   HYPRE_CURAND_CALL( curandSetGeneratorOffset(gen, offset) );
+
+#elif defined(HYPRE_USING_ROCRAND)
+   rocrand_generator gen = hypre_HandleCurandGenerator(hypre_handle());
+   HYPRE_ROCRAND_CALL( rocrand_set_seed(gen, seed) );
+   HYPRE_ROCRAND_CALL( rocrand_set_offset(gen, offset) );
+#endif
+
+   return hypre_error_flag;
+}
+
+#endif /* #if defined(HYPRE_USING_CURAND) || defined(HYPRE_USING_ROCRAND) || defined(HYPRE_USING_ONEMKLRAND) */
+
+/*--------------------------------------------------------------------
+ * hypreGPUKernel_filln
+ *--------------------------------------------------------------------*/
+
+template<typename T>
+__global__ void
+hypreGPUKernel_filln(hypre_DeviceItem &item, T *x, size_t n, T v)
+{
+   HYPRE_Int i = hypre_gpu_get_grid_thread_id<1, 1>(item);
+
+   if (i < n)
+   {
+      x[i] = v;
+   }
+}
+
+/*--------------------------------------------------------------------
+ * hypreDevice_Filln
+ *--------------------------------------------------------------------*/
+
+template<typename T>
+HYPRE_Int
+hypreDevice_Filln(T *d_x, size_t n, T v)
+{
+#if 0
+   HYPRE_THRUST_CALL( fill_n, d_x, n, v);
+#else
+   if (n <= 0)
+   {
+      return hypre_error_flag;
+   }
+
+   dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+   dim3 gDim = hypre_GetDefaultDeviceGridDimension(n, "thread", bDim);
+
+   HYPRE_GPU_LAUNCH( hypreGPUKernel_filln, gDim, bDim, d_x, n, v );
+#endif
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------
+ * hypreDevice_ComplexFilln
+ *--------------------------------------------------------------------*/
+
+HYPRE_Int
+hypreDevice_ComplexFilln( HYPRE_Complex *d_x,
+                          size_t         n,
+                          HYPRE_Complex  v )
+{
+   return hypreDevice_Filln(d_x, n, v);
+}
+
+/*--------------------------------------------------------------------
+ * hypreDevice_CharFilln
+ *--------------------------------------------------------------------*/
+
+HYPRE_Int
+hypreDevice_CharFilln( char   *d_x,
+                       size_t  n,
+                       char    v )
+{
+   return hypreDevice_Filln(d_x, n, v);
+}
+
+/*--------------------------------------------------------------------
+ * hypreDevice_IntFilln
+ *--------------------------------------------------------------------*/
+
+HYPRE_Int
+hypreDevice_IntFilln( HYPRE_Int *d_x,
+                      size_t     n,
+                      HYPRE_Int  v )
+{
+   return hypreDevice_Filln(d_x, n, v);
+}
+
+/*--------------------------------------------------------------------
+ * hypreDevice_BigIntFilln
+ *--------------------------------------------------------------------*/
+
+HYPRE_Int
+hypreDevice_BigIntFilln( HYPRE_BigInt *d_x,
+                         size_t        n,
+                         HYPRE_BigInt  v)
+{
+   return hypreDevice_Filln(d_x, n, v);
+}
+
+/*--------------------------------------------------------------------
+ * hypreGPUKernel_StridedCopy
+ *--------------------------------------------------------------------*/
+
+template<typename T>
+__global__ void
+hypreGPUKernel_StridedCopy(hypre_DeviceItem &item,
+                           HYPRE_Int         size,
+                           HYPRE_Int         stride,
+                           T                *in,
+                           T                *out )
+{
+   HYPRE_Int i = hypre_gpu_get_grid_thread_id<1, 1>(item);
+
+   if (i < size)
+   {
+      out[i] = in[i * stride];
+   }
+}
+
+/*--------------------------------------------------------------------
+ * hypreDevice_StridedCopy
+ *--------------------------------------------------------------------*/
+
+template<typename T>
+HYPRE_Int
+hypreDevice_StridedCopy( HYPRE_Int  size,
+                         HYPRE_Int  stride,
+                         T         *in,
+                         T         *out )
+{
+   if (size < 1 || stride < 1)
+   {
+      return hypre_error_flag;
+   }
+
+   if (in == out)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Cannot perform in-place strided copy");
+      return hypre_error_flag;
+   }
+
+   dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+   dim3 gDim = hypre_GetDefaultDeviceGridDimension(size, "thread", bDim);
+
+   HYPRE_GPU_LAUNCH( hypreGPUKernel_StridedCopy, gDim, bDim, size, stride, in, out );
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------
+ * hypreDevice_IntStridedCopy
+ *--------------------------------------------------------------------*/
+
+HYPRE_Int
+hypreDevice_IntStridedCopy( HYPRE_Int  size,
+                            HYPRE_Int  stride,
+                            HYPRE_Int *in,
+                            HYPRE_Int *out )
+{
+   return hypreDevice_StridedCopy(size, stride, in, out);
+}
+
+/*--------------------------------------------------------------------
+ * hypreDevice_ComplexStridedCopy
+ *--------------------------------------------------------------------*/
+
+HYPRE_Int
+hypreDevice_ComplexStridedCopy( HYPRE_Int      size,
+                                HYPRE_Int      stride,
+                                HYPRE_Complex *in,
+                                HYPRE_Complex *out )
+{
+   return hypreDevice_StridedCopy(size, stride, in, out);
+}
+
+/*--------------------------------------------------------------------
+ * hypreDevice_CsrRowPtrsToIndicesWithRowNum
+ *
+ * Input:  d_row_num, of size nrows, contains the rows indices that
+ *         can be HYPRE_BigInt or HYPRE_Int
+ * Output: d_row_ind
+ *--------------------------------------------------------------------*/
+
+template <typename T>
+HYPRE_Int
+hypreDevice_CsrRowPtrsToIndicesWithRowNum( HYPRE_Int  nrows,
+                                           HYPRE_Int  nnz,
+                                           HYPRE_Int *d_row_ptr,
+                                           T         *d_row_num,
+                                           T         *d_row_ind )
+{
+   /* trivial case */
+   if (nrows <= 0)
+   {
+      return hypre_error_flag;
+   }
+
+   HYPRE_Int *map = hypre_TAlloc(HYPRE_Int, nnz, HYPRE_MEMORY_DEVICE);
+
+   hypreDevice_CsrRowPtrsToIndices_v2(nrows, nnz, d_row_ptr, map);
+
+#if defined(HYPRE_USING_SYCL)
+   hypreSycl_gather(map, map + nnz, d_row_num, d_row_ind);
+#else
+   HYPRE_THRUST_CALL(gather, map, map + nnz, d_row_num, d_row_ind);
+#endif
+
+   hypre_TFree(map, HYPRE_MEMORY_DEVICE);
+
+   return hypre_error_flag;
+}
+
+template HYPRE_Int hypreDevice_CsrRowPtrsToIndicesWithRowNum( HYPRE_Int  nrows,
+                                                              HYPRE_Int  nnz,
+                                                              HYPRE_Int *d_row_ptr,
+                                                              HYPRE_Int *d_row_num,
+                                                              HYPRE_Int *d_row_ind );
+#if defined(HYPRE_MIXEDINT)
+template HYPRE_Int hypreDevice_CsrRowPtrsToIndicesWithRowNum( HYPRE_Int     nrows,
+                                                              HYPRE_Int     nnz,
+                                                              HYPRE_Int    *d_row_ptr,
+                                                              HYPRE_BigInt *d_row_num,
+                                                              HYPRE_BigInt *d_row_ind );
+#endif
+
+/*--------------------------------------------------------------------
+ * hypreDevice_IntegerReduceSum
+ *--------------------------------------------------------------------*/
+
+HYPRE_Int
+hypreDevice_IntegerReduceSum( HYPRE_Int  n,
+                              HYPRE_Int *d_i )
+{
+#if defined(HYPRE_USING_SYCL)
+   return HYPRE_ONEDPL_CALL(std::reduce, d_i, d_i + n);
+#else
+   return HYPRE_THRUST_CALL(reduce, d_i, d_i + n);
+#endif
+}
+
+/*--------------------------------------------------------------------
+ * hypreDevice_ComplexReduceSum
+ *--------------------------------------------------------------------*/
+
+HYPRE_Complex
+hypreDevice_ComplexReduceSum(HYPRE_Int n, HYPRE_Complex *d_x)
+{
+#if defined(HYPRE_USING_SYCL)
+   return HYPRE_ONEDPL_CALL(std::reduce, d_x, d_x + n);
+#else
+   return HYPRE_THRUST_CALL(reduce, d_x, d_x + n);
+#endif
+}
+
+/*--------------------------------------------------------------------
+ * hypreGPUKernel_scalen
+ *--------------------------------------------------------------------*/
+
+template<typename T>
+__global__ void
+hypreGPUKernel_scalen( hypre_DeviceItem &item,
+                       T                *x,
+                       size_t            n,
+                       T                *y,
+                       T                 v )
+{
+   HYPRE_Int i = hypre_gpu_get_grid_thread_id<1, 1>(item);
+
+   if (i < n)
+   {
+      y[i] = x[i] * v;
+   }
+}
+
+/*--------------------------------------------------------------------
+ * hypreDevice_Scalen
+ *--------------------------------------------------------------------*/
+
+template<typename T>
+HYPRE_Int
+hypreDevice_Scalen( T *d_x, size_t n, T *d_y, T v )
+{
+#if 0
+   HYPRE_THRUST_CALL( transform, d_x, d_x + n, d_y, v * _1 );
+#else
+   if (n <= 0)
+   {
+      return hypre_error_flag;
+   }
+
+   dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+   dim3 gDim = hypre_GetDefaultDeviceGridDimension(n, "thread", bDim);
+
+   HYPRE_GPU_LAUNCH( hypreGPUKernel_scalen, gDim, bDim, d_x, n, d_y, v );
+#endif
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------
+ * hypreDevice_IntScalen
+ *--------------------------------------------------------------------*/
+
+HYPRE_Int
+hypreDevice_IntScalen( HYPRE_Int *d_x,
+                       size_t     n,
+                       HYPRE_Int *d_y,
+                       HYPRE_Int  v )
+{
+   return hypreDevice_Scalen(d_x, n, d_y, v);
+}
+
+/*--------------------------------------------------------------------
+ * hypreDevice_ComplexScalen
+ *--------------------------------------------------------------------*/
+
+HYPRE_Int
+hypreDevice_ComplexScalen( HYPRE_Complex *d_x,
+                           size_t         n,
+                           HYPRE_Complex *d_y,
+                           HYPRE_Complex  v )
+{
+   return hypreDevice_Scalen(d_x, n, d_y, v);
+}
+
+/*--------------------------------------------------------------------
+ * hypreDevice_StableSortTupleByTupleKey
+ *
+ * opt:
+ *      0, (a,b) < (a',b') iff a < a' or (a = a' and  b  <  b')
+ *                         [normal tupe comp]
+ *
+ *      2, (a,b) < (a',b') iff a < a' or (a = a' and (b == a or b < b') and b' != a')
+ *                         [used in assembly to put diagonal first]
+ *--------------------------------------------------------------------*/
+
+template <typename T1, typename T2, typename T3, typename T4>
+HYPRE_Int
+hypreDevice_StableSortTupleByTupleKey(HYPRE_Int N,
+                                      T1 *keys1, T2 *keys2, T3 *vals1, T4 *vals2,
+                                      HYPRE_Int opt)
+{
+#if defined(HYPRE_USING_SYCL)
+   auto zipped_begin = oneapi::dpl::make_zip_iterator(keys1, keys2, vals1, vals2);
+
+   if (opt == 0)
+   {
+      HYPRE_ONEDPL_CALL(std::stable_sort,
+                        zipped_begin,
+                        zipped_begin + N,
+                        std::less< std::tuple<T1, T2, T3, T4> >());
+   }
+   else if (opt == 2)
+   {
+      HYPRE_ONEDPL_CALL(std::stable_sort,
+                        zipped_begin,
+                        zipped_begin + N,
+                        TupleComp3<T1, T2, T3, T4>());
+   }
+#else
+   auto begin_keys = thrust::make_zip_iterator(thrust::make_tuple(keys1,     keys2));
+   auto end_keys   = thrust::make_zip_iterator(thrust::make_tuple(keys1 + N, keys2 + N));
+   auto begin_vals = thrust::make_zip_iterator(thrust::make_tuple(vals1,     vals2));
+
+   if (opt == 0)
+   {
+      HYPRE_THRUST_CALL(stable_sort_by_key,
+                        begin_keys,
+                        end_keys,
+                        begin_vals,
+                        thrust::less< thrust::tuple<T1, T2> >());
+   }
+   else if (opt == 2)
+   {
+      HYPRE_THRUST_CALL(stable_sort_by_key,
+                        begin_keys,
+                        end_keys,
+                        begin_vals,
+                        TupleComp3<T1, T2>());
+   }
+#endif
+
+   return hypre_error_flag;
+}
+
+template HYPRE_Int hypreDevice_StableSortTupleByTupleKey(HYPRE_Int N, HYPRE_Int *keys1,
+                                                         HYPRE_Int *keys2, char *vals1, HYPRE_Complex *vals2, HYPRE_Int opt);
+#if defined(HYPRE_MIXEDINT)
+template HYPRE_Int hypreDevice_StableSortTupleByTupleKey(HYPRE_Int N, HYPRE_BigInt *keys1,
+                                                         HYPRE_BigInt *keys2, char *vals1, HYPRE_Complex *vals2, HYPRE_Int opt);
+#endif
+
+/*--------------------------------------------------------------------
+ * hypreGPUKernel_DiagScaleVector
+ *--------------------------------------------------------------------*/
+
+template <HYPRE_Int NV>
+__global__ void
+hypreGPUKernel_DiagScaleVector( hypre_DeviceItem &item,
+                                HYPRE_Int         num_vectors,
+                                HYPRE_Int         num_rows,
+                                HYPRE_Int        *A_i,
+                                HYPRE_Complex    *A_data,
+                                HYPRE_Complex    *x,
+                                HYPRE_Complex     beta,
+                                HYPRE_Complex    *y )
+{
+   HYPRE_Int     i = hypre_gpu_get_grid_thread_id<1, 1>(item);
+   HYPRE_Int     j;
+   HYPRE_Complex val;
+
+   if (i < num_rows)
+   {
+      val = 1.0 / A_data[A_i[i]];
+
+      if (beta != 0.0)
+      {
+         if (NV > 0)
+         {
+#pragma unroll
+            for (j = 0; j < NV; j++)
+            {
+               y[i + j * num_rows] = val  * x[i + j * num_rows] +
+                                     beta * y[i + j * num_rows];
+            }
+         }
+         else
+         {
+#pragma unroll 8
+            for (j = 0; j < num_vectors; j++)
+            {
+               y[i + j * num_rows] = val  * x[i + j * num_rows] +
+                                     beta * y[i + j * num_rows];
+            }
+         }
+      }
+      else
+      {
+         if (NV > 0)
+         {
+#pragma unroll
+            for (j = 0; j < NV; j++)
+            {
+               y[i + j * num_rows] = val  * x[i + j * num_rows];
+            }
+         }
+         else
+         {
+#pragma unroll 8
+            for (j = 0; j < num_vectors; j++)
+            {
+               y[i + j * num_rows] = val  * x[i + j * num_rows];
+            }
+         }
+      }
+   }
+}
+
+/*--------------------------------------------------------------------
+ * hypreDevice_DiagScaleVector
+ *
+ * y = diag(A) \ x + beta y
+ * Note: Assume A_i[i] points to the ith diagonal entry of A
+ *--------------------------------------------------------------------*/
+
+HYPRE_Int
+hypreDevice_DiagScaleVector( HYPRE_Int       num_vectors,
+                             HYPRE_Int       num_rows,
+                             HYPRE_Int      *A_i,
+                             HYPRE_Complex  *A_data,
+                             HYPRE_Complex  *x,
+                             HYPRE_Complex   beta,
+                             HYPRE_Complex  *y )
+{
+   /* trivial case */
+   if (num_rows <= 0)
+   {
+      return hypre_error_flag;
+   }
+   hypre_assert(num_vectors > 0);
+
+   dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+   dim3 gDim = hypre_GetDefaultDeviceGridDimension(num_rows, "thread", bDim);
+
+   switch (num_vectors)
+   {
+      case 1:
+         HYPRE_GPU_LAUNCH( hypreGPUKernel_DiagScaleVector<1>, gDim, bDim,
+                           num_vectors, num_rows, A_i, A_data, x, beta, y );
+         break;
+
+      case 2:
+         HYPRE_GPU_LAUNCH( hypreGPUKernel_DiagScaleVector<2>, gDim, bDim,
+                           num_vectors, num_rows, A_i, A_data, x, beta, y );
+         break;
+
+      case 3:
+         HYPRE_GPU_LAUNCH( hypreGPUKernel_DiagScaleVector<3>, gDim, bDim,
+                           num_vectors, num_rows, A_i, A_data, x, beta, y );
+         break;
+
+      case 4:
+         HYPRE_GPU_LAUNCH( hypreGPUKernel_DiagScaleVector<4>, gDim, bDim,
+                           num_vectors, num_rows, A_i, A_data, x, beta, y );
+         break;
+
+      case 5:
+         HYPRE_GPU_LAUNCH( hypreGPUKernel_DiagScaleVector<5>, gDim, bDim,
+                           num_vectors, num_rows, A_i, A_data, x, beta, y );
+         break;
+
+      case 6:
+         HYPRE_GPU_LAUNCH( hypreGPUKernel_DiagScaleVector<6>, gDim, bDim,
+                           num_vectors, num_rows, A_i, A_data, x, beta, y );
+         break;
+
+      case 7:
+         HYPRE_GPU_LAUNCH( hypreGPUKernel_DiagScaleVector<7>, gDim, bDim,
+                           num_vectors, num_rows, A_i, A_data, x, beta, y );
+         break;
+
+      case 8:
+         HYPRE_GPU_LAUNCH( hypreGPUKernel_DiagScaleVector<8>, gDim, bDim,
+                           num_vectors, num_rows, A_i, A_data, x, beta, y );
+         break;
+
+      default:
+         HYPRE_GPU_LAUNCH( hypreGPUKernel_DiagScaleVector<0>, gDim, bDim,
+                           num_vectors, num_rows, A_i, A_data, x, beta, y );
+         break;
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------
+ * hypreGPUKernel_DiagScaleVector2
+ *--------------------------------------------------------------------*/
+
+template <HYPRE_Int NV, HYPRE_Int CY>
+__global__ void
+hypreGPUKernel_DiagScaleVector2( hypre_DeviceItem &item,
+                                 HYPRE_Int         num_vectors,
+                                 HYPRE_Int         num_rows,
+                                 HYPRE_Complex    *diag,
+                                 HYPRE_Complex    *x,
+                                 HYPRE_Complex     beta,
+                                 HYPRE_Complex    *y,
+                                 HYPRE_Complex    *z )
+{
+   HYPRE_Int      i = hypre_gpu_get_grid_thread_id<1, 1>(item);
+   HYPRE_Int      j;
+   HYPRE_Complex  inv_diag;
+   HYPRE_Complex  x_over_diag;
+
+   if (i < num_rows)
+   {
+      inv_diag = 1.0 / diag[i];
+
+      if (NV > 0)
+      {
+#pragma unroll
+         for (j = 0; j < NV; j++)
+         {
+            x_over_diag = x[i + j * num_rows] * inv_diag;
+
+            if (CY)
+            {
+               y[i + j * num_rows] = x_over_diag;
+            }
+            z[i + j * num_rows] += beta * x_over_diag;
+         }
+      }
+      else
+      {
+#pragma unroll 8
+         for (j = 0; j < num_vectors; j++)
+         {
+            x_over_diag = x[i + j * num_rows] * inv_diag;
+
+            if (CY)
+            {
+               y[i + j * num_rows] = x_over_diag;
+            }
+            z[i + j * num_rows] += beta * x_over_diag;
+         }
+      }
+   }
+}
+
+/*--------------------------------------------------------------------
+ * hypreDevice_DiagScaleVector2
+ *
+ * y = x ./ diag
+ * z = z + beta * (x ./ diag)
+ *--------------------------------------------------------------------*/
+
+HYPRE_Int
+hypreDevice_DiagScaleVector2( HYPRE_Int       num_vectors,
+                              HYPRE_Int       num_rows,
+                              HYPRE_Complex  *diag,
+                              HYPRE_Complex  *x,
+                              HYPRE_Complex   beta,
+                              HYPRE_Complex  *y,
+                              HYPRE_Complex  *z,
+                              HYPRE_Int       computeY )
+{
+   /* trivial case */
+   if (num_rows <= 0)
+   {
+      return hypre_error_flag;
+   }
+   hypre_assert(num_vectors > 0);
+
+   dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+   dim3 gDim = hypre_GetDefaultDeviceGridDimension(num_rows, "thread", bDim);
+
+   switch (num_vectors)
+   {
+      case 1:
+         if (computeY > 0)
+         {
+            HYPRE_GPU_LAUNCH( (hypreGPUKernel_DiagScaleVector2<1, 1>), gDim, bDim,
+                              num_vectors, num_rows, diag, x, beta, y, z );
+         }
+         else
+         {
+            HYPRE_GPU_LAUNCH( (hypreGPUKernel_DiagScaleVector2<1, 0>), gDim, bDim,
+                              num_vectors, num_rows, diag, x, beta, y, z );
+         }
+         break;
+
+      case 2:
+         if (computeY > 0)
+         {
+            HYPRE_GPU_LAUNCH( (hypreGPUKernel_DiagScaleVector2<2, 1>), gDim, bDim,
+                              num_vectors, num_rows, diag, x, beta, y, z );
+         }
+         else
+         {
+            HYPRE_GPU_LAUNCH( (hypreGPUKernel_DiagScaleVector2<2, 0>), gDim, bDim,
+                              num_vectors, num_rows, diag, x, beta, y, z );
+         }
+         break;
+
+      case 3:
+         if (computeY > 0)
+         {
+            HYPRE_GPU_LAUNCH( (hypreGPUKernel_DiagScaleVector2<3, 1>), gDim, bDim,
+                              num_vectors, num_rows, diag, x, beta, y, z );
+         }
+         else
+         {
+            HYPRE_GPU_LAUNCH( (hypreGPUKernel_DiagScaleVector2<3, 0>), gDim, bDim,
+                              num_vectors, num_rows, diag, x, beta, y, z );
+         }
+         break;
+
+      case 4:
+         if (computeY > 0)
+         {
+            HYPRE_GPU_LAUNCH( (hypreGPUKernel_DiagScaleVector2<4, 1>), gDim, bDim,
+                              num_vectors, num_rows, diag, x, beta, y, z );
+         }
+         else
+         {
+            HYPRE_GPU_LAUNCH( (hypreGPUKernel_DiagScaleVector2<4, 0>), gDim, bDim,
+                              num_vectors, num_rows, diag, x, beta, y, z );
+         }
+         break;
+
+      case 5:
+         if (computeY > 0)
+         {
+            HYPRE_GPU_LAUNCH( (hypreGPUKernel_DiagScaleVector2<5, 1>), gDim, bDim,
+                              num_vectors, num_rows, diag, x, beta, y, z );
+         }
+         else
+         {
+            HYPRE_GPU_LAUNCH( (hypreGPUKernel_DiagScaleVector2<5, 0>), gDim, bDim,
+                              num_vectors, num_rows, diag, x, beta, y, z );
+         }
+         break;
+
+      case 6:
+         if (computeY > 0)
+         {
+            HYPRE_GPU_LAUNCH( (hypreGPUKernel_DiagScaleVector2<6, 1>), gDim, bDim,
+                              num_vectors, num_rows, diag, x, beta, y, z );
+         }
+         else
+         {
+            HYPRE_GPU_LAUNCH( (hypreGPUKernel_DiagScaleVector2<6, 0>), gDim, bDim,
+                              num_vectors, num_rows, diag, x, beta, y, z );
+         }
+         break;
+
+      case 7:
+         if (computeY > 0)
+         {
+            HYPRE_GPU_LAUNCH( (hypreGPUKernel_DiagScaleVector2<7, 1>), gDim, bDim,
+                              num_vectors, num_rows, diag, x, beta, y, z );
+         }
+         else
+         {
+            HYPRE_GPU_LAUNCH( (hypreGPUKernel_DiagScaleVector2<7, 0>), gDim, bDim,
+                              num_vectors, num_rows, diag, x, beta, y, z );
+         }
+         break;
+
+      case 8:
+         if (computeY > 0)
+         {
+            HYPRE_GPU_LAUNCH( (hypreGPUKernel_DiagScaleVector2<8, 1>), gDim, bDim,
+                              num_vectors, num_rows, diag, x, beta, y, z );
+         }
+         else
+         {
+            HYPRE_GPU_LAUNCH( (hypreGPUKernel_DiagScaleVector2<8, 0>), gDim, bDim,
+                              num_vectors, num_rows, diag, x, beta, y, z );
+         }
+         break;
+
+      default:
+         if (computeY > 0)
+         {
+            HYPRE_GPU_LAUNCH( (hypreGPUKernel_DiagScaleVector2<0, 1>), gDim, bDim,
+                              num_vectors, num_rows, diag, x, beta, y, z );
+         }
+         else
+         {
+            HYPRE_GPU_LAUNCH( (hypreGPUKernel_DiagScaleVector2<0, 0>), gDim, bDim,
+                              num_vectors, num_rows, diag, x, beta, y, z );
+         }
+         break;
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------
+ * hypreGPUKernel_zeqxmydd
+ *
+ * z[i] = (x[i] + alpha*y[i])*d[i]
+ *--------------------------------------------------------------------*/
+
+__global__ void
+hypreGPUKernel_zeqxmydd(hypre_DeviceItem             &item,
+                        HYPRE_Int                    n,
+                        HYPRE_Complex* __restrict__  x,
+                        HYPRE_Complex                alpha,
+                        HYPRE_Complex* __restrict__  y,
+                        HYPRE_Complex* __restrict__  z,
+                        HYPRE_Complex* __restrict__  d)
+{
+   HYPRE_Int i = hypre_gpu_get_grid_thread_id<1, 1>(item);
+
+   if (i < n)
+   {
+      z[i] = (x[i] + alpha * y[i]) * d[i];
+   }
+}
+
+/*--------------------------------------------------------------------
+ * hypreDevice_zeqxmydd
+ *--------------------------------------------------------------------*/
+
+HYPRE_Int
+hypreDevice_zeqxmydd(HYPRE_Int       n,
+                     HYPRE_Complex  *x,
+                     HYPRE_Complex   alpha,
+                     HYPRE_Complex  *y,
+                     HYPRE_Complex  *z,
+                     HYPRE_Complex  *d)
+{
+   /* trivial case */
+   if (n <= 0)
+   {
+      return hypre_error_flag;
+   }
+
+   dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+   dim3 gDim = hypre_GetDefaultDeviceGridDimension(n, "thread", bDim);
+
+   HYPRE_GPU_LAUNCH( hypreGPUKernel_zeqxmydd, gDim, bDim, n, x, alpha, y, z, d);
+
+   return hypre_error_flag;
+}
+
+#endif // #if defined(HYPRE_USING_GPU)
+
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ *      cuda/hip functions
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+
+/*--------------------------------------------------------------------
+ * hypreGPUKernel_CompileFlagSafetyCheck
+ *
+ * The architecture identification macro __CUDA_ARCH__ is assigned a
+ * three-digit value string xy0 (ending in a literal 0) during each
+ * nvcc compilation stage 1 that compiles for compute_xy.
+ *
+ * This macro can be used in the implementation of GPU functions for
+ * determining the virtual architecture for which it is currently being
+ * compiled. The host code (the non-GPU code) must not depend on it.
+ *
+ * Note that compute_XX refers to a PTX version and sm_XX refers to
+ * a cubin version.
+ *--------------------------------------------------------------------*/
+
+__global__ void
+hypreGPUKernel_CompileFlagSafetyCheck( hypre_DeviceItem &item,
+                                       hypre_int        *cuda_arch_compile )
+{
+#if defined(__CUDA_ARCH__)
+   cuda_arch_compile[0] = __CUDA_ARCH__;
+#endif
+}
+
+/*--------------------------------------------------------------------
+ * hypre_CudaCompileFlagCheck
+ *
+ * Assume this function is called inside HYPRE_Init(), at a place
+ * where we do not want to activate memory pooling, so we do not use
+ * hypre's memory model to Alloc and Free.
+ *
+ * See commented out code below (and do not delete)
+ *
+ * This is really only defined for CUDA and not for HIP
+ *--------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_CudaCompileFlagCheck()
+{
+#if defined(HYPRE_USING_CUDA)
+   HYPRE_Int device;
+   hypre_GetDevice(&device);
+
+   struct cudaDeviceProp props;
+   HYPRE_CUDA_CALL(cudaGetDeviceProperties(&props, device));
+   hypre_int cuda_arch_actual = props.major * 100 + props.minor * 10;
+   hypre_int cuda_arch_compile = -1;
+   dim3 gDim(1, 1, 1), bDim(1, 1, 1);
+
+   hypre_int *cuda_arch_compile_d = NULL;
+   //cuda_arch_compile_d = hypre_TAlloc(hypre_int, 1, HYPRE_MEMORY_DEVICE);
+   HYPRE_CUDA_CALL( cudaMalloc(&cuda_arch_compile_d, sizeof(hypre_int)) );
+   HYPRE_CUDA_CALL( cudaMemcpy(cuda_arch_compile_d, &cuda_arch_compile, sizeof(hypre_int),
+                               cudaMemcpyHostToDevice) );
+   HYPRE_GPU_LAUNCH( hypreGPUKernel_CompileFlagSafetyCheck, gDim, bDim, cuda_arch_compile_d );
+   HYPRE_CUDA_CALL( cudaMemcpy(&cuda_arch_compile, cuda_arch_compile_d, sizeof(hypre_int),
+                               cudaMemcpyDeviceToHost) );
+   //hypre_TFree(cuda_arch_compile_d, HYPRE_MEMORY_DEVICE);
+   HYPRE_CUDA_CALL( cudaFree(cuda_arch_compile_d) );
+
+   /* HYPRE_CUDA_CALL(cudaDeviceSynchronize()); */
+
+   const hypre_int cuda_arch_actual_major  = cuda_arch_actual  / 100;
+   const hypre_int cuda_arch_compile_major = cuda_arch_compile / 100;
+   const hypre_int cuda_arch_actual_minor  = cuda_arch_actual  % 100;
+   const hypre_int cuda_arch_compile_minor = cuda_arch_compile % 100;
+
+   if (cuda_arch_actual_major != cuda_arch_compile_major ||
+       cuda_arch_actual_minor < cuda_arch_compile_minor)
+   {
+      char msg[256];
+
+      if (-1 == cuda_arch_compile)
+      {
+         hypre_sprintf(msg, "hypre error: no proper cuda_arch found");
+      }
+      else
+      {
+         hypre_sprintf(msg,
+                       "hypre error: Compile arch %d ('--generate-code arch=compute_%d') does not match device arch %d",
+                       cuda_arch_compile, cuda_arch_compile / 10, cuda_arch_actual);
+      }
+
+      hypre_error_w_msg(1, msg);
+#if defined(HYPRE_DEBUG)
+      hypre_ParPrintf(hypre_MPI_COMM_WORLD, "%s\n", msg);
+#endif
+      hypre_assert(0);
+   }
+#endif // defined(HYPRE_USING_CUDA)
+
+   return hypre_error_flag;
+}
+
+#if defined(HYPRE_USING_CUSPARSE)
+
+/*--------------------------------------------------------------------
+ * hypre_HYPREComplexToCudaDataType
+ *
+ * Determines the associated CudaDataType for HYPRE_Complex
+ *
+ * TODO: Should be known at compile time.
+ *       Support more sizes.
+ *       Support complex.
+ *
+ * Note: Only works for Single and Double precision.
+ *--------------------------------------------------------------------*/
+
+cudaDataType
+hypre_HYPREComplexToCudaDataType()
+{
+   /*
+   if (sizeof(char)*CHAR_BIT != 8)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "ERROR:  Unsupported char size");
+      hypre_assert(false);
+   }
+   */
+#if defined(HYPRE_COMPLEX)
+   return CUDA_C_64F;
+#else
+#if defined(HYPRE_SINGLE)
+   hypre_assert(sizeof(HYPRE_Complex) == 4);
+   return CUDA_R_32F;
+#elif defined(HYPRE_LONG_DOUBLE)
+#error "Long Double is not supported on GPUs"
+#else
+   hypre_assert(sizeof(HYPRE_Complex) == 8);
+   return CUDA_R_64F;
+#endif
+#endif // #if defined(HYPRE_COMPLEX)
+}
+
+#if CUSPARSE_VERSION >= 10300
+/*--------------------------------------------------------------------
+ * hypre_HYPREIntToCusparseIndexType
+ *
+ * Determines the associated cusparseIndexType_t for HYPRE_Int
+ *--------------------------------------------------------------------*/
+
+cusparseIndexType_t
+hypre_HYPREIntToCusparseIndexType()
+{
+   /*
+   if(sizeof(char)*CHAR_BIT!=8)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "ERROR:  Unsupported char size");
+      hypre_assert(false);
+   }
+   */
+
+#if defined(HYPRE_BIGINT)
+   hypre_assert(sizeof(HYPRE_Int) == 8);
+   return CUSPARSE_INDEX_64I;
+#else
+   hypre_assert(sizeof(HYPRE_Int) == 4);
+   return CUSPARSE_INDEX_32I;
+#endif
+}
+#endif
+
+#endif // #if defined(HYPRE_USING_CUSPARSE)
+
+#if defined(HYPRE_USING_CUBLAS)
+
+/*--------------------------------------------------------------------
+ * hypre_DeviceDataCublasHandle
+ *--------------------------------------------------------------------*/
+
+cublasHandle_t
+hypre_DeviceDataCublasHandle(hypre_DeviceData *data)
+{
+   if (data->cublas_handle)
+   {
+      return data->cublas_handle;
+   }
+
+   cublasHandle_t handle;
+   HYPRE_CUBLAS_CALL( cublasCreate(&handle) );
+
+   HYPRE_CUBLAS_CALL( cublasSetStream(handle, hypre_DeviceDataComputeStream(data)) );
+
+   data->cublas_handle = handle;
+
+   return handle;
+}
+#endif
+
+#if defined(HYPRE_USING_CUSPARSE)
+
+/*--------------------------------------------------------------------
+ * hypre_DeviceDataCusparseHandle
+ *--------------------------------------------------------------------*/
+
+cusparseHandle_t
+hypre_DeviceDataCusparseHandle(hypre_DeviceData *data)
+{
+   if (data->cusparse_handle)
+   {
+      return data->cusparse_handle;
+   }
+
+   cusparseHandle_t handle;
+   HYPRE_CUSPARSE_CALL( cusparseCreate(&handle) );
+
+   HYPRE_CUSPARSE_CALL( cusparseSetStream(handle, hypre_DeviceDataComputeStream(data)) );
+
+   data->cusparse_handle = handle;
+
+   return handle;
+}
+#endif // defined(HYPRE_USING_CUSPARSE)
+
+#if defined(HYPRE_USING_ROCSPARSE)
+
+/*--------------------------------------------------------------------
+ * hypre_DeviceDataCusparseHandle
+ *--------------------------------------------------------------------*/
+
+rocsparse_handle
+hypre_DeviceDataCusparseHandle(hypre_DeviceData *data)
+{
+   if (data->cusparse_handle)
+   {
+      return data->cusparse_handle;
+   }
+
+   rocsparse_handle handle;
+   HYPRE_ROCSPARSE_CALL( rocsparse_create_handle(&handle) );
+
+   HYPRE_ROCSPARSE_CALL( rocsparse_set_stream(handle, hypre_DeviceDataComputeStream(data)) );
+
+   data->cusparse_handle = handle;
+
+   return handle;
+}
+#endif // defined(HYPRE_USING_ROCSPARSE)
+
+#if defined(HYPRE_USING_CUSOLVER) || defined(HYPRE_USING_ROCSOLVER)
+
+/*--------------------------------------------------------------------
+ * hypre_DeviceDataVendorSolverHandle
+ *--------------------------------------------------------------------*/
+
+vendorSolverHandle_t
+hypre_DeviceDataVendorSolverHandle(hypre_DeviceData *data)
+{
+   if (data->vendor_solver_handle)
+   {
+      return data->vendor_solver_handle;
+   }
+
+#if defined(HYPRE_USING_CUSOLVER)
+   cusolverDnHandle_t handle;
+
+   HYPRE_CUSOLVER_CALL( cusolverDnCreate(&handle) );
+   HYPRE_CUSOLVER_CALL( cusolverDnSetStream(handle, hypre_DeviceDataComputeStream(data)) );
+#else
+   rocblas_handle handle;
+
+   HYPRE_ROCBLAS_CALL( rocblas_create_handle(&handle) );
+   HYPRE_ROCBLAS_CALL( rocblas_set_stream(handle, hypre_DeviceDataComputeStream(data)) );
+#endif
+
+   data->vendor_solver_handle = handle;
+
+   return handle;
+}
+#endif // defined(HYPRE_USING_CUSOLVER) || defined(HYPRE_USING_ROCSOLVER)
+
+#endif // #if defined(HYPRE_USING_CUDA)  || defined(HYPRE_USING_HIP)
+
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ *      sycl functions
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#if defined(HYPRE_USING_SYCL)
+
+/*--------------------------------------------------------------------
+ * HYPRE_SetSYCLDevice
+ *--------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_SetSYCLDevice(sycl::device user_device)
+{
+   hypre_DeviceData *data = hypre_HandleDeviceData(hypre_handle());
+
+   /* Cleanup default device and queues */
+   if (data->device)
+   {
+      delete data->device;
+   }
+
+#if defined(HYPRE_USING_CUDA_STREAMS)
+   for (HYPRE_Int i = 0; i < HYPRE_MAX_NUM_STREAMS; i++)
+   {
+      if (data->streams[i])
+      {
+         delete data->streams[i];
+         data->streams[i] = nullptr;
+      }
+   }
+#endif
+
+   /* Setup new device and compute stream */
+   data->device = new sycl::device(user_device);
+   hypre_HandleComputeStream(hypre_handle());
+
+   return hypre_error_flag;
+}
+
+#endif // #if defined(HYPRE_USING_SYCL)
+
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ *      additional functions
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+/*--------------------------------------------------------------------
+ * hypre_bind_device
+ *
+ * This function is supposed to be used in the test drivers to mimic
+ * users' GPU binding approaches
+ * It is supposed to be called before HYPRE_Init,
+ * so that HYPRE_Init can get the wanted device id
+ * Note - sycl has no analogue to cudaSetDevice(),
+ * so this has no effect on the sycl implementation.
+ *--------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_bind_device_id( HYPRE_Int device_id_in,
+                      HYPRE_Int myid,
+                      HYPRE_Int nproc,
+                      MPI_Comm  comm )
+{
+#if defined(HYPRE_USING_GPU) || defined(HYPRE_USING_DEVICE_OPENMP)
+   /* proc id (rank) on the running node */
+   HYPRE_Int myNodeid;
+   /* num of procs (size) on the node */
+   HYPRE_Int NodeSize;
+   /* num of devices seen */
+   hypre_int nDevices;
+   /* device id that want to bind */
+   hypre_int device_id;
+
+   hypre_MPI_Comm node_comm;
+   hypre_MPI_Comm_split_type( comm, hypre_MPI_COMM_TYPE_SHARED,
+                              myid, hypre_MPI_INFO_NULL, &node_comm );
+   hypre_MPI_Comm_rank(node_comm, &myNodeid);
+   hypre_MPI_Comm_size(node_comm, &NodeSize);
+   hypre_MPI_Comm_free(&node_comm);
+   hypre_GetDeviceCount(&nDevices);
+
+   if (-1 == device_id_in)
+   {
+      /* get number of devices on this node */
+      device_id = myNodeid % nDevices;
+   }
+   else
+   {
+      device_id = (hypre_int) device_id_in;
+   }
+
+   /* set device */
+#if defined(HYPRE_USING_DEVICE_OPENMP)
+   omp_set_default_device(device_id);
+
+#elif defined(HYPRE_USING_CUDA)
+   HYPRE_CUDA_CALL( cudaSetDevice(device_id) );
+
+#elif defined(HYPRE_USING_HIP)
+   HYPRE_HIP_CALL( hipSetDevice(device_id) );
+
+#elif defined(HYPRE_USING_SYCL)
+   HYPRE_UNUSED_VAR(device_id);
+#endif
+
+#if defined(HYPRE_DEBUG) && defined(HYPRE_PRINT_ERRORS)
+   hypre_printf("Proc [global %d/%d, local %d/%d] can see %d GPUs and is running on %d\n",
+                myid, nproc, myNodeid, NodeSize, nDevices, device_id);
+#endif
+
+#else
+   HYPRE_UNUSED_VAR(device_id_in);
+   HYPRE_UNUSED_VAR(myid);
+   HYPRE_UNUSED_VAR(nproc);
+   HYPRE_UNUSED_VAR(comm);
+
+#endif // #if defined(HYPRE_USING_GPU) || defined(HYPRE_USING_DEVICE_OPENMP)
+
+   return hypre_error_flag;
+}
+
+HYPRE_Int
+hypre_bind_device( HYPRE_Int myid,
+                   HYPRE_Int nproc,
+                   MPI_Comm  comm )
+{
+   return hypre_bind_device_id(-1, myid, nproc, comm);
+}
diff --git a/external/hypre/src/utilities/device_utils.h b/external/hypre/src/utilities/device_utils.h
new file mode 100644
index 00000000..6cc7fbc5
--- /dev/null
+++ b/external/hypre/src/utilities/device_utils.h
@@ -0,0 +1,2063 @@
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+#ifndef HYPRE_DEVICE_UTILS_H
+#define HYPRE_DEVICE_UTILS_H
+
+#if defined(HYPRE_USING_GPU)
+
+/* Data types depending on GPU architecture */
+#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_SYCL)
+typedef hypre_uint          hypre_mask;
+#define hypre_mask_one      1U
+
+#elif defined(HYPRE_USING_HIP)
+typedef hypre_ulonglongint  hypre_mask;
+#define hypre_mask_one      1ULL
+
+#endif
+
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ *                          cuda includes
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#if defined(HYPRE_USING_CUDA)
+using hypre_DeviceItem = void*;
+#include <cuda.h>
+#include <cuda_runtime.h>
+#include <cuda_profiler_api.h>
+
+#if defined(HYPRE_USING_CURAND)
+#include <curand.h>
+#endif
+
+#if defined(HYPRE_USING_CUBLAS)
+#include <cublas_v2.h>
+#endif
+
+#if defined(HYPRE_USING_CUSPARSE)
+/* Note (VPM) : As of cuSPARSE 12, ILU functionalities have been marked as deprecated.
+   The following definition avoids compilation warnings regarding the use of ILU routines */
+#define DISABLE_CUSPARSE_DEPRECATED
+#include <cusparse.h>
+#endif
+
+#if defined(HYPRE_USING_CUSOLVER)
+#include <cusolverDn.h>
+#endif
+
+#ifndef CUDART_VERSION
+#error CUDART_VERSION Undefined!
+#endif
+
+#ifndef CUDA_VERSION
+#error CUDA_VERSION Undefined!
+#endif
+
+#if CUDA_VERSION >= 11000
+#define THRUST_IGNORE_DEPRECATED_CPP11
+#define CUB_IGNORE_DEPRECATED_CPP11
+#define THRUST_IGNORE_DEPRECATED_CPP_DIALECT
+#define CUB_IGNORE_DEPRECATED_CPP_DIALECT
+#endif
+
+#ifndef CUSPARSE_VERSION
+#if defined(CUSPARSE_VER_MAJOR) && defined(CUSPARSE_VER_MINOR) && defined(CUSPARSE_VER_PATCH)
+#define CUSPARSE_VERSION (CUSPARSE_VER_MAJOR * 1000 + CUSPARSE_VER_MINOR *  100 + CUSPARSE_VER_PATCH)
+#else
+#define CUSPARSE_VERSION CUDA_VERSION
+#endif
+#endif
+
+#define CUSPARSE_NEWAPI_VERSION 11000
+#define CUSPARSE_NEWSPMM_VERSION 11401
+#define CUDA_MALLOCASYNC_VERSION 11020
+#define CUDA_THRUST_NOSYNC_VERSION 12000
+
+#define CUSPARSE_SPSV_VERSION 11600
+#if CUSPARSE_VERSION >= CUSPARSE_SPSV_VERSION
+#define hypre_cusparseSpSVDescr         cusparseSpSVDescr_t
+#define hypre_cusparseSpSV_createDescr  cusparseSpSV_createDescr
+#define hypre_cusparseSpSV_destroyDescr cusparseSpSV_destroyDescr
+#else
+#define hypre_cusparseSpSVDescr         csrsv2Info_t
+#define hypre_cusparseSpSV_createDescr  cusparseCreateCsrsv2Info
+#define hypre_cusparseSpSV_destroyDescr cusparseDestroyCsrsv2Info
+#endif
+
+#define CUSPARSE_SPSM_VERSION 11600
+#if CUSPARSE_VERSION >= CUSPARSE_SPSM_VERSION
+#define hypre_cusparseSpSMDescr         cusparseSpSMDescr_t
+#define hypre_cusparseSpSM_createDescr  cusparseSpSM_createDescr
+#define hypre_cusparseSpSM_destroyDescr cusparseSpSM_destroyDescr
+#else
+#define hypre_cusparseSpSMDescr         csrsm2Info_t
+#define hypre_cusparseSpSM_createDescr  cusparseCreateCsrsm2Info
+#define hypre_cusparseSpSM_destroyDescr cusparseDestroyCsrsm2Info
+#endif
+
+#if defined(HYPRE_USING_DEVICE_MALLOC_ASYNC)
+#if CUDA_VERSION < CUDA_MALLOCASYNC_VERSION
+#error cudaMalloc/FreeAsync needs CUDA 11.2
+#endif
+#endif
+
+#if defined(HYPRE_USING_THRUST_NOSYNC)
+#if CUDA_VERSION < CUDA_THRUST_NOSYNC_VERSION
+#error thrust::cuda::par_nosync needs CUDA 12
+#endif
+#define HYPRE_THRUST_EXECUTION thrust::cuda::par_nosync
+#else
+#define HYPRE_THRUST_EXECUTION thrust::cuda::par
+#endif
+
+#endif /* defined(HYPRE_USING_CUDA) */
+
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ *                          hip includes
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#if defined(HYPRE_USING_HIP)
+
+using hypre_DeviceItem = void*;
+#include <hip/hip_runtime.h>
+
+#if defined(HYPRE_USING_ROCBLAS)
+#include <rocblas/rocblas.h>
+#endif
+
+#if defined(HYPRE_USING_ROCSPARSE)
+#include <rocsparse/rocsparse.h>
+#if !defined(ROCSPARSE_VERSION)
+#define ROCSPARSE_VERSION (ROCSPARSE_VERSION_MAJOR * 100000 + ROCSPARSE_VERSION_MINOR * 100 + ROCSPARSE_VERSION_PATCH)
+#endif
+#endif
+
+#if defined(HYPRE_USING_ROCSOLVER)
+#include <rocsolver/rocsolver.h>
+#endif
+
+#if defined(HYPRE_USING_ROCRAND)
+#include <rocrand/rocrand.h>
+#endif
+
+#endif /* defined(HYPRE_USING_HIP) */
+
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ *                          thrust includes
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+
+#include <thrust/execution_policy.h>
+#if defined(HYPRE_USING_CUDA)
+#include <thrust/system/cuda/execution_policy.h>
+#elif defined(HYPRE_USING_HIP)
+#include <thrust/system/hip/execution_policy.h>
+#endif
+#include <thrust/count.h>
+#include <thrust/device_ptr.h>
+#include <thrust/unique.h>
+#include <thrust/sort.h>
+#include <thrust/binary_search.h>
+#include <thrust/iterator/constant_iterator.h>
+#include <thrust/iterator/counting_iterator.h>
+#include <thrust/iterator/zip_iterator.h>
+#include <thrust/transform.h>
+#include <thrust/functional.h>
+#include <thrust/gather.h>
+#include <thrust/scan.h>
+#include <thrust/fill.h>
+#include <thrust/adjacent_difference.h>
+#include <thrust/inner_product.h>
+#include <thrust/logical.h>
+#include <thrust/replace.h>
+#include <thrust/sequence.h>
+#include <thrust/for_each.h>
+#include <thrust/remove.h>
+#include <thrust/version.h>
+
+/* VPM: this is needed to support cuda 10. not_fn is the correct replacement going forward. */
+#define THRUST_VERSION_NOTFN 200700
+#if (defined(THRUST_VERSION) && THRUST_VERSION < THRUST_VERSION_NOTFN)
+#define HYPRE_THRUST_NOT(pred) thrust::not1(pred)
+#else
+#define HYPRE_THRUST_NOT(pred) thrust::not_fn(pred)
+#endif
+
+using namespace thrust::placeholders;
+#endif /* defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP) */
+
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ *                          sycl includes
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#if defined(HYPRE_USING_SYCL)
+
+#include <sycl/sycl.hpp>
+#include <dpct/dpct.hpp>
+#if defined(HYPRE_USING_ONEMKLSPARSE)
+#include <oneapi/mkl/spblas.hpp>
+#endif
+#if defined(HYPRE_USING_ONEMKLBLAS)
+#include <oneapi/mkl/blas.hpp>
+#include <oneapi/mkl/lapack.hpp>
+#endif
+#if defined(HYPRE_USING_ONEMKLRAND)
+#include <oneapi/mkl/rng.hpp>
+#endif
+
+/* The following definitions facilitate code reuse and limits
+ * if/def-ing when unifying cuda/hip code with sycl code */
+using dim3 = sycl::range<3>;
+using hypre_DeviceItem = sycl::nd_item<3>;
+#define __global__
+#define __host__
+#define __device__
+#define __forceinline__ __inline__ __attribute__((always_inline))
+
+#endif /* defined(HYPRE_USING_SYCL) */
+
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ *      device defined values
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#define HYPRE_MAX_NTHREADS_BLOCK 1024
+
+// HYPRE_WARP_BITSHIFT is just log2 of HYPRE_WARP_SIZE
+#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_SYCL)
+#define HYPRE_WARP_SIZE       32
+#define HYPRE_WARP_BITSHIFT   5
+#define HYPRE_WARP_FULL_MASK  0xFFFFFFFF
+#elif defined(HYPRE_USING_HIP)
+#define HYPRE_WARP_SIZE       64
+#define HYPRE_WARP_BITSHIFT   6
+#define HYPRE_WARP_FULL_MASK  0xFFFFFFFFFFFFFFF
+#endif
+
+#define HYPRE_MAX_NUM_WARPS   (64 * 64 * 32)
+#define HYPRE_FLT_LARGE       1e30
+#define HYPRE_1D_BLOCK_SIZE   512
+#define HYPRE_MAX_NUM_STREAMS 10
+#define HYPRE_SPGEMM_MAX_NBIN 10
+
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ *       macro for launching GPU kernels
+ *       NOTE: IN HYPRE'S DEFAULT STREAM
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#if defined(HYPRE_DEBUG)
+#define GPU_LAUNCH_SYNC { hypre_SyncComputeStream(); hypre_GetDeviceLastError(); }
+#else
+#define GPU_LAUNCH_SYNC
+#endif
+
+/* cuda/hip version */
+#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#define HYPRE_GPU_LAUNCH2(kernel_name, gridsize, blocksize, shmem_size, ...)                                                        \
+{                                                                                                                                   \
+   if ( gridsize.x  == 0 || gridsize.y  == 0 || gridsize.z  == 0 ||                                                                 \
+        blocksize.x == 0 || blocksize.y == 0 || blocksize.z == 0 )                                                                  \
+   {                                                                                                                                \
+      /* printf("Warning %s %d: Zero CUDA grid/block (%d %d %d) (%d %d %d)\n",                                                      \
+                 __FILE__, __LINE__,                                                                                                \
+                 gridsize.x, gridsize.y, gridsize.z, blocksize.x, blocksize.y, blocksize.z); */                                     \
+   }                                                                                                                                \
+   else                                                                                                                             \
+   {                                                                                                                                \
+      hypre_DeviceItem item = NULL;                                                                                                 \
+      (kernel_name) <<< (gridsize), (blocksize), shmem_size, hypre_HandleComputeStream(hypre_handle()) >>> (item, __VA_ARGS__);     \
+      GPU_LAUNCH_SYNC;                                                                                                              \
+   }                                                                                                                                \
+}
+
+#define HYPRE_GPU_LAUNCH(kernel_name, gridsize, blocksize, ...) HYPRE_GPU_LAUNCH2(kernel_name, gridsize, blocksize, 0, __VA_ARGS__)
+#endif /* defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP) */
+
+/* sycl version */
+#if defined(HYPRE_USING_SYCL)
+
+#define HYPRE_GPU_LAUNCH(kernel_name, gridsize, blocksize, ...)                              \
+{                                                                                            \
+   if ( gridsize[2] == 0 || blocksize[2] == 0 )                                              \
+   {                                                                                         \
+     /* hypre_printf("Warning %s %d: Zero SYCL 1D launch parameters grid/block (%d) (%d)\n", \
+                  __FILE__, __LINE__,                                                        \
+                  gridsize[0], blocksize[0]); */                                             \
+   }                                                                                         \
+   else                                                                                      \
+   {                                                                                         \
+      hypre_HandleComputeStream(hypre_handle())->submit([&] (sycl::handler& cgh) {           \
+         cgh.parallel_for(sycl::nd_range<3>(gridsize*blocksize, blocksize),                  \
+            [=] (hypre_DeviceItem item) [[intel::reqd_sub_group_size(HYPRE_WARP_SIZE)]]      \
+               { (kernel_name)(item, __VA_ARGS__);                                           \
+         });                                                                                 \
+      }).wait_and_throw();                                                                   \
+   }                                                                                         \
+}
+
+#define HYPRE_CPU_LAUNCH(kernel_name, gridsize, blocksize, ...)                              \
+{                                                                                            \
+   if ( gridsize[2] == 0 || blocksize[2] == 0 )                                              \
+   {                                                                                         \
+     /* hypre_printf("Warning %s %d: Zero SYCL 1D launch parameters grid/block (%d) (%d)\n", \
+                  __FILE__, __LINE__,                                                        \
+                  gridsize[0], blocksize[0]); */                                             \
+   }                                                                                         \
+   else                                                                                      \
+   {                                                                                         \
+      HPYRE_Int compute_stream = hypre_HandleComputeStreamNum(hypre_handle());               \
+      hypre_HandleComputeStreamNum(hypre_handle) = HYPRE_MAX_NUM_STREAMS - 1;                \
+      hypre_HandleComputeStream(hypre_handle())->submit([&] (sycl::handler& cgh) {           \
+         cgh.parallel_for(sycl::nd_range<3>(gridsize*blocksize, blocksize),                  \
+            [=] (hypre_DeviceItem item) [[intel::reqd_sub_group_size(HYPRE_WARP_SIZE)]]      \
+               { (kernel_name)(item, __VA_ARGS__);                                           \
+         });                                                                                 \
+      }).wait_and_throw();                                                                   \
+      hypre_HandleComputeStreamNum(hypre_handle) = compute_stream;                           \
+   }                                                                                         \
+}
+
+#define HYPRE_GPU_LAUNCH2(kernel_name, gridsize, blocksize, shmem_size, ...)                 \
+{                                                                                            \
+   if ( gridsize[2] == 0 || blocksize[2] == 0 )                                              \
+   {                                                                                         \
+     /* hypre_printf("Warning %s %d: Zero SYCL 1D launch parameters grid/block (%d) (%d)\n", \
+                  __FILE__, __LINE__,                                                        \
+                  gridsize[0], blocksize[0]); */                                             \
+   }                                                                                         \
+   else                                                                                      \
+   {                                                                                         \
+      hypre_HandleComputeStream(hypre_handle())->submit([&] (sycl::handler& cgh) {           \
+         sycl::range<1> shmem_range(shmem_size);                                             \
+         sycl::local_accessor<char, 1> shmem_accessor(shmem_range, cgh);                     \
+         cgh.parallel_for(sycl::nd_range<3>(gridsize*blocksize, blocksize),                  \
+            [=] (hypre_DeviceItem item) [[intel::reqd_sub_group_size(HYPRE_WARP_SIZE)]]      \
+               { (kernel_name)(item,                                                         \
+                  shmem_accessor.get_multi_ptr<sycl::access::decorated::yes>(), __VA_ARGS__);\
+         });                                                                                 \
+      }).wait_and_throw();                                                                   \
+   }                                                                                         \
+}
+
+#define HYPRE_GPU_DEBUG_LAUNCH(kernel_name, gridsize, blocksize, ...)                        \
+{                                                                                            \
+   if ( gridsize[2] == 0 || blocksize[2] == 0 )                                              \
+   {                                                                                         \
+     /* hypre_printf("Warning %s %d: Zero SYCL 1D launch parameters grid/block (%d) (%d)\n", \
+                  __FILE__, __LINE__,                                                        \
+                  gridsize[0], blocksize[0]); */                                             \
+   }                                                                                         \
+   else                                                                                      \
+   {                                                                                         \
+      hypre_HandleComputeStream(hypre_handle())->submit([&] (sycl::handler& cgh) {           \
+         auto debug_stream = sycl::stream(4096, 1024, cgh);                                  \
+         cgh.parallel_for(sycl::nd_range<3>(gridsize*blocksize, blocksize),                  \
+            [=] (hypre_DeviceItem item) [[intel::reqd_sub_group_size(HYPRE_WARP_SIZE)]]      \
+               { (kernel_name)(item, debug_stream, __VA_ARGS__);                             \
+         });                                                                                 \
+      }).wait_and_throw();                                                                   \
+   }                                                                                         \
+}
+
+#define HYPRE_GPU_DEBUG_LAUNCH2(kernel_name, gridsize, blocksize, shmem_size, ...)           \
+{                                                                                            \
+   if ( gridsize[2] == 0 || blocksize[2] == 0 )                                              \
+   {                                                                                         \
+     /* hypre_printf("Warning %s %d: Zero SYCL 1D launch parameters grid/block (%d) (%d)\n", \
+                  __FILE__, __LINE__,                                                        \
+                  gridsize[0], blocksize[0]); */                                             \
+   }                                                                                         \
+   else                                                                                      \
+   {                                                                                         \
+      hypre_HandleComputeStream(hypre_handle())->submit([&] (sycl::handler& cgh) {           \
+         auto debug_stream = sycl::stream(4096, 1024, cgh);                                  \
+         sycl::range<1> shmem_range(shmem_size);                                             \
+         sycl::accessor<char, 1, sycl::access_mode::read_write,                              \
+            sycl::target::local> shmem_accessor(shmem_range, cgh);                           \
+         cgh.parallel_for(sycl::nd_range<3>(gridsize*blocksize, blocksize),                  \
+            [=] (hypre_DeviceItem item) [[intel::reqd_sub_group_size(HYPRE_WARP_SIZE)]]      \
+               { (kernel_name)(item, debug_stream,                                           \
+                  shmem_accessor.get_multi_ptr<sycl::access::decorated::yes>(), __VA_ARGS__);\
+         });                                                                                 \
+      }).wait_and_throw();                                                                   \
+   }                                                                                         \
+}
+#endif /* defined(HYPRE_USING_SYCL) */
+
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ *      macros for wrapping cuda/hip/sycl calls for error reporting
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#if defined(HYPRE_USING_CUDA)
+#define HYPRE_CUDA_CALL(call) do {                                                           \
+   cudaError_t err = call;                                                                   \
+   if (cudaSuccess != err) {                                                                 \
+      printf("CUDA ERROR (code = %d, %s) at %s:%d\n", err, cudaGetErrorString(err),          \
+                   __FILE__, __LINE__);                                                      \
+      hypre_assert(0);                                                                       \
+   } } while(0)
+
+#elif defined(HYPRE_USING_HIP)
+#define HYPRE_HIP_CALL(call) do {                                                            \
+   hipError_t err = call;                                                                    \
+   if (hipSuccess != err) {                                                                  \
+      printf("HIP ERROR (code = %d, %s) at %s:%d\n", err, hipGetErrorString(err),            \
+                   __FILE__, __LINE__);                                                      \
+      hypre_assert(0);                                                                       \
+   } } while(0)
+
+#elif defined(HYPRE_USING_SYCL)
+#define HYPRE_SYCL_CALL(call)                                                                \
+   try                                                                                       \
+   {                                                                                         \
+      call;                                                                                  \
+   }                                                                                         \
+   catch (sycl::exception const &ex)                                                         \
+   {                                                                                         \
+      hypre_printf("SYCL ERROR (code = %s) at %s:%d\n", ex.what(),                           \
+                     __FILE__, __LINE__);                                                    \
+      assert(0);                                                                             \
+   }                                                                                         \
+   catch(std::runtime_error const& ex)                                                       \
+   {                                                                                         \
+      hypre_printf("STD ERROR (code = %s) at %s:%d\n", ex.what(),                            \
+                   __FILE__, __LINE__);                                                      \
+      assert(0);                                                                             \
+   }
+#endif
+
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ *      macros for wrapping vendor library calls for error reporting
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#if defined(HYPRE_COMPLEX) /* Double Complex */
+#error "GPU build does not support complex numbers!"
+
+#elif defined(HYPRE_SINGLE) /* Single */
+#if defined(HYPRE_USING_CUDA)
+/* cuBLAS */
+#define hypre_cublas_scal                      cublasSscal
+#define hypre_cublas_axpy                      cublasSaxpy
+#define hypre_cublas_dot                       cublasSdot
+#define hypre_cublas_gemv                      cublasSgemv
+#define hypre_cublas_getrfBatched              cublasSgetrfBatched
+#define hypre_cublas_getriBatched              cublasSgetriBatched
+
+/* cuSPARSE */
+#define hypre_cusparse_csru2csr_bufferSizeExt  cusparseScsru2csr_bufferSizeExt
+#define hypre_cusparse_csru2csr                cusparseScsru2csr
+#define hypre_cusparse_csrsv2_bufferSize       cusparseScsrsv2_bufferSize
+#define hypre_cusparse_csrsv2_analysis         cusparseScsrsv2_analysis
+#define hypre_cusparse_csrsv2_solve            cusparseScsrsv2_solve
+#define hypre_cusparse_csrmv                   cusparseScsrmv
+#define hypre_cusparse_csrgemm                 cusparseScsrgemm
+#define hypre_cusparse_csr2csc                 cusparseScsr2csc
+#define hypre_cusparse_csrilu02_bufferSize     cusparseScsrilu02_bufferSize
+#define hypre_cusparse_csrilu02_analysis       cusparseScsrilu02_analysis
+#define hypre_cusparse_csrilu02                cusparseScsrilu02
+#define hypre_cusparse_csrsm2_bufferSizeExt    cusparseScsrsm2_bufferSizeExt
+#define hypre_cusparse_csrsm2_analysis         cusparseScsrsm2_analysis
+#define hypre_cusparse_csrsm2_solve            cusparseScsrsm2_solve
+
+/* cuSOLVER */
+#define hypre_cusolver_dngetrf                 cusolverDnSgetrf
+#define hypre_cusolver_dngetrf_bs              cusolverDnSgetrf_bufferSize
+#define hypre_cusolver_dngetrs                 cusolverDnSgetrs
+
+#elif defined(HYPRE_USING_HIP)
+/* rocSPARSE */
+#define hypre_rocsparse_csrsv_buffer_size      rocsparse_scsrsv_buffer_size
+#define hypre_rocsparse_csrsv_analysis         rocsparse_scsrsv_analysis
+#define hypre_rocsparse_csrsv_solve            rocsparse_scsrsv_solve
+#define hypre_rocsparse_gthr                   rocsparse_sgthr
+#define hypre_rocsparse_csrmv_analysis         rocsparse_scsrmv_analysis
+#define hypre_rocsparse_csrmv                  rocsparse_scsrmv
+#define hypre_rocsparse_csrgemm_buffer_size    rocsparse_scsrgemm_buffer_size
+#define hypre_rocsparse_csrgemm                rocsparse_scsrgemm
+#define hypre_rocsparse_csr2csc                rocsparse_scsr2csc
+#define hypre_rocsparse_csrilu0_buffer_size    rocsparse_scsrilu0_buffer_size
+#define hypre_rocsparse_csrilu0_analysis       rocsparse_scsrilu0_analysis
+#define hypre_rocsparse_csrilu0                rocsparse_scsrilu0
+#define hypre_rocsparse_csritilu0_compute      rocsparse_scsritilu0_compute
+#define hypre_rocsparse_csritilu0_history      rocsparse_scsritilu0_history
+
+/* rocSOLVER */
+
+/**************
+ * TODO (VPM) *
+ **************/
+
+#endif /* if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP) */
+
+#elif defined(HYPRE_LONG_DOUBLE) /* Long Double */
+#error "GPU build does not support Long Double numbers!"
+
+#else /* Double */
+#if defined(HYPRE_USING_CUDA)
+/* cuBLAS */
+#define hypre_cublas_scal                      cublasDscal
+#define hypre_cublas_axpy                      cublasDaxpy
+#define hypre_cublas_dot                       cublasDdot
+#define hypre_cublas_gemv                      cublasDgemv
+#define hypre_cublas_getrfBatched              cublasDgetrfBatched
+#define hypre_cublas_getriBatched              cublasDgetriBatched
+
+/* cuSPARSE */
+#define hypre_cusparse_csru2csr_bufferSizeExt  cusparseDcsru2csr_bufferSizeExt
+#define hypre_cusparse_csru2csr                cusparseDcsru2csr
+#define hypre_cusparse_csrsv2_bufferSize       cusparseDcsrsv2_bufferSize
+#define hypre_cusparse_csrsv2_analysis         cusparseDcsrsv2_analysis
+#define hypre_cusparse_csrsv2_solve            cusparseDcsrsv2_solve
+#define hypre_cusparse_csrmv                   cusparseDcsrmv
+#define hypre_cusparse_csrgemm                 cusparseDcsrgemm
+#define hypre_cusparse_csr2csc                 cusparseDcsr2csc
+#define hypre_cusparse_csrilu02_bufferSize     cusparseDcsrilu02_bufferSize
+#define hypre_cusparse_csrilu02_analysis       cusparseDcsrilu02_analysis
+#define hypre_cusparse_csrilu02                cusparseDcsrilu02
+#define hypre_cusparse_csrsm2_bufferSizeExt    cusparseDcsrsm2_bufferSizeExt
+#define hypre_cusparse_csrsm2_analysis         cusparseDcsrsm2_analysis
+#define hypre_cusparse_csrsm2_solve            cusparseDcsrsm2_solve
+
+/* cuSOLVER */
+#define hypre_cusolver_dngetrf                 cusolverDnDgetrf
+#define hypre_cusolver_dngetrf_bs              cusolverDnDgetrf_bufferSize
+#define hypre_cusolver_dngetrs                 cusolverDnDgetrs
+
+#elif defined(HYPRE_USING_HIP)
+/* rocSPARSE */
+#define hypre_rocsparse_csrsv_buffer_size      rocsparse_dcsrsv_buffer_size
+#define hypre_rocsparse_csrsv_analysis         rocsparse_dcsrsv_analysis
+#define hypre_rocsparse_csrsv_solve            rocsparse_dcsrsv_solve
+#define hypre_rocsparse_gthr                   rocsparse_dgthr
+#define hypre_rocsparse_csrmv_analysis         rocsparse_dcsrmv_analysis
+#define hypre_rocsparse_csrmv                  rocsparse_dcsrmv
+#define hypre_rocsparse_csrgemm_buffer_size    rocsparse_dcsrgemm_buffer_size
+#define hypre_rocsparse_csrgemm                rocsparse_dcsrgemm
+#define hypre_rocsparse_csr2csc                rocsparse_dcsr2csc
+#define hypre_rocsparse_csrilu0_buffer_size    rocsparse_dcsrilu0_buffer_size
+#define hypre_rocsparse_csrilu0_analysis       rocsparse_dcsrilu0_analysis
+#define hypre_rocsparse_csrilu0                rocsparse_dcsrilu0
+#define hypre_rocsparse_csritilu0_compute      rocsparse_dcsritilu0_compute
+#define hypre_rocsparse_csritilu0_history      rocsparse_dcsritilu0_history
+
+/* rocSOLVER */
+
+/**************
+ * TODO (VPM) *
+ **************/
+
+#endif /* #if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)*/
+#endif /* #if defined(HYPRE_COMPLEX) || defined(HYPRE_SINGLE) || defined(HYPRE_LONG_DOUBLE) */
+
+#define HYPRE_CUBLAS_CALL(call) do {                                                         \
+   cublasStatus_t err = call;                                                                \
+   if (CUBLAS_STATUS_SUCCESS != err) {                                                       \
+      printf("CUBLAS ERROR (code = %d, %d) at %s:%d\n",                                      \
+            err, err == CUBLAS_STATUS_EXECUTION_FAILED, __FILE__, __LINE__);                 \
+      hypre_assert(0); exit(1);                                                              \
+   } } while(0)
+
+#define HYPRE_ROCBLAS_CALL(call) do {                                                        \
+   rocblas_status err = call;                                                                \
+   if (rocblas_status_success != err) {                                                      \
+      printf("rocBLAS ERROR (code = %d, %s) at %s:%d\n",                                     \
+             err, rocblas_status_to_string(err), __FILE__, __LINE__);                        \
+      hypre_assert(0); exit(1);                                                              \
+   } } while(0)
+
+#if CUSPARSE_VERSION >= 10300
+#define HYPRE_CUSPARSE_CALL(call) do {                                                       \
+   cusparseStatus_t err = call;                                                              \
+   if (CUSPARSE_STATUS_SUCCESS != err) {                                                     \
+      printf("CUSPARSE ERROR (code = %d, %s) at %s:%d\n",                                    \
+            err, cusparseGetErrorString(err), __FILE__, __LINE__);                           \
+      hypre_assert(0); exit(1);                                                              \
+   } } while(0)
+#else
+#define HYPRE_CUSPARSE_CALL(call) do {                                                       \
+   cusparseStatus_t err = call;                                                              \
+   if (CUSPARSE_STATUS_SUCCESS != err) {                                                     \
+      printf("CUSPARSE ERROR (code = %d) at %s:%d\n",                                        \
+            err, __FILE__, __LINE__);                                                        \
+      hypre_assert(0); exit(1);                                                              \
+   } } while(0)
+#endif
+
+#define HYPRE_ROCSPARSE_CALL(call) do {                                                      \
+   rocsparse_status err = call;                                                              \
+   if (rocsparse_status_success != err) {                                                    \
+      printf("rocSPARSE ERROR (code = %d) at %s:%d\n",                                       \
+            err, __FILE__, __LINE__);                                                        \
+      assert(0); exit(1);                                                                    \
+   } } while(0)
+
+#define HYPRE_CUSOLVER_CALL(call) do {                                                       \
+   cusolverStatus_t err = call;                                                              \
+   if (CUSOLVER_STATUS_SUCCESS != err) {                                                     \
+      printf("cuSOLVER ERROR (code = %d) at %s:%d\n",                                        \
+            err, __FILE__, __LINE__);                                                        \
+      hypre_assert(0);                                                                       \
+   } } while(0)
+
+#define HYPRE_ROCSOLVER_CALL(call) do {                                                      \
+   rocblas_status err = call;                                                                \
+   if (rocblas_status_success != err) {                                                      \
+      printf("rocSOLVER ERROR (code = %d, %s) at %s:%d\n",                                   \
+             err, rocblas_status_to_string(err), __FILE__, __LINE__);                        \
+   } } while(0)
+
+#define HYPRE_CURAND_CALL(call) do {                                                         \
+   curandStatus_t err = call;                                                                \
+   if (CURAND_STATUS_SUCCESS != err) {                                                       \
+      printf("CURAND ERROR (code = %d) at %s:%d\n", err, __FILE__, __LINE__);                \
+      hypre_assert(0); exit(1);                                                              \
+   } } while(0)
+
+#define HYPRE_ROCRAND_CALL(call) do {                                                        \
+   rocrand_status err = call;                                                                \
+   if (ROCRAND_STATUS_SUCCESS != err) {                                                      \
+      printf("ROCRAND ERROR (code = %d) at %s:%d\n", err, __FILE__, __LINE__);               \
+      hypre_assert(0); exit(1);                                                              \
+   } } while(0)
+
+#define HYPRE_ONEMKL_CALL(call)                                                              \
+   try                                                                                       \
+   {                                                                                         \
+      call;                                                                                  \
+   }                                                                                         \
+   catch (oneapi::mkl::exception const &ex)                                                  \
+   {                                                                                         \
+      hypre_printf("ONEMKL ERROR (code = %s) at %s:%d\n", ex.what(),                         \
+                   __FILE__, __LINE__);                                                      \
+      assert(0); exit(1);                                                                    \
+   }
+
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ *      macros for wrapping thrust/oneDPL calls for error reporting
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+/* RL: TODO Want macro HYPRE_THRUST_CALL to return value but I don't know how to do it right
+ * The following one works OK for now */
+
+#if defined(HYPRE_USING_CUDA)
+#define HYPRE_THRUST_CALL(func_name, ...) \
+   thrust::func_name(HYPRE_THRUST_EXECUTION(hypre_HandleDeviceAllocator(hypre_handle())).on(hypre_HandleComputeStream(hypre_handle())), __VA_ARGS__);
+#elif defined(HYPRE_USING_HIP)
+#define HYPRE_THRUST_CALL(func_name, ...) \
+   thrust::func_name(thrust::hip::par(hypre_HandleDeviceAllocator(hypre_handle())).on(hypre_HandleComputeStream(hypre_handle())), __VA_ARGS__);
+
+#elif defined(HYPRE_USING_SYCL)
+
+#define HYPRE_ONEDPL_CALL(func_name, ...)                                                    \
+  func_name(oneapi::dpl::execution::make_device_policy(                                      \
+           *hypre_HandleComputeStream(hypre_handle())), __VA_ARGS__);
+
+#define HYPRE_ONEDPL_CPU_CALL(func_name, ...)                                                \
+   func_name(oneapi::dpl::execution::make_device_policy(                                     \
+             *hypre_DeviceDataStream(hypre_HandleDeviceData(hypre_handle()), HYPRE_MAX_NUM_STREAMS - 1)), __VA_ARGS__);
+
+#endif
+
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ *      device info data structures
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+struct hypre_cub_CachingDeviceAllocator;
+typedef struct hypre_cub_CachingDeviceAllocator hypre_cub_CachingDeviceAllocator;
+
+#if defined(HYPRE_USING_CUSOLVER)
+typedef cusolverDnHandle_t vendorSolverHandle_t;
+#elif defined(HYPRE_USING_ROCSOLVER)
+typedef rocblas_handle     vendorSolverHandle_t;
+#endif
+
+struct hypre_DeviceData
+{
+#if defined(HYPRE_USING_CURAND)
+   curandGenerator_t                 curand_generator;
+#endif
+
+#if defined(HYPRE_USING_ROCRAND)
+   rocrand_generator                 curand_generator;
+#endif
+
+#if defined(HYPRE_USING_CUBLAS)
+   cublasHandle_t                    cublas_handle;
+#endif
+
+#if defined(HYPRE_USING_CUSPARSE)
+   cusparseHandle_t                  cusparse_handle;
+#endif
+
+#if defined(HYPRE_USING_ROCSPARSE)
+   rocsparse_handle                  cusparse_handle;
+#endif
+
+#if defined(HYPRE_USING_CUSOLVER) || defined(HYPRE_USING_ROCSOLVER)
+   vendorSolverHandle_t              vendor_solver_handle;
+#endif
+
+   /* TODO (VPM): Change to HYPRE_USING_GPU_STREAMS*/
+#if defined(HYPRE_USING_CUDA_STREAMS)
+#if defined(HYPRE_USING_CUDA)
+   cudaStream_t                      streams[HYPRE_MAX_NUM_STREAMS];
+#elif defined(HYPRE_USING_HIP)
+   hipStream_t                       streams[HYPRE_MAX_NUM_STREAMS];
+#elif defined(HYPRE_USING_SYCL)
+   sycl::queue*                      streams[HYPRE_MAX_NUM_STREAMS] = {NULL};
+#endif
+#endif
+
+#if defined(HYPRE_USING_DEVICE_POOL)
+   hypre_uint                        cub_bin_growth;
+   hypre_uint                        cub_min_bin;
+   hypre_uint                        cub_max_bin;
+   size_t                            cub_max_cached_bytes;
+   hypre_cub_CachingDeviceAllocator *cub_dev_allocator;
+   hypre_cub_CachingDeviceAllocator *cub_uvm_allocator;
+#endif
+
+#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+   hypre_device_allocator            device_allocator;
+#endif
+#if defined(HYPRE_USING_SYCL)
+   sycl::device                     *device;
+   HYPRE_Int                         device_max_work_group_size;
+#else
+   HYPRE_Int                         device;
+#endif
+   hypre_int                         device_max_shmem_per_block[3];
+   /* by default, hypre puts GPU computations in this stream
+    * Do not be confused with the default (null) stream */
+   HYPRE_Int                         compute_stream_num;
+   /* work space for hypre's device reducer */
+   void                             *reduce_buffer;
+   /* device spgemm options */
+   HYPRE_Int                         spgemm_algorithm;
+   HYPRE_Int                         spgemm_binned;
+   HYPRE_Int                         spgemm_num_bin;
+   /* the highest bins for symbl [0] and numer [1]
+    * which are not necessary to be `spgemm_num_bin' due to shmem limit on GPUs */
+   HYPRE_Int                         spgemm_highest_bin[2];
+   /* for bin i: ([0][i], [2][i]) = (max #block to launch, block dimension) for symbl
+    *            ([1][i], [3][i]) = (max #block to launch, block dimension) for numer */
+   HYPRE_Int                         spgemm_block_num_dim[4][HYPRE_SPGEMM_MAX_NBIN + 1];
+   HYPRE_Int                         spgemm_rownnz_estimate_method;
+   HYPRE_Int                         spgemm_rownnz_estimate_nsamples;
+   float                             spgemm_rownnz_estimate_mult_factor;
+   /* cusparse */
+   HYPRE_Int                         spmv_use_vendor;
+   HYPRE_Int                         sptrans_use_vendor;
+   HYPRE_Int                         spgemm_use_vendor;
+   /* PMIS RNG */
+   HYPRE_Int                         use_gpu_rand;
+};
+
+#define hypre_DeviceDataCubBinGrowth(data)                   ((data) -> cub_bin_growth)
+#define hypre_DeviceDataCubMinBin(data)                      ((data) -> cub_min_bin)
+#define hypre_DeviceDataCubMaxBin(data)                      ((data) -> cub_max_bin)
+#define hypre_DeviceDataCubMaxCachedBytes(data)              ((data) -> cub_max_cached_bytes)
+#define hypre_DeviceDataCubDevAllocator(data)                ((data) -> cub_dev_allocator)
+#define hypre_DeviceDataCubUvmAllocator(data)                ((data) -> cub_uvm_allocator)
+#define hypre_DeviceDataDevice(data)                         ((data) -> device)
+#define hypre_DeviceDataDeviceMaxWorkGroupSize(data)         ((data) -> device_max_work_group_size)
+#define hypre_DeviceDataDeviceMaxShmemPerBlock(data)         ((data) -> device_max_shmem_per_block)
+#define hypre_DeviceDataDeviceMaxShmemPerBlockInited(data)  (((data) -> device_max_shmem_per_block)[2])
+#define hypre_DeviceDataComputeStreamNum(data)               ((data) -> compute_stream_num)
+#define hypre_DeviceDataReduceBuffer(data)                   ((data) -> reduce_buffer)
+#define hypre_DeviceDataSpgemmUseVendor(data)                ((data) -> spgemm_use_vendor)
+#define hypre_DeviceDataSpMVUseVendor(data)                  ((data) -> spmv_use_vendor)
+#define hypre_DeviceDataSpTransUseVendor(data)               ((data) -> sptrans_use_vendor)
+#define hypre_DeviceDataSpgemmAlgorithm(data)                ((data) -> spgemm_algorithm)
+#define hypre_DeviceDataSpgemmBinned(data)                   ((data) -> spgemm_binned)
+#define hypre_DeviceDataSpgemmNumBin(data)                   ((data) -> spgemm_num_bin)
+#define hypre_DeviceDataSpgemmHighestBin(data)               ((data) -> spgemm_highest_bin)
+#define hypre_DeviceDataSpgemmBlockNumDim(data)              ((data) -> spgemm_block_num_dim)
+#define hypre_DeviceDataSpgemmRownnzEstimateMethod(data)     ((data) -> spgemm_rownnz_estimate_method)
+#define hypre_DeviceDataSpgemmRownnzEstimateNsamples(data)   ((data) -> spgemm_rownnz_estimate_nsamples)
+#define hypre_DeviceDataSpgemmRownnzEstimateMultFactor(data) ((data) -> spgemm_rownnz_estimate_mult_factor)
+#define hypre_DeviceDataDeviceAllocator(data)                ((data) -> device_allocator)
+#define hypre_DeviceDataUseGpuRand(data)                     ((data) -> use_gpu_rand)
+
+hypre_DeviceData*     hypre_DeviceDataCreate();
+void                  hypre_DeviceDataDestroy(hypre_DeviceData* data);
+
+#if defined(HYPRE_USING_CURAND)
+curandGenerator_t     hypre_DeviceDataCurandGenerator(hypre_DeviceData *data);
+#endif
+
+#if defined(HYPRE_USING_ROCRAND)
+rocrand_generator     hypre_DeviceDataCurandGenerator(hypre_DeviceData *data);
+#endif
+
+#if defined(HYPRE_USING_CUBLAS)
+cublasHandle_t        hypre_DeviceDataCublasHandle(hypre_DeviceData *data);
+#endif
+
+#if defined(HYPRE_USING_CUSPARSE)
+cusparseHandle_t      hypre_DeviceDataCusparseHandle(hypre_DeviceData *data);
+#endif
+
+#if defined(HYPRE_USING_ROCSPARSE)
+rocsparse_handle      hypre_DeviceDataCusparseHandle(hypre_DeviceData *data);
+#endif
+
+#if defined(HYPRE_USING_CUSOLVER) || defined(HYPRE_USING_ROCSOLVER)
+vendorSolverHandle_t  hypre_DeviceDataVendorSolverHandle(hypre_DeviceData *data);
+#endif
+
+/* TODO (VPM): Create a deviceStream_t to encapsulate all stream types below */
+#if defined(HYPRE_USING_CUDA)
+cudaStream_t          hypre_DeviceDataStream(hypre_DeviceData *data, HYPRE_Int i);
+cudaStream_t          hypre_DeviceDataComputeStream(hypre_DeviceData *data);
+#elif defined(HYPRE_USING_HIP)
+hipStream_t           hypre_DeviceDataStream(hypre_DeviceData *data, HYPRE_Int i);
+hipStream_t           hypre_DeviceDataComputeStream(hypre_DeviceData *data);
+#elif defined(HYPRE_USING_SYCL)
+sycl::queue*          hypre_DeviceDataStream(hypre_DeviceData *data, HYPRE_Int i);
+sycl::queue*          hypre_DeviceDataComputeStream(hypre_DeviceData *data);
+#endif
+
+/* Data structure and accessor routines for Sparse Triangular Matrices */
+struct hypre_CsrsvData
+{
+#if defined(HYPRE_USING_CUSPARSE)
+   hypre_cusparseSpSVDescr   info_L;
+   hypre_cusparseSpSVDescr   info_U;
+   cusparseSolvePolicy_t     analysis_policy;
+   cusparseSolvePolicy_t     solve_policy;
+#elif defined(HYPRE_USING_ROCSPARSE)
+   rocsparse_mat_info        info_L;
+   rocsparse_mat_info        info_U;
+   rocsparse_analysis_policy analysis_policy;
+   rocsparse_solve_policy    solve_policy;
+#endif
+
+#if defined(HYPRE_USING_CUSPARSE) && (CUSPARSE_VERSION >= CUSPARSE_SPSV_VERSION)
+   size_t                    buffer_size_L;
+   size_t                    buffer_size_U;
+   char                     *buffer_L;
+   char                     *buffer_U;
+#else
+   hypre_int                 buffer_size;
+   char                     *buffer;
+#endif
+
+   /* Temporary array to save matrix values with modified diagonal */
+   HYPRE_Complex            *mat_data;
+
+   /* Flags for checking whether the analysis phase has been executed or not */
+   HYPRE_Int                 analyzed_L;
+   HYPRE_Int                 analyzed_U;
+};
+
+#define hypre_CsrsvDataInfoL(data)          ((data) -> info_L)
+#define hypre_CsrsvDataInfoU(data)          ((data) -> info_U)
+#define hypre_CsrsvDataAnalyzedL(data)      ((data) -> analyzed_L)
+#define hypre_CsrsvDataAnalyzedU(data)      ((data) -> analyzed_U)
+#define hypre_CsrsvDataSolvePolicy(data)    ((data) -> solve_policy)
+#define hypre_CsrsvDataAnalysisPolicy(data) ((data) -> analysis_policy)
+#if defined(HYPRE_USING_CUSPARSE) && (CUSPARSE_VERSION >= CUSPARSE_SPSV_VERSION)
+#define hypre_CsrsvDataBufferSizeL(data)    ((data) -> buffer_size_L)
+#define hypre_CsrsvDataBufferSizeU(data)    ((data) -> buffer_size_U)
+#define hypre_CsrsvDataBufferL(data)        ((data) -> buffer_L)
+#define hypre_CsrsvDataBufferU(data)        ((data) -> buffer_U)
+#else
+#define hypre_CsrsvDataBufferSize(data)     ((data) -> buffer_size)
+#define hypre_CsrsvDataBuffer(data)         ((data) -> buffer)
+#endif
+#define hypre_CsrsvDataMatData(data)        ((data) -> mat_data)
+
+struct hypre_GpuMatData
+{
+#if defined(HYPRE_USING_CUSPARSE)
+   cusparseMatDescr_t                   mat_descr;
+   char                                *spmv_buffer;
+
+#elif defined(HYPRE_USING_ROCSPARSE)
+   rocsparse_mat_descr                  mat_descr;
+   rocsparse_mat_info                   mat_info;
+
+#elif defined(HYPRE_USING_ONEMKLSPARSE)
+   oneapi::mkl::sparse::matrix_handle_t mat_handle;
+#endif
+};
+
+#define hypre_GpuMatDataMatDescr(data)    ((data) -> mat_descr)
+#define hypre_GpuMatDataMatInfo(data)     ((data) -> mat_info)
+#define hypre_GpuMatDataMatHandle(data)   ((data) -> mat_handle)
+#define hypre_GpuMatDataSpMVBuffer(data)  ((data) -> spmv_buffer)
+
+#endif /* if defined(HYPRE_USING_GPU) */
+
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ *      generic device functions (cuda/hip/sycl)
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#if defined(HYPRE_USING_GPU)
+template <typename T>
+static __device__ __forceinline__
+T read_only_load( const T *ptr )
+{
+#if defined(__CUDA_ARCH__) && __CUDA_ARCH__ >= 350
+   return __ldg( ptr );
+#else
+   return *ptr;
+#endif
+}
+
+static __device__ __forceinline__
+hypre_int next_power_of_2(hypre_int n)
+{
+   if (n <= 0)
+   {
+      return 0;
+   }
+
+   /* if n is power of 2, return itself */
+   if ( (n & (n - 1)) == 0 )
+   {
+      return n;
+   }
+
+   n |= (n >>  1);
+   n |= (n >>  2);
+   n |= (n >>  4);
+   n |= (n >>  8);
+   n |= (n >> 16);
+   n ^= (n >>  1);
+   n  = (n <<  1);
+
+   return n;
+}
+
+/* Flip n-th bit of bitmask (0 becomes 1. 1 becomes 0) */
+static __device__ __forceinline__
+hypre_mask hypre_mask_flip_at(hypre_mask bitmask, hypre_int n)
+{
+   return bitmask ^ (hypre_mask_one << n);
+}
+
+#endif // defined(HYPRE_USING_GPU)
+
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ *      cuda/hip functions
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+
+/* return the number of threads in block */
+template <hypre_int dim>
+static __device__ __forceinline__
+hypre_int hypre_gpu_get_num_threads(hypre_DeviceItem &item)
+{
+   switch (dim)
+   {
+      case 1:
+         return (blockDim.x);
+      case 2:
+         return (blockDim.x * blockDim.y);
+      case 3:
+         return (blockDim.x * blockDim.y * blockDim.z);
+   }
+
+   return -1;
+}
+
+/* return the flattened thread id in block */
+template <hypre_int dim>
+static __device__ __forceinline__
+hypre_int hypre_gpu_get_thread_id(hypre_DeviceItem &item)
+{
+   switch (dim)
+   {
+      case 1:
+         return (threadIdx.x);
+      case 2:
+         return (threadIdx.y * blockDim.x + threadIdx.x);
+      case 3:
+         return (threadIdx.z * blockDim.x * blockDim.y + threadIdx.y * blockDim.x +
+                 threadIdx.x);
+   }
+
+   return -1;
+}
+
+/* return the number of warps in block */
+template <hypre_int dim>
+static __device__ __forceinline__
+hypre_int hypre_gpu_get_num_warps(hypre_DeviceItem &item)
+{
+   return hypre_gpu_get_num_threads<dim>(item) >> HYPRE_WARP_BITSHIFT;
+}
+
+/* return the warp id in block */
+template <hypre_int dim>
+static __device__ __forceinline__
+hypre_int hypre_gpu_get_warp_id(hypre_DeviceItem &item)
+{
+   return hypre_gpu_get_thread_id<dim>(item) >> HYPRE_WARP_BITSHIFT;
+}
+
+/* return the thread lane id in warp */
+template <hypre_int dim>
+static __device__ __forceinline__
+hypre_int hypre_gpu_get_lane_id(hypre_DeviceItem &item)
+{
+   return hypre_gpu_get_thread_id<dim>(item) & (HYPRE_WARP_SIZE - 1);
+}
+
+/* return the num of blocks in grid */
+template <hypre_int dim>
+static __device__ __forceinline__
+hypre_int hypre_gpu_get_num_blocks()
+{
+   switch (dim)
+   {
+      case 1:
+         return (gridDim.x);
+      case 2:
+         return (gridDim.x * gridDim.y);
+      case 3:
+         return (gridDim.x * gridDim.y * gridDim.z);
+   }
+
+   return -1;
+}
+
+/* return the flattened block id in grid */
+template <hypre_int dim>
+static __device__ __forceinline__
+hypre_int hypre_gpu_get_block_id(hypre_DeviceItem &item)
+{
+   switch (dim)
+   {
+      case 1:
+         return (blockIdx.x);
+      case 2:
+         return (blockIdx.y * gridDim.x + blockIdx.x);
+      case 3:
+         return (blockIdx.z * gridDim.x * gridDim.y + blockIdx.y * gridDim.x +
+                 blockIdx.x);
+   }
+
+   return -1;
+}
+
+/* return the number of threads in grid */
+template <hypre_int bdim, hypre_int gdim>
+static __device__ __forceinline__
+hypre_int hypre_gpu_get_grid_num_threads(hypre_DeviceItem &item)
+{
+   return hypre_gpu_get_num_blocks<gdim>() * hypre_gpu_get_num_threads<bdim>(item);
+}
+
+/* return the flattened thread id in grid */
+template <hypre_int bdim, hypre_int gdim>
+static __device__ __forceinline__
+hypre_int hypre_gpu_get_grid_thread_id(hypre_DeviceItem &item)
+{
+   return hypre_gpu_get_block_id<gdim>(item) * hypre_gpu_get_num_threads<bdim>(item) +
+          hypre_gpu_get_thread_id<bdim>(item);
+}
+
+/* return the number of warps in grid */
+template <hypre_int bdim, hypre_int gdim>
+static __device__ __forceinline__
+hypre_int hypre_gpu_get_grid_num_warps(hypre_DeviceItem &item)
+{
+   return hypre_gpu_get_num_blocks<gdim>() * hypre_gpu_get_num_warps<bdim>(item);
+}
+
+/* return the flattened warp id in grid */
+template <hypre_int bdim, hypre_int gdim>
+static __device__ __forceinline__
+hypre_int hypre_gpu_get_grid_warp_id(hypre_DeviceItem &item)
+{
+   return hypre_gpu_get_block_id<gdim>(item) * hypre_gpu_get_num_warps<bdim>(item) +
+          hypre_gpu_get_warp_id<bdim>(item);
+}
+
+#if defined(__CUDA_ARCH__) && __CUDA_ARCH__ < 600
+static __device__ __forceinline__
+hypre_double atomicAdd(hypre_double* address, hypre_double val)
+{
+   hypre_ulonglongint* address_as_ull = (hypre_ulonglongint*) address;
+   hypre_ulonglongint old = *address_as_ull, assumed;
+
+   do
+   {
+      assumed = old;
+      old = atomicCAS(address_as_ull, assumed,
+                      __double_as_longlong(val +
+                                           __longlong_as_double(assumed)));
+
+      // Note: uses integer comparison to avoid hang in case of NaN (since NaN != NaN)
+   }
+   while (assumed != old);
+
+   return __longlong_as_double(old);
+}
+#endif
+
+// There are no *_sync functions in HIP
+#if defined(HYPRE_USING_HIP) || (CUDA_VERSION < 9000)
+
+template <typename T>
+static __device__ __forceinline__
+T __shfl_sync(hypre_mask mask, T val, hypre_int src_line, hypre_int width = HYPRE_WARP_SIZE)
+{
+   return __shfl(val, src_line, width);
+}
+
+template <typename T>
+static __device__ __forceinline__
+T __shfl_up_sync(hypre_mask mask, T val, hypre_uint delta, hypre_int width = HYPRE_WARP_SIZE)
+{
+   return __shfl_up(val, delta, width);
+}
+
+template <typename T>
+static __device__ __forceinline__
+T __shfl_down_sync(hypre_mask mask, T val, hypre_uint delta, hypre_int width = HYPRE_WARP_SIZE)
+{
+   return __shfl_down(val, delta, width);
+}
+
+template <typename T>
+static __device__ __forceinline__
+T __shfl_xor_sync(hypre_mask mask, T val, hypre_int lanemask, hypre_int width = HYPRE_WARP_SIZE)
+{
+   return __shfl_xor(val, lanemask, width);
+}
+
+static __device__ __forceinline__
+void __syncwarp()
+{
+}
+
+#endif // #if defined(HYPRE_USING_HIP) || (CUDA_VERSION < 9000)
+
+static __device__ __forceinline__
+hypre_mask hypre_ballot_sync(hypre_DeviceItem &item, hypre_mask mask, hypre_int predicate)
+{
+#if defined(HYPRE_USING_CUDA)
+   return __ballot_sync(mask, predicate);
+#else
+   return __ballot(predicate);
+#endif
+}
+
+static __device__ __forceinline__
+HYPRE_Int hypre_popc(hypre_mask mask)
+{
+#if defined(HYPRE_USING_CUDA)
+   return (HYPRE_Int) __popc(mask);
+#else
+   return (HYPRE_Int) __popcll(mask);
+#endif
+}
+
+static __device__ __forceinline__
+HYPRE_Int hypre_ffs(hypre_mask mask)
+{
+#if defined(HYPRE_USING_CUDA)
+   return (HYPRE_Int) __ffs(mask);
+#else
+   return (HYPRE_Int) __ffsll(mask);
+#endif
+}
+
+#if defined(HYPRE_USING_HIP)
+static __device__ __forceinline__
+hypre_int __any_sync(unsigned mask, hypre_int predicate)
+{
+   return __any(predicate);
+}
+#endif
+
+/* sync the thread block */
+static __device__ __forceinline__
+void block_sync(hypre_DeviceItem &item)
+{
+   __syncthreads();
+}
+
+/* sync the warp */
+static __device__ __forceinline__
+void warp_sync(hypre_DeviceItem &item)
+{
+   __syncwarp();
+}
+
+/* exclusive prefix scan */
+template <typename T>
+static __device__ __forceinline__
+T warp_prefix_sum(hypre_DeviceItem &item, hypre_int lane_id, T in, T &all_sum)
+{
+#pragma unroll
+   for (hypre_int d = 2; d <= HYPRE_WARP_SIZE; d <<= 1)
+   {
+      T t = __shfl_up_sync(HYPRE_WARP_FULL_MASK, in, d >> 1);
+      if ( (lane_id & (d - 1)) == (d - 1) )
+      {
+         in += t;
+      }
+   }
+
+   all_sum = __shfl_sync(HYPRE_WARP_FULL_MASK, in, HYPRE_WARP_SIZE - 1);
+
+   if (lane_id == HYPRE_WARP_SIZE - 1)
+   {
+      in = 0;
+   }
+
+#pragma unroll
+   for (hypre_int d = HYPRE_WARP_SIZE >> 1; d > 0; d >>= 1)
+   {
+      T t = __shfl_xor_sync(HYPRE_WARP_FULL_MASK, in, d);
+
+      if ( (lane_id & (d - 1)) == (d - 1))
+      {
+         if ( (lane_id & ((d << 1) - 1)) == ((d << 1) - 1) )
+         {
+            in += t;
+         }
+         else
+         {
+            in = t;
+         }
+      }
+   }
+   return in;
+}
+
+static __device__ __forceinline__
+hypre_int warp_any_sync(hypre_DeviceItem &item, hypre_mask mask, hypre_int predicate)
+{
+   return __any_sync(mask, predicate);
+}
+
+template <typename T>
+static __device__ __forceinline__
+T warp_shuffle_sync(hypre_DeviceItem &item, hypre_mask mask, T val, hypre_int src_line,
+                    hypre_int width = HYPRE_WARP_SIZE)
+{
+   return __shfl_sync(mask, val, src_line, width);
+}
+
+template <typename T>
+static __device__ __forceinline__
+T warp_shuffle_up_sync(hypre_DeviceItem &item, hypre_mask mask, T val, hypre_uint delta,
+                       hypre_int width = HYPRE_WARP_SIZE)
+{
+   return __shfl_up_sync(mask, val, delta, width);
+}
+
+template <typename T>
+static __device__ __forceinline__
+T warp_shuffle_down_sync(hypre_DeviceItem &item, hypre_mask mask, T val, hypre_uint delta,
+                         hypre_int width = HYPRE_WARP_SIZE)
+{
+   return __shfl_down_sync(mask, val, delta, width);
+}
+
+template <typename T>
+static __device__ __forceinline__
+T warp_shuffle_xor_sync(hypre_DeviceItem &item, hypre_mask mask, T val, hypre_int lane_mask,
+                        hypre_int width = HYPRE_WARP_SIZE)
+{
+   return __shfl_xor_sync(mask, val, lane_mask, width);
+}
+
+template <typename T>
+static __device__ __forceinline__
+T warp_reduce_sum(hypre_DeviceItem &item, T in)
+{
+#pragma unroll
+   for (hypre_int d = HYPRE_WARP_SIZE >> 1; d > 0; d >>= 1)
+   {
+      in += __shfl_down_sync(HYPRE_WARP_FULL_MASK, in, d);
+   }
+   return in;
+}
+
+template <typename T>
+static __device__ __forceinline__
+T warp_allreduce_sum(hypre_DeviceItem &item, T in)
+{
+#pragma unroll
+   for (hypre_int d = HYPRE_WARP_SIZE >> 1; d > 0; d >>= 1)
+   {
+      in += __shfl_xor_sync(HYPRE_WARP_FULL_MASK, in, d);
+   }
+   return in;
+}
+
+template <typename T>
+static __device__ __forceinline__
+T warp_reduce_max(hypre_DeviceItem &item, T in)
+{
+#pragma unroll
+   for (hypre_int d = HYPRE_WARP_SIZE >> 1; d > 0; d >>= 1)
+   {
+      in = max(in, __shfl_down_sync(HYPRE_WARP_FULL_MASK, in, d));
+   }
+   return in;
+}
+
+template <typename T>
+static __device__ __forceinline__
+T warp_allreduce_max(hypre_DeviceItem &item, T in)
+{
+#pragma unroll
+   for (hypre_int d = HYPRE_WARP_SIZE >> 1; d > 0; d >>= 1)
+   {
+      in = max(in, __shfl_xor_sync(HYPRE_WARP_FULL_MASK, in, d));
+   }
+   return in;
+}
+
+template <typename T>
+static __device__ __forceinline__
+T warp_reduce_min(hypre_DeviceItem &item, T in)
+{
+#pragma unroll
+   for (hypre_int d = HYPRE_WARP_SIZE >> 1; d > 0; d >>= 1)
+   {
+      in = min(in, __shfl_down_sync(HYPRE_WARP_FULL_MASK, in, d));
+   }
+   return in;
+}
+
+template <typename T>
+static __device__ __forceinline__
+T warp_allreduce_min(hypre_DeviceItem &item, T in)
+{
+#pragma unroll
+   for (hypre_int d = HYPRE_WARP_SIZE >> 1; d > 0; d >>= 1)
+   {
+      in = min(in, __shfl_xor_sync(HYPRE_WARP_FULL_MASK, in, d));
+   }
+   return in;
+}
+
+template<typename T1, typename T2>
+#if (defined(THRUST_VERSION) && THRUST_VERSION < THRUST_VERSION_NOTFN)
+struct type_cast : public thrust::unary_function<T1, T2>
+#else
+struct type_cast
+#endif
+{
+   __host__ __device__ T2 operator()(const T1 &x) const
+   {
+      return (T2) x;
+   }
+};
+
+template<typename T>
+#if (defined(THRUST_VERSION) && THRUST_VERSION < THRUST_VERSION_NOTFN)
+struct absolute_value : public thrust::unary_function<T, T>
+#else
+struct absolute_value
+#endif
+{
+   __host__ __device__ T operator()(const T &x) const
+   {
+      return x < T(0) ? -x : x;
+   }
+};
+
+template<typename T1, typename T2>
+struct TupleComp2
+{
+   typedef thrust::tuple<T1, T2> Tuple;
+
+   __host__ __device__ bool operator()(const Tuple& t1, const Tuple& t2)
+   {
+      if (thrust::get<0>(t1) < thrust::get<0>(t2))
+      {
+         return true;
+      }
+      if (thrust::get<0>(t1) > thrust::get<0>(t2))
+      {
+         return false;
+      }
+      return hypre_abs(thrust::get<1>(t1)) > hypre_abs(thrust::get<1>(t2));
+   }
+};
+
+template<typename T1, typename T2>
+struct TupleComp3
+{
+   typedef thrust::tuple<T1, T2> Tuple;
+
+   __host__ __device__ bool operator()(const Tuple& t1, const Tuple& t2)
+   {
+      if (thrust::get<0>(t1) < thrust::get<0>(t2))
+      {
+         return true;
+      }
+      if (thrust::get<0>(t1) > thrust::get<0>(t2))
+      {
+         return false;
+      }
+      if (thrust::get<0>(t2) == thrust::get<1>(t2))
+      {
+         return false;
+      }
+      return thrust::get<0>(t1) == thrust::get<1>(t1) || thrust::get<1>(t1) < thrust::get<1>(t2);
+   }
+};
+
+template<typename T>
+#if (defined(THRUST_VERSION) && THRUST_VERSION < THRUST_VERSION_NOTFN)
+struct is_negative : public thrust::unary_function<T, bool>
+#else
+struct is_negative
+#endif
+{
+   __host__ __device__ bool operator()(const T &x)
+   {
+      return (x < 0);
+   }
+};
+
+template<typename T>
+#if (defined(THRUST_VERSION) && THRUST_VERSION < THRUST_VERSION_NOTFN)
+struct is_positive : public thrust::unary_function<T, bool>
+#else
+struct is_positive
+#endif
+{
+   __host__ __device__ bool operator()(const T &x)
+   {
+      return (x > 0);
+   }
+};
+
+template<typename T>
+#if (defined(THRUST_VERSION) && THRUST_VERSION < THRUST_VERSION_NOTFN)
+struct is_nonnegative : public thrust::unary_function<T, bool>
+#else
+struct is_nonnegative
+#endif
+{
+   __host__ __device__ bool operator()(const T &x)
+   {
+      return (x >= 0);
+   }
+};
+
+template<typename T>
+#if (defined(THRUST_VERSION) && THRUST_VERSION < THRUST_VERSION_NOTFN)
+struct in_range : public thrust::unary_function<T, bool>
+#else
+struct in_range
+#endif
+{
+   T low, up;
+
+   in_range(T low_, T up_) { low = low_; up = up_; }
+
+   __host__ __device__ bool operator()(const T &x)
+   {
+      return (x >= low && x <= up);
+   }
+};
+
+template<typename T>
+#if (defined(THRUST_VERSION) && THRUST_VERSION < THRUST_VERSION_NOTFN)
+struct out_of_range : public thrust::unary_function<T, bool>
+#else
+struct out_of_range
+#endif
+{
+   T low, up;
+
+   out_of_range(T low_, T up_) { low = low_; up = up_; }
+
+   __host__ __device__ bool operator()(const T &x)
+   {
+      return (x < low || x > up);
+   }
+};
+
+template<typename T>
+#if (defined(THRUST_VERSION) && THRUST_VERSION < THRUST_VERSION_NOTFN)
+struct less_than : public thrust::unary_function<T, bool>
+#else
+struct less_than
+#endif
+{
+   T val;
+
+   less_than(T val_) { val = val_; }
+
+   __host__ __device__ bool operator()(const T &x)
+   {
+      return (x < val);
+   }
+};
+
+template<typename T>
+#if (defined(THRUST_VERSION) && THRUST_VERSION < THRUST_VERSION_NOTFN)
+struct modulo : public thrust::unary_function<T, T>
+#else
+struct modulo
+#endif
+{
+   T val;
+
+   modulo(T val_) { val = val_; }
+
+   __host__ __device__ T operator()(const T &x)
+   {
+      return (x % val);
+   }
+};
+
+template<typename T>
+#if (defined(THRUST_VERSION) && THRUST_VERSION < THRUST_VERSION_NOTFN)
+struct equal : public thrust::unary_function<T, bool>
+#else
+struct equal
+#endif
+{
+   T val;
+
+   equal(T val_) { val = val_; }
+
+   __host__ __device__ bool operator()(const T &x)
+   {
+      return (x == val);
+   }
+};
+
+struct print_functor
+{
+   __host__ __device__ void operator()(HYPRE_Real val)
+   {
+      printf("%f\n", val);
+   }
+};
+
+#endif // defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ *      sycl functions
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#if defined(HYPRE_USING_SYCL)
+
+/* return the number of threads in block */
+template <hypre_int dim>
+static __device__ __forceinline__
+hypre_int hypre_gpu_get_num_threads(hypre_DeviceItem &item)
+{
+   return static_cast<hypre_int>(item.get_local_range().size());
+}
+
+/* return the flattened thread id in block */
+template <hypre_int dim>
+static __device__ __forceinline__
+hypre_int hypre_gpu_get_thread_id(hypre_DeviceItem &item)
+{
+   return static_cast<hypre_int>(item.get_local_linear_id());
+}
+
+/* return the number of warps in block */
+template <hypre_int dim>
+static __device__ __forceinline__
+hypre_int hypre_gpu_get_num_warps(hypre_DeviceItem &item)
+{
+   return hypre_gpu_get_num_threads<dim>(item) >> HYPRE_WARP_BITSHIFT;
+}
+
+/* return the warp id in block */
+template <hypre_int dim>
+static __device__ __forceinline__
+hypre_int hypre_gpu_get_warp_id(hypre_DeviceItem &item)
+{
+   return hypre_gpu_get_thread_id<dim>(item) >> HYPRE_WARP_BITSHIFT;
+}
+
+/* return the thread lane id in warp */
+template <hypre_int dim>
+static __device__ __forceinline__
+hypre_int hypre_gpu_get_lane_id(hypre_DeviceItem &item)
+{
+   return static_cast<hypre_int>(item.get_sub_group().get_local_linear_id());
+}
+
+/* return the num of blocks in grid */
+template <hypre_int dim>
+static __device__ __forceinline__
+hypre_int hypre_gpu_get_num_blocks(hypre_DeviceItem &item)
+{
+   return static_cast<hypre_int>(item.get_group_range().size());
+}
+
+/* return the flattened block id in grid */
+template <hypre_int dim>
+static __device__ __forceinline__
+hypre_int hypre_gpu_get_block_id(hypre_DeviceItem &item)
+{
+   return item.get_group_linear_id();
+}
+
+/* return the number of threads in grid */
+template <hypre_int bdim, hypre_int gdim>
+static __device__ __forceinline__
+hypre_int hypre_gpu_get_grid_num_threads(hypre_DeviceItem &item)
+{
+   return hypre_gpu_get_num_blocks<gdim>(item) * hypre_gpu_get_num_threads<bdim>(item);
+}
+
+/* return the flattened thread id in grid */
+template <hypre_int bdim, hypre_int gdim>
+static __device__ __forceinline__
+hypre_int hypre_gpu_get_grid_thread_id(hypre_DeviceItem &item)
+{
+   return hypre_gpu_get_block_id<gdim>(item) * hypre_gpu_get_num_threads<bdim>(item) +
+          hypre_gpu_get_thread_id<bdim>(item);
+}
+
+/* return the number of warps in grid */
+template <hypre_int bdim, hypre_int gdim>
+static __device__ __forceinline__
+hypre_int hypre_gpu_get_grid_num_warps(hypre_DeviceItem &item)
+{
+   return hypre_gpu_get_num_blocks<gdim>(item) * hypre_gpu_get_num_warps<bdim>(item);
+}
+
+/* return the flattened warp id in nd_range */
+template <hypre_int bdim, hypre_int gdim>
+static __device__ __forceinline__
+hypre_int hypre_gpu_get_grid_warp_id(hypre_DeviceItem &item)
+{
+   return hypre_gpu_get_block_id<gdim>(item) * hypre_gpu_get_num_warps<bdim>(item) +
+          hypre_gpu_get_warp_id<bdim>(item);
+}
+
+/* sync the thread block */
+static __device__ __forceinline__
+void block_sync(hypre_DeviceItem &item)
+{
+   sycl::group_barrier(item.get_group());
+}
+
+/* sync the warp */
+static __device__ __forceinline__
+void warp_sync(hypre_DeviceItem &item)
+{
+   sycl::group_barrier(item.get_sub_group());
+}
+
+/* exclusive prefix scan */
+template <typename T>
+static __device__ __forceinline__
+T warp_prefix_sum(hypre_DeviceItem &item, hypre_int lane_id, T in, T &all_sum)
+{
+#pragma unroll
+   for (hypre_int d = 2; d <= HYPRE_WARP_SIZE; d <<= 1)
+   {
+      T t = sycl::shift_group_right(item.get_sub_group(), in, d >> 1);
+      if ( (lane_id & (d - 1)) == (d - 1) )
+      {
+         in += t;
+      }
+   }
+
+   all_sum = sycl::group_broadcast(item.get_sub_group(), in, HYPRE_WARP_SIZE - 1);
+
+   if (lane_id == HYPRE_WARP_SIZE - 1)
+   {
+      in = 0;
+   }
+
+#pragma unroll
+   for (hypre_int d = HYPRE_WARP_SIZE >> 1; d > 0; d >>= 1)
+   {
+      T t = sycl::permute_group_by_xor(item.get_sub_group(), in, d);
+
+      if ( (lane_id & (d - 1)) == (d - 1))
+      {
+         if ( (lane_id & ((d << 1) - 1)) == ((d << 1) - 1) )
+         {
+            in += t;
+         }
+         else
+         {
+            in = t;
+         }
+      }
+   }
+   return in;
+}
+
+static __device__ __forceinline__
+hypre_mask hypre_ballot_sync(hypre_DeviceItem &item, hypre_mask mask, hypre_int predicate)
+{
+   return sycl::reduce_over_group(
+             item.get_sub_group(),
+             (mask & (0x1 << item.get_sub_group().get_local_linear_id())) &&
+             predicate ? (0x1 << item.get_sub_group().get_local_linear_id()) : 0,
+             sycl::ext::oneapi::plus<>());
+}
+
+static __device__ __forceinline__
+HYPRE_Int hypre_popc(hypre_mask mask)
+{
+   return (HYPRE_Int) sycl::popcount(mask);
+}
+
+static __device__ __forceinline__
+HYPRE_Int hypre_ffs(hypre_mask mask)
+{
+   return (HYPRE_Int)dpct::ffs<HYPRE_Int>(mask);
+}
+
+static __device__ __forceinline__
+hypre_int warp_any_sync(hypre_DeviceItem &item, hypre_mask mask, hypre_int predicate)
+{
+   return sycl::any_of_group(item.get_sub_group(), predicate);
+}
+
+template <typename T>
+static __device__ __forceinline__
+T warp_shuffle_sync(hypre_DeviceItem &item, hypre_mask mask, T val, hypre_int src_line)
+{
+   return sycl::group_broadcast(item.get_sub_group(), val, src_line);
+}
+
+template <typename T>
+static __device__ __forceinline__
+T warp_shuffle_sync(hypre_DeviceItem &item, hypre_mask mask, T val, hypre_int src_line,
+                    hypre_int width)
+{
+   hypre_int lane_id = hypre_gpu_get_lane_id<1>(item);
+   hypre_int group_start = (lane_id / width) * width;
+   hypre_int src_in_warp = group_start + (src_line % width);
+   return sycl::select_from_group(item.get_sub_group(), val, src_in_warp);
+}
+
+template <typename T>
+static __device__ __forceinline__
+T warp_shuffle_up_sync(hypre_DeviceItem &item, hypre_mask mask, T val, hypre_uint delta)
+{
+   return sycl::shift_group_right(item.get_sub_group(), val, delta);
+}
+
+template <typename T>
+static __device__ __forceinline__
+T warp_shuffle_up_sync(hypre_DeviceItem &item, hypre_mask mask, T val, hypre_uint delta,
+                       hypre_int width)
+{
+   hypre_int lane_id = hypre_gpu_get_lane_id<1>(item);
+   hypre_int group_start = (lane_id / width) * width;
+   hypre_int src_in_warp = lane_id - delta >= group_start ? lane_id - delta : lane_id;
+   return sycl::select_from_group(item.get_sub_group(), val, src_in_warp);
+}
+
+template <typename T>
+static __device__ __forceinline__
+T warp_shuffle_down_sync(hypre_DeviceItem &item, hypre_mask mask, T val, hypre_uint delta)
+{
+   return sycl::shift_group_left(item.get_sub_group(), val, delta);
+}
+
+template <typename T>
+static __device__ __forceinline__
+T warp_shuffle_down_sync(hypre_DeviceItem &item, hypre_mask mask, T val, hypre_uint delta,
+                         hypre_int width)
+{
+   hypre_int lane_id = hypre_gpu_get_lane_id<1>(item);
+   hypre_int group_end = ((lane_id / width) + 1) * width - 1;
+   hypre_int src_in_warp = lane_id + delta <= group_end ? lane_id + delta : lane_id;
+   return sycl::select_from_group(item.get_sub_group(), val, src_in_warp);
+}
+
+template <typename T>
+static __device__ __forceinline__
+T warp_shuffle_xor_sync(hypre_DeviceItem &item, hypre_mask mask, T val, hypre_int lane_mask)
+{
+   return sycl::permute_group_by_xor(item.get_sub_group(), val, lane_mask);
+}
+
+template <typename T>
+static __device__ __forceinline__
+T warp_shuffle_xor_sync(hypre_DeviceItem &item, hypre_mask mask, T val, hypre_int lane_mask,
+                        hypre_int width)
+{
+   hypre_int lane_id = hypre_gpu_get_lane_id<1>(item);
+   hypre_int group_end = ((lane_id / width) + 1) * width - 1;
+   hypre_int src_in_warp = lane_id ^ lane_mask;
+   src_in_warp = src_in_warp > group_end ? lane_id : src_in_warp;
+   return sycl::select_from_group(item.get_sub_group(), val, src_in_warp);
+}
+
+template <typename T>
+static __forceinline__
+T warp_reduce_sum(hypre_DeviceItem &item, T in)
+{
+   for (hypre_int d = HYPRE_WARP_SIZE >> 1; d > 0; d >>= 1)
+   {
+      in += sycl::shift_group_left(item.get_sub_group(), in, d);
+   }
+   return in;
+}
+
+template <typename T>
+static __forceinline__
+T warp_allreduce_sum(hypre_DeviceItem &item, T in)
+{
+   for (hypre_int d = HYPRE_WARP_SIZE >> 1; d > 0; d >>= 1)
+   {
+      in += sycl::permute_group_by_xor(item.get_sub_group(), in, d);
+   }
+   return in;
+}
+
+template <typename T>
+static __forceinline__
+T warp_reduce_max(hypre_DeviceItem &item, T in)
+{
+   for (hypre_int d = HYPRE_WARP_SIZE >> 1; d > 0; d >>= 1)
+   {
+      in = std::max(in, sycl::shift_group_left(item.get_sub_group(), in, d));
+   }
+   return in;
+}
+
+template <typename T>
+static __forceinline__
+T warp_allreduce_max(hypre_DeviceItem &item, T in)
+{
+   for (hypre_int d = HYPRE_WARP_SIZE >> 1; d > 0; d >>= 1)
+   {
+      in = std::max(in, sycl::permute_group_by_xor(item.get_sub_group(), in, d));
+   }
+   return in;
+}
+
+template <typename T>
+static __forceinline__
+T warp_reduce_min(hypre_DeviceItem &item, T in)
+{
+   for (hypre_int d = HYPRE_WARP_SIZE >> 1; d > 0; d >>= 1)
+   {
+      in = std::min(in, sycl::shift_group_left(item.get_sub_group(), in, d));
+   }
+   return in;
+}
+
+template <typename T>
+static __forceinline__
+T warp_allreduce_min(hypre_DeviceItem &item, T in)
+{
+   for (hypre_int d = HYPRE_WARP_SIZE >> 1; d > 0; d >>= 1)
+   {
+      in = std::min(in, sycl::permute_group_by_xor(item.get_sub_group(), in, d));
+   }
+   return in;
+}
+
+template<typename T>
+struct is_negative
+{
+   is_negative() {}
+
+   constexpr bool operator()(const T &x = T()) const { return (x < 0); }
+};
+
+template<typename T>
+struct is_positive
+{
+   is_positive() {}
+
+   constexpr bool operator()(const T &x = T()) const { return (x > 0); }
+};
+
+template<typename T>
+struct is_nonnegative
+{
+   is_nonnegative() {}
+
+   constexpr bool operator()(const T &x = T()) const { return (x >= 0); }
+};
+
+template<typename T>
+struct in_range
+{
+   T low, high;
+   in_range(T low_ = T(), T high_ = T()) { low = low_; high = high_; }
+
+   constexpr bool operator()(const T &x) const { return (x >= low && x <= high); }
+};
+
+template<typename T>
+struct out_of_range
+{
+   T low, high;
+   out_of_range(T low_ = T(), T high_ = T()) { low = low_; high = high_; }
+
+   constexpr bool operator()(const T &x) const { return (x < low || x > high); }
+};
+
+template<typename T>
+struct less_than
+{
+   T val;
+   less_than(T val_ = T()) { val = val_; }
+
+   constexpr bool operator()(const T &x) const { return (x < val); }
+};
+
+template<typename T>
+struct modulo
+{
+   T val;
+   modulo(T val_ = T()) { val = val_; }
+
+   constexpr T operator()(const T &x) const { return (x % val); }
+};
+
+template<typename T>
+struct equal
+{
+   T val;
+   equal(T val_ = T()) { val = val_; }
+
+   constexpr bool operator()(const T &x) const { return (x == val); }
+};
+
+template<typename T1, typename T2>
+struct type_cast
+{
+   constexpr T2 operator()(const T1 &x = T1()) const { return (T2) x; }
+};
+
+template<typename T>
+struct absolute_value
+{
+   constexpr T operator()(const T &x) const { return x < T(0) ? -x : x; }
+};
+
+template<typename... T>
+struct TupleComp2
+{
+   typedef std::tuple<T...> Tuple;
+   bool operator()(const Tuple& t1, const Tuple& t2)
+   {
+      if (std::get<0>(t1) < std::get<0>(t2))
+      {
+         return true;
+      }
+      if (std::get<0>(t1) > std::get<0>(t2))
+      {
+         return false;
+      }
+      return hypre_abs(std::get<1>(t1)) > hypre_abs(std::get<1>(t2));
+   }
+};
+
+template<typename... T>
+struct TupleComp3
+{
+   typedef std::tuple<T...> Tuple;
+   bool operator()(const Tuple& t1, const Tuple& t2)
+   {
+      if (std::get<0>(t1) < std::get<0>(t2))
+      {
+         return true;
+      }
+      if (std::get<0>(t1) > std::get<0>(t2))
+      {
+         return false;
+      }
+      if (std::get<0>(t2) == std::get<1>(t2))
+      {
+         return false;
+      }
+      return std::get<0>(t1) == std::get<1>(t1) || std::get<1>(t1) < std::get<1>(t2);
+   }
+};
+
+#endif // #if defined(HYPRE_USING_SYCL)
+
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ *      end of functions defined here
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+/* device_utils.c */
+#if defined(HYPRE_USING_GPU)
+dim3 hypre_GetDefaultDeviceBlockDimension();
+
+dim3 hypre_GetDefaultDeviceGridDimension( HYPRE_Int n, const char *granularity, dim3 bDim );
+
+dim3 hypre_dim3(HYPRE_Int x);
+dim3 hypre_dim3(HYPRE_Int x, HYPRE_Int y);
+dim3 hypre_dim3(HYPRE_Int x, HYPRE_Int y, HYPRE_Int z);
+
+template <typename T1, typename T2, typename T3>
+HYPRE_Int hypreDevice_StableSortByTupleKey(HYPRE_Int N, T1 *keys1, T2 *keys2,
+                                           T3 *vals, HYPRE_Int opt);
+
+template <typename T1, typename T2, typename T3, typename T4>
+HYPRE_Int hypreDevice_StableSortTupleByTupleKey(HYPRE_Int N, T1 *keys1, T2 *keys2,
+                                                T3 *vals1, T4 *vals2, HYPRE_Int opt);
+
+template <typename T1, typename T2, typename T3>
+HYPRE_Int hypreDevice_ReduceByTupleKey(HYPRE_Int N, T1 *keys1_in, T2 *keys2_in,
+                                       T3 *vals_in, T1 *keys1_out, T2 *keys2_out,
+                                       T3 *vals_out);
+
+template <typename T>
+HYPRE_Int hypreDevice_ScatterConstant(T *x, HYPRE_Int n, HYPRE_Int *map, T v);
+
+HYPRE_Int hypreDevice_GenScatterAdd(HYPRE_Real *x, HYPRE_Int ny, HYPRE_Int *map,
+                                    HYPRE_Real *y, char *work);
+
+template <typename T>
+HYPRE_Int hypreDevice_CsrRowPtrsToIndicesWithRowNum(HYPRE_Int nrows, HYPRE_Int nnz,
+                                                    HYPRE_Int *d_row_ptr, T *d_row_num, T *d_row_ind);
+
+#endif
+
+#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+
+#if defined(HYPRE_USING_CUDA)
+cudaError_t hypre_CachingMallocDevice(void **ptr, size_t nbytes);
+
+cudaError_t hypre_CachingMallocManaged(void **ptr, size_t nbytes);
+
+cudaError_t hypre_CachingFreeDevice(void *ptr);
+
+cudaError_t hypre_CachingFreeManaged(void *ptr);
+#endif
+
+hypre_cub_CachingDeviceAllocator * hypre_DeviceDataCubCachingAllocatorCreate(hypre_uint bin_growth,
+                                                                             hypre_uint min_bin, hypre_uint max_bin, size_t max_cached_bytes, bool skip_cleanup, bool debug,
+                                                                             bool use_managed_memory);
+
+void hypre_DeviceDataCubCachingAllocatorDestroy(hypre_DeviceData *data);
+
+#endif // #if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+
+#if defined(HYPRE_USING_CUSPARSE)
+
+cudaDataType hypre_HYPREComplexToCudaDataType();
+
+#if CUSPARSE_VERSION >= CUSPARSE_NEWAPI_VERSION
+cusparseIndexType_t hypre_HYPREIntToCusparseIndexType();
+#endif
+
+#endif // #if defined(HYPRE_USING_CUSPARSE)
+
+#endif /* #ifndef HYPRE_CUDA_UTILS_H */
diff --git a/external/hypre/src/utilities/error.c b/external/hypre/src/utilities/error.c
index 43ac4956..e48b74a6 100644
--- a/external/hypre/src/utilities/error.c
+++ b/external/hypre/src/utilities/error.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -7,72 +7,303 @@
 
 #include "_hypre_utilities.h"
 
-HYPRE_Int hypre__global_error = 0;
+/* Global variable for error handling */
+hypre_Error hypre__global_error = {0, 0, 0, HYPRE_INT_MAX, NULL, 0, 0};
 
-/* Process the error with code ierr raised in the given line of the
-   given source file. */
-void hypre_error_handler(const char *filename, HYPRE_Int line, HYPRE_Int ierr, const char *msg)
+/*--------------------------------------------------------------------------
+ * Process the error raised on the given line of the given source file
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_error_handler(const char *filename, HYPRE_Int line, HYPRE_Int ierr, const char *msg)
 {
-   hypre_error_flag |= ierr;
+   /* Copy global struct into a short name and copy changes back before exiting */
+   hypre_Error err = hypre__global_error;
 
-#ifdef HYPRE_PRINT_ERRORS
-   if (msg)
-   {
-      hypre_fprintf(
-         stderr, "hypre error in file \"%s\", line %d, error code = %d - %s\n",
-         filename, line, ierr, msg);
-   }
-   else
+   /* Store the error code */
+   err.error_flag |= ierr;
+
+#if defined(HYPRE_PRINT_ERRORS)
+
+   /* process the error message only if verbosity is turned on for that error code */
+   if (ierr & hypre__global_error.verbosity)
    {
-      hypre_fprintf(
-         stderr, "hypre error in file \"%s\", line %d, error code = %d\n",
-         filename, line, ierr);
+      /* Error format strings without and with a message */
+      const char  fmt_wo[] = "hypre error in file \"%s\", line %d, error code = %d\n";
+      const char  fmt_wm[] = "hypre error in file \"%s\", line %d, error code = %d - %s\n";
+      char       *buffer;
+      HYPRE_Int   bufsz;
+
+      /* Print error message to local buffer first */
+
+      if (msg)
+      {
+         bufsz = hypre_snprintf(NULL, 0, fmt_wm, filename, line, ierr, msg);
+      }
+      else
+      {
+         bufsz = hypre_snprintf(NULL, 0, fmt_wo, filename, line, ierr);
+      }
+
+      bufsz += 1;
+      buffer = hypre_TAlloc(char, bufsz, HYPRE_MEMORY_HOST);
+
+      if (msg)
+      {
+         hypre_snprintf(buffer, bufsz, fmt_wm, filename, line, ierr, msg);
+      }
+      else
+      {
+         hypre_snprintf(buffer, bufsz, fmt_wo, filename, line, ierr);
+      }
+
+      /* Now print buffer to either memory or stderr */
+      if (err.print_to_memory)
+      {
+         HYPRE_Int  msg_sz = err.msg_sz; /* Store msg_sz for snprintf below */
+
+         /* Make sure there is enough memory for the new message */
+         err.msg_sz += bufsz;
+         if ( err.msg_sz > err.mem_sz )
+         {
+            err.mem_sz = err.msg_sz + 1024; /* Add some excess */
+            err.memory = hypre_TReAlloc(err.memory, char, err.mem_sz, HYPRE_MEMORY_HOST);
+         }
+
+         hypre_snprintf((err.memory + msg_sz), bufsz, "%s", buffer);
+      }
+      else
+      {
+         hypre_fprintf(stderr, "%s", buffer);
+      }
+
+      /* Free buffer */
+      hypre_TFree(buffer, HYPRE_MEMORY_HOST);
    }
-#endif
+#else
+   HYPRE_UNUSED_VAR(filename);
+   HYPRE_UNUSED_VAR(line);
+   HYPRE_UNUSED_VAR(msg);
+#endif /* if defined(HYPRE_PRINT_ERRORS) */
+
+   hypre__global_error = err;
 }
 
-HYPRE_Int HYPRE_GetError()
+/*--------------------------------------------------------------------------
+ * hypre_error_handler_clear_messages
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_error_handler_clear_messages(void)
+{
+   hypre_Error  err = hypre__global_error;
+
+   hypre_TFree(err.memory, HYPRE_MEMORY_HOST);
+   err.mem_sz = 0;
+   err.msg_sz = 0;
+
+   hypre__global_error = err;
+}
+
+/*--------------------------------------------------------------------------
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_error_code_save(void)
+{
+   /* Store the current error code in a temporary variable */
+   hypre_error_temp_flag = hypre_error_flag;
+
+   /* Reset current error code */
+   HYPRE_ClearAllErrors();
+}
+
+/*--------------------------------------------------------------------------
+ *--------------------------------------------------------------------------*/
+
+void
+hypre_error_code_restore(void)
+{
+   /* Restore hypre's error code */
+   hypre_error_flag = hypre_error_temp_flag;
+
+   /* Reset temporary error code */
+   hypre_error_temp_flag = 0;
+}
+
+/*--------------------------------------------------------------------------
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_GetGlobalError(MPI_Comm comm)
+{
+   HYPRE_Int global_error_flag;
+
+   hypre_MPI_Allreduce(&hypre_error_flag, &global_error_flag, 1,
+                       HYPRE_MPI_INT, hypre_MPI_BOR, comm);
+
+   return global_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_GetError(void)
 {
    return hypre_error_flag;
 }
 
-HYPRE_Int HYPRE_CheckError(HYPRE_Int ierr, HYPRE_Int hypre_error_code)
+/*--------------------------------------------------------------------------
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_CheckError(HYPRE_Int ierr, HYPRE_Int hypre_error_code)
 {
    return ierr & hypre_error_code;
 }
 
-void HYPRE_DescribeError(HYPRE_Int ierr, char *msg)
+/*--------------------------------------------------------------------------
+ *--------------------------------------------------------------------------*/
+
+void
+HYPRE_DescribeError(HYPRE_Int ierr, char *msg)
 {
    if (ierr == 0)
-      hypre_sprintf(msg,"[No error] ");
+   {
+      hypre_sprintf(msg, "[No error] ");
+   }
 
    if (ierr & HYPRE_ERROR_GENERIC)
-      hypre_sprintf(msg,"[Generic error] ");
+   {
+      hypre_sprintf(msg, "[Generic error] ");
+   }
 
    if (ierr & HYPRE_ERROR_MEMORY)
-      hypre_sprintf(msg,"[Memory error] ");
+   {
+      hypre_sprintf(msg, "[Memory error] ");
+   }
 
    if (ierr & HYPRE_ERROR_ARG)
-      hypre_sprintf(msg,"[Error in argument %d] ", HYPRE_GetErrorArg());
+   {
+      hypre_sprintf(msg, "[Error in argument %d] ", HYPRE_GetErrorArg());
+   }
 
    if (ierr & HYPRE_ERROR_CONV)
-      hypre_sprintf(msg,"[Method did not converge] ");
+   {
+      hypre_sprintf(msg, "[Method did not converge] ");
+   }
 }
 
-HYPRE_Int HYPRE_GetErrorArg()
+/*--------------------------------------------------------------------------
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_GetErrorArg(void)
 {
-   return (hypre_error_flag>>3 & 31);
+   return (hypre_error_flag >> 3 & 31);
 }
 
-HYPRE_Int HYPRE_ClearAllErrors()
+/*--------------------------------------------------------------------------
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_ClearAllErrors(void)
 {
    hypre_error_flag = 0;
    return (hypre_error_flag != 0);
 }
 
-HYPRE_Int HYPRE_ClearError(HYPRE_Int hypre_error_code)
+/*--------------------------------------------------------------------------
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_ClearError(HYPRE_Int hypre_error_code)
 {
    hypre_error_flag &= ~hypre_error_code;
    return (hypre_error_flag & hypre_error_code);
 }
 
+/*--------------------------------------------------------------------------
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_SetPrintErrorMode(HYPRE_Int mode)
+{
+   hypre__global_error.print_to_memory = mode;
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_SetPrintErrorVerbosity(HYPRE_Int code,
+                             HYPRE_Int verbosity)
+{
+   if (code < 0)
+   {
+      /* Change all error codes */
+      code = HYPRE_INT_MAX;
+   }
+   /* First turn the bit(s) on with bitwise or */
+   hypre__global_error.verbosity |= code;
+   if (!verbosity)
+   {
+      /* Turn the bit(s) off with bitwise xor (this works because they were first turned on */
+      hypre__global_error.verbosity ^= code;
+   }
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_GetErrorMessages(char **buffer, HYPRE_Int *bufsz)
+{
+   hypre_Error err = hypre__global_error;
+
+   *bufsz  = err.msg_sz;
+   *buffer = hypre_CTAlloc(char, *bufsz, HYPRE_MEMORY_HOST);
+   hypre_TMemcpy(*buffer, err.memory, char, *bufsz, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
+
+   /* Clear error messages */
+   hypre_error_handler_clear_messages();
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * This routine can be called from any rank; it is NOT collective
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_PrintErrorMessages(MPI_Comm comm)
+{
+   hypre_Error  err = hypre__global_error;
+   HYPRE_Int    myid;
+   char        *msg;
+
+   hypre_MPI_Comm_rank(comm, &myid);
+   for (msg = err.memory; msg < (err.memory + err.msg_sz); msg += strlen(msg) + 1)
+   {
+      hypre_fprintf(stderr, "%d: %s", myid, msg);
+   }
+
+   /* Clear error messages */
+   hypre_error_handler_clear_messages();
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_ClearErrorMessages(void)
+{
+   hypre_error_handler_clear_messages();
+
+   return hypre_error_flag;
+}
diff --git a/external/hypre/src/utilities/error.h b/external/hypre/src/utilities/error.h
index 592bae71..38dace43 100644
--- a/external/hypre/src/utilities/error.h
+++ b/external/hypre/src/utilities/error.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -8,24 +8,49 @@
 #ifndef hypre_ERROR_HEADER
 #define hypre_ERROR_HEADER
 
+#ifdef __cplusplus
+extern "C++"
+{
+#endif
+
 #include <assert.h>
 
+#ifdef __cplusplus
+}
+#endif
+
 /*--------------------------------------------------------------------------
  * Global variable used in hypre error checking
  *--------------------------------------------------------------------------*/
 
-extern HYPRE_Int hypre__global_error;
-#define hypre_error_flag  hypre__global_error
+typedef struct
+{
+   HYPRE_Int  error_flag;
+   HYPRE_Int  temp_error_flag;
+   HYPRE_Int  print_to_memory;
+   HYPRE_Int  verbosity;
+   char      *memory;
+   HYPRE_Int  mem_sz;
+   HYPRE_Int  msg_sz;
+
+} hypre_Error;
+
+extern hypre_Error hypre__global_error;
+#define hypre_error_flag  hypre__global_error.error_flag
+#define hypre_error_temp_flag  hypre__global_error.temp_error_flag
 
 /*--------------------------------------------------------------------------
  * HYPRE error macros
  *--------------------------------------------------------------------------*/
 
 void hypre_error_handler(const char *filename, HYPRE_Int line, HYPRE_Int ierr, const char *msg);
+void hypre_error_handler_clear_messages(void);
+void hypre_error_code_save(void);
+void hypre_error_code_restore(void);
 
-#define hypre_error(IERR)  hypre_error_handler(__FILE__, __LINE__, IERR, NULL)
-#define hypre_error_w_msg(IERR, msg)  hypre_error_handler(__FILE__, __LINE__, IERR, msg)
-#define hypre_error_in_arg(IARG)  hypre_error(HYPRE_ERROR_ARG | IARG<<3)
+#define hypre_error(IERR) hypre_error_handler(__FILE__, __LINE__, IERR, NULL)
+#define hypre_error_w_msg(IERR, msg) hypre_error_handler(__FILE__, __LINE__, IERR, msg)
+#define hypre_error_in_arg(IARG) hypre_error(HYPRE_ERROR_ARG | IARG<<3)
 
 #if defined(HYPRE_DEBUG)
 /* host assert */
@@ -35,7 +60,9 @@ void hypre_error_handler(const char *filename, HYPRE_Int line, HYPRE_Int ierr, c
 #define hypre_device_assert(EX) assert(EX)
 #elif defined(HYPRE_USING_HIP)
 /* FIXME: Currently, asserts in device kernels in HIP do not behave well */
-#define hypre_device_assert(EX)
+#define hypre_device_assert(EX) do { if (0) { static_cast<void> (EX); } } while (0)
+#elif defined(HYPRE_USING_SYCL)
+#define hypre_device_assert(EX) assert(EX)
 #endif
 #else /* #ifdef HYPRE_DEBUG */
 /* this is to silence compiler's unused variable warnings */
@@ -48,4 +75,3 @@ void hypre_error_handler(const char *filename, HYPRE_Int line, HYPRE_Int ierr, c
 #endif
 
 #endif /* hypre_ERROR_HEADER */
-
diff --git a/external/hypre/src/utilities/exchange_data.README b/external/hypre/src/utilities/exchange_data.README
index ef3bf1ea..ba922fb0 100644
--- a/external/hypre/src/utilities/exchange_data.README
+++ b/external/hypre/src/utilities/exchange_data.README
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/utilities/exchange_data.c b/external/hypre/src/utilities/exchange_data.c
index baf69660..933da2ba 100644
--- a/external/hypre/src/utilities/exchange_data.c
+++ b/external/hypre/src/utilities/exchange_data.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -15,19 +15,25 @@
 #include "_hypre_utilities.h"
 
 /*---------------------------------------------------
- * hypre_CreateBinaryTree()
+ * hypre_CreateBinaryTree
+ *
  * Get the processors position in the binary tree (i.e.,
  * its children and parent processor ids)
  *----------------------------------------------------*/
 
-HYPRE_Int hypre_CreateBinaryTree(HYPRE_Int myid, HYPRE_Int num_procs,
-                                 hypre_BinaryTree *tree)
+HYPRE_Int
+hypre_CreateBinaryTree(HYPRE_Int          myid,
+                       HYPRE_Int          num_procs,
+                       hypre_BinaryTree **tree_ptr)
 {
-   HYPRE_Int  i, proc, size=0;
+   hypre_BinaryTree *tree;
+   HYPRE_Int  i, proc, size = 0;
    HYPRE_Int  *tmp_child_id;
-   HYPRE_Int  num=0, parent = 0;
+   HYPRE_Int  num = 0, parent = 0;
+
+   tree = hypre_CTAlloc(hypre_BinaryTree, 1, HYPRE_MEMORY_HOST);
 
-   /* initialize*/
+   /* initialize */
    proc = myid;
 
    /*how many children can a processor have?*/
@@ -37,14 +43,14 @@ HYPRE_Int hypre_CreateBinaryTree(HYPRE_Int myid, HYPRE_Int num_procs,
    }
 
    /* allocate space */
-   tmp_child_id = hypre_TAlloc(HYPRE_Int,  size, HYPRE_MEMORY_HOST);
+   tmp_child_id = hypre_TAlloc(HYPRE_Int, size, HYPRE_MEMORY_HOST);
 
    /* find children and parent */
    for (i = 1; i < num_procs; i *= 2)
    {
       if ( (proc % 2) == 0)
       {
-         if( (myid + i) < num_procs )
+         if ( (myid + i) < num_procs )
          {
             tmp_child_id[num] = myid + i;
             num++;
@@ -56,30 +62,38 @@ HYPRE_Int hypre_CreateBinaryTree(HYPRE_Int myid, HYPRE_Int num_procs,
          parent = myid - i;
          break;
       }
-
    }
 
    hypre_BinaryTreeParentId(tree) = parent;
    hypre_BinaryTreeNumChild(tree) = num;
    hypre_BinaryTreeChildIds(tree) = tmp_child_id;
 
+   *tree_ptr = tree;
+
    return hypre_error_flag;
 }
 
 /*---------------------------------------------------
  * hypre_DestroyBinaryTree()
- * Destroy storage created by createBinaryTree
+ *
+ * Destroy storage created by hypre_CreateBinaryTree
  *----------------------------------------------------*/
-HYPRE_Int hypre_DestroyBinaryTree(hypre_BinaryTree *tree)
-{
 
-   hypre_TFree(hypre_BinaryTreeChildIds(tree), HYPRE_MEMORY_HOST);
+HYPRE_Int
+hypre_DestroyBinaryTree(hypre_BinaryTree *tree)
+{
+   if (tree)
+   {
+      hypre_TFree(hypre_BinaryTreeChildIds(tree), HYPRE_MEMORY_HOST);
+      hypre_TFree(tree, HYPRE_MEMORY_HOST);
+   }
 
    return hypre_error_flag;
 }
 
 /*---------------------------------------------------
  * hypre_DataExchangeList()
+ *
  * This function is for sending a list of messages ("contacts" to
  * a list of processors.  The receiving processors
  * do not know how many messages they are getting. The
@@ -90,17 +104,19 @@ HYPRE_Int hypre_DestroyBinaryTree(hypre_BinaryTree *tree)
 /* should change to where the buffers for sending and receiving are voids
    instead of ints - then cast accordingly */
 
-HYPRE_Int hypre_DataExchangeList(HYPRE_Int num_contacts,
-                                 HYPRE_Int *contact_proc_list,
-                                 void *contact_send_buf,
-                                 HYPRE_Int *contact_send_buf_starts,
-                                 HYPRE_Int contact_obj_size,
-                                 HYPRE_Int response_obj_size,
-                                 hypre_DataExchangeResponse *response_obj,
-                                 HYPRE_Int max_response_size,
-                                 HYPRE_Int rnum, MPI_Comm comm,
-                                 void **p_response_recv_buf,
-                                 HYPRE_Int **p_response_recv_buf_starts)
+HYPRE_Int
+hypre_DataExchangeList(HYPRE_Int num_contacts,
+                       HYPRE_Int *contact_proc_list,
+                       void *contact_send_buf,
+                       HYPRE_Int *contact_send_buf_starts,
+                       HYPRE_Int contact_obj_size,
+                       HYPRE_Int response_obj_size,
+                       hypre_DataExchangeResponse *response_obj,
+                       HYPRE_Int max_response_size,
+                       HYPRE_Int rnum,
+                       MPI_Comm comm,
+                       void **p_response_recv_buf,
+                       HYPRE_Int **p_response_recv_buf_starts)
 {
    /*-------------------------------------------
     *  parameters:
@@ -140,8 +156,8 @@ HYPRE_Int hypre_DataExchangeList(HYPRE_Int num_contacts,
    HYPRE_Int  size, post_size, copy_size;
    HYPRE_Int  total_size, count;
 
-   void *start_ptr = NULL, *index_ptr=NULL;
-   HYPRE_Int  *int_ptr=NULL;
+   void *start_ptr = NULL, *index_ptr = NULL;
+   HYPRE_Int  *int_ptr = NULL;
 
    void *response_recv_buf = NULL;
    void *send_response_buf = NULL;
@@ -163,26 +179,26 @@ HYPRE_Int hypre_DataExchangeList(HYPRE_Int num_contacts,
    void **post_array = NULL;  /*this must be set to null or realloc will crash */
    HYPRE_Int  post_array_storage = 0;
    HYPRE_Int  post_array_size = 0;
-   HYPRE_Int   num_post_recvs =0;
+   HYPRE_Int   num_post_recvs = 0;
 
-   void **contact_ptrs = NULL, **response_ptrs=NULL, **post_ptrs=NULL;
+   void **contact_ptrs = NULL, **response_ptrs = NULL, **post_ptrs = NULL;
 
-   hypre_BinaryTree tree;
+   hypre_BinaryTree *tree = NULL;
 
-   hypre_MPI_Request *response_requests, *contact_requests;
-   hypre_MPI_Status  *response_statuses, *contact_statuses;
+   hypre_MPI_Request *response_requests = NULL, *contact_requests = NULL;
+   hypre_MPI_Status  *response_statuses = NULL, *contact_statuses = NULL;
 
    hypre_MPI_Request  *post_send_requests = NULL, *post_recv_requests = NULL;
    hypre_MPI_Status   *post_send_statuses = NULL, *post_recv_statuses = NULL;
 
-   hypre_MPI_Request *term_requests, term_request1, request_parent;
-   hypre_MPI_Status  *term_statuses, term_status1, status_parent;
+   hypre_MPI_Request *term_requests = NULL, term_request1, request_parent;
+   hypre_MPI_Status  *term_statuses = NULL, term_status1, status_parent;
    hypre_MPI_Status  status, fill_status;
 
-   const HYPRE_Int contact_tag = 1000*rnum;
-   const HYPRE_Int response_tag = 1002*rnum;
-   const HYPRE_Int term_tag =  1004*rnum;
-   const HYPRE_Int post_tag = 1006*rnum;
+   const HYPRE_Int contact_tag = 1000 * rnum;
+   const HYPRE_Int response_tag = 1002 * rnum;
+   const HYPRE_Int term_tag =  1004 * rnum;
+   const HYPRE_Int post_tag = 1006 * rnum;
 
    hypre_MPI_Comm_size(comm, &num_procs );
    hypre_MPI_Comm_rank(comm, &myid );
@@ -190,44 +206,46 @@ HYPRE_Int hypre_DataExchangeList(HYPRE_Int num_contacts,
    /* ---------initializations ----------------*/
 
    /* if the response_obj_size or contact_obj_size is 0, set to sizeof(HYPRE_Int) */
-   if (!response_obj_size) response_obj_size = sizeof(HYPRE_Int);
-   if (!contact_obj_size) contact_obj_size = sizeof(HYPRE_Int);
+   if (!response_obj_size) { response_obj_size = sizeof(HYPRE_Int); }
+   if (!contact_obj_size) { contact_obj_size = sizeof(HYPRE_Int); }
 
-   max_response_size_bytes = max_response_size*response_obj_size;
+   max_response_size_bytes = max_response_size * response_obj_size;
 
 
    /* pre-allocate the max space for responding to contacts */
-   overhead = ceil((HYPRE_Real) sizeof(HYPRE_Int)/response_obj_size); /*for appending an integer*/
+   overhead = (HYPRE_Int)hypre_ceil((HYPRE_Real) sizeof(HYPRE_Int) /
+                                    response_obj_size); /*for appending an integer*/
 
-   max_response_total_bytes = (max_response_size+overhead)*response_obj_size;
+   max_response_total_bytes = (max_response_size + overhead) * response_obj_size;
 
    response_obj->send_response_overhead = overhead;
    response_obj->send_response_storage = max_response_size;
 
-   /*send_response_buf = hypre_MAlloc(max_response_total_bytes);*/
-   send_response_buf = hypre_CTAlloc(char, (max_response_size+overhead)*response_obj_size, HYPRE_MEMORY_HOST);
+   /*send_response_buf = hypre_TAlloc(char, max_response_total_bytes);*/
+   send_response_buf = hypre_CTAlloc(char, (max_response_size + overhead) * response_obj_size,
+                                     HYPRE_MEMORY_HOST);
 
    /*allocate space for inital recv array for the responses - give each processor
      size max_response_size */
 
-   initial_recv_buf = hypre_TAlloc(char, max_response_total_bytes*num_contacts, HYPRE_MEMORY_HOST);
-   response_recv_buf_starts =   hypre_CTAlloc(HYPRE_Int,  num_contacts+1, HYPRE_MEMORY_HOST);
+   initial_recv_buf = hypre_TAlloc(char, max_response_total_bytes * num_contacts, HYPRE_MEMORY_HOST);
+   response_recv_buf_starts =   hypre_CTAlloc(HYPRE_Int,  num_contacts + 1, HYPRE_MEMORY_HOST);
 
    contact_ptrs = hypre_TAlloc( void *,  num_contacts, HYPRE_MEMORY_HOST);
    response_ptrs = hypre_TAlloc(void *,  num_contacts, HYPRE_MEMORY_HOST);
 
    /*-------------SEND CONTACTS AND POST RECVS FOR RESPONSES---*/
 
-   for (i=0; i<= num_contacts; i++)
+   for (i = 0; i <= num_contacts; i++)
    {
-      response_recv_buf_starts[i] = i*(max_response_size+overhead);
+      response_recv_buf_starts[i] = i * (max_response_size + overhead);
    }
 
    /* Send "contact" messages to the list of processors and
       pre-post receives to wait for their response*/
 
    responses_complete = 1;
-   if (num_contacts > 0 )
+   if (num_contacts > 0)
    {
       responses_complete = 0;
       response_requests = hypre_CTAlloc(hypre_MPI_Request,  num_contacts, HYPRE_MEMORY_HOST);
@@ -238,11 +256,11 @@ HYPRE_Int hypre_DataExchangeList(HYPRE_Int num_contacts,
       /* post receives - could be confirmation or data*/
       /* the size to post is max_response_total_bytes*/
 
-      for (i=0; i< num_contacts; i++)
+      for (i = 0; i < num_contacts; i++)
       {
          /* response_ptrs[i] =  initial_recv_buf + i*max_response_total_bytes ; */
          response_ptrs[i] = (void *)((char *) initial_recv_buf +
-                                     i*max_response_total_bytes) ;
+                                     i * max_response_total_bytes) ;
 
          hypre_MPI_Irecv(response_ptrs[i], max_response_total_bytes,
                          hypre_MPI_BYTE, contact_proc_list[i],
@@ -251,15 +269,15 @@ HYPRE_Int hypre_DataExchangeList(HYPRE_Int num_contacts,
 
       /* send out contact messages */
       start_ptr = contact_send_buf;
-      for (i=0; i< num_contacts; i++)
+      for (i = 0; i < num_contacts; i++)
       {
          contact_ptrs[i] = start_ptr;
-         size =  contact_send_buf_starts[i+1] - contact_send_buf_starts[i]  ;
-         hypre_MPI_Isend(contact_ptrs[i], size*contact_obj_size,
+         size =  contact_send_buf_starts[i + 1] - contact_send_buf_starts[i]  ;
+         hypre_MPI_Isend(contact_ptrs[i], size * contact_obj_size,
                          hypre_MPI_BYTE, contact_proc_list[i],
                          contact_tag, comm, &contact_requests[i]);
          /*  start_ptr += (size*contact_obj_size); */
-         start_ptr = (void *) ((char *) start_ptr  + (size*contact_obj_size));
+         start_ptr = (void *) ((char *) start_ptr  + (size * contact_obj_size));
       }
    }
 
@@ -279,20 +297,19 @@ HYPRE_Int hypre_DataExchangeList(HYPRE_Int num_contacts,
          have received responses for all of their contacts.
          So post receives now */
 
-      term_requests = hypre_CTAlloc(hypre_MPI_Request,  tree.num_child, HYPRE_MEMORY_HOST);
-      term_statuses = hypre_CTAlloc(hypre_MPI_Status,  tree.num_child, HYPRE_MEMORY_HOST);
+      term_requests = hypre_CTAlloc(hypre_MPI_Request, tree -> num_child, HYPRE_MEMORY_HOST);
+      term_statuses = hypre_CTAlloc(hypre_MPI_Status, tree -> num_child, HYPRE_MEMORY_HOST);
 
-      for (i=0; i< tree.num_child; i++)
+      for (i = 0; i < tree -> num_child; i++)
       {
-	 hypre_MPI_Irecv(NULL, 0, HYPRE_MPI_INT, tree.child_id[i], term_tag, comm,
+         hypre_MPI_Irecv(NULL, 0, HYPRE_MPI_INT, (tree -> child_id)[i], term_tag, comm,
                          &term_requests[i]);
       }
 
       terminate = 0;
-
       children_complete = 0;
    }
-   else if (num_procs ==1 && num_contacts > 0 ) /* added 11/08 */
+   else if (num_procs == 1 && num_contacts > 0) /* added 11/08 */
    {
       terminate = 0;
    }
@@ -313,7 +330,7 @@ HYPRE_Int hypre_DataExchangeList(HYPRE_Int num_contacts,
          proc = status.hypre_MPI_SOURCE;
          hypre_MPI_Get_count(&status, hypre_MPI_BYTE, &contact_size);
 
-         contact_size = contact_size/contact_obj_size;
+         contact_size = contact_size / contact_obj_size;
 
          /*---------------FILL RESPONSE ------------------------*/
 
@@ -321,15 +338,15 @@ HYPRE_Int hypre_DataExchangeList(HYPRE_Int num_contacts,
            to determine how to populate the send buffer for the reponse*/
 
          /* do we have enough space to recv it? */
-         if(contact_size > recv_contact_buf_size)
+         if (contact_size > recv_contact_buf_size)
          {
             recv_contact_buf = hypre_TReAlloc((char*)recv_contact_buf,
-                                              char, contact_obj_size*contact_size, HYPRE_MEMORY_HOST);
+                                              char, contact_obj_size * contact_size, HYPRE_MEMORY_HOST);
             recv_contact_buf_size = contact_size;
          }
 
          /* this must be blocking - can't fill recv without the buffer*/
-         hypre_MPI_Recv(recv_contact_buf, contact_size*contact_obj_size,
+         hypre_MPI_Recv(recv_contact_buf, contact_size * contact_obj_size,
                         hypre_MPI_BYTE, proc, contact_tag, comm, &fill_status);
 
          response_obj->fill_response(recv_contact_buf, contact_size, proc,
@@ -356,13 +373,14 @@ HYPRE_Int hypre_DataExchangeList(HYPRE_Int num_contacts,
             /* allocate space for the data this post only*/
             /* this should not happen often (unless a poor max_size has been chosen)
                - so we will allocate space for the data as needed */
-            size = post_size*response_obj_size;
+            size = post_size * response_obj_size;
             post_array[post_array_size] =  hypre_TAlloc(char, size, HYPRE_MEMORY_HOST);
             /* index_ptr =  send_response_buf + max_response_size_bytes */;
             index_ptr = (void *) ((char *) send_response_buf +
                                   max_response_size_bytes);
 
-            hypre_TMemcpy(post_array[post_array_size], index_ptr, char,  size, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
+            hypre_TMemcpy(post_array[post_array_size], index_ptr, char,  size, HYPRE_MEMORY_HOST,
+                          HYPRE_MEMORY_HOST);
 
             /*now post any part of the message that is too long with a non-blocking
               send and a different tag */
@@ -381,7 +399,8 @@ HYPRE_Int hypre_DataExchangeList(HYPRE_Int num_contacts,
          index_ptr = (void *) ((char *) send_response_buf +
                                max_response_size_bytes);
 
-         hypre_TMemcpy(index_ptr,  &response_message_size, HYPRE_Int, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
+         hypre_TMemcpy(index_ptr,  &response_message_size, HYPRE_Int, 1, HYPRE_MEMORY_HOST,
+                       HYPRE_MEMORY_HOST);
 
          /*send the block of data that includes the overhead */
          /* this is a blocking send - the recv has already been posted */
@@ -404,23 +423,23 @@ HYPRE_Int hypre_DataExchangeList(HYPRE_Int num_contacts,
       {
          hypre_MPI_Testall(num_contacts, response_requests, &responses_complete,
                            response_statuses);
-         if (responses_complete && num_procs == 1) terminate = 1; /*added 11/08 */
+         if (responses_complete && num_procs == 1) { terminate = 1; } /*added 11/08 */
 
       }
-      else if(!children_complete) /* have all of our children received all of their
+      else if (!children_complete) /* have all of our children received all of their
                                      response messages?*/
       {
-         hypre_MPI_Testall(tree.num_child, term_requests, &children_complete,
+         hypre_MPI_Testall(tree -> num_child, term_requests, &children_complete,
                            term_statuses);
 
          /* if we have gotten term messages from all of our children, send a term
             message to our parent.  Then post a receive to hear back from parent */
-	 if (children_complete & (myid > 0)) /*root does not have a parent*/
+         if (children_complete & (myid > 0)) /*root does not have a parent*/
          {
-            hypre_MPI_Isend(NULL, 0, HYPRE_MPI_INT, tree.parent_id, term_tag,
+            hypre_MPI_Isend(NULL, 0, HYPRE_MPI_INT, tree -> parent_id, term_tag,
                             comm, &request_parent);
 
-            hypre_MPI_Irecv(NULL, 0, HYPRE_MPI_INT, tree.parent_id, term_tag,
+            hypre_MPI_Irecv(NULL, 0, HYPRE_MPI_INT, tree -> parent_id, term_tag,
                             comm, &term_request1);
          }
       }
@@ -435,15 +454,16 @@ HYPRE_Int hypre_DataExchangeList(HYPRE_Int num_contacts,
             hypre_MPI_Test(&term_request1, &terminate, &term_status1);
          }
          if (terminate) /*tell children to terminate */
-	 {
-            if (myid > 0 ) hypre_MPI_Wait(&request_parent, &status_parent);
+         {
+            if (myid > 0 ) { hypre_MPI_Wait(&request_parent, &status_parent); }
 
-	    for (i=0; i< tree.num_child; i++)
-	    {  /*a blocking send  - recv has been posted already*/
-	       hypre_MPI_Send(NULL, 0, HYPRE_MPI_INT, tree.child_id[i],
+            for (i = 0; i < tree -> num_child; i++)
+            {
+               /*a blocking send  - recv has been posted already*/
+               hypre_MPI_Send(NULL, 0, HYPRE_MPI_INT, (tree -> child_id)[i],
                               term_tag, comm);
-	    }
-	 }
+            }
+         }
       }
    }
 
@@ -471,15 +491,15 @@ HYPRE_Int hypre_DataExchangeList(HYPRE_Int num_contacts,
 
    /*an extra loop to determine sizes.  This is better than reallocating
      the array that will be used in posting the irecvs */
-   for (i=0; i< num_contacts; i++)
+   for (i = 0; i < num_contacts; i++)
    {
       int_ptr = (HYPRE_Int *) ((char *) start_ptr + max_response_size_bytes); /*the overhead HYPRE_Int*/
 
       response_message_size =  *int_ptr;
-      response_recv_buf_starts[i+1] =
+      response_recv_buf_starts[i + 1] =
          response_recv_buf_starts[i] + response_message_size;
       total_size +=  response_message_size;
-      if (max_response_size < response_message_size) num_post_recvs++;
+      if (max_response_size < response_message_size) { num_post_recvs++; }
       /* start_ptr += max_response_total_bytes; */
       start_ptr = (void *) ((char *) start_ptr + max_response_total_bytes);
    }
@@ -489,31 +509,32 @@ HYPRE_Int hypre_DataExchangeList(HYPRE_Int num_contacts,
    post_ptrs = hypre_TAlloc(void *,  num_post_recvs, HYPRE_MEMORY_HOST);
 
    /*second loop to post any recvs and set up recv_response_buf */
-   response_recv_buf = hypre_TAlloc(char, total_size*response_obj_size, HYPRE_MEMORY_HOST);
+   response_recv_buf = hypre_TAlloc(char, total_size * response_obj_size, HYPRE_MEMORY_HOST);
    index_ptr = response_recv_buf;
    start_ptr = initial_recv_buf;
    count = 0;
 
-   for (i=0; i< num_contacts; i++)
+   for (i = 0; i < num_contacts; i++)
    {
       response_message_size =
-         response_recv_buf_starts[i+1] - response_recv_buf_starts[i];
+         response_recv_buf_starts[i + 1] - response_recv_buf_starts[i];
       copy_size = hypre_min(response_message_size, max_response_size);
 
-      hypre_TMemcpy(index_ptr,  start_ptr,  char, copy_size*response_obj_size, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
+      hypre_TMemcpy(index_ptr,  start_ptr,  char, copy_size * response_obj_size, HYPRE_MEMORY_HOST,
+                    HYPRE_MEMORY_HOST);
       /* index_ptr += copy_size*response_obj_size; */
-      index_ptr = (void *) ((char *) index_ptr + copy_size*response_obj_size);
+      index_ptr = (void *) ((char *) index_ptr + copy_size * response_obj_size);
 
       if (max_response_size < response_message_size)
       {
-         size = (response_message_size - max_response_size)*response_obj_size;
+         size = (response_message_size - max_response_size) * response_obj_size;
          post_ptrs[count] = index_ptr;
          hypre_MPI_Irecv(post_ptrs[count], size, hypre_MPI_BYTE,
                          contact_proc_list[i], post_tag,
                          comm, &post_recv_requests[count]);
          count++;
          /* index_ptr+=size;*/
-         index_ptr=  (void *) ((char *) index_ptr + size);
+         index_ptr =  (void *) ((char *) index_ptr + size);
       }
 
       /* start_ptr += max_response_total_bytes; */
@@ -554,7 +575,7 @@ HYPRE_Int hypre_DataExchangeList(HYPRE_Int num_contacts,
       hypre_TFree(post_send_requests, HYPRE_MEMORY_HOST);
       hypre_TFree(post_send_statuses, HYPRE_MEMORY_HOST);
 
-      for (i=0; i< post_array_size; i++)
+      for (i = 0; i < post_array_size; i++)
       {
          hypre_TFree(post_array[i], HYPRE_MEMORY_HOST);
       }
@@ -566,7 +587,7 @@ HYPRE_Int hypre_DataExchangeList(HYPRE_Int num_contacts,
       hypre_TFree(term_requests, HYPRE_MEMORY_HOST);
       hypre_TFree(term_statuses, HYPRE_MEMORY_HOST);
 
-      hypre_DestroyBinaryTree(&tree);
+      hypre_DestroyBinaryTree(tree);
    }
 
    /* output  */
diff --git a/external/hypre/src/utilities/exchange_data.h b/external/hypre/src/utilities/exchange_data.h
index 52e10e37..ed2531f8 100644
--- a/external/hypre/src/utilities/exchange_data.h
+++ b/external/hypre/src/utilities/exchange_data.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -31,9 +31,9 @@ typedef struct
 typedef struct
 {
    HYPRE_Int    (*fill_response)(void* recv_buf, HYPRE_Int contact_size,
-                           HYPRE_Int contact_proc, void* response_obj,
-                           MPI_Comm comm, void** response_buf,
-                           HYPRE_Int* response_message_size);
+                                 HYPRE_Int contact_proc, void* response_obj,
+                                 MPI_Comm comm, void** response_buf,
+                                 HYPRE_Int* response_message_size);
    HYPRE_Int     send_response_overhead; /*set by exchange data */
    HYPRE_Int     send_response_storage;  /*storage allocated for send_response_buf*/
    void    *data1;                 /*data fields user may want to access in fill_response */
@@ -41,9 +41,11 @@ typedef struct
 
 } hypre_DataExchangeResponse;
 
-HYPRE_Int hypre_CreateBinaryTree(HYPRE_Int, HYPRE_Int, hypre_BinaryTree*);
+HYPRE_Int hypre_CreateBinaryTree(HYPRE_Int, HYPRE_Int, hypre_BinaryTree**);
 HYPRE_Int hypre_DestroyBinaryTree(hypre_BinaryTree*);
-HYPRE_Int hypre_DataExchangeList(HYPRE_Int num_contacts, HYPRE_Int *contact_proc_list, void *contact_send_buf, HYPRE_Int *contact_send_buf_starts, HYPRE_Int contact_obj_size, HYPRE_Int response_obj_size, hypre_DataExchangeResponse *response_obj, HYPRE_Int max_response_size, HYPRE_Int rnum, MPI_Comm comm, void **p_response_recv_buf, HYPRE_Int **p_response_recv_buf_starts);
+HYPRE_Int hypre_DataExchangeList(HYPRE_Int num_contacts, HYPRE_Int *contact_proc_list,
+                                 void *contact_send_buf, HYPRE_Int *contact_send_buf_starts, HYPRE_Int contact_obj_size,
+                                 HYPRE_Int response_obj_size, hypre_DataExchangeResponse *response_obj, HYPRE_Int max_response_size,
+                                 HYPRE_Int rnum, MPI_Comm comm, void **p_response_recv_buf, HYPRE_Int **p_response_recv_buf_starts);
 
 #endif /* end of header */
-
diff --git a/external/hypre/src/utilities/fortran.h b/external/hypre/src/utilities/fortran.h
index d2471c98..7646eedc 100644
--- a/external/hypre/src/utilities/fortran.h
+++ b/external/hypre/src/utilities/fortran.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -25,7 +25,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-    
+
 /*-------------------------------------------------------
  * Define specific name mangling macros to be used below
  *-------------------------------------------------------*/
@@ -127,7 +127,9 @@ typedef hypre_int      hypre_F90_Comm;
 typedef HYPRE_Int      hypre_F90_Int;
 typedef HYPRE_BigInt   hypre_F90_BigInt;
 typedef HYPRE_Int      hypre_F90_IntArray;
+typedef HYPRE_Int      hypre_F90_IntArrayArray;
 typedef HYPRE_BigInt   hypre_F90_BigIntArray;
+typedef HYPRE_BigInt   hypre_F90_BigIntArrayArray;
 typedef HYPRE_Real     hypre_F90_Real;
 typedef HYPRE_Real     hypre_F90_RealArray;
 typedef HYPRE_Complex  hypre_F90_Complex;
@@ -135,25 +137,26 @@ typedef HYPRE_Complex  hypre_F90_ComplexArray;
 typedef HYPRE_Int     *hypre_F90_Obj;
 typedef HYPRE_Int     *hypre_F90_ObjRef;
 
-#define hypre_F90_PassComm(arg)          (hypre_MPI_Comm_f2c(*arg))
-#define hypre_F90_PassInt(arg)           ((HYPRE_Int) *arg)
-#define hypre_F90_PassIntRef(arg)        ((HYPRE_Int *) arg)
-#define hypre_F90_PassIntArray(arg)      ((HYPRE_Int *) arg)
-#define hypre_F90_PassBigInt(arg)        ((HYPRE_BigInt) *arg)
-#define hypre_F90_PassBigIntRef(arg)     ((HYPRE_BigInt *) arg)
-#define hypre_F90_PassBigIntArray(arg)   ((HYPRE_BigInt *) arg)
-#define hypre_F90_PassReal(arg)          ((HYPRE_Real) *arg)
-#define hypre_F90_PassRealRef(arg)       ((HYPRE_Real *) arg)
-#define hypre_F90_PassRealArray(arg)     ((HYPRE_Real *) arg)
-#define hypre_F90_PassComplex(arg)       ((HYPRE_Complex) *arg)
-#define hypre_F90_PassComplexRef(arg)    ((HYPRE_Complex *) arg)
-#define hypre_F90_PassComplexArray(arg)  ((HYPRE_Complex *) arg)
-#define hypre_F90_PassObj(obj,arg)       ((obj) *arg)
-#define hypre_F90_PassObjRef(obj,arg)    ((obj *) arg)
+#define hypre_F90_PassComm(arg)             (hypre_MPI_Comm_f2c(*arg))
+#define hypre_F90_PassInt(arg)              ((HYPRE_Int) *arg)
+#define hypre_F90_PassIntRef(arg)           ((HYPRE_Int *) arg)
+#define hypre_F90_PassIntArray(arg)         ((HYPRE_Int *) arg)
+#define hypre_F90_PassIntArrayArray(arg)    ((HYPRE_Int **) arg)
+#define hypre_F90_PassBigInt(arg)           ((HYPRE_BigInt) *arg)
+#define hypre_F90_PassBigIntRef(arg)        ((HYPRE_BigInt *) arg)
+#define hypre_F90_PassBigIntArray(arg)      ((HYPRE_BigInt *) arg)
+#define hypre_F90_PassBigIntArrayArray(arg) ((HYPRE_BigInt **) arg)
+#define hypre_F90_PassReal(arg)             ((HYPRE_Real) *arg)
+#define hypre_F90_PassRealRef(arg)          ((HYPRE_Real *) arg)
+#define hypre_F90_PassRealArray(arg)        ((HYPRE_Real *) arg)
+#define hypre_F90_PassComplex(arg)          ((HYPRE_Complex) *arg)
+#define hypre_F90_PassComplexRef(arg)       ((HYPRE_Complex *) arg)
+#define hypre_F90_PassComplexArray(arg)     ((HYPRE_Complex *) arg)
+#define hypre_F90_PassObj(obj,arg)          ((obj) *arg)
+#define hypre_F90_PassObjRef(obj,arg)       ((obj *) arg)
 
 #ifdef __cplusplus
 }
 #endif
 
 #endif
-
diff --git a/external/hypre/src/utilities/fortran_matrix.c b/external/hypre/src/utilities/fortran_matrix.c
index cacbec16..b881a52c 100644
--- a/external/hypre/src/utilities/fortran_matrix.c
+++ b/external/hypre/src/utilities/fortran_matrix.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -13,7 +13,8 @@
 #include "_hypre_utilities.h"
 
 utilities_FortranMatrix*
-utilities_FortranMatrixCreate(void) {
+utilities_FortranMatrixCreate(void)
+{
 
    utilities_FortranMatrix* mtx;
 
@@ -31,15 +32,18 @@ utilities_FortranMatrixCreate(void) {
 
 void
 utilities_FortranMatrixAllocateData( HYPRE_BigInt  h, HYPRE_BigInt w,
-                                     utilities_FortranMatrix* mtx ) {
+                                     utilities_FortranMatrix* mtx )
+{
 
    hypre_assert( h > 0 && w > 0 );
    hypre_assert( mtx != NULL );
 
    if ( mtx->value != NULL && mtx->ownsValues )
-      hypre_TFree( mtx->value ,HYPRE_MEMORY_HOST);
+   {
+      hypre_TFree( mtx->value, HYPRE_MEMORY_HOST);
+   }
 
-   mtx->value = hypre_CTAlloc(HYPRE_Real,  h*w, HYPRE_MEMORY_HOST);
+   mtx->value = hypre_CTAlloc(HYPRE_Real,  h * w, HYPRE_MEMORY_HOST);
    hypre_assert ( mtx->value != NULL );
 
    mtx->globalHeight = h;
@@ -51,13 +55,16 @@ utilities_FortranMatrixAllocateData( HYPRE_BigInt  h, HYPRE_BigInt w,
 
 void
 utilities_FortranMatrixWrap( HYPRE_Real* v, HYPRE_BigInt gh, HYPRE_BigInt  h, HYPRE_BigInt w,
-                             utilities_FortranMatrix* mtx ) {
+                             utilities_FortranMatrix* mtx )
+{
 
    hypre_assert( h > 0 && w > 0 );
    hypre_assert( mtx != NULL );
 
    if ( mtx->value != NULL && mtx->ownsValues )
-      hypre_TFree( mtx->value ,HYPRE_MEMORY_HOST);
+   {
+      hypre_TFree( mtx->value, HYPRE_MEMORY_HOST);
+   }
 
    mtx->value = v;
    hypre_assert ( mtx->value != NULL );
@@ -70,19 +77,25 @@ utilities_FortranMatrixWrap( HYPRE_Real* v, HYPRE_BigInt gh, HYPRE_BigInt  h, HY
 
 
 void
-utilities_FortranMatrixDestroy( utilities_FortranMatrix* mtx ) {
+utilities_FortranMatrixDestroy( utilities_FortranMatrix* mtx )
+{
 
    if ( mtx == NULL )
+   {
       return;
+   }
 
    if ( mtx->ownsValues && mtx->value != NULL )
-      hypre_TFree(mtx->value,HYPRE_MEMORY_HOST);
+   {
+      hypre_TFree(mtx->value, HYPRE_MEMORY_HOST);
+   }
 
-   hypre_TFree(mtx,HYPRE_MEMORY_HOST);
+   hypre_TFree(mtx, HYPRE_MEMORY_HOST);
 }
 
 HYPRE_BigInt
-utilities_FortranMatrixGlobalHeight( utilities_FortranMatrix* mtx ) {
+utilities_FortranMatrixGlobalHeight( utilities_FortranMatrix* mtx )
+{
 
    hypre_assert( mtx != NULL );
 
@@ -90,7 +103,8 @@ utilities_FortranMatrixGlobalHeight( utilities_FortranMatrix* mtx ) {
 }
 
 HYPRE_BigInt
-utilities_FortranMatrixHeight( utilities_FortranMatrix* mtx ) {
+utilities_FortranMatrixHeight( utilities_FortranMatrix* mtx )
+{
 
    hypre_assert( mtx != NULL );
 
@@ -98,7 +112,8 @@ utilities_FortranMatrixHeight( utilities_FortranMatrix* mtx ) {
 }
 
 HYPRE_BigInt
-utilities_FortranMatrixWidth( utilities_FortranMatrix* mtx ) {
+utilities_FortranMatrixWidth( utilities_FortranMatrix* mtx )
+{
 
    hypre_assert( mtx != NULL );
 
@@ -106,7 +121,8 @@ utilities_FortranMatrixWidth( utilities_FortranMatrix* mtx ) {
 }
 
 HYPRE_Real*
-utilities_FortranMatrixValues( utilities_FortranMatrix* mtx ) {
+utilities_FortranMatrixValues( utilities_FortranMatrix* mtx )
+{
 
    hypre_assert( mtx != NULL );
 
@@ -114,7 +130,8 @@ utilities_FortranMatrixValues( utilities_FortranMatrix* mtx ) {
 }
 
 void
-utilities_FortranMatrixClear( utilities_FortranMatrix* mtx ) {
+utilities_FortranMatrixClear( utilities_FortranMatrix* mtx )
+{
 
    HYPRE_BigInt i, j, h, w, jump;
    HYPRE_Real* p;
@@ -126,15 +143,19 @@ utilities_FortranMatrixClear( utilities_FortranMatrix* mtx ) {
 
    jump = mtx->globalHeight - h;
 
-   for ( j = 0, p = mtx->value; j < w; j++ ) {
+   for ( j = 0, p = mtx->value; j < w; j++ )
+   {
       for ( i = 0; i < h; i++, p++ )
+      {
          *p = 0.0;
+      }
       p += jump;
    }
 }
 
 void
-utilities_FortranMatrixClearL( utilities_FortranMatrix* mtx ) {
+utilities_FortranMatrixClearL( utilities_FortranMatrix* mtx )
+{
 
    HYPRE_BigInt i, j, k, h, w, jump;
    HYPRE_Real* p;
@@ -145,22 +166,28 @@ utilities_FortranMatrixClearL( utilities_FortranMatrix* mtx ) {
    w = mtx->width;
 
    if ( w > h )
+   {
       w = h;
+   }
 
    jump = mtx->globalHeight - h;
 
-   for ( j = 0, p = mtx->value; j < w - 1; j++ ) {
+   for ( j = 0, p = mtx->value; j < w - 1; j++ )
+   {
       k = j + 1;
       p += k;
       for ( i = k; i < h; i++, p++ )
+      {
          *p = 0.0;
+      }
       p += jump;
    }
 }
 
 
 void
-utilities_FortranMatrixSetToIdentity( utilities_FortranMatrix* mtx ) {
+utilities_FortranMatrixSetToIdentity( utilities_FortranMatrix* mtx )
+{
 
    HYPRE_BigInt j, h, w, jump;
    HYPRE_Real* p;
@@ -175,12 +202,15 @@ utilities_FortranMatrixSetToIdentity( utilities_FortranMatrix* mtx ) {
    jump = mtx->globalHeight;
 
    for ( j = 0, p = mtx->value; j < w && j < h; j++, p += jump )
+   {
       *p++ = 1.0;
+   }
 
 }
 
 void
-utilities_FortranMatrixTransposeSquare( utilities_FortranMatrix* mtx ) {
+utilities_FortranMatrixTransposeSquare( utilities_FortranMatrix* mtx )
+{
 
    HYPRE_BigInt i, j, g, h, w, jump;
    HYPRE_Real* p;
@@ -197,11 +227,13 @@ utilities_FortranMatrixTransposeSquare( utilities_FortranMatrix* mtx ) {
 
    jump = mtx->globalHeight - h;
 
-   for ( j = 0, p = mtx->value; j < w; j++ ) {
+   for ( j = 0, p = mtx->value; j < w; j++ )
+   {
       q = p;
       p++;
       q += g;
-      for ( i = j + 1; i < h; i++, p++, q += g ) {
+      for ( i = j + 1; i < h; i++, p++, q += g )
+      {
          tmp = *p;
          *p = *q;
          *q = tmp;
@@ -211,7 +243,8 @@ utilities_FortranMatrixTransposeSquare( utilities_FortranMatrix* mtx ) {
 }
 
 void
-utilities_FortranMatrixSymmetrize( utilities_FortranMatrix* mtx ) {
+utilities_FortranMatrixSymmetrize( utilities_FortranMatrix* mtx )
+{
 
    HYPRE_BigInt i, j, g, h, w, jump;
    HYPRE_Real* p;
@@ -227,19 +260,23 @@ utilities_FortranMatrixSymmetrize( utilities_FortranMatrix* mtx ) {
 
    jump = mtx->globalHeight - h;
 
-   for ( j = 0, p = mtx->value; j < w; j++ ) {
+   for ( j = 0, p = mtx->value; j < w; j++ )
+   {
       q = p;
       p++;
       q += g;
       for ( i = j + 1; i < h; i++, p++, q += g )
-         *p = *q = (*p + *q)*0.5;
+      {
+         *p = *q = (*p + *q) * 0.5;
+      }
       p += ++jump;
    }
 }
 
 void
 utilities_FortranMatrixCopy( utilities_FortranMatrix* src, HYPRE_Int t,
-                             utilities_FortranMatrix* dest ) {
+                             utilities_FortranMatrix* dest )
+{
 
    HYPRE_BigInt i, j, h, w;
    HYPRE_BigInt jp, jq, jr;
@@ -254,12 +291,14 @@ utilities_FortranMatrixCopy( utilities_FortranMatrix* src, HYPRE_Int t,
 
    jp = dest->globalHeight - h;
 
-   if ( t == 0 ) {
+   if ( t == 0 )
+   {
       hypre_assert( src->height == h && src->width == w );
       jq = 1;
       jr = src->globalHeight;
    }
-   else {
+   else
+   {
       hypre_assert( src->height == w && src->width == h );
       jr = 1;
       jq = src->globalHeight;
@@ -267,13 +306,16 @@ utilities_FortranMatrixCopy( utilities_FortranMatrix* src, HYPRE_Int t,
 
    for ( j = 0, p = dest->value, r = src->value; j < w; j++, p += jp, r += jr )
       for ( i = 0, q = r; i < h; i++, p++, q += jq )
+      {
          *p = *q;
+      }
 }
 
 void
 utilities_FortranMatrixIndexCopy( HYPRE_Int* index,
                                   utilities_FortranMatrix* src, HYPRE_Int t,
-                                  utilities_FortranMatrix* dest ) {
+                                  utilities_FortranMatrix* dest )
+{
 
    HYPRE_BigInt i, j, h, w;
    HYPRE_BigInt jp, jq, jr;
@@ -288,27 +330,33 @@ utilities_FortranMatrixIndexCopy( HYPRE_Int* index,
 
    jp = dest->globalHeight - h;
 
-   if ( t == 0 ) {
+   if ( t == 0 )
+   {
       hypre_assert( src->height == h && src->width == w );
       jq = 1;
       jr = src->globalHeight;
    }
-   else {
+   else
+   {
       hypre_assert( src->height == w && src->width == h );
       jr = 1;
       jq = src->globalHeight;
    }
 
-   for ( j = 0, p = dest->value; j < w; j++, p += jp ) {
-      r = src->value + (index[j]-1)*jr;
+   for ( j = 0, p = dest->value; j < w; j++, p += jp )
+   {
+      r = src->value + (index[j] - 1) * jr;
       for ( i = 0, q = r; i < h; i++, p++, q += jq )
+      {
          *p = *q;
+      }
    }
 }
 
 void
 utilities_FortranMatrixSetDiagonal( utilities_FortranMatrix* mtx,
-                                    utilities_FortranMatrix* vec ) {
+                                    utilities_FortranMatrix* vec )
+{
 
    HYPRE_BigInt j, h, w, jump;
    HYPRE_Real* p;
@@ -325,13 +373,16 @@ utilities_FortranMatrixSetDiagonal( utilities_FortranMatrix* mtx,
 
    for ( j = 0, p = mtx->value, q = vec->value; j < w && j < h;
          j++, p += jump, q++ )
+   {
       *p = *q;
+   }
 
 }
 
 void
 utilities_FortranMatrixGetDiagonal( utilities_FortranMatrix* mtx,
-                                    utilities_FortranMatrix* vec ) {
+                                    utilities_FortranMatrix* vec )
+{
 
    HYPRE_BigInt j, h, w, jump;
    HYPRE_Real* p;
@@ -348,7 +399,9 @@ utilities_FortranMatrixGetDiagonal( utilities_FortranMatrix* mtx,
 
    for ( j = 0, p = mtx->value, q = vec->value; j < w && j < h;
          j++, p += jump, q++ )
+   {
       *q = *p;
+   }
 
 }
 
@@ -356,7 +409,8 @@ void
 utilities_FortranMatrixAdd( HYPRE_Real a,
                             utilities_FortranMatrix* mtxA,
                             utilities_FortranMatrix* mtxB,
-                            utilities_FortranMatrix* mtxC ) {
+                            utilities_FortranMatrix* mtxC )
+{
 
    HYPRE_BigInt i, j, h, w, jA, jB, jC;
    HYPRE_Real *pA;
@@ -379,37 +433,53 @@ utilities_FortranMatrixAdd( HYPRE_Real a,
    pB = mtxB->value;
    pC = mtxC->value;
 
-   if ( a == 0.0 ) {
-      for ( j = 0; j < w; j++ ) {
+   if ( a == 0.0 )
+   {
+      for ( j = 0; j < w; j++ )
+      {
          for ( i = 0; i < h; i++, pA++, pB++, pC++ )
+         {
             *pC = *pB;
+         }
          pA += jA;
          pB += jB;
          pC += jC;
       }
    }
-   else if ( a == 1.0 ) {
-      for ( j = 0; j < w; j++ ) {
+   else if ( a == 1.0 )
+   {
+      for ( j = 0; j < w; j++ )
+      {
          for ( i = 0; i < h; i++, pA++, pB++, pC++ )
+         {
             *pC = *pA + *pB;
+         }
          pA += jA;
          pB += jB;
          pC += jC;
       }
    }
-   else if ( a == -1.0 ) {
-      for ( j = 0; j < w; j++ ) {
+   else if ( a == -1.0 )
+   {
+      for ( j = 0; j < w; j++ )
+      {
          for ( i = 0; i < h; i++, pA++, pB++, pC++ )
+         {
             *pC = *pB - *pA;
+         }
          pA += jA;
          pB += jB;
          pC += jC;
       }
    }
-   else {
-      for ( j = 0; j < w; j++ ) {
+   else
+   {
+      for ( j = 0; j < w; j++ )
+      {
          for ( i = 0; i < h; i++, pA++, pB++, pC++ )
+         {
             *pC = *pA * a + *pB;
+         }
          pA += jA;
          pB += jB;
          pC += jC;
@@ -419,7 +489,8 @@ utilities_FortranMatrixAdd( HYPRE_Real a,
 
 void
 utilities_FortranMatrixDMultiply( utilities_FortranMatrix* vec,
-                                  utilities_FortranMatrix* mtx ) {
+                                  utilities_FortranMatrix* mtx )
+{
 
    HYPRE_BigInt i, j, h, w, jump;
    HYPRE_Real* p;
@@ -434,9 +505,12 @@ utilities_FortranMatrixDMultiply( utilities_FortranMatrix* vec,
 
    jump = mtx->globalHeight - h;
 
-   for ( j = 0, p = mtx->value; j < w; j++ ) {
+   for ( j = 0, p = mtx->value; j < w; j++ )
+   {
       for ( i = 0, q = vec->value; i < h; i++, p++, q++ )
+      {
          *p = *p * (*q);
+      }
       p += jump;
    }
 
@@ -444,7 +518,8 @@ utilities_FortranMatrixDMultiply( utilities_FortranMatrix* vec,
 
 void
 utilities_FortranMatrixMultiplyD( utilities_FortranMatrix* mtx,
-                                  utilities_FortranMatrix* vec ) {
+                                  utilities_FortranMatrix* vec )
+{
 
    HYPRE_BigInt i, j, h, w, jump;
    HYPRE_Real* p;
@@ -459,9 +534,12 @@ utilities_FortranMatrixMultiplyD( utilities_FortranMatrix* mtx,
 
    jump = mtx->globalHeight - h;
 
-   for ( j = 0, q = vec->value, p = mtx->value; j < w; j++, q++ ) {
+   for ( j = 0, q = vec->value, p = mtx->value; j < w; j++, q++ )
+   {
       for ( i = 0; i < h; i++, p++)
+      {
          *p = *p * (*q);
+      }
       p += jump;
    }
 
@@ -470,7 +548,8 @@ utilities_FortranMatrixMultiplyD( utilities_FortranMatrix* mtx,
 void
 utilities_FortranMatrixMultiply( utilities_FortranMatrix* mtxA, HYPRE_Int tA,
                                  utilities_FortranMatrix* mtxB, HYPRE_Int tB,
-                                 utilities_FortranMatrix* mtxC ) {
+                                 utilities_FortranMatrix* mtxC )
+{
    HYPRE_BigInt h, w;
    HYPRE_BigInt i, j, k, l;
    HYPRE_BigInt iA, kA;
@@ -493,26 +572,30 @@ utilities_FortranMatrixMultiply( utilities_FortranMatrix* mtxA, HYPRE_Int tA,
    iC = 1;
    jC = mtxC->globalHeight;
 
-   if ( tA == 0 ) {
+   if ( tA == 0 )
+   {
       hypre_assert( mtxA->height == h );
       l = mtxA->width;
       iA = 1;
       kA = mtxA->globalHeight;
    }
-   else {
+   else
+   {
       l = mtxA->height;
       hypre_assert( mtxA->width == h );
       kA = 1;
       iA = mtxA->globalHeight;
    }
 
-   if ( tB == 0 ) {
+   if ( tB == 0 )
+   {
       hypre_assert( mtxB->height == l );
       hypre_assert( mtxB->width == w );
       kB = 1;
       jB = mtxB->globalHeight;
    }
-   else {
+   else
+   {
       hypre_assert( mtxB->width == l );
       hypre_assert( mtxB->height == w );
       jB = 1;
@@ -522,17 +605,21 @@ utilities_FortranMatrixMultiply( utilities_FortranMatrix* mtxA, HYPRE_Int tA,
    for ( j = 0, pB0j = mtxB->value, pC0j = mtxC->value; j < w;
          j++, pB0j += jB, pC0j += jC  )
       for ( i = 0, pCij = pC0j, pAi0 = mtxA->value; i < h;
-            i++, pCij += iC, pAi0 += iA ) {
+            i++, pCij += iC, pAi0 += iA )
+      {
          s = 0.0;
          for ( k = 0, pAik = pAi0, pBkj = pB0j; k < l;
                k++, pAik += kA, pBkj += kB )
+         {
             s += *pAik * (*pBkj);
+         }
          *pCij = s;
       }
 }
 
 HYPRE_Real
-utilities_FortranMatrixFNorm( utilities_FortranMatrix* mtx ) {
+utilities_FortranMatrixFNorm( utilities_FortranMatrix* mtx )
+{
 
    HYPRE_BigInt i, j, h, w, jump;
    HYPRE_Real* p;
@@ -548,19 +635,23 @@ utilities_FortranMatrixFNorm( utilities_FortranMatrix* mtx ) {
 
    norm = 0.0;
 
-   for ( j = 0, p = mtx->value; j < w; j++ ) {
+   for ( j = 0, p = mtx->value; j < w; j++ )
+   {
       for ( i = 0; i < h; i++, p++ )
+      {
          norm += (*p) * (*p);
+      }
       p += jump;
    }
 
-   norm = sqrt(norm);
+   norm = hypre_sqrt(norm);
    return norm;
 }
 
 HYPRE_Real
 utilities_FortranMatrixValue( utilities_FortranMatrix* mtx,
-                              HYPRE_BigInt i, HYPRE_BigInt j ) {
+                              HYPRE_BigInt i, HYPRE_BigInt j )
+{
 
    HYPRE_BigInt k;
 
@@ -569,13 +660,14 @@ utilities_FortranMatrixValue( utilities_FortranMatrix* mtx,
    hypre_assert( 1 <= i && i <= mtx->height );
    hypre_assert( 1 <= j && j <= mtx->width );
 
-   k = i - 1 + (j - 1)*mtx->globalHeight;
+   k = i - 1 + (j - 1) * mtx->globalHeight;
    return mtx->value[k];
 }
 
 HYPRE_Real*
 utilities_FortranMatrixValuePtr( utilities_FortranMatrix* mtx,
-                                 HYPRE_BigInt i, HYPRE_BigInt j ) {
+                                 HYPRE_BigInt i, HYPRE_BigInt j )
+{
 
    HYPRE_BigInt k;
 
@@ -584,12 +676,13 @@ utilities_FortranMatrixValuePtr( utilities_FortranMatrix* mtx,
    hypre_assert( 1 <= i && i <= mtx->height );
    hypre_assert( 1 <= j && j <= mtx->width );
 
-   k = i - 1 + (j - 1)*mtx->globalHeight;
+   k = i - 1 + (j - 1) * mtx->globalHeight;
    return mtx->value + k;
 }
 
 HYPRE_Real
-utilities_FortranMatrixMaxValue( utilities_FortranMatrix* mtx ) {
+utilities_FortranMatrixMaxValue( utilities_FortranMatrix* mtx )
+{
 
    HYPRE_BigInt i, j, jump;
    HYPRE_BigInt h, w;
@@ -605,10 +698,13 @@ utilities_FortranMatrixMaxValue( utilities_FortranMatrix* mtx ) {
 
    maxVal = mtx->value[0];
 
-   for ( j = 0, p = mtx->value; j < w; j++ ) {
+   for ( j = 0, p = mtx->value; j < w; j++ )
+   {
       for ( i = 0; i < h; i++, p++ )
          if ( *p > maxVal )
+         {
             maxVal = *p;
+         }
       p += jump;
    }
 
@@ -619,13 +715,17 @@ void
 utilities_FortranMatrixSelectBlock( utilities_FortranMatrix* mtx,
                                     HYPRE_BigInt iFrom, HYPRE_BigInt iTo,
                                     HYPRE_BigInt jFrom, HYPRE_BigInt jTo,
-                                    utilities_FortranMatrix* block ) {
+                                    utilities_FortranMatrix* block )
+{
 
    if ( block->value != NULL && block->ownsValues )
-      hypre_TFree( block->value ,HYPRE_MEMORY_HOST);
+   {
+      hypre_TFree( block->value, HYPRE_MEMORY_HOST);
+   }
 
    block->globalHeight = mtx->globalHeight;
-   if ( iTo < iFrom || jTo < jFrom ) {
+   if ( iTo < iFrom || jTo < jFrom )
+   {
       block->height = 0;
       block->width = 0;
       block->value = NULL;
@@ -633,12 +733,13 @@ utilities_FortranMatrixSelectBlock( utilities_FortranMatrix* mtx,
    }
    block->height = iTo - iFrom + 1;
    block->width = jTo - jFrom + 1;
-   block->value = mtx->value + iFrom - 1 + (jFrom - 1)*mtx->globalHeight;
+   block->value = mtx->value + iFrom - 1 + (jFrom - 1) * mtx->globalHeight;
    block->ownsValues = 0;
 }
 
 void
-utilities_FortranMatrixUpperInv( utilities_FortranMatrix* u ) {
+utilities_FortranMatrixUpperInv( utilities_FortranMatrix* u )
+{
 
    HYPRE_BigInt i, j, k;
    HYPRE_BigInt n, jc, jd;
@@ -662,34 +763,39 @@ utilities_FortranMatrixUpperInv( utilities_FortranMatrix* u ) {
 
    pii = u->value;
    pd = diag;
-   for ( i = 0; i < n; i++, pii += jd, pd++ ) {
+   for ( i = 0; i < n; i++, pii += jd, pd++ )
+   {
       v = *pd = *pii;
-      *pii = 1.0/v;
+      *pii = 1.0 / v;
    }
 
    pii -= jd;
    pin = pii - 1;
    pii -= jd;
    pd -= 2;
-   for ( i = n - 1; i > 0; i--, pii -= jd, pin--, pd-- ) {
+   for ( i = n - 1; i > 0; i--, pii -= jd, pin--, pd-- )
+   {
       pij = pin;
-      for ( j = n; j > i; j--, pij -= jc ) {
+      for ( j = n; j > i; j--, pij -= jc )
+      {
          v = 0;
          pik = pii + jc;
          pkj = pij + 1;
-         for ( k = i + 1; k <= j; k++, pik += jc, pkj++  ) {
+         for ( k = i + 1; k <= j; k++, pik += jc, pkj++  )
+         {
             v -= (*pik) * (*pkj);
          }
-         *pij = v/(*pd);
+         *pij = v / (*pd);
       }
    }
 
-   hypre_TFree( diag ,HYPRE_MEMORY_HOST);
+   hypre_TFree( diag, HYPRE_MEMORY_HOST);
 
 }
 
 HYPRE_Int
-utilities_FortranMatrixPrint( utilities_FortranMatrix* mtx, const char *fileName) {
+utilities_FortranMatrixPrint( utilities_FortranMatrix* mtx, const char *fileName)
+{
 
    HYPRE_BigInt i, j, h, w, jump;
    HYPRE_Real* p;
@@ -697,20 +803,25 @@ utilities_FortranMatrixPrint( utilities_FortranMatrix* mtx, const char *fileName
 
    hypre_assert( mtx != NULL );
 
-   if ( !(fp = fopen(fileName,"w")) )
+   if ( !(fp = fopen(fileName, "w")) )
+   {
       return 1;
+   }
 
    h = mtx->height;
    w = mtx->width;
 
-   hypre_fprintf(fp,"%ld\n",h);
-   hypre_fprintf(fp,"%ld\n",w);
+   hypre_fprintf(fp, "%ld\n", h);
+   hypre_fprintf(fp, "%ld\n", w);
 
    jump = mtx->globalHeight - h;
 
-   for ( j = 0, p = mtx->value; j < w; j++ ) {
+   for ( j = 0, p = mtx->value; j < w; j++ )
+   {
       for ( i = 0; i < h; i++, p++ )
-         hypre_fprintf(fp,"%.14e\n",*p);
+      {
+         hypre_fprintf(fp, "%.14e\n", *p);
+      }
       p += jump;
    }
 
diff --git a/external/hypre/src/utilities/fortran_matrix.h b/external/hypre/src/utilities/fortran_matrix.h
index 2c6d1bc9..aedd800b 100644
--- a/external/hypre/src/utilities/fortran_matrix.h
+++ b/external/hypre/src/utilities/fortran_matrix.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -12,26 +12,26 @@
 
 typedef struct
 {
-  HYPRE_BigInt	globalHeight;
-  HYPRE_BigInt	height;
-  HYPRE_BigInt	width;
-  HYPRE_Real* value;
-  HYPRE_Int		ownsValues;
+   HYPRE_BigInt globalHeight;
+   HYPRE_BigInt height;
+   HYPRE_BigInt width;
+   HYPRE_Real* value;
+   HYPRE_Int    ownsValues;
 } utilities_FortranMatrix;
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-utilities_FortranMatrix* 
+utilities_FortranMatrix*
 utilities_FortranMatrixCreate(void);
-void 
-utilities_FortranMatrixAllocateData( HYPRE_BigInt h, HYPRE_BigInt w, 
-				     utilities_FortranMatrix* mtx );
-void 
-utilities_FortranMatrixWrap( HYPRE_Real*, HYPRE_BigInt gh, HYPRE_BigInt h, HYPRE_BigInt w, 
-			     utilities_FortranMatrix* mtx );
-void 
+void
+utilities_FortranMatrixAllocateData( HYPRE_BigInt h, HYPRE_BigInt w,
+                                     utilities_FortranMatrix* mtx );
+void
+utilities_FortranMatrixWrap( HYPRE_Real*, HYPRE_BigInt gh, HYPRE_BigInt h, HYPRE_BigInt w,
+                             utilities_FortranMatrix* mtx );
+void
 utilities_FortranMatrixDestroy( utilities_FortranMatrix* mtx );
 
 HYPRE_BigInt
@@ -43,65 +43,65 @@ utilities_FortranMatrixWidth( utilities_FortranMatrix* mtx );
 HYPRE_Real*
 utilities_FortranMatrixValues( utilities_FortranMatrix* mtx );
 
-void 
+void
 utilities_FortranMatrixClear( utilities_FortranMatrix* mtx );
-void 
+void
 utilities_FortranMatrixClearL( utilities_FortranMatrix* mtx );
-void 
+void
 utilities_FortranMatrixSetToIdentity( utilities_FortranMatrix* mtx );
 
-void 
+void
 utilities_FortranMatrixTransposeSquare( utilities_FortranMatrix* mtx );
-void 
+void
 utilities_FortranMatrixSymmetrize( utilities_FortranMatrix* mtx );
 
-void 
-utilities_FortranMatrixCopy( utilities_FortranMatrix* src, HYPRE_Int t, 
-			     utilities_FortranMatrix* dest );
-void 
-utilities_FortranMatrixIndexCopy( HYPRE_Int* index, 
-				  utilities_FortranMatrix* src, HYPRE_Int t, 
-				  utilities_FortranMatrix* dest );
-
-void 
-utilities_FortranMatrixSetDiagonal( utilities_FortranMatrix* mtx, 
-				    utilities_FortranMatrix* d );
-void 
-utilities_FortranMatrixGetDiagonal( utilities_FortranMatrix* mtx, 
-				    utilities_FortranMatrix* d );
-void 
-utilities_FortranMatrixAdd( HYPRE_Real a, 
-			    utilities_FortranMatrix* mtxA, 
-			    utilities_FortranMatrix* mtxB, 
-			    utilities_FortranMatrix* mtxC );
-void 
-utilities_FortranMatrixDMultiply( utilities_FortranMatrix* d, 
-				  utilities_FortranMatrix* mtx );
-void 
-utilities_FortranMatrixMultiplyD( utilities_FortranMatrix* mtx, 
-				  utilities_FortranMatrix* d );
-void 
-utilities_FortranMatrixMultiply( utilities_FortranMatrix* mtxA, HYPRE_Int tA, 
-				 utilities_FortranMatrix* mtxB, HYPRE_Int tB,
-				 utilities_FortranMatrix* mtxC );
-HYPRE_Real 
+void
+utilities_FortranMatrixCopy( utilities_FortranMatrix* src, HYPRE_Int t,
+                             utilities_FortranMatrix* dest );
+void
+utilities_FortranMatrixIndexCopy( HYPRE_Int* index,
+                                  utilities_FortranMatrix* src, HYPRE_Int t,
+                                  utilities_FortranMatrix* dest );
+
+void
+utilities_FortranMatrixSetDiagonal( utilities_FortranMatrix* mtx,
+                                    utilities_FortranMatrix* d );
+void
+utilities_FortranMatrixGetDiagonal( utilities_FortranMatrix* mtx,
+                                    utilities_FortranMatrix* d );
+void
+utilities_FortranMatrixAdd( HYPRE_Real a,
+                            utilities_FortranMatrix* mtxA,
+                            utilities_FortranMatrix* mtxB,
+                            utilities_FortranMatrix* mtxC );
+void
+utilities_FortranMatrixDMultiply( utilities_FortranMatrix* d,
+                                  utilities_FortranMatrix* mtx );
+void
+utilities_FortranMatrixMultiplyD( utilities_FortranMatrix* mtx,
+                                  utilities_FortranMatrix* d );
+void
+utilities_FortranMatrixMultiply( utilities_FortranMatrix* mtxA, HYPRE_Int tA,
+                                 utilities_FortranMatrix* mtxB, HYPRE_Int tB,
+                                 utilities_FortranMatrix* mtxC );
+HYPRE_Real
 utilities_FortranMatrixFNorm( utilities_FortranMatrix* mtx );
 
-HYPRE_Real 
-utilities_FortranMatrixValue( utilities_FortranMatrix* mtx, 
-			      HYPRE_BigInt i, HYPRE_BigInt j );
-HYPRE_Real* 
-utilities_FortranMatrixValuePtr( utilities_FortranMatrix* mtx, 
-				 HYPRE_BigInt i, HYPRE_BigInt j );
-HYPRE_Real 
+HYPRE_Real
+utilities_FortranMatrixValue( utilities_FortranMatrix* mtx,
+                              HYPRE_BigInt i, HYPRE_BigInt j );
+HYPRE_Real*
+utilities_FortranMatrixValuePtr( utilities_FortranMatrix* mtx,
+                                 HYPRE_BigInt i, HYPRE_BigInt j );
+HYPRE_Real
 utilities_FortranMatrixMaxValue( utilities_FortranMatrix* mtx );
 
-void 
+void
 utilities_FortranMatrixSelectBlock( utilities_FortranMatrix* mtx,
-				    HYPRE_BigInt iFrom, HYPRE_BigInt iTo, 
-				    HYPRE_BigInt jFrom, HYPRE_BigInt jTo,
-				    utilities_FortranMatrix* block );
-void 
+                                    HYPRE_BigInt iFrom, HYPRE_BigInt iTo,
+                                    HYPRE_BigInt jFrom, HYPRE_BigInt jTo,
+                                    utilities_FortranMatrix* block );
+void
 utilities_FortranMatrixUpperInv( utilities_FortranMatrix* u );
 
 HYPRE_Int
diff --git a/external/hypre/src/utilities/functors.h b/external/hypre/src/utilities/functors.h
new file mode 100644
index 00000000..c721696e
--- /dev/null
+++ b/external/hypre/src/utilities/functors.h
@@ -0,0 +1,100 @@
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+#ifndef HYPRE_FUNCTORS_H
+#define HYPRE_FUNCTORS_H
+
+#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+
+/*--------------------------------------------------------------------------
+ * hypreFunctor_DenseMatrixIdentity
+ *
+ * Functor for generating a dense identity matrix.
+ * This assumes that the input array "a" is zeros everywhere
+ *--------------------------------------------------------------------------*/
+
+struct hypreFunctor_DenseMatrixIdentity
+{
+   HYPRE_Int   n_;
+   HYPRE_Real *a_;
+
+   hypreFunctor_DenseMatrixIdentity(HYPRE_Int n, HYPRE_Real *a)
+   {
+      n_ = n;
+      a_ = a;
+   }
+
+   __host__ __device__ void operator()(HYPRE_Int i)
+   {
+      a_[i * n_ + i] = 1.0;
+   }
+};
+
+/*--------------------------------------------------------------------------
+ * hypreFunctor_ArrayStridedAccess
+ *
+ * Functor for performing strided data access on a templated array.
+ *
+ * The stride interval "s_" is used to access every "s_"-th element
+ * from the source array "a_".
+ *
+ * It is templated to support various data types for the array.
+ *--------------------------------------------------------------------------*/
+
+template <typename T>
+struct hypreFunctor_ArrayStridedAccess
+{
+   HYPRE_Int  s_;
+   T         *a_;
+
+   hypreFunctor_ArrayStridedAccess(HYPRE_Int s, T *a) : s_(s), a_(a) {}
+
+   __host__ __device__ T operator()(HYPRE_Int i)
+   {
+      return a_[i * s_];
+   }
+};
+
+/*--------------------------------------------------------------------------
+ * hypreFunctor_IndexStrided
+ *
+ * This functor multiplies a given index "i" by a specified stride "s_".
+ *
+ * It is templated to support various data types for the index and stride.
+ *--------------------------------------------------------------------------*/
+
+template <typename T>
+struct hypreFunctor_IndexStrided
+{
+   T s_;
+
+   hypreFunctor_IndexStrided(T s) : s_(s) {}
+
+   __host__ __device__ T operator()(const T i) const
+   {
+      return i * s_;
+   }
+};
+
+/*--------------------------------------------------------------------------
+ * hypreFunctor_IndexCycle
+ *--------------------------------------------------------------------------*/
+
+struct hypreFunctor_IndexCycle
+{
+   HYPRE_Int cycle_length;
+
+   hypreFunctor_IndexCycle(HYPRE_Int _cycle_length) : cycle_length(_cycle_length) {}
+
+   __host__ __device__ HYPRE_Int operator()(HYPRE_Int i) const
+   {
+      return i % cycle_length;
+   }
+};
+
+#endif /* if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP) */
+#endif /* ifndef HYPRE_FUNCTORS_H */
diff --git a/external/hypre/src/utilities/general.c b/external/hypre/src/utilities/general.c
index 1f132110..e6de9e48 100644
--- a/external/hypre/src/utilities/general.c
+++ b/external/hypre/src/utilities/general.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -8,22 +8,6 @@
 #include "_hypre_utilities.h"
 #include "_hypre_utilities.hpp"
 
-#ifdef HYPRE_USING_MEMORY_TRACKER
-hypre_MemoryTracker *_hypre_memory_tracker = NULL;
-
-/* accessor to the global ``_hypre_memory_tracker'' */
-hypre_MemoryTracker*
-hypre_memory_tracker()
-{
-   if (!_hypre_memory_tracker)
-   {
-      _hypre_memory_tracker = hypre_MemoryTrackerCreate();
-   }
-
-   return _hypre_memory_tracker;
-}
-#endif
-
 /* global variable _hypre_handle:
  * Outside this file, do NOT access it directly,
  * but use hypre_handle() instead (see handle.h) */
@@ -31,31 +15,46 @@ hypre_Handle *_hypre_handle = NULL;
 
 /* accessor to the global ``_hypre_handle'' */
 hypre_Handle*
-hypre_handle()
+hypre_handle(void)
 {
    if (!_hypre_handle)
    {
-      _hypre_handle = hypre_HandleCreate();
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                        "ERROR - _hypre_handle is not initialized. Calling HYPRE_Initialize(). All HYPRE_* or hypre_* function calls should occur between HYPRE_Initialize() and HYPRE_Finalize().\n");
+      HYPRE_Initialize();
    }
 
    return _hypre_handle;
 }
 
 hypre_Handle*
-hypre_HandleCreate()
+hypre_HandleCreate(void)
 {
-   hypre_Handle *hypre_handle_ = hypre_CTAlloc(hypre_Handle, 1, HYPRE_MEMORY_HOST);
+   /* Note: this allocation is done directly with calloc in order to
+      avoid a segmentation fault when building with HYPRE_USING_UMPIRE_HOST */
+   hypre_Handle *hypre_handle_ = (hypre_Handle*) calloc(1, sizeof(hypre_Handle));
 
+   hypre_HandleLogLevel(hypre_handle_) = 0;
    hypre_HandleMemoryLocation(hypre_handle_) = HYPRE_MEMORY_DEVICE;
 
-#if defined(HYPRE_USING_GPU)
+#if defined(HYPRE_USING_GPU) || defined(HYPRE_USING_DEVICE_OPENMP)
    hypre_HandleDefaultExecPolicy(hypre_handle_) = HYPRE_EXEC_DEVICE;
-   hypre_HandleStructExecPolicy(hypre_handle_) = HYPRE_EXEC_DEVICE;
-   hypre_HandleCudaData(hypre_handle_) = hypre_CudaDataCreate();
+#endif
+
+#if defined(HYPRE_USING_GPU)
+   hypre_HandleDeviceData(hypre_handle_) = hypre_DeviceDataCreate();
    /* Gauss-Seidel: SpTrSV */
    hypre_HandleDeviceGSMethod(hypre_handle_) = 1; /* CPU: 0; Cusparse: 1 */
 #endif
 
+#if defined(HYPRE_USING_GPU) || defined(HYPRE_USING_DEVICE_OPENMP)
+#if defined(HYPRE_USING_GPU_AWARE_MPI)
+   hypre_HandleUseGpuAwareMPI(hypre_handle_) = 1;
+#else
+   hypre_HandleUseGpuAwareMPI(hypre_handle_) = 0;
+#endif
+#endif
+
    return hypre_handle_;
 }
 
@@ -67,11 +66,18 @@ hypre_HandleDestroy(hypre_Handle *hypre_handle_)
       return hypre_error_flag;
    }
 
+   hypre_TFree(hypre_HandleStructCommRecvBuffer(hypre_handle_), HYPRE_MEMORY_DEVICE);
+   hypre_TFree(hypre_HandleStructCommSendBuffer(hypre_handle_), HYPRE_MEMORY_DEVICE);
 #if defined(HYPRE_USING_GPU)
-   hypre_CudaDataDestroy(hypre_HandleCudaData(hypre_handle_));
+   hypre_DeviceDataDestroy(hypre_HandleDeviceData(hypre_handle_));
+   hypre_HandleDeviceData(hypre_handle_) = NULL;
 #endif
 
-   hypre_TFree(hypre_handle_, HYPRE_MEMORY_HOST);
+   /* Deallocate error messages in error handler */
+   hypre_error_handler_clear_messages();
+
+   /* Note: Directly using free since this variable was allocated with calloc */
+   free((void*) hypre_handle_);
 
    return hypre_error_flag;
 }
@@ -79,31 +85,127 @@ hypre_HandleDestroy(hypre_Handle *hypre_handle_)
 HYPRE_Int
 hypre_SetDevice(hypre_int device_id, hypre_Handle *hypre_handle_)
 {
-
 #if defined(HYPRE_USING_DEVICE_OPENMP)
-   HYPRE_CUDA_CALL( cudaSetDevice(device_id) );
    omp_set_default_device(device_id);
-#endif
 
-#if defined(HYPRE_USING_CUDA)
+#elif defined(HYPRE_USING_CUDA)
    HYPRE_CUDA_CALL( cudaSetDevice(device_id) );
-#endif
+   hypre_HandleDevice(hypre_handle_) = device_id;
 
-#if defined(HYPRE_USING_HIP)
+#elif defined(HYPRE_USING_HIP)
    HYPRE_HIP_CALL( hipSetDevice(device_id) );
+   hypre_HandleDevice(hypre_handle_) = device_id;
+
+#elif defined(HYPRE_USING_SYCL)
+   if (hypre_handle_)
+   {
+      if (!hypre_HandleDevice(hypre_handle_))
+      {
+         /* Note: this enforces "explicit scaling," i.e. we treat each tile of a multi-tile GPU as a separate device */
+         sycl::platform platform(sycl::gpu_selector_v);
+         auto gpu_devices = platform.get_devices(sycl::info::device_type::gpu);
+         hypre_int n_devices = 0;
+         hypre_GetDeviceCount(&n_devices);
+         if (device_id >= n_devices)
+         {
+            hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                              "ERROR: SYCL device-ID exceed the number of devices on-node\n");
+         }
+
+         hypre_int local_n_devices = 0;
+         hypre_int i;
+         for (i = 0; i < gpu_devices.size(); i++)
+         {
+            if (local_n_devices == device_id)
+            {
+               hypre_HandleDevice(hypre_handle_) = new sycl::device(gpu_devices[i]);
+            }
+            local_n_devices++;
+         }
+      }
+      hypre_DeviceDataDeviceMaxWorkGroupSize(hypre_HandleDeviceData(hypre_handle_)) =
+         hypre_DeviceDataDevice(hypre_HandleDeviceData(
+                                   hypre_handle_))->get_info<sycl::info::device::max_work_group_size>();
+   }
+#else
+   HYPRE_UNUSED_VAR(device_id);
+   HYPRE_UNUSED_VAR(hypre_handle_);
 #endif
 
+   return hypre_error_flag;
+}
+
+HYPRE_Int
+hypre_GetDeviceMaxShmemSize(hypre_int  device_id,
+                            hypre_int *max_size_ptr,
+                            hypre_int *max_size_optin_ptr)
+{
+   hypre_int max_size = 0, max_size_optin = 0;
+
 #if defined(HYPRE_USING_GPU)
-   if (hypre_handle_)
+   hypre_Handle *handle = hypre_handle();
+
+   if (!hypre_HandleDeviceMaxShmemPerBlockInited(handle))
    {
-      hypre_HandleCudaDevice(hypre_handle_) = device_id;
+      if (device_id == -1)
+      {
+         hypre_GetDevice(&device_id);
+      }
+
+#if defined(HYPRE_USING_CUDA)
+      HYPRE_CUDA_CALL(cudaDeviceGetAttribute(
+                         &max_size,
+                         cudaDevAttrMaxSharedMemoryPerBlock,
+                         device_id));
+
+      HYPRE_CUDA_CALL(cudaDeviceGetAttribute(
+                         &max_size_optin,
+                         cudaDevAttrMaxSharedMemoryPerBlockOptin,
+                         device_id));
+
+#elif defined(HYPRE_USING_HIP)
+      HYPRE_HIP_CALL(hipDeviceGetAttribute(
+                        &max_size,
+                        hipDeviceAttributeMaxSharedMemoryPerBlock,
+                        device_id));
+
+#elif defined(HYPRE_USING_SYCL)
+      auto device = *hypre_HandleDevice(hypre_handle());
+      max_size = device.get_info<sycl::info::device::local_mem_size>();
+#endif
+      hypre_HandleDeviceMaxShmemPerBlock(handle)[0] = max_size;
+      hypre_HandleDeviceMaxShmemPerBlock(handle)[1] = max_size_optin;
+
+      hypre_HandleDeviceMaxShmemPerBlockInited(handle) = 1;
+   }
+
+   if (max_size_ptr)
+   {
+      *max_size_ptr = hypre_HandleDeviceMaxShmemPerBlock(handle)[0];
+   }
+
+   if (max_size_optin_ptr)
+   {
+      *max_size_optin_ptr = hypre_HandleDeviceMaxShmemPerBlock(handle)[1];
+   }
+#else /* not HYPRE_USING_GPU */
+   HYPRE_UNUSED_VAR(device_id);
+
+   if (max_size_ptr)
+   {
+      *max_size_ptr = max_size;
+   }
+
+   if (max_size_optin_ptr)
+   {
+      *max_size_optin_ptr = max_size_optin;
    }
 #endif
 
    return hypre_error_flag;
 }
 
-/* Note: it doesn't return device_id in hypre_Handle->hypre_CudaData,
+/* Note: it doesn't return device_id in hypre_Handle->hypre_DeviceData,
  *       calls API instead. But these two should match at all times
  */
 HYPRE_Int
@@ -111,14 +213,24 @@ hypre_GetDevice(hypre_int *device_id)
 {
 #if defined(HYPRE_USING_DEVICE_OPENMP)
    *device_id = omp_get_default_device();
-#endif
 
-#if defined(HYPRE_USING_CUDA)
+#elif defined(HYPRE_USING_CUDA)
    HYPRE_CUDA_CALL( cudaGetDevice(device_id) );
-#endif
 
-#if defined(HYPRE_USING_HIP)
+#elif defined(HYPRE_USING_HIP)
    HYPRE_HIP_CALL( hipGetDevice(device_id) );
+
+#elif defined(HYPRE_USING_SYCL)
+   /* Note - no sycl call to get which device is setup for use (if the user has already setup a device at all)
+    * Assume the rank/device binding below */
+   HYPRE_Int my_id;
+   hypre_int n_devices;
+   hypre_MPI_Comm_rank(hypre_MPI_COMM_WORLD, &my_id);
+   hypre_GetDeviceCount(&n_devices);
+   (*device_id) = my_id % n_devices;
+
+#else
+   *device_id = 0;
 #endif
 
    return hypre_error_flag;
@@ -129,32 +241,49 @@ hypre_GetDeviceCount(hypre_int *device_count)
 {
 #if defined(HYPRE_USING_DEVICE_OPENMP)
    *device_count = omp_get_num_devices();
-#endif
 
-#if defined(HYPRE_USING_CUDA)
+#elif defined(HYPRE_USING_CUDA)
    HYPRE_CUDA_CALL( cudaGetDeviceCount(device_count) );
-#endif
 
-#if defined(HYPRE_USING_HIP)
+#elif defined(HYPRE_USING_HIP)
    HYPRE_HIP_CALL( hipGetDeviceCount(device_count) );
+
+#elif defined(HYPRE_USING_SYCL)
+   (*device_count) = 0;
+   sycl::platform platform(sycl::gpu_selector_v);
+   auto const& gpu_devices = platform.get_devices(sycl::info::device_type::gpu);
+   HYPRE_Int i;
+   for (i = 0; i < gpu_devices.size(); i++)
+   {
+      (*device_count)++;
+   }
+
+#else
+   *device_count = 0;
 #endif
 
    return hypre_error_flag;
 }
 
 HYPRE_Int
-hypre_GetDeviceLastError()
+hypre_GetDeviceLastError(void)
 {
-#if defined(HYPRE_USING_DEVICE_OPENMP)
-   HYPRE_CUDA_CALL( cudaGetLastError() );
-#endif
-
 #if defined(HYPRE_USING_CUDA)
    HYPRE_CUDA_CALL( cudaGetLastError() );
-#endif
 
-#if defined(HYPRE_USING_HIP)
+#elif defined(HYPRE_USING_HIP)
    HYPRE_HIP_CALL( hipGetLastError() );
+
+#elif defined(HYPRE_USING_SYCL)
+   try
+   {
+      hypre_HandleComputeStream(hypre_handle())->wait_and_throw();
+   }
+   catch (sycl::exception const& e)
+   {
+      std::cout << "Caught synchronous SYCL exception:\n"
+                << e.what() << std::endl;
+   }
 #endif
 
    return hypre_error_flag;
@@ -167,22 +296,15 @@ hypre_GetDeviceLastError()
  *****************************************************************************/
 
 HYPRE_Int
-HYPRE_Init()
+HYPRE_DeviceInitialize(void)
 {
-#ifdef HYPRE_USING_MEMORY_TRACKER
-   if (!_hypre_memory_tracker)
-   {
-      _hypre_memory_tracker = hypre_MemoryTrackerCreate();
-   }
-#endif
-
-   if (!_hypre_handle)
-   {
-      _hypre_handle = hypre_HandleCreate();
-   }
+#if defined(HYPRE_USING_GPU) || defined(HYPRE_USING_DEVICE_OPENMP)
+   hypre_Handle *handle = hypre_handle();
 
-#if defined(HYPRE_USING_GPU)
+#if !defined(HYPRE_USING_SYCL)
+   /* With sycl, cannot call hypre_GetDeviceLastError() until after device and queue setup */
    hypre_GetDeviceLastError();
+#endif
 
    /* Notice: the cudaStream created is specific to the device
     * that was in effect when you created the stream.
@@ -190,290 +312,214 @@ HYPRE_Init()
     */
    hypre_int device_id;
    hypre_GetDevice(&device_id);
-   hypre_SetDevice(device_id, _hypre_handle);
+   hypre_SetDevice(device_id, handle);
+
+   hypre_GetDeviceMaxShmemSize(device_id, NULL, NULL);
+
+#if defined(HYPRE_USING_DEVICE_MALLOC_ASYNC)
+   cudaMemPool_t mempool;
+   cudaDeviceGetDefaultMemPool(&mempool, device_id);
+   uint64_t threshold = UINT64_MAX;
+   cudaMemPoolSetAttribute(mempool, cudaMemPoolAttrReleaseThreshold, &threshold);
+#endif
 
    /* To include the cost of creating streams/cudahandles in HYPRE_Init */
    /* If not here, will be done at the first use */
-   hypre_HandleCudaComputeStream(_hypre_handle);
+#if defined(HYPRE_USING_CUDA_STREAMS)
+   hypre_HandleComputeStream(handle);
+#endif
 
    /* A separate stream for prefetching */
-   //hypre_HandleCudaPrefetchStream(_hypre_handle);
-#endif // HYPRE_USING_GPU
+   //hypre_HandleCudaPrefetchStream(handle);
 
 #if defined(HYPRE_USING_CUBLAS)
-   hypre_HandleCublasHandle(_hypre_handle);
+   hypre_HandleCublasHandle(handle);
 #endif
 
 #if defined(HYPRE_USING_CUSPARSE) || defined(HYPRE_USING_ROCSPARSE)
-   hypre_HandleCusparseHandle(_hypre_handle);
+   hypre_HandleCusparseHandle(handle);
 #endif
 
 #if defined(HYPRE_USING_CURAND) || defined(HYPRE_USING_ROCRAND)
-   hypre_HandleCurandGenerator(_hypre_handle);
+   hypre_HandleCurandGenerator(handle);
 #endif
 
-   /* Check if cuda arch flags in compiling match the device */
-#if defined(HYPRE_USING_CUDA)
-   hypre_CudaCompileFlagCheck();
+#if defined(HYPRE_USING_CUSOLVER) || defined(HYPRE_USING_ROCSOLVER)
+   hypre_HandleVendorSolverHandle(handle);
 #endif
 
-#if defined(HYPRE_USING_DEVICE_OPENMP)
-   HYPRE_OMPOffloadOn();
+   /* Check if cuda arch flags in compiling match the device */
+#if defined(HYPRE_USING_CUDA) && defined(HYPRE_DEBUG)
+   hypre_CudaCompileFlagCheck();
 #endif
 
-#ifdef HYPRE_USING_DEVICE_POOL
-   /* Keep this check here at the end of HYPRE_Init()
-    * Make sure that device pool allocator has not been setup in HYPRE_Init,
+#if defined(HYPRE_USING_DEVICE_POOL)
+   /* Keep this check here at the end of HYPRE_Initialize()
+    * Make sure that device pool allocator has not been setup in HYPRE_Initialize,
     * otherwise users are not able to set all the parameters
     */
-   if ( hypre_HandleCubDevAllocator(_hypre_handle) ||
-        hypre_HandleCubUvmAllocator(_hypre_handle) )
+   if ( hypre_HandleCubDevAllocator(handle) ||
+        hypre_HandleCubUvmAllocator(handle) )
    {
       char msg[256];
       hypre_sprintf(msg, "%s %s", "ERROR: device pool allocators have been created in", __func__);
-      hypre_fprintf(stderr, "%s\n", msg);
       hypre_error_w_msg(-1, msg);
    }
 #endif
 
-#if defined(HYPRE_USING_UMPIRE)
-   hypre_UmpireInit(_hypre_handle);
-#endif
+#endif /* if defined(HYPRE_USING_GPU) || defined(HYPRE_USING_DEVICE_OPENMP) */
 
    return hypre_error_flag;
 }
 
-/******************************************************************************
- *
- * hypre finalization
- *
- *****************************************************************************/
-
 HYPRE_Int
-HYPRE_Finalize()
+HYPRE_Initialize(void)
 {
-#if defined(HYPRE_USING_UMPIRE)
-   hypre_UmpireFinalize(_hypre_handle);
-#endif
-
-   hypre_HandleDestroy(_hypre_handle);
-
-   _hypre_handle = NULL;
-
-   hypre_GetDeviceLastError();
+   /* Return if the hypre library is in initialized state */
+   if (hypre_Initialized())
+   {
+      return hypre_error_flag;
+   }
 
-#ifdef HYPRE_USING_MEMORY_TRACKER
-   hypre_PrintMemoryTracker();
-   hypre_MemoryTrackerDestroy(_hypre_memory_tracker);
+#if defined(HYPRE_USING_MEMORY_TRACKER)
+   if (!_hypre_memory_tracker)
+   {
+      _hypre_memory_tracker = hypre_MemoryTrackerCreate();
+   }
 #endif
 
-   return hypre_error_flag;
-}
+   if (!_hypre_handle)
+   {
+      _hypre_handle = hypre_HandleCreate();
+   }
 
-HYPRE_Int
-HYPRE_PrintDeviceInfo()
-{
 #if defined(HYPRE_USING_DEVICE_OPENMP)
-  hypre_int dev;
-  struct cudaDeviceProp deviceProp;
-
-  HYPRE_CUDA_CALL( cudaGetDevice(&dev) );
-  HYPRE_CUDA_CALL( cudaGetDeviceProperties(&deviceProp, dev) );
-  hypre_printf("Running on \"%s\", major %d, minor %d, total memory %.2f GB\n", deviceProp.name, deviceProp.major, deviceProp.minor, deviceProp.totalGlobalMem/1e9);
+   HYPRE_OMPOffloadOn();
 #endif
 
-#if defined(HYPRE_USING_CUDA)
-  hypre_int dev;
-  struct cudaDeviceProp deviceProp;
-
-  HYPRE_CUDA_CALL( cudaGetDevice(&dev) );
-  HYPRE_CUDA_CALL( cudaGetDeviceProperties(&deviceProp, dev) );
-  hypre_printf("Running on \"%s\", major %d, minor %d, total memory %.2f GB\n", deviceProp.name, deviceProp.major, deviceProp.minor, deviceProp.totalGlobalMem/1e9);
+#if defined(HYPRE_USING_UMPIRE)
+   hypre_UmpireInit(_hypre_handle);
 #endif
 
-#if defined(HYPRE_USING_HIP)
-  hypre_int dev;
-  hipDeviceProp_t deviceProp;
-
-  HYPRE_HIP_CALL( hipGetDevice(&dev) );
-  HYPRE_HIP_CALL( hipGetDeviceProperties(&deviceProp, dev) );
-  hypre_printf("Running on \"%s\", major %d, minor %d, total memory %.2f GB\n", deviceProp.name, deviceProp.major, deviceProp.minor, deviceProp.totalGlobalMem/1e9);
+#if defined(HYPRE_USING_MAGMA)
+   hypre_MagmaInitialize();
 #endif
 
+   /* Update library state */
+   hypre_SetInitialized();
+
    return hypre_error_flag;
 }
 
 /******************************************************************************
  *
- * hypre Umpire
+ * hypre finalization
  *
  *****************************************************************************/
 
-#if defined(HYPRE_USING_UMPIRE)
 HYPRE_Int
-hypre_UmpireInit(hypre_Handle *hypre_handle_)
+HYPRE_Finalize(void)
 {
-   umpire_resourcemanager_get_instance(&hypre_HandleUmpireResourceMan(hypre_handle_));
-
-   hypre_HandleUmpireDevicePoolSize(hypre_handle_) = 4LL * 1024 * 1024 * 1024;
-   hypre_HandleUmpireUMPoolSize(hypre_handle_)     = 4LL * 1024 * 1024 * 1024;
-   hypre_HandleUmpireHostPoolSize(hypre_handle_)   = 4LL * 1024 * 1024 * 1024;
-   hypre_HandleUmpirePinnedPoolSize(hypre_handle_) = 4LL * 1024 * 1024 * 1024;
-
-   hypre_HandleUmpireBlockSize(hypre_handle_) = 512;
-
-   strcpy(hypre_HandleUmpireDevicePoolName(hypre_handle_), "HYPRE_DEVICE_POOL");
-   strcpy(hypre_HandleUmpireUMPoolName(hypre_handle_),     "HYPRE_UM_POOL");
-   strcpy(hypre_HandleUmpireHostPoolName(hypre_handle_),   "HYPRE_HOST_POOL");
-   strcpy(hypre_HandleUmpirePinnedPoolName(hypre_handle_), "HYPRE_PINNED_POOL");
-
-   hypre_HandleOwnUmpireDevicePool(hypre_handle_) = 0;
-   hypre_HandleOwnUmpireUMPool(hypre_handle_)     = 0;
-   hypre_HandleOwnUmpireHostPool(hypre_handle_)   = 0;
-   hypre_HandleOwnUmpirePinnedPool(hypre_handle_) = 0;
-
-   return hypre_error_flag;
-}
-
-HYPRE_Int
-hypre_UmpireFinalize(hypre_Handle *hypre_handle_)
-{
-   umpire_resourcemanager *rm_ptr = &hypre_HandleUmpireResourceMan(hypre_handle_);
-   umpire_allocator allocator;
-
-#if defined(HYPRE_USING_UMPIRE_HOST)
-   if (hypre_HandleOwnUmpireHostPool(hypre_handle_))
+   /* Return if the hypre library has already been finalized */
+   if (hypre_Finalized())
    {
-      const char *pool_name = hypre_HandleUmpireHostPoolName(hypre_handle_);
-      umpire_resourcemanager_get_allocator_by_name(rm_ptr, pool_name, &allocator);
-      umpire_allocator_release(&allocator);
+      return hypre_error_flag;
    }
-#endif
 
-#if defined(HYPRE_USING_UMPIRE_DEVICE)
-   if (hypre_HandleOwnUmpireDevicePool(hypre_handle_))
-   {
-      const char *pool_name = hypre_HandleUmpireDevicePoolName(hypre_handle_);
-      umpire_resourcemanager_get_allocator_by_name(rm_ptr, pool_name, &allocator);
-      umpire_allocator_release(&allocator);
-   }
+#if defined(HYPRE_USING_UMPIRE)
+   hypre_UmpireFinalize(_hypre_handle);
 #endif
 
-#if defined(HYPRE_USING_UMPIRE_UM)
-   if (hypre_HandleOwnUmpireUMPool(hypre_handle_))
-   {
-      const char *pool_name = hypre_HandleUmpireUMPoolName(hypre_handle_);
-      umpire_resourcemanager_get_allocator_by_name(rm_ptr, pool_name, &allocator);
-      umpire_allocator_release(&allocator);
-   }
+#if defined(HYPRE_USING_MAGMA)
+   hypre_MagmaFinalize();
 #endif
 
-#if defined(HYPRE_USING_UMPIRE_PINNED)
-   if (hypre_HandleOwnUmpirePinnedPool(hypre_handle_))
-   {
-      const char *pool_name = hypre_HandleUmpirePinnedPoolName(hypre_handle_);
-      umpire_resourcemanager_get_allocator_by_name(rm_ptr, pool_name, &allocator);
-      umpire_allocator_release(&allocator);
-   }
+#if defined(HYPRE_USING_SYCL)
+   /* With sycl, cannot call hypre_GetDeviceLastError() after destroying the handle, so do it here */
+   hypre_GetDeviceLastError();
 #endif
 
-   return hypre_error_flag;
-}
-
-HYPRE_Int
-HYPRE_SetUmpireDevicePoolSize(size_t nbytes)
-{
-   hypre_HandleUmpireDevicePoolSize(hypre_handle()) = nbytes;
-
-   return hypre_error_flag;
-}
-
-HYPRE_Int
-HYPRE_SetUmpireUMPoolSize(size_t nbytes)
-{
-   hypre_HandleUmpireUMPoolSize(hypre_handle()) = nbytes;
-
-   return hypre_error_flag;
-}
-
-HYPRE_Int
-HYPRE_SetUmpireHostPoolSize(size_t nbytes)
-{
-   hypre_HandleUmpireHostPoolSize(hypre_handle()) = nbytes;
-
-   return hypre_error_flag;
-}
-
-HYPRE_Int
-HYPRE_SetUmpirePinnedPoolSize(size_t nbytes)
-{
-   hypre_HandleUmpirePinnedPoolSize(hypre_handle()) = nbytes;
+   hypre_HandleDestroy(_hypre_handle);
+   _hypre_handle = NULL;
 
-   return hypre_error_flag;
-}
+#if !defined(HYPRE_USING_SYCL)
+   hypre_GetDeviceLastError();
+#endif
 
-HYPRE_Int
-HYPRE_SetUmpireDevicePoolName(const char *pool_name)
-{
-   if (strlen(pool_name) > HYPRE_UMPIRE_POOL_NAME_MAX_LEN)
-   {
-      hypre_error_in_arg(1);
+#if defined(HYPRE_USING_MEMORY_TRACKER)
+   hypre_PrintMemoryTracker(hypre_total_bytes, hypre_peak_bytes, hypre_current_bytes,
+                            hypre_memory_tracker_print, hypre_memory_tracker_filename);
 
-      return hypre_error_flag;
-   }
+   hypre_MemoryTrackerDestroy(_hypre_memory_tracker);
+   _hypre_memory_tracker = NULL;
+#endif
 
-   strcpy(hypre_HandleUmpireDevicePoolName(hypre_handle()), pool_name);
+   /* Update library state */
+   hypre_SetFinalized();
 
    return hypre_error_flag;
 }
 
 HYPRE_Int
-HYPRE_SetUmpireUMPoolName(const char *pool_name)
+HYPRE_PrintDeviceInfo(void)
 {
-   if (strlen(pool_name) > HYPRE_UMPIRE_POOL_NAME_MAX_LEN)
-   {
-      hypre_error_in_arg(1);
+#if defined(HYPRE_USING_GPU)
+   hypre_int dev = 0;
+#endif
 
-      return hypre_error_flag;
-   }
+#if defined(HYPRE_USING_CUDA)
+   struct cudaDeviceProp deviceProp;
+
+   HYPRE_CUDA_CALL( cudaGetDevice(&dev) );
+   HYPRE_CUDA_CALL( cudaGetDeviceProperties(&deviceProp, dev) );
+   hypre_printf("Running on \"%s\", major %d, minor %d, total memory %.2f GiB\n", deviceProp.name,
+                deviceProp.major, deviceProp.minor, deviceProp.totalGlobalMem / (1 << 30));
+
+#elif defined(HYPRE_USING_HIP)
+   hipDeviceProp_t deviceProp;
+
+   HYPRE_HIP_CALL( hipGetDevice(&dev) );
+   HYPRE_HIP_CALL( hipGetDeviceProperties(&deviceProp, dev) );
+   hypre_printf("Running on \"%s\", major %d, minor %d, total memory %.2f GiB\n", deviceProp.name,
+                deviceProp.major, deviceProp.minor, deviceProp.totalGlobalMem / (1 << 30));
+
+#elif defined(HYPRE_USING_SYCL)
+   auto device = *hypre_HandleDevice(hypre_handle());
+   auto p_name = device.get_platform().get_info<sycl::info::platform::name>();
+   hypre_printf("Platform Name: %s\n", p_name.c_str());
+   auto p_version = device.get_platform().get_info<sycl::info::platform::version>();
+   hypre_printf("Platform Version: %s\n", p_version.c_str());
+   auto d_name = device.get_info<sycl::info::device::name>();
+   hypre_printf("Device Name: %s\n", d_name.c_str());
+   auto max_work_group = device.get_info<sycl::info::device::max_work_group_size>();
+   hypre_printf("Max Work Groups: %d\n", max_work_group);
+   auto max_compute_units = device.get_info<sycl::info::device::max_compute_units>();
+   hypre_printf("Max Compute Units: %d\n", max_compute_units);
+#endif
 
-   strcpy(hypre_HandleUmpireUMPoolName(hypre_handle()), pool_name);
+#if defined(HYPRE_USING_GPU)
+   hypre_int max_size = 0, max_size_optin = 0;
+   hypre_GetDeviceMaxShmemSize(dev, &max_size, &max_size_optin);
+   hypre_printf("MaxSharedMemoryPerBlock %d, MaxSharedMemoryPerBlockOptin %d\n",
+                max_size, max_size_optin);
+#endif
 
    return hypre_error_flag;
 }
 
-HYPRE_Int
-HYPRE_SetUmpireHostPoolName(const char *pool_name)
-{
-   if (strlen(pool_name) > HYPRE_UMPIRE_POOL_NAME_MAX_LEN)
-   {
-      hypre_error_in_arg(1);
-
-      return hypre_error_flag;
-   }
-
-   strcpy(hypre_HandleUmpireHostPoolName(hypre_handle()), pool_name);
-
-   return hypre_error_flag;
-}
+/*--------------------------------------------------------------------------
+ * HYPRE_MemoryPrintUsage
+ *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-HYPRE_SetUmpirePinnedPoolName(const char *pool_name)
+HYPRE_MemoryPrintUsage(MPI_Comm    comm,
+                       HYPRE_Int   level,
+                       const char *function,
+                       HYPRE_Int   line)
 {
-   if (strlen(pool_name) > HYPRE_UMPIRE_POOL_NAME_MAX_LEN)
-   {
-      hypre_error_in_arg(1);
-
-      return hypre_error_flag;
-   }
-
-   strcpy(hypre_HandleUmpirePinnedPoolName(hypre_handle()), pool_name);
-
-   return hypre_error_flag;
+   return hypre_MemoryPrintUsage(comm, level, function, line);
 }
 
-#endif /* #if defined(HYPRE_USING_UMPIRE) */
-
 /******************************************************************************
  *
  * HYPRE memory location
@@ -510,14 +556,6 @@ HYPRE_SetExecutionPolicy(HYPRE_ExecutionPolicy exec_policy)
    return hypre_error_flag;
 }
 
-HYPRE_Int
-HYPRE_SetStructExecutionPolicy(HYPRE_ExecutionPolicy exec_policy)
-{
-   hypre_HandleStructExecPolicy(hypre_handle()) = exec_policy;
-
-   return hypre_error_flag;
-}
-
 HYPRE_Int
 HYPRE_GetExecutionPolicy(HYPRE_ExecutionPolicy *exec_policy)
 {
@@ -526,11 +564,30 @@ HYPRE_GetExecutionPolicy(HYPRE_ExecutionPolicy *exec_policy)
    return hypre_error_flag;
 }
 
-HYPRE_Int
-HYPRE_GetStructExecutionPolicy(HYPRE_ExecutionPolicy *exec_policy)
+const char*
+HYPRE_GetExecutionPolicyName(HYPRE_ExecutionPolicy exec_policy)
 {
-   *exec_policy = hypre_HandleStructExecPolicy(hypre_handle());
+   switch (exec_policy)
+   {
+      case HYPRE_EXEC_HOST:
+         return "Host";
 
-   return hypre_error_flag;
+      case HYPRE_EXEC_DEVICE:
+#if defined(HYPRE_USING_GPU) || defined(HYPRE_USING_DEVICE_OPENMP)
+#if defined(HYPRE_USING_CUDA)
+         return "Device (CUDA)";
+#elif defined(HYPRE_USING_HIP)
+         return "Device (HIP)";
+#elif defined(HYPRE_USING_SYCL)
+         return "Device (SYCL)";
+#else
+         return "Device (OpenMP)";
+#endif
+#else
+         return "Host";
+#endif
+      case HYPRE_EXEC_UNDEFINED:
+      default:
+         return "Undefined";
+   }
 }
-
diff --git a/external/hypre/src/utilities/general.h b/external/hypre/src/utilities/general.h
index 8a89948f..fb48c781 100644
--- a/external/hypre/src/utilities/general.h
+++ b/external/hypre/src/utilities/general.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -14,16 +14,48 @@
 #ifndef hypre_GENERAL_HEADER
 #define hypre_GENERAL_HEADER
 
+/* #include <stdio.h> */
+/* #include <stdlib.h> */
+#include <stdint.h>
+#include <limits.h>
+#include <math.h>
+
+/*--------------------------------------------------------------------------
+ * typedefs
+ *--------------------------------------------------------------------------*/
+
 /* This allows us to consistently avoid 'int' throughout hypre */
 typedef int                    hypre_int;
 typedef long int               hypre_longint;
 typedef unsigned int           hypre_uint;
 typedef unsigned long int      hypre_ulongint;
 typedef unsigned long long int hypre_ulonglongint;
+typedef uint32_t               hypre_uint32;
+typedef uint64_t               hypre_uint64;
 
-/* This allows us to consistently avoid 'double' throughout hypre */
+/* This allows us to consistently avoid 'float' and 'double' throughout hypre */
+typedef float                  hypre_float;
 typedef double                 hypre_double;
 
+/*--------------------------------------------------------------------------
+ * Define macros
+ *--------------------------------------------------------------------------*/
+
+/* Macro for silencing unused function warning */
+#if defined(__GNUC__) || defined(__clang__)
+#define HYPRE_MAYBE_UNUSED_FUNC __attribute__((unused))
+#elif defined(_MSC_VER)
+#define HYPRE_MAYBE_UNUSED_FUNC
+#else
+#define HYPRE_MAYBE_UNUSED_FUNC
+#endif
+
+/* Macro for silencing unused variable warning */
+#define HYPRE_UNUSED_VAR(var) ((void) var)
+
+/* Macro for marking deprecated functions */
+#define HYPRE_DEPRECATED(reason) _Pragma(reason)
+
 /*--------------------------------------------------------------------------
  * Define various functions
  *--------------------------------------------------------------------------*/
@@ -47,5 +79,114 @@ typedef double                 hypre_double;
 #define hypre_pow2(i)  ( 1 << (i) )
 #endif
 
-#endif /* hypre_GENERAL_HEADER */
+#ifndef hypre_squared
+#define hypre_squared(i)  ((i) * (i))
+#endif
+
+#ifndef hypre_sqrt
+#if defined(HYPRE_SINGLE)
+#define hypre_sqrt sqrtf
+#elif defined(HYPRE_LONG_DOUBLE)
+#define hypre_sqrt sqrtl
+#else
+#define hypre_sqrt sqrt
+#endif
+#endif
+
+#ifndef hypre_pow
+#if defined(HYPRE_SINGLE)
+#define hypre_pow powf
+#elif defined(HYPRE_LONG_DOUBLE)
+#define hypre_pow powl
+#else
+#define hypre_pow pow
+#endif
+#endif
+
+/* Macro for ceiling division. It assumes non-negative dividend and positive divisor.
+   The result of this macro might need to be casted to an integer type depending on the use case */
+#ifndef hypre_ceildiv
+#define hypre_ceildiv(a, b) (((a) + (b) - 1) / (b))
+#endif
+
+#ifndef hypre_ceil
+#if defined(HYPRE_SINGLE)
+#define hypre_ceil ceilf
+#elif defined(HYPRE_LONG_DOUBLE)
+#define hypre_ceil ceill
+#else
+#define hypre_ceil ceil
+#endif
+#endif
+
+#ifndef hypre_floor
+#if defined(HYPRE_SINGLE)
+#define hypre_floor floorf
+#elif defined(HYPRE_LONG_DOUBLE)
+#define hypre_floor floorl
+#else
+#define hypre_floor floor
+#endif
+#endif
+
+#ifndef hypre_log
+#if defined(HYPRE_SINGLE)
+#define hypre_log logf
+#elif defined(HYPRE_LONG_DOUBLE)
+#define hypre_log logl
+#else
+#define hypre_log log
+#endif
+#endif
+
+#ifndef hypre_exp
+#if defined(HYPRE_SINGLE)
+#define hypre_exp expf
+#elif defined(HYPRE_LONG_DOUBLE)
+#define hypre_exp expl
+#else
+#define hypre_exp exp
+#endif
+#endif
 
+#ifndef hypre_sin
+#if defined(HYPRE_SINGLE)
+#define hypre_sin sinf
+#elif defined(HYPRE_LONG_DOUBLE)
+#define hypre_sin sinl
+#else
+#define hypre_sin sin
+#endif
+#endif
+
+#ifndef hypre_cos
+#if defined(HYPRE_SINGLE)
+#define hypre_cos cosf
+#elif defined(HYPRE_LONG_DOUBLE)
+#define hypre_cos cosl
+#else
+#define hypre_cos cos
+#endif
+#endif
+
+#ifndef hypre_atan
+#if defined(HYPRE_SINGLE)
+#define hypre_atan atanf
+#elif defined(HYPRE_LONG_DOUBLE)
+#define hypre_atan atanl
+#else
+#define hypre_atan atan
+#endif
+#endif
+
+#ifndef hypre_fmod
+#if defined(HYPRE_SINGLE)
+#define hypre_fmod fmodf
+#elif defined(HYPRE_LONG_DOUBLE)
+#define hypre_fmod fmodl
+#else
+#define hypre_fmod fmod
+#endif
+#endif
+
+#endif /* hypre_GENERAL_HEADER */
diff --git a/external/hypre/src/utilities/gselim.h b/external/hypre/src/utilities/gselim.h
index 9bffd54a..cca92ba9 100644
--- a/external/hypre/src/utilities/gselim.h
+++ b/external/hypre/src/utilities/gselim.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/utilities/handle.c b/external/hypre/src/utilities/handle.c
index 4f484080..8abaf30b 100644
--- a/external/hypre/src/utilities/handle.c
+++ b/external/hypre/src/utilities/handle.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -14,16 +14,70 @@
 #include "_hypre_utilities.h"
 #include "_hypre_utilities.hpp"
 
-/* GPU SpGemm */
+/*--------------------------------------------------------------------------
+ * hypre_SetLogLevel
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_SetLogLevel(HYPRE_Int log_level)
+{
+   hypre_HandleLogLevel(hypre_handle()) = log_level;
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_SetSpTransUseVendor
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_SetSpTransUseVendor( HYPRE_Int use_vendor )
+{
+#if defined(HYPRE_USING_GPU)
+   hypre_HandleSpTransUseVendor(hypre_handle()) = use_vendor;
+#else
+   HYPRE_UNUSED_VAR(use_vendor);
+#endif
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_SetSpMVUseVendor
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_SetSpMVUseVendor( HYPRE_Int use_vendor )
+{
+#if defined(HYPRE_USING_GPU)
+   hypre_HandleSpMVUseVendor(hypre_handle()) = use_vendor;
+#else
+   HYPRE_UNUSED_VAR(use_vendor);
+#endif
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_SetSpGemmUseVendor
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
-hypre_SetSpGemmUseCusparse( HYPRE_Int use_cusparse )
+hypre_SetSpGemmUseVendor( HYPRE_Int use_vendor )
 {
 #if defined(HYPRE_USING_GPU)
-   hypre_HandleSpgemmUseCusparse(hypre_handle()) = use_cusparse;
+   hypre_HandleSpgemmUseVendor(hypre_handle()) = use_vendor;
+#else
+   HYPRE_UNUSED_VAR(use_vendor);
 #endif
+
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_SetSpGemmAlgorithm
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_SetSpGemmAlgorithm( HYPRE_Int value )
 {
@@ -36,10 +90,33 @@ hypre_SetSpGemmAlgorithm( HYPRE_Int value )
    {
       hypre_error_in_arg(1);
    }
+#else
+   HYPRE_UNUSED_VAR(value);
 #endif
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_SetSpGemmBinned
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_SetSpGemmBinned( HYPRE_Int value )
+{
+#if defined(HYPRE_USING_GPU)
+   hypre_HandleSpgemmBinned(hypre_handle()) = value;
+#else
+   HYPRE_UNUSED_VAR(value);
+#endif
+
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_SetSpGemmRownnzEstimateMethod
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_SetSpGemmRownnzEstimateMethod( HYPRE_Int value )
 {
@@ -52,19 +129,33 @@ hypre_SetSpGemmRownnzEstimateMethod( HYPRE_Int value )
    {
       hypre_error_in_arg(1);
    }
+#else
+   HYPRE_UNUSED_VAR(value);
 #endif
+
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_SetSpGemmRownnzEstimateNSamples
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_SetSpGemmRownnzEstimateNSamples( HYPRE_Int value )
 {
 #if defined(HYPRE_USING_GPU)
    hypre_HandleSpgemmRownnzEstimateNsamples(hypre_handle()) = value;
+#else
+   HYPRE_UNUSED_VAR(value);
 #endif
+
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_SetSpGemmRownnzEstimateMultFactor
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_SetSpGemmRownnzEstimateMultFactor( HYPRE_Real value )
 {
@@ -77,59 +168,102 @@ hypre_SetSpGemmRownnzEstimateMultFactor( HYPRE_Real value )
    {
       hypre_error_in_arg(1);
    }
+#else
+   HYPRE_UNUSED_VAR(value);
 #endif
-   return hypre_error_flag;
-}
 
-HYPRE_Int
-hypre_SetSpGemmHashType( char value )
-{
-#if defined(HYPRE_USING_GPU)
-   if (value == 'L' || value == 'Q' || value == 'D')
-   {
-      hypre_HandleSpgemmHashType(hypre_handle()) = value;
-   }
-   else
-   {
-      hypre_error_in_arg(1);
-   }
-#endif
    return hypre_error_flag;
 }
 
-/* GPU Rand */
+/*--------------------------------------------------------------------------
+ * hypre_SetUseGpuRand
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_SetUseGpuRand( HYPRE_Int use_gpurand )
 {
 #if defined(HYPRE_USING_GPU)
    hypre_HandleUseGpuRand(hypre_handle()) = use_gpurand;
+#else
+   HYPRE_UNUSED_VAR(use_gpurand);
 #endif
+
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_SetGaussSeidelMethod
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_SetGaussSeidelMethod( HYPRE_Int gs_method )
 {
 #if defined(HYPRE_USING_GPU)
    hypre_HandleDeviceGSMethod(hypre_handle()) = gs_method;
+#else
+   HYPRE_UNUSED_VAR(gs_method);
 #endif
+
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_SetUserDeviceMalloc
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_SetUserDeviceMalloc(GPUMallocFunc func)
 {
 #if defined(HYPRE_USING_GPU)
    hypre_HandleUserDeviceMalloc(hypre_handle()) = func;
+#else
+   HYPRE_UNUSED_VAR(func);
 #endif
+
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_SetUserDeviceMfree
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_SetUserDeviceMfree(GPUMfreeFunc func)
 {
 #if defined(HYPRE_USING_GPU)
    hypre_HandleUserDeviceMfree(hypre_handle()) = func;
+#else
+   HYPRE_UNUSED_VAR(func);
 #endif
+
    return hypre_error_flag;
 }
+
+/*--------------------------------------------------------------------------
+ * hypre_SetGpuAwareMPI
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_SetGpuAwareMPI( HYPRE_Int use_gpu_aware_mpi )
+{
+#if defined(HYPRE_USING_GPU) || defined(HYPRE_USING_DEVICE_OPENMP)
+   hypre_HandleUseGpuAwareMPI(hypre_handle()) = use_gpu_aware_mpi;
+#else
+   HYPRE_UNUSED_VAR(use_gpu_aware_mpi);
+#endif
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_GetGpuAwareMPI
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_GetGpuAwareMPI(void)
+{
+#if defined(HYPRE_USING_GPU) || defined(HYPRE_USING_DEVICE_OPENMP)
+   return hypre_HandleUseGpuAwareMPI(hypre_handle());
+#else
+   return 0;
+#endif
+}
diff --git a/external/hypre/src/utilities/handle.h b/external/hypre/src/utilities/handle.h
index f46e5b89..7ca8c124 100644
--- a/external/hypre/src/utilities/handle.h
+++ b/external/hypre/src/utilities/handle.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -14,20 +14,50 @@
 #ifndef HYPRE_HANDLE_H
 #define HYPRE_HANDLE_H
 
-struct hypre_CudaData;
-typedef struct hypre_CudaData hypre_CudaData;
+#if defined(HYPRE_USING_UMPIRE)
+#include "umpire/config.hpp"
+#if UMPIRE_VERSION_MAJOR >= 2022
+#include "umpire/interface/c_fortran/umpire.h"
+#define hypre_umpire_resourcemanager_make_allocator_pool umpire_resourcemanager_make_allocator_quick_pool
+#else
+#include "umpire/interface/umpire.h"
+#define hypre_umpire_resourcemanager_make_allocator_pool umpire_resourcemanager_make_allocator_pool
+#endif /* UMPIRE_VERSION_MAJOR >= 2022 */
+#define HYPRE_UMPIRE_POOL_NAME_MAX_LEN 1024
+#endif /* defined(HYPRE_USING_UMPIRE) */
+
+struct hypre_DeviceData;
+typedef struct hypre_DeviceData hypre_DeviceData;
+typedef void (*GPUMallocFunc)(void **, size_t);
+typedef void (*GPUMfreeFunc)(void *);
 
 typedef struct
 {
+   HYPRE_Int              log_level;
    HYPRE_Int              hypre_error;
    HYPRE_MemoryLocation   memory_location;
    HYPRE_ExecutionPolicy  default_exec_policy;
-   HYPRE_ExecutionPolicy  struct_exec_policy;
+
+   /* the device buffers needed to do MPI communication for struct comm */
+   HYPRE_Complex         *struct_comm_recv_buffer;
+   HYPRE_Complex         *struct_comm_send_buffer;
+   HYPRE_Int              struct_comm_recv_buffer_size;
+   HYPRE_Int              struct_comm_send_buffer_size;
+
+   /* GPU MPI */
+#if defined(HYPRE_USING_GPU) || defined(HYPRE_USING_DEVICE_OPENMP)
+   HYPRE_Int              use_gpu_aware_mpi;
+#endif
+
 #if defined(HYPRE_USING_GPU)
-   hypre_CudaData        *cuda_data;
-   /* device G-S options */
-   HYPRE_Int              device_gs_method;
+   hypre_DeviceData      *device_data;
+   HYPRE_Int              device_gs_method; /* device G-S options */
 #endif
+
+   /* user malloc/free function pointers */
+   GPUMallocFunc          user_device_malloc;
+   GPUMfreeFunc           user_device_free;
+
 #if defined(HYPRE_USING_UMPIRE)
    char                   umpire_device_pool_name[HYPRE_UMPIRE_POOL_NAME_MAX_LEN];
    char                   umpire_um_pool_name[HYPRE_UMPIRE_POOL_NAME_MAX_LEN];
@@ -44,43 +74,56 @@ typedef struct
    HYPRE_Int              own_umpire_pinned_pool;
    umpire_resourcemanager umpire_rm;
 #endif
-   /* user malloc/free function pointers */
-   GPUMallocFunc          user_device_malloc;
-   GPUMfreeFunc           user_device_free;
+
+#if defined(HYPRE_USING_MAGMA)
+   magma_queue_t          magma_queue;
+#endif
 } hypre_Handle;
 
 /* accessor macros to hypre_Handle */
+#define hypre_HandleLogLevel(hypre_handle)                       ((hypre_handle) -> log_level)
 #define hypre_HandleMemoryLocation(hypre_handle)                 ((hypre_handle) -> memory_location)
 #define hypre_HandleDefaultExecPolicy(hypre_handle)              ((hypre_handle) -> default_exec_policy)
-#define hypre_HandleStructExecPolicy(hypre_handle)               ((hypre_handle) -> struct_exec_policy)
-#define hypre_HandleCudaData(hypre_handle)                       ((hypre_handle) -> cuda_data)
+
+#define hypre_HandleStructCommRecvBuffer(hypre_handle)           ((hypre_handle) -> struct_comm_recv_buffer)
+#define hypre_HandleStructCommSendBuffer(hypre_handle)           ((hypre_handle) -> struct_comm_send_buffer)
+#define hypre_HandleStructCommRecvBufferSize(hypre_handle)       ((hypre_handle) -> struct_comm_recv_buffer_size)
+#define hypre_HandleStructCommSendBufferSize(hypre_handle)       ((hypre_handle) -> struct_comm_send_buffer_size)
+
+#define hypre_HandleDeviceData(hypre_handle)                     ((hypre_handle) -> device_data)
 #define hypre_HandleDeviceGSMethod(hypre_handle)                 ((hypre_handle) -> device_gs_method)
+#define hypre_HandleUseGpuAwareMPI(hypre_handle)                 ((hypre_handle) -> use_gpu_aware_mpi)
 
-#define hypre_HandleCurandGenerator(hypre_handle)                hypre_CudaDataCurandGenerator(hypre_HandleCudaData(hypre_handle))
-#define hypre_HandleCublasHandle(hypre_handle)                   hypre_CudaDataCublasHandle(hypre_HandleCudaData(hypre_handle))
-#define hypre_HandleCusparseHandle(hypre_handle)                 hypre_CudaDataCusparseHandle(hypre_HandleCudaData(hypre_handle))
-#define hypre_HandleCudaComputeStream(hypre_handle)              hypre_CudaDataCudaComputeStream(hypre_HandleCudaData(hypre_handle))
-#define hypre_HandleCubBinGrowth(hypre_handle)                   hypre_CudaDataCubBinGrowth(hypre_HandleCudaData(hypre_handle))
-#define hypre_HandleCubMinBin(hypre_handle)                      hypre_CudaDataCubMinBin(hypre_HandleCudaData(hypre_handle))
-#define hypre_HandleCubMaxBin(hypre_handle)                      hypre_CudaDataCubMaxBin(hypre_HandleCudaData(hypre_handle))
-#define hypre_HandleCubMaxCachedBytes(hypre_handle)              hypre_CudaDataCubMaxCachedBytes(hypre_HandleCudaData(hypre_handle))
-#define hypre_HandleCubDevAllocator(hypre_handle)                hypre_CudaDataCubDevAllocator(hypre_HandleCudaData(hypre_handle))
-#define hypre_HandleCubUvmAllocator(hypre_handle)                hypre_CudaDataCubUvmAllocator(hypre_HandleCudaData(hypre_handle))
-#define hypre_HandleCudaDevice(hypre_handle)                     hypre_CudaDataCudaDevice(hypre_HandleCudaData(hypre_handle))
-#define hypre_HandleCudaComputeStreamNum(hypre_handle)           hypre_CudaDataCudaComputeStreamNum(hypre_HandleCudaData(hypre_handle))
-#define hypre_HandleCudaReduceBuffer(hypre_handle)               hypre_CudaDataCudaReduceBuffer(hypre_HandleCudaData(hypre_handle))
-#define hypre_HandleStructCommRecvBuffer(hypre_handle)           hypre_CudaDataStructCommRecvBuffer(hypre_HandleCudaData(hypre_handle))
-#define hypre_HandleStructCommSendBuffer(hypre_handle)           hypre_CudaDataStructCommSendBuffer(hypre_HandleCudaData(hypre_handle))
-#define hypre_HandleStructCommRecvBufferSize(hypre_handle)       hypre_CudaDataStructCommRecvBufferSize(hypre_HandleCudaData(hypre_handle))
-#define hypre_HandleStructCommSendBufferSize(hypre_handle)       hypre_CudaDataStructCommSendBufferSize(hypre_HandleCudaData(hypre_handle))
-#define hypre_HandleSpgemmUseCusparse(hypre_handle)              hypre_CudaDataSpgemmUseCusparse(hypre_HandleCudaData(hypre_handle))
-#define hypre_HandleSpgemmAlgorithm(hypre_handle)                hypre_CudaDataSpgemmAlgorithm(hypre_HandleCudaData(hypre_handle))
-#define hypre_HandleSpgemmRownnzEstimateMethod(hypre_handle)     hypre_CudaDataSpgemmRownnzEstimateMethod(hypre_HandleCudaData(hypre_handle))
-#define hypre_HandleSpgemmRownnzEstimateNsamples(hypre_handle)   hypre_CudaDataSpgemmRownnzEstimateNsamples(hypre_HandleCudaData(hypre_handle))
-#define hypre_HandleSpgemmRownnzEstimateMultFactor(hypre_handle) hypre_CudaDataSpgemmRownnzEstimateMultFactor(hypre_HandleCudaData(hypre_handle))
-#define hypre_HandleSpgemmHashType(hypre_handle)                 hypre_CudaDataSpgemmHashType(hypre_HandleCudaData(hypre_handle))
-#define hypre_HandleDeviceAllocator(hypre_handle)                hypre_CudaDataDeviceAllocator(hypre_HandleCudaData(hypre_handle))
-#define hypre_HandleUseGpuRand(hypre_handle)                     hypre_CudaDataUseGpuRand(hypre_HandleCudaData(hypre_handle))
+#define hypre_HandleCurandGenerator(hypre_handle)                hypre_DeviceDataCurandGenerator(hypre_HandleDeviceData(hypre_handle))
+#define hypre_HandleCublasHandle(hypre_handle)                   hypre_DeviceDataCublasHandle(hypre_HandleDeviceData(hypre_handle))
+#define hypre_HandleCusparseHandle(hypre_handle)                 hypre_DeviceDataCusparseHandle(hypre_HandleDeviceData(hypre_handle))
+#define hypre_HandleVendorSolverHandle(hypre_handle)             hypre_DeviceDataVendorSolverHandle(hypre_HandleDeviceData(hypre_handle))
+#define hypre_HandleComputeStream(hypre_handle)                  hypre_DeviceDataComputeStream(hypre_HandleDeviceData(hypre_handle))
+#define hypre_HandleCubBinGrowth(hypre_handle)                   hypre_DeviceDataCubBinGrowth(hypre_HandleDeviceData(hypre_handle))
+#define hypre_HandleCubMinBin(hypre_handle)                      hypre_DeviceDataCubMinBin(hypre_HandleDeviceData(hypre_handle))
+#define hypre_HandleCubMaxBin(hypre_handle)                      hypre_DeviceDataCubMaxBin(hypre_HandleDeviceData(hypre_handle))
+#define hypre_HandleCubMaxCachedBytes(hypre_handle)              hypre_DeviceDataCubMaxCachedBytes(hypre_HandleDeviceData(hypre_handle))
+#define hypre_HandleCubDevAllocator(hypre_handle)                hypre_DeviceDataCubDevAllocator(hypre_HandleDeviceData(hypre_handle))
+#define hypre_HandleCubUvmAllocator(hypre_handle)                hypre_DeviceDataCubUvmAllocator(hypre_HandleDeviceData(hypre_handle))
+#define hypre_HandleDevice(hypre_handle)                         hypre_DeviceDataDevice(hypre_HandleDeviceData(hypre_handle))
+#define hypre_HandleDeviceMaxWorkGroupSize(hypre_handle)         hypre_DeviceDataDeviceMaxWorkGroupSize(hypre_HandleDeviceData(hypre_handle))
+#define hypre_HandleDeviceMaxShmemPerBlock(hypre_handle)         hypre_DeviceDataDeviceMaxShmemPerBlock(hypre_HandleDeviceData(hypre_handle))
+#define hypre_HandleDeviceMaxShmemPerBlockInited(hypre_handle)   hypre_DeviceDataDeviceMaxShmemPerBlockInited(hypre_HandleDeviceData(hypre_handle))
+#define hypre_HandleComputeStreamNum(hypre_handle)               hypre_DeviceDataComputeStreamNum(hypre_HandleDeviceData(hypre_handle))
+#define hypre_HandleReduceBuffer(hypre_handle)                   hypre_DeviceDataReduceBuffer(hypre_HandleDeviceData(hypre_handle))
+#define hypre_HandleSpgemmUseVendor(hypre_handle)                hypre_DeviceDataSpgemmUseVendor(hypre_HandleDeviceData(hypre_handle))
+#define hypre_HandleSpMVUseVendor(hypre_handle)                  hypre_DeviceDataSpMVUseVendor(hypre_HandleDeviceData(hypre_handle))
+#define hypre_HandleSpTransUseVendor(hypre_handle)               hypre_DeviceDataSpTransUseVendor(hypre_HandleDeviceData(hypre_handle))
+#define hypre_HandleSpgemmAlgorithm(hypre_handle)                hypre_DeviceDataSpgemmAlgorithm(hypre_HandleDeviceData(hypre_handle))
+#define hypre_HandleSpgemmBinned(hypre_handle)                   hypre_DeviceDataSpgemmBinned(hypre_HandleDeviceData(hypre_handle))
+#define hypre_HandleSpgemmNumBin(hypre_handle)                   hypre_DeviceDataSpgemmNumBin(hypre_HandleDeviceData(hypre_handle))
+#define hypre_HandleSpgemmHighestBin(hypre_handle)               hypre_DeviceDataSpgemmHighestBin(hypre_HandleDeviceData(hypre_handle))
+#define hypre_HandleSpgemmBlockNumDim(hypre_handle)              hypre_DeviceDataSpgemmBlockNumDim(hypre_HandleDeviceData(hypre_handle))
+#define hypre_HandleSpgemmRownnzEstimateMethod(hypre_handle)     hypre_DeviceDataSpgemmRownnzEstimateMethod(hypre_HandleDeviceData(hypre_handle))
+#define hypre_HandleSpgemmRownnzEstimateNsamples(hypre_handle)   hypre_DeviceDataSpgemmRownnzEstimateNsamples(hypre_HandleDeviceData(hypre_handle))
+#define hypre_HandleSpgemmRownnzEstimateMultFactor(hypre_handle) hypre_DeviceDataSpgemmRownnzEstimateMultFactor(hypre_HandleDeviceData(hypre_handle))
+#define hypre_HandleDeviceAllocator(hypre_handle)                hypre_DeviceDataDeviceAllocator(hypre_HandleDeviceData(hypre_handle))
+#define hypre_HandleUseGpuRand(hypre_handle)                     hypre_DeviceDataUseGpuRand(hypre_HandleDeviceData(hypre_handle))
 
 #define hypre_HandleUserDeviceMalloc(hypre_handle)               ((hypre_handle) -> user_device_malloc)
 #define hypre_HandleUserDeviceMfree(hypre_handle)                ((hypre_handle) -> user_device_free)
@@ -100,4 +143,6 @@ typedef struct
 #define hypre_HandleOwnUmpireHostPool(hypre_handle)              ((hypre_handle) -> own_umpire_host_pool)
 #define hypre_HandleOwnUmpirePinnedPool(hypre_handle)            ((hypre_handle) -> own_umpire_pinned_pool)
 
+#define hypre_HandleMagmaQueue(hypre_handle)                     ((hypre_handle) -> magma_queue)
+
 #endif
diff --git a/external/hypre/src/utilities/headers b/external/hypre/src/utilities/headers
old mode 100644
new mode 100755
index 01990752..7de3d3a8
--- a/external/hypre/src/utilities/headers
+++ b/external/hypre/src/utilities/headers
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -33,23 +33,29 @@ extern "C" {
 # Structures and prototypes
 #===========================================================================
 
+cat handle.h                   >> $INTERNAL_HEADER
+cat state.h                    >> $INTERNAL_HEADER
 cat general.h                  >> $INTERNAL_HEADER
+cat base.h                     >> $INTERNAL_HEADER
+cat magma.h                    >> $INTERNAL_HEADER
+cat matrix_stats.h             >> $INTERNAL_HEADER
 cat printf.h                   >> $INTERNAL_HEADER
 cat error.h                    >> $INTERNAL_HEADER
 cat mpistubs.h                 >> $INTERNAL_HEADER
 cat smp.h                      >> $INTERNAL_HEADER
 cat memory.h                   >> $INTERNAL_HEADER
+cat memory_tracker.h           >> $INTERNAL_HEADER
 cat omp_device.h               >> $INTERNAL_HEADER
 cat threading.h                >> $INTERNAL_HEADER
 cat timing.h                   >> $INTERNAL_HEADER
 cat amg_linklist.h             >> $INTERNAL_HEADER
 cat exchange_data.h            >> $INTERNAL_HEADER
 cat caliper_instrumentation.h  >> $INTERNAL_HEADER
-cat handle.h                   >> $INTERNAL_HEADER
 cat gselim.h                   >> $INTERNAL_HEADER
 cat int_array.h                >> $INTERNAL_HEADER
 cat protos.h                   >> $INTERNAL_HEADER
 cat hopscotch_hash.h           >> $INTERNAL_HEADER
+cat mmio.h                     >> $INTERNAL_HEADER
 
 #===========================================================================
 # Include guards
@@ -79,6 +85,7 @@ cat > $INTERNAL_HEADER <<@
 #ifndef hypre_UTILITIES_HPP
 #define hypre_UTILITIES_HPP
 
+
 #ifdef __cplusplus
 extern "C++" {
 #endif
@@ -89,10 +96,12 @@ extern "C++" {
 # Structures and prototypes
 #===========================================================================
 
-cat device_allocator.h >> $INTERNAL_HEADER
-cat cuda_utils.h       >> $INTERNAL_HEADER
-cat cuda_reducer.h     >> $INTERNAL_HEADER
-cat cub_allocator.h    >> $INTERNAL_HEADER
+cat functors.h             >> $INTERNAL_HEADER
+cat predicates.h           >> $INTERNAL_HEADER
+cat device_allocator.h     >> $INTERNAL_HEADER
+cat device_utils.h         >> $INTERNAL_HEADER
+cat device_reducer.h       >> $INTERNAL_HEADER
+cat cub_allocator.h        >> $INTERNAL_HEADER
 
 #===========================================================================
 # Include guards
@@ -107,4 +116,3 @@ cat >> $INTERNAL_HEADER <<@
 #endif
 
 @
-
diff --git a/external/hypre/src/utilities/hopscotch_hash.c b/external/hypre/src/utilities/hopscotch_hash.c
index 0f58378d..b38ed35e 100644
--- a/external/hypre/src/utilities/hopscotch_hash.c
+++ b/external/hypre/src/utilities/hopscotch_hash.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -9,35 +9,36 @@
 
 static HYPRE_Int NearestPowerOfTwo( HYPRE_Int value )
 {
-  HYPRE_Int rc = 1;
-  while (rc < value) {
-    rc <<= 1;
-  }
-  return rc;
+   HYPRE_Int rc = 1;
+   while (rc < value)
+   {
+      rc <<= 1;
+   }
+   return rc;
 }
 
 static void InitBucket(hypre_HopscotchBucket *b)
 {
-  b->hopInfo = 0;
-  b->hash = HYPRE_HOPSCOTCH_HASH_EMPTY;
+   b->hopInfo = 0;
+   b->hash = HYPRE_HOPSCOTCH_HASH_EMPTY;
 }
 
 static void InitBigBucket(hypre_BigHopscotchBucket *b)
 {
-  b->hopInfo = 0;
-  b->hash = HYPRE_HOPSCOTCH_HASH_EMPTY;
+   b->hopInfo = 0;
+   b->hash = HYPRE_HOPSCOTCH_HASH_EMPTY;
 }
 
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
 static void InitSegment(hypre_HopscotchSegment *s)
 {
-  s->timestamp = 0;
-  omp_init_lock(&s->lock);
+   s->timestamp = 0;
+   omp_init_lock(&s->lock);
 }
 
 static void DestroySegment(hypre_HopscotchSegment *s)
 {
-  omp_destroy_lock(&s->lock);
+   omp_destroy_lock(&s->lock);
 }
 #endif
 
@@ -45,306 +46,306 @@ void hypre_UnorderedIntSetCreate( hypre_UnorderedIntSet *s,
                                   HYPRE_Int inCapacity,
                                   HYPRE_Int concurrencyLevel)
 {
-  s->segmentMask = NearestPowerOfTwo(concurrencyLevel) - 1;
-  if (inCapacity < s->segmentMask + 1)
-  {
-    inCapacity = s->segmentMask + 1;
-  }
+   s->segmentMask = NearestPowerOfTwo(concurrencyLevel) - 1;
+   if (inCapacity < s->segmentMask + 1)
+   {
+      inCapacity = s->segmentMask + 1;
+   }
 
-  //ADJUST INPUT ............................
-  HYPRE_Int adjInitCap = NearestPowerOfTwo(inCapacity+4096);
-  HYPRE_Int num_buckets = adjInitCap + HYPRE_HOPSCOTCH_HASH_INSERT_RANGE + 1;
-  s->bucketMask = adjInitCap - 1;
+   //ADJUST INPUT ............................
+   HYPRE_Int adjInitCap = NearestPowerOfTwo(inCapacity + 4096);
+   HYPRE_Int num_buckets = adjInitCap + HYPRE_HOPSCOTCH_HASH_INSERT_RANGE + 1;
+   s->bucketMask = adjInitCap - 1;
 
-  HYPRE_Int i;
+   HYPRE_Int i;
 
-  //ALLOCATE THE SEGMENTS ...................
+   //ALLOCATE THE SEGMENTS ...................
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-  s->segments = hypre_TAlloc(hypre_HopscotchSegment,  s->segmentMask + 1, HYPRE_MEMORY_HOST);
-  for (i = 0; i <= s->segmentMask; ++i)
-  {
-    InitSegment(&s->segments[i]);
-  }
+   s->segments = hypre_TAlloc(hypre_HopscotchSegment,  s->segmentMask + 1, HYPRE_MEMORY_HOST);
+   for (i = 0; i <= s->segmentMask; ++i)
+   {
+      InitSegment(&s->segments[i]);
+   }
 #endif
 
-  s->hopInfo = hypre_TAlloc(hypre_uint,  num_buckets, HYPRE_MEMORY_HOST);
-  s->key = hypre_TAlloc(HYPRE_Int,  num_buckets, HYPRE_MEMORY_HOST);
-  s->hash = hypre_TAlloc(HYPRE_Int,  num_buckets, HYPRE_MEMORY_HOST);
+   s->hopInfo = hypre_TAlloc(hypre_uint,  num_buckets, HYPRE_MEMORY_HOST);
+   s->key = hypre_TAlloc(HYPRE_Int,  num_buckets, HYPRE_MEMORY_HOST);
+   s->hash = hypre_TAlloc(HYPRE_Int,  num_buckets, HYPRE_MEMORY_HOST);
 
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-#pragma omp parallel for
+   #pragma omp parallel for
 #endif
-  for (i = 0; i < num_buckets; ++i)
-  {
-    s->hopInfo[i] = 0;
-    s->hash[i] = HYPRE_HOPSCOTCH_HASH_EMPTY;
-  }
+   for (i = 0; i < num_buckets; ++i)
+   {
+      s->hopInfo[i] = 0;
+      s->hash[i] = HYPRE_HOPSCOTCH_HASH_EMPTY;
+   }
 }
 
 void hypre_UnorderedBigIntSetCreate( hypre_UnorderedBigIntSet *s,
-                                  HYPRE_Int inCapacity,
-                                  HYPRE_Int concurrencyLevel)
+                                     HYPRE_Int inCapacity,
+                                     HYPRE_Int concurrencyLevel)
 {
-  s->segmentMask = NearestPowerOfTwo(concurrencyLevel) - 1;
-  if (inCapacity < s->segmentMask + 1)
-  {
-    inCapacity = s->segmentMask + 1;
-  }
+   s->segmentMask = NearestPowerOfTwo(concurrencyLevel) - 1;
+   if (inCapacity < s->segmentMask + 1)
+   {
+      inCapacity = s->segmentMask + 1;
+   }
 
-  //ADJUST INPUT ............................
-  HYPRE_Int adjInitCap = NearestPowerOfTwo(inCapacity+4096);
-  HYPRE_Int num_buckets = adjInitCap + HYPRE_HOPSCOTCH_HASH_INSERT_RANGE + 1;
-  s->bucketMask = adjInitCap - 1;
+   //ADJUST INPUT ............................
+   HYPRE_Int adjInitCap = NearestPowerOfTwo(inCapacity + 4096);
+   HYPRE_Int num_buckets = adjInitCap + HYPRE_HOPSCOTCH_HASH_INSERT_RANGE + 1;
+   s->bucketMask = adjInitCap - 1;
 
-  HYPRE_Int i;
+   HYPRE_Int i;
 
-  //ALLOCATE THE SEGMENTS ...................
+   //ALLOCATE THE SEGMENTS ...................
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-  s->segments = hypre_TAlloc(hypre_HopscotchSegment,  s->segmentMask + 1, HYPRE_MEMORY_HOST);
-  for (i = 0; i <= s->segmentMask; ++i)
-  {
-    InitSegment(&s->segments[i]);
-  }
+   s->segments = hypre_TAlloc(hypre_HopscotchSegment,  s->segmentMask + 1, HYPRE_MEMORY_HOST);
+   for (i = 0; i <= s->segmentMask; ++i)
+   {
+      InitSegment(&s->segments[i]);
+   }
 #endif
 
-  s->hopInfo = hypre_TAlloc(hypre_uint,  num_buckets, HYPRE_MEMORY_HOST);
-  s->key = hypre_TAlloc(HYPRE_BigInt,  num_buckets, HYPRE_MEMORY_HOST);
-  s->hash = hypre_TAlloc(HYPRE_BigInt,  num_buckets, HYPRE_MEMORY_HOST);
+   s->hopInfo = hypre_TAlloc(hypre_uint,  num_buckets, HYPRE_MEMORY_HOST);
+   s->key = hypre_TAlloc(HYPRE_BigInt,  num_buckets, HYPRE_MEMORY_HOST);
+   s->hash = hypre_TAlloc(HYPRE_BigInt,  num_buckets, HYPRE_MEMORY_HOST);
 
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-#pragma omp parallel for
+   #pragma omp parallel for
 #endif
-  for (i = 0; i < num_buckets; ++i)
-  {
-    s->hopInfo[i] = 0;
-    s->hash[i] = HYPRE_HOPSCOTCH_HASH_EMPTY;
-  }
+   for (i = 0; i < num_buckets; ++i)
+   {
+      s->hopInfo[i] = 0;
+      s->hash[i] = HYPRE_HOPSCOTCH_HASH_EMPTY;
+   }
 }
 
 void hypre_UnorderedIntMapCreate( hypre_UnorderedIntMap *m,
                                   HYPRE_Int inCapacity,
                                   HYPRE_Int concurrencyLevel)
 {
-  m->segmentMask = NearestPowerOfTwo(concurrencyLevel) - 1;
-  if (inCapacity < m->segmentMask + 1)
-  {
-    inCapacity = m->segmentMask + 1;
-  }
+   m->segmentMask = NearestPowerOfTwo(concurrencyLevel) - 1;
+   if (inCapacity < m->segmentMask + 1)
+   {
+      inCapacity = m->segmentMask + 1;
+   }
 
-  //ADJUST INPUT ............................
-  HYPRE_Int adjInitCap = NearestPowerOfTwo(inCapacity+4096);
-  HYPRE_Int num_buckets = adjInitCap + HYPRE_HOPSCOTCH_HASH_INSERT_RANGE + 1;
-  m->bucketMask = adjInitCap - 1;
+   //ADJUST INPUT ............................
+   HYPRE_Int adjInitCap = NearestPowerOfTwo(inCapacity + 4096);
+   HYPRE_Int num_buckets = adjInitCap + HYPRE_HOPSCOTCH_HASH_INSERT_RANGE + 1;
+   m->bucketMask = adjInitCap - 1;
 
-  HYPRE_Int i;
+   HYPRE_Int i;
 
-  //ALLOCATE THE SEGMENTS ...................
+   //ALLOCATE THE SEGMENTS ...................
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-  m->segments = hypre_TAlloc(hypre_HopscotchSegment,  m->segmentMask + 1, HYPRE_MEMORY_HOST);
-  for (i = 0; i <= m->segmentMask; i++)
-  {
-    InitSegment(&m->segments[i]);
-  }
+   m->segments = hypre_TAlloc(hypre_HopscotchSegment,  m->segmentMask + 1, HYPRE_MEMORY_HOST);
+   for (i = 0; i <= m->segmentMask; i++)
+   {
+      InitSegment(&m->segments[i]);
+   }
 #endif
 
-  m->table = hypre_TAlloc(hypre_HopscotchBucket,  num_buckets, HYPRE_MEMORY_HOST);
+   m->table = hypre_TAlloc(hypre_HopscotchBucket,  num_buckets, HYPRE_MEMORY_HOST);
 
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-#pragma omp parallel for
+   #pragma omp parallel for
 #endif
-  for (i = 0; i < num_buckets; i++)
-  {
-    InitBucket(&m->table[i]);
-  }
+   for (i = 0; i < num_buckets; i++)
+   {
+      InitBucket(&m->table[i]);
+   }
 }
 
 void hypre_UnorderedBigIntMapCreate( hypre_UnorderedBigIntMap *m,
-                                  HYPRE_Int inCapacity,
-                                  HYPRE_Int concurrencyLevel)
+                                     HYPRE_Int inCapacity,
+                                     HYPRE_Int concurrencyLevel)
 {
-  m->segmentMask = NearestPowerOfTwo(concurrencyLevel) - 1;
-  if (inCapacity < m->segmentMask + 1)
-  {
-    inCapacity = m->segmentMask + 1;
-  }
+   m->segmentMask = NearestPowerOfTwo(concurrencyLevel) - 1;
+   if (inCapacity < m->segmentMask + 1)
+   {
+      inCapacity = m->segmentMask + 1;
+   }
 
-  //ADJUST INPUT ............................
-  HYPRE_Int adjInitCap = NearestPowerOfTwo(inCapacity+4096);
-  HYPRE_Int num_buckets = adjInitCap + HYPRE_HOPSCOTCH_HASH_INSERT_RANGE + 1;
-  m->bucketMask = adjInitCap - 1;
+   //ADJUST INPUT ............................
+   HYPRE_Int adjInitCap = NearestPowerOfTwo(inCapacity + 4096);
+   HYPRE_Int num_buckets = adjInitCap + HYPRE_HOPSCOTCH_HASH_INSERT_RANGE + 1;
+   m->bucketMask = adjInitCap - 1;
 
-  HYPRE_Int i;
+   HYPRE_Int i;
 
-  //ALLOCATE THE SEGMENTS ...................
+   //ALLOCATE THE SEGMENTS ...................
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-  m->segments = hypre_TAlloc(hypre_HopscotchSegment,  m->segmentMask + 1, HYPRE_MEMORY_HOST);
-  for (i = 0; i <= m->segmentMask; i++)
-  {
-    InitSegment(&m->segments[i]);
-  }
+   m->segments = hypre_TAlloc(hypre_HopscotchSegment,  m->segmentMask + 1, HYPRE_MEMORY_HOST);
+   for (i = 0; i <= m->segmentMask; i++)
+   {
+      InitSegment(&m->segments[i]);
+   }
 #endif
 
-  m->table = hypre_TAlloc(hypre_BigHopscotchBucket,  num_buckets, HYPRE_MEMORY_HOST);
+   m->table = hypre_TAlloc(hypre_BigHopscotchBucket,  num_buckets, HYPRE_MEMORY_HOST);
 
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-#pragma omp parallel for
+   #pragma omp parallel for
 #endif
-  for (i = 0; i < num_buckets; i++)
-  {
-    InitBigBucket(&m->table[i]);
-  }
+   for (i = 0; i < num_buckets; i++)
+   {
+      InitBigBucket(&m->table[i]);
+   }
 }
 
 void hypre_UnorderedIntSetDestroy( hypre_UnorderedIntSet *s )
 {
-  hypre_TFree(s->hopInfo, HYPRE_MEMORY_HOST);
-  hypre_TFree(s->key, HYPRE_MEMORY_HOST);
-  hypre_TFree(s->hash, HYPRE_MEMORY_HOST);
+   hypre_TFree(s->hopInfo, HYPRE_MEMORY_HOST);
+   hypre_TFree(s->key, HYPRE_MEMORY_HOST);
+   hypre_TFree(s->hash, HYPRE_MEMORY_HOST);
 
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-  HYPRE_Int i;
-  for (i = 0; i <= s->segmentMask; i++)
-  {
-    DestroySegment(&s->segments[i]);
-  }
-  hypre_TFree(s->segments, HYPRE_MEMORY_HOST);
+   HYPRE_Int i;
+   for (i = 0; i <= s->segmentMask; i++)
+   {
+      DestroySegment(&s->segments[i]);
+   }
+   hypre_TFree(s->segments, HYPRE_MEMORY_HOST);
 #endif
 }
 
 void hypre_UnorderedBigIntSetDestroy( hypre_UnorderedBigIntSet *s )
 {
-  hypre_TFree(s->hopInfo, HYPRE_MEMORY_HOST);
-  hypre_TFree(s->key, HYPRE_MEMORY_HOST);
-  hypre_TFree(s->hash, HYPRE_MEMORY_HOST);
+   hypre_TFree(s->hopInfo, HYPRE_MEMORY_HOST);
+   hypre_TFree(s->key, HYPRE_MEMORY_HOST);
+   hypre_TFree(s->hash, HYPRE_MEMORY_HOST);
 
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-  HYPRE_Int i;
-  for (i = 0; i <= s->segmentMask; i++)
-  {
-    DestroySegment(&s->segments[i]);
-  }
-  hypre_TFree(s->segments, HYPRE_MEMORY_HOST);
+   HYPRE_Int i;
+   for (i = 0; i <= s->segmentMask; i++)
+   {
+      DestroySegment(&s->segments[i]);
+   }
+   hypre_TFree(s->segments, HYPRE_MEMORY_HOST);
 #endif
 }
 
 void hypre_UnorderedIntMapDestroy( hypre_UnorderedIntMap *m)
 {
-  hypre_TFree(m->table, HYPRE_MEMORY_HOST);
+   hypre_TFree(m->table, HYPRE_MEMORY_HOST);
 
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-  HYPRE_Int i;
-  for (i = 0; i <= m->segmentMask; i++)
-  {
-    DestroySegment(&m->segments[i]);
-  }
-  hypre_TFree(m->segments, HYPRE_MEMORY_HOST);
+   HYPRE_Int i;
+   for (i = 0; i <= m->segmentMask; i++)
+   {
+      DestroySegment(&m->segments[i]);
+   }
+   hypre_TFree(m->segments, HYPRE_MEMORY_HOST);
 #endif
 }
 
 void hypre_UnorderedBigIntMapDestroy( hypre_UnorderedBigIntMap *m)
 {
-  hypre_TFree(m->table, HYPRE_MEMORY_HOST);
+   hypre_TFree(m->table, HYPRE_MEMORY_HOST);
 
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-  HYPRE_Int i;
-  for (i = 0; i <= m->segmentMask; i++)
-  {
-    DestroySegment(&m->segments[i]);
-  }
-  hypre_TFree(m->segments, HYPRE_MEMORY_HOST);
+   HYPRE_Int i;
+   for (i = 0; i <= m->segmentMask; i++)
+   {
+      DestroySegment(&m->segments[i]);
+   }
+   hypre_TFree(m->segments, HYPRE_MEMORY_HOST);
 #endif
 }
 
 HYPRE_Int *hypre_UnorderedIntSetCopyToArray( hypre_UnorderedIntSet *s, HYPRE_Int *len )
 {
-  /*HYPRE_Int prefix_sum_workspace[hypre_NumThreads() + 1];*/
-  HYPRE_Int *prefix_sum_workspace;
-  HYPRE_Int *ret_array = NULL;
+   /*HYPRE_Int prefix_sum_workspace[hypre_NumThreads() + 1];*/
+   HYPRE_Int *prefix_sum_workspace;
+   HYPRE_Int *ret_array = NULL;
 
-  prefix_sum_workspace = hypre_TAlloc(HYPRE_Int,  hypre_NumThreads() + 1, HYPRE_MEMORY_HOST);
+   prefix_sum_workspace = hypre_TAlloc(HYPRE_Int,  hypre_NumThreads() + 1, HYPRE_MEMORY_HOST);
 
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-#pragma omp parallel
+   #pragma omp parallel
 #endif
-  {
-    HYPRE_Int n = s->bucketMask + HYPRE_HOPSCOTCH_HASH_INSERT_RANGE;
-    HYPRE_Int i_begin, i_end;
-    hypre_GetSimpleThreadPartition(&i_begin, &i_end, n);
+   {
+      HYPRE_Int n = s->bucketMask + HYPRE_HOPSCOTCH_HASH_INSERT_RANGE;
+      HYPRE_Int i_begin, i_end;
+      hypre_GetSimpleThreadPartition(&i_begin, &i_end, n);
 
-    HYPRE_Int cnt = 0;
-    HYPRE_Int i;
-    for (i = i_begin; i < i_end; i++)
-    {
-      if (HYPRE_HOPSCOTCH_HASH_EMPTY != s->hash[i]) cnt++;
-    }
+      HYPRE_Int cnt = 0;
+      HYPRE_Int i;
+      for (i = i_begin; i < i_end; i++)
+      {
+         if (HYPRE_HOPSCOTCH_HASH_EMPTY != s->hash[i]) { cnt++; }
+      }
 
-    hypre_prefix_sum(&cnt, len, prefix_sum_workspace);
+      hypre_prefix_sum(&cnt, len, prefix_sum_workspace);
 
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-#pragma omp barrier
-#pragma omp master
+      #pragma omp barrier
+      #pragma omp master
 #endif
-    {
-      ret_array = hypre_TAlloc(HYPRE_Int,  *len, HYPRE_MEMORY_HOST);
-    }
+      {
+         ret_array = hypre_TAlloc(HYPRE_Int,  *len, HYPRE_MEMORY_HOST);
+      }
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-#pragma omp barrier
+      #pragma omp barrier
 #endif
 
-    for (i = i_begin; i < i_end; i++)
-    {
-      if (HYPRE_HOPSCOTCH_HASH_EMPTY != s->hash[i]) ret_array[cnt++] = s->key[i];
-    }
-  }
+      for (i = i_begin; i < i_end; i++)
+      {
+         if (HYPRE_HOPSCOTCH_HASH_EMPTY != s->hash[i]) { ret_array[cnt++] = s->key[i]; }
+      }
+   }
 
-  hypre_TFree(prefix_sum_workspace, HYPRE_MEMORY_HOST);
+   hypre_TFree(prefix_sum_workspace, HYPRE_MEMORY_HOST);
 
-  return ret_array;
+   return ret_array;
 }
 
 HYPRE_BigInt *hypre_UnorderedBigIntSetCopyToArray( hypre_UnorderedBigIntSet *s, HYPRE_Int *len )
 {
-  /*HYPRE_Int prefix_sum_workspace[hypre_NumThreads() + 1];*/
-  HYPRE_Int *prefix_sum_workspace;
-  HYPRE_BigInt *ret_array = NULL;
+   /*HYPRE_Int prefix_sum_workspace[hypre_NumThreads() + 1];*/
+   HYPRE_Int *prefix_sum_workspace;
+   HYPRE_BigInt *ret_array = NULL;
 
-  prefix_sum_workspace = hypre_TAlloc(HYPRE_Int,  hypre_NumThreads() + 1, HYPRE_MEMORY_HOST);
+   prefix_sum_workspace = hypre_TAlloc(HYPRE_Int,  hypre_NumThreads() + 1, HYPRE_MEMORY_HOST);
 
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-#pragma omp parallel
+   #pragma omp parallel
 #endif
-  {
-    HYPRE_Int n = s->bucketMask + HYPRE_HOPSCOTCH_HASH_INSERT_RANGE;
-    HYPRE_Int i_begin, i_end;
-    hypre_GetSimpleThreadPartition(&i_begin, &i_end, n);
+   {
+      HYPRE_Int n = s->bucketMask + HYPRE_HOPSCOTCH_HASH_INSERT_RANGE;
+      HYPRE_Int i_begin, i_end;
+      hypre_GetSimpleThreadPartition(&i_begin, &i_end, n);
 
-    HYPRE_Int cnt = 0;
-    HYPRE_Int i;
-    for (i = i_begin; i < i_end; i++)
-    {
-      if (HYPRE_HOPSCOTCH_HASH_EMPTY != s->hash[i]) cnt++;
-    }
+      HYPRE_Int cnt = 0;
+      HYPRE_Int i;
+      for (i = i_begin; i < i_end; i++)
+      {
+         if (HYPRE_HOPSCOTCH_HASH_EMPTY != s->hash[i]) { cnt++; }
+      }
 
-    hypre_prefix_sum(&cnt, len, prefix_sum_workspace);
+      hypre_prefix_sum(&cnt, len, prefix_sum_workspace);
 
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-#pragma omp barrier
-#pragma omp master
+      #pragma omp barrier
+      #pragma omp master
 #endif
-    {
-      ret_array = hypre_TAlloc(HYPRE_BigInt,  *len, HYPRE_MEMORY_HOST);
-    }
+      {
+         ret_array = hypre_TAlloc(HYPRE_BigInt,  *len, HYPRE_MEMORY_HOST);
+      }
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-#pragma omp barrier
+      #pragma omp barrier
 #endif
 
-    for (i = i_begin; i < i_end; i++)
-    {
-      if (HYPRE_HOPSCOTCH_HASH_EMPTY != s->hash[i]) ret_array[cnt++] = s->key[i];
-    }
-  }
+      for (i = i_begin; i < i_end; i++)
+      {
+         if (HYPRE_HOPSCOTCH_HASH_EMPTY != s->hash[i]) { ret_array[cnt++] = s->key[i]; }
+      }
+   }
 
-  hypre_TFree(prefix_sum_workspace, HYPRE_MEMORY_HOST);
+   hypre_TFree(prefix_sum_workspace, HYPRE_MEMORY_HOST);
 
-  return ret_array;
+   return ret_array;
 }
diff --git a/external/hypre/src/utilities/hopscotch_hash.h b/external/hypre/src/utilities/hopscotch_hash.h
index 22bde2bb..32e9e1ed 100644
--- a/external/hypre/src/utilities/hopscotch_hash.h
+++ b/external/hypre/src/utilities/hopscotch_hash.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -47,13 +47,13 @@
 #include <string.h>
 #include <stdio.h>
 #include <limits.h>
-#include <math.h>
+//#include <math.h>
 
 #ifdef HYPRE_USING_OPENMP
 #include <omp.h>
 #endif
 
-#include "_hypre_utilities.h"
+//#include "_hypre_utilities.h"
 
 // Potentially architecture specific features used here:
 // __sync_val_compare_and_swap
@@ -70,36 +70,36 @@ extern "C" {
  ******************************************************************************/
 
 #ifdef HYPRE_USING_ATOMIC
-static inline HYPRE_Int
+static inline HYPRE_MAYBE_UNUSED_FUNC HYPRE_Int
 hypre_compare_and_swap( HYPRE_Int *ptr, HYPRE_Int oldval, HYPRE_Int newval )
 {
 #if defined(__GNUC__) && defined(__GNUC_MINOR__) && defined(__GNUC_PATCHLEVEL__) && (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) > 40100
-  return __sync_val_compare_and_swap(ptr, oldval, newval);
-//#elif defind _MSC_VER
-  //return _InterlockedCompareExchange((long *)ptr, newval, oldval);
-//#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L && !defined(__STDC_NO_ATOMICS__)
-// JSP: not many compilers have implemented this, so comment out for now
-  //_Atomic HYPRE_Int *atomic_ptr = ptr;
-  //atomic_compare_exchange_strong(atomic_ptr, &oldval, newval);
-  //return oldval;
+   return __sync_val_compare_and_swap(ptr, oldval, newval);
+   //#elif defind _MSC_VER
+   //return _InterlockedCompareExchange((long *)ptr, newval, oldval);
+   //#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L && !defined(__STDC_NO_ATOMICS__)
+   // JSP: not many compilers have implemented this, so comment out for now
+   //_Atomic HYPRE_Int *atomic_ptr = ptr;
+   //atomic_compare_exchange_strong(atomic_ptr, &oldval, newval);
+   //return oldval;
 #endif
 }
 
-static inline HYPRE_Int
+static inline HYPRE_MAYBE_UNUSED_FUNC HYPRE_Int
 hypre_fetch_and_add( HYPRE_Int *ptr, HYPRE_Int value )
 {
 #if defined(__GNUC__) && defined(__GNUC_MINOR__) && defined(__GNUC_PATCHLEVEL__) && (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) > 40100
-  return __sync_fetch_and_add(ptr, value);
-//#elif defined _MSC_VER
-  //return _InterlockedExchangeAdd((long *)ptr, value);
-//#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L && !defined(__STDC_NO_ATOMICS__)
-// JSP: not many compilers have implemented this, so comment out for now
-  //_Atomic HYPRE_Int *atomic_ptr = ptr;
-  //return atomic_fetch_add(atomic_ptr, value);
+   return __sync_fetch_and_add(ptr, value);
+   //#elif defined _MSC_VER
+   //return _InterlockedExchangeAdd((long *)ptr, value);
+   //#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L && !defined(__STDC_NO_ATOMICS__)
+   // JSP: not many compilers have implemented this, so comment out for now
+   //_Atomic HYPRE_Int *atomic_ptr = ptr;
+   //return atomic_fetch_add(atomic_ptr, value);
 #endif
 }
 #else // !HYPRE_USING_ATOMIC
-static inline HYPRE_Int
+static inline HYPRE_MAYBE_UNUSED_FUNC HYPRE_Int
 hypre_compare_and_swap( HYPRE_Int *ptr, HYPRE_Int oldval, HYPRE_Int newval )
 {
    if (*ptr == oldval)
@@ -107,10 +107,10 @@ hypre_compare_and_swap( HYPRE_Int *ptr, HYPRE_Int oldval, HYPRE_Int newval )
       *ptr = newval;
       return oldval;
    }
-   else return *ptr;
+   else { return *ptr; }
 }
 
-static inline HYPRE_Int
+static inline HYPRE_MAYBE_UNUSED_FUNC HYPRE_Int
 hypre_fetch_and_add( HYPRE_Int *ptr, HYPRE_Int value )
 {
    HYPRE_Int oldval = *ptr;
@@ -129,7 +129,7 @@ hypre_fetch_and_add( HYPRE_Int *ptr, HYPRE_Int value )
 #define HYPRE_HOPSCOTCH_HASH_BUSY  (1)
 
 // Small Utilities ..........................................................
-static inline HYPRE_Int
+static inline HYPRE_MAYBE_UNUSED_FUNC HYPRE_Int
 first_lsb_bit_indx( hypre_uint x )
 {
    HYPRE_Int pos;
@@ -206,181 +206,189 @@ first_lsb_bit_indx( hypre_uint x )
 #define HYPRE_XXH_rotl64(x,r) ((x << r) | (x >> (64 - r)))
 
 #if defined(HYPRE_MIXEDINT) || defined(HYPRE_BIGINT)
-static inline HYPRE_BigInt
+static inline HYPRE_MAYBE_UNUSED_FUNC HYPRE_BigInt
 hypre_BigHash( HYPRE_BigInt input )
 {
-    hypre_ulongint h64 = HYPRE_XXH_PRIME64_5 + sizeof(input);
+   hypre_ulonglongint h64 = HYPRE_XXH_PRIME64_5 + sizeof(input);
 
-    hypre_ulongint k1 = input;
-    k1 *= HYPRE_XXH_PRIME64_2;
-    k1 = HYPRE_XXH_rotl64(k1, 31);
-    k1 *= HYPRE_XXH_PRIME64_1;
-    h64 ^= k1;
-    h64 = HYPRE_XXH_rotl64(h64, 27)*HYPRE_XXH_PRIME64_1 + HYPRE_XXH_PRIME64_4;
+   hypre_ulonglongint k1 = input;
+   k1 *= HYPRE_XXH_PRIME64_2;
+   k1 = HYPRE_XXH_rotl64(k1, 31);
+   k1 *= HYPRE_XXH_PRIME64_1;
+   h64 ^= k1;
+   h64 = HYPRE_XXH_rotl64(h64, 27) * HYPRE_XXH_PRIME64_1 + HYPRE_XXH_PRIME64_4;
 
-    h64 ^= h64 >> 33;
-    h64 *= HYPRE_XXH_PRIME64_2;
-    h64 ^= h64 >> 29;
-    h64 *= HYPRE_XXH_PRIME64_3;
-    h64 ^= h64 >> 32;
+   h64 ^= h64 >> 33;
+   h64 *= HYPRE_XXH_PRIME64_2;
+   h64 ^= h64 >> 29;
+   h64 *= HYPRE_XXH_PRIME64_3;
+   h64 ^= h64 >> 32;
 
 #ifndef NDEBUG
-    if (HYPRE_HOPSCOTCH_HASH_EMPTY == h64) {
+   if (HYPRE_HOPSCOTCH_HASH_EMPTY == h64)
+   {
       hypre_printf("hash(%lld) = %d\n", h64, HYPRE_HOPSCOTCH_HASH_EMPTY);
       hypre_assert(HYPRE_HOPSCOTCH_HASH_EMPTY != h64);
-    }
+   }
 #endif
 
-    return h64;
+   return h64;
 }
 
 #else
-static inline HYPRE_Int
+static inline HYPRE_MAYBE_UNUSED_FUNC HYPRE_Int
 hypre_BigHash(HYPRE_Int input)
 {
-    hypre_uint h32 = HYPRE_XXH_PRIME32_5 + sizeof(input);
+   hypre_uint h32 = HYPRE_XXH_PRIME32_5 + sizeof(input);
 
-    // 1665863975 is added to input so that
-    // only -1073741824 gives HYPRE_HOPSCOTCH_HASH_EMPTY.
-    // Hence, we're fine as long as key is non-negative.
-    h32 += (input + 1665863975)*HYPRE_XXH_PRIME32_3;
-    h32 = HYPRE_XXH_rotl32(h32, 17)*HYPRE_XXH_PRIME32_4;
+   // 1665863975 is added to input so that
+   // only -1073741824 gives HYPRE_HOPSCOTCH_HASH_EMPTY.
+   // Hence, we're fine as long as key is non-negative.
+   h32 += (input + 1665863975) * HYPRE_XXH_PRIME32_3;
+   h32 = HYPRE_XXH_rotl32(h32, 17) * HYPRE_XXH_PRIME32_4;
 
-    h32 ^= h32 >> 15;
-    h32 *= HYPRE_XXH_PRIME32_2;
-    h32 ^= h32 >> 13;
-    h32 *= HYPRE_XXH_PRIME32_3;
-    h32 ^= h32 >> 16;
+   h32 ^= h32 >> 15;
+   h32 *= HYPRE_XXH_PRIME32_2;
+   h32 ^= h32 >> 13;
+   h32 *= HYPRE_XXH_PRIME32_3;
+   h32 ^= h32 >> 16;
 
-    //hypre_assert(HYPRE_HOPSCOTCH_HASH_EMPTY != h32);
+   //hypre_assert(HYPRE_HOPSCOTCH_HASH_EMPTY != h32);
 
-    return h32;
+   return h32;
 }
 #endif
 
 #ifdef HYPRE_BIGINT
-static inline HYPRE_Int
+static inline HYPRE_MAYBE_UNUSED_FUNC HYPRE_Int
 hypre_Hash(HYPRE_Int input)
 {
-    hypre_ulongint h64 = HYPRE_XXH_PRIME64_5 + sizeof(input);
+   hypre_ulonglongint h64 = HYPRE_XXH_PRIME64_5 + sizeof(input);
 
-    hypre_ulongint k1 = input;
-    k1 *= HYPRE_XXH_PRIME64_2;
-    k1 = HYPRE_XXH_rotl64(k1, 31);
-    k1 *= HYPRE_XXH_PRIME64_1;
-    h64 ^= k1;
-    h64 = HYPRE_XXH_rotl64(h64, 27)*HYPRE_XXH_PRIME64_1 + HYPRE_XXH_PRIME64_4;
+   hypre_ulonglongint k1 = input;
+   k1 *= HYPRE_XXH_PRIME64_2;
+   k1 = HYPRE_XXH_rotl64(k1, 31);
+   k1 *= HYPRE_XXH_PRIME64_1;
+   h64 ^= k1;
+   h64 = HYPRE_XXH_rotl64(h64, 27) * HYPRE_XXH_PRIME64_1 + HYPRE_XXH_PRIME64_4;
 
-    h64 ^= h64 >> 33;
-    h64 *= HYPRE_XXH_PRIME64_2;
-    h64 ^= h64 >> 29;
-    h64 *= HYPRE_XXH_PRIME64_3;
-    h64 ^= h64 >> 32;
+   h64 ^= h64 >> 33;
+   h64 *= HYPRE_XXH_PRIME64_2;
+   h64 ^= h64 >> 29;
+   h64 *= HYPRE_XXH_PRIME64_3;
+   h64 ^= h64 >> 32;
 
 #ifndef NDEBUG
-    if (HYPRE_HOPSCOTCH_HASH_EMPTY == h64) {
+   if (HYPRE_HOPSCOTCH_HASH_EMPTY == h64)
+   {
       hypre_printf("hash(%lld) = %d\n", h64, HYPRE_HOPSCOTCH_HASH_EMPTY);
       hypre_assert(HYPRE_HOPSCOTCH_HASH_EMPTY != h64);
-    }
+   }
 #endif
 
-    return h64;
+   return h64;
 }
 
 #else
-static inline HYPRE_Int
+static inline HYPRE_MAYBE_UNUSED_FUNC HYPRE_Int
 hypre_Hash(HYPRE_Int input)
 {
-    hypre_uint h32 = HYPRE_XXH_PRIME32_5 + sizeof(input);
+   hypre_uint h32 = HYPRE_XXH_PRIME32_5 + sizeof(input);
 
-    // 1665863975 is added to input so that
-    // only -1073741824 gives HYPRE_HOPSCOTCH_HASH_EMPTY.
-    // Hence, we're fine as long as key is non-negative.
-    h32 += (input + 1665863975)*HYPRE_XXH_PRIME32_3;
-    h32 = HYPRE_XXH_rotl32(h32, 17)*HYPRE_XXH_PRIME32_4;
+   // 1665863975 is added to input so that
+   // only -1073741824 gives HYPRE_HOPSCOTCH_HASH_EMPTY.
+   // Hence, we're fine as long as key is non-negative.
+   h32 += (input + 1665863975) * HYPRE_XXH_PRIME32_3;
+   h32 = HYPRE_XXH_rotl32(h32, 17) * HYPRE_XXH_PRIME32_4;
 
-    h32 ^= h32 >> 15;
-    h32 *= HYPRE_XXH_PRIME32_2;
-    h32 ^= h32 >> 13;
-    h32 *= HYPRE_XXH_PRIME32_3;
-    h32 ^= h32 >> 16;
+   h32 ^= h32 >> 15;
+   h32 *= HYPRE_XXH_PRIME32_2;
+   h32 ^= h32 >> 13;
+   h32 *= HYPRE_XXH_PRIME32_3;
+   h32 ^= h32 >> 16;
 
-    //hypre_assert(HYPRE_HOPSCOTCH_HASH_EMPTY != h32);
+   //hypre_assert(HYPRE_HOPSCOTCH_HASH_EMPTY != h32);
 
-    return h32;
+   return h32;
 }
 #endif
 
-static inline void
- hypre_UnorderedIntSetFindCloserFreeBucket( hypre_UnorderedIntSet *s,
+static inline HYPRE_MAYBE_UNUSED_FUNC void
+hypre_UnorderedIntSetFindCloserFreeBucket( hypre_UnorderedIntSet *s,
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-                                            hypre_HopscotchSegment *start_seg,
+                                           hypre_HopscotchSegment *start_seg,
 #endif
-                                            HYPRE_Int *free_bucket,
-                                            HYPRE_Int *free_dist )
+                                           HYPRE_Int *free_bucket,
+                                           HYPRE_Int *free_dist )
 {
-  HYPRE_Int move_bucket = *free_bucket - (HYPRE_HOPSCOTCH_HASH_HOP_RANGE - 1);
-  HYPRE_Int move_free_dist;
-  for (move_free_dist = HYPRE_HOPSCOTCH_HASH_HOP_RANGE - 1; move_free_dist > 0; --move_free_dist)
-  {
-    hypre_uint start_hop_info = s->hopInfo[move_bucket];
-    HYPRE_Int move_new_free_dist = -1;
-    hypre_uint mask = 1;
-    HYPRE_Int i;
-    for (i = 0; i < move_free_dist; ++i, mask <<= 1)
-    {
-      if (mask & start_hop_info)
+   HYPRE_Int move_bucket = *free_bucket - (HYPRE_HOPSCOTCH_HASH_HOP_RANGE - 1);
+   HYPRE_Int move_free_dist;
+   for (move_free_dist = HYPRE_HOPSCOTCH_HASH_HOP_RANGE - 1; move_free_dist > 0; --move_free_dist)
+   {
+      hypre_uint start_hop_info = s->hopInfo[move_bucket];
+      HYPRE_Int move_new_free_dist = -1;
+      hypre_uint mask = 1;
+      HYPRE_Int i;
+      for (i = 0; i < move_free_dist; ++i, mask <<= 1)
       {
-        move_new_free_dist = i;
-        break;
+         if (mask & start_hop_info)
+         {
+            move_new_free_dist = i;
+            break;
+         }
       }
-    }
-    if (-1 != move_new_free_dist)
-    {
+      if (-1 != move_new_free_dist)
+      {
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-      hypre_HopscotchSegment*  move_segment = &(s->segments[move_bucket & s->segmentMask]);
+         hypre_HopscotchSegment*  move_segment = &(s->segments[move_bucket & s->segmentMask]);
 
-      if(start_seg != move_segment)
-        omp_set_lock(&move_segment->lock);
+         if (start_seg != move_segment)
+         {
+            omp_set_lock(&move_segment->lock);
+         }
 #endif
 
-      if (start_hop_info == s->hopInfo[move_bucket])
-      {
-        // new_free_bucket -> free_bucket and empty new_free_bucket
-        HYPRE_Int new_free_bucket = move_bucket + move_new_free_dist;
-        s->key[*free_bucket]  = s->key[new_free_bucket];
-        s->hash[*free_bucket] = s->hash[new_free_bucket];
+         if (start_hop_info == s->hopInfo[move_bucket])
+         {
+            // new_free_bucket -> free_bucket and empty new_free_bucket
+            HYPRE_Int new_free_bucket = move_bucket + move_new_free_dist;
+            s->key[*free_bucket]  = s->key[new_free_bucket];
+            s->hash[*free_bucket] = s->hash[new_free_bucket];
 
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-        ++move_segment->timestamp;
-#pragma omp flush
+            ++move_segment->timestamp;
+            #pragma omp flush
 #endif
 
-        s->hopInfo[move_bucket] |= (1U << move_free_dist);
-        s->hopInfo[move_bucket] &= ~(1U << move_new_free_dist);
+            s->hopInfo[move_bucket] |= (1U << move_free_dist);
+            s->hopInfo[move_bucket] &= ~(1U << move_new_free_dist);
 
-        *free_bucket = new_free_bucket;
-        *free_dist -= move_free_dist - move_new_free_dist;
+            *free_bucket = new_free_bucket;
+            *free_dist -= move_free_dist - move_new_free_dist;
 
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-        if(start_seg != move_segment)
-          omp_unset_lock(&move_segment->lock);
+            if (start_seg != move_segment)
+            {
+               omp_unset_lock(&move_segment->lock);
+            }
 #endif
 
-        return;
-      }
+            return;
+         }
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-      if(start_seg != move_segment)
-        omp_unset_lock(&move_segment->lock);
-#endif
-    }
-    ++move_bucket;
-  }
-  *free_bucket = -1;
-  *free_dist = 0;
+         if (start_seg != move_segment)
+         {
+            omp_unset_lock(&move_segment->lock);
+         }
+#endif
+      }
+      ++move_bucket;
+   }
+   *free_bucket = -1;
+   *free_dist = 0;
 }
 
-static inline void
+static inline HYPRE_MAYBE_UNUSED_FUNC void
 hypre_UnorderedBigIntSetFindCloserFreeBucket( hypre_UnorderedBigIntSet *s,
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
                                               hypre_HopscotchSegment   *start_seg,
@@ -388,68 +396,74 @@ hypre_UnorderedBigIntSetFindCloserFreeBucket( hypre_UnorderedBigIntSet *s,
                                               HYPRE_Int *free_bucket,
                                               HYPRE_Int *free_dist )
 {
-  HYPRE_Int move_bucket = *free_bucket - (HYPRE_HOPSCOTCH_HASH_HOP_RANGE - 1);
-  HYPRE_Int move_free_dist;
-  for (move_free_dist = HYPRE_HOPSCOTCH_HASH_HOP_RANGE - 1; move_free_dist > 0; --move_free_dist)
-  {
-    hypre_uint start_hop_info = s->hopInfo[move_bucket];
-    HYPRE_Int move_new_free_dist = -1;
-    hypre_uint mask = 1;
-    HYPRE_Int i;
-    for (i = 0; i < move_free_dist; ++i, mask <<= 1)
-    {
-      if (mask & start_hop_info)
+   HYPRE_Int move_bucket = *free_bucket - (HYPRE_HOPSCOTCH_HASH_HOP_RANGE - 1);
+   HYPRE_Int move_free_dist;
+   for (move_free_dist = HYPRE_HOPSCOTCH_HASH_HOP_RANGE - 1; move_free_dist > 0; --move_free_dist)
+   {
+      hypre_uint start_hop_info = s->hopInfo[move_bucket];
+      HYPRE_Int move_new_free_dist = -1;
+      hypre_uint mask = 1;
+      HYPRE_Int i;
+      for (i = 0; i < move_free_dist; ++i, mask <<= 1)
       {
-        move_new_free_dist = i;
-        break;
+         if (mask & start_hop_info)
+         {
+            move_new_free_dist = i;
+            break;
+         }
       }
-    }
-    if (-1 != move_new_free_dist)
-    {
+      if (-1 != move_new_free_dist)
+      {
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-      hypre_HopscotchSegment*  move_segment = &(s->segments[move_bucket & s->segmentMask]);
+         hypre_HopscotchSegment*  move_segment = &(s->segments[move_bucket & s->segmentMask]);
 
-      if(start_seg != move_segment)
-        omp_set_lock(&move_segment->lock);
+         if (start_seg != move_segment)
+         {
+            omp_set_lock(&move_segment->lock);
+         }
 #endif
 
-      if (start_hop_info == s->hopInfo[move_bucket])
-      {
-        // new_free_bucket -> free_bucket and empty new_free_bucket
-        HYPRE_Int new_free_bucket = move_bucket + move_new_free_dist;
-        s->key[*free_bucket]  = s->key[new_free_bucket];
-        s->hash[*free_bucket] = s->hash[new_free_bucket];
+         if (start_hop_info == s->hopInfo[move_bucket])
+         {
+            // new_free_bucket -> free_bucket and empty new_free_bucket
+            HYPRE_Int new_free_bucket = move_bucket + move_new_free_dist;
+            s->key[*free_bucket]  = s->key[new_free_bucket];
+            s->hash[*free_bucket] = s->hash[new_free_bucket];
 
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-        ++move_segment->timestamp;
-#pragma omp flush
+            ++move_segment->timestamp;
+            #pragma omp flush
 #endif
 
-        s->hopInfo[move_bucket] |= (1U << move_free_dist);
-        s->hopInfo[move_bucket] &= ~(1U << move_new_free_dist);
+            s->hopInfo[move_bucket] |= (1U << move_free_dist);
+            s->hopInfo[move_bucket] &= ~(1U << move_new_free_dist);
 
-        *free_bucket = new_free_bucket;
-        *free_dist -= move_free_dist - move_new_free_dist;
+            *free_bucket = new_free_bucket;
+            *free_dist -= move_free_dist - move_new_free_dist;
 
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-        if(start_seg != move_segment)
-          omp_unset_lock(&move_segment->lock);
+            if (start_seg != move_segment)
+            {
+               omp_unset_lock(&move_segment->lock);
+            }
 #endif
 
-        return;
-      }
+            return;
+         }
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-      if(start_seg != move_segment)
-        omp_unset_lock(&move_segment->lock);
-#endif
-    }
-    ++move_bucket;
-  }
-  *free_bucket = -1;
-  *free_dist = 0;
+         if (start_seg != move_segment)
+         {
+            omp_unset_lock(&move_segment->lock);
+         }
+#endif
+      }
+      ++move_bucket;
+   }
+   *free_bucket = -1;
+   *free_dist = 0;
 }
 
-static inline void
+static inline HYPRE_MAYBE_UNUSED_FUNC void
 hypre_UnorderedIntMapFindCloserFreeBucket( hypre_UnorderedIntMap  *m,
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
                                            hypre_HopscotchSegment *start_seg,
@@ -457,69 +471,77 @@ hypre_UnorderedIntMapFindCloserFreeBucket( hypre_UnorderedIntMap  *m,
                                            hypre_HopscotchBucket **free_bucket,
                                            HYPRE_Int *free_dist)
 {
-  hypre_HopscotchBucket* move_bucket = *free_bucket - (HYPRE_HOPSCOTCH_HASH_HOP_RANGE - 1);
-  HYPRE_Int move_free_dist;
-  for (move_free_dist = HYPRE_HOPSCOTCH_HASH_HOP_RANGE - 1; move_free_dist > 0; --move_free_dist)
-  {
-    hypre_uint start_hop_info = move_bucket->hopInfo;
-    HYPRE_Int move_new_free_dist = -1;
-    hypre_uint mask = 1;
-    HYPRE_Int i;
-    for (i = 0; i < move_free_dist; ++i, mask <<= 1)
-    {
-      if (mask & start_hop_info)
+   HYPRE_UNUSED_VAR(m);
+
+   hypre_HopscotchBucket* move_bucket = *free_bucket - (HYPRE_HOPSCOTCH_HASH_HOP_RANGE - 1);
+   HYPRE_Int move_free_dist;
+   for (move_free_dist = HYPRE_HOPSCOTCH_HASH_HOP_RANGE - 1; move_free_dist > 0; --move_free_dist)
+   {
+      hypre_uint start_hop_info = move_bucket->hopInfo;
+      HYPRE_Int move_new_free_dist = -1;
+      hypre_uint mask = 1;
+      HYPRE_Int i;
+      for (i = 0; i < move_free_dist; ++i, mask <<= 1)
       {
-        move_new_free_dist = i;
-        break;
+         if (mask & start_hop_info)
+         {
+            move_new_free_dist = i;
+            break;
+         }
       }
-    }
-    if (-1 != move_new_free_dist)
-    {
+      if (-1 != move_new_free_dist)
+      {
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-      hypre_HopscotchSegment* move_segment = &(m->segments[(move_bucket - m->table) & m->segmentMask]);
+         hypre_HopscotchSegment* move_segment = &(m->segments[(move_bucket - m->table) & m->segmentMask]);
 
-      if (start_seg != move_segment)
-        omp_set_lock(&move_segment->lock);
+         if (start_seg != move_segment)
+         {
+            omp_set_lock(&move_segment->lock);
+         }
 #endif
 
-      if (start_hop_info == move_bucket->hopInfo)
-      {
-        // new_free_bucket -> free_bucket and empty new_free_bucket
-        hypre_HopscotchBucket* new_free_bucket = move_bucket + move_new_free_dist;
-        (*free_bucket)->data = new_free_bucket->data;
-        (*free_bucket)->key  = new_free_bucket->key;
-        (*free_bucket)->hash = new_free_bucket->hash;
+         if (start_hop_info == move_bucket->hopInfo)
+         {
+            // new_free_bucket -> free_bucket and empty new_free_bucket
+            hypre_HopscotchBucket* new_free_bucket = move_bucket + move_new_free_dist;
+            (*free_bucket)->data = new_free_bucket->data;
+            (*free_bucket)->key  = new_free_bucket->key;
+            (*free_bucket)->hash = new_free_bucket->hash;
 
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-        ++move_segment->timestamp;
+            ++move_segment->timestamp;
 
-#pragma omp flush
+            #pragma omp flush
 #endif
 
-        move_bucket->hopInfo |= (1U << move_free_dist);
-        move_bucket->hopInfo &= ~(1U << move_new_free_dist);
+            move_bucket->hopInfo = move_bucket->hopInfo | (1U << move_free_dist);
+            move_bucket->hopInfo = move_bucket->hopInfo & ~(1U << move_new_free_dist);
 
-        *free_bucket = new_free_bucket;
-        *free_dist -= move_free_dist - move_new_free_dist;
+            *free_bucket = new_free_bucket;
+            *free_dist -= move_free_dist - move_new_free_dist;
 
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-        if(start_seg != move_segment)
-          omp_unset_lock(&move_segment->lock);
+            if (start_seg != move_segment)
+            {
+               omp_unset_lock(&move_segment->lock);
+            }
 #endif
-        return;
-      }
+            return;
+         }
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-      if(start_seg != move_segment)
-        omp_unset_lock(&move_segment->lock);
-#endif
-    }
-    ++move_bucket;
-  }
-  *free_bucket = NULL;
-  *free_dist = 0;
+         if (start_seg != move_segment)
+         {
+            omp_unset_lock(&move_segment->lock);
+         }
+#endif
+      }
+      ++move_bucket;
+   }
+   *free_bucket = NULL;
+   *free_dist = 0;
 }
 
-static inline void
+static inline HYPRE_MAYBE_UNUSED_FUNC void
 hypre_UnorderedBigIntMapFindCloserFreeBucket( hypre_UnorderedBigIntMap   *m,
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
                                               hypre_HopscotchSegment     *start_seg,
@@ -527,80 +549,88 @@ hypre_UnorderedBigIntMapFindCloserFreeBucket( hypre_UnorderedBigIntMap   *m,
                                               hypre_BigHopscotchBucket **free_bucket,
                                               HYPRE_Int *free_dist)
 {
-  hypre_BigHopscotchBucket* move_bucket = *free_bucket - (HYPRE_HOPSCOTCH_HASH_HOP_RANGE - 1);
-  HYPRE_Int move_free_dist;
-  for (move_free_dist = HYPRE_HOPSCOTCH_HASH_HOP_RANGE - 1; move_free_dist > 0; --move_free_dist)
-  {
-    hypre_uint start_hop_info = move_bucket->hopInfo;
-    HYPRE_Int move_new_free_dist = -1;
-    hypre_uint mask = 1;
-    HYPRE_Int i;
-    for (i = 0; i < move_free_dist; ++i, mask <<= 1)
-    {
-      if (mask & start_hop_info)
+   HYPRE_UNUSED_VAR(m);
+
+   hypre_BigHopscotchBucket* move_bucket = *free_bucket - (HYPRE_HOPSCOTCH_HASH_HOP_RANGE - 1);
+   HYPRE_Int move_free_dist;
+   for (move_free_dist = HYPRE_HOPSCOTCH_HASH_HOP_RANGE - 1; move_free_dist > 0; --move_free_dist)
+   {
+      hypre_uint start_hop_info = move_bucket->hopInfo;
+      HYPRE_Int move_new_free_dist = -1;
+      hypre_uint mask = 1;
+      HYPRE_Int i;
+      for (i = 0; i < move_free_dist; ++i, mask <<= 1)
       {
-        move_new_free_dist = i;
-        break;
+         if (mask & start_hop_info)
+         {
+            move_new_free_dist = i;
+            break;
+         }
       }
-    }
-    if (-1 != move_new_free_dist)
-    {
+      if (-1 != move_new_free_dist)
+      {
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-      hypre_HopscotchSegment* move_segment = &(m->segments[(move_bucket - m->table) & m->segmentMask]);
+         hypre_HopscotchSegment* move_segment = &(m->segments[(move_bucket - m->table) & m->segmentMask]);
 
-      if (start_seg != move_segment)
-        omp_set_lock(&move_segment->lock);
+         if (start_seg != move_segment)
+         {
+            omp_set_lock(&move_segment->lock);
+         }
 #endif
 
-      if (start_hop_info == move_bucket->hopInfo)
-      {
-        // new_free_bucket -> free_bucket and empty new_free_bucket
-        hypre_BigHopscotchBucket* new_free_bucket = move_bucket + move_new_free_dist;
-        (*free_bucket)->data = new_free_bucket->data;
-        (*free_bucket)->key  = new_free_bucket->key;
-        (*free_bucket)->hash = new_free_bucket->hash;
+         if (start_hop_info == move_bucket->hopInfo)
+         {
+            // new_free_bucket -> free_bucket and empty new_free_bucket
+            hypre_BigHopscotchBucket* new_free_bucket = move_bucket + move_new_free_dist;
+            (*free_bucket)->data = new_free_bucket->data;
+            (*free_bucket)->key  = new_free_bucket->key;
+            (*free_bucket)->hash = new_free_bucket->hash;
 
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-        ++move_segment->timestamp;
+            ++move_segment->timestamp;
 
-#pragma omp flush
+            #pragma omp flush
 #endif
 
-        move_bucket->hopInfo |= (1U << move_free_dist);
-        move_bucket->hopInfo &= ~(1U << move_new_free_dist);
+            move_bucket->hopInfo = move_bucket->hopInfo | (1U << move_free_dist);
+            move_bucket->hopInfo = move_bucket->hopInfo & ~(1U << move_new_free_dist);
 
-        *free_bucket = new_free_bucket;
-        *free_dist -= move_free_dist - move_new_free_dist;
+            *free_bucket = new_free_bucket;
+            *free_dist -= move_free_dist - move_new_free_dist;
 
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-        if(start_seg != move_segment)
-          omp_unset_lock(&move_segment->lock);
+            if (start_seg != move_segment)
+            {
+               omp_unset_lock(&move_segment->lock);
+            }
 #endif
-        return;
-      }
+            return;
+         }
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-      if(start_seg != move_segment)
-        omp_unset_lock(&move_segment->lock);
-#endif
-    }
-    ++move_bucket;
-  }
-  *free_bucket = NULL;
-  *free_dist = 0;
+         if (start_seg != move_segment)
+         {
+            omp_unset_lock(&move_segment->lock);
+         }
+#endif
+      }
+      ++move_bucket;
+   }
+   *free_bucket = NULL;
+   *free_dist = 0;
 }
 
 void hypre_UnorderedIntSetCreate( hypre_UnorderedIntSet *s,
                                   HYPRE_Int inCapacity,
                                   HYPRE_Int concurrencyLevel);
 void hypre_UnorderedBigIntSetCreate( hypre_UnorderedBigIntSet *s,
-                                  HYPRE_Int inCapacity,
-                                  HYPRE_Int concurrencyLevel);
+                                     HYPRE_Int inCapacity,
+                                     HYPRE_Int concurrencyLevel);
 void hypre_UnorderedIntMapCreate( hypre_UnorderedIntMap *m,
                                   HYPRE_Int inCapacity,
                                   HYPRE_Int concurrencyLevel);
 void hypre_UnorderedBigIntMapCreate( hypre_UnorderedBigIntMap *m,
-                                  HYPRE_Int inCapacity,
-                                  HYPRE_Int concurrencyLevel);
+                                     HYPRE_Int inCapacity,
+                                     HYPRE_Int concurrencyLevel);
 
 void hypre_UnorderedIntSetDestroy( hypre_UnorderedIntSet *s );
 void hypre_UnorderedBigIntSetDestroy( hypre_UnorderedBigIntSet *s );
@@ -608,606 +638,658 @@ void hypre_UnorderedIntMapDestroy( hypre_UnorderedIntMap *m );
 void hypre_UnorderedBigIntMapDestroy( hypre_UnorderedBigIntMap *m );
 
 // Query Operations .........................................................
-static inline HYPRE_Int
+static inline HYPRE_MAYBE_UNUSED_FUNC HYPRE_Int
 hypre_UnorderedIntSetContains( hypre_UnorderedIntSet *s,
                                HYPRE_Int              key )
 {
-  //CALCULATE HASH ..........................
+   //CALCULATE HASH ..........................
 #ifdef HYPRE_BIGINT
-  HYPRE_Int hash = hypre_BigHash(key);
+   HYPRE_Int hash = hypre_BigHash(key);
 #else
-  HYPRE_Int hash = hypre_Hash(key);
+   HYPRE_Int hash = hypre_Hash(key);
 #endif
 
-  //CHECK IF ALREADY CONTAIN ................
+   //CHECK IF ALREADY CONTAIN ................
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-  hypre_HopscotchSegment *segment = &s->segments[hash & s->segmentMask];
+   hypre_HopscotchSegment *segment = &s->segments[hash & s->segmentMask];
 #endif
-  HYPRE_Int bucket = hash & s->bucketMask;
-  hypre_uint hopInfo = s->hopInfo[bucket];
+   HYPRE_Int bucket = hash & s->bucketMask;
+   hypre_uint hopInfo = s->hopInfo[bucket];
 
-  if (0 == hopInfo)
-    return 0;
-  else if (1 == hopInfo )
-  {
-    if (hash == s->hash[bucket] && key == s->key[bucket])
-      return 1;
-    else return 0;
-  }
+   if (0 == hopInfo)
+   {
+      return 0;
+   }
+   else if (1 == hopInfo )
+   {
+      if (hash == s->hash[bucket] && key == s->key[bucket])
+      {
+         return 1;
+      }
+      else { return 0; }
+   }
 
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-  HYPRE_Int startTimestamp = segment->timestamp;
+   HYPRE_Int startTimestamp = segment->timestamp;
 #endif
-  while (0 != hopInfo)
-  {
-    HYPRE_Int i = first_lsb_bit_indx(hopInfo);
-    HYPRE_Int currElm = bucket + i;
+   while (0 != hopInfo)
+   {
+      HYPRE_Int i = first_lsb_bit_indx(hopInfo);
+      HYPRE_Int currElm = bucket + i;
 
-    if (hash == s->hash[currElm] && key == s->key[currElm])
-      return 1;
-    hopInfo &= ~(1U << i);
-  }
+      if (hash == s->hash[currElm] && key == s->key[currElm])
+      {
+         return 1;
+      }
+      hopInfo &= ~(1U << i);
+   }
 
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-  if (segment->timestamp == startTimestamp)
-    return 0;
+   if (segment->timestamp == startTimestamp)
+   {
+      return 0;
+   }
 #endif
 
-  HYPRE_Int i;
-  for (i = 0; i< HYPRE_HOPSCOTCH_HASH_HOP_RANGE; ++i)
-  {
-    if (hash == s->hash[bucket + i] && key == s->key[bucket + i])
-      return 1;
-  }
-  return 0;
+   HYPRE_Int i;
+   for (i = 0; i < HYPRE_HOPSCOTCH_HASH_HOP_RANGE; ++i)
+   {
+      if (hash == s->hash[bucket + i] && key == s->key[bucket + i])
+      {
+         return 1;
+      }
+   }
+   return 0;
 }
 
-static inline HYPRE_Int
+static inline HYPRE_MAYBE_UNUSED_FUNC HYPRE_Int
 hypre_UnorderedBigIntSetContains( hypre_UnorderedBigIntSet *s,
                                   HYPRE_BigInt key )
 {
-  //CALCULATE HASH ..........................
+   //CALCULATE HASH ..........................
 #if defined(HYPRE_BIGINT) || defined(HYPRE_MIXEDINT)
-  HYPRE_BigInt hash = hypre_BigHash(key);
+   HYPRE_BigInt hash = hypre_BigHash(key);
 #else
-  HYPRE_BigInt hash = hypre_Hash(key);
+   HYPRE_BigInt hash = hypre_Hash(key);
 #endif
 
-  //CHECK IF ALREADY CONTAIN ................
+   //CHECK IF ALREADY CONTAIN ................
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-  hypre_HopscotchSegment *segment = &s->segments[(HYPRE_Int)(hash & s->segmentMask)];
+   hypre_HopscotchSegment *segment = &s->segments[(HYPRE_Int)(hash & s->segmentMask)];
 #endif
-  HYPRE_Int bucket = (HYPRE_Int)(hash & s->bucketMask);
-  hypre_uint hopInfo = s->hopInfo[bucket];
+   HYPRE_Int bucket = (HYPRE_Int)(hash & s->bucketMask);
+   hypre_uint hopInfo = s->hopInfo[bucket];
 
-  if (0 == hopInfo)
-    return 0;
-  else if (1 == hopInfo )
-  {
-    if (hash == s->hash[bucket] && key == s->key[bucket])
-      return 1;
-    else return 0;
-  }
+   if (0 == hopInfo)
+   {
+      return 0;
+   }
+   else if (1 == hopInfo )
+   {
+      if (hash == s->hash[bucket] && key == s->key[bucket])
+      {
+         return 1;
+      }
+      else { return 0; }
+   }
 
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-  HYPRE_Int startTimestamp = segment->timestamp;
+   HYPRE_Int startTimestamp = segment->timestamp;
 #endif
-  while (0 != hopInfo)
-  {
-    HYPRE_Int i = first_lsb_bit_indx(hopInfo);
-    HYPRE_Int currElm = bucket + i;
+   while (0 != hopInfo)
+   {
+      HYPRE_Int i = first_lsb_bit_indx(hopInfo);
+      HYPRE_Int currElm = bucket + i;
 
-    if (hash == s->hash[currElm] && key == s->key[currElm])
-      return 1;
-    hopInfo &= ~(1U << i);
-  }
+      if (hash == s->hash[currElm] && key == s->key[currElm])
+      {
+         return 1;
+      }
+      hopInfo &= ~(1U << i);
+   }
 
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-  if (segment->timestamp == startTimestamp)
-    return 0;
+   if (segment->timestamp == startTimestamp)
+   {
+      return 0;
+   }
 #endif
 
-  HYPRE_Int i;
-  for (i = 0; i< HYPRE_HOPSCOTCH_HASH_HOP_RANGE; ++i)
-  {
-    if (hash == s->hash[bucket + i] && key == s->key[bucket + i])
-      return 1;
-  }
-  return 0;
+   HYPRE_Int i;
+   for (i = 0; i < HYPRE_HOPSCOTCH_HASH_HOP_RANGE; ++i)
+   {
+      if (hash == s->hash[bucket + i] && key == s->key[bucket + i])
+      {
+         return 1;
+      }
+   }
+   return 0;
 }
 
 /**
  * @ret -1 if key doesn't exist
  */
-static inline HYPRE_Int
+static inline HYPRE_MAYBE_UNUSED_FUNC HYPRE_Int
 hypre_UnorderedIntMapGet( hypre_UnorderedIntMap *m,
                           HYPRE_Int key )
 {
-  //CALCULATE HASH ..........................
+   //CALCULATE HASH ..........................
 #ifdef HYPRE_BIGINT
-  HYPRE_Int hash = hypre_BigHash(key);
+   HYPRE_Int hash = hypre_BigHash(key);
 #else
-  HYPRE_Int hash = hypre_Hash(key);
+   HYPRE_Int hash = hypre_Hash(key);
 #endif
 
-  //CHECK IF ALREADY CONTAIN ................
+   //CHECK IF ALREADY CONTAIN ................
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-  hypre_HopscotchSegment *segment = &m->segments[hash & m->segmentMask];
-#endif
-  hypre_HopscotchBucket *elmAry = &(m->table[hash & m->bucketMask]);
-  hypre_uint hopInfo = elmAry->hopInfo;
-  if (0 == hopInfo)
-    return -1;
-  else if (1 == hopInfo )
-  {
-    if (hash == elmAry->hash && key == elmAry->key)
-      return elmAry->data;
-    else return -1;
-  }
+   hypre_HopscotchSegment *segment = &m->segments[hash & m->segmentMask];
+#endif
+   hypre_HopscotchBucket *elmAry = &(m->table[hash & m->bucketMask]);
+   hypre_uint hopInfo = elmAry->hopInfo;
+   if (0 == hopInfo)
+   {
+      return -1;
+   }
+   else if (1 == hopInfo )
+   {
+      if (hash == elmAry->hash && key == elmAry->key)
+      {
+         return elmAry->data;
+      }
+      else { return -1; }
+   }
 
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-  HYPRE_Int startTimestamp = segment->timestamp;
+   HYPRE_Int startTimestamp = segment->timestamp;
 #endif
-  while (0 != hopInfo)
-  {
-    HYPRE_Int i = first_lsb_bit_indx(hopInfo);
-    hypre_HopscotchBucket* currElm = elmAry + i;
-    if (hash == currElm->hash && key == currElm->key)
-      return currElm->data;
-    hopInfo &= ~(1U << i);
-  }
+   while (0 != hopInfo)
+   {
+      HYPRE_Int i = first_lsb_bit_indx(hopInfo);
+      hypre_HopscotchBucket* currElm = elmAry + i;
+      if (hash == currElm->hash && key == currElm->key)
+      {
+         return currElm->data;
+      }
+      hopInfo &= ~(1U << i);
+   }
 
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-  if (segment->timestamp == startTimestamp)
-    return -1;
-#endif
-
-  hypre_HopscotchBucket *currBucket = &(m->table[hash & m->bucketMask]);
-  HYPRE_Int i;
-  for (i = 0; i< HYPRE_HOPSCOTCH_HASH_HOP_RANGE; ++i, ++currBucket)
-  {
-    if (hash == currBucket->hash && key == currBucket->key)
-      return currBucket->data;
-  }
-  return -1;
+   if (segment->timestamp == startTimestamp)
+   {
+      return -1;
+   }
+#endif
+
+   hypre_HopscotchBucket *currBucket = &(m->table[hash & m->bucketMask]);
+   HYPRE_Int i;
+   for (i = 0; i < HYPRE_HOPSCOTCH_HASH_HOP_RANGE; ++i, ++currBucket)
+   {
+      if (hash == currBucket->hash && key == currBucket->key)
+      {
+         return currBucket->data;
+      }
+   }
+   return -1;
 }
 
-static inline
+static inline HYPRE_MAYBE_UNUSED_FUNC
 HYPRE_Int hypre_UnorderedBigIntMapGet( hypre_UnorderedBigIntMap *m,
                                        HYPRE_BigInt key )
 {
-  //CALCULATE HASH ..........................
+   //CALCULATE HASH ..........................
 #if defined(HYPRE_BIGINT) || defined(HYPRE_MIXEDINT)
-  HYPRE_BigInt hash = hypre_BigHash(key);
+   HYPRE_BigInt hash = hypre_BigHash(key);
 #else
-  HYPRE_BigInt hash = hypre_Hash(key);
+   HYPRE_BigInt hash = hypre_Hash(key);
 #endif
 
-  //CHECK IF ALREADY CONTAIN ................
+   //CHECK IF ALREADY CONTAIN ................
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-  hypre_HopscotchSegment *segment = &m->segments[(HYPRE_Int)(hash & m->segmentMask)];
-#endif
-  hypre_BigHopscotchBucket *elmAry = &(m->table[(HYPRE_Int)(hash & m->bucketMask)]);
-  hypre_uint hopInfo = elmAry->hopInfo;
-  if (0 == hopInfo)
-    return -1;
-  else if (1 == hopInfo )
-  {
-    if (hash == elmAry->hash && key == elmAry->key)
-      return elmAry->data;
-    else return -1;
-  }
+   hypre_HopscotchSegment *segment = &m->segments[(HYPRE_Int)(hash & m->segmentMask)];
+#endif
+   hypre_BigHopscotchBucket *elmAry = &(m->table[(HYPRE_Int)(hash & m->bucketMask)]);
+   hypre_uint hopInfo = elmAry->hopInfo;
+   if (0 == hopInfo)
+   {
+      return -1;
+   }
+   else if (1 == hopInfo )
+   {
+      if (hash == elmAry->hash && key == elmAry->key)
+      {
+         return elmAry->data;
+      }
+      else { return -1; }
+   }
 
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-  HYPRE_Int startTimestamp = segment->timestamp;
+   HYPRE_Int startTimestamp = segment->timestamp;
 #endif
-  while (0 != hopInfo)
-  {
-    HYPRE_Int i = first_lsb_bit_indx(hopInfo);
-    hypre_BigHopscotchBucket* currElm = elmAry + i;
-    if (hash == currElm->hash && key == currElm->key)
-      return currElm->data;
-    hopInfo &= ~(1U << i);
-  }
+   while (0 != hopInfo)
+   {
+      HYPRE_Int i = first_lsb_bit_indx(hopInfo);
+      hypre_BigHopscotchBucket* currElm = elmAry + i;
+      if (hash == currElm->hash && key == currElm->key)
+      {
+         return currElm->data;
+      }
+      hopInfo &= ~(1U << i);
+   }
 
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-  if (segment->timestamp == startTimestamp)
-    return -1;
-#endif
-
-  hypre_BigHopscotchBucket *currBucket = &(m->table[hash & m->bucketMask]);
-  HYPRE_Int i;
-  for (i = 0; i< HYPRE_HOPSCOTCH_HASH_HOP_RANGE; ++i, ++currBucket)
-  {
-    if (hash == currBucket->hash && key == currBucket->key)
-      return currBucket->data;
-  }
-  return -1;
+   if (segment->timestamp == startTimestamp)
+   {
+      return -1;
+   }
+#endif
+
+   hypre_BigHopscotchBucket *currBucket = &(m->table[hash & m->bucketMask]);
+   HYPRE_Int i;
+   for (i = 0; i < HYPRE_HOPSCOTCH_HASH_HOP_RANGE; ++i, ++currBucket)
+   {
+      if (hash == currBucket->hash && key == currBucket->key)
+      {
+         return currBucket->data;
+      }
+   }
+   return -1;
 }
 
 //status Operations .........................................................
-static inline
+static inline HYPRE_MAYBE_UNUSED_FUNC
 HYPRE_Int hypre_UnorderedIntSetSize( hypre_UnorderedIntSet *s )
 {
-  HYPRE_Int counter = 0;
-  HYPRE_Int n = s->bucketMask + HYPRE_HOPSCOTCH_HASH_INSERT_RANGE;
-  HYPRE_Int i;
-  for (i = 0; i < n; ++i)
-  {
-    if (HYPRE_HOPSCOTCH_HASH_EMPTY != s->hash[i])
-    {
-      ++counter;
-    }
-  }
-  return counter;
+   HYPRE_Int counter = 0;
+   HYPRE_Int n = s->bucketMask + HYPRE_HOPSCOTCH_HASH_INSERT_RANGE;
+   HYPRE_Int i;
+   for (i = 0; i < n; ++i)
+   {
+      if (HYPRE_HOPSCOTCH_HASH_EMPTY != s->hash[i])
+      {
+         ++counter;
+      }
+   }
+   return counter;
 }
 
-static inline
+static inline HYPRE_MAYBE_UNUSED_FUNC
 HYPRE_Int hypre_UnorderedBigIntSetSize( hypre_UnorderedBigIntSet *s )
 {
-  HYPRE_Int counter = 0;
-  HYPRE_BigInt n = s->bucketMask + HYPRE_HOPSCOTCH_HASH_INSERT_RANGE;
-  HYPRE_Int i;
-  for (i = 0; i < n; ++i)
-  {
-    if (HYPRE_HOPSCOTCH_HASH_EMPTY != s->hash[i])
-    {
-      ++counter;
-    }
-  }
-  return counter;
+   HYPRE_Int counter = 0;
+   HYPRE_BigInt n = s->bucketMask + HYPRE_HOPSCOTCH_HASH_INSERT_RANGE;
+   HYPRE_Int i;
+   for (i = 0; i < n; ++i)
+   {
+      if (HYPRE_HOPSCOTCH_HASH_EMPTY != s->hash[i])
+      {
+         ++counter;
+      }
+   }
+   return counter;
 }
 
-static inline HYPRE_Int
+static inline HYPRE_MAYBE_UNUSED_FUNC HYPRE_Int
 hypre_UnorderedIntMapSize( hypre_UnorderedIntMap *m )
 {
-  HYPRE_Int counter = 0;
-  HYPRE_Int n = m->bucketMask + HYPRE_HOPSCOTCH_HASH_INSERT_RANGE;
-  HYPRE_Int i;
-  for (i = 0; i < n; ++i)
-  {
-    if( HYPRE_HOPSCOTCH_HASH_EMPTY != m->table[i].hash )
-    {
-      ++counter;
-    }
-  }
-  return counter;
+   HYPRE_Int counter = 0;
+   HYPRE_Int n = m->bucketMask + HYPRE_HOPSCOTCH_HASH_INSERT_RANGE;
+   HYPRE_Int i;
+   for (i = 0; i < n; ++i)
+   {
+      if ( HYPRE_HOPSCOTCH_HASH_EMPTY != m->table[i].hash )
+      {
+         ++counter;
+      }
+   }
+   return counter;
 }
 
-static inline HYPRE_Int
+static inline HYPRE_MAYBE_UNUSED_FUNC HYPRE_Int
 hypre_UnorderedBigIntMapSize( hypre_UnorderedBigIntMap *m )
 {
-  HYPRE_Int counter = 0;
-  HYPRE_Int n = m->bucketMask + HYPRE_HOPSCOTCH_HASH_INSERT_RANGE;
-  HYPRE_Int i;
-  for (i = 0; i < n; ++i)
-  {
-    if( HYPRE_HOPSCOTCH_HASH_EMPTY != m->table[i].hash )
-    {
-      ++counter;
-    }
-  }
-  return counter;
+   HYPRE_Int counter = 0;
+   HYPRE_Int n = m->bucketMask + HYPRE_HOPSCOTCH_HASH_INSERT_RANGE;
+   HYPRE_Int i;
+   for (i = 0; i < n; ++i)
+   {
+      if ( HYPRE_HOPSCOTCH_HASH_EMPTY != m->table[i].hash )
+      {
+         ++counter;
+      }
+   }
+   return counter;
 }
 
 HYPRE_Int *hypre_UnorderedIntSetCopyToArray( hypre_UnorderedIntSet *s, HYPRE_Int *len );
 HYPRE_BigInt *hypre_UnorderedBigIntSetCopyToArray( hypre_UnorderedBigIntSet *s, HYPRE_Int *len );
 
 //modification Operations ...................................................
-static inline void
+static inline HYPRE_MAYBE_UNUSED_FUNC void
 hypre_UnorderedIntSetPut( hypre_UnorderedIntSet *s,
                           HYPRE_Int key )
 {
-  //CALCULATE HASH ..........................
+   //CALCULATE HASH ..........................
 #ifdef HYPRE_BIGINT
-  HYPRE_Int hash = hypre_BigHash(key);
+   HYPRE_Int hash = hypre_BigHash(key);
 #else
-  HYPRE_Int hash = hypre_Hash(key);
+   HYPRE_Int hash = hypre_Hash(key);
 #endif
 
-  //LOCK KEY HASH ENTERY ....................
+   //LOCK KEY HASH ENTERY ....................
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-  hypre_HopscotchSegment  *segment = &s->segments[hash & s->segmentMask];
-  omp_set_lock(&segment->lock);
+   hypre_HopscotchSegment  *segment = &s->segments[hash & s->segmentMask];
+   omp_set_lock(&segment->lock);
 #endif
-  HYPRE_Int bucket = hash&s->bucketMask;
+   HYPRE_Int bucket = hash & s->bucketMask;
 
-  //CHECK IF ALREADY CONTAIN ................
-  hypre_uint hopInfo = s->hopInfo[bucket];
-  while (0 != hopInfo)
-  {
-    HYPRE_Int i = first_lsb_bit_indx(hopInfo);
-    HYPRE_Int currElm = bucket + i;
+   //CHECK IF ALREADY CONTAIN ................
+   hypre_uint hopInfo = s->hopInfo[bucket];
+   while (0 != hopInfo)
+   {
+      HYPRE_Int i = first_lsb_bit_indx(hopInfo);
+      HYPRE_Int currElm = bucket + i;
 
-    if(hash == s->hash[currElm] && key == s->key[currElm])
-    {
+      if (hash == s->hash[currElm] && key == s->key[currElm])
+      {
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-      omp_unset_lock(&segment->lock);
-#endif
-      return;
-    }
-    hopInfo &= ~(1U << i);
-  }
-
-  //LOOK FOR FREE BUCKET ....................
-  HYPRE_Int free_bucket = bucket;
-  HYPRE_Int free_dist = 0;
-  for ( ; free_dist < HYPRE_HOPSCOTCH_HASH_INSERT_RANGE; ++free_dist, ++free_bucket)
-  {
-    if( (HYPRE_HOPSCOTCH_HASH_EMPTY == s->hash[free_bucket]) &&
-        (HYPRE_HOPSCOTCH_HASH_EMPTY ==
-           hypre_compare_and_swap((HYPRE_Int *)&s->hash[free_bucket],
-                                  (HYPRE_Int)HYPRE_HOPSCOTCH_HASH_EMPTY,
-                                  (HYPRE_Int)HYPRE_HOPSCOTCH_HASH_BUSY)) )
-      break;
-  }
-
-  //PLACE THE NEW KEY .......................
-  if (free_dist < HYPRE_HOPSCOTCH_HASH_INSERT_RANGE)
-  {
-    do
-    {
-      if (free_dist < HYPRE_HOPSCOTCH_HASH_HOP_RANGE)
+         omp_unset_lock(&segment->lock);
+#endif
+         return;
+      }
+      hopInfo &= ~(1U << i);
+   }
+
+   //LOOK FOR FREE BUCKET ....................
+   HYPRE_Int free_bucket = bucket;
+   HYPRE_Int free_dist = 0;
+   for ( ; free_dist < HYPRE_HOPSCOTCH_HASH_INSERT_RANGE; ++free_dist, ++free_bucket)
+   {
+      if ( (HYPRE_HOPSCOTCH_HASH_EMPTY == s->hash[free_bucket]) &&
+           (HYPRE_HOPSCOTCH_HASH_EMPTY ==
+            hypre_compare_and_swap((HYPRE_Int *)&s->hash[free_bucket],
+                                   (HYPRE_Int)HYPRE_HOPSCOTCH_HASH_EMPTY,
+                                   (HYPRE_Int)HYPRE_HOPSCOTCH_HASH_BUSY)) )
       {
-        s->key[free_bucket]  = key;
-        s->hash[free_bucket] = hash;
-        s->hopInfo[bucket]  |= 1U << free_dist;
+         break;
+      }
+   }
+
+   //PLACE THE NEW KEY .......................
+   if (free_dist < HYPRE_HOPSCOTCH_HASH_INSERT_RANGE)
+   {
+      do
+      {
+         if (free_dist < HYPRE_HOPSCOTCH_HASH_HOP_RANGE)
+         {
+            s->key[free_bucket]  = key;
+            s->hash[free_bucket] = hash;
+            s->hopInfo[bucket]  |= 1U << free_dist;
 
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-        omp_unset_lock(&segment->lock);
+            omp_unset_lock(&segment->lock);
 #endif
-        return;
-      }
-      hypre_UnorderedIntSetFindCloserFreeBucket(s,
+            return;
+         }
+         hypre_UnorderedIntSetFindCloserFreeBucket(s,
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-                                                segment,
+                                                   segment,
 #endif
-                                                &free_bucket, &free_dist);
-    } while (-1 != free_bucket);
-  }
+                                                   &free_bucket, &free_dist);
+      }
+      while (-1 != free_bucket);
+   }
 
-  //NEED TO RESIZE ..........................
-  hypre_error_w_msg(HYPRE_ERROR_GENERIC,"ERROR - RESIZE is not implemented\n");
-  /*fprintf(stderr, "ERROR - RESIZE is not implemented\n");*/
-  exit(1);
-  return;
+   //NEED TO RESIZE ..........................
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "ERROR - RESIZE is not implemented\n");
+   /*fprintf(stderr, "ERROR - RESIZE is not implemented\n");*/
+   exit(1);
+   return;
 }
 
-static inline void
+static inline HYPRE_MAYBE_UNUSED_FUNC void
 hypre_UnorderedBigIntSetPut( hypre_UnorderedBigIntSet *s,
                              HYPRE_BigInt key )
 {
-  //CALCULATE HASH ..........................
+   //CALCULATE HASH ..........................
 #if defined(HYPRE_BIGINT) || defined(HYPRE_MIXEDINT)
-  HYPRE_BigInt hash = hypre_BigHash(key);
+   HYPRE_BigInt hash = hypre_BigHash(key);
 #else
-  HYPRE_BigInt hash = hypre_Hash(key);
+   HYPRE_BigInt hash = hypre_Hash(key);
 #endif
 
-  //LOCK KEY HASH ENTERY ....................
+   //LOCK KEY HASH ENTERY ....................
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-  hypre_HopscotchSegment  *segment = &s->segments[hash & s->segmentMask];
-  omp_set_lock(&segment->lock);
+   hypre_HopscotchSegment  *segment = &s->segments[hash & s->segmentMask];
+   omp_set_lock(&segment->lock);
 #endif
-  HYPRE_Int bucket = (HYPRE_Int)(hash&s->bucketMask);
+   HYPRE_Int bucket = (HYPRE_Int)(hash & s->bucketMask);
 
-  //CHECK IF ALREADY CONTAIN ................
-  hypre_uint hopInfo = s->hopInfo[bucket];
-  while (0 != hopInfo)
-  {
-    HYPRE_Int i = first_lsb_bit_indx(hopInfo);
-    HYPRE_Int currElm = bucket + i;
+   //CHECK IF ALREADY CONTAIN ................
+   hypre_uint hopInfo = s->hopInfo[bucket];
+   while (0 != hopInfo)
+   {
+      HYPRE_Int i = first_lsb_bit_indx(hopInfo);
+      HYPRE_Int currElm = bucket + i;
 
-    if(hash == s->hash[currElm] && key == s->key[currElm])
-    {
+      if (hash == s->hash[currElm] && key == s->key[currElm])
+      {
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-      omp_unset_lock(&segment->lock);
-#endif
-      return;
-    }
-    hopInfo &= ~(1U << i);
-  }
-
-  //LOOK FOR FREE BUCKET ....................
-  HYPRE_Int free_bucket = bucket;
-  HYPRE_Int free_dist = 0;
-  for ( ; free_dist < HYPRE_HOPSCOTCH_HASH_INSERT_RANGE; ++free_dist, ++free_bucket)
-  {
-    if( (HYPRE_HOPSCOTCH_HASH_EMPTY == s->hash[free_bucket]) &&
-        (HYPRE_HOPSCOTCH_HASH_EMPTY ==
-           hypre_compare_and_swap((HYPRE_Int *)&s->hash[free_bucket],
-                                  (HYPRE_Int)HYPRE_HOPSCOTCH_HASH_EMPTY,
-                                  (HYPRE_Int)HYPRE_HOPSCOTCH_HASH_BUSY)) )
-      break;
-  }
-
-  //PLACE THE NEW KEY .......................
-  if (free_dist < HYPRE_HOPSCOTCH_HASH_INSERT_RANGE)
-  {
-    do
-    {
-      if (free_dist < HYPRE_HOPSCOTCH_HASH_HOP_RANGE)
+         omp_unset_lock(&segment->lock);
+#endif
+         return;
+      }
+      hopInfo &= ~(1U << i);
+   }
+
+   //LOOK FOR FREE BUCKET ....................
+   HYPRE_Int free_bucket = bucket;
+   HYPRE_Int free_dist = 0;
+   for ( ; free_dist < HYPRE_HOPSCOTCH_HASH_INSERT_RANGE; ++free_dist, ++free_bucket)
+   {
+      if ( (HYPRE_HOPSCOTCH_HASH_EMPTY == s->hash[free_bucket]) &&
+           (HYPRE_HOPSCOTCH_HASH_EMPTY ==
+            hypre_compare_and_swap((HYPRE_Int *)&s->hash[free_bucket],
+                                   (HYPRE_Int)HYPRE_HOPSCOTCH_HASH_EMPTY,
+                                   (HYPRE_Int)HYPRE_HOPSCOTCH_HASH_BUSY)) )
       {
-        s->key[free_bucket]  = key;
-        s->hash[free_bucket] = hash;
-        s->hopInfo[bucket]  |= 1U << free_dist;
+         break;
+      }
+   }
+
+   //PLACE THE NEW KEY .......................
+   if (free_dist < HYPRE_HOPSCOTCH_HASH_INSERT_RANGE)
+   {
+      do
+      {
+         if (free_dist < HYPRE_HOPSCOTCH_HASH_HOP_RANGE)
+         {
+            s->key[free_bucket]  = key;
+            s->hash[free_bucket] = hash;
+            s->hopInfo[bucket]  |= 1U << free_dist;
 
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-        omp_unset_lock(&segment->lock);
+            omp_unset_lock(&segment->lock);
 #endif
-        return;
-      }
-      hypre_UnorderedBigIntSetFindCloserFreeBucket(s,
+            return;
+         }
+         hypre_UnorderedBigIntSetFindCloserFreeBucket(s,
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-                                                   segment,
+                                                      segment,
 #endif
-                                                   &free_bucket, &free_dist);
-    } while (-1 != free_bucket);
-  }
-
-  //NEED TO RESIZE ..........................
-  hypre_error_w_msg(HYPRE_ERROR_GENERIC,"ERROR - RESIZE is not implemented\n");
-  /*fprintf(stderr, "ERROR - RESIZE is not implemented\n");*/
-  exit(1);
-  return;
+                                                      &free_bucket, &free_dist);
+      }
+      while (-1 != free_bucket);
+   }
+
+   //NEED TO RESIZE ..........................
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "ERROR - RESIZE is not implemented\n");
+   /*fprintf(stderr, "ERROR - RESIZE is not implemented\n");*/
+   exit(1);
+   return;
 }
 
-static inline HYPRE_Int
+static inline HYPRE_MAYBE_UNUSED_FUNC HYPRE_Int
 hypre_UnorderedIntMapPutIfAbsent( hypre_UnorderedIntMap *m,
                                   HYPRE_Int key, HYPRE_Int data )
 {
-  //CALCULATE HASH ..........................
+   //CALCULATE HASH ..........................
 #ifdef HYPRE_BIGINT
-  HYPRE_Int hash = hypre_BigHash(key);
+   HYPRE_Int hash = hypre_BigHash(key);
 #else
-  HYPRE_Int hash = hypre_Hash(key);
+   HYPRE_Int hash = hypre_Hash(key);
 #endif
 
-  //LOCK KEY HASH ENTERY ....................
+   //LOCK KEY HASH ENTERY ....................
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-  hypre_HopscotchSegment *segment = &m->segments[hash & m->segmentMask];
-  omp_set_lock(&segment->lock);
-#endif
-  hypre_HopscotchBucket* startBucket = &(m->table[hash & m->bucketMask]);
-
-  //CHECK IF ALREADY CONTAIN ................
-  hypre_uint hopInfo = startBucket->hopInfo;
-  while (0 != hopInfo)
-  {
-    HYPRE_Int i = first_lsb_bit_indx(hopInfo);
-    hypre_HopscotchBucket* currElm = startBucket + i;
-    if (hash == currElm->hash && key == currElm->key)
-    {
-      HYPRE_Int rc = currElm->data;
+   hypre_HopscotchSegment *segment = &m->segments[hash & m->segmentMask];
+   omp_set_lock(&segment->lock);
+#endif
+   hypre_HopscotchBucket* startBucket = &(m->table[hash & m->bucketMask]);
+
+   //CHECK IF ALREADY CONTAIN ................
+   hypre_uint hopInfo = startBucket->hopInfo;
+   while (0 != hopInfo)
+   {
+      HYPRE_Int i = first_lsb_bit_indx(hopInfo);
+      hypre_HopscotchBucket* currElm = startBucket + i;
+      if (hash == currElm->hash && key == currElm->key)
+      {
+         HYPRE_Int rc = currElm->data;
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-      omp_unset_lock(&segment->lock);
-#endif
-      return rc;
-    }
-    hopInfo &= ~(1U << i);
-  }
-
-  //LOOK FOR FREE BUCKET ....................
-  hypre_HopscotchBucket* free_bucket = startBucket;
-  HYPRE_Int free_dist = 0;
-  for ( ; free_dist < HYPRE_HOPSCOTCH_HASH_INSERT_RANGE; ++free_dist, ++free_bucket)
-  {
-    if( (HYPRE_HOPSCOTCH_HASH_EMPTY == free_bucket->hash) &&
-        (HYPRE_HOPSCOTCH_HASH_EMPTY ==
+         omp_unset_lock(&segment->lock);
+#endif
+         return rc;
+      }
+      hopInfo &= ~(1U << i);
+   }
+
+   //LOOK FOR FREE BUCKET ....................
+   hypre_HopscotchBucket* free_bucket = startBucket;
+   HYPRE_Int free_dist = 0;
+   for ( ; free_dist < HYPRE_HOPSCOTCH_HASH_INSERT_RANGE; ++free_dist, ++free_bucket)
+   {
+      if ( (HYPRE_HOPSCOTCH_HASH_EMPTY == free_bucket->hash) &&
+           (HYPRE_HOPSCOTCH_HASH_EMPTY ==
             hypre_compare_and_swap((HYPRE_Int *)&free_bucket->hash,
                                    (HYPRE_Int)HYPRE_HOPSCOTCH_HASH_EMPTY,
                                    (HYPRE_Int)HYPRE_HOPSCOTCH_HASH_BUSY)) )
-      break;
-  }
-
-  //PLACE THE NEW KEY .......................
-  if (free_dist < HYPRE_HOPSCOTCH_HASH_INSERT_RANGE)
-  {
-    do
-    {
-      if (free_dist < HYPRE_HOPSCOTCH_HASH_HOP_RANGE)
       {
-        free_bucket->data     = data;
-        free_bucket->key      = key;
-        free_bucket->hash     = hash;
-        startBucket->hopInfo |= 1U << free_dist;
+         break;
+      }
+   }
+
+   //PLACE THE NEW KEY .......................
+   if (free_dist < HYPRE_HOPSCOTCH_HASH_INSERT_RANGE)
+   {
+      do
+      {
+         if (free_dist < HYPRE_HOPSCOTCH_HASH_HOP_RANGE)
+         {
+            free_bucket->data    = data;
+            free_bucket->key     = key;
+            free_bucket->hash    = hash;
+            startBucket->hopInfo = startBucket->hopInfo | (1U << free_dist);
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-        omp_unset_lock(&segment->lock);
+            omp_unset_lock(&segment->lock);
 #endif
-        return HYPRE_HOPSCOTCH_HASH_EMPTY;
-      }
-      hypre_UnorderedIntMapFindCloserFreeBucket(m,
+            return HYPRE_HOPSCOTCH_HASH_EMPTY;
+         }
+         hypre_UnorderedIntMapFindCloserFreeBucket(m,
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-                                                segment,
+                                                   segment,
 #endif
-                                                &free_bucket, &free_dist);
-    } while (NULL != free_bucket);
-  }
+                                                   &free_bucket, &free_dist);
+      }
+      while (NULL != free_bucket);
+   }
 
-  //NEED TO RESIZE ..........................
-  hypre_error_w_msg(HYPRE_ERROR_GENERIC,"ERROR - RESIZE is not implemented\n");
-  /*fprintf(stderr, "ERROR - RESIZE is not implemented\n");*/
-  exit(1);
-  return HYPRE_HOPSCOTCH_HASH_EMPTY;
+   //NEED TO RESIZE ..........................
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "ERROR - RESIZE is not implemented\n");
+   /*fprintf(stderr, "ERROR - RESIZE is not implemented\n");*/
+   exit(1);
+   return HYPRE_HOPSCOTCH_HASH_EMPTY;
 }
 
-static inline HYPRE_Int
+static inline HYPRE_MAYBE_UNUSED_FUNC HYPRE_Int
 hypre_UnorderedBigIntMapPutIfAbsent( hypre_UnorderedBigIntMap *m,
                                      HYPRE_BigInt key, HYPRE_Int data)
 {
-  //CALCULATE HASH ..........................
+   //CALCULATE HASH ..........................
 #if defined(HYPRE_BIGINT) || defined(HYPRE_MIXEDINT)
-  HYPRE_BigInt hash = hypre_BigHash(key);
+   HYPRE_BigInt hash = hypre_BigHash(key);
 #else
-  HYPRE_BigInt hash = hypre_Hash(key);
+   HYPRE_BigInt hash = hypre_Hash(key);
 #endif
 
-  //LOCK KEY HASH ENTERY ....................
+   //LOCK KEY HASH ENTERY ....................
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-  hypre_HopscotchSegment *segment = &m->segments[hash & m->segmentMask];
-  omp_set_lock(&segment->lock);
-#endif
-  hypre_BigHopscotchBucket* startBucket = &(m->table[hash & m->bucketMask]);
-
-  //CHECK IF ALREADY CONTAIN ................
-  hypre_uint hopInfo = startBucket->hopInfo;
-  while (0 != hopInfo)
-  {
-    HYPRE_Int i = first_lsb_bit_indx(hopInfo);
-    hypre_BigHopscotchBucket* currElm = startBucket + i;
-    if (hash == currElm->hash && key == currElm->key)
-    {
-      HYPRE_Int rc = currElm->data;
-#ifdef HYPRE_CONCURRENT_HOPSCOTCH
-      omp_unset_lock(&segment->lock);
-#endif
-      return rc;
-    }
-    hopInfo &= ~(1U << i);
-  }
-
-  //LOOK FOR FREE BUCKET ....................
-  hypre_BigHopscotchBucket* free_bucket = startBucket;
-  HYPRE_Int free_dist = 0;
-  for ( ; free_dist < HYPRE_HOPSCOTCH_HASH_INSERT_RANGE; ++free_dist, ++free_bucket)
-  {
-    if( (HYPRE_HOPSCOTCH_HASH_EMPTY == free_bucket->hash) &&
-        (HYPRE_HOPSCOTCH_HASH_EMPTY ==
-           hypre_compare_and_swap((HYPRE_Int *)&free_bucket->hash,
-                                  (HYPRE_Int)HYPRE_HOPSCOTCH_HASH_EMPTY,
-                                  (HYPRE_Int)HYPRE_HOPSCOTCH_HASH_BUSY)) )
-      break;
-  }
-
-  //PLACE THE NEW KEY .......................
-  if (free_dist < HYPRE_HOPSCOTCH_HASH_INSERT_RANGE)
-  {
-    do
-    {
-      if (free_dist < HYPRE_HOPSCOTCH_HASH_HOP_RANGE)
+   hypre_HopscotchSegment *segment = &m->segments[hash & m->segmentMask];
+   omp_set_lock(&segment->lock);
+#endif
+   hypre_BigHopscotchBucket* startBucket = &(m->table[hash & m->bucketMask]);
+
+   //CHECK IF ALREADY CONTAIN ................
+   hypre_uint hopInfo = startBucket->hopInfo;
+   while (0 != hopInfo)
+   {
+      HYPRE_Int i = first_lsb_bit_indx(hopInfo);
+      hypre_BigHopscotchBucket* currElm = startBucket + i;
+      if (hash == currElm->hash && key == currElm->key)
       {
-        free_bucket->data     = data;
-        free_bucket->key      = key;
-        free_bucket->hash     = hash;
-        startBucket->hopInfo |= 1U << free_dist;
+         HYPRE_Int rc = currElm->data;
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-        omp_unset_lock(&segment->lock);
+         omp_unset_lock(&segment->lock);
 #endif
-        return HYPRE_HOPSCOTCH_HASH_EMPTY;
+         return rc;
       }
-      hypre_UnorderedBigIntMapFindCloserFreeBucket(m,
+      hopInfo &= ~(1U << i);
+   }
+
+   //LOOK FOR FREE BUCKET ....................
+   hypre_BigHopscotchBucket* free_bucket = startBucket;
+   HYPRE_Int free_dist = 0;
+   for ( ; free_dist < HYPRE_HOPSCOTCH_HASH_INSERT_RANGE; ++free_dist, ++free_bucket)
+   {
+      if ( (HYPRE_HOPSCOTCH_HASH_EMPTY == free_bucket->hash) &&
+           (HYPRE_HOPSCOTCH_HASH_EMPTY ==
+            hypre_compare_and_swap((HYPRE_Int *)&free_bucket->hash,
+                                   (HYPRE_Int)HYPRE_HOPSCOTCH_HASH_EMPTY,
+                                   (HYPRE_Int)HYPRE_HOPSCOTCH_HASH_BUSY)) )
+      {
+         break;
+      }
+   }
+
+   //PLACE THE NEW KEY .......................
+   if (free_dist < HYPRE_HOPSCOTCH_HASH_INSERT_RANGE)
+   {
+      do
+      {
+         if (free_dist < HYPRE_HOPSCOTCH_HASH_HOP_RANGE)
+         {
+            free_bucket->data    = data;
+            free_bucket->key     = key;
+            free_bucket->hash    = hash;
+            startBucket->hopInfo = startBucket->hopInfo | (1U << free_dist);
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-                                                   segment,
+            omp_unset_lock(&segment->lock);
 #endif
-                                                   &free_bucket, &free_dist);
-    } while (NULL != free_bucket);
-  }
-
-  //NEED TO RESIZE ..........................
-  hypre_error_w_msg(HYPRE_ERROR_GENERIC,"ERROR - RESIZE is not implemented\n");
-  /*fprintf(stderr, "ERROR - RESIZE is not implemented\n");*/
-  exit(1);
-  return HYPRE_HOPSCOTCH_HASH_EMPTY;
+            return HYPRE_HOPSCOTCH_HASH_EMPTY;
+         }
+         hypre_UnorderedBigIntMapFindCloserFreeBucket(m,
+#ifdef HYPRE_CONCURRENT_HOPSCOTCH
+                                                      segment,
+#endif
+                                                      &free_bucket, &free_dist);
+      }
+      while (NULL != free_bucket);
+   }
+
+   //NEED TO RESIZE ..........................
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "ERROR - RESIZE is not implemented\n");
+   /*fprintf(stderr, "ERROR - RESIZE is not implemented\n");*/
+   exit(1);
+   return HYPRE_HOPSCOTCH_HASH_EMPTY;
 }
 
 #ifdef __cplusplus
diff --git a/external/hypre/src/utilities/int_array.c b/external/hypre/src/utilities/int_array.c
index d0e02224..6ba520f2 100644
--- a/external/hypre/src/utilities/int_array.c
+++ b/external/hypre/src/utilities/int_array.c
@@ -1,12 +1,11 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
  ******************************************************************************/
 
 #include "_hypre_utilities.h"
-#include "_hypre_utilities.hpp"
 
 /******************************************************************************
  *
@@ -40,8 +39,6 @@ hypre_IntArrayCreate( HYPRE_Int size )
 HYPRE_Int
 hypre_IntArrayDestroy( hypre_IntArray *array )
 {
-   HYPRE_Int ierr=0;
-
    if (array)
    {
       HYPRE_MemoryLocation memory_location = hypre_IntArrayMemoryLocation(array);
@@ -51,7 +48,7 @@ hypre_IntArrayDestroy( hypre_IntArray *array )
       hypre_TFree(array, HYPRE_MEMORY_HOST);
    }
 
-   return ierr;
+   return hypre_error_flag;
 }
 
 /*--------------------------------------------------------------------------
@@ -62,7 +59,6 @@ HYPRE_Int
 hypre_IntArrayInitialize_v2( hypre_IntArray *array, HYPRE_MemoryLocation memory_location )
 {
    HYPRE_Int  size = hypre_IntArraySize(array);
-   HYPRE_Int  ierr = 0;
 
    hypre_IntArrayMemoryLocation(array) = memory_location;
 
@@ -70,37 +66,38 @@ hypre_IntArrayInitialize_v2( hypre_IntArray *array, HYPRE_MemoryLocation memory_
     * to be consistent with `memory_location'
     * Otherwise, mismatches will exist and problems will be encountered
     * when being used, and freed */
-   if ( !hypre_IntArrayData(array) )
+   if (!hypre_IntArrayData(array))
    {
       hypre_IntArrayData(array) = hypre_CTAlloc(HYPRE_Int, size, memory_location);
    }
 
-   return ierr;
+   return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_IntArrayInitialize
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_IntArrayInitialize( hypre_IntArray *array )
 {
-   HYPRE_Int ierr;
+   hypre_IntArrayInitialize_v2( array, hypre_IntArrayMemoryLocation(array) );
 
-   ierr = hypre_IntArrayInitialize_v2( array, hypre_IntArrayMemoryLocation(array) );
-
-   return ierr;
+   return hypre_error_flag;
 }
 
-
 /*--------------------------------------------------------------------------
  * hypre_IntArrayCopy
- * copies data from x to y
+ *
+ * Copies data from x to y
  * if size of x is larger than y only the first size_y elements of x are
  * copied to y
  *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_IntArrayCopy( hypre_IntArray *x,
                     hypre_IntArray *y )
 {
-   HYPRE_Int ierr = 0;
-
    size_t size = hypre_min( hypre_IntArraySize(x), hypre_IntArraySize(y) );
 
    hypre_TMemcpy( hypre_IntArrayData(y),
@@ -110,12 +107,11 @@ hypre_IntArrayCopy( hypre_IntArray *x,
                   hypre_IntArrayMemoryLocation(y),
                   hypre_IntArrayMemoryLocation(x) );
 
-   return ierr;
+   return hypre_error_flag;
 }
 
 /*--------------------------------------------------------------------------
- * hypre_IntArrayCloneDeep
- * Returns a complete copy of x - a deep copy, with its own copy of the data.
+ * hypre_IntArrayCloneDeep_v2
  *--------------------------------------------------------------------------*/
 
 hypre_IntArray *
@@ -131,12 +127,169 @@ hypre_IntArrayCloneDeep_v2( hypre_IntArray *x, HYPRE_MemoryLocation memory_locat
    return y;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_IntArrayCloneDeep
+ * Returns a complete copy of x - a deep copy, with its own copy of the data.
+ *--------------------------------------------------------------------------*/
+
 hypre_IntArray *
 hypre_IntArrayCloneDeep( hypre_IntArray *x )
 {
    return hypre_IntArrayCloneDeep_v2(x, hypre_IntArrayMemoryLocation(x));
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_IntArrayMigrate
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_IntArrayMigrate( hypre_IntArray      *v,
+                       HYPRE_MemoryLocation memory_location )
+{
+   HYPRE_Int            size                = hypre_IntArraySize(v);
+   HYPRE_Int           *v_data              = hypre_IntArrayData(v);
+   HYPRE_MemoryLocation old_memory_location = hypre_IntArrayMemoryLocation(v);
+
+   HYPRE_Int           *w_data;
+
+   /* Update v's memory location */
+   hypre_IntArrayMemoryLocation(v) = memory_location;
+
+   if ( hypre_GetActualMemLocation(memory_location) !=
+        hypre_GetActualMemLocation(old_memory_location) )
+   {
+      w_data = hypre_TAlloc(HYPRE_Int, size, memory_location);
+      hypre_TMemcpy(w_data, v_data, HYPRE_Int, size,
+                    memory_location, old_memory_location);
+      hypre_TFree(v_data, old_memory_location);
+      hypre_IntArrayData(v) = w_data;
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_IntArrayPrint
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_IntArrayPrint( MPI_Comm        comm,
+                     hypre_IntArray *array,
+                     const char     *filename )
+{
+   HYPRE_Int             size            = hypre_IntArraySize(array);
+   HYPRE_MemoryLocation  memory_location = hypre_IntArrayMemoryLocation(array);
+
+   hypre_IntArray       *h_array;
+   HYPRE_Int            *data;
+
+   FILE                 *file;
+   HYPRE_Int             i, myid;
+   char                  new_filename[1024];
+
+   hypre_MPI_Comm_rank(comm, &myid);
+
+   /* Move data to host if needed*/
+   h_array = (hypre_GetActualMemLocation(memory_location) == hypre_MEMORY_DEVICE) ?
+             hypre_IntArrayCloneDeep_v2(array, HYPRE_MEMORY_HOST) : array;
+   data = hypre_IntArrayData(h_array);
+
+   /* Open file */
+   hypre_sprintf(new_filename, "%s.%05d", filename, myid);
+   if ((file = fopen(new_filename, "w")) == NULL)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Error: can't open output file\n");
+      return hypre_error_flag;
+   }
+
+   /* Print to file */
+   hypre_fprintf(file, "%d\n", size);
+   for (i = 0; i < size; i++)
+   {
+      hypre_fprintf(file, "%d\n", data[i]);
+   }
+   fclose(file);
+
+   /* Free memory */
+   if (h_array != array)
+   {
+      hypre_IntArrayDestroy(h_array);
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_IntArrayRead
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_IntArrayRead( MPI_Comm         comm,
+                    const char      *filename,
+                    hypre_IntArray **array_ptr )
+{
+   hypre_IntArray       *array;
+   HYPRE_Int             size;
+   FILE                 *file;
+   HYPRE_Int             i, myid;
+   char                  new_filename[1024];
+
+   hypre_MPI_Comm_rank(comm, &myid);
+
+   /* Open file */
+   hypre_sprintf(new_filename, "%s.%05d", filename, myid);
+   if ((file = fopen(new_filename, "r")) == NULL)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Error: can't open input file\n");
+      return hypre_error_flag;
+   }
+
+   /* Read array size from file */
+   hypre_fscanf(file, "%d\n", &size);
+
+   /* Create IntArray on the host */
+   array = hypre_IntArrayCreate(size);
+   hypre_IntArrayInitialize_v2(array, HYPRE_MEMORY_HOST);
+
+   /* Read array values from file */
+   for (i = 0; i < size; i++)
+   {
+      hypre_fscanf(file, "%d\n", &hypre_IntArrayData(array)[i]);
+   }
+   fclose(file);
+
+   /* Migrate to final memory location */
+   hypre_IntArrayMigrate(array, hypre_HandleMemoryLocation(hypre_handle()));
+
+   /* Set output pointer */
+   *array_ptr = array;
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_IntArraySetConstantValuesHost
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_IntArraySetConstantValuesHost( hypre_IntArray *v,
+                                     HYPRE_Int       value )
+{
+   HYPRE_Int *array_data = hypre_IntArrayData(v);
+   HYPRE_Int  size       = hypre_IntArraySize(v);
+   HYPRE_Int  i;
+
+#if defined(HYPRE_USING_OPENMP)
+   #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+#endif
+   for (i = 0; i < size; i++)
+   {
+      array_data[i] = value;
+   }
+
+   return hypre_error_flag;
+}
+
 /*--------------------------------------------------------------------------
  * hypre_IntArraySetConstantValues
  *--------------------------------------------------------------------------*/
@@ -145,32 +298,430 @@ HYPRE_Int
 hypre_IntArraySetConstantValues( hypre_IntArray *v,
                                  HYPRE_Int       value )
 {
-   HYPRE_Int     *array_data = hypre_IntArrayData(v);
-   HYPRE_Int      size       = hypre_IntArraySize(v);
-   HYPRE_Int      ierr       = 0;
+   if (hypre_IntArraySize(v) <= 0)
+   {
+      return hypre_error_flag;
+   }
+
+#if defined(HYPRE_USING_GPU) || defined(HYPRE_USING_DEVICE_OPENMP)
+   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1(hypre_IntArrayMemoryLocation(v));
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-   if (size > 0)
+   if (exec == HYPRE_EXEC_DEVICE)
    {
-      HYPRE_THRUST_CALL( fill_n, array_data, size, value );
+      hypre_IntArraySetConstantValuesDevice(v, value);
    }
-#else
-   HYPRE_Int i;
-#if defined(HYPRE_USING_DEVICE_OPENMP)
-#pragma omp target teams distribute parallel for private(i) is_device_ptr(array_data)
-#elif defined(HYPRE_USING_OPENMP)
-#pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+   else
+#endif
+   {
+      hypre_IntArraySetConstantValuesHost(v, value);
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_IntArraySetInterleavedValuesHost
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_IntArraySetInterleavedValuesHost( hypre_IntArray *v,
+                                        HYPRE_Int       cycle )
+{
+   HYPRE_Int *array_data = hypre_IntArrayData(v);
+   HYPRE_Int  size       = hypre_IntArraySize(v);
+   HYPRE_Int  i;
+
+#if defined(HYPRE_USING_OPENMP)
+   #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
 #endif
    for (i = 0; i < size; i++)
    {
-      array_data[i] = value;
+      array_data[i] = i % cycle;
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_IntArraySetInterleavedValues
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_IntArraySetInterleavedValues( hypre_IntArray *v,
+                                    HYPRE_Int       cycle )
+{
+   if (cycle < 1)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Invalid cycle value!");
+      return hypre_error_flag;
+   }
+
+#if defined(HYPRE_USING_GPU) || defined(HYPRE_USING_DEVICE_OPENMP)
+   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1(hypre_IntArrayMemoryLocation(v));
+
+   if (exec == HYPRE_EXEC_DEVICE)
+   {
+      hypre_IntArraySetInterleavedValuesDevice(v, cycle);
+   }
+   else
+#endif
+   {
+      hypre_IntArraySetInterleavedValuesHost(v, cycle);
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_IntArrayCountHost
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_IntArrayCountHost( hypre_IntArray *v,
+                         HYPRE_Int       value,
+                         HYPRE_Int      *num_values_ptr )
+{
+   HYPRE_Int  *array_data  = hypre_IntArrayData(v);
+   HYPRE_Int   size        = hypre_IntArraySize(v);
+   HYPRE_Int   num_values  = 0;
+   HYPRE_Int   i;
+
+#if !defined(_MSC_VER) && defined(HYPRE_USING_OPENMP)
+   #pragma omp parallel for private(i) reduction(+:num_values) HYPRE_SMP_SCHEDULE
+#endif
+   for (i = 0; i < size; i++)
+   {
+      num_values += (array_data[i] == value) ? 1 : 0;
+   }
+
+   *num_values_ptr = num_values;
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_IntArrayCount
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_IntArrayCount( hypre_IntArray *v,
+                     HYPRE_Int       value,
+                     HYPRE_Int      *num_values_ptr )
+{
+   if (hypre_IntArraySize(v) <= 0)
+   {
+      *num_values_ptr = 0;
+      return hypre_error_flag;
+   }
+
+#if defined(HYPRE_USING_GPU) || defined(HYPRE_USING_DEVICE_OPENMP)
+   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1(hypre_IntArrayMemoryLocation(v));
+
+   if (exec == HYPRE_EXEC_DEVICE)
+   {
+      hypre_IntArrayCountDevice(v, value, num_values_ptr);
+   }
+   else
+#endif
+   {
+      hypre_IntArrayCountHost(v, value, num_values_ptr);
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_IntArrayInverseMappingHost
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_IntArrayInverseMappingHost( hypre_IntArray  *v,
+                                  hypre_IntArray  *w )
+{
+   HYPRE_Int   size    = hypre_IntArraySize(v);
+   HYPRE_Int  *v_data  = hypre_IntArrayData(v);
+   HYPRE_Int  *w_data  = hypre_IntArrayData(w);
+
+   HYPRE_Int   i;
+
+#if defined(HYPRE_USING_OPENMP)
+   #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+#endif
+   for (i = 0; i < size; i++)
+   {
+      w_data[v_data[i]] = i;
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_IntArrayInverseMapping
+ *
+ * Compute the reverse mapping (w) given an input array (v)
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_IntArrayInverseMapping( hypre_IntArray  *v,
+                              hypre_IntArray **w_ptr )
+{
+   HYPRE_Int             size = hypre_IntArraySize(v);
+   HYPRE_MemoryLocation  memory_location = hypre_IntArrayMemoryLocation(v);
+   hypre_IntArray       *w;
+
+   /* Create and initialize output array */
+   w = hypre_IntArrayCreate(size);
+   hypre_IntArrayInitialize_v2(w, memory_location);
+
+   /* Exit if array has no elements */
+   if (hypre_IntArraySize(w) <= 0)
+   {
+      *w_ptr = w;
+
+      return hypre_error_flag;
+   }
+
+#if defined(HYPRE_USING_GPU)
+   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1(memory_location);
+
+   if (exec == HYPRE_EXEC_DEVICE)
+   {
+      hypre_IntArrayInverseMappingDevice(v, w);
+   }
+   else
+#endif
+   {
+      hypre_IntArrayInverseMappingHost(v, w);
+   }
+
+   /* Set output pointer */
+   *w_ptr = w;
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_IntArrayNegate
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_IntArrayNegate( hypre_IntArray *v )
+{
+   HYPRE_Int  *array_data  = hypre_IntArrayData(v);
+   HYPRE_Int   size        = hypre_IntArraySize(v);
+   HYPRE_Int   i;
+
+   if (size <= 0)
+   {
+      return hypre_error_flag;
    }
-#endif /* defined(HYPRE_USING_CUDA)  || defined(HYPRE_USING_HIP) */
 
 #if defined(HYPRE_USING_GPU)
-   hypre_SyncCudaComputeStream(hypre_handle());
+   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1(hypre_IntArrayMemoryLocation(v));
+
+   if (exec == HYPRE_EXEC_DEVICE)
+   {
+      hypre_IntArrayNegateDevice(v);
+   }
+   else
+#endif
+   {
+#if defined(HYPRE_USING_OPENMP)
+      #pragma omp parallel for private(i) HYPRE_SMP_SCHEDULE
+#endif
+      for (i = 0; i < size; i++)
+      {
+         array_data[i] = - array_data[i];
+      }
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_IntArraySeparateByValue
+ *
+ * This function separates the indices of an array "v" based on
+ * specified values.
+ *
+ * Input parameters:
+ *   - num_values: number of unique values found in "v"
+ *   - values: array of size "num_values" containing a list of unique values
+ *   - sizes: array of size "num_values" containing the number of occurrences
+ *            in "v" of each value from "values".
+ *   - v: object of type hypre_IntArray containing values for categorization.
+ *
+ * Output parameter:
+ *   - w: object of type hypre_IntArrayArray containing pointers to "num_values"
+ *        arrays. Each array contains the set of indices in "v" that map to a
+ *        particular value of the array "values".
+ *
+ * Example:
+ *   Consider the following:
+ *   - v = {-1, -1, 1, -1, -1, 1, 1, -1}
+ *   - values = {-1, 1}
+ *   - num_values = 2
+ *
+ *   This function computes:
+ *   - w[0] = {0, 1, 3, 4, 7}
+ *   - w[1] = {2, 5, 6}
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_IntArraySeparateByValue( HYPRE_Int             num_values,
+                               HYPRE_Int            *values,
+                               HYPRE_Int            *sizes,
+                               hypre_IntArray       *v,
+                               hypre_IntArrayArray **w_ptr )
+{
+   hypre_IntArrayArray *w;
+
+   HYPRE_Int           *v_data = hypre_IntArrayData(v);
+   HYPRE_Int            v_size = hypre_IntArraySize(v);
+   HYPRE_Int            i, k, val;
+   HYPRE_Int           *count;
+
+   /* Create output array */
+   w = hypre_IntArrayArrayCreate(num_values, sizes);
+   hypre_IntArrayArrayInitializeIn(w, hypre_IntArrayMemoryLocation(v));
+
+   /* Fill arrays */
+#if defined(HYPRE_USING_GPU) || defined(HYPRE_USING_DEVICE_OPENMP)
+   HYPRE_ExecutionPolicy exec = hypre_GetExecPolicy1(hypre_IntArrayMemoryLocation(v));
+
+   if (exec == HYPRE_EXEC_DEVICE)
+   {
+      hypre_IntArraySeparateByValueDevice(num_values, values, sizes, v, w);
+   }
+   else
 #endif
+   {
+      count = hypre_CTAlloc(HYPRE_Int, num_values, HYPRE_MEMORY_HOST);
+      for (k = 0; k < v_size; k++)
+      {
+         val = v_data[k];
+
+         /* Find which entry "val" belongs to */
+         for (i = 0; i < num_values; i++)
+         {
+            if (values[i] == val)
+            {
+               hypre_IntArrayArrayEntryIDataJ(w, i, count[i]++) = k;
+               break;
+            }
+         }
+      }
+      hypre_TFree(count, HYPRE_MEMORY_HOST);
+   }
+
+   /* Set output pointer */
+   *w_ptr = w;
+
+   return hypre_error_flag;
+}
+
+/******************************************************************************
+ *
+ * Routines for hypre_IntArrayArray struct
+ *
+ *****************************************************************************/
+
+/*--------------------------------------------------------------------------
+ * hypre_IntArrayArrayCreate
+ *--------------------------------------------------------------------------*/
+
+hypre_IntArrayArray *
+hypre_IntArrayArrayCreate( HYPRE_Int  num_entries,
+                           HYPRE_Int *sizes )
+{
+   hypre_IntArrayArray  *w;
+   HYPRE_Int             i;
+
+   w = hypre_CTAlloc(hypre_IntArrayArray, 1, HYPRE_MEMORY_HOST);
+
+   hypre_IntArrayArraySize(w)    = num_entries;
+   hypre_IntArrayArrayEntries(w) = hypre_TAlloc(hypre_IntArray*, num_entries, HYPRE_MEMORY_HOST);
+
+   for (i = 0; i < num_entries; i++)
+   {
+      hypre_IntArrayArrayEntryI(w, i) = hypre_IntArrayCreate(sizes[i]);
+   }
+
+   return w;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_IntArrayArrayDestroy
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_IntArrayArrayDestroy( hypre_IntArrayArray *w )
+{
+   HYPRE_Int  i;
 
-   return ierr;
+   if (w)
+   {
+      for (i = 0; i < hypre_IntArrayArraySize(w); i++)
+      {
+         hypre_IntArrayDestroy(hypre_IntArrayArrayEntryI(w, i));
+      }
+      hypre_TFree(hypre_IntArrayArrayEntries(w), HYPRE_MEMORY_HOST);
+      hypre_TFree(w, HYPRE_MEMORY_HOST);
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_IntArrayArrayInitializeIn
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_IntArrayArrayInitializeIn( hypre_IntArrayArray  *w,
+                                 HYPRE_MemoryLocation  memory_location )
+{
+   HYPRE_Int  i;
+
+   for (i = 0; i < hypre_IntArrayArraySize(w); i++)
+   {
+      hypre_IntArrayInitialize_v2(hypre_IntArrayArrayEntryI(w, i), memory_location);
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_IntArrayArrayInitialize
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_IntArrayArrayInitialize( hypre_IntArrayArray *w )
+{
+   hypre_IntArray  *v = hypre_IntArrayArrayEntryI(w, 0);
+   HYPRE_Int        i;
+
+   for (i = 0; i < hypre_IntArrayArraySize(w); i++)
+   {
+      hypre_IntArrayInitialize_v2(v, hypre_IntArrayMemoryLocation(v));
+   }
+
+   return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_IntArrayArrayMigrate
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_IntArrayArrayMigrate( hypre_IntArrayArray  *w,
+                            HYPRE_MemoryLocation  memory_location )
+{
+   HYPRE_Int i;
+
+   for (i = 0; i < hypre_IntArrayArraySize(w); i++)
+   {
+      hypre_IntArrayMigrate(hypre_IntArrayArrayEntryI(w, i), memory_location);
+   }
+
+   return hypre_error_flag;
+}
diff --git a/external/hypre/src/utilities/int_array.h b/external/hypre/src/utilities/int_array.h
index b1acaa7c..e26d7cfa 100644
--- a/external/hypre/src/utilities/int_array.h
+++ b/external/hypre/src/utilities/int_array.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -18,9 +18,9 @@
  * hypre_IntArray
  *--------------------------------------------------------------------------*/
 
-typedef struct 
+typedef struct
 {
-   /* pointer to data and size of data */ 
+   /* pointer to data and size of data */
    HYPRE_Int            *data;
    HYPRE_Int             size;
 
@@ -33,7 +33,34 @@ typedef struct
  *--------------------------------------------------------------------------*/
 
 #define hypre_IntArrayData(array)                  ((array) -> data)
+#define hypre_IntArrayDataI(array, i)              ((array) -> data[i])
 #define hypre_IntArraySize(array)                  ((array) -> size)
 #define hypre_IntArrayMemoryLocation(array)        ((array) -> memory_location)
 
+/******************************************************************************
+ *
+ * hypre_IntArrayArray: struct for holding an array of hypre_IntArray
+ *
+ *****************************************************************************/
+
+/*--------------------------------------------------------------------------
+ * hypre_IntArrayArray
+ *--------------------------------------------------------------------------*/
+
+typedef struct
+{
+   hypre_IntArray       **entries;
+   HYPRE_Int              size;
+} hypre_IntArrayArray;
+
+/*--------------------------------------------------------------------------
+ * Accessor functions for the IntArrayArray structure
+ *--------------------------------------------------------------------------*/
+
+#define hypre_IntArrayArrayEntries(array)           ((array) -> entries)
+#define hypre_IntArrayArrayEntryI(array, i)         ((array) -> entries[i])
+#define hypre_IntArrayArrayEntryIData(array, i)     ((array) -> entries[i] -> data)
+#define hypre_IntArrayArrayEntryIDataJ(array, i, j) ((array) -> entries[i] -> data[j])
+#define hypre_IntArrayArraySize(array)              ((array) -> size)
+
 #endif
diff --git a/external/hypre/src/utilities/int_array_device.c b/external/hypre/src/utilities/int_array_device.c
new file mode 100644
index 00000000..813c3f67
--- /dev/null
+++ b/external/hypre/src/utilities/int_array_device.c
@@ -0,0 +1,225 @@
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+#include "_hypre_utilities.h"
+#include "_hypre_utilities.hpp"
+#include "_hypre_onedpl.hpp"
+
+/* GPU kernels */
+#if defined(HYPRE_USING_GPU)
+
+/*--------------------------------------------------------------------------
+ * hypreGPUKernel_IntArrayInverseMapping
+ *--------------------------------------------------------------------------*/
+
+__global__ void
+hypreGPUKernel_IntArrayInverseMapping( hypre_DeviceItem  &item,
+                                       HYPRE_Int          size,
+                                       HYPRE_Int         *v_data,
+                                       HYPRE_Int         *w_data )
+{
+   HYPRE_Int i = hypre_gpu_get_grid_thread_id<1, 1>(item);
+
+   if (i < size)
+   {
+      w_data[v_data[i]] = i;
+   }
+}
+#endif
+
+/* Functions */
+#if defined(HYPRE_USING_GPU) || defined(HYPRE_USING_DEVICE_OPENMP)
+
+/*--------------------------------------------------------------------------
+ * hypre_IntArraySetConstantValuesDevice
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_IntArraySetConstantValuesDevice( hypre_IntArray *v,
+                                       HYPRE_Int       value )
+{
+   HYPRE_Int *array_data = hypre_IntArrayData(v);
+   HYPRE_Int  size       = hypre_IntArraySize(v);
+
+#if defined(HYPRE_USING_GPU)
+   hypreDevice_IntFilln( array_data, size, value );
+
+   hypre_SyncComputeStream();
+
+#elif defined(HYPRE_USING_DEVICE_OPENMP)
+   HYPRE_Int i;
+   #pragma omp target teams distribute parallel for private(i) is_device_ptr(array_data)
+   for (i = 0; i < size; i++)
+   {
+      array_data[i] = value;
+   }
+#endif
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_IntArrayInverseMappingDevice
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_IntArrayInverseMappingDevice( hypre_IntArray  *v,
+                                    hypre_IntArray  *w )
+{
+   HYPRE_Int   size    = hypre_IntArraySize(v);
+   HYPRE_Int  *v_data  = hypre_IntArrayData(v);
+   HYPRE_Int  *w_data  = hypre_IntArrayData(w);
+
+#if defined(HYPRE_USING_GPU)
+   dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+   dim3 gDim = hypre_GetDefaultDeviceGridDimension(size, "thread", bDim);
+
+   HYPRE_GPU_LAUNCH( hypreGPUKernel_IntArrayInverseMapping, gDim, bDim, size, v_data, w_data );
+   hypre_SyncComputeStream();
+
+#elif defined(HYPRE_USING_DEVICE_OPENMP)
+   HYPRE_Int i;
+
+   #pragma omp target teams distribute parallel for private(i) is_device_ptr(v_data, w_data)
+   for (i = 0; i < size; i++)
+   {
+      w_data[v_data[i]] = i;
+   }
+#endif
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_IntArrayCountDevice
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_IntArrayCountDevice( hypre_IntArray *v,
+                           HYPRE_Int       value,
+                           HYPRE_Int      *num_values_ptr )
+{
+   HYPRE_Int  *array_data  = hypre_IntArrayData(v);
+   HYPRE_Int   size        = hypre_IntArraySize(v);
+
+#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+   *num_values_ptr = HYPRE_THRUST_CALL( count,
+                                        array_data,
+                                        array_data + size,
+                                        value );
+
+#elif defined(HYPRE_USING_SYCL)
+   *num_values_ptr = HYPRE_ONEDPL_CALL( std::count,
+                                        array_data,
+                                        array_data + size,
+                                        value );
+
+#elif defined (HYPRE_USING_DEVICE_OPENMP)
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Function not implemented for Device OpenMP");
+   *num_values_ptr = 0;
+#endif
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_IntArrayNegateDevice
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_IntArrayNegateDevice( hypre_IntArray *v )
+{
+#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+   HYPRE_THRUST_CALL( transform,
+                      hypre_IntArrayData(v),
+                      hypre_IntArrayData(v) + hypre_IntArraySize(v),
+                      hypre_IntArrayData(v),
+                      thrust::negate<HYPRE_Int>() );
+#elif defined(HYPRE_USING_SYCL)
+   HYPRE_ONEDPL_CALL( std::transform,
+                      hypre_IntArrayData(v),
+                      hypre_IntArrayData(v) + hypre_IntArraySize(v),
+                      hypre_IntArrayData(v),
+                      std::negate<HYPRE_Int>() );
+#else
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Not implemented yet!");
+#endif
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_IntArraySetInterleavedValuesDevice
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_IntArraySetInterleavedValuesDevice( hypre_IntArray *v,
+                                          HYPRE_Int       cycle )
+{
+#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+   HYPRE_THRUST_CALL( sequence,
+                      hypre_IntArrayData(v),
+                      hypre_IntArrayData(v) + hypre_IntArraySize(v));
+
+   HYPRE_THRUST_CALL( transform,
+                      hypre_IntArrayData(v),
+                      hypre_IntArrayData(v) + hypre_IntArraySize(v),
+                      hypre_IntArrayData(v),
+                      hypreFunctor_IndexCycle(cycle) );
+
+#else
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Not implemented yet!");
+#endif
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_IntArraySeparateByValueDevice
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_IntArraySeparateByValueDevice( HYPRE_Int             num_values,
+                                     HYPRE_Int            *values,
+                                     HYPRE_Int            *sizes,
+                                     hypre_IntArray       *v,
+                                     hypre_IntArrayArray  *w )
+{
+#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+   HYPRE_Int     v_size = hypre_IntArraySize(v);
+   HYPRE_Int    *v_data = hypre_IntArrayData(v);
+   HYPRE_Int    *indices, *buffer;
+   HYPRE_Int     i, val;
+
+   /* Create a sequence of all indices */
+   indices = hypre_TAlloc(HYPRE_Int, v_size, HYPRE_MEMORY_DEVICE);
+   HYPRE_THRUST_CALL(sequence, indices, indices + v_size);
+
+   /* Create a buffer array */
+   buffer = hypre_TAlloc(HYPRE_Int, v_size, HYPRE_MEMORY_DEVICE);
+
+   for (i = 0; i < num_values; i++)
+   {
+      val = values[i];
+
+      HYPRE_THRUST_CALL(copy_if, indices, indices + v_size, v_data, buffer, equal<HYPRE_Int>(val));
+
+      hypre_TMemcpy(hypre_IntArrayArrayEntryIData(w, i), buffer, HYPRE_Int, sizes[i],
+                    HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
+   }
+
+   /* Free memory */
+   hypre_TFree(indices, HYPRE_MEMORY_DEVICE);
+   hypre_TFree(buffer, HYPRE_MEMORY_DEVICE);
+#else
+   hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Not implemented yet!");
+#endif
+
+   return hypre_error_flag;
+}
+
+#endif
diff --git a/external/hypre/src/utilities/log.c b/external/hypre/src/utilities/log.c
index 4308d7e5..fed79113 100644
--- a/external/hypre/src/utilities/log.c
+++ b/external/hypre/src/utilities/log.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/utilities/magma.c b/external/hypre/src/utilities/magma.c
new file mode 100644
index 00000000..f03a671e
--- /dev/null
+++ b/external/hypre/src/utilities/magma.c
@@ -0,0 +1,46 @@
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+#include "_hypre_utilities.h"
+
+#if defined(HYPRE_USING_MAGMA)
+
+/*--------------------------------------------------------------------------
+ * hypre_MagmaInitialize
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_MagmaInitialize(void)
+{
+   /* Initialize MAGMA */
+   magma_init();
+
+   /* Create device queue */
+#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+   hypre_int device_id;
+
+   hypre_GetDevice(&device_id);
+   magma_queue_create((magma_int_t) device_id, &hypre_HandleMagmaQueue(hypre_handle()));
+#endif
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_MagmaFinalize
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_MagmaFinalize(void)
+{
+   /* Finalize MAGMA */
+   magma_finalize();
+
+   return hypre_error_flag;
+}
+
+#endif /* HYPRE_USING_MAGMA */
diff --git a/external/hypre/src/utilities/magma.h b/external/hypre/src/utilities/magma.h
new file mode 100644
index 00000000..a4e5ac9f
--- /dev/null
+++ b/external/hypre/src/utilities/magma.h
@@ -0,0 +1,71 @@
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+#ifndef HYPRE_MAGMA_HEADER
+#define HYPRE_MAGMA_HEADER
+
+#include "HYPRE_config.h"
+
+#if defined(HYPRE_USING_MAGMA)
+
+#include "error.h"
+
+#ifdef __cplusplus
+extern "C++"
+{
+#endif
+
+#if !defined(MAGMA_GLOBAL)
+#define ADD_
+#endif
+#include <magma_v2.h>
+
+#ifdef __cplusplus
+}
+#endif
+
+/*--------------------------------------------------------------------------
+ * Wrappers to MAGMA functions according to hypre's precision
+ *--------------------------------------------------------------------------*/
+
+#if defined(HYPRE_COMPLEX) || defined(HYPRE_LONG_DOUBLE)
+#error "MAGMA interface does not support (yet) HYPRE_COMPLEX and HYPRE_LONG_DOUBLE"
+
+#elif defined(HYPRE_SINGLE)
+#define hypre_magma_getrf_gpu              magma_sgetrf_gpu
+#define hypre_magma_getrf_nat              magma_sgetrf_native
+#define hypre_magma_getrs_gpu              magma_sgetrs_gpu
+#define hypre_magma_getri_gpu              magma_sgetri_gpu
+#define hypre_magma_getri_nb               magma_get_dgetri_nb
+#define hypre_magma_gemv                   magma_sgemv
+
+#else /* Double precision */
+#define hypre_magma_getrf_gpu              magma_dgetrf_gpu
+#define hypre_magma_getrf_nat              magma_dgetrf_native
+#define hypre_magma_getrs_gpu              magma_dgetrs_gpu
+#define hypre_magma_getri_gpu              magma_dgetri_gpu
+#define hypre_magma_getri_nb               magma_get_sgetri_nb
+#define hypre_magma_gemv                   magma_dgemv
+
+#endif
+
+/*--------------------------------------------------------------------------
+ * General wrapper call to MAGMA functions
+ *--------------------------------------------------------------------------*/
+
+#define HYPRE_MAGMA_CALL(call) do {                   \
+   magma_int_t err = call;                            \
+   if (MAGMA_SUCCESS != err) {                        \
+      printf("MAGMA ERROR (code = %d) at %s:%d\n",    \
+            err, __FILE__, __LINE__);                 \
+      hypre_assert(0);                                \
+   } } while(0)
+
+#define HYPRE_MAGMA_VCALL(call) call
+
+#endif /* HYPRE_USING_MAGMA */
+#endif /* HYPRE_MAGMA_HEADER */
diff --git a/external/hypre/src/utilities/matrix_stats.c b/external/hypre/src/utilities/matrix_stats.c
new file mode 100644
index 00000000..caf7fb2d
--- /dev/null
+++ b/external/hypre/src/utilities/matrix_stats.c
@@ -0,0 +1,477 @@
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+#include "_hypre_utilities.h"
+
+/******************************************************************************
+ *
+ * Member functions for hypre_MatrixStats class.
+ *
+ *****************************************************************************/
+
+/*--------------------------------------------------------------------------
+ * hypre_MatrixStatsCreate
+ *--------------------------------------------------------------------------*/
+
+hypre_MatrixStats*
+hypre_MatrixStatsCreate(void)
+{
+   hypre_MatrixStats  *stats;
+
+   stats = hypre_CTAlloc(hypre_MatrixStats, 1, HYPRE_MEMORY_HOST);
+
+   hypre_MatrixStatsNumRows(stats)         = 0;
+   hypre_MatrixStatsNumCols(stats)         = 0;
+   hypre_MatrixStatsNumNonzeros(stats)     = 0ULL;
+
+   hypre_MatrixStatsActualNonzeros(stats)  = 0ULL;
+   hypre_MatrixStatsActualThreshold(stats) = HYPRE_REAL_EPSILON;
+   hypre_MatrixStatsSparsity(stats)        = 0.0;
+
+   hypre_MatrixStatsNnzrowMin(stats)       = 0;
+   hypre_MatrixStatsNnzrowMax(stats)       = 0;
+   hypre_MatrixStatsNnzrowAvg(stats)       = 0.0;
+   hypre_MatrixStatsNnzrowStDev(stats)     = 0.0;
+   hypre_MatrixStatsNnzrowSqsum(stats)     = 0.0;
+
+   hypre_MatrixStatsRowsumMin(stats)       = 0.0;
+   hypre_MatrixStatsRowsumMax(stats)       = 0.0;
+   hypre_MatrixStatsRowsumAvg(stats)       = 0.0;
+   hypre_MatrixStatsRowsumStDev(stats)     = 0.0;
+   hypre_MatrixStatsRowsumSqsum(stats)     = 0.0;
+
+   return stats;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_MatrixStatsDestroy
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_MatrixStatsDestroy(hypre_MatrixStats *stats)
+{
+   if (stats)
+   {
+      hypre_TFree(stats, HYPRE_MEMORY_HOST);
+   }
+
+   return hypre_error_flag;
+}
+
+/******************************************************************************
+ *
+ * Member functions for hypre_MatrixStatsArray class.
+ *
+ *****************************************************************************/
+
+/*--------------------------------------------------------------------------
+ * hypre_MatrixStatsArrayCreate
+ *--------------------------------------------------------------------------*/
+
+hypre_MatrixStatsArray*
+hypre_MatrixStatsArrayCreate(HYPRE_Int capacity)
+{
+   hypre_MatrixStatsArray  *stats_array;
+   HYPRE_Int                i;
+
+   stats_array = hypre_CTAlloc(hypre_MatrixStatsArray, 1, HYPRE_MEMORY_HOST);
+
+   hypre_MatrixStatsArrayCapacity(stats_array) = capacity;
+   hypre_MatrixStatsArrayEntries(stats_array)  = hypre_TAlloc(hypre_MatrixStats *,
+                                                              capacity,
+                                                              HYPRE_MEMORY_HOST);
+   for (i = 0; i < capacity; i++)
+   {
+      hypre_MatrixStatsArrayEntry(stats_array, i) = hypre_MatrixStatsCreate();
+   }
+
+   return stats_array;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_MatrixStatsArrayDestroy
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_MatrixStatsArrayDestroy(hypre_MatrixStatsArray *stats_array)
+{
+   HYPRE_Int   i;
+   HYPRE_Int   capacity;
+
+   if (stats_array)
+   {
+      capacity = hypre_MatrixStatsArrayCapacity(stats_array);
+
+      for (i = 0; i < capacity; i++)
+      {
+         hypre_MatrixStatsDestroy(hypre_MatrixStatsArrayEntry(stats_array, i));
+      }
+      hypre_TFree(hypre_MatrixStatsArrayEntries(stats_array), HYPRE_MEMORY_HOST);
+      hypre_TFree(stats_array, HYPRE_MEMORY_HOST);
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_MatrixStatsArrayPrint
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_MatrixStatsArrayPrint(HYPRE_Int                num_hierarchies,
+                            HYPRE_Int               *num_levels,
+                            HYPRE_Int                use_divisors,
+                            HYPRE_Int                shift,
+                            const char             **messages,
+                            hypre_MatrixStatsArray  *stats_array)
+{
+   HYPRE_Int            capacity = hypre_MatrixStatsArrayCapacity(stats_array);
+
+   hypre_MatrixStats   *stats;
+   hypre_MatrixStats   *stats_finest;
+   hypre_MatrixStats   *stats_next;
+
+   HYPRE_Int            ndigits[HYPRE_NDIGITS_SIZE];
+   HYPRE_Int            offsets[6];
+   HYPRE_Int            divisors[3];
+   HYPRE_Int            i, square;
+   HYPRE_Int            square_count;
+   HYPRE_Int            num_levels_total;
+   HYPRE_BigInt         fine_num_rows;
+   HYPRE_BigInt         coarse_num_rows;
+   HYPRE_BigInt         total_num_rows;
+
+   /* Compute total number of levels */
+   num_levels_total = 0;
+   for (i = 0; i < num_hierarchies; i++)
+   {
+      num_levels_total += num_levels[i];
+   }
+
+   /* Sanity check */
+   if (capacity < num_levels_total)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                        "Matrix statistics array does not have enough capacity!");
+      return hypre_error_flag;
+   }
+
+   /* Check if all matrices are square or rectangular */
+   square_count = 0;
+   for (i = 0; i < num_levels_total; i++)
+   {
+      stats = hypre_MatrixStatsArrayEntry(stats_array, i);
+
+      if (hypre_MatrixStatsNumRows(stats) ==
+          hypre_MatrixStatsNumCols(stats))
+      {
+         square_count += 1;
+      }
+   }
+
+   if (square_count == 0)
+   {
+      square = 0;
+   }
+   else if (square_count == num_levels_total)
+   {
+      square = 1;
+   }
+   else
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC,
+                        "Cannot process square and rectangular matrices at the same time!");
+      return hypre_error_flag;
+   }
+
+   /* Set some shortcuts */
+   stats_finest = hypre_MatrixStatsArrayEntry(stats_array, 0);
+
+   /* Digits computation */
+   ndigits[0]  = hypre_max(7, hypre_ndigits(hypre_MatrixStatsNumRows(stats_finest)));
+   ndigits[1]  = 7;
+   ndigits[2]  = hypre_max(8, hypre_ndigits(hypre_MatrixStatsNumNonzeros(stats_finest)));
+   ndigits[3]  = 7;
+   ndigits[4]  = 4;
+   ndigits[5]  = 4;
+   ndigits[6]  = 4;
+   ndigits[7]  = 5;
+   ndigits[8]  = 8;
+   ndigits[9]  = 8;
+   ndigits[10] = 8;
+   ndigits[11] = 8;
+
+   for (i = 0; i < num_levels_total; i++)
+   {
+      stats = hypre_MatrixStatsArrayEntry(stats_array, i);
+      stats_next = hypre_MatrixStatsArrayEntry(stats_array, i + 1);
+
+      total_num_rows = hypre_MatrixStatsNumRows(stats);
+      if (square)
+      {
+         if (i < num_levels_total - 1)
+         {
+            coarse_num_rows = hypre_MatrixStatsNumRows(stats_next);
+         }
+         else
+         {
+            coarse_num_rows = 0;
+         }
+      }
+      else
+      {
+         coarse_num_rows = hypre_MatrixStatsNumCols(stats);
+      }
+      fine_num_rows = total_num_rows - coarse_num_rows;
+
+      ndigits[1] = hypre_max(ndigits[1], 1 + hypre_ndigits(fine_num_rows));
+      ndigits[3] = hypre_max(ndigits[3],
+                             4 + hypre_ndigits((HYPRE_Int) hypre_MatrixStatsSparsity(stats)));
+      ndigits[4] = hypre_max(ndigits[4],
+                             1 + hypre_ndigits(hypre_MatrixStatsNnzrowMin(stats)));
+      ndigits[5] = hypre_max(ndigits[5],
+                             1 + hypre_ndigits(hypre_MatrixStatsNnzrowMax(stats)));
+      ndigits[6] = hypre_max(ndigits[6],
+                             4 + hypre_ndigits((HYPRE_Int) hypre_MatrixStatsNnzrowAvg(stats)));
+      ndigits[7] = hypre_max(ndigits[7],
+                             4 + hypre_ndigits((HYPRE_Int) hypre_MatrixStatsNnzrowStDev(stats)));
+   }
+
+   /* Column offsets calculation */
+   offsets[0] = 6 + ndigits[0] + ndigits[1] + ndigits[2];
+   offsets[1] = 0 + ndigits[2];
+   offsets[2] = 2 + ndigits[3];
+   offsets[3] = 7 + (ndigits[4] + ndigits[5] + ndigits[6] + ndigits[7]) / 2;
+   offsets[4] = (1 + ndigits[4] + ndigits[5] + ndigits[6] + ndigits[7]) / 2 - 3;
+   offsets[5] = 4 + (ndigits[8] + ndigits[9] + ndigits[10] + ndigits[11]) / 2;
+   if (!square)
+   {
+      offsets[0] += 2;
+   }
+
+   /* Table divisors */
+   if (use_divisors)
+   {
+      divisors[0] = 9 + ndigits[0] + ndigits[1] +  ndigits[3] + 2 * ndigits[2];
+      divisors[1] = 5 + ndigits[4] + ndigits[5] +  ndigits[6] +     ndigits[7];
+      divisors[2] = 5 + ndigits[8] + ndigits[9] + ndigits[10] +    ndigits[11];
+      if (!square)
+      {
+         divisors[0] += 2;
+      }
+   }
+   else
+   {
+      divisors[0] = 4 + ndigits[2]; /* Note: ndigits[2] happens twice */
+      for (i = 0; i < HYPRE_NDIGITS_SIZE; i++)
+      {
+         divisors[0] += ndigits[i] + 1;
+      }
+   }
+
+   /* Header first line */
+   HYPRE_PRINT_INDENT(shift);
+   {
+      hypre_printf("\n%s",   messages[0]);
+   }
+   HYPRE_PRINT_INDENT(shift);
+   {
+      hypre_printf("%*s ", offsets[0], "nonzero");
+      hypre_printf("%*s ", offsets[1], "actual");
+   }
+   if (use_divisors)
+   {
+      hypre_printf("%*s ", offsets[2], "|");
+   }
+   {
+      hypre_printf("%*s ", offsets[3], "entries/row");
+   }
+   if (use_divisors)
+   {
+      hypre_printf("%*s ", offsets[4], "|");
+   }
+   {
+      hypre_printf("%*s ", offsets[5], "rowsums");
+      hypre_printf("\n");
+   }
+
+   /* Header second line */
+   HYPRE_PRINT_INDENT(shift);
+   {
+      hypre_printf("%s ", "lev");
+   }
+   if (square)
+   {
+      hypre_printf("%*s ",  ndigits[0], "rows");
+      hypre_printf("%*s ",  ndigits[1], "fine");
+      hypre_printf("%*s ",  ndigits[2], "entries");
+   }
+   else
+   {
+      hypre_printf("%*s ",   ndigits[0], "rows");
+      hypre_printf("%-*s ",  ndigits[1], "x cols");
+      hypre_printf("%*s ",   ndigits[2], "   entries");
+   }
+   {
+      hypre_printf("%*s ",  ndigits[2], "entries");
+      hypre_printf("%*s ",  ndigits[3], "sparse");
+   }
+   if (use_divisors)
+   {
+      hypre_printf("| ");
+   }
+   {
+      // entries per row
+      hypre_printf("%*s ",  ndigits[4], "min");
+      hypre_printf("%*s ",  ndigits[5], "max");
+      hypre_printf("%*s ",  ndigits[6], "avg");
+      hypre_printf("%*s ",  ndigits[7], "stdev");
+   }
+   if (use_divisors)
+   {
+      hypre_printf("| ");
+   }
+   {
+      // rowsums
+      hypre_printf("%*s ",  ndigits[8], "min");
+      hypre_printf("%*s ",  ndigits[9], "max");
+      hypre_printf("%*s ", ndigits[10], "avg");
+      hypre_printf("%*s ", ndigits[11], "stdev");
+   }
+   {
+      hypre_printf("\n");
+   }
+   HYPRE_PRINT_INDENT(shift);
+   if (use_divisors)
+   {
+      HYPRE_PRINT_TOP_DIVISOR(3, divisors);
+   }
+   else
+   {
+      HYPRE_PRINT_TOP_DIVISOR(1, divisors);
+   }
+
+   /* Values */
+   for (i = 0; i < num_levels_total; i++)
+   {
+      stats = hypre_MatrixStatsArrayEntry(stats_array, i);
+      stats_next = hypre_MatrixStatsArrayEntry(stats_array, i + 1);
+
+      total_num_rows = hypre_MatrixStatsNumRows(stats);
+      if (square)
+      {
+         if (i < num_levels_total - 1)
+         {
+            coarse_num_rows = hypre_MatrixStatsNumRows(stats_next);
+         }
+         else
+         {
+            coarse_num_rows = 0;
+         }
+      }
+      else
+      {
+         coarse_num_rows = hypre_MatrixStatsNumCols(stats);
+      }
+      fine_num_rows = total_num_rows - coarse_num_rows;
+
+      /* General info */
+      HYPRE_PRINT_INDENT(shift);
+      if (square)
+      {
+         hypre_printf("%3d %*b %*b %*b %*b %*.3f ",
+                      i,
+                      ndigits[0], hypre_MatrixStatsNumRows(stats),
+                      ndigits[1], fine_num_rows,
+                      ndigits[2], hypre_MatrixStatsNumNonzeros(stats),
+                      ndigits[2], hypre_MatrixStatsActualNonzeros(stats),
+                      ndigits[3], hypre_MatrixStatsSparsity(stats));
+      }
+      else
+      {
+         hypre_printf("%3d %*b x %-*b %*b %*b %*.3f ",
+                      i,
+                      ndigits[0], hypre_MatrixStatsNumRows(stats),
+                      ndigits[1], coarse_num_rows,
+                      ndigits[2], hypre_MatrixStatsNumNonzeros(stats),
+                      ndigits[2], hypre_MatrixStatsActualNonzeros(stats),
+                      ndigits[3], hypre_MatrixStatsSparsity(stats));
+      }
+      if (use_divisors)
+      {
+         hypre_printf("| ");
+      }
+
+      /* Entries per row info */
+      hypre_printf("%*d %*d %*.1f %*.2f ",
+                   ndigits[4], hypre_MatrixStatsNnzrowMin(stats),
+                   ndigits[5], hypre_MatrixStatsNnzrowMax(stats),
+                   ndigits[6], hypre_MatrixStatsNnzrowAvg(stats),
+                   ndigits[7], hypre_MatrixStatsNnzrowStDev(stats));
+      if (use_divisors)
+      {
+         hypre_printf("| ");
+      }
+
+      /* Row sum info */
+      hypre_printf("%*.1e %*.1e %*.1e %*.1e",
+                   ndigits[8], hypre_MatrixStatsRowsumMin(stats),
+                   ndigits[9], hypre_MatrixStatsRowsumMax(stats),
+                   ndigits[10], hypre_MatrixStatsRowsumAvg(stats),
+                   ndigits[11], hypre_MatrixStatsRowsumStDev(stats));
+
+      if (use_divisors)
+      {
+         if (num_hierarchies == 1)
+         {
+            hypre_printf("\n");
+         }
+         else if (num_hierarchies == 2)
+         {
+            if (i == num_levels[0] / 2)
+            {
+               hypre_printf(messages[2]);
+            }
+
+            if ((num_levels[1] > 1) &&
+                (i == num_levels[0] + num_levels[1] / 2))
+            {
+               hypre_printf(messages[3]);
+            }
+
+            hypre_printf("\n");
+            HYPRE_PRINT_INDENT(shift);
+            if (square)
+            {
+               if (i == num_levels[0])
+               {
+                  HYPRE_PRINT_MID_DIVISOR(3, divisors, messages[1]);
+               }
+            }
+            else
+            {
+               if (i == (num_levels[0] - 1))
+               {
+                  HYPRE_PRINT_MID_DIVISOR(3, divisors, messages[1]);
+               }
+            }
+         }
+         else
+         {
+            hypre_error_w_msg(HYPRE_ERROR_GENERIC, "num_hierarchies > 2 not implemented!");
+            return hypre_error_flag;
+         }
+      }
+      else
+      {
+         hypre_printf("\n");
+      }
+   }
+   hypre_printf("\n\n");
+
+   return hypre_error_flag;
+}
diff --git a/external/hypre/src/utilities/matrix_stats.h b/external/hypre/src/utilities/matrix_stats.h
new file mode 100644
index 00000000..e583868e
--- /dev/null
+++ b/external/hypre/src/utilities/matrix_stats.h
@@ -0,0 +1,130 @@
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+#ifndef hypre_MATRIX_STATS_HEADER
+#define hypre_MATRIX_STATS_HEADER
+
+/******************************************************************************
+ *
+ * Header info for (generic) matrix statistics data structure
+ *
+ *****************************************************************************/
+
+typedef struct hypre_MatrixStats_struct
+{
+   /* General info */
+   HYPRE_BigInt        num_rows;
+   HYPRE_BigInt        num_cols;
+   hypre_ulonglongint  num_nonzeros;
+
+   /* Actual nonzeros statistics */
+   hypre_ulonglongint  actual_nonzeros;
+   HYPRE_Real          actual_threshold;
+   HYPRE_Real          sparsity;
+
+   /* Nonzeros per row statistics */
+   HYPRE_Int           nnzrow_min;
+   HYPRE_Int           nnzrow_max;
+   HYPRE_Real          nnzrow_avg;
+   HYPRE_Real          nnzrow_stdev;
+   HYPRE_Real          nnzrow_sqsum;
+
+   /* Row sum statistics */
+   HYPRE_Real          rowsum_min;
+   HYPRE_Real          rowsum_max;
+   HYPRE_Real          rowsum_avg;
+   HYPRE_Real          rowsum_stdev;
+   HYPRE_Real          rowsum_sqsum;
+} hypre_MatrixStats;
+
+/*--------------------------------------------------------------------------
+ * Accessor macros
+ *--------------------------------------------------------------------------*/
+
+#define hypre_MatrixStatsNumRows(data)               ((data) -> num_rows)
+#define hypre_MatrixStatsNumCols(data)               ((data) -> num_cols)
+#define hypre_MatrixStatsNumNonzeros(data)           ((data) -> num_nonzeros)
+
+#define hypre_MatrixStatsSparsity(data)              ((data) -> sparsity)
+#define hypre_MatrixStatsActualNonzeros(data)        ((data) -> actual_nonzeros)
+#define hypre_MatrixStatsActualThreshold(data)       ((data) -> actual_threshold)
+
+#define hypre_MatrixStatsNnzrowMin(data)             ((data) -> nnzrow_min)
+#define hypre_MatrixStatsNnzrowMax(data)             ((data) -> nnzrow_max)
+#define hypre_MatrixStatsNnzrowAvg(data)             ((data) -> nnzrow_avg)
+#define hypre_MatrixStatsNnzrowStDev(data)           ((data) -> nnzrow_stdev)
+#define hypre_MatrixStatsNnzrowSqsum(data)           ((data) -> nnzrow_sqsum)
+
+#define hypre_MatrixStatsRowsumMin(data)             ((data) -> rowsum_min)
+#define hypre_MatrixStatsRowsumMax(data)             ((data) -> rowsum_max)
+#define hypre_MatrixStatsRowsumAvg(data)             ((data) -> rowsum_avg)
+#define hypre_MatrixStatsRowsumStDev(data)           ((data) -> rowsum_stdev)
+#define hypre_MatrixStatsRowsumSqsum(data)           ((data) -> rowsum_sqsum)
+
+/******************************************************************************
+ *
+ * Header info for array of (generic) matrix statistics data structure
+ *
+ *****************************************************************************/
+
+typedef struct hypre_MatrixStatsArray_struct
+{
+   HYPRE_Int             capacity;
+   hypre_MatrixStats   **entries;
+} hypre_MatrixStatsArray;
+
+/*--------------------------------------------------------------------------
+ * Accessor macros
+ *--------------------------------------------------------------------------*/
+
+#define hypre_MatrixStatsArrayCapacity(data)         ((data) -> capacity)
+#define hypre_MatrixStatsArrayEntries(data)          ((data) -> entries)
+#define hypre_MatrixStatsArrayEntry(data, i)         ((data) -> entries[i])
+
+/*--------------------------------------------------------------------------
+ * Helper macros for table formatting
+ *--------------------------------------------------------------------------*/
+
+#define HYPRE_PRINT_TOP_DIVISOR(m, d)               \
+   for (HYPRE_Int __i = 0; __i < m; __i++)          \
+   {                                                \
+      for (HYPRE_Int __j = 0; __j < d[__i]; __j++)  \
+      {                                             \
+         hypre_printf("%s", "=");                   \
+      }                                             \
+      if (__i < m - 1)                              \
+      {                                             \
+         hypre_printf("+");                         \
+      }                                             \
+   }                                                \
+   hypre_printf("\n");
+
+#define HYPRE_PRINT_MID_DIVISOR(m, d, msg)          \
+   for (HYPRE_Int __i = 0; __i < m; __i++)          \
+   {                                                \
+      for (HYPRE_Int __j = 0; __j < d[__i]; __j++)  \
+      {                                             \
+         hypre_printf("%s", "-");                   \
+      }                                             \
+      if (__i < m - 1)                              \
+      {                                             \
+         hypre_printf("+");                         \
+      }                                             \
+   }                                                \
+   hypre_printf(" %s\n", msg);
+
+#define HYPRE_PRINT_INDENT(n)                       \
+   hypre_printf("%*s", (n > 0) ? n : 0, "");
+
+
+#define HYPRE_PRINT_SHIFTED_PARAM(n, ...)           \
+   HYPRE_PRINT_INDENT(n)                            \
+   hypre_printf(__VA_ARGS__)
+
+#define HYPRE_NDIGITS_SIZE 12
+
+#endif /* hypre_MATRIX_STATS_HEADER */
diff --git a/external/hypre/src/utilities/memory.c b/external/hypre/src/utilities/memory.c
index 322d355d..22a32edf 100644
--- a/external/hypre/src/utilities/memory.c
+++ b/external/hypre/src/utilities/memory.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -13,8 +13,16 @@
 
 #include "_hypre_utilities.h"
 #include "_hypre_utilities.hpp"
+#if defined(__APPLE__)
+#include <sys/types.h>
+#include <sys/sysctl.h>
+#include <mach/mach.h>
+#include <mach/task_info.h>
+#elif defined(__linux__)
+#include <sys/sysinfo.h>
+#endif
 
-#ifdef HYPRE_USE_UMALLOC
+#if defined(HYPRE_USE_UMALLOC)
 #undef HYPRE_USE_UMALLOC
 #endif
 
@@ -24,25 +32,77 @@
  *
  *****************************************************************************/
 
+HYPRE_Int
+hypre_GetMemoryLocationName(hypre_MemoryLocation  memory_location,
+                            char                 *memory_location_name)
+{
+   if (memory_location == hypre_MEMORY_HOST)
+   {
+      sprintf(memory_location_name, "%s", "HOST");
+   }
+   else if (memory_location == hypre_MEMORY_HOST_PINNED)
+   {
+      sprintf(memory_location_name, "%s", "HOST PINNED");
+   }
+   else if (memory_location == hypre_MEMORY_DEVICE)
+   {
+      sprintf(memory_location_name, "%s", "DEVICE");
+   }
+   else if (memory_location == hypre_MEMORY_UNIFIED)
+   {
+      sprintf(memory_location_name, "%s", "UNIFIED");
+   }
+   else
+   {
+      sprintf(memory_location_name, "%s", "");
+   }
+
+   return hypre_error_flag;
+}
+
 /*--------------------------------------------------------------------------
  * hypre_OutOfMemory
  *--------------------------------------------------------------------------*/
+
 static inline void
 hypre_OutOfMemory(size_t size)
 {
-   hypre_error_w_msg(HYPRE_ERROR_MEMORY,"Out of memory trying to allocate too many bytes\n");
+   char msg[1024];
+
+   hypre_sprintf(msg, "Out of memory trying to allocate %zu bytes\n", size);
+   hypre_error_w_msg(HYPRE_ERROR_MEMORY, msg);
    hypre_assert(0);
    fflush(stdout);
 }
 
 static inline void
-hypre_WrongMemoryLocation()
+hypre_WrongMemoryLocation(void)
 {
-   hypre_error_w_msg(HYPRE_ERROR_MEMORY, "Wrong HYPRE MEMORY location: Only HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE and HYPRE_MEMORY_HOST_PINNED are supported!\n");
+   hypre_error_w_msg(HYPRE_ERROR_MEMORY, "Unrecognized hypre_MemoryLocation\n");
    hypre_assert(0);
    fflush(stdout);
 }
 
+void
+hypre_CheckMemoryLocation(void *ptr, hypre_MemoryLocation location)
+{
+#if defined(HYPRE_DEBUG) && defined(HYPRE_USING_GPU)
+   if (!ptr)
+   {
+      return;
+   }
+
+   hypre_MemoryLocation location_ptr;
+   hypre_GetPointerLocation(ptr, &location_ptr);
+   /* do not use hypre_assert, which has alloc and free;
+    * will create an endless loop otherwise */
+   assert(location == location_ptr);
+#else
+   HYPRE_UNUSED_VAR(ptr);
+   HYPRE_UNUSED_VAR(location);
+#endif
+}
+
 /*==========================================================================
  * Physical memory location (hypre_MemoryLocation) interface
  *==========================================================================*/
@@ -61,20 +121,30 @@ hypre_DeviceMemset(void *ptr, HYPRE_Int value, size_t num)
 {
 #if defined(HYPRE_USING_DEVICE_OPENMP)
 #if defined(HYPRE_DEVICE_OPENMP_ALLOC)
-   HYPRE_CUDA_CALL( cudaMemset(ptr, value, num) );
+   #pragma omp target teams distribute parallel for is_device_ptr(ptr)
+   for (size_t i = 0; i < num; i++)
+   {
+      ((unsigned char *) ptr)[i] = (unsigned char) value;
+   }
 #else
    memset(ptr, value, num);
    HYPRE_OMPOffload(hypre__offload_device_num, ptr, num, "update", "to");
 #endif
-   HYPRE_CUDA_CALL( cudaDeviceSynchronize() );
-#endif
+   /* HYPRE_CUDA_CALL( cudaDeviceSynchronize() ); */
 
-#if defined(HYPRE_USING_CUDA)
+#elif defined(HYPRE_USING_CUDA)
    HYPRE_CUDA_CALL( cudaMemset(ptr, value, num) );
-#endif
 
-#if defined(HYPRE_USING_HIP)
+#elif defined(HYPRE_USING_HIP)
    HYPRE_HIP_CALL( hipMemset(ptr, value, num) );
+
+#elif defined(HYPRE_USING_SYCL)
+   HYPRE_SYCL_CALL( (hypre_HandleComputeStream(hypre_handle()))->memset(ptr, value, num).wait() );
+
+#else
+   HYPRE_UNUSED_VAR(ptr);
+   HYPRE_UNUSED_VAR(value);
+   HYPRE_UNUSED_VAR(num);
 #endif
 }
 
@@ -82,16 +152,31 @@ static inline void
 hypre_UnifiedMemset(void *ptr, HYPRE_Int value, size_t num)
 {
 #if defined(HYPRE_USING_DEVICE_OPENMP)
-   HYPRE_CUDA_CALL( cudaMemset(ptr, value, num) );
-   HYPRE_CUDA_CALL( cudaDeviceSynchronize() );
+#if defined(HYPRE_DEVICE_OPENMP_ALLOC)
+   #pragma omp target teams distribute parallel for is_device_ptr(ptr)
+   for (size_t i = 0; i < num; i++)
+   {
+      ((unsigned char *) ptr)[i] = (unsigned char) value;
+   }
+#else
+   memset(ptr, value, num);
+   HYPRE_OMPOffload(hypre__offload_device_num, ptr, num, "update", "to");
 #endif
+   /* HYPRE_CUDA_CALL( cudaDeviceSynchronize() ); */
 
-#if defined(HYPRE_USING_CUDA)
+#elif defined(HYPRE_USING_CUDA)
    HYPRE_CUDA_CALL( cudaMemset(ptr, value, num) );
-#endif
 
-#if defined(HYPRE_USING_HIP)
+#elif defined(HYPRE_USING_HIP)
    HYPRE_HIP_CALL( hipMemset(ptr, value, num) );
+
+#elif defined(HYPRE_USING_SYCL)
+   HYPRE_SYCL_CALL( (hypre_HandleComputeStream(hypre_handle()))->memset(ptr, value, num).wait() );
+
+#else
+   HYPRE_UNUSED_VAR(ptr);
+   HYPRE_UNUSED_VAR(value);
+   HYPRE_UNUSED_VAR(num);
 #endif
 }
 
@@ -101,56 +186,59 @@ hypre_UnifiedMemset(void *ptr, HYPRE_Int value, size_t num)
 static inline void
 hypre_UnifiedMemPrefetch(void *ptr, size_t size, hypre_MemoryLocation location)
 {
-#if defined(HYPRE_USING_GPU)
-#ifdef HYPRE_DEBUG
-   hypre_MemoryLocation tmp;
-   hypre_GetPointerLocation(ptr, &tmp);
-   /* do not use hypre_assert, which has alloc and free;
-    * will create an endless loop otherwise */
-   assert(hypre_MEMORY_UNIFIED == tmp);
-#endif
-#endif
-
-#if defined(HYPRE_USING_DEVICE_OPENMP)
-   if (location == hypre_MEMORY_DEVICE)
+   if (!size)
    {
-      HYPRE_CUDA_CALL( cudaMemPrefetchAsync(ptr, size, hypre_HandleCudaDevice(hypre_handle()),
-                       hypre_HandleCudaComputeStream(hypre_handle())) );
-   }
-   else if (location == hypre_MEMORY_HOST)
-   {
-      HYPRE_CUDA_CALL( cudaMemPrefetchAsync(ptr, size, cudaCpuDeviceId,
-                       hypre_HandleCudaComputeStream(hypre_handle())) );
+      return;
    }
-#endif
+
+   hypre_CheckMemoryLocation(ptr, hypre_MEMORY_UNIFIED);
 
 #if defined(HYPRE_USING_CUDA)
    if (location == hypre_MEMORY_DEVICE)
    {
-      HYPRE_CUDA_CALL( cudaMemPrefetchAsync(ptr, size, hypre_HandleCudaDevice(hypre_handle()),
-                       hypre_HandleCudaComputeStream(hypre_handle())) );
+      HYPRE_CUDA_CALL( cudaMemPrefetchAsync(ptr, size, hypre_HandleDevice(hypre_handle()),
+                                            hypre_HandleComputeStream(hypre_handle())) );
    }
    else if (location == hypre_MEMORY_HOST)
    {
       HYPRE_CUDA_CALL( cudaMemPrefetchAsync(ptr, size, cudaCpuDeviceId,
-                       hypre_HandleCudaComputeStream(hypre_handle())) );
+                                            hypre_HandleComputeStream(hypre_handle())) );
    }
-#endif
 
-#if defined(HYPRE_USING_HIP)
+#elif defined(HYPRE_USING_HIP)
+   HYPRE_UNUSED_VAR(ptr);
+   HYPRE_UNUSED_VAR(size);
+   HYPRE_UNUSED_VAR(location);
    // Not currently implemented for HIP, but leaving place holder
    /*
     *if (location == hypre_MEMORY_DEVICE)
     *{
-    *  HYPRE_HIP_CALL( hipMemPrefetchAsync(ptr, size, hypre_HandleCudaDevice(hypre_handle()),
-    *                   hypre_HandleCudaComputeStream(hypre_handle())) );
+    *  HYPRE_HIP_CALL( hipMemPrefetchAsync(ptr, size, hypre_HandleDevice(hypre_handle()),
+    *                   hypre_HandleComputeStream(hypre_handle())) );
     *}
     *else if (location == hypre_MEMORY_HOST)
     *{
     *   HYPRE_CUDA_CALL( hipMemPrefetchAsync(ptr, size, cudaCpuDeviceId,
-    *                    hypre_HandleCudaComputeStream(hypre_handle())) );
+    *                    hypre_HandleComputeStream(hypre_handle())) );
     *}
     */
+
+#elif defined(HYPRE_USING_SYCL)
+   HYPRE_UNUSED_VAR(ptr);
+   HYPRE_UNUSED_VAR(size);
+   HYPRE_UNUSED_VAR(location);
+   if (location == hypre_MEMORY_DEVICE)
+   {
+      /* WM: todo - the call below seems like it may occasionally result in an error: */
+      /*     Native API returns: -997 (The plugin has emitted a backend specific error) */
+      /*     or a seg fault. On the other hand, removing this line can also cause the code
+       *     to hang (or run excessively slow?). */
+      /* HYPRE_SYCL_CALL( hypre_HandleComputeStream(hypre_handle())->prefetch(ptr, size).wait() ); */
+   }
+#else
+   HYPRE_UNUSED_VAR(ptr);
+   HYPRE_UNUSED_VAR(size);
+   HYPRE_UNUSED_VAR(location);
 #endif
 }
 
@@ -212,6 +300,8 @@ hypre_DeviceMalloc(size_t size, HYPRE_Int zeroinit)
 #if defined(HYPRE_USING_CUDA)
 #if defined(HYPRE_USING_DEVICE_POOL)
       HYPRE_CUDA_CALL( hypre_CachingMallocDevice(&ptr, size) );
+#elif defined(HYPRE_USING_DEVICE_MALLOC_ASYNC)
+      HYPRE_CUDA_CALL( cudaMallocAsync(&ptr, size, NULL) );
 #else
       HYPRE_CUDA_CALL( cudaMalloc(&ptr, size) );
 #endif
@@ -221,6 +311,10 @@ hypre_DeviceMalloc(size_t size, HYPRE_Int zeroinit)
       HYPRE_HIP_CALL( hipMalloc(&ptr, size) );
 #endif
 
+#if defined(HYPRE_USING_SYCL)
+      ptr = (void *)sycl::malloc_device(size, *(hypre_HandleComputeStream(hypre_handle())));
+#endif
+
 #endif /* #if defined(HYPRE_USING_UMPIRE_DEVICE) */
    }
 
@@ -242,7 +336,15 @@ hypre_UnifiedMalloc(size_t size, HYPRE_Int zeroinit)
 #else
 
 #if defined(HYPRE_USING_DEVICE_OPENMP)
-   HYPRE_CUDA_CALL( cudaMallocManaged(&ptr, size, cudaMemAttachGlobal) );
+#if defined(HYPRE_DEVICE_OPENMP_ALLOC)
+   ptr = omp_target_alloc(size, hypre__offload_device_num);
+#else
+   ptr = malloc(size + sizeof(size_t));
+   size_t *sp = (size_t*) ptr;
+   sp[0] = size;
+   ptr = (void *) (&sp[1]);
+   HYPRE_OMPOffload(hypre__offload_device_num, ptr, size, "enter", "alloc");
+#endif
 #endif
 
 #if defined(HYPRE_USING_CUDA)
@@ -257,6 +359,11 @@ hypre_UnifiedMalloc(size_t size, HYPRE_Int zeroinit)
    HYPRE_HIP_CALL( hipMallocManaged(&ptr, size, hipMemAttachGlobal) );
 #endif
 
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_SYCL_CALL( ptr = (void *)sycl::malloc_shared(size,
+                                                      *(hypre_HandleComputeStream(hypre_handle()))) );
+#endif
+
 #endif /* #if defined(HYPRE_USING_UMPIRE_UM) */
 
    /* prefecth to device */
@@ -282,10 +389,6 @@ hypre_HostPinnedMalloc(size_t size, HYPRE_Int zeroinit)
    hypre_umpire_pinned_pooled_allocate(&ptr, size);
 #else
 
-#if defined(HYPRE_USING_DEVICE_OPENMP)
-   HYPRE_CUDA_CALL( cudaMallocHost(&ptr, size) );
-#endif
-
 #if defined(HYPRE_USING_CUDA)
    HYPRE_CUDA_CALL( cudaMallocHost(&ptr, size) );
 #endif
@@ -294,6 +397,11 @@ hypre_HostPinnedMalloc(size_t size, HYPRE_Int zeroinit)
    HYPRE_HIP_CALL( hipHostMalloc(&ptr, size) );
 #endif
 
+#if defined(HYPRE_USING_SYCL)
+   HYPRE_SYCL_CALL( ptr = (void *)sycl::malloc_host(size,
+                                                    *(hypre_HandleComputeStream(hypre_handle()))) );
+#endif
+
 #endif /* #if defined(HYPRE_USING_UMPIRE_PINNED) */
 
    if (ptr && zeroinit)
@@ -384,6 +492,8 @@ hypre_DeviceFree(void *ptr)
 #if defined(HYPRE_USING_CUDA)
 #if defined(HYPRE_USING_DEVICE_POOL)
       HYPRE_CUDA_CALL( hypre_CachingFreeDevice(ptr) );
+#elif defined(HYPRE_USING_DEVICE_MALLOC_ASYNC)
+      HYPRE_CUDA_CALL( cudaFreeAsync(ptr, NULL) );
 #else
       HYPRE_CUDA_CALL( cudaFree(ptr) );
 #endif
@@ -393,6 +503,10 @@ hypre_DeviceFree(void *ptr)
       HYPRE_HIP_CALL( hipFree(ptr) );
 #endif
 
+#if defined(HYPRE_USING_SYCL)
+      HYPRE_SYCL_CALL( sycl::free(ptr, *(hypre_HandleComputeStream(hypre_handle()))) );
+#endif
+
 #endif /* #if defined(HYPRE_USING_UMPIRE_DEVICE) */
    }
 }
@@ -402,23 +516,27 @@ hypre_UnifiedFree(void *ptr)
 {
 #if defined(HYPRE_USING_UMPIRE_UM)
    hypre_umpire_um_pooled_free(ptr);
-#else
 
-#if defined(HYPRE_USING_DEVICE_OPENMP)
-   HYPRE_CUDA_CALL( cudaFree(ptr) );
-#endif
+#elif defined(HYPRE_USING_DEVICE_OPENMP) && defined(HYPRE_DEVICE_OPENMP_ALLOC)
+   omp_target_free(ptr, hypre__offload_device_num);
 
-#if defined(HYPRE_USING_CUDA)
-#if defined(HYPRE_USING_DEVICE_POOL)
+#elif defined(HYPRE_USING_DEVICE_OPENMP) && !defined(HYPRE_DEVICE_OPENMP_ALLOC)
+   HYPRE_OMPOffload(hypre__offload_device_num, ptr, ((size_t *) ptr)[-1], "exit", "delete");
+
+#elif defined(HYPRE_USING_CUDA) && defined(HYPRE_USING_DEVICE_POOL)
    HYPRE_CUDA_CALL( hypre_CachingFreeManaged(ptr) );
-#else
+
+#elif defined(HYPRE_USING_CUDA) && !defined(HYPRE_USING_DEVICE_POOL)
    HYPRE_CUDA_CALL( cudaFree(ptr) );
-#endif
-#endif
 
-#if defined(HYPRE_USING_HIP)
+#elif defined(HYPRE_USING_HIP)
    HYPRE_HIP_CALL( hipFree(ptr) );
-#endif
+
+#elif defined(HYPRE_USING_SYCL)
+   HYPRE_SYCL_CALL( sycl::free(ptr, *(hypre_HandleComputeStream(hypre_handle()))) );
+
+#else
+   HYPRE_UNUSED_VAR(ptr);
 
 #endif /* #if defined(HYPRE_USING_UMPIRE_UM) */
 }
@@ -428,19 +546,18 @@ hypre_HostPinnedFree(void *ptr)
 {
 #if defined(HYPRE_USING_UMPIRE_PINNED)
    hypre_umpire_pinned_pooled_free(ptr);
-#else
-
-#if defined(HYPRE_USING_DEVICE_OPENMP)
-   HYPRE_CUDA_CALL( cudaFreeHost(ptr) );
-#endif
 
-#if defined(HYPRE_USING_CUDA)
+#elif defined(HYPRE_USING_CUDA)
    HYPRE_CUDA_CALL( cudaFreeHost(ptr) );
-#endif
 
-#if defined(HYPRE_USING_HIP)
+#elif defined(HYPRE_USING_HIP)
    HYPRE_HIP_CALL( hipHostFree(ptr) );
-#endif
+
+#elif defined(HYPRE_USING_SYCL)
+   HYPRE_SYCL_CALL( sycl::free(ptr, *(hypre_HandleComputeStream(hypre_handle()))) );
+
+#else
+   HYPRE_UNUSED_VAR(ptr);
 
 #endif /* #if defined(HYPRE_USING_UMPIRE_PINNED) */
 }
@@ -453,13 +570,7 @@ hypre_Free_core(void *ptr, hypre_MemoryLocation location)
       return;
    }
 
-#ifdef HYPRE_DEBUG
-   hypre_MemoryLocation tmp;
-   hypre_GetPointerLocation(ptr, &tmp);
-   /* do not use hypre_assert, which has alloc and free;
-    * will create an endless loop otherwise */
-   assert(location == tmp);
-#endif
+   hypre_CheckMemoryLocation(ptr, location);
 
    switch (location)
    {
@@ -491,8 +602,18 @@ _hypre_Free(void *ptr, hypre_MemoryLocation location)
  * Memcpy
  *--------------------------------------------------------------------------*/
 static inline void
-hypre_Memcpy_core(void *dst, void *src, size_t size, hypre_MemoryLocation loc_dst, hypre_MemoryLocation loc_src)
+hypre_Memcpy_core(void *dst, void *src, size_t size, hypre_MemoryLocation loc_dst,
+                  hypre_MemoryLocation loc_src)
 {
+   if (size == 0)
+   {
+      return;
+   }
+
+#if defined(HYPRE_USING_SYCL)
+   sycl::queue* q = hypre_HandleComputeStream(hypre_handle());
+#endif
+
    if (dst == NULL || src == NULL)
    {
       if (size)
@@ -509,6 +630,12 @@ hypre_Memcpy_core(void *dst, void *src, size_t size, hypre_MemoryLocation loc_ds
       return;
    }
 
+   if (size > 0)
+   {
+      hypre_CheckMemoryLocation(dst, loc_dst);
+      hypre_CheckMemoryLocation(src, loc_src);
+   }
+
    /* Totally 4 x 4 = 16 cases */
 
    /* 4: Host   <-- Host, Host   <-- Pinned,
@@ -528,7 +655,7 @@ hypre_Memcpy_core(void *dst, void *src, size_t size, hypre_MemoryLocation loc_ds
         (loc_dst == hypre_MEMORY_UNIFIED && loc_src == hypre_MEMORY_UNIFIED) )
    {
 #if defined(HYPRE_USING_DEVICE_OPENMP)
-      HYPRE_CUDA_CALL( cudaMemcpy(dst, src, size, cudaMemcpyDeviceToDevice) );
+      omp_target_memcpy(dst, src, size, 0, 0, hypre__offload_device_num, hypre__offload_device_num);
 #endif
 
 #if defined(HYPRE_USING_CUDA)
@@ -536,7 +663,14 @@ hypre_Memcpy_core(void *dst, void *src, size_t size, hypre_MemoryLocation loc_ds
 #endif
 
 #if defined(HYPRE_USING_HIP)
-      HYPRE_HIP_CALL( hipMemcpy(dst, src, size, hipMemcpyDeviceToDevice) );
+      // hipMemcpy(DtoD) causes a host-side synchronization, unlike cudaMemcpy(DtoD),
+      // use hipMemcpyAsync to get cuda's more performant behavior. For more info see:
+      // https://github.com/mfem/mfem/pull/2780
+      HYPRE_HIP_CALL( hipMemcpyAsync(dst, src, size, hipMemcpyDeviceToDevice) );
+#endif
+
+#if defined(HYPRE_USING_SYCL)
+      HYPRE_SYCL_CALL( q->memcpy(dst, src, size).wait() );
 #endif
       return;
    }
@@ -546,7 +680,7 @@ hypre_Memcpy_core(void *dst, void *src, size_t size, hypre_MemoryLocation loc_ds
    if (loc_dst == hypre_MEMORY_UNIFIED)
    {
 #if defined(HYPRE_USING_DEVICE_OPENMP)
-      HYPRE_CUDA_CALL( cudaMemcpy(dst, src, size, cudaMemcpyHostToDevice) );
+      omp_target_memcpy(dst, src, size, 0, 0, hypre__offload_device_num, hypre__offload_host_num);
 #endif
 
 #if defined(HYPRE_USING_CUDA)
@@ -556,6 +690,10 @@ hypre_Memcpy_core(void *dst, void *src, size_t size, hypre_MemoryLocation loc_ds
 #if defined(HYPRE_USING_HIP)
       HYPRE_HIP_CALL( hipMemcpy(dst, src, size, hipMemcpyHostToDevice) );
 #endif
+
+#if defined(HYPRE_USING_SYCL)
+      HYPRE_SYCL_CALL( q->memcpy(dst, src, size).wait() );
+#endif
       return;
    }
 
@@ -564,7 +702,7 @@ hypre_Memcpy_core(void *dst, void *src, size_t size, hypre_MemoryLocation loc_ds
    if (loc_src == hypre_MEMORY_UNIFIED)
    {
 #if defined(HYPRE_USING_DEVICE_OPENMP)
-      HYPRE_CUDA_CALL( cudaMemcpy(dst, src, size, cudaMemcpyDeviceToHost) );
+      omp_target_memcpy(dst, src, size, 0, 0, hypre__offload_host_num, hypre__offload_device_num);
 #endif
 
 #if defined(HYPRE_USING_CUDA)
@@ -574,12 +712,17 @@ hypre_Memcpy_core(void *dst, void *src, size_t size, hypre_MemoryLocation loc_ds
 #if defined(HYPRE_USING_HIP)
       HYPRE_HIP_CALL( hipMemcpy(dst, src, size, hipMemcpyDeviceToHost) );
 #endif
+
+#if defined(HYPRE_USING_SYCL)
+      HYPRE_SYCL_CALL( q->memcpy(dst, src, size).wait() );
+#endif
       return;
    }
 
 
    /* 2: Device <-- Host, Device <-- Pinned */
-   if ( loc_dst == hypre_MEMORY_DEVICE && (loc_src == hypre_MEMORY_HOST || loc_src == hypre_MEMORY_HOST_PINNED) )
+   if ( loc_dst == hypre_MEMORY_DEVICE && (loc_src == hypre_MEMORY_HOST ||
+                                           loc_src == hypre_MEMORY_HOST_PINNED) )
    {
 #if defined(HYPRE_USING_DEVICE_OPENMP)
 #if defined(HYPRE_DEVICE_OPENMP_ALLOC)
@@ -597,12 +740,17 @@ hypre_Memcpy_core(void *dst, void *src, size_t size, hypre_MemoryLocation loc_ds
 #if defined(HYPRE_USING_HIP)
       HYPRE_HIP_CALL( hipMemcpy(dst, src, size, hipMemcpyHostToDevice) );
 #endif
+
+#if defined(HYPRE_USING_SYCL)
+      HYPRE_SYCL_CALL( q->memcpy(dst, src, size).wait() );
+#endif
       return;
    }
 
 
    /* 2: Host <-- Device, Pinned <-- Device */
-   if ( (loc_dst == hypre_MEMORY_HOST || loc_dst == hypre_MEMORY_HOST_PINNED) && loc_src == hypre_MEMORY_DEVICE )
+   if ( (loc_dst == hypre_MEMORY_HOST || loc_dst == hypre_MEMORY_HOST_PINNED) &&
+        loc_src == hypre_MEMORY_DEVICE )
    {
 #if defined(HYPRE_USING_DEVICE_OPENMP)
 #if defined(HYPRE_DEVICE_OPENMP_ALLOC)
@@ -620,6 +768,10 @@ hypre_Memcpy_core(void *dst, void *src, size_t size, hypre_MemoryLocation loc_ds
 #if defined(HYPRE_USING_HIP)
       HYPRE_HIP_CALL( hipMemcpy(dst, src, size, hipMemcpyDeviceToHost) );
 #endif
+
+#if defined(HYPRE_USING_SYCL)
+      HYPRE_SYCL_CALL( q->memcpy(dst, src, size).wait() );
+#endif
       return;
    }
 
@@ -642,7 +794,14 @@ hypre_Memcpy_core(void *dst, void *src, size_t size, hypre_MemoryLocation loc_ds
 #endif
 
 #if defined(HYPRE_USING_HIP)
-      HYPRE_HIP_CALL( hipMemcpy(dst, src, size, hipMemcpyDeviceToDevice) );
+      // hipMemcpy(DtoD) causes a host-side synchronization, unlike cudaMemcpy(DtoD),
+      // use hipMemcpyAsync to get cuda's more performant behavior. For more info see:
+      // https://github.com/mfem/mfem/pull/2780
+      HYPRE_HIP_CALL( hipMemcpyAsync(dst, src, size, hipMemcpyDeviceToDevice) );
+#endif
+
+#if defined(HYPRE_USING_SYCL)
+      HYPRE_SYCL_CALL( q->memcpy(dst, src, size).wait() );
 #endif
       return;
    }
@@ -653,6 +812,7 @@ hypre_Memcpy_core(void *dst, void *src, size_t size, hypre_MemoryLocation loc_ds
 /*--------------------------------------------------------------------------*
  * ExecPolicy
  *--------------------------------------------------------------------------*/
+
 static inline HYPRE_ExecutionPolicy
 hypre_GetExecPolicy1_core(hypre_MemoryLocation location)
 {
@@ -668,7 +828,7 @@ hypre_GetExecPolicy1_core(hypre_MemoryLocation location)
          exec = HYPRE_EXEC_DEVICE;
          break;
       case hypre_MEMORY_UNIFIED :
-#if defined(HYPRE_USING_GPU)
+#if defined(HYPRE_USING_GPU) || defined(HYPRE_USING_DEVICE_OPENMP)
          exec = hypre_HandleDefaultExecPolicy(hypre_handle());
 #endif
          break;
@@ -715,7 +875,7 @@ hypre_GetExecPolicy2_core(hypre_MemoryLocation location1,
 
    if (location1 == hypre_MEMORY_UNIFIED && location2 == hypre_MEMORY_UNIFIED)
    {
-#if defined(HYPRE_USING_GPU)
+#if defined(HYPRE_USING_GPU) || defined(HYPRE_USING_DEVICE_OPENMP)
       exec = hypre_HandleDefaultExecPolicy(hypre_handle());
 #endif
    }
@@ -762,6 +922,8 @@ hypre_Memset(void *ptr, HYPRE_Int value, size_t num, HYPRE_MemoryLocation locati
       return ptr;
    }
 
+   hypre_CheckMemoryLocation(ptr, hypre_GetActualMemLocation(location));
+
    switch (hypre_GetActualMemLocation(location))
    {
       case hypre_MEMORY_HOST :
@@ -821,9 +983,11 @@ hypre_Free(void *ptr, HYPRE_MemoryLocation location)
  *--------------------------------------------------------------------------*/
 
 void
-hypre_Memcpy(void *dst, void *src, size_t size, HYPRE_MemoryLocation loc_dst, HYPRE_MemoryLocation loc_src)
+hypre_Memcpy(void *dst, void *src, size_t size, HYPRE_MemoryLocation loc_dst,
+             HYPRE_MemoryLocation loc_src)
 {
-   hypre_Memcpy_core( dst, src, size, hypre_GetActualMemLocation(loc_dst), hypre_GetActualMemLocation(loc_src) );
+   hypre_Memcpy_core( dst, src, size, hypre_GetActualMemLocation(loc_dst),
+                      hypre_GetActualMemLocation(loc_src) );
 }
 
 /*--------------------------------------------------------------------------
@@ -879,6 +1043,11 @@ hypre_ReAlloc_v2(void *ptr, size_t old_size, size_t new_size, HYPRE_MemoryLocati
       return hypre_MAlloc(new_size, location);
    }
 
+   if (old_size == new_size)
+   {
+      return ptr;
+   }
+
    void *new_ptr = hypre_MAlloc(new_size, location);
    size_t smaller_size = new_size > old_size ? old_size : new_size;
    hypre_Memcpy(new_ptr, ptr, smaller_size, location, location);
@@ -924,7 +1093,7 @@ hypre_GetPointerLocation(const void *ptr, hypre_MemoryLocation *memory_location)
 #if defined(HYPRE_USING_GPU)
    *memory_location = hypre_MEMORY_UNDEFINED;
 
-#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_DEVICE_OPENMP)
+#if defined(HYPRE_USING_CUDA)
    struct cudaPointerAttributes attr;
 
 #if (CUDART_VERSION >= 10000)
@@ -982,7 +1151,7 @@ hypre_GetPointerLocation(const void *ptr, hypre_MemoryLocation *memory_location)
       *memory_location = hypre_MEMORY_HOST_PINNED;
    }
 #endif // CUDART_VERSION >= 10000
-#endif // defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_DEVICE_OPENMP)
+#endif // defined(HYPRE_USING_CUDA)
 
 #if defined(HYPRE_USING_HIP)
 
@@ -995,7 +1164,7 @@ hypre_GetPointerLocation(const void *ptr, hypre_MemoryLocation *memory_location)
       ierr = 1;
 
       /* clear the error */
-      hipGetLastError();
+      (void) hipGetLastError();
 
       if (err == hipErrorInvalidValue)
       {
@@ -1006,271 +1175,479 @@ hypre_GetPointerLocation(const void *ptr, hypre_MemoryLocation *memory_location)
    {
       *memory_location = hypre_MEMORY_UNIFIED;
    }
+#if (HIP_VERSION_MAJOR >= 6)
+   else if (attr.type == hipMemoryTypeDevice)
+#else // (HIP_VERSION_MAJOR < 6)
    else if (attr.memoryType == hipMemoryTypeDevice)
+#endif // (HIP_VERSION_MAJOR >= 6)
    {
       *memory_location = hypre_MEMORY_DEVICE;
    }
+#if (HIP_VERSION_MAJOR >= 6)
+   else if (attr.type == hipMemoryTypeHost)
+#else // (HIP_VERSION_MAJOR < 6)
    else if (attr.memoryType == hipMemoryTypeHost)
+#endif // (HIP_VERSION_MAJOR >= 6)
    {
       *memory_location = hypre_MEMORY_HOST_PINNED;
    }
+#if (HIP_VERSION_MAJOR >= 6)
+   else if (attr.type == hipMemoryTypeUnregistered)
+#else
+   else
+#endif
+   {
+      *memory_location = hypre_MEMORY_HOST;
+   }
 #endif // defined(HYPRE_USING_HIP)
 
+#if defined(HYPRE_USING_SYCL)
+   /* If the device is not setup, then all allocations are assumed to be on the host */
+   *memory_location = hypre_MEMORY_HOST;
+   if (hypre_HandleDeviceData(hypre_handle()))
+   {
+      if (hypre_HandleDevice(hypre_handle()))
+      {
+         sycl::usm::alloc allocType;
+         allocType = sycl::get_pointer_type(ptr, (hypre_HandleComputeStream(hypre_handle()))->get_context());
+
+         if (allocType == sycl::usm::alloc::unknown)
+         {
+            *memory_location = hypre_MEMORY_HOST;
+         }
+         else if (allocType == sycl::usm::alloc::host)
+         {
+            *memory_location = hypre_MEMORY_HOST_PINNED;
+         }
+         else if (allocType == sycl::usm::alloc::device)
+         {
+            *memory_location = hypre_MEMORY_DEVICE;
+         }
+         else if (allocType == sycl::usm::alloc::shared)
+         {
+            *memory_location = hypre_MEMORY_UNIFIED;
+         }
+      }
+   }
+#endif //HYPRE_USING_SYCL
+
 #else /* #if defined(HYPRE_USING_GPU) */
    *memory_location = hypre_MEMORY_HOST;
+   HYPRE_UNUSED_VAR(ptr);
 #endif
 
    return ierr;
 }
 
-#ifdef HYPRE_USING_MEMORY_TRACKER
-
 /*--------------------------------------------------------------------------
- * Memory tracker
- * do not use hypre_T* in the following since we don't want to track them   *
+ * hypre_HostMemoryGetUsage
+ *
+ * Retrieves various memory usage statistics involving CPU RAM. The function
+ * fills an array with the memory data, converted to gibibytes (GiB).
+ * Detailed info is given below:
+ *
+ *    - mem[0]: VmSize
+ *      The current virtual memory size used by the process. This includes
+ *      all memory the process can access, including memory that is swapped
+ *      out and memory allocated but not used.
+ *
+ *    - mem[1]: VmPeak
+ *      The peak virtual memory size used by the process during its lifetime.
+ *
+ *    - mem[2]: VmRSS
+ *      The resident set size, which is the portion of the process' memory
+ *      that is held in CPU RAM. This includes code, data, and stack space
+ *      but excludes swapped-out memory.
+ *
+ *    - mem[3]: VmHWM
+ *      The peak resident set size, which is the maximum amount of memory
+ *      that the process has had in CPU RAM at any point in time, aka.
+ *      high water mark.
+ *
+ *    - mem[4]: used
+ *      The amount of used CPU RAM in the system.
+ *
+ *    - mem[5]: total
+ *      The total amount of CPU RAM installed in the system.
+ *
+ * This function doesn't return correct memory info for Windows environments.
  *--------------------------------------------------------------------------*/
-hypre_MemoryTracker *
-hypre_MemoryTrackerCreate()
-{
-   hypre_MemoryTracker *ptr = (hypre_MemoryTracker *) calloc(1, sizeof(hypre_MemoryTracker));
-   return ptr;
-}
 
-void
-hypre_MemoryTrackerDestroy(hypre_MemoryTracker *tracker)
+HYPRE_Int
+hypre_HostMemoryGetUsage(HYPRE_Real *mem)
 {
-   if (tracker)
+   size_t       vm_size  = 0;
+   size_t       vm_rss   = 0;
+   size_t       vm_hwm   = 0;
+   size_t       vm_peak  = 0;
+   size_t       tot_mem  = 0;
+   size_t       free_mem = 0;
+   HYPRE_Real   b_to_gib = (HYPRE_Real) (1 << 30);
+
+   /* Sanity check */
+   if (!mem)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Mem is a NULL pointer!");
+      return hypre_error_flag;
+   }
+
+   /* Get system memory info */
+#if defined(__APPLE__)
+   struct task_basic_info   t_info;
+   mach_msg_type_number_t   t_info_count = TASK_BASIC_INFO_COUNT;
+   mach_msg_type_number_t   count = HOST_VM_INFO_COUNT;
+   vm_statistics_data_t     vm_stat;
+   hypre_int                mib[2] = {CTL_HW, HW_MEMSIZE};
+   size_t                   length = sizeof(size_t);
+
+   if (sysctl(mib, 2, &tot_mem, &length, NULL, 0))
    {
-      free(tracker->data);
-      free(tracker);
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Problem running sysctl!");
+      return hypre_error_flag;
    }
-}
 
-void
-hypre_MemoryTrackerInsert(const char           *action,
-                          void                 *ptr,
-                          size_t                nbytes,
-                          hypre_MemoryLocation  memory_location,
-                          const char           *filename,
-                          const char           *function,
-                          HYPRE_Int             line)
-{
+   if (host_statistics(mach_host_self(), HOST_VM_INFO, (host_info_t)&vm_stat, &count) !=
+       KERN_SUCCESS)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Problem running host_statistics!");
+      return hypre_error_flag;
+   }
 
-   if (ptr == NULL)
+   free_mem = (size_t) vm_stat.free_count * (size_t) vm_page_size;
+
+   /* Get the task info */
+   if (task_info(mach_task_self(), TASK_BASIC_INFO, (task_info_t)&t_info,
+                 &t_info_count) != KERN_SUCCESS)
    {
-      return;
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Problem running task_info!");
+      return hypre_error_flag;
    }
 
-   hypre_MemoryTracker *tracker = hypre_memory_tracker();
+   /* vm_peak is not directly available, so we set it to vm_size */
+   vm_size = vm_peak = (size_t) t_info.virtual_size;
+
+   /* vm_hwm is not directly available, so we set it to vm_rss */
+   vm_rss = vm_hwm = (size_t) t_info.resident_size;
+
+#elif defined(__linux__)
+   struct sysinfo   info;
+   char             line[512];
+   FILE            *file;
+
+   if (sysinfo(&info) != 0)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Problem running sysinfo!");
+      return hypre_error_flag;
+   }
+   tot_mem  = info.totalram * info.mem_unit;
+   free_mem = info.freeram  * info.mem_unit;
 
-   if (tracker->alloced_size <= tracker->actual_size)
+   /* Function to get process memory info */
+   file = fopen("/proc/self/status", "r");
+   if (file == NULL)
    {
-      tracker->alloced_size = 2 * tracker->alloced_size + 1;
-      tracker->data = (hypre_MemoryTrackerEntry *) realloc(tracker->data, tracker->alloced_size * sizeof(hypre_MemoryTrackerEntry));
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Cannot open /proc/self/status!");
+      return hypre_error_flag;
    }
 
-   hypre_assert(tracker->actual_size < tracker->alloced_size);
+   while (fgets(line, sizeof(line), file))
+   {
+      (void) sscanf(line, "VmPeak: %zu kB", &vm_peak);
+      (void) sscanf(line, "VmSize: %zu kB", &vm_size);
+      (void) sscanf(line,  "VmRSS: %zu kB", &vm_rss);
+      (void) sscanf(line,  "VmHWM: %zu kB", &vm_hwm);
+   }
+   fclose(file);
 
-   hypre_MemoryTrackerEntry *entry = tracker->data + tracker->actual_size;
+   /* Convert KB to bytes */
+   vm_peak *= 1024;
+   vm_size *= 1024;
+   vm_rss  *= 1024;
+   vm_hwm  *= 1024;
+#endif
 
-   sprintf(entry->_action, "%s", action);
-   entry->_ptr = ptr;
-   entry->_nbytes = nbytes;
-   entry->_memory_location = memory_location;
-   sprintf(entry->_filename, "%s", filename);
-   sprintf(entry->_function, "%s", function);
-   entry->_line = line;
-   /* -1 is the initial value */
-   entry->_pair = (size_t) -1;
+   /* Convert data from bytes to GiB (HYPRE_Real) */
+   mem[0] = vm_size  / b_to_gib;
+   mem[1] = vm_peak  / b_to_gib;
+   mem[2] = vm_rss   / b_to_gib;
+   mem[3] = vm_hwm   / b_to_gib;
+   mem[4] = (tot_mem - free_mem) / b_to_gib;
+   mem[5] = tot_mem  / b_to_gib;
 
-   tracker->actual_size ++;
+   return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_MemoryPrintUsage
+ *--------------------------------------------------------------------------*/
 
-/* do not use hypre_printf, hypre_fprintf, which have TAlloc
- * endless loop "for (i = 0; i < tracker->actual_size; i++)" otherwise */
 HYPRE_Int
-hypre_PrintMemoryTracker()
+hypre_MemoryPrintUsage(MPI_Comm    comm,
+                       HYPRE_Int   log_level,
+                       const char *function,
+                       HYPRE_Int   line)
 {
-   HYPRE_Int myid, ierr = 0;
-   char filename[256];
-   FILE *file;
-   size_t i, j;
+   HYPRE_Int    offset = 0;
+   HYPRE_Int    ne = 6;
+   HYPRE_Real   lmem[16];
+   HYPRE_Real   min[16];
+   HYPRE_Real   max[16];
+   HYPRE_Real   avg[16];
+   HYPRE_Real   ssq[16];
+   HYPRE_Real   std[16];
+   HYPRE_Real  *gmem = NULL;
+   HYPRE_Int    i, j, myid, nprocs, ndigits;
+   const char  *labels[] = {"Min", "Max", "Avg", "Std"};
+   HYPRE_Real  *data[]   = {min, max, avg, std};
+
+#if defined(HYPRE_USING_GPU)
+   offset = 2;
+   ne += offset;
+#endif
 
-   hypre_MemoryTracker *tracker = hypre_memory_tracker();
+#if defined(HYPRE_USING_UMPIRE)
+   ne += 8;
+#endif
 
-   hypre_MPI_Comm_rank(hypre_MPI_COMM_WORLD, &myid);
-   hypre_sprintf(filename,"HypreMemoryTrack.log.%05d", myid);
-   if ((file = fopen(filename, "a")) == NULL)
+   /* Return if neither the 1st nor 2nd bits of log_level are set */
+   if (!(log_level & 0x3))
    {
-      fprintf(stderr, "Error: can't open output file %s\n", filename);
       return hypre_error_flag;
    }
 
-   fprintf(file, "==== Operations:\n");
-   fprintf(file, "     ID        EVENT                 ADDRESS       BYTE         LOCATION                                       FILE(LINE)                                           FUNCTION  |  Memory (   H            P            D            U )\n");
+   /* Initialize locals */
+   for (j = 0; j < ne; j++)
+   {
+      lmem[j] = 0.0;
+      min[j]  = HYPRE_REAL_MAX;
+      max[j]  = 0.0;
+      avg[j]  = 0.0;
+      ssq[j]  = 0.0;
+      std[j]  = 0.0;
+   }
 
-   size_t totl_bytes[hypre_MEMORY_UNIFIED+1] = {0};
-   size_t peak_bytes[hypre_MEMORY_UNIFIED+1] = {0};
-   size_t curr_bytes[hypre_MEMORY_UNIFIED+1] = {0};
+   /* MPI variables */
+   hypre_MPI_Comm_size(comm, &nprocs);
+   hypre_MPI_Comm_rank(comm, &myid);
+   ndigits = hypre_ndigits(nprocs);
 
-   for (i = 0; i < tracker->actual_size; i++)
+   /* Work space for gathering memory info */
+   if (!myid)
    {
-      if (strstr(tracker->data[i]._action, "alloc") != NULL)
-      {
-         totl_bytes[tracker->data[i]._memory_location] += tracker->data[i]._nbytes;
-         curr_bytes[tracker->data[i]._memory_location] += tracker->data[i]._nbytes;
-         peak_bytes[tracker->data[i]._memory_location] =
-            hypre_max( curr_bytes[tracker->data[i]._memory_location],
-                       peak_bytes[tracker->data[i]._memory_location] );
-
-         /* for each unpaired "alloc", find its "free" */
-         if (tracker->data[i]._pair != (size_t) -1)
-         {
-            if ( tracker->data[i]._pair >= tracker->actual_size ||
-                 tracker->data[tracker->data[i]._pair]._pair != i)
-            {
-               fprintf(stderr, "hypre memory tracker internal error!\n");
-               hypre_MPI_Abort(hypre_MPI_COMM_WORLD, 1);
-            }
+      gmem = hypre_CTAlloc(HYPRE_Real, ne * nprocs, HYPRE_MEMORY_HOST);
+   }
 
-            continue;
-         }
+   /* Get host memory info */
+   hypre_HostMemoryGetUsage(lmem);
 
-         for (j = i+1; j < tracker->actual_size; j++)
-         {
-            if ( strstr(tracker->data[j]._action, "free") != NULL &&
-                 tracker->data[j]._pair == (size_t) -1 &&
-                 tracker->data[i]._ptr == tracker->data[j]._ptr &&
-                 tracker->data[i]._memory_location == tracker->data[j]._memory_location )
-            {
-               tracker->data[i]._pair = j;
-               tracker->data[j]._pair = i;
-               tracker->data[j]._nbytes = tracker->data[i]._nbytes;
-               break;
-            }
-         }
+   /* Get device memory info */
+#if defined(HYPRE_USING_GPU)
+   hypre_DeviceMemoryGetUsage(&lmem[6]);
+#endif
+
+   /* Get umpire memory info */
+#if defined(HYPRE_USING_UMPIRE)
+   hypre_UmpireMemoryGetUsage(&lmem[6 + offset]);
+
+#elif !defined(HYPRE_USING_GPU)
+   HYPRE_UNUSED_VAR(offset);
+#endif
+
+   /* Gather memory info to rank 0 */
+   hypre_MPI_Gather(lmem, ne, hypre_MPI_REAL, gmem, ne, hypre_MPI_REAL, 0, comm);
 
-         if (tracker->data[i]._pair == (size_t) -1)
+   /* Rank 0 computes min/max/avg/stddev statistics */
+   if (!myid && (log_level & 0x2))
+   {
+      for (i = 0; i < nprocs; i++)
+      {
+         for (j = 0; j < ne; j++)
          {
-            fprintf(stderr, "%6zu: %16p may not freed\n", i, tracker->data[i]._ptr );
+            if (gmem[ne * i + j] < min[j]) { min[j] = gmem[ne * i + j]; }
+            if (gmem[ne * i + j] > max[j]) { max[j] = gmem[ne * i + j]; }
+            avg[j] += gmem[ne * i + j];
          }
       }
-      else if (strstr(tracker->data[i]._action, "free") != NULL)
+
+      for (j = 0; j < ne; j++)
       {
-         size_t pair = tracker->data[i]._pair;
+         avg[j] /= (HYPRE_Real) nprocs;
+      }
 
-         if (pair == (size_t) -1)
-         {
-            fprintf(stderr, "%6zu: unpaired free at %16p\n", i, tracker->data[i]._ptr );
-         }
-         else
+      for (i = 0; i < nprocs; i++)
+      {
+         for (j = 0; j < ne; j++)
          {
-            curr_bytes[tracker->data[i]._memory_location] -= tracker->data[pair]._nbytes;
+            ssq[j] += hypre_pow(gmem[ne * i + j] - avg[j], 2) / (HYPRE_Real) nprocs;
          }
       }
 
-      if (i < tracker->prev_end)
+      for (j = 0; j < ne; j++)
       {
-         continue;
+         std[j] = hypre_sqrt(ssq[j]);
       }
+   }
 
-      char memory_location[256];
-      char nbytes[32];
-
-      if (tracker->data[i]._memory_location == hypre_MEMORY_HOST)
-      {
-         sprintf(memory_location, "%s", "HOST");
-      }
-      else if (tracker->data[i]._memory_location == hypre_MEMORY_HOST_PINNED)
-      {
-         sprintf(memory_location, "%s", "HOST_PINNED");
-      }
-      else if (tracker->data[i]._memory_location == hypre_MEMORY_DEVICE)
-      {
-         sprintf(memory_location, "%s", "DEVICE");
-      }
-      else if (tracker->data[i]._memory_location == hypre_MEMORY_UNIFIED)
-      {
-         sprintf(memory_location, "%s", "UNIFIED");
-      }
-      else
+   /* Rank 0 prints the data */
+   if (!myid)
+   {
+      /* Local memory usage statistics */
+      if (log_level & 0x1)
       {
-         sprintf(memory_location, "%s", "UNDEFINED");
+         for (i = 0; i < nprocs; i++)
+         {
+            if (line > 0)
+            {
+               hypre_printf("[%*d]: %s at line %d", ndigits, i, function, line);
+            }
+            else
+            {
+               hypre_printf("[%*d]: %s", ndigits, i, function);
+            }
+            hypre_printf(" | Vm[Size,RSS]/[Peak,HWM]: (%.2f, %.2f / %.2f, %.2f) GiB",
+                         gmem[ne * i + 0], gmem[ne * i + 2],
+                         gmem[ne * i + 1], gmem[ne * i + 3]);
+            hypre_printf(" | Used/Total RAM: (%.2f / %.2f)", gmem[ne * i + 4], gmem[ne * i + 5]);
+#if defined(HYPRE_USING_GPU)
+            hypre_printf(" | Used/Total VRAM: (%.2f / %.2f)", gmem[ne * i + 6], gmem[ne * i + 7]);
+#endif
+#if defined(HYPRE_USING_UMPIRE)
+            if (gmem[ne * i + 9])
+            {
+               hypre_printf(" | UmpHSize/UmpHPeak: (%.2f / %.2f)",
+                            gmem[ne * i + 8], gmem[ne * i + 9]);
+            }
+            if (gmem[ne * i + 11])
+            {
+               hypre_printf(" | UmpDSize/UmpDPeak: (%.2f / %.2f)",
+                            gmem[ne * i + 10], gmem[ne * i + 11]);
+            }
+            if (gmem[ne * i + 13])
+            {
+               hypre_printf(" | UmpUSize/UmpUPeak: (%.2f / %.2f)",
+                            gmem[ne * i + 12], gmem[ne * i + 13]);
+            }
+            if (gmem[ne * i + 15])
+            {
+               hypre_printf(" | UmpPSize/UmpPPeak: (%.2f / %.2f)",
+                            gmem[ne * i + 14], gmem[ne * i + 15]);
+            }
+#endif
+            hypre_printf("\n");
+         }
       }
 
-      if (tracker->data[i]._nbytes != (size_t) -1)
+      /* Global memory usage statistics */
+      if (log_level & 0x2)
       {
-         sprintf(nbytes, "%zu", tracker->data[i]._nbytes);
-      }
-      else
-      {
-         sprintf(nbytes, "%s", "");
-      }
+         hypre_printf("\nMemory usage across ranks - ");
+         if (line > 0)
+         {
+            hypre_printf("%s at line %d\n\n", function, line);
+         }
+         else
+         {
+            hypre_printf("%s\n\n", function);
+         }
 
-      fprintf(file, " %6zu %12s        %16p %10s %16s %40s (%5d) %50s  |  %12zu %12zu %12zu %12zu\n",
-              i,
-              tracker->data[i]._action,
-              tracker->data[i]._ptr,
-              nbytes,
-              memory_location,
-              tracker->data[i]._filename,
-              tracker->data[i]._line,
-              tracker->data[i]._function,
-              curr_bytes[hypre_MEMORY_HOST],
-              curr_bytes[hypre_MEMORY_HOST_PINNED],
-              curr_bytes[hypre_MEMORY_DEVICE],
-              curr_bytes[hypre_MEMORY_UNIFIED]
-              );
-   }
-
-   fprintf(file, "\n==== Total allocated (byte):\n");
-   fprintf(file, "HOST: %16zu, HOST_PINNED %16zu, DEVICE %16zu, UNIFIED %16zu\n",
-           totl_bytes[hypre_MEMORY_HOST],
-           totl_bytes[hypre_MEMORY_HOST_PINNED],
-           totl_bytes[hypre_MEMORY_DEVICE],
-           totl_bytes[hypre_MEMORY_UNIFIED]);
-
-   fprintf(file, "\n==== Peak (byte):\n");
-   fprintf(file, "HOST: %16zu, HOST_PINNED %16zu, DEVICE %16zu, UNIFIED %16zu\n",
-           peak_bytes[hypre_MEMORY_HOST],
-           peak_bytes[hypre_MEMORY_HOST_PINNED],
-           peak_bytes[hypre_MEMORY_DEVICE],
-           peak_bytes[hypre_MEMORY_UNIFIED]);
-
-   fprintf(file, "\n==== Reachable (byte):\n");
-   fprintf(file, "HOST: %16zu, HOST_PINNED %16zu, DEVICE %16zu, UNIFIED %16zu\n",
-           curr_bytes[hypre_MEMORY_HOST],
-           curr_bytes[hypre_MEMORY_HOST_PINNED],
-           curr_bytes[hypre_MEMORY_DEVICE],
-           curr_bytes[hypre_MEMORY_UNIFIED]);
-
-   fprintf(file, "\n==== Warnings:\n");
-   for (i = 0; i < tracker->actual_size; i++)
-   {
-      if (tracker->data[i]._pair == (size_t) -1)
-      {
-         if (strstr(tracker->data[i]._action, "alloc") != NULL)
+         /* Print header */
+         hypre_printf("       | %12s | %12s | %12s | %12s",
+                      "VmSize (GiB)", "VmPeak (GiB)", "VmRSS (GiB)", "VmHWM (GiB)");
+#if defined(HYPRE_USING_GPU)
+         hypre_printf(" | %14s | %15s", "VRAMsize (GiB)", "VRAMtotal (GiB)");
+#endif
+#if defined(HYPRE_USING_UMPIRE_HOST)
+         hypre_printf(" | %14s | %14s", "UmpHSize (GiB)", "UmpHPeak (GiB)");
+#endif
+#if defined(HYPRE_USING_UMPIRE_DEVICE)
+         hypre_printf(" | %14s | %14s", "UmpDSize (GiB)", "UmpDPeak (GiB)");
+#endif
+#if defined(HYPRE_USING_UMPIRE_UM)
+         if (max[12] > 0.0)
+         {
+            hypre_printf(" | %13s | %13s", "UmpUSize (GiB)", "UmpUPeak (GiB)");
+         }
+#endif
+#if defined(HYPRE_USING_UMPIRE_PINNED)
+         hypre_printf(" | %13s | %13s", "UmpPSize (GiB)", "UmpPPeak (GiB)")
+#endif
+         hypre_printf("\n");
+         hypre_printf("   ----+--------------+--------------+--------------+-------------");
+#if defined(HYPRE_USING_GPU)
+         hypre_printf("-+----------------+----------------");
+#endif
+#if defined(HYPRE_USING_UMPIRE_HOST)
+         if (max[8] > 0.0)
+         {
+            hypre_printf("-+----------------+---------------");
+         }
+#endif
+#if defined(HYPRE_USING_UMPIRE_DEVICE)
+         if (max[10] > 0.0)
          {
-            fprintf(file, "%6zu: %p may have not been freed\n", i, tracker->data[i]._ptr );
+            hypre_printf("-+----------------+---------------");
          }
-         else if (strstr(tracker->data[i]._action, "free") != NULL)
+#endif
+#if defined(HYPRE_USING_UMPIRE_UM)
+         if (max[12] > 0.0)
+         {
+            hypre_printf("-+----------------+---------------");
+         }
+#endif
+#if defined(HYPRE_USING_UMPIRE_PINNED)
+         if (max[14] > 0.0)
          {
-            fprintf(file, "%6zu: unpaired free at %16p\n", i, tracker->data[i]._ptr );
+            hypre_printf("-+----------------+---------------");
+         }
+#endif
+         hypre_printf("\n");
+
+         /* Print table */
+         for (i = 0; i < 4; i++)
+         {
+            hypre_printf("   %-3s", labels[i]);
+            hypre_printf(" | %12.3f | %12.3f | %12.3f | %12.3f",
+                         data[i][0], data[i][1], data[i][2], data[i][3]);
+#if defined(HYPRE_USING_GPU)
+            hypre_printf(" | %14.3f | %15.3f", data[i][6], data[i][7]);
+#endif
+#if defined(HYPRE_USING_UMPIRE_HOST)
+            if (max[8] > 0.0)
+            {
+               hypre_printf(" | %14.3f | %14.3f", data[i][8], data[i][9]);
+            }
+#endif
+#if defined(HYPRE_USING_UMPIRE_DEVICE)
+            if (max[10] > 0.0)
+            {
+               hypre_printf(" | %14.3f | %14.3f", data[i][10], data[i][11]);
+            }
+#endif
+#if defined(HYPRE_USING_UMPIRE_UM)
+            if (max[12] > 0.0)
+            {
+               hypre_printf(" | %14.3f | %14.3f", data[i][12], data[i][13]);
+            }
+#endif
+#if defined(HYPRE_USING_UMPIRE_PINNED)
+            if (max[14] > 0.0)
+            {
+               hypre_printf(" | %14.3f | %14.3f", data[i][14], data[i][15]);
+            }
+#endif
+            hypre_printf("\n");
          }
       }
    }
+   hypre_MPI_Barrier(comm);
 
-   fclose(file);
-
-   tracker->prev_end = tracker->actual_size;
+   hypre_TFree(gmem, HYPRE_MEMORY_HOST);
 
-   return ierr;
+   return hypre_error_flag;
 }
-#endif
 
-/*--------------------------------------------------------------------------*
- * Memory Pool
+/*--------------------------------------------------------------------------
+ * hypre_SetCubMemPoolSize
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
@@ -1279,8 +1656,7 @@ hypre_SetCubMemPoolSize(hypre_uint cub_bin_growth,
                         hypre_uint cub_max_bin,
                         size_t     cub_max_cached_bytes)
 {
-#if defined(HYPRE_USING_CUDA)
-#ifdef HYPRE_USING_DEVICE_POOL
+#if defined(HYPRE_USING_CUDA) && defined(HYPRE_USING_DEVICE_POOL)
    hypre_HandleCubBinGrowth(hypre_handle())      = cub_bin_growth;
    hypre_HandleCubMinBin(hypre_handle())         = cub_min_bin;
    hypre_HandleCubMaxBin(hypre_handle())         = cub_max_bin;
@@ -1296,12 +1672,20 @@ hypre_SetCubMemPoolSize(hypre_uint cub_bin_growth,
    {
       hypre_HandleCubUvmAllocator(hypre_handle()) -> SetMaxCachedBytes(cub_max_cached_bytes);
    }
-#endif
+#else
+   HYPRE_UNUSED_VAR(cub_bin_growth);
+   HYPRE_UNUSED_VAR(cub_min_bin);
+   HYPRE_UNUSED_VAR(cub_max_bin);
+   HYPRE_UNUSED_VAR(cub_max_cached_bytes);
 #endif
 
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ * HYPRE_SetGPUMemoryPoolSize
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 HYPRE_SetGPUMemoryPoolSize(HYPRE_Int bin_growth,
                            HYPRE_Int min_bin,
@@ -1311,63 +1695,84 @@ HYPRE_SetGPUMemoryPoolSize(HYPRE_Int bin_growth,
    return hypre_SetCubMemPoolSize(bin_growth, min_bin, max_bin, max_cached_bytes);
 }
 
-#ifdef HYPRE_USING_DEVICE_POOL
+#if defined(HYPRE_USING_DEVICE_POOL) && defined(HYPRE_USING_CUDA)
+
+/*--------------------------------------------------------------------------
+ * hypre_CachingMallocDevice
+ *--------------------------------------------------------------------------*/
+
 cudaError_t
 hypre_CachingMallocDevice(void **ptr, size_t nbytes)
 {
    if (!hypre_HandleCubDevAllocator(hypre_handle()))
    {
       hypre_HandleCubDevAllocator(hypre_handle()) =
-         hypre_CudaDataCubCachingAllocatorCreate( hypre_HandleCubBinGrowth(hypre_handle()),
-                                                  hypre_HandleCubMinBin(hypre_handle()),
-                                                  hypre_HandleCubMaxBin(hypre_handle()),
-                                                  hypre_HandleCubMaxCachedBytes(hypre_handle()),
-                                                  false,
-                                                  false,
-                                                  false );
+         hypre_DeviceDataCubCachingAllocatorCreate( hypre_HandleCubBinGrowth(hypre_handle()),
+                                                    hypre_HandleCubMinBin(hypre_handle()),
+                                                    hypre_HandleCubMaxBin(hypre_handle()),
+                                                    hypre_HandleCubMaxCachedBytes(hypre_handle()),
+                                                    false,
+                                                    false,
+                                                    false );
    }
 
    return hypre_HandleCubDevAllocator(hypre_handle()) -> DeviceAllocate(ptr, nbytes);
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_CachingFreeDevice
+ *--------------------------------------------------------------------------*/
+
 cudaError_t
 hypre_CachingFreeDevice(void *ptr)
 {
    return hypre_HandleCubDevAllocator(hypre_handle()) -> DeviceFree(ptr);
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_CachingMallocManaged
+ *--------------------------------------------------------------------------*/
+
 cudaError_t
 hypre_CachingMallocManaged(void **ptr, size_t nbytes)
 {
    if (!hypre_HandleCubUvmAllocator(hypre_handle()))
    {
       hypre_HandleCubUvmAllocator(hypre_handle()) =
-         hypre_CudaDataCubCachingAllocatorCreate( hypre_HandleCubBinGrowth(hypre_handle()),
-                                                  hypre_HandleCubMinBin(hypre_handle()),
-                                                  hypre_HandleCubMaxBin(hypre_handle()),
-                                                  hypre_HandleCubMaxCachedBytes(hypre_handle()),
-                                                  false,
-                                                  false,
-                                                  true );
+         hypre_DeviceDataCubCachingAllocatorCreate( hypre_HandleCubBinGrowth(hypre_handle()),
+                                                    hypre_HandleCubMinBin(hypre_handle()),
+                                                    hypre_HandleCubMaxBin(hypre_handle()),
+                                                    hypre_HandleCubMaxCachedBytes(hypre_handle()),
+                                                    false,
+                                                    false,
+                                                    true );
    }
 
    return hypre_HandleCubUvmAllocator(hypre_handle()) -> DeviceAllocate(ptr, nbytes);
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_CachingFreeManaged
+ *--------------------------------------------------------------------------*/
+
 cudaError_t
 hypre_CachingFreeManaged(void *ptr)
 {
    return hypre_HandleCubUvmAllocator(hypre_handle()) -> DeviceFree(ptr);
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_DeviceDataCubCachingAllocatorCreate
+ *--------------------------------------------------------------------------*/
+
 hypre_cub_CachingDeviceAllocator *
-hypre_CudaDataCubCachingAllocatorCreate(hypre_uint bin_growth,
-                                        hypre_uint min_bin,
-                                        hypre_uint max_bin,
-                                        size_t     max_cached_bytes,
-                                        bool       skip_cleanup,
-                                        bool       debug,
-                                        bool       use_managed_memory)
+hypre_DeviceDataCubCachingAllocatorCreate(hypre_uint bin_growth,
+                                          hypre_uint min_bin,
+                                          hypre_uint max_bin,
+                                          size_t     max_cached_bytes,
+                                          bool       skip_cleanup,
+                                          bool       debug,
+                                          bool       use_managed_memory)
 {
    hypre_cub_CachingDeviceAllocator *allocator =
       new hypre_cub_CachingDeviceAllocator( bin_growth,
@@ -1381,16 +1786,25 @@ hypre_CudaDataCubCachingAllocatorCreate(hypre_uint bin_growth,
    return allocator;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_DeviceDataCubCachingAllocatorDestroy
+ *--------------------------------------------------------------------------*/
+
 void
-hypre_CudaDataCubCachingAllocatorDestroy(hypre_CudaData *data)
+hypre_DeviceDataCubCachingAllocatorDestroy(hypre_DeviceData *data)
 {
-   delete hypre_CudaDataCubDevAllocator(data);
-   delete hypre_CudaDataCubUvmAllocator(data);
+   delete hypre_DeviceDataCubDevAllocator(data);
+   delete hypre_DeviceDataCubUvmAllocator(data);
 }
 
-#endif // #ifdef HYPRE_USING_DEVICE_POOL
+#endif // #if defined(HYPRE_USING_DEVICE_POOL) && defined(HYPRE_USING_CUDA)
 
 #if defined(HYPRE_USING_UMPIRE_HOST)
+
+/*--------------------------------------------------------------------------
+ * hypre_umpire_host_pooled_allocate
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_umpire_host_pooled_allocate(void **ptr, size_t nbytes)
 {
@@ -1409,9 +1823,9 @@ hypre_umpire_host_pooled_allocate(void **ptr, size_t nbytes)
    {
       umpire_allocator allocator;
       umpire_resourcemanager_get_allocator_by_name(rm_ptr, resource_name, &allocator);
-      umpire_resourcemanager_make_allocator_pool(rm_ptr, pool_name, allocator,
-                                                 hypre_HandleUmpireHostPoolSize(handle),
-                                                 hypre_HandleUmpireBlockSize(handle), &pooled_allocator);
+      hypre_umpire_resourcemanager_make_allocator_pool(rm_ptr, pool_name, allocator,
+                                                       hypre_HandleUmpireHostPoolSize(handle),
+                                                       hypre_HandleUmpireBlockSize(handle), &pooled_allocator);
       hypre_HandleOwnUmpireHostPool(handle) = 1;
    }
 
@@ -1420,6 +1834,10 @@ hypre_umpire_host_pooled_allocate(void **ptr, size_t nbytes)
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_umpire_host_pooled_free
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_umpire_host_pooled_free(void *ptr)
 {
@@ -1437,6 +1855,10 @@ hypre_umpire_host_pooled_free(void *ptr)
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_umpire_host_pooled_realloc
+ *--------------------------------------------------------------------------*/
+
 void *
 hypre_umpire_host_pooled_realloc(void *ptr, size_t size)
 {
@@ -1456,11 +1878,16 @@ hypre_umpire_host_pooled_realloc(void *ptr, size_t size)
 #endif
 
 #if defined(HYPRE_USING_UMPIRE_DEVICE)
+
+/*--------------------------------------------------------------------------
+ * hypre_umpire_device_pooled_allocate
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_umpire_device_pooled_allocate(void **ptr, size_t nbytes)
 {
    hypre_Handle *handle = hypre_handle();
-   const hypre_int device_id = hypre_HandleCudaDevice(handle);
+   const hypre_int device_id = hypre_HandleDevice(handle);
    char resource_name[16];
    const char *pool_name = hypre_HandleUmpireDevicePoolName(handle);
 
@@ -1477,9 +1904,9 @@ hypre_umpire_device_pooled_allocate(void **ptr, size_t nbytes)
    {
       umpire_allocator allocator;
       umpire_resourcemanager_get_allocator_by_name(rm_ptr, resource_name, &allocator);
-      umpire_resourcemanager_make_allocator_pool(rm_ptr, pool_name, allocator,
-                                                 hypre_HandleUmpireDevicePoolSize(handle),
-                                                 hypre_HandleUmpireBlockSize(handle), &pooled_allocator);
+      hypre_umpire_resourcemanager_make_allocator_pool(rm_ptr, pool_name, allocator,
+                                                       hypre_HandleUmpireDevicePoolSize(handle),
+                                                       hypre_HandleUmpireBlockSize(handle), &pooled_allocator);
 
       hypre_HandleOwnUmpireDevicePool(handle) = 1;
    }
@@ -1489,6 +1916,10 @@ hypre_umpire_device_pooled_allocate(void **ptr, size_t nbytes)
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_umpire_device_pooled_free
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_umpire_device_pooled_free(void *ptr)
 {
@@ -1508,6 +1939,11 @@ hypre_umpire_device_pooled_free(void *ptr)
 #endif
 
 #if defined(HYPRE_USING_UMPIRE_UM)
+
+/*--------------------------------------------------------------------------
+ * hypre_umpire_um_pooled_allocate
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_umpire_um_pooled_allocate(void **ptr, size_t nbytes)
 {
@@ -1526,9 +1962,9 @@ hypre_umpire_um_pooled_allocate(void **ptr, size_t nbytes)
    {
       umpire_allocator allocator;
       umpire_resourcemanager_get_allocator_by_name(rm_ptr, resource_name, &allocator);
-      umpire_resourcemanager_make_allocator_pool(rm_ptr, pool_name, allocator,
-                                                 hypre_HandleUmpireUMPoolSize(handle),
-                                                 hypre_HandleUmpireBlockSize(handle), &pooled_allocator);
+      hypre_umpire_resourcemanager_make_allocator_pool(rm_ptr, pool_name, allocator,
+                                                       hypre_HandleUmpireUMPoolSize(handle),
+                                                       hypre_HandleUmpireBlockSize(handle), &pooled_allocator);
 
       hypre_HandleOwnUmpireUMPool(handle) = 1;
    }
@@ -1538,6 +1974,10 @@ hypre_umpire_um_pooled_allocate(void **ptr, size_t nbytes)
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_umpire_um_pooled_free
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_umpire_um_pooled_free(void *ptr)
 {
@@ -1557,6 +1997,11 @@ hypre_umpire_um_pooled_free(void *ptr)
 #endif
 
 #if defined(HYPRE_USING_UMPIRE_PINNED)
+
+/*--------------------------------------------------------------------------
+ * hypre_umpire_pinned_pooled_allocate
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_umpire_pinned_pooled_allocate(void **ptr, size_t nbytes)
 {
@@ -1575,9 +2020,9 @@ hypre_umpire_pinned_pooled_allocate(void **ptr, size_t nbytes)
    {
       umpire_allocator allocator;
       umpire_resourcemanager_get_allocator_by_name(rm_ptr, resource_name, &allocator);
-      umpire_resourcemanager_make_allocator_pool(rm_ptr, pool_name, allocator,
-                                                 hypre_HandleUmpirePinnedPoolSize(handle),
-                                                 hypre_HandleUmpireBlockSize(handle), &pooled_allocator);
+      hypre_umpire_resourcemanager_make_allocator_pool(rm_ptr, pool_name, allocator,
+                                                       hypre_HandleUmpirePinnedPoolSize(handle),
+                                                       hypre_HandleUmpireBlockSize(handle), &pooled_allocator);
 
       hypre_HandleOwnUmpirePinnedPool(handle) = 1;
    }
@@ -1587,10 +2032,14 @@ hypre_umpire_pinned_pooled_allocate(void **ptr, size_t nbytes)
    return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_umpire_pinned_pooled_free
+ *--------------------------------------------------------------------------*/
+
 HYPRE_Int
 hypre_umpire_pinned_pooled_free(void *ptr)
 {
-   const hypre_Handle *handle = hypre_handle();
+   hypre_Handle *handle = hypre_handle();
    const char *pool_name = hypre_HandleUmpirePinnedPoolName(handle);
    umpire_allocator pooled_allocator;
 
@@ -1605,3 +2054,280 @@ hypre_umpire_pinned_pooled_free(void *ptr)
 }
 #endif
 
+/******************************************************************************
+ *
+ * hypre Umpire
+ *
+ *****************************************************************************/
+
+#if defined(HYPRE_USING_UMPIRE)
+
+/*--------------------------------------------------------------------------
+ * hypre_UmpireInit
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_UmpireInit(hypre_Handle *hypre_handle_)
+{
+   umpire_resourcemanager_get_instance(&hypre_HandleUmpireResourceMan(hypre_handle_));
+
+   hypre_HandleUmpireDevicePoolSize(hypre_handle_) = 4LL * (1 << 30); // 4 GiB
+   hypre_HandleUmpireUMPoolSize(hypre_handle_)     = 4LL * (1 << 30); // 4 GiB
+   hypre_HandleUmpireHostPoolSize(hypre_handle_)   = 4LL * (1 << 30); // 4 GiB
+   hypre_HandleUmpirePinnedPoolSize(hypre_handle_) = 4LL * (1 << 30); // 4 GiB
+
+   hypre_HandleUmpireBlockSize(hypre_handle_) = 512;
+
+   strcpy(hypre_HandleUmpireDevicePoolName(hypre_handle_), "HYPRE_DEVICE_POOL");
+   strcpy(hypre_HandleUmpireUMPoolName(hypre_handle_),     "HYPRE_UM_POOL");
+   strcpy(hypre_HandleUmpireHostPoolName(hypre_handle_),   "HYPRE_HOST_POOL");
+   strcpy(hypre_HandleUmpirePinnedPoolName(hypre_handle_), "HYPRE_PINNED_POOL");
+
+   hypre_HandleOwnUmpireDevicePool(hypre_handle_) = 0;
+   hypre_HandleOwnUmpireUMPool(hypre_handle_)     = 0;
+   hypre_HandleOwnUmpireHostPool(hypre_handle_)   = 0;
+   hypre_HandleOwnUmpirePinnedPool(hypre_handle_) = 0;
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_UmpireFinalize
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_UmpireFinalize(hypre_Handle *hypre_handle_)
+{
+   umpire_resourcemanager *rm_ptr = &hypre_HandleUmpireResourceMan(hypre_handle_);
+   umpire_allocator allocator;
+
+#if defined(HYPRE_USING_UMPIRE_HOST)
+   if (hypre_HandleOwnUmpireHostPool(hypre_handle_))
+   {
+      const char *pool_name = hypre_HandleUmpireHostPoolName(hypre_handle_);
+      umpire_resourcemanager_get_allocator_by_name(rm_ptr, pool_name, &allocator);
+      umpire_allocator_release(&allocator);
+   }
+#endif
+
+#if defined(HYPRE_USING_UMPIRE_DEVICE)
+   if (hypre_HandleOwnUmpireDevicePool(hypre_handle_))
+   {
+      const char *pool_name = hypre_HandleUmpireDevicePoolName(hypre_handle_);
+      umpire_resourcemanager_get_allocator_by_name(rm_ptr, pool_name, &allocator);
+      umpire_allocator_release(&allocator);
+   }
+#endif
+
+#if defined(HYPRE_USING_UMPIRE_UM)
+   if (hypre_HandleOwnUmpireUMPool(hypre_handle_))
+   {
+      const char *pool_name = hypre_HandleUmpireUMPoolName(hypre_handle_);
+      umpire_resourcemanager_get_allocator_by_name(rm_ptr, pool_name, &allocator);
+      umpire_allocator_release(&allocator);
+   }
+#endif
+
+#if defined(HYPRE_USING_UMPIRE_PINNED)
+   if (hypre_HandleOwnUmpirePinnedPool(hypre_handle_))
+   {
+      const char *pool_name = hypre_HandleUmpirePinnedPoolName(hypre_handle_);
+      umpire_resourcemanager_get_allocator_by_name(rm_ptr, pool_name, &allocator);
+      umpire_allocator_release(&allocator);
+   }
+#endif
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_UmpireMemoryGetUsage
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_UmpireMemoryGetUsage(HYPRE_Real *memory)
+{
+   hypre_Handle                 *handle = hypre_handle();
+   umpire_resourcemanager       *rm_ptr = &hypre_HandleUmpireResourceMan(handle);
+   umpire_allocator              allocator;
+
+   size_t                        memoryB[8] = {0, 0, 0, 0, 0, 0, 0, 0};
+   HYPRE_Int                     i;
+
+   /* Sanity check */
+   if (!memory)
+   {
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, "memory is a NULL pointer!");
+      return hypre_error_flag;
+   }
+
+#if defined(HYPRE_USING_UMPIRE_HOST)
+   if (hypre_HandleOwnUmpireHostPool(handle))
+   {
+      const char *pool_name = hypre_HandleUmpireHostPoolName(handle);
+      umpire_resourcemanager_get_allocator_by_name(rm_ptr, pool_name, &allocator);
+      memoryB[0] = umpire_allocator_get_current_size(&allocator);
+      memoryB[1] = umpire_allocator_get_high_watermark(&allocator);
+   }
+#endif
+
+#if defined(HYPRE_USING_UMPIRE_DEVICE)
+   if (hypre_HandleOwnUmpireDevicePool(handle))
+   {
+      const char *pool_name = hypre_HandleUmpireDevicePoolName(handle);
+      umpire_resourcemanager_get_allocator_by_name(rm_ptr, pool_name, &allocator);
+      memoryB[2] = umpire_allocator_get_current_size(&allocator);
+      memoryB[3] = umpire_allocator_get_high_watermark(&allocator);
+   }
+#endif
+
+#if defined(HYPRE_USING_UMPIRE_UM)
+   if (hypre_HandleOwnUmpireUMPool(handle))
+   {
+      const char *pool_name = hypre_HandleUmpireUMPoolName(handle);
+      umpire_resourcemanager_get_allocator_by_name(rm_ptr, pool_name, &allocator);
+      memoryB[4] = umpire_allocator_get_current_size(&allocator);
+      memoryB[5] = umpire_allocator_get_high_watermark(&allocator);
+   }
+#endif
+
+#if defined(HYPRE_USING_UMPIRE_PINNED)
+   if (hypre_HandleOwnUmpirePinnedPool(handle))
+   {
+      const char *pool_name = hypre_HandleUmpirePinnedPoolName(handle);
+      umpire_resourcemanager_get_allocator_by_name(rm_ptr, pool_name, &allocator);
+      memoryB[6] = umpire_allocator_get_current_size(&allocator);
+      memoryB[7] = umpire_allocator_get_high_watermark(&allocator);
+   }
+#endif
+
+   /* Convert bytes to GiB */
+   for (i = 0; i < 8; i++)
+   {
+      memory[i] = ((HYPRE_Real) memoryB[i]) / ((HYPRE_Real) (1 << 30));
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_SetUmpireDevicePoolSize
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_SetUmpireDevicePoolSize(size_t nbytes)
+{
+   hypre_HandleUmpireDevicePoolSize(hypre_handle()) = nbytes;
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_SetUmpireUMPoolSize
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_SetUmpireUMPoolSize(size_t nbytes)
+{
+   hypre_HandleUmpireUMPoolSize(hypre_handle()) = nbytes;
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_SetUmpireHostPoolSize
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_SetUmpireHostPoolSize(size_t nbytes)
+{
+   hypre_HandleUmpireHostPoolSize(hypre_handle()) = nbytes;
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_SetUmpirePinnedPoolSize
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_SetUmpirePinnedPoolSize(size_t nbytes)
+{
+   hypre_HandleUmpirePinnedPoolSize(hypre_handle()) = nbytes;
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_SetUmpireDevicePoolName
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_SetUmpireDevicePoolName(const char *pool_name)
+{
+   if (strlen(pool_name) > HYPRE_UMPIRE_POOL_NAME_MAX_LEN)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   strcpy(hypre_HandleUmpireDevicePoolName(hypre_handle()), pool_name);
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_SetUmpireUMPoolName
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_SetUmpireUMPoolName(const char *pool_name)
+{
+   if (strlen(pool_name) > HYPRE_UMPIRE_POOL_NAME_MAX_LEN)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   strcpy(hypre_HandleUmpireUMPoolName(hypre_handle()), pool_name);
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_SetUmpireHostPoolName
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_SetUmpireHostPoolName(const char *pool_name)
+{
+   if (strlen(pool_name) > HYPRE_UMPIRE_POOL_NAME_MAX_LEN)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   strcpy(hypre_HandleUmpireHostPoolName(hypre_handle()), pool_name);
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_SetUmpirePinnedPoolName
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_SetUmpirePinnedPoolName(const char *pool_name)
+{
+   if (strlen(pool_name) > HYPRE_UMPIRE_POOL_NAME_MAX_LEN)
+   {
+      hypre_error_in_arg(1);
+      return hypre_error_flag;
+   }
+
+   strcpy(hypre_HandleUmpirePinnedPoolName(hypre_handle()), pool_name);
+
+   return hypre_error_flag;
+}
+
+#endif /* #if defined(HYPRE_USING_UMPIRE) */
diff --git a/external/hypre/src/utilities/memory.h b/external/hypre/src/utilities/memory.h
index d4f66e4c..64c44f44 100644
--- a/external/hypre/src/utilities/memory.h
+++ b/external/hypre/src/utilities/memory.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -71,9 +71,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#if defined(HYPRE_USING_UMPIRE)
-#include "umpire/interface/umpire.h"
-#define HYPRE_UMPIRE_POOL_NAME_MAX_LEN 1024
+#if defined(HYPRE_USING_UNIFIED_MEMORY) && defined(HYPRE_USING_DEVICE_OPENMP)
+//#pragma omp requires unified_shared_memory
 #endif
 
 /* stringification:
@@ -91,17 +90,18 @@ extern "C" {
 typedef enum _hypre_MemoryLocation
 {
    hypre_MEMORY_UNDEFINED = -1,
-   hypre_MEMORY_HOST          ,
-   hypre_MEMORY_HOST_PINNED   ,
-   hypre_MEMORY_DEVICE        ,
-   hypre_MEMORY_UNIFIED
+   hypre_MEMORY_HOST,
+   hypre_MEMORY_HOST_PINNED,
+   hypre_MEMORY_DEVICE,
+   hypre_MEMORY_UNIFIED,
+   hypre_NUM_MEMORY_LOCATION
 } hypre_MemoryLocation;
 
 /*-------------------------------------------------------
  * hypre_GetActualMemLocation
  *   return actual location based on the selected memory model
  *-------------------------------------------------------*/
-static inline hypre_MemoryLocation
+static inline HYPRE_MAYBE_UNUSED_FUNC hypre_MemoryLocation
 hypre_GetActualMemLocation(HYPRE_MemoryLocation location)
 {
    if (location == HYPRE_MEMORY_HOST)
@@ -125,102 +125,8 @@ hypre_GetActualMemLocation(HYPRE_MemoryLocation location)
    return hypre_MEMORY_UNDEFINED;
 }
 
-#ifdef HYPRE_USING_MEMORY_TRACKER
 
-typedef struct
-{
-   char                  _action[16];
-   void                 *_ptr;
-   size_t                _nbytes;
-   hypre_MemoryLocation  _memory_location;
-   char                  _filename[256];
-   char                  _function[256];
-   HYPRE_Int             _line;
-   size_t                _pair;
-} hypre_MemoryTrackerEntry;
-
-typedef struct
-{
-   size_t actual_size;
-   size_t alloced_size;
-   size_t prev_end;
-   hypre_MemoryTrackerEntry *data;
-} hypre_MemoryTracker;
-
-/* These Allocs are with memory tracker, for debug */
-#define hypre_TAlloc(type, count, location)                                                                                           \
-(                                                                                                                                     \
-{                                                                                                                                     \
-   void *ptr = hypre_MAlloc((size_t)(sizeof(type) * (count)), location);                                                              \
-   hypre_MemoryTrackerInsert("malloc", ptr, sizeof(type)*(count), hypre_GetActualMemLocation(location), __FILE__, __func__, __LINE__);\
-   (type *) ptr;                                                                                                                      \
-}                                                                                                                                     \
-)
-
-#define _hypre_TAlloc(type, count, location)                                                                                          \
-(                                                                                                                                     \
-{                                                                                                                                     \
-   void *ptr = _hypre_MAlloc((size_t)(sizeof(type) * (count)), location);                                                             \
-   hypre_MemoryTrackerInsert("malloc", ptr, sizeof(type)*(count), location, __FILE__, __func__, __LINE__);                            \
-   (type *) ptr;                                                                                                                      \
-}                                                                                                                                     \
-)
-
-#define hypre_CTAlloc(type, count, location)                                                                                          \
-(                                                                                                                                     \
-{                                                                                                                                     \
-   void *ptr = hypre_CAlloc((size_t)(count), (size_t)sizeof(type), location);                                                         \
-   hypre_MemoryTrackerInsert("calloc", ptr, sizeof(type)*(count), hypre_GetActualMemLocation(location), __FILE__, __func__, __LINE__);\
-   (type *) ptr;                                                                                                                      \
-}                                                                                                                                     \
-)
-
-#define hypre_TReAlloc(ptr, type, count, location)                                                                                         \
-(                                                                                                                                          \
-{                                                                                                                                          \
-   hypre_MemoryTrackerInsert("rfree", ptr, (size_t) -1, hypre_GetActualMemLocation(location), __FILE__, __func__, __LINE__);               \
-   void *new_ptr = hypre_ReAlloc((char *)ptr, (size_t)(sizeof(type) * (count)), location);                                                 \
-   hypre_MemoryTrackerInsert("rmalloc", new_ptr, sizeof(type)*(count), hypre_GetActualMemLocation(location), __FILE__, __func__, __LINE__);\
-   (type *) new_ptr;                                                                                                                       \
-}                                                                                                                                          \
-)
-
-#define hypre_TReAlloc_v2(ptr, old_type, old_count, new_type, new_count, location)                                                                 \
-(                                                                                                                                                  \
-{                                                                                                                                                  \
-   hypre_MemoryTrackerInsert("rfree", ptr, sizeof(old_type)*(old_count), hypre_GetActualMemLocation(location), __FILE__, __func__, __LINE__);      \
-   void *new_ptr = hypre_ReAlloc_v2((char *)ptr, (size_t)(sizeof(old_type)*(old_count)), (size_t)(sizeof(new_type)*(new_count)), location);        \
-   hypre_MemoryTrackerInsert("rmalloc", new_ptr, sizeof(new_type)*(new_count), hypre_GetActualMemLocation(location), __FILE__, __func__, __LINE__);\
-   (new_type *) new_ptr;                                                                                                                           \
-}                                                                                                                                                  \
-)
-
-#define hypre_TMemcpy(dst, src, type, count, locdst, locsrc)                                     \
-(                                                                                                \
-{                                                                                                \
-   hypre_Memcpy((void *)(dst), (void *)(src), (size_t)(sizeof(type) * (count)), locdst, locsrc); \
-}                                                                                                \
-)
-
-#define hypre_TFree(ptr, location)                                                                                          \
-(                                                                                                                           \
-{                                                                                                                           \
-   hypre_MemoryTrackerInsert("free", ptr, (size_t) -1, hypre_GetActualMemLocation(location), __FILE__, __func__, __LINE__); \
-   hypre_Free((void *)ptr, location);                                                                                       \
-   ptr = NULL;                                                                                                              \
-}                                                                                                                           \
-)
-
-#define _hypre_TFree(ptr, location)                                                                             \
-(                                                                                                               \
-{                                                                                                               \
-   hypre_MemoryTrackerInsert("free", ptr, (size_t) -1, location, __FILE__, __func__, __LINE__);                 \
-   _hypre_Free((void *)ptr, location);                                                                          \
-   ptr = NULL;                                                                                                  \
-}                                                                                                               \
-)
-
-#else /* #ifdef HYPRE_USING_MEMORY_TRACKER */
+#if !defined(HYPRE_USING_MEMORY_TRACKER)
 
 #define hypre_TAlloc(type, count, location) \
 ( (type *) hypre_MAlloc((size_t)(sizeof(type) * (count)), location) )
@@ -246,7 +152,7 @@ typedef struct
 #define _hypre_TFree(ptr, location) \
 ( _hypre_Free((void *)ptr, location), ptr = NULL )
 
-#endif /* #ifdef HYPRE_USING_MEMORY_TRACKER */
+#endif /* #if !defined(HYPRE_USING_MEMORY_TRACKER) */
 
 
 /*--------------------------------------------------------------------------
@@ -254,12 +160,16 @@ typedef struct
  *--------------------------------------------------------------------------*/
 
 /* memory.c */
+HYPRE_Int hypre_GetMemoryLocationName(hypre_MemoryLocation memory_location,
+                                      char *memory_location_name);
+void   hypre_CheckMemoryLocation(void *ptr, hypre_MemoryLocation location);
 void * hypre_Memset(void *ptr, HYPRE_Int value, size_t num, HYPRE_MemoryLocation location);
 void   hypre_MemPrefetch(void *ptr, size_t size, HYPRE_MemoryLocation location);
 void * hypre_MAlloc(size_t size, HYPRE_MemoryLocation location);
 void * hypre_CAlloc( size_t count, size_t elt_size, HYPRE_MemoryLocation location);
 void   hypre_Free(void *ptr, HYPRE_MemoryLocation location);
-void   hypre_Memcpy(void *dst, void *src, size_t size, HYPRE_MemoryLocation loc_dst, HYPRE_MemoryLocation loc_src);
+void   hypre_Memcpy(void *dst, void *src, size_t size, HYPRE_MemoryLocation loc_dst,
+                    HYPRE_MemoryLocation loc_src);
 void * hypre_ReAlloc(void *ptr, size_t size, HYPRE_MemoryLocation location);
 void * hypre_ReAlloc_v2(void *ptr, size_t old_size, size_t new_size, HYPRE_MemoryLocation location);
 
@@ -267,11 +177,12 @@ void * _hypre_MAlloc(size_t size, hypre_MemoryLocation location);
 void   _hypre_Free(void *ptr, hypre_MemoryLocation location);
 
 HYPRE_ExecutionPolicy hypre_GetExecPolicy1(HYPRE_MemoryLocation location);
-HYPRE_ExecutionPolicy hypre_GetExecPolicy2(HYPRE_MemoryLocation location1, HYPRE_MemoryLocation location2);
+HYPRE_ExecutionPolicy hypre_GetExecPolicy2(HYPRE_MemoryLocation location1,
+                                           HYPRE_MemoryLocation location2);
 
 HYPRE_Int hypre_GetPointerLocation(const void *ptr, hypre_MemoryLocation *memory_location);
-HYPRE_Int hypre_PrintMemoryTracker();
-HYPRE_Int hypre_SetCubMemPoolSize( hypre_uint bin_growth, hypre_uint min_bin, hypre_uint max_bin, size_t max_cached_bytes );
+HYPRE_Int hypre_SetCubMemPoolSize( hypre_uint bin_growth, hypre_uint min_bin, hypre_uint max_bin,
+                                   size_t max_cached_bytes );
 HYPRE_Int hypre_umpire_host_pooled_allocate(void **ptr, size_t nbytes);
 HYPRE_Int hypre_umpire_host_pooled_free(void *ptr);
 void *hypre_umpire_host_pooled_realloc(void *ptr, size_t size);
@@ -281,29 +192,27 @@ HYPRE_Int hypre_umpire_um_pooled_allocate(void **ptr, size_t nbytes);
 HYPRE_Int hypre_umpire_um_pooled_free(void *ptr);
 HYPRE_Int hypre_umpire_pinned_pooled_allocate(void **ptr, size_t nbytes);
 HYPRE_Int hypre_umpire_pinned_pooled_free(void *ptr);
-
-#ifdef HYPRE_USING_MEMORY_TRACKER
-hypre_MemoryTracker * hypre_MemoryTrackerCreate();
-void hypre_MemoryTrackerDestroy(hypre_MemoryTracker *tracker);
-void hypre_MemoryTrackerInsert(const char *action, void *ptr, size_t nbytes, hypre_MemoryLocation memory_location, const char *filename, const char *function, HYPRE_Int line);
-HYPRE_Int hypre_PrintMemoryTracker();
-#endif
-
+HYPRE_Int hypre_UmpireInit(hypre_Handle *hypre_handle_);
+HYPRE_Int hypre_UmpireFinalize(hypre_Handle *hypre_handle_);
+HYPRE_Int hypre_UmpireGetCurrentMemoryUsage(MPI_Comm comm, HYPRE_Real *current);
+HYPRE_Int hypre_UmpireMemoryGetUsage(HYPRE_Real *memory);
+HYPRE_Int hypre_HostMemoryGetUsage(HYPRE_Real *mem);
+HYPRE_Int hypre_MemoryPrintUsage(MPI_Comm comm, HYPRE_Int level,
+                                 const char *function, HYPRE_Int line);
+#define HYPRE_PRINT_MEMORY_USAGE(comm) hypre_MemoryPrintUsage(comm,\
+                                                              hypre_HandleLogLevel(hypre_handle()),\
+                                                              __func__,\
+                                                              __LINE__)
 /* memory_dmalloc.c */
 HYPRE_Int hypre_InitMemoryDebugDML( HYPRE_Int id );
 HYPRE_Int hypre_FinalizeMemoryDebugDML( void );
-char *hypre_MAllocDML( HYPRE_Int size , char *file , HYPRE_Int line );
-char *hypre_CAllocDML( HYPRE_Int count , HYPRE_Int elt_size , char *file , HYPRE_Int line );
-char *hypre_ReAllocDML( char *ptr , HYPRE_Int size , char *file , HYPRE_Int line );
-void hypre_FreeDML( char *ptr , char *file , HYPRE_Int line );
-
-/* GPU malloc prototype */
-typedef void (*GPUMallocFunc)(void **, size_t);
-typedef void (*GPUMfreeFunc)(void *);
+char *hypre_MAllocDML( HYPRE_Int size, char *file, HYPRE_Int line );
+char *hypre_CAllocDML( HYPRE_Int count, HYPRE_Int elt_size, char *file, HYPRE_Int line );
+char *hypre_ReAllocDML( char *ptr, HYPRE_Int size, char *file, HYPRE_Int line );
+void hypre_FreeDML( char *ptr, char *file, HYPRE_Int line );
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif
-
+#endif /* hypre_MEMORY_HEADER */
diff --git a/external/hypre/src/utilities/memory_dmalloc.c b/external/hypre/src/utilities/memory_dmalloc.c
index 00c7df3f..5c4971df 100644
--- a/external/hypre/src/utilities/memory_dmalloc.c
+++ b/external/hypre/src/utilities/memory_dmalloc.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -63,9 +63,13 @@ hypre_MAllocDML( HYPRE_Int   size,
    char *ptr;
 
    if (size > 0)
+   {
       ptr = _malloc_leap(file, line, size);
+   }
    else
+   {
       ptr = NULL;
+   }
 
    return ptr;
 }
@@ -81,7 +85,7 @@ hypre_CAllocDML( HYPRE_Int   count,
                  HYPRE_Int   line    )
 {
    char *ptr;
-   HYPRE_Int   size = count*elt_size;
+   HYPRE_Int   size = count * elt_size;
 
    if (size > 0)
    {
diff --git a/external/hypre/src/utilities/memory_tracker.c b/external/hypre/src/utilities/memory_tracker.c
new file mode 100644
index 00000000..895611e3
--- /dev/null
+++ b/external/hypre/src/utilities/memory_tracker.c
@@ -0,0 +1,638 @@
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+/*--------------------------------------------------------------------------
+ * Memory tracker
+ * Do NOT use hypre_T* in this file since we don't want to track them,
+ * Do NOT use hypre_printf, hypre_fprintf, which have hypre_TAlloc/Free
+ * endless for-loop otherwise
+ *--------------------------------------------------------------------------*/
+
+#include "_hypre_utilities.h"
+
+#if defined(HYPRE_USING_MEMORY_TRACKER)
+
+hypre_MemoryTracker *_hypre_memory_tracker = NULL;
+
+/* accessor to the global ``_hypre_memory_tracker'' */
+hypre_MemoryTracker*
+hypre_memory_tracker(void)
+{
+#ifdef HYPRE_USING_OPENMP
+   #pragma omp critical
+#endif
+   {
+      if (!_hypre_memory_tracker)
+      {
+         _hypre_memory_tracker = hypre_MemoryTrackerCreate();
+      }
+   }
+
+   return _hypre_memory_tracker;
+}
+
+size_t hypre_total_bytes[hypre_NUM_MEMORY_LOCATION];
+size_t hypre_peak_bytes[hypre_NUM_MEMORY_LOCATION];
+size_t hypre_current_bytes[hypre_NUM_MEMORY_LOCATION];
+HYPRE_Int hypre_memory_tracker_print = 0;
+char hypre_memory_tracker_filename[HYPRE_MAX_FILE_NAME_LEN] = "HypreMemoryTrack.log";
+
+char *hypre_basename(const char *name)
+{
+   const char *base = name;
+   while (*name)
+   {
+      if (*name++ == '/')
+      {
+         base = name;
+      }
+   }
+   return (char *) base;
+}
+
+hypre_MemcpyType
+hypre_GetMemcpyType(hypre_MemoryLocation dst,
+                    hypre_MemoryLocation src)
+{
+   HYPRE_Int d = 0, s = 0;
+
+   if      (dst == hypre_MEMORY_HOST   || dst == hypre_MEMORY_HOST_PINNED) { d = 0; }
+   else if (dst == hypre_MEMORY_DEVICE || dst == hypre_MEMORY_UNIFIED)     { d = 1; }
+
+   if      (src == hypre_MEMORY_HOST   || src == hypre_MEMORY_HOST_PINNED) { s = 0; }
+   else if (src == hypre_MEMORY_DEVICE || src == hypre_MEMORY_UNIFIED)     { s = 1; }
+
+   if (d == 0 && s == 0) { return hypre_MEMCPY_H2H; }
+   if (d == 0 && s == 1) { return hypre_MEMCPY_D2H; }
+   if (d == 1 && s == 0) { return hypre_MEMCPY_H2D; }
+   if (d == 1 && s == 1) { return hypre_MEMCPY_D2D; }
+
+   return hypre_MEMCPY_NUM_TYPES;
+}
+
+hypre_int
+hypre_MemoryTrackerQueueCompSort(const void *e1,
+                                 const void *e2)
+{
+   void *p1 = ((hypre_MemoryTrackerEntry *) e1) -> ptr;
+   void *p2 = ((hypre_MemoryTrackerEntry *) e2) -> ptr;
+
+   if (p1 < p2) { return -1; }
+   if (p1 > p2) { return  1; }
+
+   size_t t1 = ((hypre_MemoryTrackerEntry *) e1) -> time_step;
+   size_t t2 = ((hypre_MemoryTrackerEntry *) e2) -> time_step;
+
+   if (t1 < t2) { return -1; }
+   if (t1 > t2) { return  1; }
+
+   return 0;
+}
+
+
+hypre_int
+hypre_MemoryTrackerQueueCompSearch(const void *e1,
+                                   const void *e2)
+{
+   void *p1 = ((hypre_MemoryTrackerEntry **) e1)[0] -> ptr;
+   void *p2 = ((hypre_MemoryTrackerEntry **) e2)[0] -> ptr;
+
+   if (p1 < p2) { return -1; }
+   if (p1 > p2) { return  1; }
+
+   return 0;
+}
+
+hypre_MemoryTrackerEvent
+hypre_MemoryTrackerGetNext(hypre_MemoryTracker *tracker)
+{
+   hypre_MemoryTrackerEvent i, k = HYPRE_MEMORY_NUM_EVENTS;
+   hypre_MemoryTrackerQueue *q = tracker->queue;
+
+   for (i = HYPRE_MEMORY_EVENT_ALLOC; i < HYPRE_MEMORY_NUM_EVENTS; i++)
+   {
+      if (q[i].head >= q[i].actual_size)
+      {
+         continue;
+      }
+
+      if (k == HYPRE_MEMORY_NUM_EVENTS || q[i].data[q[i].head].time_step < q[k].data[q[k].head].time_step)
+      {
+         k = i;
+      }
+   }
+
+   return k;
+}
+
+HYPRE_Int
+hypre_MemoryTrackerSortQueue(hypre_MemoryTrackerQueue *q)
+{
+   size_t i = 0;
+
+   if (!q) { return hypre_error_flag; }
+
+   free(q->sorted_data);
+   free(q->sorted_data_compressed_offset);
+   free(q->sorted_data_compressed);
+
+   q->sorted_data = (hypre_MemoryTrackerEntry *) malloc(q->actual_size * sizeof(
+                                                           hypre_MemoryTrackerEntry));
+   memcpy(q->sorted_data, q->data, q->actual_size * sizeof(hypre_MemoryTrackerEntry));
+   qsort(q->sorted_data, q->actual_size, sizeof(hypre_MemoryTrackerEntry),
+         hypre_MemoryTrackerQueueCompSort);
+
+   q->sorted_data_compressed_len = 0;
+   q->sorted_data_compressed_offset = (size_t *) malloc(q->actual_size * sizeof(size_t));
+   q->sorted_data_compressed = (hypre_MemoryTrackerEntry **) malloc((q->actual_size + 1) * sizeof(
+                                                                       hypre_MemoryTrackerEntry *));
+
+   for (i = 0; i < q->actual_size; i++)
+   {
+      if (i == 0 || q->sorted_data[i].ptr != q->sorted_data[i - 1].ptr)
+      {
+         q->sorted_data_compressed_offset[q->sorted_data_compressed_len] = i;
+         q->sorted_data_compressed[q->sorted_data_compressed_len] = &q->sorted_data[i];
+         q->sorted_data_compressed_len ++;
+      }
+   }
+   q->sorted_data_compressed[q->sorted_data_compressed_len] = q->sorted_data + q->actual_size;
+
+   q->sorted_data_compressed_offset = (size_t *)
+                                      realloc(q->sorted_data_compressed_offset, q->sorted_data_compressed_len * sizeof(size_t));
+
+   q->sorted_data_compressed = (hypre_MemoryTrackerEntry **)
+                               realloc(q->sorted_data_compressed,
+                                       (q->sorted_data_compressed_len + 1) * sizeof(hypre_MemoryTrackerEntry *));
+
+   return hypre_error_flag;
+}
+
+hypre_MemoryTracker *
+hypre_MemoryTrackerCreate()
+{
+   hypre_MemoryTracker *ptr = (hypre_MemoryTracker *) calloc(1, sizeof(hypre_MemoryTracker));
+   return ptr;
+}
+
+void
+hypre_MemoryTrackerDestroy(hypre_MemoryTracker *tracker)
+{
+   if (tracker)
+   {
+      HYPRE_Int i;
+
+      for (i = 0; i < HYPRE_MEMORY_NUM_EVENTS; i++)
+      {
+         free(tracker->queue[i].data);
+         free(tracker->queue[i].sorted_data);
+         free(tracker->queue[i].sorted_data_compressed_offset);
+         free(tracker->queue[i].sorted_data_compressed);
+      }
+
+      free(tracker);
+   }
+}
+
+HYPRE_Int
+hypre_MemoryTrackerSetPrint(HYPRE_Int do_print)
+{
+   hypre_memory_tracker_print = do_print;
+
+   return hypre_error_flag;
+}
+
+HYPRE_Int
+hypre_MemoryTrackerSetFileName(const char *file_name)
+{
+   snprintf(hypre_memory_tracker_filename, HYPRE_MAX_FILE_NAME_LEN, "%s", file_name);
+
+   return hypre_error_flag;
+}
+
+void
+hypre_MemoryTrackerInsert1(const char           *action,
+                           void                 *ptr,
+                           size_t                nbytes,
+                           hypre_MemoryLocation  memory_location,
+                           const char           *filename,
+                           const char           *function,
+                           HYPRE_Int             line)
+{
+   hypre_MemoryTrackerInsert2(action, ptr, NULL, nbytes, memory_location, hypre_MEMORY_UNDEFINED,
+                              filename, function, line);
+}
+
+void
+hypre_MemoryTrackerInsert2(const char           *action,
+                           void                 *ptr,
+                           void                 *ptr2,
+                           size_t                nbytes,
+                           hypre_MemoryLocation  memory_location,
+                           hypre_MemoryLocation  memory_location2,
+                           const char           *filename,
+                           const char           *function,
+                           HYPRE_Int             line)
+{
+   if (ptr == NULL)
+   {
+      return;
+   }
+
+   hypre_MemoryTracker *tracker = hypre_memory_tracker();
+
+   hypre_MemoryTrackerEvent q;
+
+   /* Get the proper queue based on the action */
+
+   if (strstr(action, "alloc") != NULL)
+   {
+      /* including malloc, alloc and the malloc in realloc */
+      q = HYPRE_MEMORY_EVENT_ALLOC;
+   }
+   else if (strstr(action, "free") != NULL)
+   {
+      /* including free and the free in realloc */
+      q = HYPRE_MEMORY_EVENT_FREE;
+   }
+   else if (strstr(action, "memcpy") != NULL)
+   {
+      /* including memcpy */
+      q = HYPRE_MEMORY_EVENT_COPY;
+   }
+   else
+   {
+      return;
+   }
+
+   hypre_MemoryTrackerQueue *queue = &tracker->queue[q];
+
+#ifdef HYPRE_USING_OPENMP
+   #pragma omp critical
+#endif
+   {
+      /* resize if not enough space */
+
+      if (queue->alloced_size <= queue->actual_size)
+      {
+         queue->alloced_size = 2 * queue->alloced_size + 1;
+         queue->data = (hypre_MemoryTrackerEntry *) realloc(queue->data,
+                                                            queue->alloced_size * sizeof(hypre_MemoryTrackerEntry));
+      }
+
+      hypre_assert(queue->actual_size < queue->alloced_size);
+
+      /* insert an entry */
+      hypre_MemoryTrackerEntry *entry = queue->data + queue->actual_size;
+
+      entry->index = queue->actual_size;
+      entry->time_step = tracker->curr_time_step;
+      sprintf(entry->action, "%s", action);
+      entry->ptr = ptr;
+      entry->ptr2 = ptr2;
+      entry->nbytes = nbytes;
+      entry->memory_location = memory_location;
+      entry->memory_location2 = memory_location2;
+      sprintf(entry->filename, "%s", filename);
+      sprintf(entry->function, "%s", function);
+      entry->line = line;
+      entry->pair = (size_t) -1;
+
+#if 0
+      HYPRE_Int myid;
+      hypre_MPI_Comm_rank(hypre_MPI_COMM_WORLD, &myid);
+      if (myid == 0 && entry->time_step == 28111) {assert(0);}
+#endif
+
+      /* increase the time step */
+      tracker->curr_time_step ++;
+
+      /* increase the queue length by 1 */
+      queue->actual_size ++;
+   }
+}
+
+HYPRE_Int
+hypre_PrintMemoryTracker( size_t     *totl_bytes_o,
+                          size_t     *peak_bytes_o,
+                          size_t     *curr_bytes_o,
+                          HYPRE_Int   do_print,
+                          const char *fname )
+{
+   char   filename[HYPRE_MAX_FILE_NAME_LEN + 16];
+   FILE  *file = NULL;
+   size_t totl_bytes[hypre_NUM_MEMORY_LOCATION] = {0};
+   size_t peak_bytes[hypre_NUM_MEMORY_LOCATION] = {0};
+   size_t curr_bytes[hypre_NUM_MEMORY_LOCATION] = {0};
+   size_t copy_bytes[hypre_MEMCPY_NUM_TYPES] = {0};
+   size_t j;
+   hypre_MemoryTrackerEvent i;
+   //HYPRE_Real t0 = hypre_MPI_Wtime();
+
+   HYPRE_Int leakcheck = 1;
+
+   hypre_MemoryTracker *tracker = hypre_memory_tracker();
+   hypre_MemoryTrackerQueue *qq = tracker->queue;
+   hypre_MemoryTrackerQueue *qa = &qq[HYPRE_MEMORY_EVENT_ALLOC];
+   hypre_MemoryTrackerQueue *qf = &qq[HYPRE_MEMORY_EVENT_FREE];
+
+   if (do_print)
+   {
+      HYPRE_Int myid;
+      hypre_MPI_Comm_rank(hypre_MPI_COMM_WORLD, &myid);
+
+      if (fname)
+      {
+         hypre_sprintf(filename, "%s.%05d.csv", fname, myid);
+      }
+      else
+      {
+         hypre_sprintf(filename, "HypreMemoryTrack.log.%05d.csv", myid);
+      }
+
+      if ((file = fopen(filename, "w")) == NULL)
+      {
+         fprintf(stderr, "Error: can't open output file %s\n", filename);
+         return hypre_error_flag;
+      }
+
+      fprintf(file, "\"==== Operations:\"\n");
+      fprintf(file, " %6s, %9s, %16s, %16s, %10s, %10s, %10s, %28s, %8s, %54s, %11s, %11s, %11s, %11s\n",
+              "ID", "EVENT", "ADDRESS1", "ADDRESS2", "BYTE", "LOCATION1", "LOCATION2",
+              "FILE", "LINE", "FUNCTION", "HOST", "PINNED", "DEVICE", "UNIFIED");
+   }
+
+   if (leakcheck)
+   {
+      //HYPRE_Real t0 = hypre_MPI_Wtime();
+      hypre_MemoryTrackerSortQueue(qf);
+      //HYPRE_Real t1 = hypre_MPI_Wtime() - t0;
+      //printf("Sort Time %.2f\n", t1);
+   }
+
+   size_t total_num_events = 0;
+   size_t total_num_events_2 = 0;
+   for (i = HYPRE_MEMORY_EVENT_ALLOC; i < HYPRE_MEMORY_NUM_EVENTS; i++)
+   {
+      total_num_events_2 += qq[i].actual_size;
+   }
+
+   for (i = hypre_MemoryTrackerGetNext(tracker); i < HYPRE_MEMORY_NUM_EVENTS;
+        i = hypre_MemoryTrackerGetNext(tracker))
+   {
+      total_num_events ++;
+
+      hypre_MemoryTrackerEntry *entry = &qq[i].data[qq[i].head++];
+
+      if (strstr(entry->action, "alloc") != NULL)
+      {
+         totl_bytes[entry->memory_location] += entry->nbytes;
+
+         if (leakcheck)
+         {
+            curr_bytes[entry->memory_location] += entry->nbytes;
+            peak_bytes[entry->memory_location] = hypre_max( curr_bytes[entry->memory_location],
+                                                            peak_bytes[entry->memory_location] );
+         }
+
+         if (leakcheck && entry->pair == (size_t) -1)
+         {
+            hypre_MemoryTrackerEntry key = { .ptr = entry->ptr };
+            hypre_MemoryTrackerEntry *key_ptr = &key;
+
+            hypre_MemoryTrackerEntry **result = bsearch(&key_ptr,
+                                                        qf->sorted_data_compressed,
+                                                        qf->sorted_data_compressed_len,
+                                                        sizeof(hypre_MemoryTrackerEntry *),
+                                                        hypre_MemoryTrackerQueueCompSearch);
+            if (result)
+            {
+               j = result - qf->sorted_data_compressed;
+               hypre_MemoryTrackerEntry *p = qf->sorted_data + qf->sorted_data_compressed_offset[j];
+
+               if (p < qf->sorted_data_compressed[j + 1])
+               {
+                  hypre_assert(p->ptr == entry->ptr);
+                  entry->pair = p->index;
+                  hypre_assert(qf->data[p->index].pair == -1);
+                  hypre_assert(qq[i].head - 1 == entry->index);
+                  qf->data[p->index].pair = entry->index;
+                  qf->data[p->index].nbytes = entry->nbytes;
+
+                  qf->sorted_data_compressed_offset[j] ++;
+               }
+            }
+         }
+      }
+      else if (leakcheck && strstr(entry->action, "free") != NULL)
+      {
+         if (entry->pair < qa->actual_size)
+         {
+            curr_bytes[entry->memory_location] -= qa->data[entry->pair].nbytes;
+         }
+      }
+      else if (strstr(entry->action, "memcpy") != NULL)
+      {
+         copy_bytes[hypre_GetMemcpyType(entry->memory_location, entry->memory_location2)] += entry->nbytes;
+      }
+
+      if (do_print)
+      {
+         char memory_location[256];
+         char memory_location2[256];
+         char nbytes[32];
+
+         hypre_GetMemoryLocationName(entry->memory_location, memory_location);
+         hypre_GetMemoryLocationName(entry->memory_location2, memory_location2);
+
+         if (entry->nbytes != (size_t) -1)
+         {
+            sprintf(nbytes, "%zu", entry->nbytes);
+         }
+         else
+         {
+            sprintf(nbytes, "%s", "--");
+         }
+
+         fprintf(file,
+                 " %6zu, %9s, %16p, %16p, %10s, %10s, %10s, %28s, %8d, %54s, %11zu, %11zu, %11zu, %11zu\n",
+                 entry->time_step,
+                 entry->action,
+                 entry->ptr,
+                 entry->ptr2,
+                 nbytes,
+                 memory_location,
+                 memory_location2,
+                 hypre_basename(entry->filename),
+                 entry->line,
+                 entry->function,
+                 curr_bytes[hypre_MEMORY_HOST],
+                 curr_bytes[hypre_MEMORY_HOST_PINNED],
+                 curr_bytes[hypre_MEMORY_DEVICE],
+                 curr_bytes[hypre_MEMORY_UNIFIED]
+                );
+      }
+   }
+
+   hypre_assert(total_num_events == total_num_events_2);
+
+   if (do_print)
+   {
+      fprintf(file, "\n\"==== Total Allocation (byte):\"\n");
+      fprintf(file, " %6s, %9s, %16s, %16s, %10s, %10s, %10s, %28s, %8s, %54s, %11s, %11s, %11s, %11s\n",
+              "", "", "", "", "", "", "", "", "", "", "HOST", "PINNED", "DEVICE", "UNIFIED");
+      fprintf(file,
+              " %6s, %9s, %16s, %16s, %10s, %10s, %10s, %28s, %8s, %54s, %11zu, %11zu, %11zu, %11zu\n",
+              "", "", "", "", "", "", "", "", "", "",
+              totl_bytes[hypre_MEMORY_HOST],
+              totl_bytes[hypre_MEMORY_HOST_PINNED],
+              totl_bytes[hypre_MEMORY_DEVICE],
+              totl_bytes[hypre_MEMORY_UNIFIED]);
+
+      fprintf(file, "\n\"==== Peak Allocation (byte):\"\n");
+      /*fprintf(file, " %6s, %9s, %16s, %16s, %10s, %10s, %10s, %28s, %8s, %54s, %11s, %11s, %11s, %11s\n",
+            "", "", "", "", "", "", "", "", "", "", "HOST", "PINNED", "DEVICE", "UNIFIED"); */
+      fprintf(file,
+              " %6s, %9s, %16s, %16s, %10s, %10s, %10s, %28s, %8s, %54s, %11zu, %11zu, %11zu, %11zu\n",
+              "", "", "", "", "", "", "", "", "", "",
+              peak_bytes[hypre_MEMORY_HOST],
+              peak_bytes[hypre_MEMORY_HOST_PINNED],
+              peak_bytes[hypre_MEMORY_DEVICE],
+              peak_bytes[hypre_MEMORY_UNIFIED]);
+
+      fprintf(file, "\n\"==== Reachable Allocation (byte):\"\n");
+      /* fprintf(file, " %6s, %9s, %16s, %16s, %10s, %10s, %10s, %28s, %8s, %54s, %11s, %11s, %11s, %11s\n",
+            "", "", "", "", "", "", "", "", "", "", "HOST", "PINNED", "DEVICE", "UNIFIED"); */
+      fprintf(file,
+              " %6s, %9s, %16s, %16s, %10s, %10s, %10s, %28s, %8s, %54s, %11zu, %11zu, %11zu, %11zu\n",
+              "", "", "", "", "", "", "", "", "", "",
+              curr_bytes[hypre_MEMORY_HOST],
+              curr_bytes[hypre_MEMORY_HOST_PINNED],
+              curr_bytes[hypre_MEMORY_DEVICE],
+              curr_bytes[hypre_MEMORY_UNIFIED]);
+
+      fprintf(file, "\n\"==== Memory Copy (byte):\"\n");
+      fprintf(file, " %6s, %9s, %16s, %16s, %10s, %10s, %10s, %28s, %8s, %54s, %11s, %11s, %11s, %11s\n",
+              "", "", "", "", "", "", "", "", "", "", "H2H", "D2H", "H2D", "D2D");
+      fprintf(file,
+              " %6s, %9s, %16s, %16s, %10s, %10s, %10s, %28s, %8s, %54s, %11zu, %11zu, %11zu, %11zu\n",
+              "", "", "", "", "", "", "", "", "", "",
+              copy_bytes[hypre_MEMCPY_H2H],
+              copy_bytes[hypre_MEMCPY_D2H],
+              copy_bytes[hypre_MEMCPY_H2D],
+              copy_bytes[hypre_MEMCPY_D2D]);
+
+   }
+
+   if (totl_bytes_o)
+   {
+      totl_bytes_o[hypre_MEMORY_HOST] = totl_bytes[hypre_MEMORY_HOST];
+      totl_bytes_o[hypre_MEMORY_HOST_PINNED] = totl_bytes[hypre_MEMORY_HOST_PINNED];
+      totl_bytes_o[hypre_MEMORY_DEVICE] = totl_bytes[hypre_MEMORY_DEVICE];
+      totl_bytes_o[hypre_MEMORY_UNIFIED] = totl_bytes[hypre_MEMORY_UNIFIED];
+   }
+
+   if (peak_bytes_o)
+   {
+      peak_bytes_o[hypre_MEMORY_HOST] = peak_bytes[hypre_MEMORY_HOST];
+      peak_bytes_o[hypre_MEMORY_HOST_PINNED] = peak_bytes[hypre_MEMORY_HOST_PINNED];
+      peak_bytes_o[hypre_MEMORY_DEVICE] = peak_bytes[hypre_MEMORY_DEVICE];
+      peak_bytes_o[hypre_MEMORY_UNIFIED] = peak_bytes[hypre_MEMORY_UNIFIED];
+   }
+
+   if (curr_bytes_o)
+   {
+      curr_bytes_o[hypre_MEMORY_HOST] = curr_bytes[hypre_MEMORY_HOST];
+      curr_bytes_o[hypre_MEMORY_HOST_PINNED] = curr_bytes[hypre_MEMORY_HOST_PINNED];
+      curr_bytes_o[hypre_MEMORY_DEVICE] = curr_bytes[hypre_MEMORY_DEVICE];
+      curr_bytes_o[hypre_MEMORY_UNIFIED] = curr_bytes[hypre_MEMORY_UNIFIED];
+   }
+
+#if defined(HYPRE_DEBUG)
+   for (i = HYPRE_MEMORY_EVENT_ALLOC; i < HYPRE_MEMORY_NUM_EVENTS; i++)
+   {
+      hypre_assert(qq[i].head == qq[i].actual_size);
+   }
+#endif
+
+   if (leakcheck && do_print)
+   {
+      fprintf(file, "\n\"==== Warnings:\"\n");
+
+      for (j = 0; j < qa->actual_size; j++)
+      {
+         hypre_MemoryTrackerEntry *entry = &qa->data[j];
+         if (entry->pair == (size_t) -1)
+         {
+            fprintf(file, " %6zu, %9s, %16p, %16s, %10s, %10s, %10s, %28s, %8s, %54s, %11s, %11s, %11s, %11s\n",
+                    entry->time_step, entry->action, entry->ptr, "", "", "", "", "", "", "Not freed", "", "", "", "");
+         }
+         else
+         {
+            hypre_assert(entry->pair < qf->actual_size);
+            hypre_assert(qf->data[entry->pair].ptr == entry->ptr);
+            hypre_assert(qf->data[entry->pair].nbytes == entry->nbytes);
+            hypre_assert(qf->data[entry->pair].memory_location == entry->memory_location);
+            hypre_assert(qf->data[entry->pair].pair == j);
+         }
+      }
+
+      for (j = 0; j < qf->actual_size; j++)
+      {
+         hypre_MemoryTrackerEntry *entry = &qf->data[j];
+         if (entry->pair == (size_t) -1)
+         {
+            fprintf(file, " %6zu, %9s, %16p, %16s, %10s, %10s, %10s, %28s, %8s, %54s, %11s, %11s, %11s, %11s\n",
+                    entry->time_step, entry->action, entry->ptr, "", "", "", "", "", "", "Unpaired free", "", "", "",
+                    "");
+         }
+         else
+         {
+            hypre_assert(entry->pair < qa->actual_size);
+            hypre_assert(qa->data[entry->pair].ptr == entry->ptr);
+            hypre_assert(qa->data[entry->pair].nbytes == entry->nbytes);
+            hypre_assert(qa->data[entry->pair].memory_location == entry->memory_location);
+            hypre_assert(qa->data[entry->pair].pair == j);
+         }
+      }
+   }
+
+   if (file)
+   {
+      fclose(file);
+   }
+
+   if (leakcheck)
+   {
+      hypre_MemoryLocation t;
+
+      for (t = hypre_MEMORY_HOST; t <= hypre_MEMORY_UNIFIED; t++)
+      {
+         if (curr_bytes[t])
+         {
+            char memory_location[256];
+            hypre_GetMemoryLocationName(t, memory_location);
+            fprintf(stderr, "%zu bytes of %s memory may not be freed\n", curr_bytes[t], memory_location);
+         }
+
+      }
+
+      /*
+      for (t = hypre_MEMORY_HOST; t <= hypre_MEMORY_UNIFIED; t++)
+      {
+         hypre_assert(curr_bytes[t] == 0);
+      }
+      */
+   }
+
+   //HYPRE_Real t1 = hypre_MPI_Wtime() - t0;
+   //printf("Tracker Print Time %.2f\n", t1);
+
+   return hypre_error_flag;
+}
+
+#endif
diff --git a/external/hypre/src/utilities/memory_tracker.h b/external/hypre/src/utilities/memory_tracker.h
new file mode 100644
index 00000000..72eb0146
--- /dev/null
+++ b/external/hypre/src/utilities/memory_tracker.h
@@ -0,0 +1,176 @@
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+#ifndef hypre_MEMORY_TRACKER_HEADER
+#define hypre_MEMORY_TRACKER_HEADER
+
+#if defined(HYPRE_USING_MEMORY_TRACKER)
+
+extern size_t hypre_total_bytes[hypre_MEMORY_UNIFIED + 1];
+extern size_t hypre_peak_bytes[hypre_MEMORY_UNIFIED + 1];
+extern size_t hypre_current_bytes[hypre_MEMORY_UNIFIED + 1];
+extern HYPRE_Int hypre_memory_tracker_print;
+extern char hypre_memory_tracker_filename[HYPRE_MAX_FILE_NAME_LEN];
+
+typedef enum _hypre_MemoryTrackerEvent
+{
+   HYPRE_MEMORY_EVENT_ALLOC = 0,
+   HYPRE_MEMORY_EVENT_FREE,
+   HYPRE_MEMORY_EVENT_COPY,
+   HYPRE_MEMORY_NUM_EVENTS,
+} hypre_MemoryTrackerEvent;
+
+typedef enum _hypre_MemcpyType
+{
+   hypre_MEMCPY_H2H = 0,
+   hypre_MEMCPY_D2H,
+   hypre_MEMCPY_H2D,
+   hypre_MEMCPY_D2D,
+   hypre_MEMCPY_NUM_TYPES,
+} hypre_MemcpyType;
+
+typedef struct
+{
+   size_t                index;
+   size_t                time_step;
+   char                  action[16];
+   void                 *ptr;
+   void                 *ptr2;
+   size_t                nbytes;
+   hypre_MemoryLocation  memory_location;
+   hypre_MemoryLocation  memory_location2;
+   char                  filename[HYPRE_MAX_FILE_NAME_LEN];
+   char                  function[256];
+   HYPRE_Int             line;
+   size_t                pair;
+} hypre_MemoryTrackerEntry;
+
+typedef struct
+{
+   size_t                     head;
+   size_t                     actual_size;
+   size_t                     alloced_size;
+   hypre_MemoryTrackerEntry  *data;
+   /* Free Queue is sorted based on (ptr, time_step) ascendingly */
+   hypre_MemoryTrackerEntry  *sorted_data;
+   /* compressed sorted_data with the same ptr */
+   size_t                     sorted_data_compressed_len;
+   size_t                    *sorted_data_compressed_offset;
+   hypre_MemoryTrackerEntry **sorted_data_compressed;
+} hypre_MemoryTrackerQueue;
+
+typedef struct
+{
+   size_t                   curr_time_step;
+   hypre_MemoryTrackerQueue queue[HYPRE_MEMORY_NUM_EVENTS];
+} hypre_MemoryTracker;
+
+extern hypre_MemoryTracker *_hypre_memory_tracker;
+
+#define hypre_TAlloc(type, count, location)                                                         \
+(                                                                                                   \
+{                                                                                                   \
+   void *ptr = hypre_MAlloc((size_t)(sizeof(type) * (count)), location);                            \
+                                                                                                    \
+   hypre_MemoryLocation alocation = hypre_GetActualMemLocation(location);                           \
+   hypre_MemoryTrackerInsert1("malloc", ptr, sizeof(type)*(count), alocation,                       \
+                              __FILE__, __func__, __LINE__);                                        \
+   (type *) ptr;                                                                                    \
+}                                                                                                   \
+)
+
+#define hypre_CTAlloc(type, count, location)                                                        \
+(                                                                                                   \
+{                                                                                                   \
+   void *ptr = hypre_CAlloc((size_t)(count), (size_t)sizeof(type), location);                       \
+                                                                                                    \
+   hypre_MemoryLocation alocation = hypre_GetActualMemLocation(location);                           \
+   hypre_MemoryTrackerInsert1("calloc", ptr, sizeof(type)*(count), alocation,                       \
+                              __FILE__, __func__, __LINE__);                                        \
+   (type *) ptr;                                                                                    \
+}                                                                                                   \
+)
+
+#define hypre_TReAlloc(ptr, type, count, location)                                                  \
+(                                                                                                   \
+{                                                                                                   \
+   void *new_ptr = hypre_ReAlloc((char *)ptr, (size_t)(sizeof(type) * (count)), location);          \
+                                                                                                    \
+   hypre_MemoryLocation alocation = hypre_GetActualMemLocation(location);                           \
+   hypre_MemoryTrackerInsert1("rfree", ptr, (size_t) -1, alocation,                                 \
+                              __FILE__, __func__, __LINE__);                                        \
+   hypre_MemoryTrackerInsert1("rmalloc", new_ptr, sizeof(type)*(count), alocation,                  \
+                              __FILE__, __func__, __LINE__);                                        \
+   (type *) new_ptr;                                                                                \
+}                                                                                                   \
+)
+
+#define hypre_TReAlloc_v2(ptr, old_type, old_count, new_type, new_count, location)                  \
+(                                                                                                   \
+{                                                                                                   \
+   void *new_ptr = hypre_ReAlloc_v2((char *)ptr, (size_t)(sizeof(old_type)*(old_count)),            \
+                                    (size_t)(sizeof(new_type)*(new_count)), location);              \
+                                                                                                    \
+   hypre_MemoryLocation alocation = hypre_GetActualMemLocation(location);                           \
+   hypre_MemoryTrackerInsert1("rfree", ptr, sizeof(old_type)*(old_count), alocation,                \
+                              __FILE__, __func__, __LINE__);                                        \
+   hypre_MemoryTrackerInsert1("rmalloc", new_ptr, sizeof(new_type)*(new_count), alocation,          \
+                              __FILE__, __func__, __LINE__);                                        \
+   (new_type *) new_ptr;                                                                            \
+}                                                                                                   \
+)
+
+#define hypre_TMemcpy(dst, src, type, count, locdst, locsrc)                                        \
+(                                                                                                   \
+{                                                                                                   \
+   hypre_Memcpy((void *)(dst), (void *)(src), (size_t)(sizeof(type) * (count)), locdst, locsrc);    \
+                                                                                                    \
+   hypre_MemoryLocation alocation_dst = hypre_GetActualMemLocation(locdst);                         \
+   hypre_MemoryLocation alocation_src = hypre_GetActualMemLocation(locsrc);                         \
+   hypre_MemoryTrackerInsert2("memcpy", (void *) (dst), (void *) (src), sizeof(type)*(count),       \
+                              alocation_dst, alocation_src,                                         \
+                              __FILE__, __func__, __LINE__);                                        \
+}                                                                                                   \
+)
+
+#define hypre_TFree(ptr, location)                                                                  \
+(                                                                                                   \
+{                                                                                                   \
+   hypre_Free((void *)ptr, location);                                                               \
+                                                                                                    \
+   hypre_MemoryLocation alocation = hypre_GetActualMemLocation(location);                           \
+   hypre_MemoryTrackerInsert1("free", ptr, (size_t) -1, alocation,                                  \
+                              __FILE__, __func__, __LINE__);                                        \
+   ptr = NULL;                                                                                      \
+}                                                                                                   \
+)
+
+#define _hypre_TAlloc(type, count, location)                                                        \
+(                                                                                                   \
+{                                                                                                   \
+   void *ptr = _hypre_MAlloc((size_t)(sizeof(type) * (count)), location);                           \
+                                                                                                    \
+   hypre_MemoryTrackerInsert1("malloc", ptr, sizeof(type)*(count), location,                        \
+                              __FILE__, __func__, __LINE__);                                        \
+   (type *) ptr;                                                                                    \
+}                                                                                                   \
+)
+
+#define _hypre_TFree(ptr, location)                                                                 \
+(                                                                                                   \
+{                                                                                                   \
+   _hypre_Free((void *)ptr, location);                                                              \
+                                                                                                    \
+   hypre_MemoryTrackerInsert1("free", ptr, (size_t) -1, location,                                   \
+                             __FILE__, __func__, __LINE__);                                         \
+   ptr = NULL;                                                                                      \
+}                                                                                                   \
+)
+
+#endif /* #if defined(HYPRE_USING_MEMORY_TRACKER) */
+#endif /* #ifndef hypre_MEMORY_TRACKER_HEADER */
+
diff --git a/external/hypre/src/utilities/merge_sort.c b/external/hypre/src/utilities/merge_sort.c
index 05ceb384..0f033abf 100644
--- a/external/hypre/src/utilities/merge_sort.c
+++ b/external/hypre/src/utilities/merge_sort.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -16,50 +16,56 @@
 #define SWAP(T, a, b) do { T tmp = a; a = b; b = tmp; } while (0)
 
 /*--------------------------------------------------------------------------
- * hypre_MergeOrderedArrays: merge two ordered arrays
+ * hypre_IntArrayMergeOrdered: merge two ordered arrays
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_MergeOrderedArrays( HYPRE_Int  size1,     HYPRE_Int  *array1,
-                          HYPRE_Int  size2,     HYPRE_Int  *array2,
-                          HYPRE_Int *size3_ptr, HYPRE_Int **array3_ptr )
+hypre_IntArrayMergeOrdered( hypre_IntArray *array1,
+                            hypre_IntArray *array2,
+                            hypre_IntArray *array3 )
 {
-   HYPRE_Int  *array3;
-   HYPRE_Int   i, j, k;
+   HYPRE_Int i = 0, j = 0, k = 0;
+   const HYPRE_Int size1 = hypre_IntArraySize(array1);
+   const HYPRE_Int size2 = hypre_IntArraySize(array2);
+
+   HYPRE_MemoryLocation memory_location = hypre_IntArrayMemoryLocation(array3);
 
-   array3 = hypre_CTAlloc(HYPRE_Int, (size1 + size2), HYPRE_MEMORY_HOST);
+   HYPRE_Int *array1_data = hypre_IntArrayData(array1);
+   HYPRE_Int *array2_data = hypre_IntArrayData(array2);
+   HYPRE_Int *array3_data = hypre_TAlloc(HYPRE_Int, size1 + size2, memory_location);
 
-   i = j = k = 0;
    while (i < size1 && j < size2)
    {
-      if (array1[i] > array2[j])
+      if (array1_data[i] > array2_data[j])
       {
-         array3[k++] = array2[j++];
+         array3_data[k++] = array2_data[j++];
       }
-      else if (array1[i] < array2[j])
+      else if (array1_data[i] < array2_data[j])
       {
-         array3[k++] = array1[i++];
+         array3_data[k++] = array1_data[i++];
       }
       else
       {
-         array3[k++] = array1[i++];
+         array3_data[k++] = array1_data[i++];
          j++;
       }
    }
 
    while (i < size1)
    {
-      array3[k++] = array1[i++];
+      array3_data[k++] = array1_data[i++];
    }
 
    while (j < size2)
    {
-      array3[k++] = array2[j++];
+      array3_data[k++] = array2_data[j++];
    }
 
-   /* Set pointers */
-   *size3_ptr  = k;
-   *array3_ptr = hypre_TReAlloc(array3, HYPRE_Int, k, HYPRE_MEMORY_HOST);
+   array3_data = hypre_TReAlloc_v2(array3_data, HYPRE_Int, size1 + size2, HYPRE_Int, k,
+                                   memory_location);
+
+   hypre_IntArraySize(array3) = k;
+   hypre_IntArrayData(array3) = array3_data;
 
    return hypre_error_flag;
 }
@@ -194,7 +200,7 @@ static void kth_element_( HYPRE_Int *out1, HYPRE_Int *out2,
 {
    while (1)
    {
-      HYPRE_Int i = (left + right)/2; // right < k -> i < k
+      HYPRE_Int i = (left + right) / 2; // right < k -> i < k
       HYPRE_Int j = k - i - 1;
 #ifdef DBG_MERGE_SORT
       hypre_assert(left <= right && right <= k);
@@ -212,7 +218,7 @@ static void kth_element_( HYPRE_Int *out1, HYPRE_Int *out2,
          *out1 = i + 1; *out2 = j;
          return;
       }
-      else if (a1[i] > a2[j] && j != n2 - 1 && a1[i] > a2[j+1])
+      else if (a1[i] > a2[j] && j != n2 - 1 && a1[i] > a2[j + 1])
       {
          // search in left half of a1
          right = i - 1;
@@ -289,7 +295,7 @@ static void kth_element( HYPRE_Int *out1, HYPRE_Int *out2,
       SWAP(HYPRE_Int *, out1, out2);
    }
 
-   if (k < (n1 + n2)/2)
+   if (k < (n1 + n2) / 2)
    {
       kth_element_(out1, out2, a1, a2, 0, hypre_min(n1 - 1, k), n1, n2, k);
    }
@@ -322,7 +328,7 @@ static void big_kth_element_( HYPRE_Int *out1, HYPRE_Int *out2,
 {
    while (1)
    {
-      HYPRE_Int i = (left + right)/2; // right < k -> i < k
+      HYPRE_Int i = (left + right) / 2; // right < k -> i < k
       HYPRE_Int j = k - i - 1;
 #ifdef DBG_MERGE_SORT
       hypre_assert(left <= right && right <= k);
@@ -340,7 +346,7 @@ static void big_kth_element_( HYPRE_Int *out1, HYPRE_Int *out2,
          *out1 = i + 1; *out2 = j;
          return;
       }
-      else if (a1[i] > a2[j] && j != n2 - 1 && a1[i] > a2[j+1])
+      else if (a1[i] > a2[j] && j != n2 - 1 && a1[i] > a2[j + 1])
       {
          // search in left half of a1
          right = i - 1;
@@ -412,7 +418,7 @@ static void big_kth_element( HYPRE_Int *out1, HYPRE_Int *out2,
       SWAP(HYPRE_Int *, out1, out2);
    }
 
-   if (k < (n1 + n2)/2)
+   if (k < (n1 + n2) / 2)
    {
       big_kth_element_(out1, out2, a1, a2, 0, hypre_min(n1 - 1, k), n1, n2, k);
    }
@@ -424,7 +430,8 @@ static void big_kth_element( HYPRE_Int *out1, HYPRE_Int *out2,
 
       HYPRE_Int new_n1 = hypre_min(n1 - offset1, new_k + 1);
       HYPRE_Int new_n2 = hypre_min(n2 - offset2, new_k + 1);
-      big_kth_element_(out1, out2, a1 + (HYPRE_BigInt)offset1, a2 + (HYPRE_BigInt)offset2, 0, new_n1 - 1, new_n1, new_n2, new_k);
+      big_kth_element_(out1, out2, a1 + (HYPRE_BigInt)offset1, a2 + (HYPRE_BigInt)offset2, 0, new_n1 - 1,
+                       new_n1, new_n2, new_k);
 
       *out1 += offset1;
       *out2 += offset2;
@@ -450,8 +457,8 @@ static void hypre_parallel_merge( HYPRE_Int *first1, HYPRE_Int *last1,
    HYPRE_Int n1 = last1 - first1;
    HYPRE_Int n2 = last2 - first2;
    HYPRE_Int n = n1 + n2;
-   HYPRE_Int n_per_thread = (n + num_threads - 1)/num_threads;
-   HYPRE_Int begin_rank = hypre_min(n_per_thread*my_thread_num, n);
+   HYPRE_Int n_per_thread = (n + num_threads - 1) / num_threads;
+   HYPRE_Int begin_rank = hypre_min(n_per_thread * my_thread_num, n);
    HYPRE_Int end_rank = hypre_min(begin_rank + n_per_thread, n);
 
 #ifdef DBG_MERGE_SORT
@@ -509,8 +516,8 @@ static void hypre_big_parallel_merge(
    HYPRE_Int n1 = (HYPRE_Int)(last1 - first1);
    HYPRE_Int n2 = (HYPRE_Int)(last2 - first2);
    HYPRE_Int n = n1 + n2;
-   HYPRE_Int n_per_thread = (n + num_threads - 1)/num_threads;
-   HYPRE_Int begin_rank = hypre_min(n_per_thread*my_thread_num, n);
+   HYPRE_Int n_per_thread = (n + num_threads - 1) / num_threads;
+   HYPRE_Int begin_rank = hypre_min(n_per_thread * my_thread_num, n);
    HYPRE_Int end_rank = hypre_min(begin_rank + n_per_thread, n);
 
 #ifdef DBG_MERGE_SORT
@@ -558,7 +565,7 @@ static void hypre_big_parallel_merge(
 
 void hypre_merge_sort( HYPRE_Int *in, HYPRE_Int *temp, HYPRE_Int len, HYPRE_Int **out )
 {
-   if (0 == len) return;
+   if (0 == len) { return; }
 
 #ifdef HYPRE_PROFILE
    hypre_profile_times[HYPRE_TIMER_ID_MERGE] -= hypre_MPI_Wtime();
@@ -574,15 +581,15 @@ void hypre_merge_sort( HYPRE_Int *in, HYPRE_Int *temp, HYPRE_Int len, HYPRE_Int
    // HYPRE_Int out_len = 0;
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel
+   #pragma omp parallel
 #endif
    {
       HYPRE_Int num_threads = hypre_NumActiveThreads();
       HYPRE_Int my_thread_num = hypre_GetThreadNum();
 
       // thread-private sort
-      HYPRE_Int i_per_thread = (len + num_threads - 1)/num_threads;
-      HYPRE_Int i_begin = hypre_min(i_per_thread*my_thread_num, len);
+      HYPRE_Int i_per_thread = (len + num_threads - 1) / num_threads;
+      HYPRE_Int i_begin = hypre_min(i_per_thread * my_thread_num, len);
       HYPRE_Int i_end = hypre_min(i_begin + i_per_thread, len);
 
       hypre_qsort0(in, i_begin, i_end - 1);
@@ -594,22 +601,22 @@ void hypre_merge_sort( HYPRE_Int *in, HYPRE_Int *temp, HYPRE_Int len, HYPRE_Int
       for (in_group_size = 1; in_group_size < num_threads; in_group_size *= 2)
       {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+         #pragma omp barrier
 #endif
 
          // merge 2 in-groups into 1 out-group
-         HYPRE_Int out_group_size = in_group_size*2;
-         HYPRE_Int group_leader = my_thread_num/out_group_size*out_group_size;
+         HYPRE_Int out_group_size = in_group_size * 2;
+         HYPRE_Int group_leader = my_thread_num / out_group_size * out_group_size;
          // HYPRE_Int group_sub_leader = hypre_min(group_leader + in_group_size, num_threads - 1);
-         HYPRE_Int id_in_group = my_thread_num%out_group_size;
+         HYPRE_Int id_in_group = my_thread_num % out_group_size;
          HYPRE_Int num_threads_in_group =
             hypre_min(group_leader + out_group_size, num_threads) - group_leader;
 
-         HYPRE_Int in_group1_begin = hypre_min(i_per_thread*group_leader, len);
-         HYPRE_Int in_group1_end = hypre_min(in_group1_begin + i_per_thread*in_group_size, len);
+         HYPRE_Int in_group1_begin = hypre_min(i_per_thread * group_leader, len);
+         HYPRE_Int in_group1_end = hypre_min(in_group1_begin + i_per_thread * in_group_size, len);
 
-         HYPRE_Int in_group2_begin = hypre_min(in_group1_begin + i_per_thread*in_group_size, len);
-         HYPRE_Int in_group2_end = hypre_min(in_group2_begin + i_per_thread*in_group_size, len);
+         HYPRE_Int in_group2_begin = hypre_min(in_group1_begin + i_per_thread * in_group_size, len);
+         HYPRE_Int in_group2_end = hypre_min(in_group2_begin + i_per_thread * in_group_size, len);
 
          hypre_parallel_merge(
             in_buf + in_group1_begin, in_buf + in_group1_end,
@@ -637,6 +644,8 @@ void hypre_merge_sort( HYPRE_Int *in, HYPRE_Int *temp, HYPRE_Int len, HYPRE_Int
 #endif
 }
 
+#if defined(HYPRE_USING_HOPSCOTCH)
+
 /*--------------------------------------------------------------------------
  * hypre_sort_and_create_inverse_map
  *
@@ -646,8 +655,11 @@ void hypre_merge_sort( HYPRE_Int *in, HYPRE_Int *temp, HYPRE_Int len, HYPRE_Int
  *      inverse_map[i] = j iff (*out)[j] = i
  *--------------------------------------------------------------------------*/
 
-void hypre_sort_and_create_inverse_map(HYPRE_Int *in, HYPRE_Int len, HYPRE_Int **out,
-                                       hypre_UnorderedIntMap *inverse_map)
+void
+hypre_sort_and_create_inverse_map(HYPRE_Int              *in,
+                                  HYPRE_Int               len,
+                                  HYPRE_Int             **out,
+                                  hypre_UnorderedIntMap  *inverse_map)
 {
    if (len == 0)
    {
@@ -660,10 +672,10 @@ void hypre_sort_and_create_inverse_map(HYPRE_Int *in, HYPRE_Int len, HYPRE_Int *
 
    HYPRE_Int *temp = hypre_TAlloc(HYPRE_Int,  len, HYPRE_MEMORY_HOST);
    hypre_merge_sort(in, temp, len, out);
-   hypre_UnorderedIntMapCreate(inverse_map, 2*len, 16*hypre_NumThreads());
+   hypre_UnorderedIntMapCreate(inverse_map, 2 * len, 16 * hypre_NumThreads());
    HYPRE_Int i;
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-#pragma omp parallel for HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for HYPRE_SMP_SCHEDULE
 #endif
    for (i = 0; i < len; i++)
    {
@@ -679,16 +691,17 @@ void hypre_sort_and_create_inverse_map(HYPRE_Int *in, HYPRE_Int len, HYPRE_Int *
    }
 
 #ifdef DBG_MERGE_SORT
-  std::unordered_map<HYPRE_Int, HYPRE_Int> inverse_map2(len);
-  for (HYPRE_Int i = 0; i < len; ++i) {
-    inverse_map2[(*out)[i]] = i;
-    if (hypre_UnorderedIntMapGet(inverse_map, (*out)[i]) != i)
-    {
-      fprintf(stderr, "%d %d\n", i, (*out)[i]);
-      hypre_assert(false);
-    }
-  }
-  hypre_assert(hypre_UnorderedIntMapSize(inverse_map) == len);
+   std::unordered_map<HYPRE_Int, HYPRE_Int> inverse_map2(len);
+   for (HYPRE_Int i = 0; i < len; ++i)
+   {
+      inverse_map2[(*out)[i]] = i;
+      if (hypre_UnorderedIntMapGet(inverse_map, (*out)[i]) != i)
+      {
+         fprintf(stderr, "%d %d\n", i, (*out)[i]);
+         hypre_assert(false);
+      }
+   }
+   hypre_assert(hypre_UnorderedIntMapSize(inverse_map) == len);
 #endif
 
    if (*out == in)
@@ -705,6 +718,8 @@ void hypre_sort_and_create_inverse_map(HYPRE_Int *in, HYPRE_Int len, HYPRE_Int *
 #endif
 }
 
+#endif /* if defined(HYPRE_USING_HOPSCOTCH) */
+
 /*--------------------------------------------------------------------------
  * hypre_big_merge_sort
  *--------------------------------------------------------------------------*/
@@ -712,7 +727,7 @@ void hypre_sort_and_create_inverse_map(HYPRE_Int *in, HYPRE_Int len, HYPRE_Int *
 void hypre_big_merge_sort(HYPRE_BigInt *in, HYPRE_BigInt *temp, HYPRE_Int len,
                           HYPRE_BigInt **out)
 {
-   if (0 == len) return;
+   if (0 == len) { return; }
 
 #ifdef HYPRE_PROFILE
    hypre_profile_times[HYPRE_TIMER_ID_MERGE] -= hypre_MPI_Wtime();
@@ -728,15 +743,15 @@ void hypre_big_merge_sort(HYPRE_BigInt *in, HYPRE_BigInt *temp, HYPRE_Int len,
    // HYPRE_Int out_len = 0;
 
 #ifdef HYPRE_USING_OPENMP
-#pragma omp parallel
+   #pragma omp parallel
 #endif
    {
       HYPRE_Int num_threads = hypre_NumActiveThreads();
       HYPRE_Int my_thread_num = hypre_GetThreadNum();
 
       // thread-private sort
-      HYPRE_Int i_per_thread = (len + num_threads - 1)/num_threads;
-      HYPRE_Int i_begin = hypre_min(i_per_thread*my_thread_num, len);
+      HYPRE_Int i_per_thread = (len + num_threads - 1) / num_threads;
+      HYPRE_Int i_begin = hypre_min(i_per_thread * my_thread_num, len);
       HYPRE_Int i_end = hypre_min(i_begin + i_per_thread, len);
 
       hypre_BigQsort0(in, i_begin, i_end - 1);
@@ -748,22 +763,22 @@ void hypre_big_merge_sort(HYPRE_BigInt *in, HYPRE_BigInt *temp, HYPRE_Int len,
       for (in_group_size = 1; in_group_size < num_threads; in_group_size *= 2)
       {
 #ifdef HYPRE_USING_OPENMP
-#pragma omp barrier
+         #pragma omp barrier
 #endif
 
          // merge 2 in-groups into 1 out-group
-         HYPRE_Int out_group_size = in_group_size*2;
-         HYPRE_Int group_leader = my_thread_num/out_group_size*out_group_size;
+         HYPRE_Int out_group_size = in_group_size * 2;
+         HYPRE_Int group_leader = my_thread_num / out_group_size * out_group_size;
          // HYPRE_Int group_sub_leader = hypre_min(group_leader + in_group_size, num_threads - 1);
-         HYPRE_Int id_in_group = my_thread_num%out_group_size;
+         HYPRE_Int id_in_group = my_thread_num % out_group_size;
          HYPRE_Int num_threads_in_group =
             hypre_min(group_leader + out_group_size, num_threads) - group_leader;
 
-         HYPRE_Int in_group1_begin = hypre_min(i_per_thread*group_leader, len);
-         HYPRE_Int in_group1_end = hypre_min(in_group1_begin + i_per_thread*in_group_size, len);
+         HYPRE_Int in_group1_begin = hypre_min(i_per_thread * group_leader, len);
+         HYPRE_Int in_group1_end = hypre_min(in_group1_begin + i_per_thread * in_group_size, len);
 
-         HYPRE_Int in_group2_begin = hypre_min(in_group1_begin + i_per_thread*in_group_size, len);
-         HYPRE_Int in_group2_end = hypre_min(in_group2_begin + i_per_thread*in_group_size, len);
+         HYPRE_Int in_group2_begin = hypre_min(in_group1_begin + i_per_thread * in_group_size, len);
+         HYPRE_Int in_group2_end = hypre_min(in_group2_begin + i_per_thread * in_group_size, len);
 
          hypre_big_parallel_merge(
             in_buf + (HYPRE_BigInt)in_group1_begin, in_buf + (HYPRE_BigInt)in_group1_end,
@@ -795,8 +810,11 @@ void hypre_big_merge_sort(HYPRE_BigInt *in, HYPRE_BigInt *temp, HYPRE_Int len,
  * hypre_big_sort_and_create_inverse_map
  *--------------------------------------------------------------------------*/
 
-void hypre_big_sort_and_create_inverse_map(HYPRE_BigInt *in, HYPRE_Int len, HYPRE_BigInt **out,
-                                           hypre_UnorderedBigIntMap *inverse_map)
+void
+hypre_big_sort_and_create_inverse_map(HYPRE_BigInt              *in,
+                                      HYPRE_Int                  len,
+                                      HYPRE_BigInt             **out,
+                                      hypre_UnorderedBigIntMap  *inverse_map)
 {
    if (len == 0)
    {
@@ -809,10 +827,10 @@ void hypre_big_sort_and_create_inverse_map(HYPRE_BigInt *in, HYPRE_Int len, HYPR
 
    HYPRE_BigInt *temp = hypre_TAlloc(HYPRE_BigInt,  len, HYPRE_MEMORY_HOST);
    hypre_big_merge_sort(in, temp, len, out);
-   hypre_UnorderedBigIntMapCreate(inverse_map, 2*len, 16*hypre_NumThreads());
+   hypre_UnorderedBigIntMapCreate(inverse_map, 2 * len, 16 * hypre_NumThreads());
    HYPRE_Int i;
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
-#pragma omp parallel for HYPRE_SMP_SCHEDULE
+   #pragma omp parallel for HYPRE_SMP_SCHEDULE
 #endif
    for (i = 0; i < len; i++)
    {
@@ -828,16 +846,17 @@ void hypre_big_sort_and_create_inverse_map(HYPRE_BigInt *in, HYPRE_Int len, HYPR
    }
 
 #ifdef DBG_MERGE_SORT
-  std::unordered_map<HYPRE_Int, HYPRE_Int> inverse_map2(len);
-  for (HYPRE_Int i = 0; i < len; ++i) {
-    inverse_map2[(*out)[i]] = i;
-    if (hypre_UnorderedBigIntMapGet(inverse_map, (*out)[i]) != i)
-    {
-      fprintf(stderr, "%d %d\n", i, (*out)[i]);
-      hypre_assert(false);
-    }
-  }
-  hypre_assert(hypre_UnorderedBigIntMapSize(inverse_map) == len);
+   std::unordered_map<HYPRE_Int, HYPRE_Int> inverse_map2(len);
+   for (HYPRE_Int i = 0; i < len; ++i)
+   {
+      inverse_map2[(*out)[i]] = i;
+      if (hypre_UnorderedBigIntMapGet(inverse_map, (*out)[i]) != i)
+      {
+         fprintf(stderr, "%d %d\n", i, (*out)[i]);
+         hypre_assert(false);
+      }
+   }
+   hypre_assert(hypre_UnorderedBigIntMapSize(inverse_map) == len);
 #endif
 
    if (*out == in)
@@ -853,5 +872,3 @@ void hypre_big_sort_and_create_inverse_map(HYPRE_BigInt *in, HYPRE_Int len, HYPR
    hypre_profile_times[HYPRE_TIMER_ID_MERGE] += hypre_MPI_Wtime();
 #endif
 }
-
-/* vim: set tabstop=8 softtabstop=3 sw=3 expandtab: */
diff --git a/external/hypre/src/utilities/mmio.c b/external/hypre/src/utilities/mmio.c
new file mode 100644
index 00000000..811b3338
--- /dev/null
+++ b/external/hypre/src/utilities/mmio.c
@@ -0,0 +1,175 @@
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+/*
+*   Matrix Market I/O library for ANSI C
+*
+*   See http://math.nist.gov/MatrixMarket for details.
+*
+*
+*/
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include "_hypre_utilities.h"
+
+HYPRE_Int hypre_mm_is_valid(MM_typecode matcode)
+{
+   if (!hypre_mm_is_matrix(matcode)) { return 0; }
+   if (hypre_mm_is_dense(matcode) && hypre_mm_is_pattern(matcode)) { return 0; }
+   if (hypre_mm_is_real(matcode) && hypre_mm_is_hermitian(matcode)) { return 0; }
+   if (hypre_mm_is_pattern(matcode) && (hypre_mm_is_hermitian(matcode) || hypre_mm_is_skew(matcode))) { return 0; }
+   return 1;
+}
+
+HYPRE_Int hypre_mm_read_banner(FILE *f, MM_typecode *matcode)
+{
+   char line[MM_MAX_LINE_LENGTH];
+   char banner[MM_MAX_TOKEN_LENGTH];
+   char mtx[MM_MAX_TOKEN_LENGTH];
+   char crd[MM_MAX_TOKEN_LENGTH];
+   char data_type[MM_MAX_TOKEN_LENGTH];
+   char storage_scheme[MM_MAX_TOKEN_LENGTH];
+   char *p;
+
+   hypre_mm_clear_typecode(matcode);
+
+   if (fgets(line, MM_MAX_LINE_LENGTH, f) == NULL)
+   {
+      return MM_PREMATURE_EOF;
+   }
+
+   if (sscanf(line, "%s %s %s %s %s", banner, mtx, crd, data_type,
+              storage_scheme) != 5)
+   {
+      return MM_PREMATURE_EOF;
+   }
+
+   for (p = mtx; *p != '\0'; *p = tolower(*p), p++); /* convert to lower case */
+   for (p = crd; *p != '\0'; *p = tolower(*p), p++);
+   for (p = data_type; *p != '\0'; *p = tolower(*p), p++);
+   for (p = storage_scheme; *p != '\0'; *p = tolower(*p), p++);
+
+   /* check for banner */
+   if (strncmp(banner, MatrixMarketBanner, strlen(MatrixMarketBanner)) != 0)
+   {
+      return MM_NO_HEADER;
+   }
+
+   /* first field should be "mtx" */
+   if (strcmp(mtx, MM_MTX_STR) != 0)
+   {
+      return MM_UNSUPPORTED_TYPE;
+   }
+   hypre_mm_set_matrix(matcode);
+
+
+   /* second field describes whether this is a sparse matrix (in coordinate
+      storgae) or a dense array */
+
+
+   if (strcmp(crd, MM_SPARSE_STR) == 0)
+   {
+      hypre_mm_set_sparse(matcode);
+   }
+   else if (strcmp(crd, MM_DENSE_STR) == 0)
+   {
+      hypre_mm_set_dense(matcode);
+   }
+   else
+   {
+      return MM_UNSUPPORTED_TYPE;
+   }
+
+
+   /* third field */
+
+   if (strcmp(data_type, MM_REAL_STR) == 0)
+   {
+      hypre_mm_set_real(matcode);
+   }
+   else if (strcmp(data_type, MM_COMPLEX_STR) == 0)
+   {
+      hypre_mm_set_complex(matcode);
+   }
+   else if (strcmp(data_type, MM_PATTERN_STR) == 0)
+   {
+      hypre_mm_set_pattern(matcode);
+   }
+   else if (strcmp(data_type, MM_INT_STR) == 0)
+   {
+      hypre_mm_set_integer(matcode);
+   }
+   else
+   {
+      return MM_UNSUPPORTED_TYPE;
+   }
+
+
+   /* fourth field */
+
+   if (strcmp(storage_scheme, MM_GENERAL_STR) == 0)
+   {
+      hypre_mm_set_general(matcode);
+   }
+   else if (strcmp(storage_scheme, MM_SYMM_STR) == 0)
+   {
+      hypre_mm_set_symmetric(matcode);
+   }
+   else if (strcmp(storage_scheme, MM_HERM_STR) == 0)
+   {
+      hypre_mm_set_hermitian(matcode);
+   }
+   else if (strcmp(storage_scheme, MM_SKEW_STR) == 0)
+   {
+      hypre_mm_set_skew(matcode);
+   }
+   else
+   {
+      return MM_UNSUPPORTED_TYPE;
+   }
+
+   return 0;
+}
+
+HYPRE_Int hypre_mm_read_mtx_crd_size(FILE *f, HYPRE_Int *M, HYPRE_Int *N, HYPRE_Int *nz )
+{
+   char line[MM_MAX_LINE_LENGTH];
+   HYPRE_Int num_items_read;
+
+   /* set return null parameter values, in case we exit with errors */
+   *M = *N = *nz = 0;
+
+   /* now continue scanning until you reach the end-of-comments */
+   do
+   {
+      if (fgets(line, MM_MAX_LINE_LENGTH, f) == NULL)
+      {
+         return MM_PREMATURE_EOF;
+      }
+   }
+   while (line[0] == '%');
+
+   /* line[] is either blank or has M,N, nz */
+   if (hypre_sscanf(line, "%d %d %d", M, N, nz) == 3)
+   {
+      return 0;
+   }
+   else
+   {
+      do
+      {
+         num_items_read = hypre_fscanf(f, "%d %d %d", M, N, nz);
+         if (num_items_read == EOF) { return MM_PREMATURE_EOF; }
+      }
+      while (num_items_read != 3);
+   }
+
+   return 0;
+}
+
diff --git a/external/hypre/src/utilities/mmio.h b/external/hypre/src/utilities/mmio.h
new file mode 100644
index 00000000..2bb67a8a
--- /dev/null
+++ b/external/hypre/src/utilities/mmio.h
@@ -0,0 +1,120 @@
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+/*
+*   Matrix Market I/O library for ANSI C
+*
+*   See http://math.nist.gov/MatrixMarket for details.
+*
+*
+*/
+
+#ifndef MM_IO_H
+#define MM_IO_H
+
+#define MM_MAX_LINE_LENGTH 1025
+#define MatrixMarketBanner "%%MatrixMarket"
+#define MM_MAX_TOKEN_LENGTH 64
+
+typedef char MM_typecode[4];
+
+HYPRE_Int hypre_mm_is_valid(MM_typecode matcode); /* too complex for a macro */
+HYPRE_Int hypre_mm_read_banner(FILE *f, MM_typecode *matcode);
+HYPRE_Int hypre_mm_read_mtx_crd_size(FILE *f, HYPRE_Int *M, HYPRE_Int *N, HYPRE_Int *nz);
+
+/********************* MM_typecode query fucntions ***************************/
+
+#define hypre_mm_is_matrix(typecode)    ((typecode)[0]=='M')
+
+#define hypre_mm_is_sparse(typecode)    ((typecode)[1]=='C')
+#define hypre_mm_is_coordinate(typecode)((typecode)[1]=='C')
+#define hypre_mm_is_dense(typecode)   ((typecode)[1]=='A')
+#define hypre_mm_is_array(typecode)   ((typecode)[1]=='A')
+
+#define hypre_mm_is_complex(typecode) ((typecode)[2]=='C')
+#define hypre_mm_is_real(typecode)    ((typecode)[2]=='R')
+#define hypre_mm_is_pattern(typecode) ((typecode)[2]=='P')
+#define hypre_mm_is_integer(typecode) ((typecode)[2]=='I')
+
+#define hypre_mm_is_symmetric(typecode)((typecode)[3]=='S')
+#define hypre_mm_is_general(typecode) ((typecode)[3]=='G')
+#define hypre_mm_is_skew(typecode) ((typecode)[3]=='K')
+#define hypre_mm_is_hermitian(typecode)((typecode)[3]=='H')
+
+
+
+/********************* MM_typecode modify fucntions ***************************/
+
+#define hypre_mm_set_matrix(typecode) ((*typecode)[0]='M')
+#define hypre_mm_set_coordinate(typecode) ((*typecode)[1]='C')
+#define hypre_mm_set_array(typecode)  ((*typecode)[1]='A')
+#define hypre_mm_set_dense(typecode)  hypre_mm_set_array(typecode)
+#define hypre_mm_set_sparse(typecode) hypre_mm_set_coordinate(typecode)
+
+#define hypre_mm_set_complex(typecode)((*typecode)[2]='C')
+#define hypre_mm_set_real(typecode)   ((*typecode)[2]='R')
+#define hypre_mm_set_pattern(typecode)((*typecode)[2]='P')
+#define hypre_mm_set_integer(typecode)((*typecode)[2]='I')
+
+
+#define hypre_mm_set_symmetric(typecode)((*typecode)[3]='S')
+#define hypre_mm_set_general(typecode)  ((*typecode)[3]='G')
+#define hypre_mm_set_skew(typecode)     ((*typecode)[3]='K')
+#define hypre_mm_set_hermitian(typecode)((*typecode)[3]='H')
+
+#define hypre_mm_clear_typecode(typecode) ((*typecode)[0]=(*typecode)[1]= \
+      (*typecode)[2]=' ',(*typecode)[3]='G')
+
+#define hypre_mm_initialize_typecode(typecode) hypre_mm_clear_typecode(typecode)
+
+
+/********************* Matrix Market error codes ***************************/
+
+
+#define MM_COULD_NOT_READ_FILE  11
+#define MM_PREMATURE_EOF        12
+#define MM_NOT_MTX              13
+#define MM_NO_HEADER            14
+#define MM_UNSUPPORTED_TYPE     15
+#define MM_LINE_TOO_LONG        16
+#define MM_COULD_NOT_WRITE_FILE 17
+
+
+/******************** Matrix Market internal definitions ********************
+
+   MM_matrix_typecode: 4-character sequence
+
+   object sparse/data        storage
+   dense  type        scheme
+
+   string position: [0]        [1] [2]         [3]
+
+   Matrix typecode:  M(atrix)  C(oord) R(eal)   G(eneral)
+   A(array)    C(omplex)   H(ermitian)
+   P(attern)   S(ymmetric)
+   I(nteger)   K(kew)
+
+ ***********************************************************************/
+
+#define MM_MTX_STR        "matrix"
+#define MM_ARRAY_STR      "array"
+#define MM_DENSE_STR      "array"
+#define MM_COORDINATE_STR "coordinate"
+#define MM_SPARSE_STR     "coordinate"
+#define MM_COMPLEX_STR    "complex"
+#define MM_REAL_STR       "real"
+#define MM_INT_STR        "integer"
+#define MM_GENERAL_STR    "general"
+#define MM_SYMM_STR       "symmetric"
+#define MM_HERM_STR       "hermitian"
+#define MM_SKEW_STR       "skew-symmetric"
+#define MM_PATTERN_STR    "pattern"
+
+
+/*  high level routines */
+
+#endif
diff --git a/external/hypre/src/utilities/mpi_comm_f2c.c b/external/hypre/src/utilities/mpi_comm_f2c.c
index 96fcbc17..81534db4 100644
--- a/external/hypre/src/utilities/mpi_comm_f2c.c
+++ b/external/hypre/src/utilities/mpi_comm_f2c.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -17,11 +17,11 @@
 #if 0 /* This function is problematic and no longer needed anyway. */
 void
 hypre_F90_IFACE(hypre_mpi_comm_f2c, HYPRE_MPI_COMM_F2C)
-   (hypre_F90_Obj  *c_comm,
-    hypre_F90_Comm *f_comm,
-    hypre_F90_Int  *ierr)
+(hypre_F90_Obj  *c_comm,
+ hypre_F90_Comm *f_comm,
+ hypre_F90_Int  *ierr)
 {
-   *c_comm = (hypre_F90_Obj) hypre_MPI_Comm_f2c( (hypre_int) *f_comm );
+   *c_comm = (hypre_F90_Obj) hypre_MPI_Comm_f2c( (hypre_int) * f_comm );
    *ierr = 0;
 }
 #endif
diff --git a/external/hypre/src/utilities/mpistubs.c b/external/hypre/src/utilities/mpistubs.c
index 7e5db5d7..a33455c1 100644
--- a/external/hypre/src/utilities/mpistubs.c
+++ b/external/hypre/src/utilities/mpistubs.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -28,44 +28,51 @@ hypre_MPI_Comm_f2c( hypre_int comm )
  * MPI stubs to generate serial codes without mpi
  *****************************************************************************/
 
-#ifdef HYPRE_SEQUENTIAL
+#if defined(HYPRE_SEQUENTIAL)
 
 HYPRE_Int
 hypre_MPI_Init( hypre_int   *argc,
                 char      ***argv )
 {
-   return(0);
+   HYPRE_UNUSED_VAR(argc);
+   HYPRE_UNUSED_VAR(argv);
+
+   return (0);
 }
 
 HYPRE_Int
-hypre_MPI_Finalize( )
+hypre_MPI_Finalize( void )
 {
-   return(0);
+   return (0);
 }
 
 HYPRE_Int
 hypre_MPI_Abort( hypre_MPI_Comm comm,
                  HYPRE_Int      errorcode )
 {
-   return(0);
+   HYPRE_UNUSED_VAR(comm);
+   HYPRE_UNUSED_VAR(errorcode);
+
+   return (0);
 }
 
 HYPRE_Real
-hypre_MPI_Wtime( )
+hypre_MPI_Wtime( void )
 {
-   return(0.0);
+   return (0.0);
 }
 
 HYPRE_Real
-hypre_MPI_Wtick( )
+hypre_MPI_Wtick( void )
 {
-   return(0.0);
+   return (0.0);
 }
 
 HYPRE_Int
 hypre_MPI_Barrier( hypre_MPI_Comm comm )
 {
-   return(0);
+   HYPRE_UNUSED_VAR(comm);
+   return (0);
 }
 
 HYPRE_Int
@@ -73,35 +80,42 @@ hypre_MPI_Comm_create( hypre_MPI_Comm   comm,
                        hypre_MPI_Group  group,
                        hypre_MPI_Comm  *newcomm )
 {
-   return(0);
+   HYPRE_UNUSED_VAR(comm);
+   HYPRE_UNUSED_VAR(group);
+   *newcomm = hypre_MPI_COMM_NULL;
+   return (0);
 }
 
 HYPRE_Int
 hypre_MPI_Comm_dup( hypre_MPI_Comm  comm,
                     hypre_MPI_Comm *newcomm )
 {
-   return(0);
+   *newcomm = comm;
+   return (0);
 }
 
 HYPRE_Int
 hypre_MPI_Comm_size( hypre_MPI_Comm  comm,
                      HYPRE_Int      *size )
 {
+   HYPRE_UNUSED_VAR(comm);
    *size = 1;
-   return(0);
+   return (0);
 }
 
 HYPRE_Int
 hypre_MPI_Comm_rank( hypre_MPI_Comm  comm,
                      HYPRE_Int      *rank )
 {
+   HYPRE_UNUSED_VAR(comm);
    *rank = 0;
-   return(0);
+   return (0);
 }
 
 HYPRE_Int
 hypre_MPI_Comm_free( hypre_MPI_Comm *comm )
 {
+   HYPRE_UNUSED_VAR(comm);
    return 0;
 }
 
@@ -109,7 +123,9 @@ HYPRE_Int
 hypre_MPI_Comm_group( hypre_MPI_Comm   comm,
                       hypre_MPI_Group *group )
 {
-   return(0);
+   HYPRE_UNUSED_VAR(comm);
+   HYPRE_UNUSED_VAR(group);
+   return (0);
 }
 
 HYPRE_Int
@@ -118,7 +134,11 @@ hypre_MPI_Comm_split( hypre_MPI_Comm  comm,
                       HYPRE_Int       m,
                       hypre_MPI_Comm *comms )
 {
-   return(0);
+   HYPRE_UNUSED_VAR(comm);
+   HYPRE_UNUSED_VAR(n);
+   HYPRE_UNUSED_VAR(m);
+   HYPRE_UNUSED_VAR(comms);
+   return (0);
 }
 
 HYPRE_Int
@@ -127,12 +147,17 @@ hypre_MPI_Group_incl( hypre_MPI_Group  group,
                       HYPRE_Int       *ranks,
                       hypre_MPI_Group *newgroup )
 {
-   return(0);
+   HYPRE_UNUSED_VAR(group);
+   HYPRE_UNUSED_VAR(n);
+   HYPRE_UNUSED_VAR(ranks);
+   HYPRE_UNUSED_VAR(newgroup);
+   return (0);
 }
 
 HYPRE_Int
 hypre_MPI_Group_free( hypre_MPI_Group *group )
 {
+   HYPRE_UNUSED_VAR(group);
    return 0;
 }
 
@@ -140,7 +165,9 @@ HYPRE_Int
 hypre_MPI_Address( void           *location,
                    hypre_MPI_Aint *address )
 {
-   return(0);
+   HYPRE_UNUSED_VAR(location);
+   HYPRE_UNUSED_VAR(address);
+   return (0);
 }
 
 HYPRE_Int
@@ -148,7 +175,10 @@ hypre_MPI_Get_count( hypre_MPI_Status   *status,
                      hypre_MPI_Datatype  datatype,
                      HYPRE_Int          *count )
 {
-   return(0);
+   HYPRE_UNUSED_VAR(status);
+   HYPRE_UNUSED_VAR(datatype);
+   HYPRE_UNUSED_VAR(count);
+   return (0);
 }
 
 HYPRE_Int
@@ -160,7 +190,14 @@ hypre_MPI_Alltoall( void               *sendbuf,
                     hypre_MPI_Datatype  recvtype,
                     hypre_MPI_Comm      comm )
 {
-   return(0);
+   HYPRE_UNUSED_VAR(sendbuf);
+   HYPRE_UNUSED_VAR(sendcount);
+   HYPRE_UNUSED_VAR(sendtype);
+   HYPRE_UNUSED_VAR(recvbuf);
+   HYPRE_UNUSED_VAR(recvcount);
+   HYPRE_UNUSED_VAR(recvtype);
+   HYPRE_UNUSED_VAR(comm);
+   return (0);
 }
 
 HYPRE_Int
@@ -174,6 +211,9 @@ hypre_MPI_Allgather( void               *sendbuf,
 {
    HYPRE_Int i;
 
+   HYPRE_UNUSED_VAR(comm);
+   HYPRE_UNUSED_VAR(recvcount);
+   HYPRE_UNUSED_VAR(recvtype);
    switch (sendtype)
    {
       case hypre_MPI_INT:
@@ -182,7 +222,29 @@ hypre_MPI_Allgather( void               *sendbuf,
          HYPRE_Int *csendbuf = (HYPRE_Int *)sendbuf;
          for (i = 0; i < sendcount; i++)
          {
-	    crecvbuf[i] = csendbuf[i];
+            crecvbuf[i] = csendbuf[i];
+         }
+      }
+      break;
+
+      case hypre_MPI_LONG_LONG_INT:
+      {
+         HYPRE_BigInt *crecvbuf = (HYPRE_BigInt *)recvbuf;
+         HYPRE_BigInt *csendbuf = (HYPRE_BigInt *)sendbuf;
+         for (i = 0; i < sendcount; i++)
+         {
+            crecvbuf[i] = csendbuf[i];
+         }
+      }
+      break;
+
+      case hypre_MPI_FLOAT:
+      {
+         float *crecvbuf = (float *)recvbuf;
+         float *csendbuf = (float *)sendbuf;
+         for (i = 0; i < sendcount; i++)
+         {
+            crecvbuf[i] = csendbuf[i];
          }
       }
       break;
@@ -193,7 +255,18 @@ hypre_MPI_Allgather( void               *sendbuf,
          double *csendbuf = (double *)sendbuf;
          for (i = 0; i < sendcount; i++)
          {
-	    crecvbuf[i] = csendbuf[i];
+            crecvbuf[i] = csendbuf[i];
+         }
+      }
+      break;
+
+      case hypre_MPI_LONG_DOUBLE:
+      {
+         long double *crecvbuf = (long double *)recvbuf;
+         long double *csendbuf = (long double *)sendbuf;
+         for (i = 0; i < sendcount; i++)
+         {
+            crecvbuf[i] = csendbuf[i];
          }
       }
       break;
@@ -204,14 +277,25 @@ hypre_MPI_Allgather( void               *sendbuf,
          char *csendbuf = (char *)sendbuf;
          for (i = 0; i < sendcount; i++)
          {
-	    crecvbuf[i] = csendbuf[i];
+            crecvbuf[i] = csendbuf[i];
+         }
+      }
+      break;
+
+      case hypre_MPI_LONG:
+      {
+         hypre_longint *crecvbuf = (hypre_longint *)recvbuf;
+         hypre_longint *csendbuf = (hypre_longint *)sendbuf;
+         for (i = 0; i < sendcount; i++)
+         {
+            crecvbuf[i] = csendbuf[i];
          }
       }
       break;
 
       case hypre_MPI_BYTE:
       {
-         hypre_Memcpy(recvbuf,  sendbuf,  sendcount, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
+         hypre_TMemcpy(recvbuf, sendbuf, char, sendcount, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
       }
       break;
 
@@ -221,7 +305,7 @@ hypre_MPI_Allgather( void               *sendbuf,
          HYPRE_Real *csendbuf = (HYPRE_Real *)sendbuf;
          for (i = 0; i < sendcount; i++)
          {
-	    crecvbuf[i] = csendbuf[i];
+            crecvbuf[i] = csendbuf[i];
          }
       }
       break;
@@ -232,13 +316,13 @@ hypre_MPI_Allgather( void               *sendbuf,
          HYPRE_Complex *csendbuf = (HYPRE_Complex *)sendbuf;
          for (i = 0; i < sendcount; i++)
          {
-	    crecvbuf[i] = csendbuf[i];
+            crecvbuf[i] = csendbuf[i];
          }
       }
       break;
    }
 
-   return(0);
+   return (0);
 }
 
 HYPRE_Int
@@ -251,6 +335,7 @@ hypre_MPI_Allgatherv( void               *sendbuf,
                       hypre_MPI_Datatype  recvtype,
                       hypre_MPI_Comm      comm )
 {
+   HYPRE_UNUSED_VAR(displs);
    return ( hypre_MPI_Allgather(sendbuf, sendcount, sendtype,
                                 recvbuf, *recvcounts, recvtype, comm) );
 }
@@ -265,21 +350,24 @@ hypre_MPI_Gather( void               *sendbuf,
                   HYPRE_Int           root,
                   hypre_MPI_Comm      comm )
 {
+   HYPRE_UNUSED_VAR(root);
    return ( hypre_MPI_Allgather(sendbuf, sendcount, sendtype,
                                 recvbuf, recvcount, recvtype, comm) );
 }
 
 HYPRE_Int
 hypre_MPI_Gatherv( void              *sendbuf,
-                  HYPRE_Int           sendcount,
-                  hypre_MPI_Datatype  sendtype,
-                  void               *recvbuf,
-                  HYPRE_Int          *recvcounts,
-                  HYPRE_Int          *displs,
-                  hypre_MPI_Datatype  recvtype,
-                  HYPRE_Int           root,
-                  hypre_MPI_Comm      comm )
+                   HYPRE_Int           sendcount,
+                   hypre_MPI_Datatype  sendtype,
+                   void               *recvbuf,
+                   HYPRE_Int          *recvcounts,
+                   HYPRE_Int          *displs,
+                   hypre_MPI_Datatype  recvtype,
+                   HYPRE_Int           root,
+                   hypre_MPI_Comm      comm )
 {
+   HYPRE_UNUSED_VAR(displs);
+   HYPRE_UNUSED_VAR(root);
    return ( hypre_MPI_Allgather(sendbuf, sendcount, sendtype,
                                 recvbuf, *recvcounts, recvtype, comm) );
 }
@@ -294,21 +382,24 @@ hypre_MPI_Scatter( void               *sendbuf,
                    HYPRE_Int           root,
                    hypre_MPI_Comm      comm )
 {
+   HYPRE_UNUSED_VAR(root);
    return ( hypre_MPI_Allgather(sendbuf, sendcount, sendtype,
                                 recvbuf, recvcount, recvtype, comm) );
 }
 
 HYPRE_Int
 hypre_MPI_Scatterv( void               *sendbuf,
-                   HYPRE_Int           *sendcounts,
-                   HYPRE_Int           *displs,
-                   hypre_MPI_Datatype   sendtype,
-                   void                *recvbuf,
-                   HYPRE_Int            recvcount,
-                   hypre_MPI_Datatype   recvtype,
-                   HYPRE_Int            root,
-                   hypre_MPI_Comm       comm )
-{
+                    HYPRE_Int           *sendcounts,
+                    HYPRE_Int           *displs,
+                    hypre_MPI_Datatype   sendtype,
+                    void                *recvbuf,
+                    HYPRE_Int            recvcount,
+                    hypre_MPI_Datatype   recvtype,
+                    HYPRE_Int            root,
+                    hypre_MPI_Comm       comm )
+{
+   HYPRE_UNUSED_VAR(displs);
+   HYPRE_UNUSED_VAR(root);
    return ( hypre_MPI_Allgather(sendbuf, *sendcounts, sendtype,
                                 recvbuf, recvcount, recvtype, comm) );
 }
@@ -320,7 +411,12 @@ hypre_MPI_Bcast( void               *buffer,
                  HYPRE_Int           root,
                  hypre_MPI_Comm      comm )
 {
-   return(0);
+   HYPRE_UNUSED_VAR(buffer);
+   HYPRE_UNUSED_VAR(count);
+   HYPRE_UNUSED_VAR(datatype);
+   HYPRE_UNUSED_VAR(root);
+   HYPRE_UNUSED_VAR(comm);
+   return (0);
 }
 
 HYPRE_Int
@@ -331,7 +427,13 @@ hypre_MPI_Send( void               *buf,
                 HYPRE_Int           tag,
                 hypre_MPI_Comm      comm )
 {
-   return(0);
+   HYPRE_UNUSED_VAR(buf);
+   HYPRE_UNUSED_VAR(count);
+   HYPRE_UNUSED_VAR(datatype);
+   HYPRE_UNUSED_VAR(dest);
+   HYPRE_UNUSED_VAR(tag);
+   HYPRE_UNUSED_VAR(comm);
+   return (0);
 }
 
 HYPRE_Int
@@ -343,7 +445,14 @@ hypre_MPI_Recv( void               *buf,
                 hypre_MPI_Comm      comm,
                 hypre_MPI_Status   *status )
 {
-   return(0);
+   HYPRE_UNUSED_VAR(buf);
+   HYPRE_UNUSED_VAR(count);
+   HYPRE_UNUSED_VAR(datatype);
+   HYPRE_UNUSED_VAR(source);
+   HYPRE_UNUSED_VAR(tag);
+   HYPRE_UNUSED_VAR(comm);
+   HYPRE_UNUSED_VAR(status);
+   return (0);
 }
 
 HYPRE_Int
@@ -355,7 +464,14 @@ hypre_MPI_Isend( void               *buf,
                  hypre_MPI_Comm      comm,
                  hypre_MPI_Request  *request )
 {
-   return(0);
+   HYPRE_UNUSED_VAR(buf);
+   HYPRE_UNUSED_VAR(count);
+   HYPRE_UNUSED_VAR(datatype);
+   HYPRE_UNUSED_VAR(dest);
+   HYPRE_UNUSED_VAR(tag);
+   HYPRE_UNUSED_VAR(comm);
+   HYPRE_UNUSED_VAR(request);
+   return (0);
 }
 
 HYPRE_Int
@@ -367,7 +483,14 @@ hypre_MPI_Irecv( void               *buf,
                  hypre_MPI_Comm      comm,
                  hypre_MPI_Request  *request )
 {
-   return(0);
+   HYPRE_UNUSED_VAR(buf);
+   HYPRE_UNUSED_VAR(count);
+   HYPRE_UNUSED_VAR(datatype);
+   HYPRE_UNUSED_VAR(source);
+   HYPRE_UNUSED_VAR(tag);
+   HYPRE_UNUSED_VAR(comm);
+   HYPRE_UNUSED_VAR(request);
+   return (0);
 }
 
 HYPRE_Int
@@ -379,6 +502,13 @@ hypre_MPI_Send_init( void               *buf,
                      hypre_MPI_Comm      comm,
                      hypre_MPI_Request  *request )
 {
+   HYPRE_UNUSED_VAR(buf);
+   HYPRE_UNUSED_VAR(count);
+   HYPRE_UNUSED_VAR(datatype);
+   HYPRE_UNUSED_VAR(dest);
+   HYPRE_UNUSED_VAR(tag);
+   HYPRE_UNUSED_VAR(comm);
+   HYPRE_UNUSED_VAR(request);
    return 0;
 }
 
@@ -391,6 +521,13 @@ hypre_MPI_Recv_init( void               *buf,
                      hypre_MPI_Comm      comm,
                      hypre_MPI_Request  *request )
 {
+   HYPRE_UNUSED_VAR(buf);
+   HYPRE_UNUSED_VAR(count);
+   HYPRE_UNUSED_VAR(datatype);
+   HYPRE_UNUSED_VAR(dest);
+   HYPRE_UNUSED_VAR(tag);
+   HYPRE_UNUSED_VAR(comm);
+   HYPRE_UNUSED_VAR(request);
    return 0;
 }
 
@@ -403,6 +540,13 @@ hypre_MPI_Irsend( void               *buf,
                   hypre_MPI_Comm      comm,
                   hypre_MPI_Request  *request )
 {
+   HYPRE_UNUSED_VAR(buf);
+   HYPRE_UNUSED_VAR(count);
+   HYPRE_UNUSED_VAR(datatype);
+   HYPRE_UNUSED_VAR(dest);
+   HYPRE_UNUSED_VAR(tag);
+   HYPRE_UNUSED_VAR(comm);
+   HYPRE_UNUSED_VAR(request);
    return 0;
 }
 
@@ -410,6 +554,8 @@ HYPRE_Int
 hypre_MPI_Startall( HYPRE_Int          count,
                     hypre_MPI_Request *array_of_requests )
 {
+   HYPRE_UNUSED_VAR(count);
+   HYPRE_UNUSED_VAR(array_of_requests);
    return 0;
 }
 
@@ -419,6 +565,10 @@ hypre_MPI_Probe( HYPRE_Int         source,
                  hypre_MPI_Comm    comm,
                  hypre_MPI_Status *status )
 {
+   HYPRE_UNUSED_VAR(source);
+   HYPRE_UNUSED_VAR(tag);
+   HYPRE_UNUSED_VAR(comm);
+   HYPRE_UNUSED_VAR(status);
    return 0;
 }
 
@@ -429,6 +579,11 @@ hypre_MPI_Iprobe( HYPRE_Int         source,
                   HYPRE_Int        *flag,
                   hypre_MPI_Status *status )
 {
+   HYPRE_UNUSED_VAR(source);
+   HYPRE_UNUSED_VAR(tag);
+   HYPRE_UNUSED_VAR(comm);
+   HYPRE_UNUSED_VAR(flag);
+   HYPRE_UNUSED_VAR(status);
    return 0;
 }
 
@@ -437,8 +592,10 @@ hypre_MPI_Test( hypre_MPI_Request *request,
                 HYPRE_Int         *flag,
                 hypre_MPI_Status  *status )
 {
+   HYPRE_UNUSED_VAR(request);
+   HYPRE_UNUSED_VAR(status);
    *flag = 1;
-   return(0);
+   return (0);
 }
 
 HYPRE_Int
@@ -447,15 +604,21 @@ hypre_MPI_Testall( HYPRE_Int          count,
                    HYPRE_Int         *flag,
                    hypre_MPI_Status  *array_of_statuses )
 {
+   HYPRE_UNUSED_VAR(count);
+   HYPRE_UNUSED_VAR(array_of_requests);
+   HYPRE_UNUSED_VAR(flag);
+   HYPRE_UNUSED_VAR(array_of_statuses);
    *flag = 1;
-   return(0);
+   return (0);
 }
 
 HYPRE_Int
 hypre_MPI_Wait( hypre_MPI_Request *request,
                 hypre_MPI_Status  *status )
 {
-   return(0);
+   HYPRE_UNUSED_VAR(request);
+   HYPRE_UNUSED_VAR(status);
+   return (0);
 }
 
 HYPRE_Int
@@ -463,7 +626,10 @@ hypre_MPI_Waitall( HYPRE_Int          count,
                    hypre_MPI_Request *array_of_requests,
                    hypre_MPI_Status  *array_of_statuses )
 {
-   return(0);
+   HYPRE_UNUSED_VAR(count);
+   HYPRE_UNUSED_VAR(array_of_requests);
+   HYPRE_UNUSED_VAR(array_of_statuses);
+   return (0);
 }
 
 HYPRE_Int
@@ -472,7 +638,11 @@ hypre_MPI_Waitany( HYPRE_Int          count,
                    HYPRE_Int         *index,
                    hypre_MPI_Status  *status )
 {
-   return(0);
+   HYPRE_UNUSED_VAR(count);
+   HYPRE_UNUSED_VAR(array_of_requests);
+   HYPRE_UNUSED_VAR(index);
+   HYPRE_UNUSED_VAR(status);
+   return (0);
 }
 
 HYPRE_Int
@@ -485,6 +655,8 @@ hypre_MPI_Allreduce( void              *sendbuf,
 {
    HYPRE_Int i;
 
+   HYPRE_UNUSED_VAR(op);
+   HYPRE_UNUSED_VAR(comm);
    switch (datatype)
    {
       case hypre_MPI_INT:
@@ -495,7 +667,28 @@ hypre_MPI_Allreduce( void              *sendbuf,
          {
             crecvbuf[i] = csendbuf[i];
          }
+      }
+      break;
 
+      case hypre_MPI_LONG_LONG_INT:
+      {
+         HYPRE_BigInt *crecvbuf = (HYPRE_BigInt *)recvbuf;
+         HYPRE_BigInt *csendbuf = (HYPRE_BigInt *)sendbuf;
+         for (i = 0; i < count; i++)
+         {
+            crecvbuf[i] = csendbuf[i];
+         }
+      }
+      break;
+
+      case hypre_MPI_FLOAT:
+      {
+         float *crecvbuf = (float *)recvbuf;
+         float *csendbuf = (float *)sendbuf;
+         for (i = 0; i < count; i++)
+         {
+            crecvbuf[i] = csendbuf[i];
+         }
       }
       break;
 
@@ -510,6 +703,17 @@ hypre_MPI_Allreduce( void              *sendbuf,
       }
       break;
 
+      case hypre_MPI_LONG_DOUBLE:
+      {
+         long double *crecvbuf = (long double *)recvbuf;
+         long double *csendbuf = (long double *)sendbuf;
+         for (i = 0; i < count; i++)
+         {
+            crecvbuf[i] = csendbuf[i];
+         }
+      }
+      break;
+
       case hypre_MPI_CHAR:
       {
          char *crecvbuf = (char *)recvbuf;
@@ -521,9 +725,20 @@ hypre_MPI_Allreduce( void              *sendbuf,
       }
       break;
 
+      case hypre_MPI_LONG:
+      {
+         hypre_longint *crecvbuf = (hypre_longint *)recvbuf;
+         hypre_longint *csendbuf = (hypre_longint *)sendbuf;
+         for (i = 0; i < count; i++)
+         {
+            crecvbuf[i] = csendbuf[i];
+         }
+      }
+      break;
+
       case hypre_MPI_BYTE:
       {
-         hypre_Memcpy(recvbuf,  sendbuf,  count, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
+         hypre_TMemcpy(recvbuf, sendbuf, char, count, HYPRE_MEMORY_HOST, HYPRE_MEMORY_HOST);
       }
       break;
 
@@ -562,6 +777,7 @@ hypre_MPI_Reduce( void               *sendbuf,
                   HYPRE_Int           root,
                   hypre_MPI_Comm      comm )
 {
+   HYPRE_UNUSED_VAR(root);
    hypre_MPI_Allreduce(sendbuf, recvbuf, count, datatype, op, comm);
    return 0;
 }
@@ -581,6 +797,7 @@ hypre_MPI_Scan( void               *sendbuf,
 HYPRE_Int
 hypre_MPI_Request_free( hypre_MPI_Request *request )
 {
+   HYPRE_UNUSED_VAR(request);
    return 0;
 }
 
@@ -589,7 +806,10 @@ hypre_MPI_Type_contiguous( HYPRE_Int           count,
                            hypre_MPI_Datatype  oldtype,
                            hypre_MPI_Datatype *newtype )
 {
-   return(0);
+   HYPRE_UNUSED_VAR(count);
+   HYPRE_UNUSED_VAR(oldtype);
+   HYPRE_UNUSED_VAR(newtype);
+   return (0);
 }
 
 HYPRE_Int
@@ -599,7 +819,12 @@ hypre_MPI_Type_vector( HYPRE_Int           count,
                        hypre_MPI_Datatype  oldtype,
                        hypre_MPI_Datatype *newtype )
 {
-   return(0);
+   HYPRE_UNUSED_VAR(count);
+   HYPRE_UNUSED_VAR(blocklength);
+   HYPRE_UNUSED_VAR(stride);
+   HYPRE_UNUSED_VAR(oldtype);
+   HYPRE_UNUSED_VAR(newtype);
+   return (0);
 }
 
 HYPRE_Int
@@ -609,7 +834,12 @@ hypre_MPI_Type_hvector( HYPRE_Int           count,
                         hypre_MPI_Datatype  oldtype,
                         hypre_MPI_Datatype *newtype )
 {
-   return(0);
+   HYPRE_UNUSED_VAR(count);
+   HYPRE_UNUSED_VAR(blocklength);
+   HYPRE_UNUSED_VAR(stride);
+   HYPRE_UNUSED_VAR(oldtype);
+   HYPRE_UNUSED_VAR(newtype);
+   return (0);
 }
 
 HYPRE_Int
@@ -619,46 +849,65 @@ hypre_MPI_Type_struct( HYPRE_Int           count,
                        hypre_MPI_Datatype *array_of_types,
                        hypre_MPI_Datatype *newtype )
 {
-   return(0);
+   HYPRE_UNUSED_VAR(count);
+   HYPRE_UNUSED_VAR(array_of_blocklengths);
+   HYPRE_UNUSED_VAR(array_of_displacements);
+   HYPRE_UNUSED_VAR(array_of_types);
+   HYPRE_UNUSED_VAR(newtype);
+   return (0);
 }
 
 HYPRE_Int
 hypre_MPI_Type_commit( hypre_MPI_Datatype *datatype )
 {
-   return(0);
+   HYPRE_UNUSED_VAR(datatype);
+   return (0);
 }
 
 HYPRE_Int
 hypre_MPI_Type_free( hypre_MPI_Datatype *datatype )
 {
-   return(0);
+   HYPRE_UNUSED_VAR(datatype);
+   return (0);
 }
 
 HYPRE_Int
 hypre_MPI_Op_create( hypre_MPI_User_function *function, hypre_int commute, hypre_MPI_Op *op )
 {
-   return(0);
+   HYPRE_UNUSED_VAR(function);
+   HYPRE_UNUSED_VAR(commute);
+   HYPRE_UNUSED_VAR(op);
+   return (0);
 }
 
 HYPRE_Int
 hypre_MPI_Op_free( hypre_MPI_Op *op )
 {
-   return(0);
+   HYPRE_UNUSED_VAR(op);
+   return (0);
 }
 
 #if defined(HYPRE_USING_GPU)
-HYPRE_Int hypre_MPI_Comm_split_type( hypre_MPI_Comm comm, HYPRE_Int split_type, HYPRE_Int key, hypre_MPI_Info info, hypre_MPI_Comm *newcomm )
-{
+HYPRE_Int hypre_MPI_Comm_split_type( hypre_MPI_Comm comm, HYPRE_Int split_type, HYPRE_Int key,
+                                     hypre_MPI_Info info, hypre_MPI_Comm *newcomm )
+{
+   HYPRE_UNUSED_VAR(comm);
+   HYPRE_UNUSED_VAR(split_type);
+   HYPRE_UNUSED_VAR(key);
+   HYPRE_UNUSED_VAR(info);
+   HYPRE_UNUSED_VAR(newcomm);
    return (0);
 }
 
 HYPRE_Int hypre_MPI_Info_create( hypre_MPI_Info *info )
 {
+   HYPRE_UNUSED_VAR(info);
    return (0);
 }
 
 HYPRE_Int hypre_MPI_Info_free( hypre_MPI_Info *info )
 {
+   HYPRE_UNUSED_VAR(info);
    return (0);
 }
 #endif
@@ -677,7 +926,7 @@ hypre_MPI_Init( hypre_int   *argc,
 }
 
 HYPRE_Int
-hypre_MPI_Finalize( )
+hypre_MPI_Finalize( void )
 {
    return (HYPRE_Int) MPI_Finalize();
 }
@@ -690,15 +939,15 @@ hypre_MPI_Abort( hypre_MPI_Comm comm,
 }
 
 HYPRE_Real
-hypre_MPI_Wtime( )
+hypre_MPI_Wtime( void )
 {
-   return MPI_Wtime();
+   return (HYPRE_Real)MPI_Wtime();
 }
 
 HYPRE_Real
-hypre_MPI_Wtick( )
+hypre_MPI_Wtick( void )
 {
-   return MPI_Wtick();
+   return (HYPRE_Real)MPI_Wtick();
 }
 
 HYPRE_Int
@@ -918,8 +1167,8 @@ hypre_MPI_Gatherv(void               *sendbuf,
       }
    }
    ierr = (HYPRE_Int) MPI_Gatherv(sendbuf, (hypre_int)sendcount, sendtype,
-                                     recvbuf, mpi_recvcounts, mpi_displs,
-                                     recvtype, (hypre_int) root, comm);
+                                  recvbuf, mpi_recvcounts, mpi_displs,
+                                  recvtype, (hypre_int) root, comm);
    hypre_TFree(mpi_recvcounts, HYPRE_MEMORY_HOST);
    hypre_TFree(mpi_displs, HYPRE_MEMORY_HOST);
 
@@ -971,8 +1220,8 @@ hypre_MPI_Scatterv(void               *sendbuf,
       }
    }
    ierr = (HYPRE_Int) MPI_Scatterv(sendbuf, mpi_sendcounts, mpi_displs, sendtype,
-                                     recvbuf, (hypre_int) recvcount,
-                                     recvtype, (hypre_int) root, comm);
+                                   recvbuf, (hypre_int) recvcount,
+                                   recvtype, (hypre_int) root, comm);
    hypre_TFree(mpi_sendcounts, HYPRE_MEMORY_HOST);
    hypre_TFree(mpi_displs, HYPRE_MEMORY_HOST);
 
@@ -1177,8 +1426,14 @@ hypre_MPI_Allreduce( void              *sendbuf,
                      hypre_MPI_Op       op,
                      hypre_MPI_Comm     comm )
 {
-   return (HYPRE_Int) MPI_Allreduce(sendbuf, recvbuf, (hypre_int)count,
+   hypre_GpuProfilingPushRange("MPI_Allreduce");
+
+   HYPRE_Int result = MPI_Allreduce(sendbuf, recvbuf, (hypre_int)count,
                                     datatype, op, comm);
+
+   hypre_GpuProfilingPopRange();
+
+   return result;
 }
 
 HYPRE_Int
@@ -1239,8 +1494,8 @@ hypre_MPI_Type_hvector( HYPRE_Int           count,
                         hypre_MPI_Datatype *newtype )
 {
 #if MPI_VERSION > 1
-      return (HYPRE_Int) MPI_Type_create_hvector((hypre_int)count, (hypre_int)blocklength,
-                                                 stride, oldtype, newtype);
+   return (HYPRE_Int) MPI_Type_create_hvector((hypre_int)count, (hypre_int)blocklength,
+                                              stride, oldtype, newtype);
 #else
    return (HYPRE_Int) MPI_Type_hvector((hypre_int)count, (hypre_int)blocklength,
                                        stride, oldtype, newtype);
@@ -1265,13 +1520,13 @@ hypre_MPI_Type_struct( HYPRE_Int           count,
    }
 
 #if MPI_VERSION > 1
-      ierr = (HYPRE_Int) MPI_Type_create_struct((hypre_int)count, mpi_array_of_blocklengths,
-                                                array_of_displacements, array_of_types,
-                                                newtype);
+   ierr = (HYPRE_Int) MPI_Type_create_struct((hypre_int)count, mpi_array_of_blocklengths,
+                                             array_of_displacements, array_of_types,
+                                             newtype);
 #else
-      ierr = (HYPRE_Int) MPI_Type_struct((hypre_int)count, mpi_array_of_blocklengths,
-                                         array_of_displacements, array_of_types,
-                                         newtype);
+   ierr = (HYPRE_Int) MPI_Type_struct((hypre_int)count, mpi_array_of_blocklengths,
+                                      array_of_displacements, array_of_types,
+                                      newtype);
 #endif
 
    hypre_TFree(mpi_array_of_blocklengths, HYPRE_MEMORY_HOST);
@@ -1303,9 +1558,10 @@ hypre_MPI_Op_create( hypre_MPI_User_function *function, hypre_int commute, hypre
    return (HYPRE_Int) MPI_Op_create(function, commute, op);
 }
 
-#if defined(HYPRE_USING_GPU)
+#if defined(HYPRE_USING_GPU) || defined(HYPRE_USING_DEVICE_OPENMP)
 HYPRE_Int
-hypre_MPI_Comm_split_type( hypre_MPI_Comm comm, HYPRE_Int split_type, HYPRE_Int key, hypre_MPI_Info info, hypre_MPI_Comm *newcomm )
+hypre_MPI_Comm_split_type( hypre_MPI_Comm comm, HYPRE_Int split_type, HYPRE_Int key,
+                           hypre_MPI_Info info, hypre_MPI_Comm *newcomm )
 {
    return (HYPRE_Int) MPI_Comm_split_type(comm, split_type, key, info, newcomm );
 }
diff --git a/external/hypre/src/utilities/mpistubs.h b/external/hypre/src/utilities/mpistubs.h
index cedbe2ba..50cf780e 100644
--- a/external/hypre/src/utilities/mpistubs.h
+++ b/external/hypre/src/utilities/mpistubs.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -45,16 +45,19 @@ extern "C" {
 #define MPI_COMM_SELF        hypre_MPI_COMM_SELF
 #define MPI_COMM_TYPE_SHARED hypre_MPI_COMM_TYPE_SHARED
 
-#define MPI_BOTTOM  	    hypre_MPI_BOTTOM
+#define MPI_BOTTOM          hypre_MPI_BOTTOM
 
 #define MPI_FLOAT           hypre_MPI_FLOAT
 #define MPI_DOUBLE          hypre_MPI_DOUBLE
 #define MPI_LONG_DOUBLE     hypre_MPI_LONG_DOUBLE
 #define MPI_INT             hypre_MPI_INT
-#define MPI_LONG_LONG_INT   hypre_MPI_INT
+#define MPI_LONG_LONG_INT   hypre_MPI_LONG_LONG_INT
 #define MPI_CHAR            hypre_MPI_CHAR
 #define MPI_LONG            hypre_MPI_LONG
 #define MPI_BYTE            hypre_MPI_BYTE
+
+#define MPI_C_FLOAT_COMPLEX hypre_MPI_COMPLEX
+#define MPI_C_LONG_DOUBLE_COMPLEX hypre_MPI_COMPLEX
 #define MPI_C_DOUBLE_COMPLEX hypre_MPI_COMPLEX
 
 #define MPI_SUM             hypre_MPI_SUM
@@ -62,6 +65,7 @@ extern "C" {
 #define MPI_MAX             hypre_MPI_MAX
 #define MPI_LOR             hypre_MPI_LOR
 #define MPI_LAND            hypre_MPI_LAND
+#define MPI_BOR             hypre_MPI_BOR
 #define MPI_SUCCESS         hypre_MPI_SUCCESS
 #define MPI_STATUSES_IGNORE hypre_MPI_STATUSES_IGNORE
 
@@ -139,7 +143,7 @@ typedef HYPRE_Int hypre_MPI_Comm;
 typedef HYPRE_Int hypre_MPI_Group;
 typedef HYPRE_Int hypre_MPI_Request;
 typedef HYPRE_Int hypre_MPI_Datatype;
-typedef void (hypre_MPI_User_function) ();
+typedef void (hypre_MPI_User_function) (void);
 
 typedef struct
 {
@@ -168,12 +172,14 @@ typedef HYPRE_Int  hypre_MPI_Info;
 #define  hypre_MPI_BYTE 6
 #define  hypre_MPI_REAL 7
 #define  hypre_MPI_COMPLEX 8
+#define  hypre_MPI_LONG_LONG_INT 9
 
 #define  hypre_MPI_SUM 0
 #define  hypre_MPI_MIN 1
 #define  hypre_MPI_MAX 2
 #define  hypre_MPI_LOR 3
 #define  hypre_MPI_LAND 4
+#define  hypre_MPI_BOR 5
 #define  hypre_MPI_SUCCESS 0
 #define  hypre_MPI_STATUSES_IGNORE 0
 
@@ -222,6 +228,7 @@ typedef MPI_User_function    hypre_MPI_User_function;
 #define  hypre_MPI_MIN MPI_MIN
 #define  hypre_MPI_MAX MPI_MAX
 #define  hypre_MPI_LOR MPI_LOR
+#define  hypre_MPI_BOR MPI_BOR
 #define  hypre_MPI_SUCCESS MPI_SUCCESS
 #define  hypre_MPI_STATUSES_IGNORE MPI_STATUSES_IGNORE
 
@@ -245,61 +252,100 @@ typedef MPI_User_function    hypre_MPI_User_function;
  *--------------------------------------------------------------------------*/
 
 /* mpistubs.c */
-HYPRE_Int hypre_MPI_Init( hypre_int *argc , char ***argv );
+HYPRE_Int hypre_MPI_Init( hypre_int *argc, char ***argv );
 HYPRE_Int hypre_MPI_Finalize( void );
-HYPRE_Int hypre_MPI_Abort( hypre_MPI_Comm comm , HYPRE_Int errorcode );
+HYPRE_Int hypre_MPI_Abort( hypre_MPI_Comm comm, HYPRE_Int errorcode );
 HYPRE_Real hypre_MPI_Wtime( void );
 HYPRE_Real hypre_MPI_Wtick( void );
 HYPRE_Int hypre_MPI_Barrier( hypre_MPI_Comm comm );
-HYPRE_Int hypre_MPI_Comm_create( hypre_MPI_Comm comm , hypre_MPI_Group group , hypre_MPI_Comm *newcomm );
-HYPRE_Int hypre_MPI_Comm_dup( hypre_MPI_Comm comm , hypre_MPI_Comm *newcomm );
+HYPRE_Int hypre_MPI_Comm_create( hypre_MPI_Comm comm, hypre_MPI_Group group,
+                                 hypre_MPI_Comm *newcomm );
+HYPRE_Int hypre_MPI_Comm_dup( hypre_MPI_Comm comm, hypre_MPI_Comm *newcomm );
 hypre_MPI_Comm hypre_MPI_Comm_f2c( hypre_int comm );
-HYPRE_Int hypre_MPI_Comm_size( hypre_MPI_Comm comm , HYPRE_Int *size );
-HYPRE_Int hypre_MPI_Comm_rank( hypre_MPI_Comm comm , HYPRE_Int *rank );
+HYPRE_Int hypre_MPI_Comm_size( hypre_MPI_Comm comm, HYPRE_Int *size );
+HYPRE_Int hypre_MPI_Comm_rank( hypre_MPI_Comm comm, HYPRE_Int *rank );
 HYPRE_Int hypre_MPI_Comm_free( hypre_MPI_Comm *comm );
-HYPRE_Int hypre_MPI_Comm_group( hypre_MPI_Comm comm , hypre_MPI_Group *group );
-HYPRE_Int hypre_MPI_Comm_split( hypre_MPI_Comm comm, HYPRE_Int n, HYPRE_Int m, hypre_MPI_Comm * comms );
-HYPRE_Int hypre_MPI_Group_incl( hypre_MPI_Group group , HYPRE_Int n , HYPRE_Int *ranks , hypre_MPI_Group *newgroup );
+HYPRE_Int hypre_MPI_Comm_group( hypre_MPI_Comm comm, hypre_MPI_Group *group );
+HYPRE_Int hypre_MPI_Comm_split( hypre_MPI_Comm comm, HYPRE_Int n, HYPRE_Int m,
+                                hypre_MPI_Comm * comms );
+HYPRE_Int hypre_MPI_Group_incl( hypre_MPI_Group group, HYPRE_Int n, HYPRE_Int *ranks,
+                                hypre_MPI_Group *newgroup );
 HYPRE_Int hypre_MPI_Group_free( hypre_MPI_Group *group );
-HYPRE_Int hypre_MPI_Address( void *location , hypre_MPI_Aint *address );
-HYPRE_Int hypre_MPI_Get_count( hypre_MPI_Status *status , hypre_MPI_Datatype datatype , HYPRE_Int *count );
-HYPRE_Int hypre_MPI_Alltoall( void *sendbuf , HYPRE_Int sendcount , hypre_MPI_Datatype sendtype , void *recvbuf , HYPRE_Int recvcount , hypre_MPI_Datatype recvtype , hypre_MPI_Comm comm );
-HYPRE_Int hypre_MPI_Allgather( void *sendbuf , HYPRE_Int sendcount , hypre_MPI_Datatype sendtype , void *recvbuf , HYPRE_Int recvcount , hypre_MPI_Datatype recvtype , hypre_MPI_Comm comm );
-HYPRE_Int hypre_MPI_Allgatherv( void *sendbuf , HYPRE_Int sendcount , hypre_MPI_Datatype sendtype , void *recvbuf , HYPRE_Int *recvcounts , HYPRE_Int *displs , hypre_MPI_Datatype recvtype , hypre_MPI_Comm comm );
-HYPRE_Int hypre_MPI_Gather( void *sendbuf , HYPRE_Int sendcount , hypre_MPI_Datatype sendtype , void *recvbuf , HYPRE_Int recvcount , hypre_MPI_Datatype recvtype , HYPRE_Int root , hypre_MPI_Comm comm );
-HYPRE_Int hypre_MPI_Gatherv( void *sendbuf , HYPRE_Int sendcount , hypre_MPI_Datatype sendtype , void *recvbuf , HYPRE_Int *recvcounts , HYPRE_Int *displs , hypre_MPI_Datatype recvtype , HYPRE_Int root , hypre_MPI_Comm comm );
-HYPRE_Int hypre_MPI_Scatter( void *sendbuf , HYPRE_Int sendcount , hypre_MPI_Datatype sendtype , void *recvbuf , HYPRE_Int recvcount , hypre_MPI_Datatype recvtype , HYPRE_Int root , hypre_MPI_Comm comm );
-HYPRE_Int hypre_MPI_Scatterv( void *sendbuf , HYPRE_Int *sendcounts , HYPRE_Int *displs, hypre_MPI_Datatype sendtype , void *recvbuf , HYPRE_Int recvcount , hypre_MPI_Datatype recvtype , HYPRE_Int root , hypre_MPI_Comm comm );
-HYPRE_Int hypre_MPI_Bcast( void *buffer , HYPRE_Int count , hypre_MPI_Datatype datatype , HYPRE_Int root , hypre_MPI_Comm comm );
-HYPRE_Int hypre_MPI_Send( void *buf , HYPRE_Int count , hypre_MPI_Datatype datatype , HYPRE_Int dest , HYPRE_Int tag , hypre_MPI_Comm comm );
-HYPRE_Int hypre_MPI_Recv( void *buf , HYPRE_Int count , hypre_MPI_Datatype datatype , HYPRE_Int source , HYPRE_Int tag , hypre_MPI_Comm comm , hypre_MPI_Status *status );
-HYPRE_Int hypre_MPI_Isend( void *buf , HYPRE_Int count , hypre_MPI_Datatype datatype , HYPRE_Int dest , HYPRE_Int tag , hypre_MPI_Comm comm , hypre_MPI_Request *request );
-HYPRE_Int hypre_MPI_Irecv( void *buf , HYPRE_Int count , hypre_MPI_Datatype datatype , HYPRE_Int source , HYPRE_Int tag , hypre_MPI_Comm comm , hypre_MPI_Request *request );
-HYPRE_Int hypre_MPI_Send_init( void *buf , HYPRE_Int count , hypre_MPI_Datatype datatype , HYPRE_Int dest , HYPRE_Int tag , hypre_MPI_Comm comm , hypre_MPI_Request *request );
-HYPRE_Int hypre_MPI_Recv_init( void *buf , HYPRE_Int count , hypre_MPI_Datatype datatype , HYPRE_Int dest , HYPRE_Int tag , hypre_MPI_Comm comm , hypre_MPI_Request *request );
-HYPRE_Int hypre_MPI_Irsend( void *buf , HYPRE_Int count , hypre_MPI_Datatype datatype , HYPRE_Int dest , HYPRE_Int tag , hypre_MPI_Comm comm , hypre_MPI_Request *request );
-HYPRE_Int hypre_MPI_Startall( HYPRE_Int count , hypre_MPI_Request *array_of_requests );
-HYPRE_Int hypre_MPI_Probe( HYPRE_Int source , HYPRE_Int tag , hypre_MPI_Comm comm , hypre_MPI_Status *status );
-HYPRE_Int hypre_MPI_Iprobe( HYPRE_Int source , HYPRE_Int tag , hypre_MPI_Comm comm , HYPRE_Int *flag , hypre_MPI_Status *status );
-HYPRE_Int hypre_MPI_Test( hypre_MPI_Request *request , HYPRE_Int *flag , hypre_MPI_Status *status );
-HYPRE_Int hypre_MPI_Testall( HYPRE_Int count , hypre_MPI_Request *array_of_requests , HYPRE_Int *flag , hypre_MPI_Status *array_of_statuses );
-HYPRE_Int hypre_MPI_Wait( hypre_MPI_Request *request , hypre_MPI_Status *status );
-HYPRE_Int hypre_MPI_Waitall( HYPRE_Int count , hypre_MPI_Request *array_of_requests , hypre_MPI_Status *array_of_statuses );
-HYPRE_Int hypre_MPI_Waitany( HYPRE_Int count , hypre_MPI_Request *array_of_requests , HYPRE_Int *index , hypre_MPI_Status *status );
-HYPRE_Int hypre_MPI_Allreduce( void *sendbuf , void *recvbuf , HYPRE_Int count , hypre_MPI_Datatype datatype , hypre_MPI_Op op , hypre_MPI_Comm comm );
-HYPRE_Int hypre_MPI_Reduce( void *sendbuf , void *recvbuf , HYPRE_Int count , hypre_MPI_Datatype datatype , hypre_MPI_Op op , HYPRE_Int root , hypre_MPI_Comm comm );
-HYPRE_Int hypre_MPI_Scan( void *sendbuf , void *recvbuf , HYPRE_Int count , hypre_MPI_Datatype datatype , hypre_MPI_Op op , hypre_MPI_Comm comm );
+HYPRE_Int hypre_MPI_Address( void *location, hypre_MPI_Aint *address );
+HYPRE_Int hypre_MPI_Get_count( hypre_MPI_Status *status, hypre_MPI_Datatype datatype,
+                               HYPRE_Int *count );
+HYPRE_Int hypre_MPI_Alltoall( void *sendbuf, HYPRE_Int sendcount, hypre_MPI_Datatype sendtype,
+                              void *recvbuf, HYPRE_Int recvcount, hypre_MPI_Datatype recvtype, hypre_MPI_Comm comm );
+HYPRE_Int hypre_MPI_Allgather( void *sendbuf, HYPRE_Int sendcount, hypre_MPI_Datatype sendtype,
+                               void *recvbuf, HYPRE_Int recvcount, hypre_MPI_Datatype recvtype, hypre_MPI_Comm comm );
+HYPRE_Int hypre_MPI_Allgatherv( void *sendbuf, HYPRE_Int sendcount, hypre_MPI_Datatype sendtype,
+                                void *recvbuf, HYPRE_Int *recvcounts, HYPRE_Int *displs, hypre_MPI_Datatype recvtype,
+                                hypre_MPI_Comm comm );
+HYPRE_Int hypre_MPI_Gather( void *sendbuf, HYPRE_Int sendcount, hypre_MPI_Datatype sendtype,
+                            void *recvbuf, HYPRE_Int recvcount, hypre_MPI_Datatype recvtype, HYPRE_Int root,
+                            hypre_MPI_Comm comm );
+HYPRE_Int hypre_MPI_Gatherv( void *sendbuf, HYPRE_Int sendcount, hypre_MPI_Datatype sendtype,
+                             void *recvbuf, HYPRE_Int *recvcounts, HYPRE_Int *displs, hypre_MPI_Datatype recvtype,
+                             HYPRE_Int root, hypre_MPI_Comm comm );
+HYPRE_Int hypre_MPI_Scatter( void *sendbuf, HYPRE_Int sendcount, hypre_MPI_Datatype sendtype,
+                             void *recvbuf, HYPRE_Int recvcount, hypre_MPI_Datatype recvtype, HYPRE_Int root,
+                             hypre_MPI_Comm comm );
+HYPRE_Int hypre_MPI_Scatterv( void *sendbuf, HYPRE_Int *sendcounts, HYPRE_Int *displs,
+                              hypre_MPI_Datatype sendtype, void *recvbuf, HYPRE_Int recvcount, hypre_MPI_Datatype recvtype,
+                              HYPRE_Int root, hypre_MPI_Comm comm );
+HYPRE_Int hypre_MPI_Bcast( void *buffer, HYPRE_Int count, hypre_MPI_Datatype datatype,
+                           HYPRE_Int root, hypre_MPI_Comm comm );
+HYPRE_Int hypre_MPI_Send( void *buf, HYPRE_Int count, hypre_MPI_Datatype datatype, HYPRE_Int dest,
+                          HYPRE_Int tag, hypre_MPI_Comm comm );
+HYPRE_Int hypre_MPI_Recv( void *buf, HYPRE_Int count, hypre_MPI_Datatype datatype, HYPRE_Int source,
+                          HYPRE_Int tag, hypre_MPI_Comm comm, hypre_MPI_Status *status );
+HYPRE_Int hypre_MPI_Isend( void *buf, HYPRE_Int count, hypre_MPI_Datatype datatype, HYPRE_Int dest,
+                           HYPRE_Int tag, hypre_MPI_Comm comm, hypre_MPI_Request *request );
+HYPRE_Int hypre_MPI_Irecv( void *buf, HYPRE_Int count, hypre_MPI_Datatype datatype,
+                           HYPRE_Int source, HYPRE_Int tag, hypre_MPI_Comm comm, hypre_MPI_Request *request );
+HYPRE_Int hypre_MPI_Send_init( void *buf, HYPRE_Int count, hypre_MPI_Datatype datatype,
+                               HYPRE_Int dest, HYPRE_Int tag, hypre_MPI_Comm comm, hypre_MPI_Request *request );
+HYPRE_Int hypre_MPI_Recv_init( void *buf, HYPRE_Int count, hypre_MPI_Datatype datatype,
+                               HYPRE_Int dest, HYPRE_Int tag, hypre_MPI_Comm comm, hypre_MPI_Request *request );
+HYPRE_Int hypre_MPI_Irsend( void *buf, HYPRE_Int count, hypre_MPI_Datatype datatype, HYPRE_Int dest,
+                            HYPRE_Int tag, hypre_MPI_Comm comm, hypre_MPI_Request *request );
+HYPRE_Int hypre_MPI_Startall( HYPRE_Int count, hypre_MPI_Request *array_of_requests );
+HYPRE_Int hypre_MPI_Probe( HYPRE_Int source, HYPRE_Int tag, hypre_MPI_Comm comm,
+                           hypre_MPI_Status *status );
+HYPRE_Int hypre_MPI_Iprobe( HYPRE_Int source, HYPRE_Int tag, hypre_MPI_Comm comm, HYPRE_Int *flag,
+                            hypre_MPI_Status *status );
+HYPRE_Int hypre_MPI_Test( hypre_MPI_Request *request, HYPRE_Int *flag, hypre_MPI_Status *status );
+HYPRE_Int hypre_MPI_Testall( HYPRE_Int count, hypre_MPI_Request *array_of_requests, HYPRE_Int *flag,
+                             hypre_MPI_Status *array_of_statuses );
+HYPRE_Int hypre_MPI_Wait( hypre_MPI_Request *request, hypre_MPI_Status *status );
+HYPRE_Int hypre_MPI_Waitall( HYPRE_Int count, hypre_MPI_Request *array_of_requests,
+                             hypre_MPI_Status *array_of_statuses );
+HYPRE_Int hypre_MPI_Waitany( HYPRE_Int count, hypre_MPI_Request *array_of_requests,
+                             HYPRE_Int *index, hypre_MPI_Status *status );
+HYPRE_Int hypre_MPI_Allreduce( void *sendbuf, void *recvbuf, HYPRE_Int count,
+                               hypre_MPI_Datatype datatype, hypre_MPI_Op op, hypre_MPI_Comm comm );
+HYPRE_Int hypre_MPI_Reduce( void *sendbuf, void *recvbuf, HYPRE_Int count,
+                            hypre_MPI_Datatype datatype, hypre_MPI_Op op, HYPRE_Int root, hypre_MPI_Comm comm );
+HYPRE_Int hypre_MPI_Scan( void *sendbuf, void *recvbuf, HYPRE_Int count,
+                          hypre_MPI_Datatype datatype, hypre_MPI_Op op, hypre_MPI_Comm comm );
 HYPRE_Int hypre_MPI_Request_free( hypre_MPI_Request *request );
-HYPRE_Int hypre_MPI_Type_contiguous( HYPRE_Int count , hypre_MPI_Datatype oldtype , hypre_MPI_Datatype *newtype );
-HYPRE_Int hypre_MPI_Type_vector( HYPRE_Int count , HYPRE_Int blocklength , HYPRE_Int stride , hypre_MPI_Datatype oldtype , hypre_MPI_Datatype *newtype );
-HYPRE_Int hypre_MPI_Type_hvector( HYPRE_Int count , HYPRE_Int blocklength , hypre_MPI_Aint stride , hypre_MPI_Datatype oldtype , hypre_MPI_Datatype *newtype );
-HYPRE_Int hypre_MPI_Type_struct( HYPRE_Int count , HYPRE_Int *array_of_blocklengths , hypre_MPI_Aint *array_of_displacements , hypre_MPI_Datatype *array_of_types , hypre_MPI_Datatype *newtype );
+HYPRE_Int hypre_MPI_Type_contiguous( HYPRE_Int count, hypre_MPI_Datatype oldtype,
+                                     hypre_MPI_Datatype *newtype );
+HYPRE_Int hypre_MPI_Type_vector( HYPRE_Int count, HYPRE_Int blocklength, HYPRE_Int stride,
+                                 hypre_MPI_Datatype oldtype, hypre_MPI_Datatype *newtype );
+HYPRE_Int hypre_MPI_Type_hvector( HYPRE_Int count, HYPRE_Int blocklength, hypre_MPI_Aint stride,
+                                  hypre_MPI_Datatype oldtype, hypre_MPI_Datatype *newtype );
+HYPRE_Int hypre_MPI_Type_struct( HYPRE_Int count, HYPRE_Int *array_of_blocklengths,
+                                 hypre_MPI_Aint *array_of_displacements, hypre_MPI_Datatype *array_of_types,
+                                 hypre_MPI_Datatype *newtype );
 HYPRE_Int hypre_MPI_Type_commit( hypre_MPI_Datatype *datatype );
 HYPRE_Int hypre_MPI_Type_free( hypre_MPI_Datatype *datatype );
 HYPRE_Int hypre_MPI_Op_free( hypre_MPI_Op *op );
-HYPRE_Int hypre_MPI_Op_create( hypre_MPI_User_function *function , hypre_int commute , hypre_MPI_Op *op );
-#if defined(HYPRE_USING_GPU)
-HYPRE_Int hypre_MPI_Comm_split_type(hypre_MPI_Comm comm, HYPRE_Int split_type, HYPRE_Int key, hypre_MPI_Info info, hypre_MPI_Comm *newcomm);
+HYPRE_Int hypre_MPI_Op_create( hypre_MPI_User_function *function, hypre_int commute,
+                               hypre_MPI_Op *op );
+#if defined(HYPRE_USING_GPU) || defined(HYPRE_USING_DEVICE_OPENMP)
+HYPRE_Int hypre_MPI_Comm_split_type(hypre_MPI_Comm comm, HYPRE_Int split_type, HYPRE_Int key,
+                                    hypre_MPI_Info info, hypre_MPI_Comm *newcomm);
 HYPRE_Int hypre_MPI_Info_create(hypre_MPI_Info *info);
 HYPRE_Int hypre_MPI_Info_free( hypre_MPI_Info *info );
 #endif
diff --git a/external/hypre/src/utilities/nvtx.c b/external/hypre/src/utilities/nvtx.c
index 6515d456..0b06f966 100644
--- a/external/hypre/src/utilities/nvtx.c
+++ b/external/hypre/src/utilities/nvtx.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -9,10 +9,9 @@
 
 #if defined(HYPRE_USING_ROCTX)
 #include "hip/hip_runtime_api.h"
-#include "roctx.h"
-#endif
+#include "roctracer/roctx.h"
 
-#if defined(HYPRE_USING_NVTX)
+#elif defined(HYPRE_USING_NVTX)
 
 #include <string>
 #include <algorithm>
@@ -70,7 +69,7 @@ static std::vector<std::string> hypre_nvtx_range_names;
 
 void hypre_GpuProfilingPushRangeColor(const char *name, HYPRE_Int color_id)
 {
-#ifdef HYPRE_USING_NVTX
+#if defined (HYPRE_USING_NVTX)
    color_id = color_id % hypre_nvtx_num_colors;
    nvtxEventAttributes_t eventAttrib = {0};
    eventAttrib.version = NVTX_VERSION;
@@ -80,16 +79,19 @@ void hypre_GpuProfilingPushRangeColor(const char *name, HYPRE_Int color_id)
    eventAttrib.messageType = NVTX_MESSAGE_TYPE_ASCII;
    eventAttrib.message.ascii = name;
    nvtxRangePushEx(&eventAttrib);
-#endif
 
-#ifdef HYPRE_USING_ROCTX
+#elif defined (HYPRE_USING_ROCTX)
    roctxRangePush(name);
+
+#else
+   HYPRE_UNUSED_VAR(name);
+   HYPRE_UNUSED_VAR(color_id);
 #endif
 }
 
 void hypre_GpuProfilingPushRange(const char *name)
 {
-#ifdef HYPRE_USING_NVTX
+#if defined (HYPRE_USING_NVTX)
    std::vector<std::string>::iterator p = std::find(hypre_nvtx_range_names.begin(),
                                                     hypre_nvtx_range_names.end(),
                                                     name);
@@ -103,23 +105,24 @@ void hypre_GpuProfilingPushRange(const char *name)
    HYPRE_Int color = p - hypre_nvtx_range_names.begin();
 
    hypre_GpuProfilingPushRangeColor(name, color);
-#endif
 
-#ifdef HYPRE_USING_ROCTX
+#elif defined (HYPRE_USING_ROCTX)
    roctxRangePush(name);
+
+#else
+   HYPRE_UNUSED_VAR(name);
 #endif
 }
 
-void hypre_GpuProfilingPopRange()
+void hypre_GpuProfilingPopRange(void)
 {
-#ifdef HYPRE_USING_NVTX
+#if defined (HYPRE_USING_NVTX)
    hypre_GpuProfilingPushRangeColor("StreamSync0", Red);
    cudaStreamSynchronize(0);
    nvtxRangePop();
    nvtxRangePop();
-#endif
 
-#ifdef HYPRE_USING_ROCTX
+#elif defined (HYPRE_USING_ROCTX)
    roctxRangePush("StreamSync0");
    hipStreamSynchronize(0);
    roctxRangePop();
diff --git a/external/hypre/src/utilities/omp_device.c b/external/hypre/src/utilities/omp_device.c
index 25bd957c..e939c534 100644
--- a/external/hypre/src/utilities/omp_device.c
+++ b/external/hypre/src/utilities/omp_device.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -38,7 +38,8 @@ HYPRE_OMPOffload(HYPRE_Int device, void *ptr, size_t num,
 HYPRE_Int
 HYPRE_OMPPtrIsMapped(void *p, HYPRE_Int device_num)
 {
-   if (hypre__global_offload && !omp_target_is_present(p, device_num)) {
+   if (hypre__global_offload && !omp_target_is_present(p, device_num))
+   {
       printf("HYPRE mapping error: %p has not been mapped to device %d!\n", p, device_num);
       return 1;
    }
diff --git a/external/hypre/src/utilities/omp_device.h b/external/hypre/src/utilities/omp_device.h
index 0e27316c..cd493a2a 100644
--- a/external/hypre/src/utilities/omp_device.h
+++ b/external/hypre/src/utilities/omp_device.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -102,11 +102,12 @@ extern size_t hypre__target_dtoh_bytes;
    } \
 }
 
-HYPRE_Int HYPRE_OMPOffload(HYPRE_Int device, void *ptr, size_t num, const char *type1, const char *type2);
+HYPRE_Int HYPRE_OMPOffload(HYPRE_Int device, void *ptr, size_t num, const char *type1,
+                           const char *type2);
 HYPRE_Int HYPRE_OMPPtrIsMapped(void *p, HYPRE_Int device_num);
-HYPRE_Int HYPRE_OMPOffloadOn();
-HYPRE_Int HYPRE_OMPOffloadOff();
-HYPRE_Int HYPRE_OMPOffloadStatPrint();
+HYPRE_Int HYPRE_OMPOffloadOn(void);
+HYPRE_Int HYPRE_OMPOffloadOff(void);
+HYPRE_Int HYPRE_OMPOffloadStatPrint(void);
 
 #endif /* HYPRE_USING_DEVICE_OPENMP */
 #endif /* HYPRE_OMP_DEVICE_H */
diff --git a/external/hypre/src/utilities/predicates.h b/external/hypre/src/utilities/predicates.h
new file mode 100644
index 00000000..0f01d5c9
--- /dev/null
+++ b/external/hypre/src/utilities/predicates.h
@@ -0,0 +1,43 @@
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+#ifndef HYPRE_PREDICATES_H
+#define HYPRE_PREDICATES_H
+
+/******************************************************************************
+ *
+ * Header file defining predicates for thrust used throughout hypre
+ *
+ *****************************************************************************/
+
+#if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+
+/*--------------------------------------------------------------------------
+ * hyprePred_StridedAccess
+ *
+ * This struct defines a predicate for strided access in array-like data.
+ *
+ * It is used to determine if an element at a given index should be processed
+ * or not, based on a specified stride. The operator() returns true when the
+ * index is a multiple of the stride, indicating the element at that index
+ * is part of the strided subset.
+ *--------------------------------------------------------------------------*/
+
+struct hyprePred_StridedAccess
+{
+   HYPRE_Int  s_;
+
+   hyprePred_StridedAccess(HYPRE_Int s) : s_(s) {}
+
+   __host__ __device__ HYPRE_Int operator()(const HYPRE_Int i) const
+   {
+      return (!(i % s_));
+   }
+};
+
+#endif /* if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP) */
+#endif /* ifndef HYPRE_PREDICATES_H */
diff --git a/external/hypre/src/utilities/prefix_sum.c b/external/hypre/src/utilities/prefix_sum.c
index 6043196f..92dff2cc 100644
--- a/external/hypre/src/utilities/prefix_sum.c
+++ b/external/hypre/src/utilities/prefix_sum.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -16,8 +16,8 @@ void hypre_prefix_sum(HYPRE_Int *in_out, HYPRE_Int *sum, HYPRE_Int *workspace)
 
    workspace[my_thread_num + 1] = *in_out;
 
-#pragma omp barrier
-#pragma omp master
+   #pragma omp barrier
+   #pragma omp master
    {
       HYPRE_Int i;
       workspace[0] = 0;
@@ -27,7 +27,7 @@ void hypre_prefix_sum(HYPRE_Int *in_out, HYPRE_Int *sum, HYPRE_Int *workspace)
       }
       *sum = workspace[num_threads];
    }
-#pragma omp barrier
+   #pragma omp barrier
 
    *in_out = workspace[my_thread_num];
 #else /* !HYPRE_USING_OPENMP */
@@ -39,18 +39,19 @@ void hypre_prefix_sum(HYPRE_Int *in_out, HYPRE_Int *sum, HYPRE_Int *workspace)
 #endif /* !HYPRE_USING_OPENMP */
 }
 
-void hypre_prefix_sum_pair(HYPRE_Int *in_out1, HYPRE_Int *sum1, HYPRE_Int *in_out2, HYPRE_Int *sum2, HYPRE_Int *workspace)
+void hypre_prefix_sum_pair(HYPRE_Int *in_out1, HYPRE_Int *sum1, HYPRE_Int *in_out2, HYPRE_Int *sum2,
+                           HYPRE_Int *workspace)
 {
 #ifdef HYPRE_USING_OPENMP
    HYPRE_Int my_thread_num = hypre_GetThreadNum();
    HYPRE_Int num_threads = hypre_NumActiveThreads();
    hypre_assert(1 == num_threads || omp_in_parallel());
 
-   workspace[(my_thread_num + 1)*2] = *in_out1;
-   workspace[(my_thread_num + 1)*2 + 1] = *in_out2;
+   workspace[(my_thread_num + 1) * 2] = *in_out1;
+   workspace[(my_thread_num + 1) * 2 + 1] = *in_out2;
 
-#pragma omp barrier
-#pragma omp master
+   #pragma omp barrier
+   #pragma omp master
    {
       HYPRE_Int i;
       workspace[0] = 0;
@@ -58,16 +59,16 @@ void hypre_prefix_sum_pair(HYPRE_Int *in_out1, HYPRE_Int *sum1, HYPRE_Int *in_ou
 
       for (i = 1; i < num_threads; i++)
       {
-         workspace[(i + 1)*2] += workspace[i*2];
-         workspace[(i + 1)*2 + 1] += workspace[i*2 + 1];
+         workspace[(i + 1) * 2] += workspace[i * 2];
+         workspace[(i + 1) * 2 + 1] += workspace[i * 2 + 1];
       }
-      *sum1 = workspace[num_threads*2];
-      *sum2 = workspace[num_threads*2 + 1];
+      *sum1 = workspace[num_threads * 2];
+      *sum2 = workspace[num_threads * 2 + 1];
    }
-#pragma omp barrier
+   #pragma omp barrier
 
-   *in_out1 = workspace[my_thread_num*2];
-   *in_out2 = workspace[my_thread_num*2 + 1];
+   *in_out1 = workspace[my_thread_num * 2];
+   *in_out2 = workspace[my_thread_num * 2 + 1];
 #else /* !HYPRE_USING_OPENMP */
    *sum1 = *in_out1;
    *sum2 = *in_out2;
@@ -81,19 +82,20 @@ void hypre_prefix_sum_pair(HYPRE_Int *in_out1, HYPRE_Int *sum1, HYPRE_Int *in_ou
 #endif /* !HYPRE_USING_OPENMP */
 }
 
-void hypre_prefix_sum_triple(HYPRE_Int *in_out1, HYPRE_Int *sum1, HYPRE_Int *in_out2, HYPRE_Int *sum2, HYPRE_Int *in_out3, HYPRE_Int *sum3, HYPRE_Int *workspace)
+void hypre_prefix_sum_triple(HYPRE_Int *in_out1, HYPRE_Int *sum1, HYPRE_Int *in_out2,
+                             HYPRE_Int *sum2, HYPRE_Int *in_out3, HYPRE_Int *sum3, HYPRE_Int *workspace)
 {
 #ifdef HYPRE_USING_OPENMP
    HYPRE_Int my_thread_num = hypre_GetThreadNum();
    HYPRE_Int num_threads = hypre_NumActiveThreads();
    hypre_assert(1 == num_threads || omp_in_parallel());
 
-   workspace[(my_thread_num + 1)*3] = *in_out1;
-   workspace[(my_thread_num + 1)*3 + 1] = *in_out2;
-   workspace[(my_thread_num + 1)*3 + 2] = *in_out3;
+   workspace[(my_thread_num + 1) * 3] = *in_out1;
+   workspace[(my_thread_num + 1) * 3 + 1] = *in_out2;
+   workspace[(my_thread_num + 1) * 3 + 2] = *in_out3;
 
-#pragma omp barrier
-#pragma omp master
+   #pragma omp barrier
+   #pragma omp master
    {
       HYPRE_Int i;
       workspace[0] = 0;
@@ -102,19 +104,19 @@ void hypre_prefix_sum_triple(HYPRE_Int *in_out1, HYPRE_Int *sum1, HYPRE_Int *in_
 
       for (i = 1; i < num_threads; i++)
       {
-         workspace[(i + 1)*3] += workspace[i*3];
-         workspace[(i + 1)*3 + 1] += workspace[i*3 + 1];
-         workspace[(i + 1)*3 + 2] += workspace[i*3 + 2];
+         workspace[(i + 1) * 3] += workspace[i * 3];
+         workspace[(i + 1) * 3 + 1] += workspace[i * 3 + 1];
+         workspace[(i + 1) * 3 + 2] += workspace[i * 3 + 2];
       }
-      *sum1 = workspace[num_threads*3];
-      *sum2 = workspace[num_threads*3 + 1];
-      *sum3 = workspace[num_threads*3 + 2];
+      *sum1 = workspace[num_threads * 3];
+      *sum2 = workspace[num_threads * 3 + 1];
+      *sum3 = workspace[num_threads * 3 + 2];
    }
-#pragma omp barrier
+   #pragma omp barrier
 
-   *in_out1 = workspace[my_thread_num*3];
-   *in_out2 = workspace[my_thread_num*3 + 1];
-   *in_out3 = workspace[my_thread_num*3 + 2];
+   *in_out1 = workspace[my_thread_num * 3];
+   *in_out2 = workspace[my_thread_num * 3 + 1];
+   *in_out3 = workspace[my_thread_num * 3 + 2];
 #else /* !HYPRE_USING_OPENMP */
    *sum1 = *in_out1;
    *sum2 = *in_out2;
@@ -142,11 +144,11 @@ void hypre_prefix_sum_multiple(HYPRE_Int *in_out, HYPRE_Int *sum, HYPRE_Int n, H
 
    for (i = 0; i < n; i++)
    {
-     workspace[(my_thread_num + 1)*n + i] = in_out[i];
+      workspace[(my_thread_num + 1)*n + i] = in_out[i];
    }
 
-#pragma omp barrier
-#pragma omp master
+   #pragma omp barrier
+   #pragma omp master
    {
       HYPRE_Int t;
       for (i = 0; i < n; i++)
@@ -159,20 +161,20 @@ void hypre_prefix_sum_multiple(HYPRE_Int *in_out, HYPRE_Int *sum, HYPRE_Int n, H
       {
          for (i = 0; i < n; i++)
          {
-            workspace[(t + 1)*n + i] += workspace[t*n + i];
+            workspace[(t + 1)*n + i] += workspace[t * n + i];
          }
       }
 
       for (i = 0; i < n; i++)
       {
-         sum[i] = workspace[num_threads*n + i];
+         sum[i] = workspace[num_threads * n + i];
       }
    }
-#pragma omp barrier
+   #pragma omp barrier
 
    for (i = 0; i < n; i++)
    {
-      in_out[i] = workspace[my_thread_num*n + i];
+      in_out[i] = workspace[my_thread_num * n + i];
    }
 #else /* !HYPRE_USING_OPENMP */
    for (i = 0; i < n; i++)
diff --git a/external/hypre/src/utilities/printf.c b/external/hypre/src/utilities/printf.c
index 173e5537..7e0531d9 100644
--- a/external/hypre/src/utilities/printf.c
+++ b/external/hypre/src/utilities/printf.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -9,6 +9,9 @@
 #include <stdarg.h>
 #include <stdio.h>
 
+#define hypre_printf_buffer_len 4096
+char hypre_printf_buffer[hypre_printf_buffer_len];
+
 // #ifdef HYPRE_BIGINT
 
 /* these prototypes are missing by default for some compilers */
@@ -28,8 +31,16 @@ new_format( const char *format,
    HYPRE_Int   copychar;
    HYPRE_Int   foundpercent = 0;
 
-   newformatlen = 2*strlen(format)+1; /* worst case is all %d's to %lld's */
-   newformat = hypre_TAlloc(char,  newformatlen, HYPRE_MEMORY_HOST);
+   newformatlen = 2 * strlen(format) + 1; /* worst case is all %d's to %lld's */
+
+   if (newformatlen > hypre_printf_buffer_len)
+   {
+      newformat = hypre_TAlloc(char, newformatlen, HYPRE_MEMORY_HOST);
+   }
+   else
+   {
+      newformat = hypre_printf_buffer;
+   }
 
    nfp = newformat;
    for (fp = format; *fp != '\0'; fp++)
@@ -49,7 +60,7 @@ new_format( const char *format,
                fp++; /* remove second 'l' if present */
             }
          }
-         switch(*fp)
+         switch (*fp)
          {
             case 'b': /* used for BigInt type in hypre */
 #if defined(HYPRE_BIGINT) || defined(HYPRE_MIXEDINT)
@@ -98,7 +109,7 @@ new_format( const char *format,
 
    *newformat_ptr = newformat;
 
-/*   printf("\nNEWFORMAT: %s\n", *newformat_ptr);*/
+   /*   printf("\nNEWFORMAT: %s\n", *newformat_ptr);*/
 
    return 0;
 }
@@ -106,7 +117,10 @@ new_format( const char *format,
 HYPRE_Int
 free_format( char *newformat )
 {
-   hypre_TFree(newformat, HYPRE_MEMORY_HOST);
+   if (newformat != hypre_printf_buffer)
+   {
+      hypre_TFree(newformat, HYPRE_MEMORY_HOST);
+   }
 
    return 0;
 }
@@ -116,7 +130,7 @@ hypre_ndigits( HYPRE_BigInt number )
 {
    HYPRE_Int     ndigits = 0;
 
-   while(number)
+   while (number)
    {
       number /= 10;
       ndigits++;
@@ -140,6 +154,8 @@ hypre_printf( const char *format, ...)
    free_format(newformat);
    va_end(ap);
 
+   fflush(stdout);
+
    return ierr;
 }
 
@@ -175,6 +191,22 @@ hypre_sprintf( char *s, const char *format, ...)
    return ierr;
 }
 
+HYPRE_Int
+hypre_snprintf( char *s, size_t size, const char *format, ...)
+{
+   va_list   ap;
+   char     *newformat;
+   HYPRE_Int ierr = 0;
+
+   va_start(ap, format);
+   new_format(format, &newformat);
+   ierr = vsnprintf(s, size, newformat, ap);
+   free_format(newformat);
+   va_end(ap);
+
+   return ierr;
+}
+
 /* scanf functions */
 
 HYPRE_Int
@@ -225,9 +257,36 @@ hypre_sscanf( char *s, const char *format, ...)
    return ierr;
 }
 
+HYPRE_Int
+hypre_ParPrintf(MPI_Comm comm, const char *format, ...)
+{
+   HYPRE_Int my_id;
+   HYPRE_Int ierr = hypre_MPI_Comm_rank(comm, &my_id);
+
+   if (ierr)
+   {
+      return ierr;
+   }
+
+   if (!my_id)
+   {
+      va_list ap;
+      char   *newformat;
+
+      va_start(ap, format);
+      new_format(format, &newformat);
+      ierr = vprintf(newformat, ap);
+      free_format(newformat);
+      va_end(ap);
+
+      fflush(stdout);
+   }
+
+   return ierr;
+}
 // #else
-// 
+//
 // /* this is used only to eliminate compiler warnings */
 // HYPRE_Int hypre_printf_empty;
-// 
+//
 // #endif
diff --git a/external/hypre/src/utilities/printf.h b/external/hypre/src/utilities/printf.h
index 41b1242c..3741c8fd 100644
--- a/external/hypre/src/utilities/printf.h
+++ b/external/hypre/src/utilities/printf.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -13,12 +13,14 @@
 /* printf.c */
 // #ifdef HYPRE_BIGINT
 HYPRE_Int hypre_ndigits( HYPRE_BigInt number );
-HYPRE_Int hypre_printf( const char *format , ... );
-HYPRE_Int hypre_fprintf( FILE *stream , const char *format, ... );
-HYPRE_Int hypre_sprintf( char *s , const char *format, ... );
-HYPRE_Int hypre_scanf( const char *format , ... );
-HYPRE_Int hypre_fscanf( FILE *stream , const char *format, ... );
-HYPRE_Int hypre_sscanf( char *s , const char *format, ... );
+HYPRE_Int hypre_printf( const char *format, ... );
+HYPRE_Int hypre_fprintf( FILE *stream, const char *format, ... );
+HYPRE_Int hypre_sprintf( char *s, const char *format, ... );
+HYPRE_Int hypre_snprintf( char *s, size_t size, const char *format, ...);
+HYPRE_Int hypre_scanf( const char *format, ... );
+HYPRE_Int hypre_fscanf( FILE *stream, const char *format, ... );
+HYPRE_Int hypre_sscanf( char *s, const char *format, ... );
+HYPRE_Int hypre_ParPrintf(MPI_Comm comm, const char *format, ...);
 // #else
 // #define hypre_printf  printf
 // #define hypre_fprintf fprintf
diff --git a/external/hypre/src/utilities/protos b/external/hypre/src/utilities/protos
old mode 100644
new mode 100755
index 48605c72..1ce068a9
--- a/external/hypre/src/utilities/protos
+++ b/external/hypre/src/utilities/protos
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/utilities/protos.h b/external/hypre/src/utilities/protos.h
index e1474a0d..0fe65c07 100644
--- a/external/hypre/src/utilities/protos.h
+++ b/external/hypre/src/utilities/protos.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -7,14 +7,17 @@
 
 /* amg_linklist.c */
 void hypre_dispose_elt ( hypre_LinkList element_ptr );
-void hypre_remove_point ( hypre_LinkList *LoL_head_ptr , hypre_LinkList *LoL_tail_ptr , HYPRE_Int measure , HYPRE_Int index , HYPRE_Int *lists , HYPRE_Int *where );
+void hypre_remove_point ( hypre_LinkList *LoL_head_ptr, hypre_LinkList *LoL_tail_ptr,
+                          HYPRE_Int measure, HYPRE_Int index, HYPRE_Int *lists, HYPRE_Int *where );
 hypre_LinkList hypre_create_elt ( HYPRE_Int Item );
-void hypre_enter_on_lists ( hypre_LinkList *LoL_head_ptr , hypre_LinkList *LoL_tail_ptr , HYPRE_Int measure , HYPRE_Int index , HYPRE_Int *lists , HYPRE_Int *where );
+void hypre_enter_on_lists ( hypre_LinkList *LoL_head_ptr, hypre_LinkList *LoL_tail_ptr,
+                            HYPRE_Int measure, HYPRE_Int index, HYPRE_Int *lists, HYPRE_Int *where );
 
 /* binsearch.c */
-HYPRE_Int hypre_BinarySearch ( HYPRE_Int *list , HYPRE_Int value , HYPRE_Int list_length );
-HYPRE_Int hypre_BigBinarySearch ( HYPRE_BigInt *list , HYPRE_BigInt value , HYPRE_Int list_length );
-HYPRE_Int hypre_BinarySearch2 ( HYPRE_Int *list , HYPRE_Int value , HYPRE_Int low , HYPRE_Int high , HYPRE_Int *spot );
+HYPRE_Int hypre_BinarySearch ( HYPRE_Int *list, HYPRE_Int value, HYPRE_Int list_length );
+HYPRE_Int hypre_BigBinarySearch ( HYPRE_BigInt *list, HYPRE_BigInt value, HYPRE_Int list_length );
+HYPRE_Int hypre_BinarySearch2 ( HYPRE_Int *list, HYPRE_Int value, HYPRE_Int low, HYPRE_Int high,
+                                HYPRE_Int *spot );
 HYPRE_Int *hypre_LowerBound( HYPRE_Int *first, HYPRE_Int *last, HYPRE_Int value );
 HYPRE_BigInt *hypre_BigLowerBound( HYPRE_BigInt *first, HYPRE_BigInt *last, HYPRE_BigInt value );
 
@@ -27,65 +30,87 @@ HYPRE_Complex hypre_conj( HYPRE_Complex value );
 HYPRE_Real    hypre_cabs( HYPRE_Complex value );
 HYPRE_Real    hypre_creal( HYPRE_Complex value );
 HYPRE_Real    hypre_cimag( HYPRE_Complex value );
+HYPRE_Complex hypre_csqrt( HYPRE_Complex value );
 #else
 #define hypre_conj(value)  value
-#define hypre_cabs(value)  fabs(value)
+#define hypre_cabs(value)  hypre_abs(value)
 #define hypre_creal(value) value
 #define hypre_cimag(value) 0.0
+#define hypre_csqrt(value) hypre_sqrt(value)
 #endif
 
+/* state.c */
+HYPRE_Int hypre_Initialized( void );
+HYPRE_Int hypre_Finalized( void );
+HYPRE_Int hypre_SetInitialized( void );
+HYPRE_Int hypre_SetFinalized( void );
+
 /* general.c */
-#ifdef HYPRE_USING_MEMORY_TRACKER
-hypre_MemoryTracker* hypre_memory_tracker();
-#endif
-hypre_Handle* hypre_handle();
-hypre_Handle* hypre_HandleCreate();
+hypre_Handle* hypre_handle(void);
+hypre_Handle* hypre_HandleCreate(void);
 HYPRE_Int hypre_HandleDestroy(hypre_Handle *hypre_handle_);
 HYPRE_Int hypre_SetDevice(hypre_int device_id, hypre_Handle *hypre_handle_);
 HYPRE_Int hypre_GetDevice(hypre_int *device_id);
 HYPRE_Int hypre_GetDeviceCount(hypre_int *device_count);
-HYPRE_Int hypre_GetDeviceLastError();
-HYPRE_Int hypre_UmpireInit(hypre_Handle *hypre_handle_);
-HYPRE_Int hypre_UmpireFinalize(hypre_Handle *hypre_handle_);
+HYPRE_Int hypre_GetDeviceLastError(void);
+HYPRE_Int hypre_GetDeviceMaxShmemSize(hypre_int device_id, hypre_int *max_size_ptr,
+                                      hypre_int *max_size_optin_ptr);
+
+/* matrix_stats.h */
+hypre_MatrixStats* hypre_MatrixStatsCreate( void );
+HYPRE_Int hypre_MatrixStatsDestroy( hypre_MatrixStats *stats );
+hypre_MatrixStatsArray* hypre_MatrixStatsArrayCreate( HYPRE_Int capacity );
+HYPRE_Int hypre_MatrixStatsArrayDestroy( hypre_MatrixStatsArray *stats_array );
+HYPRE_Int hypre_MatrixStatsArrayPrint( HYPRE_Int num_hierarchies, HYPRE_Int *num_levels,
+                                       HYPRE_Int use_divisors, HYPRE_Int shift,
+                                       const char **messages,
+                                       hypre_MatrixStatsArray *stats_array );
 
 /* qsort.c */
-void hypre_swap ( HYPRE_Int *v , HYPRE_Int i , HYPRE_Int j );
-void hypre_swap_c ( HYPRE_Complex *v , HYPRE_Int i , HYPRE_Int j );
-void hypre_swap2 ( HYPRE_Int *v , HYPRE_Real *w , HYPRE_Int i , HYPRE_Int j );
-void hypre_BigSwap2 ( HYPRE_BigInt *v , HYPRE_Real *w , HYPRE_Int i , HYPRE_Int j );
-void hypre_swap2i ( HYPRE_Int *v , HYPRE_Int *w , HYPRE_Int i , HYPRE_Int j );
-void hypre_BigSwap2i ( HYPRE_BigInt *v , HYPRE_Int *w , HYPRE_Int i , HYPRE_Int j );
-void hypre_swap3i ( HYPRE_Int *v , HYPRE_Int *w , HYPRE_Int *z , HYPRE_Int i , HYPRE_Int j );
-void hypre_swap3_d ( HYPRE_Real *v , HYPRE_Int *w , HYPRE_Int *z , HYPRE_Int i , HYPRE_Int j );
+void hypre_swap ( HYPRE_Int *v, HYPRE_Int i, HYPRE_Int j );
+void hypre_swap_c ( HYPRE_Complex *v, HYPRE_Int i, HYPRE_Int j );
+void hypre_swap2 ( HYPRE_Int *v, HYPRE_Real *w, HYPRE_Int i, HYPRE_Int j );
+void hypre_BigSwap2 ( HYPRE_BigInt *v, HYPRE_Real *w, HYPRE_Int i, HYPRE_Int j );
+void hypre_swap2i ( HYPRE_Int *v, HYPRE_Int *w, HYPRE_Int i, HYPRE_Int j );
+void hypre_BigSwap2i ( HYPRE_BigInt *v, HYPRE_Int *w, HYPRE_Int i, HYPRE_Int j );
+void hypre_swap3i ( HYPRE_Int *v, HYPRE_Int *w, HYPRE_Int *z, HYPRE_Int i, HYPRE_Int j );
+void hypre_swap3_d ( HYPRE_Real *v, HYPRE_Int *w, HYPRE_Int *z, HYPRE_Int i, HYPRE_Int j );
 void hypre_swap3_d_perm(HYPRE_Int  *v, HYPRE_Real  *w, HYPRE_Int  *z, HYPRE_Int  i, HYPRE_Int  j );
-void hypre_BigSwap4_d ( HYPRE_Real *v , HYPRE_BigInt *w , HYPRE_Int *z , HYPRE_Int *y , HYPRE_Int i , HYPRE_Int j );
-void hypre_swap_d ( HYPRE_Real *v , HYPRE_Int i , HYPRE_Int j );
-void hypre_qsort0 ( HYPRE_Int *v , HYPRE_Int left , HYPRE_Int right );
-void hypre_qsort1 ( HYPRE_Int *v , HYPRE_Real *w , HYPRE_Int left , HYPRE_Int right );
-void hypre_BigQsort1 ( HYPRE_BigInt *v , HYPRE_Real *w , HYPRE_Int left , HYPRE_Int right );
-void hypre_qsort2i ( HYPRE_Int *v , HYPRE_Int *w , HYPRE_Int left , HYPRE_Int right );
+void hypre_BigSwap4_d ( HYPRE_Real *v, HYPRE_BigInt *w, HYPRE_Int *z, HYPRE_Int *y, HYPRE_Int i,
+                        HYPRE_Int j );
+void hypre_swap_d ( HYPRE_Real *v, HYPRE_Int i, HYPRE_Int j );
+void hypre_qsort0 ( HYPRE_Int *v, HYPRE_Int left, HYPRE_Int right );
+void hypre_qsort1 ( HYPRE_Int *v, HYPRE_Real *w, HYPRE_Int left, HYPRE_Int right );
+void hypre_BigQsort1 ( HYPRE_BigInt *v, HYPRE_Real *w, HYPRE_Int left, HYPRE_Int right );
+void hypre_qsort2i ( HYPRE_Int *v, HYPRE_Int *w, HYPRE_Int left, HYPRE_Int right );
 void hypre_BigQsort2i( HYPRE_BigInt *v, HYPRE_Int *w, HYPRE_Int  left, HYPRE_Int  right );
-void hypre_qsort2 ( HYPRE_Int *v , HYPRE_Real *w , HYPRE_Int left , HYPRE_Int right );
-void hypre_qsort2_abs ( HYPRE_Int *v , HYPRE_Real *w , HYPRE_Int left , HYPRE_Int right );
-void hypre_qsort3i ( HYPRE_Int *v , HYPRE_Int *w , HYPRE_Int *z , HYPRE_Int left , HYPRE_Int right );
-void hypre_qsort3ir ( HYPRE_Int *v , HYPRE_Real *w , HYPRE_Int *z , HYPRE_Int left , HYPRE_Int right );
+void hypre_qsort2 ( HYPRE_Int *v, HYPRE_Real *w, HYPRE_Int left, HYPRE_Int right );
+void hypre_qsort2_abs ( HYPRE_Int *v, HYPRE_Real *w, HYPRE_Int left, HYPRE_Int right );
+void hypre_qsort3i ( HYPRE_Int *v, HYPRE_Int *w, HYPRE_Int *z, HYPRE_Int left, HYPRE_Int right );
+void hypre_qsort3ir ( HYPRE_Int *v, HYPRE_Real *w, HYPRE_Int *z, HYPRE_Int left, HYPRE_Int right );
 void hypre_qsort3( HYPRE_Real *v, HYPRE_Int *w, HYPRE_Int *z, HYPRE_Int  left, HYPRE_Int  right );
-void hypre_qsort3_abs ( HYPRE_Real *v , HYPRE_Int *w , HYPRE_Int *z , HYPRE_Int left , HYPRE_Int right );
-void hypre_BigQsort4_abs ( HYPRE_Real *v , HYPRE_BigInt *w , HYPRE_Int *z , HYPRE_Int *y , HYPRE_Int left , HYPRE_Int right );
-void hypre_qsort_abs ( HYPRE_Real *w , HYPRE_Int left , HYPRE_Int right );
+void hypre_qsort3_abs ( HYPRE_Real *v, HYPRE_Int *w, HYPRE_Int *z, HYPRE_Int left,
+                        HYPRE_Int right );
+void hypre_BigQsort4_abs ( HYPRE_Real *v, HYPRE_BigInt *w, HYPRE_Int *z, HYPRE_Int *y,
+                           HYPRE_Int left, HYPRE_Int right );
+void hypre_qsort_abs ( HYPRE_Real *w, HYPRE_Int left, HYPRE_Int right );
 void hypre_BigSwapbi(HYPRE_BigInt  *v, HYPRE_Int  *w, HYPRE_Int  i, HYPRE_Int  j );
 void hypre_BigQsortbi( HYPRE_BigInt *v, HYPRE_Int *w, HYPRE_Int  left, HYPRE_Int  right );
 void hypre_BigSwapLoc(HYPRE_BigInt  *v, HYPRE_Int  *w, HYPRE_Int  i, HYPRE_Int  j );
 void hypre_BigQsortbLoc( HYPRE_BigInt *v, HYPRE_Int *w, HYPRE_Int  left, HYPRE_Int  right );
 void hypre_BigSwapb2i(HYPRE_BigInt  *v, HYPRE_Int  *w, HYPRE_Int  *z, HYPRE_Int  i, HYPRE_Int  j );
-void hypre_BigQsortb2i( HYPRE_BigInt *v, HYPRE_Int *w, HYPRE_Int *z, HYPRE_Int  left, HYPRE_Int  right );
+void hypre_BigQsortb2i( HYPRE_BigInt *v, HYPRE_Int *w, HYPRE_Int *z, HYPRE_Int  left,
+                        HYPRE_Int  right );
 void hypre_BigSwap( HYPRE_BigInt *v, HYPRE_Int  i, HYPRE_Int  j );
 void hypre_BigQsort0( HYPRE_BigInt *v, HYPRE_Int  left, HYPRE_Int  right );
-void hypre_topo_sort(const HYPRE_Int *row_ptr, const HYPRE_Int *col_inds, const HYPRE_Complex *data, HYPRE_Int *ordering, HYPRE_Int n);
-void hypre_dense_topo_sort(const HYPRE_Complex *L, HYPRE_Int *ordering, HYPRE_Int n, HYPRE_Int is_col_major);
+void hypre_topo_sort(const HYPRE_Int *row_ptr, const HYPRE_Int *col_inds, const HYPRE_Complex *data,
+                     HYPRE_Int *ordering, HYPRE_Int n);
+void hypre_dense_topo_sort(const HYPRE_Complex *L, HYPRE_Int *ordering, HYPRE_Int n,
+                           HYPRE_Int is_col_major);
 
 /* qsplit.c */
-HYPRE_Int hypre_DoubleQuickSplit ( HYPRE_Real *values , HYPRE_Int *indices , HYPRE_Int list_length , HYPRE_Int NumberKept );
+HYPRE_Int hypre_DoubleQuickSplit ( HYPRE_Real *values, HYPRE_Int *indices, HYPRE_Int list_length,
+                                   HYPRE_Int NumberKept );
 
 /* random.c */
 /* HYPRE_CUDA_GLOBAL */ void hypre_SeedRand ( HYPRE_Int seed );
@@ -113,12 +138,14 @@ void hypre_prefix_sum(HYPRE_Int *in_out, HYPRE_Int *sum, HYPRE_Int *workspace);
  *                  workspace[2*tid] and workspace[2*tid+1] will contain results for tid
  *                  workspace[3*nthreads] and workspace[3*nthreads + 1] will contain sums
  */
-void hypre_prefix_sum_pair(HYPRE_Int *in_out1, HYPRE_Int *sum1, HYPRE_Int *in_out2, HYPRE_Int *sum2, HYPRE_Int *workspace);
+void hypre_prefix_sum_pair(HYPRE_Int *in_out1, HYPRE_Int *sum1, HYPRE_Int *in_out2, HYPRE_Int *sum2,
+                           HYPRE_Int *workspace);
 /**
  * @param workspace at least with length 3*(nthreads+1)
  *                  workspace[3*tid:3*tid+3) will contain results for tid
  */
-void hypre_prefix_sum_triple(HYPRE_Int *in_out1, HYPRE_Int *sum1, HYPRE_Int *in_out2, HYPRE_Int *sum2, HYPRE_Int *in_out3, HYPRE_Int *sum3, HYPRE_Int *workspace);
+void hypre_prefix_sum_triple(HYPRE_Int *in_out1, HYPRE_Int *sum1, HYPRE_Int *in_out2,
+                             HYPRE_Int *sum2, HYPRE_Int *in_out3, HYPRE_Int *sum3, HYPRE_Int *workspace);
 
 /**
  * n prefix-sums together.
@@ -127,7 +154,8 @@ void hypre_prefix_sum_triple(HYPRE_Int *in_out1, HYPRE_Int *sum1, HYPRE_Int *in_
  *
  * @param workspace at least with length n*(nthreads+1)
  */
-void hypre_prefix_sum_multiple(HYPRE_Int *in_out, HYPRE_Int *sum, HYPRE_Int n, HYPRE_Int *workspace);
+void hypre_prefix_sum_multiple(HYPRE_Int *in_out, HYPRE_Int *sum, HYPRE_Int n,
+                               HYPRE_Int *workspace);
 
 /* hopscotch_hash.c */
 
@@ -146,7 +174,7 @@ void hypre_prefix_sum_multiple(HYPRE_Int *in_out, HYPRE_Int *sum, HYPRE_Int n, H
 
 #endif // HYPRE_USING_OPENMP
 
-#ifdef HYPRE_HOPSCOTCH
+#ifdef HYPRE_USING_HOPSCOTCH
 #ifdef HYPRE_USING_ATOMIC
 // concurrent hopscotch hashing is possible only with atomic supports
 #define HYPRE_CONCURRENT_HOPSCOTCH
@@ -156,8 +184,8 @@ void hypre_prefix_sum_multiple(HYPRE_Int *in_out, HYPRE_Int *sum, HYPRE_Int n, H
 #ifdef HYPRE_CONCURRENT_HOPSCOTCH
 typedef struct
 {
-  HYPRE_Int volatile timestamp;
-  omp_lock_t         lock;
+   HYPRE_Int volatile timestamp;
+   omp_lock_t         lock;
 } hypre_HopscotchSegment;
 #endif
 
@@ -197,18 +225,18 @@ typedef struct
 
 typedef struct
 {
-  hypre_uint volatile hopInfo;
-  HYPRE_Int  volatile hash;
-  HYPRE_Int  volatile key;
-  HYPRE_Int  volatile data;
+   hypre_uint volatile hopInfo;
+   HYPRE_Int  volatile hash;
+   HYPRE_Int  volatile key;
+   HYPRE_Int  volatile data;
 } hypre_HopscotchBucket;
 
 typedef struct
 {
-  hypre_uint volatile hopInfo;
-  HYPRE_BigInt  volatile hash;
-  HYPRE_BigInt  volatile key;
-  HYPRE_Int  volatile data;
+   hypre_uint volatile hopInfo;
+   HYPRE_BigInt  volatile hash;
+   HYPRE_BigInt  volatile key;
+   HYPRE_Int  volatile data;
 } hypre_BigHopscotchBucket;
 
 /**
@@ -243,49 +271,124 @@ typedef struct
  * 1) Merge sort can take advantage of eliminating duplicates.
  * 2) Merge sort is more efficiently parallelizable than qsort
  */
-HYPRE_Int hypre_MergeOrderedArrays( HYPRE_Int size1 , HYPRE_Int *array1 , HYPRE_Int size2 , HYPRE_Int *array2 , HYPRE_Int *size3_ptr , HYPRE_Int **array3_ptr);
-void hypre_union2(HYPRE_Int n1, HYPRE_BigInt *arr1, HYPRE_Int n2, HYPRE_BigInt *arr2, HYPRE_Int *n3, HYPRE_BigInt *arr3, HYPRE_Int *map1, HYPRE_Int *map2);
+HYPRE_Int hypre_IntArrayMergeOrdered( hypre_IntArray *array1, hypre_IntArray *array2,
+                                      hypre_IntArray *array3 );
+void hypre_union2(HYPRE_Int n1, HYPRE_BigInt *arr1, HYPRE_Int n2, HYPRE_BigInt *arr2, HYPRE_Int *n3,
+                  HYPRE_BigInt *arr3, HYPRE_Int *map1, HYPRE_Int *map2);
 void hypre_merge_sort(HYPRE_Int *in, HYPRE_Int *temp, HYPRE_Int len, HYPRE_Int **sorted);
-void hypre_big_merge_sort(HYPRE_BigInt *in, HYPRE_BigInt *temp, HYPRE_Int len, HYPRE_BigInt **sorted);
-void hypre_sort_and_create_inverse_map(HYPRE_Int *in, HYPRE_Int len, HYPRE_Int **out, hypre_UnorderedIntMap *inverse_map);
-void hypre_big_sort_and_create_inverse_map(HYPRE_BigInt *in, HYPRE_Int len, HYPRE_BigInt **out, hypre_UnorderedBigIntMap *inverse_map);
+void hypre_big_merge_sort(HYPRE_BigInt *in, HYPRE_BigInt *temp, HYPRE_Int len,
+                          HYPRE_BigInt **sorted);
+void hypre_sort_and_create_inverse_map(HYPRE_Int *in, HYPRE_Int len, HYPRE_Int **out,
+                                       hypre_UnorderedIntMap *inverse_map);
+void hypre_big_sort_and_create_inverse_map(HYPRE_BigInt *in, HYPRE_Int len, HYPRE_BigInt **out,
+                                           hypre_UnorderedBigIntMap *inverse_map);
 
+/* device_utils.c */
 #if defined(HYPRE_USING_GPU)
-HYPRE_Int hypre_SyncCudaComputeStream(hypre_Handle *hypre_handle);
-HYPRE_Int hypre_SyncCudaDevice(hypre_Handle *hypre_handle);
-HYPRE_Int hypre_ResetCudaDevice(hypre_Handle *hypre_handle);
-HYPRE_Int hypreDevice_DiagScaleVector(HYPRE_Int n, HYPRE_Int *A_i, HYPRE_Complex *A_data, HYPRE_Complex *x, HYPRE_Complex beta, HYPRE_Complex *y);
-HYPRE_Int hypreDevice_DiagScaleVector2(HYPRE_Int n, HYPRE_Int *A_i, HYPRE_Complex *A_data, HYPRE_Complex *x, HYPRE_Complex beta, HYPRE_Complex *y, HYPRE_Complex *z);
+HYPRE_Int hypre_DeviceMemoryGetUsage(HYPRE_Real *mem);
+HYPRE_Int hypre_ForceSyncComputeStream();
+HYPRE_Int hypre_SyncComputeStream();
+HYPRE_Int hypre_SyncDevice();
+HYPRE_Int hypre_ResetDevice();
+
+HYPRE_Int hypreDevice_DiagScaleVector(HYPRE_Int num_vectors, HYPRE_Int num_rows,
+                                      HYPRE_Int *A_i, HYPRE_Complex *A_data,
+                                      HYPRE_Complex *x, HYPRE_Complex beta,
+                                      HYPRE_Complex *y);
+HYPRE_Int hypreDevice_DiagScaleVector2(HYPRE_Int num_vectors, HYPRE_Int num_rows,
+                                       HYPRE_Complex *diag, HYPRE_Complex *x,
+                                       HYPRE_Complex beta, HYPRE_Complex *y,
+                                       HYPRE_Complex *z, HYPRE_Int computeY);
+HYPRE_Int hypreDevice_ComplexArrayToArrayOfPtrs(HYPRE_Int n, HYPRE_Int m,
+                                                HYPRE_Complex *data, HYPRE_Complex **data_aop);
+HYPRE_Int hypreDevice_zeqxmydd(HYPRE_Int n, HYPRE_Complex *x, HYPRE_Complex alpha,
+                               HYPRE_Complex *y, HYPRE_Complex *z, HYPRE_Complex *d);
 HYPRE_Int hypreDevice_IVAXPY(HYPRE_Int n, HYPRE_Complex *a, HYPRE_Complex *x, HYPRE_Complex *y);
-HYPRE_Int hypreDevice_IVAXPYMarked(HYPRE_Int n, HYPRE_Complex *a, HYPRE_Complex *x, HYPRE_Complex *y, HYPRE_Int *marker, HYPRE_Int marker_val);
+HYPRE_Int hypreDevice_IVAXPYMarked(HYPRE_Int n, HYPRE_Complex *a, HYPRE_Complex *x,
+                                   HYPRE_Complex *y, HYPRE_Int *marker, HYPRE_Int marker_val);
+HYPRE_Int hypreDevice_IVAMXPMY(HYPRE_Int m, HYPRE_Int n, HYPRE_Complex *a,
+                               HYPRE_Complex *x, HYPRE_Complex *y);
+HYPRE_Int hypreDevice_IntFilln(HYPRE_Int *d_x, size_t n, HYPRE_Int v);
 HYPRE_Int hypreDevice_BigIntFilln(HYPRE_BigInt *d_x, size_t n, HYPRE_BigInt v);
-HYPRE_Int hypreDevice_Filln(HYPRE_Complex *d_x, size_t n, HYPRE_Complex v);
-HYPRE_Int hypreDevice_Scalen(HYPRE_Complex *d_x, size_t n, HYPRE_Complex v);
+HYPRE_Int hypreDevice_ComplexFilln(HYPRE_Complex *d_x, size_t n, HYPRE_Complex v);
+HYPRE_Int hypreDevice_CharFilln(char *d_x, size_t n, char v);
+HYPRE_Int hypreDevice_IntStridedCopy ( HYPRE_Int size, HYPRE_Int stride,
+                                       HYPRE_Int *in, HYPRE_Int *out );
+HYPRE_Int hypreDevice_ComplexStridedCopy ( HYPRE_Int size, HYPRE_Int stride,
+                                           HYPRE_Complex *in, HYPRE_Complex *out );
+HYPRE_Int hypreDevice_IntScalen(HYPRE_Int *d_x, size_t n, HYPRE_Int *d_y, HYPRE_Int v);
+HYPRE_Int hypreDevice_ComplexScalen(HYPRE_Complex *d_x, size_t n, HYPRE_Complex *d_y,
+                                    HYPRE_Complex v);
+HYPRE_Int hypreDevice_ComplexAxpyn(HYPRE_Complex *d_x, size_t n, HYPRE_Complex *d_y,
+                                   HYPRE_Complex *d_z, HYPRE_Complex a);
+HYPRE_Int hypreDevice_ComplexAxpyzn(HYPRE_Int n, HYPRE_Complex *d_x, HYPRE_Complex *d_y,
+                                    HYPRE_Complex *d_z, HYPRE_Complex a, HYPRE_Complex b);
+HYPRE_Int hypreDevice_IntAxpyn(HYPRE_Int *d_x, size_t n, HYPRE_Int *d_y, HYPRE_Int *d_z,
+                               HYPRE_Int a);
+HYPRE_Int hypreDevice_BigIntAxpyn(HYPRE_BigInt *d_x, size_t n, HYPRE_BigInt *d_y,
+                                  HYPRE_BigInt *d_z, HYPRE_BigInt a);
+HYPRE_Int* hypreDevice_CsrRowPtrsToIndices(HYPRE_Int nrows, HYPRE_Int nnz, HYPRE_Int *d_row_ptr);
+HYPRE_Int hypreDevice_CsrRowPtrsToIndices_v2(HYPRE_Int nrows, HYPRE_Int nnz, HYPRE_Int *d_row_ptr,
+                                             HYPRE_Int *d_row_ind);
+HYPRE_Int* hypreDevice_CsrRowIndicesToPtrs(HYPRE_Int nrows, HYPRE_Int nnz, HYPRE_Int *d_row_ind);
+HYPRE_Int hypreDevice_CsrRowIndicesToPtrs_v2(HYPRE_Int nrows, HYPRE_Int nnz, HYPRE_Int *d_row_ind,
+                                             HYPRE_Int *d_row_ptr);
+HYPRE_Int hypreDevice_GetRowNnz(HYPRE_Int nrows, HYPRE_Int *d_row_indices, HYPRE_Int *d_diag_ia,
+                                HYPRE_Int *d_offd_ia, HYPRE_Int *d_rownnz);
+HYPRE_Int hypreDevice_CopyParCSRRows(HYPRE_Int nrows, HYPRE_Int *d_row_indices, HYPRE_Int job,
+                                     HYPRE_Int has_offd, HYPRE_BigInt first_col,
+                                     HYPRE_BigInt *d_col_map_offd_A, HYPRE_Int *d_diag_i,
+                                     HYPRE_Int *d_diag_j, HYPRE_Complex *d_diag_a,
+                                     HYPRE_Int *d_offd_i, HYPRE_Int *d_offd_j,
+                                     HYPRE_Complex *d_offd_a, HYPRE_Int *d_ib,
+                                     HYPRE_BigInt *d_jb, HYPRE_Complex *d_ab);
+HYPRE_Int hypreDevice_IntegerReduceSum(HYPRE_Int m, HYPRE_Int *d_i);
+HYPRE_Complex hypreDevice_ComplexReduceSum(HYPRE_Int m, HYPRE_Complex *d_x);
+HYPRE_Int hypreDevice_IntegerInclusiveScan(HYPRE_Int n, HYPRE_Int *d_i);
+HYPRE_Int hypreDevice_IntegerExclusiveScan(HYPRE_Int n, HYPRE_Int *d_i);
+HYPRE_Int hypre_CudaCompileFlagCheck(void);
 #endif
 
-HYPRE_Int hypre_CurandUniform( HYPRE_Int n, HYPRE_Real *urand, HYPRE_Int set_seed, hypre_ulonglongint seed, HYPRE_Int set_offset, hypre_ulonglongint offset);
-HYPRE_Int hypre_CurandUniformSingle( HYPRE_Int n, float *urand, HYPRE_Int set_seed, hypre_ulonglongint seed, HYPRE_Int set_offset, hypre_ulonglongint offset);
+HYPRE_Int hypre_CurandUniform( HYPRE_Int n, HYPRE_Real *urand, HYPRE_Int set_seed,
+                               hypre_ulonglongint seed, HYPRE_Int set_offset, hypre_ulonglongint offset);
+HYPRE_Int hypre_CurandUniformSingle( HYPRE_Int n, float *urand, HYPRE_Int set_seed,
+                                     hypre_ulonglongint seed, HYPRE_Int set_offset, hypre_ulonglongint offset);
+
+HYPRE_Int hypre_ResetDeviceRandGenerator( hypre_ulonglongint seed, hypre_ulonglongint offset );
 
+HYPRE_Int hypre_bind_device_id(HYPRE_Int device_id_in, HYPRE_Int myid,
+                               HYPRE_Int nproc, MPI_Comm comm);
 HYPRE_Int hypre_bind_device(HYPRE_Int myid, HYPRE_Int nproc, MPI_Comm comm);
 
+/* stl_ops.c */
+HYPRE_Int hypre_IntSequence(HYPRE_MemoryLocation memory_location, HYPRE_Int size, HYPRE_Int *data);
+
 /* nvtx.c */
 void hypre_GpuProfilingPushRangeColor(const char *name, HYPRE_Int cid);
 void hypre_GpuProfilingPushRange(const char *name);
-void hypre_GpuProfilingPopRange();
+void hypre_GpuProfilingPopRange(void);
 
 /* utilities.c */
 HYPRE_Int hypre_multmod(HYPRE_Int a, HYPRE_Int b, HYPRE_Int mod);
 void hypre_partition1D(HYPRE_Int n, HYPRE_Int p, HYPRE_Int j, HYPRE_Int *s, HYPRE_Int *e);
 char *hypre_strcpy(char *destination, const char *source);
+HYPRE_Int hypre_CheckDirExists(const char *path);
+HYPRE_Int hypre_CreateDir(const char *path);
+HYPRE_Int hypre_CreateNextDirOfSequence(const char *basepath, const char *prefix,
+                                        char **fullpath_ptr);
+char* hypre_ConvertIndicesToString(HYPRE_Int size, HYPRE_Int *indices);
 
 HYPRE_Int hypre_SetSyncCudaCompute(HYPRE_Int action);
-HYPRE_Int hypre_RestoreSyncCudaCompute();
+HYPRE_Int hypre_RestoreSyncCudaCompute(void);
 HYPRE_Int hypre_GetSyncCudaCompute(HYPRE_Int *cuda_compute_stream_sync_ptr);
-HYPRE_Int hypre_SyncCudaComputeStream(hypre_Handle *hypre_handle);
 
 /* handle.c */
-HYPRE_Int hypre_SetSpGemmUseCusparse( HYPRE_Int use_cusparse );
+HYPRE_Int hypre_SetLogLevel( HYPRE_Int log_level );
+HYPRE_Int hypre_SetSpTransUseVendor( HYPRE_Int use_vendor );
+HYPRE_Int hypre_SetSpMVUseVendor( HYPRE_Int use_vendor );
+HYPRE_Int hypre_SetSpGemmUseVendor( HYPRE_Int use_vendor );
 HYPRE_Int hypre_SetSpGemmAlgorithm( HYPRE_Int value );
+HYPRE_Int hypre_SetSpGemmBinned( HYPRE_Int value );
 HYPRE_Int hypre_SetSpGemmRownnzEstimateMethod( HYPRE_Int value );
 HYPRE_Int hypre_SetSpGemmRownnzEstimateNSamples( HYPRE_Int value );
 HYPRE_Int hypre_SetSpGemmRownnzEstimateMultFactor( HYPRE_Real value );
@@ -294,13 +397,76 @@ HYPRE_Int hypre_SetUseGpuRand( HYPRE_Int use_gpurand );
 HYPRE_Int hypre_SetGaussSeidelMethod( HYPRE_Int gs_method );
 HYPRE_Int hypre_SetUserDeviceMalloc(GPUMallocFunc func);
 HYPRE_Int hypre_SetUserDeviceMfree(GPUMfreeFunc func);
+HYPRE_Int hypre_SetGpuAwareMPI( HYPRE_Int use_gpu_aware_mpi );
+HYPRE_Int hypre_GetGpuAwareMPI(void);
 
 /* int_array.c */
 hypre_IntArray* hypre_IntArrayCreate( HYPRE_Int size );
 HYPRE_Int hypre_IntArrayDestroy( hypre_IntArray *array );
-HYPRE_Int hypre_IntArrayInitialize_v2( hypre_IntArray *array, HYPRE_MemoryLocation memory_location );
+HYPRE_Int hypre_IntArrayInitialize_v2( hypre_IntArray *array,
+                                       HYPRE_MemoryLocation memory_location );
 HYPRE_Int hypre_IntArrayInitialize( hypre_IntArray *array );
 HYPRE_Int hypre_IntArrayCopy( hypre_IntArray *x, hypre_IntArray *y );
-hypre_IntArray* hypre_IntArrayCloneDeep_v2( hypre_IntArray *x, HYPRE_MemoryLocation memory_location );
+hypre_IntArray* hypre_IntArrayCloneDeep_v2( hypre_IntArray *x,
+                                            HYPRE_MemoryLocation memory_location );
 hypre_IntArray* hypre_IntArrayCloneDeep( hypre_IntArray *x );
+HYPRE_Int hypre_IntArrayMigrate( hypre_IntArray *v, HYPRE_MemoryLocation memory_location );
+HYPRE_Int hypre_IntArrayPrint( MPI_Comm comm, hypre_IntArray *array, const char *filename );
+HYPRE_Int hypre_IntArrayRead( MPI_Comm comm, const char *filename, hypre_IntArray **array_ptr );
+HYPRE_Int hypre_IntArraySetConstantValuesHost( hypre_IntArray *v, HYPRE_Int value );
 HYPRE_Int hypre_IntArraySetConstantValues( hypre_IntArray *v, HYPRE_Int value );
+HYPRE_Int hypre_IntArraySetInterleavedValues( hypre_IntArray *v, HYPRE_Int cycle );
+HYPRE_Int hypre_IntArrayCountHost( hypre_IntArray *v, HYPRE_Int value,
+                                   HYPRE_Int *num_values_ptr );
+HYPRE_Int hypre_IntArrayCount( hypre_IntArray *v, HYPRE_Int value,
+                               HYPRE_Int *num_values_ptr );
+HYPRE_Int hypre_IntArrayInverseMapping( hypre_IntArray *v, hypre_IntArray **w_ptr );
+HYPRE_Int hypre_IntArrayNegate( hypre_IntArray *v );
+HYPRE_Int hypre_IntArraySeparateByValue( HYPRE_Int num_values, HYPRE_Int *values,
+                                         HYPRE_Int *sizes, hypre_IntArray *v,
+                                         hypre_IntArrayArray **w_ptr );
+hypre_IntArrayArray* hypre_IntArrayArrayCreate( HYPRE_Int num_entries, HYPRE_Int *sizes );
+HYPRE_Int hypre_IntArrayArrayDestroy( hypre_IntArrayArray *w );
+HYPRE_Int hypre_IntArrayArrayInitializeIn( hypre_IntArrayArray *w,
+                                           HYPRE_MemoryLocation  memory_location );
+HYPRE_Int hypre_IntArrayArrayInitialize( hypre_IntArrayArray *w );
+HYPRE_Int hypre_IntArrayArrayMigrate( hypre_IntArrayArray *w,
+                                      HYPRE_MemoryLocation memory_location );
+
+/* int_array_device.c */
+#if defined(HYPRE_USING_GPU) || defined(HYPRE_USING_DEVICE_OPENMP)
+HYPRE_Int hypre_IntArraySetConstantValuesDevice( hypre_IntArray *v, HYPRE_Int value );
+HYPRE_Int hypre_IntArrayCountDevice ( hypre_IntArray *v, HYPRE_Int value,
+                                      HYPRE_Int *num_values_ptr );
+HYPRE_Int hypre_IntArrayInverseMappingDevice( hypre_IntArray *v, hypre_IntArray *w );
+HYPRE_Int hypre_IntArrayNegateDevice( hypre_IntArray *v );
+HYPRE_Int hypre_IntArraySetInterleavedValuesDevice( hypre_IntArray *v, HYPRE_Int cycle );
+HYPRE_Int hypre_IntArraySeparateByValueDevice( HYPRE_Int num_values, HYPRE_Int *values,
+                                               HYPRE_Int *sizes, hypre_IntArray *v,
+                                               hypre_IntArrayArray *w );
+#endif
+
+/* memory_tracker.c */
+#ifdef HYPRE_USING_MEMORY_TRACKER
+hypre_MemoryTracker* hypre_memory_tracker(void);
+hypre_MemoryTracker * hypre_MemoryTrackerCreate(void);
+void hypre_MemoryTrackerDestroy(hypre_MemoryTracker *tracker);
+void hypre_MemoryTrackerInsert1(const char *action, void *ptr, size_t nbytes,
+                                hypre_MemoryLocation memory_location, const char *filename,
+                                const char *function, HYPRE_Int line);
+void hypre_MemoryTrackerInsert2(const char *action, void *ptr, void *ptr2, size_t nbytes,
+                                hypre_MemoryLocation memory_location,
+                                hypre_MemoryLocation memory_location2,
+                                const char *filename,
+                                const char *function, HYPRE_Int line);
+HYPRE_Int hypre_PrintMemoryTracker( size_t *totl_bytes_o, size_t *peak_bytes_o,
+                                    size_t *curr_bytes_o, HYPRE_Int do_print, const char *fname );
+HYPRE_Int hypre_MemoryTrackerSetPrint(HYPRE_Int do_print);
+HYPRE_Int hypre_MemoryTrackerSetFileName(const char *file_name);
+#endif
+
+/* magma.c */
+#if defined(HYPRE_USING_MAGMA)
+HYPRE_Int hypre_MagmaInitialize(void);
+HYPRE_Int hypre_MagmaFinalize(void);
+#endif
diff --git a/external/hypre/src/utilities/qsort.c b/external/hypre/src/utilities/qsort.c
index 7a8d564c..1b03d00a 100644
--- a/external/hypre/src/utilities/qsort.c
+++ b/external/hypre/src/utilities/qsort.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -232,9 +232,9 @@ void hypre_qsort0( HYPRE_Int *v,
    {
       return;
    }
-   hypre_swap(v, left, (left+right)/2);
+   hypre_swap(v, left, (left + right) / 2);
    last = left;
-   for (i = left+1; i <= right; i++)
+   for (i = left + 1; i <= right; i++)
    {
       if (v[i] < v[left])
       {
@@ -242,8 +242,8 @@ void hypre_qsort0( HYPRE_Int *v,
       }
    }
    hypre_swap(v, left, last);
-   hypre_qsort0(v, left, last-1);
-   hypre_qsort0(v, last+1, right);
+   hypre_qsort0(v, left, last - 1);
+   hypre_qsort0(v, last + 1, right);
 }
 
 /*--------------------------------------------------------------------------
@@ -260,9 +260,9 @@ void hypre_qsort1( HYPRE_Int  *v,
    {
       return;
    }
-   hypre_swap2( v, w, left, (left+right)/2);
+   hypre_swap2( v, w, left, (left + right) / 2);
    last = left;
-   for (i = left+1; i <= right; i++)
+   for (i = left + 1; i <= right; i++)
    {
       if (v[i] < v[left])
       {
@@ -270,8 +270,8 @@ void hypre_qsort1( HYPRE_Int  *v,
       }
    }
    hypre_swap2(v, w, left, last);
-   hypre_qsort1(v, w, left, last-1);
-   hypre_qsort1(v, w, last+1, right);
+   hypre_qsort1(v, w, left, last - 1);
+   hypre_qsort1(v, w, last + 1, right);
 }
 
 /*--------------------------------------------------------------------------
@@ -288,9 +288,9 @@ void hypre_BigQsort1( HYPRE_BigInt *v,
    {
       return;
    }
-   hypre_BigSwap2(v, w, left, (left+right)/2);
+   hypre_BigSwap2(v, w, left, (left + right) / 2);
    last = left;
-   for (i = left+1; i <= right; i++)
+   for (i = left + 1; i <= right; i++)
    {
       if (v[i] < v[left])
       {
@@ -298,8 +298,8 @@ void hypre_BigQsort1( HYPRE_BigInt *v,
       }
    }
    hypre_BigSwap2(v, w, left, last);
-   hypre_BigQsort1(v, w, left, last-1);
-   hypre_BigQsort1(v, w, last+1, right);
+   hypre_BigQsort1(v, w, left, last - 1);
+   hypre_BigQsort1(v, w, last + 1, right);
 }
 
 /*--------------------------------------------------------------------------
@@ -316,9 +316,9 @@ void hypre_qsort2i( HYPRE_Int *v,
    {
       return;
    }
-   hypre_swap2i( v, w, left, (left+right)/2);
+   hypre_swap2i( v, w, left, (left + right) / 2);
    last = left;
-   for (i = left+1; i <= right; i++)
+   for (i = left + 1; i <= right; i++)
    {
       if (v[i] < v[left])
       {
@@ -326,17 +326,17 @@ void hypre_qsort2i( HYPRE_Int *v,
       }
    }
    hypre_swap2i(v, w, left, last);
-   hypre_qsort2i(v, w, left, last-1);
-   hypre_qsort2i(v, w, last+1, right);
+   hypre_qsort2i(v, w, left, last - 1);
+   hypre_qsort2i(v, w, last + 1, right);
 }
 
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
 
 void hypre_BigQsort2i( HYPRE_BigInt *v,
-                    HYPRE_Int *w,
-                    HYPRE_Int  left,
-                    HYPRE_Int  right )
+                       HYPRE_Int *w,
+                       HYPRE_Int  left,
+                       HYPRE_Int  right )
 {
    HYPRE_Int i, last;
 
@@ -344,9 +344,9 @@ void hypre_BigQsort2i( HYPRE_BigInt *v,
    {
       return;
    }
-   hypre_BigSwap2i( v, w, left, (left+right)/2);
+   hypre_BigSwap2i( v, w, left, (left + right) / 2);
    last = left;
-   for (i = left+1; i <= right; i++)
+   for (i = left + 1; i <= right; i++)
    {
       if (v[i] < v[left])
       {
@@ -354,8 +354,8 @@ void hypre_BigQsort2i( HYPRE_BigInt *v,
       }
    }
    hypre_BigSwap2i(v, w, left, last);
-   hypre_BigQsort2i(v, w, left, last-1);
-   hypre_BigQsort2i(v, w, last+1, right);
+   hypre_BigQsort2i(v, w, left, last - 1);
+   hypre_BigQsort2i(v, w, last + 1, right);
 }
 
 /*--------------------------------------------------------------------------
@@ -374,9 +374,9 @@ void hypre_qsort2( HYPRE_Int  *v,
    {
       return;
    }
-   hypre_swap2( v, w, left, (left+right)/2);
+   hypre_swap2( v, w, left, (left + right) / 2);
    last = left;
-   for (i = left+1; i <= right; i++)
+   for (i = left + 1; i <= right; i++)
    {
       if (w[i] < w[left])
       {
@@ -384,8 +384,8 @@ void hypre_qsort2( HYPRE_Int  *v,
       }
    }
    hypre_swap2(v, w, left, last);
-   hypre_qsort2(v, w, left, last-1);
-   hypre_qsort2(v, w, last+1, right);
+   hypre_qsort2(v, w, left, last - 1);
+   hypre_qsort2(v, w, last + 1, right);
 }
 
 /*--------------------------------------------------------------------------
@@ -402,18 +402,18 @@ void hypre_qsort2_abs( HYPRE_Int  *v,
    {
       return;
    }
-   hypre_swap2( v, w, left, (left+right)/2);
+   hypre_swap2( v, w, left, (left + right) / 2);
    last = left;
-   for (i = left+1; i <= right; i++)
+   for (i = left + 1; i <= right; i++)
    {
-      if (fabs(w[i]) > fabs(w[left]))
+      if (hypre_abs(w[i]) > hypre_abs(w[left]))
       {
          hypre_swap2(v, w, ++last, i);
       }
    }
    hypre_swap2(v, w, left, last);
-   hypre_qsort2_abs(v, w, left, last-1);
-   hypre_qsort2_abs(v, w, last+1, right);
+   hypre_qsort2_abs(v, w, left, last - 1);
+   hypre_qsort2_abs(v, w, last + 1, right);
 }
 /*--------------------------------------------------------------------------
  *--------------------------------------------------------------------------*/
@@ -432,9 +432,9 @@ void hypre_qsort3i( HYPRE_Int *v,
    {
       return;
    }
-   hypre_swap3i( v, w, z, left, (left+right)/2);
+   hypre_swap3i( v, w, z, left, (left + right) / 2);
    last = left;
-   for (i = left+1; i <= right; i++)
+   for (i = left + 1; i <= right; i++)
    {
       if (v[i] < v[left])
       {
@@ -442,8 +442,8 @@ void hypre_qsort3i( HYPRE_Int *v,
       }
    }
    hypre_swap3i(v, w, z, left, last);
-   hypre_qsort3i(v, w, z, left, last-1);
-   hypre_qsort3i(v, w, z, last+1, right);
+   hypre_qsort3i(v, w, z, left, last - 1);
+   hypre_qsort3i(v, w, z, last + 1, right);
 }
 
 /* sort on v, move w and z DOK */
@@ -459,9 +459,9 @@ void hypre_qsort3ir( HYPRE_Int  *v,
    {
       return;
    }
-   hypre_swap3_d_perm( v, w, z, left, (left+right)/2);
+   hypre_swap3_d_perm( v, w, z, left, (left + right) / 2);
    last = left;
-   for (i = left+1; i <= right; i++)
+   for (i = left + 1; i <= right; i++)
    {
       if (v[i] < v[left])
       {
@@ -469,8 +469,8 @@ void hypre_qsort3ir( HYPRE_Int  *v,
       }
    }
    hypre_swap3_d_perm(v, w, z, left, last);
-   hypre_qsort3ir(v, w, z, left, last-1);
-   hypre_qsort3ir(v, w, z, last+1, right);
+   hypre_qsort3ir(v, w, z, left, last - 1);
+   hypre_qsort3ir(v, w, z, last + 1, right);
 }
 
 /*--------------------------------------------------------------------------
@@ -489,18 +489,18 @@ void hypre_qsort3( HYPRE_Real *v,
    {
       return;
    }
-   hypre_swap3_d( v, w, z, left, (left+right)/2);
+   hypre_swap3_d( v, w, z, left, (left + right) / 2);
    last = left;
-   for (i = left+1; i <= right; i++)
+   for (i = left + 1; i <= right; i++)
    {
       if (v[i] < v[left])
       {
-         hypre_swap3_d(v,w, z, ++last, i);
+         hypre_swap3_d(v, w, z, ++last, i);
       }
    }
    hypre_swap3_d(v, w, z, left, last);
-   hypre_qsort3(v, w, z, left, last-1);
-   hypre_qsort3(v, w, z, last+1, right);
+   hypre_qsort3(v, w, z, left, last - 1);
+   hypre_qsort3(v, w, z, last + 1, right);
 }
 
 /*--------------------------------------------------------------------------
@@ -520,18 +520,18 @@ void hypre_qsort3_abs(HYPRE_Real *v,
    {
       return;
    }
-   hypre_swap3_d( v, w, z, left, (left+right)/2);
+   hypre_swap3_d( v, w, z, left, (left + right) / 2);
    last = left;
-   for (i = left+1; i <= right; i++)
+   for (i = left + 1; i <= right; i++)
    {
-      if (fabs(v[i]) < fabs(v[left]))
+      if (hypre_abs(v[i]) < hypre_abs(v[left]))
       {
-         hypre_swap3_d(v,w, z, ++last, i);
+         hypre_swap3_d(v, w, z, ++last, i);
       }
    }
    hypre_swap3_d(v, w, z, left, last);
-   hypre_qsort3_abs(v, w, z, left, last-1);
-   hypre_qsort3_abs(v, w, z, last+1, right);
+   hypre_qsort3_abs(v, w, z, left, last - 1);
+   hypre_qsort3_abs(v, w, z, last + 1, right);
 }
 
 /*--------------------------------------------------------------------------
@@ -552,18 +552,18 @@ void hypre_BigQsort4_abs( HYPRE_Real   *v,
    {
       return;
    }
-   hypre_BigSwap4_d( v, w, z, y, left, (left+right)/2);
+   hypre_BigSwap4_d( v, w, z, y, left, (left + right) / 2);
    last = left;
-   for (i = left+1; i <= right; i++)
+   for (i = left + 1; i <= right; i++)
    {
-      if (fabs(v[i]) < fabs(v[left]))
+      if (hypre_abs(v[i]) < hypre_abs(v[left]))
       {
-         hypre_BigSwap4_d(v,w, z, y, ++last, i);
+         hypre_BigSwap4_d(v, w, z, y, ++last, i);
       }
    }
    hypre_BigSwap4_d(v, w, z, y, left, last);
-   hypre_BigQsort4_abs(v, w, z, y, left, last-1);
-   hypre_BigQsort4_abs(v, w, z, y, last+1, right);
+   hypre_BigQsort4_abs(v, w, z, y, left, last - 1);
+   hypre_BigQsort4_abs(v, w, z, y, last + 1, right);
 }
 
 /*--------------------------------------------------------------------------
@@ -580,18 +580,18 @@ void hypre_qsort_abs( HYPRE_Real *w,
    {
       return;
    }
-   hypre_swap_d( w, left, (left+right)/2);
+   hypre_swap_d( w, left, (left + right) / 2);
    last = left;
-   for (i = left+1; i <= right; i++)
+   for (i = left + 1; i <= right; i++)
    {
-      if (fabs(w[i]) < fabs(w[left]))
+      if (hypre_abs(w[i]) < hypre_abs(w[left]))
       {
          hypre_swap_d(w, ++last, i);
       }
    }
    hypre_swap_d(w, left, last);
-   hypre_qsort_abs(w, left, last-1);
-   hypre_qsort_abs(w, last+1, right);
+   hypre_qsort_abs(w, left, last - 1);
+   hypre_qsort_abs(w, last + 1, right);
 }
 
 
@@ -628,9 +628,9 @@ void hypre_BigQsortbi( HYPRE_BigInt *v,
    {
       return;
    }
-   hypre_BigSwapbi( v, w, left, (left+right)/2);
+   hypre_BigSwapbi( v, w, left, (left + right) / 2);
    last = left;
-   for (i = left+1; i <= right; i++)
+   for (i = left + 1; i <= right; i++)
    {
       if (v[i] < v[left])
       {
@@ -638,8 +638,8 @@ void hypre_BigQsortbi( HYPRE_BigInt *v,
       }
    }
    hypre_BigSwapbi(v, w, left, last);
-   hypre_BigQsortbi(v, w, left, last-1);
-   hypre_BigQsortbi(v, w, last+1, right);
+   hypre_BigQsortbi(v, w, left, last - 1);
+   hypre_BigQsortbi(v, w, last + 1, right);
 }
 
 /*--------------------------------------------------------------------------
@@ -673,9 +673,9 @@ void hypre_BigQsortbLoc( HYPRE_BigInt *v,
    {
       return;
    }
-   hypre_BigSwapLoc( v, w, left, (left+right)/2);
+   hypre_BigSwapLoc( v, w, left, (left + right) / 2);
    last = left;
-   for (i = left+1; i <= right; i++)
+   for (i = left + 1; i <= right; i++)
    {
       if (v[i] < v[left])
       {
@@ -683,8 +683,8 @@ void hypre_BigQsortbLoc( HYPRE_BigInt *v,
       }
    }
    hypre_BigSwapLoc(v, w, left, last);
-   hypre_BigQsortbLoc(v, w, left, last-1);
-   hypre_BigQsortbLoc(v, w, last+1, right);
+   hypre_BigQsortbLoc(v, w, left, last - 1);
+   hypre_BigQsortbLoc(v, w, last + 1, right);
 }
 
 /*--------------------------------------------------------------------------
@@ -726,9 +726,9 @@ void hypre_BigQsortb2i( HYPRE_BigInt *v,
    {
       return;
    }
-   hypre_BigSwapb2i( v, w, z, left, (left+right)/2);
+   hypre_BigSwapb2i( v, w, z, left, (left + right) / 2);
    last = left;
-   for (i = left+1; i <= right; i++)
+   for (i = left + 1; i <= right; i++)
    {
       if (v[i] < v[left])
       {
@@ -736,8 +736,8 @@ void hypre_BigQsortb2i( HYPRE_BigInt *v,
       }
    }
    hypre_BigSwapb2i(v, w, z, left, last);
-   hypre_BigQsortb2i(v, w, z, left, last-1);
-   hypre_BigQsortb2i(v, w, z, last+1, right);
+   hypre_BigQsortb2i(v, w, z, left, last - 1);
+   hypre_BigQsortb2i(v, w, z, last + 1, right);
 }
 
 /*--------------------------------------------------------------------------
@@ -767,9 +767,9 @@ void hypre_BigQsort0( HYPRE_BigInt *v,
    {
       return;
    }
-   hypre_BigSwap( v, left, (left+right)/2);
+   hypre_BigSwap( v, left, (left + right) / 2);
    last = left;
-   for (i = left+1; i <= right; i++)
+   for (i = left + 1; i <= right; i++)
    {
       if (v[i] < v[left])
       {
@@ -777,8 +777,8 @@ void hypre_BigQsort0( HYPRE_BigInt *v,
       }
    }
    hypre_BigSwap(v, left, last);
-   hypre_BigQsort0(v, left, last-1);
-   hypre_BigQsort0(v, last+1, right);
+   hypre_BigQsort0(v, left, last - 1);
+   hypre_BigQsort0(v, last + 1, right);
 }
 
 // Recursive DFS search.
@@ -796,11 +796,11 @@ static void hypre_search_row(HYPRE_Int            row,
    {
       HYPRE_Int j;
       visited[row] = 1;
-      for (j=row_ptr[row]; j<row_ptr[row+1]; j++)
+      for (j = row_ptr[row]; j < row_ptr[row + 1]; j++)
       {
          HYPRE_Int col = col_inds[j];
          hypre_search_row(col, row_ptr, col_inds, data,
-                         visited, ordering, order_ind);
+                          visited, ordering, order_ind);
       }
       // Add node to ordering *after* it has been searched
       ordering[*order_ind] = row;
@@ -854,18 +854,18 @@ static void hypre_dense_search_row(HYPRE_Int            row,
    {
       HYPRE_Int col;
       visited[row] = 1;
-      for (col=0; col<n; col++)
+      for (col = 0; col < n; col++)
       {
          HYPRE_Complex val;
          if (is_col_major)
          {
-            val = L[col*n + row];
+            val = L[col * n + row];
          }
          else
          {
-            val = L[row*n + col];
+            val = L[row * n + col];
          }
-         if (fabs(val) > 1e-14)
+         if (hypre_cabs(val) > 1e-14)
          {
             hypre_dense_search_row(col, L, visited, ordering, order_ind, n, is_col_major);
          }
diff --git a/external/hypre/src/utilities/qsplit.c b/external/hypre/src/utilities/qsplit.c
index bc990fc9..2c6382fb 100644
--- a/external/hypre/src/utilities/qsplit.c
+++ b/external/hypre/src/utilities/qsplit.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -7,17 +7,17 @@
 
 #include "_hypre_utilities.h"
 #include <math.h>
- 
+
 /*--------------------------------------------------------------------------
  * hypre_DoubleQuickSplit
  * C version of the routine "qsplit" from SPARSKIT
- * Uses a quicksort-type algorithm to split data into 
+ * Uses a quicksort-type algorithm to split data into
  * highest "NumberCut" values without completely sorting them.
  * Data is HYPRE_Real precision data.
  *--------------------------------------------------------------------------*/
- 
-HYPRE_Int hypre_DoubleQuickSplit(HYPRE_Real *values, HYPRE_Int *indices, 
-                           HYPRE_Int list_length, HYPRE_Int NumberKept )
+
+HYPRE_Int hypre_DoubleQuickSplit(HYPRE_Real *values, HYPRE_Int *indices,
+                                 HYPRE_Int list_length, HYPRE_Int NumberKept )
 {
    HYPRE_Int ierr = 0;
    HYPRE_Real interchange_value;
@@ -28,10 +28,12 @@ HYPRE_Int hypre_DoubleQuickSplit(HYPRE_Real *values, HYPRE_Int *indices,
    HYPRE_Int done;
 
    first = 0;
-   last = list_length-1;
+   last = list_length - 1;
 
-   if ( (NumberKept < first+1) || (NumberKept > last+1) )
-      return( ierr );
+   if ( (NumberKept < first + 1) || (NumberKept > last + 1) )
+   {
+      return ( ierr );
+   }
 
    /* Loop until the "midpoint" is NumberKept */
    done = 0;
@@ -39,11 +41,11 @@ HYPRE_Int hypre_DoubleQuickSplit(HYPRE_Real *values, HYPRE_Int *indices,
    for ( ; !done; )
    {
       mid = first;
-      abskey = fabs( values[ mid ]);
+      abskey = hypre_abs( values[ mid ]);
 
-      for( j = first+1; j <= last; j ++)
+      for ( j = first + 1; j <= last; j ++)
       {
-         if( fabs( values[ j ]) > abskey )
+         if ( hypre_abs( values[ j ]) > abskey )
          {
             mid ++;
             /* interchange values */
@@ -53,8 +55,8 @@ HYPRE_Int hypre_DoubleQuickSplit(HYPRE_Real *values, HYPRE_Int *indices,
             indices[ mid] = indices[ j];
             values[ j] = interchange_value;
             indices[ j] = interchange_index;
-          }
-       }
+         }
+      }
 
       /*  interchange the first and mid value */
       interchange_value = values[ mid];
@@ -64,15 +66,19 @@ HYPRE_Int hypre_DoubleQuickSplit(HYPRE_Real *values, HYPRE_Int *indices,
       values[ first] = interchange_value;
       indices[ first] = interchange_index;
 
-      if ( mid+1 == NumberKept )
+      if ( mid + 1 == NumberKept )
       {
          done = 1;
          break;
       }
-      if ( mid+1 > NumberKept )
+      if ( mid + 1 > NumberKept )
+      {
          last = mid - 1;
+      }
       else
+      {
          first = mid + 1;
+      }
    }
 
    return ( ierr );
diff --git a/external/hypre/src/utilities/random.c b/external/hypre/src/utilities/random.c
index d52c401a..e2adc7f2 100644
--- a/external/hypre/src/utilities/random.c
+++ b/external/hypre/src/utilities/random.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -53,13 +53,13 @@ static HYPRE_Int Seed = 13579;
 void hypre_SeedRand( HYPRE_Int seed )
 {
    /* RL: seed must be between 1 and 2^31-2 */
-   if (seed < 1) 
+   if (seed < 1)
    {
       seed = 1;
    }
    else if (seed >= m)
    {
-     seed = m - 1;
+      seed = m - 1;
    }
 
    Seed = seed;
@@ -71,13 +71,13 @@ void hypre_SeedRand( HYPRE_Int seed )
  *
  * @return a HYPRE_Int between (0, 2147483647]
  *--------------------------------------------------------------------------*/
-HYPRE_Int hypre_RandI()
+HYPRE_Int hypre_RandI( void )
 {
    HYPRE_Int  low, high, test;
    high = Seed / q;
    low = Seed % q;
    test = a * low - r * high;
-   if(test > 0)
+   if (test > 0)
    {
       Seed = test;
    }
@@ -96,8 +96,8 @@ HYPRE_Int hypre_RandI()
  * @return a HYPRE_Real containing the next number in the sequence divided by
  * 2147483647 so that the numbers are in (0, 1].
  *--------------------------------------------------------------------------*/
-HYPRE_Real hypre_Rand()
+HYPRE_Real hypre_Rand( void )
 {
-  return ((HYPRE_Real)(hypre_RandI()) / m);
+   return ((HYPRE_Real)(hypre_RandI()) / (HYPRE_Real)m);
 }
 
diff --git a/external/hypre/src/utilities/smp.h b/external/hypre/src/utilities/smp.h
index 34cfe87b..8d255f64 100644
--- a/external/hypre/src/utilities/smp.h
+++ b/external/hypre/src/utilities/smp.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/utilities/state.c b/external/hypre/src/utilities/state.c
new file mode 100644
index 00000000..ed3caca0
--- /dev/null
+++ b/external/hypre/src/utilities/state.c
@@ -0,0 +1,88 @@
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+#include "_hypre_utilities.h"
+
+/* Global variable: library state (initialized, finalized, or none) */
+hypre_State hypre__global_state = HYPRE_STATE_NONE;
+
+/*--------------------------------------------------------------------------
+ * HYPRE_Initialized
+ *
+ * Public function for hypre_Initialized
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_Initialized( void )
+{
+   return hypre_Initialized();
+}
+
+/*--------------------------------------------------------------------------
+ * HYPRE_Finalized
+ *
+ * Public function for hypre_Finalized
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+HYPRE_Finalized( void )
+{
+   return hypre_Finalized();
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_Initialized
+ *
+ * This function returns True when the library has been initialized, but not
+ * finalized yet.
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_Initialized( void )
+{
+   return (hypre__global_state == HYPRE_STATE_INITIALIZED);
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_Finalized
+ *
+ * This function returns True when the library is in finalized state;
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_Finalized( void )
+{
+   return (hypre__global_state == HYPRE_STATE_FINALIZED);
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_SetInitialized
+ *
+ * This function sets the library state to initialized
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_SetInitialized( void )
+{
+   hypre__global_state = HYPRE_STATE_INITIALIZED;
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_SetFinalized
+ *
+ * This function sets the library state to finalized
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_SetFinalized( void )
+{
+   hypre__global_state = HYPRE_STATE_FINALIZED;
+
+   return hypre_error_flag;
+}
diff --git a/external/hypre/src/utilities/state.h b/external/hypre/src/utilities/state.h
new file mode 100644
index 00000000..07944999
--- /dev/null
+++ b/external/hypre/src/utilities/state.h
@@ -0,0 +1,24 @@
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+#ifndef hypre_STATE_HEADER
+#define hypre_STATE_HEADER
+
+/*--------------------------------------------------------------------------
+ * hypre library state
+ *--------------------------------------------------------------------------*/
+
+typedef enum hypre_State_enum
+{
+   HYPRE_STATE_NONE        = 0,
+   HYPRE_STATE_INITIALIZED = 1,
+   HYPRE_STATE_FINALIZED   = 2
+} hypre_State;
+
+extern hypre_State hypre__global_state;
+
+#endif /* hypre_STATE_HEADER */
diff --git a/external/hypre/src/utilities/stl_ops.c b/external/hypre/src/utilities/stl_ops.c
new file mode 100644
index 00000000..3f867d9b
--- /dev/null
+++ b/external/hypre/src/utilities/stl_ops.c
@@ -0,0 +1,53 @@
+/******************************************************************************
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+ * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+ *
+ * SPDX-License-Identifier: (Apache-2.0 OR MIT)
+ ******************************************************************************/
+
+#include "_hypre_onedpl.hpp"
+#include "_hypre_utilities.h"
+#include "_hypre_utilities.hpp"
+#include <math.h>
+
+/*--------------------------------------------------------------------
+ * hypre_IntSequence
+ *
+ * Generate a linear sequence of integers from 0 to size-1 and store
+ * them in the provided data array.
+ *--------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_IntSequence(HYPRE_MemoryLocation  memory_location,
+                  HYPRE_Int             size,
+                  HYPRE_Int            *data)
+{
+#if !defined (HYPRE_USING_GPU)
+   HYPRE_UNUSED_VAR(memory_location);
+#endif
+
+   HYPRE_Int   i;
+
+#if defined (HYPRE_USING_GPU)
+   if (hypre_GetExecPolicy1(memory_location) == HYPRE_EXEC_DEVICE)
+   {
+#if defined(HYPRE_USING_SYCL)
+      hypreSycl_sequence(data, data + size, 0);
+#else
+      HYPRE_THRUST_CALL(sequence, data, data + size);
+#endif
+   }
+   else
+#endif
+   {
+#ifdef HYPRE_USING_OPENMP
+      #pragma omp parallel for HYPRE_SMP_SCHEDULE
+#endif
+      for (i = 0; i < size; i++)
+      {
+         data[i] = i;
+      }
+   }
+
+   return hypre_error_flag;
+}
diff --git a/external/hypre/src/utilities/thread_protos.awk b/external/hypre/src/utilities/thread_protos.awk
index 7cd04b09..7af8ba01 100644
--- a/external/hypre/src/utilities/thread_protos.awk
+++ b/external/hypre/src/utilities/thread_protos.awk
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/utilities/thread_wrappers.awk b/external/hypre/src/utilities/thread_wrappers.awk
index 6b7f1779..67a3a291 100644
--- a/external/hypre/src/utilities/thread_wrappers.awk
+++ b/external/hypre/src/utilities/thread_wrappers.awk
@@ -1,4 +1,4 @@
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/utilities/threading.c b/external/hypre/src/utilities/threading.c
index e6e113ea..fbd12ffc 100644
--- a/external/hypre/src/utilities/threading.c
+++ b/external/hypre/src/utilities/threading.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -12,7 +12,7 @@
 #ifdef HYPRE_USING_OPENMP
 
 HYPRE_Int
-hypre_NumThreads( )
+hypre_NumThreads( void )
 {
    HYPRE_Int num_threads;
 
@@ -24,7 +24,7 @@ hypre_NumThreads( )
 /* This next function must be called from within a parallel region! */
 
 HYPRE_Int
-hypre_NumActiveThreads( )
+hypre_NumActiveThreads( void )
 {
    HYPRE_Int num_threads;
 
@@ -36,7 +36,7 @@ hypre_NumActiveThreads( )
 /* This next function must be called from within a parallel region! */
 
 HYPRE_Int
-hypre_GetThreadNum( )
+hypre_GetThreadNum( void )
 {
    HYPRE_Int my_thread_num;
 
@@ -46,7 +46,7 @@ hypre_GetThreadNum( )
 }
 
 void
-hypre_SetNumThreads(HYPRE_Int nt)
+hypre_SetNumThreads( HYPRE_Int nt )
 {
    omp_set_num_threads(nt);
 }
@@ -61,8 +61,8 @@ hypre_GetSimpleThreadPartition( HYPRE_Int *begin, HYPRE_Int *end, HYPRE_Int n )
    HYPRE_Int num_threads = hypre_NumActiveThreads();
    HYPRE_Int my_thread_num = hypre_GetThreadNum();
 
-   HYPRE_Int n_per_thread = (n + num_threads - 1)/num_threads;
+   HYPRE_Int n_per_thread = (n + num_threads - 1) / num_threads;
 
-   *begin = hypre_min(n_per_thread*my_thread_num, n);
+   *begin = hypre_min(n_per_thread * my_thread_num, n);
    *end = hypre_min(*begin + n_per_thread, n);
 }
diff --git a/external/hypre/src/utilities/threading.h b/external/hypre/src/utilities/threading.h
index f9b81eef..d5621645 100644
--- a/external/hypre/src/utilities/threading.h
+++ b/external/hypre/src/utilities/threading.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/external/hypre/src/utilities/timer.c b/external/hypre/src/utilities/timer.c
index bf09df50..3bdfda5c 100644
--- a/external/hypre/src/utilities/timer.c
+++ b/external/hypre/src/utilities/timer.c
@@ -1,14 +1,14 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
  ******************************************************************************/
 
 /*
- * File:	timer.c
- * Author:	Scott Kohn (skohn@llnl.gov)
- * Description:	somewhat portable timing routines for C++, C, and Fortran
+ * File: timer.c
+ * Author:  Scott Kohn (skohn@llnl.gov)
+ * Description:   somewhat portable timing routines for C++, C, and Fortran
  *
  * This has been modified many times since the original author's version.
  */
@@ -24,15 +24,15 @@
 HYPRE_Real time_getWallclockSeconds(void)
 {
 #ifndef HYPRE_SEQUENTIAL
-   return(hypre_MPI_Wtime());
+   return (hypre_MPI_Wtime());
 #else
 #ifdef WIN32
-   clock_t cl=clock();
-   return(((HYPRE_Real) cl)/((HYPRE_Real) CLOCKS_PER_SEC));
+   clock_t cl = clock();
+   return (((HYPRE_Real) cl) / ((HYPRE_Real) CLOCKS_PER_SEC));
 #else
    struct tms usage;
    hypre_longint wallclock = times(&usage);
-   return(((HYPRE_Real) wallclock)/((HYPRE_Real) sysconf(_SC_CLK_TCK)));
+   return (((HYPRE_Real) wallclock) / ((HYPRE_Real) sysconf(_SC_CLK_TCK)));
 #endif
 #endif
 }
@@ -41,18 +41,18 @@ HYPRE_Real time_getCPUSeconds(void)
 {
 #ifndef TIMER_NO_SYS
    clock_t cpuclock = clock();
-   return(((HYPRE_Real) (cpuclock))/((HYPRE_Real) CLOCKS_PER_SEC));
+   return (((HYPRE_Real) (cpuclock)) / ((HYPRE_Real) CLOCKS_PER_SEC));
 #else
-   return(0.0);
+   return (0.0);
 #endif
 }
 
 HYPRE_Real time_get_wallclock_seconds_(void)
 {
-   return(time_getWallclockSeconds());
+   return (time_getWallclockSeconds());
 }
 
 HYPRE_Real time_get_cpu_seconds_(void)
 {
-   return(time_getCPUSeconds());
+   return (time_getCPUSeconds());
 }
diff --git a/external/hypre/src/utilities/timing.c b/external/hypre/src/utilities/timing.c
index 0becaf36..0c03b27c 100644
--- a/external/hypre/src/utilities/timing.c
+++ b/external/hypre/src/utilities/timing.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -79,7 +79,7 @@ hypre_InitializeTiming( const char *name )
 
    if (new_name)
    {
-      for (i = 0; i < hypre_global_timing_ref(threadid ,size); i++)
+      for (i = 0; i < hypre_global_timing_ref(threadid, size); i++)
       {
          if (hypre_TimingNumRegs(i) == 0)
          {
@@ -105,17 +105,17 @@ hypre_InitializeTiming( const char *name )
          old_num_regs  = (hypre_global_timing_ref(threadid, num_regs));
 
          (hypre_global_timing_ref(threadid, wall_time)) =
-            hypre_CTAlloc(HYPRE_Real,  (time_index+1), HYPRE_MEMORY_HOST);
+            hypre_CTAlloc(HYPRE_Real,  (time_index + 1), HYPRE_MEMORY_HOST);
          (hypre_global_timing_ref(threadid, cpu_time))  =
-            hypre_CTAlloc(HYPRE_Real,  (time_index+1), HYPRE_MEMORY_HOST);
+            hypre_CTAlloc(HYPRE_Real,  (time_index + 1), HYPRE_MEMORY_HOST);
          (hypre_global_timing_ref(threadid, flops))     =
-            hypre_CTAlloc(HYPRE_Real,  (time_index+1), HYPRE_MEMORY_HOST);
+            hypre_CTAlloc(HYPRE_Real,  (time_index + 1), HYPRE_MEMORY_HOST);
          (hypre_global_timing_ref(threadid, name))      =
-            hypre_CTAlloc(char *,  (time_index+1), HYPRE_MEMORY_HOST);
+            hypre_CTAlloc(char *,  (time_index + 1), HYPRE_MEMORY_HOST);
          (hypre_global_timing_ref(threadid, state))     =
-            hypre_CTAlloc(HYPRE_Int,     (time_index+1), HYPRE_MEMORY_HOST);
+            hypre_CTAlloc(HYPRE_Int,     (time_index + 1), HYPRE_MEMORY_HOST);
          (hypre_global_timing_ref(threadid, num_regs))  =
-            hypre_CTAlloc(HYPRE_Int,     (time_index+1), HYPRE_MEMORY_HOST);
+            hypre_CTAlloc(HYPRE_Int,     (time_index + 1), HYPRE_MEMORY_HOST);
          (hypre_global_timing_ref(threadid, size)) ++;
 
          for (i = 0; i < time_index; i++)
@@ -157,7 +157,9 @@ hypre_FinalizeTiming( HYPRE_Int time_index )
    HYPRE_Int  i;
 
    if (hypre_global_timing == NULL)
+   {
       return ierr;
+   }
 
    if (time_index < (hypre_global_timing_ref(threadid, size)))
    {
@@ -192,6 +194,26 @@ hypre_FinalizeTiming( HYPRE_Int time_index )
    return ierr;
 }
 
+HYPRE_Int
+hypre_FinalizeAllTimings( void )
+{
+   HYPRE_Int time_index, ierr = 0;
+
+   if (hypre_global_timing == NULL)
+   {
+      return ierr;
+   }
+
+   HYPRE_Int size = hypre_global_timing_ref(threadid, size);
+
+   for (time_index = 0; time_index < size; time_index++)
+   {
+      ierr += hypre_FinalizeTiming(time_index);
+   }
+
+   return ierr;
+}
+
 /*--------------------------------------------------------------------------
  * hypre_IncFLOPCount
  *--------------------------------------------------------------------------*/
@@ -202,7 +224,9 @@ hypre_IncFLOPCount( HYPRE_BigInt inc )
    HYPRE_Int  ierr = 0;
 
    if (hypre_global_timing == NULL)
+   {
       return ierr;
+   }
 
    hypre_TimingFLOPCount += (HYPRE_Real) (inc);
 
@@ -219,7 +243,9 @@ hypre_BeginTiming( HYPRE_Int time_index )
    HYPRE_Int  ierr = 0;
 
    if (hypre_global_timing == NULL)
+   {
       return ierr;
+   }
 
    if (hypre_TimingState(time_index) == 0)
    {
@@ -245,11 +271,20 @@ hypre_EndTiming( HYPRE_Int time_index )
    HYPRE_Int  ierr = 0;
 
    if (hypre_global_timing == NULL)
+   {
       return ierr;
+   }
 
    hypre_TimingState(time_index) --;
    if (hypre_TimingState(time_index) == 0)
    {
+#if defined(HYPRE_USING_GPU)
+      hypre_Handle *hypre_handle_ = hypre_handle();
+      if (hypre_HandleDefaultExecPolicy(hypre_handle_) == HYPRE_EXEC_DEVICE)
+      {
+         hypre_SyncDevice();
+      }
+#endif
       hypre_StopTiming();
       hypre_TimingWallTime(time_index) += hypre_TimingWallCount;
       hypre_TimingCPUTime(time_index)  += hypre_TimingCPUCount;
@@ -265,15 +300,17 @@ hypre_EndTiming( HYPRE_Int time_index )
  *--------------------------------------------------------------------------*/
 
 HYPRE_Int
-hypre_ClearTiming( )
+hypre_ClearTiming( void )
 {
    HYPRE_Int  ierr = 0;
    HYPRE_Int  i;
 
    if (hypre_global_timing == NULL)
+   {
       return ierr;
+   }
 
-   for (i = 0; i < (hypre_global_timing_ref(threadid,size)); i++)
+   for (i = 0; i < (hypre_global_timing_ref(threadid, size)); i++)
    {
       hypre_TimingWallTime(i) = 0.0;
       hypre_TimingCPUTime(i)  = 0.0;
@@ -304,7 +341,9 @@ hypre_PrintTiming( const char     *heading,
    HYPRE_Int     myrank;
 
    if (hypre_global_timing == NULL)
+   {
       return ierr;
+   }
 
    hypre_MPI_Comm_rank(comm, &myrank );
 
@@ -323,9 +362,9 @@ hypre_PrintTiming( const char     *heading,
          local_wall_time = hypre_TimingWallTime(i);
          local_cpu_time  = hypre_TimingCPUTime(i);
          hypre_MPI_Allreduce(&local_wall_time, &wall_time, 1,
-                       hypre_MPI_REAL, hypre_MPI_MAX, comm);
+                             hypre_MPI_REAL, hypre_MPI_MAX, comm);
          hypre_MPI_Allreduce(&local_cpu_time, &cpu_time, 1,
-                       hypre_MPI_REAL, hypre_MPI_MAX, comm);
+                             hypre_MPI_REAL, hypre_MPI_MAX, comm);
 
          if (myrank == 0)
          {
@@ -334,17 +373,25 @@ hypre_PrintTiming( const char     *heading,
             /* print wall clock info */
             hypre_printf("  wall clock time = %f seconds\n", wall_time);
             if (wall_time)
+            {
                wall_mflops = hypre_TimingFLOPS(i) / wall_time / 1.0E6;
+            }
             else
+            {
                wall_mflops = 0.0;
+            }
             hypre_printf("  wall MFLOPS     = %f\n", wall_mflops);
 
             /* print CPU clock info */
             hypre_printf("  cpu clock time  = %f seconds\n", cpu_time);
             if (cpu_time)
+            {
                cpu_mflops = hypre_TimingFLOPS(i) / cpu_time / 1.0E6;
+            }
             else
+            {
                cpu_mflops = 0.0;
+            }
             hypre_printf("  cpu MFLOPS      = %f\n\n", cpu_mflops);
          }
       }
@@ -352,3 +399,57 @@ hypre_PrintTiming( const char     *heading,
 
    return ierr;
 }
+
+/*--------------------------------------------------------------------------
+ * hypre_GetTiming
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_GetTiming( const char     *heading,
+                 HYPRE_Real     *wall_time_ptr,
+                 MPI_Comm        comm  )
+{
+   HYPRE_Int  ierr = 0;
+
+   HYPRE_Real  local_wall_time;
+   HYPRE_Real  wall_time;
+
+   HYPRE_Int     i;
+   HYPRE_Int     myrank;
+
+   if (hypre_global_timing == NULL)
+   {
+      return ierr;
+   }
+
+   hypre_MPI_Comm_rank(comm, &myrank );
+
+   /* print heading */
+   if (myrank == 0)
+   {
+      hypre_printf("=============================================\n");
+      hypre_printf("%s:\n", heading);
+      hypre_printf("=============================================\n");
+   }
+
+   for (i = 0; i < (hypre_global_timing -> size); i++)
+   {
+      if (hypre_TimingNumRegs(i) > 0)
+      {
+         local_wall_time = hypre_TimingWallTime(i);
+         hypre_MPI_Allreduce(&local_wall_time, &wall_time, 1,
+                             hypre_MPI_REAL, hypre_MPI_MAX, comm);
+
+         if (myrank == 0)
+         {
+            hypre_printf("%s:\n", hypre_TimingName(i));
+
+            /* print wall clock info */
+            hypre_printf("  wall clock time = %f seconds\n", wall_time);
+         }
+      }
+   }
+
+   *wall_time_ptr = wall_time;
+   return ierr;
+}
diff --git a/external/hypre/src/utilities/timing.h b/external/hypre/src/utilities/timing.h
index a2f41eb1..f09fb1db 100644
--- a/external/hypre/src/utilities/timing.h
+++ b/external/hypre/src/utilities/timing.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -40,11 +40,13 @@ HYPRE_Real time_get_cpu_seconds_( void );
 
 #define hypre_InitializeTiming(name) 0
 #define hypre_FinalizeTiming(index)
+#define hypre_FinalizeAllTimings()
 #define hypre_IncFLOPCount(inc)
 #define hypre_BeginTiming(i)
 #define hypre_EndTiming(i)
 #define hypre_PrintTiming(heading, comm)
 #define hypre_ClearTiming()
+#define hypre_GetTiming(heading, comm, time)
 
 /*--------------------------------------------------------------------------
  * With timing on
@@ -101,11 +103,13 @@ extern hypre_TimingType *hypre_global_timing;
 /* timing.c */
 HYPRE_Int hypre_InitializeTiming( const char *name );
 HYPRE_Int hypre_FinalizeTiming( HYPRE_Int time_index );
+HYPRE_Int hypre_FinalizeAllTimings( void );
 HYPRE_Int hypre_IncFLOPCount( HYPRE_BigInt inc );
 HYPRE_Int hypre_BeginTiming( HYPRE_Int time_index );
 HYPRE_Int hypre_EndTiming( HYPRE_Int time_index );
 HYPRE_Int hypre_ClearTiming( void );
-HYPRE_Int hypre_PrintTiming( const char *heading , MPI_Comm comm );
+HYPRE_Int hypre_PrintTiming( const char *heading, MPI_Comm comm );
+HYPRE_Int hypre_GetTiming( const char *heading, HYPRE_Real *wall_time_ptr, MPI_Comm comm );
 
 #endif
 
diff --git a/external/hypre/src/utilities/utilities.c b/external/hypre/src/utilities/utilities.c
index 9f388f9d..454a0e30 100644
--- a/external/hypre/src/utilities/utilities.c
+++ b/external/hypre/src/utilities/utilities.c
@@ -1,11 +1,22 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
  ******************************************************************************/
 
 #include "_hypre_utilities.h"
+#include <errno.h>
+
+#ifdef _WIN32
+#include <windows.h>
+#include <direct.h>
+#define mkdir(path, mode) _mkdir(path)
+#else
+#include <dirent.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#endif
 
 /*--------------------------------------------------------------------------
  * hypre_multmod
@@ -17,21 +28,21 @@ hypre_multmod(HYPRE_Int a,
               HYPRE_Int b,
               HYPRE_Int mod)
 {
-    HYPRE_Int res = 0; // Initialize result
-    a %= mod;
-    while (b)
-    {
-        // If b is odd, add a with result
-        if (b & 1)
-        {
-            res = (res + a) % mod;
-        }
-        // Here we assume that doing 2*a
-        // doesn't cause overflow
-        a = (2 * a) % mod;
-        b >>= 1;  // b = b / 2
-    }
-    return res;
+   HYPRE_Int res = 0; // Initialize result
+   a %= mod;
+   while (b)
+   {
+      // If b is odd, add a with result
+      if (b & 1)
+      {
+         res = (res + a) % mod;
+      }
+      // Here we assume that doing 2*a
+      // doesn't cause overflow
+      a = (2 * a) % mod;
+      b >>= 1;  // b = b / 2
+   }
+   return res;
 }
 
 /*--------------------------------------------------------------------------
@@ -88,3 +99,169 @@ hypre_strcpy(char *destination, const char *source)
       return ((char *) memmove(destination, source, len + 1));
    }
 }
+
+/*--------------------------------------------------------------------------
+ * hypre_CheckDirExists
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_CheckDirExists(const char *path)
+{
+#ifndef _WIN32
+   DIR *dir = opendir(path);
+
+   if (dir)
+   {
+      closedir(dir);
+      return 1;
+   }
+#else
+   DWORD att = GetFileAttributesA(path);
+
+   if (att == INVALID_FILE_ATTRIBUTES)
+   {
+      return 0;
+   }
+
+   if (att & FILE_ATTRIBUTE_DIRECTORY)
+   {
+      return 1;
+   }
+#endif
+
+   return 0;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_CreateDir
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_CreateDir(const char *path)
+{
+   char msg[HYPRE_MAX_MSG_LEN];
+
+   if (mkdir(path, 0777))
+   {
+      hypre_sprintf(msg, "Could not create directory: %s", path);
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, msg);
+   }
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------------
+ * hypre_CreateNextDirOfSequence
+ *--------------------------------------------------------------------------*/
+
+HYPRE_Int
+hypre_CreateNextDirOfSequence(const char *basepath, const char *prefix, char **fullpath_ptr)
+{
+   HYPRE_Int       max_suffix = -1;
+   char           *fullpath;
+
+#ifndef _WIN32
+   HYPRE_Int       suffix;
+   char            msg[HYPRE_MAX_MSG_LEN];
+   DIR            *dir;
+   struct dirent  *entry;
+
+   if ((dir = opendir(basepath)) == NULL)
+   {
+      hypre_sprintf(msg, "Could not open directory: %s", basepath);
+      hypre_error_w_msg(HYPRE_ERROR_GENERIC, msg);
+      return hypre_error_flag;
+   }
+
+   max_suffix = -1;
+   while ((entry = readdir(dir)) != NULL)
+   {
+      if (strncmp(entry->d_name, prefix, strlen(prefix)) == 0)
+      {
+         if (hypre_sscanf(entry->d_name + strlen(prefix), "%d", &suffix) == 1)
+         {
+            if (suffix > max_suffix)
+            {
+               max_suffix = suffix;
+            }
+         }
+      }
+   }
+   closedir(dir);
+#else
+   /* TODO (VPM) */
+#endif
+
+   /* Create directory */
+   fullpath = hypre_TAlloc(char, strlen(basepath) + 10, HYPRE_MEMORY_HOST);
+   hypre_sprintf(fullpath, "%s/%s%05d", basepath, prefix, max_suffix + 1);
+   hypre_CreateDir(fullpath);
+
+   /* Set output pointer */
+   *fullpath_ptr = fullpath;
+
+   return hypre_error_flag;
+}
+
+/*--------------------------------------------------------------------
+ * hypre_ConvertIndicesToString
+ *
+ * Converts an array of integers (indices) into a formatted string.
+ * The function creates a string representing the array in a comma-
+ * separated format, enclosed within square brackets ("[]").
+ *
+ * - If the input array is empty (size = 0), it returns a string "[]".
+ * - The resulting string includes the list of integers with proper
+ *   formatting: each integer is separated by a comma and a space.
+ *
+ * Parameters:
+ * - size: Number of elements in the input array.
+ * - indices: Pointer to the array of integers (HYPRE_Int) to convert.
+ *
+ * Returns:
+ * - A dynamically allocated string representing the integer array.
+ *--------------------------------------------------------------------*/
+
+char*
+hypre_ConvertIndicesToString(HYPRE_Int  size,
+                             HYPRE_Int *indices)
+{
+   HYPRE_Int    max_length;
+   HYPRE_Int    i, length;
+   char        *string;
+   char        *pos;
+
+   if (!size)
+   {
+      string = hypre_TAlloc(char, 3, HYPRE_MEMORY_HOST);
+      hypre_sprintf(string, "[]");
+
+      return string;
+   }
+
+   /* Estimate maximum string needed */
+   max_length = 12 * size + 3;
+   string = hypre_TAlloc(char, max_length, HYPRE_MEMORY_HOST);
+
+   pos    = string;
+   length = hypre_sprintf(pos, "[");
+   pos    += length;
+
+   for (i = 0; i < size; i++)
+   {
+      /* Add comma before all but the first element */
+      if (i > 0)
+      {
+         length = hypre_sprintf(pos, ", ");
+         pos += length;
+      }
+
+      /* Write integer as string */
+      length = hypre_sprintf(pos, "%d", indices[i]);
+      pos += length;
+   }
+
+   hypre_sprintf(pos, "]");
+
+   return string;
+}
diff --git a/external/hypre/src/utilities/version.sh b/external/hypre/src/utilities/version.sh
old mode 100644
new mode 100755
index c9e2a6b4..6413b408
--- a/external/hypre/src/utilities/version.sh
+++ b/external/hypre/src/utilities/version.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+#!/bin/bash
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
 # HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)

From bef5035794d7668871908843cd62c1d8b1dee75b Mon Sep 17 00:00:00 2001
From: Luohao Wang <luohaothu@live.com>
Date: Sun, 1 Jun 2025 00:37:23 +0800
Subject: [PATCH 04/31] [Core] Enable C++ 26

---
 CMakeLists.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d80e6e8e..e0de3af0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -178,11 +178,11 @@ target_include_directories(opflow INTERFACE
 # Compile options
 # ----------------------------------------------------------------------------
 include(CheckCXXCompilerFlag)
-check_cxx_compiler_flag(-std=c++20 c++20support)
-if (NOT c++20support)
-    message(FATAL_ERROR "OpFlow requires C++20 to compile.")
+check_cxx_compiler_flag(-std=c++26 c++26support)
+if (NOT c++26support)
+    message(FATAL_ERROR "OpFlow requires C++26 to compile.")
 endif ()
-target_compile_options(opflow INTERFACE -std=c++20)
+target_compile_options(opflow INTERFACE -std=c++26)
 
 # ----------------------------------------------------------------------------
 # Use spdlog package

From e34bd1da49178bb81c8e94727332816fbeee3b59 Mon Sep 17 00:00:00 2001
From: Luohao Wang <luohaothu@live.com>
Date: Sun, 1 Jun 2025 10:53:42 +0800
Subject: [PATCH 05/31] [Core] Move external configs to `external` dir

---
 CMakeLists.txt           | 153 ++-------------------------------------
 cmake/AMGCLConfig.cmake  |   2 +-
 cmake/FMTConfig.cmake    |   2 +-
 cmake/HYPREConfig.cmake  |   2 +-
 cmake/SPDLOGConfig.cmake |   2 +-
 cmake/TBBConfig.cmake    |   2 +-
 cmake/TECIOConfig.cmake  |  36 ++++-----
 external/CMakeLists.txt  | 117 ++++++++++++++++++++++++++++++
 8 files changed, 146 insertions(+), 170 deletions(-)
 create mode 100644 external/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e0de3af0..c3c2b268 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -174,6 +174,11 @@ target_include_directories(opflow INTERFACE
         "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
         "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/src>")
 
+# ----------------------------------------------------------------------------
+# External dependencies
+# ----------------------------------------------------------------------------
+add_subdirectory(external)
+
 # ----------------------------------------------------------------------------
 # Compile options
 # ----------------------------------------------------------------------------
@@ -183,54 +188,7 @@ if (NOT c++26support)
     message(FATAL_ERROR "OpFlow requires C++26 to compile.")
 endif ()
 target_compile_options(opflow INTERFACE -std=c++26)
-
-# ----------------------------------------------------------------------------
-# Use spdlog package
-# ----------------------------------------------------------------------------
-if (OPFLOW_INSTALL)
-    # Same as libfmt
-    include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/SPDLOGConfig.cmake)
-    CONFIG_AND_INSTALL_SPDLOG()
-    find_package(spdlog REQUIRED PATHS ${CMAKE_INSTALL_PREFIX} NO_DEFAULT_PATH)
-else ()
-    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/external/spdlog EXCLUDE_FROM_ALL)
-endif ()
-target_link_libraries(opflow INTERFACE spdlog::spdlog)
-
-# ----------------------------------------------------------------------------
-# Use AMGCL
-# ----------------------------------------------------------------------------
-if (OPFLOW_INSTALL)
-    include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/AMGCLConfig.cmake)
-    CONFIG_AND_INSTALL_AMGCL()
-    find_package(amgcl REQUIRED PATHS ${CMAKE_INSTALL_PREFIX} NO_DEFAULT_PATH)
-else ()
-    add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/external/amgcl EXCLUDE_FROM_ALL)
-endif ()
-target_link_libraries(opflow INTERFACE amgcl::amgcl)
-
-# ----------------------------------------------------------------------------
-# Use TBB
-# ----------------------------------------------------------------------------
-if (OPFLOW_TBB_EXTERNAL)
-    if (NOT DEFINED TBB_DIR)
-        message(FATAL "Variable TBB_DIR not defined. Use -DTBB_DIR to specify TBB's install path.")
-    endif ()
-    find_package(TBB REQUIRED PATHS ${TBB_DIR} NO_DEFAULT_PATH)
-else ()
-    if (OPFLOW_INSTALL)
-        include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/TBBConfig.cmake)
-        CONFIG_AND_INSTALL_TBB()
-        find_package(tbb NAMES tbb TBB REQUIRED PATHS ${CMAKE_INSTALL_PREFIX} NO_DEFAULT_PATH)
-    else ()
-        set(BUILD_SHARED_LIBS ON)
-        set(TBB_TEST OFF)
-        set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
-        add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/external/tbb EXCLUDE_FROM_ALL)
-        find_package(tbb NAMES tbb TBB REQUIRED)
-    endif ()
-endif ()
-target_link_libraries(opflow INTERFACE TBB::tbb)
+set_property(TARGET opflow PROPERTY CXX_SCAN_FOR_MODULES ON)
 
 # ----------------------------------------------------------------------------
 # Find MPI
@@ -273,105 +231,6 @@ if (OPFLOW_WITH_OPENMP)
     list(APPEND PKG_CONFIG_REQUIRES OpenMP)
 endif ()
 
-# ----------------------------------------------------------------------------
-# Use HYPRE package
-# ----------------------------------------------------------------------------
-if (OPFLOW_HYPRE_EXTERNAL)
-    if (NOT DEFINED HYPRE_DIR)
-        message(FATAL "Variable HYPRE_DIR not set. Use -DHYPRE_DIR to specify HYPRE's install path")
-    endif ()
-    # Use external HYPRE
-    find_package(HYPRE REQUIRED PATHS ${HYPRE_DIR} NO_DEFAULT_PATH)
-    # Here we hard link to the found HYPRE to avoid find again at client
-    target_link_libraries(opflow INTERFACE HYPRE)
-else ()
-    # Use bundled HYPRE
-    if (OPFLOW_INSTALL)
-        include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/HYPREConfig.cmake)
-        CONFIG_AND_INSTALL_HYPRE()
-        find_package(HYPRE REQUIRED PATHS ${CMAKE_INSTALL_PREFIX} NO_DEFAULT_PATH)
-        # HYPRE::HYPRE is only exported on install
-        target_link_libraries(opflow INTERFACE HYPRE::HYPRE)
-    else ()
-        set(HYPRE_BUILD_TYPE Debug)
-        set(HYPRE_WITH_OPENMP ${OPFLOW_WITH_OPENMP})
-        set(HYPRE_ENABLE_SINGLE ${OPFLOW_SINGLE_PRECISION})
-        set(HYPRE_WITH_MPI ${OPFLOW_WITH_MPI})
-        add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/external/hypre/src EXCLUDE_FROM_ALL)
-        target_link_libraries(opflow INTERFACE HYPRE)
-    endif ()
-endif ()
-
-# ----------------------------------------------------------------------------
-# Use VTK package
-# ----------------------------------------------------------------------------
-if (OPFLOW_WITH_VTK)
-    target_compile_definitions(opflow INTERFACE OPFLOW_WITH_VTK)
-    if (OPFLOW_VTK_EXTERNAL)
-        if (NOT TARGET VTK)
-            if (NOT DEFINED VTK_DIR)
-                message(FATAL "Variable VTK_DIR not defined. Use -DVTK_DIR to specify VTK's install path")
-            endif ()
-            find_package(VTK REQUIRED PATHS ${VTK_DIR} NO_DEFAULT_PATH)
-            target_compile_definitions(opflow INTERFACE OPFLOW_VTK_EXTERNAL)
-        endif ()
-    else ()
-        include(cmake/VTKConfig.cmake)
-        CONFIG_VTK()
-    endif ()
-    list(APPEND PKG_CONFIG_REQUIRES VTK)
-    target_include_directories(opflow INTERFACE ${VTK_INCLUDE_DIRS})
-    target_link_directories(opflow INTERFACE ${VTK_LIBRARY_DIRS})
-    target_link_libraries(opflow INTERFACE ${VTK_LIBRARIES})
-endif ()
-
-# ----------------------------------------------------------------------------
-# Use HDF5 package
-# ----------------------------------------------------------------------------
-if (OPFLOW_WITH_HDF5)
-    if (OPFLOW_WITH_MPI)
-        set(HDF5_PREFER_PARALLEL TRUE)
-    endif ()
-    set(HDF5_USE_STATIC_LIBRARIES ON)
-    include(FindHDF5)
-    find_package(HDF5 COMPONENTS C REQUIRED)
-    if (HDF5_PREFER_PARALLEL AND NOT HDF5_IS_PARALLEL)
-        message(FATAL_ERROR "Cannot find parallel HDF5 library")
-    endif ()
-    target_include_directories(opflow INTERFACE ${HDF5_C_INCLUDE_DIRS})
-    target_link_libraries(opflow INTERFACE ${HDF5_C_LIBRARIES})
-    target_compile_definitions(opflow INTERFACE OPFLOW_WITH_HDF5 ${HDF5_C_DEFINITIONS})
-    if (OPFLOW_WITH_MPI)
-        target_compile_definitions(opflow INTERFACE H5_HAVE_PARALLEL)
-    endif ()
-endif ()
-
-# ----------------------------------------------------------------------------
-# Use TecIO library
-# ----------------------------------------------------------------------------
-if (OPFLOW_INSTALL)
-    include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/TECIOConfig.cmake)
-    CONFIG_AND_INSTALL_TECIO()
-    target_include_directories(opflow INTERFACE ${CMAKE_INSTALL_PREFIX}/include/tecio)
-    target_link_directories(opflow INTERFACE ${CMAKE_INSTALL_PREFIX}/lib)
-    if (OPFLOW_WITH_MPI)
-        target_link_libraries(opflow INTERFACE teciompi)
-        target_compile_definitions(opflow INTERFACE TECIOMPI)
-    else ()
-        target_link_libraries(opflow INTERFACE tecio)
-    endif ()
-else ()
-    if (OPFLOW_WITH_MPI)
-        add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/external/tecio/teciompisrc EXCLUDE_FROM_ALL)
-        target_include_directories(opflow INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/external/tecio/teciompisrc)
-        target_link_libraries(opflow INTERFACE teciompi)
-    else ()
-        add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/external/tecio/teciosrc EXCLUDE_FROM_ALL)
-        include_directories(${CMAKE_CURRENT_SOURCE_DIR}/external/tecio/teciosrc)
-        target_link_libraries(opflow INTERFACE tecio)
-    endif ()
-endif ()
-
 # ----------------------------------------------------------------------------
 # Platform detection
 # ----------------------------------------------------------------------------
diff --git a/cmake/AMGCLConfig.cmake b/cmake/AMGCLConfig.cmake
index dfc433d1..c96f55c3 100644
--- a/cmake/AMGCLConfig.cmake
+++ b/cmake/AMGCLConfig.cmake
@@ -19,7 +19,7 @@ macro(CONFIG_AND_INSTALL_AMGCL)
     execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}"
             -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
             -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
-            -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} ${CMAKE_CURRENT_SOURCE_DIR}/external/amgcl
+            -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} ${CMAKE_CURRENT_LIST_DIR}/../external/amgcl
             RESULT_VARIABLE result
             WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/amgcl-build)
     if (result)
diff --git a/cmake/FMTConfig.cmake b/cmake/FMTConfig.cmake
index 2518c16c..cbe08c87 100644
--- a/cmake/FMTConfig.cmake
+++ b/cmake/FMTConfig.cmake
@@ -21,7 +21,7 @@ macro(CONFIG_AND_INSTALL_FMT)
             -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
             -DFMT_DOC=OFF -DFMT_TEST=OFF
             -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
-            -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} ${CMAKE_CURRENT_SOURCE_DIR}/external/fmt
+            -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} ${CMAKE_CURRENT_LIST_DIR}/../external/fmt
             RESULT_VARIABLE result
             WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/fmt-build)
     if (result)
diff --git a/cmake/HYPREConfig.cmake b/cmake/HYPREConfig.cmake
index 9e789c02..ba8690f6 100644
--- a/cmake/HYPREConfig.cmake
+++ b/cmake/HYPREConfig.cmake
@@ -35,7 +35,7 @@ macro(CONFIG_AND_INSTALL_HYPRE)
             -DHYPRE_ENABLE_OPENMP=${OPFLOW_WITH_OPENMP}
             -DHYPRE_ENABLE_MPI=${OPFLOW_WITH_MPI}
             -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
-            ${CMAKE_CURRENT_SOURCE_DIR}/external/hypre/src
+            ${CMAKE_CURRENT_LIST_DIR}/../external/hypre/src
             RESULT_VARIABLE _result
             WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/hypre-build)
     if (_result)
diff --git a/cmake/SPDLOGConfig.cmake b/cmake/SPDLOGConfig.cmake
index b5a4c2d6..254ea995 100644
--- a/cmake/SPDLOGConfig.cmake
+++ b/cmake/SPDLOGConfig.cmake
@@ -20,7 +20,7 @@ macro(CONFIG_AND_INSTALL_SPDLOG)
             -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
             -DSPDLOG_BUILD_EXAMPLE=OFF
             -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
-            -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} ${CMAKE_CURRENT_SOURCE_DIR}/external/spdlog
+            -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} ${CMAKE_CURRENT_LIST_DIR}/../external/spdlog
             RESULT_VARIABLE result
             WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/spdlog-build)
     if (result)
diff --git a/cmake/TBBConfig.cmake b/cmake/TBBConfig.cmake
index 9c928dad..baeab705 100644
--- a/cmake/TBBConfig.cmake
+++ b/cmake/TBBConfig.cmake
@@ -19,7 +19,7 @@ macro(CONFIG_AND_INSTALL_TBB)
     execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}"
             -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
             -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DTBB_TEST=OFF -DTBB_STRICT=OFF
-            -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} ${CMAKE_CURRENT_SOURCE_DIR}/external/tbb
+            -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} ${CMAKE_CURRENT_LIST_DIR}/../external/tbb
             RESULT_VARIABLE result
             WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tbb-build)
     if (result)
diff --git a/cmake/TECIOConfig.cmake b/cmake/TECIOConfig.cmake
index e64b2e24..4dacb60e 100644
--- a/cmake/TECIOConfig.cmake
+++ b/cmake/TECIOConfig.cmake
@@ -19,14 +19,14 @@ macro(CONFIG_AND_INSTALL_TECIO)
     if (OPFLOW_WITH_MPI)
         execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}"
                 -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-                -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} ${CMAKE_CURRENT_SOURCE_DIR}/external/tecio/teciompisrc
+                -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} ${CMAKE_CURRENT_LIST_DIR}/../external/tecio/teciompisrc
                 RESULT_VARIABLE result
                 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tecio-build)
 
     else ()
         execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}"
                 -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-                -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} ${CMAKE_CURRENT_SOURCE_DIR}/external/tecio/teciosrc
+                -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} ${CMAKE_CURRENT_LIST_DIR}/../external/tecio/teciosrc
                 RESULT_VARIABLE result
                 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tecio-build)
     endif ()
@@ -42,25 +42,25 @@ macro(CONFIG_AND_INSTALL_TECIO)
     # Manually install
     file(MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/include/tecio)
     if (OPFLOW_WITH_MPI)
-        file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/external/tecio/teciompisrc/TECIO.h
-                ${CMAKE_CURRENT_SOURCE_DIR}/external/tecio/teciompisrc/tecio_Exports.h
-                ${CMAKE_CURRENT_SOURCE_DIR}/external/tecio/teciompisrc/tecio.inc
-                ${CMAKE_CURRENT_SOURCE_DIR}/external/tecio/teciompisrc/tecio.for
-                ${CMAKE_CURRENT_SOURCE_DIR}/external/tecio/teciompisrc/tecio.f90
-                ${CMAKE_CURRENT_SOURCE_DIR}/external/tecio/teciompisrc/tecio_license_agreement.txt
-                ${CMAKE_CURRENT_SOURCE_DIR}/external/tecio/teciompisrc/StandardIntegralTypes.h
-                DESTINATION ${CMAKE_INSTALL_PREFIX}/include/tecio)
+        file(COPY ${CMAKE_CURRENT_LIST_DIR}/../external/tecio/teciompisrc/TECIO.h
+                  ${CMAKE_CURRENT_LIST_DIR}/../external/tecio/teciompisrc/tecio_Exports.h
+                  ${CMAKE_CURRENT_LIST_DIR}/../external/tecio/teciompisrc/tecio.inc
+                  ${CMAKE_CURRENT_LIST_DIR}/../external/tecio/teciompisrc/tecio.for
+                  ${CMAKE_CURRENT_LIST_DIR}/../external/tecio/teciompisrc/tecio.f90
+                  ${CMAKE_CURRENT_LIST_DIR}/../external/tecio/teciompisrc/tecio_license_agreement.txt
+                  ${CMAKE_CURRENT_LIST_DIR}/../external/tecio/teciompisrc/StandardIntegralTypes.h
+                  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/tecio)
 
         file(COPY ${CMAKE_CURRENT_BINARY_DIR}/tecio-build/libteciompi.a DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
     else ()
-        file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/external/tecio/teciosrc/TECIO.h
-                ${CMAKE_CURRENT_SOURCE_DIR}/external/tecio/teciosrc/tecio_Exports.h
-                ${CMAKE_CURRENT_SOURCE_DIR}/external/tecio/teciosrc/tecio.inc
-                ${CMAKE_CURRENT_SOURCE_DIR}/external/tecio/teciosrc/tecio.for
-                ${CMAKE_CURRENT_SOURCE_DIR}/external/tecio/teciosrc/tecio.f90
-                ${CMAKE_CURRENT_SOURCE_DIR}/external/tecio/teciosrc/tecio_license_agreement.txt
-                ${CMAKE_CURRENT_SOURCE_DIR}/external/tecio/teciosrc/StandardIntegralTypes.h
-                DESTINATION ${CMAKE_INSTALL_PREFIX}/include/tecio)
+        file(COPY ${CMAKE_CURRENT_LIST_DIR}/../external/tecio/teciosrc/TECIO.h
+                  ${CMAKE_CURRENT_LIST_DIR}/../external/tecio/teciosrc/tecio_Exports.h
+                  ${CMAKE_CURRENT_LIST_DIR}/../external/tecio/teciosrc/tecio.inc
+                  ${CMAKE_CURRENT_LIST_DIR}/../external/tecio/teciosrc/tecio.for
+                  ${CMAKE_CURRENT_LIST_DIR}/../external/tecio/teciosrc/tecio.f90
+                  ${CMAKE_CURRENT_LIST_DIR}/../external/tecio/teciosrc/tecio_license_agreement.txt
+                  ${CMAKE_CURRENT_LIST_DIR}/../external/tecio/teciosrc/StandardIntegralTypes.h
+                  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/tecio)
 
         file(COPY ${CMAKE_CURRENT_BINARY_DIR}/tecio-build/libtecio.a DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
     endif ()
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
new file mode 100644
index 00000000..7c43cc4b
--- /dev/null
+++ b/external/CMakeLists.txt
@@ -0,0 +1,117 @@
+# ----------------------------------------------------------------------------
+# External dependencies configuration
+# ----------------------------------------------------------------------------
+
+# Use spdlog package
+if (OPFLOW_INSTALL)
+    # Same as libfmt
+    include(${CMAKE_SOURCE_DIR}/cmake/SPDLOGConfig.cmake)
+    CONFIG_AND_INSTALL_SPDLOG()
+    find_package(spdlog REQUIRED PATHS ${CMAKE_INSTALL_PREFIX} NO_DEFAULT_PATH)
+else ()
+    add_subdirectory(${CMAKE_SOURCE_DIR}/external/spdlog EXCLUDE_FROM_ALL)
+endif ()
+target_link_libraries(opflow INTERFACE spdlog::spdlog)
+
+# Use AMGCL
+if (OPFLOW_INSTALL)
+    include(${CMAKE_SOURCE_DIR}/cmake/AMGCLConfig.cmake)
+    CONFIG_AND_INSTALL_AMGCL()
+    find_package(amgcl REQUIRED PATHS ${CMAKE_INSTALL_PREFIX} NO_DEFAULT_PATH)
+else ()
+    add_subdirectory(${CMAKE_SOURCE_DIR}/external/amgcl EXCLUDE_FROM_ALL)
+endif ()
+target_link_libraries(opflow INTERFACE amgcl::amgcl)
+
+# Use TBB
+if (OPFLOW_TBB_EXTERNAL)
+    if (NOT DEFINED TBB_DIR)
+        message(FATAL "Variable TBB_DIR not defined. Use -DTBB_DIR to specify TBB's install path.")
+    endif ()
+    find_package(TBB REQUIRED PATHS ${TBB_DIR} NO_DEFAULT_PATH)
+else ()
+    if (OPFLOW_INSTALL)
+        include(${CMAKE_SOURCE_DIR}/cmake/TBBConfig.cmake)
+        CONFIG_AND_INSTALL_TBB()
+        find_package(tbb NAMES tbb TBB REQUIRED PATHS ${CMAKE_INSTALL_PREFIX} NO_DEFAULT_PATH)
+    else ()
+        set(BUILD_SHARED_LIBS ON)
+        set(TBB_TEST OFF)
+        set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
+        add_subdirectory(${CMAKE_SOURCE_DIR}/external/tbb EXCLUDE_FROM_ALL)
+        find_package(tbb NAMES tbb TBB REQUIRED)
+    endif ()
+endif ()
+target_link_libraries(opflow INTERFACE TBB::tbb)
+
+# Use HYPRE package
+if (OPFLOW_HYPRE_EXTERNAL)
+    if (NOT DEFINED HYPRE_DIR)
+        message(FATAL "Variable HYPRE_DIR not set. Use -DHYPRE_DIR to specify HYPRE's install path")
+    endif ()
+    # Use external HYPRE
+    find_package(HYPRE REQUIRED PATHS ${HYPRE_DIR} NO_DEFAULT_PATH)
+    # Here we hard link to the found HYPRE to avoid find again at client
+    target_link_libraries(opflow INTERFACE HYPRE)
+else ()
+    # Use bundled HYPRE
+    if (OPFLOW_INSTALL)
+        include(${CMAKE_SOURCE_DIR}/cmake/HYPREConfig.cmake)
+        CONFIG_AND_INSTALL_HYPRE()
+        find_package(HYPRE REQUIRED PATHS ${CMAKE_INSTALL_PREFIX} NO_DEFAULT_PATH)
+        # HYPRE::HYPRE is only exported on install
+        target_link_libraries(opflow INTERFACE HYPRE::HYPRE)
+    else ()
+        set(HYPRE_BUILD_TYPE Debug)
+        set(HYPRE_WITH_OPENMP ${OPFLOW_WITH_OPENMP})
+        set(HYPRE_ENABLE_SINGLE ${OPFLOW_SINGLE_PRECISION})
+        set(HYPRE_WITH_MPI ${OPFLOW_WITH_MPI})
+        add_subdirectory(${CMAKE_SOURCE_DIR}/external/hypre/src EXCLUDE_FROM_ALL)
+        target_link_libraries(opflow INTERFACE HYPRE)
+    endif ()
+endif ()
+
+# Use VTK package
+if (OPFLOW_WITH_VTK)
+    target_compile_definitions(opflow INTERFACE OPFLOW_WITH_VTK)
+    if (OPFLOW_VTK_EXTERNAL)
+        if (NOT TARGET VTK)
+            if (NOT DEFINED VTK_DIR)
+                message(FATAL "Variable VTK_DIR not defined. Use -DVTK_DIR to specify VTK's install path")
+            endif ()
+            find_package(VTK REQUIRED PATHS ${VTK_DIR} NO_DEFAULT_PATH)
+            target_compile_definitions(opflow INTERFACE OPFLOW_VTK_EXTERNAL)
+        endif ()
+    else ()
+        include(${CMAKE_SOURCE_DIR}/cmake/VTKConfig.cmake)
+        CONFIG_VTK()
+    endif ()
+    list(APPEND PKG_CONFIG_REQUIRES VTK)
+    target_include_directories(opflow INTERFACE ${VTK_INCLUDE_DIRS})
+    target_link_directories(opflow INTERFACE ${VTK_LIBRARY_DIRS})
+    target_link_libraries(opflow INTERFACE ${VTK_LIBRARIES})
+endif ()
+
+# Use TecIO library
+if (OPFLOW_INSTALL)
+    include(${CMAKE_SOURCE_DIR}/cmake/TECIOConfig.cmake)
+    CONFIG_AND_INSTALL_TECIO()
+    target_include_directories(opflow INTERFACE ${CMAKE_INSTALL_PREFIX}/include/tecio)
+    target_link_directories(opflow INTERFACE ${CMAKE_INSTALL_PREFIX}/lib)
+    if (OPFLOW_WITH_MPI)
+        target_link_libraries(opflow INTERFACE teciompi)
+        target_compile_definitions(opflow INTERFACE TECIOMPI)
+    else ()
+        target_link_libraries(opflow INTERFACE tecio)
+    endif ()
+else ()
+    if (OPFLOW_WITH_MPI)
+        add_subdirectory(${CMAKE_SOURCE_DIR}/external/tecio/teciompisrc EXCLUDE_FROM_ALL)
+        target_include_directories(opflow INTERFACE ${CMAKE_SOURCE_DIR}/external/tecio/teciompisrc)
+        target_link_libraries(opflow INTERFACE teciompi)
+    else ()
+        add_subdirectory(${CMAKE_SOURCE_DIR}/external/tecio/teciosrc EXCLUDE_FROM_ALL)
+        include_directories(${CMAKE_SOURCE_DIR}/external/tecio/teciosrc)
+        target_link_libraries(opflow INTERFACE tecio)
+    endif ()
+endif ()

From 6aa6189128021b3ee8ff2dd4397384e21b784785 Mon Sep 17 00:00:00 2001
From: Luohao Wang <luohaothu@live.com>
Date: Sun, 1 Jun 2025 16:25:45 +0800
Subject: [PATCH 06/31] [Core] Add seperate CMakeList for src

---
 CMakeLists.txt     | 257 +++++++++++++++++++++------------------------
 src/CMakeLists.txt |  75 +++++++++++++
 2 files changed, 195 insertions(+), 137 deletions(-)
 create mode 100644 src/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c3c2b268..8f3f5189 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,68 +38,68 @@ include(GNUInstallDirs)
 # ----------------------------------------------------------------------------
 # Set CMake policies to support later version behaviour
 # ----------------------------------------------------------------------------
-if (POLICY CMP0077)
+if(POLICY CMP0077)
     cmake_policy(SET CMP0077 NEW) # option() honors variables already set
-endif ()
+endif()
 
 # ----------------------------------------------------------------------------
 # Set default build to release
 # ----------------------------------------------------------------------------
-if (NOT CMAKE_BUILD_TYPE)
+if(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose Release or Debug" FORCE)
-endif ()
+endif()
 
 # ----------------------------------------------------------------------------
 # Compiler config
 # ----------------------------------------------------------------------------
-if (NOT CMAKE_C_STANDARD)
+if(NOT CMAKE_C_STANDARD)
     set(CMAKE_C_STANDARD 11)
     set(CMAKE_C_STANDARD_REQUIRED ON)
-elseif (CMAKE_C_STANDARD LESS 11)
+elseif(CMAKE_C_STANDARD LESS 11)
     message(WARNING "OpFlow needs C11 to compile. Changing the standard to C11.")
     set(CMAKE_C_STANDARD 11)
     set(CMAKE_C_STANDARD_REQUIRED ON)
-endif ()
+endif()
 
 # make sure __cplusplus is defined when using msvc
-if (MSVC)
+if(MSVC)
     string(APPEND CMAKE_CXX_FLAGS " /Zc:__cplusplus /wd4267 /wd4390 /wd4244")
-endif ()
+endif()
 
 # supress possible abi warning by upgrade compiler
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-psabi")
 # temporary fix for macOS 14 & CLT 15
-if (CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin"
-        AND CMAKE_HOST_SYSTEM_VERSION VERSION_GREATER_EQUAL 23)
+if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin"
+    AND CMAKE_HOST_SYSTEM_VERSION VERSION_GREATER_EQUAL 23)
     add_link_options(-Wl,-ld_classic)
-endif ()
+endif()
 
 set(CMAKE_CXX_EXTENSIONS OFF)
 
-if (CMAKE_SYSTEM_NAME MATCHES "CYGWIN" OR CMAKE_SYSTEM_NAME MATCHES "MSYS")
+if(CMAKE_SYSTEM_NAME MATCHES "CYGWIN" OR CMAKE_SYSTEM_NAME MATCHES "MSYS")
     set(CMAKE_CXX_EXTENSIONS ON)
-endif ()
+endif()
 
-if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     set(CMAKE_THREAD_LIBS_INIT "-lpthread")
     set(CMAKE_HAVE_THREADS_LIBRARY 1)
     set(CMAKE_USE_WIN32_THREADS_INIT 0)
     set(CMAKE_USE_PTHREADS_INIT 1)
     set(THREADS_PREFER_PTHREAD_FLAG ON)
     #set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++ -lc++abi")
-endif ()
+endif()
 
 # ----------------------------------------------------------------------------
 # Set OPFLOW_MASTER_PROJECT to ON if we are building opflow
 # ----------------------------------------------------------------------------
 # Check if opflow is being used directly or via add_subdirectory, but allow overriding
-if (NOT DEFINED OPFLOW_MASTER_PROJECT)
-    if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
+if(NOT DEFINED OPFLOW_MASTER_PROJECT)
+    if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
         set(OPFLOW_MASTER_PROJECT ON)
-    else ()
+    else()
         set(OPFLOW_MASTER_PROJECT OFF)
-    endif ()
-endif ()
+    endif()
+endif()
 
 option(OPFLOW_BUILD_ALL "Build all artifacts" OFF)
 
@@ -146,142 +146,125 @@ option(OPFLOW_VTK_EXTERNAL "Use external VTK library instead of bundled" OFF)
 option(OPFLOW_TBB_EXTERNAL "Use external Intel TBB library instead of bundled" OFF)
 
 # clang-tidy
-if (${CMAKE_VERSION} VERSION_GREATER "3.5")
+if(${CMAKE_VERSION} VERSION_GREATER "3.5")
     option(OPFLOW_TIDY "run clang-tidy" OFF)
-endif ()
+endif()
 
-if (OPFLOW_TIDY)
+if(OPFLOW_TIDY)
     set(CMAKE_CXX_CLANG_TIDY "clang-tidy")
     set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
     message(STATUS "Enabled clang-tidy")
-endif ()
-
-message(STATUS "Build type: " ${CMAKE_BUILD_TYPE})
+endif()
 
 # ----------------------------------------------------------------------------
-# Header only version
+# Compile options
 # ----------------------------------------------------------------------------
-add_library(opflow INTERFACE)
-add_library(opflow::opflow ALIAS opflow)
-
-# Create & include the version header
-configure_file(${CMAKE_CURRENT_LIST_DIR}/cmake/Version.hpp.in ${CMAKE_CURRENT_BINARY_DIR}/Version.hpp @ONLY)
+include(CheckCXXCompilerFlag)
+check_cxx_compiler_flag(-std=c++26 c++26support)
+if(NOT c++26support)
+    message(FATAL_ERROR "OpFlow requires C++26 to compile.")
+endif()
 
-target_include_directories(opflow INTERFACE
-        "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
-        "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src>"
-        "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/>"
-        "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
-        "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/src>")
+message(STATUS "Build type: " ${CMAKE_BUILD_TYPE})
+add_subdirectory(src)
 
 # ----------------------------------------------------------------------------
 # External dependencies
 # ----------------------------------------------------------------------------
 add_subdirectory(external)
 
-# ----------------------------------------------------------------------------
-# Compile options
-# ----------------------------------------------------------------------------
-include(CheckCXXCompilerFlag)
-check_cxx_compiler_flag(-std=c++26 c++26support)
-if (NOT c++26support)
-    message(FATAL_ERROR "OpFlow requires C++26 to compile.")
-endif ()
-target_compile_options(opflow INTERFACE -std=c++26)
-set_property(TARGET opflow PROPERTY CXX_SCAN_FOR_MODULES ON)
-
 # ----------------------------------------------------------------------------
 # Find MPI
 # ----------------------------------------------------------------------------
-if (OPFLOW_WITH_MPI)
+if(OPFLOW_WITH_MPI)
     find_package(MPI REQUIRED)
     target_link_libraries(opflow INTERFACE MPI::MPI_C MPI::MPI_CXX)
 
     list(APPEND PKG_CONFIG_REQUIRES MPI)
-endif ()
+endif()
 
 # ----------------------------------------------------------------------------
 # Find OpenMP
 # ----------------------------------------------------------------------------
-if (OPFLOW_WITH_OPENMP)
+if(OPFLOW_WITH_OPENMP)
     # workarounds for CI to find the correct libomp
-    if (APPLE)
-        if (EXISTS /usr/local/opt/llvm/lib)
+    if(APPLE)
+        if(EXISTS /usr/local/opt/llvm/lib)
             link_directories("/usr/local/opt/llvm/lib")
-        elseif (EXISTS /opt/homebrew/lib)
+        elseif(EXISTS /opt/homebrew/lib)
             link_directories("/opt/homebrew/lib")
-        endif ()
-    endif ()
-    if (CMAKE_C_COMPILER_ID MATCHES "Clang")
+        endif()
+    endif()
+    if(CMAKE_C_COMPILER_ID MATCHES "Clang")
         set(OpenMP_C "${CMAKE_C_COMPILER}")
         set(OpenMP_C_FLAGS "-fopenmp=libomp -Wno-unused-command-line-argument -Wno-deprecated-pragma")
         set(OpenMP_C_LIB_NAMES "omp")
         set(OpenMP_omp_LIBRARY ${OpenMP_C_LIB_NAMES})
-    endif ()
-    if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    endif()
+    if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
         set(OpenMP_CXX "${CMAKE_CXX_COMPILER}")
         set(OpenMP_CXX_FLAGS "-fopenmp=libomp -Wno-unused-command-line-argument")
         set(OpenMP_CXX_LIB_NAMES "omp")
         set(OpenMP_omp_LIBRARY ${OpenMP_CXX_LIB_NAMES})
-    endif ()
+    endif()
     find_package(OpenMP REQUIRED)
     target_link_libraries(opflow INTERFACE OpenMP::OpenMP_C OpenMP::OpenMP_CXX)
     target_compile_options(opflow INTERFACE ${OpenMP_CXX_FLAGS})
 
     list(APPEND PKG_CONFIG_REQUIRES OpenMP)
-endif ()
+endif()
 
 # ----------------------------------------------------------------------------
 # Platform detection
 # ----------------------------------------------------------------------------
-if (UNIX)
+if(UNIX)
     target_compile_definitions(opflow INTERFACE OPFLOW_PLATFORM_UNIX)
-elseif (APPLE)
+elseif(APPLE)
     target_compile_definitions(opflow INTERFACE OPFLOW_PLATFORM_APPLE)
-elseif (WIN32)
+elseif(WIN32)
     target_compile_definitions(opflow INTERFACE OPFLOW_PLATFORM_WIN)
-endif ()
+endif()
 
 # ----------------------------------------------------------------------------
 # Language & library features detection
 # ----------------------------------------------------------------------------
 include(CheckIncludeFiles)
 check_include_files("sys/mman.h" HAS_SYS_MMAN_H)
-if (HAS_SYS_MMAN_H)
+if(HAS_SYS_MMAN_H)
     target_compile_definitions(opflow INTERFACE OPFLOW_HAS_MMAN_H)
-endif ()
+endif()
 
 # ----------------------------------------------------------------------------
 # Misc definitions according to tweak options
 # ----------------------------------------------------------------------------
-foreach (
-        OPFLOW_OPTION
-        OPFLOW_SINGLE_PRECISION
-        OPFLOW_WITH_MPI
-        OPFLOW_WITH_OPENMP)
-    if (${OPFLOW_OPTION})
+foreach(
+    OPFLOW_OPTION
+    OPFLOW_SINGLE_PRECISION
+    OPFLOW_WITH_MPI
+    OPFLOW_WITH_OPENMP)
+    if(${OPFLOW_OPTION})
         target_compile_definitions(opflow INTERFACE ${OPFLOW_OPTION})
-    endif ()
-endforeach ()
-if (OPFLOW_WITH_MPI)
+    endif()
+endforeach()
+if(OPFLOW_WITH_MPI)
     target_compile_definitions(opflow INTERFACE OPFLOW_DISTRIBUTE_MODEL_MPI)
-endif ()
+endif()
 
-if (OPFLOW_NO_EXCEPTIONS AND NOT MSVC)
+if(OPFLOW_NO_EXCEPTIONS AND NOT MSVC)
     target_compile_options(opflow INTERFACE -fno-exceptions)
-endif ()
+endif()
 
 # sanitizer flags
 target_compile_options(opflow
-        INTERFACE $<$<BOOL:${OPFLOW_SANITIZE_ADDRESS}>: -fsanitize=address>
-        INTERFACE $<$<BOOL:${OPFLOW_SANITIZE_LEAK}>: -fsanitize=leak>
-        INTERFACE $<$<BOOL:${OPFLOW_SANITIZE_THREAD}>: -fsanitize=thread>
-        INTERFACE $<$<BOOL:${OPFLOW_SANITIZE_UB}>: -fsanitize=undefined>)
+    INTERFACE $<$<BOOL:${OPFLOW_SANITIZE_ADDRESS}>: -fsanitize=address>
+    INTERFACE $<$<BOOL:${OPFLOW_SANITIZE_LEAK}>: -fsanitize=leak>
+    INTERFACE $<$<BOOL:${OPFLOW_SANITIZE_THREAD}>: -fsanitize=thread>
+    INTERFACE $<$<BOOL:${OPFLOW_SANITIZE_UB}>: -fsanitize=undefined>)
 target_link_options(opflow
-        INTERFACE $<$<BOOL:${OPFLOW_SANITIZE_ADDRESS}>: -fsanitize=address>
-        INTERFACE $<$<BOOL:${OPFLOW_SANITIZE_LEAK}>: -fsanitize=leak>
-        INTERFACE $<$<BOOL:${OPFLOW_SANITIZE_THREAD}>: -fsanitize=thread>
-        INTERFACE $<$<BOOL:${OPFLOW_SANITIZE_UB}>: -fsanitize=undefined>)
+    INTERFACE $<$<BOOL:${OPFLOW_SANITIZE_ADDRESS}>: -fsanitize=address>
+    INTERFACE $<$<BOOL:${OPFLOW_SANITIZE_LEAK}>: -fsanitize=leak>
+    INTERFACE $<$<BOOL:${OPFLOW_SANITIZE_THREAD}>: -fsanitize=thread>
+    INTERFACE $<$<BOOL:${OPFLOW_SANITIZE_UB}>: -fsanitize=undefined>)
 
 # ----------------------------------------------------------------------------
 # All_CI target (= AllExamples + AllBenchmarks + AllTests)
@@ -291,24 +274,24 @@ add_custom_target(All_CI)
 # ----------------------------------------------------------------------------
 # Build binaries
 # ----------------------------------------------------------------------------
-if (OPFLOW_BUILD_EXAMPLES OR OPFLOW_BUILD_ALL)
+if(OPFLOW_BUILD_EXAMPLES OR OPFLOW_BUILD_ALL)
     message(STATUS "Generating examples")
     add_subdirectory(examples)
-endif ()
+endif()
 
 # ----------------------------------------------------------------------------
 # Build tests
 # ----------------------------------------------------------------------------
-if (OPFLOW_BUILD_TESTS OR OPFLOW_BUILD_ALL)
+if(OPFLOW_BUILD_TESTS OR OPFLOW_BUILD_ALL)
     message(STATUS "Generating tests")
     enable_testing()
     add_subdirectory(test)
-endif ()
+endif()
 
 # ----------------------------------------------------------------------------
 # Build benchmarks
 # ----------------------------------------------------------------------------
-if (OPFLOW_BUILD_BENCHMARKS OR OPFLOW_BUILD_ALL)
+if(OPFLOW_BUILD_BENCHMARKS OR OPFLOW_BUILD_ALL)
     message(STATUS "Generating benchmarks")
     # config google benchmark as part of the project
     set(BENCHMARK_ENABLE_INSTALL OFF)
@@ -316,61 +299,61 @@ if (OPFLOW_BUILD_BENCHMARKS OR OPFLOW_BUILD_ALL)
     set(BENCHMARK_ENABLE_GTEST_TESTS OFF)
     add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/external/benchmark EXCLUDE_FROM_ALL)
     add_subdirectory(benchmark)
-endif ()
+endif()
 
 # ----------------------------------------------------------------------------
 # Build docs
 # ----------------------------------------------------------------------------
-if (OPFLOW_BUILD_DOCS OR OPFLOW_BUILD_ALL)
+if(OPFLOW_BUILD_DOCS OR OPFLOW_BUILD_ALL)
     message(STATUS "Generating docs")
     find_program(SPHINX_PATH sphinx-build
-            HINTS $ENV{PATH} ${SPHINX_DIR})
-    if (NOT SPHINX_PATH)
+        HINTS $ENV{PATH} ${SPHINX_DIR})
+    if(NOT SPHINX_PATH)
         message(FATAL_ERROR "sphinx-build not found. Please install it via \
         instructions at https://www.sphinx-doc.org/en/master/usage/installation.html")
-    else ()
+    else()
         message(STATUS "Found sphinx-build at ${SPHINX_PATH}")
-    endif ()
+    endif()
     find_program(DOXYGEN_PATH doxygen
-            HINTS ${DOXYGEN_DIR}
-            REQUIRED
-            )
-    if (NOT DOXYGEN_PATH)
+        HINTS ${DOXYGEN_DIR}
+        REQUIRED
+    )
+    if(NOT DOXYGEN_PATH)
         message(FATAL_ERROR "Doxygen not found. Please install doxygen with version >= 1.9.2")
-    else ()
+    else()
         execute_process(
-                COMMAND ${DOXYGEN_PATH} --version
-                RESULT_VARIABLE _
-                OUTPUT_VARIABLE _out
+            COMMAND ${DOXYGEN_PATH} --version
+            RESULT_VARIABLE _
+            OUTPUT_VARIABLE _out
         )
         string(REGEX REPLACE "\n$" "" _out "${_out}")
-        if (${_out} VERSION_LESS "1.9.2")
+        if(${_out} VERSION_LESS "1.9.2")
             message(FATAL_ERROR "Doxygen version too low. Found v${_out}, require >= v1.9.2")
-        endif ()
-    endif ()
+        endif()
+    endif()
     message(STATUS "Found Doxygen version: ${_out}")
     configure_file(doc/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
     file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/doxygen)
     add_custom_target(doxygen_doc
-            COMMAND ${DOXYGEN_PATH} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
-            WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+        COMMAND ${DOXYGEN_PATH} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
+        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
     add_custom_target(doc
-            COMMAND ${SPHINX_PATH} -b html
-            -Dbreathe_projects.OpFlow=${CMAKE_CURRENT_BINARY_DIR}/doc/doxygen/xml
-            ${CMAKE_CURRENT_LIST_DIR}/doc ${CMAKE_CURRENT_BINARY_DIR}/doc
-            DEPENDS doxygen_doc
-            WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-endif ()
+        COMMAND ${SPHINX_PATH} -b html
+        -Dbreathe_projects.OpFlow=${CMAKE_CURRENT_BINARY_DIR}/doc/doxygen/xml
+        ${CMAKE_CURRENT_LIST_DIR}/doc ${CMAKE_CURRENT_BINARY_DIR}/doc
+        DEPENDS doxygen_doc
+        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+endif()
 
 # ----------------------------------------------------------------------------
 # Install
 # ----------------------------------------------------------------------------
-if (OPFLOW_INSTALL)
+if(OPFLOW_INSTALL)
     message(STATUS "Generating install")
-    IF (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+    IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
         SET(CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}" CACHE PATH "" FORCE)
         message(STATUS "Install prefix set to: ${CMAKE_INSTALL_PREFIX}")
-    ENDIF (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+    ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
     set(project_config_in "${CMAKE_CURRENT_LIST_DIR}/cmake/opflowConfig.cmake.in")
     set(project_config_out "${CMAKE_CURRENT_BINARY_DIR}/opflowConfig.cmake")
     set(config_targets_file "opflowConfigTargets.cmake")
@@ -386,16 +369,16 @@ if (OPFLOW_INSTALL)
     install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/src/ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/src")
     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Version.hpp DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
     install(
-            TARGETS opflow
-            EXPORT opflow
-            LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-            ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-            RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+        TARGETS opflow
+        EXPORT opflow
+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 
-    if (OPFLOW_WITH_VTK AND NOT OPFLOW_VTK_EXTERNAL)
+    if(OPFLOW_WITH_VTK AND NOT OPFLOW_VTK_EXTERNAL)
         install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/vtk/
-                DESTINATION "${CMAKE_INSTALL_PREFIX}")
-    endif ()
+            DESTINATION "${CMAKE_INSTALL_PREFIX}")
+    endif()
 
     # ----------------------------------------------------------------------------
     # Install CMake config files
@@ -412,15 +395,15 @@ if (OPFLOW_INSTALL)
     # Support creation of installable packages
     # ----------------------------------------------------------------------------
     #include(cmake/opflowCPack.cmake)
-endif ()
+endif()
 
 # uninstall target
-if (NOT TARGET uninstall)
+if(NOT TARGET uninstall)
     configure_file(
-            "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
-            "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
-            IMMEDIATE @ONLY)
+        "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
+        "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+        IMMEDIATE @ONLY)
 
     add_custom_target(uninstall
-            COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
-endif ()
+        COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
+endif()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644
index 00000000..6c45b1fa
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,75 @@
+# ----------------------------------------------------------------------------
+# CMakeLists.txt for the opflow library
+# ----------------------------------------------------------------------------
+cmake_minimum_required(VERSION 3.16)
+
+# ----------------------------------------------------------------------------
+# Header only version
+# ----------------------------------------------------------------------------
+add_library(opflow INTERFACE)
+add_library(opflow::opflow ALIAS opflow)
+
+target_compile_options(opflow INTERFACE -std=c++26)
+set_property(TARGET opflow PROPERTY CXX_SCAN_FOR_MODULES ON)
+
+# Create & include the version header
+configure_file(${CMAKE_CURRENT_LIST_DIR}/../cmake/Version.hpp.in ${CMAKE_BINARY_DIR}/Version.hpp @ONLY)
+
+target_include_directories(opflow INTERFACE
+    "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/../include>"
+    "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/../src>"
+    "$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/>"
+    "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
+    "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/src>")
+
+# ----------------------------------------------------------------------------
+# Platform detection
+# ----------------------------------------------------------------------------
+if(UNIX)
+    target_compile_definitions(opflow INTERFACE OPFLOW_PLATFORM_UNIX)
+elseif(APPLE)
+    target_compile_definitions(opflow INTERFACE OPFLOW_PLATFORM_APPLE)
+elseif(WIN32)
+    target_compile_definitions(opflow INTERFACE OPFLOW_PLATFORM_WIN)
+endif()
+
+# ----------------------------------------------------------------------------
+# Language & library features detection
+# ----------------------------------------------------------------------------
+include(CheckIncludeFiles)
+check_include_files("sys/mman.h" HAS_SYS_MMAN_H)
+if(HAS_SYS_MMAN_H)
+    target_compile_definitions(opflow INTERFACE OPFLOW_HAS_MMAN_H)
+endif()
+
+# ----------------------------------------------------------------------------
+# Misc definitions according to tweak options
+# ----------------------------------------------------------------------------
+foreach(
+    OPFLOW_OPTION
+    OPFLOW_SINGLE_PRECISION
+    OPFLOW_WITH_MPI
+    OPFLOW_WITH_OPENMP)
+    if(${OPFLOW_OPTION})
+        target_compile_definitions(opflow INTERFACE ${OPFLOW_OPTION})
+    endif()
+endforeach()
+if(OPFLOW_WITH_MPI)
+    target_compile_definitions(opflow INTERFACE OPFLOW_DISTRIBUTE_MODEL_MPI)
+endif()
+
+if(OPFLOW_NO_EXCEPTIONS AND NOT MSVC)
+    target_compile_options(opflow INTERFACE -fno-exceptions)
+endif()
+
+# sanitizer flags
+target_compile_options(opflow
+    INTERFACE $<$<BOOL:${OPFLOW_SANITIZE_ADDRESS}>: -fsanitize=address>
+    INTERFACE $<$<BOOL:${OPFLOW_SANITIZE_LEAK}>: -fsanitize=leak>
+    INTERFACE $<$<BOOL:${OPFLOW_SANITIZE_THREAD}>: -fsanitize=thread>
+    INTERFACE $<$<BOOL:${OPFLOW_SANITIZE_UB}>: -fsanitize=undefined>)
+target_link_options(opflow
+    INTERFACE $<$<BOOL:${OPFLOW_SANITIZE_ADDRESS}>: -fsanitize=address>
+    INTERFACE $<$<BOOL:${OPFLOW_SANITIZE_LEAK}>: -fsanitize=leak>
+    INTERFACE $<$<BOOL:${OPFLOW_SANITIZE_THREAD}>: -fsanitize=thread>
+    INTERFACE $<$<BOOL:${OPFLOW_SANITIZE_UB}>: -fsanitize=undefined>)

From 44b9314ceca522513c1b1d0bbded1051c2aa70cd Mon Sep 17 00:00:00 2001
From: Luohao Wang <luohaothu@live.com>
Date: Mon, 2 Jun 2025 12:58:19 +0800
Subject: [PATCH 07/31] [Ext] Update external deps

---
 external/amgcl/CMakeLists.txt                 |    4 +-
 external/googletest/.clang-format             |    4 +-
 .../.github/ISSUE_TEMPLATE/00-bug_report.md   |   35 -
 .../.github/ISSUE_TEMPLATE/00-bug_report.yml  |   53 +
 .../ISSUE_TEMPLATE/10-feature_request.md      |   21 -
 .../ISSUE_TEMPLATE/10-feature_request.yml     |   33 +
 .../.github/ISSUE_TEMPLATE/config.yml         |    4 +
 external/googletest/.gitignore                |    5 +
 external/googletest/BUILD.bazel               |   78 +-
 external/googletest/CMakeLists.txt            |   45 +-
 external/googletest/CONTRIBUTING.md           |  152 +-
 external/googletest/CONTRIBUTORS              |    3 +
 .../scripts/upload_gtest.py => MODULE.bazel}  |   86 +-
 external/googletest/README.md                 |  161 +-
 external/googletest/WORKSPACE                 |   63 +-
 external/googletest/WORKSPACE.bzlmod          |   35 +
 external/googletest/ci/linux-presubmit.sh     |   85 +-
 external/googletest/ci/macos-presubmit.sh     |   13 +-
 external/googletest/ci/windows-presubmit.bat  |   75 +
 external/googletest/docs/_data/navigation.yml |   84 +-
 .../googletest/docs/_layouts/default.html     |   79 +-
 external/googletest/docs/_sass/main.scss      |    2 +-
 external/googletest/docs/advanced.md          | 1706 ++--
 .../docs/community_created_documentation.md   |    7 +-
 external/googletest/docs/faq.md               |  567 +-
 external/googletest/docs/gmock_cheat_sheet.md |   76 +-
 external/googletest/docs/gmock_cook_book.md   | 2180 +++--
 external/googletest/docs/gmock_faq.md         |  216 +-
 external/googletest/docs/gmock_for_dummies.md |  594 +-
 external/googletest/docs/index.md             |   28 +-
 external/googletest/docs/pkgconfig.md         |   95 +-
 external/googletest/docs/platforms.md         |   36 +-
 external/googletest/docs/primer.md            |  389 +-
 external/googletest/docs/quickstart-bazel.md  |  119 +-
 external/googletest/docs/quickstart-cmake.md  |   84 +-
 external/googletest/docs/reference/actions.md |   44 +-
 .../googletest/docs/reference/assertions.md   |  279 +-
 .../googletest/docs/reference/matchers.md     |  209 +-
 external/googletest/docs/reference/mocking.md |  259 +-
 external/googletest/docs/reference/testing.md |  590 +-
 external/googletest/docs/samples.md           |   31 +-
 external/googletest/fake_fuchsia_sdk.bzl      |   61 +
 external/googletest/googlemock/CMakeLists.txt |  295 +-
 external/googletest/googlemock/README.md      |   47 +-
 external/googletest/googlemock/docs/README.md |    4 +-
 .../googlemock/include/gmock/gmock-actions.h  | 1146 ++-
 .../include/gmock/gmock-cardinalities.h       |    7 +-
 .../include/gmock/gmock-function-mocker.h     |  142 +-
 .../googlemock/include/gmock/gmock-matchers.h | 1347 ++-
 .../include/gmock/gmock-more-actions.h        |  630 +-
 .../include/gmock/gmock-more-matchers.h       |   64 +-
 .../include/gmock/gmock-nice-strict.h         |   40 +-
 .../include/gmock/gmock-spec-builders.h       |  648 +-
 .../googlemock/include/gmock/gmock.h          |   22 +-
 .../include/gmock/internal/custom/README.md   |   14 +-
 .../internal/custom/gmock-generated-actions.h |    3 +-
 .../gmock/internal/custom/gmock-matchers.h    |    7 +-
 .../gmock/internal/custom/gmock-port.h        |    5 +-
 .../gmock/internal/gmock-internal-utils.h     |   91 +-
 .../include/gmock/internal/gmock-port.h       |   78 +-
 .../googletest/googlemock/scripts/README.md   |    4 -
 .../googlemock/scripts/fuse_gmock_files.py    |  256 -
 .../googlemock/scripts/generator/LICENSE      |  203 -
 .../googlemock/scripts/generator/README       |   34 -
 .../scripts/generator/README.cppclean         |  115 -
 .../scripts/generator/cpp/__init__.py         |    0
 .../googlemock/scripts/generator/cpp/ast.py   | 1772 ----
 .../scripts/generator/cpp/gmock_class.py      |  247 -
 .../scripts/generator/cpp/gmock_class_test.py |  570 --
 .../scripts/generator/cpp/keywords.py         |   55 -
 .../scripts/generator/cpp/tokenize.py         |  279 -
 .../googlemock/scripts/generator/cpp/utils.py |   37 -
 .../googlemock/scripts/generator/gmock_gen.py |   30 -
 .../googlemock/src/gmock-cardinalities.cc     |   11 +-
 .../googlemock/src/gmock-internal-utils.cc    |   98 +-
 .../googlemock/src/gmock-matchers.cc          |   37 +-
 .../googlemock/src/gmock-spec-builders.cc     |  225 +-
 external/googletest/googlemock/src/gmock.cc   |   61 +-
 .../googletest/googlemock/src/gmock_main.cc   |    9 +-
 .../googletest/googlemock/test/BUILD.bazel    |    4 +-
 .../googlemock/test/gmock-actions_test.cc     |  858 +-
 .../test/gmock-cardinalities_test.cc          |    7 +-
 .../test/gmock-function-mocker_test.cc        |  184 +-
 .../test/gmock-internal-utils_test.cc         |  105 +-
 .../test/gmock-matchers-arithmetic_test.cc    | 1699 ++++
 .../test/gmock-matchers-comparisons_test.cc   | 2496 +++++
 .../test/gmock-matchers-containers_test.cc    | 3446 +++++++
 .../test/gmock-matchers-misc_test.cc          | 1882 ++++
 .../googlemock/test/gmock-matchers_test.cc    | 8498 -----------------
 .../googlemock/test/gmock-matchers_test.h     |  192 +
 .../test/gmock-more-actions_test.cc           |  125 +-
 .../googlemock/test/gmock-nice-strict_test.cc |   60 +-
 .../googlemock/test/gmock-pp_test.cc          |    2 +-
 .../test/gmock-spec-builders_test.cc          |  242 +-
 .../googlemock/test/gmock_all_test.cc         |    5 +-
 .../googlemock/test/gmock_ex_test.cc          |    2 +
 .../googlemock/test/gmock_leak_test.py        |   99 +-
 .../googlemock/test/gmock_leak_test_.cc       |    7 +-
 .../googlemock/test/gmock_link_test.h         |   31 +-
 .../googlemock/test/gmock_output_test.py      |  162 +-
 .../googlemock/test/gmock_output_test_.cc     |   26 +-
 .../test/gmock_output_test_golden.txt         |   30 +-
 .../googlemock/test/gmock_stress_test.cc      |   53 +-
 .../googletest/googlemock/test/gmock_test.cc  |   38 +-
 .../googlemock/test/gmock_test_utils.py       |   78 +-
 external/googletest/googletest/CMakeLists.txt |  461 +-
 external/googletest/googletest/README.md      |  202 +-
 .../googletest/cmake/Config.cmake.in          |    4 +
 .../googletest/cmake/internal_utils.cmake     |  510 +-
 external/googletest/googletest/docs/README.md |    4 +-
 .../include/gtest/gtest-assertion-result.h    |  244 +
 .../include/gtest/gtest-death-test.h          |   28 +-
 .../googletest/include/gtest/gtest-matchers.h |  106 +-
 .../googletest/include/gtest/gtest-message.h  |   44 +-
 .../include/gtest/gtest-param-test.h          |  180 +-
 .../googletest/include/gtest/gtest-printers.h |  250 +-
 .../googletest/include/gtest/gtest-spi.h      |   23 +-
 .../include/gtest/gtest-test-part.h           |   18 +-
 .../include/gtest/gtest-typed-test.h          |   52 +-
 .../googletest/include/gtest/gtest.h          |  411 +-
 .../include/gtest/gtest_pred_impl.h           |   12 +-
 .../googletest/include/gtest/gtest_prod.h     |    3 +-
 .../include/gtest/internal/custom/README.md   |   44 +-
 .../internal/gtest-death-test-internal.h      |   84 +-
 .../include/gtest/internal/gtest-filepath.h   |   31 +-
 .../include/gtest/internal/gtest-internal.h   |  323 +-
 .../include/gtest/internal/gtest-param-util.h |  320 +-
 .../include/gtest/internal/gtest-port-arch.h  |   12 +-
 .../include/gtest/internal/gtest-port.h       | 1469 +--
 .../include/gtest/internal/gtest-string.h     |    9 +-
 .../include/gtest/internal/gtest-type-util.h  |   38 +-
 .../googletest/samples/prime_tables.h         |    7 +-
 .../googletest/samples/sample10_unittest.cc   |    1 -
 .../googletest/samples/sample3_unittest.cc    |    2 +-
 .../googletest/samples/sample5_unittest.cc    |    2 +-
 .../googletest/samples/sample6_unittest.cc    |    2 +-
 .../googletest/samples/sample7_unittest.cc    |    2 +-
 .../googletest/samples/sample8_unittest.cc    |    8 +-
 .../googletest/samples/sample9_unittest.cc    |    7 +-
 .../googletest/googletest/scripts/README.md   |    4 -
 .../googletest/googletest/scripts/common.py   |   81 -
 .../googletest/scripts/fuse_gtest_files.py    |  254 -
 .../googletest/scripts/gen_gtest_pred_impl.py |  737 --
 .../googletest/scripts/gtest-config.in        |  274 -
 .../googletest/scripts/release_docs.py        |  160 -
 .../googletest/scripts/run_with_path.py       |   34 -
 .../googletest/googletest/scripts/upload.py   | 1410 ---
 .../googletest/googletest/src/gtest-all.cc    |    1 +
 .../googletest/src/gtest-assertion-result.cc  |   77 +
 .../googletest/src/gtest-death-test.cc        |  246 +-
 .../googletest/src/gtest-filepath.cc          |  189 +-
 .../googletest/src/gtest-internal-inl.h       |  250 +-
 .../googletest/googletest/src/gtest-port.cc   |  258 +-
 .../googletest/src/gtest-printers.cc          |   59 +-
 .../googletest/src/gtest-test-part.cc         |    5 +-
 .../googletest/src/gtest-typed-test.cc        |    6 +-
 external/googletest/googletest/src/gtest.cc   | 1551 +--
 .../googletest/googletest/src/gtest_main.cc   |   19 +-
 .../googletest/googletest/test/BUILD.bazel    |   75 +-
 .../googletest-break-on-failure-unittest.py   |  232 +-
 .../googletest-break-on-failure-unittest_.cc  |    8 +-
 .../test/googletest-catch-exceptions-test.py  |  392 +-
 .../googletest/test/googletest-color-test.py  |  147 +-
 .../test/googletest-death-test-test.cc        |  502 +-
 .../test/googletest-death-test_ex_test.cc     |    8 +-
 .../test/googletest-env-var-test.py           |  101 +-
 .../test/googletest-env-var-test_.cc          |   30 +-
 ...no-test-linked-test-with-disabled-test_.cc |   38 +
 ...-no-test-linked-test-with-enabled-test_.cc |   38 +
 .../googletest-fail-if-no-test-linked-test.py |  169 +
 .../test/googletest-failfast-unittest.py      |  696 +-
 .../test/googletest-filepath-test.cc          |   50 +-
 .../test/googletest-filter-unittest.py        |  918 +-
 .../googletest-global-environment-unittest.py |  111 +-
 .../test/googletest-json-outfiles-test.py     |  263 +-
 .../test/googletest-json-output-unittest.py   | 1609 ++--
 .../test/googletest-list-tests-unittest.py    |  195 +-
 .../test/googletest-list-tests-unittest_.cc   |    3 +
 .../test/googletest-listener-test.cc          |   45 +-
 .../test/googletest-message-test.cc           |   44 +-
 .../test/googletest-options-test.cc           |   55 +-
 .../googletest-output-test-golden-lin.txt     |   33 +-
 .../googletest/test/googletest-output-test.py |  437 +-
 .../test/googletest-output-test_.cc           |   37 +-
 ...oogletest-param-test-invalid-name1-test.py |   24 +-
 ...oogletest-param-test-invalid-name2-test.py |   24 +-
 ...ogletest-param-test-invalid-name2-test_.cc |    2 +
 .../test/googletest-param-test-test.cc        |  161 +-
 .../googletest/test/googletest-port-test.cc   |  146 +-
 .../test/googletest-printers-test.cc          |  538 +-
 .../test/googletest-setuptestsuite-test.py    |   27 +-
 .../test/googletest-setuptestsuite-test_.cc   |    4 +-
 .../test/googletest-shuffle-test.py           |  512 +-
 .../test/googletest-shuffle-test_.cc          |    4 +-
 .../test/googletest-throw-on-failure-test.py  |  203 +-
 .../test/googletest-uninitialized-test.py     |   37 +-
 .../googletest/test/gtest-typed-test_test.cc  |    5 +-
 .../test/gtest-unittest-api_test.cc           |   24 +-
 .../googletest/test/gtest_dirs_test.cc        |  101 +
 .../googletest/test/gtest_environment_test.cc |  102 +-
 .../googletest/test/gtest_help_test.py        |  208 +-
 .../googletest/test/gtest_help_test_.cc       |    2 +-
 .../googletest/test/gtest_json_test_utils.py  |   57 +-
 .../test/gtest_list_output_unittest.py        |  103 +-
 .../test/gtest_pred_impl_unittest.cc          |   14 +-
 .../googletest/test/gtest_prod_test.cc        |    2 +-
 .../googletest/test/gtest_repeat_test.cc      |   38 +-
 .../test/gtest_skip_check_output_test.py      |   19 +-
 ...test_skip_environment_check_output_test.py |   13 +-
 .../googletest/test/gtest_stress_test.cc      |    9 +-
 .../googletest/test/gtest_test_utils.py       |  364 +-
 .../googletest/test/gtest_testbridge_test.py  |   26 +-
 .../test/gtest_throw_on_failure_ex_test.cc    |    2 +-
 .../googletest/test/gtest_unittest.cc         | 2169 ++---
 .../test/gtest_xml_outfile2_test_.cc          |   38 +-
 .../test/gtest_xml_outfiles_test.py           |  142 +-
 .../test/gtest_xml_output_unittest.py         |  560 +-
 .../test/gtest_xml_output_unittest_.cc        |   55 +-
 .../googletest/test/gtest_xml_test_utils.py   |  357 +-
 external/googletest/googletest_deps.bzl       |   28 +
 external/googletest/library.json              |   62 -
 external/tbb/CMakeLists.txt                   |    2 +-
 external/tecio/teciompisrc/CMakeLists.txt     |    2 +-
 external/tecio/teciosrc/CMakeLists.txt        |    2 +-
 224 files changed, 31023 insertions(+), 29583 deletions(-)
 delete mode 100644 external/googletest/.github/ISSUE_TEMPLATE/00-bug_report.md
 create mode 100644 external/googletest/.github/ISSUE_TEMPLATE/00-bug_report.yml
 delete mode 100644 external/googletest/.github/ISSUE_TEMPLATE/10-feature_request.md
 create mode 100644 external/googletest/.github/ISSUE_TEMPLATE/10-feature_request.yml
 rename external/googletest/{googletest/scripts/upload_gtest.py => MODULE.bazel} (50%)
 create mode 100644 external/googletest/WORKSPACE.bzlmod
 create mode 100644 external/googletest/ci/windows-presubmit.bat
 create mode 100644 external/googletest/fake_fuchsia_sdk.bzl
 delete mode 100644 external/googletest/googlemock/scripts/README.md
 delete mode 100644 external/googletest/googlemock/scripts/fuse_gmock_files.py
 delete mode 100644 external/googletest/googlemock/scripts/generator/LICENSE
 delete mode 100644 external/googletest/googlemock/scripts/generator/README
 delete mode 100644 external/googletest/googlemock/scripts/generator/README.cppclean
 delete mode 100644 external/googletest/googlemock/scripts/generator/cpp/__init__.py
 delete mode 100644 external/googletest/googlemock/scripts/generator/cpp/ast.py
 delete mode 100644 external/googletest/googlemock/scripts/generator/cpp/gmock_class.py
 delete mode 100644 external/googletest/googlemock/scripts/generator/cpp/gmock_class_test.py
 delete mode 100644 external/googletest/googlemock/scripts/generator/cpp/keywords.py
 delete mode 100644 external/googletest/googlemock/scripts/generator/cpp/tokenize.py
 delete mode 100644 external/googletest/googlemock/scripts/generator/cpp/utils.py
 delete mode 100644 external/googletest/googlemock/scripts/generator/gmock_gen.py
 create mode 100644 external/googletest/googlemock/test/gmock-matchers-arithmetic_test.cc
 create mode 100644 external/googletest/googlemock/test/gmock-matchers-comparisons_test.cc
 create mode 100644 external/googletest/googlemock/test/gmock-matchers-containers_test.cc
 create mode 100644 external/googletest/googlemock/test/gmock-matchers-misc_test.cc
 delete mode 100644 external/googletest/googlemock/test/gmock-matchers_test.cc
 create mode 100644 external/googletest/googlemock/test/gmock-matchers_test.h
 mode change 100644 => 100755 external/googletest/googlemock/test/gmock_leak_test.py
 mode change 100644 => 100755 external/googletest/googlemock/test/gmock_output_test.py
 mode change 100644 => 100755 external/googletest/googlemock/test/gmock_test_utils.py
 create mode 100644 external/googletest/googletest/include/gtest/gtest-assertion-result.h
 delete mode 100644 external/googletest/googletest/scripts/README.md
 delete mode 100644 external/googletest/googletest/scripts/common.py
 delete mode 100644 external/googletest/googletest/scripts/fuse_gtest_files.py
 delete mode 100644 external/googletest/googletest/scripts/gen_gtest_pred_impl.py
 delete mode 100644 external/googletest/googletest/scripts/gtest-config.in
 delete mode 100644 external/googletest/googletest/scripts/release_docs.py
 delete mode 100644 external/googletest/googletest/scripts/run_with_path.py
 delete mode 100644 external/googletest/googletest/scripts/upload.py
 create mode 100644 external/googletest/googletest/src/gtest-assertion-result.cc
 mode change 100644 => 100755 external/googletest/googletest/test/googletest-break-on-failure-unittest.py
 mode change 100644 => 100755 external/googletest/googletest/test/googletest-catch-exceptions-test.py
 mode change 100644 => 100755 external/googletest/googletest/test/googletest-color-test.py
 mode change 100644 => 100755 external/googletest/googletest/test/googletest-env-var-test.py
 create mode 100644 external/googletest/googletest/test/googletest-fail-if-no-test-linked-test-with-disabled-test_.cc
 create mode 100644 external/googletest/googletest/test/googletest-fail-if-no-test-linked-test-with-enabled-test_.cc
 create mode 100755 external/googletest/googletest/test/googletest-fail-if-no-test-linked-test.py
 mode change 100644 => 100755 external/googletest/googletest/test/googletest-failfast-unittest.py
 mode change 100644 => 100755 external/googletest/googletest/test/googletest-filter-unittest.py
 mode change 100644 => 100755 external/googletest/googletest/test/googletest-list-tests-unittest.py
 mode change 100644 => 100755 external/googletest/googletest/test/googletest-output-test.py
 mode change 100644 => 100755 external/googletest/googletest/test/googletest-setuptestsuite-test.py
 mode change 100644 => 100755 external/googletest/googletest/test/googletest-shuffle-test.py
 mode change 100644 => 100755 external/googletest/googletest/test/googletest-throw-on-failure-test.py
 mode change 100644 => 100755 external/googletest/googletest/test/googletest-uninitialized-test.py
 create mode 100644 external/googletest/googletest/test/gtest_dirs_test.cc
 mode change 100644 => 100755 external/googletest/googletest/test/gtest_help_test.py
 mode change 100644 => 100755 external/googletest/googletest/test/gtest_skip_check_output_test.py
 mode change 100644 => 100755 external/googletest/googletest/test/gtest_skip_environment_check_output_test.py
 mode change 100644 => 100755 external/googletest/googletest/test/gtest_test_utils.py
 mode change 100644 => 100755 external/googletest/googletest/test/gtest_testbridge_test.py
 mode change 100644 => 100755 external/googletest/googletest/test/gtest_xml_outfiles_test.py
 mode change 100644 => 100755 external/googletest/googletest/test/gtest_xml_output_unittest.py
 mode change 100644 => 100755 external/googletest/googletest/test/gtest_xml_test_utils.py
 create mode 100644 external/googletest/googletest_deps.bzl
 delete mode 100644 external/googletest/library.json

diff --git a/external/amgcl/CMakeLists.txt b/external/amgcl/CMakeLists.txt
index f2288442..44162c72 100755
--- a/external/amgcl/CMakeLists.txt
+++ b/external/amgcl/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.1...3.28)
 if (NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "Build type")
     message(STATUS "No build type selected, default to ${CMAKE_BUILD_TYPE}")
@@ -7,7 +7,7 @@ endif()
 project(AMGCL)
 
 if (NOT (CMAKE_VERSION LESS 3.3))
-    cmake_policy(SET CMP0058 OLD)
+    #cmake_policy(SET CMP0058 OLD)
 endif()
 
 set(AMGCL_MASTER_PROJECT OFF)
diff --git a/external/googletest/.clang-format b/external/googletest/.clang-format
index 56ba7ee4..5b9bfe6d 100644
--- a/external/googletest/.clang-format
+++ b/external/googletest/.clang-format
@@ -1,4 +1,4 @@
 # Run manually to reformat a file:
 # clang-format -i --style=file <file>
-Language: Cpp
-BasedOnStyle: Google
+Language:        Cpp
+BasedOnStyle:  Google
diff --git a/external/googletest/.github/ISSUE_TEMPLATE/00-bug_report.md b/external/googletest/.github/ISSUE_TEMPLATE/00-bug_report.md
deleted file mode 100644
index 8bfa24a3..00000000
--- a/external/googletest/.github/ISSUE_TEMPLATE/00-bug_report.md
+++ /dev/null
@@ -1,35 +0,0 @@
----
-name: Bug report about: Create a report to help us improve title: ''
-labels: 'bug' assignees: ''
----
-
-**Describe the bug**
-
-Include a clear and concise description of what the problem is, including what you expected to happen, and what actually
-happened.
-
-**Steps to reproduce the bug**
-
-It's important that we are able to reproduce the problem that you are experiencing. Please provide all code and relevant
-steps to reproduce the problem, including your `BUILD`/`CMakeLists.txt` file and build commands. Links to a GitHub
-branch or [godbolt.org](https://godbolt.org/) that demonstrate the problem are also helpful.
-
-**Does the bug persist in the most recent commit?**
-
-We recommend using the latest commit in the master branch in your projects.
-
-**What operating system and version are you using?**
-
-If you are using a Linux distribution please include the name and version of the distribution as well.
-
-**What compiler and version are you using?**
-
-Please include the output of `gcc -v` or `clang -v`, or the equivalent for your compiler.
-
-**What build system are you using?**
-
-Please include the output of `bazel --version` or `cmake --version`, or the equivalent for your build system.
-
-**Additional context**
-
-Add any other context about the problem here.
diff --git a/external/googletest/.github/ISSUE_TEMPLATE/00-bug_report.yml b/external/googletest/.github/ISSUE_TEMPLATE/00-bug_report.yml
new file mode 100644
index 00000000..586779ad
--- /dev/null
+++ b/external/googletest/.github/ISSUE_TEMPLATE/00-bug_report.yml
@@ -0,0 +1,53 @@
+name: Bug Report
+description: Let us know that something does not work as expected.
+title: "[Bug]: Please title this bug report"
+body:
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: Describe the issue
+      description: What happened, and what did you expect to happen?
+    validations:
+      required: true
+  - type: textarea
+    id: steps
+    attributes:
+      label: Steps to reproduce the problem
+      description: It is important that we are able to reproduce the problem that you are experiencing. Please provide all code and relevant steps to reproduce the problem, including your `BUILD`/`CMakeLists.txt` file and build commands. Links to a GitHub branch or [godbolt.org](https://godbolt.org/) that demonstrate the problem are also helpful.
+    validations:
+      required: true
+  - type: textarea
+    id: version
+    attributes:
+      label: What version of GoogleTest are you using?
+      description: Please include the output of `git rev-parse HEAD` or the GoogleTest release version number that you are using.
+    validations:
+      required: true
+  - type: textarea
+    id: os
+    attributes:
+      label: What operating system and version are you using?
+      description: If you are using a Linux distribution please include the name and version of the distribution as well.
+    validations:
+      required: true
+  - type: textarea
+    id: compiler
+    attributes:
+      label: What compiler and version are you using?
+      description: Please include the output of `gcc -v` or `clang -v`, or the equivalent for your compiler.
+    validations:
+      required: true
+  - type: textarea
+    id: buildsystem
+    attributes:
+      label: What build system are you using?
+      description: Please include the output of `bazel --version` or `cmake --version`, or the equivalent for your build system.
+    validations:
+      required: true
+  - type: textarea
+    id: additional
+    attributes:
+      label: Additional context
+      description: Add any other context about the problem here.
+    validations:
+      required: false
diff --git a/external/googletest/.github/ISSUE_TEMPLATE/10-feature_request.md b/external/googletest/.github/ISSUE_TEMPLATE/10-feature_request.md
deleted file mode 100644
index 586b9b2e..00000000
--- a/external/googletest/.github/ISSUE_TEMPLATE/10-feature_request.md
+++ /dev/null
@@ -1,21 +0,0 @@
----
-name: Feature request about: Propose a new feature title: ''
-labels: 'enhancement' assignees: ''
----
-
-**Does the feature exist in the most recent commit?**
-
-We recommend using the latest commit from GitHub in your projects.
-
-**Why do we need this feature?**
-
-Ideally, explain why a combination of existing features cannot be used instead.
-
-**Describe the proposal**
-
-Include a detailed description of the feature, with usage examples.
-
-**Is the feature specific to an operating system, compiler, or build system version?**
-
-If it is, please specify which versions.
-
diff --git a/external/googletest/.github/ISSUE_TEMPLATE/10-feature_request.yml b/external/googletest/.github/ISSUE_TEMPLATE/10-feature_request.yml
new file mode 100644
index 00000000..f3bbc091
--- /dev/null
+++ b/external/googletest/.github/ISSUE_TEMPLATE/10-feature_request.yml
@@ -0,0 +1,33 @@
+name: Feature request
+description: Propose a new feature.
+title: "[FR]: Please title this feature request"
+labels: "enhancement"
+body:
+  - type: textarea
+    id: version
+    attributes:
+      label: Does the feature exist in the most recent commit?
+      description: We recommend using the latest commit from GitHub in your projects.
+    validations:
+      required: true
+  - type: textarea
+    id: why
+    attributes:
+      label: Why do we need this feature?
+      description: Ideally, explain why a combination of existing features cannot be used instead.
+    validations:
+      required: true
+  - type: textarea
+    id: proposal
+    attributes:
+      label: Describe the proposal.
+      description: Include a detailed description of the feature, with usage examples.
+    validations:
+      required: true
+  - type: textarea
+    id: platform
+    attributes:
+      label: Is the feature specific to an operating system, compiler, or build system version?
+      description: If it is, please specify which versions.
+    validations:
+      required: true
diff --git a/external/googletest/.github/ISSUE_TEMPLATE/config.yml b/external/googletest/.github/ISSUE_TEMPLATE/config.yml
index 3ba13e0c..65170d10 100644
--- a/external/googletest/.github/ISSUE_TEMPLATE/config.yml
+++ b/external/googletest/.github/ISSUE_TEMPLATE/config.yml
@@ -1 +1,5 @@
 blank_issues_enabled: false
+contact_links:
+    - name: Get Help
+      url: https://github.com/google/googletest/discussions
+      about: Please ask and answer questions here.
diff --git a/external/googletest/.gitignore b/external/googletest/.gitignore
index f08cb72a..f0df39db 100644
--- a/external/googletest/.gitignore
+++ b/external/googletest/.gitignore
@@ -8,6 +8,7 @@ bazel-genfiles
 bazel-googletest
 bazel-out
 bazel-testlogs
+MODULE.bazel.lock
 # python
 *.pyc
 
@@ -24,6 +25,10 @@ Win32-Release/
 x64-Debug/
 x64-Release/
 
+# VSCode files
+.cache/
+cmake-variants.yaml
+
 # Ignore autoconf / automake files
 Makefile.in
 aclocal.m4
diff --git a/external/googletest/BUILD.bazel b/external/googletest/BUILD.bazel
index 965c518d..53501454 100644
--- a/external/googletest/BUILD.bazel
+++ b/external/googletest/BUILD.bazel
@@ -30,19 +30,38 @@
 #
 #   Bazel Build for Google C++ Testing Framework(Google Test)
 
-load("@rules_cc//cc:defs.bzl", "cc_library", "cc_test")
-
 package(default_visibility = ["//visibility:public"])
 
 licenses(["notice"])
 
 exports_files(["LICENSE"])
 
+config_setting(
+    name = "qnx",
+    constraint_values = ["@platforms//os:qnx"],
+)
+
 config_setting(
     name = "windows",
     constraint_values = ["@platforms//os:windows"],
 )
 
+config_setting(
+    name = "freebsd",
+    constraint_values = ["@platforms//os:freebsd"],
+)
+
+config_setting(
+    name = "openbsd",
+    constraint_values = ["@platforms//os:openbsd"],
+)
+
+# NOTE: Fuchsia is not an officially supported platform.
+config_setting(
+    name = "fuchsia",
+    constraint_values = ["@platforms//os:fuchsia"],
+)
+
 config_setting(
     name = "msvc_compiler",
     flag_values = {
@@ -64,6 +83,10 @@ cc_library(
 )
 
 # Google Test including Google Mock
+
+# For an actual test, use `gtest` and also `gtest_main` if you depend on gtest's
+# main(). For a library, use `gtest_for_library` instead if the library can be
+# testonly.
 cc_library(
     name = "gtest",
     srcs = glob(
@@ -86,6 +109,7 @@ cc_library(
         "googlemock/include/gmock/*.h",
     ]),
     copts = select({
+        ":qnx": [],
         ":windows": [],
         "//conditions:default": ["-pthread"],
     }),
@@ -104,23 +128,59 @@ cc_library(
         "googletest/include",
     ],
     linkopts = select({
+        ":qnx": ["-lregex"],
         ":windows": [],
+        ":freebsd": [
+            "-lm",
+            "-pthread",
+        ],
+        ":openbsd": [
+            "-lm",
+            "-pthread",
+        ],
         "//conditions:default": ["-pthread"],
     }),
     deps = select({
         ":has_absl": [
-            "@com_google_absl//absl/debugging:failure_signal_handler",
-            "@com_google_absl//absl/debugging:stacktrace",
-            "@com_google_absl//absl/debugging:symbolize",
-            "@com_google_absl//absl/strings",
-            "@com_google_absl//absl/types:any",
-            "@com_google_absl//absl/types:optional",
-            "@com_google_absl//absl/types:variant",
+            "@abseil-cpp//absl/container:flat_hash_set",
+            "@abseil-cpp//absl/debugging:failure_signal_handler",
+            "@abseil-cpp//absl/debugging:stacktrace",
+            "@abseil-cpp//absl/debugging:symbolize",
+            "@abseil-cpp//absl/flags:flag",
+            "@abseil-cpp//absl/flags:parse",
+            "@abseil-cpp//absl/flags:reflection",
+            "@abseil-cpp//absl/flags:usage",
+            "@abseil-cpp//absl/strings",
+            "@abseil-cpp//absl/types:any",
+            "@abseil-cpp//absl/types:optional",
+            "@abseil-cpp//absl/types:variant",
+            "@re2//:re2",
+        ],
+        "//conditions:default": [],
+    }) + select({
+        # `gtest-death-test.cc` has `EXPECT_DEATH` that spawns a process,
+        # expects it to crash and inspects its logs with the given matcher,
+        # so that's why these libraries are needed.
+        # Otherwise, builds targeting Fuchsia would fail to compile.
+        ":fuchsia": [
+            "@fuchsia_sdk//pkg/fdio",
+            "@fuchsia_sdk//pkg/syslog",
+            "@fuchsia_sdk//pkg/zx",
         ],
         "//conditions:default": [],
     }),
 )
 
+# `gtest`, but testonly. See guidance on `gtest` for when to use this.
+alias(
+    name = "gtest_for_library",
+    actual = ":gtest",
+    testonly = True,
+)
+
+# Implements main() for tests using gtest. Prefer to depend on `gtest` as well
+# to ensure compliance with the layering_check Bazel feature where only the
+# direct hdrs values are available.
 cc_library(
     name = "gtest_main",
     srcs = ["googlemock/src/gmock_main.cc"],
diff --git a/external/googletest/CMakeLists.txt b/external/googletest/CMakeLists.txt
index c94dc57c..0567ae7d 100644
--- a/external/googletest/CMakeLists.txt
+++ b/external/googletest/CMakeLists.txt
@@ -1,37 +1,36 @@
 # Note: CMake support is community-based. The maintainers do not use CMake
 # internally.
 
-cmake_minimum_required(VERSION 2.8.12)
-
-if (POLICY CMP0048)
-    cmake_policy(SET CMP0048 NEW)
-endif (POLICY CMP0048)
+cmake_minimum_required(VERSION 3.16)
 
 project(googletest-distribution)
-set(GOOGLETEST_VERSION 1.11.0)
+set(GOOGLETEST_VERSION 1.17.0)
 
-if (CMAKE_VERSION VERSION_GREATER "3.0.2")
-    if (NOT CYGWIN AND NOT MSYS AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL QNX)
-        set(CMAKE_CXX_EXTENSIONS OFF)
-    endif ()
-endif ()
+if(NOT CYGWIN AND NOT MSYS AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL QNX)
+  set(CMAKE_CXX_EXTENSIONS OFF)
+endif()
 
 enable_testing()
 
 include(CMakeDependentOption)
 include(GNUInstallDirs)
 
-#Note that googlemock target already builds googletest
+# Note that googlemock target already builds googletest.
 option(BUILD_GMOCK "Builds the googlemock subproject" ON)
 option(INSTALL_GTEST "Enable installation of googletest. (Projects embedding googletest may want to turn this OFF.)" ON)
-
-# temporary fix for macOS 14 & CLT 15
-if (CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin"
-        AND CMAKE_HOST_SYSTEM_VERSION VERSION_GREATER_EQUAL 23)
-    add_link_options(-Wl,-ld_classic)
-endif ()
-if (BUILD_GMOCK)
-    add_subdirectory(googlemock)
-else ()
-    add_subdirectory(googletest)
-endif ()
+option(GTEST_HAS_ABSL "Use Abseil and RE2. Requires Abseil and RE2 to be separately added to the build." OFF)
+
+if(GTEST_HAS_ABSL)
+  if(NOT TARGET absl::base)
+    find_package(absl REQUIRED)
+  endif()
+  if(NOT TARGET re2::re2)
+    find_package(re2 REQUIRED)
+  endif()
+endif()
+
+if(BUILD_GMOCK)
+  add_subdirectory( googlemock )
+else()
+  add_subdirectory( googletest )
+endif()
diff --git a/external/googletest/CONTRIBUTING.md b/external/googletest/CONTRIBUTING.md
index e93fe630..ab5a47bf 100644
--- a/external/googletest/CONTRIBUTING.md
+++ b/external/googletest/CONTRIBUTING.md
@@ -2,80 +2,95 @@
 
 ## Contributor License Agreements
 
-We'd love to accept your patches! Before we can take them, we have to jump a couple of legal hurdles.
+We'd love to accept your patches! Before we can take them, we have to jump a
+couple of legal hurdles.
 
 Please fill out either the individual or corporate Contributor License Agreement
 (CLA).
 
-* If you are an individual writing original source code and you're sure you own the intellectual property, then you'll
-  need to sign an
-  [individual CLA](https://developers.google.com/open-source/cla/individual).
-* If you work for a company that wants to allow you to contribute your work, then you'll need to sign a
-  [corporate CLA](https://developers.google.com/open-source/cla/corporate).
+*   If you are an individual writing original source code and you're sure you
+    own the intellectual property, then you'll need to sign an
+    [individual CLA](https://developers.google.com/open-source/cla/individual).
+*   If you work for a company that wants to allow you to contribute your work,
+    then you'll need to sign a
+    [corporate CLA](https://developers.google.com/open-source/cla/corporate).
 
-Follow either of the two links above to access the appropriate CLA and instructions for how to sign and return it. Once
-we receive it, we'll be able to accept your pull requests.
+Follow either of the two links above to access the appropriate CLA and
+instructions for how to sign and return it. Once we receive it, we'll be able to
+accept your pull requests.
 
 ## Are you a Googler?
 
-If you are a Googler, please make an attempt to submit an internal change rather than a GitHub Pull Request. If you are
-not able to submit an internal change a PR is acceptable as an alternative.
+If you are a Googler, please make an attempt to submit an internal contribution
+rather than a GitHub Pull Request. If you are not able to submit internally, a
+PR is acceptable as an alternative.
 
 ## Contributing A Patch
 
-1. Submit an issue describing your proposed change to the
-   [issue tracker](https://github.com/google/googletest/issues).
-2. Please don't mix more than one logical change per submittal, because it makes the history hard to follow. If you want
-   to make a change that doesn't have a corresponding issue in the issue tracker, please create one.
-3. Also, coordinate with team members that are listed on the issue in question. This ensures that work isn't being
-   duplicated and communicating your plan early also generally leads to better patches.
-4. If your proposed change is accepted, and you haven't already done so, sign a Contributor License Agreement (see
-   details above).
-5. Fork the desired repo, develop and test your code changes.
-6. Ensure that your code adheres to the existing style in the sample to which you are contributing.
-7. Ensure that your code has an appropriate set of unit tests which all pass.
-8. Submit a pull request.
+1.  Submit an issue describing your proposed change to the
+    [issue tracker](https://github.com/google/googletest/issues).
+2.  Please don't mix more than one logical change per submittal, because it
+    makes the history hard to follow. If you want to make a change that doesn't
+    have a corresponding issue in the issue tracker, please create one.
+3.  Also, coordinate with team members that are listed on the issue in question.
+    This ensures that work isn't being duplicated and communicating your plan
+    early also generally leads to better patches.
+4.  If your proposed change is accepted, and you haven't already done so, sign a
+    Contributor License Agreement
+    ([see details above](#contributor-license-agreements)).
+5.  Fork the desired repo, develop and test your code changes.
+6.  Ensure that your code adheres to the existing style in the sample to which
+    you are contributing.
+7.  Ensure that your code has an appropriate set of unit tests which all pass.
+8.  Submit a pull request.
 
 ## The Google Test and Google Mock Communities
 
 The Google Test community exists primarily through the
-[discussion group](http://groups.google.com/group/googletestframework) and the GitHub repository. Likewise, the Google
-Mock community exists primarily through their own [discussion group](http://groups.google.com/group/googlemock). You are
-definitely encouraged to contribute to the discussion and you can also help us to keep the effectiveness of the group
-high by following and promoting the guidelines listed here.
+[discussion group](https://groups.google.com/group/googletestframework) and the
+GitHub repository. Likewise, the Google Mock community exists primarily through
+their own [discussion group](https://groups.google.com/group/googlemock). You
+are definitely encouraged to contribute to the discussion and you can also help
+us to keep the effectiveness of the group high by following and promoting the
+guidelines listed here.
 
 ### Please Be Friendly
 
-Showing courtesy and respect to others is a vital part of the Google culture, and we strongly encourage everyone
-participating in Google Test development to join us in accepting nothing less. Of course, being courteous is not the
-same as failing to constructively disagree with each other, but it does mean that we should be respectful of each other
-when enumerating the 42 technical reasons that a particular proposal may not be the best choice. There's never a reason
-to be antagonistic or dismissive toward anyone who is sincerely trying to contribute to a discussion.
+Showing courtesy and respect to others is a vital part of the Google culture,
+and we strongly encourage everyone participating in Google Test development to
+join us in accepting nothing less. Of course, being courteous is not the same as
+failing to constructively disagree with each other, but it does mean that we
+should be respectful of each other when enumerating the 42 technical reasons
+that a particular proposal may not be the best choice. There's never a reason to
+be antagonistic or dismissive toward anyone who is sincerely trying to
+contribute to a discussion.
 
-Sure, C++ testing is serious business and all that, but it's also a lot of fun. Let's keep it that way. Let's strive to
-be one of the friendliest communities in all of open source.
+Sure, C++ testing is serious business and all that, but it's also a lot of fun.
+Let's keep it that way. Let's strive to be one of the friendliest communities in
+all of open source.
 
-As always, discuss Google Test in the official GoogleTest discussion group. You don't have to actually submit code in
-order to sign up. Your participation itself is a valuable contribution.
+As always, discuss Google Test in the official GoogleTest discussion group. You
+don't have to actually submit code in order to sign up. Your participation
+itself is a valuable contribution.
 
 ## Style
 
-To keep the source consistent, readable, diffable and easy to merge, we use a fairly rigid coding style, as defined by
-the
-[google-styleguide](https://github.com/google/styleguide) project. All patches will be expected to conform to the style
-outlined
+To keep the source consistent, readable, diffable and easy to merge, we use a
+fairly rigid coding style, as defined by the
+[google-styleguide](https://github.com/google/styleguide) project. All patches
+will be expected to conform to the style outlined
 [here](https://google.github.io/styleguide/cppguide.html). Use
-[.clang-format](https://github.com/google/googletest/blob/master/.clang-format)
-to check your formatting.
+[.clang-format](https://github.com/google/googletest/blob/main/.clang-format) to
+check your formatting.
 
 ## Requirements for Contributors
 
-If you plan to contribute a patch, you need to build Google Test, Google Mock, and their own tests from a git checkout,
-which has further requirements:
+If you plan to contribute a patch, you need to build Google Test, Google Mock,
+and their own tests from a git checkout, which has further requirements:
 
-* [Python](https://www.python.org/) v2.3 or newer (for running some of the tests and re-generating certain source files
-  from templates)
-* [CMake](https://cmake.org/) v2.8.12 or newer
+*   [Python](https://www.python.org/) v3.6 or newer (for running some of the
+    tests and re-generating certain source files from templates)
+*   [CMake](https://cmake.org/) v2.8.12 or newer
 
 ## Developing Google Test and Google Mock
 
@@ -83,31 +98,44 @@ This section discusses how to make your own changes to the Google Test project.
 
 ### Testing Google Test and Google Mock Themselves
 
-To make sure your changes work as intended and don't break existing functionality, you'll want to compile and run Google
-Test and GoogleMock's own tests. For that you can use CMake:
+To make sure your changes work as intended and don't break existing
+functionality, you'll want to compile and run Google Test and GoogleMock's own
+tests. For that you can use CMake:
 
-    mkdir mybuild
-    cd mybuild
-    cmake -Dgtest_build_tests=ON -Dgmock_build_tests=ON ${GTEST_REPO_DIR}
+```
+mkdir mybuild
+cd mybuild
+cmake -Dgtest_build_tests=ON -Dgmock_build_tests=ON ${GTEST_REPO_DIR}
+```
 
-To choose between building only Google Test or Google Mock, you may modify your cmake command to be one of each
+To choose between building only Google Test or Google Mock, you may modify your
+cmake command to be one of each
 
-    cmake -Dgtest_build_tests=ON ${GTEST_DIR} # sets up Google Test tests
-    cmake -Dgmock_build_tests=ON ${GMOCK_DIR} # sets up Google Mock tests
+```
+cmake -Dgtest_build_tests=ON ${GTEST_DIR} # sets up Google Test tests
+cmake -Dgmock_build_tests=ON ${GMOCK_DIR} # sets up Google Mock tests
+```
 
-Make sure you have Python installed, as some of Google Test's tests are written in Python. If the cmake command
-complains about not being able to find Python
-(`Could NOT find PythonInterp (missing: PYTHON_EXECUTABLE)`), try telling it explicitly where your Python executable can
-be found:
+Make sure you have Python installed, as some of Google Test's tests are written
+in Python. If the cmake command complains about not being able to find Python
+(`Could NOT find PythonInterp (missing: PYTHON_EXECUTABLE)`), try telling it
+explicitly where your Python executable can be found:
 
-    cmake -DPYTHON_EXECUTABLE=path/to/python ...
+```
+cmake -DPYTHON_EXECUTABLE=path/to/python ...
+```
 
-Next, you can build Google Test and / or Google Mock and all desired tests. On \*nix, this is usually done by
+Next, you can build Google Test and / or Google Mock and all desired tests. On
+\*nix, this is usually done by
 
-    make
+```
+make
+```
 
 To run the tests, do
 
-    make test
+```
+make test
+```
 
 All tests should pass.
diff --git a/external/googletest/CONTRIBUTORS b/external/googletest/CONTRIBUTORS
index 76db0b40..ccea41ea 100644
--- a/external/googletest/CONTRIBUTORS
+++ b/external/googletest/CONTRIBUTORS
@@ -34,6 +34,7 @@ Manuel Klimek <klimek@google.com>
 Mario Tanev <radix@google.com>
 Mark Paskin
 Markus Heule <markus.heule@gmail.com>
+Martijn Vels <mvels@google.com>
 Matthew Simmons <simmonmt@acm.org>
 Mika Raento <mikie@iki.fi>
 Mike Bland <mbland@google.com>
@@ -54,7 +55,9 @@ Russ Cox <rsc@google.com>
 Russ Rufer <russ@pentad.com>
 Sean Mcafee <eefacm@gmail.com>
 Sigurður Ásgeirsson <siggi@google.com>
+Soyeon Kim <sxshx818@naver.com>
 Sverre Sundsdal <sundsdal@gmail.com>
+Szymon Sobik <sobik.szymon@gmail.com>
 Takeshi Yoshino <tyoshino@google.com>
 Tracy Bialik <tracy@pentad.com>
 Vadim Berman <vadimb@google.com>
diff --git a/external/googletest/googletest/scripts/upload_gtest.py b/external/googletest/MODULE.bazel
similarity index 50%
rename from external/googletest/googletest/scripts/upload_gtest.py
rename to external/googletest/MODULE.bazel
index efb7101b..5cb0b156 100644
--- a/external/googletest/googletest/scripts/upload_gtest.py
+++ b/external/googletest/MODULE.bazel
@@ -1,7 +1,6 @@
-#!/usr/bin/env python
+# Copyright 2024 Google Inc.
+# All Rights Reserved.
 #
-# Copyright 2009, Google Inc.
-# All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
@@ -29,50 +28,49 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-"""upload_gtest.py v0.1.0 -- uploads a Google Test patch for review.
+# https://bazel.build/external/overview#bzlmod
 
-This simple wrapper passes all command line flags and
---cc=googletestframework@googlegroups.com to upload.py.
+module(
+    name = "googletest",
+    version = "1.17.0",
+    compatibility_level = 1,
+)
 
-USAGE: upload_gtest.py [options for upload.py]
-"""
+# Only direct dependencies need to be listed below.
+# Please keep the versions in sync with the versions in the WORKSPACE file.
 
-__author__ = 'wan@google.com (Zhanyong Wan)'
+bazel_dep(
+    name = "abseil-cpp",
+    version = "20250127.1",
+)
+bazel_dep(
+    name = "platforms",
+    version = "0.0.11",
+)
+bazel_dep(
+    name = "re2",
+    version = "2024-07-02.bcr.1",
+)
 
-import os
-import sys
+bazel_dep(
+    name = "rules_python",
+    version = "1.3.0",
+    dev_dependency = True,
+)
 
-CC_FLAG = '--cc='
-GTEST_GROUP = 'googletestframework@googlegroups.com'
+# https://rules-python.readthedocs.io/en/stable/toolchains.html#library-modules-with-dev-only-python-usage
+python = use_extension(
+    "@rules_python//python/extensions:python.bzl",
+    "python",
+    dev_dependency = True,
+)
+python.toolchain(
+    ignore_root_user_error = True,
+    is_default = True,
+    python_version = "3.12",
+)
 
-
-def main():
-    # Finds the path to upload.py, assuming it is in the same directory
-    # as this file.
-    my_dir = os.path.dirname(os.path.abspath(__file__))
-    upload_py_path = os.path.join(my_dir, 'upload.py')
-
-    # Adds Google Test discussion group to the cc line if it's not there
-    # already.
-    upload_py_argv = [upload_py_path]
-    found_cc_flag = False
-    for arg in sys.argv[1:]:
-        if arg.startswith(CC_FLAG):
-            found_cc_flag = True
-            cc_line = arg[len(CC_FLAG):]
-            cc_list = [addr for addr in cc_line.split(',') if addr]
-            if GTEST_GROUP not in cc_list:
-                cc_list.append(GTEST_GROUP)
-            upload_py_argv.append(CC_FLAG + ','.join(cc_list))
-        else:
-            upload_py_argv.append(arg)
-
-    if not found_cc_flag:
-        upload_py_argv.append(CC_FLAG + GTEST_GROUP)
-
-    # Invokes upload.py with the modified command line flags.
-    os.execv(upload_py_path, upload_py_argv)
-
-
-if __name__ == '__main__':
-    main()
+# See fake_fuchsia_sdk.bzl for instructions on how to override this with a real SDK, if needed.
+fuchsia_sdk = use_extension("//:fake_fuchsia_sdk.bzl", "fuchsia_sdk")
+fuchsia_sdk.create_fake()
+use_repo(fuchsia_sdk, "fuchsia_sdk")
diff --git a/external/googletest/README.md b/external/googletest/README.md
index 95ada68a..598cf312 100644
--- a/external/googletest/README.md
+++ b/external/googletest/README.md
@@ -2,38 +2,38 @@
 
 ### Announcements
 
-#### Live at Head
-
-GoogleTest now follows the
-[Abseil Live at Head philosophy](https://abseil.io/about/philosophy#upgrade-support). We recommend using the latest
-commit in the `master` branch in your projects.
-
 #### Documentation Updates
 
 Our documentation is now live on GitHub Pages at
-https://google.github.io/googletest/. We recommend browsing the documentation on GitHub Pages rather than directly in
-the repository.
+https://google.github.io/googletest/. We recommend browsing the documentation on
+GitHub Pages rather than directly in the repository.
+
+#### Release 1.17.0
+
+[Release 1.17.0](https://github.com/google/googletest/releases/tag/v1.17.0) is
+now available.
 
-#### Release 1.10.x
+The 1.17.x branch [requires at least C++17]((https://opensource.google/documentation/policies/cplusplus-support#c_language_standard).
 
-[Release 1.10.x](https://github.com/google/googletest/releases/tag/release-1.10.0)
-is now available.
+#### Continuous Integration
+
+We use Google's internal systems for continuous integration.
 
 #### Coming Soon
 
-* We are planning to take a dependency on
-  [Abseil](https://github.com/abseil/abseil-cpp).
-* More documentation improvements are planned.
+*   We are planning to take a dependency on
+    [Abseil](https://github.com/abseil/abseil-cpp).
 
 ## Welcome to **GoogleTest**, Google's C++ test framework!
 
-This repository is a merger of the formerly separate GoogleTest and GoogleMock projects. These were so closely related
-that it makes sense to maintain and release them together.
+This repository is a merger of the formerly separate GoogleTest and GoogleMock
+projects. These were so closely related that it makes sense to maintain and
+release them together.
 
 ### Getting Started
 
-See the [GoogleTest User's Guide](https://google.github.io/googletest/) for documentation. We recommend starting with
-the
+See the [GoogleTest User's Guide](https://google.github.io/googletest/) for
+documentation. We recommend starting with the
 [GoogleTest Primer](https://google.github.io/googletest/primer.html).
 
 More information about building GoogleTest can be found at
@@ -41,88 +41,93 @@ More information about building GoogleTest can be found at
 
 ## Features
 
-* An [xUnit](https://en.wikipedia.org/wiki/XUnit) test framework.
-* Test discovery.
-* A rich set of assertions.
-* User-defined assertions.
-* Death tests.
-* Fatal and non-fatal failures.
-* Value-parameterized tests.
-* Type-parameterized tests.
-* Various options for running the tests.
-* XML test report generation.
+*   xUnit test framework: \
+    Googletest is based on the [xUnit](https://en.wikipedia.org/wiki/XUnit)
+    testing framework, a popular architecture for unit testing
+*   Test discovery: \
+    Googletest automatically discovers and runs your tests, eliminating the need
+    to manually register your tests
+*   Rich set of assertions: \
+    Googletest provides a variety of assertions, such as equality, inequality,
+    exceptions, and more, making it easy to test your code
+*   User-defined assertions: \
+    You can define your own assertions with Googletest, making it simple to
+    write tests that are specific to your code
+*   Death tests: \
+    Googletest supports death tests, which verify that your code exits in a
+    certain way, making it useful for testing error-handling code
+*   Fatal and non-fatal failures: \
+    You can specify whether a test failure should be treated as fatal or
+    non-fatal with Googletest, allowing tests to continue running even if a
+    failure occurs
+*   Value-parameterized tests: \
+    Googletest supports value-parameterized tests, which run multiple times with
+    different input values, making it useful for testing functions that take
+    different inputs
+*   Type-parameterized tests: \
+    Googletest also supports type-parameterized tests, which run with different
+    data types, making it useful for testing functions that work with different
+    data types
+*   Various options for running tests: \
+    Googletest provides many options for running tests including running
+    individual tests, running tests in a specific order and running tests in
+    parallel
 
 ## Supported Platforms
 
-GoogleTest requires a codebase and compiler compliant with the C++11 standard or newer.
-
-The GoogleTest code is officially supported on the following platforms. Operating systems or tools not listed below are
-community-supported. For community-supported platforms, patches that do not complicate the code may be considered.
-
-If you notice any problems on your platform, please file an issue on the
-[GoogleTest GitHub Issue Tracker](https://github.com/google/googletest/issues). Pull requests containing fixes are
-welcome!
-
-### Operating Systems
-
-* Linux
-* macOS
-* Windows
-
-### Compilers
-
-* gcc 5.0+
-* clang 5.0+
-* MSVC 2015+
-
-**macOS users:** Xcode 9.3+ provides clang 5.0+.
-
-### Build Systems
-
-* [Bazel](https://bazel.build/)
-* [CMake](https://cmake.org/)
-
-**Note:** Bazel is the build system used by the team internally and in tests. CMake is supported on a best-effort basis
-and by the community.
+GoogleTest follows Google's
+[Foundational C++ Support Policy](https://opensource.google/documentation/policies/cplusplus-support).
+See
+[this table](https://github.com/google/oss-policies-info/blob/main/foundational-cxx-support-matrix.md)
+for a list of currently supported versions of compilers, platforms, and build
+tools.
 
 ## Who Is Using GoogleTest?
 
-In addition to many internal projects at Google, GoogleTest is also used by the following notable projects:
+In addition to many internal projects at Google, GoogleTest is also used by the
+following notable projects:
 
-* The [Chromium projects](http://www.chromium.org/) (behind the Chrome browser and Chrome OS).
-* The [LLVM](http://llvm.org/) compiler.
-* [Protocol Buffers](https://github.com/google/protobuf), Google's data interchange format.
-* The [OpenCV](http://opencv.org/) computer vision library.
+*   The [Chromium projects](https://www.chromium.org/) (behind the Chrome
+    browser and Chrome OS).
+*   The [LLVM](https://llvm.org/) compiler.
+*   [Protocol Buffers](https://github.com/google/protobuf), Google's data
+    interchange format.
+*   The [OpenCV](https://opencv.org/) computer vision library.
 
 ## Related Open Source Projects
 
-[GTest Runner](https://github.com/nholthaus/gtest-runner) is a Qt5 based automated test-runner and Graphical User
-Interface with powerful features for Windows and Linux platforms.
+[GTest Runner](https://github.com/nholthaus/gtest-runner) is a Qt5 based
+automated test-runner and Graphical User Interface with powerful features for
+Windows and Linux platforms.
 
-[GoogleTest UI](https://github.com/ospector/gtest-gbar) is a test runner that runs your test binary, allows you to track
-its progress via a progress bar, and displays a list of test failures. Clicking on one shows failure text. Google Test
+[GoogleTest UI](https://github.com/ospector/gtest-gbar) is a test runner that
+runs your test binary, allows you to track its progress via a progress bar, and
+displays a list of test failures. Clicking on one shows failure text. GoogleTest
 UI is written in C#.
 
-[GTest TAP Listener](https://github.com/kinow/gtest-tap-listener) is an event listener for GoogleTest that implements
-the
-[TAP protocol](https://en.wikipedia.org/wiki/Test_Anything_Protocol) for test result output. If your test runner
-understands TAP, you may find it useful.
+[GTest TAP Listener](https://github.com/kinow/gtest-tap-listener) is an event
+listener for GoogleTest that implements the
+[TAP protocol](https://en.wikipedia.org/wiki/Test_Anything_Protocol) for test
+result output. If your test runner understands TAP, you may find it useful.
 
-[gtest-parallel](https://github.com/google/gtest-parallel) is a test runner that runs tests from your binary in parallel
-to provide significant speed-up.
+[gtest-parallel](https://github.com/google/gtest-parallel) is a test runner that
+runs tests from your binary in parallel to provide significant speed-up.
 
 [GoogleTest Adapter](https://marketplace.visualstudio.com/items?itemName=DavidSchuldenfrei.gtest-adapter)
-is a VS Code extension allowing to view GoogleTest in a tree view, and run/debug your tests.
+is a VS Code extension allowing to view GoogleTest in a tree view and run/debug
+your tests.
 
-[C++ TestMate](https://github.com/matepek/vscode-catch2-test-adapter) is a VS Code extension allowing to view GoogleTest
-in a tree view, and run/debug your tests.
+[C++ TestMate](https://github.com/matepek/vscode-catch2-test-adapter) is a VS
+Code extension allowing to view GoogleTest in a tree view and run/debug your
+tests.
 
-[Cornichon](https://pypi.org/project/cornichon/) is a small Gherkin DSL parser that generates stub code for GoogleTest.
+[Cornichon](https://pypi.org/project/cornichon/) is a small Gherkin DSL parser
+that generates stub code for GoogleTest.
 
 ## Contributing Changes
 
 Please read
-[`CONTRIBUTING.md`](https://github.com/google/googletest/blob/master/CONTRIBUTING.md)
+[`CONTRIBUTING.md`](https://github.com/google/googletest/blob/main/CONTRIBUTING.md)
 for details on how to contribute to this project.
 
 Happy testing!
diff --git a/external/googletest/WORKSPACE b/external/googletest/WORKSPACE
index 614f5577..0ae5dee9 100644
--- a/external/googletest/WORKSPACE
+++ b/external/googletest/WORKSPACE
@@ -1,24 +1,61 @@
-workspace(name = "com_google_googletest")
+# Copyright 2024 Google Inc.
+# All Rights Reserved.
+#
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+workspace(name = "googletest")
+
+load("//:googletest_deps.bzl", "googletest_deps")
+googletest_deps()
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 http_archive(
-    name = "com_google_absl",
-    urls = ["https://github.com/abseil/abseil-cpp/archive/7971fb358ae376e016d2d4fc9327aad95659b25e.zip"],  # 2021-05-20T02:59:16Z
-    strip_prefix = "abseil-cpp-7971fb358ae376e016d2d4fc9327aad95659b25e",
-    sha256 = "aeba534f7307e36fe084b452299e49b97420667a8d28102cf9a0daeed340b859",
+    name = "rules_python",
+    sha256 = "2cc26bbd53854ceb76dd42a834b1002cd4ba7f8df35440cf03482e045affc244",
+    strip_prefix = "rules_python-1.3.0",
+    url = "https://github.com/bazelbuild/rules_python/releases/download/1.3.0/rules_python-1.3.0.tar.gz",
 )
+# https://github.com/bazelbuild/rules_python/releases/tag/1.1.0
+load("@rules_python//python:repositories.bzl", "py_repositories")
+py_repositories()
 
 http_archive(
-  name = "rules_cc",
-  urls = ["https://github.com/bazelbuild/rules_cc/archive/68cb652a71e7e7e2858c50593e5a9e3b94e5b9a9.zip"],  # 2021-05-14T14:51:14Z
-  strip_prefix = "rules_cc-68cb652a71e7e7e2858c50593e5a9e3b94e5b9a9",
-  sha256 = "1e19e9a3bc3d4ee91d7fcad00653485ee6c798efbbf9588d40b34cbfbded143d",
+  name = "bazel_skylib",
+  sha256 = "cd55a062e763b9349921f0f5db8c3933288dc8ba4f76dd9416aac68acee3cb94",
+  urls = ["https://github.com/bazelbuild/bazel-skylib/releases/download/1.5.0/bazel-skylib-1.5.0.tar.gz"],
 )
 
 http_archive(
-  name = "rules_python",
-  urls = ["https://github.com/bazelbuild/rules_python/archive/ed6cc8f2c3692a6a7f013ff8bc185ba77eb9b4d2.zip"],  # 2021-05-17T00:24:16Z
-  strip_prefix = "rules_python-ed6cc8f2c3692a6a7f013ff8bc185ba77eb9b4d2",
-  sha256 = "98b3c592faea9636ac8444bfd9de7f3fb4c60590932d6e6ac5946e3f8dbd5ff6",
+    name = "platforms",
+    urls = [
+        "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.11/platforms-0.0.11.tar.gz",
+        "https://github.com/bazelbuild/platforms/releases/download/0.0.11/platforms-0.0.11.tar.gz",
+    ],
+    sha256 = "29742e87275809b5e598dc2f04d86960cc7a55b3067d97221c9abbc9926bff0f",
 )
diff --git a/external/googletest/WORKSPACE.bzlmod b/external/googletest/WORKSPACE.bzlmod
new file mode 100644
index 00000000..381432c5
--- /dev/null
+++ b/external/googletest/WORKSPACE.bzlmod
@@ -0,0 +1,35 @@
+# Copyright 2024 Google Inc.
+# All Rights Reserved.
+#
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# https://bazel.build/external/migration#workspace.bzlmod
+#
+# This file is intentionally empty. When bzlmod is enabled and this
+# file exists, the content of WORKSPACE is ignored. This prevents
+# bzlmod builds from unintentionally depending on the WORKSPACE file.
diff --git a/external/googletest/ci/linux-presubmit.sh b/external/googletest/ci/linux-presubmit.sh
index 6bea1cde..6491e798 100644
--- a/external/googletest/ci/linux-presubmit.sh
+++ b/external/googletest/ci/linux-presubmit.sh
@@ -31,39 +31,59 @@
 
 set -euox pipefail
 
-readonly LINUX_LATEST_CONTAINER="gcr.io/google.com/absl-177019/linux_hybrid-latest:20210525"
-readonly LINUX_GCC_FLOOR_CONTAINER="gcr.io/google.com/absl-177019/linux_gcc-floor:20201015"
+readonly LINUX_LATEST_CONTAINER="gcr.io/google.com/absl-177019/linux_hybrid-latest:20241218"
+readonly LINUX_GCC_FLOOR_CONTAINER="gcr.io/google.com/absl-177019/linux_gcc-floor:20250205"
 
 if [[ -z ${GTEST_ROOT:-} ]]; then
   GTEST_ROOT="$(realpath $(dirname ${0})/..)"
 fi
 
 if [[ -z ${STD:-} ]]; then
-  STD="c++11 c++14 c++17 c++20"
+  STD="c++17 c++20"
 fi
 
-# Test the CMake build
-for cc in /usr/local/bin/gcc /opt/llvm/clang/bin/clang; do
-  for cmake_off_on in OFF ON; do
-    time docker run \
-      --volume="${GTEST_ROOT}:/src:ro" \
-      --tmpfs="/build:exec" \
-      --workdir="/build" \
-      --rm \
-      --env="CC=${cc}" \
-      --env="CXX_FLAGS=\"-Werror -Wdeprecated\"" \
-      ${LINUX_LATEST_CONTAINER} \
-      /bin/bash -c "
-        cmake /src \
-          -DCMAKE_CXX_STANDARD=11 \
-          -Dgtest_build_samples=ON \
-          -Dgtest_build_tests=ON \
-          -Dgmock_build_tests=ON \
-          -Dcxx_no_exception=${cmake_off_on} \
-          -Dcxx_no_rtti=${cmake_off_on} && \
-        make -j$(nproc) && \
-        ctest -j$(nproc) --output-on-failure"
-  done
+# Test CMake + GCC
+for cmake_off_on in OFF ON; do
+  time docker run \
+    --volume="${GTEST_ROOT}:/src:ro" \
+    --tmpfs="/build:exec" \
+    --workdir="/build" \
+    --rm \
+    --env="CC=/usr/local/bin/gcc" \
+    --env=CXXFLAGS="-Werror -Wdeprecated" \
+    ${LINUX_LATEST_CONTAINER} \
+    /bin/bash -c "
+      cmake /src \
+        -DCMAKE_CXX_STANDARD=17 \
+        -Dgtest_build_samples=ON \
+        -Dgtest_build_tests=ON \
+        -Dgmock_build_tests=ON \
+        -Dcxx_no_exception=${cmake_off_on} \
+        -Dcxx_no_rtti=${cmake_off_on} && \
+      make -j$(nproc) && \
+      ctest -j$(nproc) --output-on-failure"
+done
+
+# Test CMake + Clang
+for cmake_off_on in OFF ON; do
+  time docker run \
+    --volume="${GTEST_ROOT}:/src:ro" \
+    --tmpfs="/build:exec" \
+    --workdir="/build" \
+    --rm \
+    --env="CC=/opt/llvm/clang/bin/clang" \
+    --env=CXXFLAGS="-Werror -Wdeprecated --gcc-toolchain=/usr/local" \
+    ${LINUX_LATEST_CONTAINER} \
+    /bin/bash -c "
+      cmake /src \
+        -DCMAKE_CXX_STANDARD=17 \
+        -Dgtest_build_samples=ON \
+        -Dgtest_build_tests=ON \
+        -Dgmock_build_tests=ON \
+        -Dcxx_no_exception=${cmake_off_on} \
+        -Dcxx_no_rtti=${cmake_off_on} && \
+      make -j$(nproc) && \
+      ctest -j$(nproc) --output-on-failure"
 done
 
 # Do one test with an older version of GCC
@@ -72,11 +92,16 @@ time docker run \
   --workdir="/src" \
   --rm \
   --env="CC=/usr/local/bin/gcc" \
+  --env="BAZEL_CXXOPTS=-std=c++17" \
   ${LINUX_GCC_FLOOR_CONTAINER} \
     /usr/local/bin/bazel test ... \
       --copt="-Wall" \
       --copt="-Werror" \
+      --copt="-Wuninitialized" \
+      --copt="-Wundef" \
       --copt="-Wno-error=pragmas" \
+      --enable_bzlmod=false \
+      --features=external_include_paths \
       --keep_going \
       --show_timestamps \
       --test_output=errors
@@ -94,8 +119,11 @@ for std in ${STD}; do
       /usr/local/bin/bazel test ... \
         --copt="-Wall" \
         --copt="-Werror" \
+        --copt="-Wuninitialized" \
+        --copt="-Wundef" \
         --define="absl=${absl}" \
-        --distdir="/bazel-distdir" \
+        --enable_bzlmod=true \
+        --features=external_include_paths \
         --keep_going \
         --show_timestamps \
         --test_output=errors
@@ -116,8 +144,11 @@ for std in ${STD}; do
         --copt="--gcc-toolchain=/usr/local" \
         --copt="-Wall" \
         --copt="-Werror" \
+        --copt="-Wuninitialized" \
+        --copt="-Wundef" \
         --define="absl=${absl}" \
-        --distdir="/bazel-distdir" \
+        --enable_bzlmod=true \
+        --features=external_include_paths \
         --keep_going \
         --linkopt="--gcc-toolchain=/usr/local" \
         --show_timestamps \
diff --git a/external/googletest/ci/macos-presubmit.sh b/external/googletest/ci/macos-presubmit.sh
index d6423faa..5370ed60 100644
--- a/external/googletest/ci/macos-presubmit.sh
+++ b/external/googletest/ci/macos-presubmit.sh
@@ -31,6 +31,9 @@
 
 set -euox pipefail
 
+# Use Xcode 16.0
+sudo xcode-select -s /Applications/Xcode_16.0.app/Contents/Developer
+
 if [[ -z ${GTEST_ROOT:-} ]]; then
   GTEST_ROOT="$(realpath $(dirname ${0})/..)"
 fi
@@ -40,20 +43,20 @@ for cmake_off_on in OFF ON; do
   BUILD_DIR=$(mktemp -d build_dir.XXXXXXXX)
   cd ${BUILD_DIR}
   time cmake ${GTEST_ROOT} \
-    -DCMAKE_CXX_STANDARD=11 \
+    -DCMAKE_CXX_STANDARD=17 \
     -Dgtest_build_samples=ON \
     -Dgtest_build_tests=ON \
     -Dgmock_build_tests=ON \
     -Dcxx_no_exception=${cmake_off_on} \
     -Dcxx_no_rtti=${cmake_off_on}
-  time make
+  time make -j$(nproc)
   time ctest -j$(nproc) --output-on-failure
 done
 
 # Test the Bazel build
 
 # If we are running on Kokoro, check for a versioned Bazel binary.
-KOKORO_GFILE_BAZEL_BIN="bazel-3.7.0-darwin-x86_64"
+KOKORO_GFILE_BAZEL_BIN="bazel-8.0.0-darwin-x86_64"
 if [[ ${KOKORO_GFILE_DIR:-} ]] && [[ -f ${KOKORO_GFILE_DIR}/${KOKORO_GFILE_BAZEL_BIN} ]]; then
   BAZEL_BIN="${KOKORO_GFILE_DIR}/${KOKORO_GFILE_BAZEL_BIN}"
   chmod +x ${BAZEL_BIN}
@@ -66,7 +69,11 @@ for absl in 0 1; do
   ${BAZEL_BIN} test ... \
     --copt="-Wall" \
     --copt="-Werror" \
+    --copt="-Wundef" \
+    --cxxopt="-std=c++17" \
     --define="absl=${absl}" \
+    --enable_bzlmod=true \
+    --features=external_include_paths \
     --keep_going \
     --show_timestamps \
     --test_output=errors
diff --git a/external/googletest/ci/windows-presubmit.bat b/external/googletest/ci/windows-presubmit.bat
new file mode 100644
index 00000000..e2664c53
--- /dev/null
+++ b/external/googletest/ci/windows-presubmit.bat
@@ -0,0 +1,75 @@
+SETLOCAL ENABLEDELAYEDEXPANSION
+
+SET BAZEL_EXE=%KOKORO_GFILE_DIR%\bazel-8.0.0-windows-x86_64.exe
+
+SET PATH=C:\Python34;%PATH%
+SET BAZEL_PYTHON=C:\python34\python.exe
+SET BAZEL_SH=C:\tools\msys64\usr\bin\bash.exe
+SET CMAKE_BIN="cmake.exe"
+SET CTEST_BIN="ctest.exe"
+SET CTEST_OUTPUT_ON_FAILURE=1
+SET CMAKE_BUILD_PARALLEL_LEVEL=16
+SET CTEST_PARALLEL_LEVEL=16
+
+SET GTEST_ROOT=%~dp0\..
+IF %errorlevel% neq 0 EXIT /B 1
+
+:: ----------------------------------------------------------------------------
+:: CMake
+SET CMAKE_BUILD_PATH=cmake_msvc2022
+MKDIR %CMAKE_BUILD_PATH%
+CD %CMAKE_BUILD_PATH%
+
+%CMAKE_BIN% %GTEST_ROOT% ^
+  -G "Visual Studio 17 2022" ^
+  -DCMAKE_CXX_STANDARD=17 ^
+  -DPYTHON_EXECUTABLE:FILEPATH=c:\python37\python.exe ^
+  -DPYTHON_INCLUDE_DIR:PATH=c:\python37\include ^
+  -DPYTHON_LIBRARY:FILEPATH=c:\python37\lib\site-packages\pip ^
+  -Dgtest_build_samples=ON ^
+  -Dgtest_build_tests=ON ^
+  -Dgmock_build_tests=ON
+IF %errorlevel% neq 0 EXIT /B 1
+
+%CMAKE_BIN% --build . --target ALL_BUILD --config Debug -- -maxcpucount
+IF %errorlevel% neq 0 EXIT /B 1
+
+%CTEST_BIN% -C Debug --timeout 600
+IF %errorlevel% neq 0 EXIT /B 1
+
+CD %GTEST_ROOT%
+RMDIR /S /Q %CMAKE_BUILD_PATH%
+
+:: ----------------------------------------------------------------------------
+:: Bazel
+
+:: The default home directory on Kokoro is a long path which causes errors
+:: because of Windows limitations on path length.
+:: --output_user_root=C:\tmp causes Bazel to use a shorter path.
+SET BAZEL_VS=C:\Program Files\Microsoft Visual Studio\2022\Community
+
+:: C++17
+%BAZEL_EXE% ^
+  --output_user_root=C:\tmp ^
+  test ... ^
+  --compilation_mode=dbg ^
+  --copt=/std:c++17 ^
+  --copt=/WX ^
+  --enable_bzlmod=true ^
+  --keep_going ^
+  --test_output=errors ^
+  --test_tag_filters=-no_test_msvc2017
+IF %errorlevel% neq 0 EXIT /B 1
+
+:: C++20
+%BAZEL_EXE% ^
+  --output_user_root=C:\tmp ^
+  test ... ^
+  --compilation_mode=dbg ^
+  --copt=/std:c++20 ^
+  --copt=/WX ^
+  --enable_bzlmod=true ^
+  --keep_going ^
+  --test_output=errors ^
+  --test_tag_filters=-no_test_msvc2017
+IF %errorlevel% neq 0 EXIT /B 1
diff --git a/external/googletest/docs/_data/navigation.yml b/external/googletest/docs/_data/navigation.yml
index 8d13e343..9f333270 100644
--- a/external/googletest/docs/_data/navigation.yml
+++ b/external/googletest/docs/_data/navigation.yml
@@ -1,43 +1,43 @@
 nav:
-  - section: "Get Started"
-    items:
-      - title: "Supported Platforms"
-        url: "/platforms.html"
-      - title: "Quickstart: Bazel"
-        url: "/quickstart-bazel.html"
-      - title: "Quickstart: CMake"
-        url: "/quickstart-cmake.html"
-  - section: "Guides"
-    items:
-      - title: "GoogleTest Primer"
-        url: "/primer.html"
-      - title: "Advanced Topics"
-        url: "/advanced.html"
-      - title: "Mocking for Dummies"
-        url: "/gmock_for_dummies.html"
-      - title: "Mocking Cookbook"
-        url: "/gmock_cook_book.html"
-      - title: "Mocking Cheat Sheet"
-        url: "/gmock_cheat_sheet.html"
-  - section: "References"
-    items:
-      - title: "Testing Reference"
-        url: "/reference/testing.html"
-      - title: "Mocking Reference"
-        url: "/reference/mocking.html"
-      - title: "Assertions"
-        url: "/reference/assertions.html"
-      - title: "Matchers"
-        url: "/reference/matchers.html"
-      - title: "Actions"
-        url: "/reference/actions.html"
-      - title: "Testing FAQ"
-        url: "/faq.html"
-      - title: "Mocking FAQ"
-        url: "/gmock_faq.html"
-      - title: "Code Samples"
-        url: "/samples.html"
-      - title: "Using pkg-config"
-        url: "/pkgconfig.html"
-      - title: "Community Documentation"
-        url: "/community_created_documentation.html"
+- section: "Get Started"
+  items:
+  - title: "Supported Platforms"
+    url: "/platforms.html"
+  - title: "Quickstart: Bazel"
+    url: "/quickstart-bazel.html"
+  - title: "Quickstart: CMake"
+    url: "/quickstart-cmake.html"
+- section: "Guides"
+  items:
+  - title: "GoogleTest Primer"
+    url: "/primer.html"
+  - title: "Advanced Topics"
+    url: "/advanced.html"
+  - title: "Mocking for Dummies"
+    url: "/gmock_for_dummies.html"
+  - title: "Mocking Cookbook"
+    url: "/gmock_cook_book.html"
+  - title: "Mocking Cheat Sheet"
+    url: "/gmock_cheat_sheet.html"
+- section: "References"
+  items:
+  - title: "Testing Reference"
+    url: "/reference/testing.html"
+  - title: "Mocking Reference"
+    url: "/reference/mocking.html"
+  - title: "Assertions"
+    url: "/reference/assertions.html"
+  - title: "Matchers"
+    url: "/reference/matchers.html"
+  - title: "Actions"
+    url: "/reference/actions.html"
+  - title: "Testing FAQ"
+    url: "/faq.html"
+  - title: "Mocking FAQ"
+    url: "/gmock_faq.html"
+  - title: "Code Samples"
+    url: "/samples.html"
+  - title: "Using pkg-config"
+    url: "/pkgconfig.html"
+  - title: "Community Documentation"
+    url: "/community_created_documentation.html"
diff --git a/external/googletest/docs/_layouts/default.html b/external/googletest/docs/_layouts/default.html
index db30419f..c7f331b8 100644
--- a/external/googletest/docs/_layouts/default.html
+++ b/external/googletest/docs/_layouts/default.html
@@ -1,63 +1,58 @@
 <!DOCTYPE html>
-<html lang="{{ site.lang | default: " en-US" }}">
-<head>
+<html lang="{{ site.lang | default: "en-US" }}">
+  <head>
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-    {% seo %}
-    <link rel="stylesheet" href="{{ "
-    /assets/css/style.css?v=" | append: site.github.build_revision | relative_url }}">
+{% seo %}
+    <link rel="stylesheet" href="{{ "/assets/css/style.css?v=" | append: site.github.build_revision | relative_url }}">
     <script>
-        window.ga = window.ga || function () {
-            (ga.q = ga.q || []).push(arguments)
-        };
-        ga.l = +new Date;
-        ga('create', 'UA-197576187-1', {'storage': 'none'});
-        ga('set', 'referrer', document.referrer.split('?')[0]);
-        ga('set', 'location', window.location.href.split('?')[0]);
-        ga('set', 'anonymizeIp', true);
-        ga('send', 'pageview');
+      window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
+      ga('create', 'UA-197576187-1', { 'storage': 'none' });
+      ga('set', 'referrer', document.referrer.split('?')[0]);
+      ga('set', 'location', window.location.href.split('?')[0]);
+      ga('set', 'anonymizeIp', true);
+      ga('send', 'pageview');
     </script>
     <script async src='https://www.google-analytics.com/analytics.js'></script>
-</head>
-<body>
-<div class="sidebar">
-    <div class="header">
+  </head>
+  <body>
+    <div class="sidebar">
+      <div class="header">
         <h1><a href="{{ "/" | relative_url }}">{{ site.title | default: "Documentation" }}</a></h1>
-    </div>
-    <input type="checkbox" id="nav-toggle" class="nav-toggle">
-    <label for="nav-toggle" class="expander">
+      </div>
+      <input type="checkbox" id="nav-toggle" class="nav-toggle">
+      <label for="nav-toggle" class="expander">
         <span class="arrow"></span>
-    </label>
-    <nav>
+      </label>
+      <nav>
         {% for item in site.data.navigation.nav %}
         <h2>{{ item.section }}</h2>
         <ul>
-            {% for subitem in item.items %}
-            <a href="{{subitem.url | relative_url }}">
-                <li class="{% if subitem.url == page.url %}active{% endif %}">
-                    {{ subitem.title }}
-                </li>
-            </a>
-            {% endfor %}
+          {% for subitem in item.items %}
+          <a href="{{subitem.url | relative_url }}">
+            <li class="{% if subitem.url == page.url %}active{% endif %}">
+              {{ subitem.title }}
+            </li>
+          </a>
+          {% endfor %}
         </ul>
         {% endfor %}
-    </nav>
-</div>
-<div class="main markdown-body">
-    <div class="main-inner">
-        {{ content }}
+      </nav>
     </div>
-    <div class="footer">
+    <div class="main markdown-body">
+      <div class="main-inner">
+        {{ content }}
+      </div>
+      <div class="footer">
         GoogleTest &middot;
         <a href="https://github.com/google/googletest">GitHub Repository</a> &middot;
-        <a href="https://github.com/google/googletest/blob/master/LICENSE">License</a> &middot;
+        <a href="https://github.com/google/googletest/blob/main/LICENSE">License</a> &middot;
         <a href="https://policies.google.com/privacy">Privacy Policy</a>
+      </div>
     </div>
-</div>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/anchor-js/4.1.0/anchor.min.js"
-        integrity="sha256-lZaRhKri35AyJSypXXs4o6OPFTbTmUoltBbDCbdzegg=" crossorigin="anonymous"></script>
-<script>anchors.add('.main h2, .main h3, .main h4, .main h5, .main h6');</script>
-</body>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/anchor-js/4.1.0/anchor.min.js" integrity="sha256-lZaRhKri35AyJSypXXs4o6OPFTbTmUoltBbDCbdzegg=" crossorigin="anonymous"></script>
+    <script>anchors.add('.main h2, .main h3, .main h4, .main h5, .main h6');</script>
+  </body>
 </html>
diff --git a/external/googletest/docs/_sass/main.scss b/external/googletest/docs/_sass/main.scss
index 02b9269a..92edc877 100644
--- a/external/googletest/docs/_sass/main.scss
+++ b/external/googletest/docs/_sass/main.scss
@@ -85,7 +85,7 @@ body {
   }
 
   a {
-    text-decoration: none;
+   text-decoration: none;
   }
 
   li {
diff --git a/external/googletest/docs/advanced.md b/external/googletest/docs/advanced.md
index e432d2f0..9b1220a1 100644
--- a/external/googletest/docs/advanced.md
+++ b/external/googletest/docs/advanced.md
@@ -1,48 +1,59 @@
-# Advanced googletest Topics
+# Advanced GoogleTest Topics
 
 ## Introduction
 
-Now that you have read the [googletest Primer](primer.md) and learned how to write tests using googletest, it's time to
-learn some new tricks. This document will show you more assertions as well as how to construct complex failure messages,
-propagate fatal failures, reuse and speed up your test fixtures, and use various flags with your tests.
+Now that you have read the [GoogleTest Primer](primer.md) and learned how to
+write tests using GoogleTest, it's time to learn some new tricks. This document
+will show you more assertions as well as how to construct complex failure
+messages, propagate fatal failures, reuse and speed up your test fixtures, and
+use various flags with your tests.
 
 ## More Assertions
 
-This section covers some less frequently used, but still significant, assertions.
+This section covers some less frequently used, but still significant,
+assertions.
 
 ### Explicit Success and Failure
 
-See [Explicit Success and Failure](reference/assertions.md#success-failure) in the Assertions Reference.
+See [Explicit Success and Failure](reference/assertions.md#success-failure) in
+the Assertions Reference.
 
 ### Exception Assertions
 
-See [Exception Assertions](reference/assertions.md#exceptions) in the Assertions Reference.
+See [Exception Assertions](reference/assertions.md#exceptions) in the Assertions
+Reference.
 
 ### Predicate Assertions for Better Error Messages
 
-Even though googletest has a rich set of assertions, they can never be complete, as it's impossible (nor a good idea) to
-anticipate all scenarios a user might run into. Therefore, sometimes a user has to use `EXPECT_TRUE()` to check a
-complex expression, for lack of a better macro. This has the problem of not showing you the values of the parts of the
-expression, making it hard to understand what went wrong. As a workaround, some users choose to construct the failure
-message by themselves, streaming it into `EXPECT_TRUE()`. However, this is awkward especially when the expression has
-side-effects or is expensive to evaluate.
+Even though GoogleTest has a rich set of assertions, they can never be complete,
+as it's impossible (nor a good idea) to anticipate all scenarios a user might
+run into. Therefore, sometimes a user has to use `EXPECT_TRUE()` to check a
+complex expression, for lack of a better macro. This has the problem of not
+showing you the values of the parts of the expression, making it hard to
+understand what went wrong. As a workaround, some users choose to construct the
+failure message by themselves, streaming it into `EXPECT_TRUE()`. However, this
+is awkward especially when the expression has side-effects or is expensive to
+evaluate.
 
-googletest gives you three different options to solve this problem:
+GoogleTest gives you three different options to solve this problem:
 
 #### Using an Existing Boolean Function
 
-If you already have a function or functor that returns `bool` (or a type that can be implicitly converted to `bool`),
-you can use it in a *predicate assertion* to get the function arguments printed for free. See
-[`EXPECT_PRED*`](reference/assertions.md#EXPECT_PRED) in the Assertions Reference for details.
+If you already have a function or functor that returns `bool` (or a type that
+can be implicitly converted to `bool`), you can use it in a *predicate
+assertion* to get the function arguments printed for free. See
+[`EXPECT_PRED*`](reference/assertions.md#EXPECT_PRED) in the Assertions
+Reference for details.
 
 #### Using a Function That Returns an AssertionResult
 
-While `EXPECT_PRED*()` and friends are handy for a quick job, the syntax is not satisfactory: you have to use different
-macros for different arities, and it feels more like Lisp than C++. The `::testing::AssertionResult` class solves this
-problem.
+While `EXPECT_PRED*()` and friends are handy for a quick job, the syntax is not
+satisfactory: you have to use different macros for different arities, and it
+feels more like Lisp than C++. The `::testing::AssertionResult` class solves
+this problem.
 
-An `AssertionResult` object represents the result of an assertion (whether it's a success or a failure, and an
-associated message). You can create an
+An `AssertionResult` object represents the result of an assertion (whether it's
+a success or a failure, and an associated message). You can create an
 `AssertionResult` using one of these factory functions:
 
 ```c++
@@ -62,8 +73,9 @@ AssertionResult AssertionFailure();
 You can then use the `<<` operator to stream messages to the `AssertionResult`
 object.
 
-To provide more readable messages in Boolean assertions (e.g. `EXPECT_TRUE()`), write a predicate function that
-returns `AssertionResult` instead of `bool`. For example, if you define `IsEven()` as:
+To provide more readable messages in Boolean assertions (e.g. `EXPECT_TRUE()`),
+write a predicate function that returns `AssertionResult` instead of `bool`. For
+example, if you define `IsEven()` as:
 
 ```c++
 testing::AssertionResult IsEven(int n) {
@@ -99,8 +111,9 @@ Expected: true
 ```
 
 If you want informative messages in `EXPECT_FALSE` and `ASSERT_FALSE` as well
-(one third of Boolean assertions in the Google code base are negative ones), and are fine with making the predicate
-slower in the success case, you can supply a success message:
+(one third of Boolean assertions in the Google code base are negative ones), and
+are fine with making the predicate slower in the success case, you can supply a
+success message:
 
 ```c++
 testing::AssertionResult IsEven(int n) {
@@ -123,24 +136,32 @@ Then the statement `EXPECT_FALSE(IsEven(Fib(6)))` will print
 
 If you find the default message generated by
 [`EXPECT_PRED*`](reference/assertions.md#EXPECT_PRED) and
-[`EXPECT_TRUE`](reference/assertions.md#EXPECT_TRUE) unsatisfactory, or some arguments to your predicate do not support
-streaming to `ostream`, you can instead use *predicate-formatter assertions* to *fully* customize how the message is
-formatted. See
-[`EXPECT_PRED_FORMAT*`](reference/assertions.md#EXPECT_PRED_FORMAT) in the Assertions Reference for details.
+[`EXPECT_TRUE`](reference/assertions.md#EXPECT_TRUE) unsatisfactory, or some
+arguments to your predicate do not support streaming to `ostream`, you can
+instead use *predicate-formatter assertions* to *fully* customize how the
+message is formatted. See
+[`EXPECT_PRED_FORMAT*`](reference/assertions.md#EXPECT_PRED_FORMAT) in the
+Assertions Reference for details.
 
 ### Floating-Point Comparison
 
-See [Floating-Point Comparison](reference/assertions.md#floating-point) in the Assertions Reference.
+See [Floating-Point Comparison](reference/assertions.md#floating-point) in the
+Assertions Reference.
 
 #### Floating-Point Predicate-Format Functions
 
-Some floating-point operations are useful, but not that often used. In order to avoid an explosion of new macros, we
-provide them as predicate-format functions that can be used in the predicate assertion macro
-[`EXPECT_PRED_FORMAT2`](reference/assertions.md#EXPECT_PRED_FORMAT), for example:
+Some floating-point operations are useful, but not that often used. In order to
+avoid an explosion of new macros, we provide them as predicate-format functions
+that can be used in the predicate assertion macro
+[`EXPECT_PRED_FORMAT2`](reference/assertions.md#EXPECT_PRED_FORMAT), for
+example:
 
 ```c++
-EXPECT_PRED_FORMAT2(testing::FloatLE, val1, val2);
-EXPECT_PRED_FORMAT2(testing::DoubleLE, val1, val2);
+using ::testing::FloatLE;
+using ::testing::DoubleLE;
+...
+EXPECT_PRED_FORMAT2(FloatLE, val1, val2);
+EXPECT_PRED_FORMAT2(DoubleLE, val1, val2);
 ```
 
 The above code verifies that `val1` is less than, or approximately equal to,
@@ -148,15 +169,18 @@ The above code verifies that `val1` is less than, or approximately equal to,
 
 ### Asserting Using gMock Matchers
 
-See [`EXPECT_THAT`](reference/assertions.md#EXPECT_THAT) in the Assertions Reference.
+See [`EXPECT_THAT`](reference/assertions.md#EXPECT_THAT) in the Assertions
+Reference.
 
 ### More String Assertions
 
-(Please read the [previous](#asserting-using-gmock-matchers) section first if you haven't.)
+(Please read the [previous](#asserting-using-gmock-matchers) section first if
+you haven't.)
 
 You can use the gMock [string matchers](reference/matchers.md#string-matchers)
-with [`EXPECT_THAT`](reference/assertions.md#EXPECT_THAT) to do more string comparison tricks (sub-string, prefix,
-suffix, regular expression, and etc). For example,
+with [`EXPECT_THAT`](reference/assertions.md#EXPECT_THAT) to do more string
+comparison tricks (sub-string, prefix, suffix, regular expression, and etc). For
+example,
 
 ```c++
 using ::testing::HasSubstr;
@@ -168,7 +192,8 @@ using ::testing::MatchesRegex;
 
 ### Windows HRESULT assertions
 
-See [Windows HRESULT Assertions](reference/assertions.md#HRESULT) in the Assertions Reference.
+See [Windows HRESULT Assertions](reference/assertions.md#HRESULT) in the
+Assertions Reference.
 
 ### Type Assertions
 
@@ -178,13 +203,15 @@ You can call the function
 ::testing::StaticAssertTypeEq<T1, T2>();
 ```
 
-to assert that types `T1` and `T2` are the same. The function does nothing if the assertion is satisfied. If the types
-are different, the function call will fail to compile, the compiler error message will say that
-`T1 and T2 are not the same type` and most likely (depending on the compiler)
-show you the actual values of `T1` and `T2`. This is mainly useful inside template code.
+to assert that types `T1` and `T2` are the same. The function does nothing if
+the assertion is satisfied. If the types are different, the function call will
+fail to compile, the compiler error message will say that `T1 and T2 are not the
+same type` and most likely (depending on the compiler) show you the actual
+values of `T1` and `T2`. This is mainly useful inside template code.
 
 **Caveat**: When used inside a member function of a class template or a function
-template, `StaticAssertTypeEq<T1, T2>()` is effective only if the function is instantiated. For example, given:
+template, `StaticAssertTypeEq<T1, T2>()` is effective only if the function is
+instantiated. For example, given:
 
 ```c++
 template <typename T> class Foo {
@@ -199,7 +226,8 @@ the code:
 void Test1() { Foo<bool> foo; }
 ```
 
-will not generate a compiler error, as `Foo<bool>::Bar()` is never actually instantiated. Instead, you need:
+will not generate a compiler error, as `Foo<bool>::Bar()` is never actually
+instantiated. Instead, you need:
 
 ```c++
 void Test2() { Foo<bool> foo; foo.Bar(); }
@@ -209,46 +237,56 @@ to cause a compiler error.
 
 ### Assertion Placement
 
-You can use assertions in any C++ function. In particular, it doesn't have to be a method of the test fixture class. The
-one constraint is that assertions that generate a fatal failure (`FAIL*` and `ASSERT_*`) can only be used in
-void-returning functions. This is a consequence of Google's not using exceptions. By placing it in a non-void function
-you'll get a confusing compile error like `"error: void value not ignored as it ought to be"`
-or `"cannot initialize return object of type 'bool' with an rvalue of type 'void'"` or
+You can use assertions in any C++ function. In particular, it doesn't have to be
+a method of the test fixture class. The one constraint is that assertions that
+generate a fatal failure (`FAIL*` and `ASSERT_*`) can only be used in
+void-returning functions. This is a consequence of Google's not using
+exceptions. By placing it in a non-void function you'll get a confusing compile
+error like `"error: void value not ignored as it ought to be"` or `"cannot
+initialize return object of type 'bool' with an rvalue of type 'void'"` or
 `"error: no viable conversion from 'void' to 'string'"`.
 
-If you need to use fatal assertions in a function that returns non-void, one option is to make the function return the
-value in an out parameter instead. For example, you can rewrite `T2 Foo(T1 x)` to `void Foo(T1 x, T2* result)`. You need
-to make sure that `*result` contains some sensible value even when the function returns prematurely. As the function now
-returns `void`, you can use any assertion inside of it.
+If you need to use fatal assertions in a function that returns non-void, one
+option is to make the function return the value in an out parameter instead. For
+example, you can rewrite `T2 Foo(T1 x)` to `void Foo(T1 x, T2* result)`. You
+need to make sure that `*result` contains some sensible value even when the
+function returns prematurely. As the function now returns `void`, you can use
+any assertion inside of it.
 
-If changing the function's type is not an option, you should just use assertions that generate non-fatal failures, such
-as `ADD_FAILURE*` and `EXPECT_*`.
+If changing the function's type is not an option, you should just use assertions
+that generate non-fatal failures, such as `ADD_FAILURE*` and `EXPECT_*`.
 
-{: .callout .note} NOTE: Constructors and destructors are not considered void-returning functions, according to the C++
-language specification, and so you may not use fatal assertions in them; you'll get a compilation error if you try.
-Instead, either call `abort` and crash the entire test executable, or put the fatal assertion in a `SetUp`/`TearDown`
-function; see
+{: .callout .note}
+NOTE: Constructors and destructors are not considered void-returning functions,
+according to the C++ language specification, and so you may not use fatal
+assertions in them; you'll get a compilation error if you try. Instead, either
+call `abort` and crash the entire test executable, or put the fatal assertion in
+a `SetUp`/`TearDown` function; see
 [constructor/destructor vs. `SetUp`/`TearDown`](faq.md#CtorVsSetUp)
 
-{: .callout .warning} WARNING: A fatal assertion in a helper function (private void-returning method)
-called from a constructor or destructor does not terminate the current test, as your intuition might suggest: it merely
-returns from the constructor or destructor early, possibly leaving your object in a partially-constructed or
+{: .callout .warning}
+WARNING: A fatal assertion in a helper function (private void-returning method)
+called from a constructor or destructor does not terminate the current test, as
+your intuition might suggest: it merely returns from the constructor or
+destructor early, possibly leaving your object in a partially-constructed or
 partially-destructed state! You almost certainly want to `abort` or use
 `SetUp`/`TearDown` instead.
 
 ## Skipping test execution
 
-Related to the assertions `SUCCEED()` and `FAIL()`, you can prevent further test execution at runtime with
-the `GTEST_SKIP()` macro. This is useful when you need to check for preconditions of the system under test during
-runtime and skip tests in a meaningful way.
+Related to the assertions `SUCCEED()` and `FAIL()`, you can prevent further test
+execution at runtime with the `GTEST_SKIP()` macro. This is useful when you need
+to check for preconditions of the system under test during runtime and skip
+tests in a meaningful way.
 
-`GTEST_SKIP()` can be used in individual test cases or in the `SetUp()` methods of classes derived from
-either `::testing::Environment` or `::testing::Test`. For example:
+`GTEST_SKIP()` can be used in individual test cases or in the `SetUp()` methods
+of classes derived from either `::testing::Environment` or `::testing::Test`.
+For example:
 
 ```c++
 TEST(SkipTest, DoesSkip) {
   GTEST_SKIP() << "Skipping single test";
-  EXPECT_EQ(0, 1);  // Won't fail; it won't be executed
+  FAIL();  // Won't fail; it won't be executed
 }
 
 class SkipFixture : public ::testing::Test {
@@ -260,101 +298,176 @@ class SkipFixture : public ::testing::Test {
 
 // Tests for SkipFixture won't be executed.
 TEST_F(SkipFixture, SkipsOneTest) {
-  EXPECT_EQ(5, 7);  // Won't fail
+  FAIL();  // Won't fail; it won't be executed
 }
 ```
 
 As with assertion macros, you can stream a custom message into `GTEST_SKIP()`.
 
-## Teaching googletest How to Print Your Values
+## Teaching GoogleTest How to Print Your Values
 
-When a test assertion such as `EXPECT_EQ` fails, googletest prints the argument values to help you debug. It does this
-using a user-extensible value printer.
+When a test assertion such as `EXPECT_EQ` fails, GoogleTest prints the argument
+values to help you debug. It does this using a user-extensible value printer.
 
-This printer knows how to print built-in C++ types, native arrays, STL containers, and any type that supports the `<<`
-operator. For other types, it prints the raw bytes in the value and hopes that you the user can figure it out.
+This printer knows how to print built-in C++ types, native arrays, STL
+containers, and any type that supports the `<<` operator. For other types, it
+prints the raw bytes in the value and hopes that you the user can figure it out.
 
-As mentioned earlier, the printer is *extensible*. That means you can teach it to do a better job at printing your
-particular type than to dump the bytes. To do that, define `<<` for your type:
-
-```c++
-#include <ostream>
+As mentioned earlier, the printer is *extensible*. That means you can teach it
+to do a better job at printing your particular type than to dump the bytes. To
+do that, define an `AbslStringify()` overload as a `friend` function template
+for your type:
 
+```cpp
 namespace foo {
 
-class Bar {  // We want googletest to be able to print instances of this.
-...
-  // Create a free inline friend function.
-  friend std::ostream& operator<<(std::ostream& os, const Bar& bar) {
-    return os << bar.DebugString();  // whatever needed to print bar to os
+class Point {  // We want GoogleTest to be able to print instances of this.
+  ...
+  // Provide a friend overload.
+  template <typename Sink>
+  friend void AbslStringify(Sink& sink, const Point& point) {
+    absl::Format(&sink, "(%d, %d)", point.x, point.y);
   }
+
+  int x;
+  int y;
 };
 
 // If you can't declare the function in the class it's important that the
-// << operator is defined in the SAME namespace that defines Bar.  C++'s look-up
-// rules rely on that.
-std::ostream& operator<<(std::ostream& os, const Bar& bar) {
-  return os << bar.DebugString();  // whatever needed to print bar to os
+// AbslStringify overload is defined in the SAME namespace that defines Point.
+// C++'s look-up rules rely on that.
+enum class EnumWithStringify { kMany = 0, kChoices = 1 };
+
+template <typename Sink>
+void AbslStringify(Sink& sink, EnumWithStringify e) {
+  absl::Format(&sink, "%s", e == EnumWithStringify::kMany ? "Many" : "Choices");
 }
 
 }  // namespace foo
 ```
 
-Sometimes, this might not be an option: your team may consider it bad style to have a `<<` operator for `Bar`, or `Bar`
-may already have a `<<` operator that doesn't do what you want (and you cannot change it). If so, you can instead define
-a `PrintTo()` function like this:
+{: .callout .note}
+Note: `AbslStringify()` utilizes a generic "sink" buffer to construct its
+string. For more information about supported operations on `AbslStringify()`'s
+sink, see go/abslstringify.
+
+`AbslStringify()` can also use `absl::StrFormat`'s catch-all `%v` type specifier
+within its own format strings to perform type deduction. `Point` above could be
+formatted as `"(%v, %v)"` for example, and deduce the `int` values as `%d`.
+
+Sometimes, `AbslStringify()` might not be an option: your team may wish to print
+types with extra debugging information for testing purposes only. If so, you can
+instead define a `PrintTo()` function like this:
 
 ```c++
 #include <ostream>
 
 namespace foo {
 
-class Bar {
+class Point {
   ...
-  friend void PrintTo(const Bar& bar, std::ostream* os) {
-    *os << bar.DebugString();  // whatever needed to print bar to os
+  friend void PrintTo(const Point& point, std::ostream* os) {
+    *os << "(" << point.x << "," << point.y << ")";
   }
+
+  int x;
+  int y;
 };
 
 // If you can't declare the function in the class it's important that PrintTo()
-// is defined in the SAME namespace that defines Bar.  C++'s look-up rules rely
-// on that.
-void PrintTo(const Bar& bar, std::ostream* os) {
-  *os << bar.DebugString();  // whatever needed to print bar to os
+// is defined in the SAME namespace that defines Point.  C++'s look-up rules
+// rely on that.
+void PrintTo(const Point& point, std::ostream* os) {
+    *os << "(" << point.x << "," << point.y << ")";
 }
 
 }  // namespace foo
 ```
 
-If you have defined both `<<` and `PrintTo()`, the latter will be used when googletest is concerned. This allows you to
-customize how the value appears in googletest's output without affecting code that relies on the behavior of its
-`<<` operator.
+If you have defined both `AbslStringify()` and `PrintTo()`, the latter will be
+used by GoogleTest. This allows you to customize how the value appears in
+GoogleTest's output without affecting code that relies on the behavior of
+`AbslStringify()`.
 
-If you want to print a value `x` using googletest's value printer yourself, just call `::testing::PrintToString(x)`,
-which returns an `std::string`:
+If you have an existing `<<` operator and would like to define an
+`AbslStringify()`, the latter will be used for GoogleTest printing.
+
+If you want to print a value `x` using GoogleTest's value printer yourself, just
+call `::testing::PrintToString(x)`, which returns an `std::string`:
 
 ```c++
-vector<pair<Bar, int> > bar_ints = GetBarIntVector();
+vector<pair<Point, int> > point_ints = GetPointIntVector();
 
-EXPECT_TRUE(IsCorrectBarIntVector(bar_ints))
-    << "bar_ints = " << testing::PrintToString(bar_ints);
+EXPECT_TRUE(IsCorrectPointIntVector(point_ints))
+    << "point_ints = " << testing::PrintToString(point_ints);
 ```
 
+For more details regarding `AbslStringify()` and its integration with other
+libraries, see go/abslstringify.
+
+## Regular Expression Syntax
+
+When built with Bazel and using Abseil, GoogleTest uses the
+[RE2](https://github.com/google/re2/wiki/Syntax) syntax. Otherwise, for POSIX
+systems (Linux, Cygwin, Mac), GoogleTest uses the
+[POSIX extended regular expression](https://pubs.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap09.html#tag_09_04)
+syntax. To learn about POSIX syntax, you may want to read this
+[Wikipedia entry](https://en.wikipedia.org/wiki/Regular_expression#POSIX_extended).
+
+On Windows, GoogleTest uses its own simple regular expression implementation. It
+lacks many features. For example, we don't support union (`"x|y"`), grouping
+(`"(xy)"`), brackets (`"[xy]"`), and repetition count (`"x{5,7}"`), among
+others. Below is what we do support (`A` denotes a literal character, period
+(`.`), or a single `\\ ` escape sequence; `x` and `y` denote regular
+expressions.):
+
+Expression | Meaning
+---------- | --------------------------------------------------------------
+`c`        | matches any literal character `c`
+`\\d`      | matches any decimal digit
+`\\D`      | matches any character that's not a decimal digit
+`\\f`      | matches `\f`
+`\\n`      | matches `\n`
+`\\r`      | matches `\r`
+`\\s`      | matches any ASCII whitespace, including `\n`
+`\\S`      | matches any character that's not a whitespace
+`\\t`      | matches `\t`
+`\\v`      | matches `\v`
+`\\w`      | matches any letter, `_`, or decimal digit
+`\\W`      | matches any character that `\\w` doesn't match
+`\\c`      | matches any literal character `c`, which must be a punctuation
+`.`        | matches any single character except `\n`
+`A?`       | matches 0 or 1 occurrences of `A`
+`A*`       | matches 0 or many occurrences of `A`
+`A+`       | matches 1 or many occurrences of `A`
+`^`        | matches the beginning of a string (not that of each line)
+`$`        | matches the end of a string (not that of each line)
+`xy`       | matches `x` followed by `y`
+
+To help you determine which capability is available on your system, GoogleTest
+defines macros to govern which regular expression it is using. The macros are:
+`GTEST_USES_SIMPLE_RE=1` or `GTEST_USES_POSIX_RE=1`. If you want your death
+tests to work in all cases, you can either `#if` on these macros or use the more
+limited syntax only.
+
 ## Death Tests
 
-In many applications, there are assertions that can cause application failure if a condition is not met. These sanity
-checks, which ensure that the program is in a known good state, are there to fail at the earliest possible time after
-some program state is corrupted. If the assertion checks the wrong condition, then the program may proceed in an
-erroneous state, which could lead to memory corruption, security holes, or worse. Hence it is vitally important to test
-that such assertion statements work as expected.
+In many applications, there are assertions that can cause application failure if
+a condition is not met. These consistency checks, which ensure that the program
+is in a known good state, are there to fail at the earliest possible time after
+some program state is corrupted. If the assertion checks the wrong condition,
+then the program may proceed in an erroneous state, which could lead to memory
+corruption, security holes, or worse. Hence it is vitally important to test that
+such assertion statements work as expected.
 
 Since these precondition checks cause the processes to die, we call such tests
-_death tests_. More generally, any test that checks that a program terminates
+*death tests*. More generally, any test that checks that a program terminates
 (except by throwing an exception) in an expected fashion is also a death test.
 
 Note that if a piece of code throws an exception, we don't consider it "death"
-for the purpose of death tests, as the caller of the code could catch the exception and avoid the crash. If you want to
-verify exceptions thrown by your code, see [Exception Assertions](#ExceptionAssertions).
+for the purpose of death tests, as the caller of the code could catch the
+exception and avoid the crash. If you want to verify exceptions thrown by your
+code, see [Exception Assertions](#ExceptionAssertions).
 
 If you want to test `EXPECT_*()/ASSERT_*()` failures in your test code, see
 ["Catching" Failures](#catching-failures).
@@ -362,9 +475,11 @@ If you want to test `EXPECT_*()/ASSERT_*()` failures in your test code, see
 ### How to Write a Death Test
 
 GoogleTest provides assertion macros to support death tests. See
-[Death Assertions](reference/assertions.md#death) in the Assertions Reference for details.
+[Death Assertions](reference/assertions.md#death) in the Assertions Reference
+for details.
 
-To write a death test, simply use one of the macros inside your test function. For example,
+To write a death test, simply use one of the macros inside your test function.
+For example,
 
 ```c++
 TEST(MyDeathTest, Foo) {
@@ -387,31 +502,43 @@ TEST(MyDeathTest, KillProcess) {
 
 verifies that:
 
-* calling `Foo(5)` causes the process to die with the given error message,
-* calling `NormalExit()` causes the process to print `"Success"` to stderr and exit with exit code 0, and
-* calling `KillProcess()` kills the process with signal `SIGKILL`.
+*   calling `Foo(5)` causes the process to die with the given error message,
+*   calling `NormalExit()` causes the process to print `"Success"` to stderr and
+    exit with exit code 0, and
+*   calling `KillProcess()` kills the process with signal `SIGKILL`.
 
-The test function body may contain other assertions and statements as well, if necessary.
+{: .callout .warning}
+Warning: If your death test contains mocks and is expecting a specific exit
+code, then you must allow the mock objects to be leaked via `Mock::AllowLeak`.
+This is because the mock leak detector will exit with its own error code if it
+detects a leak.
+
+The test function body may contain other assertions and statements as well, if
+necessary.
 
 Note that a death test only cares about three things:
 
-1. does `statement` abort or exit the process?
-2. (in the case of `ASSERT_EXIT` and `EXPECT_EXIT`) does the exit status satisfy `predicate`? Or (in the case
-   of `ASSERT_DEATH` and `EXPECT_DEATH`)
-   is the exit status non-zero? And
-3. does the stderr output match `matcher`?
+1.  does `statement` abort or exit the process?
+2.  (in the case of `ASSERT_EXIT` and `EXPECT_EXIT`) does the exit status
+    satisfy `predicate`? Or (in the case of `ASSERT_DEATH` and `EXPECT_DEATH`)
+    is the exit status non-zero? And
+3.  does the stderr output match `matcher`?
 
-In particular, if `statement` generates an `ASSERT_*` or `EXPECT_*` failure, it will **not** cause the death test to
-fail, as googletest assertions don't abort the process.
+In particular, if `statement` generates an `ASSERT_*` or `EXPECT_*` failure, it
+will **not** cause the death test to fail, as GoogleTest assertions don't abort
+the process.
 
 ### Death Test Naming
 
-{: .callout .important} IMPORTANT: We strongly recommend you to follow the convention of naming your
-**test suite** (not test) `*DeathTest` when it contains a death test, as demonstrated in the above example. The
+{: .callout .important}
+IMPORTANT: We strongly recommend you to follow the convention of naming your
+**test suite** (not test) `*DeathTest` when it contains a death test, as
+demonstrated in the above example. The
 [Death Tests And Threads](#death-tests-and-threads) section below explains why.
 
 If a test fixture class is shared by normal tests and death tests, you can use
-`using` or `typedef` to introduce an alias for the fixture class and avoid duplicating its code:
+`using` or `typedef` to introduce an alias for the fixture class and avoid
+duplicating its code:
 
 ```c++
 class FooTest : public testing::Test { ... };
@@ -427,94 +554,59 @@ TEST_F(FooDeathTest, DoesThat) {
 }
 ```
 
-### Regular Expression Syntax
-
-On POSIX systems (e.g. Linux, Cygwin, and Mac), googletest uses the
-[POSIX extended regular expression](http://www.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap09.html#tag_09_04)
-syntax. To learn about this syntax, you may want to read this
-[Wikipedia entry](http://en.wikipedia.org/wiki/Regular_expression#POSIX_Extended_Regular_Expressions).
-
-On Windows, googletest uses its own simple regular expression implementation. It lacks many features. For example, we
-don't support union (`"x|y"`), grouping
-(`"(xy)"`), brackets (`"[xy]"`), and repetition count (`"x{5,7}"`), among others. Below is what we do support (`A`
-denotes a literal character, period
-(`.`), or a single `\\ ` escape sequence; `x` and `y` denote regular expressions.):
-
-Expression | Meaning
----------- | --------------------------------------------------------------
-`c`        | matches any literal character `c`
-`\\d`      | matches any decimal digit
-`\\D`      | matches any character that's not a decimal digit
-`\\f`      | matches `\f`
-`\\n`      | matches `\n`
-`\\r`      | matches `\r`
-`\\s`      | matches any ASCII whitespace, including `\n`
-`\\S`      | matches any character that's not a whitespace
-`\\t`      | matches `\t`
-`\\v`      | matches `\v`
-`\\w`      | matches any letter, `_`, or decimal digit
-`\\W`      | matches any character that `\\w` doesn't match
-`\\c`      | matches any literal character `c`, which must be a punctuation
-`.`        | matches any single character except `\n`
-`A?`       | matches 0 or 1 occurrences of `A`
-`A*`       | matches 0 or many occurrences of `A`
-`A+`       | matches 1 or many occurrences of `A`
-`^`        | matches the beginning of a string (not that of each line)
-`$`        | matches the end of a string (not that of each line)
-`xy`       | matches `x` followed by `y`
-
-To help you determine which capability is available on your system, googletest defines macros to govern which regular
-expression it is using. The macros are:
-`GTEST_USES_SIMPLE_RE=1` or `GTEST_USES_POSIX_RE=1`. If you want your death tests to work in all cases, you can
-either `#if` on these macros or use the more limited syntax only.
-
 ### How It Works
 
-See [Death Assertions](reference/assertions.md#death) in the Assertions Reference.
+See [Death Assertions](reference/assertions.md#death) in the Assertions
+Reference.
 
 ### Death Tests And Threads
 
-The reason for the two death test styles has to do with thread safety. Due to well-known problems with forking in the
-presence of threads, death tests should be run in a single-threaded context. Sometimes, however, it isn't feasible to
-arrange that kind of environment. For example, statically-initialized modules may start threads before main is ever
-reached. Once threads have been created, it may be difficult or impossible to clean them up.
+The reason for the two death test styles has to do with thread safety. Due to
+well-known problems with forking in the presence of threads, death tests should
+be run in a single-threaded context. Sometimes, however, it isn't feasible to
+arrange that kind of environment. For example, statically-initialized modules
+may start threads before main is ever reached. Once threads have been created,
+it may be difficult or impossible to clean them up.
 
-googletest has three features intended to raise awareness of threading issues.
+GoogleTest has three features intended to raise awareness of threading issues.
 
-1. A warning is emitted if multiple threads are running when a death test is encountered.
-2. Test suites with a name ending in "DeathTest" are run before all other tests.
-3. It uses `clone()` instead of `fork()` to spawn the child process on Linux
-   (`clone()` is not available on Cygwin and Mac), as `fork()` is more likely to cause the child to hang when the parent
-   process has multiple threads.
+1.  A warning is emitted if multiple threads are running when a death test is
+    encountered.
+2.  Test suites with a name ending in "DeathTest" are run before all other
+    tests.
+3.  It uses `clone()` instead of `fork()` to spawn the child process on Linux
+    (`clone()` is not available on Cygwin and Mac), as `fork()` is more likely
+    to cause the child to hang when the parent process has multiple threads.
 
-It's perfectly fine to create threads inside a death test statement; they are executed in a separate process and cannot
-affect the parent.
+It's perfectly fine to create threads inside a death test statement; they are
+executed in a separate process and cannot affect the parent.
 
 ### Death Test Styles
 
-The "threadsafe" death test style was introduced in order to help mitigate the risks of testing in a possibly
-multithreaded environment. It trades increased test execution time (potentially dramatically so) for improved thread
-safety.
+The "threadsafe" death test style was introduced in order to help mitigate the
+risks of testing in a possibly multithreaded environment. It trades increased
+test execution time (potentially dramatically so) for improved thread safety.
 
-The automated testing framework does not set the style flag. You can choose a particular style of death tests by setting
-the flag programmatically:
+The automated testing framework does not set the style flag. You can choose a
+particular style of death tests by setting the flag programmatically:
 
 ```c++
-testing::FLAGS_gtest_death_test_style="threadsafe"
+GTEST_FLAG_SET(death_test_style, "threadsafe");
 ```
 
-You can do this in `main()` to set the style for all death tests in the binary, or in individual tests. Recall that
-flags are saved before running each test and restored afterwards, so you need not do that yourself. For example:
+You can do this in `main()` to set the style for all death tests in the binary,
+or in individual tests. Recall that flags are saved before running each test and
+restored afterwards, so you need not do that yourself. For example:
 
 ```c++
 int main(int argc, char** argv) {
   testing::InitGoogleTest(&argc, argv);
-  testing::FLAGS_gtest_death_test_style = "fast";
+  GTEST_FLAG_SET(death_test_style, "fast");
   return RUN_ALL_TESTS();
 }
 
 TEST(MyDeathTest, TestOne) {
-  testing::FLAGS_gtest_death_test_style = "threadsafe";
+  GTEST_FLAG_SET(death_test_style, "threadsafe");
   // This test is run in the "threadsafe" style:
   ASSERT_DEATH(ThisShouldDie(), "");
 }
@@ -527,39 +619,46 @@ TEST(MyDeathTest, TestTwo) {
 
 ### Caveats
 
-The `statement` argument of `ASSERT_EXIT()` can be any valid C++ statement. If it leaves the current function via
-a `return` statement or by throwing an exception, the death test is considered to have failed. Some googletest macros
-may return from the current function (e.g. `ASSERT_TRUE()`), so be sure to avoid them in `statement`.
+The `statement` argument of `ASSERT_EXIT()` can be any valid C++ statement. If
+it leaves the current function via a `return` statement or by throwing an
+exception, the death test is considered to have failed. Some GoogleTest macros
+may return from the current function (e.g. `ASSERT_TRUE()`), so be sure to avoid
+them in `statement`.
 
-Since `statement` runs in the child process, any in-memory side effect (e.g. modifying a variable, releasing memory,
-etc) it causes will *not* be observable in the parent process. In particular, if you release memory in a death test,
-your program will fail the heap check as the parent process will never see the memory reclaimed. To solve this problem,
-you can
+Since `statement` runs in the child process, any in-memory side effect (e.g.
+modifying a variable, releasing memory, etc) it causes will *not* be observable
+in the parent process. In particular, if you release memory in a death test,
+your program will fail the heap check as the parent process will never see the
+memory reclaimed. To solve this problem, you can
 
-1. try not to free memory in a death test;
-2. free the memory again in the parent process; or
-3. do not use the heap checker in your program.
+1.  try not to free memory in a death test;
+2.  free the memory again in the parent process; or
+3.  do not use the heap checker in your program.
 
-Due to an implementation detail, you cannot place multiple death test assertions on the same line; otherwise,
-compilation will fail with an unobvious error message.
+Due to an implementation detail, you cannot place multiple death test assertions
+on the same line; otherwise, compilation will fail with an unobvious error
+message.
 
-Despite the improved thread safety afforded by the "threadsafe" style of death test, thread problems such as deadlock
-are still possible in the presence of handlers registered with `pthread_atfork(3)`.
+Despite the improved thread safety afforded by the "threadsafe" style of death
+test, thread problems such as deadlock are still possible in the presence of
+handlers registered with `pthread_atfork(3)`.
 
 ## Using Assertions in Sub-routines
 
-{: .callout .note} Note: If you want to put a series of test assertions in a subroutine to check for a complex
-condition, consider using
-[a custom GMock matcher](gmock_cook_book.md#NewMatchers)
-instead. This lets you provide a more readable error message in case of failure and avoid all of the issues described
-below.
+{: .callout .note}
+Note: If you want to put a series of test assertions in a subroutine to check
+for a complex condition, consider using
+[a custom GMock matcher](gmock_cook_book.md#NewMatchers) instead. This lets you
+provide a more readable error message in case of failure and avoid all of the
+issues described below.
 
 ### Adding Traces to Assertions
 
-If a test sub-routine is called from several places, when an assertion inside it fails, it can be hard to tell which
-invocation of the sub-routine the failure is from. You can alleviate this problem using extra logging or custom failure
-messages, but that usually clutters up your tests. A better solution is to use the `SCOPED_TRACE` macro or
-the `ScopedTrace` utility:
+If a test sub-routine is called from several places, when an assertion inside it
+fails, it can be hard to tell which invocation of the sub-routine the failure is
+from. You can alleviate this problem using extra logging or custom failure
+messages, but that usually clutters up your tests. A better solution is to use
+the `SCOPED_TRACE` macro or the `ScopedTrace` utility:
 
 ```c++
 SCOPED_TRACE(message);
@@ -570,9 +669,10 @@ ScopedTrace trace("file_path", line_number, message);
 ```
 
 where `message` can be anything streamable to `std::ostream`. `SCOPED_TRACE`
-macro will cause the current file name, line number, and the given message to be added in every failure
-message. `ScopedTrace` accepts explicit file name and line number in arguments, which is useful for writing test
-helpers. The effect will be undone when the control leaves the current lexical scope.
+macro will cause the current file name, line number, and the given message to be
+added in every failure message. `ScopedTrace` accepts explicit file name and
+line number in arguments, which is useful for writing test helpers. The effect
+will be undone when the control leaves the current lexical scope.
 
 For example,
 
@@ -610,26 +710,31 @@ Expected: 2
 ```
 
 Without the trace, it would've been difficult to know which invocation of
-`Sub1()` the two failures come from respectively. (You could add an extra message to each assertion in `Sub1()` to
-indicate the value of `n`, but that's tedious.)
+`Sub1()` the two failures come from respectively. (You could add an extra
+message to each assertion in `Sub1()` to indicate the value of `n`, but that's
+tedious.)
 
 Some tips on using `SCOPED_TRACE`:
 
-1. With a suitable message, it's often enough to use `SCOPED_TRACE` at the beginning of a sub-routine, instead of at
-   each call site.
-2. When calling sub-routines inside a loop, make the loop iterator part of the message in `SCOPED_TRACE` such that you
-   can know which iteration the failure is from.
-3. Sometimes the line number of the trace point is enough for identifying the particular invocation of a sub-routine. In
-   this case, you don't have to choose a unique message for `SCOPED_TRACE`. You can simply use `""`.
-4. You can use `SCOPED_TRACE` in an inner scope when there is one in the outer scope. In this case, all active trace
-   points will be included in the failure messages, in reverse order they are encountered.
-5. The trace dump is clickable in Emacs - hit `return` on a line number and you'll be taken to that line in the source
-   file!
+1.  With a suitable message, it's often enough to use `SCOPED_TRACE` at the
+    beginning of a sub-routine, instead of at each call site.
+2.  When calling sub-routines inside a loop, make the loop iterator part of the
+    message in `SCOPED_TRACE` such that you can know which iteration the failure
+    is from.
+3.  Sometimes the line number of the trace point is enough for identifying the
+    particular invocation of a sub-routine. In this case, you don't have to
+    choose a unique message for `SCOPED_TRACE`. You can simply use `""`.
+4.  You can use `SCOPED_TRACE` in an inner scope when there is one in the outer
+    scope. In this case, all active trace points will be included in the failure
+    messages, in reverse order they are encountered.
+5.  The trace dump is clickable in Emacs - hit `return` on a line number and
+    you'll be taken to that line in the source file!
 
 ### Propagating Fatal Failures
 
-A common pitfall when using `ASSERT_*` and `FAIL*` is not understanding that when they fail they only abort the _current
-function_, not the entire test. For example, the following test will segfault:
+A common pitfall when using `ASSERT_*` and `FAIL*` is not understanding that
+when they fail they only abort the *current function*, not the entire test. For
+example, the following test will segfault:
 
 ```c++
 void Subroutine() {
@@ -650,9 +755,10 @@ TEST(FooTest, Bar) {
 }
 ```
 
-To alleviate this, googletest provides three different solutions. You could use either exceptions,
-the `(ASSERT|EXPECT)_NO_FATAL_FAILURE` assertions or the
-`HasFatalFailure()` function. They are described in the following two subsections.
+To alleviate this, GoogleTest provides three different solutions. You could use
+either exceptions, the `(ASSERT|EXPECT)_NO_FATAL_FAILURE` assertions or the
+`HasFatalFailure()` function. They are described in the following two
+subsections.
 
 #### Asserting on Subroutines with an exception
 
@@ -673,21 +779,25 @@ int main(int argc, char** argv) {
 }
 ```
 
-This listener should be added after other listeners if you have any, otherwise they won't see failed `OnTestPartResult`.
+This listener should be added after other listeners if you have any, otherwise
+they won't see failed `OnTestPartResult`.
 
 #### Asserting on Subroutines
 
-As shown above, if your test calls a subroutine that has an `ASSERT_*` failure in it, the test will continue after the
-subroutine returns. This may not be what you want.
+As shown above, if your test calls a subroutine that has an `ASSERT_*` failure
+in it, the test will continue after the subroutine returns. This may not be what
+you want.
 
-Often people want fatal failures to propagate like exceptions. For that googletest offers the following macros:
+Often people want fatal failures to propagate like exceptions. For that
+GoogleTest offers the following macros:
 
 Fatal assertion                       | Nonfatal assertion                    | Verifies
 ------------------------------------- | ------------------------------------- | --------
 `ASSERT_NO_FATAL_FAILURE(statement);` | `EXPECT_NO_FATAL_FAILURE(statement);` | `statement` doesn't generate any new fatal failures in the current thread.
 
-Only failures in the thread that executes the assertion are checked to determine the result of this type of assertions.
-If `statement` creates new threads, failures in these threads are ignored.
+Only failures in the thread that executes the assertion are checked to determine
+the result of this type of assertions. If `statement` creates new threads,
+failures in these threads are ignored.
 
 Examples:
 
@@ -704,8 +814,9 @@ Assertions from multiple threads are currently not supported on Windows.
 
 #### Checking for Failures in the Current Test
 
-`HasFatalFailure()` in the `::testing::Test` class returns `true` if an assertion in the current test has suffered a
-fatal failure. This allows functions to catch fatal failures in a sub-routine and return early.
+`HasFatalFailure()` in the `::testing::Test` class returns `true` if an
+assertion in the current test has suffered a fatal failure. This allows
+functions to catch fatal failures in a sub-routine and return early.
 
 ```c++
 class Test {
@@ -715,7 +826,8 @@ class Test {
 };
 ```
 
-The typical usage, which basically simulates the behavior of a thrown exception, is:
+The typical usage, which basically simulates the behavior of a thrown exception,
+is:
 
 ```c++
 TEST(FooTest, Bar) {
@@ -728,21 +840,24 @@ TEST(FooTest, Bar) {
 }
 ```
 
-If `HasFatalFailure()` is used outside of `TEST()` , `TEST_F()` , or a test fixture, you must add
-the `::testing::Test::` prefix, as in:
+If `HasFatalFailure()` is used outside of `TEST()` , `TEST_F()` , or a test
+fixture, you must add the `::testing::Test::` prefix, as in:
 
 ```c++
 if (testing::Test::HasFatalFailure()) return;
 ```
 
-Similarly, `HasNonfatalFailure()` returns `true` if the current test has at least one non-fatal failure,
-and `HasFailure()` returns `true` if the current test has at least one failure of either kind.
+Similarly, `HasNonfatalFailure()` returns `true` if the current test has at
+least one non-fatal failure, and `HasFailure()` returns `true` if the current
+test has at least one failure of either kind.
 
 ## Logging Additional Information
 
-In your test code, you can call `RecordProperty("key", value)` to log additional information, where `value` can be
-either a string or an `int`. The *last* value recorded for a key will be emitted to the
-[XML output](#generating-an-xml-report) if you specify one. For example, the test
+In your test code, you can call `RecordProperty("key", value)` to log additional
+information, where `value` can be either a string or an `int`. The *last* value
+recorded for a key will be emitted to the
+[XML output](#generating-an-xml-report) if you specify one. For example, the
+test
 
 ```c++
 TEST_F(WidgetUsageTest, MinAndMaxWidgets) {
@@ -755,52 +870,64 @@ will output XML like this:
 
 ```xml
   ...
-    <testcase name="MinAndMaxWidgets" status="run" time="0.006" classname="WidgetUsageTest" MaximumWidgets="12" MinimumWidgets="9" />
+    <testcase name="MinAndMaxWidgets" file="test.cpp" line="1" status="run" time="0.006" classname="WidgetUsageTest" MaximumWidgets="12" MinimumWidgets="9" />
   ...
 ```
 
 {: .callout .note}
 > NOTE:
 >
-> * `RecordProperty()` is a static member of the `Test` class. Therefore it
-    > needs to be prefixed with `::testing::Test::` if used outside of the
-    > `TEST` body and the test fixture class.
-> * *`key`* must be a valid XML attribute name, and cannot conflict with the
-    > ones already used by googletest (`name`, `status`, `time`, `classname`,
-    > `type_param`, and `value_param`).
-> * Calling `RecordProperty()` outside of the lifespan of a test is allowed.
-    > If it's called outside of a test but between a test suite's
-    > `SetUpTestSuite()` and `TearDownTestSuite()` methods, it will be
-    > attributed to the XML element for the test suite. If it's called outside
-    > of all test suites (e.g. in a test environment), it will be attributed to
-    > the top-level XML element.
+> *   `RecordProperty()` is a static member of the `Test` class. Therefore it
+>     needs to be prefixed with `::testing::Test::` if used outside of the
+>     `TEST` body and the test fixture class.
+> *   *`key`* must be a valid XML attribute name, and cannot conflict with the
+>     ones already used by GoogleTest (`name`, `status`, `time`, `classname`,
+>     `type_param`, and `value_param`).
+> *   Calling `RecordProperty()` outside of the lifespan of a test is allowed.
+>     If it's called outside of a test but between a test suite's
+>     `SetUpTestSuite()` and `TearDownTestSuite()` methods, it will be
+>     attributed to the XML element for the test suite. If it's called outside
+>     of all test suites (e.g. in a test environment), it will be attributed to
+>     the top-level XML element.
 
 ## Sharing Resources Between Tests in the Same Test Suite
 
-googletest creates a new test fixture object for each test in order to make tests independent and easier to debug.
-However, sometimes tests use resources that are expensive to set up, making the one-copy-per-test model prohibitively
+GoogleTest creates a new test fixture object for each test in order to make
+tests independent and easier to debug. However, sometimes tests use resources
+that are expensive to set up, making the one-copy-per-test model prohibitively
 expensive.
 
-If the tests don't change the resource, there's no harm in their sharing a single resource copy. So, in addition to
-per-test set-up/tear-down, googletest also supports per-test-suite set-up/tear-down. To use it:
+If the tests don't change the resource, there's no harm in their sharing a
+single resource copy. So, in addition to per-test set-up/tear-down, GoogleTest
+also supports per-test-suite set-up/tear-down. To use it:
 
-1. In your test fixture class (say `FooTest` ), declare as `static` some member variables to hold the shared resources.
-2. Outside your test fixture class (typically just below it), define those member variables, optionally giving them
-   initial values.
-3. In the same test fixture class, define a `static void SetUpTestSuite()`
-   function (remember not to spell it as **`SetupTestSuite`** with a small
-   `u`!) to set up the shared resources and a `static void TearDownTestSuite()`
-   function to tear them down.
+1.  In your test fixture class (say `FooTest` ), declare as `static` some member
+    variables to hold the shared resources.
+2.  Outside your test fixture class (typically just below it), define those
+    member variables, optionally giving them initial values.
+3.  In the same test fixture class, define a public member function `static void
+    SetUpTestSuite()` (remember not to spell it as **`SetupTestSuite`** with a
+    small `u`!) to set up the shared resources and a `static void
+    TearDownTestSuite()` function to tear them down.
 
-That's it! googletest automatically calls `SetUpTestSuite()` before running the
+That's it! GoogleTest automatically calls `SetUpTestSuite()` before running the
 *first test* in the `FooTest` test suite (i.e. before creating the first
 `FooTest` object), and calls `TearDownTestSuite()` after running the *last test*
-in it (i.e. after deleting the last `FooTest` object). In between, the tests can use the shared resources.
+in it (i.e. after deleting the last `FooTest` object). In between, the tests can
+use the shared resources.
 
-Remember that the test order is undefined, so your code can't depend on a test preceding or following another. Also, the
-tests must either not modify the state of any shared resource, or, if they do modify the state, they must restore the
+Remember that the test order is undefined, so your code can't depend on a test
+preceding or following another. Also, the tests must either not modify the state
+of any shared resource, or, if they do modify the state, they must restore the
 state to its original value before passing control to the next test.
 
+Note that `SetUpTestSuite()` may be called multiple times for a test fixture
+class that has derived classes, so you should not expect code in the function
+body to be run only once. Also, derived classes still have access to shared
+resources defined as static members, so careful consideration is needed when
+managing shared resources to avoid memory leaks if shared resources are not
+properly cleaned up in `TearDownTestSuite()`.
+
 Here's an example of per-test-suite set-up and tear-down:
 
 ```c++
@@ -811,6 +938,14 @@ class FooTest : public testing::Test {
   // Can be omitted if not needed.
   static void SetUpTestSuite() {
     shared_resource_ = new ...;
+
+    // If `shared_resource_` is **not deleted** in `TearDownTestSuite()`,
+    // reallocation should be prevented because `SetUpTestSuite()` may be called
+    // in subclasses of FooTest and lead to memory leak.
+    //
+    // if (shared_resource_ == nullptr) {
+    //   shared_resource_ = new ...;
+    // }
   }
 
   // Per-test-suite tear-down.
@@ -842,17 +977,18 @@ TEST_F(FooTest, Test2) {
 }
 ```
 
-{: .callout .note} NOTE: Though the above code declares `SetUpTestSuite()` protected, it may sometimes be necessary to
-declare it public, such as when using it with
+{: .callout .note}
+NOTE: Though the above code declares `SetUpTestSuite()` protected, it may
+sometimes be necessary to declare it public, such as when using it with
 `TEST_P`.
 
 ## Global Set-Up and Tear-Down
 
-Just as you can do set-up and tear-down at the test level and the test suite level, you can also do it at the test
-program level. Here's how.
+Just as you can do set-up and tear-down at the test level and the test suite
+level, you can also do it at the test program level. Here's how.
 
-First, you subclass the `::testing::Environment` class to define a test environment, which knows how to set-up and
-tear-down:
+First, you subclass the `::testing::Environment` class to define a test
+environment, which knows how to set-up and tear-down:
 
 ```c++
 class Environment : public ::testing::Environment {
@@ -867,26 +1003,40 @@ class Environment : public ::testing::Environment {
 };
 ```
 
-Then, you register an instance of your environment class with googletest by calling
-the `::testing::AddGlobalTestEnvironment()` function:
+Then, you register an instance of your environment class with GoogleTest by
+calling the `::testing::AddGlobalTestEnvironment()` function:
 
 ```c++
 Environment* AddGlobalTestEnvironment(Environment* env);
 ```
 
-Now, when `RUN_ALL_TESTS()` is called, it first calls the `SetUp()` method of each environment object, then runs the
-tests if none of the environments reported fatal failures and `GTEST_SKIP()` was not called. `RUN_ALL_TESTS()`
-always calls `TearDown()` with each environment object, regardless of whether or not the tests were run.
+Now, when `RUN_ALL_TESTS()` is invoked, it first calls the `SetUp()` method. The
+tests are then executed, provided that none of the environments have reported
+fatal failures and `GTEST_SKIP()` has not been invoked. Finally, `TearDown()` is
+called.
+
+Note that `SetUp()` and `TearDown()` are only invoked if there is at least one
+test to be performed. Importantly, `TearDown()` is executed even if the test is
+not run due to a fatal failure or `GTEST_SKIP()`.
+
+Calling `SetUp()` and `TearDown()` for each iteration depends on the flag
+`gtest_recreate_environments_when_repeating`. `SetUp()` and `TearDown()` are
+called for each environment object when the object is recreated for each
+iteration. However, if test environments are not recreated for each iteration,
+`SetUp()` is called only on the first iteration, and `TearDown()` is called only
+on the last iteration.
 
 It's OK to register multiple environment objects. In this suite, their `SetUp()`
-will be called in the order they are registered, and their `TearDown()` will be called in the reverse order.
+will be called in the order they are registered, and their `TearDown()` will be
+called in the reverse order.
 
-Note that googletest takes ownership of the registered environment objects. Therefore **do not delete them** by
-yourself.
+Note that GoogleTest takes ownership of the registered environment objects.
+Therefore **do not delete them** by yourself.
 
-You should call `AddGlobalTestEnvironment()` before `RUN_ALL_TESTS()` is called, probably in `main()`. If you
-use `gtest_main`, you need to call this before
-`main()` starts for it to take effect. One way to do this is to define a global variable like this:
+You should call `AddGlobalTestEnvironment()` before `RUN_ALL_TESTS()` is called,
+probably in `main()`. If you use `gtest_main`, you need to call this before
+`main()` starts for it to take effect. One way to do this is to define a global
+variable like this:
 
 ```c++
 testing::Environment* const foo_env =
@@ -894,39 +1044,45 @@ testing::Environment* const foo_env =
 ```
 
 However, we strongly recommend you to write your own `main()` and call
-`AddGlobalTestEnvironment()` there, as relying on initialization of global variables makes the code harder to read and
-may cause problems when you register multiple environments from different translation units and the environments have
-dependencies among them (remember that the compiler doesn't guarantee the order in which global variables from different
-translation units are initialized).
+`AddGlobalTestEnvironment()` there, as relying on initialization of global
+variables makes the code harder to read and may cause problems when you register
+multiple environments from different translation units and the environments have
+dependencies among them (remember that the compiler doesn't guarantee the order
+in which global variables from different translation units are initialized).
 
 ## Value-Parameterized Tests
 
-*Value-parameterized tests* allow you to test your code with different parameters without writing multiple copies of the
-same test. This is useful in a number of situations, for example:
+*Value-parameterized tests* allow you to test your code with different
+parameters without writing multiple copies of the same test. This is useful in a
+number of situations, for example:
 
-* You have a piece of code whose behavior is affected by one or more command-line flags. You want to make sure your code
-  performs correctly for various values of those flags.
-* You want to test different implementations of an OO interface.
-* You want to test your code over various inputs (a.k.a. data-driven testing). This feature is easy to abuse, so please
-  exercise your good sense when doing it!
+*   You have a piece of code whose behavior is affected by one or more
+    command-line flags. You want to make sure your code performs correctly for
+    various values of those flags.
+*   You want to test different implementations of an OO interface.
+*   You want to test your code over various inputs (a.k.a. data-driven testing).
+    This feature is easy to abuse, so please exercise your good sense when doing
+    it!
 
 ### How to Write Value-Parameterized Tests
 
-To write value-parameterized tests, first you should define a fixture class. It must be derived from
-both `testing::Test` and `testing::WithParamInterface<T>`
-(the latter is a pure interface), where `T` is the type of your parameter values. For convenience, you can just derive
-the fixture class from
+To write value-parameterized tests, first you should define a fixture class. It
+must be derived from both `testing::Test` and `testing::WithParamInterface<T>`
+(the latter is a pure interface), where `T` is the type of your parameter
+values. For convenience, you can just derive the fixture class from
 `testing::TestWithParam<T>`, which itself is derived from both `testing::Test`
-and `testing::WithParamInterface<T>`. `T` can be any copyable type. If it's a raw pointer, you are responsible for
-managing the lifespan of the pointed values.
+and `testing::WithParamInterface<T>`. `T` can be any copyable type. If it's a
+raw pointer, you are responsible for managing the lifespan of the pointed
+values.
 
-{: .callout .note} NOTE: If your test fixture defines `SetUpTestSuite()` or `TearDownTestSuite()`
+{: .callout .note}
+NOTE: If your test fixture defines `SetUpTestSuite()` or `TearDownTestSuite()`
 they must be declared **public** rather than **protected** in order to use
 `TEST_P`.
 
 ```c++
 class FooTest :
-    public testing::TestWithParam<const char*> {
+    public testing::TestWithParam<absl::string_view> {
   // You can implement all the usual fixture class members here.
   // To access the test parameter, call GetParam() from class
   // TestWithParam<T>.
@@ -937,13 +1093,14 @@ class BaseTest : public testing::Test {
   ...
 };
 class BarTest : public BaseTest,
-                public testing::WithParamInterface<const char*> {
+                public testing::WithParamInterface<absl::string_view> {
   ...
 };
 ```
 
-Then, use the `TEST_P` macro to define as many test patterns using this fixture as you want. The `_P` suffix is for "
-parameterized" or "pattern", whichever you prefer to think.
+Then, use the `TEST_P` macro to define as many test patterns using this fixture
+as you want. The `_P` suffix is for "parameterized" or "pattern", whichever you
+prefer to think.
 
 ```c++
 TEST_P(FooTest, DoesBlah) {
@@ -958,9 +1115,11 @@ TEST_P(FooTest, HasBlahBlah) {
 }
 ```
 
-Finally, you can use the `INSTANTIATE_TEST_SUITE_P` macro to instantiate the test suite with any set of parameters you
-want. GoogleTest defines a number of functions for generating test parameters—see details at
-[`INSTANTIATE_TEST_SUITE_P`](reference/testing.md#INSTANTIATE_TEST_SUITE_P) in the Testing Reference.
+Finally, you can use the `INSTANTIATE_TEST_SUITE_P` macro to instantiate the
+test suite with any set of parameters you want. GoogleTest defines a number of
+functions for generating test parameters—see details at
+[`INSTANTIATE_TEST_SUITE_P`](reference/testing.md#INSTANTIATE_TEST_SUITE_P) in
+the Testing Reference.
 
 For example, the following statement will instantiate tests from the `FooTest`
 test suite each with parameter values `"meeny"`, `"miny"`, and `"moe"` using the
@@ -972,50 +1131,60 @@ INSTANTIATE_TEST_SUITE_P(MeenyMinyMoe,
                          testing::Values("meeny", "miny", "moe"));
 ```
 
-{: .callout .note} NOTE: The code above must be placed at global or namespace scope, not at function scope.
+{: .callout .note}
+NOTE: The code above must be placed at global or namespace scope, not at
+function scope.
 
-The first argument to `INSTANTIATE_TEST_SUITE_P` is a unique name for the instantiation of the test suite. The next
-argument is the name of the test pattern, and the last is the
+The first argument to `INSTANTIATE_TEST_SUITE_P` is a unique name for the
+instantiation of the test suite. The next argument is the name of the test
+pattern, and the last is the
 [parameter generator](reference/testing.md#param-generators).
 
-You can instantiate a test pattern more than once, so to distinguish different instances of the pattern, the
-instantiation name is added as a prefix to the actual test suite name. Remember to pick unique prefixes for different
+The parameter generator expression is not evaluated until GoogleTest is
+initialized (via `InitGoogleTest()`). Any prior initialization done in the
+`main` function will be accessible from the parameter generator, for example,
+the results of flag parsing.
+
+You can instantiate a test pattern more than once, so to distinguish different
+instances of the pattern, the instantiation name is added as a prefix to the
+actual test suite name. Remember to pick unique prefixes for different
 instantiations. The tests from the instantiation above will have these names:
 
-* `MeenyMinyMoe/FooTest.DoesBlah/0` for `"meeny"`
-* `MeenyMinyMoe/FooTest.DoesBlah/1` for `"miny"`
-* `MeenyMinyMoe/FooTest.DoesBlah/2` for `"moe"`
-* `MeenyMinyMoe/FooTest.HasBlahBlah/0` for `"meeny"`
-* `MeenyMinyMoe/FooTest.HasBlahBlah/1` for `"miny"`
-* `MeenyMinyMoe/FooTest.HasBlahBlah/2` for `"moe"`
+*   `MeenyMinyMoe/FooTest.DoesBlah/0` for `"meeny"`
+*   `MeenyMinyMoe/FooTest.DoesBlah/1` for `"miny"`
+*   `MeenyMinyMoe/FooTest.DoesBlah/2` for `"moe"`
+*   `MeenyMinyMoe/FooTest.HasBlahBlah/0` for `"meeny"`
+*   `MeenyMinyMoe/FooTest.HasBlahBlah/1` for `"miny"`
+*   `MeenyMinyMoe/FooTest.HasBlahBlah/2` for `"moe"`
 
 You can use these names in [`--gtest_filter`](#running-a-subset-of-the-tests).
 
-The following statement will instantiate all tests from `FooTest` again, each with parameter values `"cat"` and `"dog"`
-using the
+The following statement will instantiate all tests from `FooTest` again, each
+with parameter values `"cat"` and `"dog"` using the
 [`ValuesIn`](reference/testing.md#param-generators) parameter generator:
 
 ```c++
-const char* pets[] = {"cat", "dog"};
-INSTANTIATE_TEST_SUITE_P(Pets, FooTest, testing::ValuesIn(pets));
+constexpr absl::string_view kPets[] = {"cat", "dog"};
+INSTANTIATE_TEST_SUITE_P(Pets, FooTest, testing::ValuesIn(kPets));
 ```
 
 The tests from the instantiation above will have these names:
 
-* `Pets/FooTest.DoesBlah/0` for `"cat"`
-* `Pets/FooTest.DoesBlah/1` for `"dog"`
-* `Pets/FooTest.HasBlahBlah/0` for `"cat"`
-* `Pets/FooTest.HasBlahBlah/1` for `"dog"`
+*   `Pets/FooTest.DoesBlah/0` for `"cat"`
+*   `Pets/FooTest.DoesBlah/1` for `"dog"`
+*   `Pets/FooTest.HasBlahBlah/0` for `"cat"`
+*   `Pets/FooTest.HasBlahBlah/1` for `"dog"`
 
-Please note that `INSTANTIATE_TEST_SUITE_P` will instantiate *all* tests in the given test suite, whether their
-definitions come before or *after* the
+Please note that `INSTANTIATE_TEST_SUITE_P` will instantiate *all* tests in the
+given test suite, whether their definitions come before or *after* the
 `INSTANTIATE_TEST_SUITE_P` statement.
 
 Additionally, by default, every `TEST_P` without a corresponding
 `INSTANTIATE_TEST_SUITE_P` causes a failing test in test suite
-`GoogleTestVerification`. If you have a test suite where that omission is not an error, for example it is in a library
-that may be linked in for other reasons or where the list of test cases is dynamic and may be empty, then this check can
-be suppressed by tagging the test suite:
+`GoogleTestVerification`. If you have a test suite where that omission is not an
+error, for example it is in a library that may be linked in for other reasons or
+where the list of test cases is dynamic and may be empty, then this check can be
+suppressed by tagging the test suite:
 
 ```c++
 GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(FooTest);
@@ -1023,42 +1192,47 @@ GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(FooTest);
 
 You can see [sample7_unittest.cc] and [sample8_unittest.cc] for more examples.
 
-[sample7_unittest.cc]: https://github.com/google/googletest/blob/master/googletest/samples/sample7_unittest.cc "Parameterized Test example"
-
-[sample8_unittest.cc]: https://github.com/google/googletest/blob/master/googletest/samples/sample8_unittest.cc "Parameterized Test example with multiple parameters"
+[sample7_unittest.cc]: https://github.com/google/googletest/blob/main/googletest/samples/sample7_unittest.cc "Parameterized Test example"
+[sample8_unittest.cc]: https://github.com/google/googletest/blob/main/googletest/samples/sample8_unittest.cc "Parameterized Test example with multiple parameters"
 
 ### Creating Value-Parameterized Abstract Tests
 
-In the above, we define and instantiate `FooTest` in the *same* source file. Sometimes you may want to define
-value-parameterized tests in a library and let other people instantiate them later. This pattern is known as *abstract
-tests*. As an example of its application, when you are designing an interface you can write a standard suite of abstract
-tests (perhaps using a factory function as the test parameter) that all implementations of the interface are expected to
-pass. When someone implements the interface, they can instantiate your suite to get all the interface-conformance tests
-for free.
+In the above, we define and instantiate `FooTest` in the *same* source file.
+Sometimes you may want to define value-parameterized tests in a library and let
+other people instantiate them later. This pattern is known as *abstract tests*.
+As an example of its application, when you are designing an interface you can
+write a standard suite of abstract tests (perhaps using a factory function as
+the test parameter) that all implementations of the interface are expected to
+pass. When someone implements the interface, they can instantiate your suite to
+get all the interface-conformance tests for free.
 
 To define abstract tests, you should organize your code like this:
 
-1. Put the definition of the parameterized test fixture class (e.g. `FooTest`)
-   in a header file, say `foo_param_test.h`. Think of this as *declaring* your abstract tests.
-2. Put the `TEST_P` definitions in `foo_param_test.cc`, which includes
-   `foo_param_test.h`. Think of this as *implementing* your abstract tests.
+1.  Put the definition of the parameterized test fixture class (e.g. `FooTest`)
+    in a header file, say `foo_param_test.h`. Think of this as *declaring* your
+    abstract tests.
+2.  Put the `TEST_P` definitions in `foo_param_test.cc`, which includes
+    `foo_param_test.h`. Think of this as *implementing* your abstract tests.
 
-Once they are defined, you can instantiate them by including `foo_param_test.h`, invoking `INSTANTIATE_TEST_SUITE_P()`,
-and depending on the library target that contains `foo_param_test.cc`. You can instantiate the same abstract test suite
+Once they are defined, you can instantiate them by including `foo_param_test.h`,
+invoking `INSTANTIATE_TEST_SUITE_P()`, and depending on the library target that
+contains `foo_param_test.cc`. You can instantiate the same abstract test suite
 multiple times, possibly in different source files.
 
 ### Specifying Names for Value-Parameterized Test Parameters
 
-The optional last argument to `INSTANTIATE_TEST_SUITE_P()` allows the user to specify a function or functor that
-generates custom test name suffixes based on the test parameters. The function should accept one argument of type
+The optional last argument to `INSTANTIATE_TEST_SUITE_P()` allows the user to
+specify a function or functor that generates custom test name suffixes based on
+the test parameters. The function should accept one argument of type
 `testing::TestParamInfo<class ParamType>`, and return `std::string`.
 
-`testing::PrintToStringParamName` is a builtin test suffix generator that returns the value
-of `testing::PrintToString(GetParam())`. It does not work for
+`testing::PrintToStringParamName` is a builtin test suffix generator that
+returns the value of `testing::PrintToString(GetParam())`. It does not work for
 `std::string` or C strings.
 
-{: .callout .note} NOTE: test names must be non-empty, unique, and may only contain ASCII alphanumeric characters. In
-particular, they
+{: .callout .note}
+NOTE: test names must be non-empty, unique, and may only contain ASCII
+alphanumeric characters. In particular, they
 [should not contain underscores](faq.md#why-should-test-suite-names-and-test-names-not-contain-underscore)
 
 ```c++
@@ -1073,10 +1247,12 @@ INSTANTIATE_TEST_SUITE_P(MyGroup, MyTestSuite, testing::Range(0, 10),
                          testing::PrintToStringParamName());
 ```
 
-Providing a custom functor allows for more control over test parameter name generation, especially for types where the
-automatic conversion does not generate helpful parameter names (e.g. strings as demonstrated above). The following
-example illustrates this for multiple parameters, an enumeration type and a string, and also demonstrates how to combine
-generators. It uses a lambda for conciseness:
+Providing a custom functor allows for more control over test parameter name
+generation, especially for types where the automatic conversion does not
+generate helpful parameter names (e.g. strings as demonstrated above). The
+following example illustrates this for multiple parameters, an enumeration type
+and a string, and also demonstrates how to combine generators. It uses a lambda
+for conciseness:
 
 ```c++
 enum class MyType { MY_FOO = 0, MY_BAR = 1 };
@@ -1100,19 +1276,23 @@ INSTANTIATE_TEST_SUITE_P(
 
 ## Typed Tests
 
-Suppose you have multiple implementations of the same interface and want to make sure that all of them satisfy some
-common requirements. Or, you may have defined several types that are supposed to conform to the same "concept" and you
-want to verify it. In both cases, you want the same test logic repeated for different types.
+Suppose you have multiple implementations of the same interface and want to make
+sure that all of them satisfy some common requirements. Or, you may have defined
+several types that are supposed to conform to the same "concept" and you want to
+verify it. In both cases, you want the same test logic repeated for different
+types.
 
-While you can write one `TEST` or `TEST_F` for each type you want to test (and you may even factor the test logic into a
-function template that you invoke from the `TEST`), it's tedious and doesn't scale: if you want `m` tests over `n`
+While you can write one `TEST` or `TEST_F` for each type you want to test (and
+you may even factor the test logic into a function template that you invoke from
+the `TEST`), it's tedious and doesn't scale: if you want `m` tests over `n`
 types, you'll end up writing `m*n` `TEST`s.
 
-*Typed tests* allow you to repeat the same test logic over a list of types. You only need to write the test logic once,
-although you must know the type list when writing typed tests. Here's how you do it:
+*Typed tests* allow you to repeat the same test logic over a list of types. You
+only need to write the test logic once, although you must know the type list
+when writing typed tests. Here's how you do it:
 
-First, define a fixture class template. It should be parameterized by a type. Remember to derive it
-from `::testing::Test`:
+First, define a fixture class template. It should be parameterized by a type.
+Remember to derive it from `::testing::Test`:
 
 ```c++
 template <typename T>
@@ -1125,7 +1305,8 @@ class FooTest : public testing::Test {
 };
 ```
 
-Next, associate a list of types with the test suite, which will be repeated for each type in the list:
+Next, associate a list of types with the test suite, which will be repeated for
+each type in the list:
 
 ```c++
 using MyTypes = ::testing::Types<char, int, unsigned int>;
@@ -1133,11 +1314,11 @@ TYPED_TEST_SUITE(FooTest, MyTypes);
 ```
 
 The type alias (`using` or `typedef`) is necessary for the `TYPED_TEST_SUITE`
-macro to parse correctly. Otherwise the compiler will think that each comma in the type list introduces a new macro
-argument.
+macro to parse correctly. Otherwise the compiler will think that each comma in
+the type list introduces a new macro argument.
 
-Then, use `TYPED_TEST()` instead of `TEST_F()` to define a typed test for this test suite. You can repeat this as many
-times as you want:
+Then, use `TYPED_TEST()` instead of `TEST_F()` to define a typed test for this
+test suite. You can repeat this as many times as you want:
 
 ```c++
 TYPED_TEST(FooTest, DoesBlah) {
@@ -1163,24 +1344,28 @@ TYPED_TEST(FooTest, HasPropertyA) { ... }
 
 You can see [sample6_unittest.cc] for a complete example.
 
-[sample6_unittest.cc]: https://github.com/google/googletest/blob/master/googletest/samples/sample6_unittest.cc "Typed Test example"
+[sample6_unittest.cc]: https://github.com/google/googletest/blob/main/googletest/samples/sample6_unittest.cc "Typed Test example"
 
 ## Type-Parameterized Tests
 
-*Type-parameterized tests* are like typed tests, except that they don't require you to know the list of types ahead of
-time. Instead, you can define the test logic first and instantiate it with different type lists later. You can even
+*Type-parameterized tests* are like typed tests, except that they don't require
+you to know the list of types ahead of time. Instead, you can define the test
+logic first and instantiate it with different type lists later. You can even
 instantiate it more than once in the same program.
 
-If you are designing an interface or concept, you can define a suite of type-parameterized tests to verify properties
-that any valid implementation of the interface/concept should have. Then, the author of each implementation can just
-instantiate the test suite with their type to verify that it conforms to the requirements, without having to write
-similar tests repeatedly. Here's an example:
+If you are designing an interface or concept, you can define a suite of
+type-parameterized tests to verify properties that any valid implementation of
+the interface/concept should have. Then, the author of each implementation can
+just instantiate the test suite with their type to verify that it conforms to
+the requirements, without having to write similar tests repeatedly. Here's an
+example:
 
 First, define a fixture class template, as we did with typed tests:
 
 ```c++
 template <typename T>
 class FooTest : public testing::Test {
+  void DoSomethingInteresting();
   ...
 };
 ```
@@ -1191,12 +1376,16 @@ Next, declare that you will define a type-parameterized test suite:
 TYPED_TEST_SUITE_P(FooTest);
 ```
 
-Then, use `TYPED_TEST_P()` to define a type-parameterized test. You can repeat this as many times as you want:
+Then, use `TYPED_TEST_P()` to define a type-parameterized test. You can repeat
+this as many times as you want:
 
 ```c++
 TYPED_TEST_P(FooTest, DoesBlah) {
   // Inside a test, refer to TypeParam to get the type parameter.
   TypeParam n = 0;
+
+  // You will need to use `this` explicitly to refer to fixture members.
+  this->DoSomethingInteresting()
   ...
 }
 
@@ -1204,16 +1393,18 @@ TYPED_TEST_P(FooTest, HasPropertyA) { ... }
 ```
 
 Now the tricky part: you need to register all test patterns using the
-`REGISTER_TYPED_TEST_SUITE_P` macro before you can instantiate them. The first argument of the macro is the test suite
-name; the rest are the names of the tests in this test suite:
+`REGISTER_TYPED_TEST_SUITE_P` macro before you can instantiate them. The first
+argument of the macro is the test suite name; the rest are the names of the
+tests in this test suite:
 
 ```c++
 REGISTER_TYPED_TEST_SUITE_P(FooTest,
                             DoesBlah, HasPropertyA);
 ```
 
-Finally, you are free to instantiate the pattern with the types you want. If you put the above code in a header file,
-you can `#include` it in multiple C++ source files and instantiate it multiple times.
+Finally, you are free to instantiate the pattern with the types you want. If you
+put the above code in a header file, you can `#include` it in multiple C++
+source files and instantiate it multiple times.
 
 ```c++
 using MyTypes = ::testing::Types<char, int, unsigned int>;
@@ -1221,11 +1412,12 @@ INSTANTIATE_TYPED_TEST_SUITE_P(My, FooTest, MyTypes);
 ```
 
 To distinguish different instances of the pattern, the first argument to the
-`INSTANTIATE_TYPED_TEST_SUITE_P` macro is a prefix that will be added to the actual test suite name. Remember to pick
-unique prefixes for different instances.
+`INSTANTIATE_TYPED_TEST_SUITE_P` macro is a prefix that will be added to the
+actual test suite name. Remember to pick unique prefixes for different
+instances.
 
-In the special case where the type list contains only one type, you can write that type directly
-without `::testing::Types<...>`, like this:
+In the special case where the type list contains only one type, you can write
+that type directly without `::testing::Types<...>`, like this:
 
 ```c++
 INSTANTIATE_TYPED_TEST_SUITE_P(My, FooTest, int);
@@ -1235,119 +1427,136 @@ You can see [sample6_unittest.cc] for a complete example.
 
 ## Testing Private Code
 
-If you change your software's internal implementation, your tests should not break as long as the change is not
-observable by users. Therefore, **per the black-box testing principle, most of the time you should test your code
-through its public interfaces.**
+If you change your software's internal implementation, your tests should not
+break as long as the change is not observable by users. Therefore, **per the
+black-box testing principle, most of the time you should test your code through
+its public interfaces.**
 
-**If you still find yourself needing to test internal implementation code, consider if there's a better design.** The
-desire to test internal implementation is often a sign that the class is doing too much. Consider extracting an
-implementation class, and testing it. Then use that implementation class in the original class.
+**If you still find yourself needing to test internal implementation code,
+consider if there's a better design.** The desire to test internal
+implementation is often a sign that the class is doing too much. Consider
+extracting an implementation class, and testing it. Then use that implementation
+class in the original class.
 
-If you absolutely have to test non-public interface code though, you can. There are two cases to consider:
+If you absolutely have to test non-public interface code though, you can. There
+are two cases to consider:
 
-* Static functions ( *not* the same as static member functions!) or unnamed namespaces, and
-* Private or protected class members
+*   Static functions ( *not* the same as static member functions!) or unnamed
+    namespaces, and
+*   Private or protected class members
 
 To test them, we use the following special techniques:
 
-* Both static functions and definitions/declarations in an unnamed namespace are only visible within the same
-  translation unit. To test them, you can
-  `#include` the entire `.cc` file being tested in your `*_test.cc` file.
-  (#including `.cc` files is not a good way to reuse code - you should not do this in production code!)
-
-  However, a better approach is to move the private code into the
-  `foo::internal` namespace, where `foo` is the namespace your project normally uses, and put the private declarations
-  in a `*-internal.h` file. Your production `.cc` files and your tests are allowed to include this internal header, but
-  your clients are not. This way, you can fully test your internal implementation without leaking it to your clients.
-
-* Private class members are only accessible from within the class or by friends. To access a class' private members, you
-  can declare your test fixture as a friend to the class and define accessors in your fixture. Tests using the fixture
-  can then access the private members of your production class via the accessors in the fixture. Note that even though
-  your fixture is a friend to your production class, your tests are not automatically friends to it, as they are
-  technically defined in sub-classes of the fixture.
-
-  Another way to test private members is to refactor them into an implementation class, which is then declared in
-  a `*-internal.h` file. Your clients aren't allowed to include this header but your tests can. Such is called the
-  [Pimpl](https://www.gamedev.net/articles/programming/general-and-gameplay-programming/the-c-pimpl-r1794/)
-  (Private Implementation) idiom.
-
-  Or, you can declare an individual test as a friend of your class by adding this line in the class body:
-
-  ```c++
-      FRIEND_TEST(TestSuiteName, TestName);
-  ```
-
-  For example,
-
-  ```c++
-  // foo.h
-  class Foo {
+*   Both static functions and definitions/declarations in an unnamed namespace
+    are only visible within the same translation unit. To test them, you can
+    `#include` the entire `.cc` file being tested in your `*_test.cc` file.
+    (#including `.cc` files is not a good way to reuse code - you should not do
+    this in production code!)
+
+    However, a better approach is to move the private code into the
+    `foo::internal` namespace, where `foo` is the namespace your project
+    normally uses, and put the private declarations in a `*-internal.h` file.
+    Your production `.cc` files and your tests are allowed to include this
+    internal header, but your clients are not. This way, you can fully test your
+    internal implementation without leaking it to your clients.
+
+*   Private class members are only accessible from within the class or by
+    friends. To access a class' private members, you can declare your test
+    fixture as a friend to the class and define accessors in your fixture. Tests
+    using the fixture can then access the private members of your production
+    class via the accessors in the fixture. Note that even though your fixture
+    is a friend to your production class, your tests are not automatically
+    friends to it, as they are technically defined in sub-classes of the
+    fixture.
+
+    Another way to test private members is to refactor them into an
+    implementation class, which is then declared in a `*-internal.h` file. Your
+    clients aren't allowed to include this header but your tests can. Such is
+    called the
+    [Pimpl](https://www.gamedev.net/articles/programming/general-and-gameplay-programming/the-c-pimpl-r1794/)
+    (Private Implementation) idiom.
+
+    Or, you can declare an individual test as a friend of your class by adding
+    this line in the class body:
+
+    ```c++
+        FRIEND_TEST(TestSuiteName, TestName);
+    ```
+
+    For example,
+
+    ```c++
+    // foo.h
+    class Foo {
+      ...
+     private:
+      FRIEND_TEST(FooTest, BarReturnsZeroOnNull);
+
+      int Bar(void* x);
+    };
+
+    // foo_test.cc
     ...
-   private:
-    FRIEND_TEST(FooTest, BarReturnsZeroOnNull);
+    TEST(FooTest, BarReturnsZeroOnNull) {
+      Foo foo;
+      EXPECT_EQ(foo.Bar(NULL), 0);  // Uses Foo's private member Bar().
+    }
+    ```
 
-    int Bar(void* x);
-  };
+    Pay special attention when your class is defined in a namespace. If you want
+    your test fixtures and tests to be friends of your class, then they must be
+    defined in the exact same namespace (no anonymous or inline namespaces).
 
-  // foo_test.cc
-  ...
-  TEST(FooTest, BarReturnsZeroOnNull) {
-    Foo foo;
-    EXPECT_EQ(foo.Bar(NULL), 0);  // Uses Foo's private member Bar().
-  }
-  ```
+    For example, if the code to be tested looks like:
 
-  Pay special attention when your class is defined in a namespace. If you want your test fixtures and tests to be
-  friends of your class, then they must be defined in the exact same namespace (no anonymous or inline namespaces).
+    ```c++
+    namespace my_namespace {
 
-  For example, if the code to be tested looks like:
+    class Foo {
+      friend class FooTest;
+      FRIEND_TEST(FooTest, Bar);
+      FRIEND_TEST(FooTest, Baz);
+      ... definition of the class Foo ...
+    };
 
-  ```c++
-  namespace my_namespace {
+    }  // namespace my_namespace
+    ```
 
-  class Foo {
-    friend class FooTest;
-    FRIEND_TEST(FooTest, Bar);
-    FRIEND_TEST(FooTest, Baz);
-    ... definition of the class Foo ...
-  };
+    Your test code should be something like:
 
-  }  // namespace my_namespace
-  ```
+    ```c++
+    namespace my_namespace {
 
-  Your test code should be something like:
+    class FooTest : public testing::Test {
+     protected:
+      ...
+    };
 
-  ```c++
-  namespace my_namespace {
+    TEST_F(FooTest, Bar) { ... }
+    TEST_F(FooTest, Baz) { ... }
 
-  class FooTest : public testing::Test {
-   protected:
-    ...
-  };
-
-  TEST_F(FooTest, Bar) { ... }
-  TEST_F(FooTest, Baz) { ... }
-
-  }  // namespace my_namespace
-  ```
+    }  // namespace my_namespace
+    ```
 
 ## "Catching" Failures
 
-If you are building a testing utility on top of googletest, you'll want to test your utility. What framework would you
-use to test it? googletest, of course.
+If you are building a testing utility on top of GoogleTest, you'll want to test
+your utility. What framework would you use to test it? GoogleTest, of course.
 
-The challenge is to verify that your testing utility reports failures correctly. In frameworks that report a failure by
-throwing an exception, you could catch the exception and assert on it. But googletest doesn't use exceptions, so how do
+The challenge is to verify that your testing utility reports failures correctly.
+In frameworks that report a failure by throwing an exception, you could catch
+the exception and assert on it. But GoogleTest doesn't use exceptions, so how do
 we test that a piece of code generates an expected failure?
 
-`"gtest/gtest-spi.h"` contains some constructs to do this. After #including this header, you can use
+`"gtest/gtest-spi.h"` contains some constructs to do this.
+After #including this header, you can use
 
 ```c++
   EXPECT_FATAL_FAILURE(statement, substring);
 ```
 
-to assert that `statement` generates a fatal (e.g. `ASSERT_*`) failure in the current thread whose message contains the
-given `substring`, or use
+to assert that `statement` generates a fatal (e.g. `ASSERT_*`) failure in the
+current thread whose message contains the given `substring`, or use
 
 ```c++
   EXPECT_NONFATAL_FAILURE(statement, substring);
@@ -1355,34 +1564,39 @@ given `substring`, or use
 
 if you are expecting a non-fatal (e.g. `EXPECT_*`) failure.
 
-Only failures in the current thread are checked to determine the result of this type of expectations. If `statement`
-creates new threads, failures in these threads are also ignored. If you want to catch failures in other threads as well,
-use one of the following macros instead:
+Only failures in the current thread are checked to determine the result of this
+type of expectations. If `statement` creates new threads, failures in these
+threads are also ignored. If you want to catch failures in other threads as
+well, use one of the following macros instead:
 
 ```c++
   EXPECT_FATAL_FAILURE_ON_ALL_THREADS(statement, substring);
   EXPECT_NONFATAL_FAILURE_ON_ALL_THREADS(statement, substring);
 ```
 
-{: .callout .note} NOTE: Assertions from multiple threads are currently not supported on Windows.
+{: .callout .note}
+NOTE: Assertions from multiple threads are currently not supported on Windows.
 
 For technical reasons, there are some caveats:
 
-1. You cannot stream a failure message to either macro.
+1.  You cannot stream a failure message to either macro.
 
-2. `statement` in `EXPECT_FATAL_FAILURE{_ON_ALL_THREADS}()` cannot reference local non-static variables or non-static
-   members of `this` object.
+2.  `statement` in `EXPECT_FATAL_FAILURE{_ON_ALL_THREADS}()` cannot reference
+    local non-static variables or non-static members of `this` object.
 
-3. `statement` in `EXPECT_FATAL_FAILURE{_ON_ALL_THREADS}()` cannot return a value.
+3.  `statement` in `EXPECT_FATAL_FAILURE{_ON_ALL_THREADS}()` cannot return a
+    value.
 
 ## Registering tests programmatically
 
-The `TEST` macros handle the vast majority of all use cases, but there are few where runtime registration logic is
-required. For those cases, the framework provides the `::testing::RegisterTest` that allows callers to register
-arbitrary tests dynamically.
+The `TEST` macros handle the vast majority of all use cases, but there are few
+where runtime registration logic is required. For those cases, the framework
+provides the `::testing::RegisterTest` that allows callers to register arbitrary
+tests dynamically.
 
-This is an advanced API only to be used when the `TEST` macros are insufficient. The macros should be preferred when
-possible, as they avoid most of the complexity of calling this function.
+This is an advanced API only to be used when the `TEST` macros are insufficient.
+The macros should be preferred when possible, as they avoid most of the
+complexity of calling this function.
 
 It provides the following signature:
 
@@ -1393,15 +1607,18 @@ TestInfo* RegisterTest(const char* test_suite_name, const char* test_name,
                        const char* file, int line, Factory factory);
 ```
 
-The `factory` argument is a factory callable (move-constructible) object or function pointer that creates a new instance
-of the Test object. It handles ownership to the caller. The signature of the callable is `Fixture*()`, where
-`Fixture` is the test fixture class for the test. All tests registered with the same `test_suite_name` must return the
-same fixture type. This is checked at runtime.
+The `factory` argument is a factory callable (move-constructible) object or
+function pointer that creates a new instance of the Test object. It handles
+ownership to the caller. The signature of the callable is `Fixture*()`, where
+`Fixture` is the test fixture class for the test. All tests registered with the
+same `test_suite_name` must return the same fixture type. This is checked at
+runtime.
 
 The framework will infer the fixture class from the factory and will call the
 `SetUpTestSuite` and `TearDownTestSuite` for it.
 
-Must be called before `RUN_ALL_TESTS()` is invoked, otherwise behavior is undefined.
+Must be called before `RUN_ALL_TESTS()` is invoked, otherwise behavior is
+undefined.
 
 Use case example:
 
@@ -1436,6 +1653,7 @@ void RegisterMyTests(const std::vector<int>& values) {
 }
 ...
 int main(int argc, char** argv) {
+  testing::InitGoogleTest(&argc, argv);
   std::vector<int> values_to_test = LoadValuesFromConfig();
   RegisterMyTests(values_to_test);
   ...
@@ -1445,8 +1663,9 @@ int main(int argc, char** argv) {
 
 ## Getting the Current Test's Name
 
-Sometimes a function may need to know the name of the currently running test. For example, you may be using
-the `SetUp()` method of your test fixture to set the golden file name based on which test is running. The
+Sometimes a function may need to know the name of the currently running test.
+For example, you may be using the `SetUp()` method of your test fixture to set
+the golden file name based on which test is running. The
 [`TestInfo`](reference/testing.md#TestInfo) class has this information.
 
 To obtain a `TestInfo` object for the currently running test, call
@@ -1464,38 +1683,43 @@ singleton object:
          test_info->test_suite_name());
 ```
 
-`current_test_info()` returns a null pointer if no test is running. In particular, you cannot find the test suite name
-in `SetUpTestSuite()`,
-`TearDownTestSuite()` (where you know the test suite name implicitly), or functions called from them.
+`current_test_info()` returns a null pointer if no test is running. In
+particular, you cannot find the test suite name in `SetUpTestSuite()`,
+`TearDownTestSuite()` (where you know the test suite name implicitly), or
+functions called from them.
 
-## Extending googletest by Handling Test Events
+## Extending GoogleTest by Handling Test Events
 
-googletest provides an **event listener API** to let you receive notifications about the progress of a test program and
-test failures. The events you can listen to include the start and end of the test program, a test suite, or a test
-method, among others. You may use this API to augment or replace the standard console output, replace the XML output, or
-provide a completely different form of output, such as a GUI or a database. You can also use test events as checkpoints
-to implement a resource leak checker, for example.
+GoogleTest provides an **event listener API** to let you receive notifications
+about the progress of a test program and test failures. The events you can
+listen to include the start and end of the test program, a test suite, or a test
+method, among others. You may use this API to augment or replace the standard
+console output, replace the XML output, or provide a completely different form
+of output, such as a GUI or a database. You can also use test events as
+checkpoints to implement a resource leak checker, for example.
 
 ### Defining Event Listeners
 
 To define a event listener, you subclass either
 [`testing::TestEventListener`](reference/testing.md#TestEventListener) or
 [`testing::EmptyTestEventListener`](reference/testing.md#EmptyTestEventListener)
-The former is an (abstract) interface, where *each pure virtual method can be overridden to handle a test event* (For
-example, when a test starts, the
-`OnTestStart()` method will be called.). The latter provides an empty implementation of all methods in the interface,
-such that a subclass only needs to override the methods it cares about.
+The former is an (abstract) interface, where *each pure virtual method can be
+overridden to handle a test event* (For example, when a test starts, the
+`OnTestStart()` method will be called.). The latter provides an empty
+implementation of all methods in the interface, such that a subclass only needs
+to override the methods it cares about.
 
-When an event is fired, its context is passed to the handler function as an argument. The following argument types are
-used:
+When an event is fired, its context is passed to the handler function as an
+argument. The following argument types are used:
 
-* UnitTest reflects the state of the entire test program,
-* TestSuite has information about a test suite, which can contain one or more tests,
-* TestInfo contains the state of a test, and
-* TestPartResult represents the result of a test assertion.
+*   UnitTest reflects the state of the entire test program,
+*   TestSuite has information about a test suite, which can contain one or more
+    tests,
+*   TestInfo contains the state of a test, and
+*   TestPartResult represents the result of a test assertion.
 
-An event handler function can examine the argument it receives to find out interesting information about the event and
-the test program's state.
+An event handler function can examine the argument it receives to find out
+interesting information about the event and the test program's state.
 
 Here's an example:
 
@@ -1526,8 +1750,8 @@ Here's an example:
 
 ### Using Event Listeners
 
-To use the event listener you have defined, add an instance of it to the googletest event listener list (represented by
-class
+To use the event listener you have defined, add an instance of it to the
+GoogleTest event listener list (represented by class
 [`TestEventListeners`](reference/testing.md#TestEventListeners) - note the "s"
 at the end of the name) in your `main()` function, before calling
 `RUN_ALL_TESTS()`:
@@ -1538,15 +1762,16 @@ int main(int argc, char** argv) {
   // Gets hold of the event listener list.
   testing::TestEventListeners& listeners =
       testing::UnitTest::GetInstance()->listeners();
-  // Adds a listener to the end.  googletest takes the ownership.
+  // Adds a listener to the end.  GoogleTest takes the ownership.
   listeners.Append(new MinimalistPrinter);
   return RUN_ALL_TESTS();
 }
 ```
 
-There's only one problem: the default test result printer is still in effect, so its output will mingle with the output
-from your minimalist printer. To suppress the default printer, just release it from the event listener list and delete
-it. You can do so by adding one line:
+There's only one problem: the default test result printer is still in effect, so
+its output will mingle with the output from your minimalist printer. To suppress
+the default printer, just release it from the event listener list and delete it.
+You can do so by adding one line:
 
 ```c++
   ...
@@ -1555,51 +1780,59 @@ it. You can do so by adding one line:
   return RUN_ALL_TESTS();
 ```
 
-Now, sit back and enjoy a completely different output from your tests. For more details, see [sample9_unittest.cc].
+Now, sit back and enjoy a completely different output from your tests. For more
+details, see [sample9_unittest.cc].
 
-[sample9_unittest.cc]: https://github.com/google/googletest/blob/master/googletest/samples/sample9_unittest.cc "Event listener example"
+[sample9_unittest.cc]: https://github.com/google/googletest/blob/main/googletest/samples/sample9_unittest.cc "Event listener example"
 
 You may append more than one listener to the list. When an `On*Start()` or
-`OnTestPartResult()` event is fired, the listeners will receive it in the order they appear in the list (since new
-listeners are added to the end of the list, the default text printer and the default XML generator will receive the
-event first). An `On*End()` event will be received by the listeners in the *reverse*
-order. This allows output by listeners added later to be framed by output from listeners added earlier.
+`OnTestPartResult()` event is fired, the listeners will receive it in the order
+they appear in the list (since new listeners are added to the end of the list,
+the default text printer and the default XML generator will receive the event
+first). An `On*End()` event will be received by the listeners in the *reverse*
+order. This allows output by listeners added later to be framed by output from
+listeners added earlier.
 
 ### Generating Failures in Listeners
 
 You may use failure-raising macros (`EXPECT_*()`, `ASSERT_*()`, `FAIL()`, etc)
 when processing an event. There are some restrictions:
 
-1. You cannot generate any failure in `OnTestPartResult()` (otherwise it will cause `OnTestPartResult()` to be called
-   recursively).
-2. A listener that handles `OnTestPartResult()` is not allowed to generate any failure.
+1.  You cannot generate any failure in `OnTestPartResult()` (otherwise it will
+    cause `OnTestPartResult()` to be called recursively).
+2.  A listener that handles `OnTestPartResult()` is not allowed to generate any
+    failure.
 
-When you add listeners to the listener list, you should put listeners that handle `OnTestPartResult()` *before*
-listeners that can generate failures. This ensures that failures generated by the latter are attributed to the right
-test by the former.
+When you add listeners to the listener list, you should put listeners that
+handle `OnTestPartResult()` *before* listeners that can generate failures. This
+ensures that failures generated by the latter are attributed to the right test
+by the former.
 
 See [sample10_unittest.cc] for an example of a failure-raising listener.
 
-[sample10_unittest.cc]: https://github.com/google/googletest/blob/master/googletest/samples/sample10_unittest.cc "Failure-raising listener example"
+[sample10_unittest.cc]: https://github.com/google/googletest/blob/main/googletest/samples/sample10_unittest.cc "Failure-raising listener example"
 
 ## Running Test Programs: Advanced Options
 
-googletest test programs are ordinary executables. Once built, you can run them directly and affect their behavior via
-the following environment variables and/or command line flags. For the flags to work, your programs must call
+GoogleTest test programs are ordinary executables. Once built, you can run them
+directly and affect their behavior via the following environment variables
+and/or command line flags. For the flags to work, your programs must call
 `::testing::InitGoogleTest()` before calling `RUN_ALL_TESTS()`.
 
-To see a list of supported flags and their usage, please run your test program with the `--help` flag. You can also
-use `-h`, `-?`, or `/?` for short.
+To see a list of supported flags and their usage, please run your test program
+with the `--help` flag.
 
-If an option is specified both by an environment variable and by a flag, the latter takes precedence.
+If an option is specified both by an environment variable and by a flag, the
+latter takes precedence.
 
 ### Selecting Tests
 
 #### Listing Test Names
 
-Sometimes it is necessary to list the available tests in a program before running them so that a filter may be applied
-if needed. Including the flag
-`--gtest_list_tests` overrides all other flags and lists tests in the following format:
+Sometimes it is necessary to list the available tests in a program before
+running them so that a filter may be applied if needed. Including the flag
+`--gtest_list_tests` overrides all other flags and lists tests in the following
+format:
 
 ```none
 TestSuite1.
@@ -1609,54 +1842,64 @@ TestSuite2.
   TestName
 ```
 
-None of the tests listed are actually run if the flag is provided. There is no corresponding environment variable for
-this flag.
+None of the tests listed are actually run if the flag is provided. There is no
+corresponding environment variable for this flag.
 
 #### Running a Subset of the Tests
 
-By default, a googletest program runs all tests the user has defined. Sometimes, you want to run only a subset of the
-tests (e.g. for debugging or quickly verifying a change). If you set the `GTEST_FILTER` environment variable or the
-`--gtest_filter` flag to a filter string, googletest will only run the tests whose full names (in the form
-of `TestSuiteName.TestName`) match the filter.
+By default, a GoogleTest program runs all tests the user has defined. Sometimes,
+you want to run only a subset of the tests (e.g. for debugging or quickly
+verifying a change). If you set the `GTEST_FILTER` environment variable or the
+`--gtest_filter` flag to a filter string, GoogleTest will only run the tests
+whose full names (in the form of `TestSuiteName.TestName`) match the filter.
 
-The format of a filter is a '`:`'-separated list of wildcard patterns (called the *positive patterns*) optionally
-followed by a '`-`' and another
-'`:`'-separated pattern list (called the *negative patterns*). A test matches the filter if and only if it matches any
-of the positive patterns but does not match any of the negative patterns.
+The format of a filter is a '`:`'-separated list of wildcard patterns (called
+the *positive patterns*) optionally followed by a '`-`' and another
+'`:`'-separated pattern list (called the *negative patterns*). A test matches
+the filter if and only if it matches any of the positive patterns but does not
+match any of the negative patterns.
 
-A pattern may contain `'*'` (matches any string) or `'?'` (matches any single character). For convenience, the
-filter `'*-NegativePatterns'` can be also written as `'-NegativePatterns'`.
+A pattern may contain `'*'` (matches any string) or `'?'` (matches any single
+character). For convenience, the filter `'*-NegativePatterns'` can be also
+written as `'-NegativePatterns'`.
 
 For example:
 
-* `./foo_test` Has no flag, and thus runs all its tests.
-* `./foo_test --gtest_filter=*` Also runs everything, due to the single match-everything `*` value.
-* `./foo_test --gtest_filter=FooTest.*` Runs everything in test suite
-  `FooTest` .
-* `./foo_test --gtest_filter=*Null*:*Constructor*` Runs any test whose full name contains either `"Null"`
-  or `"Constructor"` .
-* `./foo_test --gtest_filter=-*DeathTest.*` Runs all non-death tests.
-* `./foo_test --gtest_filter=FooTest.*-FooTest.Bar` Runs everything in test suite `FooTest` except `FooTest.Bar`.
-* `./foo_test --gtest_filter=FooTest.*:BarTest.*-FooTest.Bar:BarTest.Foo` Runs everything in test suite `FooTest`
-  except `FooTest.Bar` and everything in test suite `BarTest` except `BarTest.Foo`.
+*   `./foo_test` Has no flag, and thus runs all its tests.
+*   `./foo_test --gtest_filter=*` Also runs everything, due to the single
+    match-everything `*` value.
+*   `./foo_test --gtest_filter=FooTest.*` Runs everything in test suite
+    `FooTest` .
+*   `./foo_test --gtest_filter=*Null*:*Constructor*` Runs any test whose full
+    name contains either `"Null"` or `"Constructor"` .
+*   `./foo_test --gtest_filter=-*DeathTest.*` Runs all non-death tests.
+*   `./foo_test --gtest_filter=FooTest.*-FooTest.Bar` Runs everything in test
+    suite `FooTest` except `FooTest.Bar`.
+*   `./foo_test --gtest_filter=FooTest.*:BarTest.*-FooTest.Bar:BarTest.Foo` Runs
+    everything in test suite `FooTest` except `FooTest.Bar` and everything in
+    test suite `BarTest` except `BarTest.Foo`.
 
 #### Stop test execution upon first failure
 
-By default, a googletest program runs all tests the user has defined. In some cases (e.g. iterative test development &
-execution) it may be desirable stop test execution upon first failure (trading improved latency for completeness).
-If `GTEST_FAIL_FAST` environment variable or `--gtest_fail_fast` flag is set, the test runner will stop execution as
-soon as the first test failure is found.
+By default, a GoogleTest program runs all tests the user has defined. In some
+cases (e.g. iterative test development & execution) it may be desirable stop
+test execution upon first failure (trading improved latency for completeness).
+If `GTEST_FAIL_FAST` environment variable or `--gtest_fail_fast` flag is set,
+the test runner will stop execution as soon as the first test failure is found.
 
 #### Temporarily Disabling Tests
 
 If you have a broken test that you cannot fix right away, you can add the
-`DISABLED_` prefix to its name. This will exclude it from execution. This is better than commenting out the code or
-using `#if 0`, as disabled tests are still compiled (and thus won't rot).
+`DISABLED_` prefix to its name. This will exclude it from execution. This is
+better than commenting out the code or using `#if 0`, as disabled tests are
+still compiled (and thus won't rot).
 
 If you need to disable all tests in a test suite, you can either add `DISABLED_`
-to the front of the name of each test, or alternatively add it to the front of the test suite name.
+to the front of the name of each test, or alternatively add it to the front of
+the test suite name.
 
-For example, the following tests won't be run by googletest, even though they will still be compiled:
+For example, the following tests won't be run by GoogleTest, even though they
+will still be compiled:
 
 ```c++
 // Tests that Foo does Abc.
@@ -1668,27 +1911,47 @@ class DISABLED_BarTest : public testing::Test { ... };
 TEST_F(DISABLED_BarTest, DoesXyz) { ... }
 ```
 
-{: .callout .note} NOTE: This feature should only be used for temporary pain-relief. You still have to fix the disabled
-tests at a later date. As a reminder, googletest will print a banner warning you if a test program contains any disabled
-tests.
+{: .callout .note}
+NOTE: This feature should only be used for temporary pain-relief. You still have
+to fix the disabled tests at a later date. As a reminder, GoogleTest will print
+a banner warning you if a test program contains any disabled tests.
 
-{: .callout .tip} TIP: You can easily count the number of disabled tests you have using
-`grep`. This number can be used as a metric for improving your test quality.
+{: .callout .tip}
+TIP: You can easily count the number of disabled tests you have using
+`grep`. This number can be used as a metric for
+improving your test quality.
 
 #### Temporarily Enabling Disabled Tests
 
-To include disabled tests in test execution, just invoke the test program with the `--gtest_also_run_disabled_tests`
-flag or set the
-`GTEST_ALSO_RUN_DISABLED_TESTS` environment variable to a value other than `0`. You can combine this with
-the `--gtest_filter` flag to further select which disabled tests to run.
+To include disabled tests in test execution, just invoke the test program with
+the `--gtest_also_run_disabled_tests` flag or set the
+`GTEST_ALSO_RUN_DISABLED_TESTS` environment variable to a value other than `0`.
+You can combine this with the `--gtest_filter` flag to further select which
+disabled tests to run.
+
+### Enforcing Having At Least One Test Case
+
+A not uncommon programmer mistake is to write a test program that has no test
+case linked in. This can happen, for example, when you put test case definitions
+in a library and the library is not marked as "always link".
+
+To catch such mistakes, run the test program with the
+`--gtest_fail_if_no_test_linked` flag or set the `GTEST_FAIL_IF_NO_TEST_LINKED`
+environment variable to a value other than `0`. Now the program will fail if no
+test case is linked in.
+
+Note that *any* test case linked in makes the program valid for the purpose of
+this check. In particular, even a disabled test case suffices.
 
 ### Repeating the Tests
 
-Once in a while you'll run into a test whose result is hit-or-miss. Perhaps it will fail only 1% of the time, making it
-rather hard to reproduce the bug under a debugger. This can be a major source of frustration.
+Once in a while you'll run into a test whose result is hit-or-miss. Perhaps it
+will fail only 1% of the time, making it rather hard to reproduce the bug under
+a debugger. This can be a major source of frustration.
 
-The `--gtest_repeat` flag allows you to repeat all (or selected) test methods in a program many times. Hopefully, a
-flaky test will eventually fail and give you a chance to debug. Here's how to use it:
+The `--gtest_repeat` flag allows you to repeat all (or selected) test methods in
+a program many times. Hopefully, a flaky test will eventually fail and give you
+a chance to debug. Here's how to use it:
 
 ```none
 $ foo_test --gtest_repeat=1000
@@ -1708,29 +1971,90 @@ Repeat the tests whose name matches the filter 1000 times.
 ```
 
 If your test program contains
-[global set-up/tear-down](#global-set-up-and-tear-down) code, it will be repeated in each iteration as well, as the
-flakiness may be in it. You can also specify the repeat count by setting the `GTEST_REPEAT` environment variable.
+[global set-up/tear-down](#global-set-up-and-tear-down) code, it will be
+repeated in each iteration as well, as the flakiness may be in it. To avoid
+repeating global set-up/tear-down, specify
+`--gtest_recreate_environments_when_repeating=false`{.nowrap}.
+
+You can also specify the repeat count by setting the `GTEST_REPEAT` environment
+variable.
 
 ### Shuffling the Tests
 
 You can specify the `--gtest_shuffle` flag (or set the `GTEST_SHUFFLE`
-environment variable to `1`) to run the tests in a program in a random order. This helps to reveal bad dependencies
-between tests.
+environment variable to `1`) to run the tests in a program in a random order.
+This helps to reveal bad dependencies between tests.
 
-By default, googletest uses a random seed calculated from the current time. Therefore you'll get a different order every
-time. The console output includes the random seed value, such that you can reproduce an order-related test failure
+By default, GoogleTest uses a random seed calculated from the current time.
+Therefore you'll get a different order every time. The console output includes
+the random seed value, such that you can reproduce an order-related test failure
 later. To specify the random seed explicitly, use the `--gtest_random_seed=SEED`
-flag (or set the `GTEST_RANDOM_SEED` environment variable), where `SEED` is an integer in the range [0, 99999]. The seed
-value 0 is special: it tells googletest to do the default behavior of calculating the seed from the current time.
-
-If you combine this with `--gtest_repeat=N`, googletest will pick a different random seed and re-shuffle the tests in
-each iteration.
+flag (or set the `GTEST_RANDOM_SEED` environment variable), where `SEED` is an
+integer in the range [0, 99999]. The seed value 0 is special: it tells
+GoogleTest to do the default behavior of calculating the seed from the current
+time.
+
+If you combine this with `--gtest_repeat=N`, GoogleTest will pick a different
+random seed and re-shuffle the tests in each iteration.
+
+### Distributing Test Functions to Multiple Machines
+
+If you have more than one machine you can use to run a test program, you might
+want to run the test functions in parallel and get the result faster. We call
+this technique *sharding*, where each machine is called a *shard*.
+
+GoogleTest is compatible with test sharding. To take advantage of this feature,
+your test runner (not part of GoogleTest) needs to do the following:
+
+1.  Allocate a number of machines (shards) to run the tests.
+1.  On each shard, set the `GTEST_TOTAL_SHARDS` environment variable to the total
+    number of shards. It must be the same for all shards.
+1.  On each shard, set the `GTEST_SHARD_INDEX` environment variable to the index
+    of the shard. Different shards must be assigned different indices, which
+    must be in the range `[0, GTEST_TOTAL_SHARDS - 1]`.
+1.  Run the same test program on all shards. When GoogleTest sees the above two
+    environment variables, it will select a subset of the test functions to run.
+    Across all shards, each test function in the program will be run exactly
+    once.
+1.  Wait for all shards to finish, then collect and report the results.
+
+Your project may have tests that were written without GoogleTest and thus don't
+understand this protocol. In order for your test runner to figure out which test
+supports sharding, it can set the environment variable `GTEST_SHARD_STATUS_FILE`
+to a non-existent file path. If a test program supports sharding, it will create
+this file to acknowledge that fact; otherwise it will not create it. The actual
+contents of the file are not important at this time, although we may put some
+useful information in it in the future.
+
+Here's an example to make it clear. Suppose you have a test program `foo_test`
+that contains the following 5 test functions:
+
+```
+TEST(A, V)
+TEST(A, W)
+TEST(B, X)
+TEST(B, Y)
+TEST(B, Z)
+```
+
+Suppose you have 3 machines at your disposal. To run the test functions in
+parallel, you would set `GTEST_TOTAL_SHARDS` to 3 on all machines, and set
+`GTEST_SHARD_INDEX` to 0, 1, and 2 on the machines respectively. Then you would
+run the same `foo_test` on each machine.
+
+GoogleTest reserves the right to change how the work is distributed across the
+shards, but here's one possible scenario:
+
+*   Machine #0 runs `A.V` and `B.X`.
+*   Machine #1 runs `A.W` and `B.Y`.
+*   Machine #2 runs `B.Z`.
 
 ### Controlling Test Output
 
 #### Colored Terminal Output
 
-googletest can use colors in its terminal output to make it easier to spot the important information:
+GoogleTest can use colors in its terminal output to make it easier to spot the
+important information:
 
 <pre>...
 <font color="green">[----------]</font> 1 test from FooTest
@@ -1753,47 +2077,54 @@ googletest can use colors in its terminal output to make it easier to spot the i
 </pre>
 
 You can set the `GTEST_COLOR` environment variable or the `--gtest_color`
-command line flag to `yes`, `no`, or `auto` (the default) to enable colors, disable colors, or let googletest decide.
-When the value is `auto`, googletest will use colors if and only if the output goes to a terminal and (on non-Windows
+command line flag to `yes`, `no`, or `auto` (the default) to enable colors,
+disable colors, or let GoogleTest decide. When the value is `auto`, GoogleTest
+will use colors if and only if the output goes to a terminal and (on non-Windows
 platforms) the `TERM` environment variable is set to `xterm` or `xterm-color`.
 
 #### Suppressing test passes
 
-By default, googletest prints 1 line of output for each test, indicating if it passed or failed. To show only test
-failures, run the test program with
+By default, GoogleTest prints 1 line of output for each test, indicating if it
+passed or failed. To show only test failures, run the test program with
 `--gtest_brief=1`, or set the GTEST_BRIEF environment variable to `1`.
 
 #### Suppressing the Elapsed Time
 
-By default, googletest prints the time it takes to run each test. To disable that, run the test program with
-the `--gtest_print_time=0` command line flag, or set the GTEST_PRINT_TIME environment variable to `0`.
+By default, GoogleTest prints the time it takes to run each test. To disable
+that, run the test program with the `--gtest_print_time=0` command line flag, or
+set the GTEST_PRINT_TIME environment variable to `0`.
 
 #### Suppressing UTF-8 Text Output
 
-In case of assertion failures, googletest prints expected and actual values of type `string` both as hex-encoded strings
-as well as in readable UTF-8 text if they contain valid non-ASCII UTF-8 characters. If you want to suppress the UTF-8
-text because, for example, you don't have an UTF-8 compatible output medium, run the test program
-with `--gtest_print_utf8=0` or set the `GTEST_PRINT_UTF8`
+In case of assertion failures, GoogleTest prints expected and actual values of
+type `string` both as hex-encoded strings as well as in readable UTF-8 text if
+they contain valid non-ASCII UTF-8 characters. If you want to suppress the UTF-8
+text because, for example, you don't have an UTF-8 compatible output medium, run
+the test program with `--gtest_print_utf8=0` or set the `GTEST_PRINT_UTF8`
 environment variable to `0`.
 
 #### Generating an XML Report
 
-googletest can emit a detailed XML report to a file in addition to its normal textual output. The report contains the
-duration of each test, and thus can help you identify slow tests.
+GoogleTest can emit a detailed XML report to a file in addition to its normal
+textual output. The report contains the duration of each test, and thus can help
+you identify slow tests.
 
 To generate the XML report, set the `GTEST_OUTPUT` environment variable or the
-`--gtest_output` flag to the string `"xml:path_to_output_file"`, which will create the file at the given location. You
-can also just use the string `"xml"`, in which case the output can be found in the `test_detail.xml` file in the current
-directory.
+`--gtest_output` flag to the string `"xml:path_to_output_file"`, which will
+create the file at the given location. You can also just use the string `"xml"`,
+in which case the output can be found in the `test_detail.xml` file in the
+current directory.
 
 If you specify a directory (for example, `"xml:output/directory/"` on Linux or
-`"xml:output\directory\"` on Windows), googletest will create the XML file in that directory, named after the test
-executable (e.g. `foo_test.xml` for test program `foo_test` or `foo_test.exe`). If the file already exists (perhaps left
-over from a previous run), googletest will pick a different name (e.g.
+`"xml:output\directory\"` on Windows), GoogleTest will create the XML file in
+that directory, named after the test executable (e.g. `foo_test.xml` for test
+program `foo_test` or `foo_test.exe`). If the file already exists (perhaps left
+over from a previous run), GoogleTest will pick a different name (e.g.
 `foo_test_1.xml`) to avoid overwriting it.
 
-The report is based on the `junitreport` Ant task. Since that format was originally intended for Java, a little
-interpretation is required to make it apply to googletest tests, as shown here:
+The report is based on the `junitreport` Ant task. Since that format was
+originally intended for Java, a little interpretation is required to make it
+apply to GoogleTest tests, as shown here:
 
 ```xml
 <testsuites name="AllTests" ...>
@@ -1807,9 +2138,9 @@ interpretation is required to make it apply to googletest tests, as shown here:
 </testsuites>
 ```
 
-* The root `<testsuites>` element corresponds to the entire test program.
-* `<testsuite>` elements correspond to googletest test suites.
-* `<testcase>` elements correspond to googletest test functions.
+*   The root `<testsuites>` element corresponds to the entire test program.
+*   `<testsuite>` elements correspond to GoogleTest test suites.
+*   `<testcase>` elements correspond to GoogleTest test functions.
 
 For instance, the following program
 
@@ -1825,15 +2156,15 @@ could generate this report:
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites tests="3" failures="1" errors="0" time="0.035" timestamp="2011-10-31T18:52:42" name="AllTests">
   <testsuite name="MathTest" tests="2" failures="1" errors="0" time="0.015">
-    <testcase name="Addition" status="run" time="0.007" classname="">
+    <testcase name="Addition" file="test.cpp" line="1" status="run" time="0.007" classname="">
       <failure message="Value of: add(1, 1)&#x0A;  Actual: 3&#x0A;Expected: 2" type="">...</failure>
       <failure message="Value of: add(1, -1)&#x0A;  Actual: 1&#x0A;Expected: 0" type="">...</failure>
     </testcase>
-    <testcase name="Subtraction" status="run" time="0.005" classname="">
+    <testcase name="Subtraction" file="test.cpp" line="2" status="run" time="0.005" classname="">
     </testcase>
   </testsuite>
   <testsuite name="LogicTest" tests="1" failures="0" errors="0" time="0.005">
-    <testcase name="NonContradiction" status="run" time="0.005" classname="">
+    <testcase name="NonContradiction" file="test.cpp" line="3" status="run" time="0.005" classname="">
     </testcase>
   </testsuite>
 </testsuites>
@@ -1841,29 +2172,36 @@ could generate this report:
 
 Things to note:
 
-* The `tests` attribute of a `<testsuites>` or `<testsuite>` element tells how many test functions the googletest
-  program or test suite contains, while the
-  `failures` attribute tells how many of them failed.
+*   The `tests` attribute of a `<testsuites>` or `<testsuite>` element tells how
+    many test functions the GoogleTest program or test suite contains, while the
+    `failures` attribute tells how many of them failed.
+
+*   The `time` attribute expresses the duration of the test, test suite, or
+    entire test program in seconds.
 
-* The `time` attribute expresses the duration of the test, test suite, or entire test program in seconds.
+*   The `timestamp` attribute records the local date and time of the test
+    execution.
 
-* The `timestamp` attribute records the local date and time of the test execution.
+*   The `file` and `line` attributes record the source file location, where the
+    test was defined.
 
-* Each `<failure>` element corresponds to a single failed googletest assertion.
+*   Each `<failure>` element corresponds to a single failed GoogleTest
+    assertion.
 
 #### Generating a JSON Report
 
-googletest can also emit a JSON report as an alternative format to XML. To generate the JSON report, set
-the `GTEST_OUTPUT` environment variable or the
-`--gtest_output` flag to the string `"json:path_to_output_file"`, which will create the file at the given location. You
-can also just use the string
-`"json"`, in which case the output can be found in the `test_detail.json` file in the current directory.
+GoogleTest can also emit a JSON report as an alternative format to XML. To
+generate the JSON report, set the `GTEST_OUTPUT` environment variable or the
+`--gtest_output` flag to the string `"json:path_to_output_file"`, which will
+create the file at the given location. You can also just use the string
+`"json"`, in which case the output can be found in the `test_detail.json` file
+in the current directory.
 
 The report format conforms to the following JSON Schema:
 
 ```json
 {
-  "$schema": "http://json-schema.org/schema#",
+  "$schema": "https://json-schema.org/schema#",
   "type": "object",
   "definitions": {
     "TestCase": {
@@ -1886,6 +2224,8 @@ The report format conforms to the following JSON Schema:
       "type": "object",
       "properties": {
         "name": { "type": "string" },
+        "file": { "type": "string" },
+        "line": { "type": "integer" },
         "status": {
           "type": "string",
           "enum": ["RUN", "NOTRUN"]
@@ -1963,6 +2303,8 @@ message TestCase {
 
 message TestInfo {
   string name = 1;
+  string file = 6;
+  int32 line = 7;
   enum Status {
     RUN = 0;
     NOTRUN = 1;
@@ -2006,6 +2348,8 @@ could generate this report:
       "testsuite": [
         {
           "name": "Addition",
+          "file": "test.cpp",
+          "line": 1,
           "status": "RUN",
           "time": "0.007s",
           "classname": "",
@@ -2022,6 +2366,8 @@ could generate this report:
         },
         {
           "name": "Subtraction",
+          "file": "test.cpp",
+          "line": 2,
           "status": "RUN",
           "time": "0.005s",
           "classname": ""
@@ -2037,6 +2383,8 @@ could generate this report:
       "testsuite": [
         {
           "name": "NonContradiction",
+          "file": "test.cpp",
+          "line": 3,
           "status": "RUN",
           "time": "0.005s",
           "classname": ""
@@ -2047,48 +2395,58 @@ could generate this report:
 }
 ```
 
-{: .callout .important} IMPORTANT: The exact format of the JSON document is subject to change.
+{: .callout .important}
+IMPORTANT: The exact format of the JSON document is subject to change.
 
 ### Controlling How Failures Are Reported
 
 #### Detecting Test Premature Exit
 
-Google Test implements the _premature-exit-file_ protocol for test runners to catch any kind of unexpected exits of test
-programs. Upon start, Google Test creates the file which will be automatically deleted after all work has been finished.
-Then, the test runner can check if this file exists. In case the file remains undeleted, the inspected test has exited
-prematurely.
+Google Test implements the *premature-exit-file* protocol for test runners to
+catch any kind of unexpected exits of test programs. Upon start, Google Test
+creates the file which will be automatically deleted after all work has been
+finished. Then, the test runner can check if this file exists. In case the file
+remains undeleted, the inspected test has exited prematurely.
 
-This feature is enabled only if the `TEST_PREMATURE_EXIT_FILE` environment variable has been set.
+This feature is enabled only if the `TEST_PREMATURE_EXIT_FILE` environment
+variable has been set.
 
 #### Turning Assertion Failures into Break-Points
 
-When running test programs under a debugger, it's very convenient if the debugger can catch an assertion failure and
-automatically drop into interactive mode. googletest's *break-on-failure* mode supports this behavior.
+When running test programs under a debugger, it's very convenient if the
+debugger can catch an assertion failure and automatically drop into interactive
+mode. GoogleTest's *break-on-failure* mode supports this behavior.
 
-To enable it, set the `GTEST_BREAK_ON_FAILURE` environment variable to a value other than `0`. Alternatively, you can
-use the `--gtest_break_on_failure`
+To enable it, set the `GTEST_BREAK_ON_FAILURE` environment variable to a value
+other than `0`. Alternatively, you can use the `--gtest_break_on_failure`
 command line flag.
 
 #### Disabling Catching Test-Thrown Exceptions
 
-googletest can be used either with or without exceptions enabled. If a test throws a C++ exception or (on Windows) a
-structured exception (SEH), by default googletest catches it, reports it as a test failure, and continues with the next
-test method. This maximizes the coverage of a test run. Also, on Windows an uncaught exception will cause a pop-up
-window, so catching the exceptions allows you to run the tests automatically.
+GoogleTest can be used either with or without exceptions enabled. If a test
+throws a C++ exception or (on Windows) a structured exception (SEH), by default
+GoogleTest catches it, reports it as a test failure, and continues with the next
+test method. This maximizes the coverage of a test run. Also, on Windows an
+uncaught exception will cause a pop-up window, so catching the exceptions allows
+you to run the tests automatically.
 
-When debugging the test failures, however, you may instead want the exceptions to be handled by the debugger, such that
-you can examine the call stack when an exception is thrown. To achieve that, set the `GTEST_CATCH_EXCEPTIONS`
-environment variable to `0`, or use the `--gtest_catch_exceptions=0` flag when running the tests.
+When debugging the test failures, however, you may instead want the exceptions
+to be handled by the debugger, such that you can examine the call stack when an
+exception is thrown. To achieve that, set the `GTEST_CATCH_EXCEPTIONS`
+environment variable to `0`, or use the `--gtest_catch_exceptions=0` flag when
+running the tests.
 
 ### Sanitizer Integration
 
 The
 [Undefined Behavior Sanitizer](https://clang.llvm.org/docs/UndefinedBehaviorSanitizer.html),
-[Address Sanitizer](https://github.com/google/sanitizers/wiki/AddressSanitizer), and
+[Address Sanitizer](https://github.com/google/sanitizers/wiki/AddressSanitizer),
+and
 [Thread Sanitizer](https://github.com/google/sanitizers/wiki/ThreadSanitizerCppManual)
-all provide weak functions that you can override to trigger explicit failures when they detect sanitizer errors, such as
-creating a reference from `nullptr`. To override these functions, place definitions for them in a source file that you
-compile as part of your main binary:
+all provide weak functions that you can override to trigger explicit failures
+when they detect sanitizer errors, such as creating a reference from `nullptr`.
+To override these functions, place definitions for them in a source file that
+you compile as part of your main binary:
 
 ```
 extern "C" {
@@ -2104,5 +2462,5 @@ void __tsan_on_report() {
 }  // extern "C"
 ```
 
-After compiling your project with one of the sanitizers enabled, if a particular test triggers a sanitizer error,
-googletest will report that it failed.
+After compiling your project with one of the sanitizers enabled, if a particular
+test triggers a sanitizer error, GoogleTest will report that it failed.
diff --git a/external/googletest/docs/community_created_documentation.md b/external/googletest/docs/community_created_documentation.md
index d986d4f5..4569075f 100644
--- a/external/googletest/docs/community_created_documentation.md
+++ b/external/googletest/docs/community_created_documentation.md
@@ -1,6 +1,7 @@
 # Community-Created Documentation
 
-The following is a list, in no particular order, of links to documentation created by the Googletest community.
+The following is a list, in no particular order, of links to documentation
+created by the Googletest community.
 
-* [Googlemock Insights](https://github.com/ElectricRCAircraftGuy/eRCaGuy_dotfiles/blob/master/googletest/insights.md),
-  by [ElectricRCAircraftGuy](https://github.com/ElectricRCAircraftGuy)
+*   [Googlemock Insights](https://github.com/ElectricRCAircraftGuy/eRCaGuy_dotfiles/blob/master/googletest/insights.md),
+    by [ElectricRCAircraftGuy](https://github.com/ElectricRCAircraftGuy)
diff --git a/external/googletest/docs/faq.md b/external/googletest/docs/faq.md
index 598c4d2d..4e958384 100644
--- a/external/googletest/docs/faq.md
+++ b/external/googletest/docs/faq.md
@@ -1,15 +1,18 @@
-# Googletest FAQ
+# GoogleTest FAQ
 
 ## Why should test suite names and test names not contain underscore?
 
-{: .callout .note} Note: Googletest reserves underscore (`_`) for special purpose keywords, such as
-[the `DISABLED_` prefix](advanced.md#temporarily-disabling-tests), in addition to the following rationale.
+{: .callout .note}
+Note: GoogleTest reserves underscore (`_`) for special-purpose keywords, such as
+[the `DISABLED_` prefix](advanced.md#temporarily-disabling-tests), in addition
+to the following rationale.
 
-Underscore (`_`) is special, as C++ reserves the following to be used by the compiler and the standard library:
+Underscore (`_`) is special, as C++ reserves the following to be used by the
+compiler and the standard library:
 
-1. any identifier that starts with an `_` followed by an upper-case letter, and
-2. any identifier that contains two consecutive underscores (i.e. `__`)
-   *anywhere* in its name.
+1.  any identifier that starts with an `_` followed by an upper-case letter, and
+2.  any identifier that contains two consecutive underscores (i.e. `__`)
+    *anywhere* in its name.
 
 User code is *prohibited* from using such identifiers.
 
@@ -19,20 +22,23 @@ Currently `TEST(TestSuiteName, TestName)` generates a class named
 `TestSuiteName_TestName_Test`. What happens if `TestSuiteName` or `TestName`
 contains `_`?
 
-1. If `TestSuiteName` starts with an `_` followed by an upper-case letter (say,
-   `_Foo`), we end up with `_Foo_TestName_Test`, which is reserved and thus invalid.
-2. If `TestSuiteName` ends with an `_` (say, `Foo_`), we get
-   `Foo__TestName_Test`, which is invalid.
-3. If `TestName` starts with an `_` (say, `_Bar`), we get
-   `TestSuiteName__Bar_Test`, which is invalid.
-4. If `TestName` ends with an `_` (say, `Bar_`), we get
-   `TestSuiteName_Bar__Test`, which is invalid.
+1.  If `TestSuiteName` starts with an `_` followed by an upper-case letter (say,
+    `_Foo`), we end up with `_Foo_TestName_Test`, which is reserved and thus
+    invalid.
+2.  If `TestSuiteName` ends with an `_` (say, `Foo_`), we get
+    `Foo__TestName_Test`, which is invalid.
+3.  If `TestName` starts with an `_` (say, `_Bar`), we get
+    `TestSuiteName__Bar_Test`, which is invalid.
+4.  If `TestName` ends with an `_` (say, `Bar_`), we get
+    `TestSuiteName_Bar__Test`, which is invalid.
 
 So clearly `TestSuiteName` and `TestName` cannot start or end with `_`
-(Actually, `TestSuiteName` can start with `_` -- as long as the `_` isn't followed by an upper-case letter. But that's
-getting complicated. So for simplicity we just say that it cannot start with `_`.).
+(Actually, `TestSuiteName` can start with `_`—as long as the `_` isn't followed
+by an upper-case letter. But that's getting complicated. So for simplicity we
+just say that it cannot start with `_`.).
 
-It may seem fine for `TestSuiteName` and `TestName` to contain `_` in the middle. However, consider this:
+It may seem fine for `TestSuiteName` and `TestName` to contain `_` in the
+middle. However, consider this:
 
 ```c++
 TEST(Time, Flies_Like_An_Arrow) { ... }
@@ -43,112 +49,115 @@ Now, the two `TEST`s will both generate the same class
 (`Time_Flies_Like_An_Arrow_Test`). That's not good.
 
 So for simplicity, we just ask the users to avoid `_` in `TestSuiteName` and
-`TestName`. The rule is more constraining than necessary, but it's simple and easy to remember. It also gives googletest
-some wiggle room in case its implementation needs to change in the future.
+`TestName`. The rule is more constraining than necessary, but it's simple and
+easy to remember. It also gives GoogleTest some wiggle room in case its
+implementation needs to change in the future.
 
-If you violate the rule, there may not be immediate consequences, but your test may (just may) break with a new
-compiler (or a new version of the compiler you are using) or with a new version of googletest. Therefore it's best to
-follow the rule.
+If you violate the rule, there may not be immediate consequences, but your test
+may (just may) break with a new compiler (or a new version of the compiler you
+are using) or with a new version of GoogleTest. Therefore it's best to follow
+the rule.
 
-## Why does googletest support `EXPECT_EQ(NULL, ptr)` and `ASSERT_EQ(NULL, ptr)` but not `EXPECT_NE(NULL, ptr)` and `ASSERT_NE(NULL, ptr)`?
+## Why does GoogleTest support `EXPECT_EQ(NULL, ptr)` and `ASSERT_EQ(NULL, ptr)` but not `EXPECT_NE(NULL, ptr)` and `ASSERT_NE(NULL, ptr)`?
 
 First of all, you can use `nullptr` with each of these macros, e.g.
 `EXPECT_EQ(ptr, nullptr)`, `EXPECT_NE(ptr, nullptr)`, `ASSERT_EQ(ptr, nullptr)`,
-`ASSERT_NE(ptr, nullptr)`. This is the preferred syntax in the style guide because `nullptr` does not have the type
-problems that `NULL` does.
+`ASSERT_NE(ptr, nullptr)`. This is the preferred syntax in the style guide
+because `nullptr` does not have the type problems that `NULL` does.
 
-Due to some peculiarity of C++, it requires some non-trivial template meta programming tricks to support using `NULL` as
-an argument of the `EXPECT_XX()`
+Due to some peculiarity of C++, it requires some non-trivial template meta
+programming tricks to support using `NULL` as an argument of the `EXPECT_XX()`
 and `ASSERT_XX()` macros. Therefore we only do it where it's most needed
-(otherwise we make the implementation of googletest harder to maintain and more error-prone than necessary).
-
-Historically, the `EXPECT_EQ()` macro took the *expected* value as its first argument and the *actual* value as the
-second, though this argument order is now discouraged. It was reasonable that someone wanted to
-write `EXPECT_EQ(NULL, some_expression)`, and this indeed was requested several times. Therefore we implemented it.
-
-The need for `EXPECT_NE(NULL, ptr)` wasn't nearly as strong. When the assertion fails, you already know that `ptr` must
-be `NULL`, so it doesn't add any information to print `ptr` in this case. That means `EXPECT_TRUE(ptr != NULL)`
+(otherwise we make the implementation of GoogleTest harder to maintain and more
+error-prone than necessary).
+
+Historically, the `EXPECT_EQ()` macro took the *expected* value as its first
+argument and the *actual* value as the second, though this argument order is now
+discouraged. It was reasonable that someone wanted
+to write `EXPECT_EQ(NULL, some_expression)`, and this indeed was requested
+several times. Therefore we implemented it.
+
+The need for `EXPECT_NE(NULL, ptr)` wasn't nearly as strong. When the assertion
+fails, you already know that `ptr` must be `NULL`, so it doesn't add any
+information to print `ptr` in this case. That means `EXPECT_TRUE(ptr != NULL)`
 works just as well.
 
-If we were to support `EXPECT_NE(NULL, ptr)`, for consistency we'd have to support `EXPECT_NE(ptr, NULL)` as well. This
-means using the template meta programming tricks twice in the implementation, making it even harder to understand and
-maintain. We believe the benefit doesn't justify the cost.
+If we were to support `EXPECT_NE(NULL, ptr)`, for consistency we'd have to
+support `EXPECT_NE(ptr, NULL)` as well. This means using the template meta
+programming tricks twice in the implementation, making it even harder to
+understand and maintain. We believe the benefit doesn't justify the cost.
 
-Finally, with the growth of the gMock matcher library, we are encouraging people to use the
-unified `EXPECT_THAT(value, matcher)` syntax more often in tests. One significant advantage of the matcher approach is
-that matchers can be easily combined to form new matchers, while the `EXPECT_NE`, etc, macros cannot be easily combined.
-Therefore we want to invest more in the matchers than in the
+Finally, with the growth of the gMock matcher library, we are encouraging people
+to use the unified `EXPECT_THAT(value, matcher)` syntax more often in tests. One
+significant advantage of the matcher approach is that matchers can be easily
+combined to form new matchers, while the `EXPECT_NE`, etc, macros cannot be
+easily combined. Therefore we want to invest more in the matchers than in the
 `EXPECT_XX()` macros.
 
 ## I need to test that different implementations of an interface satisfy some common requirements. Should I use typed tests or value-parameterized tests?
 
-For testing various implementations of the same interface, either typed tests or value-parameterized tests can get it
-done. It's really up to you the user to decide which is more convenient for you, depending on your particular case. Some
+For testing various implementations of the same interface, either typed tests or
+value-parameterized tests can get it done. It's really up to you the user to
+decide which is more convenient for you, depending on your particular case. Some
 rough guidelines:
 
-* Typed tests can be easier to write if instances of the different implementations can be created the same way, modulo
-  the type. For example, if all these implementations have a public default constructor (such that you can
-  write `new TypeParam`), or if their factory functions have the same form (e.g. `CreateInstance<TypeParam>()`).
-* Value-parameterized tests can be easier to write if you need different code patterns to create different
-  implementations' instances, e.g. `new Foo` vs
-  `new Bar(5)`. To accommodate for the differences, you can write factory function wrappers and pass these function
-  pointers to the tests as their parameters.
-* When a typed test fails, the default output includes the name of the type, which can help you quickly identify which
-  implementation is wrong. Value-parameterized tests only show the number of the failed iteration by default. You will
-  need to define a function that returns the iteration name and pass it as the third parameter to
-  INSTANTIATE_TEST_SUITE_P to have more useful output.
-* When using typed tests, you need to make sure you are testing against the interface type, not the concrete types (in
-  other words, you want to make sure `implicit_cast<MyInterface*>(my_concrete_impl)` works, not just that
-  `my_concrete_impl` works). It's less likely to make mistakes in this area when using value-parameterized tests.
-
-I hope I didn't confuse you more. :-) If you don't mind, I'd suggest you to give both approaches a try. Practice is a
-much better way to grasp the subtle differences between the two tools. Once you have some concrete experience, you can
-much more easily decide which one to use the next time.
-
-## I got some run-time errors about invalid proto descriptors when using `ProtocolMessageEquals`. Help!
-
-{: .callout .note}
-**Note:** `ProtocolMessageEquals` and `ProtocolMessageEquiv` are *deprecated*
-now. Please use `EqualsProto`, etc instead.
-
-`ProtocolMessageEquals` and `ProtocolMessageEquiv` were redefined recently and are now less tolerant of invalid protocol
-buffer definitions. In particular, if you have a `foo.proto` that doesn't fully qualify the type of a protocol message
-it references (e.g. `message<Bar>` where it should be `message<blah.Bar>`), you will now get run-time errors like:
-
-```
-... descriptor.cc:...] Invalid proto descriptor for file "path/to/foo.proto":
-... descriptor.cc:...]  blah.MyMessage.my_field: ".Bar" is not defined.
-```
-
-If you see this, your `.proto` file is broken and needs to be fixed by making the types fully qualified. The new
-definition of `ProtocolMessageEquals` and
-`ProtocolMessageEquiv` just happen to reveal your bug.
+*   Typed tests can be easier to write if instances of the different
+    implementations can be created the same way, modulo the type. For example,
+    if all these implementations have a public default constructor (such that
+    you can write `new TypeParam`), or if their factory functions have the same
+    form (e.g. `CreateInstance<TypeParam>()`).
+*   Value-parameterized tests can be easier to write if you need different code
+    patterns to create different implementations' instances, e.g. `new Foo` vs
+    `new Bar(5)`. To accommodate for the differences, you can write factory
+    function wrappers and pass these function pointers to the tests as their
+    parameters.
+*   When a typed test fails, the default output includes the name of the type,
+    which can help you quickly identify which implementation is wrong.
+    Value-parameterized tests only show the number of the failed iteration by
+    default. You will need to define a function that returns the iteration name
+    and pass it as the third parameter to INSTANTIATE_TEST_SUITE_P to have more
+    useful output.
+*   When using typed tests, you need to make sure you are testing against the
+    interface type, not the concrete types (in other words, you want to make
+    sure `implicit_cast<MyInterface*>(my_concrete_impl)` works, not just that
+    `my_concrete_impl` works). It's less likely to make mistakes in this area
+    when using value-parameterized tests.
+
+I hope I didn't confuse you more. :-) If you don't mind, I'd suggest you to give
+both approaches a try. Practice is a much better way to grasp the subtle
+differences between the two tools. Once you have some concrete experience, you
+can much more easily decide which one to use the next time.
 
 ## My death test modifies some state, but the change seems lost after the death test finishes. Why?
 
-Death tests (`EXPECT_DEATH`, etc) are executed in a sub-process s.t. the expected crash won't kill the test program (
-i.e. the parent process). As a result, any in-memory side effects they incur are observable in their respective
-sub-processes, but not in the parent process. You can think of them as running in a parallel universe, more or less.
+Death tests (`EXPECT_DEATH`, etc.) are executed in a sub-process s.t. the
+expected crash won't kill the test program (i.e. the parent process). As a
+result, any in-memory side effects they incur are observable in their respective
+sub-processes, but not in the parent process. You can think of them as running
+in a parallel universe, more or less.
 
-In particular, if you use mocking and the death test statement invokes some mock methods, the parent process will think
-the calls have never occurred. Therefore, you may want to move your `EXPECT_CALL` statements inside the `EXPECT_DEATH`
+In particular, if you use mocking and the death test statement invokes some mock
+methods, the parent process will think the calls have never occurred. Therefore,
+you may want to move your `EXPECT_CALL` statements inside the `EXPECT_DEATH`
 macro.
 
-## EXPECT_EQ(htonl(blah), blah_blah) generates weird compiler errors in opt mode. Is this a googletest bug?
+## EXPECT_EQ(htonl(blah), blah_blah) generates weird compiler errors in opt mode. Is this a GoogleTest bug?
 
 Actually, the bug is in `htonl()`.
 
-According to `'man htonl'`, `htonl()` is a *function*, which means it's valid to use `htonl` as a function pointer.
-However, in opt mode `htonl()` is defined as a *macro*, which breaks this usage.
+According to `'man htonl'`, `htonl()` is a *function*, which means it's valid to
+use `htonl` as a function pointer. However, in opt mode `htonl()` is defined as
+a *macro*, which breaks this usage.
 
 Worse, the macro definition of `htonl()` uses a `gcc` extension and is *not*
-standard C++. That hacky implementation has some ad hoc limitations. In particular, it prevents you from
-writing `Foo<sizeof(htonl(x))>()`, where `Foo`
+standard C++. That hacky implementation has some ad hoc limitations. In
+particular, it prevents you from writing `Foo<sizeof(htonl(x))>()`, where `Foo`
 is a template that has an integral argument.
 
-The implementation of `EXPECT_EQ(a, b)` uses `sizeof(... a ...)` inside a template argument, and thus doesn't compile in
-opt mode when `a` contains a call to `htonl()`. It is difficult to make `EXPECT_EQ` bypass the `htonl()` bug, as the
-solution must work with different compilers on various platforms.
+The implementation of `EXPECT_EQ(a, b)` uses `sizeof(... a ...)` inside a
+template argument, and thus doesn't compile in opt mode when `a` contains a call
+to `htonl()`. It is difficult to make `EXPECT_EQ` bypass the `htonl()` bug, as
+the solution must work with different compilers on various platforms.
 
 ## The compiler complains about "undefined references" to some static const member variables, but I did define them in the class body. What's wrong?
 
@@ -162,19 +171,20 @@ class Foo {
 };
 ```
 
-You also need to define it *outside* of the class body in `foo.cc`:
+you also need to define it *outside* of the class body in `foo.cc`:
 
 ```c++
 const int Foo::kBar;  // No initializer here.
 ```
 
-Otherwise your code is **invalid C++**, and may break in unexpected ways. In particular, using it in googletest
-comparison assertions (`EXPECT_EQ`, etc) will generate an "undefined reference" linker error. The fact that "it used to
-work"
-doesn't mean it's valid. It just means that you were lucky. :-)
+Otherwise your code is **invalid C++**, and may break in unexpected ways. In
+particular, using it in GoogleTest comparison assertions (`EXPECT_EQ`, etc.)
+will generate an "undefined reference" linker error. The fact that "it used to
+work" doesn't mean it's valid. It just means that you were lucky. :-)
 
-If the declaration of the static data member is `constexpr` then it is implicitly an `inline` definition, and a separate
-definition in `foo.cc` is not needed:
+If the declaration of the static data member is `constexpr` then it is
+implicitly an `inline` definition, and a separate definition in `foo.cc` is not
+needed:
 
 ```c++
 // foo.h
@@ -188,14 +198,16 @@ class Foo {
 
 Yes.
 
-Each test fixture has a corresponding and same named test suite. This means only one test suite can use a particular
-fixture. Sometimes, however, multiple test cases may want to use the same or slightly different fixtures. For example,
-you may want to make sure that all of a GUI library's test suites don't leak important system resources like fonts and
-brushes.
+Each test fixture has a corresponding and same named test suite. This means only
+one test suite can use a particular fixture. Sometimes, however, multiple test
+cases may want to use the same or slightly different fixtures. For example, you
+may want to make sure that all of a GUI library's test suites don't leak
+important system resources like fonts and brushes.
 
-In googletest, you share a fixture among test suites by putting the shared logic in a base test fixture, then deriving
-from that base a separate fixture for each test suite that wants to use this common logic. You then use `TEST_F()` to
-write tests using each derived fixture.
+In GoogleTest, you share a fixture among test suites by putting the shared logic
+in a base test fixture, then deriving from that base a separate fixture for each
+test suite that wants to use this common logic. You then use `TEST_F()` to write
+tests using each derived fixture.
 
 Typically, your code looks like this:
 
@@ -230,85 +242,104 @@ TEST_F(FooTest, Baz) { ... }
 ... additional fixtures derived from BaseTest ...
 ```
 
-If necessary, you can continue to derive test fixtures from a derived fixture. googletest has no limit on how deep the
-hierarchy can be.
+If necessary, you can continue to derive test fixtures from a derived fixture.
+GoogleTest has no limit on how deep the hierarchy can be.
 
 For a complete example using derived test fixtures, see
-[sample5_unittest.cc](https://github.com/google/googletest/blob/master/googletest/samples/sample5_unittest.cc).
+[sample5_unittest.cc](https://github.com/google/googletest/blob/main/googletest/samples/sample5_unittest.cc).
 
 ## My compiler complains "void value not ignored as it ought to be." What does this mean?
 
 You're probably using an `ASSERT_*()` in a function that doesn't return `void`.
-`ASSERT_*()` can only be used in `void` functions, due to exceptions being disabled by our build system. Please see more
-details
+`ASSERT_*()` can only be used in `void` functions, due to exceptions being
+disabled by our build system. Please see more details
 [here](advanced.md#assertion-placement).
 
 ## My death test hangs (or seg-faults). How do I fix it?
 
-In googletest, death tests are run in a child process and the way they work is delicate. To write death tests you really
-need to understand how they work—see the details at [Death Assertions](reference/assertions.md#death) in the Assertions
-Reference.
+In GoogleTest, death tests are run in a child process and the way they work is
+delicate. To write death tests you really need to understand how they work—see
+the details at [Death Assertions](reference/assertions.md#death) in the
+Assertions Reference.
 
-In particular, death tests don't like having multiple threads in the parent process. So the first thing you can try is
-to eliminate creating threads outside of `EXPECT_DEATH()`. For example, you may want to use mocks or fake objects
+In particular, death tests don't like having multiple threads in the parent
+process. So the first thing you can try is to eliminate creating threads outside
+of `EXPECT_DEATH()`. For example, you may want to use mocks or fake objects
 instead of real ones in your tests.
 
-Sometimes this is impossible as some library you must use may be creating threads before `main()` is even reached. In
-this case, you can try to minimize the chance of conflicts by either moving as many activities as possible inside
-`EXPECT_DEATH()` (in the extreme case, you want to move everything inside), or leaving as few things as possible in it.
-Also, you can try to set the death test style to `"threadsafe"`, which is safer but slower, and see if it helps.
+Sometimes this is impossible as some library you must use may be creating
+threads before `main()` is even reached. In this case, you can try to minimize
+the chance of conflicts by either moving as many activities as possible inside
+`EXPECT_DEATH()` (in the extreme case, you want to move everything inside), or
+leaving as few things as possible in it. Also, you can try to set the death test
+style to `"threadsafe"`, which is safer but slower, and see if it helps.
 
-If you go with thread-safe death tests, remember that they rerun the test program from the beginning in the child
-process. Therefore make sure your program can run side-by-side with itself and is deterministic.
+If you go with thread-safe death tests, remember that they rerun the test
+program from the beginning in the child process. Therefore make sure your
+program can run side-by-side with itself and is deterministic.
 
-In the end, this boils down to good concurrent programming. You have to make sure that there are no race conditions or
-deadlocks in your program. No silver bullet - sorry!
+In the end, this boils down to good concurrent programming. You have to make
+sure that there are no race conditions or deadlocks in your program. No silver
+bullet - sorry!
 
 ## Should I use the constructor/destructor of the test fixture or SetUp()/TearDown()? {#CtorVsSetUp}
 
-The first thing to remember is that googletest does **not** reuse the same test fixture object across multiple tests.
-For each `TEST_F`, googletest will create a **fresh** test fixture object, immediately call `SetUp()`, run the test
-body, call `TearDown()`, and then delete the test fixture object.
-
-When you need to write per-test set-up and tear-down logic, you have the choice between using the test fixture
-constructor/destructor or `SetUp()/TearDown()`. The former is usually preferred, as it has the following benefits:
-
-* By initializing a member variable in the constructor, we have the option to make it `const`, which helps prevent
-  accidental changes to its value and makes the tests more obviously correct.
-* In case we need to subclass the test fixture class, the subclass' constructor is guaranteed to call the base class'
-  constructor *first*, and the subclass' destructor is guaranteed to call the base class' destructor
-  *afterward*. With `SetUp()/TearDown()`, a subclass may make the mistake of forgetting to call the base
-  class' `SetUp()/TearDown()` or call them at the wrong time.
+The first thing to remember is that GoogleTest does **not** reuse the same test
+fixture object across multiple tests. For each `TEST_F`, GoogleTest will create
+a **fresh** test fixture object, immediately call `SetUp()`, run the test body,
+call `TearDown()`, and then delete the test fixture object.
+
+When you need to write per-test set-up and tear-down logic, you have the choice
+between using the test fixture constructor/destructor or `SetUp()`/`TearDown()`.
+The former is usually preferred, as it has the following benefits:
+
+*   By initializing a member variable in the constructor, we have the option to
+    make it `const`, which helps prevent accidental changes to its value and
+    makes the tests more obviously correct.
+*   In case we need to subclass the test fixture class, the subclass'
+    constructor is guaranteed to call the base class' constructor *first*, and
+    the subclass' destructor is guaranteed to call the base class' destructor
+    *afterward*. With `SetUp()/TearDown()`, a subclass may make the mistake of
+    forgetting to call the base class' `SetUp()/TearDown()` or call them at the
+    wrong time.
 
 You may still want to use `SetUp()/TearDown()` in the following cases:
 
-* C++ does not allow virtual function calls in constructors and destructors. You can call a method declared as virtual,
-  but it will not use dynamic dispatch, it will use the definition from the class the constructor of which is currently
-  executing. This is because calling a virtual method before the derived class constructor has a chance to run is very
-  dangerous - the virtual method might operate on uninitialized data. Therefore, if you need to call a method that will
-  be overridden in a derived class, you have to use
-  `SetUp()/TearDown()`.
-* In the body of a constructor (or destructor), it's not possible to use the
-  `ASSERT_xx` macros. Therefore, if the set-up operation could cause a fatal test failure that should prevent the test
-  from running, it's necessary to use `abort` and abort the whole test executable, or to use `SetUp()` instead of a
-  constructor.
-* If the tear-down operation could throw an exception, you must use
-  `TearDown()` as opposed to the destructor, as throwing in a destructor leads to undefined behavior and usually will
-  kill your program right away. Note that many standard libraries (like STL) may throw when exceptions are enabled in
-  the compiler. Therefore you should prefer `TearDown()` if you want to write portable tests that work with or without
-  exceptions.
-* The googletest team is considering making the assertion macros throw on platforms where exceptions are enabled (e.g.
-  Windows, Mac OS, and Linux client-side), which will eliminate the need for the user to propagate failures from a
-  subroutine to its caller. Therefore, you shouldn't use googletest assertions in a destructor if your code could run on
-  such a platform.
-
-## The compiler complains "no matching function to call" when I use ASSERT_PRED*. How do I fix it?
-
-See details for [`EXPECT_PRED*`](reference/assertions.md#EXPECT_PRED) in the Assertions Reference.
+*   C++ does not allow virtual function calls in constructors and destructors.
+    You can call a method declared as virtual, but it will not use dynamic
+    dispatch. It will use the definition from the class the constructor of which
+    is currently executing. This is because calling a virtual method before the
+    derived class constructor has a chance to run is very dangerous - the
+    virtual method might operate on uninitialized data. Therefore, if you need
+    to call a method that will be overridden in a derived class, you have to use
+    `SetUp()/TearDown()`.
+*   In the body of a constructor (or destructor), it's not possible to use the
+    `ASSERT_xx` macros. Therefore, if the set-up operation could cause a fatal
+    test failure that should prevent the test from running, it's necessary to
+    use `abort` and abort the whole test
+    executable, or to use `SetUp()` instead of a constructor.
+*   If the tear-down operation could throw an exception, you must use
+    `TearDown()` as opposed to the destructor, as throwing in a destructor leads
+    to undefined behavior and usually will kill your program right away. Note
+    that many standard libraries (like STL) may throw when exceptions are
+    enabled in the compiler. Therefore you should prefer `TearDown()` if you
+    want to write portable tests that work with or without exceptions.
+*   The GoogleTest team is considering making the assertion macros throw on
+    platforms where exceptions are enabled (e.g. Windows, Mac OS, and Linux
+    client-side), which will eliminate the need for the user to propagate
+    failures from a subroutine to its caller. Therefore, you shouldn't use
+    GoogleTest assertions in a destructor if your code could run on such a
+    platform.
+
+## The compiler complains "no matching function to call" when I use `ASSERT_PRED*`. How do I fix it?
+
+See details for [`EXPECT_PRED*`](reference/assertions.md#EXPECT_PRED) in the
+Assertions Reference.
 
 ## My compiler complains about "ignoring return value" when I call RUN_ALL_TESTS(). Why?
 
-Some people had been ignoring the return value of `RUN_ALL_TESTS()`. That is, instead of
+Some people had been ignoring the return value of `RUN_ALL_TESTS()`. That is,
+instead of
 
 ```c++
   return RUN_ALL_TESTS();
@@ -320,41 +351,45 @@ they write
   RUN_ALL_TESTS();
 ```
 
-This is **wrong and dangerous**. The testing services needs to see the return value of `RUN_ALL_TESTS()` in order to
-determine if a test has passed. If your
-`main()` function ignores it, your test will be considered successful even if it has a googletest assertion failure.
-Very bad.
+This is **wrong and dangerous**. The testing services needs to see the return
+value of `RUN_ALL_TESTS()` in order to determine if a test has passed. If your
+`main()` function ignores it, your test will be considered successful even if it
+has a GoogleTest assertion failure. Very bad.
 
-We have decided to fix this (thanks to Michael Chastain for the idea). Now, your code will no longer be able to
-ignore `RUN_ALL_TESTS()` when compiled with
+We have decided to fix this (thanks to Michael Chastain for the idea). Now, your
+code will no longer be able to ignore `RUN_ALL_TESTS()` when compiled with
 `gcc`. If you do so, you'll get a compiler error.
 
 If you see the compiler complaining about you ignoring the return value of
-`RUN_ALL_TESTS()`, the fix is simple: just make sure its value is used as the return value of `main()`.
+`RUN_ALL_TESTS()`, the fix is simple: just make sure its value is used as the
+return value of `main()`.
 
-But how could we introduce a change that breaks existing tests? Well, in this case, the code was already broken in the
-first place, so we didn't break it. :-)
+But how could we introduce a change that breaks existing tests? Well, in this
+case, the code was already broken in the first place, so we didn't break it. :-)
 
 ## My compiler complains that a constructor (or destructor) cannot return a value. What's going on?
 
-Due to a peculiarity of C++, in order to support the syntax for streaming messages to an `ASSERT_*`, e.g.
+Due to a peculiarity of C++, in order to support the syntax for streaming
+messages to an `ASSERT_*`, e.g.
 
 ```c++
   ASSERT_EQ(1, Foo()) << "blah blah" << foo;
 ```
 
 we had to give up using `ASSERT*` and `FAIL*` (but not `EXPECT*` and
-`ADD_FAILURE*`) in constructors and destructors. The workaround is to move the content of your constructor/destructor to
-a private void member function, or switch to `EXPECT_*()` if that works. This
+`ADD_FAILURE*`) in constructors and destructors. The workaround is to move the
+content of your constructor/destructor to a private void member function, or
+switch to `EXPECT_*()` if that works. This
 [section](advanced.md#assertion-placement) in the user's guide explains it.
 
 ## My SetUp() function is not called. Why?
 
 C++ is case-sensitive. Did you spell it as `Setup()`?
 
-Similarly, sometimes people spell `SetUpTestSuite()` as `SetupTestSuite()` and wonder why it's never called.
+Similarly, sometimes people spell `SetUpTestSuite()` as `SetupTestSuite()` and
+wonder why it's never called.
 
-## I have several test suites which share the same test fixture logic, do I have to define a new test fixture class for each of them? This seems pretty tedious.
+## I have several test suites which share the same test fixture logic; do I have to define a new test fixture class for each of them? This seems pretty tedious.
 
 You don't have to. Instead of
 
@@ -384,13 +419,16 @@ TEST_F(BarTest, Abc) { ... }
 TEST_F(BarTest, Def) { ... }
 ```
 
-## googletest output is buried in a whole bunch of LOG messages. What do I do?
+## GoogleTest output is buried in a whole bunch of LOG messages. What do I do?
 
-The googletest output is meant to be a concise and human-friendly report. If your test generates textual output itself,
-it will mix with the googletest output, making it hard to read. However, there is an easy solution to this problem.
+The GoogleTest output is meant to be a concise and human-friendly report. If
+your test generates textual output itself, it will mix with the GoogleTest
+output, making it hard to read. However, there is an easy solution to this
+problem.
 
-Since `LOG` messages go to stderr, we decided to let googletest output go to stdout. This way, you can easily separate
-the two using redirection. For example:
+Since `LOG` messages go to stderr, we decided to let GoogleTest output go to
+stdout. This way, you can easily separate the two using redirection. For
+example:
 
 ```shell
 $ ./my_test > gtest_output.txt
@@ -400,22 +438,26 @@ $ ./my_test > gtest_output.txt
 
 There are several good reasons:
 
-1. It's likely your test needs to change the states of its global variables. This makes it difficult to keep side
-   effects from escaping one test and contaminating others, making debugging difficult. By using fixtures, each test has
-   a fresh set of variables that's different (but with the same names). Thus, tests are kept independent of each other.
-2. Global variables pollute the global namespace.
-3. Test fixtures can be reused via subclassing, which cannot be done easily with global variables. This is useful if
-   many test suites have something in common.
+1.  It's likely your test needs to change the states of its global variables.
+    This makes it difficult to keep side effects from escaping one test and
+    contaminating others, making debugging difficult. By using fixtures, each
+    test has a fresh set of variables that's different (but with the same
+    names). Thus, tests are kept independent of each other.
+2.  Global variables pollute the global namespace.
+3.  Test fixtures can be reused via subclassing, which cannot be done easily
+    with global variables. This is useful if many test suites have something in
+    common.
 
 ## What can the statement argument in ASSERT_DEATH() be?
 
-`ASSERT_DEATH(statement, matcher)` (or any death assertion macro) can be used wherever *`statement`* is valid. So
-basically *`statement`* can be any C++ statement that makes sense in the current context. In particular, it can
+`ASSERT_DEATH(statement, matcher)` (or any death assertion macro) can be used
+wherever *`statement`* is valid. So basically *`statement`* can be any C++
+statement that makes sense in the current context. In particular, it can
 reference global and/or local variables, and can be:
 
-* a simple function call (often the case),
-* a complex expression, or
-* a compound statement.
+*   a simple function call (often the case),
+*   a complex expression, or
+*   a compound statement.
 
 Some examples are shown here:
 
@@ -457,34 +499,29 @@ TEST(MyDeathTest, CompoundStatement) {
 
 ## I have a fixture class `FooTest`, but `TEST_F(FooTest, Bar)` gives me error ``"no matching function for call to `FooTest::FooTest()'"``. Why?
 
-Googletest needs to be able to create objects of your test fixture class, so it must have a default constructor.
-Normally the compiler will define one for you. However, there are cases where you have to define your own:
-
-* If you explicitly declare a non-default constructor for class `FooTest`
-  (`DISALLOW_EVIL_CONSTRUCTORS()` does this), then you need to define a default constructor, even if it would be empty.
-* If `FooTest` has a const non-static data member, then you have to define the default constructor *and* initialize the
-  const member in the initializer list of the constructor. (Early versions of `gcc` doesn't force you to initialize the
-  const member. It's a bug that has been fixed in `gcc 4`.)
-
-## Why does ASSERT_DEATH complain about previous threads that were already joined?
-
-With the Linux pthread library, there is no turning back once you cross the line from a single thread to multiple
-threads. The first time you create a thread, a manager thread is created in addition, so you get 3, not 2, threads.
-Later when the thread you create joins the main thread, the thread count decrements by 1, but the manager thread will
-never be killed, so you still have 2 threads, which means you cannot safely run a death test.
+GoogleTest needs to be able to create objects of your test fixture class, so it
+must have a default constructor. Normally the compiler will define one for you.
+However, there are cases where you have to define your own:
 
-The new NPTL thread library doesn't suffer from this problem, as it doesn't create a manager thread. However, if you
-don't control which machine your test runs on, you shouldn't depend on this.
+*   If you explicitly declare a non-default constructor for class `FooTest`
+    (`DISALLOW_EVIL_CONSTRUCTORS()` does this), then you need to define a
+    default constructor, even if it would be empty.
+*   If `FooTest` has a const non-static data member, then you have to define the
+    default constructor *and* initialize the const member in the initializer
+    list of the constructor. (Early versions of `gcc` doesn't force you to
+    initialize the const member. It's a bug that has been fixed in `gcc 4`.)
 
-## Why does googletest require the entire test suite, instead of individual tests, to be named *DeathTest when it uses ASSERT_DEATH?
+## Why does GoogleTest require the entire test suite, instead of individual tests, to be named `*DeathTest` when it uses `ASSERT_DEATH`?
 
-googletest does not interleave tests from different test suites. That is, it runs all tests in one test suite first, and
-then runs all tests in the next test suite, and so on. googletest does this because it needs to set up a test suite
-before the first test in it is run, and tear it down afterwards. Splitting up the test case would require multiple
-set-up and tear-down processes, which is inefficient and makes the semantics unclean.
+GoogleTest does not interleave tests from different test suites. That is, it
+runs all tests in one test suite first, and then runs all tests in the next test
+suite, and so on. GoogleTest does this because it needs to set up a test suite
+before the first test in it is run, and tear it down afterwards. Splitting up
+the test case would require multiple set-up and tear-down processes, which is
+inefficient and makes the semantics unclean.
 
-If we were to determine the order of tests based on test name instead of test case name, then we would have a problem
-with the following situation:
+If we were to determine the order of tests based on test name instead of test
+case name, then we would have a problem with the following situation:
 
 ```c++
 TEST_F(FooTest, AbcDeathTest) { ... }
@@ -494,15 +531,16 @@ TEST_F(BarTest, DefDeathTest) { ... }
 TEST_F(BarTest, Xyz) { ... }
 ```
 
-Since `FooTest.AbcDeathTest` needs to run before `BarTest.Xyz`, and we don't interleave tests from different test
-suites, we need to run all tests in the
-`FooTest` case before running any test in the `BarTest` case. This contradicts with the requirement to
-run `BarTest.DefDeathTest` before `FooTest.Uvw`.
+Since `FooTest.AbcDeathTest` needs to run before `BarTest.Xyz`, and we don't
+interleave tests from different test suites, we need to run all tests in the
+`FooTest` case before running any test in the `BarTest` case. This contradicts
+with the requirement to run `BarTest.DefDeathTest` before `FooTest.Uvw`.
 
-## But I don't like calling my entire test suite \*DeathTest when it contains both death tests and non-death tests. What do I do?
+## But I don't like calling my entire test suite `*DeathTest` when it contains both death tests and non-death tests. What do I do?
 
 You don't have to, but if you like, you may split up the test suite into
-`FooTest` and `FooDeathTest`, where the names make it clear that they are related:
+`FooTest` and `FooDeathTest`, where the names make it clear that they are
+related:
 
 ```c++
 class FooTest : public ::testing::Test { ... };
@@ -516,66 +554,74 @@ TEST_F(FooDeathTest, Uvw) { ... EXPECT_DEATH(...) ... }
 TEST_F(FooDeathTest, Xyz) { ... ASSERT_DEATH(...) ... }
 ```
 
-## googletest prints the LOG messages in a death test's child process only when the test fails. How can I see the LOG messages when the death test succeeds?
+## GoogleTest prints the LOG messages in a death test's child process only when the test fails. How can I see the LOG messages when the death test succeeds?
 
 Printing the LOG messages generated by the statement inside `EXPECT_DEATH()`
-makes it harder to search for real problems in the parent's log. Therefore, googletest only prints them when the death
-test has failed.
+makes it harder to search for real problems in the parent's log. Therefore,
+GoogleTest only prints them when the death test has failed.
 
-If you really need to see such LOG messages, a workaround is to temporarily break the death test (e.g. by changing the
-regex pattern it is expected to match). Admittedly, this is a hack. We'll consider a more permanent solution after the
-fork-and-exec-style death tests are implemented.
+If you really need to see such LOG messages, a workaround is to temporarily
+break the death test (e.g. by changing the regex pattern it is expected to
+match). Admittedly, this is a hack. We'll consider a more permanent solution
+after the fork-and-exec-style death tests are implemented.
 
 ## The compiler complains about `no match for 'operator<<'` when I use an assertion. What gives?
 
-If you use a user-defined type `FooType` in an assertion, you must make sure there is
-an `std::ostream& operator<<(std::ostream&, const FooType&)` function defined such that we can print a value
-of `FooType`.
+If you use a user-defined type `FooType` in an assertion, you must make sure
+there is an `std::ostream& operator<<(std::ostream&, const FooType&)` function
+defined such that we can print a value of `FooType`.
 
-In addition, if `FooType` is declared in a name space, the `<<` operator also needs to be defined in the *same* name
-space. See
-[Tip of the Week #49](http://abseil.io/tips/49) for details.
+In addition, if `FooType` is declared in a name space, the `<<` operator also
+needs to be defined in the *same* name space. See
+[Tip of the Week #49](https://abseil.io/tips/49) for details.
 
 ## How do I suppress the memory leak messages on Windows?
 
-Since the statically initialized googletest singleton requires allocations on the heap, the Visual C++ memory leak
-detector will report memory leaks at the end of the program run. The easiest way to avoid this is to use the
-`_CrtMemCheckpoint` and `_CrtMemDumpAllObjectsSince` calls to not report any statically initialized heap objects. See
-MSDN for more details and additional heap check/debug routines.
+Since the statically initialized GoogleTest singleton requires allocations on
+the heap, the Visual C++ memory leak detector will report memory leaks at the
+end of the program run. The easiest way to avoid this is to use the
+`_CrtMemCheckpoint` and `_CrtMemDumpAllObjectsSince` calls to not report any
+statically initialized heap objects. See MSDN for more details and additional
+heap check/debug routines.
 
 ## How can my code detect if it is running in a test?
 
-If you write code that sniffs whether it's running in a test and does different things accordingly, you are leaking
-test-only logic into production code and there is no easy way to ensure that the test-only code paths aren't run by
+If you write code that sniffs whether it's running in a test and does different
+things accordingly, you are leaking test-only logic into production code and
+there is no easy way to ensure that the test-only code paths aren't run by
 mistake in production. Such cleverness also leads to
-[Heisenbugs](https://en.wikipedia.org/wiki/Heisenbug). Therefore we strongly advise against the practice, and googletest
-doesn't provide a way to do it.
+[Heisenbugs](https://en.wikipedia.org/wiki/Heisenbug). Therefore we strongly
+advise against the practice, and GoogleTest doesn't provide a way to do it.
 
-In general, the recommended way to cause the code to behave differently under test
-is [Dependency Injection](http://en.wikipedia.org/wiki/Dependency_injection). You can inject different functionality
-from the test and from the production code. Since your production code doesn't link in the for-test logic at all (the
-[`testonly`](http://docs.bazel.build/versions/master/be/common-definitions.html#common.testonly) attribute for BUILD
-targets helps to ensure that), there is no danger in accidentally running it.
+In general, the recommended way to cause the code to behave differently under
+test is [Dependency Injection](https://en.wikipedia.org/wiki/Dependency_injection). You can inject
+different functionality from the test and from the production code. Since your
+production code doesn't link in the for-test logic at all (the
+[`testonly`](https://docs.bazel.build/versions/master/be/common-definitions.html#common.testonly) attribute for BUILD targets helps to ensure
+that), there is no danger in accidentally running it.
 
-However, if you *really*, *really*, *really* have no choice, and if you follow the rule of ending your test program
-names with `_test`, you can use the
-*horrible* hack of sniffing your executable name (`argv[0]` in `main()`) to know whether the code is under test.
+However, if you *really*, *really*, *really* have no choice, and if you follow
+the rule of ending your test program names with `_test`, you can use the
+*horrible* hack of sniffing your executable name (`argv[0]` in `main()`) to know
+whether the code is under test.
 
 ## How do I temporarily disable a test?
 
 If you have a broken test that you cannot fix right away, you can add the
-`DISABLED_` prefix to its name. This will exclude it from execution. This is better than commenting out the code or
-using `#if 0`, as disabled tests are still compiled (and thus won't rot).
+`DISABLED_` prefix to its name. This will exclude it from execution. This is
+better than commenting out the code or using `#if 0`, as disabled tests are
+still compiled (and thus won't rot).
 
-To include disabled tests in test execution, just invoke the test program with the `--gtest_also_run_disabled_tests`
-flag.
+To include disabled tests in test execution, just invoke the test program with
+the `--gtest_also_run_disabled_tests` flag.
 
 ## Is it OK if I have two separate `TEST(Foo, Bar)` test methods defined in different namespaces?
 
 Yes.
 
-The rule is **all test methods in the same test suite must use the same fixture class.** This means that the following
-is **allowed** because both tests use the same fixture class (`::testing::Test`).
+The rule is **all test methods in the same test suite must use the same fixture
+class**. This means that the following is **allowed** because both tests use the
+same fixture class (`::testing::Test`).
 
 ```c++
 namespace foo {
@@ -591,8 +637,9 @@ TEST(CoolTest, DoSomething) {
 }  // namespace bar
 ```
 
-However, the following code is **not allowed** and will produce a runtime error from googletest because the test methods
-are using different test fixture classes with the same test suite name.
+However, the following code is **not allowed** and will produce a runtime error
+from GoogleTest because the test methods are using different test fixture
+classes with the same test suite name.
 
 ```c++
 namespace foo {
diff --git a/external/googletest/docs/gmock_cheat_sheet.md b/external/googletest/docs/gmock_cheat_sheet.md
index e19704b1..ddafaaa2 100644
--- a/external/googletest/docs/gmock_cheat_sheet.md
+++ b/external/googletest/docs/gmock_cheat_sheet.md
@@ -8,7 +8,7 @@ Given
 
 ```cpp
 class Foo {
-  ...
+ public:
   virtual ~Foo();
   virtual int GetSize() const = 0;
   virtual string Describe(const char* name) = 0;
@@ -20,10 +20,10 @@ class Foo {
 (note that `~Foo()` **must** be virtual) we can define its mock as
 
 ```cpp
-#include "gmock/gmock.h"
+#include <gmock/gmock.h>
 
 class MockFoo : public Foo {
-  ...
+ public:
   MOCK_METHOD(int, GetSize, (), (const, override));
   MOCK_METHOD(string, Describe, (const char* name), (override));
   MOCK_METHOD(string, Describe, (int type), (override));
@@ -31,8 +31,9 @@ class MockFoo : public Foo {
 };
 ```
 
-To create a "nice" mock, which ignores all uninteresting calls, a "naggy" mock, which warns on all uninteresting calls,
-or a "strict" mock, which treats them as failures:
+To create a "nice" mock, which ignores all uninteresting calls, a "naggy" mock,
+which warns on all uninteresting calls, or a "strict" mock, which treats them as
+failures:
 
 ```cpp
 using ::testing::NiceMock;
@@ -45,7 +46,8 @@ StrictMock<MockFoo> strict_foo;  // The type is a subclass of MockFoo.
 ```
 
 {: .callout .note}
-**Note:** A mock object is currently naggy by default. We may make it nice by default in the future.
+**Note:** A mock object is currently naggy by default. We may make it nice by
+default in the future.
 
 ### Mocking a Class Template {#MockTemplate}
 
@@ -56,7 +58,7 @@ To mock
 ```cpp
 template <typename Elem>
 class StackInterface {
-  ...
+ public:
   virtual ~StackInterface();
   virtual int GetSize() const = 0;
   virtual void Push(const Elem& x) = 0;
@@ -69,7 +71,7 @@ class StackInterface {
 ```cpp
 template <typename Elem>
 class MockStack : public StackInterface<Elem> {
-  ...
+ public:
   MOCK_METHOD(int, GetSize, (), (const, override));
   MOCK_METHOD(void, Push, (const Elem& x), (override));
 };
@@ -77,8 +79,9 @@ class MockStack : public StackInterface<Elem> {
 
 ### Specifying Calling Conventions for Mock Functions
 
-If your mock function doesn't use the default calling convention, you can specify it by adding `Calltype(convention)`
-to `MOCK_METHOD`'s 4th parameter. For example,
+If your mock function doesn't use the default calling convention, you can
+specify it by adding `Calltype(convention)` to `MOCK_METHOD`'s 4th parameter.
+For example,
 
 ```cpp
   MOCK_METHOD(bool, Foo, (int n), (Calltype(STDMETHODCALLTYPE)));
@@ -92,13 +95,16 @@ where `STDMETHODCALLTYPE` is defined by `<objbase.h>` on Windows.
 
 The typical work flow is:
 
-1. Import the gMock names you need to use. All gMock symbols are in the
-   `testing` namespace unless they are macros or otherwise noted.
-2. Create the mock objects.
-3. Optionally, set the default actions of the mock objects.
-4. Set your expectations on the mock objects (How will they be called? What will they do?).
-5. Exercise code that uses the mock objects; if necessary, check the result using googletest assertions.
-6. When a mock object is destructed, gMock automatically verifies that all expectations on it have been satisfied.
+1.  Import the gMock names you need to use. All gMock symbols are in the
+    `testing` namespace unless they are macros or otherwise noted.
+2.  Create the mock objects.
+3.  Optionally, set the default actions of the mock objects.
+4.  Set your expectations on the mock objects (How will they be called? What
+    will they do?).
+5.  Exercise code that uses the mock objects; if necessary, check the result
+    using googletest assertions.
+6.  When a mock object is destructed, gMock automatically verifies that all
+    expectations on it have been satisfied.
 
 Here's an example:
 
@@ -124,8 +130,8 @@ TEST(BarTest, DoesThis) {
 ## Setting Default Actions {#OnCall}
 
 gMock has a **built-in default action** for any function that returns `void`,
-`bool`, a numeric value, or a pointer. In C++11, it will additionally returns the default-constructed value, if one
-exists for the given type.
+`bool`, a numeric value, or a pointer. In C++11, it will additionally returns
+the default-constructed value, if one exists for the given type.
 
 To customize the default action for functions with return type `T`, use
 [`DefaultValue<T>`](reference/mocking.md#DefaultValue). For example:
@@ -134,7 +140,7 @@ To customize the default action for functions with return type `T`, use
   // Sets the default action for return type std::unique_ptr<Buzz> to
   // creating a new Buzz every time.
   DefaultValue<std::unique_ptr<Buzz>>::SetFactory(
-      [] { return MakeUnique<Buzz>(AccessLevel::kInternal); });
+      [] { return std::make_unique<Buzz>(AccessLevel::kInternal); });
 
   // When this fires, the default action of MakeBuzz() will run, which
   // will return a new Buzz object.
@@ -151,10 +157,12 @@ To customize the default action for functions with return type `T`, use
   DefaultValue<std::unique_ptr<Buzz>>::Clear();
 ```
 
-To customize the default action for a particular method of a specific mock object,
-use [`ON_CALL`](reference/mocking.md#ON_CALL). `ON_CALL` has a similar syntax to `EXPECT_CALL`, but it is used for
-setting default behaviors when you do not require that the mock method is called. See
-[Knowing When to Expect](gmock_cook_book.md#UseOnCall) for a more detailed discussion.
+To customize the default action for a particular method of a specific mock
+object, use [`ON_CALL`](reference/mocking.md#ON_CALL). `ON_CALL` has a similar
+syntax to `EXPECT_CALL`, but it is used for setting default behaviors when you
+do not require that the mock method is called. See
+[Knowing When to Expect](gmock_cook_book.md#UseOnCall) for a more detailed
+discussion.
 
 ## Setting Expectations {#ExpectCall}
 
@@ -175,15 +183,16 @@ See the [`Times` clause](reference/mocking.md#EXPECT_CALL.Times) of
 
 ## Expectation Order
 
-By default, expectations can be matched in *any* order. If some or all expectations must be matched in a given order,
-you can use the
+By default, expectations can be matched in *any* order. If some or all
+expectations must be matched in a given order, you can use the
 [`After` clause](reference/mocking.md#EXPECT_CALL.After) or
 [`InSequence` clause](reference/mocking.md#EXPECT_CALL.InSequence) of
 `EXPECT_CALL`, or use an [`InSequence` object](reference/mocking.md#InSequence).
 
 ## Verifying and Resetting a Mock
 
-gMock will verify the expectations on a mock object when it is destructed, or you can do it earlier:
+gMock will verify the expectations on a mock object when it is destructed, or
+you can do it earlier:
 
 ```cpp
 using ::testing::Mock;
@@ -198,11 +207,13 @@ Mock::VerifyAndClearExpectations(&mock_obj);
 Mock::VerifyAndClear(&mock_obj);
 ```
 
-Do not set new expectations after verifying and clearing a mock after its use. Setting expectations after code that
-exercises the mock has undefined behavior. See [Using Mocks in Tests](gmock_for_dummies.md#using-mocks-in-tests) for
-more information.
+Do not set new expectations after verifying and clearing a mock after its use.
+Setting expectations after code that exercises the mock has undefined behavior.
+See [Using Mocks in Tests](gmock_for_dummies.md#using-mocks-in-tests) for more
+information.
 
-You can also tell gMock that a mock object can be leaked and doesn't need to be verified:
+You can also tell gMock that a mock object can be leaked and doesn't need to be
+verified:
 
 ```cpp
 Mock::AllowLeak(&mock_obj);
@@ -219,7 +230,8 @@ class MockFunction<R(A1, ..., An)> {
 };
 ```
 
-See this [recipe](gmock_cook_book.md#using-check-points) for one application of it.
+See this [recipe](gmock_cook_book.md#UsingCheckPoints) for one application of
+it.
 
 ## Flags
 
diff --git a/external/googletest/docs/gmock_cook_book.md b/external/googletest/docs/gmock_cook_book.md
index 22a3d19d..9e59b4cf 100644
--- a/external/googletest/docs/gmock_cook_book.md
+++ b/external/googletest/docs/gmock_cook_book.md
@@ -1,17 +1,19 @@
 # gMock Cookbook
 
 You can find recipes for using gMock here. If you haven't yet, please read
-[the dummy guide](gmock_for_dummies.md) first to make sure you understand the basics.
+[the dummy guide](gmock_for_dummies.md) first to make sure you understand the
+basics.
 
 {: .callout .note}
-**Note:** gMock lives in the `testing` name space. For readability, it is recommended to write `using ::testing::Foo;`
-once in your file before using the name `Foo` defined by gMock. We omit such `using` statements in this section for
+**Note:** gMock lives in the `testing` name space. For readability, it is
+recommended to write `using ::testing::Foo;` once in your file before using the
+name `Foo` defined by gMock. We omit such `using` statements in this section for
 brevity, but you should do it in your own code.
 
 ## Creating Mock Classes
 
-Mock classes are defined as normal classes, using the `MOCK_METHOD` macro to generate mocked methods. The macro gets 3
-or 4 parameters:
+Mock classes are defined as normal classes, using the `MOCK_METHOD` macro to
+generate mocked methods. The macro gets 3 or 4 parameters:
 
 ```cpp
 class MyMock {
@@ -21,17 +23,21 @@ class MyMock {
 };
 ```
 
-The first 3 parameters are simply the method declaration, split into 3 parts. The 4th parameter accepts a closed list of
-qualifiers, which affect the generated method:
+The first 3 parameters are simply the method declaration, split into 3 parts.
+The 4th parameter accepts a closed list of qualifiers, which affect the
+generated method:
 
-* **`const`** - Makes the mocked method a `const` method. Required if overriding a `const` method.
-* **`override`** - Marks the method with `override`. Recommended if overriding a `virtual` method.
-* **`noexcept`** - Marks the method with `noexcept`. Required if overriding a
-  `noexcept` method.
-* **`Calltype(...)`** - Sets the call type for the method (e.g. to
-  `STDMETHODCALLTYPE`), useful in Windows.
-* **`ref(...)`** - Marks the method with the reference qualification specified. Required if overriding a method that has
-  reference qualifications. Eg `ref(&)` or `ref(&&)`.
+*   **`const`** - Makes the mocked method a `const` method. Required if
+    overriding a `const` method.
+*   **`override`** - Marks the method with `override`. Recommended if overriding
+    a `virtual` method.
+*   **`noexcept`** - Marks the method with `noexcept`. Required if overriding a
+    `noexcept` method.
+*   **`Calltype(...)`** - Sets the call type for the method (e.g. to
+    `STDMETHODCALLTYPE`), useful in Windows.
+*   **`ref(...)`** - Marks the method with the reference qualification
+    specified. Required if overriding a method that has reference
+    qualifications. Eg `ref(&)` or `ref(&&)`.
 
 ### Dealing with unprotected commas
 
@@ -39,7 +45,6 @@ Unprotected commas, i.e. commas which are not surrounded by parentheses, prevent
 `MOCK_METHOD` from parsing its arguments correctly:
 
 {: .bad}
-
 ```cpp
 class MockFoo {
  public:
@@ -51,7 +56,6 @@ class MockFoo {
 Solution 1 - wrap with parentheses:
 
 {: .good}
-
 ```cpp
 class MockFoo {
  public:
@@ -60,13 +64,12 @@ class MockFoo {
 };
 ```
 
-Note that wrapping a return or argument type with parentheses is, in general, invalid C++. `MOCK_METHOD` removes the
-parentheses.
+Note that wrapping a return or argument type with parentheses is, in general,
+invalid C++. `MOCK_METHOD` removes the parentheses.
 
 Solution 2 - define an alias:
 
 {: .good}
-
 ```cpp
 class MockFoo {
  public:
@@ -83,7 +86,8 @@ You must always put a mock method definition (`MOCK_METHOD`) in a `public:`
 section of the mock class, regardless of the method being mocked being `public`,
 `protected`, or `private` in the base class. This allows `ON_CALL` and
 `EXPECT_CALL` to reference the mock function from outside of the mock class.
-(Yes, C++ allows a subclass to change the access level of a virtual function in the base class.) Example:
+(Yes, C++ allows a subclass to change the access level of a virtual function in
+the base class.) Example:
 
 ```cpp
 class Foo {
@@ -141,8 +145,9 @@ class MockFoo : public Foo {
 ```
 
 {: .callout .note}
-**Note:** if you don't mock all versions of the overloaded method, the compiler will give you a warning about some
-methods in the base class being hidden. To fix that, use `using` to bring them in scope:
+**Note:** if you don't mock all versions of the overloaded method, the compiler
+will give you a warning about some methods in the base class being hidden. To
+fix that, use `using` to bring them in scope:
 
 ```cpp
 class MockFoo : public Foo {
@@ -172,7 +177,7 @@ class StackInterface {
 template <typename Elem>
 class MockStack : public StackInterface<Elem> {
   ...
-  MOCK_METHOD(int, GetSize, (), (override));
+  MOCK_METHOD(int, GetSize, (), (const, override));
   MOCK_METHOD(void, Push, (const Elem& x), (override));
 };
 ```
@@ -181,8 +186,9 @@ class MockStack : public StackInterface<Elem> {
 
 gMock can mock non-virtual functions to be used in Hi-perf dependency injection.
 
-In this case, instead of sharing a common base class with the real class, your mock class will be *unrelated* to the
-real class, but contain methods with the same signatures. The syntax for mocking non-virtual methods is the *same* as
+In this case, instead of sharing a common base class with the real class, your
+mock class will be *unrelated* to the real class, but contain methods with the
+same signatures. The syntax for mocking non-virtual methods is the *same* as
 mocking virtual methods (just don't add `override`):
 
 ```cpp
@@ -205,17 +211,19 @@ class MockPacketStream {
 };
 ```
 
-Note that the mock class doesn't define `AppendPacket()`, unlike the real class. That's fine as long as the test doesn't
-need to call it.
+Note that the mock class doesn't define `AppendPacket()`, unlike the real class.
+That's fine as long as the test doesn't need to call it.
 
-Next, you need a way to say that you want to use `ConcretePacketStream` in production code, and use `MockPacketStream`
-in tests. Since the functions are not virtual and the two classes are unrelated, you must specify your choice at
+Next, you need a way to say that you want to use `ConcretePacketStream` in
+production code, and use `MockPacketStream` in tests. Since the functions are
+not virtual and the two classes are unrelated, you must specify your choice at
 *compile time* (as opposed to run time).
 
-One way to do it is to templatize your code that needs to use a packet stream. More specifically, you will give your
-code a template type argument for the type of the packet stream. In production, you will instantiate your template with
-`ConcretePacketStream` as the type argument. In tests, you will instantiate the same template with `MockPacketStream`.
-For example, you may write:
+One way to do it is to templatize your code that needs to use a packet stream.
+More specifically, you will give your code a template type argument for the type
+of the packet stream. In production, you will instantiate your template with
+`ConcretePacketStream` as the type argument. In tests, you will instantiate the
+same template with `MockPacketStream`. For example, you may write:
 
 ```cpp
 template <class PacketStream>
@@ -230,7 +238,8 @@ class PacketReader {
 
 Then you can use `CreateConnection<ConcretePacketStream>()` and
 `PacketReader<ConcretePacketStream>` in production code, and use
-`CreateConnection<MockPacketStream>()` and `PacketReader<MockPacketStream>` in tests.
+`CreateConnection<MockPacketStream>()` and `PacketReader<MockPacketStream>` in
+tests.
 
 ```cpp
   MockPacketStream mock_stream;
@@ -242,12 +251,12 @@ Then you can use `CreateConnection<ConcretePacketStream>()` and
 
 ### Mocking Free Functions
 
-It is not possible to directly mock a free function (i.e. a C-style function or a static method). If you need to, you
-can rewrite your code to use an interface
+It is not possible to directly mock a free function (i.e. a C-style function or
+a static method). If you need to, you can rewrite your code to use an interface
 (abstract class).
 
-Instead of calling a free function (say, `OpenFile`) directly, introduce an interface for it and have a concrete
-subclass that calls the free function:
+Instead of calling a free function (say, `OpenFile`) directly, introduce an
+interface for it and have a concrete subclass that calls the free function:
 
 ```cpp
 class FileInterface {
@@ -265,30 +274,38 @@ class File : public FileInterface {
 };
 ```
 
-Your code should talk to `FileInterface` to open a file. Now it's easy to mock out the function.
+Your code should talk to `FileInterface` to open a file. Now it's easy to mock
+out the function.
 
-This may seem like a lot of hassle, but in practice you often have multiple related functions that you can put in the
-same interface, so the per-function syntactic overhead will be much lower.
+This may seem like a lot of hassle, but in practice you often have multiple
+related functions that you can put in the same interface, so the per-function
+syntactic overhead will be much lower.
 
-If you are concerned about the performance overhead incurred by virtual functions, and profiling confirms your concern,
-you can combine this with the recipe for [mocking non-virtual methods](#MockingNonVirtualMethods).
+If you are concerned about the performance overhead incurred by virtual
+functions, and profiling confirms your concern, you can combine this with the
+recipe for [mocking non-virtual methods](#MockingNonVirtualMethods).
+
+Alternatively, instead of introducing a new interface, you can rewrite your code
+to accept a std::function instead of the free function, and then use
+[MockFunction](#MockFunction) to mock the std::function.
 
 ### Old-Style `MOCK_METHODn` Macros
 
 Before the generic `MOCK_METHOD` macro
-[was introduced in 2018](https://github.com/google/googletest/commit/c5f08bf91944ce1b19bcf414fa1760e69d20afc2), mocks
-where created using a family of macros collectively called `MOCK_METHODn`. These macros are still supported, though
-migration to the new `MOCK_METHOD` is recommended.
+[was introduced in 2018](https://github.com/google/googletest/commit/c5f08bf91944ce1b19bcf414fa1760e69d20afc2),
+mocks where created using a family of macros collectively called `MOCK_METHODn`.
+These macros are still supported, though migration to the new `MOCK_METHOD` is
+recommended.
 
 The macros in the `MOCK_METHODn` family differ from `MOCK_METHOD`:
 
-* The general structure is `MOCK_METHODn(MethodName, ReturnType(Args))`, instead
-  of `MOCK_METHOD(ReturnType, MethodName, (Args))`.
-* The number `n` must equal the number of arguments.
-* When mocking a const method, one must use `MOCK_CONST_METHODn`.
-* When mocking a class template, the macro name must be suffixed with `_T`.
-* In order to specify the call type, the macro name must be suffixed with
-  `_WITH_CALLTYPE`, and the call type is the first macro argument.
+*   The general structure is `MOCK_METHODn(MethodName, ReturnType(Args))`,
+    instead of `MOCK_METHOD(ReturnType, MethodName, (Args))`.
+*   The number `n` must equal the number of arguments.
+*   When mocking a const method, one must use `MOCK_CONST_METHODn`.
+*   When mocking a class template, the macro name must be suffixed with `_T`.
+*   In order to specify the call type, the macro name must be suffixed with
+    `_WITH_CALLTYPE`, and the call type is the first macro argument.
 
 Old macros and their new equivalents:
 
@@ -378,11 +395,12 @@ Old macros and their new equivalents:
 
 If a mock method has no `EXPECT_CALL` spec but is called, we say that it's an
 "uninteresting call", and the default action (which can be specified using
-`ON_CALL()`) of the method will be taken. Currently, an uninteresting call will also by default cause gMock to print a
-warning. (In the future, we might remove this warning by default.)
+`ON_CALL()`) of the method will be taken. Currently, an uninteresting call will
+also by default cause gMock to print a warning.
 
-However, sometimes you may want to ignore these uninteresting calls, and sometimes you may want to treat them as errors.
-gMock lets you make the decision on a per-mock-object basis.
+However, sometimes you may want to ignore these uninteresting calls, and
+sometimes you may want to treat them as errors. gMock lets you make the decision
+on a per-mock-object basis.
 
 Suppose your test uses a mock class `MockFoo`:
 
@@ -394,8 +412,9 @@ TEST(...) {
 }
 ```
 
-If a method of `mock_foo` other than `DoThis()` is called, you will get a warning. However, if you rewrite your test to
-use `NiceMock<MockFoo>` instead, you can suppress the warning:
+If a method of `mock_foo` other than `DoThis()` is called, you will get a
+warning. However, if you rewrite your test to use `NiceMock<MockFoo>` instead,
+you can suppress the warning:
 
 ```cpp
 using ::testing::NiceMock;
@@ -423,7 +442,8 @@ TEST(...) {
 }
 ```
 
-The usage of `StrictMock` is similar, except that it makes all uninteresting calls failures:
+The usage of `StrictMock` is similar, except that it makes all uninteresting
+calls failures:
 
 ```cpp
 using ::testing::StrictMock;
@@ -438,32 +458,40 @@ TEST(...) {
 }
 ```
 
-{: .callout .note} NOTE: `NiceMock` and `StrictMock` only affects *uninteresting* calls (calls of
-*methods* with no expectations); they do not affect *unexpected* calls (calls of methods with expectations, but they
-don't match). See
+{: .callout .note}
+NOTE: `NiceMock` and `StrictMock` only affects *uninteresting* calls (calls of
+*methods* with no expectations); they do not affect *unexpected* calls (calls of
+methods with expectations, but they don't match). See
 [Understanding Uninteresting vs Unexpected Calls](#uninteresting-vs-unexpected).
 
-There are some caveats though (sadly they are side effects of C++'s limitations):
-
-1. `NiceMock<MockFoo>` and `StrictMock<MockFoo>` only work for mock methods defined using the `MOCK_METHOD` macro **
-   directly** in the `MockFoo` class. If a mock method is defined in a **base class** of `MockFoo`, the "nice" or
-   "strict" modifier may not affect it, depending on the compiler. In particular, nesting `NiceMock` and `StrictMock` (
-   e.g.
-   `NiceMock<StrictMock<MockFoo> >`) is **not** supported.
-2. `NiceMock<MockFoo>` and `StrictMock<MockFoo>` may not work correctly if the destructor of `MockFoo` is not virtual.
-   We would like to fix this, but it requires cleaning up existing tests.
-
-Finally, you should be **very cautious** about when to use naggy or strict mocks, as they tend to make tests more
-brittle and harder to maintain. When you refactor your code without changing its externally visible behavior, ideally
-you shouldn't need to update any tests. If your code interacts with a naggy mock, however, you may start to get spammed
-with warnings as the result of your change. Worse, if your code interacts with a strict mock, your tests may start to
-fail and you'll be forced to fix them. Our general recommendation is to use nice mocks (not yet the default) most of the
-time, use naggy mocks (the current default) when developing or debugging tests, and use strict mocks only as the last
-resort.
+There are some caveats though (sadly they are side effects of C++'s
+limitations):
+
+1.  `NiceMock<MockFoo>` and `StrictMock<MockFoo>` only work for mock methods
+    defined using the `MOCK_METHOD` macro **directly** in the `MockFoo` class.
+    If a mock method is defined in a **base class** of `MockFoo`, the "nice" or
+    "strict" modifier may not affect it, depending on the compiler. In
+    particular, nesting `NiceMock` and `StrictMock` (e.g.
+    `NiceMock<StrictMock<MockFoo> >`) is **not** supported.
+2.  `NiceMock<MockFoo>` and `StrictMock<MockFoo>` may not work correctly if the
+    destructor of `MockFoo` is not virtual. We would like to fix this, but it
+    requires cleaning up existing tests.
+
+Finally, you should be **very cautious** about when to use naggy or strict
+mocks, as they tend to make tests more brittle and harder to maintain. When you
+refactor your code without changing its externally visible behavior, ideally you
+shouldn't need to update any tests. If your code interacts with a naggy mock,
+however, you may start to get spammed with warnings as the result of your
+change. Worse, if your code interacts with a strict mock, your tests may start
+to fail and you'll be forced to fix them. Our general recommendation is to use
+nice mocks (not yet the default) most of the time, use naggy mocks (the current
+default) when developing or debugging tests, and use strict mocks only as the
+last resort.
 
 ### Simplifying the Interface without Breaking Existing Code {#SimplerInterfaces}
 
-Sometimes a method has a long list of arguments that is mostly uninteresting. For example:
+Sometimes a method has a long list of arguments that is mostly uninteresting.
+For example:
 
 ```cpp
 class LogSink {
@@ -477,8 +505,9 @@ class LogSink {
 ```
 
 This method's argument list is lengthy and hard to work with (the `message`
-argument is not even 0-terminated). If we mock it as is, using the mock will be awkward. If, however, we try to simplify
-this interface, we'll need to fix all clients depending on it, which is often infeasible.
+argument is not even 0-terminated). If we mock it as is, using the mock will be
+awkward. If, however, we try to simplify this interface, we'll need to fix all
+clients depending on it, which is often infeasible.
 
 The trick is to redispatch the method in the mock class:
 
@@ -505,10 +534,12 @@ class ScopedMockLog : public LogSink {
 };
 ```
 
-By defining a new mock method with a trimmed argument list, we make the mock class more user-friendly.
+By defining a new mock method with a trimmed argument list, we make the mock
+class more user-friendly.
 
-This technique may also be applied to make overloaded methods more amenable to mocking. For example, when overloads have
-been used to implement default arguments:
+This technique may also be applied to make overloaded methods more amenable to
+mocking. For example, when overloads have been used to implement default
+arguments:
 
 ```cpp
 class MockTurtleFactory : public TurtleFactory {
@@ -521,7 +552,8 @@ class MockTurtleFactory : public TurtleFactory {
 };
 ```
 
-This allows tests that don't care which overload was invoked to avoid specifying argument matchers:
+This allows tests that don't care which overload was invoked to avoid specifying
+argument matchers:
 
 ```cpp
 ON_CALL(factory, DoMakeTurtle)
@@ -530,54 +562,70 @@ ON_CALL(factory, DoMakeTurtle)
 
 ### Alternative to Mocking Concrete Classes
 
-Often you may find yourself using classes that don't implement interfaces. In order to test your code that uses such a
-class (let's call it `Concrete`), you may be tempted to make the methods of `Concrete` virtual and then mock it.
+Often you may find yourself using classes that don't implement interfaces. In
+order to test your code that uses such a class (let's call it `Concrete`), you
+may be tempted to make the methods of `Concrete` virtual and then mock it.
 
 Try not to do that.
 
-Making a non-virtual function virtual is a big decision. It creates an extension point where subclasses can tweak your
-class' behavior. This weakens your control on the class because now it's harder to maintain the class invariants. You
-should make a function virtual only when there is a valid reason for a subclass to override it.
+Making a non-virtual function virtual is a big decision. It creates an extension
+point where subclasses can tweak your class' behavior. This weakens your control
+on the class because now it's harder to maintain the class invariants. You
+should make a function virtual only when there is a valid reason for a subclass
+to override it.
 
-Mocking concrete classes directly is problematic as it creates a tight coupling between the class and the tests - any
-small change in the class may invalidate your tests and make test maintenance a pain.
+Mocking concrete classes directly is problematic as it creates a tight coupling
+between the class and the tests - any small change in the class may invalidate
+your tests and make test maintenance a pain.
 
-To avoid such problems, many programmers have been practicing "coding to interfaces": instead of talking to
-the `Concrete` class, your code would define an interface and talk to it. Then you implement that interface as an
-adaptor on top of `Concrete`. In tests, you can easily mock that interface to observe how your code is doing.
+To avoid such problems, many programmers have been practicing "coding to
+interfaces": instead of talking to the `Concrete` class, your code would define
+an interface and talk to it. Then you implement that interface as an adaptor on
+top of `Concrete`. In tests, you can easily mock that interface to observe how
+your code is doing.
 
 This technique incurs some overhead:
 
-* You pay the cost of virtual function calls (usually not a problem).
-* There is more abstraction for the programmers to learn.
-
-However, it can also bring significant benefits in addition to better testability:
-
-* `Concrete`'s API may not fit your problem domain very well, as you may not be the only client it tries to serve. By
-  designing your own interface, you have a chance to tailor it to your need - you may add higher-level functionalities,
-  rename stuff, etc instead of just trimming the class. This allows you to write your code (user of the interface) in a
-  more natural way, which means it will be more readable, more maintainable, and you'll be more productive.
-* If `Concrete`'s implementation ever has to change, you don't have to rewrite everywhere it is used. Instead, you can
-  absorb the change in your implementation of the interface, and your other code and tests will be insulated from this
-  change.
-
-Some people worry that if everyone is practicing this technique, they will end up writing lots of redundant code. This
-concern is totally understandable. However, there are two reasons why it may not be the case:
-
-* Different projects may need to use `Concrete` in different ways, so the best interfaces for them will be different.
-  Therefore, each of them will have its own domain-specific interface on top of `Concrete`, and they will not be the
-  same code.
-* If enough projects want to use the same interface, they can always share it, just like they have been
-  sharing `Concrete`. You can check in the interface and the adaptor somewhere near `Concrete` (perhaps in a `contrib`
-  sub-directory) and let many projects use it.
-
-You need to weigh the pros and cons carefully for your particular problem, but I'd like to assure you that the Java
-community has been practicing this for a long time and it's a proven effective technique applicable in a wide variety of
+*   You pay the cost of virtual function calls (usually not a problem).
+*   There is more abstraction for the programmers to learn.
+
+However, it can also bring significant benefits in addition to better
+testability:
+
+*   `Concrete`'s API may not fit your problem domain very well, as you may not
+    be the only client it tries to serve. By designing your own interface, you
+    have a chance to tailor it to your need - you may add higher-level
+    functionalities, rename stuff, etc instead of just trimming the class. This
+    allows you to write your code (user of the interface) in a more natural way,
+    which means it will be more readable, more maintainable, and you'll be more
+    productive.
+*   If `Concrete`'s implementation ever has to change, you don't have to rewrite
+    everywhere it is used. Instead, you can absorb the change in your
+    implementation of the interface, and your other code and tests will be
+    insulated from this change.
+
+Some people worry that if everyone is practicing this technique, they will end
+up writing lots of redundant code. This concern is totally understandable.
+However, there are two reasons why it may not be the case:
+
+*   Different projects may need to use `Concrete` in different ways, so the best
+    interfaces for them will be different. Therefore, each of them will have its
+    own domain-specific interface on top of `Concrete`, and they will not be the
+    same code.
+*   If enough projects want to use the same interface, they can always share it,
+    just like they have been sharing `Concrete`. You can check in the interface
+    and the adaptor somewhere near `Concrete` (perhaps in a `contrib`
+    sub-directory) and let many projects use it.
+
+You need to weigh the pros and cons carefully for your particular problem, but
+I'd like to assure you that the Java community has been practicing this for a
+long time and it's a proven effective technique applicable in a wide variety of
 situations. :-)
 
 ### Delegating Calls to a Fake {#DelegatingToFake}
 
-Some times you have a non-trivial fake implementation of an interface. For example:
+Some times you have a non-trivial fake implementation of an interface. For
+example:
 
 ```cpp
 class Foo {
@@ -600,11 +648,12 @@ class FakeFoo : public Foo {
 };
 ```
 
-Now you want to mock this interface such that you can set expectations on it. However, you also want to use `FakeFoo`
-for the default behavior, as duplicating it in the mock object is, well, a lot of work.
+Now you want to mock this interface such that you can set expectations on it.
+However, you also want to use `FakeFoo` for the default behavior, as duplicating
+it in the mock object is, well, a lot of work.
 
-When you define the mock class using gMock, you can have it delegate its default action to a fake class you already
-have, using this pattern:
+When you define the mock class using gMock, you can have it delegate its default
+action to a fake class you already have, using this pattern:
 
 ```cpp
 class MockFoo : public Foo {
@@ -629,8 +678,9 @@ class MockFoo : public Foo {
 };
 ```
 
-With that, you can use `MockFoo` in your tests as usual. Just remember that if you don't explicitly set an action in
-an `ON_CALL()` or `EXPECT_CALL()`, the fake will be called upon to do it.:
+With that, you can use `MockFoo` in your tests as usual. Just remember that if
+you don't explicitly set an action in an `ON_CALL()` or `EXPECT_CALL()`, the
+fake will be called upon to do it.:
 
 ```cpp
 using ::testing::_;
@@ -647,52 +697,63 @@ TEST(AbcTest, Xyz) {
   EXPECT_CALL(foo, DoThat(_, _));
 
   int n = 0;
-  EXPECT_EQ('+', foo.DoThis(5));  // FakeFoo::DoThis() is invoked.
+  EXPECT_EQ(foo.DoThis(5), '+');  // FakeFoo::DoThis() is invoked.
   foo.DoThat("Hi", &n);  // FakeFoo::DoThat() is invoked.
-  EXPECT_EQ(2, n);
+  EXPECT_EQ(n, 2);
 }
 ```
 
 **Some tips:**
 
-* If you want, you can still override the default action by providing your own
-  `ON_CALL()` or using `.WillOnce()` / `.WillRepeatedly()` in `EXPECT_CALL()`.
-* In `DelegateToFake()`, you only need to delegate the methods whose fake implementation you intend to use.
-
-* The general technique discussed here works for overloaded methods, but you'll need to tell the compiler which version
-  you mean. To disambiguate a mock function (the one you specify inside the parentheses of `ON_CALL()`),
-  use [this technique](#SelectOverload); to disambiguate a fake function (the one you place inside `Invoke()`), use
-  a `static_cast` to specify the function's type. For instance, if class `Foo` has methods `char DoThis(int n)`
-  and `bool DoThis(double x) const`, and you want to invoke the latter, you need to
-  write `Invoke(&fake_, static_cast<bool (FakeFoo::*)(double)
-  const>(&FakeFoo::DoThis))` instead of `Invoke(&fake_, &FakeFoo::DoThis)`
-  (The strange-looking thing inside the angled brackets of `static_cast` is the type of a function pointer to the
-  second `DoThis()` method.).
-
-* Having to mix a mock and a fake is often a sign of something gone wrong. Perhaps you haven't got used to the
-  interaction-based way of testing yet. Or perhaps your interface is taking on too many roles and should be split up.
-  Therefore, **don't abuse this**. We would only recommend to do it as an intermediate step when you are refactoring
-  your code.
-
-Regarding the tip on mixing a mock and a fake, here's an example on why it may be a bad sign: Suppose you have a
-class `System` for low-level system operations. In particular, it does file and I/O operations. And suppose you want to
-test how your code uses `System` to do I/O, and you just want the file operations to work normally. If you mock out the
-entire `System` class, you'll have to provide a fake implementation for the file operation part, which suggests
-that `System` is taking on too many roles.
+*   If you want, you can still override the default action by providing your own
+    `ON_CALL()` or using `.WillOnce()` / `.WillRepeatedly()` in `EXPECT_CALL()`.
+*   In `DelegateToFake()`, you only need to delegate the methods whose fake
+    implementation you intend to use.
+
+*   The general technique discussed here works for overloaded methods, but
+    you'll need to tell the compiler which version you mean. To disambiguate a
+    mock function (the one you specify inside the parentheses of `ON_CALL()`),
+    use [this technique](#SelectOverload); to disambiguate a fake function (the
+    one you place inside `Invoke()`), use a `static_cast` to specify the
+    function's type. For instance, if class `Foo` has methods `char DoThis(int
+    n)` and `bool DoThis(double x) const`, and you want to invoke the latter,
+    you need to write `Invoke(&fake_, static_cast<bool (FakeFoo::*)(double)
+    const>(&FakeFoo::DoThis))` instead of `Invoke(&fake_, &FakeFoo::DoThis)`
+    (The strange-looking thing inside the angled brackets of `static_cast` is
+    the type of a function pointer to the second `DoThis()` method.).
+
+*   Having to mix a mock and a fake is often a sign of something gone wrong.
+    Perhaps you haven't got used to the interaction-based way of testing yet. Or
+    perhaps your interface is taking on too many roles and should be split up.
+    Therefore, **don't abuse this**. We would only recommend to do it as an
+    intermediate step when you are refactoring your code.
+
+Regarding the tip on mixing a mock and a fake, here's an example on why it may
+be a bad sign: Suppose you have a class `System` for low-level system
+operations. In particular, it does file and I/O operations. And suppose you want
+to test how your code uses `System` to do I/O, and you just want the file
+operations to work normally. If you mock out the entire `System` class, you'll
+have to provide a fake implementation for the file operation part, which
+suggests that `System` is taking on too many roles.
 
 Instead, you can define a `FileOps` interface and an `IOOps` interface and split
-`System`'s functionalities into the two. Then you can mock `IOOps` without mocking `FileOps`.
+`System`'s functionalities into the two. Then you can mock `IOOps` without
+mocking `FileOps`.
 
 ### Delegating Calls to a Real Object
 
-When using testing doubles (mocks, fakes, stubs, and etc), sometimes their behaviors will differ from those of the real
-objects. This difference could be either intentional (as in simulating an error such that you can test the error
-handling code) or unintentional. If your mocks have different behaviors than the real objects by mistake, you could end
-up with code that passes the tests but fails in production.
+When using testing doubles (mocks, fakes, stubs, and etc), sometimes their
+behaviors will differ from those of the real objects. This difference could be
+either intentional (as in simulating an error such that you can test the error
+handling code) or unintentional. If your mocks have different behaviors than the
+real objects by mistake, you could end up with code that passes the tests but
+fails in production.
 
-You can use the *delegating-to-real* technique to ensure that your mock has the same behavior as the real object while
-retaining the ability to validate calls. This technique is very similar to the [delegating-to-fake](#DelegatingToFake)
-technique, the difference being that we use a real object instead of a fake. Here's an example:
+You can use the *delegating-to-real* technique to ensure that your mock has the
+same behavior as the real object while retaining the ability to validate calls.
+This technique is very similar to the [delegating-to-fake](#DelegatingToFake)
+technique, the difference being that we use a real object instead of a fake.
+Here's an example:
 
 ```cpp
 using ::testing::AtLeast;
@@ -725,14 +786,16 @@ class MockFoo : public Foo {
   ... use mock in test ...
 ```
 
-With this, gMock will verify that your code made the right calls (with the right arguments, in the right order, called
-the right number of times, etc), and a real object will answer the calls (so the behavior will be the same as in
+With this, gMock will verify that your code made the right calls (with the right
+arguments, in the right order, called the right number of times, etc), and a
+real object will answer the calls (so the behavior will be the same as in
 production). This gives you the best of both worlds.
 
 ### Delegating Calls to a Parent Class
 
-Ideally, you should code to interfaces, whose methods are all pure virtual. In reality, sometimes you do need to mock a
-virtual method that is not pure (i.e, it already has an implementation). For example:
+Ideally, you should code to interfaces, whose methods are all pure virtual. In
+reality, sometimes you do need to mock a virtual method that is not pure (i.e,
+it already has an implementation). For example:
 
 ```cpp
 class Foo {
@@ -753,9 +816,10 @@ class MockFoo : public Foo {
 ```
 
 Sometimes you may want to call `Foo::Concrete()` instead of
-`MockFoo::Concrete()`. Perhaps you want to do it as part of a stub action, or perhaps your test doesn't need to
-mock `Concrete()` at all (but it would be oh-so painful to have to define a new mock class whenever you don't need to
-mock one of its methods).
+`MockFoo::Concrete()`. Perhaps you want to do it as part of a stub action, or
+perhaps your test doesn't need to mock `Concrete()` at all (but it would be
+oh-so painful to have to define a new mock class whenever you don't need to mock
+one of its methods).
 
 You can call `Foo::Concrete()` inside an action by:
 
@@ -834,16 +898,17 @@ using ::testing::Not;
                           NULL));
 ```
 
-Matchers are function objects, and parametrized matchers can be composed just like any other function. However because
-their types can be long and rarely provide meaningful information, it can be easier to express them with C++14 generic
-lambdas to avoid specifying types. For example,
+Matchers are function objects, and parametrized matchers can be composed just
+like any other function. However because their types can be long and rarely
+provide meaningful information, it can be easier to express them with C++14
+generic lambdas to avoid specifying types. For example,
 
 ```cpp
 using ::testing::Contains;
 using ::testing::Property;
 
 inline constexpr auto HasFoo = [](const auto& f) {
-  return Property(&MyClass::foo, Contains(f));
+  return Property("foo", &MyClass::foo, Contains(f));
 };
 ...
   EXPECT_THAT(x, HasFoo("blah"));
@@ -851,24 +916,28 @@ inline constexpr auto HasFoo = [](const auto& f) {
 
 ### Casting Matchers {#SafeMatcherCast}
 
-gMock matchers are statically typed, meaning that the compiler can catch your mistake if you use a matcher of the wrong
-type (for example, if you use `Eq(5)`
+gMock matchers are statically typed, meaning that the compiler can catch your
+mistake if you use a matcher of the wrong type (for example, if you use `Eq(5)`
 to match a `string` argument). Good for you!
 
-Sometimes, however, you know what you're doing and want the compiler to give you some slack. One example is that you
-have a matcher for `long` and the argument you want to match is `int`. While the two types aren't exactly the same,
-there is nothing really wrong with using a `Matcher<long>` to match an `int` - after all, we can first convert the `int`
-argument to a `long` losslessly before giving it to the matcher.
+Sometimes, however, you know what you're doing and want the compiler to give you
+some slack. One example is that you have a matcher for `long` and the argument
+you want to match is `int`. While the two types aren't exactly the same, there
+is nothing really wrong with using a `Matcher<long>` to match an `int` - after
+all, we can first convert the `int` argument to a `long` losslessly before
+giving it to the matcher.
 
-To support this need, gMock gives you the `SafeMatcherCast<T>(m)` function. It casts a matcher `m` to type `Matcher<T>`.
-To ensure safety, gMock checks that
+To support this need, gMock gives you the `SafeMatcherCast<T>(m)` function. It
+casts a matcher `m` to type `Matcher<T>`. To ensure safety, gMock checks that
 (let `U` be the type `m` accepts :
 
-1. Type `T` can be *implicitly* cast to type `U`;
-2. When both `T` and `U` are built-in arithmetic types (`bool`, integers, and floating-point numbers), the conversion
-   from `T` to `U` is not lossy (in other words, any value representable by `T` can also be represented by `U`); and
-3. When `U` is a reference, `T` must also be a reference (as the underlying matcher may be interested in the address of
-   the `U` value).
+1.  Type `T` can be *implicitly* cast to type `U`;
+2.  When both `T` and `U` are built-in arithmetic types (`bool`, integers, and
+    floating-point numbers), the conversion from `T` to `U` is not lossy (in
+    other words, any value representable by `T` can also be represented by `U`);
+    and
+3.  When `U` is a non-const reference, `T` must also be a reference (as the
+    underlying matcher may be interested in the address of the `U` value).
 
 The code won't compile if any of these conditions isn't met.
 
@@ -893,14 +962,17 @@ class MockFoo : public Foo {
 ```
 
 If you find `SafeMatcherCast<T>(m)` too limiting, you can use a similar function
-`MatcherCast<T>(m)`. The difference is that `MatcherCast` works as long as you can `static_cast` type `T` to type `U`.
+`MatcherCast<T>(m)`. The difference is that `MatcherCast` works as long as you
+can `static_cast` type `T` to type `U`.
 
-`MatcherCast` essentially lets you bypass C++'s type system (`static_cast` isn't always safe as it could throw away
-information, for example), so be careful not to misuse/abuse it.
+`MatcherCast` essentially lets you bypass C++'s type system (`static_cast` isn't
+always safe as it could throw away information, for example), so be careful not
+to misuse/abuse it.
 
 ### Selecting Between Overloaded Functions {#SelectOverload}
 
-If you expect an overloaded function to be called, the compiler may need some help on which overloaded version it is.
+If you expect an overloaded function to be called, the compiler may need some
+help on which overloaded version it is.
 
 To disambiguate functions overloaded on the const-ness of this object, use the
 `Const()` argument wrapper.
@@ -925,9 +997,10 @@ class MockFoo : public Foo {
 
 (`Const()` is defined by gMock and returns a `const` reference to its argument.)
 
-To disambiguate overloaded functions with the same number of arguments but different argument types, you may need to
-specify the exact type of a matcher, either by wrapping your matcher in `Matcher<type>()`, or using a matcher whose type
-is fixed (`TypedEq<type>`, `An<type>()`, etc):
+To disambiguate overloaded functions with the same number of arguments but
+different argument types, you may need to specify the exact type of a matcher,
+either by wrapping your matcher in `Matcher<type>()`, or using a matcher whose
+type is fixed (`TypedEq<type>`, `An<type>()`, etc):
 
 ```cpp
 using ::testing::An;
@@ -955,8 +1028,9 @@ TEST(PrinterTest, Print) {
 
 ### Performing Different Actions Based on the Arguments
 
-When a mock method is called, the *last* matching expectation that's still active will be selected (think "newer
-overrides older"). So, you can make a method do different things depending on its argument values like this:
+When a mock method is called, the *last* matching expectation that's still
+active will be selected (think "newer overrides older"). So, you can make a
+method do different things depending on its argument values like this:
 
 ```cpp
 using ::testing::_;
@@ -971,12 +1045,14 @@ using ::testing::Return;
       .WillRepeatedly(Return('a'));
 ```
 
-Now, if `foo.DoThis()` is called with a value less than 5, `'a'` will be returned; otherwise `'b'` will be returned.
+Now, if `foo.DoThis()` is called with a value less than 5, `'a'` will be
+returned; otherwise `'b'` will be returned.
 
 ### Matching Multiple Arguments as a Whole
 
-Sometimes it's not enough to match the arguments individually. For example, we may want to say that the first argument
-must be less than the second argument. The `With()` clause allows us to match all arguments of a mock function as a
+Sometimes it's not enough to match the arguments individually. For example, we
+may want to say that the first argument must be less than the second argument.
+The `With()` clause allows us to match all arguments of a mock function as a
 whole. For example,
 
 ```cpp
@@ -988,15 +1064,17 @@ using ::testing::Lt;
       .With(Lt());
 ```
 
-says that the first argument of `InRange()` must not be 0, and must be less than the second argument.
+says that the first argument of `InRange()` must not be 0, and must be less than
+the second argument.
 
-The expression inside `With()` must be a matcher of type `Matcher<std::tuple<A1, ..., An>>`, where `A1`, ..., `An` are
-the types of the function arguments.
+The expression inside `With()` must be a matcher of type `Matcher<std::tuple<A1,
+..., An>>`, where `A1`, ..., `An` are the types of the function arguments.
 
-You can also write `AllArgs(m)` instead of `m` inside `.With()`. The two forms are equivalent,
-but `.With(AllArgs(Lt()))` is more readable than `.With(Lt())`.
+You can also write `AllArgs(m)` instead of `m` inside `.With()`. The two forms
+are equivalent, but `.With(AllArgs(Lt()))` is more readable than `.With(Lt())`.
 
-You can use `Args<k1, ..., kn>(m)` to match the `n` selected arguments (as a tuple) against `m`. For example,
+You can use `Args<k1, ..., kn>(m)` to match the `n` selected arguments (as a
+tuple) against `m`. For example,
 
 ```cpp
 using ::testing::_;
@@ -1009,23 +1087,28 @@ using ::testing::Lt;
 ```
 
 says that `Blah` will be called with arguments `x`, `y`, and `z` where `x < y <
-z`. Note that in this example, it wasn't necessary specify the positional matchers.
+z`. Note that in this example, it wasn't necessary to specify the positional
+matchers.
 
-As a convenience and example, gMock provides some matchers for 2-tuples, including the `Lt()` matcher above. See
-[Multi-argument Matchers](reference/matchers.md#MultiArgMatchers) for the complete list.
+As a convenience and example, gMock provides some matchers for 2-tuples,
+including the `Lt()` matcher above. See
+[Multi-argument Matchers](reference/matchers.md#MultiArgMatchers) for the
+complete list.
 
 Note that if you want to pass the arguments to a predicate of your own (e.g.
-`.With(Args<0, 1>(Truly(&MyPredicate)))`), that predicate MUST be written to take a `std::tuple` as its argument; gMock
-will pass the `n` selected arguments as *one* single tuple to the predicate.
+`.With(Args<0, 1>(Truly(&MyPredicate)))`), that predicate MUST be written to
+take a `std::tuple` as its argument; gMock will pass the `n` selected arguments
+as *one* single tuple to the predicate.
 
 ### Using Matchers as Predicates
 
-Have you noticed that a matcher is just a fancy predicate that also knows how to describe itself? Many existing
-algorithms take predicates as arguments (e.g. those defined in STL's `<algorithm>` header), and it would be a shame if
-gMock matchers were not allowed to participate.
+Have you noticed that a matcher is just a fancy predicate that also knows how to
+describe itself? Many existing algorithms take predicates as arguments (e.g.
+those defined in STL's `<algorithm>` header), and it would be a shame if gMock
+matchers were not allowed to participate.
 
-Luckily, you can use a matcher where a unary predicate functor is expected by wrapping it inside the `Matches()`
-function. For example,
+Luckily, you can use a matcher where a unary predicate functor is expected by
+wrapping it inside the `Matches()` function. For example,
 
 ```cpp
 #include <algorithm>
@@ -1040,30 +1123,33 @@ vector<int> v;
 const int count = count_if(v.begin(), v.end(), Matches(Ge(10)));
 ```
 
-Since you can build complex matchers from simpler ones easily using gMock, this gives you a way to conveniently
-construct composite predicates (doing the same using STL's `<functional>` header is just painful). For example, here's a
+Since you can build complex matchers from simpler ones easily using gMock, this
+gives you a way to conveniently construct composite predicates (doing the same
+using STL's `<functional>` header is just painful). For example, here's a
 predicate that's satisfied by any number that is >= 0, <= 100, and != 50:
 
 ```cpp
-using testing::AllOf;
-using testing::Ge;
-using testing::Le;
-using testing::Matches;
-using testing::Ne;
+using ::testing::AllOf;
+using ::testing::Ge;
+using ::testing::Le;
+using ::testing::Matches;
+using ::testing::Ne;
 ...
 Matches(AllOf(Ge(0), Le(100), Ne(50)))
 ```
 
 ### Using Matchers in googletest Assertions
 
-See [`EXPECT_THAT`](reference/assertions.md#EXPECT_THAT) in the Assertions Reference.
+See [`EXPECT_THAT`](reference/assertions.md#EXPECT_THAT) in the Assertions
+Reference.
 
 ### Using Predicates as Matchers
 
-gMock provides a set of built-in matchers for matching arguments with expected values—see
-the [Matchers Reference](reference/matchers.md) for more information. In case you find the built-in set lacking, you can
-use an arbitrary unary predicate function or functor as a matcher - as long as the predicate accepts a value of the type
-you want. You do this by wrapping the predicate inside the
+gMock provides a set of built-in matchers for matching arguments with expected
+values—see the [Matchers Reference](reference/matchers.md) for more information.
+In case you find the built-in set lacking, you can use an arbitrary unary
+predicate function or functor as a matcher - as long as the predicate accepts a
+value of the type you want. You do this by wrapping the predicate inside the
 `Truly()` function, for example:
 
 ```cpp
@@ -1075,21 +1161,24 @@ int IsEven(int n) { return (n % 2) == 0 ? 1 : 0; }
   EXPECT_CALL(foo, Bar(Truly(IsEven)));
 ```
 
-Note that the predicate function / functor doesn't have to return `bool`. It works as long as the return value can be
-used as the condition in in statement
+Note that the predicate function / functor doesn't have to return `bool`. It
+works as long as the return value can be used as the condition in the statement
 `if (condition) ...`.
 
 ### Matching Arguments that Are Not Copyable
 
 When you do an `EXPECT_CALL(mock_obj, Foo(bar))`, gMock saves away a copy of
-`bar`. When `Foo()` is called later, gMock compares the argument to `Foo()` with the saved copy of `bar`. This way, you
-don't need to worry about `bar` being modified or destroyed after the `EXPECT_CALL()` is executed. The same is true when
-you use matchers like `Eq(bar)`, `Le(bar)`, and so on.
+`bar`. When `Foo()` is called later, gMock compares the argument to `Foo()` with
+the saved copy of `bar`. This way, you don't need to worry about `bar` being
+modified or destroyed after the `EXPECT_CALL()` is executed. The same is true
+when you use matchers like `Eq(bar)`, `Le(bar)`, and so on.
 
-But what if `bar` cannot be copied (i.e. has no copy constructor)? You could define your own matcher function or
-callback and use it with `Truly()`, as the previous couple of recipes have shown. Or, you may be able to get away from
-it if you can guarantee that `bar` won't be changed after the `EXPECT_CALL()` is executed. Just tell gMock that it
-should save a reference to `bar`, instead of a copy of it. Here's how:
+But what if `bar` cannot be copied (i.e. has no copy constructor)? You could
+define your own matcher function or callback and use it with `Truly()`, as the
+previous couple of recipes have shown. Or, you may be able to get away from it
+if you can guarantee that `bar` won't be changed after the `EXPECT_CALL()` is
+executed. Just tell gMock that it should save a reference to `bar`, instead of a
+copy of it. Here's how:
 
 ```cpp
 using ::testing::Eq;
@@ -1102,39 +1191,45 @@ using ::testing::Lt;
   EXPECT_CALL(mock_obj, Foo(Lt(std::ref(bar))));
 ```
 
-Remember: if you do this, don't change `bar` after the `EXPECT_CALL()`, or the result is undefined.
+Remember: if you do this, don't change `bar` after the `EXPECT_CALL()`, or the
+result is undefined.
 
 ### Validating a Member of an Object
 
-Often a mock function takes a reference to object as an argument. When matching the argument, you may not want to
-compare the entire object against a fixed object, as that may be over-specification. Instead, you may need to validate a
-certain member variable or the result of a certain getter method of the object. You can do this with `Field()`
-and `Property()`. More specifically,
+Often a mock function takes a reference to object as an argument. When matching
+the argument, you may not want to compare the entire object against a fixed
+object, as that may be over-specification. Instead, you may need to validate a
+certain member variable or the result of a certain getter method of the object.
+You can do this with `Field()` and `Property()`. More specifically,
 
 ```cpp
 Field(&Foo::bar, m)
 ```
 
-is a matcher that matches a `Foo` object whose `bar` member variable satisfies matcher `m`.
+is a matcher that matches a `Foo` object whose `bar` member variable satisfies
+matcher `m`.
 
 ```cpp
 Property(&Foo::baz, m)
 ```
 
-is a matcher that matches a `Foo` object whose `baz()` method returns a value that satisfies matcher `m`.
+is a matcher that matches a `Foo` object whose `baz()` method returns a value
+that satisfies matcher `m`.
 
 For example:
 
 | Expression                   | Description                              |
 | :--------------------------- | :--------------------------------------- |
 | `Field(&Foo::number, Ge(3))` | Matches `x` where `x.number >= 3`.       |
-| `Property(&Foo::name, StartsWith("John "))` | Matches `x` where `x.name()` starts with  `"John "`. |
+| `Property(&Foo::name,  StartsWith("John "))` | Matches `x` where `x.name()` starts with  `"John "`. |
 
-Note that in `Property(&Foo::baz, ...)`, method `baz()` must take no argument and be declared as `const`. Don't
-use `Property()` against member functions that you do not own, because taking addresses of functions is fragile and
-generally not part of the contract of the function.
+Note that in `Property(&Foo::baz, ...)`, method `baz()` must take no argument
+and be declared as `const`. Don't use `Property()` against member functions that
+you do not own, because taking addresses of functions is fragile and generally
+not part of the contract of the function.
 
-`Field()` and `Property()` can also match plain pointers to objects. For instance,
+`Field()` and `Property()` can also match plain pointers to objects. For
+instance,
 
 ```cpp
 using ::testing::Field;
@@ -1143,14 +1238,15 @@ using ::testing::Ge;
 Field(&Foo::number, Ge(3))
 ```
 
-matches a plain pointer `p` where `p->number >= 3`. If `p` is `NULL`, the match will always fail regardless of the inner
-matcher.
+matches a plain pointer `p` where `p->number >= 3`. If `p` is `NULL`, the match
+will always fail regardless of the inner matcher.
 
-What if you want to validate more than one members at the same time? Remember that there
-are [`AllOf()` and `AllOfArray()`](#CombiningMatchers).
+What if you want to validate more than one members at the same time? Remember
+that there are [`AllOf()` and `AllOfArray()`](#CombiningMatchers).
 
-Finally `Field()` and `Property()` provide overloads that take the field or property names as the first argument to
-include it in the error message. This can be useful when creating combined matchers.
+Finally `Field()` and `Property()` provide overloads that take the field or
+property names as the first argument to include it in the error message. This
+can be useful when creating combined matchers.
 
 ```cpp
 using ::testing::AllOf;
@@ -1168,11 +1264,13 @@ Matcher<Foo> IsFoo(const Foo& foo) {
 ### Validating the Value Pointed to by a Pointer Argument
 
 C++ functions often take pointers as arguments. You can use matchers like
-`IsNull()`, `NotNull()`, and other comparison matchers to match a pointer, but what if you want to make sure the value *
-pointed to* by the pointer, instead of the pointer itself, has a certain property? Well, you can use the `Pointee(m)`
+`IsNull()`, `NotNull()`, and other comparison matchers to match a pointer, but
+what if you want to make sure the value *pointed to* by the pointer, instead of
+the pointer itself, has a certain property? Well, you can use the `Pointee(m)`
 matcher.
 
-`Pointee(m)` matches a pointer if and only if `m` matches the value the pointer points to. For example:
+`Pointee(m)` matches a pointer if and only if `m` matches the value the pointer
+points to. For example:
 
 ```cpp
 using ::testing::Ge;
@@ -1181,10 +1279,11 @@ using ::testing::Pointee;
   EXPECT_CALL(foo, Bar(Pointee(Ge(3))));
 ```
 
-expects `foo.Bar()` to be called with a pointer that points to a value greater than or equal to 3.
+expects `foo.Bar()` to be called with a pointer that points to a value greater
+than or equal to 3.
 
-One nice thing about `Pointee()` is that it treats a `NULL` pointer as a match failure, so you can write `Pointee(m)`
-instead of
+One nice thing about `Pointee()` is that it treats a `NULL` pointer as a match
+failure, so you can write `Pointee(m)` instead of
 
 ```cpp
 using ::testing::AllOf;
@@ -1201,24 +1300,30 @@ smart pointers (`std::unique_ptr`, `std::shared_ptr`, etc)?
 
 What if you have a pointer to pointer? You guessed it - you can use nested
 `Pointee()` to probe deeper inside the value. For example,
-`Pointee(Pointee(Lt(3)))` matches a pointer that points to a pointer that points to a number less than 3 (what a
-mouthful...).
+`Pointee(Pointee(Lt(3)))` matches a pointer that points to a pointer that points
+to a number less than 3 (what a mouthful...).
 
-### Testing a Certain Property of an Object
+### Defining a Custom Matcher Class {#CustomMatcherClass}
 
-Sometimes you want to specify that an object argument has a certain property, but there is no existing matcher that does
-this. If you want good error messages, you should [define a matcher](#NewMatchers). If you want to do it quick and
-dirty, you could get away with writing an ordinary function.
+Most matchers can be simply defined using [the MATCHER* macros](#NewMatchers),
+which are terse and flexible, and produce good error messages. However, these
+macros are not very explicit about the interfaces they create and are not always
+suitable, especially for matchers that will be widely reused.
 
-Let's say you have a mock function that takes an object of type `Foo`, which has an `int bar()` method and
-an `int baz()` method, and you want to constrain that the argument's `bar()` value plus its `baz()` value is a given
-number. Here's how you can define a matcher to do it:
+For more advanced cases, you may need to define your own matcher class. A custom
+matcher allows you to test a specific invariant property of that object. Let's
+take a look at how to do so.
 
-```cpp
-using ::testing::Matcher;
+Imagine you have a mock function that takes an object of type `Foo`, which has
+an `int bar()` method and an `int baz()` method. You want to constrain that the
+argument's `bar()` value plus its `baz()` value is a given number. (This is an
+invariant.) Here's how we can write and use a matcher class to do so:
 
+```cpp
 class BarPlusBazEqMatcher {
  public:
+  using is_gtest_matcher = void;
+
   explicit BarPlusBazEqMatcher(int expected_sum)
       : expected_sum_(expected_sum) {}
 
@@ -1227,37 +1332,41 @@ class BarPlusBazEqMatcher {
     return (foo.bar() + foo.baz()) == expected_sum_;
   }
 
-  void DescribeTo(std::ostream& os) const {
-    os << "bar() + baz() equals " << expected_sum_;
+  void DescribeTo(std::ostream* os) const {
+    *os << "bar() + baz() equals " << expected_sum_;
   }
 
-  void DescribeNegationTo(std::ostream& os) const {
-    os << "bar() + baz() does not equal " << expected_sum_;
+  void DescribeNegationTo(std::ostream* os) const {
+    *os << "bar() + baz() does not equal " << expected_sum_;
   }
  private:
   const int expected_sum_;
 };
 
-Matcher<const Foo&> BarPlusBazEq(int expected_sum) {
+::testing::Matcher<const Foo&> BarPlusBazEq(int expected_sum) {
   return BarPlusBazEqMatcher(expected_sum);
 }
 
 ...
-  EXPECT_CALL(..., DoThis(BarPlusBazEq(5)))...;
+  Foo foo;
+  EXPECT_THAT(foo, BarPlusBazEq(5))...;
 ```
 
 ### Matching Containers
 
-Sometimes an STL container (e.g. list, vector, map, ...) is passed to a mock function and you may want to validate it.
-Since most STL containers support the
+Sometimes an STL container (e.g. list, vector, map, ...) is passed to a mock
+function and you may want to validate it. Since most STL containers support the
 `==` operator, you can write `Eq(expected_container)` or simply
 `expected_container` to match a container exactly.
 
-Sometimes, though, you may want to be more flexible (for example, the first element must be an exact match, but the
-second element can be any positive number, and so on). Also, containers used in tests often have a small number of
-elements, and having to define the expected container out-of-line is a bit of a hassle.
+Sometimes, though, you may want to be more flexible (for example, the first
+element must be an exact match, but the second element can be any positive
+number, and so on). Also, containers used in tests often have a small number of
+elements, and having to define the expected container out-of-line is a bit of a
+hassle.
 
-You can use the `ElementsAre()` or `UnorderedElementsAre()` matcher in such cases:
+You can use the `ElementsAre()` or `UnorderedElementsAre()` matcher in such
+cases:
 
 ```cpp
 using ::testing::_;
@@ -1269,8 +1378,8 @@ using ::testing::Gt;
   EXPECT_CALL(mock, Foo(ElementsAre(1, Gt(0), _, 5)));
 ```
 
-The above matcher says that the container must have 4 elements, which must be 1, greater than 0, anything, and 5
-respectively.
+The above matcher says that the container must have 4 elements, which must be 1,
+greater than 0, anything, and 5 respectively.
 
 If you instead write:
 
@@ -1302,8 +1411,9 @@ using ::testing::ElementsAreArray;
   EXPECT_CALL(mock, Foo(ElementsAreArray(expected_vector2)));
 ```
 
-In case the array needs to be dynamically created (and therefore the array size cannot be inferred by the compiler), you
-can give `ElementsAreArray()` an additional argument to specify the array size:
+In case the array needs to be dynamically created (and therefore the array size
+cannot be inferred by the compiler), you can give `ElementsAreArray()` an
+additional argument to specify the array size:
 
 ```cpp
 using ::testing::ElementsAreArray;
@@ -1318,36 +1428,41 @@ Use `Pair` when comparing maps or other associative containers.
 {% raw %}
 
 ```cpp
-using testing::ElementsAre;
-using testing::Pair;
+using ::testing::UnorderedElementsAre;
+using ::testing::Pair;
 ...
-  std::map<string, int> m = {{"a", 1}, {"b", 2}, {"c", 3}};
-  EXPECT_THAT(m, ElementsAre(Pair("a", 1), Pair("b", 2), Pair("c", 3)));
+  absl::flat_hash_map<string, int> m = {{"a", 1}, {"b", 2}, {"c", 3}};
+  EXPECT_THAT(m, UnorderedElementsAre(
+      Pair("a", 1), Pair("b", 2), Pair("c", 3)));
 ```
 
 {% endraw %}
 
 **Tips:**
 
-* `ElementsAre*()` can be used to match *any* container that implements the STL iterator pattern (i.e. it has
-  a `const_iterator` type and supports
-  `begin()/end()`), not just the ones defined in STL. It will even work with container types yet to be written - as long
-  as they follows the above pattern.
-* You can use nested `ElementsAre*()` to match nested (multi-dimensional)
-  containers.
-* If the container is passed by pointer instead of by reference, just write
-  `Pointee(ElementsAre*(...))`.
-* The order of elements *matters* for `ElementsAre*()`. If you are using it with containers whose element order are
-  undefined (e.g. `hash_map`) you should use `WhenSorted` around `ElementsAre`.
+*   `ElementsAre*()` can be used to match *any* container that implements the
+    STL iterator pattern (i.e. it has a `const_iterator` type and supports
+    `begin()/end()`), not just the ones defined in STL. It will even work with
+    container types yet to be written - as long as they follows the above
+    pattern.
+*   You can use nested `ElementsAre*()` to match nested (multi-dimensional)
+    containers.
+*   If the container is passed by pointer instead of by reference, just write
+    `Pointee(ElementsAre*(...))`.
+*   The order of elements *matters* for `ElementsAre*()`. If you are using it
+    with containers whose element order are undefined (such as a
+    `std::unordered_map`) you should use `UnorderedElementsAre`.
 
 ### Sharing Matchers
 
-Under the hood, a gMock matcher object consists of a pointer to a ref-counted implementation object. Copying matchers is
-allowed and very efficient, as only the pointer is copied. When the last matcher that references the implementation
+Under the hood, a gMock matcher object consists of a pointer to a ref-counted
+implementation object. Copying matchers is allowed and very efficient, as only
+the pointer is copied. When the last matcher that references the implementation
 object dies, the implementation object will be deleted.
 
-Therefore, if you have some complex matcher that you want to use again and again, there is no need to build it
-everytime. Just assign it to a matcher variable and use that variable repeatedly! For example,
+Therefore, if you have some complex matcher that you want to use again and
+again, there is no need to build it every time. Just assign it to a matcher
+variable and use that variable repeatedly! For example,
 
 ```cpp
 using ::testing::AllOf;
@@ -1361,13 +1476,16 @@ using ::testing::Matcher;
 
 ### Matchers must have no side-effects {#PureMatchers}
 
-{: .callout .warning} WARNING: gMock does not guarantee when or how many times a matcher will be invoked. Therefore, all
-matchers must be *purely functional*: they cannot have any side effects, and the match result must not depend on
-anything other than the matcher's parameters and the value being matched.
+{: .callout .warning}
+WARNING: gMock does not guarantee when or how many times a matcher will be
+invoked. Therefore, all matchers must be *purely functional*: they cannot have
+any side effects, and the match result must not depend on anything other than
+the matcher's parameters and the value being matched.
 
-This requirement must be satisfied no matter how a matcher is defined (e.g., if it is one of the standard matchers, or a
-custom matcher). In particular, a matcher can never call a mock function, as that will affect the state of the mock
-object and gMock.
+This requirement must be satisfied no matter how a matcher is defined (e.g., if
+it is one of the standard matchers, or a custom matcher). In particular, a
+matcher can never call a mock function, as that will affect the state of the
+mock object and gMock.
 
 ## Setting Expectations
 
@@ -1376,51 +1494,64 @@ object and gMock.
 **`ON_CALL`** is likely the *single most under-utilized construct* in gMock.
 
 There are basically two constructs for defining the behavior of a mock object:
-`ON_CALL` and `EXPECT_CALL`. The difference? `ON_CALL` defines what happens when a mock method is called, but <em>
-doesn't imply any expectation on the method being called</em>. `EXPECT_CALL` not only defines the behavior, but also
-sets an expectation that <em>the method will be called with the given arguments, for the given number of times</em> (
-and *in the given order* when you specify the order too).
+`ON_CALL` and `EXPECT_CALL`. The difference? `ON_CALL` defines what happens when
+a mock method is called, but <em>doesn't imply any expectation on the method
+being called</em>. `EXPECT_CALL` not only defines the behavior, but also sets an
+expectation that <em>the method will be called with the given arguments, for the
+given number of times</em> (and *in the given order* when you specify the order
+too).
 
 Since `EXPECT_CALL` does more, isn't it better than `ON_CALL`? Not really. Every
-`EXPECT_CALL` adds a constraint on the behavior of the code under test. Having more constraints than necessary is *
-baaad* - even worse than not having enough constraints.
-
-This may be counter-intuitive. How could tests that verify more be worse than tests that verify less? Isn't verification
-the whole point of tests?
-
-The answer lies in *what* a test should verify. **A good test verifies the contract of the code.** If a test
-over-specifies, it doesn't leave enough freedom to the implementation. As a result, changing the implementation without
-breaking the contract (e.g. refactoring and optimization), which should be perfectly fine to do, can break such tests.
-Then you have to spend time fixing them, only to see them broken again the next time the implementation is changed.
-
-Keep in mind that one doesn't have to verify more than one property in one test. In fact, **it's a good style to verify
-only one thing in one test.** If you do that, a bug will likely break only one or two tests instead of dozens (which
-case would you rather debug?). If you are also in the habit of giving tests descriptive names that tell what they
-verify, you can often easily guess what's wrong just from the test log itself.
-
-So use `ON_CALL` by default, and only use `EXPECT_CALL` when you actually intend to verify that the call is made. For
-example, you may have a bunch of `ON_CALL`s in your test fixture to set the common mock behavior shared by all tests in
-the same group, and write (scarcely) different `EXPECT_CALL`s in different `TEST_F`s to verify different aspects of the
-code's behavior. Compared with the style where each `TEST` has many `EXPECT_CALL`s, this leads to tests that are more
-resilient to implementational changes (and thus less likely to require maintenance) and makes the intent of the tests
-more obvious (so they are easier to maintain when you do need to maintain them).
-
-If you are bothered by the "Uninteresting mock function call" message printed when a mock method without
-an `EXPECT_CALL` is called, you may use a `NiceMock`
-instead to suppress all such messages for the mock object, or suppress the message for specific methods by
-adding `EXPECT_CALL(...).Times(AnyNumber())`. DO NOT suppress it by blindly adding an `EXPECT_CALL(...)`, or you'll have
-a test that's a pain to maintain.
+`EXPECT_CALL` adds a constraint on the behavior of the code under test. Having
+more constraints than necessary is *baaad* - even worse than not having enough
+constraints.
+
+This may be counter-intuitive. How could tests that verify more be worse than
+tests that verify less? Isn't verification the whole point of tests?
+
+The answer lies in *what* a test should verify. **A good test verifies the
+contract of the code.** If a test over-specifies, it doesn't leave enough
+freedom to the implementation. As a result, changing the implementation without
+breaking the contract (e.g. refactoring and optimization), which should be
+perfectly fine to do, can break such tests. Then you have to spend time fixing
+them, only to see them broken again the next time the implementation is changed.
+
+Keep in mind that one doesn't have to verify more than one property in one test.
+In fact, **it's a good style to verify only one thing in one test.** If you do
+that, a bug will likely break only one or two tests instead of dozens (which
+case would you rather debug?). If you are also in the habit of giving tests
+descriptive names that tell what they verify, you can often easily guess what's
+wrong just from the test log itself.
+
+So use `ON_CALL` by default, and only use `EXPECT_CALL` when you actually intend
+to verify that the call is made. For example, you may have a bunch of `ON_CALL`s
+in your test fixture to set the common mock behavior shared by all tests in the
+same group, and write (scarcely) different `EXPECT_CALL`s in different `TEST_F`s
+to verify different aspects of the code's behavior. Compared with the style
+where each `TEST` has many `EXPECT_CALL`s, this leads to tests that are more
+resilient to implementational changes (and thus less likely to require
+maintenance) and makes the intent of the tests more obvious (so they are easier
+to maintain when you do need to maintain them).
+
+If you are bothered by the "Uninteresting mock function call" message printed
+when a mock method without an `EXPECT_CALL` is called, you may use a `NiceMock`
+instead to suppress all such messages for the mock object, or suppress the
+message for specific methods by adding `EXPECT_CALL(...).Times(AnyNumber())`. DO
+NOT suppress it by blindly adding an `EXPECT_CALL(...)`, or you'll have a test
+that's a pain to maintain.
 
 ### Ignoring Uninteresting Calls
 
-If you are not interested in how a mock method is called, just don't say anything about it. In this case, if the method
-is ever called, gMock will perform its default action to allow the test program to continue. If you are not happy with
-the default action taken by gMock, you can override it using
+If you are not interested in how a mock method is called, just don't say
+anything about it. In this case, if the method is ever called, gMock will
+perform its default action to allow the test program to continue. If you are not
+happy with the default action taken by gMock, you can override it using
 `DefaultValue<T>::Set()` (described [here](#DefaultValue)) or `ON_CALL()`.
 
 Please note that once you expressed interest in a particular mock method (via
-`EXPECT_CALL()`), all invocations to it must match some expectation. If this function is called but the arguments don't
-match any `EXPECT_CALL()` statement, it will be an error.
+`EXPECT_CALL()`), all invocations to it must match some expectation. If this
+function is called but the arguments don't match any `EXPECT_CALL()` statement,
+it will be an error.
 
 ### Disallowing Unexpected Calls
 
@@ -1433,7 +1564,8 @@ using ::testing::_;
       .Times(0);
 ```
 
-If some calls to the method are allowed, but the rest are not, just list all the expected calls:
+If some calls to the method are allowed, but the rest are not, just list all the
+expected calls:
 
 ```cpp
 using ::testing::AnyNumber;
@@ -1444,7 +1576,8 @@ using ::testing::Gt;
       .Times(AnyNumber());
 ```
 
-A call to `foo.Bar()` that doesn't match any of the `EXPECT_CALL()` statements will be an error.
+A call to `foo.Bar()` that doesn't match any of the `EXPECT_CALL()` statements
+will be an error.
 
 ### Understanding Uninteresting vs Unexpected Calls {#uninteresting-vs-unexpected}
 
@@ -1453,27 +1586,34 @@ A call to `foo.Bar()` that doesn't match any of the `EXPECT_CALL()` statements w
 
 A call `x.Y(...)` is **uninteresting** if there's *not even a single*
 `EXPECT_CALL(x, Y(...))` set. In other words, the test isn't interested in the
-`x.Y()` method at all, as evident in that the test doesn't care to say anything about it.
+`x.Y()` method at all, as evident in that the test doesn't care to say anything
+about it.
 
-A call `x.Y(...)` is **unexpected** if there are *some* `EXPECT_CALL(x, Y(...))`s set, but none of them matches the
-call. Put another way, the test is interested in the `x.Y()` method (therefore it explicitly sets some
-`EXPECT_CALL` to verify how it's called); however, the verification fails as the test doesn't expect this particular
-call to happen.
+A call `x.Y(...)` is **unexpected** if there are *some* `EXPECT_CALL(x,
+Y(...))`s set, but none of them matches the call. Put another way, the test is
+interested in the `x.Y()` method (therefore it explicitly sets some
+`EXPECT_CALL` to verify how it's called); however, the verification fails as the
+test doesn't expect this particular call to happen.
 
-**An unexpected call is always an error,** as the code under test doesn't behave the way the test expects it to behave.
+**An unexpected call is always an error,** as the code under test doesn't behave
+the way the test expects it to behave.
 
-**By default, an uninteresting call is not an error,** as it violates no constraint specified by the test. (gMock's
-philosophy is that saying nothing means there is no constraint.) However, it leads to a warning, as it *might*
-indicate a problem (e.g. the test author might have forgotten to specify a constraint).
+**By default, an uninteresting call is not an error,** as it violates no
+constraint specified by the test. (gMock's philosophy is that saying nothing
+means there is no constraint.) However, it leads to a warning, as it *might*
+indicate a problem (e.g. the test author might have forgotten to specify a
+constraint).
 
 In gMock, `NiceMock` and `StrictMock` can be used to make a mock class "nice" or
 "strict". How does this affect uninteresting calls and unexpected calls?
 
-A **nice mock** suppresses uninteresting call *warnings*. It is less chatty than the default mock, but otherwise is the
-same. If a test fails with a default mock, it will also fail using a nice mock instead. And vice versa. Don't expect
+A **nice mock** suppresses uninteresting call *warnings*. It is less chatty than
+the default mock, but otherwise is the same. If a test fails with a default
+mock, it will also fail using a nice mock instead. And vice versa. Don't expect
 making a mock nice to change the test's result.
 
-A **strict mock** turns uninteresting call warnings into errors. So making a mock strict may change the test's result.
+A **strict mock** turns uninteresting call warnings into errors. So making a
+mock strict may change the test's result.
 
 Let's look at an example:
 
@@ -1489,11 +1629,12 @@ TEST(...) {
 ```
 
 The sole `EXPECT_CALL` here says that all calls to `GetDomainOwner()` must have
-`"google.com"` as the argument. If `GetDomainOwner("yahoo.com")` is called, it will be an unexpected call, and thus an
-error. *Having a nice mock doesn't change the severity of an unexpected call.*
+`"google.com"` as the argument. If `GetDomainOwner("yahoo.com")` is called, it
+will be an unexpected call, and thus an error. *Having a nice mock doesn't
+change the severity of an unexpected call.*
 
-So how do we tell gMock that `GetDomainOwner()` can be called with some other arguments as well? The standard technique
-is to add a "catch all" `EXPECT_CALL`:
+So how do we tell gMock that `GetDomainOwner()` can be called with some other
+arguments as well? The standard technique is to add a "catch all" `EXPECT_CALL`:
 
 ```cpp
   EXPECT_CALL(mock_registry, GetDomainOwner(_))
@@ -1504,7 +1645,8 @@ is to add a "catch all" `EXPECT_CALL`:
 
 Remember that `_` is the wildcard matcher that matches anything. With this, if
 `GetDomainOwner("google.com")` is called, it will do what the second
-`EXPECT_CALL` says; if it is called with a different argument, it will do what the first `EXPECT_CALL` says.
+`EXPECT_CALL` says; if it is called with a different argument, it will do what
+the first `EXPECT_CALL` says.
 
 Note that the order of the two `EXPECT_CALL`s is important, as a newer
 `EXPECT_CALL` takes precedence over an older one.
@@ -1514,8 +1656,8 @@ For more on uninteresting calls, nice mocks, and strict mocks, read
 
 ### Ignoring Uninteresting Arguments {#ParameterlessExpectations}
 
-If your test doesn't care about the parameters (it only cares about the number or order of calls), you can often simply
-omit the parameter list:
+If your test doesn't care about the parameters (it only cares about the number
+or order of calls), you can often simply omit the parameter list:
 
 ```cpp
   // Expect foo.Bar( ... ) twice with any arguments.
@@ -1526,24 +1668,28 @@ omit the parameter list:
       .WillByDefault(&BuildFooForTest);
 ```
 
-This functionality is only available when a method is not overloaded; to prevent unexpected behavior it is a compilation
-error to try to set an expectation on a method where the specific overload is ambiguous. You can work around this by
-supplying a [simpler mock interface](#SimplerInterfaces) than the mocked class provides.
+This functionality is only available when a method is not overloaded; to prevent
+unexpected behavior it is a compilation error to try to set an expectation on a
+method where the specific overload is ambiguous. You can work around this by
+supplying a [simpler mock interface](#SimplerInterfaces) than the mocked class
+provides.
 
-This pattern is also useful when the arguments are interesting, but match logic is substantially complex. You can leave
-the argument list unspecified and use SaveArg actions to [save the values for later verification](#SaveArgVerify). If
-you do that, you can easily differentiate calling the method the wrong number of times from calling it with the wrong
-arguments.
+This pattern is also useful when the arguments are interesting, but match logic
+is substantially complex. You can leave the argument list unspecified and use
+SaveArg actions to [save the values for later verification](#SaveArgVerify). If
+you do that, you can easily differentiate calling the method the wrong number of
+times from calling it with the wrong arguments.
 
 ### Expecting Ordered Calls {#OrderedCalls}
 
-Although an `EXPECT_CALL()` statement defined later takes precedence when gMock tries to match a function call with an
-expectation, by default calls don't have to happen in the order `EXPECT_CALL()` statements are written. For example, if
-the arguments match the matchers in the second `EXPECT_CALL()`, but not those in the first and third, then the second
-expectation will be used.
+Although an `EXPECT_CALL()` statement defined later takes precedence when gMock
+tries to match a function call with an expectation, by default calls don't have
+to happen in the order `EXPECT_CALL()` statements are written. For example, if
+the arguments match the matchers in the second `EXPECT_CALL()`, but not those in
+the first and third, then the second expectation will be used.
 
-If you would rather have all calls occur in the order of the expectations, put the `EXPECT_CALL()` statements in a block
-where you define a variable of type
+If you would rather have all calls occur in the order of the expectations, put
+the `EXPECT_CALL()` statements in a block where you define a variable of type
 `InSequence`:
 
 ```cpp
@@ -1561,34 +1707,39 @@ using ::testing::InSequence;
 ```
 
 In this example, we expect a call to `foo.DoThis(5)`, followed by two calls to
-`bar.DoThat()` where the argument can be anything, which are in turn followed by a call to `foo.DoThis(6)`. If a call
-occurred out-of-order, gMock will report an error.
+`bar.DoThat()` where the argument can be anything, which are in turn followed by
+a call to `foo.DoThis(6)`. If a call occurred out-of-order, gMock will report an
+error.
 
 ### Expecting Partially Ordered Calls {#PartialOrder}
 
-Sometimes requiring everything to occur in a predetermined order can lead to brittle tests. For example, we may care
-about `A` occurring before both `B` and
-`C`, but aren't interested in the relative order of `B` and `C`. In this case, the test should reflect our real intent,
-instead of being overly constraining.
+Sometimes requiring everything to occur in a predetermined order can lead to
+brittle tests. For example, we may care about `A` occurring before both `B` and
+`C`, but aren't interested in the relative order of `B` and `C`. In this case,
+the test should reflect our real intent, instead of being overly constraining.
 
-gMock allows you to impose an arbitrary DAG (directed acyclic graph) on the calls. One way to express the DAG is to use
-the
+gMock allows you to impose an arbitrary DAG (directed acyclic graph) on the
+calls. One way to express the DAG is to use the
 [`After` clause](reference/mocking.md#EXPECT_CALL.After) of `EXPECT_CALL`.
 
 Another way is via the `InSequence()` clause (not the same as the `InSequence`
-class), which we borrowed from jMock 2. It's less flexible than `After()`, but more convenient when you have long chains
-of sequential calls, as it doesn't require you to come up with different names for the expectations in the chains.
+class), which we borrowed from jMock 2. It's less flexible than `After()`, but
+more convenient when you have long chains of sequential calls, as it doesn't
+require you to come up with different names for the expectations in the chains.
 Here's how it works:
 
-If we view `EXPECT_CALL()` statements as nodes in a graph, and add an edge from node A to node B wherever A must occur
-before B, we can get a DAG. We use the term "sequence" to mean a directed path in this DAG. Now, if we decompose the DAG
-into sequences, we just need to know which sequences each `EXPECT_CALL()`
+If we view `EXPECT_CALL()` statements as nodes in a graph, and add an edge from
+node A to node B wherever A must occur before B, we can get a DAG. We use the
+term "sequence" to mean a directed path in this DAG. Now, if we decompose the
+DAG into sequences, we just need to know which sequences each `EXPECT_CALL()`
 belongs to in order to be able to reconstruct the original DAG.
 
 So, to specify the partial order on the expectations we need to do two things:
-first to define some `Sequence` objects, and then for each `EXPECT_CALL()` say which `Sequence` objects it is part of.
+first to define some `Sequence` objects, and then for each `EXPECT_CALL()` say
+which `Sequence` objects it is part of.
 
-Expectations in the same sequence must occur in the order they are written. For example,
+Expectations in the same sequence must occur in the order they are written. For
+example,
 
 ```cpp
 using ::testing::Sequence;
@@ -1612,16 +1763,16 @@ specifies the following DAG (where `s1` is `A -> B`, and `s2` is `A -> C -> D`):
        |
   A ---|
        |
-        +---> C ---> D
+       +---> C ---> D
 ```
 
-This means that A must occur before B and C, and C must occur before D. There's no restriction about the order other
-than these.
+This means that A must occur before B and C, and C must occur before D. There's
+no restriction about the order other than these.
 
 ### Controlling When an Expectation Retires
 
-When a mock method is called, gMock only considers expectations that are still active. An expectation is active when
-created, and becomes inactive (aka
+When a mock method is called, gMock only considers expectations that are still
+active. An expectation is active when created, and becomes inactive (aka
 *retires*) when a call that has to occur later has occurred. For example, in
 
 ```cpp
@@ -1639,10 +1790,11 @@ using ::testing::Sequence;
       .InSequence(s2);
 ```
 
-as soon as either #2 or #3 is matched, #1 will retire. If a warning `"File too large."` is logged after this, it will be
-an error.
+as soon as either #2 or #3 is matched, #1 will retire. If a warning `"File too
+large."` is logged after this, it will be an error.
 
-Note that an expectation doesn't retire automatically when it's saturated. For example,
+Note that an expectation doesn't retire automatically when it's saturated. For
+example,
 
 ```cpp
 using ::testing::_;
@@ -1651,10 +1803,12 @@ using ::testing::_;
   EXPECT_CALL(log, Log(WARNING, _, "File too large."));     // #2
 ```
 
-says that there will be exactly one warning with the message `"File too large."`. If the second warning contains this
-message too, #2 will match again and result in an upper-bound-violated error.
+says that there will be exactly one warning with the message `"File too
+large."`. If the second warning contains this message too, #2 will match again
+and result in an upper-bound-violated error.
 
-If this is not what you want, you can ask an expectation to retire as soon as it becomes saturated:
+If this is not what you want, you can ask an expectation to retire as soon as it
+becomes saturated:
 
 ```cpp
 using ::testing::_;
@@ -1665,7 +1819,8 @@ using ::testing::_;
 ```
 
 Here #2 can be used only once, so if you have two warnings with the message
-`"File too large."`, the first will match #2 and the second will match #1 - there will be no error.
+`"File too large."`, the first will match #2 and the second will match #1 -
+there will be no error.
 
 ## Using Actions
 
@@ -1691,19 +1846,22 @@ class MockFoo : public Foo {
 
 ### Returning Live Values from Mock Methods
 
-The `Return(x)` action saves a copy of `x` when the action is created, and always returns the same value whenever it's
-executed. Sometimes you may want to instead return the *live* value of `x` (i.e. its value at the time when the action
-is *executed*.). Use either `ReturnRef()` or `ReturnPointee()` for this purpose.
+The `Return(x)` action saves a copy of `x` when the action is created, and
+always returns the same value whenever it's executed. Sometimes you may want to
+instead return the *live* value of `x` (i.e. its value at the time when the
+action is *executed*.). Use either `ReturnRef()` or `ReturnPointee()` for this
+purpose.
 
 If the mock function's return type is a reference, you can do it using
-`ReturnRef(x)`, as shown in the previous recipe ("Returning References from Mock Methods"). However, gMock doesn't let
-you use `ReturnRef()` in a mock function whose return type is not a reference, as doing that usually indicates a user
+`ReturnRef(x)`, as shown in the previous recipe ("Returning References from Mock
+Methods"). However, gMock doesn't let you use `ReturnRef()` in a mock function
+whose return type is not a reference, as doing that usually indicates a user
 error. So, what shall you do?
 
 Though you may be tempted, DO NOT use `std::ref()`:
 
 ```cpp
-using testing::Return;
+using ::testing::Return;
 
 class MockFoo : public Foo {
  public:
@@ -1715,7 +1873,7 @@ class MockFoo : public Foo {
   EXPECT_CALL(foo, GetValue())
       .WillRepeatedly(Return(std::ref(x)));  // Wrong!
   x = 42;
-  EXPECT_EQ(42, foo.GetValue());
+  EXPECT_EQ(foo.GetValue(), 42);
 ```
 
 Unfortunately, it doesn't work here. The above code will fail with error:
@@ -1726,31 +1884,32 @@ Value of: foo.GetValue()
 Expected: 42
 ```
 
-The reason is that `Return(*value*)` converts `value` to the actual return type of the mock function at the time when
-the action is *created*, not when it is
-*executed*. (This behavior was chosen for the action to be safe when `value` is a proxy object that references some
-temporary objects.) As a result,
-`std::ref(x)` is converted to an `int` value (instead of a `const int&`) when the expectation is set,
-and `Return(std::ref(x))` will always return 0.
+The reason is that `Return(*value*)` converts `value` to the actual return type
+of the mock function at the time when the action is *created*, not when it is
+*executed*. (This behavior was chosen for the action to be safe when `value` is
+a proxy object that references some temporary objects.) As a result,
+`std::ref(x)` is converted to an `int` value (instead of a `const int&`) when
+the expectation is set, and `Return(std::ref(x))` will always return 0.
 
-`ReturnPointee(pointer)` was provided to solve this problem specifically. It returns the value pointed to by `pointer`
-at the time the action is *executed*:
+`ReturnPointee(pointer)` was provided to solve this problem specifically. It
+returns the value pointed to by `pointer` at the time the action is *executed*:
 
 ```cpp
-using testing::ReturnPointee;
+using ::testing::ReturnPointee;
 ...
   int x = 0;
   MockFoo foo;
   EXPECT_CALL(foo, GetValue())
       .WillRepeatedly(ReturnPointee(&x));  // Note the & here.
   x = 42;
-  EXPECT_EQ(42, foo.GetValue());  // This will succeed now.
+  EXPECT_EQ(foo.GetValue(), 42);  // This will succeed now.
 ```
 
 ### Combining Actions
 
 Want to do more than one thing when a function is called? That's fine. `DoAll()`
-allow you to do sequence of actions every time. Only the return value of the last action in the sequence will be used.
+allows you to do a sequence of actions every time. Only the return value of the
+last action in the sequence will be used.
 
 ```cpp
 using ::testing::_;
@@ -1768,12 +1927,19 @@ class MockFoo : public Foo {
                       action_n));
 ```
 
+The return value of the last action **must** match the return type of the mocked
+method. In the example above, `action_n` could be `Return(true)`, or a lambda
+that returns a `bool`, but not `SaveArg`, which returns `void`. Otherwise the
+signature of `DoAll` would not match the signature expected by `WillOnce`, which
+is the signature of the mocked method, and it wouldn't compile.
+
 ### Verifying Complex Arguments {#SaveArgVerify}
 
-If you want to verify that a method is called with a particular argument but the match criteria is complex, it can be
-difficult to distinguish between cardinality failures (calling the method the wrong number of times) and argument match
-failures. Similarly, if you are matching multiple parameters, it may not be easy to distinguishing which argument failed
-to match. For example:
+If you want to verify that a method is called with a particular argument but the
+match criteria is complex, it can be difficult to distinguish between
+cardinality failures (calling the method the wrong number of times) and argument
+match failures. Similarly, if you are matching multiple parameters, it may not
+be easy to distinguishing which argument failed to match. For example:
 
 ```cpp
   // Not ideal: this could fail because of a problem with arg1 or arg2, or maybe
@@ -1793,8 +1959,9 @@ You can instead save the arguments and test them individually:
 
 ### Mocking Side Effects {#MockingSideEffects}
 
-Sometimes a method exhibits its effect not via returning a value but via side effects. For example, it may change some
-global state or modify an output argument. To mock side effects, in general you can define your own action by
+Sometimes a method exhibits its effect not via returning a value but via side
+effects. For example, it may change some global state or modify an output
+argument. To mock side effects, in general you can define your own action by
 implementing `::testing::ActionInterface`.
 
 If all you need to do is to change an output argument, the built-in
@@ -1818,8 +1985,9 @@ class MockMutator : public Mutator {
 In this example, when `mutator.Mutate()` is called, we will assign 5 to the
 `int` variable pointed to by argument #1 (0-based).
 
-`SetArgPointee()` conveniently makes an internal copy of the value you pass to it, removing the need to keep the value
-in scope and alive. The implication however is that the value must have a copy constructor and assignment operator.
+`SetArgPointee()` conveniently makes an internal copy of the value you pass to
+it, removing the need to keep the value in scope and alive. The implication
+however is that the value must have a copy constructor and assignment operator.
 
 If the mock method also needs to return a value as well, you can chain
 `SetArgPointee()` with `Return()` using `DoAll()`, remembering to put the
@@ -1827,6 +1995,7 @@ If the mock method also needs to return a value as well, you can chain
 
 ```cpp
 using ::testing::_;
+using ::testing::DoAll;
 using ::testing::Return;
 using ::testing::SetArgPointee;
 
@@ -1842,12 +2011,13 @@ class MockMutator : public Mutator {
                       Return(true)));
 ```
 
-Note, however, that if you use the `ReturnOKWith()` method, it will override the values provided by `SetArgPointee()` in
-the response parameters of your function call.
+Note, however, that if you use the `ReturnOKWith()` method, it will override the
+values provided by `SetArgPointee()` in the response parameters of your function
+call.
 
 If the output argument is an array, use the `SetArrayArgument<N>(first, last)`
-action instead. It copies the elements in source range `[first, last)` to the array pointed to by the `N`-th (0-based)
-argument:
+action instead. It copies the elements in source range `[first, last)` to the
+array pointed to by the `N`-th (0-based) argument:
 
 ```cpp
 using ::testing::NotNull;
@@ -1879,10 +2049,7 @@ class MockRolodex : public Rolodex {
 }
 ...
   MockRolodex rolodex;
-  vector<string> names;
-  names.push_back("George");
-  names.push_back("John");
-  names.push_back("Thomas");
+  vector<string> names = {"George", "John", "Thomas"};
   EXPECT_CALL(rolodex, GetNames(_))
       .WillOnce(SetArrayArgument<0>(names.begin(), names.end()));
 ```
@@ -1890,7 +2057,8 @@ class MockRolodex : public Rolodex {
 ### Changing a Mock Object's Behavior Based on the State
 
 If you expect a call to change the behavior of a mock object, you can use
-`::testing::InSequence` to specify different behaviors before and after the call:
+`::testing::InSequence` to specify different behaviors before and after the
+call:
 
 ```cpp
 using ::testing::InSequence;
@@ -1908,10 +2076,11 @@ using ::testing::Return;
   my_mock.FlushIfDirty();
 ```
 
-This makes `my_mock.IsDirty()` return `true` before `my_mock.Flush()` is called and return `false` afterwards.
+This makes `my_mock.IsDirty()` return `true` before `my_mock.Flush()` is called
+and return `false` afterwards.
 
-If the behavior change is more complex, you can store the effects in a variable and make a mock method get its return
-value from that variable:
+If the behavior change is more complex, you can store the effects in a variable
+and make a mock method get its return value from that variable:
 
 ```cpp
 using ::testing::_;
@@ -1933,12 +2102,14 @@ Here `my_mock.GetPrevValue()` will always return the argument of the last
 
 ### Setting the Default Value for a Return Type {#DefaultValue}
 
-If a mock method's return type is a built-in C++ type or pointer, by default it will return 0 when invoked. Also, in C++
-11 and above, a mock method whose return type has a default constructor will return a default-constructed value by
-default. You only need to specify an action if this default value doesn't work for you.
+If a mock method's return type is a built-in C++ type or pointer, by default it
+will return 0 when invoked. Also, in C++ 11 and above, a mock method whose
+return type has a default constructor will return a default-constructed value by
+default. You only need to specify an action if this default value doesn't work
+for you.
 
-Sometimes, you may want to change this default value, or you may want to specify a default value for types gMock doesn't
-know about. You can do this using the
+Sometimes, you may want to change this default value, or you may want to specify
+a default value for types gMock doesn't know about. You can do this using the
 `::testing::DefaultValue` class template:
 
 ```cpp
@@ -1967,15 +2138,16 @@ class MockFoo : public Foo {
   DefaultValue<Bar>::Clear();
 ```
 
-Please note that changing the default value for a type can make your tests hard to understand. We recommend you to use
-this feature judiciously. For example, you may want to make sure the `Set()` and `Clear()` calls are right next to the
+Please note that changing the default value for a type can make your tests hard
+to understand. We recommend you to use this feature judiciously. For example,
+you may want to make sure the `Set()` and `Clear()` calls are right next to the
 code that uses your mock.
 
 ### Setting the Default Actions for a Mock Method
 
-You've learned how to change the default value of a given type. However, this may be too coarse for your purpose:
-perhaps you have two mock methods with the same return type and you want them to have different behaviors.
-The `ON_CALL()`
+You've learned how to change the default value of a given type. However, this
+may be too coarse for your purpose: perhaps you have two mock methods with the
+same return type and you want them to have different behaviors. The `ON_CALL()`
 macro allows you to customize your mock's behavior at the method level:
 
 ```cpp
@@ -1999,13 +2171,15 @@ using ::testing::Return;
   foo.Sign(0);   // This should return 0.
 ```
 
-As you may have guessed, when there are more than one `ON_CALL()` statements, the newer ones in the order take
-precedence over the older ones. In other words, the **last** one that matches the function arguments will be used. This
-matching order allows you to set up the common behavior in a mock object's constructor or the test fixture's set-up
-phase and specialize the mock's behavior later.
+As you may have guessed, when there are more than one `ON_CALL()` statements,
+the newer ones in the order take precedence over the older ones. In other words,
+the **last** one that matches the function arguments will be used. This matching
+order allows you to set up the common behavior in a mock object's constructor or
+the test fixture's set-up phase and specialize the mock's behavior later.
 
-Note that both `ON_CALL` and `EXPECT_CALL` have the same "later statements take precedence" rule, but they don't
-interact. That is, `EXPECT_CALL`s have their own precedence order distinct from the `ON_CALL` precedence order.
+Note that both `ON_CALL` and `EXPECT_CALL` have the same "later statements take
+precedence" rule, but they don't interact. That is, `EXPECT_CALL`s have their
+own precedence order distinct from the `ON_CALL` precedence order.
 
 ### Using Functions/Methods/Functors/Lambdas as Actions {#FunctionsAsActions}
 
@@ -2047,32 +2221,36 @@ class Helper {
 ```
 
 The only requirement is that the type of the function, etc must be *compatible*
-with the signature of the mock function, meaning that the latter's arguments (if it takes any) can be implicitly
-converted to the corresponding arguments of the former, and the former's return type can be implicitly converted to that
-of the latter. So, you can invoke something whose type is *not* exactly the same as the mock function, as long as it's
-safe to do so - nice, huh?
+with the signature of the mock function, meaning that the latter's arguments (if
+it takes any) can be implicitly converted to the corresponding arguments of the
+former, and the former's return type can be implicitly converted to that of the
+latter. So, you can invoke something whose type is *not* exactly the same as the
+mock function, as long as it's safe to do so - nice, huh?
 
 Note that:
 
-* The action takes ownership of the callback and will delete it when the action itself is destructed.
-* If the type of a callback is derived from a base callback type `C`, you need to implicitly cast it to `C` to resolve
-  the overloading, e.g.
+*   The action takes ownership of the callback and will delete it when the
+    action itself is destructed.
+*   If the type of a callback is derived from a base callback type `C`, you need
+    to implicitly cast it to `C` to resolve the overloading, e.g.
 
-  ```cpp
-  using ::testing::Invoke;
-  ...
-    ResultCallback<bool>* is_ok = ...;
-    ... Invoke(is_ok) ...;  // This works.
+    ```cpp
+    using ::testing::Invoke;
+    ...
+      ResultCallback<bool>* is_ok = ...;
+      ... Invoke(is_ok) ...;  // This works.
 
-    BlockingClosure* done = new BlockingClosure;
-    ... Invoke(implicit_cast<Closure*>(done)) ...;  // The cast is necessary.
-  ```
+      BlockingClosure* done = new BlockingClosure;
+      ... Invoke(implicit_cast<Closure*>(done)) ...;  // The cast is necessary.
+    ```
 
 ### Using Functions with Extra Info as Actions
 
-The function or functor you call using `Invoke()` must have the same number of arguments as the mock function you use it
-for. Sometimes you may have a function that takes more arguments, and you are willing to pass in the extra arguments
-yourself to fill the gap. You can do this in gMock using callbacks with pre-bound arguments. Here's an example:
+The function or functor you call using `Invoke()` must have the same number of
+arguments as the mock function you use it for. Sometimes you may have a function
+that takes more arguments, and you are willing to pass in the extra arguments
+yourself to fill the gap. You can do this in gMock using callbacks with
+pre-bound arguments. Here's an example:
 
 ```cpp
 using ::testing::Invoke;
@@ -2092,23 +2270,26 @@ TEST_F(FooTest, Test) {
 
   EXPECT_CALL(foo, DoThis(2))
       .WillOnce(Invoke(NewPermanentCallback(SignOfSum, 5)));
-  EXPECT_EQ('+', foo.DoThis(2));  // Invokes SignOfSum(5, 2).
+  EXPECT_EQ(foo.DoThis(2), '+');  // Invokes SignOfSum(5, 2).
 }
 ```
 
 ### Invoking a Function/Method/Functor/Lambda/Callback Without Arguments
 
-`Invoke()` passes the mock function's arguments to the function, etc being invoked such that the callee has the full
-context of the call to work with. If the invoked function is not interested in some or all of the arguments, it can
+`Invoke()` passes the mock function's arguments to the function, etc being
+invoked such that the callee has the full context of the call to work with. If
+the invoked function is not interested in some or all of the arguments, it can
 simply ignore them.
 
-Yet, a common pattern is that a test author wants to invoke a function without the arguments of the mock function. She
-could do that using a wrapper function that throws away the arguments before invoking an underlining nullary function.
+Yet, a common pattern is that a test author wants to invoke a function without
+the arguments of the mock function. She could do that using a wrapper function
+that throws away the arguments before invoking an underlining nullary function.
 Needless to say, this can be tedious and obscures the intent of the test.
 
-There are two solutions to this problem. First, you can pass any callable of zero args as an action. Alternatively,
-use `InvokeWithoutArgs()`, which is like
-`Invoke()` except that it doesn't pass the mock function's arguments to the callee. Here's an example of each:
+There are two solutions to this problem. First, you can pass any callable of
+zero args as an action. Alternatively, use `InvokeWithoutArgs()`, which is like
+`Invoke()` except that it doesn't pass the mock function's arguments to the
+callee. Here's an example of each:
 
 ```cpp
 using ::testing::_;
@@ -2134,24 +2315,26 @@ bool Job2(int n, char c) { ... }
 
 Note that:
 
-* The action takes ownership of the callback and will delete it when the action itself is destructed.
-* If the type of a callback is derived from a base callback type `C`, you need to implicitly cast it to `C` to resolve
-  the overloading, e.g.
+*   The action takes ownership of the callback and will delete it when the
+    action itself is destructed.
+*   If the type of a callback is derived from a base callback type `C`, you need
+    to implicitly cast it to `C` to resolve the overloading, e.g.
 
-  ```cpp
-  using ::testing::InvokeWithoutArgs;
-  ...
-    ResultCallback<bool>* is_ok = ...;
-    ... InvokeWithoutArgs(is_ok) ...;  // This works.
+    ```cpp
+    using ::testing::InvokeWithoutArgs;
+    ...
+      ResultCallback<bool>* is_ok = ...;
+      ... InvokeWithoutArgs(is_ok) ...;  // This works.
 
-    BlockingClosure* done = ...;
-    ... InvokeWithoutArgs(implicit_cast<Closure*>(done)) ...;
-    // The cast is necessary.
-  ```
+      BlockingClosure* done = ...;
+      ... InvokeWithoutArgs(implicit_cast<Closure*>(done)) ...;
+      // The cast is necessary.
+    ```
 
 ### Invoking an Argument of the Mock Function
 
-Sometimes a mock function will receive a function pointer, a functor (in other words, a "callable") as an argument, e.g.
+Sometimes a mock function will receive a function pointer, a functor (in other
+words, a "callable") as an argument, e.g.
 
 ```cpp
 class MockFoo : public Foo {
@@ -2173,7 +2356,8 @@ using ::testing::_;
       // second argument DoThis() receives.
 ```
 
-{: .callout .note} NOTE: The section below is legacy documentation from before C++ had lambdas:
+{: .callout .note}
+NOTE: The section below is legacy documentation from before C++ had lambdas:
 
 Arghh, you need to refer to a mock function argument but C++ has no lambda
 (yet), so you have to define your own action. :-( Or do you really?
@@ -2185,8 +2369,8 @@ InvokeArgument<N>(arg_1, arg_2, ..., arg_m)
 ```
 
 will invoke the `N`-th (0-based) argument the mock function receives, with
-`arg_1`, `arg_2`, ..., and `arg_m`. No matter if the argument is a function pointer, a functor, or a callback. gMock
-handles them all.
+`arg_1`, `arg_2`, ..., and `arg_m`. No matter if the argument is a function
+pointer, a functor, or a callback. gMock handles them all.
 
 With that, you could write:
 
@@ -2200,7 +2384,8 @@ using ::testing::InvokeArgument;
       // second argument DoThis() receives.
 ```
 
-What if the callable takes an argument by reference? No problem - just wrap it inside `std::ref()`:
+What if the callable takes an argument by reference? No problem - just wrap it
+inside `std::ref()`:
 
 ```cpp
   ...
@@ -2220,9 +2405,11 @@ What if the callable takes an argument by reference? No problem - just wrap it i
       // it, will be passed to the callback.
 ```
 
-What if the callable takes an argument by reference and we do **not** wrap the argument in `std::ref()`?
-Then `InvokeArgument()` will *make a copy* of the argument, and pass a *reference to the copy*, instead of a reference
-to the original value, to the callable. This is especially handy when the argument is a temporary value:
+What if the callable takes an argument by reference and we do **not** wrap the
+argument in `std::ref()`? Then `InvokeArgument()` will *make a copy* of the
+argument, and pass a *reference to the copy*, instead of a reference to the
+original value, to the callable. This is especially handy when the argument is a
+temporary value:
 
 ```cpp
   ...
@@ -2245,10 +2432,10 @@ to the original value, to the callable. This is especially handy when the argume
 
 ### Ignoring an Action's Result
 
-Sometimes you have an action that returns *something*, but you need an action that returns `void` (perhaps you want to
-use it in a mock function that returns
-`void`, or perhaps it needs to be used in `DoAll()` and it's not the last in the list). `IgnoreResult()` lets you do
-that. For example:
+Sometimes you have an action that returns *something*, but you need an action
+that returns `void` (perhaps you want to use it in a mock function that returns
+`void`, or perhaps it needs to be used in `DoAll()` and it's not the last in the
+list). `IgnoreResult()` lets you do that. For example:
 
 ```cpp
 using ::testing::_;
@@ -2283,8 +2470,9 @@ Note that you **cannot** use `IgnoreResult()` on an action that already returns
 
 ### Selecting an Action's Arguments {#SelectingArgs}
 
-Say you have a mock function `Foo()` that takes seven arguments, and you have a custom action that you want to invoke
-when `Foo()` is called. Trouble is, the custom action only wants three arguments:
+Say you have a mock function `Foo()` that takes seven arguments, and you have a
+custom action that you want to invoke when `Foo()` is called. Trouble is, the
+custom action only wants three arguments:
 
 ```cpp
 using ::testing::_;
@@ -2303,8 +2491,8 @@ bool IsVisibleInQuadrant1(bool visible, int x, int y) {
       .WillOnce(Invoke(IsVisibleInQuadrant1));  // Uh, won't compile. :-(
 ```
 
-To please the compiler God, you need to define an "adaptor" that has the same signature as `Foo()` and calls the custom
-action with the right arguments:
+To please the compiler God, you need to define an "adaptor" that has the same
+signature as `Foo()` and calls the custom action with the right arguments:
 
 ```cpp
 using ::testing::_;
@@ -2322,15 +2510,16 @@ bool MyIsVisibleInQuadrant1(bool visible, const string& name, int x, int y,
 
 But isn't this awkward?
 
-gMock provides a generic *action adaptor*, so you can spend your time minding more important business than writing your
-own adaptors. Here's the syntax:
+gMock provides a generic *action adaptor*, so you can spend your time minding
+more important business than writing your own adaptors. Here's the syntax:
 
 ```cpp
 WithArgs<N1, N2, ..., Nk>(action)
 ```
 
-creates an action that passes the arguments of the mock function at the given indices (0-based) to the inner `action`
-and performs it. Using `WithArgs`, our original example can be written as:
+creates an action that passes the arguments of the mock function at the given
+indices (0-based) to the inner `action` and performs it. Using `WithArgs`, our
+original example can be written as:
 
 ```cpp
 using ::testing::_;
@@ -2343,34 +2532,39 @@ using ::testing::WithArgs;
 
 For better readability, gMock also gives you:
 
-* `WithoutArgs(action)` when the inner `action` takes *no* argument, and
-* `WithArg<N>(action)` (no `s` after `Arg`) when the inner `action` takes
-  *one* argument.
+*   `WithoutArgs(action)` when the inner `action` takes *no* argument, and
+*   `WithArg<N>(action)` (no `s` after `Arg`) when the inner `action` takes
+    *one* argument.
 
 As you may have realized, `InvokeWithoutArgs(...)` is just syntactic sugar for
 `WithoutArgs(Invoke(...))`.
 
 Here are more tips:
 
-* The inner action used in `WithArgs` and friends does not have to be
-  `Invoke()` -- it can be anything.
-* You can repeat an argument in the argument list if necessary, e.g.
-  `WithArgs<2, 3, 3, 5>(...)`.
-* You can change the order of the arguments, e.g. `WithArgs<3, 2, 1>(...)`.
-* The types of the selected arguments do *not* have to match the signature of the inner action exactly. It works as long
-  as they can be implicitly converted to the corresponding arguments of the inner action. For example, if the 4-th
-  argument of the mock function is an `int` and `my_action` takes a `double`, `WithArg<4>(my_action)` will work.
+*   The inner action used in `WithArgs` and friends does not have to be
+    `Invoke()` -- it can be anything.
+*   You can repeat an argument in the argument list if necessary, e.g.
+    `WithArgs<2, 3, 3, 5>(...)`.
+*   You can change the order of the arguments, e.g. `WithArgs<3, 2, 1>(...)`.
+*   The types of the selected arguments do *not* have to match the signature of
+    the inner action exactly. It works as long as they can be implicitly
+    converted to the corresponding arguments of the inner action. For example,
+    if the 4-th argument of the mock function is an `int` and `my_action` takes
+    a `double`, `WithArg<4>(my_action)` will work.
 
 ### Ignoring Arguments in Action Functions
 
-The [selecting-an-action's-arguments](#SelectingArgs) recipe showed us one way to make a mock function and an action
-with incompatible argument lists fit together. The downside is that wrapping the action in `WithArgs<...>()` can get
+The [selecting-an-action's-arguments](#SelectingArgs) recipe showed us one way
+to make a mock function and an action with incompatible argument lists fit
+together. The downside is that wrapping the action in `WithArgs<...>()` can get
 tedious for people writing the tests.
 
-If you are defining a function (or method, functor, lambda, callback) to be used with `Invoke*()`, and you are not
-interested in some of its arguments, an alternative to `WithArgs` is to declare the uninteresting arguments as `Unused`.
-This makes the definition less cluttered and less fragile in case the types of the uninteresting arguments change. It
-could also increase the chance the action function can be reused. For example, given
+If you are defining a function (or method, functor, lambda, callback) to be used
+with `Invoke*()`, and you are not interested in some of its arguments, an
+alternative to `WithArgs` is to declare the uninteresting arguments as `Unused`.
+This makes the definition less cluttered and less fragile in case the types of
+the uninteresting arguments change. It could also increase the chance the action
+function can be reused. For example, given
 
 ```cpp
  public:
@@ -2417,13 +2611,16 @@ double DistanceToOrigin(Unused, double x, double y) {
 
 ### Sharing Actions
 
-Just like matchers, a gMock action object consists of a pointer to a ref-counted implementation object. Therefore
-copying actions is also allowed and very efficient. When the last action that references the implementation object dies,
+Just like matchers, a gMock action object consists of a pointer to a ref-counted
+implementation object. Therefore copying actions is also allowed and very
+efficient. When the last action that references the implementation object dies,
 the implementation object will be deleted.
 
-If you have some complex action that you want to use again and again, you may not have to build it from scratch
-everytime. If the action doesn't have an internal state (i.e. if it always does the same thing no matter how many times
-it has been called), you can assign it to an action variable and use that variable repeatedly. For example:
+If you have some complex action that you want to use again and again, you may
+not have to build it from scratch every time. If the action doesn't have an
+internal state (i.e. if it always does the same thing no matter how many times
+it has been called), you can assign it to an action variable and use that
+variable repeatedly. For example:
 
 ```cpp
 using ::testing::Action;
@@ -2436,11 +2633,11 @@ using ::testing::SetArgPointee;
   ... use set_flag in .WillOnce() and .WillRepeatedly() ...
 ```
 
-However, if the action has its own state, you may be surprised if you share the action object. Suppose you have an
-action factory `IncrementCounter(init)` which creates an action that increments and returns a counter whose initial
-value is
-`init`, using two actions created from the same expression and using a shared action will exhibit different behaviors.
-Example:
+However, if the action has its own state, you may be surprised if you share the
+action object. Suppose you have an action factory `IncrementCounter(init)` which
+creates an action that increments and returns a counter whose initial value is
+`init`, using two actions created from the same expression and using a shared
+action will exhibit different behaviors. Example:
 
 ```cpp
   EXPECT_CALL(foo, DoThis())
@@ -2449,8 +2646,8 @@ Example:
       .WillRepeatedly(IncrementCounter(0));
   foo.DoThis();  // Returns 1.
   foo.DoThis();  // Returns 2.
-  foo.DoThat();  // Returns 1 - Blah() uses a different
-                 // counter than Bar()'s.
+  foo.DoThat();  // Returns 1 - DoThat() uses a different
+                 // counter than DoThis()'s.
 ```
 
 versus
@@ -2470,10 +2667,12 @@ using ::testing::Action;
 
 ### Testing Asynchronous Behavior
 
-One oft-encountered problem with gMock is that it can be hard to test asynchronous behavior. Suppose you had
-a `EventQueue` class that you wanted to test, and you created a separate `EventDispatcher` interface so that you could
-easily mock it out. However, the implementation of the class fired all the events on a background thread, which made
-test timings difficult. You could just insert `sleep()` statements and hope for the best, but that makes your test
+One oft-encountered problem with gMock is that it can be hard to test
+asynchronous behavior. Suppose you had a `EventQueue` class that you wanted to
+test, and you created a separate `EventDispatcher` interface so that you could
+easily mock it out. However, the implementation of the class fired all the
+events on a background thread, which made test timings difficult. You could just
+insert `sleep()` statements and hope for the best, but that makes your test
 behavior nondeterministic. A better way is to use gMock actions and
 `Notification` objects to force your asynchronous test to behave synchronously.
 
@@ -2496,29 +2695,34 @@ TEST(EventQueueTest, EnqueueEventTest) {
 }
 ```
 
-In the example above, we set our normal gMock expectations, but then add an additional action to notify
-the `Notification` object. Now we can just call
-`Notification::WaitForNotification()` in the main thread to wait for the asynchronous call to finish. After that, our
-test suite is complete and we can safely exit.
+In the example above, we set our normal gMock expectations, but then add an
+additional action to notify the `Notification` object. Now we can just call
+`Notification::WaitForNotification()` in the main thread to wait for the
+asynchronous call to finish. After that, our test suite is complete and we can
+safely exit.
 
-{: .callout .note} Note: this example has a downside: namely, if the expectation is not satisfied, our test will run
-forever. It will eventually time-out and fail, but it will take longer and be slightly harder to debug. To alleviate
-this problem, you can use `WaitForNotificationWithTimeout(ms)` instead of `WaitForNotification()`.
+{: .callout .note}
+Note: this example has a downside: namely, if the expectation is not satisfied,
+our test will run forever. It will eventually time-out and fail, but it will
+take longer and be slightly harder to debug. To alleviate this problem, you can
+use `WaitForNotificationWithTimeout(ms)` instead of `WaitForNotification()`.
 
 ## Misc Recipes on Using gMock
 
 ### Mocking Methods That Use Move-Only Types
 
-C++11 introduced *move-only types*. A move-only-typed value can be moved from one object to another, but cannot be
-copied. `std::unique_ptr<T>` is probably the most commonly used move-only type.
+C++11 introduced *move-only types*. A move-only-typed value can be moved from
+one object to another, but cannot be copied. `std::unique_ptr<T>` is probably
+the most commonly used move-only type.
 
-Mocking a method that takes and/or returns move-only types presents some challenges, but nothing insurmountable. This
-recipe shows you how you can do it. Note that the support for move-only method arguments was only introduced to gMock in
-April 2017; in older code, you may find more complex
+Mocking a method that takes and/or returns move-only types presents some
+challenges, but nothing insurmountable. This recipe shows you how you can do it.
+Note that the support for move-only method arguments was only introduced to
+gMock in April 2017; in older code, you may find more complex
 [workarounds](#LegacyMoveOnly) for lack of this feature.
 
-Let’s say we are working on a fictional project that lets one post and share snippets called “buzzes”. Your code uses
-these types:
+Let’s say we are working on a fictional project that lets one post and share
+snippets called “buzzes”. Your code uses these types:
 
 ```cpp
 enum class AccessLevel { kInternal, kPublic };
@@ -2540,9 +2744,11 @@ class Buzzer {
 
 A `Buzz` object represents a snippet being posted. A class that implements the
 `Buzzer` interface is capable of creating and sharing `Buzz`es. Methods in
-`Buzzer` may return a `unique_ptr<Buzz>` or take a `unique_ptr<Buzz>`. Now we need to mock `Buzzer` in our tests.
+`Buzzer` may return a `unique_ptr<Buzz>` or take a `unique_ptr<Buzz>`. Now we
+need to mock `Buzzer` in our tests.
 
-To mock a method that accepts or returns move-only types, you just use the familiar `MOCK_METHOD` syntax as usual:
+To mock a method that accepts or returns move-only types, you just use the
+familiar `MOCK_METHOD` syntax as usual:
 
 ```cpp
 class MockBuzzer : public Buzzer {
@@ -2553,75 +2759,79 @@ class MockBuzzer : public Buzzer {
 };
 ```
 
-Now that we have the mock class defined, we can use it in tests. In the following code examples, we assume that we have
-defined a `MockBuzzer` object named `mock_buzzer_`:
+Now that we have the mock class defined, we can use it in tests. In the
+following code examples, we assume that we have defined a `MockBuzzer` object
+named `mock_buzzer_`:
 
 ```cpp
   MockBuzzer mock_buzzer_;
 ```
 
-First let’s see how we can set expectations on the `MakeBuzz()` method, which returns a `unique_ptr<Buzz>`.
+First let’s see how we can set expectations on the `MakeBuzz()` method, which
+returns a `unique_ptr<Buzz>`.
 
 As usual, if you set an expectation without an action (i.e. the `.WillOnce()` or
-`.WillRepeatedly()` clause), when that expectation fires, the default action for that method will be taken.
-Since `unique_ptr<>` has a default constructor that returns a null `unique_ptr`, that’s what you’ll get if you don’t
-specify an action:
+`.WillRepeatedly()` clause), when that expectation fires, the default action for
+that method will be taken. Since `unique_ptr<>` has a default constructor that
+returns a null `unique_ptr`, that’s what you’ll get if you don’t specify an
+action:
 
 ```cpp
+using ::testing::IsNull;
+...
   // Use the default action.
   EXPECT_CALL(mock_buzzer_, MakeBuzz("hello"));
 
   // Triggers the previous EXPECT_CALL.
-  EXPECT_EQ(nullptr, mock_buzzer_.MakeBuzz("hello"));
+  EXPECT_THAT(mock_buzzer_.MakeBuzz("hello"), IsNull());
 ```
 
 If you are not happy with the default action, you can tweak it as usual; see
 [Setting Default Actions](#OnCall).
 
-If you just need to return a pre-defined move-only value, you can use the
-`Return(ByMove(...))` action:
+If you just need to return a move-only value, you can use it in combination with
+`WillOnce`. For example:
 
 ```cpp
-  // When this fires, the unique_ptr<> specified by ByMove(...) will
-  // be returned.
-  EXPECT_CALL(mock_buzzer_, MakeBuzz("world"))
-      .WillOnce(Return(ByMove(MakeUnique<Buzz>(AccessLevel::kInternal))));
-
-  EXPECT_NE(nullptr, mock_buzzer_.MakeBuzz("world"));
+  EXPECT_CALL(mock_buzzer_, MakeBuzz("hello"))
+      .WillOnce(Return(std::make_unique<Buzz>(AccessLevel::kInternal)));
+  EXPECT_NE(nullptr, mock_buzzer_.MakeBuzz("hello"));
 ```
 
-Note that `ByMove()` is essential here - if you drop it, the code won’t compile.
-
-Quiz time! What do you think will happen if a `Return(ByMove(...))` action is performed more than once (e.g. you
-write `... .WillRepeatedly(Return(ByMove(...)));`)? Come think of it, after the first time the action runs, the source
-value will be consumed (since it’s a move-only value), so the next time around, there’s no value to move from -- you’ll
-get a run-time error that `Return(ByMove(...))` can only be run once.
+Quiz time! What do you think will happen if a `Return` action is performed more
+than once (e.g. you write `... .WillRepeatedly(Return(std::move(...)));`)? Come
+think of it, after the first time the action runs, the source value will be
+consumed (since it’s a move-only value), so the next time around, there’s no
+value to move from -- you’ll get a run-time error that `Return(std::move(...))`
+can only be run once.
 
-If you need your mock method to do more than just moving a pre-defined value, remember that you can always use a lambda
-or a callable object, which can do pretty much anything you want:
+If you need your mock method to do more than just moving a pre-defined value,
+remember that you can always use a lambda or a callable object, which can do
+pretty much anything you want:
 
 ```cpp
   EXPECT_CALL(mock_buzzer_, MakeBuzz("x"))
       .WillRepeatedly([](StringPiece text) {
-        return MakeUnique<Buzz>(AccessLevel::kInternal);
+        return std::make_unique<Buzz>(AccessLevel::kInternal);
       });
 
   EXPECT_NE(nullptr, mock_buzzer_.MakeBuzz("x"));
   EXPECT_NE(nullptr, mock_buzzer_.MakeBuzz("x"));
 ```
 
-Every time this `EXPECT_CALL` fires, a new `unique_ptr<Buzz>` will be created and returned. You cannot do this
-with `Return(ByMove(...))`.
+Every time this `EXPECT_CALL` fires, a new `unique_ptr<Buzz>` will be created
+and returned. You cannot do this with `Return(std::make_unique<...>(...))`.
 
-That covers returning move-only values; but how do we work with methods accepting move-only arguments? The answer is
-that they work normally, although some actions will not compile when any of method's arguments are move-only. You can
-always use `Return`, or a [lambda or functor](#FunctionsAsActions):
+That covers returning move-only values; but how do we work with methods
+accepting move-only arguments? The answer is that they work normally, although
+some actions will not compile when any of method's arguments are move-only. You
+can always use `Return`, or a [lambda or functor](#FunctionsAsActions):
 
 ```cpp
   using ::testing::Unused;
 
   EXPECT_CALL(mock_buzzer_, ShareBuzz(NotNull(), _)).WillOnce(Return(true));
-  EXPECT_TRUE(mock_buzzer_.ShareBuzz(MakeUnique<Buzz>(AccessLevel::kInternal)),
+  EXPECT_TRUE(mock_buzzer_.ShareBuzz(std::make_unique<Buzz>(AccessLevel::kInternal)),
               0);
 
   EXPECT_CALL(mock_buzzer_, ShareBuzz(_, _)).WillOnce(
@@ -2630,16 +2840,17 @@ always use `Return`, or a [lambda or functor](#FunctionsAsActions):
 ```
 
 Many built-in actions (`WithArgs`, `WithoutArgs`,`DeleteArg`, `SaveArg`, ...)
-could in principle support move-only arguments, but the support for this is not implemented yet. If this is blocking
-you, please file a bug.
+could in principle support move-only arguments, but the support for this is not
+implemented yet. If this is blocking you, please file a bug.
 
-A few actions (e.g. `DoAll`) copy their arguments internally, so they can never work with non-copyable objects; you'll
-have to use functors instead.
+A few actions (e.g. `DoAll`) copy their arguments internally, so they can never
+work with non-copyable objects; you'll have to use functors instead.
 
 #### Legacy workarounds for move-only types {#LegacyMoveOnly}
 
-Support for move-only function arguments was only introduced to gMock in April of 2017. In older code, you may encounter
-the following workaround for the lack of this feature (it is no longer necessary - we're including it just for
+Support for move-only function arguments was only introduced to gMock in April
+of 2017. In older code, you may encounter the following workaround for the lack
+of this feature (it is no longer necessary - we're including it just for
 reference):
 
 ```cpp
@@ -2652,8 +2863,9 @@ class MockBuzzer : public Buzzer {
 };
 ```
 
-The trick is to delegate the `ShareBuzz()` method to a mock method (let’s call it `DoShareBuzz()`) that does not take
-move-only parameters. Then, instead of setting expectations on `ShareBuzz()`, you set them on the `DoShareBuzz()` mock
+The trick is to delegate the `ShareBuzz()` method to a mock method (let’s call
+it `DoShareBuzz()`) that does not take move-only parameters. Then, instead of
+setting expectations on `ShareBuzz()`, you set them on the `DoShareBuzz()` mock
 method:
 
 ```cpp
@@ -2663,22 +2875,27 @@ method:
   // When one calls ShareBuzz() on the MockBuzzer like this, the call is
   // forwarded to DoShareBuzz(), which is mocked.  Therefore this statement
   // will trigger the above EXPECT_CALL.
-  mock_buzzer_.ShareBuzz(MakeUnique<Buzz>(AccessLevel::kInternal), 0);
+  mock_buzzer_.ShareBuzz(std::make_unique<Buzz>(AccessLevel::kInternal), 0);
 ```
 
 ### Making the Compilation Faster
 
-Believe it or not, the *vast majority* of the time spent on compiling a mock class is in generating its constructor and
-destructor, as they perform non-trivial tasks (e.g. verification of the expectations). What's more, mock methods with
-different signatures have different types and thus their constructors/destructors need to be generated by the compiler
-separately. As a result, if you mock many different types of methods, compiling your mock class can get really slow.
+Believe it or not, the *vast majority* of the time spent on compiling a mock
+class is in generating its constructor and destructor, as they perform
+non-trivial tasks (e.g. verification of the expectations). What's more, mock
+methods with different signatures have different types and thus their
+constructors/destructors need to be generated by the compiler separately. As a
+result, if you mock many different types of methods, compiling your mock class
+can get really slow.
 
-If you are experiencing slow compilation, you can move the definition of your mock class' constructor and destructor out
-of the class body and into a `.cc`
-file. This way, even if you `#include` your mock class in N files, the compiler only needs to generate its constructor
-and destructor once, resulting in a much faster compilation.
+If you are experiencing slow compilation, you can move the definition of your
+mock class' constructor and destructor out of the class body and into a `.cc`
+file. This way, even if you `#include` your mock class in N files, the compiler
+only needs to generate its constructor and destructor once, resulting in a much
+faster compilation.
 
-Let's illustrate the idea using an example. Here's the definition of a mock class before applying this recipe:
+Let's illustrate the idea using an example. Here's the definition of a mock
+class before applying this recipe:
 
 ```cpp
 // File mock_foo.h.
@@ -2727,16 +2944,20 @@ MockFoo::~MockFoo() {}
 
 ### Forcing a Verification
 
-When it's being destroyed, your friendly mock object will automatically verify that all expectations on it have been
-satisfied, and will generate googletest failures if not. This is convenient as it leaves you with one less thing to
-worry about. That is, unless you are not sure if your mock object will be destroyed.
+When it's being destroyed, your friendly mock object will automatically verify
+that all expectations on it have been satisfied, and will generate googletest
+failures if not. This is convenient as it leaves you with one less thing to
+worry about. That is, unless you are not sure if your mock object will be
+destroyed.
 
-How could it be that your mock object won't eventually be destroyed? Well, it might be created on the heap and owned by
-the code you are testing. Suppose there's a bug in that code and it doesn't delete the mock object properly - you could
-end up with a passing test when there's actually a bug.
+How could it be that your mock object won't eventually be destroyed? Well, it
+might be created on the heap and owned by the code you are testing. Suppose
+there's a bug in that code and it doesn't delete the mock object properly - you
+could end up with a passing test when there's actually a bug.
 
-Using a heap checker is a good idea and can alleviate the concern, but its implementation is not 100% reliable. So,
-sometimes you do want to *force* gMock to verify a mock object before it is (hopefully) destructed. You can do this
+Using a heap checker is a good idea and can alleviate the concern, but its
+implementation is not 100% reliable. So, sometimes you do want to *force* gMock
+to verify a mock object before it is (hopefully) destructed. You can do this
 with `Mock::VerifyAndClearExpectations(&mock_object)`:
 
 ```cpp
@@ -2758,22 +2979,26 @@ TEST(MyServerTest, ProcessesRequest) {
 ```
 
 {: .callout .tip}
-**Tip:** The `Mock::VerifyAndClearExpectations()` function returns a `bool` to indicate whether the verification was
-successful (`true` for yes), so you can wrap that function call inside a `ASSERT_TRUE()` if there is no point going
+**Tip:** The `Mock::VerifyAndClearExpectations()` function returns a `bool` to
+indicate whether the verification was successful (`true` for yes), so you can
+wrap that function call inside a `ASSERT_TRUE()` if there is no point going
 further when the verification has failed.
 
-Do not set new expectations after verifying and clearing a mock after its use. Setting expectations after code that
-exercises the mock has undefined behavior. See [Using Mocks in Tests](gmock_for_dummies.md#using-mocks-in-tests) for
-more information.
+Do not set new expectations after verifying and clearing a mock after its use.
+Setting expectations after code that exercises the mock has undefined behavior.
+See [Using Mocks in Tests](gmock_for_dummies.md#using-mocks-in-tests) for more
+information.
 
 ### Using Checkpoints {#UsingCheckPoints}
 
-Sometimes you might want to test a mock object's behavior in phases whose sizes are each manageable, or you might want
-to set more detailed expectations about which API calls invoke which mock functions.
+Sometimes you might want to test a mock object's behavior in phases whose sizes
+are each manageable, or you might want to set more detailed expectations about
+which API calls invoke which mock functions.
 
-A technique you can use is to put the expectations in a sequence and insert calls to a dummy "checkpoint" function at
-specific places. Then you can verify that the mock function calls do happen at the right time. For example, if you are
-exercising the code:
+A technique you can use is to put the expectations in a sequence and insert
+calls to a dummy "checkpoint" function at specific places. Then you can verify
+that the mock function calls do happen at the right time. For example, if you
+are exercising the code:
 
 ```cpp
   Foo(1);
@@ -2808,25 +3033,29 @@ TEST(FooTest, InvokesBarCorrectly) {
 }
 ```
 
-The expectation spec says that the first `Bar("a")` call must happen before checkpoint "1", the second `Bar("a")` call
-must happen after checkpoint "2", and nothing should happen between the two checkpoints. The explicit checkpoints make
+The expectation spec says that the first `Bar("a")` call must happen before
+checkpoint "1", the second `Bar("a")` call must happen after checkpoint "2", and
+nothing should happen between the two checkpoints. The explicit checkpoints make
 it clear which `Bar("a")` is called by which call to `Foo()`.
 
 ### Mocking Destructors
 
-Sometimes you want to make sure a mock object is destructed at the right time, e.g. after `bar->A()` is called but
-before `bar->B()` is called. We already know that you can specify constraints on the [order](#OrderedCalls) of mock
-function calls, so all we need to do is to mock the destructor of the mock function.
+Sometimes you want to make sure a mock object is destructed at the right time,
+e.g. after `bar->A()` is called but before `bar->B()` is called. We already know
+that you can specify constraints on the [order](#OrderedCalls) of mock function
+calls, so all we need to do is to mock the destructor of the mock function.
 
-This sounds simple, except for one problem: a destructor is a special function with special syntax and special
-semantics, and the `MOCK_METHOD` macro doesn't work for it:
+This sounds simple, except for one problem: a destructor is a special function
+with special syntax and special semantics, and the `MOCK_METHOD` macro doesn't
+work for it:
 
 ```cpp
 MOCK_METHOD(void, ~MockFoo, ());  // Won't compile!
 ```
 
-The good news is that you can use a simple pattern to achieve the same effect. First, add a mock function `Die()` to
-your mock class and call it in the destructor, like this:
+The good news is that you can use a simple pattern to achieve the same effect.
+First, add a mock function `Die()` to your mock class and call it in the
+destructor, like this:
 
 ```cpp
 class MockFoo : public Foo {
@@ -2837,8 +3066,9 @@ class MockFoo : public Foo {
 };
 ```
 
-(If the name `Die()` clashes with an existing symbol, choose another name.) Now, we have translated the problem of
-testing when a `MockFoo` object dies to testing when its `Die()` method is called:
+(If the name `Die()` clashes with an existing symbol, choose another name.) Now,
+we have translated the problem of testing when a `MockFoo` object dies to
+testing when its `Die()` method is called:
 
 ```cpp
   MockFoo* foo = new MockFoo;
@@ -2858,35 +3088,41 @@ And that's that.
 
 ### Using gMock and Threads {#UsingThreads}
 
-In a **unit** test, it's best if you could isolate and test a piece of code in a single-threaded context. That avoids
-race conditions and dead locks, and makes debugging your test much easier.
+In a **unit** test, it's best if you could isolate and test a piece of code in a
+single-threaded context. That avoids race conditions and dead locks, and makes
+debugging your test much easier.
 
-Yet most programs are multi-threaded, and sometimes to test something we need to pound on it from more than one thread.
-gMock works for this purpose too.
+Yet most programs are multi-threaded, and sometimes to test something we need to
+pound on it from more than one thread. gMock works for this purpose too.
 
 Remember the steps for using a mock:
 
-1. Create a mock object `foo`.
-2. Set its default actions and expectations using `ON_CALL()` and
-   `EXPECT_CALL()`.
-3. The code under test calls methods of `foo`.
-4. Optionally, verify and reset the mock.
-5. Destroy the mock yourself, or let the code under test destroy it. The destructor will automatically verify it.
+1.  Create a mock object `foo`.
+2.  Set its default actions and expectations using `ON_CALL()` and
+    `EXPECT_CALL()`.
+3.  The code under test calls methods of `foo`.
+4.  Optionally, verify and reset the mock.
+5.  Destroy the mock yourself, or let the code under test destroy it. The
+    destructor will automatically verify it.
 
-If you follow the following simple rules, your mocks and threads can live happily together:
+If you follow the following simple rules, your mocks and threads can live
+happily together:
 
-* Execute your *test code* (as opposed to the code being tested) in *one*
-  thread. This makes your test easy to follow.
-* Obviously, you can do step #1 without locking.
-* When doing step #2 and #5, make sure no other thread is accessing `foo`. Obvious too, huh?
-*   # 3 and #4 can be done either in one thread or in multiple threads - anyway
-    you want. gMock takes care of the locking, so you don't have to do any - unless required by your test logic.
+*   Execute your *test code* (as opposed to the code being tested) in *one*
+    thread. This makes your test easy to follow.
+*   Obviously, you can do step #1 without locking.
+*   When doing step #2 and #5, make sure no other thread is accessing `foo`.
+    Obvious too, huh?
+*   #3 and #4 can be done either in one thread or in multiple threads - anyway
+    you want. gMock takes care of the locking, so you don't have to do any -
+    unless required by your test logic.
 
-If you violate the rules (for example, if you set expectations on a mock while another thread is calling its methods),
-you get undefined behavior. That's not fun, so don't do it.
+If you violate the rules (for example, if you set expectations on a mock while
+another thread is calling its methods), you get undefined behavior. That's not
+fun, so don't do it.
 
-gMock guarantees that the action for a mock function is done in the same thread that called the mock function. For
-example, in
+gMock guarantees that the action for a mock function is done in the same thread
+that called the mock function. For example, in
 
 ```cpp
   EXPECT_CALL(mock, Foo(1))
@@ -2895,73 +3131,80 @@ example, in
       .WillOnce(action2);
 ```
 
-if `Foo(1)` is called in thread 1 and `Foo(2)` is called in thread 2, gMock will execute `action1` in thread 1
-and `action2` in thread 2.
+if `Foo(1)` is called in thread 1 and `Foo(2)` is called in thread 2, gMock will
+execute `action1` in thread 1 and `action2` in thread 2.
 
 gMock does *not* impose a sequence on actions performed in different threads
-(doing so may create deadlocks as the actions may need to cooperate). This means that the execution of `action1`
-and `action2` in the above example *may*
+(doing so may create deadlocks as the actions may need to cooperate). This means
+that the execution of `action1` and `action2` in the above example *may*
 interleave. If this is a problem, you should add proper synchronization logic to
 `action1` and `action2` to make the test thread-safe.
 
-Also, remember that `DefaultValue<T>` is a global resource that potentially affects *all* living mock objects in your
-program. Naturally, you won't want to mess with it from multiple threads or when there still are mocks in action.
+Also, remember that `DefaultValue<T>` is a global resource that potentially
+affects *all* living mock objects in your program. Naturally, you won't want to
+mess with it from multiple threads or when there still are mocks in action.
 
 ### Controlling How Much Information gMock Prints
 
-When gMock sees something that has the potential of being an error (e.g. a mock function with no expectation is called,
-a.k.a. an uninteresting call, which is allowed but perhaps you forgot to explicitly ban the call), it prints some
-warning messages, including the arguments of the function, the return value, and the stack trace. Hopefully this will
-remind you to take a look and see if there is indeed a problem.
+When gMock sees something that has the potential of being an error (e.g. a mock
+function with no expectation is called, a.k.a. an uninteresting call, which is
+allowed but perhaps you forgot to explicitly ban the call), it prints some
+warning messages, including the arguments of the function, the return value, and
+the stack trace. Hopefully this will remind you to take a look and see if there
+is indeed a problem.
 
-Sometimes you are confident that your tests are correct and may not appreciate such friendly messages. Some other times,
-you are debugging your tests or learning about the behavior of the code you are testing, and wish you could observe
-every mock call that happens (including argument values, the return value, and the stack trace). Clearly, one size
-doesn't fit all.
+Sometimes you are confident that your tests are correct and may not appreciate
+such friendly messages. Some other times, you are debugging your tests or
+learning about the behavior of the code you are testing, and wish you could
+observe every mock call that happens (including argument values, the return
+value, and the stack trace). Clearly, one size doesn't fit all.
 
 You can control how much gMock tells you using the `--gmock_verbose=LEVEL`
 command-line flag, where `LEVEL` is a string with three possible values:
 
-* `info`: gMock will print all informational messages, warnings, and errors
-  (most verbose). At this setting, gMock will also log any calls to the
-  `ON_CALL/EXPECT_CALL` macros. It will include a stack trace in
-  "uninteresting call" warnings.
-* `warning`: gMock will print both warnings and errors (less verbose); it will omit the stack traces in "uninteresting
-  call" warnings. This is the default.
-* `error`: gMock will print errors only (least verbose).
+*   `info`: gMock will print all informational messages, warnings, and errors
+    (most verbose). At this setting, gMock will also log any calls to the
+    `ON_CALL/EXPECT_CALL` macros. It will include a stack trace in
+    "uninteresting call" warnings.
+*   `warning`: gMock will print both warnings and errors (less verbose); it will
+    omit the stack traces in "uninteresting call" warnings. This is the default.
+*   `error`: gMock will print errors only (least verbose).
 
-Alternatively, you can adjust the value of that flag from within your tests like so:
+Alternatively, you can adjust the value of that flag from within your tests like
+so:
 
 ```cpp
   ::testing::FLAGS_gmock_verbose = "error";
 ```
 
-If you find gMock printing too many stack frames with its informational or warning messages, remember that you can
-control their amount with the
+If you find gMock printing too many stack frames with its informational or
+warning messages, remember that you can control their amount with the
 `--gtest_stack_trace_depth=max_depth` flag.
 
 Now, judiciously use the right flag to enable gMock serve you better!
 
 ### Gaining Super Vision into Mock Calls
 
-You have a test using gMock. It fails: gMock tells you some expectations aren't satisfied. However, you aren't sure why:
-Is there a typo somewhere in the matchers? Did you mess up the order of the `EXPECT_CALL`s? Or is the code under test
-doing something wrong? How can you find out the cause?
+You have a test using gMock. It fails: gMock tells you some expectations aren't
+satisfied. However, you aren't sure why: Is there a typo somewhere in the
+matchers? Did you mess up the order of the `EXPECT_CALL`s? Or is the code under
+test doing something wrong? How can you find out the cause?
 
 Won't it be nice if you have X-ray vision and can actually see the trace of all
-`EXPECT_CALL`s and mock method calls as they are made? For each call, would you like to see its actual argument values
-and which `EXPECT_CALL` gMock thinks it matches? If you still need some help to figure out who made these calls, how
+`EXPECT_CALL`s and mock method calls as they are made? For each call, would you
+like to see its actual argument values and which `EXPECT_CALL` gMock thinks it
+matches? If you still need some help to figure out who made these calls, how
 about being able to see the complete stack trace at each mock call?
 
 You can unlock this power by running your test with the `--gmock_verbose=info`
 flag. For example, given the test program:
 
 ```cpp
-#include "gmock/gmock.h"
+#include <gmock/gmock.h>
 
-using testing::_;
-using testing::HasSubstr;
-using testing::Return;
+using ::testing::_;
+using ::testing::HasSubstr;
+using ::testing::Return;
 
 class MockFoo {
  public:
@@ -3008,20 +3251,23 @@ Actual function call count doesn't match EXPECT_CALL(mock, F("c", HasSubstr("d")
 [  FAILED  ] Foo.Bar
 ```
 
-Suppose the bug is that the `"c"` in the third `EXPECT_CALL` is a typo and should actually be `"a"`. With the above
-message, you should see that the actual
-`F("a", "good")` call is matched by the first `EXPECT_CALL`, not the third as you thought. From that it should be
-obvious that the third `EXPECT_CALL` is written wrong. Case solved.
+Suppose the bug is that the `"c"` in the third `EXPECT_CALL` is a typo and
+should actually be `"a"`. With the above message, you should see that the actual
+`F("a", "good")` call is matched by the first `EXPECT_CALL`, not the third as
+you thought. From that it should be obvious that the third `EXPECT_CALL` is
+written wrong. Case solved.
 
-If you are interested in the mock call trace but not the stack traces, you can combine `--gmock_verbose=info`
-with `--gtest_stack_trace_depth=0` on the test command line.
+If you are interested in the mock call trace but not the stack traces, you can
+combine `--gmock_verbose=info` with `--gtest_stack_trace_depth=0` on the test
+command line.
 
 ### Running Tests in Emacs
 
 If you build and run your tests in Emacs using the `M-x google-compile` command
-(as many googletest users do), the source file locations of gMock and googletest errors will be highlighted. Just
-press `<Enter>` on one of them and you'll be taken to the offending line. Or, you can just type `C-x`` to jump to the
-next error.
+(as many googletest users do), the source file locations of gMock and googletest
+errors will be highlighted. Just press `<Enter>` on one of them and you'll be
+taken to the offending line. Or, you can just type `C-x`` to jump to the next
+error.
 
 To make it even easier, you can add the following lines to your `~/.emacs` file:
 
@@ -3031,37 +3277,42 @@ To make it even easier, you can add the following lines to your `~/.emacs` file:
 (global-set-key [M-up]  '(lambda () (interactive) (next-error -1)))
 ```
 
-Then you can type `M-m` to start a build (if you want to run the test as well, just make sure `foo_test.run`
-or `runtests` is in the build command you supply after typing `M-m`), or `M-up`/`M-down` to move back and forth between
-errors.
+Then you can type `M-m` to start a build (if you want to run the test as well,
+just make sure `foo_test.run` or `runtests` is in the build command you supply
+after typing `M-m`), or `M-up`/`M-down` to move back and forth between errors.
 
 ## Extending gMock
 
 ### Writing New Matchers Quickly {#NewMatchers}
 
-{: .callout .warning} WARNING: gMock does not guarantee when or how many times a matcher will be invoked. Therefore, all
-matchers must be functionally pure. See
+{: .callout .warning}
+WARNING: gMock does not guarantee when or how many times a matcher will be
+invoked. Therefore, all matchers must be functionally pure. See
 [this section](#PureMatchers) for more details.
 
-The `MATCHER*` family of macros can be used to define custom matchers easily. The syntax:
+The `MATCHER*` family of macros can be used to define custom matchers easily.
+The syntax:
 
 ```cpp
 MATCHER(name, description_string_expression) { statements; }
 ```
 
-will define a matcher with the given name that executes the statements, which must return a `bool` to indicate if the
-match succeeds. Inside the statements, you can refer to the value being matched by `arg`, and refer to its type by
+will define a matcher with the given name that executes the statements, which
+must return a `bool` to indicate if the match succeeds. Inside the statements,
+you can refer to the value being matched by `arg`, and refer to its type by
 `arg_type`.
 
-The *description string* is a `string`-typed expression that documents what the matcher does, and is used to generate
-the failure message when the match fails. It can (and should) reference the special `bool` variable `negation`, and
-should evaluate to the description of the matcher when `negation` is `false`, or that of the matcher's negation
-when `negation` is `true`.
+The *description string* is a `string`-typed expression that documents what the
+matcher does, and is used to generate the failure message when the match fails.
+It can (and should) reference the special `bool` variable `negation`, and should
+evaluate to the description of the matcher when `negation` is `false`, or that
+of the matcher's negation when `negation` is `true`.
 
-For convenience, we allow the description string to be empty (`""`), in which case gMock will use the sequence of words
-in the matcher name as the description.
+For convenience, we allow the description string to be empty (`""`), in which
+case gMock will use the sequence of words in the matcher name as the
+description.
 
-For example:
+#### Basic Example
 
 ```cpp
 MATCHER(IsDivisibleBy7, "") { return (arg % 7) == 0; }
@@ -3096,11 +3347,13 @@ If the above assertions fail, they will print something like:
     Actual: 21
 ```
 
-where the descriptions `"is divisible by 7"` and `"not (is divisible by 7)"` are automatically calculated from the
-matcher name `IsDivisibleBy7`.
+where the descriptions `"is divisible by 7"` and `"not (is divisible by 7)"` are
+automatically calculated from the matcher name `IsDivisibleBy7`.
 
-As you may have noticed, the auto-generated descriptions (especially those for the negation) may not be so great. You
-can always override them with a `string`
+#### Adding Custom Failure Messages
+
+As you may have noticed, the auto-generated descriptions (especially those for
+the negation) may not be so great. You can always override them with a `string`
 expression of your own:
 
 ```cpp
@@ -3111,7 +3364,8 @@ MATCHER(IsDivisibleBy7,
 ```
 
 Optionally, you can stream additional information to a hidden argument named
-`result_listener` to explain the match result. For example, a better definition of `IsDivisibleBy7` is:
+`result_listener` to explain the match result. For example, a better definition
+of `IsDivisibleBy7` is:
 
 ```cpp
 MATCHER(IsDivisibleBy7, "") {
@@ -3131,26 +3385,60 @@ With this definition, the above assertion will give a better message:
     Actual: 27 (the remainder is 6)
 ```
 
-You should let `MatchAndExplain()` print *any additional information* that can help a user understand the match result.
-Note that it should explain why the match succeeds in case of a success (unless it's obvious) - this is useful when the
-matcher is used inside `Not()`. There is no need to print the argument value itself, as gMock already prints it for you.
+#### Using EXPECT_ Statements in Matchers
+
+You can also use `EXPECT_...` statements inside custom matcher definitions. In
+many cases, this allows you to write your matcher more concisely while still
+providing an informative error message. For example:
+
+```cpp
+MATCHER(IsDivisibleBy7, "") {
+  const auto remainder = arg % 7;
+  EXPECT_EQ(remainder, 0);
+  return true;
+}
+```
+
+If you write a test that includes the line `EXPECT_THAT(27, IsDivisibleBy7());`,
+you will get an error something like the following:
 
-{: .callout .note} NOTE: The type of the value being matched (`arg_type`) is determined by the context in which you use
-the matcher and is supplied to you by the compiler, so you don't need to worry about declaring it (nor can you). This
-allows the matcher to be polymorphic. For example, `IsDivisibleBy7()` can be used to match any type where the value
-of `(arg % 7) == 0` can be implicitly converted to a
-`bool`. In the `Bar(IsDivisibleBy7())` example above, if method `Bar()` takes an
-`int`, `arg_type` will be `int`; if it takes an `unsigned long`, `arg_type` will be `unsigned long`; and so on.
+```shell
+Expected equality of these values:
+  remainder
+    Which is: 6
+  0
+```
+
+#### `MatchAndExplain`
+
+You should let `MatchAndExplain()` print *any additional information* that can
+help a user understand the match result. Note that it should explain why the
+match succeeds in case of a success (unless it's obvious) - this is useful when
+the matcher is used inside `Not()`. There is no need to print the argument value
+itself, as gMock already prints it for you.
+
+#### Argument Types
+
+The type of the value being matched (`arg_type`) is determined by the context in
+which you use the matcher and is supplied to you by the compiler, so you don't
+need to worry about declaring it (nor can you). This allows the matcher to be
+polymorphic. For example, `IsDivisibleBy7()` can be used to match any type where
+the value of `(arg % 7) == 0` can be implicitly converted to a `bool`. In the
+`Bar(IsDivisibleBy7())` example above, if method `Bar()` takes an `int`,
+`arg_type` will be `int`; if it takes an `unsigned long`, `arg_type` will be
+`unsigned long`; and so on.
 
 ### Writing New Parameterized Matchers Quickly
 
-Sometimes you'll want to define a matcher that has parameters. For that you can use the macro:
+Sometimes you'll want to define a matcher that has parameters. For that you can
+use the macro:
 
 ```cpp
 MATCHER_P(name, param_name, description_string) { statements; }
 ```
 
-where the description string can be either `""` or a `string` expression that references `negation` and `param_name`.
+where the description string can be either `""` or a `string` expression that
+references `negation` and `param_name`.
 
 For example:
 
@@ -3172,21 +3460,26 @@ which may lead to this message (assuming `n` is 10):
     Actual: -9
 ```
 
-Note that both the matcher description and its parameter are printed, making the message human-friendly.
+Note that both the matcher description and its parameter are printed, making the
+message human-friendly.
 
-In the matcher definition body, you can write `foo_type` to reference the type of a parameter named `foo`. For example,
-in the body of
-`MATCHER_P(HasAbsoluteValue, value)` above, you can write `value_type` to refer to the type of `value`.
+In the matcher definition body, you can write `foo_type` to reference the type
+of a parameter named `foo`. For example, in the body of
+`MATCHER_P(HasAbsoluteValue, value)` above, you can write `value_type` to refer
+to the type of `value`.
 
-gMock also provides `MATCHER_P2`, `MATCHER_P3`, ..., up to `MATCHER_P10` to support multi-parameter matchers:
+gMock also provides `MATCHER_P2`, `MATCHER_P3`, ..., up to `MATCHER_P10` to
+support multi-parameter matchers:
 
 ```cpp
 MATCHER_Pk(name, param_1, ..., param_k, description_string) { statements; }
 ```
 
-Please note that the custom description string is for a particular *instance* of the matcher, where the parameters have
-been bound to actual values. Therefore usually you'll want the parameter values to be part of the description. gMock
-lets you do that by referencing the matcher parameters in the description string expression.
+Please note that the custom description string is for a particular *instance* of
+the matcher, where the parameters have been bound to actual values. Therefore
+usually you'll want the parameter values to be part of the description. gMock
+lets you do that by referencing the matcher parameters in the description string
+expression.
 
 For example,
 
@@ -3207,8 +3500,9 @@ would generate a failure that contains the message:
   Expected: is in range [4, 6]
 ```
 
-If you specify `""` as the description, the failure message will contain the sequence of words in the matcher name
-followed by the parameter values printed as a tuple. For example,
+If you specify `""` as the description, the failure message will contain the
+sequence of words in the matcher name followed by the parameter values printed
+as a tuple. For example,
 
 ```cpp
   MATCHER_P2(InClosedRange, low, hi, "") { ... }
@@ -3236,19 +3530,24 @@ FooMatcherPk<p1_type, ..., pk_type>
 Foo(p1_type p1, ..., pk_type pk) { ... }
 ```
 
-When you write `Foo(v1, ..., vk)`, the compiler infers the types of the parameters `v1`, ..., and `vk` for you. If you
-are not happy with the result of the type inference, you can specify the types by explicitly instantiating the template,
-as in `Foo<long, bool>(5, false)`. As said earlier, you don't get to
-(or need to) specify `arg_type` as that's determined by the context in which the matcher is used.
+When you write `Foo(v1, ..., vk)`, the compiler infers the types of the
+parameters `v1`, ..., and `vk` for you. If you are not happy with the result of
+the type inference, you can specify the types by explicitly instantiating the
+template, as in `Foo<long, bool>(5, false)`. As said earlier, you don't get to
+(or need to) specify `arg_type` as that's determined by the context in which the
+matcher is used.
 
 You can assign the result of expression `Foo(p1, ..., pk)` to a variable of type
-`FooMatcherPk<p1_type, ..., pk_type>`. This can be useful when composing matchers. Matchers that don't have a parameter
-or have only one parameter have special types: you can assign `Foo()` to a `FooMatcher`-typed variable, and
+`FooMatcherPk<p1_type, ..., pk_type>`. This can be useful when composing
+matchers. Matchers that don't have a parameter or have only one parameter have
+special types: you can assign `Foo()` to a `FooMatcher`-typed variable, and
 assign `Foo(p)` to a `FooMatcherP<p_type>`-typed variable.
 
-While you can instantiate a matcher template with reference types, passing the parameters by pointer usually makes your
-code more readable. If, however, you still want to pass a parameter by reference, be aware that in the failure message
-generated by the matcher you will see the value of the referenced object but not its address.
+While you can instantiate a matcher template with reference types, passing the
+parameters by pointer usually makes your code more readable. If, however, you
+still want to pass a parameter by reference, be aware that in the failure
+message generated by the matcher you will see the value of the referenced object
+but not its address.
 
 You can overload matchers with different numbers of parameters:
 
@@ -3257,18 +3556,26 @@ MATCHER_P(Blah, a, description_string_1) { ... }
 MATCHER_P2(Blah, a, b, description_string_2) { ... }
 ```
 
-While it's tempting to always use the `MATCHER*` macros when defining a new matcher, you should also consider
-implementing the matcher interface directly instead (see the recipes that follow), especially if you need to use the
-matcher a lot. While these approaches require more work, they give you more control on the types of the value being
-matched and the matcher parameters, which in general leads to better compiler error messages that pay off in the long
-run. They also allow overloading matchers based on parameter types (as opposed to just based on the number of
-parameters).
+While it's tempting to always use the `MATCHER*` macros when defining a new
+matcher, you should also consider implementing the matcher interface directly
+instead (see the recipes that follow), especially if you need to use the matcher
+a lot. While these approaches require more work, they give you more control on
+the types of the value being matched and the matcher parameters, which in
+general leads to better compiler error messages that pay off in the long run.
+They also allow overloading matchers based on parameter types (as opposed to
+just based on the number of parameters).
 
 ### Writing New Monomorphic Matchers
 
-A matcher of argument type `T` implements the matcher interface for `T` and does two things: it tests whether a value of
-type `T` matches the matcher, and can describe what kind of values it matches. The latter ability is used for generating
-readable error messages when expectations are violated.
+A matcher of type `testing::Matcher<T>` implements the matcher interface for `T`
+and does two things: it tests whether a value of type `T` matches the matcher,
+and can describe what kind of values it matches. The latter ability is used for
+generating readable error messages when expectations are violated. Some matchers
+can even explain why it matches or doesn't match a certain value, which can be
+helpful when the reason isn't obvious.
+
+Because a matcher of type `testing::Matcher<T>` for a particular type `T` can
+only be used to match a value of type `T`, we call it "monomorphic."
 
 A matcher of `T` must declare a typedef like:
 
@@ -3290,13 +3597,16 @@ matcher.DescribeNegationTo(os);
 // where `os` is of type `std::ostream*`.
 ```
 
-If you need a custom matcher but `Truly()` is not a good option (for example, you may not be happy with the
-way `Truly(predicate)` describes itself, or you may want your matcher to be polymorphic as `Eq(value)` is), you can
-define a matcher to do whatever you want in two steps: first implement the matcher interface, and then define a factory
-function to create a matcher instance. The second step is not strictly needed but it makes the syntax of using the
-matcher nicer.
+If you need a custom matcher but `Truly()` is not a good option (for example,
+you may not be happy with the way `Truly(predicate)` describes itself, or you
+may want your matcher to be polymorphic as `Eq(value)` is), you can define a
+matcher to do whatever you want in two steps: first implement the matcher
+interface, and then define a factory function to create a matcher instance. The
+second step is not strictly needed but it makes the syntax of using the matcher
+nicer.
 
-For example, you can define a matcher to test whether an `int` is divisible by 7 and then use it like this:
+For example, you can define a matcher to test whether an `int` is divisible by 7
+and then use it like this:
 
 ```cpp
 using ::testing::Matcher;
@@ -3351,12 +3661,22 @@ Expected: is divisible by 7
   Actual: 23 (the remainder is 2)
 ```
 
-{: .callout .tip} Tip: for convenience, `MatchAndExplain()` can take a `MatchResultListener*`
+{: .callout .tip}
+Tip: for convenience, `MatchAndExplain()` can take a `MatchResultListener*`
 instead of `std::ostream*`.
 
 ### Writing New Polymorphic Matchers
 
-Expanding what we learned above to *polymorphic* matchers is now just as simple as adding templates in the right place.
+Unlike a monomorphic matcher, which can only be used to match a value of a
+particular type, a *polymorphic* matcher is one that can be used to match values
+of multiple types. For example, `Eq(5)` is a polymorhpic matcher as it can be
+used to match an `int`, a `double`, a `float`, and so on. You should think of a
+polymorphic matcher as a *matcher factory* as opposed to a
+`testing::Matcher<SomeType>` - itself is not an actual matcher, but can be
+implicitly converted to a `testing::Matcher<SomeType>` depending on the context.
+
+Expanding what we learned above to polymorphic matchers is now as simple as
+adding templates in the right place.
 
 ```cpp
 
@@ -3394,8 +3714,9 @@ NotNullMatcher NotNull() {
 
 ### Legacy Matcher Implementation
 
-Defining matchers used to be somewhat more complicated, in which it required several supporting classes and virtual
-functions. To implement a matcher for type `T` using the legacy API you have to derive from `MatcherInterface<T>` and
+Defining matchers used to be somewhat more complicated, in which it required
+several supporting classes and virtual functions. To implement a matcher for
+type `T` using the legacy API you have to derive from `MatcherInterface<T>` and
 call `MakeMatcher` to construct the object.
 
 The interface looks like this:
@@ -3430,8 +3751,9 @@ class MatcherInterface {
 };
 ```
 
-Fortunately, most of the time you can define a polymorphic matcher easily with the help of `MakePolymorphicMatcher()`.
-Here's how you can define `NotNull()` as an example:
+Fortunately, most of the time you can define a polymorphic matcher easily with
+the help of `MakePolymorphicMatcher()`. Here's how you can define `NotNull()` as
+an example:
 
 ```cpp
 using ::testing::MakePolymorphicMatcher;
@@ -3474,19 +3796,41 @@ PolymorphicMatcher<NotNullMatcher> NotNull() {
 
 {: .callout .note}
 **Note:** Your polymorphic matcher class does **not** need to inherit from
-`MatcherInterface` or any other class, and its methods do **not** need to be virtual.
-
-Like in a monomorphic matcher, you may explain the match result by streaming additional information to the `listener`
-argument in `MatchAndExplain()`.
+`MatcherInterface` or any other class, and its methods do **not** need to be
+virtual.
+
+Like in a monomorphic matcher, you may explain the match result by streaming
+additional information to the `listener` argument in `MatchAndExplain()`.
+
+### Implementing Composite Matchers {#CompositeMatchers}
+
+Sometimes we want to define a matcher that takes other matchers as parameters.
+For example, `DistanceFrom(target, m)` is a polymorphic matcher that takes a
+matcher `m` as a parameter. It tests that the distance from `target` to the
+value being matched satisfies sub-matcher `m`.
+
+If you are implementing such a composite matcher, you'll need to generate the
+description of the matcher based on the description(s) of its sub-matcher(s).
+You can see the implementation of `DistanceFrom()` in
+`googlemock/include/gmock/gmock-matchers.h` for an example. In particular, pay
+attention to `DistanceFromMatcherImpl`. Notice that it stores the sub-matcher as
+a `const Matcher<const Distance&> distance_matcher_` instead of a polymorphic
+matcher - this allows it to call `distance_matcher_.DescribeTo(os)` to describe
+the sub-matcher. If the sub-matcher is stored as a polymorphic matcher instead,
+it would not be possible to get its description as in general polymorphic
+matchers don't know how to describe themselves - they are matcher factories
+instead of actual matchers; only after being converted to `Matcher<SomeType>`
+can they be described.
 
 ### Writing New Cardinalities
 
-A cardinality is used in `Times()` to tell gMock how many times you expect a call to occur. It doesn't have to be exact.
-For example, you can say
+A cardinality is used in `Times()` to tell gMock how many times you expect a
+call to occur. It doesn't have to be exact. For example, you can say
 `AtLeast(5)` or `Between(2, 4)`.
 
-If the [built-in set](gmock_cheat_sheet.md#CardinalityList) of cardinalities doesn't suit you, you are free to define
-your own by implementing the following interface (in namespace `testing`):
+If the [built-in set](gmock_cheat_sheet.md#CardinalityList) of cardinalities
+doesn't suit you, you are free to define your own by implementing the following
+interface (in namespace `testing`):
 
 ```cpp
 class CardinalityInterface {
@@ -3505,7 +3849,8 @@ class CardinalityInterface {
 };
 ```
 
-For example, to specify that a call must occur even number of times, you can write
+For example, to specify that a call must occur even number of times, you can
+write
 
 ```cpp
 using ::testing::Cardinality;
@@ -3536,39 +3881,81 @@ Cardinality EvenNumber() {
       .Times(EvenNumber());
 ```
 
-### Writing New Actions Quickly {#QuickNewActions}
+### Writing New Actions {#QuickNewActions}
 
-If the built-in actions don't work for you, you can easily define your own one. Just define a functor class with a (
-possibly templated) call operator, matching the signature of your action.
+If the built-in actions don't work for you, you can easily define your own one.
+All you need is a call operator with a signature compatible with the mocked
+function. So you can use a lambda:
 
 ```cpp
-struct Increment {
-  template <typename T>
-  T operator()(T* arg) {
-    return ++(*arg);
-  }
-}
+MockFunction<int(int)> mock;
+EXPECT_CALL(mock, Call).WillOnce([](const int input) { return input * 7; });
+EXPECT_EQ(mock.AsStdFunction()(2), 14);
 ```
 
-The same approach works with stateful functors (or any callable, really):
+Or a struct with a call operator (even a templated one):
 
-```
+```cpp
 struct MultiplyBy {
   template <typename T>
   T operator()(T arg) { return arg * multiplier; }
 
   int multiplier;
-}
+};
 
 // Then use:
 // EXPECT_CALL(...).WillOnce(MultiplyBy{7});
 ```
 
+It's also fine for the callable to take no arguments, ignoring the arguments
+supplied to the mock function:
+
+```cpp
+MockFunction<int(int)> mock;
+EXPECT_CALL(mock, Call).WillOnce([] { return 17; });
+EXPECT_EQ(mock.AsStdFunction()(0), 17);
+```
+
+When used with `WillOnce`, the callable can assume it will be called at most
+once and is allowed to be a move-only type:
+
+```cpp
+// An action that contains move-only types and has an &&-qualified operator,
+// demanding in the type system that it be called at most once. This can be
+// used with WillOnce, but the compiler will reject it if handed to
+// WillRepeatedly.
+struct MoveOnlyAction {
+  std::unique_ptr<int> move_only_state;
+  std::unique_ptr<int> operator()() && { return std::move(move_only_state); }
+};
+
+MockFunction<std::unique_ptr<int>()> mock;
+EXPECT_CALL(mock, Call).WillOnce(MoveOnlyAction{std::make_unique<int>(17)});
+EXPECT_THAT(mock.AsStdFunction()(), Pointee(Eq(17)));
+```
+
+More generally, to use with a mock function whose signature is `R(Args...)` the
+object can be anything convertible to `OnceAction<R(Args...)>` or
+`Action<R(Args...)`>. The difference between the two is that `OnceAction` has
+weaker requirements (`Action` requires a copy-constructible input that can be
+called repeatedly whereas `OnceAction` requires only move-constructible and
+supports `&&`-qualified call operators), but can be used only with `WillOnce`.
+`OnceAction` is typically relevant only when supporting move-only types or
+actions that want a type-system guarantee that they will be called at most once.
+
+Typically the `OnceAction` and `Action` templates need not be referenced
+directly in your actions: a struct or class with a call operator is sufficient,
+as in the examples above. But fancier polymorphic actions that need to know the
+specific return type of the mock function can define templated conversion
+operators to make that possible. See `gmock-actions.h` for examples.
+
 #### Legacy macro-based Actions
 
-Before C++11, the functor-based actions were not supported; the old way of writing actions was through a set
-of `ACTION*` macros. We suggest to avoid them in new code; they hide a lot of logic behind the macro, potentially
-leading to harder-to-understand compiler errors. Nevertheless, we cover them here for completeness.
+Before C++11, the functor-based actions were not supported; the old way of
+writing actions was through a set of `ACTION*` macros. We suggest to avoid them
+in new code; they hide a lot of logic behind the macro, potentially leading to
+harder-to-understand compiler errors. Nevertheless, we cover them here for
+completeness.
 
 By writing
 
@@ -3576,10 +3963,10 @@ By writing
 ACTION(name) { statements; }
 ```
 
-in a namespace scope (i.e. not inside a class or function), you will define an action with the given name that executes
-the statements. The value returned by
-`statements` will be used as the return value of the action. Inside the statements, you can refer to the K-th (0-based)
-argument of the mock function as
+in a namespace scope (i.e. not inside a class or function), you will define an
+action with the given name that executes the statements. The value returned by
+`statements` will be used as the return value of the action. Inside the
+statements, you can refer to the K-th (0-based) argument of the mock function as
 `argK`. For example:
 
 ```cpp
@@ -3592,10 +3979,10 @@ allows you to write
 ... WillOnce(IncrementArg1());
 ```
 
-Note that you don't need to specify the types of the mock function arguments. Rest assured that your code is type-safe
-though: you'll get a compiler error if
-`*arg1` doesn't support the `++` operator, or if the type of `++(*arg1)` isn't compatible with the mock function's
-return type.
+Note that you don't need to specify the types of the mock function arguments.
+Rest assured that your code is type-safe though: you'll get a compiler error if
+`*arg1` doesn't support the `++` operator, or if the type of `++(*arg1)` isn't
+compatible with the mock function's return type.
 
 Another example:
 
@@ -3608,10 +3995,12 @@ ACTION(Foo) {
 }
 ```
 
-defines an action `Foo()` that invokes argument #2 (a function pointer) with 5, calls function `Blah()`, sets the value
-pointed to by argument #1 to 0, and returns argument #0.
+defines an action `Foo()` that invokes argument #2 (a function pointer) with 5,
+calls function `Blah()`, sets the value pointed to by argument #1 to 0, and
+returns argument #0.
 
-For more convenience and flexibility, you can also use the following pre-defined symbols in the body of `ACTION`:
+For more convenience and flexibility, you can also use the following pre-defined
+symbols in the body of `ACTION`:
 
 `argK_type`     | The type of the K-th (0-based) argument of the mock function
 :-------------- | :-----------------------------------------------------------
@@ -3641,7 +4030,8 @@ Pre-defined Symbol | Is Bound To
 
 #### Legacy macro-based parameterized Actions
 
-Sometimes you'll want to parameterize an action you define. For that we have another macro
+Sometimes you'll want to parameterize an action you define. For that we have
+another macro
 
 ```cpp
 ACTION_P(name, param) { statements; }
@@ -3660,15 +4050,18 @@ will allow you to write
 ... WillOnce(Add(5));
 ```
 
-For convenience, we use the term *arguments* for the values used to invoke the mock function, and the term *parameters*
-for the values used to instantiate an action.
+For convenience, we use the term *arguments* for the values used to invoke the
+mock function, and the term *parameters* for the values used to instantiate an
+action.
 
-Note that you don't need to provide the type of the parameter either. Suppose the parameter is named `param`, you can
-also use the gMock-defined symbol
-`param_type` to refer to the type of the parameter as inferred by the compiler. For example, in the body
-of `ACTION_P(Add, n)` above, you can write `n_type` for the type of `n`.
+Note that you don't need to provide the type of the parameter either. Suppose
+the parameter is named `param`, you can also use the gMock-defined symbol
+`param_type` to refer to the type of the parameter as inferred by the compiler.
+For example, in the body of `ACTION_P(Add, n)` above, you can write `n_type` for
+the type of `n`.
 
-gMock also provides `ACTION_P2`, `ACTION_P3`, and etc to support multi-parameter actions. For example,
+gMock also provides `ACTION_P2`, `ACTION_P3`, and etc to support multi-parameter
+actions. For example,
 
 ```cpp
 ACTION_P2(ReturnDistanceTo, x, y) {
@@ -3684,7 +4077,8 @@ lets you write
 ... WillOnce(ReturnDistanceTo(5.0, 26.5));
 ```
 
-You can view `ACTION` as a degenerated parameterized action where the number of parameters is 0.
+You can view `ACTION` as a degenerated parameterized action where the number of
+parameters is 0.
 
 You can also easily define actions overloaded on the number of parameters:
 
@@ -3695,10 +4089,12 @@ ACTION_P2(Plus, a, b) { ... }
 
 ### Restricting the Type of an Argument or Parameter in an ACTION
 
-For maximum brevity and reusability, the `ACTION*` macros don't ask you to provide the types of the mock function
-arguments and the action parameters. Instead, we let the compiler infer the types for us.
+For maximum brevity and reusability, the `ACTION*` macros don't ask you to
+provide the types of the mock function arguments and the action parameters.
+Instead, we let the compiler infer the types for us.
 
-Sometimes, however, we may want to be more explicit about the types. There are several tricks to do that. For example:
+Sometimes, however, we may want to be more explicit about the types. There are
+several tricks to do that. For example:
 
 ```cpp
 ACTION(Foo) {
@@ -3716,12 +4112,14 @@ ACTION_P(Bar, param) {
 }
 ```
 
-where `StaticAssertTypeEq` is a compile-time assertion in googletest that verifies two types are the same.
+where `StaticAssertTypeEq` is a compile-time assertion in googletest that
+verifies two types are the same.
 
 ### Writing New Action Templates Quickly
 
-Sometimes you want to give an action explicit template parameters that cannot be inferred from its value
-parameters. `ACTION_TEMPLATE()` supports that and can be viewed as an extension to `ACTION()` and `ACTION_P*()`.
+Sometimes you want to give an action explicit template parameters that cannot be
+inferred from its value parameters. `ACTION_TEMPLATE()` supports that and can be
+viewed as an extension to `ACTION()` and `ACTION_P*()`.
 
 The syntax:
 
@@ -3732,9 +4130,10 @@ ACTION_TEMPLATE(ActionName,
 ```
 
 defines an action template that takes *m* explicit template parameters and *n*
-value parameters, where *m* is in [1, 10] and *n* is in [0, 10]. `name_i` is the name of the *i*-th template parameter,
-and `kind_i` specifies whether it's a
-`typename`, an integral constant, or a template. `p_i` is the name of the *i*-th value parameter.
+value parameters, where *m* is in [1, 10] and *n* is in [0, 10]. `name_i` is the
+name of the *i*-th template parameter, and `kind_i` specifies whether it's a
+`typename`, an integral constant, or a template. `p_i` is the name of the *i*-th
+value parameter.
 
 Example:
 
@@ -3755,8 +4154,8 @@ To create an instance of an action template, write:
 ActionName<t1, ..., t_m>(v1, ..., v_n)
 ```
 
-where the `t`s are the template arguments and the `v`s are the value arguments. The value argument types are inferred by
-the compiler. For example:
+where the `t`s are the template arguments and the `v`s are the value arguments.
+The value argument types are inferred by the compiler. For example:
 
 ```cpp
 using ::testing::_;
@@ -3765,7 +4164,8 @@ using ::testing::_;
   EXPECT_CALL(mock, Foo).WillOnce(DuplicateArg<1, unsigned char>(&n));
 ```
 
-If you want to explicitly specify the value argument types, you can provide additional template arguments:
+If you want to explicitly specify the value argument types, you can provide
+additional template arguments:
 
 ```cpp
 ActionName<t1, ..., t_m, u1, ..., u_k>(v1, ..., v_n)
@@ -3773,20 +4173,24 @@ ActionName<t1, ..., t_m, u1, ..., u_k>(v1, ..., v_n)
 
 where `u_i` is the desired type of `v_i`.
 
-`ACTION_TEMPLATE` and `ACTION`/`ACTION_P*` can be overloaded on the number of value parameters, but not on the number of
-template parameters. Without the restriction, the meaning of the following is unclear:
+`ACTION_TEMPLATE` and `ACTION`/`ACTION_P*` can be overloaded on the number of
+value parameters, but not on the number of template parameters. Without the
+restriction, the meaning of the following is unclear:
 
 ```cpp
   OverloadedAction<int, bool>(x);
 ```
 
-Are we using a single-template-parameter action where `bool` refers to the type of `x`, or a two-template-parameter
-action where the compiler is asked to infer the type of `x`?
+Are we using a single-template-parameter action where `bool` refers to the type
+of `x`, or a two-template-parameter action where the compiler is asked to infer
+the type of `x`?
 
 ### Using the ACTION Object's Type
 
-If you are writing a function that returns an `ACTION` object, you'll need to know its type. The type depends on the
-macro used to define the action and the parameter types. The rule is relatively simple:
+If you are writing a function that returns an `ACTION` object, you'll need to
+know its type. The type depends on the macro used to define the action and the
+parameter types. The rule is relatively simple:
+
 
 | Given Definition              | Expression          | Has Type              |
 | ----------------------------- | ------------------- | --------------------- |
@@ -3798,19 +4202,23 @@ macro used to define the action and the parameter types. The rule is relatively
 | `ACTION_TEMPLATE(Baz, HAS_m_TEMPLATE_PARAMS(...), AND_2_VALUE_PARAMS(p1, p2))` | `Baz<t1, ..., t_m>(bool_value, int_value)` | `BazActionP2<t1, ..., t_m, bool, int>` |
 | ...                           | ...                 | ...                   |
 
-Note that we have to pick different suffixes (`Action`, `ActionP`, `ActionP2`, and etc) for actions with different
-numbers of value parameters, or the action definitions cannot be overloaded on the number of them.
+
+Note that we have to pick different suffixes (`Action`, `ActionP`, `ActionP2`,
+and etc) for actions with different numbers of value parameters, or the action
+definitions cannot be overloaded on the number of them.
 
 ### Writing New Monomorphic Actions {#NewMonoActions}
 
-While the `ACTION*` macros are very convenient, sometimes they are inappropriate. For example, despite the tricks shown
-in the previous recipes, they don't let you directly specify the types of the mock function arguments and the action
-parameters, which in general leads to unoptimized compiler error messages that can baffle unfamiliar users. They also
-don't allow overloading actions based on parameter types without jumping through some hoops.
+While the `ACTION*` macros are very convenient, sometimes they are
+inappropriate. For example, despite the tricks shown in the previous recipes,
+they don't let you directly specify the types of the mock function arguments and
+the action parameters, which in general leads to unoptimized compiler error
+messages that can baffle unfamiliar users. They also don't allow overloading
+actions based on parameter types without jumping through some hoops.
 
 An alternative to the `ACTION*` macros is to implement
-`::testing::ActionInterface<F>`, where `F` is the type of the mock function in which the action will be used. For
-example:
+`::testing::ActionInterface<F>`, where `F` is the type of the mock function in
+which the action will be used. For example:
 
 ```cpp
 template <typename F>
@@ -3858,13 +4266,15 @@ Action<IncrementMethod> IncrementArgument() {
 
 ### Writing New Polymorphic Actions {#NewPolyActions}
 
-The previous recipe showed you how to define your own action. This is all good, except that you need to know the type of
-the function in which the action will be used. Sometimes that can be a problem. For example, if you want to use the
+The previous recipe showed you how to define your own action. This is all good,
+except that you need to know the type of the function in which the action will
+be used. Sometimes that can be a problem. For example, if you want to use the
 action in functions with *different* types (e.g. like `Return()` and
 `SetArgPointee()`).
 
 If an action can be used in several types of mock functions, we say it's
-*polymorphic*. The `MakePolymorphicAction()` function template makes it easy to define such an action:
+*polymorphic*. The `MakePolymorphicAction()` function template makes it easy to
+define such an action:
 
 ```cpp
 namespace testing {
@@ -3873,8 +4283,9 @@ PolymorphicAction<Impl> MakePolymorphicAction(const Impl& impl);
 }  // namespace testing
 ```
 
-As an example, let's define an action that returns the second argument in the mock function's argument list. The first
-step is to define an implementation class:
+As an example, let's define an action that returns the second argument in the
+mock function's argument list. The first step is to define an implementation
+class:
 
 ```cpp
 class ReturnSecondArgumentAction {
@@ -3887,14 +4298,17 @@ class ReturnSecondArgumentAction {
 };
 ```
 
-This implementation class does *not* need to inherit from any particular class. What matters is that it must have
-a `Perform()` method template. This method template takes the mock function's arguments as a tuple in a **single**
-argument, and returns the result of the action. It can be either `const` or not, but must be invokable with exactly one
-template argument, which is the result type. In other words, you must be able to call `Perform<R>(args)` where `R` is
+This implementation class does *not* need to inherit from any particular class.
+What matters is that it must have a `Perform()` method template. This method
+template takes the mock function's arguments as a tuple in a **single**
+argument, and returns the result of the action. It can be either `const` or not,
+but must be invocable with exactly one template argument, which is the result
+type. In other words, you must be able to call `Perform<R>(args)` where `R` is
 the mock function's return type and `args` is its arguments in a tuple.
 
-Next, we use `MakePolymorphicAction()` to turn an instance of the implementation class into the polymorphic action we
-need. It will be convenient to have a wrapper for this:
+Next, we use `MakePolymorphicAction()` to turn an instance of the implementation
+class into the polymorphic action we need. It will be convenient to have a
+wrapper for this:
 
 ```cpp
 using ::testing::MakePolymorphicAction;
@@ -3928,15 +4342,18 @@ class MockFoo : public Foo {
 
 ### Teaching gMock How to Print Your Values
 
-When an uninteresting or unexpected call occurs, gMock prints the argument values and the stack trace to help you debug.
-Assertion macros like
-`EXPECT_THAT` and `EXPECT_EQ` also print the values in question when the assertion fails. gMock and googletest do this
-using googletest's user-extensible value printer.
+When an uninteresting or unexpected call occurs, gMock prints the argument
+values and the stack trace to help you debug. Assertion macros like
+`EXPECT_THAT` and `EXPECT_EQ` also print the values in question when the
+assertion fails. gMock and googletest do this using googletest's user-extensible
+value printer.
 
-This printer knows how to print built-in C++ types, native arrays, STL containers, and any type that supports the `<<`
-operator. For other types, it prints the raw bytes in the value and hopes that you the user can figure it out.
+This printer knows how to print built-in C++ types, native arrays, STL
+containers, and any type that supports the `<<` operator. For other types, it
+prints the raw bytes in the value and hopes that you the user can figure it out.
 [The GoogleTest advanced guide](advanced.md#teaching-googletest-how-to-print-your-values)
-explains how to extend the printer to do a better job at printing your particular type than to dump the bytes.
+explains how to extend the printer to do a better job at printing your
+particular type than to dump the bytes.
 
 ## Useful Mocks Created Using gMock
 
@@ -3945,9 +4362,10 @@ explains how to extend the printer to do a better job at printing your particula
 
 ### Mock std::function {#MockFunction}
 
-`std::function` is a general function type introduced in C++11. It is a preferred way of passing callbacks to new
-interfaces. Functions are copiable, and are not usually passed around by pointer, which makes them tricky to mock. But
-fear not - `MockFunction` can help you with that.
+`std::function` is a general function type introduced in C++11. It is a
+preferred way of passing callbacks to new interfaces. Functions are copyable,
+and are not usually passed around by pointer, which makes them tricky to mock.
+But fear not - `MockFunction` can help you with that.
 
 `MockFunction<R(T1, ..., Tn)>` has a mock method `Call()` with the signature:
 
@@ -3955,14 +4373,15 @@ fear not - `MockFunction` can help you with that.
   R Call(T1, ..., Tn);
 ```
 
-It also has a `AsStdFunction()` method, which creates a `std::function` proxy forwarding to Call:
+It also has a `AsStdFunction()` method, which creates a `std::function` proxy
+forwarding to Call:
 
 ```cpp
   std::function<R(T1, ..., Tn)> AsStdFunction();
 ```
 
-To use `MockFunction`, first create `MockFunction` object and set up expectations on its `Call` method. Then pass proxy
-obtained from
+To use `MockFunction`, first create `MockFunction` object and set up
+expectations on its `Call` method. Then pass proxy obtained from
 `AsStdFunction()` to the code you are testing. For example:
 
 ```cpp
@@ -3984,9 +4403,10 @@ TEST(FooTest, RunsCallbackWithBarArgument) {
 }
 ```
 
-Remember that function objects created with `AsStdFunction()` are just forwarders. If you create multiple of them, they
-will share the same set of expectations.
+Remember that function objects created with `AsStdFunction()` are just
+forwarders. If you create multiple of them, they will share the same set of
+expectations.
 
 Although `std::function` supports unlimited number of arguments, `MockFunction`
-implementation is limited to ten. If you ever hit that limit... well, your callback has bigger problems than being
-mockable. :-)
+implementation is limited to ten. If you ever hit that limit... well, your
+callback has bigger problems than being mockable. :-)
diff --git a/external/googletest/docs/gmock_faq.md b/external/googletest/docs/gmock_faq.md
index 93badc9b..8f220bf7 100644
--- a/external/googletest/docs/gmock_faq.md
+++ b/external/googletest/docs/gmock_faq.md
@@ -10,15 +10,18 @@ In order for a method to be mocked, it must be *virtual*, unless you use the
 You cannot mock a variadic function (i.e. a function taking ellipsis (`...`)
 arguments) directly in gMock.
 
-The problem is that in general, there is *no way* for a mock object to know how many arguments are passed to the
-variadic method, and what the arguments' types are. Only the *author of the base class* knows the protocol, and we
-cannot look into his or her head.
+The problem is that in general, there is *no way* for a mock object to know how
+many arguments are passed to the variadic method, and what the arguments' types
+are. Only the *author of the base class* knows the protocol, and we cannot look
+into his or her head.
 
-Therefore, to mock such a function, the *user* must teach the mock object how to figure out the number of arguments and
-their types. One way to do it is to provide overloaded versions of the function.
+Therefore, to mock such a function, the *user* must teach the mock object how to
+figure out the number of arguments and their types. One way to do it is to
+provide overloaded versions of the function.
 
-Ellipsis arguments are inherited from C and not really a C++ feature. They are unsafe to use and don't work with
-arguments that have constructors or destructors. Therefore we recommend to avoid them in C++ as much as possible.
+Ellipsis arguments are inherited from C and not really a C++ feature. They are
+unsafe to use and don't work with arguments that have constructors or
+destructors. Therefore we recommend to avoid them in C++ as much as possible.
 
 ### MSVC gives me warning C4301 or C4373 when I define a mock method with a const parameter. Why?
 
@@ -42,8 +45,8 @@ You may get the following warning:
 warning C4301: 'MockFoo::Bar': overriding virtual function only differs from 'Foo::Bar' by const/volatile qualifier
 ```
 
-This is a MSVC bug. The same code compiles fine with gcc, for example. If you use Visual C++ 2008 SP1, you would get the
-warning:
+This is a MSVC bug. The same code compiles fine with gcc, for example. If you
+use Visual C++ 2008 SP1, you would get the warning:
 
 ```shell
 warning C4373: 'MockFoo::Bar': virtual function overrides 'Foo::Bar', previous versions of the compiler did not override when parameters only differed by const/volatile qualifiers
@@ -62,12 +65,14 @@ class Foo {
 In fact, you can *declare* `Bar()` with an `int` parameter, and define it with a
 `const int` parameter. The compiler will still match them up.
 
-Since making a parameter `const` is meaningless in the method declaration, we recommend to remove it in both `Foo`
-and `MockFoo`. That should workaround the VC bug.
+Since making a parameter `const` is meaningless in the method declaration, we
+recommend to remove it in both `Foo` and `MockFoo`. That should workaround the
+VC bug.
 
-Note that we are talking about the *top-level* `const` modifier here. If the function parameter is passed by pointer or
-reference, declaring the pointee or referee as `const` is still meaningful. For example, the following two declarations
-are *not* equivalent:
+Note that we are talking about the *top-level* `const` modifier here. If the
+function parameter is passed by pointer or reference, declaring the pointee or
+referee as `const` is still meaningful. For example, the following two
+declarations are *not* equivalent:
 
 ```cpp
 void Bar(int* p);         // Neither p nor *p is const.
@@ -76,24 +81,28 @@ void Bar(const int* p);  // p is not const, but *p is.
 
 ### I can't figure out why gMock thinks my expectations are not satisfied. What should I do?
 
-You might want to run your test with `--gmock_verbose=info`. This flag lets gMock print a trace of every mock function
-call it receives. By studying the trace, you'll gain insights on why the expectations you set are not met.
+You might want to run your test with `--gmock_verbose=info`. This flag lets
+gMock print a trace of every mock function call it receives. By studying the
+trace, you'll gain insights on why the expectations you set are not met.
 
-If you see the message "The mock function has no default action set, and its return type has no default value set.",
-then try
-[adding a default action](gmock_cheat_sheet.md#OnCall). Due to a known issue, unexpected calls on mocks without default
-actions don't print out a detailed comparison between the actual arguments and the expected arguments.
+If you see the message "The mock function has no default action set, and its
+return type has no default value set.", then try
+[adding a default action](gmock_cheat_sheet.md#OnCall). Due to a known issue,
+unexpected calls on mocks without default actions don't print out a detailed
+comparison between the actual arguments and the expected arguments.
 
 ### My program crashed and `ScopedMockLog` spit out tons of messages. Is it a gMock bug?
 
 gMock and `ScopedMockLog` are likely doing the right thing here.
 
-When a test crashes, the failure signal handler will try to log a lot of information (the stack trace, and the address
-map, for example). The messages are compounded if you have many threads with depth stacks. When `ScopedMockLog`
-intercepts these messages and finds that they don't match any expectations, it prints an error for each of them.
+When a test crashes, the failure signal handler will try to log a lot of
+information (the stack trace, and the address map, for example). The messages
+are compounded if you have many threads with depth stacks. When `ScopedMockLog`
+intercepts these messages and finds that they don't match any expectations, it
+prints an error for each of them.
 
-You can learn to ignore the errors, or you can rewrite your expectations to make your test more robust, for example, by
-adding something like:
+You can learn to ignore the errors, or you can rewrite your expectations to make
+your test more robust, for example, by adding something like:
 
 ```cpp
 using ::testing::AnyNumber;
@@ -115,20 +124,23 @@ using ::testing::_;
 
 ### I have a failed test where gMock tells me TWICE that a particular expectation is not satisfied. Isn't this redundant?
 
-When gMock detects a failure, it prints relevant information (the mock function arguments, the state of relevant
-expectations, and etc) to help the user debug. If another failure is detected, gMock will do the same, including
-printing the state of relevant expectations.
+When gMock detects a failure, it prints relevant information (the mock function
+arguments, the state of relevant expectations, and etc) to help the user debug.
+If another failure is detected, gMock will do the same, including printing the
+state of relevant expectations.
 
-Sometimes an expectation's state didn't change between two failures, and you'll see the same description of the state
-twice. They are however *not* redundant, as they refer to *different points in time*. The fact they are the same *is*
+Sometimes an expectation's state didn't change between two failures, and you'll
+see the same description of the state twice. They are however *not* redundant,
+as they refer to *different points in time*. The fact they are the same *is*
 interesting information.
 
 ### I get a heapcheck failure when using a mock object, but using a real object is fine. What can be wrong?
 
-Does the class (hopefully a pure interface) you are mocking have a virtual destructor?
+Does the class (hopefully a pure interface) you are mocking have a virtual
+destructor?
 
-Whenever you derive from a base class, make sure its destructor is virtual. Otherwise Bad Things will happen. Consider
-the following code:
+Whenever you derive from a base class, make sure its destructor is virtual.
+Otherwise Bad Things will happen. Consider the following code:
 
 ```cpp
 class Base {
@@ -173,13 +185,16 @@ using ::testing::Return;
       .RetiresOnSaturation();
 ```
 
-The problem, is that they didn't pick the **best** way to express the test's intent.
+The problem, is that they didn't pick the **best** way to express the test's
+intent.
 
-By default, expectations don't have to be matched in *any* particular order. If you want them to match in a certain
-order, you need to be explicit. This is gMock's (and jMock's) fundamental philosophy: it's easy to accidentally
+By default, expectations don't have to be matched in *any* particular order. If
+you want them to match in a certain order, you need to be explicit. This is
+gMock's (and jMock's) fundamental philosophy: it's easy to accidentally
 over-specify your tests, and we want to make it harder to do so.
 
-There are two better ways to write the test spec. You could either put the expectations in sequence:
+There are two better ways to write the test spec. You could either put the
+expectations in sequence:
 
 ```cpp
 using ::testing::Return;
@@ -212,20 +227,23 @@ using ::testing::Return;
 ```
 
 Back to the original questions: why does gMock search the expectations (and
-`ON_CALL`s) from back to front? Because this allows a user to set up a mock's behavior for the common case early (e.g.
-in the mock's constructor or the test fixture's set-up phase) and customize it with more specific rules later. If gMock
-searches from front to back, this very useful pattern won't be possible.
+`ON_CALL`s) from back to front? Because this allows a user to set up a mock's
+behavior for the common case early (e.g. in the mock's constructor or the test
+fixture's set-up phase) and customize it with more specific rules later. If
+gMock searches from front to back, this very useful pattern won't be possible.
 
 ### gMock prints a warning when a function without EXPECT_CALL is called, even if I have set its behavior using ON_CALL. Would it be reasonable not to show the warning in this case?
 
-When choosing between being neat and being safe, we lean toward the latter. So the answer is that we think it's better
-to show the warning.
+When choosing between being neat and being safe, we lean toward the latter. So
+the answer is that we think it's better to show the warning.
 
-Often people write `ON_CALL`s in the mock object's constructor or `SetUp()`, as the default behavior rarely changes from
-test to test. Then in the test body they set the expectations, which are often different for each test. Having an
-`ON_CALL` in the set-up part of a test doesn't mean that the calls are expected. If there's no `EXPECT_CALL` and the
-method is called, it's possibly an error. If we quietly let the call go through without notifying the user, bugs may
-creep in unnoticed.
+Often people write `ON_CALL`s in the mock object's constructor or `SetUp()`, as
+the default behavior rarely changes from test to test. Then in the test body
+they set the expectations, which are often different for each test. Having an
+`ON_CALL` in the set-up part of a test doesn't mean that the calls are expected.
+If there's no `EXPECT_CALL` and the method is called, it's possibly an error. If
+we quietly let the call go through without notifying the user, bugs may creep in
+unnoticed.
 
 If, however, you are sure that the calls are OK, you can write
 
@@ -247,13 +265,14 @@ using ::testing::_;
 
 This tells gMock that you do expect the calls and no warning should be printed.
 
-Also, you can control the verbosity by specifying `--gmock_verbose=error`. Other values are `info` and `warning`. If you
-find the output too noisy when debugging, just choose a less verbose level.
+Also, you can control the verbosity by specifying `--gmock_verbose=error`. Other
+values are `info` and `warning`. If you find the output too noisy when
+debugging, just choose a less verbose level.
 
 ### How can I delete the mock function's argument in an action?
 
-If your mock function takes a pointer argument and you want to delete that argument, you can use testing::DeleteArg<N>()
-to delete the N'th (zero-indexed)
+If your mock function takes a pointer argument and you want to delete that
+argument, you can use testing::DeleteArg<N>() to delete the N'th (zero-indexed)
 argument:
 
 ```cpp
@@ -267,11 +286,11 @@ using ::testing::_;
 
 ### How can I perform an arbitrary action on a mock function's argument?
 
-If you find yourself needing to perform some action that's not supported by gMock directly, remember that you can define
-your own actions using
+If you find yourself needing to perform some action that's not supported by
+gMock directly, remember that you can define your own actions using
 [`MakeAction()`](#NewMonoActions) or
-[`MakePolymorphicAction()`](#NewPolyActions), or you can write a stub function and invoke it
-using [`Invoke()`](#FunctionsAsActions).
+[`MakePolymorphicAction()`](#NewPolyActions), or you can write a stub function
+and invoke it using [`Invoke()`](#FunctionsAsActions).
 
 ```cpp
 using ::testing::_;
@@ -287,72 +306,85 @@ using ::testing::Invoke;
 
 You can, but you need to make some changes.
 
-In general, if you find yourself needing to mock a static function, it's a sign that your modules are too tightly
-coupled (and less flexible, less reusable, less testable, etc). You are probably better off defining a small interface
-and call the function through that interface, which then can be easily mocked. It's a bit of work initially, but usually
-pays for itself quickly.
+In general, if you find yourself needing to mock a static function, it's a sign
+that your modules are too tightly coupled (and less flexible, less reusable,
+less testable, etc). You are probably better off defining a small interface and
+call the function through that interface, which then can be easily mocked. It's
+a bit of work initially, but usually pays for itself quickly.
 
 This Google Testing Blog
-[post](https://testing.googleblog.com/2008/06/defeat-static-cling.html) says it excellently. Check it out.
+[post](https://testing.googleblog.com/2008/06/defeat-static-cling.html) says it
+excellently. Check it out.
 
 ### My mock object needs to do complex stuff. It's a lot of pain to specify the actions. gMock sucks!
 
 I know it's not a question, but you get an answer for free any way. :-)
 
-With gMock, you can create mocks in C++ easily. And people might be tempted to use them everywhere. Sometimes they work
-great, and sometimes you may find them, well, a pain to use. So, what's wrong in the latter case?
+With gMock, you can create mocks in C++ easily. And people might be tempted to
+use them everywhere. Sometimes they work great, and sometimes you may find them,
+well, a pain to use. So, what's wrong in the latter case?
 
-When you write a test without using mocks, you exercise the code and assert that it returns the correct value or that
-the system is in an expected state. This is sometimes called "state-based testing".
+When you write a test without using mocks, you exercise the code and assert that
+it returns the correct value or that the system is in an expected state. This is
+sometimes called "state-based testing".
 
-Mocks are great for what some call "interaction-based" testing: instead of checking the system state at the very end,
-mock objects verify that they are invoked the right way and report an error as soon as it arises, giving you a handle on
-the precise context in which the error was triggered. This is often more effective and economical to do than state-based
-testing.
+Mocks are great for what some call "interaction-based" testing: instead of
+checking the system state at the very end, mock objects verify that they are
+invoked the right way and report an error as soon as it arises, giving you a
+handle on the precise context in which the error was triggered. This is often
+more effective and economical to do than state-based testing.
 
-If you are doing state-based testing and using a test double just to simulate the real object, you are probably better
-off using a fake. Using a mock in this case causes pain, as it's not a strong point for mocks to perform complex
-actions. If you experience this and think that mocks suck, you are just not using the right tool for your problem. Or,
-you might be trying to solve the wrong problem. :-)
+If you are doing state-based testing and using a test double just to simulate
+the real object, you are probably better off using a fake. Using a mock in this
+case causes pain, as it's not a strong point for mocks to perform complex
+actions. If you experience this and think that mocks suck, you are just not
+using the right tool for your problem. Or, you might be trying to solve the
+wrong problem. :-)
 
 ### I got a warning "Uninteresting function call encountered - default action taken.." Should I panic?
 
 By all means, NO! It's just an FYI. :-)
 
-What it means is that you have a mock function, you haven't set any expectations on it (by gMock's rule this means that
-you are not interested in calls to this function and therefore it can be called any number of times), and it is called.
+What it means is that you have a mock function, you haven't set any expectations
+on it (by gMock's rule this means that you are not interested in calls to this
+function and therefore it can be called any number of times), and it is called.
 That's OK - you didn't say it's not OK to call the function!
 
 What if you actually meant to disallow this function to be called, but forgot to
-write `EXPECT_CALL(foo, Bar()).Times(0)`? While one can argue that it's the user's fault, gMock tries to be nice and
-prints you a note.
+write `EXPECT_CALL(foo, Bar()).Times(0)`? While one can argue that it's the
+user's fault, gMock tries to be nice and prints you a note.
 
-So, when you see the message and believe that there shouldn't be any uninteresting calls, you should investigate what's
-going on. To make your life easier, gMock dumps the stack trace when an uninteresting call is encountered. From that you
-can figure out which mock function it is, and how it is called.
+So, when you see the message and believe that there shouldn't be any
+uninteresting calls, you should investigate what's going on. To make your life
+easier, gMock dumps the stack trace when an uninteresting call is encountered.
+From that you can figure out which mock function it is, and how it is called.
 
 ### I want to define a custom action. Should I use Invoke() or implement the ActionInterface interface?
 
-Either way is fine - you want to choose the one that's more convenient for your circumstance.
+Either way is fine - you want to choose the one that's more convenient for your
+circumstance.
 
 Usually, if your action is for a particular function type, defining it using
-`Invoke()` should be easier; if your action can be used in functions of different types (e.g. if you are
-defining `Return(*value*)`),
-`MakePolymorphicAction()` is easiest. Sometimes you want precise control on what types of functions the action can be
-used in, and implementing `ActionInterface`
-is the way to go here. See the implementation of `Return()` in
-`testing/base/public/gmock-actions.h` for an example.
+`Invoke()` should be easier; if your action can be used in functions of
+different types (e.g. if you are defining `Return(*value*)`),
+`MakePolymorphicAction()` is easiest. Sometimes you want precise control on what
+types of functions the action can be used in, and implementing `ActionInterface`
+is the way to go here. See the implementation of `Return()` in `gmock-actions.h`
+for an example.
 
 ### I use SetArgPointee() in WillOnce(), but gcc complains about "conflicting return type specified". What does it mean?
 
-You got this error as gMock has no idea what value it should return when the mock method is called. `SetArgPointee()`
-says what the side effect is, but doesn't say what the return value should be. You need `DoAll()` to chain a
-`SetArgPointee()` with a `Return()` that provides a value appropriate to the API being mocked.
+You got this error as gMock has no idea what value it should return when the
+mock method is called. `SetArgPointee()` says what the side effect is, but
+doesn't say what the return value should be. You need `DoAll()` to chain a
+`SetArgPointee()` with a `Return()` that provides a value appropriate to the API
+being mocked.
 
-See this [recipe](gmock_cook_book.md#mocking-side-effects) for more details and an example.
+See this [recipe](gmock_cook_book.md#mocking-side-effects) for more details and
+an example.
 
 ### I have a huge mock class, and Microsoft Visual C++ runs out of memory when compiling it. What can I do?
 
-We've noticed that when the `/clr` compiler flag is used, Visual C++ uses 5~6 times as much memory when compiling a mock
-class. We suggest to avoid `/clr`
+We've noticed that when the `/clr` compiler flag is used, Visual C++ uses 5~6
+times as much memory when compiling a mock class. We suggest to avoid `/clr`
 when compiling native C++ mocks.
diff --git a/external/googletest/docs/gmock_for_dummies.md b/external/googletest/docs/gmock_for_dummies.md
index 45cf949b..ed2297c2 100644
--- a/external/googletest/docs/gmock_for_dummies.md
+++ b/external/googletest/docs/gmock_for_dummies.md
@@ -2,70 +2,86 @@
 
 ## What Is gMock?
 
-When you write a prototype or test, often it's not feasible or wise to rely on real objects entirely. A **mock object**
-implements the same interface as a real object (so it can be used as one), but lets you specify at run time how it will
-be used and what it should do (which methods will be called? in which order? how many times? with what arguments? what
-will they return? etc).
-
-It is easy to confuse the term *fake objects* with mock objects. Fakes and mocks actually mean very different things in
-the Test-Driven Development (TDD)
+When you write a prototype or test, often it's not feasible or wise to rely on
+real objects entirely. A **mock object** implements the same interface as a real
+object (so it can be used as one), but lets you specify at run time how it will
+be used and what it should do (which methods will be called? in which order? how
+many times? with what arguments? what will they return? etc).
+
+It is easy to confuse the term *fake objects* with mock objects. Fakes and mocks
+actually mean very different things in the Test-Driven Development (TDD)
 community:
 
-* **Fake** objects have working implementations, but usually take some shortcut (perhaps to make the operations less
-  expensive), which makes them not suitable for production. An in-memory file system would be an example of a fake.
-* **Mocks** are objects pre-programmed with *expectations*, which form a specification of the calls they are expected to
-  receive.
+*   **Fake** objects have working implementations, but usually take some
+    shortcut (perhaps to make the operations less expensive), which makes them
+    not suitable for production. An in-memory file system would be an example of
+    a fake.
+*   **Mocks** are objects pre-programmed with *expectations*, which form a
+    specification of the calls they are expected to receive.
 
-If all this seems too abstract for you, don't worry - the most important thing to remember is that a mock allows you to
-check the *interaction* between itself and code that uses it. The difference between fakes and mocks shall become much
+If all this seems too abstract for you, don't worry - the most important thing
+to remember is that a mock allows you to check the *interaction* between itself
+and code that uses it. The difference between fakes and mocks shall become much
 clearer once you start to use mocks.
 
-**gMock** is a library (sometimes we also call it a "framework" to make it sound cool) for creating mock classes and
-using them. It does to C++ what jMock/EasyMock does to Java (well, more or less).
+**gMock** is a library (sometimes we also call it a "framework" to make it sound
+cool) for creating mock classes and using them. It does to C++ what
+jMock/EasyMock does to Java (well, more or less).
 
 When using gMock,
 
-1. first, you use some simple macros to describe the interface you want to mock, and they will expand to the
-   implementation of your mock class;
-2. next, you create some mock objects and specify its expectations and behavior using an intuitive syntax;
-3. then you exercise code that uses the mock objects. gMock will catch any violation to the expectations as soon as it
-   arises.
+1.  first, you use some simple macros to describe the interface you want to
+    mock, and they will expand to the implementation of your mock class;
+2.  next, you create some mock objects and specify its expectations and behavior
+    using an intuitive syntax;
+3.  then you exercise code that uses the mock objects. gMock will catch any
+    violation to the expectations as soon as it arises.
 
 ## Why gMock?
 
-While mock objects help you remove unnecessary dependencies in tests and make them fast and reliable, using mocks
-manually in C++ is *hard*:
-
-* Someone has to implement the mocks. The job is usually tedious and error-prone. No wonder people go great distance to
-  avoid it.
-* The quality of those manually written mocks is a bit, uh, unpredictable. You may see some really polished ones, but
-  you may also see some that were hacked up in a hurry and have all sorts of ad hoc restrictions.
-* The knowledge you gained from using one mock doesn't transfer to the next one.
-
-In contrast, Java and Python programmers have some fine mock frameworks (jMock, EasyMock, etc), which automate the
-creation of mocks. As a result, mocking is a proven effective technique and widely adopted practice in those
-communities. Having the right tool absolutely makes the difference.
-
-gMock was built to help C++ programmers. It was inspired by jMock and EasyMock, but designed with C++'s specifics in
-mind. It is your friend if any of the following problems is bothering you:
-
-* You are stuck with a sub-optimal design and wish you had done more prototyping before it was too late, but prototyping
-  in C++ is by no means
-  "rapid".
-* Your tests are slow as they depend on too many libraries or use expensive resources (e.g. a database).
-* Your tests are brittle as some resources they use are unreliable (e.g. the network).
-* You want to test how your code handles a failure (e.g. a file checksum error), but it's not easy to cause one.
-* You need to make sure that your module interacts with other modules in the right way, but it's hard to observe the
-  interaction; therefore you resort to observing the side effects at the end of the action, but it's awkward at best.
-* You want to "mock out" your dependencies, except that they don't have mock implementations yet; and, frankly, you
-  aren't thrilled by some of those hand-written mocks.
+While mock objects help you remove unnecessary dependencies in tests and make
+them fast and reliable, using mocks manually in C++ is *hard*:
+
+*   Someone has to implement the mocks. The job is usually tedious and
+    error-prone. No wonder people go great distance to avoid it.
+*   The quality of those manually written mocks is a bit, uh, unpredictable. You
+    may see some really polished ones, but you may also see some that were
+    hacked up in a hurry and have all sorts of ad hoc restrictions.
+*   The knowledge you gained from using one mock doesn't transfer to the next
+    one.
+
+In contrast, Java and Python programmers have some fine mock frameworks (jMock,
+EasyMock, etc), which automate the creation of mocks. As a result, mocking is a
+proven effective technique and widely adopted practice in those communities.
+Having the right tool absolutely makes the difference.
+
+gMock was built to help C++ programmers. It was inspired by jMock and EasyMock,
+but designed with C++'s specifics in mind. It is your friend if any of the
+following problems is bothering you:
+
+*   You are stuck with a sub-optimal design and wish you had done more
+    prototyping before it was too late, but prototyping in C++ is by no means
+    "rapid".
+*   Your tests are slow as they depend on too many libraries or use expensive
+    resources (e.g. a database).
+*   Your tests are brittle as some resources they use are unreliable (e.g. the
+    network).
+*   You want to test how your code handles a failure (e.g. a file checksum
+    error), but it's not easy to cause one.
+*   You need to make sure that your module interacts with other modules in the
+    right way, but it's hard to observe the interaction; therefore you resort to
+    observing the side effects at the end of the action, but it's awkward at
+    best.
+*   You want to "mock out" your dependencies, except that they don't have mock
+    implementations yet; and, frankly, you aren't thrilled by some of those
+    hand-written mocks.
 
 We encourage you to use gMock as
 
-* a *design* tool, for it lets you experiment with your interface design early and often. More iterations lead to better
-  designs!
-* a *testing* tool to cut your tests' outbound dependencies and probe the interaction between your module and its
-  collaborators.
+*   a *design* tool, for it lets you experiment with your interface design early
+    and often. More iterations lead to better designs!
+*   a *testing* tool to cut your tests' outbound dependencies and probe the
+    interaction between your module and its collaborators.
 
 ## Getting Started
 
@@ -73,16 +89,17 @@ gMock is bundled with googletest.
 
 ## A Case for Mock Turtles
 
-Let's look at an example. Suppose you are developing a graphics program that relies on
-a [LOGO](http://en.wikipedia.org/wiki/Logo_programming_language)-like
-API for drawing. How would you test that it does the right thing? Well, you can run it and compare the screen with a
-golden screen snapshot, but let's admit it:
-tests like this are expensive to run and fragile (What if you just upgraded to a shiny new graphics card that has better
-anti-aliasing? Suddenly you have to update all your golden images.). It would be too painful if all your tests are like
-this. Fortunately, you learned about
-[Dependency Injection](http://en.wikipedia.org/wiki/Dependency_injection) and know the right thing to do: instead of
-having your application talk to the system API directly, wrap the API in an interface (say, `Turtle`) and code to that
-interface:
+Let's look at an example. Suppose you are developing a graphics program that
+relies on a [LOGO](https://en.wikipedia.org/wiki/Logo_programming_language)-like
+API for drawing. How would you test that it does the right thing? Well, you can
+run it and compare the screen with a golden screen snapshot, but let's admit it:
+tests like this are expensive to run and fragile (What if you just upgraded to a
+shiny new graphics card that has better anti-aliasing? Suddenly you have to
+update all your golden images.). It would be too painful if all your tests are
+like this. Fortunately, you learned about
+[Dependency Injection](https://en.wikipedia.org/wiki/Dependency_injection) and know the right thing
+to do: instead of having your application talk to the system API directly, wrap
+the API in an interface (say, `Turtle`) and code to that interface:
 
 ```cpp
 class Turtle {
@@ -99,46 +116,55 @@ class Turtle {
 ```
 
 (Note that the destructor of `Turtle` **must** be virtual, as is the case for
-**all** classes you intend to inherit from - otherwise the destructor of the derived class will not be called when you
-delete an object through a base pointer, and you'll get corrupted program states like memory leaks.)
+**all** classes you intend to inherit from - otherwise the destructor of the
+derived class will not be called when you delete an object through a base
+pointer, and you'll get corrupted program states like memory leaks.)
 
 You can control whether the turtle's movement will leave a trace using `PenUp()`
 and `PenDown()`, and control its movement using `Forward()`, `Turn()`, and
-`GoTo()`. Finally, `GetX()` and `GetY()` tell you the current position of the turtle.
+`GoTo()`. Finally, `GetX()` and `GetY()` tell you the current position of the
+turtle.
 
-Your program will normally use a real implementation of this interface. In tests, you can use a mock implementation
-instead. This allows you to easily check what drawing primitives your program is calling, with what arguments, and in
-which order. Tests written this way are much more robust (they won't break because your new machine does anti-aliasing
-differently), easier to read and maintain (the intent of a test is expressed in the code, not in some binary images),
-and run *much, much faster*.
+Your program will normally use a real implementation of this interface. In
+tests, you can use a mock implementation instead. This allows you to easily
+check what drawing primitives your program is calling, with what arguments, and
+in which order. Tests written this way are much more robust (they won't break
+because your new machine does anti-aliasing differently), easier to read and
+maintain (the intent of a test is expressed in the code, not in some binary
+images), and run *much, much faster*.
 
 ## Writing the Mock Class
 
-If you are lucky, the mocks you need to use have already been implemented by some nice people. If, however, you find
-yourself in the position to write a mock class, relax - gMock turns this task into a fun game! (Well, almost.)
+If you are lucky, the mocks you need to use have already been implemented by
+some nice people. If, however, you find yourself in the position to write a mock
+class, relax - gMock turns this task into a fun game! (Well, almost.)
 
 ### How to Define It
 
-Using the `Turtle` interface as example, here are the simple steps you need to follow:
-
-* Derive a class `MockTurtle` from `Turtle`.
-* Take a *virtual* function of `Turtle` (while it's possible to
-  [mock non-virtual methods using templates](gmock_cook_book.md#MockingNonVirtualMethods), it's much more involved).
-* In the `public:` section of the child class, write `MOCK_METHOD();`
-* Now comes the fun part: you take the function signature, cut-and-paste it into the macro, and add two commas - one
-  between the return type and the name, another between the name and the argument list.
-* If you're mocking a const method, add a 4th parameter containing `(const)`
-  (the parentheses are required).
-* Since you're overriding a virtual method, we suggest adding the `override`
-  keyword. For const methods the 4th parameter becomes `(const, override)`, for non-const methods just `(override)`.
-  This isn't mandatory.
-* Repeat until all virtual functions you want to mock are done. (It goes without saying that *all* pure virtual methods
-  in your abstract class must be either mocked or overridden.)
+Using the `Turtle` interface as example, here are the simple steps you need to
+follow:
+
+*   Derive a class `MockTurtle` from `Turtle`.
+*   Take a *virtual* function of `Turtle` (while it's possible to
+    [mock non-virtual methods using templates](gmock_cook_book.md#MockingNonVirtualMethods),
+    it's much more involved).
+*   In the `public:` section of the child class, write `MOCK_METHOD();`
+*   Now comes the fun part: you take the function signature, cut-and-paste it
+    into the macro, and add two commas - one between the return type and the
+    name, another between the name and the argument list.
+*   If you're mocking a const method, add a 4th parameter containing `(const)`
+    (the parentheses are required).
+*   Since you're overriding a virtual method, we suggest adding the `override`
+    keyword. For const methods the 4th parameter becomes `(const, override)`,
+    for non-const methods just `(override)`. This isn't mandatory.
+*   Repeat until all virtual functions you want to mock are done. (It goes
+    without saying that *all* pure virtual methods in your abstract class must
+    be either mocked or overridden.)
 
 After the process, you should have something like:
 
 ```cpp
-#include "gmock/gmock.h"  // Brings in gMock.
+#include <gmock/gmock.h>  // Brings in gMock.
 
 class MockTurtle : public Turtle {
  public:
@@ -158,42 +184,48 @@ macro will generate the definitions for you. It's that simple!
 
 ### Where to Put It
 
-When you define a mock class, you need to decide where to put its definition. Some people put it in a `_test.cc`. This
-is fine when the interface being mocked
+When you define a mock class, you need to decide where to put its definition.
+Some people put it in a `_test.cc`. This is fine when the interface being mocked
 (say, `Foo`) is owned by the same person or team. Otherwise, when the owner of
-`Foo` changes it, your test could break. (You can't really expect `Foo`'s maintainer to fix every test that uses `Foo`,
-can you?)
+`Foo` changes it, your test could break. (You can't really expect `Foo`'s
+maintainer to fix every test that uses `Foo`, can you?)
 
-So, the rule of thumb is: if you need to mock `Foo` and it's owned by others, define the mock class in `Foo`'s package (
-better, in a `testing` sub-package such that you can clearly separate production code and testing utilities), put it in
-a `.h` and a `cc_library`. Then everyone can reference them from their tests. If `Foo` ever changes, there is only one
-copy of `MockFoo` to change, and only tests that depend on the changed methods need to be fixed.
+Generally, you should not mock classes you don't own. If you must mock such a
+class owned by others, define the mock class in `Foo`'s Bazel package (usually
+the same directory or a `testing` sub-directory), and put it in a `.h` and a
+`cc_library` with `testonly=True`. Then everyone can reference them from their
+tests. If `Foo` ever changes, there is only one copy of `MockFoo` to change, and
+only tests that depend on the changed methods need to be fixed.
 
 Another way to do it: you can introduce a thin layer `FooAdaptor` on top of
-`Foo` and code to this new interface. Since you own `FooAdaptor`, you can absorb changes in `Foo` much more easily.
-While this is more work initially, carefully choosing the adaptor interface can make your code easier to write and more
-readable (a net win in the long run), as you can choose `FooAdaptor` to fit your specific domain much better than `Foo`
-does.
+`Foo` and code to this new interface. Since you own `FooAdaptor`, you can absorb
+changes in `Foo` much more easily. While this is more work initially, carefully
+choosing the adaptor interface can make your code easier to write and more
+readable (a net win in the long run), as you can choose `FooAdaptor` to fit your
+specific domain much better than `Foo` does.
 
 ## Using Mocks in Tests
 
 Once you have a mock class, using it is easy. The typical work flow is:
 
-1. Import the gMock names from the `testing` namespace such that you can use them unqualified (You only have to do it
-   once per file). Remember that namespaces are a good idea.
-2. Create some mock objects.
-3. Specify your expectations on them (How many times will a method be called? With what arguments? What should it do?
-   etc.).
-4. Exercise some code that uses the mocks; optionally, check the result using googletest assertions. If a mock method is
-   called more than expected or with wrong arguments, you'll get an error immediately.
-5. When a mock is destructed, gMock will automatically check whether all expectations on it have been satisfied.
+1.  Import the gMock names from the `testing` namespace such that you can use
+    them unqualified (You only have to do it once per file). Remember that
+    namespaces are a good idea.
+2.  Create some mock objects.
+3.  Specify your expectations on them (How many times will a method be called?
+    With what arguments? What should it do? etc.).
+4.  Exercise some code that uses the mocks; optionally, check the result using
+    googletest assertions. If a mock method is called more than expected or with
+    wrong arguments, you'll get an error immediately.
+5.  When a mock is destructed, gMock will automatically check whether all
+    expectations on it have been satisfied.
 
 Here's an example:
 
 ```cpp
 #include "path/to/mock-turtle.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
 
 using ::testing::AtLeast;                         // #1
 
@@ -208,8 +240,9 @@ TEST(PainterTest, CanDrawSomething) {
 }
 ```
 
-As you might have guessed, this test checks that `PenDown()` is called at least once. If the `painter` object didn't
-call this method, your test will fail with a message like this:
+As you might have guessed, this test checks that `PenDown()` is called at least
+once. If the `painter` object didn't call this method, your test will fail with
+a message like this:
 
 ```text
 path/to/my_test.cc:119: Failure
@@ -220,35 +253,44 @@ Stack trace:
 ...
 ```
 
-**Tip 1:** If you run the test from an Emacs buffer, you can hit `<Enter>` on the line number to jump right to the
-failed expectation.
+**Tip 1:** If you run the test from an Emacs buffer, you can hit `<Enter>` on
+the line number to jump right to the failed expectation.
 
-**Tip 2:** If your mock objects are never deleted, the final verification won't happen. Therefore it's a good idea to
-turn on the heap checker in your tests when you allocate mocks on the heap. You get that automatically if you use the
+**Tip 2:** If your mock objects are never deleted, the final verification won't
+happen. Therefore it's a good idea to turn on the heap checker in your tests
+when you allocate mocks on the heap. You get that automatically if you use the
 `gtest_main` library already.
 
-**Important note:** gMock requires expectations to be set **before** the mock functions are called, otherwise the
-behavior is **undefined**. Do not alternate between calls to `EXPECT_CALL()` and calls to the mock functions, and do not
-set any expectations on a mock after passing the mock to an API.
+###### Expectation Ordering
+
+**Important note:** gMock requires expectations to be set **before** the mock
+functions are called, otherwise the behavior is **undefined**. Do not alternate
+between calls to `EXPECT_CALL()` and calls to the mock functions, and do not set
+any expectations on a mock after passing the mock to an API.
 
 This means `EXPECT_CALL()` should be read as expecting that a call will occur
-*in the future*, not that a call has occurred. Why does gMock work like that? Well, specifying the expectation
-beforehand allows gMock to report a violation as soon as it rises, when the context (stack trace, etc) is still
-available. This makes debugging much easier.
+*in the future*, not that a call has occurred. Why does gMock work like that?
+Well, specifying the expectation beforehand allows gMock to report a violation
+as soon as it rises, when the context (stack trace, etc) is still available.
+This makes debugging much easier.
 
-Admittedly, this test is contrived and doesn't do much. You can easily achieve the same effect without using gMock.
-However, as we shall reveal soon, gMock allows you to do *so much more* with the mocks.
+Admittedly, this test is contrived and doesn't do much. You can easily achieve
+the same effect without using gMock. However, as we shall reveal soon, gMock
+allows you to do *so much more* with the mocks.
 
 ## Setting Expectations
 
 The key to using a mock object successfully is to set the *right expectations*
-on it. If you set the expectations too strict, your test will fail as the result of unrelated changes. If you set them
-too loose, bugs can slip through. You want to do it just right such that your test can catch exactly the kind of bugs
-you intend it to catch. gMock provides the necessary means for you to do it "just right."
+on it. If you set the expectations too strict, your test will fail as the result
+of unrelated changes. If you set them too loose, bugs can slip through. You want
+to do it just right such that your test can catch exactly the kind of bugs you
+intend it to catch. gMock provides the necessary means for you to do it "just
+right."
 
 ### General Syntax
 
-In gMock we use the `EXPECT_CALL()` macro to set an expectation on a mock method. The general syntax is:
+In gMock we use the `EXPECT_CALL()` macro to set an expectation on a mock
+method. The general syntax is:
 
 ```cpp
 EXPECT_CALL(mock_object, method(matchers))
@@ -257,8 +299,8 @@ EXPECT_CALL(mock_object, method(matchers))
     .WillRepeatedly(action);
 ```
 
-The macro has two arguments: first the mock object, and then the method and its arguments. Note that the two are
-separated by a comma (`,`), not a period (`.`).
+The macro has two arguments: first the mock object, and then the method and its
+arguments. Note that the two are separated by a comma (`,`), not a period (`.`).
 (Why using a comma? The answer is that it was necessary for technical reasons.)
 If the method is not overloaded, the macro can also be called without matchers:
 
@@ -270,13 +312,16 @@ EXPECT_CALL(mock_object, non-overloaded-method)
 ```
 
 This syntax allows the test writer to specify "called with any arguments"
-without explicitly specifying the number or types of arguments. To avoid unintended ambiguity, this syntax may only be
-used for methods that are not overloaded.
+without explicitly specifying the number or types of arguments. To avoid
+unintended ambiguity, this syntax may only be used for methods that are not
+overloaded.
 
-Either form of the macro can be followed by some optional *clauses* that provide more information about the expectation.
-We'll discuss how each clause works in the coming sections.
+Either form of the macro can be followed by some optional *clauses* that provide
+more information about the expectation. We'll discuss how each clause works in
+the coming sections.
 
-This syntax is designed to make an expectation read like English. For example, you can probably guess that
+This syntax is designed to make an expectation read like English. For example,
+you can probably guess that
 
 ```cpp
 using ::testing::Return;
@@ -288,26 +333,30 @@ EXPECT_CALL(turtle, GetX())
     .WillRepeatedly(Return(200));
 ```
 
-says that the `turtle` object's `GetX()` method will be called five times, it will return 100 the first time, 150 the
-second time, and then 200 every time. Some people like to call this style of syntax a Domain-Specific Language (DSL).
+says that the `turtle` object's `GetX()` method will be called five times, it
+will return 100 the first time, 150 the second time, and then 200 every time.
+Some people like to call this style of syntax a Domain-Specific Language (DSL).
 
 {: .callout .note}
-**Note:** Why do we use a macro to do this? Well it serves two purposes: first it makes expectations easily
-identifiable (either by `grep` or by a human reader), and second it allows gMock to include the source file location of
-a failed expectation in messages, making debugging easier.
+**Note:** Why do we use a macro to do this? Well it serves two purposes: first
+it makes expectations easily identifiable (either by `grep` or by a human
+reader), and second it allows gMock to include the source file location of a
+failed expectation in messages, making debugging easier.
 
 ### Matchers: What Arguments Do We Expect?
 
-When a mock function takes arguments, we may specify what arguments we are expecting, for example:
+When a mock function takes arguments, we may specify what arguments we are
+expecting, for example:
 
 ```cpp
 // Expects the turtle to move forward by 100 units.
 EXPECT_CALL(turtle, Forward(100));
 ```
 
-Oftentimes you do not want to be too specific. Remember that talk about tests being too rigid? Over specification leads
-to brittle tests and obscures the intent of tests. Therefore we encourage you to specify only what's necessary—no more,
-no less. If you aren't interested in the value of an argument, write `_`
+Oftentimes you do not want to be too specific. Remember that talk about tests
+being too rigid? Over specification leads to brittle tests and obscures the
+intent of tests. Therefore we encourage you to specify only what's necessary—no
+more, no less. If you aren't interested in the value of an argument, write `_`
 as the argument, which means "anything goes":
 
 ```cpp
@@ -317,12 +366,14 @@ using ::testing::_;
 EXPECT_CALL(turtle, GoTo(50, _));
 ```
 
-`_` is an instance of what we call **matchers**. A matcher is like a predicate and can test whether an argument is what
-we'd expect. You can use a matcher inside `EXPECT_CALL()` wherever a function argument is expected. `_` is a convenient
-way of saying "any value".
+`_` is an instance of what we call **matchers**. A matcher is like a predicate
+and can test whether an argument is what we'd expect. You can use a matcher
+inside `EXPECT_CALL()` wherever a function argument is expected. `_` is a
+convenient way of saying "any value".
 
-In the above examples, `100` and `50` are also matchers; implicitly, they are the same as `Eq(100)` and `Eq(50)`, which
-specify that the argument must be equal (using `operator==`) to the matcher argument. There are many
+In the above examples, `100` and `50` are also matchers; implicitly, they are
+the same as `Eq(100)` and `Eq(50)`, which specify that the argument must be
+equal (using `operator==`) to the matcher argument. There are many
 [built-in matchers](reference/matchers.md) for common types (as well as
 [custom matchers](gmock_cook_book.md#NewMatchers)); for example:
 
@@ -333,8 +384,8 @@ using ::testing::Ge;
 EXPECT_CALL(turtle, Forward(Ge(100)));
 ```
 
-If you don't care about *any* arguments, rather than specify `_` for each of them you may instead omit the parameter
-list:
+If you don't care about *any* arguments, rather than specify `_` for each of
+them you may instead omit the parameter list:
 
 ```cpp
 // Expects the turtle to move forward.
@@ -343,50 +394,58 @@ EXPECT_CALL(turtle, Forward);
 EXPECT_CALL(turtle, GoTo);
 ```
 
-This works for all non-overloaded methods; if a method is overloaded, you need to help gMock resolve which overload is
-expected by specifying the number of arguments and possibly also the
+This works for all non-overloaded methods; if a method is overloaded, you need
+to help gMock resolve which overload is expected by specifying the number of
+arguments and possibly also the
 [types of the arguments](gmock_cook_book.md#SelectOverload).
 
 ### Cardinalities: How Many Times Will It Be Called?
 
-The first clause we can specify following an `EXPECT_CALL()` is `Times()`. We call its argument a **cardinality** as it
-tells *how many times* the call should occur. It allows us to repeat an expectation many times without actually writing
-it as many times. More importantly, a cardinality can be "fuzzy", just like a matcher can be. This allows a user to
-express the intent of a test exactly.
+The first clause we can specify following an `EXPECT_CALL()` is `Times()`. We
+call its argument a **cardinality** as it tells *how many times* the call should
+occur. It allows us to repeat an expectation many times without actually writing
+it as many times. More importantly, a cardinality can be "fuzzy", just like a
+matcher can be. This allows a user to express the intent of a test exactly.
 
-An interesting special case is when we say `Times(0)`. You may have guessed - it means that the function shouldn't be
-called with the given arguments at all, and gMock will report a googletest failure whenever the function is (wrongfully)
+An interesting special case is when we say `Times(0)`. You may have guessed - it
+means that the function shouldn't be called with the given arguments at all, and
+gMock will report a googletest failure whenever the function is (wrongfully)
 called.
 
-We've seen `AtLeast(n)` as an example of fuzzy cardinalities earlier. For the list of built-in cardinalities you can
-use, see
+We've seen `AtLeast(n)` as an example of fuzzy cardinalities earlier. For the
+list of built-in cardinalities you can use, see
 [here](gmock_cheat_sheet.md#CardinalityList).
 
-The `Times()` clause can be omitted. **If you omit `Times()`, gMock will infer the cardinality for you.** The rules are
-easy to remember:
+The `Times()` clause can be omitted. **If you omit `Times()`, gMock will infer
+the cardinality for you.** The rules are easy to remember:
 
-* If **neither** `WillOnce()` **nor** `WillRepeatedly()` is in the
-  `EXPECT_CALL()`, the inferred cardinality is `Times(1)`.
-* If there are *n* `WillOnce()`'s but **no** `WillRepeatedly()`, where *n* >= 1, the cardinality is `Times(n)`.
-* If there are *n* `WillOnce()`'s and **one** `WillRepeatedly()`, where *n* >= 0, the cardinality is `Times(AtLeast(n))`
-  .
+*   If **neither** `WillOnce()` **nor** `WillRepeatedly()` is in the
+    `EXPECT_CALL()`, the inferred cardinality is `Times(1)`.
+*   If there are *n* `WillOnce()`'s but **no** `WillRepeatedly()`, where *n* >=
+    1, the cardinality is `Times(n)`.
+*   If there are *n* `WillOnce()`'s and **one** `WillRepeatedly()`, where *n* >=
+    0, the cardinality is `Times(AtLeast(n))`.
 
-**Quick quiz:** what do you think will happen if a function is expected to be called twice but actually called four
-times?
+**Quick quiz:** what do you think will happen if a function is expected to be
+called twice but actually called four times?
 
 ### Actions: What Should It Do?
 
-Remember that a mock object doesn't really have a working implementation? We as users have to tell it what to do when a
-method is invoked. This is easy in gMock.
-
-First, if the return type of a mock function is a built-in type or a pointer, the function has a **default action** (
-a `void` function will just return, a
-`bool` function will return `false`, and other functions will return 0). In addition, in C++ 11 and above, a mock
-function whose return type is default-constructible (i.e. has a default constructor) has a default action of returning a
-default-constructed value. If you don't say anything, this behavior will be used.
-
-Second, if a mock function doesn't have a default action, or the default action doesn't suit you, you can specify the
-action to be taken each time the expectation matches using a series of `WillOnce()` clauses followed by an
+Remember that a mock object doesn't really have a working implementation? We as
+users have to tell it what to do when a method is invoked. This is easy in
+gMock.
+
+First, if the return type of a mock function is a built-in type or a pointer,
+the function has a **default action** (a `void` function will just return, a
+`bool` function will return `false`, and other functions will return 0). In
+addition, in C++ 11 and above, a mock function whose return type is
+default-constructible (i.e. has a default constructor) has a default action of
+returning a default-constructed value. If you don't say anything, this behavior
+will be used.
+
+Second, if a mock function doesn't have a default action, or the default action
+doesn't suit you, you can specify the action to be taken each time the
+expectation matches using a series of `WillOnce()` clauses followed by an
 optional `WillRepeatedly()`. For example,
 
 ```cpp
@@ -398,8 +457,9 @@ EXPECT_CALL(turtle, GetX())
      .WillOnce(Return(300));
 ```
 
-says that `turtle.GetX()` will be called *exactly three times* (gMock inferred this from how many `WillOnce()` clauses
-we've written, since we didn't explicitly write `Times()`), and will return 100, 200, and 300 respectively.
+says that `turtle.GetX()` will be called *exactly three times* (gMock inferred
+this from how many `WillOnce()` clauses we've written, since we didn't
+explicitly write `Times()`), and will return 100, 200, and 300 respectively.
 
 ```cpp
 using ::testing::Return;
@@ -410,22 +470,24 @@ EXPECT_CALL(turtle, GetY())
      .WillRepeatedly(Return(300));
 ```
 
-says that `turtle.GetY()` will be called *at least twice* (gMock knows this as we've written two `WillOnce()` clauses
-and a `WillRepeatedly()` while having no explicit `Times()`), will return 100 and 200 respectively the first two times,
+says that `turtle.GetY()` will be called *at least twice* (gMock knows this as
+we've written two `WillOnce()` clauses and a `WillRepeatedly()` while having no
+explicit `Times()`), will return 100 and 200 respectively the first two times,
 and 300 from the third time on.
 
-Of course, if you explicitly write a `Times()`, gMock will not try to infer the cardinality itself. What if the number
-you specified is larger than there are
-`WillOnce()` clauses? Well, after all `WillOnce()`s are used up, gMock will do the *default* action for the function
-every time (unless, of course, you have a
+Of course, if you explicitly write a `Times()`, gMock will not try to infer the
+cardinality itself. What if the number you specified is larger than there are
+`WillOnce()` clauses? Well, after all `WillOnce()`s are used up, gMock will do
+the *default* action for the function every time (unless, of course, you have a
 `WillRepeatedly()`.).
 
-What can we do inside `WillOnce()` besides `Return()`? You can return a reference using `ReturnRef(*variable*)`, or
-invoke a pre-defined function, among
-[others](gmock_cook_book.md#using-actions).
+What can we do inside `WillOnce()` besides `Return()`? You can return a
+reference using `ReturnRef(`*`variable`*`)`, or invoke a pre-defined function,
+among [others](gmock_cook_book.md#using-actions).
 
-**Important note:** The `EXPECT_CALL()` statement evaluates the action clause only once, even though the action may be
-performed many times. Therefore you must be careful about side effects. The following may not do what you want:
+**Important note:** The `EXPECT_CALL()` statement evaluates the action clause
+only once, even though the action may be performed many times. Therefore you
+must be careful about side effects. The following may not do what you want:
 
 ```cpp
 using ::testing::Return;
@@ -436,10 +498,11 @@ EXPECT_CALL(turtle, GetX())
     .WillRepeatedly(Return(n++));
 ```
 
-Instead of returning 100, 101, 102, ..., consecutively, this mock function will always return 100 as `n++` is only
-evaluated once. Similarly, `Return(new Foo)`
-will create a new `Foo` object when the `EXPECT_CALL()` is executed, and will return the same pointer every time. If you
-want the side effect to happen every time, you need to define a custom action, which we'll teach in the
+Instead of returning 100, 101, 102, ..., consecutively, this mock function will
+always return 100 as `n++` is only evaluated once. Similarly, `Return(new Foo)`
+will create a new `Foo` object when the `EXPECT_CALL()` is executed, and will
+return the same pointer every time. If you want the side effect to happen every
+time, you need to define a custom action, which we'll teach in the
 [cook book](gmock_cook_book.md).
 
 Time for another quiz! What do you think the following means?
@@ -452,21 +515,24 @@ EXPECT_CALL(turtle, GetY())
     .WillOnce(Return(100));
 ```
 
-Obviously `turtle.GetY()` is expected to be called four times. But if you think it will return 100 every time, think
-twice! Remember that one `WillOnce()`
-clause will be consumed each time the function is invoked and the default action will be taken afterwards. So the right
-answer is that `turtle.GetY()` will return 100 the first time, but **return 0 from the second time on**, as returning 0
-is the default action for `int` functions.
+Obviously `turtle.GetY()` is expected to be called four times. But if you think
+it will return 100 every time, think twice! Remember that one `WillOnce()`
+clause will be consumed each time the function is invoked and the default action
+will be taken afterwards. So the right answer is that `turtle.GetY()` will
+return 100 the first time, but **return 0 from the second time on**, as
+returning 0 is the default action for `int` functions.
 
 ### Using Multiple Expectations {#MultiExpectations}
 
-So far we've only shown examples where you have a single expectation. More realistically, you'll specify expectations on
-multiple mock methods which may be from multiple mock objects.
+So far we've only shown examples where you have a single expectation. More
+realistically, you'll specify expectations on multiple mock methods which may be
+from multiple mock objects.
 
-By default, when a mock method is invoked, gMock will search the expectations in the **reverse order** they are defined,
-and stop when an active expectation that matches the arguments is found (you can think of it as "newer rules override
-older ones."). If the matching expectation cannot take any more calls, you will get an upper-bound-violated failure.
-Here's an example:
+By default, when a mock method is invoked, gMock will search the expectations in
+the **reverse order** they are defined, and stop when an active expectation that
+matches the arguments is found (you can think of it as "newer rules override
+older ones."). If the matching expectation cannot take any more calls, you will
+get an upper-bound-violated failure. Here's an example:
 
 ```cpp
 using ::testing::_;
@@ -476,30 +542,37 @@ EXPECT_CALL(turtle, Forward(10))  // #2
     .Times(2);
 ```
 
-If `Forward(10)` is called three times in a row, the third time it will be an error, as the last matching expectation (
-#2) has been saturated. If, however, the third `Forward(10)` call is replaced by `Forward(20)`, then it would be OK, as
-now #1 will be the matching expectation.
+If `Forward(10)` is called three times in a row, the third time it will be an
+error, as the last matching expectation (#2) has been saturated. If, however,
+the third `Forward(10)` call is replaced by `Forward(20)`, then it would be OK,
+as now #1 will be the matching expectation.
 
 {: .callout .note}
-**Note:** Why does gMock search for a match in the *reverse* order of the expectations? The reason is that this allows a
-user to set up the default expectations in a mock object's constructor or the test fixture's set-up phase and then
-customize the mock by writing more specific expectations in the test body. So, if you have two expectations on the same
-method, you want to put the one with more specific matchers **after** the other, or the more specific rule would be
-shadowed by the more general one that comes after it.
+**Note:** Why does gMock search for a match in the *reverse* order of the
+expectations? The reason is that this allows a user to set up the default
+expectations in a mock object's constructor or the test fixture's set-up phase
+and then customize the mock by writing more specific expectations in the test
+body. So, if you have two expectations on the same method, you want to put the
+one with more specific matchers **after** the other, or the more specific rule
+would be shadowed by the more general one that comes after it.
 
 {: .callout .tip}
-**Tip:** It is very common to start with a catch-all expectation for a method and `Times(AnyNumber())` (omitting
-arguments, or with `_` for all arguments, if overloaded). This makes any calls to the method expected. This is not
-necessary for methods that are not mentioned at all (these are "uninteresting"), but is useful for methods that have
-some expectations, but for which other calls are ok. See
+**Tip:** It is very common to start with a catch-all expectation for a method
+and `Times(AnyNumber())` (omitting arguments, or with `_` for all arguments, if
+overloaded). This makes any calls to the method expected. This is not necessary
+for methods that are not mentioned at all (these are "uninteresting"), but is
+useful for methods that have some expectations, but for which other calls are
+ok. See
 [Understanding Uninteresting vs Unexpected Calls](gmock_cook_book.md#uninteresting-vs-unexpected).
 
 ### Ordered vs Unordered Calls {#OrderedCalls}
 
-By default, an expectation can match a call even though an earlier expectation hasn't been satisfied. In other words,
-the calls don't have to occur in the order the expectations are specified.
+By default, an expectation can match a call even though an earlier expectation
+hasn't been satisfied. In other words, the calls don't have to occur in the
+order the expectations are specified.
 
-Sometimes, you may want all the expected calls to occur in a strict order. To say this in gMock is easy:
+Sometimes, you may want all the expected calls to occur in a strict order. To
+say this in gMock is easy:
 
 ```cpp
 using ::testing::InSequence;
@@ -517,20 +590,22 @@ TEST(FooTest, DrawsLineSegment) {
 }
 ```
 
-By creating an object of type `InSequence`, all expectations in its scope are put into a *sequence* and have to occur *
-sequentially*. Since we are just relying on the constructor and destructor of this object to do the actual work, its
-name is really irrelevant.
+By creating an object of type `InSequence`, all expectations in its scope are
+put into a *sequence* and have to occur *sequentially*. Since we are just
+relying on the constructor and destructor of this object to do the actual work,
+its name is really irrelevant.
 
-In this example, we test that `Foo()` calls the three expected functions in the order as written. If a call is made
-out-of-order, it will be an error.
+In this example, we test that `Foo()` calls the three expected functions in the
+order as written. If a call is made out-of-order, it will be an error.
 
-(What if you care about the relative order of some of the calls, but not all of them? Can you specify an arbitrary
-partial order? The answer is ... yes! The details can be found [here](gmock_cook_book.md#OrderedCalls).)
+(What if you care about the relative order of some of the calls, but not all of
+them? Can you specify an arbitrary partial order? The answer is ... yes! The
+details can be found [here](gmock_cook_book.md#OrderedCalls).)
 
 ### All Expectations Are Sticky (Unless Said Otherwise) {#StickyExpectations}
 
-Now let's do a quick quiz to see how well you can use this mock stuff already. How would you test that the turtle is
-asked to go to the origin *exactly twice*
+Now let's do a quick quiz to see how well you can use this mock stuff already.
+How would you test that the turtle is asked to go to the origin *exactly twice*
 (you want to ignore any other instructions it receives)?
 
 After you've come up with your answer, take a look at ours and compare notes
@@ -546,17 +621,21 @@ EXPECT_CALL(turtle, GoTo(0, 0))  // #2
      .Times(2);
 ```
 
-Suppose `turtle.GoTo(0, 0)` is called three times. In the third time, gMock will see that the arguments match
-expectation #2 (remember that we always pick the last matching expectation). Now, since we said that there should be
-only two such calls, gMock will report an error immediately. This is basically what we've told you in
-the [Using Multiple Expectations](#MultiExpectations) section above.
+Suppose `turtle.GoTo(0, 0)` is called three times. In the third time, gMock will
+see that the arguments match expectation #2 (remember that we always pick the
+last matching expectation). Now, since we said that there should be only two
+such calls, gMock will report an error immediately. This is basically what we've
+told you in the [Using Multiple Expectations](#MultiExpectations) section above.
 
-This example shows that **expectations in gMock are "sticky" by default**, in the sense that they remain active even
-after we have reached their invocation upper bounds. This is an important rule to remember, as it affects the meaning of
-the spec, and is **different** to how it's done in many other mocking frameworks (Why'd we do that? Because we think our
-rule makes the common cases easier to express and understand.).
+This example shows that **expectations in gMock are "sticky" by default**, in
+the sense that they remain active even after we have reached their invocation
+upper bounds. This is an important rule to remember, as it affects the meaning
+of the spec, and is **different** to how it's done in many other mocking
+frameworks (Why'd we do that? Because we think our rule makes the common cases
+easier to express and understand.).
 
-Simple? Let's see if you've really understood it: what does the following code say?
+Simple? Let's see if you've really understood it: what does the following code
+say?
 
 ```cpp
 using ::testing::Return;
@@ -567,13 +646,15 @@ for (int i = n; i > 0; i--) {
 }
 ```
 
-If you think it says that `turtle.GetX()` will be called `n` times and will return 10, 20, 30, ..., consecutively, think
-twice! The problem is that, as we said, expectations are sticky. So, the second time `turtle.GetX()` is called, the
-last (latest) `EXPECT_CALL()` statement will match, and will immediately lead to an "upper bound violated" error - this
-piece of code is not very useful!
+If you think it says that `turtle.GetX()` will be called `n` times and will
+return 10, 20, 30, ..., consecutively, think twice! The problem is that, as we
+said, expectations are sticky. So, the second time `turtle.GetX()` is called,
+the last (latest) `EXPECT_CALL()` statement will match, and will immediately
+lead to an "upper bound violated" error - this piece of code is not very useful!
 
-One correct way of saying that `turtle.GetX()` will return 10, 20, 30, ..., is to explicitly say that the expectations
-are *not* sticky. In other words, they should *retire* as soon as they are saturated:
+One correct way of saying that `turtle.GetX()` will return 10, 20, 30, ..., is
+to explicitly say that the expectations are *not* sticky. In other words, they
+should *retire* as soon as they are saturated:
 
 ```cpp
 using ::testing::Return;
@@ -585,8 +666,9 @@ for (int i = n; i > 0; i--) {
 }
 ```
 
-And, there's a better way to do it: in this case, we expect the calls to occur in a specific order, and we line up the
-actions to match the order. Since the order is important here, we should make it explicit using a sequence:
+And, there's a better way to do it: in this case, we expect the calls to occur
+in a specific order, and we line up the actions to match the order. Since the
+order is important here, we should make it explicit using a sequence:
 
 ```cpp
 using ::testing::InSequence;
@@ -603,16 +685,18 @@ using ::testing::Return;
 }
 ```
 
-By the way, the other situation where an expectation may *not* be sticky is when it's in a sequence - as soon as another
-expectation that comes after it in the sequence has been used, it automatically retires (and will never be used to match
-any call).
+By the way, the other situation where an expectation may *not* be sticky is when
+it's in a sequence - as soon as another expectation that comes after it in the
+sequence has been used, it automatically retires (and will never be used to
+match any call).
 
 ### Uninteresting Calls
 
-A mock object may have many methods, and not all of them are that interesting. For example, in some tests we may not
-care about how many times `GetX()` and
+A mock object may have many methods, and not all of them are that interesting.
+For example, in some tests we may not care about how many times `GetX()` and
 `GetY()` get called.
 
-In gMock, if you are not interested in a method, just don't say anything about it. If a call to this method occurs,
-you'll see a warning in the test output, but it won't be a failure. This is called "naggy" behavior; to change, see
+In gMock, if you are not interested in a method, just don't say anything about
+it. If a call to this method occurs, you'll see a warning in the test output,
+but it won't be a failure. This is called "naggy" behavior; to change, see
 [The Nice, the Strict, and the Naggy](gmock_cook_book.md#NiceStrictNaggy).
diff --git a/external/googletest/docs/index.md b/external/googletest/docs/index.md
index c953c262..b162c740 100644
--- a/external/googletest/docs/index.md
+++ b/external/googletest/docs/index.md
@@ -2,15 +2,21 @@
 
 ## Welcome to GoogleTest!
 
-GoogleTest is Google's C++ testing and mocking framework. This user's guide has the following contents:
+GoogleTest is Google's C++ testing and mocking framework. This user's guide has
+the following contents:
 
-* [GoogleTest Primer](primer.md) - Teaches you how to write simple tests using GoogleTest. Read this first if you are
-  new to GoogleTest.
-* [GoogleTest Advanced](advanced.md) - Read this when you've finished the Primer and want to utilize GoogleTest to its
-  full potential.
-* [GoogleTest Samples](samples.md) - Describes some GoogleTest samples.
-* [GoogleTest FAQ](faq.md) - Have a question? Want some tips? Check here first.
-* [Mocking for Dummies](gmock_for_dummies.md) - Teaches you how to create mock objects and use them in tests.
-* [Mocking Cookbook](gmock_cook_book.md) - Includes tips and approaches to common mocking use cases.
-* [Mocking Cheat Sheet](gmock_cheat_sheet.md) - A handy reference for matchers, actions, invariants, and more.
-* [Mocking FAQ](gmock_faq.md) - Contains answers to some mocking-specific questions.
+*   [GoogleTest Primer](primer.md) - Teaches you how to write simple tests using
+    GoogleTest. Read this first if you are new to GoogleTest.
+*   [GoogleTest Advanced](advanced.md) - Read this when you've finished the
+    Primer and want to utilize GoogleTest to its full potential.
+*   [GoogleTest Samples](samples.md) - Describes some GoogleTest samples.
+*   [GoogleTest FAQ](faq.md) - Have a question? Want some tips? Check here
+    first.
+*   [Mocking for Dummies](gmock_for_dummies.md) - Teaches you how to create mock
+    objects and use them in tests.
+*   [Mocking Cookbook](gmock_cook_book.md) - Includes tips and approaches to
+    common mocking use cases.
+*   [Mocking Cheat Sheet](gmock_cheat_sheet.md) - A handy reference for
+    matchers, actions, invariants, and more.
+*   [Mocking FAQ](gmock_faq.md) - Contains answers to some mocking-specific
+    questions.
diff --git a/external/googletest/docs/pkgconfig.md b/external/googletest/docs/pkgconfig.md
index ec3239d5..bf05d593 100644
--- a/external/googletest/docs/pkgconfig.md
+++ b/external/googletest/docs/pkgconfig.md
@@ -1,16 +1,17 @@
 ## Using GoogleTest from various build systems
 
-GoogleTest comes with pkg-config files that can be used to determine all necessary flags for compiling and linking to
-GoogleTest (and GoogleMock). Pkg-config is a standardised plain-text format containing
-
-* the includedir (-I) path
-* necessary macro (-D) definitions
-* further required flags (-pthread)
-* the library (-L) path
-* the library (-l) to link to
-
-All current build systems support pkg-config in one way or another. For all examples here we assume you want to compile
-the sample
+GoogleTest comes with pkg-config files that can be used to determine all
+necessary flags for compiling and linking to GoogleTest (and GoogleMock).
+Pkg-config is a standardised plain-text format containing
+
+*   the includedir (-I) path
+*   necessary macro (-D) definitions
+*   further required flags (-pthread)
+*   the library (-L) path
+*   the library (-l) to link to
+
+All current build systems support pkg-config in one way or another. For all
+examples here we assume you want to compile the sample
 `samples/sample3_unittest.cc`.
 
 ### CMake
@@ -18,34 +19,33 @@ the sample
 Using `pkg-config` in CMake is fairly easy:
 
 ```cmake
-cmake_minimum_required(VERSION 3.0)
-
-cmake_policy(SET CMP0048 NEW)
-project(my_gtest_pkgconfig VERSION 0.0.1 LANGUAGES CXX)
-
 find_package(PkgConfig)
 pkg_search_module(GTEST REQUIRED gtest_main)
 
-add_executable(testapp samples/sample3_unittest.cc)
-target_link_libraries(testapp ${GTEST_LDFLAGS})
-target_compile_options(testapp PUBLIC ${GTEST_CFLAGS})
+add_executable(testapp)
+target_sources(testapp PRIVATE samples/sample3_unittest.cc)
+target_link_libraries(testapp PRIVATE ${GTEST_LDFLAGS})
+target_compile_options(testapp PRIVATE ${GTEST_CFLAGS})
 
-include(CTest)
+enable_testing()
 add_test(first_and_only_test testapp)
 ```
 
 It is generally recommended that you use `target_compile_options` + `_CFLAGS`
-over `target_include_directories` + `_INCLUDE_DIRS` as the former includes not just -I flags (GoogleTest might require a
-macro indicating to internal headers that all libraries have been compiled with threading enabled. In addition,
-GoogleTest might also require `-pthread` in the compiling step, and as such splitting the pkg-config `Cflags` variable
-into include dirs and macros for
-`target_compile_definitions()` might still miss this). The same recommendation goes for using `_LDFLAGS` over the more
-commonplace `_LIBRARIES`, which happens to discard `-L` flags and `-pthread`.
+over `target_include_directories` + `_INCLUDE_DIRS` as the former includes not
+just -I flags (GoogleTest might require a macro indicating to internal headers
+that all libraries have been compiled with threading enabled. In addition,
+GoogleTest might also require `-pthread` in the compiling step, and as such
+splitting the pkg-config `Cflags` variable into include dirs and macros for
+`target_compile_definitions()` might still miss this). The same recommendation
+goes for using `_LDFLAGS` over the more commonplace `_LIBRARIES`, which happens
+to discard `-L` flags and `-pthread`.
 
 ### Help! pkg-config can't find GoogleTest!
 
-Let's say you have a `CMakeLists.txt` along the lines of the one in this tutorial and you try to run `cmake`. It is very
-possible that you get a failure along the lines of:
+Let's say you have a `CMakeLists.txt` along the lines of the one in this
+tutorial and you try to run `cmake`. It is very possible that you get a failure
+along the lines of:
 
 ```
 -- Checking for one of the modules 'gtest_main'
@@ -53,10 +53,11 @@ CMake Error at /usr/share/cmake/Modules/FindPkgConfig.cmake:640 (message):
   None of the required 'gtest_main' found
 ```
 
-These failures are common if you installed GoogleTest yourself and have not sourced it from a distro or other package
-manager. If so, you need to tell pkg-config where it can find the `.pc` files containing the information. Say you
-installed GoogleTest to `/usr/local`, then it might be that the `.pc` files are installed
-under `/usr/local/lib64/pkgconfig`. If you set
+These failures are common if you installed GoogleTest yourself and have not
+sourced it from a distro or other package manager. If so, you need to tell
+pkg-config where it can find the `.pc` files containing the information. Say you
+installed GoogleTest to `/usr/local`, then it might be that the `.pc` files are
+installed under `/usr/local/lib64/pkgconfig`. If you set
 
 ```
 export PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig
@@ -66,9 +67,9 @@ pkg-config will also try to look in `PKG_CONFIG_PATH` to find `gtest_main.pc`.
 
 ### Using pkg-config in a cross-compilation setting
 
-Pkg-config can be used in a cross-compilation setting too. To do this, let's assume the final prefix of the
-cross-compiled installation will be `/usr`, and your sysroot is `/home/MYUSER/sysroot`. Configure and install GTest
-using
+Pkg-config can be used in a cross-compilation setting too. To do this, let's
+assume the final prefix of the cross-compiled installation will be `/usr`, and
+your sysroot is `/home/MYUSER/sysroot`. Configure and install GTest using
 
 ```
 mkdir build && cmake -DCMAKE_INSTALL_PREFIX=/usr ..
@@ -80,16 +81,17 @@ Install into the sysroot using `DESTDIR`:
 make -j install DESTDIR=/home/MYUSER/sysroot
 ```
 
-Before we continue, it is recommended to **always** define the following two variables for pkg-config in a
-cross-compilation setting:
+Before we continue, it is recommended to **always** define the following two
+variables for pkg-config in a cross-compilation setting:
 
 ```
 export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=yes
 export PKG_CONFIG_ALLOW_SYSTEM_LIBS=yes
 ```
 
-otherwise `pkg-config` will filter `-I` and `-L` flags against standard prefixes such as `/usr` (
-see https://bugs.freedesktop.org/show_bug.cgi?id=28264#c3 for reasons why this stripping needs to occur usually).
+otherwise `pkg-config` will filter `-I` and `-L` flags against standard prefixes
+such as `/usr` (see https://bugs.freedesktop.org/show_bug.cgi?id=28264#c3 for
+reasons why this stripping needs to occur usually).
 
 If you look at the generated pkg-config file, it will look something like
 
@@ -99,13 +101,14 @@ includedir=/usr/include
 
 Name: gtest
 Description: GoogleTest (without main() function)
-Version: 1.10.0
+Version: 1.11.0
 URL: https://github.com/google/googletest
 Libs: -L${libdir} -lgtest -lpthread
 Cflags: -I${includedir} -DGTEST_HAS_PTHREAD=1 -lpthread
 ```
 
-Notice that the sysroot is not included in `libdir` and `includedir`! If you try to run `pkg-config` with the correct
+Notice that the sysroot is not included in `libdir` and `includedir`! If you try
+to run `pkg-config` with the correct
 `PKG_CONFIG_LIBDIR=/home/MYUSER/sysroot/usr/lib64/pkgconfig` against this `.pc`
 file, you will get
 
@@ -116,8 +119,9 @@ $ pkg-config --libs gtest
 -L/usr/lib64 -lgtest -lpthread
 ```
 
-which is obviously wrong and points to the `CBUILD` and not `CHOST` root. In order to use this in a cross-compilation
-setting, we need to tell pkg-config to inject the actual sysroot into `-I` and `-L` variables. Let us now tell
+which is obviously wrong and points to the `CBUILD` and not `CHOST` root. In
+order to use this in a cross-compilation setting, we need to tell pkg-config to
+inject the actual sysroot into `-I` and `-L` variables. Let us now tell
 pkg-config about the actual sysroot
 
 ```
@@ -135,5 +139,6 @@ $ pkg-config --libs gtest
 -L/home/MYUSER/sysroot/usr/lib64 -lgtest -lpthread
 ```
 
-which contains the correct sysroot now. For a more comprehensive guide to also including `${CHOST}` in build system
-calls, see the excellent tutorial by Diego Elio Pettenò: <https://autotools.io/pkgconfig/cross-compiling.html>
+which contains the correct sysroot now. For a more comprehensive guide to also
+including `${CHOST}` in build system calls, see the excellent tutorial by Diego
+Elio Pettenò: <https://autotools.io/pkgconfig/cross-compiling.html>
diff --git a/external/googletest/docs/platforms.md b/external/googletest/docs/platforms.md
index aa73069f..d35a7be0 100644
--- a/external/googletest/docs/platforms.md
+++ b/external/googletest/docs/platforms.md
@@ -1,32 +1,8 @@
 # Supported Platforms
 
-GoogleTest requires a codebase and compiler compliant with the C++11 standard or newer.
-
-The GoogleTest code is officially supported on the following platforms. Operating systems or tools not listed below are
-community-supported. For community-supported platforms, patches that do not complicate the code may be considered.
-
-If you notice any problems on your platform, please file an issue on the
-[GoogleTest GitHub Issue Tracker](https://github.com/google/googletest/issues). Pull requests containing fixes are
-welcome!
-
-### Operating systems
-
-* Linux
-* macOS
-* Windows
-
-### Compilers
-
-* gcc 5.0+
-* clang 5.0+
-* MSVC 2015+
-
-**macOS users:** Xcode 9.3+ provides clang 5.0+.
-
-### Build systems
-
-* [Bazel](https://bazel.build/)
-* [CMake](https://cmake.org/)
-
-Bazel is the build system used by the team internally and in tests. CMake is supported on a best-effort basis and by the
-community.
+GoogleTest follows Google's
+[Foundational C++ Support Policy](https://opensource.google/documentation/policies/cplusplus-support).
+See
+[this table](https://github.com/google/oss-policies-info/blob/main/foundational-cxx-support-matrix.md)
+for a list of currently supported versions compilers, platforms, and build
+tools.
diff --git a/external/googletest/docs/primer.md b/external/googletest/docs/primer.md
index be1eb28d..69d6c6dd 100644
--- a/external/googletest/docs/primer.md
+++ b/external/googletest/docs/primer.md
@@ -1,106 +1,126 @@
-# Googletest Primer
-
-## Introduction: Why googletest?
-
-*googletest* helps you write better C++ tests.
-
-googletest is a testing framework developed by the Testing Technology team with Google's specific requirements and
-constraints in mind. Whether you work on Linux, Windows, or a Mac, if you write C++ code, googletest can help you. And
-it supports *any* kind of tests, not just unit tests.
-
-So what makes a good test, and how does googletest fit in? We believe:
-
-1. Tests should be *independent* and *repeatable*. It's a pain to debug a test that succeeds or fails as a result of
-   other tests. googletest isolates the tests by running each of them on a different object. When a test fails,
-   googletest allows you to run it in isolation for quick debugging.
-2. Tests should be well *organized* and reflect the structure of the tested code. googletest groups related tests into
-   test suites that can share data and subroutines. This common pattern is easy to recognize and makes tests easy to
-   maintain. Such consistency is especially helpful when people switch projects and start to work on a new code base.
-3. Tests should be *portable* and *reusable*. Google has a lot of code that is platform-neutral; its tests should also
-   be platform-neutral. googletest works on different OSes, with different compilers, with or without exceptions, so
-   googletest tests can work with a variety of configurations.
-4. When tests fail, they should provide as much *information* about the problem as possible. googletest doesn't stop at
-   the first test failure. Instead, it only stops the current test and continues with the next. You can also set up
-   tests that report non-fatal failures after which the current test continues. Thus, you can detect and fix multiple
-   bugs in a single run-edit-compile cycle.
-5. The testing framework should liberate test writers from housekeeping chores and let them focus on the test *content*.
-   googletest automatically keeps track of all tests defined, and doesn't require the user to enumerate them in order to
-   run them.
-6. Tests should be *fast*. With googletest, you can reuse shared resources across tests and pay for the set-up/tear-down
-   only once, without making tests depend on each other.
-
-Since googletest is based on the popular xUnit architecture, you'll feel right at home if you've used JUnit or PyUnit
-before. If not, it will take you about 10 minutes to learn the basics and get started. So let's go!
-
-## Beware of the nomenclature
+# GoogleTest Primer
+
+## Introduction: Why GoogleTest?
+
+*GoogleTest* helps you write better C++ tests.
+
+GoogleTest is a testing framework developed by the Testing Technology team with
+Google's specific requirements and constraints in mind. Whether you work on
+Linux, Windows, or a Mac, if you write C++ code, GoogleTest can help you. And it
+supports *any* kind of tests, not just unit tests.
+
+So what makes a good test, and how does GoogleTest fit in? We believe:
+
+1.  Tests should be *independent* and *repeatable*. It's a pain to debug a test
+    that succeeds or fails as a result of other tests. GoogleTest isolates the
+    tests by running each of them on a different object. When a test fails,
+    GoogleTest allows you to run it in isolation for quick debugging.
+2.  Tests should be well *organized* and reflect the structure of the tested
+    code. GoogleTest groups related tests into test suites that can share data
+    and subroutines. This common pattern is easy to recognize and makes tests
+    easy to maintain. Such consistency is especially helpful when people switch
+    projects and start to work on a new code base.
+3.  Tests should be *portable* and *reusable*. Google has a lot of code that is
+    platform-neutral; its tests should also be platform-neutral. GoogleTest
+    works on different OSes, with different compilers, with or without
+    exceptions, so GoogleTest tests can work with a variety of configurations.
+4.  When tests fail, they should provide as much *information* about the problem
+    as possible. GoogleTest doesn't stop at the first test failure. Instead, it
+    only stops the current test and continues with the next. You can also set up
+    tests that report non-fatal failures after which the current test continues.
+    Thus, you can detect and fix multiple bugs in a single run-edit-compile
+    cycle.
+5.  The testing framework should liberate test writers from housekeeping chores
+    and let them focus on the test *content*. GoogleTest automatically keeps
+    track of all tests defined, and doesn't require the user to enumerate them
+    in order to run them.
+6.  Tests should be *fast*. With GoogleTest, you can reuse shared resources
+    across tests and pay for the set-up/tear-down only once, without making
+    tests depend on each other.
+
+Since GoogleTest is based on the popular xUnit architecture, you'll feel right
+at home if you've used JUnit or PyUnit before. If not, it will take you about 10
+minutes to learn the basics and get started. So let's go!
+
+## Beware of the Nomenclature
 
 {: .callout .note}
-_Note:_ There might be some confusion arising from different definitions of the terms _Test_, _Test Case_ and _Test
-Suite_, so beware of misunderstanding these.
+*Note:* There might be some confusion arising from different definitions of the
+terms *Test*, *Test Case* and *Test Suite*, so beware of misunderstanding these.
 
-Historically, googletest started to use the term _Test Case_ for grouping related tests, whereas current publications,
-including International Software Testing Qualifications Board ([ISTQB](http://www.istqb.org/)) materials and various
-textbooks on software quality, use the term
-_[Test Suite][istqb test suite]_ for this.
+Historically, GoogleTest started to use the term *Test Case* for grouping
+related tests, whereas current publications, including International Software
+Testing Qualifications Board ([ISTQB](https://www.istqb.org/)) materials and
+various textbooks on software quality, use the term
+*[Test Suite][istqb test suite]* for this.
 
-The related term _Test_, as it is used in googletest, corresponds to the term
-_[Test Case][istqb test case]_ of ISTQB and others.
+The related term *Test*, as it is used in GoogleTest, corresponds to the term
+*[Test Case][istqb test case]* of ISTQB and others.
 
-The term _Test_ is commonly of broad enough sense, including ISTQB's definition of _Test Case_, so it's not much of a
-problem here. But the term _Test Case_ as was used in Google Test is of contradictory sense and thus confusing.
+The term *Test* is commonly of broad enough sense, including ISTQB's definition
+of *Test Case*, so it's not much of a problem here. But the term *Test Case* as
+was used in Google Test is of contradictory sense and thus confusing.
 
-googletest recently started replacing the term _Test Case_ with _Test Suite_. The preferred API is *TestSuite*. The
-older TestCase API is being slowly deprecated and refactored away.
+GoogleTest recently started replacing the term *Test Case* with *Test Suite*.
+The preferred API is *TestSuite*. The older TestCase API is being slowly
+deprecated and refactored away.
 
 So please be aware of the different definitions of the terms:
 
-Meaning                                                                              | googletest Term         | [ISTQB](http://www.istqb.org/) Term
+
+Meaning                                                                              | GoogleTest Term         | [ISTQB](https://www.istqb.org/) Term
 :----------------------------------------------------------------------------------- | :---------------------- | :----------------------------------
 Exercise a particular program path with specific input values and verify the results | [TEST()](#simple-tests) | [Test Case][istqb test case]
 
-[istqb test case]: http://glossary.istqb.org/en/search/test%20case
 
-[istqb test suite]: http://glossary.istqb.org/en/search/test%20suite
+[istqb test case]: https://glossary.istqb.org/en_US/term/test-case
+[istqb test suite]: https://glossary.istqb.org/en_US/term/test-suite
 
 ## Basic Concepts
 
-When using googletest, you start by writing *assertions*, which are statements that check whether a condition is true.
-An assertion's result can be *success*,
-*nonfatal failure*, or *fatal failure*. If a fatal failure occurs, it aborts the current function; otherwise the program
-continues normally.
+When using GoogleTest, you start by writing *assertions*, which are statements
+that check whether a condition is true. An assertion's result can be *success*,
+*nonfatal failure*, or *fatal failure*. If a fatal failure occurs, it aborts the
+current function; otherwise the program continues normally.
 
-*Tests* use assertions to verify the tested code's behavior. If a test crashes or has a failed assertion, then it *
-fails*; otherwise it *succeeds*.
+*Tests* use assertions to verify the tested code's behavior. If a test crashes
+or has a failed assertion, then it *fails*; otherwise it *succeeds*.
 
-A *test suite* contains one or many tests. You should group your tests into test suites that reflect the structure of
-the tested code. When multiple tests in a test suite need to share common objects and subroutines, you can put them into
-a
+A *test suite* contains one or many tests. You should group your tests into test
+suites that reflect the structure of the tested code. When multiple tests in a
+test suite need to share common objects and subroutines, you can put them into a
 *test fixture* class.
 
 A *test program* can contain multiple test suites.
 
-We'll now explain how to write a test program, starting at the individual assertion level and building up to tests and
-test suites.
+We'll now explain how to write a test program, starting at the individual
+assertion level and building up to tests and test suites.
 
 ## Assertions
 
-googletest assertions are macros that resemble function calls. You test a class or function by making assertions about
-its behavior. When an assertion fails, googletest prints the assertion's source file and line number location, along
-with a failure message. You may also supply a custom failure message which will be appended to googletest's message.
-
-The assertions come in pairs that test the same thing but have different effects on the current function. `ASSERT_*`
-versions generate fatal failures when they fail, and **abort the current function**. `EXPECT_*` versions generate
-nonfatal failures, which don't abort the current function. Usually `EXPECT_*` are preferred, as they allow more than one
-failure to be reported in a test. However, you should use `ASSERT_*` if it doesn't make sense to continue when the
+GoogleTest assertions are macros that resemble function calls. You test a class
+or function by making assertions about its behavior. When an assertion fails,
+GoogleTest prints the assertion's source file and line number location, along
+with a failure message. You may also supply a custom failure message which will
+be appended to GoogleTest's message.
+
+The assertions come in pairs that test the same thing but have different effects
+on the current function. `ASSERT_*` versions generate fatal failures when they
+fail, and **abort the current function**. `EXPECT_*` versions generate nonfatal
+failures, which don't abort the current function. Usually `EXPECT_*` are
+preferred, as they allow more than one failure to be reported in a test.
+However, you should use `ASSERT_*` if it doesn't make sense to continue when the
 assertion in question fails.
 
-Since a failed `ASSERT_*` returns from the current function immediately, possibly skipping clean-up code that comes
-after it, it may cause a space leak. Depending on the nature of the leak, it may or may not be worth fixing - so keep
+Since a failed `ASSERT_*` returns from the current function immediately,
+possibly skipping clean-up code that comes after it, it may cause a space leak.
+Depending on the nature of the leak, it may or may not be worth fixing - so keep
 this in mind if you get a heap checker error in addition to assertion errors.
 
 To provide a custom failure message, simply stream it into the macro using the
 `<<` operator or a sequence of such operators. See the following example, using
-the [`ASSERT_EQ` and `EXPECT_EQ`](reference/assertions.md#EXPECT_EQ) macros to verify value equality:
+the [`ASSERT_EQ` and `EXPECT_EQ`](reference/assertions.md#EXPECT_EQ) macros to
+verify value equality:
 
 ```c++
 ASSERT_EQ(x.size(), y.size()) << "Vectors x and y are of unequal length";
@@ -110,26 +130,29 @@ for (int i = 0; i < x.size(); ++i) {
 }
 ```
 
-Anything that can be streamed to an `ostream` can be streamed to an assertion macro--in particular, C strings
-and `string` objects. If a wide string
-(`wchar_t*`, `TCHAR*` in `UNICODE` mode on Windows, or `std::wstring`) is streamed to an assertion, it will be
-translated to UTF-8 when printed.
+Anything that can be streamed to an `ostream` can be streamed to an assertion
+macro--in particular, C strings and `string` objects. If a wide string
+(`wchar_t*`, `TCHAR*` in `UNICODE` mode on Windows, or `std::wstring`) is
+streamed to an assertion, it will be translated to UTF-8 when printed.
 
-GoogleTest provides a collection of assertions for verifying the behavior of your code in various ways. You can check
-Boolean conditions, compare values based on relational operators, verify string values, floating-point values, and much
-more. There are even assertions that enable you to verify more complex states by providing custom predicates. For the
-complete list of assertions provided by GoogleTest, see the [Assertions Reference](reference/assertions.md).
+GoogleTest provides a collection of assertions for verifying the behavior of
+your code in various ways. You can check Boolean conditions, compare values
+based on relational operators, verify string values, floating-point values, and
+much more. There are even assertions that enable you to verify more complex
+states by providing custom predicates. For the complete list of assertions
+provided by GoogleTest, see the [Assertions Reference](reference/assertions.md).
 
 ## Simple Tests
 
 To create a test:
 
-1. Use the `TEST()` macro to define and name a test function. These are ordinary C++ functions that don't return a
-   value.
-2. In this function, along with any valid C++ statements you want to include, use the various googletest assertions to
-   check values.
-3. The test's result is determined by the assertions; if any assertion in the test fails (either fatally or non-fatally)
-   , or if the test crashes, the entire test fails. Otherwise, it succeeds.
+1.  Use the `TEST()` macro to define and name a test function. These are
+    ordinary C++ functions that don't return a value.
+2.  In this function, along with any valid C++ statements you want to include,
+    use the various GoogleTest assertions to check values.
+3.  The test's result is determined by the assertions; if any assertion in the
+    test fails (either fatally or non-fatally), or if the test crashes, the
+    entire test fails. Otherwise, it succeeds.
 
 ```c++
 TEST(TestSuiteName, TestName) {
@@ -137,10 +160,12 @@ TEST(TestSuiteName, TestName) {
 }
 ```
 
-`TEST()` arguments go from general to specific. The *first* argument is the name of the test suite, and the *second*
-argument is the test's name within the test suite. Both names must be valid C++ identifiers, and they should not contain
-any underscores (`_`). A test's *full name* consists of its containing test suite and its individual name. Tests from
-different test suites can have the same individual name.
+`TEST()` arguments go from general to specific. The *first* argument is the name
+of the test suite, and the *second* argument is the test's name within the test
+suite. Both names must be valid C++ identifiers, and they should not contain any
+underscores (`_`). A test's *full name* consists of its containing test suite
+and its individual name. Tests from different test suites can have the same
+individual name.
 
 For example, let's take a simple integer function:
 
@@ -165,60 +190,70 @@ TEST(FactorialTest, HandlesPositiveInput) {
 }
 ```
 
-googletest groups the test results by test suites, so logically related tests should be in the same test suite; in other
-words, the first argument to their
+GoogleTest groups the test results by test suites, so logically related tests
+should be in the same test suite; in other words, the first argument to their
 `TEST()` should be the same. In the above example, we have two tests,
-`HandlesZeroInput` and `HandlesPositiveInput`, that belong to the same test suite `FactorialTest`.
+`HandlesZeroInput` and `HandlesPositiveInput`, that belong to the same test
+suite `FactorialTest`.
 
-When naming your test suites and tests, you should follow the same convention as for
+When naming your test suites and tests, you should follow the same convention as
+for
 [naming functions and classes](https://google.github.io/styleguide/cppguide.html#Function_Names).
 
 **Availability**: Linux, Windows, Mac.
 
 ## Test Fixtures: Using the Same Data Configuration for Multiple Tests {#same-data-multiple-tests}
 
-If you find yourself writing two or more tests that operate on similar data, you can use a *test fixture*. This allows
-you to reuse the same configuration of objects for several different tests.
+If you find yourself writing two or more tests that operate on similar data, you
+can use a *test fixture*. This allows you to reuse the same configuration of
+objects for several different tests.
 
 To create a fixture:
 
-1. Derive a class from `::testing::Test` . Start its body with `protected:`, as we'll want to access fixture members
-   from sub-classes.
-2. Inside the class, declare any objects you plan to use.
-3. If necessary, write a default constructor or `SetUp()` function to prepare the objects for each test. A common
-   mistake is to spell `SetUp()` as
-   **`Setup()`** with a small `u` - Use `override` in C++11 to make sure you spelled it correctly.
-4. If necessary, write a destructor or `TearDown()` function to release any resources you allocated in `SetUp()` . To
-   learn when you should use the constructor/destructor and when you should use `SetUp()/TearDown()`, read
-   the [FAQ](faq.md#CtorVsSetUp).
-5. If needed, define subroutines for your tests to share.
-
-When using a fixture, use `TEST_F()` instead of `TEST()` as it allows you to access objects and subroutines in the test
-fixture:
+1.  Derive a class from `testing::Test` . Start its body with `protected:`, as
+    we'll want to access fixture members from sub-classes.
+2.  Inside the class, declare any objects you plan to use.
+3.  If necessary, write a default constructor or `SetUp()` function to prepare
+    the objects for each test. A common mistake is to spell `SetUp()` as
+    **`Setup()`** with a small `u` - Use `override` in C++11 to make sure you
+    spelled it correctly.
+4.  If necessary, write a destructor or `TearDown()` function to release any
+    resources you allocated in `SetUp()` . To learn when you should use the
+    constructor/destructor and when you should use `SetUp()/TearDown()`, read
+    the [FAQ](faq.md#CtorVsSetUp).
+5.  If needed, define subroutines for your tests to share.
+
+When using a fixture, use `TEST_F()` instead of `TEST()` as it allows you to
+access objects and subroutines in the test fixture:
 
 ```c++
-TEST_F(TestFixtureName, TestName) {
+TEST_F(TestFixtureClassName, TestName) {
   ... test body ...
 }
 ```
 
-Like `TEST()`, the first argument is the test suite name, but for `TEST_F()`
-this must be the name of the test fixture class. You've probably guessed: `_F`
-is for fixture.
+Unlike `TEST()`, in `TEST_F()` the first argument must be the name of the test
+fixture class. (`_F` stands for "Fixture"). No test suite name is specified for
+this macro.
 
-Unfortunately, the C++ macro system does not allow us to create a single macro that can handle both types of tests.
-Using the wrong macro causes a compiler error.
+Unfortunately, the C++ macro system does not allow us to create a single macro
+that can handle both types of tests. Using the wrong macro causes a compiler
+error.
 
 Also, you must first define a test fixture class before using it in a
-`TEST_F()`, or you'll get the compiler error "`virtual outside class declaration`".
+`TEST_F()`, or you'll get the compiler error "`virtual outside class
+declaration`".
 
-For each test defined with `TEST_F()`, googletest will create a *fresh* test fixture at runtime, immediately initialize
-it via `SetUp()`, run the test, clean up by calling `TearDown()`, and then delete the test fixture. Note that different
-tests in the same test suite have different test fixture objects, and googletest always deletes a test fixture before it
-creates the next one. googletest does **not** reuse the same test fixture for multiple tests. Any changes one test makes
-to the fixture do not affect other tests.
+For each test defined with `TEST_F()`, GoogleTest will create a *fresh* test
+fixture at runtime, immediately initialize it via `SetUp()`, run the test, clean
+up by calling `TearDown()`, and then delete the test fixture. Note that
+different tests in the same test suite have different test fixture objects, and
+GoogleTest always deletes a test fixture before it creates the next one.
+GoogleTest does **not** reuse the same test fixture for multiple tests. Any
+changes one test makes to the fixture do not affect other tests.
 
-As an example, let's write tests for a FIFO queue class named `Queue`, which has the following interface:
+As an example, let's write tests for a FIFO queue class named `Queue`, which has
+the following interface:
 
 ```c++
 template <typename E>  // E is the element type.
@@ -236,15 +271,16 @@ First, define a fixture class. By convention, you should give it the name
 `FooTest` where `Foo` is the class being tested.
 
 ```c++
-class QueueTest : public ::testing::Test {
+class QueueTest : public testing::Test {
  protected:
-  void SetUp() override {
+  QueueTest() {
+     // q0_ remains empty
      q1_.Enqueue(1);
      q2_.Enqueue(2);
      q2_.Enqueue(3);
   }
 
-  // void TearDown() override {}
+  // ~QueueTest() override = default;
 
   Queue<int> q0_;
   Queue<int> q1_;
@@ -252,8 +288,9 @@ class QueueTest : public ::testing::Test {
 };
 ```
 
-In this case, `TearDown()` is not needed since we don't have to clean up after each test, other than what's already done
-by the destructor.
+In this case, we don't need to define a destructor or a `TearDown()` method,
+because the implicit destructor generated by the compiler will perform all of
+the necessary cleanup.
 
 Now we'll write tests using `TEST_F()` and this fixture.
 
@@ -280,50 +317,51 @@ TEST_F(QueueTest, DequeueWorks) {
 }
 ```
 
-The above uses both `ASSERT_*` and `EXPECT_*` assertions. The rule of thumb is to use `EXPECT_*` when you want the test
-to continue to reveal more errors after the assertion failure, and use `ASSERT_*` when continuing after failure doesn't
+The above uses both `ASSERT_*` and `EXPECT_*` assertions. The rule of thumb is
+to use `EXPECT_*` when you want the test to continue to reveal more errors after
+the assertion failure, and use `ASSERT_*` when continuing after failure doesn't
 make sense. For example, the second assertion in the `Dequeue` test is
-`ASSERT_NE(n, nullptr)`, as we need to dereference the pointer `n` later, which would lead to a segfault when `n`
-is `NULL`.
+`ASSERT_NE(n, nullptr)`, as we need to dereference the pointer `n` later, which
+would lead to a segfault when `n` is `NULL`.
 
 When these tests run, the following happens:
 
-1. googletest constructs a `QueueTest` object (let's call it `t1`).
-2. `t1.SetUp()` initializes `t1`.
-3. The first test (`IsEmptyInitially`) runs on `t1`.
-4. `t1.TearDown()` cleans up after the test finishes.
-5. `t1` is destructed.
-6. The above steps are repeated on another `QueueTest` object, this time running the `DequeueWorks` test.
+1.  GoogleTest constructs a `QueueTest` object (let's call it `t1`).
+2.  The first test (`IsEmptyInitially`) runs on `t1`.
+3.  `t1` is destructed.
+4.  The above steps are repeated on another `QueueTest` object, this time
+    running the `DequeueWorks` test.
 
 **Availability**: Linux, Windows, Mac.
 
 ## Invoking the Tests
 
-`TEST()` and `TEST_F()` implicitly register their tests with googletest. So, unlike with many other C++ testing
-frameworks, you don't have to re-list all your defined tests in order to run them.
+`TEST()` and `TEST_F()` implicitly register their tests with GoogleTest. So,
+unlike with many other C++ testing frameworks, you don't have to re-list all
+your defined tests in order to run them.
 
-After defining your tests, you can run them with `RUN_ALL_TESTS()`, which returns `0` if all the tests are successful,
-or `1` otherwise. Note that
-`RUN_ALL_TESTS()` runs *all tests* in your link unit--they can be from different test suites, or even different source
-files.
+After defining your tests, you can run them with `RUN_ALL_TESTS()`, which
+returns `0` if all the tests are successful, or `1` otherwise. Note that
+`RUN_ALL_TESTS()` runs *all tests* in your link unit--they can be from different
+test suites, or even different source files.
 
 When invoked, the `RUN_ALL_TESTS()` macro:
 
-* Saves the state of all googletest flags.
+*   Saves the state of all GoogleTest flags.
 
-* Creates a test fixture object for the first test.
+*   Creates a test fixture object for the first test.
 
-* Initializes it via `SetUp()`.
+*   Initializes it via `SetUp()`.
 
-* Runs the test on the fixture object.
+*   Runs the test on the fixture object.
 
-* Cleans up the fixture via `TearDown()`.
+*   Cleans up the fixture via `TearDown()`.
 
-* Deletes the fixture.
+*   Deletes the fixture.
 
-* Restores the state of all googletest flags.
+*   Restores the state of all GoogleTest flags.
 
-* Repeats the above steps for the next test, until all tests have run.
+*   Repeats the above steps for the next test, until all tests have run.
 
 If a fatal failure happens the subsequent steps will be skipped.
 
@@ -335,17 +373,18 @@ If a fatal failure happens the subsequent steps will be skipped.
 > return the value of `RUN_ALL_TESTS()`.
 >
 > Also, you should call `RUN_ALL_TESTS()` only **once**. Calling it more than
-> once conflicts with some advanced googletest features (e.g., thread-safe
+> once conflicts with some advanced GoogleTest features (e.g., thread-safe
 > [death tests](advanced.md#death-tests)) and thus is not supported.
 
 **Availability**: Linux, Windows, Mac.
 
 ## Writing the main() Function
 
-Most users should _not_ need to write their own `main` function and instead link with `gtest_main` (as opposed to
-with `gtest`), which defines a suitable entry point. See the end of this section for details. The remainder of this
-section should only apply when you need to do something custom before the tests run that cannot be expressed within the
-framework of fixtures and test suites.
+Most users should *not* need to write their own `main` function and instead link
+with `gtest_main` (as opposed to with `gtest`), which defines a suitable entry
+point. See the end of this section for details. The remainder of this section
+should only apply when you need to do something custom before the tests run that
+cannot be expressed within the framework of fixtures and test suites.
 
 If you write your own `main` function, it should return the value of
 `RUN_ALL_TESTS()`.
@@ -355,14 +394,14 @@ You can start from this boilerplate:
 ```c++
 #include "this/package/foo.h"
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 
 namespace my {
 namespace project {
 namespace {
 
 // The fixture for testing class Foo.
-class FooTest : public ::testing::Test {
+class FooTest : public testing::Test {
  protected:
   // You can remove any or all of the following functions if their bodies would
   // be empty.
@@ -410,30 +449,34 @@ TEST_F(FooTest, DoesXyz) {
 }  // namespace my
 
 int main(int argc, char **argv) {
-  ::testing::InitGoogleTest(&argc, argv);
+  testing::InitGoogleTest(&argc, argv);
   return RUN_ALL_TESTS();
 }
 ```
 
-The `::testing::InitGoogleTest()` function parses the command line for googletest flags, and removes all recognized
-flags. This allows the user to control a test program's behavior via various flags, which we'll cover in
-the [AdvancedGuide](advanced.md). You **must** call this function before calling
+The `testing::InitGoogleTest()` function parses the command line for GoogleTest
+flags, and removes all recognized flags. This allows the user to control a test
+program's behavior via various flags, which we'll cover in the
+[AdvancedGuide](advanced.md). You **must** call this function before calling
 `RUN_ALL_TESTS()`, or the flags won't be properly initialized.
 
-On Windows, `InitGoogleTest()` also works with wide strings, so it can be used in programs compiled in `UNICODE` mode as
-well.
+On Windows, `InitGoogleTest()` also works with wide strings, so it can be used
+in programs compiled in `UNICODE` mode as well.
 
-But maybe you think that writing all those `main` functions is too much work? We agree with you completely, and that's
-why Google Test provides a basic implementation of main(). If it fits your needs, then just link your test with
+But maybe you think that writing all those `main` functions is too much work? We
+agree with you completely, and that's why Google Test provides a basic
+implementation of main(). If it fits your needs, then just link your test with
 the `gtest_main` library and you are good to go.
 
-{: .callout .note} NOTE: `ParseGUnitFlags()` is deprecated in favor of `InitGoogleTest()`.
+{: .callout .note}
+NOTE: `ParseGUnitFlags()` is deprecated in favor of `InitGoogleTest()`.
 
 ## Known Limitations
 
-* Google Test is designed to be thread-safe. The implementation is thread-safe on systems where the `pthreads` library
-  is available. It is currently
-  _unsafe_ to use Google Test assertions from two threads concurrently on other systems (e.g. Windows). In most tests
-  this is not an issue as usually the assertions are done in the main thread. If you want to help, you can volunteer to
-  implement the necessary synchronization primitives in
-  `gtest-port.h` for your platform.
+*   Google Test is designed to be thread-safe. The implementation is thread-safe
+    on systems where the `pthreads` library is available. It is currently
+    *unsafe* to use Google Test assertions from two threads concurrently on
+    other systems (e.g. Windows). In most tests this is not an issue as usually
+    the assertions are done in the main thread. If you want to help, you can
+    volunteer to implement the necessary synchronization primitives in
+    `gtest-port.h` for your platform.
diff --git a/external/googletest/docs/quickstart-bazel.md b/external/googletest/docs/quickstart-bazel.md
index 08a18e99..5750f026 100644
--- a/external/googletest/docs/quickstart-bazel.md
+++ b/external/googletest/docs/quickstart-bazel.md
@@ -1,31 +1,35 @@
 # Quickstart: Building with Bazel
 
-This tutorial aims to get you up and running with GoogleTest using the Bazel build system. If you're using GoogleTest
-for the first time or need a refresher, we recommend this tutorial as a starting point.
+This tutorial aims to get you up and running with GoogleTest using the Bazel
+build system. If you're using GoogleTest for the first time or need a refresher,
+we recommend this tutorial as a starting point.
 
 ## Prerequisites
 
 To complete this tutorial, you'll need:
 
-* A compatible operating system (e.g. Linux, macOS, Windows).
-* A compatible C++ compiler that supports at least C++11.
-* [Bazel](https://bazel.build/), the preferred build system used by the GoogleTest team.
+*   A compatible operating system (e.g. Linux, macOS, Windows).
+*   A compatible C++ compiler that supports at least C++14.
+*   [Bazel](https://bazel.build/) 7.0 or higher, the preferred build system used
+    by the GoogleTest team.
 
-See [Supported Platforms](platforms.md) for more information about platforms compatible with GoogleTest.
+See [Supported Platforms](platforms.md) for more information about platforms
+compatible with GoogleTest.
 
 If you don't already have Bazel installed, see the
-[Bazel installation guide](https://docs.bazel.build/versions/master/install.html).
+[Bazel installation guide](https://bazel.build/install).
 
-{: .callout .note} Note: The terminal commands in this tutorial show a Unix shell prompt, but the commands work on the
-Windows command line as well.
+{: .callout .note} Note: The terminal commands in this tutorial show a Unix
+shell prompt, but the commands work on the Windows command line as well.
 
 ## Set up a Bazel workspace
 
 A
-[Bazel workspace](https://docs.bazel.build/versions/master/build-ref.html#workspace)
-is a directory on your filesystem that you use to manage source files for the software you want to build. Each workspace
-directory has a text file named
-`WORKSPACE` which may be empty, or may contain references to external dependencies required to build the outputs.
+[Bazel workspace](https://docs.bazel.build/versions/main/build-ref.html#workspace)
+is a directory on your filesystem that you use to manage source files for the
+software you want to build. Each workspace directory has a text file named
+`MODULE.bazel` which may be empty, or may contain references to external
+dependencies required to build the outputs.
 
 First, create a directory for your workspace:
 
@@ -33,45 +37,26 @@ First, create a directory for your workspace:
 $ mkdir my_workspace && cd my_workspace
 ```
 
-Next, you’ll create the `WORKSPACE` file to specify dependencies. A common and recommended way to depend on GoogleTest
-is to use a
-[Bazel external dependency](https://docs.bazel.build/versions/master/external.html)
-via the
-[`http_archive` rule](https://docs.bazel.build/versions/master/repo/http.html#http_archive). To do this, in the root
-directory of your workspace (`my_workspace/`), create a file named `WORKSPACE` with the following contents:
+Next, you’ll create the `MODULE.bazel` file to specify dependencies. As of Bazel
+7.0, the recommended way to consume GoogleTest is through the
+[Bazel Central Registry](https://registry.bazel.build/modules/googletest). To do
+this, create a `MODULE.bazel` file in the root directory of your Bazel workspace
+with the following content:
 
 ```
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+# MODULE.bazel
 
-http_archive(
-  name = "com_google_googletest",
-  urls = ["https://github.com/google/googletest/archive/609281088cfefc76f9d0ce82e1ff6c30cc3591e5.zip"],
-  strip_prefix = "googletest-609281088cfefc76f9d0ce82e1ff6c30cc3591e5",
-)
-```
-
-The above configuration declares a dependency on GoogleTest which is downloaded as a ZIP archive from GitHub. In the
-above example,
-`609281088cfefc76f9d0ce82e1ff6c30cc3591e5` is the Git commit hash of the GoogleTest version to use; we recommend
-updating the hash often to point to the latest version.
-
-Bazel also needs a dependency on the
-[`rules_cc` repository](https://github.com/bazelbuild/rules_cc) to build C++ code, so add the following to
-the `WORKSPACE` file:
-
-```
-http_archive(
-  name = "rules_cc",
-  urls = ["https://github.com/bazelbuild/rules_cc/archive/40548a2974f1aea06215272d9c2b47a14a24e556.zip"],
-  strip_prefix = "rules_cc-40548a2974f1aea06215272d9c2b47a14a24e556",
-)
+# Choose the most recent version available at
+# https://registry.bazel.build/modules/googletest
+bazel_dep(name = "googletest", version = "1.15.2")
 ```
 
 Now you're ready to build C++ code that uses GoogleTest.
 
 ## Create and run a binary
 
-With your Bazel workspace set up, you can now use GoogleTest code within your own project.
+With your Bazel workspace set up, you can now use GoogleTest code within your
+own project.
 
 As an example, create a file named `hello_test.cc` in your `my_workspace`
 directory with the following contents:
@@ -88,31 +73,42 @@ TEST(HelloTest, BasicAssertions) {
 }
 ```
 
-GoogleTest provides [assertions](primer.md#assertions) that you use to test the behavior of your code. The above sample
-includes the main GoogleTest header file and demonstrates some basic assertions.
+GoogleTest provides [assertions](primer.md#assertions) that you use to test the
+behavior of your code. The above sample includes the main GoogleTest header file
+and demonstrates some basic assertions.
 
-To build the code, create a file named `BUILD` in the same directory with the following contents:
+To build the code, create a file named `BUILD` in the same directory with the
+following contents:
 
 ```
-load("@rules_cc//cc:defs.bzl", "cc_test")
-
 cc_test(
-  name = "hello_test",
-  size = "small",
-  srcs = ["hello_test.cc"],
-  deps = ["@com_google_googletest//:gtest_main"],
+    name = "hello_test",
+    size = "small",
+    srcs = ["hello_test.cc"],
+    deps = [
+        "@googletest//:gtest",
+        "@googletest//:gtest_main",
+    ],
 )
 ```
 
-This `cc_test` rule declares the C++ test binary you want to build, and links to GoogleTest (`//:gtest_main`) using the
-prefix you specified in the `WORKSPACE`
-file (`@com_google_googletest`). For more information about Bazel `BUILD` files, see the
-[Bazel C++ Tutorial](https://docs.bazel.build/versions/master/tutorial/cpp.html).
+This `cc_test` rule declares the C++ test binary you want to build, and links to
+the GoogleTest library (`@googletest//:gtest"`) and the GoogleTest `main()`
+function (`@googletest//:gtest_main`). For more information about Bazel `BUILD`
+files, see the
+[Bazel C++ Tutorial](https://docs.bazel.build/versions/main/tutorial/cpp.html).
+
+{: .callout .note}
+NOTE: In the example below, we assume Clang or GCC and set `--cxxopt=-std=c++14`
+to ensure that GoogleTest is compiled as C++14 instead of the compiler's default
+setting (which could be C++11). For MSVC, the equivalent would be
+`--cxxopt=/std:c++14`. See [Supported Platforms](platforms.md) for more details
+on supported language versions.
 
 Now you can build and run your test:
 
 <pre>
-<strong>my_workspace$ bazel test --test_output=all //:hello_test</strong>
+<strong>$ bazel test --cxxopt=-std=c++14 --test_output=all //:hello_test</strong>
 INFO: Analyzed target //:hello_test (26 packages loaded, 362 targets configured).
 INFO: Found 1 test target...
 INFO: From Testing //:hello_test:
@@ -139,9 +135,12 @@ INFO: Build completed successfully, 27 total actions
 INFO: Build completed successfully, 27 total actions
 </pre>
 
-Congratulations! You've successfully built and run a test binary using GoogleTest.
+Congratulations! You've successfully built and run a test binary using
+GoogleTest.
 
 ## Next steps
 
-* [Check out the Primer](primer.md) to start learning how to write simple tests.
-* [See the code samples](samples.md) for more examples showing how to use a variety of GoogleTest features.
+*   [Check out the Primer](primer.md) to start learning how to write simple
+    tests.
+*   [See the code samples](samples.md) for more examples showing how to use a
+    variety of GoogleTest features.
diff --git a/external/googletest/docs/quickstart-cmake.md b/external/googletest/docs/quickstart-cmake.md
index 81eaeea0..4e422b74 100644
--- a/external/googletest/docs/quickstart-cmake.md
+++ b/external/googletest/docs/quickstart-cmake.md
@@ -1,34 +1,39 @@
 # Quickstart: Building with CMake
 
-This tutorial aims to get you up and running with GoogleTest using CMake. If you're using GoogleTest for the first time
-or need a refresher, we recommend this tutorial as a starting point. If your project uses Bazel, see the
+This tutorial aims to get you up and running with GoogleTest using CMake. If
+you're using GoogleTest for the first time or need a refresher, we recommend
+this tutorial as a starting point. If your project uses Bazel, see the
 [Quickstart for Bazel](quickstart-bazel.md) instead.
 
 ## Prerequisites
 
 To complete this tutorial, you'll need:
 
-* A compatible operating system (e.g. Linux, macOS, Windows).
-* A compatible C++ compiler that supports at least C++11.
-* [CMake](https://cmake.org/) and a compatible build tool for building the project.
-    * Compatible build tools include
-      [Make](https://www.gnu.org/software/make/),
-      [Ninja](https://ninja-build.org/), and others - see
-      [CMake Generators](https://cmake.org/cmake/help/latest/manual/cmake-generators.7.html)
-      for more information.
+*   A compatible operating system (e.g. Linux, macOS, Windows).
+*   A compatible C++ compiler that supports at least C++14.
+*   [CMake](https://cmake.org/) and a compatible build tool for building the
+    project.
+    *   Compatible build tools include
+        [Make](https://www.gnu.org/software/make/),
+        [Ninja](https://ninja-build.org/), and others - see
+        [CMake Generators](https://cmake.org/cmake/help/latest/manual/cmake-generators.7.html)
+        for more information.
 
-See [Supported Platforms](platforms.md) for more information about platforms compatible with GoogleTest.
+See [Supported Platforms](platforms.md) for more information about platforms
+compatible with GoogleTest.
 
 If you don't already have CMake installed, see the
 [CMake installation guide](https://cmake.org/install).
 
-{: .callout .note} Note: The terminal commands in this tutorial show a Unix shell prompt, but the commands work on the
-Windows command line as well.
+{: .callout .note}
+Note: The terminal commands in this tutorial show a Unix shell prompt, but the
+commands work on the Windows command line as well.
 
 ## Set up a project
 
-CMake uses a file named `CMakeLists.txt` to configure the build system for a project. You'll use this file to set up
-your project and declare a dependency on GoogleTest.
+CMake uses a file named `CMakeLists.txt` to configure the build system for a
+project. You'll use this file to set up your project and declare a dependency on
+GoogleTest.
 
 First, create a directory for your project:
 
@@ -36,39 +41,43 @@ First, create a directory for your project:
 $ mkdir my_project && cd my_project
 ```
 
-Next, you'll create the `CMakeLists.txt` file and declare a dependency on GoogleTest. There are many ways to express
-dependencies in the CMake ecosystem; in this quickstart, you'll use the
-[`FetchContent` CMake module](https://cmake.org/cmake/help/latest/module/FetchContent.html). To do this, in your project
-directory (`my_project`), create a file named
+Next, you'll create the `CMakeLists.txt` file and declare a dependency on
+GoogleTest. There are many ways to express dependencies in the CMake ecosystem;
+in this quickstart, you'll use the
+[`FetchContent` CMake module](https://cmake.org/cmake/help/latest/module/FetchContent.html).
+To do this, in your project directory (`my_project`), create a file named
 `CMakeLists.txt` with the following contents:
 
 ```cmake
 cmake_minimum_required(VERSION 3.14)
 project(my_project)
 
-# GoogleTest requires at least C++11
-set(CMAKE_CXX_STANDARD 11)
+# GoogleTest requires at least C++14
+set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 include(FetchContent)
 FetchContent_Declare(
   googletest
-  URL https://github.com/google/googletest/archive/609281088cfefc76f9d0ce82e1ff6c30cc3591e5.zip
+  URL https://github.com/google/googletest/archive/03597a01ee50ed33e9dfd640b249b4be3799d395.zip
 )
 # For Windows: Prevent overriding the parent project's compiler/linker settings
 set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
 FetchContent_MakeAvailable(googletest)
 ```
 
-The above configuration declares a dependency on GoogleTest which is downloaded from GitHub. In the above
-example, `609281088cfefc76f9d0ce82e1ff6c30cc3591e5` is the Git commit hash of the GoogleTest version to use; we
-recommend updating the hash often to point to the latest version.
+The above configuration declares a dependency on GoogleTest which is downloaded
+from GitHub. In the above example, `03597a01ee50ed33e9dfd640b249b4be3799d395` is
+the Git commit hash of the GoogleTest version to use; we recommend updating the
+hash often to point to the latest version.
 
 For more information about how to create `CMakeLists.txt` files, see the
 [CMake Tutorial](https://cmake.org/cmake/help/latest/guide/tutorial/index.html).
 
 ## Create and run a binary
 
-With GoogleTest declared as a dependency, you can use GoogleTest code within your own project.
+With GoogleTest declared as a dependency, you can use GoogleTest code within
+your own project.
 
 As an example, create a file named `hello_test.cc` in your `my_project`
 directory with the following contents:
@@ -85,8 +94,9 @@ TEST(HelloTest, BasicAssertions) {
 }
 ```
 
-GoogleTest provides [assertions](primer.md#assertions) that you use to test the behavior of your code. The above sample
-includes the main GoogleTest header file and demonstrates some basic assertions.
+GoogleTest provides [assertions](primer.md#assertions) that you use to test the
+behavior of your code. The above sample includes the main GoogleTest header file
+and demonstrates some basic assertions.
 
 To build the code, add the following to the end of your `CMakeLists.txt` file:
 
@@ -99,16 +109,17 @@ add_executable(
 )
 target_link_libraries(
   hello_test
-  gtest_main
+  GTest::gtest_main
 )
 
 include(GoogleTest)
 gtest_discover_tests(hello_test)
 ```
 
-The above configuration enables testing in CMake, declares the C++ test binary you want to build (`hello_test`), and
-links it to GoogleTest (`gtest_main`). The last two lines enable CMake's test runner to discover the tests included in
-the binary, using the
+The above configuration enables testing in CMake, declares the C++ test binary
+you want to build (`hello_test`), and links it to GoogleTest (`gtest_main`). The
+last two lines enable CMake's test runner to discover the tests included in the
+binary, using the
 [`GoogleTest` CMake module](https://cmake.org/cmake/help/git-stage/module/GoogleTest.html).
 
 Now you can build and run your test:
@@ -135,9 +146,12 @@ Test project .../my_project/build
 Total Test time (real) =   0.01 sec
 </pre>
 
-Congratulations! You've successfully built and run a test binary using GoogleTest.
+Congratulations! You've successfully built and run a test binary using
+GoogleTest.
 
 ## Next steps
 
-* [Check out the Primer](primer.md) to start learning how to write simple tests.
-* [See the code samples](samples.md) for more examples showing how to use a variety of GoogleTest features.
+*   [Check out the Primer](primer.md) to start learning how to write simple
+    tests.
+*   [See the code samples](samples.md) for more examples showing how to use a
+    variety of GoogleTest features.
diff --git a/external/googletest/docs/reference/actions.md b/external/googletest/docs/reference/actions.md
index c88725dd..0ebdc1e8 100644
--- a/external/googletest/docs/reference/actions.md
+++ b/external/googletest/docs/reference/actions.md
@@ -1,11 +1,12 @@
 # Actions Reference
 
-[**Actions**](../gmock_for_dummies.md#actions-what-should-it-do) specify what a mock function should do when invoked.
-This page lists the built-in actions provided by GoogleTest. All actions are defined in the `::testing` namespace.
+[**Actions**](../gmock_for_dummies.md#actions-what-should-it-do) specify what a
+mock function should do when invoked. This page lists the built-in actions
+provided by GoogleTest. All actions are defined in the `::testing` namespace.
 
 ## Returning a Value
 
-|                                   |                                               |
+| Action                            | Description                                   |
 | :-------------------------------- | :-------------------------------------------- |
 | `Return()`                        | Return from a `void` mock function.           |
 | `Return(value)`                   | Return `value`. If the type of `value` is     different to the mock function's return type, `value` is converted to the latter type <i>at the time the expectation is set</i>, not when the action is executed. |
@@ -19,11 +20,12 @@ This page lists the built-in actions provided by GoogleTest. All actions are def
 
 ## Side Effects
 
-|                                    |                                         |
+| Action                             | Description                             |
 | :--------------------------------- | :-------------------------------------- |
 | `Assign(&variable, value)` | Assign `value` to variable. |
 | `DeleteArg<N>()` | Delete the `N`-th (0-based) argument, which must be a pointer. |
-| `SaveArg<N>(pointer)` | Save the `N`-th (0-based) argument to `*pointer`. |
+| `SaveArg<N>(pointer)` | Save the `N`-th (0-based) argument to `*pointer` by copy-assignment. |
+| `SaveArgByMove<N>(pointer)` | Save the `N`-th (0-based) argument to `*pointer` by move-assignment. |
 | `SaveArgPointee<N>(pointer)` | Save the value pointed to by the `N`-th (0-based) argument to `*pointer`. |
 | `SetArgReferee<N>(value)` | Assign `value` to the variable referenced by the `N`-th (0-based) argument. |
 | `SetArgPointee<N>(value)` | Assign `value` to the variable pointed by the `N`-th (0-based) argument. |
@@ -34,20 +36,23 @@ This page lists the built-in actions provided by GoogleTest. All actions are def
 
 ## Using a Function, Functor, or Lambda as an Action
 
-In the following, by "callable" we mean a free function, `std::function`, functor, or lambda.
+In the following, by "callable" we mean a free function, `std::function`,
+functor, or lambda.
 
-|                                     |                                        |
+| Action                              | Description                            |
 | :---------------------------------- | :------------------------------------- |
-| `f` | Invoke f with the arguments passed to the mock function, where f is a callable. |
+| `f` | Invoke `f` with the arguments passed to the mock function, where `f` is a callable. |
 | `Invoke(f)` | Invoke `f` with the arguments passed to the mock function, where `f` can be a global/static function or a functor. |
 | `Invoke(object_pointer, &class::method)` | Invoke the method on the object with the arguments passed to the mock function. |
 | `InvokeWithoutArgs(f)` | Invoke `f`, which can be a global/static function or a functor. `f` must take no arguments. |
 | `InvokeWithoutArgs(object_pointer, &class::method)` | Invoke the method on the object, which takes no arguments. |
 | `InvokeArgument<N>(arg1, arg2, ..., argk)` | Invoke the mock function's `N`-th (0-based) argument, which must be a function or a functor, with the `k` arguments. |
 
-The return value of the invoked function is used as the return value of the action.
+The return value of the invoked function is used as the return value of the
+action.
 
-When defining a callable to be used with `Invoke*()`, you can declare any unused parameters as `Unused`:
+When defining a callable to be used with `Invoke*()`, you can declare any unused
+parameters as `Unused`:
 
 ```cpp
 using ::testing::Invoke;
@@ -57,7 +62,8 @@ EXPECT_CALL(mock, Foo("Hi", _, _)).WillOnce(Invoke(Distance));
 ```
 
 `Invoke(callback)` and `InvokeWithoutArgs(callback)` take ownership of
-`callback`, which must be permanent. The type of `callback` must be a base callback type instead of a derived one, e.g.
+`callback`, which must be permanent. The type of `callback` must be a base
+callback type instead of a derived one, e.g.
 
 ```cpp
   BlockingClosure* done = new BlockingClosure;
@@ -67,7 +73,8 @@ EXPECT_CALL(mock, Foo("Hi", _, _)).WillOnce(Invoke(Distance));
   ... Invoke(done2) ...;  // This works.
 ```
 
-In `InvokeArgument<N>(...)`, if an argument needs to be passed by reference, wrap it inside `std::ref()`. For example,
+In `InvokeArgument<N>(...)`, if an argument needs to be passed by reference,
+wrap it inside `std::ref()`. For example,
 
 ```cpp
 using ::testing::InvokeArgument;
@@ -75,21 +82,22 @@ using ::testing::InvokeArgument;
 InvokeArgument<2>(5, string("Hi"), std::ref(foo))
 ```
 
-calls the mock function's #2 argument, passing to it `5` and `string("Hi")` by value, and `foo` by reference.
+calls the mock function's #2 argument, passing to it `5` and `string("Hi")` by
+value, and `foo` by reference.
 
 ## Default Action
 
-| Matcher       | Description                                            |
+| Action        | Description                                            |
 | :------------ | :----------------------------------------------------- |
 | `DoDefault()` | Do the default action (specified by `ON_CALL()` or the built-in one). |
 
 {: .callout .note}
-**Note:** due to technical reasons, `DoDefault()` cannot be used inside a composite action - trying to do so will result
-in a run-time error.
+**Note:** due to technical reasons, `DoDefault()` cannot be used inside a
+composite action - trying to do so will result in a run-time error.
 
 ## Composite Actions
 
-|                                |                                             |
+| Action                         | Description                                 |
 | :----------------------------- | :------------------------------------------ |
 | `DoAll(a1, a2, ..., an)`       | Do all actions `a1` to `an` and return the result of `an` in each invocation. The first `n - 1` sub-actions must return void and will receive a  readonly view of the arguments. |
 | `IgnoreResult(a)`              | Perform action `a` and ignore its result. `a` must not return void. |
@@ -99,7 +107,7 @@ in a run-time error.
 
 ## Defining Actions
 
-|                                    |                                         |
+| Macro                              | Description                             |
 | :--------------------------------- | :-------------------------------------- |
 | `ACTION(Sum) { return arg0 + arg1; }` | Defines an action `Sum()` to return the sum of the mock function's argument #0 and #1. |
 | `ACTION_P(Plus, n) { return arg0 + n; }` | Defines an action `Plus(n)` to return the sum of the mock function's argument #0 and `n`. |
diff --git a/external/googletest/docs/reference/assertions.md b/external/googletest/docs/reference/assertions.md
index cd2c1821..eeec4a0c 100644
--- a/external/googletest/docs/reference/assertions.md
+++ b/external/googletest/docs/reference/assertions.md
@@ -1,28 +1,31 @@
 # Assertions Reference
 
-This page lists the assertion macros provided by GoogleTest for verifying code behavior. To use them, include the
-header `gtest/gtest.h`.
+This page lists the assertion macros provided by GoogleTest for verifying code
+behavior. To use them, add `#include <gtest/gtest.h>`.
 
-The majority of the macros listed below come as a pair with an `EXPECT_` variant and an `ASSERT_` variant. Upon
-failure, `EXPECT_` macros generate nonfatal failures and allow the current function to continue running, while `ASSERT_`
+The majority of the macros listed below come as a pair with an `EXPECT_` variant
+and an `ASSERT_` variant. Upon failure, `EXPECT_` macros generate nonfatal
+failures and allow the current function to continue running, while `ASSERT_`
 macros generate fatal failures and abort the current function.
 
-All assertion macros support streaming a custom failure message into them with the `<<` operator, for example:
+All assertion macros support streaming a custom failure message into them with
+the `<<` operator, for example:
 
 ```cpp
 EXPECT_TRUE(my_condition) << "My condition is not true";
 ```
 
-Anything that can be streamed to an `ostream` can be streamed to an assertion macro—in particular, C strings and string
-objects. If a wide string (`wchar_t*`,
-`TCHAR*` in `UNICODE` mode on Windows, or `std::wstring`) is streamed to an assertion, it will be translated to UTF-8
-when printed.
+Anything that can be streamed to an `ostream` can be streamed to an assertion
+macro—in particular, C strings and string objects. If a wide string (`wchar_t*`,
+`TCHAR*` in `UNICODE` mode on Windows, or `std::wstring`) is streamed to an
+assertion, it will be translated to UTF-8 when printed.
 
 ## Explicit Success and Failure {#success-failure}
 
-The assertions in this section generate a success or failure directly instead of testing a value or expression. These
-are useful when control flow, rather than a Boolean expression, determines the test's success or failure, as shown by
-the following example:
+The assertions in this section generate a success or failure directly instead of
+testing a value or expression. These are useful when control flow, rather than a
+Boolean expression, determines the test's success or failure, as shown by the
+following example:
 
 ```c++
 switch(expression) {
@@ -39,11 +42,12 @@ switch(expression) {
 
 `SUCCEED()`
 
-Generates a success. This *does not* make the overall test succeed. A test is considered successful only if none of its
-assertions fail during its execution.
+Generates a success. This *does not* make the overall test succeed. A test is
+considered successful only if none of its assertions fail during its execution.
 
-The `SUCCEED` assertion is purely documentary and currently doesn't generate any user-visible output. However, we may
-add `SUCCEED` messages to GoogleTest output in the future.
+The `SUCCEED` assertion is purely documentary and currently doesn't generate any
+user-visible output. However, we may add `SUCCEED` messages to GoogleTest output
+in the future.
 
 ### FAIL {#FAIL}
 
@@ -58,7 +62,8 @@ Can only be used in functions that return `void`. See
 
 `ADD_FAILURE()`
 
-Generates a nonfatal failure, which allows the current function to continue running.
+Generates a nonfatal failure, which allows the current function to continue
+running.
 
 ### ADD_FAILURE_AT {#ADD_FAILURE_AT}
 
@@ -68,7 +73,8 @@ Generates a nonfatal failure at the file and line number specified.
 
 ## Generalized Assertion {#generalized}
 
-The following assertion allows [matchers](matchers.md) to be used to verify values.
+The following assertion allows [matchers](matchers.md) to be used to verify
+values.
 
 ### EXPECT_THAT {#EXPECT_THAT}
 
@@ -78,10 +84,11 @@ The following assertion allows [matchers](matchers.md) to be used to verify valu
 Verifies that *`value`* matches the [matcher](matchers.md) *`matcher`*.
 
 For example, the following code verifies that the string `value1` starts with
-`"Hello"`, `value2` matches a regular expression, and `value3` is between 5 and 10:
+`"Hello"`, `value2` matches a regular expression, and `value3` is between 5 and
+10:
 
 ```cpp
-#include "gmock/gmock.h"
+#include <gmock/gmock.h>
 
 using ::testing::AllOf;
 using ::testing::Gt;
@@ -95,8 +102,8 @@ EXPECT_THAT(value2, MatchesRegex("Line \\d+"));
 ASSERT_THAT(value3, AllOf(Gt(5), Lt(10)));
 ```
 
-Matchers enable assertions of this form to read like English and generate informative failure messages. For example, if
-the above assertion on `value1`
+Matchers enable assertions of this form to read like English and generate
+informative failure messages. For example, if the above assertion on `value1`
 fails, the resulting message will be similar to the following:
 
 ```
@@ -107,10 +114,11 @@ Expected: starts with "Hello"
 
 GoogleTest provides a built-in library of matchers—see the
 [Matchers Reference](matchers.md). It is also possible to write your own
-matchers—see [Writing New Matchers Quickly](../gmock_cook_book.md#NewMatchers). The use of matchers makes `EXPECT_THAT`
-a powerful, extensible assertion.
+matchers—see [Writing New Matchers Quickly](../gmock_cook_book.md#NewMatchers).
+The use of matchers makes `EXPECT_THAT` a powerful, extensible assertion.
 
-*The idea for this assertion was borrowed from Joe Walnes' Hamcrest project, which adds `assertThat()` to JUnit.*
+*The idea for this assertion was borrowed from Joe Walnes' Hamcrest project,
+which adds `assertThat()` to JUnit.*
 
 ## Boolean Conditions {#boolean}
 
@@ -132,21 +140,24 @@ Verifies that *`condition`* is false.
 
 ## Binary Comparison {#binary-comparison}
 
-The following assertions compare two values. The value arguments must be comparable by the assertion's comparison
-operator, otherwise a compiler error will result.
+The following assertions compare two values. The value arguments must be
+comparable by the assertion's comparison operator, otherwise a compiler error
+will result.
 
-If an argument supports the `<<` operator, it will be called to print the argument when the assertion fails. Otherwise,
-GoogleTest will attempt to print them in the best way it can—see
+If an argument supports the `<<` operator, it will be called to print the
+argument when the assertion fails. Otherwise, GoogleTest will attempt to print
+them in the best way it can—see
 [Teaching GoogleTest How to Print Your Values](../advanced.md#teaching-googletest-how-to-print-your-values).
 
-Arguments are always evaluated exactly once, so it's OK for the arguments to have side effects. However, the argument
-evaluation order is undefined and programs should not depend on any particular argument evaluation order.
+Arguments are always evaluated exactly once, so it's OK for the arguments to
+have side effects. However, the argument evaluation order is undefined and
+programs should not depend on any particular argument evaluation order.
 
 These assertions work with both narrow and wide string objects (`string` and
 `wstring`).
 
-See also the [Floating-Point Comparison](#floating-point) assertions to compare floating-point numbers and avoid
-problems caused by rounding.
+See also the [Floating-Point Comparison](#floating-point) assertions to compare
+floating-point numbers and avoid problems caused by rounding.
 
 ### EXPECT_EQ {#EXPECT_EQ}
 
@@ -155,11 +166,13 @@ problems caused by rounding.
 
 Verifies that *`val1`*`==`*`val2`*.
 
-Does pointer equality on pointers. If used on two C strings, it tests if they are in the same memory location, not if
-they have the same value. Use
-[`EXPECT_STREQ`](#EXPECT_STREQ) to compare C strings (e.g. `const char*`) by value.
+Does pointer equality on pointers. If used on two C strings, it tests if they
+are in the same memory location, not if they have the same value. Use
+[`EXPECT_STREQ`](#EXPECT_STREQ) to compare C strings (e.g. `const char*`) by
+value.
 
-When comparing a pointer to `NULL`, use `EXPECT_EQ(`*`ptr`*`, nullptr)` instead of `EXPECT_EQ(`*`ptr`*`, NULL)`.
+When comparing a pointer to `NULL`, use `EXPECT_EQ(`*`ptr`*`, nullptr)` instead
+of `EXPECT_EQ(`*`ptr`*`, NULL)`.
 
 ### EXPECT_NE {#EXPECT_NE}
 
@@ -168,11 +181,13 @@ When comparing a pointer to `NULL`, use `EXPECT_EQ(`*`ptr`*`, nullptr)` instead
 
 Verifies that *`val1`*`!=`*`val2`*.
 
-Does pointer equality on pointers. If used on two C strings, it tests if they are in different memory locations, not if
-they have different values. Use
-[`EXPECT_STRNE`](#EXPECT_STRNE) to compare C strings (e.g. `const char*`) by value.
+Does pointer equality on pointers. If used on two C strings, it tests if they
+are in different memory locations, not if they have different values. Use
+[`EXPECT_STRNE`](#EXPECT_STRNE) to compare C strings (e.g. `const char*`) by
+value.
 
-When comparing a pointer to `NULL`, use `EXPECT_NE(`*`ptr`*`, nullptr)` instead of `EXPECT_NE(`*`ptr`*`, NULL)`.
+When comparing a pointer to `NULL`, use `EXPECT_NE(`*`ptr`*`, nullptr)` instead
+of `EXPECT_NE(`*`ptr`*`, NULL)`.
 
 ### EXPECT_LT {#EXPECT_LT}
 
@@ -207,8 +222,8 @@ Verifies that *`val1`*`>=`*`val2`*.
 The following assertions compare two **C strings**. To compare two `string`
 objects, use [`EXPECT_EQ`](#EXPECT_EQ) or [`EXPECT_NE`](#EXPECT_NE) instead.
 
-These assertions also accept wide C strings (`wchar_t*`). If a comparison of two wide strings fails, their values will
-be printed as UTF-8 narrow strings.
+These assertions also accept wide C strings (`wchar_t*`). If a comparison of two
+wide strings fails, their values will be printed as UTF-8 narrow strings.
 
 To compare a C string with `NULL`, use `EXPECT_EQ(`*`c_string`*`, nullptr)` or
 `EXPECT_NE(`*`c_string`*`, nullptr)`.
@@ -232,52 +247,64 @@ Verifies that the two C strings *`str1`* and *`str2`* have different contents.
 `EXPECT_STRCASEEQ(`*`str1`*`,`*`str2`*`)` \
 `ASSERT_STRCASEEQ(`*`str1`*`,`*`str2`*`)`
 
-Verifies that the two C strings *`str1`* and *`str2`* have the same contents, ignoring case.
+Verifies that the two C strings *`str1`* and *`str2`* have the same contents,
+ignoring case.
 
 ### EXPECT_STRCASENE {#EXPECT_STRCASENE}
 
 `EXPECT_STRCASENE(`*`str1`*`,`*`str2`*`)` \
 `ASSERT_STRCASENE(`*`str1`*`,`*`str2`*`)`
 
-Verifies that the two C strings *`str1`* and *`str2`* have different contents, ignoring case.
+Verifies that the two C strings *`str1`* and *`str2`* have different contents,
+ignoring case.
 
 ## Floating-Point Comparison {#floating-point}
 
 The following assertions compare two floating-point values.
 
-Due to rounding errors, it is very unlikely that two floating-point values will match exactly, so `EXPECT_EQ` is not
-suitable. In general, for floating-point comparison to make sense, the user needs to carefully choose the error bound.
+Due to rounding errors, it is very unlikely that two floating-point values will
+match exactly, so `EXPECT_EQ` is not suitable. In general, for floating-point
+comparison to make sense, the user needs to carefully choose the error bound.
 
-GoogleTest also provides assertions that use a default error bound based on Units in the Last Place (ULPs). To learn
-more about ULPs, see the article
-[Comparing Floating Point Numbers](https://randomascii.wordpress.com/2012/02/25/comparing-floating-point-numbers-2012-edition/)
-.
+GoogleTest also provides assertions that use a default error bound based on
+Units in the Last Place (ULPs). To learn more about ULPs, see the article
+[Comparing Floating Point Numbers](https://randomascii.wordpress.com/2012/02/25/comparing-floating-point-numbers-2012-edition/).
 
 ### EXPECT_FLOAT_EQ {#EXPECT_FLOAT_EQ}
 
 `EXPECT_FLOAT_EQ(`*`val1`*`,`*`val2`*`)` \
 `ASSERT_FLOAT_EQ(`*`val1`*`,`*`val2`*`)`
 
-Verifies that the two `float` values *`val1`* and *`val2`* are approximately equal, to within 4 ULPs from each other.
+Verifies that the two `float` values *`val1`* and *`val2`* are approximately
+equal, to within 4 ULPs from each other. Infinity and the largest finite float
+value are considered to be one ULP apart.
 
 ### EXPECT_DOUBLE_EQ {#EXPECT_DOUBLE_EQ}
 
 `EXPECT_DOUBLE_EQ(`*`val1`*`,`*`val2`*`)` \
 `ASSERT_DOUBLE_EQ(`*`val1`*`,`*`val2`*`)`
 
-Verifies that the two `double` values *`val1`* and *`val2`* are approximately equal, to within 4 ULPs from each other.
+Verifies that the two `double` values *`val1`* and *`val2`* are approximately
+equal, to within 4 ULPs from each other. Infinity and the largest finite double
+value are considered to be one ULP apart.
 
 ### EXPECT_NEAR {#EXPECT_NEAR}
 
 `EXPECT_NEAR(`*`val1`*`,`*`val2`*`,`*`abs_error`*`)` \
 `ASSERT_NEAR(`*`val1`*`,`*`val2`*`,`*`abs_error`*`)`
 
-Verifies that the difference between *`val1`* and *`val2`* does not exceed the absolute error bound *`abs_error`*.
+Verifies that the difference between *`val1`* and *`val2`* does not exceed the
+absolute error bound *`abs_error`*.
+
+If *`val`* and *`val2`* are both infinity of the same sign, the difference is
+considered to be 0. Otherwise, if either value is infinity, the difference is
+considered to be infinity. All non-NaN values (including infinity) are
+considered to not exceed an *`abs_error`* of infinity.
 
 ## Exception Assertions {#exceptions}
 
-The following assertions verify that a piece of code throws, or does not throw, an exception. Usage requires exceptions
-to be enabled in the build environment.
+The following assertions verify that a piece of code throws, or does not throw,
+an exception. Usage requires exceptions to be enabled in the build environment.
 
 Note that the piece of code under test can be a compound statement, for example:
 
@@ -311,8 +338,8 @@ Verifies that *`statement`* does not throw any exception.
 
 ## Predicate Assertions {#predicates}
 
-The following assertions enable more complex predicates to be verified while printing a more clear failure message than
-if `EXPECT_TRUE` were used alone.
+The following assertions enable more complex predicates to be verified while
+printing a more clear failure message than if `EXPECT_TRUE` were used alone.
 
 ### EXPECT_PRED* {#EXPECT_PRED}
 
@@ -328,12 +355,15 @@ if `EXPECT_TRUE` were used alone.
 `ASSERT_PRED4(`*`pred`*`,`*`val1`*`,`*`val2`*`,`*`val3`*`,`*`val4`*`)` \
 `ASSERT_PRED5(`*`pred`*`,`*`val1`*`,`*`val2`*`,`*`val3`*`,`*`val4`*`,`*`val5`*`)`
 
-Verifies that the predicate *`pred`* returns `true` when passed the given values as arguments.
+Verifies that the predicate *`pred`* returns `true` when passed the given values
+as arguments.
 
-The parameter *`pred`* is a function or functor that accepts as many arguments as the corresponding macro accepts
-values. If *`pred`* returns `true` for the given arguments, the assertion succeeds, otherwise the assertion fails.
+The parameter *`pred`* is a function or functor that accepts as many arguments
+as the corresponding macro accepts values. If *`pred`* returns `true` for the
+given arguments, the assertion succeeds, otherwise the assertion fails.
 
-When the assertion fails, it prints the value of each argument. Arguments are always evaluated exactly once.
+When the assertion fails, it prints the value of each argument. Arguments are
+always evaluated exactly once.
 
 As an example, see the following code:
 
@@ -349,7 +379,8 @@ EXPECT_PRED2(MutuallyPrime, a, b);  // Succeeds
 EXPECT_PRED2(MutuallyPrime, b, c);  // Fails
 ```
 
-In the above example, the first assertion succeeds, and the second fails with the following message:
+In the above example, the first assertion succeeds, and the second fails with
+the following message:
 
 ```
 MutuallyPrime(b, c) is false, where
@@ -357,18 +388,20 @@ b is 4
 c is 10
 ```
 
-Note that if the given predicate is an overloaded function or a function template, the assertion macro might not be able
-to determine which version to use, and it might be necessary to explicitly specify the type of the function. For
-example, for a Boolean function `IsPositive()` overloaded to take either a single `int` or `double` argument, it would
-be necessary to write one of the following:
+Note that if the given predicate is an overloaded function or a function
+template, the assertion macro might not be able to determine which version to
+use, and it might be necessary to explicitly specify the type of the function.
+For example, for a Boolean function `IsPositive()` overloaded to take either a
+single `int` or `double` argument, it would be necessary to write one of the
+following:
 
 ```cpp
 EXPECT_PRED1(static_cast<bool (*)(int)>(IsPositive), 5);
 EXPECT_PRED1(static_cast<bool (*)(double)>(IsPositive), 3.14);
 ```
 
-Writing simply `EXPECT_PRED1(IsPositive, 5);` would result in a compiler error. Similarly, to use a template function,
-specify the template arguments:
+Writing simply `EXPECT_PRED1(IsPositive, 5);` would result in a compiler error.
+Similarly, to use a template function, specify the template arguments:
 
 ```cpp
 template <typename T>
@@ -379,7 +412,8 @@ bool IsNegative(T x) {
 EXPECT_PRED1(IsNegative<int>, -5);  // Must specify type for IsNegative
 ```
 
-If a template has multiple parameters, wrap the predicate in parentheses so the macro arguments are parsed correctly:
+If a template has multiple parameters, wrap the predicate in parentheses so the
+macro arguments are parsed correctly:
 
 ```cpp
 ASSERT_PRED2((MyPredicate<int, int>), 5, 0);
@@ -401,9 +435,11 @@ ASSERT_PRED2((MyPredicate<int, int>), 5, 0);
 \
 `ASSERT_PRED_FORMAT5(`*`pred_formatter`*`,`*`val1`*`,`*`val2`*`,`*`val3`*`,`*`val4`*`,`*`val5`*`)`
 
-Verifies that the predicate *`pred_formatter`* succeeds when passed the given values as arguments.
+Verifies that the predicate *`pred_formatter`* succeeds when passed the given
+values as arguments.
 
-The parameter *`pred_formatter`* is a *predicate-formatter*, which is a function or functor with the signature:
+The parameter *`pred_formatter`* is a *predicate-formatter*, which is a function
+or functor with the signature:
 
 ```cpp
 testing::AssertionResult PredicateFormatter(const char* expr1,
@@ -416,10 +452,12 @@ testing::AssertionResult PredicateFormatter(const char* expr1,
                                             Tn valn);
 ```
 
-where *`val1`*, *`val2`*, ..., *`valn`* are the values of the predicate arguments, and *`expr1`*, *`expr2`*,
-..., *`exprn`* are the corresponding expressions as they appear in the source code. The types `T1`, `T2`, ..., `Tn`
-can be either value types or reference types; if an argument has type `T`, it can be declared as either `T`
-or `const T&`, whichever is appropriate. For more about the return type `testing::AssertionResult`, see
+where *`val1`*, *`val2`*, ..., *`valn`* are the values of the predicate
+arguments, and *`expr1`*, *`expr2`*, ..., *`exprn`* are the corresponding
+expressions as they appear in the source code. The types `T1`, `T2`, ..., `Tn`
+can be either value types or reference types; if an argument has type `T`, it
+can be declared as either `T` or `const T&`, whichever is appropriate. For more
+about the return type `testing::AssertionResult`, see
 [Using a Function That Returns an AssertionResult](../advanced.md#using-a-function-that-returns-an-assertionresult).
 
 As an example, see the following code:
@@ -453,7 +491,8 @@ EXPECT_PRED_FORMAT2(AssertMutuallyPrime, a, b);  // Succeeds
 EXPECT_PRED_FORMAT2(AssertMutuallyPrime, b, c);  // Fails
 ```
 
-In the above example, the final assertion fails and the predicate-formatter produces the following failure message:
+In the above example, the final assertion fails and the predicate-formatter
+produces the following failure message:
 
 ```
 b and c (4 and 10) are not mutually prime, as they have a common divisor 2
@@ -470,7 +509,8 @@ CComVariant empty;
 ASSERT_HRESULT_SUCCEEDED(shell->ShellExecute(CComBSTR(url), empty, empty, empty, empty));
 ```
 
-The generated output contains the human-readable error message associated with the returned `HRESULT` code.
+The generated output contains the human-readable error message associated with
+the returned `HRESULT` code.
 
 ### EXPECT_HRESULT_SUCCEEDED {#EXPECT_HRESULT_SUCCEEDED}
 
@@ -482,31 +522,38 @@ Verifies that *`expression`* is a success `HRESULT`.
 ### EXPECT_HRESULT_FAILED {#EXPECT_HRESULT_FAILED}
 
 `EXPECT_HRESULT_FAILED(`*`expression`*`)` \
-`EXPECT_HRESULT_FAILED(`*`expression`*`)`
+`ASSERT_HRESULT_FAILED(`*`expression`*`)`
 
 Verifies that *`expression`* is a failure `HRESULT`.
 
 ## Death Assertions {#death}
 
-The following assertions verify that a piece of code causes the process to terminate. For context,
-see [Death Tests](../advanced.md#death-tests).
-
-These assertions spawn a new process and execute the code under test in that process. How that happens depends on the
-platform and the variable
-`::testing::GTEST_FLAG(death_test_style)`, which is initialized from the command-line flag `--gtest_death_test_style`.
-
-* On POSIX systems, `fork()` (or `clone()` on Linux) is used to spawn the child, after which:
-    * If the variable's value is `"fast"`, the death test statement is immediately executed.
-    * If the variable's value is `"threadsafe"`, the child process re-executes the unit test binary just as it was
-      originally invoked, but with some extra flags to cause just the single death test under consideration to be run.
-* On Windows, the child is spawned using the `CreateProcess()` API, and re-executes the binary to cause just the single
-  death test under consideration to be run - much like the `"threadsafe"` mode on POSIX.
-
-Other values for the variable are illegal and will cause the death test to fail. Currently, the flag's default value is
+The following assertions verify that a piece of code causes the process to
+terminate. For context, see [Death Tests](../advanced.md#death-tests).
+
+These assertions spawn a new process and execute the code under test in that
+process. How that happens depends on the platform and the variable
+`::testing::GTEST_FLAG(death_test_style)`, which is initialized from the
+command-line flag `--gtest_death_test_style`.
+
+*   On POSIX systems, `fork()` (or `clone()` on Linux) is used to spawn the
+    child, after which:
+    *   If the variable's value is `"fast"`, the death test statement is
+        immediately executed.
+    *   If the variable's value is `"threadsafe"`, the child process re-executes
+        the unit test binary just as it was originally invoked, but with some
+        extra flags to cause just the single death test under consideration to
+        be run.
+*   On Windows, the child is spawned using the `CreateProcess()` API, and
+    re-executes the binary to cause just the single death test under
+    consideration to be run - much like the `"threadsafe"` mode on POSIX.
+
+Other values for the variable are illegal and will cause the death test to fail.
+Currently, the flag's default value is
 **`"fast"`**.
 
-If the death test statement runs to completion without dying, the child process will nonetheless terminate, and the
-assertion fails.
+If the death test statement runs to completion without dying, the child process
+will nonetheless terminate, and the assertion fails.
 
 Note that the piece of code under test can be a compound statement, for example:
 
@@ -522,17 +569,18 @@ EXPECT_DEATH({
 `EXPECT_DEATH(`*`statement`*`,`*`matcher`*`)` \
 `ASSERT_DEATH(`*`statement`*`,`*`matcher`*`)`
 
-Verifies that *`statement`* causes the process to terminate with a nonzero exit status and produces `stderr` output that
-matches *`matcher`*.
+Verifies that *`statement`* causes the process to terminate with a nonzero exit
+status and produces `stderr` output that matches *`matcher`*.
 
-The parameter *`matcher`* is either a [matcher](matchers.md) for a `const std::string&`, or a regular expression (see
-[Regular Expression Syntax](../advanced.md#regular-expression-syntax))—a bare string *`s`* (with no matcher) is treated
-as
+The parameter *`matcher`* is either a [matcher](matchers.md) for a `const
+std::string&`, or a regular expression (see
+[Regular Expression Syntax](../advanced.md#regular-expression-syntax))—a bare
+string *`s`* (with no matcher) is treated as
 [`ContainsRegex(s)`](matchers.md#string-matchers), **not**
 [`Eq(s)`](matchers.md#generic-comparison).
 
-For example, the following code verifies that calling `DoSomething(42)` causes the process to die with an error message
-that contains the text `My error`:
+For example, the following code verifies that calling `DoSomething(42)` causes
+the process to die with an error message that contains the text `My error`:
 
 ```cpp
 EXPECT_DEATH(DoSomething(42), "My error");
@@ -551,20 +599,21 @@ If death tests are supported, behaves the same as
 `EXPECT_DEBUG_DEATH(`*`statement`*`,`*`matcher`*`)` \
 `ASSERT_DEBUG_DEATH(`*`statement`*`,`*`matcher`*`)`
 
-In debug mode, behaves the same as [`EXPECT_DEATH`](#EXPECT_DEATH). When not in debug mode (i.e. `NDEBUG` is defined),
-just executes *`statement`*.
+In debug mode, behaves the same as [`EXPECT_DEATH`](#EXPECT_DEATH). When not in
+debug mode (i.e. `NDEBUG` is defined), just executes *`statement`*.
 
 ### EXPECT_EXIT {#EXPECT_EXIT}
 
 `EXPECT_EXIT(`*`statement`*`,`*`predicate`*`,`*`matcher`*`)` \
 `ASSERT_EXIT(`*`statement`*`,`*`predicate`*`,`*`matcher`*`)`
 
-Verifies that *`statement`* causes the process to terminate with an exit status that satisfies *`predicate`*, and
-produces `stderr` output that matches
+Verifies that *`statement`* causes the process to terminate with an exit status
+that satisfies *`predicate`*, and produces `stderr` output that matches
 *`matcher`*.
 
-The parameter *`predicate`* is a function or functor that accepts an `int` exit status and returns a `bool`. GoogleTest
-provides two predicates to handle common cases:
+The parameter *`predicate`* is a function or functor that accepts an `int` exit
+status and returns a `bool`. GoogleTest provides two predicates to handle common
+cases:
 
 ```cpp
 // Returns true if the program exited normally with the given exit status code.
@@ -575,14 +624,16 @@ provides two predicates to handle common cases:
 ::testing::KilledBySignal(signal_number);
 ```
 
-The parameter *`matcher`* is either a [matcher](matchers.md) for a `const std::string&`, or a regular expression (see
-[Regular Expression Syntax](../advanced.md#regular-expression-syntax))—a bare string *`s`* (with no matcher) is treated
-as
+The parameter *`matcher`* is either a [matcher](matchers.md) for a `const
+std::string&`, or a regular expression (see
+[Regular Expression Syntax](../advanced.md#regular-expression-syntax))—a bare
+string *`s`* (with no matcher) is treated as
 [`ContainsRegex(s)`](matchers.md#string-matchers), **not**
 [`Eq(s)`](matchers.md#generic-comparison).
 
-For example, the following code verifies that calling `NormalExit()` causes the process to print a message containing
-the text `Success` to `stderr` and exit with exit status code 0:
+For example, the following code verifies that calling `NormalExit()` causes the
+process to print a message containing the text `Success` to `stderr` and exit
+with exit status code 0:
 
 ```cpp
 EXPECT_EXIT(NormalExit(), testing::ExitedWithCode(0), "Success");
diff --git a/external/googletest/docs/reference/matchers.md b/external/googletest/docs/reference/matchers.md
index 2a1c2d16..8ff9e0bc 100644
--- a/external/googletest/docs/reference/matchers.md
+++ b/external/googletest/docs/reference/matchers.md
@@ -6,18 +6,22 @@ A **matcher** matches a *single* argument. You can use it inside `ON_CALL()` or
 | Macro                                | Description                           |
 | :----------------------------------- | :------------------------------------ |
 | `EXPECT_THAT(actual_value, matcher)` | Asserts that `actual_value` matches `matcher`. |
-| `ASSERT_THAT(actual_value, matcher)` | The same as `EXPECT_THAT(actual_value, matcher)`, except that it generates a **
-fatal** failure. |
+| `ASSERT_THAT(actual_value, matcher)` | The same as `EXPECT_THAT(actual_value, matcher)`, except that it generates a **fatal** failure. |
 
-{: .callout .note}
-**Note:** Although equality matching via `EXPECT_THAT(actual_value, expected_value)` is supported, prefer to make the
-comparison explicit via
-`EXPECT_THAT(actual_value, Eq(expected_value))` or `EXPECT_EQ(actual_value, expected_value)`.
+{: .callout .warning}
+**WARNING:** Equality matching via `EXPECT_THAT(actual_value, expected_value)`
+is supported, however note that implicit conversions can cause surprising
+results. For example, `EXPECT_THAT(some_bool, "some string")` will compile and
+may pass unintentionally.
+
+**BEST PRACTICE:** Prefer to make the comparison explicit via
+`EXPECT_THAT(actual_value, Eq(expected_value))` or `EXPECT_EQ(actual_value,
+expected_value)`.
 
 Built-in matchers (where `argument` is the function argument, e.g.
 `actual_value` in the example above, or when used in the context of
-`EXPECT_CALL(mock_object, method(matchers))`, the arguments of `method`) are divided into several categories. All
-matchers are defined in the `::testing`
+`EXPECT_CALL(mock_object, method(matchers))`, the arguments of `method`) are
+divided into several categories. All matchers are defined in the `::testing`
 namespace unless otherwise noted.
 
 ## Wildcard
@@ -38,6 +42,8 @@ Matcher                     | Description
 | `Lt(value)`            | `argument < value`                                  |
 | `Ne(value)`            | `argument != value`                                 |
 | `IsFalse()`            | `argument` evaluates to `false` in a Boolean context. |
+| `DistanceFrom(target, m)` | The distance between `argument` and `target` (computed by `abs(argument - target)`) matches `m`. |
+| `DistanceFrom(target, get_distance, m)` | The distance between `argument` and `target` (computed by `get_distance(argument, target)`) matches `m`. |
 | `IsTrue()`             | `argument` evaluates to `true` in a Boolean context. |
 | `IsNull()`             | `argument` is a `NULL` pointer (raw or smart).      |
 | `NotNull()`            | `argument` is a non-null pointer (raw or smart).    |
@@ -46,13 +52,16 @@ Matcher                     | Description
 | `Ref(variable)`        | `argument` is a reference to `variable`.            |
 | `TypedEq<type>(value)` | `argument` has type `type` and is equal to `value`. You may need to use this instead of `Eq(value)` when the mock function is overloaded. |
 
-Except `Ref()`, these matchers make a *copy* of `value` in case it's modified or destructed later. If the compiler
-complains that `value` doesn't have a public copy constructor, try wrap it in `std::ref()`, e.g.
+Except `Ref()`, these matchers make a *copy* of `value` in case it's modified or
+destructed later. If the compiler complains that `value` doesn't have a public
+copy constructor, try wrap it in `std::ref()`, e.g.
 `Eq(std::ref(non_copyable_value))`. If you do that, make sure
-`non_copyable_value` is not changed afterwards, or the meaning of your matcher will be changed.
+`non_copyable_value` is not changed afterwards, or the meaning of your matcher
+will be changed.
 
-`IsTrue` and `IsFalse` are useful when you need to use a matcher, or for types that can be explicitly converted to
-Boolean, but are not implicitly converted to Boolean. In other cases, you can use the basic
+`IsTrue` and `IsFalse` are useful when you need to use a matcher, or for types
+that can be explicitly converted to Boolean, but are not implicitly converted to
+Boolean. In other cases, you can use the basic
 [`EXPECT_TRUE` and `EXPECT_FALSE`](assertions.md#boolean) assertions.
 
 ## Floating-Point Matchers {#FpMatchers}
@@ -65,10 +74,12 @@ Boolean, but are not implicitly converted to Boolean. In other cases, you can us
 | `NanSensitiveFloatEq(a_float)`   | `argument` is a `float` value approximately equal to `a_float`, treating two NaNs as equal. |
 | `IsNan()`   | `argument` is any floating-point type with a NaN value. |
 
-The above matchers use ULP-based comparison (the same as used in googletest). They automatically pick a reasonable error
-bound based on the absolute value of the expected value. `DoubleEq()` and `FloatEq()` conform to the IEEE standard,
+The above matchers use ULP-based comparison (the same as used in googletest).
+They automatically pick a reasonable error bound based on the absolute value of
+the expected value. `DoubleEq()` and `FloatEq()` conform to the IEEE standard,
 which requires comparing two NaNs for equality to return false. The
-`NanSensitive*` version instead treats two NaNs as equal, which is often what a user wants.
+`NanSensitive*` version instead treats two NaNs as equal, which is often what a
+user wants.
 
 | Matcher                                           | Description              |
 | :------------------------------------------------ | :----------------------- |
@@ -83,43 +94,45 @@ The `argument` can be either a C string or a C++ string object:
 
 | Matcher                 | Description                                        |
 | :---------------------- | :------------------------------------------------- |
-| `ContainsRegex(string)` | `argument` matches the given regular expression.   |
-| `EndsWith(suffix)`      | `argument` ends with string `suffix`.              |
-| `HasSubstr(string)`     | `argument` contains `string` as a sub-string.      |
-| `IsEmpty()`             | `argument` is an empty string.                     |
-| `MatchesRegex(string)`  | `argument` matches the given regular expression with the match starting at the first character and ending at the last character. |
-| `StartsWith(prefix)`    | `argument` starts with string `prefix`.            |
-| `StrCaseEq(string)`     | `argument` is equal to `string`, ignoring case.    |
-| `StrCaseNe(string)`     | `argument` is not equal to `string`, ignoring case. |
-| `StrEq(string)`         | `argument` is equal to `string`.                   |
-| `StrNe(string)`         | `argument` is not equal to `string`.               |
-
-`ContainsRegex()` and `MatchesRegex()` take ownership of the `RE` object. They use the regular expression syntax defined
+| `ContainsRegex(string)`  | `argument` matches the given regular expression.  |
+| `EndsWith(suffix)`       | `argument` ends with string `suffix`.             |
+| `HasSubstr(string)`      | `argument` contains `string` as a sub-string.     |
+| `IsEmpty()`              | `argument` is an empty string.                    |
+| `MatchesRegex(string)`   | `argument` matches the given regular expression with the match starting at the first character and ending at the last character. |
+| `StartsWith(prefix)`     | `argument` starts with string `prefix`.           |
+| `StrCaseEq(string)`      | `argument` is equal to `string`, ignoring case.   |
+| `StrCaseNe(string)`      | `argument` is not equal to `string`, ignoring case. |
+| `StrEq(string)`          | `argument` is equal to `string`.                  |
+| `StrNe(string)`          | `argument` is not equal to `string`.              |
+| `WhenBase64Unescaped(m)` | `argument` is a base-64 escaped string whose unescaped string matches `m`.  The web-safe format from [RFC 4648](https://www.rfc-editor.org/rfc/rfc4648#section-5) is supported. |
+
+`ContainsRegex()` and `MatchesRegex()` take ownership of the `RE` object. They
+use the regular expression syntax defined
 [here](../advanced.md#regular-expression-syntax). All of these matchers, except
 `ContainsRegex()` and `MatchesRegex()` work for wide strings as well.
 
 ## Container Matchers
 
 Most STL-style containers support `==`, so you can use `Eq(expected_container)`
-or simply `expected_container` to match a container exactly. If you want to write the elements in-line, match them more
-flexibly, or get more informative messages, you can use:
+or simply `expected_container` to match a container exactly. If you want to
+write the elements in-line, match them more flexibly, or get more informative
+messages, you can use:
 
 | Matcher                                   | Description                      |
 | :---------------------------------------- | :------------------------------- |
 | `BeginEndDistanceIs(m)` | `argument` is a container whose `begin()` and `end()` iterators are separated by a number of increments matching `m`. E.g. `BeginEndDistanceIs(2)` or `BeginEndDistanceIs(Lt(2))`. For containers that define a `size()` method, `SizeIs(m)` may be more efficient. |
 | `ContainerEq(container)` | The same as `Eq(container)` except that the failure message also includes which elements are in one container but not the other. |
 | `Contains(e)` | `argument` contains an element that matches `e`, which can be either a value or a matcher. |
+| `Contains(e).Times(n)` | `argument` contains elements that match `e`, which can be either a value or a matcher, and the number of matches is `n`, which can be either a value or a matcher. Unlike the plain `Contains` and `Each` this allows to check for arbitrary occurrences including testing for absence with `Contains(e).Times(0)`. |
 | `Each(e)` | `argument` is a container where *every* element matches `e`, which can be either a value or a matcher. |
-| `ElementsAre(e0, e1, ..., en)` | `argument` has `n + 1` elements, where the *
-i*-th element matches `ei`, which can be a value or a matcher. |
+| `ElementsAre(e0, e1, ..., en)` | `argument` has `n + 1` elements, where the *i*-th element matches `ei`, which can be a value or a matcher. |
 | `ElementsAreArray({e0, e1, ..., en})`, `ElementsAreArray(a_container)`, `ElementsAreArray(begin, end)`, `ElementsAreArray(array)`, or `ElementsAreArray(array, count)` | The same as `ElementsAre()` except that the expected element values/matchers come from an initializer list, STL-style container, iterator range, or C-style array. |
 | `IsEmpty()` | `argument` is an empty container (`container.empty()`). |
 | `IsSubsetOf({e0, e1, ..., en})`, `IsSubsetOf(a_container)`, `IsSubsetOf(begin, end)`, `IsSubsetOf(array)`, or `IsSubsetOf(array, count)` | `argument` matches `UnorderedElementsAre(x0, x1, ..., xk)` for some subset `{x0, x1, ..., xk}` of the expected matchers. |
 | `IsSupersetOf({e0, e1, ..., en})`, `IsSupersetOf(a_container)`, `IsSupersetOf(begin, end)`, `IsSupersetOf(array)`, or `IsSupersetOf(array, count)` | Some subset of `argument` matches `UnorderedElementsAre(`expected matchers`)`. |
 | `Pointwise(m, container)`, `Pointwise(m, {e0, e1, ..., en})` | `argument` contains the same number of elements as in `container`, and for all i, (the i-th element in `argument`, the i-th element in `container`) match `m`, which is a matcher on 2-tuples. E.g. `Pointwise(Le(), upper_bounds)` verifies that each element in `argument` doesn't exceed the corresponding element in `upper_bounds`. See more detail below. |
 | `SizeIs(m)` | `argument` is a container whose size matches `m`. E.g. `SizeIs(2)` or `SizeIs(Lt(2))`. |
-| `UnorderedElementsAre(e0, e1, ..., en)` | `argument` has `n + 1` elements, and under *
-some* permutation of the elements, each element matches an `ei` (for a different `i`), which can be a value or a matcher. |
+| `UnorderedElementsAre(e0, e1, ..., en)` | `argument` has `n + 1` elements, and under *some* permutation of the elements, each element matches an `ei` (for a different `i`), which can be a value or a matcher. |
 | `UnorderedElementsAreArray({e0, e1, ..., en})`, `UnorderedElementsAreArray(a_container)`, `UnorderedElementsAreArray(begin, end)`, `UnorderedElementsAreArray(array)`, or `UnorderedElementsAreArray(array, count)` | The same as `UnorderedElementsAre()` except that the expected element values/matchers come from an initializer list, STL-style container, iterator range, or C-style array. |
 | `UnorderedPointwise(m, container)`, `UnorderedPointwise(m, {e0, e1, ..., en})` | Like `Pointwise(m, container)`, but ignores the order of elements. |
 | `WhenSorted(m)` | When `argument` is sorted using the `<` operator, it matches container matcher `m`. E.g. `WhenSorted(ElementsAre(1, 2, 3))` verifies that `argument` contains elements 1, 2, and 3, ignoring order. |
@@ -127,63 +140,68 @@ some* permutation of the elements, each element matches an `ei` (for a different
 
 **Notes:**
 
-* These matchers can also match:
-    1. a native array passed by reference (e.g. in `Foo(const int (&a)[5])`), and
-    2. an array passed as a pointer and a count (e.g. in `Bar(const T* buffer, int len)` --
-       see [Multi-argument Matchers](#MultiArgMatchers)).
-* The array being matched may be multi-dimensional (i.e. its elements can be arrays).
-* `m` in `Pointwise(m, ...)` and `UnorderedPointwise(m, ...)` should be a matcher for `::std::tuple<T, U>` where `T`
-  and `U` are the element type of the actual container and the expected container, respectively. For example, to compare
-  two `Foo` containers where `Foo` doesn't support `operator==`, one might write:
-
-  ```cpp
-  using ::std::get;
-  MATCHER(FooEq, "") {
-    return std::get<0>(arg).Equals(std::get<1>(arg));
-  }
-  ...
-  EXPECT_THAT(actual_foos, Pointwise(FooEq(), expected_foos));
-  ```
+*   These matchers can also match:
+    1.  a native array passed by reference (e.g. in `Foo(const int (&a)[5])`),
+        and
+    2.  an array passed as a pointer and a count (e.g. in `Bar(const T* buffer,
+        int len)` -- see [Multi-argument Matchers](#MultiArgMatchers)).
+*   The array being matched may be multi-dimensional (i.e. its elements can be
+    arrays).
+*   `m` in `Pointwise(m, ...)` and `UnorderedPointwise(m, ...)` should be a
+    matcher for `::std::tuple<T, U>` where `T` and `U` are the element type of
+    the actual container and the expected container, respectively. For example,
+    to compare two `Foo` containers where `Foo` doesn't support `operator==`,
+    one might write:
+
+    ```cpp
+    MATCHER(FooEq, "") {
+      return std::get<0>(arg).Equals(std::get<1>(arg));
+    }
+    ...
+    EXPECT_THAT(actual_foos, Pointwise(FooEq(), expected_foos));
+    ```
 
 ## Member Matchers
 
 | Matcher                         | Description                                |
 | :------------------------------ | :----------------------------------------- |
-| `Field(&class::field, m)`       | `argument.field` (or `argument->field` when `argument` is a plain pointer) matches matcher `m`, where `argument` is an object of type _
-class_. |
+| `Field(&class::field, m)`       | `argument.field` (or `argument->field` when `argument` is a plain pointer) matches matcher `m`, where `argument` is an object of type _class_. |
 | `Field(field_name, &class::field, m)` | The same as the two-parameter version, but provides a better error message. |
 | `Key(e)`                        | `argument.first` matches `e`, which can be either a value or a matcher. E.g. `Contains(Key(Le(5)))` can verify that a `map` contains a key `<= 5`. |
 | `Pair(m1, m2)`                  | `argument` is an `std::pair` whose `first` field matches `m1` and `second` field matches `m2`. |
 | `FieldsAre(m...)`                   | `argument` is a compatible object where each field matches piecewise with the matchers `m...`. A compatible object is any that supports the `std::tuple_size<Obj>`+`get<I>(obj)` protocol. In C++17 and up this also supports types compatible with structured bindings, like aggregates. |
-| `Property(&class::property, m)` | `argument.property()` (or `argument->property()` when `argument` is a plain pointer) matches matcher `m`, where `argument` is an object of type _
-class_. The method `property()` must take no argument and be declared as `const`. |
+| `Property(&class::property, m)` | `argument.property()` (or `argument->property()` when `argument` is a plain pointer) matches matcher `m`, where `argument` is an object of type _class_. The method `property()` must take no argument and be declared as `const`. |
 | `Property(property_name, &class::property, m)` | The same as the two-parameter version, but provides a better error message.
 
-**Notes:**
+{: .callout .warning}
+Warning: Don't use `Property()` against member functions that you do not own,
+because taking addresses of functions is fragile and generally not part of the
+contract of the function.
 
-* You can use `FieldsAre()` to match any type that supports structured bindings, such as `std::tuple`, `std::pair`
-  , `std::array`, and aggregate types. For example:
+**Notes:**
 
-  ```cpp
-  std::tuple<int, std::string> my_tuple{7, "hello world"};
-  EXPECT_THAT(my_tuple, FieldsAre(Ge(0), HasSubstr("hello")));
+*   You can use `FieldsAre()` to match any type that supports structured
+    bindings, such as `std::tuple`, `std::pair`, `std::array`, and aggregate
+    types. For example:
 
-  struct MyStruct {
-    int value = 42;
-    std::string greeting = "aloha";
-  };
-  MyStruct s;
-  EXPECT_THAT(s, FieldsAre(42, "aloha"));
-  ```
+    ```cpp
+    std::tuple<int, std::string> my_tuple{7, "hello world"};
+    EXPECT_THAT(my_tuple, FieldsAre(Ge(0), HasSubstr("hello")));
 
-* Don't use `Property()` against member functions that you do not own, because taking addresses of functions is fragile
-  and generally not part of the contract of the function.
+    struct MyStruct {
+      int value = 42;
+      std::string greeting = "aloha";
+    };
+    MyStruct s;
+    EXPECT_THAT(s, FieldsAre(42, "aloha"));
+    ```
 
 ## Matching the Result of a Function, Functor, or Callback
 
 | Matcher          | Description                                       |
 | :--------------- | :------------------------------------------------ |
 | `ResultOf(f, m)` | `f(argument)` matches matcher `m`, where `f` is a function or functor. |
+| `ResultOf(result_description, f, m)` | The same as the two-parameter version, but provides a better error message.
 
 ## Pointer Matchers
 
@@ -196,8 +214,9 @@ class_. The method `property()` must take no argument and be declared as `const`
 
 ## Multi-argument Matchers {#MultiArgMatchers}
 
-Technically, all matchers match a *single* value. A "multi-argument" matcher is just one that matches a *tuple*. The
-following matchers can be used to match a tuple `(x, y)`:
+Technically, all matchers match a *single* value. A "multi-argument" matcher is
+just one that matches a *tuple*. The following matchers can be used to match a
+tuple `(x, y)`:
 
 Matcher | Description
 :------ | :----------
@@ -208,7 +227,8 @@ Matcher | Description
 `Lt()`  | `x < y`
 `Ne()`  | `x != y`
 
-You can use the following selectors to pick a subset of the arguments (or reorder them) to participate in the matching:
+You can use the following selectors to pick a subset of the arguments (or
+reorder them) to participate in the matching:
 
 | Matcher                    | Description                                     |
 | :------------------------- | :---------------------------------------------- |
@@ -226,6 +246,7 @@ You can make a matcher from one or more other matchers:
 | `AnyOf(m1, m2, ..., mn)` | `argument` matches at least one of the matchers `m1` to `mn`. |
 | `AnyOfArray({m0, m1, ..., mn})`, `AnyOfArray(a_container)`, `AnyOfArray(begin, end)`, `AnyOfArray(array)`, or `AnyOfArray(array, count)` | The same as `AnyOf()` except that the matchers come from an initializer list, STL-style container, iterator range, or C-style array. |
 | `Not(m)` | `argument` doesn't match matcher `m`. |
+| `Conditional(cond, m1, m2)` | Matches matcher `m1` if `cond` evaluates to true, else matches `m2`.|
 
 ## Adapters for Matchers
 
@@ -235,7 +256,8 @@ You can make a matcher from one or more other matchers:
 | `SafeMatcherCast<T>(m)` | [safely casts](../gmock_cook_book.md#SafeMatcherCast) matcher `m` to type `Matcher<T>`. |
 | `Truly(predicate)`      | `predicate(argument)` returns something considered by C++ to be true, where `predicate` is a function or functor. |
 
-`AddressSatisfies(callback)` and `Truly(callback)` take ownership of `callback`, which must be a permanent callback.
+`AddressSatisfies(callback)` and `Truly(callback)` take ownership of `callback`,
+which must be a permanent callback.
 
 ## Using Matchers as Predicates {#MatchersAsPredicatesCheat}
 
@@ -247,7 +269,7 @@ You can make a matcher from one or more other matchers:
 
 ## Defining Matchers
 
-| Matcher                              | Description                           |
+| Macro                                | Description                           |
 | :----------------------------------- | :------------------------------------ |
 | `MATCHER(IsEven, "") { return (arg % 2) == 0; }` | Defines a matcher `IsEven()` to match an even number. |
 | `MATCHER_P(IsDivisibleBy, n, "") { *result_listener << "where the remainder is " << (arg % n); return (arg % n) == 0; }` | Defines a matcher `IsDivisibleBy(n)` to match a number divisible by `n`. |
@@ -255,14 +277,29 @@ You can make a matcher from one or more other matchers:
 
 **Notes:**
 
-1. The `MATCHER*` macros cannot be used inside a function or class.
-2. The matcher body must be *purely functional* (i.e. it cannot have any side effect, and the result must not depend on
-   anything other than the value being matched and the matcher parameters).
-3. You can use `PrintToString(x)` to convert a value `x` of any type to a string.
-4. You can use `ExplainMatchResult()` in a custom matcher to wrap another matcher, for example:
-
-   ```cpp
-   MATCHER_P(NestedPropertyMatches, matcher, "") {
-     return ExplainMatchResult(matcher, arg.nested().property(), result_listener);
-   }
-   ```
+1.  The `MATCHER*` macros cannot be used inside a function or class.
+2.  The matcher body must be *purely functional* (i.e. it cannot have any side
+    effect, and the result must not depend on anything other than the value
+    being matched and the matcher parameters).
+3.  You can use `PrintToString(x)` to convert a value `x` of any type to a
+    string.
+4.  You can use `ExplainMatchResult()` in a custom matcher to wrap another
+    matcher, for example:
+
+    ```cpp
+    MATCHER_P(NestedPropertyMatches, matcher, "") {
+      return ExplainMatchResult(matcher, arg.nested().property(), result_listener);
+    }
+    ```
+
+5.  You can use `DescribeMatcher<>` to describe another matcher. For example:
+
+    ```cpp
+    MATCHER_P(XAndYThat, matcher,
+              "X that " + DescribeMatcher<int>(matcher, negation) +
+                  (negation ? " or" : " and") + " Y that " +
+                  DescribeMatcher<double>(matcher, negation)) {
+      return ExplainMatchResult(matcher, arg.x(), result_listener) &&
+             ExplainMatchResult(matcher, arg.y(), result_listener);
+    }
+    ```
diff --git a/external/googletest/docs/reference/mocking.md b/external/googletest/docs/reference/mocking.md
index 89c5727b..ab37ebf3 100644
--- a/external/googletest/docs/reference/mocking.md
+++ b/external/googletest/docs/reference/mocking.md
@@ -1,8 +1,7 @@
 # Mocking Reference
 
-This page lists the facilities provided by GoogleTest for creating and working with mock objects. To use them, include
-the header
-`gmock/gmock.h`.
+This page lists the facilities provided by GoogleTest for creating and working
+with mock objects. To use them, add `#include <gmock/gmock.h>`.
 
 ## Macros {#macros}
 
@@ -14,11 +13,12 @@ GoogleTest defines the following macros for working with mocks.
 `MOCK_METHOD(`*`return_type`*`,`*`method_name`*`, (`*`args...`*`),
 (`*`specs...`*`));`
 
-Defines a mock method *`method_name`* with arguments `(`*`args...`*`)` and return type *`return_type`* within a mock
-class.
+Defines a mock method *`method_name`* with arguments `(`*`args...`*`)` and
+return type *`return_type`* within a mock class.
 
-The parameters of `MOCK_METHOD` mirror the method declaration. The optional fourth parameter *`specs...`* is a
-comma-separated list of qualifiers. The following qualifiers are accepted:
+The parameters of `MOCK_METHOD` mirror the method declaration. The optional
+fourth parameter *`specs...`* is a comma-separated list of qualifiers. The
+following qualifiers are accepted:
 
 | Qualifier                  | Meaning                                      |
 | -------------------------- | -------------------------------------------- |
@@ -28,8 +28,9 @@ comma-separated list of qualifiers. The following qualifiers are accepted:
 | `Calltype(`*`calltype`*`)` | Sets the call type for the method, for example `Calltype(STDMETHODCALLTYPE)`. Useful on Windows. |
 | `ref(`*`qualifier`*`)`     | Marks the method with the given reference qualifier, for example `ref(&)` or `ref(&&)`. Required if overriding a method that has a reference qualifier. |
 
-Note that commas in arguments prevent `MOCK_METHOD` from parsing the arguments correctly if they are not appropriately
-surrounded by parentheses. See the following example:
+Note that commas in arguments prevent `MOCK_METHOD` from parsing the arguments
+correctly if they are not appropriately surrounded by parentheses. See the
+following example:
 
 ```cpp
 class MyMock {
@@ -50,26 +51,29 @@ class MyMock {
 };
 ```
 
-`MOCK_METHOD` must be used in the `public:` section of a mock class definition, regardless of whether the method being
-mocked is `public`, `protected`, or
+`MOCK_METHOD` must be used in the `public:` section of a mock class definition,
+regardless of whether the method being mocked is `public`, `protected`, or
 `private` in the base class.
 
 ### EXPECT_CALL {#EXPECT_CALL}
 
 `EXPECT_CALL(`*`mock_object`*`,`*`method_name`*`(`*`matchers...`*`))`
 
-Creates an [expectation](../gmock_for_dummies.md#setting-expectations) that the method *`method_name`* of the
-object *`mock_object`* is called with arguments that match the given matchers *`matchers...`*. `EXPECT_CALL` must
-precede any code that exercises the mock object.
+Creates an [expectation](../gmock_for_dummies.md#setting-expectations) that the
+method *`method_name`* of the object *`mock_object`* is called with arguments
+that match the given matchers *`matchers...`*. `EXPECT_CALL` must precede any
+code that exercises the mock object.
 
 The parameter *`matchers...`* is a comma-separated list of
-[matchers](../gmock_for_dummies.md#matchers-what-arguments-do-we-expect) that correspond to each argument of the
-method *`method_name`*. The expectation will apply only to calls of *`method_name`* whose arguments match all of the
-matchers. If `(`*`matchers...`*`)` is omitted, the expectation behaves as if each argument's matcher were
-a [wildcard matcher (`_`)](matchers.md#wildcard). See the [Matchers Reference](matchers.md) for a list of all built-in
-matchers.
+[matchers](../gmock_for_dummies.md#matchers-what-arguments-do-we-expect) that
+correspond to each argument of the method *`method_name`*. The expectation will
+apply only to calls of *`method_name`* whose arguments match all of the
+matchers. If `(`*`matchers...`*`)` is omitted, the expectation behaves as if
+each argument's matcher were a [wildcard matcher (`_`)](matchers.md#wildcard).
+See the [Matchers Reference](matchers.md) for a list of all built-in matchers.
 
-The following chainable clauses can be used to modify the expectation, and they must be used in the following order:
+The following chainable clauses can be used to modify the expectation, and they
+must be used in the following order:
 
 ```cpp
 EXPECT_CALL(mock_object, method_name(matchers...))
@@ -88,15 +92,17 @@ See details for each modifier clause below.
 
 `.With(`*`multi_argument_matcher`*`)`
 
-Restricts the expectation to apply only to mock function calls whose arguments as a whole match the multi-argument
-matcher *`multi_argument_matcher`*.
+Restricts the expectation to apply only to mock function calls whose arguments
+as a whole match the multi-argument matcher *`multi_argument_matcher`*.
 
-GoogleTest passes all of the arguments as one tuple into the matcher. The parameter *`multi_argument_matcher`* must thus
-be a matcher of type
-`Matcher<std::tuple<A1, ..., An>>`, where `A1, ..., An` are the types of the function arguments.
+GoogleTest passes all of the arguments as one tuple into the matcher. The
+parameter *`multi_argument_matcher`* must thus be a matcher of type
+`Matcher<std::tuple<A1, ..., An>>`, where `A1, ..., An` are the types of the
+function arguments.
 
 For example, the following code sets the expectation that
-`my_mock.SetPosition()` is called with any two arguments, the first argument being less than the second:
+`my_mock.SetPosition()` is called with any two arguments, the first argument
+being less than the second:
 
 ```cpp
 using ::testing::_;
@@ -109,7 +115,8 @@ EXPECT_CALL(my_mock, SetPosition(_, _))
 GoogleTest provides some built-in matchers for 2-tuples, including the `Lt()`
 matcher above. See [Multi-argument Matchers](matchers.md#MultiArgMatchers).
 
-The `With` clause can be used at most once on an expectation and must be the first clause.
+The `With` clause can be used at most once on an expectation and must be the
+first clause.
 
 #### Times {#EXPECT_CALL.Times}
 
@@ -117,8 +124,8 @@ The `With` clause can be used at most once on an expectation and must be the fir
 
 Specifies how many times the mock function call is expected.
 
-The parameter *`cardinality`* represents the number of expected calls and can be one of the following, all defined in
-the `::testing` namespace:
+The parameter *`cardinality`* represents the number of expected calls and can be
+one of the following, all defined in the `::testing` namespace:
 
 | Cardinality         | Meaning                                             |
 | ------------------- | --------------------------------------------------- |
@@ -130,12 +137,13 @@ the `::testing` namespace:
 
 If the `Times` clause is omitted, GoogleTest infers the cardinality as follows:
 
-* If neither [`WillOnce`](#EXPECT_CALL.WillOnce) nor
-  [`WillRepeatedly`](#EXPECT_CALL.WillRepeatedly) are specified, the inferred cardinality is `Times(1)`.
-* If there are *n* `WillOnce` clauses and no `WillRepeatedly` clause, where
-  *n* >= 1, the inferred cardinality is `Times(n)`.
-* If there are *n* `WillOnce` clauses and one `WillRepeatedly` clause, where
-  *n* >= 0, the inferred cardinality is `Times(AtLeast(n))`.
+*   If neither [`WillOnce`](#EXPECT_CALL.WillOnce) nor
+    [`WillRepeatedly`](#EXPECT_CALL.WillRepeatedly) are specified, the inferred
+    cardinality is `Times(1)`.
+*   If there are *n* `WillOnce` clauses and no `WillRepeatedly` clause, where
+    *n* >= 1, the inferred cardinality is `Times(n)`.
+*   If there are *n* `WillOnce` clauses and one `WillRepeatedly` clause, where
+    *n* >= 0, the inferred cardinality is `Times(AtLeast(n))`.
 
 The `Times` clause can be used at most once on an expectation.
 
@@ -145,11 +153,12 @@ The `Times` clause can be used at most once on an expectation.
 
 Specifies that the mock function call is expected in a certain sequence.
 
-The parameter *`sequences...`* is any number of [`Sequence`](#Sequence) objects. Expected calls assigned to the same
-sequence are expected to occur in the order the expectations are declared.
+The parameter *`sequences...`* is any number of [`Sequence`](#Sequence) objects.
+Expected calls assigned to the same sequence are expected to occur in the order
+the expectations are declared.
 
-For example, the following code sets the expectation that the `Reset()` method of `my_mock` is called before
-both `GetSize()` and `Describe()`, and `GetSize()`
+For example, the following code sets the expectation that the `Reset()` method
+of `my_mock` is called before both `GetSize()` and `Describe()`, and `GetSize()`
 and `Describe()` can occur in any order relative to each other:
 
 ```cpp
@@ -172,14 +181,16 @@ See also the [`InSequence` class](#InSequence).
 
 `.After(`*`expectations...`*`)`
 
-Specifies that the mock function call is expected to occur after one or more other calls.
+Specifies that the mock function call is expected to occur after one or more
+other calls.
 
 The parameter *`expectations...`* can be up to five
-[`Expectation`](#Expectation) or [`ExpectationSet`](#ExpectationSet) objects. The mock function call is expected to
-occur after all of the given expectations.
+[`Expectation`](#Expectation) or [`ExpectationSet`](#ExpectationSet) objects.
+The mock function call is expected to occur after all of the given expectations.
 
 For example, the following code sets the expectation that the `Describe()`
-method of `my_mock` is called only after both `InitX()` and `InitY()` have been called.
+method of `my_mock` is called only after both `InitX()` and `InitY()` have been
+called.
 
 ```cpp
 using ::testing::Expectation;
@@ -190,8 +201,8 @@ EXPECT_CALL(my_mock, Describe())
     .After(init_x, init_y);
 ```
 
-The `ExpectationSet` object is helpful when the number of prerequisites for an expectation is large or variable, for
-example:
+The `ExpectationSet` object is helpful when the number of prerequisites for an
+expectation is large or variable, for example:
 
 ```cpp
 using ::testing::ExpectationSet;
@@ -211,18 +222,21 @@ The `After` clause can be used any number of times on an expectation.
 
 `.WillOnce(`*`action`*`)`
 
-Specifies the mock function's actual behavior when invoked, for a single matching function call.
+Specifies the mock function's actual behavior when invoked, for a single
+matching function call.
 
 The parameter *`action`* represents the
-[action](../gmock_for_dummies.md#actions-what-should-it-do) that the function call will perform. See
-the [Actions Reference](actions.md) for a list of built-in actions.
+[action](../gmock_for_dummies.md#actions-what-should-it-do) that the function
+call will perform. See the [Actions Reference](actions.md) for a list of
+built-in actions.
 
 The use of `WillOnce` implicitly sets a cardinality on the expectation when
 `Times` is not specified. See [`Times`](#EXPECT_CALL.Times).
 
-Each matching function call will perform the next action in the order declared. For example, the following code
-specifies that `my_mock.GetNumber()` is expected to be called exactly 3 times and will return `1`, `2`, and `3`
-respectively on the first, second, and third calls:
+Each matching function call will perform the next action in the order declared.
+For example, the following code specifies that `my_mock.GetNumber()` is expected
+to be called exactly 3 times and will return `1`, `2`, and `3` respectively on
+the first, second, and third calls:
 
 ```cpp
 using ::testing::Return;
@@ -233,25 +247,29 @@ EXPECT_CALL(my_mock, GetNumber())
     .WillOnce(Return(3));
 ```
 
-The `WillOnce` clause can be used any number of times on an expectation.
+The `WillOnce` clause can be used any number of times on an expectation. Unlike
+`WillRepeatedly`, the action fed to each `WillOnce` call will be called at most
+once, so may be a move-only type and/or have an `&&`-qualified call operator.
 
 #### WillRepeatedly {#EXPECT_CALL.WillRepeatedly}
 
 `.WillRepeatedly(`*`action`*`)`
 
-Specifies the mock function's actual behavior when invoked, for all subsequent matching function calls. Takes effect
-after the actions specified in the
+Specifies the mock function's actual behavior when invoked, for all subsequent
+matching function calls. Takes effect after the actions specified in the
 [`WillOnce`](#EXPECT_CALL.WillOnce) clauses, if any, have been performed.
 
 The parameter *`action`* represents the
-[action](../gmock_for_dummies.md#actions-what-should-it-do) that the function call will perform. See
-the [Actions Reference](actions.md) for a list of built-in actions.
+[action](../gmock_for_dummies.md#actions-what-should-it-do) that the function
+call will perform. See the [Actions Reference](actions.md) for a list of
+built-in actions.
 
-The use of `WillRepeatedly` implicitly sets a cardinality on the expectation when `Times` is not specified.
-See [`Times`](#EXPECT_CALL.Times).
+The use of `WillRepeatedly` implicitly sets a cardinality on the expectation
+when `Times` is not specified. See [`Times`](#EXPECT_CALL.Times).
 
-If any `WillOnce` clauses have been specified, matching function calls will perform those actions before the action
-specified by `WillRepeatedly`. See the following example:
+If any `WillOnce` clauses have been specified, matching function calls will
+perform those actions before the action specified by `WillRepeatedly`. See the
+following example:
 
 ```cpp
 using ::testing::Return;
@@ -270,12 +288,13 @@ The `WillRepeatedly` clause can be used at most once on an expectation.
 
 `.RetiresOnSaturation()`
 
-Indicates that the expectation will no longer be active after the expected number of matching function calls has been
-reached.
+Indicates that the expectation will no longer be active after the expected
+number of matching function calls has been reached.
 
-The `RetiresOnSaturation` clause is only meaningful for expectations with an upper-bounded cardinality. The expectation
-will *retire* (no longer match any function calls) after it has been *saturated* (the upper bound has been reached). See
-the following example:
+The `RetiresOnSaturation` clause is only meaningful for expectations with an
+upper-bounded cardinality. The expectation will *retire* (no longer match any
+function calls) after it has been *saturated* (the upper bound has been
+reached). See the following example:
 
 ```cpp
 using ::testing::_;
@@ -288,12 +307,15 @@ EXPECT_CALL(my_mock, SetNumber(7))  // Expectation 2
     .RetiresOnSaturation();
 ```
 
-In the above example, the first two calls to `my_mock.SetNumber(7)` match expectation 2, which then becomes inactive and
-no longer matches any calls. A third call to `my_mock.SetNumber(7)` would then match expectation 1. Without
+In the above example, the first two calls to `my_mock.SetNumber(7)` match
+expectation 2, which then becomes inactive and no longer matches any calls. A
+third call to `my_mock.SetNumber(7)` would then match expectation 1. Without
 `RetiresOnSaturation()` on expectation 2, a third call to `my_mock.SetNumber(7)`
-would match expectation 2 again, producing a failure since the limit of 2 calls was exceeded.
+would match expectation 2 again, producing a failure since the limit of 2 calls
+was exceeded.
 
-The `RetiresOnSaturation` clause can be used at most once on an expectation and must be the last clause.
+The `RetiresOnSaturation` clause can be used at most once on an expectation and
+must be the last clause.
 
 ### ON_CALL {#ON_CALL}
 
@@ -305,14 +327,15 @@ Defines what happens when the method *`method_name`* of the object
 *Does not* set any expectations that the method will be called.
 
 The parameter *`matchers...`* is a comma-separated list of
-[matchers](../gmock_for_dummies.md#matchers-what-arguments-do-we-expect) that correspond to each argument of the
-method *`method_name`*. The `ON_CALL`
-specification will apply only to calls of *`method_name`* whose arguments match all of the matchers.
-If `(`*`matchers...`*`)` is omitted, the behavior is as if each argument's matcher were
-a [wildcard matcher (`_`)](matchers.md#wildcard). See the [Matchers Reference](matchers.md) for a list of all built-in
-matchers.
+[matchers](../gmock_for_dummies.md#matchers-what-arguments-do-we-expect) that
+correspond to each argument of the method *`method_name`*. The `ON_CALL`
+specification will apply only to calls of *`method_name`* whose arguments match
+all of the matchers. If `(`*`matchers...`*`)` is omitted, the behavior is as if
+each argument's matcher were a [wildcard matcher (`_`)](matchers.md#wildcard).
+See the [Matchers Reference](matchers.md) for a list of all built-in matchers.
 
-The following chainable clauses can be used to set the method's behavior, and they must be used in the following order:
+The following chainable clauses can be used to set the method's behavior, and
+they must be used in the following order:
 
 ```cpp
 ON_CALL(mock_object, method_name(matchers...))
@@ -326,15 +349,17 @@ See details for each modifier clause below.
 
 `.With(`*`multi_argument_matcher`*`)`
 
-Restricts the specification to only mock function calls whose arguments as a whole match the multi-argument
-matcher *`multi_argument_matcher`*.
+Restricts the specification to only mock function calls whose arguments as a
+whole match the multi-argument matcher *`multi_argument_matcher`*.
 
-GoogleTest passes all of the arguments as one tuple into the matcher. The parameter *`multi_argument_matcher`* must thus
-be a matcher of type
-`Matcher<std::tuple<A1, ..., An>>`, where `A1, ..., An` are the types of the function arguments.
+GoogleTest passes all of the arguments as one tuple into the matcher. The
+parameter *`multi_argument_matcher`* must thus be a matcher of type
+`Matcher<std::tuple<A1, ..., An>>`, where `A1, ..., An` are the types of the
+function arguments.
 
 For example, the following code sets the default behavior when
-`my_mock.SetPosition()` is called with any two arguments, the first argument being less than the second:
+`my_mock.SetPosition()` is called with any two arguments, the first argument
+being less than the second:
 
 ```cpp
 using ::testing::_;
@@ -358,8 +383,9 @@ The `With` clause can be used at most once with each `ON_CALL` statement.
 Specifies the default behavior of a matching mock function call.
 
 The parameter *`action`* represents the
-[action](../gmock_for_dummies.md#actions-what-should-it-do) that the function call will perform. See
-the [Actions Reference](actions.md) for a list of built-in actions.
+[action](../gmock_for_dummies.md#actions-what-should-it-do) that the function
+call will perform. See the [Actions Reference](actions.md) for a list of
+built-in actions.
 
 For example, the following code specifies that by default, a call to
 `my_mock.Greet()` will return `"hello"`:
@@ -371,8 +397,8 @@ ON_CALL(my_mock, Greet())
     .WillByDefault(Return("hello"));
 ```
 
-The action specified by `WillByDefault` is superseded by the actions specified on a matching `EXPECT_CALL` statement, if
-any. See the
+The action specified by `WillByDefault` is superseded by the actions specified
+on a matching `EXPECT_CALL` statement, if any. See the
 [`WillOnce`](#EXPECT_CALL.WillOnce) and
 [`WillRepeatedly`](#EXPECT_CALL.WillRepeatedly) clauses of `EXPECT_CALL`.
 
@@ -387,11 +413,13 @@ GoogleTest defines the following classes for working with mocks.
 
 `::testing::DefaultValue<T>`
 
-Allows a user to specify the default value for a type `T` that is both copyable and publicly destructible (i.e. anything
-that can be used as a function return type). For mock functions with a return type of `T`, this default value is
+Allows a user to specify the default value for a type `T` that is both copyable
+and publicly destructible (i.e. anything that can be used as a function return
+type). For mock functions with a return type of `T`, this default value is
 returned from function calls that do not specify an action.
 
-Provides the static methods `Set()`, `SetFactory()`, and `Clear()` to manage the default value:
+Provides the static methods `Set()`, `SetFactory()`, and `Clear()` to manage the
+default value:
 
 ```cpp
 // Sets the default value to be returned. T must be copy constructible.
@@ -410,16 +438,17 @@ DefaultValue<T>::Clear();
 `::testing::NiceMock<T>`
 
 Represents a mock object that suppresses warnings on
-[uninteresting calls](../gmock_cook_book.md#uninteresting-vs-unexpected). The template parameter `T` is any mock class,
-except for another `NiceMock`,
+[uninteresting calls](../gmock_cook_book.md#uninteresting-vs-unexpected). The
+template parameter `T` is any mock class, except for another `NiceMock`,
 `NaggyMock`, or `StrictMock`.
 
-Usage of `NiceMock<T>` is analogous to usage of `T`. `NiceMock<T>` is a subclass of `T`, so it can be used wherever an
-object of type `T` is accepted. In addition, `NiceMock<T>` can be constructed with any arguments that a constructor
+Usage of `NiceMock<T>` is analogous to usage of `T`. `NiceMock<T>` is a subclass
+of `T`, so it can be used wherever an object of type `T` is accepted. In
+addition, `NiceMock<T>` can be constructed with any arguments that a constructor
 of `T` accepts.
 
-For example, the following code suppresses warnings on the mock `my_mock` of type `MockClass` if a method other
-than `DoSomething()` is called:
+For example, the following code suppresses warnings on the mock `my_mock` of
+type `MockClass` if a method other than `DoSomething()` is called:
 
 ```cpp
 using ::testing::NiceMock;
@@ -429,8 +458,9 @@ EXPECT_CALL(my_mock, DoSomething());
 ... code that uses my_mock ...
 ```
 
-`NiceMock<T>` only works for mock methods defined using the `MOCK_METHOD` macro directly in the definition of class `T`.
-If a mock method is defined in a base class of `T`, a warning might still be generated.
+`NiceMock<T>` only works for mock methods defined using the `MOCK_METHOD` macro
+directly in the definition of class `T`. If a mock method is defined in a base
+class of `T`, a warning might still be generated.
 
 `NiceMock<T>` might not work correctly if the destructor of `T` is not virtual.
 
@@ -439,13 +469,14 @@ If a mock method is defined in a base class of `T`, a warning might still be gen
 `::testing::NaggyMock<T>`
 
 Represents a mock object that generates warnings on
-[uninteresting calls](../gmock_cook_book.md#uninteresting-vs-unexpected). The template parameter `T` is any mock class,
-except for another `NiceMock`,
+[uninteresting calls](../gmock_cook_book.md#uninteresting-vs-unexpected). The
+template parameter `T` is any mock class, except for another `NiceMock`,
 `NaggyMock`, or `StrictMock`.
 
-Usage of `NaggyMock<T>` is analogous to usage of `T`. `NaggyMock<T>` is a subclass of `T`, so it can be used wherever an
-object of type `T` is accepted. In addition, `NaggyMock<T>` can be constructed with any arguments that a constructor
-of `T` accepts.
+Usage of `NaggyMock<T>` is analogous to usage of `T`. `NaggyMock<T>` is a
+subclass of `T`, so it can be used wherever an object of type `T` is accepted.
+In addition, `NaggyMock<T>` can be constructed with any arguments that a
+constructor of `T` accepts.
 
 For example, the following code generates warnings on the mock `my_mock` of type
 `MockClass` if a method other than `DoSomething()` is called:
@@ -465,13 +496,14 @@ Mock objects of type `T` by default behave the same way as `NaggyMock<T>`.
 `::testing::StrictMock<T>`
 
 Represents a mock object that generates test failures on
-[uninteresting calls](../gmock_cook_book.md#uninteresting-vs-unexpected). The template parameter `T` is any mock class,
-except for another `NiceMock`,
+[uninteresting calls](../gmock_cook_book.md#uninteresting-vs-unexpected). The
+template parameter `T` is any mock class, except for another `NiceMock`,
 `NaggyMock`, or `StrictMock`.
 
-Usage of `StrictMock<T>` is analogous to usage of `T`. `StrictMock<T>` is a subclass of `T`, so it can be used wherever
-an object of type `T` is accepted. In addition, `StrictMock<T>` can be constructed with any arguments that a constructor
-of `T` accepts.
+Usage of `StrictMock<T>` is analogous to usage of `T`. `StrictMock<T>` is a
+subclass of `T`, so it can be used wherever an object of type `T` is accepted.
+In addition, `StrictMock<T>` can be constructed with any arguments that a
+constructor of `T` accepts.
 
 For example, the following code generates a test failure on the mock `my_mock`
 of type `MockClass` if a method other than `DoSomething()` is called:
@@ -485,10 +517,11 @@ EXPECT_CALL(my_mock, DoSomething());
 ```
 
 `StrictMock<T>` only works for mock methods defined using the `MOCK_METHOD`
-macro directly in the definition of class `T`. If a mock method is defined in a base class of `T`, a failure might not
-be generated.
+macro directly in the definition of class `T`. If a mock method is defined in a
+base class of `T`, a failure might not be generated.
 
-`StrictMock<T>` might not work correctly if the destructor of `T` is not virtual.
+`StrictMock<T>` might not work correctly if the destructor of `T` is not
+virtual.
 
 ### Sequence {#Sequence}
 
@@ -501,9 +534,11 @@ Represents a chronological sequence of expectations. See the
 
 `::testing::InSequence`
 
-An object of this type causes all expectations encountered in its scope to be put in an anonymous sequence.
+An object of this type causes all expectations encountered in its scope to be
+put in an anonymous sequence.
 
-This allows more convenient expression of multiple expectations in a single sequence:
+This allows more convenient expression of multiple expectations in a single
+sequence:
 
 ```cpp
 using ::testing::InSequence;
diff --git a/external/googletest/docs/reference/testing.md b/external/googletest/docs/reference/testing.md
index 30ae0191..d7dc5cf9 100644
--- a/external/googletest/docs/reference/testing.md
+++ b/external/googletest/docs/reference/testing.md
@@ -2,8 +2,8 @@
 
 <!--* toc_depth: 3 *-->
 
-This page lists the facilities provided by GoogleTest for writing test programs. To use them, include the
-header `gtest/gtest.h`.
+This page lists the facilities provided by GoogleTest for writing test programs.
+To use them, add `#include <gtest/gtest.h>`.
 
 ## Macros
 
@@ -20,11 +20,13 @@ TEST(<em>TestSuiteName</em>, <em>TestName</em>) {
 Defines an individual test named *`TestName`* in the test suite
 *`TestSuiteName`*, consisting of the given statements.
 
-Both arguments *`TestSuiteName`* and *`TestName`* must be valid C++ identifiers and must not contain underscores (`_`).
-Tests in different test suites can have the same individual name.
+Both arguments *`TestSuiteName`* and *`TestName`* must be valid C++ identifiers
+and must not contain underscores (`_`). Tests in different test suites can have
+the same individual name.
 
 The statements within the test body can be any code under test.
-[Assertions](assertions.md) used within the test body determine the outcome of the test.
+[Assertions](assertions.md) used within the test body determine the outcome of
+the test.
 
 ### TEST_F {#TEST_F}
 
@@ -37,12 +39,14 @@ TEST_F(<em>TestFixtureName</em>, <em>TestName</em>) {
 Defines an individual test named *`TestName`* that uses the test fixture class
 *`TestFixtureName`*. The test suite name is *`TestFixtureName`*.
 
-Both arguments *`TestFixtureName`* and *`TestName`* must be valid C++ identifiers and must not contain underscores (`_`)
-. *`TestFixtureName`* must be the name of a test fixture class—see
+Both arguments *`TestFixtureName`* and *`TestName`* must be valid C++
+identifiers and must not contain underscores (`_`). *`TestFixtureName`* must be
+the name of a test fixture class—see
 [Test Fixtures](../primer.md#same-data-multiple-tests).
 
 The statements within the test body can be any code under test.
-[Assertions](assertions.md) used within the test body determine the outcome of the test.
+[Assertions](assertions.md) used within the test body determine the outcome of
+the test.
 
 ### TEST_P {#TEST_P}
 
@@ -52,16 +56,17 @@ TEST_P(<em>TestFixtureName</em>, <em>TestName</em>) {
 }
 </pre>
 
-Defines an individual value-parameterized test named *`TestName`* that uses the test fixture class *`TestFixtureName`*.
-The test suite name is
+Defines an individual value-parameterized test named *`TestName`* that uses the
+test fixture class *`TestFixtureName`*. The test suite name is
 *`TestFixtureName`*.
 
-Both arguments *`TestFixtureName`* and *`TestName`* must be valid C++ identifiers and must not contain underscores (`_`)
-. *`TestFixtureName`* must be the name of a value-parameterized test fixture class—see
+Both arguments *`TestFixtureName`* and *`TestName`* must be valid C++
+identifiers and must not contain underscores (`_`). *`TestFixtureName`* must be
+the name of a value-parameterized test fixture class—see
 [Value-Parameterized Tests](../advanced.md#value-parameterized-tests).
 
-The statements within the test body can be any code under test. Within the test body, the test parameter can be accessed
-with the `GetParam()` function (see
+The statements within the test body can be any code under test. Within the test
+body, the test parameter can be accessed with the `GetParam()` function (see
 [`WithParamInterface`](#WithParamInterface)). For example:
 
 ```cpp
@@ -72,7 +77,8 @@ TEST_P(MyTestSuite, DoesSomething) {
 }
 ```
 
-[Assertions](assertions.md) used within the test body determine the outcome of the test.
+[Assertions](assertions.md) used within the test body determine the outcome of
+the test.
 
 See also [`INSTANTIATE_TEST_SUITE_P`](#INSTANTIATE_TEST_SUITE_P).
 
@@ -85,12 +91,14 @@ See also [`INSTANTIATE_TEST_SUITE_P`](#INSTANTIATE_TEST_SUITE_P).
 Instantiates the value-parameterized test suite *`TestSuiteName`* (defined with
 [`TEST_P`](#TEST_P)).
 
-The argument *`InstantiationName`* is a unique name for the instantiation of the test suite, to distinguish between
-multiple instantiations. In test output, the instantiation name is added as a prefix to the test suite name
-*`TestSuiteName`*.
+The argument *`InstantiationName`* is a unique name for the instantiation of the
+test suite, to distinguish between multiple instantiations. In test output, the
+instantiation name is added as a prefix to the test suite name
+*`TestSuiteName`*. If *`InstantiationName`* is empty
+(`INSTANTIATE_TEST_SUITE_P(, ...)`), no prefix is added.
 
-The argument *`param_generator`* is one of the following GoogleTest-provided functions that generate the test
-parameters, all defined in the `::testing`
+The argument *`param_generator`* is one of the following GoogleTest-provided
+functions that generate the test parameters, all defined in the `::testing`
 namespace:
 
 <span id="param-generators"></span>
@@ -101,21 +109,22 @@ namespace:
 | `Values(v1, v2, ..., vN)`    | Yields values `{v1, v2, ..., vN}`.          |
 | `ValuesIn(container)` or `ValuesIn(begin,end)` | Yields values from a C-style array, an STL-style container, or an iterator range `[begin, end)`. |
 | `Bool()`                     | Yields sequence `{false, true}`.            |
-| `Combine(g1, g2, ..., gN)`   | Yields as `std::tuple` *
-n*-tuples all combinations (Cartesian product) of the values generated by the given *
-n* generators `g1`, `g2`, ..., `gN`. |
-
-The optional last argument *`name_generator`* is a function or functor that generates custom test name suffixes based on
-the test parameters. The function must accept an argument of type
-[`TestParamInfo<class ParamType>`](#TestParamInfo) and return a `std::string`. The test name suffix can only contain
-alphanumeric characters and underscores. GoogleTest provides [`PrintToStringParamName`](#PrintToStringParamName), or a
+| `Combine(g1, g2, ..., gN)`   | Yields as `std::tuple` *n*-tuples all combinations (Cartesian product) of the values generated by the given *n* generators `g1`, `g2`, ..., `gN`. |
+| `ConvertGenerator<T>(g)` or `ConvertGenerator(g, func)`    | Yields values generated by generator `g`, `static_cast` from `T`. (Note: `T` might not be what you expect. See [*Using ConvertGenerator*](#using-convertgenerator) below.) The second overload uses `func` to perform the conversion. |
+
+The optional last argument *`name_generator`* is a function or functor that
+generates custom test name suffixes based on the test parameters. The function
+must accept an argument of type
+[`TestParamInfo<class ParamType>`](#TestParamInfo) and return a `std::string`.
+The test name suffix can only contain alphanumeric characters and underscores.
+GoogleTest provides [`PrintToStringParamName`](#PrintToStringParamName), or a
 custom function can be used for more control:
 
 ```cpp
 INSTANTIATE_TEST_SUITE_P(
     MyInstantiation, MyTestSuite,
-    ::testing::Values(...),
-    [](const ::testing::TestParamInfo<MyTestSuite::ParamType>& info) {
+    testing::Values(...),
+    [](const testing::TestParamInfo<MyTestSuite::ParamType>& info) {
       // Can use info.param here to generate the test suffix
       std::string name = ...
       return name;
@@ -128,17 +137,117 @@ For more information, see
 See also
 [`GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST`](#GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST).
 
+###### Using `ConvertGenerator`
+
+The functions listed in the table above appear to return generators that create
+values of the desired types, but this is not generally the case. Rather, they
+typically return factory objects that convert to the the desired generators.
+This affords some flexibility in allowing you to specify values of types that
+are different from, yet implicitly convertible to, the actual parameter type
+required by your fixture class.
+
+For example, you can do the following with a fixture that requires an `int`
+parameter:
+
+```cpp
+INSTANTIATE_TEST_SUITE_P(MyInstantiation, MyTestSuite,
+    testing::Values(1, 1.2));  // Yes, Values() supports heterogeneous argument types.
+```
+
+It might seem obvious that `1.2` &mdash; a `double` &mdash; will be converted to
+an `int` but in actuality it requires some template gymnastics involving the
+indirection described in the previous paragraph.
+
+What if your parameter type is not implicitly convertible from the generated
+type but is *explicitly* convertible? There will be no automatic conversion, but
+you can force it by applying `ConvertGenerator<T>`. The compiler can
+automatically deduce the target type (your fixture's parameter type), but
+because of the aforementioned indirection it cannot decide what the generated
+type should be. You need to tell it, by providing the type `T` explicitly. Thus
+`T` should not be your fixture's parameter type, but rather an intermediate type
+that is supported by the factory object, and which can be `static_cast` to the
+fixture's parameter type:
+
+```cpp
+// The fixture's parameter type.
+class MyParam {
+ public:
+  // Explicit converting ctor.
+  explicit MyParam(const std::tuple<int, bool>& t);
+  ...
+};
+
+INSTANTIATE_TEST_SUITE_P(MyInstantiation, MyTestSuite,
+    ConvertGenerator<std::tuple<int, bool>>(Combine(Values(0.1, 1.2), Bool())));
+```
+
+In this example `Combine` supports the generation of `std::tuple<int, bool>>`
+objects (even though the provided values for the first tuple element are
+`double`s) and those `tuple`s get converted into `MyParam` objects by virtue of
+the call to `ConvertGenerator`.
+
+For parameter types that are not convertible from the generated types you can
+provide a callable that does the conversion. The callable accepts an object of
+the generated type and returns an object of the fixture's parameter type. The
+generated type can often be deduced by the compiler from the callable's call
+signature so you do not usually need specify it explicitly (but see a caveat
+below).
+
+```cpp
+// The fixture's parameter type.
+class MyParam {
+ public:
+  MyParam(int, bool);
+  ...
+};
+
+INSTANTIATE_TEST_SUITE_P(MyInstantiation, MyTestSuite,
+    ConvertGenerator(Combine(Values(1, 1.2), Bool()),
+        [](const std::tuple<int i, bool>& t){
+          const auto [i, b] = t;
+          return MyParam(i, b);
+        }));
+```
+
+The callable may be anything that can be used to initialize a `std::function`
+with the appropriate call signature. Note the callable's return object gets
+`static_cast` to the fixture's parameter type, so it does not have to be of that
+exact type, only convertible to it.
+
+**Caveat:** Consider the following example.
+
+```cpp
+INSTANTIATE_TEST_SUITE_P(MyInstantiation, MyTestSuite,
+    ConvertGenerator(Values(std::string("s")), [](std::string_view s) { ... }));
+```
+
+The `string` argument gets copied into the factory object returned by `Values`.
+Then, because the generated type deduced from the lambda is `string_view`, the
+factory object spawns a generator that holds a `string_view` referencing that
+`string`. Unfortunately, by the time this generator gets invoked, the factory
+object is gone and the `string_view` is dangling.
+
+To overcome this problem you can specify the generated type explicitly:
+`ConvertGenerator<std::string>(Values(std::string("s")), [](std::string_view s)
+{ ... })`. Alternatively, you can change the lambda's signature to take a
+`std::string` or a `const std::string&` (the latter will not leave you with a
+dangling reference because the type deduction strips off the reference and the
+`const`).
+
 ### TYPED_TEST_SUITE {#TYPED_TEST_SUITE}
 
 `TYPED_TEST_SUITE(`*`TestFixtureName`*`,`*`Types`*`)`
+`TYPED_TEST_SUITE(`*`TestFixtureName`*`,`*`Types`*`,`*`NameGenerator`*`)`
 
-Defines a typed test suite based on the test fixture *`TestFixtureName`*. The test suite name is *`TestFixtureName`*.
+Defines a typed test suite based on the test fixture *`TestFixtureName`*. The
+test suite name is *`TestFixtureName`*.
 
-The argument *`TestFixtureName`* is a fixture class template, parameterized by a type, for example:
+The argument *`TestFixtureName`* is a fixture class template, parameterized by a
+type, for example:
 
 ```cpp
 template <typename T>
-class MyFixture : public ::testing::Test {
+class MyFixture : public testing::Test {
  public:
   ...
   using List = std::list<T>;
@@ -147,7 +256,8 @@ class MyFixture : public ::testing::Test {
 };
 ```
 
-The argument *`Types`* is a [`Types`](#Types) object representing the list of types to run the tests on, for example:
+The argument *`Types`* is a [`Types`](#Types) object representing the list of
+types to run the tests on, for example:
 
 ```cpp
 using MyTypes = ::testing::Types<char, int, unsigned int>;
@@ -157,6 +267,22 @@ TYPED_TEST_SUITE(MyFixture, MyTypes);
 The type alias (`using` or `typedef`) is necessary for the `TYPED_TEST_SUITE`
 macro to parse correctly.
 
+The optional third argument *`NameGenerator`* allows specifying a class that
+exposes a templated static function `GetName(int)`. For example:
+
+```cpp
+class NameGenerator {
+ public:
+  template <typename T>
+  static std::string GetName(int) {
+    if constexpr (std::is_same_v<T, char>) return "char";
+    if constexpr (std::is_same_v<T, int>) return "int";
+    if constexpr (std::is_same_v<T, unsigned int>) return "unsignedInt";
+  }
+};
+TYPED_TEST_SUITE(MyFixture, MyTypes, NameGenerator);
+```
+
 See also [`TYPED_TEST`](#TYPED_TEST) and
 [Typed Tests](../advanced.md#typed-tests) for more information.
 
@@ -172,8 +298,8 @@ Defines an individual typed test named *`TestName`* in the typed test suite
 *`TestSuiteName`*. The test suite must be defined with
 [`TYPED_TEST_SUITE`](#TYPED_TEST_SUITE).
 
-Within the test body, the special name `TypeParam` refers to the type parameter, and `TestFixture` refers to the fixture
-class. See the following example:
+Within the test body, the special name `TypeParam` refers to the type parameter,
+and `TestFixture` refers to the fixture class. See the following example:
 
 ```cpp
 TYPED_TEST(MyFixture, Example) {
@@ -204,11 +330,12 @@ For more information, see [Typed Tests](../advanced.md#typed-tests).
 Defines a type-parameterized test suite based on the test fixture
 *`TestFixtureName`*. The test suite name is *`TestFixtureName`*.
 
-The argument *`TestFixtureName`* is a fixture class template, parameterized by a type.
-See [`TYPED_TEST_SUITE`](#TYPED_TEST_SUITE) for an example.
+The argument *`TestFixtureName`* is a fixture class template, parameterized by a
+type. See [`TYPED_TEST_SUITE`](#TYPED_TEST_SUITE) for an example.
 
 See also [`TYPED_TEST_P`](#TYPED_TEST_P) and
-[Type-Parameterized Tests](../advanced.md#type-parameterized-tests) for more information.
+[Type-Parameterized Tests](../advanced.md#type-parameterized-tests) for more
+information.
 
 ### TYPED_TEST_P {#TYPED_TEST_P}
 
@@ -218,15 +345,17 @@ TYPED_TEST_P(<em>TestSuiteName</em>, <em>TestName</em>) {
 }
 </pre>
 
-Defines an individual type-parameterized test named *`TestName`* in the type-parameterized test suite *`TestSuiteName`*.
-The test suite must be defined with [`TYPED_TEST_SUITE_P`](#TYPED_TEST_SUITE_P).
+Defines an individual type-parameterized test named *`TestName`* in the
+type-parameterized test suite *`TestSuiteName`*. The test suite must be defined
+with [`TYPED_TEST_SUITE_P`](#TYPED_TEST_SUITE_P).
 
-Within the test body, the special name `TypeParam` refers to the type parameter, and `TestFixture` refers to the fixture
-class. See [`TYPED_TEST`](#TYPED_TEST)
+Within the test body, the special name `TypeParam` refers to the type parameter,
+and `TestFixture` refers to the fixture class. See [`TYPED_TEST`](#TYPED_TEST)
 for an example.
 
 See also [`REGISTER_TYPED_TEST_SUITE_P`](#REGISTER_TYPED_TEST_SUITE_P) and
-[Type-Parameterized Tests](../advanced.md#type-parameterized-tests) for more information.
+[Type-Parameterized Tests](../advanced.md#type-parameterized-tests) for more
+information.
 
 ### REGISTER_TYPED_TEST_SUITE_P {#REGISTER_TYPED_TEST_SUITE_P}
 
@@ -249,20 +378,25 @@ REGISTER_TYPED_TEST_SUITE_P(MyFixture, HasPropertyA, HasPropertyB);
 ```
 
 See also [`INSTANTIATE_TYPED_TEST_SUITE_P`](#INSTANTIATE_TYPED_TEST_SUITE_P) and
-[Type-Parameterized Tests](../advanced.md#type-parameterized-tests) for more information.
+[Type-Parameterized Tests](../advanced.md#type-parameterized-tests) for more
+information.
 
 ### INSTANTIATE_TYPED_TEST_SUITE_P {#INSTANTIATE_TYPED_TEST_SUITE_P}
 
 `INSTANTIATE_TYPED_TEST_SUITE_P(`*`InstantiationName`*`,`*`TestSuiteName`*`,`*`Types`*`)`
 
-Instantiates the type-parameterized test suite *`TestSuiteName`*. The test suite must be registered with
+Instantiates the type-parameterized test suite *`TestSuiteName`*. The test suite
+must be registered with
 [`REGISTER_TYPED_TEST_SUITE_P`](#REGISTER_TYPED_TEST_SUITE_P).
 
-The argument *`InstantiationName`* is a unique name for the instantiation of the test suite, to distinguish between
-multiple instantiations. In test output, the instantiation name is added as a prefix to the test suite name
-*`TestSuiteName`*.
+The argument *`InstantiationName`* is a unique name for the instantiation of the
+test suite, to distinguish between multiple instantiations. In test output, the
+instantiation name is added as a prefix to the test suite name
+*`TestSuiteName`*. If *`InstantiationName`* is empty
+(`INSTANTIATE_TYPED_TEST_SUITE_P(, ...)`), no prefix is added.
 
-The argument *`Types`* is a [`Types`](#Types) object representing the list of types to run the tests on, for example:
+The argument *`Types`* is a [`Types`](#Types) object representing the list of
+types to run the tests on, for example:
 
 ```cpp
 using MyTypes = ::testing::Types<char, int, unsigned int>;
@@ -279,11 +413,12 @@ For more information, see
 
 `FRIEND_TEST(`*`TestSuiteName`*`,`*`TestName`*`)`
 
-Within a class body, declares an individual test as a friend of the class, enabling the test to access private class
-members.
+Within a class body, declares an individual test as a friend of the class,
+enabling the test to access private class members.
 
-If the class is defined in a namespace, then in order to be friends of the class, test fixtures and tests must be
-defined in the exact same namespace, without inline or anonymous namespaces.
+If the class is defined in a namespace, then in order to be friends of the
+class, test fixtures and tests must be defined in the exact same namespace,
+without inline or anonymous namespaces.
 
 For example, if the class definition looks like the following:
 
@@ -305,7 +440,7 @@ Then the test code should look like:
 ```cpp
 namespace my_namespace {
 
-class MyClassTest : public ::testing::Test {
+class MyClassTest : public testing::Test {
   ...
 };
 
@@ -315,14 +450,16 @@ TEST_F(MyClassTest, HasPropertyB) { ... }
 }  // namespace my_namespace
 ```
 
-See [Testing Private Code](../advanced.md#testing-private-code) for more information.
+See [Testing Private Code](../advanced.md#testing-private-code) for more
+information.
 
 ### SCOPED_TRACE {#SCOPED_TRACE}
 
 `SCOPED_TRACE(`*`message`*`)`
 
-Causes the current file name, line number, and the given message *`message`* to be added to the failure message for each
-assertion failure that occurs in the scope.
+Causes the current file name, line number, and the given message *`message`* to
+be added to the failure message for each assertion failure that occurs in the
+scope.
 
 For more information, see
 [Adding Traces to Assertions](../advanced.md#adding-traces-to-assertions).
@@ -335,26 +472,30 @@ See also the [`ScopedTrace` class](#ScopedTrace).
 
 Prevents further test execution at runtime.
 
-Can be used in individual test cases or in the `SetUp()` methods of test environments or test fixtures (classes derived
-from the
-[`Environment`](#Environment) or [`Test`](#Test) classes). If used in a global test environment `SetUp()` method, it
-skips all tests in the test program. If used in a test fixture `SetUp()` method, it skips all tests in the corresponding
+Can be used in individual test cases or in the `SetUp()` methods of test
+environments or test fixtures (classes derived from the
+[`Environment`](#Environment) or [`Test`](#Test) classes). If used in a global
+test environment `SetUp()` method, it skips all tests in the test program. If
+used in a test fixture `SetUp()` method, it skips all tests in the corresponding
 test suite.
 
 Similar to assertions, `GTEST_SKIP` allows streaming a custom message into it.
 
-See [Skipping Test Execution](../advanced.md#skipping-test-execution) for more information.
+See [Skipping Test Execution](../advanced.md#skipping-test-execution) for more
+information.
 
 ### GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST {#GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST}
 
 `GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(`*`TestSuiteName`*`)`
 
-Allows the value-parameterized test suite *`TestSuiteName`* to be uninstantiated.
+Allows the value-parameterized test suite *`TestSuiteName`* to be
+uninstantiated.
 
 By default, every [`TEST_P`](#TEST_P) call without a corresponding
-[`INSTANTIATE_TEST_SUITE_P`](#INSTANTIATE_TEST_SUITE_P) call causes a failing test in the test
-suite `GoogleTestVerification`.
-`GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST` suppresses this failure for the given test suite.
+[`INSTANTIATE_TEST_SUITE_P`](#INSTANTIATE_TEST_SUITE_P) call causes a failing
+test in the test suite `GoogleTestVerification`.
+`GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST` suppresses this failure for the
+given test suite.
 
 ## Classes and types
 
@@ -362,12 +503,12 @@ GoogleTest defines the following classes and types to help with writing tests.
 
 ### AssertionResult {#AssertionResult}
 
-`::testing::AssertionResult`
+`testing::AssertionResult`
 
 A class for indicating whether an assertion was successful.
 
-When the assertion wasn't successful, the `AssertionResult` object stores a non-empty failure message that can be
-retrieved with the object's `message()`
+When the assertion wasn't successful, the `AssertionResult` object stores a
+non-empty failure message that can be retrieved with the object's `message()`
 method.
 
 To create an instance of this class, use one of the factory functions
@@ -376,22 +517,22 @@ To create an instance of this class, use one of the factory functions
 
 ### AssertionException {#AssertionException}
 
-`::testing::AssertionException`
+`testing::AssertionException`
 
 Exception which can be thrown from
 [`TestEventListener::OnTestPartResult`](#TestEventListener::OnTestPartResult).
 
 ### EmptyTestEventListener {#EmptyTestEventListener}
 
-`::testing::EmptyTestEventListener`
+`testing::EmptyTestEventListener`
 
 Provides an empty implementation of all methods in the
-[`TestEventListener`](#TestEventListener) interface, such that a subclass only needs to override the methods it cares
-about.
+[`TestEventListener`](#TestEventListener) interface, such that a subclass only
+needs to override the methods it cares about.
 
 ### Environment {#Environment}
 
-`::testing::Environment`
+`testing::Environment`
 
 Represents a global test environment. See
 [Global Set-Up and Tear-Down](../advanced.md#global-set-up-and-tear-down).
@@ -412,10 +553,10 @@ Override this to define how to tear down the environment.
 
 ### ScopedTrace {#ScopedTrace}
 
-`::testing::ScopedTrace`
+`testing::ScopedTrace`
 
-An instance of this class causes a trace to be included in every test failure message generated by code in the scope of
-the lifetime of the `ScopedTrace`
+An instance of this class causes a trace to be included in every test failure
+message generated by code in the scope of the lifetime of the `ScopedTrace`
 instance. The effect is undone with the destruction of the instance.
 
 The `ScopedTrace` constructor has the following form:
@@ -428,18 +569,18 @@ ScopedTrace(const char* file, int line, const T& message)
 Example usage:
 
 ```cpp
-::testing::ScopedTrace trace("file.cc", 123, "message");
+testing::ScopedTrace trace("file.cc", 123, "message");
 ```
 
-The resulting trace includes the given source file path and line number, and the given message. The `message` argument
-can be anything streamable to
+The resulting trace includes the given source file path and line number, and the
+given message. The `message` argument can be anything streamable to
 `std::ostream`.
 
 See also [`SCOPED_TRACE`](#SCOPED_TRACE).
 
 ### Test {#Test}
 
-`::testing::Test`
+`testing::Test`
 
 The abstract class that all tests inherit from. `Test` is not copyable.
 
@@ -475,7 +616,8 @@ Returns true if and only if the current test has a nonfatal failure.
 
 `static bool Test::HasFailure()`
 
-Returns true if and only if the current test has any failure, either fatal or nonfatal.
+Returns true if and only if the current test has any failure, either fatal or
+nonfatal.
 
 ##### IsSkipped {#Test::IsSkipped}
 
@@ -485,22 +627,28 @@ Returns true if and only if the current test was skipped.
 
 ##### RecordProperty {#Test::RecordProperty}
 
-`static void Test::RecordProperty(const std::string& key, const std::string& value)` \
+`static void Test::RecordProperty(const std::string& key, const std::string&
+value)` \
 `static void Test::RecordProperty(const std::string& key, int value)`
 
-Logs a property for the current test, test suite, or entire invocation of the test program. Only the last value for a
-given key is logged.
+Logs a property for the current test, test suite, or entire invocation of the
+test program. Only the last value for a given key is logged.
 
-The key must be a valid XML attribute name, and cannot conflict with the ones already used by GoogleTest (`name`
-, `status`, `time`, `classname`, `type_param`, and `value_param`).
+The key must be a valid XML attribute name, and cannot conflict with the ones
+already used by GoogleTest (`name`, `file`, `line`, `status`, `time`,
+`classname`, `type_param`, and `value_param`).
 
-`RecordProperty` is `public static` so it can be called from utility functions that are not members of the test fixture.
+`RecordProperty` is `public static` so it can be called from utility functions
+that are not members of the test fixture.
 
-Calls to `RecordProperty` made during the lifespan of the test (from the moment its constructor starts to the moment its
-destructor finishes) are output in XML as attributes of the `<testcase>` element. Properties recorded from a fixture's
-`SetUpTestSuite` or `TearDownTestSuite` methods are logged as attributes of the corresponding `<testsuite>` element.
-Calls to `RecordProperty` made in the global context (before or after invocation of `RUN_ALL_TESTS` or from the
-`SetUp`/`TearDown` methods of registered `Environment` objects) are output as attributes of the `<testsuites>` element.
+Calls to `RecordProperty` made during the lifespan of the test (from the moment
+its constructor starts to the moment its destructor finishes) are output in XML
+as attributes of the `<testcase>` element. Properties recorded from a fixture's
+`SetUpTestSuite` or `TearDownTestSuite` methods are logged as attributes of the
+corresponding `<testsuite>` element. Calls to `RecordProperty` made in the
+global context (before or after invocation of `RUN_ALL_TESTS` or from the
+`SetUp`/`TearDown` methods of registered `Environment` objects) are output as
+attributes of the `<testsuites>` element.
 
 #### Protected Methods {#Test-protected}
 
@@ -508,7 +656,8 @@ Calls to `RecordProperty` made in the global context (before or after invocation
 
 `virtual void Test::SetUp()`
 
-Override this to perform test fixture setup. GoogleTest calls `SetUp()` before running each individual test.
+Override this to perform test fixture setup. GoogleTest calls `SetUp()` before
+running each individual test.
 
 ##### TearDown {#Test::TearDown}
 
@@ -519,7 +668,7 @@ after running each individual test.
 
 ### TestWithParam {#TestWithParam}
 
-`::testing::TestWithParam<T>`
+`testing::TestWithParam<T>`
 
 A convenience class which inherits from both [`Test`](#Test) and
 [`WithParamInterface<T>`](#WithParamInterface).
@@ -540,8 +689,8 @@ Gets the name of the test suite.
 
 `const char* TestSuite::type_param() const`
 
-Returns the name of the parameter type, or `NULL` if this is not a typed or type-parameterized test suite.
-See [Typed Tests](../advanced.md#typed-tests) and
+Returns the name of the parameter type, or `NULL` if this is not a typed or
+type-parameterized test suite. See [Typed Tests](../advanced.md#typed-tests) and
 [Type-Parameterized Tests](../advanced.md#type-parameterized-tests).
 
 ##### should_run {#TestSuite::should_run}
@@ -627,18 +776,19 @@ Gets the time of the test suite start, in ms from the start of the UNIX epoch.
 `const TestInfo* TestSuite::GetTestInfo(int i) const`
 
 Returns the [`TestInfo`](#TestInfo) for the `i`-th test among all the tests. `i`
-can range from 0 to `total_test_count() - 1`. If `i` is not in that range, returns `NULL`.
+can range from 0 to `total_test_count() - 1`. If `i` is not in that range,
+returns `NULL`.
 
 ##### ad_hoc_test_result {#TestSuite::ad_hoc_test_result}
 
 `const TestResult& TestSuite::ad_hoc_test_result() const`
 
-Returns the [`TestResult`](#TestResult) that holds test properties recorded during execution of `SetUpTestSuite`
-and `TearDownTestSuite`.
+Returns the [`TestResult`](#TestResult) that holds test properties recorded
+during execution of `SetUpTestSuite` and `TearDownTestSuite`.
 
 ### TestInfo {#TestInfo}
 
-`::testing::TestInfo`
+`testing::TestInfo`
 
 Stores information about a test.
 
@@ -660,15 +810,16 @@ Returns the test name.
 
 `const char* TestInfo::type_param() const`
 
-Returns the name of the parameter type, or `NULL` if this is not a typed or type-parameterized test.
-See [Typed Tests](../advanced.md#typed-tests) and
+Returns the name of the parameter type, or `NULL` if this is not a typed or
+type-parameterized test. See [Typed Tests](../advanced.md#typed-tests) and
 [Type-Parameterized Tests](../advanced.md#type-parameterized-tests).
 
 ##### value_param {#TestInfo::value_param}
 
 `const char* TestInfo::value_param() const`
 
-Returns the text representation of the value parameter, or `NULL` if this is not a value-parameterized test. See
+Returns the text representation of the value parameter, or `NULL` if this is not
+a value-parameterized test. See
 [Value-Parameterized Tests](../advanced.md#value-parameterized-tests).
 
 ##### file {#TestInfo::file}
@@ -693,10 +844,12 @@ Returns true if this test should not be run because it's in another shard.
 
 `bool TestInfo::should_run() const`
 
-Returns true if this test should run, that is if the test is not disabled (or it is disabled but
-the `also_run_disabled_tests` flag has been specified) and its full name matches the user-specified filter.
+Returns true if this test should run, that is if the test is not disabled (or it
+is disabled but the `also_run_disabled_tests` flag has been specified) and its
+full name matches the user-specified filter.
 
-GoogleTest allows the user to filter the tests by their full names. Only the tests that match the filter will run. See
+GoogleTest allows the user to filter the tests by their full names. Only the
+tests that match the filter will run. See
 [Running a Subset of the Tests](../advanced.md#running-a-subset-of-the-tests)
 for more information.
 
@@ -714,15 +867,17 @@ Returns the result of the test. See [`TestResult`](#TestResult).
 
 ### TestParamInfo {#TestParamInfo}
 
-`::testing::TestParamInfo<T>`
+`testing::TestParamInfo<T>`
 
-Describes a parameter to a value-parameterized test. The type `T` is the type of the parameter.
+Describes a parameter to a value-parameterized test. The type `T` is the type of
+the parameter.
 
-Contains the fields `param` and `index` which hold the value of the parameter and its integer index respectively.
+Contains the fields `param` and `index` which hold the value of the parameter
+and its integer index respectively.
 
 ### UnitTest {#UnitTest}
 
-`::testing::UnitTest`
+`testing::UnitTest`
 
 This class contains information about the test program.
 
@@ -738,7 +893,8 @@ This class contains information about the test program.
 `static UnitTest* UnitTest::GetInstance()`
 
 Gets the singleton `UnitTest` object. The first time this method is called, a
-`UnitTest` object is constructed and returned. Consecutive calls will return the same object.
+`UnitTest` object is constructed and returned. Consecutive calls will return the
+same object.
 
 ##### original_working_dir {#UnitTest::original_working_dir}
 
@@ -751,13 +907,15 @@ Returns the working directory when the first [`TEST()`](#TEST) or
 
 `const TestSuite* UnitTest::current_test_suite() const`
 
-Returns the [`TestSuite`](#TestSuite) object for the test that's currently running, or `NULL` if no test is running.
+Returns the [`TestSuite`](#TestSuite) object for the test that's currently
+running, or `NULL` if no test is running.
 
 ##### current_test_info {#UnitTest::current_test_info}
 
 `const TestInfo* UnitTest::current_test_info() const`
 
-Returns the [`TestInfo`](#TestInfo) object for the test that's currently running, or `NULL` if no test is running.
+Returns the [`TestInfo`](#TestInfo) object for the test that's currently
+running, or `NULL` if no test is running.
 
 ##### random_seed {#UnitTest::random_seed}
 
@@ -787,7 +945,8 @@ Gets the number of all test suites.
 
 `int UnitTest::test_suite_to_run_count() const`
 
-Gets the number of all test suites that contain at least one test that should run.
+Gets the number of all test suites that contain at least one test that should
+run.
 
 ##### successful_test_count {#UnitTest::successful_test_count}
 
@@ -859,36 +1018,37 @@ Returns true if and only if the unit test passed (i.e. all test suites passed).
 
 `bool UnitTest::Failed() const`
 
-Returns true if and only if the unit test failed (i.e. some test suite failed or something outside of all tests failed).
+Returns true if and only if the unit test failed (i.e. some test suite failed or
+something outside of all tests failed).
 
 ##### GetTestSuite {#UnitTest::GetTestSuite}
 
 `const TestSuite* UnitTest::GetTestSuite(int i) const`
 
-Gets the [`TestSuite`](#TestSuite) object for the `i`-th test suite among all the test suites. `i` can range from 0
-to `total_test_suite_count() - 1`. If `i`
+Gets the [`TestSuite`](#TestSuite) object for the `i`-th test suite among all
+the test suites. `i` can range from 0 to `total_test_suite_count() - 1`. If `i`
 is not in that range, returns `NULL`.
 
 ##### ad_hoc_test_result {#UnitTest::ad_hoc_test_result}
 
 `const TestResult& UnitTest::ad_hoc_test_result() const`
 
-Returns the [`TestResult`](#TestResult) containing information on test failures and properties logged outside of
-individual test suites.
+Returns the [`TestResult`](#TestResult) containing information on test failures
+and properties logged outside of individual test suites.
 
 ##### listeners {#UnitTest::listeners}
 
 `TestEventListeners& UnitTest::listeners()`
 
-Returns the list of event listeners that can be used to track events inside GoogleTest.
-See [`TestEventListeners`](#TestEventListeners).
+Returns the list of event listeners that can be used to track events inside
+GoogleTest. See [`TestEventListeners`](#TestEventListeners).
 
 ### TestEventListener {#TestEventListener}
 
-`::testing::TestEventListener`
+`testing::TestEventListener`
 
-The interface for tracing execution of tests. The methods below are listed in the order the corresponding events are
-fired.
+The interface for tracing execution of tests. The methods below are listed in
+the order the corresponding events are fired.
 
 #### Public Methods {#TestEventListener-public}
 
@@ -900,20 +1060,24 @@ Fired before any test activity starts.
 
 ##### OnTestIterationStart {#TestEventListener::OnTestIterationStart}
 
-`virtual void TestEventListener::OnTestIterationStart(const UnitTest& unit_test, int iteration)`
+`virtual void TestEventListener::OnTestIterationStart(const UnitTest& unit_test,
+int iteration)`
 
-Fired before each iteration of tests starts. There may be more than one iteration if `GTEST_FLAG(repeat)` is
-set. `iteration` is the iteration index, starting from 0.
+Fired before each iteration of tests starts. There may be more than one
+iteration if `GTEST_FLAG(repeat)` is set. `iteration` is the iteration index,
+starting from 0.
 
 ##### OnEnvironmentsSetUpStart {#TestEventListener::OnEnvironmentsSetUpStart}
 
-`virtual void TestEventListener::OnEnvironmentsSetUpStart(const UnitTest& unit_test)`
+`virtual void TestEventListener::OnEnvironmentsSetUpStart(const UnitTest&
+unit_test)`
 
 Fired before environment set-up for each iteration of tests starts.
 
 ##### OnEnvironmentsSetUpEnd {#TestEventListener::OnEnvironmentsSetUpEnd}
 
-`virtual void TestEventListener::OnEnvironmentsSetUpEnd(const UnitTest& unit_test)`
+`virtual void TestEventListener::OnEnvironmentsSetUpEnd(const UnitTest&
+unit_test)`
 
 Fired after environment set-up for each iteration of tests ends.
 
@@ -931,10 +1095,11 @@ Fired before the test starts.
 
 ##### OnTestPartResult {#TestEventListener::OnTestPartResult}
 
-`virtual void TestEventListener::OnTestPartResult(const TestPartResult& test_part_result)`
+`virtual void TestEventListener::OnTestPartResult(const TestPartResult&
+test_part_result)`
 
-Fired after a failed assertion or a `SUCCEED()` invocation. If you want to throw an exception from this function to skip
-to the next test, it must be an
+Fired after a failed assertion or a `SUCCEED()` invocation. If you want to throw
+an exception from this function to skip to the next test, it must be an
 [`AssertionException`](#AssertionException) or inherited from it.
 
 ##### OnTestEnd {#TestEventListener::OnTestEnd}
@@ -951,19 +1116,22 @@ Fired after the test suite ends.
 
 ##### OnEnvironmentsTearDownStart {#TestEventListener::OnEnvironmentsTearDownStart}
 
-`virtual void TestEventListener::OnEnvironmentsTearDownStart(const UnitTest& unit_test)`
+`virtual void TestEventListener::OnEnvironmentsTearDownStart(const UnitTest&
+unit_test)`
 
 Fired before environment tear-down for each iteration of tests starts.
 
 ##### OnEnvironmentsTearDownEnd {#TestEventListener::OnEnvironmentsTearDownEnd}
 
-`virtual void TestEventListener::OnEnvironmentsTearDownEnd(const UnitTest& unit_test)`
+`virtual void TestEventListener::OnEnvironmentsTearDownEnd(const UnitTest&
+unit_test)`
 
 Fired after environment tear-down for each iteration of tests ends.
 
 ##### OnTestIterationEnd {#TestEventListener::OnTestIterationEnd}
 
-`virtual void TestEventListener::OnTestIterationEnd(const UnitTest& unit_test, int iteration)`
+`virtual void TestEventListener::OnTestIterationEnd(const UnitTest& unit_test,
+int iteration)`
 
 Fired after each iteration of tests finishes.
 
@@ -975,7 +1143,7 @@ Fired after all test activities have ended.
 
 ### TestEventListeners {#TestEventListeners}
 
-`::testing::TestEventListeners`
+`testing::TestEventListeners`
 
 Lets users add listeners to track events in GoogleTest.
 
@@ -985,41 +1153,45 @@ Lets users add listeners to track events in GoogleTest.
 
 `void TestEventListeners::Append(TestEventListener* listener)`
 
-Appends an event listener to the end of the list. GoogleTest assumes ownership of the listener (i.e. it will delete the
-listener when the test program finishes).
+Appends an event listener to the end of the list. GoogleTest assumes ownership
+of the listener (i.e. it will delete the listener when the test program
+finishes).
 
 ##### Release {#TestEventListeners::Release}
 
 `TestEventListener* TestEventListeners::Release(TestEventListener* listener)`
 
-Removes the given event listener from the list and returns it. It then becomes the caller's responsibility to delete the
-listener. Returns `NULL` if the listener is not found in the list.
+Removes the given event listener from the list and returns it. It then becomes
+the caller's responsibility to delete the listener. Returns `NULL` if the
+listener is not found in the list.
 
 ##### default_result_printer {#TestEventListeners::default_result_printer}
 
 `TestEventListener* TestEventListeners::default_result_printer() const`
 
-Returns the standard listener responsible for the default console output. Can be removed from the listeners list to shut
-down default console output. Note that removing this object from the listener list with
-[`Release()`](#TestEventListeners::Release) transfers its ownership to the caller and makes this function return `NULL`
-the next time.
+Returns the standard listener responsible for the default console output. Can be
+removed from the listeners list to shut down default console output. Note that
+removing this object from the listener list with
+[`Release()`](#TestEventListeners::Release) transfers its ownership to the
+caller and makes this function return `NULL` the next time.
 
 ##### default_xml_generator {#TestEventListeners::default_xml_generator}
 
 `TestEventListener* TestEventListeners::default_xml_generator() const`
 
-Returns the standard listener responsible for the default XML output controlled by the `--gtest_output=xml` flag. Can be
-removed from the listeners list by users who want to shut down the default XML output controlled by this flag and
-substitute it with custom one. Note that removing this object from the listener list
-with [`Release()`](#TestEventListeners::Release) transfers its ownership to the caller and makes this function
-return `NULL` the next time.
+Returns the standard listener responsible for the default XML output controlled
+by the `--gtest_output=xml` flag. Can be removed from the listeners list by
+users who want to shut down the default XML output controlled by this flag and
+substitute it with custom one. Note that removing this object from the listener
+list with [`Release()`](#TestEventListeners::Release) transfers its ownership to
+the caller and makes this function return `NULL` the next time.
 
 ### TestPartResult {#TestPartResult}
 
-`::testing::TestPartResult`
+`testing::TestPartResult`
 
-A copyable object representing the result of a test part (i.e. an assertion or an explicit `FAIL()`, `ADD_FAILURE()`,
-or `SUCCESS()`).
+A copyable object representing the result of a test part (i.e. an assertion or
+an explicit `FAIL()`, `ADD_FAILURE()`, or `SUCCESS()`).
 
 #### Public Methods {#TestPartResult-public}
 
@@ -1044,13 +1216,15 @@ enum Type {
 
 `const char* TestPartResult::file_name() const`
 
-Gets the name of the source file where the test part took place, or `NULL` if it's unknown.
+Gets the name of the source file where the test part took place, or `NULL` if
+it's unknown.
 
 ##### line_number {#TestPartResult::line_number}
 
 `int TestPartResult::line_number() const`
 
-Gets the line in the source file where the test part took place, or `-1` if it's unknown.
+Gets the line in the source file where the test part took place, or `-1` if it's
+unknown.
 
 ##### summary {#TestPartResult::summary}
 
@@ -1096,9 +1270,10 @@ Returns true if and only if the test part failed.
 
 ### TestProperty {#TestProperty}
 
-`::testing::TestProperty`
+`testing::TestProperty`
 
-A copyable object representing a user-specified test property which can be output as a key/value string pair.
+A copyable object representing a user-specified test property which can be
+output as a key/value string pair.
 
 #### Public Methods {#TestProperty-public}
 
@@ -1122,7 +1297,7 @@ Sets a new value, overriding the previous one.
 
 ### TestResult {#TestResult}
 
-`::testing::TestResult`
+`testing::TestResult`
 
 Contains information about the result of a single test.
 
@@ -1134,8 +1309,8 @@ Contains information about the result of a single test.
 
 `int TestResult::total_part_count() const`
 
-Gets the number of all test parts. This is the sum of the number of successful test parts and the number of failed test
-parts.
+Gets the number of all test parts. This is the sum of the number of successful
+test parts and the number of failed test parts.
 
 ##### test_property_count {#TestResult::test_property_count}
 
@@ -1189,8 +1364,8 @@ Gets the time of the test case start, in ms from the start of the UNIX epoch.
 
 `const TestPartResult& TestResult::GetTestPartResult(int i) const`
 
-Returns the [`TestPartResult`](#TestPartResult) for the `i`-th test part result among all the results. `i` can range
-from 0 to `total_part_count() - 1`. If `i`
+Returns the [`TestPartResult`](#TestPartResult) for the `i`-th test part result
+among all the results. `i` can range from 0 to `total_part_count() - 1`. If `i`
 is not in that range, aborts the program.
 
 ##### GetTestProperty {#TestResult::GetTestProperty}
@@ -1198,42 +1373,44 @@ is not in that range, aborts the program.
 `const TestProperty& TestResult::GetTestProperty(int i) const`
 
 Returns the [`TestProperty`](#TestProperty) object for the `i`-th test property.
-`i` can range from 0 to `test_property_count() - 1`. If `i` is not in that range, aborts the program.
+`i` can range from 0 to `test_property_count() - 1`. If `i` is not in that
+range, aborts the program.
 
 ### TimeInMillis {#TimeInMillis}
 
-`::testing::TimeInMillis`
+`testing::TimeInMillis`
 
 An integer type representing time in milliseconds.
 
 ### Types {#Types}
 
-`::testing::Types<T...>`
+`testing::Types<T...>`
 
 Represents a list of types for use in typed tests and type-parameterized tests.
 
 The template argument `T...` can be any number of types, for example:
 
 ```
-::testing::Types<char, int, unsigned int>
+testing::Types<char, int, unsigned int>
 ```
 
 See [Typed Tests](../advanced.md#typed-tests) and
-[Type-Parameterized Tests](../advanced.md#type-parameterized-tests) for more information.
+[Type-Parameterized Tests](../advanced.md#type-parameterized-tests) for more
+information.
 
 ### WithParamInterface {#WithParamInterface}
 
-`::testing::WithParamInterface<T>`
+`testing::WithParamInterface<T>`
 
 The pure interface class that all value-parameterized tests inherit from.
 
 A value-parameterized test fixture class must inherit from both [`Test`](#Test)
 and `WithParamInterface`. In most cases that just means inheriting from
-[`TestWithParam`](#TestWithParam), but more complicated test hierarchies may need to inherit from `Test`
-and `WithParamInterface` at different levels.
+[`TestWithParam`](#TestWithParam), but more complicated test hierarchies may
+need to inherit from `Test` and `WithParamInterface` at different levels.
 
-This interface defines the type alias `ParamType` for the parameter type `T` and has support for accessing the test
-parameter value via the `GetParam()` method:
+This interface defines the type alias `ParamType` for the parameter type `T` and
+has support for accessing the test parameter value via the `GetParam()` method:
 
 ```
 static const ParamType& GetParam()
@@ -1244,31 +1421,38 @@ For more information, see
 
 ## Functions
 
-GoogleTest defines the following functions to help with writing and running tests.
+GoogleTest defines the following functions to help with writing and running
+tests.
 
 ### InitGoogleTest {#InitGoogleTest}
 
-`void ::testing::InitGoogleTest(int* argc, char** argv)` \
-`void ::testing::InitGoogleTest(int* argc, wchar_t** argv)` \
-`void ::testing::InitGoogleTest()`
+`void testing::InitGoogleTest(int* argc, char** argv)` \
+`void testing::InitGoogleTest(int* argc, wchar_t** argv)` \
+`void testing::InitGoogleTest()`
 
 Initializes GoogleTest. This must be called before calling
-[`RUN_ALL_TESTS()`](#RUN_ALL_TESTS). In particular, it parses the command line for the flags that GoogleTest recognizes.
-Whenever a GoogleTest flag is seen, it is removed from `argv`, and `*argc` is decremented.
+[`RUN_ALL_TESTS()`](#RUN_ALL_TESTS). In particular, it parses the command line
+for the flags that GoogleTest recognizes. Whenever a GoogleTest flag is seen, it
+is removed from `argv`, and `*argc` is decremented. Keep in mind that `argv`
+must terminate with a `NULL` pointer (i.e. `argv[argc]` is `NULL`), which is
+already the case with the default `argv` passed to `main`.
 
 No value is returned. Instead, the GoogleTest flag variables are updated.
 
-The `InitGoogleTest(int* argc, wchar_t** argv)` overload can be used in Windows programs compiled in `UNICODE` mode.
+The `InitGoogleTest(int* argc, wchar_t** argv)` overload can be used in Windows
+programs compiled in `UNICODE` mode.
 
-The argument-less `InitGoogleTest()` overload can be used on Arduino/embedded platforms where there is no `argc`/`argv`.
+The argument-less `InitGoogleTest()` overload can be used on Arduino/embedded
+platforms where there is no `argc`/`argv`.
 
 ### AddGlobalTestEnvironment {#AddGlobalTestEnvironment}
 
-`Environment* ::testing::AddGlobalTestEnvironment(Environment* env)`
+`Environment* testing::AddGlobalTestEnvironment(Environment* env)`
 
 Adds a test environment to the test program. Must be called before
 [`RUN_ALL_TESTS()`](#RUN_ALL_TESTS) is called. See
-[Global Set-Up and Tear-Down](../advanced.md#global-set-up-and-tear-down) for more information.
+[Global Set-Up and Tear-Down](../advanced.md#global-set-up-and-tear-down) for
+more information.
 
 See also [`Environment`](#Environment).
 
@@ -1276,22 +1460,25 @@ See also [`Environment`](#Environment).
 
 ```cpp
 template <typename Factory>
-TestInfo* ::testing::RegisterTest(const char* test_suite_name, const char* test_name,
+TestInfo* testing::RegisterTest(const char* test_suite_name, const char* test_name,
                                   const char* type_param, const char* value_param,
                                   const char* file, int line, Factory factory)
 ```
 
 Dynamically registers a test with the framework.
 
-The `factory` argument is a factory callable (move-constructible) object or function pointer that creates a new instance
-of the `Test` object. It handles ownership to the caller. The signature of the callable is `Fixture*()`, where
-`Fixture` is the test fixture class for the test. All tests registered with the same `test_suite_name` must return the
-same fixture type. This is checked at runtime.
+The `factory` argument is a factory callable (move-constructible) object or
+function pointer that creates a new instance of the `Test` object. It handles
+ownership to the caller. The signature of the callable is `Fixture*()`, where
+`Fixture` is the test fixture class for the test. All tests registered with the
+same `test_suite_name` must return the same fixture type. This is checked at
+runtime.
 
 The framework will infer the fixture class from the factory and will call the
 `SetUpTestSuite` and `TearDownTestSuite` methods for it.
 
-Must be called before [`RUN_ALL_TESTS()`](#RUN_ALL_TESTS) is invoked, otherwise behavior is undefined.
+Must be called before [`RUN_ALL_TESTS()`](#RUN_ALL_TESTS) is invoked, otherwise
+behavior is undefined.
 
 See
 [Registering tests programmatically](../advanced.md#registering-tests-programmatically)
@@ -1301,35 +1488,38 @@ for more information.
 
 `int RUN_ALL_TESTS()`
 
-Use this function in `main()` to run all tests. It returns `0` if all tests are successful, or `1` otherwise.
+Use this function in `main()` to run all tests. It returns `0` if all tests are
+successful, or `1` otherwise.
 
 `RUN_ALL_TESTS()` should be invoked after the command line has been parsed by
 [`InitGoogleTest()`](#InitGoogleTest).
 
-This function was formerly a macro; thus, it is in the global namespace and has an all-caps name.
+This function was formerly a macro; thus, it is in the global namespace and has
+an all-caps name.
 
 ### AssertionSuccess {#AssertionSuccess}
 
-`AssertionResult ::testing::AssertionSuccess()`
+`AssertionResult testing::AssertionSuccess()`
 
 Creates a successful assertion result. See
 [`AssertionResult`](#AssertionResult).
 
 ### AssertionFailure {#AssertionFailure}
 
-`AssertionResult ::testing::AssertionFailure()`
+`AssertionResult testing::AssertionFailure()`
 
-Creates a failed assertion result. Use the `<<` operator to store a failure message:
+Creates a failed assertion result. Use the `<<` operator to store a failure
+message:
 
 ```cpp
-::testing::AssertionFailure() << "My failure message";
+testing::AssertionFailure() << "My failure message";
 ```
 
 See [`AssertionResult`](#AssertionResult).
 
 ### StaticAssertTypeEq {#StaticAssertTypeEq}
 
-`::testing::StaticAssertTypeEq<T1, T2>()`
+`testing::StaticAssertTypeEq<T1, T2>()`
 
 Compile-time assertion for type equality. Compiles if and only if `T1` and `T2`
 are the same type. The value it returns is irrelevant.
@@ -1338,7 +1528,7 @@ See [Type Assertions](../advanced.md#type-assertions) for more information.
 
 ### PrintToString {#PrintToString}
 
-`std::string ::testing::PrintToString(x)`
+`std::string testing::PrintToString(x)`
 
 Prints any value `x` using GoogleTest's value printer.
 
@@ -1348,11 +1538,11 @@ for more information.
 
 ### PrintToStringParamName {#PrintToStringParamName}
 
-`std::string ::testing::PrintToStringParamName(TestParamInfo<T>& info)`
+`std::string testing::PrintToStringParamName(TestParamInfo<T>& info)`
 
 A built-in parameterized test name generator which returns the result of
-[`PrintToString`](#PrintToString) called on `info.param`. Does not work when the test parameter is a `std::string` or C
-string. See
+[`PrintToString`](#PrintToString) called on `info.param`. Does not work when the
+test parameter is a `std::string` or C string. See
 [Specifying Names for Value-Parameterized Test Parameters](../advanced.md#specifying-names-for-value-parameterized-test-parameters)
 for more information.
 
diff --git a/external/googletest/docs/samples.md b/external/googletest/docs/samples.md
index 3edf9177..dedc5909 100644
--- a/external/googletest/docs/samples.md
+++ b/external/googletest/docs/samples.md
@@ -1,17 +1,22 @@
 # Googletest Samples
 
 If you're like us, you'd like to look at
-[googletest samples.](https://github.com/google/googletest/tree/master/googletest/samples)
-The sample directory has a number of well-commented samples showing how to use a variety of googletest features.
+[googletest samples.](https://github.com/google/googletest/blob/main/googletest/samples)
+The sample directory has a number of well-commented samples showing how to use a
+variety of googletest features.
 
-* Sample #1 shows the basic steps of using googletest to test C++ functions.
-* Sample #2 shows a more complex unit test for a class with multiple member functions.
-* Sample #3 uses a test fixture.
-* Sample #4 teaches you how to use googletest and `googletest.h` together to get the best of both libraries.
-* Sample #5 puts shared testing logic in a base test fixture, and reuses it in derived fixtures.
-* Sample #6 demonstrates type-parameterized tests.
-* Sample #7 teaches the basics of value-parameterized tests.
-* Sample #8 shows using `Combine()` in value-parameterized tests.
-* Sample #9 shows use of the listener API to modify Google Test's console output and the use of its reflection API to
-  inspect test results.
-* Sample #10 shows use of the listener API to implement a primitive memory leak checker.
+*   Sample #1 shows the basic steps of using googletest to test C++ functions.
+*   Sample #2 shows a more complex unit test for a class with multiple member
+    functions.
+*   Sample #3 uses a test fixture.
+*   Sample #4 teaches you how to use googletest and `googletest.h` together to
+    get the best of both libraries.
+*   Sample #5 puts shared testing logic in a base test fixture, and reuses it in
+    derived fixtures.
+*   Sample #6 demonstrates type-parameterized tests.
+*   Sample #7 teaches the basics of value-parameterized tests.
+*   Sample #8 shows using `Combine()` in value-parameterized tests.
+*   Sample #9 shows use of the listener API to modify Google Test's console
+    output and the use of its reflection API to inspect test results.
+*   Sample #10 shows use of the listener API to implement a primitive memory
+    leak checker.
diff --git a/external/googletest/fake_fuchsia_sdk.bzl b/external/googletest/fake_fuchsia_sdk.bzl
new file mode 100644
index 00000000..bc5b9273
--- /dev/null
+++ b/external/googletest/fake_fuchsia_sdk.bzl
@@ -0,0 +1,61 @@
+"""Provides a fake @fuchsia_sdk implementation that's used when the real one isn't available.
+
+GoogleTest can be used with the [Fuchsia](https://fuchsia.dev/) SDK. However,
+because the Fuchsia SDK does not yet support bzlmod, GoogleTest's `MODULE.bazel`
+file by default provides a "fake" Fuchsia SDK.
+
+To override this and use the real Fuchsia SDK, you can add the following to your
+project's `MODULE.bazel` file:
+
+    fake_fuchsia_sdk_extension =
+    use_extension("@com_google_googletest//:fake_fuchsia_sdk.bzl", "fuchsia_sdk")
+    override_repo(fake_fuchsia_sdk_extension, "fuchsia_sdk")
+
+NOTE: The `override_repo` built-in is only available in Bazel 8.0 and higher.
+
+See https://github.com/google/googletest/issues/4472 for more details of why the
+fake Fuchsia SDK is needed.
+"""
+
+def _fake_fuchsia_sdk_impl(repo_ctx):
+    for stub_target in repo_ctx.attr._stub_build_targets:
+        stub_package = stub_target
+        stub_target_name = stub_target.split("/")[-1]
+        repo_ctx.file("%s/BUILD.bazel" % stub_package, """
+filegroup(
+    name = "%s",
+)
+""" % stub_target_name)
+
+fake_fuchsia_sdk = repository_rule(
+    doc = "Used to create a fake @fuchsia_sdk repository with stub build targets.",
+    implementation = _fake_fuchsia_sdk_impl,
+    attrs = {
+        "_stub_build_targets": attr.string_list(
+            doc = "The stub build targets to initialize.",
+            default = [
+                "pkg/fdio",
+                "pkg/syslog",
+                "pkg/zx",
+            ],
+        ),
+    },
+)
+
+_create_fake = tag_class()
+
+def _fuchsia_sdk_impl(module_ctx):
+    create_fake_sdk = False
+    for mod in module_ctx.modules:
+        for _ in mod.tags.create_fake:
+            create_fake_sdk = True
+
+    if create_fake_sdk:
+        fake_fuchsia_sdk(name = "fuchsia_sdk")
+
+    return module_ctx.extension_metadata(reproducible = True)
+
+fuchsia_sdk = module_extension(
+    implementation = _fuchsia_sdk_impl,
+    tag_classes = {"create_fake": _create_fake},
+)
diff --git a/external/googletest/googlemock/CMakeLists.txt b/external/googletest/googlemock/CMakeLists.txt
index e8878d8d..99b2411f 100644
--- a/external/googletest/googlemock/CMakeLists.txt
+++ b/external/googletest/googlemock/CMakeLists.txt
@@ -5,26 +5,26 @@
 # CMake build script for Google Mock.
 #
 # To run the tests for Google Mock itself on Linux, use 'make test' or
-# ctest.  You can select which tests to run using 'ctest -R regex'.
+# ctest. You can select which tests to run using 'ctest -R regex'.
 # For more options, run 'ctest --help'.
 
 option(gmock_build_tests "Build all of Google Mock's own tests." OFF)
 
 # A directory to find Google Test sources.
 if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/gtest/CMakeLists.txt")
-    set(gtest_dir gtest)
-else ()
-    set(gtest_dir ../googletest)
-endif ()
+  set(gtest_dir gtest)
+else()
+  set(gtest_dir ../googletest)
+endif()
 
 # Defines pre_project_set_up_hermetic_build() and set_up_hermetic_build().
 include("${gtest_dir}/cmake/hermetic_build.cmake" OPTIONAL)
 
 if (COMMAND pre_project_set_up_hermetic_build)
-    # Google Test also calls hermetic setup functions from add_subdirectory,
-    # although its changes will not affect things at the current scope.
-    pre_project_set_up_hermetic_build()
-endif ()
+  # Google Test also calls hermetic setup functions from add_subdirectory,
+  # although its changes will not affect things at the current scope.
+  pre_project_set_up_hermetic_build()
+endif()
 
 ########################################################################
 #
@@ -36,95 +36,83 @@ endif ()
 # as ${gmock_SOURCE_DIR} and to the root binary directory as
 # ${gmock_BINARY_DIR}.
 # Language "C" is required for find_package(Threads).
-if (CMAKE_VERSION VERSION_LESS 3.0)
-    project(gmock CXX C)
-else ()
-    cmake_policy(SET CMP0048 NEW)
-    project(gmock VERSION ${GOOGLETEST_VERSION} LANGUAGES CXX C)
-endif ()
-
-if (POLICY CMP0042)
-    cmake_policy(SET CMP0042 NEW)
-endif (POLICY CMP0042)
-
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.13)
+project(gmock VERSION ${GOOGLETEST_VERSION} LANGUAGES CXX C)
 
 if (COMMAND set_up_hermetic_build)
-    set_up_hermetic_build()
-endif ()
+  set_up_hermetic_build()
+endif()
 
 # Instructs CMake to process Google Test's CMakeLists.txt and add its
-# targets to the current scope.  We are placing Google Test's binary
+# targets to the current scope. We are placing Google Test's binary
 # directory in a subdirectory of our own as VC compilation may break
 # if they are the same (the default).
 add_subdirectory("${gtest_dir}" "${gmock_BINARY_DIR}/${gtest_dir}")
 
 
 # These commands only run if this is the main project
-if (CMAKE_PROJECT_NAME STREQUAL "gmock" OR CMAKE_PROJECT_NAME STREQUAL "googletest-distribution")
-    # BUILD_SHARED_LIBS is a standard CMake variable, but we declare it here to
-    # make it prominent in the GUI.
-    option(BUILD_SHARED_LIBS "Build shared libraries (DLLs)." OFF)
-else ()
-    mark_as_advanced(gmock_build_tests)
-endif ()
+if(CMAKE_PROJECT_NAME STREQUAL "gmock" OR CMAKE_PROJECT_NAME STREQUAL "googletest-distribution")
+  # BUILD_SHARED_LIBS is a standard CMake variable, but we declare it here to
+  # make it prominent in the GUI.
+  option(BUILD_SHARED_LIBS "Build shared libraries (DLLs)." OFF)
+else()
+  mark_as_advanced(gmock_build_tests)
+endif()
 
 # Although Google Test's CMakeLists.txt calls this function, the
-# changes there don't affect the current scope.  Therefore we have to
+# changes there don't affect the current scope. Therefore we have to
 # call it again here.
-config_compiler_and_linker()  # from ${gtest_dir}/cmake/internal_utils.cmake
+config_compiler_and_linker() # from ${gtest_dir}/cmake/internal_utils.cmake
 
 # Adds Google Mock's and Google Test's header directories to the search path.
+# Get Google Test's include dirs from the target, gtest_SOURCE_DIR is broken
+# when using fetch-content with the name "GTest".
+get_target_property(gtest_include_dirs gtest INCLUDE_DIRECTORIES)
 set(gmock_build_include_dirs
-        "${gmock_SOURCE_DIR}/include"
-        "${gmock_SOURCE_DIR}"
-        "${gtest_SOURCE_DIR}/include"
-        # This directory is needed to build directly from Google Test sources.
-        "${gtest_SOURCE_DIR}")
+  "${gmock_SOURCE_DIR}/include"
+  "${gmock_SOURCE_DIR}"
+  "${gtest_include_dirs}")
 include_directories(${gmock_build_include_dirs})
 
 ########################################################################
 #
-# Defines the gmock & gmock_main libraries.  User tests should link
+# Defines the gmock & gmock_main libraries. User tests should link
 # with one of them.
 
-# Google Mock libraries.  We build them using more strict warnings than what
+# Google Mock libraries. We build them using more strict warnings than what
 # are used for other targets, to ensure that Google Mock can be compiled by
 # a user aggressive about warnings.
 if (MSVC)
-    cxx_library(gmock
-            "${cxx_strict}"
-            "${gtest_dir}/src/gtest-all.cc"
-            src/gmock-all.cc)
-
-    cxx_library(gmock_main
-            "${cxx_strict}"
-            "${gtest_dir}/src/gtest-all.cc"
-            src/gmock-all.cc
-            src/gmock_main.cc)
-else ()
-    cxx_library(gmock "${cxx_strict}" src/gmock-all.cc)
-    target_link_libraries(gmock PUBLIC gtest)
-    set_target_properties(gmock PROPERTIES VERSION ${GOOGLETEST_VERSION})
-    cxx_library(gmock_main "${cxx_strict}" src/gmock_main.cc)
-    target_link_libraries(gmock_main PUBLIC gmock)
-    set_target_properties(gmock_main PROPERTIES VERSION ${GOOGLETEST_VERSION})
-endif ()
-# If the CMake version supports it, attach header directory information
-# to the targets for when we are part of a parent build (ie being pulled
-# in via add_subdirectory() rather than being a standalone build).
-if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11")
-    target_include_directories(gmock SYSTEM INTERFACE
-            "$<BUILD_INTERFACE:${gmock_build_include_dirs}>"
-            "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
-    target_include_directories(gmock_main SYSTEM INTERFACE
-            "$<BUILD_INTERFACE:${gmock_build_include_dirs}>"
-            "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
-endif ()
+  cxx_library(gmock
+              "${cxx_strict}"
+              "${gtest_dir}/src/gtest-all.cc"
+              src/gmock-all.cc)
+
+  cxx_library(gmock_main
+              "${cxx_strict}"
+              "${gtest_dir}/src/gtest-all.cc"
+              src/gmock-all.cc
+              src/gmock_main.cc)
+else()
+  cxx_library(gmock "${cxx_strict}" src/gmock-all.cc)
+  target_link_libraries(gmock PUBLIC gtest)
+  set_target_properties(gmock PROPERTIES VERSION ${GOOGLETEST_VERSION})
+  cxx_library(gmock_main "${cxx_strict}" src/gmock_main.cc)
+  target_link_libraries(gmock_main PUBLIC gmock)
+  set_target_properties(gmock_main PROPERTIES VERSION ${GOOGLETEST_VERSION})
+endif()
+
+string(REPLACE ";" "$<SEMICOLON>" dirs "${gmock_build_include_dirs}")
+target_include_directories(gmock SYSTEM INTERFACE
+  "$<BUILD_INTERFACE:${dirs}>"
+  "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
+target_include_directories(gmock_main SYSTEM INTERFACE
+  "$<BUILD_INTERFACE:${dirs}>"
+  "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
 
 ########################################################################
 #
-# Install rules
+# Install rules.
 install_project(gmock gmock_main)
 
 ########################################################################
@@ -134,90 +122,89 @@ install_project(gmock gmock_main)
 # You can skip this section if you aren't interested in testing
 # Google Mock itself.
 #
-# The tests are not built by default.  To build them, set the
-# gmock_build_tests option to ON.  You can do it by running ccmake
+# The tests are not built by default. To build them, set the
+# gmock_build_tests option to ON. You can do it by running ccmake
 # or specifying the -Dgmock_build_tests=ON flag when running cmake.
 
 if (gmock_build_tests)
-    # This must be set in the root directory for the tests to be run by
-    # 'make test' or ctest.
-    enable_testing()
-
-    if (MINGW OR CYGWIN)
-        if (CMAKE_VERSION VERSION_LESS "2.8.12")
-            add_compile_options("-Wa,-mbig-obj")
-        else ()
-            add_definitions("-Wa,-mbig-obj")
-        endif ()
-    endif ()
-
-    ############################################################
-    # C++ tests built with standard compiler flags.
-
-    cxx_test(gmock-actions_test gmock_main)
-    cxx_test(gmock-cardinalities_test gmock_main)
-    cxx_test(gmock_ex_test gmock_main)
-    cxx_test(gmock-function-mocker_test gmock_main)
-    cxx_test(gmock-internal-utils_test gmock_main)
-    cxx_test(gmock-matchers_test gmock_main)
-    cxx_test(gmock-more-actions_test gmock_main)
-    cxx_test(gmock-nice-strict_test gmock_main)
-    cxx_test(gmock-port_test gmock_main)
-    cxx_test(gmock-spec-builders_test gmock_main)
-    cxx_test(gmock_link_test gmock_main test/gmock_link2_test.cc)
-    cxx_test(gmock_test gmock_main)
-
-    if (DEFINED GTEST_HAS_PTHREAD)
-        cxx_test(gmock_stress_test gmock)
-    endif ()
-
-    # gmock_all_test is commented to save time building and running tests.
-    # Uncomment if necessary.
-    # cxx_test(gmock_all_test gmock_main)
-
-    ############################################################
-    # C++ tests built with non-standard compiler flags.
-
-    if (MSVC)
-        cxx_library(gmock_main_no_exception "${cxx_no_exception}"
-                "${gtest_dir}/src/gtest-all.cc" src/gmock-all.cc src/gmock_main.cc)
-
-        cxx_library(gmock_main_no_rtti "${cxx_no_rtti}"
-                "${gtest_dir}/src/gtest-all.cc" src/gmock-all.cc src/gmock_main.cc)
-
-    else ()
-        cxx_library(gmock_main_no_exception "${cxx_no_exception}" src/gmock_main.cc)
-        target_link_libraries(gmock_main_no_exception PUBLIC gmock)
-
-        cxx_library(gmock_main_no_rtti "${cxx_no_rtti}" src/gmock_main.cc)
-        target_link_libraries(gmock_main_no_rtti PUBLIC gmock)
-    endif ()
-    cxx_test_with_flags(gmock-more-actions_no_exception_test "${cxx_no_exception}"
-            gmock_main_no_exception test/gmock-more-actions_test.cc)
-
-    cxx_test_with_flags(gmock_no_rtti_test "${cxx_no_rtti}"
-            gmock_main_no_rtti test/gmock-spec-builders_test.cc)
-
-    cxx_shared_library(shared_gmock_main "${cxx_default}"
-            "${gtest_dir}/src/gtest-all.cc" src/gmock-all.cc src/gmock_main.cc)
-
-    # Tests that a binary can be built with Google Mock as a shared library.  On
-    # some system configurations, it may not possible to run the binary without
-    # knowing more details about the system configurations. We do not try to run
-    # this binary. To get a more robust shared library coverage, configure with
-    # -DBUILD_SHARED_LIBS=ON.
-    cxx_executable_with_flags(shared_gmock_test_ "${cxx_default}"
-            shared_gmock_main test/gmock-spec-builders_test.cc)
-    set_target_properties(shared_gmock_test_
-            PROPERTIES
-            COMPILE_DEFINITIONS "GTEST_LINKED_AS_SHARED_LIBRARY=1")
-
-    ############################################################
-    # Python tests.
-
-    cxx_executable(gmock_leak_test_ test gmock_main)
-    py_test(gmock_leak_test)
-
-    cxx_executable(gmock_output_test_ test gmock)
-    py_test(gmock_output_test)
-endif ()
+  # This must be set in the root directory for the tests to be run by
+  # 'make test' or ctest.
+  enable_testing()
+
+  if (MINGW OR CYGWIN)
+    add_compile_options("-Wa,-mbig-obj")
+  endif()
+
+  ############################################################
+  # C++ tests built with standard compiler flags.
+
+  cxx_test(gmock-actions_test gmock_main)
+  cxx_test(gmock-cardinalities_test gmock_main)
+  cxx_test(gmock_ex_test gmock_main)
+  cxx_test(gmock-function-mocker_test gmock_main)
+  cxx_test(gmock-internal-utils_test gmock_main)
+  cxx_test(gmock-matchers-arithmetic_test gmock_main)
+  cxx_test(gmock-matchers-comparisons_test gmock_main)
+  cxx_test(gmock-matchers-containers_test gmock_main)
+  cxx_test(gmock-matchers-misc_test gmock_main)
+  cxx_test(gmock-more-actions_test gmock_main)
+  cxx_test(gmock-nice-strict_test gmock_main)
+  cxx_test(gmock-port_test gmock_main)
+  cxx_test(gmock-spec-builders_test gmock_main)
+  cxx_test(gmock_link_test gmock_main test/gmock_link2_test.cc)
+  cxx_test(gmock_test gmock_main)
+
+  if (DEFINED GTEST_HAS_PTHREAD)
+    cxx_test(gmock_stress_test gmock)
+  endif()
+
+  # gmock_all_test is commented to save time building and running tests.
+  # Uncomment if necessary.
+  # cxx_test(gmock_all_test gmock_main)
+
+  ############################################################
+  # C++ tests built with non-standard compiler flags.
+
+  if (MSVC)
+    cxx_library(gmock_main_no_exception "${cxx_no_exception}"
+      "${gtest_dir}/src/gtest-all.cc" src/gmock-all.cc src/gmock_main.cc)
+
+    cxx_library(gmock_main_no_rtti "${cxx_no_rtti}"
+      "${gtest_dir}/src/gtest-all.cc" src/gmock-all.cc src/gmock_main.cc)
+
+  else()
+    cxx_library(gmock_main_no_exception "${cxx_no_exception}" src/gmock_main.cc)
+    target_link_libraries(gmock_main_no_exception PUBLIC gmock)
+
+    cxx_library(gmock_main_no_rtti "${cxx_no_rtti}" src/gmock_main.cc)
+    target_link_libraries(gmock_main_no_rtti PUBLIC gmock)
+  endif()
+  cxx_test_with_flags(gmock-more-actions_no_exception_test "${cxx_no_exception}"
+    gmock_main_no_exception test/gmock-more-actions_test.cc)
+
+  cxx_test_with_flags(gmock_no_rtti_test "${cxx_no_rtti}"
+    gmock_main_no_rtti test/gmock-spec-builders_test.cc)
+
+  cxx_shared_library(shared_gmock_main "${cxx_default}"
+    "${gtest_dir}/src/gtest-all.cc" src/gmock-all.cc src/gmock_main.cc)
+
+  # Tests that a binary can be built with Google Mock as a shared library. On
+  # some system configurations, it may not possible to run the binary without
+  # knowing more details about the system configurations. We do not try to run
+  # this binary. To get a more robust shared library coverage, configure with
+  # -DBUILD_SHARED_LIBS=ON.
+  cxx_executable_with_flags(shared_gmock_test_ "${cxx_default}"
+    shared_gmock_main test/gmock-spec-builders_test.cc)
+  set_target_properties(shared_gmock_test_
+    PROPERTIES
+    COMPILE_DEFINITIONS "GTEST_LINKED_AS_SHARED_LIBRARY=1")
+
+  ############################################################
+  # Python tests.
+
+  cxx_executable(gmock_leak_test_ test gmock_main)
+  py_test(gmock_leak_test)
+
+  cxx_executable(gmock_output_test_ test gmock)
+  py_test(gmock_output_test)
+endif()
diff --git a/external/googletest/googlemock/README.md b/external/googletest/googlemock/README.md
index 1397fd00..e1103b16 100644
--- a/external/googletest/googlemock/README.md
+++ b/external/googletest/googlemock/README.md
@@ -2,40 +2,39 @@
 
 ### Overview
 
-Google's framework for writing and using C++ mock classes. It can help you derive better designs of your system and
-write better tests.
+Google's framework for writing and using C++ mock classes. It can help you
+derive better designs of your system and write better tests.
 
 It is inspired by:
 
-* [jMock](http://www.jmock.org/)
-* [EasyMock](http://www.easymock.org/)
-* [Hamcrest](http://code.google.com/p/hamcrest/)
+*   [jMock](http://www.jmock.org/)
+*   [EasyMock](https://easymock.org/)
+*   [Hamcrest](https://code.google.com/p/hamcrest/)
 
 It is designed with C++'s specifics in mind.
 
 gMock:
 
-- Provides a declarative syntax for defining mocks.
-- Can define partial (hybrid) mocks, which are a cross of real and mock objects.
-- Handles functions of arbitrary types and overloaded functions.
-- Comes with a rich set of matchers for validating function arguments.
-- Uses an intuitive syntax for controlling the behavior of a mock.
-- Does automatic verification of expectations (no record-and-replay needed).
-- Allows arbitrary (partial) ordering constraints on function calls to be expressed.
-- Lets a user extend it by defining new matchers and actions.
-- Does not use exceptions.
-- Is easy to learn and use.
+-   Provides a declarative syntax for defining mocks.
+-   Can define partial (hybrid) mocks, which are a cross of real and mock
+    objects.
+-   Handles functions of arbitrary types and overloaded functions.
+-   Comes with a rich set of matchers for validating function arguments.
+-   Uses an intuitive syntax for controlling the behavior of a mock.
+-   Does automatic verification of expectations (no record-and-replay needed).
+-   Allows arbitrary (partial) ordering constraints on function calls to be
+    expressed.
+-   Lets a user extend it by defining new matchers and actions.
+-   Does not use exceptions.
+-   Is easy to learn and use.
 
 Details and examples can be found here:
 
-* [gMock for Dummies](https://google.github.io/googletest/gmock_for_dummies.html)
-* [Legacy gMock FAQ](https://google.github.io/googletest/gmock_faq.html)
-* [gMock Cookbook](https://google.github.io/googletest/gmock_cook_book.html)
-* [gMock Cheat Sheet](https://google.github.io/googletest/gmock_cheat_sheet.html)
-
-Please note that code under scripts/generator/ is from the
-[cppclean project](http://code.google.com/p/cppclean/) and under the Apache License, which is different from
-GoogleMock's license.
+*   [gMock for Dummies](https://google.github.io/googletest/gmock_for_dummies.html)
+*   [Legacy gMock FAQ](https://google.github.io/googletest/gmock_faq.html)
+*   [gMock Cookbook](https://google.github.io/googletest/gmock_cook_book.html)
+*   [gMock Cheat Sheet](https://google.github.io/googletest/gmock_cheat_sheet.html)
 
 GoogleMock is a part of
-[GoogleTest C++ testing framework](http://github.com/google/googletest/) and a subject to the same requirements.
+[GoogleTest C++ testing framework](https://github.com/google/googletest/) and a
+subject to the same requirements.
diff --git a/external/googletest/googlemock/docs/README.md b/external/googletest/googlemock/docs/README.md
index e55dfa5e..1bc57b79 100644
--- a/external/googletest/googlemock/docs/README.md
+++ b/external/googletest/googlemock/docs/README.md
@@ -1,4 +1,4 @@
 # Content Moved
 
-We are working on updates to the GoogleTest documentation, which has moved to the top-level [docs](../../docs)
-directory.
+We are working on updates to the GoogleTest documentation, which has moved to
+the top-level [docs](../../docs) directory.
diff --git a/external/googletest/googlemock/include/gmock/gmock-actions.h b/external/googletest/googlemock/include/gmock/gmock-actions.h
index c1cc8583..5fe50e3d 100644
--- a/external/googletest/googlemock/include/gmock/gmock-actions.h
+++ b/external/googletest/googlemock/include/gmock/gmock-actions.h
@@ -122,9 +122,10 @@
 // MORE INFORMATION:
 //
 // To learn more about using these macros, please search for 'ACTION' on
-// https://github.com/google/googletest/blob/master/docs/gmock_cook_book.md
+// https://github.com/google/googletest/blob/main/docs/gmock_cook_book.md
 
-// GOOGLETEST_CM0002 DO NOT DELETE
+// IWYU pragma: private, include "gmock/gmock.h"
+// IWYU pragma: friend gmock/.*
 
 #ifndef GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_ACTIONS_H_
 #define GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_ACTIONS_H_
@@ -134,6 +135,7 @@
 #endif
 
 #include <algorithm>
+#include <exception>
 #include <functional>
 #include <memory>
 #include <string>
@@ -145,10 +147,7 @@
 #include "gmock/internal/gmock-port.h"
 #include "gmock/internal/gmock-pp.h"
 
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4100)
-#endif
+GTEST_DISABLE_MSC_WARNINGS_PUSH_(4100)
 
 namespace testing {
 
@@ -177,9 +176,15 @@ struct BuiltInDefaultValueGetter<T, false> {
   static T Get() {
     Assert(false, __FILE__, __LINE__,
            "Default action undefined for the function return type.");
-    return internal::Invalid<T>();
+#if defined(__GNUC__) || defined(__clang__)
+    __builtin_unreachable();
+#elif defined(_MSC_VER)
+    __assume(0);
+#else
+    return Invalid<T>();
     // The above statement will never be reached, but is required in
     // order for this function to compile.
+#endif
   }
 };
 
@@ -261,12 +266,300 @@ GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(double, 0);
 
 #undef GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_
 
-// Simple two-arg form of std::disjunction.
-template <typename P, typename Q>
-using disjunction = typename ::std::conditional<P::value, P, Q>::type;
+// Partial implementations of metaprogramming types from the standard library
+// not available in C++11.
+
+template <typename P>
+struct negation
+    // NOLINTNEXTLINE
+    : std::integral_constant<bool, bool(!P::value)> {};
+
+// Base case: with zero predicates the answer is always true.
+template <typename...>
+struct conjunction : std::true_type {};
+
+// With a single predicate, the answer is that predicate.
+template <typename P1>
+struct conjunction<P1> : P1 {};
+
+// With multiple predicates the answer is the first predicate if that is false,
+// and we recurse otherwise.
+template <typename P1, typename... Ps>
+struct conjunction<P1, Ps...>
+    : std::conditional<bool(P1::value), conjunction<Ps...>, P1>::type {};
+
+template <typename...>
+struct disjunction : std::false_type {};
+
+template <typename P1>
+struct disjunction<P1> : P1 {};
+
+template <typename P1, typename... Ps>
+struct disjunction<P1, Ps...>
+    // NOLINTNEXTLINE
+    : std::conditional<!bool(P1::value), disjunction<Ps...>, P1>::type {};
+
+template <typename...>
+using void_t = void;
+
+// Detects whether an expression of type `From` can be implicitly converted to
+// `To` according to [conv]. In C++17, [conv]/3 defines this as follows:
+//
+//     An expression e can be implicitly converted to a type T if and only if
+//     the declaration T t=e; is well-formed, for some invented temporary
+//     variable t ([dcl.init]).
+//
+// [conv]/2 implies we can use function argument passing to detect whether this
+// initialization is valid.
+//
+// Note that this is distinct from is_convertible, which requires this be valid:
+//
+//     To test() {
+//       return declval<From>();
+//     }
+//
+// In particular, is_convertible doesn't give the correct answer when `To` and
+// `From` are the same non-moveable type since `declval<From>` will be an rvalue
+// reference, defeating the guaranteed copy elision that would otherwise make
+// this function work.
+//
+// REQUIRES: `From` is not cv void.
+template <typename From, typename To>
+struct is_implicitly_convertible {
+ private:
+  // A function that accepts a parameter of type T. This can be called with type
+  // U successfully only if U is implicitly convertible to T.
+  template <typename T>
+  static void Accept(T);
+
+  // A function that creates a value of type T.
+  template <typename T>
+  static T Make();
+
+  // An overload be selected when implicit conversion from T to To is possible.
+  template <typename T, typename = decltype(Accept<To>(Make<T>()))>
+  static std::true_type TestImplicitConversion(int);
+
+  // A fallback overload selected in all other cases.
+  template <typename T>
+  static std::false_type TestImplicitConversion(...);
+
+ public:
+  using type = decltype(TestImplicitConversion<From>(0));
+  static constexpr bool value = type::value;
+};
+
+// Like std::invoke_result_t from C++17, but works only for objects with call
+// operators (not e.g. member function pointers, which we don't need specific
+// support for in OnceAction because std::function deals with them).
+template <typename F, typename... Args>
+using call_result_t = decltype(std::declval<F>()(std::declval<Args>()...));
+
+template <typename Void, typename R, typename F, typename... Args>
+struct is_callable_r_impl : std::false_type {};
+
+// Specialize the struct for those template arguments where call_result_t is
+// well-formed. When it's not, the generic template above is chosen, resulting
+// in std::false_type.
+template <typename R, typename F, typename... Args>
+struct is_callable_r_impl<void_t<call_result_t<F, Args...>>, R, F, Args...>
+    : std::conditional<
+          std::is_void<R>::value,  //
+          std::true_type,          //
+          is_implicitly_convertible<call_result_t<F, Args...>, R>>::type {};
+
+// Like std::is_invocable_r from C++17, but works only for objects with call
+// operators. See the note on call_result_t.
+template <typename R, typename F, typename... Args>
+using is_callable_r = is_callable_r_impl<void, R, F, Args...>;
+
+// Like std::as_const from C++17.
+template <typename T>
+typename std::add_const<T>::type& as_const(T& t) {
+  return t;
+}
 
 }  // namespace internal
 
+// Specialized for function types below.
+template <typename F>
+class OnceAction;
+
+// An action that can only be used once.
+//
+// This is accepted by WillOnce, which doesn't require the underlying action to
+// be copy-constructible (only move-constructible), and promises to invoke it as
+// an rvalue reference. This allows the action to work with move-only types like
+// std::move_only_function in a type-safe manner.
+//
+// For example:
+//
+//     // Assume we have some API that needs to accept a unique pointer to some
+//     // non-copyable object Foo.
+//     void AcceptUniquePointer(std::unique_ptr<Foo> foo);
+//
+//     // We can define an action that provides a Foo to that API. Because It
+//     // has to give away its unique pointer, it must not be called more than
+//     // once, so its call operator is &&-qualified.
+//     struct ProvideFoo {
+//       std::unique_ptr<Foo> foo;
+//
+//       void operator()() && {
+//         AcceptUniquePointer(std::move(Foo));
+//       }
+//     };
+//
+//     // This action can be used with WillOnce.
+//     EXPECT_CALL(mock, Call)
+//         .WillOnce(ProvideFoo{std::make_unique<Foo>(...)});
+//
+//     // But a call to WillRepeatedly will fail to compile. This is correct,
+//     // since the action cannot correctly be used repeatedly.
+//     EXPECT_CALL(mock, Call)
+//         .WillRepeatedly(ProvideFoo{std::make_unique<Foo>(...)});
+//
+// A less-contrived example would be an action that returns an arbitrary type,
+// whose &&-qualified call operator is capable of dealing with move-only types.
+template <typename Result, typename... Args>
+class OnceAction<Result(Args...)> final {
+ private:
+  // True iff we can use the given callable type (or lvalue reference) directly
+  // via StdFunctionAdaptor.
+  template <typename Callable>
+  using IsDirectlyCompatible = internal::conjunction<
+      // It must be possible to capture the callable in StdFunctionAdaptor.
+      std::is_constructible<typename std::decay<Callable>::type, Callable>,
+      // The callable must be compatible with our signature.
+      internal::is_callable_r<Result, typename std::decay<Callable>::type,
+                              Args...>>;
+
+  // True iff we can use the given callable type via StdFunctionAdaptor once we
+  // ignore incoming arguments.
+  template <typename Callable>
+  using IsCompatibleAfterIgnoringArguments = internal::conjunction<
+      // It must be possible to capture the callable in a lambda.
+      std::is_constructible<typename std::decay<Callable>::type, Callable>,
+      // The callable must be invocable with zero arguments, returning something
+      // convertible to Result.
+      internal::is_callable_r<Result, typename std::decay<Callable>::type>>;
+
+ public:
+  // Construct from a callable that is directly compatible with our mocked
+  // signature: it accepts our function type's arguments and returns something
+  // convertible to our result type.
+  template <typename Callable,
+            typename std::enable_if<
+                internal::conjunction<
+                    // Teach clang on macOS that we're not talking about a
+                    // copy/move constructor here. Otherwise it gets confused
+                    // when checking the is_constructible requirement of our
+                    // traits above.
+                    internal::negation<std::is_same<
+                        OnceAction, typename std::decay<Callable>::type>>,
+                    IsDirectlyCompatible<Callable>>  //
+                ::value,
+                int>::type = 0>
+  OnceAction(Callable&& callable)  // NOLINT
+      : function_(StdFunctionAdaptor<typename std::decay<Callable>::type>(
+            {}, std::forward<Callable>(callable))) {}
+
+  // As above, but for a callable that ignores the mocked function's arguments.
+  template <typename Callable,
+            typename std::enable_if<
+                internal::conjunction<
+                    // Teach clang on macOS that we're not talking about a
+                    // copy/move constructor here. Otherwise it gets confused
+                    // when checking the is_constructible requirement of our
+                    // traits above.
+                    internal::negation<std::is_same<
+                        OnceAction, typename std::decay<Callable>::type>>,
+                    // Exclude callables for which the overload above works.
+                    // We'd rather provide the arguments if possible.
+                    internal::negation<IsDirectlyCompatible<Callable>>,
+                    IsCompatibleAfterIgnoringArguments<Callable>>::value,
+                int>::type = 0>
+  OnceAction(Callable&& callable)  // NOLINT
+                                   // Call the constructor above with a callable
+                                   // that ignores the input arguments.
+      : OnceAction(IgnoreIncomingArguments<typename std::decay<Callable>::type>{
+            std::forward<Callable>(callable)}) {}
+
+  // We are naturally copyable because we store only an std::function, but
+  // semantically we should not be copyable.
+  OnceAction(const OnceAction&) = delete;
+  OnceAction& operator=(const OnceAction&) = delete;
+  OnceAction(OnceAction&&) = default;
+
+  // Invoke the underlying action callable with which we were constructed,
+  // handing it the supplied arguments.
+  Result Call(Args... args) && {
+    return function_(std::forward<Args>(args)...);
+  }
+
+ private:
+  // An adaptor that wraps a callable that is compatible with our signature and
+  // being invoked as an rvalue reference so that it can be used as an
+  // StdFunctionAdaptor. This throws away type safety, but that's fine because
+  // this is only used by WillOnce, which we know calls at most once.
+  //
+  // Once we have something like std::move_only_function from C++23, we can do
+  // away with this.
+  template <typename Callable>
+  class StdFunctionAdaptor final {
+   public:
+    // A tag indicating that the (otherwise universal) constructor is accepting
+    // the callable itself, instead of e.g. stealing calls for the move
+    // constructor.
+    struct CallableTag final {};
+
+    template <typename F>
+    explicit StdFunctionAdaptor(CallableTag, F&& callable)
+        : callable_(std::make_shared<Callable>(std::forward<F>(callable))) {}
+
+    // Rather than explicitly returning Result, we return whatever the wrapped
+    // callable returns. This allows for compatibility with existing uses like
+    // the following, when the mocked function returns void:
+    //
+    //     EXPECT_CALL(mock_fn_, Call)
+    //         .WillOnce([&] {
+    //            [...]
+    //            return 0;
+    //         });
+    //
+    // Such a callable can be turned into std::function<void()>. If we use an
+    // explicit return type of Result here then it *doesn't* work with
+    // std::function, because we'll get a "void function should not return a
+    // value" error.
+    //
+    // We need not worry about incompatible result types because the SFINAE on
+    // OnceAction already checks this for us. std::is_invocable_r_v itself makes
+    // the same allowance for void result types.
+    template <typename... ArgRefs>
+    internal::call_result_t<Callable, ArgRefs...> operator()(
+        ArgRefs&&... args) const {
+      return std::move(*callable_)(std::forward<ArgRefs>(args)...);
+    }
+
+   private:
+    // We must put the callable on the heap so that we are copyable, which
+    // std::function needs.
+    std::shared_ptr<Callable> callable_;
+  };
+
+  // An adaptor that makes a callable that accepts zero arguments callable with
+  // our mocked arguments.
+  template <typename Callable>
+  struct IgnoreIncomingArguments {
+    internal::call_result_t<Callable> operator()(Args&&...) {
+      return std::move(callable)();
+    }
+
+    Callable callable;
+  };
+
+  std::function<Result(Args...)> function_;
+};
+
 // When an unexpected function call is encountered, Google Mock will
 // let it return a default value if the user has specified one for its
 // return type, or if the return type has a built-in default value;
@@ -325,7 +618,7 @@ class DefaultValue {
  private:
   class ValueProducer {
    public:
-    virtual ~ValueProducer() {}
+    virtual ~ValueProducer() = default;
     virtual T Produce() = 0;
   };
 
@@ -336,7 +629,8 @@ class DefaultValue {
 
    private:
     const T value_;
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(FixedValueProducer);
+    FixedValueProducer(const FixedValueProducer&) = delete;
+    FixedValueProducer& operator=(const FixedValueProducer&) = delete;
   };
 
   class FactoryValueProducer : public ValueProducer {
@@ -347,7 +641,8 @@ class DefaultValue {
 
    private:
     const FactoryFunction factory_;
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(FactoryValueProducer);
+    FactoryValueProducer(const FactoryValueProducer&) = delete;
+    FactoryValueProducer& operator=(const FactoryValueProducer&) = delete;
   };
 
   static ValueProducer* producer_;
@@ -411,8 +706,8 @@ class ActionInterface {
   typedef typename internal::Function<F>::Result Result;
   typedef typename internal::Function<F>::ArgumentTuple ArgumentTuple;
 
-  ActionInterface() {}
-  virtual ~ActionInterface() {}
+  ActionInterface() = default;
+  virtual ~ActionInterface() = default;
 
   // Performs the action.  This method is not const, as in general an
   // action can have side effects and be stateful.  For example, a
@@ -421,28 +716,34 @@ class ActionInterface {
   virtual Result Perform(const ArgumentTuple& args) = 0;
 
  private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ActionInterface);
+  ActionInterface(const ActionInterface&) = delete;
+  ActionInterface& operator=(const ActionInterface&) = delete;
 };
 
-// An Action<F> is a copyable and IMMUTABLE (except by assignment)
-// object that represents an action to be taken when a mock function
-// of type F is called.  The implementation of Action<T> is just a
-// std::shared_ptr to const ActionInterface<T>. Don't inherit from Action!
-// You can view an object implementing ActionInterface<F> as a
-// concrete action (including its current state), and an Action<F>
-// object as a handle to it.
 template <typename F>
-class Action {
+class Action;
+
+// An Action<R(Args...)> is a copyable and IMMUTABLE (except by assignment)
+// object that represents an action to be taken when a mock function of type
+// R(Args...) is called. The implementation of Action<T> is just a
+// std::shared_ptr to const ActionInterface<T>. Don't inherit from Action! You
+// can view an object implementing ActionInterface<F> as a concrete action
+// (including its current state), and an Action<F> object as a handle to it.
+template <typename R, typename... Args>
+class Action<R(Args...)> {
+ private:
+  using F = R(Args...);
+
   // Adapter class to allow constructing Action from a legacy ActionInterface.
   // New code should create Actions from functors instead.
   struct ActionAdapter {
     // Adapter must be copyable to satisfy std::function requirements.
     ::std::shared_ptr<ActionInterface<F>> impl_;
 
-    template <typename... Args>
-    typename internal::Function<F>::Result operator()(Args&&... args) {
+    template <typename... InArgs>
+    typename internal::Function<F>::Result operator()(InArgs&&... args) {
       return impl_->Perform(
-          ::std::forward_as_tuple(::std::forward<Args>(args)...));
+          ::std::forward_as_tuple(::std::forward<InArgs>(args)...));
     }
   };
 
@@ -455,7 +756,7 @@ class Action {
 
   // Constructs a null Action.  Needed for storing Action objects in
   // STL containers.
-  Action() {}
+  Action() = default;
 
   // Construct an Action from a specified callable.
   // This cannot take std::function directly, because then Action would not be
@@ -477,7 +778,8 @@ class Action {
   // Action<F>, as long as F's arguments can be implicitly converted
   // to Func's and Func's return type can be implicitly converted to F's.
   template <typename Func>
-  explicit Action(const Action<Func>& action) : fun_(action.fun_) {}
+  Action(const Action<Func>& action)  // NOLINT
+      : fun_(action.fun_) {}
 
   // Returns true if and only if this is the DoDefault() action.
   bool IsDoDefault() const { return fun_ == nullptr; }
@@ -495,6 +797,24 @@ class Action {
     return internal::Apply(fun_, ::std::move(args));
   }
 
+  // An action can be used as a OnceAction, since it's obviously safe to call it
+  // once.
+  operator OnceAction<F>() const {  // NOLINT
+    // Return a OnceAction-compatible callable that calls Perform with the
+    // arguments it is provided. We could instead just return fun_, but then
+    // we'd need to handle the IsDoDefault() case separately.
+    struct OA {
+      Action<F> action;
+
+      R operator()(Args... args) && {
+        return action.Perform(
+            std::forward_as_tuple(std::forward<Args>(args)...));
+      }
+    };
+
+    return OA{*this};
+  }
+
  private:
   template <typename G>
   friend class Action;
@@ -511,8 +831,12 @@ class Action {
 
   template <typename FunctionImpl>
   struct IgnoreArgs {
-    template <typename... Args>
-    Result operator()(const Args&...) const {
+    template <typename... InArgs>
+    Result operator()(const InArgs&...) const {
+      return function_impl();
+    }
+    template <typename... InArgs>
+    Result operator()(const InArgs&...) {
       return function_impl();
     }
 
@@ -603,118 +927,198 @@ struct ByMoveWrapper {
   T payload;
 };
 
-// Implements the polymorphic Return(x) action, which can be used in
-// any function that returns the type of x, regardless of the argument
-// types.
-//
-// Note: The value passed into Return must be converted into
-// Function<F>::Result when this action is cast to Action<F> rather than
-// when that action is performed. This is important in scenarios like
-//
-// MOCK_METHOD1(Method, T(U));
-// ...
-// {
-//   Foo foo;
-//   X x(&foo);
-//   EXPECT_CALL(mock, Method(_)).WillOnce(Return(x));
-// }
-//
-// In the example above the variable x holds reference to foo which leaves
-// scope and gets destroyed.  If copying X just copies a reference to foo,
-// that copy will be left with a hanging reference.  If conversion to T
-// makes a copy of foo, the above code is safe. To support that scenario, we
-// need to make sure that the type conversion happens inside the EXPECT_CALL
-// statement, and conversion of the result of Return to Action<T(U)> is a
-// good place for that.
-//
-// The real life example of the above scenario happens when an invocation
-// of gtl::Container() is passed into Return.
-//
+// The general implementation of Return(R). Specializations follow below.
 template <typename R>
-class ReturnAction {
+class ReturnAction final {
  public:
-  // Constructs a ReturnAction object from the value to be returned.
-  // 'value' is passed by value instead of by const reference in order
-  // to allow Return("string literal") to compile.
-  explicit ReturnAction(R value) : value_(new R(std::move(value))) {}
+  explicit ReturnAction(R value) : value_(std::move(value)) {}
+
+  template <typename U, typename... Args,
+            typename = typename std::enable_if<conjunction<
+                // See the requirements documented on Return.
+                negation<std::is_same<void, U>>,  //
+                negation<std::is_reference<U>>,   //
+                std::is_convertible<R, U>,        //
+                std::is_move_constructible<U>>::value>::type>
+  operator OnceAction<U(Args...)>() && {  // NOLINT
+    return Impl<U>(std::move(value_));
+  }
 
-  // This template type conversion operator allows Return(x) to be
-  // used in ANY function that returns x's type.
-  template <typename F>
-  operator Action<F>() const {  // NOLINT
-    // Assert statement belongs here because this is the best place to verify
-    // conditions on F. It produces the clearest error messages
-    // in most compilers.
-    // Impl really belongs in this scope as a local class but can't
-    // because MSVC produces duplicate symbols in different translation units
-    // in this case. Until MS fixes that bug we put Impl into the class scope
-    // and put the typedef both here (for use in assert statement) and
-    // in the Impl class. But both definitions must be the same.
-    typedef typename Function<F>::Result Result;
-    GTEST_COMPILE_ASSERT_(
-        !std::is_reference<Result>::value,
-        use_ReturnRef_instead_of_Return_to_return_a_reference);
-    static_assert(!std::is_void<Result>::value,
-                  "Can't use Return() on an action expected to return `void`.");
-    return Action<F>(new Impl<R, F>(value_));
+  template <typename U, typename... Args,
+            typename = typename std::enable_if<conjunction<
+                // See the requirements documented on Return.
+                negation<std::is_same<void, U>>,   //
+                negation<std::is_reference<U>>,    //
+                std::is_convertible<const R&, U>,  //
+                std::is_copy_constructible<U>>::value>::type>
+  operator Action<U(Args...)>() const {  // NOLINT
+    return Impl<U>(value_);
   }
 
  private:
-  // Implements the Return(x) action for a particular function type F.
-  template <typename R_, typename F>
-  class Impl : public ActionInterface<F> {
+  // Implements the Return(x) action for a mock function that returns type U.
+  template <typename U>
+  class Impl final {
    public:
-    typedef typename Function<F>::Result Result;
-    typedef typename Function<F>::ArgumentTuple ArgumentTuple;
+    // The constructor used when the return value is allowed to move from the
+    // input value (i.e. we are converting to OnceAction).
+    explicit Impl(R&& input_value)
+        : state_(new State(std::move(input_value))) {}
 
-    // The implicit cast is necessary when Result has more than one
-    // single-argument constructor (e.g. Result is std::vector<int>) and R
-    // has a type conversion operator template.  In that case, value_(value)
-    // won't compile as the compiler doesn't known which constructor of
-    // Result to call.  ImplicitCast_ forces the compiler to convert R to
-    // Result without considering explicit constructors, thus resolving the
-    // ambiguity. value_ is then initialized using its copy constructor.
-    explicit Impl(const std::shared_ptr<R>& value)
-        : value_before_cast_(*value),
-          value_(ImplicitCast_<Result>(value_before_cast_)) {}
+    // The constructor used when the return value is not allowed to move from
+    // the input value (i.e. we are converting to Action).
+    explicit Impl(const R& input_value) : state_(new State(input_value)) {}
 
-    Result Perform(const ArgumentTuple&) override { return value_; }
+    U operator()() && { return std::move(state_->value); }
+    U operator()() const& { return state_->value; }
 
    private:
-    GTEST_COMPILE_ASSERT_(!std::is_reference<Result>::value,
-                          Result_cannot_be_a_reference_type);
-    // We save the value before casting just in case it is being cast to a
-    // wrapper type.
-    R value_before_cast_;
-    Result value_;
-
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(Impl);
+    // We put our state on the heap so that the compiler-generated copy/move
+    // constructors work correctly even when U is a reference-like type. This is
+    // necessary only because we eagerly create State::value (see the note on
+    // that symbol for details). If we instead had only the input value as a
+    // member then the default constructors would work fine.
+    //
+    // For example, when R is std::string and U is std::string_view, value is a
+    // reference to the string backed by input_value. The copy constructor would
+    // copy both, so that we wind up with a new input_value object (with the
+    // same contents) and a reference to the *old* input_value object rather
+    // than the new one.
+    struct State {
+      explicit State(const R& input_value_in)
+          : input_value(input_value_in),
+            // Make an implicit conversion to Result before initializing the U
+            // object we store, avoiding calling any explicit constructor of U
+            // from R.
+            //
+            // This simulates the language rules: a function with return type U
+            // that does `return R()` requires R to be implicitly convertible to
+            // U, and uses that path for the conversion, even U Result has an
+            // explicit constructor from R.
+            value(ImplicitCast_<U>(internal::as_const(input_value))) {}
+
+      // As above, but for the case where we're moving from the ReturnAction
+      // object because it's being used as a OnceAction.
+      explicit State(R&& input_value_in)
+          : input_value(std::move(input_value_in)),
+            // For the same reason as above we make an implicit conversion to U
+            // before initializing the value.
+            //
+            // Unlike above we provide the input value as an rvalue to the
+            // implicit conversion because this is a OnceAction: it's fine if it
+            // wants to consume the input value.
+            value(ImplicitCast_<U>(std::move(input_value))) {}
+
+      // A copy of the value originally provided by the user. We retain this in
+      // addition to the value of the mock function's result type below in case
+      // the latter is a reference-like type. See the std::string_view example
+      // in the documentation on Return.
+      R input_value;
+
+      // The value we actually return, as the type returned by the mock function
+      // itself.
+      //
+      // We eagerly initialize this here, rather than lazily doing the implicit
+      // conversion automatically each time Perform is called, for historical
+      // reasons: in 2009-11, commit a070cbd91c (Google changelist 13540126)
+      // made the Action<U()> conversion operator eagerly convert the R value to
+      // U, but without keeping the R alive. This broke the use case discussed
+      // in the documentation for Return, making reference-like types such as
+      // std::string_view not safe to use as U where the input type R is a
+      // value-like type such as std::string.
+      //
+      // The example the commit gave was not very clear, nor was the issue
+      // thread (https://github.com/google/googlemock/issues/86), but it seems
+      // the worry was about reference-like input types R that flatten to a
+      // value-like type U when being implicitly converted. An example of this
+      // is std::vector<bool>::reference, which is often a proxy type with an
+      // reference to the underlying vector:
+      //
+      //     // Helper method: have the mock function return bools according
+      //     // to the supplied script.
+      //     void SetActions(MockFunction<bool(size_t)>& mock,
+      //                     const std::vector<bool>& script) {
+      //       for (size_t i = 0; i < script.size(); ++i) {
+      //         EXPECT_CALL(mock, Call(i)).WillOnce(Return(script[i]));
+      //       }
+      //     }
+      //
+      //     TEST(Foo, Bar) {
+      //       // Set actions using a temporary vector, whose operator[]
+      //       // returns proxy objects that references that will be
+      //       // dangling once the call to SetActions finishes and the
+      //       // vector is destroyed.
+      //       MockFunction<bool(size_t)> mock;
+      //       SetActions(mock, {false, true});
+      //
+      //       EXPECT_FALSE(mock.AsStdFunction()(0));
+      //       EXPECT_TRUE(mock.AsStdFunction()(1));
+      //     }
+      //
+      // This eager conversion helps with a simple case like this, but doesn't
+      // fully make these types work in general. For example the following still
+      // uses a dangling reference:
+      //
+      //     TEST(Foo, Baz) {
+      //       MockFunction<std::vector<std::string>()> mock;
+      //
+      //       // Return the same vector twice, and then the empty vector
+      //       // thereafter.
+      //       auto action = Return(std::initializer_list<std::string>{
+      //           "taco", "burrito",
+      //       });
+      //
+      //       EXPECT_CALL(mock, Call)
+      //           .WillOnce(action)
+      //           .WillOnce(action)
+      //           .WillRepeatedly(Return(std::vector<std::string>{}));
+      //
+      //       EXPECT_THAT(mock.AsStdFunction()(),
+      //                   ElementsAre("taco", "burrito"));
+      //       EXPECT_THAT(mock.AsStdFunction()(),
+      //                   ElementsAre("taco", "burrito"));
+      //       EXPECT_THAT(mock.AsStdFunction()(), IsEmpty());
+      //     }
+      //
+      U value;
+    };
+
+    const std::shared_ptr<State> state_;
   };
 
-  // Partially specialize for ByMoveWrapper. This version of ReturnAction will
-  // move its contents instead.
-  template <typename R_, typename F>
-  class Impl<ByMoveWrapper<R_>, F> : public ActionInterface<F> {
-   public:
-    typedef typename Function<F>::Result Result;
-    typedef typename Function<F>::ArgumentTuple ArgumentTuple;
+  R value_;
+};
 
-    explicit Impl(const std::shared_ptr<R>& wrapper)
-        : performed_(false), wrapper_(wrapper) {}
+// A specialization of ReturnAction<R> when R is ByMoveWrapper<T> for some T.
+//
+// This version applies the type system-defeating hack of moving from T even in
+// the const call operator, checking at runtime that it isn't called more than
+// once, since the user has declared their intent to do so by using ByMove.
+template <typename T>
+class ReturnAction<ByMoveWrapper<T>> final {
+ public:
+  explicit ReturnAction(ByMoveWrapper<T> wrapper)
+      : state_(new State(std::move(wrapper.payload))) {}
 
-    Result Perform(const ArgumentTuple&) override {
-      GTEST_CHECK_(!performed_)
-          << "A ByMove() action should only be performed once.";
-      performed_ = true;
-      return std::move(wrapper_->payload);
-    }
+  T operator()() const {
+    GTEST_CHECK_(!state_->called)
+        << "A ByMove() action must be performed at most once.";
 
-   private:
-    bool performed_;
-    const std::shared_ptr<R> wrapper_;
+    state_->called = true;
+    return std::move(state_->value);
+  }
+
+ private:
+  // We store our state on the heap so that we are copyable as required by
+  // Action, despite the fact that we are stateful and T may not be copyable.
+  struct State {
+    explicit State(T&& value_in) : value(std::move(value_in)) {}
+
+    T value;
+    bool called = false;
   };
 
-  const std::shared_ptr<R> value_;
+  const std::shared_ptr<State> state_;
 };
 
 // Implements the ReturnNull() action.
@@ -756,8 +1160,8 @@ class ReturnRefAction {
     // Asserts that the function return type is a reference.  This
     // catches the user error of using ReturnRef(x) when Return(x)
     // should be used, and generates some helpful error message.
-    GTEST_COMPILE_ASSERT_(std::is_reference<Result>::value,
-                          use_Return_instead_of_ReturnRef_to_return_a_value);
+    static_assert(std::is_reference<Result>::value,
+                  "use Return instead of ReturnRef to return a value");
     return Action<F>(new Impl<F>(ref_));
   }
 
@@ -798,9 +1202,8 @@ class ReturnRefOfCopyAction {
     // Asserts that the function return type is a reference.  This
     // catches the user error of using ReturnRefOfCopy(x) when Return(x)
     // should be used, and generates some helpful error message.
-    GTEST_COMPILE_ASSERT_(
-        std::is_reference<Result>::value,
-        use_Return_instead_of_ReturnRefOfCopy_to_return_a_value);
+    static_assert(std::is_reference<Result>::value,
+                  "use Return instead of ReturnRefOfCopy to return a value");
     return Action<F>(new Impl<F>(value_));
   }
 
@@ -881,7 +1284,7 @@ class AssignAction {
   const T2 value_;
 };
 
-#if !GTEST_OS_WINDOWS_MOBILE
+#ifndef GTEST_OS_WINDOWS_MOBILE
 
 // Implements the SetErrnoAndReturn action to simulate return from
 // various system calls and libc functions.
@@ -1011,17 +1414,88 @@ class IgnoreResultAction {
 
 template <typename InnerAction, size_t... I>
 struct WithArgsAction {
-  InnerAction action;
+  InnerAction inner_action;
 
-  // The inner action could be anything convertible to Action<X>.
-  // We use the conversion operator to detect the signature of the inner Action.
+  // The signature of the function as seen by the inner action, given an out
+  // action with the given result and argument types.
   template <typename R, typename... Args>
+  using InnerSignature =
+      R(typename std::tuple_element<I, std::tuple<Args...>>::type...);
+
+  // Rather than a call operator, we must define conversion operators to
+  // particular action types. This is necessary for embedded actions like
+  // DoDefault(), which rely on an action conversion operators rather than
+  // providing a call operator because even with a particular set of arguments
+  // they don't have a fixed return type.
+
+  template <
+      typename R, typename... Args,
+      typename std::enable_if<
+          std::is_convertible<InnerAction,
+                              // Unfortunately we can't use the InnerSignature
+                              // alias here; MSVC complains about the I
+                              // parameter pack not being expanded (error C3520)
+                              // despite it being expanded in the type alias.
+                              // TupleElement is also an MSVC workaround.
+                              // See its definition for details.
+                              OnceAction<R(internal::TupleElement<
+                                           I, std::tuple<Args...>>...)>>::value,
+          int>::type = 0>
+  operator OnceAction<R(Args...)>() && {  // NOLINT
+    struct OA {
+      OnceAction<InnerSignature<R, Args...>> inner_action;
+
+      R operator()(Args&&... args) && {
+        return std::move(inner_action)
+            .Call(std::get<I>(
+                std::forward_as_tuple(std::forward<Args>(args)...))...);
+      }
+    };
+
+    return OA{std::move(inner_action)};
+  }
+
+  // As above, but in the case where we want to create a OnceAction from a const
+  // WithArgsAction. This is fine as long as the inner action doesn't need to
+  // move any of its state to create a OnceAction.
+  template <
+      typename R, typename... Args,
+      typename std::enable_if<
+          std::is_convertible<const InnerAction&,
+                              OnceAction<R(internal::TupleElement<
+                                           I, std::tuple<Args...>>...)>>::value,
+          int>::type = 0>
+  operator OnceAction<R(Args...)>() const& {  // NOLINT
+    struct OA {
+      OnceAction<InnerSignature<R, Args...>> inner_action;
+
+      R operator()(Args&&... args) && {
+        return std::move(inner_action)
+            .Call(std::get<I>(
+                std::forward_as_tuple(std::forward<Args>(args)...))...);
+      }
+    };
+
+    return OA{inner_action};
+  }
+
+  template <
+      typename R, typename... Args,
+      typename std::enable_if<
+          std::is_convertible<const InnerAction&,
+                              // Unfortunately we can't use the InnerSignature
+                              // alias here; MSVC complains about the I
+                              // parameter pack not being expanded (error C3520)
+                              // despite it being expanded in the type alias.
+                              // TupleElement is also an MSVC workaround.
+                              // See its definition for details.
+                              Action<R(internal::TupleElement<
+                                       I, std::tuple<Args...>>...)>>::value,
+          int>::type = 0>
   operator Action<R(Args...)>() const {  // NOLINT
-    using TupleType = std::tuple<Args...>;
-    Action<R(typename std::tuple_element<I, TupleType>::type...)> converted(
-        action);
+    Action<InnerSignature<R, Args...>> converted(inner_action);
 
-    return [converted](Args... args) -> R {
+    return [converted](Args&&... args) -> R {
       return converted.Perform(std::forward_as_tuple(
           std::get<I>(std::forward_as_tuple(std::forward<Args>(args)...))...));
     };
@@ -1029,37 +1503,216 @@ struct WithArgsAction {
 };
 
 template <typename... Actions>
-struct DoAllAction {
+class DoAllAction;
+
+// Base case: only a single action.
+template <typename FinalAction>
+class DoAllAction<FinalAction> {
+ public:
+  struct UserConstructorTag {};
+
+  template <typename T>
+  explicit DoAllAction(UserConstructorTag, T&& action)
+      : final_action_(std::forward<T>(action)) {}
+
+  // Rather than a call operator, we must define conversion operators to
+  // particular action types. This is necessary for embedded actions like
+  // DoDefault(), which rely on an action conversion operators rather than
+  // providing a call operator because even with a particular set of arguments
+  // they don't have a fixed return type.
+
+  // We support conversion to OnceAction whenever the sub-action does.
+  template <typename R, typename... Args,
+            typename std::enable_if<
+                std::is_convertible<FinalAction, OnceAction<R(Args...)>>::value,
+                int>::type = 0>
+  operator OnceAction<R(Args...)>() && {  // NOLINT
+    return std::move(final_action_);
+  }
+
+  // We also support conversion to OnceAction whenever the sub-action supports
+  // conversion to Action (since any Action can also be a OnceAction).
+  template <
+      typename R, typename... Args,
+      typename std::enable_if<
+          conjunction<
+              negation<
+                  std::is_convertible<FinalAction, OnceAction<R(Args...)>>>,
+              std::is_convertible<FinalAction, Action<R(Args...)>>>::value,
+          int>::type = 0>
+  operator OnceAction<R(Args...)>() && {  // NOLINT
+    return Action<R(Args...)>(std::move(final_action_));
+  }
+
+  // We support conversion to Action whenever the sub-action does.
+  template <
+      typename R, typename... Args,
+      typename std::enable_if<
+          std::is_convertible<const FinalAction&, Action<R(Args...)>>::value,
+          int>::type = 0>
+  operator Action<R(Args...)>() const {  // NOLINT
+    return final_action_;
+  }
+
+ private:
+  FinalAction final_action_;
+};
+
+// Recursive case: support N actions by calling the initial action and then
+// calling through to the base class containing N-1 actions.
+template <typename InitialAction, typename... OtherActions>
+class DoAllAction<InitialAction, OtherActions...>
+    : private DoAllAction<OtherActions...> {
  private:
+  using Base = DoAllAction<OtherActions...>;
+
+  // The type of reference that should be provided to an initial action for a
+  // mocked function parameter of type T.
+  //
+  // There are two quirks here:
+  //
+  //  *  Unlike most forwarding functions, we pass scalars through by value.
+  //     This isn't strictly necessary because an lvalue reference would work
+  //     fine too and be consistent with other non-reference types, but it's
+  //     perhaps less surprising.
+  //
+  //     For example if the mocked function has signature void(int), then it
+  //     might seem surprising for the user's initial action to need to be
+  //     convertible to Action<void(const int&)>. This is perhaps less
+  //     surprising for a non-scalar type where there may be a performance
+  //     impact, or it might even be impossible, to pass by value.
+  //
+  //  *  More surprisingly, `const T&` is often not a const reference type.
+  //     By the reference collapsing rules in C++17 [dcl.ref]/6, if T refers to
+  //     U& or U&& for some non-scalar type U, then InitialActionArgType<T> is
+  //     U&. In other words, we may hand over a non-const reference.
+  //
+  //     So for example, given some non-scalar type Obj we have the following
+  //     mappings:
+  //
+  //            T               InitialActionArgType<T>
+  //         -------            -----------------------
+  //         Obj                const Obj&
+  //         Obj&               Obj&
+  //         Obj&&              Obj&
+  //         const Obj          const Obj&
+  //         const Obj&         const Obj&
+  //         const Obj&&        const Obj&
+  //
+  //     In other words, the initial actions get a mutable view of an non-scalar
+  //     argument if and only if the mock function itself accepts a non-const
+  //     reference type. They are never given an rvalue reference to an
+  //     non-scalar type.
+  //
+  //     This situation makes sense if you imagine use with a matcher that is
+  //     designed to write through a reference. For example, if the caller wants
+  //     to fill in a reference argument and then return a canned value:
+  //
+  //         EXPECT_CALL(mock, Call)
+  //             .WillOnce(DoAll(SetArgReferee<0>(17), Return(19)));
+  //
   template <typename T>
-  using NonFinalType =
+  using InitialActionArgType =
       typename std::conditional<std::is_scalar<T>::value, T, const T&>::type;
 
-  template <typename ActionT, size_t... I>
-  std::vector<ActionT> Convert(IndexSequence<I...>) const {
-    return {ActionT(std::get<I>(actions))...};
+ public:
+  struct UserConstructorTag {};
+
+  template <typename T, typename... U>
+  explicit DoAllAction(UserConstructorTag, T&& initial_action,
+                       U&&... other_actions)
+      : Base({}, std::forward<U>(other_actions)...),
+        initial_action_(std::forward<T>(initial_action)) {}
+
+  // We support conversion to OnceAction whenever both the initial action and
+  // the rest support conversion to OnceAction.
+  template <
+      typename R, typename... Args,
+      typename std::enable_if<
+          conjunction<std::is_convertible<
+                          InitialAction,
+                          OnceAction<void(InitialActionArgType<Args>...)>>,
+                      std::is_convertible<Base, OnceAction<R(Args...)>>>::value,
+          int>::type = 0>
+  operator OnceAction<R(Args...)>() && {  // NOLINT
+    // Return an action that first calls the initial action with arguments
+    // filtered through InitialActionArgType, then forwards arguments directly
+    // to the base class to deal with the remaining actions.
+    struct OA {
+      OnceAction<void(InitialActionArgType<Args>...)> initial_action;
+      OnceAction<R(Args...)> remaining_actions;
+
+      R operator()(Args... args) && {
+        std::move(initial_action)
+            .Call(static_cast<InitialActionArgType<Args>>(args)...);
+
+        return std::move(remaining_actions).Call(std::forward<Args>(args)...);
+      }
+    };
+
+    return OA{
+        std::move(initial_action_),
+        std::move(static_cast<Base&>(*this)),
+    };
   }
 
- public:
-  std::tuple<Actions...> actions;
+  // We also support conversion to OnceAction whenever the initial action
+  // supports conversion to Action (since any Action can also be a OnceAction).
+  //
+  // The remaining sub-actions must also be compatible, but we don't need to
+  // special case them because the base class deals with them.
+  template <
+      typename R, typename... Args,
+      typename std::enable_if<
+          conjunction<
+              negation<std::is_convertible<
+                  InitialAction,
+                  OnceAction<void(InitialActionArgType<Args>...)>>>,
+              std::is_convertible<InitialAction,
+                                  Action<void(InitialActionArgType<Args>...)>>,
+              std::is_convertible<Base, OnceAction<R(Args...)>>>::value,
+          int>::type = 0>
+  operator OnceAction<R(Args...)>() && {  // NOLINT
+    return DoAll(
+        Action<void(InitialActionArgType<Args>...)>(std::move(initial_action_)),
+        std::move(static_cast<Base&>(*this)));
+  }
 
-  template <typename R, typename... Args>
+  // We support conversion to Action whenever both the initial action and the
+  // rest support conversion to Action.
+  template <
+      typename R, typename... Args,
+      typename std::enable_if<
+          conjunction<
+              std::is_convertible<const InitialAction&,
+                                  Action<void(InitialActionArgType<Args>...)>>,
+              std::is_convertible<const Base&, Action<R(Args...)>>>::value,
+          int>::type = 0>
   operator Action<R(Args...)>() const {  // NOLINT
-    struct Op {
-      std::vector<Action<void(NonFinalType<Args>...)>> converted;
-      Action<R(Args...)> last;
+    // Return an action that first calls the initial action with arguments
+    // filtered through InitialActionArgType, then forwards arguments directly
+    // to the base class to deal with the remaining actions.
+    struct OA {
+      Action<void(InitialActionArgType<Args>...)> initial_action;
+      Action<R(Args...)> remaining_actions;
+
       R operator()(Args... args) const {
-        auto tuple_args = std::forward_as_tuple(std::forward<Args>(args)...);
-        for (auto& a : converted) {
-          a.Perform(tuple_args);
-        }
-        return last.Perform(std::move(tuple_args));
+        initial_action.Perform(std::forward_as_tuple(
+            static_cast<InitialActionArgType<Args>>(args)...));
+
+        return remaining_actions.Perform(
+            std::forward_as_tuple(std::forward<Args>(args)...));
       }
     };
-    return Op{Convert<Action<void(NonFinalType<Args>...)>>(
-                  MakeIndexSequence<sizeof...(Actions) - 1>()),
-              std::get<sizeof...(Actions) - 1>(actions)};
+
+    return OA{
+        initial_action_,
+        static_cast<const Base&>(*this),
+    };
   }
+
+ private:
+  InitialAction initial_action_;
 };
 
 template <typename T, typename... Params>
@@ -1076,10 +1729,11 @@ struct ReturnNewAction {
 
 template <size_t k>
 struct ReturnArgAction {
-  template <typename... Args>
-  auto operator()(const Args&... args) const ->
-      typename std::tuple_element<k, std::tuple<Args...>>::type {
-    return std::get<k>(std::tie(args...));
+  template <typename... Args,
+            typename = typename std::enable_if<(k < sizeof...(Args))>::type>
+  auto operator()(Args&&... args) const -> decltype(std::get<k>(
+      std::forward_as_tuple(std::forward<Args>(args)...))) {
+    return std::get<k>(std::forward_as_tuple(std::forward<Args>(args)...));
   }
 };
 
@@ -1093,6 +1747,16 @@ struct SaveArgAction {
   }
 };
 
+template <size_t k, typename Ptr>
+struct SaveArgByMoveAction {
+  Ptr pointer;
+
+  template <typename... Args>
+  void operator()(Args&&... args) const {
+    *pointer = std::move(std::get<k>(std::tie(args...)));
+  }
+};
+
 template <size_t k, typename Ptr>
 struct SaveArgPointeeAction {
   Ptr pointer;
@@ -1159,6 +1823,13 @@ struct ThrowAction {
     return [copy](Args...) -> R { throw copy; };
   }
 };
+struct RethrowAction {
+  std::exception_ptr exception;
+  template <typename R, typename... Args>
+  operator Action<R(Args...)>() const {  // NOLINT
+    return [ex = exception](Args...) -> R { std::rethrow_exception(ex); };
+  }
+};
 #endif  // GTEST_HAS_EXCEPTIONS
 
 }  // namespace internal
@@ -1201,7 +1872,8 @@ typedef internal::IgnoredValue Unused;
 template <typename... Action>
 internal::DoAllAction<typename std::decay<Action>::type...> DoAll(
     Action&&... action) {
-  return {std::forward_as_tuple(std::forward<Action>(action)...)};
+  return internal::DoAllAction<typename std::decay<Action>::type...>(
+      {}, std::forward<Action>(action)...);
 }
 
 // WithArg<k>(an_action) creates an action that passes the k-th
@@ -1235,9 +1907,30 @@ internal::WithArgsAction<typename std::decay<InnerAction>::type> WithoutArgs(
   return {std::forward<InnerAction>(action)};
 }
 
-// Creates an action that returns 'value'.  'value' is passed by value
-// instead of const reference - otherwise Return("string literal")
-// will trigger a compiler error about using array as initializer.
+// Creates an action that returns a value.
+//
+// The returned type can be used with a mock function returning a non-void,
+// non-reference type U as follows:
+//
+//  *  If R is convertible to U and U is move-constructible, then the action can
+//     be used with WillOnce.
+//
+//  *  If const R& is convertible to U and U is copy-constructible, then the
+//     action can be used with both WillOnce and WillRepeatedly.
+//
+// The mock expectation contains the R value from which the U return value is
+// constructed (a move/copy of the argument to Return). This means that the R
+// value will survive at least until the mock object's expectations are cleared
+// or the mock object is destroyed, meaning that U can safely be a
+// reference-like type such as std::string_view:
+//
+//     // The mock function returns a view of a copy of the string fed to
+//     // Return. The view is valid even after the action is performed.
+//     MockFunction<std::string_view()> mock;
+//     EXPECT_CALL(mock, Call).WillOnce(Return(std::string("taco")));
+//     const std::string_view result = mock.AsStdFunction()();
+//     EXPECT_EQ("taco", result);
+//
 template <typename R>
 internal::ReturnAction<R> Return(R value) {
   return internal::ReturnAction<R>(std::move(value));
@@ -1271,6 +1964,8 @@ inline internal::ReturnRefOfCopyAction<R> ReturnRefOfCopy(const R& x) {
   return internal::ReturnRefOfCopyAction<R>(x);
 }
 
+// DEPRECATED: use Return(x) directly with WillOnce.
+//
 // Modifies the parent action (a Return() action) to perform a move of the
 // argument instead of a copy.
 // Return(ByMove()) actions can only be executed once and will assert this
@@ -1321,7 +2016,7 @@ PolymorphicAction<internal::AssignAction<T1, T2>> Assign(T1* ptr, T2 val) {
   return MakePolymorphicAction(internal::AssignAction<T1, T2>(ptr, val));
 }
 
-#if !GTEST_OS_WINDOWS_MOBILE
+#ifndef GTEST_OS_WINDOWS_MOBILE
 
 // Creates an action that sets errno and returns the appropriate error.
 template <typename T>
@@ -1412,6 +2107,13 @@ internal::SaveArgAction<k, Ptr> SaveArg(Ptr pointer) {
   return {pointer};
 }
 
+// Action SaveArgByMove<k>(pointer) moves the k-th (0-based) argument of the
+// mock function into *pointer.
+template <size_t k, typename Ptr>
+internal::SaveArgByMoveAction<k, Ptr> SaveArgByMove(Ptr pointer) {
+  return {pointer};
+}
+
 // Action SaveArgPointee<k>(pointer) saves the value pointed to
 // by the k-th (0-based) argument of the mock function to *pointer.
 template <size_t k, typename Ptr>
@@ -1451,13 +2153,23 @@ internal::ReturnPointeeAction<Ptr> ReturnPointee(Ptr pointer) {
   return {pointer};
 }
 
-// Action Throw(exception) can be used in a mock function of any type
-// to throw the given exception.  Any copyable value can be thrown.
 #if GTEST_HAS_EXCEPTIONS
+// Action Throw(exception) can be used in a mock function of any type
+// to throw the given exception.  Any copyable value can be thrown,
+// except for std::exception_ptr, which is likely a mistake if
+// thrown directly.
 template <typename T>
-internal::ThrowAction<typename std::decay<T>::type> Throw(T&& exception) {
+typename std::enable_if<
+    !std::is_base_of<std::exception_ptr, typename std::decay<T>::type>::value,
+    internal::ThrowAction<typename std::decay<T>::type>>::type
+Throw(T&& exception) {
   return {std::forward<T>(exception)};
 }
+// Action Rethrow(exception_ptr) can be used in a mock function of any type
+// to rethrow any exception_ptr. Note that the same object is thrown each time.
+inline internal::RethrowAction Rethrow(std::exception_ptr exception) {
+  return {std::move(exception)};
+}
 #endif  // GTEST_HAS_EXCEPTIONS
 
 namespace internal {
@@ -1506,13 +2218,13 @@ struct ActionImpl<R(Args...), Impl> : ImplBase<Impl>::type {
   R operator()(Args&&... arg) const {
     static constexpr size_t kMaxArgs =
         sizeof...(Args) <= 10 ? sizeof...(Args) : 10;
-    return Apply(MakeIndexSequence<kMaxArgs>{},
-                 MakeIndexSequence<10 - kMaxArgs>{},
+    return Apply(std::make_index_sequence<kMaxArgs>{},
+                 std::make_index_sequence<10 - kMaxArgs>{},
                  args_type{std::forward<Args>(arg)...});
   }
 
   template <std::size_t... arg_id, std::size_t... excess_id>
-  R Apply(IndexSequence<arg_id...>, IndexSequence<excess_id...>,
+  R Apply(std::index_sequence<arg_id...>, std::index_sequence<excess_id...>,
           const args_type& args) const {
     // Impl need not be specific to the signature of action being implemented;
     // only the implementing function body needs to have all of the specific
@@ -1545,9 +2257,9 @@ ::testing::Action<F> MakeAction(std::shared_ptr<Impl> impl) {
 }
 
 #define GMOCK_INTERNAL_ARG_UNUSED(i, data, el) \
-  , const arg##i##_type& arg##i GTEST_ATTRIBUTE_UNUSED_
-#define GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_                 \
-  const args_type& args GTEST_ATTRIBUTE_UNUSED_ GMOCK_PP_REPEAT( \
+  , [[maybe_unused]] const arg##i##_type& arg##i
+#define GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_          \
+  [[maybe_unused]] const args_type& args GMOCK_PP_REPEAT( \
       GMOCK_INTERNAL_ARG_UNUSED, , 10)
 
 #define GMOCK_INTERNAL_ARG(i, data, el) , const arg##i##_type& arg##i
@@ -1585,43 +2297,47 @@ ::testing::Action<F> MakeAction(std::shared_ptr<Impl> impl) {
 #define GMOCK_ACTION_FIELD_PARAMS_(params) \
   GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_FIELD_PARAM, , params)
 
-#define GMOCK_INTERNAL_ACTION(name, full_name, params)                        \
-  template <GMOCK_ACTION_TYPENAME_PARAMS_(params)>                            \
-  class full_name {                                                           \
-   public:                                                                    \
-    explicit full_name(GMOCK_ACTION_TYPE_GVALUE_PARAMS_(params))              \
-        : impl_(std::make_shared<gmock_Impl>(                                 \
-              GMOCK_ACTION_GVALUE_PARAMS_(params))) {}                        \
-    full_name(const full_name&) = default;                                    \
-    full_name(full_name&&) noexcept = default;                                \
-    template <typename F>                                                     \
-    operator ::testing::Action<F>() const {                                   \
-      return ::testing::internal::MakeAction<F>(impl_);                       \
-    }                                                                         \
-                                                                              \
-   private:                                                                   \
-    class gmock_Impl {                                                        \
-     public:                                                                  \
-      explicit gmock_Impl(GMOCK_ACTION_TYPE_GVALUE_PARAMS_(params))           \
-          : GMOCK_ACTION_INIT_PARAMS_(params) {}                              \
-      template <typename function_type, typename return_type,                 \
-                typename args_type, GMOCK_ACTION_TEMPLATE_ARGS_NAMES_>        \
-      return_type gmock_PerformImpl(GMOCK_ACTION_ARG_TYPES_AND_NAMES_) const; \
-      GMOCK_ACTION_FIELD_PARAMS_(params)                                      \
-    };                                                                        \
-    std::shared_ptr<const gmock_Impl> impl_;                                  \
-  };                                                                          \
-  template <GMOCK_ACTION_TYPENAME_PARAMS_(params)>                            \
-  inline full_name<GMOCK_ACTION_TYPE_PARAMS_(params)> name(                   \
-      GMOCK_ACTION_TYPE_GVALUE_PARAMS_(params)) {                             \
-    return full_name<GMOCK_ACTION_TYPE_PARAMS_(params)>(                      \
-        GMOCK_ACTION_GVALUE_PARAMS_(params));                                 \
-  }                                                                           \
-  template <GMOCK_ACTION_TYPENAME_PARAMS_(params)>                            \
-  template <typename function_type, typename return_type, typename args_type, \
-            GMOCK_ACTION_TEMPLATE_ARGS_NAMES_>                                \
-  return_type full_name<GMOCK_ACTION_TYPE_PARAMS_(params)>::gmock_Impl::      \
-      gmock_PerformImpl(GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const
+#define GMOCK_INTERNAL_ACTION(name, full_name, params)                         \
+  template <GMOCK_ACTION_TYPENAME_PARAMS_(params)>                             \
+  class full_name {                                                            \
+   public:                                                                     \
+    explicit full_name(GMOCK_ACTION_TYPE_GVALUE_PARAMS_(params))               \
+        : impl_(std::make_shared<gmock_Impl>(                                  \
+              GMOCK_ACTION_GVALUE_PARAMS_(params))) {}                         \
+    full_name(const full_name&) = default;                                     \
+    full_name(full_name&&) noexcept = default;                                 \
+    template <typename F>                                                      \
+    operator ::testing::Action<F>() const {                                    \
+      return ::testing::internal::MakeAction<F>(impl_);                        \
+    }                                                                          \
+                                                                               \
+   private:                                                                    \
+    class gmock_Impl {                                                         \
+     public:                                                                   \
+      explicit gmock_Impl(GMOCK_ACTION_TYPE_GVALUE_PARAMS_(params))            \
+          : GMOCK_ACTION_INIT_PARAMS_(params) {}                               \
+      template <typename function_type, typename return_type,                  \
+                typename args_type, GMOCK_ACTION_TEMPLATE_ARGS_NAMES_>         \
+      return_type gmock_PerformImpl(GMOCK_ACTION_ARG_TYPES_AND_NAMES_) const;  \
+      GMOCK_ACTION_FIELD_PARAMS_(params)                                       \
+    };                                                                         \
+    std::shared_ptr<const gmock_Impl> impl_;                                   \
+  };                                                                           \
+  template <GMOCK_ACTION_TYPENAME_PARAMS_(params)>                             \
+  [[nodiscard]] inline full_name<GMOCK_ACTION_TYPE_PARAMS_(params)> name(      \
+      GMOCK_ACTION_TYPE_GVALUE_PARAMS_(params));                               \
+  template <GMOCK_ACTION_TYPENAME_PARAMS_(params)>                             \
+  inline full_name<GMOCK_ACTION_TYPE_PARAMS_(params)> name(                    \
+      GMOCK_ACTION_TYPE_GVALUE_PARAMS_(params)) {                              \
+    return full_name<GMOCK_ACTION_TYPE_PARAMS_(params)>(                       \
+        GMOCK_ACTION_GVALUE_PARAMS_(params));                                  \
+  }                                                                            \
+  template <GMOCK_ACTION_TYPENAME_PARAMS_(params)>                             \
+  template <typename function_type, typename return_type, typename args_type,  \
+            GMOCK_ACTION_TEMPLATE_ARGS_NAMES_>                                 \
+  return_type                                                                  \
+  full_name<GMOCK_ACTION_TYPE_PARAMS_(params)>::gmock_Impl::gmock_PerformImpl( \
+      GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const
 
 }  // namespace internal
 
@@ -1644,7 +2360,7 @@ ::testing::Action<F> MakeAction(std::shared_ptr<Impl> impl) {
       return_type gmock_PerformImpl(GMOCK_ACTION_ARG_TYPES_AND_NAMES_) const; \
     };                                                                        \
   };                                                                          \
-  inline name##Action name() GTEST_MUST_USE_RESULT_;                          \
+  [[nodiscard]] inline name##Action name();                                   \
   inline name##Action name() { return name##Action(); }                       \
   template <typename function_type, typename return_type, typename args_type, \
             GMOCK_ACTION_TEMPLATE_ARGS_NAMES_>                                \
@@ -1683,8 +2399,6 @@ ::testing::Action<F> MakeAction(std::shared_ptr<Impl> impl) {
 
 }  // namespace testing
 
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
+GTEST_DISABLE_MSC_WARNINGS_POP_()  // 4100
 
 #endif  // GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_ACTIONS_H_
diff --git a/external/googletest/googlemock/include/gmock/gmock-cardinalities.h b/external/googletest/googlemock/include/gmock/gmock-cardinalities.h
index 5ab906bd..533e604f 100644
--- a/external/googletest/googlemock/include/gmock/gmock-cardinalities.h
+++ b/external/googletest/googlemock/include/gmock/gmock-cardinalities.h
@@ -33,7 +33,8 @@
 // cardinalities can be defined by the user implementing the
 // CardinalityInterface interface if necessary.
 
-// GOOGLETEST_CM0002 DO NOT DELETE
+// IWYU pragma: private, include "gmock/gmock.h"
+// IWYU pragma: friend gmock/.*
 
 #ifndef GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_CARDINALITIES_H_
 #define GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_CARDINALITIES_H_
@@ -64,7 +65,7 @@ namespace testing {
 // The implementation of a cardinality.
 class CardinalityInterface {
  public:
-  virtual ~CardinalityInterface() {}
+  virtual ~CardinalityInterface() = default;
 
   // Conservative estimate on the lower/upper bound of the number of
   // calls allowed.
@@ -91,7 +92,7 @@ class GTEST_API_ Cardinality {
  public:
   // Constructs a null cardinality.  Needed for storing Cardinality
   // objects in STL containers.
-  Cardinality() {}
+  Cardinality() = default;
 
   // Constructs a Cardinality from its implementation.
   explicit Cardinality(const CardinalityInterface* impl) : impl_(impl) {}
diff --git a/external/googletest/googlemock/include/gmock/gmock-function-mocker.h b/external/googletest/googlemock/include/gmock/gmock-function-mocker.h
index 0fc6f6f3..d2cb13cd 100644
--- a/external/googletest/googlemock/include/gmock/gmock-function-mocker.h
+++ b/external/googletest/googlemock/include/gmock/gmock-function-mocker.h
@@ -31,11 +31,13 @@
 //
 // This file implements MOCK_METHOD.
 
-// GOOGLETEST_CM0002 DO NOT DELETE
+// IWYU pragma: private, include "gmock/gmock.h"
+// IWYU pragma: friend gmock/.*
 
-#ifndef GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_FUNCTION_MOCKER_H_  // NOLINT
-#define GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_FUNCTION_MOCKER_H_  // NOLINT
+#ifndef GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_FUNCTION_MOCKER_H_
+#define GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_FUNCTION_MOCKER_H_
 
+#include <cstddef>
 #include <type_traits>  // IWYU pragma: keep
 #include <utility>      // IWYU pragma: keep
 
@@ -64,6 +66,39 @@ struct ThisRefAdjuster {
   }
 };
 
+constexpr bool PrefixOf(const char* a, const char* b) {
+  return *a == 0 || (*a == *b && internal::PrefixOf(a + 1, b + 1));
+}
+
+template <size_t N, size_t M>
+constexpr bool StartsWith(const char (&prefix)[N], const char (&str)[M]) {
+  return N <= M && internal::PrefixOf(prefix, str);
+}
+
+template <size_t N, size_t M>
+constexpr bool EndsWith(const char (&suffix)[N], const char (&str)[M]) {
+  return N <= M && internal::PrefixOf(suffix, str + M - N);
+}
+
+template <size_t N, size_t M>
+constexpr bool Equals(const char (&a)[N], const char (&b)[M]) {
+  return N == M && internal::PrefixOf(a, b);
+}
+
+template <size_t N>
+constexpr bool ValidateSpec(const char (&spec)[N]) {
+  return internal::Equals("const", spec) ||
+         internal::Equals("override", spec) ||
+         internal::Equals("final", spec) ||
+         internal::Equals("noexcept", spec) ||
+         (internal::StartsWith("noexcept(", spec) &&
+          internal::EndsWith(")", spec)) ||
+         internal::Equals("ref(&)", spec) ||
+         internal::Equals("ref(&&)", spec) ||
+         (internal::StartsWith("Calltype(", spec) &&
+          internal::EndsWith(")", spec));
+}
+
 }  // namespace internal
 
 // The style guide prohibits "using" statements in a namespace scope
@@ -74,8 +109,11 @@ struct ThisRefAdjuster {
 using internal::FunctionMocker;
 }  // namespace testing
 
-#define MOCK_METHOD(...) \
-  GMOCK_PP_VARIADIC_CALL(GMOCK_INTERNAL_MOCK_METHOD_ARG_, __VA_ARGS__)
+#define MOCK_METHOD(...)                                               \
+  GMOCK_INTERNAL_WARNING_PUSH()                                        \
+  GMOCK_INTERNAL_WARNING_CLANG(ignored, "-Wunused-member-function")    \
+  GMOCK_PP_VARIADIC_CALL(GMOCK_INTERNAL_MOCK_METHOD_ARG_, __VA_ARGS__) \
+  GMOCK_INTERNAL_WARNING_POP()
 
 #define GMOCK_INTERNAL_MOCK_METHOD_ARG_1(...) \
   GMOCK_INTERNAL_WRONG_ARITY(__VA_ARGS__)
@@ -86,17 +124,18 @@ using internal::FunctionMocker;
 #define GMOCK_INTERNAL_MOCK_METHOD_ARG_3(_Ret, _MethodName, _Args) \
   GMOCK_INTERNAL_MOCK_METHOD_ARG_4(_Ret, _MethodName, _Args, ())
 
-#define GMOCK_INTERNAL_MOCK_METHOD_ARG_4(_Ret, _MethodName, _Args, _Spec)     \
-  GMOCK_INTERNAL_ASSERT_PARENTHESIS(_Args);                                   \
-  GMOCK_INTERNAL_ASSERT_PARENTHESIS(_Spec);                                   \
-  GMOCK_INTERNAL_ASSERT_VALID_SIGNATURE(                                      \
-      GMOCK_PP_NARG0 _Args, GMOCK_INTERNAL_SIGNATURE(_Ret, _Args));           \
-  GMOCK_INTERNAL_ASSERT_VALID_SPEC(_Spec)                                     \
-  GMOCK_INTERNAL_MOCK_METHOD_IMPL(                                            \
-      GMOCK_PP_NARG0 _Args, _MethodName, GMOCK_INTERNAL_HAS_CONST(_Spec),     \
-      GMOCK_INTERNAL_HAS_OVERRIDE(_Spec), GMOCK_INTERNAL_HAS_FINAL(_Spec),    \
-      GMOCK_INTERNAL_GET_NOEXCEPT_SPEC(_Spec),                                \
-      GMOCK_INTERNAL_GET_CALLTYPE(_Spec), GMOCK_INTERNAL_GET_REF_SPEC(_Spec), \
+#define GMOCK_INTERNAL_MOCK_METHOD_ARG_4(_Ret, _MethodName, _Args, _Spec)  \
+  GMOCK_INTERNAL_ASSERT_PARENTHESIS(_Args);                                \
+  GMOCK_INTERNAL_ASSERT_PARENTHESIS(_Spec);                                \
+  GMOCK_INTERNAL_ASSERT_VALID_SIGNATURE(                                   \
+      GMOCK_PP_NARG0 _Args, GMOCK_INTERNAL_SIGNATURE(_Ret, _Args));        \
+  GMOCK_INTERNAL_ASSERT_VALID_SPEC(_Spec)                                  \
+  GMOCK_INTERNAL_MOCK_METHOD_IMPL(                                         \
+      GMOCK_PP_NARG0 _Args, _MethodName, GMOCK_INTERNAL_HAS_CONST(_Spec),  \
+      GMOCK_INTERNAL_HAS_OVERRIDE(_Spec), GMOCK_INTERNAL_HAS_FINAL(_Spec), \
+      GMOCK_INTERNAL_GET_NOEXCEPT_SPEC(_Spec),                             \
+      GMOCK_INTERNAL_GET_CALLTYPE_SPEC(_Spec),                             \
+      GMOCK_INTERNAL_GET_REF_SPEC(_Spec),                                  \
       (GMOCK_INTERNAL_SIGNATURE(_Ret, _Args)))
 
 #define GMOCK_INTERNAL_MOCK_METHOD_ARG_5(...) \
@@ -142,8 +181,9 @@ using internal::FunctionMocker;
       _Signature)>::Result                                                     \
   GMOCK_INTERNAL_EXPAND(_CallType)                                             \
       _MethodName(GMOCK_PP_REPEAT(GMOCK_INTERNAL_PARAMETER, _Signature, _N))   \
-          GMOCK_PP_IF(_Constness, const, ) _RefSpec _NoexceptSpec              \
-          GMOCK_PP_IF(_Override, override, ) GMOCK_PP_IF(_Final, final, ) {    \
+          GMOCK_PP_IF(_Constness, const, )                                     \
+              _RefSpec _NoexceptSpec GMOCK_PP_IF(_Override, override, )        \
+                  GMOCK_PP_IF(_Final, final, ) {                               \
     GMOCK_MOCKER_(_N, _Constness, _MethodName)                                 \
         .SetOwnerAndName(this, #_MethodName);                                  \
     return GMOCK_MOCKER_(_N, _Constness, _MethodName)                          \
@@ -166,11 +206,11 @@ using internal::FunctionMocker;
             GMOCK_INTERNAL_A_MATCHER_ARGUMENT, _Signature, _N));               \
   }                                                                            \
   mutable ::testing::FunctionMocker<GMOCK_PP_REMOVE_PARENS(_Signature)>        \
-      GMOCK_MOCKER_(_N, _Constness, _MethodName)
+  GMOCK_MOCKER_(_N, _Constness, _MethodName)
 
 #define GMOCK_INTERNAL_EXPAND(...) __VA_ARGS__
 
-// Five Valid modifiers.
+// Valid modifiers.
 #define GMOCK_INTERNAL_HAS_CONST(_Tuple) \
   GMOCK_PP_HAS_COMMA(GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_DETECT_CONST, ~, _Tuple))
 
@@ -189,6 +229,14 @@ using internal::FunctionMocker;
       GMOCK_PP_HAS_COMMA(GMOCK_INTERNAL_DETECT_NOEXCEPT(_i, _, _elem)), \
       _elem, )
 
+#define GMOCK_INTERNAL_GET_CALLTYPE_SPEC(_Tuple) \
+  GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_CALLTYPE_SPEC_IF_CALLTYPE, ~, _Tuple)
+
+#define GMOCK_INTERNAL_CALLTYPE_SPEC_IF_CALLTYPE(_i, _, _elem)          \
+  GMOCK_PP_IF(                                                          \
+      GMOCK_PP_HAS_COMMA(GMOCK_INTERNAL_DETECT_CALLTYPE(_i, _, _elem)), \
+      GMOCK_PP_CAT(GMOCK_INTERNAL_UNPACK_, _elem), )
+
 #define GMOCK_INTERNAL_GET_REF_SPEC(_Tuple) \
   GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_REF_SPEC_IF_REF, ~, _Tuple)
 
@@ -196,19 +244,25 @@ using internal::FunctionMocker;
   GMOCK_PP_IF(GMOCK_PP_HAS_COMMA(GMOCK_INTERNAL_DETECT_REF(_i, _, _elem)), \
               GMOCK_PP_CAT(GMOCK_INTERNAL_UNPACK_, _elem), )
 
-#define GMOCK_INTERNAL_GET_CALLTYPE(_Tuple) \
-  GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_GET_CALLTYPE_IMPL, ~, _Tuple)
-
-#define GMOCK_INTERNAL_ASSERT_VALID_SPEC_ELEMENT(_i, _, _elem)            \
-  static_assert(                                                          \
-      (GMOCK_PP_HAS_COMMA(GMOCK_INTERNAL_DETECT_CONST(_i, _, _elem)) +    \
-       GMOCK_PP_HAS_COMMA(GMOCK_INTERNAL_DETECT_OVERRIDE(_i, _, _elem)) + \
-       GMOCK_PP_HAS_COMMA(GMOCK_INTERNAL_DETECT_FINAL(_i, _, _elem)) +    \
-       GMOCK_PP_HAS_COMMA(GMOCK_INTERNAL_DETECT_NOEXCEPT(_i, _, _elem)) + \
-       GMOCK_PP_HAS_COMMA(GMOCK_INTERNAL_DETECT_REF(_i, _, _elem)) +      \
-       GMOCK_INTERNAL_IS_CALLTYPE(_elem)) == 1,                           \
-      GMOCK_PP_STRINGIZE(                                                 \
+#ifdef GMOCK_INTERNAL_STRICT_SPEC_ASSERT
+#define GMOCK_INTERNAL_ASSERT_VALID_SPEC_ELEMENT(_i, _, _elem) \
+  static_assert(                                                     \
+      ::testing::internal::ValidateSpec(GMOCK_PP_STRINGIZE(_elem)),  \
+      "Token \'" GMOCK_PP_STRINGIZE(                                 \
+          _elem) "\' cannot be recognized as a valid specification " \
+                 "modifier. Is a ',' missing?");
+#else
+#define GMOCK_INTERNAL_ASSERT_VALID_SPEC_ELEMENT(_i, _, _elem)                 \
+  static_assert(                                                               \
+      (GMOCK_PP_HAS_COMMA(GMOCK_INTERNAL_DETECT_CONST(_i, _, _elem)) +         \
+       GMOCK_PP_HAS_COMMA(GMOCK_INTERNAL_DETECT_OVERRIDE(_i, _, _elem)) +      \
+       GMOCK_PP_HAS_COMMA(GMOCK_INTERNAL_DETECT_FINAL(_i, _, _elem)) +         \
+       GMOCK_PP_HAS_COMMA(GMOCK_INTERNAL_DETECT_NOEXCEPT(_i, _, _elem)) +      \
+       GMOCK_PP_HAS_COMMA(GMOCK_INTERNAL_DETECT_REF(_i, _, _elem)) +           \
+       GMOCK_PP_HAS_COMMA(GMOCK_INTERNAL_DETECT_CALLTYPE(_i, _, _elem))) == 1, \
+      GMOCK_PP_STRINGIZE(                                                      \
           _elem) " cannot be recognized as a valid specification modifier.");
+#endif  // GMOCK_INTERNAL_STRICT_SPEC_ASSERT
 
 // Modifiers implementation.
 #define GMOCK_INTERNAL_DETECT_CONST(_i, _, _elem) \
@@ -238,26 +292,12 @@ using internal::FunctionMocker;
 
 #define GMOCK_INTERNAL_UNPACK_ref(x) x
 
-#define GMOCK_INTERNAL_GET_CALLTYPE_IMPL(_i, _, _elem)           \
-  GMOCK_PP_IF(GMOCK_INTERNAL_IS_CALLTYPE(_elem),                 \
-              GMOCK_INTERNAL_GET_VALUE_CALLTYPE, GMOCK_PP_EMPTY) \
-  (_elem)
-
-// TODO(iserna): GMOCK_INTERNAL_IS_CALLTYPE and
-// GMOCK_INTERNAL_GET_VALUE_CALLTYPE needed more expansions to work on windows
-// maybe they can be simplified somehow.
-#define GMOCK_INTERNAL_IS_CALLTYPE(_arg) \
-  GMOCK_INTERNAL_IS_CALLTYPE_I(          \
-      GMOCK_PP_CAT(GMOCK_INTERNAL_IS_CALLTYPE_HELPER_, _arg))
-#define GMOCK_INTERNAL_IS_CALLTYPE_I(_arg) GMOCK_PP_IS_ENCLOSED_PARENS(_arg)
+#define GMOCK_INTERNAL_DETECT_CALLTYPE(_i, _, _elem) \
+  GMOCK_PP_CAT(GMOCK_INTERNAL_DETECT_CALLTYPE_I_, _elem)
 
-#define GMOCK_INTERNAL_GET_VALUE_CALLTYPE(_arg) \
-  GMOCK_INTERNAL_GET_VALUE_CALLTYPE_I(          \
-      GMOCK_PP_CAT(GMOCK_INTERNAL_IS_CALLTYPE_HELPER_, _arg))
-#define GMOCK_INTERNAL_GET_VALUE_CALLTYPE_I(_arg) \
-  GMOCK_PP_IDENTITY _arg
+#define GMOCK_INTERNAL_DETECT_CALLTYPE_I_Calltype ,
 
-#define GMOCK_INTERNAL_IS_CALLTYPE_HELPER_Calltype
+#define GMOCK_INTERNAL_UNPACK_Calltype(...) __VA_ARGS__
 
 // Note: The use of `identity_t` here allows _Ret to represent return types that
 // would normally need to be specified in a different way. For example, a method
@@ -476,4 +516,4 @@ using internal::FunctionMocker;
 #define GMOCK_MOCKER_(arity, constness, Method) \
   GTEST_CONCAT_TOKEN_(gmock##constness##arity##_##Method##_, __LINE__)
 
-#endif  // GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_FUNCTION_MOCKER_H_
+#endif  // GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_FUNCTION_MOCKER_H_
diff --git a/external/googletest/googlemock/include/gmock/gmock-matchers.h b/external/googletest/googlemock/include/gmock/gmock-matchers.h
index 86be9c17..aa3a5eb1 100644
--- a/external/googletest/googlemock/include/gmock/gmock-matchers.h
+++ b/external/googletest/googlemock/include/gmock/gmock-matchers.h
@@ -27,7 +27,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
 // Google Mock - a framework for writing C++ mock classes.
 //
 // The MATCHER* family of macros can be used in a namespace scope to
@@ -241,7 +240,7 @@
 //
 // To learn more about using these macros, please search for 'MATCHER'
 // on
-// https://github.com/google/googletest/blob/master/docs/gmock_cook_book.md
+// https://github.com/google/googletest/blob/main/docs/gmock_cook_book.md
 //
 // This file also implements some commonly used argument matchers.  More
 // matchers can be defined by the user implementing the
@@ -250,14 +249,19 @@
 // See googletest/include/gtest/gtest-matchers.h for the definition of class
 // Matcher, class MatcherInterface, and others.
 
-// GOOGLETEST_CM0002 DO NOT DELETE
+// IWYU pragma: private, include "gmock/gmock.h"
+// IWYU pragma: friend gmock/.*
 
 #ifndef GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_MATCHERS_H_
 #define GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_MATCHERS_H_
 
 #include <algorithm>
 #include <cmath>
+#include <cstddef>
+#include <exception>
+#include <functional>
 #include <initializer_list>
+#include <ios>
 #include <iterator>
 #include <limits>
 #include <memory>
@@ -313,7 +317,9 @@ class StringMatchResultListener : public MatchResultListener {
  private:
   ::std::stringstream ss_;
 
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(StringMatchResultListener);
+  StringMatchResultListener(const StringMatchResultListener&) = delete;
+  StringMatchResultListener& operator=(const StringMatchResultListener&) =
+      delete;
 };
 
 // Anything inside the 'internal' namespace IS INTERNAL IMPLEMENTATION
@@ -396,20 +402,29 @@ class MatcherCastImpl {
 // is already a Matcher.  This only compiles when type T can be
 // statically converted to type U.
 template <typename T, typename U>
-class MatcherCastImpl<T, Matcher<U> > {
+class MatcherCastImpl<T, Matcher<U>> {
  public:
   static Matcher<T> Cast(const Matcher<U>& source_matcher) {
     return Matcher<T>(new Impl(source_matcher));
   }
 
  private:
-  class Impl : public MatcherInterface<T> {
+  // If it's possible to implicitly convert a `const T&` to U, then `Impl` can
+  // take that as input to avoid a copy. Otherwise, such as when `T` is a
+  // non-const reference type or a type explicitly constructible only from a
+  // non-const reference, then `Impl` must use `T` as-is (potentially copying).
+  using ImplArgT =
+      typename std::conditional<std::is_convertible<const T&, const U&>::value,
+                                const T&, T>::type;
+
+  class Impl : public MatcherInterface<ImplArgT> {
    public:
     explicit Impl(const Matcher<U>& source_matcher)
         : source_matcher_(source_matcher) {}
 
     // We delegate the matching logic to the source matcher.
-    bool MatchAndExplain(T x, MatchResultListener* listener) const override {
+    bool MatchAndExplain(ImplArgT x,
+                         MatchResultListener* listener) const override {
       using FromType = typename std::remove_cv<typename std::remove_pointer<
           typename std::remove_reference<T>::type>::type>::type;
       using ToType = typename std::remove_cv<typename std::remove_pointer<
@@ -426,9 +441,8 @@ class MatcherCastImpl<T, Matcher<U> > {
 
       // Do the cast to `U` explicitly if necessary.
       // Otherwise, let implicit conversions do the trick.
-      using CastType =
-          typename std::conditional<std::is_convertible<T&, const U&>::value,
-                                    T&, U>::type;
+      using CastType = typename std::conditional<
+          std::is_convertible<ImplArgT&, const U&>::value, ImplArgT&, U>::type;
 
       return source_matcher_.MatchAndExplain(static_cast<CastType>(x),
                                              listener);
@@ -450,7 +464,7 @@ class MatcherCastImpl<T, Matcher<U> > {
 // This even more specialized version is used for efficiently casting
 // a matcher to its own type.
 template <typename T>
-class MatcherCastImpl<T, Matcher<T> > {
+class MatcherCastImpl<T, Matcher<T>> {
  public:
   static Matcher<T> Cast(const Matcher<T>& matcher) { return matcher; }
 };
@@ -485,12 +499,12 @@ class MatcherBaseImpl<Derived<Ts...>> {
 
   template <typename F>
   operator ::testing::Matcher<F>() const {  // NOLINT(runtime/explicit)
-    return Apply<F>(MakeIndexSequence<sizeof...(Ts)>{});
+    return Apply<F>(std::make_index_sequence<sizeof...(Ts)>{});
   }
 
  private:
   template <typename F, std::size_t... tuple_ids>
-  ::testing::Matcher<F> Apply(IndexSequence<tuple_ids...>) const {
+  ::testing::Matcher<F> Apply(std::index_sequence<tuple_ids...>) const {
     return ::testing::Matcher<F>(
         new typename Derived<Ts...>::template gmock_Impl<F>(
             std::get<tuple_ids>(params_)...));
@@ -523,29 +537,26 @@ inline Matcher<T> SafeMatcherCast(const M& polymorphic_matcher_or_value) {
 // safely convert a Matcher<U> to a Matcher<T> (i.e. Matcher is
 // contravariant): just keep a copy of the original Matcher<U>, convert the
 // argument from type T to U, and then pass it to the underlying Matcher<U>.
-// The only exception is when U is a reference and T is not, as the
+// The only exception is when U is a non-const reference and T is not, as the
 // underlying Matcher<U> may be interested in the argument's address, which
-// is not preserved in the conversion from T to U.
+// cannot be preserved in the conversion from T to U (since a copy of the input
+// T argument would be required to provide a non-const reference U).
 template <typename T, typename U>
 inline Matcher<T> SafeMatcherCast(const Matcher<U>& matcher) {
   // Enforce that T can be implicitly converted to U.
   static_assert(std::is_convertible<const T&, const U&>::value,
-                "T must be implicitly convertible to U");
-  // Enforce that we are not converting a non-reference type T to a reference
-  // type U.
-  GTEST_COMPILE_ASSERT_(
-      std::is_reference<T>::value || !std::is_reference<U>::value,
-      cannot_convert_non_reference_arg_to_reference);
+                "T must be implicitly convertible to U (and T must be a "
+                "non-const reference if U is a non-const reference)");
   // In case both T and U are arithmetic types, enforce that the
   // conversion is not lossy.
   typedef GTEST_REMOVE_REFERENCE_AND_CONST_(T) RawT;
   typedef GTEST_REMOVE_REFERENCE_AND_CONST_(U) RawU;
   constexpr bool kTIsOther = GMOCK_KIND_OF_(RawT) == internal::kOther;
   constexpr bool kUIsOther = GMOCK_KIND_OF_(RawU) == internal::kOther;
-  GTEST_COMPILE_ASSERT_(
+  static_assert(
       kTIsOther || kUIsOther ||
-      (internal::LosslessArithmeticConvertible<RawT, RawU>::value),
-      conversion_of_arithmetic_types_must_be_lossless);
+          (internal::LosslessArithmeticConvertible<RawT, RawU>::value),
+      "conversion of arithmetic types must be lossless");
   return MatcherCast<T>(matcher);
 }
 
@@ -557,10 +568,15 @@ Matcher<T> A();
 // and MUST NOT BE USED IN USER CODE!!!
 namespace internal {
 
+// Used per go/ranked-overloads for dispatching.
+struct Rank0 {};
+struct Rank1 : Rank0 {};
+using HighestRank = Rank1;
+
 // If the explanation is not empty, prints it to the ostream.
 inline void PrintIfNotEmpty(const std::string& explanation,
                             ::std::ostream* os) {
-  if (explanation != "" && os != nullptr) {
+  if (!explanation.empty() && os != nullptr) {
     *os << ", " << explanation;
   }
 }
@@ -678,9 +694,9 @@ bool TupleMatches(const MatcherTuple& matcher_tuple,
                   const ValueTuple& value_tuple) {
   // Makes sure that matcher_tuple and value_tuple have the same
   // number of fields.
-  GTEST_COMPILE_ASSERT_(std::tuple_size<MatcherTuple>::value ==
-                            std::tuple_size<ValueTuple>::value,
-                        matcher_and_value_have_different_numbers_of_fields);
+  static_assert(std::tuple_size<MatcherTuple>::value ==
+                    std::tuple_size<ValueTuple>::value,
+                "matcher and value have different numbers of fields");
   return TuplePrefix<std::tuple_size<ValueTuple>::value>::Matches(matcher_tuple,
                                                                   value_tuple);
 }
@@ -689,8 +705,7 @@ bool TupleMatches(const MatcherTuple& matcher_tuple,
 // is no failure, nothing will be streamed to os.
 template <typename MatcherTuple, typename ValueTuple>
 void ExplainMatchFailureTupleTo(const MatcherTuple& matchers,
-                                const ValueTuple& values,
-                                ::std::ostream* os) {
+                                const ValueTuple& values, ::std::ostream* os) {
   TuplePrefix<std::tuple_size<MatcherTuple>::value>::ExplainMatchFailuresTo(
       matchers, values, os);
 }
@@ -714,14 +729,14 @@ class TransformTupleValuesHelper {
  private:
   template <typename Tup, size_t kRemainingSize>
   struct IterateOverTuple {
-    OutIter operator() (Func f, const Tup& t, OutIter out) const {
+    OutIter operator()(Func f, const Tup& t, OutIter out) const {
       *out++ = f(::std::get<TupleSize::value - kRemainingSize>(t));
       return IterateOverTuple<Tup, kRemainingSize - 1>()(f, t, out);
     }
   };
   template <typename Tup>
   struct IterateOverTuple<Tup, 0> {
-    OutIter operator() (Func /* f */, const Tup& /* t */, OutIter out) const {
+    OutIter operator()(Func /* f */, const Tup& /* t */, OutIter out) const {
       return out;
     }
   };
@@ -767,9 +782,7 @@ class IsNullMatcher {
   }
 
   void DescribeTo(::std::ostream* os) const { *os << "is NULL"; }
-  void DescribeNegationTo(::std::ostream* os) const {
-    *os << "isn't NULL";
-  }
+  void DescribeNegationTo(::std::ostream* os) const { *os << "isn't NULL"; }
 };
 
 // Implements the polymorphic NotNull() matcher, which matches any raw or smart
@@ -783,9 +796,7 @@ class NotNullMatcher {
   }
 
   void DescribeTo(::std::ostream* os) const { *os << "isn't NULL"; }
-  void DescribeNegationTo(::std::ostream* os) const {
-    *os << "is NULL";
-  }
+  void DescribeNegationTo(::std::ostream* os) const { *os << "is NULL"; }
 };
 
 // Ref(variable) matches any argument that is a reference to
@@ -871,8 +882,7 @@ inline bool CaseInsensitiveCStringEquals(const wchar_t* lhs,
 // String comparison for narrow or wide strings that can have embedded NUL
 // characters.
 template <typename StringType>
-bool CaseInsensitiveStringEquals(const StringType& s1,
-                                 const StringType& s2) {
+bool CaseInsensitiveStringEquals(const StringType& s1, const StringType& s2) {
   // Are the heads equal?
   if (!CaseInsensitiveCStringEquals(s1.c_str(), s2.c_str())) {
     return false;
@@ -933,8 +943,8 @@ class StrEqualityMatcher {
   bool MatchAndExplain(const MatcheeStringType& s,
                        MatchResultListener* /* listener */) const {
     const StringType s2(s);
-    const bool eq = case_sensitive_ ? s2 == string_ :
-        CaseInsensitiveStringEquals(s2, string_);
+    const bool eq = case_sensitive_ ? s2 == string_
+                                    : CaseInsensitiveStringEquals(s2, string_);
     return expect_eq_ == eq;
   }
 
@@ -1021,8 +1031,7 @@ class HasSubstrMatcher {
 template <typename StringType>
 class StartsWithMatcher {
  public:
-  explicit StartsWithMatcher(const StringType& prefix) : prefix_(prefix) {
-  }
+  explicit StartsWithMatcher(const StringType& prefix) : prefix_(prefix) {}
 
 #if GTEST_INTERNAL_HAS_STRING_VIEW
   bool MatchAndExplain(const internal::StringView& s,
@@ -1051,9 +1060,9 @@ class StartsWithMatcher {
   template <typename MatcheeStringType>
   bool MatchAndExplain(const MatcheeStringType& s,
                        MatchResultListener* /* listener */) const {
-    const StringType& s2(s);
+    const StringType s2(s);
     return s2.length() >= prefix_.length() &&
-        s2.substr(0, prefix_.length()) == prefix_;
+           s2.substr(0, prefix_.length()) == prefix_;
   }
 
   void DescribeTo(::std::ostream* os) const {
@@ -1105,9 +1114,9 @@ class EndsWithMatcher {
   template <typename MatcheeStringType>
   bool MatchAndExplain(const MatcheeStringType& s,
                        MatchResultListener* /* listener */) const {
-    const StringType& s2(s);
+    const StringType s2(s);
     return s2.length() >= suffix_.length() &&
-        s2.substr(s2.length() - suffix_.length()) == suffix_;
+           s2.substr(s2.length() - suffix_.length()) == suffix_;
   }
 
   void DescribeTo(::std::ostream* os) const {
@@ -1124,6 +1133,45 @@ class EndsWithMatcher {
   const StringType suffix_;
 };
 
+// Implements the polymorphic WhenBase64Unescaped(matcher) matcher, which can be
+// used as a Matcher<T> as long as T can be converted to a string.
+class WhenBase64UnescapedMatcher {
+ public:
+  using is_gtest_matcher = void;
+
+  explicit WhenBase64UnescapedMatcher(
+      const Matcher<const std::string&>& internal_matcher)
+      : internal_matcher_(internal_matcher) {}
+
+  // Matches anything that can convert to std::string.
+  template <typename MatcheeStringType>
+  bool MatchAndExplain(const MatcheeStringType& s,
+                       MatchResultListener* listener) const {
+    const std::string s2(s);  // NOLINT (needed for working with string_view).
+    std::string unescaped;
+    if (!internal::Base64Unescape(s2, &unescaped)) {
+      if (listener != nullptr) {
+        *listener << "is not a valid base64 escaped string";
+      }
+      return false;
+    }
+    return MatchPrintAndExplain(unescaped, internal_matcher_, listener);
+  }
+
+  void DescribeTo(::std::ostream* os) const {
+    *os << "matches after Base64Unescape ";
+    internal_matcher_.DescribeTo(os);
+  }
+
+  void DescribeNegationTo(::std::ostream* os) const {
+    *os << "does not match after Base64Unescape ";
+    internal_matcher_.DescribeTo(os);
+  }
+
+ private:
+  const Matcher<const std::string&> internal_matcher_;
+};
+
 // Implements a matcher that compares the two fields of a 2-tuple
 // using one of the ==, <=, <, etc, operators.  The two fields being
 // compared don't have to have the same type.
@@ -1165,27 +1213,27 @@ class PairMatchBase {
   };
 };
 
-class Eq2Matcher : public PairMatchBase<Eq2Matcher, AnyEq> {
+class Eq2Matcher : public PairMatchBase<Eq2Matcher, std::equal_to<>> {
  public:
   static const char* Desc() { return "an equal pair"; }
 };
-class Ne2Matcher : public PairMatchBase<Ne2Matcher, AnyNe> {
+class Ne2Matcher : public PairMatchBase<Ne2Matcher, std::not_equal_to<>> {
  public:
   static const char* Desc() { return "an unequal pair"; }
 };
-class Lt2Matcher : public PairMatchBase<Lt2Matcher, AnyLt> {
+class Lt2Matcher : public PairMatchBase<Lt2Matcher, std::less<>> {
  public:
   static const char* Desc() { return "a pair where the first < the second"; }
 };
-class Gt2Matcher : public PairMatchBase<Gt2Matcher, AnyGt> {
+class Gt2Matcher : public PairMatchBase<Gt2Matcher, std::greater<>> {
  public:
   static const char* Desc() { return "a pair where the first > the second"; }
 };
-class Le2Matcher : public PairMatchBase<Le2Matcher, AnyLe> {
+class Le2Matcher : public PairMatchBase<Le2Matcher, std::less_equal<>> {
  public:
   static const char* Desc() { return "a pair where the first <= the second"; }
 };
-class Ge2Matcher : public PairMatchBase<Ge2Matcher, AnyGe> {
+class Ge2Matcher : public PairMatchBase<Ge2Matcher, std::greater_equal<>> {
  public:
   static const char* Desc() { return "a pair where the first >= the second"; }
 };
@@ -1197,8 +1245,7 @@ class Ge2Matcher : public PairMatchBase<Ge2Matcher, AnyGe> {
 template <typename T>
 class NotMatcherImpl : public MatcherInterface<const T&> {
  public:
-  explicit NotMatcherImpl(const Matcher<T>& matcher)
-      : matcher_(matcher) {}
+  explicit NotMatcherImpl(const Matcher<T>& matcher) : matcher_(matcher) {}
 
   bool MatchAndExplain(const T& x,
                        MatchResultListener* listener) const override {
@@ -1242,7 +1289,7 @@ class NotMatcher {
 template <typename T>
 class AllOfMatcherImpl : public MatcherInterface<const T&> {
  public:
-  explicit AllOfMatcherImpl(std::vector<Matcher<T> > matchers)
+  explicit AllOfMatcherImpl(std::vector<Matcher<T>> matchers)
       : matchers_(std::move(matchers)) {}
 
   void DescribeTo(::std::ostream* os) const override {
@@ -1265,35 +1312,58 @@ class AllOfMatcherImpl : public MatcherInterface<const T&> {
 
   bool MatchAndExplain(const T& x,
                        MatchResultListener* listener) const override {
-    // If either matcher1_ or matcher2_ doesn't match x, we only need
-    // to explain why one of them fails.
+    if (!listener->IsInterested()) {
+      // Fast path to avoid unnecessary formatting.
+      for (const Matcher<T>& matcher : matchers_) {
+        if (!matcher.Matches(x)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    // This method uses matcher's explanation when explaining the result.
+    // However, if matcher doesn't provide one, this method uses matcher's
+    // description.
     std::string all_match_result;
-
-    for (size_t i = 0; i < matchers_.size(); ++i) {
+    for (const Matcher<T>& matcher : matchers_) {
       StringMatchResultListener slistener;
-      if (matchers_[i].MatchAndExplain(x, &slistener)) {
-        if (all_match_result.empty()) {
-          all_match_result = slistener.str();
+      // Return explanation for first failed matcher.
+      if (!matcher.MatchAndExplain(x, &slistener)) {
+        const std::string explanation = slistener.str();
+        if (!explanation.empty()) {
+          *listener << explanation;
         } else {
-          std::string result = slistener.str();
-          if (!result.empty()) {
-            all_match_result += ", and ";
-            all_match_result += result;
-          }
+          *listener << "which doesn't match (" << Describe(matcher) << ")";
         }
-      } else {
-        *listener << slistener.str();
         return false;
       }
+      // Keep track of explanations in case all matchers succeed.
+      std::string explanation = slistener.str();
+      if (explanation.empty()) {
+        explanation = Describe(matcher);
+      }
+      if (all_match_result.empty()) {
+        all_match_result = explanation;
+      } else {
+        if (!explanation.empty()) {
+          all_match_result += ", and ";
+          all_match_result += explanation;
+        }
+      }
     }
 
-    // Otherwise we need to explain why *both* of them match.
     *listener << all_match_result;
     return true;
   }
 
  private:
-  const std::vector<Matcher<T> > matchers_;
+  // Returns matcher description as a string.
+  std::string Describe(const Matcher<T>& matcher) const {
+    StringMatchResultListener listener;
+    matcher.DescribeTo(listener.stream());
+    return listener.str();
+  }
+  const std::vector<Matcher<T>> matchers_;
 };
 
 // VariadicMatcher is used for the variadic implementation of
@@ -1316,14 +1386,14 @@ class VariadicMatcher {
   // all of the provided matchers (Matcher1, Matcher2, ...) can match.
   template <typename T>
   operator Matcher<T>() const {
-    std::vector<Matcher<T> > values;
+    std::vector<Matcher<T>> values;
     CreateVariadicMatcher<T>(&values, std::integral_constant<size_t, 0>());
     return Matcher<T>(new CombiningMatcher<T>(std::move(values)));
   }
 
  private:
   template <typename T, size_t I>
-  void CreateVariadicMatcher(std::vector<Matcher<T> >* values,
+  void CreateVariadicMatcher(std::vector<Matcher<T>>* values,
                              std::integral_constant<size_t, I>) const {
     values->push_back(SafeMatcherCast<T>(std::get<I>(matchers_)));
     CreateVariadicMatcher<T>(values, std::integral_constant<size_t, I + 1>());
@@ -1331,7 +1401,7 @@ class VariadicMatcher {
 
   template <typename T>
   void CreateVariadicMatcher(
-      std::vector<Matcher<T> >*,
+      std::vector<Matcher<T>>*,
       std::integral_constant<size_t, sizeof...(Args)>) const {}
 
   std::tuple<Args...> matchers_;
@@ -1347,7 +1417,7 @@ using AllOfMatcher = VariadicMatcher<AllOfMatcherImpl, Args...>;
 template <typename T>
 class AnyOfMatcherImpl : public MatcherInterface<const T&> {
  public:
-  explicit AnyOfMatcherImpl(std::vector<Matcher<T> > matchers)
+  explicit AnyOfMatcherImpl(std::vector<Matcher<T>> matchers)
       : matchers_(std::move(matchers)) {}
 
   void DescribeTo(::std::ostream* os) const override {
@@ -1370,41 +1440,93 @@ class AnyOfMatcherImpl : public MatcherInterface<const T&> {
 
   bool MatchAndExplain(const T& x,
                        MatchResultListener* listener) const override {
+    if (!listener->IsInterested()) {
+      // Fast path to avoid unnecessary formatting of match explanations.
+      for (const Matcher<T>& matcher : matchers_) {
+        if (matcher.Matches(x)) {
+          return true;
+        }
+      }
+      return false;
+    }
+    // This method uses matcher's explanation when explaining the result.
+    // However, if matcher doesn't provide one, this method uses matcher's
+    // description.
     std::string no_match_result;
-
-    // If either matcher1_ or matcher2_ matches x, we just need to
-    // explain why *one* of them matches.
-    for (size_t i = 0; i < matchers_.size(); ++i) {
+    for (const Matcher<T>& matcher : matchers_) {
       StringMatchResultListener slistener;
-      if (matchers_[i].MatchAndExplain(x, &slistener)) {
-        *listener << slistener.str();
+      // Return explanation for first match.
+      if (matcher.MatchAndExplain(x, &slistener)) {
+        const std::string explanation = slistener.str();
+        if (!explanation.empty()) {
+          *listener << explanation;
+        } else {
+          *listener << "which matches (" << Describe(matcher) << ")";
+        }
         return true;
+      }
+      // Keep track of explanations in case there is no match.
+      std::string explanation = slistener.str();
+      if (explanation.empty()) {
+        explanation = DescribeNegation(matcher);
+      }
+      if (no_match_result.empty()) {
+        no_match_result = explanation;
       } else {
-        if (no_match_result.empty()) {
-          no_match_result = slistener.str();
-        } else {
-          std::string result = slistener.str();
-          if (!result.empty()) {
-            no_match_result += ", and ";
-            no_match_result += result;
-          }
+        if (!explanation.empty()) {
+          no_match_result += ", and ";
+          no_match_result += explanation;
         }
       }
     }
 
-    // Otherwise we need to explain why *both* of them fail.
     *listener << no_match_result;
     return false;
   }
 
  private:
-  const std::vector<Matcher<T> > matchers_;
+  // Returns matcher description as a string.
+  std::string Describe(const Matcher<T>& matcher) const {
+    StringMatchResultListener listener;
+    matcher.DescribeTo(listener.stream());
+    return listener.str();
+  }
+
+  std::string DescribeNegation(const Matcher<T>& matcher) const {
+    StringMatchResultListener listener;
+    matcher.DescribeNegationTo(listener.stream());
+    return listener.str();
+  }
+
+  const std::vector<Matcher<T>> matchers_;
 };
 
 // AnyOfMatcher is used for the variadic implementation of AnyOf(m_1, m_2, ...).
 template <typename... Args>
 using AnyOfMatcher = VariadicMatcher<AnyOfMatcherImpl, Args...>;
 
+// ConditionalMatcher is the implementation of Conditional(cond, m1, m2)
+template <typename MatcherTrue, typename MatcherFalse>
+class ConditionalMatcher {
+ public:
+  ConditionalMatcher(bool condition, MatcherTrue matcher_true,
+                     MatcherFalse matcher_false)
+      : condition_(condition),
+        matcher_true_(std::move(matcher_true)),
+        matcher_false_(std::move(matcher_false)) {}
+
+  template <typename T>
+  operator Matcher<T>() const {  // NOLINT(runtime/explicit)
+    return condition_ ? SafeMatcherCast<T>(matcher_true_)
+                      : SafeMatcherCast<T>(matcher_false_);
+  }
+
+ private:
+  bool condition_;
+  MatcherTrue matcher_true_;
+  MatcherFalse matcher_false_;
+};
+
 // Wrapper for implementation of Any/AllOfArray().
 template <template <class> class MatcherImpl, typename T>
 class SomeOfArrayMatcher {
@@ -1418,6 +1540,7 @@ class SomeOfArrayMatcher {
   operator Matcher<U>() const {  // NOLINT
     using RawU = typename std::decay<U>::type;
     std::vector<Matcher<RawU>> matchers;
+    matchers.reserve(matchers_.size());
     for (const auto& matcher : matchers_) {
       matchers.push_back(MatcherCast<RawU>(matcher));
     }
@@ -1425,7 +1548,7 @@ class SomeOfArrayMatcher {
   }
 
  private:
-  const ::std::vector<T> matchers_;
+  const std::vector<std::remove_const_t<T>> matchers_;
 };
 
 template <typename T>
@@ -1454,8 +1577,7 @@ class TrulyMatcher {
     // We cannot write 'return !!predicate_(x);' as that doesn't work
     // when predicate_(x) returns a class convertible to bool but
     // having no operator!().
-    if (predicate_(x))
-      return true;
+    if (predicate_(x)) return true;
     *listener << "didn't satisfy the given predicate";
     return false;
   }
@@ -1563,8 +1685,8 @@ class PredicateFormatterFromMatcher {
 // used for implementing ASSERT_THAT() and EXPECT_THAT().
 // Implementation detail: 'matcher' is received by-value to force decaying.
 template <typename M>
-inline PredicateFormatterFromMatcher<M>
-MakePredicateFormatterFromMatcher(M matcher) {
+inline PredicateFormatterFromMatcher<M> MakePredicateFormatterFromMatcher(
+    M matcher) {
   return PredicateFormatterFromMatcher<M>(std::move(matcher));
 }
 
@@ -1579,9 +1701,7 @@ class IsNanMatcher {
   }
 
   void DescribeTo(::std::ostream* os) const { *os << "is NaN"; }
-  void DescribeNegationTo(::std::ostream* os) const {
-    *os << "isn't NaN";
-  }
+  void DescribeNegationTo(::std::ostream* os) const { *os << "isn't NaN"; }
 };
 
 // Implements the polymorphic floating point equality matcher, which matches
@@ -1597,9 +1717,8 @@ class FloatingEqMatcher {
   // equality comparisons between NANs will always return false.  We specify a
   // negative max_abs_error_ term to indicate that ULP-based approximation will
   // be used for comparison.
-  FloatingEqMatcher(FloatType expected, bool nan_eq_nan) :
-    expected_(expected), nan_eq_nan_(nan_eq_nan), max_abs_error_(-1) {
-  }
+  FloatingEqMatcher(FloatType expected, bool nan_eq_nan)
+      : expected_(expected), nan_eq_nan_(nan_eq_nan), max_abs_error_(-1) {}
 
   // Constructor that supports a user-specified max_abs_error that will be used
   // for comparison instead of ULP-based approximation.  The max absolute
@@ -1661,8 +1780,8 @@ class FloatingEqMatcher {
       // os->precision() returns the previously set precision, which we
       // store to restore the ostream to its original configuration
       // after outputting.
-      const ::std::streamsize old_precision = os->precision(
-          ::std::numeric_limits<FloatType>::digits10 + 2);
+      const ::std::streamsize old_precision =
+          os->precision(::std::numeric_limits<FloatType>::digits10 + 2);
       if (FloatingPoint<FloatType>(expected_).is_nan()) {
         if (nan_eq_nan_) {
           *os << "is NaN";
@@ -1680,8 +1799,8 @@ class FloatingEqMatcher {
 
     void DescribeNegationTo(::std::ostream* os) const override {
       // As before, get original precision.
-      const ::std::streamsize old_precision = os->precision(
-          ::std::numeric_limits<FloatType>::digits10 + 2);
+      const ::std::streamsize old_precision =
+          os->precision(::std::numeric_limits<FloatType>::digits10 + 2);
       if (FloatingPoint<FloatType>(expected_).is_nan()) {
         if (nan_eq_nan_) {
           *os << "isn't NaN";
@@ -1699,9 +1818,7 @@ class FloatingEqMatcher {
     }
 
    private:
-    bool HasMaxAbsError() const {
-      return max_abs_error_ >= 0;
-    }
+    bool HasMaxAbsError() const { return max_abs_error_ >= 0; }
 
     const FloatType expected_;
     const bool nan_eq_nan_;
@@ -1773,9 +1890,8 @@ class FloatingEq2Matcher {
   template <typename Tuple>
   class Impl : public MatcherInterface<Tuple> {
    public:
-    Impl(FloatType max_abs_error, bool nan_eq_nan) :
-        max_abs_error_(max_abs_error),
-        nan_eq_nan_(nan_eq_nan) {}
+    Impl(FloatType max_abs_error, bool nan_eq_nan)
+        : max_abs_error_(max_abs_error), nan_eq_nan_(nan_eq_nan) {}
 
     bool MatchAndExplain(Tuple args,
                          MatchResultListener* listener) const override {
@@ -1951,9 +2067,7 @@ class WhenDynamicCastToMatcherBase {
  protected:
   const Matcher<To> matcher_;
 
-  static std::string GetToName() {
-    return GetTypeName<To>();
-  }
+  static std::string GetToName() { return GetTypeName<To>(); }
 
  private:
   static void GetCastTypeDescription(::std::ostream* os) {
@@ -2002,11 +2116,11 @@ class WhenDynamicCastToMatcher<To&> : public WhenDynamicCastToMatcherBase<To&> {
 template <typename Class, typename FieldType>
 class FieldMatcher {
  public:
-  FieldMatcher(FieldType Class::*field,
+  FieldMatcher(FieldType Class::* field,
                const Matcher<const FieldType&>& matcher)
       : field_(field), matcher_(matcher), whose_field_("whose given field ") {}
 
-  FieldMatcher(const std::string& field_name, FieldType Class::*field,
+  FieldMatcher(const std::string& field_name, FieldType Class::* field,
                const Matcher<const FieldType&>& matcher)
       : field_(field),
         matcher_(matcher),
@@ -2050,7 +2164,7 @@ class FieldMatcher {
     return MatchAndExplainImpl(std::false_type(), *p, listener);
   }
 
-  const FieldType Class::*field_;
+  const FieldType Class::* field_;
   const Matcher<const FieldType&> matcher_;
 
   // Contains either "whose given field " if the name of the field is unknown
@@ -2090,7 +2204,7 @@ class PropertyMatcher {
   }
 
   template <typename T>
-  bool MatchAndExplain(const T&value, MatchResultListener* listener) const {
+  bool MatchAndExplain(const T& value, MatchResultListener* listener) const {
     return MatchAndExplainImpl(
         typename std::is_pointer<typename std::remove_const<T>::type>::type(),
         value, listener);
@@ -2142,16 +2256,16 @@ struct CallableTraits {
 
 // Specialization for function pointers.
 template <typename ArgType, typename ResType>
-struct CallableTraits<ResType(*)(ArgType)> {
+struct CallableTraits<ResType (*)(ArgType)> {
   typedef ResType ResultType;
-  typedef ResType(*StorageType)(ArgType);
+  typedef ResType (*StorageType)(ArgType);
 
-  static void CheckIsValid(ResType(*f)(ArgType)) {
+  static void CheckIsValid(ResType (*f)(ArgType)) {
     GTEST_CHECK_(f != nullptr)
         << "NULL function pointer is passed into ResultOf().";
   }
   template <typename T>
-  static ResType Invoke(ResType(*f)(ArgType), T arg) {
+  static ResType Invoke(ResType (*f)(ArgType), T arg) {
     return (*f)(arg);
   }
 };
@@ -2162,13 +2276,21 @@ template <typename Callable, typename InnerMatcher>
 class ResultOfMatcher {
  public:
   ResultOfMatcher(Callable callable, InnerMatcher matcher)
-      : callable_(std::move(callable)), matcher_(std::move(matcher)) {
+      : ResultOfMatcher(/*result_description=*/"", std::move(callable),
+                        std::move(matcher)) {}
+
+  ResultOfMatcher(const std::string& result_description, Callable callable,
+                  InnerMatcher matcher)
+      : result_description_(result_description),
+        callable_(std::move(callable)),
+        matcher_(std::move(matcher)) {
     CallableTraits<Callable>::CheckIsValid(callable_);
   }
 
   template <typename T>
   operator Matcher<T>() const {
-    return Matcher<T>(new Impl<const T&>(callable_, matcher_));
+    return Matcher<T>(
+        new Impl<const T&>(result_description_, callable_, matcher_));
   }
 
  private:
@@ -2178,43 +2300,63 @@ class ResultOfMatcher {
   class Impl : public MatcherInterface<T> {
     using ResultType = decltype(CallableTraits<Callable>::template Invoke<T>(
         std::declval<CallableStorageType>(), std::declval<T>()));
+    using InnerType = std::conditional_t<
+        std::is_lvalue_reference<ResultType>::value,
+        const typename std::remove_reference<ResultType>::type&, ResultType>;
 
    public:
     template <typename M>
-    Impl(const CallableStorageType& callable, const M& matcher)
-        : callable_(callable), matcher_(MatcherCast<ResultType>(matcher)) {}
+    Impl(const std::string& result_description,
+         const CallableStorageType& callable, const M& matcher)
+        : result_description_(result_description),
+          callable_(callable),
+          matcher_(MatcherCast<InnerType>(matcher)) {}
 
     void DescribeTo(::std::ostream* os) const override {
-      *os << "is mapped by the given callable to a value that ";
+      if (result_description_.empty()) {
+        *os << "is mapped by the given callable to a value that ";
+      } else {
+        *os << "whose " << result_description_ << " ";
+      }
       matcher_.DescribeTo(os);
     }
 
     void DescribeNegationTo(::std::ostream* os) const override {
-      *os << "is mapped by the given callable to a value that ";
+      if (result_description_.empty()) {
+        *os << "is mapped by the given callable to a value that ";
+      } else {
+        *os << "whose " << result_description_ << " ";
+      }
       matcher_.DescribeNegationTo(os);
     }
 
     bool MatchAndExplain(T obj, MatchResultListener* listener) const override {
-      *listener << "which is mapped by the given callable to ";
+      if (result_description_.empty()) {
+        *listener << "which is mapped by the given callable to ";
+      } else {
+        *listener << "whose " << result_description_ << " is ";
+      }
       // Cannot pass the return value directly to MatchPrintAndExplain, which
       // takes a non-const reference as argument.
       // Also, specifying template argument explicitly is needed because T could
       // be a non-const reference (e.g. Matcher<Uncopyable&>).
-      ResultType result =
+      InnerType result =
           CallableTraits<Callable>::template Invoke<T>(callable_, obj);
       return MatchPrintAndExplain(result, matcher_, listener);
     }
 
    private:
+    const std::string result_description_;
     // Functors often define operator() as non-const method even though
     // they are actually stateless. But we need to use them even when
     // 'this' is a const pointer. It's the user's responsibility not to
     // use stateful callables with ResultOf(), which doesn't guarantee
     // how many times the callable will be invoked.
     mutable CallableStorageType callable_;
-    const Matcher<ResultType> matcher_;
+    const Matcher<InnerType> matcher_;
   };  // class Impl
 
+  const std::string result_description_;
   const CallableStorageType callable_;
   const InnerMatcher matcher_;
 };
@@ -2224,8 +2366,7 @@ template <typename SizeMatcher>
 class SizeIsMatcher {
  public:
   explicit SizeIsMatcher(const SizeMatcher& size_matcher)
-       : size_matcher_(size_matcher) {
-  }
+      : size_matcher_(size_matcher) {}
 
   template <typename Container>
   operator Matcher<Container>() const {
@@ -2240,11 +2381,11 @@ class SizeIsMatcher {
         : size_matcher_(MatcherCast<SizeType>(size_matcher)) {}
 
     void DescribeTo(::std::ostream* os) const override {
-      *os << "size ";
+      *os << "has a size that ";
       size_matcher_.DescribeTo(os);
     }
     void DescribeNegationTo(::std::ostream* os) const override {
-      *os << "size ";
+      *os << "has a size that ";
       size_matcher_.DescribeNegationTo(os);
     }
 
@@ -2253,8 +2394,8 @@ class SizeIsMatcher {
       SizeType size = container.size();
       StringMatchResultListener size_listener;
       const bool result = size_matcher_.MatchAndExplain(size, &size_listener);
-      *listener
-          << "whose size " << size << (result ? " matches" : " doesn't match");
+      *listener << "whose size " << size
+                << (result ? " matches" : " doesn't match");
       PrintIfNotEmpty(size_listener.str(), listener->stream());
       return result;
     }
@@ -2283,8 +2424,9 @@ class BeginEndDistanceIsMatcher {
   template <typename Container>
   class Impl : public MatcherInterface<Container> {
    public:
-    typedef internal::StlContainerView<
-        GTEST_REMOVE_REFERENCE_AND_CONST_(Container)> ContainerView;
+    typedef internal::StlContainerView<GTEST_REMOVE_REFERENCE_AND_CONST_(
+        Container)>
+        ContainerView;
     typedef typename std::iterator_traits<
         typename ContainerView::type::const_iterator>::difference_type
         DistanceType;
@@ -2364,18 +2506,15 @@ class ContainerEqMatcher {
     typedef internal::StlContainerView<
         typename std::remove_const<LhsContainer>::type>
         LhsView;
-    typedef typename LhsView::type LhsStlContainer;
     StlContainerReference lhs_stl_container = LhsView::ConstReference(lhs);
-    if (lhs_stl_container == expected_)
-      return true;
+    if (lhs_stl_container == expected_) return true;
 
     ::std::ostream* const os = listener->stream();
     if (os != nullptr) {
       // Something is different. Check for extra values first.
       bool printed_header = false;
-      for (typename LhsStlContainer::const_iterator it =
-               lhs_stl_container.begin();
-           it != lhs_stl_container.end(); ++it) {
+      for (auto it = lhs_stl_container.begin(); it != lhs_stl_container.end();
+           ++it) {
         if (internal::ArrayAwareFind(expected_.begin(), expected_.end(), *it) ==
             expected_.end()) {
           if (printed_header) {
@@ -2390,11 +2529,10 @@ class ContainerEqMatcher {
 
       // Now check for missing values.
       bool printed_header2 = false;
-      for (typename StlContainer::const_iterator it = expected_.begin();
-           it != expected_.end(); ++it) {
-        if (internal::ArrayAwareFind(
-                lhs_stl_container.begin(), lhs_stl_container.end(), *it) ==
-            lhs_stl_container.end()) {
+      for (auto it = expected_.begin(); it != expected_.end(); ++it) {
+        if (internal::ArrayAwareFind(lhs_stl_container.begin(),
+                                     lhs_stl_container.end(),
+                                     *it) == lhs_stl_container.end()) {
           if (printed_header2) {
             *os << ", ";
           } else {
@@ -2417,7 +2555,9 @@ class ContainerEqMatcher {
 // A comparator functor that uses the < operator to compare two values.
 struct LessComparator {
   template <typename T, typename U>
-  bool operator()(const T& lhs, const U& rhs) const { return lhs < rhs; }
+  bool operator()(const T& lhs, const U& rhs) const {
+    return lhs < rhs;
+  }
 };
 
 // Implements WhenSortedBy(comparator, container_matcher).
@@ -2436,14 +2576,16 @@ class WhenSortedByMatcher {
   template <typename LhsContainer>
   class Impl : public MatcherInterface<LhsContainer> {
    public:
-    typedef internal::StlContainerView<
-         GTEST_REMOVE_REFERENCE_AND_CONST_(LhsContainer)> LhsView;
+    typedef internal::StlContainerView<GTEST_REMOVE_REFERENCE_AND_CONST_(
+        LhsContainer)>
+        LhsView;
     typedef typename LhsView::type LhsStlContainer;
     typedef typename LhsView::const_reference LhsStlContainerReference;
     // Transforms std::pair<const Key, Value> into std::pair<Key, Value>
     // so that we can match associative containers.
-    typedef typename RemoveConstFromKey<
-        typename LhsStlContainer::value_type>::type LhsValue;
+    typedef
+        typename RemoveConstFromKey<typename LhsStlContainer::value_type>::type
+            LhsValue;
 
     Impl(const Comparator& comparator, const ContainerMatcher& matcher)
         : comparator_(comparator), matcher_(matcher) {}
@@ -2463,8 +2605,8 @@ class WhenSortedByMatcher {
       LhsStlContainerReference lhs_stl_container = LhsView::ConstReference(lhs);
       ::std::vector<LhsValue> sorted_container(lhs_stl_container.begin(),
                                                lhs_stl_container.end());
-      ::std::sort(
-           sorted_container.begin(), sorted_container.end(), comparator_);
+      ::std::sort(sorted_container.begin(), sorted_container.end(),
+                  comparator_);
 
       if (!listener->IsInterested()) {
         // If the listener is not interested, we do not need to
@@ -2477,8 +2619,8 @@ class WhenSortedByMatcher {
       *listener << " when sorted";
 
       StringMatchResultListener inner_listener;
-      const bool match = matcher_.MatchAndExplain(sorted_container,
-                                                  &inner_listener);
+      const bool match =
+          matcher_.MatchAndExplain(sorted_container, &inner_listener);
       PrintIfNotEmpty(inner_listener.str(), listener->stream());
       return match;
     }
@@ -2487,7 +2629,8 @@ class WhenSortedByMatcher {
     const Comparator comparator_;
     const Matcher<const ::std::vector<LhsValue>&> matcher_;
 
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(Impl);
+    Impl(const Impl&) = delete;
+    Impl& operator=(const Impl&) = delete;
   };
 
  private:
@@ -2501,9 +2644,9 @@ class WhenSortedByMatcher {
 // container and the RHS container respectively.
 template <typename TupleMatcher, typename RhsContainer>
 class PointwiseMatcher {
-  GTEST_COMPILE_ASSERT_(
+  static_assert(
       !IsHashTable<GTEST_REMOVE_REFERENCE_AND_CONST_(RhsContainer)>::value,
-      use_UnorderedPointwise_with_hash_tables);
+      "use UnorderedPointwise with hash tables");
 
  public:
   typedef internal::StlContainerView<RhsContainer> RhsView;
@@ -2522,9 +2665,9 @@ class PointwiseMatcher {
 
   template <typename LhsContainer>
   operator Matcher<LhsContainer>() const {
-    GTEST_COMPILE_ASSERT_(
+    static_assert(
         !IsHashTable<GTEST_REMOVE_REFERENCE_AND_CONST_(LhsContainer)>::value,
-        use_UnorderedPointwise_with_hash_tables);
+        "use UnorderedPointwise with hash tables");
 
     return Matcher<LhsContainer>(
         new Impl<const LhsContainer&>(tuple_matcher_, rhs_));
@@ -2533,8 +2676,9 @@ class PointwiseMatcher {
   template <typename LhsContainer>
   class Impl : public MatcherInterface<LhsContainer> {
    public:
-    typedef internal::StlContainerView<
-         GTEST_REMOVE_REFERENCE_AND_CONST_(LhsContainer)> LhsView;
+    typedef internal::StlContainerView<GTEST_REMOVE_REFERENCE_AND_CONST_(
+        LhsContainer)>
+        LhsView;
     typedef typename LhsView::type LhsStlContainer;
     typedef typename LhsView::const_reference LhsStlContainerReference;
     typedef typename LhsStlContainer::value_type LhsValue;
@@ -2574,14 +2718,14 @@ class PointwiseMatcher {
         return false;
       }
 
-      typename LhsStlContainer::const_iterator left = lhs_stl_container.begin();
-      typename RhsStlContainer::const_iterator right = rhs_.begin();
+      auto left = lhs_stl_container.begin();
+      auto right = rhs_.begin();
       for (size_t i = 0; i != actual_size; ++i, ++left, ++right) {
         if (listener->IsInterested()) {
           StringMatchResultListener inner_listener;
           // Create InnerMatcherArg as a temporarily object to avoid it outlives
           // *left and *right. Dereference or the conversion to `const T&` may
-          // return temp objects, e.g for vector<bool>.
+          // return temp objects, e.g. for vector<bool>.
           if (!mono_tuple_matcher_.MatchAndExplain(
                   InnerMatcherArg(ImplicitCast_<const LhsValue&>(*left),
                                   ImplicitCast_<const RhsValue&>(*right)),
@@ -2628,18 +2772,17 @@ class QuantifierMatcherImpl : public MatcherInterface<Container> {
   template <typename InnerMatcher>
   explicit QuantifierMatcherImpl(InnerMatcher inner_matcher)
       : inner_matcher_(
-           testing::SafeMatcherCast<const Element&>(inner_matcher)) {}
+            testing::SafeMatcherCast<const Element&>(inner_matcher)) {}
 
   // Checks whether:
   // * All elements in the container match, if all_elements_should_match.
   // * Any element in the container matches, if !all_elements_should_match.
-  bool MatchAndExplainImpl(bool all_elements_should_match,
-                           Container container,
+  bool MatchAndExplainImpl(bool all_elements_should_match, Container container,
                            MatchResultListener* listener) const {
     StlContainerReference stl_container = View::ConstReference(container);
     size_t i = 0;
-    for (typename StlContainer::const_iterator it = stl_container.begin();
-         it != stl_container.end(); ++it, ++i) {
+    for (auto it = stl_container.begin(); it != stl_container.end();
+         ++it, ++i) {
       StringMatchResultListener inner_listener;
       const bool matches = inner_matcher_.MatchAndExplain(*it, &inner_listener);
 
@@ -2653,6 +2796,54 @@ class QuantifierMatcherImpl : public MatcherInterface<Container> {
     return all_elements_should_match;
   }
 
+  bool MatchAndExplainImpl(const Matcher<size_t>& count_matcher,
+                           Container container,
+                           MatchResultListener* listener) const {
+    StlContainerReference stl_container = View::ConstReference(container);
+    size_t i = 0;
+    std::vector<size_t> match_elements;
+    for (auto it = stl_container.begin(); it != stl_container.end();
+         ++it, ++i) {
+      StringMatchResultListener inner_listener;
+      const bool matches = inner_matcher_.MatchAndExplain(*it, &inner_listener);
+      if (matches) {
+        match_elements.push_back(i);
+      }
+    }
+    if (listener->IsInterested()) {
+      if (match_elements.empty()) {
+        *listener << "has no element that matches";
+      } else if (match_elements.size() == 1) {
+        *listener << "whose element #" << match_elements[0] << " matches";
+      } else {
+        *listener << "whose elements (";
+        std::string sep = "";
+        for (size_t e : match_elements) {
+          *listener << sep << e;
+          sep = ", ";
+        }
+        *listener << ") match";
+      }
+    }
+    StringMatchResultListener count_listener;
+    if (count_matcher.MatchAndExplain(match_elements.size(), &count_listener)) {
+      *listener << " and whose match quantity of " << match_elements.size()
+                << " matches";
+      PrintIfNotEmpty(count_listener.str(), listener->stream());
+      return true;
+    } else {
+      if (match_elements.empty()) {
+        *listener << " and";
+      } else {
+        *listener << " but";
+      }
+      *listener << " whose match quantity of " << match_elements.size()
+                << " does not match";
+      PrintIfNotEmpty(count_listener.str(), listener->stream());
+      return false;
+    }
+  }
+
  protected:
   const Matcher<const Element&> inner_matcher_;
 };
@@ -2683,6 +2874,54 @@ class ContainsMatcherImpl : public QuantifierMatcherImpl<Container> {
   }
 };
 
+// Implements DistanceFrom(target, get_distance, distance_matcher) for the given
+// argument types:
+//   * V is the type of the value to be matched.
+//   * T is the type of the target value.
+//   * Distance is the type of the distance between V and T.
+//   * GetDistance is the type of the functor for computing the distance between
+//     V and T.
+template <typename V, typename T, typename Distance, typename GetDistance>
+class DistanceFromMatcherImpl : public MatcherInterface<V> {
+ public:
+  // Arguments:
+  //   * target: the target value.
+  //   * get_distance: the functor for computing the distance between the value
+  //   being matched and target.
+  //   * distance_matcher: the matcher for checking the distance.
+  DistanceFromMatcherImpl(T target, GetDistance get_distance,
+                          Matcher<const Distance&> distance_matcher)
+      : target_(std::move(target)),
+        get_distance_(std::move(get_distance)),
+        distance_matcher_(std::move(distance_matcher)) {}
+
+  // Describes what this matcher does.
+  void DescribeTo(::std::ostream* os) const override {
+    distance_matcher_.DescribeTo(os);
+    *os << " away from " << PrintToString(target_);
+  }
+
+  void DescribeNegationTo(::std::ostream* os) const override {
+    distance_matcher_.DescribeNegationTo(os);
+    *os << " away from " << PrintToString(target_);
+  }
+
+  bool MatchAndExplain(V value, MatchResultListener* listener) const override {
+    const auto distance = get_distance_(value, target_);
+    const bool match = distance_matcher_.Matches(distance);
+    if (!match && listener->IsInterested()) {
+      *listener << "which is " << PrintToString(distance) << " away from "
+                << PrintToString(target_);
+    }
+    return match;
+  }
+
+ private:
+  const T target_;
+  const GetDistance get_distance_;
+  const Matcher<const Distance&> distance_matcher_;
+};
+
 // Implements Each(element_matcher) for the given argument type Container.
 // Symmetric to ContainsMatcherImpl.
 template <typename Container>
@@ -2709,6 +2948,58 @@ class EachMatcherImpl : public QuantifierMatcherImpl<Container> {
   }
 };
 
+// Implements Contains(element_matcher).Times(n) for the given argument type
+// Container.
+template <typename Container>
+class ContainsTimesMatcherImpl : public QuantifierMatcherImpl<Container> {
+ public:
+  template <typename InnerMatcher>
+  explicit ContainsTimesMatcherImpl(InnerMatcher inner_matcher,
+                                    Matcher<size_t> count_matcher)
+      : QuantifierMatcherImpl<Container>(inner_matcher),
+        count_matcher_(std::move(count_matcher)) {}
+
+  void DescribeTo(::std::ostream* os) const override {
+    *os << "quantity of elements that match ";
+    this->inner_matcher_.DescribeTo(os);
+    *os << " ";
+    count_matcher_.DescribeTo(os);
+  }
+
+  void DescribeNegationTo(::std::ostream* os) const override {
+    *os << "quantity of elements that match ";
+    this->inner_matcher_.DescribeTo(os);
+    *os << " ";
+    count_matcher_.DescribeNegationTo(os);
+  }
+
+  bool MatchAndExplain(Container container,
+                       MatchResultListener* listener) const override {
+    return this->MatchAndExplainImpl(count_matcher_, container, listener);
+  }
+
+ private:
+  const Matcher<size_t> count_matcher_;
+};
+
+// Implements polymorphic Contains(element_matcher).Times(n).
+template <typename M>
+class ContainsTimesMatcher {
+ public:
+  explicit ContainsTimesMatcher(M m, Matcher<size_t> count_matcher)
+      : inner_matcher_(m), count_matcher_(std::move(count_matcher)) {}
+
+  template <typename Container>
+  operator Matcher<Container>() const {  // NOLINT
+    return Matcher<Container>(new ContainsTimesMatcherImpl<const Container&>(
+        inner_matcher_, count_matcher_));
+  }
+
+ private:
+  const M inner_matcher_;
+  const Matcher<size_t> count_matcher_;
+};
+
 // Implements polymorphic Contains(element_matcher).
 template <typename M>
 class ContainsMatcher {
@@ -2716,11 +3007,15 @@ class ContainsMatcher {
   explicit ContainsMatcher(M m) : inner_matcher_(m) {}
 
   template <typename Container>
-  operator Matcher<Container>() const {
+  operator Matcher<Container>() const {  // NOLINT
     return Matcher<Container>(
         new ContainsMatcherImpl<const Container&>(inner_matcher_));
   }
 
+  ContainsTimesMatcher<M> Times(Matcher<size_t> count_matcher) const {
+    return ContainsTimesMatcher<M>(inner_matcher_, std::move(count_matcher));
+  }
+
  private:
   const M inner_matcher_;
 };
@@ -2732,7 +3027,7 @@ class EachMatcher {
   explicit EachMatcher(M m) : inner_matcher_(m) {}
 
   template <typename Container>
-  operator Matcher<Container>() const {
+  operator Matcher<Container>() const {  // NOLINT
     return Matcher<Container>(
         new EachMatcherImpl<const Container&>(inner_matcher_));
   }
@@ -2741,30 +3036,73 @@ class EachMatcher {
   const M inner_matcher_;
 };
 
-struct Rank1 {};
-struct Rank0 : Rank1 {};
-
 namespace pair_getters {
 using std::get;
 template <typename T>
-auto First(T& x, Rank1) -> decltype(get<0>(x)) {  // NOLINT
+auto First(T& x, Rank0) -> decltype(get<0>(x)) {  // NOLINT
   return get<0>(x);
 }
 template <typename T>
-auto First(T& x, Rank0) -> decltype((x.first)) {  // NOLINT
+auto First(T& x, Rank1) -> decltype((x.first)) {  // NOLINT
   return x.first;
 }
 
 template <typename T>
-auto Second(T& x, Rank1) -> decltype(get<1>(x)) {  // NOLINT
+auto Second(T& x, Rank0) -> decltype(get<1>(x)) {  // NOLINT
   return get<1>(x);
 }
 template <typename T>
-auto Second(T& x, Rank0) -> decltype((x.second)) {  // NOLINT
+auto Second(T& x, Rank1) -> decltype((x.second)) {  // NOLINT
   return x.second;
 }
 }  // namespace pair_getters
 
+// Default functor for computing the distance between two values.
+struct DefaultGetDistance {
+  template <typename T, typename U>
+  auto operator()(const T& lhs, const U& rhs) const {
+    using std::abs;
+    // Allow finding abs() in the type's namespace via ADL.
+    return abs(lhs - rhs);
+  }
+};
+
+// Implements polymorphic DistanceFrom(target, get_distance, distance_matcher)
+// matcher. Template arguments:
+//   * T is the type of the target value.
+//   * GetDistance is the type of the functor for computing the distance between
+//     the value being matched and the target.
+//   * DistanceMatcher is the type of the matcher for checking the distance.
+template <typename T, typename GetDistance, typename DistanceMatcher>
+class DistanceFromMatcher {
+ public:
+  // Arguments:
+  //   * target: the target value.
+  //   * get_distance: the functor for computing the distance between the value
+  //     being matched and target.
+  //   * distance_matcher: the matcher for checking the distance.
+  DistanceFromMatcher(T target, GetDistance get_distance,
+                      DistanceMatcher distance_matcher)
+      : target_(std::move(target)),
+        get_distance_(std::move(get_distance)),
+        distance_matcher_(std::move(distance_matcher)) {}
+
+  DistanceFromMatcher(const DistanceFromMatcher& other) = default;
+
+  // Implicitly converts to a monomorphic matcher of the given type.
+  template <typename V>
+  operator Matcher<V>() const {  // NOLINT
+    using Distance = decltype(get_distance_(std::declval<V>(), target_));
+    return Matcher<V>(new DistanceFromMatcherImpl<V, T, Distance, GetDistance>(
+        target_, get_distance_, distance_matcher_));
+  }
+
+ private:
+  const T target_;
+  const GetDistance get_distance_;
+  const DistanceMatcher distance_matcher_;
+};
+
 // Implements Key(inner_matcher) for the given argument pair type.
 // Key(inner_matcher) matches an std::pair whose 'first' field matches
 // inner_matcher.  For example, Contains(Key(Ge(5))) can be used to match an
@@ -2778,8 +3116,7 @@ class KeyMatcherImpl : public MatcherInterface<PairType> {
   template <typename InnerMatcher>
   explicit KeyMatcherImpl(InnerMatcher inner_matcher)
       : inner_matcher_(
-          testing::SafeMatcherCast<const KeyType&>(inner_matcher)) {
-  }
+            testing::SafeMatcherCast<const KeyType&>(inner_matcher)) {}
 
   // Returns true if and only if 'key_value.first' (the key) matches the inner
   // matcher.
@@ -2787,9 +3124,9 @@ class KeyMatcherImpl : public MatcherInterface<PairType> {
                        MatchResultListener* listener) const override {
     StringMatchResultListener inner_listener;
     const bool match = inner_matcher_.MatchAndExplain(
-        pair_getters::First(key_value, Rank0()), &inner_listener);
+        pair_getters::First(key_value, Rank1()), &inner_listener);
     const std::string explanation = inner_listener.str();
-    if (explanation != "") {
+    if (!explanation.empty()) {
       *listener << "whose first field is a value " << explanation;
     }
     return match;
@@ -2884,8 +3221,7 @@ class PairMatcherImpl : public MatcherInterface<PairType> {
       : first_matcher_(
             testing::SafeMatcherCast<const FirstType&>(first_matcher)),
         second_matcher_(
-            testing::SafeMatcherCast<const SecondType&>(second_matcher)) {
-  }
+            testing::SafeMatcherCast<const SecondType&>(second_matcher)) {}
 
   // Describes what this matcher does.
   void DescribeTo(::std::ostream* os) const override {
@@ -2910,18 +3246,18 @@ class PairMatcherImpl : public MatcherInterface<PairType> {
     if (!listener->IsInterested()) {
       // If the listener is not interested, we don't need to construct the
       // explanation.
-      return first_matcher_.Matches(pair_getters::First(a_pair, Rank0())) &&
-             second_matcher_.Matches(pair_getters::Second(a_pair, Rank0()));
+      return first_matcher_.Matches(pair_getters::First(a_pair, Rank1())) &&
+             second_matcher_.Matches(pair_getters::Second(a_pair, Rank1()));
     }
     StringMatchResultListener first_inner_listener;
-    if (!first_matcher_.MatchAndExplain(pair_getters::First(a_pair, Rank0()),
+    if (!first_matcher_.MatchAndExplain(pair_getters::First(a_pair, Rank1()),
                                         &first_inner_listener)) {
       *listener << "whose first field does not match";
       PrintIfNotEmpty(first_inner_listener.str(), listener->stream());
       return false;
     }
     StringMatchResultListener second_inner_listener;
-    if (!second_matcher_.MatchAndExplain(pair_getters::Second(a_pair, Rank0()),
+    if (!second_matcher_.MatchAndExplain(pair_getters::Second(a_pair, Rank1()),
                                          &second_inner_listener)) {
       *listener << "whose second field does not match";
       PrintIfNotEmpty(second_inner_listener.str(), listener->stream());
@@ -2937,12 +3273,12 @@ class PairMatcherImpl : public MatcherInterface<PairType> {
                       const std::string& second_explanation,
                       MatchResultListener* listener) const {
     *listener << "whose both fields match";
-    if (first_explanation != "") {
+    if (!first_explanation.empty()) {
       *listener << ", where the first field is a value " << first_explanation;
     }
-    if (second_explanation != "") {
+    if (!second_explanation.empty()) {
       *listener << ", ";
-      if (first_explanation != "") {
+      if (!first_explanation.empty()) {
         *listener << "and ";
       } else {
         *listener << "where ";
@@ -2963,7 +3299,7 @@ class PairMatcher {
       : first_matcher_(first_matcher), second_matcher_(second_matcher) {}
 
   template <typename PairType>
-  operator Matcher<PairType> () const {
+  operator Matcher<PairType>() const {
     return Matcher<PairType>(
         new PairMatcherImpl<const PairType&>(first_matcher_, second_matcher_));
   }
@@ -2974,7 +3310,7 @@ class PairMatcher {
 };
 
 template <typename T, size_t... I>
-auto UnpackStructImpl(const T& t, IndexSequence<I...>, int)
+auto UnpackStructImpl(const T& t, std::index_sequence<I...>, int)
     -> decltype(std::tie(get<I>(t)...)) {
   static_assert(std::tuple_size<T>::value == sizeof...(I),
                 "Number of arguments doesn't match the number of fields.");
@@ -2983,91 +3319,126 @@ auto UnpackStructImpl(const T& t, IndexSequence<I...>, int)
 
 #if defined(__cpp_structured_bindings) && __cpp_structured_bindings >= 201606
 template <typename T>
-auto UnpackStructImpl(const T& t, MakeIndexSequence<1>, char) {
+auto UnpackStructImpl(const T& t, std::make_index_sequence<1>, char) {
   const auto& [a] = t;
   return std::tie(a);
 }
 template <typename T>
-auto UnpackStructImpl(const T& t, MakeIndexSequence<2>, char) {
+auto UnpackStructImpl(const T& t, std::make_index_sequence<2>, char) {
   const auto& [a, b] = t;
   return std::tie(a, b);
 }
 template <typename T>
-auto UnpackStructImpl(const T& t, MakeIndexSequence<3>, char) {
+auto UnpackStructImpl(const T& t, std::make_index_sequence<3>, char) {
   const auto& [a, b, c] = t;
   return std::tie(a, b, c);
 }
 template <typename T>
-auto UnpackStructImpl(const T& t, MakeIndexSequence<4>, char) {
+auto UnpackStructImpl(const T& t, std::make_index_sequence<4>, char) {
   const auto& [a, b, c, d] = t;
   return std::tie(a, b, c, d);
 }
 template <typename T>
-auto UnpackStructImpl(const T& t, MakeIndexSequence<5>, char) {
+auto UnpackStructImpl(const T& t, std::make_index_sequence<5>, char) {
   const auto& [a, b, c, d, e] = t;
   return std::tie(a, b, c, d, e);
 }
 template <typename T>
-auto UnpackStructImpl(const T& t, MakeIndexSequence<6>, char) {
+auto UnpackStructImpl(const T& t, std::make_index_sequence<6>, char) {
   const auto& [a, b, c, d, e, f] = t;
   return std::tie(a, b, c, d, e, f);
 }
 template <typename T>
-auto UnpackStructImpl(const T& t, MakeIndexSequence<7>, char) {
+auto UnpackStructImpl(const T& t, std::make_index_sequence<7>, char) {
   const auto& [a, b, c, d, e, f, g] = t;
   return std::tie(a, b, c, d, e, f, g);
 }
 template <typename T>
-auto UnpackStructImpl(const T& t, MakeIndexSequence<8>, char) {
+auto UnpackStructImpl(const T& t, std::make_index_sequence<8>, char) {
   const auto& [a, b, c, d, e, f, g, h] = t;
   return std::tie(a, b, c, d, e, f, g, h);
 }
 template <typename T>
-auto UnpackStructImpl(const T& t, MakeIndexSequence<9>, char) {
+auto UnpackStructImpl(const T& t, std::make_index_sequence<9>, char) {
   const auto& [a, b, c, d, e, f, g, h, i] = t;
   return std::tie(a, b, c, d, e, f, g, h, i);
 }
 template <typename T>
-auto UnpackStructImpl(const T& t, MakeIndexSequence<10>, char) {
+auto UnpackStructImpl(const T& t, std::make_index_sequence<10>, char) {
   const auto& [a, b, c, d, e, f, g, h, i, j] = t;
   return std::tie(a, b, c, d, e, f, g, h, i, j);
 }
 template <typename T>
-auto UnpackStructImpl(const T& t, MakeIndexSequence<11>, char) {
+auto UnpackStructImpl(const T& t, std::make_index_sequence<11>, char) {
   const auto& [a, b, c, d, e, f, g, h, i, j, k] = t;
   return std::tie(a, b, c, d, e, f, g, h, i, j, k);
 }
 template <typename T>
-auto UnpackStructImpl(const T& t, MakeIndexSequence<12>, char) {
+auto UnpackStructImpl(const T& t, std::make_index_sequence<12>, char) {
   const auto& [a, b, c, d, e, f, g, h, i, j, k, l] = t;
   return std::tie(a, b, c, d, e, f, g, h, i, j, k, l);
 }
 template <typename T>
-auto UnpackStructImpl(const T& t, MakeIndexSequence<13>, char) {
+auto UnpackStructImpl(const T& t, std::make_index_sequence<13>, char) {
   const auto& [a, b, c, d, e, f, g, h, i, j, k, l, m] = t;
   return std::tie(a, b, c, d, e, f, g, h, i, j, k, l, m);
 }
 template <typename T>
-auto UnpackStructImpl(const T& t, MakeIndexSequence<14>, char) {
+auto UnpackStructImpl(const T& t, std::make_index_sequence<14>, char) {
   const auto& [a, b, c, d, e, f, g, h, i, j, k, l, m, n] = t;
   return std::tie(a, b, c, d, e, f, g, h, i, j, k, l, m, n);
 }
 template <typename T>
-auto UnpackStructImpl(const T& t, MakeIndexSequence<15>, char) {
+auto UnpackStructImpl(const T& t, std::make_index_sequence<15>, char) {
   const auto& [a, b, c, d, e, f, g, h, i, j, k, l, m, n, o] = t;
   return std::tie(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o);
 }
 template <typename T>
-auto UnpackStructImpl(const T& t, MakeIndexSequence<16>, char) {
+auto UnpackStructImpl(const T& t, std::make_index_sequence<16>, char) {
   const auto& [a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p] = t;
   return std::tie(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p);
 }
+template <typename T>
+auto UnpackStructImpl(const T& t, std::make_index_sequence<17>, char) {
+  const auto& [a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q] = t;
+  return std::tie(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q);
+}
+template <typename T>
+auto UnpackStructImpl(const T& t, std::make_index_sequence<18>, char) {
+  const auto& [a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r] = t;
+  return std::tie(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r);
+}
+template <typename T>
+auto UnpackStructImpl(const T& t, std::make_index_sequence<19>, char) {
+  const auto& [a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s] = t;
+  return std::tie(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s);
+}
+template <typename T>
+auto UnpackStructImpl(const T& u, std::make_index_sequence<20>, char) {
+  const auto& [a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t] = u;
+  return std::tie(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t);
+}
+template <typename T>
+auto UnpackStructImpl(const T& in, std::make_index_sequence<21>, char) {
+  const auto& [a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u] =
+      in;
+  return std::tie(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t,
+                  u);
+}
+
+template <typename T>
+auto UnpackStructImpl(const T& in, std::make_index_sequence<22>, char) {
+  const auto& [a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u,
+               v] = in;
+  return std::tie(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u,
+                  v);
+}
 #endif  // defined(__cpp_structured_bindings)
 
 template <size_t I, typename T>
 auto UnpackStruct(const T& t)
-    -> decltype((UnpackStructImpl)(t, MakeIndexSequence<I>{}, 0)) {
-  return (UnpackStructImpl)(t, MakeIndexSequence<I>{}, 0);
+    -> decltype((UnpackStructImpl)(t, std::make_index_sequence<I>{}, 0)) {
+  return (UnpackStructImpl)(t, std::make_index_sequence<I>{}, 0);
 }
 
 // Helper function to do comma folding in C++11.
@@ -3080,7 +3451,7 @@ template <typename Struct, typename StructSize>
 class FieldsAreMatcherImpl;
 
 template <typename Struct, size_t... I>
-class FieldsAreMatcherImpl<Struct, IndexSequence<I...>>
+class FieldsAreMatcherImpl<Struct, std::index_sequence<I...>>
     : public MatcherInterface<Struct> {
   using UnpackedType =
       decltype(UnpackStruct<sizeof...(I)>(std::declval<const Struct&>()));
@@ -3162,8 +3533,8 @@ class FieldsAreMatcher {
   template <typename Struct>
   operator Matcher<Struct>() const {  // NOLINT
     return Matcher<Struct>(
-        new FieldsAreMatcherImpl<const Struct&, IndexSequenceFor<Inner...>>(
-            matchers_));
+        new FieldsAreMatcherImpl<const Struct&,
+                                 std::index_sequence_for<Inner...>>(matchers_));
   }
 
  private:
@@ -3235,9 +3606,9 @@ class ElementsAreMatcherImpl : public MatcherInterface<Container> {
     // explanations[i] is the explanation of the element at index i.
     ::std::vector<std::string> explanations(count());
     StlContainerReference stl_container = View::ConstReference(container);
-    typename StlContainer::const_iterator it = stl_container.begin();
+    auto it = stl_container.begin();
     size_t exam_pos = 0;
-    bool mismatch_found = false;  // Have we found a mismatched element yet?
+    bool unmatched_found = false;
 
     // Go through the elements and matchers in pairs, until we reach
     // the end of either the elements or the matchers, or until we find a
@@ -3253,11 +3624,23 @@ class ElementsAreMatcherImpl : public MatcherInterface<Container> {
       }
 
       if (!match) {
-        mismatch_found = true;
+        unmatched_found = true;
+        // We cannot store the iterator for the unmatched element to be used
+        // later, as some users use ElementsAre() with a "container" whose
+        // iterator is not copy-constructible or copy-assignable.
+        //
+        // We cannot store a pointer to the element either, as some container's
+        // iterators return a temporary.
+        //
+        // We cannot store the element itself either, as the element may not be
+        // copyable.
+        //
+        // Therefore, we just remember the index of the unmatched element,
+        // and use it later to print the unmatched element.
         break;
       }
     }
-    // If mismatch_found is true, 'exam_pos' is the index of the mismatch.
+    // If unmatched_found is true, exam_pos is the index of the mismatch.
 
     // Find how many elements the actual container has.  We avoid
     // calling size() s.t. this code works for stream-like "containers"
@@ -3278,10 +3661,27 @@ class ElementsAreMatcherImpl : public MatcherInterface<Container> {
       return false;
     }
 
-    if (mismatch_found) {
+    if (unmatched_found) {
       // The element count matches, but the exam_pos-th element doesn't match.
       if (listener_interested) {
-        *listener << "whose element #" << exam_pos << " doesn't match";
+        // Find the unmatched element.
+        auto unmatched_it = stl_container.begin();
+        // We cannot call std::advance() on the iterator, as some users use
+        // ElementsAre() with a "container" whose iterator is incompatible with
+        // std::advance() (e.g. it may not have the difference_type member
+        // type).
+        for (size_t i = 0; i != exam_pos; ++i) {
+          ++unmatched_it;
+        }
+
+        // If the array is long or the elements' print-out is large, it may be
+        // hard for the user to find the mismatched element and its
+        // corresponding matcher description. Therefore we print the index, the
+        // value of the mismatched element, and the corresponding matcher
+        // description to ease debugging.
+        *listener << "whose element #" << exam_pos << " ("
+                  << PrintToString(*unmatched_it) << ") ";
+        matchers_[exam_pos].DescribeNegationTo(listener->stream());
         PrintIfNotEmpty(explanations[exam_pos], listener->stream());
       }
       return false;
@@ -3312,7 +3712,7 @@ class ElementsAreMatcherImpl : public MatcherInterface<Container> {
 
   size_t count() const { return matchers_.size(); }
 
-  ::std::vector<Matcher<const Element&> > matchers_;
+  ::std::vector<Matcher<const Element&>> matchers_;
 };
 
 // Connectivity matrix of (elements X matchers), in element-major order.
@@ -3324,8 +3724,7 @@ class GTEST_API_ MatchMatrix {
   MatchMatrix(size_t num_elements, size_t num_matchers)
       : num_elements_(num_elements),
         num_matchers_(num_matchers),
-        matched_(num_elements_* num_matchers_, 0) {
-  }
+        matched_(num_elements_ * num_matchers_, 0) {}
 
   size_t LhsSize() const { return num_elements_; }
   size_t RhsSize() const { return num_matchers_; }
@@ -3364,8 +3763,7 @@ typedef ::std::vector<ElementMatcherPair> ElementMatcherPairs;
 
 // Returns a maximum bipartite matching for the specified graph 'g'.
 // The matching is represented as a vector of {element, matcher} pairs.
-GTEST_API_ ElementMatcherPairs
-FindMaxBipartiteMatching(const MatchMatrix& g);
+GTEST_API_ ElementMatcherPairs FindMaxBipartiteMatching(const MatchMatrix& g);
 
 struct UnorderedMatcherRequire {
   enum Flags {
@@ -3402,9 +3800,7 @@ class GTEST_API_ UnorderedElementsAreMatcherImplBase {
   bool FindPairing(const MatchMatrix& matrix,
                    MatchResultListener* listener) const;
 
-  MatcherDescriberVec& matcher_describers() {
-    return matcher_describers_;
-  }
+  MatcherDescriberVec& matcher_describers() { return matcher_describers_; }
 
   static Message Elements(size_t n) {
     return Message() << n << " element" << (n == 1 ? "" : "s");
@@ -3428,7 +3824,6 @@ class UnorderedElementsAreMatcherImpl
   typedef internal::StlContainerView<RawContainer> View;
   typedef typename View::type StlContainer;
   typedef typename View::const_reference StlContainerReference;
-  typedef typename StlContainer::const_iterator StlContainerConstIterator;
   typedef typename StlContainer::value_type Element;
 
   template <typename InputIter>
@@ -3461,23 +3856,6 @@ class UnorderedElementsAreMatcherImpl
         AnalyzeElements(stl_container.begin(), stl_container.end(),
                         &element_printouts, listener);
 
-    if (matrix.LhsSize() == 0 && matrix.RhsSize() == 0) {
-      return true;
-    }
-
-    if (match_flags() == UnorderedMatcherRequire::ExactMatch) {
-      if (matrix.LhsSize() != matrix.RhsSize()) {
-        // The element count doesn't match.  If the container is empty,
-        // there's no need to explain anything as Google Mock already
-        // prints the empty container. Otherwise we just need to show
-        // how many elements there actually are.
-        if (matrix.LhsSize() != 0 && listener->IsInterested()) {
-          *listener << "which has " << Elements(matrix.LhsSize());
-        }
-        return false;
-      }
-    }
-
     return VerifyMatchMatrix(element_printouts, matrix, listener) &&
            FindPairing(matrix, listener);
   }
@@ -3511,7 +3889,7 @@ class UnorderedElementsAreMatcherImpl
     return matrix;
   }
 
-  ::std::vector<Matcher<const Element&> > matchers_;
+  ::std::vector<Matcher<const Element&>> matchers_;
 };
 
 // Functor for use in TransformTuple.
@@ -3536,7 +3914,7 @@ class UnorderedElementsAreMatcher {
     typedef GTEST_REMOVE_REFERENCE_AND_CONST_(Container) RawContainer;
     typedef typename internal::StlContainerView<RawContainer>::type View;
     typedef typename View::value_type Element;
-    typedef ::std::vector<Matcher<const Element&> > MatcherVec;
+    typedef ::std::vector<Matcher<const Element&>> MatcherVec;
     MatcherVec matchers;
     matchers.reserve(::std::tuple_size<MatcherTuple>::value);
     TransformTupleValues(CastAndAppendTransform<const Element&>(), matchers_,
@@ -3559,15 +3937,15 @@ class ElementsAreMatcher {
 
   template <typename Container>
   operator Matcher<Container>() const {
-    GTEST_COMPILE_ASSERT_(
+    static_assert(
         !IsHashTable<GTEST_REMOVE_REFERENCE_AND_CONST_(Container)>::value ||
             ::std::tuple_size<MatcherTuple>::value < 2,
-        use_UnorderedElementsAre_with_hash_tables);
+        "use UnorderedElementsAre with hash tables");
 
     typedef GTEST_REMOVE_REFERENCE_AND_CONST_(Container) RawContainer;
     typedef typename internal::StlContainerView<RawContainer>::type View;
     typedef typename View::value_type Element;
-    typedef ::std::vector<Matcher<const Element&> > MatcherVec;
+    typedef ::std::vector<Matcher<const Element&>> MatcherVec;
     MatcherVec matchers;
     matchers.reserve(::std::tuple_size<MatcherTuple>::value);
     TransformTupleValues(CastAndAppendTransform<const Element&>(), matchers_,
@@ -3598,7 +3976,7 @@ class UnorderedElementsAreArrayMatcher {
 
  private:
   UnorderedMatcherRequire::Flags match_flags_;
-  ::std::vector<T> matchers_;
+  std::vector<std::remove_const_t<T>> matchers_;
 };
 
 // Implements ElementsAreArray().
@@ -3610,16 +3988,16 @@ class ElementsAreArrayMatcher {
 
   template <typename Container>
   operator Matcher<Container>() const {
-    GTEST_COMPILE_ASSERT_(
+    static_assert(
         !IsHashTable<GTEST_REMOVE_REFERENCE_AND_CONST_(Container)>::value,
-        use_UnorderedElementsAreArray_with_hash_tables);
+        "use UnorderedElementsAreArray with hash tables");
 
     return Matcher<Container>(new ElementsAreMatcherImpl<const Container&>(
         matchers_.begin(), matchers_.end()));
   }
 
  private:
-  const ::std::vector<T> matchers_;
+  const std::vector<std::remove_const_t<T>> matchers_;
 };
 
 // Given a 2-tuple matcher tm of type Tuple2Matcher and a value second
@@ -3702,9 +4080,24 @@ BoundSecondMatcher<Tuple2Matcher, Second> MatcherBindSecond(
 // 'negation' is false; otherwise returns the description of the
 // negation of the matcher.  'param_values' contains a list of strings
 // that are the print-out of the matcher's parameters.
-GTEST_API_ std::string FormatMatcherDescription(bool negation,
-                                                const char* matcher_name,
-                                                const Strings& param_values);
+GTEST_API_ std::string FormatMatcherDescription(
+    bool negation, const char* matcher_name,
+    const std::vector<const char*>& param_names, const Strings& param_values);
+
+// Overloads to support `OptionalMatcher` being used with a type that either
+// supports implicit conversion to bool or a `has_value()` method.
+template <typename Optional>
+auto IsOptionalEngaged(const Optional& optional, Rank1)
+    -> decltype(!!optional) {
+  // The use of double-negation here is to preserve historical behavior where
+  // the matcher used `operator!` rather than directly using `operator bool`.
+  return !static_cast<bool>(!optional);
+}
+template <typename Optional>
+auto IsOptionalEngaged(const Optional& optional, Rank0)
+    -> decltype(!optional.has_value()) {
+  return optional.has_value();
+}
 
 // Implements a matcher that checks the value of a optional<> type variable.
 template <typename ValueMatcher>
@@ -3738,11 +4131,15 @@ class OptionalMatcher {
 
     bool MatchAndExplain(Optional optional,
                          MatchResultListener* listener) const override {
-      if (!optional) {
+      if (!IsOptionalEngaged(optional, HighestRank())) {
         *listener << "which is not engaged";
         return false;
       }
       const ValueType& value = *optional;
+      if (!listener->IsInterested()) {
+        // Fast path to avoid unnecessary generation of match explanation.
+        return value_matcher_.Matches(value);
+      }
       StringMatchResultListener value_listener;
       const bool match = value_matcher_.MatchAndExplain(value, &value_listener);
       *listener << "whose value " << PrintToString(value)
@@ -3932,7 +4329,12 @@ class ArgsMatcherImpl : public MatcherInterface<ArgsTuple> {
     const char* sep = "";
     // Workaround spurious C4189 on MSVC<=15.7 when k is empty.
     (void)sep;
-    const char* dummy[] = {"", (*os << sep << "#" << k, sep = ", ")...};
+    // The static_cast to void is needed to silence Clang's -Wcomma warning.
+    // This pattern looks suspiciously like we may have mismatched parentheses
+    // and may have been trying to use the first operation of the comma operator
+    // as a member of the array, so Clang warns that we may have made a mistake.
+    const char* dummy[] = {
+        "", (static_cast<void>(*os << sep << "#" << k), sep = ", ")...};
     (void)dummy;
     *os << ") ";
   }
@@ -3981,26 +4383,26 @@ ElementsAreArray(Iter first, Iter last) {
 }
 
 template <typename T>
-inline internal::ElementsAreArrayMatcher<T> ElementsAreArray(
-    const T* pointer, size_t count) {
+inline auto ElementsAreArray(const T* pointer, size_t count)
+    -> decltype(ElementsAreArray(pointer, pointer + count)) {
   return ElementsAreArray(pointer, pointer + count);
 }
 
 template <typename T, size_t N>
-inline internal::ElementsAreArrayMatcher<T> ElementsAreArray(
-    const T (&array)[N]) {
+inline auto ElementsAreArray(const T (&array)[N])
+    -> decltype(ElementsAreArray(array, N)) {
   return ElementsAreArray(array, N);
 }
 
 template <typename Container>
-inline internal::ElementsAreArrayMatcher<typename Container::value_type>
-ElementsAreArray(const Container& container) {
+inline auto ElementsAreArray(const Container& container)
+    -> decltype(ElementsAreArray(container.begin(), container.end())) {
   return ElementsAreArray(container.begin(), container.end());
 }
 
 template <typename T>
-inline internal::ElementsAreArrayMatcher<T>
-ElementsAreArray(::std::initializer_list<T> xs) {
+inline auto ElementsAreArray(::std::initializer_list<T> xs)
+    -> decltype(ElementsAreArray(xs.begin(), xs.end())) {
   return ElementsAreArray(xs.begin(), xs.end());
 }
 
@@ -4027,14 +4429,14 @@ UnorderedElementsAreArray(Iter first, Iter last) {
 }
 
 template <typename T>
-inline internal::UnorderedElementsAreArrayMatcher<T>
-UnorderedElementsAreArray(const T* pointer, size_t count) {
+inline internal::UnorderedElementsAreArrayMatcher<T> UnorderedElementsAreArray(
+    const T* pointer, size_t count) {
   return UnorderedElementsAreArray(pointer, pointer + count);
 }
 
 template <typename T, size_t N>
-inline internal::UnorderedElementsAreArrayMatcher<T>
-UnorderedElementsAreArray(const T (&array)[N]) {
+inline internal::UnorderedElementsAreArrayMatcher<T> UnorderedElementsAreArray(
+    const T (&array)[N]) {
   return UnorderedElementsAreArray(array, N);
 }
 
@@ -4046,8 +4448,8 @@ UnorderedElementsAreArray(const Container& container) {
 }
 
 template <typename T>
-inline internal::UnorderedElementsAreArrayMatcher<T>
-UnorderedElementsAreArray(::std::initializer_list<T> xs) {
+inline internal::UnorderedElementsAreArrayMatcher<T> UnorderedElementsAreArray(
+    ::std::initializer_list<T> xs) {
   return UnorderedElementsAreArray(xs.begin(), xs.end());
 }
 
@@ -4081,14 +4483,14 @@ Matcher<T> internal::MatcherCastImpl<T, M>::CastImpl(
 }
 
 // Creates a polymorphic matcher that matches any NULL pointer.
-inline PolymorphicMatcher<internal::IsNullMatcher > IsNull() {
+inline PolymorphicMatcher<internal::IsNullMatcher> IsNull() {
   return MakePolymorphicMatcher(internal::IsNullMatcher());
 }
 
 // Creates a polymorphic matcher that matches any non-NULL pointer.
 // This is convenient as Not(NULL) doesn't compile (the compiler
 // thinks that that expression is comparing a pointer with an integer).
-inline PolymorphicMatcher<internal::NotNullMatcher > NotNull() {
+inline PolymorphicMatcher<internal::NotNullMatcher> NotNull() {
   return MakePolymorphicMatcher(internal::NotNullMatcher());
 }
 
@@ -4119,11 +4521,47 @@ inline internal::FloatingEqMatcher<double> NanSensitiveDoubleEq(double rhs) {
 // Creates a matcher that matches any double argument approximately equal to
 // rhs, up to the specified max absolute error bound, where two NANs are
 // considered unequal.  The max absolute error bound must be non-negative.
-inline internal::FloatingEqMatcher<double> DoubleNear(
-    double rhs, double max_abs_error) {
+inline internal::FloatingEqMatcher<double> DoubleNear(double rhs,
+                                                      double max_abs_error) {
   return internal::FloatingEqMatcher<double>(rhs, false, max_abs_error);
 }
 
+// The DistanceFrom(target, get_distance, m) and DistanceFrom(target, m)
+// matchers work on arbitrary types that have the "distance" concept. What they
+// do:
+//
+// 1. compute the distance between the value and the target using
+//    get_distance(value, target) if get_distance is provided; otherwise compute
+//    the distance as abs(value - target).
+// 2. match the distance against the user-provided matcher m; if the match
+//    succeeds, the DistanceFrom() match succeeds.
+//
+// Examples:
+//
+//   // 0.5's distance from 0.6 should be <= 0.2.
+//   EXPECT_THAT(0.5, DistanceFrom(0.6, Le(0.2)));
+//
+//   Vector2D v1(3.0, 4.0), v2(3.2, 6.0);
+//   // v1's distance from v2, as computed by EuclideanDistance(v1, v2),
+//   // should be >= 1.0.
+//   EXPECT_THAT(v1, DistanceFrom(v2, EuclideanDistance, Ge(1.0)));
+
+template <typename T, typename GetDistance, typename DistanceMatcher>
+inline internal::DistanceFromMatcher<T, GetDistance, DistanceMatcher>
+DistanceFrom(T target, GetDistance get_distance,
+             DistanceMatcher distance_matcher) {
+  return internal::DistanceFromMatcher<T, GetDistance, DistanceMatcher>(
+      std::move(target), std::move(get_distance), std::move(distance_matcher));
+}
+
+template <typename T, typename DistanceMatcher>
+inline internal::DistanceFromMatcher<T, internal::DefaultGetDistance,
+                                     DistanceMatcher>
+DistanceFrom(T target, DistanceMatcher distance_matcher) {
+  return DistanceFrom(std::move(target), internal::DefaultGetDistance(),
+                      std::move(distance_matcher));
+}
+
 // Creates a matcher that matches any double argument approximately equal to
 // rhs, up to the specified max absolute error bound, including NaN values when
 // rhs is NaN.  The max absolute error bound must be non-negative.
@@ -4147,8 +4585,8 @@ inline internal::FloatingEqMatcher<float> NanSensitiveFloatEq(float rhs) {
 // Creates a matcher that matches any float argument approximately equal to
 // rhs, up to the specified max absolute error bound, where two NANs are
 // considered unequal.  The max absolute error bound must be non-negative.
-inline internal::FloatingEqMatcher<float> FloatNear(
-    float rhs, float max_abs_error) {
+inline internal::FloatingEqMatcher<float> FloatNear(float rhs,
+                                                    float max_abs_error) {
   return internal::FloatingEqMatcher<float>(rhs, false, max_abs_error);
 }
 
@@ -4176,7 +4614,7 @@ inline internal::PointeeMatcher<InnerMatcher> Pointee(
 // If To is a reference and the cast fails, this matcher returns false
 // immediately.
 template <typename To>
-inline PolymorphicMatcher<internal::WhenDynamicCastToMatcher<To> >
+inline PolymorphicMatcher<internal::WhenDynamicCastToMatcher<To>>
 WhenDynamicCastTo(const Matcher<To>& inner_matcher) {
   return MakePolymorphicMatcher(
       internal::WhenDynamicCastToMatcher<To>(inner_matcher));
@@ -4188,12 +4626,10 @@ WhenDynamicCastTo(const Matcher<To>& inner_matcher) {
 //   Field(&Foo::number, Ge(5))
 // matches a Foo object x if and only if x.number >= 5.
 template <typename Class, typename FieldType, typename FieldMatcher>
-inline PolymorphicMatcher<
-  internal::FieldMatcher<Class, FieldType> > Field(
-    FieldType Class::*field, const FieldMatcher& matcher) {
-  return MakePolymorphicMatcher(
-      internal::FieldMatcher<Class, FieldType>(
-          field, MatcherCast<const FieldType&>(matcher)));
+inline PolymorphicMatcher<internal::FieldMatcher<Class, FieldType>> Field(
+    FieldType Class::* field, const FieldMatcher& matcher) {
+  return MakePolymorphicMatcher(internal::FieldMatcher<Class, FieldType>(
+      field, MatcherCast<const FieldType&>(matcher)));
   // The call to MatcherCast() is required for supporting inner
   // matchers of compatible types.  For example, it allows
   //   Field(&Foo::bar, m)
@@ -4203,8 +4639,8 @@ inline PolymorphicMatcher<
 // Same as Field() but also takes the name of the field to provide better error
 // messages.
 template <typename Class, typename FieldType, typename FieldMatcher>
-inline PolymorphicMatcher<internal::FieldMatcher<Class, FieldType> > Field(
-    const std::string& field_name, FieldType Class::*field,
+inline PolymorphicMatcher<internal::FieldMatcher<Class, FieldType>> Field(
+    const std::string& field_name, FieldType Class::* field,
     const FieldMatcher& matcher) {
   return MakePolymorphicMatcher(internal::FieldMatcher<Class, FieldType>(
       field_name, field, MatcherCast<const FieldType&>(matcher)));
@@ -4214,9 +4650,13 @@ inline PolymorphicMatcher<internal::FieldMatcher<Class, FieldType> > Field(
 // matches 'matcher'.  For example,
 //   Property(&Foo::str, StartsWith("hi"))
 // matches a Foo object x if and only if x.str() starts with "hi".
+//
+// Warning: Don't use `Property()` against member functions that you do not
+// own, because taking addresses of functions is fragile and generally not part
+// of the contract of the function.
 template <typename Class, typename PropertyType, typename PropertyMatcher>
 inline PolymorphicMatcher<internal::PropertyMatcher<
-    Class, PropertyType, PropertyType (Class::*)() const> >
+    Class, PropertyType, PropertyType (Class::*)() const>>
 Property(PropertyType (Class::*property)() const,
          const PropertyMatcher& matcher) {
   return MakePolymorphicMatcher(
@@ -4233,7 +4673,7 @@ Property(PropertyType (Class::*property)() const,
 // better error messages.
 template <typename Class, typename PropertyType, typename PropertyMatcher>
 inline PolymorphicMatcher<internal::PropertyMatcher<
-    Class, PropertyType, PropertyType (Class::*)() const> >
+    Class, PropertyType, PropertyType (Class::*)() const>>
 Property(const std::string& property_name,
          PropertyType (Class::*property)() const,
          const PropertyMatcher& matcher) {
@@ -4246,8 +4686,8 @@ Property(const std::string& property_name,
 // The same as above but for reference-qualified member functions.
 template <typename Class, typename PropertyType, typename PropertyMatcher>
 inline PolymorphicMatcher<internal::PropertyMatcher<
-    Class, PropertyType, PropertyType (Class::*)() const &> >
-Property(PropertyType (Class::*property)() const &,
+    Class, PropertyType, PropertyType (Class::*)() const&>>
+Property(PropertyType (Class::*property)() const&,
          const PropertyMatcher& matcher) {
   return MakePolymorphicMatcher(
       internal::PropertyMatcher<Class, PropertyType,
@@ -4258,9 +4698,9 @@ Property(PropertyType (Class::*property)() const &,
 // Three-argument form for reference-qualified member functions.
 template <typename Class, typename PropertyType, typename PropertyMatcher>
 inline PolymorphicMatcher<internal::PropertyMatcher<
-    Class, PropertyType, PropertyType (Class::*)() const &> >
+    Class, PropertyType, PropertyType (Class::*)() const&>>
 Property(const std::string& property_name,
-         PropertyType (Class::*property)() const &,
+         PropertyType (Class::*property)() const&,
          const PropertyMatcher& matcher) {
   return MakePolymorphicMatcher(
       internal::PropertyMatcher<Class, PropertyType,
@@ -4279,15 +4719,25 @@ Property(const std::string& property_name,
 template <typename Callable, typename InnerMatcher>
 internal::ResultOfMatcher<Callable, InnerMatcher> ResultOf(
     Callable callable, InnerMatcher matcher) {
+  return internal::ResultOfMatcher<Callable, InnerMatcher>(std::move(callable),
+                                                           std::move(matcher));
+}
+
+// Same as ResultOf() above, but also takes a description of the `callable`
+// result to provide better error messages.
+template <typename Callable, typename InnerMatcher>
+internal::ResultOfMatcher<Callable, InnerMatcher> ResultOf(
+    const std::string& result_description, Callable callable,
+    InnerMatcher matcher) {
   return internal::ResultOfMatcher<Callable, InnerMatcher>(
-      std::move(callable), std::move(matcher));
+      result_description, std::move(callable), std::move(matcher));
 }
 
 // String matchers.
 
 // Matches a string equal to str.
 template <typename T = std::string>
-PolymorphicMatcher<internal::StrEqualityMatcher<std::string> > StrEq(
+PolymorphicMatcher<internal::StrEqualityMatcher<std::string>> StrEq(
     const internal::StringLike<T>& str) {
   return MakePolymorphicMatcher(
       internal::StrEqualityMatcher<std::string>(std::string(str), true, true));
@@ -4295,7 +4745,7 @@ PolymorphicMatcher<internal::StrEqualityMatcher<std::string> > StrEq(
 
 // Matches a string not equal to str.
 template <typename T = std::string>
-PolymorphicMatcher<internal::StrEqualityMatcher<std::string> > StrNe(
+PolymorphicMatcher<internal::StrEqualityMatcher<std::string>> StrNe(
     const internal::StringLike<T>& str) {
   return MakePolymorphicMatcher(
       internal::StrEqualityMatcher<std::string>(std::string(str), false, true));
@@ -4303,7 +4753,7 @@ PolymorphicMatcher<internal::StrEqualityMatcher<std::string> > StrNe(
 
 // Matches a string equal to str, ignoring case.
 template <typename T = std::string>
-PolymorphicMatcher<internal::StrEqualityMatcher<std::string> > StrCaseEq(
+PolymorphicMatcher<internal::StrEqualityMatcher<std::string>> StrCaseEq(
     const internal::StringLike<T>& str) {
   return MakePolymorphicMatcher(
       internal::StrEqualityMatcher<std::string>(std::string(str), true, false));
@@ -4311,7 +4761,7 @@ PolymorphicMatcher<internal::StrEqualityMatcher<std::string> > StrCaseEq(
 
 // Matches a string not equal to str, ignoring case.
 template <typename T = std::string>
-PolymorphicMatcher<internal::StrEqualityMatcher<std::string> > StrCaseNe(
+PolymorphicMatcher<internal::StrEqualityMatcher<std::string>> StrCaseNe(
     const internal::StringLike<T>& str) {
   return MakePolymorphicMatcher(internal::StrEqualityMatcher<std::string>(
       std::string(str), false, false));
@@ -4320,7 +4770,7 @@ PolymorphicMatcher<internal::StrEqualityMatcher<std::string> > StrCaseNe(
 // Creates a matcher that matches any string, std::string, or C string
 // that contains the given substring.
 template <typename T = std::string>
-PolymorphicMatcher<internal::HasSubstrMatcher<std::string> > HasSubstr(
+PolymorphicMatcher<internal::HasSubstrMatcher<std::string>> HasSubstr(
     const internal::StringLike<T>& substring) {
   return MakePolymorphicMatcher(
       internal::HasSubstrMatcher<std::string>(std::string(substring)));
@@ -4328,7 +4778,7 @@ PolymorphicMatcher<internal::HasSubstrMatcher<std::string> > HasSubstr(
 
 // Matches a string that starts with 'prefix' (case-sensitive).
 template <typename T = std::string>
-PolymorphicMatcher<internal::StartsWithMatcher<std::string> > StartsWith(
+PolymorphicMatcher<internal::StartsWithMatcher<std::string>> StartsWith(
     const internal::StringLike<T>& prefix) {
   return MakePolymorphicMatcher(
       internal::StartsWithMatcher<std::string>(std::string(prefix)));
@@ -4336,7 +4786,7 @@ PolymorphicMatcher<internal::StartsWithMatcher<std::string> > StartsWith(
 
 // Matches a string that ends with 'suffix' (case-sensitive).
 template <typename T = std::string>
-PolymorphicMatcher<internal::EndsWithMatcher<std::string> > EndsWith(
+PolymorphicMatcher<internal::EndsWithMatcher<std::string>> EndsWith(
     const internal::StringLike<T>& suffix) {
   return MakePolymorphicMatcher(
       internal::EndsWithMatcher<std::string>(std::string(suffix)));
@@ -4346,50 +4796,50 @@ PolymorphicMatcher<internal::EndsWithMatcher<std::string> > EndsWith(
 // Wide string matchers.
 
 // Matches a string equal to str.
-inline PolymorphicMatcher<internal::StrEqualityMatcher<std::wstring> > StrEq(
+inline PolymorphicMatcher<internal::StrEqualityMatcher<std::wstring>> StrEq(
     const std::wstring& str) {
   return MakePolymorphicMatcher(
       internal::StrEqualityMatcher<std::wstring>(str, true, true));
 }
 
 // Matches a string not equal to str.
-inline PolymorphicMatcher<internal::StrEqualityMatcher<std::wstring> > StrNe(
+inline PolymorphicMatcher<internal::StrEqualityMatcher<std::wstring>> StrNe(
     const std::wstring& str) {
   return MakePolymorphicMatcher(
       internal::StrEqualityMatcher<std::wstring>(str, false, true));
 }
 
 // Matches a string equal to str, ignoring case.
-inline PolymorphicMatcher<internal::StrEqualityMatcher<std::wstring> >
-StrCaseEq(const std::wstring& str) {
+inline PolymorphicMatcher<internal::StrEqualityMatcher<std::wstring>> StrCaseEq(
+    const std::wstring& str) {
   return MakePolymorphicMatcher(
       internal::StrEqualityMatcher<std::wstring>(str, true, false));
 }
 
 // Matches a string not equal to str, ignoring case.
-inline PolymorphicMatcher<internal::StrEqualityMatcher<std::wstring> >
-StrCaseNe(const std::wstring& str) {
+inline PolymorphicMatcher<internal::StrEqualityMatcher<std::wstring>> StrCaseNe(
+    const std::wstring& str) {
   return MakePolymorphicMatcher(
       internal::StrEqualityMatcher<std::wstring>(str, false, false));
 }
 
 // Creates a matcher that matches any ::wstring, std::wstring, or C wide string
 // that contains the given substring.
-inline PolymorphicMatcher<internal::HasSubstrMatcher<std::wstring> > HasSubstr(
+inline PolymorphicMatcher<internal::HasSubstrMatcher<std::wstring>> HasSubstr(
     const std::wstring& substring) {
   return MakePolymorphicMatcher(
       internal::HasSubstrMatcher<std::wstring>(substring));
 }
 
 // Matches a string that starts with 'prefix' (case-sensitive).
-inline PolymorphicMatcher<internal::StartsWithMatcher<std::wstring> >
-StartsWith(const std::wstring& prefix) {
+inline PolymorphicMatcher<internal::StartsWithMatcher<std::wstring>> StartsWith(
+    const std::wstring& prefix) {
   return MakePolymorphicMatcher(
       internal::StartsWithMatcher<std::wstring>(prefix));
 }
 
 // Matches a string that ends with 'suffix' (case-sensitive).
-inline PolymorphicMatcher<internal::EndsWithMatcher<std::wstring> > EndsWith(
+inline PolymorphicMatcher<internal::EndsWithMatcher<std::wstring>> EndsWith(
     const std::wstring& suffix) {
   return MakePolymorphicMatcher(
       internal::EndsWithMatcher<std::wstring>(suffix));
@@ -4484,8 +4934,8 @@ inline internal::NotMatcher<InnerMatcher> Not(InnerMatcher m) {
 // predicate.  The predicate can be any unary function or functor
 // whose return type can be implicitly converted to bool.
 template <typename Predicate>
-inline PolymorphicMatcher<internal::TrulyMatcher<Predicate> >
-Truly(Predicate pred) {
+inline PolymorphicMatcher<internal::TrulyMatcher<Predicate>> Truly(
+    Predicate pred) {
   return MakePolymorphicMatcher(internal::TrulyMatcher<Predicate>(pred));
 }
 
@@ -4496,8 +4946,8 @@ Truly(Predicate pred) {
 //   EXPECT_THAT(container, SizeIs(2));     // Checks container has 2 elements.
 //   EXPECT_THAT(container, SizeIs(Le(2));  // Checks container has at most 2.
 template <typename SizeMatcher>
-inline internal::SizeIsMatcher<SizeMatcher>
-SizeIs(const SizeMatcher& size_matcher) {
+inline internal::SizeIsMatcher<SizeMatcher> SizeIs(
+    const SizeMatcher& size_matcher) {
   return internal::SizeIsMatcher<SizeMatcher>(size_matcher);
 }
 
@@ -4507,8 +4957,8 @@ SizeIs(const SizeMatcher& size_matcher) {
 // do not implement size(). The container must provide const_iterator (with
 // valid iterator_traits), begin() and end().
 template <typename DistanceMatcher>
-inline internal::BeginEndDistanceIsMatcher<DistanceMatcher>
-BeginEndDistanceIs(const DistanceMatcher& distance_matcher) {
+inline internal::BeginEndDistanceIsMatcher<DistanceMatcher> BeginEndDistanceIs(
+    const DistanceMatcher& distance_matcher) {
   return internal::BeginEndDistanceIsMatcher<DistanceMatcher>(distance_matcher);
 }
 
@@ -4517,8 +4967,8 @@ BeginEndDistanceIs(const DistanceMatcher& distance_matcher) {
 // values that are included in one container but not the other. (Duplicate
 // values and order differences are not explained.)
 template <typename Container>
-inline PolymorphicMatcher<internal::ContainerEqMatcher<
-    typename std::remove_const<Container>::type>>
+inline PolymorphicMatcher<
+    internal::ContainerEqMatcher<typename std::remove_const<Container>::type>>
 ContainerEq(const Container& rhs) {
   return MakePolymorphicMatcher(internal::ContainerEqMatcher<Container>(rhs));
 }
@@ -4526,9 +4976,8 @@ ContainerEq(const Container& rhs) {
 // Returns a matcher that matches a container that, when sorted using
 // the given comparator, matches container_matcher.
 template <typename Comparator, typename ContainerMatcher>
-inline internal::WhenSortedByMatcher<Comparator, ContainerMatcher>
-WhenSortedBy(const Comparator& comparator,
-             const ContainerMatcher& container_matcher) {
+inline internal::WhenSortedByMatcher<Comparator, ContainerMatcher> WhenSortedBy(
+    const Comparator& comparator, const ContainerMatcher& container_matcher) {
   return internal::WhenSortedByMatcher<Comparator, ContainerMatcher>(
       comparator, container_matcher);
 }
@@ -4538,9 +4987,9 @@ WhenSortedBy(const Comparator& comparator,
 template <typename ContainerMatcher>
 inline internal::WhenSortedByMatcher<internal::LessComparator, ContainerMatcher>
 WhenSorted(const ContainerMatcher& container_matcher) {
-  return
-      internal::WhenSortedByMatcher<internal::LessComparator, ContainerMatcher>(
-          internal::LessComparator(), container_matcher);
+  return internal::WhenSortedByMatcher<internal::LessComparator,
+                                       ContainerMatcher>(
+      internal::LessComparator(), container_matcher);
 }
 
 // Matches an STL-style container or a native array that contains the
@@ -4557,15 +5006,14 @@ Pointwise(const TupleMatcher& tuple_matcher, const Container& rhs) {
                                                              rhs);
 }
 
-
 // Supports the Pointwise(m, {a, b, c}) syntax.
 template <typename TupleMatcher, typename T>
-inline internal::PointwiseMatcher<TupleMatcher, std::vector<T> > Pointwise(
-    const TupleMatcher& tuple_matcher, std::initializer_list<T> rhs) {
-  return Pointwise(tuple_matcher, std::vector<T>(rhs));
+inline internal::PointwiseMatcher<TupleMatcher,
+                                  std::vector<std::remove_const_t<T>>>
+Pointwise(const TupleMatcher& tuple_matcher, std::initializer_list<T> rhs) {
+  return Pointwise(tuple_matcher, std::vector<std::remove_const_t<T>>(rhs));
 }
 
-
 // UnorderedPointwise(pair_matcher, rhs) matches an STL-style
 // container or a native array that contains the same number of
 // elements as in rhs, where in some permutation of the container, its
@@ -4594,28 +5042,25 @@ UnorderedPointwise(const Tuple2Matcher& tuple2_matcher,
       RhsView::ConstReference(rhs_container);
 
   // Create a matcher for each element in rhs_container.
-  ::std::vector<internal::BoundSecondMatcher<Tuple2Matcher, Second> > matchers;
-  for (typename RhsStlContainer::const_iterator it = rhs_stl_container.begin();
-       it != rhs_stl_container.end(); ++it) {
-    matchers.push_back(
-        internal::MatcherBindSecond(tuple2_matcher, *it));
+  ::std::vector<internal::BoundSecondMatcher<Tuple2Matcher, Second>> matchers;
+  for (auto it = rhs_stl_container.begin(); it != rhs_stl_container.end();
+       ++it) {
+    matchers.push_back(internal::MatcherBindSecond(tuple2_matcher, *it));
   }
 
   // Delegate the work to UnorderedElementsAreArray().
   return UnorderedElementsAreArray(matchers);
 }
 
-
 // Supports the UnorderedPointwise(m, {a, b, c}) syntax.
 template <typename Tuple2Matcher, typename T>
 inline internal::UnorderedElementsAreArrayMatcher<
-    typename internal::BoundSecondMatcher<Tuple2Matcher, T> >
+    typename internal::BoundSecondMatcher<Tuple2Matcher, T>>
 UnorderedPointwise(const Tuple2Matcher& tuple2_matcher,
                    std::initializer_list<T> rhs) {
   return UnorderedPointwise(tuple2_matcher, std::vector<T>(rhs));
 }
 
-
 // Matches an STL-style container or a native array that contains at
 // least one element matching the given value or matcher.
 //
@@ -4625,7 +5070,7 @@ UnorderedPointwise(const Tuple2Matcher& tuple2_matcher,
 //   page_ids.insert(1);
 //   EXPECT_THAT(page_ids, Contains(1));
 //   EXPECT_THAT(page_ids, Contains(Gt(2)));
-//   EXPECT_THAT(page_ids, Not(Contains(4)));
+//   EXPECT_THAT(page_ids, Not(Contains(4)));  // See below for Times(0)
 //
 //   ::std::map<int, size_t> page_lengths;
 //   page_lengths[1] = 100;
@@ -4634,6 +5079,19 @@ UnorderedPointwise(const Tuple2Matcher& tuple2_matcher,
 //
 //   const char* user_ids[] = { "joe", "mike", "tom" };
 //   EXPECT_THAT(user_ids, Contains(Eq(::std::string("tom"))));
+//
+// The matcher supports a modifier `Times` that allows to check for arbitrary
+// occurrences including testing for absence with Times(0).
+//
+// Examples:
+//   ::std::vector<int> ids;
+//   ids.insert(1);
+//   ids.insert(1);
+//   ids.insert(3);
+//   EXPECT_THAT(ids, Contains(1).Times(2));      // 1 occurs 2 times
+//   EXPECT_THAT(ids, Contains(2).Times(0));      // 2 is not present
+//   EXPECT_THAT(ids, Contains(3).Times(Ge(1)));  // 3 occurs at least once
+
 template <typename M>
 inline internal::ContainsMatcher<M> Contains(M matcher) {
   return internal::ContainsMatcher<M>(matcher);
@@ -4715,7 +5173,7 @@ inline internal::UnorderedElementsAreArrayMatcher<T> IsSupersetOf(
 // - {1} matches IsSubsetOf({Gt(0), Lt(0)}), as 1 matches Gt(0).
 // - {1, -1} matches IsSubsetOf({Lt(0), Gt(0)}), as 1 matches Gt(0) and -1
 //   matches Lt(0).
-// - {1, 2} doesn't matches IsSubsetOf({Gt(0), Lt(0)}), even though 1 and 2 both
+// - {1, 2} doesn't match IsSubsetOf({Gt(0), Lt(0)}), even though 1 and 2 both
 //   match Gt(0). The reason is that different matchers must be used for
 //   elements in different slots of the container.
 //
@@ -4760,7 +5218,7 @@ inline internal::UnorderedElementsAreArrayMatcher<T> IsSubsetOf(
 // Matches an STL-style container or a native array that contains only
 // elements matching the given value or matcher.
 //
-// Each(m) is semantically equivalent to Not(Contains(Not(m))). Only
+// Each(m) is semantically equivalent to `Not(Contains(Not(m)))`. Only
 // the messages are different.
 //
 // Examples:
@@ -4803,13 +5261,25 @@ inline internal::KeyMatcher<M> Key(M inner_matcher) {
 // to match a std::map<int, string> that contains exactly one element whose key
 // is >= 5 and whose value equals "foo".
 template <typename FirstMatcher, typename SecondMatcher>
-inline internal::PairMatcher<FirstMatcher, SecondMatcher>
-Pair(FirstMatcher first_matcher, SecondMatcher second_matcher) {
-  return internal::PairMatcher<FirstMatcher, SecondMatcher>(
-      first_matcher, second_matcher);
+inline internal::PairMatcher<FirstMatcher, SecondMatcher> Pair(
+    FirstMatcher first_matcher, SecondMatcher second_matcher) {
+  return internal::PairMatcher<FirstMatcher, SecondMatcher>(first_matcher,
+                                                            second_matcher);
 }
 
 namespace no_adl {
+// Conditional() creates a matcher that conditionally uses either the first or
+// second matcher provided. For example, we could create an `equal if, and only
+// if' matcher using the Conditional wrapper as follows:
+//
+//   EXPECT_THAT(result, Conditional(condition, Eq(expected), Ne(expected)));
+template <typename MatcherTrue, typename MatcherFalse>
+internal::ConditionalMatcher<MatcherTrue, MatcherFalse> Conditional(
+    bool condition, MatcherTrue matcher_true, MatcherFalse matcher_false) {
+  return internal::ConditionalMatcher<MatcherTrue, MatcherFalse>(
+      condition, std::move(matcher_true), std::move(matcher_false));
+}
+
 // FieldsAre(matchers...) matches piecewise the fields of compatible structs.
 // These include those that support `get<I>(obj)`, and when structured bindings
 // are enabled any class that supports them.
@@ -4836,6 +5306,14 @@ inline internal::AddressMatcher<InnerMatcher> Address(
     const InnerMatcher& inner_matcher) {
   return internal::AddressMatcher<InnerMatcher>(inner_matcher);
 }
+
+// Matches a base64 escaped string, when the unescaped string matches the
+// internal matcher.
+template <typename MatcherType>
+internal::WhenBase64UnescapedMatcher WhenBase64Unescaped(
+    const MatcherType& internal_matcher) {
+  return internal::WhenBase64UnescapedMatcher(internal_matcher);
+}
 }  // namespace no_adl
 
 // Returns a predicate that is satisfied by anything that matches the
@@ -4854,8 +5332,8 @@ inline bool Value(const T& value, M matcher) {
 // Matches the value against the given matcher and explains the match
 // result to listener.
 template <typename T, typename M>
-inline bool ExplainMatchResult(
-    M matcher, const T& value, MatchResultListener* listener) {
+inline bool ExplainMatchResult(M matcher, const T& value,
+                               MatchResultListener* listener) {
   return SafeMatcherCast<const T&>(matcher).MatchAndExplain(value, listener);
 }
 
@@ -4865,7 +5343,8 @@ inline bool ExplainMatchResult(
 //
 // MATCHER_P(XAndYThat, matcher,
 //           "X that " + DescribeMatcher<int>(matcher, negation) +
-//               " and Y that " + DescribeMatcher<double>(matcher, negation)) {
+//               (negation ? " or" : " and") + " Y that " +
+//               DescribeMatcher<double>(matcher, negation)) {
 //   return ExplainMatchResult(matcher, arg.x(), result_listener) &&
 //          ExplainMatchResult(matcher, arg.y(), result_listener);
 // }
@@ -5014,12 +5493,15 @@ internal::ArgsMatcher<typename std::decay<InnerMatcher>::type, k...> Args(
 //
 //   EXPECT_CALL(foo, Bar(_, _)).With(Eq());
 template <typename InnerMatcher>
-inline InnerMatcher AllArgs(const InnerMatcher& matcher) { return matcher; }
+inline InnerMatcher AllArgs(const InnerMatcher& matcher) {
+  return matcher;
+}
 
 // Returns a matcher that matches the value of an optional<> type variable.
-// The matcher implementation only uses '!arg' and requires that the optional<>
-// type has a 'value_type' member type and that '*arg' is of type 'value_type'
-// and is printable using 'PrintToString'. It is compatible with
+// The matcher implementation only uses '!arg' (or 'arg.has_value()' if '!arg`
+// isn't a valid expression) and requires that the optional<> type has a
+// 'value_type' member type and that '*arg' is of type 'value_type' and is
+// printable using 'PrintToString'. It is compatible with
 // std::optional/std::experimental::optional.
 // Note that to compare an optional type variable against nullopt you should
 // use Eq(nullopt) and not Eq(Optional(nullopt)). The latter implies that the
@@ -5032,7 +5514,7 @@ inline internal::OptionalMatcher<ValueMatcher> Optional(
 
 // Returns a matcher that matches the value of a absl::any type variable.
 template <typename T>
-PolymorphicMatcher<internal::any_cast_matcher::AnyCastMatcher<T> > AnyWith(
+PolymorphicMatcher<internal::any_cast_matcher::AnyCastMatcher<T>> AnyWith(
     const Matcher<const T&>& matcher) {
   return MakePolymorphicMatcher(
       internal::any_cast_matcher::AnyCastMatcher<T>(matcher));
@@ -5043,7 +5525,7 @@ PolymorphicMatcher<internal::any_cast_matcher::AnyCastMatcher<T> > AnyWith(
 // functions.
 // It is compatible with std::variant.
 template <typename T>
-PolymorphicMatcher<internal::variant_matcher::VariantMatcher<T> > VariantWith(
+PolymorphicMatcher<internal::variant_matcher::VariantMatcher<T>> VariantWith(
     const Matcher<const T&>& matcher) {
   return MakePolymorphicMatcher(
       internal::variant_matcher::VariantMatcher<T>(matcher));
@@ -5072,7 +5554,8 @@ class WithWhatMatcherImpl {
 
   template <typename Err>
   bool MatchAndExplain(const Err& err, MatchResultListener* listener) const {
-    *listener << "which contains .what() that ";
+    *listener << "which contains .what() (of value = " << err.what()
+              << ") that ";
     return matcher_.MatchAndExplain(err.what(), listener);
   }
 
@@ -5222,76 +5705,91 @@ PolymorphicMatcher<internal::ExceptionMatcherImpl<Err>> ThrowsMessage(
 // tests.  ASSERT_THAT(value, matcher) and EXPECT_THAT(value, matcher)
 // succeed if and only if the value matches the matcher.  If the assertion
 // fails, the value and the description of the matcher will be printed.
-#define ASSERT_THAT(value, matcher) ASSERT_PRED_FORMAT1(\
-    ::testing::internal::MakePredicateFormatterFromMatcher(matcher), value)
-#define EXPECT_THAT(value, matcher) EXPECT_PRED_FORMAT1(\
-    ::testing::internal::MakePredicateFormatterFromMatcher(matcher), value)
-
-// MATCHER* macroses itself are listed below.
-#define MATCHER(name, description)                                             \
-  class name##Matcher                                                          \
-      : public ::testing::internal::MatcherBaseImpl<name##Matcher> {           \
-   public:                                                                     \
-    template <typename arg_type>                                               \
-    class gmock_Impl : public ::testing::MatcherInterface<const arg_type&> {   \
-     public:                                                                   \
-      gmock_Impl() {}                                                          \
-      bool MatchAndExplain(                                                    \
-          const arg_type& arg,                                                 \
-          ::testing::MatchResultListener* result_listener) const override;     \
-      void DescribeTo(::std::ostream* gmock_os) const override {               \
-        *gmock_os << FormatDescription(false);                                 \
-      }                                                                        \
-      void DescribeNegationTo(::std::ostream* gmock_os) const override {       \
-        *gmock_os << FormatDescription(true);                                  \
-      }                                                                        \
-                                                                               \
-     private:                                                                  \
-      ::std::string FormatDescription(bool negation) const {                   \
-        ::std::string gmock_description = (description);                       \
-        if (!gmock_description.empty()) {                                      \
-          return gmock_description;                                            \
-        }                                                                      \
-        return ::testing::internal::FormatMatcherDescription(negation, #name,  \
-                                                             {});              \
-      }                                                                        \
-    };                                                                         \
-  };                                                                           \
-  GTEST_ATTRIBUTE_UNUSED_ inline name##Matcher name() { return {}; }           \
-  template <typename arg_type>                                                 \
-  bool name##Matcher::gmock_Impl<arg_type>::MatchAndExplain(                   \
-      const arg_type& arg,                                                     \
-      ::testing::MatchResultListener* result_listener GTEST_ATTRIBUTE_UNUSED_) \
-      const
+#define ASSERT_THAT(value, matcher) \
+  ASSERT_PRED_FORMAT1(              \
+      ::testing::internal::MakePredicateFormatterFromMatcher(matcher), value)
+#define EXPECT_THAT(value, matcher) \
+  EXPECT_PRED_FORMAT1(              \
+      ::testing::internal::MakePredicateFormatterFromMatcher(matcher), value)
+
+// MATCHER* macros itself are listed below.
+#define MATCHER(name, description)                                            \
+  class name##Matcher                                                         \
+      : public ::testing::internal::MatcherBaseImpl<name##Matcher> {          \
+   public:                                                                    \
+    template <typename arg_type>                                              \
+    class gmock_Impl : public ::testing::MatcherInterface<const arg_type&> {  \
+     public:                                                                  \
+      gmock_Impl() {}                                                         \
+      bool MatchAndExplain(                                                   \
+          const arg_type& arg,                                                \
+          ::testing::MatchResultListener* result_listener) const override;    \
+      void DescribeTo(::std::ostream* gmock_os) const override {              \
+        *gmock_os << FormatDescription(false);                                \
+      }                                                                       \
+      void DescribeNegationTo(::std::ostream* gmock_os) const override {      \
+        *gmock_os << FormatDescription(true);                                 \
+      }                                                                       \
+                                                                              \
+     private:                                                                 \
+      ::std::string FormatDescription(bool negation) const {                  \
+        /* NOLINTNEXTLINE readability-redundant-string-init */                \
+        ::std::string gmock_description = (description);                      \
+        if (!gmock_description.empty()) {                                     \
+          return gmock_description;                                           \
+        }                                                                     \
+        return ::testing::internal::FormatMatcherDescription(negation, #name, \
+                                                             {}, {});         \
+      }                                                                       \
+    };                                                                        \
+  };                                                                          \
+  inline name##Matcher GMOCK_INTERNAL_WARNING_PUSH()                          \
+      GMOCK_INTERNAL_WARNING_CLANG(ignored, "-Wunused-function")              \
+          GMOCK_INTERNAL_WARNING_CLANG(ignored, "-Wunused-member-function")   \
+              name GMOCK_INTERNAL_WARNING_POP()() {                           \
+    return {};                                                                \
+  }                                                                           \
+  template <typename arg_type>                                                \
+  bool name##Matcher::gmock_Impl<arg_type>::MatchAndExplain(                  \
+      const arg_type& arg,                                                    \
+      [[maybe_unused]] ::testing::MatchResultListener* result_listener) const
 
 #define MATCHER_P(name, p0, description) \
-  GMOCK_INTERNAL_MATCHER(name, name##MatcherP, description, (p0))
-#define MATCHER_P2(name, p0, p1, description) \
-  GMOCK_INTERNAL_MATCHER(name, name##MatcherP2, description, (p0, p1))
-#define MATCHER_P3(name, p0, p1, p2, description) \
-  GMOCK_INTERNAL_MATCHER(name, name##MatcherP3, description, (p0, p1, p2))
-#define MATCHER_P4(name, p0, p1, p2, p3, description) \
-  GMOCK_INTERNAL_MATCHER(name, name##MatcherP4, description, (p0, p1, p2, p3))
+  GMOCK_INTERNAL_MATCHER(name, name##MatcherP, description, (#p0), (p0))
+#define MATCHER_P2(name, p0, p1, description)                            \
+  GMOCK_INTERNAL_MATCHER(name, name##MatcherP2, description, (#p0, #p1), \
+                         (p0, p1))
+#define MATCHER_P3(name, p0, p1, p2, description)                             \
+  GMOCK_INTERNAL_MATCHER(name, name##MatcherP3, description, (#p0, #p1, #p2), \
+                         (p0, p1, p2))
+#define MATCHER_P4(name, p0, p1, p2, p3, description)        \
+  GMOCK_INTERNAL_MATCHER(name, name##MatcherP4, description, \
+                         (#p0, #p1, #p2, #p3), (p0, p1, p2, p3))
 #define MATCHER_P5(name, p0, p1, p2, p3, p4, description)    \
   GMOCK_INTERNAL_MATCHER(name, name##MatcherP5, description, \
-                         (p0, p1, p2, p3, p4))
+                         (#p0, #p1, #p2, #p3, #p4), (p0, p1, p2, p3, p4))
 #define MATCHER_P6(name, p0, p1, p2, p3, p4, p5, description) \
   GMOCK_INTERNAL_MATCHER(name, name##MatcherP6, description,  \
+                         (#p0, #p1, #p2, #p3, #p4, #p5),      \
                          (p0, p1, p2, p3, p4, p5))
 #define MATCHER_P7(name, p0, p1, p2, p3, p4, p5, p6, description) \
   GMOCK_INTERNAL_MATCHER(name, name##MatcherP7, description,      \
+                         (#p0, #p1, #p2, #p3, #p4, #p5, #p6),     \
                          (p0, p1, p2, p3, p4, p5, p6))
 #define MATCHER_P8(name, p0, p1, p2, p3, p4, p5, p6, p7, description) \
   GMOCK_INTERNAL_MATCHER(name, name##MatcherP8, description,          \
+                         (#p0, #p1, #p2, #p3, #p4, #p5, #p6, #p7),    \
                          (p0, p1, p2, p3, p4, p5, p6, p7))
 #define MATCHER_P9(name, p0, p1, p2, p3, p4, p5, p6, p7, p8, description) \
   GMOCK_INTERNAL_MATCHER(name, name##MatcherP9, description,              \
+                         (#p0, #p1, #p2, #p3, #p4, #p5, #p6, #p7, #p8),   \
                          (p0, p1, p2, p3, p4, p5, p6, p7, p8))
 #define MATCHER_P10(name, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, description) \
   GMOCK_INTERNAL_MATCHER(name, name##MatcherP10, description,                  \
+                         (#p0, #p1, #p2, #p3, #p4, #p5, #p6, #p7, #p8, #p9),   \
                          (p0, p1, p2, p3, p4, p5, p6, p7, p8, p9))
 
-#define GMOCK_INTERNAL_MATCHER(name, full_name, description, args)             \
+#define GMOCK_INTERNAL_MATCHER(name, full_name, description, arg_names, args)  \
   template <GMOCK_INTERNAL_MATCHER_TEMPLATE_PARAMS(args)>                      \
   class full_name : public ::testing::internal::MatcherBaseImpl<               \
                         full_name<GMOCK_INTERNAL_MATCHER_TYPE_PARAMS(args)>> { \
@@ -5315,12 +5813,13 @@ PolymorphicMatcher<internal::ExceptionMatcherImpl<Err>> ThrowsMessage(
                                                                                \
      private:                                                                  \
       ::std::string FormatDescription(bool negation) const {                   \
-        ::std::string gmock_description = (description);                       \
+        ::std::string gmock_description;                                       \
+        gmock_description = (description);                                     \
         if (!gmock_description.empty()) {                                      \
           return gmock_description;                                            \
         }                                                                      \
         return ::testing::internal::FormatMatcherDescription(                  \
-            negation, #name,                                                   \
+            negation, #name, {GMOCK_PP_REMOVE_PARENS(arg_names)},              \
             ::testing::internal::UniversalTersePrintTupleFieldsToStrings(      \
                 ::std::tuple<GMOCK_INTERNAL_MATCHER_TYPE_PARAMS(args)>(        \
                     GMOCK_INTERNAL_MATCHER_MEMBERS_USAGE(args))));             \
@@ -5335,11 +5834,11 @@ PolymorphicMatcher<internal::ExceptionMatcherImpl<Err>> ThrowsMessage(
   }                                                                            \
   template <GMOCK_INTERNAL_MATCHER_TEMPLATE_PARAMS(args)>                      \
   template <typename arg_type>                                                 \
-  bool full_name<GMOCK_INTERNAL_MATCHER_TYPE_PARAMS(args)>::gmock_Impl<        \
-      arg_type>::MatchAndExplain(const arg_type& arg,                          \
-                                 ::testing::MatchResultListener*               \
-                                     result_listener GTEST_ATTRIBUTE_UNUSED_)  \
-      const
+  bool full_name<GMOCK_INTERNAL_MATCHER_TYPE_PARAMS(args)>::                   \
+      gmock_Impl<arg_type>::MatchAndExplain(                                   \
+          const arg_type& arg,                                                 \
+          [[maybe_unused]] ::testing::MatchResultListener* result_listener)    \
+          const
 
 #define GMOCK_INTERNAL_MATCHER_TEMPLATE_PARAMS(args) \
   GMOCK_PP_TAIL(                                     \
@@ -5374,8 +5873,8 @@ PolymorphicMatcher<internal::ExceptionMatcherImpl<Err>> ThrowsMessage(
 
 #define GMOCK_INTERNAL_MATCHER_ARGS_USAGE(args) \
   GMOCK_PP_TAIL(GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_MATCHER_ARG_USAGE, , args))
-#define GMOCK_INTERNAL_MATCHER_ARG_USAGE(i, data_unused, arg_unused) \
-  , gmock_p##i
+#define GMOCK_INTERNAL_MATCHER_ARG_USAGE(i, data_unused, arg) \
+  , ::std::forward<arg##_type>(gmock_p##i)
 
 // To prevent ADL on certain functions we put them on a separate namespace.
 using namespace no_adl;  // NOLINT
diff --git a/external/googletest/googlemock/include/gmock/gmock-more-actions.h b/external/googletest/googlemock/include/gmock/gmock-more-actions.h
index fd293358..eacfdcd9 100644
--- a/external/googletest/googlemock/include/gmock/gmock-more-actions.h
+++ b/external/googletest/googlemock/include/gmock/gmock-more-actions.h
@@ -27,12 +27,12 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
 // Google Mock - a framework for writing C++ mock classes.
 //
 // This file implements some commonly used variadic actions.
 
-// GOOGLETEST_CM0002 DO NOT DELETE
+// IWYU pragma: private, include "gmock/gmock.h"
+// IWYU pragma: friend gmock/.*
 
 #ifndef GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_MORE_ACTIONS_H_
 #define GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_MORE_ACTIONS_H_
@@ -129,170 +129,207 @@
 
 // Declares the template parameters.
 #define GMOCK_INTERNAL_DECL_HAS_1_TEMPLATE_PARAMS(kind0, name0) kind0 name0
-#define GMOCK_INTERNAL_DECL_HAS_2_TEMPLATE_PARAMS(kind0, name0, kind1, \
-    name1) kind0 name0, kind1 name1
+#define GMOCK_INTERNAL_DECL_HAS_2_TEMPLATE_PARAMS(kind0, name0, kind1, name1) \
+  kind0 name0, kind1 name1
 #define GMOCK_INTERNAL_DECL_HAS_3_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
-    kind2, name2) kind0 name0, kind1 name1, kind2 name2
+                                                  kind2, name2)               \
+  kind0 name0, kind1 name1, kind2 name2
 #define GMOCK_INTERNAL_DECL_HAS_4_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
-    kind2, name2, kind3, name3) kind0 name0, kind1 name1, kind2 name2, \
-    kind3 name3
-#define GMOCK_INTERNAL_DECL_HAS_5_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
-    kind2, name2, kind3, name3, kind4, name4) kind0 name0, kind1 name1, \
-    kind2 name2, kind3 name3, kind4 name4
+                                                  kind2, name2, kind3, name3) \
+  kind0 name0, kind1 name1, kind2 name2, kind3 name3
+#define GMOCK_INTERNAL_DECL_HAS_5_TEMPLATE_PARAMS(                        \
+    kind0, name0, kind1, name1, kind2, name2, kind3, name3, kind4, name4) \
+  kind0 name0, kind1 name1, kind2 name2, kind3 name3, kind4 name4
 #define GMOCK_INTERNAL_DECL_HAS_6_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
-    kind2, name2, kind3, name3, kind4, name4, kind5, name5) kind0 name0, \
-    kind1 name1, kind2 name2, kind3 name3, kind4 name4, kind5 name5
-#define GMOCK_INTERNAL_DECL_HAS_7_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
-    kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, \
-    name6) kind0 name0, kind1 name1, kind2 name2, kind3 name3, kind4 name4, \
-    kind5 name5, kind6 name6
-#define GMOCK_INTERNAL_DECL_HAS_8_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
-    kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, name6, \
-    kind7, name7) kind0 name0, kind1 name1, kind2 name2, kind3 name3, \
-    kind4 name4, kind5 name5, kind6 name6, kind7 name7
-#define GMOCK_INTERNAL_DECL_HAS_9_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
-    kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, name6, \
-    kind7, name7, kind8, name8) kind0 name0, kind1 name1, kind2 name2, \
-    kind3 name3, kind4 name4, kind5 name5, kind6 name6, kind7 name7, \
-    kind8 name8
-#define GMOCK_INTERNAL_DECL_HAS_10_TEMPLATE_PARAMS(kind0, name0, kind1, \
-    name1, kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, \
-    name6, kind7, name7, kind8, name8, kind9, name9) kind0 name0, \
-    kind1 name1, kind2 name2, kind3 name3, kind4 name4, kind5 name5, \
-    kind6 name6, kind7 name7, kind8 name8, kind9 name9
+                                                  kind2, name2, kind3, name3, \
+                                                  kind4, name4, kind5, name5) \
+  kind0 name0, kind1 name1, kind2 name2, kind3 name3, kind4 name4, kind5 name5
+#define GMOCK_INTERNAL_DECL_HAS_7_TEMPLATE_PARAMS(                        \
+    kind0, name0, kind1, name1, kind2, name2, kind3, name3, kind4, name4, \
+    kind5, name5, kind6, name6)                                           \
+  kind0 name0, kind1 name1, kind2 name2, kind3 name3, kind4 name4,        \
+      kind5 name5, kind6 name6
+#define GMOCK_INTERNAL_DECL_HAS_8_TEMPLATE_PARAMS(                        \
+    kind0, name0, kind1, name1, kind2, name2, kind3, name3, kind4, name4, \
+    kind5, name5, kind6, name6, kind7, name7)                             \
+  kind0 name0, kind1 name1, kind2 name2, kind3 name3, kind4 name4,        \
+      kind5 name5, kind6 name6, kind7 name7
+#define GMOCK_INTERNAL_DECL_HAS_9_TEMPLATE_PARAMS(                        \
+    kind0, name0, kind1, name1, kind2, name2, kind3, name3, kind4, name4, \
+    kind5, name5, kind6, name6, kind7, name7, kind8, name8)               \
+  kind0 name0, kind1 name1, kind2 name2, kind3 name3, kind4 name4,        \
+      kind5 name5, kind6 name6, kind7 name7, kind8 name8
+#define GMOCK_INTERNAL_DECL_HAS_10_TEMPLATE_PARAMS(                       \
+    kind0, name0, kind1, name1, kind2, name2, kind3, name3, kind4, name4, \
+    kind5, name5, kind6, name6, kind7, name7, kind8, name8, kind9, name9) \
+  kind0 name0, kind1 name1, kind2 name2, kind3 name3, kind4 name4,        \
+      kind5 name5, kind6 name6, kind7 name7, kind8 name8, kind9 name9
 
 // Lists the template parameters.
 #define GMOCK_INTERNAL_LIST_HAS_1_TEMPLATE_PARAMS(kind0, name0) name0
-#define GMOCK_INTERNAL_LIST_HAS_2_TEMPLATE_PARAMS(kind0, name0, kind1, \
-    name1) name0, name1
+#define GMOCK_INTERNAL_LIST_HAS_2_TEMPLATE_PARAMS(kind0, name0, kind1, name1) \
+  name0, name1
 #define GMOCK_INTERNAL_LIST_HAS_3_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
-    kind2, name2) name0, name1, name2
+                                                  kind2, name2)               \
+  name0, name1, name2
 #define GMOCK_INTERNAL_LIST_HAS_4_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
-    kind2, name2, kind3, name3) name0, name1, name2, name3
-#define GMOCK_INTERNAL_LIST_HAS_5_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
-    kind2, name2, kind3, name3, kind4, name4) name0, name1, name2, name3, \
-    name4
+                                                  kind2, name2, kind3, name3) \
+  name0, name1, name2, name3
+#define GMOCK_INTERNAL_LIST_HAS_5_TEMPLATE_PARAMS(                        \
+    kind0, name0, kind1, name1, kind2, name2, kind3, name3, kind4, name4) \
+  name0, name1, name2, name3, name4
 #define GMOCK_INTERNAL_LIST_HAS_6_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
-    kind2, name2, kind3, name3, kind4, name4, kind5, name5) name0, name1, \
-    name2, name3, name4, name5
-#define GMOCK_INTERNAL_LIST_HAS_7_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
-    kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, \
-    name6) name0, name1, name2, name3, name4, name5, name6
-#define GMOCK_INTERNAL_LIST_HAS_8_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
-    kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, name6, \
-    kind7, name7) name0, name1, name2, name3, name4, name5, name6, name7
-#define GMOCK_INTERNAL_LIST_HAS_9_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
-    kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, name6, \
-    kind7, name7, kind8, name8) name0, name1, name2, name3, name4, name5, \
-    name6, name7, name8
-#define GMOCK_INTERNAL_LIST_HAS_10_TEMPLATE_PARAMS(kind0, name0, kind1, \
-    name1, kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, \
-    name6, kind7, name7, kind8, name8, kind9, name9) name0, name1, name2, \
-    name3, name4, name5, name6, name7, name8, name9
+                                                  kind2, name2, kind3, name3, \
+                                                  kind4, name4, kind5, name5) \
+  name0, name1, name2, name3, name4, name5
+#define GMOCK_INTERNAL_LIST_HAS_7_TEMPLATE_PARAMS(                        \
+    kind0, name0, kind1, name1, kind2, name2, kind3, name3, kind4, name4, \
+    kind5, name5, kind6, name6)                                           \
+  name0, name1, name2, name3, name4, name5, name6
+#define GMOCK_INTERNAL_LIST_HAS_8_TEMPLATE_PARAMS(                        \
+    kind0, name0, kind1, name1, kind2, name2, kind3, name3, kind4, name4, \
+    kind5, name5, kind6, name6, kind7, name7)                             \
+  name0, name1, name2, name3, name4, name5, name6, name7
+#define GMOCK_INTERNAL_LIST_HAS_9_TEMPLATE_PARAMS(                        \
+    kind0, name0, kind1, name1, kind2, name2, kind3, name3, kind4, name4, \
+    kind5, name5, kind6, name6, kind7, name7, kind8, name8)               \
+  name0, name1, name2, name3, name4, name5, name6, name7, name8
+#define GMOCK_INTERNAL_LIST_HAS_10_TEMPLATE_PARAMS(                       \
+    kind0, name0, kind1, name1, kind2, name2, kind3, name3, kind4, name4, \
+    kind5, name5, kind6, name6, kind7, name7, kind8, name8, kind9, name9) \
+  name0, name1, name2, name3, name4, name5, name6, name7, name8, name9
 
 // Declares the types of value parameters.
 #define GMOCK_INTERNAL_DECL_TYPE_AND_0_VALUE_PARAMS()
 #define GMOCK_INTERNAL_DECL_TYPE_AND_1_VALUE_PARAMS(p0) , typename p0##_type
-#define GMOCK_INTERNAL_DECL_TYPE_AND_2_VALUE_PARAMS(p0, p1) , \
-    typename p0##_type, typename p1##_type
-#define GMOCK_INTERNAL_DECL_TYPE_AND_3_VALUE_PARAMS(p0, p1, p2) , \
-    typename p0##_type, typename p1##_type, typename p2##_type
-#define GMOCK_INTERNAL_DECL_TYPE_AND_4_VALUE_PARAMS(p0, p1, p2, p3) , \
-    typename p0##_type, typename p1##_type, typename p2##_type, \
-    typename p3##_type
-#define GMOCK_INTERNAL_DECL_TYPE_AND_5_VALUE_PARAMS(p0, p1, p2, p3, p4) , \
-    typename p0##_type, typename p1##_type, typename p2##_type, \
-    typename p3##_type, typename p4##_type
-#define GMOCK_INTERNAL_DECL_TYPE_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, p5) , \
-    typename p0##_type, typename p1##_type, typename p2##_type, \
-    typename p3##_type, typename p4##_type, typename p5##_type
+#define GMOCK_INTERNAL_DECL_TYPE_AND_2_VALUE_PARAMS(p0, p1) \
+  , typename p0##_type, typename p1##_type
+#define GMOCK_INTERNAL_DECL_TYPE_AND_3_VALUE_PARAMS(p0, p1, p2) \
+  , typename p0##_type, typename p1##_type, typename p2##_type
+#define GMOCK_INTERNAL_DECL_TYPE_AND_4_VALUE_PARAMS(p0, p1, p2, p3) \
+  , typename p0##_type, typename p1##_type, typename p2##_type,     \
+      typename p3##_type
+#define GMOCK_INTERNAL_DECL_TYPE_AND_5_VALUE_PARAMS(p0, p1, p2, p3, p4) \
+  , typename p0##_type, typename p1##_type, typename p2##_type,         \
+      typename p3##_type, typename p4##_type
+#define GMOCK_INTERNAL_DECL_TYPE_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, p5) \
+  , typename p0##_type, typename p1##_type, typename p2##_type,             \
+      typename p3##_type, typename p4##_type, typename p5##_type
 #define GMOCK_INTERNAL_DECL_TYPE_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
-    p6) , typename p0##_type, typename p1##_type, typename p2##_type, \
-    typename p3##_type, typename p4##_type, typename p5##_type, \
-    typename p6##_type
+                                                    p6)                     \
+  , typename p0##_type, typename p1##_type, typename p2##_type,             \
+      typename p3##_type, typename p4##_type, typename p5##_type,           \
+      typename p6##_type
 #define GMOCK_INTERNAL_DECL_TYPE_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
-    p6, p7) , typename p0##_type, typename p1##_type, typename p2##_type, \
-    typename p3##_type, typename p4##_type, typename p5##_type, \
-    typename p6##_type, typename p7##_type
+                                                    p6, p7)                 \
+  , typename p0##_type, typename p1##_type, typename p2##_type,             \
+      typename p3##_type, typename p4##_type, typename p5##_type,           \
+      typename p6##_type, typename p7##_type
 #define GMOCK_INTERNAL_DECL_TYPE_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
-    p6, p7, p8) , typename p0##_type, typename p1##_type, typename p2##_type, \
-    typename p3##_type, typename p4##_type, typename p5##_type, \
-    typename p6##_type, typename p7##_type, typename p8##_type
+                                                    p6, p7, p8)             \
+  , typename p0##_type, typename p1##_type, typename p2##_type,             \
+      typename p3##_type, typename p4##_type, typename p5##_type,           \
+      typename p6##_type, typename p7##_type, typename p8##_type
 #define GMOCK_INTERNAL_DECL_TYPE_AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
-    p6, p7, p8, p9) , typename p0##_type, typename p1##_type, \
-    typename p2##_type, typename p3##_type, typename p4##_type, \
-    typename p5##_type, typename p6##_type, typename p7##_type, \
-    typename p8##_type, typename p9##_type
+                                                     p6, p7, p8, p9)         \
+  , typename p0##_type, typename p1##_type, typename p2##_type,              \
+      typename p3##_type, typename p4##_type, typename p5##_type,            \
+      typename p6##_type, typename p7##_type, typename p8##_type,            \
+      typename p9##_type
 
 // Initializes the value parameters.
-#define GMOCK_INTERNAL_INIT_AND_0_VALUE_PARAMS()\
-    ()
-#define GMOCK_INTERNAL_INIT_AND_1_VALUE_PARAMS(p0)\
-    (p0##_type gmock_p0) : p0(::std::move(gmock_p0))
-#define GMOCK_INTERNAL_INIT_AND_2_VALUE_PARAMS(p0, p1)\
-    (p0##_type gmock_p0, p1##_type gmock_p1) : p0(::std::move(gmock_p0)), \
-        p1(::std::move(gmock_p1))
-#define GMOCK_INTERNAL_INIT_AND_3_VALUE_PARAMS(p0, p1, p2)\
-    (p0##_type gmock_p0, p1##_type gmock_p1, \
-        p2##_type gmock_p2) : p0(::std::move(gmock_p0)), \
-        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2))
-#define GMOCK_INTERNAL_INIT_AND_4_VALUE_PARAMS(p0, p1, p2, p3)\
-    (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
-        p3##_type gmock_p3) : p0(::std::move(gmock_p0)), \
-        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2)), \
+#define GMOCK_INTERNAL_INIT_AND_0_VALUE_PARAMS() ()
+#define GMOCK_INTERNAL_INIT_AND_1_VALUE_PARAMS(p0) \
+  (p0##_type gmock_p0) : p0(::std::move(gmock_p0))
+#define GMOCK_INTERNAL_INIT_AND_2_VALUE_PARAMS(p0, p1) \
+  (p0##_type gmock_p0, p1##_type gmock_p1)             \
+      : p0(::std::move(gmock_p0)), p1(::std::move(gmock_p1))
+#define GMOCK_INTERNAL_INIT_AND_3_VALUE_PARAMS(p0, p1, p2)     \
+  (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2) \
+      : p0(::std::move(gmock_p0)),                             \
+        p1(::std::move(gmock_p1)),                             \
+        p2(::std::move(gmock_p2))
+#define GMOCK_INTERNAL_INIT_AND_4_VALUE_PARAMS(p0, p1, p2, p3) \
+  (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
+   p3##_type gmock_p3)                                         \
+      : p0(::std::move(gmock_p0)),                             \
+        p1(::std::move(gmock_p1)),                             \
+        p2(::std::move(gmock_p2)),                             \
         p3(::std::move(gmock_p3))
-#define GMOCK_INTERNAL_INIT_AND_5_VALUE_PARAMS(p0, p1, p2, p3, p4)\
-    (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
-        p3##_type gmock_p3, p4##_type gmock_p4) : p0(::std::move(gmock_p0)), \
-        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2)), \
-        p3(::std::move(gmock_p3)), p4(::std::move(gmock_p4))
-#define GMOCK_INTERNAL_INIT_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, p5)\
-    (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
-        p3##_type gmock_p3, p4##_type gmock_p4, \
-        p5##_type gmock_p5) : p0(::std::move(gmock_p0)), \
-        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2)), \
-        p3(::std::move(gmock_p3)), p4(::std::move(gmock_p4)), \
+#define GMOCK_INTERNAL_INIT_AND_5_VALUE_PARAMS(p0, p1, p2, p3, p4) \
+  (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2,     \
+   p3##_type gmock_p3, p4##_type gmock_p4)                         \
+      : p0(::std::move(gmock_p0)),                                 \
+        p1(::std::move(gmock_p1)),                                 \
+        p2(::std::move(gmock_p2)),                                 \
+        p3(::std::move(gmock_p3)),                                 \
+        p4(::std::move(gmock_p4))
+#define GMOCK_INTERNAL_INIT_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, p5) \
+  (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2,         \
+   p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5)         \
+      : p0(::std::move(gmock_p0)),                                     \
+        p1(::std::move(gmock_p1)),                                     \
+        p2(::std::move(gmock_p2)),                                     \
+        p3(::std::move(gmock_p3)),                                     \
+        p4(::std::move(gmock_p4)),                                     \
         p5(::std::move(gmock_p5))
-#define GMOCK_INTERNAL_INIT_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6)\
-    (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
-        p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \
-        p6##_type gmock_p6) : p0(::std::move(gmock_p0)), \
-        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2)), \
-        p3(::std::move(gmock_p3)), p4(::std::move(gmock_p4)), \
-        p5(::std::move(gmock_p5)), p6(::std::move(gmock_p6))
-#define GMOCK_INTERNAL_INIT_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, p7)\
-    (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
-        p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \
-        p6##_type gmock_p6, p7##_type gmock_p7) : p0(::std::move(gmock_p0)), \
-        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2)), \
-        p3(::std::move(gmock_p3)), p4(::std::move(gmock_p4)), \
-        p5(::std::move(gmock_p5)), p6(::std::move(gmock_p6)), \
+#define GMOCK_INTERNAL_INIT_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6) \
+  (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2,             \
+   p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5,             \
+   p6##_type gmock_p6)                                                     \
+      : p0(::std::move(gmock_p0)),                                         \
+        p1(::std::move(gmock_p1)),                                         \
+        p2(::std::move(gmock_p2)),                                         \
+        p3(::std::move(gmock_p3)),                                         \
+        p4(::std::move(gmock_p4)),                                         \
+        p5(::std::move(gmock_p5)),                                         \
+        p6(::std::move(gmock_p6))
+#define GMOCK_INTERNAL_INIT_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, p7) \
+  (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2,                 \
+   p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5,                 \
+   p6##_type gmock_p6, p7##_type gmock_p7)                                     \
+      : p0(::std::move(gmock_p0)),                                             \
+        p1(::std::move(gmock_p1)),                                             \
+        p2(::std::move(gmock_p2)),                                             \
+        p3(::std::move(gmock_p3)),                                             \
+        p4(::std::move(gmock_p4)),                                             \
+        p5(::std::move(gmock_p5)),                                             \
+        p6(::std::move(gmock_p6)),                                             \
         p7(::std::move(gmock_p7))
-#define GMOCK_INTERNAL_INIT_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
-    p7, p8)\
-    (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
-        p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \
-        p6##_type gmock_p6, p7##_type gmock_p7, \
-        p8##_type gmock_p8) : p0(::std::move(gmock_p0)), \
-        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2)), \
-        p3(::std::move(gmock_p3)), p4(::std::move(gmock_p4)), \
-        p5(::std::move(gmock_p5)), p6(::std::move(gmock_p6)), \
-        p7(::std::move(gmock_p7)), p8(::std::move(gmock_p8))
+#define GMOCK_INTERNAL_INIT_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, p7, \
+                                               p8)                             \
+  (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2,                 \
+   p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5,                 \
+   p6##_type gmock_p6, p7##_type gmock_p7, p8##_type gmock_p8)                 \
+      : p0(::std::move(gmock_p0)),                                             \
+        p1(::std::move(gmock_p1)),                                             \
+        p2(::std::move(gmock_p2)),                                             \
+        p3(::std::move(gmock_p3)),                                             \
+        p4(::std::move(gmock_p4)),                                             \
+        p5(::std::move(gmock_p5)),                                             \
+        p6(::std::move(gmock_p6)),                                             \
+        p7(::std::move(gmock_p7)),                                             \
+        p8(::std::move(gmock_p8))
 #define GMOCK_INTERNAL_INIT_AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
-    p7, p8, p9)\
-    (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
-        p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \
-        p6##_type gmock_p6, p7##_type gmock_p7, p8##_type gmock_p8, \
-        p9##_type gmock_p9) : p0(::std::move(gmock_p0)), \
-        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2)), \
-        p3(::std::move(gmock_p3)), p4(::std::move(gmock_p4)), \
-        p5(::std::move(gmock_p5)), p6(::std::move(gmock_p6)), \
-        p7(::std::move(gmock_p7)), p8(::std::move(gmock_p8)), \
+                                                p7, p8, p9)                 \
+  (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2,              \
+   p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5,              \
+   p6##_type gmock_p6, p7##_type gmock_p7, p8##_type gmock_p8,              \
+   p9##_type gmock_p9)                                                      \
+      : p0(::std::move(gmock_p0)),                                          \
+        p1(::std::move(gmock_p1)),                                          \
+        p2(::std::move(gmock_p2)),                                          \
+        p3(::std::move(gmock_p3)),                                          \
+        p4(::std::move(gmock_p4)),                                          \
+        p5(::std::move(gmock_p5)),                                          \
+        p6(::std::move(gmock_p6)),                                          \
+        p7(::std::move(gmock_p7)),                                          \
+        p8(::std::move(gmock_p8)),                                          \
         p9(::std::move(gmock_p9))
 
 // Defines the copy constructor
 #define GMOCK_INTERNAL_DEFN_COPY_AND_0_VALUE_PARAMS() \
-    {}  // Avoid https://gcc.gnu.org/bugzilla/show_bug.cgi?id=82134
+  {}  // Avoid https://gcc.gnu.org/bugzilla/show_bug.cgi?id=82134
 #define GMOCK_INTERNAL_DEFN_COPY_AND_1_VALUE_PARAMS(...) = default;
 #define GMOCK_INTERNAL_DEFN_COPY_AND_2_VALUE_PARAMS(...) = default;
 #define GMOCK_INTERNAL_DEFN_COPY_AND_3_VALUE_PARAMS(...) = default;
@@ -307,30 +344,71 @@
 // Declares the fields for storing the value parameters.
 #define GMOCK_INTERNAL_DEFN_AND_0_VALUE_PARAMS()
 #define GMOCK_INTERNAL_DEFN_AND_1_VALUE_PARAMS(p0) p0##_type p0;
-#define GMOCK_INTERNAL_DEFN_AND_2_VALUE_PARAMS(p0, p1) p0##_type p0; \
-    p1##_type p1;
-#define GMOCK_INTERNAL_DEFN_AND_3_VALUE_PARAMS(p0, p1, p2) p0##_type p0; \
-    p1##_type p1; p2##_type p2;
-#define GMOCK_INTERNAL_DEFN_AND_4_VALUE_PARAMS(p0, p1, p2, p3) p0##_type p0; \
-    p1##_type p1; p2##_type p2; p3##_type p3;
-#define GMOCK_INTERNAL_DEFN_AND_5_VALUE_PARAMS(p0, p1, p2, p3, \
-    p4) p0##_type p0; p1##_type p1; p2##_type p2; p3##_type p3; p4##_type p4;
-#define GMOCK_INTERNAL_DEFN_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, \
-    p5) p0##_type p0; p1##_type p1; p2##_type p2; p3##_type p3; p4##_type p4; \
-    p5##_type p5;
-#define GMOCK_INTERNAL_DEFN_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
-    p6) p0##_type p0; p1##_type p1; p2##_type p2; p3##_type p3; p4##_type p4; \
-    p5##_type p5; p6##_type p6;
-#define GMOCK_INTERNAL_DEFN_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
-    p7) p0##_type p0; p1##_type p1; p2##_type p2; p3##_type p3; p4##_type p4; \
-    p5##_type p5; p6##_type p6; p7##_type p7;
-#define GMOCK_INTERNAL_DEFN_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
-    p7, p8) p0##_type p0; p1##_type p1; p2##_type p2; p3##_type p3; \
-    p4##_type p4; p5##_type p5; p6##_type p6; p7##_type p7; p8##_type p8;
+#define GMOCK_INTERNAL_DEFN_AND_2_VALUE_PARAMS(p0, p1) \
+  p0##_type p0;                                        \
+  p1##_type p1;
+#define GMOCK_INTERNAL_DEFN_AND_3_VALUE_PARAMS(p0, p1, p2) \
+  p0##_type p0;                                            \
+  p1##_type p1;                                            \
+  p2##_type p2;
+#define GMOCK_INTERNAL_DEFN_AND_4_VALUE_PARAMS(p0, p1, p2, p3) \
+  p0##_type p0;                                                \
+  p1##_type p1;                                                \
+  p2##_type p2;                                                \
+  p3##_type p3;
+#define GMOCK_INTERNAL_DEFN_AND_5_VALUE_PARAMS(p0, p1, p2, p3, p4) \
+  p0##_type p0;                                                    \
+  p1##_type p1;                                                    \
+  p2##_type p2;                                                    \
+  p3##_type p3;                                                    \
+  p4##_type p4;
+#define GMOCK_INTERNAL_DEFN_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, p5) \
+  p0##_type p0;                                                        \
+  p1##_type p1;                                                        \
+  p2##_type p2;                                                        \
+  p3##_type p3;                                                        \
+  p4##_type p4;                                                        \
+  p5##_type p5;
+#define GMOCK_INTERNAL_DEFN_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6) \
+  p0##_type p0;                                                            \
+  p1##_type p1;                                                            \
+  p2##_type p2;                                                            \
+  p3##_type p3;                                                            \
+  p4##_type p4;                                                            \
+  p5##_type p5;                                                            \
+  p6##_type p6;
+#define GMOCK_INTERNAL_DEFN_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, p7) \
+  p0##_type p0;                                                                \
+  p1##_type p1;                                                                \
+  p2##_type p2;                                                                \
+  p3##_type p3;                                                                \
+  p4##_type p4;                                                                \
+  p5##_type p5;                                                                \
+  p6##_type p6;                                                                \
+  p7##_type p7;
+#define GMOCK_INTERNAL_DEFN_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, p7, \
+                                               p8)                             \
+  p0##_type p0;                                                                \
+  p1##_type p1;                                                                \
+  p2##_type p2;                                                                \
+  p3##_type p3;                                                                \
+  p4##_type p4;                                                                \
+  p5##_type p5;                                                                \
+  p6##_type p6;                                                                \
+  p7##_type p7;                                                                \
+  p8##_type p8;
 #define GMOCK_INTERNAL_DEFN_AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
-    p7, p8, p9) p0##_type p0; p1##_type p1; p2##_type p2; p3##_type p3; \
-    p4##_type p4; p5##_type p5; p6##_type p6; p7##_type p7; p8##_type p8; \
-    p9##_type p9;
+                                                p7, p8, p9)                 \
+  p0##_type p0;                                                             \
+  p1##_type p1;                                                             \
+  p2##_type p2;                                                             \
+  p3##_type p3;                                                             \
+  p4##_type p4;                                                             \
+  p5##_type p5;                                                             \
+  p6##_type p6;                                                             \
+  p7##_type p7;                                                             \
+  p8##_type p8;                                                             \
+  p9##_type p9;
 
 // Lists the value parameters.
 #define GMOCK_INTERNAL_LIST_AND_0_VALUE_PARAMS()
@@ -338,72 +416,78 @@
 #define GMOCK_INTERNAL_LIST_AND_2_VALUE_PARAMS(p0, p1) p0, p1
 #define GMOCK_INTERNAL_LIST_AND_3_VALUE_PARAMS(p0, p1, p2) p0, p1, p2
 #define GMOCK_INTERNAL_LIST_AND_4_VALUE_PARAMS(p0, p1, p2, p3) p0, p1, p2, p3
-#define GMOCK_INTERNAL_LIST_AND_5_VALUE_PARAMS(p0, p1, p2, p3, p4) p0, p1, \
-    p2, p3, p4
-#define GMOCK_INTERNAL_LIST_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, p5) p0, \
-    p1, p2, p3, p4, p5
-#define GMOCK_INTERNAL_LIST_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
-    p6) p0, p1, p2, p3, p4, p5, p6
-#define GMOCK_INTERNAL_LIST_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
-    p7) p0, p1, p2, p3, p4, p5, p6, p7
-#define GMOCK_INTERNAL_LIST_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
-    p7, p8) p0, p1, p2, p3, p4, p5, p6, p7, p8
+#define GMOCK_INTERNAL_LIST_AND_5_VALUE_PARAMS(p0, p1, p2, p3, p4) \
+  p0, p1, p2, p3, p4
+#define GMOCK_INTERNAL_LIST_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, p5) \
+  p0, p1, p2, p3, p4, p5
+#define GMOCK_INTERNAL_LIST_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6) \
+  p0, p1, p2, p3, p4, p5, p6
+#define GMOCK_INTERNAL_LIST_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, p7) \
+  p0, p1, p2, p3, p4, p5, p6, p7
+#define GMOCK_INTERNAL_LIST_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, p7, \
+                                               p8)                             \
+  p0, p1, p2, p3, p4, p5, p6, p7, p8
 #define GMOCK_INTERNAL_LIST_AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
-    p7, p8, p9) p0, p1, p2, p3, p4, p5, p6, p7, p8, p9
+                                                p7, p8, p9)                 \
+  p0, p1, p2, p3, p4, p5, p6, p7, p8, p9
 
 // Lists the value parameter types.
 #define GMOCK_INTERNAL_LIST_TYPE_AND_0_VALUE_PARAMS()
 #define GMOCK_INTERNAL_LIST_TYPE_AND_1_VALUE_PARAMS(p0) , p0##_type
-#define GMOCK_INTERNAL_LIST_TYPE_AND_2_VALUE_PARAMS(p0, p1) , p0##_type, \
-    p1##_type
-#define GMOCK_INTERNAL_LIST_TYPE_AND_3_VALUE_PARAMS(p0, p1, p2) , p0##_type, \
-    p1##_type, p2##_type
-#define GMOCK_INTERNAL_LIST_TYPE_AND_4_VALUE_PARAMS(p0, p1, p2, p3) , \
-    p0##_type, p1##_type, p2##_type, p3##_type
-#define GMOCK_INTERNAL_LIST_TYPE_AND_5_VALUE_PARAMS(p0, p1, p2, p3, p4) , \
-    p0##_type, p1##_type, p2##_type, p3##_type, p4##_type
-#define GMOCK_INTERNAL_LIST_TYPE_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, p5) , \
-    p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, p5##_type
+#define GMOCK_INTERNAL_LIST_TYPE_AND_2_VALUE_PARAMS(p0, p1) \
+  , p0##_type, p1##_type
+#define GMOCK_INTERNAL_LIST_TYPE_AND_3_VALUE_PARAMS(p0, p1, p2) \
+  , p0##_type, p1##_type, p2##_type
+#define GMOCK_INTERNAL_LIST_TYPE_AND_4_VALUE_PARAMS(p0, p1, p2, p3) \
+  , p0##_type, p1##_type, p2##_type, p3##_type
+#define GMOCK_INTERNAL_LIST_TYPE_AND_5_VALUE_PARAMS(p0, p1, p2, p3, p4) \
+  , p0##_type, p1##_type, p2##_type, p3##_type, p4##_type
+#define GMOCK_INTERNAL_LIST_TYPE_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, p5) \
+  , p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, p5##_type
 #define GMOCK_INTERNAL_LIST_TYPE_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
-    p6) , p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, p5##_type, \
-    p6##_type
+                                                    p6)                     \
+  , p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, p5##_type, p6##_type
 #define GMOCK_INTERNAL_LIST_TYPE_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
-    p6, p7) , p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, \
-    p5##_type, p6##_type, p7##_type
+                                                    p6, p7)                 \
+  , p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, p5##_type,       \
+      p6##_type, p7##_type
 #define GMOCK_INTERNAL_LIST_TYPE_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
-    p6, p7, p8) , p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, \
-    p5##_type, p6##_type, p7##_type, p8##_type
+                                                    p6, p7, p8)             \
+  , p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, p5##_type,       \
+      p6##_type, p7##_type, p8##_type
 #define GMOCK_INTERNAL_LIST_TYPE_AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
-    p6, p7, p8, p9) , p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, \
-    p5##_type, p6##_type, p7##_type, p8##_type, p9##_type
+                                                     p6, p7, p8, p9)         \
+  , p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, p5##_type,        \
+      p6##_type, p7##_type, p8##_type, p9##_type
 
 // Declares the value parameters.
 #define GMOCK_INTERNAL_DECL_AND_0_VALUE_PARAMS()
 #define GMOCK_INTERNAL_DECL_AND_1_VALUE_PARAMS(p0) p0##_type p0
-#define GMOCK_INTERNAL_DECL_AND_2_VALUE_PARAMS(p0, p1) p0##_type p0, \
-    p1##_type p1
-#define GMOCK_INTERNAL_DECL_AND_3_VALUE_PARAMS(p0, p1, p2) p0##_type p0, \
-    p1##_type p1, p2##_type p2
-#define GMOCK_INTERNAL_DECL_AND_4_VALUE_PARAMS(p0, p1, p2, p3) p0##_type p0, \
-    p1##_type p1, p2##_type p2, p3##_type p3
-#define GMOCK_INTERNAL_DECL_AND_5_VALUE_PARAMS(p0, p1, p2, p3, \
-    p4) p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, p4##_type p4
-#define GMOCK_INTERNAL_DECL_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, \
-    p5) p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, p4##_type p4, \
-    p5##_type p5
-#define GMOCK_INTERNAL_DECL_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
-    p6) p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, p4##_type p4, \
-    p5##_type p5, p6##_type p6
-#define GMOCK_INTERNAL_DECL_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
-    p7) p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, p4##_type p4, \
-    p5##_type p5, p6##_type p6, p7##_type p7
-#define GMOCK_INTERNAL_DECL_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
-    p7, p8) p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, \
-    p4##_type p4, p5##_type p5, p6##_type p6, p7##_type p7, p8##_type p8
+#define GMOCK_INTERNAL_DECL_AND_2_VALUE_PARAMS(p0, p1) \
+  p0##_type p0, p1##_type p1
+#define GMOCK_INTERNAL_DECL_AND_3_VALUE_PARAMS(p0, p1, p2) \
+  p0##_type p0, p1##_type p1, p2##_type p2
+#define GMOCK_INTERNAL_DECL_AND_4_VALUE_PARAMS(p0, p1, p2, p3) \
+  p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3
+#define GMOCK_INTERNAL_DECL_AND_5_VALUE_PARAMS(p0, p1, p2, p3, p4) \
+  p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, p4##_type p4
+#define GMOCK_INTERNAL_DECL_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, p5)  \
+  p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, p4##_type p4, \
+      p5##_type p5
+#define GMOCK_INTERNAL_DECL_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6) \
+  p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, p4##_type p4,    \
+      p5##_type p5, p6##_type p6
+#define GMOCK_INTERNAL_DECL_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, p7) \
+  p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, p4##_type p4,        \
+      p5##_type p5, p6##_type p6, p7##_type p7
+#define GMOCK_INTERNAL_DECL_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, p7, \
+                                               p8)                             \
+  p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, p4##_type p4,        \
+      p5##_type p5, p6##_type p6, p7##_type p7, p8##_type p8
 #define GMOCK_INTERNAL_DECL_AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
-    p7, p8, p9) p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, \
-    p4##_type p4, p5##_type p5, p6##_type p6, p7##_type p7, p8##_type p8, \
-    p9##_type p9
+                                                p7, p8, p9)                 \
+  p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, p4##_type p4,     \
+      p5##_type p5, p6##_type p6, p7##_type p7, p8##_type p8, p9##_type p9
 
 // The suffix of the class template implementing the action template.
 #define GMOCK_INTERNAL_COUNT_AND_0_VALUE_PARAMS()
@@ -415,40 +499,43 @@
 #define GMOCK_INTERNAL_COUNT_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, p5) P6
 #define GMOCK_INTERNAL_COUNT_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6) P7
 #define GMOCK_INTERNAL_COUNT_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
-    p7) P8
+                                                p7)                         \
+  P8
 #define GMOCK_INTERNAL_COUNT_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
-    p7, p8) P9
+                                                p7, p8)                     \
+  P9
 #define GMOCK_INTERNAL_COUNT_AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
-    p7, p8, p9) P10
+                                                 p7, p8, p9)                 \
+  P10
 
 // The name of the class template implementing the action template.
-#define GMOCK_ACTION_CLASS_(name, value_params)\
-    GTEST_CONCAT_TOKEN_(name##Action, GMOCK_INTERNAL_COUNT_##value_params)
+#define GMOCK_ACTION_CLASS_(name, value_params) \
+  GTEST_CONCAT_TOKEN_(name##Action, GMOCK_INTERNAL_COUNT_##value_params)
 
 #define ACTION_TEMPLATE(name, template_params, value_params)                   \
   template <GMOCK_INTERNAL_DECL_##template_params                              \
-            GMOCK_INTERNAL_DECL_TYPE_##value_params>                           \
+                GMOCK_INTERNAL_DECL_TYPE_##value_params>                       \
   class GMOCK_ACTION_CLASS_(name, value_params) {                              \
    public:                                                                     \
     explicit GMOCK_ACTION_CLASS_(name, value_params)(                          \
         GMOCK_INTERNAL_DECL_##value_params)                                    \
         GMOCK_PP_IF(GMOCK_PP_IS_EMPTY(GMOCK_INTERNAL_COUNT_##value_params),    \
-                    = default; ,                                               \
-                    : impl_(std::make_shared<gmock_Impl>(                      \
-                                GMOCK_INTERNAL_LIST_##value_params)) { })      \
-    GMOCK_ACTION_CLASS_(name, value_params)(                                   \
-        const GMOCK_ACTION_CLASS_(name, value_params)&) noexcept               \
-        GMOCK_INTERNAL_DEFN_COPY_##value_params                                \
-    GMOCK_ACTION_CLASS_(name, value_params)(                                   \
-        GMOCK_ACTION_CLASS_(name, value_params)&&) noexcept                    \
-        GMOCK_INTERNAL_DEFN_COPY_##value_params                                \
-    template <typename F>                                                      \
-    operator ::testing::Action<F>() const {                                    \
+                    = default;                                                 \
+                    , : impl_(std::make_shared<gmock_Impl>(                    \
+                          GMOCK_INTERNAL_LIST_##value_params)){})              \
+            GMOCK_ACTION_CLASS_(name, value_params)(const GMOCK_ACTION_CLASS_( \
+                name, value_params) &) noexcept GMOCK_INTERNAL_DEFN_COPY_      \
+        ##value_params                                                         \
+        GMOCK_ACTION_CLASS_(name, value_params)(GMOCK_ACTION_CLASS_(           \
+            name, value_params) &&) noexcept GMOCK_INTERNAL_DEFN_COPY_         \
+        ##value_params template <typename F>                                   \
+        operator ::testing::Action<F>() const {                                \
       return GMOCK_PP_IF(                                                      \
           GMOCK_PP_IS_EMPTY(GMOCK_INTERNAL_COUNT_##value_params),              \
-                      (::testing::internal::MakeAction<F, gmock_Impl>()),      \
-                      (::testing::internal::MakeAction<F>(impl_)));            \
+          (::testing::internal::MakeAction<F, gmock_Impl>()),                  \
+          (::testing::internal::MakeAction<F>(impl_)));                        \
     }                                                                          \
+                                                                               \
    private:                                                                    \
     class gmock_Impl {                                                         \
      public:                                                                   \
@@ -458,34 +545,35 @@
       return_type gmock_PerformImpl(GMOCK_ACTION_ARG_TYPES_AND_NAMES_) const;  \
       GMOCK_INTERNAL_DEFN_##value_params                                       \
     };                                                                         \
-    GMOCK_PP_IF(GMOCK_PP_IS_EMPTY(GMOCK_INTERNAL_COUNT_##value_params),        \
-                , std::shared_ptr<const gmock_Impl> impl_;)                    \
+    GMOCK_PP_IF(GMOCK_PP_IS_EMPTY(GMOCK_INTERNAL_COUNT_##value_params), ,      \
+                std::shared_ptr<const gmock_Impl> impl_;)                      \
   };                                                                           \
   template <GMOCK_INTERNAL_DECL_##template_params                              \
-            GMOCK_INTERNAL_DECL_TYPE_##value_params>                           \
-  GMOCK_ACTION_CLASS_(name, value_params)<                                     \
-      GMOCK_INTERNAL_LIST_##template_params                                    \
-      GMOCK_INTERNAL_LIST_TYPE_##value_params> name(                           \
-          GMOCK_INTERNAL_DECL_##value_params) GTEST_MUST_USE_RESULT_;          \
+                GMOCK_INTERNAL_DECL_TYPE_##value_params>                       \
+  [[nodiscard]] GMOCK_ACTION_CLASS_(                                           \
+      name, value_params)<GMOCK_INTERNAL_LIST_##template_params                \
+                              GMOCK_INTERNAL_LIST_TYPE_##value_params>         \
+      name(GMOCK_INTERNAL_DECL_##value_params);                                \
   template <GMOCK_INTERNAL_DECL_##template_params                              \
-            GMOCK_INTERNAL_DECL_TYPE_##value_params>                           \
-  inline GMOCK_ACTION_CLASS_(name, value_params)<                              \
-      GMOCK_INTERNAL_LIST_##template_params                                    \
-      GMOCK_INTERNAL_LIST_TYPE_##value_params> name(                           \
-          GMOCK_INTERNAL_DECL_##value_params) {                                \
-    return GMOCK_ACTION_CLASS_(name, value_params)<                            \
-        GMOCK_INTERNAL_LIST_##template_params                                  \
-        GMOCK_INTERNAL_LIST_TYPE_##value_params>(                              \
-            GMOCK_INTERNAL_LIST_##value_params);                               \
+                GMOCK_INTERNAL_DECL_TYPE_##value_params>                       \
+  inline GMOCK_ACTION_CLASS_(                                                  \
+      name, value_params)<GMOCK_INTERNAL_LIST_##template_params                \
+                              GMOCK_INTERNAL_LIST_TYPE_##value_params>         \
+  name(GMOCK_INTERNAL_DECL_##value_params) {                                   \
+    return GMOCK_ACTION_CLASS_(                                                \
+        name, value_params)<GMOCK_INTERNAL_LIST_##template_params              \
+                                GMOCK_INTERNAL_LIST_TYPE_##value_params>(      \
+        GMOCK_INTERNAL_LIST_##value_params);                                   \
   }                                                                            \
   template <GMOCK_INTERNAL_DECL_##template_params                              \
-            GMOCK_INTERNAL_DECL_TYPE_##value_params>                           \
+                GMOCK_INTERNAL_DECL_TYPE_##value_params>                       \
   template <typename function_type, typename return_type, typename args_type,  \
             GMOCK_ACTION_TEMPLATE_ARGS_NAMES_>                                 \
-  return_type GMOCK_ACTION_CLASS_(name, value_params)<                         \
-      GMOCK_INTERNAL_LIST_##template_params                                    \
-      GMOCK_INTERNAL_LIST_TYPE_##value_params>::gmock_Impl::gmock_PerformImpl( \
-          GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const
+  return_type GMOCK_ACTION_CLASS_(                                             \
+      name, value_params)<GMOCK_INTERNAL_LIST_##template_params                \
+                              GMOCK_INTERNAL_LIST_TYPE_##value_params>::       \
+      gmock_Impl::gmock_PerformImpl(GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_)  \
+          const
 
 namespace testing {
 
@@ -494,10 +582,7 @@ namespace testing {
 // the macro definition, as the warnings are generated when the macro
 // is expanded and macro expansion cannot contain #pragma.  Therefore
 // we suppress them here.
-#ifdef _MSC_VER
-# pragma warning(push)
-# pragma warning(disable:4100)
-#endif
+GTEST_DISABLE_MSC_WARNINGS_PUSH_(4100)
 
 namespace internal {
 
@@ -506,20 +591,23 @@ namespace internal {
 // Overloads for other custom-callables are provided in the
 // internal/custom/gmock-generated-actions.h header.
 template <typename F, typename... Args>
-auto InvokeArgument(F f, Args... args) -> decltype(f(args...)) {
-  return f(args...);
+auto InvokeArgument(F &&f,
+                    Args... args) -> decltype(std::forward<F>(f)(args...)) {
+  return std::forward<F>(f)(args...);
 }
 
 template <std::size_t index, typename... Params>
 struct InvokeArgumentAction {
-  template <typename... Args>
-  auto operator()(Args&&... args) const -> decltype(internal::InvokeArgument(
-      std::get<index>(std::forward_as_tuple(std::forward<Args>(args)...)),
-      std::declval<const Params&>()...)) {
-    internal::FlatTuple<Args&&...> args_tuple(FlatTupleConstructTag{},
-                                              std::forward<Args>(args)...);
-    return params.Apply([&](const Params&... unpacked_params) {
-      auto&& callable = args_tuple.template Get<index>();
+  template <typename... Args,
+            typename = typename std::enable_if<(index < sizeof...(Args))>::type>
+  auto operator()(Args &&...args) const
+      -> decltype(internal::InvokeArgument(
+          std::get<index>(std::forward_as_tuple(std::forward<Args>(args)...)),
+          std::declval<const Params &>()...)) {
+    internal::FlatTuple<Args &&...> args_tuple(FlatTupleConstructTag{},
+                                               std::forward<Args>(args)...);
+    return params.Apply([&](const Params &...unpacked_params) {
+      auto &&callable = std::move(args_tuple.template Get<index>());
       return internal::InvokeArgument(
           std::forward<decltype(callable)>(callable), unpacked_params...);
     });
@@ -559,14 +647,12 @@ struct InvokeArgumentAction {
 //   later.
 template <std::size_t index, typename... Params>
 internal::InvokeArgumentAction<index, typename std::decay<Params>::type...>
-InvokeArgument(Params&&... params) {
+InvokeArgument(Params &&...params) {
   return {internal::FlatTuple<typename std::decay<Params>::type...>(
       internal::FlatTupleConstructTag{}, std::forward<Params>(params)...)};
 }
 
-#ifdef _MSC_VER
-# pragma warning(pop)
-#endif
+GTEST_DISABLE_MSC_WARNINGS_POP_()  // 4100
 
 }  // namespace testing
 
diff --git a/external/googletest/googlemock/include/gmock/gmock-more-matchers.h b/external/googletest/googlemock/include/gmock/gmock-more-matchers.h
index dfc77e35..54ea68be 100644
--- a/external/googletest/googlemock/include/gmock/gmock-more-matchers.h
+++ b/external/googletest/googlemock/include/gmock/gmock-more-matchers.h
@@ -27,7 +27,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
 // Google Mock - a framework for writing C++ mock classes.
 //
 // This file implements some matchers that depend on gmock-matchers.h.
@@ -35,35 +34,64 @@
 // Note that tests are implemented in gmock-matchers_test.cc rather than
 // gmock-more-matchers-test.cc.
 
-// GOOGLETEST_CM0002 DO NOT DELETE
+// IWYU pragma: private, include "gmock/gmock.h"
+// IWYU pragma: friend gmock/.*
 
 #ifndef GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_MORE_MATCHERS_H_
 #define GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_MORE_MATCHERS_H_
 
+#include <ostream>
+#include <string>
+
 #include "gmock/gmock-matchers.h"
 
 namespace testing {
 
 // Silence C4100 (unreferenced formal
 // parameter) for MSVC
-#ifdef _MSC_VER
-# pragma warning(push)
-# pragma warning(disable:4100)
-#if (_MSC_VER == 1900)
+GTEST_DISABLE_MSC_WARNINGS_PUSH_(4100)
+#if defined(_MSC_VER) && (_MSC_VER == 1900)
 // and silence C4800 (C4800: 'int *const ': forcing value
 // to bool 'true' or 'false') for MSVC 14
-# pragma warning(disable:4800)
-  #endif
+GTEST_DISABLE_MSC_WARNINGS_PUSH_(4800)
 #endif
 
-// Defines a matcher that matches an empty container. The container must
-// support both size() and empty(), which all STL-like containers provide.
-MATCHER(IsEmpty, negation ? "isn't empty" : "is empty") {
-  if (arg.empty()) {
-    return true;
+namespace internal {
+
+// Implements the polymorphic IsEmpty matcher, which
+// can be used as a Matcher<T> as long as T is either a container that defines
+// empty() and size() (e.g. std::vector or std::string), or a C-style string.
+class IsEmptyMatcher {
+ public:
+  // Matches anything that defines empty() and size().
+  template <typename MatcheeContainerType>
+  bool MatchAndExplain(const MatcheeContainerType& c,
+                       MatchResultListener* listener) const {
+    if (c.empty()) {
+      return true;
+    }
+    *listener << "whose size is " << c.size();
+    return false;
+  }
+
+  // Matches C-style strings.
+  bool MatchAndExplain(const char* s, MatchResultListener* listener) const {
+    return MatchAndExplain(std::string(s), listener);
   }
-  *result_listener << "whose size is " << arg.size();
-  return false;
+
+  // Describes what this matcher matches.
+  void DescribeTo(std::ostream* os) const { *os << "is empty"; }
+
+  void DescribeNegationTo(std::ostream* os) const { *os << "isn't empty"; }
+};
+
+}  // namespace internal
+
+// Creates a polymorphic matcher that matches an empty container or C-style
+// string. The container must support both size() and empty(), which all
+// STL-like containers provide.
+inline PolymorphicMatcher<internal::IsEmptyMatcher> IsEmpty() {
+  return MakePolymorphicMatcher(internal::IsEmptyMatcher());
 }
 
 // Define a matcher that matches a value that evaluates in boolean
@@ -82,10 +110,10 @@ MATCHER(IsFalse, negation ? "is true" : "is false") {
   return !static_cast<bool>(arg);
 }
 
-#ifdef _MSC_VER
-# pragma warning(pop)
+#if defined(_MSC_VER) && (_MSC_VER == 1900)
+GTEST_DISABLE_MSC_WARNINGS_POP_()  // 4800
 #endif
-
+GTEST_DISABLE_MSC_WARNINGS_POP_()  // 4100
 
 }  // namespace testing
 
diff --git a/external/googletest/googlemock/include/gmock/gmock-nice-strict.h b/external/googletest/googlemock/include/gmock/gmock-nice-strict.h
index b03b770c..056d4714 100644
--- a/external/googletest/googlemock/include/gmock/gmock-nice-strict.h
+++ b/external/googletest/googlemock/include/gmock/gmock-nice-strict.h
@@ -27,7 +27,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
 // Implements class templates NiceMock, NaggyMock, and StrictMock.
 //
 // Given a mock class MockFoo that is created using Google Mock,
@@ -58,11 +57,13 @@
 // In particular, nesting NiceMock, NaggyMock, and StrictMock is NOT
 // supported.
 
-// GOOGLETEST_CM0002 DO NOT DELETE
+// IWYU pragma: private, include "gmock/gmock.h"
+// IWYU pragma: friend gmock/.*
 
 #ifndef GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_NICE_STRICT_H_
 #define GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_NICE_STRICT_H_
 
+#include <cstdint>
 #include <type_traits>
 
 #include "gmock/gmock-spec-builders.h"
@@ -97,7 +98,7 @@ constexpr bool HasStrictnessModifier() {
 // deregistration. This guarantees that MockClass's constructor and destructor
 // run with the same level of strictness as its instance methods.
 
-#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MINGW && \
+#if defined(GTEST_OS_WINDOWS) && !defined(GTEST_OS_WINDOWS_MINGW) && \
     (defined(_MSC_VER) || defined(__clang__))
 // We need to mark these classes with this declspec to ensure that
 // the empty base class optimization is performed.
@@ -109,25 +110,37 @@ constexpr bool HasStrictnessModifier() {
 template <typename Base>
 class NiceMockImpl {
  public:
-  NiceMockImpl() { ::testing::Mock::AllowUninterestingCalls(this); }
+  NiceMockImpl() {
+    ::testing::Mock::AllowUninterestingCalls(reinterpret_cast<uintptr_t>(this));
+  }
 
-  ~NiceMockImpl() { ::testing::Mock::UnregisterCallReaction(this); }
+  ~NiceMockImpl() {
+    ::testing::Mock::UnregisterCallReaction(reinterpret_cast<uintptr_t>(this));
+  }
 };
 
 template <typename Base>
 class NaggyMockImpl {
  public:
-  NaggyMockImpl() { ::testing::Mock::WarnUninterestingCalls(this); }
+  NaggyMockImpl() {
+    ::testing::Mock::WarnUninterestingCalls(reinterpret_cast<uintptr_t>(this));
+  }
 
-  ~NaggyMockImpl() { ::testing::Mock::UnregisterCallReaction(this); }
+  ~NaggyMockImpl() {
+    ::testing::Mock::UnregisterCallReaction(reinterpret_cast<uintptr_t>(this));
+  }
 };
 
 template <typename Base>
 class StrictMockImpl {
  public:
-  StrictMockImpl() { ::testing::Mock::FailUninterestingCalls(this); }
+  StrictMockImpl() {
+    ::testing::Mock::FailUninterestingCalls(reinterpret_cast<uintptr_t>(this));
+  }
 
-  ~StrictMockImpl() { ::testing::Mock::UnregisterCallReaction(this); }
+  ~StrictMockImpl() {
+    ::testing::Mock::UnregisterCallReaction(reinterpret_cast<uintptr_t>(this));
+  }
 };
 
 }  // namespace internal
@@ -169,7 +182,8 @@ class GTEST_INTERNAL_EMPTY_BASE_CLASS NiceMock
   }
 
  private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(NiceMock);
+  NiceMock(const NiceMock&) = delete;
+  NiceMock& operator=(const NiceMock&) = delete;
 };
 
 template <class MockClass>
@@ -210,7 +224,8 @@ class GTEST_INTERNAL_EMPTY_BASE_CLASS NaggyMock
   }
 
  private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(NaggyMock);
+  NaggyMock(const NaggyMock&) = delete;
+  NaggyMock& operator=(const NaggyMock&) = delete;
 };
 
 template <class MockClass>
@@ -251,7 +266,8 @@ class GTEST_INTERNAL_EMPTY_BASE_CLASS StrictMock
   }
 
  private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(StrictMock);
+  StrictMock(const StrictMock&) = delete;
+  StrictMock& operator=(const StrictMock&) = delete;
 };
 
 #undef GTEST_INTERNAL_EMPTY_BASE_CLASS
diff --git a/external/googletest/googlemock/include/gmock/gmock-spec-builders.h b/external/googletest/googlemock/include/gmock/gmock-spec-builders.h
index 41323c1c..c4c42b7c 100644
--- a/external/googletest/googlemock/include/gmock/gmock-spec-builders.h
+++ b/external/googletest/googlemock/include/gmock/gmock-spec-builders.h
@@ -27,7 +27,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
 // Google Mock - a framework for writing C++ mock classes.
 //
 // This file implements the ON_CALL() and EXPECT_CALL() macros.
@@ -56,20 +55,24 @@
 // where all clauses are optional, and .InSequence()/.After()/
 // .WillOnce() can appear any number of times.
 
-// GOOGLETEST_CM0002 DO NOT DELETE
+// IWYU pragma: private, include "gmock/gmock.h"
+// IWYU pragma: friend gmock/.*
 
 #ifndef GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_SPEC_BUILDERS_H_
 #define GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_SPEC_BUILDERS_H_
 
+#include <cstdint>
 #include <functional>
 #include <map>
 #include <memory>
+#include <ostream>
 #include <set>
 #include <sstream>
 #include <string>
 #include <type_traits>
 #include <utility>
 #include <vector>
+
 #include "gmock/gmock-actions.h"
 #include "gmock/gmock-cardinalities.h"
 #include "gmock/gmock-matchers.h"
@@ -78,7 +81,7 @@
 #include "gtest/gtest.h"
 
 #if GTEST_HAS_EXCEPTIONS
-# include <stdexcept>  // NOLINT
+#include <stdexcept>  // NOLINT
 #endif
 
 GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
@@ -97,13 +100,15 @@ class ExpectationSet;
 namespace internal {
 
 // Implements a mock function.
-template <typename F> class FunctionMocker;
+template <typename F>
+class FunctionMocker;
 
 // Base class for expectations.
 class ExpectationBase;
 
 // Implements an expectation.
-template <typename F> class TypedExpectation;
+template <typename F>
+class TypedExpectation;
 
 // Helper class for testing the Expectation class template.
 class ExpectationTester;
@@ -129,9 +134,6 @@ class NaggyMockImpl;
 // calls to ensure the integrity of the mock objects' states.
 GTEST_API_ GTEST_DECLARE_STATIC_MUTEX_(g_gmock_mutex);
 
-// Untyped base class for ActionResultHolder<R>.
-class UntypedActionResultHolderBase;
-
 // Abstract base class of FunctionMocker.  This is the
 // type-agnostic part of the function mocker interface.  Its pure
 // virtual methods are implemented by FunctionMocker.
@@ -154,27 +156,12 @@ class GTEST_API_ UntypedFunctionMockerBase {
   // responsibility to guarantee the correctness of the arguments'
   // types.
 
-  // Performs the default action with the given arguments and returns
-  // the action's result.  The call description string will be used in
-  // the error message to describe the call in the case the default
-  // action fails.
-  // L = *
-  virtual UntypedActionResultHolderBase* UntypedPerformDefaultAction(
-      void* untyped_args, const std::string& call_description) const = 0;
-
-  // Performs the given action with the given arguments and returns
-  // the action's result.
-  // L = *
-  virtual UntypedActionResultHolderBase* UntypedPerformAction(
-      const void* untyped_action, void* untyped_args) const = 0;
-
   // Writes a message that the call is uninteresting (i.e. neither
   // explicitly expected nor explicitly unexpected) to the given
   // ostream.
-  virtual void UntypedDescribeUninterestingCall(
-      const void* untyped_args,
-      ::std::ostream* os) const
-          GTEST_LOCK_EXCLUDED_(g_gmock_mutex) = 0;
+  virtual void UntypedDescribeUninterestingCall(const void* untyped_args,
+                                                ::std::ostream* os) const
+      GTEST_LOCK_EXCLUDED_(g_gmock_mutex) = 0;
 
   // Returns the expectation that matches the given function arguments
   // (or NULL is there's no match); when a match is found,
@@ -183,10 +170,9 @@ class GTEST_API_ UntypedFunctionMockerBase {
   // is_excessive is modified to indicate whether the call exceeds the
   // expected number.
   virtual const ExpectationBase* UntypedFindMatchingExpectation(
-      const void* untyped_args,
-      const void** untyped_action, bool* is_excessive,
+      const void* untyped_args, const void** untyped_action, bool* is_excessive,
       ::std::ostream* what, ::std::ostream* why)
-          GTEST_LOCK_EXCLUDED_(g_gmock_mutex) = 0;
+      GTEST_LOCK_EXCLUDED_(g_gmock_mutex) = 0;
 
   // Prints the given function arguments to the ostream.
   virtual void UntypedPrintArgs(const void* untyped_args,
@@ -196,8 +182,7 @@ class GTEST_API_ UntypedFunctionMockerBase {
   // this information in the global mock registry.  Will be called
   // whenever an EXPECT_CALL() or ON_CALL() is executed on this mock
   // method.
-  void RegisterOwner(const void* mock_obj)
-      GTEST_LOCK_EXCLUDED_(g_gmock_mutex);
+  void RegisterOwner(const void* mock_obj) GTEST_LOCK_EXCLUDED_(g_gmock_mutex);
 
   // Sets the mock object this mock method belongs to, and sets the
   // name of the mock function.  Will be called upon each invocation
@@ -208,26 +193,20 @@ class GTEST_API_ UntypedFunctionMockerBase {
   // Returns the mock object this mock method belongs to.  Must be
   // called after RegisterOwner() or SetOwnerAndName() has been
   // called.
-  const void* MockObject() const
-      GTEST_LOCK_EXCLUDED_(g_gmock_mutex);
+  const void* MockObject() const GTEST_LOCK_EXCLUDED_(g_gmock_mutex);
 
   // Returns the name of this mock method.  Must be called after
   // SetOwnerAndName() has been called.
-  const char* Name() const
-      GTEST_LOCK_EXCLUDED_(g_gmock_mutex);
-
-  // Returns the result of invoking this mock function with the given
-  // arguments.  This function can be safely called from multiple
-  // threads concurrently.  The caller is responsible for deleting the
-  // result.
-  UntypedActionResultHolderBase* UntypedInvokeWith(void* untyped_args)
-      GTEST_LOCK_EXCLUDED_(g_gmock_mutex);
+  const char* Name() const GTEST_LOCK_EXCLUDED_(g_gmock_mutex);
 
  protected:
   typedef std::vector<const void*> UntypedOnCallSpecs;
 
   using UntypedExpectations = std::vector<std::shared_ptr<ExpectationBase>>;
 
+  struct UninterestingCallCleanupHandler;
+  struct FailureCleanupHandler;
+
   // Returns an Expectation object that references and co-owns exp,
   // which must be an expectation on this mock function.
   Expectation GetHandleOf(ExpectationBase* exp);
@@ -430,29 +409,28 @@ class GTEST_API_ Mock {
 
   // Tells Google Mock to allow uninteresting calls on the given mock
   // object.
-  static void AllowUninterestingCalls(const void* mock_obj)
+  static void AllowUninterestingCalls(uintptr_t mock_obj)
       GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
 
   // Tells Google Mock to warn the user about uninteresting calls on
   // the given mock object.
-  static void WarnUninterestingCalls(const void* mock_obj)
+  static void WarnUninterestingCalls(uintptr_t mock_obj)
       GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
 
   // Tells Google Mock to fail uninteresting calls on the given mock
   // object.
-  static void FailUninterestingCalls(const void* mock_obj)
+  static void FailUninterestingCalls(uintptr_t mock_obj)
       GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
 
   // Tells Google Mock the given mock object is being destroyed and
   // its entry in the call-reaction table should be removed.
-  static void UnregisterCallReaction(const void* mock_obj)
+  static void UnregisterCallReaction(uintptr_t mock_obj)
       GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
 
   // Returns the reaction Google Mock will have on uninteresting calls
   // made on the given mock object.
   static internal::CallReaction GetReactionOnUninterestingCalls(
-      const void* mock_obj)
-          GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
+      const void* mock_obj) GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
 
   // Verifies that all expectations on the given mock object have been
   // satisfied.  Reports one or more Google Test non-fatal failures
@@ -465,17 +443,16 @@ class GTEST_API_ Mock {
       GTEST_EXCLUSIVE_LOCK_REQUIRED_(internal::g_gmock_mutex);
 
   // Registers a mock object and a mock method it owns.
-  static void Register(
-      const void* mock_obj,
-      internal::UntypedFunctionMockerBase* mocker)
-          GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
+  static void Register(const void* mock_obj,
+                       internal::UntypedFunctionMockerBase* mocker)
+      GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
 
   // Tells Google Mock where in the source code mock_obj is used in an
   // ON_CALL or EXPECT_CALL.  In case mock_obj is leaked, this
   // information helps the user identify which object it is.
-  static void RegisterUseByOnCallOrExpectCall(
-      const void* mock_obj, const char* file, int line)
-          GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
+  static void RegisterUseByOnCallOrExpectCall(const void* mock_obj,
+                                              const char* file, int line)
+      GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
 
   // Unregisters a mock method; removes the owning mock object from
   // the registry when the last mock method associated with it has
@@ -589,7 +566,7 @@ class ExpectationSet {
   typedef Expectation::Set::value_type value_type;
 
   // Constructs an empty set.
-  ExpectationSet() {}
+  ExpectationSet() = default;
 
   // This single-argument ctor must not be explicit, in order to support the
   //   ExpectationSet es = EXPECT_CALL(...);
@@ -632,7 +609,6 @@ class ExpectationSet {
   Expectation::Set expectations_;
 };
 
-
 // Sequence objects are used by a user to specify the relative order
 // in which the expectations should match.  They are copyable (we rely
 // on the compiler-defined copy constructor and assignment operator).
@@ -678,11 +654,13 @@ class GTEST_API_ InSequence {
  public:
   InSequence();
   ~InSequence();
+
  private:
   bool sequence_created_;
 
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(InSequence);  // NOLINT
-} GTEST_ATTRIBUTE_UNUSED_;
+  InSequence(const InSequence&) = delete;
+  InSequence& operator=(const InSequence&) = delete;
+};
 
 namespace internal {
 
@@ -732,6 +710,12 @@ class GTEST_API_ ExpectationBase {
   // describes it to the ostream.
   virtual void MaybeDescribeExtraMatcherTo(::std::ostream* os) = 0;
 
+  // Do not rely on this for correctness.
+  // This is only for making human-readable test output easier to understand.
+  void UntypedDescription(std::string description) {
+    description_ = std::move(description);
+  }
+
  protected:
   friend class ::testing::Expectation;
   friend class UntypedFunctionMockerBase;
@@ -784,40 +768,38 @@ class GTEST_API_ ExpectationBase {
   // the current thread.
 
   // Retires all pre-requisites of this expectation.
-  void RetireAllPreRequisites()
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex);
+  void RetireAllPreRequisites() GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex);
 
   // Returns true if and only if this expectation is retired.
-  bool is_retired() const
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+  bool is_retired() const GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
     g_gmock_mutex.AssertHeld();
     return retired_;
   }
 
   // Retires this expectation.
-  void Retire()
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+  void Retire() GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
     g_gmock_mutex.AssertHeld();
     retired_ = true;
   }
 
+  // Returns a human-readable description of this expectation.
+  // Do not rely on this for correctness. It is only for human readability.
+  const std::string& GetDescription() const { return description_; }
+
   // Returns true if and only if this expectation is satisfied.
-  bool IsSatisfied() const
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+  bool IsSatisfied() const GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
     g_gmock_mutex.AssertHeld();
     return cardinality().IsSatisfiedByCallCount(call_count_);
   }
 
   // Returns true if and only if this expectation is saturated.
-  bool IsSaturated() const
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+  bool IsSaturated() const GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
     g_gmock_mutex.AssertHeld();
     return cardinality().IsSaturatedByCallCount(call_count_);
   }
 
   // Returns true if and only if this expectation is over-saturated.
-  bool IsOverSaturated() const
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+  bool IsOverSaturated() const GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
     g_gmock_mutex.AssertHeld();
     return cardinality().IsOverSaturatedByCallCount(call_count_);
   }
@@ -832,15 +814,13 @@ class GTEST_API_ ExpectationBase {
       GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex);
 
   // Returns the number this expectation has been invoked.
-  int call_count() const
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+  int call_count() const GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
     g_gmock_mutex.AssertHeld();
     return call_count_;
   }
 
   // Increments the number this expectation has been invoked.
-  void IncrementCallCount()
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+  void IncrementCallCount() GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
     g_gmock_mutex.AssertHeld();
     call_count_++;
   }
@@ -849,8 +829,7 @@ class GTEST_API_ ExpectationBase {
   // WillRepeatedly() clauses) against the cardinality if this hasn't
   // been done before.  Prints a warning if there are too many or too
   // few actions.
-  void CheckActionCountIfNotDone() const
-      GTEST_LOCK_EXCLUDED_(mutex_);
+  void CheckActionCountIfNotDone() const GTEST_LOCK_EXCLUDED_(mutex_);
 
   friend class ::testing::Sequence;
   friend class ::testing::internal::ExpectationTester;
@@ -863,12 +842,13 @@ class GTEST_API_ ExpectationBase {
 
   // This group of fields are part of the spec and won't change after
   // an EXPECT_CALL() statement finishes.
-  const char* file_;          // The file that contains the expectation.
-  int line_;                  // The line number of the expectation.
+  const char* file_;               // The file that contains the expectation.
+  int line_;                       // The line number of the expectation.
   const std::string source_text_;  // The EXPECT_CALL(...) source text.
+  std::string description_;        // User-readable name for the expectation.
   // True if and only if the cardinality is specified explicitly.
   bool cardinality_specified_;
-  Cardinality cardinality_;            // The cardinality of the expectation.
+  Cardinality cardinality_;  // The cardinality of the expectation.
   // The immediate pre-requisites (i.e. expectations that must be
   // satisfied before this expectation can be matched) of this
   // expectation.  We use std::shared_ptr in the set because we want an
@@ -887,12 +867,18 @@ class GTEST_API_ ExpectationBase {
   bool retires_on_saturation_;
   Clause last_clause_;
   mutable bool action_count_checked_;  // Under mutex_.
-  mutable Mutex mutex_;  // Protects action_count_checked_.
+  mutable Mutex mutex_;                // Protects action_count_checked_.
 };  // class ExpectationBase
 
-// Impements an expectation for the given function type.
 template <typename F>
-class TypedExpectation : public ExpectationBase {
+class TypedExpectation;
+
+// Implements an expectation for the given function type.
+template <typename R, typename... Args>
+class TypedExpectation<R(Args...)> : public ExpectationBase {
+ private:
+  using F = R(Args...);
+
  public:
   typedef typename Function<F>::ArgumentTuple ArgumentTuple;
   typedef typename Function<F>::ArgumentMatcherTuple ArgumentMatcherTuple;
@@ -938,6 +924,13 @@ class TypedExpectation : public ExpectationBase {
     return *this;
   }
 
+  // Do not rely on this for correctness.
+  // This is only for making human-readable test output easier to understand.
+  TypedExpectation& Description(std::string name) {
+    ExpectationBase::UntypedDescription(std::move(name));
+    return *this;
+  }
+
   // Implements the .Times() clause.
   TypedExpectation& Times(const Cardinality& a_cardinality) {
     ExpectationBase::UntypedTimes(a_cardinality);
@@ -945,9 +938,7 @@ class TypedExpectation : public ExpectationBase {
   }
 
   // Implements the .Times() clause.
-  TypedExpectation& Times(int n) {
-    return Times(Exactly(n));
-  }
+  TypedExpectation& Times(int n) { return Times(Exactly(n)); }
 
   // Implements the .InSequence() clause.
   TypedExpectation& InSequence(const Sequence& s) {
@@ -1007,14 +998,31 @@ class TypedExpectation : public ExpectationBase {
     return After(s1, s2, s3, s4).After(s5);
   }
 
-  // Implements the .WillOnce() clause.
-  TypedExpectation& WillOnce(const Action<F>& action) {
+  // Preferred, type-safe overload: consume anything that can be directly
+  // converted to a OnceAction, except for Action<F> objects themselves.
+  TypedExpectation& WillOnce(OnceAction<F> once_action) {
+    // Call the overload below, smuggling the OnceAction as a copyable callable.
+    // We know this is safe because a WillOnce action will not be called more
+    // than once.
+    return WillOnce(Action<F>(ActionAdaptor{
+        std::make_shared<OnceAction<F>>(std::move(once_action)),
+    }));
+  }
+
+  // Fallback overload: accept Action<F> objects and those actions that define
+  // `operator Action<F>` but not `operator OnceAction<F>`.
+  //
+  // This is templated in order to cause the overload above to be preferred
+  // when the input is convertible to either type.
+  template <int&... ExplicitArgumentBarrier, typename = void>
+  TypedExpectation& WillOnce(Action<F> action) {
     ExpectSpecProperty(last_clause_ <= kWillOnce,
                        ".WillOnce() cannot appear after "
                        ".WillRepeatedly() or .RetiresOnSaturation().");
     last_clause_ = kWillOnce;
 
-    untyped_actions_.push_back(new Action<F>(action));
+    untyped_actions_.push_back(new Action<F>(std::move(action)));
+
     if (!cardinality_specified()) {
       set_cardinality(Exactly(static_cast<int>(untyped_actions_.size())));
     }
@@ -1062,9 +1070,7 @@ class TypedExpectation : public ExpectationBase {
 
   // Returns the matchers for the arguments as specified inside the
   // EXPECT_CALL() macro.
-  const ArgumentMatcherTuple& matchers() const {
-    return matchers_;
-  }
+  const ArgumentMatcherTuple& matchers() const { return matchers_; }
 
   // Returns the matcher specified by the .With() clause.
   const Matcher<const ArgumentTuple&>& extra_matcher() const {
@@ -1088,6 +1094,16 @@ class TypedExpectation : public ExpectationBase {
   template <typename Function>
   friend class FunctionMocker;
 
+  // An adaptor that turns a OneAction<F> into something compatible with
+  // Action<F>. Must be called at most once.
+  struct ActionAdaptor {
+    std::shared_ptr<OnceAction<R(Args...)>> once_action;
+
+    R operator()(Args&&... args) const {
+      return std::move(*once_action).Call(std::forward<Args>(args)...);
+    }
+  };
+
   // Returns an Expectation object that references and co-owns this
   // expectation.
   Expectation GetHandle() override { return owner_->GetHandleOf(this); }
@@ -1119,10 +1135,8 @@ class TypedExpectation : public ExpectationBase {
 
   // Describes the result of matching the arguments against this
   // expectation to the given ostream.
-  void ExplainMatchResultTo(
-      const ArgumentTuple& args,
-      ::std::ostream* os) const
-          GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+  void ExplainMatchResultTo(const ArgumentTuple& args, ::std::ostream* os) const
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
     g_gmock_mutex.AssertHeld();
 
     if (is_retired()) {
@@ -1181,9 +1195,9 @@ class TypedExpectation : public ExpectationBase {
       ::std::stringstream ss;
       DescribeLocationTo(&ss);
       ss << "Actions ran out in " << source_text() << "...\n"
-         << "Called " << count << " times, but only "
-         << action_count << " WillOnce()"
-         << (action_count == 1 ? " is" : "s are") << " specified - ";
+         << "Called " << count << " times, but only " << action_count
+         << " WillOnce()" << (action_count == 1 ? " is" : "s are")
+         << " specified - ";
       mocker->DescribeDefaultActionTo(args, &ss);
       Log(kWarning, ss.str(), 1);
     }
@@ -1207,10 +1221,15 @@ class TypedExpectation : public ExpectationBase {
                                          ::std::ostream* why)
       GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
     g_gmock_mutex.AssertHeld();
+    const ::std::string& expectation_description = GetDescription();
     if (IsSaturated()) {
       // We have an excessive call.
       IncrementCallCount();
-      *what << "Mock function called more times than expected - ";
+      *what << "Mock function ";
+      if (!expectation_description.empty()) {
+        *what << "\"" << expectation_description << "\" ";
+      }
+      *what << "called more times than expected - ";
       mocker->DescribeDefaultActionTo(args, what);
       DescribeCallCountTo(why);
 
@@ -1225,7 +1244,11 @@ class TypedExpectation : public ExpectationBase {
     }
 
     // Must be done after IncrementCount()!
-    *what << "Mock function call matches " << source_text() <<"...\n";
+    *what << "Mock function ";
+    if (!expectation_description.empty()) {
+      *what << "\"" << expectation_description << "\" ";
+    }
+    *what << "call matches " << source_text() << "...\n";
     return &(GetCurrentAction(mocker, args));
   }
 
@@ -1236,7 +1259,8 @@ class TypedExpectation : public ExpectationBase {
   Matcher<const ArgumentTuple&> extra_matcher_;
   Action<F> repeated_action_;
 
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(TypedExpectation);
+  TypedExpectation(const TypedExpectation&) = delete;
+  TypedExpectation& operator=(const TypedExpectation&) = delete;
 };  // class TypedExpectation
 
 // A MockSpec object is used by ON_CALL() or EXPECT_CALL() for
@@ -1258,8 +1282,8 @@ template <typename F>
 class MockSpec {
  public:
   typedef typename internal::Function<F>::ArgumentTuple ArgumentTuple;
-  typedef typename internal::Function<F>::ArgumentMatcherTuple
-      ArgumentMatcherTuple;
+  typedef
+      typename internal::Function<F>::ArgumentMatcherTuple ArgumentMatcherTuple;
 
   // Constructs a MockSpec object, given the function mocker object
   // that the spec is associated with.
@@ -1269,8 +1293,9 @@ class MockSpec {
 
   // Adds a new default action spec to the function mocker and returns
   // the newly created spec.
-  internal::OnCallSpec<F>& InternalDefaultActionSetAt(
-      const char* file, int line, const char* obj, const char* call) {
+  internal::OnCallSpec<F>& InternalDefaultActionSetAt(const char* file,
+                                                      int line, const char* obj,
+                                                      const char* call) {
     LogWithLocation(internal::kInfo, file, line,
                     std::string("ON_CALL(") + obj + ", " + call + ") invoked");
     return function_mocker_->AddNewOnCallSpec(file, line, matchers_);
@@ -1278,13 +1303,14 @@ class MockSpec {
 
   // Adds a new expectation spec to the function mocker and returns
   // the newly created spec.
-  internal::TypedExpectation<F>& InternalExpectedAt(
-      const char* file, int line, const char* obj, const char* call) {
+  internal::TypedExpectation<F>& InternalExpectedAt(const char* file, int line,
+                                                    const char* obj,
+                                                    const char* call) {
     const std::string source_text(std::string("EXPECT_CALL(") + obj + ", " +
                                   call + ")");
     LogWithLocation(internal::kInfo, file, line, source_text + " invoked");
-    return function_mocker_->AddNewExpectation(
-        file, line, source_text, matchers_);
+    return function_mocker_->AddNewExpectation(file, line, source_text,
+                                               matchers_);
   }
 
   // This operator overload is used to swallow the superfluous parameter list
@@ -1317,9 +1343,7 @@ template <typename T>
 class ReferenceOrValueWrapper {
  public:
   // Constructs a wrapper from the given value/reference.
-  explicit ReferenceOrValueWrapper(T value)
-      : value_(std::move(value)) {
-  }
+  explicit ReferenceOrValueWrapper(T value) : value_(std::move(value)) {}
 
   // Unwraps and returns the underlying value/reference, exactly as
   // originally passed. The behavior of calling this more than once on
@@ -1330,9 +1354,7 @@ class ReferenceOrValueWrapper {
   // Always returns a const reference (more precisely,
   // const std::add_lvalue_reference<T>::type). The behavior of calling this
   // after calling Unwrap on the same object is unspecified.
-  const T& Peek() const {
-    return value_;
-  }
+  const T& Peek() const { return value_; }
 
  private:
   T value_;
@@ -1346,8 +1368,7 @@ class ReferenceOrValueWrapper<T&> {
   // Workaround for debatable pass-by-reference lint warning (c-library-team
   // policy precludes NOLINT in this context)
   typedef T& reference;
-  explicit ReferenceOrValueWrapper(reference ref)
-      : value_ptr_(&ref) {}
+  explicit ReferenceOrValueWrapper(reference ref) : value_ptr_(&ref) {}
   T& Unwrap() { return *value_ptr_; }
   const T& Peek() const { return *value_ptr_; }
 
@@ -1355,102 +1376,62 @@ class ReferenceOrValueWrapper<T&> {
   T* value_ptr_;
 };
 
-// C++ treats the void type specially.  For example, you cannot define
-// a void-typed variable or pass a void value to a function.
-// ActionResultHolder<T> holds a value of type T, where T must be a
-// copyable type or void (T doesn't need to be default-constructable).
-// It hides the syntactic difference between void and other types, and
-// is used to unify the code for invoking both void-returning and
-// non-void-returning mock functions.
-
-// Untyped base class for ActionResultHolder<T>.
-class UntypedActionResultHolderBase {
- public:
-  virtual ~UntypedActionResultHolderBase() {}
-
-  // Prints the held value as an action's result to os.
-  virtual void PrintAsActionResult(::std::ostream* os) const = 0;
-};
-
-// This generic definition is used when T is not void.
+// Prints the held value as an action's result to os.
 template <typename T>
-class ActionResultHolder : public UntypedActionResultHolderBase {
- public:
-  // Returns the held value. Must not be called more than once.
-  T Unwrap() {
-    return result_.Unwrap();
-  }
-
-  // Prints the held value as an action's result to os.
-  void PrintAsActionResult(::std::ostream* os) const override {
-    *os << "\n          Returns: ";
-    // T may be a reference type, so we don't use UniversalPrint().
-    UniversalPrinter<T>::Print(result_.Peek(), os);
-  }
+void PrintAsActionResult(const T& result, std::ostream& os) {
+  os << "\n          Returns: ";
+  // T may be a reference type, so we don't use UniversalPrint().
+  UniversalPrinter<T>::Print(result, &os);
+}
 
-  // Performs the given mock function's default action and returns the
-  // result in a new-ed ActionResultHolder.
-  template <typename F>
-  static ActionResultHolder* PerformDefaultAction(
-      const FunctionMocker<F>* func_mocker,
-      typename Function<F>::ArgumentTuple&& args,
-      const std::string& call_description) {
-    return new ActionResultHolder(Wrapper(func_mocker->PerformDefaultAction(
-        std::move(args), call_description)));
-  }
+// Reports an uninteresting call (whose description is in msg) in the
+// manner specified by 'reaction'.
+GTEST_API_ void ReportUninterestingCall(CallReaction reaction,
+                                        const std::string& msg);
 
-  // Performs the given action and returns the result in a new-ed
-  // ActionResultHolder.
-  template <typename F>
-  static ActionResultHolder* PerformAction(
-      const Action<F>& action, typename Function<F>::ArgumentTuple&& args) {
-    return new ActionResultHolder(
-        Wrapper(action.Perform(std::move(args))));
-  }
+// A generic RAII type that runs a user-provided function in its destructor.
+class Cleanup final {
+ public:
+  explicit Cleanup(std::function<void()> f) : f_(std::move(f)) {}
+  ~Cleanup() { f_(); }
 
  private:
-  typedef ReferenceOrValueWrapper<T> Wrapper;
-
-  explicit ActionResultHolder(Wrapper result)
-      : result_(std::move(result)) {
-  }
-
-  Wrapper result_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ActionResultHolder);
+  std::function<void()> f_;
 };
 
-// Specialization for T = void.
-template <>
-class ActionResultHolder<void> : public UntypedActionResultHolderBase {
- public:
-  void Unwrap() { }
-
-  void PrintAsActionResult(::std::ostream* /* os */) const override {}
+struct UntypedFunctionMockerBase::UninterestingCallCleanupHandler {
+  CallReaction reaction;
+  std::stringstream& ss;
 
-  // Performs the given mock function's default action and returns ownership
-  // of an empty ActionResultHolder*.
-  template <typename F>
-  static ActionResultHolder* PerformDefaultAction(
-      const FunctionMocker<F>* func_mocker,
-      typename Function<F>::ArgumentTuple&& args,
-      const std::string& call_description) {
-    func_mocker->PerformDefaultAction(std::move(args), call_description);
-    return new ActionResultHolder;
+  ~UninterestingCallCleanupHandler() {
+    ReportUninterestingCall(reaction, ss.str());
   }
+};
 
-  // Performs the given action and returns ownership of an empty
-  // ActionResultHolder*.
-  template <typename F>
-  static ActionResultHolder* PerformAction(
-      const Action<F>& action, typename Function<F>::ArgumentTuple&& args) {
-    action.Perform(std::move(args));
-    return new ActionResultHolder;
+struct UntypedFunctionMockerBase::FailureCleanupHandler {
+  std::stringstream& ss;
+  std::stringstream& why;
+  std::stringstream& loc;
+  const ExpectationBase* untyped_expectation;
+  bool found;
+  bool is_excessive;
+
+  ~FailureCleanupHandler() {
+    ss << "\n" << why.str();
+
+    if (!found) {
+      // No expectation matches this call - reports a failure.
+      Expect(false, nullptr, -1, ss.str());
+    } else if (is_excessive) {
+      // We had an upper-bound violation and the failure message is in ss.
+      Expect(false, untyped_expectation->file(), untyped_expectation->line(),
+             ss.str());
+    } else {
+      // We had an expected call and the matching expectation is
+      // described in ss.
+      Log(kInfo, loc.str() + ss.str(), 2);
+    }
   }
-
- private:
-  ActionResultHolder() {}
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ActionResultHolder);
 };
 
 template <typename F>
@@ -1465,7 +1446,7 @@ class FunctionMocker<R(Args...)> final : public UntypedFunctionMockerBase {
   using ArgumentTuple = std::tuple<Args...>;
   using ArgumentMatcherTuple = std::tuple<Matcher<Args>...>;
 
-  FunctionMocker() {}
+  FunctionMocker() = default;
 
   // There is no generally useful and implementable semantics of
   // copying a mock object, so copying a mock is usually a user error.
@@ -1495,14 +1476,12 @@ class FunctionMocker<R(Args...)> final : public UntypedFunctionMockerBase {
   // Returns the ON_CALL spec that matches this mock function with the
   // given arguments; returns NULL if no matching ON_CALL is found.
   // L = *
-  const OnCallSpec<F>* FindOnCallSpec(
-      const ArgumentTuple& args) const {
-    for (UntypedOnCallSpecs::const_reverse_iterator it
-             = untyped_on_call_specs_.rbegin();
+  const OnCallSpec<F>* FindOnCallSpec(const ArgumentTuple& args) const {
+    for (UntypedOnCallSpecs::const_reverse_iterator it =
+             untyped_on_call_specs_.rbegin();
          it != untyped_on_call_specs_.rend(); ++it) {
       const OnCallSpec<F>* spec = static_cast<const OnCallSpec<F>*>(*it);
-      if (spec->Matches(args))
-        return spec;
+      if (spec->Matches(args)) return spec;
     }
 
     return nullptr;
@@ -1510,15 +1489,14 @@ class FunctionMocker<R(Args...)> final : public UntypedFunctionMockerBase {
 
   // Performs the default action of this mock function on the given
   // arguments and returns the result. Asserts (or throws if
-  // exceptions are enabled) with a helpful call descrption if there
+  // exceptions are enabled) with a helpful call description if there
   // is no valid return value. This method doesn't depend on the
   // mutable state of this object, and thus can be called concurrently
   // without locking.
   // L = *
   Result PerformDefaultAction(ArgumentTuple&& args,
                               const std::string& call_description) const {
-    const OnCallSpec<F>* const spec =
-        this->FindOnCallSpec(args);
+    const OnCallSpec<F>* const spec = this->FindOnCallSpec(args);
     if (spec != nullptr) {
       return spec->GetAction().Perform(std::move(args));
     }
@@ -1536,32 +1514,6 @@ class FunctionMocker<R(Args...)> final : public UntypedFunctionMockerBase {
     return DefaultValue<Result>::Get();
   }
 
-  // Performs the default action with the given arguments and returns
-  // the action's result.  The call description string will be used in
-  // the error message to describe the call in the case the default
-  // action fails.  The caller is responsible for deleting the result.
-  // L = *
-  UntypedActionResultHolderBase* UntypedPerformDefaultAction(
-      void* untyped_args,  // must point to an ArgumentTuple
-      const std::string& call_description) const override {
-    ArgumentTuple* args = static_cast<ArgumentTuple*>(untyped_args);
-    return ResultHolder::PerformDefaultAction(this, std::move(*args),
-                                              call_description);
-  }
-
-  // Performs the given action with the given arguments and returns
-  // the action's result.  The caller is responsible for deleting the
-  // result.
-  // L = *
-  UntypedActionResultHolderBase* UntypedPerformAction(
-      const void* untyped_action, void* untyped_args) const override {
-    // Make a copy of the action before performing it, in case the
-    // action deletes the mock object (and thus deletes itself).
-    const Action<F> action = *static_cast<const Action<F>*>(untyped_action);
-    ArgumentTuple* args = static_cast<ArgumentTuple*>(untyped_args);
-    return ResultHolder::PerformAction(action, std::move(*args));
-  }
-
   // Implements UntypedFunctionMockerBase::ClearDefaultActionsLocked():
   // clears the ON_CALL()s set on this mock function.
   void ClearDefaultActionsLocked() override
@@ -1579,8 +1531,7 @@ class FunctionMocker<R(Args...)> final : public UntypedFunctionMockerBase {
     untyped_on_call_specs_.swap(specs_to_delete);
 
     g_gmock_mutex.Unlock();
-    for (UntypedOnCallSpecs::const_iterator it =
-             specs_to_delete.begin();
+    for (UntypedOnCallSpecs::const_iterator it = specs_to_delete.begin();
          it != specs_to_delete.end(); ++it) {
       delete static_cast<const OnCallSpec<F>*>(*it);
     }
@@ -1594,10 +1545,7 @@ class FunctionMocker<R(Args...)> final : public UntypedFunctionMockerBase {
   // arguments.  This function can be safely called from multiple
   // threads concurrently.
   Result Invoke(Args... args) GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
-    ArgumentTuple tuple(std::forward<Args>(args)...);
-    std::unique_ptr<ResultHolder> holder(DownCast_<ResultHolder*>(
-        this->UntypedInvokeWith(static_cast<void*>(&tuple))));
-    return holder->Unwrap();
+    return InvokeWith(ArgumentTuple(std::forward<Args>(args)...));
   }
 
   MockSpec<F> With(Matcher<Args>... m) {
@@ -1608,13 +1556,10 @@ class FunctionMocker<R(Args...)> final : public UntypedFunctionMockerBase {
   template <typename Function>
   friend class MockSpec;
 
-  typedef ActionResultHolder<Result> ResultHolder;
-
   // Adds and returns a default action spec for this mock function.
-  OnCallSpec<F>& AddNewOnCallSpec(
-      const char* file, int line,
-      const ArgumentMatcherTuple& m)
-          GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
+  OnCallSpec<F>& AddNewOnCallSpec(const char* file, int line,
+                                  const ArgumentMatcherTuple& m)
+      GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
     Mock::RegisterUseByOnCallOrExpectCall(MockObject(), file, line);
     OnCallSpec<F>* const on_call_spec = new OnCallSpec<F>(file, line, m);
     untyped_on_call_specs_.push_back(on_call_spec);
@@ -1644,7 +1589,8 @@ class FunctionMocker<R(Args...)> final : public UntypedFunctionMockerBase {
   }
 
  private:
-  template <typename Func> friend class TypedExpectation;
+  template <typename Func>
+  friend class TypedExpectation;
 
   // Some utilities needed for implementing UntypedInvokeWith().
 
@@ -1728,9 +1674,8 @@ class FunctionMocker<R(Args...)> final : public UntypedFunctionMockerBase {
 
   // Returns the expectation that matches the arguments, or NULL if no
   // expectation matches them.
-  TypedExpectation<F>* FindMatchingExpectationLocked(
-      const ArgumentTuple& args) const
-          GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+  TypedExpectation<F>* FindMatchingExpectationLocked(const ArgumentTuple& args)
+      const GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
     g_gmock_mutex.AssertHeld();
     // See the definition of untyped_expectations_ for why access to
     // it is unprotected here.
@@ -1747,11 +1692,10 @@ class FunctionMocker<R(Args...)> final : public UntypedFunctionMockerBase {
   }
 
   // Returns a message that the arguments don't match any expectation.
-  void FormatUnexpectedCallMessageLocked(
-      const ArgumentTuple& args,
-      ::std::ostream* os,
-      ::std::ostream* why) const
-          GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+  void FormatUnexpectedCallMessageLocked(const ArgumentTuple& args,
+                                         ::std::ostream* os,
+                                         ::std::ostream* why) const
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
     g_gmock_mutex.AssertHeld();
     *os << "\nUnexpected mock function call - ";
     DescribeDefaultActionTo(args, os);
@@ -1760,15 +1704,14 @@ class FunctionMocker<R(Args...)> final : public UntypedFunctionMockerBase {
 
   // Prints a list of expectations that have been tried against the
   // current mock function call.
-  void PrintTriedExpectationsLocked(
-      const ArgumentTuple& args,
-      ::std::ostream* why) const
-          GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+  void PrintTriedExpectationsLocked(const ArgumentTuple& args,
+                                    ::std::ostream* why) const
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
     g_gmock_mutex.AssertHeld();
     const size_t count = untyped_expectations_.size();
     *why << "Google Mock tried the following " << count << " "
-         << (count == 1 ? "expectation, but it didn't match" :
-             "expectations, but none matched")
+         << (count == 1 ? "expectation, but it didn't match"
+                        : "expectations, but none matched")
          << ":\n";
     for (size_t i = 0; i < count; i++) {
       TypedExpectation<F>* const expectation =
@@ -1783,11 +1726,174 @@ class FunctionMocker<R(Args...)> final : public UntypedFunctionMockerBase {
       expectation->DescribeCallCountTo(why);
     }
   }
+
+  // Performs the given action (or the default if it's null) with the given
+  // arguments and returns the action's result.
+  // L = *
+  R PerformAction(const void* untyped_action, ArgumentTuple&& args,
+                  const std::string& call_description) const {
+    if (untyped_action == nullptr) {
+      return PerformDefaultAction(std::move(args), call_description);
+    }
+
+    // Make a copy of the action before performing it, in case the
+    // action deletes the mock object (and thus deletes itself).
+    const Action<F> action = *static_cast<const Action<F>*>(untyped_action);
+    return action.Perform(std::move(args));
+  }
+
+  // Is it possible to store an object of the supplied type in a local variable
+  // for the sake of printing it, then return it on to the caller?
+  template <typename T>
+  using can_print_result = internal::conjunction<
+      // void can't be stored as an object (and we also don't need to print it).
+      internal::negation<std::is_void<T>>,
+      // Non-moveable types can't be returned on to the user, so there's no way
+      // for us to intercept and print them.
+      std::is_move_constructible<T>>;
+
+  // Perform the supplied action, printing the result to os.
+  template <typename T = R,
+            typename std::enable_if<can_print_result<T>::value, int>::type = 0>
+  R PerformActionAndPrintResult(const void* const untyped_action,
+                                ArgumentTuple&& args,
+                                const std::string& call_description,
+                                std::ostream& os) {
+    R result = PerformAction(untyped_action, std::move(args), call_description);
+
+    PrintAsActionResult(result, os);
+    return std::forward<R>(result);
+  }
+
+  // An overload for when it's not possible to print the result. In this case we
+  // simply perform the action.
+  template <typename T = R,
+            typename std::enable_if<
+                internal::negation<can_print_result<T>>::value, int>::type = 0>
+  R PerformActionAndPrintResult(const void* const untyped_action,
+                                ArgumentTuple&& args,
+                                const std::string& call_description,
+                                std::ostream&) {
+    return PerformAction(untyped_action, std::move(args), call_description);
+  }
+
+  // Returns the result of invoking this mock function with the given
+  // arguments. This function can be safely called from multiple
+  // threads concurrently.
+  R InvokeWith(ArgumentTuple&& args) GTEST_LOCK_EXCLUDED_(g_gmock_mutex);
 };  // class FunctionMocker
 
-// Reports an uninteresting call (whose description is in msg) in the
-// manner specified by 'reaction'.
-void ReportUninterestingCall(CallReaction reaction, const std::string& msg);
+// Calculates the result of invoking this mock function with the given
+// arguments, prints it, and returns it.
+template <typename R, typename... Args>
+R FunctionMocker<R(Args...)>::InvokeWith(ArgumentTuple&& args)
+    GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
+  // See the definition of untyped_expectations_ for why access to it
+  // is unprotected here.
+  if (untyped_expectations_.size() == 0) {
+    // No expectation is set on this mock method - we have an
+    // uninteresting call.
+
+    // We must get Google Mock's reaction on uninteresting calls
+    // made on this mock object BEFORE performing the action,
+    // because the action may DELETE the mock object and make the
+    // following expression meaningless.
+    const CallReaction reaction =
+        Mock::GetReactionOnUninterestingCalls(MockObject());
+
+    // True if and only if we need to print this call's arguments and return
+    // value.  This definition must be kept in sync with
+    // the behavior of ReportUninterestingCall().
+    const bool need_to_report_uninteresting_call =
+        // If the user allows this uninteresting call, we print it
+        // only when they want informational messages.
+        reaction == kAllow ? LogIsVisible(kInfo) :
+                           // If the user wants this to be a warning, we print
+                           // it only when they want to see warnings.
+            reaction == kWarn
+            ? LogIsVisible(kWarning)
+            :
+            // Otherwise, the user wants this to be an error, and we
+            // should always print detailed information in the error.
+            true;
+
+    if (!need_to_report_uninteresting_call) {
+      // Perform the action without printing the call information.
+      return this->PerformDefaultAction(
+          std::move(args), "Function call: " + std::string(Name()));
+    }
+
+    // Warns about the uninteresting call.
+    ::std::stringstream ss;
+    this->UntypedDescribeUninterestingCall(&args, &ss);
+
+    // Perform the action, print the result, and then report the uninteresting
+    // call.
+    //
+    // We use RAII to do the latter in case R is void or a non-moveable type. In
+    // either case we can't assign it to a local variable.
+    //
+    // Note that std::bind() is essential here.
+    // We *don't* use any local callback types (like lambdas).
+    // Doing so slows down compilation dramatically because the *constructor* of
+    // std::function<T> is re-instantiated with different template
+    // parameters each time.
+    const UninterestingCallCleanupHandler report_uninteresting_call = {reaction,
+                                                                       ss};
+
+    return PerformActionAndPrintResult(nullptr, std::move(args), ss.str(), ss);
+  }
+
+  bool is_excessive = false;
+  ::std::stringstream ss;
+  ::std::stringstream why;
+  ::std::stringstream loc;
+  const void* untyped_action = nullptr;
+
+  // The UntypedFindMatchingExpectation() function acquires and
+  // releases g_gmock_mutex.
+
+  const ExpectationBase* const untyped_expectation =
+      this->UntypedFindMatchingExpectation(&args, &untyped_action,
+                                           &is_excessive, &ss, &why);
+  const bool found = untyped_expectation != nullptr;
+
+  // True if and only if we need to print the call's arguments
+  // and return value.
+  // This definition must be kept in sync with the uses of Expect()
+  // and Log() in this function.
+  const bool need_to_report_call =
+      !found || is_excessive || LogIsVisible(kInfo);
+  if (!need_to_report_call) {
+    // Perform the action without printing the call information.
+    return PerformAction(untyped_action, std::move(args), "");
+  }
+
+  ss << "    Function call: " << Name();
+  this->UntypedPrintArgs(&args, &ss);
+
+  // In case the action deletes a piece of the expectation, we
+  // generate the message beforehand.
+  if (found && !is_excessive) {
+    untyped_expectation->DescribeLocationTo(&loc);
+  }
+
+  // Perform the action, print the result, and then fail or log in whatever way
+  // is appropriate.
+  //
+  // We use RAII to do the latter in case R is void or a non-moveable type. In
+  // either case we can't assign it to a local variable.
+  //
+  // Note that we *don't* use any local callback types (like lambdas) here.
+  // Doing so slows down compilation dramatically because the *constructor* of
+  // std::function<T> is re-instantiated with different template
+  // parameters each time.
+  const FailureCleanupHandler handle_failures = {
+      ss, why, loc, untyped_expectation, found, is_excessive};
+
+  return PerformActionAndPrintResult(untyped_action, std::move(args), ss.str(),
+                                     ss);
+}
 
 }  // namespace internal
 
@@ -1952,7 +2058,9 @@ using internal::MockSpec;
 //   // Expects a call to const MockFoo::Bar().
 //   EXPECT_CALL(Const(foo), Bar());
 template <typename T>
-inline const T& Const(const T& x) { return x; }
+inline const T& Const(const T& x) {
+  return x;
+}
 
 // Constructs an Expectation object that references and co-owns exp.
 inline Expectation::Expectation(internal::ExpectationBase& exp)  // NOLINT
diff --git a/external/googletest/googlemock/include/gmock/gmock.h b/external/googletest/googlemock/include/gmock/gmock.h
index 8a8358c0..c78fb8ee 100644
--- a/external/googletest/googlemock/include/gmock/gmock.h
+++ b/external/googletest/googlemock/include/gmock/gmock.h
@@ -31,8 +31,6 @@
 //
 // This is the main header file a user should include.
 
-// GOOGLETEST_CM0002 DO NOT DELETE
-
 #ifndef GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_H_
 #define GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_H_
 
@@ -55,22 +53,24 @@
 //
 // where all clauses are optional and WillOnce() can be repeated.
 
-#include "gmock/gmock-actions.h"
-#include "gmock/gmock-cardinalities.h"
-#include "gmock/gmock-function-mocker.h"
-#include "gmock/gmock-matchers.h"
-#include "gmock/gmock-more-actions.h"
-#include "gmock/gmock-more-matchers.h"
-#include "gmock/gmock-nice-strict.h"
+#include "gmock/gmock-actions.h"  // IWYU pragma: export
+#include "gmock/gmock-cardinalities.h"  // IWYU pragma: export
+#include "gmock/gmock-function-mocker.h"  // IWYU pragma: export
+#include "gmock/gmock-matchers.h"  // IWYU pragma: export
+#include "gmock/gmock-more-actions.h"  // IWYU pragma: export
+#include "gmock/gmock-more-matchers.h"  // IWYU pragma: export
+#include "gmock/gmock-nice-strict.h"  // IWYU pragma: export
+#include "gmock/gmock-spec-builders.h"  // IWYU pragma: export
 #include "gmock/internal/gmock-internal-utils.h"
-
-namespace testing {
+#include "gmock/internal/gmock-port.h"
 
 // Declares Google Mock flags that we want a user to use programmatically.
 GMOCK_DECLARE_bool_(catch_leaked_mocks);
 GMOCK_DECLARE_string_(verbose);
 GMOCK_DECLARE_int32_(default_mock_behavior);
 
+namespace testing {
+
 // Initializes Google Mock.  This must be called before running the
 // tests.  In particular, it parses the command line for the flags
 // that Google Mock recognizes.  Whenever a Google Mock flag is seen,
diff --git a/external/googletest/googlemock/include/gmock/internal/custom/README.md b/external/googletest/googlemock/include/gmock/internal/custom/README.md
index 21491ee1..9c4874fd 100644
--- a/external/googletest/googlemock/include/gmock/internal/custom/README.md
+++ b/external/googletest/googlemock/include/gmock/internal/custom/README.md
@@ -8,9 +8,11 @@ The following macros can be defined:
 
 ### Flag related macros:
 
-* `GMOCK_DECLARE_bool_(name)`
-* `GMOCK_DECLARE_int32_(name)`
-* `GMOCK_DECLARE_string_(name)`
-* `GMOCK_DEFINE_bool_(name, default_val, doc)`
-* `GMOCK_DEFINE_int32_(name, default_val, doc)`
-* `GMOCK_DEFINE_string_(name, default_val, doc)`
+*   `GMOCK_DECLARE_bool_(name)`
+*   `GMOCK_DECLARE_int32_(name)`
+*   `GMOCK_DECLARE_string_(name)`
+*   `GMOCK_DEFINE_bool_(name, default_val, doc)`
+*   `GMOCK_DEFINE_int32_(name, default_val, doc)`
+*   `GMOCK_DEFINE_string_(name, default_val, doc)`
+*   `GMOCK_FLAG_GET(flag_name)`
+*   `GMOCK_FLAG_SET(flag_name, value)`
diff --git a/external/googletest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h b/external/googletest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h
index 63f89996..bbcad31c 100644
--- a/external/googletest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h
+++ b/external/googletest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h
@@ -1,4 +1,5 @@
-// GOOGLETEST_CM0002 DO NOT DELETE
+// IWYU pragma: private, include "gmock/gmock.h"
+// IWYU pragma: friend gmock/.*
 
 #ifndef GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_GENERATED_ACTIONS_H_
 #define GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_GENERATED_ACTIONS_H_
diff --git a/external/googletest/googlemock/include/gmock/internal/custom/gmock-matchers.h b/external/googletest/googlemock/include/gmock/internal/custom/gmock-matchers.h
index 63842948..bb7dcbaa 100644
--- a/external/googletest/googlemock/include/gmock/internal/custom/gmock-matchers.h
+++ b/external/googletest/googlemock/include/gmock/internal/custom/gmock-matchers.h
@@ -26,10 +26,11 @@
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
+
 // Injection point for custom user configurations. See README for details
-//
-// GOOGLETEST_CM0002 DO NOT DELETE
+
+// IWYU pragma: private, include "gmock/gmock.h"
+// IWYU pragma: friend gmock/.*
 
 #ifndef GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_MATCHERS_H_
 #define GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_MATCHERS_H_
diff --git a/external/googletest/googlemock/include/gmock/internal/custom/gmock-port.h b/external/googletest/googlemock/include/gmock/internal/custom/gmock-port.h
index 14378692..f055f750 100644
--- a/external/googletest/googlemock/include/gmock/internal/custom/gmock-port.h
+++ b/external/googletest/googlemock/include/gmock/internal/custom/gmock-port.h
@@ -26,12 +26,13 @@
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
+
 // Injection point for custom user configurations. See README for details
 //
 // ** Custom implementation starts here **
 
-// GOOGLETEST_CM0002 DO NOT DELETE
+// IWYU pragma: private, include "gmock/gmock.h"
+// IWYU pragma: friend gmock/.*
 
 #ifndef GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_PORT_H_
 #define GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_PORT_H_
diff --git a/external/googletest/googlemock/include/gmock/internal/gmock-internal-utils.h b/external/googletest/googlemock/include/gmock/internal/gmock-internal-utils.h
index a3e34937..8fc1ddc7 100644
--- a/external/googletest/googlemock/include/gmock/internal/gmock-internal-utils.h
+++ b/external/googletest/googlemock/include/gmock/internal/gmock-internal-utils.h
@@ -33,7 +33,8 @@
 // Mock.  They are subject to change without notice, so please DO NOT
 // USE THEM IN USER CODE.
 
-// GOOGLETEST_CM0002 DO NOT DELETE
+// IWYU pragma: private, include "gmock/gmock.h"
+// IWYU pragma: friend gmock/.*
 
 #ifndef GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_INTERNAL_UTILS_H_
 #define GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_INTERNAL_UTILS_H_
@@ -43,6 +44,8 @@
 #include <ostream>  // NOLINT
 #include <string>
 #include <type_traits>
+#include <utility>
+#include <vector>
 
 #include "gmock/internal/gmock-port.h"
 #include "gtest/gtest.h"
@@ -56,15 +59,12 @@ namespace internal {
 
 // Silence MSVC C4100 (unreferenced formal parameter) and
 // C4805('==': unsafe mix of type 'const int' and type 'const bool')
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4100)
-#pragma warning(disable : 4805)
-#endif
+GTEST_DISABLE_MSC_WARNINGS_PUSH_(4100 4805)
 
 // Joins a vector of strings as if they are fields of a tuple; returns
 // the joined string.
-GTEST_API_ std::string JoinAsTuple(const Strings& fields);
+GTEST_API_ std::string JoinAsKeyValueTuple(
+    const std::vector<const char*>& names, const Strings& values);
 
 // Converts an identifier name to a space-separated list of lower-case
 // words.  Each maximum substring of the form [A-Za-z][a-z]*|\d+ is
@@ -79,12 +79,37 @@ template <typename Pointer>
 inline const typename Pointer::element_type* GetRawPointer(const Pointer& p) {
   return p.get();
 }
+// This overload version is for std::reference_wrapper, which does not work with
+// the overload above, as it does not have an `element_type`.
+template <typename Element>
+inline const Element* GetRawPointer(const std::reference_wrapper<Element>& r) {
+  return &r.get();
+}
+
 // This overloaded version is for the raw pointer case.
 template <typename Element>
 inline Element* GetRawPointer(Element* p) {
   return p;
 }
 
+// Default definitions for all compilers.
+// NOTE: If you implement support for other compilers, make sure to avoid
+// unexpected overlaps.
+// (e.g., Clang also processes #pragma GCC, and clang-cl also handles _MSC_VER.)
+#define GMOCK_INTERNAL_WARNING_PUSH()
+#define GMOCK_INTERNAL_WARNING_CLANG(Level, Name)
+#define GMOCK_INTERNAL_WARNING_POP()
+
+#if defined(__clang__)
+#undef GMOCK_INTERNAL_WARNING_PUSH
+#define GMOCK_INTERNAL_WARNING_PUSH() _Pragma("clang diagnostic push")
+#undef GMOCK_INTERNAL_WARNING_CLANG
+#define GMOCK_INTERNAL_WARNING_CLANG(Level, Warning) \
+  _Pragma(GMOCK_PP_INTERNAL_STRINGIZE(clang diagnostic Level Warning))
+#undef GMOCK_INTERNAL_WARNING_POP
+#define GMOCK_INTERNAL_WARNING_POP() _Pragma("clang diagnostic pop")
+#endif
+
 // MSVC treats wchar_t as a native type usually, but treats it as the
 // same as unsigned short when the compiler option /Zc:wchar_t- is
 // specified.  It defines _NATIVE_WCHAR_T_DEFINED symbol when wchar_t
@@ -200,7 +225,7 @@ class FailureReporterInterface {
   // The type of a failure (either non-fatal or fatal).
   enum FailureType { kNonfatal, kFatal };
 
-  virtual ~FailureReporterInterface() {}
+  virtual ~FailureReporterInterface() = default;
 
   // Reports a failure that occurred at the given source file location.
   virtual void ReportFailure(FailureType type, const char* file, int line,
@@ -280,13 +305,6 @@ class WithoutMatchers {
 // Internal use only: access the singleton instance of WithoutMatchers.
 GTEST_API_ WithoutMatchers GetWithoutMatchers();
 
-// Disable MSVC warnings for infinite recursion, since in this case the
-// the recursion is unreachable.
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4717)
-#endif
-
 // Invalid<T>() is usable as an expression of type T, but will terminate
 // the program with an assertion failure if actually run.  This is useful
 // when a value of type T is needed for compilation, but the statement
@@ -294,16 +312,16 @@ GTEST_API_ WithoutMatchers GetWithoutMatchers();
 // crashes).
 template <typename T>
 inline T Invalid() {
-  Assert(false, "", -1, "Internal error: attempt to return invalid value");
-  // This statement is unreachable, and would never terminate even if it
-  // could be reached. It is provided only to placate compiler warnings
-  // about missing return statements.
+  Assert(/*condition=*/false, /*file=*/"", /*line=*/-1,
+         "Internal error: attempt to return invalid value");
+#if defined(__GNUC__) || defined(__clang__)
+  __builtin_unreachable();
+#elif defined(_MSC_VER)
+  __assume(0);
+#else
   return Invalid<T>();
-}
-
-#ifdef _MSC_VER
-#pragma warning(pop)
 #endif
+}
 
 // Given a raw type (i.e. having no top-level reference or const
 // modifier) RawContainer that's either an STL-style container or a
@@ -403,7 +421,7 @@ struct RemoveConstFromKey<std::pair<const K, V> > {
 GTEST_API_ void IllegalDoDefault(const char* file, int line);
 
 template <typename F, typename Tuple, size_t... Idx>
-auto ApplyImpl(F&& f, Tuple&& args, IndexSequence<Idx...>)
+auto ApplyImpl(F&& f, Tuple&& args, std::index_sequence<Idx...>)
     -> decltype(std::forward<F>(f)(
         std::get<Idx>(std::forward<Tuple>(args))...)) {
   return std::forward<F>(f)(std::get<Idx>(std::forward<Tuple>(args))...);
@@ -411,12 +429,13 @@ auto ApplyImpl(F&& f, Tuple&& args, IndexSequence<Idx...>)
 
 // Apply the function to a tuple of arguments.
 template <typename F, typename Tuple>
-auto Apply(F&& f, Tuple&& args) -> decltype(ApplyImpl(
-    std::forward<F>(f), std::forward<Tuple>(args),
-    MakeIndexSequence<std::tuple_size<
-        typename std::remove_reference<Tuple>::type>::value>())) {
+auto Apply(F&& f, Tuple&& args)
+    -> decltype(ApplyImpl(
+        std::forward<F>(f), std::forward<Tuple>(args),
+        std::make_index_sequence<std::tuple_size<
+            typename std::remove_reference<Tuple>::type>::value>())) {
   return ApplyImpl(std::forward<F>(f), std::forward<Tuple>(args),
-                   MakeIndexSequence<std::tuple_size<
+                   std::make_index_sequence<std::tuple_size<
                        typename std::remove_reference<Tuple>::type>::value>());
 }
 
@@ -448,12 +467,16 @@ struct Function<R(Args...)> {
   using MakeResultIgnoredValue = IgnoredValue(Args...);
 };
 
-template <typename R, typename... Args>
-constexpr size_t Function<R(Args...)>::ArgumentCount;
+// Workaround for MSVC error C2039: 'type': is not a member of 'std'
+// when std::tuple_element is used.
+// See: https://github.com/google/googletest/issues/3931
+// Can be replaced with std::tuple_element_t in C++14.
+template <size_t I, typename T>
+using TupleElement = typename std::tuple_element<I, T>::type;
 
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
+bool Base64Unescape(const std::string& encoded, std::string* decoded);
+
+GTEST_DISABLE_MSC_WARNINGS_POP_()  // 4100 4805
 
 }  // namespace internal
 }  // namespace testing
diff --git a/external/googletest/googlemock/include/gmock/internal/gmock-port.h b/external/googletest/googlemock/include/gmock/internal/gmock-port.h
index 7e4b5071..42d36d2f 100644
--- a/external/googletest/googlemock/include/gmock/internal/gmock-port.h
+++ b/external/googletest/googlemock/include/gmock/internal/gmock-port.h
@@ -27,7 +27,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-//
 // Low-level types and utilities for porting Google Mock to various
 // platforms.  All macros ending with _ and symbols defined in an
 // internal namespace are subject to change without notice.  Code
@@ -35,7 +34,8 @@
 // end with _ are part of Google Mock's public API and can be used by
 // code outside Google Mock.
 
-// GOOGLETEST_CM0002 DO NOT DELETE
+// IWYU pragma: private, include "gmock/gmock.h"
+// IWYU pragma: friend gmock/.*
 
 #ifndef GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_PORT_H_
 #define GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_PORT_H_
@@ -57,6 +57,11 @@
 #include "gmock/internal/custom/gmock-port.h"
 #include "gtest/internal/gtest-port.h"
 
+#if defined(GTEST_HAS_ABSL) && !defined(GTEST_NO_ABSL_FLAGS)
+#include "absl/flags/declare.h"
+#include "absl/flags/flag.h"
+#endif
+
 // For MS Visual C++, check the compiler version. At least VS 2015 is
 // required to compile Google Mock.
 #if defined(_MSC_VER) && _MSC_VER < 1900
@@ -65,24 +70,71 @@
 
 // Macro for referencing flags.  This is public as we want the user to
 // use this syntax to reference Google Mock flags.
+#define GMOCK_FLAG_NAME_(name) gmock_##name
 #define GMOCK_FLAG(name) FLAGS_gmock_##name
 
-#if !defined(GMOCK_DECLARE_bool_)
-
-// Macros for declaring flags.
-#define GMOCK_DECLARE_bool_(name) extern GTEST_API_ bool GMOCK_FLAG(name)
-#define GMOCK_DECLARE_int32_(name) extern GTEST_API_ int32_t GMOCK_FLAG(name)
-#define GMOCK_DECLARE_string_(name) \
-  extern GTEST_API_ ::std::string GMOCK_FLAG(name)
+// Pick a command line flags implementation.
+#if defined(GTEST_HAS_ABSL) && !defined(GTEST_NO_ABSL_FLAGS)
 
 // Macros for defining flags.
 #define GMOCK_DEFINE_bool_(name, default_val, doc) \
-  GTEST_API_ bool GMOCK_FLAG(name) = (default_val)
+  ABSL_FLAG(bool, GMOCK_FLAG_NAME_(name), default_val, doc)
 #define GMOCK_DEFINE_int32_(name, default_val, doc) \
-  GTEST_API_ int32_t GMOCK_FLAG(name) = (default_val)
+  ABSL_FLAG(int32_t, GMOCK_FLAG_NAME_(name), default_val, doc)
 #define GMOCK_DEFINE_string_(name, default_val, doc) \
-  GTEST_API_ ::std::string GMOCK_FLAG(name) = (default_val)
+  ABSL_FLAG(std::string, GMOCK_FLAG_NAME_(name), default_val, doc)
+
+// Macros for declaring flags.
+#define GMOCK_DECLARE_bool_(name) \
+  ABSL_DECLARE_FLAG(bool, GMOCK_FLAG_NAME_(name))
+#define GMOCK_DECLARE_int32_(name) \
+  ABSL_DECLARE_FLAG(int32_t, GMOCK_FLAG_NAME_(name))
+#define GMOCK_DECLARE_string_(name) \
+  ABSL_DECLARE_FLAG(std::string, GMOCK_FLAG_NAME_(name))
+
+#define GMOCK_FLAG_GET(name) ::absl::GetFlag(GMOCK_FLAG(name))
+#define GMOCK_FLAG_SET(name, value) \
+  (void)(::absl::SetFlag(&GMOCK_FLAG(name), value))
+
+#else  // defined(GTEST_HAS_ABSL) && !defined(GTEST_NO_ABSL_FLAGS)
+
+// Macros for defining flags.
+#define GMOCK_DEFINE_bool_(name, default_val, doc)  \
+  namespace testing {                               \
+  GTEST_API_ bool GMOCK_FLAG(name) = (default_val); \
+  }                                                 \
+  static_assert(true, "no-op to require trailing semicolon")
+#define GMOCK_DEFINE_int32_(name, default_val, doc)    \
+  namespace testing {                                  \
+  GTEST_API_ int32_t GMOCK_FLAG(name) = (default_val); \
+  }                                                    \
+  static_assert(true, "no-op to require trailing semicolon")
+#define GMOCK_DEFINE_string_(name, default_val, doc)         \
+  namespace testing {                                        \
+  GTEST_API_ ::std::string GMOCK_FLAG(name) = (default_val); \
+  }                                                          \
+  static_assert(true, "no-op to require trailing semicolon")
+
+// Macros for declaring flags.
+#define GMOCK_DECLARE_bool_(name)          \
+  namespace testing {                      \
+  GTEST_API_ extern bool GMOCK_FLAG(name); \
+  }                                        \
+  static_assert(true, "no-op to require trailing semicolon")
+#define GMOCK_DECLARE_int32_(name)            \
+  namespace testing {                         \
+  GTEST_API_ extern int32_t GMOCK_FLAG(name); \
+  }                                           \
+  static_assert(true, "no-op to require trailing semicolon")
+#define GMOCK_DECLARE_string_(name)                 \
+  namespace testing {                               \
+  GTEST_API_ extern ::std::string GMOCK_FLAG(name); \
+  }                                                 \
+  static_assert(true, "no-op to require trailing semicolon")
+
+#define GMOCK_FLAG_GET(name) ::testing::GMOCK_FLAG(name)
+#define GMOCK_FLAG_SET(name, value) (void)(::testing::GMOCK_FLAG(name) = value)
 
-#endif  // !defined(GMOCK_DECLARE_bool_)
+#endif  // defined(GTEST_HAS_ABSL) && !defined(GTEST_NO_ABSL_FLAGS)
 
 #endif  // GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_PORT_H_
diff --git a/external/googletest/googlemock/scripts/README.md b/external/googletest/googlemock/scripts/README.md
deleted file mode 100644
index b74c8d44..00000000
--- a/external/googletest/googlemock/scripts/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# Please Note:
-
-Files in this directory are no longer supported by the maintainers. They represent mostly historical artifacts and
-supported by the community only. There is no guarantee whatsoever that these scripts still work.
diff --git a/external/googletest/googlemock/scripts/fuse_gmock_files.py b/external/googletest/googlemock/scripts/fuse_gmock_files.py
deleted file mode 100644
index 60a4db4d..00000000
--- a/external/googletest/googlemock/scripts/fuse_gmock_files.py
+++ /dev/null
@@ -1,256 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2009, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-"""fuse_gmock_files.py v0.1.0.
-
-Fuses Google Mock and Google Test source code into two .h files and a .cc file.
-
-SYNOPSIS
-       fuse_gmock_files.py [GMOCK_ROOT_DIR] OUTPUT_DIR
-
-       Scans GMOCK_ROOT_DIR for Google Mock and Google Test source
-       code, assuming Google Test is in the GMOCK_ROOT_DIR/../googletest
-       directory, and generates three files:
-       OUTPUT_DIR/gtest/gtest.h, OUTPUT_DIR/gmock/gmock.h, and
-       OUTPUT_DIR/gmock-gtest-all.cc.  Then you can build your tests
-       by adding OUTPUT_DIR to the include search path and linking
-       with OUTPUT_DIR/gmock-gtest-all.cc.  These three files contain
-       everything you need to use Google Mock.  Hence you can
-       "install" Google Mock by copying them to wherever you want.
-
-       GMOCK_ROOT_DIR can be omitted and defaults to the parent
-       directory of the directory holding this script.
-
-EXAMPLES
-       ./fuse_gmock_files.py fused_gmock
-       ./fuse_gmock_files.py path/to/unpacked/gmock fused_gmock
-
-This tool is experimental.  In particular, it assumes that there is no
-conditional inclusion of Google Mock or Google Test headers.  Please
-report any problems to googlemock@googlegroups.com.  You can read
-https://github.com/google/googletest/blob/master/docs/gmock_cook_book.md
-for more
-information.
-"""
-
-from __future__ import print_function
-
-import os
-import re
-import sys
-
-__author__ = 'wan@google.com (Zhanyong Wan)'
-
-# We assume that this file is in the scripts/ directory in the Google
-# Mock root directory.
-DEFAULT_GMOCK_ROOT_DIR = os.path.join(os.path.dirname(__file__), '..')
-
-# We need to call into googletest/scripts/fuse_gtest_files.py.
-sys.path.append(os.path.join(DEFAULT_GMOCK_ROOT_DIR, '../googletest/scripts'))
-import fuse_gtest_files as gtest  # pylint:disable=g-import-not-at-top
-
-# Regex for matching
-# '#include "gmock/..."'.
-INCLUDE_GMOCK_FILE_REGEX = re.compile(r'^\s*#\s*include\s*"(gmock/.+)"')
-
-# Where to find the source seed files.
-GMOCK_H_SEED = 'include/gmock/gmock.h'
-GMOCK_ALL_CC_SEED = 'src/gmock-all.cc'
-
-# Where to put the generated files.
-GTEST_H_OUTPUT = 'gtest/gtest.h'
-GMOCK_H_OUTPUT = 'gmock/gmock.h'
-GMOCK_GTEST_ALL_CC_OUTPUT = 'gmock-gtest-all.cc'
-
-
-def GetGTestRootDir(gmock_root):
-    """Returns the root directory of Google Test."""
-
-    return os.path.join(gmock_root, '../googletest')
-
-
-def ValidateGMockRootDir(gmock_root):
-    """Makes sure gmock_root points to a valid gmock root directory.
-
-    The function aborts the program on failure.
-
-    Args:
-      gmock_root: A string with the mock root directory.
-    """
-
-    gtest.ValidateGTestRootDir(GetGTestRootDir(gmock_root))
-    gtest.VerifyFileExists(gmock_root, GMOCK_H_SEED)
-    gtest.VerifyFileExists(gmock_root, GMOCK_ALL_CC_SEED)
-
-
-def ValidateOutputDir(output_dir):
-    """Makes sure output_dir points to a valid output directory.
-
-    The function aborts the program on failure.
-
-    Args:
-      output_dir: A string representing the output directory.
-    """
-
-    gtest.VerifyOutputFile(output_dir, gtest.GTEST_H_OUTPUT)
-    gtest.VerifyOutputFile(output_dir, GMOCK_H_OUTPUT)
-    gtest.VerifyOutputFile(output_dir, GMOCK_GTEST_ALL_CC_OUTPUT)
-
-
-def FuseGMockH(gmock_root, output_dir):
-    """Scans folder gmock_root to generate gmock/gmock.h in output_dir."""
-
-    output_file = open(os.path.join(output_dir, GMOCK_H_OUTPUT), 'w')
-    processed_files = set()  # Holds all gmock headers we've processed.
-
-    def ProcessFile(gmock_header_path):
-        """Processes the given gmock header file."""
-
-        # We don't process the same header twice.
-        if gmock_header_path in processed_files:
-            return
-
-        processed_files.add(gmock_header_path)
-
-        # Reads each line in the given gmock header.
-
-        with open(os.path.join(gmock_root, gmock_header_path), 'r') as fh:
-            for line in fh:
-                m = INCLUDE_GMOCK_FILE_REGEX.match(line)
-                if m:
-                    # '#include "gmock/..."'
-                    # - let's process it recursively.
-                    ProcessFile('include/' + m.group(1))
-                else:
-                    m = gtest.INCLUDE_GTEST_FILE_REGEX.match(line)
-                    if m:
-                        # '#include "gtest/foo.h"'
-                        # We translate it to "gtest/gtest.h", regardless of what foo is,
-                        # since all gtest headers are fused into gtest/gtest.h.
-
-                        # There is no need to #include gtest.h twice.
-                        if gtest.GTEST_H_SEED not in processed_files:
-                            processed_files.add(gtest.GTEST_H_SEED)
-                            output_file.write('#include "%s"\n' % (gtest.GTEST_H_OUTPUT,))
-                    else:
-                        # Otherwise we copy the line unchanged to the output file.
-                        output_file.write(line)
-
-    ProcessFile(GMOCK_H_SEED)
-    output_file.close()
-
-
-def FuseGMockAllCcToFile(gmock_root, output_file):
-    """Scans folder gmock_root to fuse gmock-all.cc into output_file."""
-
-    processed_files = set()
-
-    def ProcessFile(gmock_source_file):
-        """Processes the given gmock source file."""
-
-        # We don't process the same #included file twice.
-        if gmock_source_file in processed_files:
-            return
-
-        processed_files.add(gmock_source_file)
-
-        # Reads each line in the given gmock source file.
-
-        with open(os.path.join(gmock_root, gmock_source_file), 'r') as fh:
-            for line in fh:
-                m = INCLUDE_GMOCK_FILE_REGEX.match(line)
-                if m:
-                    # '#include "gmock/foo.h"'
-                    # We treat it as '#include  "gmock/gmock.h"', as all other gmock
-                    # headers are being fused into gmock.h and cannot be
-                    # included directly.  No need to
-                    # #include "gmock/gmock.h"
-                    # more than once.
-
-                    if GMOCK_H_SEED not in processed_files:
-                        processed_files.add(GMOCK_H_SEED)
-                        output_file.write('#include "%s"\n' % (GMOCK_H_OUTPUT,))
-                else:
-                    m = gtest.INCLUDE_GTEST_FILE_REGEX.match(line)
-                    if m:
-                        # '#include "gtest/..."'
-                        # There is no need to #include gtest.h as it has been
-                        # #included by gtest-all.cc.
-
-                        pass
-                    else:
-                        m = gtest.INCLUDE_SRC_FILE_REGEX.match(line)
-                        if m:
-                            # It's '#include "src/foo"' - let's process it recursively.
-                            ProcessFile(m.group(1))
-                        else:
-                            # Otherwise we copy the line unchanged to the output file.
-                            output_file.write(line)
-
-    ProcessFile(GMOCK_ALL_CC_SEED)
-
-
-def FuseGMockGTestAllCc(gmock_root, output_dir):
-    """Scans folder gmock_root to generate gmock-gtest-all.cc in output_dir."""
-
-    with open(os.path.join(output_dir, GMOCK_GTEST_ALL_CC_OUTPUT),
-              'w') as output_file:
-        # First, fuse gtest-all.cc into gmock-gtest-all.cc.
-        gtest.FuseGTestAllCcToFile(GetGTestRootDir(gmock_root), output_file)
-        # Next, append fused gmock-all.cc to gmock-gtest-all.cc.
-        FuseGMockAllCcToFile(gmock_root, output_file)
-
-
-def FuseGMock(gmock_root, output_dir):
-    """Fuses gtest.h, gmock.h, and gmock-gtest-all.h."""
-
-    ValidateGMockRootDir(gmock_root)
-    ValidateOutputDir(output_dir)
-
-    gtest.FuseGTestH(GetGTestRootDir(gmock_root), output_dir)
-    FuseGMockH(gmock_root, output_dir)
-    FuseGMockGTestAllCc(gmock_root, output_dir)
-
-
-def main():
-    argc = len(sys.argv)
-    if argc == 2:
-        # fuse_gmock_files.py OUTPUT_DIR
-        FuseGMock(DEFAULT_GMOCK_ROOT_DIR, sys.argv[1])
-    elif argc == 3:
-        # fuse_gmock_files.py GMOCK_ROOT_DIR OUTPUT_DIR
-        FuseGMock(sys.argv[1], sys.argv[2])
-    else:
-        print(__doc__)
-        sys.exit(1)
-
-
-if __name__ == '__main__':
-    main()
diff --git a/external/googletest/googlemock/scripts/generator/LICENSE b/external/googletest/googlemock/scripts/generator/LICENSE
deleted file mode 100644
index 87ea0636..00000000
--- a/external/googletest/googlemock/scripts/generator/LICENSE
+++ /dev/null
@@ -1,203 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [2007] Neal Norwitz
-   Portions Copyright [2007] Google Inc.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/external/googletest/googlemock/scripts/generator/README b/external/googletest/googlemock/scripts/generator/README
deleted file mode 100644
index 01fd463d..00000000
--- a/external/googletest/googlemock/scripts/generator/README
+++ /dev/null
@@ -1,34 +0,0 @@
-
-The Google Mock class generator is an application that is part of cppclean.
-For more information about cppclean, visit http://code.google.com/p/cppclean/
-
-The mock generator requires Python 2.3.5 or later.  If you don't have Python
-installed on your system, you will also need to install it.  You can download
-Python from:  http://www.python.org/download/releases/
-
-To use the Google Mock class generator, you need to call it
-on the command line passing the header file and class for which you want
-to generate a Google Mock class.
-
-Make sure to install the scripts somewhere in your path.  Then you can
-run the program.
-
-  gmock_gen.py header-file.h [ClassName]...
-
-If no ClassNames are specified, all classes in the file are emitted.
-
-To change the indentation from the default of 2, set INDENT in
-the environment.  For example to use an indent of 4 spaces:
-
-INDENT=4 gmock_gen.py header-file.h ClassName
-
-This version was made from SVN revision 281 in the cppclean repository.
-
-Known Limitations
------------------
-Not all code will be generated properly.  For example, when mocking templated
-classes, the template information is lost.  You will need to add the template
-information manually.
-
-Not all permutations of using multiple pointers/references will be rendered
-properly.  These will also have to be fixed manually.
diff --git a/external/googletest/googlemock/scripts/generator/README.cppclean b/external/googletest/googlemock/scripts/generator/README.cppclean
deleted file mode 100644
index 65431b61..00000000
--- a/external/googletest/googlemock/scripts/generator/README.cppclean
+++ /dev/null
@@ -1,115 +0,0 @@
-Goal:
------
-  CppClean attempts to find problems in C++ source that slow development
-  in large code bases, for example various forms of unused code.
-  Unused code can be unused functions, methods, data members, types, etc
-  to unnecessary #include directives.  Unnecessary #includes can cause
-  considerable extra compiles increasing the edit-compile-run cycle.
-
-  The project home page is:   http://code.google.com/p/cppclean/
-
-
-Features:
----------
- * Find and print C++ language constructs: classes, methods, functions, etc.
- * Find classes with virtual methods, no virtual destructor, and no bases
- * Find global/static data that are potential problems when using threads
- * Unnecessary forward class declarations
- * Unnecessary function declarations
- * Undeclared function definitions
- * (planned) Find unnecessary header files #included
-   - No direct reference to anything in the header
-   - Header is unnecessary if classes were forward declared instead
- * (planned) Source files that reference headers not directly #included,
-   ie, files that rely on a transitive #include from another header
- * (planned) Unused members (private, protected, & public) methods and data
- * (planned) Store AST in a SQL database so relationships can be queried
-
-AST is Abstract Syntax Tree, a representation of parsed source code.
-http://en.wikipedia.org/wiki/Abstract_syntax_tree
-
-
-System Requirements:
---------------------
- * Python 2.4 or later (2.3 probably works too)
- * Works on Windows (untested), Mac OS X, and Unix
-
-
-How to Run:
------------
-  For all examples, it is assumed that cppclean resides in a directory called
-  /cppclean.
-
-  To print warnings for classes with virtual methods, no virtual destructor and
-  no base classes:
-
-      /cppclean/run.sh nonvirtual_dtors.py file1.h file2.h file3.cc ...
-
-  To print all the functions defined in header file(s):
-
-      /cppclean/run.sh functions.py file1.h file2.h ...
-
-  All the commands take multiple files on the command line.  Other programs
-  include: find_warnings, headers, methods, and types.  Some other programs
-  are available, but used primarily for debugging.
-
-  run.sh is a simple wrapper that sets PYTHONPATH to /cppclean and then
-  runs the program in /cppclean/cpp/PROGRAM.py.  There is currently
-  no equivalent for Windows.  Contributions for a run.bat file
-  would be greatly appreciated.
-
-
-How to Configure:
------------------
-  You can add a siteheaders.py file in /cppclean/cpp to configure where
-  to look for other headers (typically -I options passed to a compiler).
-  Currently two values are supported:  _TRANSITIVE and GetIncludeDirs.
-  _TRANSITIVE should be set to a boolean value (True or False) indicating
-  whether to transitively process all header files.  The default is False.
-
-  GetIncludeDirs is a function that takes a single argument and returns
-  a sequence of directories to include.  This can be a generator or
-  return a static list.
-
-      def GetIncludeDirs(filename):
-          return ['/some/path/with/other/headers']
-
-      # Here is a more complicated example.
-      def GetIncludeDirs(filename):
-          yield '/path1'
-          yield os.path.join('/path2', os.path.dirname(filename))
-          yield '/path3'
-
-
-How to Test:
-------------
-  For all examples, it is assumed that cppclean resides in a directory called
-  /cppclean.  The tests require
-
-  cd /cppclean
-  make test
-  # To generate expected results after a change:
-  make expected
-
-
-Current Status:
----------------
-  The parser works pretty well for header files, parsing about 99% of Google's
-  header files.  Anything which inspects structure of C++ source files should
-  work reasonably well.  Function bodies are not transformed to an AST,
-  but left as tokens.  Much work is still needed on finding unused header files
-  and storing an AST in a database.
-
-
-Non-goals:
-----------
- * Parsing all valid C++ source
- * Handling invalid C++ source gracefully
- * Compiling to machine code (or anything beyond an AST)
-
-
-Contact:
---------
-  If you used cppclean, I would love to hear about your experiences
-  cppclean@googlegroups.com.  Even if you don't use cppclean, I'd like to
-  hear from you.  :-)  (You can contact me directly at:  nnorwitz@gmail.com)
diff --git a/external/googletest/googlemock/scripts/generator/cpp/__init__.py b/external/googletest/googlemock/scripts/generator/cpp/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/external/googletest/googlemock/scripts/generator/cpp/ast.py b/external/googletest/googlemock/scripts/generator/cpp/ast.py
deleted file mode 100644
index 188c2146..00000000
--- a/external/googletest/googlemock/scripts/generator/cpp/ast.py
+++ /dev/null
@@ -1,1772 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2007 Neal Norwitz
-# Portions Copyright 2007 Google Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""Generate an Abstract Syntax Tree (AST) for C++."""
-
-# FIXME:
-#  * Tokens should never be exported, need to convert to Nodes
-#    (return types, parameters, etc.)
-#  * Handle static class data for templatized classes
-#  * Handle casts (both C++ and C-style)
-#  * Handle conditions and loops (if/else, switch, for, while/do)
-#
-# TODO much, much later:
-#  * Handle #define
-#  * exceptions
-
-
-try:
-    # Python 3.x
-    import builtins
-except ImportError:
-    # Python 2.x
-    import __builtin__ as builtins
-
-import collections
-import sys
-import traceback
-
-from cpp import keywords
-from cpp import tokenize
-from cpp import utils
-
-if not hasattr(builtins, 'reversed'):
-    # Support Python 2.3 and earlier.
-    def reversed(seq):
-        for i in range(len(seq) - 1, -1, -1):
-            yield seq[i]
-
-if not hasattr(builtins, 'next'):
-    # Support Python 2.5 and earlier.
-    def next(obj):
-        return obj.next()
-
-VISIBILITY_PUBLIC, VISIBILITY_PROTECTED, VISIBILITY_PRIVATE = range(3)
-
-FUNCTION_NONE = 0x00
-FUNCTION_CONST = 0x01
-FUNCTION_VIRTUAL = 0x02
-FUNCTION_PURE_VIRTUAL = 0x04
-FUNCTION_CTOR = 0x08
-FUNCTION_DTOR = 0x10
-FUNCTION_ATTRIBUTE = 0x20
-FUNCTION_UNKNOWN_ANNOTATION = 0x40
-FUNCTION_THROW = 0x80
-FUNCTION_OVERRIDE = 0x100
-
-"""
-These are currently unused.  Should really handle these properly at some point.
-
-TYPE_MODIFIER_INLINE   = 0x010000
-TYPE_MODIFIER_EXTERN   = 0x020000
-TYPE_MODIFIER_STATIC   = 0x040000
-TYPE_MODIFIER_CONST    = 0x080000
-TYPE_MODIFIER_REGISTER = 0x100000
-TYPE_MODIFIER_VOLATILE = 0x200000
-TYPE_MODIFIER_MUTABLE  = 0x400000
-
-TYPE_MODIFIER_MAP = {
-    'inline': TYPE_MODIFIER_INLINE,
-    'extern': TYPE_MODIFIER_EXTERN,
-    'static': TYPE_MODIFIER_STATIC,
-    'const': TYPE_MODIFIER_CONST,
-    'register': TYPE_MODIFIER_REGISTER,
-    'volatile': TYPE_MODIFIER_VOLATILE,
-    'mutable': TYPE_MODIFIER_MUTABLE,
-    }
-"""
-
-_INTERNAL_TOKEN = 'internal'
-_NAMESPACE_POP = 'ns-pop'
-
-
-# TODO(nnorwitz): use this as a singleton for templated_types, etc
-# where we don't want to create a new empty dict each time.  It is also const.
-class _NullDict(object):
-    __contains__ = lambda self: False
-    keys = values = items = iterkeys = itervalues = iteritems = lambda self: ()
-
-
-# TODO(nnorwitz): move AST nodes into a separate module.
-class Node(object):
-    """Base AST node."""
-
-    def __init__(self, start, end):
-        self.start = start
-        self.end = end
-
-    def IsDeclaration(self):
-        """Returns bool if this node is a declaration."""
-        return False
-
-    def IsDefinition(self):
-        """Returns bool if this node is a definition."""
-        return False
-
-    def IsExportable(self):
-        """Returns bool if this node exportable from a header file."""
-        return False
-
-    def Requires(self, node):
-        """Does this AST node require the definition of the node passed in?"""
-        return False
-
-    def XXX__str__(self):
-        return self._StringHelper(self.__class__.__name__, '')
-
-    def _StringHelper(self, name, suffix):
-        if not utils.DEBUG:
-            return '%s(%s)' % (name, suffix)
-        return '%s(%d, %d, %s)' % (name, self.start, self.end, suffix)
-
-    def __repr__(self):
-        return str(self)
-
-
-class Define(Node):
-    def __init__(self, start, end, name, definition):
-        Node.__init__(self, start, end)
-        self.name = name
-        self.definition = definition
-
-    def __str__(self):
-        value = '%s %s' % (self.name, self.definition)
-        return self._StringHelper(self.__class__.__name__, value)
-
-
-class Include(Node):
-    def __init__(self, start, end, filename, system):
-        Node.__init__(self, start, end)
-        self.filename = filename
-        self.system = system
-
-    def __str__(self):
-        fmt = '"%s"'
-        if self.system:
-            fmt = '<%s>'
-        return self._StringHelper(self.__class__.__name__, fmt % self.filename)
-
-
-class Goto(Node):
-    def __init__(self, start, end, label):
-        Node.__init__(self, start, end)
-        self.label = label
-
-    def __str__(self):
-        return self._StringHelper(self.__class__.__name__, str(self.label))
-
-
-class Expr(Node):
-    def __init__(self, start, end, expr):
-        Node.__init__(self, start, end)
-        self.expr = expr
-
-    def Requires(self, node):
-        # TODO(nnorwitz): impl.
-        return False
-
-    def __str__(self):
-        return self._StringHelper(self.__class__.__name__, str(self.expr))
-
-
-class Return(Expr):
-    pass
-
-
-class Delete(Expr):
-    pass
-
-
-class Friend(Expr):
-    def __init__(self, start, end, expr, namespace):
-        Expr.__init__(self, start, end, expr)
-        self.namespace = namespace[:]
-
-
-class Using(Node):
-    def __init__(self, start, end, names):
-        Node.__init__(self, start, end)
-        self.names = names
-
-    def __str__(self):
-        return self._StringHelper(self.__class__.__name__, str(self.names))
-
-
-class Parameter(Node):
-    def __init__(self, start, end, name, parameter_type, default):
-        Node.__init__(self, start, end)
-        self.name = name
-        self.type = parameter_type
-        self.default = default
-
-    def Requires(self, node):
-        # TODO(nnorwitz): handle namespaces, etc.
-        return self.type.name == node.name
-
-    def __str__(self):
-        name = str(self.type)
-        suffix = '%s %s' % (name, self.name)
-        if self.default:
-            suffix += ' = ' + ''.join([d.name for d in self.default])
-        return self._StringHelper(self.__class__.__name__, suffix)
-
-
-class _GenericDeclaration(Node):
-    def __init__(self, start, end, name, namespace):
-        Node.__init__(self, start, end)
-        self.name = name
-        self.namespace = namespace[:]
-
-    def FullName(self):
-        prefix = ''
-        if self.namespace and self.namespace[-1]:
-            prefix = '::'.join(self.namespace) + '::'
-        return prefix + self.name
-
-    def _TypeStringHelper(self, suffix):
-        if self.namespace:
-            names = [n or '<anonymous>' for n in self.namespace]
-            suffix += ' in ' + '::'.join(names)
-        return self._StringHelper(self.__class__.__name__, suffix)
-
-
-# TODO(nnorwitz): merge with Parameter in some way?
-class VariableDeclaration(_GenericDeclaration):
-    def __init__(self, start, end, name, var_type, initial_value, namespace):
-        _GenericDeclaration.__init__(self, start, end, name, namespace)
-        self.type = var_type
-        self.initial_value = initial_value
-
-    def Requires(self, node):
-        # TODO(nnorwitz): handle namespaces, etc.
-        return self.type.name == node.name
-
-    def ToString(self):
-        """Return a string that tries to reconstitute the variable decl."""
-        suffix = '%s %s' % (self.type, self.name)
-        if self.initial_value:
-            suffix += ' = ' + self.initial_value
-        return suffix
-
-    def __str__(self):
-        return self._StringHelper(self.__class__.__name__, self.ToString())
-
-
-class Typedef(_GenericDeclaration):
-    def __init__(self, start, end, name, alias, namespace):
-        _GenericDeclaration.__init__(self, start, end, name, namespace)
-        self.alias = alias
-
-    def IsDefinition(self):
-        return True
-
-    def IsExportable(self):
-        return True
-
-    def Requires(self, node):
-        # TODO(nnorwitz): handle namespaces, etc.
-        name = node.name
-        for token in self.alias:
-            if token is not None and name == token.name:
-                return True
-        return False
-
-    def __str__(self):
-        suffix = '%s, %s' % (self.name, self.alias)
-        return self._TypeStringHelper(suffix)
-
-
-class _NestedType(_GenericDeclaration):
-    def __init__(self, start, end, name, fields, namespace):
-        _GenericDeclaration.__init__(self, start, end, name, namespace)
-        self.fields = fields
-
-    def IsDefinition(self):
-        return True
-
-    def IsExportable(self):
-        return True
-
-    def __str__(self):
-        suffix = '%s, {%s}' % (self.name, self.fields)
-        return self._TypeStringHelper(suffix)
-
-
-class Union(_NestedType):
-    pass
-
-
-class Enum(_NestedType):
-    pass
-
-
-class Class(_GenericDeclaration):
-    def __init__(self, start, end, name, bases, templated_types, body, namespace):
-        _GenericDeclaration.__init__(self, start, end, name, namespace)
-        self.bases = bases
-        self.body = body
-        self.templated_types = templated_types
-
-    def IsDeclaration(self):
-        return self.bases is None and self.body is None
-
-    def IsDefinition(self):
-        return not self.IsDeclaration()
-
-    def IsExportable(self):
-        return not self.IsDeclaration()
-
-    def Requires(self, node):
-        # TODO(nnorwitz): handle namespaces, etc.
-        if self.bases:
-            for token_list in self.bases:
-                # TODO(nnorwitz): bases are tokens, do name comparison.
-                for token in token_list:
-                    if token.name == node.name:
-                        return True
-        # TODO(nnorwitz): search in body too.
-        return False
-
-    def __str__(self):
-        name = self.name
-        if self.templated_types:
-            name += '<%s>' % self.templated_types
-        suffix = '%s, %s, %s' % (name, self.bases, self.body)
-        return self._TypeStringHelper(suffix)
-
-
-class Struct(Class):
-    pass
-
-
-class Function(_GenericDeclaration):
-    def __init__(self, start, end, name, return_type, parameters,
-                 modifiers, templated_types, body, namespace):
-        _GenericDeclaration.__init__(self, start, end, name, namespace)
-        converter = TypeConverter(namespace)
-        self.return_type = converter.CreateReturnType(return_type)
-        self.parameters = converter.ToParameters(parameters)
-        self.modifiers = modifiers
-        self.body = body
-        self.templated_types = templated_types
-
-    def IsDeclaration(self):
-        return self.body is None
-
-    def IsDefinition(self):
-        return self.body is not None
-
-    def IsExportable(self):
-        if self.return_type and 'static' in self.return_type.modifiers:
-            return False
-        return None not in self.namespace
-
-    def Requires(self, node):
-        if self.parameters:
-            # TODO(nnorwitz): parameters are tokens, do name comparison.
-            for p in self.parameters:
-                if p.name == node.name:
-                    return True
-        # TODO(nnorwitz): search in body too.
-        return False
-
-    def __str__(self):
-        # TODO(nnorwitz): add templated_types.
-        suffix = ('%s %s(%s), 0x%02x, %s' %
-                  (self.return_type, self.name, self.parameters,
-                   self.modifiers, self.body))
-        return self._TypeStringHelper(suffix)
-
-
-class Method(Function):
-    def __init__(self, start, end, name, in_class, return_type, parameters,
-                 modifiers, templated_types, body, namespace):
-        Function.__init__(self, start, end, name, return_type, parameters,
-                          modifiers, templated_types, body, namespace)
-        # TODO(nnorwitz): in_class could also be a namespace which can
-        # mess up finding functions properly.
-        self.in_class = in_class
-
-
-class Type(_GenericDeclaration):
-    """Type used for any variable (eg class, primitive, struct, etc)."""
-
-    def __init__(self, start, end, name, templated_types, modifiers,
-                 reference, pointer, array):
-        """
-            Args:
-              name: str name of main type
-              templated_types: [Class (Type?)] template type info between <>
-              modifiers: [str] type modifiers (keywords) eg, const, mutable, etc.
-              reference, pointer, array: bools
-            """
-        _GenericDeclaration.__init__(self, start, end, name, [])
-        self.templated_types = templated_types
-        if not name and modifiers:
-            self.name = modifiers.pop()
-        self.modifiers = modifiers
-        self.reference = reference
-        self.pointer = pointer
-        self.array = array
-
-    def __str__(self):
-        prefix = ''
-        if self.modifiers:
-            prefix = ' '.join(self.modifiers) + ' '
-        name = str(self.name)
-        if self.templated_types:
-            name += '<%s>' % self.templated_types
-        suffix = prefix + name
-        if self.reference:
-            suffix += '&'
-        if self.pointer:
-            suffix += '*'
-        if self.array:
-            suffix += '[]'
-        return self._TypeStringHelper(suffix)
-
-    # By definition, Is* are always False.  A Type can only exist in
-    # some sort of variable declaration, parameter, or return value.
-    def IsDeclaration(self):
-        return False
-
-    def IsDefinition(self):
-        return False
-
-    def IsExportable(self):
-        return False
-
-
-class TypeConverter(object):
-
-    def __init__(self, namespace_stack):
-        self.namespace_stack = namespace_stack
-
-    def _GetTemplateEnd(self, tokens, start):
-        count = 1
-        end = start
-        while 1:
-            token = tokens[end]
-            end += 1
-            if token.name == '<':
-                count += 1
-            elif token.name == '>':
-                count -= 1
-                if count == 0:
-                    break
-        return tokens[start:end - 1], end
-
-    def ToType(self, tokens):
-        """Convert [Token,...] to [Class(...), ] useful for base classes.
-            For example, code like class Foo : public Bar<x, y> { ... };
-            the "Bar<x, y>" portion gets converted to an AST.
-
-            Returns:
-              [Class(...), ...]
-            """
-        result = []
-        name_tokens = []
-        reference = pointer = array = False
-
-        def AddType(templated_types):
-            # Partition tokens into name and modifier tokens.
-            names = []
-            modifiers = []
-            for t in name_tokens:
-                if keywords.IsKeyword(t.name):
-                    modifiers.append(t.name)
-                else:
-                    names.append(t.name)
-            name = ''.join(names)
-            if name_tokens:
-                result.append(Type(name_tokens[0].start, name_tokens[-1].end,
-                                   name, templated_types, modifiers,
-                                   reference, pointer, array))
-            del name_tokens[:]
-
-        i = 0
-        end = len(tokens)
-        while i < end:
-            token = tokens[i]
-            if token.name == '<':
-                new_tokens, new_end = self._GetTemplateEnd(tokens, i + 1)
-                AddType(self.ToType(new_tokens))
-                # If there is a comma after the template, we need to consume
-                # that here otherwise it becomes part of the name.
-                i = new_end
-                reference = pointer = array = False
-            elif token.name == ',':
-                AddType([])
-                reference = pointer = array = False
-            elif token.name == '*':
-                pointer = True
-            elif token.name == '&':
-                reference = True
-            elif token.name == '[':
-                pointer = True
-            elif token.name == ']':
-                pass
-            else:
-                name_tokens.append(token)
-            i += 1
-
-        if name_tokens:
-            # No '<' in the tokens, just a simple name and no template.
-            AddType([])
-        return result
-
-    def DeclarationToParts(self, parts, needs_name_removed):
-        name = None
-        default = []
-        if needs_name_removed:
-            # Handle default (initial) values properly.
-            for i, t in enumerate(parts):
-                if t.name == '=':
-                    default = parts[i + 1:]
-                    name = parts[i - 1].name
-                    if name == ']' and parts[i - 2].name == '[':
-                        name = parts[i - 3].name
-                        i -= 1
-                    parts = parts[:i - 1]
-                    break
-            else:
-                if parts[-1].token_type == tokenize.NAME:
-                    name = parts.pop().name
-                else:
-                    # TODO(nnorwitz): this is a hack that happens for code like
-                    # Register(Foo<T>); where it thinks this is a function call
-                    # but it's actually a declaration.
-                    name = '???'
-        modifiers = []
-        type_name = []
-        other_tokens = []
-        templated_types = []
-        i = 0
-        end = len(parts)
-        while i < end:
-            p = parts[i]
-            if keywords.IsKeyword(p.name):
-                modifiers.append(p.name)
-            elif p.name == '<':
-                templated_tokens, new_end = self._GetTemplateEnd(parts, i + 1)
-                templated_types = self.ToType(templated_tokens)
-                i = new_end - 1
-                # Don't add a spurious :: to data members being initialized.
-                next_index = i + 1
-                if next_index < end and parts[next_index].name == '::':
-                    i += 1
-            elif p.name in ('[', ']', '='):
-                # These are handled elsewhere.
-                other_tokens.append(p)
-            elif p.name not in ('*', '&', '>'):
-                # Ensure that names have a space between them.
-                if (type_name and type_name[-1].token_type == tokenize.NAME and
-                        p.token_type == tokenize.NAME):
-                    type_name.append(tokenize.Token(tokenize.SYNTAX, ' ', 0, 0))
-                type_name.append(p)
-            else:
-                other_tokens.append(p)
-            i += 1
-        type_name = ''.join([t.name for t in type_name])
-        return name, type_name, templated_types, modifiers, default, other_tokens
-
-    def ToParameters(self, tokens):
-        if not tokens:
-            return []
-
-        result = []
-        name = type_name = ''
-        type_modifiers = []
-        pointer = reference = array = False
-        first_token = None
-        default = []
-
-        def AddParameter(end):
-            if default:
-                del default[0]  # Remove flag.
-            parts = self.DeclarationToParts(type_modifiers, True)
-            (name, type_name, templated_types, modifiers,
-             unused_default, unused_other_tokens) = parts
-            parameter_type = Type(first_token.start, first_token.end,
-                                  type_name, templated_types, modifiers,
-                                  reference, pointer, array)
-            p = Parameter(first_token.start, end, name,
-                          parameter_type, default)
-            result.append(p)
-
-        template_count = 0
-        brace_count = 0
-        for s in tokens:
-            if not first_token:
-                first_token = s
-
-            # Check for braces before templates, as we can have unmatched '<>'
-            # inside default arguments.
-            if s.name == '{':
-                brace_count += 1
-            elif s.name == '}':
-                brace_count -= 1
-            if brace_count > 0:
-                type_modifiers.append(s)
-                continue
-
-            if s.name == '<':
-                template_count += 1
-            elif s.name == '>':
-                template_count -= 1
-            if template_count > 0:
-                type_modifiers.append(s)
-                continue
-
-            if s.name == ',':
-                AddParameter(s.start)
-                name = type_name = ''
-                type_modifiers = []
-                pointer = reference = array = False
-                first_token = None
-                default = []
-            elif s.name == '*':
-                pointer = True
-            elif s.name == '&':
-                reference = True
-            elif s.name == '[':
-                array = True
-            elif s.name == ']':
-                pass  # Just don't add to type_modifiers.
-            elif s.name == '=':
-                # Got a default value.  Add any value (None) as a flag.
-                default.append(None)
-            elif default:
-                default.append(s)
-            else:
-                type_modifiers.append(s)
-        AddParameter(tokens[-1].end)
-        return result
-
-    def CreateReturnType(self, return_type_seq):
-        if not return_type_seq:
-            return None
-        start = return_type_seq[0].start
-        end = return_type_seq[-1].end
-        _, name, templated_types, modifiers, default, other_tokens = \
-            self.DeclarationToParts(return_type_seq, False)
-        names = [n.name for n in other_tokens]
-        reference = '&' in names
-        pointer = '*' in names
-        array = '[' in names
-        return Type(start, end, name, templated_types, modifiers,
-                    reference, pointer, array)
-
-    def GetTemplateIndices(self, names):
-        # names is a list of strings.
-        start = names.index('<')
-        end = len(names) - 1
-        while end > 0:
-            if names[end] == '>':
-                break
-            end -= 1
-        return start, end + 1
-
-
-class AstBuilder(object):
-    def __init__(self, token_stream, filename, in_class='', visibility=None,
-                 namespace_stack=[]):
-        self.tokens = token_stream
-        self.filename = filename
-        # TODO(nnorwitz): use a better data structure (deque) for the queue.
-        # Switching directions of the "queue" improved perf by about 25%.
-        # Using a deque should be even better since we access from both sides.
-        self.token_queue = []
-        self.namespace_stack = namespace_stack[:]
-        self.in_class = in_class
-        if in_class is None:
-            self.in_class_name_only = None
-        else:
-            self.in_class_name_only = in_class.split('::')[-1]
-        self.visibility = visibility
-        self.in_function = False
-        self.current_token = None
-        # Keep the state whether we are currently handling a typedef or not.
-        self._handling_typedef = False
-
-        self.converter = TypeConverter(self.namespace_stack)
-
-    def HandleError(self, msg, token):
-        printable_queue = list(reversed(self.token_queue[-20:]))
-        sys.stderr.write('Got %s in %s @ %s %s\n' %
-                         (msg, self.filename, token, printable_queue))
-
-    def Generate(self):
-        while 1:
-            token = self._GetNextToken()
-            if not token:
-                break
-
-            # Get the next token.
-            self.current_token = token
-
-            # Dispatch on the next token type.
-            if token.token_type == _INTERNAL_TOKEN:
-                if token.name == _NAMESPACE_POP:
-                    self.namespace_stack.pop()
-                continue
-
-            try:
-                result = self._GenerateOne(token)
-                if result is not None:
-                    yield result
-            except:
-                self.HandleError('exception', token)
-                raise
-
-    def _CreateVariable(self, pos_token, name, type_name, type_modifiers,
-                        ref_pointer_name_seq, templated_types, value=None):
-        reference = '&' in ref_pointer_name_seq
-        pointer = '*' in ref_pointer_name_seq
-        array = '[' in ref_pointer_name_seq
-        var_type = Type(pos_token.start, pos_token.end, type_name,
-                        templated_types, type_modifiers,
-                        reference, pointer, array)
-        return VariableDeclaration(pos_token.start, pos_token.end,
-                                   name, var_type, value, self.namespace_stack)
-
-    def _GenerateOne(self, token):
-        if token.token_type == tokenize.NAME:
-            if (keywords.IsKeyword(token.name) and
-                    not keywords.IsBuiltinType(token.name)):
-                if token.name == 'enum':
-                    # Pop the next token and only put it back if it's not
-                    # 'class'.  This allows us to support the two-token
-                    # 'enum class' keyword as if it were simply 'enum'.
-                    next = self._GetNextToken()
-                    if next.name != 'class':
-                        self._AddBackToken(next)
-
-                method = getattr(self, 'handle_' + token.name)
-                return method()
-            elif token.name == self.in_class_name_only:
-                # The token name is the same as the class, must be a ctor if
-                # there is a paren.  Otherwise, it's the return type.
-                # Peek ahead to get the next token to figure out which.
-                next = self._GetNextToken()
-                self._AddBackToken(next)
-                if next.token_type == tokenize.SYNTAX and next.name == '(':
-                    return self._GetMethod([token], FUNCTION_CTOR, None, True)
-                # Fall through--handle like any other method.
-
-            # Handle data or function declaration/definition.
-            syntax = tokenize.SYNTAX
-            temp_tokens, last_token = \
-                self._GetVarTokensUpToIgnoringTemplates(syntax,
-                                                        '(', ';', '{', '[')
-            temp_tokens.insert(0, token)
-            if last_token.name == '(':
-                # If there is an assignment before the paren,
-                # this is an expression, not a method.
-                expr = bool([e for e in temp_tokens if e.name == '='])
-                if expr:
-                    new_temp = self._GetTokensUpTo(tokenize.SYNTAX, ';')
-                    temp_tokens.append(last_token)
-                    temp_tokens.extend(new_temp)
-                    last_token = tokenize.Token(tokenize.SYNTAX, ';', 0, 0)
-
-            if last_token.name == '[':
-                # Handle array, this isn't a method, unless it's an operator.
-                # TODO(nnorwitz): keep the size somewhere.
-                # unused_size = self._GetTokensUpTo(tokenize.SYNTAX, ']')
-                temp_tokens.append(last_token)
-                if temp_tokens[-2].name == 'operator':
-                    temp_tokens.append(self._GetNextToken())
-                else:
-                    temp_tokens2, last_token = \
-                        self._GetVarTokensUpTo(tokenize.SYNTAX, ';')
-                    temp_tokens.extend(temp_tokens2)
-
-            if last_token.name == ';':
-                # Handle data, this isn't a method.
-                parts = self.converter.DeclarationToParts(temp_tokens, True)
-                (name, type_name, templated_types, modifiers, default,
-                 unused_other_tokens) = parts
-
-                t0 = temp_tokens[0]
-                names = [t.name for t in temp_tokens]
-                if templated_types:
-                    start, end = self.converter.GetTemplateIndices(names)
-                    names = names[:start] + names[end:]
-                default = ''.join([t.name for t in default])
-                return self._CreateVariable(t0, name, type_name, modifiers,
-                                            names, templated_types, default)
-            if last_token.name == '{':
-                self._AddBackTokens(temp_tokens[1:])
-                self._AddBackToken(last_token)
-                method_name = temp_tokens[0].name
-                method = getattr(self, 'handle_' + method_name, None)
-                if not method:
-                    # Must be declaring a variable.
-                    # TODO(nnorwitz): handle the declaration.
-                    return None
-                return method()
-            return self._GetMethod(temp_tokens, 0, None, False)
-        elif token.token_type == tokenize.SYNTAX:
-            if token.name == '~' and self.in_class:
-                # Must be a dtor (probably not in method body).
-                token = self._GetNextToken()
-                # self.in_class can contain A::Name, but the dtor will only
-                # be Name.  Make sure to compare against the right value.
-                if (token.token_type == tokenize.NAME and
-                        token.name == self.in_class_name_only):
-                    return self._GetMethod([token], FUNCTION_DTOR, None, True)
-            # TODO(nnorwitz): handle a lot more syntax.
-        elif token.token_type == tokenize.PREPROCESSOR:
-            # TODO(nnorwitz): handle more preprocessor directives.
-            # token starts with a #, so remove it and strip whitespace.
-            name = token.name[1:].lstrip()
-            if name.startswith('include'):
-                # Remove "include".
-                name = name[7:].strip()
-                assert name
-                # Handle #include \<newline> "header-on-second-line.h".
-                if name.startswith('\\'):
-                    name = name[1:].strip()
-                assert name[0] in '<"', token
-                assert name[-1] in '>"', token
-                system = name[0] == '<'
-                filename = name[1:-1]
-                return Include(token.start, token.end, filename, system)
-            if name.startswith('define'):
-                # Remove "define".
-                name = name[6:].strip()
-                assert name
-                value = ''
-                for i, c in enumerate(name):
-                    if c.isspace():
-                        value = name[i:].lstrip()
-                        name = name[:i]
-                        break
-                return Define(token.start, token.end, name, value)
-            if name.startswith('if') and name[2:3].isspace():
-                condition = name[3:].strip()
-                if condition.startswith('0') or condition.startswith('(0)'):
-                    self._SkipIf0Blocks()
-        return None
-
-    def _GetTokensUpTo(self, expected_token_type, expected_token):
-        return self._GetVarTokensUpTo(expected_token_type, expected_token)[0]
-
-    def _GetVarTokensUpTo(self, expected_token_type, *expected_tokens):
-        last_token = self._GetNextToken()
-        tokens = []
-        while (last_token.token_type != expected_token_type or
-               last_token.name not in expected_tokens):
-            tokens.append(last_token)
-            last_token = self._GetNextToken()
-        return tokens, last_token
-
-    # Same as _GetVarTokensUpTo, but skips over '<...>' which could contain an
-    # expected token.
-    def _GetVarTokensUpToIgnoringTemplates(self, expected_token_type,
-                                           *expected_tokens):
-        last_token = self._GetNextToken()
-        tokens = []
-        nesting = 0
-        while (nesting > 0 or
-               last_token.token_type != expected_token_type or
-               last_token.name not in expected_tokens):
-            tokens.append(last_token)
-            last_token = self._GetNextToken()
-            if last_token.name == '<':
-                nesting += 1
-            elif last_token.name == '>':
-                nesting -= 1
-        return tokens, last_token
-
-    # TODO(nnorwitz): remove _IgnoreUpTo() it shouldn't be necessary.
-    def _IgnoreUpTo(self, token_type, token):
-        unused_tokens = self._GetTokensUpTo(token_type, token)
-
-    def _SkipIf0Blocks(self):
-        count = 1
-        while 1:
-            token = self._GetNextToken()
-            if token.token_type != tokenize.PREPROCESSOR:
-                continue
-
-            name = token.name[1:].lstrip()
-            if name.startswith('endif'):
-                count -= 1
-                if count == 0:
-                    break
-            elif name.startswith('if'):
-                count += 1
-
-    def _GetMatchingChar(self, open_paren, close_paren, GetNextToken=None):
-        if GetNextToken is None:
-            GetNextToken = self._GetNextToken
-        # Assumes the current token is open_paren and we will consume
-        # and return up to the close_paren.
-        count = 1
-        token = GetNextToken()
-        while 1:
-            if token.token_type == tokenize.SYNTAX:
-                if token.name == open_paren:
-                    count += 1
-                elif token.name == close_paren:
-                    count -= 1
-                    if count == 0:
-                        break
-            yield token
-            token = GetNextToken()
-        yield token
-
-    def _GetParameters(self):
-        return self._GetMatchingChar('(', ')')
-
-    def GetScope(self):
-        return self._GetMatchingChar('{', '}')
-
-    def _GetNextToken(self):
-        if self.token_queue:
-            return self.token_queue.pop()
-        try:
-            return next(self.tokens)
-        except StopIteration:
-            return
-
-    def _AddBackToken(self, token):
-        if token.whence == tokenize.WHENCE_STREAM:
-            token.whence = tokenize.WHENCE_QUEUE
-            self.token_queue.insert(0, token)
-        else:
-            assert token.whence == tokenize.WHENCE_QUEUE, token
-            self.token_queue.append(token)
-
-    def _AddBackTokens(self, tokens):
-        if tokens:
-            if tokens[-1].whence == tokenize.WHENCE_STREAM:
-                for token in tokens:
-                    token.whence = tokenize.WHENCE_QUEUE
-                self.token_queue[:0] = reversed(tokens)
-            else:
-                assert tokens[-1].whence == tokenize.WHENCE_QUEUE, tokens
-                self.token_queue.extend(reversed(tokens))
-
-    def GetName(self, seq=None):
-        """Returns ([tokens], next_token_info)."""
-        GetNextToken = self._GetNextToken
-        if seq is not None:
-            it = iter(seq)
-            GetNextToken = lambda: next(it)
-        next_token = GetNextToken()
-        tokens = []
-        last_token_was_name = False
-        while (next_token.token_type == tokenize.NAME or
-               (next_token.token_type == tokenize.SYNTAX and
-                next_token.name in ('::', '<'))):
-            # Two NAMEs in a row means the identifier should terminate.
-            # It's probably some sort of variable declaration.
-            if last_token_was_name and next_token.token_type == tokenize.NAME:
-                break
-            last_token_was_name = next_token.token_type == tokenize.NAME
-            tokens.append(next_token)
-            # Handle templated names.
-            if next_token.name == '<':
-                tokens.extend(self._GetMatchingChar('<', '>', GetNextToken))
-                last_token_was_name = True
-            next_token = GetNextToken()
-        return tokens, next_token
-
-    def GetMethod(self, modifiers, templated_types):
-        return_type_and_name = self._GetTokensUpTo(tokenize.SYNTAX, '(')
-        assert len(return_type_and_name) >= 1
-        return self._GetMethod(return_type_and_name, modifiers, templated_types,
-                               False)
-
-    def _GetMethod(self, return_type_and_name, modifiers, templated_types,
-                   get_paren):
-        template_portion = None
-        if get_paren:
-            token = self._GetNextToken()
-            assert token.token_type == tokenize.SYNTAX, token
-            if token.name == '<':
-                # Handle templatized dtors.
-                template_portion = [token]
-                template_portion.extend(self._GetMatchingChar('<', '>'))
-                token = self._GetNextToken()
-            assert token.token_type == tokenize.SYNTAX, token
-            assert token.name == '(', token
-
-        name = return_type_and_name.pop()
-        # Handle templatized ctors.
-        if name.name == '>':
-            index = 1
-            while return_type_and_name[index].name != '<':
-                index += 1
-            template_portion = return_type_and_name[index:] + [name]
-            del return_type_and_name[index:]
-            name = return_type_and_name.pop()
-        elif name.name == ']':
-            rt = return_type_and_name
-            assert rt[-1].name == '[', return_type_and_name
-            assert rt[-2].name == 'operator', return_type_and_name
-            name_seq = return_type_and_name[-2:]
-            del return_type_and_name[-2:]
-            name = tokenize.Token(tokenize.NAME, 'operator[]',
-                                  name_seq[0].start, name.end)
-            # Get the open paren so _GetParameters() below works.
-            unused_open_paren = self._GetNextToken()
-
-        # TODO(nnorwitz): store template_portion.
-        return_type = return_type_and_name
-        indices = name
-        if return_type:
-            indices = return_type[0]
-
-        # Force ctor for templatized ctors.
-        if name.name == self.in_class and not modifiers:
-            modifiers |= FUNCTION_CTOR
-        parameters = list(self._GetParameters())
-        del parameters[-1]  # Remove trailing ')'.
-
-        # Handling operator() is especially weird.
-        if name.name == 'operator' and not parameters:
-            token = self._GetNextToken()
-            assert token.name == '(', token
-            parameters = list(self._GetParameters())
-            del parameters[-1]  # Remove trailing ')'.
-
-        token = self._GetNextToken()
-        while token.token_type == tokenize.NAME:
-            modifier_token = token
-            token = self._GetNextToken()
-            if modifier_token.name == 'const':
-                modifiers |= FUNCTION_CONST
-            elif modifier_token.name == '__attribute__':
-                # TODO(nnorwitz): handle more __attribute__ details.
-                modifiers |= FUNCTION_ATTRIBUTE
-                assert token.name == '(', token
-                # Consume everything between the (parens).
-                unused_tokens = list(self._GetMatchingChar('(', ')'))
-                token = self._GetNextToken()
-            elif modifier_token.name == 'throw':
-                modifiers |= FUNCTION_THROW
-                assert token.name == '(', token
-                # Consume everything between the (parens).
-                unused_tokens = list(self._GetMatchingChar('(', ')'))
-                token = self._GetNextToken()
-            elif modifier_token.name == 'override':
-                modifiers |= FUNCTION_OVERRIDE
-            elif modifier_token.name == modifier_token.name.upper():
-                # HACK(nnorwitz):  assume that all upper-case names
-                # are some macro we aren't expanding.
-                modifiers |= FUNCTION_UNKNOWN_ANNOTATION
-            else:
-                self.HandleError('unexpected token', modifier_token)
-
-        assert token.token_type == tokenize.SYNTAX, token
-        # Handle ctor initializers.
-        if token.name == ':':
-            # TODO(nnorwitz): anything else to handle for initializer list?
-            while token.name != ';' and token.name != '{':
-                token = self._GetNextToken()
-
-        # Handle pointer to functions that are really data but look
-        # like method declarations.
-        if token.name == '(':
-            if parameters[0].name == '*':
-                # name contains the return type.
-                name = parameters.pop()
-                # parameters contains the name of the data.
-                modifiers = [p.name for p in parameters]
-                # Already at the ( to open the parameter list.
-                function_parameters = list(self._GetMatchingChar('(', ')'))
-                del function_parameters[-1]  # Remove trailing ')'.
-                # TODO(nnorwitz): store the function_parameters.
-                token = self._GetNextToken()
-                assert token.token_type == tokenize.SYNTAX, token
-                assert token.name == ';', token
-                return self._CreateVariable(indices, name.name, indices.name,
-                                            modifiers, '', None)
-            # At this point, we got something like:
-            #  return_type (type::*name_)(params);
-            # This is a data member called name_ that is a function pointer.
-            # With this code: void (sq_type::*field_)(string&);
-            # We get: name=void return_type=[] parameters=sq_type ... field_
-            # TODO(nnorwitz): is return_type always empty?
-            # TODO(nnorwitz): this isn't even close to being correct.
-            # Just put in something so we don't crash and can move on.
-            real_name = parameters[-1]
-            modifiers = [p.name for p in self._GetParameters()]
-            del modifiers[-1]  # Remove trailing ')'.
-            return self._CreateVariable(indices, real_name.name, indices.name,
-                                        modifiers, '', None)
-
-        if token.name == '{':
-            body = list(self.GetScope())
-            del body[-1]  # Remove trailing '}'.
-        else:
-            body = None
-            if token.name == '=':
-                token = self._GetNextToken()
-
-                if token.name == 'default' or token.name == 'delete':
-                    # Ignore explicitly defaulted and deleted special members
-                    # in C++11.
-                    token = self._GetNextToken()
-                else:
-                    # Handle pure-virtual declarations.
-                    assert token.token_type == tokenize.CONSTANT, token
-                    assert token.name == '0', token
-                    modifiers |= FUNCTION_PURE_VIRTUAL
-                    token = self._GetNextToken()
-
-            if token.name == '[':
-                # TODO(nnorwitz): store tokens and improve parsing.
-                # template <typename T, size_t N> char (&ASH(T (&seq)[N]))[N];
-                tokens = list(self._GetMatchingChar('[', ']'))
-                token = self._GetNextToken()
-
-            assert token.name == ';', (token, return_type_and_name, parameters)
-
-        # Looks like we got a method, not a function.
-        if len(return_type) > 2 and return_type[-1].name == '::':
-            return_type, in_class = \
-                self._GetReturnTypeAndClassName(return_type)
-            return Method(indices.start, indices.end, name.name, in_class,
-                          return_type, parameters, modifiers, templated_types,
-                          body, self.namespace_stack)
-        return Function(indices.start, indices.end, name.name, return_type,
-                        parameters, modifiers, templated_types, body,
-                        self.namespace_stack)
-
-    def _GetReturnTypeAndClassName(self, token_seq):
-        # Splitting the return type from the class name in a method
-        # can be tricky.  For example, Return::Type::Is::Hard::To::Find().
-        # Where is the return type and where is the class name?
-        # The heuristic used is to pull the last name as the class name.
-        # This includes all the templated type info.
-        # TODO(nnorwitz): if there is only One name like in the
-        # example above, punt and assume the last bit is the class name.
-
-        # Ignore a :: prefix, if exists so we can find the first real name.
-        i = 0
-        if token_seq[0].name == '::':
-            i = 1
-        # Ignore a :: suffix, if exists.
-        end = len(token_seq) - 1
-        if token_seq[end - 1].name == '::':
-            end -= 1
-
-        # Make a copy of the sequence so we can append a sentinel
-        # value. This is required for GetName will has to have some
-        # terminating condition beyond the last name.
-        seq_copy = token_seq[i:end]
-        seq_copy.append(tokenize.Token(tokenize.SYNTAX, '', 0, 0))
-        names = []
-        while i < end:
-            # Iterate through the sequence parsing out each name.
-            new_name, next = self.GetName(seq_copy[i:])
-            assert new_name, 'Got empty new_name, next=%s' % next
-            # We got a pointer or ref.  Add it to the name.
-            if next and next.token_type == tokenize.SYNTAX:
-                new_name.append(next)
-            names.append(new_name)
-            i += len(new_name)
-
-        # Now that we have the names, it's time to undo what we did.
-
-        # Remove the sentinel value.
-        names[-1].pop()
-        # Flatten the token sequence for the return type.
-        return_type = [e for seq in names[:-1] for e in seq]
-        # The class name is the last name.
-        class_name = names[-1]
-        return return_type, class_name
-
-    def handle_bool(self):
-        pass
-
-    def handle_char(self):
-        pass
-
-    def handle_int(self):
-        pass
-
-    def handle_long(self):
-        pass
-
-    def handle_short(self):
-        pass
-
-    def handle_double(self):
-        pass
-
-    def handle_float(self):
-        pass
-
-    def handle_void(self):
-        pass
-
-    def handle_wchar_t(self):
-        pass
-
-    def handle_unsigned(self):
-        pass
-
-    def handle_signed(self):
-        pass
-
-    def _GetNestedType(self, ctor):
-        name = None
-        name_tokens, token = self.GetName()
-        if name_tokens:
-            name = ''.join([t.name for t in name_tokens])
-
-        # Handle forward declarations.
-        if token.token_type == tokenize.SYNTAX and token.name == ';':
-            return ctor(token.start, token.end, name, None,
-                        self.namespace_stack)
-
-        if token.token_type == tokenize.NAME and self._handling_typedef:
-            self._AddBackToken(token)
-            return ctor(token.start, token.end, name, None,
-                        self.namespace_stack)
-
-        # Must be the type declaration.
-        fields = list(self._GetMatchingChar('{', '}'))
-        del fields[-1]  # Remove trailing '}'.
-        if token.token_type == tokenize.SYNTAX and token.name == '{':
-            next = self._GetNextToken()
-            new_type = ctor(token.start, token.end, name, fields,
-                            self.namespace_stack)
-            # A name means this is an anonymous type and the name
-            # is the variable declaration.
-            if next.token_type != tokenize.NAME:
-                return new_type
-            name = new_type
-            token = next
-
-        # Must be variable declaration using the type prefixed with keyword.
-        assert token.token_type == tokenize.NAME, token
-        return self._CreateVariable(token, token.name, name, [], '', None)
-
-    def handle_struct(self):
-        # Special case the handling typedef/aliasing of structs here.
-        # It would be a pain to handle in the class code.
-        name_tokens, var_token = self.GetName()
-        if name_tokens:
-            next_token = self._GetNextToken()
-            is_syntax = (var_token.token_type == tokenize.SYNTAX and
-                         var_token.name[0] in '*&')
-            is_variable = (var_token.token_type == tokenize.NAME and
-                           next_token.name == ';')
-            variable = var_token
-            if is_syntax and not is_variable:
-                variable = next_token
-                temp = self._GetNextToken()
-                if temp.token_type == tokenize.SYNTAX and temp.name == '(':
-                    # Handle methods declared to return a struct.
-                    t0 = name_tokens[0]
-                    struct = tokenize.Token(tokenize.NAME, 'struct',
-                                            t0.start - 7, t0.start - 2)
-                    type_and_name = [struct]
-                    type_and_name.extend(name_tokens)
-                    type_and_name.extend((var_token, next_token))
-                    return self._GetMethod(type_and_name, 0, None, False)
-                assert temp.name == ';', (temp, name_tokens, var_token)
-            if is_syntax or (is_variable and not self._handling_typedef):
-                modifiers = ['struct']
-                type_name = ''.join([t.name for t in name_tokens])
-                position = name_tokens[0]
-                return self._CreateVariable(position, variable.name, type_name,
-                                            modifiers, var_token.name, None)
-            name_tokens.extend((var_token, next_token))
-            self._AddBackTokens(name_tokens)
-        else:
-            self._AddBackToken(var_token)
-        return self._GetClass(Struct, VISIBILITY_PUBLIC, None)
-
-    def handle_union(self):
-        return self._GetNestedType(Union)
-
-    def handle_enum(self):
-        return self._GetNestedType(Enum)
-
-    def handle_auto(self):
-        # TODO(nnorwitz): warn about using auto?  Probably not since it
-        # will be reclaimed and useful for C++0x.
-        pass
-
-    def handle_register(self):
-        pass
-
-    def handle_const(self):
-        pass
-
-    def handle_inline(self):
-        pass
-
-    def handle_extern(self):
-        pass
-
-    def handle_static(self):
-        pass
-
-    def handle_virtual(self):
-        # What follows must be a method.
-        token = token2 = self._GetNextToken()
-        if token.name == 'inline':
-            # HACK(nnorwitz): handle inline dtors by ignoring 'inline'.
-            token2 = self._GetNextToken()
-        if token2.token_type == tokenize.SYNTAX and token2.name == '~':
-            return self.GetMethod(FUNCTION_VIRTUAL + FUNCTION_DTOR, None)
-        assert token.token_type == tokenize.NAME or token.name == '::', token
-        return_type_and_name, _ = self._GetVarTokensUpToIgnoringTemplates(
-            tokenize.SYNTAX, '(')  # )
-        return_type_and_name.insert(0, token)
-        if token2 is not token:
-            return_type_and_name.insert(1, token2)
-        return self._GetMethod(return_type_and_name, FUNCTION_VIRTUAL,
-                               None, False)
-
-    def handle_volatile(self):
-        pass
-
-    def handle_mutable(self):
-        pass
-
-    def handle_public(self):
-        assert self.in_class
-        self.visibility = VISIBILITY_PUBLIC
-
-    def handle_protected(self):
-        assert self.in_class
-        self.visibility = VISIBILITY_PROTECTED
-
-    def handle_private(self):
-        assert self.in_class
-        self.visibility = VISIBILITY_PRIVATE
-
-    def handle_friend(self):
-        tokens = self._GetTokensUpTo(tokenize.SYNTAX, ';')
-        assert tokens
-        t0 = tokens[0]
-        return Friend(t0.start, t0.end, tokens, self.namespace_stack)
-
-    def handle_static_cast(self):
-        pass
-
-    def handle_const_cast(self):
-        pass
-
-    def handle_dynamic_cast(self):
-        pass
-
-    def handle_reinterpret_cast(self):
-        pass
-
-    def handle_new(self):
-        pass
-
-    def handle_delete(self):
-        tokens = self._GetTokensUpTo(tokenize.SYNTAX, ';')
-        assert tokens
-        return Delete(tokens[0].start, tokens[0].end, tokens)
-
-    def handle_typedef(self):
-        token = self._GetNextToken()
-        if (token.token_type == tokenize.NAME and
-                keywords.IsKeyword(token.name)):
-            # Token must be struct/enum/union/class.
-            method = getattr(self, 'handle_' + token.name)
-            self._handling_typedef = True
-            tokens = [method()]
-            self._handling_typedef = False
-        else:
-            tokens = [token]
-
-        # Get the remainder of the typedef up to the semi-colon.
-        tokens.extend(self._GetTokensUpTo(tokenize.SYNTAX, ';'))
-
-        # TODO(nnorwitz): clean all this up.
-        assert tokens
-        name = tokens.pop()
-        indices = name
-        if tokens:
-            indices = tokens[0]
-        if not indices:
-            indices = token
-        if name.name == ')':
-            # HACK(nnorwitz): Handle pointers to functions "properly".
-            if (len(tokens) >= 4 and
-                    tokens[1].name == '(' and tokens[2].name == '*'):
-                tokens.append(name)
-                name = tokens[3]
-        elif name.name == ']':
-            # HACK(nnorwitz): Handle arrays properly.
-            if len(tokens) >= 2:
-                tokens.append(name)
-                name = tokens[1]
-        new_type = tokens
-        if tokens and isinstance(tokens[0], tokenize.Token):
-            new_type = self.converter.ToType(tokens)[0]
-        return Typedef(indices.start, indices.end, name.name,
-                       new_type, self.namespace_stack)
-
-    def handle_typeid(self):
-        pass  # Not needed yet.
-
-    def handle_typename(self):
-        pass  # Not needed yet.
-
-    def _GetTemplatedTypes(self):
-        result = collections.OrderedDict()
-        tokens = list(self._GetMatchingChar('<', '>'))
-        len_tokens = len(tokens) - 1  # Ignore trailing '>'.
-        i = 0
-        while i < len_tokens:
-            key = tokens[i].name
-            i += 1
-            if keywords.IsKeyword(key) or key == ',':
-                continue
-            type_name = default = None
-            if i < len_tokens:
-                i += 1
-                if tokens[i - 1].name == '=':
-                    assert i < len_tokens, '%s %s' % (i, tokens)
-                    default, unused_next_token = self.GetName(tokens[i:])
-                    i += len(default)
-                else:
-                    if tokens[i - 1].name != ',':
-                        # We got something like: Type variable.
-                        # Re-adjust the key (variable) and type_name (Type).
-                        key = tokens[i - 1].name
-                        type_name = tokens[i - 2]
-
-            result[key] = (type_name, default)
-        return result
-
-    def handle_template(self):
-        token = self._GetNextToken()
-        assert token.token_type == tokenize.SYNTAX, token
-        assert token.name == '<', token
-        templated_types = self._GetTemplatedTypes()
-        # TODO(nnorwitz): for now, just ignore the template params.
-        token = self._GetNextToken()
-        if token.token_type == tokenize.NAME:
-            if token.name == 'class':
-                return self._GetClass(Class, VISIBILITY_PRIVATE, templated_types)
-            elif token.name == 'struct':
-                return self._GetClass(Struct, VISIBILITY_PUBLIC, templated_types)
-            elif token.name == 'friend':
-                return self.handle_friend()
-        self._AddBackToken(token)
-        tokens, last = self._GetVarTokensUpTo(tokenize.SYNTAX, '(', ';')
-        tokens.append(last)
-        self._AddBackTokens(tokens)
-        if last.name == '(':
-            return self.GetMethod(FUNCTION_NONE, templated_types)
-        # Must be a variable definition.
-        return None
-
-    def handle_true(self):
-        pass  # Nothing to do.
-
-    def handle_false(self):
-        pass  # Nothing to do.
-
-    def handle_asm(self):
-        pass  # Not needed yet.
-
-    def handle_class(self):
-        return self._GetClass(Class, VISIBILITY_PRIVATE, None)
-
-    def _GetBases(self):
-        # Get base classes.
-        bases = []
-        while 1:
-            token = self._GetNextToken()
-            assert token.token_type == tokenize.NAME, token
-            # TODO(nnorwitz): store kind of inheritance...maybe.
-            if token.name not in ('public', 'protected', 'private'):
-                # If inheritance type is not specified, it is private.
-                # Just put the token back so we can form a name.
-                # TODO(nnorwitz): it would be good to warn about this.
-                self._AddBackToken(token)
-            else:
-                # Check for virtual inheritance.
-                token = self._GetNextToken()
-                if token.name != 'virtual':
-                    self._AddBackToken(token)
-                else:
-                    # TODO(nnorwitz): store that we got virtual for this base.
-                    pass
-            base, next_token = self.GetName()
-            bases_ast = self.converter.ToType(base)
-            assert len(bases_ast) == 1, bases_ast
-            bases.append(bases_ast[0])
-            assert next_token.token_type == tokenize.SYNTAX, next_token
-            if next_token.name == '{':
-                token = next_token
-                break
-            # Support multiple inheritance.
-            assert next_token.name == ',', next_token
-        return bases, token
-
-    def _GetClass(self, class_type, visibility, templated_types):
-        class_name = None
-        class_token = self._GetNextToken()
-        if class_token.token_type != tokenize.NAME:
-            assert class_token.token_type == tokenize.SYNTAX, class_token
-            token = class_token
-        else:
-            # Skip any macro (e.g. storage class specifiers) after the
-            # 'class' keyword.
-            next_token = self._GetNextToken()
-            if next_token.token_type == tokenize.NAME:
-                self._AddBackToken(next_token)
-            else:
-                self._AddBackTokens([class_token, next_token])
-            name_tokens, token = self.GetName()
-            class_name = ''.join([t.name for t in name_tokens])
-        bases = None
-        if token.token_type == tokenize.SYNTAX:
-            if token.name == ';':
-                # Forward declaration.
-                return class_type(class_token.start, class_token.end,
-                                  class_name, None, templated_types, None,
-                                  self.namespace_stack)
-            if token.name in '*&':
-                # Inline forward declaration.  Could be method or data.
-                name_token = self._GetNextToken()
-                next_token = self._GetNextToken()
-                if next_token.name == ';':
-                    # Handle data
-                    modifiers = ['class']
-                    return self._CreateVariable(class_token, name_token.name,
-                                                class_name,
-                                                modifiers, token.name, None)
-                else:
-                    # Assume this is a method.
-                    tokens = (class_token, token, name_token, next_token)
-                    self._AddBackTokens(tokens)
-                    return self.GetMethod(FUNCTION_NONE, None)
-            if token.name == ':':
-                bases, token = self._GetBases()
-
-        body = None
-        if token.token_type == tokenize.SYNTAX and token.name == '{':
-            assert token.token_type == tokenize.SYNTAX, token
-            assert token.name == '{', token
-
-            ast = AstBuilder(self.GetScope(), self.filename, class_name,
-                             visibility, self.namespace_stack)
-            body = list(ast.Generate())
-
-            if not self._handling_typedef:
-                token = self._GetNextToken()
-                if token.token_type != tokenize.NAME:
-                    assert token.token_type == tokenize.SYNTAX, token
-                    assert token.name == ';', token
-                else:
-                    new_class = class_type(class_token.start, class_token.end,
-                                           class_name, bases, None,
-                                           body, self.namespace_stack)
-
-                    modifiers = []
-                    return self._CreateVariable(class_token,
-                                                token.name, new_class,
-                                                modifiers, token.name, None)
-        else:
-            if not self._handling_typedef:
-                self.HandleError('non-typedef token', token)
-            self._AddBackToken(token)
-
-        return class_type(class_token.start, class_token.end, class_name,
-                          bases, templated_types, body, self.namespace_stack)
-
-    def handle_namespace(self):
-        # Support anonymous namespaces.
-        name = None
-        name_tokens, token = self.GetName()
-        if name_tokens:
-            name = ''.join([t.name for t in name_tokens])
-        self.namespace_stack.append(name)
-        assert token.token_type == tokenize.SYNTAX, token
-        # Create an internal token that denotes when the namespace is complete.
-        internal_token = tokenize.Token(_INTERNAL_TOKEN, _NAMESPACE_POP,
-                                        None, None)
-        internal_token.whence = token.whence
-        if token.name == '=':
-            # TODO(nnorwitz): handle aliasing namespaces.
-            name, next_token = self.GetName()
-            assert next_token.name == ';', next_token
-            self._AddBackToken(internal_token)
-        else:
-            assert token.name == '{', token
-            tokens = list(self.GetScope())
-            # Replace the trailing } with the internal namespace pop token.
-            tokens[-1] = internal_token
-            # Handle namespace with nothing in it.
-            self._AddBackTokens(tokens)
-        return None
-
-    def handle_using(self):
-        tokens = self._GetTokensUpTo(tokenize.SYNTAX, ';')
-        assert tokens
-        return Using(tokens[0].start, tokens[0].end, tokens)
-
-    def handle_explicit(self):
-        assert self.in_class
-        # Nothing much to do.
-        # TODO(nnorwitz): maybe verify the method name == class name.
-        # This must be a ctor.
-        return self.GetMethod(FUNCTION_CTOR, None)
-
-    def handle_this(self):
-        pass  # Nothing to do.
-
-    def handle_operator(self):
-        # Pull off the next token(s?) and make that part of the method name.
-        pass
-
-    def handle_sizeof(self):
-        pass
-
-    def handle_case(self):
-        pass
-
-    def handle_switch(self):
-        pass
-
-    def handle_default(self):
-        token = self._GetNextToken()
-        assert token.token_type == tokenize.SYNTAX
-        assert token.name == ':'
-
-    def handle_if(self):
-        pass
-
-    def handle_else(self):
-        pass
-
-    def handle_return(self):
-        tokens = self._GetTokensUpTo(tokenize.SYNTAX, ';')
-        if not tokens:
-            return Return(self.current_token.start, self.current_token.end, None)
-        return Return(tokens[0].start, tokens[0].end, tokens)
-
-    def handle_goto(self):
-        tokens = self._GetTokensUpTo(tokenize.SYNTAX, ';')
-        assert len(tokens) == 1, str(tokens)
-        return Goto(tokens[0].start, tokens[0].end, tokens[0].name)
-
-    def handle_try(self):
-        pass  # Not needed yet.
-
-    def handle_catch(self):
-        pass  # Not needed yet.
-
-    def handle_throw(self):
-        pass  # Not needed yet.
-
-    def handle_while(self):
-        pass
-
-    def handle_do(self):
-        pass
-
-    def handle_for(self):
-        pass
-
-    def handle_break(self):
-        self._IgnoreUpTo(tokenize.SYNTAX, ';')
-
-    def handle_continue(self):
-        self._IgnoreUpTo(tokenize.SYNTAX, ';')
-
-
-def BuilderFromSource(source, filename):
-    """Utility method that returns an AstBuilder from source code.
-
-      Args:
-        source: 'C++ source code'
-        filename: 'file1'
-
-      Returns:
-        AstBuilder
-      """
-    return AstBuilder(tokenize.GetTokens(source), filename)
-
-
-def PrintIndentifiers(filename, should_print):
-    """Prints all identifiers for a C++ source file.
-
-      Args:
-        filename: 'file1'
-        should_print: predicate with signature: bool Function(token)
-      """
-    source = utils.ReadFile(filename, False)
-    if source is None:
-        sys.stderr.write('Unable to find: %s\n' % filename)
-        return
-
-    # print('Processing %s' % actual_filename)
-    builder = BuilderFromSource(source, filename)
-    try:
-        for node in builder.Generate():
-            if should_print(node):
-                print(node.name)
-    except KeyboardInterrupt:
-        return
-    except:
-        pass
-
-
-def PrintAllIndentifiers(filenames, should_print):
-    """Prints all identifiers for each C++ source file in filenames.
-
-      Args:
-        filenames: ['file1', 'file2', ...]
-        should_print: predicate with signature: bool Function(token)
-      """
-    for path in filenames:
-        PrintIndentifiers(path, should_print)
-
-
-def main(argv):
-    for filename in argv[1:]:
-        source = utils.ReadFile(filename)
-        if source is None:
-            continue
-
-        print('Processing %s' % filename)
-        builder = BuilderFromSource(source, filename)
-        try:
-            entire_ast = filter(None, builder.Generate())
-        except KeyboardInterrupt:
-            return
-        except:
-            # Already printed a warning, print the traceback and continue.
-            traceback.print_exc()
-        else:
-            if utils.DEBUG:
-                for ast in entire_ast:
-                    print(ast)
-
-
-if __name__ == '__main__':
-    main(sys.argv)
diff --git a/external/googletest/googlemock/scripts/generator/cpp/gmock_class.py b/external/googletest/googlemock/scripts/generator/cpp/gmock_class.py
deleted file mode 100644
index 38a232ba..00000000
--- a/external/googletest/googlemock/scripts/generator/cpp/gmock_class.py
+++ /dev/null
@@ -1,247 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2008 Google Inc.  All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""Generate Google Mock classes from base classes.
-
-This program will read in a C++ source file and output the Google Mock
-classes for the specified classes.  If no class is specified, all
-classes in the source file are emitted.
-
-Usage:
-  gmock_class.py header-file.h [ClassName]...
-
-Output is sent to stdout.
-"""
-
-import os
-import re
-import sys
-
-from cpp import ast
-from cpp import utils
-
-# Preserve compatibility with Python 2.3.
-try:
-    _dummy = set
-except NameError:
-    import sets
-
-    set = sets.Set
-
-_VERSION = (1, 0, 1)  # The version of this script.
-# How many spaces to indent.  Can set me with the INDENT environment variable.
-_INDENT = 2
-
-
-def _RenderType(ast_type):
-    """Renders the potentially recursively templated type into a string.
-
-    Args:
-      ast_type: The AST of the type.
-
-    Returns:
-      Rendered string of the type.
-    """
-    # Add modifiers like 'const'.
-    modifiers = ''
-    if ast_type.modifiers:
-        modifiers = ' '.join(ast_type.modifiers) + ' '
-    return_type = modifiers + ast_type.name
-    if ast_type.templated_types:
-        # Collect template args.
-        template_args = []
-        for arg in ast_type.templated_types:
-            rendered_arg = _RenderType(arg)
-            template_args.append(rendered_arg)
-        return_type += '<' + ', '.join(template_args) + '>'
-    if ast_type.pointer:
-        return_type += '*'
-    if ast_type.reference:
-        return_type += '&'
-    return return_type
-
-
-def _GenerateArg(source):
-    """Strips out comments, default arguments, and redundant spaces from a single argument.
-
-    Args:
-      source: A string for a single argument.
-
-    Returns:
-      Rendered string of the argument.
-    """
-    # Remove end of line comments before eliminating newlines.
-    arg = re.sub(r'//.*', '', source)
-
-    # Remove c-style comments.
-    arg = re.sub(r'/\*.*\*/', '', arg)
-
-    # Remove default arguments.
-    arg = re.sub(r'=.*', '', arg)
-
-    # Collapse spaces and newlines into a single space.
-    arg = re.sub(r'\s+', ' ', arg)
-    return arg.strip()
-
-
-def _EscapeForMacro(s):
-    """Escapes a string for use as an argument to a C++ macro."""
-    paren_count = 0
-    for c in s:
-        if c == '(':
-            paren_count += 1
-        elif c == ')':
-            paren_count -= 1
-        elif c == ',' and paren_count == 0:
-            return '(' + s + ')'
-    return s
-
-
-def _GenerateMethods(output_lines, source, class_node):
-    function_type = (
-            ast.FUNCTION_VIRTUAL | ast.FUNCTION_PURE_VIRTUAL | ast.FUNCTION_OVERRIDE)
-    ctor_or_dtor = ast.FUNCTION_CTOR | ast.FUNCTION_DTOR
-    indent = ' ' * _INDENT
-
-    for node in class_node.body:
-        # We only care about virtual functions.
-        if (isinstance(node, ast.Function) and node.modifiers & function_type and
-                not node.modifiers & ctor_or_dtor):
-            # Pick out all the elements we need from the original function.
-            modifiers = 'override'
-            if node.modifiers & ast.FUNCTION_CONST:
-                modifiers = 'const, ' + modifiers
-
-            return_type = 'void'
-            if node.return_type:
-                return_type = _EscapeForMacro(_RenderType(node.return_type))
-
-            args = []
-            for p in node.parameters:
-                arg = _GenerateArg(source[p.start:p.end])
-                if arg != 'void':
-                    args.append(_EscapeForMacro(arg))
-
-            # Create the mock method definition.
-            output_lines.extend([
-                '%sMOCK_METHOD(%s, %s, (%s), (%s));' %
-                (indent, return_type, node.name, ', '.join(args), modifiers)
-            ])
-
-
-def _GenerateMocks(filename, source, ast_list, desired_class_names):
-    processed_class_names = set()
-    lines = []
-    for node in ast_list:
-        if (isinstance(node, ast.Class) and node.body and
-                # desired_class_names being None means that all classes are selected.
-                (not desired_class_names or node.name in desired_class_names)):
-            class_name = node.name
-            parent_name = class_name
-            processed_class_names.add(class_name)
-            class_node = node
-            # Add namespace before the class.
-            if class_node.namespace:
-                lines.extend(['namespace %s {' % n for n in class_node.namespace])  # }
-                lines.append('')
-
-            # Add template args for templated classes.
-            if class_node.templated_types:
-                # TODO(paulchang): Handle non-type template arguments (e.g.
-                # template<typename T, int N>).
-
-                # class_node.templated_types is an OrderedDict from strings to a tuples.
-                # The key is the name of the template, and the value is
-                # (type_name, default). Both type_name and default could be None.
-                template_args = class_node.templated_types.keys()
-                template_decls = ['typename ' + arg for arg in template_args]
-                lines.append('template <' + ', '.join(template_decls) + '>')
-                parent_name += '<' + ', '.join(template_args) + '>'
-
-            # Add the class prolog.
-            lines.append('class Mock%s : public %s {'  # }
-                         % (class_name, parent_name))
-            lines.append('%spublic:' % (' ' * (_INDENT // 2)))
-
-            # Add all the methods.
-            _GenerateMethods(lines, source, class_node)
-
-            # Close the class.
-            if lines:
-                # If there are no virtual methods, no need for a public label.
-                if len(lines) == 2:
-                    del lines[-1]
-
-                # Only close the class if there really is a class.
-                lines.append('};')
-                lines.append('')  # Add an extra newline.
-
-            # Close the namespace.
-            if class_node.namespace:
-                for i in range(len(class_node.namespace) - 1, -1, -1):
-                    lines.append('}  // namespace %s' % class_node.namespace[i])
-                lines.append('')  # Add an extra newline.
-
-    if desired_class_names:
-        missing_class_name_list = list(desired_class_names - processed_class_names)
-        if missing_class_name_list:
-            missing_class_name_list.sort()
-            sys.stderr.write('Class(es) not found in %s: %s\n' %
-                             (filename, ', '.join(missing_class_name_list)))
-    elif not processed_class_names:
-        sys.stderr.write('No class found in %s\n' % filename)
-
-    return lines
-
-
-def main(argv=sys.argv):
-    if len(argv) < 2:
-        sys.stderr.write('Google Mock Class Generator v%s\n\n' %
-                         '.'.join(map(str, _VERSION)))
-        sys.stderr.write(__doc__)
-        return 1
-
-    global _INDENT
-    try:
-        _INDENT = int(os.environ['INDENT'])
-    except KeyError:
-        pass
-    except:
-        sys.stderr.write('Unable to use indent of %s\n' % os.environ.get('INDENT'))
-
-    filename = argv[1]
-    desired_class_names = None  # None means all classes in the source file.
-    if len(argv) >= 3:
-        desired_class_names = set(argv[2:])
-    source = utils.ReadFile(filename)
-    if source is None:
-        return 1
-
-    builder = ast.BuilderFromSource(source, filename)
-    try:
-        entire_ast = filter(None, builder.Generate())
-    except KeyboardInterrupt:
-        return
-    except:
-        # An error message was already printed since we couldn't parse.
-        sys.exit(1)
-    else:
-        lines = _GenerateMocks(filename, source, entire_ast, desired_class_names)
-        sys.stdout.write('\n'.join(lines))
-
-
-if __name__ == '__main__':
-    main(sys.argv)
diff --git a/external/googletest/googlemock/scripts/generator/cpp/gmock_class_test.py b/external/googletest/googlemock/scripts/generator/cpp/gmock_class_test.py
deleted file mode 100644
index 60992b5d..00000000
--- a/external/googletest/googlemock/scripts/generator/cpp/gmock_class_test.py
+++ /dev/null
@@ -1,570 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2009 Neal Norwitz All Rights Reserved.
-# Portions Copyright 2009 Google Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""Tests for gmock.scripts.generator.cpp.gmock_class."""
-
-import os
-import sys
-import unittest
-
-# Allow the cpp imports below to work when run as a standalone script.
-sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
-
-from cpp import ast
-from cpp import gmock_class
-
-
-class TestCase(unittest.TestCase):
-    """Helper class that adds assert methods."""
-
-    @staticmethod
-    def StripLeadingWhitespace(lines):
-        """Strip leading whitespace in each line in 'lines'."""
-        return '\n'.join([s.lstrip() for s in lines.split('\n')])
-
-    def assertEqualIgnoreLeadingWhitespace(self, expected_lines, lines):
-        """Specialized assert that ignores the indent level."""
-        self.assertEqual(expected_lines, self.StripLeadingWhitespace(lines))
-
-
-class GenerateMethodsTest(TestCase):
-
-    @staticmethod
-    def GenerateMethodSource(cpp_source):
-        """Convert C++ source to Google Mock output source lines."""
-        method_source_lines = []
-        # <test> is a pseudo-filename, it is not read or written.
-        builder = ast.BuilderFromSource(cpp_source, '<test>')
-        ast_list = list(builder.Generate())
-        gmock_class._GenerateMethods(method_source_lines, cpp_source, ast_list[0])
-        return '\n'.join(method_source_lines)
-
-    def testSimpleMethod(self):
-        source = """
-class Foo {
- public:
-  virtual int Bar();
-};
-"""
-        self.assertEqualIgnoreLeadingWhitespace(
-            'MOCK_METHOD(int, Bar, (), (override));',
-            self.GenerateMethodSource(source))
-
-    def testSimpleConstructorsAndDestructor(self):
-        source = """
-class Foo {
- public:
-  Foo();
-  Foo(int x);
-  Foo(const Foo& f);
-  Foo(Foo&& f);
-  ~Foo();
-  virtual int Bar() = 0;
-};
-"""
-        # The constructors and destructor should be ignored.
-        self.assertEqualIgnoreLeadingWhitespace(
-            'MOCK_METHOD(int, Bar, (), (override));',
-            self.GenerateMethodSource(source))
-
-    def testVirtualDestructor(self):
-        source = """
-class Foo {
- public:
-  virtual ~Foo();
-  virtual int Bar() = 0;
-};
-"""
-        # The destructor should be ignored.
-        self.assertEqualIgnoreLeadingWhitespace(
-            'MOCK_METHOD(int, Bar, (), (override));',
-            self.GenerateMethodSource(source))
-
-    def testExplicitlyDefaultedConstructorsAndDestructor(self):
-        source = """
-class Foo {
- public:
-  Foo() = default;
-  Foo(const Foo& f) = default;
-  Foo(Foo&& f) = default;
-  ~Foo() = default;
-  virtual int Bar() = 0;
-};
-"""
-        # The constructors and destructor should be ignored.
-        self.assertEqualIgnoreLeadingWhitespace(
-            'MOCK_METHOD(int, Bar, (), (override));',
-            self.GenerateMethodSource(source))
-
-    def testExplicitlyDeletedConstructorsAndDestructor(self):
-        source = """
-class Foo {
- public:
-  Foo() = delete;
-  Foo(const Foo& f) = delete;
-  Foo(Foo&& f) = delete;
-  ~Foo() = delete;
-  virtual int Bar() = 0;
-};
-"""
-        # The constructors and destructor should be ignored.
-        self.assertEqualIgnoreLeadingWhitespace(
-            'MOCK_METHOD(int, Bar, (), (override));',
-            self.GenerateMethodSource(source))
-
-    def testSimpleOverrideMethod(self):
-        source = """
-class Foo {
- public:
-  int Bar() override;
-};
-"""
-        self.assertEqualIgnoreLeadingWhitespace(
-            'MOCK_METHOD(int, Bar, (), (override));',
-            self.GenerateMethodSource(source))
-
-    def testSimpleConstMethod(self):
-        source = """
-class Foo {
- public:
-  virtual void Bar(bool flag) const;
-};
-"""
-        self.assertEqualIgnoreLeadingWhitespace(
-            'MOCK_METHOD(void, Bar, (bool flag), (const, override));',
-            self.GenerateMethodSource(source))
-
-    def testExplicitVoid(self):
-        source = """
-class Foo {
- public:
-  virtual int Bar(void);
-};
-"""
-        self.assertEqualIgnoreLeadingWhitespace(
-            'MOCK_METHOD(int, Bar, (), (override));',
-            self.GenerateMethodSource(source))
-
-    def testStrangeNewlineInParameter(self):
-        source = """
-class Foo {
- public:
-  virtual void Bar(int
-a) = 0;
-};
-"""
-        self.assertEqualIgnoreLeadingWhitespace(
-            'MOCK_METHOD(void, Bar, (int a), (override));',
-            self.GenerateMethodSource(source))
-
-    def testDefaultParameters(self):
-        source = """
-class Foo {
- public:
-  virtual void Bar(int a, char c = 'x') = 0;
-};
-"""
-        self.assertEqualIgnoreLeadingWhitespace(
-            'MOCK_METHOD(void, Bar, (int a, char c), (override));',
-            self.GenerateMethodSource(source))
-
-    def testMultipleDefaultParameters(self):
-        source = """
-class Foo {
- public:
-  virtual void Bar(
-        int a = 42, 
-        char c = 'x', 
-        const int* const p = nullptr, 
-        const std::string& s = "42",
-        char tab[] = {'4','2'},
-        int const *& rp = aDefaultPointer) = 0;
-};
-"""
-        self.assertEqualIgnoreLeadingWhitespace(
-            'MOCK_METHOD(void, Bar, '
-            '(int a, char c, const int* const p, const std::string& s, char tab[], int const *& rp), '
-            '(override));', self.GenerateMethodSource(source))
-
-    def testMultipleSingleLineDefaultParameters(self):
-        source = """
-class Foo {
- public:
-  virtual void Bar(int a = 42, int b = 43, int c = 44) = 0;
-};
-"""
-        self.assertEqualIgnoreLeadingWhitespace(
-            'MOCK_METHOD(void, Bar, (int a, int b, int c), (override));',
-            self.GenerateMethodSource(source))
-
-    def testConstDefaultParameter(self):
-        source = """
-class Test {
- public:
-  virtual bool Bar(const int test_arg = 42) = 0;
-};
-"""
-        self.assertEqualIgnoreLeadingWhitespace(
-            'MOCK_METHOD(bool, Bar, (const int test_arg), (override));',
-            self.GenerateMethodSource(source))
-
-    def testConstRefDefaultParameter(self):
-        source = """
-class Test {
- public:
-  virtual bool Bar(const std::string& test_arg = "42" ) = 0;
-};
-"""
-        self.assertEqualIgnoreLeadingWhitespace(
-            'MOCK_METHOD(bool, Bar, (const std::string& test_arg), (override));',
-            self.GenerateMethodSource(source))
-
-    def testRemovesCommentsWhenDefaultsArePresent(self):
-        source = """
-class Foo {
- public:
-  virtual void Bar(int a = 42 /* a comment */,
-                   char /* other comment */ c= 'x') = 0;
-};
-"""
-        self.assertEqualIgnoreLeadingWhitespace(
-            'MOCK_METHOD(void, Bar, (int a, char c), (override));',
-            self.GenerateMethodSource(source))
-
-    def testDoubleSlashCommentsInParameterListAreRemoved(self):
-        source = """
-class Foo {
- public:
-  virtual void Bar(int a,  // inline comments should be elided.
-                   int b   // inline comments should be elided.
-                   ) const = 0;
-};
-"""
-        self.assertEqualIgnoreLeadingWhitespace(
-            'MOCK_METHOD(void, Bar, (int a, int b), (const, override));',
-            self.GenerateMethodSource(source))
-
-    def testCStyleCommentsInParameterListAreNotRemoved(self):
-        # NOTE(nnorwitz): I'm not sure if it's the best behavior to keep these
-        # comments.  Also note that C style comments after the last parameter
-        # are still elided.
-        source = """
-class Foo {
- public:
-  virtual const string& Bar(int /* keeper */, int b);
-};
-"""
-        self.assertEqualIgnoreLeadingWhitespace(
-            'MOCK_METHOD(const string&, Bar, (int, int b), (override));',
-            self.GenerateMethodSource(source))
-
-    def testArgsOfTemplateTypes(self):
-        source = """
-class Foo {
- public:
-  virtual int Bar(const vector<int>& v, map<int, string>* output);
-};"""
-        self.assertEqualIgnoreLeadingWhitespace(
-            'MOCK_METHOD(int, Bar, (const vector<int>& v, (map<int, string>* output)), (override));',
-            self.GenerateMethodSource(source))
-
-    def testReturnTypeWithOneTemplateArg(self):
-        source = """
-class Foo {
- public:
-  virtual vector<int>* Bar(int n);
-};"""
-        self.assertEqualIgnoreLeadingWhitespace(
-            'MOCK_METHOD(vector<int>*, Bar, (int n), (override));',
-            self.GenerateMethodSource(source))
-
-    def testReturnTypeWithManyTemplateArgs(self):
-        source = """
-class Foo {
- public:
-  virtual map<int, string> Bar();
-};"""
-        self.assertEqualIgnoreLeadingWhitespace(
-            'MOCK_METHOD((map<int, string>), Bar, (), (override));',
-            self.GenerateMethodSource(source))
-
-    def testSimpleMethodInTemplatedClass(self):
-        source = """
-template<class T>
-class Foo {
- public:
-  virtual int Bar();
-};
-"""
-        self.assertEqualIgnoreLeadingWhitespace(
-            'MOCK_METHOD(int, Bar, (), (override));',
-            self.GenerateMethodSource(source))
-
-    def testPointerArgWithoutNames(self):
-        source = """
-class Foo {
-  virtual int Bar(C*);
-};
-"""
-        self.assertEqualIgnoreLeadingWhitespace(
-            'MOCK_METHOD(int, Bar, (C*), (override));',
-            self.GenerateMethodSource(source))
-
-    def testReferenceArgWithoutNames(self):
-        source = """
-class Foo {
-  virtual int Bar(C&);
-};
-"""
-        self.assertEqualIgnoreLeadingWhitespace(
-            'MOCK_METHOD(int, Bar, (C&), (override));',
-            self.GenerateMethodSource(source))
-
-    def testArrayArgWithoutNames(self):
-        source = """
-class Foo {
-  virtual int Bar(C[]);
-};
-"""
-        self.assertEqualIgnoreLeadingWhitespace(
-            'MOCK_METHOD(int, Bar, (C[]), (override));',
-            self.GenerateMethodSource(source))
-
-
-class GenerateMocksTest(TestCase):
-
-    @staticmethod
-    def GenerateMocks(cpp_source):
-        """Convert C++ source to complete Google Mock output source."""
-        # <test> is a pseudo-filename, it is not read or written.
-        filename = '<test>'
-        builder = ast.BuilderFromSource(cpp_source, filename)
-        ast_list = list(builder.Generate())
-        lines = gmock_class._GenerateMocks(filename, cpp_source, ast_list, None)
-        return '\n'.join(lines)
-
-    def testNamespaces(self):
-        source = """
-namespace Foo {
-namespace Bar { class Forward; }
-namespace Baz::Qux {
-
-class Test {
- public:
-  virtual void Foo();
-};
-
-}  // namespace Baz::Qux
-}  // namespace Foo
-"""
-        expected = """\
-namespace Foo {
-namespace Baz::Qux {
-
-class MockTest : public Test {
-public:
-MOCK_METHOD(void, Foo, (), (override));
-};
-
-}  // namespace Baz::Qux
-}  // namespace Foo
-"""
-        self.assertEqualIgnoreLeadingWhitespace(expected,
-                                                self.GenerateMocks(source))
-
-    def testClassWithStorageSpecifierMacro(self):
-        source = """
-class STORAGE_SPECIFIER Test {
- public:
-  virtual void Foo();
-};
-"""
-        expected = """\
-class MockTest : public Test {
-public:
-MOCK_METHOD(void, Foo, (), (override));
-};
-"""
-        self.assertEqualIgnoreLeadingWhitespace(expected,
-                                                self.GenerateMocks(source))
-
-    def testTemplatedForwardDeclaration(self):
-        source = """
-template <class T> class Forward;  // Forward declaration should be ignored.
-class Test {
- public:
-  virtual void Foo();
-};
-"""
-        expected = """\
-class MockTest : public Test {
-public:
-MOCK_METHOD(void, Foo, (), (override));
-};
-"""
-        self.assertEqualIgnoreLeadingWhitespace(expected,
-                                                self.GenerateMocks(source))
-
-    def testTemplatedClass(self):
-        source = """
-template <typename S, typename T>
-class Test {
- public:
-  virtual void Foo();
-};
-"""
-        expected = """\
-template <typename S, typename T>
-class MockTest : public Test<S, T> {
-public:
-MOCK_METHOD(void, Foo, (), (override));
-};
-"""
-        self.assertEqualIgnoreLeadingWhitespace(expected,
-                                                self.GenerateMocks(source))
-
-    def testTemplateInATemplateTypedef(self):
-        source = """
-class Test {
- public:
-  typedef std::vector<std::list<int>> FooType;
-  virtual void Bar(const FooType& test_arg);
-};
-"""
-        expected = """\
-class MockTest : public Test {
-public:
-MOCK_METHOD(void, Bar, (const FooType& test_arg), (override));
-};
-"""
-        self.assertEqualIgnoreLeadingWhitespace(expected,
-                                                self.GenerateMocks(source))
-
-    def testTemplatedClassWithTemplatedArguments(self):
-        source = """
-template <typename S, typename T, typename U, typename V, typename W>
-class Test {
- public:
-  virtual U Foo(T some_arg);
-};
-"""
-        expected = """\
-template <typename S, typename T, typename U, typename V, typename W>
-class MockTest : public Test<S, T, U, V, W> {
-public:
-MOCK_METHOD(U, Foo, (T some_arg), (override));
-};
-"""
-        self.assertEqualIgnoreLeadingWhitespace(expected,
-                                                self.GenerateMocks(source))
-
-    def testTemplateInATemplateTypedefWithComma(self):
-        source = """
-class Test {
- public:
-  typedef std::function<void(
-      const vector<std::list<int>>&, int> FooType;
-  virtual void Bar(const FooType& test_arg);
-};
-"""
-        expected = """\
-class MockTest : public Test {
-public:
-MOCK_METHOD(void, Bar, (const FooType& test_arg), (override));
-};
-"""
-        self.assertEqualIgnoreLeadingWhitespace(expected,
-                                                self.GenerateMocks(source))
-
-    def testParenthesizedCommaInArg(self):
-        source = """
-class Test {
- public:
-   virtual void Bar(std::function<void(int, int)> f);
-};
-"""
-        expected = """\
-class MockTest : public Test {
-public:
-MOCK_METHOD(void, Bar, (std::function<void(int, int)> f), (override));
-};
-"""
-        self.assertEqualIgnoreLeadingWhitespace(expected,
-                                                self.GenerateMocks(source))
-
-    def testEnumType(self):
-        source = """
-class Test {
- public:
-  enum Bar {
-    BAZ, QUX, QUUX, QUUUX
-  };
-  virtual void Foo();
-};
-"""
-        expected = """\
-class MockTest : public Test {
-public:
-MOCK_METHOD(void, Foo, (), (override));
-};
-"""
-        self.assertEqualIgnoreLeadingWhitespace(expected,
-                                                self.GenerateMocks(source))
-
-    def testEnumClassType(self):
-        source = """
-class Test {
- public:
-  enum class Bar {
-    BAZ, QUX, QUUX, QUUUX
-  };
-  virtual void Foo();
-};
-"""
-        expected = """\
-class MockTest : public Test {
-public:
-MOCK_METHOD(void, Foo, (), (override));
-};
-"""
-        self.assertEqualIgnoreLeadingWhitespace(expected,
-                                                self.GenerateMocks(source))
-
-    def testStdFunction(self):
-        source = """
-class Test {
- public:
-  Test(std::function<int(std::string)> foo) : foo_(foo) {}
-
-  virtual std::function<int(std::string)> foo();
-
- private:
-  std::function<int(std::string)> foo_;
-};
-"""
-        expected = """\
-class MockTest : public Test {
-public:
-MOCK_METHOD(std::function<int (std::string)>, foo, (), (override));
-};
-"""
-        self.assertEqualIgnoreLeadingWhitespace(expected,
-                                                self.GenerateMocks(source))
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/external/googletest/googlemock/scripts/generator/cpp/keywords.py b/external/googletest/googlemock/scripts/generator/cpp/keywords.py
deleted file mode 100644
index 57a82887..00000000
--- a/external/googletest/googlemock/scripts/generator/cpp/keywords.py
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2007 Neal Norwitz
-# Portions Copyright 2007 Google Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""C++ keywords and helper utilities for determining keywords."""
-
-try:
-    # Python 3.x
-    import builtins
-except ImportError:
-    # Python 2.x
-    import __builtin__ as builtins
-
-if not hasattr(builtins, 'set'):
-    # Nominal support for Python 2.3.
-    from sets import Set as set
-
-TYPES = set('bool char int long short double float void wchar_t unsigned signed'.split())
-TYPE_MODIFIERS = set('auto register const inline extern static virtual volatile mutable'.split())
-ACCESS = set('public protected private friend'.split())
-
-CASTS = set('static_cast const_cast dynamic_cast reinterpret_cast'.split())
-
-OTHERS = set('true false asm class namespace using explicit this operator sizeof'.split())
-OTHER_TYPES = set('new delete typedef struct union enum typeid typename template'.split())
-
-CONTROL = set('case switch default if else return goto'.split())
-EXCEPTION = set('try catch throw'.split())
-LOOP = set('while do for break continue'.split())
-
-ALL = TYPES | TYPE_MODIFIERS | ACCESS | CASTS | OTHERS | OTHER_TYPES | CONTROL | EXCEPTION | LOOP
-
-
-def IsKeyword(token):
-    return token in ALL
-
-
-def IsBuiltinType(token):
-    if token in ('virtual', 'inline'):
-        # These only apply to methods, they can't be types by themselves.
-        return False
-    return token in TYPES or token in TYPE_MODIFIERS
diff --git a/external/googletest/googlemock/scripts/generator/cpp/tokenize.py b/external/googletest/googlemock/scripts/generator/cpp/tokenize.py
deleted file mode 100644
index 2afb9446..00000000
--- a/external/googletest/googlemock/scripts/generator/cpp/tokenize.py
+++ /dev/null
@@ -1,279 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2007 Neal Norwitz
-# Portions Copyright 2007 Google Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""Tokenize C++ source code."""
-
-try:
-    # Python 3.x
-    import builtins
-except ImportError:
-    # Python 2.x
-    import __builtin__ as builtins
-
-import sys
-
-from cpp import utils
-
-if not hasattr(builtins, 'set'):
-    # Nominal support for Python 2.3.
-    from sets import Set as set
-
-# Add $ as a valid identifier char since so much code uses it.
-_letters = 'abcdefghijklmnopqrstuvwxyz'
-VALID_IDENTIFIER_CHARS = set(_letters + _letters.upper() + '_0123456789$')
-HEX_DIGITS = set('0123456789abcdefABCDEF')
-INT_OR_FLOAT_DIGITS = set('01234567890eE-+')
-
-# C++0x string preffixes.
-_STR_PREFIXES = set(('R', 'u8', 'u8R', 'u', 'uR', 'U', 'UR', 'L', 'LR'))
-
-# Token types.
-UNKNOWN = 'UNKNOWN'
-SYNTAX = 'SYNTAX'
-CONSTANT = 'CONSTANT'
-NAME = 'NAME'
-PREPROCESSOR = 'PREPROCESSOR'
-
-# Where the token originated from.  This can be used for backtracking.
-# It is always set to WHENCE_STREAM in this code.
-WHENCE_STREAM, WHENCE_QUEUE = range(2)
-
-
-class Token(object):
-    """Data container to represent a C++ token.
-
-    Tokens can be identifiers, syntax char(s), constants, or
-    pre-processor directives.
-
-    start contains the index of the first char of the token in the source
-    end contains the index of the last char of the token in the source
-    """
-
-    def __init__(self, token_type, name, start, end):
-        self.token_type = token_type
-        self.name = name
-        self.start = start
-        self.end = end
-        self.whence = WHENCE_STREAM
-
-    def __str__(self):
-        if not utils.DEBUG:
-            return 'Token(%r)' % self.name
-        return 'Token(%r, %s, %s)' % (self.name, self.start, self.end)
-
-    __repr__ = __str__
-
-
-def _GetString(source, start, i):
-    i = source.find('"', i + 1)
-    while source[i - 1] == '\\':
-        # Count the trailing backslashes.
-        backslash_count = 1
-        j = i - 2
-        while source[j] == '\\':
-            backslash_count += 1
-            j -= 1
-        # When trailing backslashes are even, they escape each other.
-        if (backslash_count % 2) == 0:
-            break
-        i = source.find('"', i + 1)
-    return i + 1
-
-
-def _GetChar(source, start, i):
-    # NOTE(nnorwitz): may not be quite correct, should be good enough.
-    i = source.find("'", i + 1)
-    while source[i - 1] == '\\':
-        # Need to special case '\\'.
-        if (i - 2) > start and source[i - 2] == '\\':
-            break
-        i = source.find("'", i + 1)
-    # Try to handle unterminated single quotes (in a #if 0 block).
-    if i < 0:
-        i = start
-    return i + 1
-
-
-def GetTokens(source):
-    """Returns a sequence of Tokens.
-
-    Args:
-      source: string of C++ source code.
-
-    Yields:
-      Token that represents the next token in the source.
-    """
-    # Cache various valid character sets for speed.
-    valid_identifier_chars = VALID_IDENTIFIER_CHARS
-    hex_digits = HEX_DIGITS
-    int_or_float_digits = INT_OR_FLOAT_DIGITS
-    int_or_float_digits2 = int_or_float_digits | set('.')
-
-    # Only ignore errors while in a #if 0 block.
-    ignore_errors = False
-    count_ifs = 0
-
-    i = 0
-    end = len(source)
-    while i < end:
-        # Skip whitespace.
-        while i < end and source[i].isspace():
-            i += 1
-        if i >= end:
-            return
-
-        token_type = UNKNOWN
-        start = i
-        c = source[i]
-        if c.isalpha() or c == '_':  # Find a string token.
-            token_type = NAME
-            while source[i] in valid_identifier_chars:
-                i += 1
-            # String and character constants can look like a name if
-            # they are something like L"".
-            if (source[i] == "'" and (i - start) == 1 and
-                    source[start:i] in 'uUL'):
-                # u, U, and L are valid C++0x character preffixes.
-                token_type = CONSTANT
-                i = _GetChar(source, start, i)
-            elif source[i] == "'" and source[start:i] in _STR_PREFIXES:
-                token_type = CONSTANT
-                i = _GetString(source, start, i)
-        elif c == '/' and source[i + 1] == '/':  # Find // comments.
-            i = source.find('\n', i)
-            if i == -1:  # Handle EOF.
-                i = end
-            continue
-        elif c == '/' and source[i + 1] == '*':  # Find /* comments. */
-            i = source.find('*/', i) + 2
-            continue
-        elif c in ':+-<>&|*=':  # : or :: (plus other chars).
-            token_type = SYNTAX
-            i += 1
-            new_ch = source[i]
-            if new_ch == c and c != '>':  # Treat ">>" as two tokens.
-                i += 1
-            elif c == '-' and new_ch == '>':
-                i += 1
-            elif new_ch == '=':
-                i += 1
-        elif c in '()[]{}~!?^%;/.,':  # Handle single char tokens.
-            token_type = SYNTAX
-            i += 1
-            if c == '.' and source[i].isdigit():
-                token_type = CONSTANT
-                i += 1
-                while source[i] in int_or_float_digits:
-                    i += 1
-                # Handle float suffixes.
-                for suffix in ('l', 'f'):
-                    if suffix == source[i:i + 1].lower():
-                        i += 1
-                        break
-        elif c.isdigit():  # Find integer.
-            token_type = CONSTANT
-            if c == '0' and source[i + 1] in 'xX':
-                # Handle hex digits.
-                i += 2
-                while source[i] in hex_digits:
-                    i += 1
-            else:
-                while source[i] in int_or_float_digits2:
-                    i += 1
-            # Handle integer (and float) suffixes.
-            for suffix in ('ull', 'll', 'ul', 'l', 'f', 'u'):
-                size = len(suffix)
-                if suffix == source[i:i + size].lower():
-                    i += size
-                    break
-        elif c == '"':  # Find string.
-            token_type = CONSTANT
-            i = _GetString(source, start, i)
-        elif c == "'":  # Find char.
-            token_type = CONSTANT
-            i = _GetChar(source, start, i)
-        elif c == '#':  # Find pre-processor command.
-            token_type = PREPROCESSOR
-            got_if = source[i:i + 3] == '#if' and source[i + 3:i + 4].isspace()
-            if got_if:
-                count_ifs += 1
-            elif source[i:i + 6] == '#endif':
-                count_ifs -= 1
-                if count_ifs == 0:
-                    ignore_errors = False
-
-            # TODO(nnorwitz): handle preprocessor statements (\ continuations).
-            while 1:
-                i1 = source.find('\n', i)
-                i2 = source.find('//', i)
-                i3 = source.find('/*', i)
-                i4 = source.find('"', i)
-                # NOTE(nnorwitz): doesn't handle comments in #define macros.
-                # Get the first important symbol (newline, comment, EOF/end).
-                i = min([x for x in (i1, i2, i3, i4, end) if x != -1])
-
-                # Handle #include "dir//foo.h" properly.
-                if source[i] == '"':
-                    i = source.find('"', i + 1) + 1
-                    assert i > 0
-                    continue
-                # Keep going if end of the line and the line ends with \.
-                if not (i == i1 and source[i - 1] == '\\'):
-                    if got_if:
-                        condition = source[start + 4:i].lstrip()
-                        if (condition.startswith('0') or
-                                condition.startswith('(0)')):
-                            ignore_errors = True
-                    break
-                i += 1
-        elif c == '\\':  # Handle \ in code.
-            # This is different from the pre-processor \ handling.
-            i += 1
-            continue
-        elif ignore_errors:
-            # The tokenizer seems to be in pretty good shape.  This
-            # raise is conditionally disabled so that bogus code
-            # in an #if 0 block can be handled.  Since we will ignore
-            # it anyways, this is probably fine.  So disable the
-            # exception and  return the bogus char.
-            i += 1
-        else:
-            sys.stderr.write('Got invalid token in %s @ %d token:%s: %r\n' %
-                             ('?', i, c, source[i - 10:i + 10]))
-            raise RuntimeError('unexpected token')
-
-        if i <= 0:
-            print('Invalid index, exiting now.')
-            return
-        yield Token(token_type, source[start:i], start, i)
-
-
-if __name__ == '__main__':
-    def main(argv):
-        """Driver mostly for testing purposes."""
-        for filename in argv[1:]:
-            source = utils.ReadFile(filename)
-            if source is None:
-                continue
-
-            for token in GetTokens(source):
-                print('%-12s: %s' % (token.token_type, token.name))
-                # print('\r%6.2f%%' % (100.0 * index / token.end),)
-            sys.stdout.write('\n')
-
-
-    main(sys.argv)
diff --git a/external/googletest/googlemock/scripts/generator/cpp/utils.py b/external/googletest/googlemock/scripts/generator/cpp/utils.py
deleted file mode 100644
index 6f5fc097..00000000
--- a/external/googletest/googlemock/scripts/generator/cpp/utils.py
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2007 Neal Norwitz
-# Portions Copyright 2007 Google Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""Generic utilities for C++ parsing."""
-
-import sys
-
-# Set to True to see the start/end token indices.
-DEBUG = True
-
-
-def ReadFile(filename, print_error=True):
-    """Returns the contents of a file."""
-    try:
-        fp = open(filename)
-        try:
-            return fp.read()
-        finally:
-            fp.close()
-    except IOError:
-        if print_error:
-            print('Error reading %s: %s' % (filename, sys.exc_info()[1]))
-        return None
diff --git a/external/googletest/googlemock/scripts/generator/gmock_gen.py b/external/googletest/googlemock/scripts/generator/gmock_gen.py
deleted file mode 100644
index f7979ae2..00000000
--- a/external/googletest/googlemock/scripts/generator/gmock_gen.py
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2008 Google Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""Driver for starting up Google Mock class generator."""
-
-import os
-import sys
-
-if __name__ == '__main__':
-    # Add the directory of this script to the path so we can import gmock_class.
-    sys.path.append(os.path.dirname(__file__))
-
-    from cpp import gmock_class
-
-    # Fix the docstring in case they require the usage.
-    gmock_class.__doc__ = gmock_class.__doc__.replace('gmock_class.py', __file__)
-    gmock_class.main()
diff --git a/external/googletest/googlemock/src/gmock-cardinalities.cc b/external/googletest/googlemock/src/gmock-cardinalities.cc
index 1e7b898c..a7283aaf 100644
--- a/external/googletest/googlemock/src/gmock-cardinalities.cc
+++ b/external/googletest/googlemock/src/gmock-cardinalities.cc
@@ -53,12 +53,12 @@ class BetweenCardinalityImpl : public CardinalityInterface {
       : min_(min >= 0 ? min : 0), max_(max >= min_ ? max : min_) {
     std::stringstream ss;
     if (min < 0) {
-      ss << "The invocation lower bound must be >= 0, "
-         << "but is actually " << min << ".";
+      ss << "The invocation lower bound must be >= 0, " << "but is actually "
+         << min << ".";
       internal::Expect(false, __FILE__, __LINE__, ss.str());
     } else if (max < 0) {
-      ss << "The invocation upper bound must be >= 0, "
-         << "but is actually " << max << ".";
+      ss << "The invocation upper bound must be >= 0, " << "but is actually "
+         << max << ".";
       internal::Expect(false, __FILE__, __LINE__, ss.str());
     } else if (min > max) {
       ss << "The invocation upper bound (" << max
@@ -86,7 +86,8 @@ class BetweenCardinalityImpl : public CardinalityInterface {
   const int min_;
   const int max_;
 
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(BetweenCardinalityImpl);
+  BetweenCardinalityImpl(const BetweenCardinalityImpl&) = delete;
+  BetweenCardinalityImpl& operator=(const BetweenCardinalityImpl&) = delete;
 };
 
 // Formats "n times" in a human-friendly way.
diff --git a/external/googletest/googlemock/src/gmock-internal-utils.cc b/external/googletest/googlemock/src/gmock-internal-utils.cc
index a1a6d789..96c7e306 100644
--- a/external/googletest/googlemock/src/gmock-internal-utils.cc
+++ b/external/googletest/googlemock/src/gmock-internal-utils.cc
@@ -37,8 +37,15 @@
 
 #include <ctype.h>
 
+#include <array>
+#include <cctype>
+#include <cstdint>
+#include <cstring>
+#include <iostream>
 #include <ostream>  // NOLINT
 #include <string>
+#include <utility>
+#include <vector>
 
 #include "gmock/gmock.h"
 #include "gmock/internal/gmock-port.h"
@@ -49,21 +56,22 @@ namespace internal {
 
 // Joins a vector of strings as if they are fields of a tuple; returns
 // the joined string.
-GTEST_API_ std::string JoinAsTuple(const Strings& fields) {
-  switch (fields.size()) {
-    case 0:
-      return "";
-    case 1:
-      return fields[0];
-    default:
-      std::string result = "(" + fields[0];
-      for (size_t i = 1; i < fields.size(); i++) {
-        result += ", ";
-        result += fields[i];
-      }
-      result += ")";
-      return result;
+GTEST_API_ std::string JoinAsKeyValueTuple(
+    const std::vector<const char*>& names, const Strings& values) {
+  GTEST_CHECK_(names.size() == values.size());
+  if (values.empty()) {
+    return "";
   }
+  const auto build_one = [&](const size_t i) {
+    return std::string(names[i]) + ": " + values[i];
+  };
+  std::string result = "(" + build_one(0);
+  for (size_t i = 1; i < values.size(); i++) {
+    result += ", ";
+    result += build_one(i);
+  }
+  result += ")";
+  return result;
 }
 
 // Converts an identifier name to a space-separated list of lower-case
@@ -81,7 +89,7 @@ GTEST_API_ std::string ConvertIdentifierNameToWords(const char* id_name) {
                                  (!IsDigit(prev_char) && IsDigit(*p));
 
     if (IsAlNum(*p)) {
-      if (starts_new_word && result != "") result += ' ';
+      if (starts_new_word && !result.empty()) result += ' ';
       result += ToLower(*p);
     }
   }
@@ -123,10 +131,10 @@ static GTEST_DEFINE_STATIC_MUTEX_(g_log_mutex);
 // Returns true if and only if a log with the given severity is visible
 // according to the --gmock_verbose flag.
 GTEST_API_ bool LogIsVisible(LogSeverity severity) {
-  if (GMOCK_FLAG(verbose) == kInfoVerbosity) {
+  if (GMOCK_FLAG_GET(verbose) == kInfoVerbosity) {
     // Always show the log if --gmock_verbose=info.
     return true;
-  } else if (GMOCK_FLAG(verbose) == kErrorVerbosity) {
+  } else if (GMOCK_FLAG_GET(verbose) == kErrorVerbosity) {
     // Always hide it if --gmock_verbose=error.
     return false;
   } else {
@@ -175,7 +183,7 @@ GTEST_API_ void Log(LogSeverity severity, const std::string& message,
     }
     std::cout << "Stack trace:\n"
               << ::testing::internal::GetCurrentOsStackTraceExceptTop(
-                     ::testing::UnitTest::GetInstance(), actual_to_skip);
+                     actual_to_skip);
   }
   std::cout << ::std::flush;
 }
@@ -192,5 +200,59 @@ GTEST_API_ void IllegalDoDefault(const char* file, int line) {
       "the variable in various places.");
 }
 
+constexpr char UndoWebSafeEncoding(char c) {
+  return c == '-' ? '+' : c == '_' ? '/' : c;
+}
+
+constexpr char UnBase64Impl(char c, const char* const base64, char carry) {
+  return *base64 == 0 ? static_cast<char>(65)
+         : *base64 == c
+             ? carry
+             : UnBase64Impl(c, base64 + 1, static_cast<char>(carry + 1));
+}
+
+template <size_t... I>
+constexpr std::array<char, 256> UnBase64Impl(std::index_sequence<I...>,
+                                             const char* const base64) {
+  return {
+      {UnBase64Impl(UndoWebSafeEncoding(static_cast<char>(I)), base64, 0)...}};
+}
+
+constexpr std::array<char, 256> UnBase64(const char* const base64) {
+  return UnBase64Impl(std::make_index_sequence<256>{}, base64);
+}
+
+static constexpr char kBase64[] =
+    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+static constexpr std::array<char, 256> kUnBase64 = UnBase64(kBase64);
+
+bool Base64Unescape(const std::string& encoded, std::string* decoded) {
+  decoded->clear();
+  size_t encoded_len = encoded.size();
+  decoded->reserve(3 * (encoded_len / 4) + (encoded_len % 4));
+  int bit_pos = 0;
+  char dst = 0;
+  for (int src : encoded) {
+    if (std::isspace(src) || src == '=') {
+      continue;
+    }
+    char src_bin = kUnBase64[static_cast<size_t>(src)];
+    if (src_bin >= 64) {
+      decoded->clear();
+      return false;
+    }
+    if (bit_pos == 0) {
+      dst |= static_cast<char>(src_bin << 2);
+      bit_pos = 6;
+    } else {
+      dst |= static_cast<char>(src_bin >> (bit_pos - 2));
+      decoded->push_back(dst);
+      dst = static_cast<char>(src_bin << (10 - bit_pos));
+      bit_pos = (bit_pos + 6) % 8;
+    }
+  }
+  return true;
+}
+
 }  // namespace internal
 }  // namespace testing
diff --git a/external/googletest/googlemock/src/gmock-matchers.cc b/external/googletest/googlemock/src/gmock-matchers.cc
index 8b19584e..277add6b 100644
--- a/external/googletest/googlemock/src/gmock-matchers.cc
+++ b/external/googletest/googlemock/src/gmock-matchers.cc
@@ -39,6 +39,7 @@
 #include <iostream>
 #include <sstream>
 #include <string>
+#include <vector>
 
 namespace testing {
 namespace internal {
@@ -48,11 +49,13 @@ namespace internal {
 // 'negation' is false; otherwise returns the description of the
 // negation of the matcher.  'param_values' contains a list of strings
 // that are the print-out of the matcher's parameters.
-GTEST_API_ std::string FormatMatcherDescription(bool negation,
-                                                const char* matcher_name,
-                                                const Strings& param_values) {
+GTEST_API_ std::string FormatMatcherDescription(
+    bool negation, const char* matcher_name,
+    const std::vector<const char*>& param_names, const Strings& param_values) {
   std::string result = ConvertIdentifierNameToWords(matcher_name);
-  if (param_values.size() >= 1) result += " " + JoinAsTuple(param_values);
+  if (!param_values.empty()) {
+    result += " " + JoinAsKeyValueTuple(param_names, param_values);
+  }
   return negation ? "not (" + result + ")" : result;
 }
 
@@ -117,7 +120,7 @@ GTEST_API_ std::string FormatMatcherDescription(bool negation,
 //   [1] Cormen, et al (2001). "Section 26.2: The Ford-Fulkerson method".
 //       "Introduction to Algorithms (Second ed.)", pp. 651-664.
 //   [2] "Ford-Fulkerson algorithm", Wikipedia,
-//       'http://en.wikipedia.org/wiki/Ford%E2%80%93Fulkerson_algorithm'
+//       'https://en.wikipedia.org/wiki/Ford%E2%80%93Fulkerson_algorithm'
 class MaxBipartiteMatchState {
  public:
   explicit MaxBipartiteMatchState(const MatchMatrix& graph)
@@ -233,9 +236,8 @@ static void LogElementMatcherPairVec(const ElementMatcherPairs& pairs,
   os << "{";
   const char* sep = "";
   for (Iter it = pairs.begin(); it != pairs.end(); ++it) {
-    os << sep << "\n  ("
-       << "element #" << it->first << ", "
-       << "matcher #" << it->second << ")";
+    os << sep << "\n  (" << "element #" << it->first << ", " << "matcher #"
+       << it->second << ")";
     sep = ",";
   }
   os << "\n}";
@@ -367,7 +369,24 @@ void UnorderedElementsAreMatcherImplBase::DescribeNegationToImpl(
 bool UnorderedElementsAreMatcherImplBase::VerifyMatchMatrix(
     const ::std::vector<std::string>& element_printouts,
     const MatchMatrix& matrix, MatchResultListener* listener) const {
-  bool result = true;
+  if (matrix.LhsSize() == 0 && matrix.RhsSize() == 0) {
+    return true;
+  }
+
+  const bool is_exact_match_with_size_discrepency =
+      match_flags() == UnorderedMatcherRequire::ExactMatch &&
+      matrix.LhsSize() != matrix.RhsSize();
+  if (is_exact_match_with_size_discrepency) {
+    // The element count doesn't match.  If the container is empty,
+    // there's no need to explain anything as Google Mock already
+    // prints the empty container. Otherwise we just need to show
+    // how many elements there actually are.
+    if (matrix.LhsSize() != 0 && listener->IsInterested()) {
+      *listener << "which has " << Elements(matrix.LhsSize()) << "\n";
+    }
+  }
+
+  bool result = !is_exact_match_with_size_discrepency;
   ::std::vector<char> element_matched(matrix.LhsSize(), 0);
   ::std::vector<char> matcher_matched(matrix.RhsSize(), 0);
 
diff --git a/external/googletest/googlemock/src/gmock-spec-builders.cc b/external/googletest/googlemock/src/gmock-spec-builders.cc
index 78cedf1e..ffdf03dd 100644
--- a/external/googletest/googlemock/src/gmock-spec-builders.cc
+++ b/external/googletest/googlemock/src/gmock-spec-builders.cc
@@ -40,24 +40,26 @@
 #include <map>
 #include <memory>
 #include <set>
+#include <sstream>
 #include <string>
+#include <unordered_map>
 #include <vector>
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 #include "gtest/internal/gtest-port.h"
 
-#if GTEST_OS_CYGWIN || GTEST_OS_LINUX || GTEST_OS_MAC
+#if defined(GTEST_OS_CYGWIN) || defined(GTEST_OS_LINUX) || defined(GTEST_OS_MAC)
 #include <unistd.h>  // NOLINT
 #endif
+#ifdef GTEST_OS_QURT
+#include <qurt_event.h>
+#endif
 
 // Silence C4800 (C4800: 'int *const ': forcing value
 // to bool 'true' or 'false') for MSVC 15
-#ifdef _MSC_VER
-#if _MSC_VER == 1900
-#pragma warning(push)
-#pragma warning(disable : 4800)
-#endif
+#if defined(_MSC_VER) && (_MSC_VER == 1900)
+GTEST_DISABLE_MSC_WARNINGS_PUSH_(4800)
 #endif
 
 namespace testing {
@@ -94,7 +96,7 @@ ExpectationBase::ExpectationBase(const char* a_file, int a_line,
       action_count_checked_(false) {}
 
 // Destructs an ExpectationBase object.
-ExpectationBase::~ExpectationBase() {}
+ExpectationBase::~ExpectationBase() = default;
 
 // Explicitly specifies the cardinality of this expectation.  Used by
 // the subclasses to implement the .Times() clause.
@@ -263,10 +265,10 @@ void ExpectationBase::UntypedTimes(const Cardinality& a_cardinality) {
                        ".Times() cannot appear "
                        "more than once in an EXPECT_CALL().");
   } else {
-    ExpectSpecProperty(last_clause_ < kTimes,
-                       ".Times() cannot appear after "
-                       ".InSequence(), .WillOnce(), .WillRepeatedly(), "
-                       "or .RetiresOnSaturation().");
+    ExpectSpecProperty(
+        last_clause_ < kTimes,
+        ".Times() may only appear *before* .InSequence(), .WillOnce(), "
+        ".WillRepeatedly(), or .RetiresOnSaturation(), not after.");
   }
   last_clause_ = kTimes;
 
@@ -282,7 +284,7 @@ GTEST_API_ ThreadLocal<Sequence*> g_gmock_implicit_sequence;
 void ReportUninterestingCall(CallReaction reaction, const std::string& msg) {
   // Include a stack trace only if --gmock_verbose=info is specified.
   const int stack_frames_to_skip =
-      GMOCK_FLAG(verbose) == kInfoVerbosity ? 3 : -1;
+      GMOCK_FLAG_GET(verbose) == kInfoVerbosity ? 3 : -1;
   switch (reaction) {
     case kAllow:
       Log(kInfo, msg, stack_frames_to_skip);
@@ -294,9 +296,9 @@ void ReportUninterestingCall(CallReaction reaction, const std::string& msg) {
               "call should not happen.  Do not suppress it by blindly adding "
               "an EXPECT_CALL() if you don't mean to enforce the call.  "
               "See "
-              "https://github.com/google/googletest/blob/master/docs/"
+              "https://github.com/google/googletest/blob/main/docs/"
               "gmock_cook_book.md#"
-              "knowing-when-to-expect for details.\n",
+              "knowing-when-to-expect-useoncall for details.\n",
           stack_frames_to_skip);
       break;
     default:  // FAIL
@@ -307,7 +309,7 @@ void ReportUninterestingCall(CallReaction reaction, const std::string& msg) {
 UntypedFunctionMockerBase::UntypedFunctionMockerBase()
     : mock_obj_(nullptr), name_("") {}
 
-UntypedFunctionMockerBase::~UntypedFunctionMockerBase() {}
+UntypedFunctionMockerBase::~UntypedFunctionMockerBase() = default;
 
 // Sets the mock object this mock method belongs to, and registers
 // this information in the global mock registry.  Will be called
@@ -369,136 +371,6 @@ const char* UntypedFunctionMockerBase::Name() const
   return name;
 }
 
-// Calculates the result of invoking this mock function with the given
-// arguments, prints it, and returns it.  The caller is responsible
-// for deleting the result.
-UntypedActionResultHolderBase* UntypedFunctionMockerBase::UntypedInvokeWith(
-    void* const untyped_args) GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
-  // See the definition of untyped_expectations_ for why access to it
-  // is unprotected here.
-  if (untyped_expectations_.size() == 0) {
-    // No expectation is set on this mock method - we have an
-    // uninteresting call.
-
-    // We must get Google Mock's reaction on uninteresting calls
-    // made on this mock object BEFORE performing the action,
-    // because the action may DELETE the mock object and make the
-    // following expression meaningless.
-    const CallReaction reaction =
-        Mock::GetReactionOnUninterestingCalls(MockObject());
-
-    // True if and only if we need to print this call's arguments and return
-    // value.  This definition must be kept in sync with
-    // the behavior of ReportUninterestingCall().
-    const bool need_to_report_uninteresting_call =
-        // If the user allows this uninteresting call, we print it
-        // only when they want informational messages.
-        reaction == kAllow ? LogIsVisible(kInfo) :
-                           // If the user wants this to be a warning, we print
-                           // it only when they want to see warnings.
-            reaction == kWarn
-            ? LogIsVisible(kWarning)
-            :
-            // Otherwise, the user wants this to be an error, and we
-            // should always print detailed information in the error.
-            true;
-
-    if (!need_to_report_uninteresting_call) {
-      // Perform the action without printing the call information.
-      return this->UntypedPerformDefaultAction(
-          untyped_args, "Function call: " + std::string(Name()));
-    }
-
-    // Warns about the uninteresting call.
-    ::std::stringstream ss;
-    this->UntypedDescribeUninterestingCall(untyped_args, &ss);
-
-    // Calculates the function result.
-    UntypedActionResultHolderBase* const result =
-        this->UntypedPerformDefaultAction(untyped_args, ss.str());
-
-    // Prints the function result.
-    if (result != nullptr) result->PrintAsActionResult(&ss);
-
-    ReportUninterestingCall(reaction, ss.str());
-    return result;
-  }
-
-  bool is_excessive = false;
-  ::std::stringstream ss;
-  ::std::stringstream why;
-  ::std::stringstream loc;
-  const void* untyped_action = nullptr;
-
-  // The UntypedFindMatchingExpectation() function acquires and
-  // releases g_gmock_mutex.
-
-  const ExpectationBase* const untyped_expectation =
-      this->UntypedFindMatchingExpectation(untyped_args, &untyped_action,
-                                           &is_excessive, &ss, &why);
-  const bool found = untyped_expectation != nullptr;
-
-  // True if and only if we need to print the call's arguments
-  // and return value.
-  // This definition must be kept in sync with the uses of Expect()
-  // and Log() in this function.
-  const bool need_to_report_call =
-      !found || is_excessive || LogIsVisible(kInfo);
-  if (!need_to_report_call) {
-    // Perform the action without printing the call information.
-    return untyped_action == nullptr
-               ? this->UntypedPerformDefaultAction(untyped_args, "")
-               : this->UntypedPerformAction(untyped_action, untyped_args);
-  }
-
-  ss << "    Function call: " << Name();
-  this->UntypedPrintArgs(untyped_args, &ss);
-
-  // In case the action deletes a piece of the expectation, we
-  // generate the message beforehand.
-  if (found && !is_excessive) {
-    untyped_expectation->DescribeLocationTo(&loc);
-  }
-
-  UntypedActionResultHolderBase* result = nullptr;
-
-  auto perform_action = [&] {
-    return untyped_action == nullptr
-               ? this->UntypedPerformDefaultAction(untyped_args, ss.str())
-               : this->UntypedPerformAction(untyped_action, untyped_args);
-  };
-  auto handle_failures = [&] {
-    ss << "\n" << why.str();
-
-    if (!found) {
-      // No expectation matches this call - reports a failure.
-      Expect(false, nullptr, -1, ss.str());
-    } else if (is_excessive) {
-      // We had an upper-bound violation and the failure message is in ss.
-      Expect(false, untyped_expectation->file(), untyped_expectation->line(),
-             ss.str());
-    } else {
-      // We had an expected call and the matching expectation is
-      // described in ss.
-      Log(kInfo, loc.str() + ss.str(), 2);
-    }
-  };
-#if GTEST_HAS_EXCEPTIONS
-  try {
-    result = perform_action();
-  } catch (...) {
-    handle_failures();
-    throw;
-  }
-#else
-  result = perform_action();
-#endif
-
-  if (result != nullptr) result->PrintAsActionResult(&ss);
-  handle_failures();
-  return result;
-}
-
 // Returns an Expectation object that references and co-owns exp,
 // which must be an expectation on this mock function.
 Expectation UntypedFunctionMockerBase::GetHandleOf(ExpectationBase* exp) {
@@ -535,8 +407,15 @@ bool UntypedFunctionMockerBase::VerifyAndClearExpectationsLocked()
     } else if (!untyped_expectation->IsSatisfied()) {
       expectations_met = false;
       ::std::stringstream ss;
-      ss << "Actual function call count doesn't match "
-         << untyped_expectation->source_text() << "...\n";
+
+      const ::std::string& expectation_name =
+          untyped_expectation->GetDescription();
+      ss << "Actual function ";
+      if (!expectation_name.empty()) {
+        ss << "\"" << expectation_name << "\" ";
+      }
+      ss << "call count doesn't match " << untyped_expectation->source_text()
+         << "...\n";
       // No need to show the source file location of the expectation
       // in the description, as the Expect() call that follows already
       // takes care of it.
@@ -564,7 +443,7 @@ bool UntypedFunctionMockerBase::VerifyAndClearExpectationsLocked()
   return expectations_met;
 }
 
-CallReaction intToCallReaction(int mock_behavior) {
+static CallReaction intToCallReaction(int mock_behavior) {
   if (mock_behavior >= kAllow && mock_behavior <= kFail) {
     return static_cast<internal::CallReaction>(mock_behavior);
   }
@@ -610,7 +489,8 @@ class MockObjectRegistry {
   // object alive.  Therefore we report any living object as test
   // failure, unless the user explicitly asked us to ignore it.
   ~MockObjectRegistry() {
-    if (!GMOCK_FLAG(catch_leaked_mocks)) return;
+    if (!GMOCK_FLAG_GET(catch_leaked_mocks)) return;
+    internal::MutexLock l(&internal::g_gmock_mutex);
 
     int leaked_count = 0;
     for (StateMap::const_iterator it = states_.begin(); it != states_.end();
@@ -625,7 +505,7 @@ class MockObjectRegistry {
       std::cout << internal::FormatFileLocation(state.first_used_file,
                                                 state.first_used_line);
       std::cout << " ERROR: this mock object";
-      if (state.first_used_test != "") {
+      if (!state.first_used_test.empty()) {
         std::cout << " (used in test " << state.first_used_test_suite << "."
                   << state.first_used_test << ")";
       }
@@ -648,8 +528,12 @@ class MockObjectRegistry {
       // RUN_ALL_TESTS() has already returned when this destructor is
       // called.  Therefore we cannot use the normal Google Test
       // failure reporting mechanism.
-      _exit(1);  // We cannot call exit() as it is not reentrant and
+#ifdef GTEST_OS_QURT
+      qurt_exception_raise_fatal();
+#else
+      _Exit(1);  // We cannot call exit() as it is not reentrant and
                  // may already have been called.
+#endif
     }
   }
 
@@ -664,46 +548,50 @@ MockObjectRegistry g_mock_object_registry;
 
 // Maps a mock object to the reaction Google Mock should have when an
 // uninteresting method is called.  Protected by g_gmock_mutex.
-std::map<const void*, internal::CallReaction> g_uninteresting_call_reaction;
+std::unordered_map<uintptr_t, internal::CallReaction>&
+UninterestingCallReactionMap() {
+  static auto* map = new std::unordered_map<uintptr_t, internal::CallReaction>;
+  return *map;
+}
 
 // Sets the reaction Google Mock should have when an uninteresting
 // method of the given mock object is called.
-void SetReactionOnUninterestingCalls(const void* mock_obj,
+void SetReactionOnUninterestingCalls(uintptr_t mock_obj,
                                      internal::CallReaction reaction)
     GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
   internal::MutexLock l(&internal::g_gmock_mutex);
-  g_uninteresting_call_reaction[mock_obj] = reaction;
+  UninterestingCallReactionMap()[mock_obj] = reaction;
 }
 
 }  // namespace
 
 // Tells Google Mock to allow uninteresting calls on the given mock
 // object.
-void Mock::AllowUninterestingCalls(const void* mock_obj)
+void Mock::AllowUninterestingCalls(uintptr_t mock_obj)
     GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
   SetReactionOnUninterestingCalls(mock_obj, internal::kAllow);
 }
 
 // Tells Google Mock to warn the user about uninteresting calls on the
 // given mock object.
-void Mock::WarnUninterestingCalls(const void* mock_obj)
+void Mock::WarnUninterestingCalls(uintptr_t mock_obj)
     GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
   SetReactionOnUninterestingCalls(mock_obj, internal::kWarn);
 }
 
 // Tells Google Mock to fail uninteresting calls on the given mock
 // object.
-void Mock::FailUninterestingCalls(const void* mock_obj)
+void Mock::FailUninterestingCalls(uintptr_t mock_obj)
     GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
   SetReactionOnUninterestingCalls(mock_obj, internal::kFail);
 }
 
 // Tells Google Mock the given mock object is being destroyed and its
 // entry in the call-reaction table should be removed.
-void Mock::UnregisterCallReaction(const void* mock_obj)
+void Mock::UnregisterCallReaction(uintptr_t mock_obj)
     GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
   internal::MutexLock l(&internal::g_gmock_mutex);
-  g_uninteresting_call_reaction.erase(mock_obj);
+  UninterestingCallReactionMap().erase(static_cast<uintptr_t>(mock_obj));
 }
 
 // Returns the reaction Google Mock will have on uninteresting calls
@@ -711,9 +599,12 @@ void Mock::UnregisterCallReaction(const void* mock_obj)
 internal::CallReaction Mock::GetReactionOnUninterestingCalls(
     const void* mock_obj) GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
   internal::MutexLock l(&internal::g_gmock_mutex);
-  return (g_uninteresting_call_reaction.count(mock_obj) == 0)
-             ? internal::intToCallReaction(GMOCK_FLAG(default_mock_behavior))
-             : g_uninteresting_call_reaction[mock_obj];
+  return (UninterestingCallReactionMap().count(
+              reinterpret_cast<uintptr_t>(mock_obj)) == 0)
+             ? internal::intToCallReaction(
+                   GMOCK_FLAG_GET(default_mock_behavior))
+             : UninterestingCallReactionMap()[reinterpret_cast<uintptr_t>(
+                   mock_obj)];
 }
 
 // Tells Google Mock to ignore mock_obj when checking for leaked mock
@@ -856,13 +747,13 @@ void Mock::ClearDefaultActionsLocked(void* mock_obj)
   // needed by VerifyAndClearExpectationsLocked().
 }
 
-Expectation::Expectation() {}
+Expectation::Expectation() = default;
 
 Expectation::Expectation(
     const std::shared_ptr<internal::ExpectationBase>& an_expectation_base)
     : expectation_base_(an_expectation_base) {}
 
-Expectation::~Expectation() {}
+Expectation::~Expectation() = default;
 
 // Adds an expectation to a sequence.
 void Sequence::AddExpectation(const Expectation& expectation) const {
@@ -896,8 +787,6 @@ InSequence::~InSequence() {
 
 }  // namespace testing
 
-#ifdef _MSC_VER
-#if _MSC_VER == 1900
-#pragma warning(pop)
-#endif
+#if defined(_MSC_VER) && (_MSC_VER == 1900)
+GTEST_DISABLE_MSC_WARNINGS_POP_()  // 4800
 #endif
diff --git a/external/googletest/googlemock/src/gmock.cc b/external/googletest/googlemock/src/gmock.cc
index f4bf257a..b5e714da 100644
--- a/external/googletest/googlemock/src/gmock.cc
+++ b/external/googletest/googlemock/src/gmock.cc
@@ -29,15 +29,15 @@
 
 #include "gmock/gmock.h"
 
-#include "gmock/internal/gmock-port.h"
+#include <string>
 
-namespace testing {
+#include "gmock/internal/gmock-port.h"
 
 GMOCK_DEFINE_bool_(catch_leaked_mocks, true,
                    "true if and only if Google Mock should report leaked "
                    "mock objects as failures.");
 
-GMOCK_DEFINE_string_(verbose, internal::kWarningVerbosity,
+GMOCK_DEFINE_string_(verbose, testing::internal::kWarningVerbosity,
                      "Controls how verbose Google Mock's output is."
                      "  Valid values:\n"
                      "  info    - prints all messages.\n"
@@ -51,6 +51,7 @@ GMOCK_DEFINE_int32_(default_mock_behavior, 1,
                     "  1 - by default, mocks act as NaggyMocks.\n"
                     "  2 - by default, mocks act as StrictMocks.");
 
+namespace testing {
 namespace internal {
 
 // Parses a string as a command line flag.  The string should have the
@@ -58,18 +59,19 @@ namespace internal {
 // "=value" part can be omitted.
 //
 // Returns the value of the flag, or NULL if the parsing failed.
-static const char* ParseGoogleMockFlagValue(const char* str, const char* flag,
+static const char* ParseGoogleMockFlagValue(const char* str,
+                                            const char* flag_name,
                                             bool def_optional) {
   // str and flag must not be NULL.
-  if (str == nullptr || flag == nullptr) return nullptr;
+  if (str == nullptr || flag_name == nullptr) return nullptr;
 
   // The flag must start with "--gmock_".
-  const std::string flag_str = std::string("--gmock_") + flag;
-  const size_t flag_len = flag_str.length();
-  if (strncmp(str, flag_str.c_str(), flag_len) != 0) return nullptr;
+  const std::string flag_name_str = std::string("--gmock_") + flag_name;
+  const size_t flag_name_len = flag_name_str.length();
+  if (strncmp(str, flag_name_str.c_str(), flag_name_len) != 0) return nullptr;
 
   // Skips the flag name.
-  const char* flag_end = str + flag_len;
+  const char* flag_end = str + flag_name_len;
 
   // When def_optional is true, it's OK to not have a "=value" part.
   if (def_optional && (flag_end[0] == '\0')) {
@@ -90,10 +92,10 @@ static const char* ParseGoogleMockFlagValue(const char* str, const char* flag,
 //
 // On success, stores the value of the flag in *value, and returns
 // true.  On failure, returns false without changing *value.
-static bool ParseGoogleMockBoolFlag(const char* str, const char* flag,
-                                    bool* value) {
+static bool ParseGoogleMockFlag(const char* str, const char* flag_name,
+                                bool* value) {
   // Gets the value of the flag as a string.
-  const char* const value_str = ParseGoogleMockFlagValue(str, flag, true);
+  const char* const value_str = ParseGoogleMockFlagValue(str, flag_name, true);
 
   // Aborts if the parsing failed.
   if (value_str == nullptr) return false;
@@ -109,10 +111,10 @@ static bool ParseGoogleMockBoolFlag(const char* str, const char* flag,
 // On success, stores the value of the flag in *value, and returns
 // true.  On failure, returns false without changing *value.
 template <typename String>
-static bool ParseGoogleMockStringFlag(const char* str, const char* flag,
-                                      String* value) {
+static bool ParseGoogleMockFlag(const char* str, const char* flag_name,
+                                String* value) {
   // Gets the value of the flag as a string.
-  const char* const value_str = ParseGoogleMockFlagValue(str, flag, false);
+  const char* const value_str = ParseGoogleMockFlagValue(str, flag_name, false);
 
   // Aborts if the parsing failed.
   if (value_str == nullptr) return false;
@@ -122,16 +124,16 @@ static bool ParseGoogleMockStringFlag(const char* str, const char* flag,
   return true;
 }
 
-static bool ParseGoogleMockIntFlag(const char* str, const char* flag,
-                                   int32_t* value) {
+static bool ParseGoogleMockFlag(const char* str, const char* flag_name,
+                                int32_t* value) {
   // Gets the value of the flag as a string.
-  const char* const value_str = ParseGoogleMockFlagValue(str, flag, true);
+  const char* const value_str = ParseGoogleMockFlagValue(str, flag_name, true);
 
   // Aborts if the parsing failed.
   if (value_str == nullptr) return false;
 
   // Sets *value to the value of the flag.
-  return ParseInt32(Message() << "The value of flag --" << flag, value_str,
+  return ParseInt32(Message() << "The value of flag --" << flag_name, value_str,
                     value);
 }
 
@@ -151,11 +153,22 @@ void InitGoogleMockImpl(int* argc, CharType** argv) {
     const char* const arg = arg_string.c_str();
 
     // Do we see a Google Mock flag?
-    if (ParseGoogleMockBoolFlag(arg, "catch_leaked_mocks",
-                                &GMOCK_FLAG(catch_leaked_mocks)) ||
-        ParseGoogleMockStringFlag(arg, "verbose", &GMOCK_FLAG(verbose)) ||
-        ParseGoogleMockIntFlag(arg, "default_mock_behavior",
-                               &GMOCK_FLAG(default_mock_behavior))) {
+    bool found_gmock_flag = false;
+
+#define GMOCK_INTERNAL_PARSE_FLAG(flag_name)            \
+  if (!found_gmock_flag) {                              \
+    auto value = GMOCK_FLAG_GET(flag_name);             \
+    if (ParseGoogleMockFlag(arg, #flag_name, &value)) { \
+      GMOCK_FLAG_SET(flag_name, value);                 \
+      found_gmock_flag = true;                          \
+    }                                                   \
+  }
+
+    GMOCK_INTERNAL_PARSE_FLAG(catch_leaked_mocks)
+    GMOCK_INTERNAL_PARSE_FLAG(verbose)
+    GMOCK_INTERNAL_PARSE_FLAG(default_mock_behavior)
+
+    if (found_gmock_flag) {
       // Yes.  Shift the remainder of the argv list left by one.  Note
       // that argv has (*argc + 1) elements, the last one always being
       // NULL.  The following loop moves the trailing NULL element as
diff --git a/external/googletest/googlemock/src/gmock_main.cc b/external/googletest/googlemock/src/gmock_main.cc
index b411c5ec..6b554127 100644
--- a/external/googletest/googlemock/src/gmock_main.cc
+++ b/external/googletest/googlemock/src/gmock_main.cc
@@ -32,8 +32,9 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-#if GTEST_OS_ESP8266 || GTEST_OS_ESP32
-#if GTEST_OS_ESP8266
+#if defined(GTEST_OS_ESP8266) || defined(GTEST_OS_ESP32) || \
+    (defined(GTEST_OS_NRF52) && defined(ARDUINO))
+#ifdef GTEST_OS_ESP8266
 extern "C" {
 #endif
 void setup() {
@@ -43,7 +44,7 @@ void setup() {
   testing::InitGoogleMock();
 }
 void loop() { RUN_ALL_TESTS(); }
-#if GTEST_OS_ESP8266
+#ifdef GTEST_OS_ESP8266
 }
 #endif
 
@@ -55,7 +56,7 @@ void loop() { RUN_ALL_TESTS(); }
 // Windows. See the following link to track the current status of this bug:
 // https://web.archive.org/web/20170912203238/connect.microsoft.com/VisualStudio/feedback/details/394464/wmain-link-error-in-the-static-library
 // // NOLINT
-#if GTEST_OS_WINDOWS_MOBILE
+#ifdef GTEST_OS_WINDOWS_MOBILE
 #include <tchar.h>  // NOLINT
 
 GTEST_API_ int _tmain(int argc, TCHAR** argv) {
diff --git a/external/googletest/googlemock/test/BUILD.bazel b/external/googletest/googlemock/test/BUILD.bazel
index efb7306b..d4297c80 100644
--- a/external/googletest/googlemock/test/BUILD.bazel
+++ b/external/googletest/googlemock/test/BUILD.bazel
@@ -30,7 +30,6 @@
 #
 #   Bazel Build for Google C++ Testing Framework(Google Test)-googlemock
 
-load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_test")
 load("@rules_python//python:defs.bzl", "py_library", "py_test")
 
 licenses(["notice"])
@@ -39,8 +38,9 @@ licenses(["notice"])
 cc_test(
     name = "gmock_all_test",
     size = "small",
-    srcs = glob(include = ["gmock-*.cc"]),
+    srcs = glob(include = ["gmock-*.cc"]) + ["gmock-matchers_test.h"],
     linkopts = select({
+        "//:qnx": [],
         "//:windows": [],
         "//conditions:default": ["-pthread"],
     }),
diff --git a/external/googletest/googlemock/test/gmock-actions_test.cc b/external/googletest/googlemock/test/gmock-actions_test.cc
index 63c34806..46b0e918 100644
--- a/external/googletest/googlemock/test/gmock-actions_test.cc
+++ b/external/googletest/googlemock/test/gmock-actions_test.cc
@@ -31,61 +31,227 @@
 //
 // This file tests the built-in actions.
 
-// Silence C4100 (unreferenced formal parameter) for MSVC
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4100)
-#if _MSC_VER == 1900
-// and silence C4800 (C4800: 'int *const ': forcing value
-// to bool 'true' or 'false') for MSVC 15
-#pragma warning(disable : 4800)
-#endif
-#endif
-
 #include "gmock/gmock-actions.h"
 
 #include <algorithm>
+#include <functional>
 #include <iterator>
 #include <memory>
+#include <sstream>
 #include <string>
+#include <tuple>
 #include <type_traits>
+#include <utility>
+#include <vector>
 
 #include "gmock/gmock.h"
 #include "gmock/internal/gmock-port.h"
 #include "gtest/gtest-spi.h"
 #include "gtest/gtest.h"
+#include "gtest/internal/gtest-port.h"
 
+// Silence C4100 (unreferenced formal parameter) and C4503 (decorated name
+// length exceeded) for MSVC.
+GTEST_DISABLE_MSC_WARNINGS_PUSH_(4100 4503)
+#if defined(_MSC_VER) && (_MSC_VER == 1900)
+// and silence C4800 (C4800: 'int *const ': forcing value
+// to bool 'true' or 'false') for MSVC 15
+GTEST_DISABLE_MSC_WARNINGS_PUSH_(4800)
+#endif
+
+namespace testing {
 namespace {
 
-using ::testing::_;
-using ::testing::Action;
-using ::testing::ActionInterface;
-using ::testing::Assign;
-using ::testing::ByMove;
-using ::testing::ByRef;
-using ::testing::DefaultValue;
-using ::testing::DoAll;
-using ::testing::DoDefault;
-using ::testing::IgnoreResult;
-using ::testing::Invoke;
-using ::testing::InvokeWithoutArgs;
-using ::testing::MakePolymorphicAction;
-using ::testing::PolymorphicAction;
-using ::testing::Return;
-using ::testing::ReturnNew;
-using ::testing::ReturnNull;
-using ::testing::ReturnRef;
-using ::testing::ReturnRefOfCopy;
-using ::testing::ReturnRoundRobin;
-using ::testing::SetArgPointee;
-using ::testing::SetArgumentPointee;
-using ::testing::Unused;
-using ::testing::WithArgs;
 using ::testing::internal::BuiltInDefaultValue;
 
-#if !GTEST_OS_WINDOWS_MOBILE
-using ::testing::SetErrnoAndReturn;
-#endif
+TEST(TypeTraits, Negation) {
+  // Direct use with std types.
+  static_assert(std::is_base_of<std::false_type,
+                                internal::negation<std::true_type>>::value,
+                "");
+
+  static_assert(std::is_base_of<std::true_type,
+                                internal::negation<std::false_type>>::value,
+                "");
+
+  // With other types that fit the requirement of a value member that is
+  // convertible to bool.
+  static_assert(std::is_base_of<
+                    std::true_type,
+                    internal::negation<std::integral_constant<int, 0>>>::value,
+                "");
+
+  static_assert(std::is_base_of<
+                    std::false_type,
+                    internal::negation<std::integral_constant<int, 1>>>::value,
+                "");
+
+  static_assert(std::is_base_of<
+                    std::false_type,
+                    internal::negation<std::integral_constant<int, -1>>>::value,
+                "");
+}
+
+// Weird false/true types that aren't actually bool constants (but should still
+// be legal according to [meta.logical] because `bool(T::value)` is valid), are
+// distinct from std::false_type and std::true_type, and are distinct from other
+// instantiations of the same template.
+//
+// These let us check finicky details mandated by the standard like
+// "std::conjunction should evaluate to a type that inherits from the first
+// false-y input".
+template <int>
+struct MyFalse : std::integral_constant<int, 0> {};
+
+template <int>
+struct MyTrue : std::integral_constant<int, -1> {};
+
+TEST(TypeTraits, Conjunction) {
+  // Base case: always true.
+  static_assert(std::is_base_of<std::true_type, internal::conjunction<>>::value,
+                "");
+
+  // One predicate: inherits from that predicate, regardless of value.
+  static_assert(
+      std::is_base_of<MyFalse<0>, internal::conjunction<MyFalse<0>>>::value,
+      "");
+
+  static_assert(
+      std::is_base_of<MyTrue<0>, internal::conjunction<MyTrue<0>>>::value, "");
+
+  // Multiple predicates, with at least one false: inherits from that one.
+  static_assert(
+      std::is_base_of<MyFalse<1>, internal::conjunction<MyTrue<0>, MyFalse<1>,
+                                                        MyTrue<2>>>::value,
+      "");
+
+  static_assert(
+      std::is_base_of<MyFalse<1>, internal::conjunction<MyTrue<0>, MyFalse<1>,
+                                                        MyFalse<2>>>::value,
+      "");
+
+  // Short circuiting: in the case above, additional predicates need not even
+  // define a value member.
+  struct Empty {};
+  static_assert(
+      std::is_base_of<MyFalse<1>, internal::conjunction<MyTrue<0>, MyFalse<1>,
+                                                        Empty>>::value,
+      "");
+
+  // All predicates true: inherits from the last.
+  static_assert(
+      std::is_base_of<MyTrue<2>, internal::conjunction<MyTrue<0>, MyTrue<1>,
+                                                       MyTrue<2>>>::value,
+      "");
+}
+
+TEST(TypeTraits, Disjunction) {
+  // Base case: always false.
+  static_assert(
+      std::is_base_of<std::false_type, internal::disjunction<>>::value, "");
+
+  // One predicate: inherits from that predicate, regardless of value.
+  static_assert(
+      std::is_base_of<MyFalse<0>, internal::disjunction<MyFalse<0>>>::value,
+      "");
+
+  static_assert(
+      std::is_base_of<MyTrue<0>, internal::disjunction<MyTrue<0>>>::value, "");
+
+  // Multiple predicates, with at least one true: inherits from that one.
+  static_assert(
+      std::is_base_of<MyTrue<1>, internal::disjunction<MyFalse<0>, MyTrue<1>,
+                                                       MyFalse<2>>>::value,
+      "");
+
+  static_assert(
+      std::is_base_of<MyTrue<1>, internal::disjunction<MyFalse<0>, MyTrue<1>,
+                                                       MyTrue<2>>>::value,
+      "");
+
+  // Short circuiting: in the case above, additional predicates need not even
+  // define a value member.
+  struct Empty {};
+  static_assert(
+      std::is_base_of<MyTrue<1>, internal::disjunction<MyFalse<0>, MyTrue<1>,
+                                                       Empty>>::value,
+      "");
+
+  // All predicates false: inherits from the last.
+  static_assert(
+      std::is_base_of<MyFalse<2>, internal::disjunction<MyFalse<0>, MyFalse<1>,
+                                                        MyFalse<2>>>::value,
+      "");
+}
+
+TEST(TypeTraits, IsInvocableRV) {
+  struct C {
+    int operator()() const { return 0; }
+    void operator()(int) & {}
+    std::string operator()(int) && { return ""; };
+  };
+
+  // The first overload is callable for const and non-const rvalues and lvalues.
+  // It can be used to obtain an int, cv void, or anything int is convertible
+  // to.
+  static_assert(internal::is_callable_r<int, C>::value, "");
+  static_assert(internal::is_callable_r<int, C&>::value, "");
+  static_assert(internal::is_callable_r<int, const C>::value, "");
+  static_assert(internal::is_callable_r<int, const C&>::value, "");
+
+  static_assert(internal::is_callable_r<void, C>::value, "");
+  static_assert(internal::is_callable_r<const volatile void, C>::value, "");
+  static_assert(internal::is_callable_r<char, C>::value, "");
+
+  // It's possible to provide an int. If it's given to an lvalue, the result is
+  // void. Otherwise it is std::string (which is also treated as allowed for a
+  // void result type).
+  static_assert(internal::is_callable_r<void, C&, int>::value, "");
+  static_assert(!internal::is_callable_r<int, C&, int>::value, "");
+  static_assert(!internal::is_callable_r<std::string, C&, int>::value, "");
+  static_assert(!internal::is_callable_r<void, const C&, int>::value, "");
+
+  static_assert(internal::is_callable_r<std::string, C, int>::value, "");
+  static_assert(internal::is_callable_r<void, C, int>::value, "");
+  static_assert(!internal::is_callable_r<int, C, int>::value, "");
+
+  // It's not possible to provide other arguments.
+  static_assert(!internal::is_callable_r<void, C, std::string>::value, "");
+  static_assert(!internal::is_callable_r<void, C, int, int>::value, "");
+
+  // In C++17 and above, where it's guaranteed that functions can return
+  // non-moveable objects, everything should work fine for non-moveable rsult
+  // types too.
+  // TODO(b/396121064) - Fix this test under MSVC
+#ifndef _MSC_VER
+  {
+    struct NonMoveable {
+      NonMoveable() = default;
+      NonMoveable(NonMoveable&&) = delete;
+    };
+
+    static_assert(!std::is_move_constructible_v<NonMoveable>);
+
+    struct Callable {
+      NonMoveable operator()() { return NonMoveable(); }
+    };
+
+    static_assert(internal::is_callable_r<NonMoveable, Callable>::value);
+    static_assert(internal::is_callable_r<void, Callable>::value);
+    static_assert(
+        internal::is_callable_r<const volatile void, Callable>::value);
+
+    static_assert(!internal::is_callable_r<int, Callable>::value);
+    static_assert(!internal::is_callable_r<NonMoveable, Callable, int>::value);
+  }
+#endif  // _MSC_VER
+
+  // Nothing should choke when we try to call other arguments besides directly
+  // callable objects, but they should not show up as callable.
+  static_assert(!internal::is_callable_r<void, int>::value, "");
+  static_assert(!internal::is_callable_r<void, void (C::*)()>::value, "");
+  static_assert(!internal::is_callable_r<void, void (C::*)(), C*>::value, "");
+}
 
 // Tests that BuiltInDefaultValue<T*>::Get() returns NULL.
 TEST(BuiltInDefaultValueTest, IsNullForPointerTypes) {
@@ -275,15 +441,15 @@ TEST(DefaultValueDeathTest, GetReturnsBuiltInDefaultValueWhenUnset) {
 
   EXPECT_EQ(0, DefaultValue<int>::Get());
 
-  EXPECT_DEATH_IF_SUPPORTED({ DefaultValue<MyNonDefaultConstructible>::Get(); },
-                            "");
+  EXPECT_DEATH_IF_SUPPORTED(
+      { DefaultValue<MyNonDefaultConstructible>::Get(); }, "");
 }
 
 TEST(DefaultValueTest, GetWorksForMoveOnlyIfSet) {
   EXPECT_TRUE(DefaultValue<std::unique_ptr<int>>::Exists());
   EXPECT_TRUE(DefaultValue<std::unique_ptr<int>>::Get() == nullptr);
   DefaultValue<std::unique_ptr<int>>::SetFactory(
-      [] { return std::unique_ptr<int>(new int(42)); });
+      [] { return std::make_unique<int>(42); });
   EXPECT_TRUE(DefaultValue<std::unique_ptr<int>>::Exists());
   std::unique_ptr<int> i = DefaultValue<std::unique_ptr<int>>::Get();
   EXPECT_EQ(42, *i);
@@ -301,7 +467,7 @@ TEST(DefaultValueOfReferenceTest, IsInitiallyUnset) {
   EXPECT_FALSE(DefaultValue<MyNonDefaultConstructible&>::IsSet());
 }
 
-// Tests that DefaultValue<T&>::Exists is false initiallly.
+// Tests that DefaultValue<T&>::Exists is false initially.
 TEST(DefaultValueOfReferenceTest, IsInitiallyNotExisting) {
   EXPECT_FALSE(DefaultValue<int&>::Exists());
   EXPECT_FALSE(DefaultValue<MyDefaultConstructible&>::Exists());
@@ -339,8 +505,8 @@ TEST(DefaultValueOfReferenceDeathTest, GetReturnsBuiltInDefaultValueWhenUnset) {
   EXPECT_FALSE(DefaultValue<MyNonDefaultConstructible&>::IsSet());
 
   EXPECT_DEATH_IF_SUPPORTED({ DefaultValue<int&>::Get(); }, "");
-  EXPECT_DEATH_IF_SUPPORTED({ DefaultValue<MyNonDefaultConstructible>::Get(); },
-                            "");
+  EXPECT_DEATH_IF_SUPPORTED(
+      { DefaultValue<MyNonDefaultConstructible>::Get(); }, "");
 }
 
 // Tests that ActionInterface can be implemented by defining the
@@ -371,7 +537,7 @@ TEST(ActionInterfaceTest, MakeAction) {
   EXPECT_EQ(5, action.Perform(std::make_tuple(true, 5)));
 }
 
-// Tests that Action<F> can be contructed from a pointer to
+// Tests that Action<F> can be constructed from a pointer to
 // ActionInterface<F>.
 TEST(ActionTest, CanBeConstructedFromActionInterface) {
   Action<MyGlobalFunction> action(new MyActionImpl);
@@ -512,27 +678,137 @@ TEST(ReturnTest, AcceptsStringLiteral) {
   EXPECT_EQ("world", a2.Perform(std::make_tuple()));
 }
 
-// Test struct which wraps a vector of integers. Used in
-// 'SupportsWrapperReturnType' test.
-struct IntegerVectorWrapper {
-  std::vector<int>* v;
-  IntegerVectorWrapper(std::vector<int>& _v) : v(&_v) {}  // NOLINT
-};
+// Return(x) should work fine when the mock function's return type is a
+// reference-like wrapper for decltype(x), as when x is a std::string and the
+// mock function returns std::string_view.
+TEST(ReturnTest, SupportsReferenceLikeReturnType) {
+  // A reference wrapper for std::vector<int>, implicitly convertible from it.
+  struct Result {
+    const std::vector<int>* v;
+    Result(const std::vector<int>& vec) : v(&vec) {}  // NOLINT
+  };
+
+  // Set up an action for a mock function that returns the reference wrapper
+  // type, initializing it with an actual vector.
+  //
+  // The returned wrapper should be initialized with a copy of that vector
+  // that's embedded within the action itself (which should stay alive as long
+  // as the mock object is alive), rather than e.g. a reference to the temporary
+  // we feed to Return. This should work fine both for WillOnce and
+  // WillRepeatedly.
+  MockFunction<Result()> mock;
+  EXPECT_CALL(mock, Call)
+      .WillOnce(Return(std::vector<int>{17, 19, 23}))
+      .WillRepeatedly(Return(std::vector<int>{29, 31, 37}));
 
-// Tests that Return() works when return type is a wrapper type.
-TEST(ReturnTest, SupportsWrapperReturnType) {
-  // Initialize vector of integers.
-  std::vector<int> v;
-  for (int i = 0; i < 5; ++i) v.push_back(i);
+  EXPECT_THAT(mock.AsStdFunction()(),
+              Field(&Result::v, Pointee(ElementsAre(17, 19, 23))));
 
-  // Return() called with 'v' as argument. The Action will return the same data
-  // as 'v' (copy) but it will be wrapped in an IntegerVectorWrapper.
-  Action<IntegerVectorWrapper()> a = Return(v);
-  const std::vector<int>& result = *(a.Perform(std::make_tuple()).v);
-  EXPECT_THAT(result, ::testing::ElementsAre(0, 1, 2, 3, 4));
+  EXPECT_THAT(mock.AsStdFunction()(),
+              Field(&Result::v, Pointee(ElementsAre(29, 31, 37))));
 }
 
-// Tests that Return(v) is covaraint.
+TEST(ReturnTest, PrefersConversionOperator) {
+  // Define types In and Out such that:
+  //
+  //  *  In is implicitly convertible to Out.
+  //  *  Out also has an explicit constructor from In.
+  //
+  struct In;
+  struct Out {
+    int x;
+
+    explicit Out(const int val) : x(val) {}
+    explicit Out(const In&) : x(0) {}
+  };
+
+  struct In {
+    operator Out() const { return Out{19}; }  // NOLINT
+  };
+
+  // Assumption check: the C++ language rules are such that a function that
+  // returns Out which uses In a return statement will use the implicit
+  // conversion path rather than the explicit constructor.
+  EXPECT_THAT([]() -> Out { return In(); }(), Field(&Out::x, 19));
+
+  // Return should work the same way: if the mock function's return type is Out
+  // and we feed Return an In value, then the Out should be created through the
+  // implicit conversion path rather than the explicit constructor.
+  MockFunction<Out()> mock;
+  EXPECT_CALL(mock, Call).WillOnce(Return(In()));
+  EXPECT_THAT(mock.AsStdFunction()(), Field(&Out::x, 19));
+}
+
+// It should be possible to use Return(R) with a mock function result type U
+// that is convertible from const R& but *not* R (such as
+// std::reference_wrapper). This should work for both WillOnce and
+// WillRepeatedly.
+TEST(ReturnTest, ConversionRequiresConstLvalueReference) {
+  using R = int;
+  using U = std::reference_wrapper<const int>;
+
+  static_assert(std::is_convertible<const R&, U>::value, "");
+  static_assert(!std::is_convertible<R, U>::value, "");
+
+  MockFunction<U()> mock;
+  EXPECT_CALL(mock, Call).WillOnce(Return(17)).WillRepeatedly(Return(19));
+
+  EXPECT_EQ(17, mock.AsStdFunction()());
+  EXPECT_EQ(19, mock.AsStdFunction()());
+}
+
+// Return(x) should not be usable with a mock function result type that's
+// implicitly convertible from decltype(x) but requires a non-const lvalue
+// reference to the input. It doesn't make sense for the conversion operator to
+// modify the input.
+TEST(ReturnTest, ConversionRequiresMutableLvalueReference) {
+  // Set up a type that is implicitly convertible from std::string&, but not
+  // std::string&& or `const std::string&`.
+  //
+  // Avoid asserting about conversion from std::string on MSVC, which seems to
+  // implement std::is_convertible incorrectly in this case.
+  struct S {
+    S(std::string&) {}  // NOLINT
+  };
+
+  static_assert(std::is_convertible<std::string&, S>::value, "");
+#ifndef _MSC_VER
+  static_assert(!std::is_convertible<std::string&&, S>::value, "");
+#endif
+  static_assert(!std::is_convertible<const std::string&, S>::value, "");
+
+  // It shouldn't be possible to use the result of Return(std::string) in a
+  // context where an S is needed.
+  //
+  // Here too we disable the assertion for MSVC, since its incorrect
+  // implementation of is_convertible causes our SFINAE to be wrong.
+  using RA = decltype(Return(std::string()));
+
+  static_assert(!std::is_convertible<RA, Action<S()>>::value, "");
+#ifndef _MSC_VER
+  static_assert(!std::is_convertible<RA, OnceAction<S()>>::value, "");
+#endif
+}
+
+TEST(ReturnTest, MoveOnlyResultType) {
+  // Return should support move-only result types when used with WillOnce.
+  {
+    MockFunction<std::unique_ptr<int>()> mock;
+    EXPECT_CALL(mock, Call)
+        // NOLINTNEXTLINE
+        .WillOnce(Return(std::unique_ptr<int>(new int(17))));
+
+    EXPECT_THAT(mock.AsStdFunction()(), Pointee(17));
+  }
+
+  // The result of Return should not be convertible to Action (so it can't be
+  // used with WillRepeatedly).
+  static_assert(!std::is_convertible<decltype(Return(std::unique_ptr<int>())),
+                                     Action<std::unique_ptr<int>()>>::value,
+                "");
+}
+
+// Tests that Return(v) is covariant.
 
 struct Base {
   bool operator==(const Base&) { return true; }
@@ -583,19 +859,6 @@ TEST(ReturnTest, ConvertsArgumentWhenConverted) {
                           << "when performed.";
 }
 
-class DestinationType {};
-
-class SourceType {
- public:
-  // Note: a non-const typecast operator.
-  operator DestinationType() { return DestinationType(); }
-};
-
-TEST(ReturnTest, CanConvertArgumentUsingNonConstTypeCastOperator) {
-  SourceType s;
-  Action<DestinationType()> action(Return(s));
-}
-
 // Tests that ReturnNull() returns NULL in a pointer-returning function.
 TEST(ReturnNullTest, WorksInPointerReturningFunction) {
   const Action<int*()> a1 = ReturnNull();
@@ -724,7 +987,7 @@ TEST(ReturnRoundRobinTest, WorksForVector) {
 
 class MockClass {
  public:
-  MockClass() {}
+  MockClass() = default;
 
   MOCK_METHOD1(IntFunc, int(bool flag));  // NOLINT
   MOCK_METHOD0(Foo, MyNonDefaultConstructible());
@@ -736,7 +999,8 @@ class MockClass {
                int(const std::unique_ptr<int>&, std::unique_ptr<int>));
 
  private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(MockClass);
+  MockClass(const MockClass&) = delete;
+  MockClass& operator=(const MockClass&) = delete;
 };
 
 // Tests that DoDefault() returns the built-in default value for the
@@ -1059,6 +1323,208 @@ TEST(AssignTest, CompatibleTypes) {
   EXPECT_DOUBLE_EQ(5, x);
 }
 
+// DoAll should support &&-qualified actions when used with WillOnce.
+TEST(DoAll, SupportsRefQualifiedActions) {
+  struct InitialAction {
+    void operator()(const int arg) && { EXPECT_EQ(17, arg); }
+  };
+
+  struct FinalAction {
+    int operator()() && { return 19; }
+  };
+
+  MockFunction<int(int)> mock;
+  EXPECT_CALL(mock, Call).WillOnce(DoAll(InitialAction{}, FinalAction{}));
+  EXPECT_EQ(19, mock.AsStdFunction()(17));
+}
+
+// DoAll should never provide rvalue references to the initial actions. If the
+// mock action itself accepts an rvalue reference or a non-scalar object by
+// value then the final action should receive an rvalue reference, but initial
+// actions should receive only lvalue references.
+TEST(DoAll, ProvidesLvalueReferencesToInitialActions) {
+  struct Obj {};
+
+  // Mock action accepts by value: the initial action should be fed a const
+  // lvalue reference, and the final action an rvalue reference.
+  {
+    struct InitialAction {
+      void operator()(Obj&) const { FAIL() << "Unexpected call"; }
+      void operator()(const Obj&) const {}
+      void operator()(Obj&&) const { FAIL() << "Unexpected call"; }
+      void operator()(const Obj&&) const { FAIL() << "Unexpected call"; }
+    };
+
+    MockFunction<void(Obj)> mock;
+    EXPECT_CALL(mock, Call)
+        .WillOnce(DoAll(InitialAction{}, InitialAction{}, [](Obj&&) {}))
+        .WillRepeatedly(DoAll(InitialAction{}, InitialAction{}, [](Obj&&) {}));
+
+    mock.AsStdFunction()(Obj{});
+    mock.AsStdFunction()(Obj{});
+  }
+
+  // Mock action accepts by const lvalue reference: both actions should receive
+  // a const lvalue reference.
+  {
+    struct InitialAction {
+      void operator()(Obj&) const { FAIL() << "Unexpected call"; }
+      void operator()(const Obj&) const {}
+      void operator()(Obj&&) const { FAIL() << "Unexpected call"; }
+      void operator()(const Obj&&) const { FAIL() << "Unexpected call"; }
+    };
+
+    MockFunction<void(const Obj&)> mock;
+    EXPECT_CALL(mock, Call)
+        .WillOnce(DoAll(InitialAction{}, InitialAction{}, [](const Obj&) {}))
+        .WillRepeatedly(
+            DoAll(InitialAction{}, InitialAction{}, [](const Obj&) {}));
+
+    mock.AsStdFunction()(Obj{});
+    mock.AsStdFunction()(Obj{});
+  }
+
+  // Mock action accepts by non-const lvalue reference: both actions should get
+  // a non-const lvalue reference if they want them.
+  {
+    struct InitialAction {
+      void operator()(Obj&) const {}
+      void operator()(Obj&&) const { FAIL() << "Unexpected call"; }
+    };
+
+    MockFunction<void(Obj&)> mock;
+    EXPECT_CALL(mock, Call)
+        .WillOnce(DoAll(InitialAction{}, InitialAction{}, [](Obj&) {}))
+        .WillRepeatedly(DoAll(InitialAction{}, InitialAction{}, [](Obj&) {}));
+
+    Obj obj;
+    mock.AsStdFunction()(obj);
+    mock.AsStdFunction()(obj);
+  }
+
+  // Mock action accepts by rvalue reference: the initial actions should receive
+  // a non-const lvalue reference if it wants it, and the final action an rvalue
+  // reference.
+  {
+    struct InitialAction {
+      void operator()(Obj&) const {}
+      void operator()(Obj&&) const { FAIL() << "Unexpected call"; }
+    };
+
+    MockFunction<void(Obj&&)> mock;
+    EXPECT_CALL(mock, Call)
+        .WillOnce(DoAll(InitialAction{}, InitialAction{}, [](Obj&&) {}))
+        .WillRepeatedly(DoAll(InitialAction{}, InitialAction{}, [](Obj&&) {}));
+
+    mock.AsStdFunction()(Obj{});
+    mock.AsStdFunction()(Obj{});
+  }
+
+  // &&-qualified initial actions should also be allowed with WillOnce.
+  {
+    struct InitialAction {
+      void operator()(Obj&) && {}
+    };
+
+    MockFunction<void(Obj&)> mock;
+    EXPECT_CALL(mock, Call)
+        .WillOnce(DoAll(InitialAction{}, InitialAction{}, [](Obj&) {}));
+
+    Obj obj;
+    mock.AsStdFunction()(obj);
+  }
+
+  {
+    struct InitialAction {
+      void operator()(Obj&) && {}
+    };
+
+    MockFunction<void(Obj&&)> mock;
+    EXPECT_CALL(mock, Call)
+        .WillOnce(DoAll(InitialAction{}, InitialAction{}, [](Obj&&) {}));
+
+    mock.AsStdFunction()(Obj{});
+  }
+}
+
+// DoAll should support being used with type-erased Action objects, both through
+// WillOnce and WillRepeatedly.
+TEST(DoAll, SupportsTypeErasedActions) {
+  // With only type-erased actions.
+  const Action<void()> initial_action = [] {};
+  const Action<int()> final_action = [] { return 17; };
+
+  MockFunction<int()> mock;
+  EXPECT_CALL(mock, Call)
+      .WillOnce(DoAll(initial_action, initial_action, final_action))
+      .WillRepeatedly(DoAll(initial_action, initial_action, final_action));
+
+  EXPECT_EQ(17, mock.AsStdFunction()());
+
+  // With &&-qualified and move-only final action.
+  {
+    struct FinalAction {
+      FinalAction() = default;
+      FinalAction(FinalAction&&) = default;
+
+      int operator()() && { return 17; }
+    };
+
+    EXPECT_CALL(mock, Call)
+        .WillOnce(DoAll(initial_action, initial_action, FinalAction{}));
+
+    EXPECT_EQ(17, mock.AsStdFunction()());
+  }
+}
+
+// A DoAll action should be convertible to a OnceAction, even when its component
+// sub-actions are user-provided types that define only an Action conversion
+// operator. If they supposed being called more than once then they also support
+// being called at most once.
+TEST(DoAll, ConvertibleToOnceActionWithUserProvidedActionConversion) {
+  // Simplest case: only one sub-action.
+  struct CustomFinal final {
+    operator Action<int()>() {  // NOLINT
+      return Return(17);
+    }
+
+    operator Action<int(int, char)>() {  // NOLINT
+      return Return(19);
+    }
+  };
+
+  {
+    OnceAction<int()> action = DoAll(CustomFinal{});
+    EXPECT_EQ(17, std::move(action).Call());
+  }
+
+  {
+    OnceAction<int(int, char)> action = DoAll(CustomFinal{});
+    EXPECT_EQ(19, std::move(action).Call(0, 0));
+  }
+
+  // It should also work with multiple sub-actions.
+  struct CustomInitial final {
+    operator Action<void()>() {  // NOLINT
+      return [] {};
+    }
+
+    operator Action<void(int, char)>() {  // NOLINT
+      return [] {};
+    }
+  };
+
+  {
+    OnceAction<int()> action = DoAll(CustomInitial{}, CustomFinal{});
+    EXPECT_EQ(17, std::move(action).Call());
+  }
+
+  {
+    OnceAction<int(int, char)> action = DoAll(CustomInitial{}, CustomFinal{});
+    EXPECT_EQ(19, std::move(action).Call(0, 0));
+  }
+}
+
 // Tests using WithArgs and with an action that takes 1 argument.
 TEST(WithArgsTest, OneArg) {
   Action<bool(double x, int n)> a = WithArgs<1>(Invoke(Unary));  // NOLINT
@@ -1154,11 +1620,48 @@ TEST(WithArgsTest, ReturnReference) {
 
 TEST(WithArgsTest, InnerActionWithConversion) {
   Action<Derived*()> inner = [] { return nullptr; };
-  Action<Base*(double)> a = testing::WithoutArgs(inner);
-  EXPECT_EQ(nullptr, a.Perform(std::make_tuple(1.1)));
+
+  MockFunction<Base*(double)> mock;
+  EXPECT_CALL(mock, Call)
+      .WillOnce(WithoutArgs(inner))
+      .WillRepeatedly(WithoutArgs(inner));
+
+  EXPECT_EQ(nullptr, mock.AsStdFunction()(1.1));
+  EXPECT_EQ(nullptr, mock.AsStdFunction()(1.1));
 }
 
-#if !GTEST_OS_WINDOWS_MOBILE
+// It should be possible to use an &&-qualified inner action as long as the
+// whole shebang is used as an rvalue with WillOnce.
+TEST(WithArgsTest, RefQualifiedInnerAction) {
+  struct SomeAction {
+    int operator()(const int arg) && {
+      EXPECT_EQ(17, arg);
+      return 19;
+    }
+  };
+
+  MockFunction<int(int, int)> mock;
+  EXPECT_CALL(mock, Call).WillOnce(WithArg<1>(SomeAction{}));
+  EXPECT_EQ(19, mock.AsStdFunction()(0, 17));
+}
+
+// It should be fine to provide an lvalue WithArgsAction to WillOnce, even when
+// the inner action only wants to convert to OnceAction.
+TEST(WithArgsTest, ProvideAsLvalueToWillOnce) {
+  struct SomeAction {
+    operator OnceAction<int(int)>() const {  // NOLINT
+      return [](const int arg) { return arg + 2; };
+    }
+  };
+
+  const auto wa = WithArg<1>(SomeAction{});
+
+  MockFunction<int(int, int)> mock;
+  EXPECT_CALL(mock, Call).WillOnce(wa);
+  EXPECT_EQ(19, mock.AsStdFunction()(0, 17));
+}
+
+#ifndef GTEST_OS_WINDOWS_MOBILE
 
 class SetErrnoAndReturnTest : public testing::Test {
  protected:
@@ -1317,9 +1820,7 @@ TEST(ReturnNewTest, ConstructorThatTakes10Arguments) {
   delete c;
 }
 
-std::unique_ptr<int> UniquePtrSource() {
-  return std::unique_ptr<int>(new int(19));
-}
+std::unique_ptr<int> UniquePtrSource() { return std::make_unique<int>(19); }
 
 std::vector<std::unique_ptr<int>> VectorUniquePtrSource() {
   std::vector<std::unique_ptr<int>> out;
@@ -1368,7 +1869,7 @@ TEST(MockMethodTest, CanReturnMoveOnlyValue_Invoke) {
 
   // Check default value
   DefaultValue<std::unique_ptr<int>>::SetFactory(
-      [] { return std::unique_ptr<int>(new int(42)); });
+      [] { return std::make_unique<int>(42); });
   EXPECT_EQ(42, *mock.MakeUnique());
 
   EXPECT_CALL(mock, MakeUnique()).WillRepeatedly(Invoke(UniquePtrSource));
@@ -1388,7 +1889,7 @@ TEST(MockMethodTest, CanReturnMoveOnlyValue_Invoke) {
 
 TEST(MockMethodTest, CanTakeMoveOnlyValue) {
   MockClass mock;
-  auto make = [](int i) { return std::unique_ptr<int>(new int(i)); };
+  auto make = [](int i) { return std::make_unique<int>(i); };
 
   EXPECT_CALL(mock, TakeUnique(_)).WillRepeatedly([](std::unique_ptr<int> i) {
     return *i;
@@ -1428,6 +1929,179 @@ TEST(MockMethodTest, CanTakeMoveOnlyValue) {
   EXPECT_EQ(42, *saved);
 }
 
+// It should be possible to use callables with an &&-qualified call operator
+// with WillOnce, since they will be called only once. This allows actions to
+// contain and manipulate move-only types.
+TEST(MockMethodTest, ActionHasRvalueRefQualifiedCallOperator) {
+  struct Return17 {
+    int operator()() && { return 17; }
+  };
+
+  // Action is directly compatible with mocked function type.
+  {
+    MockFunction<int()> mock;
+    EXPECT_CALL(mock, Call).WillOnce(Return17());
+
+    EXPECT_EQ(17, mock.AsStdFunction()());
+  }
+
+  // Action doesn't want mocked function arguments.
+  {
+    MockFunction<int(int)> mock;
+    EXPECT_CALL(mock, Call).WillOnce(Return17());
+
+    EXPECT_EQ(17, mock.AsStdFunction()(0));
+  }
+}
+
+// Edge case: if an action has both a const-qualified and an &&-qualified call
+// operator, there should be no "ambiguous call" errors. The &&-qualified
+// operator should be used by WillOnce (since it doesn't need to retain the
+// action beyond one call), and the const-qualified one by WillRepeatedly.
+TEST(MockMethodTest, ActionHasMultipleCallOperators) {
+  struct ReturnInt {
+    int operator()() && { return 17; }
+    int operator()() const& { return 19; }
+  };
+
+  // Directly compatible with mocked function type.
+  {
+    MockFunction<int()> mock;
+    EXPECT_CALL(mock, Call).WillOnce(ReturnInt()).WillRepeatedly(ReturnInt());
+
+    EXPECT_EQ(17, mock.AsStdFunction()());
+    EXPECT_EQ(19, mock.AsStdFunction()());
+    EXPECT_EQ(19, mock.AsStdFunction()());
+  }
+
+  // Ignores function arguments.
+  {
+    MockFunction<int(int)> mock;
+    EXPECT_CALL(mock, Call).WillOnce(ReturnInt()).WillRepeatedly(ReturnInt());
+
+    EXPECT_EQ(17, mock.AsStdFunction()(0));
+    EXPECT_EQ(19, mock.AsStdFunction()(0));
+    EXPECT_EQ(19, mock.AsStdFunction()(0));
+  }
+}
+
+// WillOnce should have no problem coping with a move-only action, whether it is
+// &&-qualified or not.
+TEST(MockMethodTest, MoveOnlyAction) {
+  // &&-qualified
+  {
+    struct Return17 {
+      Return17() = default;
+      Return17(Return17&&) = default;
+
+      Return17(const Return17&) = delete;
+      Return17 operator=(const Return17&) = delete;
+
+      int operator()() && { return 17; }
+    };
+
+    MockFunction<int()> mock;
+    EXPECT_CALL(mock, Call).WillOnce(Return17());
+    EXPECT_EQ(17, mock.AsStdFunction()());
+  }
+
+  // Not &&-qualified
+  {
+    struct Return17 {
+      Return17() = default;
+      Return17(Return17&&) = default;
+
+      Return17(const Return17&) = delete;
+      Return17 operator=(const Return17&) = delete;
+
+      int operator()() const { return 17; }
+    };
+
+    MockFunction<int()> mock;
+    EXPECT_CALL(mock, Call).WillOnce(Return17());
+    EXPECT_EQ(17, mock.AsStdFunction()());
+  }
+}
+
+// It should be possible to use an action that returns a value with a mock
+// function that doesn't, both through WillOnce and WillRepeatedly.
+TEST(MockMethodTest, ActionReturnsIgnoredValue) {
+  struct ReturnInt {
+    int operator()() const { return 0; }
+  };
+
+  MockFunction<void()> mock;
+  EXPECT_CALL(mock, Call).WillOnce(ReturnInt()).WillRepeatedly(ReturnInt());
+
+  mock.AsStdFunction()();
+  mock.AsStdFunction()();
+}
+
+// Despite the fanciness around move-only actions and so on, it should still be
+// possible to hand an lvalue reference to a copyable action to WillOnce.
+TEST(MockMethodTest, WillOnceCanAcceptLvalueReference) {
+  MockFunction<int()> mock;
+
+  const auto action = [] { return 17; };
+  EXPECT_CALL(mock, Call).WillOnce(action);
+
+  EXPECT_EQ(17, mock.AsStdFunction()());
+}
+
+// A callable that doesn't use SFINAE to restrict its call operator's overload
+// set, but is still picky about which arguments it will accept.
+struct StaticAssertSingleArgument {
+  template <typename... Args>
+  static constexpr bool CheckArgs() {
+    static_assert(sizeof...(Args) == 1, "");
+    return true;
+  }
+
+  template <typename... Args, bool = CheckArgs<Args...>()>
+  int operator()(Args...) const {
+    return 17;
+  }
+};
+
+// WillOnce and WillRepeatedly should both work fine with naïve implementations
+// of actions that don't use SFINAE to limit the overload set for their call
+// operator. If they are compatible with the actual mocked signature, we
+// shouldn't probe them with no arguments and trip a static_assert.
+TEST(MockMethodTest, ActionSwallowsAllArguments) {
+  MockFunction<int(int)> mock;
+  EXPECT_CALL(mock, Call)
+      .WillOnce(StaticAssertSingleArgument{})
+      .WillRepeatedly(StaticAssertSingleArgument{});
+
+  EXPECT_EQ(17, mock.AsStdFunction()(0));
+  EXPECT_EQ(17, mock.AsStdFunction()(0));
+}
+
+struct ActionWithTemplatedConversionOperators {
+  template <typename... Args>
+  operator OnceAction<int(Args...)>() && {  // NOLINT
+    return [] { return 17; };
+  }
+
+  template <typename... Args>
+  operator Action<int(Args...)>() const {  // NOLINT
+    return [] { return 19; };
+  }
+};
+
+// It should be fine to hand both WillOnce and WillRepeatedly a function that
+// defines templated conversion operators to OnceAction and Action. WillOnce
+// should prefer the OnceAction version.
+TEST(MockMethodTest, ActionHasTemplatedConversionOperators) {
+  MockFunction<int()> mock;
+  EXPECT_CALL(mock, Call)
+      .WillOnce(ActionWithTemplatedConversionOperators{})
+      .WillRepeatedly(ActionWithTemplatedConversionOperators{});
+
+  EXPECT_EQ(17, mock.AsStdFunction()());
+  EXPECT_EQ(19, mock.AsStdFunction()());
+}
+
 // Tests for std::function based action.
 
 int Add(int val, int& ref, int* ptr) {  // NOLINT
@@ -1446,9 +2120,7 @@ struct Double {
   }
 };
 
-std::unique_ptr<int> UniqueInt(int i) {
-  return std::unique_ptr<int>(new int(i));
-}
+std::unique_ptr<int> UniqueInt(int i) { return std::make_unique<int>(i); }
 
 TEST(FunctorActionTest, ActionFromFunction) {
   Action<int(int, int&, int*)> a = &Add;
@@ -1552,10 +2224,10 @@ TEST(ActionMacro, LargeArity) {
                                    14, 15, 16, 17, 18, 19)));
 }
 
-}  // Unnamed namespace
+}  // namespace
+}  // namespace testing
 
-#ifdef _MSC_VER
-#if _MSC_VER == 1900
-#pragma warning(pop)
-#endif
+#if defined(_MSC_VER) && (_MSC_VER == 1900)
+GTEST_DISABLE_MSC_WARNINGS_POP_()  // 4800
 #endif
+GTEST_DISABLE_MSC_WARNINGS_POP_()  // 4100 4503
diff --git a/external/googletest/googlemock/test/gmock-cardinalities_test.cc b/external/googletest/googlemock/test/gmock-cardinalities_test.cc
index e7efd97d..ad49752e 100644
--- a/external/googletest/googlemock/test/gmock-cardinalities_test.cc
+++ b/external/googletest/googlemock/test/gmock-cardinalities_test.cc
@@ -31,6 +31,8 @@
 //
 // This file tests the built-in cardinalities.
 
+#include <ostream>
+
 #include "gmock/gmock.h"
 #include "gtest/gtest-spi.h"
 #include "gtest/gtest.h"
@@ -50,11 +52,12 @@ using testing::MakeCardinality;
 
 class MockFoo {
  public:
-  MockFoo() {}
+  MockFoo() = default;
   MOCK_METHOD0(Bar, int());  // NOLINT
 
  private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(MockFoo);
+  MockFoo(const MockFoo&) = delete;
+  MockFoo& operator=(const MockFoo&) = delete;
 };
 
 // Tests that Cardinality objects can be default constructed.
diff --git a/external/googletest/googlemock/test/gmock-function-mocker_test.cc b/external/googletest/googlemock/test/gmock-function-mocker_test.cc
index cf76fa99..cdac79b7 100644
--- a/external/googletest/googlemock/test/gmock-function-mocker_test.cc
+++ b/external/googletest/googlemock/test/gmock-function-mocker_test.cc
@@ -27,17 +27,19 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
 // Google Mock - a framework for writing C++ mock classes.
 //
 // This file tests the function mocker classes.
 #include "gmock/gmock-function-mocker.h"
 
-#if GTEST_OS_WINDOWS
+// Silence C4503 (decorated name length exceeded) for MSVC.
+GTEST_DISABLE_MSC_WARNINGS_PUSH_(4503)
+
+#ifdef GTEST_OS_WINDOWS
 // MSDN says the header file to be included for STDMETHOD is BaseTyps.h but
 // we are getting compiler errors if we use basetyps.h, hence including
 // objbase.h for definition of STDMETHOD.
-# include <objbase.h>
+#include <objbase.h>
 #endif  // GTEST_OS_WINDOWS
 
 #include <functional>
@@ -65,10 +67,10 @@ using testing::Return;
 using testing::ReturnRef;
 using testing::TypedEq;
 
-template<typename T>
+template <typename T>
 class TemplatedCopyable {
  public:
-  TemplatedCopyable() {}
+  TemplatedCopyable() = default;
 
   template <typename U>
   TemplatedCopyable(const U& other) {}  // NOLINT
@@ -76,13 +78,13 @@ class TemplatedCopyable {
 
 class FooInterface {
  public:
-  virtual ~FooInterface() {}
+  virtual ~FooInterface() = default;
 
   virtual void VoidReturning(int x) = 0;
 
   virtual int Nullary() = 0;
   virtual bool Unary(int x) = 0;
-  virtual long Binary(short x, int y) = 0;  // NOLINT
+  virtual long Binary(short x, int y) = 0;                     // NOLINT
   virtual int Decimal(bool b, char c, short d, int e, long f,  // NOLINT
                       float g, double h, unsigned i, char* j,
                       const std::string& k) = 0;
@@ -118,7 +120,7 @@ class FooInterface {
   virtual int RefQualifiedOverloaded() & = 0;
   virtual int RefQualifiedOverloaded() && = 0;
 
-#if GTEST_OS_WINDOWS
+#ifdef GTEST_OS_WINDOWS
   STDMETHOD_(int, CTNullary)() = 0;
   STDMETHOD_(bool, CTUnary)(int x) = 0;
   STDMETHOD_(int, CTDecimal)
@@ -132,13 +134,10 @@ class FooInterface {
 // significant in determining whether two virtual functions had the same
 // signature. This was fixed in Visual Studio 2008. However, the compiler
 // still emits a warning that alerts about this change in behavior.
-#ifdef _MSC_VER
-# pragma warning(push)
-# pragma warning(disable : 4373)
-#endif
+GTEST_DISABLE_MSC_WARNINGS_PUSH_(4373)
 class MockFoo : public FooInterface {
  public:
-  MockFoo() {}
+  MockFoo() = default;
 
   // Makes sure that a mock function parameter can be named.
   MOCK_METHOD(void, VoidReturning, (int n));  // NOLINT
@@ -179,7 +178,7 @@ class MockFoo : public FooInterface {
   MOCK_METHOD(int (*)(bool), ReturnsFunctionPointer1, (int), ());
   MOCK_METHOD(fn_ptr, ReturnsFunctionPointer2, (int), ());
 
-#if GTEST_OS_WINDOWS
+#ifdef GTEST_OS_WINDOWS
   MOCK_METHOD(int, CTNullary, (), (Calltype(STDMETHODCALLTYPE)));
   MOCK_METHOD(bool, CTUnary, (int), (Calltype(STDMETHODCALLTYPE)));
   MOCK_METHOD(int, CTDecimal,
@@ -203,12 +202,13 @@ class MockFoo : public FooInterface {
   MOCK_METHOD(int, RefQualifiedOverloaded, (), (ref(&&), override));
 
  private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(MockFoo);
+  MockFoo(const MockFoo&) = delete;
+  MockFoo& operator=(const MockFoo&) = delete;
 };
 
 class LegacyMockFoo : public FooInterface {
  public:
-  LegacyMockFoo() {}
+  LegacyMockFoo() = default;
 
   // Makes sure that a mock function parameter can be named.
   MOCK_METHOD1(VoidReturning, void(int n));  // NOLINT
@@ -248,7 +248,7 @@ class LegacyMockFoo : public FooInterface {
   MOCK_METHOD1(ReturnsFunctionPointer1, int (*(int))(bool));
   MOCK_METHOD1(ReturnsFunctionPointer2, fn_ptr(int));
 
-#if GTEST_OS_WINDOWS
+#ifdef GTEST_OS_WINDOWS
   MOCK_METHOD0_WITH_CALLTYPE(STDMETHODCALLTYPE, CTNullary, int());
   MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, CTUnary, bool(int));  // NOLINT
   MOCK_METHOD10_WITH_CALLTYPE(STDMETHODCALLTYPE, CTDecimal,
@@ -275,12 +275,11 @@ class LegacyMockFoo : public FooInterface {
   int RefQualifiedOverloaded() && override { return 0; }
 
  private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(LegacyMockFoo);
+  LegacyMockFoo(const LegacyMockFoo&) = delete;
+  LegacyMockFoo& operator=(const LegacyMockFoo&) = delete;
 };
 
-#ifdef _MSC_VER
-# pragma warning(pop)
-#endif
+GTEST_DISABLE_MSC_WARNINGS_POP_()  // 4373
 
 template <class T>
 class FunctionMockerTest : public testing::Test {
@@ -326,8 +325,8 @@ TYPED_TEST(FunctionMockerTest, MocksBinaryFunction) {
 
 // Tests mocking a decimal function.
 TYPED_TEST(FunctionMockerTest, MocksDecimalFunction) {
-  EXPECT_CALL(this->mock_foo_,
-              Decimal(true, 'a', 0, 0, 1L, A<float>(), Lt(100), 5U, NULL, "hi"))
+  EXPECT_CALL(this->mock_foo_, Decimal(true, 'a', 0, 0, 1L, A<float>(), Lt(100),
+                                       5U, nullptr, "hi"))
       .WillOnce(Return(5));
 
   EXPECT_EQ(5, this->foo_->Decimal(true, 'a', 0, 0, 1, 0, 0, 5, nullptr, "hi"));
@@ -405,7 +404,7 @@ TYPED_TEST(FunctionMockerTest, MocksTypeWithTemplatedCopyCtor) {
   EXPECT_TRUE(this->foo_->TypeWithTemplatedCopyCtor(TemplatedCopyable<int>()));
 }
 
-#if GTEST_OS_WINDOWS
+#ifdef GTEST_OS_WINDOWS
 // Tests mocking a nullary function with calltype.
 TYPED_TEST(FunctionMockerTest, MocksNullaryFunctionWithCallType) {
   EXPECT_CALL(this->mock_foo_, CTNullary())
@@ -488,22 +487,24 @@ TEST(FunctionMockerTest, RefQualified) {
 
 class MockB {
  public:
-  MockB() {}
+  MockB() = default;
 
   MOCK_METHOD(void, DoB, ());
 
  private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(MockB);
+  MockB(const MockB&) = delete;
+  MockB& operator=(const MockB&) = delete;
 };
 
 class LegacyMockB {
  public:
-  LegacyMockB() {}
+  LegacyMockB() = default;
 
   MOCK_METHOD0(DoB, void());
 
  private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(LegacyMockB);
+  LegacyMockB(const LegacyMockB&) = delete;
+  LegacyMockB& operator=(const LegacyMockB&) = delete;
 };
 
 template <typename T>
@@ -533,7 +534,7 @@ TYPED_TEST(ExpectCallTest, UnmentionedFunctionCanBeCalledAnyNumberOfTimes) {
 template <typename T>
 class StackInterface {
  public:
-  virtual ~StackInterface() {}
+  virtual ~StackInterface() = default;
 
   // Template parameter appears in function parameter.
   virtual void Push(const T& value) = 0;
@@ -546,7 +547,7 @@ class StackInterface {
 template <typename T>
 class MockStack : public StackInterface<T> {
  public:
-  MockStack() {}
+  MockStack() = default;
 
   MOCK_METHOD(void, Push, (const T& elem), ());
   MOCK_METHOD(void, Pop, (), (final));
@@ -558,13 +559,14 @@ class MockStack : public StackInterface<T> {
   MOCK_METHOD((std::map<int, int>), ReturnTypeWithComma, (int), (const));
 
  private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(MockStack);
+  MockStack(const MockStack&) = delete;
+  MockStack& operator=(const MockStack&) = delete;
 };
 
 template <typename T>
 class LegacyMockStack : public StackInterface<T> {
  public:
-  LegacyMockStack() {}
+  LegacyMockStack() = default;
 
   MOCK_METHOD1_T(Push, void(const T& elem));
   MOCK_METHOD0_T(Pop, void());
@@ -576,7 +578,8 @@ class LegacyMockStack : public StackInterface<T> {
   MOCK_CONST_METHOD1_T(ReturnTypeWithComma, std::map<int, int>(int));  // NOLINT
 
  private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(LegacyMockStack);
+  LegacyMockStack(const LegacyMockStack&) = delete;
+  LegacyMockStack& operator=(const LegacyMockStack&) = delete;
 };
 
 template <typename T>
@@ -595,10 +598,8 @@ TYPED_TEST(TemplateMockTest, Works) {
       .WillOnce(Return(0));
   EXPECT_CALL(mock, Push(_));
   int n = 5;
-  EXPECT_CALL(mock, GetTop())
-      .WillOnce(ReturnRef(n));
-  EXPECT_CALL(mock, Pop())
-      .Times(AnyNumber());
+  EXPECT_CALL(mock, GetTop()).WillOnce(ReturnRef(n));
+  EXPECT_CALL(mock, Pop()).Times(AnyNumber());
 
   EXPECT_EQ(0, mock.GetSize());
   mock.Push(5);
@@ -612,16 +613,14 @@ TYPED_TEST(TemplateMockTest, MethodWithCommaInReturnTypeWorks) {
   TypeParam mock;
 
   const std::map<int, int> a_map;
-  EXPECT_CALL(mock, ReturnTypeWithComma())
-      .WillOnce(Return(a_map));
-  EXPECT_CALL(mock, ReturnTypeWithComma(1))
-      .WillOnce(Return(a_map));
+  EXPECT_CALL(mock, ReturnTypeWithComma()).WillOnce(Return(a_map));
+  EXPECT_CALL(mock, ReturnTypeWithComma(1)).WillOnce(Return(a_map));
 
   EXPECT_EQ(a_map, mock.ReturnTypeWithComma());
   EXPECT_EQ(a_map, mock.ReturnTypeWithComma(1));
 }
 
-#if GTEST_OS_WINDOWS
+#ifdef GTEST_OS_WINDOWS
 // Tests mocking template interfaces with calltype.
 
 template <typename T>
@@ -650,7 +649,8 @@ class MockStackWithCallType : public StackInterfaceWithCallType<T> {
               (Calltype(STDMETHODCALLTYPE), override, const));
 
  private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(MockStackWithCallType);
+  MockStackWithCallType(const MockStackWithCallType&) = delete;
+  MockStackWithCallType& operator=(const MockStackWithCallType&) = delete;
 };
 
 template <typename T>
@@ -664,7 +664,9 @@ class LegacyMockStackWithCallType : public StackInterfaceWithCallType<T> {
   MOCK_CONST_METHOD0_T_WITH_CALLTYPE(STDMETHODCALLTYPE, GetTop, const T&());
 
  private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(LegacyMockStackWithCallType);
+  LegacyMockStackWithCallType(const LegacyMockStackWithCallType&) = delete;
+  LegacyMockStackWithCallType& operator=(const LegacyMockStackWithCallType&) =
+      delete;
 };
 
 template <typename T>
@@ -685,10 +687,8 @@ TYPED_TEST(TemplateMockTestWithCallType, Works) {
       .WillOnce(Return(0));
   EXPECT_CALL(mock, Push(_));
   int n = 5;
-  EXPECT_CALL(mock, GetTop())
-      .WillOnce(ReturnRef(n));
-  EXPECT_CALL(mock, Pop())
-      .Times(AnyNumber());
+  EXPECT_CALL(mock, GetTop()).WillOnce(ReturnRef(n));
+  EXPECT_CALL(mock, Pop()).Times(AnyNumber());
 
   EXPECT_EQ(0, mock.GetSize());
   mock.Push(5);
@@ -711,22 +711,27 @@ TYPED_TEST(TemplateMockTestWithCallType, Works) {
 
 class MockOverloadedOnArgNumber {
  public:
-  MockOverloadedOnArgNumber() {}
+  MockOverloadedOnArgNumber() = default;
 
   MY_MOCK_METHODS1_;
 
  private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(MockOverloadedOnArgNumber);
+  MockOverloadedOnArgNumber(const MockOverloadedOnArgNumber&) = delete;
+  MockOverloadedOnArgNumber& operator=(const MockOverloadedOnArgNumber&) =
+      delete;
 };
 
 class LegacyMockOverloadedOnArgNumber {
  public:
-  LegacyMockOverloadedOnArgNumber() {}
+  LegacyMockOverloadedOnArgNumber() = default;
 
   LEGACY_MY_MOCK_METHODS1_;
 
  private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(LegacyMockOverloadedOnArgNumber);
+  LegacyMockOverloadedOnArgNumber(const LegacyMockOverloadedOnArgNumber&) =
+      delete;
+  LegacyMockOverloadedOnArgNumber& operator=(
+      const LegacyMockOverloadedOnArgNumber&) = delete;
 };
 
 template <typename T>
@@ -747,18 +752,20 @@ TYPED_TEST(OverloadedMockMethodTest, CanOverloadOnArgNumberInMacroBody) {
   EXPECT_TRUE(mock.Overloaded(true, 1));
 }
 
-#define MY_MOCK_METHODS2_ \
-    MOCK_CONST_METHOD1(Overloaded, int(int n)); \
-    MOCK_METHOD1(Overloaded, int(int n))
+#define MY_MOCK_METHODS2_                     \
+  MOCK_CONST_METHOD1(Overloaded, int(int n)); \
+  MOCK_METHOD1(Overloaded, int(int n))
 
 class MockOverloadedOnConstness {
  public:
-  MockOverloadedOnConstness() {}
+  MockOverloadedOnConstness() = default;
 
   MY_MOCK_METHODS2_;
 
  private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(MockOverloadedOnConstness);
+  MockOverloadedOnConstness(const MockOverloadedOnConstness&) = delete;
+  MockOverloadedOnConstness& operator=(const MockOverloadedOnConstness&) =
+      delete;
 };
 
 TEST(MockMethodOverloadedMockMethodTest, CanOverloadOnConstnessInMacroBody) {
@@ -779,9 +786,7 @@ TEST(MockMethodMockFunctionTest, WorksForVoidNullary) {
 
 TEST(MockMethodMockFunctionTest, WorksForNonVoidNullary) {
   MockFunction<int()> foo;
-  EXPECT_CALL(foo, Call())
-      .WillOnce(Return(1))
-      .WillOnce(Return(2));
+  EXPECT_CALL(foo, Call()).WillOnce(Return(1)).WillOnce(Return(2));
   EXPECT_EQ(1, foo.Call());
   EXPECT_EQ(2, foo.Call());
 }
@@ -794,19 +799,17 @@ TEST(MockMethodMockFunctionTest, WorksForVoidUnary) {
 
 TEST(MockMethodMockFunctionTest, WorksForNonVoidBinary) {
   MockFunction<int(bool, int)> foo;
-  EXPECT_CALL(foo, Call(false, 42))
-      .WillOnce(Return(1))
-      .WillOnce(Return(2));
-  EXPECT_CALL(foo, Call(true, Ge(100)))
-      .WillOnce(Return(3));
+  EXPECT_CALL(foo, Call(false, 42)).WillOnce(Return(1)).WillOnce(Return(2));
+  EXPECT_CALL(foo, Call(true, Ge(100))).WillOnce(Return(3));
   EXPECT_EQ(1, foo.Call(false, 42));
   EXPECT_EQ(2, foo.Call(false, 42));
   EXPECT_EQ(3, foo.Call(true, 120));
 }
 
 TEST(MockMethodMockFunctionTest, WorksFor10Arguments) {
-  MockFunction<int(bool a0, char a1, int a2, int a3, int a4,
-                   int a5, int a6, char a7, int a8, bool a9)> foo;
+  MockFunction<int(bool a0, char a1, int a2, int a3, int a4, int a5, int a6,
+                   char a7, int a8, bool a9)>
+      foo;
   EXPECT_CALL(foo, Call(_, 'a', _, _, _, _, _, _, _, _))
       .WillOnce(Return(1))
       .WillOnce(Return(2));
@@ -816,9 +819,7 @@ TEST(MockMethodMockFunctionTest, WorksFor10Arguments) {
 
 TEST(MockMethodMockFunctionTest, AsStdFunction) {
   MockFunction<int(int)> foo;
-  auto call = [](const std::function<int(int)> &f, int i) {
-    return f(i);
-  };
+  auto call = [](const std::function<int(int)>& f, int i) { return f(i); };
   EXPECT_CALL(foo, Call(1)).WillOnce(Return(-1));
   EXPECT_CALL(foo, Call(2)).WillOnce(Return(-2));
   EXPECT_EQ(-1, call(foo.AsStdFunction(), 1));
@@ -836,10 +837,8 @@ TEST(MockMethodMockFunctionTest, AsStdFunctionReturnsReference) {
 }
 
 TEST(MockMethodMockFunctionTest, AsStdFunctionWithReferenceParameter) {
-  MockFunction<int(int &)> foo;
-  auto call = [](const std::function<int(int& )> &f, int &i) {
-    return f(i);
-  };
+  MockFunction<int(int&)> foo;
+  auto call = [](const std::function<int(int&)>& f, int& i) { return f(i); };
   int i = 42;
   EXPECT_CALL(foo, Call(i)).WillOnce(Return(-1));
   EXPECT_EQ(-1, call(foo.AsStdFunction(), i));
@@ -888,8 +887,7 @@ TYPED_TEST(
 }
 
 template <typename F>
-struct AlternateCallable {
-};
+struct AlternateCallable {};
 
 TYPED_TEST(MockMethodMockFunctionSignatureTest,
            IsMockFunctionTemplateArgumentDeducedForAlternateCallable) {
@@ -898,16 +896,14 @@ TYPED_TEST(MockMethodMockFunctionSignatureTest,
   EXPECT_TRUE(IsMockFunctionTemplateArgumentDeducedTo<TypeParam>(foo));
 }
 
-TYPED_TEST(
-    MockMethodMockFunctionSignatureTest,
-    IsMockFunctionCallMethodSignatureTheSameForAlternateCallable) {
+TYPED_TEST(MockMethodMockFunctionSignatureTest,
+           IsMockFunctionCallMethodSignatureTheSameForAlternateCallable) {
   using ForRawSignature = decltype(&MockFunction<TypeParam>::Call);
   using ForStdFunction =
       decltype(&MockFunction<std::function<TypeParam>>::Call);
   EXPECT_TRUE((std::is_same<ForRawSignature, ForStdFunction>::value));
 }
 
-
 struct MockMethodSizes0 {
   MOCK_METHOD(void, func, ());
 };
@@ -925,22 +921,21 @@ struct MockMethodSizes4 {
 };
 
 struct LegacyMockMethodSizes0 {
-    MOCK_METHOD0(func, void());
+  MOCK_METHOD0(func, void());
 };
 struct LegacyMockMethodSizes1 {
-    MOCK_METHOD1(func, void(int));
+  MOCK_METHOD1(func, void(int));
 };
 struct LegacyMockMethodSizes2 {
-    MOCK_METHOD2(func, void(int, int));
+  MOCK_METHOD2(func, void(int, int));
 };
 struct LegacyMockMethodSizes3 {
-    MOCK_METHOD3(func, void(int, int, int));
+  MOCK_METHOD3(func, void(int, int, int));
 };
 struct LegacyMockMethodSizes4 {
-    MOCK_METHOD4(func, void(int, int, int, int));
+  MOCK_METHOD4(func, void(int, int, int, int));
 };
 
-
 TEST(MockMethodMockFunctionTest, MockMethodSizeOverhead) {
   EXPECT_EQ(sizeof(MockMethodSizes0), sizeof(MockMethodSizes1));
   EXPECT_EQ(sizeof(MockMethodSizes0), sizeof(MockMethodSizes2));
@@ -955,6 +950,21 @@ TEST(MockMethodMockFunctionTest, MockMethodSizeOverhead) {
   EXPECT_EQ(sizeof(LegacyMockMethodSizes0), sizeof(MockMethodSizes0));
 }
 
+TEST(MockMethodMockFunctionTest, EnsureNoUnusedMemberFunction) {
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic error "-Wunused-member-function"
+#endif
+  // https://github.com/google/googletest/issues/4052
+  struct Foo {
+    MOCK_METHOD(void, foo, ());
+  };
+  EXPECT_CALL(Foo(), foo()).Times(0);
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+}
+
 void hasTwoParams(int, int);
 void MaybeThrows();
 void DoesntThrow() noexcept;
@@ -984,3 +994,5 @@ TEST(MockMethodMockFunctionTest, NoexceptSpecifierPreserved) {
 
 }  // namespace gmock_function_mocker_test
 }  // namespace testing
+
+GTEST_DISABLE_MSC_WARNINGS_POP_()  // 4503
diff --git a/external/googletest/googlemock/test/gmock-internal-utils_test.cc b/external/googletest/googlemock/test/gmock-internal-utils_test.cc
index 448a5eb6..6c769a88 100644
--- a/external/googletest/googlemock/test/gmock-internal-utils_test.cc
+++ b/external/googletest/googlemock/test/gmock-internal-utils_test.cc
@@ -40,6 +40,7 @@
 #include <memory>
 #include <sstream>
 #include <string>
+#include <tuple>
 #include <vector>
 
 #include "gmock/gmock.h"
@@ -56,7 +57,7 @@
 #include "src/gtest-internal-inl.h"
 #undef GTEST_IMPLEMENTATION_
 
-#if GTEST_OS_CYGWIN
+#ifdef GTEST_OS_CYGWIN
 #include <sys/types.h>  // For ssize_t. NOLINT
 #endif
 
@@ -69,24 +70,23 @@ namespace internal {
 
 namespace {
 
-TEST(JoinAsTupleTest, JoinsEmptyTuple) {
-  EXPECT_EQ("", JoinAsTuple(Strings()));
+TEST(JoinAsKeyValueTupleTest, JoinsEmptyTuple) {
+  EXPECT_EQ("", JoinAsKeyValueTuple({}, Strings()));
 }
 
-TEST(JoinAsTupleTest, JoinsOneTuple) {
-  const char* fields[] = {"1"};
-  EXPECT_EQ("1", JoinAsTuple(Strings(fields, fields + 1)));
+TEST(JoinAsKeyValueTupleTest, JoinsOneTuple) {
+  EXPECT_EQ("(a: 1)", JoinAsKeyValueTuple({"a"}, {"1"}));
 }
 
-TEST(JoinAsTupleTest, JoinsTwoTuple) {
-  const char* fields[] = {"1", "a"};
-  EXPECT_EQ("(1, a)", JoinAsTuple(Strings(fields, fields + 2)));
+TEST(JoinAsKeyValueTupleTest, JoinsTwoTuple) {
+  EXPECT_EQ("(a: 1, b: 2)", JoinAsKeyValueTuple({"a", "b"}, {"1", "2"}));
 }
 
-TEST(JoinAsTupleTest, JoinsTenTuple) {
-  const char* fields[] = {"1", "2", "3", "4", "5", "6", "7", "8", "9", "10"};
-  EXPECT_EQ("(1, 2, 3, 4, 5, 6, 7, 8, 9, 10)",
-            JoinAsTuple(Strings(fields, fields + 10)));
+TEST(JoinAsKeyValueTupleTest, JoinsTenTuple) {
+  EXPECT_EQ(
+      "(a: 1, b: 2, c: 3, d: 4, e: 5, f: 6, g: 7, h: 8, i: 9, j: 10)",
+      JoinAsKeyValueTuple({"a", "b", "c", "d", "e", "f", "g", "h", "i", "j"},
+                          {"1", "2", "3", "4", "5", "6", "7", "8", "9", "10"}));
 }
 
 TEST(ConvertIdentifierNameToWordsTest, WorksWhenNameContainsNoWord) {
@@ -139,6 +139,12 @@ TEST(GetRawPointerTest, WorksForRawPointers) {
   EXPECT_EQ(&n, GetRawPointer(&n));
 }
 
+TEST(GetRawPointerTest, WorksForStdReferenceWrapper) {
+  int n = 1;
+  EXPECT_EQ(&n, GetRawPointer(std::ref(n)));
+  EXPECT_EQ(&n, GetRawPointer(std::cref(n)));
+}
+
 // Tests KindOf<T>.
 
 class Base {};
@@ -162,7 +168,7 @@ TEST(KindOfTest, Integer) {
   EXPECT_EQ(kInteger, GMOCK_KIND_OF_(unsigned long long));  // NOLINT
   EXPECT_EQ(kInteger, GMOCK_KIND_OF_(wchar_t));             // NOLINT
   EXPECT_EQ(kInteger, GMOCK_KIND_OF_(size_t));              // NOLINT
-#if GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_CYGWIN
+#if defined(GTEST_OS_LINUX) || defined(GTEST_OS_MAC) || defined(GTEST_OS_CYGWIN)
   // ssize_t is not defined on Windows and possibly some other OSes.
   EXPECT_EQ(kInteger, GMOCK_KIND_OF_(ssize_t));  // NOLINT
 #endif
@@ -361,27 +367,27 @@ TEST(ExpectTest, FailsNonfatallyOnFalse) {
 
 class LogIsVisibleTest : public ::testing::Test {
  protected:
-  void SetUp() override { original_verbose_ = GMOCK_FLAG(verbose); }
+  void SetUp() override { original_verbose_ = GMOCK_FLAG_GET(verbose); }
 
-  void TearDown() override { GMOCK_FLAG(verbose) = original_verbose_; }
+  void TearDown() override { GMOCK_FLAG_SET(verbose, original_verbose_); }
 
   std::string original_verbose_;
 };
 
 TEST_F(LogIsVisibleTest, AlwaysReturnsTrueIfVerbosityIsInfo) {
-  GMOCK_FLAG(verbose) = kInfoVerbosity;
+  GMOCK_FLAG_SET(verbose, kInfoVerbosity);
   EXPECT_TRUE(LogIsVisible(kInfo));
   EXPECT_TRUE(LogIsVisible(kWarning));
 }
 
 TEST_F(LogIsVisibleTest, AlwaysReturnsFalseIfVerbosityIsError) {
-  GMOCK_FLAG(verbose) = kErrorVerbosity;
+  GMOCK_FLAG_SET(verbose, kErrorVerbosity);
   EXPECT_FALSE(LogIsVisible(kInfo));
   EXPECT_FALSE(LogIsVisible(kWarning));
 }
 
 TEST_F(LogIsVisibleTest, WorksWhenVerbosityIsWarning) {
-  GMOCK_FLAG(verbose) = kWarningVerbosity;
+  GMOCK_FLAG_SET(verbose, kWarningVerbosity);
   EXPECT_FALSE(LogIsVisible(kInfo));
   EXPECT_TRUE(LogIsVisible(kWarning));
 }
@@ -394,8 +400,8 @@ TEST_F(LogIsVisibleTest, WorksWhenVerbosityIsWarning) {
 // and log severity.
 void TestLogWithSeverity(const std::string& verbosity, LogSeverity severity,
                          bool should_print) {
-  const std::string old_flag = GMOCK_FLAG(verbose);
-  GMOCK_FLAG(verbose) = verbosity;
+  const std::string old_flag = GMOCK_FLAG_GET(verbose);
+  GMOCK_FLAG_SET(verbose, verbosity);
   CaptureStdout();
   Log(severity, "Test log.\n", 0);
   if (should_print) {
@@ -407,18 +413,18 @@ void TestLogWithSeverity(const std::string& verbosity, LogSeverity severity,
   } else {
     EXPECT_STREQ("", GetCapturedStdout().c_str());
   }
-  GMOCK_FLAG(verbose) = old_flag;
+  GMOCK_FLAG_SET(verbose, old_flag);
 }
 
 // Tests that when the stack_frames_to_skip parameter is negative,
 // Log() doesn't include the stack trace in the output.
 TEST(LogTest, NoStackTraceWhenStackFramesToSkipIsNegative) {
-  const std::string saved_flag = GMOCK_FLAG(verbose);
-  GMOCK_FLAG(verbose) = kInfoVerbosity;
+  const std::string saved_flag = GMOCK_FLAG_GET(verbose);
+  GMOCK_FLAG_SET(verbose, kInfoVerbosity);
   CaptureStdout();
   Log(kInfo, "Test log.\n", -1);
   EXPECT_STREQ("\nTest log.\n", GetCapturedStdout().c_str());
-  GMOCK_FLAG(verbose) = saved_flag;
+  GMOCK_FLAG_SET(verbose, saved_flag);
 }
 
 struct MockStackTraceGetter : testing::internal::OsStackTraceGetterInterface {
@@ -440,7 +446,8 @@ TEST(LogTest, NoSkippingStackFrameInOptMode) {
   const std::string log = GetCapturedStdout();
 
   std::string expected_trace =
-      (testing::Message() << GTEST_FLAG(stack_trace_depth) << "::").GetString();
+      (testing::Message() << GTEST_FLAG_GET(stack_trace_depth) << "::")
+          .GetString();
   std::string expected_message =
       "\nGMOCK WARNING:\n"
       "Test log.\n"
@@ -498,11 +505,11 @@ TEST(LogTest, OnlyWarningsArePrintedWhenVerbosityIsInvalid) {
 // Verifies that Log() behaves correctly for the given verbosity level
 // and log severity.
 std::string GrabOutput(void (*logger)(), const char* verbosity) {
-  const std::string saved_flag = GMOCK_FLAG(verbose);
-  GMOCK_FLAG(verbose) = verbosity;
+  const std::string saved_flag = GMOCK_FLAG_GET(verbose);
+  GMOCK_FLAG_SET(verbose, verbosity);
   CaptureStdout();
   logger();
-  GMOCK_FLAG(verbose) = saved_flag;
+  GMOCK_FLAG_SET(verbose, saved_flag);
   return GetCapturedStdout();
 }
 
@@ -714,6 +721,46 @@ TEST(FunctionTest, LongArgumentList) {
                    F::MakeResultIgnoredValue>::value));
 }
 
+TEST(Base64Unescape, InvalidString) {
+  std::string unescaped;
+  EXPECT_FALSE(Base64Unescape("(invalid)", &unescaped));
+}
+
+TEST(Base64Unescape, ShortString) {
+  std::string unescaped;
+  EXPECT_TRUE(Base64Unescape("SGVsbG8gd29ybGQh", &unescaped));
+  EXPECT_EQ("Hello world!", unescaped);
+}
+
+TEST(Base64Unescape, ShortStringWithPadding) {
+  std::string unescaped;
+  EXPECT_TRUE(Base64Unescape("SGVsbG8gd29ybGQ=", &unescaped));
+  EXPECT_EQ("Hello world", unescaped);
+}
+
+TEST(Base64Unescape, ShortStringWithoutPadding) {
+  std::string unescaped;
+  EXPECT_TRUE(Base64Unescape("SGVsbG8gd29ybGQ", &unescaped));
+  EXPECT_EQ("Hello world", unescaped);
+}
+
+TEST(Base64Unescape, LongStringWithWhiteSpaces) {
+  std::string escaped =
+      R"(TWFuIGlzIGRpc3Rpbmd1aXNoZWQsIG5vdCBvbmx5IGJ5IGhpcyByZWFzb24sIGJ1dCBieSB0aGlz
+  IHNpbmd1bGFyIHBhc3Npb24gZnJvbSBvdGhlciBhbmltYWxzLCB3aGljaCBpcyBhIGx1c3Qgb2Yg
+  dGhlIG1pbmQsIHRoYXQgYnkgYSBwZXJzZXZlcmFuY2Ugb2YgZGVsaWdodCBpbiB0aGUgY29udGlu
+  dWVkIGFuZCBpbmRlZmF0aWdhYmxlIGdlbmVyYXRpb24gb2Yga25vd2xlZGdlLCBleGNlZWRzIHRo
+  ZSBzaG9ydCB2ZWhlbWVuY2Ugb2YgYW55IGNhcm5hbCBwbGVhc3VyZS4=)";
+  std::string expected =
+      "Man is distinguished, not only by his reason, but by this singular "
+      "passion from other animals, which is a lust of the mind, that by a "
+      "perseverance of delight in the continued and indefatigable generation "
+      "of knowledge, exceeds the short vehemence of any carnal pleasure.";
+  std::string unescaped;
+  EXPECT_TRUE(Base64Unescape(escaped, &unescaped));
+  EXPECT_EQ(expected, unescaped);
+}
+
 }  // namespace
 }  // namespace internal
 }  // namespace testing
diff --git a/external/googletest/googlemock/test/gmock-matchers-arithmetic_test.cc b/external/googletest/googlemock/test/gmock-matchers-arithmetic_test.cc
new file mode 100644
index 00000000..b6c35119
--- /dev/null
+++ b/external/googletest/googlemock/test/gmock-matchers-arithmetic_test.cc
@@ -0,0 +1,1699 @@
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Google Mock - a framework for writing C++ mock classes.
+//
+// This file tests some commonly used argument matchers.
+
+#include <cmath>
+#include <limits>
+#include <memory>
+#include <ostream>
+#include <string>
+
+#include "gmock/gmock.h"
+#include "test/gmock-matchers_test.h"
+#include "gtest/gtest.h"
+
+// Silence warning C4244: 'initializing': conversion from 'int' to 'short',
+// possible loss of data and C4100, unreferenced local parameter
+GTEST_DISABLE_MSC_WARNINGS_PUSH_(4244 4100)
+
+namespace testing {
+namespace gmock_matchers_test {
+namespace {
+
+typedef ::std::tuple<long, int> Tuple2;  // NOLINT
+
+// Tests that Eq() matches a 2-tuple where the first field == the
+// second field.
+TEST(Eq2Test, MatchesEqualArguments) {
+  Matcher<const Tuple2&> m = Eq();
+  EXPECT_TRUE(m.Matches(Tuple2(5L, 5)));
+  EXPECT_FALSE(m.Matches(Tuple2(5L, 6)));
+}
+
+// Tests that Eq() describes itself properly.
+TEST(Eq2Test, CanDescribeSelf) {
+  Matcher<const Tuple2&> m = Eq();
+  EXPECT_EQ("are an equal pair", Describe(m));
+}
+
+// Tests that Ge() matches a 2-tuple where the first field >= the
+// second field.
+TEST(Ge2Test, MatchesGreaterThanOrEqualArguments) {
+  Matcher<const Tuple2&> m = Ge();
+  EXPECT_TRUE(m.Matches(Tuple2(5L, 4)));
+  EXPECT_TRUE(m.Matches(Tuple2(5L, 5)));
+  EXPECT_FALSE(m.Matches(Tuple2(5L, 6)));
+}
+
+// Tests that Ge() describes itself properly.
+TEST(Ge2Test, CanDescribeSelf) {
+  Matcher<const Tuple2&> m = Ge();
+  EXPECT_EQ("are a pair where the first >= the second", Describe(m));
+}
+
+// Tests that Gt() matches a 2-tuple where the first field > the
+// second field.
+TEST(Gt2Test, MatchesGreaterThanArguments) {
+  Matcher<const Tuple2&> m = Gt();
+  EXPECT_TRUE(m.Matches(Tuple2(5L, 4)));
+  EXPECT_FALSE(m.Matches(Tuple2(5L, 5)));
+  EXPECT_FALSE(m.Matches(Tuple2(5L, 6)));
+}
+
+// Tests that Gt() describes itself properly.
+TEST(Gt2Test, CanDescribeSelf) {
+  Matcher<const Tuple2&> m = Gt();
+  EXPECT_EQ("are a pair where the first > the second", Describe(m));
+}
+
+// Tests that Le() matches a 2-tuple where the first field <= the
+// second field.
+TEST(Le2Test, MatchesLessThanOrEqualArguments) {
+  Matcher<const Tuple2&> m = Le();
+  EXPECT_TRUE(m.Matches(Tuple2(5L, 6)));
+  EXPECT_TRUE(m.Matches(Tuple2(5L, 5)));
+  EXPECT_FALSE(m.Matches(Tuple2(5L, 4)));
+}
+
+// Tests that Le() describes itself properly.
+TEST(Le2Test, CanDescribeSelf) {
+  Matcher<const Tuple2&> m = Le();
+  EXPECT_EQ("are a pair where the first <= the second", Describe(m));
+}
+
+// Tests that Lt() matches a 2-tuple where the first field < the
+// second field.
+TEST(Lt2Test, MatchesLessThanArguments) {
+  Matcher<const Tuple2&> m = Lt();
+  EXPECT_TRUE(m.Matches(Tuple2(5L, 6)));
+  EXPECT_FALSE(m.Matches(Tuple2(5L, 5)));
+  EXPECT_FALSE(m.Matches(Tuple2(5L, 4)));
+}
+
+// Tests that Lt() describes itself properly.
+TEST(Lt2Test, CanDescribeSelf) {
+  Matcher<const Tuple2&> m = Lt();
+  EXPECT_EQ("are a pair where the first < the second", Describe(m));
+}
+
+// Tests that Ne() matches a 2-tuple where the first field != the
+// second field.
+TEST(Ne2Test, MatchesUnequalArguments) {
+  Matcher<const Tuple2&> m = Ne();
+  EXPECT_TRUE(m.Matches(Tuple2(5L, 6)));
+  EXPECT_TRUE(m.Matches(Tuple2(5L, 4)));
+  EXPECT_FALSE(m.Matches(Tuple2(5L, 5)));
+}
+
+// Tests that Ne() describes itself properly.
+TEST(Ne2Test, CanDescribeSelf) {
+  Matcher<const Tuple2&> m = Ne();
+  EXPECT_EQ("are an unequal pair", Describe(m));
+}
+
+TEST(PairMatchBaseTest, WorksWithMoveOnly) {
+  using Pointers = std::tuple<std::unique_ptr<int>, std::unique_ptr<int>>;
+  Matcher<Pointers> matcher = Eq();
+  Pointers pointers;
+  // Tested values don't matter; the point is that matcher does not copy the
+  // matched values.
+  EXPECT_TRUE(matcher.Matches(pointers));
+}
+
+// Tests that IsNan() matches a NaN, with float.
+TEST(IsNan, FloatMatchesNan) {
+  float quiet_nan = std::numeric_limits<float>::quiet_NaN();
+  float other_nan = std::nanf("1");
+  float real_value = 1.0f;
+
+  Matcher<float> m = IsNan();
+  EXPECT_TRUE(m.Matches(quiet_nan));
+  EXPECT_TRUE(m.Matches(other_nan));
+  EXPECT_FALSE(m.Matches(real_value));
+
+  Matcher<float&> m_ref = IsNan();
+  EXPECT_TRUE(m_ref.Matches(quiet_nan));
+  EXPECT_TRUE(m_ref.Matches(other_nan));
+  EXPECT_FALSE(m_ref.Matches(real_value));
+
+  Matcher<const float&> m_cref = IsNan();
+  EXPECT_TRUE(m_cref.Matches(quiet_nan));
+  EXPECT_TRUE(m_cref.Matches(other_nan));
+  EXPECT_FALSE(m_cref.Matches(real_value));
+}
+
+// Tests that IsNan() matches a NaN, with double.
+TEST(IsNan, DoubleMatchesNan) {
+  double quiet_nan = std::numeric_limits<double>::quiet_NaN();
+  double other_nan = std::nan("1");
+  double real_value = 1.0;
+
+  Matcher<double> m = IsNan();
+  EXPECT_TRUE(m.Matches(quiet_nan));
+  EXPECT_TRUE(m.Matches(other_nan));
+  EXPECT_FALSE(m.Matches(real_value));
+
+  Matcher<double&> m_ref = IsNan();
+  EXPECT_TRUE(m_ref.Matches(quiet_nan));
+  EXPECT_TRUE(m_ref.Matches(other_nan));
+  EXPECT_FALSE(m_ref.Matches(real_value));
+
+  Matcher<const double&> m_cref = IsNan();
+  EXPECT_TRUE(m_cref.Matches(quiet_nan));
+  EXPECT_TRUE(m_cref.Matches(other_nan));
+  EXPECT_FALSE(m_cref.Matches(real_value));
+}
+
+// Tests that IsNan() matches a NaN, with long double.
+TEST(IsNan, LongDoubleMatchesNan) {
+  long double quiet_nan = std::numeric_limits<long double>::quiet_NaN();
+  long double other_nan = std::nan("1");
+  long double real_value = 1.0;
+
+  Matcher<long double> m = IsNan();
+  EXPECT_TRUE(m.Matches(quiet_nan));
+  EXPECT_TRUE(m.Matches(other_nan));
+  EXPECT_FALSE(m.Matches(real_value));
+
+  Matcher<long double&> m_ref = IsNan();
+  EXPECT_TRUE(m_ref.Matches(quiet_nan));
+  EXPECT_TRUE(m_ref.Matches(other_nan));
+  EXPECT_FALSE(m_ref.Matches(real_value));
+
+  Matcher<const long double&> m_cref = IsNan();
+  EXPECT_TRUE(m_cref.Matches(quiet_nan));
+  EXPECT_TRUE(m_cref.Matches(other_nan));
+  EXPECT_FALSE(m_cref.Matches(real_value));
+}
+
+// Tests that IsNan() works with Not.
+TEST(IsNan, NotMatchesNan) {
+  Matcher<float> mf = Not(IsNan());
+  EXPECT_FALSE(mf.Matches(std::numeric_limits<float>::quiet_NaN()));
+  EXPECT_FALSE(mf.Matches(std::nanf("1")));
+  EXPECT_TRUE(mf.Matches(1.0));
+
+  Matcher<double> md = Not(IsNan());
+  EXPECT_FALSE(md.Matches(std::numeric_limits<double>::quiet_NaN()));
+  EXPECT_FALSE(md.Matches(std::nan("1")));
+  EXPECT_TRUE(md.Matches(1.0));
+
+  Matcher<long double> mld = Not(IsNan());
+  EXPECT_FALSE(mld.Matches(std::numeric_limits<long double>::quiet_NaN()));
+  EXPECT_FALSE(mld.Matches(std::nanl("1")));
+  EXPECT_TRUE(mld.Matches(1.0));
+}
+
+// Tests that IsNan() can describe itself.
+TEST(IsNan, CanDescribeSelf) {
+  Matcher<float> mf = IsNan();
+  EXPECT_EQ("is NaN", Describe(mf));
+
+  Matcher<double> md = IsNan();
+  EXPECT_EQ("is NaN", Describe(md));
+
+  Matcher<long double> mld = IsNan();
+  EXPECT_EQ("is NaN", Describe(mld));
+}
+
+// Tests that IsNan() can describe itself with Not.
+TEST(IsNan, CanDescribeSelfWithNot) {
+  Matcher<float> mf = Not(IsNan());
+  EXPECT_EQ("isn't NaN", Describe(mf));
+
+  Matcher<double> md = Not(IsNan());
+  EXPECT_EQ("isn't NaN", Describe(md));
+
+  Matcher<long double> mld = Not(IsNan());
+  EXPECT_EQ("isn't NaN", Describe(mld));
+}
+
+// Tests that FloatEq() matches a 2-tuple where
+// FloatEq(first field) matches the second field.
+TEST(FloatEq2Test, MatchesEqualArguments) {
+  typedef ::std::tuple<float, float> Tpl;
+  Matcher<const Tpl&> m = FloatEq();
+  EXPECT_TRUE(m.Matches(Tpl(1.0f, 1.0f)));
+  EXPECT_TRUE(m.Matches(Tpl(0.3f, 0.1f + 0.1f + 0.1f)));
+  EXPECT_FALSE(m.Matches(Tpl(1.1f, 1.0f)));
+}
+
+// Tests that FloatEq() describes itself properly.
+TEST(FloatEq2Test, CanDescribeSelf) {
+  Matcher<const ::std::tuple<float, float>&> m = FloatEq();
+  EXPECT_EQ("are an almost-equal pair", Describe(m));
+}
+
+// Tests that NanSensitiveFloatEq() matches a 2-tuple where
+// NanSensitiveFloatEq(first field) matches the second field.
+TEST(NanSensitiveFloatEqTest, MatchesEqualArgumentsWithNaN) {
+  typedef ::std::tuple<float, float> Tpl;
+  Matcher<const Tpl&> m = NanSensitiveFloatEq();
+  EXPECT_TRUE(m.Matches(Tpl(1.0f, 1.0f)));
+  EXPECT_TRUE(m.Matches(Tpl(std::numeric_limits<float>::quiet_NaN(),
+                            std::numeric_limits<float>::quiet_NaN())));
+  EXPECT_FALSE(m.Matches(Tpl(1.1f, 1.0f)));
+  EXPECT_FALSE(m.Matches(Tpl(1.0f, std::numeric_limits<float>::quiet_NaN())));
+  EXPECT_FALSE(m.Matches(Tpl(std::numeric_limits<float>::quiet_NaN(), 1.0f)));
+}
+
+// Tests that NanSensitiveFloatEq() describes itself properly.
+TEST(NanSensitiveFloatEqTest, CanDescribeSelfWithNaNs) {
+  Matcher<const ::std::tuple<float, float>&> m = NanSensitiveFloatEq();
+  EXPECT_EQ("are an almost-equal pair", Describe(m));
+}
+
+// Tests that DoubleEq() matches a 2-tuple where
+// DoubleEq(first field) matches the second field.
+TEST(DoubleEq2Test, MatchesEqualArguments) {
+  typedef ::std::tuple<double, double> Tpl;
+  Matcher<const Tpl&> m = DoubleEq();
+  EXPECT_TRUE(m.Matches(Tpl(1.0, 1.0)));
+  EXPECT_TRUE(m.Matches(Tpl(0.3, 0.1 + 0.1 + 0.1)));
+  EXPECT_FALSE(m.Matches(Tpl(1.1, 1.0)));
+}
+
+// Tests that DoubleEq() describes itself properly.
+TEST(DoubleEq2Test, CanDescribeSelf) {
+  Matcher<const ::std::tuple<double, double>&> m = DoubleEq();
+  EXPECT_EQ("are an almost-equal pair", Describe(m));
+}
+
+// Tests that NanSensitiveDoubleEq() matches a 2-tuple where
+// NanSensitiveDoubleEq(first field) matches the second field.
+TEST(NanSensitiveDoubleEqTest, MatchesEqualArgumentsWithNaN) {
+  typedef ::std::tuple<double, double> Tpl;
+  Matcher<const Tpl&> m = NanSensitiveDoubleEq();
+  EXPECT_TRUE(m.Matches(Tpl(1.0f, 1.0f)));
+  EXPECT_TRUE(m.Matches(Tpl(std::numeric_limits<double>::quiet_NaN(),
+                            std::numeric_limits<double>::quiet_NaN())));
+  EXPECT_FALSE(m.Matches(Tpl(1.1f, 1.0f)));
+  EXPECT_FALSE(m.Matches(Tpl(1.0f, std::numeric_limits<double>::quiet_NaN())));
+  EXPECT_FALSE(m.Matches(Tpl(std::numeric_limits<double>::quiet_NaN(), 1.0f)));
+}
+
+// Tests that DoubleEq() describes itself properly.
+TEST(NanSensitiveDoubleEqTest, CanDescribeSelfWithNaNs) {
+  Matcher<const ::std::tuple<double, double>&> m = NanSensitiveDoubleEq();
+  EXPECT_EQ("are an almost-equal pair", Describe(m));
+}
+
+// Tests that FloatEq() matches a 2-tuple where
+// FloatNear(first field, max_abs_error) matches the second field.
+TEST(FloatNear2Test, MatchesEqualArguments) {
+  typedef ::std::tuple<float, float> Tpl;
+  Matcher<const Tpl&> m = FloatNear(0.5f);
+  EXPECT_TRUE(m.Matches(Tpl(1.0f, 1.0f)));
+  EXPECT_TRUE(m.Matches(Tpl(1.3f, 1.0f)));
+  EXPECT_FALSE(m.Matches(Tpl(1.8f, 1.0f)));
+}
+
+// Tests that FloatNear() describes itself properly.
+TEST(FloatNear2Test, CanDescribeSelf) {
+  Matcher<const ::std::tuple<float, float>&> m = FloatNear(0.5f);
+  EXPECT_EQ("are an almost-equal pair", Describe(m));
+}
+
+// Tests that NanSensitiveFloatNear() matches a 2-tuple where
+// NanSensitiveFloatNear(first field) matches the second field.
+TEST(NanSensitiveFloatNearTest, MatchesNearbyArgumentsWithNaN) {
+  typedef ::std::tuple<float, float> Tpl;
+  Matcher<const Tpl&> m = NanSensitiveFloatNear(0.5f);
+  EXPECT_TRUE(m.Matches(Tpl(1.0f, 1.0f)));
+  EXPECT_TRUE(m.Matches(Tpl(1.1f, 1.0f)));
+  EXPECT_TRUE(m.Matches(Tpl(std::numeric_limits<float>::quiet_NaN(),
+                            std::numeric_limits<float>::quiet_NaN())));
+  EXPECT_FALSE(m.Matches(Tpl(1.6f, 1.0f)));
+  EXPECT_FALSE(m.Matches(Tpl(1.0f, std::numeric_limits<float>::quiet_NaN())));
+  EXPECT_FALSE(m.Matches(Tpl(std::numeric_limits<float>::quiet_NaN(), 1.0f)));
+}
+
+// Tests that NanSensitiveFloatNear() describes itself properly.
+TEST(NanSensitiveFloatNearTest, CanDescribeSelfWithNaNs) {
+  Matcher<const ::std::tuple<float, float>&> m = NanSensitiveFloatNear(0.5f);
+  EXPECT_EQ("are an almost-equal pair", Describe(m));
+}
+
+// Tests that FloatEq() matches a 2-tuple where
+// DoubleNear(first field, max_abs_error) matches the second field.
+TEST(DoubleNear2Test, MatchesEqualArguments) {
+  typedef ::std::tuple<double, double> Tpl;
+  Matcher<const Tpl&> m = DoubleNear(0.5);
+  EXPECT_TRUE(m.Matches(Tpl(1.0, 1.0)));
+  EXPECT_TRUE(m.Matches(Tpl(1.3, 1.0)));
+  EXPECT_FALSE(m.Matches(Tpl(1.8, 1.0)));
+}
+
+// Tests that DoubleNear() describes itself properly.
+TEST(DoubleNear2Test, CanDescribeSelf) {
+  Matcher<const ::std::tuple<double, double>&> m = DoubleNear(0.5);
+  EXPECT_EQ("are an almost-equal pair", Describe(m));
+}
+
+// Tests that NanSensitiveDoubleNear() matches a 2-tuple where
+// NanSensitiveDoubleNear(first field) matches the second field.
+TEST(NanSensitiveDoubleNearTest, MatchesNearbyArgumentsWithNaN) {
+  typedef ::std::tuple<double, double> Tpl;
+  Matcher<const Tpl&> m = NanSensitiveDoubleNear(0.5f);
+  EXPECT_TRUE(m.Matches(Tpl(1.0f, 1.0f)));
+  EXPECT_TRUE(m.Matches(Tpl(1.1f, 1.0f)));
+  EXPECT_TRUE(m.Matches(Tpl(std::numeric_limits<double>::quiet_NaN(),
+                            std::numeric_limits<double>::quiet_NaN())));
+  EXPECT_FALSE(m.Matches(Tpl(1.6f, 1.0f)));
+  EXPECT_FALSE(m.Matches(Tpl(1.0f, std::numeric_limits<double>::quiet_NaN())));
+  EXPECT_FALSE(m.Matches(Tpl(std::numeric_limits<double>::quiet_NaN(), 1.0f)));
+}
+
+// Tests that NanSensitiveDoubleNear() describes itself properly.
+TEST(NanSensitiveDoubleNearTest, CanDescribeSelfWithNaNs) {
+  Matcher<const ::std::tuple<double, double>&> m = NanSensitiveDoubleNear(0.5f);
+  EXPECT_EQ("are an almost-equal pair", Describe(m));
+}
+
+// Tests that DistanceFrom() can describe itself properly.
+TEST(DistanceFrom, CanDescribeSelf) {
+  Matcher<double> m = DistanceFrom(1.5, Lt(0.1));
+  EXPECT_EQ(Describe(m), "is < 0.1 away from 1.5");
+
+  m = DistanceFrom(2.5, Gt(0.2));
+  EXPECT_EQ(Describe(m), "is > 0.2 away from 2.5");
+}
+
+// Tests that DistanceFrom() can explain match failure.
+TEST(DistanceFrom, CanExplainMatchFailure) {
+  Matcher<double> m = DistanceFrom(1.5, Lt(0.1));
+  EXPECT_EQ(Explain(m, 2.0), "which is 0.5 away from 1.5");
+}
+
+// Tests that DistanceFrom() matches a double that is within the given range of
+// the given value.
+TEST(DistanceFrom, MatchesDoubleWithinRange) {
+  const Matcher<double> m = DistanceFrom(0.5, Le(0.1));
+  EXPECT_TRUE(m.Matches(0.45));
+  EXPECT_TRUE(m.Matches(0.5));
+  EXPECT_TRUE(m.Matches(0.55));
+  EXPECT_FALSE(m.Matches(0.39));
+  EXPECT_FALSE(m.Matches(0.61));
+}
+
+// Tests that DistanceFrom() matches a double reference that is within the given
+// range of the given value.
+TEST(DistanceFrom, MatchesDoubleRefWithinRange) {
+  const Matcher<const double&> m = DistanceFrom(0.5, Le(0.1));
+  EXPECT_TRUE(m.Matches(0.45));
+  EXPECT_TRUE(m.Matches(0.5));
+  EXPECT_TRUE(m.Matches(0.55));
+  EXPECT_FALSE(m.Matches(0.39));
+  EXPECT_FALSE(m.Matches(0.61));
+}
+
+// Tests that DistanceFrom() can be implicitly converted to a matcher depending
+// on the type of the argument.
+TEST(DistanceFrom, CanBeImplicitlyConvertedToMatcher) {
+  EXPECT_THAT(0.58, DistanceFrom(0.5, Le(0.1)));
+  EXPECT_THAT(0.2, Not(DistanceFrom(0.5, Le(0.1))));
+
+  EXPECT_THAT(0.58f, DistanceFrom(0.5f, Le(0.1f)));
+  EXPECT_THAT(0.7f, Not(DistanceFrom(0.5f, Le(0.1f))));
+}
+
+// Tests that DistanceFrom() can be used on compatible types (i.e. not
+// everything has to be of the same type).
+TEST(DistanceFrom, CanBeUsedOnCompatibleTypes) {
+  EXPECT_THAT(0.58, DistanceFrom(0.5, Le(0.1f)));
+  EXPECT_THAT(0.2, Not(DistanceFrom(0.5, Le(0.1f))));
+
+  EXPECT_THAT(0.58, DistanceFrom(0.5f, Le(0.1)));
+  EXPECT_THAT(0.2, Not(DistanceFrom(0.5f, Le(0.1))));
+
+  EXPECT_THAT(0.58, DistanceFrom(0.5f, Le(0.1f)));
+  EXPECT_THAT(0.2, Not(DistanceFrom(0.5f, Le(0.1f))));
+
+  EXPECT_THAT(0.58f, DistanceFrom(0.5, Le(0.1)));
+  EXPECT_THAT(0.2f, Not(DistanceFrom(0.5, Le(0.1))));
+
+  EXPECT_THAT(0.58f, DistanceFrom(0.5, Le(0.1f)));
+  EXPECT_THAT(0.2f, Not(DistanceFrom(0.5, Le(0.1f))));
+
+  EXPECT_THAT(0.58f, DistanceFrom(0.5f, Le(0.1)));
+  EXPECT_THAT(0.2f, Not(DistanceFrom(0.5f, Le(0.1))));
+}
+
+// A 2-dimensional point. For testing using DistanceFrom() with a custom type
+// that doesn't have a built-in distance function.
+class Point {
+ public:
+  Point(double x, double y) : x_(x), y_(y) {}
+  double x() const { return x_; }
+  double y() const { return y_; }
+
+ private:
+  double x_;
+  double y_;
+};
+
+// Returns the distance between two points.
+double PointDistance(const Point& lhs, const Point& rhs) {
+  return std::sqrt(std::pow(lhs.x() - rhs.x(), 2) +
+                   std::pow(lhs.y() - rhs.y(), 2));
+}
+
+// Tests that DistanceFrom() can be used on a type with a custom distance
+// function.
+TEST(DistanceFrom, CanBeUsedOnTypeWithCustomDistanceFunction) {
+  const Matcher<Point> m =
+      DistanceFrom(Point(0.5, 0.5), PointDistance, Le(0.1));
+  EXPECT_THAT(Point(0.45, 0.45), m);
+  EXPECT_THAT(Point(0.2, 0.45), Not(m));
+}
+
+// A wrapper around a double value. For testing using DistanceFrom() with a
+// custom type that has neither a built-in distance function nor a built-in
+// distance comparator.
+class Double {
+ public:
+  explicit Double(double value) : value_(value) {}
+  Double(const Double& other) = default;
+  double value() const { return value_; }
+
+  // Defines how to print a Double value. We don't use the AbslStringify API
+  // because googletest doesn't require absl yet.
+  friend void PrintTo(const Double& value, std::ostream* os) {
+    *os << "Double(" << value.value() << ")";
+  }
+
+ private:
+  double value_;
+};
+
+// Returns the distance between two Double values.
+Double DoubleDistance(Double lhs, Double rhs) {
+  return Double(std::abs(lhs.value() - rhs.value()));
+}
+
+MATCHER_P(DoubleLe, rhs, (negation ? "is > " : "is <= ") + PrintToString(rhs)) {
+  return arg.value() <= rhs.value();
+}
+
+// Tests that DistanceFrom() can describe itself properly for a type with a
+// custom printer.
+TEST(DistanceFrom, CanDescribeWithCustomPrinter) {
+  const Matcher<Double> m =
+      DistanceFrom(Double(0.5), DoubleDistance, DoubleLe(Double(0.1)));
+  EXPECT_EQ(Describe(m), "is <= Double(0.1) away from Double(0.5)");
+  EXPECT_EQ(DescribeNegation(m), "is > Double(0.1) away from Double(0.5)");
+}
+
+// Tests that DistanceFrom() can be used with a custom distance function and
+// comparator.
+TEST(DistanceFrom, CanCustomizeDistanceAndComparator) {
+  const Matcher<Double> m =
+      DistanceFrom(Double(0.5), DoubleDistance, DoubleLe(Double(0.1)));
+  EXPECT_TRUE(m.Matches(Double(0.45)));
+  EXPECT_TRUE(m.Matches(Double(0.5)));
+  EXPECT_FALSE(m.Matches(Double(0.39)));
+  EXPECT_FALSE(m.Matches(Double(0.61)));
+}
+
+// For testing using DistanceFrom() with a type that supports both - and abs.
+class Float {
+ public:
+  explicit Float(float value) : value_(value) {}
+  Float(const Float& other) = default;
+  float value() const { return value_; }
+
+ private:
+  float value_ = 0.0f;
+};
+
+// Returns the difference between two Float values. This must be defined in the
+// same namespace as Float.
+Float operator-(const Float& lhs, const Float& rhs) {
+  return Float(lhs.value() - rhs.value());
+}
+
+// Returns the absolute value of a Float value. This must be defined in the
+// same namespace as Float.
+Float abs(Float value) { return Float(std::abs(value.value())); }
+
+// Returns true if and only if the first Float value is less than the second
+// Float value. This must be defined in the same namespace as Float.
+bool operator<(const Float& lhs, const Float& rhs) {
+  return lhs.value() < rhs.value();
+}
+
+// Tests that DistanceFrom() can be used with a type that supports both - and
+// abs.
+TEST(DistanceFrom, CanBeUsedWithTypeThatSupportsBothMinusAndAbs) {
+  const Matcher<Float> m = DistanceFrom(Float(0.5f), Lt(Float(0.1f)));
+  EXPECT_TRUE(m.Matches(Float(0.45f)));
+  EXPECT_TRUE(m.Matches(Float(0.55f)));
+  EXPECT_FALSE(m.Matches(Float(0.39f)));
+  EXPECT_FALSE(m.Matches(Float(0.61f)));
+}
+
+// Tests that Not(m) matches any value that doesn't match m.
+TEST(NotTest, NegatesMatcher) {
+  Matcher<int> m;
+  m = Not(Eq(2));
+  EXPECT_TRUE(m.Matches(3));
+  EXPECT_FALSE(m.Matches(2));
+}
+
+// Tests that Not(m) describes itself properly.
+TEST(NotTest, CanDescribeSelf) {
+  Matcher<int> m = Not(Eq(5));
+  EXPECT_EQ("isn't equal to 5", Describe(m));
+}
+
+// Tests that monomorphic matchers are safely cast by the Not matcher.
+TEST(NotTest, NotMatcherSafelyCastsMonomorphicMatchers) {
+  // greater_than_5 is a monomorphic matcher.
+  Matcher<int> greater_than_5 = Gt(5);
+
+  Matcher<const int&> m = Not(greater_than_5);
+  Matcher<int&> m2 = Not(greater_than_5);
+  Matcher<int&> m3 = Not(m);
+}
+
+// Helper to allow easy testing of AllOf matchers with num parameters.
+void AllOfMatches(int num, const Matcher<int>& m) {
+  SCOPED_TRACE(Describe(m));
+  EXPECT_TRUE(m.Matches(0));
+  for (int i = 1; i <= num; ++i) {
+    EXPECT_FALSE(m.Matches(i));
+  }
+  EXPECT_TRUE(m.Matches(num + 1));
+}
+
+INSTANTIATE_GTEST_MATCHER_TEST_P(AllOfTest);
+
+// Tests that AllOf(m1, ..., mn) matches any value that matches all of
+// the given matchers.
+TEST(AllOfTest, MatchesWhenAllMatch) {
+  Matcher<int> m;
+  m = AllOf(Le(2), Ge(1));
+  EXPECT_TRUE(m.Matches(1));
+  EXPECT_TRUE(m.Matches(2));
+  EXPECT_FALSE(m.Matches(0));
+  EXPECT_FALSE(m.Matches(3));
+
+  m = AllOf(Gt(0), Ne(1), Ne(2));
+  EXPECT_TRUE(m.Matches(3));
+  EXPECT_FALSE(m.Matches(2));
+  EXPECT_FALSE(m.Matches(1));
+  EXPECT_FALSE(m.Matches(0));
+
+  m = AllOf(Gt(0), Ne(1), Ne(2), Ne(3));
+  EXPECT_TRUE(m.Matches(4));
+  EXPECT_FALSE(m.Matches(3));
+  EXPECT_FALSE(m.Matches(2));
+  EXPECT_FALSE(m.Matches(1));
+  EXPECT_FALSE(m.Matches(0));
+
+  m = AllOf(Ge(0), Lt(10), Ne(3), Ne(5), Ne(7));
+  EXPECT_TRUE(m.Matches(0));
+  EXPECT_TRUE(m.Matches(1));
+  EXPECT_FALSE(m.Matches(3));
+
+  // The following tests for varying number of sub-matchers. Due to the way
+  // the sub-matchers are handled it is enough to test every sub-matcher once
+  // with sub-matchers using the same matcher type. Varying matcher types are
+  // checked for above.
+  AllOfMatches(2, AllOf(Ne(1), Ne(2)));
+  AllOfMatches(3, AllOf(Ne(1), Ne(2), Ne(3)));
+  AllOfMatches(4, AllOf(Ne(1), Ne(2), Ne(3), Ne(4)));
+  AllOfMatches(5, AllOf(Ne(1), Ne(2), Ne(3), Ne(4), Ne(5)));
+  AllOfMatches(6, AllOf(Ne(1), Ne(2), Ne(3), Ne(4), Ne(5), Ne(6)));
+  AllOfMatches(7, AllOf(Ne(1), Ne(2), Ne(3), Ne(4), Ne(5), Ne(6), Ne(7)));
+  AllOfMatches(8,
+               AllOf(Ne(1), Ne(2), Ne(3), Ne(4), Ne(5), Ne(6), Ne(7), Ne(8)));
+  AllOfMatches(
+      9, AllOf(Ne(1), Ne(2), Ne(3), Ne(4), Ne(5), Ne(6), Ne(7), Ne(8), Ne(9)));
+  AllOfMatches(10, AllOf(Ne(1), Ne(2), Ne(3), Ne(4), Ne(5), Ne(6), Ne(7), Ne(8),
+                         Ne(9), Ne(10)));
+  AllOfMatches(
+      50, AllOf(Ne(1), Ne(2), Ne(3), Ne(4), Ne(5), Ne(6), Ne(7), Ne(8), Ne(9),
+                Ne(10), Ne(11), Ne(12), Ne(13), Ne(14), Ne(15), Ne(16), Ne(17),
+                Ne(18), Ne(19), Ne(20), Ne(21), Ne(22), Ne(23), Ne(24), Ne(25),
+                Ne(26), Ne(27), Ne(28), Ne(29), Ne(30), Ne(31), Ne(32), Ne(33),
+                Ne(34), Ne(35), Ne(36), Ne(37), Ne(38), Ne(39), Ne(40), Ne(41),
+                Ne(42), Ne(43), Ne(44), Ne(45), Ne(46), Ne(47), Ne(48), Ne(49),
+                Ne(50)));
+}
+
+// Tests that AllOf(m1, ..., mn) describes itself properly.
+TEST(AllOfTest, CanDescribeSelf) {
+  Matcher<int> m;
+  m = AllOf(Le(2), Ge(1));
+  EXPECT_EQ("(is <= 2) and (is >= 1)", Describe(m));
+
+  m = AllOf(Gt(0), Ne(1), Ne(2));
+  std::string expected_descr1 =
+      "(is > 0) and (isn't equal to 1) and (isn't equal to 2)";
+  EXPECT_EQ(expected_descr1, Describe(m));
+
+  m = AllOf(Gt(0), Ne(1), Ne(2), Ne(3));
+  std::string expected_descr2 =
+      "(is > 0) and (isn't equal to 1) and (isn't equal to 2) and (isn't equal "
+      "to 3)";
+  EXPECT_EQ(expected_descr2, Describe(m));
+
+  m = AllOf(Ge(0), Lt(10), Ne(3), Ne(5), Ne(7));
+  std::string expected_descr3 =
+      "(is >= 0) and (is < 10) and (isn't equal to 3) and (isn't equal to 5) "
+      "and (isn't equal to 7)";
+  EXPECT_EQ(expected_descr3, Describe(m));
+}
+
+// Tests that AllOf(m1, ..., mn) describes its negation properly.
+TEST(AllOfTest, CanDescribeNegation) {
+  Matcher<int> m;
+  m = AllOf(Le(2), Ge(1));
+  std::string expected_descr4 = "(isn't <= 2) or (isn't >= 1)";
+  EXPECT_EQ(expected_descr4, DescribeNegation(m));
+
+  m = AllOf(Gt(0), Ne(1), Ne(2));
+  std::string expected_descr5 =
+      "(isn't > 0) or (is equal to 1) or (is equal to 2)";
+  EXPECT_EQ(expected_descr5, DescribeNegation(m));
+
+  m = AllOf(Gt(0), Ne(1), Ne(2), Ne(3));
+  std::string expected_descr6 =
+      "(isn't > 0) or (is equal to 1) or (is equal to 2) or (is equal to 3)";
+  EXPECT_EQ(expected_descr6, DescribeNegation(m));
+
+  m = AllOf(Ge(0), Lt(10), Ne(3), Ne(5), Ne(7));
+  std::string expected_desr7 =
+      "(isn't >= 0) or (isn't < 10) or (is equal to 3) or (is equal to 5) or "
+      "(is equal to 7)";
+  EXPECT_EQ(expected_desr7, DescribeNegation(m));
+
+  m = AllOf(Ne(1), Ne(2), Ne(3), Ne(4), Ne(5), Ne(6), Ne(7), Ne(8), Ne(9),
+            Ne(10), Ne(11));
+  AllOf(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11);
+  EXPECT_THAT(Describe(m), EndsWith("and (isn't equal to 11)"));
+  AllOfMatches(11, m);
+}
+
+// Tests that monomorphic matchers are safely cast by the AllOf matcher.
+TEST(AllOfTest, AllOfMatcherSafelyCastsMonomorphicMatchers) {
+  // greater_than_5 and less_than_10 are monomorphic matchers.
+  Matcher<int> greater_than_5 = Gt(5);
+  Matcher<int> less_than_10 = Lt(10);
+
+  Matcher<const int&> m = AllOf(greater_than_5, less_than_10);
+  Matcher<int&> m2 = AllOf(greater_than_5, less_than_10);
+  Matcher<int&> m3 = AllOf(greater_than_5, m2);
+
+  // Tests that BothOf works when composing itself.
+  Matcher<const int&> m4 = AllOf(greater_than_5, less_than_10, less_than_10);
+  Matcher<int&> m5 = AllOf(greater_than_5, less_than_10, less_than_10);
+}
+
+TEST_P(AllOfTestP, ExplainsResult) {
+  Matcher<int> m;
+
+  // Successful match.  Both matchers need to explain.  The second
+  // matcher doesn't give an explanation, so the matcher description is used.
+  m = AllOf(GreaterThan(10), Lt(30));
+  EXPECT_EQ("which is 15 more than 10, and is < 30", Explain(m, 25));
+
+  // Successful match.  Both matchers need to explain.
+  m = AllOf(GreaterThan(10), GreaterThan(20));
+  EXPECT_EQ("which is 20 more than 10, and which is 10 more than 20",
+            Explain(m, 30));
+
+  // Successful match.  All matchers need to explain.  The second
+  // matcher doesn't given an explanation.
+  m = AllOf(GreaterThan(10), Lt(30), GreaterThan(20));
+  EXPECT_EQ(
+      "which is 15 more than 10, and is < 30, and which is 5 more than 20",
+      Explain(m, 25));
+
+  // Successful match.  All matchers need to explain.
+  m = AllOf(GreaterThan(10), GreaterThan(20), GreaterThan(30));
+  EXPECT_EQ(
+      "which is 30 more than 10, and which is 20 more than 20, "
+      "and which is 10 more than 30",
+      Explain(m, 40));
+
+  // Failed match.  The first matcher, which failed, needs to
+  // explain.
+  m = AllOf(GreaterThan(10), GreaterThan(20));
+  EXPECT_EQ("which is 5 less than 10", Explain(m, 5));
+
+  // Failed match.  The second matcher, which failed, needs to
+  // explain.  Since it doesn't given an explanation, the matcher text is
+  // printed.
+  m = AllOf(GreaterThan(10), Lt(30));
+  EXPECT_EQ("which doesn't match (is < 30)", Explain(m, 40));
+
+  // Failed match.  The second matcher, which failed, needs to
+  // explain.
+  m = AllOf(GreaterThan(10), GreaterThan(20));
+  EXPECT_EQ("which is 5 less than 20", Explain(m, 15));
+}
+
+// Helper to allow easy testing of AnyOf matchers with num parameters.
+static void AnyOfMatches(int num, const Matcher<int>& m) {
+  SCOPED_TRACE(Describe(m));
+  EXPECT_FALSE(m.Matches(0));
+  for (int i = 1; i <= num; ++i) {
+    EXPECT_TRUE(m.Matches(i));
+  }
+  EXPECT_FALSE(m.Matches(num + 1));
+}
+
+static void AnyOfStringMatches(int num, const Matcher<std::string>& m) {
+  SCOPED_TRACE(Describe(m));
+  EXPECT_FALSE(m.Matches(std::to_string(0)));
+
+  for (int i = 1; i <= num; ++i) {
+    EXPECT_TRUE(m.Matches(std::to_string(i)));
+  }
+  EXPECT_FALSE(m.Matches(std::to_string(num + 1)));
+}
+
+INSTANTIATE_GTEST_MATCHER_TEST_P(AnyOfTest);
+
+// Tests that AnyOf(m1, ..., mn) matches any value that matches at
+// least one of the given matchers.
+TEST(AnyOfTest, MatchesWhenAnyMatches) {
+  Matcher<int> m;
+  m = AnyOf(Le(1), Ge(3));
+  EXPECT_TRUE(m.Matches(1));
+  EXPECT_TRUE(m.Matches(4));
+  EXPECT_FALSE(m.Matches(2));
+
+  m = AnyOf(Lt(0), Eq(1), Eq(2));
+  EXPECT_TRUE(m.Matches(-1));
+  EXPECT_TRUE(m.Matches(1));
+  EXPECT_TRUE(m.Matches(2));
+  EXPECT_FALSE(m.Matches(0));
+
+  m = AnyOf(Lt(0), Eq(1), Eq(2), Eq(3));
+  EXPECT_TRUE(m.Matches(-1));
+  EXPECT_TRUE(m.Matches(1));
+  EXPECT_TRUE(m.Matches(2));
+  EXPECT_TRUE(m.Matches(3));
+  EXPECT_FALSE(m.Matches(0));
+
+  m = AnyOf(Le(0), Gt(10), 3, 5, 7);
+  EXPECT_TRUE(m.Matches(0));
+  EXPECT_TRUE(m.Matches(11));
+  EXPECT_TRUE(m.Matches(3));
+  EXPECT_FALSE(m.Matches(2));
+
+  // The following tests for varying number of sub-matchers. Due to the way
+  // the sub-matchers are handled it is enough to test every sub-matcher once
+  // with sub-matchers using the same matcher type. Varying matcher types are
+  // checked for above.
+  AnyOfMatches(2, AnyOf(1, 2));
+  AnyOfMatches(3, AnyOf(1, 2, 3));
+  AnyOfMatches(4, AnyOf(1, 2, 3, 4));
+  AnyOfMatches(5, AnyOf(1, 2, 3, 4, 5));
+  AnyOfMatches(6, AnyOf(1, 2, 3, 4, 5, 6));
+  AnyOfMatches(7, AnyOf(1, 2, 3, 4, 5, 6, 7));
+  AnyOfMatches(8, AnyOf(1, 2, 3, 4, 5, 6, 7, 8));
+  AnyOfMatches(9, AnyOf(1, 2, 3, 4, 5, 6, 7, 8, 9));
+  AnyOfMatches(10, AnyOf(1, 2, 3, 4, 5, 6, 7, 8, 9, 10));
+}
+
+// Tests the variadic version of the AnyOfMatcher.
+TEST(AnyOfTest, VariadicMatchesWhenAnyMatches) {
+  // Also make sure AnyOf is defined in the right namespace and does not depend
+  // on ADL.
+  Matcher<int> m = ::testing::AnyOf(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11);
+
+  EXPECT_THAT(Describe(m), EndsWith("or (is equal to 11)"));
+  AnyOfMatches(11, m);
+  AnyOfMatches(50, AnyOf(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
+                         17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
+                         31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
+                         45, 46, 47, 48, 49, 50));
+  AnyOfStringMatches(
+      50, AnyOf("1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12",
+                "13", "14", "15", "16", "17", "18", "19", "20", "21", "22",
+                "23", "24", "25", "26", "27", "28", "29", "30", "31", "32",
+                "33", "34", "35", "36", "37", "38", "39", "40", "41", "42",
+                "43", "44", "45", "46", "47", "48", "49", "50"));
+}
+
+TEST(ConditionalTest, MatchesFirstIfCondition) {
+  Matcher<std::string> eq_red = Eq("red");
+  Matcher<std::string> ne_red = Ne("red");
+  Matcher<std::string> m = Conditional(true, eq_red, ne_red);
+  EXPECT_TRUE(m.Matches("red"));
+  EXPECT_FALSE(m.Matches("green"));
+
+  StringMatchResultListener listener;
+  StringMatchResultListener expected;
+  EXPECT_FALSE(m.MatchAndExplain("green", &listener));
+  EXPECT_FALSE(eq_red.MatchAndExplain("green", &expected));
+  EXPECT_THAT(listener.str(), Eq(expected.str()));
+}
+
+TEST(ConditionalTest, MatchesSecondIfCondition) {
+  Matcher<std::string> eq_red = Eq("red");
+  Matcher<std::string> ne_red = Ne("red");
+  Matcher<std::string> m = Conditional(false, eq_red, ne_red);
+  EXPECT_FALSE(m.Matches("red"));
+  EXPECT_TRUE(m.Matches("green"));
+
+  StringMatchResultListener listener;
+  StringMatchResultListener expected;
+  EXPECT_FALSE(m.MatchAndExplain("red", &listener));
+  EXPECT_FALSE(ne_red.MatchAndExplain("red", &expected));
+  EXPECT_THAT(listener.str(), Eq(expected.str()));
+}
+
+// Tests that AnyOf(m1, ..., mn) describes itself properly.
+TEST(AnyOfTest, CanDescribeSelf) {
+  Matcher<int> m;
+  m = AnyOf(Le(1), Ge(3));
+
+  EXPECT_EQ("(is <= 1) or (is >= 3)", Describe(m));
+
+  m = AnyOf(Lt(0), Eq(1), Eq(2));
+  EXPECT_EQ("(is < 0) or (is equal to 1) or (is equal to 2)", Describe(m));
+
+  m = AnyOf(Lt(0), Eq(1), Eq(2), Eq(3));
+  EXPECT_EQ("(is < 0) or (is equal to 1) or (is equal to 2) or (is equal to 3)",
+            Describe(m));
+
+  m = AnyOf(Le(0), Gt(10), 3, 5, 7);
+  EXPECT_EQ(
+      "(is <= 0) or (is > 10) or (is equal to 3) or (is equal to 5) or (is "
+      "equal to 7)",
+      Describe(m));
+}
+
+// Tests that AnyOf(m1, ..., mn) describes its negation properly.
+TEST(AnyOfTest, CanDescribeNegation) {
+  Matcher<int> m;
+  m = AnyOf(Le(1), Ge(3));
+  EXPECT_EQ("(isn't <= 1) and (isn't >= 3)", DescribeNegation(m));
+
+  m = AnyOf(Lt(0), Eq(1), Eq(2));
+  EXPECT_EQ("(isn't < 0) and (isn't equal to 1) and (isn't equal to 2)",
+            DescribeNegation(m));
+
+  m = AnyOf(Lt(0), Eq(1), Eq(2), Eq(3));
+  EXPECT_EQ(
+      "(isn't < 0) and (isn't equal to 1) and (isn't equal to 2) and (isn't "
+      "equal to 3)",
+      DescribeNegation(m));
+
+  m = AnyOf(Le(0), Gt(10), 3, 5, 7);
+  EXPECT_EQ(
+      "(isn't <= 0) and (isn't > 10) and (isn't equal to 3) and (isn't equal "
+      "to 5) and (isn't equal to 7)",
+      DescribeNegation(m));
+}
+
+// Tests that monomorphic matchers are safely cast by the AnyOf matcher.
+TEST(AnyOfTest, AnyOfMatcherSafelyCastsMonomorphicMatchers) {
+  // greater_than_5 and less_than_10 are monomorphic matchers.
+  Matcher<int> greater_than_5 = Gt(5);
+  Matcher<int> less_than_10 = Lt(10);
+
+  Matcher<const int&> m = AnyOf(greater_than_5, less_than_10);
+  Matcher<int&> m2 = AnyOf(greater_than_5, less_than_10);
+  Matcher<int&> m3 = AnyOf(greater_than_5, m2);
+
+  // Tests that EitherOf works when composing itself.
+  Matcher<const int&> m4 = AnyOf(greater_than_5, less_than_10, less_than_10);
+  Matcher<int&> m5 = AnyOf(greater_than_5, less_than_10, less_than_10);
+}
+
+TEST_P(AnyOfTestP, ExplainsResult) {
+  Matcher<int> m;
+
+  // Failed match. The second matcher have no explanation (description is used).
+  m = AnyOf(GreaterThan(10), Lt(0));
+  EXPECT_EQ("which is 5 less than 10, and isn't < 0", Explain(m, 5));
+
+  // Failed match. Both matchers have explanations.
+  m = AnyOf(GreaterThan(10), GreaterThan(20));
+  EXPECT_EQ("which is 5 less than 10, and which is 15 less than 20",
+            Explain(m, 5));
+
+  // Failed match. The middle matcher have no explanation.
+  m = AnyOf(GreaterThan(10), Gt(20), GreaterThan(30));
+  EXPECT_EQ(
+      "which is 5 less than 10, and isn't > 20, and which is 25 less than 30",
+      Explain(m, 5));
+
+  // Failed match. All three matchers have explanations.
+  m = AnyOf(GreaterThan(10), GreaterThan(20), GreaterThan(30));
+  EXPECT_EQ(
+      "which is 5 less than 10, and which is 15 less than 20, "
+      "and which is 25 less than 30",
+      Explain(m, 5));
+
+  // Successful match. The first macher succeeded and has explanation.
+  m = AnyOf(GreaterThan(10), GreaterThan(20));
+  EXPECT_EQ("which is 5 more than 10", Explain(m, 15));
+
+  // Successful match. The second matcher succeeded and has explanation.
+  m = AnyOf(GreaterThan(30), GreaterThan(20));
+  EXPECT_EQ("which is 5 more than 20", Explain(m, 25));
+
+  // Successful match. The first matcher succeeded and has no explanation.
+  m = AnyOf(Gt(10), Lt(20));
+  EXPECT_EQ("which matches (is > 10)", Explain(m, 15));
+
+  // Successful match. The second matcher succeeded and has no explanation.
+  m = AnyOf(Gt(30), Gt(20));
+  EXPECT_EQ("which matches (is > 20)", Explain(m, 25));
+}
+
+// The following predicate function and predicate functor are for
+// testing the Truly(predicate) matcher.
+
+// Returns non-zero if the input is positive.  Note that the return
+// type of this function is not bool.  It's OK as Truly() accepts any
+// unary function or functor whose return type can be implicitly
+// converted to bool.
+int IsPositive(double x) { return x > 0 ? 1 : 0; }
+
+// This functor returns true if the input is greater than the given
+// number.
+class IsGreaterThan {
+ public:
+  explicit IsGreaterThan(int threshold) : threshold_(threshold) {}
+
+  bool operator()(int n) const { return n > threshold_; }
+
+ private:
+  int threshold_;
+};
+
+// For testing Truly().
+const int foo = 0;
+
+// This predicate returns true if and only if the argument references foo and
+// has a zero value.
+bool ReferencesFooAndIsZero(const int& n) { return (&n == &foo) && (n == 0); }
+
+// Tests that Truly(predicate) matches what satisfies the given
+// predicate.
+TEST(TrulyTest, MatchesWhatSatisfiesThePredicate) {
+  Matcher<double> m = Truly(IsPositive);
+  EXPECT_TRUE(m.Matches(2.0));
+  EXPECT_FALSE(m.Matches(-1.5));
+}
+
+// Tests that Truly(predicate_functor) works too.
+TEST(TrulyTest, CanBeUsedWithFunctor) {
+  Matcher<int> m = Truly(IsGreaterThan(5));
+  EXPECT_TRUE(m.Matches(6));
+  EXPECT_FALSE(m.Matches(4));
+}
+
+// A class that can be implicitly converted to bool.
+class ConvertibleToBool {
+ public:
+  explicit ConvertibleToBool(int number) : number_(number) {}
+  operator bool() const { return number_ != 0; }
+
+ private:
+  int number_;
+};
+
+ConvertibleToBool IsNotZero(int number) { return ConvertibleToBool(number); }
+
+// Tests that the predicate used in Truly() may return a class that's
+// implicitly convertible to bool, even when the class has no
+// operator!().
+TEST(TrulyTest, PredicateCanReturnAClassConvertibleToBool) {
+  Matcher<int> m = Truly(IsNotZero);
+  EXPECT_TRUE(m.Matches(1));
+  EXPECT_FALSE(m.Matches(0));
+}
+
+// Tests that Truly(predicate) can describe itself properly.
+TEST(TrulyTest, CanDescribeSelf) {
+  Matcher<double> m = Truly(IsPositive);
+  EXPECT_EQ("satisfies the given predicate", Describe(m));
+}
+
+// Tests that Truly(predicate) works when the matcher takes its
+// argument by reference.
+TEST(TrulyTest, WorksForByRefArguments) {
+  Matcher<const int&> m = Truly(ReferencesFooAndIsZero);
+  EXPECT_TRUE(m.Matches(foo));
+  int n = 0;
+  EXPECT_FALSE(m.Matches(n));
+}
+
+// Tests that Truly(predicate) provides a helpful reason when it fails.
+TEST(TrulyTest, ExplainsFailures) {
+  StringMatchResultListener listener;
+  EXPECT_FALSE(ExplainMatchResult(Truly(IsPositive), -1, &listener));
+  EXPECT_EQ(listener.str(), "didn't satisfy the given predicate");
+}
+
+// Tests that Matches(m) is a predicate satisfied by whatever that
+// matches matcher m.
+TEST(MatchesTest, IsSatisfiedByWhatMatchesTheMatcher) {
+  EXPECT_TRUE(Matches(Ge(0))(1));
+  EXPECT_FALSE(Matches(Eq('a'))('b'));
+}
+
+// Tests that Matches(m) works when the matcher takes its argument by
+// reference.
+TEST(MatchesTest, WorksOnByRefArguments) {
+  int m = 0, n = 0;
+  EXPECT_TRUE(Matches(AllOf(Ref(n), Eq(0)))(n));
+  EXPECT_FALSE(Matches(Ref(m))(n));
+}
+
+// Tests that a Matcher on non-reference type can be used in
+// Matches().
+TEST(MatchesTest, WorksWithMatcherOnNonRefType) {
+  Matcher<int> eq5 = Eq(5);
+  EXPECT_TRUE(Matches(eq5)(5));
+  EXPECT_FALSE(Matches(eq5)(2));
+}
+
+// Tests Value(value, matcher).  Since Value() is a simple wrapper for
+// Matches(), which has been tested already, we don't spend a lot of
+// effort on testing Value().
+TEST(ValueTest, WorksWithPolymorphicMatcher) {
+  EXPECT_TRUE(Value("hi", StartsWith("h")));
+  EXPECT_FALSE(Value(5, Gt(10)));
+}
+
+TEST(ValueTest, WorksWithMonomorphicMatcher) {
+  const Matcher<int> is_zero = Eq(0);
+  EXPECT_TRUE(Value(0, is_zero));
+  EXPECT_FALSE(Value('a', is_zero));
+
+  int n = 0;
+  const Matcher<const int&> ref_n = Ref(n);
+  EXPECT_TRUE(Value(n, ref_n));
+  EXPECT_FALSE(Value(1, ref_n));
+}
+
+TEST(AllArgsTest, WorksForTuple) {
+  EXPECT_THAT(std::make_tuple(1, 2L), AllArgs(Lt()));
+  EXPECT_THAT(std::make_tuple(2L, 1), Not(AllArgs(Lt())));
+}
+
+TEST(AllArgsTest, WorksForNonTuple) {
+  EXPECT_THAT(42, AllArgs(Gt(0)));
+  EXPECT_THAT('a', Not(AllArgs(Eq('b'))));
+}
+
+class AllArgsHelper {
+ public:
+  AllArgsHelper() = default;
+
+  MOCK_METHOD2(Helper, int(char x, int y));
+
+ private:
+  AllArgsHelper(const AllArgsHelper&) = delete;
+  AllArgsHelper& operator=(const AllArgsHelper&) = delete;
+};
+
+TEST(AllArgsTest, WorksInWithClause) {
+  AllArgsHelper helper;
+  ON_CALL(helper, Helper(_, _)).With(AllArgs(Lt())).WillByDefault(Return(1));
+  EXPECT_CALL(helper, Helper(_, _));
+  EXPECT_CALL(helper, Helper(_, _)).With(AllArgs(Gt())).WillOnce(Return(2));
+
+  EXPECT_EQ(1, helper.Helper('\1', 2));
+  EXPECT_EQ(2, helper.Helper('a', 1));
+}
+
+class OptionalMatchersHelper {
+ public:
+  OptionalMatchersHelper() = default;
+
+  MOCK_METHOD0(NoArgs, int());
+
+  MOCK_METHOD1(OneArg, int(int y));
+
+  MOCK_METHOD2(TwoArgs, int(char x, int y));
+
+  MOCK_METHOD1(Overloaded, int(char x));
+  MOCK_METHOD2(Overloaded, int(char x, int y));
+
+ private:
+  OptionalMatchersHelper(const OptionalMatchersHelper&) = delete;
+  OptionalMatchersHelper& operator=(const OptionalMatchersHelper&) = delete;
+};
+
+TEST(AllArgsTest, WorksWithoutMatchers) {
+  OptionalMatchersHelper helper;
+
+  ON_CALL(helper, NoArgs).WillByDefault(Return(10));
+  ON_CALL(helper, OneArg).WillByDefault(Return(20));
+  ON_CALL(helper, TwoArgs).WillByDefault(Return(30));
+
+  EXPECT_EQ(10, helper.NoArgs());
+  EXPECT_EQ(20, helper.OneArg(1));
+  EXPECT_EQ(30, helper.TwoArgs('\1', 2));
+
+  EXPECT_CALL(helper, NoArgs).Times(1);
+  EXPECT_CALL(helper, OneArg).WillOnce(Return(100));
+  EXPECT_CALL(helper, OneArg(17)).WillOnce(Return(200));
+  EXPECT_CALL(helper, TwoArgs).Times(0);
+
+  EXPECT_EQ(10, helper.NoArgs());
+  EXPECT_EQ(100, helper.OneArg(1));
+  EXPECT_EQ(200, helper.OneArg(17));
+}
+
+// Tests floating-point matchers.
+template <typename RawType>
+class FloatingPointTest : public testing::Test {
+ protected:
+  typedef testing::internal::FloatingPoint<RawType> Floating;
+  typedef typename Floating::Bits Bits;
+
+  FloatingPointTest()
+      : max_ulps_(Floating::kMaxUlps),
+        zero_bits_(Floating(0).bits()),
+        one_bits_(Floating(1).bits()),
+        infinity_bits_(Floating(Floating::Infinity()).bits()),
+        close_to_positive_zero_(
+            Floating::ReinterpretBits(zero_bits_ + max_ulps_ / 2)),
+        close_to_negative_zero_(
+            -Floating::ReinterpretBits(zero_bits_ + max_ulps_ - max_ulps_ / 2)),
+        further_from_negative_zero_(-Floating::ReinterpretBits(
+            zero_bits_ + max_ulps_ + 1 - max_ulps_ / 2)),
+        close_to_one_(Floating::ReinterpretBits(one_bits_ + max_ulps_)),
+        further_from_one_(Floating::ReinterpretBits(one_bits_ + max_ulps_ + 1)),
+        infinity_(Floating::Infinity()),
+        close_to_infinity_(
+            Floating::ReinterpretBits(infinity_bits_ - max_ulps_)),
+        further_from_infinity_(
+            Floating::ReinterpretBits(infinity_bits_ - max_ulps_ - 1)),
+        max_(std::numeric_limits<RawType>::max()),
+        nan1_(Floating::ReinterpretBits(Floating::kExponentBitMask | 1)),
+        nan2_(Floating::ReinterpretBits(Floating::kExponentBitMask | 200)) {}
+
+  void TestSize() { EXPECT_EQ(sizeof(RawType), sizeof(Bits)); }
+
+  // A battery of tests for FloatingEqMatcher::Matches.
+  // matcher_maker is a pointer to a function which creates a FloatingEqMatcher.
+  void TestMatches(
+      testing::internal::FloatingEqMatcher<RawType> (*matcher_maker)(RawType)) {
+    Matcher<RawType> m1 = matcher_maker(0.0);
+    EXPECT_TRUE(m1.Matches(-0.0));
+    EXPECT_TRUE(m1.Matches(close_to_positive_zero_));
+    EXPECT_TRUE(m1.Matches(close_to_negative_zero_));
+    EXPECT_FALSE(m1.Matches(1.0));
+
+    Matcher<RawType> m2 = matcher_maker(close_to_positive_zero_);
+    EXPECT_FALSE(m2.Matches(further_from_negative_zero_));
+
+    Matcher<RawType> m3 = matcher_maker(1.0);
+    EXPECT_TRUE(m3.Matches(close_to_one_));
+    EXPECT_FALSE(m3.Matches(further_from_one_));
+
+    // Test commutativity: matcher_maker(0.0).Matches(1.0) was tested above.
+    EXPECT_FALSE(m3.Matches(0.0));
+
+    Matcher<RawType> m4 = matcher_maker(-infinity_);
+    EXPECT_TRUE(m4.Matches(-close_to_infinity_));
+
+    Matcher<RawType> m5 = matcher_maker(infinity_);
+    EXPECT_TRUE(m5.Matches(close_to_infinity_));
+
+    // This is interesting as the representations of infinity_ and nan1_
+    // are only 1 DLP apart.
+    EXPECT_FALSE(m5.Matches(nan1_));
+
+    // matcher_maker can produce a Matcher<const RawType&>, which is needed in
+    // some cases.
+    Matcher<const RawType&> m6 = matcher_maker(0.0);
+    EXPECT_TRUE(m6.Matches(-0.0));
+    EXPECT_TRUE(m6.Matches(close_to_positive_zero_));
+    EXPECT_FALSE(m6.Matches(1.0));
+
+    // matcher_maker can produce a Matcher<RawType&>, which is needed in some
+    // cases.
+    Matcher<RawType&> m7 = matcher_maker(0.0);
+    RawType x = 0.0;
+    EXPECT_TRUE(m7.Matches(x));
+    x = 0.01f;
+    EXPECT_FALSE(m7.Matches(x));
+  }
+
+  // Pre-calculated numbers to be used by the tests.
+
+  const Bits max_ulps_;
+
+  const Bits zero_bits_;      // The bits that represent 0.0.
+  const Bits one_bits_;       // The bits that represent 1.0.
+  const Bits infinity_bits_;  // The bits that represent +infinity.
+
+  // Some numbers close to 0.0.
+  const RawType close_to_positive_zero_;
+  const RawType close_to_negative_zero_;
+  const RawType further_from_negative_zero_;
+
+  // Some numbers close to 1.0.
+  const RawType close_to_one_;
+  const RawType further_from_one_;
+
+  // Some numbers close to +infinity.
+  const RawType infinity_;
+  const RawType close_to_infinity_;
+  const RawType further_from_infinity_;
+
+  // Maximum representable value that's not infinity.
+  const RawType max_;
+
+  // Some NaNs.
+  const RawType nan1_;
+  const RawType nan2_;
+};
+
+// Tests floating-point matchers with fixed epsilons.
+template <typename RawType>
+class FloatingPointNearTest : public FloatingPointTest<RawType> {
+ protected:
+  typedef FloatingPointTest<RawType> ParentType;
+
+  // A battery of tests for FloatingEqMatcher::Matches with a fixed epsilon.
+  // matcher_maker is a pointer to a function which creates a FloatingEqMatcher.
+  void TestNearMatches(testing::internal::FloatingEqMatcher<RawType> (
+      *matcher_maker)(RawType, RawType)) {
+    Matcher<RawType> m1 = matcher_maker(0.0, 0.0);
+    EXPECT_TRUE(m1.Matches(0.0));
+    EXPECT_TRUE(m1.Matches(-0.0));
+    EXPECT_FALSE(m1.Matches(ParentType::close_to_positive_zero_));
+    EXPECT_FALSE(m1.Matches(ParentType::close_to_negative_zero_));
+    EXPECT_FALSE(m1.Matches(1.0));
+
+    Matcher<RawType> m2 = matcher_maker(0.0, 1.0);
+    EXPECT_TRUE(m2.Matches(0.0));
+    EXPECT_TRUE(m2.Matches(-0.0));
+    EXPECT_TRUE(m2.Matches(1.0));
+    EXPECT_TRUE(m2.Matches(-1.0));
+    EXPECT_FALSE(m2.Matches(ParentType::close_to_one_));
+    EXPECT_FALSE(m2.Matches(-ParentType::close_to_one_));
+
+    // Check that inf matches inf, regardless of the of the specified max
+    // absolute error.
+    Matcher<RawType> m3 = matcher_maker(ParentType::infinity_, 0.0);
+    EXPECT_TRUE(m3.Matches(ParentType::infinity_));
+    EXPECT_FALSE(m3.Matches(ParentType::close_to_infinity_));
+    EXPECT_FALSE(m3.Matches(-ParentType::infinity_));
+
+    Matcher<RawType> m4 = matcher_maker(-ParentType::infinity_, 0.0);
+    EXPECT_TRUE(m4.Matches(-ParentType::infinity_));
+    EXPECT_FALSE(m4.Matches(-ParentType::close_to_infinity_));
+    EXPECT_FALSE(m4.Matches(ParentType::infinity_));
+
+    // Test various overflow scenarios.
+    Matcher<RawType> m5 = matcher_maker(ParentType::max_, ParentType::max_);
+    EXPECT_TRUE(m5.Matches(ParentType::max_));
+    EXPECT_FALSE(m5.Matches(-ParentType::max_));
+
+    Matcher<RawType> m6 = matcher_maker(-ParentType::max_, ParentType::max_);
+    EXPECT_FALSE(m6.Matches(ParentType::max_));
+    EXPECT_TRUE(m6.Matches(-ParentType::max_));
+
+    Matcher<RawType> m7 = matcher_maker(ParentType::max_, 0);
+    EXPECT_TRUE(m7.Matches(ParentType::max_));
+    EXPECT_FALSE(m7.Matches(-ParentType::max_));
+
+    Matcher<RawType> m8 = matcher_maker(-ParentType::max_, 0);
+    EXPECT_FALSE(m8.Matches(ParentType::max_));
+    EXPECT_TRUE(m8.Matches(-ParentType::max_));
+
+    // The difference between max() and -max() normally overflows to infinity,
+    // but it should still match if the max_abs_error is also infinity.
+    Matcher<RawType> m9 =
+        matcher_maker(ParentType::max_, ParentType::infinity_);
+    EXPECT_TRUE(m8.Matches(-ParentType::max_));
+
+    // matcher_maker can produce a Matcher<const RawType&>, which is needed in
+    // some cases.
+    Matcher<const RawType&> m10 = matcher_maker(0.0, 1.0);
+    EXPECT_TRUE(m10.Matches(-0.0));
+    EXPECT_TRUE(m10.Matches(ParentType::close_to_positive_zero_));
+    EXPECT_FALSE(m10.Matches(ParentType::close_to_one_));
+
+    // matcher_maker can produce a Matcher<RawType&>, which is needed in some
+    // cases.
+    Matcher<RawType&> m11 = matcher_maker(0.0, 1.0);
+    RawType x = 0.0;
+    EXPECT_TRUE(m11.Matches(x));
+    x = 1.0f;
+    EXPECT_TRUE(m11.Matches(x));
+    x = -1.0f;
+    EXPECT_TRUE(m11.Matches(x));
+    x = 1.1f;
+    EXPECT_FALSE(m11.Matches(x));
+    x = -1.1f;
+    EXPECT_FALSE(m11.Matches(x));
+  }
+};
+
+// Instantiate FloatingPointTest for testing floats.
+typedef FloatingPointTest<float> FloatTest;
+
+TEST_F(FloatTest, FloatEqApproximatelyMatchesFloats) { TestMatches(&FloatEq); }
+
+TEST_F(FloatTest, NanSensitiveFloatEqApproximatelyMatchesFloats) {
+  TestMatches(&NanSensitiveFloatEq);
+}
+
+TEST_F(FloatTest, FloatEqCannotMatchNaN) {
+  // FloatEq never matches NaN.
+  Matcher<float> m = FloatEq(nan1_);
+  EXPECT_FALSE(m.Matches(nan1_));
+  EXPECT_FALSE(m.Matches(nan2_));
+  EXPECT_FALSE(m.Matches(1.0));
+}
+
+TEST_F(FloatTest, NanSensitiveFloatEqCanMatchNaN) {
+  // NanSensitiveFloatEq will match NaN.
+  Matcher<float> m = NanSensitiveFloatEq(nan1_);
+  EXPECT_TRUE(m.Matches(nan1_));
+  EXPECT_TRUE(m.Matches(nan2_));
+  EXPECT_FALSE(m.Matches(1.0));
+}
+
+TEST_F(FloatTest, FloatEqCanDescribeSelf) {
+  Matcher<float> m1 = FloatEq(2.0f);
+  EXPECT_EQ("is approximately 2", Describe(m1));
+  EXPECT_EQ("isn't approximately 2", DescribeNegation(m1));
+
+  Matcher<float> m2 = FloatEq(0.5f);
+  EXPECT_EQ("is approximately 0.5", Describe(m2));
+  EXPECT_EQ("isn't approximately 0.5", DescribeNegation(m2));
+
+  Matcher<float> m3 = FloatEq(nan1_);
+  EXPECT_EQ("never matches", Describe(m3));
+  EXPECT_EQ("is anything", DescribeNegation(m3));
+}
+
+TEST_F(FloatTest, NanSensitiveFloatEqCanDescribeSelf) {
+  Matcher<float> m1 = NanSensitiveFloatEq(2.0f);
+  EXPECT_EQ("is approximately 2", Describe(m1));
+  EXPECT_EQ("isn't approximately 2", DescribeNegation(m1));
+
+  Matcher<float> m2 = NanSensitiveFloatEq(0.5f);
+  EXPECT_EQ("is approximately 0.5", Describe(m2));
+  EXPECT_EQ("isn't approximately 0.5", DescribeNegation(m2));
+
+  Matcher<float> m3 = NanSensitiveFloatEq(nan1_);
+  EXPECT_EQ("is NaN", Describe(m3));
+  EXPECT_EQ("isn't NaN", DescribeNegation(m3));
+}
+
+// Instantiate FloatingPointTest for testing floats with a user-specified
+// max absolute error.
+typedef FloatingPointNearTest<float> FloatNearTest;
+
+TEST_F(FloatNearTest, FloatNearMatches) { TestNearMatches(&FloatNear); }
+
+TEST_F(FloatNearTest, NanSensitiveFloatNearApproximatelyMatchesFloats) {
+  TestNearMatches(&NanSensitiveFloatNear);
+}
+
+TEST_F(FloatNearTest, FloatNearCanDescribeSelf) {
+  Matcher<float> m1 = FloatNear(2.0f, 0.5f);
+  EXPECT_EQ("is approximately 2 (absolute error <= 0.5)", Describe(m1));
+  EXPECT_EQ("isn't approximately 2 (absolute error > 0.5)",
+            DescribeNegation(m1));
+
+  Matcher<float> m2 = FloatNear(0.5f, 0.5f);
+  EXPECT_EQ("is approximately 0.5 (absolute error <= 0.5)", Describe(m2));
+  EXPECT_EQ("isn't approximately 0.5 (absolute error > 0.5)",
+            DescribeNegation(m2));
+
+  Matcher<float> m3 = FloatNear(nan1_, 0.0);
+  EXPECT_EQ("never matches", Describe(m3));
+  EXPECT_EQ("is anything", DescribeNegation(m3));
+}
+
+TEST_F(FloatNearTest, NanSensitiveFloatNearCanDescribeSelf) {
+  Matcher<float> m1 = NanSensitiveFloatNear(2.0f, 0.5f);
+  EXPECT_EQ("is approximately 2 (absolute error <= 0.5)", Describe(m1));
+  EXPECT_EQ("isn't approximately 2 (absolute error > 0.5)",
+            DescribeNegation(m1));
+
+  Matcher<float> m2 = NanSensitiveFloatNear(0.5f, 0.5f);
+  EXPECT_EQ("is approximately 0.5 (absolute error <= 0.5)", Describe(m2));
+  EXPECT_EQ("isn't approximately 0.5 (absolute error > 0.5)",
+            DescribeNegation(m2));
+
+  Matcher<float> m3 = NanSensitiveFloatNear(nan1_, 0.1f);
+  EXPECT_EQ("is NaN", Describe(m3));
+  EXPECT_EQ("isn't NaN", DescribeNegation(m3));
+}
+
+TEST_F(FloatNearTest, FloatNearCannotMatchNaN) {
+  // FloatNear never matches NaN.
+  Matcher<float> m = FloatNear(ParentType::nan1_, 0.1f);
+  EXPECT_FALSE(m.Matches(nan1_));
+  EXPECT_FALSE(m.Matches(nan2_));
+  EXPECT_FALSE(m.Matches(1.0));
+}
+
+TEST_F(FloatNearTest, NanSensitiveFloatNearCanMatchNaN) {
+  // NanSensitiveFloatNear will match NaN.
+  Matcher<float> m = NanSensitiveFloatNear(nan1_, 0.1f);
+  EXPECT_TRUE(m.Matches(nan1_));
+  EXPECT_TRUE(m.Matches(nan2_));
+  EXPECT_FALSE(m.Matches(1.0));
+}
+
+// Instantiate FloatingPointTest for testing doubles.
+typedef FloatingPointTest<double> DoubleTest;
+
+TEST_F(DoubleTest, DoubleEqApproximatelyMatchesDoubles) {
+  TestMatches(&DoubleEq);
+}
+
+TEST_F(DoubleTest, NanSensitiveDoubleEqApproximatelyMatchesDoubles) {
+  TestMatches(&NanSensitiveDoubleEq);
+}
+
+TEST_F(DoubleTest, DoubleEqCannotMatchNaN) {
+  // DoubleEq never matches NaN.
+  Matcher<double> m = DoubleEq(nan1_);
+  EXPECT_FALSE(m.Matches(nan1_));
+  EXPECT_FALSE(m.Matches(nan2_));
+  EXPECT_FALSE(m.Matches(1.0));
+}
+
+TEST_F(DoubleTest, NanSensitiveDoubleEqCanMatchNaN) {
+  // NanSensitiveDoubleEq will match NaN.
+  Matcher<double> m = NanSensitiveDoubleEq(nan1_);
+  EXPECT_TRUE(m.Matches(nan1_));
+  EXPECT_TRUE(m.Matches(nan2_));
+  EXPECT_FALSE(m.Matches(1.0));
+}
+
+TEST_F(DoubleTest, DoubleEqCanDescribeSelf) {
+  Matcher<double> m1 = DoubleEq(2.0);
+  EXPECT_EQ("is approximately 2", Describe(m1));
+  EXPECT_EQ("isn't approximately 2", DescribeNegation(m1));
+
+  Matcher<double> m2 = DoubleEq(0.5);
+  EXPECT_EQ("is approximately 0.5", Describe(m2));
+  EXPECT_EQ("isn't approximately 0.5", DescribeNegation(m2));
+
+  Matcher<double> m3 = DoubleEq(nan1_);
+  EXPECT_EQ("never matches", Describe(m3));
+  EXPECT_EQ("is anything", DescribeNegation(m3));
+}
+
+TEST_F(DoubleTest, NanSensitiveDoubleEqCanDescribeSelf) {
+  Matcher<double> m1 = NanSensitiveDoubleEq(2.0);
+  EXPECT_EQ("is approximately 2", Describe(m1));
+  EXPECT_EQ("isn't approximately 2", DescribeNegation(m1));
+
+  Matcher<double> m2 = NanSensitiveDoubleEq(0.5);
+  EXPECT_EQ("is approximately 0.5", Describe(m2));
+  EXPECT_EQ("isn't approximately 0.5", DescribeNegation(m2));
+
+  Matcher<double> m3 = NanSensitiveDoubleEq(nan1_);
+  EXPECT_EQ("is NaN", Describe(m3));
+  EXPECT_EQ("isn't NaN", DescribeNegation(m3));
+}
+
+// Instantiate FloatingPointTest for testing floats with a user-specified
+// max absolute error.
+typedef FloatingPointNearTest<double> DoubleNearTest;
+
+TEST_F(DoubleNearTest, DoubleNearMatches) { TestNearMatches(&DoubleNear); }
+
+TEST_F(DoubleNearTest, NanSensitiveDoubleNearApproximatelyMatchesDoubles) {
+  TestNearMatches(&NanSensitiveDoubleNear);
+}
+
+TEST_F(DoubleNearTest, DoubleNearCanDescribeSelf) {
+  Matcher<double> m1 = DoubleNear(2.0, 0.5);
+  EXPECT_EQ("is approximately 2 (absolute error <= 0.5)", Describe(m1));
+  EXPECT_EQ("isn't approximately 2 (absolute error > 0.5)",
+            DescribeNegation(m1));
+
+  Matcher<double> m2 = DoubleNear(0.5, 0.5);
+  EXPECT_EQ("is approximately 0.5 (absolute error <= 0.5)", Describe(m2));
+  EXPECT_EQ("isn't approximately 0.5 (absolute error > 0.5)",
+            DescribeNegation(m2));
+
+  Matcher<double> m3 = DoubleNear(nan1_, 0.0);
+  EXPECT_EQ("never matches", Describe(m3));
+  EXPECT_EQ("is anything", DescribeNegation(m3));
+}
+
+TEST_F(DoubleNearTest, ExplainsResultWhenMatchFails) {
+  EXPECT_EQ("", Explain(DoubleNear(2.0, 0.1), 2.05));
+  EXPECT_EQ("which is 0.2 from 2", Explain(DoubleNear(2.0, 0.1), 2.2));
+  EXPECT_EQ("which is -0.3 from 2", Explain(DoubleNear(2.0, 0.1), 1.7));
+
+  const std::string explanation =
+      Explain(DoubleNear(2.1, 1e-10), 2.1 + 1.2e-10);
+  // Different C++ implementations may print floating-point numbers
+  // slightly differently.
+  EXPECT_TRUE(explanation == "which is 1.2e-10 from 2.1" ||  // GCC
+              explanation == "which is 1.2e-010 from 2.1")   // MSVC
+      << " where explanation is \"" << explanation << "\".";
+}
+
+TEST_F(DoubleNearTest, NanSensitiveDoubleNearCanDescribeSelf) {
+  Matcher<double> m1 = NanSensitiveDoubleNear(2.0, 0.5);
+  EXPECT_EQ("is approximately 2 (absolute error <= 0.5)", Describe(m1));
+  EXPECT_EQ("isn't approximately 2 (absolute error > 0.5)",
+            DescribeNegation(m1));
+
+  Matcher<double> m2 = NanSensitiveDoubleNear(0.5, 0.5);
+  EXPECT_EQ("is approximately 0.5 (absolute error <= 0.5)", Describe(m2));
+  EXPECT_EQ("isn't approximately 0.5 (absolute error > 0.5)",
+            DescribeNegation(m2));
+
+  Matcher<double> m3 = NanSensitiveDoubleNear(nan1_, 0.1);
+  EXPECT_EQ("is NaN", Describe(m3));
+  EXPECT_EQ("isn't NaN", DescribeNegation(m3));
+}
+
+TEST_F(DoubleNearTest, DoubleNearCannotMatchNaN) {
+  // DoubleNear never matches NaN.
+  Matcher<double> m = DoubleNear(ParentType::nan1_, 0.1);
+  EXPECT_FALSE(m.Matches(nan1_));
+  EXPECT_FALSE(m.Matches(nan2_));
+  EXPECT_FALSE(m.Matches(1.0));
+}
+
+TEST_F(DoubleNearTest, NanSensitiveDoubleNearCanMatchNaN) {
+  // NanSensitiveDoubleNear will match NaN.
+  Matcher<double> m = NanSensitiveDoubleNear(nan1_, 0.1);
+  EXPECT_TRUE(m.Matches(nan1_));
+  EXPECT_TRUE(m.Matches(nan2_));
+  EXPECT_FALSE(m.Matches(1.0));
+}
+
+TEST(NotTest, WorksOnMoveOnlyType) {
+  std::unique_ptr<int> p(new int(3));
+  EXPECT_THAT(p, Pointee(Eq(3)));
+  EXPECT_THAT(p, Not(Pointee(Eq(2))));
+}
+
+TEST(AllOfTest, HugeMatcher) {
+  // Verify that using AllOf with many arguments doesn't cause
+  // the compiler to exceed template instantiation depth limit.
+  EXPECT_THAT(0, testing::AllOf(_, _, _, _, _, _, _, _, _,
+                                testing::AllOf(_, _, _, _, _, _, _, _, _, _)));
+}
+
+TEST(AnyOfTest, HugeMatcher) {
+  // Verify that using AnyOf with many arguments doesn't cause
+  // the compiler to exceed template instantiation depth limit.
+  EXPECT_THAT(0, testing::AnyOf(_, _, _, _, _, _, _, _, _,
+                                testing::AnyOf(_, _, _, _, _, _, _, _, _, _)));
+}
+
+namespace adl_test {
+
+// Verifies that the implementation of ::testing::AllOf and ::testing::AnyOf
+// don't issue unqualified recursive calls.  If they do, the argument dependent
+// name lookup will cause AllOf/AnyOf in the 'adl_test' namespace to be found
+// as a candidate and the compilation will break due to an ambiguous overload.
+
+// The matcher must be in the same namespace as AllOf/AnyOf to make argument
+// dependent lookup find those.
+MATCHER(M, "") {
+  (void)arg;
+  return true;
+}
+
+template <typename T1, typename T2>
+bool AllOf(const T1& /*t1*/, const T2& /*t2*/) {
+  return true;
+}
+
+TEST(AllOfTest, DoesNotCallAllOfUnqualified) {
+  EXPECT_THAT(42,
+              testing::AllOf(M(), M(), M(), M(), M(), M(), M(), M(), M(), M()));
+}
+
+template <typename T1, typename T2>
+bool AnyOf(const T1&, const T2&) {
+  return true;
+}
+
+TEST(AnyOfTest, DoesNotCallAnyOfUnqualified) {
+  EXPECT_THAT(42,
+              testing::AnyOf(M(), M(), M(), M(), M(), M(), M(), M(), M(), M()));
+}
+
+}  // namespace adl_test
+
+TEST(AllOfTest, WorksOnMoveOnlyType) {
+  std::unique_ptr<int> p(new int(3));
+  EXPECT_THAT(p, AllOf(Pointee(Eq(3)), Pointee(Gt(0)), Pointee(Lt(5))));
+  EXPECT_THAT(p, Not(AllOf(Pointee(Eq(3)), Pointee(Gt(0)), Pointee(Lt(3)))));
+}
+
+TEST(AnyOfTest, WorksOnMoveOnlyType) {
+  std::unique_ptr<int> p(new int(3));
+  EXPECT_THAT(p, AnyOf(Pointee(Eq(5)), Pointee(Lt(0)), Pointee(Lt(5))));
+  EXPECT_THAT(p, Not(AnyOf(Pointee(Eq(5)), Pointee(Lt(0)), Pointee(Gt(5)))));
+}
+
+}  // namespace
+}  // namespace gmock_matchers_test
+}  // namespace testing
+
+GTEST_DISABLE_MSC_WARNINGS_POP_()  // 4244 4100
diff --git a/external/googletest/googlemock/test/gmock-matchers-comparisons_test.cc b/external/googletest/googlemock/test/gmock-matchers-comparisons_test.cc
new file mode 100644
index 00000000..87eca08f
--- /dev/null
+++ b/external/googletest/googlemock/test/gmock-matchers-comparisons_test.cc
@@ -0,0 +1,2496 @@
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Google Mock - a framework for writing C++ mock classes.
+//
+// This file tests some commonly used argument matchers.
+
+#include <functional>
+#include <memory>
+#include <optional>
+#include <string>
+#include <tuple>
+#include <vector>
+
+#include "gmock/gmock.h"
+#include "test/gmock-matchers_test.h"
+#include "gtest/gtest.h"
+
+// Silence warning C4244: 'initializing': conversion from 'int' to 'short',
+// possible loss of data and C4100, unreferenced local parameter
+GTEST_DISABLE_MSC_WARNINGS_PUSH_(4244 4100)
+
+namespace testing {
+namespace gmock_matchers_test {
+namespace {
+
+INSTANTIATE_GTEST_MATCHER_TEST_P(MonotonicMatcherTest);
+
+TEST_P(MonotonicMatcherTestP, IsPrintable) {
+  stringstream ss;
+  ss << GreaterThan(5);
+  EXPECT_EQ("is > 5", ss.str());
+}
+
+TEST(MatchResultListenerTest, StreamingWorks) {
+  StringMatchResultListener listener;
+  listener << "hi" << 5;
+  EXPECT_EQ("hi5", listener.str());
+
+  listener.Clear();
+  EXPECT_EQ("", listener.str());
+
+  listener << 42;
+  EXPECT_EQ("42", listener.str());
+
+  // Streaming shouldn't crash when the underlying ostream is NULL.
+  DummyMatchResultListener dummy;
+  dummy << "hi" << 5;
+}
+
+TEST(MatchResultListenerTest, CanAccessUnderlyingStream) {
+  EXPECT_TRUE(DummyMatchResultListener().stream() == nullptr);
+  EXPECT_TRUE(StreamMatchResultListener(nullptr).stream() == nullptr);
+
+  EXPECT_EQ(&std::cout, StreamMatchResultListener(&std::cout).stream());
+}
+
+TEST(MatchResultListenerTest, IsInterestedWorks) {
+  EXPECT_TRUE(StringMatchResultListener().IsInterested());
+  EXPECT_TRUE(StreamMatchResultListener(&std::cout).IsInterested());
+
+  EXPECT_FALSE(DummyMatchResultListener().IsInterested());
+  EXPECT_FALSE(StreamMatchResultListener(nullptr).IsInterested());
+}
+
+// Makes sure that the MatcherInterface<T> interface doesn't
+// change.
+class EvenMatcherImpl : public MatcherInterface<int> {
+ public:
+  bool MatchAndExplain(int x,
+                       MatchResultListener* /* listener */) const override {
+    return x % 2 == 0;
+  }
+
+  void DescribeTo(ostream* os) const override { *os << "is an even number"; }
+
+  // We deliberately don't define DescribeNegationTo() and
+  // ExplainMatchResultTo() here, to make sure the definition of these
+  // two methods is optional.
+};
+
+// Makes sure that the MatcherInterface API doesn't change.
+TEST(MatcherInterfaceTest, CanBeImplementedUsingPublishedAPI) {
+  EvenMatcherImpl m;
+}
+
+// Tests implementing a monomorphic matcher using MatchAndExplain().
+
+class NewEvenMatcherImpl : public MatcherInterface<int> {
+ public:
+  bool MatchAndExplain(int x, MatchResultListener* listener) const override {
+    const bool match = x % 2 == 0;
+    // Verifies that we can stream to a listener directly.
+    *listener << "value % " << 2;
+    if (listener->stream() != nullptr) {
+      // Verifies that we can stream to a listener's underlying stream
+      // too.
+      *listener->stream() << " == " << (x % 2);
+    }
+    return match;
+  }
+
+  void DescribeTo(ostream* os) const override { *os << "is an even number"; }
+};
+
+TEST(MatcherInterfaceTest, CanBeImplementedUsingNewAPI) {
+  Matcher<int> m = MakeMatcher(new NewEvenMatcherImpl);
+  EXPECT_TRUE(m.Matches(2));
+  EXPECT_FALSE(m.Matches(3));
+  EXPECT_EQ("value % 2 == 0", Explain(m, 2));
+  EXPECT_EQ("value % 2 == 1", Explain(m, 3));
+}
+
+INSTANTIATE_GTEST_MATCHER_TEST_P(MatcherTest);
+
+// Tests default-constructing a matcher.
+TEST(MatcherTest, CanBeDefaultConstructed) { Matcher<double> m; }
+
+// Tests that Matcher<T> can be constructed from a MatcherInterface<T>*.
+TEST(MatcherTest, CanBeConstructedFromMatcherInterface) {
+  const MatcherInterface<int>* impl = new EvenMatcherImpl;
+  Matcher<int> m(impl);
+  EXPECT_TRUE(m.Matches(4));
+  EXPECT_FALSE(m.Matches(5));
+}
+
+// Tests that value can be used in place of Eq(value).
+TEST(MatcherTest, CanBeImplicitlyConstructedFromValue) {
+  Matcher<int> m1 = 5;
+  EXPECT_TRUE(m1.Matches(5));
+  EXPECT_FALSE(m1.Matches(6));
+}
+
+// Tests that NULL can be used in place of Eq(NULL).
+TEST(MatcherTest, CanBeImplicitlyConstructedFromNULL) {
+  Matcher<int*> m1 = nullptr;
+  EXPECT_TRUE(m1.Matches(nullptr));
+  int n = 0;
+  EXPECT_FALSE(m1.Matches(&n));
+}
+
+// Tests that matchers can be constructed from a variable that is not properly
+// defined. This should be illegal, but many users rely on this accidentally.
+struct Undefined {
+  virtual ~Undefined() = 0;
+  static const int kInt = 1;
+};
+
+TEST(MatcherTest, CanBeConstructedFromUndefinedVariable) {
+  Matcher<int> m1 = Undefined::kInt;
+  EXPECT_TRUE(m1.Matches(1));
+  EXPECT_FALSE(m1.Matches(2));
+}
+
+// Test that a matcher parameterized with an abstract class compiles.
+TEST(MatcherTest, CanAcceptAbstractClass) { Matcher<const Undefined&> m = _; }
+
+// Tests that matchers are copyable.
+TEST(MatcherTest, IsCopyable) {
+  // Tests the copy constructor.
+  Matcher<bool> m1 = Eq(false);
+  EXPECT_TRUE(m1.Matches(false));
+  EXPECT_FALSE(m1.Matches(true));
+
+  // Tests the assignment operator.
+  m1 = Eq(true);
+  EXPECT_TRUE(m1.Matches(true));
+  EXPECT_FALSE(m1.Matches(false));
+}
+
+// Tests that Matcher<T>::DescribeTo() calls
+// MatcherInterface<T>::DescribeTo().
+TEST(MatcherTest, CanDescribeItself) {
+  EXPECT_EQ("is an even number", Describe(Matcher<int>(new EvenMatcherImpl)));
+}
+
+// Tests Matcher<T>::MatchAndExplain().
+TEST_P(MatcherTestP, MatchAndExplain) {
+  Matcher<int> m = GreaterThan(0);
+  StringMatchResultListener listener1;
+  EXPECT_TRUE(m.MatchAndExplain(42, &listener1));
+  EXPECT_EQ("which is 42 more than 0", listener1.str());
+
+  StringMatchResultListener listener2;
+  EXPECT_FALSE(m.MatchAndExplain(-9, &listener2));
+  EXPECT_EQ("which is 9 less than 0", listener2.str());
+}
+
+// Tests that a C-string literal can be implicitly converted to a
+// Matcher<std::string> or Matcher<const std::string&>.
+TEST(StringMatcherTest, CanBeImplicitlyConstructedFromCStringLiteral) {
+  Matcher<std::string> m1 = "hi";
+  EXPECT_TRUE(m1.Matches("hi"));
+  EXPECT_FALSE(m1.Matches("hello"));
+
+  Matcher<const std::string&> m2 = "hi";
+  EXPECT_TRUE(m2.Matches("hi"));
+  EXPECT_FALSE(m2.Matches("hello"));
+}
+
+// Tests that a string object can be implicitly converted to a
+// Matcher<std::string> or Matcher<const std::string&>.
+TEST(StringMatcherTest, CanBeImplicitlyConstructedFromString) {
+  Matcher<std::string> m1 = std::string("hi");
+  EXPECT_TRUE(m1.Matches("hi"));
+  EXPECT_FALSE(m1.Matches("hello"));
+
+  Matcher<const std::string&> m2 = std::string("hi");
+  EXPECT_TRUE(m2.Matches("hi"));
+  EXPECT_FALSE(m2.Matches("hello"));
+}
+
+#if GTEST_INTERNAL_HAS_STRING_VIEW
+// Tests that a C-string literal can be implicitly converted to a
+// Matcher<StringView> or Matcher<const StringView&>.
+TEST(StringViewMatcherTest, CanBeImplicitlyConstructedFromCStringLiteral) {
+  Matcher<internal::StringView> m1 = "cats";
+  EXPECT_TRUE(m1.Matches("cats"));
+  EXPECT_FALSE(m1.Matches("dogs"));
+
+  Matcher<const internal::StringView&> m2 = "cats";
+  EXPECT_TRUE(m2.Matches("cats"));
+  EXPECT_FALSE(m2.Matches("dogs"));
+}
+
+// Tests that a std::string object can be implicitly converted to a
+// Matcher<StringView> or Matcher<const StringView&>.
+TEST(StringViewMatcherTest, CanBeImplicitlyConstructedFromString) {
+  Matcher<internal::StringView> m1 = std::string("cats");
+  EXPECT_TRUE(m1.Matches("cats"));
+  EXPECT_FALSE(m1.Matches("dogs"));
+
+  Matcher<const internal::StringView&> m2 = std::string("cats");
+  EXPECT_TRUE(m2.Matches("cats"));
+  EXPECT_FALSE(m2.Matches("dogs"));
+}
+
+// Tests that a StringView object can be implicitly converted to a
+// Matcher<StringView> or Matcher<const StringView&>.
+TEST(StringViewMatcherTest, CanBeImplicitlyConstructedFromStringView) {
+  Matcher<internal::StringView> m1 = internal::StringView("cats");
+  EXPECT_TRUE(m1.Matches("cats"));
+  EXPECT_FALSE(m1.Matches("dogs"));
+
+  Matcher<const internal::StringView&> m2 = internal::StringView("cats");
+  EXPECT_TRUE(m2.Matches("cats"));
+  EXPECT_FALSE(m2.Matches("dogs"));
+}
+#endif  // GTEST_INTERNAL_HAS_STRING_VIEW
+
+// Tests that a std::reference_wrapper<std::string> object can be implicitly
+// converted to a Matcher<std::string> or Matcher<const std::string&> via Eq().
+TEST(StringMatcherTest,
+     CanBeImplicitlyConstructedFromEqReferenceWrapperString) {
+  std::string value = "cats";
+  Matcher<std::string> m1 = Eq(std::ref(value));
+  EXPECT_TRUE(m1.Matches("cats"));
+  EXPECT_FALSE(m1.Matches("dogs"));
+
+  Matcher<const std::string&> m2 = Eq(std::ref(value));
+  EXPECT_TRUE(m2.Matches("cats"));
+  EXPECT_FALSE(m2.Matches("dogs"));
+}
+
+// Tests that MakeMatcher() constructs a Matcher<T> from a
+// MatcherInterface* without requiring the user to explicitly
+// write the type.
+TEST(MakeMatcherTest, ConstructsMatcherFromMatcherInterface) {
+  const MatcherInterface<int>* dummy_impl = new EvenMatcherImpl;
+  Matcher<int> m = MakeMatcher(dummy_impl);
+}
+
+// Tests that MakePolymorphicMatcher() can construct a polymorphic
+// matcher from its implementation using the old API.
+const int g_bar = 1;
+class ReferencesBarOrIsZeroImpl {
+ public:
+  template <typename T>
+  bool MatchAndExplain(const T& x, MatchResultListener* /* listener */) const {
+    const void* p = &x;
+    return p == &g_bar || x == 0;
+  }
+
+  void DescribeTo(ostream* os) const { *os << "g_bar or zero"; }
+
+  void DescribeNegationTo(ostream* os) const {
+    *os << "doesn't reference g_bar and is not zero";
+  }
+};
+
+// This function verifies that MakePolymorphicMatcher() returns a
+// PolymorphicMatcher<T> where T is the argument's type.
+PolymorphicMatcher<ReferencesBarOrIsZeroImpl> ReferencesBarOrIsZero() {
+  return MakePolymorphicMatcher(ReferencesBarOrIsZeroImpl());
+}
+
+TEST(MakePolymorphicMatcherTest, ConstructsMatcherUsingOldAPI) {
+  // Using a polymorphic matcher to match a reference type.
+  Matcher<const int&> m1 = ReferencesBarOrIsZero();
+  EXPECT_TRUE(m1.Matches(0));
+  // Verifies that the identity of a by-reference argument is preserved.
+  EXPECT_TRUE(m1.Matches(g_bar));
+  EXPECT_FALSE(m1.Matches(1));
+  EXPECT_EQ("g_bar or zero", Describe(m1));
+
+  // Using a polymorphic matcher to match a value type.
+  Matcher<double> m2 = ReferencesBarOrIsZero();
+  EXPECT_TRUE(m2.Matches(0.0));
+  EXPECT_FALSE(m2.Matches(0.1));
+  EXPECT_EQ("g_bar or zero", Describe(m2));
+}
+
+// Tests implementing a polymorphic matcher using MatchAndExplain().
+
+class PolymorphicIsEvenImpl {
+ public:
+  void DescribeTo(ostream* os) const { *os << "is even"; }
+
+  void DescribeNegationTo(ostream* os) const { *os << "is odd"; }
+
+  template <typename T>
+  bool MatchAndExplain(const T& x, MatchResultListener* listener) const {
+    // Verifies that we can stream to the listener directly.
+    *listener << "% " << 2;
+    if (listener->stream() != nullptr) {
+      // Verifies that we can stream to the listener's underlying stream
+      // too.
+      *listener->stream() << " == " << (x % 2);
+    }
+    return (x % 2) == 0;
+  }
+};
+
+PolymorphicMatcher<PolymorphicIsEvenImpl> PolymorphicIsEven() {
+  return MakePolymorphicMatcher(PolymorphicIsEvenImpl());
+}
+
+TEST(MakePolymorphicMatcherTest, ConstructsMatcherUsingNewAPI) {
+  // Using PolymorphicIsEven() as a Matcher<int>.
+  const Matcher<int> m1 = PolymorphicIsEven();
+  EXPECT_TRUE(m1.Matches(42));
+  EXPECT_FALSE(m1.Matches(43));
+  EXPECT_EQ("is even", Describe(m1));
+
+  const Matcher<int> not_m1 = Not(m1);
+  EXPECT_EQ("is odd", Describe(not_m1));
+
+  EXPECT_EQ("% 2 == 0", Explain(m1, 42));
+
+  // Using PolymorphicIsEven() as a Matcher<char>.
+  const Matcher<char> m2 = PolymorphicIsEven();
+  EXPECT_TRUE(m2.Matches('\x42'));
+  EXPECT_FALSE(m2.Matches('\x43'));
+  EXPECT_EQ("is even", Describe(m2));
+
+  const Matcher<char> not_m2 = Not(m2);
+  EXPECT_EQ("is odd", Describe(not_m2));
+
+  EXPECT_EQ("% 2 == 0", Explain(m2, '\x42'));
+}
+
+INSTANTIATE_GTEST_MATCHER_TEST_P(MatcherCastTest);
+
+// Tests that MatcherCast<T>(m) works when m is a polymorphic matcher.
+TEST_P(MatcherCastTestP, FromPolymorphicMatcher) {
+  Matcher<int16_t> m;
+  if (use_gtest_matcher_) {
+    m = MatcherCast<int16_t>(GtestGreaterThan(int64_t{5}));
+  } else {
+    m = MatcherCast<int16_t>(Gt(int64_t{5}));
+  }
+  EXPECT_TRUE(m.Matches(6));
+  EXPECT_FALSE(m.Matches(4));
+}
+
+// For testing casting matchers between compatible types.
+class IntValue {
+ public:
+  // An int can be statically (although not implicitly) cast to a
+  // IntValue.
+  explicit IntValue(int a_value) : value_(a_value) {}
+
+  int value() const { return value_; }
+
+ private:
+  int value_;
+};
+
+// For testing casting matchers between compatible types. This is similar to
+// IntValue, but takes a non-const reference to the value, showing MatcherCast
+// works with such types (and doesn't, for example, use a const ref internally).
+class MutableIntView {
+ public:
+  // An int& can be statically (although not implicitly) cast to a
+  // MutableIntView.
+  explicit MutableIntView(int& a_value) : value_(a_value) {}
+
+  int& value() const { return value_; }
+
+ private:
+  int& value_;
+};
+
+// For testing casting matchers between compatible types.
+bool IsPositiveIntValue(const IntValue& foo) { return foo.value() > 0; }
+
+// For testing casting matchers between compatible types.
+bool IsPositiveMutableIntView(MutableIntView foo) { return foo.value() > 0; }
+
+// Tests that MatcherCast<T>(m) works when m is a Matcher<U> where T
+// can be statically converted to U.
+TEST(MatcherCastTest, FromCompatibleType) {
+  Matcher<double> m1 = Eq(2.0);
+  Matcher<int> m2 = MatcherCast<int>(m1);
+  EXPECT_TRUE(m2.Matches(2));
+  EXPECT_FALSE(m2.Matches(3));
+
+  Matcher<IntValue> m3 = Truly(IsPositiveIntValue);
+  Matcher<int> m4 = MatcherCast<int>(m3);
+  // In the following, the arguments 1 and 0 are statically converted
+  // to IntValue objects, and then tested by the IsPositiveIntValue()
+  // predicate.
+  EXPECT_TRUE(m4.Matches(1));
+  EXPECT_FALSE(m4.Matches(0));
+
+  Matcher<MutableIntView> m5 = Truly(IsPositiveMutableIntView);
+  Matcher<int> m6 = MatcherCast<int>(m5);
+  // In the following, the arguments 1 and 0 are statically converted to
+  // MutableIntView objects, and then tested by the IsPositiveMutableIntView()
+  // predicate.
+  EXPECT_TRUE(m6.Matches(1));
+  EXPECT_FALSE(m6.Matches(0));
+}
+
+// Tests that MatcherCast<T>(m) works when m is a Matcher<const T&>.
+TEST(MatcherCastTest, FromConstReferenceToNonReference) {
+  int n = 0;
+  Matcher<const int&> m1 = Ref(n);
+  Matcher<int> m2 = MatcherCast<int>(m1);
+  int n1 = 0;
+  EXPECT_TRUE(m2.Matches(n));
+  EXPECT_FALSE(m2.Matches(n1));
+}
+
+// Tests that MatcherCast<T&>(m) works when m is a Matcher<const T&>.
+TEST(MatcherCastTest, FromConstReferenceToReference) {
+  int n = 0;
+  Matcher<const int&> m1 = Ref(n);
+  Matcher<int&> m2 = MatcherCast<int&>(m1);
+  int n1 = 0;
+  EXPECT_TRUE(m2.Matches(n));
+  EXPECT_FALSE(m2.Matches(n1));
+}
+
+// Tests that MatcherCast<T>(m) works when m is a Matcher<T&>.
+TEST(MatcherCastTest, FromReferenceToNonReference) {
+  Matcher<int&> m1 = Eq(0);
+  Matcher<int> m2 = MatcherCast<int>(m1);
+  EXPECT_TRUE(m2.Matches(0));
+  EXPECT_FALSE(m2.Matches(1));
+
+  // Of course, reference identity isn't preserved since a copy is required.
+  int n = 0;
+  Matcher<int&> m3 = Ref(n);
+  Matcher<int> m4 = MatcherCast<int>(m3);
+  EXPECT_FALSE(m4.Matches(n));
+}
+
+// Tests that MatcherCast<const T&>(m) works when m is a Matcher<T>.
+TEST(MatcherCastTest, FromNonReferenceToConstReference) {
+  Matcher<int> m1 = Eq(0);
+  Matcher<const int&> m2 = MatcherCast<const int&>(m1);
+  EXPECT_TRUE(m2.Matches(0));
+  EXPECT_FALSE(m2.Matches(1));
+}
+
+// Tests that MatcherCast<T&>(m) works when m is a Matcher<T>.
+TEST(MatcherCastTest, FromNonReferenceToReference) {
+  Matcher<int> m1 = Eq(0);
+  Matcher<int&> m2 = MatcherCast<int&>(m1);
+  int n = 0;
+  EXPECT_TRUE(m2.Matches(n));
+  n = 1;
+  EXPECT_FALSE(m2.Matches(n));
+}
+
+// Tests that MatcherCast<T>(m) works when m is a Matcher<T>.
+TEST(MatcherCastTest, FromSameType) {
+  Matcher<int> m1 = Eq(0);
+  Matcher<int> m2 = MatcherCast<int>(m1);
+  EXPECT_TRUE(m2.Matches(0));
+  EXPECT_FALSE(m2.Matches(1));
+}
+
+// Tests that MatcherCast<T>(m) works when m is a value of the same type as the
+// value type of the Matcher.
+TEST(MatcherCastTest, FromAValue) {
+  Matcher<int> m = MatcherCast<int>(42);
+  EXPECT_TRUE(m.Matches(42));
+  EXPECT_FALSE(m.Matches(239));
+}
+
+// Tests that MatcherCast<T>(m) works when m is a value of the type implicitly
+// convertible to the value type of the Matcher.
+TEST(MatcherCastTest, FromAnImplicitlyConvertibleValue) {
+  const int kExpected = 'c';
+  Matcher<int> m = MatcherCast<int>('c');
+  EXPECT_TRUE(m.Matches(kExpected));
+  EXPECT_FALSE(m.Matches(kExpected + 1));
+}
+
+struct NonImplicitlyConstructibleTypeWithOperatorEq {
+  friend bool operator==(
+      const NonImplicitlyConstructibleTypeWithOperatorEq& /* ignored */,
+      int rhs) {
+    return 42 == rhs;
+  }
+  friend bool operator==(
+      int lhs,
+      const NonImplicitlyConstructibleTypeWithOperatorEq& /* ignored */) {
+    return lhs == 42;
+  }
+};
+
+// Tests that MatcherCast<T>(m) works when m is a neither a matcher nor
+// implicitly convertible to the value type of the Matcher, but the value type
+// of the matcher has operator==() overload accepting m.
+TEST(MatcherCastTest, NonImplicitlyConstructibleTypeWithOperatorEq) {
+  Matcher<NonImplicitlyConstructibleTypeWithOperatorEq> m1 =
+      MatcherCast<NonImplicitlyConstructibleTypeWithOperatorEq>(42);
+  EXPECT_TRUE(m1.Matches(NonImplicitlyConstructibleTypeWithOperatorEq()));
+
+  Matcher<NonImplicitlyConstructibleTypeWithOperatorEq> m2 =
+      MatcherCast<NonImplicitlyConstructibleTypeWithOperatorEq>(239);
+  EXPECT_FALSE(m2.Matches(NonImplicitlyConstructibleTypeWithOperatorEq()));
+
+  // When updating the following lines please also change the comment to
+  // namespace convertible_from_any.
+  Matcher<int> m3 =
+      MatcherCast<int>(NonImplicitlyConstructibleTypeWithOperatorEq());
+  EXPECT_TRUE(m3.Matches(42));
+  EXPECT_FALSE(m3.Matches(239));
+}
+
+// ConvertibleFromAny does not work with MSVC. resulting in
+// error C2440: 'initializing': cannot convert from 'Eq' to 'M'
+// No constructor could take the source type, or constructor overload
+// resolution was ambiguous
+
+#if !defined _MSC_VER
+
+// The below ConvertibleFromAny struct is implicitly constructible from anything
+// and when in the same namespace can interact with other tests. In particular,
+// if it is in the same namespace as other tests and one removes
+//   NonImplicitlyConstructibleTypeWithOperatorEq::operator==(int lhs, ...);
+// then the corresponding test still compiles (and it should not!) by implicitly
+// converting NonImplicitlyConstructibleTypeWithOperatorEq to ConvertibleFromAny
+// in m3.Matcher().
+namespace convertible_from_any {
+// Implicitly convertible from any type.
+struct ConvertibleFromAny {
+  ConvertibleFromAny(int a_value) : value(a_value) {}
+  template <typename T>
+  ConvertibleFromAny(const T& /*a_value*/) : value(-1) {
+    ADD_FAILURE() << "Conversion constructor called";
+  }
+  int value;
+};
+
+bool operator==(const ConvertibleFromAny& a, const ConvertibleFromAny& b) {
+  return a.value == b.value;
+}
+
+ostream& operator<<(ostream& os, const ConvertibleFromAny& a) {
+  return os << a.value;
+}
+
+TEST(MatcherCastTest, ConversionConstructorIsUsed) {
+  Matcher<ConvertibleFromAny> m = MatcherCast<ConvertibleFromAny>(1);
+  EXPECT_TRUE(m.Matches(ConvertibleFromAny(1)));
+  EXPECT_FALSE(m.Matches(ConvertibleFromAny(2)));
+}
+
+TEST(MatcherCastTest, FromConvertibleFromAny) {
+  Matcher<ConvertibleFromAny> m =
+      MatcherCast<ConvertibleFromAny>(Eq(ConvertibleFromAny(1)));
+  EXPECT_TRUE(m.Matches(ConvertibleFromAny(1)));
+  EXPECT_FALSE(m.Matches(ConvertibleFromAny(2)));
+}
+}  // namespace convertible_from_any
+
+#endif  // !defined _MSC_VER
+
+struct IntReferenceWrapper {
+  IntReferenceWrapper(const int& a_value) : value(&a_value) {}
+  const int* value;
+};
+
+bool operator==(const IntReferenceWrapper& a, const IntReferenceWrapper& b) {
+  return a.value == b.value;
+}
+
+TEST(MatcherCastTest, ValueIsNotCopied) {
+  int n = 42;
+  Matcher<IntReferenceWrapper> m = MatcherCast<IntReferenceWrapper>(n);
+  // Verify that the matcher holds a reference to n, not to its temporary copy.
+  EXPECT_TRUE(m.Matches(n));
+}
+
+class Base {
+ public:
+  virtual ~Base() = default;
+  Base() = default;
+
+ private:
+  Base(const Base&) = delete;
+  Base& operator=(const Base&) = delete;
+};
+
+class Derived : public Base {
+ public:
+  Derived() : Base() {}
+  int i;
+};
+
+class OtherDerived : public Base {};
+
+INSTANTIATE_GTEST_MATCHER_TEST_P(SafeMatcherCastTest);
+
+// Tests that SafeMatcherCast<T>(m) works when m is a polymorphic matcher.
+TEST_P(SafeMatcherCastTestP, FromPolymorphicMatcher) {
+  Matcher<char> m2;
+  if (use_gtest_matcher_) {
+    m2 = SafeMatcherCast<char>(GtestGreaterThan(32));
+  } else {
+    m2 = SafeMatcherCast<char>(Gt(32));
+  }
+  EXPECT_TRUE(m2.Matches('A'));
+  EXPECT_FALSE(m2.Matches('\n'));
+}
+
+// Tests that SafeMatcherCast<T>(m) works when m is a Matcher<U> where
+// T and U are arithmetic types and T can be losslessly converted to
+// U.
+TEST(SafeMatcherCastTest, FromLosslesslyConvertibleArithmeticType) {
+  Matcher<double> m1 = DoubleEq(1.0);
+  Matcher<float> m2 = SafeMatcherCast<float>(m1);
+  EXPECT_TRUE(m2.Matches(1.0f));
+  EXPECT_FALSE(m2.Matches(2.0f));
+
+  Matcher<char> m3 = SafeMatcherCast<char>(TypedEq<int>('a'));
+  EXPECT_TRUE(m3.Matches('a'));
+  EXPECT_FALSE(m3.Matches('b'));
+}
+
+// Tests that SafeMatcherCast<T>(m) works when m is a Matcher<U> where T and U
+// are pointers or references to a derived and a base class, correspondingly.
+TEST(SafeMatcherCastTest, FromBaseClass) {
+  Derived d, d2;
+  Matcher<Base*> m1 = Eq(&d);
+  Matcher<Derived*> m2 = SafeMatcherCast<Derived*>(m1);
+  EXPECT_TRUE(m2.Matches(&d));
+  EXPECT_FALSE(m2.Matches(&d2));
+
+  Matcher<Base&> m3 = Ref(d);
+  Matcher<Derived&> m4 = SafeMatcherCast<Derived&>(m3);
+  EXPECT_TRUE(m4.Matches(d));
+  EXPECT_FALSE(m4.Matches(d2));
+}
+
+// Tests that SafeMatcherCast<T>(m) works when m is a Matcher<const T&>.
+TEST(SafeMatcherCastTest, FromConstReferenceToNonReference) {
+  int n = 0;
+  Matcher<const int&> m1 = Ref(n);
+  Matcher<int> m2 = SafeMatcherCast<int>(m1);
+  int n1 = 0;
+  EXPECT_TRUE(m2.Matches(n));
+  EXPECT_FALSE(m2.Matches(n1));
+}
+
+// Tests that SafeMatcherCast<T&>(m) works when m is a Matcher<const T&>.
+TEST(SafeMatcherCastTest, FromConstReferenceToReference) {
+  int n = 0;
+  Matcher<const int&> m1 = Ref(n);
+  Matcher<int&> m2 = SafeMatcherCast<int&>(m1);
+  int n1 = 0;
+  EXPECT_TRUE(m2.Matches(n));
+  EXPECT_FALSE(m2.Matches(n1));
+}
+
+// Tests that MatcherCast<const T&>(m) works when m is a Matcher<T>.
+TEST(SafeMatcherCastTest, FromNonReferenceToConstReference) {
+  Matcher<std::unique_ptr<int>> m1 = IsNull();
+  Matcher<const std::unique_ptr<int>&> m2 =
+      SafeMatcherCast<const std::unique_ptr<int>&>(m1);
+  EXPECT_TRUE(m2.Matches(std::unique_ptr<int>()));
+  EXPECT_FALSE(m2.Matches(std::unique_ptr<int>(new int)));
+}
+
+// Tests that SafeMatcherCast<T&>(m) works when m is a Matcher<T>.
+TEST(SafeMatcherCastTest, FromNonReferenceToReference) {
+  Matcher<int> m1 = Eq(0);
+  Matcher<int&> m2 = SafeMatcherCast<int&>(m1);
+  int n = 0;
+  EXPECT_TRUE(m2.Matches(n));
+  n = 1;
+  EXPECT_FALSE(m2.Matches(n));
+}
+
+// Tests that SafeMatcherCast<T>(m) works when m is a Matcher<T>.
+TEST(SafeMatcherCastTest, FromSameType) {
+  Matcher<int> m1 = Eq(0);
+  Matcher<int> m2 = SafeMatcherCast<int>(m1);
+  EXPECT_TRUE(m2.Matches(0));
+  EXPECT_FALSE(m2.Matches(1));
+}
+
+#if !defined _MSC_VER
+
+namespace convertible_from_any {
+TEST(SafeMatcherCastTest, ConversionConstructorIsUsed) {
+  Matcher<ConvertibleFromAny> m = SafeMatcherCast<ConvertibleFromAny>(1);
+  EXPECT_TRUE(m.Matches(ConvertibleFromAny(1)));
+  EXPECT_FALSE(m.Matches(ConvertibleFromAny(2)));
+}
+
+TEST(SafeMatcherCastTest, FromConvertibleFromAny) {
+  Matcher<ConvertibleFromAny> m =
+      SafeMatcherCast<ConvertibleFromAny>(Eq(ConvertibleFromAny(1)));
+  EXPECT_TRUE(m.Matches(ConvertibleFromAny(1)));
+  EXPECT_FALSE(m.Matches(ConvertibleFromAny(2)));
+}
+}  // namespace convertible_from_any
+
+#endif  // !defined _MSC_VER
+
+TEST(SafeMatcherCastTest, ValueIsNotCopied) {
+  int n = 42;
+  Matcher<IntReferenceWrapper> m = SafeMatcherCast<IntReferenceWrapper>(n);
+  // Verify that the matcher holds a reference to n, not to its temporary copy.
+  EXPECT_TRUE(m.Matches(n));
+}
+
+TEST(ExpectThat, TakesLiterals) {
+  EXPECT_THAT(1, 1);
+  EXPECT_THAT(1.0, 1.0);
+  EXPECT_THAT(std::string(), "");
+}
+
+TEST(ExpectThat, TakesFunctions) {
+  struct Helper {
+    static void Func() {}
+  };
+  void (*func)() = Helper::Func;
+  EXPECT_THAT(func, Helper::Func);
+  EXPECT_THAT(func, &Helper::Func);
+}
+
+// Tests that A<T>() matches any value of type T.
+TEST(ATest, MatchesAnyValue) {
+  // Tests a matcher for a value type.
+  Matcher<double> m1 = A<double>();
+  EXPECT_TRUE(m1.Matches(91.43));
+  EXPECT_TRUE(m1.Matches(-15.32));
+
+  // Tests a matcher for a reference type.
+  int a = 2;
+  int b = -6;
+  Matcher<int&> m2 = A<int&>();
+  EXPECT_TRUE(m2.Matches(a));
+  EXPECT_TRUE(m2.Matches(b));
+}
+
+TEST(ATest, WorksForDerivedClass) {
+  Base base;
+  Derived derived;
+  EXPECT_THAT(&base, A<Base*>());
+  // This shouldn't compile: EXPECT_THAT(&base, A<Derived*>());
+  EXPECT_THAT(&derived, A<Base*>());
+  EXPECT_THAT(&derived, A<Derived*>());
+}
+
+// Tests that A<T>() describes itself properly.
+TEST(ATest, CanDescribeSelf) { EXPECT_EQ("is anything", Describe(A<bool>())); }
+
+// Tests that An<T>() matches any value of type T.
+TEST(AnTest, MatchesAnyValue) {
+  // Tests a matcher for a value type.
+  Matcher<int> m1 = An<int>();
+  EXPECT_TRUE(m1.Matches(9143));
+  EXPECT_TRUE(m1.Matches(-1532));
+
+  // Tests a matcher for a reference type.
+  int a = 2;
+  int b = -6;
+  Matcher<int&> m2 = An<int&>();
+  EXPECT_TRUE(m2.Matches(a));
+  EXPECT_TRUE(m2.Matches(b));
+}
+
+// Tests that An<T>() describes itself properly.
+TEST(AnTest, CanDescribeSelf) { EXPECT_EQ("is anything", Describe(An<int>())); }
+
+// Tests that _ can be used as a matcher for any type and matches any
+// value of that type.
+TEST(UnderscoreTest, MatchesAnyValue) {
+  // Uses _ as a matcher for a value type.
+  Matcher<int> m1 = _;
+  EXPECT_TRUE(m1.Matches(123));
+  EXPECT_TRUE(m1.Matches(-242));
+
+  // Uses _ as a matcher for a reference type.
+  bool a = false;
+  const bool b = true;
+  Matcher<const bool&> m2 = _;
+  EXPECT_TRUE(m2.Matches(a));
+  EXPECT_TRUE(m2.Matches(b));
+}
+
+// Tests that _ describes itself properly.
+TEST(UnderscoreTest, CanDescribeSelf) {
+  Matcher<int> m = _;
+  EXPECT_EQ("is anything", Describe(m));
+}
+
+// Tests that Eq(x) matches any value equal to x.
+TEST(EqTest, MatchesEqualValue) {
+  // 2 C-strings with same content but different addresses.
+  const char a1[] = "hi";
+  const char a2[] = "hi";
+
+  Matcher<const char*> m1 = Eq(a1);
+  EXPECT_TRUE(m1.Matches(a1));
+  EXPECT_FALSE(m1.Matches(a2));
+}
+
+// Tests that Eq(v) describes itself properly.
+
+class Unprintable {
+ public:
+  Unprintable() : c_('a') {}
+
+  bool operator==(const Unprintable& /* rhs */) const { return true; }
+  // -Wunused-private-field: dummy accessor for `c_`.
+  char dummy_c() { return c_; }
+
+ private:
+  char c_;
+};
+
+TEST(EqTest, CanDescribeSelf) {
+  Matcher<Unprintable> m = Eq(Unprintable());
+  EXPECT_EQ("is equal to 1-byte object <61>", Describe(m));
+}
+
+// Tests that Eq(v) can be used to match any type that supports
+// comparing with type T, where T is v's type.
+TEST(EqTest, IsPolymorphic) {
+  Matcher<int> m1 = Eq(1);
+  EXPECT_TRUE(m1.Matches(1));
+  EXPECT_FALSE(m1.Matches(2));
+
+  Matcher<char> m2 = Eq(1);
+  EXPECT_TRUE(m2.Matches('\1'));
+  EXPECT_FALSE(m2.Matches('a'));
+}
+
+// Tests that TypedEq<T>(v) matches values of type T that's equal to v.
+TEST(TypedEqTest, ChecksEqualityForGivenType) {
+  Matcher<char> m1 = TypedEq<char>('a');
+  EXPECT_TRUE(m1.Matches('a'));
+  EXPECT_FALSE(m1.Matches('b'));
+
+  Matcher<int> m2 = TypedEq<int>(6);
+  EXPECT_TRUE(m2.Matches(6));
+  EXPECT_FALSE(m2.Matches(7));
+}
+
+// Tests that TypedEq(v) describes itself properly.
+TEST(TypedEqTest, CanDescribeSelf) {
+  EXPECT_EQ("is equal to 2", Describe(TypedEq<int>(2)));
+}
+
+// Tests that TypedEq<T>(v) has type Matcher<T>.
+
+// Type<T>::IsTypeOf(v) compiles if and only if the type of value v is T, where
+// T is a "bare" type (i.e. not in the form of const U or U&).  If v's type is
+// not T, the compiler will generate a message about "undefined reference".
+template <typename T>
+struct Type {
+  static bool IsTypeOf(const T& /* v */) { return true; }
+
+  template <typename T2>
+  static void IsTypeOf(T2 v);
+};
+
+TEST(TypedEqTest, HasSpecifiedType) {
+  // Verifies that the type of TypedEq<T>(v) is Matcher<T>.
+  Type<Matcher<int>>::IsTypeOf(TypedEq<int>(5));
+  Type<Matcher<double>>::IsTypeOf(TypedEq<double>(5));
+}
+
+// Tests that Ge(v) matches anything >= v.
+TEST(GeTest, ImplementsGreaterThanOrEqual) {
+  Matcher<int> m1 = Ge(0);
+  EXPECT_TRUE(m1.Matches(1));
+  EXPECT_TRUE(m1.Matches(0));
+  EXPECT_FALSE(m1.Matches(-1));
+}
+
+// Tests that Ge(v) describes itself properly.
+TEST(GeTest, CanDescribeSelf) {
+  Matcher<int> m = Ge(5);
+  EXPECT_EQ("is >= 5", Describe(m));
+}
+
+// Tests that Gt(v) matches anything > v.
+TEST(GtTest, ImplementsGreaterThan) {
+  Matcher<double> m1 = Gt(0);
+  EXPECT_TRUE(m1.Matches(1.0));
+  EXPECT_FALSE(m1.Matches(0.0));
+  EXPECT_FALSE(m1.Matches(-1.0));
+}
+
+// Tests that Gt(v) describes itself properly.
+TEST(GtTest, CanDescribeSelf) {
+  Matcher<int> m = Gt(5);
+  EXPECT_EQ("is > 5", Describe(m));
+}
+
+// Tests that Le(v) matches anything <= v.
+TEST(LeTest, ImplementsLessThanOrEqual) {
+  Matcher<char> m1 = Le('b');
+  EXPECT_TRUE(m1.Matches('a'));
+  EXPECT_TRUE(m1.Matches('b'));
+  EXPECT_FALSE(m1.Matches('c'));
+}
+
+// Tests that Le(v) describes itself properly.
+TEST(LeTest, CanDescribeSelf) {
+  Matcher<int> m = Le(5);
+  EXPECT_EQ("is <= 5", Describe(m));
+}
+
+// Tests that Lt(v) matches anything < v.
+TEST(LtTest, ImplementsLessThan) {
+  Matcher<const std::string&> m1 = Lt("Hello");
+  EXPECT_TRUE(m1.Matches("Abc"));
+  EXPECT_FALSE(m1.Matches("Hello"));
+  EXPECT_FALSE(m1.Matches("Hello, world!"));
+}
+
+// Tests that Lt(v) describes itself properly.
+TEST(LtTest, CanDescribeSelf) {
+  Matcher<int> m = Lt(5);
+  EXPECT_EQ("is < 5", Describe(m));
+}
+
+// Tests that Ne(v) matches anything != v.
+TEST(NeTest, ImplementsNotEqual) {
+  Matcher<int> m1 = Ne(0);
+  EXPECT_TRUE(m1.Matches(1));
+  EXPECT_TRUE(m1.Matches(-1));
+  EXPECT_FALSE(m1.Matches(0));
+}
+
+// Tests that Ne(v) describes itself properly.
+TEST(NeTest, CanDescribeSelf) {
+  Matcher<int> m = Ne(5);
+  EXPECT_EQ("isn't equal to 5", Describe(m));
+}
+
+class MoveOnly {
+ public:
+  explicit MoveOnly(int i) : i_(i) {}
+  MoveOnly(const MoveOnly&) = delete;
+  MoveOnly(MoveOnly&&) = default;
+  MoveOnly& operator=(const MoveOnly&) = delete;
+  MoveOnly& operator=(MoveOnly&&) = default;
+
+  bool operator==(const MoveOnly& other) const { return i_ == other.i_; }
+  bool operator!=(const MoveOnly& other) const { return i_ != other.i_; }
+  bool operator<(const MoveOnly& other) const { return i_ < other.i_; }
+  bool operator<=(const MoveOnly& other) const { return i_ <= other.i_; }
+  bool operator>(const MoveOnly& other) const { return i_ > other.i_; }
+  bool operator>=(const MoveOnly& other) const { return i_ >= other.i_; }
+
+ private:
+  int i_;
+};
+
+struct MoveHelper {
+  MOCK_METHOD1(Call, void(MoveOnly));
+};
+
+// Disable this test in VS 2015 (version 14), where it fails when SEH is enabled
+#if defined(_MSC_VER) && (_MSC_VER < 1910)
+TEST(ComparisonBaseTest, DISABLED_WorksWithMoveOnly) {
+#else
+TEST(ComparisonBaseTest, WorksWithMoveOnly) {
+#endif
+  MoveOnly m{0};
+  MoveHelper helper;
+
+  EXPECT_CALL(helper, Call(Eq(ByRef(m))));
+  helper.Call(MoveOnly(0));
+  EXPECT_CALL(helper, Call(Ne(ByRef(m))));
+  helper.Call(MoveOnly(1));
+  EXPECT_CALL(helper, Call(Le(ByRef(m))));
+  helper.Call(MoveOnly(0));
+  EXPECT_CALL(helper, Call(Lt(ByRef(m))));
+  helper.Call(MoveOnly(-1));
+  EXPECT_CALL(helper, Call(Ge(ByRef(m))));
+  helper.Call(MoveOnly(0));
+  EXPECT_CALL(helper, Call(Gt(ByRef(m))));
+  helper.Call(MoveOnly(1));
+}
+
+TEST(IsEmptyTest, MatchesContainer) {
+  const Matcher<std::vector<int>> m = IsEmpty();
+  std::vector<int> a = {};
+  std::vector<int> b = {1};
+  EXPECT_TRUE(m.Matches(a));
+  EXPECT_FALSE(m.Matches(b));
+}
+
+TEST(IsEmptyTest, MatchesStdString) {
+  const Matcher<std::string> m = IsEmpty();
+  std::string a = "z";
+  std::string b = "";
+  EXPECT_FALSE(m.Matches(a));
+  EXPECT_TRUE(m.Matches(b));
+}
+
+TEST(IsEmptyTest, MatchesCString) {
+  const Matcher<const char*> m = IsEmpty();
+  const char a[] = "";
+  const char b[] = "x";
+  EXPECT_TRUE(m.Matches(a));
+  EXPECT_FALSE(m.Matches(b));
+}
+
+// Tests that IsNull() matches any NULL pointer of any type.
+TEST(IsNullTest, MatchesNullPointer) {
+  Matcher<int*> m1 = IsNull();
+  int* p1 = nullptr;
+  int n = 0;
+  EXPECT_TRUE(m1.Matches(p1));
+  EXPECT_FALSE(m1.Matches(&n));
+
+  Matcher<const char*> m2 = IsNull();
+  const char* p2 = nullptr;
+  EXPECT_TRUE(m2.Matches(p2));
+  EXPECT_FALSE(m2.Matches("hi"));
+
+  Matcher<void*> m3 = IsNull();
+  void* p3 = nullptr;
+  EXPECT_TRUE(m3.Matches(p3));
+  EXPECT_FALSE(m3.Matches(reinterpret_cast<void*>(0xbeef)));
+}
+
+TEST(IsNullTest, StdFunction) {
+  const Matcher<std::function<void()>> m = IsNull();
+
+  EXPECT_TRUE(m.Matches(std::function<void()>()));
+  EXPECT_FALSE(m.Matches([] {}));
+}
+
+// Tests that IsNull() describes itself properly.
+TEST(IsNullTest, CanDescribeSelf) {
+  Matcher<int*> m = IsNull();
+  EXPECT_EQ("is NULL", Describe(m));
+  EXPECT_EQ("isn't NULL", DescribeNegation(m));
+}
+
+// Tests that NotNull() matches any non-NULL pointer of any type.
+TEST(NotNullTest, MatchesNonNullPointer) {
+  Matcher<int*> m1 = NotNull();
+  int* p1 = nullptr;
+  int n = 0;
+  EXPECT_FALSE(m1.Matches(p1));
+  EXPECT_TRUE(m1.Matches(&n));
+
+  Matcher<const char*> m2 = NotNull();
+  const char* p2 = nullptr;
+  EXPECT_FALSE(m2.Matches(p2));
+  EXPECT_TRUE(m2.Matches("hi"));
+}
+
+TEST(NotNullTest, LinkedPtr) {
+  const Matcher<std::shared_ptr<int>> m = NotNull();
+  const std::shared_ptr<int> null_p;
+  const std::shared_ptr<int> non_null_p(new int);
+
+  EXPECT_FALSE(m.Matches(null_p));
+  EXPECT_TRUE(m.Matches(non_null_p));
+}
+
+TEST(NotNullTest, ReferenceToConstLinkedPtr) {
+  const Matcher<const std::shared_ptr<double>&> m = NotNull();
+  const std::shared_ptr<double> null_p;
+  const std::shared_ptr<double> non_null_p(new double);
+
+  EXPECT_FALSE(m.Matches(null_p));
+  EXPECT_TRUE(m.Matches(non_null_p));
+}
+
+TEST(NotNullTest, StdFunction) {
+  const Matcher<std::function<void()>> m = NotNull();
+
+  EXPECT_TRUE(m.Matches([] {}));
+  EXPECT_FALSE(m.Matches(std::function<void()>()));
+}
+
+// Tests that NotNull() describes itself properly.
+TEST(NotNullTest, CanDescribeSelf) {
+  Matcher<int*> m = NotNull();
+  EXPECT_EQ("isn't NULL", Describe(m));
+}
+
+// Tests that Ref(variable) matches an argument that references
+// 'variable'.
+TEST(RefTest, MatchesSameVariable) {
+  int a = 0;
+  int b = 0;
+  Matcher<int&> m = Ref(a);
+  EXPECT_TRUE(m.Matches(a));
+  EXPECT_FALSE(m.Matches(b));
+}
+
+// Tests that Ref(variable) describes itself properly.
+TEST(RefTest, CanDescribeSelf) {
+  int n = 5;
+  Matcher<int&> m = Ref(n);
+  stringstream ss;
+  ss << "references the variable @" << &n << " 5";
+  EXPECT_EQ(ss.str(), Describe(m));
+}
+
+// Test that Ref(non_const_varialbe) can be used as a matcher for a
+// const reference.
+TEST(RefTest, CanBeUsedAsMatcherForConstReference) {
+  int a = 0;
+  int b = 0;
+  Matcher<const int&> m = Ref(a);
+  EXPECT_TRUE(m.Matches(a));
+  EXPECT_FALSE(m.Matches(b));
+}
+
+// Tests that Ref(variable) is covariant, i.e. Ref(derived) can be
+// used wherever Ref(base) can be used (Ref(derived) is a sub-type
+// of Ref(base), but not vice versa.
+
+TEST(RefTest, IsCovariant) {
+  Base base, base2;
+  Derived derived;
+  Matcher<const Base&> m1 = Ref(base);
+  EXPECT_TRUE(m1.Matches(base));
+  EXPECT_FALSE(m1.Matches(base2));
+  EXPECT_FALSE(m1.Matches(derived));
+
+  m1 = Ref(derived);
+  EXPECT_TRUE(m1.Matches(derived));
+  EXPECT_FALSE(m1.Matches(base));
+  EXPECT_FALSE(m1.Matches(base2));
+}
+
+TEST(RefTest, ExplainsResult) {
+  int n = 0;
+  EXPECT_THAT(Explain(Matcher<const int&>(Ref(n)), n),
+              StartsWith("which is located @"));
+
+  int m = 0;
+  EXPECT_THAT(Explain(Matcher<const int&>(Ref(n)), m),
+              StartsWith("which is located @"));
+}
+
+// Tests string comparison matchers.
+
+template <typename T = std::string>
+std::string FromStringLike(internal::StringLike<T> str) {
+  return std::string(str);
+}
+
+TEST(StringLike, TestConversions) {
+  EXPECT_EQ("foo", FromStringLike("foo"));
+  EXPECT_EQ("foo", FromStringLike(std::string("foo")));
+#if GTEST_INTERNAL_HAS_STRING_VIEW
+  EXPECT_EQ("foo", FromStringLike(internal::StringView("foo")));
+#endif  // GTEST_INTERNAL_HAS_STRING_VIEW
+
+  // Non deducible types.
+  EXPECT_EQ("", FromStringLike({}));
+  EXPECT_EQ("foo", FromStringLike({'f', 'o', 'o'}));
+  const char buf[] = "foo";
+  EXPECT_EQ("foo", FromStringLike({buf, buf + 3}));
+}
+
+TEST(StrEqTest, MatchesEqualString) {
+  Matcher<const char*> m = StrEq(std::string("Hello"));
+  EXPECT_TRUE(m.Matches("Hello"));
+  EXPECT_FALSE(m.Matches("hello"));
+  EXPECT_FALSE(m.Matches(nullptr));
+
+  Matcher<const std::string&> m2 = StrEq("Hello");
+  EXPECT_TRUE(m2.Matches("Hello"));
+  EXPECT_FALSE(m2.Matches("Hi"));
+
+#if GTEST_INTERNAL_HAS_STRING_VIEW
+  Matcher<const internal::StringView&> m3 =
+      StrEq(internal::StringView("Hello"));
+  EXPECT_TRUE(m3.Matches(internal::StringView("Hello")));
+  EXPECT_FALSE(m3.Matches(internal::StringView("hello")));
+  EXPECT_FALSE(m3.Matches(internal::StringView()));
+
+  Matcher<const internal::StringView&> m_empty = StrEq("");
+  EXPECT_TRUE(m_empty.Matches(internal::StringView("")));
+  EXPECT_TRUE(m_empty.Matches(internal::StringView()));
+  EXPECT_FALSE(m_empty.Matches(internal::StringView("hello")));
+#endif  // GTEST_INTERNAL_HAS_STRING_VIEW
+}
+
+TEST(StrEqTest, CanDescribeSelf) {
+  Matcher<std::string> m = StrEq("Hi-\'\"?\\\a\b\f\n\r\t\v\xD3");
+  EXPECT_EQ("is equal to \"Hi-\'\\\"?\\\\\\a\\b\\f\\n\\r\\t\\v\\xD3\"",
+            Describe(m));
+
+  std::string str("01204500800");
+  str[3] = '\0';
+  Matcher<std::string> m2 = StrEq(str);
+  EXPECT_EQ("is equal to \"012\\04500800\"", Describe(m2));
+  str[0] = str[6] = str[7] = str[9] = str[10] = '\0';
+  Matcher<std::string> m3 = StrEq(str);
+  EXPECT_EQ("is equal to \"\\012\\045\\0\\08\\0\\0\"", Describe(m3));
+}
+
+TEST(StrNeTest, MatchesUnequalString) {
+  Matcher<const char*> m = StrNe("Hello");
+  EXPECT_TRUE(m.Matches(""));
+  EXPECT_TRUE(m.Matches(nullptr));
+  EXPECT_FALSE(m.Matches("Hello"));
+
+  Matcher<std::string> m2 = StrNe(std::string("Hello"));
+  EXPECT_TRUE(m2.Matches("hello"));
+  EXPECT_FALSE(m2.Matches("Hello"));
+
+#if GTEST_INTERNAL_HAS_STRING_VIEW
+  Matcher<const internal::StringView> m3 = StrNe(internal::StringView("Hello"));
+  EXPECT_TRUE(m3.Matches(internal::StringView("")));
+  EXPECT_TRUE(m3.Matches(internal::StringView()));
+  EXPECT_FALSE(m3.Matches(internal::StringView("Hello")));
+#endif  // GTEST_INTERNAL_HAS_STRING_VIEW
+}
+
+TEST(StrNeTest, CanDescribeSelf) {
+  Matcher<const char*> m = StrNe("Hi");
+  EXPECT_EQ("isn't equal to \"Hi\"", Describe(m));
+}
+
+TEST(StrCaseEqTest, MatchesEqualStringIgnoringCase) {
+  Matcher<const char*> m = StrCaseEq(std::string("Hello"));
+  EXPECT_TRUE(m.Matches("Hello"));
+  EXPECT_TRUE(m.Matches("hello"));
+  EXPECT_FALSE(m.Matches("Hi"));
+  EXPECT_FALSE(m.Matches(nullptr));
+
+  Matcher<const std::string&> m2 = StrCaseEq("Hello");
+  EXPECT_TRUE(m2.Matches("hello"));
+  EXPECT_FALSE(m2.Matches("Hi"));
+
+#if GTEST_INTERNAL_HAS_STRING_VIEW
+  Matcher<const internal::StringView&> m3 =
+      StrCaseEq(internal::StringView("Hello"));
+  EXPECT_TRUE(m3.Matches(internal::StringView("Hello")));
+  EXPECT_TRUE(m3.Matches(internal::StringView("hello")));
+  EXPECT_FALSE(m3.Matches(internal::StringView("Hi")));
+  EXPECT_FALSE(m3.Matches(internal::StringView()));
+#endif  // GTEST_INTERNAL_HAS_STRING_VIEW
+}
+
+TEST(StrCaseEqTest, MatchesEqualStringWith0IgnoringCase) {
+  std::string str1("oabocdooeoo");
+  std::string str2("OABOCDOOEOO");
+  Matcher<const std::string&> m0 = StrCaseEq(str1);
+  EXPECT_FALSE(m0.Matches(str2 + std::string(1, '\0')));
+
+  str1[3] = str2[3] = '\0';
+  Matcher<const std::string&> m1 = StrCaseEq(str1);
+  EXPECT_TRUE(m1.Matches(str2));
+
+  str1[0] = str1[6] = str1[7] = str1[10] = '\0';
+  str2[0] = str2[6] = str2[7] = str2[10] = '\0';
+  Matcher<const std::string&> m2 = StrCaseEq(str1);
+  str1[9] = str2[9] = '\0';
+  EXPECT_FALSE(m2.Matches(str2));
+
+  Matcher<const std::string&> m3 = StrCaseEq(str1);
+  EXPECT_TRUE(m3.Matches(str2));
+
+  EXPECT_FALSE(m3.Matches(str2 + "x"));
+  str2.append(1, '\0');
+  EXPECT_FALSE(m3.Matches(str2));
+  EXPECT_FALSE(m3.Matches(std::string(str2, 0, 9)));
+}
+
+TEST(StrCaseEqTest, CanDescribeSelf) {
+  Matcher<std::string> m = StrCaseEq("Hi");
+  EXPECT_EQ("is equal to (ignoring case) \"Hi\"", Describe(m));
+}
+
+TEST(StrCaseNeTest, MatchesUnequalStringIgnoringCase) {
+  Matcher<const char*> m = StrCaseNe("Hello");
+  EXPECT_TRUE(m.Matches("Hi"));
+  EXPECT_TRUE(m.Matches(nullptr));
+  EXPECT_FALSE(m.Matches("Hello"));
+  EXPECT_FALSE(m.Matches("hello"));
+
+  Matcher<std::string> m2 = StrCaseNe(std::string("Hello"));
+  EXPECT_TRUE(m2.Matches(""));
+  EXPECT_FALSE(m2.Matches("Hello"));
+
+#if GTEST_INTERNAL_HAS_STRING_VIEW
+  Matcher<const internal::StringView> m3 =
+      StrCaseNe(internal::StringView("Hello"));
+  EXPECT_TRUE(m3.Matches(internal::StringView("Hi")));
+  EXPECT_TRUE(m3.Matches(internal::StringView()));
+  EXPECT_FALSE(m3.Matches(internal::StringView("Hello")));
+  EXPECT_FALSE(m3.Matches(internal::StringView("hello")));
+#endif  // GTEST_INTERNAL_HAS_STRING_VIEW
+}
+
+TEST(StrCaseNeTest, CanDescribeSelf) {
+  Matcher<const char*> m = StrCaseNe("Hi");
+  EXPECT_EQ("isn't equal to (ignoring case) \"Hi\"", Describe(m));
+}
+
+// Tests that HasSubstr() works for matching string-typed values.
+TEST(HasSubstrTest, WorksForStringClasses) {
+  const Matcher<std::string> m1 = HasSubstr("foo");
+  EXPECT_TRUE(m1.Matches(std::string("I love food.")));
+  EXPECT_FALSE(m1.Matches(std::string("tofo")));
+
+  const Matcher<const std::string&> m2 = HasSubstr("foo");
+  EXPECT_TRUE(m2.Matches(std::string("I love food.")));
+  EXPECT_FALSE(m2.Matches(std::string("tofo")));
+
+  const Matcher<std::string> m_empty = HasSubstr("");
+  EXPECT_TRUE(m_empty.Matches(std::string()));
+  EXPECT_TRUE(m_empty.Matches(std::string("not empty")));
+}
+
+// Tests that HasSubstr() works for matching C-string-typed values.
+TEST(HasSubstrTest, WorksForCStrings) {
+  const Matcher<char*> m1 = HasSubstr("foo");
+  EXPECT_TRUE(m1.Matches(const_cast<char*>("I love food.")));
+  EXPECT_FALSE(m1.Matches(const_cast<char*>("tofo")));
+  EXPECT_FALSE(m1.Matches(nullptr));
+
+  const Matcher<const char*> m2 = HasSubstr("foo");
+  EXPECT_TRUE(m2.Matches("I love food."));
+  EXPECT_FALSE(m2.Matches("tofo"));
+  EXPECT_FALSE(m2.Matches(nullptr));
+
+  const Matcher<const char*> m_empty = HasSubstr("");
+  EXPECT_TRUE(m_empty.Matches("not empty"));
+  EXPECT_TRUE(m_empty.Matches(""));
+  EXPECT_FALSE(m_empty.Matches(nullptr));
+}
+
+#if GTEST_INTERNAL_HAS_STRING_VIEW
+// Tests that HasSubstr() works for matching StringView-typed values.
+TEST(HasSubstrTest, WorksForStringViewClasses) {
+  const Matcher<internal::StringView> m1 =
+      HasSubstr(internal::StringView("foo"));
+  EXPECT_TRUE(m1.Matches(internal::StringView("I love food.")));
+  EXPECT_FALSE(m1.Matches(internal::StringView("tofo")));
+  EXPECT_FALSE(m1.Matches(internal::StringView()));
+
+  const Matcher<const internal::StringView&> m2 = HasSubstr("foo");
+  EXPECT_TRUE(m2.Matches(internal::StringView("I love food.")));
+  EXPECT_FALSE(m2.Matches(internal::StringView("tofo")));
+  EXPECT_FALSE(m2.Matches(internal::StringView()));
+
+  const Matcher<const internal::StringView&> m3 = HasSubstr("");
+  EXPECT_TRUE(m3.Matches(internal::StringView("foo")));
+  EXPECT_TRUE(m3.Matches(internal::StringView("")));
+  EXPECT_TRUE(m3.Matches(internal::StringView()));
+}
+#endif  // GTEST_INTERNAL_HAS_STRING_VIEW
+
+// Tests that HasSubstr(s) describes itself properly.
+TEST(HasSubstrTest, CanDescribeSelf) {
+  Matcher<std::string> m = HasSubstr("foo\n\"");
+  EXPECT_EQ("has substring \"foo\\n\\\"\"", Describe(m));
+}
+
+INSTANTIATE_GTEST_MATCHER_TEST_P(KeyTest);
+
+TEST(KeyTest, CanDescribeSelf) {
+  Matcher<const pair<std::string, int>&> m = Key("foo");
+  EXPECT_EQ("has a key that is equal to \"foo\"", Describe(m));
+  EXPECT_EQ("doesn't have a key that is equal to \"foo\"", DescribeNegation(m));
+}
+
+TEST_P(KeyTestP, ExplainsResult) {
+  Matcher<pair<int, bool>> m = Key(GreaterThan(10));
+  EXPECT_EQ("whose first field is a value which is 5 less than 10",
+            Explain(m, make_pair(5, true)));
+  EXPECT_EQ("whose first field is a value which is 5 more than 10",
+            Explain(m, make_pair(15, true)));
+}
+
+TEST(KeyTest, MatchesCorrectly) {
+  pair<int, std::string> p(25, "foo");
+  EXPECT_THAT(p, Key(25));
+  EXPECT_THAT(p, Not(Key(42)));
+  EXPECT_THAT(p, Key(Ge(20)));
+  EXPECT_THAT(p, Not(Key(Lt(25))));
+}
+
+TEST(KeyTest, WorksWithMoveOnly) {
+  pair<std::unique_ptr<int>, std::unique_ptr<int>> p;
+  EXPECT_THAT(p, Key(Eq(nullptr)));
+}
+
+INSTANTIATE_GTEST_MATCHER_TEST_P(PairTest);
+
+template <size_t I>
+struct Tag {};
+
+struct PairWithGet {
+  int member_1;
+  std::string member_2;
+  using first_type = int;
+  using second_type = std::string;
+
+  const int& GetImpl(Tag<0>) const { return member_1; }
+  const std::string& GetImpl(Tag<1>) const { return member_2; }
+};
+template <size_t I>
+auto get(const PairWithGet& value) -> decltype(value.GetImpl(Tag<I>())) {
+  return value.GetImpl(Tag<I>());
+}
+TEST(PairTest, MatchesPairWithGetCorrectly) {
+  PairWithGet p{25, "foo"};
+  EXPECT_THAT(p, Key(25));
+  EXPECT_THAT(p, Not(Key(42)));
+  EXPECT_THAT(p, Key(Ge(20)));
+  EXPECT_THAT(p, Not(Key(Lt(25))));
+
+  std::vector<PairWithGet> v = {{11, "Foo"}, {29, "gMockIsBestMock"}};
+  EXPECT_THAT(v, Contains(Key(29)));
+}
+
+TEST(KeyTest, SafelyCastsInnerMatcher) {
+  Matcher<int> is_positive = Gt(0);
+  Matcher<int> is_negative = Lt(0);
+  pair<char, bool> p('a', true);
+  EXPECT_THAT(p, Key(is_positive));
+  EXPECT_THAT(p, Not(Key(is_negative)));
+}
+
+TEST(KeyTest, InsideContainsUsingMap) {
+  map<int, char> container;
+  container.insert(make_pair(1, 'a'));
+  container.insert(make_pair(2, 'b'));
+  container.insert(make_pair(4, 'c'));
+  EXPECT_THAT(container, Contains(Key(1)));
+  EXPECT_THAT(container, Not(Contains(Key(3))));
+}
+
+TEST(KeyTest, InsideContainsUsingMultimap) {
+  multimap<int, char> container;
+  container.insert(make_pair(1, 'a'));
+  container.insert(make_pair(2, 'b'));
+  container.insert(make_pair(4, 'c'));
+
+  EXPECT_THAT(container, Not(Contains(Key(25))));
+  container.insert(make_pair(25, 'd'));
+  EXPECT_THAT(container, Contains(Key(25)));
+  container.insert(make_pair(25, 'e'));
+  EXPECT_THAT(container, Contains(Key(25)));
+
+  EXPECT_THAT(container, Contains(Key(1)));
+  EXPECT_THAT(container, Not(Contains(Key(3))));
+}
+
+TEST(PairTest, Typing) {
+  // Test verifies the following type conversions can be compiled.
+  Matcher<const pair<const char*, int>&> m1 = Pair("foo", 42);
+  Matcher<const pair<const char*, int>> m2 = Pair("foo", 42);
+  Matcher<pair<const char*, int>> m3 = Pair("foo", 42);
+
+  Matcher<pair<int, const std::string>> m4 = Pair(25, "42");
+  Matcher<pair<const std::string, int>> m5 = Pair("25", 42);
+}
+
+TEST(PairTest, CanDescribeSelf) {
+  Matcher<const pair<std::string, int>&> m1 = Pair("foo", 42);
+  EXPECT_EQ(
+      "has a first field that is equal to \"foo\""
+      ", and has a second field that is equal to 42",
+      Describe(m1));
+  EXPECT_EQ(
+      "has a first field that isn't equal to \"foo\""
+      ", or has a second field that isn't equal to 42",
+      DescribeNegation(m1));
+  // Double and triple negation (1 or 2 times not and description of negation).
+  Matcher<const pair<int, int>&> m2 = Not(Pair(Not(13), 42));
+  EXPECT_EQ(
+      "has a first field that isn't equal to 13"
+      ", and has a second field that is equal to 42",
+      DescribeNegation(m2));
+}
+
+TEST_P(PairTestP, CanExplainMatchResultTo) {
+  // If neither field matches, Pair() should explain about the first
+  // field.
+  const Matcher<pair<int, int>> m = Pair(GreaterThan(0), GreaterThan(0));
+  EXPECT_EQ("whose first field does not match, which is 1 less than 0",
+            Explain(m, make_pair(-1, -2)));
+
+  // If the first field matches but the second doesn't, Pair() should
+  // explain about the second field.
+  EXPECT_EQ("whose second field does not match, which is 2 less than 0",
+            Explain(m, make_pair(1, -2)));
+
+  // If the first field doesn't match but the second does, Pair()
+  // should explain about the first field.
+  EXPECT_EQ("whose first field does not match, which is 1 less than 0",
+            Explain(m, make_pair(-1, 2)));
+
+  // If both fields match, Pair() should explain about them both.
+  EXPECT_EQ(
+      "whose both fields match, where the first field is a value "
+      "which is 1 more than 0, and the second field is a value "
+      "which is 2 more than 0",
+      Explain(m, make_pair(1, 2)));
+
+  // If only the first match has an explanation, only this explanation should
+  // be printed.
+  const Matcher<pair<int, int>> explain_first = Pair(GreaterThan(0), 0);
+  EXPECT_EQ(
+      "whose both fields match, where the first field is a value "
+      "which is 1 more than 0",
+      Explain(explain_first, make_pair(1, 0)));
+
+  // If only the second match has an explanation, only this explanation should
+  // be printed.
+  const Matcher<pair<int, int>> explain_second = Pair(0, GreaterThan(0));
+  EXPECT_EQ(
+      "whose both fields match, where the second field is a value "
+      "which is 1 more than 0",
+      Explain(explain_second, make_pair(0, 1)));
+}
+
+TEST(PairTest, MatchesCorrectly) {
+  pair<int, std::string> p(25, "foo");
+
+  // Both fields match.
+  EXPECT_THAT(p, Pair(25, "foo"));
+  EXPECT_THAT(p, Pair(Ge(20), HasSubstr("o")));
+
+  // 'first' doesn't match, but 'second' matches.
+  EXPECT_THAT(p, Not(Pair(42, "foo")));
+  EXPECT_THAT(p, Not(Pair(Lt(25), "foo")));
+
+  // 'first' matches, but 'second' doesn't match.
+  EXPECT_THAT(p, Not(Pair(25, "bar")));
+  EXPECT_THAT(p, Not(Pair(25, Not("foo"))));
+
+  // Neither field matches.
+  EXPECT_THAT(p, Not(Pair(13, "bar")));
+  EXPECT_THAT(p, Not(Pair(Lt(13), HasSubstr("a"))));
+}
+
+TEST(PairTest, WorksWithMoveOnly) {
+  pair<std::unique_ptr<int>, std::unique_ptr<int>> p;
+  p.second = std::make_unique<int>(7);
+  EXPECT_THAT(p, Pair(Eq(nullptr), Ne(nullptr)));
+}
+
+TEST(PairTest, SafelyCastsInnerMatchers) {
+  Matcher<int> is_positive = Gt(0);
+  Matcher<int> is_negative = Lt(0);
+  pair<char, bool> p('a', true);
+  EXPECT_THAT(p, Pair(is_positive, _));
+  EXPECT_THAT(p, Not(Pair(is_negative, _)));
+  EXPECT_THAT(p, Pair(_, is_positive));
+  EXPECT_THAT(p, Not(Pair(_, is_negative)));
+}
+
+TEST(PairTest, InsideContainsUsingMap) {
+  map<int, char> container;
+  container.insert(make_pair(1, 'a'));
+  container.insert(make_pair(2, 'b'));
+  container.insert(make_pair(4, 'c'));
+  EXPECT_THAT(container, Contains(Pair(1, 'a')));
+  EXPECT_THAT(container, Contains(Pair(1, _)));
+  EXPECT_THAT(container, Contains(Pair(_, 'a')));
+  EXPECT_THAT(container, Not(Contains(Pair(3, _))));
+}
+
+INSTANTIATE_GTEST_MATCHER_TEST_P(FieldsAreTest);
+
+TEST(FieldsAreTest, MatchesCorrectly) {
+  std::tuple<int, std::string, double> p(25, "foo", .5);
+
+  // All fields match.
+  EXPECT_THAT(p, FieldsAre(25, "foo", .5));
+  EXPECT_THAT(p, FieldsAre(Ge(20), HasSubstr("o"), DoubleEq(.5)));
+
+  // Some don't match.
+  EXPECT_THAT(p, Not(FieldsAre(26, "foo", .5)));
+  EXPECT_THAT(p, Not(FieldsAre(25, "fo", .5)));
+  EXPECT_THAT(p, Not(FieldsAre(25, "foo", .6)));
+}
+
+TEST(FieldsAreTest, CanDescribeSelf) {
+  Matcher<const pair<std::string, int>&> m1 = FieldsAre("foo", 42);
+  EXPECT_EQ(
+      "has field #0 that is equal to \"foo\""
+      ", and has field #1 that is equal to 42",
+      Describe(m1));
+  EXPECT_EQ(
+      "has field #0 that isn't equal to \"foo\""
+      ", or has field #1 that isn't equal to 42",
+      DescribeNegation(m1));
+}
+
+TEST_P(FieldsAreTestP, CanExplainMatchResultTo) {
+  // The first one that fails is the one that gives the error.
+  Matcher<std::tuple<int, int, int>> m =
+      FieldsAre(GreaterThan(0), GreaterThan(0), GreaterThan(0));
+
+  EXPECT_EQ("whose field #0 does not match, which is 1 less than 0",
+            Explain(m, std::make_tuple(-1, -2, -3)));
+  EXPECT_EQ("whose field #1 does not match, which is 2 less than 0",
+            Explain(m, std::make_tuple(1, -2, -3)));
+  EXPECT_EQ("whose field #2 does not match, which is 3 less than 0",
+            Explain(m, std::make_tuple(1, 2, -3)));
+
+  // If they all match, we get a long explanation of success.
+  EXPECT_EQ(
+      "whose all elements match, "
+      "where field #0 is a value which is 1 more than 0"
+      ", and field #1 is a value which is 2 more than 0"
+      ", and field #2 is a value which is 3 more than 0",
+      Explain(m, std::make_tuple(1, 2, 3)));
+
+  // Only print those that have an explanation.
+  m = FieldsAre(GreaterThan(0), 0, GreaterThan(0));
+  EXPECT_EQ(
+      "whose all elements match, "
+      "where field #0 is a value which is 1 more than 0"
+      ", and field #2 is a value which is 3 more than 0",
+      Explain(m, std::make_tuple(1, 0, 3)));
+
+  // If only one has an explanation, then print that one.
+  m = FieldsAre(0, GreaterThan(0), 0);
+  EXPECT_EQ(
+      "whose all elements match, "
+      "where field #1 is a value which is 1 more than 0",
+      Explain(m, std::make_tuple(0, 1, 0)));
+}
+
+#if defined(__cpp_structured_bindings) && __cpp_structured_bindings >= 201606
+TEST(FieldsAreTest, StructuredBindings) {
+  // testing::FieldsAre can also match aggregates and such with C++17 and up.
+  struct MyType {
+    int i;
+    std::string str;
+  };
+  EXPECT_THAT((MyType{17, "foo"}), FieldsAre(Eq(17), HasSubstr("oo")));
+
+  // Test all the supported arities.
+  struct MyVarType1 {
+    int a;
+  };
+  EXPECT_THAT(MyVarType1{}, FieldsAre(0));
+  struct MyVarType2 {
+    int a, b;
+  };
+  EXPECT_THAT(MyVarType2{}, FieldsAre(0, 0));
+  struct MyVarType3 {
+    int a, b, c;
+  };
+  EXPECT_THAT(MyVarType3{}, FieldsAre(0, 0, 0));
+  struct MyVarType4 {
+    int a, b, c, d;
+  };
+  EXPECT_THAT(MyVarType4{}, FieldsAre(0, 0, 0, 0));
+  struct MyVarType5 {
+    int a, b, c, d, e;
+  };
+  EXPECT_THAT(MyVarType5{}, FieldsAre(0, 0, 0, 0, 0));
+  struct MyVarType6 {
+    int a, b, c, d, e, f;
+  };
+  EXPECT_THAT(MyVarType6{}, FieldsAre(0, 0, 0, 0, 0, 0));
+  struct MyVarType7 {
+    int a, b, c, d, e, f, g;
+  };
+  EXPECT_THAT(MyVarType7{}, FieldsAre(0, 0, 0, 0, 0, 0, 0));
+  struct MyVarType8 {
+    int a, b, c, d, e, f, g, h;
+  };
+  EXPECT_THAT(MyVarType8{}, FieldsAre(0, 0, 0, 0, 0, 0, 0, 0));
+  struct MyVarType9 {
+    int a, b, c, d, e, f, g, h, i;
+  };
+  EXPECT_THAT(MyVarType9{}, FieldsAre(0, 0, 0, 0, 0, 0, 0, 0, 0));
+  struct MyVarType10 {
+    int a, b, c, d, e, f, g, h, i, j;
+  };
+  EXPECT_THAT(MyVarType10{}, FieldsAre(0, 0, 0, 0, 0, 0, 0, 0, 0, 0));
+  struct MyVarType11 {
+    int a, b, c, d, e, f, g, h, i, j, k;
+  };
+  EXPECT_THAT(MyVarType11{}, FieldsAre(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0));
+  struct MyVarType12 {
+    int a, b, c, d, e, f, g, h, i, j, k, l;
+  };
+  EXPECT_THAT(MyVarType12{}, FieldsAre(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0));
+  struct MyVarType13 {
+    int a, b, c, d, e, f, g, h, i, j, k, l, m;
+  };
+  EXPECT_THAT(MyVarType13{}, FieldsAre(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0));
+  struct MyVarType14 {
+    int a, b, c, d, e, f, g, h, i, j, k, l, m, n;
+  };
+  EXPECT_THAT(MyVarType14{},
+              FieldsAre(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0));
+  struct MyVarType15 {
+    int a, b, c, d, e, f, g, h, i, j, k, l, m, n, o;
+  };
+  EXPECT_THAT(MyVarType15{},
+              FieldsAre(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0));
+  struct MyVarType16 {
+    int a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p;
+  };
+  EXPECT_THAT(MyVarType16{},
+              FieldsAre(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0));
+  struct MyVarType17 {
+    int a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q;
+  };
+  EXPECT_THAT(MyVarType17{},
+              FieldsAre(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0));
+  struct MyVarType18 {
+    int a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r;
+  };
+  EXPECT_THAT(MyVarType18{},
+              FieldsAre(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0));
+  struct MyVarType19 {
+    int a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s;
+  };
+  EXPECT_THAT(MyVarType19{}, FieldsAre(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                                       0, 0, 0, 0, 0));
+}
+#endif
+
+TEST(PairTest, UseGetInsteadOfMembers) {
+  PairWithGet pair{7, "ABC"};
+  EXPECT_THAT(pair, Pair(7, "ABC"));
+  EXPECT_THAT(pair, Pair(Ge(7), HasSubstr("AB")));
+  EXPECT_THAT(pair, Not(Pair(Lt(7), "ABC")));
+
+  std::vector<PairWithGet> v = {{11, "Foo"}, {29, "gMockIsBestMock"}};
+  EXPECT_THAT(v,
+              ElementsAre(Pair(11, std::string("Foo")), Pair(Ge(10), Not(""))));
+}
+
+// Tests StartsWith(s).
+
+TEST(StartsWithTest, MatchesStringWithGivenPrefix) {
+  const Matcher<const char*> m1 = StartsWith(std::string(""));
+  EXPECT_TRUE(m1.Matches("Hi"));
+  EXPECT_TRUE(m1.Matches(""));
+  EXPECT_FALSE(m1.Matches(nullptr));
+
+  const Matcher<const std::string&> m2 = StartsWith("Hi");
+  EXPECT_TRUE(m2.Matches("Hi"));
+  EXPECT_TRUE(m2.Matches("Hi Hi!"));
+  EXPECT_TRUE(m2.Matches("High"));
+  EXPECT_FALSE(m2.Matches("H"));
+  EXPECT_FALSE(m2.Matches(" Hi"));
+
+#if GTEST_INTERNAL_HAS_STRING_VIEW
+  const Matcher<internal::StringView> m_empty =
+      StartsWith(internal::StringView(""));
+  EXPECT_TRUE(m_empty.Matches(internal::StringView()));
+  EXPECT_TRUE(m_empty.Matches(internal::StringView("")));
+  EXPECT_TRUE(m_empty.Matches(internal::StringView("not empty")));
+#endif  // GTEST_INTERNAL_HAS_STRING_VIEW
+}
+
+TEST(StartsWithTest, CanDescribeSelf) {
+  Matcher<const std::string> m = StartsWith("Hi");
+  EXPECT_EQ("starts with \"Hi\"", Describe(m));
+}
+
+TEST(StartsWithTest, WorksWithStringMatcherOnStringViewMatchee) {
+#if GTEST_INTERNAL_HAS_STRING_VIEW
+  EXPECT_THAT(internal::StringView("talk to me goose"),
+              StartsWith(std::string("talk")));
+#else
+  GTEST_SKIP() << "Not applicable without internal::StringView.";
+#endif  // GTEST_INTERNAL_HAS_STRING_VIEW
+}
+
+// Tests EndsWith(s).
+
+TEST(EndsWithTest, MatchesStringWithGivenSuffix) {
+  const Matcher<const char*> m1 = EndsWith("");
+  EXPECT_TRUE(m1.Matches("Hi"));
+  EXPECT_TRUE(m1.Matches(""));
+  EXPECT_FALSE(m1.Matches(nullptr));
+
+  const Matcher<const std::string&> m2 = EndsWith(std::string("Hi"));
+  EXPECT_TRUE(m2.Matches("Hi"));
+  EXPECT_TRUE(m2.Matches("Wow Hi Hi"));
+  EXPECT_TRUE(m2.Matches("Super Hi"));
+  EXPECT_FALSE(m2.Matches("i"));
+  EXPECT_FALSE(m2.Matches("Hi "));
+
+#if GTEST_INTERNAL_HAS_STRING_VIEW
+  const Matcher<const internal::StringView&> m4 =
+      EndsWith(internal::StringView(""));
+  EXPECT_TRUE(m4.Matches("Hi"));
+  EXPECT_TRUE(m4.Matches(""));
+  EXPECT_TRUE(m4.Matches(internal::StringView()));
+  EXPECT_TRUE(m4.Matches(internal::StringView("")));
+#endif  // GTEST_INTERNAL_HAS_STRING_VIEW
+}
+
+TEST(EndsWithTest, CanDescribeSelf) {
+  Matcher<const std::string> m = EndsWith("Hi");
+  EXPECT_EQ("ends with \"Hi\"", Describe(m));
+}
+
+// Tests WhenBase64Unescaped.
+
+TEST(WhenBase64UnescapedTest, MatchesUnescapedBase64Strings) {
+  const Matcher<const char*> m1 = WhenBase64Unescaped(EndsWith("!"));
+  EXPECT_FALSE(m1.Matches("invalid base64"));
+  EXPECT_FALSE(m1.Matches("aGVsbG8gd29ybGQ="));  // hello world
+  EXPECT_TRUE(m1.Matches("aGVsbG8gd29ybGQh"));   // hello world!
+  EXPECT_TRUE(m1.Matches("+/-_IQ"));             // \xfb\xff\xbf!
+
+  const Matcher<const std::string&> m2 = WhenBase64Unescaped(EndsWith("!"));
+  EXPECT_FALSE(m2.Matches("invalid base64"));
+  EXPECT_FALSE(m2.Matches("aGVsbG8gd29ybGQ="));  // hello world
+  EXPECT_TRUE(m2.Matches("aGVsbG8gd29ybGQh"));   // hello world!
+  EXPECT_TRUE(m2.Matches("+/-_IQ"));             // \xfb\xff\xbf!
+
+#if GTEST_INTERNAL_HAS_STRING_VIEW
+  const Matcher<const internal::StringView&> m3 =
+      WhenBase64Unescaped(EndsWith("!"));
+  EXPECT_FALSE(m3.Matches("invalid base64"));
+  EXPECT_FALSE(m3.Matches("aGVsbG8gd29ybGQ="));  // hello world
+  EXPECT_TRUE(m3.Matches("aGVsbG8gd29ybGQh"));   // hello world!
+  EXPECT_TRUE(m3.Matches("+/-_IQ"));             // \xfb\xff\xbf!
+#endif  // GTEST_INTERNAL_HAS_STRING_VIEW
+}
+
+TEST(WhenBase64UnescapedTest, CanDescribeSelf) {
+  const Matcher<const char*> m = WhenBase64Unescaped(EndsWith("!"));
+  EXPECT_EQ("matches after Base64Unescape ends with \"!\"", Describe(m));
+}
+
+// Tests MatchesRegex().
+
+TEST(MatchesRegexTest, MatchesStringMatchingGivenRegex) {
+  const Matcher<const char*> m1 = MatchesRegex("a.*z");
+  EXPECT_TRUE(m1.Matches("az"));
+  EXPECT_TRUE(m1.Matches("abcz"));
+  EXPECT_FALSE(m1.Matches(nullptr));
+
+  const Matcher<const std::string&> m2 = MatchesRegex(new RE("a.*z"));
+  EXPECT_TRUE(m2.Matches("azbz"));
+  EXPECT_FALSE(m2.Matches("az1"));
+  EXPECT_FALSE(m2.Matches("1az"));
+
+#if GTEST_INTERNAL_HAS_STRING_VIEW
+  const Matcher<const internal::StringView&> m3 = MatchesRegex("a.*z");
+  EXPECT_TRUE(m3.Matches(internal::StringView("az")));
+  EXPECT_TRUE(m3.Matches(internal::StringView("abcz")));
+  EXPECT_FALSE(m3.Matches(internal::StringView("1az")));
+  EXPECT_FALSE(m3.Matches(internal::StringView()));
+  const Matcher<const internal::StringView&> m4 =
+      MatchesRegex(internal::StringView(""));
+  EXPECT_TRUE(m4.Matches(internal::StringView("")));
+  EXPECT_TRUE(m4.Matches(internal::StringView()));
+#endif  // GTEST_INTERNAL_HAS_STRING_VIEW
+}
+
+TEST(MatchesRegexTest, CanDescribeSelf) {
+  Matcher<const std::string> m1 = MatchesRegex(std::string("Hi.*"));
+  EXPECT_EQ("matches regular expression \"Hi.*\"", Describe(m1));
+
+  Matcher<const char*> m2 = MatchesRegex(new RE("a.*"));
+  EXPECT_EQ("matches regular expression \"a.*\"", Describe(m2));
+
+#if GTEST_INTERNAL_HAS_STRING_VIEW
+  Matcher<const internal::StringView> m3 = MatchesRegex(new RE("0.*"));
+  EXPECT_EQ("matches regular expression \"0.*\"", Describe(m3));
+#endif  // GTEST_INTERNAL_HAS_STRING_VIEW
+}
+
+// Tests ContainsRegex().
+
+TEST(ContainsRegexTest, MatchesStringContainingGivenRegex) {
+  const Matcher<const char*> m1 = ContainsRegex(std::string("a.*z"));
+  EXPECT_TRUE(m1.Matches("az"));
+  EXPECT_TRUE(m1.Matches("0abcz1"));
+  EXPECT_FALSE(m1.Matches(nullptr));
+
+  const Matcher<const std::string&> m2 = ContainsRegex(new RE("a.*z"));
+  EXPECT_TRUE(m2.Matches("azbz"));
+  EXPECT_TRUE(m2.Matches("az1"));
+  EXPECT_FALSE(m2.Matches("1a"));
+
+#if GTEST_INTERNAL_HAS_STRING_VIEW
+  const Matcher<const internal::StringView&> m3 = ContainsRegex(new RE("a.*z"));
+  EXPECT_TRUE(m3.Matches(internal::StringView("azbz")));
+  EXPECT_TRUE(m3.Matches(internal::StringView("az1")));
+  EXPECT_FALSE(m3.Matches(internal::StringView("1a")));
+  EXPECT_FALSE(m3.Matches(internal::StringView()));
+  const Matcher<const internal::StringView&> m4 =
+      ContainsRegex(internal::StringView(""));
+  EXPECT_TRUE(m4.Matches(internal::StringView("")));
+  EXPECT_TRUE(m4.Matches(internal::StringView()));
+#endif  // GTEST_INTERNAL_HAS_STRING_VIEW
+}
+
+TEST(ContainsRegexTest, CanDescribeSelf) {
+  Matcher<const std::string> m1 = ContainsRegex("Hi.*");
+  EXPECT_EQ("contains regular expression \"Hi.*\"", Describe(m1));
+
+  Matcher<const char*> m2 = ContainsRegex(new RE("a.*"));
+  EXPECT_EQ("contains regular expression \"a.*\"", Describe(m2));
+
+#if GTEST_INTERNAL_HAS_STRING_VIEW
+  Matcher<const internal::StringView> m3 = ContainsRegex(new RE("0.*"));
+  EXPECT_EQ("contains regular expression \"0.*\"", Describe(m3));
+#endif  // GTEST_INTERNAL_HAS_STRING_VIEW
+}
+
+// Tests for wide strings.
+#if GTEST_HAS_STD_WSTRING
+TEST(StdWideStrEqTest, MatchesEqual) {
+  Matcher<const wchar_t*> m = StrEq(::std::wstring(L"Hello"));
+  EXPECT_TRUE(m.Matches(L"Hello"));
+  EXPECT_FALSE(m.Matches(L"hello"));
+  EXPECT_FALSE(m.Matches(nullptr));
+
+  Matcher<const ::std::wstring&> m2 = StrEq(L"Hello");
+  EXPECT_TRUE(m2.Matches(L"Hello"));
+  EXPECT_FALSE(m2.Matches(L"Hi"));
+
+  Matcher<const ::std::wstring&> m3 = StrEq(L"\xD3\x576\x8D3\xC74D");
+  EXPECT_TRUE(m3.Matches(L"\xD3\x576\x8D3\xC74D"));
+  EXPECT_FALSE(m3.Matches(L"\xD3\x576\x8D3\xC74E"));
+
+  ::std::wstring str(L"01204500800");
+  str[3] = L'\0';
+  Matcher<const ::std::wstring&> m4 = StrEq(str);
+  EXPECT_TRUE(m4.Matches(str));
+  str[0] = str[6] = str[7] = str[9] = str[10] = L'\0';
+  Matcher<const ::std::wstring&> m5 = StrEq(str);
+  EXPECT_TRUE(m5.Matches(str));
+}
+
+TEST(StdWideStrEqTest, CanDescribeSelf) {
+  Matcher<::std::wstring> m = StrEq(L"Hi-\'\"?\\\a\b\f\n\r\t\v");
+  EXPECT_EQ("is equal to L\"Hi-\'\\\"?\\\\\\a\\b\\f\\n\\r\\t\\v\"",
+            Describe(m));
+
+  Matcher<::std::wstring> m2 = StrEq(L"\xD3\x576\x8D3\xC74D");
+  EXPECT_EQ("is equal to L\"\\xD3\\x576\\x8D3\\xC74D\"", Describe(m2));
+
+  ::std::wstring str(L"01204500800");
+  str[3] = L'\0';
+  Matcher<const ::std::wstring&> m4 = StrEq(str);
+  EXPECT_EQ("is equal to L\"012\\04500800\"", Describe(m4));
+  str[0] = str[6] = str[7] = str[9] = str[10] = L'\0';
+  Matcher<const ::std::wstring&> m5 = StrEq(str);
+  EXPECT_EQ("is equal to L\"\\012\\045\\0\\08\\0\\0\"", Describe(m5));
+}
+
+TEST(StdWideStrNeTest, MatchesUnequalString) {
+  Matcher<const wchar_t*> m = StrNe(L"Hello");
+  EXPECT_TRUE(m.Matches(L""));
+  EXPECT_TRUE(m.Matches(nullptr));
+  EXPECT_FALSE(m.Matches(L"Hello"));
+
+  Matcher<::std::wstring> m2 = StrNe(::std::wstring(L"Hello"));
+  EXPECT_TRUE(m2.Matches(L"hello"));
+  EXPECT_FALSE(m2.Matches(L"Hello"));
+}
+
+TEST(StdWideStrNeTest, CanDescribeSelf) {
+  Matcher<const wchar_t*> m = StrNe(L"Hi");
+  EXPECT_EQ("isn't equal to L\"Hi\"", Describe(m));
+}
+
+TEST(StdWideStrCaseEqTest, MatchesEqualStringIgnoringCase) {
+  Matcher<const wchar_t*> m = StrCaseEq(::std::wstring(L"Hello"));
+  EXPECT_TRUE(m.Matches(L"Hello"));
+  EXPECT_TRUE(m.Matches(L"hello"));
+  EXPECT_FALSE(m.Matches(L"Hi"));
+  EXPECT_FALSE(m.Matches(nullptr));
+
+  Matcher<const ::std::wstring&> m2 = StrCaseEq(L"Hello");
+  EXPECT_TRUE(m2.Matches(L"hello"));
+  EXPECT_FALSE(m2.Matches(L"Hi"));
+}
+
+TEST(StdWideStrCaseEqTest, MatchesEqualStringWith0IgnoringCase) {
+  ::std::wstring str1(L"oabocdooeoo");
+  ::std::wstring str2(L"OABOCDOOEOO");
+  Matcher<const ::std::wstring&> m0 = StrCaseEq(str1);
+  EXPECT_FALSE(m0.Matches(str2 + ::std::wstring(1, L'\0')));
+
+  str1[3] = str2[3] = L'\0';
+  Matcher<const ::std::wstring&> m1 = StrCaseEq(str1);
+  EXPECT_TRUE(m1.Matches(str2));
+
+  str1[0] = str1[6] = str1[7] = str1[10] = L'\0';
+  str2[0] = str2[6] = str2[7] = str2[10] = L'\0';
+  Matcher<const ::std::wstring&> m2 = StrCaseEq(str1);
+  str1[9] = str2[9] = L'\0';
+  EXPECT_FALSE(m2.Matches(str2));
+
+  Matcher<const ::std::wstring&> m3 = StrCaseEq(str1);
+  EXPECT_TRUE(m3.Matches(str2));
+
+  EXPECT_FALSE(m3.Matches(str2 + L"x"));
+  str2.append(1, L'\0');
+  EXPECT_FALSE(m3.Matches(str2));
+  EXPECT_FALSE(m3.Matches(::std::wstring(str2, 0, 9)));
+}
+
+TEST(StdWideStrCaseEqTest, CanDescribeSelf) {
+  Matcher<::std::wstring> m = StrCaseEq(L"Hi");
+  EXPECT_EQ("is equal to (ignoring case) L\"Hi\"", Describe(m));
+}
+
+TEST(StdWideStrCaseNeTest, MatchesUnequalStringIgnoringCase) {
+  Matcher<const wchar_t*> m = StrCaseNe(L"Hello");
+  EXPECT_TRUE(m.Matches(L"Hi"));
+  EXPECT_TRUE(m.Matches(nullptr));
+  EXPECT_FALSE(m.Matches(L"Hello"));
+  EXPECT_FALSE(m.Matches(L"hello"));
+
+  Matcher<::std::wstring> m2 = StrCaseNe(::std::wstring(L"Hello"));
+  EXPECT_TRUE(m2.Matches(L""));
+  EXPECT_FALSE(m2.Matches(L"Hello"));
+}
+
+TEST(StdWideStrCaseNeTest, CanDescribeSelf) {
+  Matcher<const wchar_t*> m = StrCaseNe(L"Hi");
+  EXPECT_EQ("isn't equal to (ignoring case) L\"Hi\"", Describe(m));
+}
+
+// Tests that HasSubstr() works for matching wstring-typed values.
+TEST(StdWideHasSubstrTest, WorksForStringClasses) {
+  const Matcher<::std::wstring> m1 = HasSubstr(L"foo");
+  EXPECT_TRUE(m1.Matches(::std::wstring(L"I love food.")));
+  EXPECT_FALSE(m1.Matches(::std::wstring(L"tofo")));
+
+  const Matcher<const ::std::wstring&> m2 = HasSubstr(L"foo");
+  EXPECT_TRUE(m2.Matches(::std::wstring(L"I love food.")));
+  EXPECT_FALSE(m2.Matches(::std::wstring(L"tofo")));
+}
+
+// Tests that HasSubstr() works for matching C-wide-string-typed values.
+TEST(StdWideHasSubstrTest, WorksForCStrings) {
+  const Matcher<wchar_t*> m1 = HasSubstr(L"foo");
+  EXPECT_TRUE(m1.Matches(const_cast<wchar_t*>(L"I love food.")));
+  EXPECT_FALSE(m1.Matches(const_cast<wchar_t*>(L"tofo")));
+  EXPECT_FALSE(m1.Matches(nullptr));
+
+  const Matcher<const wchar_t*> m2 = HasSubstr(L"foo");
+  EXPECT_TRUE(m2.Matches(L"I love food."));
+  EXPECT_FALSE(m2.Matches(L"tofo"));
+  EXPECT_FALSE(m2.Matches(nullptr));
+}
+
+// Tests that HasSubstr(s) describes itself properly.
+TEST(StdWideHasSubstrTest, CanDescribeSelf) {
+  Matcher<::std::wstring> m = HasSubstr(L"foo\n\"");
+  EXPECT_EQ("has substring L\"foo\\n\\\"\"", Describe(m));
+}
+
+// Tests StartsWith(s).
+
+TEST(StdWideStartsWithTest, MatchesStringWithGivenPrefix) {
+  const Matcher<const wchar_t*> m1 = StartsWith(::std::wstring(L""));
+  EXPECT_TRUE(m1.Matches(L"Hi"));
+  EXPECT_TRUE(m1.Matches(L""));
+  EXPECT_FALSE(m1.Matches(nullptr));
+
+  const Matcher<const ::std::wstring&> m2 = StartsWith(L"Hi");
+  EXPECT_TRUE(m2.Matches(L"Hi"));
+  EXPECT_TRUE(m2.Matches(L"Hi Hi!"));
+  EXPECT_TRUE(m2.Matches(L"High"));
+  EXPECT_FALSE(m2.Matches(L"H"));
+  EXPECT_FALSE(m2.Matches(L" Hi"));
+}
+
+TEST(StdWideStartsWithTest, CanDescribeSelf) {
+  Matcher<const ::std::wstring> m = StartsWith(L"Hi");
+  EXPECT_EQ("starts with L\"Hi\"", Describe(m));
+}
+
+// Tests EndsWith(s).
+
+TEST(StdWideEndsWithTest, MatchesStringWithGivenSuffix) {
+  const Matcher<const wchar_t*> m1 = EndsWith(L"");
+  EXPECT_TRUE(m1.Matches(L"Hi"));
+  EXPECT_TRUE(m1.Matches(L""));
+  EXPECT_FALSE(m1.Matches(nullptr));
+
+  const Matcher<const ::std::wstring&> m2 = EndsWith(::std::wstring(L"Hi"));
+  EXPECT_TRUE(m2.Matches(L"Hi"));
+  EXPECT_TRUE(m2.Matches(L"Wow Hi Hi"));
+  EXPECT_TRUE(m2.Matches(L"Super Hi"));
+  EXPECT_FALSE(m2.Matches(L"i"));
+  EXPECT_FALSE(m2.Matches(L"Hi "));
+}
+
+TEST(StdWideEndsWithTest, CanDescribeSelf) {
+  Matcher<const ::std::wstring> m = EndsWith(L"Hi");
+  EXPECT_EQ("ends with L\"Hi\"", Describe(m));
+}
+
+#endif  // GTEST_HAS_STD_WSTRING
+
+TEST(ExplainMatchResultTest, WorksWithPolymorphicMatcher) {
+  StringMatchResultListener listener1;
+  EXPECT_TRUE(ExplainMatchResult(PolymorphicIsEven(), 42, &listener1));
+  EXPECT_EQ("% 2 == 0", listener1.str());
+
+  StringMatchResultListener listener2;
+  EXPECT_FALSE(ExplainMatchResult(Ge(42), 1.5, &listener2));
+  EXPECT_EQ("", listener2.str());
+}
+
+TEST(ExplainMatchResultTest, WorksWithMonomorphicMatcher) {
+  const Matcher<int> is_even = PolymorphicIsEven();
+  StringMatchResultListener listener1;
+  EXPECT_TRUE(ExplainMatchResult(is_even, 42, &listener1));
+  EXPECT_EQ("% 2 == 0", listener1.str());
+
+  const Matcher<const double&> is_zero = Eq(0);
+  StringMatchResultListener listener2;
+  EXPECT_FALSE(ExplainMatchResult(is_zero, 1.5, &listener2));
+  EXPECT_EQ("", listener2.str());
+}
+
+MATCHER(ConstructNoArg, "") { return true; }
+MATCHER_P(Construct1Arg, arg1, "") { return true; }
+MATCHER_P2(Construct2Args, arg1, arg2, "") { return true; }
+
+TEST(MatcherConstruct, ExplicitVsImplicit) {
+  {
+    // No arg constructor can be constructed with empty brace.
+    ConstructNoArgMatcher m = {};
+    (void)m;
+    // And with no args
+    ConstructNoArgMatcher m2;
+    (void)m2;
+  }
+  {
+    // The one arg constructor has an explicit constructor.
+    // This is to prevent the implicit conversion.
+    using M = Construct1ArgMatcherP<int>;
+    EXPECT_TRUE((std::is_constructible<M, int>::value));
+    EXPECT_FALSE((std::is_convertible<int, M>::value));
+  }
+  {
+    // Multiple arg matchers can be constructed with an implicit construction.
+    Construct2ArgsMatcherP2<int, double> m = {1, 2.2};
+    (void)m;
+  }
+}
+
+MATCHER_P(Really, inner_matcher, "") {
+  return ExplainMatchResult(inner_matcher, arg, result_listener);
+}
+
+TEST(ExplainMatchResultTest, WorksInsideMATCHER) {
+  EXPECT_THAT(0, Really(Eq(0)));
+}
+
+TEST(DescribeMatcherTest, WorksWithValue) {
+  EXPECT_EQ("is equal to 42", DescribeMatcher<int>(42));
+  EXPECT_EQ("isn't equal to 42", DescribeMatcher<int>(42, true));
+}
+
+TEST(DescribeMatcherTest, WorksWithMonomorphicMatcher) {
+  const Matcher<int> monomorphic = Le(0);
+  EXPECT_EQ("is <= 0", DescribeMatcher<int>(monomorphic));
+  EXPECT_EQ("isn't <= 0", DescribeMatcher<int>(monomorphic, true));
+}
+
+TEST(DescribeMatcherTest, WorksWithPolymorphicMatcher) {
+  EXPECT_EQ("is even", DescribeMatcher<int>(PolymorphicIsEven()));
+  EXPECT_EQ("is odd", DescribeMatcher<int>(PolymorphicIsEven(), true));
+}
+
+MATCHER_P(FieldIIs, inner_matcher, "") {
+  return ExplainMatchResult(inner_matcher, arg.i, result_listener);
+}
+
+#if GTEST_HAS_RTTI
+TEST(WhenDynamicCastToTest, SameType) {
+  Derived derived;
+  derived.i = 4;
+
+  // Right type. A pointer is passed down.
+  Base* as_base_ptr = &derived;
+  EXPECT_THAT(as_base_ptr, WhenDynamicCastTo<Derived*>(Not(IsNull())));
+  EXPECT_THAT(as_base_ptr, WhenDynamicCastTo<Derived*>(Pointee(FieldIIs(4))));
+  EXPECT_THAT(as_base_ptr,
+              Not(WhenDynamicCastTo<Derived*>(Pointee(FieldIIs(5)))));
+}
+
+TEST(WhenDynamicCastToTest, WrongTypes) {
+  Base base;
+  Derived derived;
+  OtherDerived other_derived;
+
+  // Wrong types. NULL is passed.
+  EXPECT_THAT(&base, Not(WhenDynamicCastTo<Derived*>(Pointee(_))));
+  EXPECT_THAT(&base, WhenDynamicCastTo<Derived*>(IsNull()));
+  Base* as_base_ptr = &derived;
+  EXPECT_THAT(as_base_ptr, Not(WhenDynamicCastTo<OtherDerived*>(Pointee(_))));
+  EXPECT_THAT(as_base_ptr, WhenDynamicCastTo<OtherDerived*>(IsNull()));
+  as_base_ptr = &other_derived;
+  EXPECT_THAT(as_base_ptr, Not(WhenDynamicCastTo<Derived*>(Pointee(_))));
+  EXPECT_THAT(as_base_ptr, WhenDynamicCastTo<Derived*>(IsNull()));
+}
+
+TEST(WhenDynamicCastToTest, AlreadyNull) {
+  // Already NULL.
+  Base* as_base_ptr = nullptr;
+  EXPECT_THAT(as_base_ptr, WhenDynamicCastTo<Derived*>(IsNull()));
+}
+
+struct AmbiguousCastTypes {
+  class VirtualDerived : public virtual Base {};
+  class DerivedSub1 : public VirtualDerived {};
+  class DerivedSub2 : public VirtualDerived {};
+  class ManyDerivedInHierarchy : public DerivedSub1, public DerivedSub2 {};
+};
+
+TEST(WhenDynamicCastToTest, AmbiguousCast) {
+  AmbiguousCastTypes::DerivedSub1 sub1;
+  AmbiguousCastTypes::ManyDerivedInHierarchy many_derived;
+  // Multiply derived from Base. dynamic_cast<> returns NULL.
+  Base* as_base_ptr =
+      static_cast<AmbiguousCastTypes::DerivedSub1*>(&many_derived);
+  EXPECT_THAT(as_base_ptr,
+              WhenDynamicCastTo<AmbiguousCastTypes::VirtualDerived*>(IsNull()));
+  as_base_ptr = &sub1;
+  EXPECT_THAT(
+      as_base_ptr,
+      WhenDynamicCastTo<AmbiguousCastTypes::VirtualDerived*>(Not(IsNull())));
+}
+
+TEST(WhenDynamicCastToTest, Describe) {
+  Matcher<Base*> matcher = WhenDynamicCastTo<Derived*>(Pointee(_));
+  const std::string prefix =
+      "when dynamic_cast to " + internal::GetTypeName<Derived*>() + ", ";
+  EXPECT_EQ(prefix + "points to a value that is anything", Describe(matcher));
+  EXPECT_EQ(prefix + "does not point to a value that is anything",
+            DescribeNegation(matcher));
+}
+
+TEST(WhenDynamicCastToTest, Explain) {
+  Matcher<Base*> matcher = WhenDynamicCastTo<Derived*>(Pointee(_));
+  Base* null = nullptr;
+  EXPECT_THAT(Explain(matcher, null), HasSubstr("NULL"));
+  Derived derived;
+  EXPECT_TRUE(matcher.Matches(&derived));
+  EXPECT_THAT(Explain(matcher, &derived), HasSubstr("which points to "));
+
+  // With references, the matcher itself can fail. Test for that one.
+  Matcher<const Base&> ref_matcher = WhenDynamicCastTo<const OtherDerived&>(_);
+  EXPECT_THAT(Explain(ref_matcher, derived),
+              HasSubstr("which cannot be dynamic_cast"));
+}
+
+TEST(WhenDynamicCastToTest, GoodReference) {
+  Derived derived;
+  derived.i = 4;
+  Base& as_base_ref = derived;
+  EXPECT_THAT(as_base_ref, WhenDynamicCastTo<const Derived&>(FieldIIs(4)));
+  EXPECT_THAT(as_base_ref, WhenDynamicCastTo<const Derived&>(Not(FieldIIs(5))));
+}
+
+TEST(WhenDynamicCastToTest, BadReference) {
+  Derived derived;
+  Base& as_base_ref = derived;
+  EXPECT_THAT(as_base_ref, Not(WhenDynamicCastTo<const OtherDerived&>(_)));
+}
+#endif  // GTEST_HAS_RTTI
+
+class DivisibleByImpl {
+ public:
+  explicit DivisibleByImpl(int a_divider) : divider_(a_divider) {}
+
+  // For testing using ExplainMatchResultTo() with polymorphic matchers.
+  template <typename T>
+  bool MatchAndExplain(const T& n, MatchResultListener* listener) const {
+    *listener << "which is " << (n % divider_) << " modulo " << divider_;
+    return (n % divider_) == 0;
+  }
+
+  void DescribeTo(ostream* os) const { *os << "is divisible by " << divider_; }
+
+  void DescribeNegationTo(ostream* os) const {
+    *os << "is not divisible by " << divider_;
+  }
+
+  void set_divider(int a_divider) { divider_ = a_divider; }
+  int divider() const { return divider_; }
+
+ private:
+  int divider_;
+};
+
+PolymorphicMatcher<DivisibleByImpl> DivisibleBy(int n) {
+  return MakePolymorphicMatcher(DivisibleByImpl(n));
+}
+
+// Tests that when AllOf() fails, only the first failing matcher is
+// asked to explain why.
+TEST(ExplainMatchResultTest, AllOf_False_False) {
+  const Matcher<int> m = AllOf(DivisibleBy(4), DivisibleBy(3));
+  EXPECT_EQ("which is 1 modulo 4", Explain(m, 5));
+}
+
+// Tests that when AllOf() fails, only the first failing matcher is
+// asked to explain why.
+TEST(ExplainMatchResultTest, AllOf_False_True) {
+  const Matcher<int> m = AllOf(DivisibleBy(4), DivisibleBy(3));
+  EXPECT_EQ("which is 2 modulo 4", Explain(m, 6));
+}
+
+// Tests that when AllOf() fails, only the first failing matcher is
+// asked to explain why.
+TEST(ExplainMatchResultTest, AllOf_True_False) {
+  const Matcher<int> m = AllOf(Ge(1), DivisibleBy(3));
+  EXPECT_EQ("which is 2 modulo 3", Explain(m, 5));
+}
+
+// Tests that when AllOf() succeeds, all matchers are asked to explain
+// why.
+TEST(ExplainMatchResultTest, AllOf_True_True) {
+  const Matcher<int> m = AllOf(DivisibleBy(2), DivisibleBy(3));
+  EXPECT_EQ("which is 0 modulo 2, and which is 0 modulo 3", Explain(m, 6));
+}
+
+// Tests that when AllOf() succeeds, but matchers have no explanation,
+// the matcher description is used.
+TEST(ExplainMatchResultTest, AllOf_True_True_2) {
+  const Matcher<int> m = AllOf(Ge(2), Le(3));
+  EXPECT_EQ("is >= 2, and is <= 3", Explain(m, 2));
+}
+
+// A matcher that records whether the listener was interested.
+template <typename T>
+class CountingMatcher : public MatcherInterface<T> {
+ public:
+  explicit CountingMatcher(const Matcher<T>& base_matcher,
+                           std::vector<bool>* listener_interested)
+      : base_matcher_(base_matcher),
+        listener_interested_(listener_interested) {}
+
+  bool MatchAndExplain(T x, MatchResultListener* listener) const override {
+    listener_interested_->push_back(listener->IsInterested());
+    return base_matcher_.MatchAndExplain(x, listener);
+  }
+
+  void DescribeTo(ostream* os) const override { base_matcher_.DescribeTo(os); }
+
+ private:
+  Matcher<T> base_matcher_;
+  std::vector<bool>* listener_interested_;
+};
+
+TEST(AllOfTest, DoesNotFormatChildMatchersWhenNotInterested) {
+  std::vector<bool> listener_interested;
+  Matcher<int> matcher =
+      MakeMatcher(new CountingMatcher<int>(Eq(1), &listener_interested));
+  EXPECT_TRUE(matcher.Matches(1));
+  EXPECT_THAT(listener_interested, ElementsAre(false));
+  listener_interested.clear();
+  Matcher<int> all_of_matcher = AllOf(matcher, matcher);
+  EXPECT_TRUE(all_of_matcher.Matches(1));
+  EXPECT_THAT(listener_interested, ElementsAre(false, false));
+  listener_interested.clear();
+  EXPECT_FALSE(all_of_matcher.Matches(0));
+  EXPECT_THAT(listener_interested, ElementsAre(false));
+}
+
+TEST(AnyOfTest, DoesNotFormatChildMatchersWhenNotInterested) {
+  std::vector<bool> listener_interested;
+  Matcher<int> matcher =
+      MakeMatcher(new CountingMatcher<int>(Eq(1), &listener_interested));
+  EXPECT_TRUE(matcher.Matches(1));
+  EXPECT_THAT(listener_interested, ElementsAre(false));
+  listener_interested.clear();
+  Matcher<int> any_of_matcher = AnyOf(matcher, matcher);
+  EXPECT_TRUE(any_of_matcher.Matches(1));
+  EXPECT_THAT(listener_interested, ElementsAre(false));
+  listener_interested.clear();
+  EXPECT_FALSE(any_of_matcher.Matches(0));
+  EXPECT_THAT(listener_interested, ElementsAre(false, false));
+}
+
+TEST(OptionalTest, DoesNotFormatChildMatcherWhenNotInterested) {
+  std::vector<bool> listener_interested;
+  Matcher<int> matcher =
+      MakeMatcher(new CountingMatcher<int>(Eq(1), &listener_interested));
+  EXPECT_TRUE(matcher.Matches(1));
+  EXPECT_THAT(listener_interested, ElementsAre(false));
+  listener_interested.clear();
+  Matcher<std::optional<int>> optional_matcher = Optional(matcher);
+  EXPECT_FALSE(optional_matcher.Matches(std::nullopt));
+  EXPECT_THAT(listener_interested, ElementsAre());
+  EXPECT_TRUE(optional_matcher.Matches(1));
+  EXPECT_THAT(listener_interested, ElementsAre(false));
+  listener_interested.clear();
+  EXPECT_FALSE(matcher.Matches(0));
+  EXPECT_THAT(listener_interested, ElementsAre(false));
+}
+
+INSTANTIATE_GTEST_MATCHER_TEST_P(ExplainmatcherResultTest);
+
+TEST_P(ExplainmatcherResultTestP, MonomorphicMatcher) {
+  const Matcher<int> m = GreaterThan(5);
+  EXPECT_EQ("which is 1 more than 5", Explain(m, 6));
+}
+
+// Tests PolymorphicMatcher::mutable_impl().
+TEST(PolymorphicMatcherTest, CanAccessMutableImpl) {
+  PolymorphicMatcher<DivisibleByImpl> m(DivisibleByImpl(42));
+  DivisibleByImpl& impl = m.mutable_impl();
+  EXPECT_EQ(42, impl.divider());
+
+  impl.set_divider(0);
+  EXPECT_EQ(0, m.mutable_impl().divider());
+}
+
+// Tests PolymorphicMatcher::impl().
+TEST(PolymorphicMatcherTest, CanAccessImpl) {
+  const PolymorphicMatcher<DivisibleByImpl> m(DivisibleByImpl(42));
+  const DivisibleByImpl& impl = m.impl();
+  EXPECT_EQ(42, impl.divider());
+}
+
+}  // namespace
+}  // namespace gmock_matchers_test
+}  // namespace testing
+
+GTEST_DISABLE_MSC_WARNINGS_POP_()  // 4244 4100
diff --git a/external/googletest/googlemock/test/gmock-matchers-containers_test.cc b/external/googletest/googlemock/test/gmock-matchers-containers_test.cc
new file mode 100644
index 00000000..e9f1a02d
--- /dev/null
+++ b/external/googletest/googlemock/test/gmock-matchers-containers_test.cc
@@ -0,0 +1,3446 @@
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Google Mock - a framework for writing C++ mock classes.
+//
+// This file tests some commonly used argument matchers.
+
+#include <algorithm>
+#include <array>
+#include <cstddef>
+#include <deque>
+#include <forward_list>
+#include <iterator>
+#include <list>
+#include <memory>
+#include <ostream>
+#include <string>
+#include <tuple>
+#include <vector>
+
+#include "gmock/gmock.h"
+#include "test/gmock-matchers_test.h"
+#include "gtest/gtest.h"
+
+// Silence warning C4244: 'initializing': conversion from 'int' to 'short',
+// possible loss of data and C4100, unreferenced local parameter
+GTEST_DISABLE_MSC_WARNINGS_PUSH_(4244 4100)
+
+namespace testing {
+namespace gmock_matchers_test {
+namespace {
+
+std::vector<std::unique_ptr<int>> MakeUniquePtrs(const std::vector<int>& ints) {
+  std::vector<std::unique_ptr<int>> pointers;
+  for (int i : ints) pointers.emplace_back(new int(i));
+  return pointers;
+}
+
+std::string OfType(const std::string& type_name) {
+#if GTEST_HAS_RTTI
+  return IsReadableTypeName(type_name) ? " (of type " + type_name + ")" : "";
+#else
+  return "";
+#endif
+}
+
+TEST(ContainsTest, WorksWithMoveOnly) {
+  ContainerHelper helper;
+  EXPECT_CALL(helper, Call(Contains(Pointee(2))));
+  helper.Call(MakeUniquePtrs({1, 2}));
+}
+
+INSTANTIATE_GTEST_MATCHER_TEST_P(ElementsAreTest);
+
+// Tests the variadic version of the ElementsAreMatcher
+TEST(ElementsAreTest, HugeMatcher) {
+  vector<int> test_vector{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12};
+
+  EXPECT_THAT(test_vector,
+              ElementsAre(Eq(1), Eq(2), Lt(13), Eq(4), Eq(5), Eq(6), Eq(7),
+                          Eq(8), Eq(9), Eq(10), Gt(1), Eq(12)));
+}
+
+// Tests the variadic version of the UnorderedElementsAreMatcher
+TEST(ElementsAreTest, HugeMatcherStr) {
+  vector<std::string> test_vector{
+      "literal_string", "", "", "", "", "", "", "", "", "", "", ""};
+
+  EXPECT_THAT(test_vector, UnorderedElementsAre("literal_string", _, _, _, _, _,
+                                                _, _, _, _, _, _));
+}
+
+// Tests the variadic version of the UnorderedElementsAreMatcher
+TEST(ElementsAreTest, HugeMatcherUnordered) {
+  vector<int> test_vector{2, 1, 8, 5, 4, 6, 7, 3, 9, 12, 11, 10};
+
+  EXPECT_THAT(test_vector, UnorderedElementsAre(
+                               Eq(2), Eq(1), Gt(7), Eq(5), Eq(4), Eq(6), Eq(7),
+                               Eq(3), Eq(9), Eq(12), Eq(11), Ne(122)));
+}
+
+// Tests that ASSERT_THAT() and EXPECT_THAT() work when the value
+// matches the matcher.
+TEST(MatcherAssertionTest, WorksWhenMatcherIsSatisfied) {
+  ASSERT_THAT(5, Ge(2)) << "This should succeed.";
+  ASSERT_THAT("Foo", EndsWith("oo"));
+  EXPECT_THAT(2, AllOf(Le(7), Ge(0))) << "This should succeed too.";
+  EXPECT_THAT("Hello", StartsWith("Hell"));
+}
+
+// Tests that ASSERT_THAT() and EXPECT_THAT() work when the value
+// doesn't match the matcher.
+TEST(MatcherAssertionTest, WorksWhenMatcherIsNotSatisfied) {
+  // 'n' must be static as it is used in an EXPECT_FATAL_FAILURE(),
+  // which cannot reference auto variables.
+  static unsigned short n;  // NOLINT
+  n = 5;
+
+  EXPECT_FATAL_FAILURE(ASSERT_THAT(n, Gt(10)),
+                       "Value of: n\n"
+                       "Expected: is > 10\n"
+                       "  Actual: 5" +
+                           OfType("unsigned short"));
+  n = 0;
+  EXPECT_NONFATAL_FAILURE(EXPECT_THAT(n, AllOf(Le(7), Ge(5))),
+                          "Value of: n\n"
+                          "Expected: (is <= 7) and (is >= 5)\n"
+                          "  Actual: 0" +
+                              OfType("unsigned short"));
+}
+
+// Tests that ASSERT_THAT() and EXPECT_THAT() work when the argument
+// has a reference type.
+TEST(MatcherAssertionTest, WorksForByRefArguments) {
+  // We use a static variable here as EXPECT_FATAL_FAILURE() cannot
+  // reference auto variables.
+  static int n;
+  n = 0;
+  EXPECT_THAT(n, AllOf(Le(7), Ref(n)));
+  EXPECT_FATAL_FAILURE(ASSERT_THAT(n, Not(Ref(n))),
+                       "Value of: n\n"
+                       "Expected: does not reference the variable @");
+  // Tests the "Actual" part.
+  EXPECT_FATAL_FAILURE(ASSERT_THAT(n, Not(Ref(n))),
+                       "Actual: 0" + OfType("int") + ", which is located @");
+}
+
+// Tests that ASSERT_THAT() and EXPECT_THAT() work when the matcher is
+// monomorphic.
+TEST(MatcherAssertionTest, WorksForMonomorphicMatcher) {
+  Matcher<const char*> starts_with_he = StartsWith("he");
+  ASSERT_THAT("hello", starts_with_he);
+
+  Matcher<const std::string&> ends_with_ok = EndsWith("ok");
+  ASSERT_THAT("book", ends_with_ok);
+  const std::string bad = "bad";
+  EXPECT_NONFATAL_FAILURE(EXPECT_THAT(bad, ends_with_ok),
+                          "Value of: bad\n"
+                          "Expected: ends with \"ok\"\n"
+                          "  Actual: \"bad\"");
+  Matcher<int> is_greater_than_5 = Gt(5);
+  EXPECT_NONFATAL_FAILURE(EXPECT_THAT(5, is_greater_than_5),
+                          "Value of: 5\n"
+                          "Expected: is > 5\n"
+                          "  Actual: 5" +
+                              OfType("int"));
+}
+
+TEST(PointeeTest, RawPointer) {
+  const Matcher<int*> m = Pointee(Ge(0));
+
+  int n = 1;
+  EXPECT_TRUE(m.Matches(&n));
+  n = -1;
+  EXPECT_FALSE(m.Matches(&n));
+  EXPECT_FALSE(m.Matches(nullptr));
+}
+
+TEST(PointeeTest, RawPointerToConst) {
+  const Matcher<const double*> m = Pointee(Ge(0));
+
+  double x = 1;
+  EXPECT_TRUE(m.Matches(&x));
+  x = -1;
+  EXPECT_FALSE(m.Matches(&x));
+  EXPECT_FALSE(m.Matches(nullptr));
+}
+
+TEST(PointeeTest, ReferenceToConstRawPointer) {
+  const Matcher<int* const&> m = Pointee(Ge(0));
+
+  int n = 1;
+  EXPECT_TRUE(m.Matches(&n));
+  n = -1;
+  EXPECT_FALSE(m.Matches(&n));
+  EXPECT_FALSE(m.Matches(nullptr));
+}
+
+TEST(PointeeTest, ReferenceToNonConstRawPointer) {
+  const Matcher<double*&> m = Pointee(Ge(0));
+
+  double x = 1.0;
+  double* p = &x;
+  EXPECT_TRUE(m.Matches(p));
+  x = -1;
+  EXPECT_FALSE(m.Matches(p));
+  p = nullptr;
+  EXPECT_FALSE(m.Matches(p));
+}
+
+TEST(PointeeTest, SmartPointer) {
+  const Matcher<std::unique_ptr<int>> m = Pointee(Ge(0));
+
+  std::unique_ptr<int> n(new int(1));
+  EXPECT_TRUE(m.Matches(n));
+}
+
+TEST(PointeeTest, SmartPointerToConst) {
+  const Matcher<std::unique_ptr<const int>> m = Pointee(Ge(0));
+
+  // There's no implicit conversion from unique_ptr<int> to const
+  // unique_ptr<const int>, so we must pass a unique_ptr<const int> into the
+  // matcher.
+  std::unique_ptr<const int> n(new int(1));
+  EXPECT_TRUE(m.Matches(n));
+}
+
+TEST(PointerTest, RawPointer) {
+  int n = 1;
+  const Matcher<int*> m = Pointer(Eq(&n));
+
+  EXPECT_TRUE(m.Matches(&n));
+
+  int* p = nullptr;
+  EXPECT_FALSE(m.Matches(p));
+  EXPECT_FALSE(m.Matches(nullptr));
+}
+
+TEST(PointerTest, RawPointerToConst) {
+  int n = 1;
+  const Matcher<const int*> m = Pointer(Eq(&n));
+
+  EXPECT_TRUE(m.Matches(&n));
+
+  int* p = nullptr;
+  EXPECT_FALSE(m.Matches(p));
+  EXPECT_FALSE(m.Matches(nullptr));
+}
+
+TEST(PointerTest, SmartPointer) {
+  std::unique_ptr<int> n(new int(10));
+  int* raw_n = n.get();
+  const Matcher<std::unique_ptr<int>> m = Pointer(Eq(raw_n));
+
+  EXPECT_TRUE(m.Matches(n));
+}
+
+TEST(PointerTest, SmartPointerToConst) {
+  std::unique_ptr<const int> n(new int(10));
+  const int* raw_n = n.get();
+  const Matcher<std::unique_ptr<const int>> m = Pointer(Eq(raw_n));
+
+  // There's no implicit conversion from unique_ptr<int> to const
+  // unique_ptr<const int>, so we must pass a unique_ptr<const int> into the
+  // matcher.
+  std::unique_ptr<const int> p(new int(10));
+  EXPECT_FALSE(m.Matches(p));
+}
+
+// Minimal const-propagating pointer.
+template <typename T>
+class ConstPropagatingPtr {
+ public:
+  typedef T element_type;
+
+  ConstPropagatingPtr() : val_() {}
+  explicit ConstPropagatingPtr(T* t) : val_(t) {}
+  ConstPropagatingPtr(const ConstPropagatingPtr& other) : val_(other.val_) {}
+
+  T* get() { return val_; }
+  T& operator*() { return *val_; }
+  // Most smart pointers return non-const T* and T& from the next methods.
+  const T* get() const { return val_; }
+  const T& operator*() const { return *val_; }
+
+ private:
+  T* val_;
+};
+
+INSTANTIATE_GTEST_MATCHER_TEST_P(PointeeTest);
+
+TEST(PointeeTest, WorksWithConstPropagatingPointers) {
+  const Matcher<ConstPropagatingPtr<int>> m = Pointee(Lt(5));
+  int three = 3;
+  const ConstPropagatingPtr<int> co(&three);
+  ConstPropagatingPtr<int> o(&three);
+  EXPECT_TRUE(m.Matches(o));
+  EXPECT_TRUE(m.Matches(co));
+  *o = 6;
+  EXPECT_FALSE(m.Matches(o));
+  EXPECT_FALSE(m.Matches(ConstPropagatingPtr<int>()));
+}
+
+TEST(PointeeTest, NeverMatchesNull) {
+  const Matcher<const char*> m = Pointee(_);
+  EXPECT_FALSE(m.Matches(nullptr));
+}
+
+// Tests that we can write Pointee(value) instead of Pointee(Eq(value)).
+TEST(PointeeTest, MatchesAgainstAValue) {
+  const Matcher<int*> m = Pointee(5);
+
+  int n = 5;
+  EXPECT_TRUE(m.Matches(&n));
+  n = -1;
+  EXPECT_FALSE(m.Matches(&n));
+  EXPECT_FALSE(m.Matches(nullptr));
+}
+
+TEST(PointeeTest, CanDescribeSelf) {
+  const Matcher<int*> m = Pointee(Gt(3));
+  EXPECT_EQ("points to a value that is > 3", Describe(m));
+  EXPECT_EQ("does not point to a value that is > 3", DescribeNegation(m));
+}
+
+TEST_P(PointeeTestP, CanExplainMatchResult) {
+  const Matcher<const std::string*> m = Pointee(StartsWith("Hi"));
+
+  EXPECT_EQ("", Explain(m, static_cast<const std::string*>(nullptr)));
+
+  const Matcher<long*> m2 = Pointee(GreaterThan(1));  // NOLINT
+  long n = 3;                                         // NOLINT
+  EXPECT_EQ("which points to 3" + OfType("long") + ", which is 2 more than 1",
+            Explain(m2, &n));
+}
+
+TEST(PointeeTest, AlwaysExplainsPointee) {
+  const Matcher<int*> m = Pointee(0);
+  int n = 42;
+  EXPECT_EQ("which points to 42" + OfType("int"), Explain(m, &n));
+}
+
+// An uncopyable class.
+class Uncopyable {
+ public:
+  Uncopyable() : value_(-1) {}
+  explicit Uncopyable(int a_value) : value_(a_value) {}
+
+  int value() const { return value_; }
+  void set_value(int i) { value_ = i; }
+
+ private:
+  int value_;
+  Uncopyable(const Uncopyable&) = delete;
+  Uncopyable& operator=(const Uncopyable&) = delete;
+};
+
+// Returns true if and only if x.value() is positive.
+bool ValueIsPositive(const Uncopyable& x) { return x.value() > 0; }
+
+MATCHER_P(UncopyableIs, inner_matcher, "") {
+  return ExplainMatchResult(inner_matcher, arg.value(), result_listener);
+}
+
+// A user-defined struct for testing Field().
+struct AStruct {
+  AStruct() : x(0), y(1.0), z(5), p(nullptr) {}
+  AStruct(const AStruct& rhs)
+      : x(rhs.x), y(rhs.y), z(rhs.z.value()), p(rhs.p) {}
+
+  int x;           // A non-const field.
+  const double y;  // A const field.
+  Uncopyable z;    // An uncopyable field.
+  const char* p;   // A pointer field.
+};
+
+// A derived struct for testing Field().
+struct DerivedStruct : public AStruct {
+  char ch;
+};
+
+INSTANTIATE_GTEST_MATCHER_TEST_P(FieldTest);
+
+// Tests that Field(&Foo::field, ...) works when field is non-const.
+TEST(FieldTest, WorksForNonConstField) {
+  Matcher<AStruct> m = Field(&AStruct::x, Ge(0));
+  Matcher<AStruct> m_with_name = Field("x", &AStruct::x, Ge(0));
+
+  AStruct a;
+  EXPECT_TRUE(m.Matches(a));
+  EXPECT_TRUE(m_with_name.Matches(a));
+  a.x = -1;
+  EXPECT_FALSE(m.Matches(a));
+  EXPECT_FALSE(m_with_name.Matches(a));
+}
+
+// Tests that Field(&Foo::field, ...) works when field is const.
+TEST(FieldTest, WorksForConstField) {
+  AStruct a;
+
+  Matcher<AStruct> m = Field(&AStruct::y, Ge(0.0));
+  Matcher<AStruct> m_with_name = Field("y", &AStruct::y, Ge(0.0));
+  EXPECT_TRUE(m.Matches(a));
+  EXPECT_TRUE(m_with_name.Matches(a));
+  m = Field(&AStruct::y, Le(0.0));
+  m_with_name = Field("y", &AStruct::y, Le(0.0));
+  EXPECT_FALSE(m.Matches(a));
+  EXPECT_FALSE(m_with_name.Matches(a));
+}
+
+// Tests that Field(&Foo::field, ...) works when field is not copyable.
+TEST(FieldTest, WorksForUncopyableField) {
+  AStruct a;
+
+  Matcher<AStruct> m = Field(&AStruct::z, Truly(ValueIsPositive));
+  EXPECT_TRUE(m.Matches(a));
+  m = Field(&AStruct::z, Not(Truly(ValueIsPositive)));
+  EXPECT_FALSE(m.Matches(a));
+}
+
+// Tests that Field(&Foo::field, ...) works when field is a pointer.
+TEST(FieldTest, WorksForPointerField) {
+  // Matching against NULL.
+  Matcher<AStruct> m = Field(&AStruct::p, static_cast<const char*>(nullptr));
+  AStruct a;
+  EXPECT_TRUE(m.Matches(a));
+  a.p = "hi";
+  EXPECT_FALSE(m.Matches(a));
+
+  // Matching a pointer that is not NULL.
+  m = Field(&AStruct::p, StartsWith("hi"));
+  a.p = "hill";
+  EXPECT_TRUE(m.Matches(a));
+  a.p = "hole";
+  EXPECT_FALSE(m.Matches(a));
+}
+
+// Tests that Field() works when the object is passed by reference.
+TEST(FieldTest, WorksForByRefArgument) {
+  Matcher<const AStruct&> m = Field(&AStruct::x, Ge(0));
+
+  AStruct a;
+  EXPECT_TRUE(m.Matches(a));
+  a.x = -1;
+  EXPECT_FALSE(m.Matches(a));
+}
+
+// Tests that Field(&Foo::field, ...) works when the argument's type
+// is a sub-type of Foo.
+TEST(FieldTest, WorksForArgumentOfSubType) {
+  // Note that the matcher expects DerivedStruct but we say AStruct
+  // inside Field().
+  Matcher<const DerivedStruct&> m = Field(&AStruct::x, Ge(0));
+
+  DerivedStruct d;
+  EXPECT_TRUE(m.Matches(d));
+  d.x = -1;
+  EXPECT_FALSE(m.Matches(d));
+}
+
+// Tests that Field(&Foo::field, m) works when field's type and m's
+// argument type are compatible but not the same.
+TEST(FieldTest, WorksForCompatibleMatcherType) {
+  // The field is an int, but the inner matcher expects a signed char.
+  Matcher<const AStruct&> m = Field(&AStruct::x, Matcher<signed char>(Ge(0)));
+
+  AStruct a;
+  EXPECT_TRUE(m.Matches(a));
+  a.x = -1;
+  EXPECT_FALSE(m.Matches(a));
+}
+
+// Tests that Field() can describe itself.
+TEST(FieldTest, CanDescribeSelf) {
+  Matcher<const AStruct&> m = Field(&AStruct::x, Ge(0));
+
+  EXPECT_EQ("is an object whose given field is >= 0", Describe(m));
+  EXPECT_EQ("is an object whose given field isn't >= 0", DescribeNegation(m));
+}
+
+TEST(FieldTest, CanDescribeSelfWithFieldName) {
+  Matcher<const AStruct&> m = Field("field_name", &AStruct::x, Ge(0));
+
+  EXPECT_EQ("is an object whose field `field_name` is >= 0", Describe(m));
+  EXPECT_EQ("is an object whose field `field_name` isn't >= 0",
+            DescribeNegation(m));
+}
+
+// Tests that Field() can explain the match result.
+TEST_P(FieldTestP, CanExplainMatchResult) {
+  Matcher<const AStruct&> m = Field(&AStruct::x, Ge(0));
+
+  AStruct a;
+  a.x = 1;
+  EXPECT_EQ("whose given field is 1" + OfType("int"), Explain(m, a));
+
+  m = Field(&AStruct::x, GreaterThan(0));
+  EXPECT_EQ(
+      "whose given field is 1" + OfType("int") + ", which is 1 more than 0",
+      Explain(m, a));
+}
+
+TEST_P(FieldTestP, CanExplainMatchResultWithFieldName) {
+  Matcher<const AStruct&> m = Field("field_name", &AStruct::x, Ge(0));
+
+  AStruct a;
+  a.x = 1;
+  EXPECT_EQ("whose field `field_name` is 1" + OfType("int"), Explain(m, a));
+
+  m = Field("field_name", &AStruct::x, GreaterThan(0));
+  EXPECT_EQ("whose field `field_name` is 1" + OfType("int") +
+                ", which is 1 more than 0",
+            Explain(m, a));
+}
+
+INSTANTIATE_GTEST_MATCHER_TEST_P(FieldForPointerTest);
+
+// Tests that Field() works when the argument is a pointer to const.
+TEST(FieldForPointerTest, WorksForPointerToConst) {
+  Matcher<const AStruct*> m = Field(&AStruct::x, Ge(0));
+
+  AStruct a;
+  EXPECT_TRUE(m.Matches(&a));
+  a.x = -1;
+  EXPECT_FALSE(m.Matches(&a));
+}
+
+// Tests that Field() works when the argument is a pointer to non-const.
+TEST(FieldForPointerTest, WorksForPointerToNonConst) {
+  Matcher<AStruct*> m = Field(&AStruct::x, Ge(0));
+
+  AStruct a;
+  EXPECT_TRUE(m.Matches(&a));
+  a.x = -1;
+  EXPECT_FALSE(m.Matches(&a));
+}
+
+// Tests that Field() works when the argument is a reference to a const pointer.
+TEST(FieldForPointerTest, WorksForReferenceToConstPointer) {
+  Matcher<AStruct* const&> m = Field(&AStruct::x, Ge(0));
+
+  AStruct a;
+  EXPECT_TRUE(m.Matches(&a));
+  a.x = -1;
+  EXPECT_FALSE(m.Matches(&a));
+}
+
+// Tests that Field() does not match the NULL pointer.
+TEST(FieldForPointerTest, DoesNotMatchNull) {
+  Matcher<const AStruct*> m = Field(&AStruct::x, _);
+  EXPECT_FALSE(m.Matches(nullptr));
+}
+
+// Tests that Field(&Foo::field, ...) works when the argument's type
+// is a sub-type of const Foo*.
+TEST(FieldForPointerTest, WorksForArgumentOfSubType) {
+  // Note that the matcher expects DerivedStruct but we say AStruct
+  // inside Field().
+  Matcher<DerivedStruct*> m = Field(&AStruct::x, Ge(0));
+
+  DerivedStruct d;
+  EXPECT_TRUE(m.Matches(&d));
+  d.x = -1;
+  EXPECT_FALSE(m.Matches(&d));
+}
+
+// Tests that Field() can describe itself when used to match a pointer.
+TEST(FieldForPointerTest, CanDescribeSelf) {
+  Matcher<const AStruct*> m = Field(&AStruct::x, Ge(0));
+
+  EXPECT_EQ("is an object whose given field is >= 0", Describe(m));
+  EXPECT_EQ("is an object whose given field isn't >= 0", DescribeNegation(m));
+}
+
+TEST(FieldForPointerTest, CanDescribeSelfWithFieldName) {
+  Matcher<const AStruct*> m = Field("field_name", &AStruct::x, Ge(0));
+
+  EXPECT_EQ("is an object whose field `field_name` is >= 0", Describe(m));
+  EXPECT_EQ("is an object whose field `field_name` isn't >= 0",
+            DescribeNegation(m));
+}
+
+// Tests that Field() can explain the result of matching a pointer.
+TEST_P(FieldForPointerTestP, CanExplainMatchResult) {
+  Matcher<const AStruct*> m = Field(&AStruct::x, Ge(0));
+
+  AStruct a;
+  a.x = 1;
+  EXPECT_EQ("", Explain(m, static_cast<const AStruct*>(nullptr)));
+  EXPECT_EQ("which points to an object whose given field is 1" + OfType("int"),
+            Explain(m, &a));
+
+  m = Field(&AStruct::x, GreaterThan(0));
+  EXPECT_EQ("which points to an object whose given field is 1" + OfType("int") +
+                ", which is 1 more than 0",
+            Explain(m, &a));
+}
+
+TEST_P(FieldForPointerTestP, CanExplainMatchResultWithFieldName) {
+  Matcher<const AStruct*> m = Field("field_name", &AStruct::x, Ge(0));
+
+  AStruct a;
+  a.x = 1;
+  EXPECT_EQ("", Explain(m, static_cast<const AStruct*>(nullptr)));
+  EXPECT_EQ(
+      "which points to an object whose field `field_name` is 1" + OfType("int"),
+      Explain(m, &a));
+
+  m = Field("field_name", &AStruct::x, GreaterThan(0));
+  EXPECT_EQ("which points to an object whose field `field_name` is 1" +
+                OfType("int") + ", which is 1 more than 0",
+            Explain(m, &a));
+}
+
+// A user-defined class for testing Property().
+class AClass {
+ public:
+  AClass() : n_(0) {}
+
+  // A getter that returns a non-reference.
+  int n() const { return n_; }
+
+  void set_n(int new_n) { n_ = new_n; }
+
+  // A getter that returns a reference to const.
+  const std::string& s() const { return s_; }
+
+  const std::string& s_ref() const& { return s_; }
+
+  void set_s(const std::string& new_s) { s_ = new_s; }
+
+  // A getter that returns a reference to non-const.
+  double& x() const { return x_; }
+
+ private:
+  int n_;
+  std::string s_;
+
+  static double x_;
+};
+
+double AClass::x_ = 0.0;
+
+// A derived class for testing Property().
+class DerivedClass : public AClass {
+ public:
+  int k() const { return k_; }
+
+ private:
+  int k_;
+};
+
+INSTANTIATE_GTEST_MATCHER_TEST_P(PropertyTest);
+
+// Tests that Property(&Foo::property, ...) works when property()
+// returns a non-reference.
+TEST(PropertyTest, WorksForNonReferenceProperty) {
+  Matcher<const AClass&> m = Property(&AClass::n, Ge(0));
+  Matcher<const AClass&> m_with_name = Property("n", &AClass::n, Ge(0));
+
+  AClass a;
+  a.set_n(1);
+  EXPECT_TRUE(m.Matches(a));
+  EXPECT_TRUE(m_with_name.Matches(a));
+
+  a.set_n(-1);
+  EXPECT_FALSE(m.Matches(a));
+  EXPECT_FALSE(m_with_name.Matches(a));
+}
+
+// Tests that Property(&Foo::property, ...) works when property()
+// returns a reference to const.
+TEST(PropertyTest, WorksForReferenceToConstProperty) {
+  Matcher<const AClass&> m = Property(&AClass::s, StartsWith("hi"));
+  Matcher<const AClass&> m_with_name =
+      Property("s", &AClass::s, StartsWith("hi"));
+
+  AClass a;
+  a.set_s("hill");
+  EXPECT_TRUE(m.Matches(a));
+  EXPECT_TRUE(m_with_name.Matches(a));
+
+  a.set_s("hole");
+  EXPECT_FALSE(m.Matches(a));
+  EXPECT_FALSE(m_with_name.Matches(a));
+}
+
+// Tests that Property(&Foo::property, ...) works when property() is
+// ref-qualified.
+TEST(PropertyTest, WorksForRefQualifiedProperty) {
+  Matcher<const AClass&> m = Property(&AClass::s_ref, StartsWith("hi"));
+  Matcher<const AClass&> m_with_name =
+      Property("s", &AClass::s_ref, StartsWith("hi"));
+
+  AClass a;
+  a.set_s("hill");
+  EXPECT_TRUE(m.Matches(a));
+  EXPECT_TRUE(m_with_name.Matches(a));
+
+  a.set_s("hole");
+  EXPECT_FALSE(m.Matches(a));
+  EXPECT_FALSE(m_with_name.Matches(a));
+}
+
+// Tests that Property(&Foo::property, ...) works when property()
+// returns a reference to non-const.
+TEST(PropertyTest, WorksForReferenceToNonConstProperty) {
+  double x = 0.0;
+  AClass a;
+
+  Matcher<const AClass&> m = Property(&AClass::x, Ref(x));
+  EXPECT_FALSE(m.Matches(a));
+
+  m = Property(&AClass::x, Not(Ref(x)));
+  EXPECT_TRUE(m.Matches(a));
+}
+
+// Tests that Property(&Foo::property, ...) works when the argument is
+// passed by value.
+TEST(PropertyTest, WorksForByValueArgument) {
+  Matcher<AClass> m = Property(&AClass::s, StartsWith("hi"));
+
+  AClass a;
+  a.set_s("hill");
+  EXPECT_TRUE(m.Matches(a));
+
+  a.set_s("hole");
+  EXPECT_FALSE(m.Matches(a));
+}
+
+// Tests that Property(&Foo::property, ...) works when the argument's
+// type is a sub-type of Foo.
+TEST(PropertyTest, WorksForArgumentOfSubType) {
+  // The matcher expects a DerivedClass, but inside the Property() we
+  // say AClass.
+  Matcher<const DerivedClass&> m = Property(&AClass::n, Ge(0));
+
+  DerivedClass d;
+  d.set_n(1);
+  EXPECT_TRUE(m.Matches(d));
+
+  d.set_n(-1);
+  EXPECT_FALSE(m.Matches(d));
+}
+
+// Tests that Property(&Foo::property, m) works when property()'s type
+// and m's argument type are compatible but different.
+TEST(PropertyTest, WorksForCompatibleMatcherType) {
+  // n() returns an int but the inner matcher expects a signed char.
+  Matcher<const AClass&> m = Property(&AClass::n, Matcher<signed char>(Ge(0)));
+
+  Matcher<const AClass&> m_with_name =
+      Property("n", &AClass::n, Matcher<signed char>(Ge(0)));
+
+  AClass a;
+  EXPECT_TRUE(m.Matches(a));
+  EXPECT_TRUE(m_with_name.Matches(a));
+  a.set_n(-1);
+  EXPECT_FALSE(m.Matches(a));
+  EXPECT_FALSE(m_with_name.Matches(a));
+}
+
+// Tests that Property() can describe itself.
+TEST(PropertyTest, CanDescribeSelf) {
+  Matcher<const AClass&> m = Property(&AClass::n, Ge(0));
+
+  EXPECT_EQ("is an object whose given property is >= 0", Describe(m));
+  EXPECT_EQ("is an object whose given property isn't >= 0",
+            DescribeNegation(m));
+}
+
+TEST(PropertyTest, CanDescribeSelfWithPropertyName) {
+  Matcher<const AClass&> m = Property("fancy_name", &AClass::n, Ge(0));
+
+  EXPECT_EQ("is an object whose property `fancy_name` is >= 0", Describe(m));
+  EXPECT_EQ("is an object whose property `fancy_name` isn't >= 0",
+            DescribeNegation(m));
+}
+
+// Tests that Property() can explain the match result.
+TEST_P(PropertyTestP, CanExplainMatchResult) {
+  Matcher<const AClass&> m = Property(&AClass::n, Ge(0));
+
+  AClass a;
+  a.set_n(1);
+  EXPECT_EQ("whose given property is 1" + OfType("int"), Explain(m, a));
+
+  m = Property(&AClass::n, GreaterThan(0));
+  EXPECT_EQ(
+      "whose given property is 1" + OfType("int") + ", which is 1 more than 0",
+      Explain(m, a));
+}
+
+TEST_P(PropertyTestP, CanExplainMatchResultWithPropertyName) {
+  Matcher<const AClass&> m = Property("fancy_name", &AClass::n, Ge(0));
+
+  AClass a;
+  a.set_n(1);
+  EXPECT_EQ("whose property `fancy_name` is 1" + OfType("int"), Explain(m, a));
+
+  m = Property("fancy_name", &AClass::n, GreaterThan(0));
+  EXPECT_EQ("whose property `fancy_name` is 1" + OfType("int") +
+                ", which is 1 more than 0",
+            Explain(m, a));
+}
+
+INSTANTIATE_GTEST_MATCHER_TEST_P(PropertyForPointerTest);
+
+// Tests that Property() works when the argument is a pointer to const.
+TEST(PropertyForPointerTest, WorksForPointerToConst) {
+  Matcher<const AClass*> m = Property(&AClass::n, Ge(0));
+
+  AClass a;
+  a.set_n(1);
+  EXPECT_TRUE(m.Matches(&a));
+
+  a.set_n(-1);
+  EXPECT_FALSE(m.Matches(&a));
+}
+
+// Tests that Property() works when the argument is a pointer to non-const.
+TEST(PropertyForPointerTest, WorksForPointerToNonConst) {
+  Matcher<AClass*> m = Property(&AClass::s, StartsWith("hi"));
+
+  AClass a;
+  a.set_s("hill");
+  EXPECT_TRUE(m.Matches(&a));
+
+  a.set_s("hole");
+  EXPECT_FALSE(m.Matches(&a));
+}
+
+// Tests that Property() works when the argument is a reference to a
+// const pointer.
+TEST(PropertyForPointerTest, WorksForReferenceToConstPointer) {
+  Matcher<AClass* const&> m = Property(&AClass::s, StartsWith("hi"));
+
+  AClass a;
+  a.set_s("hill");
+  EXPECT_TRUE(m.Matches(&a));
+
+  a.set_s("hole");
+  EXPECT_FALSE(m.Matches(&a));
+}
+
+// Tests that Property() does not match the NULL pointer.
+TEST(PropertyForPointerTest, WorksForReferenceToNonConstProperty) {
+  Matcher<const AClass*> m = Property(&AClass::x, _);
+  EXPECT_FALSE(m.Matches(nullptr));
+}
+
+// Tests that Property(&Foo::property, ...) works when the argument's
+// type is a sub-type of const Foo*.
+TEST(PropertyForPointerTest, WorksForArgumentOfSubType) {
+  // The matcher expects a DerivedClass, but inside the Property() we
+  // say AClass.
+  Matcher<const DerivedClass*> m = Property(&AClass::n, Ge(0));
+
+  DerivedClass d;
+  d.set_n(1);
+  EXPECT_TRUE(m.Matches(&d));
+
+  d.set_n(-1);
+  EXPECT_FALSE(m.Matches(&d));
+}
+
+// Tests that Property() can describe itself when used to match a pointer.
+TEST(PropertyForPointerTest, CanDescribeSelf) {
+  Matcher<const AClass*> m = Property(&AClass::n, Ge(0));
+
+  EXPECT_EQ("is an object whose given property is >= 0", Describe(m));
+  EXPECT_EQ("is an object whose given property isn't >= 0",
+            DescribeNegation(m));
+}
+
+TEST(PropertyForPointerTest, CanDescribeSelfWithPropertyDescription) {
+  Matcher<const AClass*> m = Property("fancy_name", &AClass::n, Ge(0));
+
+  EXPECT_EQ("is an object whose property `fancy_name` is >= 0", Describe(m));
+  EXPECT_EQ("is an object whose property `fancy_name` isn't >= 0",
+            DescribeNegation(m));
+}
+
+// Tests that Property() can explain the result of matching a pointer.
+TEST_P(PropertyForPointerTestP, CanExplainMatchResult) {
+  Matcher<const AClass*> m = Property(&AClass::n, Ge(0));
+
+  AClass a;
+  a.set_n(1);
+  EXPECT_EQ("", Explain(m, static_cast<const AClass*>(nullptr)));
+  EXPECT_EQ(
+      "which points to an object whose given property is 1" + OfType("int"),
+      Explain(m, &a));
+
+  m = Property(&AClass::n, GreaterThan(0));
+  EXPECT_EQ("which points to an object whose given property is 1" +
+                OfType("int") + ", which is 1 more than 0",
+            Explain(m, &a));
+}
+
+TEST_P(PropertyForPointerTestP, CanExplainMatchResultWithPropertyName) {
+  Matcher<const AClass*> m = Property("fancy_name", &AClass::n, Ge(0));
+
+  AClass a;
+  a.set_n(1);
+  EXPECT_EQ("", Explain(m, static_cast<const AClass*>(nullptr)));
+  EXPECT_EQ("which points to an object whose property `fancy_name` is 1" +
+                OfType("int"),
+            Explain(m, &a));
+
+  m = Property("fancy_name", &AClass::n, GreaterThan(0));
+  EXPECT_EQ("which points to an object whose property `fancy_name` is 1" +
+                OfType("int") + ", which is 1 more than 0",
+            Explain(m, &a));
+}
+
+// Tests ResultOf.
+
+// Tests that ResultOf(f, ...) compiles and works as expected when f is a
+// function pointer.
+std::string IntToStringFunction(int input) {
+  return input == 1 ? "foo" : "bar";
+}
+
+INSTANTIATE_GTEST_MATCHER_TEST_P(ResultOfTest);
+
+TEST(ResultOfTest, WorksForFunctionPointers) {
+  Matcher<int> matcher = ResultOf(&IntToStringFunction, Eq(std::string("foo")));
+
+  EXPECT_TRUE(matcher.Matches(1));
+  EXPECT_FALSE(matcher.Matches(2));
+}
+
+// Tests that ResultOf() can describe itself.
+TEST(ResultOfTest, CanDescribeItself) {
+  Matcher<int> matcher = ResultOf(&IntToStringFunction, StrEq("foo"));
+
+  EXPECT_EQ(
+      "is mapped by the given callable to a value that "
+      "is equal to \"foo\"",
+      Describe(matcher));
+  EXPECT_EQ(
+      "is mapped by the given callable to a value that "
+      "isn't equal to \"foo\"",
+      DescribeNegation(matcher));
+}
+
+// Tests that ResultOf() can describe itself when provided a result description.
+TEST(ResultOfTest, CanDescribeItselfWithResultDescription) {
+  Matcher<int> matcher =
+      ResultOf("string conversion", &IntToStringFunction, StrEq("foo"));
+
+  EXPECT_EQ("whose string conversion is equal to \"foo\"", Describe(matcher));
+  EXPECT_EQ("whose string conversion isn't equal to \"foo\"",
+            DescribeNegation(matcher));
+}
+
+// Tests that ResultOf() can explain the match result.
+int IntFunction(int input) { return input == 42 ? 80 : 90; }
+
+TEST_P(ResultOfTestP, CanExplainMatchResult) {
+  Matcher<int> matcher = ResultOf(&IntFunction, Ge(85));
+  EXPECT_EQ("which is mapped by the given callable to 90" + OfType("int"),
+            Explain(matcher, 36));
+
+  matcher = ResultOf(&IntFunction, GreaterThan(85));
+  EXPECT_EQ("which is mapped by the given callable to 90" + OfType("int") +
+                ", which is 5 more than 85",
+            Explain(matcher, 36));
+}
+
+TEST_P(ResultOfTestP, CanExplainMatchResultWithResultDescription) {
+  Matcher<int> matcher = ResultOf("magic int conversion", &IntFunction, Ge(85));
+  EXPECT_EQ("whose magic int conversion is 90" + OfType("int"),
+            Explain(matcher, 36));
+
+  matcher = ResultOf("magic int conversion", &IntFunction, GreaterThan(85));
+  EXPECT_EQ("whose magic int conversion is 90" + OfType("int") +
+                ", which is 5 more than 85",
+            Explain(matcher, 36));
+}
+
+// Tests that ResultOf(f, ...) compiles and works as expected when f(x)
+// returns a non-reference.
+TEST(ResultOfTest, WorksForNonReferenceResults) {
+  Matcher<int> matcher = ResultOf(&IntFunction, Eq(80));
+
+  EXPECT_TRUE(matcher.Matches(42));
+  EXPECT_FALSE(matcher.Matches(36));
+}
+
+// Tests that ResultOf(f, ...) compiles and works as expected when f(x)
+// returns a reference to non-const.
+double& DoubleFunction(double& input) { return input; }  // NOLINT
+
+Uncopyable& RefUncopyableFunction(Uncopyable& obj) {  // NOLINT
+  return obj;
+}
+
+TEST(ResultOfTest, WorksForReferenceToNonConstResults) {
+  double x = 3.14;
+  double x2 = x;
+  Matcher<double&> matcher = ResultOf(&DoubleFunction, Ref(x));
+
+  EXPECT_TRUE(matcher.Matches(x));
+  EXPECT_FALSE(matcher.Matches(x2));
+
+  // Test that ResultOf works with uncopyable objects
+  Uncopyable obj(0);
+  Uncopyable obj2(0);
+  Matcher<Uncopyable&> matcher2 = ResultOf(&RefUncopyableFunction, Ref(obj));
+
+  EXPECT_TRUE(matcher2.Matches(obj));
+  EXPECT_FALSE(matcher2.Matches(obj2));
+}
+
+// Tests that ResultOf(f, ...) compiles and works as expected when f(x)
+// returns a reference to const.
+const std::string& StringFunction(const std::string& input) { return input; }
+
+TEST(ResultOfTest, WorksForReferenceToConstResults) {
+  std::string s = "foo";
+  std::string s2 = s;
+  Matcher<const std::string&> matcher = ResultOf(&StringFunction, Ref(s));
+
+  EXPECT_TRUE(matcher.Matches(s));
+  EXPECT_FALSE(matcher.Matches(s2));
+}
+
+// Tests that ResultOf(f, m) works when f(x) and m's
+// argument types are compatible but different.
+TEST(ResultOfTest, WorksForCompatibleMatcherTypes) {
+  // IntFunction() returns int but the inner matcher expects a signed char.
+  Matcher<int> matcher = ResultOf(IntFunction, Matcher<signed char>(Ge(85)));
+
+  EXPECT_TRUE(matcher.Matches(36));
+  EXPECT_FALSE(matcher.Matches(42));
+}
+
+// Tests that the program aborts when ResultOf is passed
+// a NULL function pointer.
+TEST(ResultOfDeathTest, DiesOnNullFunctionPointers) {
+  EXPECT_DEATH_IF_SUPPORTED(
+      ResultOf(static_cast<std::string (*)(int dummy)>(nullptr),
+               Eq(std::string("foo"))),
+      "NULL function pointer is passed into ResultOf\\(\\)\\.");
+}
+
+// Tests that ResultOf(f, ...) compiles and works as expected when f is a
+// function reference.
+TEST(ResultOfTest, WorksForFunctionReferences) {
+  Matcher<int> matcher = ResultOf(IntToStringFunction, StrEq("foo"));
+  EXPECT_TRUE(matcher.Matches(1));
+  EXPECT_FALSE(matcher.Matches(2));
+}
+
+// Tests that ResultOf(f, ...) compiles and works as expected when f is a
+// function object.
+struct Functor {
+  std::string operator()(int input) const { return IntToStringFunction(input); }
+};
+
+TEST(ResultOfTest, WorksForFunctors) {
+  Matcher<int> matcher = ResultOf(Functor(), Eq(std::string("foo")));
+
+  EXPECT_TRUE(matcher.Matches(1));
+  EXPECT_FALSE(matcher.Matches(2));
+}
+
+// Tests that ResultOf(f, ...) compiles and works as expected when f is a
+// functor with more than one operator() defined. ResultOf() must work
+// for each defined operator().
+struct PolymorphicFunctor {
+  typedef int result_type;
+  int operator()(int n) { return n; }
+  int operator()(const char* s) { return static_cast<int>(strlen(s)); }
+  std::string operator()(int* p) { return p ? "good ptr" : "null"; }
+};
+
+TEST(ResultOfTest, WorksForPolymorphicFunctors) {
+  Matcher<int> matcher_int = ResultOf(PolymorphicFunctor(), Ge(5));
+
+  EXPECT_TRUE(matcher_int.Matches(10));
+  EXPECT_FALSE(matcher_int.Matches(2));
+
+  Matcher<const char*> matcher_string = ResultOf(PolymorphicFunctor(), Ge(5));
+
+  EXPECT_TRUE(matcher_string.Matches("long string"));
+  EXPECT_FALSE(matcher_string.Matches("shrt"));
+}
+
+TEST(ResultOfTest, WorksForPolymorphicFunctorsIgnoringResultType) {
+  Matcher<int*> matcher = ResultOf(PolymorphicFunctor(), "good ptr");
+
+  int n = 0;
+  EXPECT_TRUE(matcher.Matches(&n));
+  EXPECT_FALSE(matcher.Matches(nullptr));
+}
+
+TEST(ResultOfTest, WorksForLambdas) {
+  Matcher<int> matcher = ResultOf(
+      [](int str_len) {
+        return std::string(static_cast<size_t>(str_len), 'x');
+      },
+      "xxx");
+  EXPECT_TRUE(matcher.Matches(3));
+  EXPECT_FALSE(matcher.Matches(1));
+}
+
+TEST(ResultOfTest, WorksForNonCopyableArguments) {
+  Matcher<std::unique_ptr<int>> matcher = ResultOf(
+      [](const std::unique_ptr<int>& str_len) {
+        return std::string(static_cast<size_t>(*str_len), 'x');
+      },
+      "xxx");
+  EXPECT_TRUE(matcher.Matches(std::unique_ptr<int>(new int(3))));
+  EXPECT_FALSE(matcher.Matches(std::unique_ptr<int>(new int(1))));
+}
+
+const int* ReferencingFunction(const int& n) { return &n; }
+
+struct ReferencingFunctor {
+  typedef const int* result_type;
+  result_type operator()(const int& n) { return &n; }
+};
+
+TEST(ResultOfTest, WorksForReferencingCallables) {
+  const int n = 1;
+  const int n2 = 1;
+  Matcher<const int&> matcher2 = ResultOf(ReferencingFunction, Eq(&n));
+  EXPECT_TRUE(matcher2.Matches(n));
+  EXPECT_FALSE(matcher2.Matches(n2));
+
+  Matcher<const int&> matcher3 = ResultOf(ReferencingFunctor(), Eq(&n));
+  EXPECT_TRUE(matcher3.Matches(n));
+  EXPECT_FALSE(matcher3.Matches(n2));
+}
+
+TEST(SizeIsTest, ImplementsSizeIs) {
+  vector<int> container;
+  EXPECT_THAT(container, SizeIs(0));
+  EXPECT_THAT(container, Not(SizeIs(1)));
+  container.push_back(0);
+  EXPECT_THAT(container, Not(SizeIs(0)));
+  EXPECT_THAT(container, SizeIs(1));
+  container.push_back(0);
+  EXPECT_THAT(container, Not(SizeIs(0)));
+  EXPECT_THAT(container, SizeIs(2));
+}
+
+TEST(SizeIsTest, WorksWithMap) {
+  map<std::string, int> container;
+  EXPECT_THAT(container, SizeIs(0));
+  EXPECT_THAT(container, Not(SizeIs(1)));
+  container.insert(make_pair("foo", 1));
+  EXPECT_THAT(container, Not(SizeIs(0)));
+  EXPECT_THAT(container, SizeIs(1));
+  container.insert(make_pair("bar", 2));
+  EXPECT_THAT(container, Not(SizeIs(0)));
+  EXPECT_THAT(container, SizeIs(2));
+}
+
+TEST(SizeIsTest, WorksWithReferences) {
+  vector<int> container;
+  Matcher<const vector<int>&> m = SizeIs(1);
+  EXPECT_THAT(container, Not(m));
+  container.push_back(0);
+  EXPECT_THAT(container, m);
+}
+
+TEST(SizeIsTest, WorksWithMoveOnly) {
+  ContainerHelper helper;
+  EXPECT_CALL(helper, Call(SizeIs(3)));
+  helper.Call(MakeUniquePtrs({1, 2, 3}));
+}
+
+// SizeIs should work for any type that provides a size() member function.
+// For example, a size_type member type should not need to be provided.
+struct MinimalistCustomType {
+  int size() const { return 1; }
+};
+TEST(SizeIsTest, WorksWithMinimalistCustomType) {
+  MinimalistCustomType container;
+  EXPECT_THAT(container, SizeIs(1));
+  EXPECT_THAT(container, Not(SizeIs(0)));
+}
+
+TEST(SizeIsTest, CanDescribeSelf) {
+  Matcher<vector<int>> m = SizeIs(2);
+  EXPECT_EQ("has a size that is equal to 2", Describe(m));
+  EXPECT_EQ("has a size that isn't equal to 2", DescribeNegation(m));
+}
+
+TEST(SizeIsTest, ExplainsResult) {
+  Matcher<vector<int>> m1 = SizeIs(2);
+  Matcher<vector<int>> m2 = SizeIs(Lt(2u));
+  Matcher<vector<int>> m3 = SizeIs(AnyOf(0, 3));
+  Matcher<vector<int>> m4 = SizeIs(Gt(1u));
+  vector<int> container;
+  EXPECT_EQ("whose size 0 doesn't match", Explain(m1, container));
+  EXPECT_EQ("whose size 0 matches", Explain(m2, container));
+  EXPECT_EQ("whose size 0 matches, which matches (is equal to 0)",
+            Explain(m3, container));
+  EXPECT_EQ("whose size 0 doesn't match", Explain(m4, container));
+  container.push_back(0);
+  container.push_back(0);
+  EXPECT_EQ("whose size 2 matches", Explain(m1, container));
+  EXPECT_EQ("whose size 2 doesn't match", Explain(m2, container));
+  EXPECT_EQ(
+      "whose size 2 doesn't match, isn't equal to 0, and isn't equal to 3",
+      Explain(m3, container));
+  EXPECT_EQ("whose size 2 matches", Explain(m4, container));
+}
+
+TEST(WhenSortedByTest, WorksForEmptyContainer) {
+  const vector<int> numbers;
+  EXPECT_THAT(numbers, WhenSortedBy(less<int>(), ElementsAre()));
+  EXPECT_THAT(numbers, Not(WhenSortedBy(less<int>(), ElementsAre(1))));
+}
+
+TEST(WhenSortedByTest, WorksForNonEmptyContainer) {
+  vector<unsigned> numbers;
+  numbers.push_back(3);
+  numbers.push_back(1);
+  numbers.push_back(2);
+  numbers.push_back(2);
+  EXPECT_THAT(numbers,
+              WhenSortedBy(greater<unsigned>(), ElementsAre(3, 2, 2, 1)));
+  EXPECT_THAT(numbers,
+              Not(WhenSortedBy(greater<unsigned>(), ElementsAre(1, 2, 2, 3))));
+}
+
+TEST(WhenSortedByTest, WorksForNonVectorContainer) {
+  list<std::string> words;
+  words.push_back("say");
+  words.push_back("hello");
+  words.push_back("world");
+  EXPECT_THAT(words, WhenSortedBy(less<std::string>(),
+                                  ElementsAre("hello", "say", "world")));
+  EXPECT_THAT(words, Not(WhenSortedBy(less<std::string>(),
+                                      ElementsAre("say", "hello", "world"))));
+}
+
+TEST(WhenSortedByTest, WorksForNativeArray) {
+  const int numbers[] = {1, 3, 2, 4};
+  const int sorted_numbers[] = {1, 2, 3, 4};
+  EXPECT_THAT(numbers, WhenSortedBy(less<int>(), ElementsAre(1, 2, 3, 4)));
+  EXPECT_THAT(numbers,
+              WhenSortedBy(less<int>(), ElementsAreArray(sorted_numbers)));
+  EXPECT_THAT(numbers, Not(WhenSortedBy(less<int>(), ElementsAre(1, 3, 2, 4))));
+}
+
+TEST(WhenSortedByTest, CanDescribeSelf) {
+  const Matcher<vector<int>> m = WhenSortedBy(less<int>(), ElementsAre(1, 2));
+  EXPECT_EQ(
+      "(when sorted) has 2 elements where\n"
+      "element #0 is equal to 1,\n"
+      "element #1 is equal to 2",
+      Describe(m));
+  EXPECT_EQ(
+      "(when sorted) doesn't have 2 elements, or\n"
+      "element #0 isn't equal to 1, or\n"
+      "element #1 isn't equal to 2",
+      DescribeNegation(m));
+}
+
+TEST(WhenSortedByTest, ExplainsMatchResult) {
+  const int a[] = {2, 1};
+  EXPECT_EQ(
+      Explain(WhenSortedBy(less<int>(), ElementsAre(2, 3)), a),
+      "which is { 1, 2 } when sorted, whose element #0 (1) isn't equal to 2");
+  EXPECT_EQ(Explain(WhenSortedBy(less<int>(), ElementsAre(1, 2)), a),
+            "which is { 1, 2 } when sorted");
+}
+
+// WhenSorted() is a simple wrapper on WhenSortedBy().  Hence we don't
+// need to test it as exhaustively as we test the latter.
+
+TEST(WhenSortedTest, WorksForEmptyContainer) {
+  const vector<int> numbers;
+  EXPECT_THAT(numbers, WhenSorted(ElementsAre()));
+  EXPECT_THAT(numbers, Not(WhenSorted(ElementsAre(1))));
+}
+
+TEST(WhenSortedTest, WorksForNonEmptyContainer) {
+  list<std::string> words;
+  words.push_back("3");
+  words.push_back("1");
+  words.push_back("2");
+  words.push_back("2");
+  EXPECT_THAT(words, WhenSorted(ElementsAre("1", "2", "2", "3")));
+  EXPECT_THAT(words, Not(WhenSorted(ElementsAre("3", "1", "2", "2"))));
+}
+
+TEST(WhenSortedTest, WorksForMapTypes) {
+  map<std::string, int> word_counts;
+  word_counts["and"] = 1;
+  word_counts["the"] = 1;
+  word_counts["buffalo"] = 2;
+  EXPECT_THAT(word_counts,
+              WhenSorted(ElementsAre(Pair("and", 1), Pair("buffalo", 2),
+                                     Pair("the", 1))));
+  EXPECT_THAT(word_counts,
+              Not(WhenSorted(ElementsAre(Pair("and", 1), Pair("the", 1),
+                                         Pair("buffalo", 2)))));
+}
+
+TEST(WhenSortedTest, WorksForMultiMapTypes) {
+  multimap<int, int> ifib;
+  ifib.insert(make_pair(8, 6));
+  ifib.insert(make_pair(2, 3));
+  ifib.insert(make_pair(1, 1));
+  ifib.insert(make_pair(3, 4));
+  ifib.insert(make_pair(1, 2));
+  ifib.insert(make_pair(5, 5));
+  EXPECT_THAT(ifib,
+              WhenSorted(ElementsAre(Pair(1, 1), Pair(1, 2), Pair(2, 3),
+                                     Pair(3, 4), Pair(5, 5), Pair(8, 6))));
+  EXPECT_THAT(ifib,
+              Not(WhenSorted(ElementsAre(Pair(8, 6), Pair(2, 3), Pair(1, 1),
+                                         Pair(3, 4), Pair(1, 2), Pair(5, 5)))));
+}
+
+TEST(WhenSortedTest, WorksForPolymorphicMatcher) {
+  std::deque<int> d;
+  d.push_back(2);
+  d.push_back(1);
+  EXPECT_THAT(d, WhenSorted(ElementsAre(1, 2)));
+  EXPECT_THAT(d, Not(WhenSorted(ElementsAre(2, 1))));
+}
+
+TEST(WhenSortedTest, WorksForVectorConstRefMatcher) {
+  std::deque<int> d;
+  d.push_back(2);
+  d.push_back(1);
+  Matcher<const std::vector<int>&> vector_match = ElementsAre(1, 2);
+  EXPECT_THAT(d, WhenSorted(vector_match));
+  Matcher<const std::vector<int>&> not_vector_match = ElementsAre(2, 1);
+  EXPECT_THAT(d, Not(WhenSorted(not_vector_match)));
+}
+
+// Deliberately bare pseudo-container.
+// Offers only begin() and end() accessors, yielding InputIterator.
+template <typename T>
+class Streamlike {
+ private:
+  class ConstIter;
+
+ public:
+  typedef ConstIter const_iterator;
+  typedef T value_type;
+
+  template <typename InIter>
+  Streamlike(InIter first, InIter last) : remainder_(first, last) {}
+
+  const_iterator begin() const {
+    return const_iterator(this, remainder_.begin());
+  }
+  const_iterator end() const { return const_iterator(this, remainder_.end()); }
+
+ private:
+  class ConstIter {
+   public:
+    using iterator_category = std::input_iterator_tag;
+    using value_type = T;
+    using difference_type = ptrdiff_t;
+    using pointer = const value_type*;
+    using reference = const value_type&;
+
+    ConstIter(const Streamlike* s, typename std::list<value_type>::iterator pos)
+        : s_(s), pos_(pos) {}
+
+    const value_type& operator*() const { return *pos_; }
+    const value_type* operator->() const { return &*pos_; }
+    ConstIter& operator++() {
+      s_->remainder_.erase(pos_++);
+      return *this;
+    }
+
+    // *iter++ is required to work (see std::istreambuf_iterator).
+    // (void)iter++ is also required to work.
+    class PostIncrProxy {
+     public:
+      explicit PostIncrProxy(const value_type& value) : value_(value) {}
+      value_type operator*() const { return value_; }
+
+     private:
+      value_type value_;
+    };
+    PostIncrProxy operator++(int) {
+      PostIncrProxy proxy(**this);
+      ++(*this);
+      return proxy;
+    }
+
+    friend bool operator==(const ConstIter& a, const ConstIter& b) {
+      return a.s_ == b.s_ && a.pos_ == b.pos_;
+    }
+    friend bool operator!=(const ConstIter& a, const ConstIter& b) {
+      return !(a == b);
+    }
+
+   private:
+    const Streamlike* s_;
+    typename std::list<value_type>::iterator pos_;
+  };
+
+  friend std::ostream& operator<<(std::ostream& os, const Streamlike& s) {
+    os << "[";
+    typedef typename std::list<value_type>::const_iterator Iter;
+    const char* sep = "";
+    for (Iter it = s.remainder_.begin(); it != s.remainder_.end(); ++it) {
+      os << sep << *it;
+      sep = ",";
+    }
+    os << "]";
+    return os;
+  }
+
+  mutable std::list<value_type> remainder_;  // modified by iteration
+};
+
+TEST(StreamlikeTest, Iteration) {
+  const int a[5] = {2, 1, 4, 5, 3};
+  Streamlike<int> s(a, a + 5);
+  Streamlike<int>::const_iterator it = s.begin();
+  const int* ip = a;
+  while (it != s.end()) {
+    SCOPED_TRACE(ip - a);
+    EXPECT_EQ(*ip++, *it++);
+  }
+}
+
+INSTANTIATE_GTEST_MATCHER_TEST_P(BeginEndDistanceIsTest);
+
+TEST(BeginEndDistanceIsTest, WorksWithForwardList) {
+  std::forward_list<int> container;
+  EXPECT_THAT(container, BeginEndDistanceIs(0));
+  EXPECT_THAT(container, Not(BeginEndDistanceIs(1)));
+  container.push_front(0);
+  EXPECT_THAT(container, Not(BeginEndDistanceIs(0)));
+  EXPECT_THAT(container, BeginEndDistanceIs(1));
+  container.push_front(0);
+  EXPECT_THAT(container, Not(BeginEndDistanceIs(0)));
+  EXPECT_THAT(container, BeginEndDistanceIs(2));
+}
+
+TEST(BeginEndDistanceIsTest, WorksWithNonStdList) {
+  const int a[5] = {1, 2, 3, 4, 5};
+  Streamlike<int> s(a, a + 5);
+  EXPECT_THAT(s, BeginEndDistanceIs(5));
+}
+
+TEST(BeginEndDistanceIsTest, CanDescribeSelf) {
+  Matcher<vector<int>> m = BeginEndDistanceIs(2);
+  EXPECT_EQ("distance between begin() and end() is equal to 2", Describe(m));
+  EXPECT_EQ("distance between begin() and end() isn't equal to 2",
+            DescribeNegation(m));
+}
+
+TEST(BeginEndDistanceIsTest, WorksWithMoveOnly) {
+  ContainerHelper helper;
+  EXPECT_CALL(helper, Call(BeginEndDistanceIs(2)));
+  helper.Call(MakeUniquePtrs({1, 2}));
+}
+
+TEST_P(BeginEndDistanceIsTestP, ExplainsResult) {
+  Matcher<vector<int>> m1 = BeginEndDistanceIs(2);
+  Matcher<vector<int>> m2 = BeginEndDistanceIs(Lt(2));
+  Matcher<vector<int>> m3 = BeginEndDistanceIs(AnyOf(0, 3));
+  Matcher<vector<int>> m4 = BeginEndDistanceIs(GreaterThan(1));
+  vector<int> container;
+  EXPECT_EQ("whose distance between begin() and end() 0 doesn't match",
+            Explain(m1, container));
+  EXPECT_EQ("whose distance between begin() and end() 0 matches",
+            Explain(m2, container));
+  EXPECT_EQ(
+      "whose distance between begin() and end() 0 matches, which matches (is "
+      "equal to 0)",
+      Explain(m3, container));
+  EXPECT_EQ(
+      "whose distance between begin() and end() 0 doesn't match, which is 1 "
+      "less than 1",
+      Explain(m4, container));
+  container.push_back(0);
+  container.push_back(0);
+  EXPECT_EQ("whose distance between begin() and end() 2 matches",
+            Explain(m1, container));
+  EXPECT_EQ("whose distance between begin() and end() 2 doesn't match",
+            Explain(m2, container));
+  EXPECT_EQ(
+      "whose distance between begin() and end() 2 doesn't match, isn't equal "
+      "to 0, and isn't equal to 3",
+      Explain(m3, container));
+  EXPECT_EQ(
+      "whose distance between begin() and end() 2 matches, which is 1 more "
+      "than 1",
+      Explain(m4, container));
+}
+
+TEST(WhenSortedTest, WorksForStreamlike) {
+  // Streamlike 'container' provides only minimal iterator support.
+  // Its iterators are tagged with input_iterator_tag.
+  const int a[5] = {2, 1, 4, 5, 3};
+  Streamlike<int> s(std::begin(a), std::end(a));
+  EXPECT_THAT(s, WhenSorted(ElementsAre(1, 2, 3, 4, 5)));
+  EXPECT_THAT(s, Not(WhenSorted(ElementsAre(2, 1, 4, 5, 3))));
+}
+
+TEST(WhenSortedTest, WorksForVectorConstRefMatcherOnStreamlike) {
+  const int a[] = {2, 1, 4, 5, 3};
+  Streamlike<int> s(std::begin(a), std::end(a));
+  Matcher<const std::vector<int>&> vector_match = ElementsAre(1, 2, 3, 4, 5);
+  EXPECT_THAT(s, WhenSorted(vector_match));
+  EXPECT_THAT(s, Not(WhenSorted(ElementsAre(2, 1, 4, 5, 3))));
+}
+
+TEST(IsSupersetOfTest, WorksForNativeArray) {
+  const int subset[] = {1, 4};
+  const int superset[] = {1, 2, 4};
+  const int disjoint[] = {1, 0, 3};
+  EXPECT_THAT(subset, IsSupersetOf(subset));
+  EXPECT_THAT(subset, Not(IsSupersetOf(superset)));
+  EXPECT_THAT(superset, IsSupersetOf(subset));
+  EXPECT_THAT(subset, Not(IsSupersetOf(disjoint)));
+  EXPECT_THAT(disjoint, Not(IsSupersetOf(subset)));
+}
+
+TEST(IsSupersetOfTest, WorksWithDuplicates) {
+  const int not_enough[] = {1, 2};
+  const int enough[] = {1, 1, 2};
+  const int expected[] = {1, 1};
+  EXPECT_THAT(not_enough, Not(IsSupersetOf(expected)));
+  EXPECT_THAT(enough, IsSupersetOf(expected));
+}
+
+TEST(IsSupersetOfTest, WorksForEmpty) {
+  vector<int> numbers;
+  vector<int> expected;
+  EXPECT_THAT(numbers, IsSupersetOf(expected));
+  expected.push_back(1);
+  EXPECT_THAT(numbers, Not(IsSupersetOf(expected)));
+  expected.clear();
+  numbers.push_back(1);
+  numbers.push_back(2);
+  EXPECT_THAT(numbers, IsSupersetOf(expected));
+  expected.push_back(1);
+  EXPECT_THAT(numbers, IsSupersetOf(expected));
+  expected.push_back(2);
+  EXPECT_THAT(numbers, IsSupersetOf(expected));
+  expected.push_back(3);
+  EXPECT_THAT(numbers, Not(IsSupersetOf(expected)));
+}
+
+TEST(IsSupersetOfTest, WorksForStreamlike) {
+  const int a[5] = {1, 2, 3, 4, 5};
+  Streamlike<int> s(std::begin(a), std::end(a));
+
+  vector<int> expected;
+  expected.push_back(1);
+  expected.push_back(2);
+  expected.push_back(5);
+  EXPECT_THAT(s, IsSupersetOf(expected));
+
+  expected.push_back(0);
+  EXPECT_THAT(s, Not(IsSupersetOf(expected)));
+}
+
+TEST(IsSupersetOfTest, TakesStlContainer) {
+  const int actual[] = {3, 1, 2};
+
+  ::std::list<int> expected;
+  expected.push_back(1);
+  expected.push_back(3);
+  EXPECT_THAT(actual, IsSupersetOf(expected));
+
+  expected.push_back(4);
+  EXPECT_THAT(actual, Not(IsSupersetOf(expected)));
+}
+
+TEST(IsSupersetOfTest, Describe) {
+  typedef std::vector<int> IntVec;
+  IntVec expected;
+  expected.push_back(111);
+  expected.push_back(222);
+  expected.push_back(333);
+  EXPECT_THAT(
+      Describe<IntVec>(IsSupersetOf(expected)),
+      Eq("a surjection from elements to requirements exists such that:\n"
+         " - an element is equal to 111\n"
+         " - an element is equal to 222\n"
+         " - an element is equal to 333"));
+}
+
+TEST(IsSupersetOfTest, DescribeNegation) {
+  typedef std::vector<int> IntVec;
+  IntVec expected;
+  expected.push_back(111);
+  expected.push_back(222);
+  expected.push_back(333);
+  EXPECT_THAT(
+      DescribeNegation<IntVec>(IsSupersetOf(expected)),
+      Eq("no surjection from elements to requirements exists such that:\n"
+         " - an element is equal to 111\n"
+         " - an element is equal to 222\n"
+         " - an element is equal to 333"));
+}
+
+TEST(IsSupersetOfTest, MatchAndExplain) {
+  std::vector<int> v;
+  v.push_back(2);
+  v.push_back(3);
+  std::vector<int> expected;
+  expected.push_back(1);
+  expected.push_back(2);
+  StringMatchResultListener listener;
+  ASSERT_FALSE(ExplainMatchResult(IsSupersetOf(expected), v, &listener))
+      << listener.str();
+  EXPECT_THAT(listener.str(),
+              Eq("where the following matchers don't match any elements:\n"
+                 "matcher #0: is equal to 1"));
+
+  v.push_back(1);
+  listener.Clear();
+  ASSERT_TRUE(ExplainMatchResult(IsSupersetOf(expected), v, &listener))
+      << listener.str();
+  EXPECT_THAT(listener.str(), Eq("where:\n"
+                                 " - element #0 is matched by matcher #1,\n"
+                                 " - element #2 is matched by matcher #0"));
+}
+
+TEST(IsSupersetOfTest, WorksForRhsInitializerList) {
+  const int numbers[] = {1, 3, 6, 2, 4, 5};
+  EXPECT_THAT(numbers, IsSupersetOf({1, 2}));
+  EXPECT_THAT(numbers, Not(IsSupersetOf({3, 0})));
+}
+
+TEST(IsSupersetOfTest, WorksWithMoveOnly) {
+  ContainerHelper helper;
+  EXPECT_CALL(helper, Call(IsSupersetOf({Pointee(1)})));
+  helper.Call(MakeUniquePtrs({1, 2}));
+  EXPECT_CALL(helper, Call(Not(IsSupersetOf({Pointee(1), Pointee(2)}))));
+  helper.Call(MakeUniquePtrs({2}));
+}
+
+TEST(IsSubsetOfTest, WorksForNativeArray) {
+  const int subset[] = {1, 4};
+  const int superset[] = {1, 2, 4};
+  const int disjoint[] = {1, 0, 3};
+  EXPECT_THAT(subset, IsSubsetOf(subset));
+  EXPECT_THAT(subset, IsSubsetOf(superset));
+  EXPECT_THAT(superset, Not(IsSubsetOf(subset)));
+  EXPECT_THAT(subset, Not(IsSubsetOf(disjoint)));
+  EXPECT_THAT(disjoint, Not(IsSubsetOf(subset)));
+}
+
+TEST(IsSubsetOfTest, WorksWithDuplicates) {
+  const int not_enough[] = {1, 2};
+  const int enough[] = {1, 1, 2};
+  const int actual[] = {1, 1};
+  EXPECT_THAT(actual, Not(IsSubsetOf(not_enough)));
+  EXPECT_THAT(actual, IsSubsetOf(enough));
+}
+
+TEST(IsSubsetOfTest, WorksForEmpty) {
+  vector<int> numbers;
+  vector<int> expected;
+  EXPECT_THAT(numbers, IsSubsetOf(expected));
+  expected.push_back(1);
+  EXPECT_THAT(numbers, IsSubsetOf(expected));
+  expected.clear();
+  numbers.push_back(1);
+  numbers.push_back(2);
+  EXPECT_THAT(numbers, Not(IsSubsetOf(expected)));
+  expected.push_back(1);
+  EXPECT_THAT(numbers, Not(IsSubsetOf(expected)));
+  expected.push_back(2);
+  EXPECT_THAT(numbers, IsSubsetOf(expected));
+  expected.push_back(3);
+  EXPECT_THAT(numbers, IsSubsetOf(expected));
+}
+
+TEST(IsSubsetOfTest, WorksForStreamlike) {
+  const int a[5] = {1, 2};
+  Streamlike<int> s(std::begin(a), std::end(a));
+
+  vector<int> expected;
+  expected.push_back(1);
+  EXPECT_THAT(s, Not(IsSubsetOf(expected)));
+  expected.push_back(2);
+  expected.push_back(5);
+  EXPECT_THAT(s, IsSubsetOf(expected));
+}
+
+TEST(IsSubsetOfTest, TakesStlContainer) {
+  const int actual[] = {3, 1, 2};
+
+  ::std::list<int> expected;
+  expected.push_back(1);
+  expected.push_back(3);
+  EXPECT_THAT(actual, Not(IsSubsetOf(expected)));
+
+  expected.push_back(2);
+  expected.push_back(4);
+  EXPECT_THAT(actual, IsSubsetOf(expected));
+}
+
+TEST(IsSubsetOfTest, Describe) {
+  typedef std::vector<int> IntVec;
+  IntVec expected;
+  expected.push_back(111);
+  expected.push_back(222);
+  expected.push_back(333);
+
+  EXPECT_THAT(
+      Describe<IntVec>(IsSubsetOf(expected)),
+      Eq("an injection from elements to requirements exists such that:\n"
+         " - an element is equal to 111\n"
+         " - an element is equal to 222\n"
+         " - an element is equal to 333"));
+}
+
+TEST(IsSubsetOfTest, DescribeNegation) {
+  typedef std::vector<int> IntVec;
+  IntVec expected;
+  expected.push_back(111);
+  expected.push_back(222);
+  expected.push_back(333);
+  EXPECT_THAT(
+      DescribeNegation<IntVec>(IsSubsetOf(expected)),
+      Eq("no injection from elements to requirements exists such that:\n"
+         " - an element is equal to 111\n"
+         " - an element is equal to 222\n"
+         " - an element is equal to 333"));
+}
+
+TEST(IsSubsetOfTest, MatchAndExplain) {
+  std::vector<int> v;
+  v.push_back(2);
+  v.push_back(3);
+  std::vector<int> expected;
+  expected.push_back(1);
+  expected.push_back(2);
+  StringMatchResultListener listener;
+  ASSERT_FALSE(ExplainMatchResult(IsSubsetOf(expected), v, &listener))
+      << listener.str();
+  EXPECT_THAT(listener.str(),
+              Eq("where the following elements don't match any matchers:\n"
+                 "element #1: 3"));
+
+  expected.push_back(3);
+  listener.Clear();
+  ASSERT_TRUE(ExplainMatchResult(IsSubsetOf(expected), v, &listener))
+      << listener.str();
+  EXPECT_THAT(listener.str(), Eq("where:\n"
+                                 " - element #0 is matched by matcher #1,\n"
+                                 " - element #1 is matched by matcher #2"));
+}
+
+TEST(IsSubsetOfTest, WorksForRhsInitializerList) {
+  const int numbers[] = {1, 2, 3};
+  EXPECT_THAT(numbers, IsSubsetOf({1, 2, 3, 4}));
+  EXPECT_THAT(numbers, Not(IsSubsetOf({1, 2})));
+}
+
+TEST(IsSubsetOfTest, WorksWithMoveOnly) {
+  ContainerHelper helper;
+  EXPECT_CALL(helper, Call(IsSubsetOf({Pointee(1), Pointee(2)})));
+  helper.Call(MakeUniquePtrs({1}));
+  EXPECT_CALL(helper, Call(Not(IsSubsetOf({Pointee(1)}))));
+  helper.Call(MakeUniquePtrs({2}));
+}
+
+// A container whose iterator returns a temporary. This can iterate over the
+// characters in a string.
+class CharString {
+ public:
+  using value_type = char;
+
+  class const_iterator {
+   public:
+    using iterator_category = std::input_iterator_tag;
+    using value_type = char;
+    using difference_type = std::ptrdiff_t;
+    using pointer = const char*;
+    using reference = const char&;
+
+    // Create an iterator that points to the given character.
+    explicit const_iterator(const char* ptr) : ptr_(ptr) {}
+
+    // Returns the current character. IMPORTANT: this must return a temporary,
+    // not a reference, to test that ElementsAre() works with containers whose
+    // iterators return temporaries.
+    char operator*() const { return *ptr_; }
+
+    // Advances to the next character.
+    const_iterator& operator++() {
+      ++ptr_;
+      return *this;
+    }
+
+    // Compares two iterators.
+    bool operator==(const const_iterator& other) const {
+      return ptr_ == other.ptr_;
+    }
+    bool operator!=(const const_iterator& other) const {
+      return ptr_ != other.ptr_;
+    }
+
+   private:
+    const char* ptr_ = nullptr;
+  };
+
+  // Creates a CharString that contains the given string.
+  explicit CharString(const std::string& s) : s_(s) {}
+
+  // Returns an iterator pointing to the first character in the string.
+  const_iterator begin() const { return const_iterator(s_.c_str()); }
+
+  // Returns an iterator pointing past the last character in the string.
+  const_iterator end() const { return const_iterator(s_.c_str() + s_.size()); }
+
+ private:
+  std::string s_;
+};
+
+// Tests using ElementsAre() with a container whose iterator returns a
+// temporary.
+TEST(ElementsAreTest, WorksWithContainerThatReturnsTempInIterator) {
+  CharString s("abc");
+  EXPECT_THAT(s, ElementsAre('a', 'b', 'c'));
+  EXPECT_THAT(s, Not(ElementsAre('a', 'b', 'd')));
+}
+
+// Tests using ElementsAreArray() with a container whose iterator returns a
+// temporary.
+TEST(ElementsAreArrayTest, WorksWithContainerThatReturnsTempInIterator) {
+  CharString s("abc");
+  EXPECT_THAT(s, ElementsAreArray({'a', 'b', 'c'}));
+  EXPECT_THAT(s, Not(ElementsAreArray({'a', 'b', 'd'})));
+}
+
+// A container whose iterator returns a temporary and is not copy-assignable.
+// This simulates the behavior of the proxy object returned by absl::StrSplit().
+class CharString2 {
+ public:
+  using value_type = char;
+
+  class const_iterator {
+   public:
+    using iterator_category = std::input_iterator_tag;
+    using value_type = char;
+    using difference_type = std::ptrdiff_t;
+    using pointer = const char*;
+    using reference = const char&;
+
+    // Make const_iterator copy-constructible but not copy-assignable,
+    // simulating the behavior of the proxy object returned by absl::StrSplit().
+    const_iterator(const const_iterator&) = default;
+    const_iterator& operator=(const const_iterator&) = delete;
+
+    // Create an iterator that points to the given character.
+    explicit const_iterator(const char* ptr) : ptr_(ptr) {}
+
+    // Returns the current character. IMPORTANT: this must return a temporary,
+    // not a reference, to test that ElementsAre() works with containers whose
+    // iterators return temporaries.
+    char operator*() const { return *ptr_; }
+
+    // Advances to the next character.
+    const_iterator& operator++() {
+      ++ptr_;
+      return *this;
+    }
+
+    // Compares two iterators.
+    bool operator==(const const_iterator& other) const {
+      return ptr_ == other.ptr_;
+    }
+    bool operator!=(const const_iterator& other) const {
+      return ptr_ != other.ptr_;
+    }
+
+   private:
+    const char* ptr_ = nullptr;
+  };
+
+  // Creates a CharString that contains the given string.
+  explicit CharString2(const std::string& s) : s_(s) {}
+
+  // Returns an iterator pointing to the first character in the string.
+  const_iterator begin() const { return const_iterator(s_.c_str()); }
+
+  // Returns an iterator pointing past the last character in the string.
+  const_iterator end() const { return const_iterator(s_.c_str() + s_.size()); }
+
+ private:
+  std::string s_;
+};
+
+// Tests using ElementsAre() with a container whose iterator returns a
+// temporary and is not copy-assignable.
+TEST(ElementsAreTest, WorksWithContainerThatReturnsTempInUnassignableIterator) {
+  CharString2 s("abc");
+  EXPECT_THAT(s, ElementsAre('a', 'b', 'c'));
+  EXPECT_THAT(s, Not(ElementsAre('a', 'b', 'd')));
+}
+
+// Tests using ElementsAreArray() with a container whose iterator returns a
+// temporary and is not copy-assignable.
+TEST(ElementsAreArrayTest,
+     WorksWithContainerThatReturnsTempInUnassignableIterator) {
+  CharString2 s("abc");
+  EXPECT_THAT(s, ElementsAreArray({'a', 'b', 'c'}));
+  EXPECT_THAT(s, Not(ElementsAreArray({'a', 'b', 'd'})));
+}
+
+// A container whose iterator returns a temporary and is neither
+// copy-constructible nor copy-assignable.
+class CharString3 {
+ public:
+  using value_type = char;
+
+  class const_iterator {
+   public:
+    using iterator_category = std::input_iterator_tag;
+    using value_type = char;
+    using difference_type = std::ptrdiff_t;
+    using pointer = const char*;
+    using reference = const char&;
+
+    // Make const_iterator neither copy-constructible nor copy-assignable.
+    const_iterator(const const_iterator&) = delete;
+    const_iterator& operator=(const const_iterator&) = delete;
+
+    // Create an iterator that points to the given character.
+    explicit const_iterator(const char* ptr) : ptr_(ptr) {}
+
+    // Returns the current character. IMPORTANT: this must return a temporary,
+    // not a reference, to test that ElementsAre() works with containers whose
+    // iterators return temporaries.
+    char operator*() const { return *ptr_; }
+
+    // Advances to the next character.
+    const_iterator& operator++() {
+      ++ptr_;
+      return *this;
+    }
+
+    // Compares two iterators.
+    bool operator==(const const_iterator& other) const {
+      return ptr_ == other.ptr_;
+    }
+    bool operator!=(const const_iterator& other) const {
+      return ptr_ != other.ptr_;
+    }
+
+   private:
+    const char* ptr_ = nullptr;
+  };
+
+  // Creates a CharString that contains the given string.
+  explicit CharString3(const std::string& s) : s_(s) {}
+
+  // Returns an iterator pointing to the first character in the string.
+  const_iterator begin() const { return const_iterator(s_.c_str()); }
+
+  // Returns an iterator pointing past the last character in the string.
+  const_iterator end() const { return const_iterator(s_.c_str() + s_.size()); }
+
+ private:
+  std::string s_;
+};
+
+// Tests using ElementsAre() with a container whose iterator returns a
+// temporary and is neither copy-constructible nor copy-assignable.
+TEST(ElementsAreTest, WorksWithContainerThatReturnsTempInUncopyableIterator) {
+  CharString3 s("abc");
+  EXPECT_THAT(s, ElementsAre('a', 'b', 'c'));
+  EXPECT_THAT(s, Not(ElementsAre('a', 'b', 'd')));
+}
+
+// Tests using ElementsAreArray() with a container whose iterator returns a
+// temporary and is neither copy-constructible nor copy-assignable.
+TEST(ElementsAreArrayTest,
+     WorksWithContainerThatReturnsTempInUncopyableIterator) {
+  CharString3 s("abc");
+  EXPECT_THAT(s, ElementsAreArray({'a', 'b', 'c'}));
+  EXPECT_THAT(s, Not(ElementsAreArray({'a', 'b', 'd'})));
+}
+
+// A container whose iterator returns a temporary, is neither
+// copy-constructible nor copy-assignable, and has no member types.
+class CharString4 {
+ public:
+  using value_type = char;
+
+  class const_iterator {
+   public:
+    // Do not define difference_type, etc.
+
+    // Make const_iterator neither copy-constructible nor copy-assignable.
+    const_iterator(const const_iterator&) = delete;
+    const_iterator& operator=(const const_iterator&) = delete;
+
+    // Create an iterator that points to the given character.
+    explicit const_iterator(const char* ptr) : ptr_(ptr) {}
+
+    // Returns the current character. IMPORTANT: this must return a temporary,
+    // not a reference, to test that ElementsAre() works with containers whose
+    // iterators return temporaries.
+    char operator*() const { return *ptr_; }
+
+    // Advances to the next character.
+    const_iterator& operator++() {
+      ++ptr_;
+      return *this;
+    }
+
+    // Compares two iterators.
+    bool operator==(const const_iterator& other) const {
+      return ptr_ == other.ptr_;
+    }
+    bool operator!=(const const_iterator& other) const {
+      return ptr_ != other.ptr_;
+    }
+
+   private:
+    const char* ptr_ = nullptr;
+  };
+
+  // Creates a CharString that contains the given string.
+  explicit CharString4(const std::string& s) : s_(s) {}
+
+  // Returns an iterator pointing to the first character in the string.
+  const_iterator begin() const { return const_iterator(s_.c_str()); }
+
+  // Returns an iterator pointing past the last character in the string.
+  const_iterator end() const { return const_iterator(s_.c_str() + s_.size()); }
+
+ private:
+  std::string s_;
+};
+
+// Tests using ElementsAre() with a container whose iterator returns a
+// temporary, is neither copy-constructible nor copy-assignable, and has no
+// member types.
+TEST(ElementsAreTest, WorksWithContainerWithIteratorWithNoMemberTypes) {
+  CharString4 s("abc");
+  EXPECT_THAT(s, ElementsAre('a', 'b', 'c'));
+  EXPECT_THAT(s, Not(ElementsAre('a', 'b', 'd')));
+}
+
+// Tests using ElementsAreArray() with a container whose iterator returns a
+// temporary, is neither copy-constructible nor copy-assignable, and has no
+// member types.
+TEST(ElementsAreArrayTest, WorksWithContainerWithIteratorWithNoMemberTypes) {
+  CharString4 s("abc");
+  EXPECT_THAT(s, ElementsAreArray({'a', 'b', 'c'}));
+  EXPECT_THAT(s, Not(ElementsAreArray({'a', 'b', 'd'})));
+}
+
+// Tests using ElementsAre() and ElementsAreArray() with stream-like
+// "containers".
+
+TEST(ElemensAreStreamTest, WorksForStreamlike) {
+  const int a[5] = {1, 2, 3, 4, 5};
+  Streamlike<int> s(std::begin(a), std::end(a));
+  EXPECT_THAT(s, ElementsAre(1, 2, 3, 4, 5));
+  EXPECT_THAT(s, Not(ElementsAre(2, 1, 4, 5, 3)));
+}
+
+TEST(ElemensAreArrayStreamTest, WorksForStreamlike) {
+  const int a[5] = {1, 2, 3, 4, 5};
+  Streamlike<int> s(std::begin(a), std::end(a));
+
+  vector<int> expected;
+  expected.push_back(1);
+  expected.push_back(2);
+  expected.push_back(3);
+  expected.push_back(4);
+  expected.push_back(5);
+  EXPECT_THAT(s, ElementsAreArray(expected));
+
+  expected[3] = 0;
+  EXPECT_THAT(s, Not(ElementsAreArray(expected)));
+}
+
+TEST(ElementsAreTest, WorksWithUncopyable) {
+  Uncopyable objs[2];
+  objs[0].set_value(-3);
+  objs[1].set_value(1);
+  EXPECT_THAT(objs, ElementsAre(UncopyableIs(-3), Truly(ValueIsPositive)));
+}
+
+TEST(ElementsAreTest, WorksWithMoveOnly) {
+  ContainerHelper helper;
+  EXPECT_CALL(helper, Call(ElementsAre(Pointee(1), Pointee(2))));
+  helper.Call(MakeUniquePtrs({1, 2}));
+
+  EXPECT_CALL(helper, Call(ElementsAreArray({Pointee(3), Pointee(4)})));
+  helper.Call(MakeUniquePtrs({3, 4}));
+}
+
+TEST(ElementsAreTest, TakesStlContainer) {
+  const int actual[] = {3, 1, 2};
+
+  ::std::list<int> expected;
+  expected.push_back(3);
+  expected.push_back(1);
+  expected.push_back(2);
+  EXPECT_THAT(actual, ElementsAreArray(expected));
+
+  expected.push_back(4);
+  EXPECT_THAT(actual, Not(ElementsAreArray(expected)));
+}
+
+// Tests for UnorderedElementsAreArray()
+
+TEST(UnorderedElementsAreArrayTest, SucceedsWhenExpected) {
+  const int a[] = {0, 1, 2, 3, 4};
+  std::vector<int> s(std::begin(a), std::end(a));
+  do {
+    StringMatchResultListener listener;
+    EXPECT_TRUE(ExplainMatchResult(UnorderedElementsAreArray(a), s, &listener))
+        << listener.str();
+  } while (std::next_permutation(s.begin(), s.end()));
+}
+
+TEST(UnorderedElementsAreArrayTest, VectorBool) {
+  const bool a[] = {false, true, false, true, true};
+  const bool b[] = {true, false, true, true, false};
+  std::vector<bool> expected(std::begin(a), std::end(a));
+  std::vector<bool> actual(std::begin(b), std::end(b));
+  StringMatchResultListener listener;
+  EXPECT_TRUE(ExplainMatchResult(UnorderedElementsAreArray(expected), actual,
+                                 &listener))
+      << listener.str();
+}
+
+TEST(UnorderedElementsAreArrayTest, WorksForStreamlike) {
+  // Streamlike 'container' provides only minimal iterator support.
+  // Its iterators are tagged with input_iterator_tag, and it has no
+  // size() or empty() methods.
+  const int a[5] = {2, 1, 4, 5, 3};
+  Streamlike<int> s(std::begin(a), std::end(a));
+
+  ::std::vector<int> expected;
+  expected.push_back(1);
+  expected.push_back(2);
+  expected.push_back(3);
+  expected.push_back(4);
+  expected.push_back(5);
+  EXPECT_THAT(s, UnorderedElementsAreArray(expected));
+
+  expected.push_back(6);
+  EXPECT_THAT(s, Not(UnorderedElementsAreArray(expected)));
+}
+
+TEST(UnorderedElementsAreArrayTest, TakesStlContainer) {
+  const int actual[] = {3, 1, 2};
+
+  ::std::list<int> expected;
+  expected.push_back(1);
+  expected.push_back(2);
+  expected.push_back(3);
+  EXPECT_THAT(actual, UnorderedElementsAreArray(expected));
+
+  expected.push_back(4);
+  EXPECT_THAT(actual, Not(UnorderedElementsAreArray(expected)));
+}
+
+TEST(UnorderedElementsAreArrayTest, TakesInitializerList) {
+  const int a[5] = {2, 1, 4, 5, 3};
+  EXPECT_THAT(a, UnorderedElementsAreArray({1, 2, 3, 4, 5}));
+  EXPECT_THAT(a, Not(UnorderedElementsAreArray({1, 2, 3, 4, 6})));
+}
+
+TEST(UnorderedElementsAreArrayTest, TakesInitializerListOfCStrings) {
+  const std::string a[5] = {"a", "b", "c", "d", "e"};
+  EXPECT_THAT(a, UnorderedElementsAreArray({"a", "b", "c", "d", "e"}));
+  EXPECT_THAT(a, Not(UnorderedElementsAreArray({"a", "b", "c", "d", "ef"})));
+}
+
+TEST(UnorderedElementsAreArrayTest, TakesInitializerListOfSameTypedMatchers) {
+  const int a[5] = {2, 1, 4, 5, 3};
+  EXPECT_THAT(a,
+              UnorderedElementsAreArray({Eq(1), Eq(2), Eq(3), Eq(4), Eq(5)}));
+  EXPECT_THAT(
+      a, Not(UnorderedElementsAreArray({Eq(1), Eq(2), Eq(3), Eq(4), Eq(6)})));
+}
+
+TEST(UnorderedElementsAreArrayTest,
+     TakesInitializerListOfDifferentTypedMatchers) {
+  const int a[5] = {2, 1, 4, 5, 3};
+  // The compiler cannot infer the type of the initializer list if its
+  // elements have different types.  We must explicitly specify the
+  // unified element type in this case.
+  EXPECT_THAT(a, UnorderedElementsAreArray<Matcher<int>>(
+                     {Eq(1), Ne(-2), Ge(3), Le(4), Eq(5)}));
+  EXPECT_THAT(a, Not(UnorderedElementsAreArray<Matcher<int>>(
+                     {Eq(1), Ne(-2), Ge(3), Le(4), Eq(6)})));
+}
+
+TEST(UnorderedElementsAreArrayTest, WorksWithMoveOnly) {
+  ContainerHelper helper;
+  EXPECT_CALL(helper,
+              Call(UnorderedElementsAreArray({Pointee(1), Pointee(2)})));
+  helper.Call(MakeUniquePtrs({2, 1}));
+}
+
+class UnorderedElementsAreTest : public testing::Test {
+ protected:
+  typedef std::vector<int> IntVec;
+};
+
+TEST_F(UnorderedElementsAreTest, WorksWithUncopyable) {
+  Uncopyable objs[2];
+  objs[0].set_value(-3);
+  objs[1].set_value(1);
+  EXPECT_THAT(objs,
+              UnorderedElementsAre(Truly(ValueIsPositive), UncopyableIs(-3)));
+}
+
+TEST_F(UnorderedElementsAreTest, SucceedsWhenExpected) {
+  const int a[] = {1, 2, 3};
+  std::vector<int> s(std::begin(a), std::end(a));
+  do {
+    StringMatchResultListener listener;
+    EXPECT_TRUE(ExplainMatchResult(UnorderedElementsAre(1, 2, 3), s, &listener))
+        << listener.str();
+  } while (std::next_permutation(s.begin(), s.end()));
+}
+
+TEST_F(UnorderedElementsAreTest, FailsWhenAnElementMatchesNoMatcher) {
+  const int a[] = {1, 2, 3};
+  std::vector<int> s(std::begin(a), std::end(a));
+  std::vector<Matcher<int>> mv;
+  mv.push_back(1);
+  mv.push_back(2);
+  mv.push_back(2);
+  // The element with value '3' matches nothing: fail fast.
+  StringMatchResultListener listener;
+  EXPECT_FALSE(ExplainMatchResult(UnorderedElementsAreArray(mv), s, &listener))
+      << listener.str();
+}
+
+TEST_F(UnorderedElementsAreTest, WorksForStreamlike) {
+  // Streamlike 'container' provides only minimal iterator support.
+  // Its iterators are tagged with input_iterator_tag, and it has no
+  // size() or empty() methods.
+  const int a[5] = {2, 1, 4, 5, 3};
+  Streamlike<int> s(std::begin(a), std::end(a));
+
+  EXPECT_THAT(s, UnorderedElementsAre(1, 2, 3, 4, 5));
+  EXPECT_THAT(s, Not(UnorderedElementsAre(2, 2, 3, 4, 5)));
+}
+
+TEST_F(UnorderedElementsAreTest, WorksWithMoveOnly) {
+  ContainerHelper helper;
+  EXPECT_CALL(helper, Call(UnorderedElementsAre(Pointee(1), Pointee(2))));
+  helper.Call(MakeUniquePtrs({2, 1}));
+}
+
+// One naive implementation of the matcher runs in O(N!) time, which is too
+// slow for many real-world inputs. This test shows that our matcher can match
+// 100 inputs very quickly (a few milliseconds).  An O(100!) is 10^158
+// iterations and obviously effectively incomputable.
+// [ RUN      ] UnorderedElementsAreTest.Performance
+// [       OK ] UnorderedElementsAreTest.Performance (4 ms)
+TEST_F(UnorderedElementsAreTest, Performance) {
+  std::vector<int> s;
+  std::vector<Matcher<int>> mv;
+  for (int i = 0; i < 100; ++i) {
+    s.push_back(i);
+    mv.push_back(_);
+  }
+  mv[50] = Eq(0);
+  StringMatchResultListener listener;
+  EXPECT_TRUE(ExplainMatchResult(UnorderedElementsAreArray(mv), s, &listener))
+      << listener.str();
+}
+
+// Another variant of 'Performance' with similar expectations.
+// [ RUN      ] UnorderedElementsAreTest.PerformanceHalfStrict
+// [       OK ] UnorderedElementsAreTest.PerformanceHalfStrict (4 ms)
+TEST_F(UnorderedElementsAreTest, PerformanceHalfStrict) {
+  std::vector<int> s;
+  std::vector<Matcher<int>> mv;
+  for (int i = 0; i < 100; ++i) {
+    s.push_back(i);
+    if (i & 1) {
+      mv.push_back(_);
+    } else {
+      mv.push_back(i);
+    }
+  }
+  StringMatchResultListener listener;
+  EXPECT_TRUE(ExplainMatchResult(UnorderedElementsAreArray(mv), s, &listener))
+      << listener.str();
+}
+
+TEST_F(UnorderedElementsAreTest, FailMessageCountWrong) {
+  std::vector<int> v;
+  v.push_back(4);
+  StringMatchResultListener listener;
+  EXPECT_FALSE(ExplainMatchResult(UnorderedElementsAre(1, 2, 3), v, &listener))
+      << listener.str();
+  EXPECT_THAT(listener.str(),
+              Eq("which has 1 element\n"
+                 "where the following matchers don't match any elements:\n"
+                 "matcher #0: is equal to 1,\n"
+                 "matcher #1: is equal to 2,\n"
+                 "matcher #2: is equal to 3\n"
+                 "and where the following elements don't match any matchers:\n"
+                 "element #0: 4"));
+}
+
+TEST_F(UnorderedElementsAreTest, FailMessageCountWrongZero) {
+  std::vector<int> v;
+  StringMatchResultListener listener;
+  EXPECT_FALSE(ExplainMatchResult(UnorderedElementsAre(1, 2, 3), v, &listener))
+      << listener.str();
+  EXPECT_THAT(listener.str(),
+              Eq("where the following matchers don't match any elements:\n"
+                 "matcher #0: is equal to 1,\n"
+                 "matcher #1: is equal to 2,\n"
+                 "matcher #2: is equal to 3"));
+}
+
+TEST_F(UnorderedElementsAreTest, FailMessageUnmatchedMatchers) {
+  std::vector<int> v;
+  v.push_back(1);
+  v.push_back(1);
+  StringMatchResultListener listener;
+  EXPECT_FALSE(ExplainMatchResult(UnorderedElementsAre(1, 2), v, &listener))
+      << listener.str();
+  EXPECT_THAT(listener.str(),
+              Eq("where the following matchers don't match any elements:\n"
+                 "matcher #1: is equal to 2"));
+}
+
+TEST_F(UnorderedElementsAreTest, FailMessageUnmatchedElements) {
+  std::vector<int> v;
+  v.push_back(1);
+  v.push_back(2);
+  StringMatchResultListener listener;
+  EXPECT_FALSE(ExplainMatchResult(UnorderedElementsAre(1, 1), v, &listener))
+      << listener.str();
+  EXPECT_THAT(listener.str(),
+              Eq("where the following elements don't match any matchers:\n"
+                 "element #1: 2"));
+}
+
+TEST_F(UnorderedElementsAreTest, FailMessageUnmatchedMatcherAndElement) {
+  std::vector<int> v;
+  v.push_back(2);
+  v.push_back(3);
+  StringMatchResultListener listener;
+  EXPECT_FALSE(ExplainMatchResult(UnorderedElementsAre(1, 2), v, &listener))
+      << listener.str();
+  EXPECT_THAT(listener.str(),
+              Eq("where"
+                 " the following matchers don't match any elements:\n"
+                 "matcher #0: is equal to 1\n"
+                 "and"
+                 " where"
+                 " the following elements don't match any matchers:\n"
+                 "element #1: 3"));
+}
+
+// Test helper for formatting element, matcher index pairs in expectations.
+static std::string EMString(int element, int matcher) {
+  stringstream ss;
+  ss << "(element #" << element << ", matcher #" << matcher << ")";
+  return ss.str();
+}
+
+TEST_F(UnorderedElementsAreTest, FailMessageImperfectMatchOnly) {
+  // A situation where all elements and matchers have a match
+  // associated with them, but the max matching is not perfect.
+  std::vector<std::string> v;
+  v.push_back("a");
+  v.push_back("b");
+  v.push_back("c");
+  StringMatchResultListener listener;
+  EXPECT_FALSE(ExplainMatchResult(
+      UnorderedElementsAre("a", "a", AnyOf("b", "c")), v, &listener))
+      << listener.str();
+
+  std::string prefix =
+      "where no permutation of the elements can satisfy all matchers, "
+      "and the closest match is 2 of 3 matchers with the "
+      "pairings:\n";
+
+  // We have to be a bit loose here, because there are 4 valid max matches.
+  EXPECT_THAT(
+      listener.str(),
+      AnyOf(
+          prefix + "{\n  " + EMString(0, 0) + ",\n  " + EMString(1, 2) + "\n}",
+          prefix + "{\n  " + EMString(0, 1) + ",\n  " + EMString(1, 2) + "\n}",
+          prefix + "{\n  " + EMString(0, 0) + ",\n  " + EMString(2, 2) + "\n}",
+          prefix + "{\n  " + EMString(0, 1) + ",\n  " + EMString(2, 2) +
+              "\n}"));
+}
+
+TEST_F(UnorderedElementsAreTest, Describe) {
+  EXPECT_THAT(Describe<IntVec>(UnorderedElementsAre()), Eq("is empty"));
+  EXPECT_THAT(Describe<IntVec>(UnorderedElementsAre(345)),
+              Eq("has 1 element and that element is equal to 345"));
+  EXPECT_THAT(Describe<IntVec>(UnorderedElementsAre(111, 222, 333)),
+              Eq("has 3 elements and there exists some permutation "
+                 "of elements such that:\n"
+                 " - element #0 is equal to 111, and\n"
+                 " - element #1 is equal to 222, and\n"
+                 " - element #2 is equal to 333"));
+}
+
+TEST_F(UnorderedElementsAreTest, DescribeNegation) {
+  EXPECT_THAT(DescribeNegation<IntVec>(UnorderedElementsAre()),
+              Eq("isn't empty"));
+  EXPECT_THAT(
+      DescribeNegation<IntVec>(UnorderedElementsAre(345)),
+      Eq("doesn't have 1 element, or has 1 element that isn't equal to 345"));
+  EXPECT_THAT(DescribeNegation<IntVec>(UnorderedElementsAre(123, 234, 345)),
+              Eq("doesn't have 3 elements, or there exists no permutation "
+                 "of elements such that:\n"
+                 " - element #0 is equal to 123, and\n"
+                 " - element #1 is equal to 234, and\n"
+                 " - element #2 is equal to 345"));
+}
+
+// Tests Each().
+
+INSTANTIATE_GTEST_MATCHER_TEST_P(EachTest);
+
+TEST_P(EachTestP, ExplainsMatchResultCorrectly) {
+  set<int> a;  // empty
+
+  Matcher<set<int>> m = Each(2);
+  EXPECT_EQ("", Explain(m, a));
+
+  Matcher<const int (&)[1]> n = Each(1);  // NOLINT
+
+  const int b[1] = {1};
+  EXPECT_EQ("", Explain(n, b));
+
+  n = Each(3);
+  EXPECT_EQ("whose element #0 doesn't match", Explain(n, b));
+
+  a.insert(1);
+  a.insert(2);
+  a.insert(3);
+  m = Each(GreaterThan(0));
+  EXPECT_EQ("", Explain(m, a));
+
+  m = Each(GreaterThan(10));
+  EXPECT_EQ("whose element #0 doesn't match, which is 9 less than 10",
+            Explain(m, a));
+}
+
+TEST(EachTest, DescribesItselfCorrectly) {
+  Matcher<vector<int>> m = Each(1);
+  EXPECT_EQ("only contains elements that is equal to 1", Describe(m));
+
+  Matcher<vector<int>> m2 = Not(m);
+  EXPECT_EQ("contains some element that isn't equal to 1", Describe(m2));
+}
+
+TEST(EachTest, MatchesVectorWhenAllElementsMatch) {
+  vector<int> some_vector;
+  EXPECT_THAT(some_vector, Each(1));
+  some_vector.push_back(3);
+  EXPECT_THAT(some_vector, Not(Each(1)));
+  EXPECT_THAT(some_vector, Each(3));
+  some_vector.push_back(1);
+  some_vector.push_back(2);
+  EXPECT_THAT(some_vector, Not(Each(3)));
+  EXPECT_THAT(some_vector, Each(Lt(3.5)));
+
+  vector<std::string> another_vector;
+  another_vector.push_back("fee");
+  EXPECT_THAT(another_vector, Each(std::string("fee")));
+  another_vector.push_back("fie");
+  another_vector.push_back("foe");
+  another_vector.push_back("fum");
+  EXPECT_THAT(another_vector, Not(Each(std::string("fee"))));
+}
+
+TEST(EachTest, MatchesMapWhenAllElementsMatch) {
+  map<const char*, int> my_map;
+  const char* bar = "a string";
+  my_map[bar] = 2;
+  EXPECT_THAT(my_map, Each(make_pair(bar, 2)));
+
+  map<std::string, int> another_map;
+  EXPECT_THAT(another_map, Each(make_pair(std::string("fee"), 1)));
+  another_map["fee"] = 1;
+  EXPECT_THAT(another_map, Each(make_pair(std::string("fee"), 1)));
+  another_map["fie"] = 2;
+  another_map["foe"] = 3;
+  another_map["fum"] = 4;
+  EXPECT_THAT(another_map, Not(Each(make_pair(std::string("fee"), 1))));
+  EXPECT_THAT(another_map, Not(Each(make_pair(std::string("fum"), 1))));
+  EXPECT_THAT(another_map, Each(Pair(_, Gt(0))));
+}
+
+TEST(EachTest, AcceptsMatcher) {
+  const int a[] = {1, 2, 3};
+  EXPECT_THAT(a, Each(Gt(0)));
+  EXPECT_THAT(a, Not(Each(Gt(1))));
+}
+
+TEST(EachTest, WorksForNativeArrayAsTuple) {
+  const int a[] = {1, 2};
+  const int* const pointer = a;
+  EXPECT_THAT(std::make_tuple(pointer, 2), Each(Gt(0)));
+  EXPECT_THAT(std::make_tuple(pointer, 2), Not(Each(Gt(1))));
+}
+
+TEST(EachTest, WorksWithMoveOnly) {
+  ContainerHelper helper;
+  EXPECT_CALL(helper, Call(Each(Pointee(Gt(0)))));
+  helper.Call(MakeUniquePtrs({1, 2}));
+}
+
+// For testing Pointwise().
+class IsHalfOfMatcher {
+ public:
+  template <typename T1, typename T2>
+  bool MatchAndExplain(const std::tuple<T1, T2>& a_pair,
+                       MatchResultListener* listener) const {
+    if (std::get<0>(a_pair) == std::get<1>(a_pair) / 2) {
+      *listener << "where the second is " << std::get<1>(a_pair);
+      return true;
+    } else {
+      *listener << "where the second/2 is " << std::get<1>(a_pair) / 2;
+      return false;
+    }
+  }
+
+  void DescribeTo(ostream* os) const {
+    *os << "are a pair where the first is half of the second";
+  }
+
+  void DescribeNegationTo(ostream* os) const {
+    *os << "are a pair where the first isn't half of the second";
+  }
+};
+
+PolymorphicMatcher<IsHalfOfMatcher> IsHalfOf() {
+  return MakePolymorphicMatcher(IsHalfOfMatcher());
+}
+
+TEST(PointwiseTest, DescribesSelf) {
+  vector<int> rhs;
+  rhs.push_back(1);
+  rhs.push_back(2);
+  rhs.push_back(3);
+  const Matcher<const vector<int>&> m = Pointwise(IsHalfOf(), rhs);
+  EXPECT_EQ(
+      "contains 3 values, where each value and its corresponding value "
+      "in { 1, 2, 3 } are a pair where the first is half of the second",
+      Describe(m));
+  EXPECT_EQ(
+      "doesn't contain exactly 3 values, or contains a value x at some "
+      "index i where x and the i-th value of { 1, 2, 3 } are a pair "
+      "where the first isn't half of the second",
+      DescribeNegation(m));
+}
+
+TEST(PointwiseTest, MakesCopyOfRhs) {
+  list<signed char> rhs;
+  rhs.push_back(2);
+  rhs.push_back(4);
+
+  int lhs[] = {1, 2};
+  const Matcher<const int (&)[2]> m = Pointwise(IsHalfOf(), rhs);
+  EXPECT_THAT(lhs, m);
+
+  // Changing rhs now shouldn't affect m, which made a copy of rhs.
+  rhs.push_back(6);
+  EXPECT_THAT(lhs, m);
+}
+
+TEST(PointwiseTest, WorksForLhsNativeArray) {
+  const int lhs[] = {1, 2, 3};
+  vector<int> rhs;
+  rhs.push_back(2);
+  rhs.push_back(4);
+  rhs.push_back(6);
+  EXPECT_THAT(lhs, Pointwise(Lt(), rhs));
+  EXPECT_THAT(lhs, Not(Pointwise(Gt(), rhs)));
+}
+
+TEST(PointwiseTest, WorksForRhsNativeArray) {
+  const int rhs[] = {1, 2, 3};
+  vector<int> lhs;
+  lhs.push_back(2);
+  lhs.push_back(4);
+  lhs.push_back(6);
+  EXPECT_THAT(lhs, Pointwise(Gt(), rhs));
+  EXPECT_THAT(lhs, Not(Pointwise(Lt(), rhs)));
+}
+
+// Test is effective only with sanitizers.
+TEST(PointwiseTest, WorksForVectorOfBool) {
+  vector<bool> rhs(3, false);
+  rhs[1] = true;
+  vector<bool> lhs = rhs;
+  EXPECT_THAT(lhs, Pointwise(Eq(), rhs));
+  rhs[0] = true;
+  EXPECT_THAT(lhs, Not(Pointwise(Eq(), rhs)));
+}
+
+TEST(PointwiseTest, WorksForRhsInitializerList) {
+  const vector<int> lhs{2, 4, 6};
+  EXPECT_THAT(lhs, Pointwise(Gt(), {1, 2, 3}));
+  EXPECT_THAT(lhs, Not(Pointwise(Lt(), {3, 3, 7})));
+}
+
+TEST(PointwiseTest, RejectsWrongSize) {
+  const double lhs[2] = {1, 2};
+  const int rhs[1] = {0};
+  EXPECT_THAT(lhs, Not(Pointwise(Gt(), rhs)));
+  EXPECT_EQ("which contains 2 values", Explain(Pointwise(Gt(), rhs), lhs));
+
+  const int rhs2[3] = {0, 1, 2};
+  EXPECT_THAT(lhs, Not(Pointwise(Gt(), rhs2)));
+}
+
+TEST(PointwiseTest, RejectsWrongContent) {
+  const double lhs[3] = {1, 2, 3};
+  const int rhs[3] = {2, 6, 4};
+  EXPECT_THAT(lhs, Not(Pointwise(IsHalfOf(), rhs)));
+  EXPECT_EQ(
+      "where the value pair (2, 6) at index #1 don't match, "
+      "where the second/2 is 3",
+      Explain(Pointwise(IsHalfOf(), rhs), lhs));
+}
+
+TEST(PointwiseTest, AcceptsCorrectContent) {
+  const double lhs[3] = {1, 2, 3};
+  const int rhs[3] = {2, 4, 6};
+  EXPECT_THAT(lhs, Pointwise(IsHalfOf(), rhs));
+  EXPECT_EQ("", Explain(Pointwise(IsHalfOf(), rhs), lhs));
+}
+
+TEST(PointwiseTest, AllowsMonomorphicInnerMatcher) {
+  const double lhs[3] = {1, 2, 3};
+  const int rhs[3] = {2, 4, 6};
+  const Matcher<std::tuple<const double&, const int&>> m1 = IsHalfOf();
+  EXPECT_THAT(lhs, Pointwise(m1, rhs));
+  EXPECT_EQ("", Explain(Pointwise(m1, rhs), lhs));
+
+  // This type works as a std::tuple<const double&, const int&> can be
+  // implicitly cast to std::tuple<double, int>.
+  const Matcher<std::tuple<double, int>> m2 = IsHalfOf();
+  EXPECT_THAT(lhs, Pointwise(m2, rhs));
+  EXPECT_EQ("", Explain(Pointwise(m2, rhs), lhs));
+}
+
+MATCHER(PointeeEquals, "Points to an equal value") {
+  return ExplainMatchResult(::testing::Pointee(::testing::get<1>(arg)),
+                            ::testing::get<0>(arg), result_listener);
+}
+
+TEST(PointwiseTest, WorksWithMoveOnly) {
+  ContainerHelper helper;
+  EXPECT_CALL(helper, Call(Pointwise(PointeeEquals(), std::vector<int>{1, 2})));
+  helper.Call(MakeUniquePtrs({1, 2}));
+}
+
+TEST(UnorderedPointwiseTest, DescribesSelf) {
+  vector<int> rhs;
+  rhs.push_back(1);
+  rhs.push_back(2);
+  rhs.push_back(3);
+  const Matcher<const vector<int>&> m = UnorderedPointwise(IsHalfOf(), rhs);
+  EXPECT_EQ(
+      "has 3 elements and there exists some permutation of elements such "
+      "that:\n"
+      " - element #0 and 1 are a pair where the first is half of the second, "
+      "and\n"
+      " - element #1 and 2 are a pair where the first is half of the second, "
+      "and\n"
+      " - element #2 and 3 are a pair where the first is half of the second",
+      Describe(m));
+  EXPECT_EQ(
+      "doesn't have 3 elements, or there exists no permutation of elements "
+      "such that:\n"
+      " - element #0 and 1 are a pair where the first is half of the second, "
+      "and\n"
+      " - element #1 and 2 are a pair where the first is half of the second, "
+      "and\n"
+      " - element #2 and 3 are a pair where the first is half of the second",
+      DescribeNegation(m));
+}
+
+TEST(UnorderedPointwiseTest, MakesCopyOfRhs) {
+  list<signed char> rhs;
+  rhs.push_back(2);
+  rhs.push_back(4);
+
+  int lhs[] = {2, 1};
+  const Matcher<const int (&)[2]> m = UnorderedPointwise(IsHalfOf(), rhs);
+  EXPECT_THAT(lhs, m);
+
+  // Changing rhs now shouldn't affect m, which made a copy of rhs.
+  rhs.push_back(6);
+  EXPECT_THAT(lhs, m);
+}
+
+TEST(UnorderedPointwiseTest, WorksForLhsNativeArray) {
+  const int lhs[] = {1, 2, 3};
+  vector<int> rhs;
+  rhs.push_back(4);
+  rhs.push_back(6);
+  rhs.push_back(2);
+  EXPECT_THAT(lhs, UnorderedPointwise(Lt(), rhs));
+  EXPECT_THAT(lhs, Not(UnorderedPointwise(Gt(), rhs)));
+}
+
+TEST(UnorderedPointwiseTest, WorksForRhsNativeArray) {
+  const int rhs[] = {1, 2, 3};
+  vector<int> lhs;
+  lhs.push_back(4);
+  lhs.push_back(2);
+  lhs.push_back(6);
+  EXPECT_THAT(lhs, UnorderedPointwise(Gt(), rhs));
+  EXPECT_THAT(lhs, Not(UnorderedPointwise(Lt(), rhs)));
+}
+
+TEST(UnorderedPointwiseTest, WorksForRhsInitializerList) {
+  const vector<int> lhs{2, 4, 6};
+  EXPECT_THAT(lhs, UnorderedPointwise(Gt(), {5, 1, 3}));
+  EXPECT_THAT(lhs, Not(UnorderedPointwise(Lt(), {1, 1, 7})));
+}
+
+TEST(UnorderedPointwiseTest, RejectsWrongSize) {
+  const double lhs[2] = {1, 2};
+  const int rhs[1] = {0};
+  EXPECT_THAT(lhs, Not(UnorderedPointwise(Gt(), rhs)));
+  EXPECT_EQ("which has 2 elements\n",
+            Explain(UnorderedPointwise(Gt(), rhs), lhs));
+
+  const int rhs2[3] = {0, 1, 2};
+  EXPECT_THAT(lhs, Not(UnorderedPointwise(Gt(), rhs2)));
+}
+
+TEST(UnorderedPointwiseTest, RejectsWrongContent) {
+  const double lhs[3] = {1, 2, 3};
+  const int rhs[3] = {2, 6, 6};
+  EXPECT_THAT(lhs, Not(UnorderedPointwise(IsHalfOf(), rhs)));
+  EXPECT_EQ(
+      "where the following elements don't match any matchers:\n"
+      "element #1: 2",
+      Explain(UnorderedPointwise(IsHalfOf(), rhs), lhs));
+}
+
+TEST(UnorderedPointwiseTest, AcceptsCorrectContentInSameOrder) {
+  const double lhs[3] = {1, 2, 3};
+  const int rhs[3] = {2, 4, 6};
+  EXPECT_THAT(lhs, UnorderedPointwise(IsHalfOf(), rhs));
+}
+
+TEST(UnorderedPointwiseTest, AcceptsCorrectContentInDifferentOrder) {
+  const double lhs[3] = {1, 2, 3};
+  const int rhs[3] = {6, 4, 2};
+  EXPECT_THAT(lhs, UnorderedPointwise(IsHalfOf(), rhs));
+}
+
+TEST(UnorderedPointwiseTest, AllowsMonomorphicInnerMatcher) {
+  const double lhs[3] = {1, 2, 3};
+  const int rhs[3] = {4, 6, 2};
+  const Matcher<std::tuple<const double&, const int&>> m1 = IsHalfOf();
+  EXPECT_THAT(lhs, UnorderedPointwise(m1, rhs));
+
+  // This type works as a std::tuple<const double&, const int&> can be
+  // implicitly cast to std::tuple<double, int>.
+  const Matcher<std::tuple<double, int>> m2 = IsHalfOf();
+  EXPECT_THAT(lhs, UnorderedPointwise(m2, rhs));
+}
+
+TEST(UnorderedPointwiseTest, WorksWithMoveOnly) {
+  ContainerHelper helper;
+  EXPECT_CALL(helper, Call(UnorderedPointwise(PointeeEquals(),
+                                              std::vector<int>{1, 2})));
+  helper.Call(MakeUniquePtrs({2, 1}));
+}
+
+TEST(PointeeTest, WorksOnMoveOnlyType) {
+  std::unique_ptr<int> p(new int(3));
+  EXPECT_THAT(p, Pointee(Eq(3)));
+  EXPECT_THAT(p, Not(Pointee(Eq(2))));
+}
+
+class PredicateFormatterFromMatcherTest : public ::testing::Test {
+ protected:
+  enum Behavior { kInitialSuccess, kAlwaysFail, kFlaky };
+
+  // A matcher that can return different results when used multiple times on the
+  // same input. No real matcher should do this; but this lets us test that we
+  // detect such behavior and fail appropriately.
+  class MockMatcher : public MatcherInterface<Behavior> {
+   public:
+    bool MatchAndExplain(Behavior behavior,
+                         MatchResultListener* listener) const override {
+      *listener << "[MatchAndExplain]";
+      switch (behavior) {
+        case kInitialSuccess:
+          // The first call to MatchAndExplain should use a "not interested"
+          // listener; so this is expected to return |true|. There should be no
+          // subsequent calls.
+          return !listener->IsInterested();
+
+        case kAlwaysFail:
+          return false;
+
+        case kFlaky:
+          // The first call to MatchAndExplain should use a "not interested"
+          // listener; so this will return |false|. Subsequent calls should have
+          // an "interested" listener; so this will return |true|, thus
+          // simulating a flaky matcher.
+          return listener->IsInterested();
+      }
+
+      GTEST_LOG_(FATAL) << "This should never be reached";
+      return false;
+    }
+
+    void DescribeTo(ostream* os) const override { *os << "[DescribeTo]"; }
+
+    void DescribeNegationTo(ostream* os) const override {
+      *os << "[DescribeNegationTo]";
+    }
+  };
+
+  AssertionResult RunPredicateFormatter(Behavior behavior) {
+    auto matcher = MakeMatcher(new MockMatcher);
+    PredicateFormatterFromMatcher<Matcher<Behavior>> predicate_formatter(
+        matcher);
+    return predicate_formatter("dummy-name", behavior);
+  }
+};
+
+TEST_F(PredicateFormatterFromMatcherTest, ShortCircuitOnSuccess) {
+  AssertionResult result = RunPredicateFormatter(kInitialSuccess);
+  EXPECT_TRUE(result);  // Implicit cast to bool.
+  std::string expect;
+  EXPECT_EQ(expect, result.message());
+}
+
+TEST_F(PredicateFormatterFromMatcherTest, NoShortCircuitOnFailure) {
+  AssertionResult result = RunPredicateFormatter(kAlwaysFail);
+  EXPECT_FALSE(result);  // Implicit cast to bool.
+  std::string expect =
+      "Value of: dummy-name\nExpected: [DescribeTo]\n"
+      "  Actual: 1" +
+      OfType(internal::GetTypeName<Behavior>()) + ", [MatchAndExplain]";
+  EXPECT_EQ(expect, result.message());
+}
+
+TEST_F(PredicateFormatterFromMatcherTest, DetectsFlakyShortCircuit) {
+  AssertionResult result = RunPredicateFormatter(kFlaky);
+  EXPECT_FALSE(result);  // Implicit cast to bool.
+  std::string expect =
+      "Value of: dummy-name\nExpected: [DescribeTo]\n"
+      "  The matcher failed on the initial attempt; but passed when rerun to "
+      "generate the explanation.\n"
+      "  Actual: 2" +
+      OfType(internal::GetTypeName<Behavior>()) + ", [MatchAndExplain]";
+  EXPECT_EQ(expect, result.message());
+}
+
+// Tests for ElementsAre().
+
+TEST(ElementsAreTest, CanDescribeExpectingNoElement) {
+  Matcher<const vector<int>&> m = ElementsAre();
+  EXPECT_EQ("is empty", Describe(m));
+}
+
+TEST(ElementsAreTest, CanDescribeExpectingOneElement) {
+  Matcher<vector<int>> m = ElementsAre(Gt(5));
+  EXPECT_EQ("has 1 element that is > 5", Describe(m));
+}
+
+TEST(ElementsAreTest, CanDescribeExpectingManyElements) {
+  Matcher<list<std::string>> m = ElementsAre(StrEq("one"), "two");
+  EXPECT_EQ(
+      "has 2 elements where\n"
+      "element #0 is equal to \"one\",\n"
+      "element #1 is equal to \"two\"",
+      Describe(m));
+}
+
+TEST(ElementsAreTest, CanDescribeNegationOfExpectingNoElement) {
+  Matcher<vector<int>> m = ElementsAre();
+  EXPECT_EQ("isn't empty", DescribeNegation(m));
+}
+
+TEST(ElementsAreTest, CanDescribeNegationOfExpectingOneElement) {
+  Matcher<const list<int>&> m = ElementsAre(Gt(5));
+  EXPECT_EQ(
+      "doesn't have 1 element, or\n"
+      "element #0 isn't > 5",
+      DescribeNegation(m));
+}
+
+TEST(ElementsAreTest, CanDescribeNegationOfExpectingManyElements) {
+  Matcher<const list<std::string>&> m = ElementsAre("one", "two");
+  EXPECT_EQ(
+      "doesn't have 2 elements, or\n"
+      "element #0 isn't equal to \"one\", or\n"
+      "element #1 isn't equal to \"two\"",
+      DescribeNegation(m));
+}
+
+TEST(ElementsAreTest, DoesNotExplainTrivialMatch) {
+  Matcher<const list<int>&> m = ElementsAre(1, Ne(2));
+
+  list<int> test_list;
+  test_list.push_back(1);
+  test_list.push_back(3);
+  EXPECT_EQ("", Explain(m, test_list));  // No need to explain anything.
+}
+
+TEST_P(ElementsAreTestP, ExplainsNonTrivialMatch) {
+  Matcher<const vector<int>&> m =
+      ElementsAre(GreaterThan(1), 0, GreaterThan(2));
+
+  const int a[] = {10, 0, 100};
+  vector<int> test_vector(std::begin(a), std::end(a));
+  EXPECT_EQ(
+      "whose element #0 matches, which is 9 more than 1,\n"
+      "and whose element #2 matches, which is 98 more than 2",
+      Explain(m, test_vector));
+}
+
+TEST(ElementsAreTest, CanExplainMismatchWrongSize) {
+  Matcher<const list<int>&> m = ElementsAre(1, 3);
+
+  list<int> test_list;
+  // No need to explain when the container is empty.
+  EXPECT_EQ("", Explain(m, test_list));
+
+  test_list.push_back(1);
+  EXPECT_EQ("which has 1 element", Explain(m, test_list));
+}
+
+TEST_P(ElementsAreTestP, CanExplainMismatchRightSize) {
+  Matcher<const vector<int>&> m = ElementsAre(1, GreaterThan(5));
+
+  vector<int> v;
+  v.push_back(2);
+  v.push_back(1);
+  EXPECT_EQ(Explain(m, v), "whose element #0 (2) isn't equal to 1");
+
+  v[0] = 1;
+  EXPECT_EQ(Explain(m, v),
+            "whose element #1 (1) is <= 5, which is 4 less than 5");
+}
+
+TEST(ElementsAreTest, MatchesOneElementVector) {
+  vector<std::string> test_vector;
+  test_vector.push_back("test string");
+
+  EXPECT_THAT(test_vector, ElementsAre(StrEq("test string")));
+}
+
+TEST(ElementsAreTest, MatchesOneElementList) {
+  list<std::string> test_list;
+  test_list.push_back("test string");
+
+  EXPECT_THAT(test_list, ElementsAre("test string"));
+}
+
+TEST(ElementsAreTest, MatchesThreeElementVector) {
+  vector<std::string> test_vector;
+  test_vector.push_back("one");
+  test_vector.push_back("two");
+  test_vector.push_back("three");
+
+  EXPECT_THAT(test_vector, ElementsAre("one", StrEq("two"), _));
+}
+
+TEST(ElementsAreTest, MatchesOneElementEqMatcher) {
+  vector<int> test_vector;
+  test_vector.push_back(4);
+
+  EXPECT_THAT(test_vector, ElementsAre(Eq(4)));
+}
+
+TEST(ElementsAreTest, MatchesOneElementAnyMatcher) {
+  vector<int> test_vector;
+  test_vector.push_back(4);
+
+  EXPECT_THAT(test_vector, ElementsAre(_));
+}
+
+TEST(ElementsAreTest, MatchesOneElementValue) {
+  vector<int> test_vector;
+  test_vector.push_back(4);
+
+  EXPECT_THAT(test_vector, ElementsAre(4));
+}
+
+TEST(ElementsAreTest, MatchesThreeElementsMixedMatchers) {
+  vector<int> test_vector;
+  test_vector.push_back(1);
+  test_vector.push_back(2);
+  test_vector.push_back(3);
+
+  EXPECT_THAT(test_vector, ElementsAre(1, Eq(2), _));
+}
+
+TEST(ElementsAreTest, MatchesTenElementVector) {
+  const int a[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
+  vector<int> test_vector(std::begin(a), std::end(a));
+
+  EXPECT_THAT(test_vector,
+              // The element list can contain values and/or matchers
+              // of different types.
+              ElementsAre(0, Ge(0), _, 3, 4, Ne(2), Eq(6), 7, 8, _));
+}
+
+TEST(ElementsAreTest, DoesNotMatchWrongSize) {
+  vector<std::string> test_vector;
+  test_vector.push_back("test string");
+  test_vector.push_back("test string");
+
+  Matcher<vector<std::string>> m = ElementsAre(StrEq("test string"));
+  EXPECT_FALSE(m.Matches(test_vector));
+}
+
+TEST(ElementsAreTest, DoesNotMatchWrongValue) {
+  vector<std::string> test_vector;
+  test_vector.push_back("other string");
+
+  Matcher<vector<std::string>> m = ElementsAre(StrEq("test string"));
+  EXPECT_FALSE(m.Matches(test_vector));
+}
+
+TEST(ElementsAreTest, DoesNotMatchWrongOrder) {
+  vector<std::string> test_vector;
+  test_vector.push_back("one");
+  test_vector.push_back("three");
+  test_vector.push_back("two");
+
+  Matcher<vector<std::string>> m =
+      ElementsAre(StrEq("one"), StrEq("two"), StrEq("three"));
+  EXPECT_FALSE(m.Matches(test_vector));
+}
+
+TEST(ElementsAreTest, WorksForNestedContainer) {
+  constexpr std::array<const char*, 2> strings = {{"Hi", "world"}};
+
+  vector<list<char>> nested;
+  for (const auto& s : strings) {
+    nested.emplace_back(s, s + strlen(s));
+  }
+
+  EXPECT_THAT(nested, ElementsAre(ElementsAre('H', Ne('e')),
+                                  ElementsAre('w', 'o', _, _, 'd')));
+  EXPECT_THAT(nested, Not(ElementsAre(ElementsAre('H', 'e'),
+                                      ElementsAre('w', 'o', _, _, 'd'))));
+}
+
+TEST(ElementsAreTest, WorksWithByRefElementMatchers) {
+  int a[] = {0, 1, 2};
+  vector<int> v(std::begin(a), std::end(a));
+
+  EXPECT_THAT(v, ElementsAre(Ref(v[0]), Ref(v[1]), Ref(v[2])));
+  EXPECT_THAT(v, Not(ElementsAre(Ref(v[0]), Ref(v[1]), Ref(a[2]))));
+}
+
+TEST(ElementsAreTest, WorksWithContainerPointerUsingPointee) {
+  int a[] = {0, 1, 2};
+  vector<int> v(std::begin(a), std::end(a));
+
+  EXPECT_THAT(&v, Pointee(ElementsAre(0, 1, _)));
+  EXPECT_THAT(&v, Not(Pointee(ElementsAre(0, _, 3))));
+}
+
+TEST(ElementsAreTest, WorksWithNativeArrayPassedByReference) {
+  int array[] = {0, 1, 2};
+  EXPECT_THAT(array, ElementsAre(0, 1, _));
+  EXPECT_THAT(array, Not(ElementsAre(1, _, _)));
+  EXPECT_THAT(array, Not(ElementsAre(0, _)));
+}
+
+class NativeArrayPassedAsPointerAndSize {
+ public:
+  NativeArrayPassedAsPointerAndSize() = default;
+
+  MOCK_METHOD(void, Helper, (int* array, int size));
+
+ private:
+  NativeArrayPassedAsPointerAndSize(const NativeArrayPassedAsPointerAndSize&) =
+      delete;
+  NativeArrayPassedAsPointerAndSize& operator=(
+      const NativeArrayPassedAsPointerAndSize&) = delete;
+};
+
+TEST(ElementsAreTest, WorksWithNativeArrayPassedAsPointerAndSize) {
+  int array[] = {0, 1};
+  ::std::tuple<int*, size_t> array_as_tuple(array, 2);
+  EXPECT_THAT(array_as_tuple, ElementsAre(0, 1));
+  EXPECT_THAT(array_as_tuple, Not(ElementsAre(0)));
+
+  NativeArrayPassedAsPointerAndSize helper;
+  EXPECT_CALL(helper, Helper(_, _)).With(ElementsAre(0, 1));
+  helper.Helper(array, 2);
+}
+
+TEST(ElementsAreTest, WorksWithTwoDimensionalNativeArray) {
+  const char a2[][3] = {"hi", "lo"};
+  EXPECT_THAT(a2, ElementsAre(ElementsAre('h', 'i', '\0'),
+                              ElementsAre('l', 'o', '\0')));
+  EXPECT_THAT(a2, ElementsAre(StrEq("hi"), StrEq("lo")));
+  EXPECT_THAT(a2, ElementsAre(Not(ElementsAre('h', 'o', '\0')),
+                              ElementsAre('l', 'o', '\0')));
+}
+
+TEST(ElementsAreTest, AcceptsStringLiteral) {
+  std::string array[] = {"hi", "one", "two"};
+  EXPECT_THAT(array, ElementsAre("hi", "one", "two"));
+  EXPECT_THAT(array, Not(ElementsAre("hi", "one", "too")));
+}
+
+// Declared here with the size unknown.  Defined AFTER the following test.
+extern const char kHi[];
+
+TEST(ElementsAreTest, AcceptsArrayWithUnknownSize) {
+  // The size of kHi is not known in this test, but ElementsAre() should
+  // still accept it.
+
+  std::string array1[] = {"hi"};
+  EXPECT_THAT(array1, ElementsAre(kHi));
+
+  std::string array2[] = {"ho"};
+  EXPECT_THAT(array2, Not(ElementsAre(kHi)));
+}
+
+const char kHi[] = "hi";
+
+TEST(ElementsAreTest, MakesCopyOfArguments) {
+  int x = 1;
+  int y = 2;
+  // This should make a copy of x and y.
+  ::testing::internal::ElementsAreMatcher<std::tuple<int, int>>
+      polymorphic_matcher = ElementsAre(x, y);
+  // Changing x and y now shouldn't affect the meaning of the above matcher.
+  x = y = 0;
+  const int array1[] = {1, 2};
+  EXPECT_THAT(array1, polymorphic_matcher);
+  const int array2[] = {0, 0};
+  EXPECT_THAT(array2, Not(polymorphic_matcher));
+}
+
+// Tests for ElementsAreArray().  Since ElementsAreArray() shares most
+// of the implementation with ElementsAre(), we don't test it as
+// thoroughly here.
+
+TEST(ElementsAreArrayTest, CanBeCreatedWithValueArray) {
+  const int a[] = {1, 2, 3};
+
+  vector<int> test_vector(std::begin(a), std::end(a));
+  EXPECT_THAT(test_vector, ElementsAreArray(a));
+
+  test_vector[2] = 0;
+  EXPECT_THAT(test_vector, Not(ElementsAreArray(a)));
+}
+
+TEST(ElementsAreArrayTest, CanBeCreatedWithArraySize) {
+  std::array<const char*, 3> a = {{"one", "two", "three"}};
+
+  vector<std::string> test_vector(std::begin(a), std::end(a));
+  EXPECT_THAT(test_vector, ElementsAreArray(a.data(), a.size()));
+
+  const char** p = a.data();
+  test_vector[0] = "1";
+  EXPECT_THAT(test_vector, Not(ElementsAreArray(p, a.size())));
+}
+
+TEST(ElementsAreArrayTest, CanBeCreatedWithoutArraySize) {
+  const char* a[] = {"one", "two", "three"};
+
+  vector<std::string> test_vector(std::begin(a), std::end(a));
+  EXPECT_THAT(test_vector, ElementsAreArray(a));
+
+  test_vector[0] = "1";
+  EXPECT_THAT(test_vector, Not(ElementsAreArray(a)));
+}
+
+TEST(ElementsAreArrayTest, CanBeCreatedWithMatcherArray) {
+  const Matcher<std::string> kMatcherArray[] = {StrEq("one"), StrEq("two"),
+                                                StrEq("three")};
+
+  vector<std::string> test_vector;
+  test_vector.push_back("one");
+  test_vector.push_back("two");
+  test_vector.push_back("three");
+  EXPECT_THAT(test_vector, ElementsAreArray(kMatcherArray));
+
+  test_vector.push_back("three");
+  EXPECT_THAT(test_vector, Not(ElementsAreArray(kMatcherArray)));
+}
+
+TEST(ElementsAreArrayTest, CanBeCreatedWithVector) {
+  const int a[] = {1, 2, 3};
+  vector<int> test_vector(std::begin(a), std::end(a));
+  const vector<int> expected(std::begin(a), std::end(a));
+  EXPECT_THAT(test_vector, ElementsAreArray(expected));
+  test_vector.push_back(4);
+  EXPECT_THAT(test_vector, Not(ElementsAreArray(expected)));
+}
+
+TEST(ElementsAreArrayTest, TakesInitializerList) {
+  const int a[5] = {1, 2, 3, 4, 5};
+  EXPECT_THAT(a, ElementsAreArray({1, 2, 3, 4, 5}));
+  EXPECT_THAT(a, Not(ElementsAreArray({1, 2, 3, 5, 4})));
+  EXPECT_THAT(a, Not(ElementsAreArray({1, 2, 3, 4, 6})));
+}
+
+TEST(ElementsAreArrayTest, TakesInitializerListOfCStrings) {
+  const std::string a[5] = {"a", "b", "c", "d", "e"};
+  EXPECT_THAT(a, ElementsAreArray({"a", "b", "c", "d", "e"}));
+  EXPECT_THAT(a, Not(ElementsAreArray({"a", "b", "c", "e", "d"})));
+  EXPECT_THAT(a, Not(ElementsAreArray({"a", "b", "c", "d", "ef"})));
+}
+
+TEST(ElementsAreArrayTest, TakesInitializerListOfSameTypedMatchers) {
+  const int a[5] = {1, 2, 3, 4, 5};
+  EXPECT_THAT(a, ElementsAreArray({Eq(1), Eq(2), Eq(3), Eq(4), Eq(5)}));
+  EXPECT_THAT(a, Not(ElementsAreArray({Eq(1), Eq(2), Eq(3), Eq(4), Eq(6)})));
+}
+
+TEST(ElementsAreArrayTest, TakesInitializerListOfDifferentTypedMatchers) {
+  const int a[5] = {1, 2, 3, 4, 5};
+  // The compiler cannot infer the type of the initializer list if its
+  // elements have different types.  We must explicitly specify the
+  // unified element type in this case.
+  EXPECT_THAT(
+      a, ElementsAreArray<Matcher<int>>({Eq(1), Ne(-2), Ge(3), Le(4), Eq(5)}));
+  EXPECT_THAT(a, Not(ElementsAreArray<Matcher<int>>(
+                     {Eq(1), Ne(-2), Ge(3), Le(4), Eq(6)})));
+}
+
+TEST(ElementsAreArrayTest, CanBeCreatedWithMatcherVector) {
+  const int a[] = {1, 2, 3};
+  const Matcher<int> kMatchers[] = {Eq(1), Eq(2), Eq(3)};
+  vector<int> test_vector(std::begin(a), std::end(a));
+  const vector<Matcher<int>> expected(std::begin(kMatchers),
+                                      std::end(kMatchers));
+  EXPECT_THAT(test_vector, ElementsAreArray(expected));
+  test_vector.push_back(4);
+  EXPECT_THAT(test_vector, Not(ElementsAreArray(expected)));
+}
+
+TEST(ElementsAreArrayTest, CanBeCreatedWithIteratorRange) {
+  const int a[] = {1, 2, 3};
+  const vector<int> test_vector(std::begin(a), std::end(a));
+  const vector<int> expected(std::begin(a), std::end(a));
+  EXPECT_THAT(test_vector, ElementsAreArray(expected.begin(), expected.end()));
+  // Pointers are iterators, too.
+  EXPECT_THAT(test_vector, ElementsAreArray(std::begin(a), std::end(a)));
+  // The empty range of NULL pointers should also be okay.
+  int* const null_int = nullptr;
+  EXPECT_THAT(test_vector, Not(ElementsAreArray(null_int, null_int)));
+  EXPECT_THAT((vector<int>()), ElementsAreArray(null_int, null_int));
+}
+
+// Since ElementsAre() and ElementsAreArray() share much of the
+// implementation, we only do a test for native arrays here.
+TEST(ElementsAreArrayTest, WorksWithNativeArray) {
+  ::std::string a[] = {"hi", "ho"};
+  ::std::string b[] = {"hi", "ho"};
+
+  EXPECT_THAT(a, ElementsAreArray(b));
+  EXPECT_THAT(a, ElementsAreArray(b, 2));
+  EXPECT_THAT(a, Not(ElementsAreArray(b, 1)));
+}
+
+TEST(ElementsAreArrayTest, SourceLifeSpan) {
+  const int a[] = {1, 2, 3};
+  vector<int> test_vector(std::begin(a), std::end(a));
+  vector<int> expect(std::begin(a), std::end(a));
+  ElementsAreArrayMatcher<int> matcher_maker =
+      ElementsAreArray(expect.begin(), expect.end());
+  EXPECT_THAT(test_vector, matcher_maker);
+  // Changing in place the values that initialized matcher_maker should not
+  // affect matcher_maker anymore. It should have made its own copy of them.
+  for (int& i : expect) {
+    i += 10;
+  }
+  EXPECT_THAT(test_vector, matcher_maker);
+  test_vector.push_back(3);
+  EXPECT_THAT(test_vector, Not(matcher_maker));
+}
+
+// Tests Contains().
+
+INSTANTIATE_GTEST_MATCHER_TEST_P(ContainsTest);
+
+TEST(ContainsTest, ListMatchesWhenElementIsInContainer) {
+  list<int> some_list;
+  some_list.push_back(3);
+  some_list.push_back(1);
+  some_list.push_back(2);
+  some_list.push_back(3);
+  EXPECT_THAT(some_list, Contains(1));
+  EXPECT_THAT(some_list, Contains(Gt(2.5)));
+  EXPECT_THAT(some_list, Contains(Eq(2.0f)));
+
+  list<std::string> another_list;
+  another_list.push_back("fee");
+  another_list.push_back("fie");
+  another_list.push_back("foe");
+  another_list.push_back("fum");
+  EXPECT_THAT(another_list, Contains(std::string("fee")));
+}
+
+TEST(ContainsTest, ListDoesNotMatchWhenElementIsNotInContainer) {
+  list<int> some_list;
+  some_list.push_back(3);
+  some_list.push_back(1);
+  EXPECT_THAT(some_list, Not(Contains(4)));
+}
+
+TEST(ContainsTest, SetMatchesWhenElementIsInContainer) {
+  set<int> some_set;
+  some_set.insert(3);
+  some_set.insert(1);
+  some_set.insert(2);
+  EXPECT_THAT(some_set, Contains(Eq(1.0)));
+  EXPECT_THAT(some_set, Contains(Eq(3.0f)));
+  EXPECT_THAT(some_set, Contains(2));
+
+  set<std::string> another_set;
+  another_set.insert("fee");
+  another_set.insert("fie");
+  another_set.insert("foe");
+  another_set.insert("fum");
+  EXPECT_THAT(another_set, Contains(Eq(std::string("fum"))));
+}
+
+TEST(ContainsTest, SetDoesNotMatchWhenElementIsNotInContainer) {
+  set<int> some_set;
+  some_set.insert(3);
+  some_set.insert(1);
+  EXPECT_THAT(some_set, Not(Contains(4)));
+
+  set<std::string> c_string_set;
+  c_string_set.insert("hello");
+  EXPECT_THAT(c_string_set, Not(Contains(std::string("goodbye"))));
+}
+
+TEST_P(ContainsTestP, ExplainsMatchResultCorrectly) {
+  const int a[2] = {1, 2};
+  Matcher<const int (&)[2]> m = Contains(2);
+  EXPECT_EQ("whose element #1 matches", Explain(m, a));
+
+  m = Contains(3);
+  EXPECT_EQ("", Explain(m, a));
+
+  m = Contains(GreaterThan(0));
+  EXPECT_EQ("whose element #0 matches, which is 1 more than 0", Explain(m, a));
+
+  m = Contains(GreaterThan(10));
+  EXPECT_EQ("", Explain(m, a));
+}
+
+TEST(ContainsTest, DescribesItselfCorrectly) {
+  Matcher<vector<int>> m = Contains(1);
+  EXPECT_EQ("contains at least one element that is equal to 1", Describe(m));
+
+  Matcher<vector<int>> m2 = Not(m);
+  EXPECT_EQ("doesn't contain any element that is equal to 1", Describe(m2));
+}
+
+TEST(ContainsTest, MapMatchesWhenElementIsInContainer) {
+  map<std::string, int> my_map;
+  const char* bar = "a string";
+  my_map[bar] = 2;
+  EXPECT_THAT(my_map, Contains(pair<const char* const, int>(bar, 2)));
+
+  map<std::string, int> another_map;
+  another_map["fee"] = 1;
+  another_map["fie"] = 2;
+  another_map["foe"] = 3;
+  another_map["fum"] = 4;
+  EXPECT_THAT(another_map,
+              Contains(pair<const std::string, int>(std::string("fee"), 1)));
+  EXPECT_THAT(another_map, Contains(pair<const std::string, int>("fie", 2)));
+}
+
+TEST(ContainsTest, MapDoesNotMatchWhenElementIsNotInContainer) {
+  map<int, int> some_map;
+  some_map[1] = 11;
+  some_map[2] = 22;
+  EXPECT_THAT(some_map, Not(Contains(pair<const int, int>(2, 23))));
+}
+
+TEST(ContainsTest, ArrayMatchesWhenElementIsInContainer) {
+  const char* string_array[] = {"fee", "fie", "foe", "fum"};
+  EXPECT_THAT(string_array, Contains(Eq(std::string("fum"))));
+}
+
+TEST(ContainsTest, ArrayDoesNotMatchWhenElementIsNotInContainer) {
+  int int_array[] = {1, 2, 3, 4};
+  EXPECT_THAT(int_array, Not(Contains(5)));
+}
+
+TEST(ContainsTest, AcceptsMatcher) {
+  const int a[] = {1, 2, 3};
+  EXPECT_THAT(a, Contains(Gt(2)));
+  EXPECT_THAT(a, Not(Contains(Gt(4))));
+}
+
+TEST(ContainsTest, WorksForNativeArrayAsTuple) {
+  const int a[] = {1, 2};
+  const int* const pointer = a;
+  EXPECT_THAT(std::make_tuple(pointer, 2), Contains(1));
+  EXPECT_THAT(std::make_tuple(pointer, 2), Not(Contains(Gt(3))));
+}
+
+TEST(ContainsTest, WorksForTwoDimensionalNativeArray) {
+  int a[][3] = {{1, 2, 3}, {4, 5, 6}};
+  EXPECT_THAT(a, Contains(ElementsAre(4, 5, 6)));
+  EXPECT_THAT(a, Contains(Contains(5)));
+  EXPECT_THAT(a, Not(Contains(ElementsAre(3, 4, 5))));
+  EXPECT_THAT(a, Contains(Not(Contains(5))));
+}
+
+}  // namespace
+}  // namespace gmock_matchers_test
+}  // namespace testing
+
+GTEST_DISABLE_MSC_WARNINGS_POP_()  // 4244 4100
diff --git a/external/googletest/googlemock/test/gmock-matchers-misc_test.cc b/external/googletest/googlemock/test/gmock-matchers-misc_test.cc
new file mode 100644
index 00000000..de8b76c6
--- /dev/null
+++ b/external/googletest/googlemock/test/gmock-matchers-misc_test.cc
@@ -0,0 +1,1882 @@
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Google Mock - a framework for writing C++ mock classes.
+//
+// This file tests some commonly used argument matchers.
+
+#include <array>
+#include <cstdint>
+#include <memory>
+#include <ostream>
+#include <string>
+#include <tuple>
+#include <utility>
+#include <vector>
+
+#include "gmock/gmock.h"
+#include "test/gmock-matchers_test.h"
+#include "gtest/gtest.h"
+
+// Silence warning C4244: 'initializing': conversion from 'int' to 'short',
+// possible loss of data and C4100, unreferenced local parameter
+GTEST_DISABLE_MSC_WARNINGS_PUSH_(4244 4100)
+
+namespace testing {
+namespace gmock_matchers_test {
+namespace {
+
+TEST(AddressTest, NonConst) {
+  int n = 1;
+  const Matcher<int> m = Address(Eq(&n));
+
+  EXPECT_TRUE(m.Matches(n));
+
+  int other = 5;
+
+  EXPECT_FALSE(m.Matches(other));
+
+  int& n_ref = n;
+
+  EXPECT_TRUE(m.Matches(n_ref));
+}
+
+TEST(AddressTest, Const) {
+  const int n = 1;
+  const Matcher<int> m = Address(Eq(&n));
+
+  EXPECT_TRUE(m.Matches(n));
+
+  int other = 5;
+
+  EXPECT_FALSE(m.Matches(other));
+}
+
+TEST(AddressTest, MatcherDoesntCopy) {
+  std::unique_ptr<int> n(new int(1));
+  const Matcher<std::unique_ptr<int>> m = Address(Eq(&n));
+
+  EXPECT_TRUE(m.Matches(n));
+}
+
+TEST(AddressTest, Describe) {
+  Matcher<int> matcher = Address(_);
+  EXPECT_EQ("has address that is anything", Describe(matcher));
+  EXPECT_EQ("does not have address that is anything",
+            DescribeNegation(matcher));
+}
+
+// The following two tests verify that values without a public copy
+// ctor can be used as arguments to matchers like Eq(), Ge(), and etc
+// with the help of ByRef().
+
+class NotCopyable {
+ public:
+  explicit NotCopyable(int a_value) : value_(a_value) {}
+
+  int value() const { return value_; }
+
+  bool operator==(const NotCopyable& rhs) const {
+    return value() == rhs.value();
+  }
+
+  bool operator>=(const NotCopyable& rhs) const {
+    return value() >= rhs.value();
+  }
+
+ private:
+  int value_;
+
+  NotCopyable(const NotCopyable&) = delete;
+  NotCopyable& operator=(const NotCopyable&) = delete;
+};
+
+TEST(ByRefTest, AllowsNotCopyableConstValueInMatchers) {
+  const NotCopyable const_value1(1);
+  const Matcher<const NotCopyable&> m = Eq(ByRef(const_value1));
+
+  const NotCopyable n1(1), n2(2);
+  EXPECT_TRUE(m.Matches(n1));
+  EXPECT_FALSE(m.Matches(n2));
+}
+
+TEST(ByRefTest, AllowsNotCopyableValueInMatchers) {
+  NotCopyable value2(2);
+  const Matcher<NotCopyable&> m = Ge(ByRef(value2));
+
+  NotCopyable n1(1), n2(2);
+  EXPECT_FALSE(m.Matches(n1));
+  EXPECT_TRUE(m.Matches(n2));
+}
+
+TEST(IsEmptyTest, ImplementsIsEmpty) {
+  vector<int> container;
+  EXPECT_THAT(container, IsEmpty());
+  container.push_back(0);
+  EXPECT_THAT(container, Not(IsEmpty()));
+  container.push_back(1);
+  EXPECT_THAT(container, Not(IsEmpty()));
+}
+
+TEST(IsEmptyTest, WorksWithString) {
+  std::string text;
+  EXPECT_THAT(text, IsEmpty());
+  text = "foo";
+  EXPECT_THAT(text, Not(IsEmpty()));
+  text = std::string("\0", 1);
+  EXPECT_THAT(text, Not(IsEmpty()));
+}
+
+TEST(IsEmptyTest, CanDescribeSelf) {
+  Matcher<vector<int>> m = IsEmpty();
+  EXPECT_EQ("is empty", Describe(m));
+  EXPECT_EQ("isn't empty", DescribeNegation(m));
+}
+
+TEST(IsEmptyTest, ExplainsResult) {
+  Matcher<vector<int>> m = IsEmpty();
+  vector<int> container;
+  EXPECT_EQ("", Explain(m, container));
+  container.push_back(0);
+  EXPECT_EQ("whose size is 1", Explain(m, container));
+}
+
+TEST(IsEmptyTest, WorksWithMoveOnly) {
+  ContainerHelper helper;
+  EXPECT_CALL(helper, Call(IsEmpty()));
+  helper.Call({});
+}
+
+TEST(IsTrueTest, IsTrueIsFalse) {
+  EXPECT_THAT(true, IsTrue());
+  EXPECT_THAT(false, IsFalse());
+  EXPECT_THAT(true, Not(IsFalse()));
+  EXPECT_THAT(false, Not(IsTrue()));
+  EXPECT_THAT(0, Not(IsTrue()));
+  EXPECT_THAT(0, IsFalse());
+  EXPECT_THAT(nullptr, Not(IsTrue()));
+  EXPECT_THAT(nullptr, IsFalse());
+  EXPECT_THAT(-1, IsTrue());
+  EXPECT_THAT(-1, Not(IsFalse()));
+  EXPECT_THAT(1, IsTrue());
+  EXPECT_THAT(1, Not(IsFalse()));
+  EXPECT_THAT(2, IsTrue());
+  EXPECT_THAT(2, Not(IsFalse()));
+  int a = 42;
+  EXPECT_THAT(a, IsTrue());
+  EXPECT_THAT(a, Not(IsFalse()));
+  EXPECT_THAT(&a, IsTrue());
+  EXPECT_THAT(&a, Not(IsFalse()));
+  EXPECT_THAT(false, Not(IsTrue()));
+  EXPECT_THAT(true, Not(IsFalse()));
+  EXPECT_THAT(std::true_type(), IsTrue());
+  EXPECT_THAT(std::true_type(), Not(IsFalse()));
+  EXPECT_THAT(std::false_type(), IsFalse());
+  EXPECT_THAT(std::false_type(), Not(IsTrue()));
+  EXPECT_THAT(nullptr, Not(IsTrue()));
+  EXPECT_THAT(nullptr, IsFalse());
+  std::unique_ptr<int> null_unique;
+  std::unique_ptr<int> nonnull_unique(new int(0));
+  EXPECT_THAT(null_unique, Not(IsTrue()));
+  EXPECT_THAT(null_unique, IsFalse());
+  EXPECT_THAT(nonnull_unique, IsTrue());
+  EXPECT_THAT(nonnull_unique, Not(IsFalse()));
+}
+
+#ifdef GTEST_HAS_TYPED_TEST
+// Tests ContainerEq with different container types, and
+// different element types.
+
+template <typename T>
+class ContainerEqTest : public testing::Test {};
+
+typedef testing::Types<set<int>, vector<size_t>, multiset<size_t>, list<int>>
+    ContainerEqTestTypes;
+
+TYPED_TEST_SUITE(ContainerEqTest, ContainerEqTestTypes);
+
+// Tests that the filled container is equal to itself.
+TYPED_TEST(ContainerEqTest, EqualsSelf) {
+  static const int vals[] = {1, 1, 2, 3, 5, 8};
+  TypeParam my_set(vals, vals + 6);
+  const Matcher<TypeParam> m = ContainerEq(my_set);
+  EXPECT_TRUE(m.Matches(my_set));
+  EXPECT_EQ("", Explain(m, my_set));
+}
+
+// Tests that missing values are reported.
+TYPED_TEST(ContainerEqTest, ValueMissing) {
+  static const int vals[] = {1, 1, 2, 3, 5, 8};
+  static const int test_vals[] = {2, 1, 8, 5};
+  TypeParam my_set(vals, vals + 6);
+  TypeParam test_set(test_vals, test_vals + 4);
+  const Matcher<TypeParam> m = ContainerEq(my_set);
+  EXPECT_FALSE(m.Matches(test_set));
+  EXPECT_EQ("which doesn't have these expected elements: 3",
+            Explain(m, test_set));
+}
+
+// Tests that added values are reported.
+TYPED_TEST(ContainerEqTest, ValueAdded) {
+  static const int vals[] = {1, 1, 2, 3, 5, 8};
+  static const int test_vals[] = {1, 2, 3, 5, 8, 46};
+  TypeParam my_set(vals, vals + 6);
+  TypeParam test_set(test_vals, test_vals + 6);
+  const Matcher<const TypeParam&> m = ContainerEq(my_set);
+  EXPECT_FALSE(m.Matches(test_set));
+  EXPECT_EQ("which has these unexpected elements: 46", Explain(m, test_set));
+}
+
+// Tests that added and missing values are reported together.
+TYPED_TEST(ContainerEqTest, ValueAddedAndRemoved) {
+  static const int vals[] = {1, 1, 2, 3, 5, 8};
+  static const int test_vals[] = {1, 2, 3, 8, 46};
+  TypeParam my_set(vals, vals + 6);
+  TypeParam test_set(test_vals, test_vals + 5);
+  const Matcher<TypeParam> m = ContainerEq(my_set);
+  EXPECT_FALSE(m.Matches(test_set));
+  EXPECT_EQ(
+      "which has these unexpected elements: 46,\n"
+      "and doesn't have these expected elements: 5",
+      Explain(m, test_set));
+}
+
+// Tests duplicated value -- expect no explanation.
+TYPED_TEST(ContainerEqTest, DuplicateDifference) {
+  static const int vals[] = {1, 1, 2, 3, 5, 8};
+  static const int test_vals[] = {1, 2, 3, 5, 8};
+  TypeParam my_set(vals, vals + 6);
+  TypeParam test_set(test_vals, test_vals + 5);
+  const Matcher<const TypeParam&> m = ContainerEq(my_set);
+  // Depending on the container, match may be true or false
+  // But in any case there should be no explanation.
+  EXPECT_EQ("", Explain(m, test_set));
+}
+#endif  // GTEST_HAS_TYPED_TEST
+
+// Tests that multiple missing values are reported.
+// Using just vector here, so order is predictable.
+TEST(ContainerEqExtraTest, MultipleValuesMissing) {
+  static const int vals[] = {1, 1, 2, 3, 5, 8};
+  static const int test_vals[] = {2, 1, 5};
+  vector<int> my_set(vals, vals + 6);
+  vector<int> test_set(test_vals, test_vals + 3);
+  const Matcher<vector<int>> m = ContainerEq(my_set);
+  EXPECT_FALSE(m.Matches(test_set));
+  EXPECT_EQ("which doesn't have these expected elements: 3, 8",
+            Explain(m, test_set));
+}
+
+// Tests that added values are reported.
+// Using just vector here, so order is predictable.
+TEST(ContainerEqExtraTest, MultipleValuesAdded) {
+  static const int vals[] = {1, 1, 2, 3, 5, 8};
+  static const int test_vals[] = {1, 2, 92, 3, 5, 8, 46};
+  list<size_t> my_set(vals, vals + 6);
+  list<size_t> test_set(test_vals, test_vals + 7);
+  const Matcher<const list<size_t>&> m = ContainerEq(my_set);
+  EXPECT_FALSE(m.Matches(test_set));
+  EXPECT_EQ("which has these unexpected elements: 92, 46",
+            Explain(m, test_set));
+}
+
+// Tests that added and missing values are reported together.
+TEST(ContainerEqExtraTest, MultipleValuesAddedAndRemoved) {
+  static const int vals[] = {1, 1, 2, 3, 5, 8};
+  static const int test_vals[] = {1, 2, 3, 92, 46};
+  list<size_t> my_set(vals, vals + 6);
+  list<size_t> test_set(test_vals, test_vals + 5);
+  const Matcher<const list<size_t>> m = ContainerEq(my_set);
+  EXPECT_FALSE(m.Matches(test_set));
+  EXPECT_EQ(
+      "which has these unexpected elements: 92, 46,\n"
+      "and doesn't have these expected elements: 5, 8",
+      Explain(m, test_set));
+}
+
+// Tests to see that duplicate elements are detected,
+// but (as above) not reported in the explanation.
+TEST(ContainerEqExtraTest, MultiSetOfIntDuplicateDifference) {
+  static const int vals[] = {1, 1, 2, 3, 5, 8};
+  static const int test_vals[] = {1, 2, 3, 5, 8};
+  vector<int> my_set(vals, vals + 6);
+  vector<int> test_set(test_vals, test_vals + 5);
+  const Matcher<vector<int>> m = ContainerEq(my_set);
+  EXPECT_TRUE(m.Matches(my_set));
+  EXPECT_FALSE(m.Matches(test_set));
+  // There is nothing to report when both sets contain all the same values.
+  EXPECT_EQ("", Explain(m, test_set));
+}
+
+// Tests that ContainerEq works for non-trivial associative containers,
+// like maps.
+TEST(ContainerEqExtraTest, WorksForMaps) {
+  map<int, std::string> my_map;
+  my_map[0] = "a";
+  my_map[1] = "b";
+
+  map<int, std::string> test_map;
+  test_map[0] = "aa";
+  test_map[1] = "b";
+
+  const Matcher<const map<int, std::string>&> m = ContainerEq(my_map);
+  EXPECT_TRUE(m.Matches(my_map));
+  EXPECT_FALSE(m.Matches(test_map));
+
+  EXPECT_EQ(
+      "which has these unexpected elements: (0, \"aa\"),\n"
+      "and doesn't have these expected elements: (0, \"a\")",
+      Explain(m, test_map));
+}
+
+TEST(ContainerEqExtraTest, WorksForNativeArray) {
+  int a1[] = {1, 2, 3};
+  int a2[] = {1, 2, 3};
+  int b[] = {1, 2, 4};
+
+  EXPECT_THAT(a1, ContainerEq(a2));
+  EXPECT_THAT(a1, Not(ContainerEq(b)));
+}
+
+TEST(ContainerEqExtraTest, WorksForTwoDimensionalNativeArray) {
+  const char a1[][3] = {"hi", "lo"};
+  const char a2[][3] = {"hi", "lo"};
+  const char b[][3] = {"lo", "hi"};
+
+  // Tests using ContainerEq() in the first dimension.
+  EXPECT_THAT(a1, ContainerEq(a2));
+  EXPECT_THAT(a1, Not(ContainerEq(b)));
+
+  // Tests using ContainerEq() in the second dimension.
+  EXPECT_THAT(a1, ElementsAre(ContainerEq(a2[0]), ContainerEq(a2[1])));
+  EXPECT_THAT(a1, ElementsAre(Not(ContainerEq(b[0])), ContainerEq(a2[1])));
+}
+
+TEST(ContainerEqExtraTest, WorksForNativeArrayAsTuple) {
+  const int a1[] = {1, 2, 3};
+  const int a2[] = {1, 2, 3};
+  const int b[] = {1, 2, 3, 4};
+
+  const int* const p1 = a1;
+  EXPECT_THAT(std::make_tuple(p1, 3), ContainerEq(a2));
+  EXPECT_THAT(std::make_tuple(p1, 3), Not(ContainerEq(b)));
+
+  const int c[] = {1, 3, 2};
+  EXPECT_THAT(std::make_tuple(p1, 3), Not(ContainerEq(c)));
+}
+
+TEST(ContainerEqExtraTest, CopiesNativeArrayParameter) {
+  std::string a1[][3] = {{"hi", "hello", "ciao"}, {"bye", "see you", "ciao"}};
+
+  std::string a2[][3] = {{"hi", "hello", "ciao"}, {"bye", "see you", "ciao"}};
+
+  const Matcher<const std::string(&)[2][3]> m = ContainerEq(a2);
+  EXPECT_THAT(a1, m);
+
+  a2[0][0] = "ha";
+  EXPECT_THAT(a1, m);
+}
+
+namespace {
+
+// Used as a check on the more complex max flow method used in the
+// real testing::internal::FindMaxBipartiteMatching. This method is
+// compatible but runs in worst-case factorial time, so we only
+// use it in testing for small problem sizes.
+template <typename Graph>
+class BacktrackingMaxBPMState {
+ public:
+  // Does not take ownership of 'g'.
+  explicit BacktrackingMaxBPMState(const Graph* g) : graph_(g) {}
+
+  ElementMatcherPairs Compute() {
+    if (graph_->LhsSize() == 0 || graph_->RhsSize() == 0) {
+      return best_so_far_;
+    }
+    lhs_used_.assign(graph_->LhsSize(), kUnused);
+    rhs_used_.assign(graph_->RhsSize(), kUnused);
+    for (size_t irhs = 0; irhs < graph_->RhsSize(); ++irhs) {
+      matches_.clear();
+      RecurseInto(irhs);
+      if (best_so_far_.size() == graph_->RhsSize()) break;
+    }
+    return best_so_far_;
+  }
+
+ private:
+  static const size_t kUnused = static_cast<size_t>(-1);
+
+  void PushMatch(size_t lhs, size_t rhs) {
+    matches_.push_back(ElementMatcherPair(lhs, rhs));
+    lhs_used_[lhs] = rhs;
+    rhs_used_[rhs] = lhs;
+    if (matches_.size() > best_so_far_.size()) {
+      best_so_far_ = matches_;
+    }
+  }
+
+  void PopMatch() {
+    const ElementMatcherPair& back = matches_.back();
+    lhs_used_[back.first] = kUnused;
+    rhs_used_[back.second] = kUnused;
+    matches_.pop_back();
+  }
+
+  bool RecurseInto(size_t irhs) {
+    if (rhs_used_[irhs] != kUnused) {
+      return true;
+    }
+    for (size_t ilhs = 0; ilhs < graph_->LhsSize(); ++ilhs) {
+      if (lhs_used_[ilhs] != kUnused) {
+        continue;
+      }
+      if (!graph_->HasEdge(ilhs, irhs)) {
+        continue;
+      }
+      PushMatch(ilhs, irhs);
+      if (best_so_far_.size() == graph_->RhsSize()) {
+        return false;
+      }
+      for (size_t mi = irhs + 1; mi < graph_->RhsSize(); ++mi) {
+        if (!RecurseInto(mi)) return false;
+      }
+      PopMatch();
+    }
+    return true;
+  }
+
+  const Graph* graph_;  // not owned
+  std::vector<size_t> lhs_used_;
+  std::vector<size_t> rhs_used_;
+  ElementMatcherPairs matches_;
+  ElementMatcherPairs best_so_far_;
+};
+
+template <typename Graph>
+const size_t BacktrackingMaxBPMState<Graph>::kUnused;
+
+}  // namespace
+
+// Implement a simple backtracking algorithm to determine if it is possible
+// to find one element per matcher, without reusing elements.
+template <typename Graph>
+ElementMatcherPairs FindBacktrackingMaxBPM(const Graph& g) {
+  return BacktrackingMaxBPMState<Graph>(&g).Compute();
+}
+
+class BacktrackingBPMTest : public ::testing::Test {};
+
+// Tests the MaxBipartiteMatching algorithm with square matrices.
+// The single int param is the # of nodes on each of the left and right sides.
+class BipartiteTest : public ::testing::TestWithParam<size_t> {};
+
+// Verify all match graphs up to some moderate number of edges.
+TEST_P(BipartiteTest, Exhaustive) {
+  size_t nodes = GetParam();
+  MatchMatrix graph(nodes, nodes);
+  do {
+    ElementMatcherPairs matches = internal::FindMaxBipartiteMatching(graph);
+    EXPECT_EQ(FindBacktrackingMaxBPM(graph).size(), matches.size())
+        << "graph: " << graph.DebugString();
+    // Check that all elements of matches are in the graph.
+    // Check that elements of first and second are unique.
+    std::vector<bool> seen_element(graph.LhsSize());
+    std::vector<bool> seen_matcher(graph.RhsSize());
+    SCOPED_TRACE(PrintToString(matches));
+    for (size_t i = 0; i < matches.size(); ++i) {
+      size_t ilhs = matches[i].first;
+      size_t irhs = matches[i].second;
+      EXPECT_TRUE(graph.HasEdge(ilhs, irhs));
+      EXPECT_FALSE(seen_element[ilhs]);
+      EXPECT_FALSE(seen_matcher[irhs]);
+      seen_element[ilhs] = true;
+      seen_matcher[irhs] = true;
+    }
+  } while (graph.NextGraph());
+}
+
+INSTANTIATE_TEST_SUITE_P(AllGraphs, BipartiteTest,
+                         ::testing::Range(size_t{0}, size_t{5}));
+
+// Parameterized by a pair interpreted as (LhsSize, RhsSize).
+class BipartiteNonSquareTest
+    : public ::testing::TestWithParam<std::pair<size_t, size_t>> {};
+
+TEST_F(BipartiteNonSquareTest, SimpleBacktracking) {
+  //   .......
+  // 0:-----\ :
+  // 1:---\ | :
+  // 2:---\ | :
+  // 3:-\ | | :
+  //  :.......:
+  //    0 1 2
+  MatchMatrix g(4, 3);
+  constexpr std::array<std::array<size_t, 2>, 4> kEdges = {
+      {{{0, 2}}, {{1, 1}}, {{2, 1}}, {{3, 0}}}};
+  for (size_t i = 0; i < kEdges.size(); ++i) {
+    g.SetEdge(kEdges[i][0], kEdges[i][1], true);
+  }
+  EXPECT_THAT(FindBacktrackingMaxBPM(g),
+              ElementsAre(Pair(3, 0), Pair(AnyOf(1, 2), 1), Pair(0, 2)))
+      << g.DebugString();
+}
+
+// Verify a few nonsquare matrices.
+TEST_P(BipartiteNonSquareTest, Exhaustive) {
+  size_t nlhs = GetParam().first;
+  size_t nrhs = GetParam().second;
+  MatchMatrix graph(nlhs, nrhs);
+  do {
+    EXPECT_EQ(FindBacktrackingMaxBPM(graph).size(),
+              internal::FindMaxBipartiteMatching(graph).size())
+        << "graph: " << graph.DebugString()
+        << "\nbacktracking: " << PrintToString(FindBacktrackingMaxBPM(graph))
+        << "\nmax flow: "
+        << PrintToString(internal::FindMaxBipartiteMatching(graph));
+  } while (graph.NextGraph());
+}
+
+INSTANTIATE_TEST_SUITE_P(
+    AllGraphs, BipartiteNonSquareTest,
+    testing::Values(std::make_pair(1, 2), std::make_pair(2, 1),
+                    std::make_pair(3, 2), std::make_pair(2, 3),
+                    std::make_pair(4, 1), std::make_pair(1, 4),
+                    std::make_pair(4, 3), std::make_pair(3, 4)));
+
+class BipartiteRandomTest
+    : public ::testing::TestWithParam<std::pair<int, int>> {};
+
+// Verifies a large sample of larger graphs.
+TEST_P(BipartiteRandomTest, LargerNets) {
+  int nodes = GetParam().first;
+  int iters = GetParam().second;
+  MatchMatrix graph(static_cast<size_t>(nodes), static_cast<size_t>(nodes));
+
+  auto seed = static_cast<uint32_t>(GTEST_FLAG_GET(random_seed));
+  if (seed == 0) {
+    seed = static_cast<uint32_t>(time(nullptr));
+  }
+
+  for (; iters > 0; --iters, ++seed) {
+    srand(static_cast<unsigned int>(seed));
+    graph.Randomize();
+    EXPECT_EQ(FindBacktrackingMaxBPM(graph).size(),
+              internal::FindMaxBipartiteMatching(graph).size())
+        << " graph: " << graph.DebugString()
+        << "\nTo reproduce the failure, rerun the test with the flag"
+           " --"
+        << GTEST_FLAG_PREFIX_ << "random_seed=" << seed;
+  }
+}
+
+// Test argument is a std::pair<int, int> representing (nodes, iters).
+INSTANTIATE_TEST_SUITE_P(Samples, BipartiteRandomTest,
+                         testing::Values(std::make_pair(5, 10000),
+                                         std::make_pair(6, 5000),
+                                         std::make_pair(7, 2000),
+                                         std::make_pair(8, 500),
+                                         std::make_pair(9, 100)));
+
+// Tests IsReadableTypeName().
+
+TEST(IsReadableTypeNameTest, ReturnsTrueForShortNames) {
+  EXPECT_TRUE(IsReadableTypeName("int"));
+  EXPECT_TRUE(IsReadableTypeName("const unsigned char*"));
+  EXPECT_TRUE(IsReadableTypeName("MyMap<int, void*>"));
+  EXPECT_TRUE(IsReadableTypeName("void (*)(int, bool)"));
+}
+
+TEST(IsReadableTypeNameTest, ReturnsTrueForLongNonTemplateNonFunctionNames) {
+  EXPECT_TRUE(IsReadableTypeName("my_long_namespace::MyClassName"));
+  EXPECT_TRUE(IsReadableTypeName("int [5][6][7][8][9][10][11]"));
+  EXPECT_TRUE(IsReadableTypeName("my_namespace::MyOuterClass::MyInnerClass"));
+}
+
+TEST(IsReadableTypeNameTest, ReturnsFalseForLongTemplateNames) {
+  EXPECT_FALSE(
+      IsReadableTypeName("basic_string<char, std::char_traits<char> >"));
+  EXPECT_FALSE(IsReadableTypeName("std::vector<int, std::alloc_traits<int> >"));
+}
+
+TEST(IsReadableTypeNameTest, ReturnsFalseForLongFunctionTypeNames) {
+  EXPECT_FALSE(IsReadableTypeName("void (&)(int, bool, char, float)"));
+}
+
+// Tests FormatMatcherDescription().
+
+TEST(FormatMatcherDescriptionTest, WorksForEmptyDescription) {
+  EXPECT_EQ("is even",
+            FormatMatcherDescription(false, "IsEven", {}, Strings()));
+  EXPECT_EQ("not (is even)",
+            FormatMatcherDescription(true, "IsEven", {}, Strings()));
+
+  EXPECT_EQ("equals (a: 5)",
+            FormatMatcherDescription(false, "Equals", {"a"}, {"5"}));
+
+  EXPECT_EQ(
+      "is in range (a: 5, b: 8)",
+      FormatMatcherDescription(false, "IsInRange", {"a", "b"}, {"5", "8"}));
+}
+
+INSTANTIATE_GTEST_MATCHER_TEST_P(MatcherTupleTest);
+
+TEST_P(MatcherTupleTestP, ExplainsMatchFailure) {
+  stringstream ss1;
+  ExplainMatchFailureTupleTo(
+      std::make_tuple(Matcher<char>(Eq('a')), GreaterThan(5)),
+      std::make_tuple('a', 10), &ss1);
+  EXPECT_EQ("", ss1.str());  // Successful match.
+
+  stringstream ss2;
+  ExplainMatchFailureTupleTo(
+      std::make_tuple(GreaterThan(5), Matcher<char>(Eq('a'))),
+      std::make_tuple(2, 'b'), &ss2);
+  EXPECT_EQ(
+      "  Expected arg #0: is > 5\n"
+      "           Actual: 2, which is 3 less than 5\n"
+      "  Expected arg #1: is equal to 'a' (97, 0x61)\n"
+      "           Actual: 'b' (98, 0x62)\n",
+      ss2.str());  // Failed match where both arguments need explanation.
+
+  stringstream ss3;
+  ExplainMatchFailureTupleTo(
+      std::make_tuple(GreaterThan(5), Matcher<char>(Eq('a'))),
+      std::make_tuple(2, 'a'), &ss3);
+  EXPECT_EQ(
+      "  Expected arg #0: is > 5\n"
+      "           Actual: 2, which is 3 less than 5\n",
+      ss3.str());  // Failed match where only one argument needs
+                   // explanation.
+}
+
+#if GTEST_HAS_TYPED_TEST
+
+// Sample optional type implementation with minimal requirements for use with
+// Optional matcher.
+template <typename T>
+class SampleOptional {
+ public:
+  using value_type = T;
+  explicit SampleOptional(T value)
+      : value_(std::move(value)), has_value_(true) {}
+  SampleOptional() : value_(), has_value_(false) {}
+  operator bool() const { return has_value_; }
+  const T& operator*() const { return value_; }
+
+ private:
+  T value_;
+  bool has_value_;
+};
+
+// Sample optional type implementation with alternative minimal requirements for
+// use with Optional matcher. In particular, while it doesn't have a bool
+// conversion operator, it does have a has_value() method.
+template <typename T>
+class SampleOptionalWithoutBoolConversion {
+ public:
+  using value_type = T;
+  explicit SampleOptionalWithoutBoolConversion(T value)
+      : value_(std::move(value)), has_value_(true) {}
+  SampleOptionalWithoutBoolConversion() : value_(), has_value_(false) {}
+  bool has_value() const { return has_value_; }
+  const T& operator*() const { return value_; }
+
+ private:
+  T value_;
+  bool has_value_;
+};
+
+template <typename T>
+class OptionalTest : public testing::Test {};
+
+using OptionalTestTypes =
+    testing::Types<SampleOptional<int>,
+                   SampleOptionalWithoutBoolConversion<int>>;
+
+TYPED_TEST_SUITE(OptionalTest, OptionalTestTypes);
+
+TYPED_TEST(OptionalTest, DescribesSelf) {
+  const Matcher<TypeParam> m = Optional(Eq(1));
+  EXPECT_EQ("value is equal to 1", Describe(m));
+}
+
+TYPED_TEST(OptionalTest, ExplainsSelf) {
+  const Matcher<TypeParam> m = Optional(Eq(1));
+  EXPECT_EQ("whose value 1 matches", Explain(m, TypeParam(1)));
+  EXPECT_EQ("whose value 2 doesn't match", Explain(m, TypeParam(2)));
+}
+
+TYPED_TEST(OptionalTest, MatchesNonEmptyOptional) {
+  const Matcher<TypeParam> m1 = Optional(1);
+  const Matcher<TypeParam> m2 = Optional(Eq(2));
+  const Matcher<TypeParam> m3 = Optional(Lt(3));
+  TypeParam opt(1);
+  EXPECT_TRUE(m1.Matches(opt));
+  EXPECT_FALSE(m2.Matches(opt));
+  EXPECT_TRUE(m3.Matches(opt));
+}
+
+TYPED_TEST(OptionalTest, DoesNotMatchNullopt) {
+  const Matcher<TypeParam> m = Optional(1);
+  TypeParam empty;
+  EXPECT_FALSE(m.Matches(empty));
+}
+
+TYPED_TEST(OptionalTest, ComposesWithMonomorphicMatchersTakingReferences) {
+  const Matcher<const int&> eq1 = Eq(1);
+  const Matcher<const int&> eq2 = Eq(2);
+  TypeParam opt(1);
+  EXPECT_THAT(opt, Optional(eq1));
+  EXPECT_THAT(opt, Optional(Not(eq2)));
+  EXPECT_THAT(opt, Optional(AllOf(eq1, Not(eq2))));
+}
+
+TYPED_TEST(OptionalTest, ComposesWithMonomorphicMatchersRequiringConversion) {
+  const Matcher<int64_t> eq1 = Eq(1);
+  const Matcher<int64_t> eq2 = Eq(2);
+  TypeParam opt(1);
+  EXPECT_THAT(opt, Optional(eq1));
+  EXPECT_THAT(opt, Optional(Not(eq2)));
+  EXPECT_THAT(opt, Optional(AllOf(eq1, Not(eq2))));
+}
+
+template <typename T>
+class MoveOnlyOptionalTest : public testing::Test {};
+
+using MoveOnlyOptionalTestTypes =
+    testing::Types<SampleOptional<std::unique_ptr<int>>,
+                   SampleOptionalWithoutBoolConversion<std::unique_ptr<int>>>;
+
+TYPED_TEST_SUITE(MoveOnlyOptionalTest, MoveOnlyOptionalTestTypes);
+
+TYPED_TEST(MoveOnlyOptionalTest, WorksWithMoveOnly) {
+  Matcher<TypeParam> m = Optional(Eq(nullptr));
+  EXPECT_TRUE(m.Matches(TypeParam(nullptr)));
+}
+
+#endif  // GTEST_HAS_TYPED_TEST
+
+class SampleVariantIntString {
+ public:
+  SampleVariantIntString(int i) : i_(i), has_int_(true) {}
+  SampleVariantIntString(const std::string& s) : s_(s), has_int_(false) {}
+
+  template <typename T>
+  friend bool holds_alternative(const SampleVariantIntString& value) {
+    return value.has_int_ == std::is_same<T, int>::value;
+  }
+
+  template <typename T>
+  friend const T& get(const SampleVariantIntString& value) {
+    return value.get_impl(static_cast<T*>(nullptr));
+  }
+
+ private:
+  const int& get_impl(int*) const { return i_; }
+  const std::string& get_impl(std::string*) const { return s_; }
+
+  int i_;
+  std::string s_;
+  bool has_int_;
+};
+
+TEST(VariantTest, DescribesSelf) {
+  const Matcher<SampleVariantIntString> m = VariantWith<int>(Eq(1));
+  EXPECT_THAT(Describe(m), ContainsRegex("is a variant<> with value of type "
+                                         "'.*' and the value is equal to 1"));
+}
+
+TEST(VariantTest, ExplainsSelf) {
+  const Matcher<SampleVariantIntString> m = VariantWith<int>(Eq(1));
+  EXPECT_THAT(Explain(m, SampleVariantIntString(1)),
+              ContainsRegex("whose value 1"));
+  EXPECT_THAT(Explain(m, SampleVariantIntString("A")),
+              HasSubstr("whose value is not of type '"));
+  EXPECT_THAT(Explain(m, SampleVariantIntString(2)),
+              "whose value 2 doesn't match");
+}
+
+TEST(VariantTest, FullMatch) {
+  Matcher<SampleVariantIntString> m = VariantWith<int>(Eq(1));
+  EXPECT_TRUE(m.Matches(SampleVariantIntString(1)));
+
+  m = VariantWith<std::string>(Eq("1"));
+  EXPECT_TRUE(m.Matches(SampleVariantIntString("1")));
+}
+
+TEST(VariantTest, TypeDoesNotMatch) {
+  Matcher<SampleVariantIntString> m = VariantWith<int>(Eq(1));
+  EXPECT_FALSE(m.Matches(SampleVariantIntString("1")));
+
+  m = VariantWith<std::string>(Eq("1"));
+  EXPECT_FALSE(m.Matches(SampleVariantIntString(1)));
+}
+
+TEST(VariantTest, InnerDoesNotMatch) {
+  Matcher<SampleVariantIntString> m = VariantWith<int>(Eq(1));
+  EXPECT_FALSE(m.Matches(SampleVariantIntString(2)));
+
+  m = VariantWith<std::string>(Eq("1"));
+  EXPECT_FALSE(m.Matches(SampleVariantIntString("2")));
+}
+
+class SampleAnyType {
+ public:
+  explicit SampleAnyType(int i) : index_(0), i_(i) {}
+  explicit SampleAnyType(const std::string& s) : index_(1), s_(s) {}
+
+  template <typename T>
+  friend const T* any_cast(const SampleAnyType* any) {
+    return any->get_impl(static_cast<T*>(nullptr));
+  }
+
+ private:
+  int index_;
+  int i_;
+  std::string s_;
+
+  const int* get_impl(int*) const { return index_ == 0 ? &i_ : nullptr; }
+  const std::string* get_impl(std::string*) const {
+    return index_ == 1 ? &s_ : nullptr;
+  }
+};
+
+TEST(AnyWithTest, FullMatch) {
+  Matcher<SampleAnyType> m = AnyWith<int>(Eq(1));
+  EXPECT_TRUE(m.Matches(SampleAnyType(1)));
+}
+
+TEST(AnyWithTest, TestBadCastType) {
+  Matcher<SampleAnyType> m = AnyWith<std::string>(Eq("fail"));
+  EXPECT_FALSE(m.Matches(SampleAnyType(1)));
+}
+
+TEST(AnyWithTest, TestUseInContainers) {
+  std::vector<SampleAnyType> a;
+  a.emplace_back(1);
+  a.emplace_back(2);
+  a.emplace_back(3);
+  EXPECT_THAT(
+      a, ElementsAreArray({AnyWith<int>(1), AnyWith<int>(2), AnyWith<int>(3)}));
+
+  std::vector<SampleAnyType> b;
+  b.emplace_back("hello");
+  b.emplace_back("merhaba");
+  b.emplace_back("salut");
+  EXPECT_THAT(b, ElementsAreArray({AnyWith<std::string>("hello"),
+                                   AnyWith<std::string>("merhaba"),
+                                   AnyWith<std::string>("salut")}));
+}
+TEST(AnyWithTest, TestCompare) {
+  EXPECT_THAT(SampleAnyType(1), AnyWith<int>(Gt(0)));
+}
+
+TEST(AnyWithTest, DescribesSelf) {
+  const Matcher<const SampleAnyType&> m = AnyWith<int>(Eq(1));
+  EXPECT_THAT(Describe(m), ContainsRegex("is an 'any' type with value of type "
+                                         "'.*' and the value is equal to 1"));
+}
+
+TEST(AnyWithTest, ExplainsSelf) {
+  const Matcher<const SampleAnyType&> m = AnyWith<int>(Eq(1));
+
+  EXPECT_THAT(Explain(m, SampleAnyType(1)), ContainsRegex("whose value 1"));
+  EXPECT_THAT(Explain(m, SampleAnyType("A")),
+              HasSubstr("whose value is not of type '"));
+  EXPECT_THAT(Explain(m, SampleAnyType(2)), "whose value 2 doesn't match");
+}
+
+// Tests Args<k0, ..., kn>(m).
+
+TEST(ArgsTest, AcceptsZeroTemplateArg) {
+  const std::tuple<int, bool> t(5, true);
+  EXPECT_THAT(t, Args<>(Eq(std::tuple<>())));
+  EXPECT_THAT(t, Not(Args<>(Ne(std::tuple<>()))));
+}
+
+TEST(ArgsTest, AcceptsOneTemplateArg) {
+  const std::tuple<int, bool> t(5, true);
+  EXPECT_THAT(t, Args<0>(Eq(std::make_tuple(5))));
+  EXPECT_THAT(t, Args<1>(Eq(std::make_tuple(true))));
+  EXPECT_THAT(t, Not(Args<1>(Eq(std::make_tuple(false)))));
+}
+
+TEST(ArgsTest, AcceptsTwoTemplateArgs) {
+  const std::tuple<short, int, long> t(short{4}, 5, 6L);  // NOLINT
+
+  EXPECT_THAT(t, (Args<0, 1>(Lt())));
+  EXPECT_THAT(t, (Args<1, 2>(Lt())));
+  EXPECT_THAT(t, Not(Args<0, 2>(Gt())));
+}
+
+TEST(ArgsTest, AcceptsRepeatedTemplateArgs) {
+  const std::tuple<short, int, long> t(short{4}, 5, 6L);  // NOLINT
+  EXPECT_THAT(t, (Args<0, 0>(Eq())));
+  EXPECT_THAT(t, Not(Args<1, 1>(Ne())));
+}
+
+TEST(ArgsTest, AcceptsDecreasingTemplateArgs) {
+  const std::tuple<short, int, long> t(short{4}, 5, 6L);  // NOLINT
+  EXPECT_THAT(t, (Args<2, 0>(Gt())));
+  EXPECT_THAT(t, Not(Args<2, 1>(Lt())));
+}
+
+MATCHER(SumIsZero, "") {
+  return std::get<0>(arg) + std::get<1>(arg) + std::get<2>(arg) == 0;
+}
+
+TEST(ArgsTest, AcceptsMoreTemplateArgsThanArityOfOriginalTuple) {
+  EXPECT_THAT(std::make_tuple(-1, 2), (Args<0, 0, 1>(SumIsZero())));
+  EXPECT_THAT(std::make_tuple(1, 2), Not(Args<0, 0, 1>(SumIsZero())));
+}
+
+TEST(ArgsTest, CanBeNested) {
+  const std::tuple<short, int, long, int> t(short{4}, 5, 6L, 6);  // NOLINT
+  EXPECT_THAT(t, (Args<1, 2, 3>(Args<1, 2>(Eq()))));
+  EXPECT_THAT(t, (Args<0, 1, 3>(Args<0, 2>(Lt()))));
+}
+
+TEST(ArgsTest, CanMatchTupleByValue) {
+  typedef std::tuple<char, int, int> Tuple3;
+  const Matcher<Tuple3> m = Args<1, 2>(Lt());
+  EXPECT_TRUE(m.Matches(Tuple3('a', 1, 2)));
+  EXPECT_FALSE(m.Matches(Tuple3('b', 2, 2)));
+}
+
+TEST(ArgsTest, CanMatchTupleByReference) {
+  typedef std::tuple<char, char, int> Tuple3;
+  const Matcher<const Tuple3&> m = Args<0, 1>(Lt());
+  EXPECT_TRUE(m.Matches(Tuple3('a', 'b', 2)));
+  EXPECT_FALSE(m.Matches(Tuple3('b', 'b', 2)));
+}
+
+// Validates that arg is printed as str.
+MATCHER_P(PrintsAs, str, "") { return testing::PrintToString(arg) == str; }
+
+TEST(ArgsTest, AcceptsTenTemplateArgs) {
+  EXPECT_THAT(std::make_tuple(0, 1L, 2, 3L, 4, 5, 6, 7, 8, 9),
+              (Args<9, 8, 7, 6, 5, 4, 3, 2, 1, 0>(
+                  PrintsAs("(9, 8, 7, 6, 5, 4, 3, 2, 1, 0)"))));
+  EXPECT_THAT(std::make_tuple(0, 1L, 2, 3L, 4, 5, 6, 7, 8, 9),
+              Not(Args<9, 8, 7, 6, 5, 4, 3, 2, 1, 0>(
+                  PrintsAs("(0, 8, 7, 6, 5, 4, 3, 2, 1, 0)"))));
+}
+
+TEST(ArgsTest, DescirbesSelfCorrectly) {
+  const Matcher<std::tuple<int, bool, char>> m = Args<2, 0>(Lt());
+  EXPECT_EQ(
+      "are a tuple whose fields (#2, #0) are a pair where "
+      "the first < the second",
+      Describe(m));
+}
+
+TEST(ArgsTest, DescirbesNestedArgsCorrectly) {
+  const Matcher<const std::tuple<int, bool, char, int>&> m =
+      Args<0, 2, 3>(Args<2, 0>(Lt()));
+  EXPECT_EQ(
+      "are a tuple whose fields (#0, #2, #3) are a tuple "
+      "whose fields (#2, #0) are a pair where the first < the second",
+      Describe(m));
+}
+
+TEST(ArgsTest, DescribesNegationCorrectly) {
+  const Matcher<std::tuple<int, char>> m = Args<1, 0>(Gt());
+  EXPECT_EQ(
+      "are a tuple whose fields (#1, #0) aren't a pair "
+      "where the first > the second",
+      DescribeNegation(m));
+}
+
+TEST(ArgsTest, ExplainsMatchResultWithoutInnerExplanation) {
+  const Matcher<std::tuple<bool, int, int>> m = Args<1, 2>(Eq());
+  EXPECT_EQ("whose fields (#1, #2) are (42, 42)",
+            Explain(m, std::make_tuple(false, 42, 42)));
+  EXPECT_EQ("whose fields (#1, #2) are (42, 43)",
+            Explain(m, std::make_tuple(false, 42, 43)));
+}
+
+// For testing Args<>'s explanation.
+class LessThanMatcher : public MatcherInterface<std::tuple<char, int>> {
+ public:
+  void DescribeTo(::std::ostream* /*os*/) const override {}
+
+  bool MatchAndExplain(std::tuple<char, int> value,
+                       MatchResultListener* listener) const override {
+    const int diff = std::get<0>(value) - std::get<1>(value);
+    if (diff > 0) {
+      *listener << "where the first value is " << diff
+                << " more than the second";
+    }
+    return diff < 0;
+  }
+};
+
+Matcher<std::tuple<char, int>> LessThan() {
+  return MakeMatcher(new LessThanMatcher);
+}
+
+TEST(ArgsTest, ExplainsMatchResultWithInnerExplanation) {
+  const Matcher<std::tuple<char, int, int>> m = Args<0, 2>(LessThan());
+  EXPECT_EQ(
+      "whose fields (#0, #2) are ('a' (97, 0x61), 42), "
+      "where the first value is 55 more than the second",
+      Explain(m, std::make_tuple('a', 42, 42)));
+  EXPECT_EQ("whose fields (#0, #2) are ('\\0', 43)",
+            Explain(m, std::make_tuple('\0', 42, 43)));
+}
+
+// Tests for the MATCHER*() macro family.
+
+// Tests that a simple MATCHER() definition works.
+
+MATCHER(IsEven, "") { return (arg % 2) == 0; }
+
+TEST(MatcherMacroTest, Works) {
+  const Matcher<int> m = IsEven();
+  EXPECT_TRUE(m.Matches(6));
+  EXPECT_FALSE(m.Matches(7));
+
+  EXPECT_EQ("is even", Describe(m));
+  EXPECT_EQ("not (is even)", DescribeNegation(m));
+  EXPECT_EQ("", Explain(m, 6));
+  EXPECT_EQ("", Explain(m, 7));
+}
+
+// This also tests that the description string can reference 'negation'.
+MATCHER(IsEven2, negation ? "is odd" : "is even") {
+  if ((arg % 2) == 0) {
+    // Verifies that we can stream to result_listener, a listener
+    // supplied by the MATCHER macro implicitly.
+    *result_listener << "OK";
+    return true;
+  } else {
+    *result_listener << "% 2 == " << (arg % 2);
+    return false;
+  }
+}
+
+// This also tests that the description string can reference matcher
+// parameters.
+MATCHER_P2(EqSumOf, x, y,
+           std::string(negation ? "doesn't equal" : "equals") + " the sum of " +
+               PrintToString(x) + " and " + PrintToString(y)) {
+  if (arg == (x + y)) {
+    *result_listener << "OK";
+    return true;
+  } else {
+    // Verifies that we can stream to the underlying stream of
+    // result_listener.
+    if (result_listener->stream() != nullptr) {
+      *result_listener->stream() << "diff == " << (x + y - arg);
+    }
+    return false;
+  }
+}
+
+// Tests that the matcher description can reference 'negation' and the
+// matcher parameters.
+TEST(MatcherMacroTest, DescriptionCanReferenceNegationAndParameters) {
+  const Matcher<int> m1 = IsEven2();
+  EXPECT_EQ("is even", Describe(m1));
+  EXPECT_EQ("is odd", DescribeNegation(m1));
+
+  const Matcher<int> m2 = EqSumOf(5, 9);
+  EXPECT_EQ("equals the sum of 5 and 9", Describe(m2));
+  EXPECT_EQ("doesn't equal the sum of 5 and 9", DescribeNegation(m2));
+}
+
+// Tests explaining match result in a MATCHER* macro.
+TEST(MatcherMacroTest, CanExplainMatchResult) {
+  const Matcher<int> m1 = IsEven2();
+  EXPECT_EQ("OK", Explain(m1, 4));
+  EXPECT_EQ("% 2 == 1", Explain(m1, 5));
+
+  const Matcher<int> m2 = EqSumOf(1, 2);
+  EXPECT_EQ("OK", Explain(m2, 3));
+  EXPECT_EQ("diff == -1", Explain(m2, 4));
+}
+
+// Tests that the body of MATCHER() can reference the type of the
+// value being matched.
+
+MATCHER(IsEmptyString, "") {
+  StaticAssertTypeEq<::std::string, arg_type>();
+  return arg.empty();
+}
+
+MATCHER(IsEmptyStringByRef, "") {
+  StaticAssertTypeEq<const ::std::string&, arg_type>();
+  return arg.empty();
+}
+
+TEST(MatcherMacroTest, CanReferenceArgType) {
+  const Matcher<::std::string> m1 = IsEmptyString();
+  EXPECT_TRUE(m1.Matches(""));
+
+  const Matcher<const ::std::string&> m2 = IsEmptyStringByRef();
+  EXPECT_TRUE(m2.Matches(""));
+}
+
+// Tests that MATCHER() can be used in a namespace.
+
+namespace matcher_test {
+MATCHER(IsOdd, "") { return (arg % 2) != 0; }
+}  // namespace matcher_test
+
+TEST(MatcherMacroTest, WorksInNamespace) {
+  Matcher<int> m = matcher_test::IsOdd();
+  EXPECT_FALSE(m.Matches(4));
+  EXPECT_TRUE(m.Matches(5));
+}
+
+// Tests that Value() can be used to compose matchers.
+MATCHER(IsPositiveOdd, "") {
+  return Value(arg, matcher_test::IsOdd()) && arg > 0;
+}
+
+TEST(MatcherMacroTest, CanBeComposedUsingValue) {
+  EXPECT_THAT(3, IsPositiveOdd());
+  EXPECT_THAT(4, Not(IsPositiveOdd()));
+  EXPECT_THAT(-1, Not(IsPositiveOdd()));
+}
+
+// Tests that a simple MATCHER_P() definition works.
+
+MATCHER_P(IsGreaterThan32And, n, "") { return arg > 32 && arg > n; }
+
+TEST(MatcherPMacroTest, Works) {
+  const Matcher<int> m = IsGreaterThan32And(5);
+  EXPECT_TRUE(m.Matches(36));
+  EXPECT_FALSE(m.Matches(5));
+
+  EXPECT_EQ("is greater than 32 and (n: 5)", Describe(m));
+  EXPECT_EQ("not (is greater than 32 and (n: 5))", DescribeNegation(m));
+  EXPECT_EQ("", Explain(m, 36));
+  EXPECT_EQ("", Explain(m, 5));
+}
+
+// Tests that the description is calculated correctly from the matcher name.
+MATCHER_P(_is_Greater_Than32and_, n, "") { return arg > 32 && arg > n; }
+
+TEST(MatcherPMacroTest, GeneratesCorrectDescription) {
+  const Matcher<int> m = _is_Greater_Than32and_(5);
+
+  EXPECT_EQ("is greater than 32 and (n: 5)", Describe(m));
+  EXPECT_EQ("not (is greater than 32 and (n: 5))", DescribeNegation(m));
+  EXPECT_EQ("", Explain(m, 36));
+  EXPECT_EQ("", Explain(m, 5));
+}
+
+// Tests that a MATCHER_P matcher can be explicitly instantiated with
+// a reference parameter type.
+
+class UncopyableFoo {
+ public:
+  explicit UncopyableFoo(char value) : value_(value) { (void)value_; }
+
+  UncopyableFoo(const UncopyableFoo&) = delete;
+  void operator=(const UncopyableFoo&) = delete;
+
+ private:
+  char value_;
+};
+
+MATCHER_P(ReferencesUncopyable, variable, "") { return &arg == &variable; }
+
+TEST(MatcherPMacroTest, WorksWhenExplicitlyInstantiatedWithReference) {
+  UncopyableFoo foo1('1'), foo2('2');
+  const Matcher<const UncopyableFoo&> m =
+      ReferencesUncopyable<const UncopyableFoo&>(foo1);
+
+  EXPECT_TRUE(m.Matches(foo1));
+  EXPECT_FALSE(m.Matches(foo2));
+
+  // We don't want the address of the parameter printed, as most
+  // likely it will just annoy the user.  If the address is
+  // interesting, the user should consider passing the parameter by
+  // pointer instead.
+  EXPECT_EQ("references uncopyable (variable: 1-byte object <31>)",
+            Describe(m));
+}
+
+// Tests that the body of MATCHER_Pn() can reference the parameter
+// types.
+
+MATCHER_P3(ParamTypesAreIntLongAndChar, foo, bar, baz, "") {
+  StaticAssertTypeEq<int, foo_type>();
+  StaticAssertTypeEq<long, bar_type>();  // NOLINT
+  StaticAssertTypeEq<char, baz_type>();
+  return arg == 0;
+}
+
+TEST(MatcherPnMacroTest, CanReferenceParamTypes) {
+  EXPECT_THAT(0, ParamTypesAreIntLongAndChar(10, 20L, 'a'));
+}
+
+// Tests that a MATCHER_Pn matcher can be explicitly instantiated with
+// reference parameter types.
+
+MATCHER_P2(ReferencesAnyOf, variable1, variable2, "") {
+  return &arg == &variable1 || &arg == &variable2;
+}
+
+TEST(MatcherPnMacroTest, WorksWhenExplicitlyInstantiatedWithReferences) {
+  UncopyableFoo foo1('1'), foo2('2'), foo3('3');
+  const Matcher<const UncopyableFoo&> const_m =
+      ReferencesAnyOf<const UncopyableFoo&, const UncopyableFoo&>(foo1, foo2);
+
+  EXPECT_TRUE(const_m.Matches(foo1));
+  EXPECT_TRUE(const_m.Matches(foo2));
+  EXPECT_FALSE(const_m.Matches(foo3));
+
+  const Matcher<UncopyableFoo&> m =
+      ReferencesAnyOf<UncopyableFoo&, UncopyableFoo&>(foo1, foo2);
+
+  EXPECT_TRUE(m.Matches(foo1));
+  EXPECT_TRUE(m.Matches(foo2));
+  EXPECT_FALSE(m.Matches(foo3));
+}
+
+TEST(MatcherPnMacroTest,
+     GeneratesCorretDescriptionWhenExplicitlyInstantiatedWithReferences) {
+  UncopyableFoo foo1('1'), foo2('2');
+  const Matcher<const UncopyableFoo&> m =
+      ReferencesAnyOf<const UncopyableFoo&, const UncopyableFoo&>(foo1, foo2);
+
+  // We don't want the addresses of the parameters printed, as most
+  // likely they will just annoy the user.  If the addresses are
+  // interesting, the user should consider passing the parameters by
+  // pointers instead.
+  EXPECT_EQ(
+      "references any of (variable1: 1-byte object <31>, variable2: 1-byte "
+      "object <32>)",
+      Describe(m));
+}
+
+// Tests that a simple MATCHER_P2() definition works.
+
+MATCHER_P2(IsNotInClosedRange, low, hi, "") { return arg < low || arg > hi; }
+
+TEST(MatcherPnMacroTest, Works) {
+  const Matcher<const long&> m = IsNotInClosedRange(10, 20);  // NOLINT
+  EXPECT_TRUE(m.Matches(36L));
+  EXPECT_FALSE(m.Matches(15L));
+
+  EXPECT_EQ("is not in closed range (low: 10, hi: 20)", Describe(m));
+  EXPECT_EQ("not (is not in closed range (low: 10, hi: 20))",
+            DescribeNegation(m));
+  EXPECT_EQ("", Explain(m, 36L));
+  EXPECT_EQ("", Explain(m, 15L));
+}
+
+// Tests that MATCHER*() definitions can be overloaded on the number
+// of parameters; also tests MATCHER_Pn() where n >= 3.
+
+MATCHER(EqualsSumOf, "") { return arg == 0; }
+MATCHER_P(EqualsSumOf, a, "") { return arg == a; }
+MATCHER_P2(EqualsSumOf, a, b, "") { return arg == a + b; }
+MATCHER_P3(EqualsSumOf, a, b, c, "") { return arg == a + b + c; }
+MATCHER_P4(EqualsSumOf, a, b, c, d, "") { return arg == a + b + c + d; }
+MATCHER_P5(EqualsSumOf, a, b, c, d, e, "") { return arg == a + b + c + d + e; }
+MATCHER_P6(EqualsSumOf, a, b, c, d, e, f, "") {
+  return arg == a + b + c + d + e + f;
+}
+MATCHER_P7(EqualsSumOf, a, b, c, d, e, f, g, "") {
+  return arg == a + b + c + d + e + f + g;
+}
+MATCHER_P8(EqualsSumOf, a, b, c, d, e, f, g, h, "") {
+  return arg == a + b + c + d + e + f + g + h;
+}
+MATCHER_P9(EqualsSumOf, a, b, c, d, e, f, g, h, i, "") {
+  return arg == a + b + c + d + e + f + g + h + i;
+}
+MATCHER_P10(EqualsSumOf, a, b, c, d, e, f, g, h, i, j, "") {
+  return arg == a + b + c + d + e + f + g + h + i + j;
+}
+
+TEST(MatcherPnMacroTest, CanBeOverloadedOnNumberOfParameters) {
+  EXPECT_THAT(0, EqualsSumOf());
+  EXPECT_THAT(1, EqualsSumOf(1));
+  EXPECT_THAT(12, EqualsSumOf(10, 2));
+  EXPECT_THAT(123, EqualsSumOf(100, 20, 3));
+  EXPECT_THAT(1234, EqualsSumOf(1000, 200, 30, 4));
+  EXPECT_THAT(12345, EqualsSumOf(10000, 2000, 300, 40, 5));
+  EXPECT_THAT("abcdef",
+              EqualsSumOf(::std::string("a"), 'b', 'c', "d", "e", 'f'));
+  EXPECT_THAT("abcdefg",
+              EqualsSumOf(::std::string("a"), 'b', 'c', "d", "e", 'f', 'g'));
+  EXPECT_THAT("abcdefgh", EqualsSumOf(::std::string("a"), 'b', 'c', "d", "e",
+                                      'f', 'g', "h"));
+  EXPECT_THAT("abcdefghi", EqualsSumOf(::std::string("a"), 'b', 'c', "d", "e",
+                                       'f', 'g', "h", 'i'));
+  EXPECT_THAT("abcdefghij",
+              EqualsSumOf(::std::string("a"), 'b', 'c', "d", "e", 'f', 'g', "h",
+                          'i', ::std::string("j")));
+
+  EXPECT_THAT(1, Not(EqualsSumOf()));
+  EXPECT_THAT(-1, Not(EqualsSumOf(1)));
+  EXPECT_THAT(-12, Not(EqualsSumOf(10, 2)));
+  EXPECT_THAT(-123, Not(EqualsSumOf(100, 20, 3)));
+  EXPECT_THAT(-1234, Not(EqualsSumOf(1000, 200, 30, 4)));
+  EXPECT_THAT(-12345, Not(EqualsSumOf(10000, 2000, 300, 40, 5)));
+  EXPECT_THAT("abcdef ",
+              Not(EqualsSumOf(::std::string("a"), 'b', 'c', "d", "e", 'f')));
+  EXPECT_THAT("abcdefg ", Not(EqualsSumOf(::std::string("a"), 'b', 'c', "d",
+                                          "e", 'f', 'g')));
+  EXPECT_THAT("abcdefgh ", Not(EqualsSumOf(::std::string("a"), 'b', 'c', "d",
+                                           "e", 'f', 'g', "h")));
+  EXPECT_THAT("abcdefghi ", Not(EqualsSumOf(::std::string("a"), 'b', 'c', "d",
+                                            "e", 'f', 'g', "h", 'i')));
+  EXPECT_THAT("abcdefghij ",
+              Not(EqualsSumOf(::std::string("a"), 'b', 'c', "d", "e", 'f', 'g',
+                              "h", 'i', ::std::string("j"))));
+}
+
+// Tests that a MATCHER_Pn() definition can be instantiated with any
+// compatible parameter types.
+TEST(MatcherPnMacroTest, WorksForDifferentParameterTypes) {
+  EXPECT_THAT(123, EqualsSumOf(100L, 20, static_cast<char>(3)));
+  EXPECT_THAT("abcd", EqualsSumOf(::std::string("a"), "b", 'c', "d"));
+
+  EXPECT_THAT(124, Not(EqualsSumOf(100L, 20, static_cast<char>(3))));
+  EXPECT_THAT("abcde", Not(EqualsSumOf(::std::string("a"), "b", 'c', "d")));
+}
+
+// Tests that the matcher body can promote the parameter types.
+
+MATCHER_P2(EqConcat, prefix, suffix, "") {
+  // The following lines promote the two parameters to desired types.
+  std::string prefix_str(prefix);
+  char suffix_char = static_cast<char>(suffix);
+  return arg == prefix_str + suffix_char;
+}
+
+TEST(MatcherPnMacroTest, SimpleTypePromotion) {
+  Matcher<std::string> no_promo = EqConcat(std::string("foo"), 't');
+  Matcher<const std::string&> promo = EqConcat("foo", static_cast<int>('t'));
+  EXPECT_FALSE(no_promo.Matches("fool"));
+  EXPECT_FALSE(promo.Matches("fool"));
+  EXPECT_TRUE(no_promo.Matches("foot"));
+  EXPECT_TRUE(promo.Matches("foot"));
+}
+
+// Verifies the type of a MATCHER*.
+
+TEST(MatcherPnMacroTest, TypesAreCorrect) {
+  // EqualsSumOf() must be assignable to a EqualsSumOfMatcher variable.
+  EqualsSumOfMatcher a0 = EqualsSumOf();
+
+  // EqualsSumOf(1) must be assignable to a EqualsSumOfMatcherP variable.
+  EqualsSumOfMatcherP<int> a1 = EqualsSumOf(1);
+
+  // EqualsSumOf(p1, ..., pk) must be assignable to a EqualsSumOfMatcherPk
+  // variable, and so on.
+  EqualsSumOfMatcherP2<int, char> a2 = EqualsSumOf(1, '2');
+  EqualsSumOfMatcherP3<int, int, char> a3 = EqualsSumOf(1, 2, '3');
+  EqualsSumOfMatcherP4<int, int, int, char> a4 = EqualsSumOf(1, 2, 3, '4');
+  EqualsSumOfMatcherP5<int, int, int, int, char> a5 =
+      EqualsSumOf(1, 2, 3, 4, '5');
+  EqualsSumOfMatcherP6<int, int, int, int, int, char> a6 =
+      EqualsSumOf(1, 2, 3, 4, 5, '6');
+  EqualsSumOfMatcherP7<int, int, int, int, int, int, char> a7 =
+      EqualsSumOf(1, 2, 3, 4, 5, 6, '7');
+  EqualsSumOfMatcherP8<int, int, int, int, int, int, int, char> a8 =
+      EqualsSumOf(1, 2, 3, 4, 5, 6, 7, '8');
+  EqualsSumOfMatcherP9<int, int, int, int, int, int, int, int, char> a9 =
+      EqualsSumOf(1, 2, 3, 4, 5, 6, 7, 8, '9');
+  EqualsSumOfMatcherP10<int, int, int, int, int, int, int, int, int, char> a10 =
+      EqualsSumOf(1, 2, 3, 4, 5, 6, 7, 8, 9, '0');
+
+  // Avoid "unused variable" warnings.
+  (void)a0;
+  (void)a1;
+  (void)a2;
+  (void)a3;
+  (void)a4;
+  (void)a5;
+  (void)a6;
+  (void)a7;
+  (void)a8;
+  (void)a9;
+  (void)a10;
+}
+
+// Tests that matcher-typed parameters can be used in Value() inside a
+// MATCHER_Pn definition.
+
+// Succeeds if arg matches exactly 2 of the 3 matchers.
+MATCHER_P3(TwoOf, m1, m2, m3, "") {
+  const int count = static_cast<int>(Value(arg, m1)) +
+                    static_cast<int>(Value(arg, m2)) +
+                    static_cast<int>(Value(arg, m3));
+  return count == 2;
+}
+
+TEST(MatcherPnMacroTest, CanUseMatcherTypedParameterInValue) {
+  EXPECT_THAT(42, TwoOf(Gt(0), Lt(50), Eq(10)));
+  EXPECT_THAT(0, Not(TwoOf(Gt(-1), Lt(1), Eq(0))));
+}
+
+// Tests Contains().Times().
+
+INSTANTIATE_GTEST_MATCHER_TEST_P(ContainsTimes);
+
+TEST(ContainsTimes, ListMatchesWhenElementQuantityMatches) {
+  list<int> some_list;
+  some_list.push_back(3);
+  some_list.push_back(1);
+  some_list.push_back(2);
+  some_list.push_back(3);
+  EXPECT_THAT(some_list, Contains(3).Times(2));
+  EXPECT_THAT(some_list, Contains(2).Times(1));
+  EXPECT_THAT(some_list, Contains(Ge(2)).Times(3));
+  EXPECT_THAT(some_list, Contains(Ge(2)).Times(Gt(2)));
+  EXPECT_THAT(some_list, Contains(4).Times(0));
+  EXPECT_THAT(some_list, Contains(_).Times(4));
+  EXPECT_THAT(some_list, Not(Contains(5).Times(1)));
+  EXPECT_THAT(some_list, Contains(5).Times(_));  // Times(_) always matches
+  EXPECT_THAT(some_list, Not(Contains(3).Times(1)));
+  EXPECT_THAT(some_list, Contains(3).Times(Not(1)));
+  EXPECT_THAT(list<int>{}, Not(Contains(_)));
+}
+
+TEST_P(ContainsTimesP, ExplainsMatchResultCorrectly) {
+  const int a[2] = {1, 2};
+  Matcher<const int(&)[2]> m = Contains(2).Times(3);
+  EXPECT_EQ(
+      "whose element #1 matches but whose match quantity of 1 does not match",
+      Explain(m, a));
+
+  m = Contains(3).Times(0);
+  EXPECT_EQ("has no element that matches and whose match quantity of 0 matches",
+            Explain(m, a));
+
+  m = Contains(3).Times(4);
+  EXPECT_EQ(
+      "has no element that matches and whose match quantity of 0 does not "
+      "match",
+      Explain(m, a));
+
+  m = Contains(2).Times(4);
+  EXPECT_EQ(
+      "whose element #1 matches but whose match quantity of 1 does not "
+      "match",
+      Explain(m, a));
+
+  m = Contains(GreaterThan(0)).Times(2);
+  EXPECT_EQ("whose elements (0, 1) match and whose match quantity of 2 matches",
+            Explain(m, a));
+
+  m = Contains(GreaterThan(10)).Times(Gt(1));
+  EXPECT_EQ(
+      "has no element that matches and whose match quantity of 0 does not "
+      "match",
+      Explain(m, a));
+
+  m = Contains(GreaterThan(0)).Times(GreaterThan<size_t>(5));
+  EXPECT_EQ(
+      "whose elements (0, 1) match but whose match quantity of 2 does not "
+      "match, which is 3 less than 5",
+      Explain(m, a));
+}
+
+TEST(ContainsTimes, DescribesItselfCorrectly) {
+  Matcher<vector<int>> m = Contains(1).Times(2);
+  EXPECT_EQ("quantity of elements that match is equal to 1 is equal to 2",
+            Describe(m));
+
+  Matcher<vector<int>> m2 = Not(m);
+  EXPECT_EQ("quantity of elements that match is equal to 1 isn't equal to 2",
+            Describe(m2));
+}
+
+// Tests AllOfArray()
+
+TEST(AllOfArrayTest, BasicForms) {
+  // Iterator
+  std::vector<int> v0{};
+  std::vector<int> v1{1};
+  std::vector<int> v2{2, 3};
+  std::vector<int> v3{4, 4, 4};
+  EXPECT_THAT(0, AllOfArray(v0.begin(), v0.end()));
+  EXPECT_THAT(1, AllOfArray(v1.begin(), v1.end()));
+  EXPECT_THAT(2, Not(AllOfArray(v1.begin(), v1.end())));
+  EXPECT_THAT(3, Not(AllOfArray(v2.begin(), v2.end())));
+  EXPECT_THAT(4, AllOfArray(v3.begin(), v3.end()));
+  // Pointer +  size
+  int ar[6] = {1, 2, 3, 4, 4, 4};
+  EXPECT_THAT(0, AllOfArray(ar, 0));
+  EXPECT_THAT(1, AllOfArray(ar, 1));
+  EXPECT_THAT(2, Not(AllOfArray(ar, 1)));
+  EXPECT_THAT(3, Not(AllOfArray(ar + 1, 3)));
+  EXPECT_THAT(4, AllOfArray(ar + 3, 3));
+  // Array
+  // int ar0[0];  Not usable
+  int ar1[1] = {1};
+  int ar2[2] = {2, 3};
+  int ar3[3] = {4, 4, 4};
+  // EXPECT_THAT(0, Not(AllOfArray(ar0)));  // Cannot work
+  EXPECT_THAT(1, AllOfArray(ar1));
+  EXPECT_THAT(2, Not(AllOfArray(ar1)));
+  EXPECT_THAT(3, Not(AllOfArray(ar2)));
+  EXPECT_THAT(4, AllOfArray(ar3));
+  // Container
+  EXPECT_THAT(0, AllOfArray(v0));
+  EXPECT_THAT(1, AllOfArray(v1));
+  EXPECT_THAT(2, Not(AllOfArray(v1)));
+  EXPECT_THAT(3, Not(AllOfArray(v2)));
+  EXPECT_THAT(4, AllOfArray(v3));
+  // Initializer
+  EXPECT_THAT(0, AllOfArray<int>({}));  // Requires template arg.
+  EXPECT_THAT(1, AllOfArray({1}));
+  EXPECT_THAT(2, Not(AllOfArray({1})));
+  EXPECT_THAT(3, Not(AllOfArray({2, 3})));
+  EXPECT_THAT(4, AllOfArray({4, 4, 4}));
+}
+
+TEST(AllOfArrayTest, Matchers) {
+  // vector
+  std::vector<Matcher<int>> matchers{Ge(1), Lt(2)};
+  EXPECT_THAT(0, Not(AllOfArray(matchers)));
+  EXPECT_THAT(1, AllOfArray(matchers));
+  EXPECT_THAT(2, Not(AllOfArray(matchers)));
+  // initializer_list
+  EXPECT_THAT(0, Not(AllOfArray({Ge(0), Ge(1)})));
+  EXPECT_THAT(1, AllOfArray({Ge(0), Ge(1)}));
+}
+
+INSTANTIATE_GTEST_MATCHER_TEST_P(AnyOfArrayTest);
+
+TEST(AnyOfArrayTest, BasicForms) {
+  // Iterator
+  std::vector<int> v0{};
+  std::vector<int> v1{1};
+  std::vector<int> v2{2, 3};
+  EXPECT_THAT(0, Not(AnyOfArray(v0.begin(), v0.end())));
+  EXPECT_THAT(1, AnyOfArray(v1.begin(), v1.end()));
+  EXPECT_THAT(2, Not(AnyOfArray(v1.begin(), v1.end())));
+  EXPECT_THAT(3, AnyOfArray(v2.begin(), v2.end()));
+  EXPECT_THAT(4, Not(AnyOfArray(v2.begin(), v2.end())));
+  // Pointer +  size
+  int ar[3] = {1, 2, 3};
+  EXPECT_THAT(0, Not(AnyOfArray(ar, 0)));
+  EXPECT_THAT(1, AnyOfArray(ar, 1));
+  EXPECT_THAT(2, Not(AnyOfArray(ar, 1)));
+  EXPECT_THAT(3, AnyOfArray(ar + 1, 2));
+  EXPECT_THAT(4, Not(AnyOfArray(ar + 1, 2)));
+  // Array
+  // int ar0[0];  Not usable
+  int ar1[1] = {1};
+  int ar2[2] = {2, 3};
+  // EXPECT_THAT(0, Not(AnyOfArray(ar0)));  // Cannot work
+  EXPECT_THAT(1, AnyOfArray(ar1));
+  EXPECT_THAT(2, Not(AnyOfArray(ar1)));
+  EXPECT_THAT(3, AnyOfArray(ar2));
+  EXPECT_THAT(4, Not(AnyOfArray(ar2)));
+  // Container
+  EXPECT_THAT(0, Not(AnyOfArray(v0)));
+  EXPECT_THAT(1, AnyOfArray(v1));
+  EXPECT_THAT(2, Not(AnyOfArray(v1)));
+  EXPECT_THAT(3, AnyOfArray(v2));
+  EXPECT_THAT(4, Not(AnyOfArray(v2)));
+  // Initializer
+  EXPECT_THAT(0, Not(AnyOfArray<int>({})));  // Requires template arg.
+  EXPECT_THAT(1, AnyOfArray({1}));
+  EXPECT_THAT(2, Not(AnyOfArray({1})));
+  EXPECT_THAT(3, AnyOfArray({2, 3}));
+  EXPECT_THAT(4, Not(AnyOfArray({2, 3})));
+}
+
+TEST(AnyOfArrayTest, Matchers) {
+  // We negate test AllOfArrayTest.Matchers.
+  // vector
+  std::vector<Matcher<int>> matchers{Lt(1), Ge(2)};
+  EXPECT_THAT(0, AnyOfArray(matchers));
+  EXPECT_THAT(1, Not(AnyOfArray(matchers)));
+  EXPECT_THAT(2, AnyOfArray(matchers));
+  // initializer_list
+  EXPECT_THAT(0, AnyOfArray({Lt(0), Lt(1)}));
+  EXPECT_THAT(1, Not(AllOfArray({Lt(0), Lt(1)})));
+}
+
+TEST_P(AnyOfArrayTestP, ExplainsMatchResultCorrectly) {
+  // AnyOfArray and AllOfArray use the same underlying template-template,
+  // thus it is sufficient to test one here.
+  const std::vector<int> v0{};
+  const std::vector<int> v1{1};
+  const std::vector<int> v2{2, 3};
+  const Matcher<int> m0 = AnyOfArray(v0);
+  const Matcher<int> m1 = AnyOfArray(v1);
+  const Matcher<int> m2 = AnyOfArray(v2);
+  EXPECT_EQ("", Explain(m0, 0));
+  EXPECT_EQ("which matches (is equal to 1)", Explain(m1, 1));
+  EXPECT_EQ("isn't equal to 1", Explain(m1, 2));
+  EXPECT_EQ("which matches (is equal to 3)", Explain(m2, 3));
+  EXPECT_EQ("isn't equal to 2, and isn't equal to 3", Explain(m2, 4));
+  EXPECT_EQ("()", Describe(m0));
+  EXPECT_EQ("(is equal to 1)", Describe(m1));
+  EXPECT_EQ("(is equal to 2) or (is equal to 3)", Describe(m2));
+  EXPECT_EQ("()", DescribeNegation(m0));
+  EXPECT_EQ("(isn't equal to 1)", DescribeNegation(m1));
+  EXPECT_EQ("(isn't equal to 2) and (isn't equal to 3)", DescribeNegation(m2));
+  // Explain with matchers
+  const Matcher<int> g1 = AnyOfArray({GreaterThan(1)});
+  const Matcher<int> g2 = AnyOfArray({GreaterThan(1), GreaterThan(2)});
+  // Explains the first positive match and all prior negative matches...
+  EXPECT_EQ("which is 1 less than 1", Explain(g1, 0));
+  EXPECT_EQ("which is the same as 1", Explain(g1, 1));
+  EXPECT_EQ("which is 1 more than 1", Explain(g1, 2));
+  EXPECT_EQ("which is 1 less than 1, and which is 2 less than 2",
+            Explain(g2, 0));
+  EXPECT_EQ("which is the same as 1, and which is 1 less than 2",
+            Explain(g2, 1));
+  EXPECT_EQ("which is 1 more than 1",  // Only the first
+            Explain(g2, 2));
+}
+
+MATCHER(IsNotNull, "") { return arg != nullptr; }
+
+// Verifies that a matcher defined using MATCHER() can work on
+// move-only types.
+TEST(MatcherMacroTest, WorksOnMoveOnlyType) {
+  std::unique_ptr<int> p(new int(3));
+  EXPECT_THAT(p, IsNotNull());
+  EXPECT_THAT(std::unique_ptr<int>(), Not(IsNotNull()));
+}
+
+MATCHER_P(UniquePointee, pointee, "") { return *arg == pointee; }
+
+// Verifies that a matcher defined using MATCHER_P*() can work on
+// move-only types.
+TEST(MatcherPMacroTest, WorksOnMoveOnlyType) {
+  std::unique_ptr<int> p(new int(3));
+  EXPECT_THAT(p, UniquePointee(3));
+  EXPECT_THAT(p, Not(UniquePointee(2)));
+}
+
+MATCHER(EnsureNoUnusedButMarkedUnusedWarning, "") { return (arg % 2) == 0; }
+
+TEST(MockMethodMockFunctionTest, EnsureNoUnusedButMarkedUnusedWarning) {
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic error "-Wused-but-marked-unused"
+#endif
+  // https://github.com/google/googletest/issues/4055
+  EXPECT_THAT(0, EnsureNoUnusedButMarkedUnusedWarning());
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+}
+
+#if GTEST_HAS_EXCEPTIONS
+
+// std::function<void()> is used below for compatibility with older copies of
+// GCC. Normally, a raw lambda is all that is needed.
+
+// Test that examples from documentation compile
+TEST(ThrowsTest, Examples) {
+  EXPECT_THAT(
+      std::function<void()>([]() { throw std::runtime_error("message"); }),
+      Throws<std::runtime_error>());
+
+  EXPECT_THAT(
+      std::function<void()>([]() { throw std::runtime_error("message"); }),
+      ThrowsMessage<std::runtime_error>(HasSubstr("message")));
+}
+
+TEST(ThrowsTest, PrintsExceptionWhat) {
+  EXPECT_THAT(
+      std::function<void()>([]() { throw std::runtime_error("ABC123XYZ"); }),
+      ThrowsMessage<std::runtime_error>(HasSubstr("ABC123XYZ")));
+}
+
+TEST(ThrowsTest, DoesNotGenerateDuplicateCatchClauseWarning) {
+  EXPECT_THAT(std::function<void()>([]() { throw std::exception(); }),
+              Throws<std::exception>());
+}
+
+TEST(ThrowsTest, CallableExecutedExactlyOnce) {
+  size_t a = 0;
+
+  EXPECT_THAT(std::function<void()>([&a]() {
+                a++;
+                throw 10;
+              }),
+              Throws<int>());
+  EXPECT_EQ(a, 1u);
+
+  EXPECT_THAT(std::function<void()>([&a]() {
+                a++;
+                throw std::runtime_error("message");
+              }),
+              Throws<std::runtime_error>());
+  EXPECT_EQ(a, 2u);
+
+  EXPECT_THAT(std::function<void()>([&a]() {
+                a++;
+                throw std::runtime_error("message");
+              }),
+              ThrowsMessage<std::runtime_error>(HasSubstr("message")));
+  EXPECT_EQ(a, 3u);
+
+  EXPECT_THAT(std::function<void()>([&a]() {
+                a++;
+                throw std::runtime_error("message");
+              }),
+              Throws<std::runtime_error>(
+                  Property(&std::runtime_error::what, HasSubstr("message"))));
+  EXPECT_EQ(a, 4u);
+}
+
+TEST(ThrowsTest, Describe) {
+  Matcher<std::function<void()>> matcher = Throws<std::runtime_error>();
+  std::stringstream ss;
+  matcher.DescribeTo(&ss);
+  auto explanation = ss.str();
+  EXPECT_THAT(explanation, HasSubstr("std::runtime_error"));
+}
+
+TEST(ThrowsTest, Success) {
+  Matcher<std::function<void()>> matcher = Throws<std::runtime_error>();
+  StringMatchResultListener listener;
+  EXPECT_TRUE(matcher.MatchAndExplain(
+      []() { throw std::runtime_error("error message"); }, &listener));
+  EXPECT_THAT(listener.str(), HasSubstr("std::runtime_error"));
+}
+
+TEST(ThrowsTest, FailWrongType) {
+  Matcher<std::function<void()>> matcher = Throws<std::runtime_error>();
+  StringMatchResultListener listener;
+  EXPECT_FALSE(matcher.MatchAndExplain(
+      []() { throw std::logic_error("error message"); }, &listener));
+  EXPECT_THAT(listener.str(), HasSubstr("std::logic_error"));
+  EXPECT_THAT(listener.str(), HasSubstr("\"error message\""));
+}
+
+TEST(ThrowsTest, FailWrongTypeNonStd) {
+  Matcher<std::function<void()>> matcher = Throws<std::runtime_error>();
+  StringMatchResultListener listener;
+  EXPECT_FALSE(matcher.MatchAndExplain([]() { throw 10; }, &listener));
+  EXPECT_THAT(listener.str(),
+              HasSubstr("throws an exception of an unknown type"));
+}
+
+TEST(ThrowsTest, FailNoThrow) {
+  Matcher<std::function<void()>> matcher = Throws<std::runtime_error>();
+  StringMatchResultListener listener;
+  EXPECT_FALSE(matcher.MatchAndExplain([]() { (void)0; }, &listener));
+  EXPECT_THAT(listener.str(), HasSubstr("does not throw any exception"));
+}
+
+class ThrowsPredicateTest
+    : public TestWithParam<Matcher<std::function<void()>>> {};
+
+TEST_P(ThrowsPredicateTest, Describe) {
+  Matcher<std::function<void()>> matcher = GetParam();
+  std::stringstream ss;
+  matcher.DescribeTo(&ss);
+  auto explanation = ss.str();
+  EXPECT_THAT(explanation, HasSubstr("std::runtime_error"));
+  EXPECT_THAT(explanation, HasSubstr("error message"));
+}
+
+TEST_P(ThrowsPredicateTest, Success) {
+  Matcher<std::function<void()>> matcher = GetParam();
+  StringMatchResultListener listener;
+  EXPECT_TRUE(matcher.MatchAndExplain(
+      []() { throw std::runtime_error("error message"); }, &listener));
+  EXPECT_THAT(listener.str(), HasSubstr("std::runtime_error"));
+}
+
+TEST_P(ThrowsPredicateTest, FailWrongType) {
+  Matcher<std::function<void()>> matcher = GetParam();
+  StringMatchResultListener listener;
+  EXPECT_FALSE(matcher.MatchAndExplain(
+      []() { throw std::logic_error("error message"); }, &listener));
+  EXPECT_THAT(listener.str(), HasSubstr("std::logic_error"));
+  EXPECT_THAT(listener.str(), HasSubstr("\"error message\""));
+}
+
+TEST_P(ThrowsPredicateTest, FailWrongTypeNonStd) {
+  Matcher<std::function<void()>> matcher = GetParam();
+  StringMatchResultListener listener;
+  EXPECT_FALSE(matcher.MatchAndExplain([]() { throw 10; }, &listener));
+  EXPECT_THAT(listener.str(),
+              HasSubstr("throws an exception of an unknown type"));
+}
+
+TEST_P(ThrowsPredicateTest, FailNoThrow) {
+  Matcher<std::function<void()>> matcher = GetParam();
+  StringMatchResultListener listener;
+  EXPECT_FALSE(matcher.MatchAndExplain([]() {}, &listener));
+  EXPECT_THAT(listener.str(), HasSubstr("does not throw any exception"));
+}
+
+INSTANTIATE_TEST_SUITE_P(
+    AllMessagePredicates, ThrowsPredicateTest,
+    Values(Matcher<std::function<void()>>(
+        ThrowsMessage<std::runtime_error>(HasSubstr("error message")))));
+
+// Tests that Throws<E1>(Matcher<E2>{}) compiles even when E2 != const E1&.
+TEST(ThrowsPredicateCompilesTest, ExceptionMatcherAcceptsBroadType) {
+  {
+    Matcher<std::function<void()>> matcher =
+        ThrowsMessage<std::runtime_error>(HasSubstr("error message"));
+    EXPECT_TRUE(
+        matcher.Matches([]() { throw std::runtime_error("error message"); }));
+    EXPECT_FALSE(
+        matcher.Matches([]() { throw std::runtime_error("wrong message"); }));
+  }
+
+  {
+    Matcher<uint64_t> inner = Eq(10);
+    Matcher<std::function<void()>> matcher = Throws<uint32_t>(inner);
+    EXPECT_TRUE(matcher.Matches([]() { throw (uint32_t)10; }));
+    EXPECT_FALSE(matcher.Matches([]() { throw (uint32_t)11; }));
+  }
+}
+
+// Tests that ThrowsMessage("message") is equivalent
+// to ThrowsMessage(Eq<std::string>("message")).
+TEST(ThrowsPredicateCompilesTest, MessageMatcherAcceptsNonMatcher) {
+  Matcher<std::function<void()>> matcher =
+      ThrowsMessage<std::runtime_error>("error message");
+  EXPECT_TRUE(
+      matcher.Matches([]() { throw std::runtime_error("error message"); }));
+  EXPECT_FALSE(matcher.Matches(
+      []() { throw std::runtime_error("wrong error message"); }));
+}
+
+#endif  // GTEST_HAS_EXCEPTIONS
+
+}  // namespace
+}  // namespace gmock_matchers_test
+}  // namespace testing
+
+GTEST_DISABLE_MSC_WARNINGS_POP_()  // 4244 4100
diff --git a/external/googletest/googlemock/test/gmock-matchers_test.cc b/external/googletest/googlemock/test/gmock-matchers_test.cc
deleted file mode 100644
index 5714b708..00000000
--- a/external/googletest/googlemock/test/gmock-matchers_test.cc
+++ /dev/null
@@ -1,8498 +0,0 @@
-// Copyright 2007, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Google Mock - a framework for writing C++ mock classes.
-//
-// This file tests some commonly used argument matchers.
-
-// Silence warning C4244: 'initializing': conversion from 'int' to 'short',
-// possible loss of data and C4100, unreferenced local parameter
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4244)
-#pragma warning(disable : 4100)
-#endif
-
-#include "gmock/gmock-matchers.h"
-
-#include <string.h>
-#include <time.h>
-
-#include <array>
-#include <cstdint>
-#include <deque>
-#include <forward_list>
-#include <functional>
-#include <iostream>
-#include <iterator>
-#include <limits>
-#include <list>
-#include <map>
-#include <memory>
-#include <set>
-#include <sstream>
-#include <string>
-#include <type_traits>
-#include <unordered_map>
-#include <unordered_set>
-#include <utility>
-#include <vector>
-
-#include "gmock/gmock-more-matchers.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest-spi.h"
-#include "gtest/gtest.h"
-
-namespace testing {
-namespace gmock_matchers_test {
-namespace {
-
-using std::greater;
-using std::less;
-using std::list;
-using std::make_pair;
-using std::map;
-using std::multimap;
-using std::multiset;
-using std::ostream;
-using std::pair;
-using std::set;
-using std::stringstream;
-using std::vector;
-using testing::internal::DummyMatchResultListener;
-using testing::internal::ElementMatcherPair;
-using testing::internal::ElementMatcherPairs;
-using testing::internal::ElementsAreArrayMatcher;
-using testing::internal::ExplainMatchFailureTupleTo;
-using testing::internal::FloatingEqMatcher;
-using testing::internal::FormatMatcherDescription;
-using testing::internal::IsReadableTypeName;
-using testing::internal::MatchMatrix;
-using testing::internal::PredicateFormatterFromMatcher;
-using testing::internal::RE;
-using testing::internal::StreamMatchResultListener;
-using testing::internal::Strings;
-
-// Helper for testing container-valued matchers in mock method context. It is
-// important to test matchers in this context, since it requires additional type
-// deduction beyond what EXPECT_THAT does, thus making it more restrictive.
-struct ContainerHelper {
-  MOCK_METHOD1(Call, void(std::vector<std::unique_ptr<int>>));
-};
-
-std::vector<std::unique_ptr<int>> MakeUniquePtrs(const std::vector<int>& ints) {
-  std::vector<std::unique_ptr<int>> pointers;
-  for (int i : ints) pointers.emplace_back(new int(i));
-  return pointers;
-}
-
-// For testing ExplainMatchResultTo().
-class GreaterThanMatcher : public MatcherInterface<int> {
- public:
-  explicit GreaterThanMatcher(int rhs) : rhs_(rhs) {}
-
-  void DescribeTo(ostream* os) const override { *os << "is > " << rhs_; }
-
-  bool MatchAndExplain(int lhs, MatchResultListener* listener) const override {
-    const int diff = lhs - rhs_;
-    if (diff > 0) {
-      *listener << "which is " << diff << " more than " << rhs_;
-    } else if (diff == 0) {
-      *listener << "which is the same as " << rhs_;
-    } else {
-      *listener << "which is " << -diff << " less than " << rhs_;
-    }
-
-    return lhs > rhs_;
-  }
-
- private:
-  int rhs_;
-};
-
-Matcher<int> GreaterThan(int n) {
-  return MakeMatcher(new GreaterThanMatcher(n));
-}
-
-std::string OfType(const std::string& type_name) {
-#if GTEST_HAS_RTTI
-  return IsReadableTypeName(type_name) ? " (of type " + type_name + ")" : "";
-#else
-  return "";
-#endif
-}
-
-// Returns the description of the given matcher.
-template <typename T>
-std::string Describe(const Matcher<T>& m) {
-  return DescribeMatcher<T>(m);
-}
-
-// Returns the description of the negation of the given matcher.
-template <typename T>
-std::string DescribeNegation(const Matcher<T>& m) {
-  return DescribeMatcher<T>(m, true);
-}
-
-// Returns the reason why x matches, or doesn't match, m.
-template <typename MatcherType, typename Value>
-std::string Explain(const MatcherType& m, const Value& x) {
-  StringMatchResultListener listener;
-  ExplainMatchResult(m, x, &listener);
-  return listener.str();
-}
-
-TEST(MonotonicMatcherTest, IsPrintable) {
-  stringstream ss;
-  ss << GreaterThan(5);
-  EXPECT_EQ("is > 5", ss.str());
-}
-
-TEST(MatchResultListenerTest, StreamingWorks) {
-  StringMatchResultListener listener;
-  listener << "hi" << 5;
-  EXPECT_EQ("hi5", listener.str());
-
-  listener.Clear();
-  EXPECT_EQ("", listener.str());
-
-  listener << 42;
-  EXPECT_EQ("42", listener.str());
-
-  // Streaming shouldn't crash when the underlying ostream is NULL.
-  DummyMatchResultListener dummy;
-  dummy << "hi" << 5;
-}
-
-TEST(MatchResultListenerTest, CanAccessUnderlyingStream) {
-  EXPECT_TRUE(DummyMatchResultListener().stream() == nullptr);
-  EXPECT_TRUE(StreamMatchResultListener(nullptr).stream() == nullptr);
-
-  EXPECT_EQ(&std::cout, StreamMatchResultListener(&std::cout).stream());
-}
-
-TEST(MatchResultListenerTest, IsInterestedWorks) {
-  EXPECT_TRUE(StringMatchResultListener().IsInterested());
-  EXPECT_TRUE(StreamMatchResultListener(&std::cout).IsInterested());
-
-  EXPECT_FALSE(DummyMatchResultListener().IsInterested());
-  EXPECT_FALSE(StreamMatchResultListener(nullptr).IsInterested());
-}
-
-// Makes sure that the MatcherInterface<T> interface doesn't
-// change.
-class EvenMatcherImpl : public MatcherInterface<int> {
- public:
-  bool MatchAndExplain(int x,
-                       MatchResultListener* /* listener */) const override {
-    return x % 2 == 0;
-  }
-
-  void DescribeTo(ostream* os) const override { *os << "is an even number"; }
-
-  // We deliberately don't define DescribeNegationTo() and
-  // ExplainMatchResultTo() here, to make sure the definition of these
-  // two methods is optional.
-};
-
-// Makes sure that the MatcherInterface API doesn't change.
-TEST(MatcherInterfaceTest, CanBeImplementedUsingPublishedAPI) {
-  EvenMatcherImpl m;
-}
-
-// Tests implementing a monomorphic matcher using MatchAndExplain().
-
-class NewEvenMatcherImpl : public MatcherInterface<int> {
- public:
-  bool MatchAndExplain(int x, MatchResultListener* listener) const override {
-    const bool match = x % 2 == 0;
-    // Verifies that we can stream to a listener directly.
-    *listener << "value % " << 2;
-    if (listener->stream() != nullptr) {
-      // Verifies that we can stream to a listener's underlying stream
-      // too.
-      *listener->stream() << " == " << (x % 2);
-    }
-    return match;
-  }
-
-  void DescribeTo(ostream* os) const override { *os << "is an even number"; }
-};
-
-TEST(MatcherInterfaceTest, CanBeImplementedUsingNewAPI) {
-  Matcher<int> m = MakeMatcher(new NewEvenMatcherImpl);
-  EXPECT_TRUE(m.Matches(2));
-  EXPECT_FALSE(m.Matches(3));
-  EXPECT_EQ("value % 2 == 0", Explain(m, 2));
-  EXPECT_EQ("value % 2 == 1", Explain(m, 3));
-}
-
-// Tests default-constructing a matcher.
-TEST(MatcherTest, CanBeDefaultConstructed) { Matcher<double> m; }
-
-// Tests that Matcher<T> can be constructed from a MatcherInterface<T>*.
-TEST(MatcherTest, CanBeConstructedFromMatcherInterface) {
-  const MatcherInterface<int>* impl = new EvenMatcherImpl;
-  Matcher<int> m(impl);
-  EXPECT_TRUE(m.Matches(4));
-  EXPECT_FALSE(m.Matches(5));
-}
-
-// Tests that value can be used in place of Eq(value).
-TEST(MatcherTest, CanBeImplicitlyConstructedFromValue) {
-  Matcher<int> m1 = 5;
-  EXPECT_TRUE(m1.Matches(5));
-  EXPECT_FALSE(m1.Matches(6));
-}
-
-// Tests that NULL can be used in place of Eq(NULL).
-TEST(MatcherTest, CanBeImplicitlyConstructedFromNULL) {
-  Matcher<int*> m1 = nullptr;
-  EXPECT_TRUE(m1.Matches(nullptr));
-  int n = 0;
-  EXPECT_FALSE(m1.Matches(&n));
-}
-
-// Tests that matchers can be constructed from a variable that is not properly
-// defined. This should be illegal, but many users rely on this accidentally.
-struct Undefined {
-  virtual ~Undefined() = 0;
-  static const int kInt = 1;
-};
-
-TEST(MatcherTest, CanBeConstructedFromUndefinedVariable) {
-  Matcher<int> m1 = Undefined::kInt;
-  EXPECT_TRUE(m1.Matches(1));
-  EXPECT_FALSE(m1.Matches(2));
-}
-
-// Test that a matcher parameterized with an abstract class compiles.
-TEST(MatcherTest, CanAcceptAbstractClass) { Matcher<const Undefined&> m = _; }
-
-// Tests that matchers are copyable.
-TEST(MatcherTest, IsCopyable) {
-  // Tests the copy constructor.
-  Matcher<bool> m1 = Eq(false);
-  EXPECT_TRUE(m1.Matches(false));
-  EXPECT_FALSE(m1.Matches(true));
-
-  // Tests the assignment operator.
-  m1 = Eq(true);
-  EXPECT_TRUE(m1.Matches(true));
-  EXPECT_FALSE(m1.Matches(false));
-}
-
-// Tests that Matcher<T>::DescribeTo() calls
-// MatcherInterface<T>::DescribeTo().
-TEST(MatcherTest, CanDescribeItself) {
-  EXPECT_EQ("is an even number", Describe(Matcher<int>(new EvenMatcherImpl)));
-}
-
-// Tests Matcher<T>::MatchAndExplain().
-TEST(MatcherTest, MatchAndExplain) {
-  Matcher<int> m = GreaterThan(0);
-  StringMatchResultListener listener1;
-  EXPECT_TRUE(m.MatchAndExplain(42, &listener1));
-  EXPECT_EQ("which is 42 more than 0", listener1.str());
-
-  StringMatchResultListener listener2;
-  EXPECT_FALSE(m.MatchAndExplain(-9, &listener2));
-  EXPECT_EQ("which is 9 less than 0", listener2.str());
-}
-
-// Tests that a C-string literal can be implicitly converted to a
-// Matcher<std::string> or Matcher<const std::string&>.
-TEST(StringMatcherTest, CanBeImplicitlyConstructedFromCStringLiteral) {
-  Matcher<std::string> m1 = "hi";
-  EXPECT_TRUE(m1.Matches("hi"));
-  EXPECT_FALSE(m1.Matches("hello"));
-
-  Matcher<const std::string&> m2 = "hi";
-  EXPECT_TRUE(m2.Matches("hi"));
-  EXPECT_FALSE(m2.Matches("hello"));
-}
-
-// Tests that a string object can be implicitly converted to a
-// Matcher<std::string> or Matcher<const std::string&>.
-TEST(StringMatcherTest, CanBeImplicitlyConstructedFromString) {
-  Matcher<std::string> m1 = std::string("hi");
-  EXPECT_TRUE(m1.Matches("hi"));
-  EXPECT_FALSE(m1.Matches("hello"));
-
-  Matcher<const std::string&> m2 = std::string("hi");
-  EXPECT_TRUE(m2.Matches("hi"));
-  EXPECT_FALSE(m2.Matches("hello"));
-}
-
-#if GTEST_INTERNAL_HAS_STRING_VIEW
-// Tests that a C-string literal can be implicitly converted to a
-// Matcher<StringView> or Matcher<const StringView&>.
-TEST(StringViewMatcherTest, CanBeImplicitlyConstructedFromCStringLiteral) {
-  Matcher<internal::StringView> m1 = "cats";
-  EXPECT_TRUE(m1.Matches("cats"));
-  EXPECT_FALSE(m1.Matches("dogs"));
-
-  Matcher<const internal::StringView&> m2 = "cats";
-  EXPECT_TRUE(m2.Matches("cats"));
-  EXPECT_FALSE(m2.Matches("dogs"));
-}
-
-// Tests that a std::string object can be implicitly converted to a
-// Matcher<StringView> or Matcher<const StringView&>.
-TEST(StringViewMatcherTest, CanBeImplicitlyConstructedFromString) {
-  Matcher<internal::StringView> m1 = std::string("cats");
-  EXPECT_TRUE(m1.Matches("cats"));
-  EXPECT_FALSE(m1.Matches("dogs"));
-
-  Matcher<const internal::StringView&> m2 = std::string("cats");
-  EXPECT_TRUE(m2.Matches("cats"));
-  EXPECT_FALSE(m2.Matches("dogs"));
-}
-
-// Tests that a StringView object can be implicitly converted to a
-// Matcher<StringView> or Matcher<const StringView&>.
-TEST(StringViewMatcherTest, CanBeImplicitlyConstructedFromStringView) {
-  Matcher<internal::StringView> m1 = internal::StringView("cats");
-  EXPECT_TRUE(m1.Matches("cats"));
-  EXPECT_FALSE(m1.Matches("dogs"));
-
-  Matcher<const internal::StringView&> m2 = internal::StringView("cats");
-  EXPECT_TRUE(m2.Matches("cats"));
-  EXPECT_FALSE(m2.Matches("dogs"));
-}
-#endif  // GTEST_INTERNAL_HAS_STRING_VIEW
-
-// Tests that a std::reference_wrapper<std::string> object can be implicitly
-// converted to a Matcher<std::string> or Matcher<const std::string&> via Eq().
-TEST(StringMatcherTest,
-     CanBeImplicitlyConstructedFromEqReferenceWrapperString) {
-  std::string value = "cats";
-  Matcher<std::string> m1 = Eq(std::ref(value));
-  EXPECT_TRUE(m1.Matches("cats"));
-  EXPECT_FALSE(m1.Matches("dogs"));
-
-  Matcher<const std::string&> m2 = Eq(std::ref(value));
-  EXPECT_TRUE(m2.Matches("cats"));
-  EXPECT_FALSE(m2.Matches("dogs"));
-}
-
-// Tests that MakeMatcher() constructs a Matcher<T> from a
-// MatcherInterface* without requiring the user to explicitly
-// write the type.
-TEST(MakeMatcherTest, ConstructsMatcherFromMatcherInterface) {
-  const MatcherInterface<int>* dummy_impl = new EvenMatcherImpl;
-  Matcher<int> m = MakeMatcher(dummy_impl);
-}
-
-// Tests that MakePolymorphicMatcher() can construct a polymorphic
-// matcher from its implementation using the old API.
-const int g_bar = 1;
-class ReferencesBarOrIsZeroImpl {
- public:
-  template <typename T>
-  bool MatchAndExplain(const T& x, MatchResultListener* /* listener */) const {
-    const void* p = &x;
-    return p == &g_bar || x == 0;
-  }
-
-  void DescribeTo(ostream* os) const { *os << "g_bar or zero"; }
-
-  void DescribeNegationTo(ostream* os) const {
-    *os << "doesn't reference g_bar and is not zero";
-  }
-};
-
-// This function verifies that MakePolymorphicMatcher() returns a
-// PolymorphicMatcher<T> where T is the argument's type.
-PolymorphicMatcher<ReferencesBarOrIsZeroImpl> ReferencesBarOrIsZero() {
-  return MakePolymorphicMatcher(ReferencesBarOrIsZeroImpl());
-}
-
-TEST(MakePolymorphicMatcherTest, ConstructsMatcherUsingOldAPI) {
-  // Using a polymorphic matcher to match a reference type.
-  Matcher<const int&> m1 = ReferencesBarOrIsZero();
-  EXPECT_TRUE(m1.Matches(0));
-  // Verifies that the identity of a by-reference argument is preserved.
-  EXPECT_TRUE(m1.Matches(g_bar));
-  EXPECT_FALSE(m1.Matches(1));
-  EXPECT_EQ("g_bar or zero", Describe(m1));
-
-  // Using a polymorphic matcher to match a value type.
-  Matcher<double> m2 = ReferencesBarOrIsZero();
-  EXPECT_TRUE(m2.Matches(0.0));
-  EXPECT_FALSE(m2.Matches(0.1));
-  EXPECT_EQ("g_bar or zero", Describe(m2));
-}
-
-// Tests implementing a polymorphic matcher using MatchAndExplain().
-
-class PolymorphicIsEvenImpl {
- public:
-  void DescribeTo(ostream* os) const { *os << "is even"; }
-
-  void DescribeNegationTo(ostream* os) const { *os << "is odd"; }
-
-  template <typename T>
-  bool MatchAndExplain(const T& x, MatchResultListener* listener) const {
-    // Verifies that we can stream to the listener directly.
-    *listener << "% " << 2;
-    if (listener->stream() != nullptr) {
-      // Verifies that we can stream to the listener's underlying stream
-      // too.
-      *listener->stream() << " == " << (x % 2);
-    }
-    return (x % 2) == 0;
-  }
-};
-
-PolymorphicMatcher<PolymorphicIsEvenImpl> PolymorphicIsEven() {
-  return MakePolymorphicMatcher(PolymorphicIsEvenImpl());
-}
-
-TEST(MakePolymorphicMatcherTest, ConstructsMatcherUsingNewAPI) {
-  // Using PolymorphicIsEven() as a Matcher<int>.
-  const Matcher<int> m1 = PolymorphicIsEven();
-  EXPECT_TRUE(m1.Matches(42));
-  EXPECT_FALSE(m1.Matches(43));
-  EXPECT_EQ("is even", Describe(m1));
-
-  const Matcher<int> not_m1 = Not(m1);
-  EXPECT_EQ("is odd", Describe(not_m1));
-
-  EXPECT_EQ("% 2 == 0", Explain(m1, 42));
-
-  // Using PolymorphicIsEven() as a Matcher<char>.
-  const Matcher<char> m2 = PolymorphicIsEven();
-  EXPECT_TRUE(m2.Matches('\x42'));
-  EXPECT_FALSE(m2.Matches('\x43'));
-  EXPECT_EQ("is even", Describe(m2));
-
-  const Matcher<char> not_m2 = Not(m2);
-  EXPECT_EQ("is odd", Describe(not_m2));
-
-  EXPECT_EQ("% 2 == 0", Explain(m2, '\x42'));
-}
-
-// Tests that MatcherCast<T>(m) works when m is a polymorphic matcher.
-TEST(MatcherCastTest, FromPolymorphicMatcher) {
-  Matcher<int> m = MatcherCast<int>(Eq(5));
-  EXPECT_TRUE(m.Matches(5));
-  EXPECT_FALSE(m.Matches(6));
-}
-
-// For testing casting matchers between compatible types.
-class IntValue {
- public:
-  // An int can be statically (although not implicitly) cast to a
-  // IntValue.
-  explicit IntValue(int a_value) : value_(a_value) {}
-
-  int value() const { return value_; }
-
- private:
-  int value_;
-};
-
-// For testing casting matchers between compatible types.
-bool IsPositiveIntValue(const IntValue& foo) { return foo.value() > 0; }
-
-// Tests that MatcherCast<T>(m) works when m is a Matcher<U> where T
-// can be statically converted to U.
-TEST(MatcherCastTest, FromCompatibleType) {
-  Matcher<double> m1 = Eq(2.0);
-  Matcher<int> m2 = MatcherCast<int>(m1);
-  EXPECT_TRUE(m2.Matches(2));
-  EXPECT_FALSE(m2.Matches(3));
-
-  Matcher<IntValue> m3 = Truly(IsPositiveIntValue);
-  Matcher<int> m4 = MatcherCast<int>(m3);
-  // In the following, the arguments 1 and 0 are statically converted
-  // to IntValue objects, and then tested by the IsPositiveIntValue()
-  // predicate.
-  EXPECT_TRUE(m4.Matches(1));
-  EXPECT_FALSE(m4.Matches(0));
-}
-
-// Tests that MatcherCast<T>(m) works when m is a Matcher<const T&>.
-TEST(MatcherCastTest, FromConstReferenceToNonReference) {
-  Matcher<const int&> m1 = Eq(0);
-  Matcher<int> m2 = MatcherCast<int>(m1);
-  EXPECT_TRUE(m2.Matches(0));
-  EXPECT_FALSE(m2.Matches(1));
-}
-
-// Tests that MatcherCast<T>(m) works when m is a Matcher<T&>.
-TEST(MatcherCastTest, FromReferenceToNonReference) {
-  Matcher<int&> m1 = Eq(0);
-  Matcher<int> m2 = MatcherCast<int>(m1);
-  EXPECT_TRUE(m2.Matches(0));
-  EXPECT_FALSE(m2.Matches(1));
-}
-
-// Tests that MatcherCast<const T&>(m) works when m is a Matcher<T>.
-TEST(MatcherCastTest, FromNonReferenceToConstReference) {
-  Matcher<int> m1 = Eq(0);
-  Matcher<const int&> m2 = MatcherCast<const int&>(m1);
-  EXPECT_TRUE(m2.Matches(0));
-  EXPECT_FALSE(m2.Matches(1));
-}
-
-// Tests that MatcherCast<T&>(m) works when m is a Matcher<T>.
-TEST(MatcherCastTest, FromNonReferenceToReference) {
-  Matcher<int> m1 = Eq(0);
-  Matcher<int&> m2 = MatcherCast<int&>(m1);
-  int n = 0;
-  EXPECT_TRUE(m2.Matches(n));
-  n = 1;
-  EXPECT_FALSE(m2.Matches(n));
-}
-
-// Tests that MatcherCast<T>(m) works when m is a Matcher<T>.
-TEST(MatcherCastTest, FromSameType) {
-  Matcher<int> m1 = Eq(0);
-  Matcher<int> m2 = MatcherCast<int>(m1);
-  EXPECT_TRUE(m2.Matches(0));
-  EXPECT_FALSE(m2.Matches(1));
-}
-
-// Tests that MatcherCast<T>(m) works when m is a value of the same type as the
-// value type of the Matcher.
-TEST(MatcherCastTest, FromAValue) {
-  Matcher<int> m = MatcherCast<int>(42);
-  EXPECT_TRUE(m.Matches(42));
-  EXPECT_FALSE(m.Matches(239));
-}
-
-// Tests that MatcherCast<T>(m) works when m is a value of the type implicitly
-// convertible to the value type of the Matcher.
-TEST(MatcherCastTest, FromAnImplicitlyConvertibleValue) {
-  const int kExpected = 'c';
-  Matcher<int> m = MatcherCast<int>('c');
-  EXPECT_TRUE(m.Matches(kExpected));
-  EXPECT_FALSE(m.Matches(kExpected + 1));
-}
-
-struct NonImplicitlyConstructibleTypeWithOperatorEq {
-  friend bool operator==(
-      const NonImplicitlyConstructibleTypeWithOperatorEq& /* ignored */,
-      int rhs) {
-    return 42 == rhs;
-  }
-  friend bool operator==(
-      int lhs,
-      const NonImplicitlyConstructibleTypeWithOperatorEq& /* ignored */) {
-    return lhs == 42;
-  }
-};
-
-// Tests that MatcherCast<T>(m) works when m is a neither a matcher nor
-// implicitly convertible to the value type of the Matcher, but the value type
-// of the matcher has operator==() overload accepting m.
-TEST(MatcherCastTest, NonImplicitlyConstructibleTypeWithOperatorEq) {
-  Matcher<NonImplicitlyConstructibleTypeWithOperatorEq> m1 =
-      MatcherCast<NonImplicitlyConstructibleTypeWithOperatorEq>(42);
-  EXPECT_TRUE(m1.Matches(NonImplicitlyConstructibleTypeWithOperatorEq()));
-
-  Matcher<NonImplicitlyConstructibleTypeWithOperatorEq> m2 =
-      MatcherCast<NonImplicitlyConstructibleTypeWithOperatorEq>(239);
-  EXPECT_FALSE(m2.Matches(NonImplicitlyConstructibleTypeWithOperatorEq()));
-
-  // When updating the following lines please also change the comment to
-  // namespace convertible_from_any.
-  Matcher<int> m3 =
-      MatcherCast<int>(NonImplicitlyConstructibleTypeWithOperatorEq());
-  EXPECT_TRUE(m3.Matches(42));
-  EXPECT_FALSE(m3.Matches(239));
-}
-
-// ConvertibleFromAny does not work with MSVC. resulting in
-// error C2440: 'initializing': cannot convert from 'Eq' to 'M'
-// No constructor could take the source type, or constructor overload
-// resolution was ambiguous
-
-#if !defined _MSC_VER
-
-// The below ConvertibleFromAny struct is implicitly constructible from anything
-// and when in the same namespace can interact with other tests. In particular,
-// if it is in the same namespace as other tests and one removes
-//   NonImplicitlyConstructibleTypeWithOperatorEq::operator==(int lhs, ...);
-// then the corresponding test still compiles (and it should not!) by implicitly
-// converting NonImplicitlyConstructibleTypeWithOperatorEq to ConvertibleFromAny
-// in m3.Matcher().
-namespace convertible_from_any {
-// Implicitly convertible from any type.
-struct ConvertibleFromAny {
-  ConvertibleFromAny(int a_value) : value(a_value) {}
-  template <typename T>
-  ConvertibleFromAny(const T& /*a_value*/) : value(-1) {
-    ADD_FAILURE() << "Conversion constructor called";
-  }
-  int value;
-};
-
-bool operator==(const ConvertibleFromAny& a, const ConvertibleFromAny& b) {
-  return a.value == b.value;
-}
-
-ostream& operator<<(ostream& os, const ConvertibleFromAny& a) {
-  return os << a.value;
-}
-
-TEST(MatcherCastTest, ConversionConstructorIsUsed) {
-  Matcher<ConvertibleFromAny> m = MatcherCast<ConvertibleFromAny>(1);
-  EXPECT_TRUE(m.Matches(ConvertibleFromAny(1)));
-  EXPECT_FALSE(m.Matches(ConvertibleFromAny(2)));
-}
-
-TEST(MatcherCastTest, FromConvertibleFromAny) {
-  Matcher<ConvertibleFromAny> m =
-      MatcherCast<ConvertibleFromAny>(Eq(ConvertibleFromAny(1)));
-  EXPECT_TRUE(m.Matches(ConvertibleFromAny(1)));
-  EXPECT_FALSE(m.Matches(ConvertibleFromAny(2)));
-}
-}  // namespace convertible_from_any
-
-#endif  // !defined _MSC_VER
-
-struct IntReferenceWrapper {
-  IntReferenceWrapper(const int& a_value) : value(&a_value) {}
-  const int* value;
-};
-
-bool operator==(const IntReferenceWrapper& a, const IntReferenceWrapper& b) {
-  return a.value == b.value;
-}
-
-TEST(MatcherCastTest, ValueIsNotCopied) {
-  int n = 42;
-  Matcher<IntReferenceWrapper> m = MatcherCast<IntReferenceWrapper>(n);
-  // Verify that the matcher holds a reference to n, not to its temporary copy.
-  EXPECT_TRUE(m.Matches(n));
-}
-
-class Base {
- public:
-  virtual ~Base() {}
-  Base() {}
-
- private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(Base);
-};
-
-class Derived : public Base {
- public:
-  Derived() : Base() {}
-  int i;
-};
-
-class OtherDerived : public Base {};
-
-// Tests that SafeMatcherCast<T>(m) works when m is a polymorphic matcher.
-TEST(SafeMatcherCastTest, FromPolymorphicMatcher) {
-  Matcher<char> m2 = SafeMatcherCast<char>(Eq(32));
-  EXPECT_TRUE(m2.Matches(' '));
-  EXPECT_FALSE(m2.Matches('\n'));
-}
-
-// Tests that SafeMatcherCast<T>(m) works when m is a Matcher<U> where
-// T and U are arithmetic types and T can be losslessly converted to
-// U.
-TEST(SafeMatcherCastTest, FromLosslesslyConvertibleArithmeticType) {
-  Matcher<double> m1 = DoubleEq(1.0);
-  Matcher<float> m2 = SafeMatcherCast<float>(m1);
-  EXPECT_TRUE(m2.Matches(1.0f));
-  EXPECT_FALSE(m2.Matches(2.0f));
-
-  Matcher<char> m3 = SafeMatcherCast<char>(TypedEq<int>('a'));
-  EXPECT_TRUE(m3.Matches('a'));
-  EXPECT_FALSE(m3.Matches('b'));
-}
-
-// Tests that SafeMatcherCast<T>(m) works when m is a Matcher<U> where T and U
-// are pointers or references to a derived and a base class, correspondingly.
-TEST(SafeMatcherCastTest, FromBaseClass) {
-  Derived d, d2;
-  Matcher<Base*> m1 = Eq(&d);
-  Matcher<Derived*> m2 = SafeMatcherCast<Derived*>(m1);
-  EXPECT_TRUE(m2.Matches(&d));
-  EXPECT_FALSE(m2.Matches(&d2));
-
-  Matcher<Base&> m3 = Ref(d);
-  Matcher<Derived&> m4 = SafeMatcherCast<Derived&>(m3);
-  EXPECT_TRUE(m4.Matches(d));
-  EXPECT_FALSE(m4.Matches(d2));
-}
-
-// Tests that SafeMatcherCast<T&>(m) works when m is a Matcher<const T&>.
-TEST(SafeMatcherCastTest, FromConstReferenceToReference) {
-  int n = 0;
-  Matcher<const int&> m1 = Ref(n);
-  Matcher<int&> m2 = SafeMatcherCast<int&>(m1);
-  int n1 = 0;
-  EXPECT_TRUE(m2.Matches(n));
-  EXPECT_FALSE(m2.Matches(n1));
-}
-
-// Tests that MatcherCast<const T&>(m) works when m is a Matcher<T>.
-TEST(SafeMatcherCastTest, FromNonReferenceToConstReference) {
-  Matcher<std::unique_ptr<int>> m1 = IsNull();
-  Matcher<const std::unique_ptr<int>&> m2 =
-      SafeMatcherCast<const std::unique_ptr<int>&>(m1);
-  EXPECT_TRUE(m2.Matches(std::unique_ptr<int>()));
-  EXPECT_FALSE(m2.Matches(std::unique_ptr<int>(new int)));
-}
-
-// Tests that SafeMatcherCast<T&>(m) works when m is a Matcher<T>.
-TEST(SafeMatcherCastTest, FromNonReferenceToReference) {
-  Matcher<int> m1 = Eq(0);
-  Matcher<int&> m2 = SafeMatcherCast<int&>(m1);
-  int n = 0;
-  EXPECT_TRUE(m2.Matches(n));
-  n = 1;
-  EXPECT_FALSE(m2.Matches(n));
-}
-
-// Tests that SafeMatcherCast<T>(m) works when m is a Matcher<T>.
-TEST(SafeMatcherCastTest, FromSameType) {
-  Matcher<int> m1 = Eq(0);
-  Matcher<int> m2 = SafeMatcherCast<int>(m1);
-  EXPECT_TRUE(m2.Matches(0));
-  EXPECT_FALSE(m2.Matches(1));
-}
-
-#if !defined _MSC_VER
-
-namespace convertible_from_any {
-TEST(SafeMatcherCastTest, ConversionConstructorIsUsed) {
-  Matcher<ConvertibleFromAny> m = SafeMatcherCast<ConvertibleFromAny>(1);
-  EXPECT_TRUE(m.Matches(ConvertibleFromAny(1)));
-  EXPECT_FALSE(m.Matches(ConvertibleFromAny(2)));
-}
-
-TEST(SafeMatcherCastTest, FromConvertibleFromAny) {
-  Matcher<ConvertibleFromAny> m =
-      SafeMatcherCast<ConvertibleFromAny>(Eq(ConvertibleFromAny(1)));
-  EXPECT_TRUE(m.Matches(ConvertibleFromAny(1)));
-  EXPECT_FALSE(m.Matches(ConvertibleFromAny(2)));
-}
-}  // namespace convertible_from_any
-
-#endif  // !defined _MSC_VER
-
-TEST(SafeMatcherCastTest, ValueIsNotCopied) {
-  int n = 42;
-  Matcher<IntReferenceWrapper> m = SafeMatcherCast<IntReferenceWrapper>(n);
-  // Verify that the matcher holds a reference to n, not to its temporary copy.
-  EXPECT_TRUE(m.Matches(n));
-}
-
-TEST(ExpectThat, TakesLiterals) {
-  EXPECT_THAT(1, 1);
-  EXPECT_THAT(1.0, 1.0);
-  EXPECT_THAT(std::string(), "");
-}
-
-TEST(ExpectThat, TakesFunctions) {
-  struct Helper {
-    static void Func() {}
-  };
-  void (*func)() = Helper::Func;
-  EXPECT_THAT(func, Helper::Func);
-  EXPECT_THAT(func, &Helper::Func);
-}
-
-// Tests that A<T>() matches any value of type T.
-TEST(ATest, MatchesAnyValue) {
-  // Tests a matcher for a value type.
-  Matcher<double> m1 = A<double>();
-  EXPECT_TRUE(m1.Matches(91.43));
-  EXPECT_TRUE(m1.Matches(-15.32));
-
-  // Tests a matcher for a reference type.
-  int a = 2;
-  int b = -6;
-  Matcher<int&> m2 = A<int&>();
-  EXPECT_TRUE(m2.Matches(a));
-  EXPECT_TRUE(m2.Matches(b));
-}
-
-TEST(ATest, WorksForDerivedClass) {
-  Base base;
-  Derived derived;
-  EXPECT_THAT(&base, A<Base*>());
-  // This shouldn't compile: EXPECT_THAT(&base, A<Derived*>());
-  EXPECT_THAT(&derived, A<Base*>());
-  EXPECT_THAT(&derived, A<Derived*>());
-}
-
-// Tests that A<T>() describes itself properly.
-TEST(ATest, CanDescribeSelf) { EXPECT_EQ("is anything", Describe(A<bool>())); }
-
-// Tests that An<T>() matches any value of type T.
-TEST(AnTest, MatchesAnyValue) {
-  // Tests a matcher for a value type.
-  Matcher<int> m1 = An<int>();
-  EXPECT_TRUE(m1.Matches(9143));
-  EXPECT_TRUE(m1.Matches(-1532));
-
-  // Tests a matcher for a reference type.
-  int a = 2;
-  int b = -6;
-  Matcher<int&> m2 = An<int&>();
-  EXPECT_TRUE(m2.Matches(a));
-  EXPECT_TRUE(m2.Matches(b));
-}
-
-// Tests that An<T>() describes itself properly.
-TEST(AnTest, CanDescribeSelf) { EXPECT_EQ("is anything", Describe(An<int>())); }
-
-// Tests that _ can be used as a matcher for any type and matches any
-// value of that type.
-TEST(UnderscoreTest, MatchesAnyValue) {
-  // Uses _ as a matcher for a value type.
-  Matcher<int> m1 = _;
-  EXPECT_TRUE(m1.Matches(123));
-  EXPECT_TRUE(m1.Matches(-242));
-
-  // Uses _ as a matcher for a reference type.
-  bool a = false;
-  const bool b = true;
-  Matcher<const bool&> m2 = _;
-  EXPECT_TRUE(m2.Matches(a));
-  EXPECT_TRUE(m2.Matches(b));
-}
-
-// Tests that _ describes itself properly.
-TEST(UnderscoreTest, CanDescribeSelf) {
-  Matcher<int> m = _;
-  EXPECT_EQ("is anything", Describe(m));
-}
-
-// Tests that Eq(x) matches any value equal to x.
-TEST(EqTest, MatchesEqualValue) {
-  // 2 C-strings with same content but different addresses.
-  const char a1[] = "hi";
-  const char a2[] = "hi";
-
-  Matcher<const char*> m1 = Eq(a1);
-  EXPECT_TRUE(m1.Matches(a1));
-  EXPECT_FALSE(m1.Matches(a2));
-}
-
-// Tests that Eq(v) describes itself properly.
-
-class Unprintable {
- public:
-  Unprintable() : c_('a') {}
-
-  bool operator==(const Unprintable& /* rhs */) const { return true; }
-  // -Wunused-private-field: dummy accessor for `c_`.
-  char dummy_c() { return c_; }
-
- private:
-  char c_;
-};
-
-TEST(EqTest, CanDescribeSelf) {
-  Matcher<Unprintable> m = Eq(Unprintable());
-  EXPECT_EQ("is equal to 1-byte object <61>", Describe(m));
-}
-
-// Tests that Eq(v) can be used to match any type that supports
-// comparing with type T, where T is v's type.
-TEST(EqTest, IsPolymorphic) {
-  Matcher<int> m1 = Eq(1);
-  EXPECT_TRUE(m1.Matches(1));
-  EXPECT_FALSE(m1.Matches(2));
-
-  Matcher<char> m2 = Eq(1);
-  EXPECT_TRUE(m2.Matches('\1'));
-  EXPECT_FALSE(m2.Matches('a'));
-}
-
-// Tests that TypedEq<T>(v) matches values of type T that's equal to v.
-TEST(TypedEqTest, ChecksEqualityForGivenType) {
-  Matcher<char> m1 = TypedEq<char>('a');
-  EXPECT_TRUE(m1.Matches('a'));
-  EXPECT_FALSE(m1.Matches('b'));
-
-  Matcher<int> m2 = TypedEq<int>(6);
-  EXPECT_TRUE(m2.Matches(6));
-  EXPECT_FALSE(m2.Matches(7));
-}
-
-// Tests that TypedEq(v) describes itself properly.
-TEST(TypedEqTest, CanDescribeSelf) {
-  EXPECT_EQ("is equal to 2", Describe(TypedEq<int>(2)));
-}
-
-// Tests that TypedEq<T>(v) has type Matcher<T>.
-
-// Type<T>::IsTypeOf(v) compiles if and only if the type of value v is T, where
-// T is a "bare" type (i.e. not in the form of const U or U&).  If v's type is
-// not T, the compiler will generate a message about "undefined reference".
-template <typename T>
-struct Type {
-  static bool IsTypeOf(const T& /* v */) { return true; }
-
-  template <typename T2>
-  static void IsTypeOf(T2 v);
-};
-
-TEST(TypedEqTest, HasSpecifiedType) {
-  // Verfies that the type of TypedEq<T>(v) is Matcher<T>.
-  Type<Matcher<int>>::IsTypeOf(TypedEq<int>(5));
-  Type<Matcher<double>>::IsTypeOf(TypedEq<double>(5));
-}
-
-// Tests that Ge(v) matches anything >= v.
-TEST(GeTest, ImplementsGreaterThanOrEqual) {
-  Matcher<int> m1 = Ge(0);
-  EXPECT_TRUE(m1.Matches(1));
-  EXPECT_TRUE(m1.Matches(0));
-  EXPECT_FALSE(m1.Matches(-1));
-}
-
-// Tests that Ge(v) describes itself properly.
-TEST(GeTest, CanDescribeSelf) {
-  Matcher<int> m = Ge(5);
-  EXPECT_EQ("is >= 5", Describe(m));
-}
-
-// Tests that Gt(v) matches anything > v.
-TEST(GtTest, ImplementsGreaterThan) {
-  Matcher<double> m1 = Gt(0);
-  EXPECT_TRUE(m1.Matches(1.0));
-  EXPECT_FALSE(m1.Matches(0.0));
-  EXPECT_FALSE(m1.Matches(-1.0));
-}
-
-// Tests that Gt(v) describes itself properly.
-TEST(GtTest, CanDescribeSelf) {
-  Matcher<int> m = Gt(5);
-  EXPECT_EQ("is > 5", Describe(m));
-}
-
-// Tests that Le(v) matches anything <= v.
-TEST(LeTest, ImplementsLessThanOrEqual) {
-  Matcher<char> m1 = Le('b');
-  EXPECT_TRUE(m1.Matches('a'));
-  EXPECT_TRUE(m1.Matches('b'));
-  EXPECT_FALSE(m1.Matches('c'));
-}
-
-// Tests that Le(v) describes itself properly.
-TEST(LeTest, CanDescribeSelf) {
-  Matcher<int> m = Le(5);
-  EXPECT_EQ("is <= 5", Describe(m));
-}
-
-// Tests that Lt(v) matches anything < v.
-TEST(LtTest, ImplementsLessThan) {
-  Matcher<const std::string&> m1 = Lt("Hello");
-  EXPECT_TRUE(m1.Matches("Abc"));
-  EXPECT_FALSE(m1.Matches("Hello"));
-  EXPECT_FALSE(m1.Matches("Hello, world!"));
-}
-
-// Tests that Lt(v) describes itself properly.
-TEST(LtTest, CanDescribeSelf) {
-  Matcher<int> m = Lt(5);
-  EXPECT_EQ("is < 5", Describe(m));
-}
-
-// Tests that Ne(v) matches anything != v.
-TEST(NeTest, ImplementsNotEqual) {
-  Matcher<int> m1 = Ne(0);
-  EXPECT_TRUE(m1.Matches(1));
-  EXPECT_TRUE(m1.Matches(-1));
-  EXPECT_FALSE(m1.Matches(0));
-}
-
-// Tests that Ne(v) describes itself properly.
-TEST(NeTest, CanDescribeSelf) {
-  Matcher<int> m = Ne(5);
-  EXPECT_EQ("isn't equal to 5", Describe(m));
-}
-
-class MoveOnly {
- public:
-  explicit MoveOnly(int i) : i_(i) {}
-  MoveOnly(const MoveOnly&) = delete;
-  MoveOnly(MoveOnly&&) = default;
-  MoveOnly& operator=(const MoveOnly&) = delete;
-  MoveOnly& operator=(MoveOnly&&) = default;
-
-  bool operator==(const MoveOnly& other) const { return i_ == other.i_; }
-  bool operator!=(const MoveOnly& other) const { return i_ != other.i_; }
-  bool operator<(const MoveOnly& other) const { return i_ < other.i_; }
-  bool operator<=(const MoveOnly& other) const { return i_ <= other.i_; }
-  bool operator>(const MoveOnly& other) const { return i_ > other.i_; }
-  bool operator>=(const MoveOnly& other) const { return i_ >= other.i_; }
-
- private:
-  int i_;
-};
-
-struct MoveHelper {
-  MOCK_METHOD1(Call, void(MoveOnly));
-};
-
-// Disable this test in VS 2015 (version 14), where it fails when SEH is enabled
-#if defined(_MSC_VER) && (_MSC_VER < 1910)
-TEST(ComparisonBaseTest, DISABLED_WorksWithMoveOnly) {
-#else
-TEST(ComparisonBaseTest, WorksWithMoveOnly) {
-#endif
-  MoveOnly m{0};
-  MoveHelper helper;
-
-  EXPECT_CALL(helper, Call(Eq(ByRef(m))));
-  helper.Call(MoveOnly(0));
-  EXPECT_CALL(helper, Call(Ne(ByRef(m))));
-  helper.Call(MoveOnly(1));
-  EXPECT_CALL(helper, Call(Le(ByRef(m))));
-  helper.Call(MoveOnly(0));
-  EXPECT_CALL(helper, Call(Lt(ByRef(m))));
-  helper.Call(MoveOnly(-1));
-  EXPECT_CALL(helper, Call(Ge(ByRef(m))));
-  helper.Call(MoveOnly(0));
-  EXPECT_CALL(helper, Call(Gt(ByRef(m))));
-  helper.Call(MoveOnly(1));
-}
-
-// Tests that IsNull() matches any NULL pointer of any type.
-TEST(IsNullTest, MatchesNullPointer) {
-  Matcher<int*> m1 = IsNull();
-  int* p1 = nullptr;
-  int n = 0;
-  EXPECT_TRUE(m1.Matches(p1));
-  EXPECT_FALSE(m1.Matches(&n));
-
-  Matcher<const char*> m2 = IsNull();
-  const char* p2 = nullptr;
-  EXPECT_TRUE(m2.Matches(p2));
-  EXPECT_FALSE(m2.Matches("hi"));
-
-  Matcher<void*> m3 = IsNull();
-  void* p3 = nullptr;
-  EXPECT_TRUE(m3.Matches(p3));
-  EXPECT_FALSE(m3.Matches(reinterpret_cast<void*>(0xbeef)));
-}
-
-TEST(IsNullTest, StdFunction) {
-  const Matcher<std::function<void()>> m = IsNull();
-
-  EXPECT_TRUE(m.Matches(std::function<void()>()));
-  EXPECT_FALSE(m.Matches([] {}));
-}
-
-// Tests that IsNull() describes itself properly.
-TEST(IsNullTest, CanDescribeSelf) {
-  Matcher<int*> m = IsNull();
-  EXPECT_EQ("is NULL", Describe(m));
-  EXPECT_EQ("isn't NULL", DescribeNegation(m));
-}
-
-// Tests that NotNull() matches any non-NULL pointer of any type.
-TEST(NotNullTest, MatchesNonNullPointer) {
-  Matcher<int*> m1 = NotNull();
-  int* p1 = nullptr;
-  int n = 0;
-  EXPECT_FALSE(m1.Matches(p1));
-  EXPECT_TRUE(m1.Matches(&n));
-
-  Matcher<const char*> m2 = NotNull();
-  const char* p2 = nullptr;
-  EXPECT_FALSE(m2.Matches(p2));
-  EXPECT_TRUE(m2.Matches("hi"));
-}
-
-TEST(NotNullTest, LinkedPtr) {
-  const Matcher<std::shared_ptr<int>> m = NotNull();
-  const std::shared_ptr<int> null_p;
-  const std::shared_ptr<int> non_null_p(new int);
-
-  EXPECT_FALSE(m.Matches(null_p));
-  EXPECT_TRUE(m.Matches(non_null_p));
-}
-
-TEST(NotNullTest, ReferenceToConstLinkedPtr) {
-  const Matcher<const std::shared_ptr<double>&> m = NotNull();
-  const std::shared_ptr<double> null_p;
-  const std::shared_ptr<double> non_null_p(new double);
-
-  EXPECT_FALSE(m.Matches(null_p));
-  EXPECT_TRUE(m.Matches(non_null_p));
-}
-
-TEST(NotNullTest, StdFunction) {
-  const Matcher<std::function<void()>> m = NotNull();
-
-  EXPECT_TRUE(m.Matches([] {}));
-  EXPECT_FALSE(m.Matches(std::function<void()>()));
-}
-
-// Tests that NotNull() describes itself properly.
-TEST(NotNullTest, CanDescribeSelf) {
-  Matcher<int*> m = NotNull();
-  EXPECT_EQ("isn't NULL", Describe(m));
-}
-
-// Tests that Ref(variable) matches an argument that references
-// 'variable'.
-TEST(RefTest, MatchesSameVariable) {
-  int a = 0;
-  int b = 0;
-  Matcher<int&> m = Ref(a);
-  EXPECT_TRUE(m.Matches(a));
-  EXPECT_FALSE(m.Matches(b));
-}
-
-// Tests that Ref(variable) describes itself properly.
-TEST(RefTest, CanDescribeSelf) {
-  int n = 5;
-  Matcher<int&> m = Ref(n);
-  stringstream ss;
-  ss << "references the variable @" << &n << " 5";
-  EXPECT_EQ(ss.str(), Describe(m));
-}
-
-// Test that Ref(non_const_varialbe) can be used as a matcher for a
-// const reference.
-TEST(RefTest, CanBeUsedAsMatcherForConstReference) {
-  int a = 0;
-  int b = 0;
-  Matcher<const int&> m = Ref(a);
-  EXPECT_TRUE(m.Matches(a));
-  EXPECT_FALSE(m.Matches(b));
-}
-
-// Tests that Ref(variable) is covariant, i.e. Ref(derived) can be
-// used wherever Ref(base) can be used (Ref(derived) is a sub-type
-// of Ref(base), but not vice versa.
-
-TEST(RefTest, IsCovariant) {
-  Base base, base2;
-  Derived derived;
-  Matcher<const Base&> m1 = Ref(base);
-  EXPECT_TRUE(m1.Matches(base));
-  EXPECT_FALSE(m1.Matches(base2));
-  EXPECT_FALSE(m1.Matches(derived));
-
-  m1 = Ref(derived);
-  EXPECT_TRUE(m1.Matches(derived));
-  EXPECT_FALSE(m1.Matches(base));
-  EXPECT_FALSE(m1.Matches(base2));
-}
-
-TEST(RefTest, ExplainsResult) {
-  int n = 0;
-  EXPECT_THAT(Explain(Matcher<const int&>(Ref(n)), n),
-              StartsWith("which is located @"));
-
-  int m = 0;
-  EXPECT_THAT(Explain(Matcher<const int&>(Ref(n)), m),
-              StartsWith("which is located @"));
-}
-
-// Tests string comparison matchers.
-
-template <typename T = std::string>
-std::string FromStringLike(internal::StringLike<T> str) {
-  return std::string(str);
-}
-
-TEST(StringLike, TestConversions) {
-  EXPECT_EQ("foo", FromStringLike("foo"));
-  EXPECT_EQ("foo", FromStringLike(std::string("foo")));
-#if GTEST_INTERNAL_HAS_STRING_VIEW
-  EXPECT_EQ("foo", FromStringLike(internal::StringView("foo")));
-#endif  // GTEST_INTERNAL_HAS_STRING_VIEW
-
-  // Non deducible types.
-  EXPECT_EQ("", FromStringLike({}));
-  EXPECT_EQ("foo", FromStringLike({'f', 'o', 'o'}));
-  const char buf[] = "foo";
-  EXPECT_EQ("foo", FromStringLike({buf, buf + 3}));
-}
-
-TEST(StrEqTest, MatchesEqualString) {
-  Matcher<const char*> m = StrEq(std::string("Hello"));
-  EXPECT_TRUE(m.Matches("Hello"));
-  EXPECT_FALSE(m.Matches("hello"));
-  EXPECT_FALSE(m.Matches(nullptr));
-
-  Matcher<const std::string&> m2 = StrEq("Hello");
-  EXPECT_TRUE(m2.Matches("Hello"));
-  EXPECT_FALSE(m2.Matches("Hi"));
-
-#if GTEST_INTERNAL_HAS_STRING_VIEW
-  Matcher<const internal::StringView&> m3 =
-      StrEq(internal::StringView("Hello"));
-  EXPECT_TRUE(m3.Matches(internal::StringView("Hello")));
-  EXPECT_FALSE(m3.Matches(internal::StringView("hello")));
-  EXPECT_FALSE(m3.Matches(internal::StringView()));
-
-  Matcher<const internal::StringView&> m_empty = StrEq("");
-  EXPECT_TRUE(m_empty.Matches(internal::StringView("")));
-  EXPECT_TRUE(m_empty.Matches(internal::StringView()));
-  EXPECT_FALSE(m_empty.Matches(internal::StringView("hello")));
-#endif  // GTEST_INTERNAL_HAS_STRING_VIEW
-}
-
-TEST(StrEqTest, CanDescribeSelf) {
-  Matcher<std::string> m = StrEq("Hi-\'\"?\\\a\b\f\n\r\t\v\xD3");
-  EXPECT_EQ("is equal to \"Hi-\'\\\"?\\\\\\a\\b\\f\\n\\r\\t\\v\\xD3\"",
-            Describe(m));
-
-  std::string str("01204500800");
-  str[3] = '\0';
-  Matcher<std::string> m2 = StrEq(str);
-  EXPECT_EQ("is equal to \"012\\04500800\"", Describe(m2));
-  str[0] = str[6] = str[7] = str[9] = str[10] = '\0';
-  Matcher<std::string> m3 = StrEq(str);
-  EXPECT_EQ("is equal to \"\\012\\045\\0\\08\\0\\0\"", Describe(m3));
-}
-
-TEST(StrNeTest, MatchesUnequalString) {
-  Matcher<const char*> m = StrNe("Hello");
-  EXPECT_TRUE(m.Matches(""));
-  EXPECT_TRUE(m.Matches(nullptr));
-  EXPECT_FALSE(m.Matches("Hello"));
-
-  Matcher<std::string> m2 = StrNe(std::string("Hello"));
-  EXPECT_TRUE(m2.Matches("hello"));
-  EXPECT_FALSE(m2.Matches("Hello"));
-
-#if GTEST_INTERNAL_HAS_STRING_VIEW
-  Matcher<const internal::StringView> m3 = StrNe(internal::StringView("Hello"));
-  EXPECT_TRUE(m3.Matches(internal::StringView("")));
-  EXPECT_TRUE(m3.Matches(internal::StringView()));
-  EXPECT_FALSE(m3.Matches(internal::StringView("Hello")));
-#endif  // GTEST_INTERNAL_HAS_STRING_VIEW
-}
-
-TEST(StrNeTest, CanDescribeSelf) {
-  Matcher<const char*> m = StrNe("Hi");
-  EXPECT_EQ("isn't equal to \"Hi\"", Describe(m));
-}
-
-TEST(StrCaseEqTest, MatchesEqualStringIgnoringCase) {
-  Matcher<const char*> m = StrCaseEq(std::string("Hello"));
-  EXPECT_TRUE(m.Matches("Hello"));
-  EXPECT_TRUE(m.Matches("hello"));
-  EXPECT_FALSE(m.Matches("Hi"));
-  EXPECT_FALSE(m.Matches(nullptr));
-
-  Matcher<const std::string&> m2 = StrCaseEq("Hello");
-  EXPECT_TRUE(m2.Matches("hello"));
-  EXPECT_FALSE(m2.Matches("Hi"));
-
-#if GTEST_INTERNAL_HAS_STRING_VIEW
-  Matcher<const internal::StringView&> m3 =
-      StrCaseEq(internal::StringView("Hello"));
-  EXPECT_TRUE(m3.Matches(internal::StringView("Hello")));
-  EXPECT_TRUE(m3.Matches(internal::StringView("hello")));
-  EXPECT_FALSE(m3.Matches(internal::StringView("Hi")));
-  EXPECT_FALSE(m3.Matches(internal::StringView()));
-#endif  // GTEST_INTERNAL_HAS_STRING_VIEW
-}
-
-TEST(StrCaseEqTest, MatchesEqualStringWith0IgnoringCase) {
-  std::string str1("oabocdooeoo");
-  std::string str2("OABOCDOOEOO");
-  Matcher<const std::string&> m0 = StrCaseEq(str1);
-  EXPECT_FALSE(m0.Matches(str2 + std::string(1, '\0')));
-
-  str1[3] = str2[3] = '\0';
-  Matcher<const std::string&> m1 = StrCaseEq(str1);
-  EXPECT_TRUE(m1.Matches(str2));
-
-  str1[0] = str1[6] = str1[7] = str1[10] = '\0';
-  str2[0] = str2[6] = str2[7] = str2[10] = '\0';
-  Matcher<const std::string&> m2 = StrCaseEq(str1);
-  str1[9] = str2[9] = '\0';
-  EXPECT_FALSE(m2.Matches(str2));
-
-  Matcher<const std::string&> m3 = StrCaseEq(str1);
-  EXPECT_TRUE(m3.Matches(str2));
-
-  EXPECT_FALSE(m3.Matches(str2 + "x"));
-  str2.append(1, '\0');
-  EXPECT_FALSE(m3.Matches(str2));
-  EXPECT_FALSE(m3.Matches(std::string(str2, 0, 9)));
-}
-
-TEST(StrCaseEqTest, CanDescribeSelf) {
-  Matcher<std::string> m = StrCaseEq("Hi");
-  EXPECT_EQ("is equal to (ignoring case) \"Hi\"", Describe(m));
-}
-
-TEST(StrCaseNeTest, MatchesUnequalStringIgnoringCase) {
-  Matcher<const char*> m = StrCaseNe("Hello");
-  EXPECT_TRUE(m.Matches("Hi"));
-  EXPECT_TRUE(m.Matches(nullptr));
-  EXPECT_FALSE(m.Matches("Hello"));
-  EXPECT_FALSE(m.Matches("hello"));
-
-  Matcher<std::string> m2 = StrCaseNe(std::string("Hello"));
-  EXPECT_TRUE(m2.Matches(""));
-  EXPECT_FALSE(m2.Matches("Hello"));
-
-#if GTEST_INTERNAL_HAS_STRING_VIEW
-  Matcher<const internal::StringView> m3 =
-      StrCaseNe(internal::StringView("Hello"));
-  EXPECT_TRUE(m3.Matches(internal::StringView("Hi")));
-  EXPECT_TRUE(m3.Matches(internal::StringView()));
-  EXPECT_FALSE(m3.Matches(internal::StringView("Hello")));
-  EXPECT_FALSE(m3.Matches(internal::StringView("hello")));
-#endif  // GTEST_INTERNAL_HAS_STRING_VIEW
-}
-
-TEST(StrCaseNeTest, CanDescribeSelf) {
-  Matcher<const char*> m = StrCaseNe("Hi");
-  EXPECT_EQ("isn't equal to (ignoring case) \"Hi\"", Describe(m));
-}
-
-// Tests that HasSubstr() works for matching string-typed values.
-TEST(HasSubstrTest, WorksForStringClasses) {
-  const Matcher<std::string> m1 = HasSubstr("foo");
-  EXPECT_TRUE(m1.Matches(std::string("I love food.")));
-  EXPECT_FALSE(m1.Matches(std::string("tofo")));
-
-  const Matcher<const std::string&> m2 = HasSubstr("foo");
-  EXPECT_TRUE(m2.Matches(std::string("I love food.")));
-  EXPECT_FALSE(m2.Matches(std::string("tofo")));
-
-  const Matcher<std::string> m_empty = HasSubstr("");
-  EXPECT_TRUE(m_empty.Matches(std::string()));
-  EXPECT_TRUE(m_empty.Matches(std::string("not empty")));
-}
-
-// Tests that HasSubstr() works for matching C-string-typed values.
-TEST(HasSubstrTest, WorksForCStrings) {
-  const Matcher<char*> m1 = HasSubstr("foo");
-  EXPECT_TRUE(m1.Matches(const_cast<char*>("I love food.")));
-  EXPECT_FALSE(m1.Matches(const_cast<char*>("tofo")));
-  EXPECT_FALSE(m1.Matches(nullptr));
-
-  const Matcher<const char*> m2 = HasSubstr("foo");
-  EXPECT_TRUE(m2.Matches("I love food."));
-  EXPECT_FALSE(m2.Matches("tofo"));
-  EXPECT_FALSE(m2.Matches(nullptr));
-
-  const Matcher<const char*> m_empty = HasSubstr("");
-  EXPECT_TRUE(m_empty.Matches("not empty"));
-  EXPECT_TRUE(m_empty.Matches(""));
-  EXPECT_FALSE(m_empty.Matches(nullptr));
-}
-
-#if GTEST_INTERNAL_HAS_STRING_VIEW
-// Tests that HasSubstr() works for matching StringView-typed values.
-TEST(HasSubstrTest, WorksForStringViewClasses) {
-  const Matcher<internal::StringView> m1 =
-      HasSubstr(internal::StringView("foo"));
-  EXPECT_TRUE(m1.Matches(internal::StringView("I love food.")));
-  EXPECT_FALSE(m1.Matches(internal::StringView("tofo")));
-  EXPECT_FALSE(m1.Matches(internal::StringView()));
-
-  const Matcher<const internal::StringView&> m2 = HasSubstr("foo");
-  EXPECT_TRUE(m2.Matches(internal::StringView("I love food.")));
-  EXPECT_FALSE(m2.Matches(internal::StringView("tofo")));
-  EXPECT_FALSE(m2.Matches(internal::StringView()));
-
-  const Matcher<const internal::StringView&> m3 = HasSubstr("");
-  EXPECT_TRUE(m3.Matches(internal::StringView("foo")));
-  EXPECT_TRUE(m3.Matches(internal::StringView("")));
-  EXPECT_TRUE(m3.Matches(internal::StringView()));
-}
-#endif  // GTEST_INTERNAL_HAS_STRING_VIEW
-
-// Tests that HasSubstr(s) describes itself properly.
-TEST(HasSubstrTest, CanDescribeSelf) {
-  Matcher<std::string> m = HasSubstr("foo\n\"");
-  EXPECT_EQ("has substring \"foo\\n\\\"\"", Describe(m));
-}
-
-TEST(KeyTest, CanDescribeSelf) {
-  Matcher<const pair<std::string, int>&> m = Key("foo");
-  EXPECT_EQ("has a key that is equal to \"foo\"", Describe(m));
-  EXPECT_EQ("doesn't have a key that is equal to \"foo\"", DescribeNegation(m));
-}
-
-TEST(KeyTest, ExplainsResult) {
-  Matcher<pair<int, bool>> m = Key(GreaterThan(10));
-  EXPECT_EQ("whose first field is a value which is 5 less than 10",
-            Explain(m, make_pair(5, true)));
-  EXPECT_EQ("whose first field is a value which is 5 more than 10",
-            Explain(m, make_pair(15, true)));
-}
-
-TEST(KeyTest, MatchesCorrectly) {
-  pair<int, std::string> p(25, "foo");
-  EXPECT_THAT(p, Key(25));
-  EXPECT_THAT(p, Not(Key(42)));
-  EXPECT_THAT(p, Key(Ge(20)));
-  EXPECT_THAT(p, Not(Key(Lt(25))));
-}
-
-TEST(KeyTest, WorksWithMoveOnly) {
-  pair<std::unique_ptr<int>, std::unique_ptr<int>> p;
-  EXPECT_THAT(p, Key(Eq(nullptr)));
-}
-
-template <size_t I>
-struct Tag {};
-
-struct PairWithGet {
-  int member_1;
-  std::string member_2;
-  using first_type = int;
-  using second_type = std::string;
-
-  const int& GetImpl(Tag<0>) const { return member_1; }
-  const std::string& GetImpl(Tag<1>) const { return member_2; }
-};
-template <size_t I>
-auto get(const PairWithGet& value) -> decltype(value.GetImpl(Tag<I>())) {
-  return value.GetImpl(Tag<I>());
-}
-TEST(PairTest, MatchesPairWithGetCorrectly) {
-  PairWithGet p{25, "foo"};
-  EXPECT_THAT(p, Key(25));
-  EXPECT_THAT(p, Not(Key(42)));
-  EXPECT_THAT(p, Key(Ge(20)));
-  EXPECT_THAT(p, Not(Key(Lt(25))));
-
-  std::vector<PairWithGet> v = {{11, "Foo"}, {29, "gMockIsBestMock"}};
-  EXPECT_THAT(v, Contains(Key(29)));
-}
-
-TEST(KeyTest, SafelyCastsInnerMatcher) {
-  Matcher<int> is_positive = Gt(0);
-  Matcher<int> is_negative = Lt(0);
-  pair<char, bool> p('a', true);
-  EXPECT_THAT(p, Key(is_positive));
-  EXPECT_THAT(p, Not(Key(is_negative)));
-}
-
-TEST(KeyTest, InsideContainsUsingMap) {
-  map<int, char> container;
-  container.insert(make_pair(1, 'a'));
-  container.insert(make_pair(2, 'b'));
-  container.insert(make_pair(4, 'c'));
-  EXPECT_THAT(container, Contains(Key(1)));
-  EXPECT_THAT(container, Not(Contains(Key(3))));
-}
-
-TEST(KeyTest, InsideContainsUsingMultimap) {
-  multimap<int, char> container;
-  container.insert(make_pair(1, 'a'));
-  container.insert(make_pair(2, 'b'));
-  container.insert(make_pair(4, 'c'));
-
-  EXPECT_THAT(container, Not(Contains(Key(25))));
-  container.insert(make_pair(25, 'd'));
-  EXPECT_THAT(container, Contains(Key(25)));
-  container.insert(make_pair(25, 'e'));
-  EXPECT_THAT(container, Contains(Key(25)));
-
-  EXPECT_THAT(container, Contains(Key(1)));
-  EXPECT_THAT(container, Not(Contains(Key(3))));
-}
-
-TEST(PairTest, Typing) {
-  // Test verifies the following type conversions can be compiled.
-  Matcher<const pair<const char*, int>&> m1 = Pair("foo", 42);
-  Matcher<const pair<const char*, int>> m2 = Pair("foo", 42);
-  Matcher<pair<const char*, int>> m3 = Pair("foo", 42);
-
-  Matcher<pair<int, const std::string>> m4 = Pair(25, "42");
-  Matcher<pair<const std::string, int>> m5 = Pair("25", 42);
-}
-
-TEST(PairTest, CanDescribeSelf) {
-  Matcher<const pair<std::string, int>&> m1 = Pair("foo", 42);
-  EXPECT_EQ(
-      "has a first field that is equal to \"foo\""
-      ", and has a second field that is equal to 42",
-      Describe(m1));
-  EXPECT_EQ(
-      "has a first field that isn't equal to \"foo\""
-      ", or has a second field that isn't equal to 42",
-      DescribeNegation(m1));
-  // Double and triple negation (1 or 2 times not and description of negation).
-  Matcher<const pair<int, int>&> m2 = Not(Pair(Not(13), 42));
-  EXPECT_EQ(
-      "has a first field that isn't equal to 13"
-      ", and has a second field that is equal to 42",
-      DescribeNegation(m2));
-}
-
-TEST(PairTest, CanExplainMatchResultTo) {
-  // If neither field matches, Pair() should explain about the first
-  // field.
-  const Matcher<pair<int, int>> m = Pair(GreaterThan(0), GreaterThan(0));
-  EXPECT_EQ("whose first field does not match, which is 1 less than 0",
-            Explain(m, make_pair(-1, -2)));
-
-  // If the first field matches but the second doesn't, Pair() should
-  // explain about the second field.
-  EXPECT_EQ("whose second field does not match, which is 2 less than 0",
-            Explain(m, make_pair(1, -2)));
-
-  // If the first field doesn't match but the second does, Pair()
-  // should explain about the first field.
-  EXPECT_EQ("whose first field does not match, which is 1 less than 0",
-            Explain(m, make_pair(-1, 2)));
-
-  // If both fields match, Pair() should explain about them both.
-  EXPECT_EQ(
-      "whose both fields match, where the first field is a value "
-      "which is 1 more than 0, and the second field is a value "
-      "which is 2 more than 0",
-      Explain(m, make_pair(1, 2)));
-
-  // If only the first match has an explanation, only this explanation should
-  // be printed.
-  const Matcher<pair<int, int>> explain_first = Pair(GreaterThan(0), 0);
-  EXPECT_EQ(
-      "whose both fields match, where the first field is a value "
-      "which is 1 more than 0",
-      Explain(explain_first, make_pair(1, 0)));
-
-  // If only the second match has an explanation, only this explanation should
-  // be printed.
-  const Matcher<pair<int, int>> explain_second = Pair(0, GreaterThan(0));
-  EXPECT_EQ(
-      "whose both fields match, where the second field is a value "
-      "which is 1 more than 0",
-      Explain(explain_second, make_pair(0, 1)));
-}
-
-TEST(PairTest, MatchesCorrectly) {
-  pair<int, std::string> p(25, "foo");
-
-  // Both fields match.
-  EXPECT_THAT(p, Pair(25, "foo"));
-  EXPECT_THAT(p, Pair(Ge(20), HasSubstr("o")));
-
-  // 'first' doesnt' match, but 'second' matches.
-  EXPECT_THAT(p, Not(Pair(42, "foo")));
-  EXPECT_THAT(p, Not(Pair(Lt(25), "foo")));
-
-  // 'first' matches, but 'second' doesn't match.
-  EXPECT_THAT(p, Not(Pair(25, "bar")));
-  EXPECT_THAT(p, Not(Pair(25, Not("foo"))));
-
-  // Neither field matches.
-  EXPECT_THAT(p, Not(Pair(13, "bar")));
-  EXPECT_THAT(p, Not(Pair(Lt(13), HasSubstr("a"))));
-}
-
-TEST(PairTest, WorksWithMoveOnly) {
-  pair<std::unique_ptr<int>, std::unique_ptr<int>> p;
-  p.second.reset(new int(7));
-  EXPECT_THAT(p, Pair(Eq(nullptr), Ne(nullptr)));
-}
-
-TEST(PairTest, SafelyCastsInnerMatchers) {
-  Matcher<int> is_positive = Gt(0);
-  Matcher<int> is_negative = Lt(0);
-  pair<char, bool> p('a', true);
-  EXPECT_THAT(p, Pair(is_positive, _));
-  EXPECT_THAT(p, Not(Pair(is_negative, _)));
-  EXPECT_THAT(p, Pair(_, is_positive));
-  EXPECT_THAT(p, Not(Pair(_, is_negative)));
-}
-
-TEST(PairTest, InsideContainsUsingMap) {
-  map<int, char> container;
-  container.insert(make_pair(1, 'a'));
-  container.insert(make_pair(2, 'b'));
-  container.insert(make_pair(4, 'c'));
-  EXPECT_THAT(container, Contains(Pair(1, 'a')));
-  EXPECT_THAT(container, Contains(Pair(1, _)));
-  EXPECT_THAT(container, Contains(Pair(_, 'a')));
-  EXPECT_THAT(container, Not(Contains(Pair(3, _))));
-}
-
-TEST(FieldsAreTest, MatchesCorrectly) {
-  std::tuple<int, std::string, double> p(25, "foo", .5);
-
-  // All fields match.
-  EXPECT_THAT(p, FieldsAre(25, "foo", .5));
-  EXPECT_THAT(p, FieldsAre(Ge(20), HasSubstr("o"), DoubleEq(.5)));
-
-  // Some don't match.
-  EXPECT_THAT(p, Not(FieldsAre(26, "foo", .5)));
-  EXPECT_THAT(p, Not(FieldsAre(25, "fo", .5)));
-  EXPECT_THAT(p, Not(FieldsAre(25, "foo", .6)));
-}
-
-TEST(FieldsAreTest, CanDescribeSelf) {
-  Matcher<const pair<std::string, int>&> m1 = FieldsAre("foo", 42);
-  EXPECT_EQ(
-      "has field #0 that is equal to \"foo\""
-      ", and has field #1 that is equal to 42",
-      Describe(m1));
-  EXPECT_EQ(
-      "has field #0 that isn't equal to \"foo\""
-      ", or has field #1 that isn't equal to 42",
-      DescribeNegation(m1));
-}
-
-TEST(FieldsAreTest, CanExplainMatchResultTo) {
-  // The first one that fails is the one that gives the error.
-  Matcher<std::tuple<int, int, int>> m =
-      FieldsAre(GreaterThan(0), GreaterThan(0), GreaterThan(0));
-
-  EXPECT_EQ("whose field #0 does not match, which is 1 less than 0",
-            Explain(m, std::make_tuple(-1, -2, -3)));
-  EXPECT_EQ("whose field #1 does not match, which is 2 less than 0",
-            Explain(m, std::make_tuple(1, -2, -3)));
-  EXPECT_EQ("whose field #2 does not match, which is 3 less than 0",
-            Explain(m, std::make_tuple(1, 2, -3)));
-
-  // If they all match, we get a long explanation of success.
-  EXPECT_EQ(
-      "whose all elements match, "
-      "where field #0 is a value which is 1 more than 0"
-      ", and field #1 is a value which is 2 more than 0"
-      ", and field #2 is a value which is 3 more than 0",
-      Explain(m, std::make_tuple(1, 2, 3)));
-
-  // Only print those that have an explanation.
-  m = FieldsAre(GreaterThan(0), 0, GreaterThan(0));
-  EXPECT_EQ(
-      "whose all elements match, "
-      "where field #0 is a value which is 1 more than 0"
-      ", and field #2 is a value which is 3 more than 0",
-      Explain(m, std::make_tuple(1, 0, 3)));
-
-  // If only one has an explanation, then print that one.
-  m = FieldsAre(0, GreaterThan(0), 0);
-  EXPECT_EQ(
-      "whose all elements match, "
-      "where field #1 is a value which is 1 more than 0",
-      Explain(m, std::make_tuple(0, 1, 0)));
-}
-
-#if defined(__cpp_structured_bindings) && __cpp_structured_bindings >= 201606
-TEST(FieldsAreTest, StructuredBindings) {
-  // testing::FieldsAre can also match aggregates and such with C++17 and up.
-  struct MyType {
-    int i;
-    std::string str;
-  };
-  EXPECT_THAT((MyType{17, "foo"}), FieldsAre(Eq(17), HasSubstr("oo")));
-
-  // Test all the supported arities.
-  struct MyVarType1 {
-    int a;
-  };
-  EXPECT_THAT(MyVarType1{}, FieldsAre(0));
-  struct MyVarType2 {
-    int a, b;
-  };
-  EXPECT_THAT(MyVarType2{}, FieldsAre(0, 0));
-  struct MyVarType3 {
-    int a, b, c;
-  };
-  EXPECT_THAT(MyVarType3{}, FieldsAre(0, 0, 0));
-  struct MyVarType4 {
-    int a, b, c, d;
-  };
-  EXPECT_THAT(MyVarType4{}, FieldsAre(0, 0, 0, 0));
-  struct MyVarType5 {
-    int a, b, c, d, e;
-  };
-  EXPECT_THAT(MyVarType5{}, FieldsAre(0, 0, 0, 0, 0));
-  struct MyVarType6 {
-    int a, b, c, d, e, f;
-  };
-  EXPECT_THAT(MyVarType6{}, FieldsAre(0, 0, 0, 0, 0, 0));
-  struct MyVarType7 {
-    int a, b, c, d, e, f, g;
-  };
-  EXPECT_THAT(MyVarType7{}, FieldsAre(0, 0, 0, 0, 0, 0, 0));
-  struct MyVarType8 {
-    int a, b, c, d, e, f, g, h;
-  };
-  EXPECT_THAT(MyVarType8{}, FieldsAre(0, 0, 0, 0, 0, 0, 0, 0));
-  struct MyVarType9 {
-    int a, b, c, d, e, f, g, h, i;
-  };
-  EXPECT_THAT(MyVarType9{}, FieldsAre(0, 0, 0, 0, 0, 0, 0, 0, 0));
-  struct MyVarType10 {
-    int a, b, c, d, e, f, g, h, i, j;
-  };
-  EXPECT_THAT(MyVarType10{}, FieldsAre(0, 0, 0, 0, 0, 0, 0, 0, 0, 0));
-  struct MyVarType11 {
-    int a, b, c, d, e, f, g, h, i, j, k;
-  };
-  EXPECT_THAT(MyVarType11{}, FieldsAre(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0));
-  struct MyVarType12 {
-    int a, b, c, d, e, f, g, h, i, j, k, l;
-  };
-  EXPECT_THAT(MyVarType12{}, FieldsAre(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0));
-  struct MyVarType13 {
-    int a, b, c, d, e, f, g, h, i, j, k, l, m;
-  };
-  EXPECT_THAT(MyVarType13{}, FieldsAre(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0));
-  struct MyVarType14 {
-    int a, b, c, d, e, f, g, h, i, j, k, l, m, n;
-  };
-  EXPECT_THAT(MyVarType14{},
-              FieldsAre(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0));
-  struct MyVarType15 {
-    int a, b, c, d, e, f, g, h, i, j, k, l, m, n, o;
-  };
-  EXPECT_THAT(MyVarType15{},
-              FieldsAre(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0));
-  struct MyVarType16 {
-    int a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p;
-  };
-  EXPECT_THAT(MyVarType16{},
-              FieldsAre(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0));
-}
-#endif
-
-TEST(ContainsTest, WorksWithMoveOnly) {
-  ContainerHelper helper;
-  EXPECT_CALL(helper, Call(Contains(Pointee(2))));
-  helper.Call(MakeUniquePtrs({1, 2}));
-}
-
-TEST(PairTest, UseGetInsteadOfMembers) {
-  PairWithGet pair{7, "ABC"};
-  EXPECT_THAT(pair, Pair(7, "ABC"));
-  EXPECT_THAT(pair, Pair(Ge(7), HasSubstr("AB")));
-  EXPECT_THAT(pair, Not(Pair(Lt(7), "ABC")));
-
-  std::vector<PairWithGet> v = {{11, "Foo"}, {29, "gMockIsBestMock"}};
-  EXPECT_THAT(v,
-              ElementsAre(Pair(11, std::string("Foo")), Pair(Ge(10), Not(""))));
-}
-
-// Tests StartsWith(s).
-
-TEST(StartsWithTest, MatchesStringWithGivenPrefix) {
-  const Matcher<const char*> m1 = StartsWith(std::string(""));
-  EXPECT_TRUE(m1.Matches("Hi"));
-  EXPECT_TRUE(m1.Matches(""));
-  EXPECT_FALSE(m1.Matches(nullptr));
-
-  const Matcher<const std::string&> m2 = StartsWith("Hi");
-  EXPECT_TRUE(m2.Matches("Hi"));
-  EXPECT_TRUE(m2.Matches("Hi Hi!"));
-  EXPECT_TRUE(m2.Matches("High"));
-  EXPECT_FALSE(m2.Matches("H"));
-  EXPECT_FALSE(m2.Matches(" Hi"));
-
-#if GTEST_INTERNAL_HAS_STRING_VIEW
-  const Matcher<internal::StringView> m_empty =
-      StartsWith(internal::StringView(""));
-  EXPECT_TRUE(m_empty.Matches(internal::StringView()));
-  EXPECT_TRUE(m_empty.Matches(internal::StringView("")));
-  EXPECT_TRUE(m_empty.Matches(internal::StringView("not empty")));
-#endif  // GTEST_INTERNAL_HAS_STRING_VIEW
-}
-
-TEST(StartsWithTest, CanDescribeSelf) {
-  Matcher<const std::string> m = StartsWith("Hi");
-  EXPECT_EQ("starts with \"Hi\"", Describe(m));
-}
-
-// Tests EndsWith(s).
-
-TEST(EndsWithTest, MatchesStringWithGivenSuffix) {
-  const Matcher<const char*> m1 = EndsWith("");
-  EXPECT_TRUE(m1.Matches("Hi"));
-  EXPECT_TRUE(m1.Matches(""));
-  EXPECT_FALSE(m1.Matches(nullptr));
-
-  const Matcher<const std::string&> m2 = EndsWith(std::string("Hi"));
-  EXPECT_TRUE(m2.Matches("Hi"));
-  EXPECT_TRUE(m2.Matches("Wow Hi Hi"));
-  EXPECT_TRUE(m2.Matches("Super Hi"));
-  EXPECT_FALSE(m2.Matches("i"));
-  EXPECT_FALSE(m2.Matches("Hi "));
-
-#if GTEST_INTERNAL_HAS_STRING_VIEW
-  const Matcher<const internal::StringView&> m4 =
-      EndsWith(internal::StringView(""));
-  EXPECT_TRUE(m4.Matches("Hi"));
-  EXPECT_TRUE(m4.Matches(""));
-  EXPECT_TRUE(m4.Matches(internal::StringView()));
-  EXPECT_TRUE(m4.Matches(internal::StringView("")));
-#endif  // GTEST_INTERNAL_HAS_STRING_VIEW
-}
-
-TEST(EndsWithTest, CanDescribeSelf) {
-  Matcher<const std::string> m = EndsWith("Hi");
-  EXPECT_EQ("ends with \"Hi\"", Describe(m));
-}
-
-// Tests MatchesRegex().
-
-TEST(MatchesRegexTest, MatchesStringMatchingGivenRegex) {
-  const Matcher<const char*> m1 = MatchesRegex("a.*z");
-  EXPECT_TRUE(m1.Matches("az"));
-  EXPECT_TRUE(m1.Matches("abcz"));
-  EXPECT_FALSE(m1.Matches(nullptr));
-
-  const Matcher<const std::string&> m2 = MatchesRegex(new RE("a.*z"));
-  EXPECT_TRUE(m2.Matches("azbz"));
-  EXPECT_FALSE(m2.Matches("az1"));
-  EXPECT_FALSE(m2.Matches("1az"));
-
-#if GTEST_INTERNAL_HAS_STRING_VIEW
-  const Matcher<const internal::StringView&> m3 = MatchesRegex("a.*z");
-  EXPECT_TRUE(m3.Matches(internal::StringView("az")));
-  EXPECT_TRUE(m3.Matches(internal::StringView("abcz")));
-  EXPECT_FALSE(m3.Matches(internal::StringView("1az")));
-  EXPECT_FALSE(m3.Matches(internal::StringView()));
-  const Matcher<const internal::StringView&> m4 =
-      MatchesRegex(internal::StringView(""));
-  EXPECT_TRUE(m4.Matches(internal::StringView("")));
-  EXPECT_TRUE(m4.Matches(internal::StringView()));
-#endif  // GTEST_INTERNAL_HAS_STRING_VIEW
-}
-
-TEST(MatchesRegexTest, CanDescribeSelf) {
-  Matcher<const std::string> m1 = MatchesRegex(std::string("Hi.*"));
-  EXPECT_EQ("matches regular expression \"Hi.*\"", Describe(m1));
-
-  Matcher<const char*> m2 = MatchesRegex(new RE("a.*"));
-  EXPECT_EQ("matches regular expression \"a.*\"", Describe(m2));
-
-#if GTEST_INTERNAL_HAS_STRING_VIEW
-  Matcher<const internal::StringView> m3 = MatchesRegex(new RE("0.*"));
-  EXPECT_EQ("matches regular expression \"0.*\"", Describe(m3));
-#endif  // GTEST_INTERNAL_HAS_STRING_VIEW
-}
-
-// Tests ContainsRegex().
-
-TEST(ContainsRegexTest, MatchesStringContainingGivenRegex) {
-  const Matcher<const char*> m1 = ContainsRegex(std::string("a.*z"));
-  EXPECT_TRUE(m1.Matches("az"));
-  EXPECT_TRUE(m1.Matches("0abcz1"));
-  EXPECT_FALSE(m1.Matches(nullptr));
-
-  const Matcher<const std::string&> m2 = ContainsRegex(new RE("a.*z"));
-  EXPECT_TRUE(m2.Matches("azbz"));
-  EXPECT_TRUE(m2.Matches("az1"));
-  EXPECT_FALSE(m2.Matches("1a"));
-
-#if GTEST_INTERNAL_HAS_STRING_VIEW
-  const Matcher<const internal::StringView&> m3 = ContainsRegex(new RE("a.*z"));
-  EXPECT_TRUE(m3.Matches(internal::StringView("azbz")));
-  EXPECT_TRUE(m3.Matches(internal::StringView("az1")));
-  EXPECT_FALSE(m3.Matches(internal::StringView("1a")));
-  EXPECT_FALSE(m3.Matches(internal::StringView()));
-  const Matcher<const internal::StringView&> m4 =
-      ContainsRegex(internal::StringView(""));
-  EXPECT_TRUE(m4.Matches(internal::StringView("")));
-  EXPECT_TRUE(m4.Matches(internal::StringView()));
-#endif  // GTEST_INTERNAL_HAS_STRING_VIEW
-}
-
-TEST(ContainsRegexTest, CanDescribeSelf) {
-  Matcher<const std::string> m1 = ContainsRegex("Hi.*");
-  EXPECT_EQ("contains regular expression \"Hi.*\"", Describe(m1));
-
-  Matcher<const char*> m2 = ContainsRegex(new RE("a.*"));
-  EXPECT_EQ("contains regular expression \"a.*\"", Describe(m2));
-
-#if GTEST_INTERNAL_HAS_STRING_VIEW
-  Matcher<const internal::StringView> m3 = ContainsRegex(new RE("0.*"));
-  EXPECT_EQ("contains regular expression \"0.*\"", Describe(m3));
-#endif  // GTEST_INTERNAL_HAS_STRING_VIEW
-}
-
-// Tests for wide strings.
-#if GTEST_HAS_STD_WSTRING
-TEST(StdWideStrEqTest, MatchesEqual) {
-  Matcher<const wchar_t*> m = StrEq(::std::wstring(L"Hello"));
-  EXPECT_TRUE(m.Matches(L"Hello"));
-  EXPECT_FALSE(m.Matches(L"hello"));
-  EXPECT_FALSE(m.Matches(nullptr));
-
-  Matcher<const ::std::wstring&> m2 = StrEq(L"Hello");
-  EXPECT_TRUE(m2.Matches(L"Hello"));
-  EXPECT_FALSE(m2.Matches(L"Hi"));
-
-  Matcher<const ::std::wstring&> m3 = StrEq(L"\xD3\x576\x8D3\xC74D");
-  EXPECT_TRUE(m3.Matches(L"\xD3\x576\x8D3\xC74D"));
-  EXPECT_FALSE(m3.Matches(L"\xD3\x576\x8D3\xC74E"));
-
-  ::std::wstring str(L"01204500800");
-  str[3] = L'\0';
-  Matcher<const ::std::wstring&> m4 = StrEq(str);
-  EXPECT_TRUE(m4.Matches(str));
-  str[0] = str[6] = str[7] = str[9] = str[10] = L'\0';
-  Matcher<const ::std::wstring&> m5 = StrEq(str);
-  EXPECT_TRUE(m5.Matches(str));
-}
-
-TEST(StdWideStrEqTest, CanDescribeSelf) {
-  Matcher<::std::wstring> m = StrEq(L"Hi-\'\"?\\\a\b\f\n\r\t\v");
-  EXPECT_EQ("is equal to L\"Hi-\'\\\"?\\\\\\a\\b\\f\\n\\r\\t\\v\"",
-            Describe(m));
-
-  Matcher<::std::wstring> m2 = StrEq(L"\xD3\x576\x8D3\xC74D");
-  EXPECT_EQ("is equal to L\"\\xD3\\x576\\x8D3\\xC74D\"", Describe(m2));
-
-  ::std::wstring str(L"01204500800");
-  str[3] = L'\0';
-  Matcher<const ::std::wstring&> m4 = StrEq(str);
-  EXPECT_EQ("is equal to L\"012\\04500800\"", Describe(m4));
-  str[0] = str[6] = str[7] = str[9] = str[10] = L'\0';
-  Matcher<const ::std::wstring&> m5 = StrEq(str);
-  EXPECT_EQ("is equal to L\"\\012\\045\\0\\08\\0\\0\"", Describe(m5));
-}
-
-TEST(StdWideStrNeTest, MatchesUnequalString) {
-  Matcher<const wchar_t*> m = StrNe(L"Hello");
-  EXPECT_TRUE(m.Matches(L""));
-  EXPECT_TRUE(m.Matches(nullptr));
-  EXPECT_FALSE(m.Matches(L"Hello"));
-
-  Matcher<::std::wstring> m2 = StrNe(::std::wstring(L"Hello"));
-  EXPECT_TRUE(m2.Matches(L"hello"));
-  EXPECT_FALSE(m2.Matches(L"Hello"));
-}
-
-TEST(StdWideStrNeTest, CanDescribeSelf) {
-  Matcher<const wchar_t*> m = StrNe(L"Hi");
-  EXPECT_EQ("isn't equal to L\"Hi\"", Describe(m));
-}
-
-TEST(StdWideStrCaseEqTest, MatchesEqualStringIgnoringCase) {
-  Matcher<const wchar_t*> m = StrCaseEq(::std::wstring(L"Hello"));
-  EXPECT_TRUE(m.Matches(L"Hello"));
-  EXPECT_TRUE(m.Matches(L"hello"));
-  EXPECT_FALSE(m.Matches(L"Hi"));
-  EXPECT_FALSE(m.Matches(nullptr));
-
-  Matcher<const ::std::wstring&> m2 = StrCaseEq(L"Hello");
-  EXPECT_TRUE(m2.Matches(L"hello"));
-  EXPECT_FALSE(m2.Matches(L"Hi"));
-}
-
-TEST(StdWideStrCaseEqTest, MatchesEqualStringWith0IgnoringCase) {
-  ::std::wstring str1(L"oabocdooeoo");
-  ::std::wstring str2(L"OABOCDOOEOO");
-  Matcher<const ::std::wstring&> m0 = StrCaseEq(str1);
-  EXPECT_FALSE(m0.Matches(str2 + ::std::wstring(1, L'\0')));
-
-  str1[3] = str2[3] = L'\0';
-  Matcher<const ::std::wstring&> m1 = StrCaseEq(str1);
-  EXPECT_TRUE(m1.Matches(str2));
-
-  str1[0] = str1[6] = str1[7] = str1[10] = L'\0';
-  str2[0] = str2[6] = str2[7] = str2[10] = L'\0';
-  Matcher<const ::std::wstring&> m2 = StrCaseEq(str1);
-  str1[9] = str2[9] = L'\0';
-  EXPECT_FALSE(m2.Matches(str2));
-
-  Matcher<const ::std::wstring&> m3 = StrCaseEq(str1);
-  EXPECT_TRUE(m3.Matches(str2));
-
-  EXPECT_FALSE(m3.Matches(str2 + L"x"));
-  str2.append(1, L'\0');
-  EXPECT_FALSE(m3.Matches(str2));
-  EXPECT_FALSE(m3.Matches(::std::wstring(str2, 0, 9)));
-}
-
-TEST(StdWideStrCaseEqTest, CanDescribeSelf) {
-  Matcher<::std::wstring> m = StrCaseEq(L"Hi");
-  EXPECT_EQ("is equal to (ignoring case) L\"Hi\"", Describe(m));
-}
-
-TEST(StdWideStrCaseNeTest, MatchesUnequalStringIgnoringCase) {
-  Matcher<const wchar_t*> m = StrCaseNe(L"Hello");
-  EXPECT_TRUE(m.Matches(L"Hi"));
-  EXPECT_TRUE(m.Matches(nullptr));
-  EXPECT_FALSE(m.Matches(L"Hello"));
-  EXPECT_FALSE(m.Matches(L"hello"));
-
-  Matcher<::std::wstring> m2 = StrCaseNe(::std::wstring(L"Hello"));
-  EXPECT_TRUE(m2.Matches(L""));
-  EXPECT_FALSE(m2.Matches(L"Hello"));
-}
-
-TEST(StdWideStrCaseNeTest, CanDescribeSelf) {
-  Matcher<const wchar_t*> m = StrCaseNe(L"Hi");
-  EXPECT_EQ("isn't equal to (ignoring case) L\"Hi\"", Describe(m));
-}
-
-// Tests that HasSubstr() works for matching wstring-typed values.
-TEST(StdWideHasSubstrTest, WorksForStringClasses) {
-  const Matcher<::std::wstring> m1 = HasSubstr(L"foo");
-  EXPECT_TRUE(m1.Matches(::std::wstring(L"I love food.")));
-  EXPECT_FALSE(m1.Matches(::std::wstring(L"tofo")));
-
-  const Matcher<const ::std::wstring&> m2 = HasSubstr(L"foo");
-  EXPECT_TRUE(m2.Matches(::std::wstring(L"I love food.")));
-  EXPECT_FALSE(m2.Matches(::std::wstring(L"tofo")));
-}
-
-// Tests that HasSubstr() works for matching C-wide-string-typed values.
-TEST(StdWideHasSubstrTest, WorksForCStrings) {
-  const Matcher<wchar_t*> m1 = HasSubstr(L"foo");
-  EXPECT_TRUE(m1.Matches(const_cast<wchar_t*>(L"I love food.")));
-  EXPECT_FALSE(m1.Matches(const_cast<wchar_t*>(L"tofo")));
-  EXPECT_FALSE(m1.Matches(nullptr));
-
-  const Matcher<const wchar_t*> m2 = HasSubstr(L"foo");
-  EXPECT_TRUE(m2.Matches(L"I love food."));
-  EXPECT_FALSE(m2.Matches(L"tofo"));
-  EXPECT_FALSE(m2.Matches(nullptr));
-}
-
-// Tests that HasSubstr(s) describes itself properly.
-TEST(StdWideHasSubstrTest, CanDescribeSelf) {
-  Matcher<::std::wstring> m = HasSubstr(L"foo\n\"");
-  EXPECT_EQ("has substring L\"foo\\n\\\"\"", Describe(m));
-}
-
-// Tests StartsWith(s).
-
-TEST(StdWideStartsWithTest, MatchesStringWithGivenPrefix) {
-  const Matcher<const wchar_t*> m1 = StartsWith(::std::wstring(L""));
-  EXPECT_TRUE(m1.Matches(L"Hi"));
-  EXPECT_TRUE(m1.Matches(L""));
-  EXPECT_FALSE(m1.Matches(nullptr));
-
-  const Matcher<const ::std::wstring&> m2 = StartsWith(L"Hi");
-  EXPECT_TRUE(m2.Matches(L"Hi"));
-  EXPECT_TRUE(m2.Matches(L"Hi Hi!"));
-  EXPECT_TRUE(m2.Matches(L"High"));
-  EXPECT_FALSE(m2.Matches(L"H"));
-  EXPECT_FALSE(m2.Matches(L" Hi"));
-}
-
-TEST(StdWideStartsWithTest, CanDescribeSelf) {
-  Matcher<const ::std::wstring> m = StartsWith(L"Hi");
-  EXPECT_EQ("starts with L\"Hi\"", Describe(m));
-}
-
-// Tests EndsWith(s).
-
-TEST(StdWideEndsWithTest, MatchesStringWithGivenSuffix) {
-  const Matcher<const wchar_t*> m1 = EndsWith(L"");
-  EXPECT_TRUE(m1.Matches(L"Hi"));
-  EXPECT_TRUE(m1.Matches(L""));
-  EXPECT_FALSE(m1.Matches(nullptr));
-
-  const Matcher<const ::std::wstring&> m2 = EndsWith(::std::wstring(L"Hi"));
-  EXPECT_TRUE(m2.Matches(L"Hi"));
-  EXPECT_TRUE(m2.Matches(L"Wow Hi Hi"));
-  EXPECT_TRUE(m2.Matches(L"Super Hi"));
-  EXPECT_FALSE(m2.Matches(L"i"));
-  EXPECT_FALSE(m2.Matches(L"Hi "));
-}
-
-TEST(StdWideEndsWithTest, CanDescribeSelf) {
-  Matcher<const ::std::wstring> m = EndsWith(L"Hi");
-  EXPECT_EQ("ends with L\"Hi\"", Describe(m));
-}
-
-#endif  // GTEST_HAS_STD_WSTRING
-
-typedef ::std::tuple<long, int> Tuple2;  // NOLINT
-
-// Tests that Eq() matches a 2-tuple where the first field == the
-// second field.
-TEST(Eq2Test, MatchesEqualArguments) {
-  Matcher<const Tuple2&> m = Eq();
-  EXPECT_TRUE(m.Matches(Tuple2(5L, 5)));
-  EXPECT_FALSE(m.Matches(Tuple2(5L, 6)));
-}
-
-// Tests that Eq() describes itself properly.
-TEST(Eq2Test, CanDescribeSelf) {
-  Matcher<const Tuple2&> m = Eq();
-  EXPECT_EQ("are an equal pair", Describe(m));
-}
-
-// Tests that Ge() matches a 2-tuple where the first field >= the
-// second field.
-TEST(Ge2Test, MatchesGreaterThanOrEqualArguments) {
-  Matcher<const Tuple2&> m = Ge();
-  EXPECT_TRUE(m.Matches(Tuple2(5L, 4)));
-  EXPECT_TRUE(m.Matches(Tuple2(5L, 5)));
-  EXPECT_FALSE(m.Matches(Tuple2(5L, 6)));
-}
-
-// Tests that Ge() describes itself properly.
-TEST(Ge2Test, CanDescribeSelf) {
-  Matcher<const Tuple2&> m = Ge();
-  EXPECT_EQ("are a pair where the first >= the second", Describe(m));
-}
-
-// Tests that Gt() matches a 2-tuple where the first field > the
-// second field.
-TEST(Gt2Test, MatchesGreaterThanArguments) {
-  Matcher<const Tuple2&> m = Gt();
-  EXPECT_TRUE(m.Matches(Tuple2(5L, 4)));
-  EXPECT_FALSE(m.Matches(Tuple2(5L, 5)));
-  EXPECT_FALSE(m.Matches(Tuple2(5L, 6)));
-}
-
-// Tests that Gt() describes itself properly.
-TEST(Gt2Test, CanDescribeSelf) {
-  Matcher<const Tuple2&> m = Gt();
-  EXPECT_EQ("are a pair where the first > the second", Describe(m));
-}
-
-// Tests that Le() matches a 2-tuple where the first field <= the
-// second field.
-TEST(Le2Test, MatchesLessThanOrEqualArguments) {
-  Matcher<const Tuple2&> m = Le();
-  EXPECT_TRUE(m.Matches(Tuple2(5L, 6)));
-  EXPECT_TRUE(m.Matches(Tuple2(5L, 5)));
-  EXPECT_FALSE(m.Matches(Tuple2(5L, 4)));
-}
-
-// Tests that Le() describes itself properly.
-TEST(Le2Test, CanDescribeSelf) {
-  Matcher<const Tuple2&> m = Le();
-  EXPECT_EQ("are a pair where the first <= the second", Describe(m));
-}
-
-// Tests that Lt() matches a 2-tuple where the first field < the
-// second field.
-TEST(Lt2Test, MatchesLessThanArguments) {
-  Matcher<const Tuple2&> m = Lt();
-  EXPECT_TRUE(m.Matches(Tuple2(5L, 6)));
-  EXPECT_FALSE(m.Matches(Tuple2(5L, 5)));
-  EXPECT_FALSE(m.Matches(Tuple2(5L, 4)));
-}
-
-// Tests that Lt() describes itself properly.
-TEST(Lt2Test, CanDescribeSelf) {
-  Matcher<const Tuple2&> m = Lt();
-  EXPECT_EQ("are a pair where the first < the second", Describe(m));
-}
-
-// Tests that Ne() matches a 2-tuple where the first field != the
-// second field.
-TEST(Ne2Test, MatchesUnequalArguments) {
-  Matcher<const Tuple2&> m = Ne();
-  EXPECT_TRUE(m.Matches(Tuple2(5L, 6)));
-  EXPECT_TRUE(m.Matches(Tuple2(5L, 4)));
-  EXPECT_FALSE(m.Matches(Tuple2(5L, 5)));
-}
-
-// Tests that Ne() describes itself properly.
-TEST(Ne2Test, CanDescribeSelf) {
-  Matcher<const Tuple2&> m = Ne();
-  EXPECT_EQ("are an unequal pair", Describe(m));
-}
-
-TEST(PairMatchBaseTest, WorksWithMoveOnly) {
-  using Pointers = std::tuple<std::unique_ptr<int>, std::unique_ptr<int>>;
-  Matcher<Pointers> matcher = Eq();
-  Pointers pointers;
-  // Tested values don't matter; the point is that matcher does not copy the
-  // matched values.
-  EXPECT_TRUE(matcher.Matches(pointers));
-}
-
-// Tests that IsNan() matches a NaN, with float.
-TEST(IsNan, FloatMatchesNan) {
-  float quiet_nan = std::numeric_limits<float>::quiet_NaN();
-  float other_nan = std::nanf("1");
-  float real_value = 1.0f;
-
-  Matcher<float> m = IsNan();
-  EXPECT_TRUE(m.Matches(quiet_nan));
-  EXPECT_TRUE(m.Matches(other_nan));
-  EXPECT_FALSE(m.Matches(real_value));
-
-  Matcher<float&> m_ref = IsNan();
-  EXPECT_TRUE(m_ref.Matches(quiet_nan));
-  EXPECT_TRUE(m_ref.Matches(other_nan));
-  EXPECT_FALSE(m_ref.Matches(real_value));
-
-  Matcher<const float&> m_cref = IsNan();
-  EXPECT_TRUE(m_cref.Matches(quiet_nan));
-  EXPECT_TRUE(m_cref.Matches(other_nan));
-  EXPECT_FALSE(m_cref.Matches(real_value));
-}
-
-// Tests that IsNan() matches a NaN, with double.
-TEST(IsNan, DoubleMatchesNan) {
-  double quiet_nan = std::numeric_limits<double>::quiet_NaN();
-  double other_nan = std::nan("1");
-  double real_value = 1.0;
-
-  Matcher<double> m = IsNan();
-  EXPECT_TRUE(m.Matches(quiet_nan));
-  EXPECT_TRUE(m.Matches(other_nan));
-  EXPECT_FALSE(m.Matches(real_value));
-
-  Matcher<double&> m_ref = IsNan();
-  EXPECT_TRUE(m_ref.Matches(quiet_nan));
-  EXPECT_TRUE(m_ref.Matches(other_nan));
-  EXPECT_FALSE(m_ref.Matches(real_value));
-
-  Matcher<const double&> m_cref = IsNan();
-  EXPECT_TRUE(m_cref.Matches(quiet_nan));
-  EXPECT_TRUE(m_cref.Matches(other_nan));
-  EXPECT_FALSE(m_cref.Matches(real_value));
-}
-
-// Tests that IsNan() matches a NaN, with long double.
-TEST(IsNan, LongDoubleMatchesNan) {
-  long double quiet_nan = std::numeric_limits<long double>::quiet_NaN();
-  long double other_nan = std::nan("1");
-  long double real_value = 1.0;
-
-  Matcher<long double> m = IsNan();
-  EXPECT_TRUE(m.Matches(quiet_nan));
-  EXPECT_TRUE(m.Matches(other_nan));
-  EXPECT_FALSE(m.Matches(real_value));
-
-  Matcher<long double&> m_ref = IsNan();
-  EXPECT_TRUE(m_ref.Matches(quiet_nan));
-  EXPECT_TRUE(m_ref.Matches(other_nan));
-  EXPECT_FALSE(m_ref.Matches(real_value));
-
-  Matcher<const long double&> m_cref = IsNan();
-  EXPECT_TRUE(m_cref.Matches(quiet_nan));
-  EXPECT_TRUE(m_cref.Matches(other_nan));
-  EXPECT_FALSE(m_cref.Matches(real_value));
-}
-
-// Tests that IsNan() works with Not.
-TEST(IsNan, NotMatchesNan) {
-  Matcher<float> mf = Not(IsNan());
-  EXPECT_FALSE(mf.Matches(std::numeric_limits<float>::quiet_NaN()));
-  EXPECT_FALSE(mf.Matches(std::nanf("1")));
-  EXPECT_TRUE(mf.Matches(1.0));
-
-  Matcher<double> md = Not(IsNan());
-  EXPECT_FALSE(md.Matches(std::numeric_limits<double>::quiet_NaN()));
-  EXPECT_FALSE(md.Matches(std::nan("1")));
-  EXPECT_TRUE(md.Matches(1.0));
-
-  Matcher<long double> mld = Not(IsNan());
-  EXPECT_FALSE(mld.Matches(std::numeric_limits<long double>::quiet_NaN()));
-  EXPECT_FALSE(mld.Matches(std::nanl("1")));
-  EXPECT_TRUE(mld.Matches(1.0));
-}
-
-// Tests that IsNan() can describe itself.
-TEST(IsNan, CanDescribeSelf) {
-  Matcher<float> mf = IsNan();
-  EXPECT_EQ("is NaN", Describe(mf));
-
-  Matcher<double> md = IsNan();
-  EXPECT_EQ("is NaN", Describe(md));
-
-  Matcher<long double> mld = IsNan();
-  EXPECT_EQ("is NaN", Describe(mld));
-}
-
-// Tests that IsNan() can describe itself with Not.
-TEST(IsNan, CanDescribeSelfWithNot) {
-  Matcher<float> mf = Not(IsNan());
-  EXPECT_EQ("isn't NaN", Describe(mf));
-
-  Matcher<double> md = Not(IsNan());
-  EXPECT_EQ("isn't NaN", Describe(md));
-
-  Matcher<long double> mld = Not(IsNan());
-  EXPECT_EQ("isn't NaN", Describe(mld));
-}
-
-// Tests that FloatEq() matches a 2-tuple where
-// FloatEq(first field) matches the second field.
-TEST(FloatEq2Test, MatchesEqualArguments) {
-  typedef ::std::tuple<float, float> Tpl;
-  Matcher<const Tpl&> m = FloatEq();
-  EXPECT_TRUE(m.Matches(Tpl(1.0f, 1.0f)));
-  EXPECT_TRUE(m.Matches(Tpl(0.3f, 0.1f + 0.1f + 0.1f)));
-  EXPECT_FALSE(m.Matches(Tpl(1.1f, 1.0f)));
-}
-
-// Tests that FloatEq() describes itself properly.
-TEST(FloatEq2Test, CanDescribeSelf) {
-  Matcher<const ::std::tuple<float, float>&> m = FloatEq();
-  EXPECT_EQ("are an almost-equal pair", Describe(m));
-}
-
-// Tests that NanSensitiveFloatEq() matches a 2-tuple where
-// NanSensitiveFloatEq(first field) matches the second field.
-TEST(NanSensitiveFloatEqTest, MatchesEqualArgumentsWithNaN) {
-  typedef ::std::tuple<float, float> Tpl;
-  Matcher<const Tpl&> m = NanSensitiveFloatEq();
-  EXPECT_TRUE(m.Matches(Tpl(1.0f, 1.0f)));
-  EXPECT_TRUE(m.Matches(Tpl(std::numeric_limits<float>::quiet_NaN(),
-                            std::numeric_limits<float>::quiet_NaN())));
-  EXPECT_FALSE(m.Matches(Tpl(1.1f, 1.0f)));
-  EXPECT_FALSE(m.Matches(Tpl(1.0f, std::numeric_limits<float>::quiet_NaN())));
-  EXPECT_FALSE(m.Matches(Tpl(std::numeric_limits<float>::quiet_NaN(), 1.0f)));
-}
-
-// Tests that NanSensitiveFloatEq() describes itself properly.
-TEST(NanSensitiveFloatEqTest, CanDescribeSelfWithNaNs) {
-  Matcher<const ::std::tuple<float, float>&> m = NanSensitiveFloatEq();
-  EXPECT_EQ("are an almost-equal pair", Describe(m));
-}
-
-// Tests that DoubleEq() matches a 2-tuple where
-// DoubleEq(first field) matches the second field.
-TEST(DoubleEq2Test, MatchesEqualArguments) {
-  typedef ::std::tuple<double, double> Tpl;
-  Matcher<const Tpl&> m = DoubleEq();
-  EXPECT_TRUE(m.Matches(Tpl(1.0, 1.0)));
-  EXPECT_TRUE(m.Matches(Tpl(0.3, 0.1 + 0.1 + 0.1)));
-  EXPECT_FALSE(m.Matches(Tpl(1.1, 1.0)));
-}
-
-// Tests that DoubleEq() describes itself properly.
-TEST(DoubleEq2Test, CanDescribeSelf) {
-  Matcher<const ::std::tuple<double, double>&> m = DoubleEq();
-  EXPECT_EQ("are an almost-equal pair", Describe(m));
-}
-
-// Tests that NanSensitiveDoubleEq() matches a 2-tuple where
-// NanSensitiveDoubleEq(first field) matches the second field.
-TEST(NanSensitiveDoubleEqTest, MatchesEqualArgumentsWithNaN) {
-  typedef ::std::tuple<double, double> Tpl;
-  Matcher<const Tpl&> m = NanSensitiveDoubleEq();
-  EXPECT_TRUE(m.Matches(Tpl(1.0f, 1.0f)));
-  EXPECT_TRUE(m.Matches(Tpl(std::numeric_limits<double>::quiet_NaN(),
-                            std::numeric_limits<double>::quiet_NaN())));
-  EXPECT_FALSE(m.Matches(Tpl(1.1f, 1.0f)));
-  EXPECT_FALSE(m.Matches(Tpl(1.0f, std::numeric_limits<double>::quiet_NaN())));
-  EXPECT_FALSE(m.Matches(Tpl(std::numeric_limits<double>::quiet_NaN(), 1.0f)));
-}
-
-// Tests that DoubleEq() describes itself properly.
-TEST(NanSensitiveDoubleEqTest, CanDescribeSelfWithNaNs) {
-  Matcher<const ::std::tuple<double, double>&> m = NanSensitiveDoubleEq();
-  EXPECT_EQ("are an almost-equal pair", Describe(m));
-}
-
-// Tests that FloatEq() matches a 2-tuple where
-// FloatNear(first field, max_abs_error) matches the second field.
-TEST(FloatNear2Test, MatchesEqualArguments) {
-  typedef ::std::tuple<float, float> Tpl;
-  Matcher<const Tpl&> m = FloatNear(0.5f);
-  EXPECT_TRUE(m.Matches(Tpl(1.0f, 1.0f)));
-  EXPECT_TRUE(m.Matches(Tpl(1.3f, 1.0f)));
-  EXPECT_FALSE(m.Matches(Tpl(1.8f, 1.0f)));
-}
-
-// Tests that FloatNear() describes itself properly.
-TEST(FloatNear2Test, CanDescribeSelf) {
-  Matcher<const ::std::tuple<float, float>&> m = FloatNear(0.5f);
-  EXPECT_EQ("are an almost-equal pair", Describe(m));
-}
-
-// Tests that NanSensitiveFloatNear() matches a 2-tuple where
-// NanSensitiveFloatNear(first field) matches the second field.
-TEST(NanSensitiveFloatNearTest, MatchesNearbyArgumentsWithNaN) {
-  typedef ::std::tuple<float, float> Tpl;
-  Matcher<const Tpl&> m = NanSensitiveFloatNear(0.5f);
-  EXPECT_TRUE(m.Matches(Tpl(1.0f, 1.0f)));
-  EXPECT_TRUE(m.Matches(Tpl(1.1f, 1.0f)));
-  EXPECT_TRUE(m.Matches(Tpl(std::numeric_limits<float>::quiet_NaN(),
-                            std::numeric_limits<float>::quiet_NaN())));
-  EXPECT_FALSE(m.Matches(Tpl(1.6f, 1.0f)));
-  EXPECT_FALSE(m.Matches(Tpl(1.0f, std::numeric_limits<float>::quiet_NaN())));
-  EXPECT_FALSE(m.Matches(Tpl(std::numeric_limits<float>::quiet_NaN(), 1.0f)));
-}
-
-// Tests that NanSensitiveFloatNear() describes itself properly.
-TEST(NanSensitiveFloatNearTest, CanDescribeSelfWithNaNs) {
-  Matcher<const ::std::tuple<float, float>&> m = NanSensitiveFloatNear(0.5f);
-  EXPECT_EQ("are an almost-equal pair", Describe(m));
-}
-
-// Tests that FloatEq() matches a 2-tuple where
-// DoubleNear(first field, max_abs_error) matches the second field.
-TEST(DoubleNear2Test, MatchesEqualArguments) {
-  typedef ::std::tuple<double, double> Tpl;
-  Matcher<const Tpl&> m = DoubleNear(0.5);
-  EXPECT_TRUE(m.Matches(Tpl(1.0, 1.0)));
-  EXPECT_TRUE(m.Matches(Tpl(1.3, 1.0)));
-  EXPECT_FALSE(m.Matches(Tpl(1.8, 1.0)));
-}
-
-// Tests that DoubleNear() describes itself properly.
-TEST(DoubleNear2Test, CanDescribeSelf) {
-  Matcher<const ::std::tuple<double, double>&> m = DoubleNear(0.5);
-  EXPECT_EQ("are an almost-equal pair", Describe(m));
-}
-
-// Tests that NanSensitiveDoubleNear() matches a 2-tuple where
-// NanSensitiveDoubleNear(first field) matches the second field.
-TEST(NanSensitiveDoubleNearTest, MatchesNearbyArgumentsWithNaN) {
-  typedef ::std::tuple<double, double> Tpl;
-  Matcher<const Tpl&> m = NanSensitiveDoubleNear(0.5f);
-  EXPECT_TRUE(m.Matches(Tpl(1.0f, 1.0f)));
-  EXPECT_TRUE(m.Matches(Tpl(1.1f, 1.0f)));
-  EXPECT_TRUE(m.Matches(Tpl(std::numeric_limits<double>::quiet_NaN(),
-                            std::numeric_limits<double>::quiet_NaN())));
-  EXPECT_FALSE(m.Matches(Tpl(1.6f, 1.0f)));
-  EXPECT_FALSE(m.Matches(Tpl(1.0f, std::numeric_limits<double>::quiet_NaN())));
-  EXPECT_FALSE(m.Matches(Tpl(std::numeric_limits<double>::quiet_NaN(), 1.0f)));
-}
-
-// Tests that NanSensitiveDoubleNear() describes itself properly.
-TEST(NanSensitiveDoubleNearTest, CanDescribeSelfWithNaNs) {
-  Matcher<const ::std::tuple<double, double>&> m = NanSensitiveDoubleNear(0.5f);
-  EXPECT_EQ("are an almost-equal pair", Describe(m));
-}
-
-// Tests that Not(m) matches any value that doesn't match m.
-TEST(NotTest, NegatesMatcher) {
-  Matcher<int> m;
-  m = Not(Eq(2));
-  EXPECT_TRUE(m.Matches(3));
-  EXPECT_FALSE(m.Matches(2));
-}
-
-// Tests that Not(m) describes itself properly.
-TEST(NotTest, CanDescribeSelf) {
-  Matcher<int> m = Not(Eq(5));
-  EXPECT_EQ("isn't equal to 5", Describe(m));
-}
-
-// Tests that monomorphic matchers are safely cast by the Not matcher.
-TEST(NotTest, NotMatcherSafelyCastsMonomorphicMatchers) {
-  // greater_than_5 is a monomorphic matcher.
-  Matcher<int> greater_than_5 = Gt(5);
-
-  Matcher<const int&> m = Not(greater_than_5);
-  Matcher<int&> m2 = Not(greater_than_5);
-  Matcher<int&> m3 = Not(m);
-}
-
-// Helper to allow easy testing of AllOf matchers with num parameters.
-void AllOfMatches(int num, const Matcher<int>& m) {
-  SCOPED_TRACE(Describe(m));
-  EXPECT_TRUE(m.Matches(0));
-  for (int i = 1; i <= num; ++i) {
-    EXPECT_FALSE(m.Matches(i));
-  }
-  EXPECT_TRUE(m.Matches(num + 1));
-}
-
-// Tests that AllOf(m1, ..., mn) matches any value that matches all of
-// the given matchers.
-TEST(AllOfTest, MatchesWhenAllMatch) {
-  Matcher<int> m;
-  m = AllOf(Le(2), Ge(1));
-  EXPECT_TRUE(m.Matches(1));
-  EXPECT_TRUE(m.Matches(2));
-  EXPECT_FALSE(m.Matches(0));
-  EXPECT_FALSE(m.Matches(3));
-
-  m = AllOf(Gt(0), Ne(1), Ne(2));
-  EXPECT_TRUE(m.Matches(3));
-  EXPECT_FALSE(m.Matches(2));
-  EXPECT_FALSE(m.Matches(1));
-  EXPECT_FALSE(m.Matches(0));
-
-  m = AllOf(Gt(0), Ne(1), Ne(2), Ne(3));
-  EXPECT_TRUE(m.Matches(4));
-  EXPECT_FALSE(m.Matches(3));
-  EXPECT_FALSE(m.Matches(2));
-  EXPECT_FALSE(m.Matches(1));
-  EXPECT_FALSE(m.Matches(0));
-
-  m = AllOf(Ge(0), Lt(10), Ne(3), Ne(5), Ne(7));
-  EXPECT_TRUE(m.Matches(0));
-  EXPECT_TRUE(m.Matches(1));
-  EXPECT_FALSE(m.Matches(3));
-
-  // The following tests for varying number of sub-matchers. Due to the way
-  // the sub-matchers are handled it is enough to test every sub-matcher once
-  // with sub-matchers using the same matcher type. Varying matcher types are
-  // checked for above.
-  AllOfMatches(2, AllOf(Ne(1), Ne(2)));
-  AllOfMatches(3, AllOf(Ne(1), Ne(2), Ne(3)));
-  AllOfMatches(4, AllOf(Ne(1), Ne(2), Ne(3), Ne(4)));
-  AllOfMatches(5, AllOf(Ne(1), Ne(2), Ne(3), Ne(4), Ne(5)));
-  AllOfMatches(6, AllOf(Ne(1), Ne(2), Ne(3), Ne(4), Ne(5), Ne(6)));
-  AllOfMatches(7, AllOf(Ne(1), Ne(2), Ne(3), Ne(4), Ne(5), Ne(6), Ne(7)));
-  AllOfMatches(8,
-               AllOf(Ne(1), Ne(2), Ne(3), Ne(4), Ne(5), Ne(6), Ne(7), Ne(8)));
-  AllOfMatches(
-      9, AllOf(Ne(1), Ne(2), Ne(3), Ne(4), Ne(5), Ne(6), Ne(7), Ne(8), Ne(9)));
-  AllOfMatches(10, AllOf(Ne(1), Ne(2), Ne(3), Ne(4), Ne(5), Ne(6), Ne(7), Ne(8),
-                         Ne(9), Ne(10)));
-  AllOfMatches(
-      50, AllOf(Ne(1), Ne(2), Ne(3), Ne(4), Ne(5), Ne(6), Ne(7), Ne(8), Ne(9),
-                Ne(10), Ne(11), Ne(12), Ne(13), Ne(14), Ne(15), Ne(16), Ne(17),
-                Ne(18), Ne(19), Ne(20), Ne(21), Ne(22), Ne(23), Ne(24), Ne(25),
-                Ne(26), Ne(27), Ne(28), Ne(29), Ne(30), Ne(31), Ne(32), Ne(33),
-                Ne(34), Ne(35), Ne(36), Ne(37), Ne(38), Ne(39), Ne(40), Ne(41),
-                Ne(42), Ne(43), Ne(44), Ne(45), Ne(46), Ne(47), Ne(48), Ne(49),
-                Ne(50)));
-}
-
-// Tests that AllOf(m1, ..., mn) describes itself properly.
-TEST(AllOfTest, CanDescribeSelf) {
-  Matcher<int> m;
-  m = AllOf(Le(2), Ge(1));
-  EXPECT_EQ("(is <= 2) and (is >= 1)", Describe(m));
-
-  m = AllOf(Gt(0), Ne(1), Ne(2));
-  std::string expected_descr1 =
-      "(is > 0) and (isn't equal to 1) and (isn't equal to 2)";
-  EXPECT_EQ(expected_descr1, Describe(m));
-
-  m = AllOf(Gt(0), Ne(1), Ne(2), Ne(3));
-  std::string expected_descr2 =
-      "(is > 0) and (isn't equal to 1) and (isn't equal to 2) and (isn't equal "
-      "to 3)";
-  EXPECT_EQ(expected_descr2, Describe(m));
-
-  m = AllOf(Ge(0), Lt(10), Ne(3), Ne(5), Ne(7));
-  std::string expected_descr3 =
-      "(is >= 0) and (is < 10) and (isn't equal to 3) and (isn't equal to 5) "
-      "and (isn't equal to 7)";
-  EXPECT_EQ(expected_descr3, Describe(m));
-}
-
-// Tests that AllOf(m1, ..., mn) describes its negation properly.
-TEST(AllOfTest, CanDescribeNegation) {
-  Matcher<int> m;
-  m = AllOf(Le(2), Ge(1));
-  std::string expected_descr4 = "(isn't <= 2) or (isn't >= 1)";
-  EXPECT_EQ(expected_descr4, DescribeNegation(m));
-
-  m = AllOf(Gt(0), Ne(1), Ne(2));
-  std::string expected_descr5 =
-      "(isn't > 0) or (is equal to 1) or (is equal to 2)";
-  EXPECT_EQ(expected_descr5, DescribeNegation(m));
-
-  m = AllOf(Gt(0), Ne(1), Ne(2), Ne(3));
-  std::string expected_descr6 =
-      "(isn't > 0) or (is equal to 1) or (is equal to 2) or (is equal to 3)";
-  EXPECT_EQ(expected_descr6, DescribeNegation(m));
-
-  m = AllOf(Ge(0), Lt(10), Ne(3), Ne(5), Ne(7));
-  std::string expected_desr7 =
-      "(isn't >= 0) or (isn't < 10) or (is equal to 3) or (is equal to 5) or "
-      "(is equal to 7)";
-  EXPECT_EQ(expected_desr7, DescribeNegation(m));
-
-  m = AllOf(Ne(1), Ne(2), Ne(3), Ne(4), Ne(5), Ne(6), Ne(7), Ne(8), Ne(9),
-            Ne(10), Ne(11));
-  AllOf(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11);
-  EXPECT_THAT(Describe(m), EndsWith("and (isn't equal to 11)"));
-  AllOfMatches(11, m);
-}
-
-// Tests that monomorphic matchers are safely cast by the AllOf matcher.
-TEST(AllOfTest, AllOfMatcherSafelyCastsMonomorphicMatchers) {
-  // greater_than_5 and less_than_10 are monomorphic matchers.
-  Matcher<int> greater_than_5 = Gt(5);
-  Matcher<int> less_than_10 = Lt(10);
-
-  Matcher<const int&> m = AllOf(greater_than_5, less_than_10);
-  Matcher<int&> m2 = AllOf(greater_than_5, less_than_10);
-  Matcher<int&> m3 = AllOf(greater_than_5, m2);
-
-  // Tests that BothOf works when composing itself.
-  Matcher<const int&> m4 = AllOf(greater_than_5, less_than_10, less_than_10);
-  Matcher<int&> m5 = AllOf(greater_than_5, less_than_10, less_than_10);
-}
-
-TEST(AllOfTest, ExplainsResult) {
-  Matcher<int> m;
-
-  // Successful match.  Both matchers need to explain.  The second
-  // matcher doesn't give an explanation, so only the first matcher's
-  // explanation is printed.
-  m = AllOf(GreaterThan(10), Lt(30));
-  EXPECT_EQ("which is 15 more than 10", Explain(m, 25));
-
-  // Successful match.  Both matchers need to explain.
-  m = AllOf(GreaterThan(10), GreaterThan(20));
-  EXPECT_EQ("which is 20 more than 10, and which is 10 more than 20",
-            Explain(m, 30));
-
-  // Successful match.  All matchers need to explain.  The second
-  // matcher doesn't given an explanation.
-  m = AllOf(GreaterThan(10), Lt(30), GreaterThan(20));
-  EXPECT_EQ("which is 15 more than 10, and which is 5 more than 20",
-            Explain(m, 25));
-
-  // Successful match.  All matchers need to explain.
-  m = AllOf(GreaterThan(10), GreaterThan(20), GreaterThan(30));
-  EXPECT_EQ(
-      "which is 30 more than 10, and which is 20 more than 20, "
-      "and which is 10 more than 30",
-      Explain(m, 40));
-
-  // Failed match.  The first matcher, which failed, needs to
-  // explain.
-  m = AllOf(GreaterThan(10), GreaterThan(20));
-  EXPECT_EQ("which is 5 less than 10", Explain(m, 5));
-
-  // Failed match.  The second matcher, which failed, needs to
-  // explain.  Since it doesn't given an explanation, nothing is
-  // printed.
-  m = AllOf(GreaterThan(10), Lt(30));
-  EXPECT_EQ("", Explain(m, 40));
-
-  // Failed match.  The second matcher, which failed, needs to
-  // explain.
-  m = AllOf(GreaterThan(10), GreaterThan(20));
-  EXPECT_EQ("which is 5 less than 20", Explain(m, 15));
-}
-
-// Helper to allow easy testing of AnyOf matchers with num parameters.
-static void AnyOfMatches(int num, const Matcher<int>& m) {
-  SCOPED_TRACE(Describe(m));
-  EXPECT_FALSE(m.Matches(0));
-  for (int i = 1; i <= num; ++i) {
-    EXPECT_TRUE(m.Matches(i));
-  }
-  EXPECT_FALSE(m.Matches(num + 1));
-}
-
-static void AnyOfStringMatches(int num, const Matcher<std::string>& m) {
-  SCOPED_TRACE(Describe(m));
-  EXPECT_FALSE(m.Matches(std::to_string(0)));
-
-  for (int i = 1; i <= num; ++i) {
-    EXPECT_TRUE(m.Matches(std::to_string(i)));
-  }
-  EXPECT_FALSE(m.Matches(std::to_string(num + 1)));
-}
-
-// Tests that AnyOf(m1, ..., mn) matches any value that matches at
-// least one of the given matchers.
-TEST(AnyOfTest, MatchesWhenAnyMatches) {
-  Matcher<int> m;
-  m = AnyOf(Le(1), Ge(3));
-  EXPECT_TRUE(m.Matches(1));
-  EXPECT_TRUE(m.Matches(4));
-  EXPECT_FALSE(m.Matches(2));
-
-  m = AnyOf(Lt(0), Eq(1), Eq(2));
-  EXPECT_TRUE(m.Matches(-1));
-  EXPECT_TRUE(m.Matches(1));
-  EXPECT_TRUE(m.Matches(2));
-  EXPECT_FALSE(m.Matches(0));
-
-  m = AnyOf(Lt(0), Eq(1), Eq(2), Eq(3));
-  EXPECT_TRUE(m.Matches(-1));
-  EXPECT_TRUE(m.Matches(1));
-  EXPECT_TRUE(m.Matches(2));
-  EXPECT_TRUE(m.Matches(3));
-  EXPECT_FALSE(m.Matches(0));
-
-  m = AnyOf(Le(0), Gt(10), 3, 5, 7);
-  EXPECT_TRUE(m.Matches(0));
-  EXPECT_TRUE(m.Matches(11));
-  EXPECT_TRUE(m.Matches(3));
-  EXPECT_FALSE(m.Matches(2));
-
-  // The following tests for varying number of sub-matchers. Due to the way
-  // the sub-matchers are handled it is enough to test every sub-matcher once
-  // with sub-matchers using the same matcher type. Varying matcher types are
-  // checked for above.
-  AnyOfMatches(2, AnyOf(1, 2));
-  AnyOfMatches(3, AnyOf(1, 2, 3));
-  AnyOfMatches(4, AnyOf(1, 2, 3, 4));
-  AnyOfMatches(5, AnyOf(1, 2, 3, 4, 5));
-  AnyOfMatches(6, AnyOf(1, 2, 3, 4, 5, 6));
-  AnyOfMatches(7, AnyOf(1, 2, 3, 4, 5, 6, 7));
-  AnyOfMatches(8, AnyOf(1, 2, 3, 4, 5, 6, 7, 8));
-  AnyOfMatches(9, AnyOf(1, 2, 3, 4, 5, 6, 7, 8, 9));
-  AnyOfMatches(10, AnyOf(1, 2, 3, 4, 5, 6, 7, 8, 9, 10));
-}
-
-// Tests the variadic version of the AnyOfMatcher.
-TEST(AnyOfTest, VariadicMatchesWhenAnyMatches) {
-  // Also make sure AnyOf is defined in the right namespace and does not depend
-  // on ADL.
-  Matcher<int> m = ::testing::AnyOf(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11);
-
-  EXPECT_THAT(Describe(m), EndsWith("or (is equal to 11)"));
-  AnyOfMatches(11, m);
-  AnyOfMatches(50, AnyOf(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
-                         17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
-                         31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
-                         45, 46, 47, 48, 49, 50));
-  AnyOfStringMatches(
-      50, AnyOf("1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12",
-                "13", "14", "15", "16", "17", "18", "19", "20", "21", "22",
-                "23", "24", "25", "26", "27", "28", "29", "30", "31", "32",
-                "33", "34", "35", "36", "37", "38", "39", "40", "41", "42",
-                "43", "44", "45", "46", "47", "48", "49", "50"));
-}
-
-// Tests the variadic version of the ElementsAreMatcher
-TEST(ElementsAreTest, HugeMatcher) {
-  vector<int> test_vector{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12};
-
-  EXPECT_THAT(test_vector,
-              ElementsAre(Eq(1), Eq(2), Lt(13), Eq(4), Eq(5), Eq(6), Eq(7),
-                          Eq(8), Eq(9), Eq(10), Gt(1), Eq(12)));
-}
-
-// Tests the variadic version of the UnorderedElementsAreMatcher
-TEST(ElementsAreTest, HugeMatcherStr) {
-  vector<std::string> test_vector{
-      "literal_string", "", "", "", "", "", "", "", "", "", "", ""};
-
-  EXPECT_THAT(test_vector, UnorderedElementsAre("literal_string", _, _, _, _, _,
-                                                _, _, _, _, _, _));
-}
-
-// Tests the variadic version of the UnorderedElementsAreMatcher
-TEST(ElementsAreTest, HugeMatcherUnordered) {
-  vector<int> test_vector{2, 1, 8, 5, 4, 6, 7, 3, 9, 12, 11, 10};
-
-  EXPECT_THAT(test_vector, UnorderedElementsAre(
-                               Eq(2), Eq(1), Gt(7), Eq(5), Eq(4), Eq(6), Eq(7),
-                               Eq(3), Eq(9), Eq(12), Eq(11), Ne(122)));
-}
-
-// Tests that AnyOf(m1, ..., mn) describes itself properly.
-TEST(AnyOfTest, CanDescribeSelf) {
-  Matcher<int> m;
-  m = AnyOf(Le(1), Ge(3));
-
-  EXPECT_EQ("(is <= 1) or (is >= 3)", Describe(m));
-
-  m = AnyOf(Lt(0), Eq(1), Eq(2));
-  EXPECT_EQ("(is < 0) or (is equal to 1) or (is equal to 2)", Describe(m));
-
-  m = AnyOf(Lt(0), Eq(1), Eq(2), Eq(3));
-  EXPECT_EQ("(is < 0) or (is equal to 1) or (is equal to 2) or (is equal to 3)",
-            Describe(m));
-
-  m = AnyOf(Le(0), Gt(10), 3, 5, 7);
-  EXPECT_EQ(
-      "(is <= 0) or (is > 10) or (is equal to 3) or (is equal to 5) or (is "
-      "equal to 7)",
-      Describe(m));
-}
-
-// Tests that AnyOf(m1, ..., mn) describes its negation properly.
-TEST(AnyOfTest, CanDescribeNegation) {
-  Matcher<int> m;
-  m = AnyOf(Le(1), Ge(3));
-  EXPECT_EQ("(isn't <= 1) and (isn't >= 3)", DescribeNegation(m));
-
-  m = AnyOf(Lt(0), Eq(1), Eq(2));
-  EXPECT_EQ("(isn't < 0) and (isn't equal to 1) and (isn't equal to 2)",
-            DescribeNegation(m));
-
-  m = AnyOf(Lt(0), Eq(1), Eq(2), Eq(3));
-  EXPECT_EQ(
-      "(isn't < 0) and (isn't equal to 1) and (isn't equal to 2) and (isn't "
-      "equal to 3)",
-      DescribeNegation(m));
-
-  m = AnyOf(Le(0), Gt(10), 3, 5, 7);
-  EXPECT_EQ(
-      "(isn't <= 0) and (isn't > 10) and (isn't equal to 3) and (isn't equal "
-      "to 5) and (isn't equal to 7)",
-      DescribeNegation(m));
-}
-
-// Tests that monomorphic matchers are safely cast by the AnyOf matcher.
-TEST(AnyOfTest, AnyOfMatcherSafelyCastsMonomorphicMatchers) {
-  // greater_than_5 and less_than_10 are monomorphic matchers.
-  Matcher<int> greater_than_5 = Gt(5);
-  Matcher<int> less_than_10 = Lt(10);
-
-  Matcher<const int&> m = AnyOf(greater_than_5, less_than_10);
-  Matcher<int&> m2 = AnyOf(greater_than_5, less_than_10);
-  Matcher<int&> m3 = AnyOf(greater_than_5, m2);
-
-  // Tests that EitherOf works when composing itself.
-  Matcher<const int&> m4 = AnyOf(greater_than_5, less_than_10, less_than_10);
-  Matcher<int&> m5 = AnyOf(greater_than_5, less_than_10, less_than_10);
-}
-
-TEST(AnyOfTest, ExplainsResult) {
-  Matcher<int> m;
-
-  // Failed match.  Both matchers need to explain.  The second
-  // matcher doesn't give an explanation, so only the first matcher's
-  // explanation is printed.
-  m = AnyOf(GreaterThan(10), Lt(0));
-  EXPECT_EQ("which is 5 less than 10", Explain(m, 5));
-
-  // Failed match.  Both matchers need to explain.
-  m = AnyOf(GreaterThan(10), GreaterThan(20));
-  EXPECT_EQ("which is 5 less than 10, and which is 15 less than 20",
-            Explain(m, 5));
-
-  // Failed match.  All matchers need to explain.  The second
-  // matcher doesn't given an explanation.
-  m = AnyOf(GreaterThan(10), Gt(20), GreaterThan(30));
-  EXPECT_EQ("which is 5 less than 10, and which is 25 less than 30",
-            Explain(m, 5));
-
-  // Failed match.  All matchers need to explain.
-  m = AnyOf(GreaterThan(10), GreaterThan(20), GreaterThan(30));
-  EXPECT_EQ(
-      "which is 5 less than 10, and which is 15 less than 20, "
-      "and which is 25 less than 30",
-      Explain(m, 5));
-
-  // Successful match.  The first matcher, which succeeded, needs to
-  // explain.
-  m = AnyOf(GreaterThan(10), GreaterThan(20));
-  EXPECT_EQ("which is 5 more than 10", Explain(m, 15));
-
-  // Successful match.  The second matcher, which succeeded, needs to
-  // explain.  Since it doesn't given an explanation, nothing is
-  // printed.
-  m = AnyOf(GreaterThan(10), Lt(30));
-  EXPECT_EQ("", Explain(m, 0));
-
-  // Successful match.  The second matcher, which succeeded, needs to
-  // explain.
-  m = AnyOf(GreaterThan(30), GreaterThan(20));
-  EXPECT_EQ("which is 5 more than 20", Explain(m, 25));
-}
-
-// The following predicate function and predicate functor are for
-// testing the Truly(predicate) matcher.
-
-// Returns non-zero if the input is positive.  Note that the return
-// type of this function is not bool.  It's OK as Truly() accepts any
-// unary function or functor whose return type can be implicitly
-// converted to bool.
-int IsPositive(double x) { return x > 0 ? 1 : 0; }
-
-// This functor returns true if the input is greater than the given
-// number.
-class IsGreaterThan {
- public:
-  explicit IsGreaterThan(int threshold) : threshold_(threshold) {}
-
-  bool operator()(int n) const { return n > threshold_; }
-
- private:
-  int threshold_;
-};
-
-// For testing Truly().
-const int foo = 0;
-
-// This predicate returns true if and only if the argument references foo and
-// has a zero value.
-bool ReferencesFooAndIsZero(const int& n) { return (&n == &foo) && (n == 0); }
-
-// Tests that Truly(predicate) matches what satisfies the given
-// predicate.
-TEST(TrulyTest, MatchesWhatSatisfiesThePredicate) {
-  Matcher<double> m = Truly(IsPositive);
-  EXPECT_TRUE(m.Matches(2.0));
-  EXPECT_FALSE(m.Matches(-1.5));
-}
-
-// Tests that Truly(predicate_functor) works too.
-TEST(TrulyTest, CanBeUsedWithFunctor) {
-  Matcher<int> m = Truly(IsGreaterThan(5));
-  EXPECT_TRUE(m.Matches(6));
-  EXPECT_FALSE(m.Matches(4));
-}
-
-// A class that can be implicitly converted to bool.
-class ConvertibleToBool {
- public:
-  explicit ConvertibleToBool(int number) : number_(number) {}
-  operator bool() const { return number_ != 0; }
-
- private:
-  int number_;
-};
-
-ConvertibleToBool IsNotZero(int number) { return ConvertibleToBool(number); }
-
-// Tests that the predicate used in Truly() may return a class that's
-// implicitly convertible to bool, even when the class has no
-// operator!().
-TEST(TrulyTest, PredicateCanReturnAClassConvertibleToBool) {
-  Matcher<int> m = Truly(IsNotZero);
-  EXPECT_TRUE(m.Matches(1));
-  EXPECT_FALSE(m.Matches(0));
-}
-
-// Tests that Truly(predicate) can describe itself properly.
-TEST(TrulyTest, CanDescribeSelf) {
-  Matcher<double> m = Truly(IsPositive);
-  EXPECT_EQ("satisfies the given predicate", Describe(m));
-}
-
-// Tests that Truly(predicate) works when the matcher takes its
-// argument by reference.
-TEST(TrulyTest, WorksForByRefArguments) {
-  Matcher<const int&> m = Truly(ReferencesFooAndIsZero);
-  EXPECT_TRUE(m.Matches(foo));
-  int n = 0;
-  EXPECT_FALSE(m.Matches(n));
-}
-
-// Tests that Truly(predicate) provides a helpful reason when it fails.
-TEST(TrulyTest, ExplainsFailures) {
-  StringMatchResultListener listener;
-  EXPECT_FALSE(ExplainMatchResult(Truly(IsPositive), -1, &listener));
-  EXPECT_EQ(listener.str(), "didn't satisfy the given predicate");
-}
-
-// Tests that Matches(m) is a predicate satisfied by whatever that
-// matches matcher m.
-TEST(MatchesTest, IsSatisfiedByWhatMatchesTheMatcher) {
-  EXPECT_TRUE(Matches(Ge(0))(1));
-  EXPECT_FALSE(Matches(Eq('a'))('b'));
-}
-
-// Tests that Matches(m) works when the matcher takes its argument by
-// reference.
-TEST(MatchesTest, WorksOnByRefArguments) {
-  int m = 0, n = 0;
-  EXPECT_TRUE(Matches(AllOf(Ref(n), Eq(0)))(n));
-  EXPECT_FALSE(Matches(Ref(m))(n));
-}
-
-// Tests that a Matcher on non-reference type can be used in
-// Matches().
-TEST(MatchesTest, WorksWithMatcherOnNonRefType) {
-  Matcher<int> eq5 = Eq(5);
-  EXPECT_TRUE(Matches(eq5)(5));
-  EXPECT_FALSE(Matches(eq5)(2));
-}
-
-// Tests Value(value, matcher).  Since Value() is a simple wrapper for
-// Matches(), which has been tested already, we don't spend a lot of
-// effort on testing Value().
-TEST(ValueTest, WorksWithPolymorphicMatcher) {
-  EXPECT_TRUE(Value("hi", StartsWith("h")));
-  EXPECT_FALSE(Value(5, Gt(10)));
-}
-
-TEST(ValueTest, WorksWithMonomorphicMatcher) {
-  const Matcher<int> is_zero = Eq(0);
-  EXPECT_TRUE(Value(0, is_zero));
-  EXPECT_FALSE(Value('a', is_zero));
-
-  int n = 0;
-  const Matcher<const int&> ref_n = Ref(n);
-  EXPECT_TRUE(Value(n, ref_n));
-  EXPECT_FALSE(Value(1, ref_n));
-}
-
-TEST(ExplainMatchResultTest, WorksWithPolymorphicMatcher) {
-  StringMatchResultListener listener1;
-  EXPECT_TRUE(ExplainMatchResult(PolymorphicIsEven(), 42, &listener1));
-  EXPECT_EQ("% 2 == 0", listener1.str());
-
-  StringMatchResultListener listener2;
-  EXPECT_FALSE(ExplainMatchResult(Ge(42), 1.5, &listener2));
-  EXPECT_EQ("", listener2.str());
-}
-
-TEST(ExplainMatchResultTest, WorksWithMonomorphicMatcher) {
-  const Matcher<int> is_even = PolymorphicIsEven();
-  StringMatchResultListener listener1;
-  EXPECT_TRUE(ExplainMatchResult(is_even, 42, &listener1));
-  EXPECT_EQ("% 2 == 0", listener1.str());
-
-  const Matcher<const double&> is_zero = Eq(0);
-  StringMatchResultListener listener2;
-  EXPECT_FALSE(ExplainMatchResult(is_zero, 1.5, &listener2));
-  EXPECT_EQ("", listener2.str());
-}
-
-MATCHER(ConstructNoArg, "") { return true; }
-MATCHER_P(Construct1Arg, arg1, "") { return true; }
-MATCHER_P2(Construct2Args, arg1, arg2, "") { return true; }
-
-TEST(MatcherConstruct, ExplicitVsImplicit) {
-  {
-    // No arg constructor can be constructed with empty brace.
-    ConstructNoArgMatcher m = {};
-    (void)m;
-    // And with no args
-    ConstructNoArgMatcher m2;
-    (void)m2;
-  }
-  {
-    // The one arg constructor has an explicit constructor.
-    // This is to prevent the implicit conversion.
-    using M = Construct1ArgMatcherP<int>;
-    EXPECT_TRUE((std::is_constructible<M, int>::value));
-    EXPECT_FALSE((std::is_convertible<int, M>::value));
-  }
-  {
-    // Multiple arg matchers can be constructed with an implicit construction.
-    Construct2ArgsMatcherP2<int, double> m = {1, 2.2};
-    (void)m;
-  }
-}
-
-MATCHER_P(Really, inner_matcher, "") {
-  return ExplainMatchResult(inner_matcher, arg, result_listener);
-}
-
-TEST(ExplainMatchResultTest, WorksInsideMATCHER) {
-  EXPECT_THAT(0, Really(Eq(0)));
-}
-
-TEST(DescribeMatcherTest, WorksWithValue) {
-  EXPECT_EQ("is equal to 42", DescribeMatcher<int>(42));
-  EXPECT_EQ("isn't equal to 42", DescribeMatcher<int>(42, true));
-}
-
-TEST(DescribeMatcherTest, WorksWithMonomorphicMatcher) {
-  const Matcher<int> monomorphic = Le(0);
-  EXPECT_EQ("is <= 0", DescribeMatcher<int>(monomorphic));
-  EXPECT_EQ("isn't <= 0", DescribeMatcher<int>(monomorphic, true));
-}
-
-TEST(DescribeMatcherTest, WorksWithPolymorphicMatcher) {
-  EXPECT_EQ("is even", DescribeMatcher<int>(PolymorphicIsEven()));
-  EXPECT_EQ("is odd", DescribeMatcher<int>(PolymorphicIsEven(), true));
-}
-
-TEST(AllArgsTest, WorksForTuple) {
-  EXPECT_THAT(std::make_tuple(1, 2L), AllArgs(Lt()));
-  EXPECT_THAT(std::make_tuple(2L, 1), Not(AllArgs(Lt())));
-}
-
-TEST(AllArgsTest, WorksForNonTuple) {
-  EXPECT_THAT(42, AllArgs(Gt(0)));
-  EXPECT_THAT('a', Not(AllArgs(Eq('b'))));
-}
-
-class AllArgsHelper {
- public:
-  AllArgsHelper() {}
-
-  MOCK_METHOD2(Helper, int(char x, int y));
-
- private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(AllArgsHelper);
-};
-
-TEST(AllArgsTest, WorksInWithClause) {
-  AllArgsHelper helper;
-  ON_CALL(helper, Helper(_, _)).With(AllArgs(Lt())).WillByDefault(Return(1));
-  EXPECT_CALL(helper, Helper(_, _));
-  EXPECT_CALL(helper, Helper(_, _)).With(AllArgs(Gt())).WillOnce(Return(2));
-
-  EXPECT_EQ(1, helper.Helper('\1', 2));
-  EXPECT_EQ(2, helper.Helper('a', 1));
-}
-
-class OptionalMatchersHelper {
- public:
-  OptionalMatchersHelper() {}
-
-  MOCK_METHOD0(NoArgs, int());
-
-  MOCK_METHOD1(OneArg, int(int y));
-
-  MOCK_METHOD2(TwoArgs, int(char x, int y));
-
-  MOCK_METHOD1(Overloaded, int(char x));
-  MOCK_METHOD2(Overloaded, int(char x, int y));
-
- private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(OptionalMatchersHelper);
-};
-
-TEST(AllArgsTest, WorksWithoutMatchers) {
-  OptionalMatchersHelper helper;
-
-  ON_CALL(helper, NoArgs).WillByDefault(Return(10));
-  ON_CALL(helper, OneArg).WillByDefault(Return(20));
-  ON_CALL(helper, TwoArgs).WillByDefault(Return(30));
-
-  EXPECT_EQ(10, helper.NoArgs());
-  EXPECT_EQ(20, helper.OneArg(1));
-  EXPECT_EQ(30, helper.TwoArgs('\1', 2));
-
-  EXPECT_CALL(helper, NoArgs).Times(1);
-  EXPECT_CALL(helper, OneArg).WillOnce(Return(100));
-  EXPECT_CALL(helper, OneArg(17)).WillOnce(Return(200));
-  EXPECT_CALL(helper, TwoArgs).Times(0);
-
-  EXPECT_EQ(10, helper.NoArgs());
-  EXPECT_EQ(100, helper.OneArg(1));
-  EXPECT_EQ(200, helper.OneArg(17));
-}
-
-// Tests that ASSERT_THAT() and EXPECT_THAT() work when the value
-// matches the matcher.
-TEST(MatcherAssertionTest, WorksWhenMatcherIsSatisfied) {
-  ASSERT_THAT(5, Ge(2)) << "This should succeed.";
-  ASSERT_THAT("Foo", EndsWith("oo"));
-  EXPECT_THAT(2, AllOf(Le(7), Ge(0))) << "This should succeed too.";
-  EXPECT_THAT("Hello", StartsWith("Hell"));
-}
-
-// Tests that ASSERT_THAT() and EXPECT_THAT() work when the value
-// doesn't match the matcher.
-TEST(MatcherAssertionTest, WorksWhenMatcherIsNotSatisfied) {
-  // 'n' must be static as it is used in an EXPECT_FATAL_FAILURE(),
-  // which cannot reference auto variables.
-  static unsigned short n;  // NOLINT
-  n = 5;
-
-  EXPECT_FATAL_FAILURE(ASSERT_THAT(n, Gt(10)),
-                       "Value of: n\n"
-                       "Expected: is > 10\n"
-                       "  Actual: 5" +
-                           OfType("unsigned short"));
-  n = 0;
-  EXPECT_NONFATAL_FAILURE(EXPECT_THAT(n, AllOf(Le(7), Ge(5))),
-                          "Value of: n\n"
-                          "Expected: (is <= 7) and (is >= 5)\n"
-                          "  Actual: 0" +
-                              OfType("unsigned short"));
-}
-
-// Tests that ASSERT_THAT() and EXPECT_THAT() work when the argument
-// has a reference type.
-TEST(MatcherAssertionTest, WorksForByRefArguments) {
-  // We use a static variable here as EXPECT_FATAL_FAILURE() cannot
-  // reference auto variables.
-  static int n;
-  n = 0;
-  EXPECT_THAT(n, AllOf(Le(7), Ref(n)));
-  EXPECT_FATAL_FAILURE(ASSERT_THAT(n, Not(Ref(n))),
-                       "Value of: n\n"
-                       "Expected: does not reference the variable @");
-  // Tests the "Actual" part.
-  EXPECT_FATAL_FAILURE(ASSERT_THAT(n, Not(Ref(n))),
-                       "Actual: 0" + OfType("int") + ", which is located @");
-}
-
-// Tests that ASSERT_THAT() and EXPECT_THAT() work when the matcher is
-// monomorphic.
-TEST(MatcherAssertionTest, WorksForMonomorphicMatcher) {
-  Matcher<const char*> starts_with_he = StartsWith("he");
-  ASSERT_THAT("hello", starts_with_he);
-
-  Matcher<const std::string&> ends_with_ok = EndsWith("ok");
-  ASSERT_THAT("book", ends_with_ok);
-  const std::string bad = "bad";
-  EXPECT_NONFATAL_FAILURE(EXPECT_THAT(bad, ends_with_ok),
-                          "Value of: bad\n"
-                          "Expected: ends with \"ok\"\n"
-                          "  Actual: \"bad\"");
-  Matcher<int> is_greater_than_5 = Gt(5);
-  EXPECT_NONFATAL_FAILURE(EXPECT_THAT(5, is_greater_than_5),
-                          "Value of: 5\n"
-                          "Expected: is > 5\n"
-                          "  Actual: 5" +
-                              OfType("int"));
-}
-
-// Tests floating-point matchers.
-template <typename RawType>
-class FloatingPointTest : public testing::Test {
- protected:
-  typedef testing::internal::FloatingPoint<RawType> Floating;
-  typedef typename Floating::Bits Bits;
-
-  FloatingPointTest()
-      : max_ulps_(Floating::kMaxUlps),
-        zero_bits_(Floating(0).bits()),
-        one_bits_(Floating(1).bits()),
-        infinity_bits_(Floating(Floating::Infinity()).bits()),
-        close_to_positive_zero_(
-            Floating::ReinterpretBits(zero_bits_ + max_ulps_ / 2)),
-        close_to_negative_zero_(
-            -Floating::ReinterpretBits(zero_bits_ + max_ulps_ - max_ulps_ / 2)),
-        further_from_negative_zero_(-Floating::ReinterpretBits(
-            zero_bits_ + max_ulps_ + 1 - max_ulps_ / 2)),
-        close_to_one_(Floating::ReinterpretBits(one_bits_ + max_ulps_)),
-        further_from_one_(Floating::ReinterpretBits(one_bits_ + max_ulps_ + 1)),
-        infinity_(Floating::Infinity()),
-        close_to_infinity_(
-            Floating::ReinterpretBits(infinity_bits_ - max_ulps_)),
-        further_from_infinity_(
-            Floating::ReinterpretBits(infinity_bits_ - max_ulps_ - 1)),
-        max_(Floating::Max()),
-        nan1_(Floating::ReinterpretBits(Floating::kExponentBitMask | 1)),
-        nan2_(Floating::ReinterpretBits(Floating::kExponentBitMask | 200)) {}
-
-  void TestSize() { EXPECT_EQ(sizeof(RawType), sizeof(Bits)); }
-
-  // A battery of tests for FloatingEqMatcher::Matches.
-  // matcher_maker is a pointer to a function which creates a FloatingEqMatcher.
-  void TestMatches(
-      testing::internal::FloatingEqMatcher<RawType> (*matcher_maker)(RawType)) {
-    Matcher<RawType> m1 = matcher_maker(0.0);
-    EXPECT_TRUE(m1.Matches(-0.0));
-    EXPECT_TRUE(m1.Matches(close_to_positive_zero_));
-    EXPECT_TRUE(m1.Matches(close_to_negative_zero_));
-    EXPECT_FALSE(m1.Matches(1.0));
-
-    Matcher<RawType> m2 = matcher_maker(close_to_positive_zero_);
-    EXPECT_FALSE(m2.Matches(further_from_negative_zero_));
-
-    Matcher<RawType> m3 = matcher_maker(1.0);
-    EXPECT_TRUE(m3.Matches(close_to_one_));
-    EXPECT_FALSE(m3.Matches(further_from_one_));
-
-    // Test commutativity: matcher_maker(0.0).Matches(1.0) was tested above.
-    EXPECT_FALSE(m3.Matches(0.0));
-
-    Matcher<RawType> m4 = matcher_maker(-infinity_);
-    EXPECT_TRUE(m4.Matches(-close_to_infinity_));
-
-    Matcher<RawType> m5 = matcher_maker(infinity_);
-    EXPECT_TRUE(m5.Matches(close_to_infinity_));
-
-    // This is interesting as the representations of infinity_ and nan1_
-    // are only 1 DLP apart.
-    EXPECT_FALSE(m5.Matches(nan1_));
-
-    // matcher_maker can produce a Matcher<const RawType&>, which is needed in
-    // some cases.
-    Matcher<const RawType&> m6 = matcher_maker(0.0);
-    EXPECT_TRUE(m6.Matches(-0.0));
-    EXPECT_TRUE(m6.Matches(close_to_positive_zero_));
-    EXPECT_FALSE(m6.Matches(1.0));
-
-    // matcher_maker can produce a Matcher<RawType&>, which is needed in some
-    // cases.
-    Matcher<RawType&> m7 = matcher_maker(0.0);
-    RawType x = 0.0;
-    EXPECT_TRUE(m7.Matches(x));
-    x = 0.01f;
-    EXPECT_FALSE(m7.Matches(x));
-  }
-
-  // Pre-calculated numbers to be used by the tests.
-
-  const Bits max_ulps_;
-
-  const Bits zero_bits_;      // The bits that represent 0.0.
-  const Bits one_bits_;       // The bits that represent 1.0.
-  const Bits infinity_bits_;  // The bits that represent +infinity.
-
-  // Some numbers close to 0.0.
-  const RawType close_to_positive_zero_;
-  const RawType close_to_negative_zero_;
-  const RawType further_from_negative_zero_;
-
-  // Some numbers close to 1.0.
-  const RawType close_to_one_;
-  const RawType further_from_one_;
-
-  // Some numbers close to +infinity.
-  const RawType infinity_;
-  const RawType close_to_infinity_;
-  const RawType further_from_infinity_;
-
-  // Maximum representable value that's not infinity.
-  const RawType max_;
-
-  // Some NaNs.
-  const RawType nan1_;
-  const RawType nan2_;
-};
-
-// Tests floating-point matchers with fixed epsilons.
-template <typename RawType>
-class FloatingPointNearTest : public FloatingPointTest<RawType> {
- protected:
-  typedef FloatingPointTest<RawType> ParentType;
-
-  // A battery of tests for FloatingEqMatcher::Matches with a fixed epsilon.
-  // matcher_maker is a pointer to a function which creates a FloatingEqMatcher.
-  void TestNearMatches(testing::internal::FloatingEqMatcher<RawType> (
-      *matcher_maker)(RawType, RawType)) {
-    Matcher<RawType> m1 = matcher_maker(0.0, 0.0);
-    EXPECT_TRUE(m1.Matches(0.0));
-    EXPECT_TRUE(m1.Matches(-0.0));
-    EXPECT_FALSE(m1.Matches(ParentType::close_to_positive_zero_));
-    EXPECT_FALSE(m1.Matches(ParentType::close_to_negative_zero_));
-    EXPECT_FALSE(m1.Matches(1.0));
-
-    Matcher<RawType> m2 = matcher_maker(0.0, 1.0);
-    EXPECT_TRUE(m2.Matches(0.0));
-    EXPECT_TRUE(m2.Matches(-0.0));
-    EXPECT_TRUE(m2.Matches(1.0));
-    EXPECT_TRUE(m2.Matches(-1.0));
-    EXPECT_FALSE(m2.Matches(ParentType::close_to_one_));
-    EXPECT_FALSE(m2.Matches(-ParentType::close_to_one_));
-
-    // Check that inf matches inf, regardless of the of the specified max
-    // absolute error.
-    Matcher<RawType> m3 = matcher_maker(ParentType::infinity_, 0.0);
-    EXPECT_TRUE(m3.Matches(ParentType::infinity_));
-    EXPECT_FALSE(m3.Matches(ParentType::close_to_infinity_));
-    EXPECT_FALSE(m3.Matches(-ParentType::infinity_));
-
-    Matcher<RawType> m4 = matcher_maker(-ParentType::infinity_, 0.0);
-    EXPECT_TRUE(m4.Matches(-ParentType::infinity_));
-    EXPECT_FALSE(m4.Matches(-ParentType::close_to_infinity_));
-    EXPECT_FALSE(m4.Matches(ParentType::infinity_));
-
-    // Test various overflow scenarios.
-    Matcher<RawType> m5 = matcher_maker(ParentType::max_, ParentType::max_);
-    EXPECT_TRUE(m5.Matches(ParentType::max_));
-    EXPECT_FALSE(m5.Matches(-ParentType::max_));
-
-    Matcher<RawType> m6 = matcher_maker(-ParentType::max_, ParentType::max_);
-    EXPECT_FALSE(m6.Matches(ParentType::max_));
-    EXPECT_TRUE(m6.Matches(-ParentType::max_));
-
-    Matcher<RawType> m7 = matcher_maker(ParentType::max_, 0);
-    EXPECT_TRUE(m7.Matches(ParentType::max_));
-    EXPECT_FALSE(m7.Matches(-ParentType::max_));
-
-    Matcher<RawType> m8 = matcher_maker(-ParentType::max_, 0);
-    EXPECT_FALSE(m8.Matches(ParentType::max_));
-    EXPECT_TRUE(m8.Matches(-ParentType::max_));
-
-    // The difference between max() and -max() normally overflows to infinity,
-    // but it should still match if the max_abs_error is also infinity.
-    Matcher<RawType> m9 =
-        matcher_maker(ParentType::max_, ParentType::infinity_);
-    EXPECT_TRUE(m8.Matches(-ParentType::max_));
-
-    // matcher_maker can produce a Matcher<const RawType&>, which is needed in
-    // some cases.
-    Matcher<const RawType&> m10 = matcher_maker(0.0, 1.0);
-    EXPECT_TRUE(m10.Matches(-0.0));
-    EXPECT_TRUE(m10.Matches(ParentType::close_to_positive_zero_));
-    EXPECT_FALSE(m10.Matches(ParentType::close_to_one_));
-
-    // matcher_maker can produce a Matcher<RawType&>, which is needed in some
-    // cases.
-    Matcher<RawType&> m11 = matcher_maker(0.0, 1.0);
-    RawType x = 0.0;
-    EXPECT_TRUE(m11.Matches(x));
-    x = 1.0f;
-    EXPECT_TRUE(m11.Matches(x));
-    x = -1.0f;
-    EXPECT_TRUE(m11.Matches(x));
-    x = 1.1f;
-    EXPECT_FALSE(m11.Matches(x));
-    x = -1.1f;
-    EXPECT_FALSE(m11.Matches(x));
-  }
-};
-
-// Instantiate FloatingPointTest for testing floats.
-typedef FloatingPointTest<float> FloatTest;
-
-TEST_F(FloatTest, FloatEqApproximatelyMatchesFloats) { TestMatches(&FloatEq); }
-
-TEST_F(FloatTest, NanSensitiveFloatEqApproximatelyMatchesFloats) {
-  TestMatches(&NanSensitiveFloatEq);
-}
-
-TEST_F(FloatTest, FloatEqCannotMatchNaN) {
-  // FloatEq never matches NaN.
-  Matcher<float> m = FloatEq(nan1_);
-  EXPECT_FALSE(m.Matches(nan1_));
-  EXPECT_FALSE(m.Matches(nan2_));
-  EXPECT_FALSE(m.Matches(1.0));
-}
-
-TEST_F(FloatTest, NanSensitiveFloatEqCanMatchNaN) {
-  // NanSensitiveFloatEq will match NaN.
-  Matcher<float> m = NanSensitiveFloatEq(nan1_);
-  EXPECT_TRUE(m.Matches(nan1_));
-  EXPECT_TRUE(m.Matches(nan2_));
-  EXPECT_FALSE(m.Matches(1.0));
-}
-
-TEST_F(FloatTest, FloatEqCanDescribeSelf) {
-  Matcher<float> m1 = FloatEq(2.0f);
-  EXPECT_EQ("is approximately 2", Describe(m1));
-  EXPECT_EQ("isn't approximately 2", DescribeNegation(m1));
-
-  Matcher<float> m2 = FloatEq(0.5f);
-  EXPECT_EQ("is approximately 0.5", Describe(m2));
-  EXPECT_EQ("isn't approximately 0.5", DescribeNegation(m2));
-
-  Matcher<float> m3 = FloatEq(nan1_);
-  EXPECT_EQ("never matches", Describe(m3));
-  EXPECT_EQ("is anything", DescribeNegation(m3));
-}
-
-TEST_F(FloatTest, NanSensitiveFloatEqCanDescribeSelf) {
-  Matcher<float> m1 = NanSensitiveFloatEq(2.0f);
-  EXPECT_EQ("is approximately 2", Describe(m1));
-  EXPECT_EQ("isn't approximately 2", DescribeNegation(m1));
-
-  Matcher<float> m2 = NanSensitiveFloatEq(0.5f);
-  EXPECT_EQ("is approximately 0.5", Describe(m2));
-  EXPECT_EQ("isn't approximately 0.5", DescribeNegation(m2));
-
-  Matcher<float> m3 = NanSensitiveFloatEq(nan1_);
-  EXPECT_EQ("is NaN", Describe(m3));
-  EXPECT_EQ("isn't NaN", DescribeNegation(m3));
-}
-
-// Instantiate FloatingPointTest for testing floats with a user-specified
-// max absolute error.
-typedef FloatingPointNearTest<float> FloatNearTest;
-
-TEST_F(FloatNearTest, FloatNearMatches) { TestNearMatches(&FloatNear); }
-
-TEST_F(FloatNearTest, NanSensitiveFloatNearApproximatelyMatchesFloats) {
-  TestNearMatches(&NanSensitiveFloatNear);
-}
-
-TEST_F(FloatNearTest, FloatNearCanDescribeSelf) {
-  Matcher<float> m1 = FloatNear(2.0f, 0.5f);
-  EXPECT_EQ("is approximately 2 (absolute error <= 0.5)", Describe(m1));
-  EXPECT_EQ("isn't approximately 2 (absolute error > 0.5)",
-            DescribeNegation(m1));
-
-  Matcher<float> m2 = FloatNear(0.5f, 0.5f);
-  EXPECT_EQ("is approximately 0.5 (absolute error <= 0.5)", Describe(m2));
-  EXPECT_EQ("isn't approximately 0.5 (absolute error > 0.5)",
-            DescribeNegation(m2));
-
-  Matcher<float> m3 = FloatNear(nan1_, 0.0);
-  EXPECT_EQ("never matches", Describe(m3));
-  EXPECT_EQ("is anything", DescribeNegation(m3));
-}
-
-TEST_F(FloatNearTest, NanSensitiveFloatNearCanDescribeSelf) {
-  Matcher<float> m1 = NanSensitiveFloatNear(2.0f, 0.5f);
-  EXPECT_EQ("is approximately 2 (absolute error <= 0.5)", Describe(m1));
-  EXPECT_EQ("isn't approximately 2 (absolute error > 0.5)",
-            DescribeNegation(m1));
-
-  Matcher<float> m2 = NanSensitiveFloatNear(0.5f, 0.5f);
-  EXPECT_EQ("is approximately 0.5 (absolute error <= 0.5)", Describe(m2));
-  EXPECT_EQ("isn't approximately 0.5 (absolute error > 0.5)",
-            DescribeNegation(m2));
-
-  Matcher<float> m3 = NanSensitiveFloatNear(nan1_, 0.1f);
-  EXPECT_EQ("is NaN", Describe(m3));
-  EXPECT_EQ("isn't NaN", DescribeNegation(m3));
-}
-
-TEST_F(FloatNearTest, FloatNearCannotMatchNaN) {
-  // FloatNear never matches NaN.
-  Matcher<float> m = FloatNear(ParentType::nan1_, 0.1f);
-  EXPECT_FALSE(m.Matches(nan1_));
-  EXPECT_FALSE(m.Matches(nan2_));
-  EXPECT_FALSE(m.Matches(1.0));
-}
-
-TEST_F(FloatNearTest, NanSensitiveFloatNearCanMatchNaN) {
-  // NanSensitiveFloatNear will match NaN.
-  Matcher<float> m = NanSensitiveFloatNear(nan1_, 0.1f);
-  EXPECT_TRUE(m.Matches(nan1_));
-  EXPECT_TRUE(m.Matches(nan2_));
-  EXPECT_FALSE(m.Matches(1.0));
-}
-
-// Instantiate FloatingPointTest for testing doubles.
-typedef FloatingPointTest<double> DoubleTest;
-
-TEST_F(DoubleTest, DoubleEqApproximatelyMatchesDoubles) {
-  TestMatches(&DoubleEq);
-}
-
-TEST_F(DoubleTest, NanSensitiveDoubleEqApproximatelyMatchesDoubles) {
-  TestMatches(&NanSensitiveDoubleEq);
-}
-
-TEST_F(DoubleTest, DoubleEqCannotMatchNaN) {
-  // DoubleEq never matches NaN.
-  Matcher<double> m = DoubleEq(nan1_);
-  EXPECT_FALSE(m.Matches(nan1_));
-  EXPECT_FALSE(m.Matches(nan2_));
-  EXPECT_FALSE(m.Matches(1.0));
-}
-
-TEST_F(DoubleTest, NanSensitiveDoubleEqCanMatchNaN) {
-  // NanSensitiveDoubleEq will match NaN.
-  Matcher<double> m = NanSensitiveDoubleEq(nan1_);
-  EXPECT_TRUE(m.Matches(nan1_));
-  EXPECT_TRUE(m.Matches(nan2_));
-  EXPECT_FALSE(m.Matches(1.0));
-}
-
-TEST_F(DoubleTest, DoubleEqCanDescribeSelf) {
-  Matcher<double> m1 = DoubleEq(2.0);
-  EXPECT_EQ("is approximately 2", Describe(m1));
-  EXPECT_EQ("isn't approximately 2", DescribeNegation(m1));
-
-  Matcher<double> m2 = DoubleEq(0.5);
-  EXPECT_EQ("is approximately 0.5", Describe(m2));
-  EXPECT_EQ("isn't approximately 0.5", DescribeNegation(m2));
-
-  Matcher<double> m3 = DoubleEq(nan1_);
-  EXPECT_EQ("never matches", Describe(m3));
-  EXPECT_EQ("is anything", DescribeNegation(m3));
-}
-
-TEST_F(DoubleTest, NanSensitiveDoubleEqCanDescribeSelf) {
-  Matcher<double> m1 = NanSensitiveDoubleEq(2.0);
-  EXPECT_EQ("is approximately 2", Describe(m1));
-  EXPECT_EQ("isn't approximately 2", DescribeNegation(m1));
-
-  Matcher<double> m2 = NanSensitiveDoubleEq(0.5);
-  EXPECT_EQ("is approximately 0.5", Describe(m2));
-  EXPECT_EQ("isn't approximately 0.5", DescribeNegation(m2));
-
-  Matcher<double> m3 = NanSensitiveDoubleEq(nan1_);
-  EXPECT_EQ("is NaN", Describe(m3));
-  EXPECT_EQ("isn't NaN", DescribeNegation(m3));
-}
-
-// Instantiate FloatingPointTest for testing floats with a user-specified
-// max absolute error.
-typedef FloatingPointNearTest<double> DoubleNearTest;
-
-TEST_F(DoubleNearTest, DoubleNearMatches) { TestNearMatches(&DoubleNear); }
-
-TEST_F(DoubleNearTest, NanSensitiveDoubleNearApproximatelyMatchesDoubles) {
-  TestNearMatches(&NanSensitiveDoubleNear);
-}
-
-TEST_F(DoubleNearTest, DoubleNearCanDescribeSelf) {
-  Matcher<double> m1 = DoubleNear(2.0, 0.5);
-  EXPECT_EQ("is approximately 2 (absolute error <= 0.5)", Describe(m1));
-  EXPECT_EQ("isn't approximately 2 (absolute error > 0.5)",
-            DescribeNegation(m1));
-
-  Matcher<double> m2 = DoubleNear(0.5, 0.5);
-  EXPECT_EQ("is approximately 0.5 (absolute error <= 0.5)", Describe(m2));
-  EXPECT_EQ("isn't approximately 0.5 (absolute error > 0.5)",
-            DescribeNegation(m2));
-
-  Matcher<double> m3 = DoubleNear(nan1_, 0.0);
-  EXPECT_EQ("never matches", Describe(m3));
-  EXPECT_EQ("is anything", DescribeNegation(m3));
-}
-
-TEST_F(DoubleNearTest, ExplainsResultWhenMatchFails) {
-  EXPECT_EQ("", Explain(DoubleNear(2.0, 0.1), 2.05));
-  EXPECT_EQ("which is 0.2 from 2", Explain(DoubleNear(2.0, 0.1), 2.2));
-  EXPECT_EQ("which is -0.3 from 2", Explain(DoubleNear(2.0, 0.1), 1.7));
-
-  const std::string explanation =
-      Explain(DoubleNear(2.1, 1e-10), 2.1 + 1.2e-10);
-  // Different C++ implementations may print floating-point numbers
-  // slightly differently.
-  EXPECT_TRUE(explanation == "which is 1.2e-10 from 2.1" ||  // GCC
-              explanation == "which is 1.2e-010 from 2.1")   // MSVC
-      << " where explanation is \"" << explanation << "\".";
-}
-
-TEST_F(DoubleNearTest, NanSensitiveDoubleNearCanDescribeSelf) {
-  Matcher<double> m1 = NanSensitiveDoubleNear(2.0, 0.5);
-  EXPECT_EQ("is approximately 2 (absolute error <= 0.5)", Describe(m1));
-  EXPECT_EQ("isn't approximately 2 (absolute error > 0.5)",
-            DescribeNegation(m1));
-
-  Matcher<double> m2 = NanSensitiveDoubleNear(0.5, 0.5);
-  EXPECT_EQ("is approximately 0.5 (absolute error <= 0.5)", Describe(m2));
-  EXPECT_EQ("isn't approximately 0.5 (absolute error > 0.5)",
-            DescribeNegation(m2));
-
-  Matcher<double> m3 = NanSensitiveDoubleNear(nan1_, 0.1);
-  EXPECT_EQ("is NaN", Describe(m3));
-  EXPECT_EQ("isn't NaN", DescribeNegation(m3));
-}
-
-TEST_F(DoubleNearTest, DoubleNearCannotMatchNaN) {
-  // DoubleNear never matches NaN.
-  Matcher<double> m = DoubleNear(ParentType::nan1_, 0.1);
-  EXPECT_FALSE(m.Matches(nan1_));
-  EXPECT_FALSE(m.Matches(nan2_));
-  EXPECT_FALSE(m.Matches(1.0));
-}
-
-TEST_F(DoubleNearTest, NanSensitiveDoubleNearCanMatchNaN) {
-  // NanSensitiveDoubleNear will match NaN.
-  Matcher<double> m = NanSensitiveDoubleNear(nan1_, 0.1);
-  EXPECT_TRUE(m.Matches(nan1_));
-  EXPECT_TRUE(m.Matches(nan2_));
-  EXPECT_FALSE(m.Matches(1.0));
-}
-
-TEST(PointeeTest, RawPointer) {
-  const Matcher<int*> m = Pointee(Ge(0));
-
-  int n = 1;
-  EXPECT_TRUE(m.Matches(&n));
-  n = -1;
-  EXPECT_FALSE(m.Matches(&n));
-  EXPECT_FALSE(m.Matches(nullptr));
-}
-
-TEST(PointeeTest, RawPointerToConst) {
-  const Matcher<const double*> m = Pointee(Ge(0));
-
-  double x = 1;
-  EXPECT_TRUE(m.Matches(&x));
-  x = -1;
-  EXPECT_FALSE(m.Matches(&x));
-  EXPECT_FALSE(m.Matches(nullptr));
-}
-
-TEST(PointeeTest, ReferenceToConstRawPointer) {
-  const Matcher<int* const&> m = Pointee(Ge(0));
-
-  int n = 1;
-  EXPECT_TRUE(m.Matches(&n));
-  n = -1;
-  EXPECT_FALSE(m.Matches(&n));
-  EXPECT_FALSE(m.Matches(nullptr));
-}
-
-TEST(PointeeTest, ReferenceToNonConstRawPointer) {
-  const Matcher<double*&> m = Pointee(Ge(0));
-
-  double x = 1.0;
-  double* p = &x;
-  EXPECT_TRUE(m.Matches(p));
-  x = -1;
-  EXPECT_FALSE(m.Matches(p));
-  p = nullptr;
-  EXPECT_FALSE(m.Matches(p));
-}
-
-TEST(PointeeTest, SmartPointer) {
-  const Matcher<std::unique_ptr<int>> m = Pointee(Ge(0));
-
-  std::unique_ptr<int> n(new int(1));
-  EXPECT_TRUE(m.Matches(n));
-}
-
-TEST(PointeeTest, SmartPointerToConst) {
-  const Matcher<std::unique_ptr<const int>> m = Pointee(Ge(0));
-
-  // There's no implicit conversion from unique_ptr<int> to const
-  // unique_ptr<const int>, so we must pass a unique_ptr<const int> into the
-  // matcher.
-  std::unique_ptr<const int> n(new int(1));
-  EXPECT_TRUE(m.Matches(n));
-}
-
-TEST(PointerTest, RawPointer) {
-  int n = 1;
-  const Matcher<int*> m = Pointer(Eq(&n));
-
-  EXPECT_TRUE(m.Matches(&n));
-
-  int* p = nullptr;
-  EXPECT_FALSE(m.Matches(p));
-  EXPECT_FALSE(m.Matches(nullptr));
-}
-
-TEST(PointerTest, RawPointerToConst) {
-  int n = 1;
-  const Matcher<const int*> m = Pointer(Eq(&n));
-
-  EXPECT_TRUE(m.Matches(&n));
-
-  int* p = nullptr;
-  EXPECT_FALSE(m.Matches(p));
-  EXPECT_FALSE(m.Matches(nullptr));
-}
-
-TEST(PointerTest, SmartPointer) {
-  std::unique_ptr<int> n(new int(10));
-  int* raw_n = n.get();
-  const Matcher<std::unique_ptr<int>> m = Pointer(Eq(raw_n));
-
-  EXPECT_TRUE(m.Matches(n));
-}
-
-TEST(PointerTest, SmartPointerToConst) {
-  std::unique_ptr<const int> n(new int(10));
-  const int* raw_n = n.get();
-  const Matcher<std::unique_ptr<const int>> m = Pointer(Eq(raw_n));
-
-  // There's no implicit conversion from unique_ptr<int> to const
-  // unique_ptr<const int>, so we must pass a unique_ptr<const int> into the
-  // matcher.
-  std::unique_ptr<const int> p(new int(10));
-  EXPECT_FALSE(m.Matches(p));
-}
-
-TEST(AddressTest, NonConst) {
-  int n = 1;
-  const Matcher<int> m = Address(Eq(&n));
-
-  EXPECT_TRUE(m.Matches(n));
-
-  int other = 5;
-
-  EXPECT_FALSE(m.Matches(other));
-
-  int& n_ref = n;
-
-  EXPECT_TRUE(m.Matches(n_ref));
-}
-
-TEST(AddressTest, Const) {
-  const int n = 1;
-  const Matcher<int> m = Address(Eq(&n));
-
-  EXPECT_TRUE(m.Matches(n));
-
-  int other = 5;
-
-  EXPECT_FALSE(m.Matches(other));
-}
-
-TEST(AddressTest, MatcherDoesntCopy) {
-  std::unique_ptr<int> n(new int(1));
-  const Matcher<std::unique_ptr<int>> m = Address(Eq(&n));
-
-  EXPECT_TRUE(m.Matches(n));
-}
-
-TEST(AddressTest, Describe) {
-  Matcher<int> matcher = Address(_);
-  EXPECT_EQ("has address that is anything", Describe(matcher));
-  EXPECT_EQ("does not have address that is anything",
-            DescribeNegation(matcher));
-}
-
-MATCHER_P(FieldIIs, inner_matcher, "") {
-  return ExplainMatchResult(inner_matcher, arg.i, result_listener);
-}
-
-#if GTEST_HAS_RTTI
-TEST(WhenDynamicCastToTest, SameType) {
-  Derived derived;
-  derived.i = 4;
-
-  // Right type. A pointer is passed down.
-  Base* as_base_ptr = &derived;
-  EXPECT_THAT(as_base_ptr, WhenDynamicCastTo<Derived*>(Not(IsNull())));
-  EXPECT_THAT(as_base_ptr, WhenDynamicCastTo<Derived*>(Pointee(FieldIIs(4))));
-  EXPECT_THAT(as_base_ptr,
-              Not(WhenDynamicCastTo<Derived*>(Pointee(FieldIIs(5)))));
-}
-
-TEST(WhenDynamicCastToTest, WrongTypes) {
-  Base base;
-  Derived derived;
-  OtherDerived other_derived;
-
-  // Wrong types. NULL is passed.
-  EXPECT_THAT(&base, Not(WhenDynamicCastTo<Derived*>(Pointee(_))));
-  EXPECT_THAT(&base, WhenDynamicCastTo<Derived*>(IsNull()));
-  Base* as_base_ptr = &derived;
-  EXPECT_THAT(as_base_ptr, Not(WhenDynamicCastTo<OtherDerived*>(Pointee(_))));
-  EXPECT_THAT(as_base_ptr, WhenDynamicCastTo<OtherDerived*>(IsNull()));
-  as_base_ptr = &other_derived;
-  EXPECT_THAT(as_base_ptr, Not(WhenDynamicCastTo<Derived*>(Pointee(_))));
-  EXPECT_THAT(as_base_ptr, WhenDynamicCastTo<Derived*>(IsNull()));
-}
-
-TEST(WhenDynamicCastToTest, AlreadyNull) {
-  // Already NULL.
-  Base* as_base_ptr = nullptr;
-  EXPECT_THAT(as_base_ptr, WhenDynamicCastTo<Derived*>(IsNull()));
-}
-
-struct AmbiguousCastTypes {
-  class VirtualDerived : public virtual Base {};
-  class DerivedSub1 : public VirtualDerived {};
-  class DerivedSub2 : public VirtualDerived {};
-  class ManyDerivedInHierarchy : public DerivedSub1, public DerivedSub2 {};
-};
-
-TEST(WhenDynamicCastToTest, AmbiguousCast) {
-  AmbiguousCastTypes::DerivedSub1 sub1;
-  AmbiguousCastTypes::ManyDerivedInHierarchy many_derived;
-  // Multiply derived from Base. dynamic_cast<> returns NULL.
-  Base* as_base_ptr =
-      static_cast<AmbiguousCastTypes::DerivedSub1*>(&many_derived);
-  EXPECT_THAT(as_base_ptr,
-              WhenDynamicCastTo<AmbiguousCastTypes::VirtualDerived*>(IsNull()));
-  as_base_ptr = &sub1;
-  EXPECT_THAT(
-      as_base_ptr,
-      WhenDynamicCastTo<AmbiguousCastTypes::VirtualDerived*>(Not(IsNull())));
-}
-
-TEST(WhenDynamicCastToTest, Describe) {
-  Matcher<Base*> matcher = WhenDynamicCastTo<Derived*>(Pointee(_));
-  const std::string prefix =
-      "when dynamic_cast to " + internal::GetTypeName<Derived*>() + ", ";
-  EXPECT_EQ(prefix + "points to a value that is anything", Describe(matcher));
-  EXPECT_EQ(prefix + "does not point to a value that is anything",
-            DescribeNegation(matcher));
-}
-
-TEST(WhenDynamicCastToTest, Explain) {
-  Matcher<Base*> matcher = WhenDynamicCastTo<Derived*>(Pointee(_));
-  Base* null = nullptr;
-  EXPECT_THAT(Explain(matcher, null), HasSubstr("NULL"));
-  Derived derived;
-  EXPECT_TRUE(matcher.Matches(&derived));
-  EXPECT_THAT(Explain(matcher, &derived), HasSubstr("which points to "));
-
-  // With references, the matcher itself can fail. Test for that one.
-  Matcher<const Base&> ref_matcher = WhenDynamicCastTo<const OtherDerived&>(_);
-  EXPECT_THAT(Explain(ref_matcher, derived),
-              HasSubstr("which cannot be dynamic_cast"));
-}
-
-TEST(WhenDynamicCastToTest, GoodReference) {
-  Derived derived;
-  derived.i = 4;
-  Base& as_base_ref = derived;
-  EXPECT_THAT(as_base_ref, WhenDynamicCastTo<const Derived&>(FieldIIs(4)));
-  EXPECT_THAT(as_base_ref, WhenDynamicCastTo<const Derived&>(Not(FieldIIs(5))));
-}
-
-TEST(WhenDynamicCastToTest, BadReference) {
-  Derived derived;
-  Base& as_base_ref = derived;
-  EXPECT_THAT(as_base_ref, Not(WhenDynamicCastTo<const OtherDerived&>(_)));
-}
-#endif  // GTEST_HAS_RTTI
-
-// Minimal const-propagating pointer.
-template <typename T>
-class ConstPropagatingPtr {
- public:
-  typedef T element_type;
-
-  ConstPropagatingPtr() : val_() {}
-  explicit ConstPropagatingPtr(T* t) : val_(t) {}
-  ConstPropagatingPtr(const ConstPropagatingPtr& other) : val_(other.val_) {}
-
-  T* get() { return val_; }
-  T& operator*() { return *val_; }
-  // Most smart pointers return non-const T* and T& from the next methods.
-  const T* get() const { return val_; }
-  const T& operator*() const { return *val_; }
-
- private:
-  T* val_;
-};
-
-TEST(PointeeTest, WorksWithConstPropagatingPointers) {
-  const Matcher<ConstPropagatingPtr<int>> m = Pointee(Lt(5));
-  int three = 3;
-  const ConstPropagatingPtr<int> co(&three);
-  ConstPropagatingPtr<int> o(&three);
-  EXPECT_TRUE(m.Matches(o));
-  EXPECT_TRUE(m.Matches(co));
-  *o = 6;
-  EXPECT_FALSE(m.Matches(o));
-  EXPECT_FALSE(m.Matches(ConstPropagatingPtr<int>()));
-}
-
-TEST(PointeeTest, NeverMatchesNull) {
-  const Matcher<const char*> m = Pointee(_);
-  EXPECT_FALSE(m.Matches(nullptr));
-}
-
-// Tests that we can write Pointee(value) instead of Pointee(Eq(value)).
-TEST(PointeeTest, MatchesAgainstAValue) {
-  const Matcher<int*> m = Pointee(5);
-
-  int n = 5;
-  EXPECT_TRUE(m.Matches(&n));
-  n = -1;
-  EXPECT_FALSE(m.Matches(&n));
-  EXPECT_FALSE(m.Matches(nullptr));
-}
-
-TEST(PointeeTest, CanDescribeSelf) {
-  const Matcher<int*> m = Pointee(Gt(3));
-  EXPECT_EQ("points to a value that is > 3", Describe(m));
-  EXPECT_EQ("does not point to a value that is > 3", DescribeNegation(m));
-}
-
-TEST(PointeeTest, CanExplainMatchResult) {
-  const Matcher<const std::string*> m = Pointee(StartsWith("Hi"));
-
-  EXPECT_EQ("", Explain(m, static_cast<const std::string*>(nullptr)));
-
-  const Matcher<long*> m2 = Pointee(GreaterThan(1));  // NOLINT
-  long n = 3;                                         // NOLINT
-  EXPECT_EQ("which points to 3" + OfType("long") + ", which is 2 more than 1",
-            Explain(m2, &n));
-}
-
-TEST(PointeeTest, AlwaysExplainsPointee) {
-  const Matcher<int*> m = Pointee(0);
-  int n = 42;
-  EXPECT_EQ("which points to 42" + OfType("int"), Explain(m, &n));
-}
-
-// An uncopyable class.
-class Uncopyable {
- public:
-  Uncopyable() : value_(-1) {}
-  explicit Uncopyable(int a_value) : value_(a_value) {}
-
-  int value() const { return value_; }
-  void set_value(int i) { value_ = i; }
-
- private:
-  int value_;
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(Uncopyable);
-};
-
-// Returns true if and only if x.value() is positive.
-bool ValueIsPositive(const Uncopyable& x) { return x.value() > 0; }
-
-MATCHER_P(UncopyableIs, inner_matcher, "") {
-  return ExplainMatchResult(inner_matcher, arg.value(), result_listener);
-}
-
-// A user-defined struct for testing Field().
-struct AStruct {
-  AStruct() : x(0), y(1.0), z(5), p(nullptr) {}
-  AStruct(const AStruct& rhs)
-      : x(rhs.x), y(rhs.y), z(rhs.z.value()), p(rhs.p) {}
-
-  int x;           // A non-const field.
-  const double y;  // A const field.
-  Uncopyable z;    // An uncopyable field.
-  const char* p;   // A pointer field.
-};
-
-// A derived struct for testing Field().
-struct DerivedStruct : public AStruct {
-  char ch;
-};
-
-// Tests that Field(&Foo::field, ...) works when field is non-const.
-TEST(FieldTest, WorksForNonConstField) {
-  Matcher<AStruct> m = Field(&AStruct::x, Ge(0));
-  Matcher<AStruct> m_with_name = Field("x", &AStruct::x, Ge(0));
-
-  AStruct a;
-  EXPECT_TRUE(m.Matches(a));
-  EXPECT_TRUE(m_with_name.Matches(a));
-  a.x = -1;
-  EXPECT_FALSE(m.Matches(a));
-  EXPECT_FALSE(m_with_name.Matches(a));
-}
-
-// Tests that Field(&Foo::field, ...) works when field is const.
-TEST(FieldTest, WorksForConstField) {
-  AStruct a;
-
-  Matcher<AStruct> m = Field(&AStruct::y, Ge(0.0));
-  Matcher<AStruct> m_with_name = Field("y", &AStruct::y, Ge(0.0));
-  EXPECT_TRUE(m.Matches(a));
-  EXPECT_TRUE(m_with_name.Matches(a));
-  m = Field(&AStruct::y, Le(0.0));
-  m_with_name = Field("y", &AStruct::y, Le(0.0));
-  EXPECT_FALSE(m.Matches(a));
-  EXPECT_FALSE(m_with_name.Matches(a));
-}
-
-// Tests that Field(&Foo::field, ...) works when field is not copyable.
-TEST(FieldTest, WorksForUncopyableField) {
-  AStruct a;
-
-  Matcher<AStruct> m = Field(&AStruct::z, Truly(ValueIsPositive));
-  EXPECT_TRUE(m.Matches(a));
-  m = Field(&AStruct::z, Not(Truly(ValueIsPositive)));
-  EXPECT_FALSE(m.Matches(a));
-}
-
-// Tests that Field(&Foo::field, ...) works when field is a pointer.
-TEST(FieldTest, WorksForPointerField) {
-  // Matching against NULL.
-  Matcher<AStruct> m = Field(&AStruct::p, static_cast<const char*>(nullptr));
-  AStruct a;
-  EXPECT_TRUE(m.Matches(a));
-  a.p = "hi";
-  EXPECT_FALSE(m.Matches(a));
-
-  // Matching a pointer that is not NULL.
-  m = Field(&AStruct::p, StartsWith("hi"));
-  a.p = "hill";
-  EXPECT_TRUE(m.Matches(a));
-  a.p = "hole";
-  EXPECT_FALSE(m.Matches(a));
-}
-
-// Tests that Field() works when the object is passed by reference.
-TEST(FieldTest, WorksForByRefArgument) {
-  Matcher<const AStruct&> m = Field(&AStruct::x, Ge(0));
-
-  AStruct a;
-  EXPECT_TRUE(m.Matches(a));
-  a.x = -1;
-  EXPECT_FALSE(m.Matches(a));
-}
-
-// Tests that Field(&Foo::field, ...) works when the argument's type
-// is a sub-type of Foo.
-TEST(FieldTest, WorksForArgumentOfSubType) {
-  // Note that the matcher expects DerivedStruct but we say AStruct
-  // inside Field().
-  Matcher<const DerivedStruct&> m = Field(&AStruct::x, Ge(0));
-
-  DerivedStruct d;
-  EXPECT_TRUE(m.Matches(d));
-  d.x = -1;
-  EXPECT_FALSE(m.Matches(d));
-}
-
-// Tests that Field(&Foo::field, m) works when field's type and m's
-// argument type are compatible but not the same.
-TEST(FieldTest, WorksForCompatibleMatcherType) {
-  // The field is an int, but the inner matcher expects a signed char.
-  Matcher<const AStruct&> m = Field(&AStruct::x, Matcher<signed char>(Ge(0)));
-
-  AStruct a;
-  EXPECT_TRUE(m.Matches(a));
-  a.x = -1;
-  EXPECT_FALSE(m.Matches(a));
-}
-
-// Tests that Field() can describe itself.
-TEST(FieldTest, CanDescribeSelf) {
-  Matcher<const AStruct&> m = Field(&AStruct::x, Ge(0));
-
-  EXPECT_EQ("is an object whose given field is >= 0", Describe(m));
-  EXPECT_EQ("is an object whose given field isn't >= 0", DescribeNegation(m));
-}
-
-TEST(FieldTest, CanDescribeSelfWithFieldName) {
-  Matcher<const AStruct&> m = Field("field_name", &AStruct::x, Ge(0));
-
-  EXPECT_EQ("is an object whose field `field_name` is >= 0", Describe(m));
-  EXPECT_EQ("is an object whose field `field_name` isn't >= 0",
-            DescribeNegation(m));
-}
-
-// Tests that Field() can explain the match result.
-TEST(FieldTest, CanExplainMatchResult) {
-  Matcher<const AStruct&> m = Field(&AStruct::x, Ge(0));
-
-  AStruct a;
-  a.x = 1;
-  EXPECT_EQ("whose given field is 1" + OfType("int"), Explain(m, a));
-
-  m = Field(&AStruct::x, GreaterThan(0));
-  EXPECT_EQ(
-      "whose given field is 1" + OfType("int") + ", which is 1 more than 0",
-      Explain(m, a));
-}
-
-TEST(FieldTest, CanExplainMatchResultWithFieldName) {
-  Matcher<const AStruct&> m = Field("field_name", &AStruct::x, Ge(0));
-
-  AStruct a;
-  a.x = 1;
-  EXPECT_EQ("whose field `field_name` is 1" + OfType("int"), Explain(m, a));
-
-  m = Field("field_name", &AStruct::x, GreaterThan(0));
-  EXPECT_EQ("whose field `field_name` is 1" + OfType("int") +
-                ", which is 1 more than 0",
-            Explain(m, a));
-}
-
-// Tests that Field() works when the argument is a pointer to const.
-TEST(FieldForPointerTest, WorksForPointerToConst) {
-  Matcher<const AStruct*> m = Field(&AStruct::x, Ge(0));
-
-  AStruct a;
-  EXPECT_TRUE(m.Matches(&a));
-  a.x = -1;
-  EXPECT_FALSE(m.Matches(&a));
-}
-
-// Tests that Field() works when the argument is a pointer to non-const.
-TEST(FieldForPointerTest, WorksForPointerToNonConst) {
-  Matcher<AStruct*> m = Field(&AStruct::x, Ge(0));
-
-  AStruct a;
-  EXPECT_TRUE(m.Matches(&a));
-  a.x = -1;
-  EXPECT_FALSE(m.Matches(&a));
-}
-
-// Tests that Field() works when the argument is a reference to a const pointer.
-TEST(FieldForPointerTest, WorksForReferenceToConstPointer) {
-  Matcher<AStruct* const&> m = Field(&AStruct::x, Ge(0));
-
-  AStruct a;
-  EXPECT_TRUE(m.Matches(&a));
-  a.x = -1;
-  EXPECT_FALSE(m.Matches(&a));
-}
-
-// Tests that Field() does not match the NULL pointer.
-TEST(FieldForPointerTest, DoesNotMatchNull) {
-  Matcher<const AStruct*> m = Field(&AStruct::x, _);
-  EXPECT_FALSE(m.Matches(nullptr));
-}
-
-// Tests that Field(&Foo::field, ...) works when the argument's type
-// is a sub-type of const Foo*.
-TEST(FieldForPointerTest, WorksForArgumentOfSubType) {
-  // Note that the matcher expects DerivedStruct but we say AStruct
-  // inside Field().
-  Matcher<DerivedStruct*> m = Field(&AStruct::x, Ge(0));
-
-  DerivedStruct d;
-  EXPECT_TRUE(m.Matches(&d));
-  d.x = -1;
-  EXPECT_FALSE(m.Matches(&d));
-}
-
-// Tests that Field() can describe itself when used to match a pointer.
-TEST(FieldForPointerTest, CanDescribeSelf) {
-  Matcher<const AStruct*> m = Field(&AStruct::x, Ge(0));
-
-  EXPECT_EQ("is an object whose given field is >= 0", Describe(m));
-  EXPECT_EQ("is an object whose given field isn't >= 0", DescribeNegation(m));
-}
-
-TEST(FieldForPointerTest, CanDescribeSelfWithFieldName) {
-  Matcher<const AStruct*> m = Field("field_name", &AStruct::x, Ge(0));
-
-  EXPECT_EQ("is an object whose field `field_name` is >= 0", Describe(m));
-  EXPECT_EQ("is an object whose field `field_name` isn't >= 0",
-            DescribeNegation(m));
-}
-
-// Tests that Field() can explain the result of matching a pointer.
-TEST(FieldForPointerTest, CanExplainMatchResult) {
-  Matcher<const AStruct*> m = Field(&AStruct::x, Ge(0));
-
-  AStruct a;
-  a.x = 1;
-  EXPECT_EQ("", Explain(m, static_cast<const AStruct*>(nullptr)));
-  EXPECT_EQ("which points to an object whose given field is 1" + OfType("int"),
-            Explain(m, &a));
-
-  m = Field(&AStruct::x, GreaterThan(0));
-  EXPECT_EQ("which points to an object whose given field is 1" + OfType("int") +
-                ", which is 1 more than 0",
-            Explain(m, &a));
-}
-
-TEST(FieldForPointerTest, CanExplainMatchResultWithFieldName) {
-  Matcher<const AStruct*> m = Field("field_name", &AStruct::x, Ge(0));
-
-  AStruct a;
-  a.x = 1;
-  EXPECT_EQ("", Explain(m, static_cast<const AStruct*>(nullptr)));
-  EXPECT_EQ(
-      "which points to an object whose field `field_name` is 1" + OfType("int"),
-      Explain(m, &a));
-
-  m = Field("field_name", &AStruct::x, GreaterThan(0));
-  EXPECT_EQ("which points to an object whose field `field_name` is 1" +
-                OfType("int") + ", which is 1 more than 0",
-            Explain(m, &a));
-}
-
-// A user-defined class for testing Property().
-class AClass {
- public:
-  AClass() : n_(0) {}
-
-  // A getter that returns a non-reference.
-  int n() const { return n_; }
-
-  void set_n(int new_n) { n_ = new_n; }
-
-  // A getter that returns a reference to const.
-  const std::string& s() const { return s_; }
-
-  const std::string& s_ref() const& { return s_; }
-
-  void set_s(const std::string& new_s) { s_ = new_s; }
-
-  // A getter that returns a reference to non-const.
-  double& x() const { return x_; }
-
- private:
-  int n_;
-  std::string s_;
-
-  static double x_;
-};
-
-double AClass::x_ = 0.0;
-
-// A derived class for testing Property().
-class DerivedClass : public AClass {
- public:
-  int k() const { return k_; }
-
- private:
-  int k_;
-};
-
-// Tests that Property(&Foo::property, ...) works when property()
-// returns a non-reference.
-TEST(PropertyTest, WorksForNonReferenceProperty) {
-  Matcher<const AClass&> m = Property(&AClass::n, Ge(0));
-  Matcher<const AClass&> m_with_name = Property("n", &AClass::n, Ge(0));
-
-  AClass a;
-  a.set_n(1);
-  EXPECT_TRUE(m.Matches(a));
-  EXPECT_TRUE(m_with_name.Matches(a));
-
-  a.set_n(-1);
-  EXPECT_FALSE(m.Matches(a));
-  EXPECT_FALSE(m_with_name.Matches(a));
-}
-
-// Tests that Property(&Foo::property, ...) works when property()
-// returns a reference to const.
-TEST(PropertyTest, WorksForReferenceToConstProperty) {
-  Matcher<const AClass&> m = Property(&AClass::s, StartsWith("hi"));
-  Matcher<const AClass&> m_with_name =
-      Property("s", &AClass::s, StartsWith("hi"));
-
-  AClass a;
-  a.set_s("hill");
-  EXPECT_TRUE(m.Matches(a));
-  EXPECT_TRUE(m_with_name.Matches(a));
-
-  a.set_s("hole");
-  EXPECT_FALSE(m.Matches(a));
-  EXPECT_FALSE(m_with_name.Matches(a));
-}
-
-// Tests that Property(&Foo::property, ...) works when property() is
-// ref-qualified.
-TEST(PropertyTest, WorksForRefQualifiedProperty) {
-  Matcher<const AClass&> m = Property(&AClass::s_ref, StartsWith("hi"));
-  Matcher<const AClass&> m_with_name =
-      Property("s", &AClass::s_ref, StartsWith("hi"));
-
-  AClass a;
-  a.set_s("hill");
-  EXPECT_TRUE(m.Matches(a));
-  EXPECT_TRUE(m_with_name.Matches(a));
-
-  a.set_s("hole");
-  EXPECT_FALSE(m.Matches(a));
-  EXPECT_FALSE(m_with_name.Matches(a));
-}
-
-// Tests that Property(&Foo::property, ...) works when property()
-// returns a reference to non-const.
-TEST(PropertyTest, WorksForReferenceToNonConstProperty) {
-  double x = 0.0;
-  AClass a;
-
-  Matcher<const AClass&> m = Property(&AClass::x, Ref(x));
-  EXPECT_FALSE(m.Matches(a));
-
-  m = Property(&AClass::x, Not(Ref(x)));
-  EXPECT_TRUE(m.Matches(a));
-}
-
-// Tests that Property(&Foo::property, ...) works when the argument is
-// passed by value.
-TEST(PropertyTest, WorksForByValueArgument) {
-  Matcher<AClass> m = Property(&AClass::s, StartsWith("hi"));
-
-  AClass a;
-  a.set_s("hill");
-  EXPECT_TRUE(m.Matches(a));
-
-  a.set_s("hole");
-  EXPECT_FALSE(m.Matches(a));
-}
-
-// Tests that Property(&Foo::property, ...) works when the argument's
-// type is a sub-type of Foo.
-TEST(PropertyTest, WorksForArgumentOfSubType) {
-  // The matcher expects a DerivedClass, but inside the Property() we
-  // say AClass.
-  Matcher<const DerivedClass&> m = Property(&AClass::n, Ge(0));
-
-  DerivedClass d;
-  d.set_n(1);
-  EXPECT_TRUE(m.Matches(d));
-
-  d.set_n(-1);
-  EXPECT_FALSE(m.Matches(d));
-}
-
-// Tests that Property(&Foo::property, m) works when property()'s type
-// and m's argument type are compatible but different.
-TEST(PropertyTest, WorksForCompatibleMatcherType) {
-  // n() returns an int but the inner matcher expects a signed char.
-  Matcher<const AClass&> m = Property(&AClass::n, Matcher<signed char>(Ge(0)));
-
-  Matcher<const AClass&> m_with_name =
-      Property("n", &AClass::n, Matcher<signed char>(Ge(0)));
-
-  AClass a;
-  EXPECT_TRUE(m.Matches(a));
-  EXPECT_TRUE(m_with_name.Matches(a));
-  a.set_n(-1);
-  EXPECT_FALSE(m.Matches(a));
-  EXPECT_FALSE(m_with_name.Matches(a));
-}
-
-// Tests that Property() can describe itself.
-TEST(PropertyTest, CanDescribeSelf) {
-  Matcher<const AClass&> m = Property(&AClass::n, Ge(0));
-
-  EXPECT_EQ("is an object whose given property is >= 0", Describe(m));
-  EXPECT_EQ("is an object whose given property isn't >= 0",
-            DescribeNegation(m));
-}
-
-TEST(PropertyTest, CanDescribeSelfWithPropertyName) {
-  Matcher<const AClass&> m = Property("fancy_name", &AClass::n, Ge(0));
-
-  EXPECT_EQ("is an object whose property `fancy_name` is >= 0", Describe(m));
-  EXPECT_EQ("is an object whose property `fancy_name` isn't >= 0",
-            DescribeNegation(m));
-}
-
-// Tests that Property() can explain the match result.
-TEST(PropertyTest, CanExplainMatchResult) {
-  Matcher<const AClass&> m = Property(&AClass::n, Ge(0));
-
-  AClass a;
-  a.set_n(1);
-  EXPECT_EQ("whose given property is 1" + OfType("int"), Explain(m, a));
-
-  m = Property(&AClass::n, GreaterThan(0));
-  EXPECT_EQ(
-      "whose given property is 1" + OfType("int") + ", which is 1 more than 0",
-      Explain(m, a));
-}
-
-TEST(PropertyTest, CanExplainMatchResultWithPropertyName) {
-  Matcher<const AClass&> m = Property("fancy_name", &AClass::n, Ge(0));
-
-  AClass a;
-  a.set_n(1);
-  EXPECT_EQ("whose property `fancy_name` is 1" + OfType("int"), Explain(m, a));
-
-  m = Property("fancy_name", &AClass::n, GreaterThan(0));
-  EXPECT_EQ("whose property `fancy_name` is 1" + OfType("int") +
-                ", which is 1 more than 0",
-            Explain(m, a));
-}
-
-// Tests that Property() works when the argument is a pointer to const.
-TEST(PropertyForPointerTest, WorksForPointerToConst) {
-  Matcher<const AClass*> m = Property(&AClass::n, Ge(0));
-
-  AClass a;
-  a.set_n(1);
-  EXPECT_TRUE(m.Matches(&a));
-
-  a.set_n(-1);
-  EXPECT_FALSE(m.Matches(&a));
-}
-
-// Tests that Property() works when the argument is a pointer to non-const.
-TEST(PropertyForPointerTest, WorksForPointerToNonConst) {
-  Matcher<AClass*> m = Property(&AClass::s, StartsWith("hi"));
-
-  AClass a;
-  a.set_s("hill");
-  EXPECT_TRUE(m.Matches(&a));
-
-  a.set_s("hole");
-  EXPECT_FALSE(m.Matches(&a));
-}
-
-// Tests that Property() works when the argument is a reference to a
-// const pointer.
-TEST(PropertyForPointerTest, WorksForReferenceToConstPointer) {
-  Matcher<AClass* const&> m = Property(&AClass::s, StartsWith("hi"));
-
-  AClass a;
-  a.set_s("hill");
-  EXPECT_TRUE(m.Matches(&a));
-
-  a.set_s("hole");
-  EXPECT_FALSE(m.Matches(&a));
-}
-
-// Tests that Property() does not match the NULL pointer.
-TEST(PropertyForPointerTest, WorksForReferenceToNonConstProperty) {
-  Matcher<const AClass*> m = Property(&AClass::x, _);
-  EXPECT_FALSE(m.Matches(nullptr));
-}
-
-// Tests that Property(&Foo::property, ...) works when the argument's
-// type is a sub-type of const Foo*.
-TEST(PropertyForPointerTest, WorksForArgumentOfSubType) {
-  // The matcher expects a DerivedClass, but inside the Property() we
-  // say AClass.
-  Matcher<const DerivedClass*> m = Property(&AClass::n, Ge(0));
-
-  DerivedClass d;
-  d.set_n(1);
-  EXPECT_TRUE(m.Matches(&d));
-
-  d.set_n(-1);
-  EXPECT_FALSE(m.Matches(&d));
-}
-
-// Tests that Property() can describe itself when used to match a pointer.
-TEST(PropertyForPointerTest, CanDescribeSelf) {
-  Matcher<const AClass*> m = Property(&AClass::n, Ge(0));
-
-  EXPECT_EQ("is an object whose given property is >= 0", Describe(m));
-  EXPECT_EQ("is an object whose given property isn't >= 0",
-            DescribeNegation(m));
-}
-
-TEST(PropertyForPointerTest, CanDescribeSelfWithPropertyDescription) {
-  Matcher<const AClass*> m = Property("fancy_name", &AClass::n, Ge(0));
-
-  EXPECT_EQ("is an object whose property `fancy_name` is >= 0", Describe(m));
-  EXPECT_EQ("is an object whose property `fancy_name` isn't >= 0",
-            DescribeNegation(m));
-}
-
-// Tests that Property() can explain the result of matching a pointer.
-TEST(PropertyForPointerTest, CanExplainMatchResult) {
-  Matcher<const AClass*> m = Property(&AClass::n, Ge(0));
-
-  AClass a;
-  a.set_n(1);
-  EXPECT_EQ("", Explain(m, static_cast<const AClass*>(nullptr)));
-  EXPECT_EQ(
-      "which points to an object whose given property is 1" + OfType("int"),
-      Explain(m, &a));
-
-  m = Property(&AClass::n, GreaterThan(0));
-  EXPECT_EQ("which points to an object whose given property is 1" +
-                OfType("int") + ", which is 1 more than 0",
-            Explain(m, &a));
-}
-
-TEST(PropertyForPointerTest, CanExplainMatchResultWithPropertyName) {
-  Matcher<const AClass*> m = Property("fancy_name", &AClass::n, Ge(0));
-
-  AClass a;
-  a.set_n(1);
-  EXPECT_EQ("", Explain(m, static_cast<const AClass*>(nullptr)));
-  EXPECT_EQ("which points to an object whose property `fancy_name` is 1" +
-                OfType("int"),
-            Explain(m, &a));
-
-  m = Property("fancy_name", &AClass::n, GreaterThan(0));
-  EXPECT_EQ("which points to an object whose property `fancy_name` is 1" +
-                OfType("int") + ", which is 1 more than 0",
-            Explain(m, &a));
-}
-
-// Tests ResultOf.
-
-// Tests that ResultOf(f, ...) compiles and works as expected when f is a
-// function pointer.
-std::string IntToStringFunction(int input) {
-  return input == 1 ? "foo" : "bar";
-}
-
-TEST(ResultOfTest, WorksForFunctionPointers) {
-  Matcher<int> matcher = ResultOf(&IntToStringFunction, Eq(std::string("foo")));
-
-  EXPECT_TRUE(matcher.Matches(1));
-  EXPECT_FALSE(matcher.Matches(2));
-}
-
-// Tests that ResultOf() can describe itself.
-TEST(ResultOfTest, CanDescribeItself) {
-  Matcher<int> matcher = ResultOf(&IntToStringFunction, StrEq("foo"));
-
-  EXPECT_EQ(
-      "is mapped by the given callable to a value that "
-      "is equal to \"foo\"",
-      Describe(matcher));
-  EXPECT_EQ(
-      "is mapped by the given callable to a value that "
-      "isn't equal to \"foo\"",
-      DescribeNegation(matcher));
-}
-
-// Tests that ResultOf() can explain the match result.
-int IntFunction(int input) { return input == 42 ? 80 : 90; }
-
-TEST(ResultOfTest, CanExplainMatchResult) {
-  Matcher<int> matcher = ResultOf(&IntFunction, Ge(85));
-  EXPECT_EQ("which is mapped by the given callable to 90" + OfType("int"),
-            Explain(matcher, 36));
-
-  matcher = ResultOf(&IntFunction, GreaterThan(85));
-  EXPECT_EQ("which is mapped by the given callable to 90" + OfType("int") +
-                ", which is 5 more than 85",
-            Explain(matcher, 36));
-}
-
-// Tests that ResultOf(f, ...) compiles and works as expected when f(x)
-// returns a non-reference.
-TEST(ResultOfTest, WorksForNonReferenceResults) {
-  Matcher<int> matcher = ResultOf(&IntFunction, Eq(80));
-
-  EXPECT_TRUE(matcher.Matches(42));
-  EXPECT_FALSE(matcher.Matches(36));
-}
-
-// Tests that ResultOf(f, ...) compiles and works as expected when f(x)
-// returns a reference to non-const.
-double& DoubleFunction(double& input) { return input; }  // NOLINT
-
-Uncopyable& RefUncopyableFunction(Uncopyable& obj) {  // NOLINT
-  return obj;
-}
-
-TEST(ResultOfTest, WorksForReferenceToNonConstResults) {
-  double x = 3.14;
-  double x2 = x;
-  Matcher<double&> matcher = ResultOf(&DoubleFunction, Ref(x));
-
-  EXPECT_TRUE(matcher.Matches(x));
-  EXPECT_FALSE(matcher.Matches(x2));
-
-  // Test that ResultOf works with uncopyable objects
-  Uncopyable obj(0);
-  Uncopyable obj2(0);
-  Matcher<Uncopyable&> matcher2 = ResultOf(&RefUncopyableFunction, Ref(obj));
-
-  EXPECT_TRUE(matcher2.Matches(obj));
-  EXPECT_FALSE(matcher2.Matches(obj2));
-}
-
-// Tests that ResultOf(f, ...) compiles and works as expected when f(x)
-// returns a reference to const.
-const std::string& StringFunction(const std::string& input) { return input; }
-
-TEST(ResultOfTest, WorksForReferenceToConstResults) {
-  std::string s = "foo";
-  std::string s2 = s;
-  Matcher<const std::string&> matcher = ResultOf(&StringFunction, Ref(s));
-
-  EXPECT_TRUE(matcher.Matches(s));
-  EXPECT_FALSE(matcher.Matches(s2));
-}
-
-// Tests that ResultOf(f, m) works when f(x) and m's
-// argument types are compatible but different.
-TEST(ResultOfTest, WorksForCompatibleMatcherTypes) {
-  // IntFunction() returns int but the inner matcher expects a signed char.
-  Matcher<int> matcher = ResultOf(IntFunction, Matcher<signed char>(Ge(85)));
-
-  EXPECT_TRUE(matcher.Matches(36));
-  EXPECT_FALSE(matcher.Matches(42));
-}
-
-// Tests that the program aborts when ResultOf is passed
-// a NULL function pointer.
-TEST(ResultOfDeathTest, DiesOnNullFunctionPointers) {
-  EXPECT_DEATH_IF_SUPPORTED(
-      ResultOf(static_cast<std::string (*)(int dummy)>(nullptr),
-               Eq(std::string("foo"))),
-      "NULL function pointer is passed into ResultOf\\(\\)\\.");
-}
-
-// Tests that ResultOf(f, ...) compiles and works as expected when f is a
-// function reference.
-TEST(ResultOfTest, WorksForFunctionReferences) {
-  Matcher<int> matcher = ResultOf(IntToStringFunction, StrEq("foo"));
-  EXPECT_TRUE(matcher.Matches(1));
-  EXPECT_FALSE(matcher.Matches(2));
-}
-
-// Tests that ResultOf(f, ...) compiles and works as expected when f is a
-// function object.
-struct Functor {
-  std::string operator()(int input) const { return IntToStringFunction(input); }
-};
-
-TEST(ResultOfTest, WorksForFunctors) {
-  Matcher<int> matcher = ResultOf(Functor(), Eq(std::string("foo")));
-
-  EXPECT_TRUE(matcher.Matches(1));
-  EXPECT_FALSE(matcher.Matches(2));
-}
-
-// Tests that ResultOf(f, ...) compiles and works as expected when f is a
-// functor with more than one operator() defined. ResultOf() must work
-// for each defined operator().
-struct PolymorphicFunctor {
-  typedef int result_type;
-  int operator()(int n) { return n; }
-  int operator()(const char* s) { return static_cast<int>(strlen(s)); }
-  std::string operator()(int* p) { return p ? "good ptr" : "null"; }
-};
-
-TEST(ResultOfTest, WorksForPolymorphicFunctors) {
-  Matcher<int> matcher_int = ResultOf(PolymorphicFunctor(), Ge(5));
-
-  EXPECT_TRUE(matcher_int.Matches(10));
-  EXPECT_FALSE(matcher_int.Matches(2));
-
-  Matcher<const char*> matcher_string = ResultOf(PolymorphicFunctor(), Ge(5));
-
-  EXPECT_TRUE(matcher_string.Matches("long string"));
-  EXPECT_FALSE(matcher_string.Matches("shrt"));
-}
-
-TEST(ResultOfTest, WorksForPolymorphicFunctorsIgnoringResultType) {
-  Matcher<int*> matcher = ResultOf(PolymorphicFunctor(), "good ptr");
-
-  int n = 0;
-  EXPECT_TRUE(matcher.Matches(&n));
-  EXPECT_FALSE(matcher.Matches(nullptr));
-}
-
-TEST(ResultOfTest, WorksForLambdas) {
-  Matcher<int> matcher = ResultOf(
-      [](int str_len) {
-        return std::string(static_cast<size_t>(str_len), 'x');
-      },
-      "xxx");
-  EXPECT_TRUE(matcher.Matches(3));
-  EXPECT_FALSE(matcher.Matches(1));
-}
-
-TEST(ResultOfTest, WorksForNonCopyableArguments) {
-  Matcher<std::unique_ptr<int>> matcher = ResultOf(
-      [](const std::unique_ptr<int>& str_len) {
-        return std::string(static_cast<size_t>(*str_len), 'x');
-      },
-      "xxx");
-  EXPECT_TRUE(matcher.Matches(std::unique_ptr<int>(new int(3))));
-  EXPECT_FALSE(matcher.Matches(std::unique_ptr<int>(new int(1))));
-}
-
-const int* ReferencingFunction(const int& n) { return &n; }
-
-struct ReferencingFunctor {
-  typedef const int* result_type;
-  result_type operator()(const int& n) { return &n; }
-};
-
-TEST(ResultOfTest, WorksForReferencingCallables) {
-  const int n = 1;
-  const int n2 = 1;
-  Matcher<const int&> matcher2 = ResultOf(ReferencingFunction, Eq(&n));
-  EXPECT_TRUE(matcher2.Matches(n));
-  EXPECT_FALSE(matcher2.Matches(n2));
-
-  Matcher<const int&> matcher3 = ResultOf(ReferencingFunctor(), Eq(&n));
-  EXPECT_TRUE(matcher3.Matches(n));
-  EXPECT_FALSE(matcher3.Matches(n2));
-}
-
-class DivisibleByImpl {
- public:
-  explicit DivisibleByImpl(int a_divider) : divider_(a_divider) {}
-
-  // For testing using ExplainMatchResultTo() with polymorphic matchers.
-  template <typename T>
-  bool MatchAndExplain(const T& n, MatchResultListener* listener) const {
-    *listener << "which is " << (n % divider_) << " modulo " << divider_;
-    return (n % divider_) == 0;
-  }
-
-  void DescribeTo(ostream* os) const { *os << "is divisible by " << divider_; }
-
-  void DescribeNegationTo(ostream* os) const {
-    *os << "is not divisible by " << divider_;
-  }
-
-  void set_divider(int a_divider) { divider_ = a_divider; }
-  int divider() const { return divider_; }
-
- private:
-  int divider_;
-};
-
-PolymorphicMatcher<DivisibleByImpl> DivisibleBy(int n) {
-  return MakePolymorphicMatcher(DivisibleByImpl(n));
-}
-
-// Tests that when AllOf() fails, only the first failing matcher is
-// asked to explain why.
-TEST(ExplainMatchResultTest, AllOf_False_False) {
-  const Matcher<int> m = AllOf(DivisibleBy(4), DivisibleBy(3));
-  EXPECT_EQ("which is 1 modulo 4", Explain(m, 5));
-}
-
-// Tests that when AllOf() fails, only the first failing matcher is
-// asked to explain why.
-TEST(ExplainMatchResultTest, AllOf_False_True) {
-  const Matcher<int> m = AllOf(DivisibleBy(4), DivisibleBy(3));
-  EXPECT_EQ("which is 2 modulo 4", Explain(m, 6));
-}
-
-// Tests that when AllOf() fails, only the first failing matcher is
-// asked to explain why.
-TEST(ExplainMatchResultTest, AllOf_True_False) {
-  const Matcher<int> m = AllOf(Ge(1), DivisibleBy(3));
-  EXPECT_EQ("which is 2 modulo 3", Explain(m, 5));
-}
-
-// Tests that when AllOf() succeeds, all matchers are asked to explain
-// why.
-TEST(ExplainMatchResultTest, AllOf_True_True) {
-  const Matcher<int> m = AllOf(DivisibleBy(2), DivisibleBy(3));
-  EXPECT_EQ("which is 0 modulo 2, and which is 0 modulo 3", Explain(m, 6));
-}
-
-TEST(ExplainMatchResultTest, AllOf_True_True_2) {
-  const Matcher<int> m = AllOf(Ge(2), Le(3));
-  EXPECT_EQ("", Explain(m, 2));
-}
-
-TEST(ExplainmatcherResultTest, MonomorphicMatcher) {
-  const Matcher<int> m = GreaterThan(5);
-  EXPECT_EQ("which is 1 more than 5", Explain(m, 6));
-}
-
-// The following two tests verify that values without a public copy
-// ctor can be used as arguments to matchers like Eq(), Ge(), and etc
-// with the help of ByRef().
-
-class NotCopyable {
- public:
-  explicit NotCopyable(int a_value) : value_(a_value) {}
-
-  int value() const { return value_; }
-
-  bool operator==(const NotCopyable& rhs) const {
-    return value() == rhs.value();
-  }
-
-  bool operator>=(const NotCopyable& rhs) const {
-    return value() >= rhs.value();
-  }
-
- private:
-  int value_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(NotCopyable);
-};
-
-TEST(ByRefTest, AllowsNotCopyableConstValueInMatchers) {
-  const NotCopyable const_value1(1);
-  const Matcher<const NotCopyable&> m = Eq(ByRef(const_value1));
-
-  const NotCopyable n1(1), n2(2);
-  EXPECT_TRUE(m.Matches(n1));
-  EXPECT_FALSE(m.Matches(n2));
-}
-
-TEST(ByRefTest, AllowsNotCopyableValueInMatchers) {
-  NotCopyable value2(2);
-  const Matcher<NotCopyable&> m = Ge(ByRef(value2));
-
-  NotCopyable n1(1), n2(2);
-  EXPECT_FALSE(m.Matches(n1));
-  EXPECT_TRUE(m.Matches(n2));
-}
-
-TEST(IsEmptyTest, ImplementsIsEmpty) {
-  vector<int> container;
-  EXPECT_THAT(container, IsEmpty());
-  container.push_back(0);
-  EXPECT_THAT(container, Not(IsEmpty()));
-  container.push_back(1);
-  EXPECT_THAT(container, Not(IsEmpty()));
-}
-
-TEST(IsEmptyTest, WorksWithString) {
-  std::string text;
-  EXPECT_THAT(text, IsEmpty());
-  text = "foo";
-  EXPECT_THAT(text, Not(IsEmpty()));
-  text = std::string("\0", 1);
-  EXPECT_THAT(text, Not(IsEmpty()));
-}
-
-TEST(IsEmptyTest, CanDescribeSelf) {
-  Matcher<vector<int>> m = IsEmpty();
-  EXPECT_EQ("is empty", Describe(m));
-  EXPECT_EQ("isn't empty", DescribeNegation(m));
-}
-
-TEST(IsEmptyTest, ExplainsResult) {
-  Matcher<vector<int>> m = IsEmpty();
-  vector<int> container;
-  EXPECT_EQ("", Explain(m, container));
-  container.push_back(0);
-  EXPECT_EQ("whose size is 1", Explain(m, container));
-}
-
-TEST(IsEmptyTest, WorksWithMoveOnly) {
-  ContainerHelper helper;
-  EXPECT_CALL(helper, Call(IsEmpty()));
-  helper.Call({});
-}
-
-TEST(IsTrueTest, IsTrueIsFalse) {
-  EXPECT_THAT(true, IsTrue());
-  EXPECT_THAT(false, IsFalse());
-  EXPECT_THAT(true, Not(IsFalse()));
-  EXPECT_THAT(false, Not(IsTrue()));
-  EXPECT_THAT(0, Not(IsTrue()));
-  EXPECT_THAT(0, IsFalse());
-  EXPECT_THAT(nullptr, Not(IsTrue()));
-  EXPECT_THAT(nullptr, IsFalse());
-  EXPECT_THAT(-1, IsTrue());
-  EXPECT_THAT(-1, Not(IsFalse()));
-  EXPECT_THAT(1, IsTrue());
-  EXPECT_THAT(1, Not(IsFalse()));
-  EXPECT_THAT(2, IsTrue());
-  EXPECT_THAT(2, Not(IsFalse()));
-  int a = 42;
-  EXPECT_THAT(a, IsTrue());
-  EXPECT_THAT(a, Not(IsFalse()));
-  EXPECT_THAT(&a, IsTrue());
-  EXPECT_THAT(&a, Not(IsFalse()));
-  EXPECT_THAT(false, Not(IsTrue()));
-  EXPECT_THAT(true, Not(IsFalse()));
-  EXPECT_THAT(std::true_type(), IsTrue());
-  EXPECT_THAT(std::true_type(), Not(IsFalse()));
-  EXPECT_THAT(std::false_type(), IsFalse());
-  EXPECT_THAT(std::false_type(), Not(IsTrue()));
-  EXPECT_THAT(nullptr, Not(IsTrue()));
-  EXPECT_THAT(nullptr, IsFalse());
-  std::unique_ptr<int> null_unique;
-  std::unique_ptr<int> nonnull_unique(new int(0));
-  EXPECT_THAT(null_unique, Not(IsTrue()));
-  EXPECT_THAT(null_unique, IsFalse());
-  EXPECT_THAT(nonnull_unique, IsTrue());
-  EXPECT_THAT(nonnull_unique, Not(IsFalse()));
-}
-
-TEST(SizeIsTest, ImplementsSizeIs) {
-  vector<int> container;
-  EXPECT_THAT(container, SizeIs(0));
-  EXPECT_THAT(container, Not(SizeIs(1)));
-  container.push_back(0);
-  EXPECT_THAT(container, Not(SizeIs(0)));
-  EXPECT_THAT(container, SizeIs(1));
-  container.push_back(0);
-  EXPECT_THAT(container, Not(SizeIs(0)));
-  EXPECT_THAT(container, SizeIs(2));
-}
-
-TEST(SizeIsTest, WorksWithMap) {
-  map<std::string, int> container;
-  EXPECT_THAT(container, SizeIs(0));
-  EXPECT_THAT(container, Not(SizeIs(1)));
-  container.insert(make_pair("foo", 1));
-  EXPECT_THAT(container, Not(SizeIs(0)));
-  EXPECT_THAT(container, SizeIs(1));
-  container.insert(make_pair("bar", 2));
-  EXPECT_THAT(container, Not(SizeIs(0)));
-  EXPECT_THAT(container, SizeIs(2));
-}
-
-TEST(SizeIsTest, WorksWithReferences) {
-  vector<int> container;
-  Matcher<const vector<int>&> m = SizeIs(1);
-  EXPECT_THAT(container, Not(m));
-  container.push_back(0);
-  EXPECT_THAT(container, m);
-}
-
-TEST(SizeIsTest, WorksWithMoveOnly) {
-  ContainerHelper helper;
-  EXPECT_CALL(helper, Call(SizeIs(3)));
-  helper.Call(MakeUniquePtrs({1, 2, 3}));
-}
-
-// SizeIs should work for any type that provides a size() member function.
-// For example, a size_type member type should not need to be provided.
-struct MinimalistCustomType {
-  int size() const { return 1; }
-};
-TEST(SizeIsTest, WorksWithMinimalistCustomType) {
-  MinimalistCustomType container;
-  EXPECT_THAT(container, SizeIs(1));
-  EXPECT_THAT(container, Not(SizeIs(0)));
-}
-
-TEST(SizeIsTest, CanDescribeSelf) {
-  Matcher<vector<int>> m = SizeIs(2);
-  EXPECT_EQ("size is equal to 2", Describe(m));
-  EXPECT_EQ("size isn't equal to 2", DescribeNegation(m));
-}
-
-TEST(SizeIsTest, ExplainsResult) {
-  Matcher<vector<int>> m1 = SizeIs(2);
-  Matcher<vector<int>> m2 = SizeIs(Lt(2u));
-  Matcher<vector<int>> m3 = SizeIs(AnyOf(0, 3));
-  Matcher<vector<int>> m4 = SizeIs(Gt(1u));
-  vector<int> container;
-  EXPECT_EQ("whose size 0 doesn't match", Explain(m1, container));
-  EXPECT_EQ("whose size 0 matches", Explain(m2, container));
-  EXPECT_EQ("whose size 0 matches", Explain(m3, container));
-  EXPECT_EQ("whose size 0 doesn't match", Explain(m4, container));
-  container.push_back(0);
-  container.push_back(0);
-  EXPECT_EQ("whose size 2 matches", Explain(m1, container));
-  EXPECT_EQ("whose size 2 doesn't match", Explain(m2, container));
-  EXPECT_EQ("whose size 2 doesn't match", Explain(m3, container));
-  EXPECT_EQ("whose size 2 matches", Explain(m4, container));
-}
-
-#if GTEST_HAS_TYPED_TEST
-// Tests ContainerEq with different container types, and
-// different element types.
-
-template <typename T>
-class ContainerEqTest : public testing::Test {};
-
-typedef testing::Types<set<int>, vector<size_t>, multiset<size_t>, list<int>>
-    ContainerEqTestTypes;
-
-TYPED_TEST_SUITE(ContainerEqTest, ContainerEqTestTypes);
-
-// Tests that the filled container is equal to itself.
-TYPED_TEST(ContainerEqTest, EqualsSelf) {
-  static const int vals[] = {1, 1, 2, 3, 5, 8};
-  TypeParam my_set(vals, vals + 6);
-  const Matcher<TypeParam> m = ContainerEq(my_set);
-  EXPECT_TRUE(m.Matches(my_set));
-  EXPECT_EQ("", Explain(m, my_set));
-}
-
-// Tests that missing values are reported.
-TYPED_TEST(ContainerEqTest, ValueMissing) {
-  static const int vals[] = {1, 1, 2, 3, 5, 8};
-  static const int test_vals[] = {2, 1, 8, 5};
-  TypeParam my_set(vals, vals + 6);
-  TypeParam test_set(test_vals, test_vals + 4);
-  const Matcher<TypeParam> m = ContainerEq(my_set);
-  EXPECT_FALSE(m.Matches(test_set));
-  EXPECT_EQ("which doesn't have these expected elements: 3",
-            Explain(m, test_set));
-}
-
-// Tests that added values are reported.
-TYPED_TEST(ContainerEqTest, ValueAdded) {
-  static const int vals[] = {1, 1, 2, 3, 5, 8};
-  static const int test_vals[] = {1, 2, 3, 5, 8, 46};
-  TypeParam my_set(vals, vals + 6);
-  TypeParam test_set(test_vals, test_vals + 6);
-  const Matcher<const TypeParam&> m = ContainerEq(my_set);
-  EXPECT_FALSE(m.Matches(test_set));
-  EXPECT_EQ("which has these unexpected elements: 46", Explain(m, test_set));
-}
-
-// Tests that added and missing values are reported together.
-TYPED_TEST(ContainerEqTest, ValueAddedAndRemoved) {
-  static const int vals[] = {1, 1, 2, 3, 5, 8};
-  static const int test_vals[] = {1, 2, 3, 8, 46};
-  TypeParam my_set(vals, vals + 6);
-  TypeParam test_set(test_vals, test_vals + 5);
-  const Matcher<TypeParam> m = ContainerEq(my_set);
-  EXPECT_FALSE(m.Matches(test_set));
-  EXPECT_EQ(
-      "which has these unexpected elements: 46,\n"
-      "and doesn't have these expected elements: 5",
-      Explain(m, test_set));
-}
-
-// Tests duplicated value -- expect no explanation.
-TYPED_TEST(ContainerEqTest, DuplicateDifference) {
-  static const int vals[] = {1, 1, 2, 3, 5, 8};
-  static const int test_vals[] = {1, 2, 3, 5, 8};
-  TypeParam my_set(vals, vals + 6);
-  TypeParam test_set(test_vals, test_vals + 5);
-  const Matcher<const TypeParam&> m = ContainerEq(my_set);
-  // Depending on the container, match may be true or false
-  // But in any case there should be no explanation.
-  EXPECT_EQ("", Explain(m, test_set));
-}
-#endif  // GTEST_HAS_TYPED_TEST
-
-// Tests that multiple missing values are reported.
-// Using just vector here, so order is predictable.
-TEST(ContainerEqExtraTest, MultipleValuesMissing) {
-  static const int vals[] = {1, 1, 2, 3, 5, 8};
-  static const int test_vals[] = {2, 1, 5};
-  vector<int> my_set(vals, vals + 6);
-  vector<int> test_set(test_vals, test_vals + 3);
-  const Matcher<vector<int>> m = ContainerEq(my_set);
-  EXPECT_FALSE(m.Matches(test_set));
-  EXPECT_EQ("which doesn't have these expected elements: 3, 8",
-            Explain(m, test_set));
-}
-
-// Tests that added values are reported.
-// Using just vector here, so order is predictable.
-TEST(ContainerEqExtraTest, MultipleValuesAdded) {
-  static const int vals[] = {1, 1, 2, 3, 5, 8};
-  static const int test_vals[] = {1, 2, 92, 3, 5, 8, 46};
-  list<size_t> my_set(vals, vals + 6);
-  list<size_t> test_set(test_vals, test_vals + 7);
-  const Matcher<const list<size_t>&> m = ContainerEq(my_set);
-  EXPECT_FALSE(m.Matches(test_set));
-  EXPECT_EQ("which has these unexpected elements: 92, 46",
-            Explain(m, test_set));
-}
-
-// Tests that added and missing values are reported together.
-TEST(ContainerEqExtraTest, MultipleValuesAddedAndRemoved) {
-  static const int vals[] = {1, 1, 2, 3, 5, 8};
-  static const int test_vals[] = {1, 2, 3, 92, 46};
-  list<size_t> my_set(vals, vals + 6);
-  list<size_t> test_set(test_vals, test_vals + 5);
-  const Matcher<const list<size_t>> m = ContainerEq(my_set);
-  EXPECT_FALSE(m.Matches(test_set));
-  EXPECT_EQ(
-      "which has these unexpected elements: 92, 46,\n"
-      "and doesn't have these expected elements: 5, 8",
-      Explain(m, test_set));
-}
-
-// Tests to see that duplicate elements are detected,
-// but (as above) not reported in the explanation.
-TEST(ContainerEqExtraTest, MultiSetOfIntDuplicateDifference) {
-  static const int vals[] = {1, 1, 2, 3, 5, 8};
-  static const int test_vals[] = {1, 2, 3, 5, 8};
-  vector<int> my_set(vals, vals + 6);
-  vector<int> test_set(test_vals, test_vals + 5);
-  const Matcher<vector<int>> m = ContainerEq(my_set);
-  EXPECT_TRUE(m.Matches(my_set));
-  EXPECT_FALSE(m.Matches(test_set));
-  // There is nothing to report when both sets contain all the same values.
-  EXPECT_EQ("", Explain(m, test_set));
-}
-
-// Tests that ContainerEq works for non-trivial associative containers,
-// like maps.
-TEST(ContainerEqExtraTest, WorksForMaps) {
-  map<int, std::string> my_map;
-  my_map[0] = "a";
-  my_map[1] = "b";
-
-  map<int, std::string> test_map;
-  test_map[0] = "aa";
-  test_map[1] = "b";
-
-  const Matcher<const map<int, std::string>&> m = ContainerEq(my_map);
-  EXPECT_TRUE(m.Matches(my_map));
-  EXPECT_FALSE(m.Matches(test_map));
-
-  EXPECT_EQ(
-      "which has these unexpected elements: (0, \"aa\"),\n"
-      "and doesn't have these expected elements: (0, \"a\")",
-      Explain(m, test_map));
-}
-
-TEST(ContainerEqExtraTest, WorksForNativeArray) {
-  int a1[] = {1, 2, 3};
-  int a2[] = {1, 2, 3};
-  int b[] = {1, 2, 4};
-
-  EXPECT_THAT(a1, ContainerEq(a2));
-  EXPECT_THAT(a1, Not(ContainerEq(b)));
-}
-
-TEST(ContainerEqExtraTest, WorksForTwoDimensionalNativeArray) {
-  const char a1[][3] = {"hi", "lo"};
-  const char a2[][3] = {"hi", "lo"};
-  const char b[][3] = {"lo", "hi"};
-
-  // Tests using ContainerEq() in the first dimension.
-  EXPECT_THAT(a1, ContainerEq(a2));
-  EXPECT_THAT(a1, Not(ContainerEq(b)));
-
-  // Tests using ContainerEq() in the second dimension.
-  EXPECT_THAT(a1, ElementsAre(ContainerEq(a2[0]), ContainerEq(a2[1])));
-  EXPECT_THAT(a1, ElementsAre(Not(ContainerEq(b[0])), ContainerEq(a2[1])));
-}
-
-TEST(ContainerEqExtraTest, WorksForNativeArrayAsTuple) {
-  const int a1[] = {1, 2, 3};
-  const int a2[] = {1, 2, 3};
-  const int b[] = {1, 2, 3, 4};
-
-  const int* const p1 = a1;
-  EXPECT_THAT(std::make_tuple(p1, 3), ContainerEq(a2));
-  EXPECT_THAT(std::make_tuple(p1, 3), Not(ContainerEq(b)));
-
-  const int c[] = {1, 3, 2};
-  EXPECT_THAT(std::make_tuple(p1, 3), Not(ContainerEq(c)));
-}
-
-TEST(ContainerEqExtraTest, CopiesNativeArrayParameter) {
-  std::string a1[][3] = {{"hi", "hello", "ciao"}, {"bye", "see you", "ciao"}};
-
-  std::string a2[][3] = {{"hi", "hello", "ciao"}, {"bye", "see you", "ciao"}};
-
-  const Matcher<const std::string(&)[2][3]> m = ContainerEq(a2);
-  EXPECT_THAT(a1, m);
-
-  a2[0][0] = "ha";
-  EXPECT_THAT(a1, m);
-}
-
-TEST(WhenSortedByTest, WorksForEmptyContainer) {
-  const vector<int> numbers;
-  EXPECT_THAT(numbers, WhenSortedBy(less<int>(), ElementsAre()));
-  EXPECT_THAT(numbers, Not(WhenSortedBy(less<int>(), ElementsAre(1))));
-}
-
-TEST(WhenSortedByTest, WorksForNonEmptyContainer) {
-  vector<unsigned> numbers;
-  numbers.push_back(3);
-  numbers.push_back(1);
-  numbers.push_back(2);
-  numbers.push_back(2);
-  EXPECT_THAT(numbers,
-              WhenSortedBy(greater<unsigned>(), ElementsAre(3, 2, 2, 1)));
-  EXPECT_THAT(numbers,
-              Not(WhenSortedBy(greater<unsigned>(), ElementsAre(1, 2, 2, 3))));
-}
-
-TEST(WhenSortedByTest, WorksForNonVectorContainer) {
-  list<std::string> words;
-  words.push_back("say");
-  words.push_back("hello");
-  words.push_back("world");
-  EXPECT_THAT(words, WhenSortedBy(less<std::string>(),
-                                  ElementsAre("hello", "say", "world")));
-  EXPECT_THAT(words, Not(WhenSortedBy(less<std::string>(),
-                                      ElementsAre("say", "hello", "world"))));
-}
-
-TEST(WhenSortedByTest, WorksForNativeArray) {
-  const int numbers[] = {1, 3, 2, 4};
-  const int sorted_numbers[] = {1, 2, 3, 4};
-  EXPECT_THAT(numbers, WhenSortedBy(less<int>(), ElementsAre(1, 2, 3, 4)));
-  EXPECT_THAT(numbers,
-              WhenSortedBy(less<int>(), ElementsAreArray(sorted_numbers)));
-  EXPECT_THAT(numbers, Not(WhenSortedBy(less<int>(), ElementsAre(1, 3, 2, 4))));
-}
-
-TEST(WhenSortedByTest, CanDescribeSelf) {
-  const Matcher<vector<int>> m = WhenSortedBy(less<int>(), ElementsAre(1, 2));
-  EXPECT_EQ(
-      "(when sorted) has 2 elements where\n"
-      "element #0 is equal to 1,\n"
-      "element #1 is equal to 2",
-      Describe(m));
-  EXPECT_EQ(
-      "(when sorted) doesn't have 2 elements, or\n"
-      "element #0 isn't equal to 1, or\n"
-      "element #1 isn't equal to 2",
-      DescribeNegation(m));
-}
-
-TEST(WhenSortedByTest, ExplainsMatchResult) {
-  const int a[] = {2, 1};
-  EXPECT_EQ("which is { 1, 2 } when sorted, whose element #0 doesn't match",
-            Explain(WhenSortedBy(less<int>(), ElementsAre(2, 3)), a));
-  EXPECT_EQ("which is { 1, 2 } when sorted",
-            Explain(WhenSortedBy(less<int>(), ElementsAre(1, 2)), a));
-}
-
-// WhenSorted() is a simple wrapper on WhenSortedBy().  Hence we don't
-// need to test it as exhaustively as we test the latter.
-
-TEST(WhenSortedTest, WorksForEmptyContainer) {
-  const vector<int> numbers;
-  EXPECT_THAT(numbers, WhenSorted(ElementsAre()));
-  EXPECT_THAT(numbers, Not(WhenSorted(ElementsAre(1))));
-}
-
-TEST(WhenSortedTest, WorksForNonEmptyContainer) {
-  list<std::string> words;
-  words.push_back("3");
-  words.push_back("1");
-  words.push_back("2");
-  words.push_back("2");
-  EXPECT_THAT(words, WhenSorted(ElementsAre("1", "2", "2", "3")));
-  EXPECT_THAT(words, Not(WhenSorted(ElementsAre("3", "1", "2", "2"))));
-}
-
-TEST(WhenSortedTest, WorksForMapTypes) {
-  map<std::string, int> word_counts;
-  word_counts["and"] = 1;
-  word_counts["the"] = 1;
-  word_counts["buffalo"] = 2;
-  EXPECT_THAT(word_counts,
-              WhenSorted(ElementsAre(Pair("and", 1), Pair("buffalo", 2),
-                                     Pair("the", 1))));
-  EXPECT_THAT(word_counts,
-              Not(WhenSorted(ElementsAre(Pair("and", 1), Pair("the", 1),
-                                         Pair("buffalo", 2)))));
-}
-
-TEST(WhenSortedTest, WorksForMultiMapTypes) {
-  multimap<int, int> ifib;
-  ifib.insert(make_pair(8, 6));
-  ifib.insert(make_pair(2, 3));
-  ifib.insert(make_pair(1, 1));
-  ifib.insert(make_pair(3, 4));
-  ifib.insert(make_pair(1, 2));
-  ifib.insert(make_pair(5, 5));
-  EXPECT_THAT(ifib,
-              WhenSorted(ElementsAre(Pair(1, 1), Pair(1, 2), Pair(2, 3),
-                                     Pair(3, 4), Pair(5, 5), Pair(8, 6))));
-  EXPECT_THAT(ifib,
-              Not(WhenSorted(ElementsAre(Pair(8, 6), Pair(2, 3), Pair(1, 1),
-                                         Pair(3, 4), Pair(1, 2), Pair(5, 5)))));
-}
-
-TEST(WhenSortedTest, WorksForPolymorphicMatcher) {
-  std::deque<int> d;
-  d.push_back(2);
-  d.push_back(1);
-  EXPECT_THAT(d, WhenSorted(ElementsAre(1, 2)));
-  EXPECT_THAT(d, Not(WhenSorted(ElementsAre(2, 1))));
-}
-
-TEST(WhenSortedTest, WorksForVectorConstRefMatcher) {
-  std::deque<int> d;
-  d.push_back(2);
-  d.push_back(1);
-  Matcher<const std::vector<int>&> vector_match = ElementsAre(1, 2);
-  EXPECT_THAT(d, WhenSorted(vector_match));
-  Matcher<const std::vector<int>&> not_vector_match = ElementsAre(2, 1);
-  EXPECT_THAT(d, Not(WhenSorted(not_vector_match)));
-}
-
-// Deliberately bare pseudo-container.
-// Offers only begin() and end() accessors, yielding InputIterator.
-template <typename T>
-class Streamlike {
- private:
-  class ConstIter;
-
- public:
-  typedef ConstIter const_iterator;
-  typedef T value_type;
-
-  template <typename InIter>
-  Streamlike(InIter first, InIter last) : remainder_(first, last) {}
-
-  const_iterator begin() const {
-    return const_iterator(this, remainder_.begin());
-  }
-  const_iterator end() const { return const_iterator(this, remainder_.end()); }
-
- private:
-  class ConstIter
-      : public std::iterator<std::input_iterator_tag, value_type, ptrdiff_t,
-                             const value_type*, const value_type&> {
-   public:
-    ConstIter(const Streamlike* s, typename std::list<value_type>::iterator pos)
-        : s_(s), pos_(pos) {}
-
-    const value_type& operator*() const { return *pos_; }
-    const value_type* operator->() const { return &*pos_; }
-    ConstIter& operator++() {
-      s_->remainder_.erase(pos_++);
-      return *this;
-    }
-
-    // *iter++ is required to work (see std::istreambuf_iterator).
-    // (void)iter++ is also required to work.
-    class PostIncrProxy {
-     public:
-      explicit PostIncrProxy(const value_type& value) : value_(value) {}
-      value_type operator*() const { return value_; }
-
-     private:
-      value_type value_;
-    };
-    PostIncrProxy operator++(int) {
-      PostIncrProxy proxy(**this);
-      ++(*this);
-      return proxy;
-    }
-
-    friend bool operator==(const ConstIter& a, const ConstIter& b) {
-      return a.s_ == b.s_ && a.pos_ == b.pos_;
-    }
-    friend bool operator!=(const ConstIter& a, const ConstIter& b) {
-      return !(a == b);
-    }
-
-   private:
-    const Streamlike* s_;
-    typename std::list<value_type>::iterator pos_;
-  };
-
-  friend std::ostream& operator<<(std::ostream& os, const Streamlike& s) {
-    os << "[";
-    typedef typename std::list<value_type>::const_iterator Iter;
-    const char* sep = "";
-    for (Iter it = s.remainder_.begin(); it != s.remainder_.end(); ++it) {
-      os << sep << *it;
-      sep = ",";
-    }
-    os << "]";
-    return os;
-  }
-
-  mutable std::list<value_type> remainder_;  // modified by iteration
-};
-
-TEST(StreamlikeTest, Iteration) {
-  const int a[5] = {2, 1, 4, 5, 3};
-  Streamlike<int> s(a, a + 5);
-  Streamlike<int>::const_iterator it = s.begin();
-  const int* ip = a;
-  while (it != s.end()) {
-    SCOPED_TRACE(ip - a);
-    EXPECT_EQ(*ip++, *it++);
-  }
-}
-
-TEST(BeginEndDistanceIsTest, WorksWithForwardList) {
-  std::forward_list<int> container;
-  EXPECT_THAT(container, BeginEndDistanceIs(0));
-  EXPECT_THAT(container, Not(BeginEndDistanceIs(1)));
-  container.push_front(0);
-  EXPECT_THAT(container, Not(BeginEndDistanceIs(0)));
-  EXPECT_THAT(container, BeginEndDistanceIs(1));
-  container.push_front(0);
-  EXPECT_THAT(container, Not(BeginEndDistanceIs(0)));
-  EXPECT_THAT(container, BeginEndDistanceIs(2));
-}
-
-TEST(BeginEndDistanceIsTest, WorksWithNonStdList) {
-  const int a[5] = {1, 2, 3, 4, 5};
-  Streamlike<int> s(a, a + 5);
-  EXPECT_THAT(s, BeginEndDistanceIs(5));
-}
-
-TEST(BeginEndDistanceIsTest, CanDescribeSelf) {
-  Matcher<vector<int>> m = BeginEndDistanceIs(2);
-  EXPECT_EQ("distance between begin() and end() is equal to 2", Describe(m));
-  EXPECT_EQ("distance between begin() and end() isn't equal to 2",
-            DescribeNegation(m));
-}
-
-TEST(BeginEndDistanceIsTest, WorksWithMoveOnly) {
-  ContainerHelper helper;
-  EXPECT_CALL(helper, Call(BeginEndDistanceIs(2)));
-  helper.Call(MakeUniquePtrs({1, 2}));
-}
-
-TEST(BeginEndDistanceIsTest, ExplainsResult) {
-  Matcher<vector<int>> m1 = BeginEndDistanceIs(2);
-  Matcher<vector<int>> m2 = BeginEndDistanceIs(Lt(2));
-  Matcher<vector<int>> m3 = BeginEndDistanceIs(AnyOf(0, 3));
-  Matcher<vector<int>> m4 = BeginEndDistanceIs(GreaterThan(1));
-  vector<int> container;
-  EXPECT_EQ("whose distance between begin() and end() 0 doesn't match",
-            Explain(m1, container));
-  EXPECT_EQ("whose distance between begin() and end() 0 matches",
-            Explain(m2, container));
-  EXPECT_EQ("whose distance between begin() and end() 0 matches",
-            Explain(m3, container));
-  EXPECT_EQ(
-      "whose distance between begin() and end() 0 doesn't match, which is 1 "
-      "less than 1",
-      Explain(m4, container));
-  container.push_back(0);
-  container.push_back(0);
-  EXPECT_EQ("whose distance between begin() and end() 2 matches",
-            Explain(m1, container));
-  EXPECT_EQ("whose distance between begin() and end() 2 doesn't match",
-            Explain(m2, container));
-  EXPECT_EQ("whose distance between begin() and end() 2 doesn't match",
-            Explain(m3, container));
-  EXPECT_EQ(
-      "whose distance between begin() and end() 2 matches, which is 1 more "
-      "than 1",
-      Explain(m4, container));
-}
-
-TEST(WhenSortedTest, WorksForStreamlike) {
-  // Streamlike 'container' provides only minimal iterator support.
-  // Its iterators are tagged with input_iterator_tag.
-  const int a[5] = {2, 1, 4, 5, 3};
-  Streamlike<int> s(std::begin(a), std::end(a));
-  EXPECT_THAT(s, WhenSorted(ElementsAre(1, 2, 3, 4, 5)));
-  EXPECT_THAT(s, Not(WhenSorted(ElementsAre(2, 1, 4, 5, 3))));
-}
-
-TEST(WhenSortedTest, WorksForVectorConstRefMatcherOnStreamlike) {
-  const int a[] = {2, 1, 4, 5, 3};
-  Streamlike<int> s(std::begin(a), std::end(a));
-  Matcher<const std::vector<int>&> vector_match = ElementsAre(1, 2, 3, 4, 5);
-  EXPECT_THAT(s, WhenSorted(vector_match));
-  EXPECT_THAT(s, Not(WhenSorted(ElementsAre(2, 1, 4, 5, 3))));
-}
-
-TEST(IsSupersetOfTest, WorksForNativeArray) {
-  const int subset[] = {1, 4};
-  const int superset[] = {1, 2, 4};
-  const int disjoint[] = {1, 0, 3};
-  EXPECT_THAT(subset, IsSupersetOf(subset));
-  EXPECT_THAT(subset, Not(IsSupersetOf(superset)));
-  EXPECT_THAT(superset, IsSupersetOf(subset));
-  EXPECT_THAT(subset, Not(IsSupersetOf(disjoint)));
-  EXPECT_THAT(disjoint, Not(IsSupersetOf(subset)));
-}
-
-TEST(IsSupersetOfTest, WorksWithDuplicates) {
-  const int not_enough[] = {1, 2};
-  const int enough[] = {1, 1, 2};
-  const int expected[] = {1, 1};
-  EXPECT_THAT(not_enough, Not(IsSupersetOf(expected)));
-  EXPECT_THAT(enough, IsSupersetOf(expected));
-}
-
-TEST(IsSupersetOfTest, WorksForEmpty) {
-  vector<int> numbers;
-  vector<int> expected;
-  EXPECT_THAT(numbers, IsSupersetOf(expected));
-  expected.push_back(1);
-  EXPECT_THAT(numbers, Not(IsSupersetOf(expected)));
-  expected.clear();
-  numbers.push_back(1);
-  numbers.push_back(2);
-  EXPECT_THAT(numbers, IsSupersetOf(expected));
-  expected.push_back(1);
-  EXPECT_THAT(numbers, IsSupersetOf(expected));
-  expected.push_back(2);
-  EXPECT_THAT(numbers, IsSupersetOf(expected));
-  expected.push_back(3);
-  EXPECT_THAT(numbers, Not(IsSupersetOf(expected)));
-}
-
-TEST(IsSupersetOfTest, WorksForStreamlike) {
-  const int a[5] = {1, 2, 3, 4, 5};
-  Streamlike<int> s(std::begin(a), std::end(a));
-
-  vector<int> expected;
-  expected.push_back(1);
-  expected.push_back(2);
-  expected.push_back(5);
-  EXPECT_THAT(s, IsSupersetOf(expected));
-
-  expected.push_back(0);
-  EXPECT_THAT(s, Not(IsSupersetOf(expected)));
-}
-
-TEST(IsSupersetOfTest, TakesStlContainer) {
-  const int actual[] = {3, 1, 2};
-
-  ::std::list<int> expected;
-  expected.push_back(1);
-  expected.push_back(3);
-  EXPECT_THAT(actual, IsSupersetOf(expected));
-
-  expected.push_back(4);
-  EXPECT_THAT(actual, Not(IsSupersetOf(expected)));
-}
-
-TEST(IsSupersetOfTest, Describe) {
-  typedef std::vector<int> IntVec;
-  IntVec expected;
-  expected.push_back(111);
-  expected.push_back(222);
-  expected.push_back(333);
-  EXPECT_THAT(
-      Describe<IntVec>(IsSupersetOf(expected)),
-      Eq("a surjection from elements to requirements exists such that:\n"
-         " - an element is equal to 111\n"
-         " - an element is equal to 222\n"
-         " - an element is equal to 333"));
-}
-
-TEST(IsSupersetOfTest, DescribeNegation) {
-  typedef std::vector<int> IntVec;
-  IntVec expected;
-  expected.push_back(111);
-  expected.push_back(222);
-  expected.push_back(333);
-  EXPECT_THAT(
-      DescribeNegation<IntVec>(IsSupersetOf(expected)),
-      Eq("no surjection from elements to requirements exists such that:\n"
-         " - an element is equal to 111\n"
-         " - an element is equal to 222\n"
-         " - an element is equal to 333"));
-}
-
-TEST(IsSupersetOfTest, MatchAndExplain) {
-  std::vector<int> v;
-  v.push_back(2);
-  v.push_back(3);
-  std::vector<int> expected;
-  expected.push_back(1);
-  expected.push_back(2);
-  StringMatchResultListener listener;
-  ASSERT_FALSE(ExplainMatchResult(IsSupersetOf(expected), v, &listener))
-      << listener.str();
-  EXPECT_THAT(listener.str(),
-              Eq("where the following matchers don't match any elements:\n"
-                 "matcher #0: is equal to 1"));
-
-  v.push_back(1);
-  listener.Clear();
-  ASSERT_TRUE(ExplainMatchResult(IsSupersetOf(expected), v, &listener))
-      << listener.str();
-  EXPECT_THAT(listener.str(), Eq("where:\n"
-                                 " - element #0 is matched by matcher #1,\n"
-                                 " - element #2 is matched by matcher #0"));
-}
-
-TEST(IsSupersetOfTest, WorksForRhsInitializerList) {
-  const int numbers[] = {1, 3, 6, 2, 4, 5};
-  EXPECT_THAT(numbers, IsSupersetOf({1, 2}));
-  EXPECT_THAT(numbers, Not(IsSupersetOf({3, 0})));
-}
-
-TEST(IsSupersetOfTest, WorksWithMoveOnly) {
-  ContainerHelper helper;
-  EXPECT_CALL(helper, Call(IsSupersetOf({Pointee(1)})));
-  helper.Call(MakeUniquePtrs({1, 2}));
-  EXPECT_CALL(helper, Call(Not(IsSupersetOf({Pointee(1), Pointee(2)}))));
-  helper.Call(MakeUniquePtrs({2}));
-}
-
-TEST(IsSubsetOfTest, WorksForNativeArray) {
-  const int subset[] = {1, 4};
-  const int superset[] = {1, 2, 4};
-  const int disjoint[] = {1, 0, 3};
-  EXPECT_THAT(subset, IsSubsetOf(subset));
-  EXPECT_THAT(subset, IsSubsetOf(superset));
-  EXPECT_THAT(superset, Not(IsSubsetOf(subset)));
-  EXPECT_THAT(subset, Not(IsSubsetOf(disjoint)));
-  EXPECT_THAT(disjoint, Not(IsSubsetOf(subset)));
-}
-
-TEST(IsSubsetOfTest, WorksWithDuplicates) {
-  const int not_enough[] = {1, 2};
-  const int enough[] = {1, 1, 2};
-  const int actual[] = {1, 1};
-  EXPECT_THAT(actual, Not(IsSubsetOf(not_enough)));
-  EXPECT_THAT(actual, IsSubsetOf(enough));
-}
-
-TEST(IsSubsetOfTest, WorksForEmpty) {
-  vector<int> numbers;
-  vector<int> expected;
-  EXPECT_THAT(numbers, IsSubsetOf(expected));
-  expected.push_back(1);
-  EXPECT_THAT(numbers, IsSubsetOf(expected));
-  expected.clear();
-  numbers.push_back(1);
-  numbers.push_back(2);
-  EXPECT_THAT(numbers, Not(IsSubsetOf(expected)));
-  expected.push_back(1);
-  EXPECT_THAT(numbers, Not(IsSubsetOf(expected)));
-  expected.push_back(2);
-  EXPECT_THAT(numbers, IsSubsetOf(expected));
-  expected.push_back(3);
-  EXPECT_THAT(numbers, IsSubsetOf(expected));
-}
-
-TEST(IsSubsetOfTest, WorksForStreamlike) {
-  const int a[5] = {1, 2};
-  Streamlike<int> s(std::begin(a), std::end(a));
-
-  vector<int> expected;
-  expected.push_back(1);
-  EXPECT_THAT(s, Not(IsSubsetOf(expected)));
-  expected.push_back(2);
-  expected.push_back(5);
-  EXPECT_THAT(s, IsSubsetOf(expected));
-}
-
-TEST(IsSubsetOfTest, TakesStlContainer) {
-  const int actual[] = {3, 1, 2};
-
-  ::std::list<int> expected;
-  expected.push_back(1);
-  expected.push_back(3);
-  EXPECT_THAT(actual, Not(IsSubsetOf(expected)));
-
-  expected.push_back(2);
-  expected.push_back(4);
-  EXPECT_THAT(actual, IsSubsetOf(expected));
-}
-
-TEST(IsSubsetOfTest, Describe) {
-  typedef std::vector<int> IntVec;
-  IntVec expected;
-  expected.push_back(111);
-  expected.push_back(222);
-  expected.push_back(333);
-
-  EXPECT_THAT(
-      Describe<IntVec>(IsSubsetOf(expected)),
-      Eq("an injection from elements to requirements exists such that:\n"
-         " - an element is equal to 111\n"
-         " - an element is equal to 222\n"
-         " - an element is equal to 333"));
-}
-
-TEST(IsSubsetOfTest, DescribeNegation) {
-  typedef std::vector<int> IntVec;
-  IntVec expected;
-  expected.push_back(111);
-  expected.push_back(222);
-  expected.push_back(333);
-  EXPECT_THAT(
-      DescribeNegation<IntVec>(IsSubsetOf(expected)),
-      Eq("no injection from elements to requirements exists such that:\n"
-         " - an element is equal to 111\n"
-         " - an element is equal to 222\n"
-         " - an element is equal to 333"));
-}
-
-TEST(IsSubsetOfTest, MatchAndExplain) {
-  std::vector<int> v;
-  v.push_back(2);
-  v.push_back(3);
-  std::vector<int> expected;
-  expected.push_back(1);
-  expected.push_back(2);
-  StringMatchResultListener listener;
-  ASSERT_FALSE(ExplainMatchResult(IsSubsetOf(expected), v, &listener))
-      << listener.str();
-  EXPECT_THAT(listener.str(),
-              Eq("where the following elements don't match any matchers:\n"
-                 "element #1: 3"));
-
-  expected.push_back(3);
-  listener.Clear();
-  ASSERT_TRUE(ExplainMatchResult(IsSubsetOf(expected), v, &listener))
-      << listener.str();
-  EXPECT_THAT(listener.str(), Eq("where:\n"
-                                 " - element #0 is matched by matcher #1,\n"
-                                 " - element #1 is matched by matcher #2"));
-}
-
-TEST(IsSubsetOfTest, WorksForRhsInitializerList) {
-  const int numbers[] = {1, 2, 3};
-  EXPECT_THAT(numbers, IsSubsetOf({1, 2, 3, 4}));
-  EXPECT_THAT(numbers, Not(IsSubsetOf({1, 2})));
-}
-
-TEST(IsSubsetOfTest, WorksWithMoveOnly) {
-  ContainerHelper helper;
-  EXPECT_CALL(helper, Call(IsSubsetOf({Pointee(1), Pointee(2)})));
-  helper.Call(MakeUniquePtrs({1}));
-  EXPECT_CALL(helper, Call(Not(IsSubsetOf({Pointee(1)}))));
-  helper.Call(MakeUniquePtrs({2}));
-}
-
-// Tests using ElementsAre() and ElementsAreArray() with stream-like
-// "containers".
-
-TEST(ElemensAreStreamTest, WorksForStreamlike) {
-  const int a[5] = {1, 2, 3, 4, 5};
-  Streamlike<int> s(std::begin(a), std::end(a));
-  EXPECT_THAT(s, ElementsAre(1, 2, 3, 4, 5));
-  EXPECT_THAT(s, Not(ElementsAre(2, 1, 4, 5, 3)));
-}
-
-TEST(ElemensAreArrayStreamTest, WorksForStreamlike) {
-  const int a[5] = {1, 2, 3, 4, 5};
-  Streamlike<int> s(std::begin(a), std::end(a));
-
-  vector<int> expected;
-  expected.push_back(1);
-  expected.push_back(2);
-  expected.push_back(3);
-  expected.push_back(4);
-  expected.push_back(5);
-  EXPECT_THAT(s, ElementsAreArray(expected));
-
-  expected[3] = 0;
-  EXPECT_THAT(s, Not(ElementsAreArray(expected)));
-}
-
-TEST(ElementsAreTest, WorksWithUncopyable) {
-  Uncopyable objs[2];
-  objs[0].set_value(-3);
-  objs[1].set_value(1);
-  EXPECT_THAT(objs, ElementsAre(UncopyableIs(-3), Truly(ValueIsPositive)));
-}
-
-TEST(ElementsAreTest, WorksWithMoveOnly) {
-  ContainerHelper helper;
-  EXPECT_CALL(helper, Call(ElementsAre(Pointee(1), Pointee(2))));
-  helper.Call(MakeUniquePtrs({1, 2}));
-
-  EXPECT_CALL(helper, Call(ElementsAreArray({Pointee(3), Pointee(4)})));
-  helper.Call(MakeUniquePtrs({3, 4}));
-}
-
-TEST(ElementsAreTest, TakesStlContainer) {
-  const int actual[] = {3, 1, 2};
-
-  ::std::list<int> expected;
-  expected.push_back(3);
-  expected.push_back(1);
-  expected.push_back(2);
-  EXPECT_THAT(actual, ElementsAreArray(expected));
-
-  expected.push_back(4);
-  EXPECT_THAT(actual, Not(ElementsAreArray(expected)));
-}
-
-// Tests for UnorderedElementsAreArray()
-
-TEST(UnorderedElementsAreArrayTest, SucceedsWhenExpected) {
-  const int a[] = {0, 1, 2, 3, 4};
-  std::vector<int> s(std::begin(a), std::end(a));
-  do {
-    StringMatchResultListener listener;
-    EXPECT_TRUE(ExplainMatchResult(UnorderedElementsAreArray(a), s, &listener))
-        << listener.str();
-  } while (std::next_permutation(s.begin(), s.end()));
-}
-
-TEST(UnorderedElementsAreArrayTest, VectorBool) {
-  const bool a[] = {0, 1, 0, 1, 1};
-  const bool b[] = {1, 0, 1, 1, 0};
-  std::vector<bool> expected(std::begin(a), std::end(a));
-  std::vector<bool> actual(std::begin(b), std::end(b));
-  StringMatchResultListener listener;
-  EXPECT_TRUE(ExplainMatchResult(UnorderedElementsAreArray(expected), actual,
-                                 &listener))
-      << listener.str();
-}
-
-TEST(UnorderedElementsAreArrayTest, WorksForStreamlike) {
-  // Streamlike 'container' provides only minimal iterator support.
-  // Its iterators are tagged with input_iterator_tag, and it has no
-  // size() or empty() methods.
-  const int a[5] = {2, 1, 4, 5, 3};
-  Streamlike<int> s(std::begin(a), std::end(a));
-
-  ::std::vector<int> expected;
-  expected.push_back(1);
-  expected.push_back(2);
-  expected.push_back(3);
-  expected.push_back(4);
-  expected.push_back(5);
-  EXPECT_THAT(s, UnorderedElementsAreArray(expected));
-
-  expected.push_back(6);
-  EXPECT_THAT(s, Not(UnorderedElementsAreArray(expected)));
-}
-
-TEST(UnorderedElementsAreArrayTest, TakesStlContainer) {
-  const int actual[] = {3, 1, 2};
-
-  ::std::list<int> expected;
-  expected.push_back(1);
-  expected.push_back(2);
-  expected.push_back(3);
-  EXPECT_THAT(actual, UnorderedElementsAreArray(expected));
-
-  expected.push_back(4);
-  EXPECT_THAT(actual, Not(UnorderedElementsAreArray(expected)));
-}
-
-TEST(UnorderedElementsAreArrayTest, TakesInitializerList) {
-  const int a[5] = {2, 1, 4, 5, 3};
-  EXPECT_THAT(a, UnorderedElementsAreArray({1, 2, 3, 4, 5}));
-  EXPECT_THAT(a, Not(UnorderedElementsAreArray({1, 2, 3, 4, 6})));
-}
-
-TEST(UnorderedElementsAreArrayTest, TakesInitializerListOfCStrings) {
-  const std::string a[5] = {"a", "b", "c", "d", "e"};
-  EXPECT_THAT(a, UnorderedElementsAreArray({"a", "b", "c", "d", "e"}));
-  EXPECT_THAT(a, Not(UnorderedElementsAreArray({"a", "b", "c", "d", "ef"})));
-}
-
-TEST(UnorderedElementsAreArrayTest, TakesInitializerListOfSameTypedMatchers) {
-  const int a[5] = {2, 1, 4, 5, 3};
-  EXPECT_THAT(a,
-              UnorderedElementsAreArray({Eq(1), Eq(2), Eq(3), Eq(4), Eq(5)}));
-  EXPECT_THAT(
-      a, Not(UnorderedElementsAreArray({Eq(1), Eq(2), Eq(3), Eq(4), Eq(6)})));
-}
-
-TEST(UnorderedElementsAreArrayTest,
-     TakesInitializerListOfDifferentTypedMatchers) {
-  const int a[5] = {2, 1, 4, 5, 3};
-  // The compiler cannot infer the type of the initializer list if its
-  // elements have different types.  We must explicitly specify the
-  // unified element type in this case.
-  EXPECT_THAT(a, UnorderedElementsAreArray<Matcher<int>>(
-                     {Eq(1), Ne(-2), Ge(3), Le(4), Eq(5)}));
-  EXPECT_THAT(a, Not(UnorderedElementsAreArray<Matcher<int>>(
-                     {Eq(1), Ne(-2), Ge(3), Le(4), Eq(6)})));
-}
-
-TEST(UnorderedElementsAreArrayTest, WorksWithMoveOnly) {
-  ContainerHelper helper;
-  EXPECT_CALL(helper,
-              Call(UnorderedElementsAreArray({Pointee(1), Pointee(2)})));
-  helper.Call(MakeUniquePtrs({2, 1}));
-}
-
-class UnorderedElementsAreTest : public testing::Test {
- protected:
-  typedef std::vector<int> IntVec;
-};
-
-TEST_F(UnorderedElementsAreTest, WorksWithUncopyable) {
-  Uncopyable objs[2];
-  objs[0].set_value(-3);
-  objs[1].set_value(1);
-  EXPECT_THAT(objs,
-              UnorderedElementsAre(Truly(ValueIsPositive), UncopyableIs(-3)));
-}
-
-TEST_F(UnorderedElementsAreTest, SucceedsWhenExpected) {
-  const int a[] = {1, 2, 3};
-  std::vector<int> s(std::begin(a), std::end(a));
-  do {
-    StringMatchResultListener listener;
-    EXPECT_TRUE(ExplainMatchResult(UnorderedElementsAre(1, 2, 3), s, &listener))
-        << listener.str();
-  } while (std::next_permutation(s.begin(), s.end()));
-}
-
-TEST_F(UnorderedElementsAreTest, FailsWhenAnElementMatchesNoMatcher) {
-  const int a[] = {1, 2, 3};
-  std::vector<int> s(std::begin(a), std::end(a));
-  std::vector<Matcher<int>> mv;
-  mv.push_back(1);
-  mv.push_back(2);
-  mv.push_back(2);
-  // The element with value '3' matches nothing: fail fast.
-  StringMatchResultListener listener;
-  EXPECT_FALSE(ExplainMatchResult(UnorderedElementsAreArray(mv), s, &listener))
-      << listener.str();
-}
-
-TEST_F(UnorderedElementsAreTest, WorksForStreamlike) {
-  // Streamlike 'container' provides only minimal iterator support.
-  // Its iterators are tagged with input_iterator_tag, and it has no
-  // size() or empty() methods.
-  const int a[5] = {2, 1, 4, 5, 3};
-  Streamlike<int> s(std::begin(a), std::end(a));
-
-  EXPECT_THAT(s, UnorderedElementsAre(1, 2, 3, 4, 5));
-  EXPECT_THAT(s, Not(UnorderedElementsAre(2, 2, 3, 4, 5)));
-}
-
-TEST_F(UnorderedElementsAreTest, WorksWithMoveOnly) {
-  ContainerHelper helper;
-  EXPECT_CALL(helper, Call(UnorderedElementsAre(Pointee(1), Pointee(2))));
-  helper.Call(MakeUniquePtrs({2, 1}));
-}
-
-// One naive implementation of the matcher runs in O(N!) time, which is too
-// slow for many real-world inputs. This test shows that our matcher can match
-// 100 inputs very quickly (a few milliseconds).  An O(100!) is 10^158
-// iterations and obviously effectively incomputable.
-// [ RUN      ] UnorderedElementsAreTest.Performance
-// [       OK ] UnorderedElementsAreTest.Performance (4 ms)
-TEST_F(UnorderedElementsAreTest, Performance) {
-  std::vector<int> s;
-  std::vector<Matcher<int>> mv;
-  for (int i = 0; i < 100; ++i) {
-    s.push_back(i);
-    mv.push_back(_);
-  }
-  mv[50] = Eq(0);
-  StringMatchResultListener listener;
-  EXPECT_TRUE(ExplainMatchResult(UnorderedElementsAreArray(mv), s, &listener))
-      << listener.str();
-}
-
-// Another variant of 'Performance' with similar expectations.
-// [ RUN      ] UnorderedElementsAreTest.PerformanceHalfStrict
-// [       OK ] UnorderedElementsAreTest.PerformanceHalfStrict (4 ms)
-TEST_F(UnorderedElementsAreTest, PerformanceHalfStrict) {
-  std::vector<int> s;
-  std::vector<Matcher<int>> mv;
-  for (int i = 0; i < 100; ++i) {
-    s.push_back(i);
-    if (i & 1) {
-      mv.push_back(_);
-    } else {
-      mv.push_back(i);
-    }
-  }
-  StringMatchResultListener listener;
-  EXPECT_TRUE(ExplainMatchResult(UnorderedElementsAreArray(mv), s, &listener))
-      << listener.str();
-}
-
-TEST_F(UnorderedElementsAreTest, FailMessageCountWrong) {
-  std::vector<int> v;
-  v.push_back(4);
-  StringMatchResultListener listener;
-  EXPECT_FALSE(ExplainMatchResult(UnorderedElementsAre(1, 2, 3), v, &listener))
-      << listener.str();
-  EXPECT_THAT(listener.str(), Eq("which has 1 element"));
-}
-
-TEST_F(UnorderedElementsAreTest, FailMessageCountWrongZero) {
-  std::vector<int> v;
-  StringMatchResultListener listener;
-  EXPECT_FALSE(ExplainMatchResult(UnorderedElementsAre(1, 2, 3), v, &listener))
-      << listener.str();
-  EXPECT_THAT(listener.str(), Eq(""));
-}
-
-TEST_F(UnorderedElementsAreTest, FailMessageUnmatchedMatchers) {
-  std::vector<int> v;
-  v.push_back(1);
-  v.push_back(1);
-  StringMatchResultListener listener;
-  EXPECT_FALSE(ExplainMatchResult(UnorderedElementsAre(1, 2), v, &listener))
-      << listener.str();
-  EXPECT_THAT(listener.str(),
-              Eq("where the following matchers don't match any elements:\n"
-                 "matcher #1: is equal to 2"));
-}
-
-TEST_F(UnorderedElementsAreTest, FailMessageUnmatchedElements) {
-  std::vector<int> v;
-  v.push_back(1);
-  v.push_back(2);
-  StringMatchResultListener listener;
-  EXPECT_FALSE(ExplainMatchResult(UnorderedElementsAre(1, 1), v, &listener))
-      << listener.str();
-  EXPECT_THAT(listener.str(),
-              Eq("where the following elements don't match any matchers:\n"
-                 "element #1: 2"));
-}
-
-TEST_F(UnorderedElementsAreTest, FailMessageUnmatchedMatcherAndElement) {
-  std::vector<int> v;
-  v.push_back(2);
-  v.push_back(3);
-  StringMatchResultListener listener;
-  EXPECT_FALSE(ExplainMatchResult(UnorderedElementsAre(1, 2), v, &listener))
-      << listener.str();
-  EXPECT_THAT(listener.str(),
-              Eq("where"
-                 " the following matchers don't match any elements:\n"
-                 "matcher #0: is equal to 1\n"
-                 "and"
-                 " where"
-                 " the following elements don't match any matchers:\n"
-                 "element #1: 3"));
-}
-
-// Test helper for formatting element, matcher index pairs in expectations.
-static std::string EMString(int element, int matcher) {
-  stringstream ss;
-  ss << "(element #" << element << ", matcher #" << matcher << ")";
-  return ss.str();
-}
-
-TEST_F(UnorderedElementsAreTest, FailMessageImperfectMatchOnly) {
-  // A situation where all elements and matchers have a match
-  // associated with them, but the max matching is not perfect.
-  std::vector<std::string> v;
-  v.push_back("a");
-  v.push_back("b");
-  v.push_back("c");
-  StringMatchResultListener listener;
-  EXPECT_FALSE(ExplainMatchResult(
-      UnorderedElementsAre("a", "a", AnyOf("b", "c")), v, &listener))
-      << listener.str();
-
-  std::string prefix =
-      "where no permutation of the elements can satisfy all matchers, "
-      "and the closest match is 2 of 3 matchers with the "
-      "pairings:\n";
-
-  // We have to be a bit loose here, because there are 4 valid max matches.
-  EXPECT_THAT(
-      listener.str(),
-      AnyOf(
-          prefix + "{\n  " + EMString(0, 0) + ",\n  " + EMString(1, 2) + "\n}",
-          prefix + "{\n  " + EMString(0, 1) + ",\n  " + EMString(1, 2) + "\n}",
-          prefix + "{\n  " + EMString(0, 0) + ",\n  " + EMString(2, 2) + "\n}",
-          prefix + "{\n  " + EMString(0, 1) + ",\n  " + EMString(2, 2) +
-              "\n}"));
-}
-
-TEST_F(UnorderedElementsAreTest, Describe) {
-  EXPECT_THAT(Describe<IntVec>(UnorderedElementsAre()), Eq("is empty"));
-  EXPECT_THAT(Describe<IntVec>(UnorderedElementsAre(345)),
-              Eq("has 1 element and that element is equal to 345"));
-  EXPECT_THAT(Describe<IntVec>(UnorderedElementsAre(111, 222, 333)),
-              Eq("has 3 elements and there exists some permutation "
-                 "of elements such that:\n"
-                 " - element #0 is equal to 111, and\n"
-                 " - element #1 is equal to 222, and\n"
-                 " - element #2 is equal to 333"));
-}
-
-TEST_F(UnorderedElementsAreTest, DescribeNegation) {
-  EXPECT_THAT(DescribeNegation<IntVec>(UnorderedElementsAre()),
-              Eq("isn't empty"));
-  EXPECT_THAT(
-      DescribeNegation<IntVec>(UnorderedElementsAre(345)),
-      Eq("doesn't have 1 element, or has 1 element that isn't equal to 345"));
-  EXPECT_THAT(DescribeNegation<IntVec>(UnorderedElementsAre(123, 234, 345)),
-              Eq("doesn't have 3 elements, or there exists no permutation "
-                 "of elements such that:\n"
-                 " - element #0 is equal to 123, and\n"
-                 " - element #1 is equal to 234, and\n"
-                 " - element #2 is equal to 345"));
-}
-
-namespace {
-
-// Used as a check on the more complex max flow method used in the
-// real testing::internal::FindMaxBipartiteMatching. This method is
-// compatible but runs in worst-case factorial time, so we only
-// use it in testing for small problem sizes.
-template <typename Graph>
-class BacktrackingMaxBPMState {
- public:
-  // Does not take ownership of 'g'.
-  explicit BacktrackingMaxBPMState(const Graph* g) : graph_(g) {}
-
-  ElementMatcherPairs Compute() {
-    if (graph_->LhsSize() == 0 || graph_->RhsSize() == 0) {
-      return best_so_far_;
-    }
-    lhs_used_.assign(graph_->LhsSize(), kUnused);
-    rhs_used_.assign(graph_->RhsSize(), kUnused);
-    for (size_t irhs = 0; irhs < graph_->RhsSize(); ++irhs) {
-      matches_.clear();
-      RecurseInto(irhs);
-      if (best_so_far_.size() == graph_->RhsSize()) break;
-    }
-    return best_so_far_;
-  }
-
- private:
-  static const size_t kUnused = static_cast<size_t>(-1);
-
-  void PushMatch(size_t lhs, size_t rhs) {
-    matches_.push_back(ElementMatcherPair(lhs, rhs));
-    lhs_used_[lhs] = rhs;
-    rhs_used_[rhs] = lhs;
-    if (matches_.size() > best_so_far_.size()) {
-      best_so_far_ = matches_;
-    }
-  }
-
-  void PopMatch() {
-    const ElementMatcherPair& back = matches_.back();
-    lhs_used_[back.first] = kUnused;
-    rhs_used_[back.second] = kUnused;
-    matches_.pop_back();
-  }
-
-  bool RecurseInto(size_t irhs) {
-    if (rhs_used_[irhs] != kUnused) {
-      return true;
-    }
-    for (size_t ilhs = 0; ilhs < graph_->LhsSize(); ++ilhs) {
-      if (lhs_used_[ilhs] != kUnused) {
-        continue;
-      }
-      if (!graph_->HasEdge(ilhs, irhs)) {
-        continue;
-      }
-      PushMatch(ilhs, irhs);
-      if (best_so_far_.size() == graph_->RhsSize()) {
-        return false;
-      }
-      for (size_t mi = irhs + 1; mi < graph_->RhsSize(); ++mi) {
-        if (!RecurseInto(mi)) return false;
-      }
-      PopMatch();
-    }
-    return true;
-  }
-
-  const Graph* graph_;  // not owned
-  std::vector<size_t> lhs_used_;
-  std::vector<size_t> rhs_used_;
-  ElementMatcherPairs matches_;
-  ElementMatcherPairs best_so_far_;
-};
-
-template <typename Graph>
-const size_t BacktrackingMaxBPMState<Graph>::kUnused;
-
-}  // namespace
-
-// Implement a simple backtracking algorithm to determine if it is possible
-// to find one element per matcher, without reusing elements.
-template <typename Graph>
-ElementMatcherPairs FindBacktrackingMaxBPM(const Graph& g) {
-  return BacktrackingMaxBPMState<Graph>(&g).Compute();
-}
-
-class BacktrackingBPMTest : public ::testing::Test {};
-
-// Tests the MaxBipartiteMatching algorithm with square matrices.
-// The single int param is the # of nodes on each of the left and right sides.
-class BipartiteTest : public ::testing::TestWithParam<size_t> {};
-
-// Verify all match graphs up to some moderate number of edges.
-TEST_P(BipartiteTest, Exhaustive) {
-  size_t nodes = GetParam();
-  MatchMatrix graph(nodes, nodes);
-  do {
-    ElementMatcherPairs matches = internal::FindMaxBipartiteMatching(graph);
-    EXPECT_EQ(FindBacktrackingMaxBPM(graph).size(), matches.size())
-        << "graph: " << graph.DebugString();
-    // Check that all elements of matches are in the graph.
-    // Check that elements of first and second are unique.
-    std::vector<bool> seen_element(graph.LhsSize());
-    std::vector<bool> seen_matcher(graph.RhsSize());
-    SCOPED_TRACE(PrintToString(matches));
-    for (size_t i = 0; i < matches.size(); ++i) {
-      size_t ilhs = matches[i].first;
-      size_t irhs = matches[i].second;
-      EXPECT_TRUE(graph.HasEdge(ilhs, irhs));
-      EXPECT_FALSE(seen_element[ilhs]);
-      EXPECT_FALSE(seen_matcher[irhs]);
-      seen_element[ilhs] = true;
-      seen_matcher[irhs] = true;
-    }
-  } while (graph.NextGraph());
-}
-
-INSTANTIATE_TEST_SUITE_P(AllGraphs, BipartiteTest,
-                         ::testing::Range(size_t{0}, size_t{5}));
-
-// Parameterized by a pair interpreted as (LhsSize, RhsSize).
-class BipartiteNonSquareTest
-    : public ::testing::TestWithParam<std::pair<size_t, size_t>> {};
-
-TEST_F(BipartiteNonSquareTest, SimpleBacktracking) {
-  //   .......
-  // 0:-----\ :
-  // 1:---\ | :
-  // 2:---\ | :
-  // 3:-\ | | :
-  //  :.......:
-  //    0 1 2
-  MatchMatrix g(4, 3);
-  constexpr std::array<std::array<size_t, 2>, 4> kEdges = {
-      {{{0, 2}}, {{1, 1}}, {{2, 1}}, {{3, 0}}}};
-  for (size_t i = 0; i < kEdges.size(); ++i) {
-    g.SetEdge(kEdges[i][0], kEdges[i][1], true);
-  }
-  EXPECT_THAT(FindBacktrackingMaxBPM(g),
-              ElementsAre(Pair(3, 0), Pair(AnyOf(1, 2), 1), Pair(0, 2)))
-      << g.DebugString();
-}
-
-// Verify a few nonsquare matrices.
-TEST_P(BipartiteNonSquareTest, Exhaustive) {
-  size_t nlhs = GetParam().first;
-  size_t nrhs = GetParam().second;
-  MatchMatrix graph(nlhs, nrhs);
-  do {
-    EXPECT_EQ(FindBacktrackingMaxBPM(graph).size(),
-              internal::FindMaxBipartiteMatching(graph).size())
-        << "graph: " << graph.DebugString()
-        << "\nbacktracking: " << PrintToString(FindBacktrackingMaxBPM(graph))
-        << "\nmax flow: "
-        << PrintToString(internal::FindMaxBipartiteMatching(graph));
-  } while (graph.NextGraph());
-}
-
-INSTANTIATE_TEST_SUITE_P(
-    AllGraphs, BipartiteNonSquareTest,
-    testing::Values(std::make_pair(1, 2), std::make_pair(2, 1),
-                    std::make_pair(3, 2), std::make_pair(2, 3),
-                    std::make_pair(4, 1), std::make_pair(1, 4),
-                    std::make_pair(4, 3), std::make_pair(3, 4)));
-
-class BipartiteRandomTest
-    : public ::testing::TestWithParam<std::pair<int, int>> {};
-
-// Verifies a large sample of larger graphs.
-TEST_P(BipartiteRandomTest, LargerNets) {
-  int nodes = GetParam().first;
-  int iters = GetParam().second;
-  MatchMatrix graph(static_cast<size_t>(nodes), static_cast<size_t>(nodes));
-
-  auto seed = static_cast<uint32_t>(GTEST_FLAG(random_seed));
-  if (seed == 0) {
-    seed = static_cast<uint32_t>(time(nullptr));
-  }
-
-  for (; iters > 0; --iters, ++seed) {
-    srand(static_cast<unsigned int>(seed));
-    graph.Randomize();
-    EXPECT_EQ(FindBacktrackingMaxBPM(graph).size(),
-              internal::FindMaxBipartiteMatching(graph).size())
-        << " graph: " << graph.DebugString()
-        << "\nTo reproduce the failure, rerun the test with the flag"
-           " --"
-        << GTEST_FLAG_PREFIX_ << "random_seed=" << seed;
-  }
-}
-
-// Test argument is a std::pair<int, int> representing (nodes, iters).
-INSTANTIATE_TEST_SUITE_P(Samples, BipartiteRandomTest,
-                         testing::Values(std::make_pair(5, 10000),
-                                         std::make_pair(6, 5000),
-                                         std::make_pair(7, 2000),
-                                         std::make_pair(8, 500),
-                                         std::make_pair(9, 100)));
-
-// Tests IsReadableTypeName().
-
-TEST(IsReadableTypeNameTest, ReturnsTrueForShortNames) {
-  EXPECT_TRUE(IsReadableTypeName("int"));
-  EXPECT_TRUE(IsReadableTypeName("const unsigned char*"));
-  EXPECT_TRUE(IsReadableTypeName("MyMap<int, void*>"));
-  EXPECT_TRUE(IsReadableTypeName("void (*)(int, bool)"));
-}
-
-TEST(IsReadableTypeNameTest, ReturnsTrueForLongNonTemplateNonFunctionNames) {
-  EXPECT_TRUE(IsReadableTypeName("my_long_namespace::MyClassName"));
-  EXPECT_TRUE(IsReadableTypeName("int [5][6][7][8][9][10][11]"));
-  EXPECT_TRUE(IsReadableTypeName("my_namespace::MyOuterClass::MyInnerClass"));
-}
-
-TEST(IsReadableTypeNameTest, ReturnsFalseForLongTemplateNames) {
-  EXPECT_FALSE(
-      IsReadableTypeName("basic_string<char, std::char_traits<char> >"));
-  EXPECT_FALSE(IsReadableTypeName("std::vector<int, std::alloc_traits<int> >"));
-}
-
-TEST(IsReadableTypeNameTest, ReturnsFalseForLongFunctionTypeNames) {
-  EXPECT_FALSE(IsReadableTypeName("void (&)(int, bool, char, float)"));
-}
-
-// Tests FormatMatcherDescription().
-
-TEST(FormatMatcherDescriptionTest, WorksForEmptyDescription) {
-  EXPECT_EQ("is even", FormatMatcherDescription(false, "IsEven", Strings()));
-  EXPECT_EQ("not (is even)",
-            FormatMatcherDescription(true, "IsEven", Strings()));
-
-  const char* params[] = {"5"};
-  EXPECT_EQ("equals 5", FormatMatcherDescription(false, "Equals",
-                                                 Strings(params, params + 1)));
-
-  const char* params2[] = {"5", "8"};
-  EXPECT_EQ("is in range (5, 8)",
-            FormatMatcherDescription(false, "IsInRange",
-                                     Strings(params2, params2 + 2)));
-}
-
-// Tests PolymorphicMatcher::mutable_impl().
-TEST(PolymorphicMatcherTest, CanAccessMutableImpl) {
-  PolymorphicMatcher<DivisibleByImpl> m(DivisibleByImpl(42));
-  DivisibleByImpl& impl = m.mutable_impl();
-  EXPECT_EQ(42, impl.divider());
-
-  impl.set_divider(0);
-  EXPECT_EQ(0, m.mutable_impl().divider());
-}
-
-// Tests PolymorphicMatcher::impl().
-TEST(PolymorphicMatcherTest, CanAccessImpl) {
-  const PolymorphicMatcher<DivisibleByImpl> m(DivisibleByImpl(42));
-  const DivisibleByImpl& impl = m.impl();
-  EXPECT_EQ(42, impl.divider());
-}
-
-TEST(MatcherTupleTest, ExplainsMatchFailure) {
-  stringstream ss1;
-  ExplainMatchFailureTupleTo(
-      std::make_tuple(Matcher<char>(Eq('a')), GreaterThan(5)),
-      std::make_tuple('a', 10), &ss1);
-  EXPECT_EQ("", ss1.str());  // Successful match.
-
-  stringstream ss2;
-  ExplainMatchFailureTupleTo(
-      std::make_tuple(GreaterThan(5), Matcher<char>(Eq('a'))),
-      std::make_tuple(2, 'b'), &ss2);
-  EXPECT_EQ(
-      "  Expected arg #0: is > 5\n"
-      "           Actual: 2, which is 3 less than 5\n"
-      "  Expected arg #1: is equal to 'a' (97, 0x61)\n"
-      "           Actual: 'b' (98, 0x62)\n",
-      ss2.str());  // Failed match where both arguments need explanation.
-
-  stringstream ss3;
-  ExplainMatchFailureTupleTo(
-      std::make_tuple(GreaterThan(5), Matcher<char>(Eq('a'))),
-      std::make_tuple(2, 'a'), &ss3);
-  EXPECT_EQ(
-      "  Expected arg #0: is > 5\n"
-      "           Actual: 2, which is 3 less than 5\n",
-      ss3.str());  // Failed match where only one argument needs
-                   // explanation.
-}
-
-// Tests Each().
-
-TEST(EachTest, ExplainsMatchResultCorrectly) {
-  set<int> a;  // empty
-
-  Matcher<set<int>> m = Each(2);
-  EXPECT_EQ("", Explain(m, a));
-
-  Matcher<const int(&)[1]> n = Each(1);  // NOLINT
-
-  const int b[1] = {1};
-  EXPECT_EQ("", Explain(n, b));
-
-  n = Each(3);
-  EXPECT_EQ("whose element #0 doesn't match", Explain(n, b));
-
-  a.insert(1);
-  a.insert(2);
-  a.insert(3);
-  m = Each(GreaterThan(0));
-  EXPECT_EQ("", Explain(m, a));
-
-  m = Each(GreaterThan(10));
-  EXPECT_EQ("whose element #0 doesn't match, which is 9 less than 10",
-            Explain(m, a));
-}
-
-TEST(EachTest, DescribesItselfCorrectly) {
-  Matcher<vector<int>> m = Each(1);
-  EXPECT_EQ("only contains elements that is equal to 1", Describe(m));
-
-  Matcher<vector<int>> m2 = Not(m);
-  EXPECT_EQ("contains some element that isn't equal to 1", Describe(m2));
-}
-
-TEST(EachTest, MatchesVectorWhenAllElementsMatch) {
-  vector<int> some_vector;
-  EXPECT_THAT(some_vector, Each(1));
-  some_vector.push_back(3);
-  EXPECT_THAT(some_vector, Not(Each(1)));
-  EXPECT_THAT(some_vector, Each(3));
-  some_vector.push_back(1);
-  some_vector.push_back(2);
-  EXPECT_THAT(some_vector, Not(Each(3)));
-  EXPECT_THAT(some_vector, Each(Lt(3.5)));
-
-  vector<std::string> another_vector;
-  another_vector.push_back("fee");
-  EXPECT_THAT(another_vector, Each(std::string("fee")));
-  another_vector.push_back("fie");
-  another_vector.push_back("foe");
-  another_vector.push_back("fum");
-  EXPECT_THAT(another_vector, Not(Each(std::string("fee"))));
-}
-
-TEST(EachTest, MatchesMapWhenAllElementsMatch) {
-  map<const char*, int> my_map;
-  const char* bar = "a string";
-  my_map[bar] = 2;
-  EXPECT_THAT(my_map, Each(make_pair(bar, 2)));
-
-  map<std::string, int> another_map;
-  EXPECT_THAT(another_map, Each(make_pair(std::string("fee"), 1)));
-  another_map["fee"] = 1;
-  EXPECT_THAT(another_map, Each(make_pair(std::string("fee"), 1)));
-  another_map["fie"] = 2;
-  another_map["foe"] = 3;
-  another_map["fum"] = 4;
-  EXPECT_THAT(another_map, Not(Each(make_pair(std::string("fee"), 1))));
-  EXPECT_THAT(another_map, Not(Each(make_pair(std::string("fum"), 1))));
-  EXPECT_THAT(another_map, Each(Pair(_, Gt(0))));
-}
-
-TEST(EachTest, AcceptsMatcher) {
-  const int a[] = {1, 2, 3};
-  EXPECT_THAT(a, Each(Gt(0)));
-  EXPECT_THAT(a, Not(Each(Gt(1))));
-}
-
-TEST(EachTest, WorksForNativeArrayAsTuple) {
-  const int a[] = {1, 2};
-  const int* const pointer = a;
-  EXPECT_THAT(std::make_tuple(pointer, 2), Each(Gt(0)));
-  EXPECT_THAT(std::make_tuple(pointer, 2), Not(Each(Gt(1))));
-}
-
-TEST(EachTest, WorksWithMoveOnly) {
-  ContainerHelper helper;
-  EXPECT_CALL(helper, Call(Each(Pointee(Gt(0)))));
-  helper.Call(MakeUniquePtrs({1, 2}));
-}
-
-// For testing Pointwise().
-class IsHalfOfMatcher {
- public:
-  template <typename T1, typename T2>
-  bool MatchAndExplain(const std::tuple<T1, T2>& a_pair,
-                       MatchResultListener* listener) const {
-    if (std::get<0>(a_pair) == std::get<1>(a_pair) / 2) {
-      *listener << "where the second is " << std::get<1>(a_pair);
-      return true;
-    } else {
-      *listener << "where the second/2 is " << std::get<1>(a_pair) / 2;
-      return false;
-    }
-  }
-
-  void DescribeTo(ostream* os) const {
-    *os << "are a pair where the first is half of the second";
-  }
-
-  void DescribeNegationTo(ostream* os) const {
-    *os << "are a pair where the first isn't half of the second";
-  }
-};
-
-PolymorphicMatcher<IsHalfOfMatcher> IsHalfOf() {
-  return MakePolymorphicMatcher(IsHalfOfMatcher());
-}
-
-TEST(PointwiseTest, DescribesSelf) {
-  vector<int> rhs;
-  rhs.push_back(1);
-  rhs.push_back(2);
-  rhs.push_back(3);
-  const Matcher<const vector<int>&> m = Pointwise(IsHalfOf(), rhs);
-  EXPECT_EQ(
-      "contains 3 values, where each value and its corresponding value "
-      "in { 1, 2, 3 } are a pair where the first is half of the second",
-      Describe(m));
-  EXPECT_EQ(
-      "doesn't contain exactly 3 values, or contains a value x at some "
-      "index i where x and the i-th value of { 1, 2, 3 } are a pair "
-      "where the first isn't half of the second",
-      DescribeNegation(m));
-}
-
-TEST(PointwiseTest, MakesCopyOfRhs) {
-  list<signed char> rhs;
-  rhs.push_back(2);
-  rhs.push_back(4);
-
-  int lhs[] = {1, 2};
-  const Matcher<const int(&)[2]> m = Pointwise(IsHalfOf(), rhs);
-  EXPECT_THAT(lhs, m);
-
-  // Changing rhs now shouldn't affect m, which made a copy of rhs.
-  rhs.push_back(6);
-  EXPECT_THAT(lhs, m);
-}
-
-TEST(PointwiseTest, WorksForLhsNativeArray) {
-  const int lhs[] = {1, 2, 3};
-  vector<int> rhs;
-  rhs.push_back(2);
-  rhs.push_back(4);
-  rhs.push_back(6);
-  EXPECT_THAT(lhs, Pointwise(Lt(), rhs));
-  EXPECT_THAT(lhs, Not(Pointwise(Gt(), rhs)));
-}
-
-TEST(PointwiseTest, WorksForRhsNativeArray) {
-  const int rhs[] = {1, 2, 3};
-  vector<int> lhs;
-  lhs.push_back(2);
-  lhs.push_back(4);
-  lhs.push_back(6);
-  EXPECT_THAT(lhs, Pointwise(Gt(), rhs));
-  EXPECT_THAT(lhs, Not(Pointwise(Lt(), rhs)));
-}
-
-// Test is effective only with sanitizers.
-TEST(PointwiseTest, WorksForVectorOfBool) {
-  vector<bool> rhs(3, false);
-  rhs[1] = true;
-  vector<bool> lhs = rhs;
-  EXPECT_THAT(lhs, Pointwise(Eq(), rhs));
-  rhs[0] = true;
-  EXPECT_THAT(lhs, Not(Pointwise(Eq(), rhs)));
-}
-
-TEST(PointwiseTest, WorksForRhsInitializerList) {
-  const vector<int> lhs{2, 4, 6};
-  EXPECT_THAT(lhs, Pointwise(Gt(), {1, 2, 3}));
-  EXPECT_THAT(lhs, Not(Pointwise(Lt(), {3, 3, 7})));
-}
-
-TEST(PointwiseTest, RejectsWrongSize) {
-  const double lhs[2] = {1, 2};
-  const int rhs[1] = {0};
-  EXPECT_THAT(lhs, Not(Pointwise(Gt(), rhs)));
-  EXPECT_EQ("which contains 2 values", Explain(Pointwise(Gt(), rhs), lhs));
-
-  const int rhs2[3] = {0, 1, 2};
-  EXPECT_THAT(lhs, Not(Pointwise(Gt(), rhs2)));
-}
-
-TEST(PointwiseTest, RejectsWrongContent) {
-  const double lhs[3] = {1, 2, 3};
-  const int rhs[3] = {2, 6, 4};
-  EXPECT_THAT(lhs, Not(Pointwise(IsHalfOf(), rhs)));
-  EXPECT_EQ(
-      "where the value pair (2, 6) at index #1 don't match, "
-      "where the second/2 is 3",
-      Explain(Pointwise(IsHalfOf(), rhs), lhs));
-}
-
-TEST(PointwiseTest, AcceptsCorrectContent) {
-  const double lhs[3] = {1, 2, 3};
-  const int rhs[3] = {2, 4, 6};
-  EXPECT_THAT(lhs, Pointwise(IsHalfOf(), rhs));
-  EXPECT_EQ("", Explain(Pointwise(IsHalfOf(), rhs), lhs));
-}
-
-TEST(PointwiseTest, AllowsMonomorphicInnerMatcher) {
-  const double lhs[3] = {1, 2, 3};
-  const int rhs[3] = {2, 4, 6};
-  const Matcher<std::tuple<const double&, const int&>> m1 = IsHalfOf();
-  EXPECT_THAT(lhs, Pointwise(m1, rhs));
-  EXPECT_EQ("", Explain(Pointwise(m1, rhs), lhs));
-
-  // This type works as a std::tuple<const double&, const int&> can be
-  // implicitly cast to std::tuple<double, int>.
-  const Matcher<std::tuple<double, int>> m2 = IsHalfOf();
-  EXPECT_THAT(lhs, Pointwise(m2, rhs));
-  EXPECT_EQ("", Explain(Pointwise(m2, rhs), lhs));
-}
-
-MATCHER(PointeeEquals, "Points to an equal value") {
-  return ExplainMatchResult(::testing::Pointee(::testing::get<1>(arg)),
-                            ::testing::get<0>(arg), result_listener);
-}
-
-TEST(PointwiseTest, WorksWithMoveOnly) {
-  ContainerHelper helper;
-  EXPECT_CALL(helper, Call(Pointwise(PointeeEquals(), std::vector<int>{1, 2})));
-  helper.Call(MakeUniquePtrs({1, 2}));
-}
-
-TEST(UnorderedPointwiseTest, DescribesSelf) {
-  vector<int> rhs;
-  rhs.push_back(1);
-  rhs.push_back(2);
-  rhs.push_back(3);
-  const Matcher<const vector<int>&> m = UnorderedPointwise(IsHalfOf(), rhs);
-  EXPECT_EQ(
-      "has 3 elements and there exists some permutation of elements such "
-      "that:\n"
-      " - element #0 and 1 are a pair where the first is half of the second, "
-      "and\n"
-      " - element #1 and 2 are a pair where the first is half of the second, "
-      "and\n"
-      " - element #2 and 3 are a pair where the first is half of the second",
-      Describe(m));
-  EXPECT_EQ(
-      "doesn't have 3 elements, or there exists no permutation of elements "
-      "such that:\n"
-      " - element #0 and 1 are a pair where the first is half of the second, "
-      "and\n"
-      " - element #1 and 2 are a pair where the first is half of the second, "
-      "and\n"
-      " - element #2 and 3 are a pair where the first is half of the second",
-      DescribeNegation(m));
-}
-
-TEST(UnorderedPointwiseTest, MakesCopyOfRhs) {
-  list<signed char> rhs;
-  rhs.push_back(2);
-  rhs.push_back(4);
-
-  int lhs[] = {2, 1};
-  const Matcher<const int(&)[2]> m = UnorderedPointwise(IsHalfOf(), rhs);
-  EXPECT_THAT(lhs, m);
-
-  // Changing rhs now shouldn't affect m, which made a copy of rhs.
-  rhs.push_back(6);
-  EXPECT_THAT(lhs, m);
-}
-
-TEST(UnorderedPointwiseTest, WorksForLhsNativeArray) {
-  const int lhs[] = {1, 2, 3};
-  vector<int> rhs;
-  rhs.push_back(4);
-  rhs.push_back(6);
-  rhs.push_back(2);
-  EXPECT_THAT(lhs, UnorderedPointwise(Lt(), rhs));
-  EXPECT_THAT(lhs, Not(UnorderedPointwise(Gt(), rhs)));
-}
-
-TEST(UnorderedPointwiseTest, WorksForRhsNativeArray) {
-  const int rhs[] = {1, 2, 3};
-  vector<int> lhs;
-  lhs.push_back(4);
-  lhs.push_back(2);
-  lhs.push_back(6);
-  EXPECT_THAT(lhs, UnorderedPointwise(Gt(), rhs));
-  EXPECT_THAT(lhs, Not(UnorderedPointwise(Lt(), rhs)));
-}
-
-TEST(UnorderedPointwiseTest, WorksForRhsInitializerList) {
-  const vector<int> lhs{2, 4, 6};
-  EXPECT_THAT(lhs, UnorderedPointwise(Gt(), {5, 1, 3}));
-  EXPECT_THAT(lhs, Not(UnorderedPointwise(Lt(), {1, 1, 7})));
-}
-
-TEST(UnorderedPointwiseTest, RejectsWrongSize) {
-  const double lhs[2] = {1, 2};
-  const int rhs[1] = {0};
-  EXPECT_THAT(lhs, Not(UnorderedPointwise(Gt(), rhs)));
-  EXPECT_EQ("which has 2 elements",
-            Explain(UnorderedPointwise(Gt(), rhs), lhs));
-
-  const int rhs2[3] = {0, 1, 2};
-  EXPECT_THAT(lhs, Not(UnorderedPointwise(Gt(), rhs2)));
-}
-
-TEST(UnorderedPointwiseTest, RejectsWrongContent) {
-  const double lhs[3] = {1, 2, 3};
-  const int rhs[3] = {2, 6, 6};
-  EXPECT_THAT(lhs, Not(UnorderedPointwise(IsHalfOf(), rhs)));
-  EXPECT_EQ(
-      "where the following elements don't match any matchers:\n"
-      "element #1: 2",
-      Explain(UnorderedPointwise(IsHalfOf(), rhs), lhs));
-}
-
-TEST(UnorderedPointwiseTest, AcceptsCorrectContentInSameOrder) {
-  const double lhs[3] = {1, 2, 3};
-  const int rhs[3] = {2, 4, 6};
-  EXPECT_THAT(lhs, UnorderedPointwise(IsHalfOf(), rhs));
-}
-
-TEST(UnorderedPointwiseTest, AcceptsCorrectContentInDifferentOrder) {
-  const double lhs[3] = {1, 2, 3};
-  const int rhs[3] = {6, 4, 2};
-  EXPECT_THAT(lhs, UnorderedPointwise(IsHalfOf(), rhs));
-}
-
-TEST(UnorderedPointwiseTest, AllowsMonomorphicInnerMatcher) {
-  const double lhs[3] = {1, 2, 3};
-  const int rhs[3] = {4, 6, 2};
-  const Matcher<std::tuple<const double&, const int&>> m1 = IsHalfOf();
-  EXPECT_THAT(lhs, UnorderedPointwise(m1, rhs));
-
-  // This type works as a std::tuple<const double&, const int&> can be
-  // implicitly cast to std::tuple<double, int>.
-  const Matcher<std::tuple<double, int>> m2 = IsHalfOf();
-  EXPECT_THAT(lhs, UnorderedPointwise(m2, rhs));
-}
-
-TEST(UnorderedPointwiseTest, WorksWithMoveOnly) {
-  ContainerHelper helper;
-  EXPECT_CALL(helper, Call(UnorderedPointwise(PointeeEquals(),
-                                              std::vector<int>{1, 2})));
-  helper.Call(MakeUniquePtrs({2, 1}));
-}
-
-// Sample optional type implementation with minimal requirements for use with
-// Optional matcher.
-template <typename T>
-class SampleOptional {
- public:
-  using value_type = T;
-  explicit SampleOptional(T value)
-      : value_(std::move(value)), has_value_(true) {}
-  SampleOptional() : value_(), has_value_(false) {}
-  operator bool() const { return has_value_; }
-  const T& operator*() const { return value_; }
-
- private:
-  T value_;
-  bool has_value_;
-};
-
-TEST(OptionalTest, DescribesSelf) {
-  const Matcher<SampleOptional<int>> m = Optional(Eq(1));
-  EXPECT_EQ("value is equal to 1", Describe(m));
-}
-
-TEST(OptionalTest, ExplainsSelf) {
-  const Matcher<SampleOptional<int>> m = Optional(Eq(1));
-  EXPECT_EQ("whose value 1 matches", Explain(m, SampleOptional<int>(1)));
-  EXPECT_EQ("whose value 2 doesn't match", Explain(m, SampleOptional<int>(2)));
-}
-
-TEST(OptionalTest, MatchesNonEmptyOptional) {
-  const Matcher<SampleOptional<int>> m1 = Optional(1);
-  const Matcher<SampleOptional<int>> m2 = Optional(Eq(2));
-  const Matcher<SampleOptional<int>> m3 = Optional(Lt(3));
-  SampleOptional<int> opt(1);
-  EXPECT_TRUE(m1.Matches(opt));
-  EXPECT_FALSE(m2.Matches(opt));
-  EXPECT_TRUE(m3.Matches(opt));
-}
-
-TEST(OptionalTest, DoesNotMatchNullopt) {
-  const Matcher<SampleOptional<int>> m = Optional(1);
-  SampleOptional<int> empty;
-  EXPECT_FALSE(m.Matches(empty));
-}
-
-TEST(OptionalTest, WorksWithMoveOnly) {
-  Matcher<SampleOptional<std::unique_ptr<int>>> m = Optional(Eq(nullptr));
-  EXPECT_TRUE(m.Matches(SampleOptional<std::unique_ptr<int>>(nullptr)));
-}
-
-class SampleVariantIntString {
- public:
-  SampleVariantIntString(int i) : i_(i), has_int_(true) {}
-  SampleVariantIntString(const std::string& s) : s_(s), has_int_(false) {}
-
-  template <typename T>
-  friend bool holds_alternative(const SampleVariantIntString& value) {
-    return value.has_int_ == std::is_same<T, int>::value;
-  }
-
-  template <typename T>
-  friend const T& get(const SampleVariantIntString& value) {
-    return value.get_impl(static_cast<T*>(nullptr));
-  }
-
- private:
-  const int& get_impl(int*) const { return i_; }
-  const std::string& get_impl(std::string*) const { return s_; }
-
-  int i_;
-  std::string s_;
-  bool has_int_;
-};
-
-TEST(VariantTest, DescribesSelf) {
-  const Matcher<SampleVariantIntString> m = VariantWith<int>(Eq(1));
-  EXPECT_THAT(Describe(m), ContainsRegex("is a variant<> with value of type "
-                                         "'.*' and the value is equal to 1"));
-}
-
-TEST(VariantTest, ExplainsSelf) {
-  const Matcher<SampleVariantIntString> m = VariantWith<int>(Eq(1));
-  EXPECT_THAT(Explain(m, SampleVariantIntString(1)),
-              ContainsRegex("whose value 1"));
-  EXPECT_THAT(Explain(m, SampleVariantIntString("A")),
-              HasSubstr("whose value is not of type '"));
-  EXPECT_THAT(Explain(m, SampleVariantIntString(2)),
-              "whose value 2 doesn't match");
-}
-
-TEST(VariantTest, FullMatch) {
-  Matcher<SampleVariantIntString> m = VariantWith<int>(Eq(1));
-  EXPECT_TRUE(m.Matches(SampleVariantIntString(1)));
-
-  m = VariantWith<std::string>(Eq("1"));
-  EXPECT_TRUE(m.Matches(SampleVariantIntString("1")));
-}
-
-TEST(VariantTest, TypeDoesNotMatch) {
-  Matcher<SampleVariantIntString> m = VariantWith<int>(Eq(1));
-  EXPECT_FALSE(m.Matches(SampleVariantIntString("1")));
-
-  m = VariantWith<std::string>(Eq("1"));
-  EXPECT_FALSE(m.Matches(SampleVariantIntString(1)));
-}
-
-TEST(VariantTest, InnerDoesNotMatch) {
-  Matcher<SampleVariantIntString> m = VariantWith<int>(Eq(1));
-  EXPECT_FALSE(m.Matches(SampleVariantIntString(2)));
-
-  m = VariantWith<std::string>(Eq("1"));
-  EXPECT_FALSE(m.Matches(SampleVariantIntString("2")));
-}
-
-class SampleAnyType {
- public:
-  explicit SampleAnyType(int i) : index_(0), i_(i) {}
-  explicit SampleAnyType(const std::string& s) : index_(1), s_(s) {}
-
-  template <typename T>
-  friend const T* any_cast(const SampleAnyType* any) {
-    return any->get_impl(static_cast<T*>(nullptr));
-  }
-
- private:
-  int index_;
-  int i_;
-  std::string s_;
-
-  const int* get_impl(int*) const { return index_ == 0 ? &i_ : nullptr; }
-  const std::string* get_impl(std::string*) const {
-    return index_ == 1 ? &s_ : nullptr;
-  }
-};
-
-TEST(AnyWithTest, FullMatch) {
-  Matcher<SampleAnyType> m = AnyWith<int>(Eq(1));
-  EXPECT_TRUE(m.Matches(SampleAnyType(1)));
-}
-
-TEST(AnyWithTest, TestBadCastType) {
-  Matcher<SampleAnyType> m = AnyWith<std::string>(Eq("fail"));
-  EXPECT_FALSE(m.Matches(SampleAnyType(1)));
-}
-
-TEST(AnyWithTest, TestUseInContainers) {
-  std::vector<SampleAnyType> a;
-  a.emplace_back(1);
-  a.emplace_back(2);
-  a.emplace_back(3);
-  EXPECT_THAT(
-      a, ElementsAreArray({AnyWith<int>(1), AnyWith<int>(2), AnyWith<int>(3)}));
-
-  std::vector<SampleAnyType> b;
-  b.emplace_back("hello");
-  b.emplace_back("merhaba");
-  b.emplace_back("salut");
-  EXPECT_THAT(b, ElementsAreArray({AnyWith<std::string>("hello"),
-                                   AnyWith<std::string>("merhaba"),
-                                   AnyWith<std::string>("salut")}));
-}
-TEST(AnyWithTest, TestCompare) {
-  EXPECT_THAT(SampleAnyType(1), AnyWith<int>(Gt(0)));
-}
-
-TEST(AnyWithTest, DescribesSelf) {
-  const Matcher<const SampleAnyType&> m = AnyWith<int>(Eq(1));
-  EXPECT_THAT(Describe(m), ContainsRegex("is an 'any' type with value of type "
-                                         "'.*' and the value is equal to 1"));
-}
-
-TEST(AnyWithTest, ExplainsSelf) {
-  const Matcher<const SampleAnyType&> m = AnyWith<int>(Eq(1));
-
-  EXPECT_THAT(Explain(m, SampleAnyType(1)), ContainsRegex("whose value 1"));
-  EXPECT_THAT(Explain(m, SampleAnyType("A")),
-              HasSubstr("whose value is not of type '"));
-  EXPECT_THAT(Explain(m, SampleAnyType(2)), "whose value 2 doesn't match");
-}
-
-TEST(PointeeTest, WorksOnMoveOnlyType) {
-  std::unique_ptr<int> p(new int(3));
-  EXPECT_THAT(p, Pointee(Eq(3)));
-  EXPECT_THAT(p, Not(Pointee(Eq(2))));
-}
-
-TEST(NotTest, WorksOnMoveOnlyType) {
-  std::unique_ptr<int> p(new int(3));
-  EXPECT_THAT(p, Pointee(Eq(3)));
-  EXPECT_THAT(p, Not(Pointee(Eq(2))));
-}
-
-// Tests Args<k0, ..., kn>(m).
-
-TEST(ArgsTest, AcceptsZeroTemplateArg) {
-  const std::tuple<int, bool> t(5, true);
-  EXPECT_THAT(t, Args<>(Eq(std::tuple<>())));
-  EXPECT_THAT(t, Not(Args<>(Ne(std::tuple<>()))));
-}
-
-TEST(ArgsTest, AcceptsOneTemplateArg) {
-  const std::tuple<int, bool> t(5, true);
-  EXPECT_THAT(t, Args<0>(Eq(std::make_tuple(5))));
-  EXPECT_THAT(t, Args<1>(Eq(std::make_tuple(true))));
-  EXPECT_THAT(t, Not(Args<1>(Eq(std::make_tuple(false)))));
-}
-
-TEST(ArgsTest, AcceptsTwoTemplateArgs) {
-  const std::tuple<short, int, long> t(4, 5, 6L);  // NOLINT
-
-  EXPECT_THAT(t, (Args<0, 1>(Lt())));
-  EXPECT_THAT(t, (Args<1, 2>(Lt())));
-  EXPECT_THAT(t, Not(Args<0, 2>(Gt())));
-}
-
-TEST(ArgsTest, AcceptsRepeatedTemplateArgs) {
-  const std::tuple<short, int, long> t(4, 5, 6L);  // NOLINT
-  EXPECT_THAT(t, (Args<0, 0>(Eq())));
-  EXPECT_THAT(t, Not(Args<1, 1>(Ne())));
-}
-
-TEST(ArgsTest, AcceptsDecreasingTemplateArgs) {
-  const std::tuple<short, int, long> t(4, 5, 6L);  // NOLINT
-  EXPECT_THAT(t, (Args<2, 0>(Gt())));
-  EXPECT_THAT(t, Not(Args<2, 1>(Lt())));
-}
-
-MATCHER(SumIsZero, "") {
-  return std::get<0>(arg) + std::get<1>(arg) + std::get<2>(arg) == 0;
-}
-
-TEST(ArgsTest, AcceptsMoreTemplateArgsThanArityOfOriginalTuple) {
-  EXPECT_THAT(std::make_tuple(-1, 2), (Args<0, 0, 1>(SumIsZero())));
-  EXPECT_THAT(std::make_tuple(1, 2), Not(Args<0, 0, 1>(SumIsZero())));
-}
-
-TEST(ArgsTest, CanBeNested) {
-  const std::tuple<short, int, long, int> t(4, 5, 6L, 6);  // NOLINT
-  EXPECT_THAT(t, (Args<1, 2, 3>(Args<1, 2>(Eq()))));
-  EXPECT_THAT(t, (Args<0, 1, 3>(Args<0, 2>(Lt()))));
-}
-
-TEST(ArgsTest, CanMatchTupleByValue) {
-  typedef std::tuple<char, int, int> Tuple3;
-  const Matcher<Tuple3> m = Args<1, 2>(Lt());
-  EXPECT_TRUE(m.Matches(Tuple3('a', 1, 2)));
-  EXPECT_FALSE(m.Matches(Tuple3('b', 2, 2)));
-}
-
-TEST(ArgsTest, CanMatchTupleByReference) {
-  typedef std::tuple<char, char, int> Tuple3;
-  const Matcher<const Tuple3&> m = Args<0, 1>(Lt());
-  EXPECT_TRUE(m.Matches(Tuple3('a', 'b', 2)));
-  EXPECT_FALSE(m.Matches(Tuple3('b', 'b', 2)));
-}
-
-// Validates that arg is printed as str.
-MATCHER_P(PrintsAs, str, "") { return testing::PrintToString(arg) == str; }
-
-TEST(ArgsTest, AcceptsTenTemplateArgs) {
-  EXPECT_THAT(std::make_tuple(0, 1L, 2, 3L, 4, 5, 6, 7, 8, 9),
-              (Args<9, 8, 7, 6, 5, 4, 3, 2, 1, 0>(
-                  PrintsAs("(9, 8, 7, 6, 5, 4, 3, 2, 1, 0)"))));
-  EXPECT_THAT(std::make_tuple(0, 1L, 2, 3L, 4, 5, 6, 7, 8, 9),
-              Not(Args<9, 8, 7, 6, 5, 4, 3, 2, 1, 0>(
-                  PrintsAs("(0, 8, 7, 6, 5, 4, 3, 2, 1, 0)"))));
-}
-
-TEST(ArgsTest, DescirbesSelfCorrectly) {
-  const Matcher<std::tuple<int, bool, char>> m = Args<2, 0>(Lt());
-  EXPECT_EQ(
-      "are a tuple whose fields (#2, #0) are a pair where "
-      "the first < the second",
-      Describe(m));
-}
-
-TEST(ArgsTest, DescirbesNestedArgsCorrectly) {
-  const Matcher<const std::tuple<int, bool, char, int>&> m =
-      Args<0, 2, 3>(Args<2, 0>(Lt()));
-  EXPECT_EQ(
-      "are a tuple whose fields (#0, #2, #3) are a tuple "
-      "whose fields (#2, #0) are a pair where the first < the second",
-      Describe(m));
-}
-
-TEST(ArgsTest, DescribesNegationCorrectly) {
-  const Matcher<std::tuple<int, char>> m = Args<1, 0>(Gt());
-  EXPECT_EQ(
-      "are a tuple whose fields (#1, #0) aren't a pair "
-      "where the first > the second",
-      DescribeNegation(m));
-}
-
-TEST(ArgsTest, ExplainsMatchResultWithoutInnerExplanation) {
-  const Matcher<std::tuple<bool, int, int>> m = Args<1, 2>(Eq());
-  EXPECT_EQ("whose fields (#1, #2) are (42, 42)",
-            Explain(m, std::make_tuple(false, 42, 42)));
-  EXPECT_EQ("whose fields (#1, #2) are (42, 43)",
-            Explain(m, std::make_tuple(false, 42, 43)));
-}
-
-// For testing Args<>'s explanation.
-class LessThanMatcher : public MatcherInterface<std::tuple<char, int>> {
- public:
-  void DescribeTo(::std::ostream* /*os*/) const override {}
-
-  bool MatchAndExplain(std::tuple<char, int> value,
-                       MatchResultListener* listener) const override {
-    const int diff = std::get<0>(value) - std::get<1>(value);
-    if (diff > 0) {
-      *listener << "where the first value is " << diff
-                << " more than the second";
-    }
-    return diff < 0;
-  }
-};
-
-Matcher<std::tuple<char, int>> LessThan() {
-  return MakeMatcher(new LessThanMatcher);
-}
-
-TEST(ArgsTest, ExplainsMatchResultWithInnerExplanation) {
-  const Matcher<std::tuple<char, int, int>> m = Args<0, 2>(LessThan());
-  EXPECT_EQ(
-      "whose fields (#0, #2) are ('a' (97, 0x61), 42), "
-      "where the first value is 55 more than the second",
-      Explain(m, std::make_tuple('a', 42, 42)));
-  EXPECT_EQ("whose fields (#0, #2) are ('\\0', 43)",
-            Explain(m, std::make_tuple('\0', 42, 43)));
-}
-
-class PredicateFormatterFromMatcherTest : public ::testing::Test {
- protected:
-  enum Behavior { kInitialSuccess, kAlwaysFail, kFlaky };
-
-  // A matcher that can return different results when used multiple times on the
-  // same input. No real matcher should do this; but this lets us test that we
-  // detect such behavior and fail appropriately.
-  class MockMatcher : public MatcherInterface<Behavior> {
-   public:
-    bool MatchAndExplain(Behavior behavior,
-                         MatchResultListener* listener) const override {
-      *listener << "[MatchAndExplain]";
-      switch (behavior) {
-        case kInitialSuccess:
-          // The first call to MatchAndExplain should use a "not interested"
-          // listener; so this is expected to return |true|. There should be no
-          // subsequent calls.
-          return !listener->IsInterested();
-
-        case kAlwaysFail:
-          return false;
-
-        case kFlaky:
-          // The first call to MatchAndExplain should use a "not interested"
-          // listener; so this will return |false|. Subsequent calls should have
-          // an "interested" listener; so this will return |true|, thus
-          // simulating a flaky matcher.
-          return listener->IsInterested();
-      }
-
-      GTEST_LOG_(FATAL) << "This should never be reached";
-      return false;
-    }
-
-    void DescribeTo(ostream* os) const override { *os << "[DescribeTo]"; }
-
-    void DescribeNegationTo(ostream* os) const override {
-      *os << "[DescribeNegationTo]";
-    }
-  };
-
-  AssertionResult RunPredicateFormatter(Behavior behavior) {
-    auto matcher = MakeMatcher(new MockMatcher);
-    PredicateFormatterFromMatcher<Matcher<Behavior>> predicate_formatter(
-        matcher);
-    return predicate_formatter("dummy-name", behavior);
-  }
-};
-
-TEST_F(PredicateFormatterFromMatcherTest, ShortCircuitOnSuccess) {
-  AssertionResult result = RunPredicateFormatter(kInitialSuccess);
-  EXPECT_TRUE(result);  // Implicit cast to bool.
-  std::string expect;
-  EXPECT_EQ(expect, result.message());
-}
-
-TEST_F(PredicateFormatterFromMatcherTest, NoShortCircuitOnFailure) {
-  AssertionResult result = RunPredicateFormatter(kAlwaysFail);
-  EXPECT_FALSE(result);  // Implicit cast to bool.
-  std::string expect =
-      "Value of: dummy-name\nExpected: [DescribeTo]\n"
-      "  Actual: 1" +
-      OfType(internal::GetTypeName<Behavior>()) + ", [MatchAndExplain]";
-  EXPECT_EQ(expect, result.message());
-}
-
-TEST_F(PredicateFormatterFromMatcherTest, DetectsFlakyShortCircuit) {
-  AssertionResult result = RunPredicateFormatter(kFlaky);
-  EXPECT_FALSE(result);  // Implicit cast to bool.
-  std::string expect =
-      "Value of: dummy-name\nExpected: [DescribeTo]\n"
-      "  The matcher failed on the initial attempt; but passed when rerun to "
-      "generate the explanation.\n"
-      "  Actual: 2" +
-      OfType(internal::GetTypeName<Behavior>()) + ", [MatchAndExplain]";
-  EXPECT_EQ(expect, result.message());
-}
-
-// Tests for ElementsAre().
-
-TEST(ElementsAreTest, CanDescribeExpectingNoElement) {
-  Matcher<const vector<int>&> m = ElementsAre();
-  EXPECT_EQ("is empty", Describe(m));
-}
-
-TEST(ElementsAreTest, CanDescribeExpectingOneElement) {
-  Matcher<vector<int>> m = ElementsAre(Gt(5));
-  EXPECT_EQ("has 1 element that is > 5", Describe(m));
-}
-
-TEST(ElementsAreTest, CanDescribeExpectingManyElements) {
-  Matcher<list<std::string>> m = ElementsAre(StrEq("one"), "two");
-  EXPECT_EQ(
-      "has 2 elements where\n"
-      "element #0 is equal to \"one\",\n"
-      "element #1 is equal to \"two\"",
-      Describe(m));
-}
-
-TEST(ElementsAreTest, CanDescribeNegationOfExpectingNoElement) {
-  Matcher<vector<int>> m = ElementsAre();
-  EXPECT_EQ("isn't empty", DescribeNegation(m));
-}
-
-TEST(ElementsAreTest, CanDescribeNegationOfExpectingOneElment) {
-  Matcher<const list<int>&> m = ElementsAre(Gt(5));
-  EXPECT_EQ(
-      "doesn't have 1 element, or\n"
-      "element #0 isn't > 5",
-      DescribeNegation(m));
-}
-
-TEST(ElementsAreTest, CanDescribeNegationOfExpectingManyElements) {
-  Matcher<const list<std::string>&> m = ElementsAre("one", "two");
-  EXPECT_EQ(
-      "doesn't have 2 elements, or\n"
-      "element #0 isn't equal to \"one\", or\n"
-      "element #1 isn't equal to \"two\"",
-      DescribeNegation(m));
-}
-
-TEST(ElementsAreTest, DoesNotExplainTrivialMatch) {
-  Matcher<const list<int>&> m = ElementsAre(1, Ne(2));
-
-  list<int> test_list;
-  test_list.push_back(1);
-  test_list.push_back(3);
-  EXPECT_EQ("", Explain(m, test_list));  // No need to explain anything.
-}
-
-TEST(ElementsAreTest, ExplainsNonTrivialMatch) {
-  Matcher<const vector<int>&> m =
-      ElementsAre(GreaterThan(1), 0, GreaterThan(2));
-
-  const int a[] = {10, 0, 100};
-  vector<int> test_vector(std::begin(a), std::end(a));
-  EXPECT_EQ(
-      "whose element #0 matches, which is 9 more than 1,\n"
-      "and whose element #2 matches, which is 98 more than 2",
-      Explain(m, test_vector));
-}
-
-TEST(ElementsAreTest, CanExplainMismatchWrongSize) {
-  Matcher<const list<int>&> m = ElementsAre(1, 3);
-
-  list<int> test_list;
-  // No need to explain when the container is empty.
-  EXPECT_EQ("", Explain(m, test_list));
-
-  test_list.push_back(1);
-  EXPECT_EQ("which has 1 element", Explain(m, test_list));
-}
-
-TEST(ElementsAreTest, CanExplainMismatchRightSize) {
-  Matcher<const vector<int>&> m = ElementsAre(1, GreaterThan(5));
-
-  vector<int> v;
-  v.push_back(2);
-  v.push_back(1);
-  EXPECT_EQ("whose element #0 doesn't match", Explain(m, v));
-
-  v[0] = 1;
-  EXPECT_EQ("whose element #1 doesn't match, which is 4 less than 5",
-            Explain(m, v));
-}
-
-TEST(ElementsAreTest, MatchesOneElementVector) {
-  vector<std::string> test_vector;
-  test_vector.push_back("test string");
-
-  EXPECT_THAT(test_vector, ElementsAre(StrEq("test string")));
-}
-
-TEST(ElementsAreTest, MatchesOneElementList) {
-  list<std::string> test_list;
-  test_list.push_back("test string");
-
-  EXPECT_THAT(test_list, ElementsAre("test string"));
-}
-
-TEST(ElementsAreTest, MatchesThreeElementVector) {
-  vector<std::string> test_vector;
-  test_vector.push_back("one");
-  test_vector.push_back("two");
-  test_vector.push_back("three");
-
-  EXPECT_THAT(test_vector, ElementsAre("one", StrEq("two"), _));
-}
-
-TEST(ElementsAreTest, MatchesOneElementEqMatcher) {
-  vector<int> test_vector;
-  test_vector.push_back(4);
-
-  EXPECT_THAT(test_vector, ElementsAre(Eq(4)));
-}
-
-TEST(ElementsAreTest, MatchesOneElementAnyMatcher) {
-  vector<int> test_vector;
-  test_vector.push_back(4);
-
-  EXPECT_THAT(test_vector, ElementsAre(_));
-}
-
-TEST(ElementsAreTest, MatchesOneElementValue) {
-  vector<int> test_vector;
-  test_vector.push_back(4);
-
-  EXPECT_THAT(test_vector, ElementsAre(4));
-}
-
-TEST(ElementsAreTest, MatchesThreeElementsMixedMatchers) {
-  vector<int> test_vector;
-  test_vector.push_back(1);
-  test_vector.push_back(2);
-  test_vector.push_back(3);
-
-  EXPECT_THAT(test_vector, ElementsAre(1, Eq(2), _));
-}
-
-TEST(ElementsAreTest, MatchesTenElementVector) {
-  const int a[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
-  vector<int> test_vector(std::begin(a), std::end(a));
-
-  EXPECT_THAT(test_vector,
-              // The element list can contain values and/or matchers
-              // of different types.
-              ElementsAre(0, Ge(0), _, 3, 4, Ne(2), Eq(6), 7, 8, _));
-}
-
-TEST(ElementsAreTest, DoesNotMatchWrongSize) {
-  vector<std::string> test_vector;
-  test_vector.push_back("test string");
-  test_vector.push_back("test string");
-
-  Matcher<vector<std::string>> m = ElementsAre(StrEq("test string"));
-  EXPECT_FALSE(m.Matches(test_vector));
-}
-
-TEST(ElementsAreTest, DoesNotMatchWrongValue) {
-  vector<std::string> test_vector;
-  test_vector.push_back("other string");
-
-  Matcher<vector<std::string>> m = ElementsAre(StrEq("test string"));
-  EXPECT_FALSE(m.Matches(test_vector));
-}
-
-TEST(ElementsAreTest, DoesNotMatchWrongOrder) {
-  vector<std::string> test_vector;
-  test_vector.push_back("one");
-  test_vector.push_back("three");
-  test_vector.push_back("two");
-
-  Matcher<vector<std::string>> m =
-      ElementsAre(StrEq("one"), StrEq("two"), StrEq("three"));
-  EXPECT_FALSE(m.Matches(test_vector));
-}
-
-TEST(ElementsAreTest, WorksForNestedContainer) {
-  constexpr std::array<const char*, 2> strings = {{"Hi", "world"}};
-
-  vector<list<char>> nested;
-  for (const auto& s : strings) {
-    nested.emplace_back(s, s + strlen(s));
-  }
-
-  EXPECT_THAT(nested, ElementsAre(ElementsAre('H', Ne('e')),
-                                  ElementsAre('w', 'o', _, _, 'd')));
-  EXPECT_THAT(nested, Not(ElementsAre(ElementsAre('H', 'e'),
-                                      ElementsAre('w', 'o', _, _, 'd'))));
-}
-
-TEST(ElementsAreTest, WorksWithByRefElementMatchers) {
-  int a[] = {0, 1, 2};
-  vector<int> v(std::begin(a), std::end(a));
-
-  EXPECT_THAT(v, ElementsAre(Ref(v[0]), Ref(v[1]), Ref(v[2])));
-  EXPECT_THAT(v, Not(ElementsAre(Ref(v[0]), Ref(v[1]), Ref(a[2]))));
-}
-
-TEST(ElementsAreTest, WorksWithContainerPointerUsingPointee) {
-  int a[] = {0, 1, 2};
-  vector<int> v(std::begin(a), std::end(a));
-
-  EXPECT_THAT(&v, Pointee(ElementsAre(0, 1, _)));
-  EXPECT_THAT(&v, Not(Pointee(ElementsAre(0, _, 3))));
-}
-
-TEST(ElementsAreTest, WorksWithNativeArrayPassedByReference) {
-  int array[] = {0, 1, 2};
-  EXPECT_THAT(array, ElementsAre(0, 1, _));
-  EXPECT_THAT(array, Not(ElementsAre(1, _, _)));
-  EXPECT_THAT(array, Not(ElementsAre(0, _)));
-}
-
-class NativeArrayPassedAsPointerAndSize {
- public:
-  NativeArrayPassedAsPointerAndSize() {}
-
-  MOCK_METHOD(void, Helper, (int* array, int size));
-
- private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(NativeArrayPassedAsPointerAndSize);
-};
-
-TEST(ElementsAreTest, WorksWithNativeArrayPassedAsPointerAndSize) {
-  int array[] = {0, 1};
-  ::std::tuple<int*, size_t> array_as_tuple(array, 2);
-  EXPECT_THAT(array_as_tuple, ElementsAre(0, 1));
-  EXPECT_THAT(array_as_tuple, Not(ElementsAre(0)));
-
-  NativeArrayPassedAsPointerAndSize helper;
-  EXPECT_CALL(helper, Helper(_, _)).With(ElementsAre(0, 1));
-  helper.Helper(array, 2);
-}
-
-TEST(ElementsAreTest, WorksWithTwoDimensionalNativeArray) {
-  const char a2[][3] = {"hi", "lo"};
-  EXPECT_THAT(a2, ElementsAre(ElementsAre('h', 'i', '\0'),
-                              ElementsAre('l', 'o', '\0')));
-  EXPECT_THAT(a2, ElementsAre(StrEq("hi"), StrEq("lo")));
-  EXPECT_THAT(a2, ElementsAre(Not(ElementsAre('h', 'o', '\0')),
-                              ElementsAre('l', 'o', '\0')));
-}
-
-TEST(ElementsAreTest, AcceptsStringLiteral) {
-  std::string array[] = {"hi", "one", "two"};
-  EXPECT_THAT(array, ElementsAre("hi", "one", "two"));
-  EXPECT_THAT(array, Not(ElementsAre("hi", "one", "too")));
-}
-
-// Declared here with the size unknown.  Defined AFTER the following test.
-extern const char kHi[];
-
-TEST(ElementsAreTest, AcceptsArrayWithUnknownSize) {
-  // The size of kHi is not known in this test, but ElementsAre() should
-  // still accept it.
-
-  std::string array1[] = {"hi"};
-  EXPECT_THAT(array1, ElementsAre(kHi));
-
-  std::string array2[] = {"ho"};
-  EXPECT_THAT(array2, Not(ElementsAre(kHi)));
-}
-
-const char kHi[] = "hi";
-
-TEST(ElementsAreTest, MakesCopyOfArguments) {
-  int x = 1;
-  int y = 2;
-  // This should make a copy of x and y.
-  ::testing::internal::ElementsAreMatcher<std::tuple<int, int>>
-      polymorphic_matcher = ElementsAre(x, y);
-  // Changing x and y now shouldn't affect the meaning of the above matcher.
-  x = y = 0;
-  const int array1[] = {1, 2};
-  EXPECT_THAT(array1, polymorphic_matcher);
-  const int array2[] = {0, 0};
-  EXPECT_THAT(array2, Not(polymorphic_matcher));
-}
-
-// Tests for ElementsAreArray().  Since ElementsAreArray() shares most
-// of the implementation with ElementsAre(), we don't test it as
-// thoroughly here.
-
-TEST(ElementsAreArrayTest, CanBeCreatedWithValueArray) {
-  const int a[] = {1, 2, 3};
-
-  vector<int> test_vector(std::begin(a), std::end(a));
-  EXPECT_THAT(test_vector, ElementsAreArray(a));
-
-  test_vector[2] = 0;
-  EXPECT_THAT(test_vector, Not(ElementsAreArray(a)));
-}
-
-TEST(ElementsAreArrayTest, CanBeCreatedWithArraySize) {
-  std::array<const char*, 3> a = {{"one", "two", "three"}};
-
-  vector<std::string> test_vector(std::begin(a), std::end(a));
-  EXPECT_THAT(test_vector, ElementsAreArray(a.data(), a.size()));
-
-  const char** p = a.data();
-  test_vector[0] = "1";
-  EXPECT_THAT(test_vector, Not(ElementsAreArray(p, a.size())));
-}
-
-TEST(ElementsAreArrayTest, CanBeCreatedWithoutArraySize) {
-  const char* a[] = {"one", "two", "three"};
-
-  vector<std::string> test_vector(std::begin(a), std::end(a));
-  EXPECT_THAT(test_vector, ElementsAreArray(a));
-
-  test_vector[0] = "1";
-  EXPECT_THAT(test_vector, Not(ElementsAreArray(a)));
-}
-
-TEST(ElementsAreArrayTest, CanBeCreatedWithMatcherArray) {
-  const Matcher<std::string> kMatcherArray[] = {StrEq("one"), StrEq("two"),
-                                                StrEq("three")};
-
-  vector<std::string> test_vector;
-  test_vector.push_back("one");
-  test_vector.push_back("two");
-  test_vector.push_back("three");
-  EXPECT_THAT(test_vector, ElementsAreArray(kMatcherArray));
-
-  test_vector.push_back("three");
-  EXPECT_THAT(test_vector, Not(ElementsAreArray(kMatcherArray)));
-}
-
-TEST(ElementsAreArrayTest, CanBeCreatedWithVector) {
-  const int a[] = {1, 2, 3};
-  vector<int> test_vector(std::begin(a), std::end(a));
-  const vector<int> expected(std::begin(a), std::end(a));
-  EXPECT_THAT(test_vector, ElementsAreArray(expected));
-  test_vector.push_back(4);
-  EXPECT_THAT(test_vector, Not(ElementsAreArray(expected)));
-}
-
-TEST(ElementsAreArrayTest, TakesInitializerList) {
-  const int a[5] = {1, 2, 3, 4, 5};
-  EXPECT_THAT(a, ElementsAreArray({1, 2, 3, 4, 5}));
-  EXPECT_THAT(a, Not(ElementsAreArray({1, 2, 3, 5, 4})));
-  EXPECT_THAT(a, Not(ElementsAreArray({1, 2, 3, 4, 6})));
-}
-
-TEST(ElementsAreArrayTest, TakesInitializerListOfCStrings) {
-  const std::string a[5] = {"a", "b", "c", "d", "e"};
-  EXPECT_THAT(a, ElementsAreArray({"a", "b", "c", "d", "e"}));
-  EXPECT_THAT(a, Not(ElementsAreArray({"a", "b", "c", "e", "d"})));
-  EXPECT_THAT(a, Not(ElementsAreArray({"a", "b", "c", "d", "ef"})));
-}
-
-TEST(ElementsAreArrayTest, TakesInitializerListOfSameTypedMatchers) {
-  const int a[5] = {1, 2, 3, 4, 5};
-  EXPECT_THAT(a, ElementsAreArray({Eq(1), Eq(2), Eq(3), Eq(4), Eq(5)}));
-  EXPECT_THAT(a, Not(ElementsAreArray({Eq(1), Eq(2), Eq(3), Eq(4), Eq(6)})));
-}
-
-TEST(ElementsAreArrayTest, TakesInitializerListOfDifferentTypedMatchers) {
-  const int a[5] = {1, 2, 3, 4, 5};
-  // The compiler cannot infer the type of the initializer list if its
-  // elements have different types.  We must explicitly specify the
-  // unified element type in this case.
-  EXPECT_THAT(
-      a, ElementsAreArray<Matcher<int>>({Eq(1), Ne(-2), Ge(3), Le(4), Eq(5)}));
-  EXPECT_THAT(a, Not(ElementsAreArray<Matcher<int>>(
-                     {Eq(1), Ne(-2), Ge(3), Le(4), Eq(6)})));
-}
-
-TEST(ElementsAreArrayTest, CanBeCreatedWithMatcherVector) {
-  const int a[] = {1, 2, 3};
-  const Matcher<int> kMatchers[] = {Eq(1), Eq(2), Eq(3)};
-  vector<int> test_vector(std::begin(a), std::end(a));
-  const vector<Matcher<int>> expected(std::begin(kMatchers),
-                                      std::end(kMatchers));
-  EXPECT_THAT(test_vector, ElementsAreArray(expected));
-  test_vector.push_back(4);
-  EXPECT_THAT(test_vector, Not(ElementsAreArray(expected)));
-}
-
-TEST(ElementsAreArrayTest, CanBeCreatedWithIteratorRange) {
-  const int a[] = {1, 2, 3};
-  const vector<int> test_vector(std::begin(a), std::end(a));
-  const vector<int> expected(std::begin(a), std::end(a));
-  EXPECT_THAT(test_vector, ElementsAreArray(expected.begin(), expected.end()));
-  // Pointers are iterators, too.
-  EXPECT_THAT(test_vector, ElementsAreArray(std::begin(a), std::end(a)));
-  // The empty range of NULL pointers should also be okay.
-  int* const null_int = nullptr;
-  EXPECT_THAT(test_vector, Not(ElementsAreArray(null_int, null_int)));
-  EXPECT_THAT((vector<int>()), ElementsAreArray(null_int, null_int));
-}
-
-// Since ElementsAre() and ElementsAreArray() share much of the
-// implementation, we only do a sanity test for native arrays here.
-TEST(ElementsAreArrayTest, WorksWithNativeArray) {
-  ::std::string a[] = {"hi", "ho"};
-  ::std::string b[] = {"hi", "ho"};
-
-  EXPECT_THAT(a, ElementsAreArray(b));
-  EXPECT_THAT(a, ElementsAreArray(b, 2));
-  EXPECT_THAT(a, Not(ElementsAreArray(b, 1)));
-}
-
-TEST(ElementsAreArrayTest, SourceLifeSpan) {
-  const int a[] = {1, 2, 3};
-  vector<int> test_vector(std::begin(a), std::end(a));
-  vector<int> expect(std::begin(a), std::end(a));
-  ElementsAreArrayMatcher<int> matcher_maker =
-      ElementsAreArray(expect.begin(), expect.end());
-  EXPECT_THAT(test_vector, matcher_maker);
-  // Changing in place the values that initialized matcher_maker should not
-  // affect matcher_maker anymore. It should have made its own copy of them.
-  for (int& i : expect) {
-    i += 10;
-  }
-  EXPECT_THAT(test_vector, matcher_maker);
-  test_vector.push_back(3);
-  EXPECT_THAT(test_vector, Not(matcher_maker));
-}
-
-// Tests for the MATCHER*() macro family.
-
-// Tests that a simple MATCHER() definition works.
-
-MATCHER(IsEven, "") { return (arg % 2) == 0; }
-
-TEST(MatcherMacroTest, Works) {
-  const Matcher<int> m = IsEven();
-  EXPECT_TRUE(m.Matches(6));
-  EXPECT_FALSE(m.Matches(7));
-
-  EXPECT_EQ("is even", Describe(m));
-  EXPECT_EQ("not (is even)", DescribeNegation(m));
-  EXPECT_EQ("", Explain(m, 6));
-  EXPECT_EQ("", Explain(m, 7));
-}
-
-// This also tests that the description string can reference 'negation'.
-MATCHER(IsEven2, negation ? "is odd" : "is even") {
-  if ((arg % 2) == 0) {
-    // Verifies that we can stream to result_listener, a listener
-    // supplied by the MATCHER macro implicitly.
-    *result_listener << "OK";
-    return true;
-  } else {
-    *result_listener << "% 2 == " << (arg % 2);
-    return false;
-  }
-}
-
-// This also tests that the description string can reference matcher
-// parameters.
-MATCHER_P2(EqSumOf, x, y,
-           std::string(negation ? "doesn't equal" : "equals") + " the sum of " +
-               PrintToString(x) + " and " + PrintToString(y)) {
-  if (arg == (x + y)) {
-    *result_listener << "OK";
-    return true;
-  } else {
-    // Verifies that we can stream to the underlying stream of
-    // result_listener.
-    if (result_listener->stream() != nullptr) {
-      *result_listener->stream() << "diff == " << (x + y - arg);
-    }
-    return false;
-  }
-}
-
-// Tests that the matcher description can reference 'negation' and the
-// matcher parameters.
-TEST(MatcherMacroTest, DescriptionCanReferenceNegationAndParameters) {
-  const Matcher<int> m1 = IsEven2();
-  EXPECT_EQ("is even", Describe(m1));
-  EXPECT_EQ("is odd", DescribeNegation(m1));
-
-  const Matcher<int> m2 = EqSumOf(5, 9);
-  EXPECT_EQ("equals the sum of 5 and 9", Describe(m2));
-  EXPECT_EQ("doesn't equal the sum of 5 and 9", DescribeNegation(m2));
-}
-
-// Tests explaining match result in a MATCHER* macro.
-TEST(MatcherMacroTest, CanExplainMatchResult) {
-  const Matcher<int> m1 = IsEven2();
-  EXPECT_EQ("OK", Explain(m1, 4));
-  EXPECT_EQ("% 2 == 1", Explain(m1, 5));
-
-  const Matcher<int> m2 = EqSumOf(1, 2);
-  EXPECT_EQ("OK", Explain(m2, 3));
-  EXPECT_EQ("diff == -1", Explain(m2, 4));
-}
-
-// Tests that the body of MATCHER() can reference the type of the
-// value being matched.
-
-MATCHER(IsEmptyString, "") {
-  StaticAssertTypeEq<::std::string, arg_type>();
-  return arg.empty();
-}
-
-MATCHER(IsEmptyStringByRef, "") {
-  StaticAssertTypeEq<const ::std::string&, arg_type>();
-  return arg.empty();
-}
-
-TEST(MatcherMacroTest, CanReferenceArgType) {
-  const Matcher<::std::string> m1 = IsEmptyString();
-  EXPECT_TRUE(m1.Matches(""));
-
-  const Matcher<const ::std::string&> m2 = IsEmptyStringByRef();
-  EXPECT_TRUE(m2.Matches(""));
-}
-
-// Tests that MATCHER() can be used in a namespace.
-
-namespace matcher_test {
-MATCHER(IsOdd, "") { return (arg % 2) != 0; }
-}  // namespace matcher_test
-
-TEST(MatcherMacroTest, WorksInNamespace) {
-  Matcher<int> m = matcher_test::IsOdd();
-  EXPECT_FALSE(m.Matches(4));
-  EXPECT_TRUE(m.Matches(5));
-}
-
-// Tests that Value() can be used to compose matchers.
-MATCHER(IsPositiveOdd, "") {
-  return Value(arg, matcher_test::IsOdd()) && arg > 0;
-}
-
-TEST(MatcherMacroTest, CanBeComposedUsingValue) {
-  EXPECT_THAT(3, IsPositiveOdd());
-  EXPECT_THAT(4, Not(IsPositiveOdd()));
-  EXPECT_THAT(-1, Not(IsPositiveOdd()));
-}
-
-// Tests that a simple MATCHER_P() definition works.
-
-MATCHER_P(IsGreaterThan32And, n, "") { return arg > 32 && arg > n; }
-
-TEST(MatcherPMacroTest, Works) {
-  const Matcher<int> m = IsGreaterThan32And(5);
-  EXPECT_TRUE(m.Matches(36));
-  EXPECT_FALSE(m.Matches(5));
-
-  EXPECT_EQ("is greater than 32 and 5", Describe(m));
-  EXPECT_EQ("not (is greater than 32 and 5)", DescribeNegation(m));
-  EXPECT_EQ("", Explain(m, 36));
-  EXPECT_EQ("", Explain(m, 5));
-}
-
-// Tests that the description is calculated correctly from the matcher name.
-MATCHER_P(_is_Greater_Than32and_, n, "") { return arg > 32 && arg > n; }
-
-TEST(MatcherPMacroTest, GeneratesCorrectDescription) {
-  const Matcher<int> m = _is_Greater_Than32and_(5);
-
-  EXPECT_EQ("is greater than 32 and 5", Describe(m));
-  EXPECT_EQ("not (is greater than 32 and 5)", DescribeNegation(m));
-  EXPECT_EQ("", Explain(m, 36));
-  EXPECT_EQ("", Explain(m, 5));
-}
-
-// Tests that a MATCHER_P matcher can be explicitly instantiated with
-// a reference parameter type.
-
-class UncopyableFoo {
- public:
-  explicit UncopyableFoo(char value) : value_(value) { (void)value_; }
-
-  UncopyableFoo(const UncopyableFoo&) = delete;
-  void operator=(const UncopyableFoo&) = delete;
-
- private:
-  char value_;
-};
-
-MATCHER_P(ReferencesUncopyable, variable, "") { return &arg == &variable; }
-
-TEST(MatcherPMacroTest, WorksWhenExplicitlyInstantiatedWithReference) {
-  UncopyableFoo foo1('1'), foo2('2');
-  const Matcher<const UncopyableFoo&> m =
-      ReferencesUncopyable<const UncopyableFoo&>(foo1);
-
-  EXPECT_TRUE(m.Matches(foo1));
-  EXPECT_FALSE(m.Matches(foo2));
-
-  // We don't want the address of the parameter printed, as most
-  // likely it will just annoy the user.  If the address is
-  // interesting, the user should consider passing the parameter by
-  // pointer instead.
-  EXPECT_EQ("references uncopyable 1-byte object <31>", Describe(m));
-}
-
-// Tests that the body of MATCHER_Pn() can reference the parameter
-// types.
-
-MATCHER_P3(ParamTypesAreIntLongAndChar, foo, bar, baz, "") {
-  StaticAssertTypeEq<int, foo_type>();
-  StaticAssertTypeEq<long, bar_type>();  // NOLINT
-  StaticAssertTypeEq<char, baz_type>();
-  return arg == 0;
-}
-
-TEST(MatcherPnMacroTest, CanReferenceParamTypes) {
-  EXPECT_THAT(0, ParamTypesAreIntLongAndChar(10, 20L, 'a'));
-}
-
-// Tests that a MATCHER_Pn matcher can be explicitly instantiated with
-// reference parameter types.
-
-MATCHER_P2(ReferencesAnyOf, variable1, variable2, "") {
-  return &arg == &variable1 || &arg == &variable2;
-}
-
-TEST(MatcherPnMacroTest, WorksWhenExplicitlyInstantiatedWithReferences) {
-  UncopyableFoo foo1('1'), foo2('2'), foo3('3');
-  const Matcher<const UncopyableFoo&> const_m =
-      ReferencesAnyOf<const UncopyableFoo&, const UncopyableFoo&>(foo1, foo2);
-
-  EXPECT_TRUE(const_m.Matches(foo1));
-  EXPECT_TRUE(const_m.Matches(foo2));
-  EXPECT_FALSE(const_m.Matches(foo3));
-
-  const Matcher<UncopyableFoo&> m =
-      ReferencesAnyOf<UncopyableFoo&, UncopyableFoo&>(foo1, foo2);
-
-  EXPECT_TRUE(m.Matches(foo1));
-  EXPECT_TRUE(m.Matches(foo2));
-  EXPECT_FALSE(m.Matches(foo3));
-}
-
-TEST(MatcherPnMacroTest,
-     GeneratesCorretDescriptionWhenExplicitlyInstantiatedWithReferences) {
-  UncopyableFoo foo1('1'), foo2('2');
-  const Matcher<const UncopyableFoo&> m =
-      ReferencesAnyOf<const UncopyableFoo&, const UncopyableFoo&>(foo1, foo2);
-
-  // We don't want the addresses of the parameters printed, as most
-  // likely they will just annoy the user.  If the addresses are
-  // interesting, the user should consider passing the parameters by
-  // pointers instead.
-  EXPECT_EQ("references any of (1-byte object <31>, 1-byte object <32>)",
-            Describe(m));
-}
-
-// Tests that a simple MATCHER_P2() definition works.
-
-MATCHER_P2(IsNotInClosedRange, low, hi, "") { return arg < low || arg > hi; }
-
-TEST(MatcherPnMacroTest, Works) {
-  const Matcher<const long&> m = IsNotInClosedRange(10, 20);  // NOLINT
-  EXPECT_TRUE(m.Matches(36L));
-  EXPECT_FALSE(m.Matches(15L));
-
-  EXPECT_EQ("is not in closed range (10, 20)", Describe(m));
-  EXPECT_EQ("not (is not in closed range (10, 20))", DescribeNegation(m));
-  EXPECT_EQ("", Explain(m, 36L));
-  EXPECT_EQ("", Explain(m, 15L));
-}
-
-// Tests that MATCHER*() definitions can be overloaded on the number
-// of parameters; also tests MATCHER_Pn() where n >= 3.
-
-MATCHER(EqualsSumOf, "") { return arg == 0; }
-MATCHER_P(EqualsSumOf, a, "") { return arg == a; }
-MATCHER_P2(EqualsSumOf, a, b, "") { return arg == a + b; }
-MATCHER_P3(EqualsSumOf, a, b, c, "") { return arg == a + b + c; }
-MATCHER_P4(EqualsSumOf, a, b, c, d, "") { return arg == a + b + c + d; }
-MATCHER_P5(EqualsSumOf, a, b, c, d, e, "") { return arg == a + b + c + d + e; }
-MATCHER_P6(EqualsSumOf, a, b, c, d, e, f, "") {
-  return arg == a + b + c + d + e + f;
-}
-MATCHER_P7(EqualsSumOf, a, b, c, d, e, f, g, "") {
-  return arg == a + b + c + d + e + f + g;
-}
-MATCHER_P8(EqualsSumOf, a, b, c, d, e, f, g, h, "") {
-  return arg == a + b + c + d + e + f + g + h;
-}
-MATCHER_P9(EqualsSumOf, a, b, c, d, e, f, g, h, i, "") {
-  return arg == a + b + c + d + e + f + g + h + i;
-}
-MATCHER_P10(EqualsSumOf, a, b, c, d, e, f, g, h, i, j, "") {
-  return arg == a + b + c + d + e + f + g + h + i + j;
-}
-
-TEST(MatcherPnMacroTest, CanBeOverloadedOnNumberOfParameters) {
-  EXPECT_THAT(0, EqualsSumOf());
-  EXPECT_THAT(1, EqualsSumOf(1));
-  EXPECT_THAT(12, EqualsSumOf(10, 2));
-  EXPECT_THAT(123, EqualsSumOf(100, 20, 3));
-  EXPECT_THAT(1234, EqualsSumOf(1000, 200, 30, 4));
-  EXPECT_THAT(12345, EqualsSumOf(10000, 2000, 300, 40, 5));
-  EXPECT_THAT("abcdef",
-              EqualsSumOf(::std::string("a"), 'b', 'c', "d", "e", 'f'));
-  EXPECT_THAT("abcdefg",
-              EqualsSumOf(::std::string("a"), 'b', 'c', "d", "e", 'f', 'g'));
-  EXPECT_THAT("abcdefgh", EqualsSumOf(::std::string("a"), 'b', 'c', "d", "e",
-                                      'f', 'g', "h"));
-  EXPECT_THAT("abcdefghi", EqualsSumOf(::std::string("a"), 'b', 'c', "d", "e",
-                                       'f', 'g', "h", 'i'));
-  EXPECT_THAT("abcdefghij",
-              EqualsSumOf(::std::string("a"), 'b', 'c', "d", "e", 'f', 'g', "h",
-                          'i', ::std::string("j")));
-
-  EXPECT_THAT(1, Not(EqualsSumOf()));
-  EXPECT_THAT(-1, Not(EqualsSumOf(1)));
-  EXPECT_THAT(-12, Not(EqualsSumOf(10, 2)));
-  EXPECT_THAT(-123, Not(EqualsSumOf(100, 20, 3)));
-  EXPECT_THAT(-1234, Not(EqualsSumOf(1000, 200, 30, 4)));
-  EXPECT_THAT(-12345, Not(EqualsSumOf(10000, 2000, 300, 40, 5)));
-  EXPECT_THAT("abcdef ",
-              Not(EqualsSumOf(::std::string("a"), 'b', 'c', "d", "e", 'f')));
-  EXPECT_THAT("abcdefg ", Not(EqualsSumOf(::std::string("a"), 'b', 'c', "d",
-                                          "e", 'f', 'g')));
-  EXPECT_THAT("abcdefgh ", Not(EqualsSumOf(::std::string("a"), 'b', 'c', "d",
-                                           "e", 'f', 'g', "h")));
-  EXPECT_THAT("abcdefghi ", Not(EqualsSumOf(::std::string("a"), 'b', 'c', "d",
-                                            "e", 'f', 'g', "h", 'i')));
-  EXPECT_THAT("abcdefghij ",
-              Not(EqualsSumOf(::std::string("a"), 'b', 'c', "d", "e", 'f', 'g',
-                              "h", 'i', ::std::string("j"))));
-}
-
-// Tests that a MATCHER_Pn() definition can be instantiated with any
-// compatible parameter types.
-TEST(MatcherPnMacroTest, WorksForDifferentParameterTypes) {
-  EXPECT_THAT(123, EqualsSumOf(100L, 20, static_cast<char>(3)));
-  EXPECT_THAT("abcd", EqualsSumOf(::std::string("a"), "b", 'c', "d"));
-
-  EXPECT_THAT(124, Not(EqualsSumOf(100L, 20, static_cast<char>(3))));
-  EXPECT_THAT("abcde", Not(EqualsSumOf(::std::string("a"), "b", 'c', "d")));
-}
-
-// Tests that the matcher body can promote the parameter types.
-
-MATCHER_P2(EqConcat, prefix, suffix, "") {
-  // The following lines promote the two parameters to desired types.
-  std::string prefix_str(prefix);
-  char suffix_char = static_cast<char>(suffix);
-  return arg == prefix_str + suffix_char;
-}
-
-TEST(MatcherPnMacroTest, SimpleTypePromotion) {
-  Matcher<std::string> no_promo = EqConcat(std::string("foo"), 't');
-  Matcher<const std::string&> promo = EqConcat("foo", static_cast<int>('t'));
-  EXPECT_FALSE(no_promo.Matches("fool"));
-  EXPECT_FALSE(promo.Matches("fool"));
-  EXPECT_TRUE(no_promo.Matches("foot"));
-  EXPECT_TRUE(promo.Matches("foot"));
-}
-
-// Verifies the type of a MATCHER*.
-
-TEST(MatcherPnMacroTest, TypesAreCorrect) {
-  // EqualsSumOf() must be assignable to a EqualsSumOfMatcher variable.
-  EqualsSumOfMatcher a0 = EqualsSumOf();
-
-  // EqualsSumOf(1) must be assignable to a EqualsSumOfMatcherP variable.
-  EqualsSumOfMatcherP<int> a1 = EqualsSumOf(1);
-
-  // EqualsSumOf(p1, ..., pk) must be assignable to a EqualsSumOfMatcherPk
-  // variable, and so on.
-  EqualsSumOfMatcherP2<int, char> a2 = EqualsSumOf(1, '2');
-  EqualsSumOfMatcherP3<int, int, char> a3 = EqualsSumOf(1, 2, '3');
-  EqualsSumOfMatcherP4<int, int, int, char> a4 = EqualsSumOf(1, 2, 3, '4');
-  EqualsSumOfMatcherP5<int, int, int, int, char> a5 =
-      EqualsSumOf(1, 2, 3, 4, '5');
-  EqualsSumOfMatcherP6<int, int, int, int, int, char> a6 =
-      EqualsSumOf(1, 2, 3, 4, 5, '6');
-  EqualsSumOfMatcherP7<int, int, int, int, int, int, char> a7 =
-      EqualsSumOf(1, 2, 3, 4, 5, 6, '7');
-  EqualsSumOfMatcherP8<int, int, int, int, int, int, int, char> a8 =
-      EqualsSumOf(1, 2, 3, 4, 5, 6, 7, '8');
-  EqualsSumOfMatcherP9<int, int, int, int, int, int, int, int, char> a9 =
-      EqualsSumOf(1, 2, 3, 4, 5, 6, 7, 8, '9');
-  EqualsSumOfMatcherP10<int, int, int, int, int, int, int, int, int, char> a10 =
-      EqualsSumOf(1, 2, 3, 4, 5, 6, 7, 8, 9, '0');
-
-  // Avoid "unused variable" warnings.
-  (void)a0;
-  (void)a1;
-  (void)a2;
-  (void)a3;
-  (void)a4;
-  (void)a5;
-  (void)a6;
-  (void)a7;
-  (void)a8;
-  (void)a9;
-  (void)a10;
-}
-
-// Tests that matcher-typed parameters can be used in Value() inside a
-// MATCHER_Pn definition.
-
-// Succeeds if arg matches exactly 2 of the 3 matchers.
-MATCHER_P3(TwoOf, m1, m2, m3, "") {
-  const int count = static_cast<int>(Value(arg, m1)) +
-                    static_cast<int>(Value(arg, m2)) +
-                    static_cast<int>(Value(arg, m3));
-  return count == 2;
-}
-
-TEST(MatcherPnMacroTest, CanUseMatcherTypedParameterInValue) {
-  EXPECT_THAT(42, TwoOf(Gt(0), Lt(50), Eq(10)));
-  EXPECT_THAT(0, Not(TwoOf(Gt(-1), Lt(1), Eq(0))));
-}
-
-// Tests Contains().
-
-TEST(ContainsTest, ListMatchesWhenElementIsInContainer) {
-  list<int> some_list;
-  some_list.push_back(3);
-  some_list.push_back(1);
-  some_list.push_back(2);
-  EXPECT_THAT(some_list, Contains(1));
-  EXPECT_THAT(some_list, Contains(Gt(2.5)));
-  EXPECT_THAT(some_list, Contains(Eq(2.0f)));
-
-  list<std::string> another_list;
-  another_list.push_back("fee");
-  another_list.push_back("fie");
-  another_list.push_back("foe");
-  another_list.push_back("fum");
-  EXPECT_THAT(another_list, Contains(std::string("fee")));
-}
-
-TEST(ContainsTest, ListDoesNotMatchWhenElementIsNotInContainer) {
-  list<int> some_list;
-  some_list.push_back(3);
-  some_list.push_back(1);
-  EXPECT_THAT(some_list, Not(Contains(4)));
-}
-
-TEST(ContainsTest, SetMatchesWhenElementIsInContainer) {
-  set<int> some_set;
-  some_set.insert(3);
-  some_set.insert(1);
-  some_set.insert(2);
-  EXPECT_THAT(some_set, Contains(Eq(1.0)));
-  EXPECT_THAT(some_set, Contains(Eq(3.0f)));
-  EXPECT_THAT(some_set, Contains(2));
-
-  set<std::string> another_set;
-  another_set.insert("fee");
-  another_set.insert("fie");
-  another_set.insert("foe");
-  another_set.insert("fum");
-  EXPECT_THAT(another_set, Contains(Eq(std::string("fum"))));
-}
-
-TEST(ContainsTest, SetDoesNotMatchWhenElementIsNotInContainer) {
-  set<int> some_set;
-  some_set.insert(3);
-  some_set.insert(1);
-  EXPECT_THAT(some_set, Not(Contains(4)));
-
-  set<std::string> c_string_set;
-  c_string_set.insert("hello");
-  EXPECT_THAT(c_string_set, Not(Contains(std::string("goodbye"))));
-}
-
-TEST(ContainsTest, ExplainsMatchResultCorrectly) {
-  const int a[2] = {1, 2};
-  Matcher<const int(&)[2]> m = Contains(2);
-  EXPECT_EQ("whose element #1 matches", Explain(m, a));
-
-  m = Contains(3);
-  EXPECT_EQ("", Explain(m, a));
-
-  m = Contains(GreaterThan(0));
-  EXPECT_EQ("whose element #0 matches, which is 1 more than 0", Explain(m, a));
-
-  m = Contains(GreaterThan(10));
-  EXPECT_EQ("", Explain(m, a));
-}
-
-TEST(ContainsTest, DescribesItselfCorrectly) {
-  Matcher<vector<int>> m = Contains(1);
-  EXPECT_EQ("contains at least one element that is equal to 1", Describe(m));
-
-  Matcher<vector<int>> m2 = Not(m);
-  EXPECT_EQ("doesn't contain any element that is equal to 1", Describe(m2));
-}
-
-TEST(ContainsTest, MapMatchesWhenElementIsInContainer) {
-  map<std::string, int> my_map;
-  const char* bar = "a string";
-  my_map[bar] = 2;
-  EXPECT_THAT(my_map, Contains(pair<const char* const, int>(bar, 2)));
-
-  map<std::string, int> another_map;
-  another_map["fee"] = 1;
-  another_map["fie"] = 2;
-  another_map["foe"] = 3;
-  another_map["fum"] = 4;
-  EXPECT_THAT(another_map,
-              Contains(pair<const std::string, int>(std::string("fee"), 1)));
-  EXPECT_THAT(another_map, Contains(pair<const std::string, int>("fie", 2)));
-}
-
-TEST(ContainsTest, MapDoesNotMatchWhenElementIsNotInContainer) {
-  map<int, int> some_map;
-  some_map[1] = 11;
-  some_map[2] = 22;
-  EXPECT_THAT(some_map, Not(Contains(pair<const int, int>(2, 23))));
-}
-
-TEST(ContainsTest, ArrayMatchesWhenElementIsInContainer) {
-  const char* string_array[] = {"fee", "fie", "foe", "fum"};
-  EXPECT_THAT(string_array, Contains(Eq(std::string("fum"))));
-}
-
-TEST(ContainsTest, ArrayDoesNotMatchWhenElementIsNotInContainer) {
-  int int_array[] = {1, 2, 3, 4};
-  EXPECT_THAT(int_array, Not(Contains(5)));
-}
-
-TEST(ContainsTest, AcceptsMatcher) {
-  const int a[] = {1, 2, 3};
-  EXPECT_THAT(a, Contains(Gt(2)));
-  EXPECT_THAT(a, Not(Contains(Gt(4))));
-}
-
-TEST(ContainsTest, WorksForNativeArrayAsTuple) {
-  const int a[] = {1, 2};
-  const int* const pointer = a;
-  EXPECT_THAT(std::make_tuple(pointer, 2), Contains(1));
-  EXPECT_THAT(std::make_tuple(pointer, 2), Not(Contains(Gt(3))));
-}
-
-TEST(ContainsTest, WorksForTwoDimensionalNativeArray) {
-  int a[][3] = {{1, 2, 3}, {4, 5, 6}};
-  EXPECT_THAT(a, Contains(ElementsAre(4, 5, 6)));
-  EXPECT_THAT(a, Contains(Contains(5)));
-  EXPECT_THAT(a, Not(Contains(ElementsAre(3, 4, 5))));
-  EXPECT_THAT(a, Contains(Not(Contains(5))));
-}
-
-TEST(AllOfArrayTest, BasicForms) {
-  // Iterator
-  std::vector<int> v0{};
-  std::vector<int> v1{1};
-  std::vector<int> v2{2, 3};
-  std::vector<int> v3{4, 4, 4};
-  EXPECT_THAT(0, AllOfArray(v0.begin(), v0.end()));
-  EXPECT_THAT(1, AllOfArray(v1.begin(), v1.end()));
-  EXPECT_THAT(2, Not(AllOfArray(v1.begin(), v1.end())));
-  EXPECT_THAT(3, Not(AllOfArray(v2.begin(), v2.end())));
-  EXPECT_THAT(4, AllOfArray(v3.begin(), v3.end()));
-  // Pointer +  size
-  int ar[6] = {1, 2, 3, 4, 4, 4};
-  EXPECT_THAT(0, AllOfArray(ar, 0));
-  EXPECT_THAT(1, AllOfArray(ar, 1));
-  EXPECT_THAT(2, Not(AllOfArray(ar, 1)));
-  EXPECT_THAT(3, Not(AllOfArray(ar + 1, 3)));
-  EXPECT_THAT(4, AllOfArray(ar + 3, 3));
-  // Array
-  // int ar0[0];  Not usable
-  int ar1[1] = {1};
-  int ar2[2] = {2, 3};
-  int ar3[3] = {4, 4, 4};
-  // EXPECT_THAT(0, Not(AllOfArray(ar0)));  // Cannot work
-  EXPECT_THAT(1, AllOfArray(ar1));
-  EXPECT_THAT(2, Not(AllOfArray(ar1)));
-  EXPECT_THAT(3, Not(AllOfArray(ar2)));
-  EXPECT_THAT(4, AllOfArray(ar3));
-  // Container
-  EXPECT_THAT(0, AllOfArray(v0));
-  EXPECT_THAT(1, AllOfArray(v1));
-  EXPECT_THAT(2, Not(AllOfArray(v1)));
-  EXPECT_THAT(3, Not(AllOfArray(v2)));
-  EXPECT_THAT(4, AllOfArray(v3));
-  // Initializer
-  EXPECT_THAT(0, AllOfArray<int>({}));  // Requires template arg.
-  EXPECT_THAT(1, AllOfArray({1}));
-  EXPECT_THAT(2, Not(AllOfArray({1})));
-  EXPECT_THAT(3, Not(AllOfArray({2, 3})));
-  EXPECT_THAT(4, AllOfArray({4, 4, 4}));
-}
-
-TEST(AllOfArrayTest, Matchers) {
-  // vector
-  std::vector<Matcher<int>> matchers{Ge(1), Lt(2)};
-  EXPECT_THAT(0, Not(AllOfArray(matchers)));
-  EXPECT_THAT(1, AllOfArray(matchers));
-  EXPECT_THAT(2, Not(AllOfArray(matchers)));
-  // initializer_list
-  EXPECT_THAT(0, Not(AllOfArray({Ge(0), Ge(1)})));
-  EXPECT_THAT(1, AllOfArray({Ge(0), Ge(1)}));
-}
-
-TEST(AnyOfArrayTest, BasicForms) {
-  // Iterator
-  std::vector<int> v0{};
-  std::vector<int> v1{1};
-  std::vector<int> v2{2, 3};
-  EXPECT_THAT(0, Not(AnyOfArray(v0.begin(), v0.end())));
-  EXPECT_THAT(1, AnyOfArray(v1.begin(), v1.end()));
-  EXPECT_THAT(2, Not(AnyOfArray(v1.begin(), v1.end())));
-  EXPECT_THAT(3, AnyOfArray(v2.begin(), v2.end()));
-  EXPECT_THAT(4, Not(AnyOfArray(v2.begin(), v2.end())));
-  // Pointer +  size
-  int ar[3] = {1, 2, 3};
-  EXPECT_THAT(0, Not(AnyOfArray(ar, 0)));
-  EXPECT_THAT(1, AnyOfArray(ar, 1));
-  EXPECT_THAT(2, Not(AnyOfArray(ar, 1)));
-  EXPECT_THAT(3, AnyOfArray(ar + 1, 2));
-  EXPECT_THAT(4, Not(AnyOfArray(ar + 1, 2)));
-  // Array
-  // int ar0[0];  Not usable
-  int ar1[1] = {1};
-  int ar2[2] = {2, 3};
-  // EXPECT_THAT(0, Not(AnyOfArray(ar0)));  // Cannot work
-  EXPECT_THAT(1, AnyOfArray(ar1));
-  EXPECT_THAT(2, Not(AnyOfArray(ar1)));
-  EXPECT_THAT(3, AnyOfArray(ar2));
-  EXPECT_THAT(4, Not(AnyOfArray(ar2)));
-  // Container
-  EXPECT_THAT(0, Not(AnyOfArray(v0)));
-  EXPECT_THAT(1, AnyOfArray(v1));
-  EXPECT_THAT(2, Not(AnyOfArray(v1)));
-  EXPECT_THAT(3, AnyOfArray(v2));
-  EXPECT_THAT(4, Not(AnyOfArray(v2)));
-  // Initializer
-  EXPECT_THAT(0, Not(AnyOfArray<int>({})));  // Requires template arg.
-  EXPECT_THAT(1, AnyOfArray({1}));
-  EXPECT_THAT(2, Not(AnyOfArray({1})));
-  EXPECT_THAT(3, AnyOfArray({2, 3}));
-  EXPECT_THAT(4, Not(AnyOfArray({2, 3})));
-}
-
-TEST(AnyOfArrayTest, Matchers) {
-  // We negate test AllOfArrayTest.Matchers.
-  // vector
-  std::vector<Matcher<int>> matchers{Lt(1), Ge(2)};
-  EXPECT_THAT(0, AnyOfArray(matchers));
-  EXPECT_THAT(1, Not(AnyOfArray(matchers)));
-  EXPECT_THAT(2, AnyOfArray(matchers));
-  // initializer_list
-  EXPECT_THAT(0, AnyOfArray({Lt(0), Lt(1)}));
-  EXPECT_THAT(1, Not(AllOfArray({Lt(0), Lt(1)})));
-}
-
-TEST(AnyOfArrayTest, ExplainsMatchResultCorrectly) {
-  // AnyOfArray and AllOfArry use the same underlying template-template,
-  // thus it is sufficient to test one here.
-  const std::vector<int> v0{};
-  const std::vector<int> v1{1};
-  const std::vector<int> v2{2, 3};
-  const Matcher<int> m0 = AnyOfArray(v0);
-  const Matcher<int> m1 = AnyOfArray(v1);
-  const Matcher<int> m2 = AnyOfArray(v2);
-  EXPECT_EQ("", Explain(m0, 0));
-  EXPECT_EQ("", Explain(m1, 1));
-  EXPECT_EQ("", Explain(m1, 2));
-  EXPECT_EQ("", Explain(m2, 3));
-  EXPECT_EQ("", Explain(m2, 4));
-  EXPECT_EQ("()", Describe(m0));
-  EXPECT_EQ("(is equal to 1)", Describe(m1));
-  EXPECT_EQ("(is equal to 2) or (is equal to 3)", Describe(m2));
-  EXPECT_EQ("()", DescribeNegation(m0));
-  EXPECT_EQ("(isn't equal to 1)", DescribeNegation(m1));
-  EXPECT_EQ("(isn't equal to 2) and (isn't equal to 3)", DescribeNegation(m2));
-  // Explain with matchers
-  const Matcher<int> g1 = AnyOfArray({GreaterThan(1)});
-  const Matcher<int> g2 = AnyOfArray({GreaterThan(1), GreaterThan(2)});
-  // Explains the first positiv match and all prior negative matches...
-  EXPECT_EQ("which is 1 less than 1", Explain(g1, 0));
-  EXPECT_EQ("which is the same as 1", Explain(g1, 1));
-  EXPECT_EQ("which is 1 more than 1", Explain(g1, 2));
-  EXPECT_EQ("which is 1 less than 1, and which is 2 less than 2",
-            Explain(g2, 0));
-  EXPECT_EQ("which is the same as 1, and which is 1 less than 2",
-            Explain(g2, 1));
-  EXPECT_EQ("which is 1 more than 1",  // Only the first
-            Explain(g2, 2));
-}
-
-TEST(AllOfTest, HugeMatcher) {
-  // Verify that using AllOf with many arguments doesn't cause
-  // the compiler to exceed template instantiation depth limit.
-  EXPECT_THAT(0, testing::AllOf(_, _, _, _, _, _, _, _, _,
-                                testing::AllOf(_, _, _, _, _, _, _, _, _, _)));
-}
-
-TEST(AnyOfTest, HugeMatcher) {
-  // Verify that using AnyOf with many arguments doesn't cause
-  // the compiler to exceed template instantiation depth limit.
-  EXPECT_THAT(0, testing::AnyOf(_, _, _, _, _, _, _, _, _,
-                                testing::AnyOf(_, _, _, _, _, _, _, _, _, _)));
-}
-
-namespace adl_test {
-
-// Verifies that the implementation of ::testing::AllOf and ::testing::AnyOf
-// don't issue unqualified recursive calls.  If they do, the argument dependent
-// name lookup will cause AllOf/AnyOf in the 'adl_test' namespace to be found
-// as a candidate and the compilation will break due to an ambiguous overload.
-
-// The matcher must be in the same namespace as AllOf/AnyOf to make argument
-// dependent lookup find those.
-MATCHER(M, "") {
-  (void)arg;
-  return true;
-}
-
-template <typename T1, typename T2>
-bool AllOf(const T1& /*t1*/, const T2& /*t2*/) {
-  return true;
-}
-
-TEST(AllOfTest, DoesNotCallAllOfUnqualified) {
-  EXPECT_THAT(42,
-              testing::AllOf(M(), M(), M(), M(), M(), M(), M(), M(), M(), M()));
-}
-
-template <typename T1, typename T2>
-bool AnyOf(const T1&, const T2&) {
-  return true;
-}
-
-TEST(AnyOfTest, DoesNotCallAnyOfUnqualified) {
-  EXPECT_THAT(42,
-              testing::AnyOf(M(), M(), M(), M(), M(), M(), M(), M(), M(), M()));
-}
-
-}  // namespace adl_test
-
-TEST(AllOfTest, WorksOnMoveOnlyType) {
-  std::unique_ptr<int> p(new int(3));
-  EXPECT_THAT(p, AllOf(Pointee(Eq(3)), Pointee(Gt(0)), Pointee(Lt(5))));
-  EXPECT_THAT(p, Not(AllOf(Pointee(Eq(3)), Pointee(Gt(0)), Pointee(Lt(3)))));
-}
-
-TEST(AnyOfTest, WorksOnMoveOnlyType) {
-  std::unique_ptr<int> p(new int(3));
-  EXPECT_THAT(p, AnyOf(Pointee(Eq(5)), Pointee(Lt(0)), Pointee(Lt(5))));
-  EXPECT_THAT(p, Not(AnyOf(Pointee(Eq(5)), Pointee(Lt(0)), Pointee(Gt(5)))));
-}
-
-MATCHER(IsNotNull, "") { return arg != nullptr; }
-
-// Verifies that a matcher defined using MATCHER() can work on
-// move-only types.
-TEST(MatcherMacroTest, WorksOnMoveOnlyType) {
-  std::unique_ptr<int> p(new int(3));
-  EXPECT_THAT(p, IsNotNull());
-  EXPECT_THAT(std::unique_ptr<int>(), Not(IsNotNull()));
-}
-
-MATCHER_P(UniquePointee, pointee, "") { return *arg == pointee; }
-
-// Verifies that a matcher defined using MATCHER_P*() can work on
-// move-only types.
-TEST(MatcherPMacroTest, WorksOnMoveOnlyType) {
-  std::unique_ptr<int> p(new int(3));
-  EXPECT_THAT(p, UniquePointee(3));
-  EXPECT_THAT(p, Not(UniquePointee(2)));
-}
-
-#if GTEST_HAS_EXCEPTIONS
-
-// std::function<void()> is used below for compatibility with older copies of
-// GCC. Normally, a raw lambda is all that is needed.
-
-// Test that examples from documentation compile
-TEST(ThrowsTest, Examples) {
-  EXPECT_THAT(
-      std::function<void()>([]() { throw std::runtime_error("message"); }),
-      Throws<std::runtime_error>());
-
-  EXPECT_THAT(
-      std::function<void()>([]() { throw std::runtime_error("message"); }),
-      ThrowsMessage<std::runtime_error>(HasSubstr("message")));
-}
-
-TEST(ThrowsTest, DoesNotGenerateDuplicateCatchClauseWarning) {
-  EXPECT_THAT(std::function<void()>([]() { throw std::exception(); }),
-              Throws<std::exception>());
-}
-
-TEST(ThrowsTest, CallableExecutedExactlyOnce) {
-  size_t a = 0;
-
-  EXPECT_THAT(std::function<void()>([&a]() {
-                a++;
-                throw 10;
-              }),
-              Throws<int>());
-  EXPECT_EQ(a, 1u);
-
-  EXPECT_THAT(std::function<void()>([&a]() {
-                a++;
-                throw std::runtime_error("message");
-              }),
-              Throws<std::runtime_error>());
-  EXPECT_EQ(a, 2u);
-
-  EXPECT_THAT(std::function<void()>([&a]() {
-                a++;
-                throw std::runtime_error("message");
-              }),
-              ThrowsMessage<std::runtime_error>(HasSubstr("message")));
-  EXPECT_EQ(a, 3u);
-
-  EXPECT_THAT(std::function<void()>([&a]() {
-                a++;
-                throw std::runtime_error("message");
-              }),
-              Throws<std::runtime_error>(
-                  Property(&std::runtime_error::what, HasSubstr("message"))));
-  EXPECT_EQ(a, 4u);
-}
-
-TEST(ThrowsTest, Describe) {
-  Matcher<std::function<void()>> matcher = Throws<std::runtime_error>();
-  std::stringstream ss;
-  matcher.DescribeTo(&ss);
-  auto explanation = ss.str();
-  EXPECT_THAT(explanation, HasSubstr("std::runtime_error"));
-}
-
-TEST(ThrowsTest, Success) {
-  Matcher<std::function<void()>> matcher = Throws<std::runtime_error>();
-  StringMatchResultListener listener;
-  EXPECT_TRUE(matcher.MatchAndExplain(
-      []() { throw std::runtime_error("error message"); }, &listener));
-  EXPECT_THAT(listener.str(), HasSubstr("std::runtime_error"));
-}
-
-TEST(ThrowsTest, FailWrongType) {
-  Matcher<std::function<void()>> matcher = Throws<std::runtime_error>();
-  StringMatchResultListener listener;
-  EXPECT_FALSE(matcher.MatchAndExplain(
-      []() { throw std::logic_error("error message"); }, &listener));
-  EXPECT_THAT(listener.str(), HasSubstr("std::logic_error"));
-  EXPECT_THAT(listener.str(), HasSubstr("\"error message\""));
-}
-
-TEST(ThrowsTest, FailWrongTypeNonStd) {
-  Matcher<std::function<void()>> matcher = Throws<std::runtime_error>();
-  StringMatchResultListener listener;
-  EXPECT_FALSE(matcher.MatchAndExplain([]() { throw 10; }, &listener));
-  EXPECT_THAT(listener.str(),
-              HasSubstr("throws an exception of an unknown type"));
-}
-
-TEST(ThrowsTest, FailNoThrow) {
-  Matcher<std::function<void()>> matcher = Throws<std::runtime_error>();
-  StringMatchResultListener listener;
-  EXPECT_FALSE(matcher.MatchAndExplain([]() { (void)0; }, &listener));
-  EXPECT_THAT(listener.str(), HasSubstr("does not throw any exception"));
-}
-
-class ThrowsPredicateTest
-    : public TestWithParam<Matcher<std::function<void()>>> {};
-
-TEST_P(ThrowsPredicateTest, Describe) {
-  Matcher<std::function<void()>> matcher = GetParam();
-  std::stringstream ss;
-  matcher.DescribeTo(&ss);
-  auto explanation = ss.str();
-  EXPECT_THAT(explanation, HasSubstr("std::runtime_error"));
-  EXPECT_THAT(explanation, HasSubstr("error message"));
-}
-
-TEST_P(ThrowsPredicateTest, Success) {
-  Matcher<std::function<void()>> matcher = GetParam();
-  StringMatchResultListener listener;
-  EXPECT_TRUE(matcher.MatchAndExplain(
-      []() { throw std::runtime_error("error message"); }, &listener));
-  EXPECT_THAT(listener.str(), HasSubstr("std::runtime_error"));
-}
-
-TEST_P(ThrowsPredicateTest, FailWrongType) {
-  Matcher<std::function<void()>> matcher = GetParam();
-  StringMatchResultListener listener;
-  EXPECT_FALSE(matcher.MatchAndExplain(
-      []() { throw std::logic_error("error message"); }, &listener));
-  EXPECT_THAT(listener.str(), HasSubstr("std::logic_error"));
-  EXPECT_THAT(listener.str(), HasSubstr("\"error message\""));
-}
-
-TEST_P(ThrowsPredicateTest, FailWrongTypeNonStd) {
-  Matcher<std::function<void()>> matcher = GetParam();
-  StringMatchResultListener listener;
-  EXPECT_FALSE(matcher.MatchAndExplain([]() { throw 10; }, &listener));
-  EXPECT_THAT(listener.str(),
-              HasSubstr("throws an exception of an unknown type"));
-}
-
-TEST_P(ThrowsPredicateTest, FailWrongMessage) {
-  Matcher<std::function<void()>> matcher = GetParam();
-  StringMatchResultListener listener;
-  EXPECT_FALSE(matcher.MatchAndExplain(
-      []() { throw std::runtime_error("wrong message"); }, &listener));
-  EXPECT_THAT(listener.str(), HasSubstr("std::runtime_error"));
-  EXPECT_THAT(listener.str(), Not(HasSubstr("wrong message")));
-}
-
-TEST_P(ThrowsPredicateTest, FailNoThrow) {
-  Matcher<std::function<void()>> matcher = GetParam();
-  StringMatchResultListener listener;
-  EXPECT_FALSE(matcher.MatchAndExplain([]() {}, &listener));
-  EXPECT_THAT(listener.str(), HasSubstr("does not throw any exception"));
-}
-
-INSTANTIATE_TEST_SUITE_P(
-    AllMessagePredicates, ThrowsPredicateTest,
-    Values(Matcher<std::function<void()>>(
-        ThrowsMessage<std::runtime_error>(HasSubstr("error message")))));
-
-// Tests that Throws<E1>(Matcher<E2>{}) compiles even when E2 != const E1&.
-TEST(ThrowsPredicateCompilesTest, ExceptionMatcherAcceptsBroadType) {
-  {
-    Matcher<std::function<void()>> matcher =
-        ThrowsMessage<std::runtime_error>(HasSubstr("error message"));
-    EXPECT_TRUE(
-        matcher.Matches([]() { throw std::runtime_error("error message"); }));
-    EXPECT_FALSE(
-        matcher.Matches([]() { throw std::runtime_error("wrong message"); }));
-  }
-
-  {
-    Matcher<uint64_t> inner = Eq(10);
-    Matcher<std::function<void()>> matcher = Throws<uint32_t>(inner);
-    EXPECT_TRUE(matcher.Matches([]() { throw(uint32_t) 10; }));
-    EXPECT_FALSE(matcher.Matches([]() { throw(uint32_t) 11; }));
-  }
-}
-
-// Tests that ThrowsMessage("message") is equivalent
-// to ThrowsMessage(Eq<std::string>("message")).
-TEST(ThrowsPredicateCompilesTest, MessageMatcherAcceptsNonMatcher) {
-  Matcher<std::function<void()>> matcher =
-      ThrowsMessage<std::runtime_error>("error message");
-  EXPECT_TRUE(
-      matcher.Matches([]() { throw std::runtime_error("error message"); }));
-  EXPECT_FALSE(matcher.Matches(
-      []() { throw std::runtime_error("wrong error message"); }));
-}
-
-#endif  // GTEST_HAS_EXCEPTIONS
-
-}  // namespace
-}  // namespace gmock_matchers_test
-}  // namespace testing
-
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
diff --git a/external/googletest/googlemock/test/gmock-matchers_test.h b/external/googletest/googlemock/test/gmock-matchers_test.h
new file mode 100644
index 00000000..56956076
--- /dev/null
+++ b/external/googletest/googlemock/test/gmock-matchers_test.h
@@ -0,0 +1,192 @@
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Google Mock - a framework for writing C++ mock classes.
+//
+// This file tests some commonly used argument matchers.
+
+#ifndef GOOGLEMOCK_TEST_GMOCK_MATCHERS_TEST_H_
+#define GOOGLEMOCK_TEST_GMOCK_MATCHERS_TEST_H_
+
+#include <string.h>
+#include <time.h>
+
+#include <array>
+#include <cstdint>
+#include <deque>
+#include <forward_list>
+#include <functional>
+#include <iostream>
+#include <iterator>
+#include <limits>
+#include <list>
+#include <map>
+#include <memory>
+#include <set>
+#include <sstream>
+#include <string>
+#include <type_traits>
+#include <unordered_map>
+#include <unordered_set>
+#include <utility>
+#include <vector>
+
+#include "gmock/gmock-matchers.h"
+#include "gmock/gmock-more-matchers.h"
+#include "gmock/gmock.h"
+#include "gtest/gtest-spi.h"
+#include "gtest/gtest.h"
+
+namespace testing {
+namespace gmock_matchers_test {
+
+using std::greater;
+using std::less;
+using std::list;
+using std::make_pair;
+using std::map;
+using std::multimap;
+using std::multiset;
+using std::ostream;
+using std::pair;
+using std::set;
+using std::stringstream;
+using std::vector;
+using testing::internal::DummyMatchResultListener;
+using testing::internal::ElementMatcherPair;
+using testing::internal::ElementMatcherPairs;
+using testing::internal::ElementsAreArrayMatcher;
+using testing::internal::ExplainMatchFailureTupleTo;
+using testing::internal::FloatingEqMatcher;
+using testing::internal::FormatMatcherDescription;
+using testing::internal::IsReadableTypeName;
+using testing::internal::MatchMatrix;
+using testing::internal::PredicateFormatterFromMatcher;
+using testing::internal::RE;
+using testing::internal::StreamMatchResultListener;
+using testing::internal::Strings;
+
+// Helper for testing container-valued matchers in mock method context. It is
+// important to test matchers in this context, since it requires additional type
+// deduction beyond what EXPECT_THAT does, thus making it more restrictive.
+struct ContainerHelper {
+  MOCK_METHOD1(Call, void(std::vector<std::unique_ptr<int>>));
+};
+
+// For testing ExplainMatchResultTo().
+template <typename T>
+struct GtestGreaterThanMatcher {
+  using is_gtest_matcher = void;
+
+  void DescribeTo(ostream* os) const { *os << "is > " << rhs; }
+  void DescribeNegationTo(ostream* os) const { *os << "is <= " << rhs; }
+
+  bool MatchAndExplain(T lhs, MatchResultListener* listener) const {
+    if (lhs > rhs) {
+      *listener << "which is " << (lhs - rhs) << " more than " << rhs;
+    } else if (lhs == rhs) {
+      *listener << "which is the same as " << rhs;
+    } else {
+      *listener << "which is " << (rhs - lhs) << " less than " << rhs;
+    }
+
+    return lhs > rhs;
+  }
+
+  T rhs;
+};
+
+template <typename T>
+GtestGreaterThanMatcher<typename std::decay<T>::type> GtestGreaterThan(
+    T&& rhs) {
+  return {rhs};
+}
+
+// As the matcher above, but using the base class with virtual functions.
+template <typename T>
+class GreaterThanMatcher : public MatcherInterface<T> {
+ public:
+  explicit GreaterThanMatcher(T rhs) : impl_{rhs} {}
+
+  void DescribeTo(ostream* os) const override { impl_.DescribeTo(os); }
+  void DescribeNegationTo(ostream* os) const override {
+    impl_.DescribeNegationTo(os);
+  }
+
+  bool MatchAndExplain(T lhs, MatchResultListener* listener) const override {
+    return impl_.MatchAndExplain(lhs, listener);
+  }
+
+ private:
+  const GtestGreaterThanMatcher<T> impl_;
+};
+
+// Names and instantiates a new instance of GTestMatcherTestP.
+#define INSTANTIATE_GTEST_MATCHER_TEST_P(TestSuite)                        \
+  using TestSuite##P = GTestMatcherTestP;                                  \
+  INSTANTIATE_TEST_SUITE_P(MatcherInterface, TestSuite##P, Values(false)); \
+  INSTANTIATE_TEST_SUITE_P(GtestMatcher, TestSuite##P, Values(true))
+
+class GTestMatcherTestP : public testing::TestWithParam<bool> {
+ public:
+  template <typename T>
+  Matcher<T> GreaterThan(T n) {
+    if (use_gtest_matcher_) {
+      return GtestGreaterThan(n);
+    } else {
+      return MakeMatcher(new GreaterThanMatcher<T>(n));
+    }
+  }
+  const bool use_gtest_matcher_ = GetParam();
+};
+
+// Returns the description of the given matcher.
+template <typename T>
+std::string Describe(const Matcher<T>& m) {
+  return DescribeMatcher<T>(m);
+}
+
+// Returns the description of the negation of the given matcher.
+template <typename T>
+std::string DescribeNegation(const Matcher<T>& m) {
+  return DescribeMatcher<T>(m, true);
+}
+
+// Returns the reason why x matches, or doesn't match, m.
+template <typename MatcherType, typename Value>
+std::string Explain(const MatcherType& m, const Value& x) {
+  StringMatchResultListener listener;
+  ExplainMatchResult(m, x, &listener);
+  return listener.str();
+}
+
+}  // namespace gmock_matchers_test
+}  // namespace testing
+
+#endif  // GOOGLEMOCK_TEST_GMOCK_MATCHERS_TEST_H_
diff --git a/external/googletest/googlemock/test/gmock-more-actions_test.cc b/external/googletest/googlemock/test/gmock-more-actions_test.cc
index ba687732..5b8b566f 100644
--- a/external/googletest/googlemock/test/gmock-more-actions_test.cc
+++ b/external/googletest/googlemock/test/gmock-more-actions_test.cc
@@ -31,22 +31,23 @@
 //
 // This file tests the built-in actions in gmock-actions.h.
 
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4577)
-#endif
-
 #include "gmock/gmock-more-actions.h"
 
+#include <algorithm>
 #include <functional>
+#include <iterator>
 #include <memory>
 #include <sstream>
 #include <string>
+#include <tuple>
+#include <vector>
 
 #include "gmock/gmock.h"
 #include "gtest/gtest-spi.h"
 #include "gtest/gtest.h"
 
+GTEST_DISABLE_MSC_WARNINGS_PUSH_(4577)
+
 namespace testing {
 namespace gmock_more_actions_test {
 
@@ -58,6 +59,7 @@ using testing::Invoke;
 using testing::ReturnArg;
 using testing::ReturnPointee;
 using testing::SaveArg;
+using testing::SaveArgByMove;
 using testing::SaveArgPointee;
 using testing::SetArgReferee;
 using testing::Unused;
@@ -84,6 +86,16 @@ struct UnaryFunctor {
   int operator()(bool x) { return x ? 1 : -1; }
 };
 
+struct UnaryMoveOnlyFunctor : UnaryFunctor {
+  UnaryMoveOnlyFunctor() = default;
+  UnaryMoveOnlyFunctor(const UnaryMoveOnlyFunctor&) = delete;
+  UnaryMoveOnlyFunctor(UnaryMoveOnlyFunctor&&) = default;
+};
+
+struct OneShotUnaryFunctor {
+  int operator()(bool x) && { return x ? 1 : -1; }
+};
+
 const char* Binary(const char* input, short n) { return input + n; }  // NOLINT
 
 int Ternary(int x, char y, short z) { return x + y + z; }  // NOLINT
@@ -461,6 +473,12 @@ TEST(ReturnArgActionTest, WorksForMultiArgStringArg2) {
   EXPECT_EQ("seven", a.Perform(std::make_tuple(5, 6, std::string("seven"), 8)));
 }
 
+TEST(ReturnArgActionTest, WorksForNonConstRefArg0) {
+  const Action<std::string&(std::string&)> a = ReturnArg<0>();
+  std::string s = "12345";
+  EXPECT_EQ(&s, &a.Perform(std::forward_as_tuple(s)));
+}
+
 TEST(SaveArgActionTest, WorksForSameType) {
   int result = 0;
   const Action<void(int n)> a1 = SaveArg<0>(&result);
@@ -475,6 +493,34 @@ TEST(SaveArgActionTest, WorksForCompatibleType) {
   EXPECT_EQ('a', result);
 }
 
+struct MoveOnly {
+  explicit MoveOnly(int v) : i(v) {}
+  MoveOnly(MoveOnly&& o) {
+    i = o.i;
+    o.i = -1;
+  }
+  MoveOnly& operator=(MoveOnly&& o) {
+    i = o.i;
+    o.i = -1;
+    return *this;
+  }
+  int i;
+};
+
+TEST(SaveArgByMoveActionTest, WorksForSameType) {
+  MoveOnly result{0};
+  const Action<void(MoveOnly v)> a1 = SaveArgByMove<0>(&result);
+  a1.Perform(std::make_tuple(MoveOnly{5}));
+  EXPECT_EQ(5, result.i);
+}
+
+TEST(SaveArgByMoveActionTest, WorksForCompatibleType) {
+  MoveOnly result{0};
+  const Action<void(bool, MoveOnly)> a1 = SaveArgByMove<1>(&result);
+  a1.Perform(std::make_tuple(true, MoveOnly{7}));
+  EXPECT_EQ(7, result.i);
+}
+
 TEST(SaveArgPointeeActionTest, WorksForSameType) {
   int result = 0;
   const int value = 5;
@@ -670,7 +716,7 @@ TEST(SetArrayArgumentTest, SetsTheNthArrayWithIteratorArgument) {
   Action<MyFunction> a = SetArrayArgument<1>(letters.begin(), letters.end());
 
   std::string s;
-  a.Perform(std::make_tuple(true, back_inserter(s)));
+  a.Perform(std::make_tuple(true, std::back_inserter(s)));
   EXPECT_EQ(letters, s);
 }
 
@@ -691,15 +737,27 @@ TEST(InvokeArgumentTest, Function0) {
   EXPECT_EQ(1, a.Perform(std::make_tuple(2, &Nullary)));
 }
 
-// Tests using InvokeArgument with a unary function.
+// Tests using InvokeArgument with a unary functor.
 TEST(InvokeArgumentTest, Functor1) {
   Action<int(UnaryFunctor)> a = InvokeArgument<0>(true);  // NOLINT
   EXPECT_EQ(1, a.Perform(std::make_tuple(UnaryFunctor())));
 }
 
+// Tests using InvokeArgument with a unary move-only functor.
+TEST(InvokeArgumentTest, Functor1MoveOnly) {
+  Action<int(UnaryMoveOnlyFunctor)> a = InvokeArgument<0>(true);  // NOLINT
+  EXPECT_EQ(1, a.Perform(std::make_tuple(UnaryMoveOnlyFunctor())));
+}
+
+// Tests using InvokeArgument with a one-shot unary functor.
+TEST(InvokeArgumentTest, OneShotFunctor1) {
+  Action<int(OneShotUnaryFunctor)> a = InvokeArgument<0>(true);  // NOLINT
+  EXPECT_EQ(1, a.Perform(std::make_tuple(OneShotUnaryFunctor())));
+}
+
 // Tests using InvokeArgument with a 5-ary function.
 TEST(InvokeArgumentTest, Function5) {
-  Action<int(int(*)(int, int, int, int, int))> a =  // NOLINT
+  Action<int(int (*)(int, int, int, int, int))> a =  // NOLINT
       InvokeArgument<0>(10000, 2000, 300, 40, 5);
   EXPECT_EQ(12345, a.Perform(std::make_tuple(&SumOf5)));
 }
@@ -713,7 +771,7 @@ TEST(InvokeArgumentTest, Functor5) {
 
 // Tests using InvokeArgument with a 6-ary function.
 TEST(InvokeArgumentTest, Function6) {
-  Action<int(int(*)(int, int, int, int, int, int))> a =  // NOLINT
+  Action<int(int (*)(int, int, int, int, int, int))> a =  // NOLINT
       InvokeArgument<0>(100000, 20000, 3000, 400, 50, 6);
   EXPECT_EQ(123456, a.Perform(std::make_tuple(&SumOf6)));
 }
@@ -727,34 +785,34 @@ TEST(InvokeArgumentTest, Functor6) {
 
 // Tests using InvokeArgument with a 7-ary function.
 TEST(InvokeArgumentTest, Function7) {
-  Action<std::string(std::string(*)(const char*, const char*, const char*,
-                                    const char*, const char*, const char*,
-                                    const char*))>
+  Action<std::string(std::string (*)(const char*, const char*, const char*,
+                                     const char*, const char*, const char*,
+                                     const char*))>
       a = InvokeArgument<0>("1", "2", "3", "4", "5", "6", "7");
   EXPECT_EQ("1234567", a.Perform(std::make_tuple(&Concat7)));
 }
 
 // Tests using InvokeArgument with a 8-ary function.
 TEST(InvokeArgumentTest, Function8) {
-  Action<std::string(std::string(*)(const char*, const char*, const char*,
-                                    const char*, const char*, const char*,
-                                    const char*, const char*))>
+  Action<std::string(std::string (*)(const char*, const char*, const char*,
+                                     const char*, const char*, const char*,
+                                     const char*, const char*))>
       a = InvokeArgument<0>("1", "2", "3", "4", "5", "6", "7", "8");
   EXPECT_EQ("12345678", a.Perform(std::make_tuple(&Concat8)));
 }
 
 // Tests using InvokeArgument with a 9-ary function.
 TEST(InvokeArgumentTest, Function9) {
-  Action<std::string(std::string(*)(const char*, const char*, const char*,
-                                    const char*, const char*, const char*,
-                                    const char*, const char*, const char*))>
+  Action<std::string(std::string (*)(const char*, const char*, const char*,
+                                     const char*, const char*, const char*,
+                                     const char*, const char*, const char*))>
       a = InvokeArgument<0>("1", "2", "3", "4", "5", "6", "7", "8", "9");
   EXPECT_EQ("123456789", a.Perform(std::make_tuple(&Concat9)));
 }
 
 // Tests using InvokeArgument with a 10-ary function.
 TEST(InvokeArgumentTest, Function10) {
-  Action<std::string(std::string(*)(
+  Action<std::string(std::string (*)(
       const char*, const char*, const char*, const char*, const char*,
       const char*, const char*, const char*, const char*, const char*))>
       a = InvokeArgument<0>("1", "2", "3", "4", "5", "6", "7", "8", "9", "0");
@@ -778,7 +836,7 @@ TEST(InvokeArgumentTest, FunctionWithCStringLiteral) {
 
 // Tests using InvokeArgument with a function that takes a const reference.
 TEST(InvokeArgumentTest, ByConstReferenceFunction) {
-  Action<bool(bool(*function)(const std::string& s))> a =  // NOLINT
+  Action<bool(bool (*function)(const std::string& s))> a =  // NOLINT
       InvokeArgument<0>(std::string("Hi"));
   // When action 'a' is constructed, it makes a copy of the temporary
   // string object passed to it, so it's OK to use 'a' later, when the
@@ -789,7 +847,7 @@ TEST(InvokeArgumentTest, ByConstReferenceFunction) {
 // Tests using InvokeArgument with ByRef() and a function that takes a
 // const reference.
 TEST(InvokeArgumentTest, ByExplicitConstReferenceFunction) {
-  Action<bool(bool(*)(const double& x))> a =  // NOLINT
+  Action<bool(bool (*)(const double& x))> a =  // NOLINT
       InvokeArgument<0>(ByRef(g_double));
   // The above line calls ByRef() on a const value.
   EXPECT_TRUE(a.Perform(std::make_tuple(&ReferencesGlobalDouble)));
@@ -799,6 +857,22 @@ TEST(InvokeArgumentTest, ByExplicitConstReferenceFunction) {
   EXPECT_FALSE(a.Perform(std::make_tuple(&ReferencesGlobalDouble)));
 }
 
+TEST(InvokeArgumentTest, MoveOnlyType) {
+  struct Marker {};
+  struct {
+    // Method takes a unique_ptr (to a type we don't care about), and an
+    // invocable type.
+    MOCK_METHOD(bool, MockMethod,
+                (std::unique_ptr<Marker>, std::function<int()>), ());
+  } mock;
+
+  ON_CALL(mock, MockMethod(_, _)).WillByDefault(InvokeArgument<1>());
+
+  // This compiles, but is a little opaque as a workaround:
+  ON_CALL(mock, MockMethod(_, _))
+      .WillByDefault(WithArg<1>(InvokeArgument<0>()));
+}
+
 // Tests DoAll(a1, a2).
 TEST(DoAllTest, TwoActions) {
   int n = 0;
@@ -976,11 +1050,7 @@ TEST(DoAllTest, ImplicitlyConvertsActionArguments) {
 // is expanded and macro expansion cannot contain #pragma.  Therefore
 // we suppress them here.
 // Also suppress C4503 decorated name length exceeded, name was truncated
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4100)
-#pragma warning(disable : 4503)
-#endif
+GTEST_DISABLE_MSC_WARNINGS_PUSH_(4100 4503)
 // Tests the ACTION*() macro family.
 
 // Tests that ACTION() can define an action that doesn't reference the
@@ -1542,3 +1612,6 @@ TEST(ActionTemplateTest, CanBeOverloadedOnNumberOfValueParameters) {
 
 }  // namespace gmock_more_actions_test
 }  // namespace testing
+
+GTEST_DISABLE_MSC_WARNINGS_POP_()  // 4100 4503
+GTEST_DISABLE_MSC_WARNINGS_POP_()  // 4577
diff --git a/external/googletest/googlemock/test/gmock-nice-strict_test.cc b/external/googletest/googlemock/test/gmock-nice-strict_test.cc
index d194b7d7..95f09690 100644
--- a/external/googletest/googlemock/test/gmock-nice-strict_test.cc
+++ b/external/googletest/googlemock/test/gmock-nice-strict_test.cc
@@ -40,18 +40,18 @@
 // clash with ::testing::Mock.
 class Mock {
  public:
-  Mock() {}
+  Mock() = default;
 
   MOCK_METHOD0(DoThis, void());
 
  private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(Mock);
+  Mock(const Mock&) = delete;
+  Mock& operator=(const Mock&) = delete;
 };
 
 namespace testing {
 namespace gmock_nice_strict_test {
 
-using testing::GMOCK_FLAG(verbose);
 using testing::HasSubstr;
 using testing::NaggyMock;
 using testing::NiceMock;
@@ -78,7 +78,7 @@ class CallsMockMethodInDestructor {
 
 class Foo {
  public:
-  virtual ~Foo() {}
+  virtual ~Foo() = default;
 
   virtual void DoThis() = 0;
   virtual int DoThat(bool flag) = 0;
@@ -86,7 +86,7 @@ class Foo {
 
 class MockFoo : public Foo {
  public:
-  MockFoo() {}
+  MockFoo() = default;
   void Delete() { delete this; }
 
   MOCK_METHOD0(DoThis, void());
@@ -94,7 +94,8 @@ class MockFoo : public Foo {
   MOCK_METHOD0(ReturnNonDefaultConstructible, NotDefaultConstructible());
 
  private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(MockFoo);
+  MockFoo(const MockFoo&) = delete;
+  MockFoo& operator=(const MockFoo&) = delete;
 };
 
 class MockBar {
@@ -108,7 +109,7 @@ class MockBar {
            (a10 ? 'T' : 'F');
   }
 
-  virtual ~MockBar() {}
+  virtual ~MockBar() = default;
 
   const std::string& str() const { return str_; }
 
@@ -118,7 +119,8 @@ class MockBar {
  private:
   std::string str_;
 
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(MockBar);
+  MockBar(const MockBar&) = delete;
+  MockBar& operator=(const MockBar&) = delete;
 };
 
 class MockBaz {
@@ -141,8 +143,8 @@ class MockBaz {
 
 // Tests that a raw mock generates warnings for uninteresting calls.
 TEST(RawMockTest, WarningForUninterestingCall) {
-  const std::string saved_flag = GMOCK_FLAG(verbose);
-  GMOCK_FLAG(verbose) = "warning";
+  const std::string saved_flag = GMOCK_FLAG_GET(verbose);
+  GMOCK_FLAG_SET(verbose, "warning");
 
   MockFoo raw_foo;
 
@@ -152,14 +154,14 @@ TEST(RawMockTest, WarningForUninterestingCall) {
   EXPECT_THAT(GetCapturedStdout(),
               HasSubstr("Uninteresting mock function call"));
 
-  GMOCK_FLAG(verbose) = saved_flag;
+  GMOCK_FLAG_SET(verbose, saved_flag);
 }
 
 // Tests that a raw mock generates warnings for uninteresting calls
 // that delete the mock object.
 TEST(RawMockTest, WarningForUninterestingCallAfterDeath) {
-  const std::string saved_flag = GMOCK_FLAG(verbose);
-  GMOCK_FLAG(verbose) = "warning";
+  const std::string saved_flag = GMOCK_FLAG_GET(verbose);
+  GMOCK_FLAG_SET(verbose, "warning");
 
   MockFoo* const raw_foo = new MockFoo;
 
@@ -170,7 +172,7 @@ TEST(RawMockTest, WarningForUninterestingCallAfterDeath) {
   EXPECT_THAT(GetCapturedStdout(),
               HasSubstr("Uninteresting mock function call"));
 
-  GMOCK_FLAG(verbose) = saved_flag;
+  GMOCK_FLAG_SET(verbose, saved_flag);
 }
 
 // Tests that a raw mock generates informational logs for
@@ -178,14 +180,14 @@ TEST(RawMockTest, WarningForUninterestingCallAfterDeath) {
 TEST(RawMockTest, InfoForUninterestingCall) {
   MockFoo raw_foo;
 
-  const std::string saved_flag = GMOCK_FLAG(verbose);
-  GMOCK_FLAG(verbose) = "info";
+  const std::string saved_flag = GMOCK_FLAG_GET(verbose);
+  GMOCK_FLAG_SET(verbose, "info");
   CaptureStdout();
   raw_foo.DoThis();
   EXPECT_THAT(GetCapturedStdout(),
               HasSubstr("Uninteresting mock function call"));
 
-  GMOCK_FLAG(verbose) = saved_flag;
+  GMOCK_FLAG_SET(verbose, saved_flag);
 }
 
 TEST(RawMockTest, IsNaggy_IsNice_IsStrict) {
@@ -223,14 +225,14 @@ TEST(NiceMockTest, NoWarningForUninterestingCallAfterDeath) {
 TEST(NiceMockTest, InfoForUninterestingCall) {
   NiceMock<MockFoo> nice_foo;
 
-  const std::string saved_flag = GMOCK_FLAG(verbose);
-  GMOCK_FLAG(verbose) = "info";
+  const std::string saved_flag = GMOCK_FLAG_GET(verbose);
+  GMOCK_FLAG_SET(verbose, "info");
   CaptureStdout();
   nice_foo.DoThis();
   EXPECT_THAT(GetCapturedStdout(),
               HasSubstr("Uninteresting mock function call"));
 
-  GMOCK_FLAG(verbose) = saved_flag;
+  GMOCK_FLAG_SET(verbose, saved_flag);
 }
 
 #endif  // GTEST_HAS_STREAM_REDIRECTION
@@ -326,8 +328,8 @@ TEST(NiceMockTest, IsNaggy_IsNice_IsStrict) {
 
 // Tests that a naggy mock generates warnings for uninteresting calls.
 TEST(NaggyMockTest, WarningForUninterestingCall) {
-  const std::string saved_flag = GMOCK_FLAG(verbose);
-  GMOCK_FLAG(verbose) = "warning";
+  const std::string saved_flag = GMOCK_FLAG_GET(verbose);
+  GMOCK_FLAG_SET(verbose, "warning");
 
   NaggyMock<MockFoo> naggy_foo;
 
@@ -337,14 +339,14 @@ TEST(NaggyMockTest, WarningForUninterestingCall) {
   EXPECT_THAT(GetCapturedStdout(),
               HasSubstr("Uninteresting mock function call"));
 
-  GMOCK_FLAG(verbose) = saved_flag;
+  GMOCK_FLAG_SET(verbose, saved_flag);
 }
 
 // Tests that a naggy mock generates a warning for an uninteresting call
 // that deletes the mock object.
 TEST(NaggyMockTest, WarningForUninterestingCallAfterDeath) {
-  const std::string saved_flag = GMOCK_FLAG(verbose);
-  GMOCK_FLAG(verbose) = "warning";
+  const std::string saved_flag = GMOCK_FLAG_GET(verbose);
+  GMOCK_FLAG_SET(verbose, "warning");
 
   NaggyMock<MockFoo>* const naggy_foo = new NaggyMock<MockFoo>;
 
@@ -356,7 +358,7 @@ TEST(NaggyMockTest, WarningForUninterestingCallAfterDeath) {
   EXPECT_THAT(GetCapturedStdout(),
               HasSubstr("Uninteresting mock function call"));
 
-  GMOCK_FLAG(verbose) = saved_flag;
+  GMOCK_FLAG_SET(verbose, saved_flag);
 }
 
 #endif  // GTEST_HAS_STREAM_REDIRECTION
@@ -419,8 +421,8 @@ TEST(NaggyMockTest, AcceptsClassNamedMock) {
 }
 
 TEST(NaggyMockTest, IsNaggyInDestructor) {
-  const std::string saved_flag = GMOCK_FLAG(verbose);
-  GMOCK_FLAG(verbose) = "warning";
+  const std::string saved_flag = GMOCK_FLAG_GET(verbose);
+  GMOCK_FLAG_SET(verbose, "warning");
   CaptureStdout();
 
   {
@@ -431,7 +433,7 @@ TEST(NaggyMockTest, IsNaggyInDestructor) {
   EXPECT_THAT(GetCapturedStdout(),
               HasSubstr("Uninteresting mock function call"));
 
-  GMOCK_FLAG(verbose) = saved_flag;
+  GMOCK_FLAG_SET(verbose, saved_flag);
 }
 
 TEST(NaggyMockTest, IsNaggy_IsNice_IsStrict) {
diff --git a/external/googletest/googlemock/test/gmock-pp_test.cc b/external/googletest/googlemock/test/gmock-pp_test.cc
index 5d1566e3..e447f765 100644
--- a/external/googletest/googlemock/test/gmock-pp_test.cc
+++ b/external/googletest/googlemock/test/gmock-pp_test.cc
@@ -70,7 +70,7 @@ static_assert(GMOCK_PP_INTERNAL_VAR_TEST(x, y) == 2, "");
 static_assert(GMOCK_PP_INTERNAL_VAR_TEST(silly) == 1, "");
 static_assert(GMOCK_PP_INTERNAL_VAR_TEST(x, y, z) == 3, "");
 
-// TODO(iserna): The following asserts fail in --config=lexan.
+// TODO(iserna): The following asserts fail in --config=windows.
 #define GMOCK_PP_INTERNAL_IS_EMPTY_TEST_1
 static_assert(GMOCK_PP_IS_EMPTY(GMOCK_PP_INTERNAL_IS_EMPTY_TEST_1), "");
 static_assert(GMOCK_PP_IS_EMPTY(), "");
diff --git a/external/googletest/googlemock/test/gmock-spec-builders_test.cc b/external/googletest/googlemock/test/gmock-spec-builders_test.cc
index 572557a9..9e68aa0c 100644
--- a/external/googletest/googlemock/test/gmock-spec-builders_test.cc
+++ b/external/googletest/googlemock/test/gmock-spec-builders_test.cc
@@ -37,6 +37,7 @@
 #include <ostream>  // NOLINT
 #include <sstream>
 #include <string>
+#include <type_traits>
 
 #include "gmock/gmock.h"
 #include "gmock/internal/gmock-port.h"
@@ -45,64 +46,19 @@
 #include "gtest/internal/gtest-port.h"
 
 namespace testing {
-namespace internal {
-
-// Helper class for testing the Expectation class template.
-class ExpectationTester {
- public:
-  // Sets the call count of the given expectation to the given number.
-  void SetCallCount(int n, ExpectationBase* exp) { exp->call_count_ = n; }
-};
-
-}  // namespace internal
-}  // namespace testing
-
 namespace {
 
-using testing::_;
-using testing::AnyNumber;
-using testing::AtLeast;
-using testing::AtMost;
-using testing::Between;
-using testing::Cardinality;
-using testing::CardinalityInterface;
-using testing::Const;
-using testing::ContainsRegex;
-using testing::DoAll;
-using testing::DoDefault;
-using testing::Eq;
-using testing::Expectation;
-using testing::ExpectationSet;
-using testing::GMOCK_FLAG(verbose);
-using testing::Gt;
-using testing::IgnoreResult;
-using testing::InSequence;
-using testing::Invoke;
-using testing::InvokeWithoutArgs;
-using testing::IsNotSubstring;
-using testing::IsSubstring;
-using testing::Lt;
-using testing::Message;
-using testing::Mock;
-using testing::NaggyMock;
-using testing::Ne;
-using testing::Return;
-using testing::SaveArg;
-using testing::Sequence;
-using testing::SetArgPointee;
-using testing::internal::ExpectationTester;
-using testing::internal::FormatFileLocation;
-using testing::internal::kAllow;
-using testing::internal::kErrorVerbosity;
-using testing::internal::kFail;
-using testing::internal::kInfoVerbosity;
-using testing::internal::kWarn;
-using testing::internal::kWarningVerbosity;
+using ::testing::internal::FormatFileLocation;
+using ::testing::internal::kAllow;
+using ::testing::internal::kErrorVerbosity;
+using ::testing::internal::kFail;
+using ::testing::internal::kInfoVerbosity;
+using ::testing::internal::kWarn;
+using ::testing::internal::kWarningVerbosity;
 
 #if GTEST_HAS_STREAM_REDIRECTION
-using testing::HasSubstr;
-using testing::internal::CaptureStdout;
-using testing::internal::GetCapturedStdout;
+using ::testing::internal::CaptureStdout;
+using ::testing::internal::GetCapturedStdout;
 #endif
 
 class Incomplete;
@@ -142,7 +98,7 @@ class NonDefaultConstructible {
 
 class MockA {
  public:
-  MockA() {}
+  MockA() = default;
 
   MOCK_METHOD1(DoA, void(int n));
   MOCK_METHOD1(ReturnResult, Result(int n));
@@ -151,28 +107,31 @@ class MockA {
   MOCK_METHOD2(ReturnInt, int(int x, int y));
 
  private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(MockA);
+  MockA(const MockA&) = delete;
+  MockA& operator=(const MockA&) = delete;
 };
 
 class MockB {
  public:
-  MockB() {}
+  MockB() = default;
 
   MOCK_CONST_METHOD0(DoB, int());  // NOLINT
   MOCK_METHOD1(DoB, int(int n));   // NOLINT
 
  private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(MockB);
+  MockB(const MockB&) = delete;
+  MockB& operator=(const MockB&) = delete;
 };
 
 class ReferenceHoldingMock {
  public:
-  ReferenceHoldingMock() {}
+  ReferenceHoldingMock() = default;
 
   MOCK_METHOD1(AcceptReference, void(std::shared_ptr<MockA>*));
 
  private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ReferenceHoldingMock);
+  ReferenceHoldingMock(const ReferenceHoldingMock&) = delete;
+  ReferenceHoldingMock& operator=(const ReferenceHoldingMock&) = delete;
 };
 
 // Tests that EXPECT_CALL and ON_CALL compile in a presence of macro
@@ -184,17 +143,18 @@ class ReferenceHoldingMock {
 
 class CC {
  public:
-  virtual ~CC() {}
+  virtual ~CC() = default;
   virtual int Method() = 0;
 };
 class MockCC : public CC {
  public:
-  MockCC() {}
+  MockCC() = default;
 
   MOCK_METHOD0(Method, int());
 
  private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(MockCC);
+  MockCC(const MockCC&) = delete;
+  MockCC& operator=(const MockCC&) = delete;
 };
 
 // Tests that a method with expanded name compiles.
@@ -382,7 +342,7 @@ TEST(ExpectCallSyntaxTest, TimesMustBeBeforeInSequence) {
       {  // NOLINT
         EXPECT_CALL(a, DoA(1)).InSequence(s).Times(1);
       },
-      ".Times() cannot appear after ");
+      ".Times() may only appear *before* ");
 
   a.DoA(1);
 }
@@ -661,9 +621,9 @@ TEST(ExpectCallSyntaxTest, WarnsOnTooFewActions) {
 }
 
 TEST(ExpectCallSyntaxTest, WarningIsErrorWithFlag) {
-  int original_behavior = testing::GMOCK_FLAG(default_mock_behavior);
+  int original_behavior = GMOCK_FLAG_GET(default_mock_behavior);
 
-  testing::GMOCK_FLAG(default_mock_behavior) = kAllow;
+  GMOCK_FLAG_SET(default_mock_behavior, kAllow);
   CaptureStdout();
   {
     MockA a;
@@ -672,7 +632,7 @@ TEST(ExpectCallSyntaxTest, WarningIsErrorWithFlag) {
   std::string output = GetCapturedStdout();
   EXPECT_TRUE(output.empty()) << output;
 
-  testing::GMOCK_FLAG(default_mock_behavior) = kWarn;
+  GMOCK_FLAG_SET(default_mock_behavior, kWarn);
   CaptureStdout();
   {
     MockA a;
@@ -683,7 +643,7 @@ TEST(ExpectCallSyntaxTest, WarningIsErrorWithFlag) {
   EXPECT_PRED_FORMAT2(IsSubstring, "Uninteresting mock function call",
                       warning_output);
 
-  testing::GMOCK_FLAG(default_mock_behavior) = kFail;
+  GMOCK_FLAG_SET(default_mock_behavior, kFail);
   EXPECT_NONFATAL_FAILURE(
       {
         MockA a;
@@ -692,7 +652,7 @@ TEST(ExpectCallSyntaxTest, WarningIsErrorWithFlag) {
       "Uninteresting mock function call");
 
   // Out of bounds values are converted to kWarn
-  testing::GMOCK_FLAG(default_mock_behavior) = -1;
+  GMOCK_FLAG_SET(default_mock_behavior, -1);
   CaptureStdout();
   {
     MockA a;
@@ -702,7 +662,7 @@ TEST(ExpectCallSyntaxTest, WarningIsErrorWithFlag) {
   EXPECT_PRED_FORMAT2(IsSubstring, "GMOCK WARNING", warning_output);
   EXPECT_PRED_FORMAT2(IsSubstring, "Uninteresting mock function call",
                       warning_output);
-  testing::GMOCK_FLAG(default_mock_behavior) = 3;
+  GMOCK_FLAG_SET(default_mock_behavior, 3);
   CaptureStdout();
   {
     MockA a;
@@ -713,7 +673,7 @@ TEST(ExpectCallSyntaxTest, WarningIsErrorWithFlag) {
   EXPECT_PRED_FORMAT2(IsSubstring, "Uninteresting mock function call",
                       warning_output);
 
-  testing::GMOCK_FLAG(default_mock_behavior) = original_behavior;
+  GMOCK_FLAG_SET(default_mock_behavior, original_behavior);
 }
 
 #endif  // GTEST_HAS_STREAM_REDIRECTION
@@ -779,11 +739,12 @@ TEST(ExpectCallTest, CatchesTooFewCalls) {
   EXPECT_NONFATAL_FAILURE(
       {  // NOLINT
         MockB b;
-        EXPECT_CALL(b, DoB(5)).Times(AtLeast(2));
+        EXPECT_CALL(b, DoB(5)).Description("DoB Method").Times(AtLeast(2));
 
         b.DoB(5);
       },
-      "Actual function call count doesn't match EXPECT_CALL(b, DoB(5))...\n"
+      "Actual function \"DoB Method\" call count "
+      "doesn't match EXPECT_CALL(b, DoB(5))...\n"
       "         Expected: to be called at least twice\n"
       "           Actual: called once - unsatisfied and active");
 }
@@ -843,6 +804,50 @@ TEST(ExpectCallTest, InfersCardinality1WhenThereIsWillRepeatedly) {
       "to be called at least once");
 }
 
+// TODO(b/396121064) - Fix this test under MSVC
+#ifndef _MSC_VER
+// It should be possible to return a non-moveable type from a mock action in
+// C++17 and above, where it's guaranteed that such a type can be initialized
+// from a prvalue returned from a function.
+TEST(ExpectCallTest, NonMoveableType) {
+  // Define a non-moveable result type.
+  struct NonMoveableStruct {
+    explicit NonMoveableStruct(int x_in) : x(x_in) {}
+    NonMoveableStruct(NonMoveableStruct&&) = delete;
+
+    int x;
+  };
+
+  static_assert(!std::is_move_constructible_v<NonMoveableStruct>);
+  static_assert(!std::is_copy_constructible_v<NonMoveableStruct>);
+
+  static_assert(!std::is_move_assignable_v<NonMoveableStruct>);
+  static_assert(!std::is_copy_assignable_v<NonMoveableStruct>);
+
+  // We should be able to use a callable that returns that result as both a
+  // OnceAction and an Action, whether the callable ignores arguments or not.
+  const auto return_17 = [] { return NonMoveableStruct(17); };
+
+  static_cast<void>(OnceAction<NonMoveableStruct()>{return_17});
+  static_cast<void>(Action<NonMoveableStruct()>{return_17});
+
+  static_cast<void>(OnceAction<NonMoveableStruct(int)>{return_17});
+  static_cast<void>(Action<NonMoveableStruct(int)>{return_17});
+
+  // It should be possible to return the result end to end through an
+  // EXPECT_CALL statement, with both WillOnce and WillRepeatedly.
+  MockFunction<NonMoveableStruct()> mock;
+  EXPECT_CALL(mock, Call)   //
+      .WillOnce(return_17)  //
+      .WillRepeatedly(return_17);
+
+  EXPECT_EQ(17, mock.AsStdFunction()().x);
+  EXPECT_EQ(17, mock.AsStdFunction()().x);
+  EXPECT_EQ(17, mock.AsStdFunction()().x);
+}
+
+#endif  // _MSC_VER
+
 // Tests that the n-th action is taken for the n-th matching
 // invocation.
 TEST(ExpectCallTest, NthMatchTakesNthAction) {
@@ -900,7 +905,7 @@ TEST(ExpectCallTest, TakesDefaultActionWhenWillListIsExhausted) {
                         " - returning default value."));
 }
 
-TEST(FunctionMockerMessageTest, ReportsExpectCallLocationForExhausedActions) {
+TEST(FunctionMockerMessageTest, ReportsExpectCallLocationForExhaustedActions) {
   MockB b;
   std::string expect_call_location = FormatFileLocation(__FILE__, __LINE__ + 1);
   EXPECT_CALL(b, DoB()).Times(AnyNumber()).WillOnce(Return(1));
@@ -1060,7 +1065,7 @@ TEST(UnexpectedCallTest, UnmatchedArguments) {
 
 // Tests that Google Mock explains that an expectation with
 // unsatisfied pre-requisites doesn't match the call.
-TEST(UnexpectedCallTest, UnsatisifiedPrerequisites) {
+TEST(UnexpectedCallTest, UnsatisfiedPrerequisites) {
   Sequence s1, s2;
   MockB b;
   EXPECT_CALL(b, DoB(1)).InSequence(s1);
@@ -1083,16 +1088,7 @@ TEST(UnexpectedCallTest, UnsatisifiedPrerequisites) {
 
   // Verifies that the failure message contains the two unsatisfied
   // pre-requisites but not the satisfied one.
-#if GTEST_USES_PCRE
-  EXPECT_THAT(
-      r.message(),
-      ContainsRegex(
-          // PCRE has trouble using (.|\n) to match any character, but
-          // supports the (?s) prefix for using . to match any character.
-          "(?s)the following immediate pre-requisites are not satisfied:\n"
-          ".*: pre-requisite #0\n"
-          ".*: pre-requisite #1"));
-#elif GTEST_USES_POSIX_RE
+#ifdef GTEST_USES_POSIX_RE
   EXPECT_THAT(r.message(),
               ContainsRegex(
                   // POSIX RE doesn't understand the (?s) prefix, but has no
@@ -1107,7 +1103,7 @@ TEST(UnexpectedCallTest, UnsatisifiedPrerequisites) {
                   "the following immediate pre-requisites are not satisfied:"));
   EXPECT_THAT(r.message(), ContainsRegex(": pre-requisite #0"));
   EXPECT_THAT(r.message(), ContainsRegex(": pre-requisite #1"));
-#endif  // GTEST_USES_PCRE
+#endif  // GTEST_USES_POSIX_RE
 
   b.DoB(1);
   b.DoB(3);
@@ -1144,10 +1140,11 @@ TEST(ExcessiveCallTest, DoesDefaultAction) {
   // When there is no ON_CALL(), the default value for the return type
   // should be returned.
   MockB b;
-  EXPECT_CALL(b, DoB(0)).Times(0);
+  EXPECT_CALL(b, DoB(0)).Description("DoB Method").Times(0);
   int n = -1;
-  EXPECT_NONFATAL_FAILURE(n = b.DoB(0),
-                          "Mock function called more times than expected");
+  EXPECT_NONFATAL_FAILURE(
+      n = b.DoB(0),
+      "Mock function \"DoB Method\" called more times than expected");
   EXPECT_EQ(0, n);
 }
 
@@ -1155,10 +1152,11 @@ TEST(ExcessiveCallTest, DoesDefaultAction) {
 // the failure message contains the argument values.
 TEST(ExcessiveCallTest, GeneratesFailureForVoidFunction) {
   MockA a;
-  EXPECT_CALL(a, DoA(_)).Times(0);
+  EXPECT_CALL(a, DoA(_)).Description("DoA Method").Times(0);
   EXPECT_NONFATAL_FAILURE(
       a.DoA(9),
-      "Mock function called more times than expected - returning directly.\n"
+      "Mock function \"DoA Method\" called more times than expected - "
+      "returning directly.\n"
       "    Function call: DoA(9)\n"
       "         Expected: to be never called\n"
       "           Actual: called once - over-saturated and active");
@@ -1772,16 +1770,11 @@ TEST(DeletingMockEarlyTest, Success2) {
 
 // Suppresses warning on unreferenced formal parameter in MSVC with
 // -W4.
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4100)
-#endif
+GTEST_DISABLE_MSC_WARNINGS_PUSH_(4100)
 
 ACTION_P(Delete, ptr) { delete ptr; }
 
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
+GTEST_DISABLE_MSC_WARNINGS_POP_()  // 4100
 
 TEST(DeletingMockEarlyTest, CanDeleteSelfInActionReturningVoid) {
   MockA* const a = new MockA;
@@ -1888,28 +1881,32 @@ struct Unprintable {
 
 class MockC {
  public:
-  MockC() {}
+  MockC() = default;
 
   MOCK_METHOD6(VoidMethod, void(bool cond, int n, std::string s, void* p,
                                 const Printable& x, Unprintable y));
   MOCK_METHOD0(NonVoidMethod, int());  // NOLINT
 
  private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(MockC);
+  MockC(const MockC&) = delete;
+  MockC& operator=(const MockC&) = delete;
 };
 
 class VerboseFlagPreservingFixture : public testing::Test {
  protected:
-  VerboseFlagPreservingFixture() : saved_verbose_flag_(GMOCK_FLAG(verbose)) {}
+  VerboseFlagPreservingFixture()
+      : saved_verbose_flag_(GMOCK_FLAG_GET(verbose)) {}
 
   ~VerboseFlagPreservingFixture() override {
-    GMOCK_FLAG(verbose) = saved_verbose_flag_;
+    GMOCK_FLAG_SET(verbose, saved_verbose_flag_);
   }
 
  private:
   const std::string saved_verbose_flag_;
 
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(VerboseFlagPreservingFixture);
+  VerboseFlagPreservingFixture(const VerboseFlagPreservingFixture&) = delete;
+  VerboseFlagPreservingFixture& operator=(const VerboseFlagPreservingFixture&) =
+      delete;
 };
 
 #if GTEST_HAS_STREAM_REDIRECTION
@@ -1919,7 +1916,7 @@ class VerboseFlagPreservingFixture : public testing::Test {
 // --gmock_verbose=warning is specified.
 TEST(FunctionCallMessageTest,
      UninterestingCallOnNaggyMockGeneratesNoStackTraceWhenVerboseWarning) {
-  GMOCK_FLAG(verbose) = kWarningVerbosity;
+  GMOCK_FLAG_SET(verbose, kWarningVerbosity);
   NaggyMock<MockC> c;
   CaptureStdout();
   c.VoidMethod(false, 5, "Hi", nullptr, Printable(), Unprintable());
@@ -1933,7 +1930,7 @@ TEST(FunctionCallMessageTest,
 // --gmock_verbose=info is specified.
 TEST(FunctionCallMessageTest,
      UninterestingCallOnNaggyMockGeneratesFyiWithStackTraceWhenVerboseInfo) {
-  GMOCK_FLAG(verbose) = kInfoVerbosity;
+  GMOCK_FLAG_SET(verbose, kInfoVerbosity);
   NaggyMock<MockC> c;
   CaptureStdout();
   c.VoidMethod(false, 5, "Hi", nullptr, Printable(), Unprintable());
@@ -2051,9 +2048,9 @@ class GMockVerboseFlagTest : public VerboseFlagPreservingFixture {
         "call should not happen.  Do not suppress it by blindly adding "
         "an EXPECT_CALL() if you don't mean to enforce the call.  "
         "See "
-        "https://github.com/google/googletest/blob/master/docs/"
+        "https://github.com/google/googletest/blob/main/docs/"
         "gmock_cook_book.md#"
-        "knowing-when-to-expect for details.";
+        "knowing-when-to-expect-useoncall for details.";
 
     // A void-returning function.
     CaptureStdout();
@@ -2081,7 +2078,7 @@ class GMockVerboseFlagTest : public VerboseFlagPreservingFixture {
 // Tests that --gmock_verbose=info causes both expected and
 // uninteresting calls to be reported.
 TEST_F(GMockVerboseFlagTest, Info) {
-  GMOCK_FLAG(verbose) = kInfoVerbosity;
+  GMOCK_FLAG_SET(verbose, kInfoVerbosity);
   TestExpectedCall(true);
   TestUninterestingCallOnNaggyMock(true);
 }
@@ -2089,7 +2086,7 @@ TEST_F(GMockVerboseFlagTest, Info) {
 // Tests that --gmock_verbose=warning causes uninteresting calls to be
 // reported.
 TEST_F(GMockVerboseFlagTest, Warning) {
-  GMOCK_FLAG(verbose) = kWarningVerbosity;
+  GMOCK_FLAG_SET(verbose, kWarningVerbosity);
   TestExpectedCall(false);
   TestUninterestingCallOnNaggyMock(true);
 }
@@ -2097,7 +2094,7 @@ TEST_F(GMockVerboseFlagTest, Warning) {
 // Tests that --gmock_verbose=warning causes neither expected nor
 // uninteresting calls to be reported.
 TEST_F(GMockVerboseFlagTest, Error) {
-  GMOCK_FLAG(verbose) = kErrorVerbosity;
+  GMOCK_FLAG_SET(verbose, kErrorVerbosity);
   TestExpectedCall(false);
   TestUninterestingCallOnNaggyMock(false);
 }
@@ -2105,7 +2102,7 @@ TEST_F(GMockVerboseFlagTest, Error) {
 // Tests that --gmock_verbose=SOME_INVALID_VALUE has the same effect
 // as --gmock_verbose=warning.
 TEST_F(GMockVerboseFlagTest, InvalidFlagIsTreatedAsWarning) {
-  GMOCK_FLAG(verbose) = "invalid";  // Treated as "warning".
+  GMOCK_FLAG_SET(verbose, "invalid");  // Treated as "warning".
   TestExpectedCall(false);
   TestUninterestingCallOnNaggyMock(true);
 }
@@ -2124,12 +2121,13 @@ void PrintTo(PrintMeNot /* dummy */, ::std::ostream* /* os */) {
 
 class LogTestHelper {
  public:
-  LogTestHelper() {}
+  LogTestHelper() = default;
 
   MOCK_METHOD1(Foo, PrintMeNot(PrintMeNot));
 
  private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(LogTestHelper);
+  LogTestHelper(const LogTestHelper&) = delete;
+  LogTestHelper& operator=(const LogTestHelper&) = delete;
 };
 
 class GMockLogTest : public VerboseFlagPreservingFixture {
@@ -2138,19 +2136,19 @@ class GMockLogTest : public VerboseFlagPreservingFixture {
 };
 
 TEST_F(GMockLogTest, DoesNotPrintGoodCallInternallyIfVerbosityIsWarning) {
-  GMOCK_FLAG(verbose) = kWarningVerbosity;
+  GMOCK_FLAG_SET(verbose, kWarningVerbosity);
   EXPECT_CALL(helper_, Foo(_)).WillOnce(Return(PrintMeNot()));
   helper_.Foo(PrintMeNot());  // This is an expected call.
 }
 
 TEST_F(GMockLogTest, DoesNotPrintGoodCallInternallyIfVerbosityIsError) {
-  GMOCK_FLAG(verbose) = kErrorVerbosity;
+  GMOCK_FLAG_SET(verbose, kErrorVerbosity);
   EXPECT_CALL(helper_, Foo(_)).WillOnce(Return(PrintMeNot()));
   helper_.Foo(PrintMeNot());  // This is an expected call.
 }
 
 TEST_F(GMockLogTest, DoesNotPrintWarningInternallyIfVerbosityIsError) {
-  GMOCK_FLAG(verbose) = kErrorVerbosity;
+  GMOCK_FLAG_SET(verbose, kErrorVerbosity);
   ON_CALL(helper_, Foo(_)).WillByDefault(Return(PrintMeNot()));
   helper_.Foo(PrintMeNot());  // This should generate a warning.
 }
@@ -2588,20 +2586,14 @@ TEST(ParameterlessExpectationsTest,
 }
 
 }  // namespace
+}  // namespace testing
 
-// Allows the user to define their own main and then invoke gmock_main
-// from it. This might be necessary on some platforms which require
-// specific setup and teardown.
-#if GMOCK_RENAME_MAIN
-int gmock_main(int argc, char** argv) {
-#else
 int main(int argc, char** argv) {
-#endif  // GMOCK_RENAME_MAIN
   testing::InitGoogleMock(&argc, argv);
   // Ensures that the tests pass no matter what value of
   // --gmock_catch_leaked_mocks and --gmock_verbose the user specifies.
-  testing::GMOCK_FLAG(catch_leaked_mocks) = true;
-  testing::GMOCK_FLAG(verbose) = testing::internal::kWarningVerbosity;
+  GMOCK_FLAG_SET(catch_leaked_mocks, true);
+  GMOCK_FLAG_SET(verbose, testing::internal::kWarningVerbosity);
 
   return RUN_ALL_TESTS();
 }
diff --git a/external/googletest/googlemock/test/gmock_all_test.cc b/external/googletest/googlemock/test/gmock_all_test.cc
index fffbb8b6..6db0086b 100644
--- a/external/googletest/googlemock/test/gmock_all_test.cc
+++ b/external/googletest/googlemock/test/gmock_all_test.cc
@@ -38,7 +38,10 @@
 #include "test/gmock-actions_test.cc"
 #include "test/gmock-cardinalities_test.cc"
 #include "test/gmock-internal-utils_test.cc"
-#include "test/gmock-matchers_test.cc"
+#include "test/gmock-matchers-arithmetic_test.cc"
+#include "test/gmock-matchers-comparisons_test.cc"
+#include "test/gmock-matchers-containers_test.cc"
+#include "test/gmock-matchers-misc_test.cc"
 #include "test/gmock-more-actions_test.cc"
 #include "test/gmock-nice-strict_test.cc"
 #include "test/gmock-port_test.cc"
diff --git a/external/googletest/googlemock/test/gmock_ex_test.cc b/external/googletest/googlemock/test/gmock_ex_test.cc
index 44e5e35f..e174122d 100644
--- a/external/googletest/googlemock/test/gmock_ex_test.cc
+++ b/external/googletest/googlemock/test/gmock_ex_test.cc
@@ -29,6 +29,8 @@
 
 // Tests Google Mock's functionality that depends on exceptions.
 
+#include <exception>
+
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
diff --git a/external/googletest/googlemock/test/gmock_leak_test.py b/external/googletest/googlemock/test/gmock_leak_test.py
old mode 100644
new mode 100755
index 05e71aa7..8b02bc46
--- a/external/googletest/googlemock/test/gmock_leak_test.py
+++ b/external/googletest/googlemock/test/gmock_leak_test.py
@@ -31,7 +31,7 @@
 
 """Tests that leaked mock objects can be caught be Google Mock."""
 
-import gmock_test_utils
+from googlemock.test import gmock_test_utils
 
 PROGRAM_PATH = gmock_test_utils.GetTestExecutablePath('gmock_leak_test_')
 TEST_WITH_EXPECT_CALL = [PROGRAM_PATH, '--gtest_filter=*ExpectCall*']
@@ -51,54 +51,63 @@
 
 class GMockLeakTest(gmock_test_utils.TestCase):
 
-    def testCatchesLeakedMockByDefault(self):
-        self.assertNotEqual(
-            0,
-            gmock_test_utils.Subprocess(TEST_WITH_EXPECT_CALL,
-                                        env=environ).exit_code)
-        self.assertNotEqual(
-            0,
-            gmock_test_utils.Subprocess(TEST_WITH_ON_CALL,
-                                        env=environ).exit_code)
+  def testCatchesLeakedMockByDefault(self):
+    self.assertNotEqual(
+        0,
+        gmock_test_utils.Subprocess(
+            TEST_WITH_EXPECT_CALL, env=environ
+        ).exit_code,
+    )
+    self.assertNotEqual(
+        0, gmock_test_utils.Subprocess(TEST_WITH_ON_CALL, env=environ).exit_code
+    )
 
-    def testDoesNotCatchLeakedMockWhenDisabled(self):
-        self.assertEquals(
-            0,
-            gmock_test_utils.Subprocess(TEST_WITH_EXPECT_CALL +
-                                        ['--gmock_catch_leaked_mocks=0'],
-                                        env=environ).exit_code)
-        self.assertEquals(
-            0,
-            gmock_test_utils.Subprocess(TEST_WITH_ON_CALL +
-                                        ['--gmock_catch_leaked_mocks=0'],
-                                        env=environ).exit_code)
+  def testDoesNotCatchLeakedMockWhenDisabled(self):
+    self.assertEqual(
+        0,
+        gmock_test_utils.Subprocess(
+            TEST_WITH_EXPECT_CALL + ['--gmock_catch_leaked_mocks=0'],
+            env=environ,
+        ).exit_code,
+    )
+    self.assertEqual(
+        0,
+        gmock_test_utils.Subprocess(
+            TEST_WITH_ON_CALL + ['--gmock_catch_leaked_mocks=0'], env=environ
+        ).exit_code,
+    )
 
-    def testCatchesLeakedMockWhenEnabled(self):
-        self.assertNotEqual(
-            0,
-            gmock_test_utils.Subprocess(TEST_WITH_EXPECT_CALL +
-                                        ['--gmock_catch_leaked_mocks'],
-                                        env=environ).exit_code)
-        self.assertNotEqual(
-            0,
-            gmock_test_utils.Subprocess(TEST_WITH_ON_CALL +
-                                        ['--gmock_catch_leaked_mocks'],
-                                        env=environ).exit_code)
+  def testCatchesLeakedMockWhenEnabled(self):
+    self.assertNotEqual(
+        0,
+        gmock_test_utils.Subprocess(
+            TEST_WITH_EXPECT_CALL + ['--gmock_catch_leaked_mocks'], env=environ
+        ).exit_code,
+    )
+    self.assertNotEqual(
+        0,
+        gmock_test_utils.Subprocess(
+            TEST_WITH_ON_CALL + ['--gmock_catch_leaked_mocks'], env=environ
+        ).exit_code,
+    )
 
-    def testCatchesLeakedMockWhenEnabledWithExplictFlagValue(self):
-        self.assertNotEqual(
-            0,
-            gmock_test_utils.Subprocess(TEST_WITH_EXPECT_CALL +
-                                        ['--gmock_catch_leaked_mocks=1'],
-                                        env=environ).exit_code)
+  def testCatchesLeakedMockWhenEnabledWithExplictFlagValue(self):
+    self.assertNotEqual(
+        0,
+        gmock_test_utils.Subprocess(
+            TEST_WITH_EXPECT_CALL + ['--gmock_catch_leaked_mocks=1'],
+            env=environ,
+        ).exit_code,
+    )
 
-    def testCatchesMultipleLeakedMocks(self):
-        self.assertNotEqual(
-            0,
-            gmock_test_utils.Subprocess(TEST_MULTIPLE_LEAKS +
-                                        ['--gmock_catch_leaked_mocks'],
-                                        env=environ).exit_code)
+  def testCatchesMultipleLeakedMocks(self):
+    self.assertNotEqual(
+        0,
+        gmock_test_utils.Subprocess(
+            TEST_MULTIPLE_LEAKS + ['--gmock_catch_leaked_mocks'], env=environ
+        ).exit_code,
+    )
 
 
 if __name__ == '__main__':
-    gmock_test_utils.Main()
+  gmock_test_utils.Main()
diff --git a/external/googletest/googlemock/test/gmock_leak_test_.cc b/external/googletest/googlemock/test/gmock_leak_test_.cc
index ad6f6d6b..a6bb3392 100644
--- a/external/googletest/googlemock/test/gmock_leak_test_.cc
+++ b/external/googletest/googlemock/test/gmock_leak_test_.cc
@@ -40,18 +40,19 @@ using ::testing::Return;
 
 class FooInterface {
  public:
-  virtual ~FooInterface() {}
+  virtual ~FooInterface() = default;
   virtual void DoThis() = 0;
 };
 
 class MockFoo : public FooInterface {
  public:
-  MockFoo() {}
+  MockFoo() = default;
 
   MOCK_METHOD0(DoThis, void());
 
  private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(MockFoo);
+  MockFoo(const MockFoo&) = delete;
+  MockFoo& operator=(const MockFoo&) = delete;
 };
 
 TEST(LeakTest, LeakedMockWithExpectCallCausesFailureWhenLeakCheckingIsEnabled) {
diff --git a/external/googletest/googlemock/test/gmock_link_test.h b/external/googletest/googlemock/test/gmock_link_test.h
index dc9bd859..cb5179b2 100644
--- a/external/googletest/googlemock/test/gmock_link_test.h
+++ b/external/googletest/googlemock/test/gmock_link_test.h
@@ -116,7 +116,7 @@
 
 #include "gmock/gmock.h"
 
-#if !GTEST_OS_WINDOWS_MOBILE
+#ifndef GTEST_OS_WINDOWS_MOBILE
 #include <errno.h>
 #endif
 
@@ -181,11 +181,12 @@ using testing::WithArg;
 using testing::WithArgs;
 using testing::WithoutArgs;
 
-#if !GTEST_OS_WINDOWS_MOBILE
+#ifndef GTEST_OS_WINDOWS_MOBILE
 using testing::SetErrnoAndReturn;
 #endif
 
 #if GTEST_HAS_EXCEPTIONS
+using testing::Rethrow;
 using testing::Throw;
 #endif
 
@@ -194,7 +195,7 @@ using testing::MatchesRegex;
 
 class Interface {
  public:
-  virtual ~Interface() {}
+  virtual ~Interface() = default;
   virtual void VoidFromString(char* str) = 0;
   virtual char* StringFromString(char* str) = 0;
   virtual int IntFromString(char* str) = 0;
@@ -208,7 +209,7 @@ class Interface {
 
 class Mock : public Interface {
  public:
-  Mock() {}
+  Mock() = default;
 
   MOCK_METHOD1(VoidFromString, void(char* str));
   MOCK_METHOD1(StringFromString, char*(char* str));
@@ -221,7 +222,8 @@ class Mock : public Interface {
   MOCK_METHOD1(VoidFromVector, void(const std::vector<int>& v));
 
  private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(Mock);
+  Mock(const Mock&) = delete;
+  Mock& operator=(const Mock&) = delete;
 };
 
 class InvokeHelper {
@@ -305,7 +307,7 @@ TEST(LinkTest, TestSetArrayArgument) {
   mock.VoidFromString(&ch);
 }
 
-#if !GTEST_OS_WINDOWS_MOBILE
+#ifndef GTEST_OS_WINDOWS_MOBILE
 
 // Tests the linkage of the SetErrnoAndReturn action.
 TEST(LinkTest, TestSetErrnoAndReturn) {
@@ -415,6 +417,14 @@ TEST(LinkTest, TestThrow) {
   EXPECT_CALL(mock, VoidFromString(_)).WillOnce(Throw(42));
   EXPECT_THROW(mock.VoidFromString(nullptr), int);
 }
+// Tests the linkage of the Rethrow action.
+TEST(LinkTest, TestRethrow) {
+  Mock mock;
+
+  EXPECT_CALL(mock, VoidFromString(_))
+      .WillOnce(Rethrow(std::make_exception_ptr(42)));
+  EXPECT_THROW(mock.VoidFromString(nullptr), int);
+}
 #endif  // GTEST_HAS_EXCEPTIONS
 
 // The ACTION*() macros trigger warning C4100 (unreferenced formal
@@ -422,10 +432,7 @@ TEST(LinkTest, TestThrow) {
 // the macro definition, as the warnings are generated when the macro
 // is expanded and macro expansion cannot contain #pragma.  Therefore
 // we suppress them here.
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4100)
-#endif
+GTEST_DISABLE_MSC_WARNINGS_PUSH_(4100)
 
 // Tests the linkage of actions created using ACTION macro.
 namespace {
@@ -458,9 +465,7 @@ ACTION_P2(ReturnEqualsEitherOf, first, second) {
 }
 }  // namespace
 
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
+GTEST_DISABLE_MSC_WARNINGS_POP_()  // 4100
 
 TEST(LinkTest, TestActionP2Macro) {
   Mock mock;
diff --git a/external/googletest/googlemock/test/gmock_output_test.py b/external/googletest/googlemock/test/gmock_output_test.py
old mode 100644
new mode 100755
index 6e37517d..7c24d683
--- a/external/googletest/googlemock/test/gmock_output_test.py
+++ b/external/googletest/googlemock/test/gmock_output_test.py
@@ -43,7 +43,8 @@
 import os
 import re
 import sys
-import gmock_test_utils
+from googlemock.test import gmock_test_utils
+
 
 # The flag for generating the golden file
 GENGOLDEN_FLAG = '--gengolden'
@@ -55,128 +56,135 @@
 
 
 def ToUnixLineEnding(s):
-    """Changes all Windows/Mac line endings in s to UNIX line endings."""
+  """Changes all Windows/Mac line endings in s to UNIX line endings."""
 
-    return s.replace('\r\n', '\n').replace('\r', '\n')
+  return s.replace('\r\n', '\n').replace('\r', '\n')
 
 
 def RemoveReportHeaderAndFooter(output):
-    """Removes Google Test result report's header and footer from the output."""
+  """Removes Google Test result report's header and footer from the output."""
 
-    output = re.sub(r'.*gtest_main.*\n', '', output)
-    output = re.sub(r'\[.*\d+ tests.*\n', '', output)
-    output = re.sub(r'\[.* test environment .*\n', '', output)
-    output = re.sub(r'\[=+\] \d+ tests .* ran.*', '', output)
-    output = re.sub(r'.* FAILED TESTS\n', '', output)
-    return output
+  output = re.sub(r'.*gtest_main.*\n', '', output)
+  output = re.sub(r'\[.*\d+ tests.*\n', '', output)
+  output = re.sub(r'\[.* test environment .*\n', '', output)
+  output = re.sub(r'\[=+\] \d+ tests .* ran.*', '', output)
+  output = re.sub(r'.* FAILED TESTS\n', '', output)
+  return output
 
 
 def RemoveLocations(output):
-    """Removes all file location info from a Google Test program's output.
+  """Removes all file location info from a Google Test program's output.
 
-    Args:
-         output:  the output of a Google Test program.
+  Args:
+       output:  the output of a Google Test program.
 
-    Returns:
-         output with all file location info (in the form of
-         'DIRECTORY/FILE_NAME:LINE_NUMBER: 'or
-         'DIRECTORY\\FILE_NAME(LINE_NUMBER): ') replaced by
-         'FILE:#: '.
-    """
+  Returns:
+       output with all file location info (in the form of
+       'DIRECTORY/FILE_NAME:LINE_NUMBER: 'or
+       'DIRECTORY\\FILE_NAME(LINE_NUMBER): ') replaced by
+       'FILE:#: '.
+  """
 
-    return re.sub(r'.*[/\\](.+)(\:\d+|\(\d+\))\:', 'FILE:#:', output)
+  return re.sub(r'.*[/\\](.+)(\:\d+|\(\d+\))\:', 'FILE:#:', output)
 
 
 def NormalizeErrorMarker(output):
-    """Normalizes the error marker, which is different on Windows vs on Linux."""
+  """Normalizes the error marker, which is different on Windows vs on Linux."""
 
-    return re.sub(r' error: ', ' Failure\n', output)
+  return re.sub(r' error: ', ' Failure\n', output)
 
 
 def RemoveMemoryAddresses(output):
-    """Removes memory addresses from the test output."""
+  """Removes memory addresses from the test output."""
 
-    return re.sub(r'@\w+', '@0x#', output)
+  return re.sub(r'@\w+', '@0x#', output)
 
 
 def RemoveTestNamesOfLeakedMocks(output):
-    """Removes the test names of leaked mock objects from the test output."""
+  """Removes the test names of leaked mock objects from the test output."""
 
-    return re.sub(r'\(used in test .+\) ', '', output)
+  return re.sub(r'\(used in test .+\) ', '', output)
 
 
 def GetLeakyTests(output):
-    """Returns a list of test names that leak mock objects."""
+  """Returns a list of test names that leak mock objects."""
 
-    # findall() returns a list of all matches of the regex in output.
-    # For example, if '(used in test FooTest.Bar)' is in output, the
-    # list will contain 'FooTest.Bar'.
-    return re.findall(r'\(used in test (.+)\)', output)
+  # findall() returns a list of all matches of the regex in output.
+  # For example, if '(used in test FooTest.Bar)' is in output, the
+  # list will contain 'FooTest.Bar'.
+  return re.findall(r'\(used in test (.+)\)', output)
 
 
 def GetNormalizedOutputAndLeakyTests(output):
-    """Normalizes the output of gmock_output_test_.
+  """Normalizes the output of gmock_output_test_.
 
-    Args:
-      output: The test output.
+  Args:
+    output: The test output.
 
-    Returns:
-      A tuple (the normalized test output, the list of test names that have
-      leaked mocks).
-    """
+  Returns:
+    A tuple (the normalized test output, the list of test names that have
+    leaked mocks).
+  """
 
-    output = ToUnixLineEnding(output)
-    output = RemoveReportHeaderAndFooter(output)
-    output = NormalizeErrorMarker(output)
-    output = RemoveLocations(output)
-    output = RemoveMemoryAddresses(output)
-    return (RemoveTestNamesOfLeakedMocks(output), GetLeakyTests(output))
+  output = ToUnixLineEnding(output)
+  output = RemoveReportHeaderAndFooter(output)
+  output = NormalizeErrorMarker(output)
+  output = RemoveLocations(output)
+  output = RemoveMemoryAddresses(output)
+  return (RemoveTestNamesOfLeakedMocks(output), GetLeakyTests(output))
 
 
 def GetShellCommandOutput(cmd):
-    """Runs a command in a sub-process, and returns its STDOUT in a string."""
+  """Runs a command in a sub-process, and returns its STDOUT in a string."""
 
-    return gmock_test_utils.Subprocess(cmd, capture_stderr=False).output
+  return gmock_test_utils.Subprocess(cmd, capture_stderr=False).output
 
 
 def GetNormalizedCommandOutputAndLeakyTests(cmd):
-    """Runs a command and returns its normalized output and a list of leaky tests.
+  """Runs a command and returns its normalized output and a list of leaky tests.
 
-    Args:
-      cmd:  the shell command.
-    """
+  Args:
+    cmd:  the shell command.
+  """
 
-    # Disables exception pop-ups on Windows.
-    os.environ['GTEST_CATCH_EXCEPTIONS'] = '1'
-    return GetNormalizedOutputAndLeakyTests(GetShellCommandOutput(cmd))
+  # Disables exception pop-ups on Windows.
+  os.environ['GTEST_CATCH_EXCEPTIONS'] = '1'
+  return GetNormalizedOutputAndLeakyTests(GetShellCommandOutput(cmd))
 
 
 class GMockOutputTest(gmock_test_utils.TestCase):
 
-    def testOutput(self):
-        (output, leaky_tests) = GetNormalizedCommandOutputAndLeakyTests(COMMAND)
-        golden_file = open(GOLDEN_PATH, 'rb')
-        golden = golden_file.read().decode('utf-8')
-        golden_file.close()
-
-        # The normalized output should match the golden file.
-        self.assertEquals(golden, output)
-
-        # The raw output should contain 2 leaked mock object errors for
-        # test GMockOutputTest.CatchesLeakedMocks.
-        self.assertEquals(['GMockOutputTest.CatchesLeakedMocks',
-                           'GMockOutputTest.CatchesLeakedMocks'],
-                          leaky_tests)
+  def testOutput(self):
+    (output, leaky_tests) = GetNormalizedCommandOutputAndLeakyTests(COMMAND)
+    golden_file = open(GOLDEN_PATH, 'rb')
+    golden = golden_file.read().decode('utf-8')
+    golden_file.close()
+    # On Windows the repository might have been checked out with \r\n line
+    # endings, so normalize it here.
+    golden = ToUnixLineEnding(golden)
+
+    # The normalized output should match the golden file.
+    self.assertEqual(golden, output)
+
+    # The raw output should contain 2 leaked mock object errors for
+    # test GMockOutputTest.CatchesLeakedMocks.
+    self.assertEqual(
+        [
+            'GMockOutputTest.CatchesLeakedMocks',
+            'GMockOutputTest.CatchesLeakedMocks',
+        ],
+        leaky_tests,
+    )
 
 
 if __name__ == '__main__':
-    if sys.argv[1:] == [GENGOLDEN_FLAG]:
-        (output, _) = GetNormalizedCommandOutputAndLeakyTests(COMMAND)
-        golden_file = open(GOLDEN_PATH, 'wb')
-        golden_file.write(output)
-        golden_file.close()
-        # Suppress the error "googletest was imported but a call to its main()
-        # was never detected."
-        os._exit(0)
-    else:
-        gmock_test_utils.Main()
+  if sys.argv[1:] == [GENGOLDEN_FLAG]:
+    (output, _) = GetNormalizedCommandOutputAndLeakyTests(COMMAND)
+    golden_file = open(GOLDEN_PATH, 'wb')
+    golden_file.write(output)
+    golden_file.close()
+    # Suppress the error "googletest was imported but a call to its main()
+    # was never detected."
+    os._exit(0)
+  else:
+    gmock_test_utils.Main()
diff --git a/external/googletest/googlemock/test/gmock_output_test_.cc b/external/googletest/googlemock/test/gmock_output_test_.cc
index 0f641b74..03d84213 100644
--- a/external/googletest/googlemock/test/gmock_output_test_.cc
+++ b/external/googletest/googlemock/test/gmock_output_test_.cc
@@ -38,10 +38,7 @@
 #include "gtest/gtest.h"
 
 // Silence C4100 (unreferenced formal parameter)
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4100)
-#endif
+GTEST_DISABLE_MSC_WARNINGS_PUSH_(4100)
 
 using testing::_;
 using testing::AnyNumber;
@@ -55,14 +52,15 @@ using testing::Value;
 
 class MockFoo {
  public:
-  MockFoo() {}
+  MockFoo() = default;
 
   MOCK_METHOD3(Bar, char(const std::string& s, int i, double x));
   MOCK_METHOD2(Bar2, bool(int x, int y));
   MOCK_METHOD2(Bar3, void(int x, int y));
 
  private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(MockFoo);
+  MockFoo(const MockFoo&) = delete;
+  MockFoo& operator=(const MockFoo&) = delete;
 };
 
 class GMockOutputTest : public testing::Test {
@@ -71,21 +69,21 @@ class GMockOutputTest : public testing::Test {
 };
 
 TEST_F(GMockOutputTest, ExpectedCall) {
-  testing::GMOCK_FLAG(verbose) = "info";
+  GMOCK_FLAG_SET(verbose, "info");
 
   EXPECT_CALL(foo_, Bar2(0, _));
   foo_.Bar2(0, 0);  // Expected call
 
-  testing::GMOCK_FLAG(verbose) = "warning";
+  GMOCK_FLAG_SET(verbose, "warning");
 }
 
 TEST_F(GMockOutputTest, ExpectedCallToVoidFunction) {
-  testing::GMOCK_FLAG(verbose) = "info";
+  GMOCK_FLAG_SET(verbose, "info");
 
   EXPECT_CALL(foo_, Bar3(0, _));
   foo_.Bar3(0, 0);  // Expected call
 
-  testing::GMOCK_FLAG(verbose) = "warning";
+  GMOCK_FLAG_SET(verbose, "warning");
 }
 
 TEST_F(GMockOutputTest, ExplicitActionsRunOut) {
@@ -278,13 +276,11 @@ int main(int argc, char** argv) {
   testing::InitGoogleMock(&argc, argv);
   // Ensures that the tests pass no matter what value of
   // --gmock_catch_leaked_mocks and --gmock_verbose the user specifies.
-  testing::GMOCK_FLAG(catch_leaked_mocks) = true;
-  testing::GMOCK_FLAG(verbose) = "warning";
+  GMOCK_FLAG_SET(catch_leaked_mocks, true);
+  GMOCK_FLAG_SET(verbose, "warning");
 
   TestCatchesLeakedMocksInAdHocTests();
   return RUN_ALL_TESTS();
 }
 
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
+GTEST_DISABLE_MSC_WARNINGS_POP_()  // 4100
diff --git a/external/googletest/googlemock/test/gmock_output_test_golden.txt b/external/googletest/googlemock/test/gmock_output_test_golden.txt
index 4846c124..ca88af02 100644
--- a/external/googletest/googlemock/test/gmock_output_test_golden.txt
+++ b/external/googletest/googlemock/test/gmock_output_test_golden.txt
@@ -40,6 +40,7 @@ FILE:#: EXPECT_CALL(foo_, Bar2(0, _))...
            Actual: 1
          Expected: to be called once
            Actual: never called - unsatisfied and active
+
 [  FAILED  ] GMockOutputTest.UnexpectedCall
 [ RUN      ] GMockOutputTest.UnexpectedCallToVoidFunction
 unknown file: Failure
@@ -53,6 +54,7 @@ FILE:#: EXPECT_CALL(foo_, Bar3(0, _))...
            Actual: 1
          Expected: to be called once
            Actual: never called - unsatisfied and active
+
 [  FAILED  ] GMockOutputTest.UnexpectedCallToVoidFunction
 [ RUN      ] GMockOutputTest.ExcessiveCall
 FILE:#: Failure
@@ -61,6 +63,7 @@ Mock function called more times than expected - returning default value.
           Returns: false
          Expected: to be called once
            Actual: called twice - over-saturated and active
+
 [  FAILED  ] GMockOutputTest.ExcessiveCall
 [ RUN      ] GMockOutputTest.ExcessiveCallToVoidFunction
 FILE:#: Failure
@@ -68,6 +71,7 @@ Mock function called more times than expected - returning directly.
     Function call: Bar3(0, 1)
          Expected: to be called once
            Actual: called twice - over-saturated and active
+
 [  FAILED  ] GMockOutputTest.ExcessiveCallToVoidFunction
 [ RUN      ] GMockOutputTest.UninterestingCall
 
@@ -75,14 +79,14 @@ GMOCK WARNING:
 Uninteresting mock function call - returning default value.
     Function call: Bar2(0, 1)
           Returns: false
-NOTE: You can safely ignore the above warning unless this call should not happen.  Do not suppress it by blindly adding an EXPECT_CALL() if you don't mean to enforce the call.  See https://github.com/google/googletest/blob/master/docs/gmock_cook_book.md#knowing-when-to-expect for details.
+NOTE: You can safely ignore the above warning unless this call should not happen.  Do not suppress it by blindly adding an EXPECT_CALL() if you don't mean to enforce the call.  See https://github.com/google/googletest/blob/main/docs/gmock_cook_book.md#knowing-when-to-expect-useoncall for details.
 [       OK ] GMockOutputTest.UninterestingCall
 [ RUN      ] GMockOutputTest.UninterestingCallToVoidFunction
 
 GMOCK WARNING:
 Uninteresting mock function call - returning directly.
     Function call: Bar3(0, 1)
-NOTE: You can safely ignore the above warning unless this call should not happen.  Do not suppress it by blindly adding an EXPECT_CALL() if you don't mean to enforce the call.  See https://github.com/google/googletest/blob/master/docs/gmock_cook_book.md#knowing-when-to-expect for details.
+NOTE: You can safely ignore the above warning unless this call should not happen.  Do not suppress it by blindly adding an EXPECT_CALL() if you don't mean to enforce the call.  See https://github.com/google/googletest/blob/main/docs/gmock_cook_book.md#knowing-when-to-expect-useoncall for details.
 [       OK ] GMockOutputTest.UninterestingCallToVoidFunction
 [ RUN      ] GMockOutputTest.RetiredExpectation
 unknown file: Failure
@@ -104,6 +108,7 @@ FILE:#: tried expectation #1: EXPECT_CALL(foo_, Bar2(0, 0))...
            Actual: 1
          Expected: to be called once
            Actual: never called - unsatisfied and active
+
 [  FAILED  ] GMockOutputTest.RetiredExpectation
 [ RUN      ] GMockOutputTest.UnsatisfiedPrerequisite
 unknown file: Failure
@@ -125,6 +130,7 @@ FILE:#: pre-requisite #0
                    (end of pre-requisites)
          Expected: to be called once
            Actual: never called - unsatisfied and active
+
 [  FAILED  ] GMockOutputTest.UnsatisfiedPrerequisite
 [ RUN      ] GMockOutputTest.UnsatisfiedPrerequisites
 unknown file: Failure
@@ -147,6 +153,7 @@ FILE:#: pre-requisite #1
                    (end of pre-requisites)
          Expected: to be called once
            Actual: never called - unsatisfied and active
+
 [  FAILED  ] GMockOutputTest.UnsatisfiedPrerequisites
 [ RUN      ] GMockOutputTest.UnsatisfiedWith
 FILE:#: Failure
@@ -154,16 +161,19 @@ Actual function call count doesn't match EXPECT_CALL(foo_, Bar2(_, _))...
     Expected args: are a pair where the first >= the second
          Expected: to be called once
            Actual: never called - unsatisfied and active
+
 [  FAILED  ] GMockOutputTest.UnsatisfiedWith
 [ RUN      ] GMockOutputTest.UnsatisfiedExpectation
 FILE:#: Failure
 Actual function call count doesn't match EXPECT_CALL(foo_, Bar2(0, _))...
          Expected: to be called twice
            Actual: called once - unsatisfied and active
+
 FILE:#: Failure
 Actual function call count doesn't match EXPECT_CALL(foo_, Bar(_, _, _))...
          Expected: to be called once
            Actual: never called - unsatisfied and active
+
 [  FAILED  ] GMockOutputTest.UnsatisfiedExpectation
 [ RUN      ] GMockOutputTest.MismatchArguments
 unknown file: Failure
@@ -180,6 +190,7 @@ FILE:#: EXPECT_CALL(foo_, Bar(Ref(s), _, Ge(0)))...
            Actual: -0.1
          Expected: to be called once
            Actual: never called - unsatisfied and active
+
 [  FAILED  ] GMockOutputTest.MismatchArguments
 [ RUN      ] GMockOutputTest.MismatchWith
 unknown file: Failure
@@ -194,6 +205,7 @@ FILE:#: EXPECT_CALL(foo_, Bar2(Ge(2), Ge(1)))...
            Actual: don't match
          Expected: to be called once
            Actual: never called - unsatisfied and active
+
 [  FAILED  ] GMockOutputTest.MismatchWith
 [ RUN      ] GMockOutputTest.MismatchArgumentsAndWith
 unknown file: Failure
@@ -210,6 +222,7 @@ FILE:#: EXPECT_CALL(foo_, Bar2(Ge(2), Ge(1)))...
            Actual: don't match
          Expected: to be called once
            Actual: never called - unsatisfied and active
+
 [  FAILED  ] GMockOutputTest.MismatchArgumentsAndWith
 [ RUN      ] GMockOutputTest.UnexpectedCallWithDefaultAction
 unknown file: Failure
@@ -227,6 +240,7 @@ FILE:#: EXPECT_CALL(foo_, Bar2(2, 2))...
            Actual: 0
          Expected: to be called once
            Actual: never called - unsatisfied and active
+
 unknown file: Failure
 
 Unexpected mock function call - taking default action specified at:
@@ -242,6 +256,7 @@ FILE:#: EXPECT_CALL(foo_, Bar2(2, 2))...
            Actual: 0
          Expected: to be called once
            Actual: never called - unsatisfied and active
+
 [  FAILED  ] GMockOutputTest.UnexpectedCallWithDefaultAction
 [ RUN      ] GMockOutputTest.ExcessiveCallWithDefaultAction
 FILE:#: Failure
@@ -251,6 +266,7 @@ FILE:#:
           Returns: true
          Expected: to be called once
            Actual: called twice - over-saturated and active
+
 FILE:#: Failure
 Mock function called more times than expected - taking default action specified at:
 FILE:#:
@@ -258,6 +274,7 @@ FILE:#:
           Returns: false
          Expected: to be called once
            Actual: called twice - over-saturated and active
+
 [  FAILED  ] GMockOutputTest.ExcessiveCallWithDefaultAction
 [ RUN      ] GMockOutputTest.UninterestingCallWithDefaultAction
 
@@ -266,14 +283,14 @@ Uninteresting mock function call - taking default action specified at:
 FILE:#:
     Function call: Bar2(2, 2)
           Returns: true
-NOTE: You can safely ignore the above warning unless this call should not happen.  Do not suppress it by blindly adding an EXPECT_CALL() if you don't mean to enforce the call.  See https://github.com/google/googletest/blob/master/docs/gmock_cook_book.md#knowing-when-to-expect for details.
+NOTE: You can safely ignore the above warning unless this call should not happen.  Do not suppress it by blindly adding an EXPECT_CALL() if you don't mean to enforce the call.  See https://github.com/google/googletest/blob/main/docs/gmock_cook_book.md#knowing-when-to-expect-useoncall for details.
 
 GMOCK WARNING:
 Uninteresting mock function call - taking default action specified at:
 FILE:#:
     Function call: Bar2(1, 1)
           Returns: false
-NOTE: You can safely ignore the above warning unless this call should not happen.  Do not suppress it by blindly adding an EXPECT_CALL() if you don't mean to enforce the call.  See https://github.com/google/googletest/blob/master/docs/gmock_cook_book.md#knowing-when-to-expect for details.
+NOTE: You can safely ignore the above warning unless this call should not happen.  Do not suppress it by blindly adding an EXPECT_CALL() if you don't mean to enforce the call.  See https://github.com/google/googletest/blob/main/docs/gmock_cook_book.md#knowing-when-to-expect-useoncall for details.
 [       OK ] GMockOutputTest.UninterestingCallWithDefaultAction
 [ RUN      ] GMockOutputTest.ExplicitActionsRunOutWithDefaultAction
 
@@ -291,8 +308,9 @@ Stack trace:
 [ RUN      ] GMockOutputTest.PrintsMatcher
 FILE:#: Failure
 Value of: (std::pair<int, bool>(42, true))
-Expected: is pair (is >= 48, true)
-  Actual: (42, true) (of type std::pair<int, bool>)
+Expected: is pair (first: is >= 48, second: true)
+  Actual: (42, true) (of type std::pair<int,bool>)
+
 [  FAILED  ] GMockOutputTest.PrintsMatcher
 [  FAILED  ] GMockOutputTest.UnexpectedCall
 [  FAILED  ] GMockOutputTest.UnexpectedCallToVoidFunction
diff --git a/external/googletest/googlemock/test/gmock_stress_test.cc b/external/googletest/googlemock/test/gmock_stress_test.cc
index 20725d69..9e42cd93 100644
--- a/external/googletest/googlemock/test/gmock_stress_test.cc
+++ b/external/googletest/googlemock/test/gmock_stress_test.cc
@@ -27,7 +27,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
 // Tests that Google Mock constructs can be used in a large number of
 // threads concurrently.
 
@@ -49,7 +48,7 @@ const int kRepeat = 50;
 
 class MockFoo {
  public:
-  MOCK_METHOD1(Bar, int(int n));  // NOLINT
+  MOCK_METHOD1(Bar, int(int n));                                   // NOLINT
   MOCK_METHOD2(Baz, char(const char* s1, const std::string& s2));  // NOLINT
 };
 
@@ -62,21 +61,16 @@ void JoinAndDelete(ThreadWithParam<T>* t) {
 
 struct Dummy {};
 
-
 // Tests that different mock objects can be used in their respective
 // threads.  This should generate no Google Test failure.
 void TestConcurrentMockObjects(Dummy /* dummy */) {
   // Creates a mock and does some typical operations on it.
   MockFoo foo;
-  ON_CALL(foo, Bar(_))
-      .WillByDefault(Return(1));
-  ON_CALL(foo, Baz(_, _))
-      .WillByDefault(Return('b'));
-  ON_CALL(foo, Baz(_, "you"))
-      .WillByDefault(Return('a'));
-
-  EXPECT_CALL(foo, Bar(0))
-      .Times(AtMost(3));
+  ON_CALL(foo, Bar(_)).WillByDefault(Return(1));
+  ON_CALL(foo, Baz(_, _)).WillByDefault(Return('b'));
+  ON_CALL(foo, Baz(_, "you")).WillByDefault(Return('a'));
+
+  EXPECT_CALL(foo, Bar(0)).Times(AtMost(3));
   EXPECT_CALL(foo, Baz(_, _));
   EXPECT_CALL(foo, Baz("hi", "you"))
       .WillOnce(Return('z'))
@@ -119,22 +113,19 @@ void Helper1(Helper1Param param) {
 void TestConcurrentCallsOnSameObject(Dummy /* dummy */) {
   MockFoo foo;
 
-  ON_CALL(foo, Bar(_))
-      .WillByDefault(Return(1));
-  EXPECT_CALL(foo, Baz(_, "b"))
-      .Times(kRepeat)
-      .WillRepeatedly(Return('a'));
+  ON_CALL(foo, Bar(_)).WillByDefault(Return(1));
+  EXPECT_CALL(foo, Baz(_, "b")).Times(kRepeat).WillRepeatedly(Return('a'));
   EXPECT_CALL(foo, Baz(_, "c"));  // Expected to be unsatisfied.
 
   // This chunk of code should generate kRepeat failures about
   // excessive calls, and 2*kRepeat failures about unexpected calls.
   int count1 = 0;
-  const Helper1Param param = { &foo, &count1 };
+  const Helper1Param param = {&foo, &count1};
   ThreadWithParam<Helper1Param>* const t =
       new ThreadWithParam<Helper1Param>(Helper1, param, nullptr);
 
   int count2 = 0;
-  const Helper1Param param2 = { &foo, &count2 };
+  const Helper1Param param2 = {&foo, &count2};
   Helper1(param2);
   JoinAndDelete(t);
 
@@ -162,22 +153,18 @@ void TestPartiallyOrderedExpectationsWithThreads(Dummy /* dummy */) {
   {
     InSequence dummy;
     EXPECT_CALL(foo, Bar(0));
-    EXPECT_CALL(foo, Bar(1))
-        .InSequence(s1, s2);
+    EXPECT_CALL(foo, Bar(1)).InSequence(s1, s2);
   }
 
   EXPECT_CALL(foo, Bar(2))
-      .Times(2*kRepeat)
+      .Times(2 * kRepeat)
       .InSequence(s1)
       .RetiresOnSaturation();
-  EXPECT_CALL(foo, Bar(3))
-      .Times(2*kRepeat)
-      .InSequence(s2);
+  EXPECT_CALL(foo, Bar(3)).Times(2 * kRepeat).InSequence(s2);
 
   {
     InSequence dummy;
-    EXPECT_CALL(foo, Bar(2))
-        .InSequence(s1, s2);
+    EXPECT_CALL(foo, Bar(2)).InSequence(s1, s2);
     EXPECT_CALL(foo, Bar(4));
   }
 
@@ -196,12 +183,12 @@ void TestPartiallyOrderedExpectationsWithThreads(Dummy /* dummy */) {
 // Tests using Google Mock constructs in many threads concurrently.
 TEST(StressTest, CanUseGMockWithThreads) {
   void (*test_routines[])(Dummy dummy) = {
-    &TestConcurrentMockObjects,
-    &TestConcurrentCallsOnSameObject,
-    &TestPartiallyOrderedExpectationsWithThreads,
+      &TestConcurrentMockObjects,
+      &TestConcurrentCallsOnSameObject,
+      &TestPartiallyOrderedExpectationsWithThreads,
   };
 
-  const int kRoutines = sizeof(test_routines)/sizeof(test_routines[0]);
+  const int kRoutines = sizeof(test_routines) / sizeof(test_routines[0]);
   const int kCopiesOfEachRoutine = kMaxTestThreads / kRoutines;
   const int kTestThreads = kCopiesOfEachRoutine * kRoutines;
   ThreadWithParam<Dummy>* threads[kTestThreads] = {};
@@ -220,7 +207,7 @@ TEST(StressTest, CanUseGMockWithThreads) {
   // Ensures that the correct number of failures have been reported.
   const TestInfo* const info = UnitTest::GetInstance()->current_test_info();
   const TestResult& result = *info->result();
-  const int kExpectedFailures = (3*kRepeat + 1)*kCopiesOfEachRoutine;
+  const int kExpectedFailures = (3 * kRepeat + 1) * kCopiesOfEachRoutine;
   GTEST_CHECK_(kExpectedFailures == result.total_part_count())
       << "Expected " << kExpectedFailures << " failures, but got "
       << result.total_part_count();
@@ -229,7 +216,7 @@ TEST(StressTest, CanUseGMockWithThreads) {
 }  // namespace
 }  // namespace testing
 
-int main(int argc, char **argv) {
+int main(int argc, char** argv) {
   testing::InitGoogleMock(&argc, argv);
 
   const int exit_code = RUN_ALL_TESTS();  // Expected to fail.
diff --git a/external/googletest/googlemock/test/gmock_test.cc b/external/googletest/googlemock/test/gmock_test.cc
index e9840a33..8cfff306 100644
--- a/external/googletest/googlemock/test/gmock_test.cc
+++ b/external/googletest/googlemock/test/gmock_test.cc
@@ -27,7 +27,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
 // Google Mock - a framework for writing C++ mock classes.
 //
 // This file tests code in gmock.cc.
@@ -35,13 +34,12 @@
 #include "gmock/gmock.h"
 
 #include <string>
+
 #include "gtest/gtest.h"
 #include "gtest/internal/custom/gtest.h"
 
 #if !defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
 
-using testing::GMOCK_FLAG(default_mock_behavior);
-using testing::GMOCK_FLAG(verbose);
 using testing::InitGoogleMock;
 
 // Verifies that calling InitGoogleMock() on argv results in new_argv,
@@ -49,7 +47,7 @@ using testing::InitGoogleMock;
 template <typename Char, int M, int N>
 void TestInitGoogleMock(const Char* (&argv)[M], const Char* (&new_argv)[N],
                         const ::std::string& expected_gmock_verbose) {
-  const ::std::string old_verbose = GMOCK_FLAG(verbose);
+  const ::std::string old_verbose = GMOCK_FLAG_GET(verbose);
 
   int argc = M - 1;
   InitGoogleMock(&argc, const_cast<Char**>(argv));
@@ -59,8 +57,8 @@ void TestInitGoogleMock(const Char* (&argv)[M], const Char* (&new_argv)[N],
     EXPECT_STREQ(new_argv[i], argv[i]);
   }
 
-  EXPECT_EQ(expected_gmock_verbose, GMOCK_FLAG(verbose).c_str());
-  GMOCK_FLAG(verbose) = old_verbose;  // Restores the gmock_verbose flag.
+  EXPECT_EQ(expected_gmock_verbose, GMOCK_FLAG_GET(verbose));
+  GMOCK_FLAG_SET(verbose, old_verbose);  // Restores the gmock_verbose flag.
 }
 
 TEST(InitGoogleMockTest, ParsesInvalidCommandLine) {
@@ -68,7 +66,7 @@ TEST(InitGoogleMockTest, ParsesInvalidCommandLine) {
 
   const char* new_argv[] = {nullptr};
 
-  TestInitGoogleMock(argv, new_argv, GMOCK_FLAG(verbose));
+  TestInitGoogleMock(argv, new_argv, GMOCK_FLAG_GET(verbose));
 }
 
 TEST(InitGoogleMockTest, ParsesEmptyCommandLine) {
@@ -76,7 +74,7 @@ TEST(InitGoogleMockTest, ParsesEmptyCommandLine) {
 
   const char* new_argv[] = {"foo.exe", nullptr};
 
-  TestInitGoogleMock(argv, new_argv, GMOCK_FLAG(verbose));
+  TestInitGoogleMock(argv, new_argv, GMOCK_FLAG_GET(verbose));
 }
 
 TEST(InitGoogleMockTest, ParsesSingleFlag) {
@@ -88,16 +86,16 @@ TEST(InitGoogleMockTest, ParsesSingleFlag) {
 }
 
 TEST(InitGoogleMockTest, ParsesMultipleFlags) {
-  int old_default_behavior = GMOCK_FLAG(default_mock_behavior);
+  int old_default_behavior = GMOCK_FLAG_GET(default_mock_behavior);
   const wchar_t* argv[] = {L"foo.exe", L"--gmock_verbose=info",
                            L"--gmock_default_mock_behavior=2", nullptr};
 
   const wchar_t* new_argv[] = {L"foo.exe", nullptr};
 
   TestInitGoogleMock(argv, new_argv, "info");
-  EXPECT_EQ(2, GMOCK_FLAG(default_mock_behavior));
+  EXPECT_EQ(2, GMOCK_FLAG_GET(default_mock_behavior));
   EXPECT_NE(2, old_default_behavior);
-  GMOCK_FLAG(default_mock_behavior) = old_default_behavior;
+  GMOCK_FLAG_SET(default_mock_behavior, old_default_behavior);
 }
 
 TEST(InitGoogleMockTest, ParsesUnrecognizedFlag) {
@@ -105,7 +103,7 @@ TEST(InitGoogleMockTest, ParsesUnrecognizedFlag) {
 
   const char* new_argv[] = {"foo.exe", "--non_gmock_flag=blah", nullptr};
 
-  TestInitGoogleMock(argv, new_argv, GMOCK_FLAG(verbose));
+  TestInitGoogleMock(argv, new_argv, GMOCK_FLAG_GET(verbose));
 }
 
 TEST(InitGoogleMockTest, ParsesGoogleMockFlagAndUnrecognizedFlag) {
@@ -122,7 +120,7 @@ TEST(WideInitGoogleMockTest, ParsesInvalidCommandLine) {
 
   const wchar_t* new_argv[] = {nullptr};
 
-  TestInitGoogleMock(argv, new_argv, GMOCK_FLAG(verbose));
+  TestInitGoogleMock(argv, new_argv, GMOCK_FLAG_GET(verbose));
 }
 
 TEST(WideInitGoogleMockTest, ParsesEmptyCommandLine) {
@@ -130,7 +128,7 @@ TEST(WideInitGoogleMockTest, ParsesEmptyCommandLine) {
 
   const wchar_t* new_argv[] = {L"foo.exe", nullptr};
 
-  TestInitGoogleMock(argv, new_argv, GMOCK_FLAG(verbose));
+  TestInitGoogleMock(argv, new_argv, GMOCK_FLAG_GET(verbose));
 }
 
 TEST(WideInitGoogleMockTest, ParsesSingleFlag) {
@@ -142,16 +140,16 @@ TEST(WideInitGoogleMockTest, ParsesSingleFlag) {
 }
 
 TEST(WideInitGoogleMockTest, ParsesMultipleFlags) {
-  int old_default_behavior = GMOCK_FLAG(default_mock_behavior);
+  int old_default_behavior = GMOCK_FLAG_GET(default_mock_behavior);
   const wchar_t* argv[] = {L"foo.exe", L"--gmock_verbose=info",
                            L"--gmock_default_mock_behavior=2", nullptr};
 
   const wchar_t* new_argv[] = {L"foo.exe", nullptr};
 
   TestInitGoogleMock(argv, new_argv, "info");
-  EXPECT_EQ(2, GMOCK_FLAG(default_mock_behavior));
+  EXPECT_EQ(2, GMOCK_FLAG_GET(default_mock_behavior));
   EXPECT_NE(2, old_default_behavior);
-  GMOCK_FLAG(default_mock_behavior) = old_default_behavior;
+  GMOCK_FLAG_SET(default_mock_behavior, old_default_behavior);
 }
 
 TEST(WideInitGoogleMockTest, ParsesUnrecognizedFlag) {
@@ -159,7 +157,7 @@ TEST(WideInitGoogleMockTest, ParsesUnrecognizedFlag) {
 
   const wchar_t* new_argv[] = {L"foo.exe", L"--non_gmock_flag=blah", nullptr};
 
-  TestInitGoogleMock(argv, new_argv, GMOCK_FLAG(verbose));
+  TestInitGoogleMock(argv, new_argv, GMOCK_FLAG_GET(verbose));
 }
 
 TEST(WideInitGoogleMockTest, ParsesGoogleMockFlagAndUnrecognizedFlag) {
@@ -175,7 +173,7 @@ TEST(WideInitGoogleMockTest, ParsesGoogleMockFlagAndUnrecognizedFlag) {
 
 // Makes sure Google Mock flags can be accessed in code.
 TEST(FlagTest, IsAccessibleInCode) {
-  bool dummy = testing::GMOCK_FLAG(catch_leaked_mocks) &&
-      testing::GMOCK_FLAG(verbose) == "";
+  bool dummy =
+      GMOCK_FLAG_GET(catch_leaked_mocks) && GMOCK_FLAG_GET(verbose).empty();
   (void)dummy;  // Avoids the "unused local variable" warning.
 }
diff --git a/external/googletest/googlemock/test/gmock_test_utils.py b/external/googletest/googlemock/test/gmock_test_utils.py
old mode 100644
new mode 100755
index 98f1978f..edad1f75
--- a/external/googletest/googlemock/test/gmock_test_utils.py
+++ b/external/googletest/googlemock/test/gmock_test_utils.py
@@ -30,68 +30,53 @@
 """Unit test utilities for Google C++ Mocking Framework."""
 
 import os
-import sys
-
-# Determines path to gtest_test_utils and imports it.
-SCRIPT_DIR = os.path.dirname(__file__) or '.'
-
-# isdir resolves symbolic links.
-gtest_tests_util_dir = os.path.join(SCRIPT_DIR, '../../googletest/test')
-if os.path.isdir(gtest_tests_util_dir):
-    GTEST_TESTS_UTIL_DIR = gtest_tests_util_dir
-else:
-    GTEST_TESTS_UTIL_DIR = os.path.join(SCRIPT_DIR, '../../googletest/test')
-sys.path.append(GTEST_TESTS_UTIL_DIR)
 
 # pylint: disable=C6204
-import gtest_test_utils
+from googletest.test import gtest_test_utils
 
 
 def GetSourceDir():
-    """Returns the absolute path of the directory where the .py files are."""
+  """Returns the absolute path of the directory where the .py files are."""
 
-    return gtest_test_utils.GetSourceDir()
+  return gtest_test_utils.GetSourceDir()
 
 
 def GetTestExecutablePath(executable_name):
-    """Returns the absolute path of the test binary given its name.
+  """Returns the absolute path of the test binary given its name.
 
-    The function will print a message and abort the program if the resulting file
-    doesn't exist.
+  The function will print a message and abort the program if the resulting file
+  doesn't exist.
 
-    Args:
-      executable_name: name of the test binary that the test script runs.
+  Args:
+    executable_name: name of the test binary that the test script runs.
 
-    Returns:
-      The absolute path of the test binary.
-    """
+  Returns:
+    The absolute path of the test binary.
+  """
 
-    return gtest_test_utils.GetTestExecutablePath(executable_name)
+  return gtest_test_utils.GetTestExecutablePath(executable_name)
 
 
 def GetExitStatus(exit_code):
-    """Returns the argument to exit(), or -1 if exit() wasn't called.
-
-    Args:
-      exit_code: the result value of os.system(command).
-    """
-
-    if os.name == 'nt':
-        # On Windows, os.WEXITSTATUS() doesn't work and os.system() returns
-        # the argument to exit() directly.
-        return exit_code
+  """Returns the argument to exit(), or -1 if exit() wasn't called.
+
+  Args:
+    exit_code: the result value of os.system(command).
+  """
+
+  if os.name == 'nt':
+    # On Windows, os.WEXITSTATUS() doesn't work and os.system() returns
+    # the argument to exit() directly.
+    return exit_code
+  else:
+    # On Unix, os.WEXITSTATUS() must be used to extract the exit status
+    # from the result of os.system().
+    if os.WIFEXITED(exit_code):
+      return os.WEXITSTATUS(exit_code)
     else:
-        # On Unix, os.WEXITSTATUS() must be used to extract the exit status
-        # from the result of os.system().
-        if os.WIFEXITED(exit_code):
-            return os.WEXITSTATUS(exit_code)
-        else:
-            return -1
+      return -1
 
 
-# Suppresses the "Invalid const name" lint complaint
-# pylint: disable-msg=C6409
-
 # Exposes utilities from gtest_test_utils.
 Subprocess = gtest_test_utils.Subprocess
 TestCase = gtest_test_utils.TestCase
@@ -100,10 +85,7 @@ def GetExitStatus(exit_code):
 PREMATURE_EXIT_FILE_ENV_VAR = gtest_test_utils.PREMATURE_EXIT_FILE_ENV_VAR
 
 
-# pylint: enable-msg=C6409
-
-
 def Main():
-    """Runs the unit test."""
+  """Runs the unit test."""
 
-    gtest_test_utils.Main()
+  gtest_test_utils.Main()
diff --git a/external/googletest/googletest/CMakeLists.txt b/external/googletest/googletest/CMakeLists.txt
index 60c72371..dce6a7c9 100644
--- a/external/googletest/googletest/CMakeLists.txt
+++ b/external/googletest/googletest/CMakeLists.txt
@@ -5,15 +5,15 @@
 # CMake build script for Google Test.
 #
 # To run the tests for Google Test itself on Linux, use 'make test' or
-# ctest.  You can select which tests to run using 'ctest -R regex'.
+# ctest. You can select which tests to run using 'ctest -R regex'.
 # For more options, run 'ctest --help'.
 
 # When other libraries are using a shared version of runtime libraries,
 # Google Test also has to use one.
 option(
-        gtest_force_shared_crt
-        "Use shared (DLL) run-time lib even when Google Test is built as static lib."
-        OFF)
+  gtest_force_shared_crt
+  "Use shared (DLL) run-time lib even when Google Test is built as static lib."
+  OFF)
 
 option(gtest_build_tests "Build all of gtest's own tests." OFF)
 
@@ -22,20 +22,20 @@ option(gtest_build_samples "Build gtest's sample programs." OFF)
 option(gtest_disable_pthreads "Disable uses of pthreads in gtest." OFF)
 
 option(
-        gtest_hide_internal_symbols
-        "Build gtest with internal symbols hidden in shared libraries."
-        OFF)
+  gtest_hide_internal_symbols
+  "Build gtest with internal symbols hidden in shared libraries."
+  OFF)
 
 # Defines pre_project_set_up_hermetic_build() and set_up_hermetic_build().
 include(cmake/hermetic_build.cmake OPTIONAL)
 
 if (COMMAND pre_project_set_up_hermetic_build)
-    pre_project_set_up_hermetic_build()
-endif ()
+  pre_project_set_up_hermetic_build()
+endif()
 
 ########################################################################
 #
-# Project-wide settings
+# Project-wide settings.
 
 # Name of the project.
 #
@@ -44,52 +44,38 @@ endif ()
 # ${gtest_BINARY_DIR}.
 # Language "C" is required for find_package(Threads).
 
-# Project version:
+# Project version.
 
-if (CMAKE_VERSION VERSION_LESS 3.0)
-    project(gtest CXX C)
-    set(PROJECT_VERSION ${GOOGLETEST_VERSION})
-else ()
-    cmake_policy(SET CMP0048 NEW)
-    project(gtest VERSION ${GOOGLETEST_VERSION} LANGUAGES CXX C)
-endif ()
-cmake_minimum_required(VERSION 2.8.12)
-
-if (POLICY CMP0063) # Visibility
-    cmake_policy(SET CMP0063 NEW)
-endif (POLICY CMP0063)
-
-if (POLICY CMP0042)
-    cmake_policy(SET CMP0042 NEW)
-endif (POLICY CMP0042)
+cmake_minimum_required(VERSION 3.13)
+project(gtest VERSION ${GOOGLETEST_VERSION} LANGUAGES CXX C)
 
 if (COMMAND set_up_hermetic_build)
-    set_up_hermetic_build()
-endif ()
+  set_up_hermetic_build()
+endif()
 
-# These commands only run if this is the main project
-if (CMAKE_PROJECT_NAME STREQUAL "gtest" OR CMAKE_PROJECT_NAME STREQUAL "googletest-distribution")
+# These commands only run if this is the main project.
+if(CMAKE_PROJECT_NAME STREQUAL "gtest" OR CMAKE_PROJECT_NAME STREQUAL "googletest-distribution")
 
-    # BUILD_SHARED_LIBS is a standard CMake variable, but we declare it here to
-    # make it prominent in the GUI.
-    option(BUILD_SHARED_LIBS "Build shared libraries (DLLs)." OFF)
+  # BUILD_SHARED_LIBS is a standard CMake variable, but we declare it here to
+  # make it prominent in the GUI.
+  option(BUILD_SHARED_LIBS "Build shared libraries (DLLs)." OFF)
 
-else ()
+else()
 
-    mark_as_advanced(
-            gtest_force_shared_crt
-            gtest_build_tests
-            gtest_build_samples
-            gtest_disable_pthreads
-            gtest_hide_internal_symbols)
+  mark_as_advanced(
+    gtest_force_shared_crt
+    gtest_build_tests
+    gtest_build_samples
+    gtest_disable_pthreads
+    gtest_hide_internal_symbols)
 
-endif ()
+endif()
 
 
 if (gtest_hide_internal_symbols)
-    set(CMAKE_CXX_VISIBILITY_PRESET hidden)
-    set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
-endif ()
+  set(CMAKE_CXX_VISIBILITY_PRESET hidden)
+  set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
+endif()
 
 # Define helper functions and macros used by Google Test.
 include(cmake/internal_utils.cmake)
@@ -97,83 +83,100 @@ include(cmake/internal_utils.cmake)
 config_compiler_and_linker()  # Defined in internal_utils.cmake.
 
 # Needed to set the namespace for both the export targets and the
-# alias libraries
+# alias libraries.
 set(cmake_package_name GTest CACHE INTERNAL "")
 
 # Create the CMake package file descriptors.
 if (INSTALL_GTEST)
-    include(CMakePackageConfigHelpers)
-    set(targets_export_name ${cmake_package_name}Targets CACHE INTERNAL "")
-    set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated" CACHE INTERNAL "")
-    set(cmake_files_install_dir "${CMAKE_INSTALL_LIBDIR}/cmake/${cmake_package_name}")
-    set(version_file "${generated_dir}/${cmake_package_name}ConfigVersion.cmake")
-    write_basic_package_version_file(${version_file} VERSION ${GOOGLETEST_VERSION} COMPATIBILITY AnyNewerVersion)
-    install(EXPORT ${targets_export_name}
-            NAMESPACE ${cmake_package_name}::
-            DESTINATION ${cmake_files_install_dir})
-    set(config_file "${generated_dir}/${cmake_package_name}Config.cmake")
-    configure_package_config_file("${gtest_SOURCE_DIR}/cmake/Config.cmake.in"
-            "${config_file}" INSTALL_DESTINATION ${cmake_files_install_dir})
-    install(FILES ${version_file} ${config_file}
-            DESTINATION ${cmake_files_install_dir})
-endif ()
+  include(CMakePackageConfigHelpers)
+  set(targets_export_name ${cmake_package_name}Targets CACHE INTERNAL "")
+  set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated" CACHE INTERNAL "")
+  set(cmake_files_install_dir "${CMAKE_INSTALL_LIBDIR}/cmake/${cmake_package_name}")
+  set(version_file "${generated_dir}/${cmake_package_name}ConfigVersion.cmake")
+  write_basic_package_version_file(${version_file} VERSION ${GOOGLETEST_VERSION} COMPATIBILITY AnyNewerVersion)
+  install(EXPORT ${targets_export_name}
+    COMPONENT "${PROJECT_NAME}"
+    NAMESPACE ${cmake_package_name}::
+    DESTINATION ${cmake_files_install_dir})
+  set(config_file "${generated_dir}/${cmake_package_name}Config.cmake")
+  configure_package_config_file("${gtest_SOURCE_DIR}/cmake/Config.cmake.in"
+    "${config_file}" INSTALL_DESTINATION ${cmake_files_install_dir})
+  install(FILES ${version_file} ${config_file}
+    COMPONENT "${PROJECT_NAME}"
+    DESTINATION ${cmake_files_install_dir})
+endif()
 
 # Where Google Test's .h files can be found.
 set(gtest_build_include_dirs
-        "${gtest_SOURCE_DIR}/include"
-        "${gtest_SOURCE_DIR}")
+  "${gtest_SOURCE_DIR}/include"
+  "${gtest_SOURCE_DIR}")
 include_directories(${gtest_build_include_dirs})
 
 ########################################################################
 #
-# Defines the gtest & gtest_main libraries.  User tests should link
+# Defines the gtest & gtest_main libraries. User tests should link
 # with one of them.
 
-# Google Test libraries.  We build them using more strict warnings than what
+# Google Test libraries. We build them using more strict warnings than what
 # are used for other targets, to ensure that gtest can be compiled by a user
 # aggressive about warnings.
 cxx_library(gtest "${cxx_strict}" src/gtest-all.cc)
 set_target_properties(gtest PROPERTIES VERSION ${GOOGLETEST_VERSION})
+if(GTEST_HAS_ABSL)
+  target_compile_definitions(gtest PUBLIC GTEST_HAS_ABSL=1)
+  target_link_libraries(gtest PUBLIC
+    absl::failure_signal_handler
+    absl::stacktrace
+    absl::symbolize
+    absl::flags_parse
+    absl::flags_reflection
+    absl::flags_usage
+    absl::strings
+    absl::any
+    absl::optional
+    absl::variant
+    re2::re2
+  )
+endif()
 cxx_library(gtest_main "${cxx_strict}" src/gtest_main.cc)
 set_target_properties(gtest_main PROPERTIES VERSION ${GOOGLETEST_VERSION})
-# If the CMake version supports it, attach header directory information
-# to the targets for when we are part of a parent build (ie being pulled
-# in via add_subdirectory() rather than being a standalone build).
-if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11")
-    target_include_directories(gtest SYSTEM INTERFACE
-            "$<BUILD_INTERFACE:${gtest_build_include_dirs}>"
-            "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
-    target_include_directories(gtest_main SYSTEM INTERFACE
-            "$<BUILD_INTERFACE:${gtest_build_include_dirs}>"
-            "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
-endif ()
+string(REPLACE ";" "$<SEMICOLON>" dirs "${gtest_build_include_dirs}")
+target_include_directories(gtest SYSTEM INTERFACE
+  "$<BUILD_INTERFACE:${dirs}>"
+  "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
+target_include_directories(gtest_main SYSTEM INTERFACE
+  "$<BUILD_INTERFACE:${dirs}>"
+  "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
+if(CMAKE_SYSTEM_NAME MATCHES "QNX" AND CMAKE_SYSTEM_VERSION VERSION_GREATER_EQUAL 7.1)
+  target_link_libraries(gtest PUBLIC regex)
+endif()
 target_link_libraries(gtest_main PUBLIC gtest)
 
 ########################################################################
 #
-# Install rules
+# Install rules.
 install_project(gtest gtest_main)
 
 ########################################################################
 #
 # Samples on how to link user tests with gtest or gtest_main.
 #
-# They are not built by default.  To build them, set the
-# gtest_build_samples option to ON.  You can do it by running ccmake
+# They are not built by default. To build them, set the
+# gtest_build_samples option to ON. You can do it by running ccmake
 # or specifying the -Dgtest_build_samples=ON flag when running cmake.
 
 if (gtest_build_samples)
-    cxx_executable(sample1_unittest samples gtest_main samples/sample1.cc)
-    cxx_executable(sample2_unittest samples gtest_main samples/sample2.cc)
-    cxx_executable(sample3_unittest samples gtest_main)
-    cxx_executable(sample4_unittest samples gtest_main samples/sample4.cc)
-    cxx_executable(sample5_unittest samples gtest_main samples/sample1.cc)
-    cxx_executable(sample6_unittest samples gtest_main)
-    cxx_executable(sample7_unittest samples gtest_main)
-    cxx_executable(sample8_unittest samples gtest_main)
-    cxx_executable(sample9_unittest samples gtest)
-    cxx_executable(sample10_unittest samples gtest)
-endif ()
+  cxx_executable(sample1_unittest samples gtest_main samples/sample1.cc)
+  cxx_executable(sample2_unittest samples gtest_main samples/sample2.cc)
+  cxx_executable(sample3_unittest samples gtest_main)
+  cxx_executable(sample4_unittest samples gtest_main samples/sample4.cc)
+  cxx_executable(sample5_unittest samples gtest_main samples/sample1.cc)
+  cxx_executable(sample6_unittest samples gtest_main)
+  cxx_executable(sample7_unittest samples gtest_main)
+  cxx_executable(sample8_unittest samples gtest_main)
+  cxx_executable(sample9_unittest samples gtest)
+  cxx_executable(sample10_unittest samples gtest)
+endif()
 
 ########################################################################
 #
@@ -182,146 +185,146 @@ endif ()
 # You can skip this section if you aren't interested in testing
 # Google Test itself.
 #
-# The tests are not built by default.  To build them, set the
-# gtest_build_tests option to ON.  You can do it by running ccmake
+# The tests are not built by default. To build them, set the
+# gtest_build_tests option to ON. You can do it by running ccmake
 # or specifying the -Dgtest_build_tests=ON flag when running cmake.
 
 if (gtest_build_tests)
-    # This must be set in the root directory for the tests to be run by
-    # 'make test' or ctest.
-    enable_testing()
-
-    ############################################################
-    # C++ tests built with standard compiler flags.
-
-    cxx_test(googletest-death-test-test gtest_main)
-    cxx_test(gtest_environment_test gtest)
-    cxx_test(googletest-filepath-test gtest_main)
-    cxx_test(googletest-listener-test gtest_main)
-    cxx_test(gtest_main_unittest gtest_main)
-    cxx_test(googletest-message-test gtest_main)
-    cxx_test(gtest_no_test_unittest gtest)
-    cxx_test(googletest-options-test gtest_main)
-    cxx_test(googletest-param-test-test gtest
-            test/googletest-param-test2-test.cc)
-    cxx_test(googletest-port-test gtest_main)
-    cxx_test(gtest_pred_impl_unittest gtest_main)
-    cxx_test(gtest_premature_exit_test gtest
-            test/gtest_premature_exit_test.cc)
-    cxx_test(googletest-printers-test gtest_main)
-    cxx_test(gtest_prod_test gtest_main
-            test/production.cc)
-    cxx_test(gtest_repeat_test gtest)
-    cxx_test(gtest_sole_header_test gtest_main)
-    cxx_test(gtest_stress_test gtest)
-    cxx_test(googletest-test-part-test gtest_main)
-    cxx_test(gtest_throw_on_failure_ex_test gtest)
-    cxx_test(gtest-typed-test_test gtest_main
-            test/gtest-typed-test2_test.cc)
-    cxx_test(gtest_unittest gtest_main)
-    cxx_test(gtest-unittest-api_test gtest)
-    cxx_test(gtest_skip_in_environment_setup_test gtest_main)
-    cxx_test(gtest_skip_test gtest_main)
-
-    ############################################################
-    # C++ tests built with non-standard compiler flags.
-
-    # MSVC 7.1 does not support STL with exceptions disabled.
-    if (NOT MSVC OR MSVC_VERSION GREATER 1310)
-        cxx_library(gtest_no_exception "${cxx_no_exception}"
-                src/gtest-all.cc)
-        cxx_library(gtest_main_no_exception "${cxx_no_exception}"
-                src/gtest-all.cc src/gtest_main.cc)
-    endif ()
-    cxx_library(gtest_main_no_rtti "${cxx_no_rtti}"
-            src/gtest-all.cc src/gtest_main.cc)
-
-    cxx_test_with_flags(gtest-death-test_ex_nocatch_test
-            "${cxx_exception} -DGTEST_ENABLE_CATCH_EXCEPTIONS_=0"
-            gtest test/googletest-death-test_ex_test.cc)
-    cxx_test_with_flags(gtest-death-test_ex_catch_test
-            "${cxx_exception} -DGTEST_ENABLE_CATCH_EXCEPTIONS_=1"
-            gtest test/googletest-death-test_ex_test.cc)
-
-    cxx_test_with_flags(gtest_no_rtti_unittest "${cxx_no_rtti}"
-            gtest_main_no_rtti test/gtest_unittest.cc)
-
-    cxx_shared_library(gtest_dll "${cxx_default}"
-            src/gtest-all.cc src/gtest_main.cc)
-
-    cxx_executable_with_flags(gtest_dll_test_ "${cxx_default}"
-            gtest_dll test/gtest_all_test.cc)
-    set_target_properties(gtest_dll_test_
-            PROPERTIES
-            COMPILE_DEFINITIONS "GTEST_LINKED_AS_SHARED_LIBRARY=1")
-
-    ############################################################
-    # Python tests.
-
-    cxx_executable(googletest-break-on-failure-unittest_ test gtest)
-    py_test(googletest-break-on-failure-unittest)
-
-    py_test(gtest_skip_check_output_test)
-    py_test(gtest_skip_environment_check_output_test)
-
-    # Visual Studio .NET 2003 does not support STL with exceptions disabled.
-    if (NOT MSVC OR MSVC_VERSION GREATER 1310)  # 1310 is Visual Studio .NET 2003
-        cxx_executable_with_flags(
-                googletest-catch-exceptions-no-ex-test_
-                "${cxx_no_exception}"
-                gtest_main_no_exception
-                test/googletest-catch-exceptions-test_.cc)
-    endif ()
-
+  # This must be set in the root directory for the tests to be run by
+  # 'make test' or ctest.
+  enable_testing()
+
+  ############################################################
+  # C++ tests built with standard compiler flags.
+
+  cxx_test(googletest-death-test-test gtest_main)
+  cxx_test(gtest_environment_test gtest)
+  cxx_test(googletest-filepath-test gtest_main)
+  cxx_test(googletest-listener-test gtest_main)
+  cxx_test(gtest_main_unittest gtest_main)
+  cxx_test(googletest-message-test gtest_main)
+  cxx_test(gtest_no_test_unittest gtest)
+  cxx_test(googletest-options-test gtest_main)
+  cxx_test(googletest-param-test-test gtest
+    test/googletest-param-test2-test.cc)
+  cxx_test(googletest-port-test gtest_main)
+  cxx_test(gtest_pred_impl_unittest gtest_main)
+  cxx_test(gtest_premature_exit_test gtest
+    test/gtest_premature_exit_test.cc)
+  cxx_test(googletest-printers-test gtest_main)
+  cxx_test(gtest_prod_test gtest_main
+    test/production.cc)
+  cxx_test(gtest_repeat_test gtest)
+  cxx_test(gtest_sole_header_test gtest_main)
+  cxx_test(gtest_stress_test gtest)
+  cxx_test(googletest-test-part-test gtest_main)
+  cxx_test(gtest_throw_on_failure_ex_test gtest)
+  cxx_test(gtest-typed-test_test gtest_main
+    test/gtest-typed-test2_test.cc)
+  cxx_test(gtest_unittest gtest_main)
+  cxx_test(gtest-unittest-api_test gtest)
+  cxx_test(gtest_skip_in_environment_setup_test gtest_main)
+  cxx_test(gtest_skip_test gtest_main)
+
+  ############################################################
+  # C++ tests built with non-standard compiler flags.
+
+  # MSVC 7.1 does not support STL with exceptions disabled.
+  if (NOT MSVC OR MSVC_VERSION GREATER 1310)
+    cxx_library(gtest_no_exception "${cxx_no_exception}"
+      src/gtest-all.cc)
+    cxx_library(gtest_main_no_exception "${cxx_no_exception}"
+      src/gtest-all.cc src/gtest_main.cc)
+  endif()
+  cxx_library(gtest_main_no_rtti "${cxx_no_rtti}"
+    src/gtest-all.cc src/gtest_main.cc)
+
+  cxx_test_with_flags(gtest-death-test_ex_nocatch_test
+    "${cxx_exception} -DGTEST_ENABLE_CATCH_EXCEPTIONS_=0"
+    gtest test/googletest-death-test_ex_test.cc)
+  cxx_test_with_flags(gtest-death-test_ex_catch_test
+    "${cxx_exception} -DGTEST_ENABLE_CATCH_EXCEPTIONS_=1"
+    gtest test/googletest-death-test_ex_test.cc)
+
+  cxx_test_with_flags(gtest_no_rtti_unittest "${cxx_no_rtti}"
+    gtest_main_no_rtti test/gtest_unittest.cc)
+
+  cxx_shared_library(gtest_dll "${cxx_default}"
+    src/gtest-all.cc src/gtest_main.cc)
+
+  cxx_executable_with_flags(gtest_dll_test_ "${cxx_default}"
+    gtest_dll test/gtest_all_test.cc)
+  set_target_properties(gtest_dll_test_
+                        PROPERTIES
+                        COMPILE_DEFINITIONS "GTEST_LINKED_AS_SHARED_LIBRARY=1")
+
+  ############################################################
+  # Python tests.
+
+  cxx_executable(googletest-break-on-failure-unittest_ test gtest)
+  py_test(googletest-break-on-failure-unittest)
+
+  py_test(gtest_skip_check_output_test)
+  py_test(gtest_skip_environment_check_output_test)
+
+  # Visual Studio .NET 2003 does not support STL with exceptions disabled.
+  if (NOT MSVC OR MSVC_VERSION GREATER 1310) # 1310 is Visual Studio .NET 2003
     cxx_executable_with_flags(
-            googletest-catch-exceptions-ex-test_
-            "${cxx_exception}"
-            gtest_main
-            test/googletest-catch-exceptions-test_.cc)
-    py_test(googletest-catch-exceptions-test)
-
-    cxx_executable(googletest-color-test_ test gtest)
-    py_test(googletest-color-test)
-
-    cxx_executable(googletest-env-var-test_ test gtest)
-    py_test(googletest-env-var-test)
-
-    cxx_executable(googletest-filter-unittest_ test gtest)
-    py_test(googletest-filter-unittest)
-
-    cxx_executable(gtest_help_test_ test gtest_main)
-    py_test(gtest_help_test)
-
-    cxx_executable(googletest-list-tests-unittest_ test gtest)
-    py_test(googletest-list-tests-unittest)
-
-    cxx_executable(googletest-output-test_ test gtest)
-    py_test(googletest-output-test --no_stacktrace_support)
-
-    cxx_executable(googletest-shuffle-test_ test gtest)
-    py_test(googletest-shuffle-test)
-
-    # MSVC 7.1 does not support STL with exceptions disabled.
-    if (NOT MSVC OR MSVC_VERSION GREATER 1310)
-        cxx_executable(googletest-throw-on-failure-test_ test gtest_no_exception)
-        set_target_properties(googletest-throw-on-failure-test_
-                PROPERTIES
-                COMPILE_FLAGS "${cxx_no_exception}")
-        py_test(googletest-throw-on-failure-test)
-    endif ()
-
-    cxx_executable(googletest-uninitialized-test_ test gtest)
-    py_test(googletest-uninitialized-test)
-
-    cxx_executable(gtest_list_output_unittest_ test gtest)
-    py_test(gtest_list_output_unittest)
-
-    cxx_executable(gtest_xml_outfile1_test_ test gtest_main)
-    cxx_executable(gtest_xml_outfile2_test_ test gtest_main)
-    py_test(gtest_xml_outfiles_test)
-    py_test(googletest-json-outfiles-test)
-
-    cxx_executable(gtest_xml_output_unittest_ test gtest)
-    py_test(gtest_xml_output_unittest --no_stacktrace_support)
-    py_test(googletest-json-output-unittest --no_stacktrace_support)
-endif ()
+      googletest-catch-exceptions-no-ex-test_
+      "${cxx_no_exception}"
+      gtest_main_no_exception
+      test/googletest-catch-exceptions-test_.cc)
+  endif()
+
+  cxx_executable_with_flags(
+    googletest-catch-exceptions-ex-test_
+    "${cxx_exception}"
+    gtest_main
+    test/googletest-catch-exceptions-test_.cc)
+  py_test(googletest-catch-exceptions-test)
+
+  cxx_executable(googletest-color-test_ test gtest)
+  py_test(googletest-color-test)
+
+  cxx_executable(googletest-env-var-test_ test gtest)
+  py_test(googletest-env-var-test)
+
+  cxx_executable(googletest-filter-unittest_ test gtest)
+  py_test(googletest-filter-unittest)
+
+  cxx_executable(gtest_help_test_ test gtest_main)
+  py_test(gtest_help_test)
+
+  cxx_executable(googletest-list-tests-unittest_ test gtest)
+  py_test(googletest-list-tests-unittest)
+
+  cxx_executable(googletest-output-test_ test gtest)
+  py_test(googletest-output-test --no_stacktrace_support)
+
+  cxx_executable(googletest-shuffle-test_ test gtest)
+  py_test(googletest-shuffle-test)
+
+  # MSVC 7.1 does not support STL with exceptions disabled.
+  if (NOT MSVC OR MSVC_VERSION GREATER 1310)
+    cxx_executable(googletest-throw-on-failure-test_ test gtest_no_exception)
+    set_target_properties(googletest-throw-on-failure-test_
+      PROPERTIES
+      COMPILE_FLAGS "${cxx_no_exception}")
+    py_test(googletest-throw-on-failure-test)
+  endif()
+
+  cxx_executable(googletest-uninitialized-test_ test gtest)
+  py_test(googletest-uninitialized-test)
+
+  cxx_executable(gtest_list_output_unittest_ test gtest)
+  py_test(gtest_list_output_unittest)
+
+  cxx_executable(gtest_xml_outfile1_test_ test gtest_main)
+  cxx_executable(gtest_xml_outfile2_test_ test gtest_main)
+  py_test(gtest_xml_outfiles_test)
+  py_test(googletest-json-outfiles-test)
+
+  cxx_executable(gtest_xml_output_unittest_ test gtest)
+  py_test(gtest_xml_output_unittest --no_stacktrace_support)
+  py_test(googletest-json-output-unittest --no_stacktrace_support)
+endif()
diff --git a/external/googletest/googletest/README.md b/external/googletest/googletest/README.md
index 3764e1cb..a760759e 100644
--- a/external/googletest/googletest/README.md
+++ b/external/googletest/googletest/README.md
@@ -2,79 +2,90 @@
 
 #### Setup
 
-To build GoogleTest and your tests that use it, you need to tell your build system where to find its headers and source
-files. The exact way to do it depends on which build system you use, and is usually straightforward.
+To build GoogleTest and your tests that use it, you need to tell your build
+system where to find its headers and source files. The exact way to do it
+depends on which build system you use, and is usually straightforward.
 
 ### Build with CMake
 
 GoogleTest comes with a CMake build script
-([CMakeLists.txt](https://github.com/google/googletest/blob/master/CMakeLists.txt))
-that can be used on a wide range of platforms ("C" stands for cross-platform.). If you don't have CMake installed
-already, you can download it for free from
-<http://www.cmake.org/>.
+([CMakeLists.txt](https://github.com/google/googletest/blob/main/CMakeLists.txt))
+that can be used on a wide range of platforms ("C" stands for cross-platform.).
+If you don't have CMake installed already, you can download it for free from
+<https://cmake.org/>.
 
-CMake works by generating native makefiles or build projects that can be used in the compiler environment of your
-choice. You can either build GoogleTest as a standalone project or it can be incorporated into an existing CMake build
-for another project.
+CMake works by generating native makefiles or build projects that can be used in
+the compiler environment of your choice. You can either build GoogleTest as a
+standalone project or it can be incorporated into an existing CMake build for
+another project.
 
 #### Standalone CMake Project
 
-When building GoogleTest as a standalone project, the typical workflow starts with
+When building GoogleTest as a standalone project, the typical workflow starts
+with
 
 ```
-git clone https://github.com/google/googletest.git -b release-1.10.0
+git clone https://github.com/google/googletest.git -b v1.17.0
 cd googletest        # Main directory of the cloned repository.
 mkdir build          # Create a directory to hold the build output.
 cd build
 cmake ..             # Generate native build scripts for GoogleTest.
 ```
 
-The above command also includes GoogleMock by default. And so, if you want to build only GoogleTest, you should replace
-the last command with
+The above command also includes GoogleMock by default. And so, if you want to
+build only GoogleTest, you should replace the last command with
 
 ```
 cmake .. -DBUILD_GMOCK=OFF
 ```
 
-If you are on a \*nix system, you should now see a Makefile in the current directory. Just type `make` to build
-GoogleTest. And then you can simply install GoogleTest if you are a system administrator.
+If you are on a \*nix system, you should now see a Makefile in the current
+directory. Just type `make` to build GoogleTest. And then you can simply install
+GoogleTest if you are a system administrator.
 
 ```
 make
 sudo make install    # Install in /usr/local/ by default
 ```
 
-If you use Windows and have Visual Studio installed, a `gtest.sln` file and several `.vcproj` files will be created. You
-can then build them using Visual Studio.
+If you use Windows and have Visual Studio installed, a `gtest.sln` file and
+several `.vcproj` files will be created. You can then build them using Visual
+Studio.
 
 On Mac OS X with Xcode installed, a `.xcodeproj` file will be generated.
 
 #### Incorporating Into An Existing CMake Project
 
-If you want to use GoogleTest in a project which already uses CMake, the easiest way is to get installed libraries and
-headers.
-
-* Import GoogleTest by using `find_package` (or `pkg_check_modules`). For example,
-  if `find_package(GTest CONFIG REQUIRED)` succeeds, you can use the libraries as `GTest::gtest`, `GTest::gmock`.
-
-And a more robust and flexible approach is to build GoogleTest as part of that project directly. This is done by making
-the GoogleTest source code available to the main build and adding it using CMake's `add_subdirectory()` command. This
-has the significant advantage that the same compiler and linker settings are used between GoogleTest and the rest of
-your project, so issues associated with using incompatible libraries (eg debug/release), etc. are avoided. This is
-particularly useful on Windows. Making GoogleTest's source code available to the main build can be done a few different
-ways:
-
-* Download the GoogleTest source code manually and place it at a known location. This is the least flexible approach and
-  can make it more difficult to use with continuous integration systems, etc.
-* Embed the GoogleTest source code as a direct copy in the main project's source tree. This is often the simplest
-  approach, but is also the hardest to keep up to date. Some organizations may not permit this method.
-* Add GoogleTest as a git submodule or equivalent. This may not always be possible or appropriate. Git submodules, for
-  example, have their own set of advantages and drawbacks.
-* Use CMake to download GoogleTest as part of the build's configure step. This approach doesn't have the limitations of
-  the other methods.
-
-The last of the above methods is implemented with a small piece of CMake code that downloads and pulls the GoogleTest
-code into the main build.
+If you want to use GoogleTest in a project which already uses CMake, the easiest
+way is to get installed libraries and headers.
+
+*   Import GoogleTest by using `find_package` (or `pkg_check_modules`). For
+    example, if `find_package(GTest CONFIG REQUIRED)` succeeds, you can use the
+    libraries as `GTest::gtest`, `GTest::gmock`.
+
+And a more robust and flexible approach is to build GoogleTest as part of that
+project directly. This is done by making the GoogleTest source code available to
+the main build and adding it using CMake's `add_subdirectory()` command. This
+has the significant advantage that the same compiler and linker settings are
+used between GoogleTest and the rest of your project, so issues associated with
+using incompatible libraries (eg debug/release), etc. are avoided. This is
+particularly useful on Windows. Making GoogleTest's source code available to the
+main build can be done a few different ways:
+
+*   Download the GoogleTest source code manually and place it at a known
+    location. This is the least flexible approach and can make it more difficult
+    to use with continuous integration systems, etc.
+*   Embed the GoogleTest source code as a direct copy in the main project's
+    source tree. This is often the simplest approach, but is also the hardest to
+    keep up to date. Some organizations may not permit this method.
+*   Add GoogleTest as a git submodule or equivalent. This may not always be
+    possible or appropriate. Git submodules, for example, have their own set of
+    advantages and drawbacks.
+*   Use CMake to download GoogleTest as part of the build's configure step. This
+    approach doesn't have the limitations of the other methods.
+
+The last of the above methods is implemented with a small piece of CMake code
+that downloads and pulls the GoogleTest code into the main build.
 
 Just add to your `CMakeLists.txt`:
 
@@ -83,7 +94,7 @@ include(FetchContent)
 FetchContent_Declare(
   googletest
   # Specify the commit you depend on and update it regularly.
-  URL https://github.com/google/googletest/archive/609281088cfefc76f9d0ce82e1ff6c30cc3591e5.zip
+  URL https://github.com/google/googletest/archive/5376968f6948923e2411081fd9372e71a59d8e77.zip
 )
 # For Windows: Prevent overriding the parent project's compiler/linker settings
 set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
@@ -100,94 +111,121 @@ Note that this approach requires CMake 3.14 or later due to its use of the
 
 ##### Visual Studio Dynamic vs Static Runtimes
 
-By default, new Visual Studio projects link the C runtimes dynamically but GoogleTest links them statically. This will
-generate an error that looks something like the following: gtest.lib(gtest-all.obj) : error LNK2038: mismatch detected
-for 'RuntimeLibrary': value 'MTd_StaticDebug' doesn't match value
+By default, new Visual Studio projects link the C runtimes dynamically but
+GoogleTest links them statically. This will generate an error that looks
+something like the following: gtest.lib(gtest-all.obj) : error LNK2038: mismatch
+detected for 'RuntimeLibrary': value 'MTd_StaticDebug' doesn't match value
 'MDd_DynamicDebug' in main.obj
 
 GoogleTest already has a CMake option for this: `gtest_force_shared_crt`
 
-Enabling this option will make gtest link the runtimes dynamically too, and match the project in which it is included.
+Enabling this option will make gtest link the runtimes dynamically too, and
+match the project in which it is included.
 
 #### C++ Standard Version
 
-An environment that supports C++11 is required in order to successfully build GoogleTest. One way to ensure this is to
-specify the standard in the top-level project, for example by using the `set(CMAKE_CXX_STANDARD 11)` command. If this is
-not feasible, for example in a C project using GoogleTest for validation, then it can be specified by adding it to the
-options for cmake via the
-`DCMAKE_CXX_FLAGS` option.
+An environment that supports C++17 is required in order to successfully build
+GoogleTest. One way to ensure this is to specify the standard in the top-level
+project, for example by using the `set(CMAKE_CXX_STANDARD 17)` command along
+with `set(CMAKE_CXX_STANDARD_REQUIRED ON)`. If this is not feasible, for example
+in a C project using GoogleTest for validation, then it can be specified by
+adding it to the options for cmake via the`-DCMAKE_CXX_FLAGS` option.
 
 ### Tweaking GoogleTest
 
-GoogleTest can be used in diverse environments. The default configuration may not work (or may not work well) out of the
-box in some environments. However, you can easily tweak GoogleTest by defining control macros on the compiler command
-line. Generally, these macros are named like `GTEST_XYZ` and you define them to either 1 or 0 to enable or disable a
-certain feature.
+GoogleTest can be used in diverse environments. The default configuration may
+not work (or may not work well) out of the box in some environments. However,
+you can easily tweak GoogleTest by defining control macros on the compiler
+command line. Generally, these macros are named like `GTEST_XYZ` and you define
+them to either 1 or 0 to enable or disable a certain feature.
 
 We list the most frequently used macros below. For a complete list, see file
-[include/gtest/internal/gtest-port.h](https://github.com/google/googletest/blob/master/googletest/include/gtest/internal/gtest-port.h)
-.
+[include/gtest/internal/gtest-port.h](https://github.com/google/googletest/blob/main/googletest/include/gtest/internal/gtest-port.h).
 
 ### Multi-threaded Tests
 
 GoogleTest is thread-safe where the pthread library is available. After
-`#include "gtest/gtest.h"`, you can check the
+`#include <gtest/gtest.h>`, you can check the
 `GTEST_IS_THREADSAFE` macro to see whether this is the case (yes if the macro is
 `#defined` to 1, no if it's undefined.).
 
-If GoogleTest doesn't correctly detect whether pthread is available in your environment, you can force it with
+If GoogleTest doesn't correctly detect whether pthread is available in your
+environment, you can force it with
 
-    -DGTEST_HAS_PTHREAD=1
+```
+-DGTEST_HAS_PTHREAD=1
+```
 
 or
 
-    -DGTEST_HAS_PTHREAD=0
+```
+-DGTEST_HAS_PTHREAD=0
+```
 
-When GoogleTest uses pthread, you may need to add flags to your compiler and/or linker to select the pthread library, or
-you'll get link errors. If you use the CMake script, this is taken care of for you. If you use your own build script,
-you'll need to read your compiler and linker's manual to figure out what flags to add.
+When GoogleTest uses pthread, you may need to add flags to your compiler and/or
+linker to select the pthread library, or you'll get link errors. If you use the
+CMake script, this is taken care of for you. If you use your own build script,
+you'll need to read your compiler and linker's manual to figure out what flags
+to add.
 
 ### As a Shared Library (DLL)
 
-GoogleTest is compact, so most users can build and link it as a static library for the simplicity. You can choose to use
-GoogleTest as a shared library (known as a DLL on Windows) if you prefer.
+GoogleTest is compact, so most users can build and link it as a static library
+for the simplicity. You can choose to use GoogleTest as a shared library (known
+as a DLL on Windows) if you prefer.
 
 To compile *gtest* as a shared library, add
 
-    -DGTEST_CREATE_SHARED_LIBRARY=1
+```
+-DGTEST_CREATE_SHARED_LIBRARY=1
+```
 
-to the compiler flags. You'll also need to tell the linker to produce a shared library instead - consult your linker's
-manual for how to do it.
+to the compiler flags. You'll also need to tell the linker to produce a shared
+library instead - consult your linker's manual for how to do it.
 
 To compile your *tests* that use the gtest shared library, add
 
-    -DGTEST_LINKED_AS_SHARED_LIBRARY=1
+```
+-DGTEST_LINKED_AS_SHARED_LIBRARY=1
+```
 
 to the compiler flags.
 
-Note: while the above steps aren't technically necessary today when using some compilers (e.g. GCC), they may become
-necessary in the future, if we decide to improve the speed of loading the library (see
-<http://gcc.gnu.org/wiki/Visibility> for details). Therefore you are recommended to always add the above flags when
-using GoogleTest as a shared library. Otherwise a future release of GoogleTest may break your build script.
+Note: while the above steps aren't technically necessary today when using some
+compilers (e.g. GCC), they may become necessary in the future, if we decide to
+improve the speed of loading the library (see
+<https://gcc.gnu.org/wiki/Visibility> for details). Therefore you are
+recommended to always add the above flags when using GoogleTest as a shared
+library. Otherwise a future release of GoogleTest may break your build script.
 
 ### Avoiding Macro Name Clashes
 
-In C++, macros don't obey namespaces. Therefore two libraries that both define a macro of the same name will clash if
-you `#include` both definitions. In case a GoogleTest macro clashes with another library, you can force GoogleTest to
+In C++, macros don't obey namespaces. Therefore two libraries that both define a
+macro of the same name will clash if you `#include` both definitions. In case a
+GoogleTest macro clashes with another library, you can force GoogleTest to
 rename its macro to avoid the conflict.
 
-Specifically, if both GoogleTest and some other code define macro FOO, you can add
+Specifically, if both GoogleTest and some other code define macro FOO, you can
+add
 
-    -DGTEST_DONT_DEFINE_FOO=1
+```
+-DGTEST_DONT_DEFINE_FOO=1
+```
 
 to the compiler flags to tell GoogleTest to change the macro's name from `FOO`
-to `GTEST_FOO`. Currently `FOO` can be `FAIL`, `SUCCEED`, or `TEST`. For example, with `-DGTEST_DONT_DEFINE_TEST=1`,
-you'll need to write
+to `GTEST_FOO`. Currently `FOO` can be `ASSERT_EQ`, `ASSERT_FALSE`, `ASSERT_GE`,
+`ASSERT_GT`, `ASSERT_LE`, `ASSERT_LT`, `ASSERT_NE`, `ASSERT_TRUE`,
+`EXPECT_FALSE`, `EXPECT_TRUE`, `FAIL`, `SUCCEED`, `TEST`, or `TEST_F`. For
+example, with `-DGTEST_DONT_DEFINE_TEST=1`, you'll need to write
 
-    GTEST_TEST(SomeTest, DoesThis) { ... }
+```
+GTEST_TEST(SomeTest, DoesThis) { ... }
+```
 
 instead of
 
-    TEST(SomeTest, DoesThis) { ... }
+```
+TEST(SomeTest, DoesThis) { ... }
+```
 
 in order to define a test.
diff --git a/external/googletest/googletest/cmake/Config.cmake.in b/external/googletest/googletest/cmake/Config.cmake.in
index 12be4498..3f706612 100644
--- a/external/googletest/googletest/cmake/Config.cmake.in
+++ b/external/googletest/googletest/cmake/Config.cmake.in
@@ -4,6 +4,10 @@ if (@GTEST_HAS_PTHREAD@)
   set(THREADS_PREFER_PTHREAD_FLAG @THREADS_PREFER_PTHREAD_FLAG@)
   find_dependency(Threads)
 endif()
+if (@GTEST_HAS_ABSL@)
+  find_dependency(absl)
+  find_dependency(re2)
+endif()
 
 include("${CMAKE_CURRENT_LIST_DIR}/@targets_export_name@.cmake")
 check_required_components("@project_name@")
diff --git a/external/googletest/googletest/cmake/internal_utils.cmake b/external/googletest/googletest/cmake/internal_utils.cmake
index 2a92b0a1..7ca256a7 100644
--- a/external/googletest/googletest/cmake/internal_utils.cmake
+++ b/external/googletest/googletest/cmake/internal_utils.cmake
@@ -12,189 +12,190 @@
 #   Test and Google Mock's option() definitions, and thus must be
 #   called *after* the options have been defined.
 
-if (POLICY CMP0054)
-    cmake_policy(SET CMP0054 NEW)
-endif (POLICY CMP0054)
-
 # Tweaks CMake's default compiler/linker settings to suit Google Test's needs.
 #
 # This must be a macro(), as inside a function string() can only
 # update variables in the function scope.
 macro(fix_default_compiler_settings_)
-    if (MSVC)
-        # For MSVC, CMake sets certain flags to defaults we want to override.
-        # This replacement code is taken from sample in the CMake Wiki at
-        # https://gitlab.kitware.com/cmake/community/wikis/FAQ#dynamic-replace.
-        foreach (flag_var
-                CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE
-                CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO
-                CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
-                CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
-            if (NOT BUILD_SHARED_LIBS AND NOT gtest_force_shared_crt)
-                # When Google Test is built as a shared library, it should also use
-                # shared runtime libraries.  Otherwise, it may end up with multiple
-                # copies of runtime library data in different modules, resulting in
-                # hard-to-find crashes. When it is built as a static library, it is
-                # preferable to use CRT as static libraries, as we don't have to rely
-                # on CRT DLLs being available. CMake always defaults to using shared
-                # CRT libraries, so we override that default here.
-                string(REPLACE "/MD" "-MT" ${flag_var} "${${flag_var}}")
-            endif ()
+  if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC|Clang")
+    # For MSVC and Clang, CMake sets certain flags to defaults we want to
+    # override.
+    # This replacement code is taken from sample in the CMake Wiki at
+    # https://gitlab.kitware.com/cmake/community/wikis/FAQ#dynamic-replace.
+    foreach (flag_var
+             CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE
+             CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO
+             CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
+             CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
+      if (NOT BUILD_SHARED_LIBS AND NOT gtest_force_shared_crt)
+        # When Google Test is built as a shared library, it should also use
+        # shared runtime libraries. Otherwise, it may end up with multiple
+        # copies of runtime library data in different modules, resulting in
+        # hard-to-find crashes. When it is built as a static library, it is
+        # preferable to use CRT as static libraries, as we don't have to rely
+        # on CRT DLLs being available. CMake always defaults to using shared
+        # CRT libraries, so we override that default here.
+        string(REPLACE "/MD" "-MT" ${flag_var} "${${flag_var}}")
+
+        # When using Ninja with Clang, static builds pass -D_DLL on Windows.
+        # This is incorrect and should not happen, so we fix that here.
+        string(REPLACE "-D_DLL" "" ${flag_var} "${${flag_var}}")
+      endif()
 
-            # We prefer more strict warning checking for building Google Test.
-            # Replaces /W3 with /W4 in defaults.
-            string(REPLACE "/W3" "/W4" ${flag_var} "${${flag_var}}")
+      # We prefer more strict warning checking for building Google Test.
+      # Replaces /W3 with /W4 in defaults.
+      string(REPLACE "/W3" "/W4" ${flag_var} "${${flag_var}}")
 
-            # Prevent D9025 warning for targets that have exception handling
-            # turned off (/EHs-c- flag). Where required, exceptions are explicitly
-            # re-enabled using the cxx_exception_flags variable.
-            string(REPLACE "/EHsc" "" ${flag_var} "${${flag_var}}")
-        endforeach ()
-    endif ()
+      # Prevent D9025 warning for targets that have exception handling
+      # turned off (/EHs-c- flag). Where required, exceptions are explicitly
+      # re-enabled using the cxx_exception_flags variable.
+      string(REPLACE "/EHsc" "" ${flag_var} "${${flag_var}}")
+    endforeach()
+  endif()
 endmacro()
 
 # Defines the compiler/linker flags used to build Google Test and
-# Google Mock.  You can tweak these definitions to suit your need.  A
+# Google Mock. You can tweak these definitions to suit your need. A
 # variable's value is empty before it's explicitly assigned to.
 macro(config_compiler_and_linker)
-    # Note: pthreads on MinGW is not supported, even if available
-    # instead, we use windows threading primitives
-    unset(GTEST_HAS_PTHREAD)
-    if (NOT gtest_disable_pthreads AND NOT MINGW)
-        # Defines CMAKE_USE_PTHREADS_INIT and CMAKE_THREAD_LIBS_INIT.
-        find_package(Threads)
-        if (CMAKE_USE_PTHREADS_INIT)
-            set(GTEST_HAS_PTHREAD ON)
-        endif ()
-    endif ()
+  # Note: pthreads on MinGW is not supported, even if available
+  # instead, we use windows threading primitives.
+  unset(GTEST_HAS_PTHREAD)
+  if (NOT gtest_disable_pthreads AND NOT MINGW)
+    # Defines CMAKE_USE_PTHREADS_INIT and CMAKE_THREAD_LIBS_INIT.
+    find_package(Threads)
+    if (CMAKE_USE_PTHREADS_INIT)
+      set(GTEST_HAS_PTHREAD ON)
+    endif()
+  endif()
 
-    fix_default_compiler_settings_()
-    if (MSVC)
-        # Newlines inside flags variables break CMake's NMake generator.
-        # TODO(vladl@google.com): Add -RTCs and -RTCu to debug builds.
-        set(cxx_base_flags "-GS -W4 -WX -wd4251 -wd4275 -nologo -J")
-        set(cxx_base_flags "${cxx_base_flags} -D_UNICODE -DUNICODE -DWIN32 -D_WIN32")
-        set(cxx_base_flags "${cxx_base_flags} -DSTRICT -DWIN32_LEAN_AND_MEAN")
-        set(cxx_exception_flags "-EHsc -D_HAS_EXCEPTIONS=1")
-        set(cxx_no_exception_flags "-EHs-c- -D_HAS_EXCEPTIONS=0")
-        set(cxx_no_rtti_flags "-GR-")
-        # Suppress "unreachable code" warning
-        # http://stackoverflow.com/questions/3232669 explains the issue.
-        set(cxx_base_flags "${cxx_base_flags} -wd4702")
-        # Ensure MSVC treats source files as UTF-8 encoded.
-        set(cxx_base_flags "${cxx_base_flags} -utf-8")
-    elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-        set(cxx_base_flags "-Wall -Wshadow -Werror -Wconversion")
-        set(cxx_exception_flags "-fexceptions")
-        set(cxx_no_exception_flags "-fno-exceptions")
-        set(cxx_strict_flags "-W -Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wunused-parameter -Wcast-align -Wchar-subscripts -Winline -Wredundant-decls")
-        set(cxx_no_rtti_flags "-fno-rtti")
-    elseif (CMAKE_COMPILER_IS_GNUCXX)
-        set(cxx_base_flags "-Wall -Wshadow -Werror")
-        if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0.0)
-            set(cxx_base_flags "${cxx_base_flags} -Wno-error=dangling-else")
-        endif ()
-        set(cxx_exception_flags "-fexceptions")
-        set(cxx_no_exception_flags "-fno-exceptions")
-        # Until version 4.3.2, GCC doesn't define a macro to indicate
-        # whether RTTI is enabled.  Therefore we define GTEST_HAS_RTTI
-        # explicitly.
-        set(cxx_no_rtti_flags "-fno-rtti -DGTEST_HAS_RTTI=0")
-        set(cxx_strict_flags
-                "-Wextra -Wno-unused-parameter -Wno-missing-field-initializers")
-    elseif (CMAKE_CXX_COMPILER_ID STREQUAL "SunPro")
-        set(cxx_exception_flags "-features=except")
-        # Sun Pro doesn't provide macros to indicate whether exceptions and
-        # RTTI are enabled, so we define GTEST_HAS_* explicitly.
-        set(cxx_no_exception_flags "-features=no%except -DGTEST_HAS_EXCEPTIONS=0")
-        set(cxx_no_rtti_flags "-features=no%rtti -DGTEST_HAS_RTTI=0")
-    elseif (CMAKE_CXX_COMPILER_ID STREQUAL "VisualAge" OR
-            CMAKE_CXX_COMPILER_ID STREQUAL "XL")
-        # CMake 2.8 changes Visual Age's compiler ID to "XL".
-        set(cxx_exception_flags "-qeh")
-        set(cxx_no_exception_flags "-qnoeh")
-        # Until version 9.0, Visual Age doesn't define a macro to indicate
-        # whether RTTI is enabled.  Therefore we define GTEST_HAS_RTTI
-        # explicitly.
-        set(cxx_no_rtti_flags "-qnortti -DGTEST_HAS_RTTI=0")
-    elseif (CMAKE_CXX_COMPILER_ID STREQUAL "HP")
-        set(cxx_base_flags "-AA -mt")
-        set(cxx_exception_flags "-DGTEST_HAS_EXCEPTIONS=1")
-        set(cxx_no_exception_flags "+noeh -DGTEST_HAS_EXCEPTIONS=0")
-        # RTTI can not be disabled in HP aCC compiler.
-        set(cxx_no_rtti_flags "")
-    endif ()
+  fix_default_compiler_settings_()
+  if (MSVC)
+    # Newlines inside flags variables break CMake's NMake generator.
+    # TODO(vladl@google.com): Add -RTCs and -RTCu to debug builds.
+    set(cxx_base_flags "-GS -W4 -WX -wd4251 -wd4275 -nologo -J")
+    set(cxx_base_flags "${cxx_base_flags} -D_UNICODE -DUNICODE -DWIN32 -D_WIN32")
+    set(cxx_base_flags "${cxx_base_flags} -DSTRICT -DWIN32_LEAN_AND_MEAN")
+    set(cxx_exception_flags "-EHsc -D_HAS_EXCEPTIONS=1")
+    set(cxx_no_exception_flags "-EHs-c- -D_HAS_EXCEPTIONS=0")
+    set(cxx_no_rtti_flags "-GR-")
+    # Suppress "unreachable code" warning,
+    # https://stackoverflow.com/questions/3232669 explains the issue.
+    set(cxx_base_flags "${cxx_base_flags} -wd4702")
+    # Ensure MSVC treats source files as UTF-8 encoded.
+    if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+      set(cxx_base_flags "${cxx_base_flags} -utf-8")
+    endif()
+    if (CMAKE_CXX_COMPILER_ID STREQUAL "IntelLLVM")
+      set(cxx_base_flags "${cxx_base_flags} /fp:precise -Wno-inconsistent-missing-override -Wno-microsoft-exception-spec -Wno-unused-function -Wno-unused-but-set-variable")
+    endif()
+  elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR
+      CMAKE_CXX_COMPILER_ID STREQUAL "IntelLLVM")
+    set(cxx_base_flags "-Wall -Wshadow -Wconversion -Wundef")
+    set(cxx_exception_flags "-fexceptions")
+    set(cxx_no_exception_flags "-fno-exceptions")
+    set(cxx_strict_flags "-W -Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wunused-parameter -Wcast-align -Winline -Wredundant-decls")
+    set(cxx_no_rtti_flags "-fno-rtti")
+    if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+      set(cxx_strict_flags "${cxx_strict_flags} -Wchar-subscripts")
+    endif()
+    if (CMAKE_CXX_COMPILER_ID STREQUAL "IntelLLVM")
+      set(cxx_base_flags "${cxx_base_flags} -Wno-implicit-float-size-conversion -ffp-model=precise")
+    endif()
+  elseif (CMAKE_COMPILER_IS_GNUCXX)
+    set(cxx_base_flags "-Wall -Wshadow -Wundef")
+    if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0.0)
+      set(cxx_base_flags "${cxx_base_flags} -Wno-error=dangling-else")
+    endif()
+    set(cxx_exception_flags "-fexceptions")
+    set(cxx_no_exception_flags "-fno-exceptions")
+    # Until version 4.3.2, GCC doesn't define a macro to indicate
+    # whether RTTI is enabled. Therefore we define GTEST_HAS_RTTI
+    # explicitly.
+    set(cxx_no_rtti_flags "-fno-rtti -DGTEST_HAS_RTTI=0")
+    set(cxx_strict_flags
+      "-Wextra -Wno-unused-parameter -Wno-missing-field-initializers")
+  elseif (CMAKE_CXX_COMPILER_ID STREQUAL "SunPro")
+    set(cxx_exception_flags "-features=except")
+    # Sun Pro doesn't provide macros to indicate whether exceptions and
+    # RTTI are enabled, so we define GTEST_HAS_* explicitly.
+    set(cxx_no_exception_flags "-features=no%except -DGTEST_HAS_EXCEPTIONS=0")
+    set(cxx_no_rtti_flags "-features=no%rtti -DGTEST_HAS_RTTI=0")
+  elseif (CMAKE_CXX_COMPILER_ID STREQUAL "VisualAge" OR
+      CMAKE_CXX_COMPILER_ID STREQUAL "XL")
+    # CMake 2.8 changes Visual Age's compiler ID to "XL".
+    set(cxx_exception_flags "-qeh")
+    set(cxx_no_exception_flags "-qnoeh")
+    # Until version 9.0, Visual Age doesn't define a macro to indicate
+    # whether RTTI is enabled. Therefore we define GTEST_HAS_RTTI
+    # explicitly.
+    set(cxx_no_rtti_flags "-qnortti -DGTEST_HAS_RTTI=0")
+  elseif (CMAKE_CXX_COMPILER_ID STREQUAL "HP")
+    set(cxx_base_flags "-AA -mt")
+    set(cxx_exception_flags "-DGTEST_HAS_EXCEPTIONS=1")
+    set(cxx_no_exception_flags "+noeh -DGTEST_HAS_EXCEPTIONS=0")
+    # RTTI can not be disabled in HP aCC compiler.
+    set(cxx_no_rtti_flags "")
+  endif()
 
-    # The pthreads library is available and allowed?
-    if (DEFINED GTEST_HAS_PTHREAD)
-        set(GTEST_HAS_PTHREAD_MACRO "-DGTEST_HAS_PTHREAD=1")
-    else ()
-        set(GTEST_HAS_PTHREAD_MACRO "-DGTEST_HAS_PTHREAD=0")
-    endif ()
-    set(cxx_base_flags "${cxx_base_flags} ${GTEST_HAS_PTHREAD_MACRO}")
+  # The pthreads library is available and allowed?
+  if (DEFINED GTEST_HAS_PTHREAD)
+    set(GTEST_HAS_PTHREAD_MACRO "-DGTEST_HAS_PTHREAD=1")
+  else()
+    set(GTEST_HAS_PTHREAD_MACRO "-DGTEST_HAS_PTHREAD=0")
+  endif()
+  set(cxx_base_flags "${cxx_base_flags} ${GTEST_HAS_PTHREAD_MACRO}")
 
-    # For building gtest's own tests and samples.
-    set(cxx_exception "${cxx_base_flags} ${cxx_exception_flags}")
-    set(cxx_no_exception
-            "${CMAKE_CXX_FLAGS} ${cxx_base_flags} ${cxx_no_exception_flags}")
-    set(cxx_default "${cxx_exception}")
-    set(cxx_no_rtti "${cxx_default} ${cxx_no_rtti_flags}")
+  # For building gtest's own tests and samples.
+  set(cxx_exception "${cxx_base_flags} ${cxx_exception_flags}")
+  set(cxx_no_exception
+    "${CMAKE_CXX_FLAGS} ${cxx_base_flags} ${cxx_no_exception_flags}")
+  set(cxx_default "${cxx_exception}")
+  set(cxx_no_rtti "${cxx_default} ${cxx_no_rtti_flags}")
 
-    # For building the gtest libraries.
-    set(cxx_strict "${cxx_default} ${cxx_strict_flags}")
+  # For building the gtest libraries.
+  set(cxx_strict "${cxx_default} ${cxx_strict_flags}")
 endmacro()
 
-# Defines the gtest & gtest_main libraries.  User tests should link
+# Defines the gtest & gtest_main libraries. User tests should link
 # with one of them.
 function(cxx_library_with_type name type cxx_flags)
-    # type can be either STATIC or SHARED to denote a static or shared library.
-    # ARGN refers to additional arguments after 'cxx_flags'.
-    add_library(${name} ${type} ${ARGN})
-    add_library(${cmake_package_name}::${name} ALIAS ${name})
-    set_target_properties(${name}
-            PROPERTIES
-            COMPILE_FLAGS "${cxx_flags}")
-    # Generate debug library name with a postfix.
-    set_target_properties(${name}
-            PROPERTIES
-            DEBUG_POSTFIX "d")
-    # Set the output directory for build artifacts
-    set_target_properties(${name}
-            PROPERTIES
-            RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
-            LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
-            ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
-            PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
-    # make PDBs match library name
-    get_target_property(pdb_debug_postfix ${name} DEBUG_POSTFIX)
-    set_target_properties(${name}
-            PROPERTIES
-            PDB_NAME "${name}"
-            PDB_NAME_DEBUG "${name}${pdb_debug_postfix}"
-            COMPILE_PDB_NAME "${name}"
-            COMPILE_PDB_NAME_DEBUG "${name}${pdb_debug_postfix}")
+  # type can be either STATIC or SHARED to denote a static or shared library.
+  # ARGN refers to additional arguments after 'cxx_flags'.
+  add_library(${name} ${type} ${ARGN})
+  add_library(${cmake_package_name}::${name} ALIAS ${name})
+  set_target_properties(${name}
+    PROPERTIES
+    COMPILE_FLAGS "${cxx_flags}")
+  # Set the output directory for build artifacts.
+  set_target_properties(${name}
+    PROPERTIES
+    RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
+    LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
+    ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
+    PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
+    COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
+  # Make PDBs match library name.
+  get_target_property(pdb_debug_postfix ${name} DEBUG_POSTFIX)
+  set_target_properties(${name}
+    PROPERTIES
+    PDB_NAME "${name}"
+    PDB_NAME_DEBUG "${name}${pdb_debug_postfix}"
+    COMPILE_PDB_NAME "${name}"
+    COMPILE_PDB_NAME_DEBUG "${name}${pdb_debug_postfix}")
 
-    if (BUILD_SHARED_LIBS OR type STREQUAL "SHARED")
-        set_target_properties(${name}
-                PROPERTIES
-                COMPILE_DEFINITIONS "GTEST_CREATE_SHARED_LIBRARY=1")
-        if (NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11")
-            target_compile_definitions(${name} INTERFACE
-                    $<INSTALL_INTERFACE:GTEST_LINKED_AS_SHARED_LIBRARY=1>)
-        endif ()
-    endif ()
-    if (DEFINED GTEST_HAS_PTHREAD)
-        if ("${CMAKE_VERSION}" VERSION_LESS "3.1.0")
-            set(threads_spec ${CMAKE_THREAD_LIBS_INIT})
-        else ()
-            set(threads_spec Threads::Threads)
-        endif ()
-        target_link_libraries(${name} PUBLIC ${threads_spec})
-    endif ()
+  if (BUILD_SHARED_LIBS OR type STREQUAL "SHARED")
+    set_target_properties(${name}
+      PROPERTIES
+      COMPILE_DEFINITIONS "GTEST_CREATE_SHARED_LIBRARY=1")
+    target_compile_definitions(${name} INTERFACE
+      $<INSTALL_INTERFACE:GTEST_LINKED_AS_SHARED_LIBRARY=1>)
+  endif()
+  if (DEFINED GTEST_HAS_PTHREAD)
+    target_link_libraries(${name} PUBLIC Threads::Threads)
+  endif()
 
-    if (NOT "${CMAKE_VERSION}" VERSION_LESS "3.8")
-        target_compile_features(${name} PUBLIC cxx_std_11)
-    endif ()
+  target_compile_features(${name} PUBLIC cxx_std_17)
 endfunction()
 
 ########################################################################
@@ -202,143 +203,132 @@ endfunction()
 # Helper functions for creating build targets.
 
 function(cxx_shared_library name cxx_flags)
-    cxx_library_with_type(${name} SHARED "${cxx_flags}" ${ARGN})
+  cxx_library_with_type(${name} SHARED "${cxx_flags}" ${ARGN})
 endfunction()
 
 function(cxx_library name cxx_flags)
-    cxx_library_with_type(${name} "" "${cxx_flags}" ${ARGN})
+  cxx_library_with_type(${name} "" "${cxx_flags}" ${ARGN})
 endfunction()
 
 # cxx_executable_with_flags(name cxx_flags libs srcs...)
 #
-# creates a named C++ executable that depends on the given libraries and
+# Creates a named C++ executable that depends on the given libraries and
 # is built from the given source files with the given compiler flags.
 function(cxx_executable_with_flags name cxx_flags libs)
-    add_executable(${name} ${ARGN})
-    if (MSVC)
-        # BigObj required for tests.
-        set(cxx_flags "${cxx_flags} -bigobj")
-    endif ()
-    if (cxx_flags)
-        set_target_properties(${name}
-                PROPERTIES
-                COMPILE_FLAGS "${cxx_flags}")
-    endif ()
-    if (BUILD_SHARED_LIBS)
-        set_target_properties(${name}
-                PROPERTIES
-                COMPILE_DEFINITIONS "GTEST_LINKED_AS_SHARED_LIBRARY=1")
-    endif ()
-    # To support mixing linking in static and dynamic libraries, link each
-    # library in with an extra call to target_link_libraries.
-    foreach (lib "${libs}")
-        target_link_libraries(${name} ${lib})
-    endforeach ()
+  add_executable(${name} ${ARGN})
+  if (MSVC)
+    # BigObj required for tests.
+    set(cxx_flags "${cxx_flags} -bigobj")
+  endif()
+  if (cxx_flags)
+    set_target_properties(${name}
+      PROPERTIES
+      COMPILE_FLAGS "${cxx_flags}")
+  endif()
+  if (BUILD_SHARED_LIBS)
+    set_target_properties(${name}
+      PROPERTIES
+      COMPILE_DEFINITIONS "GTEST_LINKED_AS_SHARED_LIBRARY=1")
+  endif()
+  # To support mixing linking in static and dynamic libraries, link each
+  # library in with an extra call to target_link_libraries.
+  foreach (lib "${libs}")
+    target_link_libraries(${name} ${lib})
+  endforeach()
 endfunction()
 
 # cxx_executable(name dir lib srcs...)
 #
-# creates a named target that depends on the given libs and is built
-# from the given source files.  dir/name.cc is implicitly included in
+# Creates a named target that depends on the given libs and is built
+# from the given source files. dir/name.cc is implicitly included in
 # the source file list.
 function(cxx_executable name dir libs)
-    cxx_executable_with_flags(
-            ${name} "${cxx_default}" "${libs}" "${dir}/${name}.cc" ${ARGN})
+  cxx_executable_with_flags(
+    ${name} "${cxx_default}" "${libs}" "${dir}/${name}.cc" ${ARGN})
 endfunction()
 
-# Sets PYTHONINTERP_FOUND and PYTHON_EXECUTABLE.
-if ("${CMAKE_VERSION}" VERSION_LESS "3.12.0")
-    find_package(PythonInterp)
-else ()
-    find_package(Python COMPONENTS Interpreter)
-    set(PYTHONINTERP_FOUND ${Python_Interpreter_FOUND})
-    set(PYTHON_EXECUTABLE ${Python_EXECUTABLE})
-endif ()
+if(gtest_build_tests)
+  find_package(Python3)
+endif()
 
 # cxx_test_with_flags(name cxx_flags libs srcs...)
 #
-# creates a named C++ test that depends on the given libs and is built
+# Creates a named C++ test that depends on the given libs and is built
 # from the given source files with the given compiler flags.
 function(cxx_test_with_flags name cxx_flags libs)
-    cxx_executable_with_flags(${name} "${cxx_flags}" "${libs}" ${ARGN})
+  cxx_executable_with_flags(${name} "${cxx_flags}" "${libs}" ${ARGN})
     add_test(NAME ${name} COMMAND "$<TARGET_FILE:${name}>")
 endfunction()
 
 # cxx_test(name libs srcs...)
 #
-# creates a named test target that depends on the given libs and is
-# built from the given source files.  Unlike cxx_test_with_flags,
+# Creates a named test target that depends on the given libs and is
+# built from the given source files. Unlike cxx_test_with_flags,
 # test/name.cc is already implicitly included in the source file list.
 function(cxx_test name libs)
-    cxx_test_with_flags("${name}" "${cxx_default}" "${libs}"
-            "test/${name}.cc" ${ARGN})
+  cxx_test_with_flags("${name}" "${cxx_default}" "${libs}"
+    "test/${name}.cc" ${ARGN})
 endfunction()
 
 # py_test(name)
 #
-# creates a Python test with the given name whose main module is in
-# test/name.py.  It does nothing if Python is not installed.
+# Creates a Python test with the given name whose main module is in
+# test/name.py. It does nothing if Python is not installed.
 function(py_test name)
-    if (PYTHONINTERP_FOUND)
-        if ("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_GREATER 3.1)
-            if (CMAKE_CONFIGURATION_TYPES)
-                # Multi-configuration build generators as for Visual Studio save
-                # output in a subdirectory of CMAKE_CURRENT_BINARY_DIR (Debug,
-                # Release etc.), so we have to provide it here.
-                add_test(NAME ${name}
-                        COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/${name}.py
-                        --build_dir=${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG> ${ARGN})
-            else (CMAKE_CONFIGURATION_TYPES)
-                # Single-configuration build generators like Makefile generators
-                # don't have subdirs below CMAKE_CURRENT_BINARY_DIR.
-                add_test(NAME ${name}
-                        COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/${name}.py
-                        --build_dir=${CMAKE_CURRENT_BINARY_DIR} ${ARGN})
-            endif (CMAKE_CONFIGURATION_TYPES)
-        else ()
-            # ${CMAKE_CURRENT_BINARY_DIR} is known at configuration time, so we can
-            # directly bind it from cmake. ${CTEST_CONFIGURATION_TYPE} is known
-            # only at ctest runtime (by calling ctest -c <Configuration>), so
-            # we have to escape $ to delay variable substitution here.
-            add_test(NAME ${name}
-                    COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/${name}.py
-                    --build_dir=${CMAKE_CURRENT_BINARY_DIR}/\${CTEST_CONFIGURATION_TYPE} ${ARGN})
-        endif ()
-    endif (PYTHONINTERP_FOUND)
+  if (NOT Python3_Interpreter_FOUND)
+    return()
+  endif()
+
+  get_cmake_property(is_multi "GENERATOR_IS_MULTI_CONFIG")
+  set(build_dir "${CMAKE_CURRENT_BINARY_DIR}")
+  if (is_multi)
+    set(build_dir "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>")
+  endif()
+
+  add_test(NAME ${name}
+      COMMAND Python3::Interpreter ${CMAKE_CURRENT_SOURCE_DIR}/test/${name}.py
+          --build_dir=${build_dir} ${ARGN})
+
+  # Make the Python import path consistent between Bazel and CMake.
+  set_tests_properties(${name} PROPERTIES ENVIRONMENT PYTHONPATH=${CMAKE_SOURCE_DIR})
 endfunction()
 
 # install_project(targets...)
 #
 # Installs the specified targets and configures the associated pkgconfig files.
 function(install_project)
-    if (INSTALL_GTEST)
-        install(DIRECTORY "${PROJECT_SOURCE_DIR}/include/"
-                DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
-        # Install the project targets.
-        install(TARGETS ${ARGN}
-                EXPORT ${targets_export_name}
-                RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
-                ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-                LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
-        if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
-            # Install PDBs
-            foreach (t ${ARGN})
-                get_target_property(t_pdb_name ${t} COMPILE_PDB_NAME)
-                get_target_property(t_pdb_name_debug ${t} COMPILE_PDB_NAME_DEBUG)
-                get_target_property(t_pdb_output_directory ${t} PDB_OUTPUT_DIRECTORY)
-                install(FILES
-                        "${t_pdb_output_directory}/\${CMAKE_INSTALL_CONFIG_NAME}/$<$<CONFIG:Debug>:${t_pdb_name_debug}>$<$<NOT:$<CONFIG:Debug>>:${t_pdb_name}>.pdb"
-                        DESTINATION ${CMAKE_INSTALL_LIBDIR}
-                        OPTIONAL)
-            endforeach ()
-        endif ()
-        # Configure and install pkgconfig files.
-        foreach (t ${ARGN})
-            set(configured_pc "${generated_dir}/${t}.pc")
-            configure_file("${PROJECT_SOURCE_DIR}/cmake/${t}.pc.in"
-                    "${configured_pc}" @ONLY)
-            install(FILES "${configured_pc}"
-                    DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
-        endforeach ()
-    endif ()
+  if(INSTALL_GTEST)
+    install(DIRECTORY "${PROJECT_SOURCE_DIR}/include/"
+      COMPONENT "${PROJECT_NAME}"
+      DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+    # Install the project targets.
+    install(TARGETS ${ARGN}
+      EXPORT ${targets_export_name}
+      COMPONENT "${PROJECT_NAME}"
+      RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+      ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+      LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+    if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+      # Install PDBs.
+      foreach(t ${ARGN})
+        get_target_property(t_pdb_name ${t} COMPILE_PDB_NAME)
+        get_target_property(t_pdb_name_debug ${t} COMPILE_PDB_NAME_DEBUG)
+        get_target_property(t_pdb_output_directory ${t} PDB_OUTPUT_DIRECTORY)
+        install(FILES
+          "${t_pdb_output_directory}/\${CMAKE_INSTALL_CONFIG_NAME}/$<$<CONFIG:Debug>:${t_pdb_name_debug}>$<$<NOT:$<CONFIG:Debug>>:${t_pdb_name}>.pdb"
+          COMPONENT "${PROJECT_NAME}"
+          DESTINATION ${CMAKE_INSTALL_LIBDIR}
+          OPTIONAL)
+      endforeach()
+    endif()
+    # Configure and install pkgconfig files.
+    foreach(t ${ARGN})
+      set(configured_pc "${generated_dir}/${t}.pc")
+      configure_file("${PROJECT_SOURCE_DIR}/cmake/${t}.pc.in"
+        "${configured_pc}" @ONLY)
+      install(FILES "${configured_pc}"
+        COMPONENT "${PROJECT_NAME}"
+        DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+    endforeach()
+  endif()
 endfunction()
diff --git a/external/googletest/googletest/docs/README.md b/external/googletest/googletest/docs/README.md
index e55dfa5e..1bc57b79 100644
--- a/external/googletest/googletest/docs/README.md
+++ b/external/googletest/googletest/docs/README.md
@@ -1,4 +1,4 @@
 # Content Moved
 
-We are working on updates to the GoogleTest documentation, which has moved to the top-level [docs](../../docs)
-directory.
+We are working on updates to the GoogleTest documentation, which has moved to
+the top-level [docs](../../docs) directory.
diff --git a/external/googletest/googletest/include/gtest/gtest-assertion-result.h b/external/googletest/googletest/include/gtest/gtest-assertion-result.h
new file mode 100644
index 00000000..954e7c40
--- /dev/null
+++ b/external/googletest/googletest/include/gtest/gtest-assertion-result.h
@@ -0,0 +1,244 @@
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// The Google C++ Testing and Mocking Framework (Google Test)
+//
+// This file implements the AssertionResult type.
+
+// IWYU pragma: private, include "gtest/gtest.h"
+// IWYU pragma: friend gtest/.*
+// IWYU pragma: friend gmock/.*
+
+#ifndef GOOGLETEST_INCLUDE_GTEST_GTEST_ASSERTION_RESULT_H_
+#define GOOGLETEST_INCLUDE_GTEST_GTEST_ASSERTION_RESULT_H_
+
+#include <memory>
+#include <ostream>
+#include <string>
+#include <type_traits>
+
+#include "gtest/gtest-message.h"
+#include "gtest/internal/gtest-port.h"
+
+GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251                                   \
+/* class A needs to have dll-interface to be used by clients of class B */)
+
+namespace testing {
+
+// A class for indicating whether an assertion was successful.  When
+// the assertion wasn't successful, the AssertionResult object
+// remembers a non-empty message that describes how it failed.
+//
+// To create an instance of this class, use one of the factory functions
+// (AssertionSuccess() and AssertionFailure()).
+//
+// This class is useful for two purposes:
+//   1. Defining predicate functions to be used with Boolean test assertions
+//      EXPECT_TRUE/EXPECT_FALSE and their ASSERT_ counterparts
+//   2. Defining predicate-format functions to be
+//      used with predicate assertions (ASSERT_PRED_FORMAT*, etc).
+//
+// For example, if you define IsEven predicate:
+//
+//   testing::AssertionResult IsEven(int n) {
+//     if ((n % 2) == 0)
+//       return testing::AssertionSuccess();
+//     else
+//       return testing::AssertionFailure() << n << " is odd";
+//   }
+//
+// Then the failed expectation EXPECT_TRUE(IsEven(Fib(5)))
+// will print the message
+//
+//   Value of: IsEven(Fib(5))
+//     Actual: false (5 is odd)
+//   Expected: true
+//
+// instead of a more opaque
+//
+//   Value of: IsEven(Fib(5))
+//     Actual: false
+//   Expected: true
+//
+// in case IsEven is a simple Boolean predicate.
+//
+// If you expect your predicate to be reused and want to support informative
+// messages in EXPECT_FALSE and ASSERT_FALSE (negative assertions show up
+// about half as often as positive ones in our tests), supply messages for
+// both success and failure cases:
+//
+//   testing::AssertionResult IsEven(int n) {
+//     if ((n % 2) == 0)
+//       return testing::AssertionSuccess() << n << " is even";
+//     else
+//       return testing::AssertionFailure() << n << " is odd";
+//   }
+//
+// Then a statement EXPECT_FALSE(IsEven(Fib(6))) will print
+//
+//   Value of: IsEven(Fib(6))
+//     Actual: true (8 is even)
+//   Expected: false
+//
+// NB: Predicates that support negative Boolean assertions have reduced
+// performance in positive ones so be careful not to use them in tests
+// that have lots (tens of thousands) of positive Boolean assertions.
+//
+// To use this class with EXPECT_PRED_FORMAT assertions such as:
+//
+//   // Verifies that Foo() returns an even number.
+//   EXPECT_PRED_FORMAT1(IsEven, Foo());
+//
+// you need to define:
+//
+//   testing::AssertionResult IsEven(const char* expr, int n) {
+//     if ((n % 2) == 0)
+//       return testing::AssertionSuccess();
+//     else
+//       return testing::AssertionFailure()
+//         << "Expected: " << expr << " is even\n  Actual: it's " << n;
+//   }
+//
+// If Foo() returns 5, you will see the following message:
+//
+//   Expected: Foo() is even
+//     Actual: it's 5
+//
+
+// Returned AssertionResult objects may not be ignored.
+// Note: Disabled for SWIG as it doesn't parse attributes correctly.
+#if !defined(SWIG)
+class [[nodiscard]] AssertionResult;
+#endif  // !SWIG
+
+class GTEST_API_ AssertionResult {
+ public:
+  // Copy constructor.
+  // Used in EXPECT_TRUE/FALSE(assertion_result).
+  AssertionResult(const AssertionResult& other);
+
+// C4800 is a level 3 warning in Visual Studio 2015 and earlier.
+// This warning is not emitted in Visual Studio 2017.
+// This warning is off by default starting in Visual Studio 2019 but can be
+// enabled with command-line options.
+#if defined(_MSC_VER) && (_MSC_VER < 1910 || _MSC_VER >= 1920)
+  GTEST_DISABLE_MSC_WARNINGS_PUSH_(4800 /* forcing value to bool */)
+#endif
+
+  // Used in the EXPECT_TRUE/FALSE(bool_expression).
+  //
+  // T must be contextually convertible to bool.
+  //
+  // The second parameter prevents this overload from being considered if
+  // the argument is implicitly convertible to AssertionResult. In that case
+  // we want AssertionResult's copy constructor to be used.
+  template <typename T>
+  explicit AssertionResult(
+      const T& success,
+      typename std::enable_if<
+          !std::is_convertible<T, AssertionResult>::value>::type*
+      /*enabler*/
+      = nullptr)
+      : success_(success) {}
+
+#if defined(_MSC_VER) && (_MSC_VER < 1910 || _MSC_VER >= 1920)
+  GTEST_DISABLE_MSC_WARNINGS_POP_()
+#endif
+
+  // Assignment operator.
+  AssertionResult& operator=(AssertionResult other) {
+    swap(other);
+    return *this;
+  }
+
+  // Returns true if and only if the assertion succeeded.
+  operator bool() const { return success_; }  // NOLINT
+
+  // Returns the assertion's negation. Used with EXPECT/ASSERT_FALSE.
+  AssertionResult operator!() const;
+
+  // Returns the text streamed into this AssertionResult. Test assertions
+  // use it when they fail (i.e., the predicate's outcome doesn't match the
+  // assertion's expectation). When nothing has been streamed into the
+  // object, returns an empty string.
+  const char* message() const {
+    return message_ != nullptr ? message_->c_str() : "";
+  }
+  // Deprecated; please use message() instead.
+  const char* failure_message() const { return message(); }
+
+  // Streams a custom failure message into this object.
+  template <typename T>
+  AssertionResult& operator<<(const T& value) {
+    AppendMessage(Message() << value);
+    return *this;
+  }
+
+  // Allows streaming basic output manipulators such as endl or flush into
+  // this object.
+  AssertionResult& operator<<(
+      ::std::ostream& (*basic_manipulator)(::std::ostream& stream)) {
+    AppendMessage(Message() << basic_manipulator);
+    return *this;
+  }
+
+ private:
+  // Appends the contents of message to message_.
+  void AppendMessage(const Message& a_message) {
+    if (message_ == nullptr) message_ = ::std::make_unique<::std::string>();
+    message_->append(a_message.GetString().c_str());
+  }
+
+  // Swap the contents of this AssertionResult with other.
+  void swap(AssertionResult& other);
+
+  // Stores result of the assertion predicate.
+  bool success_;
+  // Stores the message describing the condition in case the expectation
+  // construct is not satisfied with the predicate's outcome.
+  // Referenced via a pointer to avoid taking too much stack frame space
+  // with test assertions.
+  std::unique_ptr< ::std::string> message_;
+};
+
+// Makes a successful assertion result.
+GTEST_API_ AssertionResult AssertionSuccess();
+
+// Makes a failed assertion result.
+GTEST_API_ AssertionResult AssertionFailure();
+
+// Makes a failed assertion result with the given failure message.
+// Deprecated; use AssertionFailure() << msg.
+GTEST_API_ AssertionResult AssertionFailure(const Message& msg);
+
+}  // namespace testing
+
+GTEST_DISABLE_MSC_WARNINGS_POP_()  // 4251
+
+#endif  // GOOGLETEST_INCLUDE_GTEST_GTEST_ASSERTION_RESULT_H_
diff --git a/external/googletest/googletest/include/gtest/gtest-death-test.h b/external/googletest/googletest/include/gtest/gtest-death-test.h
index 416af5f7..3c619097 100644
--- a/external/googletest/googletest/include/gtest/gtest-death-test.h
+++ b/external/googletest/googletest/include/gtest/gtest-death-test.h
@@ -27,21 +27,21 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-//
 // The Google C++ Testing and Mocking Framework (Google Test)
 //
 // This header file defines the public API for death tests.  It is
 // #included by gtest.h so a user doesn't need to include this
 // directly.
-// GOOGLETEST_CM0001 DO NOT DELETE
+
+// IWYU pragma: private, include "gtest/gtest.h"
+// IWYU pragma: friend gtest/.*
+// IWYU pragma: friend gmock/.*
 
 #ifndef GOOGLETEST_INCLUDE_GTEST_GTEST_DEATH_TEST_H_
 #define GOOGLETEST_INCLUDE_GTEST_GTEST_DEATH_TEST_H_
 
 #include "gtest/internal/gtest-death-test-internal.h"
 
-namespace testing {
-
 // This flag controls the style of death tests.  Valid values are "threadsafe",
 // meaning that the death test child process will re-execute the test binary
 // from the start, running only a single death test, or "fast",
@@ -49,7 +49,9 @@ namespace testing {
 // after forking.
 GTEST_DECLARE_string_(death_test_style);
 
-#if GTEST_HAS_DEATH_TEST
+namespace testing {
+
+#ifdef GTEST_HAS_DEATH_TEST
 
 namespace internal {
 
@@ -103,7 +105,6 @@ GTEST_API_ bool InDeathTestChild();
 //
 // On the regular expressions used in death tests:
 //
-//   GOOGLETEST_CM0005 DO NOT DELETE
 //   On POSIX-compliant systems (*nix), we use the <regex.h> library,
 //   which uses the POSIX extended regex syntax.
 //
@@ -202,10 +203,9 @@ class GTEST_API_ ExitedWithCode {
   const int exit_code_;
 };
 
-#if !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA
+#if !defined(GTEST_OS_WINDOWS) && !defined(GTEST_OS_FUCHSIA)
 // Tests that an exit code describes an exit due to termination by a
 // given signal.
-// GOOGLETEST_CM0006 DO NOT DELETE
 class GTEST_API_ KilledBySignal {
  public:
   explicit KilledBySignal(int signum);
@@ -293,8 +293,8 @@ class GTEST_API_ KilledBySignal {
 //                statement is compiled but not executed, to ensure that
 //                EXPECT_DEATH_IF_SUPPORTED compiles with a certain
 //                parameter if and only if EXPECT_DEATH compiles with it.
-//   regex     -  A regex that a macro such as EXPECT_DEATH would use to test
-//                the output of statement.  This parameter has to be
+//   regex_or_matcher -  A regex that a macro such as EXPECT_DEATH would use
+//                to test the output of statement.  This parameter has to be
 //                compiled but not evaluated by this macro, to ensure that
 //                this macro only accepts expressions that a macro such as
 //                EXPECT_DEATH would accept.
@@ -311,13 +311,13 @@ class GTEST_API_ KilledBySignal {
 //  statement unconditionally returns or throws. The Message constructor at
 //  the end allows the syntax of streaming additional messages into the
 //  macro, for compilational compatibility with EXPECT_DEATH/ASSERT_DEATH.
-#define GTEST_UNSUPPORTED_DEATH_TEST(statement, regex, terminator)             \
+#define GTEST_UNSUPPORTED_DEATH_TEST(statement, regex_or_matcher, terminator)  \
   GTEST_AMBIGUOUS_ELSE_BLOCKER_                                                \
   if (::testing::internal::AlwaysTrue()) {                                     \
     GTEST_LOG_(WARNING) << "Death tests are not supported on this platform.\n" \
                         << "Statement '" #statement "' cannot be verified.";   \
   } else if (::testing::internal::AlwaysFalse()) {                             \
-    ::testing::internal::RE::PartialMatch(".*", (regex));                      \
+    ::testing::internal::MakeDeathTestMatcher(regex_or_matcher);               \
     GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement);                 \
     terminator;                                                                \
   } else                                                                       \
@@ -328,7 +328,7 @@ class GTEST_API_ KilledBySignal {
 // death tests are supported; otherwise they just issue a warning.  This is
 // useful when you are combining death test assertions with normal test
 // assertions in one test.
-#if GTEST_HAS_DEATH_TEST
+#ifdef GTEST_HAS_DEATH_TEST
 #define EXPECT_DEATH_IF_SUPPORTED(statement, regex) \
   EXPECT_DEATH(statement, regex)
 #define ASSERT_DEATH_IF_SUPPORTED(statement, regex) \
@@ -337,7 +337,7 @@ class GTEST_API_ KilledBySignal {
 #define EXPECT_DEATH_IF_SUPPORTED(statement, regex) \
   GTEST_UNSUPPORTED_DEATH_TEST(statement, regex, )
 #define ASSERT_DEATH_IF_SUPPORTED(statement, regex) \
-  GTEST_UNSUPPORTED_DEATH_TEST(statement, regex, return )
+  GTEST_UNSUPPORTED_DEATH_TEST(statement, regex, return)
 #endif
 
 }  // namespace testing
diff --git a/external/googletest/googletest/include/gtest/gtest-matchers.h b/external/googletest/googletest/include/gtest/gtest-matchers.h
index aeaa549d..78160f0e 100644
--- a/external/googletest/googletest/include/gtest/gtest-matchers.h
+++ b/external/googletest/googletest/include/gtest/gtest-matchers.h
@@ -32,10 +32,15 @@
 // This file implements just enough of the matcher interface to allow
 // EXPECT_DEATH and friends to accept a matcher argument.
 
+// IWYU pragma: private, include "gtest/gtest.h"
+// IWYU pragma: friend gtest/.*
+// IWYU pragma: friend gmock/.*
+
 #ifndef GOOGLETEST_INCLUDE_GTEST_GTEST_MATCHERS_H_
 #define GOOGLETEST_INCLUDE_GTEST_GTEST_MATCHERS_H_
 
 #include <atomic>
+#include <functional>
 #include <memory>
 #include <ostream>
 #include <string>
@@ -62,10 +67,10 @@ namespace testing {
 // To implement a matcher Foo for type T, define:
 //   1. a class FooMatcherMatcher that implements the matcher interface:
 //     using is_gtest_matcher = void;
-//     bool MatchAndExplain(const T&, std::ostream*);
+//     bool MatchAndExplain(const T&, std::ostream*) const;
 //       (MatchResultListener* can also be used instead of std::ostream*)
-//     void DescribeTo(std::ostream*);
-//     void DescribeNegationTo(std::ostream*);
+//     void DescribeTo(std::ostream*) const;
+//     void DescribeNegationTo(std::ostream*) const;
 //
 //   2. a factory function that creates a Matcher<T> object from a
 //      FooMatcherMatcher.
@@ -98,16 +103,17 @@ class MatchResultListener {
  private:
   ::std::ostream* const stream_;
 
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(MatchResultListener);
+  MatchResultListener(const MatchResultListener&) = delete;
+  MatchResultListener& operator=(const MatchResultListener&) = delete;
 };
 
-inline MatchResultListener::~MatchResultListener() {}
+inline MatchResultListener::~MatchResultListener() = default;
 
 // An instance of a subclass of this knows how to describe itself as a
 // matcher.
 class GTEST_API_ MatcherDescriberInterface {
  public:
-  virtual ~MatcherDescriberInterface() {}
+  virtual ~MatcherDescriberInterface() = default;
 
   // Describes this matcher to an ostream.  The function should print
   // a verb phrase that describes the property a value matching this
@@ -173,50 +179,14 @@ class MatcherInterface : public MatcherDescriberInterface {
 
 namespace internal {
 
-struct AnyEq {
-  template <typename A, typename B>
-  bool operator()(const A& a, const B& b) const {
-    return a == b;
-  }
-};
-struct AnyNe {
-  template <typename A, typename B>
-  bool operator()(const A& a, const B& b) const {
-    return a != b;
-  }
-};
-struct AnyLt {
-  template <typename A, typename B>
-  bool operator()(const A& a, const B& b) const {
-    return a < b;
-  }
-};
-struct AnyGt {
-  template <typename A, typename B>
-  bool operator()(const A& a, const B& b) const {
-    return a > b;
-  }
-};
-struct AnyLe {
-  template <typename A, typename B>
-  bool operator()(const A& a, const B& b) const {
-    return a <= b;
-  }
-};
-struct AnyGe {
-  template <typename A, typename B>
-  bool operator()(const A& a, const B& b) const {
-    return a >= b;
-  }
-};
-
 // A match result listener that ignores the explanation.
 class DummyMatchResultListener : public MatchResultListener {
  public:
   DummyMatchResultListener() : MatchResultListener(nullptr) {}
 
  private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(DummyMatchResultListener);
+  DummyMatchResultListener(const DummyMatchResultListener&) = delete;
+  DummyMatchResultListener& operator=(const DummyMatchResultListener&) = delete;
 };
 
 // A match result listener that forwards the explanation to a given
@@ -228,7 +198,9 @@ class StreamMatchResultListener : public MatchResultListener {
       : MatchResultListener(os) {}
 
  private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(StreamMatchResultListener);
+  StreamMatchResultListener(const StreamMatchResultListener&) = delete;
+  StreamMatchResultListener& operator=(const StreamMatchResultListener&) =
+      delete;
 };
 
 struct SharedPayloadBase {
@@ -295,17 +267,18 @@ class MatcherBase : private MatcherDescriberInterface {
   }
 
  protected:
-  MatcherBase() : vtable_(nullptr) {}
+  MatcherBase() : vtable_(nullptr), buffer_() {}
 
   // Constructs a matcher from its implementation.
   template <typename U>
-  explicit MatcherBase(const MatcherInterface<U>* impl) {
+  explicit MatcherBase(const MatcherInterface<U>* impl)
+      : vtable_(nullptr), buffer_() {
     Init(impl);
   }
 
   template <typename M, typename = typename std::remove_reference<
                             M>::type::is_gtest_matcher>
-  MatcherBase(M&& m) {  // NOLINT
+  MatcherBase(M&& m) : vtable_(nullptr), buffer_() {  // NOLINT
     Init(std::forward<M>(m));
   }
 
@@ -521,7 +494,7 @@ template <>
 class GTEST_API_ Matcher<const std::string&>
     : public internal::MatcherBase<const std::string&> {
  public:
-  Matcher() {}
+  Matcher() = default;
 
   explicit Matcher(const MatcherInterface<const std::string&>* impl)
       : internal::MatcherBase<const std::string&>(impl) {}
@@ -543,7 +516,7 @@ template <>
 class GTEST_API_ Matcher<std::string>
     : public internal::MatcherBase<std::string> {
  public:
-  Matcher() {}
+  Matcher() = default;
 
   explicit Matcher(const MatcherInterface<const std::string&>* impl)
       : internal::MatcherBase<std::string>(impl) {}
@@ -571,7 +544,7 @@ template <>
 class GTEST_API_ Matcher<const internal::StringView&>
     : public internal::MatcherBase<const internal::StringView&> {
  public:
-  Matcher() {}
+  Matcher() = default;
 
   explicit Matcher(const MatcherInterface<const internal::StringView&>* impl)
       : internal::MatcherBase<const internal::StringView&>(impl) {}
@@ -597,7 +570,7 @@ template <>
 class GTEST_API_ Matcher<internal::StringView>
     : public internal::MatcherBase<internal::StringView> {
  public:
-  Matcher() {}
+  Matcher() = default;
 
   explicit Matcher(const MatcherInterface<const internal::StringView&>* impl)
       : internal::MatcherBase<internal::StringView>(impl) {}
@@ -749,50 +722,53 @@ class ComparisonBase {
 };
 
 template <typename Rhs>
-class EqMatcher : public ComparisonBase<EqMatcher<Rhs>, Rhs, AnyEq> {
+class EqMatcher : public ComparisonBase<EqMatcher<Rhs>, Rhs, std::equal_to<>> {
  public:
   explicit EqMatcher(const Rhs& rhs)
-      : ComparisonBase<EqMatcher<Rhs>, Rhs, AnyEq>(rhs) {}
+      : ComparisonBase<EqMatcher<Rhs>, Rhs, std::equal_to<>>(rhs) {}
   static const char* Desc() { return "is equal to"; }
   static const char* NegatedDesc() { return "isn't equal to"; }
 };
 template <typename Rhs>
-class NeMatcher : public ComparisonBase<NeMatcher<Rhs>, Rhs, AnyNe> {
+class NeMatcher
+    : public ComparisonBase<NeMatcher<Rhs>, Rhs, std::not_equal_to<>> {
  public:
   explicit NeMatcher(const Rhs& rhs)
-      : ComparisonBase<NeMatcher<Rhs>, Rhs, AnyNe>(rhs) {}
+      : ComparisonBase<NeMatcher<Rhs>, Rhs, std::not_equal_to<>>(rhs) {}
   static const char* Desc() { return "isn't equal to"; }
   static const char* NegatedDesc() { return "is equal to"; }
 };
 template <typename Rhs>
-class LtMatcher : public ComparisonBase<LtMatcher<Rhs>, Rhs, AnyLt> {
+class LtMatcher : public ComparisonBase<LtMatcher<Rhs>, Rhs, std::less<>> {
  public:
   explicit LtMatcher(const Rhs& rhs)
-      : ComparisonBase<LtMatcher<Rhs>, Rhs, AnyLt>(rhs) {}
+      : ComparisonBase<LtMatcher<Rhs>, Rhs, std::less<>>(rhs) {}
   static const char* Desc() { return "is <"; }
   static const char* NegatedDesc() { return "isn't <"; }
 };
 template <typename Rhs>
-class GtMatcher : public ComparisonBase<GtMatcher<Rhs>, Rhs, AnyGt> {
+class GtMatcher : public ComparisonBase<GtMatcher<Rhs>, Rhs, std::greater<>> {
  public:
   explicit GtMatcher(const Rhs& rhs)
-      : ComparisonBase<GtMatcher<Rhs>, Rhs, AnyGt>(rhs) {}
+      : ComparisonBase<GtMatcher<Rhs>, Rhs, std::greater<>>(rhs) {}
   static const char* Desc() { return "is >"; }
   static const char* NegatedDesc() { return "isn't >"; }
 };
 template <typename Rhs>
-class LeMatcher : public ComparisonBase<LeMatcher<Rhs>, Rhs, AnyLe> {
+class LeMatcher
+    : public ComparisonBase<LeMatcher<Rhs>, Rhs, std::less_equal<>> {
  public:
   explicit LeMatcher(const Rhs& rhs)
-      : ComparisonBase<LeMatcher<Rhs>, Rhs, AnyLe>(rhs) {}
+      : ComparisonBase<LeMatcher<Rhs>, Rhs, std::less_equal<>>(rhs) {}
   static const char* Desc() { return "is <="; }
   static const char* NegatedDesc() { return "isn't <="; }
 };
 template <typename Rhs>
-class GeMatcher : public ComparisonBase<GeMatcher<Rhs>, Rhs, AnyGe> {
+class GeMatcher
+    : public ComparisonBase<GeMatcher<Rhs>, Rhs, std::greater_equal<>> {
  public:
   explicit GeMatcher(const Rhs& rhs)
-      : ComparisonBase<GeMatcher<Rhs>, Rhs, AnyGe>(rhs) {}
+      : ComparisonBase<GeMatcher<Rhs>, Rhs, std::greater_equal<>>(rhs) {}
   static const char* Desc() { return "is >="; }
   static const char* NegatedDesc() { return "isn't >="; }
 };
@@ -833,7 +809,7 @@ class MatchesRegexMatcher {
   template <class MatcheeStringType>
   bool MatchAndExplain(const MatcheeStringType& s,
                        MatchResultListener* /* listener */) const {
-    const std::string& s2(s);
+    const std::string s2(s);
     return full_match_ ? RE::FullMatch(s2, *regex_)
                        : RE::PartialMatch(s2, *regex_);
   }
diff --git a/external/googletest/googletest/include/gtest/gtest-message.h b/external/googletest/googletest/include/gtest/gtest-message.h
index 36ba8b0c..448ac6b7 100644
--- a/external/googletest/googletest/include/gtest/gtest-message.h
+++ b/external/googletest/googletest/include/gtest/gtest-message.h
@@ -27,7 +27,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-//
 // The Google C++ Testing and Mocking Framework (Google Test)
 //
 // This header file defines the Message class.
@@ -42,17 +41,28 @@
 // to CHANGE WITHOUT NOTICE.  Therefore DO NOT DEPEND ON IT in a user
 // program!
 
-// GOOGLETEST_CM0001 DO NOT DELETE
+// IWYU pragma: private, include "gtest/gtest.h"
+// IWYU pragma: friend gtest/.*
+// IWYU pragma: friend gmock/.*
 
 #ifndef GOOGLETEST_INCLUDE_GTEST_GTEST_MESSAGE_H_
 #define GOOGLETEST_INCLUDE_GTEST_GTEST_MESSAGE_H_
 
 #include <limits>
 #include <memory>
+#include <ostream>
 #include <sstream>
+#include <string>
 
 #include "gtest/internal/gtest-port.h"
 
+#ifdef GTEST_HAS_ABSL
+#include <type_traits>
+
+#include "absl/strings/has_absl_stringify.h"
+#include "absl/strings/str_cat.h"
+#endif  // GTEST_HAS_ABSL
+
 GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
 /* class A needs to have dll-interface to be used by clients of class B */)
 
@@ -108,10 +118,19 @@ class GTEST_API_ Message {
     *ss_ << str;
   }
 
-  // Streams a non-pointer value to this object.
-  template <typename T>
+  // Streams a non-pointer value to this object. If building a version of
+  // GoogleTest with ABSL, this overload is only enabled if the value does not
+  // have an AbslStringify definition.
+  template <
+      typename T
+#ifdef GTEST_HAS_ABSL
+      ,
+      typename std::enable_if<!absl::HasAbslStringify<T>::value,  // NOLINT
+                              int>::type = 0
+#endif  // GTEST_HAS_ABSL
+      >
   inline Message& operator<<(const T& val) {
-    // Some libraries overload << for STL containers.  These
+        // Some libraries overload << for STL containers.  These
     // overloads are defined in the global namespace instead of ::std.
     //
     // C++'s symbol lookup rule (i.e. Koenig lookup) says that these
@@ -130,6 +149,21 @@ class GTEST_API_ Message {
     return *this;
   }
 
+#ifdef GTEST_HAS_ABSL
+  // Streams a non-pointer value with an AbslStringify definition to this
+  // object.
+  template <typename T,
+            typename std::enable_if<absl::HasAbslStringify<T>::value,  // NOLINT
+                                    int>::type = 0>
+  inline Message& operator<<(const T& val) {
+    // ::operator<< is needed here for a similar reason as with the non-Abseil
+    // version above
+    using ::operator<<;
+    *ss_ << absl::StrCat(val);
+    return *this;
+  }
+#endif  // GTEST_HAS_ABSL
+
   // Streams a pointer value to this object.
   //
   // This function is an overload of the previous one.  When you
diff --git a/external/googletest/googletest/include/gtest/gtest-param-test.h b/external/googletest/googletest/include/gtest/gtest-param-test.h
index b36ebe26..9e023f96 100644
--- a/external/googletest/googletest/include/gtest/gtest-param-test.h
+++ b/external/googletest/googletest/include/gtest/gtest-param-test.h
@@ -26,11 +26,14 @@
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
+
 // Macros and functions for implementing parameterized tests
 // in Google C++ Testing and Mocking Framework (Google Test)
-//
-// GOOGLETEST_CM0001 DO NOT DELETE
+
+// IWYU pragma: private, include "gtest/gtest.h"
+// IWYU pragma: friend gtest/.*
+// IWYU pragma: friend gmock/.*
+
 #ifndef GOOGLETEST_INCLUDE_GTEST_GTEST_PARAM_TEST_H_
 #define GOOGLETEST_INCLUDE_GTEST_GTEST_PARAM_TEST_H_
 
@@ -171,11 +174,12 @@ TEST_P(DerivedTest, DoesBlah) {
 
 #endif  // 0
 
+#include <functional>
 #include <iterator>
 #include <utility>
 
 #include "gtest/internal/gtest-internal.h"
-#include "gtest/internal/gtest-param-util.h"
+#include "gtest/internal/gtest-param-util.h"  // IWYU pragma: export
 #include "gtest/internal/gtest-port.h"
 
 namespace testing {
@@ -404,9 +408,106 @@ internal::CartesianProductHolder<Generator...> Combine(const Generator&... g) {
   return internal::CartesianProductHolder<Generator...>(g...);
 }
 
+// ConvertGenerator() wraps a parameter generator in order to cast each produced
+// value through a known type before supplying it to the test suite
+//
+// Synopsis:
+// ConvertGenerator<T>(gen)
+//   - returns a generator producing the same elements as generated by gen, but
+//     each T-typed element is static_cast to a type deduced from the interface
+//     that accepts this generator, and then returned
+//
+// It is useful when using the Combine() function to get the generated
+// parameters in a custom type instead of std::tuple
+//
+// Example:
+//
+// This will instantiate tests in test suite AnimalTest each one with
+// the parameter values tuple("cat", BLACK), tuple("cat", WHITE),
+// tuple("dog", BLACK), and tuple("dog", WHITE):
+//
+// enum Color { BLACK, GRAY, WHITE };
+// struct ParamType {
+//   using TupleT = std::tuple<const char*, Color>;
+//   std::string animal;
+//   Color color;
+//   ParamType(TupleT t) : animal(std::get<0>(t)), color(std::get<1>(t)) {}
+// };
+// class AnimalTest
+//     : public testing::TestWithParam<ParamType> {...};
+//
+// TEST_P(AnimalTest, AnimalLooksNice) {...}
+//
+// INSTANTIATE_TEST_SUITE_P(AnimalVariations, AnimalTest,
+//                          ConvertGenerator<ParamType::TupleT>(
+//                              Combine(Values("cat", "dog"),
+//                                      Values(BLACK, WHITE))));
+//
+template <typename RequestedT>
+internal::ParamConverterGenerator<RequestedT> ConvertGenerator(
+    internal::ParamGenerator<RequestedT> gen) {
+  return internal::ParamConverterGenerator<RequestedT>(std::move(gen));
+}
+
+// As above, but takes a callable as a second argument. The callable converts
+// the generated parameter to the test fixture's parameter type. This allows you
+// to use a parameter type that does not have a converting constructor from the
+// generated type.
+//
+// Example:
+//
+// This will instantiate tests in test suite AnimalTest each one with
+// the parameter values tuple("cat", BLACK), tuple("cat", WHITE),
+// tuple("dog", BLACK), and tuple("dog", WHITE):
+//
+// enum Color { BLACK, GRAY, WHITE };
+// struct ParamType {
+//   std::string animal;
+//   Color color;
+// };
+// class AnimalTest
+//     : public testing::TestWithParam<ParamType> {...};
+//
+// TEST_P(AnimalTest, AnimalLooksNice) {...}
+//
+// INSTANTIATE_TEST_SUITE_P(
+//     AnimalVariations, AnimalTest,
+//     ConvertGenerator(Combine(Values("cat", "dog"), Values(BLACK, WHITE)),
+//                      [](std::tuple<std::string, Color> t) {
+//                        return ParamType{.animal = std::get<0>(t),
+//                                         .color = std::get<1>(t)};
+//                      }));
+//
+template <typename T, int&... ExplicitArgumentBarrier, typename Gen,
+          typename Func,
+          typename StdFunction = decltype(std::function(std::declval<Func>()))>
+internal::ParamConverterGenerator<T, StdFunction> ConvertGenerator(Gen&& gen,
+                                                                   Func&& f) {
+  return internal::ParamConverterGenerator<T, StdFunction>(
+      std::forward<Gen>(gen), std::forward<Func>(f));
+}
+
+// As above, but infers the T from the supplied std::function instead of
+// having the caller specify it.
+template <int&... ExplicitArgumentBarrier, typename Gen, typename Func,
+          typename StdFunction = decltype(std::function(std::declval<Func>()))>
+auto ConvertGenerator(Gen&& gen, Func&& f) {
+  constexpr bool is_single_arg_std_function =
+      internal::IsSingleArgStdFunction<StdFunction>::value;
+  if constexpr (is_single_arg_std_function) {
+    return ConvertGenerator<
+        typename internal::FuncSingleParamType<StdFunction>::type>(
+        std::forward<Gen>(gen), std::forward<Func>(f));
+  } else {
+    static_assert(is_single_arg_std_function,
+                  "The call signature must contain a single argument.");
+  }
+}
+
 #define TEST_P(test_suite_name, test_name)                                     \
   class GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)                     \
-      : public test_suite_name {                                               \
+      : public test_suite_name,                                                \
+        private ::testing::internal::GTestNonCopyable {                        \
    public:                                                                     \
     GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)() {}                    \
     void TestBody() override;                                                  \
@@ -425,9 +526,7 @@ internal::CartesianProductHolder<Generator...> Combine(const Generator&... g) {
               ::testing::internal::CodeLocation(__FILE__, __LINE__));          \
       return 0;                                                                \
     }                                                                          \
-    static int gtest_registering_dummy_ GTEST_ATTRIBUTE_UNUSED_;               \
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(GTEST_TEST_CLASS_NAME_(test_suite_name,    \
-                                                           test_name));        \
+    [[maybe_unused]] static int gtest_registering_dummy_;                      \
   };                                                                           \
   int GTEST_TEST_CLASS_NAME_(test_suite_name,                                  \
                              test_name)::gtest_registering_dummy_ =            \
@@ -451,39 +550,38 @@ internal::CartesianProductHolder<Generator...> Combine(const Generator&... g) {
 #define GTEST_GET_FIRST_(first, ...) first
 #define GTEST_GET_SECOND_(first, second, ...) second
 
-#define INSTANTIATE_TEST_SUITE_P(prefix, test_suite_name, ...)               \
-  static ::testing::internal::ParamGenerator<test_suite_name::ParamType>     \
-      gtest_##prefix##test_suite_name##_EvalGenerator_() {                   \
-    return GTEST_EXPAND_(GTEST_GET_FIRST_(__VA_ARGS__, DUMMY_PARAM_));       \
-  }                                                                          \
-  static ::std::string gtest_##prefix##test_suite_name##_EvalGenerateName_(  \
-      const ::testing::TestParamInfo<test_suite_name::ParamType>& info) {    \
-    if (::testing::internal::AlwaysFalse()) {                                \
-      ::testing::internal::TestNotEmpty(GTEST_EXPAND_(GTEST_GET_SECOND_(     \
-          __VA_ARGS__,                                                       \
-          ::testing::internal::DefaultParamName<test_suite_name::ParamType>, \
-          DUMMY_PARAM_)));                                                   \
-      auto t = std::make_tuple(__VA_ARGS__);                                 \
-      static_assert(std::tuple_size<decltype(t)>::value <= 2,                \
-                    "Too Many Args!");                                       \
-    }                                                                        \
-    return ((GTEST_EXPAND_(GTEST_GET_SECOND_(                                \
-        __VA_ARGS__,                                                         \
-        ::testing::internal::DefaultParamName<test_suite_name::ParamType>,   \
-        DUMMY_PARAM_))))(info);                                              \
-  }                                                                          \
-  static int gtest_##prefix##test_suite_name##_dummy_                        \
-      GTEST_ATTRIBUTE_UNUSED_ =                                              \
-          ::testing::UnitTest::GetInstance()                                 \
-              ->parameterized_test_registry()                                \
-              .GetTestSuitePatternHolder<test_suite_name>(                   \
-                  GTEST_STRINGIFY_(test_suite_name),                         \
-                  ::testing::internal::CodeLocation(__FILE__, __LINE__))     \
-              ->AddTestSuiteInstantiation(                                   \
-                  GTEST_STRINGIFY_(prefix),                                  \
-                  &gtest_##prefix##test_suite_name##_EvalGenerator_,         \
-                  &gtest_##prefix##test_suite_name##_EvalGenerateName_,      \
-                  __FILE__, __LINE__)
+#define INSTANTIATE_TEST_SUITE_P(prefix, test_suite_name, ...)                \
+  static ::testing::internal::ParamGenerator<test_suite_name::ParamType>      \
+      gtest_##prefix##test_suite_name##_EvalGenerator_() {                    \
+    return GTEST_EXPAND_(GTEST_GET_FIRST_(__VA_ARGS__, DUMMY_PARAM_));        \
+  }                                                                           \
+  static ::std::string gtest_##prefix##test_suite_name##_EvalGenerateName_(   \
+      const ::testing::TestParamInfo<test_suite_name::ParamType>& info) {     \
+    if (::testing::internal::AlwaysFalse()) {                                 \
+      ::testing::internal::TestNotEmpty(GTEST_EXPAND_(GTEST_GET_SECOND_(      \
+          __VA_ARGS__,                                                        \
+          ::testing::internal::DefaultParamName<test_suite_name::ParamType>,  \
+          DUMMY_PARAM_)));                                                    \
+      auto t = std::make_tuple(__VA_ARGS__);                                  \
+      static_assert(std::tuple_size<decltype(t)>::value <= 2,                 \
+                    "Too Many Args!");                                        \
+    }                                                                         \
+    return ((GTEST_EXPAND_(GTEST_GET_SECOND_(                                 \
+        __VA_ARGS__,                                                          \
+        ::testing::internal::DefaultParamName<test_suite_name::ParamType>,    \
+        DUMMY_PARAM_))))(info);                                               \
+  }                                                                           \
+  [[maybe_unused]] static int gtest_##prefix##test_suite_name##_dummy_ =      \
+      ::testing::UnitTest::GetInstance()                                      \
+          ->parameterized_test_registry()                                     \
+          .GetTestSuitePatternHolder<test_suite_name>(                        \
+              GTEST_STRINGIFY_(test_suite_name),                              \
+              ::testing::internal::CodeLocation(__FILE__, __LINE__))          \
+          ->AddTestSuiteInstantiation(                                        \
+              GTEST_STRINGIFY_(prefix),                                       \
+              &gtest_##prefix##test_suite_name##_EvalGenerator_,              \
+              &gtest_##prefix##test_suite_name##_EvalGenerateName_, __FILE__, \
+              __LINE__)
 
 // Allow Marking a Parameterized test class as not needing to be instantiated.
 #define GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(T)                  \
diff --git a/external/googletest/googletest/include/gtest/gtest-printers.h b/external/googletest/googletest/include/gtest/gtest-printers.h
index b166e841..198a7693 100644
--- a/external/googletest/googletest/include/gtest/gtest-printers.h
+++ b/external/googletest/googletest/include/gtest/gtest-printers.h
@@ -43,6 +43,9 @@
 //   1. foo::PrintTo(const T&, ostream*)
 //   2. operator<<(ostream&, const T&) defined in either foo or the
 //      global namespace.
+// * Prefer AbslStringify(..) to operator<<(..), per https://abseil.io/tips/215.
+// * Define foo::PrintTo(..) if the type already has AbslStringify(..), but an
+//   alternative presentation in test results is of interest.
 //
 // However if T is an STL-style container then it is printed element-wise
 // unless foo::PrintTo(const T&, ostream*) is defined. Note that
@@ -94,7 +97,9 @@
 // being defined as many user-defined container types don't have
 // value_type.
 
-// GOOGLETEST_CM0001 DO NOT DELETE
+// IWYU pragma: private, include "gtest/gtest.h"
+// IWYU pragma: friend gtest/.*
+// IWYU pragma: friend gmock/.*
 
 #ifndef GOOGLETEST_INCLUDE_GTEST_GTEST_PRINTERS_H_
 #define GOOGLETEST_INCLUDE_GTEST_GTEST_PRINTERS_H_
@@ -106,12 +111,25 @@
 #include <string>
 #include <tuple>
 #include <type_traits>
+#include <typeinfo>
 #include <utility>
 #include <vector>
 
+#ifdef GTEST_HAS_ABSL
+#include "absl/strings/has_absl_stringify.h"
+#include "absl/strings/str_cat.h"
+#endif  // GTEST_HAS_ABSL
 #include "gtest/internal/gtest-internal.h"
 #include "gtest/internal/gtest-port.h"
 
+#if GTEST_INTERNAL_HAS_STD_SPAN
+#include <span>  // NOLINT
+#endif           // GTEST_INTERNAL_HAS_STD_SPAN
+
+#if GTEST_INTERNAL_HAS_COMPARE_LIB
+#include <compare>  // NOLINT
+#endif              // GTEST_INTERNAL_HAS_COMPARE_LIB
+
 namespace testing {
 
 // Definitions in the internal* namespaces are subject to change without notice.
@@ -121,13 +139,32 @@ namespace internal {
 template <typename T>
 void UniversalPrint(const T& value, ::std::ostream* os);
 
+template <typename T>
+struct IsStdSpan {
+  static constexpr bool value = false;
+};
+
+#if GTEST_INTERNAL_HAS_STD_SPAN
+template <typename E>
+struct IsStdSpan<std::span<E>> {
+  static constexpr bool value = true;
+};
+#endif  // GTEST_INTERNAL_HAS_STD_SPAN
+
 // Used to print an STL-style container when the user doesn't define
 // a PrintTo() for it.
+//
+// NOTE: Since std::span does not have const_iterator until C++23, it would
+// fail IsContainerTest before C++23. However, IsContainerTest only uses
+// the presence of const_iterator to avoid treating iterators as containers
+// because of iterator::iterator. Which means std::span satisfies the *intended*
+// condition of IsContainerTest.
 struct ContainerPrinter {
   template <typename T,
             typename = typename std::enable_if<
-                (sizeof(IsContainerTest<T>(0)) == sizeof(IsContainer)) &&
-                !IsRecursiveContainer<T>::value>::type>
+                ((sizeof(IsContainerTest<T>(0)) == sizeof(IsContainer)) &&
+                 !IsRecursiveContainer<T>::value) ||
+                IsStdSpan<T>::value>::type>
   static void PrintValue(const T& container, std::ostream* os) {
     const size_t kMaxCount = 32;  // The maximum number of elements to print.
     *os << '{';
@@ -203,12 +240,13 @@ struct StreamPrinter {
             // Don't accept member pointers here. We'd print them via implicit
             // conversion to bool, which isn't useful.
             typename = typename std::enable_if<
-                !std::is_member_pointer<T>::value>::type,
-            // Only accept types for which we can find a streaming operator via
-            // ADL (possibly involving implicit conversions).
-            typename = decltype(std::declval<std::ostream&>()
-                                << std::declval<const T&>())>
-  static void PrintValue(const T& value, ::std::ostream* os) {
+                !std::is_member_pointer<T>::value>::type>
+  // Only accept types for which we can find a streaming operator via
+  // ADL (possibly involving implicit conversions).
+  // (Use SFINAE via return type, because it seems GCC < 12 doesn't handle name
+  // lookup properly when we do it in the template parameter list.)
+  static auto PrintValue(const T& value,
+                         ::std::ostream* os) -> decltype((void)(*os << value)) {
     // Call streaming operator found by ADL, possibly with implicit conversions
     // of the arguments.
     *os << value;
@@ -256,6 +294,17 @@ struct ConvertibleToStringViewPrinter {
 #endif
 };
 
+#ifdef GTEST_HAS_ABSL
+struct ConvertibleToAbslStringifyPrinter {
+  template <typename T,
+            typename = typename std::enable_if<
+                absl::HasAbslStringify<T>::value>::type>  // NOLINT
+  static void PrintValue(const T& value, ::std::ostream* os) {
+    *os << absl::StrCat(value);
+  }
+};
+#endif  // GTEST_HAS_ABSL
+
 // Prints the given number of bytes in the given object to the given
 // ostream.
 GTEST_API_ void PrintBytesInObjectTo(const unsigned char* obj_bytes,
@@ -294,8 +343,8 @@ struct FindFirstPrinter<
 //  - Print containers (they have begin/end/etc).
 //  - Print function pointers.
 //  - Print object pointers.
-//  - Use the stream operator, if available.
 //  - Print protocol buffers.
+//  - Use the stream operator, if available.
 //  - Print types convertible to BiggestInt.
 //  - Print types convertible to StringView, if available.
 //  - Fallback to printing the raw bytes of the object.
@@ -303,9 +352,13 @@ template <typename T>
 void PrintWithFallback(const T& value, ::std::ostream* os) {
   using Printer = typename FindFirstPrinter<
       T, void, ContainerPrinter, FunctionPointerPrinter, PointerPrinter,
+      ProtobufPrinter,
+#ifdef GTEST_HAS_ABSL
+      ConvertibleToAbslStringifyPrinter,
+#endif  // GTEST_HAS_ABSL
       internal_stream_operator_without_lexical_name_lookup::StreamPrinter,
-      ProtobufPrinter, ConvertibleToIntegerPrinter,
-      ConvertibleToStringViewPrinter, RawBytesPrinter, FallbackPrinter>::type;
+      ConvertibleToIntegerPrinter, ConvertibleToStringViewPrinter,
+      RawBytesPrinter, FallbackPrinter>::type;
   Printer::PrintValue(value, os);
 }
 
@@ -357,7 +410,7 @@ GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(char);
 GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(const char);
 GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(wchar_t);
 GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(const wchar_t);
-#ifdef __cpp_char8_t
+#ifdef __cpp_lib_char8_t
 GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(char8_t);
 GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(const char8_t);
 #endif
@@ -382,7 +435,7 @@ GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(const char32_t);
 
 GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(char, ::std::string);
 GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(const char, ::std::string);
-#ifdef __cpp_char8_t
+#ifdef __cpp_lib_char8_t
 GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(char8_t, ::std::u8string);
 GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(const char8_t, ::std::u8string);
 #endif
@@ -470,12 +523,113 @@ GTEST_API_ void PrintTo(char32_t c, ::std::ostream* os);
 inline void PrintTo(char16_t c, ::std::ostream* os) {
   PrintTo(ImplicitCast_<char32_t>(c), os);
 }
-#ifdef __cpp_char8_t
+#ifdef __cpp_lib_char8_t
 inline void PrintTo(char8_t c, ::std::ostream* os) {
   PrintTo(ImplicitCast_<char32_t>(c), os);
 }
 #endif
 
+// gcc/clang __{u,}int128_t
+#if defined(__SIZEOF_INT128__)
+GTEST_API_ void PrintTo(__uint128_t v, ::std::ostream* os);
+GTEST_API_ void PrintTo(__int128_t v, ::std::ostream* os);
+#endif  // __SIZEOF_INT128__
+
+// The default resolution used to print floating-point values uses only
+// 6 digits, which can be confusing if a test compares two values whose
+// difference lies in the 7th digit.  So we'd like to print out numbers
+// in full precision.
+// However if the value is something simple like 1.1, full will print a
+// long string like 1.100000001 due to floating-point numbers not using
+// a base of 10.  This routiune returns an appropriate resolution for a
+// given floating-point number, that is, 6 if it will be accurate, or a
+// max_digits10 value (full precision) if it won't,  for values between
+// 0.0001 and one million.
+// It does this by computing what those digits would be (by multiplying
+// by an appropriate power of 10), then dividing by that power again to
+// see if gets the original value back.
+// A similar algorithm applies for values larger than one million; note
+// that for those values, we must divide to get a six-digit number, and
+// then multiply to possibly get the original value again.
+template <typename FloatType>
+int AppropriateResolution(FloatType val) {
+  int full = std::numeric_limits<FloatType>::max_digits10;
+  if (val < 0) val = -val;
+
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
+  if (val < 1000000) {
+    FloatType mulfor6 = 1e10;
+    // Without these static casts, the template instantiation for float would
+    // fail to compile when -Wdouble-promotion is enabled, as the arithmetic and
+    // comparison logic would promote floats to doubles.
+    if (val >= static_cast<FloatType>(100000.0)) {  // 100,000 to 999,999
+      mulfor6 = 1.0;
+    } else if (val >= static_cast<FloatType>(10000.0)) {
+      mulfor6 = 1e1;
+    } else if (val >= static_cast<FloatType>(1000.0)) {
+      mulfor6 = 1e2;
+    } else if (val >= static_cast<FloatType>(100.0)) {
+      mulfor6 = 1e3;
+    } else if (val >= static_cast<FloatType>(10.0)) {
+      mulfor6 = 1e4;
+    } else if (val >= static_cast<FloatType>(1.0)) {
+      mulfor6 = 1e5;
+    } else if (val >= static_cast<FloatType>(0.1)) {
+      mulfor6 = 1e6;
+    } else if (val >= static_cast<FloatType>(0.01)) {
+      mulfor6 = 1e7;
+    } else if (val >= static_cast<FloatType>(0.001)) {
+      mulfor6 = 1e8;
+    } else if (val >= static_cast<FloatType>(0.0001)) {
+      mulfor6 = 1e9;
+    }
+    if (static_cast<FloatType>(static_cast<int32_t>(
+            val * mulfor6 + (static_cast<FloatType>(0.5)))) /
+            mulfor6 ==
+        val)
+      return 6;
+  } else if (val < static_cast<FloatType>(1e10)) {
+    FloatType divfor6 = static_cast<FloatType>(1.0);
+    if (val >= static_cast<FloatType>(1e9)) {  // 1,000,000,000 to 9,999,999,999
+      divfor6 = 10000;
+    } else if (val >=
+               static_cast<FloatType>(1e8)) {  // 100,000,000 to 999,999,999
+      divfor6 = 1000;
+    } else if (val >=
+               static_cast<FloatType>(1e7)) {  // 10,000,000 to 99,999,999
+      divfor6 = 100;
+    } else if (val >= static_cast<FloatType>(1e6)) {  // 1,000,000 to 9,999,999
+      divfor6 = 10;
+    }
+    if (static_cast<FloatType>(static_cast<int32_t>(
+            val / divfor6 + (static_cast<FloatType>(0.5)))) *
+            divfor6 ==
+        val)
+      return 6;
+  }
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+  return full;
+}
+
+inline void PrintTo(float f, ::std::ostream* os) {
+  auto old_precision = os->precision();
+  os->precision(AppropriateResolution(f));
+  *os << f;
+  os->precision(old_precision);
+}
+
+inline void PrintTo(double d, ::std::ostream* os) {
+  auto old_precision = os->precision();
+  os->precision(AppropriateResolution(d));
+  *os << d;
+  os->precision(old_precision);
+}
+
 // Overloads for C strings.
 GTEST_API_ void PrintTo(const char* s, ::std::ostream* os);
 inline void PrintTo(char* s, ::std::ostream* os) {
@@ -496,7 +650,7 @@ inline void PrintTo(const unsigned char* s, ::std::ostream* os) {
 inline void PrintTo(unsigned char* s, ::std::ostream* os) {
   PrintTo(ImplicitCast_<const void*>(s), os);
 }
-#ifdef __cpp_char8_t
+#ifdef __cpp_lib_char8_t
 // Overloads for u8 strings.
 GTEST_API_ void PrintTo(const char8_t* s, ::std::ostream* os);
 inline void PrintTo(char8_t* s, ::std::ostream* os) {
@@ -548,7 +702,7 @@ inline void PrintTo(const ::std::string& s, ::std::ostream* os) {
 }
 
 // Overloads for ::std::u8string
-#ifdef __cpp_char8_t
+#ifdef __cpp_lib_char8_t
 GTEST_API_ void PrintU8StringTo(const ::std::u8string& s, ::std::ostream* os);
 inline void PrintTo(const ::std::u8string& s, ::std::ostream* os) {
   PrintU8StringTo(s, os);
@@ -584,6 +738,12 @@ inline void PrintTo(internal::StringView sp, ::std::ostream* os) {
 
 inline void PrintTo(std::nullptr_t, ::std::ostream* os) { *os << "(nullptr)"; }
 
+#if GTEST_HAS_RTTI
+inline void PrintTo(const std::type_info& info, std::ostream* os) {
+  *os << internal::GetTypeName(info);
+}
+#endif  // GTEST_HAS_RTTI
+
 template <typename T>
 void PrintTo(std::reference_wrapper<T> ref, ::std::ostream* os) {
   UniversalPrinter<T&>::Print(ref.get(), os);
@@ -626,6 +786,41 @@ void PrintTo(const std::shared_ptr<T>& ptr, std::ostream* os) {
   (PrintSmartPointer<T>)(ptr, os, 0);
 }
 
+#if GTEST_INTERNAL_HAS_COMPARE_LIB
+template <typename T>
+void PrintOrderingHelper(T ordering, std::ostream* os) {
+  if (ordering == T::less) {
+    *os << "(less)";
+  } else if (ordering == T::greater) {
+    *os << "(greater)";
+  } else if (ordering == T::equivalent) {
+    *os << "(equivalent)";
+  } else {
+    *os << "(unknown ordering)";
+  }
+}
+
+inline void PrintTo(std::strong_ordering ordering, std::ostream* os) {
+  if (ordering == std::strong_ordering::equal) {
+    *os << "(equal)";
+  } else {
+    PrintOrderingHelper(ordering, os);
+  }
+}
+
+inline void PrintTo(std::partial_ordering ordering, std::ostream* os) {
+  if (ordering == std::partial_ordering::unordered) {
+    *os << "(unordered)";
+  } else {
+    PrintOrderingHelper(ordering, os);
+  }
+}
+
+inline void PrintTo(std::weak_ordering ordering, std::ostream* os) {
+  PrintOrderingHelper(ordering, os);
+}
+#endif
+
 // Helper function for printing a tuple.  T must be instantiated with
 // a tuple type.
 template <typename T>
@@ -741,6 +936,14 @@ class UniversalPrinter<Optional<T>> {
   }
 };
 
+template <>
+class UniversalPrinter<decltype(Nullopt())> {
+ public:
+  static void Print(decltype(Nullopt()), ::std::ostream* os) {
+    *os << "(nullopt)";
+  }
+};
+
 #endif  // GTEST_INTERNAL_HAS_OPTIONAL
 
 #if GTEST_INTERNAL_HAS_VARIANT
@@ -752,7 +955,7 @@ class UniversalPrinter<Variant<T...>> {
  public:
   static void Print(const Variant<T...>& value, ::std::ostream* os) {
     *os << '(';
-#if GTEST_HAS_ABSL
+#ifdef GTEST_HAS_ABSL
     absl::visit(Visitor{os, value.index()}, value);
 #else
     std::visit(Visitor{os, value.index()}, value);
@@ -802,7 +1005,7 @@ void UniversalPrintArray(const T* begin, size_t len, ::std::ostream* os) {
 GTEST_API_ void UniversalPrintArray(const char* begin, size_t len,
                                     ::std::ostream* os);
 
-#ifdef __cpp_char8_t
+#ifdef __cpp_lib_char8_t
 // This overload prints a (const) char8_t array compactly.
 GTEST_API_ void UniversalPrintArray(const char8_t* begin, size_t len,
                                     ::std::ostream* os);
@@ -869,6 +1072,13 @@ class UniversalTersePrinter<T&> {
     UniversalPrint(value, os);
   }
 };
+template <typename T>
+class UniversalTersePrinter<std::reference_wrapper<T>> {
+ public:
+  static void Print(std::reference_wrapper<T> value, ::std::ostream* os) {
+    UniversalTersePrinter<T>::Print(value.get(), os);
+  }
+};
 template <typename T, size_t N>
 class UniversalTersePrinter<T[N]> {
  public:
@@ -891,7 +1101,7 @@ template <>
 class UniversalTersePrinter<char*> : public UniversalTersePrinter<const char*> {
 };
 
-#ifdef __cpp_char8_t
+#ifdef __cpp_lib_char8_t
 template <>
 class UniversalTersePrinter<const char8_t*> {
  public:
diff --git a/external/googletest/googletest/include/gtest/gtest-spi.h b/external/googletest/googletest/include/gtest/gtest-spi.h
index e27c7eb9..c0613b69 100644
--- a/external/googletest/googletest/include/gtest/gtest-spi.h
+++ b/external/googletest/googletest/include/gtest/gtest-spi.h
@@ -27,15 +27,14 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-//
 // Utilities for testing Google Test itself and code that uses Google Test
 // (e.g. frameworks built on top of Google Test).
 
-// GOOGLETEST_CM0004 DO NOT DELETE
-
 #ifndef GOOGLETEST_INCLUDE_GTEST_GTEST_SPI_H_
 #define GOOGLETEST_INCLUDE_GTEST_GTEST_SPI_H_
 
+#include <string>
+
 #include "gtest/gtest.h"
 
 GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
@@ -88,7 +87,10 @@ class GTEST_API_ ScopedFakeTestPartResultReporter
   TestPartResultReporterInterface* old_reporter_;
   TestPartResultArray* const result_;
 
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ScopedFakeTestPartResultReporter);
+  ScopedFakeTestPartResultReporter(const ScopedFakeTestPartResultReporter&) =
+      delete;
+  ScopedFakeTestPartResultReporter& operator=(
+      const ScopedFakeTestPartResultReporter&) = delete;
 };
 
 namespace internal {
@@ -110,7 +112,8 @@ class GTEST_API_ SingleFailureChecker {
   const TestPartResult::Type type_;
   const std::string substr_;
 
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(SingleFailureChecker);
+  SingleFailureChecker(const SingleFailureChecker&) = delete;
+  SingleFailureChecker& operator=(const SingleFailureChecker&) = delete;
 };
 
 }  // namespace internal
@@ -120,7 +123,8 @@ class GTEST_API_ SingleFailureChecker {
 GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
 
 // A set of macros for testing Google Test assertions or code that's expected
-// to generate Google Test fatal failures.  It verifies that the given
+// to generate Google Test fatal failures (e.g. a failure from an ASSERT_EQ, but
+// not a non-fatal failure, as from EXPECT_EQ).  It verifies that the given
 // statement will cause exactly one fatal Google Test failure with 'substr'
 // being part of the failure message.
 //
@@ -178,9 +182,10 @@ GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
   } while (::testing::internal::AlwaysFalse())
 
 // A macro for testing Google Test assertions or code that's expected to
-// generate Google Test non-fatal failures.  It asserts that the given
-// statement will cause exactly one non-fatal Google Test failure with 'substr'
-// being part of the failure message.
+// generate Google Test non-fatal failures (e.g. a failure from an EXPECT_EQ,
+// but not from an ASSERT_EQ). It asserts that the given statement will cause
+// exactly one non-fatal Google Test failure with 'substr' being part of the
+// failure message.
 //
 // There are two different versions of this macro. EXPECT_NONFATAL_FAILURE only
 // affects and considers failures generated in the current thread and
diff --git a/external/googletest/googletest/include/gtest/gtest-test-part.h b/external/googletest/googletest/include/gtest/gtest-test-part.h
index ea44f27d..41c8a9a0 100644
--- a/external/googletest/googletest/include/gtest/gtest-test-part.h
+++ b/external/googletest/googletest/include/gtest/gtest-test-part.h
@@ -26,13 +26,17 @@
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// GOOGLETEST_CM0001 DO NOT DELETE
+
+// IWYU pragma: private, include "gtest/gtest.h"
+// IWYU pragma: friend gtest/.*
+// IWYU pragma: friend gmock/.*
 
 #ifndef GOOGLETEST_INCLUDE_GTEST_GTEST_TEST_PART_H_
 #define GOOGLETEST_INCLUDE_GTEST_GTEST_TEST_PART_H_
 
 #include <iosfwd>
+#include <ostream>
+#include <string>
 #include <vector>
 
 #include "gtest/internal/gtest-internal.h"
@@ -129,7 +133,7 @@ std::ostream& operator<<(std::ostream& os, const TestPartResult& result);
 // virtual.
 class GTEST_API_ TestPartResultArray {
  public:
-  TestPartResultArray() {}
+  TestPartResultArray() = default;
 
   // Appends the given TestPartResult to the array.
   void Append(const TestPartResult& result);
@@ -143,13 +147,14 @@ class GTEST_API_ TestPartResultArray {
  private:
   std::vector<TestPartResult> array_;
 
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestPartResultArray);
+  TestPartResultArray(const TestPartResultArray&) = delete;
+  TestPartResultArray& operator=(const TestPartResultArray&) = delete;
 };
 
 // This interface knows how to report a test part result.
 class GTEST_API_ TestPartResultReporterInterface {
  public:
-  virtual ~TestPartResultReporterInterface() {}
+  virtual ~TestPartResultReporterInterface() = default;
 
   virtual void ReportTestPartResult(const TestPartResult& result) = 0;
 };
@@ -174,7 +179,8 @@ class GTEST_API_ HasNewFatalFailureHelper
   bool has_new_fatal_failure_;
   TestPartResultReporterInterface* original_reporter_;
 
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(HasNewFatalFailureHelper);
+  HasNewFatalFailureHelper(const HasNewFatalFailureHelper&) = delete;
+  HasNewFatalFailureHelper& operator=(const HasNewFatalFailureHelper&) = delete;
 };
 
 }  // namespace internal
diff --git a/external/googletest/googletest/include/gtest/gtest-typed-test.h b/external/googletest/googletest/include/gtest/gtest-typed-test.h
index 70ea86b9..442e00bd 100644
--- a/external/googletest/googletest/include/gtest/gtest-typed-test.h
+++ b/external/googletest/googletest/include/gtest/gtest-typed-test.h
@@ -27,7 +27,9 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-// GOOGLETEST_CM0001 DO NOT DELETE
+// IWYU pragma: private, include "gtest/gtest.h"
+// IWYU pragma: friend gtest/.*
+// IWYU pragma: friend gmock/.*
 
 #ifndef GOOGLETEST_INCLUDE_GTEST_GTEST_TYPED_TEST_H_
 #define GOOGLETEST_INCLUDE_GTEST_GTEST_TYPED_TEST_H_
@@ -190,7 +192,7 @@ INSTANTIATE_TYPED_TEST_SUITE_P(My, FooTest, MyTypes);
   typedef ::testing::internal::GenerateTypeList<Types>::type            \
       GTEST_TYPE_PARAMS_(CaseName);                                     \
   typedef ::testing::internal::NameGeneratorSelector<__VA_ARGS__>::type \
-      GTEST_NAME_GENERATOR_(CaseName)
+  GTEST_NAME_GENERATOR_(CaseName)
 
 #define TYPED_TEST(CaseName, TestName)                                        \
   static_assert(sizeof(GTEST_STRINGIFY_(TestName)) > 1,                       \
@@ -203,8 +205,8 @@ INSTANTIATE_TYPED_TEST_SUITE_P(My, FooTest, MyTypes);
     typedef gtest_TypeParam_ TypeParam;                                       \
     void TestBody() override;                                                 \
   };                                                                          \
-  static bool gtest_##CaseName##_##TestName##_registered_                     \
-      GTEST_ATTRIBUTE_UNUSED_ = ::testing::internal::TypeParameterizedTest<   \
+  [[maybe_unused]] static bool gtest_##CaseName##_##TestName##_registered_ =  \
+      ::testing::internal::TypeParameterizedTest<                             \
           CaseName,                                                           \
           ::testing::internal::TemplateSel<GTEST_TEST_CLASS_NAME_(CaseName,   \
                                                                   TestName)>, \
@@ -256,7 +258,7 @@ INSTANTIATE_TYPED_TEST_SUITE_P(My, FooTest, MyTypes);
 // #included in multiple translation units linked together.
 #define TYPED_TEST_SUITE_P(SuiteName)              \
   static ::testing::internal::TypedTestSuitePState \
-      GTEST_TYPED_TEST_SUITE_P_STATE_(SuiteName)
+  GTEST_TYPED_TEST_SUITE_P_STATE_(SuiteName)
 
 // Legacy API is deprecated but still available
 #ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
@@ -265,31 +267,31 @@ INSTANTIATE_TYPED_TEST_SUITE_P(My, FooTest, MyTypes);
   TYPED_TEST_SUITE_P
 #endif  // GTEST_REMOVE_LEGACY_TEST_CASEAPI_
 
-#define TYPED_TEST_P(SuiteName, TestName)                             \
-  namespace GTEST_SUITE_NAMESPACE_(SuiteName) {                       \
-    template <typename gtest_TypeParam_>                              \
-    class TestName : public SuiteName<gtest_TypeParam_> {             \
-     private:                                                         \
-      typedef SuiteName<gtest_TypeParam_> TestFixture;                \
-      typedef gtest_TypeParam_ TypeParam;                             \
-      void TestBody() override;                                       \
-    };                                                                \
-    static bool gtest_##TestName##_defined_ GTEST_ATTRIBUTE_UNUSED_ = \
-        GTEST_TYPED_TEST_SUITE_P_STATE_(SuiteName).AddTestName(       \
-            __FILE__, __LINE__, GTEST_STRINGIFY_(SuiteName),          \
-            GTEST_STRINGIFY_(TestName));                              \
-  }                                                                   \
-  template <typename gtest_TypeParam_>                                \
-  void GTEST_SUITE_NAMESPACE_(                                        \
+#define TYPED_TEST_P(SuiteName, TestName)                     \
+  namespace GTEST_SUITE_NAMESPACE_(SuiteName) {               \
+  template <typename gtest_TypeParam_>                        \
+  class TestName : public SuiteName<gtest_TypeParam_> {       \
+   private:                                                   \
+    typedef SuiteName<gtest_TypeParam_> TestFixture;          \
+    typedef gtest_TypeParam_ TypeParam;                       \
+    void TestBody() override;                                 \
+  };                                                          \
+  [[maybe_unused]] static bool gtest_##TestName##_defined_ =  \
+      GTEST_TYPED_TEST_SUITE_P_STATE_(SuiteName).AddTestName( \
+          __FILE__, __LINE__, GTEST_STRINGIFY_(SuiteName),    \
+          GTEST_STRINGIFY_(TestName));                        \
+  }                                                           \
+  template <typename gtest_TypeParam_>                        \
+  void GTEST_SUITE_NAMESPACE_(                                \
       SuiteName)::TestName<gtest_TypeParam_>::TestBody()
 
 // Note: this won't work correctly if the trailing arguments are macros.
 #define REGISTER_TYPED_TEST_SUITE_P(SuiteName, ...)                         \
   namespace GTEST_SUITE_NAMESPACE_(SuiteName) {                             \
-    typedef ::testing::internal::Templates<__VA_ARGS__> gtest_AllTests_;    \
+  typedef ::testing::internal::Templates<__VA_ARGS__> gtest_AllTests_;      \
   }                                                                         \
-  static const char* const GTEST_REGISTERED_TEST_NAMES_(                    \
-      SuiteName) GTEST_ATTRIBUTE_UNUSED_ =                                  \
+  [[maybe_unused]] static const char* const GTEST_REGISTERED_TEST_NAMES_(   \
+      SuiteName) =                                                          \
       GTEST_TYPED_TEST_SUITE_P_STATE_(SuiteName).VerifyRegisteredTestNames( \
           GTEST_STRINGIFY_(SuiteName), __FILE__, __LINE__, #__VA_ARGS__)
 
@@ -304,7 +306,7 @@ INSTANTIATE_TYPED_TEST_SUITE_P(My, FooTest, MyTypes);
 #define INSTANTIATE_TYPED_TEST_SUITE_P(Prefix, SuiteName, Types, ...)     \
   static_assert(sizeof(GTEST_STRINGIFY_(Prefix)) > 1,                     \
                 "test-suit-prefix must not be empty");                    \
-  static bool gtest_##Prefix##_##SuiteName GTEST_ATTRIBUTE_UNUSED_ =      \
+  [[maybe_unused]] static bool gtest_##Prefix##_##SuiteName =             \
       ::testing::internal::TypeParameterizedTestSuite<                    \
           SuiteName, GTEST_SUITE_NAMESPACE_(SuiteName)::gtest_AllTests_,  \
           ::testing::internal::GenerateTypeList<Types>::type>::           \
diff --git a/external/googletest/googletest/include/gtest/gtest.h b/external/googletest/googletest/include/gtest/gtest.h
index 949e0f89..7be0caaf 100644
--- a/external/googletest/googletest/include/gtest/gtest.h
+++ b/external/googletest/googletest/include/gtest/gtest.h
@@ -27,7 +27,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-//
 // The Google C++ Testing and Mocking Framework (Google Test)
 //
 // This header file defines the public API for Google Test.  It should be
@@ -47,42 +46,36 @@
 // registration from Barthelemy Dagenais' (barthelemy@prologique.com)
 // easyUnit framework.
 
-// GOOGLETEST_CM0001 DO NOT DELETE
-
 #ifndef GOOGLETEST_INCLUDE_GTEST_GTEST_H_
 #define GOOGLETEST_INCLUDE_GTEST_GTEST_H_
 
 #include <cstddef>
+#include <cstdint>
 #include <limits>
 #include <memory>
 #include <ostream>
+#include <set>
+#include <sstream>
+#include <string>
 #include <type_traits>
 #include <vector>
 
-#include "gtest/gtest-death-test.h"
-#include "gtest/gtest-matchers.h"
-#include "gtest/gtest-message.h"
-#include "gtest/gtest-param-test.h"
-#include "gtest/gtest-printers.h"
-#include "gtest/gtest-test-part.h"
-#include "gtest/gtest-typed-test.h"
-#include "gtest/gtest_prod.h"
+#include "gtest/gtest-assertion-result.h"  // IWYU pragma: export
+#include "gtest/gtest-death-test.h"  // IWYU pragma: export
+#include "gtest/gtest-matchers.h"  // IWYU pragma: export
+#include "gtest/gtest-message.h"  // IWYU pragma: export
+#include "gtest/gtest-param-test.h"  // IWYU pragma: export
+#include "gtest/gtest-printers.h"  // IWYU pragma: export
+#include "gtest/gtest-test-part.h"  // IWYU pragma: export
+#include "gtest/gtest-typed-test.h"  // IWYU pragma: export
+#include "gtest/gtest_pred_impl.h"  // IWYU pragma: export
+#include "gtest/gtest_prod.h"  // IWYU pragma: export
 #include "gtest/internal/gtest-internal.h"
 #include "gtest/internal/gtest-string.h"
 
 GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
 /* class A needs to have dll-interface to be used by clients of class B */)
 
-namespace testing {
-
-// Silence C4100 (unreferenced formal parameter) and 4805
-// unsafe mix of type 'const int' and type 'const bool'
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4805)
-#pragma warning(disable : 4100)
-#endif
-
 // Declares the flags.
 
 // This flag temporary enables the disabled tests.
@@ -137,6 +130,12 @@ GTEST_DECLARE_int32_(random_seed);
 // is 1. If the value is -1 the tests are repeating forever.
 GTEST_DECLARE_int32_(repeat);
 
+// This flag controls whether Google Test Environments are recreated for each
+// repeat of the tests. The default value is true. If set to false the global
+// test Environment objects are only set up once, for the first iteration, and
+// only torn down once, for the last.
+GTEST_DECLARE_bool_(recreate_environments_when_repeating);
+
 // This flag controls whether Google Test includes Google Test internal
 // stack frames in failure stack traces.
 GTEST_DECLARE_bool_(show_internal_stack_frames);
@@ -162,6 +161,12 @@ GTEST_DECLARE_string_(stream_result_to);
 GTEST_DECLARE_string_(flagfile);
 #endif  // GTEST_USE_OWN_FLAGFILE_FLAG_
 
+namespace testing {
+
+// Silence C4100 (unreferenced formal parameter) and 4805
+// unsafe mix of type 'const int' and type 'const bool'
+GTEST_DISABLE_MSC_WARNINGS_PUSH_(4805 4100)
+
 // The upper limit for valid stack trace depths.
 const int kMaxStackTraceDepth = 100;
 
@@ -185,6 +190,17 @@ void ReportFailureInUnknownLocation(TestPartResult::Type result_type,
                                     const std::string& message);
 std::set<std::string>* GetIgnoredParameterizedTestSuites();
 
+// A base class that prevents subclasses from being copyable.
+// We do this instead of using '= delete' so as to avoid triggering warnings
+// inside user code regarding any of our declarations.
+class GTestNonCopyable {
+ public:
+  GTestNonCopyable() = default;
+  GTestNonCopyable(const GTestNonCopyable&) = delete;
+  GTestNonCopyable& operator=(const GTestNonCopyable&) = delete;
+  ~GTestNonCopyable() = default;
+};
+
 }  // namespace internal
 
 // The friend relationship of some of these classes is cyclic.
@@ -200,194 +216,6 @@ using TestCase = TestSuite;
 class TestInfo;
 class UnitTest;
 
-// A class for indicating whether an assertion was successful.  When
-// the assertion wasn't successful, the AssertionResult object
-// remembers a non-empty message that describes how it failed.
-//
-// To create an instance of this class, use one of the factory functions
-// (AssertionSuccess() and AssertionFailure()).
-//
-// This class is useful for two purposes:
-//   1. Defining predicate functions to be used with Boolean test assertions
-//      EXPECT_TRUE/EXPECT_FALSE and their ASSERT_ counterparts
-//   2. Defining predicate-format functions to be
-//      used with predicate assertions (ASSERT_PRED_FORMAT*, etc).
-//
-// For example, if you define IsEven predicate:
-//
-//   testing::AssertionResult IsEven(int n) {
-//     if ((n % 2) == 0)
-//       return testing::AssertionSuccess();
-//     else
-//       return testing::AssertionFailure() << n << " is odd";
-//   }
-//
-// Then the failed expectation EXPECT_TRUE(IsEven(Fib(5)))
-// will print the message
-//
-//   Value of: IsEven(Fib(5))
-//     Actual: false (5 is odd)
-//   Expected: true
-//
-// instead of a more opaque
-//
-//   Value of: IsEven(Fib(5))
-//     Actual: false
-//   Expected: true
-//
-// in case IsEven is a simple Boolean predicate.
-//
-// If you expect your predicate to be reused and want to support informative
-// messages in EXPECT_FALSE and ASSERT_FALSE (negative assertions show up
-// about half as often as positive ones in our tests), supply messages for
-// both success and failure cases:
-//
-//   testing::AssertionResult IsEven(int n) {
-//     if ((n % 2) == 0)
-//       return testing::AssertionSuccess() << n << " is even";
-//     else
-//       return testing::AssertionFailure() << n << " is odd";
-//   }
-//
-// Then a statement EXPECT_FALSE(IsEven(Fib(6))) will print
-//
-//   Value of: IsEven(Fib(6))
-//     Actual: true (8 is even)
-//   Expected: false
-//
-// NB: Predicates that support negative Boolean assertions have reduced
-// performance in positive ones so be careful not to use them in tests
-// that have lots (tens of thousands) of positive Boolean assertions.
-//
-// To use this class with EXPECT_PRED_FORMAT assertions such as:
-//
-//   // Verifies that Foo() returns an even number.
-//   EXPECT_PRED_FORMAT1(IsEven, Foo());
-//
-// you need to define:
-//
-//   testing::AssertionResult IsEven(const char* expr, int n) {
-//     if ((n % 2) == 0)
-//       return testing::AssertionSuccess();
-//     else
-//       return testing::AssertionFailure()
-//         << "Expected: " << expr << " is even\n  Actual: it's " << n;
-//   }
-//
-// If Foo() returns 5, you will see the following message:
-//
-//   Expected: Foo() is even
-//     Actual: it's 5
-//
-class GTEST_API_ AssertionResult {
- public:
-  // Copy constructor.
-  // Used in EXPECT_TRUE/FALSE(assertion_result).
-  AssertionResult(const AssertionResult& other);
-
-// C4800 is a level 3 warning in Visual Studio 2015 and earlier.
-// This warning is not emitted in Visual Studio 2017.
-// This warning is off by default starting in Visual Studio 2019 but can be
-// enabled with command-line options.
-#if defined(_MSC_VER) && (_MSC_VER < 1910 || _MSC_VER >= 1920)
-  GTEST_DISABLE_MSC_WARNINGS_PUSH_(4800 /* forcing value to bool */)
-#endif
-
-  // Used in the EXPECT_TRUE/FALSE(bool_expression).
-  //
-  // T must be contextually convertible to bool.
-  //
-  // The second parameter prevents this overload from being considered if
-  // the argument is implicitly convertible to AssertionResult. In that case
-  // we want AssertionResult's copy constructor to be used.
-  template <typename T>
-  explicit AssertionResult(
-      const T& success,
-      typename std::enable_if<
-          !std::is_convertible<T, AssertionResult>::value>::type*
-      /*enabler*/
-      = nullptr)
-      : success_(success) {}
-
-#if defined(_MSC_VER) && (_MSC_VER < 1910 || _MSC_VER >= 1920)
-  GTEST_DISABLE_MSC_WARNINGS_POP_()
-#endif
-
-  // Assignment operator.
-  AssertionResult& operator=(AssertionResult other) {
-    swap(other);
-    return *this;
-  }
-
-  // Returns true if and only if the assertion succeeded.
-  operator bool() const { return success_; }  // NOLINT
-
-  // Returns the assertion's negation. Used with EXPECT/ASSERT_FALSE.
-  AssertionResult operator!() const;
-
-  // Returns the text streamed into this AssertionResult. Test assertions
-  // use it when they fail (i.e., the predicate's outcome doesn't match the
-  // assertion's expectation). When nothing has been streamed into the
-  // object, returns an empty string.
-  const char* message() const {
-    return message_.get() != nullptr ? message_->c_str() : "";
-  }
-  // Deprecated; please use message() instead.
-  const char* failure_message() const { return message(); }
-
-  // Streams a custom failure message into this object.
-  template <typename T>
-  AssertionResult& operator<<(const T& value) {
-    AppendMessage(Message() << value);
-    return *this;
-  }
-
-  // Allows streaming basic output manipulators such as endl or flush into
-  // this object.
-  AssertionResult& operator<<(
-      ::std::ostream& (*basic_manipulator)(::std::ostream& stream)) {
-    AppendMessage(Message() << basic_manipulator);
-    return *this;
-  }
-
- private:
-  // Appends the contents of message to message_.
-  void AppendMessage(const Message& a_message) {
-    if (message_.get() == nullptr) message_.reset(new ::std::string);
-    message_->append(a_message.GetString().c_str());
-  }
-
-  // Swap the contents of this AssertionResult with other.
-  void swap(AssertionResult& other);
-
-  // Stores result of the assertion predicate.
-  bool success_;
-  // Stores the message describing the condition in case the expectation
-  // construct is not satisfied with the predicate's outcome.
-  // Referenced via a pointer to avoid taking too much stack frame space
-  // with test assertions.
-  std::unique_ptr< ::std::string> message_;
-};
-
-// Makes a successful assertion result.
-GTEST_API_ AssertionResult AssertionSuccess();
-
-// Makes a failed assertion result.
-GTEST_API_ AssertionResult AssertionFailure();
-
-// Makes a failed assertion result with the given failure message.
-// Deprecated; use AssertionFailure() << msg.
-GTEST_API_ AssertionResult AssertionFailure(const Message& msg);
-
-}  // namespace testing
-
-// Includes the auto-generated header that implements a family of generic
-// predicate assertion macros. This include comes late because it relies on
-// APIs declared above.
-#include "gtest/gtest_pred_impl.h"
-
-namespace testing {
-
 // The abstract class that all tests inherit from.
 //
 // In Google Test, a unit test program contains one or many TestSuites, and
@@ -468,7 +296,13 @@ class GTEST_API_ Test {
   // SetUp/TearDown method of Environment objects registered with Google
   // Test) will be output as attributes of the <testsuites> element.
   static void RecordProperty(const std::string& key, const std::string& value);
-  static void RecordProperty(const std::string& key, int value);
+  // We do not define a custom serialization except for values that can be
+  // converted to int64_t, but other values could be logged in this way.
+  template <typename T, std::enable_if_t<std::is_convertible<T, int64_t>::value,
+                                         bool> = true>
+  static void RecordProperty(const std::string& key, const T& value) {
+    RecordProperty(key, (Message() << value).GetString());
+  }
 
  protected:
   // Creates a Test object.
@@ -522,7 +356,8 @@ class GTEST_API_ Test {
   virtual Setup_should_be_spelled_SetUp* Setup() { return nullptr; }
 
   // We disallow copying Tests.
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(Test);
+  Test(const Test&) = delete;
+  Test& operator=(const Test&) = delete;
 };
 
 typedef internal::TimeInMillis TimeInMillis;
@@ -680,7 +515,8 @@ class GTEST_API_ TestResult {
   TimeInMillis elapsed_time_;
 
   // We disallow copying TestResult.
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestResult);
+  TestResult(const TestResult&) = delete;
+  TestResult& operator=(const TestResult&) = delete;
 };  // class TestResult
 
 // A TestInfo object stores the following information about a test:
@@ -714,14 +550,14 @@ class GTEST_API_ TestInfo {
   // Returns the name of the parameter type, or NULL if this is not a typed
   // or a type-parameterized test.
   const char* type_param() const {
-    if (type_param_.get() != nullptr) return type_param_->c_str();
+    if (type_param_ != nullptr) return type_param_->c_str();
     return nullptr;
   }
 
   // Returns the text representation of the value parameter, or NULL if this
   // is not a value-parameterized test.
   const char* value_param() const {
-    if (value_param_.get() != nullptr) return value_param_->c_str();
+    if (value_param_ != nullptr) return value_param_->c_str();
     return nullptr;
   }
 
@@ -763,7 +599,7 @@ class GTEST_API_ TestInfo {
   const TestResult* result() const { return &result_; }
 
  private:
-#if GTEST_HAS_DEATH_TEST
+#ifdef GTEST_HAS_DEATH_TEST
   friend class internal::DefaultDeathTestFactory;
 #endif  // GTEST_HAS_DEATH_TEST
   friend class Test;
@@ -771,7 +607,7 @@ class GTEST_API_ TestInfo {
   friend class internal::UnitTestImpl;
   friend class internal::StreamingListenerTest;
   friend TestInfo* internal::MakeAndRegisterTestInfo(
-      const char* test_suite_name, const char* name, const char* type_param,
+      std::string test_suite_name, const char* name, const char* type_param,
       const char* value_param, internal::CodeLocation code_location,
       internal::TypeId fixture_class_id, internal::SetUpTestSuiteFunc set_up_tc,
       internal::TearDownTestSuiteFunc tear_down_tc,
@@ -779,7 +615,7 @@ class GTEST_API_ TestInfo {
 
   // Constructs a TestInfo object. The newly constructed instance assumes
   // ownership of the factory object.
-  TestInfo(const std::string& test_suite_name, const std::string& name,
+  TestInfo(std::string test_suite_name, std::string name,
            const char* a_type_param,   // NULL if not a type-parameterized test
            const char* a_value_param,  // NULL if not a value-parameterized test
            internal::CodeLocation a_code_location,
@@ -826,7 +662,8 @@ class GTEST_API_ TestInfo {
   // test for the second time.
   TestResult result_;
 
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestInfo);
+  TestInfo(const TestInfo&) = delete;
+  TestInfo& operator=(const TestInfo&) = delete;
 };
 
 // A test suite, which consists of a vector of TestInfos.
@@ -846,7 +683,7 @@ class GTEST_API_ TestSuite {
   //                 this is not a type-parameterized test.
   //   set_up_tc:    pointer to the function that sets up the test suite
   //   tear_down_tc: pointer to the function that tears down the test suite
-  TestSuite(const char* name, const char* a_type_param,
+  TestSuite(const std::string& name, const char* a_type_param,
             internal::SetUpTestSuiteFunc set_up_tc,
             internal::TearDownTestSuiteFunc tear_down_tc);
 
@@ -859,7 +696,7 @@ class GTEST_API_ TestSuite {
   // Returns the name of the parameter type, or NULL if this is not a
   // type-parameterized test suite.
   const char* type_param() const {
-    if (type_param_.get() != nullptr) return type_param_->c_str();
+    if (type_param_ != nullptr) return type_param_->c_str();
     return nullptr;
   }
 
@@ -1035,7 +872,8 @@ class GTEST_API_ TestSuite {
   TestResult ad_hoc_test_result_;
 
   // We disallow copying TestSuites.
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestSuite);
+  TestSuite(const TestSuite&) = delete;
+  TestSuite& operator=(const TestSuite&) = delete;
 };
 
 // An Environment object is capable of setting up and tearing down an
@@ -1055,7 +893,7 @@ class GTEST_API_ TestSuite {
 class Environment {
  public:
   // The d'tor is virtual as we need to subclass Environment.
-  virtual ~Environment() {}
+  virtual ~Environment() = default;
 
   // Override this to define how to set up the environment.
   virtual void SetUp() {}
@@ -1086,7 +924,7 @@ class GTEST_API_ AssertionException
 // the order the corresponding events are fired.
 class TestEventListener {
  public:
-  virtual ~TestEventListener() {}
+  virtual ~TestEventListener() = default;
 
   // Fired before any test activity starts.
   virtual void OnTestProgramStart(const UnitTest& unit_test) = 0;
@@ -1114,6 +952,9 @@ class TestEventListener {
   // Fired before the test starts.
   virtual void OnTestStart(const TestInfo& test_info) = 0;
 
+  // Fired when a test is disabled
+  virtual void OnTestDisabled(const TestInfo& /*test_info*/) {}
+
   // Fired after a failed assertion or a SUCCEED() invocation.
   // If you want to throw an exception from this function to skip to the next
   // TEST, it must be AssertionException defined above, or inherited from it.
@@ -1162,6 +1003,7 @@ class EmptyTestEventListener : public TestEventListener {
 #endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
 
   void OnTestStart(const TestInfo& /*test_info*/) override {}
+  void OnTestDisabled(const TestInfo& /*test_info*/) override {}
   void OnTestPartResult(const TestPartResult& /*test_part_result*/) override {}
   void OnTestEnd(const TestInfo& /*test_info*/) override {}
   void OnTestSuiteEnd(const TestSuite& /*test_suite*/) override {}
@@ -1212,6 +1054,10 @@ class GTEST_API_ TestEventListeners {
     return default_xml_generator_;
   }
 
+  // Controls whether events will be forwarded by the repeater to the
+  // listeners in the list.
+  void SuppressEventForwarding(bool);
+
  private:
   friend class TestSuite;
   friend class TestInfo;
@@ -1241,7 +1087,6 @@ class GTEST_API_ TestEventListeners {
   // Controls whether events will be forwarded by the repeater to the
   // listeners in the list.
   bool EventForwardingEnabled() const;
-  void SuppressEventForwarding();
 
   // The actual list of listeners.
   internal::TestEventRepeater* repeater_;
@@ -1251,7 +1096,8 @@ class GTEST_API_ TestEventListeners {
   TestEventListener* default_xml_generator_;
 
   // We disallow copying TestEventListeners.
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestEventListeners);
+  TestEventListeners(const TestEventListeners&) = delete;
+  TestEventListeners& operator=(const TestEventListeners&) = delete;
 };
 
 // A UnitTest consists of a vector of TestSuites.
@@ -1277,7 +1123,7 @@ class GTEST_API_ UnitTest {
   // This method can only be called from the main thread.
   //
   // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-  int Run() GTEST_MUST_USE_RESULT_;
+  [[nodiscard]] int Run();
 
   // Returns the working directory when the first TEST() or TEST_F()
   // was executed.  The UnitTest object owns the string.
@@ -1416,6 +1262,20 @@ class GTEST_API_ UnitTest {
   // total_test_suite_count() - 1. If i is not in that range, returns NULL.
   TestSuite* GetMutableTestSuite(int i);
 
+  // Invokes OsStackTrackGetterInterface::UponLeavingGTest. UponLeavingGTest()
+  // should be called immediately before Google Test calls user code. It saves
+  // some information about the current stack that CurrentStackTrace() will use
+  // to find and hide Google Test stack frames.
+  void UponLeavingGTest();
+
+  // Sets the TestSuite object for the test that's currently running.
+  void set_current_test_suite(TestSuite* a_current_test_suite)
+      GTEST_LOCK_EXCLUDED_(mutex_);
+
+  // Sets the TestInfo object for the test that's currently running.
+  void set_current_test_info(TestInfo* a_current_test_info)
+      GTEST_LOCK_EXCLUDED_(mutex_);
+
   // Accessors for the implementation object.
   internal::UnitTestImpl* impl() { return impl_; }
   const internal::UnitTestImpl* impl() const { return impl_; }
@@ -1424,6 +1284,8 @@ class GTEST_API_ UnitTest {
   // members of UnitTest.
   friend class ScopedTrace;
   friend class Test;
+  friend class TestInfo;
+  friend class TestSuite;
   friend class internal::AssertHelper;
   friend class internal::StreamingListenerTest;
   friend class internal::UnitTestRecordPropertyTestHelper;
@@ -1458,7 +1320,8 @@ class GTEST_API_ UnitTest {
   internal::UnitTestImpl* impl_;
 
   // We disallow copying UnitTest.
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(UnitTest);
+  UnitTest(const UnitTest&) = delete;
+  UnitTest& operator=(const UnitTest&) = delete;
 };
 
 // A convenient wrapper for adding an environment for the test
@@ -1726,12 +1589,12 @@ AssertionResult CmpHelperFloatingPointEQ(const char* lhs_expression,
   }
 
   ::std::stringstream lhs_ss;
-  lhs_ss << std::setprecision(std::numeric_limits<RawType>::digits10 + 2)
-         << lhs_value;
+  lhs_ss.precision(std::numeric_limits<RawType>::digits10 + 2);
+  lhs_ss << lhs_value;
 
   ::std::stringstream rhs_ss;
-  rhs_ss << std::setprecision(std::numeric_limits<RawType>::digits10 + 2)
-         << rhs_value;
+  rhs_ss.precision(std::numeric_limits<RawType>::digits10 + 2);
+  rhs_ss << rhs_value;
 
   return EqFailure(lhs_expression, rhs_expression,
                    StringStreamToString(&lhs_ss), StringStreamToString(&rhs_ss),
@@ -1776,12 +1639,14 @@ class GTEST_API_ AssertHelper {
     std::string const message;
 
    private:
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(AssertHelperData);
+    AssertHelperData(const AssertHelperData&) = delete;
+    AssertHelperData& operator=(const AssertHelperData&) = delete;
   };
 
   AssertHelperData* const data_;
 
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(AssertHelper);
+  AssertHelper(const AssertHelper&) = delete;
+  AssertHelper& operator=(const AssertHelper&) = delete;
 };
 
 }  // namespace internal
@@ -1796,7 +1661,7 @@ class GTEST_API_ AssertHelper {
 // the GetParam() method.
 //
 // Use it with one of the parameter generator defining functions, like Range(),
-// Values(), ValuesIn(), Bool(), and Combine().
+// Values(), ValuesIn(), Bool(), Combine(), and ConvertGenerator<T>().
 //
 // class FooTest : public ::testing::TestWithParam<int> {
 //  protected:
@@ -1824,7 +1689,7 @@ template <typename T>
 class WithParamInterface {
  public:
   typedef T ParamType;
-  virtual ~WithParamInterface() {}
+  virtual ~WithParamInterface() = default;
 
   // The current parameter value. Is also available in the test fixture's
   // constructor.
@@ -1894,14 +1759,15 @@ class TestWithParam : public Test, public WithParamInterface<T> {};
 #define GTEST_FAIL() GTEST_FATAL_FAILURE_("Failed")
 
 // Like GTEST_FAIL(), but at the given source file location.
-#define GTEST_FAIL_AT(file, line)         \
-  GTEST_MESSAGE_AT_(file, line, "Failed", \
-                    ::testing::TestPartResult::kFatalFailure)
+#define GTEST_FAIL_AT(file, line)                \
+  return GTEST_MESSAGE_AT_(file, line, "Failed", \
+                           ::testing::TestPartResult::kFatalFailure)
 
 // Define this macro to 1 to omit the definition of FAIL(), which is a
 // generic name and clashes with some other libraries.
-#if !GTEST_DONT_DEFINE_FAIL
+#if !(defined(GTEST_DONT_DEFINE_FAIL) && GTEST_DONT_DEFINE_FAIL)
 #define FAIL() GTEST_FAIL()
+#define FAIL_AT(file, line) GTEST_FAIL_AT(file, line)
 #endif
 
 // Generates a success with a generic message.
@@ -1909,7 +1775,7 @@ class TestWithParam : public Test, public WithParamInterface<T> {};
 
 // Define this macro to 1 to omit the definition of SUCCEED(), which
 // is a generic name and clashes with some other libraries.
-#if !GTEST_DONT_DEFINE_SUCCEED
+#if !(defined(GTEST_DONT_DEFINE_SUCCEED) && GTEST_DONT_DEFINE_SUCCEED)
 #define SUCCEED() GTEST_SUCCEED()
 #endif
 
@@ -1953,19 +1819,19 @@ class TestWithParam : public Test, public WithParamInterface<T> {};
 // Define these macros to 1 to omit the definition of the corresponding
 // EXPECT or ASSERT, which clashes with some users' own code.
 
-#if !GTEST_DONT_DEFINE_EXPECT_TRUE
+#if !(defined(GTEST_DONT_DEFINE_EXPECT_TRUE) && GTEST_DONT_DEFINE_EXPECT_TRUE)
 #define EXPECT_TRUE(condition) GTEST_EXPECT_TRUE(condition)
 #endif
 
-#if !GTEST_DONT_DEFINE_EXPECT_FALSE
+#if !(defined(GTEST_DONT_DEFINE_EXPECT_FALSE) && GTEST_DONT_DEFINE_EXPECT_FALSE)
 #define EXPECT_FALSE(condition) GTEST_EXPECT_FALSE(condition)
 #endif
 
-#if !GTEST_DONT_DEFINE_ASSERT_TRUE
+#if !(defined(GTEST_DONT_DEFINE_ASSERT_TRUE) && GTEST_DONT_DEFINE_ASSERT_TRUE)
 #define ASSERT_TRUE(condition) GTEST_ASSERT_TRUE(condition)
 #endif
 
-#if !GTEST_DONT_DEFINE_ASSERT_FALSE
+#if !(defined(GTEST_DONT_DEFINE_ASSERT_FALSE) && GTEST_DONT_DEFINE_ASSERT_FALSE)
 #define ASSERT_FALSE(condition) GTEST_ASSERT_FALSE(condition)
 #endif
 
@@ -2044,27 +1910,27 @@ class TestWithParam : public Test, public WithParamInterface<T> {};
 // Define macro GTEST_DONT_DEFINE_ASSERT_XY to 1 to omit the definition of
 // ASSERT_XY(), which clashes with some users' own code.
 
-#if !GTEST_DONT_DEFINE_ASSERT_EQ
+#if !(defined(GTEST_DONT_DEFINE_ASSERT_EQ) && GTEST_DONT_DEFINE_ASSERT_EQ)
 #define ASSERT_EQ(val1, val2) GTEST_ASSERT_EQ(val1, val2)
 #endif
 
-#if !GTEST_DONT_DEFINE_ASSERT_NE
+#if !(defined(GTEST_DONT_DEFINE_ASSERT_NE) && GTEST_DONT_DEFINE_ASSERT_NE)
 #define ASSERT_NE(val1, val2) GTEST_ASSERT_NE(val1, val2)
 #endif
 
-#if !GTEST_DONT_DEFINE_ASSERT_LE
+#if !(defined(GTEST_DONT_DEFINE_ASSERT_LE) && GTEST_DONT_DEFINE_ASSERT_LE)
 #define ASSERT_LE(val1, val2) GTEST_ASSERT_LE(val1, val2)
 #endif
 
-#if !GTEST_DONT_DEFINE_ASSERT_LT
+#if !(defined(GTEST_DONT_DEFINE_ASSERT_LT) && GTEST_DONT_DEFINE_ASSERT_LT)
 #define ASSERT_LT(val1, val2) GTEST_ASSERT_LT(val1, val2)
 #endif
 
-#if !GTEST_DONT_DEFINE_ASSERT_GE
+#if !(defined(GTEST_DONT_DEFINE_ASSERT_GE) && GTEST_DONT_DEFINE_ASSERT_GE)
 #define ASSERT_GE(val1, val2) GTEST_ASSERT_GE(val1, val2)
 #endif
 
-#if !GTEST_DONT_DEFINE_ASSERT_GT
+#if !(defined(GTEST_DONT_DEFINE_ASSERT_GT) && GTEST_DONT_DEFINE_ASSERT_GT)
 #define ASSERT_GT(val1, val2) GTEST_ASSERT_GT(val1, val2)
 #endif
 
@@ -2152,7 +2018,7 @@ GTEST_API_ AssertionResult FloatLE(const char* expr1, const char* expr2,
 GTEST_API_ AssertionResult DoubleLE(const char* expr1, const char* expr2,
                                     double val1, double val2);
 
-#if GTEST_OS_WINDOWS
+#ifdef GTEST_OS_WINDOWS
 
 // Macros that test for HRESULT failure and success, these are only useful
 // on Windows, and rely on Windows SDK macros and APIs to compile.
@@ -2232,10 +2098,9 @@ class GTEST_API_ ScopedTrace {
  private:
   void PushTrace(const char* file, int line, std::string message);
 
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ScopedTrace);
-} GTEST_ATTRIBUTE_UNUSED_;  // A ScopedTrace object does its job in its
-                            // c'tor and d'tor.  Therefore it doesn't
-                            // need to be used otherwise.
+  ScopedTrace(const ScopedTrace&) = delete;
+  ScopedTrace& operator=(const ScopedTrace&) = delete;
+};
 
 // Causes a trace (including the source file path, the current line
 // number, and the given message) to be included in every test failure
@@ -2252,8 +2117,8 @@ class GTEST_API_ ScopedTrace {
 // Assuming that each thread maintains its own stack of traces.
 // Therefore, a SCOPED_TRACE() would (correctly) only affect the
 // assertions in its own thread.
-#define SCOPED_TRACE(message)                                         \
-  ::testing::ScopedTrace GTEST_CONCAT_TOKEN_(gtest_trace_, __LINE__)( \
+#define SCOPED_TRACE(message)                                               \
+  const ::testing::ScopedTrace GTEST_CONCAT_TOKEN_(gtest_trace_, __LINE__)( \
       __FILE__, __LINE__, (message))
 
 // Compile-time assertion for type equality.
@@ -2323,7 +2188,7 @@ constexpr bool StaticAssertTypeEq() noexcept {
 
 // Define this macro to 1 to omit the definition of TEST(), which
 // is a generic name and clashes with some other libraries.
-#if !GTEST_DONT_DEFINE_TEST
+#if !(defined(GTEST_DONT_DEFINE_TEST) && GTEST_DONT_DEFINE_TEST)
 #define TEST(test_suite_name, test_name) GTEST_TEST(test_suite_name, test_name)
 #endif
 
@@ -2352,21 +2217,25 @@ constexpr bool StaticAssertTypeEq() noexcept {
 //     EXPECT_EQ(a_.size(), 0);
 //     EXPECT_EQ(b_.size(), 1);
 //   }
-//
-// GOOGLETEST_CM0011 DO NOT DELETE
-#if !GTEST_DONT_DEFINE_TEST
-#define TEST_F(test_fixture, test_name)              \
+#define GTEST_TEST_F(test_fixture, test_name)        \
   GTEST_TEST_(test_fixture, test_name, test_fixture, \
               ::testing::internal::GetTypeId<test_fixture>())
-#endif  // !GTEST_DONT_DEFINE_TEST
+#if !(defined(GTEST_DONT_DEFINE_TEST_F) && GTEST_DONT_DEFINE_TEST_F)
+#define TEST_F(test_fixture, test_name) GTEST_TEST_F(test_fixture, test_name)
+#endif
 
-// Returns a path to temporary directory.
-// Tries to determine an appropriate directory for the platform.
+// Returns a path to a temporary directory, which should be writable. It is
+// implementation-dependent whether or not the path is terminated by the
+// directory-separator character.
 GTEST_API_ std::string TempDir();
 
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
+// Returns a path to a directory that contains ancillary data files that might
+// be used by tests. It is implementation dependent whether or not the path is
+// terminated by the directory-separator character. The directory and the files
+// in it should be considered read-only.
+GTEST_API_ std::string SrcDir();
+
+GTEST_DISABLE_MSC_WARNINGS_POP_()  // 4805 4100
 
 // Dynamically registers a test with the framework.
 //
@@ -2419,6 +2288,7 @@ GTEST_API_ std::string TempDir();
 // }
 // ...
 // int main(int argc, char** argv) {
+//   ::testing::InitGoogleTest(&argc, argv);
 //   std::vector<int> values_to_test = LoadValuesFromConfig();
 //   RegisterMyTests(values_to_test);
 //   ...
@@ -2454,11 +2324,12 @@ TestInfo* RegisterTest(const char* test_suite_name, const char* test_name,
 // tests are successful, or 1 otherwise.
 //
 // RUN_ALL_TESTS() should be invoked after the command line has been
-// parsed by InitGoogleTest().
+// parsed by InitGoogleTest(). RUN_ALL_TESTS will tear down and delete any
+// installed environments and should only be called once per binary.
 //
 // This function was formerly a macro; thus, it is in the global
 // namespace and has an all-caps name.
-int RUN_ALL_TESTS() GTEST_MUST_USE_RESULT_;
+[[nodiscard]] int RUN_ALL_TESTS();
 
 inline int RUN_ALL_TESTS() { return ::testing::UnitTest::GetInstance()->Run(); }
 
diff --git a/external/googletest/googletest/include/gtest/gtest_pred_impl.h b/external/googletest/googletest/include/gtest/gtest_pred_impl.h
index f2ebcc05..47a24aa6 100644
--- a/external/googletest/googletest/include/gtest/gtest_pred_impl.h
+++ b/external/googletest/googletest/include/gtest/gtest_pred_impl.h
@@ -26,17 +26,19 @@
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// This file is AUTOMATICALLY GENERATED on 01/02/2019 by command
-// 'gen_gtest_pred_impl.py 5'.  DO NOT EDIT BY HAND!
 //
 // Implements a family of generic predicate assertion macros.
-// GOOGLETEST_CM0001 DO NOT DELETE
+
+// IWYU pragma: private, include "gtest/gtest.h"
+// IWYU pragma: friend gtest/.*
+// IWYU pragma: friend gmock/.*
 
 #ifndef GOOGLETEST_INCLUDE_GTEST_GTEST_PRED_IMPL_H_
 #define GOOGLETEST_INCLUDE_GTEST_GTEST_PRED_IMPL_H_
 
-#include "gtest/gtest.h"
+#include "gtest/gtest-assertion-result.h"
+#include "gtest/internal/gtest-internal.h"
+#include "gtest/internal/gtest-port.h"
 
 namespace testing {
 
diff --git a/external/googletest/googletest/include/gtest/gtest_prod.h b/external/googletest/googletest/include/gtest/gtest_prod.h
index d6a95e87..1f37dc31 100644
--- a/external/googletest/googletest/include/gtest/gtest_prod.h
+++ b/external/googletest/googletest/include/gtest/gtest_prod.h
@@ -27,9 +27,8 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-//
 // Google C++ Testing and Mocking Framework definitions useful in production
-// code. GOOGLETEST_CM0003 DO NOT DELETE
+// code.
 
 #ifndef GOOGLETEST_INCLUDE_GTEST_GTEST_PROD_H_
 #define GOOGLETEST_INCLUDE_GTEST_GTEST_PROD_H_
diff --git a/external/googletest/googletest/include/gtest/internal/custom/README.md b/external/googletest/googletest/include/gtest/internal/custom/README.md
index fe2e2199..cb49e2c7 100644
--- a/external/googletest/googletest/include/gtest/internal/custom/README.md
+++ b/external/googletest/googletest/include/gtest/internal/custom/README.md
@@ -6,49 +6,39 @@ The custom directory is an injection point for custom user configurations.
 
 ### The following macros can be defined:
 
-* `GTEST_OS_STACK_TRACE_GETTER_` - The name of an implementation of
-  `OsStackTraceGetterInterface`.
-* `GTEST_CUSTOM_TEMPDIR_FUNCTION_` - An override for `testing::TempDir()`. See
-  `testing::TempDir` for semantics and signature.
+*   `GTEST_OS_STACK_TRACE_GETTER_` - The name of an implementation of
+    `OsStackTraceGetterInterface`.
+*   `GTEST_CUSTOM_TEMPDIR_FUNCTION_` - An override for `testing::TempDir()`. See
+    `testing::TempDir` for semantics and signature.
 
 ## Header `gtest-port.h`
 
 The following macros can be defined:
 
-### Flag related macros:
-
-* `GTEST_FLAG(flag_name)`
-* `GTEST_USE_OWN_FLAGFILE_FLAG_` - Define to 0 when the system provides its own flagfile flag parsing.
-* `GTEST_DECLARE_bool_(name)`
-* `GTEST_DECLARE_int32_(name)`
-* `GTEST_DECLARE_string_(name)`
-* `GTEST_DEFINE_bool_(name, default_val, doc)`
-* `GTEST_DEFINE_int32_(name, default_val, doc)`
-* `GTEST_DEFINE_string_(name, default_val, doc)`
-
 ### Logging:
 
-* `GTEST_LOG_(severity)`
-* `GTEST_CHECK_(condition)`
-* Functions `LogToStderr()` and `FlushInfoLog()` have to be provided too.
+*   `GTEST_LOG_(severity)`
+*   `GTEST_CHECK_(condition)`
+*   Functions `LogToStderr()` and `FlushInfoLog()` have to be provided too.
 
 ### Threading:
 
-* `GTEST_HAS_NOTIFICATION_` - Enabled if Notification is already provided.
-* `GTEST_HAS_MUTEX_AND_THREAD_LOCAL_` - Enabled if `Mutex` and `ThreadLocal`
-  are already provided. Must also provide `GTEST_DECLARE_STATIC_MUTEX_(mutex)`
-  and `GTEST_DEFINE_STATIC_MUTEX_(mutex)`
-* `GTEST_EXCLUSIVE_LOCK_REQUIRED_(locks)`
-* `GTEST_LOCK_EXCLUDED_(locks)`
+*   `GTEST_HAS_NOTIFICATION_` - Enabled if Notification is already provided.
+*   `GTEST_HAS_MUTEX_AND_THREAD_LOCAL_` - Enabled if `Mutex` and `ThreadLocal`
+    are already provided. Must also provide `GTEST_DECLARE_STATIC_MUTEX_(mutex)`
+    and `GTEST_DEFINE_STATIC_MUTEX_(mutex)`
+*   `GTEST_EXCLUSIVE_LOCK_REQUIRED_(locks)`
+*   `GTEST_LOCK_EXCLUDED_(locks)`
 
 ### Underlying library support features
 
-* `GTEST_HAS_CXXABI_H_`
+*   `GTEST_HAS_CXXABI_H_`
 
 ### Exporting API symbols:
 
-* `GTEST_API_` - Specifier for exported symbols.
+*   `GTEST_API_` - Specifier for exported symbols.
 
 ## Header `gtest-printers.h`
 
-* See documentation at `gtest/gtest-printers.h` for details on how to define a custom printer.
+*   See documentation at `gtest/gtest-printers.h` for details on how to define a
+    custom printer.
diff --git a/external/googletest/googletest/include/gtest/internal/gtest-death-test-internal.h b/external/googletest/googletest/include/gtest/internal/gtest-death-test-internal.h
index 9475b103..b363259e 100644
--- a/external/googletest/googletest/include/gtest/internal/gtest-death-test-internal.h
+++ b/external/googletest/googletest/include/gtest/internal/gtest-death-test-internal.h
@@ -26,12 +26,15 @@
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
+
 // The Google C++ Testing and Mocking Framework (Google Test)
 //
 // This header file defines internal utilities needed for implementing
 // death tests.  They are subject to change without notice.
-// GOOGLETEST_CM0001 DO NOT DELETE
+
+// IWYU pragma: private, include "gtest/gtest.h"
+// IWYU pragma: friend gtest/.*
+// IWYU pragma: friend gmock/.*
 
 #ifndef GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_DEATH_TEST_INTERNAL_H_
 #define GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_DEATH_TEST_INTERNAL_H_
@@ -39,21 +42,43 @@
 #include <stdio.h>
 
 #include <memory>
+#include <string>
 
 #include "gtest/gtest-matchers.h"
 #include "gtest/internal/gtest-internal.h"
+#include "gtest/internal/gtest-port.h"
+
+GTEST_DECLARE_string_(internal_run_death_test);
 
 namespace testing {
 namespace internal {
 
-GTEST_DECLARE_string_(internal_run_death_test);
-
-// Names of the flags (needed for parsing Google Test flags).
-const char kDeathTestStyleFlag[] = "death_test_style";
-const char kDeathTestUseFork[] = "death_test_use_fork";
+// Name of the flag (needed for parsing Google Test flag).
 const char kInternalRunDeathTestFlag[] = "internal_run_death_test";
 
-#if GTEST_HAS_DEATH_TEST
+// A string passed to EXPECT_DEATH (etc.) is caught by one of these overloads
+// and interpreted as a regex (rather than an Eq matcher) for legacy
+// compatibility.
+inline Matcher<const ::std::string&> MakeDeathTestMatcher(
+    ::testing::internal::RE regex) {
+  return ContainsRegex(regex.pattern());
+}
+inline Matcher<const ::std::string&> MakeDeathTestMatcher(const char* regex) {
+  return ContainsRegex(regex);
+}
+inline Matcher<const ::std::string&> MakeDeathTestMatcher(
+    const ::std::string& regex) {
+  return ContainsRegex(regex);
+}
+
+// If a Matcher<const ::std::string&> is passed to EXPECT_DEATH (etc.), it's
+// used directly.
+inline Matcher<const ::std::string&> MakeDeathTestMatcher(
+    Matcher<const ::std::string&> matcher) {
+  return matcher;
+}
+
+#ifdef GTEST_HAS_DEATH_TEST
 
 GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
 /* class A needs to have dll-interface to be used by clients of class B */)
@@ -69,7 +94,7 @@ GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
 //
 // exit status:  The integer exit information in the format specified
 //               by wait(2)
-// exit code:    The integer code passed to exit(3), _exit(2), or
+// exit code:    The integer code passed to exit(3), _Exit(2), or
 //               returned from main()
 class GTEST_API_ DeathTest {
  public:
@@ -84,7 +109,7 @@ class GTEST_API_ DeathTest {
   static bool Create(const char* statement, Matcher<const std::string&> matcher,
                      const char* file, int line, DeathTest** test);
   DeathTest();
-  virtual ~DeathTest() {}
+  virtual ~DeathTest() = default;
 
   // A helper class that aborts a death test when it's deleted.
   class ReturnSentinel {
@@ -94,8 +119,9 @@ class GTEST_API_ DeathTest {
 
    private:
     DeathTest* const test_;
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(ReturnSentinel);
-  } GTEST_ATTRIBUTE_UNUSED_;
+    ReturnSentinel(const ReturnSentinel&) = delete;
+    ReturnSentinel& operator=(const ReturnSentinel&) = delete;
+  };
 
   // An enumeration of possible roles that may be taken when a death
   // test is encountered.  EXECUTE means that the death test logic should
@@ -139,7 +165,8 @@ class GTEST_API_ DeathTest {
   // A string containing a description of the outcome of the last death test.
   static std::string last_death_test_message_;
 
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(DeathTest);
+  DeathTest(const DeathTest&) = delete;
+  DeathTest& operator=(const DeathTest&) = delete;
 };
 
 GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
@@ -147,7 +174,7 @@ GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
 // Factory interface for death tests.  May be mocked out for testing.
 class DeathTestFactory {
  public:
-  virtual ~DeathTestFactory() {}
+  virtual ~DeathTestFactory() = default;
   virtual bool Create(const char* statement,
                       Matcher<const std::string&> matcher, const char* file,
                       int line, DeathTest** test) = 0;
@@ -164,28 +191,6 @@ class DefaultDeathTestFactory : public DeathTestFactory {
 // by a signal, or exited normally with a nonzero exit code.
 GTEST_API_ bool ExitedUnsuccessfully(int exit_status);
 
-// A string passed to EXPECT_DEATH (etc.) is caught by one of these overloads
-// and interpreted as a regex (rather than an Eq matcher) for legacy
-// compatibility.
-inline Matcher<const ::std::string&> MakeDeathTestMatcher(
-    ::testing::internal::RE regex) {
-  return ContainsRegex(regex.pattern());
-}
-inline Matcher<const ::std::string&> MakeDeathTestMatcher(const char* regex) {
-  return ContainsRegex(regex);
-}
-inline Matcher<const ::std::string&> MakeDeathTestMatcher(
-    const ::std::string& regex) {
-  return ContainsRegex(regex);
-}
-
-// If a Matcher<const ::std::string&> is passed to EXPECT_DEATH (etc.), it's
-// used directly.
-inline Matcher<const ::std::string&> MakeDeathTestMatcher(
-    Matcher<const ::std::string&> matcher) {
-  return matcher;
-}
-
 // Traps C++ exceptions escaping statement and reports them as test
 // failures. Note that trapping SEH exceptions is not implemented here.
 #if GTEST_HAS_EXCEPTIONS
@@ -232,14 +237,12 @@ inline Matcher<const ::std::string&> MakeDeathTestMatcher(
           }                                                                    \
           break;                                                               \
         case ::testing::internal::DeathTest::EXECUTE_TEST: {                   \
-          ::testing::internal::DeathTest::ReturnSentinel gtest_sentinel(       \
+          const ::testing::internal::DeathTest::ReturnSentinel gtest_sentinel( \
               gtest_dt);                                                       \
           GTEST_EXECUTE_DEATH_TEST_STATEMENT_(statement, gtest_dt);            \
           gtest_dt->Abort(::testing::internal::DeathTest::TEST_DID_NOT_DIE);   \
           break;                                                               \
         }                                                                      \
-        default:                                                               \
-          break;                                                               \
       }                                                                        \
     }                                                                          \
   } else                                                                       \
@@ -286,7 +289,8 @@ class InternalRunDeathTestFlag {
   int index_;
   int write_fd_;
 
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(InternalRunDeathTestFlag);
+  InternalRunDeathTestFlag(const InternalRunDeathTestFlag&) = delete;
+  InternalRunDeathTestFlag& operator=(const InternalRunDeathTestFlag&) = delete;
 };
 
 // Returns a newly created InternalRunDeathTestFlag object with fields
diff --git a/external/googletest/googletest/include/gtest/internal/gtest-filepath.h b/external/googletest/googletest/include/gtest/internal/gtest-filepath.h
index a8598e12..6dc47be5 100644
--- a/external/googletest/googletest/include/gtest/internal/gtest-filepath.h
+++ b/external/googletest/googletest/include/gtest/internal/gtest-filepath.h
@@ -26,7 +26,7 @@
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
+
 // Google Test filepath utilities
 //
 // This header file declares classes and functions used internally by
@@ -35,16 +35,24 @@
 // This file is #included in gtest/internal/gtest-internal.h.
 // Do not include this header file separately!
 
-// GOOGLETEST_CM0001 DO NOT DELETE
+// IWYU pragma: private, include "gtest/gtest.h"
+// IWYU pragma: friend gtest/.*
+// IWYU pragma: friend gmock/.*
 
 #ifndef GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_FILEPATH_H_
 #define GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_FILEPATH_H_
 
+#include <string>
+#include <utility>
+
+#include "gtest/internal/gtest-port.h"
 #include "gtest/internal/gtest-string.h"
 
 GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
 /* class A needs to have dll-interface to be used by clients of class B */)
 
+#if GTEST_HAS_FILE_SYSTEM
+
 namespace testing {
 namespace internal {
 
@@ -63,8 +71,9 @@ class GTEST_API_ FilePath {
  public:
   FilePath() : pathname_("") {}
   FilePath(const FilePath& rhs) : pathname_(rhs.pathname_) {}
+  FilePath(FilePath&& rhs) noexcept : pathname_(std::move(rhs.pathname_)) {}
 
-  explicit FilePath(const std::string& pathname) : pathname_(pathname) {
+  explicit FilePath(std::string pathname) : pathname_(std::move(pathname)) {
     Normalize();
   }
 
@@ -72,6 +81,10 @@ class GTEST_API_ FilePath {
     Set(rhs);
     return *this;
   }
+  FilePath& operator=(FilePath&& rhs) noexcept {
+    pathname_ = std::move(rhs.pathname_);
+    return *this;
+  }
 
   void Set(const FilePath& rhs) { pathname_ = rhs.pathname_; }
 
@@ -197,6 +210,16 @@ class GTEST_API_ FilePath {
   // separators. Returns NULL if no path separator was found.
   const char* FindLastPathSeparator() const;
 
+  // Returns the length of the path root, including the directory separator at
+  // the end of the prefix. Returns zero by definition if the path is relative.
+  // Examples:
+  // - [Windows] "..\Sibling" => 0
+  // - [Windows] "\Windows" => 1
+  // - [Windows] "C:/Windows\Notepad.exe" => 3
+  // - [Windows] "\\Host\Share\C$/Windows" => 13
+  // - [UNIX] "/bin" => 1
+  size_t CalculateRootLength() const;
+
   std::string pathname_;
 };  // class FilePath
 
@@ -205,4 +228,6 @@ class GTEST_API_ FilePath {
 
 GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
 
+#endif  // GTEST_HAS_FILE_SYSTEM
+
 #endif  // GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_FILEPATH_H_
diff --git a/external/googletest/googletest/include/gtest/internal/gtest-internal.h b/external/googletest/googletest/include/gtest/internal/gtest-internal.h
index 59d73941..808d89be 100644
--- a/external/googletest/googletest/include/gtest/internal/gtest-internal.h
+++ b/external/googletest/googletest/include/gtest/internal/gtest-internal.h
@@ -26,20 +26,22 @@
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
+
 // The Google C++ Testing and Mocking Framework (Google Test)
 //
 // This header file declares functions and macros used internally by
 // Google Test.  They are subject to change without notice.
 
-// GOOGLETEST_CM0001 DO NOT DELETE
+// IWYU pragma: private, include "gtest/gtest.h"
+// IWYU pragma: friend gtest/.*
+// IWYU pragma: friend gmock/.*
 
 #ifndef GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_INTERNAL_H_
 #define GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_INTERNAL_H_
 
 #include "gtest/internal/gtest-port.h"
 
-#if GTEST_OS_LINUX
+#ifdef GTEST_OS_LINUX
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -55,12 +57,13 @@
 #include <string.h>
 
 #include <cstdint>
-#include <iomanip>
+#include <functional>
 #include <limits>
 #include <map>
 #include <set>
 #include <string>
 #include <type_traits>
+#include <utility>
 #include <vector>
 
 #include "gtest/gtest-message.h"
@@ -75,7 +78,7 @@
 //
 // will result in the token foo__LINE__, instead of foo followed by
 // the current line number.  For more details, see
-// http://www.parashift.com/c++-faq-lite/misc-technical-issues.html#faq-39.6
+// https://www.parashift.com/c++-faq-lite/misc-technical-issues.html#faq-39.6
 #define GTEST_CONCAT_TOKEN_(foo, bar) GTEST_CONCAT_TOKEN_IMPL_(foo, bar)
 #define GTEST_CONCAT_TOKEN_IMPL_(foo, bar) foo##bar
 
@@ -166,7 +169,7 @@ namespace edit_distance {
 // All edits cost the same, with replace having lower priority than
 // add/remove.
 // Simple implementation of the Wagner-Fischer algorithm.
-// See http://en.wikipedia.org/wiki/Wagner-Fischer_algorithm
+// See https://en.wikipedia.org/wiki/Wagner-Fischer_algorithm
 enum EditType { kMatch, kAdd, kRemove, kReplace };
 GTEST_API_ std::vector<EditType> CalculateOptimalEdits(
     const std::vector<size_t>& left, const std::vector<size_t>& right);
@@ -183,14 +186,6 @@ GTEST_API_ std::string CreateUnifiedDiff(const std::vector<std::string>& left,
 
 }  // namespace edit_distance
 
-// Calculate the diff between 'left' and 'right' and return it in unified diff
-// format.
-// If not null, stores in 'total_line_count' the total number of lines found
-// in left + right.
-GTEST_API_ std::string DiffStrings(const std::string& left,
-                                   const std::string& right,
-                                   size_t* total_line_count);
-
 // Constructs and returns the message for an equality assertion
 // (e.g. ASSERT_EQ, EXPECT_STREQ, etc) failure.
 //
@@ -241,7 +236,7 @@ GTEST_API_ std::string GetBoolAssertionFailureMessage(
 //   For double, there are 11 exponent bits and 52 fraction bits.
 //
 //   More details can be found at
-//   http://en.wikipedia.org/wiki/IEEE_floating-point_standard.
+//   https://en.wikipedia.org/wiki/IEEE_floating-point_standard.
 //
 // Template parameter:
 //
@@ -286,7 +281,7 @@ class FloatingPoint {
   // bits.  Therefore, 4 should be enough for ordinary use.
   //
   // See the following article for more details on ULP:
-  // http://randomascii.wordpress.com/2012/02/25/comparing-floating-point-numbers-2012-edition/
+  // https://randomascii.wordpress.com/2012/02/25/comparing-floating-point-numbers-2012-edition/
   static const uint32_t kMaxUlps = 4;
 
   // Constructs a FloatingPoint from a raw floating-point number.
@@ -295,38 +290,35 @@ class FloatingPoint {
   // around may change its bits, although the new value is guaranteed
   // to be also a NAN.  Therefore, don't expect this constructor to
   // preserve the bits in x when x is a NAN.
-  explicit FloatingPoint(const RawType& x) { u_.value_ = x; }
+  explicit FloatingPoint(RawType x) { memcpy(&bits_, &x, sizeof(x)); }
 
   // Static methods
 
   // Reinterprets a bit pattern as a floating-point number.
   //
   // This function is needed to test the AlmostEquals() method.
-  static RawType ReinterpretBits(const Bits bits) {
-    FloatingPoint fp(0);
-    fp.u_.bits_ = bits;
-    return fp.u_.value_;
+  static RawType ReinterpretBits(Bits bits) {
+    RawType fp;
+    memcpy(&fp, &bits, sizeof(fp));
+    return fp;
   }
 
   // Returns the floating-point number that represent positive infinity.
   static RawType Infinity() { return ReinterpretBits(kExponentBitMask); }
 
-  // Returns the maximum representable finite floating-point number.
-  static RawType Max();
-
   // Non-static methods
 
   // Returns the bits that represents this number.
-  const Bits& bits() const { return u_.bits_; }
+  const Bits& bits() const { return bits_; }
 
   // Returns the exponent bits of this number.
-  Bits exponent_bits() const { return kExponentBitMask & u_.bits_; }
+  Bits exponent_bits() const { return kExponentBitMask & bits_; }
 
   // Returns the fraction bits of this number.
-  Bits fraction_bits() const { return kFractionBitMask & u_.bits_; }
+  Bits fraction_bits() const { return kFractionBitMask & bits_; }
 
   // Returns the sign bit of this number.
-  Bits sign_bit() const { return kSignBitMask & u_.bits_; }
+  Bits sign_bit() const { return kSignBitMask & bits_; }
 
   // Returns true if and only if this is NAN (not a number).
   bool is_nan() const {
@@ -340,23 +332,16 @@ class FloatingPoint {
   //
   //   - returns false if either number is (or both are) NAN.
   //   - treats really large numbers as almost equal to infinity.
-  //   - thinks +0.0 and -0.0 are 0 DLP's apart.
+  //   - thinks +0.0 and -0.0 are 0 ULP's apart.
   bool AlmostEquals(const FloatingPoint& rhs) const {
     // The IEEE standard says that any comparison operation involving
     // a NAN must return false.
     if (is_nan() || rhs.is_nan()) return false;
 
-    return DistanceBetweenSignAndMagnitudeNumbers(u_.bits_, rhs.u_.bits_) <=
-           kMaxUlps;
+    return DistanceBetweenSignAndMagnitudeNumbers(bits_, rhs.bits_) <= kMaxUlps;
   }
 
  private:
-  // The data type used to store the actual floating-point number.
-  union FloatingPointUnion {
-    RawType value_;  // The raw floating-point number.
-    Bits bits_;      // The bits that represent the number.
-  };
-
   // Converts an integer from the sign-and-magnitude representation to
   // the biased representation.  More precisely, let N be 2 to the
   // power of (kBitCount - 1), an integer x is represented by the
@@ -370,9 +355,9 @@ class FloatingPoint {
   //   N - 1  (the biggest number representable using
   //          sign-and-magnitude) is represented by 2N - 1.
   //
-  // Read http://en.wikipedia.org/wiki/Signed_number_representations
+  // Read https://en.wikipedia.org/wiki/Signed_number_representations
   // for more details on signed number representations.
-  static Bits SignAndMagnitudeToBiased(const Bits& sam) {
+  static Bits SignAndMagnitudeToBiased(Bits sam) {
     if (kSignBitMask & sam) {
       // sam represents a negative number.
       return ~sam + 1;
@@ -384,27 +369,15 @@ class FloatingPoint {
 
   // Given two numbers in the sign-and-magnitude representation,
   // returns the distance between them as an unsigned number.
-  static Bits DistanceBetweenSignAndMagnitudeNumbers(const Bits& sam1,
-                                                     const Bits& sam2) {
+  static Bits DistanceBetweenSignAndMagnitudeNumbers(Bits sam1, Bits sam2) {
     const Bits biased1 = SignAndMagnitudeToBiased(sam1);
     const Bits biased2 = SignAndMagnitudeToBiased(sam2);
     return (biased1 >= biased2) ? (biased1 - biased2) : (biased2 - biased1);
   }
 
-  FloatingPointUnion u_;
+  Bits bits_;  // The bits that represent the number.
 };
 
-// We cannot use std::numeric_limits<T>::max() as it clashes with the max()
-// macro defined by <windows.h>.
-template <>
-inline float FloatingPoint<float>::Max() {
-  return FLT_MAX;
-}
-template <>
-inline double FloatingPoint<double>::Max() {
-  return DBL_MAX;
-}
-
 // Typedefs the instances of the FloatingPoint template class that we
 // care to use.
 typedef FloatingPoint<float> Float;
@@ -453,7 +426,7 @@ GTEST_API_ TypeId GetTestTypeId();
 // of a Test object.
 class TestFactoryBase {
  public:
-  virtual ~TestFactoryBase() {}
+  virtual ~TestFactoryBase() = default;
 
   // Creates a test instance to run. The instance is both created and destroyed
   // within TestInfoImpl::Run()
@@ -463,10 +436,11 @@ class TestFactoryBase {
   TestFactoryBase() {}
 
  private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestFactoryBase);
+  TestFactoryBase(const TestFactoryBase&) = delete;
+  TestFactoryBase& operator=(const TestFactoryBase&) = delete;
 };
 
-// This class provides implementation of TeastFactoryBase interface.
+// This class provides implementation of TestFactoryBase interface.
 // It is used in TEST and TEST_F macros.
 template <class TestClass>
 class TestFactoryImpl : public TestFactoryBase {
@@ -474,7 +448,7 @@ class TestFactoryImpl : public TestFactoryBase {
   Test* CreateTest() override { return new TestClass; }
 };
 
-#if GTEST_OS_WINDOWS
+#ifdef GTEST_OS_WINDOWS
 
 // Predicate-formatters for implementing the HRESULT checking macros
 // {ASSERT|EXPECT}_HRESULT_{SUCCEEDED|FAILED}
@@ -492,8 +466,8 @@ using SetUpTestSuiteFunc = void (*)();
 using TearDownTestSuiteFunc = void (*)();
 
 struct CodeLocation {
-  CodeLocation(const std::string& a_file, int a_line)
-      : file(a_file), line(a_line) {}
+  CodeLocation(std::string a_file, int a_line)
+      : file(std::move(a_file)), line(a_line) {}
 
   std::string file;
   int line;
@@ -512,11 +486,11 @@ inline SetUpTearDownSuiteFuncType GetNotDefaultOrNull(
 
 template <typename T>
 //  Note that SuiteApiResolver inherits from T because
-//  SetUpTestSuite()/TearDownTestSuite() could be protected. Ths way
+//  SetUpTestSuite()/TearDownTestSuite() could be protected. This way
 //  SuiteApiResolver can access them.
 struct SuiteApiResolver : T {
   // testing::Test is only forward declared at this point. So we make it a
-  // dependend class for the compiler to be OK with it.
+  // dependent class for the compiler to be OK with it.
   using Test =
       typename std::conditional<sizeof(T) != 0, ::testing::Test, void>::type;
 
@@ -573,7 +547,7 @@ struct SuiteApiResolver : T {
 //   type_param:       the name of the test's type parameter, or NULL if
 //                     this is not a typed or a type-parameterized test.
 //   value_param:      text representation of the test's value parameter,
-//                     or NULL if this is not a type-parameterized test.
+//                     or NULL if this is not a value-parameterized test.
 //   code_location:    code location where the test is defined
 //   fixture_class_id: ID of the test fixture class
 //   set_up_tc:        pointer to the function that sets up the test suite
@@ -582,7 +556,7 @@ struct SuiteApiResolver : T {
 //                     The newly created TestInfo instance will assume
 //                     ownership of the factory object.
 GTEST_API_ TestInfo* MakeAndRegisterTestInfo(
-    const char* test_suite_name, const char* name, const char* type_param,
+    std::string test_suite_name, const char* name, const char* type_param,
     const char* value_param, CodeLocation code_location,
     TypeId fixture_class_id, SetUpTestSuiteFunc set_up_tc,
     TearDownTestSuiteFunc tear_down_tc, TestFactoryBase* factory);
@@ -613,8 +587,7 @@ class GTEST_API_ TypedTestSuitePState {
       fflush(stderr);
       posix::Abort();
     }
-    registered_tests_.insert(
-        ::std::make_pair(test_name, CodeLocation(file, line)));
+    registered_tests_.emplace(test_name, CodeLocation(file, line));
     return true;
   }
 
@@ -636,7 +609,7 @@ class GTEST_API_ TypedTestSuitePState {
                                         const char* registered_tests);
 
  private:
-  typedef ::std::map<std::string, CodeLocation> RegisteredTestsMap;
+  typedef ::std::map<std::string, CodeLocation, std::less<>> RegisteredTestsMap;
 
   bool registered_;
   RegisteredTestsMap registered_tests_;
@@ -718,7 +691,7 @@ class TypeParameterizedTest {
   // specified in INSTANTIATE_TYPED_TEST_SUITE_P(Prefix, TestSuite,
   // Types).  Valid values for 'index' are [0, N - 1] where N is the
   // length of Types.
-  static bool Register(const char* prefix, const CodeLocation& code_location,
+  static bool Register(const char* prefix, CodeLocation code_location,
                        const char* case_name, const char* test_names, int index,
                        const std::vector<std::string>& type_names =
                            GenerateNames<DefaultNameGenerator, Types>()) {
@@ -730,8 +703,7 @@ class TypeParameterizedTest {
     // list.
     MakeAndRegisterTestInfo(
         (std::string(prefix) + (prefix[0] == '\0' ? "" : "/") + case_name +
-         "/" + type_names[static_cast<size_t>(index)])
-            .c_str(),
+         "/" + type_names[static_cast<size_t>(index)]),
         StripTrailingSpaces(GetPrefixUntilComma(test_names)).c_str(),
         GetTypeName<Type>().c_str(),
         nullptr,  // No value parameter.
@@ -743,13 +715,9 @@ class TypeParameterizedTest {
         new TestFactoryImpl<TestClass>);
 
     // Next, recurses (at compile time) with the tail of the type list.
-    return TypeParameterizedTest<Fixture, TestSel,
-                                 typename Types::Tail>::Register(prefix,
-                                                                 code_location,
-                                                                 case_name,
-                                                                 test_names,
-                                                                 index + 1,
-                                                                 type_names);
+    return TypeParameterizedTest<Fixture, TestSel, typename Types::Tail>::
+        Register(prefix, std::move(code_location), case_name, test_names,
+                 index + 1, type_names);
   }
 };
 
@@ -757,7 +725,7 @@ class TypeParameterizedTest {
 template <GTEST_TEMPLATE_ Fixture, class TestSel>
 class TypeParameterizedTest<Fixture, TestSel, internal::None> {
  public:
-  static bool Register(const char* /*prefix*/, const CodeLocation&,
+  static bool Register(const char* /*prefix*/, CodeLocation,
                        const char* /*case_name*/, const char* /*test_names*/,
                        int /*index*/,
                        const std::vector<std::string>& =
@@ -804,7 +772,8 @@ class TypeParameterizedTestSuite {
 
     // Next, recurses (at compile time) with the tail of the test list.
     return TypeParameterizedTestSuite<Fixture, typename Tests::Tail,
-                                      Types>::Register(prefix, code_location,
+                                      Types>::Register(prefix,
+                                                       std::move(code_location),
                                                        state, case_name,
                                                        SkipComma(test_names),
                                                        type_names);
@@ -834,8 +803,7 @@ class TypeParameterizedTestSuite<Fixture, internal::None, Types> {
 // For example, if Foo() calls Bar(), which in turn calls
 // GetCurrentOsStackTraceExceptTop(..., 1), Foo() will be included in
 // the trace but Bar() and GetCurrentOsStackTraceExceptTop() won't.
-GTEST_API_ std::string GetCurrentOsStackTraceExceptTop(UnitTest* unit_test,
-                                                       int skip_count);
+GTEST_API_ std::string GetCurrentOsStackTraceExceptTop(int skip_count);
 
 // Helpers for suppressing warnings on unreachable code or constant
 // condition.
@@ -884,7 +852,8 @@ class GTEST_API_ Random {
 
  private:
   uint32_t state_;
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(Random);
+  Random(const Random&) = delete;
+  Random& operator=(const Random&) = delete;
 };
 
 // Turns const U&, U&, const U, and U all into U.
@@ -917,9 +886,6 @@ class HasDebugStringAndShortDebugString {
       HasDebugStringType::value && HasShortDebugStringType::value;
 };
 
-template <typename T>
-constexpr bool HasDebugStringAndShortDebugString<T>::value;
-
 // When the compiler sees expression IsContainerTest<C>(0), if C is an
 // STL-style container class, the first overload of IsContainerTest
 // will be viable (since both C::iterator* and C::const_iterator* are
@@ -1158,40 +1124,6 @@ class NativeArray {
   void (NativeArray::*clone_)(const Element*, size_t);
 };
 
-// Backport of std::index_sequence.
-template <size_t... Is>
-struct IndexSequence {
-  using type = IndexSequence;
-};
-
-// Double the IndexSequence, and one if plus_one is true.
-template <bool plus_one, typename T, size_t sizeofT>
-struct DoubleSequence;
-template <size_t... I, size_t sizeofT>
-struct DoubleSequence<true, IndexSequence<I...>, sizeofT> {
-  using type = IndexSequence<I..., (sizeofT + I)..., 2 * sizeofT>;
-};
-template <size_t... I, size_t sizeofT>
-struct DoubleSequence<false, IndexSequence<I...>, sizeofT> {
-  using type = IndexSequence<I..., (sizeofT + I)...>;
-};
-
-// Backport of std::make_index_sequence.
-// It uses O(ln(N)) instantiation depth.
-template <size_t N>
-struct MakeIndexSequenceImpl
-    : DoubleSequence<N % 2 == 1, typename MakeIndexSequenceImpl<N / 2>::type,
-                     N / 2>::type {};
-
-template <>
-struct MakeIndexSequenceImpl<0> : IndexSequence<> {};
-
-template <size_t N>
-using MakeIndexSequence = typename MakeIndexSequenceImpl<N>::type;
-
-template <typename... T>
-using IndexSequenceFor = typename MakeIndexSequence<sizeof...(T)>::type;
-
 template <size_t>
 struct Ignore {
   Ignore(...);  // NOLINT
@@ -1200,7 +1132,7 @@ struct Ignore {
 template <typename>
 struct ElemFromListImpl;
 template <size_t... I>
-struct ElemFromListImpl<IndexSequence<I...>> {
+struct ElemFromListImpl<std::index_sequence<I...>> {
   // We make Ignore a template to solve a problem with MSVC.
   // A non-template Ignore would work fine with `decltype(Ignore(I))...`, but
   // MSVC doesn't understand how to deal with that pack expansion.
@@ -1211,9 +1143,8 @@ struct ElemFromListImpl<IndexSequence<I...>> {
 
 template <size_t N, typename... T>
 struct ElemFromList {
-  using type =
-      decltype(ElemFromListImpl<typename MakeIndexSequence<N>::type>::Apply(
-          static_cast<T (*)()>(nullptr)...));
+  using type = decltype(ElemFromListImpl<std::make_index_sequence<N>>::Apply(
+      static_cast<T (*)()>(nullptr)...));
 };
 
 struct FlatTupleConstructTag {};
@@ -1238,9 +1169,9 @@ template <typename Derived, typename Idx>
 struct FlatTupleBase;
 
 template <size_t... Idx, typename... T>
-struct FlatTupleBase<FlatTuple<T...>, IndexSequence<Idx...>>
+struct FlatTupleBase<FlatTuple<T...>, std::index_sequence<Idx...>>
     : FlatTupleElemBase<FlatTuple<T...>, Idx>... {
-  using Indices = IndexSequence<Idx...>;
+  using Indices = std::index_sequence<Idx...>;
   FlatTupleBase() = default;
   template <typename... Args>
   explicit FlatTupleBase(FlatTupleConstructTag, Args&&... args)
@@ -1275,14 +1206,15 @@ struct FlatTupleBase<FlatTuple<T...>, IndexSequence<Idx...>>
 // implementations.
 // FlatTuple and ElemFromList are not recursive and have a fixed depth
 // regardless of T...
-// MakeIndexSequence, on the other hand, it is recursive but with an
+// std::make_index_sequence, on the other hand, it is recursive but with an
 // instantiation depth of O(ln(N)).
 template <typename... T>
 class FlatTuple
     : private FlatTupleBase<FlatTuple<T...>,
-                            typename MakeIndexSequence<sizeof...(T)>::type> {
-  using Indices = typename FlatTupleBase<
-      FlatTuple<T...>, typename MakeIndexSequence<sizeof...(T)>::type>::Indices;
+                            std::make_index_sequence<sizeof...(T)>> {
+  using Indices =
+      typename FlatTupleBase<FlatTuple<T...>,
+                             std::make_index_sequence<sizeof...(T)>>::Indices;
 
  public:
   FlatTuple() = default;
@@ -1296,30 +1228,40 @@ class FlatTuple
 
 // Utility functions to be called with static_assert to induce deprecation
 // warnings.
-GTEST_INTERNAL_DEPRECATED(
+[[deprecated(
     "INSTANTIATE_TEST_CASE_P is deprecated, please use "
-    "INSTANTIATE_TEST_SUITE_P")
-constexpr bool InstantiateTestCase_P_IsDeprecated() { return true; }
+    "INSTANTIATE_TEST_SUITE_P")]]
+constexpr bool InstantiateTestCase_P_IsDeprecated() {
+  return true;
+}
 
-GTEST_INTERNAL_DEPRECATED(
+[[deprecated(
     "TYPED_TEST_CASE_P is deprecated, please use "
-    "TYPED_TEST_SUITE_P")
-constexpr bool TypedTestCase_P_IsDeprecated() { return true; }
+    "TYPED_TEST_SUITE_P")]]
+constexpr bool TypedTestCase_P_IsDeprecated() {
+  return true;
+}
 
-GTEST_INTERNAL_DEPRECATED(
+[[deprecated(
     "TYPED_TEST_CASE is deprecated, please use "
-    "TYPED_TEST_SUITE")
-constexpr bool TypedTestCaseIsDeprecated() { return true; }
+    "TYPED_TEST_SUITE")]]
+constexpr bool TypedTestCaseIsDeprecated() {
+  return true;
+}
 
-GTEST_INTERNAL_DEPRECATED(
+[[deprecated(
     "REGISTER_TYPED_TEST_CASE_P is deprecated, please use "
-    "REGISTER_TYPED_TEST_SUITE_P")
-constexpr bool RegisterTypedTestCase_P_IsDeprecated() { return true; }
+    "REGISTER_TYPED_TEST_SUITE_P")]]
+constexpr bool RegisterTypedTestCase_P_IsDeprecated() {
+  return true;
+}
 
-GTEST_INTERNAL_DEPRECATED(
+[[deprecated(
     "INSTANTIATE_TYPED_TEST_CASE_P is deprecated, please use "
-    "INSTANTIATE_TYPED_TEST_SUITE_P")
-constexpr bool InstantiateTypedTestCase_P_IsDeprecated() { return true; }
+    "INSTANTIATE_TYPED_TEST_SUITE_P")]]
+constexpr bool InstantiateTypedTestCase_P_IsDeprecated() {
+  return true;
+}
 
 }  // namespace internal
 }  // namespace testing
@@ -1512,19 +1454,20 @@ class NeverThrown {
              gtest_ar_, text, #actual, #expected)                     \
              .c_str())
 
-#define GTEST_TEST_NO_FATAL_FAILURE_(statement, fail)                          \
-  GTEST_AMBIGUOUS_ELSE_BLOCKER_                                                \
-  if (::testing::internal::AlwaysTrue()) {                                     \
-    ::testing::internal::HasNewFatalFailureHelper gtest_fatal_failure_checker; \
-    GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement);                 \
-    if (gtest_fatal_failure_checker.has_new_fatal_failure()) {                 \
-      goto GTEST_CONCAT_TOKEN_(gtest_label_testnofatal_, __LINE__);            \
-    }                                                                          \
-  } else                                                                       \
-    GTEST_CONCAT_TOKEN_(gtest_label_testnofatal_, __LINE__)                    \
-        : fail("Expected: " #statement                                         \
-               " doesn't generate new fatal "                                  \
-               "failures in the current thread.\n"                             \
+#define GTEST_TEST_NO_FATAL_FAILURE_(statement, fail)               \
+  GTEST_AMBIGUOUS_ELSE_BLOCKER_                                     \
+  if (::testing::internal::AlwaysTrue()) {                          \
+    const ::testing::internal::HasNewFatalFailureHelper             \
+        gtest_fatal_failure_checker;                                \
+    GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement);      \
+    if (gtest_fatal_failure_checker.has_new_fatal_failure()) {      \
+      goto GTEST_CONCAT_TOKEN_(gtest_label_testnofatal_, __LINE__); \
+    }                                                               \
+  } else /* NOLINT */                                               \
+    GTEST_CONCAT_TOKEN_(gtest_label_testnofatal_, __LINE__)         \
+        : fail("Expected: " #statement                              \
+               " doesn't generate new fatal "                       \
+               "failures in the current thread.\n"                  \
                "  Actual: it does.")
 
 // Expands to the name of the class that implements the given test.
@@ -1532,37 +1475,43 @@ class NeverThrown {
   test_suite_name##_##test_name##_Test
 
 // Helper macro for defining tests.
-#define GTEST_TEST_(test_suite_name, test_name, parent_class, parent_id)      \
-  static_assert(sizeof(GTEST_STRINGIFY_(test_suite_name)) > 1,                \
-                "test_suite_name must not be empty");                         \
-  static_assert(sizeof(GTEST_STRINGIFY_(test_name)) > 1,                      \
-                "test_name must not be empty");                               \
-  class GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)                    \
-      : public parent_class {                                                 \
-   public:                                                                    \
-    GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)() = default;           \
-    ~GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)() override = default; \
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(GTEST_TEST_CLASS_NAME_(test_suite_name,   \
-                                                           test_name));       \
-    GTEST_DISALLOW_MOVE_AND_ASSIGN_(GTEST_TEST_CLASS_NAME_(test_suite_name,   \
-                                                           test_name));       \
-                                                                              \
-   private:                                                                   \
-    void TestBody() override;                                                 \
-    static ::testing::TestInfo* const test_info_ GTEST_ATTRIBUTE_UNUSED_;     \
-  };                                                                          \
-                                                                              \
-  ::testing::TestInfo* const GTEST_TEST_CLASS_NAME_(test_suite_name,          \
-                                                    test_name)::test_info_ =  \
-      ::testing::internal::MakeAndRegisterTestInfo(                           \
-          #test_suite_name, #test_name, nullptr, nullptr,                     \
-          ::testing::internal::CodeLocation(__FILE__, __LINE__), (parent_id), \
-          ::testing::internal::SuiteApiResolver<                              \
-              parent_class>::GetSetUpCaseOrSuite(__FILE__, __LINE__),         \
-          ::testing::internal::SuiteApiResolver<                              \
-              parent_class>::GetTearDownCaseOrSuite(__FILE__, __LINE__),      \
-          new ::testing::internal::TestFactoryImpl<GTEST_TEST_CLASS_NAME_(    \
-              test_suite_name, test_name)>);                                  \
+#define GTEST_TEST_(test_suite_name, test_name, parent_class, parent_id)       \
+  static_assert(sizeof(GTEST_STRINGIFY_(test_suite_name)) > 1,                 \
+                "test_suite_name must not be empty");                          \
+  static_assert(sizeof(GTEST_STRINGIFY_(test_name)) > 1,                       \
+                "test_name must not be empty");                                \
+  class GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)                     \
+      : public parent_class {                                                  \
+   public:                                                                     \
+    GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)() = default;            \
+    ~GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)() override = default;  \
+    GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)                         \
+    (const GTEST_TEST_CLASS_NAME_(test_suite_name, test_name) &) = delete;     \
+    GTEST_TEST_CLASS_NAME_(test_suite_name, test_name) & operator=(            \
+        const GTEST_TEST_CLASS_NAME_(test_suite_name,                          \
+                                     test_name) &) = delete; /* NOLINT */      \
+    GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)                         \
+    (GTEST_TEST_CLASS_NAME_(test_suite_name, test_name) &&) noexcept = delete; \
+    GTEST_TEST_CLASS_NAME_(test_suite_name, test_name) & operator=(            \
+        GTEST_TEST_CLASS_NAME_(test_suite_name,                                \
+                               test_name) &&) noexcept = delete; /* NOLINT */  \
+                                                                               \
+   private:                                                                    \
+    void TestBody() override;                                                  \
+    [[maybe_unused]] static ::testing::TestInfo* const test_info_;             \
+  };                                                                           \
+                                                                               \
+  ::testing::TestInfo* const GTEST_TEST_CLASS_NAME_(test_suite_name,           \
+                                                    test_name)::test_info_ =   \
+      ::testing::internal::MakeAndRegisterTestInfo(                            \
+          #test_suite_name, #test_name, nullptr, nullptr,                      \
+          ::testing::internal::CodeLocation(__FILE__, __LINE__), (parent_id),  \
+          ::testing::internal::SuiteApiResolver<                               \
+              parent_class>::GetSetUpCaseOrSuite(__FILE__, __LINE__),          \
+          ::testing::internal::SuiteApiResolver<                               \
+              parent_class>::GetTearDownCaseOrSuite(__FILE__, __LINE__),       \
+          new ::testing::internal::TestFactoryImpl<GTEST_TEST_CLASS_NAME_(     \
+              test_suite_name, test_name)>);                                   \
   void GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)::TestBody()
 
 #endif  // GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_INTERNAL_H_
diff --git a/external/googletest/googletest/include/gtest/internal/gtest-param-util.h b/external/googletest/googletest/include/gtest/internal/gtest-param-util.h
index dd04c99a..a092a86a 100644
--- a/external/googletest/googletest/include/gtest/internal/gtest-param-util.h
+++ b/external/googletest/googletest/include/gtest/internal/gtest-param-util.h
@@ -29,7 +29,9 @@
 
 // Type and function utilities for implementing parameterized tests.
 
-// GOOGLETEST_CM0001 DO NOT DELETE
+// IWYU pragma: private, include "gtest/gtest.h"
+// IWYU pragma: friend gtest/.*
+// IWYU pragma: friend gmock/.*
 
 #ifndef GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_H_
 #define GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_H_
@@ -37,11 +39,16 @@
 #include <ctype.h>
 
 #include <cassert>
+#include <functional>
 #include <iterator>
+#include <map>
 #include <memory>
+#include <ostream>
 #include <set>
+#include <string>
 #include <tuple>
 #include <type_traits>
+#include <unordered_map>
 #include <utility>
 #include <vector>
 
@@ -80,7 +87,7 @@ namespace internal {
 // TEST_P macro is used to define two tests with the same name
 // but in different namespaces.
 GTEST_API_ void ReportInvalidTestSuiteType(const char* test_suite_name,
-                                           CodeLocation code_location);
+                                           const CodeLocation& code_location);
 
 template <typename>
 class ParamGeneratorInterface;
@@ -92,7 +99,7 @@ class ParamGenerator;
 template <typename T>
 class ParamIteratorInterface {
  public:
-  virtual ~ParamIteratorInterface() {}
+  virtual ~ParamIteratorInterface() = default;
   // A pointer to the base generator instance.
   // Used only for the purposes of iterator comparison
   // to make sure that two iterators belong to the same generator.
@@ -166,7 +173,7 @@ class ParamGeneratorInterface {
  public:
   typedef T ParamType;
 
-  virtual ~ParamGeneratorInterface() {}
+  virtual ~ParamGeneratorInterface() = default;
 
   // Generator interface definition
   virtual ParamIteratorInterface<T>* Begin() const = 0;
@@ -210,7 +217,7 @@ class RangeGenerator : public ParamGeneratorInterface<T> {
         end_(end),
         step_(step),
         end_index_(CalculateEndIndex(begin, end, step)) {}
-  ~RangeGenerator() override {}
+  ~RangeGenerator() override = default;
 
   ParamIteratorInterface<T>* Begin() const override {
     return new Iterator(this, begin_, 0, step_);
@@ -225,7 +232,7 @@ class RangeGenerator : public ParamGeneratorInterface<T> {
     Iterator(const ParamGeneratorInterface<T>* base, T value, int index,
              IncrementT step)
         : base_(base), value_(value), index_(index), step_(step) {}
-    ~Iterator() override {}
+    ~Iterator() override = default;
 
     const ParamGeneratorInterface<T>* BaseGenerator() const override {
       return base_;
@@ -294,7 +301,7 @@ class ValuesInIteratorRangeGenerator : public ParamGeneratorInterface<T> {
   template <typename ForwardIterator>
   ValuesInIteratorRangeGenerator(ForwardIterator begin, ForwardIterator end)
       : container_(begin, end) {}
-  ~ValuesInIteratorRangeGenerator() override {}
+  ~ValuesInIteratorRangeGenerator() override = default;
 
   ParamIteratorInterface<T>* Begin() const override {
     return new Iterator(this, container_.begin());
@@ -311,7 +318,7 @@ class ValuesInIteratorRangeGenerator : public ParamGeneratorInterface<T> {
     Iterator(const ParamGeneratorInterface<T>* base,
              typename ContainerType::const_iterator iterator)
         : base_(base), iterator_(iterator) {}
-    ~Iterator() override {}
+    ~Iterator() override = default;
 
     const ParamGeneratorInterface<T>* BaseGenerator() const override {
       return base_;
@@ -374,9 +381,7 @@ class ValuesInIteratorRangeGenerator : public ParamGeneratorInterface<T> {
 // integer test parameter index.
 template <class ParamType>
 std::string DefaultParamName(const TestParamInfo<ParamType>& info) {
-  Message name_stream;
-  name_stream << info.index;
-  return name_stream.GetString();
+  return std::to_string(info.index);
 }
 
 template <typename T = int>
@@ -404,7 +409,8 @@ class ParameterizedTestFactory : public TestFactoryBase {
  private:
   const ParamType parameter_;
 
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ParameterizedTestFactory);
+  ParameterizedTestFactory(const ParameterizedTestFactory&) = delete;
+  ParameterizedTestFactory& operator=(const ParameterizedTestFactory&) = delete;
 };
 
 // INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
@@ -414,7 +420,7 @@ class ParameterizedTestFactory : public TestFactoryBase {
 template <class ParamType>
 class TestMetaFactoryBase {
  public:
-  virtual ~TestMetaFactoryBase() {}
+  virtual ~TestMetaFactoryBase() = default;
 
   virtual TestFactoryBase* CreateTestFactory(ParamType parameter) = 0;
 };
@@ -433,14 +439,15 @@ class TestMetaFactory
  public:
   using ParamType = typename TestSuite::ParamType;
 
-  TestMetaFactory() {}
+  TestMetaFactory() = default;
 
   TestFactoryBase* CreateTestFactory(ParamType parameter) override {
     return new ParameterizedTestFactory<TestSuite>(parameter);
   }
 
  private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestMetaFactory);
+  TestMetaFactory(const TestMetaFactory&) = delete;
+  TestMetaFactory& operator=(const TestMetaFactory&) = delete;
 };
 
 // INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
@@ -455,7 +462,7 @@ class TestMetaFactory
 // and calls RegisterTests() on each of them when asked.
 class ParameterizedTestSuiteInfoBase {
  public:
-  virtual ~ParameterizedTestSuiteInfoBase() {}
+  virtual ~ParameterizedTestSuiteInfoBase() = default;
 
   // Base part of test suite name for display purposes.
   virtual const std::string& GetTestSuiteName() const = 0;
@@ -471,7 +478,10 @@ class ParameterizedTestSuiteInfoBase {
   ParameterizedTestSuiteInfoBase() {}
 
  private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ParameterizedTestSuiteInfoBase);
+  ParameterizedTestSuiteInfoBase(const ParameterizedTestSuiteInfoBase&) =
+      delete;
+  ParameterizedTestSuiteInfoBase& operator=(
+      const ParameterizedTestSuiteInfoBase&) = delete;
 };
 
 // INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
@@ -503,9 +513,10 @@ class ParameterizedTestSuiteInfo : public ParameterizedTestSuiteInfoBase {
   typedef ParamGenerator<ParamType>(GeneratorCreationFunc)();
   using ParamNameGeneratorFunc = std::string(const TestParamInfo<ParamType>&);
 
-  explicit ParameterizedTestSuiteInfo(const char* name,
+  explicit ParameterizedTestSuiteInfo(std::string name,
                                       CodeLocation code_location)
-      : test_suite_name_(name), code_location_(code_location) {}
+      : test_suite_name_(std::move(name)),
+        code_location_(std::move(code_location)) {}
 
   // Test suite base name for display purposes.
   const std::string& GetTestSuiteName() const override {
@@ -519,20 +530,20 @@ class ParameterizedTestSuiteInfo : public ParameterizedTestSuiteInfoBase {
   // prefix). test_base_name is the name of an individual test without
   // parameter index. For the test SequenceA/FooTest.DoBar/1 FooTest is
   // test suite base name and DoBar is test base name.
-  void AddTestPattern(const char* test_suite_name, const char* test_base_name,
+  void AddTestPattern(const char*, const char* test_base_name,
                       TestMetaFactoryBase<ParamType>* meta_factory,
                       CodeLocation code_location) {
-    tests_.push_back(std::shared_ptr<TestInfo>(new TestInfo(
-        test_suite_name, test_base_name, meta_factory, code_location)));
+    tests_.emplace_back(
+        new TestInfo(test_base_name, meta_factory, std::move(code_location)));
   }
   // INSTANTIATE_TEST_SUITE_P macro uses AddGenerator() to record information
   // about a generator.
-  int AddTestSuiteInstantiation(const std::string& instantiation_name,
+  int AddTestSuiteInstantiation(std::string instantiation_name,
                                 GeneratorCreationFunc* func,
                                 ParamNameGeneratorFunc* name_func,
                                 const char* file, int line) {
-    instantiations_.push_back(
-        InstantiationInfo(instantiation_name, func, name_func, file, line));
+    instantiations_.emplace_back(std::move(instantiation_name), func, name_func,
+                                 file, line);
     return 0;  // Return value used only to run this method in namespace scope.
   }
   // UnitTest class invokes this method to register tests in this test suite
@@ -543,60 +554,61 @@ class ParameterizedTestSuiteInfo : public ParameterizedTestSuiteInfoBase {
   void RegisterTests() override {
     bool generated_instantiations = false;
 
-    for (typename TestInfoContainer::iterator test_it = tests_.begin();
-         test_it != tests_.end(); ++test_it) {
-      std::shared_ptr<TestInfo> test_info = *test_it;
-      for (typename InstantiationContainer::iterator gen_it =
-               instantiations_.begin();
-           gen_it != instantiations_.end(); ++gen_it) {
-        const std::string& instantiation_name = gen_it->name;
-        ParamGenerator<ParamType> generator((*gen_it->generator)());
-        ParamNameGeneratorFunc* name_func = gen_it->name_func;
-        const char* file = gen_it->file;
-        int line = gen_it->line;
-
-        std::string test_suite_name;
+    std::string test_suite_name;
+    std::string test_name;
+    for (const std::shared_ptr<TestInfo>& test_info : tests_) {
+      for (const InstantiationInfo& instantiation : instantiations_) {
+        const std::string& instantiation_name = instantiation.name;
+        ParamGenerator<ParamType> generator((*instantiation.generator)());
+        ParamNameGeneratorFunc* name_func = instantiation.name_func;
+        const char* file = instantiation.file;
+        int line = instantiation.line;
+
         if (!instantiation_name.empty())
           test_suite_name = instantiation_name + "/";
-        test_suite_name += test_info->test_suite_base_name;
+        else
+          test_suite_name.clear();
+        test_suite_name += test_suite_name_;
 
         size_t i = 0;
         std::set<std::string> test_param_names;
-        for (typename ParamGenerator<ParamType>::iterator param_it =
-                 generator.begin();
-             param_it != generator.end(); ++param_it, ++i) {
+        for (const auto& param : generator) {
           generated_instantiations = true;
 
-          Message test_name_stream;
+          test_name.clear();
 
           std::string param_name =
-              name_func(TestParamInfo<ParamType>(*param_it, i));
+              name_func(TestParamInfo<ParamType>(param, i));
 
           GTEST_CHECK_(IsValidParamName(param_name))
               << "Parameterized test name '" << param_name
-              << "' is invalid, in " << file << " line " << line << std::endl;
+              << "' is invalid (contains spaces, dashes, or any "
+                 "non-alphanumeric characters other than underscores), in "
+              << file << " line " << line << "" << std::endl;
 
           GTEST_CHECK_(test_param_names.count(param_name) == 0)
               << "Duplicate parameterized test name '" << param_name << "', in "
               << file << " line " << line << std::endl;
 
-          test_param_names.insert(param_name);
-
           if (!test_info->test_base_name.empty()) {
-            test_name_stream << test_info->test_base_name << "/";
+            test_name.append(test_info->test_base_name).append("/");
           }
-          test_name_stream << param_name;
+          test_name += param_name;
+
+          test_param_names.insert(std::move(param_name));
+
           MakeAndRegisterTestInfo(
-              test_suite_name.c_str(), test_name_stream.GetString().c_str(),
+              test_suite_name, test_name.c_str(),
               nullptr,  // No type parameter.
-              PrintToString(*param_it).c_str(), test_info->code_location,
+              PrintToString(param).c_str(), test_info->code_location,
               GetTestSuiteTypeId(),
               SuiteApiResolver<TestSuite>::GetSetUpCaseOrSuite(file, line),
               SuiteApiResolver<TestSuite>::GetTearDownCaseOrSuite(file, line),
-              test_info->test_meta_factory->CreateTestFactory(*param_it));
-        }  // for param_it
-      }    // for gen_it
-    }      // for test_it
+              test_info->test_meta_factory->CreateTestFactory(param));
+          ++i;
+        }  // for param
+      }  // for instantiation
+    }  // for test_info
 
     if (!generated_instantiations) {
       // There are no generaotrs, or they all generate nothing ...
@@ -609,15 +621,13 @@ class ParameterizedTestSuiteInfo : public ParameterizedTestSuiteInfoBase {
   // LocalTestInfo structure keeps information about a single test registered
   // with TEST_P macro.
   struct TestInfo {
-    TestInfo(const char* a_test_suite_base_name, const char* a_test_base_name,
+    TestInfo(const char* a_test_base_name,
              TestMetaFactoryBase<ParamType>* a_test_meta_factory,
              CodeLocation a_code_location)
-        : test_suite_base_name(a_test_suite_base_name),
-          test_base_name(a_test_base_name),
+        : test_base_name(a_test_base_name),
           test_meta_factory(a_test_meta_factory),
-          code_location(a_code_location) {}
+          code_location(std::move(a_code_location)) {}
 
-    const std::string test_suite_base_name;
     const std::string test_base_name;
     const std::unique_ptr<TestMetaFactoryBase<ParamType>> test_meta_factory;
     const CodeLocation code_location;
@@ -627,11 +637,10 @@ class ParameterizedTestSuiteInfo : public ParameterizedTestSuiteInfoBase {
   //  <Instantiation name, Sequence generator creation function,
   //     Name generator function, Source file, Source line>
   struct InstantiationInfo {
-    InstantiationInfo(const std::string& name_in,
-                      GeneratorCreationFunc* generator_in,
+    InstantiationInfo(std::string name_in, GeneratorCreationFunc* generator_in,
                       ParamNameGeneratorFunc* name_func_in, const char* file_in,
                       int line_in)
-        : name(name_in),
+        : name(std::move(name_in)),
           generator(generator_in),
           name_func(name_func_in),
           file(file_in),
@@ -662,7 +671,9 @@ class ParameterizedTestSuiteInfo : public ParameterizedTestSuiteInfoBase {
   TestInfoContainer tests_;
   InstantiationContainer instantiations_;
 
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ParameterizedTestSuiteInfo);
+  ParameterizedTestSuiteInfo(const ParameterizedTestSuiteInfo&) = delete;
+  ParameterizedTestSuiteInfo& operator=(const ParameterizedTestSuiteInfo&) =
+      delete;
 };  // class ParameterizedTestSuiteInfo
 
 //  Legacy API is deprecated but still available
@@ -679,7 +690,7 @@ using ParameterizedTestCaseInfo = ParameterizedTestSuiteInfo<TestCase>;
 // ParameterizedTestSuiteInfo descriptors.
 class ParameterizedTestSuiteRegistry {
  public:
-  ParameterizedTestSuiteRegistry() {}
+  ParameterizedTestSuiteRegistry() = default;
   ~ParameterizedTestSuiteRegistry() {
     for (auto& test_suite_info : test_suite_infos_) {
       delete test_suite_info;
@@ -690,29 +701,32 @@ class ParameterizedTestSuiteRegistry {
   // tests and instantiations of a particular test suite.
   template <class TestSuite>
   ParameterizedTestSuiteInfo<TestSuite>* GetTestSuitePatternHolder(
-      const char* test_suite_name, CodeLocation code_location) {
+      std::string test_suite_name, CodeLocation code_location) {
     ParameterizedTestSuiteInfo<TestSuite>* typed_test_info = nullptr;
-    for (auto& test_suite_info : test_suite_infos_) {
-      if (test_suite_info->GetTestSuiteName() == test_suite_name) {
-        if (test_suite_info->GetTestSuiteTypeId() != GetTypeId<TestSuite>()) {
-          // Complain about incorrect usage of Google Test facilities
-          // and terminate the program since we cannot guaranty correct
-          // test suite setup and tear-down in this case.
-          ReportInvalidTestSuiteType(test_suite_name, code_location);
-          posix::Abort();
-        } else {
-          // At this point we are sure that the object we found is of the same
-          // type we are looking for, so we downcast it to that type
-          // without further checks.
-          typed_test_info = CheckedDowncastToActualType<
-              ParameterizedTestSuiteInfo<TestSuite>>(test_suite_info);
-        }
-        break;
+
+    auto item_it = suite_name_to_info_index_.find(test_suite_name);
+    if (item_it != suite_name_to_info_index_.end()) {
+      auto* test_suite_info = test_suite_infos_[item_it->second];
+      if (test_suite_info->GetTestSuiteTypeId() != GetTypeId<TestSuite>()) {
+        // Complain about incorrect usage of Google Test facilities
+        // and terminate the program since we cannot guaranty correct
+        // test suite setup and tear-down in this case.
+        ReportInvalidTestSuiteType(test_suite_name.c_str(), code_location);
+        posix::Abort();
+      } else {
+        // At this point we are sure that the object we found is of the same
+        // type we are looking for, so we downcast it to that type
+        // without further checks.
+        typed_test_info =
+            CheckedDowncastToActualType<ParameterizedTestSuiteInfo<TestSuite>>(
+                test_suite_info);
       }
     }
     if (typed_test_info == nullptr) {
       typed_test_info = new ParameterizedTestSuiteInfo<TestSuite>(
-          test_suite_name, code_location);
+          test_suite_name, std::move(code_location));
+      suite_name_to_info_index_.emplace(std::move(test_suite_name),
+                                        test_suite_infos_.size());
       test_suite_infos_.push_back(typed_test_info);
     }
     return typed_test_info;
@@ -726,8 +740,9 @@ class ParameterizedTestSuiteRegistry {
 #ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
   template <class TestCase>
   ParameterizedTestCaseInfo<TestCase>* GetTestCasePatternHolder(
-      const char* test_case_name, CodeLocation code_location) {
-    return GetTestSuitePatternHolder<TestCase>(test_case_name, code_location);
+      std::string test_case_name, CodeLocation code_location) {
+    return GetTestSuitePatternHolder<TestCase>(std::move(test_case_name),
+                                               std::move(code_location));
   }
 
 #endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
@@ -736,8 +751,12 @@ class ParameterizedTestSuiteRegistry {
   using TestSuiteInfoContainer = ::std::vector<ParameterizedTestSuiteInfoBase*>;
 
   TestSuiteInfoContainer test_suite_infos_;
+  ::std::unordered_map<std::string, size_t> suite_name_to_info_index_;
 
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ParameterizedTestSuiteRegistry);
+  ParameterizedTestSuiteRegistry(const ParameterizedTestSuiteRegistry&) =
+      delete;
+  ParameterizedTestSuiteRegistry& operator=(
+      const ParameterizedTestSuiteRegistry&) = delete;
 };
 
 // Keep track of what type-parameterized test suite are defined and
@@ -759,7 +778,7 @@ class TypeParameterizedTestSuiteRegistry {
  private:
   struct TypeParameterizedTestSuiteInfo {
     explicit TypeParameterizedTestSuiteInfo(CodeLocation c)
-        : code_location(c), instantiated(false) {}
+        : code_location(std::move(c)), instantiated(false) {}
 
     CodeLocation code_location;
     bool instantiated;
@@ -779,10 +798,7 @@ internal::ParamGenerator<typename Container::value_type> ValuesIn(
 namespace internal {
 // Used in the Values() function to provide polymorphic capabilities.
 
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4100)
-#endif
+GTEST_DISABLE_MSC_WARNINGS_PUSH_(4100)
 
 template <typename... Ts>
 class ValueArray {
@@ -791,21 +807,19 @@ class ValueArray {
 
   template <typename T>
   operator ParamGenerator<T>() const {  // NOLINT
-    return ValuesIn(MakeVector<T>(MakeIndexSequence<sizeof...(Ts)>()));
+    return ValuesIn(MakeVector<T>(std::make_index_sequence<sizeof...(Ts)>()));
   }
 
  private:
   template <typename T, size_t... I>
-  std::vector<T> MakeVector(IndexSequence<I...>) const {
+  std::vector<T> MakeVector(std::index_sequence<I...>) const {
     return std::vector<T>{static_cast<T>(v_.template Get<I>())...};
   }
 
   FlatTuple<Ts...> v_;
 };
 
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
+GTEST_DISABLE_MSC_WARNINGS_POP_()  // 4100
 
 template <typename... T>
 class CartesianProductGenerator
@@ -815,7 +829,7 @@ class CartesianProductGenerator
 
   CartesianProductGenerator(const std::tuple<ParamGenerator<T>...>& g)
       : generators_(g) {}
-  ~CartesianProductGenerator() override {}
+  ~CartesianProductGenerator() override = default;
 
   ParamIteratorInterface<ParamType>* Begin() const override {
     return new Iterator(this, generators_, false);
@@ -828,7 +842,7 @@ class CartesianProductGenerator
   template <class I>
   class IteratorImpl;
   template <size_t... I>
-  class IteratorImpl<IndexSequence<I...>>
+  class IteratorImpl<std::index_sequence<I...>>
       : public ParamIteratorInterface<ParamType> {
    public:
     IteratorImpl(const ParamGeneratorInterface<ParamType>* base,
@@ -840,7 +854,7 @@ class CartesianProductGenerator
           current_(is_end ? end_ : begin_) {
       ComputeCurrentValue();
     }
-    ~IteratorImpl() override {}
+    ~IteratorImpl() override = default;
 
     const ParamGeneratorInterface<ParamType>* BaseGenerator() const override {
       return base_;
@@ -919,7 +933,7 @@ class CartesianProductGenerator
     std::shared_ptr<ParamType> current_value_;
   };
 
-  using Iterator = IteratorImpl<typename MakeIndexSequence<sizeof...(T)>::type>;
+  using Iterator = IteratorImpl<std::make_index_sequence<sizeof...(T)>>;
 
   std::tuple<ParamGenerator<T>...> generators_;
 };
@@ -938,6 +952,112 @@ class CartesianProductHolder {
   std::tuple<Gen...> generators_;
 };
 
+template <typename From, typename To, typename Func>
+class ParamGeneratorConverter : public ParamGeneratorInterface<To> {
+ public:
+  ParamGeneratorConverter(ParamGenerator<From> gen, Func converter)  // NOLINT
+      : generator_(std::move(gen)), converter_(std::move(converter)) {}
+
+  ParamIteratorInterface<To>* Begin() const override {
+    return new Iterator(this, generator_.begin(), generator_.end());
+  }
+  ParamIteratorInterface<To>* End() const override {
+    return new Iterator(this, generator_.end(), generator_.end());
+  }
+
+  // Returns the std::function wrapping the user-supplied converter callable. It
+  // is used by the iterator (see class Iterator below) to convert the object
+  // (of type FROM) returned by the ParamGenerator to an object of a type that
+  // can be static_cast to type TO.
+  const Func& TypeConverter() const { return converter_; }
+
+ private:
+  class Iterator : public ParamIteratorInterface<To> {
+   public:
+    Iterator(const ParamGeneratorConverter* base, ParamIterator<From> it,
+             ParamIterator<From> end)
+        : base_(base), it_(it), end_(end) {
+      if (it_ != end_)
+        value_ =
+            std::make_shared<To>(static_cast<To>(base->TypeConverter()(*it_)));
+    }
+    ~Iterator() override = default;
+
+    const ParamGeneratorInterface<To>* BaseGenerator() const override {
+      return base_;
+    }
+    void Advance() override {
+      ++it_;
+      if (it_ != end_)
+        value_ =
+            std::make_shared<To>(static_cast<To>(base_->TypeConverter()(*it_)));
+    }
+    ParamIteratorInterface<To>* Clone() const override {
+      return new Iterator(*this);
+    }
+    const To* Current() const override { return value_.get(); }
+    bool Equals(const ParamIteratorInterface<To>& other) const override {
+      // Having the same base generator guarantees that the other
+      // iterator is of the same type and we can downcast.
+      GTEST_CHECK_(BaseGenerator() == other.BaseGenerator())
+          << "The program attempted to compare iterators "
+          << "from different generators." << std::endl;
+      const ParamIterator<From> other_it =
+          CheckedDowncastToActualType<const Iterator>(&other)->it_;
+      return it_ == other_it;
+    }
+
+   private:
+    Iterator(const Iterator& other) = default;
+
+    const ParamGeneratorConverter* const base_;
+    ParamIterator<From> it_;
+    ParamIterator<From> end_;
+    std::shared_ptr<To> value_;
+  };  // class ParamGeneratorConverter::Iterator
+
+  ParamGenerator<From> generator_;
+  Func converter_;
+};  // class ParamGeneratorConverter
+
+template <class GeneratedT,
+          typename StdFunction =
+              std::function<const GeneratedT&(const GeneratedT&)>>
+class ParamConverterGenerator {
+ public:
+  ParamConverterGenerator(ParamGenerator<GeneratedT> g)  // NOLINT
+      : generator_(std::move(g)), converter_(Identity) {}
+
+  ParamConverterGenerator(ParamGenerator<GeneratedT> g, StdFunction converter)
+      : generator_(std::move(g)), converter_(std::move(converter)) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {  // NOLINT
+    return ParamGenerator<T>(
+        new ParamGeneratorConverter<GeneratedT, T, StdFunction>(generator_,
+                                                                converter_));
+  }
+
+ private:
+  static const GeneratedT& Identity(const GeneratedT& v) { return v; }
+
+  ParamGenerator<GeneratedT> generator_;
+  StdFunction converter_;
+};
+
+// Template to determine the param type of a single-param std::function.
+template <typename T>
+struct FuncSingleParamType;
+template <typename R, typename P>
+struct FuncSingleParamType<std::function<R(P)>> {
+  using type = std::remove_cv_t<std::remove_reference_t<P>>;
+};
+
+template <typename T>
+struct IsSingleArgStdFunction : public std::false_type {};
+template <typename R, typename P>
+struct IsSingleArgStdFunction<std::function<R(P)>> : public std::true_type {};
+
 }  // namespace internal
 }  // namespace testing
 
diff --git a/external/googletest/googletest/include/gtest/internal/gtest-port-arch.h b/external/googletest/googletest/include/gtest/internal/gtest-port-arch.h
index adfce20a..7ec968f3 100644
--- a/external/googletest/googletest/include/gtest/internal/gtest-port-arch.h
+++ b/external/googletest/googletest/include/gtest/internal/gtest-port-arch.h
@@ -26,7 +26,7 @@
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
+
 // The Google C++ Testing and Mocking Framework (Google Test)
 //
 // This header file defines the GTEST_OS_* macro.
@@ -56,6 +56,8 @@
 #elif WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_TV_TITLE)
 #define GTEST_OS_WINDOWS_PHONE 1
 #define GTEST_OS_WINDOWS_TV_TITLE 1
+#elif WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_GAMES)
+#define GTEST_OS_WINDOWS_GAMES 1
 #else
 // WINAPI_FAMILY defined but no known partition matched.
 // Default to desktop.
@@ -78,6 +80,8 @@
 #define GTEST_OS_FREEBSD 1
 #elif defined __Fuchsia__
 #define GTEST_OS_FUCHSIA 1
+#elif defined(__GNU__)
+#define GTEST_OS_GNU_HURD 1
 #elif defined(__GLIBC__) && defined(__FreeBSD_kernel__)
 #define GTEST_OS_GNU_KFREEBSD 1
 #elif defined __linux__
@@ -109,6 +113,12 @@
 #define GTEST_OS_ESP32 1
 #elif defined(__XTENSA__)
 #define GTEST_OS_XTENSA 1
+#elif defined(__hexagon__)
+#define GTEST_OS_QURT 1
+#elif defined(CPU_QN9090) || defined(CPU_QN9090HN)
+#define GTEST_OS_NXP_QN9090 1
+#elif defined(NRF52)
+#define GTEST_OS_NRF52 1
 #endif  // __CYGWIN__
 
 #endif  // GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_ARCH_H_
diff --git a/external/googletest/googletest/include/gtest/internal/gtest-port.h b/external/googletest/googletest/include/gtest/internal/gtest-port.h
index 0953a781..25b7d194 100644
--- a/external/googletest/googletest/include/gtest/internal/gtest-port.h
+++ b/external/googletest/googletest/include/gtest/internal/gtest-port.h
@@ -26,7 +26,7 @@
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
+
 // Low-level types and utilities for porting Google Test to various
 // platforms.  All macros ending with _ and symbols defined in an
 // internal namespace are subject to change without notice.  Code
@@ -38,7 +38,9 @@
 // files are expected to #include this.  Therefore, it cannot #include
 // any other Google Test header.
 
-// GOOGLETEST_CM0001 DO NOT DELETE
+// IWYU pragma: private, include "gtest/gtest.h"
+// IWYU pragma: friend gtest/.*
+// IWYU pragma: friend gmock/.*
 
 #ifndef GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_H_
 #define GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_H_
@@ -81,6 +83,8 @@
 //   GTEST_HAS_STD_WSTRING    - Define it to 1/0 to indicate that
 //                              std::wstring does/doesn't work (Google Test can
 //                              be used where std::wstring is unavailable).
+//   GTEST_HAS_FILE_SYSTEM    - Define it to 1/0 to indicate whether or not a
+//                              file system is/isn't available.
 //   GTEST_HAS_SEH            - Define it to 1/0 to indicate whether the
 //                              compiler supports Microsoft's "Structured
 //                              Exception Handling".
@@ -116,6 +120,7 @@
 //   GTEST_OS_DRAGONFLY - DragonFlyBSD
 //   GTEST_OS_FREEBSD  - FreeBSD
 //   GTEST_OS_FUCHSIA  - Fuchsia
+//   GTEST_OS_GNU_HURD - GNU/Hurd
 //   GTEST_OS_GNU_KFREEBSD - GNU/kFreeBSD
 //   GTEST_OS_HAIKU    - Haiku
 //   GTEST_OS_HPUX     - HP-UX
@@ -156,10 +161,10 @@
 // NOT define them.
 //
 // These macros are public so that portable tests can be written.
-// Such tests typically surround code using a feature with an #if
+// Such tests typically surround code using a feature with an #ifdef
 // which controls that code.  For example:
 //
-// #if GTEST_HAS_DEATH_TEST
+// #ifdef GTEST_HAS_DEATH_TEST
 //   EXPECT_DEATH(DoSomethingDeadly());
 // #endif
 //
@@ -167,12 +172,13 @@
 //   GTEST_HAS_TYPED_TEST   - typed tests
 //   GTEST_HAS_TYPED_TEST_P - type-parameterized tests
 //   GTEST_IS_THREADSAFE    - Google Test is thread-safe.
-//   GOOGLETEST_CM0007 DO NOT DELETE
+//   GTEST_USES_RE2         - the RE2 regular expression library is used
 //   GTEST_USES_POSIX_RE    - enhanced POSIX regex is used. Do not confuse with
 //                            GTEST_HAS_POSIX_RE (see above) which users can
 //                            define themselves.
 //   GTEST_USES_SIMPLE_RE   - our own simple regex is used;
 //                            the above RE\b(s) are mutually exclusive.
+//   GTEST_HAS_ABSL         - Google Test is compiled with Abseil.
 
 // Misc public macros
 // ------------------
@@ -188,40 +194,45 @@
 //
 // Macros for basic C++ coding:
 //   GTEST_AMBIGUOUS_ELSE_BLOCKER_ - for disabling a gcc warning.
-//   GTEST_ATTRIBUTE_UNUSED_  - declares that a class' instances or a
-//                              variable don't have to be used.
-//   GTEST_DISALLOW_ASSIGN_   - disables copy operator=.
-//   GTEST_DISALLOW_COPY_AND_ASSIGN_ - disables copy ctor and operator=.
-//   GTEST_DISALLOW_MOVE_ASSIGN_   - disables move operator=.
-//   GTEST_DISALLOW_MOVE_AND_ASSIGN_ - disables move ctor and operator=.
-//   GTEST_MUST_USE_RESULT_   - declares that a function's result must be used.
 //   GTEST_INTENTIONAL_CONST_COND_PUSH_ - start code section where MSVC C4127 is
 //                                        suppressed (constant conditional).
 //   GTEST_INTENTIONAL_CONST_COND_POP_  - finish code section where MSVC C4127
 //                                        is suppressed.
 //   GTEST_INTERNAL_HAS_ANY - for enabling UniversalPrinter<std::any> or
 //                            UniversalPrinter<absl::any> specializations.
+//                            Always defined to 0 or 1.
 //   GTEST_INTERNAL_HAS_OPTIONAL - for enabling UniversalPrinter<std::optional>
 //   or
 //                                 UniversalPrinter<absl::optional>
-//                                 specializations.
+//                                 specializations. Always defined to 0 or 1.
+//   GTEST_INTERNAL_HAS_STD_SPAN - for enabling UniversalPrinter<std::span>
+//                                 specializations. Always defined to 0 or 1
 //   GTEST_INTERNAL_HAS_STRING_VIEW - for enabling Matcher<std::string_view> or
 //                                    Matcher<absl::string_view>
-//                                    specializations.
+//                                    specializations. Always defined to 0 or 1.
 //   GTEST_INTERNAL_HAS_VARIANT - for enabling UniversalPrinter<std::variant> or
 //                                UniversalPrinter<absl::variant>
-//                                specializations.
+//                                specializations. Always defined to 0 or 1.
+//   GTEST_USE_OWN_FLAGFILE_FLAG_ - Always defined to 0 or 1.
+//   GTEST_HAS_CXXABI_H_ - Always defined to 0 or 1.
+//   GTEST_CAN_STREAM_RESULTS_ - Always defined to 0 or 1.
+//   GTEST_HAS_ALT_PATH_SEP_ - Always defined to 0 or 1.
+//   GTEST_WIDE_STRING_USES_UTF16_ - Always defined to 0 or 1.
+//   GTEST_HAS_MUTEX_AND_THREAD_LOCAL_ - Always defined to 0 or 1.
+//   GTEST_HAS_NOTIFICATION_- Always defined to 0 or 1.
 //
 // Synchronization:
 //   Mutex, MutexLock, ThreadLocal, GetThreadCount()
 //                            - synchronization primitives.
 //
 // Regular expressions:
-//   RE             - a simple regular expression class using the POSIX
-//                    Extended Regular Expression syntax on UNIX-like platforms
-//                    GOOGLETEST_CM0008 DO NOT DELETE
-//                    or a reduced regular exception syntax on other
-//                    platforms, including Windows.
+//   RE             - a simple regular expression class using
+//                     1) the RE2 syntax on all platforms when built with RE2
+//                        and Abseil as dependencies
+//                     2) the POSIX Extended Regular Expression syntax on
+//                        UNIX-like platforms,
+//                     3) A reduced regular exception syntax on other platforms,
+//                        including Windows.
 // Logging:
 //   GTEST_LOG_()   - logs messages at the specified severity level.
 //   LogToStderr()  - directs all log messages to stderr.
@@ -241,8 +252,6 @@
 //   BiggestInt     - the biggest signed integer type.
 //
 // Command-line utilities:
-//   GTEST_DECLARE_*()  - declares a flag.
-//   GTEST_DEFINE_*()   - defines a flag.
 //   GetInjectableArgvs() - returns the command line as a vector of strings.
 //
 // Environment variable utilities:
@@ -250,11 +259,39 @@
 //   BoolFromGTestEnv()   - parses a bool environment variable.
 //   Int32FromGTestEnv()  - parses an int32_t environment variable.
 //   StringFromGTestEnv() - parses a string environment variable.
+
+// The definition of GTEST_INTERNAL_CPLUSPLUS_LANG comes first because it can
+// potentially be used as an #include guard.
+#if defined(_MSVC_LANG)
+#define GTEST_INTERNAL_CPLUSPLUS_LANG _MSVC_LANG
+#elif defined(__cplusplus)
+#define GTEST_INTERNAL_CPLUSPLUS_LANG __cplusplus
+#endif
+
+#if !defined(GTEST_INTERNAL_CPLUSPLUS_LANG) || \
+    GTEST_INTERNAL_CPLUSPLUS_LANG < 201703L
+#error C++ versions less than C++17 are not supported.
+#endif
+
+// MSVC >= 19.11 (VS 2017 Update 3) supports __has_include.
+#ifdef __has_include
+#define GTEST_INTERNAL_HAS_INCLUDE __has_include
+#else
+#define GTEST_INTERNAL_HAS_INCLUDE(...) 0
+#endif
+
+// Detect C++ feature test macros as gracefully as possible.
+// MSVC >= 19.15, Clang >= 3.4.1, and GCC >= 4.1.2 support feature test macros.
 //
-// Deprecation warnings:
-//   GTEST_INTERNAL_DEPRECATED(message) - attribute marking a function as
-//                                        deprecated; calling a marked function
-//                                        should generate a compiler warning
+// GCC15 warns that <ciso646> is deprecated in C++17 and suggests using
+// <version> instead, even though <version> is not available in C++17 mode prior
+// to GCC9.
+#if GTEST_INTERNAL_CPLUSPLUS_LANG >= 202002L || \
+    GTEST_INTERNAL_HAS_INCLUDE(<version>)
+#include <version>  // C++20 or <version> support.
+#else
+#include <ciso646>  // Pre-C++20
+#endif
 
 #include <ctype.h>   // for isspace, etc
 #include <stddef.h>  // for ptrdiff_t
@@ -263,48 +300,65 @@
 #include <string.h>
 
 #include <cerrno>
+// #include <condition_variable>  // Guarded by GTEST_IS_THREADSAFE below
 #include <cstdint>
+#include <iostream>
 #include <limits>
+#include <locale>
+#include <memory>
+#include <ostream>
+#include <string>
+// #include <mutex>  // Guarded by GTEST_IS_THREADSAFE below
+#include <tuple>
 #include <type_traits>
+#include <vector>
 
 #ifndef _WIN32_WCE
-# include <sys/types.h>
-# include <sys/stat.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 #endif  // !_WIN32_WCE
 
 #if defined __APPLE__
-# include <AvailabilityMacros.h>
-# include <TargetConditionals.h>
+#include <AvailabilityMacros.h>
+#include <TargetConditionals.h>
 #endif
 
-#include <iostream>  // NOLINT
-#include <locale>
-#include <memory>
-#include <string>  // NOLINT
-#include <tuple>
-#include <vector>  // NOLINT
-
 #include "gtest/internal/custom/gtest-port.h"
 #include "gtest/internal/gtest-port-arch.h"
 
+#ifndef GTEST_HAS_MUTEX_AND_THREAD_LOCAL_
+#define GTEST_HAS_MUTEX_AND_THREAD_LOCAL_ 0
+#endif
+
+#ifndef GTEST_HAS_NOTIFICATION_
+#define GTEST_HAS_NOTIFICATION_ 0
+#endif
+
+#if defined(GTEST_HAS_ABSL) && !defined(GTEST_NO_ABSL_FLAGS)
+#define GTEST_INTERNAL_HAS_ABSL_FLAGS  // Used only in this file.
+#include "absl/flags/declare.h"
+#include "absl/flags/flag.h"
+#include "absl/flags/reflection.h"
+#endif
+
 #if !defined(GTEST_DEV_EMAIL_)
-# define GTEST_DEV_EMAIL_ "googletestframework@@googlegroups.com"
-# define GTEST_FLAG_PREFIX_ "gtest_"
-# define GTEST_FLAG_PREFIX_DASH_ "gtest-"
-# define GTEST_FLAG_PREFIX_UPPER_ "GTEST_"
-# define GTEST_NAME_ "Google Test"
-# define GTEST_PROJECT_URL_ "https://github.com/google/googletest/"
+#define GTEST_DEV_EMAIL_ "googletestframework@@googlegroups.com"
+#define GTEST_FLAG_PREFIX_ "gtest_"
+#define GTEST_FLAG_PREFIX_DASH_ "gtest-"
+#define GTEST_FLAG_PREFIX_UPPER_ "GTEST_"
+#define GTEST_NAME_ "Google Test"
+#define GTEST_PROJECT_URL_ "https://github.com/google/googletest/"
 #endif  // !defined(GTEST_DEV_EMAIL_)
 
 #if !defined(GTEST_INIT_GOOGLE_TEST_NAME_)
-# define GTEST_INIT_GOOGLE_TEST_NAME_ "testing::InitGoogleTest"
+#define GTEST_INIT_GOOGLE_TEST_NAME_ "testing::InitGoogleTest"
 #endif  // !defined(GTEST_INIT_GOOGLE_TEST_NAME_)
 
 // Determines the version of gcc that is used to compile this.
 #ifdef __GNUC__
 // 40302 means version 4.3.2.
-# define GTEST_GCC_VER_ \
-    (__GNUC__*10000 + __GNUC_MINOR__*100 + __GNUC_PATCHLEVEL__)
+#define GTEST_GCC_VER_ \
+  (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
 #endif  // __GNUC__
 
 // Macros for disabling Microsoft Visual C++ warnings.
@@ -313,43 +367,39 @@
 //   /* code that triggers warnings C4800 and C4385 */
 //   GTEST_DISABLE_MSC_WARNINGS_POP_()
 #if defined(_MSC_VER)
-# define GTEST_DISABLE_MSC_WARNINGS_PUSH_(warnings) \
-    __pragma(warning(push))                        \
-    __pragma(warning(disable: warnings))
-# define GTEST_DISABLE_MSC_WARNINGS_POP_()          \
-    __pragma(warning(pop))
+#define GTEST_DISABLE_MSC_WARNINGS_PUSH_(warnings) \
+  __pragma(warning(push)) __pragma(warning(disable : warnings))
+#define GTEST_DISABLE_MSC_WARNINGS_POP_() __pragma(warning(pop))
 #else
 // Not all compilers are MSVC
-# define GTEST_DISABLE_MSC_WARNINGS_PUSH_(warnings)
-# define GTEST_DISABLE_MSC_WARNINGS_POP_()
+#define GTEST_DISABLE_MSC_WARNINGS_PUSH_(warnings)
+#define GTEST_DISABLE_MSC_WARNINGS_POP_()
 #endif
 
 // Clang on Windows does not understand MSVC's pragma warning.
 // We need clang-specific way to disable function deprecation warning.
 #ifdef __clang__
-# define GTEST_DISABLE_MSC_DEPRECATED_PUSH_()                         \
-    _Pragma("clang diagnostic push")                                  \
-    _Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"") \
-    _Pragma("clang diagnostic ignored \"-Wdeprecated-implementations\"")
-#define GTEST_DISABLE_MSC_DEPRECATED_POP_() \
-    _Pragma("clang diagnostic pop")
+#define GTEST_DISABLE_MSC_DEPRECATED_PUSH_()                            \
+  _Pragma("clang diagnostic push")                                      \
+      _Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"") \
+          _Pragma("clang diagnostic ignored \"-Wdeprecated-implementations\"")
+#define GTEST_DISABLE_MSC_DEPRECATED_POP_() _Pragma("clang diagnostic pop")
 #else
-# define GTEST_DISABLE_MSC_DEPRECATED_PUSH_() \
-    GTEST_DISABLE_MSC_WARNINGS_PUSH_(4996)
-# define GTEST_DISABLE_MSC_DEPRECATED_POP_() \
-    GTEST_DISABLE_MSC_WARNINGS_POP_()
+#define GTEST_DISABLE_MSC_DEPRECATED_PUSH_() \
+  GTEST_DISABLE_MSC_WARNINGS_PUSH_(4996)
+#define GTEST_DISABLE_MSC_DEPRECATED_POP_() GTEST_DISABLE_MSC_WARNINGS_POP_()
 #endif
 
 // Brings in definitions for functions used in the testing::internal::posix
 // namespace (read, write, close, chdir, isatty, stat). We do not currently
 // use them on Windows Mobile.
-#if GTEST_OS_WINDOWS
-# if !GTEST_OS_WINDOWS_MOBILE
-#  include <direct.h>
-#  include <io.h>
-# endif
+#ifdef GTEST_OS_WINDOWS
+#ifndef GTEST_OS_WINDOWS_MOBILE
+#include <direct.h>
+#include <io.h>
+#endif
 // In order to avoid having to include <windows.h>, use forward declaration
-#if GTEST_OS_WINDOWS_MINGW && !defined(__MINGW64_VERSION_MAJOR)
+#if defined(GTEST_OS_WINDOWS_MINGW) && !defined(__MINGW64_VERSION_MAJOR)
 // MinGW defined _CRITICAL_SECTION and _RTL_CRITICAL_SECTION as two
 // separate (equivalent) structs, instead of using typedef
 typedef struct _CRITICAL_SECTION GTEST_CRITICAL_SECTION;
@@ -359,7 +409,7 @@ typedef struct _CRITICAL_SECTION GTEST_CRITICAL_SECTION;
 // WindowsTypesTest.CRITICAL_SECTIONIs_RTL_CRITICAL_SECTION.
 typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
 #endif
-#elif GTEST_OS_XTENSA
+#elif defined(GTEST_OS_XTENSA)
 #include <unistd.h>
 // Xtensa toolchains define strcasecmp in the string.h header instead of
 // strings.h. string.h is already included.
@@ -367,68 +417,60 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
 // This assumes that non-Windows OSes provide unistd.h. For OSes where this
 // is not the case, we need to include headers that provide the functions
 // mentioned above.
-# include <unistd.h>
-# include <strings.h>
+#include <strings.h>
+#include <unistd.h>
 #endif  // GTEST_OS_WINDOWS
 
-#if GTEST_OS_LINUX_ANDROID
+#ifdef GTEST_OS_LINUX_ANDROID
 // Used to define __ANDROID_API__ matching the target NDK API level.
-#  include <android/api-level.h>  // NOLINT
+#include <android/api-level.h>  // NOLINT
 #endif
 
 // Defines this to true if and only if Google Test can use POSIX regular
 // expressions.
 #ifndef GTEST_HAS_POSIX_RE
-# if GTEST_OS_LINUX_ANDROID
+#ifdef GTEST_OS_LINUX_ANDROID
 // On Android, <regex.h> is only available starting with Gingerbread.
-#  define GTEST_HAS_POSIX_RE (__ANDROID_API__ >= 9)
-# else
-#define GTEST_HAS_POSIX_RE (!GTEST_OS_WINDOWS && !GTEST_OS_XTENSA)
-# endif
+#define GTEST_HAS_POSIX_RE (__ANDROID_API__ >= 9)
+#else
+#if !(defined(GTEST_OS_WINDOWS) || defined(GTEST_OS_XTENSA) || \
+      defined(GTEST_OS_QURT))
+#define GTEST_HAS_POSIX_RE 1
+#else
+#define GTEST_HAS_POSIX_RE 0
+#endif
+#endif  // GTEST_OS_LINUX_ANDROID
 #endif
 
-#if GTEST_USES_PCRE
-// The appropriate headers have already been included.
-
+// Select the regular expression implementation.
+#ifdef GTEST_HAS_ABSL
+// When using Abseil, RE2 is required.
+#include "absl/strings/string_view.h"
+#include "re2/re2.h"
+#define GTEST_USES_RE2 1
 #elif GTEST_HAS_POSIX_RE
-
-// On some platforms, <regex.h> needs someone to define size_t, and
-// won't compile otherwise.  We can #include it here as we already
-// included <stdlib.h>, which is guaranteed to define size_t through
-// <stddef.h>.
-# include <regex.h>  // NOLINT
-
-# define GTEST_USES_POSIX_RE 1
-
-#elif GTEST_OS_WINDOWS
-
-// <regex.h> is not available on Windows.  Use our own simple regex
-// implementation instead.
-# define GTEST_USES_SIMPLE_RE 1
-
+#include <regex.h>  // NOLINT
+#define GTEST_USES_POSIX_RE 1
 #else
-
-// <regex.h> may not be available on this platform.  Use our own
-// simple regex implementation instead.
-# define GTEST_USES_SIMPLE_RE 1
-
-#endif  // GTEST_USES_PCRE
+// Use our own simple regex implementation.
+#define GTEST_USES_SIMPLE_RE 1
+#endif
 
 #ifndef GTEST_HAS_EXCEPTIONS
 // The user didn't tell us whether exceptions are enabled, so we need
 // to figure it out.
-# if defined(_MSC_VER) && defined(_CPPUNWIND)
+#if defined(_MSC_VER) && defined(_CPPUNWIND)
 // MSVC defines _CPPUNWIND to 1 if and only if exceptions are enabled.
-#  define GTEST_HAS_EXCEPTIONS 1
-# elif defined(__BORLANDC__)
+#define GTEST_HAS_EXCEPTIONS 1
+#elif defined(__BORLANDC__)
 // C++Builder's implementation of the STL uses the _HAS_EXCEPTIONS
 // macro to enable exceptions, so we'll do the same.
 // Assumes that exceptions are enabled by default.
-#  ifndef _HAS_EXCEPTIONS
-#   define _HAS_EXCEPTIONS 1
-#  endif  // _HAS_EXCEPTIONS
-#  define GTEST_HAS_EXCEPTIONS _HAS_EXCEPTIONS
-# elif defined(__clang__)
+#ifndef _HAS_EXCEPTIONS
+#define _HAS_EXCEPTIONS 1
+#endif  // _HAS_EXCEPTIONS
+#define GTEST_HAS_EXCEPTIONS _HAS_EXCEPTIONS
+#elif defined(__clang__)
 // clang defines __EXCEPTIONS if and only if exceptions are enabled before clang
 // 220714, but if and only if cleanups are enabled after that. In Obj-C++ files,
 // there can be cleanups for ObjC exceptions which also need cleanups, even if
@@ -437,27 +479,31 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
 // cleanups prior to that. To reliably check for C++ exception availability with
 // clang, check for
 // __EXCEPTIONS && __has_feature(cxx_exceptions).
-#  define GTEST_HAS_EXCEPTIONS (__EXCEPTIONS && __has_feature(cxx_exceptions))
-# elif defined(__GNUC__) && __EXCEPTIONS
+#if defined(__EXCEPTIONS) && __EXCEPTIONS && __has_feature(cxx_exceptions)
+#define GTEST_HAS_EXCEPTIONS 1
+#else
+#define GTEST_HAS_EXCEPTIONS 0
+#endif
+#elif defined(__GNUC__) && defined(__EXCEPTIONS) && __EXCEPTIONS
 // gcc defines __EXCEPTIONS to 1 if and only if exceptions are enabled.
-#  define GTEST_HAS_EXCEPTIONS 1
-# elif defined(__SUNPRO_CC)
+#define GTEST_HAS_EXCEPTIONS 1
+#elif defined(__SUNPRO_CC)
 // Sun Pro CC supports exceptions.  However, there is no compile-time way of
 // detecting whether they are enabled or not.  Therefore, we assume that
 // they are enabled unless the user tells us otherwise.
-#  define GTEST_HAS_EXCEPTIONS 1
-# elif defined(__IBMCPP__) && __EXCEPTIONS
+#define GTEST_HAS_EXCEPTIONS 1
+#elif defined(__IBMCPP__) && defined(__EXCEPTIONS) && __EXCEPTIONS
 // xlC defines __EXCEPTIONS to 1 if and only if exceptions are enabled.
-#  define GTEST_HAS_EXCEPTIONS 1
-# elif defined(__HP_aCC)
+#define GTEST_HAS_EXCEPTIONS 1
+#elif defined(__HP_aCC)
 // Exception handling is in effect by default in HP aCC compiler. It has to
 // be turned of by +noeh compiler option if desired.
-#  define GTEST_HAS_EXCEPTIONS 1
-# else
+#define GTEST_HAS_EXCEPTIONS 1
+#else
 // For other compilers, we assume exceptions are disabled to be
 // conservative.
-#  define GTEST_HAS_EXCEPTIONS 0
-# endif  // defined(_MSC_VER) || defined(__BORLANDC__)
+#define GTEST_HAS_EXCEPTIONS 0
+#endif  // defined(_MSC_VER) || defined(__BORLANDC__)
 #endif  // GTEST_HAS_EXCEPTIONS
 
 #ifndef GTEST_HAS_STD_WSTRING
@@ -466,74 +512,84 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
 // Cygwin 1.7 and below doesn't support ::std::wstring.
 // Solaris' libc++ doesn't support it either.  Android has
 // no support for it at least as recent as Froyo (2.2).
-#define GTEST_HAS_STD_WSTRING                                         \
-  (!(GTEST_OS_LINUX_ANDROID || GTEST_OS_CYGWIN || GTEST_OS_SOLARIS || \
-     GTEST_OS_HAIKU || GTEST_OS_ESP32 || GTEST_OS_ESP8266 || GTEST_OS_XTENSA))
-
+#if (!(defined(GTEST_OS_LINUX_ANDROID) || defined(GTEST_OS_CYGWIN) || \
+       defined(GTEST_OS_SOLARIS) || defined(GTEST_OS_HAIKU) ||        \
+       defined(GTEST_OS_ESP32) || defined(GTEST_OS_ESP8266) ||        \
+       defined(GTEST_OS_XTENSA) || defined(GTEST_OS_QURT) ||          \
+       defined(GTEST_OS_NXP_QN9090) || defined(GTEST_OS_NRF52)))
+#define GTEST_HAS_STD_WSTRING 1
+#else
+#define GTEST_HAS_STD_WSTRING 0
+#endif
 #endif  // GTEST_HAS_STD_WSTRING
 
+#ifndef GTEST_HAS_FILE_SYSTEM
+// Most platforms support a file system.
+#define GTEST_HAS_FILE_SYSTEM 1
+#endif  // GTEST_HAS_FILE_SYSTEM
+
 // Determines whether RTTI is available.
 #ifndef GTEST_HAS_RTTI
 // The user didn't tell us whether RTTI is enabled, so we need to
 // figure it out.
 
-# ifdef _MSC_VER
+#ifdef _MSC_VER
 
 #ifdef _CPPRTTI  // MSVC defines this macro if and only if RTTI is enabled.
-#   define GTEST_HAS_RTTI 1
-#  else
-#   define GTEST_HAS_RTTI 0
-#  endif
+#define GTEST_HAS_RTTI 1
+#else
+#define GTEST_HAS_RTTI 0
+#endif
 
 // Starting with version 4.3.2, gcc defines __GXX_RTTI if and only if RTTI is
 // enabled.
-# elif defined(__GNUC__)
+#elif defined(__GNUC__)
 
-#  ifdef __GXX_RTTI
+#ifdef __GXX_RTTI
 // When building against STLport with the Android NDK and with
 // -frtti -fno-exceptions, the build fails at link time with undefined
 // references to __cxa_bad_typeid. Note sure if STL or toolchain bug,
 // so disable RTTI when detected.
-#   if GTEST_OS_LINUX_ANDROID && defined(_STLPORT_MAJOR) && \
-       !defined(__EXCEPTIONS)
-#    define GTEST_HAS_RTTI 0
-#   else
-#    define GTEST_HAS_RTTI 1
-#   endif  // GTEST_OS_LINUX_ANDROID && __STLPORT_MAJOR && !__EXCEPTIONS
-#  else
-#   define GTEST_HAS_RTTI 0
-#  endif  // __GXX_RTTI
+#if defined(GTEST_OS_LINUX_ANDROID) && defined(_STLPORT_MAJOR) && \
+    !defined(__EXCEPTIONS)
+#define GTEST_HAS_RTTI 0
+#else
+#define GTEST_HAS_RTTI 1
+#endif  // GTEST_OS_LINUX_ANDROID && __STLPORT_MAJOR && !__EXCEPTIONS
+#else
+#define GTEST_HAS_RTTI 0
+#endif  // __GXX_RTTI
 
 // Clang defines __GXX_RTTI starting with version 3.0, but its manual recommends
 // using has_feature instead. has_feature(cxx_rtti) is supported since 2.7, the
 // first version with C++ support.
-# elif defined(__clang__)
+#elif defined(__clang__)
 
-#  define GTEST_HAS_RTTI __has_feature(cxx_rtti)
+#define GTEST_HAS_RTTI __has_feature(cxx_rtti)
 
 // Starting with version 9.0 IBM Visual Age defines __RTTI_ALL__ to 1 if
 // both the typeid and dynamic_cast features are present.
-# elif defined(__IBMCPP__) && (__IBMCPP__ >= 900)
+#elif defined(__IBMCPP__) && (__IBMCPP__ >= 900)
 
-#  ifdef __RTTI_ALL__
-#   define GTEST_HAS_RTTI 1
-#  else
-#   define GTEST_HAS_RTTI 0
-#  endif
+#ifdef __RTTI_ALL__
+#define GTEST_HAS_RTTI 1
+#else
+#define GTEST_HAS_RTTI 0
+#endif
 
-# else
+#else
 
 // For all other compilers, we assume RTTI is enabled.
-#  define GTEST_HAS_RTTI 1
+#define GTEST_HAS_RTTI 1
 
-# endif  // _MSC_VER
+#endif  // _MSC_VER
 
 #endif  // GTEST_HAS_RTTI
 
 // It's this header's responsibility to #include <typeinfo> when RTTI
 // is enabled.
 #if GTEST_HAS_RTTI
-# include <typeinfo>
+#include <typeinfo>
 #endif
 
 // Determines whether Google Test can use the pthreads library.
@@ -543,47 +599,53 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
 //
 // To disable threading support in Google Test, add -DGTEST_HAS_PTHREAD=0
 // to your compiler flags.
-#define GTEST_HAS_PTHREAD                                                      \
-  (GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_HPUX || GTEST_OS_QNX ||          \
-   GTEST_OS_FREEBSD || GTEST_OS_NACL || GTEST_OS_NETBSD || GTEST_OS_FUCHSIA || \
-   GTEST_OS_DRAGONFLY || GTEST_OS_GNU_KFREEBSD || GTEST_OS_OPENBSD ||          \
-   GTEST_OS_HAIKU)
+#if (defined(GTEST_OS_LINUX) || defined(GTEST_OS_MAC) ||              \
+     defined(GTEST_OS_HPUX) || defined(GTEST_OS_QNX) ||               \
+     defined(GTEST_OS_FREEBSD) || defined(GTEST_OS_NACL) ||           \
+     defined(GTEST_OS_NETBSD) || defined(GTEST_OS_FUCHSIA) ||         \
+     defined(GTEST_OS_DRAGONFLY) || defined(GTEST_OS_GNU_KFREEBSD) || \
+     defined(GTEST_OS_OPENBSD) || defined(GTEST_OS_HAIKU) ||          \
+     defined(GTEST_OS_GNU_HURD) || defined(GTEST_OS_SOLARIS) ||       \
+     defined(GTEST_OS_AIX) || defined(GTEST_OS_ZOS))
+#define GTEST_HAS_PTHREAD 1
+#else
+#define GTEST_HAS_PTHREAD 0
+#endif
 #endif  // GTEST_HAS_PTHREAD
 
 #if GTEST_HAS_PTHREAD
 // gtest-port.h guarantees to #include <pthread.h> when GTEST_HAS_PTHREAD is
 // true.
-# include <pthread.h>  // NOLINT
+#include <pthread.h>  // NOLINT
 
 // For timespec and nanosleep, used below.
-# include <time.h>  // NOLINT
+#include <time.h>  // NOLINT
 #endif
 
 // Determines whether clone(2) is supported.
 // Usually it will only be available on Linux, excluding
 // Linux on the Itanium architecture.
-// Also see http://linux.die.net/man/2/clone.
+// Also see https://linux.die.net/man/2/clone.
 #ifndef GTEST_HAS_CLONE
 // The user didn't tell us, so we need to figure it out.
 
-# if GTEST_OS_LINUX && !defined(__ia64__)
-#  if GTEST_OS_LINUX_ANDROID
+#if defined(GTEST_OS_LINUX) && !defined(__ia64__)
+#if defined(GTEST_OS_LINUX_ANDROID)
 // On Android, clone() became available at different API levels for each 32-bit
 // architecture.
-#    if defined(__LP64__) || \
-        (defined(__arm__) && __ANDROID_API__ >= 9) || \
-        (defined(__mips__) && __ANDROID_API__ >= 12) || \
-        (defined(__i386__) && __ANDROID_API__ >= 17)
-#     define GTEST_HAS_CLONE 1
-#    else
-#     define GTEST_HAS_CLONE 0
-#    endif
-#  else
-#   define GTEST_HAS_CLONE 1
-#  endif
-# else
-#  define GTEST_HAS_CLONE 0
-# endif  // GTEST_OS_LINUX && !defined(__ia64__)
+#if defined(__LP64__) || (defined(__arm__) && __ANDROID_API__ >= 9) || \
+    (defined(__mips__) && __ANDROID_API__ >= 12) ||                    \
+    (defined(__i386__) && __ANDROID_API__ >= 17)
+#define GTEST_HAS_CLONE 1
+#else
+#define GTEST_HAS_CLONE 0
+#endif
+#else
+#define GTEST_HAS_CLONE 1
+#endif
+#else
+#define GTEST_HAS_CLONE 0
+#endif  // GTEST_OS_LINUX && !defined(__ia64__)
 
 #endif  // GTEST_HAS_CLONE
 
@@ -591,24 +653,34 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
 // output correctness and to implement death tests.
 #ifndef GTEST_HAS_STREAM_REDIRECTION
 // By default, we assume that stream redirection is supported on all
-// platforms except known mobile ones.
-#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_PHONE || \
-    GTEST_OS_WINDOWS_RT || GTEST_OS_ESP8266 || GTEST_OS_XTENSA
-#  define GTEST_HAS_STREAM_REDIRECTION 0
-# else
-#  define GTEST_HAS_STREAM_REDIRECTION 1
-# endif  // !GTEST_OS_WINDOWS_MOBILE
+// platforms except known mobile / embedded ones. Also, if the port doesn't have
+// a file system, stream redirection is not supported.
+#if defined(GTEST_OS_WINDOWS_MOBILE) || defined(GTEST_OS_WINDOWS_PHONE) || \
+    defined(GTEST_OS_WINDOWS_RT) || defined(GTEST_OS_WINDOWS_GAMES) ||     \
+    defined(GTEST_OS_ESP8266) || defined(GTEST_OS_XTENSA) ||               \
+    defined(GTEST_OS_QURT) || !GTEST_HAS_FILE_SYSTEM
+#define GTEST_HAS_STREAM_REDIRECTION 0
+#else
+#define GTEST_HAS_STREAM_REDIRECTION 1
+#endif  // !GTEST_OS_WINDOWS_MOBILE
 #endif  // GTEST_HAS_STREAM_REDIRECTION
 
 // Determines whether to support death tests.
 // pops up a dialog window that cannot be suppressed programmatically.
-#if (GTEST_OS_LINUX || GTEST_OS_CYGWIN || GTEST_OS_SOLARIS ||             \
-     (GTEST_OS_MAC && !GTEST_OS_IOS) ||                                   \
-     (GTEST_OS_WINDOWS_DESKTOP && _MSC_VER) || GTEST_OS_WINDOWS_MINGW ||  \
-     GTEST_OS_AIX || GTEST_OS_HPUX || GTEST_OS_OPENBSD || GTEST_OS_QNX || \
-     GTEST_OS_FREEBSD || GTEST_OS_NETBSD || GTEST_OS_FUCHSIA ||           \
-     GTEST_OS_DRAGONFLY || GTEST_OS_GNU_KFREEBSD || GTEST_OS_HAIKU)
-# define GTEST_HAS_DEATH_TEST 1
+#if (defined(GTEST_OS_LINUX) || defined(GTEST_OS_CYGWIN) ||           \
+     defined(GTEST_OS_SOLARIS) || defined(GTEST_OS_ZOS) ||            \
+     (defined(GTEST_OS_MAC) && !defined(GTEST_OS_IOS)) ||             \
+     (defined(GTEST_OS_WINDOWS_DESKTOP) && _MSC_VER) ||               \
+     defined(GTEST_OS_WINDOWS_MINGW) || defined(GTEST_OS_AIX) ||      \
+     defined(GTEST_OS_HPUX) || defined(GTEST_OS_OPENBSD) ||           \
+     defined(GTEST_OS_QNX) || defined(GTEST_OS_FREEBSD) ||            \
+     defined(GTEST_OS_NETBSD) || defined(GTEST_OS_FUCHSIA) ||         \
+     defined(GTEST_OS_DRAGONFLY) || defined(GTEST_OS_GNU_KFREEBSD) || \
+     defined(GTEST_OS_HAIKU) || defined(GTEST_OS_GNU_HURD))
+// Death tests require a file system to work properly.
+#if GTEST_HAS_FILE_SYSTEM
+#define GTEST_HAS_DEATH_TEST 1
+#endif  // GTEST_HAS_FILE_SYSTEM
 #endif
 
 // Determines whether to support type-driven tests.
@@ -617,18 +689,26 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
 // Sun Pro CC, IBM Visual Age, and HP aCC support.
 #if defined(__GNUC__) || defined(_MSC_VER) || defined(__SUNPRO_CC) || \
     defined(__IBMCPP__) || defined(__HP_aCC)
-# define GTEST_HAS_TYPED_TEST 1
-# define GTEST_HAS_TYPED_TEST_P 1
+#define GTEST_HAS_TYPED_TEST 1
+#define GTEST_HAS_TYPED_TEST_P 1
 #endif
 
 // Determines whether the system compiler uses UTF-16 for encoding wide strings.
-#define GTEST_WIDE_STRING_USES_UTF16_ \
-  (GTEST_OS_WINDOWS || GTEST_OS_CYGWIN || GTEST_OS_AIX || GTEST_OS_OS2)
+#if defined(GTEST_OS_WINDOWS) || defined(GTEST_OS_CYGWIN) || \
+    defined(GTEST_OS_AIX) || defined(GTEST_OS_OS2)
+#define GTEST_WIDE_STRING_USES_UTF16_ 1
+#else
+#define GTEST_WIDE_STRING_USES_UTF16_ 0
+#endif
 
 // Determines whether test results can be streamed to a socket.
-#if GTEST_OS_LINUX || GTEST_OS_GNU_KFREEBSD || GTEST_OS_DRAGONFLY || \
-    GTEST_OS_FREEBSD || GTEST_OS_NETBSD || GTEST_OS_OPENBSD
-# define GTEST_CAN_STREAM_RESULTS_ 1
+#if defined(GTEST_OS_LINUX) || defined(GTEST_OS_GNU_KFREEBSD) || \
+    defined(GTEST_OS_DRAGONFLY) || defined(GTEST_OS_FREEBSD) ||  \
+    defined(GTEST_OS_NETBSD) || defined(GTEST_OS_OPENBSD) ||     \
+    defined(GTEST_OS_GNU_HURD) || defined(GTEST_OS_MAC)
+#define GTEST_CAN_STREAM_RESULTS_ 1
+#else
+#define GTEST_CAN_STREAM_RESULTS_ 0
 #endif
 
 // Defines some utility macros.
@@ -642,84 +722,68 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
 //
 // The "switch (0) case 0:" idiom is used to suppress this.
 #ifdef __INTEL_COMPILER
-# define GTEST_AMBIGUOUS_ELSE_BLOCKER_
+#define GTEST_AMBIGUOUS_ELSE_BLOCKER_
 #else
-# define GTEST_AMBIGUOUS_ELSE_BLOCKER_ switch (0) case 0: default:  // NOLINT
+#define GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
+  switch (0)                          \
+  case 0:                             \
+  default:  // NOLINT
 #endif
 
-// Use this annotation at the end of a struct/class definition to
-// prevent the compiler from optimizing away instances that are never
-// used.  This is useful when all interesting logic happens inside the
-// c'tor and / or d'tor.  Example:
+// GTEST_HAVE_ATTRIBUTE_
 //
-//   struct Foo {
-//     Foo() { ... }
-//   } GTEST_ATTRIBUTE_UNUSED_;
+// A function-like feature checking macro that is a wrapper around
+// `__has_attribute`, which is defined by GCC 5+ and Clang and evaluates to a
+// nonzero constant integer if the attribute is supported or 0 if not.
 //
-// Also use it after a variable or parameter declaration to tell the
-// compiler the variable/parameter does not have to be used.
-#if defined(__GNUC__) && !defined(COMPILER_ICC)
-# define GTEST_ATTRIBUTE_UNUSED_ __attribute__ ((unused))
-#elif defined(__clang__)
-# if __has_attribute(unused)
-#  define GTEST_ATTRIBUTE_UNUSED_ __attribute__ ((unused))
-# endif
+// It evaluates to zero if `__has_attribute` is not defined by the compiler.
+//
+// GCC: https://gcc.gnu.org/gcc-5/changes.html
+// Clang: https://clang.llvm.org/docs/LanguageExtensions.html
+#ifdef __has_attribute
+#define GTEST_HAVE_ATTRIBUTE_(x) __has_attribute(x)
+#else
+#define GTEST_HAVE_ATTRIBUTE_(x) 0
 #endif
-#ifndef GTEST_ATTRIBUTE_UNUSED_
-# define GTEST_ATTRIBUTE_UNUSED_
+
+// GTEST_INTERNAL_HAVE_CPP_ATTRIBUTE
+//
+// A function-like feature checking macro that accepts C++11 style attributes.
+// It's a wrapper around `__has_cpp_attribute`, defined by ISO C++ SD-6
+// (https://en.cppreference.com/w/cpp/experimental/feature_test). If we don't
+// find `__has_cpp_attribute`, will evaluate to 0.
+#if defined(__has_cpp_attribute)
+// NOTE: requiring __cplusplus above should not be necessary, but
+// works around https://bugs.llvm.org/show_bug.cgi?id=23435.
+#define GTEST_INTERNAL_HAVE_CPP_ATTRIBUTE(x) __has_cpp_attribute(x)
+#else
+#define GTEST_INTERNAL_HAVE_CPP_ATTRIBUTE(x) 0
+#endif
+
+// GTEST_HAVE_FEATURE_
+//
+// A function-like feature checking macro that is a wrapper around
+// `__has_feature`.
+#ifdef __has_feature
+#define GTEST_HAVE_FEATURE_(x) __has_feature(x)
+#else
+#define GTEST_HAVE_FEATURE_(x) 0
 #endif
 
 // Use this annotation before a function that takes a printf format string.
-#if (defined(__GNUC__) || defined(__clang__)) && !defined(COMPILER_ICC)
-# if defined(__MINGW_PRINTF_FORMAT)
+#if GTEST_HAVE_ATTRIBUTE_(format) && defined(__MINGW_PRINTF_FORMAT)
 // MinGW has two different printf implementations. Ensure the format macro
 // matches the selected implementation. See
 // https://sourceforge.net/p/mingw-w64/wiki2/gnu%20printf/.
-#  define GTEST_ATTRIBUTE_PRINTF_(string_index, first_to_check) \
-       __attribute__((__format__(__MINGW_PRINTF_FORMAT, string_index, \
-                                 first_to_check)))
-# else
-#  define GTEST_ATTRIBUTE_PRINTF_(string_index, first_to_check) \
-       __attribute__((__format__(__printf__, string_index, first_to_check)))
-# endif
+#define GTEST_ATTRIBUTE_PRINTF_(string_index, first_to_check) \
+  __attribute__((format(__MINGW_PRINTF_FORMAT, string_index, first_to_check)))
+#elif GTEST_HAVE_ATTRIBUTE_(format)
+#define GTEST_ATTRIBUTE_PRINTF_(string_index, first_to_check) \
+  __attribute__((format(printf, string_index, first_to_check)))
 #else
-# define GTEST_ATTRIBUTE_PRINTF_(string_index, first_to_check)
+#define GTEST_ATTRIBUTE_PRINTF_(string_index, first_to_check)
 #endif
 
-
-// A macro to disallow copy operator=
-// This should be used in the private: declarations for a class.
-#define GTEST_DISALLOW_ASSIGN_(type) \
-  type& operator=(type const &) = delete
-
-// A macro to disallow copy constructor and operator=
-// This should be used in the private: declarations for a class.
-#define GTEST_DISALLOW_COPY_AND_ASSIGN_(type) \
-  type(type const&) = delete;                 \
-  type& operator=(type const&) = delete
-
-// A macro to disallow move operator=
-// This should be used in the private: declarations for a class.
-#define GTEST_DISALLOW_MOVE_ASSIGN_(type) \
-  type& operator=(type &&) noexcept = delete
-
-// A macro to disallow move constructor and operator=
-// This should be used in the private: declarations for a class.
-#define GTEST_DISALLOW_MOVE_AND_ASSIGN_(type) \
-  type(type&&) noexcept = delete;             \
-  type& operator=(type&&) noexcept = delete
-
-// Tell the compiler to warn about unused return values for functions declared
-// with this macro.  The macro should be used on function declarations
-// following the argument list:
-//
-//   Sprocket* AllocateSprocket() GTEST_MUST_USE_RESULT_;
-#if defined(__GNUC__) && !defined(COMPILER_ICC)
-# define GTEST_MUST_USE_RESULT_ __attribute__ ((warn_unused_result))
-#else
-# define GTEST_MUST_USE_RESULT_
-#endif  // __GNUC__ && !COMPILER_ICC
-
 // MS C++ compiler emits warning when a conditional expression is compile time
 // constant. In some contexts this warning is false positive and needs to be
 // suppressed. Use the following two macros in such cases:
@@ -728,10 +792,9 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
 // while (true) {
 // GTEST_INTENTIONAL_CONST_COND_POP_()
 // }
-# define GTEST_INTENTIONAL_CONST_COND_PUSH_() \
-    GTEST_DISABLE_MSC_WARNINGS_PUSH_(4127)
-# define GTEST_INTENTIONAL_CONST_COND_POP_() \
-    GTEST_DISABLE_MSC_WARNINGS_POP_()
+#define GTEST_INTENTIONAL_CONST_COND_PUSH_() \
+  GTEST_DISABLE_MSC_WARNINGS_PUSH_(4127)
+#define GTEST_INTENTIONAL_CONST_COND_POP_() GTEST_DISABLE_MSC_WARNINGS_POP_()
 
 // Determine whether the compiler supports Microsoft's Structured Exception
 // Handling.  This is supported by several Windows compilers but generally
@@ -739,114 +802,116 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
 #ifndef GTEST_HAS_SEH
 // The user didn't tell us, so we need to figure it out.
 
-# if defined(_MSC_VER) || defined(__BORLANDC__)
+#if defined(_MSC_VER) || defined(__BORLANDC__)
 // These two compilers are known to support SEH.
-#  define GTEST_HAS_SEH 1
-# else
+#define GTEST_HAS_SEH 1
+#else
 // Assume no SEH.
-#  define GTEST_HAS_SEH 0
-# endif
+#define GTEST_HAS_SEH 0
+#endif
 
 #endif  // GTEST_HAS_SEH
 
 #ifndef GTEST_IS_THREADSAFE
 
-#define GTEST_IS_THREADSAFE                                                 \
-  (GTEST_HAS_MUTEX_AND_THREAD_LOCAL_ ||                                     \
-   (GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT) || \
-   GTEST_HAS_PTHREAD)
+#if (GTEST_HAS_MUTEX_AND_THREAD_LOCAL_ ||                              \
+     (defined(GTEST_OS_WINDOWS) && !defined(GTEST_OS_WINDOWS_PHONE) && \
+      !defined(GTEST_OS_WINDOWS_RT)) ||                                \
+     GTEST_HAS_PTHREAD)
+#define GTEST_IS_THREADSAFE 1
+#endif
 
 #endif  // GTEST_IS_THREADSAFE
 
+#ifdef GTEST_IS_THREADSAFE
+// Some platforms don't support including these threading related headers.
+#include <condition_variable>  // NOLINT
+#include <mutex>               // NOLINT
+#endif                         // GTEST_IS_THREADSAFE
+
 // GTEST_API_ qualifies all symbols that must be exported. The definitions below
 // are guarded by #ifndef to give embedders a chance to define GTEST_API_ in
 // gtest/internal/custom/gtest-port.h
 #ifndef GTEST_API_
 
 #ifdef _MSC_VER
-# if GTEST_LINKED_AS_SHARED_LIBRARY
-#  define GTEST_API_ __declspec(dllimport)
-# elif GTEST_CREATE_SHARED_LIBRARY
-#  define GTEST_API_ __declspec(dllexport)
-# endif
-#elif __GNUC__ >= 4 || defined(__clang__)
-# define GTEST_API_ __attribute__((visibility ("default")))
+#if defined(GTEST_LINKED_AS_SHARED_LIBRARY) && GTEST_LINKED_AS_SHARED_LIBRARY
+#define GTEST_API_ __declspec(dllimport)
+#elif defined(GTEST_CREATE_SHARED_LIBRARY) && GTEST_CREATE_SHARED_LIBRARY
+#define GTEST_API_ __declspec(dllexport)
+#endif
+#elif GTEST_HAVE_ATTRIBUTE_(visibility)
+#define GTEST_API_ __attribute__((visibility("default")))
 #endif  // _MSC_VER
 
 #endif  // GTEST_API_
 
 #ifndef GTEST_API_
-# define GTEST_API_
+#define GTEST_API_
 #endif  // GTEST_API_
 
 #ifndef GTEST_DEFAULT_DEATH_TEST_STYLE
-# define GTEST_DEFAULT_DEATH_TEST_STYLE  "fast"
+#define GTEST_DEFAULT_DEATH_TEST_STYLE "fast"
 #endif  // GTEST_DEFAULT_DEATH_TEST_STYLE
 
-#ifdef __GNUC__
+#if GTEST_HAVE_ATTRIBUTE_(noinline)
 // Ask the compiler to never inline a given function.
-# define GTEST_NO_INLINE_ __attribute__((noinline))
+#define GTEST_NO_INLINE_ __attribute__((noinline))
+#else
+#define GTEST_NO_INLINE_
+#endif
+
+#if GTEST_HAVE_ATTRIBUTE_(disable_tail_calls)
+// Ask the compiler not to perform tail call optimization inside
+// the marked function.
+#define GTEST_NO_TAIL_CALL_ __attribute__((disable_tail_calls))
+#elif defined(__GNUC__) && !defined(__NVCOMPILER)
+#define GTEST_NO_TAIL_CALL_ \
+  __attribute__((optimize("no-optimize-sibling-calls")))
 #else
-# define GTEST_NO_INLINE_
+#define GTEST_NO_TAIL_CALL_
 #endif
 
 // _LIBCPP_VERSION is defined by the libc++ library from the LLVM project.
 #if !defined(GTEST_HAS_CXXABI_H_)
-# if defined(__GLIBCXX__) || (defined(_LIBCPP_VERSION) && !defined(_MSC_VER))
-#  define GTEST_HAS_CXXABI_H_ 1
-# else
-#  define GTEST_HAS_CXXABI_H_ 0
-# endif
+#if defined(__GLIBCXX__) || (defined(_LIBCPP_VERSION) && !defined(_MSC_VER))
+#define GTEST_HAS_CXXABI_H_ 1
+#else
+#define GTEST_HAS_CXXABI_H_ 0
+#endif
 #endif
 
 // A function level attribute to disable checking for use of uninitialized
 // memory when built with MemorySanitizer.
-#if defined(__clang__)
-# if __has_feature(memory_sanitizer)
-#  define GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_ \
-       __attribute__((no_sanitize_memory))
-# else
-#  define GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_
-# endif  // __has_feature(memory_sanitizer)
+#if GTEST_HAVE_ATTRIBUTE_(no_sanitize_memory)
+#define GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_ __attribute__((no_sanitize_memory))
 #else
-# define GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_
-#endif  // __clang__
+#define GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_
+#endif
 
 // A function level attribute to disable AddressSanitizer instrumentation.
-#if defined(__clang__)
-# if __has_feature(address_sanitizer)
-#  define GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_ \
-       __attribute__((no_sanitize_address))
-# else
-#  define GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
-# endif  // __has_feature(address_sanitizer)
+#if GTEST_HAVE_ATTRIBUTE_(no_sanitize_address)
+#define GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_ \
+  __attribute__((no_sanitize_address))
 #else
-# define GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
-#endif  // __clang__
+#define GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
+#endif
 
 // A function level attribute to disable HWAddressSanitizer instrumentation.
-#if defined(__clang__)
-# if __has_feature(hwaddress_sanitizer)
-#  define GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_ \
-       __attribute__((no_sanitize("hwaddress")))
-# else
-#  define GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_
-# endif  // __has_feature(hwaddress_sanitizer)
+#if GTEST_HAVE_FEATURE_(hwaddress_sanitizer) && \
+    GTEST_HAVE_ATTRIBUTE_(no_sanitize)
+#define GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_ \
+  __attribute__((no_sanitize("hwaddress")))
 #else
-# define GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_
-#endif  // __clang__
+#define GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_
+#endif
 
 // A function level attribute to disable ThreadSanitizer instrumentation.
-#if defined(__clang__)
-# if __has_feature(thread_sanitizer)
-#  define GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_ \
-       __attribute__((no_sanitize_thread))
-# else
-#  define GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_
-# endif  // __has_feature(thread_sanitizer)
+#if GTEST_HAVE_ATTRIBUTE_(no_sanitize_thread)
+#define GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_ __attribute((no_sanitize_thread))
 #else
-# define GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_
-#endif  // __clang__
+#define GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_
+#endif
 
 namespace testing {
 
@@ -863,20 +928,11 @@ using std::tuple_size;
 namespace internal {
 
 // A secret type that Google Test users don't know about.  It has no
-// definition on purpose.  Therefore it's impossible to create a
+// accessible constructors on purpose.  Therefore it's impossible to create a
 // Secret object, which is what we want.
-class Secret;
-
-// The GTEST_COMPILE_ASSERT_ is a legacy macro used to verify that a compile
-// time expression is true (in new code, use static_assert instead). For
-// example, you could use it to verify the size of a static array:
-//
-//   GTEST_COMPILE_ASSERT_(GTEST_ARRAY_SIZE_(names) == NUM_NAMES,
-//                         names_incorrect_size);
-//
-// The second argument to the macro must be a valid C++ identifier. If the
-// expression is false, compiler will issue an error containing this identifier.
-#define GTEST_COMPILE_ASSERT_(expr, msg) static_assert(expr, #msg)
+class Secret {
+  Secret(const Secret&) = delete;
+};
 
 // A helper for suppressing warnings on constant condition.  It just
 // returns 'condition'.
@@ -884,9 +940,34 @@ GTEST_API_ bool IsTrue(bool condition);
 
 // Defines RE.
 
-#if GTEST_USES_PCRE
-// if used, PCRE is injected by custom/gtest-port.h
-#elif GTEST_USES_POSIX_RE || GTEST_USES_SIMPLE_RE
+#ifdef GTEST_USES_RE2
+
+// This is almost `using RE = ::RE2`, except it is copy-constructible, and it
+// needs to disambiguate the `std::string`, `absl::string_view`, and `const
+// char*` constructors.
+class GTEST_API_ RE {
+ public:
+  RE(absl::string_view regex) : regex_(regex) {}                  // NOLINT
+  RE(const char* regex) : RE(absl::string_view(regex)) {}         // NOLINT
+  RE(const std::string& regex) : RE(absl::string_view(regex)) {}  // NOLINT
+  RE(const RE& other) : RE(other.pattern()) {}
+
+  const std::string& pattern() const { return regex_.pattern(); }
+
+  static bool FullMatch(absl::string_view str, const RE& re) {
+    return RE2::FullMatch(str, re.regex_);
+  }
+  static bool PartialMatch(absl::string_view str, const RE& re) {
+    return RE2::PartialMatch(str, re.regex_);
+  }
+
+ private:
+  RE2 regex_;
+};
+
+#elif defined(GTEST_USES_POSIX_RE) || defined(GTEST_USES_SIMPLE_RE)
+GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
+/* class A needs to have dll-interface to be used by clients of class B */)
 
 // A simple C++ wrapper for <regex.h>.  It uses the POSIX Extended
 // Regular Expression syntax.
@@ -903,7 +984,7 @@ class GTEST_API_ RE {
   ~RE();
 
   // Returns the string representation of the regex.
-  const char* pattern() const { return pattern_; }
+  const char* pattern() const { return pattern_.c_str(); }
 
   // FullMatch(str, re) returns true if and only if regular expression re
   // matches the entire str.
@@ -921,22 +1002,22 @@ class GTEST_API_ RE {
 
  private:
   void Init(const char* regex);
-  const char* pattern_;
+  std::string pattern_;
   bool is_valid_;
 
-# if GTEST_USES_POSIX_RE
+#ifdef GTEST_USES_POSIX_RE
 
   regex_t full_regex_;     // For FullMatch().
   regex_t partial_regex_;  // For PartialMatch().
 
-# else  // GTEST_USES_SIMPLE_RE
+#else  // GTEST_USES_SIMPLE_RE
 
-  const char* full_pattern_;  // For FullMatch();
+  std::string full_pattern_;  // For FullMatch();
 
-# endif
+#endif
 };
-
-#endif  // GTEST_USES_PCRE
+GTEST_DISABLE_MSC_WARNINGS_POP_()  // 4251
+#endif  // ::testing::internal::RE implementation
 
 // Formats a source file path and a line number as they would appear
 // in an error message from the compiler used to compile this code.
@@ -954,12 +1035,7 @@ GTEST_API_ ::std::string FormatCompilerIndependentFileLocation(const char* file,
 //   LogToStderr()  - directs all log messages to stderr.
 //   FlushInfoLog() - flushes informational log messages.
 
-enum GTestLogSeverity {
-  GTEST_INFO,
-  GTEST_WARNING,
-  GTEST_ERROR,
-  GTEST_FATAL
-};
+enum GTestLogSeverity { GTEST_INFO, GTEST_WARNING, GTEST_ERROR, GTEST_FATAL };
 
 // Formats log entry severity, provides a stream object for streaming the
 // log message, and terminates the message with a newline when going out of
@@ -976,14 +1052,16 @@ class GTEST_API_ GTestLog {
  private:
   const GTestLogSeverity severity_;
 
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(GTestLog);
+  GTestLog(const GTestLog&) = delete;
+  GTestLog& operator=(const GTestLog&) = delete;
 };
 
 #if !defined(GTEST_LOG_)
 
-# define GTEST_LOG_(severity) \
-    ::testing::internal::GTestLog(::testing::internal::GTEST_##severity, \
-                                  __FILE__, __LINE__).GetStream()
+#define GTEST_LOG_(severity)                                           \
+  ::testing::internal::GTestLog(::testing::internal::GTEST_##severity, \
+                                __FILE__, __LINE__)                    \
+      .GetStream()
 
 inline void LogToStderr() {}
 inline void FlushInfoLog() { fflush(nullptr); }
@@ -995,7 +1073,7 @@ inline void FlushInfoLog() { fflush(nullptr); }
 //
 // GTEST_CHECK_ is an all-mode assert. It aborts the program if the condition
 // is not satisfied.
-//  Synopsys:
+//  Synopsis:
 //    GTEST_CHECK_(boolean_condition);
 //     or
 //    GTEST_CHECK_(boolean_condition) << "Additional message";
@@ -1005,12 +1083,12 @@ inline void FlushInfoLog() { fflush(nullptr); }
 //    condition itself, plus additional message streamed into it, if any,
 //    and then it aborts the program. It aborts the program irrespective of
 //    whether it is built in the debug mode or not.
-# define GTEST_CHECK_(condition) \
-    GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
-    if (::testing::internal::IsTrue(condition)) \
-      ; \
-    else \
-      GTEST_LOG_(FATAL) << "Condition " #condition " failed. "
+#define GTEST_CHECK_(condition)               \
+  GTEST_AMBIGUOUS_ELSE_BLOCKER_               \
+  if (::testing::internal::IsTrue(condition)) \
+    ;                                         \
+  else                                        \
+    GTEST_LOG_(FATAL) << "Condition " #condition " failed. "
 #endif  // !defined(GTEST_CHECK_)
 
 // An all-mode assert to verify that the given POSIX-style function
@@ -1019,9 +1097,8 @@ inline void FlushInfoLog() { fflush(nullptr); }
 // in {} if you need to use it as the only statement in an 'if'
 // branch.
 #define GTEST_CHECK_POSIX_SUCCESS_(posix_call) \
-  if (const int gtest_error = (posix_call)) \
-    GTEST_LOG_(FATAL) << #posix_call << "failed with error " \
-                      << gtest_error
+  if (const int gtest_error = (posix_call))    \
+  GTEST_LOG_(FATAL) << #posix_call << "failed with error " << gtest_error
 
 // Transforms "T" into "const T&" according to standard reference collapsing
 // rules (this is only needed as a backport for C++98 compilers that do not
@@ -1035,9 +1112,13 @@ inline void FlushInfoLog() { fflush(nullptr); }
 // Note that the non-const reference will not have "const" added. This is
 // standard, and necessary so that "T" can always bind to "const T&".
 template <typename T>
-struct ConstRef { typedef const T& type; };
+struct ConstRef {
+  typedef const T& type;
+};
 template <typename T>
-struct ConstRef<T&> { typedef T& type; };
+struct ConstRef<T&> {
+  typedef T& type;
+};
 
 // The argument T must depend on some template parameters.
 #define GTEST_REFERENCE_TO_CONST_(T) \
@@ -1050,7 +1131,7 @@ struct ConstRef<T&> { typedef T& type; };
 // const Foo*).  When you use ImplicitCast_, the compiler checks that
 // the cast is safe.  Such explicit ImplicitCast_s are necessary in
 // surprisingly many situations where C++ demands an exact type match
-// instead of an argument type convertable to a target type.
+// instead of an argument type convertible to a target type.
 //
 // The syntax for using ImplicitCast_ is the same as for static_cast:
 //
@@ -1063,48 +1144,9 @@ struct ConstRef<T&> { typedef T& type; };
 // This relatively ugly name is intentional. It prevents clashes with
 // similar functions users may have (e.g., implicit_cast). The internal
 // namespace alone is not enough because the function can be found by ADL.
-template<typename To>
-inline To ImplicitCast_(To x) { return x; }
-
-// When you upcast (that is, cast a pointer from type Foo to type
-// SuperclassOfFoo), it's fine to use ImplicitCast_<>, since upcasts
-// always succeed.  When you downcast (that is, cast a pointer from
-// type Foo to type SubclassOfFoo), static_cast<> isn't safe, because
-// how do you know the pointer is really of type SubclassOfFoo?  It
-// could be a bare Foo, or of type DifferentSubclassOfFoo.  Thus,
-// when you downcast, you should use this macro.  In debug mode, we
-// use dynamic_cast<> to double-check the downcast is legal (we die
-// if it's not).  In normal mode, we do the efficient static_cast<>
-// instead.  Thus, it's important to test in debug mode to make sure
-// the cast is legal!
-//    This is the only place in the code we should use dynamic_cast<>.
-// In particular, you SHOULDN'T be using dynamic_cast<> in order to
-// do RTTI (eg code like this:
-//    if (dynamic_cast<Subclass1>(foo)) HandleASubclass1Object(foo);
-//    if (dynamic_cast<Subclass2>(foo)) HandleASubclass2Object(foo);
-// You should design the code some other way not to need this.
-//
-// This relatively ugly name is intentional. It prevents clashes with
-// similar functions users may have (e.g., down_cast). The internal
-// namespace alone is not enough because the function can be found by ADL.
-template<typename To, typename From>  // use like this: DownCast_<T*>(foo);
-inline To DownCast_(From* f) {  // so we only accept pointers
-  // Ensures that To is a sub-type of From *.  This test is here only
-  // for compile-time type checking, and has no overhead in an
-  // optimized build at run-time, as it will be optimized away
-  // completely.
-  GTEST_INTENTIONAL_CONST_COND_PUSH_()
-  if (false) {
-  GTEST_INTENTIONAL_CONST_COND_POP_()
-  const To to = nullptr;
-  ::testing::internal::ImplicitCast_<From*>(to);
-  }
-
-#if GTEST_HAS_RTTI
-  // RTTI: debug mode only!
-  GTEST_CHECK_(f == nullptr || dynamic_cast<To>(f) != nullptr);
-#endif
-  return static_cast<To>(f);
+template <typename To>
+inline To ImplicitCast_(To x) {
+  return x;
 }
 
 // Downcasts the pointer of type Base to Derived.
@@ -1114,17 +1156,12 @@ inline To DownCast_(From* f) {  // so we only accept pointers
 // check to enforce this.
 template <class Derived, class Base>
 Derived* CheckedDowncastToActualType(Base* base) {
+  static_assert(std::is_base_of<Base, Derived>::value,
+                "target type not derived from source type");
 #if GTEST_HAS_RTTI
-  GTEST_CHECK_(typeid(*base) == typeid(Derived));
-#endif
-
-#if GTEST_HAS_DOWNCAST_
-  return ::down_cast<Derived*>(base);
-#elif GTEST_HAS_RTTI
-  return dynamic_cast<Derived*>(base);  // NOLINT
-#else
-  return static_cast<Derived*>(base);  // Poor man's downcast.
+  GTEST_CHECK_(base == nullptr || dynamic_cast<Derived*>(base) != nullptr);
 #endif
+  return static_cast<Derived*>(base);
 }
 
 #if GTEST_HAS_STREAM_REDIRECTION
@@ -1150,7 +1187,7 @@ GTEST_API_ std::string ReadEntireFile(FILE* file);
 // All command line arguments.
 GTEST_API_ std::vector<std::string> GetArgvs();
 
-#if GTEST_HAS_DEATH_TEST
+#ifdef GTEST_HAS_DEATH_TEST
 
 std::vector<std::string> GetInjectableArgvs();
 // Deprecated: pass the args vector by value instead.
@@ -1161,72 +1198,9 @@ void ClearInjectableArgvs();
 #endif  // GTEST_HAS_DEATH_TEST
 
 // Defines synchronization primitives.
-#if GTEST_IS_THREADSAFE
-# if GTEST_HAS_PTHREAD
-// Sleeps for (roughly) n milliseconds.  This function is only for testing
-// Google Test's own constructs.  Don't use it in user tests, either
-// directly or indirectly.
-inline void SleepMilliseconds(int n) {
-  const timespec time = {
-    0,                  // 0 seconds.
-    n * 1000L * 1000L,  // And n ms.
-  };
-  nanosleep(&time, nullptr);
-}
-# endif  // GTEST_HAS_PTHREAD
-
-# if GTEST_HAS_NOTIFICATION_
-// Notification has already been imported into the namespace.
-// Nothing to do here.
-
-# elif GTEST_HAS_PTHREAD
-// Allows a controller thread to pause execution of newly created
-// threads until notified.  Instances of this class must be created
-// and destroyed in the controller thread.
-//
-// This class is only for testing Google Test's own constructs. Do not
-// use it in user tests, either directly or indirectly.
-class Notification {
- public:
-  Notification() : notified_(false) {
-    GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_init(&mutex_, nullptr));
-  }
-  ~Notification() {
-    pthread_mutex_destroy(&mutex_);
-  }
-
-  // Notifies all threads created with this notification to start. Must
-  // be called from the controller thread.
-  void Notify() {
-    pthread_mutex_lock(&mutex_);
-    notified_ = true;
-    pthread_mutex_unlock(&mutex_);
-  }
-
-  // Blocks until the controller thread notifies. Must be called from a test
-  // thread.
-  void WaitForNotification() {
-    for (;;) {
-      pthread_mutex_lock(&mutex_);
-      const bool notified = notified_;
-      pthread_mutex_unlock(&mutex_);
-      if (notified)
-        break;
-      SleepMilliseconds(10);
-    }
-  }
-
- private:
-  pthread_mutex_t mutex_;
-  bool notified_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(Notification);
-};
-
-# elif GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT
-
-GTEST_API_ void SleepMilliseconds(int n);
+#ifdef GTEST_IS_THREADSAFE
 
+#ifdef GTEST_OS_WINDOWS
 // Provides leak-safe Windows kernel handle ownership.
 // Used in death tests and in threading support.
 class GTEST_API_ AutoHandle {
@@ -1253,8 +1227,18 @@ class GTEST_API_ AutoHandle {
 
   Handle handle_;
 
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(AutoHandle);
+  AutoHandle(const AutoHandle&) = delete;
+  AutoHandle& operator=(const AutoHandle&) = delete;
 };
+#endif
+
+#if GTEST_HAS_NOTIFICATION_
+// Notification has already been imported into the namespace.
+// Nothing to do here.
+
+#else
+GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
+/* class A needs to have dll-interface to be used by clients of class B */)
 
 // Allows a controller thread to pause execution of newly created
 // threads until notified.  Instances of this class must be created
@@ -1262,23 +1246,40 @@ class GTEST_API_ AutoHandle {
 //
 // This class is only for testing Google Test's own constructs. Do not
 // use it in user tests, either directly or indirectly.
+// TODO(b/203539622): Replace unconditionally with absl::Notification.
 class GTEST_API_ Notification {
  public:
-  Notification();
-  void Notify();
-  void WaitForNotification();
+  Notification() : notified_(false) {}
+  Notification(const Notification&) = delete;
+  Notification& operator=(const Notification&) = delete;
 
- private:
-  AutoHandle event_;
+  // Notifies all threads created with this notification to start. Must
+  // be called from the controller thread.
+  void Notify() {
+    std::lock_guard<std::mutex> lock(mu_);
+    notified_ = true;
+    cv_.notify_all();
+  }
 
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(Notification);
+  // Blocks until the controller thread notifies. Must be called from a test
+  // thread.
+  void WaitForNotification() {
+    std::unique_lock<std::mutex> lock(mu_);
+    cv_.wait(lock, [this]() { return notified_; });
+  }
+
+ private:
+  std::mutex mu_;
+  std::condition_variable cv_;
+  bool notified_;
 };
-# endif  // GTEST_HAS_NOTIFICATION_
+GTEST_DISABLE_MSC_WARNINGS_POP_()  // 4251
+#endif  // GTEST_HAS_NOTIFICATION_
 
 // On MinGW, we can have both GTEST_OS_WINDOWS and GTEST_HAS_PTHREAD
 // defined, but we don't want to use MinGW's pthreads implementation, which
 // has conformance problems with some versions of the POSIX standard.
-# if GTEST_HAS_PTHREAD && !GTEST_OS_WINDOWS_MINGW
+#if GTEST_HAS_PTHREAD && !defined(GTEST_OS_WINDOWS_MINGW)
 
 // As a C-function, ThreadFuncWithCLinkage cannot be templated itself.
 // Consequently, it cannot select a correct instantiation of ThreadWithParam
@@ -1287,7 +1288,7 @@ class GTEST_API_ Notification {
 // problem.
 class ThreadWithParamBase {
  public:
-  virtual ~ThreadWithParamBase() {}
+  virtual ~ThreadWithParamBase() = default;
   virtual void Run() = 0;
 };
 
@@ -1354,16 +1355,18 @@ class ThreadWithParam : public ThreadWithParamBase {
                    // finished.
   pthread_t thread_;  // The native thread object.
 
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadWithParam);
+  ThreadWithParam(const ThreadWithParam&) = delete;
+  ThreadWithParam& operator=(const ThreadWithParam&) = delete;
 };
-# endif  // !GTEST_OS_WINDOWS && GTEST_HAS_PTHREAD ||
-         // GTEST_HAS_MUTEX_AND_THREAD_LOCAL_
+#endif  // !GTEST_OS_WINDOWS && GTEST_HAS_PTHREAD ||
+        // GTEST_HAS_MUTEX_AND_THREAD_LOCAL_
 
-# if GTEST_HAS_MUTEX_AND_THREAD_LOCAL_
+#if GTEST_HAS_MUTEX_AND_THREAD_LOCAL_
 // Mutex and ThreadLocal have already been imported into the namespace.
 // Nothing to do here.
 
-# elif GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT
+#elif defined(GTEST_OS_WINDOWS) && !defined(GTEST_OS_WINDOWS_PHONE) && \
+    !defined(GTEST_OS_WINDOWS_RT)
 
 // Mutex implements mutex on Windows platforms.  It is used in conjunction
 // with class MutexLock:
@@ -1417,14 +1420,15 @@ class GTEST_API_ Mutex {
   long critical_section_init_phase_;  // NOLINT
   GTEST_CRITICAL_SECTION* critical_section_;
 
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(Mutex);
+  Mutex(const Mutex&) = delete;
+  Mutex& operator=(const Mutex&) = delete;
 };
 
-# define GTEST_DECLARE_STATIC_MUTEX_(mutex) \
-    extern ::testing::internal::Mutex mutex
+#define GTEST_DECLARE_STATIC_MUTEX_(mutex) \
+  extern ::testing::internal::Mutex mutex
 
-# define GTEST_DEFINE_STATIC_MUTEX_(mutex) \
-    ::testing::internal::Mutex mutex(::testing::internal::Mutex::kStaticMutex)
+#define GTEST_DEFINE_STATIC_MUTEX_(mutex) \
+  ::testing::internal::Mutex mutex(::testing::internal::Mutex::kStaticMutex)
 
 // We cannot name this class MutexLock because the ctor declaration would
 // conflict with a macro named MutexLock, which is defined on some
@@ -1433,15 +1437,15 @@ class GTEST_API_ Mutex {
 // "MutexLock l(&mu)".  Hence the typedef trick below.
 class GTestMutexLock {
  public:
-  explicit GTestMutexLock(Mutex* mutex)
-      : mutex_(mutex) { mutex_->Lock(); }
+  explicit GTestMutexLock(Mutex* mutex) : mutex_(mutex) { mutex_->Lock(); }
 
   ~GTestMutexLock() { mutex_->Unlock(); }
 
  private:
   Mutex* const mutex_;
 
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(GTestMutexLock);
+  GTestMutexLock(const GTestMutexLock&) = delete;
+  GTestMutexLock& operator=(const GTestMutexLock&) = delete;
 };
 
 typedef GTestMutexLock MutexLock;
@@ -1468,7 +1472,8 @@ class ThreadLocalBase {
   virtual ~ThreadLocalBase() {}
 
  private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadLocalBase);
+  ThreadLocalBase(const ThreadLocalBase&) = delete;
+  ThreadLocalBase& operator=(const ThreadLocalBase&) = delete;
 };
 
 // Maps a thread to a set of ThreadLocals that have values instantiated on that
@@ -1497,7 +1502,7 @@ class GTEST_API_ ThreadWithParamBase {
     virtual void Run() = 0;
   };
 
-  ThreadWithParamBase(Runnable *runnable, Notification* thread_can_start);
+  ThreadWithParamBase(Runnable* runnable, Notification* thread_can_start);
   virtual ~ThreadWithParamBase();
 
  private:
@@ -1511,30 +1516,26 @@ class ThreadWithParam : public ThreadWithParamBase {
   typedef void UserThreadFunc(T);
 
   ThreadWithParam(UserThreadFunc* func, T param, Notification* thread_can_start)
-      : ThreadWithParamBase(new RunnableImpl(func, param), thread_can_start) {
-  }
+      : ThreadWithParamBase(new RunnableImpl(func, param), thread_can_start) {}
   virtual ~ThreadWithParam() {}
 
  private:
   class RunnableImpl : public Runnable {
    public:
-    RunnableImpl(UserThreadFunc* func, T param)
-        : func_(func),
-          param_(param) {
-    }
+    RunnableImpl(UserThreadFunc* func, T param) : func_(func), param_(param) {}
     virtual ~RunnableImpl() {}
-    virtual void Run() {
-      func_(param_);
-    }
+    virtual void Run() { func_(param_); }
 
    private:
     UserThreadFunc* const func_;
     const T param_;
 
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(RunnableImpl);
+    RunnableImpl(const RunnableImpl&) = delete;
+    RunnableImpl& operator=(const RunnableImpl&) = delete;
   };
 
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadWithParam);
+  ThreadWithParam(const ThreadWithParam&) = delete;
+  ThreadWithParam& operator=(const ThreadWithParam&) = delete;
 };
 
 // Implements thread-local storage on Windows systems.
@@ -1571,7 +1572,7 @@ class ThreadLocal : public ThreadLocalBase {
   explicit ThreadLocal(const T& value)
       : default_factory_(new InstanceValueHolderFactory(value)) {}
 
-  ~ThreadLocal() { ThreadLocalRegistry::OnThreadLocalDestroyed(this); }
+  ~ThreadLocal() override { ThreadLocalRegistry::OnThreadLocalDestroyed(this); }
 
   T* pointer() { return GetOrCreateValue(); }
   const T* pointer() const { return GetOrCreateValue(); }
@@ -1590,16 +1591,17 @@ class ThreadLocal : public ThreadLocalBase {
 
    private:
     T value_;
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(ValueHolder);
+    ValueHolder(const ValueHolder&) = delete;
+    ValueHolder& operator=(const ValueHolder&) = delete;
   };
 
-
   T* GetOrCreateValue() const {
     return static_cast<ValueHolder*>(
-        ThreadLocalRegistry::GetValueOnCurrentThread(this))->pointer();
+               ThreadLocalRegistry::GetValueOnCurrentThread(this))
+        ->pointer();
   }
 
-  virtual ThreadLocalValueHolderBase* NewValueForCurrentThread() const {
+  ThreadLocalValueHolderBase* NewValueForCurrentThread() const override {
     return default_factory_->MakeNewHolder();
   }
 
@@ -1610,7 +1612,8 @@ class ThreadLocal : public ThreadLocalBase {
     virtual ValueHolder* MakeNewHolder() const = 0;
 
    private:
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(ValueHolderFactory);
+    ValueHolderFactory(const ValueHolderFactory&) = delete;
+    ValueHolderFactory& operator=(const ValueHolderFactory&) = delete;
   };
 
   class DefaultValueHolderFactory : public ValueHolderFactory {
@@ -1619,7 +1622,9 @@ class ThreadLocal : public ThreadLocalBase {
     ValueHolder* MakeNewHolder() const override { return new ValueHolder(); }
 
    private:
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(DefaultValueHolderFactory);
+    DefaultValueHolderFactory(const DefaultValueHolderFactory&) = delete;
+    DefaultValueHolderFactory& operator=(const DefaultValueHolderFactory&) =
+        delete;
   };
 
   class InstanceValueHolderFactory : public ValueHolderFactory {
@@ -1632,15 +1637,18 @@ class ThreadLocal : public ThreadLocalBase {
    private:
     const T value_;  // The value for each thread.
 
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(InstanceValueHolderFactory);
+    InstanceValueHolderFactory(const InstanceValueHolderFactory&) = delete;
+    InstanceValueHolderFactory& operator=(const InstanceValueHolderFactory&) =
+        delete;
   };
 
   std::unique_ptr<ValueHolderFactory> default_factory_;
 
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadLocal);
+  ThreadLocal(const ThreadLocal&) = delete;
+  ThreadLocal& operator=(const ThreadLocal&) = delete;
 };
 
-# elif GTEST_HAS_PTHREAD
+#elif GTEST_HAS_PTHREAD
 
 // MutexBase and Mutex implement mutex on pthreads-based platforms.
 class MutexBase {
@@ -1687,8 +1695,8 @@ class MutexBase {
 };
 
 // Forward-declares a static mutex.
-#  define GTEST_DECLARE_STATIC_MUTEX_(mutex) \
-     extern ::testing::internal::MutexBase mutex
+#define GTEST_DECLARE_STATIC_MUTEX_(mutex) \
+  extern ::testing::internal::MutexBase mutex
 
 // Defines and statically (i.e. at link time) initializes a static mutex.
 // The initialization list here does not explicitly initialize each field,
@@ -1707,12 +1715,11 @@ class Mutex : public MutexBase {
     GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_init(&mutex_, nullptr));
     has_owner_ = false;
   }
-  ~Mutex() {
-    GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_destroy(&mutex_));
-  }
+  ~Mutex() { GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_destroy(&mutex_)); }
 
  private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(Mutex);
+  Mutex(const Mutex&) = delete;
+  Mutex& operator=(const Mutex&) = delete;
 };
 
 // We cannot name this class MutexLock because the ctor declaration would
@@ -1722,15 +1729,15 @@ class Mutex : public MutexBase {
 // "MutexLock l(&mu)".  Hence the typedef trick below.
 class GTestMutexLock {
  public:
-  explicit GTestMutexLock(MutexBase* mutex)
-      : mutex_(mutex) { mutex_->Lock(); }
+  explicit GTestMutexLock(MutexBase* mutex) : mutex_(mutex) { mutex_->Lock(); }
 
   ~GTestMutexLock() { mutex_->Unlock(); }
 
  private:
   MutexBase* const mutex_;
 
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(GTestMutexLock);
+  GTestMutexLock(const GTestMutexLock&) = delete;
+  GTestMutexLock& operator=(const GTestMutexLock&) = delete;
 };
 
 typedef GTestMutexLock MutexLock;
@@ -1741,9 +1748,9 @@ typedef GTestMutexLock MutexLock;
 // C-linkage.  Therefore it cannot be templatized to access
 // ThreadLocal<T>.  Hence the need for class
 // ThreadLocalValueHolderBase.
-class ThreadLocalValueHolderBase {
+class GTEST_API_ ThreadLocalValueHolderBase {
  public:
-  virtual ~ThreadLocalValueHolderBase() {}
+  virtual ~ThreadLocalValueHolderBase() = default;
 };
 
 // Called by pthread to delete thread-local data stored by
@@ -1787,7 +1794,8 @@ class GTEST_API_ ThreadLocal {
 
    private:
     T value_;
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(ValueHolder);
+    ValueHolder(const ValueHolder&) = delete;
+    ValueHolder& operator=(const ValueHolder&) = delete;
   };
 
   static pthread_key_t CreateKey() {
@@ -1814,21 +1822,24 @@ class GTEST_API_ ThreadLocal {
 
   class ValueHolderFactory {
    public:
-    ValueHolderFactory() {}
-    virtual ~ValueHolderFactory() {}
+    ValueHolderFactory() = default;
+    virtual ~ValueHolderFactory() = default;
     virtual ValueHolder* MakeNewHolder() const = 0;
 
    private:
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(ValueHolderFactory);
+    ValueHolderFactory(const ValueHolderFactory&) = delete;
+    ValueHolderFactory& operator=(const ValueHolderFactory&) = delete;
   };
 
   class DefaultValueHolderFactory : public ValueHolderFactory {
    public:
-    DefaultValueHolderFactory() {}
+    DefaultValueHolderFactory() = default;
     ValueHolder* MakeNewHolder() const override { return new ValueHolder(); }
 
    private:
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(DefaultValueHolderFactory);
+    DefaultValueHolderFactory(const DefaultValueHolderFactory&) = delete;
+    DefaultValueHolderFactory& operator=(const DefaultValueHolderFactory&) =
+        delete;
   };
 
   class InstanceValueHolderFactory : public ValueHolderFactory {
@@ -1841,17 +1852,20 @@ class GTEST_API_ ThreadLocal {
    private:
     const T value_;  // The value for each thread.
 
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(InstanceValueHolderFactory);
+    InstanceValueHolderFactory(const InstanceValueHolderFactory&) = delete;
+    InstanceValueHolderFactory& operator=(const InstanceValueHolderFactory&) =
+        delete;
   };
 
   // A key pthreads uses for looking up per-thread values.
   const pthread_key_t key_;
   std::unique_ptr<ValueHolderFactory> default_factory_;
 
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadLocal);
+  ThreadLocal(const ThreadLocal&) = delete;
+  ThreadLocal& operator=(const ThreadLocal&) = delete;
 };
 
-# endif  // GTEST_HAS_MUTEX_AND_THREAD_LOCAL_
+#endif  // GTEST_HAS_MUTEX_AND_THREAD_LOCAL_
 
 #else  // GTEST_IS_THREADSAFE
 
@@ -1868,10 +1882,10 @@ class Mutex {
   void AssertHeld() const {}
 };
 
-# define GTEST_DECLARE_STATIC_MUTEX_(mutex) \
+#define GTEST_DECLARE_STATIC_MUTEX_(mutex) \
   extern ::testing::internal::Mutex mutex
 
-# define GTEST_DEFINE_STATIC_MUTEX_(mutex) ::testing::internal::Mutex mutex
+#define GTEST_DEFINE_STATIC_MUTEX_(mutex) ::testing::internal::Mutex mutex
 
 // We cannot name this class MutexLock because the ctor declaration would
 // conflict with a macro named MutexLock, which is defined on some
@@ -1894,6 +1908,7 @@ class GTEST_API_ ThreadLocal {
   const T* pointer() const { return &value_; }
   const T& get() const { return value_; }
   void set(const T& value) { value_ = value; }
+
  private:
   T value_;
 };
@@ -1904,12 +1919,12 @@ class GTEST_API_ ThreadLocal {
 // we cannot detect it.
 GTEST_API_ size_t GetThreadCount();
 
-#if GTEST_OS_WINDOWS
-# define GTEST_PATH_SEP_ "\\"
-# define GTEST_HAS_ALT_PATH_SEP_ 1
+#ifdef GTEST_OS_WINDOWS
+#define GTEST_PATH_SEP_ "\\"
+#define GTEST_HAS_ALT_PATH_SEP_ 1
 #else
-# define GTEST_PATH_SEP_ "/"
-# define GTEST_HAS_ALT_PATH_SEP_ 0
+#define GTEST_PATH_SEP_ "/"
+#define GTEST_HAS_ALT_PATH_SEP_ 0
 #endif  // GTEST_OS_WINDOWS
 
 // Utilities for char.
@@ -1940,7 +1955,7 @@ inline bool IsUpper(char ch) {
 inline bool IsXDigit(char ch) {
   return isxdigit(static_cast<unsigned char>(ch)) != 0;
 }
-#ifdef __cpp_char8_t
+#ifdef __cpp_lib_char8_t
 inline bool IsXDigit(char8_t ch) {
   return isxdigit(static_cast<unsigned char>(ch)) != 0;
 }
@@ -1967,8 +1982,7 @@ inline char ToUpper(char ch) {
 
 inline std::string StripTrailingSpaces(std::string str) {
   std::string::iterator it = str.end();
-  while (it != str.begin() && IsSpace(*--it))
-    it = str.erase(it);
+  while (it != str.begin() && IsSpace(*--it)) it = str.erase(it);
   return str;
 }
 
@@ -1980,72 +1994,86 @@ inline std::string StripTrailingSpaces(std::string str) {
 
 namespace posix {
 
-// Functions with a different name on Windows.
-
-#if GTEST_OS_WINDOWS
+// File system porting.
+// Note: Not every I/O-related function is related to file systems, so don't
+// just disable all of them here. For example, fileno() and isatty(), etc. must
+// always be available in order to detect if a pipe points to a terminal.
+#ifdef GTEST_OS_WINDOWS
 
 typedef struct _stat StatStruct;
 
-# ifdef __BORLANDC__
-inline int DoIsATTY(int fd) { return isatty(fd); }
-inline int StrCaseCmp(const char* s1, const char* s2) {
-  return stricmp(s1, s2);
-}
-inline char* StrDup(const char* src) { return strdup(src); }
-# else  // !__BORLANDC__
-#  if GTEST_OS_WINDOWS_MOBILE
-inline int DoIsATTY(int /* fd */) { return 0; }
-#  else
-inline int DoIsATTY(int fd) { return _isatty(fd); }
-#  endif  // GTEST_OS_WINDOWS_MOBILE
-inline int StrCaseCmp(const char* s1, const char* s2) {
-  return _stricmp(s1, s2);
-}
-inline char* StrDup(const char* src) { return _strdup(src); }
-# endif  // __BORLANDC__
-
-# if GTEST_OS_WINDOWS_MOBILE
+#ifdef GTEST_OS_WINDOWS_MOBILE
 inline int FileNo(FILE* file) { return reinterpret_cast<int>(_fileno(file)); }
 // Stat(), RmDir(), and IsDir() are not needed on Windows CE at this
 // time and thus not defined there.
-# else
+#else
 inline int FileNo(FILE* file) { return _fileno(file); }
+#if GTEST_HAS_FILE_SYSTEM
 inline int Stat(const char* path, StatStruct* buf) { return _stat(path, buf); }
 inline int RmDir(const char* dir) { return _rmdir(dir); }
-inline bool IsDir(const StatStruct& st) {
-  return (_S_IFDIR & st.st_mode) != 0;
-}
-# endif  // GTEST_OS_WINDOWS_MOBILE
+inline bool IsDir(const StatStruct& st) { return (_S_IFDIR & st.st_mode) != 0; }
+#endif
+#endif  // GTEST_OS_WINDOWS_MOBILE
 
-#elif GTEST_OS_ESP8266
+#elif defined(GTEST_OS_ESP8266)
 typedef struct stat StatStruct;
 
 inline int FileNo(FILE* file) { return fileno(file); }
-inline int DoIsATTY(int fd) { return isatty(fd); }
+#if GTEST_HAS_FILE_SYSTEM
 inline int Stat(const char* path, StatStruct* buf) {
   // stat function not implemented on ESP8266
   return 0;
 }
-inline int StrCaseCmp(const char* s1, const char* s2) {
-  return strcasecmp(s1, s2);
-}
-inline char* StrDup(const char* src) { return strdup(src); }
 inline int RmDir(const char* dir) { return rmdir(dir); }
 inline bool IsDir(const StatStruct& st) { return S_ISDIR(st.st_mode); }
+#endif
 
 #else
 
 typedef struct stat StatStruct;
 
 inline int FileNo(FILE* file) { return fileno(file); }
-inline int DoIsATTY(int fd) { return isatty(fd); }
+#if GTEST_HAS_FILE_SYSTEM
 inline int Stat(const char* path, StatStruct* buf) { return stat(path, buf); }
+#ifdef GTEST_OS_QURT
+// QuRT doesn't support any directory functions, including rmdir
+inline int RmDir(const char*) { return 0; }
+#else
+inline int RmDir(const char* dir) { return rmdir(dir); }
+#endif
+inline bool IsDir(const StatStruct& st) { return S_ISDIR(st.st_mode); }
+#endif
+
+#endif  // GTEST_OS_WINDOWS
+
+// Other functions with a different name on Windows.
+
+#ifdef GTEST_OS_WINDOWS
+
+#ifdef __BORLANDC__
+inline int DoIsATTY(int fd) { return isatty(fd); }
+inline int StrCaseCmp(const char* s1, const char* s2) {
+  return stricmp(s1, s2);
+}
+#else  // !__BORLANDC__
+#if defined(GTEST_OS_WINDOWS_MOBILE) || defined(GTEST_OS_ZOS) || \
+    defined(GTEST_OS_IOS) || defined(GTEST_OS_WINDOWS_PHONE) ||  \
+    defined(GTEST_OS_WINDOWS_RT) || defined(ESP_PLATFORM)
+inline int DoIsATTY(int /* fd */) { return 0; }
+#else
+inline int DoIsATTY(int fd) { return _isatty(fd); }
+#endif  // GTEST_OS_WINDOWS_MOBILE
+inline int StrCaseCmp(const char* s1, const char* s2) {
+  return _stricmp(s1, s2);
+}
+#endif  // __BORLANDC__
+
+#else
+
+inline int DoIsATTY(int fd) { return isatty(fd); }
 inline int StrCaseCmp(const char* s1, const char* s2) {
   return strcasecmp(s1, s2);
 }
-inline char* StrDup(const char* src) { return strdup(src); }
-inline int RmDir(const char* dir) { return rmdir(dir); }
-inline bool IsDir(const StatStruct& st) { return S_ISDIR(st.st_mode); }
 
 #endif  // GTEST_OS_WINDOWS
 
@@ -2067,30 +2095,32 @@ GTEST_DISABLE_MSC_DEPRECATED_PUSH_()
 // ChDir(), FReopen(), FDOpen(), Read(), Write(), Close(), and
 // StrError() aren't needed on Windows CE at this time and thus not
 // defined there.
-
-#if !GTEST_OS_WINDOWS_MOBILE && !GTEST_OS_WINDOWS_PHONE && \
-    !GTEST_OS_WINDOWS_RT && !GTEST_OS_ESP8266 && !GTEST_OS_XTENSA
+#if GTEST_HAS_FILE_SYSTEM
+#if !defined(GTEST_OS_WINDOWS_MOBILE) && !defined(GTEST_OS_WINDOWS_PHONE) && \
+    !defined(GTEST_OS_WINDOWS_RT) && !defined(GTEST_OS_WINDOWS_GAMES) &&     \
+    !defined(GTEST_OS_ESP8266) && !defined(GTEST_OS_XTENSA) &&               \
+    !defined(GTEST_OS_QURT)
 inline int ChDir(const char* dir) { return chdir(dir); }
 #endif
 inline FILE* FOpen(const char* path, const char* mode) {
-#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MINGW
+#if defined(GTEST_OS_WINDOWS) && !defined(GTEST_OS_WINDOWS_MINGW)
   struct wchar_codecvt : public std::codecvt<wchar_t, char, std::mbstate_t> {};
   std::wstring_convert<wchar_codecvt> converter;
   std::wstring wide_path = converter.from_bytes(path);
   std::wstring wide_mode = converter.from_bytes(mode);
   return _wfopen(wide_path.c_str(), wide_mode.c_str());
-#else  // GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MINGW
+#else   // GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MINGW
   return fopen(path, mode);
 #endif  // GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MINGW
 }
-#if !GTEST_OS_WINDOWS_MOBILE
-inline FILE *FReopen(const char* path, const char* mode, FILE* stream) {
+#if !defined(GTEST_OS_WINDOWS_MOBILE) && !defined(GTEST_OS_QURT)
+inline FILE* FReopen(const char* path, const char* mode, FILE* stream) {
   return freopen(path, mode, stream);
 }
 inline FILE* FDOpen(int fd, const char* mode) { return fdopen(fd, mode); }
-#endif
+#endif  // !GTEST_OS_WINDOWS_MOBILE && !GTEST_OS_QURT
 inline int FClose(FILE* fp) { return fclose(fp); }
-#if !GTEST_OS_WINDOWS_MOBILE
+#if !defined(GTEST_OS_WINDOWS_MOBILE) && !defined(GTEST_OS_QURT)
 inline int Read(int fd, void* buf, unsigned int count) {
   return static_cast<int>(read(fd, buf, count));
 }
@@ -2098,11 +2128,17 @@ inline int Write(int fd, const void* buf, unsigned int count) {
   return static_cast<int>(write(fd, buf, count));
 }
 inline int Close(int fd) { return close(fd); }
+#endif  // !GTEST_OS_WINDOWS_MOBILE && !GTEST_OS_QURT
+#endif  // GTEST_HAS_FILE_SYSTEM
+
+#if !defined(GTEST_OS_WINDOWS_MOBILE) && !defined(GTEST_OS_QURT)
 inline const char* StrError(int errnum) { return strerror(errnum); }
-#endif
+#endif  // !GTEST_OS_WINDOWS_MOBILE && !GTEST_OS_QURT
+
 inline const char* GetEnv(const char* name) {
-#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_PHONE || \
-    GTEST_OS_WINDOWS_RT || GTEST_OS_ESP8266 || GTEST_OS_XTENSA
+#if defined(GTEST_OS_WINDOWS_MOBILE) || defined(GTEST_OS_WINDOWS_PHONE) || \
+    defined(GTEST_OS_ESP8266) || defined(GTEST_OS_XTENSA) ||               \
+    defined(GTEST_OS_QURT)
   // We are on an embedded platform, which has no environment variables.
   static_cast<void>(name);  // To prevent 'unused argument' warning.
   return nullptr;
@@ -2118,7 +2154,7 @@ inline const char* GetEnv(const char* name) {
 
 GTEST_DISABLE_MSC_DEPRECATED_POP_()
 
-#if GTEST_OS_WINDOWS_MOBILE
+#ifdef GTEST_OS_WINDOWS_MOBILE
 // Windows CE has no C library. The abort() function is used in
 // several places in Google Test. This implementation provides a reasonable
 // imitation of standard behaviour.
@@ -2134,15 +2170,15 @@ GTEST_DISABLE_MSC_DEPRECATED_POP_()
 // MSVC-based platforms.  We map the GTEST_SNPRINTF_ macro to the appropriate
 // function in order to achieve that.  We use macro definition here because
 // snprintf is a variadic function.
-#if _MSC_VER && !GTEST_OS_WINDOWS_MOBILE
+#if defined(_MSC_VER) && !defined(GTEST_OS_WINDOWS_MOBILE)
 // MSVC 2005 and above support variadic macros.
-# define GTEST_SNPRINTF_(buffer, size, format, ...) \
-     _snprintf_s(buffer, size, size, format, __VA_ARGS__)
+#define GTEST_SNPRINTF_(buffer, size, format, ...) \
+  _snprintf_s(buffer, size, size, format, __VA_ARGS__)
 #elif defined(_MSC_VER)
 // Windows CE does not define _snprintf_s
-# define GTEST_SNPRINTF_ _snprintf
+#define GTEST_SNPRINTF_ _snprintf
 #else
-# define GTEST_SNPRINTF_ snprintf
+#define GTEST_SNPRINTF_ snprintf
 #endif
 
 // The biggest signed integer type the compiler supports.
@@ -2202,37 +2238,85 @@ using TimeInMillis = int64_t;  // Represents time in milliseconds.
 
 // Macro for referencing flags.
 #if !defined(GTEST_FLAG)
-# define GTEST_FLAG(name) FLAGS_gtest_##name
+#define GTEST_FLAG_NAME_(name) gtest_##name
+#define GTEST_FLAG(name) FLAGS_gtest_##name
 #endif  // !defined(GTEST_FLAG)
 
-#if !defined(GTEST_USE_OWN_FLAGFILE_FLAG_)
-# define GTEST_USE_OWN_FLAGFILE_FLAG_ 1
-#endif  // !defined(GTEST_USE_OWN_FLAGFILE_FLAG_)
+// Pick a command line flags implementation.
+#ifdef GTEST_INTERNAL_HAS_ABSL_FLAGS
 
-#if !defined(GTEST_DECLARE_bool_)
-# define GTEST_FLAG_SAVER_ ::testing::internal::GTestFlagSaver
+// Macros for defining flags.
+#define GTEST_DEFINE_bool_(name, default_val, doc) \
+  ABSL_FLAG(bool, GTEST_FLAG_NAME_(name), default_val, doc)
+#define GTEST_DEFINE_int32_(name, default_val, doc) \
+  ABSL_FLAG(int32_t, GTEST_FLAG_NAME_(name), default_val, doc)
+#define GTEST_DEFINE_string_(name, default_val, doc) \
+  ABSL_FLAG(std::string, GTEST_FLAG_NAME_(name), default_val, doc)
 
 // Macros for declaring flags.
-# define GTEST_DECLARE_bool_(name) GTEST_API_ extern bool GTEST_FLAG(name)
-# define GTEST_DECLARE_int32_(name) \
-    GTEST_API_ extern std::int32_t GTEST_FLAG(name)
-# define GTEST_DECLARE_string_(name) \
-    GTEST_API_ extern ::std::string GTEST_FLAG(name)
+#define GTEST_DECLARE_bool_(name) \
+  ABSL_DECLARE_FLAG(bool, GTEST_FLAG_NAME_(name))
+#define GTEST_DECLARE_int32_(name) \
+  ABSL_DECLARE_FLAG(int32_t, GTEST_FLAG_NAME_(name))
+#define GTEST_DECLARE_string_(name) \
+  ABSL_DECLARE_FLAG(std::string, GTEST_FLAG_NAME_(name))
+
+#define GTEST_FLAG_SAVER_ ::absl::FlagSaver
+
+#define GTEST_FLAG_GET(name) ::absl::GetFlag(GTEST_FLAG(name))
+#define GTEST_FLAG_SET(name, value) \
+  (void)(::absl::SetFlag(&GTEST_FLAG(name), value))
+#define GTEST_USE_OWN_FLAGFILE_FLAG_ 0
+
+#undef GTEST_INTERNAL_HAS_ABSL_FLAGS
+#else  // ndef GTEST_INTERNAL_HAS_ABSL_FLAGS
 
 // Macros for defining flags.
-# define GTEST_DEFINE_bool_(name, default_val, doc) \
-    GTEST_API_ bool GTEST_FLAG(name) = (default_val)
-# define GTEST_DEFINE_int32_(name, default_val, doc) \
-    GTEST_API_ std::int32_t GTEST_FLAG(name) = (default_val)
-# define GTEST_DEFINE_string_(name, default_val, doc) \
-    GTEST_API_ ::std::string GTEST_FLAG(name) = (default_val)
+#define GTEST_DEFINE_bool_(name, default_val, doc)  \
+  namespace testing {                               \
+  GTEST_API_ bool GTEST_FLAG(name) = (default_val); \
+  }                                                 \
+  static_assert(true, "no-op to require trailing semicolon")
+#define GTEST_DEFINE_int32_(name, default_val, doc)         \
+  namespace testing {                                       \
+  GTEST_API_ std::int32_t GTEST_FLAG(name) = (default_val); \
+  }                                                         \
+  static_assert(true, "no-op to require trailing semicolon")
+#define GTEST_DEFINE_string_(name, default_val, doc)         \
+  namespace testing {                                        \
+  GTEST_API_ ::std::string GTEST_FLAG(name) = (default_val); \
+  }                                                          \
+  static_assert(true, "no-op to require trailing semicolon")
 
-#endif  // !defined(GTEST_DECLARE_bool_)
+// Macros for declaring flags.
+#define GTEST_DECLARE_bool_(name)          \
+  namespace testing {                      \
+  GTEST_API_ extern bool GTEST_FLAG(name); \
+  }                                        \
+  static_assert(true, "no-op to require trailing semicolon")
+#define GTEST_DECLARE_int32_(name)                 \
+  namespace testing {                              \
+  GTEST_API_ extern std::int32_t GTEST_FLAG(name); \
+  }                                                \
+  static_assert(true, "no-op to require trailing semicolon")
+#define GTEST_DECLARE_string_(name)                 \
+  namespace testing {                               \
+  GTEST_API_ extern ::std::string GTEST_FLAG(name); \
+  }                                                 \
+  static_assert(true, "no-op to require trailing semicolon")
+
+#define GTEST_FLAG_SAVER_ ::testing::internal::GTestFlagSaver
+
+#define GTEST_FLAG_GET(name) ::testing::GTEST_FLAG(name)
+#define GTEST_FLAG_SET(name, value) (void)(::testing::GTEST_FLAG(name) = value)
+#define GTEST_USE_OWN_FLAGFILE_FLAG_ 1
+
+#endif  // GTEST_INTERNAL_HAS_ABSL_FLAGS
 
 // Thread annotations
 #if !defined(GTEST_EXCLUSIVE_LOCK_REQUIRED_)
-# define GTEST_EXCLUSIVE_LOCK_REQUIRED_(locks)
-# define GTEST_LOCK_EXCLUDED_(locks)
+#define GTEST_EXCLUSIVE_LOCK_REQUIRED_(locks)
+#define GTEST_LOCK_EXCLUDED_(locks)
 #endif  // !defined(GTEST_EXCLUSIVE_LOCK_REQUIRED_)
 
 // Parses 'str' for a 32-bit signed integer.  If successful, writes the result
@@ -2251,27 +2335,7 @@ const char* StringFromGTestEnv(const char* flag, const char* default_val);
 }  // namespace internal
 }  // namespace testing
 
-#if !defined(GTEST_INTERNAL_DEPRECATED)
-
-// Internal Macro to mark an API deprecated, for googletest usage only
-// Usage: class GTEST_INTERNAL_DEPRECATED(message) MyClass or
-// GTEST_INTERNAL_DEPRECATED(message) <return_type> myFunction(); Every usage of
-// a deprecated entity will trigger a warning when compiled with
-// `-Wdeprecated-declarations` option (clang, gcc, any __GNUC__ compiler).
-// For msvc /W3 option will need to be used
-// Note that for 'other' compilers this macro evaluates to nothing to prevent
-// compilations errors.
-#if defined(_MSC_VER)
-#define GTEST_INTERNAL_DEPRECATED(message) __declspec(deprecated(message))
-#elif defined(__GNUC__)
-#define GTEST_INTERNAL_DEPRECATED(message) __attribute__((deprecated(message)))
-#else
-#define GTEST_INTERNAL_DEPRECATED(message)
-#endif
-
-#endif  // !defined(GTEST_INTERNAL_DEPRECATED)
-
-#if GTEST_HAS_ABSL
+#ifdef GTEST_HAS_ABSL
 // Always use absl::any for UniversalPrinter<> specializations if googletest
 // is built with absl support.
 #define GTEST_INTERNAL_HAS_ANY 1
@@ -2282,8 +2346,9 @@ using Any = ::absl::any;
 }  // namespace internal
 }  // namespace testing
 #else
-#ifdef __has_include
-#if __has_include(<any>) && __cplusplus >= 201703L
+#if defined(__cpp_lib_any) || (GTEST_INTERNAL_HAS_INCLUDE(<any>) &&        \
+                               GTEST_INTERNAL_CPLUSPLUS_LANG >= 201703L && \
+                               (!defined(_MSC_VER) || GTEST_HAS_RTTI))
 // Otherwise for C++17 and higher use std::any for UniversalPrinter<>
 // specializations.
 #define GTEST_INTERNAL_HAS_ANY 1
@@ -2295,11 +2360,14 @@ using Any = ::std::any;
 }  // namespace testing
 // The case where absl is configured NOT to alias std::any is not
 // supported.
-#endif  // __has_include(<any>) && __cplusplus >= 201703L
-#endif  // __has_include
+#endif  // __cpp_lib_any
 #endif  // GTEST_HAS_ABSL
 
-#if GTEST_HAS_ABSL
+#ifndef GTEST_INTERNAL_HAS_ANY
+#define GTEST_INTERNAL_HAS_ANY 0
+#endif
+
+#ifdef GTEST_HAS_ABSL
 // Always use absl::optional for UniversalPrinter<> specializations if
 // googletest is built with absl support.
 #define GTEST_INTERNAL_HAS_OPTIONAL 1
@@ -2308,11 +2376,12 @@ namespace testing {
 namespace internal {
 template <typename T>
 using Optional = ::absl::optional<T>;
+inline ::absl::nullopt_t Nullopt() { return ::absl::nullopt; }
 }  // namespace internal
 }  // namespace testing
 #else
-#ifdef __has_include
-#if __has_include(<optional>) && __cplusplus >= 201703L
+#if defined(__cpp_lib_optional) || (GTEST_INTERNAL_HAS_INCLUDE(<optional>) && \
+                                    GTEST_INTERNAL_CPLUSPLUS_LANG >= 201703L)
 // Otherwise for C++17 and higher use std::optional for UniversalPrinter<>
 // specializations.
 #define GTEST_INTERNAL_HAS_OPTIONAL 1
@@ -2321,18 +2390,31 @@ namespace testing {
 namespace internal {
 template <typename T>
 using Optional = ::std::optional<T>;
+inline ::std::nullopt_t Nullopt() { return ::std::nullopt; }
 }  // namespace internal
 }  // namespace testing
 // The case where absl is configured NOT to alias std::optional is not
 // supported.
-#endif  // __has_include(<optional>) && __cplusplus >= 201703L
-#endif  // __has_include
+#endif  // __cpp_lib_optional
 #endif  // GTEST_HAS_ABSL
 
-#if GTEST_HAS_ABSL
+#ifndef GTEST_INTERNAL_HAS_OPTIONAL
+#define GTEST_INTERNAL_HAS_OPTIONAL 0
+#endif
+
+#if defined(__cpp_lib_span) || (GTEST_INTERNAL_HAS_INCLUDE(<span>) && \
+                                GTEST_INTERNAL_CPLUSPLUS_LANG >= 202002L)
+#define GTEST_INTERNAL_HAS_STD_SPAN 1
+#endif  // __cpp_lib_span
+
+#ifndef GTEST_INTERNAL_HAS_STD_SPAN
+#define GTEST_INTERNAL_HAS_STD_SPAN 0
+#endif
+
+#ifdef GTEST_HAS_ABSL
 // Always use absl::string_view for Matcher<> specializations if googletest
 // is built with absl support.
-# define GTEST_INTERNAL_HAS_STRING_VIEW 1
+#define GTEST_INTERNAL_HAS_STRING_VIEW 1
 #include "absl/strings/string_view.h"
 namespace testing {
 namespace internal {
@@ -2340,11 +2422,12 @@ using StringView = ::absl::string_view;
 }  // namespace internal
 }  // namespace testing
 #else
-# ifdef __has_include
-#   if __has_include(<string_view>) && __cplusplus >= 201703L
+#if defined(__cpp_lib_string_view) ||             \
+    (GTEST_INTERNAL_HAS_INCLUDE(<string_view>) && \
+     GTEST_INTERNAL_CPLUSPLUS_LANG >= 201703L)
 // Otherwise for C++17 and higher use std::string_view for Matcher<>
 // specializations.
-#   define GTEST_INTERNAL_HAS_STRING_VIEW 1
+#define GTEST_INTERNAL_HAS_STRING_VIEW 1
 #include <string_view>
 namespace testing {
 namespace internal {
@@ -2353,11 +2436,14 @@ using StringView = ::std::string_view;
 }  // namespace testing
 // The case where absl is configured NOT to alias std::string_view is not
 // supported.
-#  endif  // __has_include(<string_view>) && __cplusplus >= 201703L
-# endif  // __has_include
+#endif  // __cpp_lib_string_view
 #endif  // GTEST_HAS_ABSL
 
-#if GTEST_HAS_ABSL
+#ifndef GTEST_INTERNAL_HAS_STRING_VIEW
+#define GTEST_INTERNAL_HAS_STRING_VIEW 0
+#endif
+
+#ifdef GTEST_HAS_ABSL
 // Always use absl::variant for UniversalPrinter<> specializations if googletest
 // is built with absl support.
 #define GTEST_INTERNAL_HAS_VARIANT 1
@@ -2369,8 +2455,8 @@ using Variant = ::absl::variant<T...>;
 }  // namespace internal
 }  // namespace testing
 #else
-#ifdef __has_include
-#if __has_include(<variant>) && __cplusplus >= 201703L
+#if defined(__cpp_lib_variant) || (GTEST_INTERNAL_HAS_INCLUDE(<variant>) && \
+                                   GTEST_INTERNAL_CPLUSPLUS_LANG >= 201703L)
 // Otherwise for C++17 and higher use std::variant for UniversalPrinter<>
 // specializations.
 #define GTEST_INTERNAL_HAS_VARIANT 1
@@ -2382,8 +2468,19 @@ using Variant = ::std::variant<T...>;
 }  // namespace internal
 }  // namespace testing
 // The case where absl is configured NOT to alias std::variant is not supported.
-#endif  // __has_include(<variant>) && __cplusplus >= 201703L
-#endif  // __has_include
+#endif  // __cpp_lib_variant
 #endif  // GTEST_HAS_ABSL
 
+#ifndef GTEST_INTERNAL_HAS_VARIANT
+#define GTEST_INTERNAL_HAS_VARIANT 0
+#endif
+
+#if (defined(__cpp_lib_three_way_comparison) || \
+     (GTEST_INTERNAL_HAS_INCLUDE(<compare>) &&  \
+      GTEST_INTERNAL_CPLUSPLUS_LANG >= 201907L))
+#define GTEST_INTERNAL_HAS_COMPARE_LIB 1
+#else
+#define GTEST_INTERNAL_HAS_COMPARE_LIB 0
+#endif
+
 #endif  // GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_H_
diff --git a/external/googletest/googletest/include/gtest/internal/gtest-string.h b/external/googletest/googletest/include/gtest/internal/gtest-string.h
index 904be74e..7c05b583 100644
--- a/external/googletest/googletest/include/gtest/internal/gtest-string.h
+++ b/external/googletest/googletest/include/gtest/internal/gtest-string.h
@@ -26,7 +26,7 @@
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
+
 // The Google C++ Testing and Mocking Framework (Google Test)
 //
 // This header file declares the String class and functions used internally by
@@ -36,7 +36,9 @@
 // This header file is #included by gtest-internal.h.
 // It should not be #included by other files.
 
-// GOOGLETEST_CM0001 DO NOT DELETE
+// IWYU pragma: private, include "gtest/gtest.h"
+// IWYU pragma: friend gtest/.*
+// IWYU pragma: friend gmock/.*
 
 #ifndef GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_STRING_H_
 #define GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_STRING_H_
@@ -49,6 +51,7 @@
 #include <string.h>
 
 #include <cstdint>
+#include <sstream>
 #include <string>
 
 #include "gtest/internal/gtest-port.h"
@@ -70,7 +73,7 @@ class GTEST_API_ String {
   // memory using malloc().
   static const char* CloneCString(const char* c_str);
 
-#if GTEST_OS_WINDOWS_MOBILE
+#ifdef GTEST_OS_WINDOWS_MOBILE
   // Windows CE does not have the 'ANSI' versions of Win32 APIs. To be
   // able to pass strings to Win32 APIs on CE we need to convert them
   // to 'Unicode', UTF-16.
diff --git a/external/googletest/googletest/include/gtest/internal/gtest-type-util.h b/external/googletest/googletest/include/gtest/internal/gtest-type-util.h
index 88b72a5e..78da0531 100644
--- a/external/googletest/googletest/include/gtest/internal/gtest-type-util.h
+++ b/external/googletest/googletest/include/gtest/internal/gtest-type-util.h
@@ -30,11 +30,17 @@
 // Type utilities needed for implementing typed and type-parameterized
 // tests.
 
-// GOOGLETEST_CM0001 DO NOT DELETE
+// IWYU pragma: private, include "gtest/gtest.h"
+// IWYU pragma: friend gtest/.*
+// IWYU pragma: friend gmock/.*
 
 #ifndef GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_
 #define GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_
 
+#include <string>
+#include <type_traits>
+#include <typeinfo>
+
 #include "gtest/internal/gtest-port.h"
 
 // #ifdef __GNUC__ is too general here.  It is possible to use gcc without using
@@ -61,6 +67,22 @@ inline std::string CanonicalizeForStdLibVersioning(std::string s) {
       s.erase(strlen("std"), end - strlen("std"));
     }
   }
+
+  // Strip redundant spaces in typename to match MSVC
+  // For example, std::pair<int, bool> -> std::pair<int,bool>
+  static const char to_search[] = ", ";
+  const char replace_char = ',';
+  size_t pos = 0;
+  while (true) {
+    // Get the next occurrence from the current position
+    pos = s.find(to_search, pos);
+    if (pos == std::string::npos) {
+      break;
+    }
+    // Replace this occurrence of substring
+    s.replace(pos, strlen(to_search), 1, replace_char);
+    ++pos;
+  }
   return s;
 }
 
@@ -79,6 +101,20 @@ inline std::string GetTypeName(const std::type_info& type) {
   const std::string name_str(status == 0 ? readable_name : name);
   free(readable_name);
   return CanonicalizeForStdLibVersioning(name_str);
+#elif defined(_MSC_VER)
+  // Strip struct and class due to differences between
+  // MSVC and other compilers. std::pair<int,bool> is printed as
+  // "struct std::pair<int,bool>" when using MSVC vs "std::pair<int, bool>" with
+  // other compilers.
+  std::string s = name;
+  // Only strip the leading "struct " and "class ", so uses rfind == 0 to
+  // ensure that
+  if (s.rfind("struct ", 0) == 0) {
+    s = s.substr(strlen("struct "));
+  } else if (s.rfind("class ", 0) == 0) {
+    s = s.substr(strlen("class "));
+  }
+  return s;
 #else
   return name;
 #endif  // GTEST_HAS_CXXABI_H_ || __HP_aCC
diff --git a/external/googletest/googletest/samples/prime_tables.h b/external/googletest/googletest/samples/prime_tables.h
index 7c0286e1..14c016ad 100644
--- a/external/googletest/googletest/samples/prime_tables.h
+++ b/external/googletest/googletest/samples/prime_tables.h
@@ -39,7 +39,7 @@
 // The prime table interface.
 class PrimeTable {
  public:
-  virtual ~PrimeTable() {}
+  virtual ~PrimeTable() = default;
 
   // Returns true if and only if n is a prime number.
   virtual bool IsPrime(int n) const = 0;
@@ -78,8 +78,9 @@ class PreCalculatedPrimeTable : public PrimeTable {
  public:
   // 'max' specifies the maximum number the prime table holds.
   explicit PreCalculatedPrimeTable(int max)
-      : is_prime_size_(max + 1), is_prime_(new bool[max + 1]) {
-    CalculatePrimesUpTo(max);
+      : is_prime_size_(std::max(1, max + 1)),
+        is_prime_(new bool[static_cast<size_t>(is_prime_size_)]) {
+    CalculatePrimesUpTo(is_prime_size_ - 1);
   }
   ~PreCalculatedPrimeTable() override { delete[] is_prime_; }
 
diff --git a/external/googletest/googletest/samples/sample10_unittest.cc b/external/googletest/googletest/samples/sample10_unittest.cc
index 95b4811b..21079549 100644
--- a/external/googletest/googletest/samples/sample10_unittest.cc
+++ b/external/googletest/googletest/samples/sample10_unittest.cc
@@ -38,7 +38,6 @@ using ::testing::InitGoogleTest;
 using ::testing::Test;
 using ::testing::TestEventListeners;
 using ::testing::TestInfo;
-using ::testing::TestPartResult;
 using ::testing::UnitTest;
 
 namespace {
diff --git a/external/googletest/googletest/samples/sample3_unittest.cc b/external/googletest/googletest/samples/sample3_unittest.cc
index 233c7209..71609c6a 100644
--- a/external/googletest/googletest/samples/sample3_unittest.cc
+++ b/external/googletest/googletest/samples/sample3_unittest.cc
@@ -60,8 +60,8 @@
 //
 // </TechnicalDetails>
 
-#include "gtest/gtest.h"
 #include "sample3-inl.h"
+#include "gtest/gtest.h"
 namespace {
 // To use a test fixture, derive a class from testing::Test.
 class QueueTestSmpl3 : public testing::Test {
diff --git a/external/googletest/googletest/samples/sample5_unittest.cc b/external/googletest/googletest/samples/sample5_unittest.cc
index 7adc812e..cc8c0f01 100644
--- a/external/googletest/googletest/samples/sample5_unittest.cc
+++ b/external/googletest/googletest/samples/sample5_unittest.cc
@@ -45,9 +45,9 @@
 #include <limits.h>
 #include <time.h>
 
-#include "gtest/gtest.h"
 #include "sample1.h"
 #include "sample3-inl.h"
+#include "gtest/gtest.h"
 namespace {
 // In this sample, we want to ensure that every test finishes within
 // ~5 seconds.  If a test takes longer to run, we consider it a
diff --git a/external/googletest/googletest/samples/sample6_unittest.cc b/external/googletest/googletest/samples/sample6_unittest.cc
index 59aaa60f..cf576f0a 100644
--- a/external/googletest/googletest/samples/sample6_unittest.cc
+++ b/external/googletest/googletest/samples/sample6_unittest.cc
@@ -31,8 +31,8 @@
 // implementations of the same interface (aka interface tests).
 
 // The interface and its implementations are in this header.
-#include "gtest/gtest.h"
 #include "prime_tables.h"
+#include "gtest/gtest.h"
 namespace {
 // First, we define some factory functions for creating instances of
 // the implementations.  You may be able to skip this step if all your
diff --git a/external/googletest/googletest/samples/sample7_unittest.cc b/external/googletest/googletest/samples/sample7_unittest.cc
index 07dbc3f6..3ad22cab 100644
--- a/external/googletest/googletest/samples/sample7_unittest.cc
+++ b/external/googletest/googletest/samples/sample7_unittest.cc
@@ -34,8 +34,8 @@
 // tested.
 
 // The interface and its implementations are in this header.
-#include "gtest/gtest.h"
 #include "prime_tables.h"
+#include "gtest/gtest.h"
 namespace {
 
 using ::testing::TestWithParam;
diff --git a/external/googletest/googletest/samples/sample8_unittest.cc b/external/googletest/googletest/samples/sample8_unittest.cc
index 10488b0e..4df81df0 100644
--- a/external/googletest/googletest/samples/sample8_unittest.cc
+++ b/external/googletest/googletest/samples/sample8_unittest.cc
@@ -27,14 +27,14 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
 // This sample shows how to test code relying on some global flag variables.
 // Combine() helps with generating all possible combinations of such flags,
 // and each test is given one combination as a parameter.
 
 // Use class definitions to test from this header.
-#include "prime_tables.h"
+#include <tuple>
 
+#include "prime_tables.h"
 #include "gtest/gtest.h"
 namespace {
 
@@ -79,10 +79,10 @@ class HybridPrimeTable : public PrimeTable {
   int max_precalculated_;
 };
 
-using ::testing::TestWithParam;
 using ::testing::Bool;
-using ::testing::Values;
 using ::testing::Combine;
+using ::testing::TestWithParam;
+using ::testing::Values;
 
 // To test all code paths for HybridPrimeTable we must test it with numbers
 // both within and outside PreCalculatedPrimeTable's capacity and also with
diff --git a/external/googletest/googletest/samples/sample9_unittest.cc b/external/googletest/googletest/samples/sample9_unittest.cc
index 82781cd4..0a2f0970 100644
--- a/external/googletest/googletest/samples/sample9_unittest.cc
+++ b/external/googletest/googletest/samples/sample9_unittest.cc
@@ -28,7 +28,7 @@
 
 // This sample shows how to use Google Test listener API to implement
 // an alternative console output and how to use the UnitTest reflection API
-// to enumerate test cases and tests and to inspect their results.
+// to enumerate test suites and tests and to inspect their results.
 
 #include <stdio.h>
 
@@ -37,7 +37,6 @@
 using ::testing::EmptyTestEventListener;
 using ::testing::InitGoogleTest;
 using ::testing::Test;
-using ::testing::TestCase;
 using ::testing::TestEventListeners;
 using ::testing::TestInfo;
 using ::testing::TestPartResult;
@@ -58,7 +57,7 @@ class TersePrinter : public EmptyTestEventListener {
 
   // Called before a test starts.
   void OnTestStart(const TestInfo& test_info) override {
-    fprintf(stdout, "*** Test %s.%s starting.\n", test_info.test_case_name(),
+    fprintf(stdout, "*** Test %s.%s starting.\n", test_info.test_suite_name(),
             test_info.name());
     fflush(stdout);
   }
@@ -74,7 +73,7 @@ class TersePrinter : public EmptyTestEventListener {
 
   // Called after a test ends.
   void OnTestEnd(const TestInfo& test_info) override {
-    fprintf(stdout, "*** Test %s.%s ending.\n", test_info.test_case_name(),
+    fprintf(stdout, "*** Test %s.%s ending.\n", test_info.test_suite_name(),
             test_info.name());
     fflush(stdout);
   }
diff --git a/external/googletest/googletest/scripts/README.md b/external/googletest/googletest/scripts/README.md
deleted file mode 100644
index 5c2e8dd9..00000000
--- a/external/googletest/googletest/scripts/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# Please Note:
-
-Files in this directory are no longer supported by the maintainers. They represent mosty historical artifacts and
-supported by the community only. There is no guarantee whatsoever that these scripts still work.
diff --git a/external/googletest/googletest/scripts/common.py b/external/googletest/googletest/scripts/common.py
deleted file mode 100644
index 4e7198d5..00000000
--- a/external/googletest/googletest/scripts/common.py
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 2013 Google Inc. All Rights Reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Shared utilities for writing scripts for Google Test/Mock."""
-
-__author__ = 'wan@google.com (Zhanyong Wan)'
-
-import os
-import re
-
-# Matches the line from 'svn info .' output that describes what SVN
-# path the current local directory corresponds to.  For example, in
-# a googletest SVN workspace's trunk/test directory, the output will be:
-#
-# URL: https://googletest.googlecode.com/svn/trunk/test
-_SVN_INFO_URL_RE = re.compile(r'^URL: https://(\w+)\.googlecode\.com/svn(.*)')
-
-
-def GetCommandOutput(command):
-    """Runs the shell command and returns its stdout as a list of lines."""
-
-    f = os.popen(command, 'r')
-    lines = [line.strip() for line in f.readlines()]
-    f.close()
-    return lines
-
-
-def GetSvnInfo():
-    """Returns the project name and the current SVN workspace's root path."""
-
-    for line in GetCommandOutput('svn info .'):
-        m = _SVN_INFO_URL_RE.match(line)
-        if m:
-            project = m.group(1)  # googletest or googlemock
-            rel_path = m.group(2)
-            root = os.path.realpath(rel_path.count('/') * '../')
-            return project, root
-
-    return None, None
-
-
-def GetSvnTrunk():
-    """Returns the current SVN workspace's trunk root path."""
-
-    _, root = GetSvnInfo()
-    return root + '/trunk' if root else None
-
-
-def IsInGTestSvn():
-    project, _ = GetSvnInfo()
-    return project == 'googletest'
-
-
-def IsInGMockSvn():
-    project, _ = GetSvnInfo()
-    return project == 'googlemock'
diff --git a/external/googletest/googletest/scripts/fuse_gtest_files.py b/external/googletest/googletest/scripts/fuse_gtest_files.py
deleted file mode 100644
index 0dbae963..00000000
--- a/external/googletest/googletest/scripts/fuse_gtest_files.py
+++ /dev/null
@@ -1,254 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2009, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""fuse_gtest_files.py v0.2.0
-Fuses Google Test source code into a .h file and a .cc file.
-
-SYNOPSIS
-       fuse_gtest_files.py [GTEST_ROOT_DIR] OUTPUT_DIR
-
-       Scans GTEST_ROOT_DIR for Google Test source code, and generates
-       two files: OUTPUT_DIR/gtest/gtest.h and OUTPUT_DIR/gtest/gtest-all.cc.
-       Then you can build your tests by adding OUTPUT_DIR to the include
-       search path and linking with OUTPUT_DIR/gtest/gtest-all.cc.  These
-       two files contain everything you need to use Google Test.  Hence
-       you can "install" Google Test by copying them to wherever you want.
-
-       GTEST_ROOT_DIR can be omitted and defaults to the parent
-       directory of the directory holding this script.
-
-EXAMPLES
-       ./fuse_gtest_files.py fused_gtest
-       ./fuse_gtest_files.py path/to/unpacked/gtest fused_gtest
-
-This tool is experimental.  In particular, it assumes that there is no
-conditional inclusion of Google Test headers.  Please report any
-problems to googletestframework@googlegroups.com.  You can read
-https://github.com/google/googletest/blob/master/googletest/docs/advanced.md for
-more information.
-"""
-
-__author__ = 'wan@google.com (Zhanyong Wan)'
-
-import os
-import re
-
-try:
-    from sets import Set as set  # For Python 2.3 compatibility
-except ImportError:
-    pass
-import sys
-
-# We assume that this file is in the scripts/ directory in the Google
-# Test root directory.
-DEFAULT_GTEST_ROOT_DIR = os.path.join(os.path.dirname(__file__), '..')
-
-# Regex for matching '#include "gtest/..."'.
-INCLUDE_GTEST_FILE_REGEX = re.compile(r'^\s*#\s*include\s*"(gtest/.+)"')
-
-# Regex for matching '#include "src/..."'.
-INCLUDE_SRC_FILE_REGEX = re.compile(r'^\s*#\s*include\s*"(src/.+)"')
-
-# Where to find the source seed files.
-GTEST_H_SEED = 'include/gtest/gtest.h'
-GTEST_SPI_H_SEED = 'include/gtest/gtest-spi.h'
-GTEST_ALL_CC_SEED = 'src/gtest-all.cc'
-
-# Where to put the generated files.
-GTEST_H_OUTPUT = 'gtest/gtest.h'
-GTEST_ALL_CC_OUTPUT = 'gtest/gtest-all.cc'
-
-
-def VerifyFileExists(directory, relative_path):
-    """Verifies that the given file exists; aborts on failure.
-
-    relative_path is the file path relative to the given directory.
-    """
-
-    if not os.path.isfile(os.path.join(directory, relative_path)):
-        print('ERROR: Cannot find %s in directory %s.' % (relative_path,
-                                                          directory))
-        print('Please either specify a valid project root directory '
-              'or omit it on the command line.')
-        sys.exit(1)
-
-
-def ValidateGTestRootDir(gtest_root):
-    """Makes sure gtest_root points to a valid gtest root directory.
-
-    The function aborts the program on failure.
-    """
-
-    VerifyFileExists(gtest_root, GTEST_H_SEED)
-    VerifyFileExists(gtest_root, GTEST_ALL_CC_SEED)
-
-
-def VerifyOutputFile(output_dir, relative_path):
-    """Verifies that the given output file path is valid.
-
-    relative_path is relative to the output_dir directory.
-    """
-
-    # Makes sure the output file either doesn't exist or can be overwritten.
-    output_file = os.path.join(output_dir, relative_path)
-    if os.path.exists(output_file):
-        # TODO(wan@google.com): The following user-interaction doesn't
-        # work with automated processes.  We should provide a way for the
-        # Makefile to force overwriting the files.
-        print('%s already exists in directory %s - overwrite it? (y/N) ' %
-              (relative_path, output_dir))
-        answer = sys.stdin.readline().strip()
-        if answer not in ['y', 'Y']:
-            print('ABORTED.')
-            sys.exit(1)
-
-    # Makes sure the directory holding the output file exists; creates
-    # it and all its ancestors if necessary.
-    parent_directory = os.path.dirname(output_file)
-    if not os.path.isdir(parent_directory):
-        os.makedirs(parent_directory)
-
-
-def ValidateOutputDir(output_dir):
-    """Makes sure output_dir points to a valid output directory.
-
-    The function aborts the program on failure.
-    """
-
-    VerifyOutputFile(output_dir, GTEST_H_OUTPUT)
-    VerifyOutputFile(output_dir, GTEST_ALL_CC_OUTPUT)
-
-
-def FuseGTestH(gtest_root, output_dir):
-    """Scans folder gtest_root to generate gtest/gtest.h in output_dir."""
-
-    output_file = open(os.path.join(output_dir, GTEST_H_OUTPUT), 'w')
-    processed_files = set()  # Holds all gtest headers we've processed.
-
-    def ProcessFile(gtest_header_path):
-        """Processes the given gtest header file."""
-
-        # We don't process the same header twice.
-        if gtest_header_path in processed_files:
-            return
-
-        processed_files.add(gtest_header_path)
-
-        # Reads each line in the given gtest header.
-        for line in open(os.path.join(gtest_root, gtest_header_path), 'r'):
-            m = INCLUDE_GTEST_FILE_REGEX.match(line)
-            if m:
-                # It's '#include "gtest/..."' - let's process it recursively.
-                ProcessFile('include/' + m.group(1))
-            else:
-                # Otherwise we copy the line unchanged to the output file.
-                output_file.write(line)
-
-    ProcessFile(GTEST_H_SEED)
-    output_file.close()
-
-
-def FuseGTestAllCcToFile(gtest_root, output_file):
-    """Scans folder gtest_root to generate gtest/gtest-all.cc in output_file."""
-
-    processed_files = set()
-
-    def ProcessFile(gtest_source_file):
-        """Processes the given gtest source file."""
-
-        # We don't process the same #included file twice.
-        if gtest_source_file in processed_files:
-            return
-
-        processed_files.add(gtest_source_file)
-
-        # Reads each line in the given gtest source file.
-        for line in open(os.path.join(gtest_root, gtest_source_file), 'r'):
-            m = INCLUDE_GTEST_FILE_REGEX.match(line)
-            if m:
-                if 'include/' + m.group(1) == GTEST_SPI_H_SEED:
-                    # It's '#include "gtest/gtest-spi.h"'.  This file is not
-                    # #included by "gtest/gtest.h", so we need to process it.
-                    ProcessFile(GTEST_SPI_H_SEED)
-                else:
-                    # It's '#include "gtest/foo.h"' where foo is not gtest-spi.
-                    # We treat it as '#include "gtest/gtest.h"', as all other
-                    # gtest headers are being fused into gtest.h and cannot be
-                    # #included directly.
-
-                    # There is no need to #include "gtest/gtest.h" more than once.
-                    if not GTEST_H_SEED in processed_files:
-                        processed_files.add(GTEST_H_SEED)
-                        output_file.write('#include "%s"\n' % (GTEST_H_OUTPUT,))
-            else:
-                m = INCLUDE_SRC_FILE_REGEX.match(line)
-                if m:
-                    # It's '#include "src/foo"' - let's process it recursively.
-                    ProcessFile(m.group(1))
-                else:
-                    output_file.write(line)
-
-    ProcessFile(GTEST_ALL_CC_SEED)
-
-
-def FuseGTestAllCc(gtest_root, output_dir):
-    """Scans folder gtest_root to generate gtest/gtest-all.cc in output_dir."""
-
-    output_file = open(os.path.join(output_dir, GTEST_ALL_CC_OUTPUT), 'w')
-    FuseGTestAllCcToFile(gtest_root, output_file)
-    output_file.close()
-
-
-def FuseGTest(gtest_root, output_dir):
-    """Fuses gtest.h and gtest-all.cc."""
-
-    ValidateGTestRootDir(gtest_root)
-    ValidateOutputDir(output_dir)
-
-    FuseGTestH(gtest_root, output_dir)
-    FuseGTestAllCc(gtest_root, output_dir)
-
-
-def main():
-    argc = len(sys.argv)
-    if argc == 2:
-        # fuse_gtest_files.py OUTPUT_DIR
-        FuseGTest(DEFAULT_GTEST_ROOT_DIR, sys.argv[1])
-    elif argc == 3:
-        # fuse_gtest_files.py GTEST_ROOT_DIR OUTPUT_DIR
-        FuseGTest(sys.argv[1], sys.argv[2])
-    else:
-        print(__doc__)
-        sys.exit(1)
-
-
-if __name__ == '__main__':
-    main()
diff --git a/external/googletest/googletest/scripts/gen_gtest_pred_impl.py b/external/googletest/googletest/scripts/gen_gtest_pred_impl.py
deleted file mode 100644
index 2873d82f..00000000
--- a/external/googletest/googletest/scripts/gen_gtest_pred_impl.py
+++ /dev/null
@@ -1,737 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2006, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""gen_gtest_pred_impl.py v0.1
-
-Generates the implementation of Google Test predicate assertions and
-accompanying tests.
-
-Usage:
-
-  gen_gtest_pred_impl.py MAX_ARITY
-
-where MAX_ARITY is a positive integer.
-
-The command generates the implementation of up-to MAX_ARITY-ary
-predicate assertions, and writes it to file gtest_pred_impl.h in the
-directory where the script is.  It also generates the accompanying
-unit test in file gtest_pred_impl_unittest.cc.
-"""
-
-__author__ = 'wan@google.com (Zhanyong Wan)'
-
-import os
-import sys
-import time
-
-# Where this script is.
-SCRIPT_DIR = os.path.dirname(sys.argv[0])
-
-# Where to store the generated header.
-HEADER = os.path.join(SCRIPT_DIR, '../include/gtest/gtest_pred_impl.h')
-
-# Where to store the generated unit test.
-UNIT_TEST = os.path.join(SCRIPT_DIR, '../test/gtest_pred_impl_unittest.cc')
-
-
-def HeaderPreamble(n):
-    """Returns the preamble for the header file.
-
-    Args:
-      n:  the maximum arity of the predicate macros to be generated.
-    """
-
-    # A map that defines the values used in the preamble template.
-    DEFS = {
-        'today': time.strftime('%m/%d/%Y'),
-        'year': time.strftime('%Y'),
-        'command': '%s %s' % (os.path.basename(sys.argv[0]), n),
-        'n': n
-    }
-
-    return (
-            """// Copyright 2006, Google Inc.
-          // All rights reserved.
-          //
-          // Redistribution and use in source and binary forms, with or without
-          // modification, are permitted provided that the following conditions are
-          // met:
-          //
-          //     * Redistributions of source code must retain the above copyright
-          // notice, this list of conditions and the following disclaimer.
-          //     * Redistributions in binary form must reproduce the above
-          // copyright notice, this list of conditions and the following disclaimer
-          // in the documentation and/or other materials provided with the
-          // distribution.
-          //     * Neither the name of Google Inc. nor the names of its
-          // contributors may be used to endorse or promote products derived from
-          // this software without specific prior written permission.
-          //
-          // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-          // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-          // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-          // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-          // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-          // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-          // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-          // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-          // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-          // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-          // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-          
-          // This file is AUTOMATICALLY GENERATED on %(today)s by command
-          // '%(command)s'.  DO NOT EDIT BY HAND!
-          //
-          // Implements a family of generic predicate assertion macros.
-          // GOOGLETEST_CM0001 DO NOT DELETE
-          
-          
-          #ifndef GTEST_INCLUDE_GTEST_GTEST_PRED_IMPL_H_
-          #define GTEST_INCLUDE_GTEST_GTEST_PRED_IMPL_H_
-          
-          #include "gtest/gtest.h"
-          
-          namespace testing {
-          
-          // This header implements a family of generic predicate assertion
-          // macros:
-          //
-          //   ASSERT_PRED_FORMAT1(pred_format, v1)
-          //   ASSERT_PRED_FORMAT2(pred_format, v1, v2)
-          //   ...
-          //
-          // where pred_format is a function or functor that takes n (in the
-          // case of ASSERT_PRED_FORMATn) values and their source expression
-          // text, and returns a testing::AssertionResult.  See the definition
-          // of ASSERT_EQ in gtest.h for an example.
-          //
-          // If you don't care about formatting, you can use the more
-          // restrictive version:
-          //
-          //   ASSERT_PRED1(pred, v1)
-          //   ASSERT_PRED2(pred, v1, v2)
-          //   ...
-          //
-          // where pred is an n-ary function or functor that returns bool,
-          // and the values v1, v2, ..., must support the << operator for
-          // streaming to std::ostream.
-          //
-          // We also define the EXPECT_* variations.
-          //
-          // For now we only support predicates whose arity is at most %(n)s.
-          // Please email googletestframework@googlegroups.com if you need
-          // support for higher arities.
-          
-          // GTEST_ASSERT_ is the basic statement to which all of the assertions
-          // in this file reduce.  Don't use this in your code.
-          
-          #define GTEST_ASSERT_(expression, on_failure) \\
-            GTEST_AMBIGUOUS_ELSE_BLOCKER_ \\
-            if (const ::testing::AssertionResult gtest_ar = (expression)) \\
-              ; \\
-            else \\
-              on_failure(gtest_ar.failure_message())
-          """ % DEFS)
-
-
-def Arity(n):
-    """Returns the English name of the given arity."""
-
-    if n < 0:
-        return None
-    elif n <= 3:
-        return ['nullary', 'unary', 'binary', 'ternary'][n]
-    else:
-        return '%s-ary' % n
-
-
-def Title(word):
-    """Returns the given word in title case.  The difference between
-    this and string's title() method is that Title('4-ary') is '4-ary'
-    while '4-ary'.title() is '4-Ary'."""
-
-    return word[0].upper() + word[1:]
-
-
-def OneTo(n):
-    """Returns the list [1, 2, 3, ..., n]."""
-
-    return range(1, n + 1)
-
-
-def Iter(n, format, sep=''):
-    """Given a positive integer n, a format string that contains 0 or
-    more '%s' format specs, and optionally a separator string, returns
-    the join of n strings, each formatted with the format string on an
-    iterator ranged from 1 to n.
-
-    Example:
-
-    Iter(3, 'v%s', sep=', ') returns 'v1, v2, v3'.
-    """
-
-    # How many '%s' specs are in format?
-    spec_count = len(format.split('%s')) - 1
-    return sep.join([format % (spec_count * (i,)) for i in OneTo(n)])
-
-
-def ImplementationForArity(n):
-    """Returns the implementation of n-ary predicate assertions."""
-
-    # A map the defines the values used in the implementation template.
-    DEFS = {
-        'n': str(n),
-        'vs': Iter(n, 'v%s', sep=', '),
-        'vts': Iter(n, '#v%s', sep=', '),
-        'arity': Arity(n),
-        'Arity': Title(Arity(n))
-    }
-
-    impl = """
-
-// Helper function for implementing {EXPECT|ASSERT}_PRED%(n)s.  Don't use
-// this in your code.
-template <typename Pred""" % DEFS
-
-    impl += Iter(n, """,
-          typename T%s""")
-
-    impl += """>
-AssertionResult AssertPred%(n)sHelper(const char* pred_text""" % DEFS
-
-    impl += Iter(n, """,
-                                  const char* e%s""")
-
-    impl += """,
-                                  Pred pred"""
-
-    impl += Iter(n, """,
-                                  const T%s& v%s""")
-
-    impl += """) {
-  if (pred(%(vs)s)) return AssertionSuccess();
-
-""" % DEFS
-
-    impl += '  return AssertionFailure() << pred_text << "("'
-
-    impl += Iter(n, """
-                            << e%s""", sep=' << ", "')
-
-    impl += ' << ") evaluates to false, where"'
-
-    impl += Iter(
-        n, """
-      << "\\n" << e%s << " evaluates to " << ::testing::PrintToString(v%s)"""
-    )
-
-    impl += """;
-}
-
-// Internal macro for implementing {EXPECT|ASSERT}_PRED_FORMAT%(n)s.
-// Don't use this in your code.
-#define GTEST_PRED_FORMAT%(n)s_(pred_format, %(vs)s, on_failure)\\
-  GTEST_ASSERT_(pred_format(%(vts)s, %(vs)s), \\
-                on_failure)
-
-// Internal macro for implementing {EXPECT|ASSERT}_PRED%(n)s.  Don't use
-// this in your code.
-#define GTEST_PRED%(n)s_(pred, %(vs)s, on_failure)\\
-  GTEST_ASSERT_(::testing::AssertPred%(n)sHelper(#pred""" % DEFS
-
-    impl += Iter(n, """, \\
-                                             #v%s""")
-
-    impl += """, \\
-                                             pred"""
-
-    impl += Iter(n, """, \\
-                                             v%s""")
-
-    impl += """), on_failure)
-
-// %(Arity)s predicate assertion macros.
-#define EXPECT_PRED_FORMAT%(n)s(pred_format, %(vs)s) \\
-  GTEST_PRED_FORMAT%(n)s_(pred_format, %(vs)s, GTEST_NONFATAL_FAILURE_)
-#define EXPECT_PRED%(n)s(pred, %(vs)s) \\
-  GTEST_PRED%(n)s_(pred, %(vs)s, GTEST_NONFATAL_FAILURE_)
-#define ASSERT_PRED_FORMAT%(n)s(pred_format, %(vs)s) \\
-  GTEST_PRED_FORMAT%(n)s_(pred_format, %(vs)s, GTEST_FATAL_FAILURE_)
-#define ASSERT_PRED%(n)s(pred, %(vs)s) \\
-  GTEST_PRED%(n)s_(pred, %(vs)s, GTEST_FATAL_FAILURE_)
-
-""" % DEFS
-
-    return impl
-
-
-def HeaderPostamble():
-    """Returns the postamble for the header file."""
-
-    return """
-
-}  // namespace testing
-
-#endif  // GTEST_INCLUDE_GTEST_GTEST_PRED_IMPL_H_
-"""
-
-
-def GenerateFile(path, content):
-    """Given a file path and a content string
-       overwrites it with the given content.
-    """
-    print
-    'Updating file %s . . .' % path
-    f = file(path, 'w+')
-    print >> f, content,
-    f.close()
-
-    print
-    'File %s has been updated.' % path
-
-
-def GenerateHeader(n):
-    """Given the maximum arity n, updates the header file that implements
-    the predicate assertions.
-    """
-    GenerateFile(HEADER,
-                 HeaderPreamble(n)
-                 + ''.join([ImplementationForArity(i) for i in OneTo(n)])
-                 + HeaderPostamble())
-
-
-def UnitTestPreamble():
-    """Returns the preamble for the unit test file."""
-
-    # A map that defines the values used in the preamble template.
-    DEFS = {
-        'today': time.strftime('%m/%d/%Y'),
-        'year': time.strftime('%Y'),
-        'command': '%s %s' % (os.path.basename(sys.argv[0]), sys.argv[1]),
-    }
-
-    return (
-            """// Copyright 2006, Google Inc.
-          // All rights reserved.
-          //
-          // Redistribution and use in source and binary forms, with or without
-          // modification, are permitted provided that the following conditions are
-          // met:
-          //
-          //     * Redistributions of source code must retain the above copyright
-          // notice, this list of conditions and the following disclaimer.
-          //     * Redistributions in binary form must reproduce the above
-          // copyright notice, this list of conditions and the following disclaimer
-          // in the documentation and/or other materials provided with the
-          // distribution.
-          //     * Neither the name of Google Inc. nor the names of its
-          // contributors may be used to endorse or promote products derived from
-          // this software without specific prior written permission.
-          //
-          // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-          // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-          // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-          // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-          // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-          // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-          // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-          // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-          // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-          // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-          // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-          
-          // This file is AUTOMATICALLY GENERATED on %(today)s by command
-          // '%(command)s'.  DO NOT EDIT BY HAND!
-          
-          // Regression test for gtest_pred_impl.h
-          //
-          // This file is generated by a script and quite long.  If you intend to
-          // learn how Google Test works by reading its unit tests, read
-          // gtest_unittest.cc instead.
-          //
-          // This is intended as a regression test for the Google Test predicate
-          // assertions.  We compile it as part of the gtest_unittest target
-          // only to keep the implementation tidy and compact, as it is quite
-          // involved to set up the stage for testing Google Test using Google
-          // Test itself.
-          //
-          // Currently, gtest_unittest takes ~11 seconds to run in the testing
-          // daemon.  In the future, if it grows too large and needs much more
-          // time to finish, we should consider separating this file into a
-          // stand-alone regression test.
-          
-          #include <iostream>
-          
-          #include "gtest/gtest.h"
-          #include "gtest/gtest-spi.h"
-          
-          // A user-defined data type.
-          struct Bool {
-            explicit Bool(int val) : value(val != 0) {}
-          
-            bool operator>(int n) const { return value > Bool(n).value; }
-          
-            Bool operator+(const Bool& rhs) const { return Bool(value + rhs.value); }
-          
-            bool operator==(const Bool& rhs) const { return value == rhs.value; }
-          
-            bool value;
-          };
-          
-          // Enables Bool to be used in assertions.
-          std::ostream& operator<<(std::ostream& os, const Bool& x) {
-            return os << (x.value ? "true" : "false");
-          }
-          
-          """ % DEFS)
-
-
-def TestsForArity(n):
-    """Returns the tests for n-ary predicate assertions."""
-
-    # A map that defines the values used in the template for the tests.
-    DEFS = {
-        'n': n,
-        'es': Iter(n, 'e%s', sep=', '),
-        'vs': Iter(n, 'v%s', sep=', '),
-        'vts': Iter(n, '#v%s', sep=', '),
-        'tvs': Iter(n, 'T%s v%s', sep=', '),
-        'int_vs': Iter(n, 'int v%s', sep=', '),
-        'Bool_vs': Iter(n, 'Bool v%s', sep=', '),
-        'types': Iter(n, 'typename T%s', sep=', '),
-        'v_sum': Iter(n, 'v%s', sep=' + '),
-        'arity': Arity(n),
-        'Arity': Title(Arity(n)),
-    }
-
-    tests = (
-            """// Sample functions/functors for testing %(arity)s predicate assertions.
-          
-          // A %(arity)s predicate function.
-          template <%(types)s>
-          bool PredFunction%(n)s(%(tvs)s) {
-            return %(v_sum)s > 0;
-          }
-          
-          // The following two functions are needed because a compiler doesn't have
-          // a context yet to know which template function must be instantiated.
-          bool PredFunction%(n)sInt(%(int_vs)s) {
-            return %(v_sum)s > 0;
-          }
-          bool PredFunction%(n)sBool(%(Bool_vs)s) {
-            return %(v_sum)s > 0;
-          }
-          """ % DEFS)
-
-    tests += """
-// A %(arity)s predicate functor.
-struct PredFunctor%(n)s {
-  template <%(types)s>
-  bool operator()(""" % DEFS
-
-    tests += Iter(n, 'const T%s& v%s', sep=""",
-                  """)
-
-    tests += """) {
-    return %(v_sum)s > 0;
-  }
-};
-""" % DEFS
-
-    tests += """
-// A %(arity)s predicate-formatter function.
-template <%(types)s>
-testing::AssertionResult PredFormatFunction%(n)s(""" % DEFS
-
-    tests += Iter(n, 'const char* e%s', sep=""",
-                                             """)
-
-    tests += Iter(n, """,
-                                             const T%s& v%s""")
-
-    tests += """) {
-  if (PredFunction%(n)s(%(vs)s))
-    return testing::AssertionSuccess();
-
-  return testing::AssertionFailure()
-      << """ % DEFS
-
-    tests += Iter(n, 'e%s', sep=' << " + " << ')
-
-    tests += """
-      << " is expected to be positive, but evaluates to "
-      << %(v_sum)s << ".";
-}
-""" % DEFS
-
-    tests += """
-// A %(arity)s predicate-formatter functor.
-struct PredFormatFunctor%(n)s {
-  template <%(types)s>
-  testing::AssertionResult operator()(""" % DEFS
-
-    tests += Iter(n, 'const char* e%s', sep=""",
-                                      """)
-
-    tests += Iter(n, """,
-                                      const T%s& v%s""")
-
-    tests += """) const {
-    return PredFormatFunction%(n)s(%(es)s, %(vs)s);
-  }
-};
-""" % DEFS
-
-    tests += """
-// Tests for {EXPECT|ASSERT}_PRED_FORMAT%(n)s.
-
-class Predicate%(n)sTest : public testing::Test {
- protected:
-  void SetUp() override {
-    expected_to_finish_ = true;
-    finished_ = false;""" % DEFS
-
-    tests += """
-    """ + Iter(n, 'n%s_ = ') + """0;
-  }
-"""
-
-    tests += """
-  void TearDown() override {
-    // Verifies that each of the predicate's arguments was evaluated
-    // exactly once."""
-
-    tests += ''.join(["""
-    EXPECT_EQ(1, n%s_) <<
-        "The predicate assertion didn't evaluate argument %s "
-        "exactly once.";""" % (i, i + 1) for i in OneTo(n)])
-
-    tests += """
-
-    // Verifies that the control flow in the test function is expected.
-    if (expected_to_finish_ && !finished_) {
-      FAIL() << "The predicate assertion unexpactedly aborted the test.";
-    } else if (!expected_to_finish_ && finished_) {
-      FAIL() << "The failed predicate assertion didn't abort the test "
-                "as expected.";
-    }
-  }
-
-  // true if and only if the test function is expected to run to finish.
-  static bool expected_to_finish_;
-
-  // true if and only if the test function did run to finish.
-  static bool finished_;
-""" % DEFS
-
-    tests += Iter(n, """
-  static int n%s_;""")
-
-    tests += """
-};
-
-bool Predicate%(n)sTest::expected_to_finish_;
-bool Predicate%(n)sTest::finished_;
-""" % DEFS
-
-    tests += Iter(n, """int Predicate%%(n)sTest::n%s_;
-""") % DEFS
-
-    tests += """
-typedef Predicate%(n)sTest EXPECT_PRED_FORMAT%(n)sTest;
-typedef Predicate%(n)sTest ASSERT_PRED_FORMAT%(n)sTest;
-typedef Predicate%(n)sTest EXPECT_PRED%(n)sTest;
-typedef Predicate%(n)sTest ASSERT_PRED%(n)sTest;
-""" % DEFS
-
-    def GenTest(use_format, use_assert, expect_failure,
-                use_functor, use_user_type):
-        """Returns the test for a predicate assertion macro.
-
-        Args:
-          use_format:     true if and only if the assertion is a *_PRED_FORMAT*.
-          use_assert:     true if and only if the assertion is a ASSERT_*.
-          expect_failure: true if and only if the assertion is expected to fail.
-          use_functor:    true if and only if the first argument of the assertion is
-                          a functor (as opposed to a function)
-          use_user_type:  true if and only if the predicate functor/function takes
-                          argument(s) of a user-defined type.
-
-        Example:
-
-          GenTest(1, 0, 0, 1, 0) returns a test that tests the behavior
-          of a successful EXPECT_PRED_FORMATn() that takes a functor
-          whose arguments have built-in types."""
-
-        if use_assert:
-            assrt = 'ASSERT'  # 'assert' is reserved, so we cannot use
-            # that identifier here.
-        else:
-            assrt = 'EXPECT'
-
-        assertion = assrt + '_PRED'
-
-        if use_format:
-            pred_format = 'PredFormat'
-            assertion += '_FORMAT'
-        else:
-            pred_format = 'Pred'
-
-        assertion += '%(n)s' % DEFS
-
-        if use_functor:
-            pred_format_type = 'functor'
-            pred_format += 'Functor%(n)s()'
-        else:
-            pred_format_type = 'function'
-            pred_format += 'Function%(n)s'
-            if not use_format:
-                if use_user_type:
-                    pred_format += 'Bool'
-                else:
-                    pred_format += 'Int'
-
-        test_name = pred_format_type.title()
-
-        if use_user_type:
-            arg_type = 'user-defined type (Bool)'
-            test_name += 'OnUserType'
-            if expect_failure:
-                arg = 'Bool(n%s_++)'
-            else:
-                arg = 'Bool(++n%s_)'
-        else:
-            arg_type = 'built-in type (int)'
-            test_name += 'OnBuiltInType'
-            if expect_failure:
-                arg = 'n%s_++'
-            else:
-                arg = '++n%s_'
-
-        if expect_failure:
-            successful_or_failed = 'failed'
-            expected_or_not = 'expected.'
-            test_name += 'Failure'
-        else:
-            successful_or_failed = 'successful'
-            expected_or_not = 'UNEXPECTED!'
-            test_name += 'Success'
-
-        # A map that defines the values used in the test template.
-        defs = DEFS.copy()
-        defs.update({
-            'assert': assrt,
-            'assertion': assertion,
-            'test_name': test_name,
-            'pf_type': pred_format_type,
-            'pf': pred_format,
-            'arg_type': arg_type,
-            'arg': arg,
-            'successful': successful_or_failed,
-            'expected': expected_or_not,
-        })
-
-        test = """
-// Tests a %(successful)s %(assertion)s where the
-// predicate-formatter is a %(pf_type)s on a %(arg_type)s.
-TEST_F(%(assertion)sTest, %(test_name)s) {""" % defs
-
-        indent = (len(assertion) + 3) * ' '
-        extra_indent = ''
-
-        if expect_failure:
-            extra_indent = '  '
-            if use_assert:
-                test += """
-  expected_to_finish_ = false;
-  EXPECT_FATAL_FAILURE({  // NOLINT"""
-            else:
-                test += """
-  EXPECT_NONFATAL_FAILURE({  // NOLINT"""
-
-        test += '\n' + extra_indent + """  %(assertion)s(%(pf)s""" % defs
-
-        test = test % defs
-        test += Iter(n, ',\n' + indent + extra_indent + '%(arg)s' % defs)
-        test += ');\n' + extra_indent + '  finished_ = true;\n'
-
-        if expect_failure:
-            test += '  }, "");\n'
-
-        test += '}\n'
-        return test
-
-    # Generates tests for all 2**6 = 64 combinations.
-    tests += ''.join([GenTest(use_format, use_assert, expect_failure,
-                              use_functor, use_user_type)
-                      for use_format in [0, 1]
-                      for use_assert in [0, 1]
-                      for expect_failure in [0, 1]
-                      for use_functor in [0, 1]
-                      for use_user_type in [0, 1]
-                      ])
-
-    return tests
-
-
-def UnitTestPostamble():
-    """Returns the postamble for the tests."""
-
-    return ''
-
-
-def GenerateUnitTest(n):
-    """Returns the tests for up-to n-ary predicate assertions."""
-
-    GenerateFile(UNIT_TEST,
-                 UnitTestPreamble()
-                 + ''.join([TestsForArity(i) for i in OneTo(n)])
-                 + UnitTestPostamble())
-
-
-def _Main():
-    """The entry point of the script.  Generates the header file and its
-    unit test."""
-
-    if len(sys.argv) != 2:
-        print
-        __doc__
-        print
-        'Author: ' + __author__
-        sys.exit(1)
-
-    n = int(sys.argv[1])
-    GenerateHeader(n)
-    GenerateUnitTest(n)
-
-
-if __name__ == '__main__':
-    _Main()
diff --git a/external/googletest/googletest/scripts/gtest-config.in b/external/googletest/googletest/scripts/gtest-config.in
deleted file mode 100644
index 780f8432..00000000
--- a/external/googletest/googletest/scripts/gtest-config.in
+++ /dev/null
@@ -1,274 +0,0 @@
-#!/bin/sh
-
-# These variables are automatically filled in by the configure script.
-name="@PACKAGE_TARNAME@"
-version="@PACKAGE_VERSION@"
-
-show_usage()
-{
-  echo "Usage: gtest-config [OPTIONS...]"
-}
-
-show_help()
-{
-  show_usage
-  cat <<\EOF
-
-The `gtest-config' script provides access to the necessary compile and linking
-flags to connect with Google C++ Testing Framework, both in a build prior to
-installation, and on the system proper after installation. The installation
-overrides may be issued in combination with any other queries, but will only
-affect installation queries if called on a built but not installed gtest. The
-installation queries may not be issued with any other types of queries, and
-only one installation query may be made at a time. The version queries and
-compiler flag queries may be combined as desired but not mixed. Different
-version queries are always combined with logical "and" semantics, and only the
-last of any particular query is used while all previous ones ignored. All
-versions must be specified as a sequence of numbers separated by periods.
-Compiler flag queries output the union of the sets of flags when combined.
-
- Examples:
-  gtest-config --min-version=1.0 || echo "Insufficient Google Test version."
-
-  g++ $(gtest-config --cppflags --cxxflags) -o foo.o -c foo.cpp
-  g++ $(gtest-config --ldflags --libs) -o foo foo.o
-
-  # When using a built but not installed Google Test:
-  g++ $(../../my_gtest_build/scripts/gtest-config ...) ...
-
-  # When using an installed Google Test, but with installation overrides:
-  export GTEST_PREFIX="/opt"
-  g++ $(gtest-config --libdir="/opt/lib64" ...) ...
-
- Help:
-  --usage                    brief usage information
-  --help                     display this help message
-
- Installation Overrides:
-  --prefix=<dir>             overrides the installation prefix
-  --exec-prefix=<dir>        overrides the executable installation prefix
-  --libdir=<dir>             overrides the library installation prefix
-  --includedir=<dir>         overrides the header file installation prefix
-
- Installation Queries:
-  --prefix                   installation prefix
-  --exec-prefix              executable installation prefix
-  --libdir                   library installation directory
-  --includedir               header file installation directory
-  --version                  the version of the Google Test installation
-
- Version Queries:
-  --min-version=VERSION      return 0 if the version is at least VERSION
-  --exact-version=VERSION    return 0 if the version is exactly VERSION
-  --max-version=VERSION      return 0 if the version is at most VERSION
-
- Compilation Flag Queries:
-  --cppflags                 compile flags specific to the C-like preprocessors
-  --cxxflags                 compile flags appropriate for C++ programs
-  --ldflags                  linker flags
-  --libs                     libraries for linking
-
-EOF
-}
-
-# This function bounds our version with a min and a max. It uses some clever
-# POSIX-compliant variable expansion to portably do all the work in the shell
-# and avoid any dependency on a particular "sed" or "awk" implementation.
-# Notable is that it will only ever compare the first 3 components of versions.
-# Further components will be cleanly stripped off. All versions must be
-# unadorned, so "v1.0" will *not* work. The minimum version must be in $1, and
-# the max in $2. TODO(chandlerc@google.com): If this ever breaks, we should
-# investigate expanding this via autom4te from AS_VERSION_COMPARE rather than
-# continuing to maintain our own shell version.
-check_versions()
-{
-  major_version=${version%%.*}
-  minor_version="0"
-  point_version="0"
-  if test "${version#*.}" != "${version}"; then
-    minor_version=${version#*.}
-    minor_version=${minor_version%%.*}
-  fi
-  if test "${version#*.*.}" != "${version}"; then
-    point_version=${version#*.*.}
-    point_version=${point_version%%.*}
-  fi
-
-  min_version="$1"
-  min_major_version=${min_version%%.*}
-  min_minor_version="0"
-  min_point_version="0"
-  if test "${min_version#*.}" != "${min_version}"; then
-    min_minor_version=${min_version#*.}
-    min_minor_version=${min_minor_version%%.*}
-  fi
-  if test "${min_version#*.*.}" != "${min_version}"; then
-    min_point_version=${min_version#*.*.}
-    min_point_version=${min_point_version%%.*}
-  fi
-
-  max_version="$2"
-  max_major_version=${max_version%%.*}
-  max_minor_version="0"
-  max_point_version="0"
-  if test "${max_version#*.}" != "${max_version}"; then
-    max_minor_version=${max_version#*.}
-    max_minor_version=${max_minor_version%%.*}
-  fi
-  if test "${max_version#*.*.}" != "${max_version}"; then
-    max_point_version=${max_version#*.*.}
-    max_point_version=${max_point_version%%.*}
-  fi
-
-  test $(($major_version)) -lt $(($min_major_version)) && exit 1
-  if test $(($major_version)) -eq $(($min_major_version)); then
-    test $(($minor_version)) -lt $(($min_minor_version)) && exit 1
-    if test $(($minor_version)) -eq $(($min_minor_version)); then
-      test $(($point_version)) -lt $(($min_point_version)) && exit 1
-    fi
-  fi
-
-  test $(($major_version)) -gt $(($max_major_version)) && exit 1
-  if test $(($major_version)) -eq $(($max_major_version)); then
-    test $(($minor_version)) -gt $(($max_minor_version)) && exit 1
-    if test $(($minor_version)) -eq $(($max_minor_version)); then
-      test $(($point_version)) -gt $(($max_point_version)) && exit 1
-    fi
-  fi
-
-  exit 0
-}
-
-# Show the usage line when no arguments are specified.
-if test $# -eq 0; then
-  show_usage
-  exit 1
-fi
-
-while test $# -gt 0; do
-  case $1 in
-    --usage)          show_usage;         exit 0;;
-    --help)           show_help;          exit 0;;
-
-    # Installation overrides
-    --prefix=*)       GTEST_PREFIX=${1#--prefix=};;
-    --exec-prefix=*)  GTEST_EXEC_PREFIX=${1#--exec-prefix=};;
-    --libdir=*)       GTEST_LIBDIR=${1#--libdir=};;
-    --includedir=*)   GTEST_INCLUDEDIR=${1#--includedir=};;
-
-    # Installation queries
-    --prefix|--exec-prefix|--libdir|--includedir|--version)
-      if test -n "${do_query}"; then
-        show_usage
-        exit 1
-      fi
-      do_query=${1#--}
-      ;;
-
-    # Version checking
-    --min-version=*)
-      do_check_versions=yes
-      min_version=${1#--min-version=}
-      ;;
-    --max-version=*)
-      do_check_versions=yes
-      max_version=${1#--max-version=}
-      ;;
-    --exact-version=*)
-      do_check_versions=yes
-      exact_version=${1#--exact-version=}
-      ;;
-
-    # Compiler flag output
-    --cppflags)       echo_cppflags=yes;;
-    --cxxflags)       echo_cxxflags=yes;;
-    --ldflags)        echo_ldflags=yes;;
-    --libs)           echo_libs=yes;;
-
-    # Everything else is an error
-    *)                show_usage;         exit 1;;
-  esac
-  shift
-done
-
-# These have defaults filled in by the configure script but can also be
-# overridden by environment variables or command line parameters.
-prefix="${GTEST_PREFIX:-@prefix@}"
-exec_prefix="${GTEST_EXEC_PREFIX:-@exec_prefix@}"
-libdir="${GTEST_LIBDIR:-@libdir@}"
-includedir="${GTEST_INCLUDEDIR:-@includedir@}"
-
-# We try and detect if our binary is not located at its installed location. If
-# it's not, we provide variables pointing to the source and build tree rather
-# than to the install tree. This allows building against a just-built gtest
-# rather than an installed gtest.
-bindir="@bindir@"
-this_relative_bindir=`dirname $0`
-this_bindir=`cd ${this_relative_bindir}; pwd -P`
-if test "${this_bindir}" = "${this_bindir%${bindir}}"; then
-  # The path to the script doesn't end in the bindir sequence from Autoconf,
-  # assume that we are in a build tree.
-  build_dir=`dirname ${this_bindir}`
-  src_dir=`cd ${this_bindir}; cd @top_srcdir@; pwd -P`
-
-  # TODO(chandlerc@google.com): This is a dangerous dependency on libtool, we
-  # should work to remove it, and/or remove libtool altogether, replacing it
-  # with direct references to the library and a link path.
-  gtest_libs="${build_dir}/lib/libgtest.la @PTHREAD_CFLAGS@ @PTHREAD_LIBS@"
-  gtest_ldflags=""
-
-  # We provide hooks to include from either the source or build dir, where the
-  # build dir is always preferred. This will potentially allow us to write
-  # build rules for generated headers and have them automatically be preferred
-  # over provided versions.
-  gtest_cppflags="-I${build_dir}/include -I${src_dir}/include"
-  gtest_cxxflags="@PTHREAD_CFLAGS@"
-else
-  # We're using an installed gtest, although it may be staged under some
-  # prefix. Assume (as our own libraries do) that we can resolve the prefix,
-  # and are present in the dynamic link paths.
-  gtest_ldflags="-L${libdir}"
-  gtest_libs="-l${name} @PTHREAD_CFLAGS@ @PTHREAD_LIBS@"
-  gtest_cppflags="-I${includedir}"
-  gtest_cxxflags="@PTHREAD_CFLAGS@"
-fi
-
-# Do an installation query if requested.
-if test -n "$do_query"; then
-  case $do_query in
-    prefix)           echo $prefix;       exit 0;;
-    exec-prefix)      echo $exec_prefix;  exit 0;;
-    libdir)           echo $libdir;       exit 0;;
-    includedir)       echo $includedir;   exit 0;;
-    version)          echo $version;      exit 0;;
-    *)                show_usage;         exit 1;;
-  esac
-fi
-
-# Do a version check if requested.
-if test "$do_check_versions" = "yes"; then
-  # Make sure we didn't receive a bad combination of parameters.
-  test "$echo_cppflags" = "yes" && show_usage && exit 1
-  test "$echo_cxxflags" = "yes" && show_usage && exit 1
-  test "$echo_ldflags" = "yes"  && show_usage && exit 1
-  test "$echo_libs" = "yes"     && show_usage && exit 1
-
-  if test "$exact_version" != ""; then
-    check_versions $exact_version $exact_version
-    # unreachable
-  else
-    check_versions ${min_version:-0.0.0} ${max_version:-9999.9999.9999}
-    # unreachable
-  fi
-fi
-
-# Do the output in the correct order so that these can be used in-line of
-# a compiler invocation.
-output=""
-test "$echo_cppflags" = "yes" && output="$output $gtest_cppflags"
-test "$echo_cxxflags" = "yes" && output="$output $gtest_cxxflags"
-test "$echo_ldflags" = "yes"  && output="$output $gtest_ldflags"
-test "$echo_libs" = "yes"     && output="$output $gtest_libs"
-echo $output
-
-exit 0
diff --git a/external/googletest/googletest/scripts/release_docs.py b/external/googletest/googletest/scripts/release_docs.py
deleted file mode 100644
index 1ce05088..00000000
--- a/external/googletest/googletest/scripts/release_docs.py
+++ /dev/null
@@ -1,160 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2013 Google Inc. All Rights Reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Script for branching Google Test/Mock wiki pages for a new version.
-
-SYNOPSIS
-       release_docs.py NEW_RELEASE_VERSION
-
-       Google Test and Google Mock's external user documentation is in
-       interlinked wiki files.  When we release a new version of
-       Google Test or Google Mock, we need to branch the wiki files
-       such that users of a specific version of Google Test/Mock can
-       look up documentation relevant for that version.  This script
-       automates that process by:
-
-         - branching the current wiki pages (which document the
-           behavior of the SVN trunk head) to pages for the specified
-           version (e.g. branching FAQ.wiki to V2_6_FAQ.wiki when
-           NEW_RELEASE_VERSION is 2.6);
-         - updating the links in the branched files to point to the branched
-           version (e.g. a link in V2_6_FAQ.wiki that pointed to
-           Primer.wiki#Anchor will now point to V2_6_Primer.wiki#Anchor).
-
-       NOTE: NEW_RELEASE_VERSION must be a NEW version number for
-       which the wiki pages don't yet exist; otherwise you'll get SVN
-       errors like "svn: Path 'V1_7_PumpManual.wiki' is not a
-       directory" when running the script.
-
-EXAMPLE
-       $ cd PATH/TO/GTEST_SVN_WORKSPACE/trunk
-       $ scripts/release_docs.py 2.6  # create wiki pages for v2.6
-       $ svn status                   # verify the file list
-       $ svn diff                     # verify the file contents
-       $ svn commit -m "release wiki pages for v2.6"
-"""
-
-__author__ = 'wan@google.com (Zhanyong Wan)'
-
-import os
-import re
-import sys
-
-import common
-
-# Wiki pages that shouldn't be branched for every gtest/gmock release.
-GTEST_UNVERSIONED_WIKIS = ['DevGuide.wiki']
-GMOCK_UNVERSIONED_WIKIS = [
-    'DesignDoc.wiki',
-    'DevGuide.wiki',
-    'KnownIssues.wiki'
-]
-
-
-def DropWikiSuffix(wiki_filename):
-    """Removes the .wiki suffix (if any) from the given filename."""
-
-    return (wiki_filename[:-len('.wiki')] if wiki_filename.endswith('.wiki')
-            else wiki_filename)
-
-
-class WikiBrancher(object):
-    """Branches ..."""
-
-    def __init__(self, dot_version):
-        self.project, svn_root_path = common.GetSvnInfo()
-        if self.project not in ('googletest', 'googlemock'):
-            sys.exit('This script must be run in a gtest or gmock SVN workspace.')
-        self.wiki_dir = svn_root_path + '/wiki'
-        # Turn '2.6' to 'V2_6_'.
-        self.version_prefix = 'V' + dot_version.replace('.', '_') + '_'
-        self.files_to_branch = self.GetFilesToBranch()
-        page_names = [DropWikiSuffix(f) for f in self.files_to_branch]
-        # A link to Foo.wiki is in one of the following forms:
-        #   [Foo words]
-        #   [Foo#Anchor words]
-        #   [http://code.google.com/.../wiki/Foo words]
-        #   [http://code.google.com/.../wiki/Foo#Anchor words]
-        # We want to replace 'Foo' with 'V2_6_Foo' in the above cases.
-        self.search_for_re = re.compile(
-            # This regex matches either
-            #   [Foo
-            # or
-            #   /wiki/Foo
-            # followed by a space or a #, where Foo is the name of an
-            # unversioned wiki page.
-            r'(\[|/wiki/)(%s)([ #])' % '|'.join(page_names))
-        self.replace_with = r'\1%s\2\3' % (self.version_prefix,)
-
-    def GetFilesToBranch(self):
-        """Returns a list of .wiki file names that need to be branched."""
-
-        unversioned_wikis = (GTEST_UNVERSIONED_WIKIS if self.project == 'googletest'
-                             else GMOCK_UNVERSIONED_WIKIS)
-        return [f for f in os.listdir(self.wiki_dir)
-                if (f.endswith('.wiki') and
-                    not re.match(r'^V\d', f) and  # Excluded versioned .wiki files.
-                    f not in unversioned_wikis)]
-
-    def BranchFiles(self):
-        """Branches the .wiki files needed to be branched."""
-
-        print
-        'Branching %d .wiki files:' % (len(self.files_to_branch),)
-        os.chdir(self.wiki_dir)
-        for f in self.files_to_branch:
-            command = 'svn cp %s %s%s' % (f, self.version_prefix, f)
-            print
-            command
-            os.system(command)
-
-    def UpdateLinksInBranchedFiles(self):
-
-        for f in self.files_to_branch:
-            source_file = os.path.join(self.wiki_dir, f)
-            versioned_file = os.path.join(self.wiki_dir, self.version_prefix + f)
-            print
-            'Updating links in %s.' % (versioned_file,)
-            text = file(source_file, 'r').read()
-            new_text = self.search_for_re.sub(self.replace_with, text)
-            file(versioned_file, 'w').write(new_text)
-
-
-def main():
-    if len(sys.argv) != 2:
-        sys.exit(__doc__)
-
-    brancher = WikiBrancher(sys.argv[1])
-    brancher.BranchFiles()
-    brancher.UpdateLinksInBranchedFiles()
-
-
-if __name__ == '__main__':
-    main()
diff --git a/external/googletest/googletest/scripts/run_with_path.py b/external/googletest/googletest/scripts/run_with_path.py
deleted file mode 100644
index 0fd85884..00000000
--- a/external/googletest/googletest/scripts/run_with_path.py
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2010 Google Inc. All Rights Reserved.
-
-"""Runs program specified in the command line with the substituted PATH.
-
-   This script is needed for to support building under Pulse which is unable
-   to override the existing PATH variable.
-"""
-
-import os
-import subprocess
-import sys
-
-SUBST_PATH_ENV_VAR_NAME = "SUBST_PATH"
-
-
-def main():
-    if SUBST_PATH_ENV_VAR_NAME in os.environ:
-        os.environ["PATH"] = os.environ[SUBST_PATH_ENV_VAR_NAME]
-
-    exit_code = subprocess.Popen(sys.argv[1:]).wait()
-
-    # exit_code is negative (-signal) if the process has been terminated by
-    # a signal. Returning negative exit code is not portable and so we return
-    # 100 instead.
-    if exit_code < 0:
-        exit_code = 100
-
-    sys.exit(exit_code)
-
-
-if __name__ == "__main__":
-    main()
diff --git a/external/googletest/googletest/scripts/upload.py b/external/googletest/googletest/scripts/upload.py
deleted file mode 100644
index d04e98c4..00000000
--- a/external/googletest/googletest/scripts/upload.py
+++ /dev/null
@@ -1,1410 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2007, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Tool for uploading diffs from a version control system to the codereview app.
-
-Usage summary: upload.py [options] [-- diff_options]
-
-Diff options are passed to the diff command of the underlying system.
-
-Supported version control systems:
-  Git
-  Mercurial
-  Subversion
-
-It is important for Git/Mercurial users to specify a tree/node/branch to diff
-against by using the '--rev' option.
-"""
-# This code is derived from appcfg.py in the App Engine SDK (open source),
-# and from ASPN recipe #146306.
-
-import cookielib
-import getpass
-import logging
-import md5
-import mimetypes
-import optparse
-import os
-import re
-import socket
-import subprocess
-import sys
-import urllib
-import urllib2
-import urlparse
-
-try:
-    import readline
-except ImportError:
-    pass
-
-# The logging verbosity:
-#  0: Errors only.
-#  1: Status messages.
-#  2: Info logs.
-#  3: Debug logs.
-verbosity = 1
-
-# Max size of patch or base file.
-MAX_UPLOAD_SIZE = 900 * 1024
-
-
-def GetEmail(prompt):
-    """Prompts the user for their email address and returns it.
-
-    The last used email address is saved to a file and offered up as a suggestion
-    to the user. If the user presses enter without typing in anything the last
-    used email address is used. If the user enters a new address, it is saved
-    for next time we prompt.
-
-    """
-    last_email_file_name = os.path.expanduser("~/.last_codereview_email_address")
-    last_email = ""
-    if os.path.exists(last_email_file_name):
-        try:
-            last_email_file = open(last_email_file_name, "r")
-            last_email = last_email_file.readline().strip("\n")
-            last_email_file.close()
-            prompt += " [%s]" % last_email
-        except IOError, e:
-            pass
-    email = raw_input(prompt + ": ").strip()
-    if email:
-        try:
-            last_email_file = open(last_email_file_name, "w")
-            last_email_file.write(email)
-            last_email_file.close()
-        except IOError, e:
-            pass
-    else:
-        email = last_email
-    return email
-
-
-def StatusUpdate(msg):
-    """Print a status message to stdout.
-
-    If 'verbosity' is greater than 0, print the message.
-
-    Args:
-      msg: The string to print.
-    """
-    if verbosity > 0:
-        print
-        msg
-
-
-def ErrorExit(msg):
-    """Print an error message to stderr and exit."""
-    print >> sys.stderr, msg
-    sys.exit(1)
-
-
-class ClientLoginError(urllib2.HTTPError):
-    """Raised to indicate there was an error authenticating with ClientLogin."""
-
-    def __init__(self, url, code, msg, headers, args):
-        urllib2.HTTPError.__init__(self, url, code, msg, headers, None)
-        self.args = args
-        self.reason = args["Error"]
-
-
-class AbstractRpcServer(object):
-    """Provides a common interface for a simple RPC server."""
-
-    def __init__(self, host, auth_function, host_override=None, extra_headers={},
-                 save_cookies=False):
-        """Creates a new HttpRpcServer.
-
-        Args:
-          host: The host to send requests to.
-          auth_function: A function that takes no arguments and returns an
-            (email, password) tuple when called. Will be called if authentication
-            is required.
-          host_override: The host header to send to the server (defaults to host).
-          extra_headers: A dict of extra headers to append to every request.
-          save_cookies: If True, save the authentication cookies to local disk.
-            If False, use an in-memory cookiejar instead.  Subclasses must
-            implement this functionality.  Defaults to False.
-        """
-        self.host = host
-        self.host_override = host_override
-        self.auth_function = auth_function
-        self.authenticated = False
-        self.extra_headers = extra_headers
-        self.save_cookies = save_cookies
-        self.opener = self._GetOpener()
-        if self.host_override:
-            logging.info("Server: %s; Host: %s", self.host, self.host_override)
-        else:
-            logging.info("Server: %s", self.host)
-
-    def _GetOpener(self):
-        """Returns an OpenerDirector for making HTTP requests.
-
-        Returns:
-          A urllib2.OpenerDirector object.
-        """
-        raise NotImplementedError()
-
-    def _CreateRequest(self, url, data=None):
-        """Creates a new urllib request."""
-        logging.debug("Creating request for: '%s' with payload:\n%s", url, data)
-        req = urllib2.Request(url, data=data)
-        if self.host_override:
-            req.add_header("Host", self.host_override)
-        for key, value in self.extra_headers.iteritems():
-            req.add_header(key, value)
-        return req
-
-    def _GetAuthToken(self, email, password):
-        """Uses ClientLogin to authenticate the user, returning an auth token.
-
-        Args:
-          email:    The user's email address
-          password: The user's password
-
-        Raises:
-          ClientLoginError: If there was an error authenticating with ClientLogin.
-          HTTPError: If there was some other form of HTTP error.
-
-        Returns:
-          The authentication token returned by ClientLogin.
-        """
-        account_type = "GOOGLE"
-        if self.host.endswith(".google.com"):
-            # Needed for use inside Google.
-            account_type = "HOSTED"
-        req = self._CreateRequest(
-            url="https://www.google.com/accounts/ClientLogin",
-            data=urllib.urlencode({
-                "Email": email,
-                "Passwd": password,
-                "service": "ah",
-                "source": "rietveld-codereview-upload",
-                "accountType": account_type,
-            }),
-        )
-        try:
-            response = self.opener.open(req)
-            response_body = response.read()
-            response_dict = dict(x.split("=")
-                                 for x in response_body.split("\n") if x)
-            return response_dict["Auth"]
-        except urllib2.HTTPError, e:
-            if e.code == 403:
-                body = e.read()
-                response_dict = dict(x.split("=", 1) for x in body.split("\n") if x)
-                raise ClientLoginError(req.get_full_url(), e.code, e.msg,
-                                       e.headers, response_dict)
-            else:
-                raise
-
-    def _GetAuthCookie(self, auth_token):
-        """Fetches authentication cookies for an authentication token.
-
-        Args:
-          auth_token: The authentication token returned by ClientLogin.
-
-        Raises:
-          HTTPError: If there was an error fetching the authentication cookies.
-        """
-        # This is a dummy value to allow us to identify when we're successful.
-        continue_location = "http://localhost/"
-        args = {"continue": continue_location, "auth": auth_token}
-        req = self._CreateRequest("http://%s/_ah/login?%s" %
-                                  (self.host, urllib.urlencode(args)))
-        try:
-            response = self.opener.open(req)
-        except urllib2.HTTPError, e:
-            response = e
-        if (response.code != 302 or
-                response.info()["location"] != continue_location):
-            raise urllib2.HTTPError(req.get_full_url(), response.code, response.msg,
-                                    response.headers, response.fp)
-        self.authenticated = True
-
-    def _Authenticate(self):
-        """Authenticates the user.
-
-        The authentication process works as follows:
-         1) We get a username and password from the user
-         2) We use ClientLogin to obtain an AUTH token for the user
-            (see https://developers.google.com/identity/protocols/AuthForInstalledApps).
-         3) We pass the auth token to /_ah/login on the server to obtain an
-            authentication cookie. If login was successful, it tries to redirect
-            us to the URL we provided.
-
-        If we attempt to access the upload API without first obtaining an
-        authentication cookie, it returns a 401 response and directs us to
-        authenticate ourselves with ClientLogin.
-        """
-        for i in range(3):
-            credentials = self.auth_function()
-            try:
-                auth_token = self._GetAuthToken(credentials[0], credentials[1])
-            except ClientLoginError, e:
-                if e.reason == "BadAuthentication":
-                    print >> sys.stderr, "Invalid username or password."
-                    continue
-                if e.reason == "CaptchaRequired":
-                    print >> sys.stderr, (
-                        "Please go to\n"
-                        "https://www.google.com/accounts/DisplayUnlockCaptcha\n"
-                        "and verify you are a human.  Then try again.")
-                    break
-                if e.reason == "NotVerified":
-                    print >> sys.stderr, "Account not verified."
-                    break
-                if e.reason == "TermsNotAgreed":
-                    print >> sys.stderr, "User has not agreed to TOS."
-                    break
-                if e.reason == "AccountDeleted":
-                    print >> sys.stderr, "The user account has been deleted."
-                    break
-                if e.reason == "AccountDisabled":
-                    print >> sys.stderr, "The user account has been disabled."
-                    break
-                if e.reason == "ServiceDisabled":
-                    print >> sys.stderr, ("The user's access to the service has been "
-                                          "disabled.")
-                    break
-                if e.reason == "ServiceUnavailable":
-                    print >> sys.stderr, "The service is not available; try again later."
-                    break
-                raise
-            self._GetAuthCookie(auth_token)
-            return
-
-    def Send(self, request_path, payload=None,
-             content_type="application/octet-stream",
-             timeout=None,
-             **kwargs):
-        """Sends an RPC and returns the response.
-
-        Args:
-          request_path: The path to send the request to, eg /api/appversion/create.
-          payload: The body of the request, or None to send an empty request.
-          content_type: The Content-Type header to use.
-          timeout: timeout in seconds; default None i.e. no timeout.
-            (Note: for large requests on OS X, the timeout doesn't work right.)
-          kwargs: Any keyword arguments are converted into query string parameters.
-
-        Returns:
-          The response body, as a string.
-        """
-        # TODO: Don't require authentication.  Let the server say
-        # whether it is necessary.
-        if not self.authenticated:
-            self._Authenticate()
-
-        old_timeout = socket.getdefaulttimeout()
-        socket.setdefaulttimeout(timeout)
-        try:
-            tries = 0
-            while True:
-                tries += 1
-                args = dict(kwargs)
-                url = "http://%s%s" % (self.host, request_path)
-                if args:
-                    url += "?" + urllib.urlencode(args)
-                req = self._CreateRequest(url=url, data=payload)
-                req.add_header("Content-Type", content_type)
-                try:
-                    f = self.opener.open(req)
-                    response = f.read()
-                    f.close()
-                    return response
-                except urllib2.HTTPError, e:
-                    if tries > 3:
-                        raise
-                    elif e.code == 401:
-                        self._Authenticate()
-                    ##           elif e.code >= 500 and e.code < 600:
-                    ##             # Server Error - try again.
-                    ##             continue
-                    else:
-                        raise
-        finally:
-            socket.setdefaulttimeout(old_timeout)
-
-
-class HttpRpcServer(AbstractRpcServer):
-    """Provides a simplified RPC-style interface for HTTP requests."""
-
-    def _Authenticate(self):
-        """Save the cookie jar after authentication."""
-        super(HttpRpcServer, self)._Authenticate()
-        if self.save_cookies:
-            StatusUpdate("Saving authentication cookies to %s" % self.cookie_file)
-            self.cookie_jar.save()
-
-    def _GetOpener(self):
-        """Returns an OpenerDirector that supports cookies and ignores redirects.
-
-        Returns:
-          A urllib2.OpenerDirector object.
-        """
-        opener = urllib2.OpenerDirector()
-        opener.add_handler(urllib2.ProxyHandler())
-        opener.add_handler(urllib2.UnknownHandler())
-        opener.add_handler(urllib2.HTTPHandler())
-        opener.add_handler(urllib2.HTTPDefaultErrorHandler())
-        opener.add_handler(urllib2.HTTPSHandler())
-        opener.add_handler(urllib2.HTTPErrorProcessor())
-        if self.save_cookies:
-            self.cookie_file = os.path.expanduser("~/.codereview_upload_cookies")
-            self.cookie_jar = cookielib.MozillaCookieJar(self.cookie_file)
-            if os.path.exists(self.cookie_file):
-                try:
-                    self.cookie_jar.load()
-                    self.authenticated = True
-                    StatusUpdate("Loaded authentication cookies from %s" %
-                                 self.cookie_file)
-                except (cookielib.LoadError, IOError):
-                    # Failed to load cookies - just ignore them.
-                    pass
-            else:
-                # Create an empty cookie file with mode 600
-                fd = os.open(self.cookie_file, os.O_CREAT, 0600)
-                os.close(fd)
-            # Always chmod the cookie file
-            os.chmod(self.cookie_file, 0600)
-        else:
-            # Don't save cookies across runs of update.py.
-            self.cookie_jar = cookielib.CookieJar()
-        opener.add_handler(urllib2.HTTPCookieProcessor(self.cookie_jar))
-        return opener
-
-
-parser = optparse.OptionParser(usage="%prog [options] [-- diff_options]")
-parser.add_option("-y", "--assume_yes", action="store_true",
-                  dest="assume_yes", default=False,
-                  help="Assume that the answer to yes/no questions is 'yes'.")
-# Logging
-group = parser.add_option_group("Logging options")
-group.add_option("-q", "--quiet", action="store_const", const=0,
-                 dest="verbose", help="Print errors only.")
-group.add_option("-v", "--verbose", action="store_const", const=2,
-                 dest="verbose", default=1,
-                 help="Print info level logs (default).")
-group.add_option("--noisy", action="store_const", const=3,
-                 dest="verbose", help="Print all logs.")
-# Review server
-group = parser.add_option_group("Review server options")
-group.add_option("-s", "--server", action="store", dest="server",
-                 default="codereview.appspot.com",
-                 metavar="SERVER",
-                 help=("The server to upload to. The format is host[:port]. "
-                       "Defaults to 'codereview.appspot.com'."))
-group.add_option("-e", "--email", action="store", dest="email",
-                 metavar="EMAIL", default=None,
-                 help="The username to use. Will prompt if omitted.")
-group.add_option("-H", "--host", action="store", dest="host",
-                 metavar="HOST", default=None,
-                 help="Overrides the Host header sent with all RPCs.")
-group.add_option("--no_cookies", action="store_false",
-                 dest="save_cookies", default=True,
-                 help="Do not save authentication cookies to local disk.")
-# Issue
-group = parser.add_option_group("Issue options")
-group.add_option("-d", "--description", action="store", dest="description",
-                 metavar="DESCRIPTION", default=None,
-                 help="Optional description when creating an issue.")
-group.add_option("-f", "--description_file", action="store",
-                 dest="description_file", metavar="DESCRIPTION_FILE",
-                 default=None,
-                 help="Optional path of a file that contains "
-                      "the description when creating an issue.")
-group.add_option("-r", "--reviewers", action="store", dest="reviewers",
-                 metavar="REVIEWERS", default=None,
-                 help="Add reviewers (comma separated email addresses).")
-group.add_option("--cc", action="store", dest="cc",
-                 metavar="CC", default=None,
-                 help="Add CC (comma separated email addresses).")
-# Upload options
-group = parser.add_option_group("Patch options")
-group.add_option("-m", "--message", action="store", dest="message",
-                 metavar="MESSAGE", default=None,
-                 help="A message to identify the patch. "
-                      "Will prompt if omitted.")
-group.add_option("-i", "--issue", type="int", action="store",
-                 metavar="ISSUE", default=None,
-                 help="Issue number to which to add. Defaults to new issue.")
-group.add_option("--download_base", action="store_true",
-                 dest="download_base", default=False,
-                 help="Base files will be downloaded by the server "
-                      "(side-by-side diffs may not work on files with CRs).")
-group.add_option("--rev", action="store", dest="revision",
-                 metavar="REV", default=None,
-                 help="Branch/tree/revision to diff against (used by DVCS).")
-group.add_option("--send_mail", action="store_true",
-                 dest="send_mail", default=False,
-                 help="Send notification email to reviewers.")
-
-
-def GetRpcServer(options):
-    """Returns an instance of an AbstractRpcServer.
-
-    Returns:
-      A new AbstractRpcServer, on which RPC calls can be made.
-    """
-
-    rpc_server_class = HttpRpcServer
-
-    def GetUserCredentials():
-        """Prompts the user for a username and password."""
-        email = options.email
-        if email is None:
-            email = GetEmail("Email (login for uploading to %s)" % options.server)
-        password = getpass.getpass("Password for %s: " % email)
-        return (email, password)
-
-    # If this is the dev_appserver, use fake authentication.
-    host = (options.host or options.server).lower()
-    if host == "localhost" or host.startswith("localhost:"):
-        email = options.email
-        if email is None:
-            email = "test@example.com"
-            logging.info("Using debug user %s.  Override with --email" % email)
-        server = rpc_server_class(
-            options.server,
-            lambda: (email, "password"),
-            host_override=options.host,
-            extra_headers={"Cookie":
-                               'dev_appserver_login="%s:False"' % email},
-            save_cookies=options.save_cookies)
-        # Don't try to talk to ClientLogin.
-        server.authenticated = True
-        return server
-
-    return rpc_server_class(options.server, GetUserCredentials,
-                            host_override=options.host,
-                            save_cookies=options.save_cookies)
-
-
-def EncodeMultipartFormData(fields, files):
-    """Encode form fields for multipart/form-data.
-
-    Args:
-      fields: A sequence of (name, value) elements for regular form fields.
-      files: A sequence of (name, filename, value) elements for data to be
-             uploaded as files.
-    Returns:
-      (content_type, body) ready for httplib.HTTP instance.
-
-    Source:
-      https://web.archive.org/web/20160116052001/code.activestate.com/recipes/146306
-    """
-    BOUNDARY = '-M-A-G-I-C---B-O-U-N-D-A-R-Y-'
-    CRLF = '\r\n'
-    lines = []
-    for (key, value) in fields:
-        lines.append('--' + BOUNDARY)
-        lines.append('Content-Disposition: form-data; name="%s"' % key)
-        lines.append('')
-        lines.append(value)
-    for (key, filename, value) in files:
-        lines.append('--' + BOUNDARY)
-        lines.append('Content-Disposition: form-data; name="%s"; filename="%s"' %
-                     (key, filename))
-        lines.append('Content-Type: %s' % GetContentType(filename))
-        lines.append('')
-        lines.append(value)
-    lines.append('--' + BOUNDARY + '--')
-    lines.append('')
-    body = CRLF.join(lines)
-    content_type = 'multipart/form-data; boundary=%s' % BOUNDARY
-    return content_type, body
-
-
-def GetContentType(filename):
-    """Helper to guess the content-type from the filename."""
-    return mimetypes.guess_type(filename)[0] or 'application/octet-stream'
-
-
-# Use a shell for subcommands on Windows to get a PATH search.
-use_shell = sys.platform.startswith("win")
-
-
-def RunShellWithReturnCode(command, print_output=False,
-                           universal_newlines=True):
-    """Executes a command and returns the output from stdout and the return code.
-
-    Args:
-      command: Command to execute.
-      print_output: If True, the output is printed to stdout.
-                    If False, both stdout and stderr are ignored.
-      universal_newlines: Use universal_newlines flag (default: True).
-
-    Returns:
-      Tuple (output, return code)
-    """
-    logging.info("Running %s", command)
-    p = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE,
-                         shell=use_shell, universal_newlines=universal_newlines)
-    if print_output:
-        output_array = []
-        while True:
-            line = p.stdout.readline()
-            if not line:
-                break
-            print
-            line.strip("\n")
-            output_array.append(line)
-        output = "".join(output_array)
-    else:
-        output = p.stdout.read()
-    p.wait()
-    errout = p.stderr.read()
-    if print_output and errout:
-        print >> sys.stderr, errout
-    p.stdout.close()
-    p.stderr.close()
-    return output, p.returncode
-
-
-def RunShell(command, silent_ok=False, universal_newlines=True,
-             print_output=False):
-    data, retcode = RunShellWithReturnCode(command, print_output,
-                                           universal_newlines)
-    if retcode:
-        ErrorExit("Got error status from %s:\n%s" % (command, data))
-    if not silent_ok and not data:
-        ErrorExit("No output from %s" % command)
-    return data
-
-
-class VersionControlSystem(object):
-    """Abstract base class providing an interface to the VCS."""
-
-    def __init__(self, options):
-        """Constructor.
-
-        Args:
-          options: Command line options.
-        """
-        self.options = options
-
-    def GenerateDiff(self, args):
-        """Return the current diff as a string.
-
-        Args:
-          args: Extra arguments to pass to the diff command.
-        """
-        raise NotImplementedError(
-            "abstract method -- subclass %s must override" % self.__class__)
-
-    def GetUnknownFiles(self):
-        """Return a list of files unknown to the VCS."""
-        raise NotImplementedError(
-            "abstract method -- subclass %s must override" % self.__class__)
-
-    def CheckForUnknownFiles(self):
-        """Show an "are you sure?" prompt if there are unknown files."""
-        unknown_files = self.GetUnknownFiles()
-        if unknown_files:
-            print
-            "The following files are not added to version control:"
-            for line in unknown_files:
-                print
-                line
-            prompt = "Are you sure to continue?(y/N) "
-            answer = raw_input(prompt).strip()
-            if answer != "y":
-                ErrorExit("User aborted")
-
-    def GetBaseFile(self, filename):
-        """Get the content of the upstream version of a file.
-
-        Returns:
-          A tuple (base_content, new_content, is_binary, status)
-            base_content: The contents of the base file.
-            new_content: For text files, this is empty.  For binary files, this is
-              the contents of the new file, since the diff output won't contain
-              information to reconstruct the current file.
-            is_binary: True iff the file is binary.
-            status: The status of the file.
-        """
-
-        raise NotImplementedError(
-            "abstract method -- subclass %s must override" % self.__class__)
-
-    def GetBaseFiles(self, diff):
-        """Helper that calls GetBase file for each file in the patch.
-
-        Returns:
-          A dictionary that maps from filename to GetBaseFile's tuple.  Filenames
-          are retrieved based on lines that start with "Index:" or
-          "Property changes on:".
-        """
-        files = {}
-        for line in diff.splitlines(True):
-            if line.startswith('Index:') or line.startswith('Property changes on:'):
-                unused, filename = line.split(':', 1)
-                # On Windows if a file has property changes its filename uses '\'
-                # instead of '/'.
-                filename = filename.strip().replace('\\', '/')
-                files[filename] = self.GetBaseFile(filename)
-        return files
-
-    def UploadBaseFiles(self, issue, rpc_server, patch_list, patchset, options,
-                        files):
-        """Uploads the base files (and if necessary, the current ones as well)."""
-
-        def UploadFile(filename, file_id, content, is_binary, status, is_base):
-            """Uploads a file to the server."""
-            file_too_large = False
-            if is_base:
-                type = "base"
-            else:
-                type = "current"
-            if len(content) > MAX_UPLOAD_SIZE:
-                print("Not uploading the %s file for %s because it's too large." %
-                      (type, filename))
-                file_too_large = True
-                content = ""
-            checksum = md5.new(content).hexdigest()
-            if options.verbose > 0 and not file_too_large:
-                print
-                "Uploading %s file for %s" % (type, filename)
-            url = "/%d/upload_content/%d/%d" % (int(issue), int(patchset), file_id)
-            form_fields = [("filename", filename),
-                           ("status", status),
-                           ("checksum", checksum),
-                           ("is_binary", str(is_binary)),
-                           ("is_current", str(not is_base)),
-                           ]
-            if file_too_large:
-                form_fields.append(("file_too_large", "1"))
-            if options.email:
-                form_fields.append(("user", options.email))
-            ctype, body = EncodeMultipartFormData(form_fields,
-                                                  [("data", filename, content)])
-            response_body = rpc_server.Send(url, body,
-                                            content_type=ctype)
-            if not response_body.startswith("OK"):
-                StatusUpdate("  --> %s" % response_body)
-                sys.exit(1)
-
-        patches = dict()
-        [patches.setdefault(v, k) for k, v in patch_list]
-        for filename in patches.keys():
-            base_content, new_content, is_binary, status = files[filename]
-            file_id_str = patches.get(filename)
-            if file_id_str.find("nobase") != -1:
-                base_content = None
-                file_id_str = file_id_str[file_id_str.rfind("_") + 1:]
-            file_id = int(file_id_str)
-            if base_content != None:
-                UploadFile(filename, file_id, base_content, is_binary, status, True)
-            if new_content != None:
-                UploadFile(filename, file_id, new_content, is_binary, status, False)
-
-    def IsImage(self, filename):
-        """Returns true if the filename has an image extension."""
-        mimetype = mimetypes.guess_type(filename)[0]
-        if not mimetype:
-            return False
-        return mimetype.startswith("image/")
-
-
-class SubversionVCS(VersionControlSystem):
-    """Implementation of the VersionControlSystem interface for Subversion."""
-
-    def __init__(self, options):
-        super(SubversionVCS, self).__init__(options)
-        if self.options.revision:
-            match = re.match(r"(\d+)(:(\d+))?", self.options.revision)
-            if not match:
-                ErrorExit("Invalid Subversion revision %s." % self.options.revision)
-            self.rev_start = match.group(1)
-            self.rev_end = match.group(3)
-        else:
-            self.rev_start = self.rev_end = None
-        # Cache output from "svn list -r REVNO dirname".
-        # Keys: dirname, Values: 2-tuple (output for start rev and end rev).
-        self.svnls_cache = {}
-        # SVN base URL is required to fetch files deleted in an older revision.
-        # Result is cached to not guess it over and over again in GetBaseFile().
-        required = self.options.download_base or self.options.revision is not None
-        self.svn_base = self._GuessBase(required)
-
-    def GuessBase(self, required):
-        """Wrapper for _GuessBase."""
-        return self.svn_base
-
-    def _GuessBase(self, required):
-        """Returns the SVN base URL.
-
-        Args:
-          required: If true, exits if the url can't be guessed, otherwise None is
-            returned.
-        """
-        info = RunShell(["svn", "info"])
-        for line in info.splitlines():
-            words = line.split()
-            if len(words) == 2 and words[0] == "URL:":
-                url = words[1]
-                scheme, netloc, path, params, query, fragment = urlparse.urlparse(url)
-                username, netloc = urllib.splituser(netloc)
-                if username:
-                    logging.info("Removed username from base URL")
-                if netloc.endswith("svn.python.org"):
-                    if netloc == "svn.python.org":
-                        if path.startswith("/projects/"):
-                            path = path[9:]
-                    elif netloc != "pythondev@svn.python.org":
-                        ErrorExit("Unrecognized Python URL: %s" % url)
-                    base = "http://svn.python.org/view/*checkout*%s/" % path
-                    logging.info("Guessed Python base = %s", base)
-                elif netloc.endswith("svn.collab.net"):
-                    if path.startswith("/repos/"):
-                        path = path[6:]
-                    base = "http://svn.collab.net/viewvc/*checkout*%s/" % path
-                    logging.info("Guessed CollabNet base = %s", base)
-                elif netloc.endswith(".googlecode.com"):
-                    path = path + "/"
-                    base = urlparse.urlunparse(("http", netloc, path, params,
-                                                query, fragment))
-                    logging.info("Guessed Google Code base = %s", base)
-                else:
-                    path = path + "/"
-                    base = urlparse.urlunparse((scheme, netloc, path, params,
-                                                query, fragment))
-                    logging.info("Guessed base = %s", base)
-                return base
-        if required:
-            ErrorExit("Can't find URL in output from svn info")
-        return None
-
-    def GenerateDiff(self, args):
-        cmd = ["svn", "diff"]
-        if self.options.revision:
-            cmd += ["-r", self.options.revision]
-        cmd.extend(args)
-        data = RunShell(cmd)
-        count = 0
-        for line in data.splitlines():
-            if line.startswith("Index:") or line.startswith("Property changes on:"):
-                count += 1
-                logging.info(line)
-        if not count:
-            ErrorExit("No valid patches found in output from svn diff")
-        return data
-
-    def _CollapseKeywords(self, content, keyword_str):
-        """Collapses SVN keywords."""
-        # svn cat translates keywords but svn diff doesn't. As a result of this
-        # behavior patching.PatchChunks() fails with a chunk mismatch error.
-        # This part was originally written by the Review Board development team
-        # who had the same problem (https://reviews.reviewboard.org/r/276/).
-        # Mapping of keywords to known aliases
-        svn_keywords = {
-            # Standard keywords
-            'Date': ['Date', 'LastChangedDate'],
-            'Revision': ['Revision', 'LastChangedRevision', 'Rev'],
-            'Author': ['Author', 'LastChangedBy'],
-            'HeadURL': ['HeadURL', 'URL'],
-            'Id': ['Id'],
-
-            # Aliases
-            'LastChangedDate': ['LastChangedDate', 'Date'],
-            'LastChangedRevision': ['LastChangedRevision', 'Rev', 'Revision'],
-            'LastChangedBy': ['LastChangedBy', 'Author'],
-            'URL': ['URL', 'HeadURL'],
-        }
-
-        def repl(m):
-            if m.group(2):
-                return "$%s::%s$" % (m.group(1), " " * len(m.group(3)))
-            return "$%s$" % m.group(1)
-
-        keywords = [keyword
-                    for name in keyword_str.split(" ")
-                    for keyword in svn_keywords.get(name, [])]
-        return re.sub(r"\$(%s):(:?)([^\$]+)\$" % '|'.join(keywords), repl, content)
-
-    def GetUnknownFiles(self):
-        status = RunShell(["svn", "status", "--ignore-externals"], silent_ok=True)
-        unknown_files = []
-        for line in status.split("\n"):
-            if line and line[0] == "?":
-                unknown_files.append(line)
-        return unknown_files
-
-    def ReadFile(self, filename):
-        """Returns the contents of a file."""
-        file = open(filename, 'rb')
-        result = ""
-        try:
-            result = file.read()
-        finally:
-            file.close()
-        return result
-
-    def GetStatus(self, filename):
-        """Returns the status of a file."""
-        if not self.options.revision:
-            status = RunShell(["svn", "status", "--ignore-externals", filename])
-            if not status:
-                ErrorExit("svn status returned no output for %s" % filename)
-            status_lines = status.splitlines()
-            # If file is in a cl, the output will begin with
-            # "\n--- Changelist 'cl_name':\n".  See
-            # https://web.archive.org/web/20090918234815/svn.collab.net/repos/svn/trunk/notes/changelist-design.txt
-            if (len(status_lines) == 3 and
-                    not status_lines[0] and
-                    status_lines[1].startswith("--- Changelist")):
-                status = status_lines[2]
-            else:
-                status = status_lines[0]
-        # If we have a revision to diff against we need to run "svn list"
-        # for the old and the new revision and compare the results to get
-        # the correct status for a file.
-        else:
-            dirname, relfilename = os.path.split(filename)
-            if dirname not in self.svnls_cache:
-                cmd = ["svn", "list", "-r", self.rev_start, dirname or "."]
-                out, returncode = RunShellWithReturnCode(cmd)
-                if returncode:
-                    ErrorExit("Failed to get status for %s." % filename)
-                old_files = out.splitlines()
-                args = ["svn", "list"]
-                if self.rev_end:
-                    args += ["-r", self.rev_end]
-                cmd = args + [dirname or "."]
-                out, returncode = RunShellWithReturnCode(cmd)
-                if returncode:
-                    ErrorExit("Failed to run command %s" % cmd)
-                self.svnls_cache[dirname] = (old_files, out.splitlines())
-            old_files, new_files = self.svnls_cache[dirname]
-            if relfilename in old_files and relfilename not in new_files:
-                status = "D   "
-            elif relfilename in old_files and relfilename in new_files:
-                status = "M   "
-            else:
-                status = "A   "
-        return status
-
-    def GetBaseFile(self, filename):
-        status = self.GetStatus(filename)
-        base_content = None
-        new_content = None
-
-        # If a file is copied its status will be "A  +", which signifies
-        # "addition-with-history".  See "svn st" for more information.  We need to
-        # upload the original file or else diff parsing will fail if the file was
-        # edited.
-        if status[0] == "A" and status[3] != "+":
-            # We'll need to upload the new content if we're adding a binary file
-            # since diff's output won't contain it.
-            mimetype = RunShell(["svn", "propget", "svn:mime-type", filename],
-                                silent_ok=True)
-            base_content = ""
-            is_binary = mimetype and not mimetype.startswith("text/")
-            if is_binary and self.IsImage(filename):
-                new_content = self.ReadFile(filename)
-        elif (status[0] in ("M", "D", "R") or
-              (status[0] == "A" and status[3] == "+") or  # Copied file.
-              (status[0] == " " and status[1] == "M")):  # Property change.
-            args = []
-            if self.options.revision:
-                url = "%s/%s@%s" % (self.svn_base, filename, self.rev_start)
-            else:
-                # Don't change filename, it's needed later.
-                url = filename
-                args += ["-r", "BASE"]
-            cmd = ["svn"] + args + ["propget", "svn:mime-type", url]
-            mimetype, returncode = RunShellWithReturnCode(cmd)
-            if returncode:
-                # File does not exist in the requested revision.
-                # Reset mimetype, it contains an error message.
-                mimetype = ""
-            get_base = False
-            is_binary = mimetype and not mimetype.startswith("text/")
-            if status[0] == " ":
-                # Empty base content just to force an upload.
-                base_content = ""
-            elif is_binary:
-                if self.IsImage(filename):
-                    get_base = True
-                    if status[0] == "M":
-                        if not self.rev_end:
-                            new_content = self.ReadFile(filename)
-                        else:
-                            url = "%s/%s@%s" % (self.svn_base, filename, self.rev_end)
-                            new_content = RunShell(["svn", "cat", url],
-                                                   universal_newlines=True, silent_ok=True)
-                else:
-                    base_content = ""
-            else:
-                get_base = True
-
-            if get_base:
-                if is_binary:
-                    universal_newlines = False
-                else:
-                    universal_newlines = True
-                if self.rev_start:
-                    # "svn cat -r REV delete_file.txt" doesn't work. cat requires
-                    # the full URL with "@REV" appended instead of using "-r" option.
-                    url = "%s/%s@%s" % (self.svn_base, filename, self.rev_start)
-                    base_content = RunShell(["svn", "cat", url],
-                                            universal_newlines=universal_newlines,
-                                            silent_ok=True)
-                else:
-                    base_content = RunShell(["svn", "cat", filename],
-                                            universal_newlines=universal_newlines,
-                                            silent_ok=True)
-                if not is_binary:
-                    args = []
-                    if self.rev_start:
-                        url = "%s/%s@%s" % (self.svn_base, filename, self.rev_start)
-                    else:
-                        url = filename
-                        args += ["-r", "BASE"]
-                    cmd = ["svn"] + args + ["propget", "svn:keywords", url]
-                    keywords, returncode = RunShellWithReturnCode(cmd)
-                    if keywords and not returncode:
-                        base_content = self._CollapseKeywords(base_content, keywords)
-        else:
-            StatusUpdate("svn status returned unexpected output: %s" % status)
-            sys.exit(1)
-        return base_content, new_content, is_binary, status[0:5]
-
-
-class GitVCS(VersionControlSystem):
-    """Implementation of the VersionControlSystem interface for Git."""
-
-    def __init__(self, options):
-        super(GitVCS, self).__init__(options)
-        # Map of filename -> hash of base file.
-        self.base_hashes = {}
-
-    def GenerateDiff(self, extra_args):
-        # This is more complicated than svn's GenerateDiff because we must convert
-        # the diff output to include an svn-style "Index:" line as well as record
-        # the hashes of the base files, so we can upload them along with our diff.
-        if self.options.revision:
-            extra_args = [self.options.revision] + extra_args
-        gitdiff = RunShell(["git", "diff", "--full-index"] + extra_args)
-        svndiff = []
-        filecount = 0
-        filename = None
-        for line in gitdiff.splitlines():
-            match = re.match(r"diff --git a/(.*) b/.*$", line)
-            if match:
-                filecount += 1
-                filename = match.group(1)
-                svndiff.append("Index: %s\n" % filename)
-            else:
-                # The "index" line in a git diff looks like this (long hashes elided):
-                #   index 82c0d44..b2cee3f 100755
-                # We want to save the left hash, as that identifies the base file.
-                match = re.match(r"index (\w+)\.\.", line)
-                if match:
-                    self.base_hashes[filename] = match.group(1)
-            svndiff.append(line + "\n")
-        if not filecount:
-            ErrorExit("No valid patches found in output from git diff")
-        return "".join(svndiff)
-
-    def GetUnknownFiles(self):
-        status = RunShell(["git", "ls-files", "--exclude-standard", "--others"],
-                          silent_ok=True)
-        return status.splitlines()
-
-    def GetBaseFile(self, filename):
-        hash = self.base_hashes[filename]
-        base_content = None
-        new_content = None
-        is_binary = False
-        if hash == "0" * 40:  # All-zero hash indicates no base file.
-            status = "A"
-            base_content = ""
-        else:
-            status = "M"
-            base_content, returncode = RunShellWithReturnCode(["git", "show", hash])
-            if returncode:
-                ErrorExit("Got error status from 'git show %s'" % hash)
-        return (base_content, new_content, is_binary, status)
-
-
-class MercurialVCS(VersionControlSystem):
-    """Implementation of the VersionControlSystem interface for Mercurial."""
-
-    def __init__(self, options, repo_dir):
-        super(MercurialVCS, self).__init__(options)
-        # Absolute path to repository (we can be in a subdir)
-        self.repo_dir = os.path.normpath(repo_dir)
-        # Compute the subdir
-        cwd = os.path.normpath(os.getcwd())
-        assert cwd.startswith(self.repo_dir)
-        self.subdir = cwd[len(self.repo_dir):].lstrip(r"\/")
-        if self.options.revision:
-            self.base_rev = self.options.revision
-        else:
-            self.base_rev = RunShell(["hg", "parent", "-q"]).split(':')[1].strip()
-
-    def _GetRelPath(self, filename):
-        """Get relative path of a file according to the current directory,
-        given its logical path in the repo."""
-        assert filename.startswith(self.subdir), filename
-        return filename[len(self.subdir):].lstrip(r"\/")
-
-    def GenerateDiff(self, extra_args):
-        # If no file specified, restrict to the current subdir
-        extra_args = extra_args or ["."]
-        cmd = ["hg", "diff", "--git", "-r", self.base_rev] + extra_args
-        data = RunShell(cmd, silent_ok=True)
-        svndiff = []
-        filecount = 0
-        for line in data.splitlines():
-            m = re.match("diff --git a/(\S+) b/(\S+)", line)
-            if m:
-                # Modify line to make it look like as it comes from svn diff.
-                # With this modification no changes on the server side are required
-                # to make upload.py work with Mercurial repos.
-                # NOTE: for proper handling of moved/copied files, we have to use
-                # the second filename.
-                filename = m.group(2)
-                svndiff.append("Index: %s" % filename)
-                svndiff.append("=" * 67)
-                filecount += 1
-                logging.info(line)
-            else:
-                svndiff.append(line)
-        if not filecount:
-            ErrorExit("No valid patches found in output from hg diff")
-        return "\n".join(svndiff) + "\n"
-
-    def GetUnknownFiles(self):
-        """Return a list of files unknown to the VCS."""
-        args = []
-        status = RunShell(["hg", "status", "--rev", self.base_rev, "-u", "."],
-                          silent_ok=True)
-        unknown_files = []
-        for line in status.splitlines():
-            st, fn = line.split(" ", 1)
-            if st == "?":
-                unknown_files.append(fn)
-        return unknown_files
-
-    def GetBaseFile(self, filename):
-        # "hg status" and "hg cat" both take a path relative to the current subdir
-        # rather than to the repo root, but "hg diff" has given us the full path
-        # to the repo root.
-        base_content = ""
-        new_content = None
-        is_binary = False
-        oldrelpath = relpath = self._GetRelPath(filename)
-        # "hg status -C" returns two lines for moved/copied files, one otherwise
-        out = RunShell(["hg", "status", "-C", "--rev", self.base_rev, relpath])
-        out = out.splitlines()
-        # HACK: strip error message about missing file/directory if it isn't in
-        # the working copy
-        if out[0].startswith('%s: ' % relpath):
-            out = out[1:]
-        if len(out) > 1:
-            # Moved/copied => considered as modified, use old filename to
-            # retrieve base contents
-            oldrelpath = out[1].strip()
-            status = "M"
-        else:
-            status, _ = out[0].split(' ', 1)
-        if status != "A":
-            base_content = RunShell(["hg", "cat", "-r", self.base_rev, oldrelpath],
-                                    silent_ok=True)
-            is_binary = "\0" in base_content  # Mercurial's heuristic
-        if status != "R":
-            new_content = open(relpath, "rb").read()
-            is_binary = is_binary or "\0" in new_content
-        if is_binary and base_content:
-            # Fetch again without converting newlines
-            base_content = RunShell(["hg", "cat", "-r", self.base_rev, oldrelpath],
-                                    silent_ok=True, universal_newlines=False)
-        if not is_binary or not self.IsImage(relpath):
-            new_content = None
-        return base_content, new_content, is_binary, status
-
-
-# NOTE: The SplitPatch function is duplicated in engine.py, keep them in sync.
-def SplitPatch(data):
-    """Splits a patch into separate pieces for each file.
-
-    Args:
-      data: A string containing the output of svn diff.
-
-    Returns:
-      A list of 2-tuple (filename, text) where text is the svn diff output
-        pertaining to filename.
-    """
-    patches = []
-    filename = None
-    diff = []
-    for line in data.splitlines(True):
-        new_filename = None
-        if line.startswith('Index:'):
-            unused, new_filename = line.split(':', 1)
-            new_filename = new_filename.strip()
-        elif line.startswith('Property changes on:'):
-            unused, temp_filename = line.split(':', 1)
-            # When a file is modified, paths use '/' between directories, however
-            # when a property is modified '\' is used on Windows.  Make them the same
-            # otherwise the file shows up twice.
-            temp_filename = temp_filename.strip().replace('\\', '/')
-            if temp_filename != filename:
-                # File has property changes but no modifications, create a new diff.
-                new_filename = temp_filename
-        if new_filename:
-            if filename and diff:
-                patches.append((filename, ''.join(diff)))
-            filename = new_filename
-            diff = [line]
-            continue
-        if diff is not None:
-            diff.append(line)
-    if filename and diff:
-        patches.append((filename, ''.join(diff)))
-    return patches
-
-
-def UploadSeparatePatches(issue, rpc_server, patchset, data, options):
-    """Uploads a separate patch for each file in the diff output.
-
-    Returns a list of [patch_key, filename] for each file.
-    """
-    patches = SplitPatch(data)
-    rv = []
-    for patch in patches:
-        if len(patch[1]) > MAX_UPLOAD_SIZE:
-            print("Not uploading the patch for " + patch[0] +
-                  " because the file is too large.")
-            continue
-        form_fields = [("filename", patch[0])]
-        if not options.download_base:
-            form_fields.append(("content_upload", "1"))
-        files = [("data", "data.diff", patch[1])]
-        ctype, body = EncodeMultipartFormData(form_fields, files)
-        url = "/%d/upload_patch/%d" % (int(issue), int(patchset))
-        print
-        "Uploading patch for " + patch[0]
-        response_body = rpc_server.Send(url, body, content_type=ctype)
-        lines = response_body.splitlines()
-        if not lines or lines[0] != "OK":
-            StatusUpdate("  --> %s" % response_body)
-            sys.exit(1)
-        rv.append([lines[1], patch[0]])
-    return rv
-
-
-def GuessVCS(options):
-    """Helper to guess the version control system.
-
-    This examines the current directory, guesses which VersionControlSystem
-    we're using, and returns an instance of the appropriate class.  Exit with an
-    error if we can't figure it out.
-
-    Returns:
-      A VersionControlSystem instance. Exits if the VCS can't be guessed.
-    """
-    # Mercurial has a command to get the base directory of a repository
-    # Try running it, but don't die if we don't have hg installed.
-    # NOTE: we try Mercurial first as it can sit on top of an SVN working copy.
-    try:
-        out, returncode = RunShellWithReturnCode(["hg", "root"])
-        if returncode == 0:
-            return MercurialVCS(options, out.strip())
-    except OSError, (errno, message):
-        if errno != 2:  # ENOENT -- they don't have hg installed.
-            raise
-
-    # Subversion has a .svn in all working directories.
-    if os.path.isdir('.svn'):
-        logging.info("Guessed VCS = Subversion")
-        return SubversionVCS(options)
-
-    # Git has a command to test if you're in a git tree.
-    # Try running it, but don't die if we don't have git installed.
-    try:
-        out, returncode = RunShellWithReturnCode(["git", "rev-parse",
-                                                  "--is-inside-work-tree"])
-        if returncode == 0:
-            return GitVCS(options)
-    except OSError, (errno, message):
-        if errno != 2:  # ENOENT -- they don't have git installed.
-            raise
-
-    ErrorExit(("Could not guess version control system. "
-               "Are you in a working copy directory?"))
-
-
-def RealMain(argv, data=None):
-    """The real main function.
-
-    Args:
-      argv: Command line arguments.
-      data: Diff contents. If None (default) the diff is generated by
-        the VersionControlSystem implementation returned by GuessVCS().
-
-    Returns:
-      A 2-tuple (issue id, patchset id).
-      The patchset id is None if the base files are not uploaded by this
-      script (applies only to SVN checkouts).
-    """
-    logging.basicConfig(format=("%(asctime).19s %(levelname)s %(filename)s:"
-                                "%(lineno)s %(message)s "))
-    os.environ['LC_ALL'] = 'C'
-    options, args = parser.parse_args(argv[1:])
-    global verbosity
-    verbosity = options.verbose
-    if verbosity >= 3:
-        logging.getLogger().setLevel(logging.DEBUG)
-    elif verbosity >= 2:
-        logging.getLogger().setLevel(logging.INFO)
-    vcs = GuessVCS(options)
-    if isinstance(vcs, SubversionVCS):
-        # base field is only allowed for Subversion.
-        # Note: Fetching base files may become deprecated in future releases.
-        base = vcs.GuessBase(options.download_base)
-    else:
-        base = None
-    if not base and options.download_base:
-        options.download_base = True
-        logging.info("Enabled upload of base file")
-    if not options.assume_yes:
-        vcs.CheckForUnknownFiles()
-    if data is None:
-        data = vcs.GenerateDiff(args)
-    files = vcs.GetBaseFiles(data)
-    if verbosity >= 1:
-        print
-        "Upload server:", options.server, "(change with -s/--server)"
-    if options.issue:
-        prompt = "Message describing this patch set: "
-    else:
-        prompt = "New issue subject: "
-    message = options.message or raw_input(prompt).strip()
-    if not message:
-        ErrorExit("A non-empty message is required")
-    rpc_server = GetRpcServer(options)
-    form_fields = [("subject", message)]
-    if base:
-        form_fields.append(("base", base))
-    if options.issue:
-        form_fields.append(("issue", str(options.issue)))
-    if options.email:
-        form_fields.append(("user", options.email))
-    if options.reviewers:
-        for reviewer in options.reviewers.split(','):
-            if "@" in reviewer and not reviewer.split("@")[1].count(".") == 1:
-                ErrorExit("Invalid email address: %s" % reviewer)
-        form_fields.append(("reviewers", options.reviewers))
-    if options.cc:
-        for cc in options.cc.split(','):
-            if "@" in cc and not cc.split("@")[1].count(".") == 1:
-                ErrorExit("Invalid email address: %s" % cc)
-        form_fields.append(("cc", options.cc))
-    description = options.description
-    if options.description_file:
-        if options.description:
-            ErrorExit("Can't specify description and description_file")
-        file = open(options.description_file, 'r')
-        description = file.read()
-        file.close()
-    if description:
-        form_fields.append(("description", description))
-    # Send a hash of all the base file so the server can determine if a copy
-    # already exists in an earlier patchset.
-    base_hashes = ""
-    for file, info in files.iteritems():
-        if not info[0] is None:
-            checksum = md5.new(info[0]).hexdigest()
-            if base_hashes:
-                base_hashes += "|"
-            base_hashes += checksum + ":" + file
-    form_fields.append(("base_hashes", base_hashes))
-    # If we're uploading base files, don't send the email before the uploads, so
-    # that it contains the file status.
-    if options.send_mail and options.download_base:
-        form_fields.append(("send_mail", "1"))
-    if not options.download_base:
-        form_fields.append(("content_upload", "1"))
-    if len(data) > MAX_UPLOAD_SIZE:
-        print
-        "Patch is large, so uploading file patches separately."
-        uploaded_diff_file = []
-        form_fields.append(("separate_patches", "1"))
-    else:
-        uploaded_diff_file = [("data", "data.diff", data)]
-    ctype, body = EncodeMultipartFormData(form_fields, uploaded_diff_file)
-    response_body = rpc_server.Send("/upload", body, content_type=ctype)
-    patchset = None
-    if not options.download_base or not uploaded_diff_file:
-        lines = response_body.splitlines()
-        if len(lines) >= 2:
-            msg = lines[0]
-            patchset = lines[1].strip()
-            patches = [x.split(" ", 1) for x in lines[2:]]
-        else:
-            msg = response_body
-    else:
-        msg = response_body
-    StatusUpdate(msg)
-    if not response_body.startswith("Issue created.") and \
-            not response_body.startswith("Issue updated."):
-        sys.exit(0)
-    issue = msg[msg.rfind("/") + 1:]
-
-    if not uploaded_diff_file:
-        result = UploadSeparatePatches(issue, rpc_server, patchset, data, options)
-        if not options.download_base:
-            patches = result
-
-    if not options.download_base:
-        vcs.UploadBaseFiles(issue, rpc_server, patches, patchset, options, files)
-        if options.send_mail:
-            rpc_server.Send("/" + issue + "/mail", payload="")
-    return issue, patchset
-
-
-def main():
-    try:
-        RealMain(sys.argv)
-    except KeyboardInterrupt:
-        print
-        StatusUpdate("Interrupted.")
-        sys.exit(1)
-
-
-if __name__ == "__main__":
-    main()
diff --git a/external/googletest/googletest/src/gtest-all.cc b/external/googletest/googletest/src/gtest-all.cc
index 84ab8628..2a70ed88 100644
--- a/external/googletest/googletest/src/gtest-all.cc
+++ b/external/googletest/googletest/src/gtest-all.cc
@@ -38,6 +38,7 @@
 #include "gtest/gtest.h"
 
 // The following lines pull in the real gtest *.cc files.
+#include "src/gtest-assertion-result.cc"
 #include "src/gtest-death-test.cc"
 #include "src/gtest-filepath.cc"
 #include "src/gtest-matchers.cc"
diff --git a/external/googletest/googletest/src/gtest-assertion-result.cc b/external/googletest/googletest/src/gtest-assertion-result.cc
new file mode 100644
index 00000000..39989216
--- /dev/null
+++ b/external/googletest/googletest/src/gtest-assertion-result.cc
@@ -0,0 +1,77 @@
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// The Google C++ Testing and Mocking Framework (Google Test)
+//
+// This file defines the AssertionResult type.
+
+#include "gtest/gtest-assertion-result.h"
+
+#include <string>
+#include <utility>
+
+#include "gtest/gtest-message.h"
+
+namespace testing {
+
+// AssertionResult constructors.
+// Used in EXPECT_TRUE/FALSE(assertion_result).
+AssertionResult::AssertionResult(const AssertionResult& other)
+    : success_(other.success_),
+      message_(other.message_ != nullptr
+                   ? new ::std::string(*other.message_)
+                   : static_cast< ::std::string*>(nullptr)) {}
+
+// Swaps two AssertionResults.
+void AssertionResult::swap(AssertionResult& other) {
+  using std::swap;
+  swap(success_, other.success_);
+  swap(message_, other.message_);
+}
+
+// Returns the assertion's negation. Used with EXPECT/ASSERT_FALSE.
+AssertionResult AssertionResult::operator!() const {
+  AssertionResult negation(!success_);
+  if (message_ != nullptr) negation << *message_;
+  return negation;
+}
+
+// Makes a successful assertion result.
+AssertionResult AssertionSuccess() { return AssertionResult(true); }
+
+// Makes a failed assertion result.
+AssertionResult AssertionFailure() { return AssertionResult(false); }
+
+// Makes a failed assertion result with the given failure message.
+// Deprecated; use AssertionFailure() << message.
+AssertionResult AssertionFailure(const Message& message) {
+  return AssertionFailure() << message;
+}
+
+}  // namespace testing
diff --git a/external/googletest/googletest/src/gtest-death-test.cc b/external/googletest/googletest/src/gtest-death-test.cc
index 78474bad..15472f1a 100644
--- a/external/googletest/googletest/src/gtest-death-test.cc
+++ b/external/googletest/googletest/src/gtest-death-test.cc
@@ -32,15 +32,21 @@
 
 #include "gtest/gtest-death-test.h"
 
+#include <stdlib.h>
+
 #include <functional>
+#include <memory>
+#include <sstream>
+#include <string>
 #include <utility>
+#include <vector>
 
 #include "gtest/internal/custom/gtest.h"
 #include "gtest/internal/gtest-port.h"
 
-#if GTEST_HAS_DEATH_TEST
+#ifdef GTEST_HAS_DEATH_TEST
 
-#if GTEST_OS_MAC
+#ifdef GTEST_OS_MAC
 #include <crt_externs.h>
 #endif  // GTEST_OS_MAC
 
@@ -48,24 +54,24 @@
 #include <fcntl.h>
 #include <limits.h>
 
-#if GTEST_OS_LINUX
+#ifdef GTEST_OS_LINUX
 #include <signal.h>
 #endif  // GTEST_OS_LINUX
 
 #include <stdarg.h>
 
-#if GTEST_OS_WINDOWS
+#ifdef GTEST_OS_WINDOWS
 #include <windows.h>
 #else
 #include <sys/mman.h>
 #include <sys/wait.h>
 #endif  // GTEST_OS_WINDOWS
 
-#if GTEST_OS_QNX
+#ifdef GTEST_OS_QNX
 #include <spawn.h>
 #endif  // GTEST_OS_QNX
 
-#if GTEST_OS_FUCHSIA
+#ifdef GTEST_OS_FUCHSIA
 #include <lib/fdio/fd.h>
 #include <lib/fdio/io.h>
 #include <lib/fdio/spawn.h>
@@ -96,9 +102,12 @@ namespace testing {
 // used internally at Google, is "threadsafe".
 static const char kDefaultDeathTestStyle[] = GTEST_DEFAULT_DEATH_TEST_STYLE;
 
+}  // namespace testing
+
 GTEST_DEFINE_string_(
     death_test_style,
-    internal::StringFromGTestEnv("death_test_style", kDefaultDeathTestStyle),
+    testing::internal::StringFromGTestEnv("death_test_style",
+                                          testing::kDefaultDeathTestStyle),
     "Indicates how to run a death test in a forked child process: "
     "\"threadsafe\" (child process re-executes the test binary "
     "from the beginning, running only the specific death test) or "
@@ -107,8 +116,8 @@ GTEST_DEFINE_string_(
 
 GTEST_DEFINE_bool_(
     death_test_use_fork,
-    internal::BoolFromGTestEnv("death_test_use_fork", false),
-    "Instructs to use fork()/_exit() instead of clone() in death tests. "
+    testing::internal::BoolFromGTestEnv("death_test_use_fork", false),
+    "Instructs to use fork()/_Exit() instead of clone() in death tests. "
     "Ignored and always uses fork() on POSIX systems where clone() is not "
     "implemented. Useful when running under valgrind or similar tools if "
     "those do not support clone(). Valgrind 3.3.1 will just fail if "
@@ -117,7 +126,6 @@ GTEST_DEFINE_bool_(
     "work in 99% of the cases. Once valgrind is fixed, this flag will "
     "most likely be removed.");
 
-namespace internal {
 GTEST_DEFINE_string_(
     internal_run_death_test, "",
     "Indicates the file, line number, temporal index of "
@@ -126,15 +134,16 @@ GTEST_DEFINE_string_(
     "the '|' characters.  This flag is specified if and only if the "
     "current process is a sub-process launched for running a thread-safe "
     "death test.  FOR INTERNAL USE ONLY.");
-}  // namespace internal
 
-#if GTEST_HAS_DEATH_TEST
+namespace testing {
+
+#ifdef GTEST_HAS_DEATH_TEST
 
 namespace internal {
 
 // Valid only for fast death tests. Indicates the code is running in the
 // child process of a fast style death test.
-#if !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA
+#if !defined(GTEST_OS_WINDOWS) && !defined(GTEST_OS_FUCHSIA)
 static bool g_in_fast_death_test_child = false;
 #endif
 
@@ -144,16 +153,16 @@ static bool g_in_fast_death_test_child = false;
 // tests.  IMPORTANT: This is an internal utility.  Using it may break the
 // implementation of death tests.  User code MUST NOT use it.
 bool InDeathTestChild() {
-#if GTEST_OS_WINDOWS || GTEST_OS_FUCHSIA
+#if defined(GTEST_OS_WINDOWS) || defined(GTEST_OS_FUCHSIA)
 
   // On Windows and Fuchsia, death tests are thread-safe regardless of the value
   // of the death_test_style flag.
-  return !GTEST_FLAG(internal_run_death_test).empty();
+  return !GTEST_FLAG_GET(internal_run_death_test).empty();
 
 #else
 
-  if (GTEST_FLAG(death_test_style) == "threadsafe")
-    return !GTEST_FLAG(internal_run_death_test).empty();
+  if (GTEST_FLAG_GET(death_test_style) == "threadsafe")
+    return !GTEST_FLAG_GET(internal_run_death_test).empty();
   else
     return g_in_fast_death_test_child;
 #endif
@@ -166,7 +175,7 @@ ExitedWithCode::ExitedWithCode(int exit_code) : exit_code_(exit_code) {}
 
 // ExitedWithCode function-call operator.
 bool ExitedWithCode::operator()(int exit_status) const {
-#if GTEST_OS_WINDOWS || GTEST_OS_FUCHSIA
+#if defined(GTEST_OS_WINDOWS) || defined(GTEST_OS_FUCHSIA)
 
   return exit_status == exit_code_;
 
@@ -177,7 +186,7 @@ bool ExitedWithCode::operator()(int exit_status) const {
 #endif  // GTEST_OS_WINDOWS || GTEST_OS_FUCHSIA
 }
 
-#if !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA
+#if !defined(GTEST_OS_WINDOWS) && !defined(GTEST_OS_FUCHSIA)
 // KilledBySignal constructor.
 KilledBySignal::KilledBySignal(int signum) : signum_(signum) {}
 
@@ -204,7 +213,7 @@ namespace internal {
 static std::string ExitSummary(int exit_code) {
   Message m;
 
-#if GTEST_OS_WINDOWS || GTEST_OS_FUCHSIA
+#if defined(GTEST_OS_WINDOWS) || defined(GTEST_OS_FUCHSIA)
 
   m << "Exited with exit status " << exit_code;
 
@@ -231,7 +240,7 @@ bool ExitedUnsuccessfully(int exit_status) {
   return !ExitedWithCode(0)(exit_status);
 }
 
-#if !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA
+#if !defined(GTEST_OS_WINDOWS) && !defined(GTEST_OS_FUCHSIA)
 // Generates a textual failure message when a death test finds more than
 // one thread running, or cannot determine the number of threads, prior
 // to executing the given statement.  It is the responsibility of the
@@ -246,7 +255,7 @@ static std::string DeathTestThreadWarning(size_t thread_count) {
     msg << "detected " << thread_count << " threads.";
   }
   msg << " See "
-         "https://github.com/google/googletest/blob/master/docs/"
+         "https://github.com/google/googletest/blob/main/docs/"
          "advanced.md#death-tests-and-threads"
       << " for more explanation and suggested solutions, especially if"
       << " this is the last message you see before your test times out.";
@@ -260,7 +269,7 @@ static const char kDeathTestReturned = 'R';
 static const char kDeathTestThrew = 'T';
 static const char kDeathTestInternalError = 'I';
 
-#if GTEST_OS_FUCHSIA
+#ifdef GTEST_OS_FUCHSIA
 
 // File descriptor used for the pipe in the child process.
 static const int kFuchsiaReadPipeFd = 3;
@@ -281,7 +290,7 @@ enum DeathTestOutcome { IN_PROGRESS, DIED, LIVED, RETURNED, THREW };
 // message is propagated back to the parent process.  Otherwise, the
 // message is simply printed to stderr.  In either case, the program
 // then exits with status 1.
-static void DeathTestAbort(const std::string& message) {
+[[noreturn]] static void DeathTestAbort(const std::string& message) {
   // On a POSIX system, this function may be called from a threadsafe-style
   // death test child process, which operates on a very small stack.  Use
   // the heap for any additional non-minuscule memory requirements.
@@ -292,7 +301,7 @@ static void DeathTestAbort(const std::string& message) {
     fputc(kDeathTestInternalError, parent);
     fprintf(parent, "%s", message.c_str());
     fflush(parent);
-    _exit(1);
+    _Exit(1);
   } else {
     fprintf(stderr, "%s", message.c_str());
     fflush(stderr);
@@ -504,7 +513,7 @@ std::string DeathTestImpl::GetErrorLogs() { return GetCapturedStderr(); }
 // Signals that the death test code which should have exited, didn't.
 // Should be called only in a death test child process.
 // Writes a status byte to the child's status file descriptor, then
-// calls _exit(1).
+// calls _Exit(1).
 void DeathTestImpl::Abort(AbortReason reason) {
   // The parent process considers the death test to be a failure if
   // it finds any data in our pipe.  So, here we write a single flag byte
@@ -516,13 +525,13 @@ void DeathTestImpl::Abort(AbortReason reason) {
   GTEST_DEATH_TEST_CHECK_SYSCALL_(posix::Write(write_fd(), &status_ch, 1));
   // We are leaking the descriptor here because on some platforms (i.e.,
   // when built as Windows DLL), destructors of global objects will still
-  // run after calling _exit(). On such systems, write_fd_ will be
+  // run after calling _Exit(). On such systems, write_fd_ will be
   // indirectly closed from the destructor of UnitTestImpl, causing double
   // close if it is also closed here. On debug configurations, double close
   // may assert. As there are no in-process buffers to flush here, we are
   // relying on the OS to close the descriptor after the process terminates
   // when the destructors are not run.
-  _exit(1);  // Exits w/o any normal exit hooks (we were supposed to crash)
+  _Exit(1);  // Exits w/o any normal exit hooks (we were supposed to crash)
 }
 
 // Returns an indented copy of stderr output for a death test.
@@ -618,7 +627,21 @@ bool DeathTestImpl::Passed(bool status_ok) {
   return success;
 }
 
-#if GTEST_OS_WINDOWS
+#ifndef GTEST_OS_WINDOWS
+// Note: The return value points into args, so the return value's lifetime is
+// bound to that of args.
+static std::vector<char*> CreateArgvFromArgs(std::vector<std::string>& args) {
+  std::vector<char*> result;
+  result.reserve(args.size() + 1);
+  for (auto& arg : args) {
+    result.push_back(&arg[0]);
+  }
+  result.push_back(nullptr);  // Extra null terminator.
+  return result;
+}
+#endif
+
+#ifdef GTEST_OS_WINDOWS
 // WindowsDeathTest implements death tests on Windows. Due to the
 // specifics of starting new processes on Windows, death tests there are
 // always threadsafe, and Google Test considers the
@@ -753,16 +776,16 @@ DeathTest::TestRole WindowsDeathTest::AssumeRole() {
       nullptr));  // The even is unnamed.
   GTEST_DEATH_TEST_CHECK_(event_handle_.Get() != nullptr);
   const std::string filter_flag = std::string("--") + GTEST_FLAG_PREFIX_ +
-                                  kFilterFlag + "=" + info->test_suite_name() +
-                                  "." + info->name();
+                                  "filter=" + info->test_suite_name() + "." +
+                                  info->name();
   const std::string internal_flag =
-      std::string("--") + GTEST_FLAG_PREFIX_ + kInternalRunDeathTestFlag + "=" +
-      file_ + "|" + StreamableToString(line_) + "|" +
-      StreamableToString(death_test_index) + "|" +
+      std::string("--") + GTEST_FLAG_PREFIX_ +
+      "internal_run_death_test=" + file_ + "|" + StreamableToString(line_) +
+      "|" + StreamableToString(death_test_index) + "|" +
       StreamableToString(static_cast<unsigned int>(::GetCurrentProcessId())) +
       // size_t has the same width as pointers on both 32-bit and 64-bit
       // Windows platforms.
-      // See http://msdn.microsoft.com/en-us/library/tcxf1dw6.aspx.
+      // See https://msdn.microsoft.com/en-us/library/tcxf1dw6.aspx.
       "|" + StreamableToString(reinterpret_cast<size_t>(write_handle)) + "|" +
       StreamableToString(reinterpret_cast<size_t>(event_handle_.Get()));
 
@@ -792,8 +815,8 @@ DeathTest::TestRole WindowsDeathTest::AssumeRole() {
   GTEST_DEATH_TEST_CHECK_(
       ::CreateProcessA(
           executable_path, const_cast<char*>(command_line.c_str()),
-          nullptr,  // Retuned process handle is not inheritable.
-          nullptr,  // Retuned thread handle is not inheritable.
+          nullptr,  // Returned process handle is not inheritable.
+          nullptr,  // Returned thread handle is not inheritable.
           TRUE,  // Child inherits all inheritable handles (for write_handle_).
           0x0,   // Default creation flags.
           nullptr,  // Inherit the parent's environment.
@@ -805,7 +828,7 @@ DeathTest::TestRole WindowsDeathTest::AssumeRole() {
   return OVERSEE_TEST;
 }
 
-#elif GTEST_OS_FUCHSIA
+#elif defined(GTEST_OS_FUCHSIA)
 
 class FuchsiaDeathTest : public DeathTestImpl {
  public:
@@ -833,36 +856,6 @@ class FuchsiaDeathTest : public DeathTestImpl {
   zx::socket stderr_socket_;
 };
 
-// Utility class for accumulating command-line arguments.
-class Arguments {
- public:
-  Arguments() { args_.push_back(nullptr); }
-
-  ~Arguments() {
-    for (std::vector<char*>::iterator i = args_.begin(); i != args_.end();
-         ++i) {
-      free(*i);
-    }
-  }
-  void AddArgument(const char* argument) {
-    args_.insert(args_.end() - 1, posix::StrDup(argument));
-  }
-
-  template <typename Str>
-  void AddArguments(const ::std::vector<Str>& arguments) {
-    for (typename ::std::vector<Str>::const_iterator i = arguments.begin();
-         i != arguments.end(); ++i) {
-      args_.insert(args_.end() - 1, posix::StrDup(i->c_str()));
-    }
-  }
-  char* const* Argv() { return &args_[0]; }
-
-  int size() { return static_cast<int>(args_.size()) - 1; }
-
- private:
-  std::vector<char*> args_;
-};
-
 // Waits for the child in a death test to exit, returning its exit
 // status, or 0 if no child process exists.  As a side effect, sets the
 // outcome data member.
@@ -977,16 +970,16 @@ DeathTest::TestRole FuchsiaDeathTest::AssumeRole() {
 
   // Build the child process command line.
   const std::string filter_flag = std::string("--") + GTEST_FLAG_PREFIX_ +
-                                  kFilterFlag + "=" + info->test_suite_name() +
-                                  "." + info->name();
+                                  "filter=" + info->test_suite_name() + "." +
+                                  info->name();
   const std::string internal_flag = std::string("--") + GTEST_FLAG_PREFIX_ +
                                     kInternalRunDeathTestFlag + "=" + file_ +
                                     "|" + StreamableToString(line_) + "|" +
                                     StreamableToString(death_test_index);
-  Arguments args;
-  args.AddArguments(GetInjectableArgvs());
-  args.AddArgument(filter_flag.c_str());
-  args.AddArgument(internal_flag.c_str());
+
+  std::vector<std::string> args = GetInjectableArgvs();
+  args.push_back(filter_flag);
+  args.push_back(internal_flag);
 
   // Build the pipe for communication with the child.
   zx_status_t status;
@@ -1038,8 +1031,14 @@ DeathTest::TestRole FuchsiaDeathTest::AssumeRole() {
   GTEST_DEATH_TEST_CHECK_(status == ZX_OK);
 
   // Spawn the child process.
-  status = fdio_spawn_etc(child_job, FDIO_SPAWN_CLONE_ALL, args.Argv()[0],
-                          args.Argv(), nullptr, 2, spawn_actions,
+  // Note: The test component must have `fuchsia.process.Launcher` declared
+  // in its manifest. (Fuchsia integration tests require creating a
+  // "Fuchsia Test Component" which contains a "Fuchsia Component Manifest")
+  // Launching processes is a privileged operation in Fuchsia, and the
+  // declaration indicates that the ability is required for the component.
+  std::vector<char*> argv = CreateArgvFromArgs(args);
+  status = fdio_spawn_etc(child_job, FDIO_SPAWN_CLONE_ALL, argv[0], argv.data(),
+                          nullptr, 2, spawn_actions,
                           child_process_.reset_and_get_address(), nullptr);
   GTEST_DEATH_TEST_CHECK_(status == ZX_OK);
 
@@ -1131,7 +1130,7 @@ DeathTest::TestRole NoExecDeathTest::AssumeRole() {
     LogToStderr();
     // Event forwarding to the listeners of event listener API mush be shut
     // down in death test subprocesses.
-    GetUnitTestImpl()->listeners()->SuppressEventForwarding();
+    GetUnitTestImpl()->listeners()->SuppressEventForwarding(true);
     g_in_fast_death_test_child = true;
     return EXECUTE_TEST;
   } else {
@@ -1170,34 +1169,6 @@ class ExecDeathTest : public ForkingDeathTest {
   const int line_;
 };
 
-// Utility class for accumulating command-line arguments.
-class Arguments {
- public:
-  Arguments() { args_.push_back(nullptr); }
-
-  ~Arguments() {
-    for (std::vector<char*>::iterator i = args_.begin(); i != args_.end();
-         ++i) {
-      free(*i);
-    }
-  }
-  void AddArgument(const char* argument) {
-    args_.insert(args_.end() - 1, posix::StrDup(argument));
-  }
-
-  template <typename Str>
-  void AddArguments(const ::std::vector<Str>& arguments) {
-    for (typename ::std::vector<Str>::const_iterator i = arguments.begin();
-         i != arguments.end(); ++i) {
-      args_.insert(args_.end() - 1, posix::StrDup(i->c_str()));
-    }
-  }
-  char* const* Argv() { return &args_[0]; }
-
- private:
-  std::vector<char*> args_;
-};
-
 // A struct that encompasses the arguments to the child process of a
 // threadsafe-style death test process.
 struct ExecDeathTestArgs {
@@ -1205,7 +1176,7 @@ struct ExecDeathTestArgs {
   int close_fd;       // File descriptor to close; the read end of a pipe
 };
 
-#if GTEST_OS_QNX
+#ifdef GTEST_OS_QNX
 extern "C" char** environ;
 #else   // GTEST_OS_QNX
 // The main function for a threadsafe-style death test child process.
@@ -1286,7 +1257,7 @@ static pid_t ExecDeathTestSpawnChild(char* const* argv, int close_fd) {
   ExecDeathTestArgs args = {argv, close_fd};
   pid_t child_pid = -1;
 
-#if GTEST_OS_QNX
+#ifdef GTEST_OS_QNX
   // Obtains the current directory and sets it to be closed in the child
   // process.
   const int cwd_fd = open(".", O_RDONLY);
@@ -1317,7 +1288,7 @@ static pid_t ExecDeathTestSpawnChild(char* const* argv, int close_fd) {
   GTEST_DEATH_TEST_CHECK_SYSCALL_(close(cwd_fd));
 
 #else  // GTEST_OS_QNX
-#if GTEST_OS_LINUX
+#ifdef GTEST_OS_LINUX
   // When a SIGPROF signal is received while fork() or clone() are executing,
   // the process may hang. To avoid this, we ignore SIGPROF here and re-enable
   // it after the call to fork()/clone() is complete.
@@ -1331,7 +1302,7 @@ static pid_t ExecDeathTestSpawnChild(char* const* argv, int close_fd) {
 #endif  // GTEST_OS_LINUX
 
 #if GTEST_HAS_CLONE
-  const bool use_fork = GTEST_FLAG(death_test_use_fork);
+  const bool use_fork = GTEST_FLAG_GET(death_test_use_fork);
 
   if (!use_fork) {
     static const bool stack_grows_down = StackGrowsDown();
@@ -1364,11 +1335,10 @@ static pid_t ExecDeathTestSpawnChild(char* const* argv, int close_fd) {
 #endif  // GTEST_HAS_CLONE
 
   if (use_fork && (child_pid = fork()) == 0) {
-    ExecDeathTestChildMain(&args);
-    _exit(0);
+    _Exit(ExecDeathTestChildMain(&args));
   }
 #endif  // GTEST_OS_QNX
-#if GTEST_OS_LINUX
+#ifdef GTEST_OS_LINUX
   GTEST_DEATH_TEST_CHECK_SYSCALL_(
       sigaction(SIGPROF, &saved_sigprof_action, nullptr));
 #endif  // GTEST_OS_LINUX
@@ -1400,17 +1370,16 @@ DeathTest::TestRole ExecDeathTest::AssumeRole() {
   GTEST_DEATH_TEST_CHECK_(fcntl(pipe_fd[1], F_SETFD, 0) != -1);
 
   const std::string filter_flag = std::string("--") + GTEST_FLAG_PREFIX_ +
-                                  kFilterFlag + "=" + info->test_suite_name() +
-                                  "." + info->name();
+                                  "filter=" + info->test_suite_name() + "." +
+                                  info->name();
   const std::string internal_flag = std::string("--") + GTEST_FLAG_PREFIX_ +
-                                    kInternalRunDeathTestFlag + "=" + file_ +
-                                    "|" + StreamableToString(line_) + "|" +
+                                    "internal_run_death_test=" + file_ + "|" +
+                                    StreamableToString(line_) + "|" +
                                     StreamableToString(death_test_index) + "|" +
                                     StreamableToString(pipe_fd[1]);
-  Arguments args;
-  args.AddArguments(GetArgvsForDeathTestChildProcess());
-  args.AddArgument(filter_flag.c_str());
-  args.AddArgument(internal_flag.c_str());
+  std::vector<std::string> args = GetArgvsForDeathTestChildProcess();
+  args.push_back(filter_flag);
+  args.push_back(internal_flag);
 
   DeathTest::set_last_death_test_message("");
 
@@ -1419,7 +1388,8 @@ DeathTest::TestRole ExecDeathTest::AssumeRole() {
   // is necessary.
   FlushInfoLog();
 
-  const pid_t child_pid = ExecDeathTestSpawnChild(args.Argv(), pipe_fd[0]);
+  std::vector<char*> argv = CreateArgvFromArgs(args);
+  const pid_t child_pid = ExecDeathTestSpawnChild(argv.data(), pipe_fd[0]);
   GTEST_DEATH_TEST_CHECK_SYSCALL_(close(pipe_fd[1]));
   set_child_pid(child_pid);
   set_read_fd(pipe_fd[0]);
@@ -1460,25 +1430,25 @@ bool DefaultDeathTestFactory::Create(const char* statement,
     }
   }
 
-#if GTEST_OS_WINDOWS
+#ifdef GTEST_OS_WINDOWS
 
-  if (GTEST_FLAG(death_test_style) == "threadsafe" ||
-      GTEST_FLAG(death_test_style) == "fast") {
+  if (GTEST_FLAG_GET(death_test_style) == "threadsafe" ||
+      GTEST_FLAG_GET(death_test_style) == "fast") {
     *test = new WindowsDeathTest(statement, std::move(matcher), file, line);
   }
 
-#elif GTEST_OS_FUCHSIA
+#elif defined(GTEST_OS_FUCHSIA)
 
-  if (GTEST_FLAG(death_test_style) == "threadsafe" ||
-      GTEST_FLAG(death_test_style) == "fast") {
+  if (GTEST_FLAG_GET(death_test_style) == "threadsafe" ||
+      GTEST_FLAG_GET(death_test_style) == "fast") {
     *test = new FuchsiaDeathTest(statement, std::move(matcher), file, line);
   }
 
 #else
 
-  if (GTEST_FLAG(death_test_style) == "threadsafe") {
+  if (GTEST_FLAG_GET(death_test_style) == "threadsafe") {
     *test = new ExecDeathTest(statement, std::move(matcher), file, line);
-  } else if (GTEST_FLAG(death_test_style) == "fast") {
+  } else if (GTEST_FLAG_GET(death_test_style) == "fast") {
     *test = new NoExecDeathTest(statement, std::move(matcher));
   }
 
@@ -1486,7 +1456,7 @@ bool DefaultDeathTestFactory::Create(const char* statement,
 
   else {  // NOLINT - this is more readable than unbalanced brackets inside #if.
     DeathTest::set_last_death_test_message("Unknown death test style \"" +
-                                           GTEST_FLAG(death_test_style) +
+                                           GTEST_FLAG_GET(death_test_style) +
                                            "\" encountered");
     return false;
   }
@@ -1494,7 +1464,7 @@ bool DefaultDeathTestFactory::Create(const char* statement,
   return true;
 }
 
-#if GTEST_OS_WINDOWS
+#ifdef GTEST_OS_WINDOWS
 // Recreates the pipe and event handles from the provided parameters,
 // signals the event, and returns a file descriptor wrapped around the pipe
 // handle. This function is called in the child process only.
@@ -1561,17 +1531,17 @@ static int GetStatusFileDescriptor(unsigned int parent_process_id,
 // initialized from the GTEST_FLAG(internal_run_death_test) flag if
 // the flag is specified; otherwise returns NULL.
 InternalRunDeathTestFlag* ParseInternalRunDeathTestFlag() {
-  if (GTEST_FLAG(internal_run_death_test) == "") return nullptr;
+  if (GTEST_FLAG_GET(internal_run_death_test).empty()) return nullptr;
 
   // GTEST_HAS_DEATH_TEST implies that we have ::std::string, so we
   // can use it here.
   int line = -1;
   int index = -1;
   ::std::vector< ::std::string> fields;
-  SplitString(GTEST_FLAG(internal_run_death_test).c_str(), '|', &fields);
+  SplitString(GTEST_FLAG_GET(internal_run_death_test), '|', &fields);
   int write_fd = -1;
 
-#if GTEST_OS_WINDOWS
+#ifdef GTEST_OS_WINDOWS
 
   unsigned int parent_process_id = 0;
   size_t write_handle_as_size_t = 0;
@@ -1583,17 +1553,17 @@ InternalRunDeathTestFlag* ParseInternalRunDeathTestFlag() {
       !ParseNaturalNumber(fields[4], &write_handle_as_size_t) ||
       !ParseNaturalNumber(fields[5], &event_handle_as_size_t)) {
     DeathTestAbort("Bad --gtest_internal_run_death_test flag: " +
-                   GTEST_FLAG(internal_run_death_test));
+                   GTEST_FLAG_GET(internal_run_death_test));
   }
   write_fd = GetStatusFileDescriptor(parent_process_id, write_handle_as_size_t,
                                      event_handle_as_size_t);
 
-#elif GTEST_OS_FUCHSIA
+#elif defined(GTEST_OS_FUCHSIA)
 
   if (fields.size() != 3 || !ParseNaturalNumber(fields[1], &line) ||
       !ParseNaturalNumber(fields[2], &index)) {
     DeathTestAbort("Bad --gtest_internal_run_death_test flag: " +
-                   GTEST_FLAG(internal_run_death_test));
+                   GTEST_FLAG_GET(internal_run_death_test));
   }
 
 #else
@@ -1602,7 +1572,7 @@ InternalRunDeathTestFlag* ParseInternalRunDeathTestFlag() {
       !ParseNaturalNumber(fields[2], &index) ||
       !ParseNaturalNumber(fields[3], &write_fd)) {
     DeathTestAbort("Bad --gtest_internal_run_death_test flag: " +
-                   GTEST_FLAG(internal_run_death_test));
+                   GTEST_FLAG_GET(internal_run_death_test));
   }
 
 #endif  // GTEST_OS_WINDOWS
diff --git a/external/googletest/googletest/src/gtest-filepath.cc b/external/googletest/googletest/src/gtest-filepath.cc
index 0b562940..902d8c7f 100644
--- a/external/googletest/googletest/src/gtest-filepath.cc
+++ b/external/googletest/googletest/src/gtest-filepath.cc
@@ -30,35 +30,42 @@
 #include "gtest/internal/gtest-filepath.h"
 
 #include <stdlib.h>
-#include "gtest/internal/gtest-port.h"
+
+#include <iterator>
+#include <string>
+
 #include "gtest/gtest-message.h"
+#include "gtest/internal/gtest-port.h"
 
-#if GTEST_OS_WINDOWS_MOBILE
-# include <windows.h>
-#elif GTEST_OS_WINDOWS
-# include <direct.h>
-# include <io.h>
+#ifdef GTEST_OS_WINDOWS_MOBILE
+#include <windows.h>
+#elif defined(GTEST_OS_WINDOWS)
+#include <direct.h>
+#include <io.h>
 #else
-# include <limits.h>
-# include <climits>  // Some Linux distributions define PATH_MAX here.
-#endif  // GTEST_OS_WINDOWS_MOBILE
+#include <limits.h>
+
+#include <climits>  // Some Linux distributions define PATH_MAX here.
+#endif              // GTEST_OS_WINDOWS_MOBILE
 
 #include "gtest/internal/gtest-string.h"
 
-#if GTEST_OS_WINDOWS
-# define GTEST_PATH_MAX_ _MAX_PATH
+#ifdef GTEST_OS_WINDOWS
+#define GTEST_PATH_MAX_ _MAX_PATH
 #elif defined(PATH_MAX)
-# define GTEST_PATH_MAX_ PATH_MAX
+#define GTEST_PATH_MAX_ PATH_MAX
 #elif defined(_XOPEN_PATH_MAX)
-# define GTEST_PATH_MAX_ _XOPEN_PATH_MAX
+#define GTEST_PATH_MAX_ _XOPEN_PATH_MAX
 #else
-# define GTEST_PATH_MAX_ _POSIX_PATH_MAX
+#define GTEST_PATH_MAX_ _POSIX_PATH_MAX
 #endif  // GTEST_OS_WINDOWS
 
+#if GTEST_HAS_FILE_SYSTEM
+
 namespace testing {
 namespace internal {
 
-#if GTEST_OS_WINDOWS
+#ifdef GTEST_OS_WINDOWS
 // On Windows, '\\' is the standard path separator, but many tools and the
 // Windows API also accept '/' as an alternate path separator. Unless otherwise
 // noted, a file path can contain either kind of path separators, or a mixture
@@ -66,16 +73,16 @@ namespace internal {
 const char kPathSeparator = '\\';
 const char kAlternatePathSeparator = '/';
 const char kAlternatePathSeparatorString[] = "/";
-# if GTEST_OS_WINDOWS_MOBILE
+#ifdef GTEST_OS_WINDOWS_MOBILE
 // Windows CE doesn't have a current directory. You should not use
 // the current directory in tests on Windows CE, but this at least
 // provides a reasonable fallback.
 const char kCurrentDirectoryString[] = "\\";
 // Windows CE doesn't define INVALID_FILE_ATTRIBUTES
 const DWORD kInvalidFileAttributes = 0xffffffff;
-# else
+#else
 const char kCurrentDirectoryString[] = ".\\";
-# endif  // GTEST_OS_WINDOWS_MOBILE
+#endif  // GTEST_OS_WINDOWS_MOBILE
 #else
 const char kPathSeparator = '/';
 const char kCurrentDirectoryString[] = "./";
@@ -92,24 +99,26 @@ static bool IsPathSeparator(char c) {
 
 // Returns the current working directory, or "" if unsuccessful.
 FilePath FilePath::GetCurrentDir() {
-#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_PHONE ||         \
-    GTEST_OS_WINDOWS_RT || GTEST_OS_ESP8266 || GTEST_OS_ESP32 || \
-    GTEST_OS_XTENSA
+#if defined(GTEST_OS_WINDOWS_MOBILE) || defined(GTEST_OS_WINDOWS_PHONE) || \
+    defined(GTEST_OS_WINDOWS_RT) || defined(GTEST_OS_ESP8266) ||           \
+    defined(GTEST_OS_ESP32) || defined(GTEST_OS_XTENSA) ||                 \
+    defined(GTEST_OS_QURT) || defined(GTEST_OS_NXP_QN9090) ||              \
+    defined(GTEST_OS_NRF52)
   // These platforms do not have a current directory, so we just return
   // something reasonable.
   return FilePath(kCurrentDirectoryString);
-#elif GTEST_OS_WINDOWS
-  char cwd[GTEST_PATH_MAX_ + 1] = { '\0' };
+#elif defined(GTEST_OS_WINDOWS)
+  char cwd[GTEST_PATH_MAX_ + 1] = {'\0'};
   return FilePath(_getcwd(cwd, sizeof(cwd)) == nullptr ? "" : cwd);
 #else
-  char cwd[GTEST_PATH_MAX_ + 1] = { '\0' };
+  char cwd[GTEST_PATH_MAX_ + 1] = {'\0'};
   char* result = getcwd(cwd, sizeof(cwd));
-# if GTEST_OS_NACL
+#ifdef GTEST_OS_NACL
   // getcwd will likely fail in NaCl due to the sandbox, so return something
   // reasonable. The user may have provided a shim implementation for getcwd,
   // however, so fallback only when failure is detected.
   return FilePath(result == nullptr ? kCurrentDirectoryString : cwd);
-# endif  // GTEST_OS_NACL
+#endif  // GTEST_OS_NACL
   return FilePath(result == nullptr ? "" : cwd);
 #endif  // GTEST_OS_WINDOWS_MOBILE
 }
@@ -121,8 +130,8 @@ FilePath FilePath::GetCurrentDir() {
 FilePath FilePath::RemoveExtension(const char* extension) const {
   const std::string dot_extension = std::string(".") + extension;
   if (String::EndsWithCaseInsensitive(pathname_, dot_extension)) {
-    return FilePath(pathname_.substr(
-        0, pathname_.length() - dot_extension.length()));
+    return FilePath(
+        pathname_.substr(0, pathname_.length() - dot_extension.length()));
   }
   return *this;
 }
@@ -143,6 +152,44 @@ const char* FilePath::FindLastPathSeparator() const {
   return last_sep;
 }
 
+size_t FilePath::CalculateRootLength() const {
+  const auto& path = pathname_;
+  auto s = path.begin();
+  auto end = path.end();
+#ifdef GTEST_OS_WINDOWS
+  if (end - s >= 2 && s[1] == ':' && (end - s == 2 || IsPathSeparator(s[2])) &&
+      (('A' <= s[0] && s[0] <= 'Z') || ('a' <= s[0] && s[0] <= 'z'))) {
+    // A typical absolute path like "C:\Windows" or "D:"
+    s += 2;
+    if (s != end) {
+      ++s;
+    }
+  } else if (end - s >= 3 && IsPathSeparator(*s) && IsPathSeparator(*(s + 1)) &&
+             !IsPathSeparator(*(s + 2))) {
+    // Move past the "\\" prefix in a UNC path like "\\Server\Share\Folder"
+    s += 2;
+    // Skip 2 components and their following separators ("Server\" and "Share\")
+    for (int i = 0; i < 2; ++i) {
+      while (s != end) {
+        bool stop = IsPathSeparator(*s);
+        ++s;
+        if (stop) {
+          break;
+        }
+      }
+    }
+  } else if (s != end && IsPathSeparator(*s)) {
+    // A drive-rooted path like "\Windows"
+    ++s;
+  }
+#else
+  if (s != end && IsPathSeparator(*s)) {
+    ++s;
+  }
+#endif
+  return static_cast<size_t>(s - path.begin());
+}
+
 // Returns a copy of the FilePath with the directory part removed.
 // Example: FilePath("path/to/file").RemoveDirectoryName() returns
 // FilePath("file"). If there is no directory part ("just_a_file"), it returns
@@ -178,15 +225,14 @@ FilePath FilePath::RemoveFileName() const {
 // than zero (e.g., 12), returns "dir/test_12.xml".
 // On Windows platform, uses \ as the separator rather than /.
 FilePath FilePath::MakeFileName(const FilePath& directory,
-                                const FilePath& base_name,
-                                int number,
+                                const FilePath& base_name, int number,
                                 const char* extension) {
   std::string file;
   if (number == 0) {
     file = base_name.string() + "." + extension;
   } else {
-    file = base_name.string() + "_" + StreamableToString(number)
-        + "." + extension;
+    file =
+        base_name.string() + "_" + StreamableToString(number) + "." + extension;
   }
   return ConcatPaths(directory, FilePath(file));
 }
@@ -195,8 +241,7 @@ FilePath FilePath::MakeFileName(const FilePath& directory,
 // On Windows, uses \ as the separator rather than /.
 FilePath FilePath::ConcatPaths(const FilePath& directory,
                                const FilePath& relative_path) {
-  if (directory.IsEmpty())
-    return relative_path;
+  if (directory.IsEmpty()) return relative_path;
   const FilePath dir(directory.RemoveTrailingPathSeparator());
   return FilePath(dir.string() + kPathSeparator + relative_path.string());
 }
@@ -204,10 +249,10 @@ FilePath FilePath::ConcatPaths(const FilePath& directory,
 // Returns true if pathname describes something findable in the file-system,
 // either a file, directory, or whatever.
 bool FilePath::FileOrDirectoryExists() const {
-#if GTEST_OS_WINDOWS_MOBILE
+#ifdef GTEST_OS_WINDOWS_MOBILE
   LPCWSTR unicode = String::AnsiToUtf16(pathname_.c_str());
   const DWORD attributes = GetFileAttributes(unicode);
-  delete [] unicode;
+  delete[] unicode;
   return attributes != kInvalidFileAttributes;
 #else
   posix::StatStruct file_stat{};
@@ -219,55 +264,42 @@ bool FilePath::FileOrDirectoryExists() const {
 // that exists.
 bool FilePath::DirectoryExists() const {
   bool result = false;
-#if GTEST_OS_WINDOWS
+#ifdef GTEST_OS_WINDOWS
   // Don't strip off trailing separator if path is a root directory on
   // Windows (like "C:\\").
-  const FilePath& path(IsRootDirectory() ? *this :
-                                           RemoveTrailingPathSeparator());
+  const FilePath& path(IsRootDirectory() ? *this
+                                         : RemoveTrailingPathSeparator());
 #else
   const FilePath& path(*this);
 #endif
 
-#if GTEST_OS_WINDOWS_MOBILE
+#ifdef GTEST_OS_WINDOWS_MOBILE
   LPCWSTR unicode = String::AnsiToUtf16(path.c_str());
   const DWORD attributes = GetFileAttributes(unicode);
-  delete [] unicode;
+  delete[] unicode;
   if ((attributes != kInvalidFileAttributes) &&
       (attributes & FILE_ATTRIBUTE_DIRECTORY)) {
     result = true;
   }
 #else
   posix::StatStruct file_stat{};
-  result = posix::Stat(path.c_str(), &file_stat) == 0 &&
-      posix::IsDir(file_stat);
+  result =
+      posix::Stat(path.c_str(), &file_stat) == 0 && posix::IsDir(file_stat);
 #endif  // GTEST_OS_WINDOWS_MOBILE
 
   return result;
 }
 
 // Returns true if pathname describes a root directory. (Windows has one
-// root directory per disk drive.)
+// root directory per disk drive. UNC share roots are also included.)
 bool FilePath::IsRootDirectory() const {
-#if GTEST_OS_WINDOWS
-  return pathname_.length() == 3 && IsAbsolutePath();
-#else
-  return pathname_.length() == 1 && IsPathSeparator(pathname_.c_str()[0]);
-#endif
+  size_t root_length = CalculateRootLength();
+  return root_length > 0 && root_length == pathname_.size() &&
+         IsPathSeparator(pathname_[root_length - 1]);
 }
 
 // Returns true if pathname describes an absolute path.
-bool FilePath::IsAbsolutePath() const {
-  const char* const name = pathname_.c_str();
-#if GTEST_OS_WINDOWS
-  return pathname_.length() >= 3 &&
-     ((name[0] >= 'a' && name[0] <= 'z') ||
-      (name[0] >= 'A' && name[0] <= 'Z')) &&
-     name[1] == ':' &&
-     IsPathSeparator(name[2]);
-#else
-  return IsPathSeparator(name[0]);
-#endif
-}
+bool FilePath::IsAbsolutePath() const { return CalculateRootLength() > 0; }
 
 // Returns a pathname for a file that does not currently exist. The pathname
 // will be directory/base_name.extension or
@@ -304,7 +336,7 @@ bool FilePath::CreateDirectoriesRecursively() const {
     return false;
   }
 
-  if (pathname_.length() == 0 || this->DirectoryExists()) {
+  if (pathname_.empty() || this->DirectoryExists()) {
     return true;
   }
 
@@ -317,14 +349,16 @@ bool FilePath::CreateDirectoriesRecursively() const {
 // directory for any reason, including if the parent directory does not
 // exist. Not named "CreateDirectory" because that's a macro on Windows.
 bool FilePath::CreateFolder() const {
-#if GTEST_OS_WINDOWS_MOBILE
+#ifdef GTEST_OS_WINDOWS_MOBILE
   FilePath removed_sep(this->RemoveTrailingPathSeparator());
   LPCWSTR unicode = String::AnsiToUtf16(removed_sep.c_str());
   int result = CreateDirectory(unicode, nullptr) ? 0 : -1;
-  delete [] unicode;
-#elif GTEST_OS_WINDOWS
+  delete[] unicode;
+#elif defined(GTEST_OS_WINDOWS)
   int result = _mkdir(pathname_.c_str());
-#elif GTEST_OS_ESP8266 || GTEST_OS_XTENSA
+#elif defined(GTEST_OS_ESP8266) || defined(GTEST_OS_XTENSA) || \
+    defined(GTEST_OS_QURT) || defined(GTEST_OS_NXP_QN9090) ||  \
+    defined(GTEST_OS_NRF52)
   // do nothing
   int result = 0;
 #else
@@ -341,25 +375,34 @@ bool FilePath::CreateFolder() const {
 // name, otherwise return the name string unmodified.
 // On Windows platform, uses \ as the separator, other platforms use /.
 FilePath FilePath::RemoveTrailingPathSeparator() const {
-  return IsDirectory()
-      ? FilePath(pathname_.substr(0, pathname_.length() - 1))
-      : *this;
+  return IsDirectory() ? FilePath(pathname_.substr(0, pathname_.length() - 1))
+                       : *this;
 }
 
 // Removes any redundant separators that might be in the pathname.
 // For example, "bar///foo" becomes "bar/foo". Does not eliminate other
 // redundancies that might be in a pathname involving "." or "..".
+// Note that "\\Host\Share" does not contain a redundancy on Windows!
 void FilePath::Normalize() {
   auto out = pathname_.begin();
 
-  for (const char character : pathname_) {
+  auto i = pathname_.cbegin();
+#ifdef GTEST_OS_WINDOWS
+  // UNC paths are treated specially
+  if (pathname_.end() - i >= 3 && IsPathSeparator(*i) &&
+      IsPathSeparator(*(i + 1)) && !IsPathSeparator(*(i + 2))) {
+    *(out++) = kPathSeparator;
+    *(out++) = kPathSeparator;
+  }
+#endif
+  while (i != pathname_.end()) {
+    const char character = *i;
     if (!IsPathSeparator(character)) {
       *(out++) = character;
     } else if (out == pathname_.begin() || *std::prev(out) != kPathSeparator) {
       *(out++) = kPathSeparator;
-    } else {
-      continue;
     }
+    ++i;
   }
 
   pathname_.erase(out, pathname_.end());
@@ -367,3 +410,5 @@ void FilePath::Normalize() {
 
 }  // namespace internal
 }  // namespace testing
+
+#endif  // GTEST_HAS_FILE_SYSTEM
diff --git a/external/googletest/googletest/src/gtest-internal-inl.h b/external/googletest/googletest/src/gtest-internal-inl.h
index 479e1b36..6a39b93b 100644
--- a/external/googletest/googletest/src/gtest-internal-inl.h
+++ b/external/googletest/googletest/src/gtest-internal-inl.h
@@ -44,7 +44,9 @@
 #include <algorithm>
 #include <cstdint>
 #include <memory>
+#include <set>
 #include <string>
+#include <unordered_map>
 #include <vector>
 
 #include "gtest/internal/gtest-port.h"
@@ -54,7 +56,7 @@
 #include <netdb.h>      // NOLINT
 #endif
 
-#if GTEST_OS_WINDOWS
+#ifdef GTEST_OS_WINDOWS
 #include <windows.h>  // NOLINT
 #endif                // GTEST_OS_WINDOWS
 
@@ -64,8 +66,6 @@
 GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
 /* class A needs to have dll-interface to be used by clients of class B */)
 
-namespace testing {
-
 // Declares the flags.
 //
 // We don't want the users to modify this flag in the code, but want
@@ -73,32 +73,13 @@ namespace testing {
 // declare it here as opposed to in gtest.h.
 GTEST_DECLARE_bool_(death_test_use_fork);
 
+namespace testing {
 namespace internal {
 
 // The value of GetTestTypeId() as seen from within the Google Test
 // library.  This is solely for testing GetTestTypeId().
 GTEST_API_ extern const TypeId kTestTypeIdInGoogleTest;
 
-// Names of the flags (needed for parsing Google Test flags).
-const char kAlsoRunDisabledTestsFlag[] = "also_run_disabled_tests";
-const char kBreakOnFailureFlag[] = "break_on_failure";
-const char kCatchExceptionsFlag[] = "catch_exceptions";
-const char kColorFlag[] = "color";
-const char kFailFast[] = "fail_fast";
-const char kFilterFlag[] = "filter";
-const char kListTestsFlag[] = "list_tests";
-const char kOutputFlag[] = "output";
-const char kBriefFlag[] = "brief";
-const char kPrintTimeFlag[] = "print_time";
-const char kPrintUTF8Flag[] = "print_utf8";
-const char kRandomSeedFlag[] = "random_seed";
-const char kRepeatFlag[] = "repeat";
-const char kShuffleFlag[] = "shuffle";
-const char kStackTraceDepthFlag[] = "stack_trace_depth";
-const char kStreamResultToFlag[] = "stream_result_to";
-const char kThrowOnFailureFlag[] = "throw_on_failure";
-const char kFlagfileFlag[] = "flagfile";
-
 // A valid random seed must be in [1, kMaxRandomSeed].
 const int kMaxRandomSeed = 99999;
 
@@ -112,7 +93,8 @@ GTEST_API_ TimeInMillis GetTimeInMillis();
 // Returns true if and only if Google Test should use colors in the output.
 GTEST_API_ bool ShouldUseColor(bool stdout_is_tty);
 
-// Formats the given time in milliseconds as seconds.
+// Formats the given time in milliseconds as seconds. If the input is an exact N
+// seconds, the output has a trailing decimal point (e.g., "N." instead of "N").
 GTEST_API_ std::string FormatTimeInMillisAsSeconds(TimeInMillis ms);
 
 // Converts the given time in milliseconds to a date string in the ISO 8601
@@ -125,8 +107,7 @@ GTEST_API_ std::string FormatEpochTimeInMillisAsIso8601(TimeInMillis ms);
 //
 // On success, stores the value of the flag in *value, and returns
 // true.  On failure, returns false without changing *value.
-GTEST_API_ bool ParseInt32Flag(const char* str, const char* flag,
-                               int32_t* value);
+GTEST_API_ bool ParseFlag(const char* str, const char* flag, int32_t* value);
 
 // Returns a random seed in range [1, kMaxRandomSeed] based on the
 // given --gtest_random_seed flag value.
@@ -161,50 +142,54 @@ class GTestFlagSaver {
  public:
   // The c'tor.
   GTestFlagSaver() {
-    also_run_disabled_tests_ = GTEST_FLAG(also_run_disabled_tests);
-    break_on_failure_ = GTEST_FLAG(break_on_failure);
-    catch_exceptions_ = GTEST_FLAG(catch_exceptions);
-    color_ = GTEST_FLAG(color);
-    death_test_style_ = GTEST_FLAG(death_test_style);
-    death_test_use_fork_ = GTEST_FLAG(death_test_use_fork);
-    fail_fast_ = GTEST_FLAG(fail_fast);
-    filter_ = GTEST_FLAG(filter);
-    internal_run_death_test_ = GTEST_FLAG(internal_run_death_test);
-    list_tests_ = GTEST_FLAG(list_tests);
-    output_ = GTEST_FLAG(output);
-    brief_ = GTEST_FLAG(brief);
-    print_time_ = GTEST_FLAG(print_time);
-    print_utf8_ = GTEST_FLAG(print_utf8);
-    random_seed_ = GTEST_FLAG(random_seed);
-    repeat_ = GTEST_FLAG(repeat);
-    shuffle_ = GTEST_FLAG(shuffle);
-    stack_trace_depth_ = GTEST_FLAG(stack_trace_depth);
-    stream_result_to_ = GTEST_FLAG(stream_result_to);
-    throw_on_failure_ = GTEST_FLAG(throw_on_failure);
+    also_run_disabled_tests_ = GTEST_FLAG_GET(also_run_disabled_tests);
+    break_on_failure_ = GTEST_FLAG_GET(break_on_failure);
+    catch_exceptions_ = GTEST_FLAG_GET(catch_exceptions);
+    color_ = GTEST_FLAG_GET(color);
+    death_test_style_ = GTEST_FLAG_GET(death_test_style);
+    death_test_use_fork_ = GTEST_FLAG_GET(death_test_use_fork);
+    fail_fast_ = GTEST_FLAG_GET(fail_fast);
+    filter_ = GTEST_FLAG_GET(filter);
+    internal_run_death_test_ = GTEST_FLAG_GET(internal_run_death_test);
+    list_tests_ = GTEST_FLAG_GET(list_tests);
+    output_ = GTEST_FLAG_GET(output);
+    brief_ = GTEST_FLAG_GET(brief);
+    print_time_ = GTEST_FLAG_GET(print_time);
+    print_utf8_ = GTEST_FLAG_GET(print_utf8);
+    random_seed_ = GTEST_FLAG_GET(random_seed);
+    repeat_ = GTEST_FLAG_GET(repeat);
+    recreate_environments_when_repeating_ =
+        GTEST_FLAG_GET(recreate_environments_when_repeating);
+    shuffle_ = GTEST_FLAG_GET(shuffle);
+    stack_trace_depth_ = GTEST_FLAG_GET(stack_trace_depth);
+    stream_result_to_ = GTEST_FLAG_GET(stream_result_to);
+    throw_on_failure_ = GTEST_FLAG_GET(throw_on_failure);
   }
 
   // The d'tor is not virtual.  DO NOT INHERIT FROM THIS CLASS.
   ~GTestFlagSaver() {
-    GTEST_FLAG(also_run_disabled_tests) = also_run_disabled_tests_;
-    GTEST_FLAG(break_on_failure) = break_on_failure_;
-    GTEST_FLAG(catch_exceptions) = catch_exceptions_;
-    GTEST_FLAG(color) = color_;
-    GTEST_FLAG(death_test_style) = death_test_style_;
-    GTEST_FLAG(death_test_use_fork) = death_test_use_fork_;
-    GTEST_FLAG(filter) = filter_;
-    GTEST_FLAG(fail_fast) = fail_fast_;
-    GTEST_FLAG(internal_run_death_test) = internal_run_death_test_;
-    GTEST_FLAG(list_tests) = list_tests_;
-    GTEST_FLAG(output) = output_;
-    GTEST_FLAG(brief) = brief_;
-    GTEST_FLAG(print_time) = print_time_;
-    GTEST_FLAG(print_utf8) = print_utf8_;
-    GTEST_FLAG(random_seed) = random_seed_;
-    GTEST_FLAG(repeat) = repeat_;
-    GTEST_FLAG(shuffle) = shuffle_;
-    GTEST_FLAG(stack_trace_depth) = stack_trace_depth_;
-    GTEST_FLAG(stream_result_to) = stream_result_to_;
-    GTEST_FLAG(throw_on_failure) = throw_on_failure_;
+    GTEST_FLAG_SET(also_run_disabled_tests, also_run_disabled_tests_);
+    GTEST_FLAG_SET(break_on_failure, break_on_failure_);
+    GTEST_FLAG_SET(catch_exceptions, catch_exceptions_);
+    GTEST_FLAG_SET(color, color_);
+    GTEST_FLAG_SET(death_test_style, death_test_style_);
+    GTEST_FLAG_SET(death_test_use_fork, death_test_use_fork_);
+    GTEST_FLAG_SET(filter, filter_);
+    GTEST_FLAG_SET(fail_fast, fail_fast_);
+    GTEST_FLAG_SET(internal_run_death_test, internal_run_death_test_);
+    GTEST_FLAG_SET(list_tests, list_tests_);
+    GTEST_FLAG_SET(output, output_);
+    GTEST_FLAG_SET(brief, brief_);
+    GTEST_FLAG_SET(print_time, print_time_);
+    GTEST_FLAG_SET(print_utf8, print_utf8_);
+    GTEST_FLAG_SET(random_seed, random_seed_);
+    GTEST_FLAG_SET(repeat, repeat_);
+    GTEST_FLAG_SET(recreate_environments_when_repeating,
+                   recreate_environments_when_repeating_);
+    GTEST_FLAG_SET(shuffle, shuffle_);
+    GTEST_FLAG_SET(stack_trace_depth, stack_trace_depth_);
+    GTEST_FLAG_SET(stream_result_to, stream_result_to_);
+    GTEST_FLAG_SET(throw_on_failure, throw_on_failure_);
   }
 
  private:
@@ -225,11 +210,12 @@ class GTestFlagSaver {
   bool print_utf8_;
   int32_t random_seed_;
   int32_t repeat_;
+  bool recreate_environments_when_repeating_;
   bool shuffle_;
   int32_t stack_trace_depth_;
   std::string stream_result_to_;
   bool throw_on_failure_;
-} GTEST_ATTRIBUTE_UNUSED_;
+};
 
 // Converts a Unicode code point to a narrow string in UTF-8 encoding.
 // code_point parameter is of type UInt32 because wchar_t may not be
@@ -291,7 +277,7 @@ inline int CountIf(const Container& c, Predicate predicate) {
   // Implemented as an explicit loop since std::count_if() in libCstd on
   // Solaris has a non-standard signature.
   int count = 0;
-  for (typename Container::const_iterator it = c.begin(); it != c.end(); ++it) {
+  for (auto it = c.begin(); it != c.end(); ++it) {
     if (predicate(*it)) ++count;
   }
   return count;
@@ -327,7 +313,7 @@ void ShuffleRange(internal::Random* random, int begin, int end,
       << begin << ", " << size << "].";
 
   // Fisher-Yates shuffle, from
-  // http://en.wikipedia.org/wiki/Fisher-Yates_shuffle
+  // https://en.wikipedia.org/wiki/Fisher-Yates_shuffle
   for (int range_width = end - begin; range_width >= 2; range_width--) {
     const int last_in_range = begin + range_width - 1;
     const int selected =
@@ -399,13 +385,13 @@ class GTEST_API_ UnitTestOptions {
   static bool FilterMatchesTest(const std::string& test_suite_name,
                                 const std::string& test_name);
 
-#if GTEST_OS_WINDOWS
+#ifdef GTEST_OS_WINDOWS
   // Function for supporting the gtest_catch_exception flag.
 
-  // Returns EXCEPTION_EXECUTE_HANDLER if Google Test should handle the
-  // given SEH exception, or EXCEPTION_CONTINUE_SEARCH otherwise.
+  // Returns EXCEPTION_EXECUTE_HANDLER if given SEH exception was handled, or
+  // EXCEPTION_CONTINUE_SEARCH otherwise.
   // This function is useful as an __except condition.
-  static int GTestShouldProcessSEH(DWORD exception_code);
+  static int GTestProcessSEH(DWORD seh_code, const char* location);
 #endif  // GTEST_OS_WINDOWS
 
   // Returns true if "name" matches the ':' separated list of glob-style
@@ -413,15 +399,17 @@ class GTEST_API_ UnitTestOptions {
   static bool MatchesFilter(const std::string& name, const char* filter);
 };
 
+#if GTEST_HAS_FILE_SYSTEM
 // Returns the current application's name, removing directory path if that
 // is present.  Used by UnitTestOptions::GetOutputFile.
 GTEST_API_ FilePath GetCurrentExecutableName();
+#endif  // GTEST_HAS_FILE_SYSTEM
 
 // The role interface for getting the OS stack trace as a string.
 class OsStackTraceGetterInterface {
  public:
-  OsStackTraceGetterInterface() {}
-  virtual ~OsStackTraceGetterInterface() {}
+  OsStackTraceGetterInterface() = default;
+  virtual ~OsStackTraceGetterInterface() = default;
 
   // Returns the current OS stack trace as an std::string.  Parameters:
   //
@@ -441,19 +429,21 @@ class OsStackTraceGetterInterface {
   static const char* const kElidedFramesMarker;
 
  private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(OsStackTraceGetterInterface);
+  OsStackTraceGetterInterface(const OsStackTraceGetterInterface&) = delete;
+  OsStackTraceGetterInterface& operator=(const OsStackTraceGetterInterface&) =
+      delete;
 };
 
 // A working implementation of the OsStackTraceGetterInterface interface.
 class OsStackTraceGetter : public OsStackTraceGetterInterface {
  public:
-  OsStackTraceGetter() {}
+  OsStackTraceGetter() = default;
 
   std::string CurrentStackTrace(int max_depth, int skip_count) override;
   void UponLeavingGTest() override;
 
  private:
-#if GTEST_HAS_ABSL
+#ifdef GTEST_HAS_ABSL
   Mutex mutex_;  // Protects all internal state.
 
   // We save the stack frame below the frame that calls user code.
@@ -463,7 +453,8 @@ class OsStackTraceGetter : public OsStackTraceGetterInterface {
   void* caller_frame_ = nullptr;
 #endif  // GTEST_HAS_ABSL
 
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(OsStackTraceGetter);
+  OsStackTraceGetter(const OsStackTraceGetter&) = delete;
+  OsStackTraceGetter& operator=(const OsStackTraceGetter&) = delete;
 };
 
 // Information about a Google Test trace point.
@@ -486,7 +477,10 @@ class DefaultGlobalTestPartResultReporter
  private:
   UnitTestImpl* const unit_test_;
 
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(DefaultGlobalTestPartResultReporter);
+  DefaultGlobalTestPartResultReporter(
+      const DefaultGlobalTestPartResultReporter&) = delete;
+  DefaultGlobalTestPartResultReporter& operator=(
+      const DefaultGlobalTestPartResultReporter&) = delete;
 };
 
 // This is the default per thread test part result reporter used in
@@ -502,7 +496,10 @@ class DefaultPerThreadTestPartResultReporter
  private:
   UnitTestImpl* const unit_test_;
 
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(DefaultPerThreadTestPartResultReporter);
+  DefaultPerThreadTestPartResultReporter(
+      const DefaultPerThreadTestPartResultReporter&) = delete;
+  DefaultPerThreadTestPartResultReporter& operator=(
+      const DefaultPerThreadTestPartResultReporter&) = delete;
 };
 
 // The private implementation of the UnitTest class.  We don't protect
@@ -515,9 +512,9 @@ class GTEST_API_ UnitTestImpl {
   virtual ~UnitTestImpl();
 
   // There are two different ways to register your own TestPartResultReporter.
-  // You can register your own repoter to listen either only for test results
+  // You can register your own reporter to listen either only for test results
   // from the current thread or for results from all threads.
-  // By default, each per-thread test result repoter just passes a new
+  // By default, each per-thread test result reporter just passes a new
   // TestPartResult to the global test result reporter, which registers the
   // test part result for the currently running test.
 
@@ -640,7 +637,8 @@ class GTEST_API_ UnitTestImpl {
   // For example, if Foo() calls Bar(), which in turn calls
   // CurrentOsStackTraceExceptTop(1), Foo() will be included in the
   // trace but Bar() and CurrentOsStackTraceExceptTop() won't.
-  std::string CurrentOsStackTraceExceptTop(int skip_count) GTEST_NO_INLINE_;
+  std::string CurrentOsStackTraceExceptTop(int skip_count)
+      GTEST_NO_INLINE_ GTEST_NO_TAIL_CALL_;
 
   // Finds and returns a TestSuite with the given name.  If one doesn't
   // exist, creates one and returns it.
@@ -652,13 +650,15 @@ class GTEST_API_ UnitTestImpl {
   //                    this is not a typed or a type-parameterized test.
   //   set_up_tc:       pointer to the function that sets up the test suite
   //   tear_down_tc:    pointer to the function that tears down the test suite
-  TestSuite* GetTestSuite(const char* test_suite_name, const char* type_param,
+  TestSuite* GetTestSuite(const std::string& test_suite_name,
+                          const char* type_param,
                           internal::SetUpTestSuiteFunc set_up_tc,
                           internal::TearDownTestSuiteFunc tear_down_tc);
 
 //  Legacy API is deprecated but still available
 #ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  TestCase* GetTestCase(const char* test_case_name, const char* type_param,
+  TestCase* GetTestCase(const std::string& test_case_name,
+                        const char* type_param,
                         internal::SetUpTestSuiteFunc set_up_tc,
                         internal::TearDownTestSuiteFunc tear_down_tc) {
     return GetTestSuite(test_case_name, type_param, set_up_tc, tear_down_tc);
@@ -675,7 +675,7 @@ class GTEST_API_ UnitTestImpl {
   void AddTestInfo(internal::SetUpTestSuiteFunc set_up_tc,
                    internal::TearDownTestSuiteFunc tear_down_tc,
                    TestInfo* test_info) {
-#if GTEST_HAS_DEATH_TEST
+#if GTEST_HAS_FILE_SYSTEM
     // In order to support thread-safe death tests, we need to
     // remember the original working directory when the test program
     // was first invoked.  We cannot do this in RUN_ALL_TESTS(), as
@@ -684,13 +684,13 @@ class GTEST_API_ UnitTestImpl {
     // AddTestInfo(), which is called to register a TEST or TEST_F
     // before main() is reached.
     if (original_working_dir_.IsEmpty()) {
-      original_working_dir_.Set(FilePath::GetCurrentDir());
+      original_working_dir_ = FilePath::GetCurrentDir();
       GTEST_CHECK_(!original_working_dir_.IsEmpty())
           << "Failed to get the current working directory.";
     }
-#endif  // GTEST_HAS_DEATH_TEST
+#endif  // GTEST_HAS_FILE_SYSTEM
 
-    GetTestSuite(test_info->test_suite_name(), test_info->type_param(),
+    GetTestSuite(test_info->test_suite_name_, test_info->type_param(),
                  set_up_tc, tear_down_tc)
         ->AddTestInfo(test_info);
   }
@@ -712,18 +712,6 @@ class GTEST_API_ UnitTestImpl {
     return type_parameterized_test_registry_;
   }
 
-  // Sets the TestSuite object for the test that's currently running.
-  void set_current_test_suite(TestSuite* a_current_test_suite) {
-    current_test_suite_ = a_current_test_suite;
-  }
-
-  // Sets the TestInfo object for the test that's currently running.  If
-  // current_test_info is NULL, the assertion results will be stored in
-  // ad_hoc_test_result_.
-  void set_current_test_info(TestInfo* a_current_test_info) {
-    current_test_info_ = a_current_test_info;
-  }
-
   // Registers all parameterized tests defined using TEST_P and
   // INSTANTIATE_TEST_SUITE_P, creating regular tests for each test/parameter
   // combination. This method can be called more then once; it has guards
@@ -781,7 +769,7 @@ class GTEST_API_ UnitTestImpl {
     return gtest_trace_stack_.get();
   }
 
-#if GTEST_HAS_DEATH_TEST
+#ifdef GTEST_HAS_DEATH_TEST
   void InitDeathTestSubprocessControlInfo() {
     internal_run_death_test_flag_.reset(ParseInternalRunDeathTestFlag());
   }
@@ -838,18 +826,42 @@ class GTEST_API_ UnitTestImpl {
   bool catch_exceptions() const { return catch_exceptions_; }
 
  private:
+  // Returns true if a warning should be issued if no tests match the test
+  // filter flag.
+  bool ShouldWarnIfNoTestsMatchFilter() const;
+
+  struct CompareTestSuitesByPointer {
+    bool operator()(const TestSuite* lhs, const TestSuite* rhs) const {
+      return lhs->name_ < rhs->name_;
+    }
+  };
+
   friend class ::testing::UnitTest;
 
   // Used by UnitTest::Run() to capture the state of
   // GTEST_FLAG(catch_exceptions) at the moment it starts.
   void set_catch_exceptions(bool value) { catch_exceptions_ = value; }
 
+  // Sets the TestSuite object for the test that's currently running.
+  void set_current_test_suite(TestSuite* a_current_test_suite) {
+    current_test_suite_ = a_current_test_suite;
+  }
+
+  // Sets the TestInfo object for the test that's currently running.  If
+  // current_test_info is NULL, the assertion results will be stored in
+  // ad_hoc_test_result_.
+  void set_current_test_info(TestInfo* a_current_test_info) {
+    current_test_info_ = a_current_test_info;
+  }
+
   // The UnitTest object that owns this implementation object.
   UnitTest* const parent_;
 
+#if GTEST_HAS_FILE_SYSTEM
   // The working directory when the first TEST() or TEST_F() was
   // executed.
   internal::FilePath original_working_dir_;
+#endif  // GTEST_HAS_FILE_SYSTEM
 
   // The default test part result reporters.
   DefaultGlobalTestPartResultReporter default_global_test_part_result_reporter_;
@@ -857,7 +869,7 @@ class GTEST_API_ UnitTestImpl {
       default_per_thread_test_part_result_reporter_;
 
   // Points to (but doesn't own) the global test part result reporter.
-  TestPartResultReporterInterface* global_test_part_result_repoter_;
+  TestPartResultReporterInterface* global_test_part_result_reporter_;
 
   // Protects read and write access to global_test_part_result_reporter_.
   internal::Mutex global_test_part_result_reporter_mutex_;
@@ -874,6 +886,9 @@ class GTEST_API_ UnitTestImpl {
   // elements in the vector.
   std::vector<TestSuite*> test_suites_;
 
+  // The set of TestSuites by name.
+  std::unordered_map<std::string, TestSuite*> test_suites_by_name_;
+
   // Provides a level of indirection for the test suite list to allow
   // easy shuffling and restoring the test suite order.  The i-th
   // element of this vector is the index of the i-th test suite in the
@@ -944,7 +959,7 @@ class GTEST_API_ UnitTestImpl {
   // How long the test took to run, in milliseconds.
   TimeInMillis elapsed_time_;
 
-#if GTEST_HAS_DEATH_TEST
+#ifdef GTEST_HAS_DEATH_TEST
   // The decomposed components of the gtest_internal_run_death_test flag,
   // parsed when RUN_ALL_TESTS is called.
   std::unique_ptr<InternalRunDeathTestFlag> internal_run_death_test_flag_;
@@ -958,7 +973,8 @@ class GTEST_API_ UnitTestImpl {
   // starts.
   bool catch_exceptions_;
 
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(UnitTestImpl);
+  UnitTestImpl(const UnitTestImpl&) = delete;
+  UnitTestImpl& operator=(const UnitTestImpl&) = delete;
 };  // class UnitTestImpl
 
 // Convenience function for accessing the global UnitTest
@@ -967,7 +983,7 @@ inline UnitTestImpl* GetUnitTestImpl() {
   return UnitTest::GetInstance()->impl();
 }
 
-#if GTEST_USES_SIMPLE_RE
+#ifdef GTEST_USES_SIMPLE_RE
 
 // Internal helper functions for implementing the simple regular
 // expression matcher.
@@ -993,7 +1009,7 @@ GTEST_API_ bool MatchRegexAnywhere(const char* regex, const char* str);
 GTEST_API_ void ParseGoogleTestFlagsOnly(int* argc, char** argv);
 GTEST_API_ void ParseGoogleTestFlagsOnly(int* argc, wchar_t** argv);
 
-#if GTEST_HAS_DEATH_TEST
+#ifdef GTEST_HAS_DEATH_TEST
 
 // Returns the message describing the last system error, regardless of the
 // platform.
@@ -1064,7 +1080,7 @@ class StreamingListener : public EmptyTestEventListener {
   // Abstract base class for writing strings to a socket.
   class AbstractSocketWriter {
    public:
-    virtual ~AbstractSocketWriter() {}
+    virtual ~AbstractSocketWriter() = default;
 
     // Sends a string to the socket.
     virtual void Send(const std::string& message) = 0;
@@ -1117,7 +1133,8 @@ class StreamingListener : public EmptyTestEventListener {
     const std::string host_name_;
     const std::string port_num_;
 
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(SocketWriter);
+    SocketWriter(const SocketWriter&) = delete;
+    SocketWriter& operator=(const SocketWriter&) = delete;
   };  // class SocketWriter
 
   // Escapes '=', '&', '%', and '\n' characters in str as "%xx".
@@ -1161,15 +1178,15 @@ class StreamingListener : public EmptyTestEventListener {
 
   // Note that "event=TestCaseStart" is a wire format and has to remain
   // "case" for compatibility
-  void OnTestCaseStart(const TestCase& test_case) override {
-    SendLn(std::string("event=TestCaseStart&name=") + test_case.name());
+  void OnTestSuiteStart(const TestSuite& test_suite) override {
+    SendLn(std::string("event=TestCaseStart&name=") + test_suite.name());
   }
 
   // Note that "event=TestCaseEnd" is a wire format and has to remain
   // "case" for compatibility
-  void OnTestCaseEnd(const TestCase& test_case) override {
-    SendLn("event=TestCaseEnd&passed=" + FormatBool(test_case.Passed()) +
-           "&elapsed_time=" + StreamableToString(test_case.elapsed_time()) +
+  void OnTestSuiteEnd(const TestSuite& test_suite) override {
+    SendLn("event=TestCaseEnd&passed=" + FormatBool(test_suite.Passed()) +
+           "&elapsed_time=" + StreamableToString(test_suite.elapsed_time()) +
            "ms");
   }
 
@@ -1203,7 +1220,8 @@ class StreamingListener : public EmptyTestEventListener {
 
   const std::unique_ptr<AbstractSocketWriter> socket_writer_;
 
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(StreamingListener);
+  StreamingListener(const StreamingListener&) = delete;
+  StreamingListener& operator=(const StreamingListener&) = delete;
 };  // class StreamingListener
 
 #endif  // GTEST_CAN_STREAM_RESULTS_
diff --git a/external/googletest/googletest/src/gtest-port.cc b/external/googletest/googletest/src/gtest-port.cc
index a91f06f3..1038ad7b 100644
--- a/external/googletest/googletest/src/gtest-port.cc
+++ b/external/googletest/googletest/src/gtest-port.cc
@@ -37,8 +37,12 @@
 #include <cstdint>
 #include <fstream>
 #include <memory>
+#include <ostream>
+#include <string>
+#include <utility>
+#include <vector>
 
-#if GTEST_OS_WINDOWS
+#ifdef GTEST_OS_WINDOWS
 #include <io.h>
 #include <sys/stat.h>
 #include <windows.h>
@@ -51,32 +55,34 @@
 #include <unistd.h>
 #endif  // GTEST_OS_WINDOWS
 
-#if GTEST_OS_MAC
+#ifdef GTEST_OS_MAC
 #include <mach/mach_init.h>
 #include <mach/task.h>
 #include <mach/vm_map.h>
 #endif  // GTEST_OS_MAC
 
-#if GTEST_OS_DRAGONFLY || GTEST_OS_FREEBSD || GTEST_OS_GNU_KFREEBSD || \
-    GTEST_OS_NETBSD || GTEST_OS_OPENBSD
+#if defined(GTEST_OS_DRAGONFLY) || defined(GTEST_OS_FREEBSD) ||   \
+    defined(GTEST_OS_GNU_KFREEBSD) || defined(GTEST_OS_NETBSD) || \
+    defined(GTEST_OS_OPENBSD)
 #include <sys/sysctl.h>
-#if GTEST_OS_DRAGONFLY || GTEST_OS_FREEBSD || GTEST_OS_GNU_KFREEBSD
+#if defined(GTEST_OS_DRAGONFLY) || defined(GTEST_OS_FREEBSD) || \
+    defined(GTEST_OS_GNU_KFREEBSD)
 #include <sys/user.h>
 #endif
 #endif
 
-#if GTEST_OS_QNX
+#ifdef GTEST_OS_QNX
 #include <devctl.h>
 #include <fcntl.h>
 #include <sys/procfs.h>
 #endif  // GTEST_OS_QNX
 
-#if GTEST_OS_AIX
+#ifdef GTEST_OS_AIX
 #include <procinfo.h>
 #include <sys/types.h>
 #endif  // GTEST_OS_AIX
 
-#if GTEST_OS_FUCHSIA
+#ifdef GTEST_OS_FUCHSIA
 #include <zircon/process.h>
 #include <zircon/syscalls.h>
 #endif  // GTEST_OS_FUCHSIA
@@ -90,16 +96,7 @@
 namespace testing {
 namespace internal {
 
-#if defined(_MSC_VER) || defined(__BORLANDC__)
-// MSVC and C++Builder do not provide a definition of STDERR_FILENO.
-const int kStdOutFileno = 1;
-const int kStdErrFileno = 2;
-#else
-const int kStdOutFileno = STDOUT_FILENO;
-const int kStdErrFileno = STDERR_FILENO;
-#endif  // _MSC_VER
-
-#if GTEST_OS_LINUX
+#if defined(GTEST_OS_LINUX) || defined(GTEST_OS_GNU_HURD)
 
 namespace {
 template <typename T>
@@ -122,7 +119,7 @@ size_t GetThreadCount() {
   return ReadProcFileField<size_t>(filename, 19);
 }
 
-#elif GTEST_OS_MAC
+#elif defined(GTEST_OS_MAC)
 
 size_t GetThreadCount() {
   const task_t task = mach_task_self();
@@ -140,20 +137,20 @@ size_t GetThreadCount() {
   }
 }
 
-#elif GTEST_OS_DRAGONFLY || GTEST_OS_FREEBSD || GTEST_OS_GNU_KFREEBSD || \
-    GTEST_OS_NETBSD
+#elif defined(GTEST_OS_DRAGONFLY) || defined(GTEST_OS_FREEBSD) || \
+    defined(GTEST_OS_GNU_KFREEBSD) || defined(GTEST_OS_NETBSD)
 
-#if GTEST_OS_NETBSD
+#ifdef GTEST_OS_NETBSD
 #undef KERN_PROC
 #define KERN_PROC KERN_PROC2
 #define kinfo_proc kinfo_proc2
 #endif
 
-#if GTEST_OS_DRAGONFLY
+#ifdef GTEST_OS_DRAGONFLY
 #define KP_NLWP(kp) (kp.kp_nthreads)
-#elif GTEST_OS_FREEBSD || GTEST_OS_GNU_KFREEBSD
+#elif defined(GTEST_OS_FREEBSD) || defined(GTEST_OS_GNU_KFREEBSD)
 #define KP_NLWP(kp) (kp.ki_numthreads)
-#elif GTEST_OS_NETBSD
+#elif defined(GTEST_OS_NETBSD)
 #define KP_NLWP(kp) (kp.p_nlwps)
 #endif
 
@@ -161,13 +158,13 @@ size_t GetThreadCount() {
 // we cannot detect it.
 size_t GetThreadCount() {
   int mib[] = {
-    CTL_KERN,
-    KERN_PROC,
-    KERN_PROC_PID,
-    getpid(),
-#if GTEST_OS_NETBSD
-    sizeof(struct kinfo_proc),
-    1,
+      CTL_KERN,
+      KERN_PROC,
+      KERN_PROC_PID,
+      getpid(),
+#ifdef GTEST_OS_NETBSD
+      sizeof(struct kinfo_proc),
+      1,
 #endif
   };
   u_int miblen = sizeof(mib) / sizeof(mib[0]);
@@ -178,7 +175,7 @@ size_t GetThreadCount() {
   }
   return static_cast<size_t>(KP_NLWP(info));
 }
-#elif GTEST_OS_OPENBSD
+#elif defined(GTEST_OS_OPENBSD)
 
 // Returns the number of threads running in the process, or 0 to indicate that
 // we cannot detect it.
@@ -202,8 +199,8 @@ size_t GetThreadCount() {
   mib[5] = static_cast<int>(size / static_cast<size_t>(mib[4]));
 
   // populate array of structs
-  struct kinfo_proc info[mib[5]];
-  if (sysctl(mib, miblen, &info, &size, NULL, 0)) {
+  std::vector<struct kinfo_proc> info(mib[5]);
+  if (sysctl(mib, miblen, info.data(), &size, NULL, 0)) {
     return 0;
   }
 
@@ -215,7 +212,7 @@ size_t GetThreadCount() {
   return nthreads;
 }
 
-#elif GTEST_OS_QNX
+#elif defined(GTEST_OS_QNX)
 
 // Returns the number of threads running in the process, or 0 to indicate that
 // we cannot detect it.
@@ -235,7 +232,7 @@ size_t GetThreadCount() {
   }
 }
 
-#elif GTEST_OS_AIX
+#elif defined(GTEST_OS_AIX)
 
 size_t GetThreadCount() {
   struct procentry64 entry;
@@ -248,7 +245,7 @@ size_t GetThreadCount() {
   }
 }
 
-#elif GTEST_OS_FUCHSIA
+#elif defined(GTEST_OS_FUCHSIA)
 
 size_t GetThreadCount() {
   int dummy_buffer;
@@ -273,9 +270,7 @@ size_t GetThreadCount() {
 
 #endif  // GTEST_OS_LINUX
 
-#if GTEST_IS_THREADSAFE && GTEST_OS_WINDOWS
-
-void SleepMilliseconds(int n) { ::Sleep(static_cast<DWORD>(n)); }
+#if defined(GTEST_IS_THREADSAFE) && defined(GTEST_OS_WINDOWS)
 
 AutoHandle::AutoHandle() : handle_(INVALID_HANDLE_VALUE) {}
 
@@ -307,20 +302,6 @@ bool AutoHandle::IsCloseable() const {
   return handle_ != nullptr && handle_ != INVALID_HANDLE_VALUE;
 }
 
-Notification::Notification()
-    : event_(::CreateEvent(nullptr,     // Default security attributes.
-                           TRUE,        // Do not reset automatically.
-                           FALSE,       // Initially unset.
-                           nullptr)) {  // Anonymous event.
-  GTEST_CHECK_(event_.Get() != nullptr);
-}
-
-void Notification::Notify() { GTEST_CHECK_(::SetEvent(event_.Get()) != FALSE); }
-
-void Notification::WaitForNotification() {
-  GTEST_CHECK_(::WaitForSingleObject(event_.Get(), INFINITE) == WAIT_OBJECT_0);
-}
-
 Mutex::Mutex()
     : owner_thread_id_(0),
       type_(kDynamic),
@@ -379,18 +360,19 @@ class MemoryIsNotDeallocated {
     old_crtdbg_flag_ = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG);
     // Set heap allocation block type to _IGNORE_BLOCK so that MS debug CRT
     // doesn't report mem leak if there's no matching deallocation.
-    _CrtSetDbgFlag(old_crtdbg_flag_ & ~_CRTDBG_ALLOC_MEM_DF);
+    (void)_CrtSetDbgFlag(old_crtdbg_flag_ & ~_CRTDBG_ALLOC_MEM_DF);
   }
 
   ~MemoryIsNotDeallocated() {
     // Restore the original _CRTDBG_ALLOC_MEM_DF flag
-    _CrtSetDbgFlag(old_crtdbg_flag_);
+    (void)_CrtSetDbgFlag(old_crtdbg_flag_);
   }
 
  private:
   int old_crtdbg_flag_;
 
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(MemoryIsNotDeallocated);
+  MemoryIsNotDeallocated(const MemoryIsNotDeallocated&) = delete;
+  MemoryIsNotDeallocated& operator=(const MemoryIsNotDeallocated&) = delete;
 };
 #endif  // _MSC_VER
 
@@ -485,7 +467,8 @@ class ThreadWithParamSupport : public ThreadWithParamBase {
   // Prohibit instantiation.
   ThreadWithParamSupport();
 
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadWithParamSupport);
+  ThreadWithParamSupport(const ThreadWithParamSupport&) = delete;
+  ThreadWithParamSupport& operator=(const ThreadWithParamSupport&) = delete;
 };
 
 }  // namespace
@@ -604,9 +587,11 @@ class ThreadLocalRegistryImpl {
   // thread's ID.
   typedef std::map<DWORD, ThreadLocalValues> ThreadIdToThreadLocals;
 
-  // Holds the thread id and thread handle that we pass from
-  // StartWatcherThreadFor to WatcherThreadFunc.
-  typedef std::pair<DWORD, HANDLE> ThreadIdAndHandle;
+  struct WatcherThreadParams {
+    DWORD thread_id;
+    HANDLE handle;
+    Notification has_initialized;
+  };
 
   static void StartWatcherThreadFor(DWORD thread_id) {
     // The returned handle will be kept in thread_map and closed by
@@ -614,33 +599,47 @@ class ThreadLocalRegistryImpl {
     HANDLE thread =
         ::OpenThread(SYNCHRONIZE | THREAD_QUERY_INFORMATION, FALSE, thread_id);
     GTEST_CHECK_(thread != nullptr);
+
+    WatcherThreadParams* watcher_thread_params = new WatcherThreadParams;
+    watcher_thread_params->thread_id = thread_id;
+    watcher_thread_params->handle = thread;
+
     // We need to pass a valid thread ID pointer into CreateThread for it
     // to work correctly under Win98.
     DWORD watcher_thread_id;
-    HANDLE watcher_thread = ::CreateThread(
-        nullptr,  // Default security.
-        0,        // Default stack size
-        &ThreadLocalRegistryImpl::WatcherThreadFunc,
-        reinterpret_cast<LPVOID>(new ThreadIdAndHandle(thread_id, thread)),
-        CREATE_SUSPENDED, &watcher_thread_id);
-    GTEST_CHECK_(watcher_thread != nullptr);
+    HANDLE watcher_thread =
+        ::CreateThread(nullptr,  // Default security.
+                       0,        // Default stack size
+                       &ThreadLocalRegistryImpl::WatcherThreadFunc,
+                       reinterpret_cast<LPVOID>(watcher_thread_params),
+                       CREATE_SUSPENDED, &watcher_thread_id);
+    GTEST_CHECK_(watcher_thread != nullptr)
+        << "CreateThread failed with error " << ::GetLastError() << ".";
     // Give the watcher thread the same priority as ours to avoid being
     // blocked by it.
     ::SetThreadPriority(watcher_thread,
                         ::GetThreadPriority(::GetCurrentThread()));
     ::ResumeThread(watcher_thread);
     ::CloseHandle(watcher_thread);
+
+    // Wait for the watcher thread to start to avoid race conditions.
+    // One specific race condition that can happen is that we have returned
+    // from main and have started to tear down, the newly spawned watcher
+    // thread may access already-freed variables, like global shared_ptrs.
+    watcher_thread_params->has_initialized.WaitForNotification();
   }
 
   // Monitors exit from a given thread and notifies those
   // ThreadIdToThreadLocals about thread termination.
   static DWORD WINAPI WatcherThreadFunc(LPVOID param) {
-    const ThreadIdAndHandle* tah =
-        reinterpret_cast<const ThreadIdAndHandle*>(param);
-    GTEST_CHECK_(::WaitForSingleObject(tah->second, INFINITE) == WAIT_OBJECT_0);
-    OnThreadExit(tah->first);
-    ::CloseHandle(tah->second);
-    delete tah;
+    WatcherThreadParams* watcher_thread_params =
+        reinterpret_cast<WatcherThreadParams*>(param);
+    watcher_thread_params->has_initialized.Notify();
+    GTEST_CHECK_(::WaitForSingleObject(watcher_thread_params->handle,
+                                       INFINITE) == WAIT_OBJECT_0);
+    OnThreadExit(watcher_thread_params->thread_id);
+    ::CloseHandle(watcher_thread_params->handle);
+    delete watcher_thread_params;
     return 0;
   }
 
@@ -677,7 +676,7 @@ void ThreadLocalRegistry::OnThreadLocalDestroyed(
 
 #endif  // GTEST_IS_THREADSAFE && GTEST_OS_WINDOWS
 
-#if GTEST_USES_POSIX_RE
+#ifdef GTEST_USES_POSIX_RE
 
 // Implements RE.  Currently only needed for death tests.
 
@@ -690,7 +689,6 @@ RE::~RE() {
     regfree(&partial_regex_);
     regfree(&full_regex_);
   }
-  free(const_cast<char*>(pattern_));
 }
 
 // Returns true if and only if regular expression re matches the entire str.
@@ -712,7 +710,18 @@ bool RE::PartialMatch(const char* str, const RE& re) {
 
 // Initializes an RE from its string representation.
 void RE::Init(const char* regex) {
-  pattern_ = posix::StrDup(regex);
+  pattern_ = regex;
+
+  // NetBSD (and Android, which takes its regex implemntation from NetBSD) does
+  // not include the GNU regex extensions (such as Perl style character classes
+  // like \w) in REG_EXTENDED. REG_EXTENDED is only specified to include the
+  // [[:alpha:]] style character classes. Enable REG_GNU wherever it is defined
+  // so users can use those extensions.
+#if defined(REG_GNU)
+  constexpr int reg_flags = REG_EXTENDED | REG_GNU;
+#else
+  constexpr int reg_flags = REG_EXTENDED;
+#endif
 
   // Reserves enough bytes to hold the regular expression used for a
   // full match.
@@ -720,7 +729,7 @@ void RE::Init(const char* regex) {
   char* const full_pattern = new char[full_regex_len];
 
   snprintf(full_pattern, full_regex_len, "^(%s)$", regex);
-  is_valid_ = regcomp(&full_regex_, full_pattern, REG_EXTENDED) == 0;
+  is_valid_ = regcomp(&full_regex_, full_pattern, reg_flags) == 0;
   // We want to call regcomp(&partial_regex_, ...) even if the
   // previous expression returns false.  Otherwise partial_regex_ may
   // not be properly initialized can may cause trouble when it's
@@ -731,7 +740,7 @@ void RE::Init(const char* regex) {
   // regex.  We change it to an equivalent form "()" to be safe.
   if (is_valid_) {
     const char* const partial_regex = (*regex == '\0') ? "()" : regex;
-    is_valid_ = regcomp(&partial_regex_, partial_regex, REG_EXTENDED) == 0;
+    is_valid_ = regcomp(&partial_regex_, partial_regex, reg_flags) == 0;
   }
   EXPECT_TRUE(is_valid_)
       << "Regular expression \"" << regex
@@ -740,7 +749,7 @@ void RE::Init(const char* regex) {
   delete[] full_pattern;
 }
 
-#elif GTEST_USES_SIMPLE_RE
+#elif defined(GTEST_USES_SIMPLE_RE)
 
 // Returns true if and only if ch appears anywhere in str (excluding the
 // terminating '\0' character).
@@ -942,27 +951,26 @@ bool MatchRegexAnywhere(const char* regex, const char* str) {
 
 // Implements the RE class.
 
-RE::~RE() {
-  free(const_cast<char*>(pattern_));
-  free(const_cast<char*>(full_pattern_));
-}
+RE::~RE() = default;
 
 // Returns true if and only if regular expression re matches the entire str.
 bool RE::FullMatch(const char* str, const RE& re) {
-  return re.is_valid_ && MatchRegexAnywhere(re.full_pattern_, str);
+  return re.is_valid_ && MatchRegexAnywhere(re.full_pattern_.c_str(), str);
 }
 
 // Returns true if and only if regular expression re matches a substring of
 // str (including str itself).
 bool RE::PartialMatch(const char* str, const RE& re) {
-  return re.is_valid_ && MatchRegexAnywhere(re.pattern_, str);
+  return re.is_valid_ && MatchRegexAnywhere(re.pattern_.c_str(), str);
 }
 
 // Initializes an RE from its string representation.
 void RE::Init(const char* regex) {
-  pattern_ = full_pattern_ = nullptr;
+  full_pattern_.clear();
+  pattern_.clear();
+
   if (regex != nullptr) {
-    pattern_ = posix::StrDup(regex);
+    pattern_ = regex;
   }
 
   is_valid_ = ValidateRegex(regex);
@@ -971,25 +979,19 @@ void RE::Init(const char* regex) {
     return;
   }
 
-  const size_t len = strlen(regex);
   // Reserves enough bytes to hold the regular expression used for a
-  // full match: we need space to prepend a '^', append a '$', and
-  // terminate the string with '\0'.
-  char* buffer = static_cast<char*>(malloc(len + 3));
-  full_pattern_ = buffer;
+  // full match: we need space to prepend a '^' and append a '$'.
+  full_pattern_.reserve(pattern_.size() + 2);
 
-  if (*regex != '^')
-    *buffer++ = '^';  // Makes sure full_pattern_ starts with '^'.
-
-  // We don't use snprintf or strncpy, as they trigger a warning when
-  // compiled with VC++ 8.0.
-  memcpy(buffer, regex, len);
-  buffer += len;
+  if (pattern_.empty() || pattern_.front() != '^') {
+    full_pattern_.push_back('^');  // Makes sure full_pattern_ starts with '^'.
+  }
 
-  if (len == 0 || regex[len - 1] != '$')
-    *buffer++ = '$';  // Makes sure full_pattern_ ends with '$'.
+  full_pattern_.append(pattern_);
 
-  *buffer = '\0';
+  if (pattern_.empty() || pattern_.back() != '$') {
+    full_pattern_.push_back('$');  // Makes sure full_pattern_ ends with '$'.
+  }
 }
 
 #endif  // GTEST_USES_POSIX_RE
@@ -1046,18 +1048,28 @@ GTestLog::~GTestLog() {
   }
 }
 
+#if GTEST_HAS_STREAM_REDIRECTION
+
 // Disable Microsoft deprecation warnings for POSIX functions called from
 // this class (creat, dup, dup2, and close)
 GTEST_DISABLE_MSC_DEPRECATED_PUSH_()
 
-#if GTEST_HAS_STREAM_REDIRECTION
+namespace {
+
+#if defined(GTEST_OS_LINUX_ANDROID) || defined(GTEST_OS_IOS)
+bool EndsWithPathSeparator(const std::string& path) {
+  return !path.empty() && path.back() == GTEST_PATH_SEP_[0];
+}
+#endif
+
+}  // namespace
 
 // Object that captures an output stream (stdout/stderr).
 class CapturedStream {
  public:
   // The ctor redirects the stream to a temporary file.
   explicit CapturedStream(int fd) : fd_(fd), uncaptured_fd_(dup(fd)) {
-#if GTEST_OS_WINDOWS
+#ifdef GTEST_OS_WINDOWS
     char temp_dir_path[MAX_PATH + 1] = {'\0'};   // NOLINT
     char temp_file_path[MAX_PATH + 1] = {'\0'};  // NOLINT
 
@@ -1076,7 +1088,7 @@ class CapturedStream {
     // directory, so we create the temporary file in a temporary directory.
     std::string name_template;
 
-#if GTEST_OS_LINUX_ANDROID
+#ifdef GTEST_OS_LINUX_ANDROID
     // Note: Android applications are expected to call the framework's
     // Context.getExternalStorageDirectory() method through JNI to get
     // the location of the world-writable SD Card directory. However,
@@ -1088,8 +1100,14 @@ class CapturedStream {
     // The location /data/local/tmp is directly accessible from native code.
     // '/sdcard' and other variants cannot be relied on, as they are not
     // guaranteed to be mounted, or may have a delay in mounting.
-    name_template = "/data/local/tmp/";
-#elif GTEST_OS_IOS
+    //
+    // However, prefer using the TMPDIR environment variable if set, as newer
+    // devices may have /data/local/tmp read-only.
+    name_template = TempDir();
+    if (!EndsWithPathSeparator(name_template))
+      name_template.push_back(GTEST_PATH_SEP_[0]);
+
+#elif defined(GTEST_OS_IOS)
     char user_temp_dir[PATH_MAX + 1];
 
     // Documented alternative to NSTemporaryDirectory() (for obtaining creating
@@ -1108,7 +1126,7 @@ class CapturedStream {
     ::confstr(_CS_DARWIN_USER_TEMP_DIR, user_temp_dir, sizeof(user_temp_dir));
 
     name_template = user_temp_dir;
-    if (name_template.back() != GTEST_PATH_SEP_[0])
+    if (!EndsWithPathSeparator(name_template))
       name_template.push_back(GTEST_PATH_SEP_[0]);
 #else
     name_template = "/tmp/";
@@ -1161,7 +1179,8 @@ class CapturedStream {
   // Name of the temporary file holding the stderr output.
   ::std::string filename_;
 
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(CapturedStream);
+  CapturedStream(const CapturedStream&) = delete;
+  CapturedStream& operator=(const CapturedStream&) = delete;
 };
 
 GTEST_DISABLE_MSC_DEPRECATED_POP_()
@@ -1189,6 +1208,15 @@ static std::string GetCapturedStream(CapturedStream** captured_stream) {
   return content;
 }
 
+#if defined(_MSC_VER) || defined(__BORLANDC__)
+// MSVC and C++Builder do not provide a definition of STDERR_FILENO.
+const int kStdOutFileno = 1;
+const int kStdErrFileno = 2;
+#else
+const int kStdOutFileno = STDOUT_FILENO;
+const int kStdErrFileno = STDERR_FILENO;
+#endif  // defined(_MSC_VER) || defined(__BORLANDC__)
+
 // Starts capturing stdout.
 void CaptureStdout() {
   CaptureStream(kStdOutFileno, "stdout", &g_captured_stdout);
@@ -1239,7 +1267,7 @@ std::string ReadEntireFile(FILE* file) {
   return content;
 }
 
-#if GTEST_HAS_DEATH_TEST
+#ifdef GTEST_HAS_DEATH_TEST
 static const std::vector<std::string>* g_injected_test_argvs =
     nullptr;  // Owned.
 
@@ -1266,7 +1294,7 @@ void ClearInjectableArgvs() {
 }
 #endif  // GTEST_HAS_DEATH_TEST
 
-#if GTEST_OS_WINDOWS_MOBILE
+#ifdef GTEST_OS_WINDOWS_MOBILE
 namespace posix {
 void Abort() {
   DebugBreak();
@@ -1320,8 +1348,8 @@ bool ParseInt32(const Message& src_text, const char* str, int32_t* value) {
   ) {
     Message msg;
     msg << "WARNING: " << src_text
-        << " is expected to be a 32-bit integer, but actually"
-        << " has value " << str << ", which overflows.\n";
+        << " is expected to be a 32-bit integer, but actually" << " has value "
+        << str << ", which overflows.\n";
     printf("%s", msg.GetString().c_str());
     fflush(stdout);
     return false;
diff --git a/external/googletest/googletest/src/gtest-printers.cc b/external/googletest/googletest/src/gtest-printers.cc
index 15845324..e3acecba 100644
--- a/external/googletest/googletest/src/gtest-printers.cc
+++ b/external/googletest/googletest/src/gtest-printers.cc
@@ -47,6 +47,8 @@
 #include <cctype>
 #include <cstdint>
 #include <cwchar>
+#include <iomanip>
+#include <ios>
 #include <ostream>  // NOLINT
 #include <string>
 #include <type_traits>
@@ -214,7 +216,7 @@ static const char* GetCharWidthPrefix(signed char) { return ""; }
 
 static const char* GetCharWidthPrefix(unsigned char) { return ""; }
 
-#ifdef __cpp_char8_t
+#ifdef __cpp_lib_char8_t
 static const char* GetCharWidthPrefix(char8_t) { return "u8"; }
 #endif
 
@@ -230,7 +232,7 @@ static CharFormat PrintAsStringLiteralTo(char c, ostream* os) {
   return PrintAsStringLiteralTo(ToChar32(c), os);
 }
 
-#ifdef __cpp_char8_t
+#ifdef __cpp_lib_char8_t
 static CharFormat PrintAsStringLiteralTo(char8_t c, ostream* os) {
   return PrintAsStringLiteralTo(ToChar32(c), os);
 }
@@ -284,6 +286,51 @@ void PrintTo(char32_t c, ::std::ostream* os) {
       << static_cast<uint32_t>(c);
 }
 
+// gcc/clang __{u,}int128_t
+#if defined(__SIZEOF_INT128__)
+void PrintTo(__uint128_t v, ::std::ostream* os) {
+  if (v == 0) {
+    *os << "0";
+    return;
+  }
+
+  // Buffer large enough for ceil(log10(2^128))==39 and the null terminator
+  char buf[40];
+  char* p = buf + sizeof(buf);
+
+  // Some configurations have a __uint128_t, but no support for built in
+  // division. Do manual long division instead.
+
+  uint64_t high = static_cast<uint64_t>(v >> 64);
+  uint64_t low = static_cast<uint64_t>(v);
+
+  *--p = 0;
+  while (high != 0 || low != 0) {
+    uint64_t high_mod = high % 10;
+    high = high / 10;
+    // This is the long division algorithm specialized for a divisor of 10 and
+    // only two elements.
+    // Notable values:
+    //   2^64 / 10 == 1844674407370955161
+    //   2^64 % 10 == 6
+    const uint64_t carry = 6 * high_mod + low % 10;
+    low = low / 10 + high_mod * 1844674407370955161 + carry / 10;
+
+    char digit = static_cast<char>(carry % 10);
+    *--p = static_cast<char>('0' + digit);
+  }
+  *os << p;
+}
+void PrintTo(__int128_t v, ::std::ostream* os) {
+  __uint128_t uv = static_cast<__uint128_t>(v);
+  if (v < 0) {
+    *os << "-";
+    uv = -uv;
+  }
+  PrintTo(uv, os);
+}
+#endif  // __SIZEOF_INT128__
+
 // Prints the given array of characters to the ostream.  CharType must be either
 // char, char8_t, char16_t, char32_t, or wchar_t.
 // The array starts at begin, the length is len, it may include '\0' characters
@@ -348,7 +395,7 @@ void UniversalPrintArray(const char* begin, size_t len, ostream* os) {
   UniversalPrintCharArray(begin, len, os);
 }
 
-#ifdef __cpp_char8_t
+#ifdef __cpp_lib_char8_t
 // Prints a (const) char8_t array of 'len' elements, starting at address
 // 'begin'.
 void UniversalPrintArray(const char8_t* begin, size_t len, ostream* os) {
@@ -391,7 +438,7 @@ void PrintCStringTo(const Char* s, ostream* os) {
 
 void PrintTo(const char* s, ostream* os) { PrintCStringTo(s, os); }
 
-#ifdef __cpp_char8_t
+#ifdef __cpp_lib_char8_t
 void PrintTo(const char8_t* s, ostream* os) { PrintCStringTo(s, os); }
 #endif
 
@@ -477,13 +524,13 @@ void ConditionalPrintAsText(const char* str, size_t length, ostream* os) {
 
 void PrintStringTo(const ::std::string& s, ostream* os) {
   if (PrintCharsAsStringTo(s.data(), s.size(), os) == kHexEscape) {
-    if (GTEST_FLAG(print_utf8)) {
+    if (GTEST_FLAG_GET(print_utf8)) {
       ConditionalPrintAsText(s.data(), s.size(), os);
     }
   }
 }
 
-#ifdef __cpp_char8_t
+#ifdef __cpp_lib_char8_t
 void PrintU8StringTo(const ::std::u8string& s, ostream* os) {
   PrintCharsAsStringTo(s.data(), s.size(), os);
 }
diff --git a/external/googletest/googletest/src/gtest-test-part.cc b/external/googletest/googletest/src/gtest-test-part.cc
index eb7c8d1c..6f8ddd7c 100644
--- a/external/googletest/googletest/src/gtest-test-part.cc
+++ b/external/googletest/googletest/src/gtest-test-part.cc
@@ -32,13 +32,14 @@
 
 #include "gtest/gtest-test-part.h"
 
+#include <ostream>
+#include <string>
+
 #include "gtest/internal/gtest-port.h"
 #include "src/gtest-internal-inl.h"
 
 namespace testing {
 
-using internal::GetUnitTestImpl;
-
 // Gets the summary of the failure message by omitting the stack trace
 // in it.
 std::string TestPartResult::ExtractSummary(const char* message) {
diff --git a/external/googletest/googletest/src/gtest-typed-test.cc b/external/googletest/googletest/src/gtest-typed-test.cc
index a2828b83..b251c09d 100644
--- a/external/googletest/googletest/src/gtest-typed-test.cc
+++ b/external/googletest/googletest/src/gtest-typed-test.cc
@@ -29,6 +29,10 @@
 
 #include "gtest/gtest-typed-test.h"
 
+#include <set>
+#include <string>
+#include <vector>
+
 #include "gtest/gtest.h"
 
 namespace testing {
@@ -90,7 +94,7 @@ const char* TypedTestSuitePState::VerifyRegisteredTestNames(
   }
 
   const std::string& errors_str = errors.GetString();
-  if (errors_str != "") {
+  if (!errors_str.empty()) {
     fprintf(stderr, "%s %s", FormatFileLocation(file, line).c_str(),
             errors_str.c_str());
     fflush(stderr);
diff --git a/external/googletest/googletest/src/gtest.cc b/external/googletest/googletest/src/gtest.cc
index e50e6738..09af1517 100644
--- a/external/googletest/googletest/src/gtest.cc
+++ b/external/googletest/googletest/src/gtest.cc
@@ -43,19 +43,31 @@
 #include <algorithm>
 #include <chrono>  // NOLINT
 #include <cmath>
+#include <csignal>  // NOLINT: raise(3) is used on some platforms
 #include <cstdint>
+#include <cstdlib>
+#include <cstring>
+#include <initializer_list>
 #include <iomanip>
+#include <ios>
+#include <iostream>
+#include <iterator>
 #include <limits>
 #include <list>
 #include <map>
 #include <ostream>  // NOLINT
+#include <set>
 #include <sstream>
+#include <unordered_set>
+#include <utility>
 #include <vector>
 
+#include "gtest/gtest-assertion-result.h"
 #include "gtest/gtest-spi.h"
 #include "gtest/internal/custom/gtest.h"
+#include "gtest/internal/gtest-port.h"
 
-#if GTEST_OS_LINUX
+#ifdef GTEST_OS_LINUX
 
 #include <fcntl.h>   // NOLINT
 #include <limits.h>  // NOLINT
@@ -68,18 +80,18 @@
 
 #include <string>
 
-#elif GTEST_OS_ZOS
+#elif defined(GTEST_OS_ZOS)
 #include <sys/time.h>  // NOLINT
 
 // On z/OS we additionally need strings.h for strcasecmp.
 #include <strings.h>   // NOLINT
 
-#elif GTEST_OS_WINDOWS_MOBILE  // We are on Windows CE.
+#elif defined(GTEST_OS_WINDOWS_MOBILE)  // We are on Windows CE.
 
 #include <windows.h>  // NOLINT
 #undef min
 
-#elif GTEST_OS_WINDOWS  // We are on Windows proper.
+#elif defined(GTEST_OS_WINDOWS)  // We are on Windows proper.
 
 #include <windows.h>  // NOLINT
 #undef min
@@ -93,7 +105,7 @@
 #include <sys/timeb.h>  // NOLINT
 #include <sys/types.h>  // NOLINT
 
-#if GTEST_OS_WINDOWS_MINGW
+#ifdef GTEST_OS_WINDOWS_MINGW
 #include <sys/time.h>  // NOLINT
 #endif                 // GTEST_OS_WINDOWS_MINGW
 
@@ -119,23 +131,41 @@
 
 #include "src/gtest-internal-inl.h"
 
-#if GTEST_OS_WINDOWS
+#ifdef GTEST_OS_WINDOWS
 #define vsnprintf _vsnprintf
 #endif  // GTEST_OS_WINDOWS
 
-#if GTEST_OS_MAC
+#ifdef GTEST_OS_MAC
 #ifndef GTEST_OS_IOS
 #include <crt_externs.h>
 #endif
 #endif
 
-#if GTEST_HAS_ABSL
+#ifdef GTEST_HAS_ABSL
+#include "absl/container/flat_hash_set.h"
 #include "absl/debugging/failure_signal_handler.h"
 #include "absl/debugging/stacktrace.h"
 #include "absl/debugging/symbolize.h"
+#include "absl/flags/parse.h"
+#include "absl/flags/usage.h"
 #include "absl/strings/str_cat.h"
+#include "absl/strings/str_replace.h"
+#include "absl/strings/string_view.h"
+#include "absl/strings/strip.h"
 #endif  // GTEST_HAS_ABSL
 
+// Checks builtin compiler feature |x| while avoiding an extra layer of #ifdefs
+// at the callsite.
+#if defined(__has_builtin)
+#define GTEST_HAS_BUILTIN(x) __has_builtin(x)
+#else
+#define GTEST_HAS_BUILTIN(x) 0
+#endif  // defined(__has_builtin)
+
+#if defined(GTEST_HAS_ABSL) && !defined(GTEST_NO_ABSL_FLAGS)
+#define GTEST_HAS_ABSL_FLAGS
+#endif
+
 namespace testing {
 
 using internal::CountIf;
@@ -162,12 +192,17 @@ static const char kDefaultOutputFormat[] = "xml";
 // The default output file.
 static const char kDefaultOutputFile[] = "test_detail";
 
+// These environment variables are set by Bazel.
+// https://bazel.build/reference/test-encyclopedia#initial-conditions
+//
 // The environment variable name for the test shard index.
 static const char kTestShardIndex[] = "GTEST_SHARD_INDEX";
 // The environment variable name for the total number of test shards.
 static const char kTestTotalShards[] = "GTEST_TOTAL_SHARDS";
 // The environment variable name for the test shard status file.
 static const char kTestShardStatusFile[] = "GTEST_SHARD_STATUS_FILE";
+// The environment variable name for the test output warnings file.
+static const char kTestWarningsOutputFile[] = "TEST_WARNINGS_OUTPUT_FILE";
 
 namespace internal {
 
@@ -179,7 +214,8 @@ const char kStackTraceMarker[] = "\nStack trace:\n";
 // is specified on the command line.
 bool g_help_flag = false;
 
-// Utilty function to Open File for Writing
+#if GTEST_HAS_FILE_SYSTEM
+// Utility function to Open File for Writing
 static FILE* OpenFileForWriting(const std::string& output_file) {
   FILE* fileout = nullptr;
   FilePath output_file_path(output_file);
@@ -193,6 +229,7 @@ static FILE* OpenFileForWriting(const std::string& output_file) {
   }
   return fileout;
 }
+#endif  // GTEST_HAS_FILE_SYSTEM
 
 }  // namespace internal
 
@@ -218,34 +255,48 @@ static bool GetDefaultFailFast() {
   return false;
 }
 
+}  // namespace testing
+
 GTEST_DEFINE_bool_(
-    fail_fast, internal::BoolFromGTestEnv("fail_fast", GetDefaultFailFast()),
+    fail_fast,
+    testing::internal::BoolFromGTestEnv("fail_fast",
+                                        testing::GetDefaultFailFast()),
     "True if and only if a test failure should stop further test execution.");
 
+GTEST_DEFINE_bool_(
+    fail_if_no_test_linked,
+    testing::internal::BoolFromGTestEnv("fail_if_no_test_linked", false),
+    "True if and only if the test should fail if no test case (including "
+    "disabled test cases) is linked.");
+
 GTEST_DEFINE_bool_(
     also_run_disabled_tests,
-    internal::BoolFromGTestEnv("also_run_disabled_tests", false),
+    testing::internal::BoolFromGTestEnv("also_run_disabled_tests", false),
     "Run disabled tests too, in addition to the tests normally being run.");
 
 GTEST_DEFINE_bool_(
-    break_on_failure, internal::BoolFromGTestEnv("break_on_failure", false),
+    break_on_failure,
+    testing::internal::BoolFromGTestEnv("break_on_failure", false),
     "True if and only if a failed assertion should be a debugger "
     "break-point.");
 
 GTEST_DEFINE_bool_(catch_exceptions,
-                   internal::BoolFromGTestEnv("catch_exceptions", true),
+                   testing::internal::BoolFromGTestEnv("catch_exceptions",
+                                                       true),
                    "True if and only if " GTEST_NAME_
                    " should catch exceptions and treat them as test failures.");
 
 GTEST_DEFINE_string_(
-    color, internal::StringFromGTestEnv("color", "auto"),
+    color, testing::internal::StringFromGTestEnv("color", "auto"),
     "Whether to use colors in the output.  Valid values: yes, no, "
     "and auto.  'auto' means to use colors if the output is "
     "being sent to a terminal and the TERM environment variable "
     "is set to a terminal type that supports colors.");
 
 GTEST_DEFINE_string_(
-    filter, internal::StringFromGTestEnv("filter", GetDefaultFilter()),
+    filter,
+    testing::internal::StringFromGTestEnv("filter",
+                                          testing::GetDefaultFilter()),
     "A colon-separated list of glob (not regex) patterns "
     "for filtering the tests to run, optionally followed by a "
     "'-' and a : separated list of negative patterns (tests to "
@@ -254,7 +305,8 @@ GTEST_DEFINE_string_(
 
 GTEST_DEFINE_bool_(
     install_failure_signal_handler,
-    internal::BoolFromGTestEnv("install_failure_signal_handler", false),
+    testing::internal::BoolFromGTestEnv("install_failure_signal_handler",
+                                        false),
     "If true and supported on the current platform, " GTEST_NAME_
     " should "
     "install a signal handler that dumps debugging information when fatal "
@@ -269,8 +321,8 @@ GTEST_DEFINE_bool_(list_tests, false, "List all tests without running them.");
 //   ''
 GTEST_DEFINE_string_(
     output,
-    internal::StringFromGTestEnv("output",
-                                 internal::OutputFlagAlsoCheckEnvVar().c_str()),
+    testing::internal::StringFromGTestEnv(
+        "output", testing::internal::OutputFlagAlsoCheckEnvVar().c_str()),
     "A format (defaults to \"xml\" but can be specified to be \"json\"), "
     "optionally followed by a colon and an output file name or directory. "
     "A directory is indicated by a trailing pathname separator. "
@@ -281,62 +333,83 @@ GTEST_DEFINE_string_(
     "digits.");
 
 GTEST_DEFINE_bool_(
-    brief, internal::BoolFromGTestEnv("brief", false),
+    brief, testing::internal::BoolFromGTestEnv("brief", false),
     "True if only test failures should be displayed in text output.");
 
-GTEST_DEFINE_bool_(print_time, internal::BoolFromGTestEnv("print_time", true),
+GTEST_DEFINE_bool_(print_time,
+                   testing::internal::BoolFromGTestEnv("print_time", true),
                    "True if and only if " GTEST_NAME_
                    " should display elapsed time in text output.");
 
-GTEST_DEFINE_bool_(print_utf8, internal::BoolFromGTestEnv("print_utf8", true),
+GTEST_DEFINE_bool_(print_utf8,
+                   testing::internal::BoolFromGTestEnv("print_utf8", true),
                    "True if and only if " GTEST_NAME_
                    " prints UTF8 characters as text.");
 
 GTEST_DEFINE_int32_(
-    random_seed, internal::Int32FromGTestEnv("random_seed", 0),
+    random_seed, testing::internal::Int32FromGTestEnv("random_seed", 0),
     "Random number seed to use when shuffling test orders.  Must be in range "
     "[1, 99999], or 0 to use a seed based on the current time.");
 
 GTEST_DEFINE_int32_(
-    repeat, internal::Int32FromGTestEnv("repeat", 1),
+    repeat, testing::internal::Int32FromGTestEnv("repeat", 1),
     "How many times to repeat each test.  Specify a negative number "
     "for repeating forever.  Useful for shaking out flaky tests.");
 
+GTEST_DEFINE_bool_(
+    recreate_environments_when_repeating,
+    testing::internal::BoolFromGTestEnv("recreate_environments_when_repeating",
+                                        false),
+    "Controls whether global test environments are recreated for each repeat "
+    "of the tests. If set to false the global test environments are only set "
+    "up once, for the first iteration, and only torn down once, for the last. "
+    "Useful for shaking out flaky tests with stable, expensive test "
+    "environments. If --gtest_repeat is set to a negative number, meaning "
+    "there is no last run, the environments will always be recreated to avoid "
+    "leaks.");
+
 GTEST_DEFINE_bool_(show_internal_stack_frames, false,
                    "True if and only if " GTEST_NAME_
                    " should include internal stack frames when "
                    "printing test failure stack traces.");
 
-GTEST_DEFINE_bool_(shuffle, internal::BoolFromGTestEnv("shuffle", false),
+GTEST_DEFINE_bool_(shuffle,
+                   testing::internal::BoolFromGTestEnv("shuffle", false),
                    "True if and only if " GTEST_NAME_
                    " should randomize tests' order on every run.");
 
 GTEST_DEFINE_int32_(
     stack_trace_depth,
-    internal::Int32FromGTestEnv("stack_trace_depth", kMaxStackTraceDepth),
+    testing::internal::Int32FromGTestEnv("stack_trace_depth",
+                                         testing::kMaxStackTraceDepth),
     "The maximum number of stack frames to print when an "
     "assertion fails.  The valid range is 0 through 100, inclusive.");
 
 GTEST_DEFINE_string_(
-    stream_result_to, internal::StringFromGTestEnv("stream_result_to", ""),
+    stream_result_to,
+    testing::internal::StringFromGTestEnv("stream_result_to", ""),
     "This flag specifies the host name and the port number on which to stream "
     "test results. Example: \"localhost:555\". The flag is effective only on "
-    "Linux.");
+    "Linux and macOS.");
 
 GTEST_DEFINE_bool_(
-    throw_on_failure, internal::BoolFromGTestEnv("throw_on_failure", false),
+    throw_on_failure,
+    testing::internal::BoolFromGTestEnv("throw_on_failure", false),
     "When this flag is specified, a failed assertion will throw an exception "
     "if exceptions are enabled or exit the program with a non-zero code "
     "otherwise. For use with an external test framework.");
 
 #if GTEST_USE_OWN_FLAGFILE_FLAG_
 GTEST_DEFINE_string_(
-    flagfile, internal::StringFromGTestEnv("flagfile", ""),
+    flagfile, testing::internal::StringFromGTestEnv("flagfile", ""),
     "This flag specifies the flagfile to read command-line flags from.");
 #endif  // GTEST_USE_OWN_FLAGFILE_FLAG_
 
+namespace testing {
 namespace internal {
 
+const uint32_t Random::kMaxRange;
+
 // Generates a random number from [0, range), using a Linear
 // Congruential Generator (LCG).  Crashes if 'range' is 0 or greater
 // than kMaxRange.
@@ -359,7 +432,7 @@ uint32_t Random::Generate(uint32_t range) {
 // GTestIsInitialized() returns true if and only if the user has initialized
 // Google Test.  Useful for catching the user mistake of not initializing
 // Google Test before calling RUN_ALL_TESTS().
-static bool GTestIsInitialized() { return GetArgvs().size() > 0; }
+static bool GTestIsInitialized() { return !GetArgvs().empty(); }
 
 // Iterates over a vector of TestSuites, keeping a running sum of the
 // results of calling a given int-returning method on each.
@@ -389,6 +462,19 @@ static bool ShouldRunTestSuite(const TestSuite* test_suite) {
   return test_suite->should_run();
 }
 
+namespace {
+
+// Returns true if test part results of type `type` should include a stack
+// trace.
+bool ShouldEmitStackTraceForResultType(TestPartResult::Type type) {
+  // Suppress emission of the stack trace for SUCCEED() since it likely never
+  // requires investigation, and GTEST_SKIP() since skipping is an intentional
+  // act by the developer rather than a failure requiring investigation.
+  return type != TestPartResult::kSuccess && type != TestPartResult::kSkip;
+}
+
+}  // namespace
+
 // AssertHelper constructor.
 AssertHelper::AssertHelper(TestPartResult::Type type, const char* file,
                            int line, const char* message)
@@ -401,7 +487,9 @@ void AssertHelper::operator=(const Message& message) const {
   UnitTest::GetInstance()->AddTestPartResult(
       data_->type, data_->file, data_->line,
       AppendUserMessage(data_->message, message),
-      UnitTest::GetInstance()->impl()->CurrentOsStackTraceExceptTop(1)
+      ShouldEmitStackTraceForResultType(data_->type)
+          ? UnitTest::GetInstance()->impl()->CurrentOsStackTraceExceptTop(1)
+          : ""
       // Skips the stack frame for this function itself.
   );  // NOLINT
 }
@@ -409,7 +497,7 @@ void AssertHelper::operator=(const Message& message) const {
 namespace {
 
 // When TEST_P is found without a matching INSTANTIATE_TEST_SUITE_P
-// to creates test cases for it, a syntetic test case is
+// to creates test cases for it, a synthetic test case is
 // inserted to report ether an error or a log message.
 //
 // This configuration bit will likely be removed at some point.
@@ -459,7 +547,8 @@ void InsertSyntheticTestCase(const std::string& name, CodeLocation location,
   if (ignored.find(name) != ignored.end()) return;
 
   const char kMissingInstantiation[] =  //
-      " is defined via TEST_P, but never instantiated. None of the test cases "
+      " is defined via TEST_P, but never instantiated. None of the test "
+      "cases "
       "will run. Either no INSTANTIATE_TEST_SUITE_P is provided or the only "
       "ones provided expand to nothing."
       "\n\n"
@@ -500,7 +589,7 @@ void InsertSyntheticTestCase(const std::string& name, CodeLocation location,
 void RegisterTypeParameterizedTestSuite(const char* test_suite_name,
                                         CodeLocation code_location) {
   GetUnitTestImpl()->type_parameterized_test_registry().RegisterTestSuite(
-      test_suite_name, code_location);
+      test_suite_name, std::move(code_location));
 }
 
 void RegisterTypeParameterizedTestSuiteInstantiation(const char* case_name) {
@@ -511,7 +600,7 @@ void RegisterTypeParameterizedTestSuiteInstantiation(const char* case_name) {
 void TypeParameterizedTestSuiteRegistry::RegisterTestSuite(
     const char* test_suite_name, CodeLocation code_location) {
   suites_.emplace(std::string(test_suite_name),
-                  TypeParameterizedTestSuiteInfo(code_location));
+                  TypeParameterizedTestSuiteInfo(std::move(code_location)));
 }
 
 void TypeParameterizedTestSuiteRegistry::RegisterInstantiation(
@@ -538,10 +627,12 @@ void TypeParameterizedTestSuiteRegistry::CheckForInstantiations() {
         "\n\n"
         "Ideally, TYPED_TEST_P definitions should only ever be included as "
         "part of binaries that intend to use them. (As opposed to, for "
-        "example, being placed in a library that may be linked in to get other "
+        "example, being placed in a library that may be linked in to get "
+        "other "
         "utilities.)"
         "\n\n"
-        "To suppress this error for this test suite, insert the following line "
+        "To suppress this error for this test suite, insert the following "
+        "line "
         "(in a non-header) in the namespace it is defined in:"
         "\n\n"
         "GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(" +
@@ -575,25 +666,31 @@ ::std::vector<std::string> GetArgvs() {
 #endif  // defined(GTEST_CUSTOM_GET_ARGVS_)
 }
 
+#if GTEST_HAS_FILE_SYSTEM
 // Returns the current application's name, removing directory path if that
 // is present.
 FilePath GetCurrentExecutableName() {
   FilePath result;
 
-#if GTEST_OS_WINDOWS || GTEST_OS_OS2
-  result.Set(FilePath(GetArgvs()[0]).RemoveExtension("exe"));
+  auto args = GetArgvs();
+  if (!args.empty()) {
+#if defined(GTEST_OS_WINDOWS) || defined(GTEST_OS_OS2)
+    result.Set(FilePath(args[0]).RemoveExtension("exe"));
 #else
-  result.Set(FilePath(GetArgvs()[0]));
+    result.Set(FilePath(args[0]));
 #endif  // GTEST_OS_WINDOWS
+  }
 
   return result.RemoveDirectoryName();
 }
+#endif  // GTEST_HAS_FILE_SYSTEM
 
 // Functions for processing the gtest_output flag.
 
 // Returns the output format, or "" for normal printed output.
 std::string UnitTestOptions::GetOutputFormat() {
-  const char* const gtest_output_flag = GTEST_FLAG(output).c_str();
+  std::string s = GTEST_FLAG_GET(output);
+  const char* const gtest_output_flag = s.c_str();
   const char* const colon = strchr(gtest_output_flag, ':');
   return (colon == nullptr)
              ? std::string(gtest_output_flag)
@@ -601,10 +698,12 @@ std::string UnitTestOptions::GetOutputFormat() {
                            static_cast<size_t>(colon - gtest_output_flag));
 }
 
+#if GTEST_HAS_FILE_SYSTEM
 // Returns the name of the requested output file, or the default if none
 // was explicitly specified.
 std::string UnitTestOptions::GetAbsolutePathToOutputFile() {
-  const char* const gtest_output_flag = GTEST_FLAG(output).c_str();
+  std::string s = GTEST_FLAG_GET(output);
+  const char* const gtest_output_flag = s.c_str();
 
   std::string format = GetOutputFormat();
   if (format.empty()) format = std::string(kDefaultOutputFormat);
@@ -630,6 +729,7 @@ std::string UnitTestOptions::GetAbsolutePathToOutputFile() {
       GetOutputFormat().c_str()));
   return result.string();
 }
+#endif  // GTEST_HAS_FILE_SYSTEM
 
 // Returns true if and only if the wildcard pattern matches the string. Each
 // pattern consists of regular characters, single-character wildcards (?), and
@@ -684,86 +784,155 @@ static bool PatternMatchesString(const std::string& name_str,
   return true;
 }
 
-bool UnitTestOptions::MatchesFilter(const std::string& name_str,
-                                    const char* filter) {
-  // The filter is a list of patterns separated by colons (:).
-  const char* pattern = filter;
-  while (true) {
-    // Find the bounds of this pattern.
-    const char* const next_sep = strchr(pattern, ':');
-    const char* const pattern_end =
-        next_sep != nullptr ? next_sep : pattern + strlen(pattern);
-
-    // Check if this pattern matches name_str.
-    if (PatternMatchesString(name_str, pattern, pattern_end)) {
-      return true;
-    }
+namespace {
 
-    // Give up on this pattern. However, if we found a pattern separator (:),
-    // advance to the next pattern (skipping over the separator) and restart.
-    if (next_sep == nullptr) {
-      return false;
+bool IsGlobPattern(const std::string& pattern) {
+  return std::any_of(pattern.begin(), pattern.end(),
+                     [](const char c) { return c == '?' || c == '*'; });
+}
+
+class UnitTestFilter {
+ public:
+  UnitTestFilter() = default;
+
+  // Constructs a filter from a string of patterns separated by `:`.
+  explicit UnitTestFilter(const std::string& filter) {
+    // By design "" filter matches "" string.
+    std::vector<std::string> all_patterns;
+    SplitString(filter, ':', &all_patterns);
+    const auto exact_match_patterns_begin = std::partition(
+        all_patterns.begin(), all_patterns.end(), &IsGlobPattern);
+
+    glob_patterns_.reserve(static_cast<size_t>(
+        std::distance(all_patterns.begin(), exact_match_patterns_begin)));
+    std::move(all_patterns.begin(), exact_match_patterns_begin,
+              std::inserter(glob_patterns_, glob_patterns_.begin()));
+    std::move(
+        exact_match_patterns_begin, all_patterns.end(),
+        std::inserter(exact_match_patterns_, exact_match_patterns_.begin()));
+  }
+
+  // Returns true if and only if name matches at least one of the patterns in
+  // the filter.
+  bool MatchesName(const std::string& name) const {
+    return exact_match_patterns_.find(name) != exact_match_patterns_.end() ||
+           std::any_of(glob_patterns_.begin(), glob_patterns_.end(),
+                       [&name](const std::string& pattern) {
+                         return PatternMatchesString(
+                             name, pattern.c_str(),
+                             pattern.c_str() + pattern.size());
+                       });
+  }
+
+ private:
+  std::vector<std::string> glob_patterns_;
+  std::unordered_set<std::string> exact_match_patterns_;
+};
+
+class PositiveAndNegativeUnitTestFilter {
+ public:
+  // Constructs a positive and a negative filter from a string. The string
+  // contains a positive filter optionally followed by a '-' character and a
+  // negative filter. In case only a negative filter is provided the positive
+  // filter will be assumed "*".
+  // A filter is a list of patterns separated by ':'.
+  explicit PositiveAndNegativeUnitTestFilter(const std::string& filter) {
+    std::vector<std::string> positive_and_negative_filters;
+
+    // NOTE: `SplitString` always returns a non-empty container.
+    SplitString(filter, '-', &positive_and_negative_filters);
+    const auto& positive_filter = positive_and_negative_filters.front();
+
+    if (positive_and_negative_filters.size() > 1) {
+      positive_filter_ = UnitTestFilter(
+          positive_filter.empty() ? kUniversalFilter : positive_filter);
+
+      // TODO(b/214626361): Fail on multiple '-' characters
+      // For the moment to preserve old behavior we concatenate the rest of the
+      // string parts with `-` as separator to generate the negative filter.
+      auto negative_filter_string = positive_and_negative_filters[1];
+      for (std::size_t i = 2; i < positive_and_negative_filters.size(); i++)
+        negative_filter_string =
+            negative_filter_string + '-' + positive_and_negative_filters[i];
+      negative_filter_ = UnitTestFilter(negative_filter_string);
+    } else {
+      // In case we don't have a negative filter and positive filter is ""
+      // we do not use kUniversalFilter by design as opposed to when we have a
+      // negative filter.
+      positive_filter_ = UnitTestFilter(positive_filter);
     }
-    pattern = next_sep + 1;
   }
-  return true;
+
+  // Returns true if and only if test name (this is generated by appending test
+  // suit name and test name via a '.' character) matches the positive filter
+  // and does not match the negative filter.
+  bool MatchesTest(const std::string& test_suite_name,
+                   const std::string& test_name) const {
+    return MatchesName(test_suite_name + "." + test_name);
+  }
+
+  // Returns true if and only if name matches the positive filter and does not
+  // match the negative filter.
+  bool MatchesName(const std::string& name) const {
+    return positive_filter_.MatchesName(name) &&
+           !negative_filter_.MatchesName(name);
+  }
+
+ private:
+  UnitTestFilter positive_filter_;
+  UnitTestFilter negative_filter_;
+};
+}  // namespace
+
+bool UnitTestOptions::MatchesFilter(const std::string& name_str,
+                                    const char* filter) {
+  return UnitTestFilter(filter).MatchesName(name_str);
 }
 
 // Returns true if and only if the user-specified filter matches the test
 // suite name and the test name.
 bool UnitTestOptions::FilterMatchesTest(const std::string& test_suite_name,
                                         const std::string& test_name) {
-  const std::string& full_name = test_suite_name + "." + test_name.c_str();
-
   // Split --gtest_filter at '-', if there is one, to separate into
   // positive filter and negative filter portions
-  const char* const p = GTEST_FLAG(filter).c_str();
-  const char* const dash = strchr(p, '-');
-  std::string positive;
-  std::string negative;
-  if (dash == nullptr) {
-    positive = GTEST_FLAG(filter).c_str();  // Whole string is a positive filter
-    negative = "";
-  } else {
-    positive = std::string(p, dash);   // Everything up to the dash
-    negative = std::string(dash + 1);  // Everything after the dash
-    if (positive.empty()) {
-      // Treat '-test1' as the same as '*-test1'
-      positive = kUniversalFilter;
-    }
-  }
-
-  // A filter is a colon-separated list of patterns.  It matches a
-  // test if any pattern in it matches the test.
-  return (MatchesFilter(full_name, positive.c_str()) &&
-          !MatchesFilter(full_name, negative.c_str()));
+  return PositiveAndNegativeUnitTestFilter(GTEST_FLAG_GET(filter))
+      .MatchesTest(test_suite_name, test_name);
 }
 
 #if GTEST_HAS_SEH
-// Returns EXCEPTION_EXECUTE_HANDLER if Google Test should handle the
-// given SEH exception, or EXCEPTION_CONTINUE_SEARCH otherwise.
-// This function is useful as an __except condition.
-int UnitTestOptions::GTestShouldProcessSEH(DWORD exception_code) {
+static std::string FormatSehExceptionMessage(DWORD exception_code,
+                                             const char* location) {
+  Message message;
+  message << "SEH exception with code 0x" << std::setbase(16) << exception_code
+          << std::setbase(10) << " thrown in " << location << ".";
+  return message.GetString();
+}
+
+int UnitTestOptions::GTestProcessSEH(DWORD seh_code, const char* location) {
   // Google Test should handle a SEH exception if:
   //   1. the user wants it to, AND
-  //   2. this is not a breakpoint exception, AND
+  //   2. this is not a breakpoint exception or stack overflow, AND
   //   3. this is not a C++ exception (VC++ implements them via SEH,
   //      apparently).
   //
   // SEH exception code for C++ exceptions.
-  // (see http://support.microsoft.com/kb/185294 for more information).
+  // (see https://support.microsoft.com/kb/185294 for more information).
   const DWORD kCxxExceptionCode = 0xe06d7363;
 
-  bool should_handle = true;
+  if (!GTEST_FLAG_GET(catch_exceptions) || seh_code == kCxxExceptionCode ||
+      seh_code == EXCEPTION_BREAKPOINT ||
+      seh_code == EXCEPTION_STACK_OVERFLOW) {
+    return EXCEPTION_CONTINUE_SEARCH;  // Don't handle these exceptions
+  }
 
-  if (!GTEST_FLAG(catch_exceptions))
-    should_handle = false;
-  else if (exception_code == EXCEPTION_BREAKPOINT)
-    should_handle = false;
-  else if (exception_code == kCxxExceptionCode)
-    should_handle = false;
+  internal::ReportFailureInUnknownLocation(
+      TestPartResult::kFatalFailure,
+      FormatSehExceptionMessage(seh_code, location) +
+          "\n"
+          "Stack trace:\n" +
+          ::testing::internal::GetCurrentOsStackTraceExceptTop(1));
 
-  return should_handle ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH;
+  return EXCEPTION_EXECUTE_HANDLER;
 }
 #endif  // GTEST_HAS_SEH
 
@@ -911,14 +1080,14 @@ void DefaultPerThreadTestPartResultReporter::ReportTestPartResult(
 TestPartResultReporterInterface*
 UnitTestImpl::GetGlobalTestPartResultReporter() {
   internal::MutexLock lock(&global_test_part_result_reporter_mutex_);
-  return global_test_part_result_repoter_;
+  return global_test_part_result_reporter_;
 }
 
 // Sets the global test part result reporter.
 void UnitTestImpl::SetGlobalTestPartResultReporter(
     TestPartResultReporterInterface* reporter) {
   internal::MutexLock lock(&global_test_part_result_reporter_mutex_);
-  global_test_part_result_repoter_ = reporter;
+  global_test_part_result_reporter_ = reporter;
 }
 
 // Returns the test part result reporter for the current thread.
@@ -1007,7 +1176,7 @@ int UnitTestImpl::test_to_run_count() const {
 // trace but Bar() and CurrentOsStackTraceExceptTop() won't.
 std::string UnitTestImpl::CurrentOsStackTraceExceptTop(int skip_count) {
   return os_stack_trace_getter()->CurrentStackTrace(
-      static_cast<int>(GTEST_FLAG(stack_trace_depth)), skip_count + 1
+      static_cast<int>(GTEST_FLAG_GET(stack_trace_depth)), skip_count + 1
       // Skips the user-specified number of frames plus this function
       // itself.
   );  // NOLINT
@@ -1016,17 +1185,24 @@ std::string UnitTestImpl::CurrentOsStackTraceExceptTop(int skip_count) {
 // A helper class for measuring elapsed times.
 class Timer {
  public:
-  Timer() : start_(std::chrono::steady_clock::now()) {}
+  Timer() : start_(clock::now()) {}
 
   // Return time elapsed in milliseconds since the timer was created.
   TimeInMillis Elapsed() {
-    return std::chrono::duration_cast<std::chrono::milliseconds>(
-               std::chrono::steady_clock::now() - start_)
+    return std::chrono::duration_cast<std::chrono::milliseconds>(clock::now() -
+                                                                 start_)
         .count();
   }
 
  private:
-  std::chrono::steady_clock::time_point start_;
+  // Fall back to the system_clock when building with newlib on a system
+  // without a monotonic clock.
+#if defined(_NEWLIB_VERSION) && !defined(CLOCK_MONOTONIC)
+  using clock = std::chrono::system_clock;
+#else
+  using clock = std::chrono::steady_clock;
+#endif
+  clock::time_point start_;
 };
 
 // Returns a timestamp as milliseconds since the epoch. Note this time may jump
@@ -1043,7 +1219,7 @@ TimeInMillis GetTimeInMillis() {
 
 // class String.
 
-#if GTEST_OS_WINDOWS_MOBILE
+#ifdef GTEST_OS_WINDOWS_MOBILE
 // Creates a UTF-16 wide string from the given ANSI string, allocating
 // memory using new. The caller is responsible for deleting the return
 // value using delete[]. Returns the wide string, or NULL if the
@@ -1163,40 +1339,6 @@ std::string Message::GetString() const {
   return internal::StringStreamToString(ss_.get());
 }
 
-// AssertionResult constructors.
-// Used in EXPECT_TRUE/FALSE(assertion_result).
-AssertionResult::AssertionResult(const AssertionResult& other)
-    : success_(other.success_),
-      message_(other.message_.get() != nullptr
-                   ? new ::std::string(*other.message_)
-                   : static_cast< ::std::string*>(nullptr)) {}
-
-// Swaps two AssertionResults.
-void AssertionResult::swap(AssertionResult& other) {
-  using std::swap;
-  swap(success_, other.success_);
-  swap(message_, other.message_);
-}
-
-// Returns the assertion's negation. Used with EXPECT/ASSERT_FALSE.
-AssertionResult AssertionResult::operator!() const {
-  AssertionResult negation(!success_);
-  if (message_.get() != nullptr) negation << *message_;
-  return negation;
-}
-
-// Makes a successful assertion result.
-AssertionResult AssertionSuccess() { return AssertionResult(true); }
-
-// Makes a failed assertion result.
-AssertionResult AssertionFailure() { return AssertionResult(false); }
-
-// Makes a failed assertion result with the given failure message.
-// Deprecated; use AssertionFailure() << message.
-AssertionResult AssertionFailure(const Message& message) {
-  return AssertionFailure() << message;
-}
-
 namespace internal {
 
 namespace edit_distance {
@@ -1529,10 +1671,25 @@ std::string GetBoolAssertionFailureMessage(
   return msg.GetString();
 }
 
-// Helper function for implementing ASSERT_NEAR.
+// Helper function for implementing ASSERT_NEAR. Treats infinity as a specific
+// value, such that comparing infinity to infinity is equal, the distance
+// between -infinity and +infinity is infinity, and infinity <= infinity is
+// true.
 AssertionResult DoubleNearPredFormat(const char* expr1, const char* expr2,
                                      const char* abs_error_expr, double val1,
                                      double val2, double abs_error) {
+  // We want to return success when the two values are infinity and at least
+  // one of the following is true:
+  //  * The values are the same-signed infinity.
+  //  * The error limit itself is infinity.
+  // This is done here so that we don't end up with a NaN when calculating the
+  // difference in values.
+  if (std::isinf(val1) && std::isinf(val2) &&
+      (std::signbit(val1) == std::signbit(val2) ||
+       (abs_error > 0.0 && std::isinf(abs_error)))) {
+    return AssertionSuccess();
+  }
+
   const double diff = fabs(val1 - val2);
   if (diff <= abs_error) return AssertionSuccess();
 
@@ -1779,14 +1936,14 @@ AssertionResult IsNotSubstring(const char* needle_expr,
 
 namespace internal {
 
-#if GTEST_OS_WINDOWS
+#ifdef GTEST_OS_WINDOWS
 
 namespace {
 
 // Helper function for IsHRESULT{SuccessFailure} predicates
 AssertionResult HRESULTFailureHelper(const char* expr, const char* expected,
                                      long hr) {  // NOLINT
-#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_TV_TITLE
+#if defined(GTEST_OS_WINDOWS_MOBILE) || defined(GTEST_OS_WINDOWS_TV_TITLE)
 
   // Windows CE doesn't support FormatMessage.
   const char error_text[] = "";
@@ -2047,9 +2204,9 @@ bool String::CaseInsensitiveWideCStringEquals(const wchar_t* lhs,
 
   if (rhs == nullptr) return false;
 
-#if GTEST_OS_WINDOWS
+#ifdef GTEST_OS_WINDOWS
   return _wcsicmp(lhs, rhs) == 0;
-#elif GTEST_OS_LINUX && !GTEST_OS_LINUX_ANDROID
+#elif defined(GTEST_OS_LINUX) && !defined(GTEST_OS_LINUX_ANDROID)
   return wcscasecmp(lhs, rhs) == 0;
 #else
   // Android, Mac OS X and Cygwin don't define wcscasecmp.
@@ -2149,7 +2306,7 @@ TestResult::TestResult()
     : death_test_count_(0), start_timestamp_(0), elapsed_time_(0) {}
 
 // D'tor.
-TestResult::~TestResult() {}
+TestResult::~TestResult() = default;
 
 // Returns the i-th test part result among all the results. i can
 // range from 0 to total_part_count() - 1. If i is not in that range,
@@ -2212,7 +2369,7 @@ static const char* const kReservedTestCaseAttributes[] = {
     "type_param", "value_param", "file",   "line"};
 
 // Use a slightly different set for allowed output to ensure existing tests can
-// still RecordProperty("result") or "RecordProperty(timestamp")
+// still RecordProperty("result") or RecordProperty("timestamp")
 static const char* const kReservedOutputTestCaseAttributes[] = {
     "classname",   "name", "status", "time",   "type_param",
     "value_param", "file", "line",   "result", "timestamp"};
@@ -2237,7 +2394,9 @@ static std::vector<std::string> GetReservedAttributesForElement(
   return std::vector<std::string>();
 }
 
+#if GTEST_HAS_FILE_SYSTEM
 // TODO(jdesprez): Merge the two getReserved attributes once skip is improved
+// This function is only used when file systems are enabled.
 static std::vector<std::string> GetReservedOutputAttributesForElement(
     const std::string& xml_element) {
   if (xml_element == "testsuites") {
@@ -2252,6 +2411,7 @@ static std::vector<std::string> GetReservedOutputAttributesForElement(
   // This code is unreachable but some compilers may not realizes that.
   return std::vector<std::string>();
 }
+#endif
 
 static std::string FormatWordList(const std::vector<std::string>& words) {
   Message word_list;
@@ -2355,7 +2515,7 @@ Test::Test() : gtest_flag_saver_(new GTEST_FLAG_SAVER_) {}
 // The d'tor restores the states of all flags.  The actual work is
 // done by the d'tor of the gtest_flag_saver_ field, and thus not
 // visible here.
-Test::~Test() {}
+Test::~Test() = default;
 
 // Sets up the test fixture.
 //
@@ -2372,13 +2532,6 @@ void Test::RecordProperty(const std::string& key, const std::string& value) {
   UnitTest::GetInstance()->RecordProperty(key, value);
 }
 
-// Allows user supplied key value pairs to be recorded for later output.
-void Test::RecordProperty(const std::string& key, int value) {
-  Message value_message;
-  value_message << value;
-  RecordProperty(key, value_message.GetString().c_str());
-}
-
 namespace internal {
 
 void ReportFailureInUnknownLocation(TestPartResult::Type result_type,
@@ -2461,23 +2614,6 @@ bool Test::HasSameFixtureClass() {
   return true;
 }
 
-#if GTEST_HAS_SEH
-
-// Adds an "exception thrown" fatal failure to the current test.  This
-// function returns its result via an output parameter pointer because VC++
-// prohibits creation of objects with destructors on stack in functions
-// using __try (see error C2712).
-static std::string* FormatSehExceptionMessage(DWORD exception_code,
-                                              const char* location) {
-  Message message;
-  message << "SEH exception with code 0x" << std::setbase(16) << exception_code
-          << std::setbase(10) << " thrown in " << location << ".";
-
-  return new std::string(message.GetString());
-}
-
-#endif  // GTEST_HAS_SEH
-
 namespace internal {
 
 #if GTEST_HAS_EXCEPTIONS
@@ -2519,16 +2655,8 @@ Result HandleSehExceptionsInMethodIfSupported(T* object, Result (T::*method)(),
 #if GTEST_HAS_SEH
   __try {
     return (object->*method)();
-  } __except (internal::UnitTestOptions::GTestShouldProcessSEH(  // NOLINT
-      GetExceptionCode())) {
-    // We create the exception message on the heap because VC++ prohibits
-    // creation of objects with destructors on stack in functions using __try
-    // (see error C2712).
-    std::string* exception_message =
-        FormatSehExceptionMessage(GetExceptionCode(), location);
-    internal::ReportFailureInUnknownLocation(TestPartResult::kFatalFailure,
-                                             *exception_message);
-    delete exception_message;
+  } __except (internal::UnitTestOptions::GTestProcessSEH(  // NOLINT
+      GetExceptionCode(), location)) {
     return static_cast<Result>(0);
   }
 #else
@@ -2552,7 +2680,7 @@ Result HandleExceptionsInMethodIfSupported(T* object, Result (T::*method)(),
   // try {
   //   // Perform the test method.
   // } catch (...) {
-  //   if (GTEST_FLAG(catch_exceptions))
+  //   if (GTEST_FLAG_GET(catch_exceptions))
   //     // Report the exception as failure.
   //   else
   //     throw;  // Re-throws the original exception.
@@ -2641,17 +2769,16 @@ bool Test::IsSkipped() {
 
 // Constructs a TestInfo object. It assumes ownership of the test factory
 // object.
-TestInfo::TestInfo(const std::string& a_test_suite_name,
-                   const std::string& a_name, const char* a_type_param,
-                   const char* a_value_param,
+TestInfo::TestInfo(std::string a_test_suite_name, std::string a_name,
+                   const char* a_type_param, const char* a_value_param,
                    internal::CodeLocation a_code_location,
                    internal::TypeId fixture_class_id,
                    internal::TestFactoryBase* factory)
-    : test_suite_name_(a_test_suite_name),
-      name_(a_name),
+    : test_suite_name_(std::move(a_test_suite_name)),
+      name_(std::move(a_name)),
       type_param_(a_type_param ? new std::string(a_type_param) : nullptr),
       value_param_(a_value_param ? new std::string(a_value_param) : nullptr),
-      location_(a_code_location),
+      location_(std::move(a_code_location)),
       fixture_class_id_(fixture_class_id),
       should_run_(false),
       is_disabled_(false),
@@ -2684,19 +2811,19 @@ namespace internal {
 //                     The newly created TestInfo instance will assume
 //                     ownership of the factory object.
 TestInfo* MakeAndRegisterTestInfo(
-    const char* test_suite_name, const char* name, const char* type_param,
+    std::string test_suite_name, const char* name, const char* type_param,
     const char* value_param, CodeLocation code_location,
     TypeId fixture_class_id, SetUpTestSuiteFunc set_up_tc,
     TearDownTestSuiteFunc tear_down_tc, TestFactoryBase* factory) {
   TestInfo* const test_info =
-      new TestInfo(test_suite_name, name, type_param, value_param,
-                   code_location, fixture_class_id, factory);
+      new TestInfo(std::move(test_suite_name), name, type_param, value_param,
+                   std::move(code_location), fixture_class_id, factory);
   GetUnitTestImpl()->AddTestInfo(set_up_tc, tear_down_tc, test_info);
   return test_info;
 }
 
 void ReportInvalidTestSuiteType(const char* test_suite_name,
-                                CodeLocation code_location) {
+                                const CodeLocation& code_location) {
   Message errors;
   errors
       << "Attempted redefinition of test suite " << test_suite_name << ".\n"
@@ -2712,37 +2839,6 @@ void ReportInvalidTestSuiteType(const char* test_suite_name,
                                           code_location.line)
                     << " " << errors.GetString();
 }
-}  // namespace internal
-
-namespace {
-
-// A predicate that checks the test name of a TestInfo against a known
-// value.
-//
-// This is used for implementation of the TestSuite class only.  We put
-// it in the anonymous namespace to prevent polluting the outer
-// namespace.
-//
-// TestNameIs is copyable.
-class TestNameIs {
- public:
-  // Constructor.
-  //
-  // TestNameIs has NO default constructor.
-  explicit TestNameIs(const char* name) : name_(name) {}
-
-  // Returns true if and only if the test name of test_info matches name_.
-  bool operator()(const TestInfo* test_info) const {
-    return test_info && test_info->name() == name_;
-  }
-
- private:
-  std::string name_;
-};
-
-}  // namespace
-
-namespace internal {
 
 // This method expands all parameterized tests registered with macros TEST_P
 // and INSTANTIATE_TEST_SUITE_P into regular tests and registers those.
@@ -2760,21 +2856,20 @@ void UnitTestImpl::RegisterParameterizedTests() {
 // Creates the test object, runs it, records its result, and then
 // deletes it.
 void TestInfo::Run() {
-  if (!should_run_) return;
+  TestEventListener* repeater = UnitTest::GetInstance()->listeners().repeater();
+  if (!should_run_) {
+    if (is_disabled_ && matches_filter_) repeater->OnTestDisabled(*this);
+    return;
+  }
 
   // Tells UnitTest where to store test result.
-  internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
-  impl->set_current_test_info(this);
-
-  TestEventListener* repeater = UnitTest::GetInstance()->listeners().repeater();
+  UnitTest::GetInstance()->set_current_test_info(this);
 
   // Notifies the unit test event listeners that a test is about to start.
   repeater->OnTestStart(*this);
-
   result_.set_start_timestamp(internal::GetTimeInMillis());
   internal::Timer timer;
-
-  impl->os_stack_trace_getter()->UponLeavingGTest();
+  UnitTest::GetInstance()->UponLeavingGTest();
 
   // Creates the test object.
   Test* const test = internal::HandleExceptionsInMethodIfSupported(
@@ -2792,7 +2887,7 @@ void TestInfo::Run() {
 
   if (test != nullptr) {
     // Deletes the test object.
-    impl->os_stack_trace_getter()->UponLeavingGTest();
+    UnitTest::GetInstance()->UponLeavingGTest();
     internal::HandleExceptionsInMethodIfSupported(
         test, &Test::DeleteSelf_, "the test fixture's destructor");
   }
@@ -2804,15 +2899,14 @@ void TestInfo::Run() {
 
   // Tells UnitTest to stop associating assertion results to this
   // test.
-  impl->set_current_test_info(nullptr);
+  UnitTest::GetInstance()->set_current_test_info(nullptr);
 }
 
 // Skip and records a skipped test result for this object.
 void TestInfo::Skip() {
   if (!should_run_) return;
 
-  internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
-  impl->set_current_test_info(this);
+  UnitTest::GetInstance()->set_current_test_info(this);
 
   TestEventListener* repeater = UnitTest::GetInstance()->listeners().repeater();
 
@@ -2821,12 +2915,13 @@ void TestInfo::Skip() {
 
   const TestPartResult test_part_result =
       TestPartResult(TestPartResult::kSkip, this->file(), this->line(), "");
-  impl->GetTestPartResultReporterForCurrentThread()->ReportTestPartResult(
-      test_part_result);
+  internal::GetUnitTestImpl()
+      ->GetTestPartResultReporterForCurrentThread()
+      ->ReportTestPartResult(test_part_result);
 
   // Notifies the unit test event listener that a test has just finished.
   repeater->OnTestEnd(*this);
-  impl->set_current_test_info(nullptr);
+  UnitTest::GetInstance()->set_current_test_info(nullptr);
 }
 
 // class TestSuite
@@ -2880,7 +2975,7 @@ int TestSuite::total_test_count() const {
 //                 this is not a typed or a type-parameterized test suite.
 //   set_up_tc:    pointer to the function that sets up the test suite
 //   tear_down_tc: pointer to the function that tears down the test suite
-TestSuite::TestSuite(const char* a_name, const char* a_type_param,
+TestSuite::TestSuite(const std::string& a_name, const char* a_type_param,
                      internal::SetUpTestSuiteFunc set_up_tc,
                      internal::TearDownTestSuiteFunc tear_down_tc)
     : name_(a_name),
@@ -2922,11 +3017,29 @@ void TestSuite::AddTestInfo(TestInfo* test_info) {
 void TestSuite::Run() {
   if (!should_run_) return;
 
-  internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
-  impl->set_current_test_suite(this);
+  UnitTest::GetInstance()->set_current_test_suite(this);
 
   TestEventListener* repeater = UnitTest::GetInstance()->listeners().repeater();
 
+  // Ensure our tests are in a deterministic order.
+  //
+  // We do this by sorting lexicographically on (file, line number), providing
+  // an order matching what the user can see in the source code.
+  //
+  // In the common case the line number comparison shouldn't be necessary,
+  // because the registrations made by the TEST macro are executed in order
+  // within a translation unit. But this is not true of the manual registration
+  // API, and in more exotic scenarios a single file may be part of multiple
+  // translation units.
+  std::stable_sort(test_info_list_.begin(), test_info_list_.end(),
+                   [](const TestInfo* const a, const TestInfo* const b) {
+                     if (const int result = std::strcmp(a->file(), b->file())) {
+                       return result < 0;
+                     }
+
+                     return a->line() < b->line();
+                   });
+
   // Call both legacy and the new API
   repeater->OnTestSuiteStart(*this);
 //  Legacy API is deprecated but still available
@@ -2934,15 +3047,23 @@ void TestSuite::Run() {
   repeater->OnTestCaseStart(*this);
 #endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
 
-  impl->os_stack_trace_getter()->UponLeavingGTest();
+  UnitTest::GetInstance()->UponLeavingGTest();
   internal::HandleExceptionsInMethodIfSupported(
       this, &TestSuite::RunSetUpTestSuite, "SetUpTestSuite()");
 
+  const bool skip_all =
+      ad_hoc_test_result().Failed() || ad_hoc_test_result().Skipped();
+
   start_timestamp_ = internal::GetTimeInMillis();
   internal::Timer timer;
   for (int i = 0; i < total_test_count(); i++) {
-    GetMutableTestInfo(i)->Run();
-    if (GTEST_FLAG(fail_fast) && GetMutableTestInfo(i)->result()->Failed()) {
+    if (skip_all) {
+      GetMutableTestInfo(i)->Skip();
+    } else {
+      GetMutableTestInfo(i)->Run();
+    }
+    if (GTEST_FLAG_GET(fail_fast) &&
+        GetMutableTestInfo(i)->result()->Failed()) {
       for (int j = i + 1; j < total_test_count(); j++) {
         GetMutableTestInfo(j)->Skip();
       }
@@ -2951,7 +3072,7 @@ void TestSuite::Run() {
   }
   elapsed_time_ = timer.Elapsed();
 
-  impl->os_stack_trace_getter()->UponLeavingGTest();
+  UnitTest::GetInstance()->UponLeavingGTest();
   internal::HandleExceptionsInMethodIfSupported(
       this, &TestSuite::RunTearDownTestSuite, "TearDownTestSuite()");
 
@@ -2962,15 +3083,14 @@ void TestSuite::Run() {
   repeater->OnTestCaseEnd(*this);
 #endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
 
-  impl->set_current_test_suite(nullptr);
+  UnitTest::GetInstance()->set_current_test_suite(nullptr);
 }
 
 // Skips all tests under this TestSuite.
 void TestSuite::Skip() {
   if (!should_run_) return;
 
-  internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
-  impl->set_current_test_suite(this);
+  UnitTest::GetInstance()->set_current_test_suite(this);
 
   TestEventListener* repeater = UnitTest::GetInstance()->listeners().repeater();
 
@@ -2992,7 +3112,7 @@ void TestSuite::Skip() {
   repeater->OnTestCaseEnd(*this);
 #endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
 
-  impl->set_current_test_suite(nullptr);
+  UnitTest::GetInstance()->set_current_test_suite(nullptr);
 }
 
 // Clears the results of all tests in this test suite.
@@ -3083,7 +3203,7 @@ static void PrintTestPartResult(const TestPartResult& test_part_result) {
   // following statements add the test part result message to the Output
   // window such that the user can double-click on it to jump to the
   // corresponding source code location; otherwise they do nothing.
-#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE
+#if defined(GTEST_OS_WINDOWS) && !defined(GTEST_OS_WINDOWS_MOBILE)
   // We don't call OutputDebugString*() on Windows Mobile, as printing
   // to stdout is done by OutputDebugString() there already - we don't
   // want the same message printed twice.
@@ -3093,8 +3213,9 @@ static void PrintTestPartResult(const TestPartResult& test_part_result) {
 }
 
 // class PrettyUnitTestResultPrinter
-#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE && !GTEST_OS_WINDOWS_PHONE && \
-    !GTEST_OS_WINDOWS_RT && !GTEST_OS_WINDOWS_MINGW
+#if defined(GTEST_OS_WINDOWS) && !defined(GTEST_OS_WINDOWS_MOBILE) &&       \
+    !defined(GTEST_OS_WINDOWS_GAMES) && !defined(GTEST_OS_WINDOWS_PHONE) && \
+    !defined(GTEST_OS_WINDOWS_RT) && !defined(GTEST_OS_WINDOWS_MINGW)
 
 // Returns the character attribute for the given color.
 static WORD GetColorAttribute(GTestColor color) {
@@ -3154,7 +3275,8 @@ static const char* GetAnsiColorCode(GTestColor color) {
     case GTestColor::kYellow:
       return "3";
     default:
-      return nullptr;
+      assert(false);
+      return "9";
   }
 }
 
@@ -3162,10 +3284,11 @@ static const char* GetAnsiColorCode(GTestColor color) {
 
 // Returns true if and only if Google Test should use colors in the output.
 bool ShouldUseColor(bool stdout_is_tty) {
-  const char* const gtest_color = GTEST_FLAG(color).c_str();
+  std::string c = GTEST_FLAG_GET(color);
+  const char* const gtest_color = c.c_str();
 
   if (String::CaseInsensitiveCStringEquals(gtest_color, "auto")) {
-#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MINGW
+#if defined(GTEST_OS_WINDOWS) && !defined(GTEST_OS_WINDOWS_MINGW)
     // On Windows the TERM variable is usually not set, but the
     // console there does support colors.
     return stdout_is_tty;
@@ -3173,17 +3296,16 @@ bool ShouldUseColor(bool stdout_is_tty) {
     // On non-Windows platforms, we rely on the TERM variable.
     const char* const term = posix::GetEnv("TERM");
     const bool term_supports_color =
-        String::CStringEquals(term, "xterm") ||
-        String::CStringEquals(term, "xterm-color") ||
-        String::CStringEquals(term, "xterm-256color") ||
-        String::CStringEquals(term, "screen") ||
-        String::CStringEquals(term, "screen-256color") ||
-        String::CStringEquals(term, "tmux") ||
-        String::CStringEquals(term, "tmux-256color") ||
-        String::CStringEquals(term, "rxvt-unicode") ||
-        String::CStringEquals(term, "rxvt-unicode-256color") ||
-        String::CStringEquals(term, "linux") ||
-        String::CStringEquals(term, "cygwin");
+        term != nullptr && (String::CStringEquals(term, "xterm") ||
+                            String::CStringEquals(term, "xterm-color") ||
+                            String::CStringEquals(term, "xterm-kitty") ||
+                            String::CStringEquals(term, "alacritty") ||
+                            String::CStringEquals(term, "screen") ||
+                            String::CStringEquals(term, "tmux") ||
+                            String::CStringEquals(term, "rxvt-unicode") ||
+                            String::CStringEquals(term, "linux") ||
+                            String::CStringEquals(term, "cygwin") ||
+                            String::EndsWithCaseInsensitive(term, "-256color"));
     return stdout_is_tty && term_supports_color;
 #endif  // GTEST_OS_WINDOWS
   }
@@ -3207,14 +3329,12 @@ static void ColoredPrintf(GTestColor color, const char* fmt, ...) {
   va_list args;
   va_start(args, fmt);
 
-#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_ZOS || GTEST_OS_IOS || \
-    GTEST_OS_WINDOWS_PHONE || GTEST_OS_WINDOWS_RT || defined(ESP_PLATFORM)
-  const bool use_color = AlwaysFalse();
-#else
   static const bool in_color_mode =
+      // We don't condition this on GTEST_HAS_FILE_SYSTEM because we still need
+      // to be able to detect terminal I/O regardless.
       ShouldUseColor(posix::IsATTY(posix::FileNo(stdout)) != 0);
+
   const bool use_color = in_color_mode && (color != GTestColor::kDefault);
-#endif  // GTEST_OS_WINDOWS_MOBILE || GTEST_OS_ZOS
 
   if (!use_color) {
     vprintf(fmt, args);
@@ -3222,8 +3342,9 @@ static void ColoredPrintf(GTestColor color, const char* fmt, ...) {
     return;
   }
 
-#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE && !GTEST_OS_WINDOWS_PHONE && \
-    !GTEST_OS_WINDOWS_RT && !GTEST_OS_WINDOWS_MINGW
+#if defined(GTEST_OS_WINDOWS) && !defined(GTEST_OS_WINDOWS_MOBILE) &&       \
+    !defined(GTEST_OS_WINDOWS_GAMES) && !defined(GTEST_OS_WINDOWS_PHONE) && \
+    !defined(GTEST_OS_WINDOWS_RT) && !defined(GTEST_OS_WINDOWS_MINGW)
   const HANDLE stdout_handle = GetStdHandle(STD_OUTPUT_HANDLE);
 
   // Gets the current text color.
@@ -3277,7 +3398,7 @@ static void PrintFullTestCommentIfPresent(const TestInfo& test_info) {
 // Class PrettyUnitTestResultPrinter is copyable.
 class PrettyUnitTestResultPrinter : public TestEventListener {
  public:
-  PrettyUnitTestResultPrinter() {}
+  PrettyUnitTestResultPrinter() = default;
   static void PrintTestName(const char* test_suite, const char* test) {
     printf("%s.%s", test_suite, test);
   }
@@ -3294,6 +3415,7 @@ class PrettyUnitTestResultPrinter : public TestEventListener {
 #endif  // OnTestCaseStart
 
   void OnTestStart(const TestInfo& test_info) override;
+  void OnTestDisabled(const TestInfo& test_info) override;
 
   void OnTestPartResult(const TestPartResult& result) override;
   void OnTestEnd(const TestInfo& test_info) override;
@@ -3317,10 +3439,11 @@ class PrettyUnitTestResultPrinter : public TestEventListener {
 // Fired before each iteration of tests starts.
 void PrettyUnitTestResultPrinter::OnTestIterationStart(
     const UnitTest& unit_test, int iteration) {
-  if (GTEST_FLAG(repeat) != 1)
+  if (GTEST_FLAG_GET(repeat) != 1)
     printf("\nRepeating all tests (iteration %d) . . .\n\n", iteration + 1);
 
-  const char* const filter = GTEST_FLAG(filter).c_str();
+  std::string f = GTEST_FLAG_GET(filter);
+  const char* const filter = f.c_str();
 
   // Prints the filter if it's not *.  This reminds the user that some
   // tests may be skipped.
@@ -3336,7 +3459,7 @@ void PrettyUnitTestResultPrinter::OnTestIterationStart(
                   internal::posix::GetEnv(kTestTotalShards));
   }
 
-  if (GTEST_FLAG(shuffle)) {
+  if (GTEST_FLAG_GET(shuffle)) {
     ColoredPrintf(GTestColor::kYellow,
                   "Note: Randomizing tests' orders with a seed of %d .\n",
                   unit_test.random_seed());
@@ -3392,6 +3515,13 @@ void PrettyUnitTestResultPrinter::OnTestStart(const TestInfo& test_info) {
   fflush(stdout);
 }
 
+void PrettyUnitTestResultPrinter::OnTestDisabled(const TestInfo& test_info) {
+  ColoredPrintf(GTestColor::kYellow, "[ DISABLED ] ");
+  PrintTestName(test_info.test_suite_name(), test_info.name());
+  printf("\n");
+  fflush(stdout);
+}
+
 // Called after an assertion failure.
 void PrettyUnitTestResultPrinter::OnTestPartResult(
     const TestPartResult& result) {
@@ -3418,7 +3548,7 @@ void PrettyUnitTestResultPrinter::OnTestEnd(const TestInfo& test_info) {
   PrintTestName(test_info.test_suite_name(), test_info.name());
   if (test_info.result()->Failed()) PrintFullTestCommentIfPresent(test_info);
 
-  if (GTEST_FLAG(print_time)) {
+  if (GTEST_FLAG_GET(print_time)) {
     printf(" (%s ms)\n",
            internal::StreamableToString(test_info.result()->elapsed_time())
                .c_str());
@@ -3430,7 +3560,7 @@ void PrettyUnitTestResultPrinter::OnTestEnd(const TestInfo& test_info) {
 
 #ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
 void PrettyUnitTestResultPrinter::OnTestCaseEnd(const TestCase& test_case) {
-  if (!GTEST_FLAG(print_time)) return;
+  if (!GTEST_FLAG_GET(print_time)) return;
 
   const std::string counts =
       FormatCountableNoun(test_case.test_to_run_count(), "test", "tests");
@@ -3441,7 +3571,7 @@ void PrettyUnitTestResultPrinter::OnTestCaseEnd(const TestCase& test_case) {
 }
 #else
 void PrettyUnitTestResultPrinter::OnTestSuiteEnd(const TestSuite& test_suite) {
-  if (!GTEST_FLAG(print_time)) return;
+  if (!GTEST_FLAG_GET(print_time)) return;
 
   const std::string counts =
       FormatCountableNoun(test_suite.test_to_run_count(), "test", "tests");
@@ -3537,7 +3667,7 @@ void PrettyUnitTestResultPrinter::OnTestIterationEnd(const UnitTest& unit_test,
   printf("%s from %s ran.",
          FormatTestCount(unit_test.test_to_run_count()).c_str(),
          FormatTestSuiteCount(unit_test.test_suite_to_run_count()).c_str());
-  if (GTEST_FLAG(print_time)) {
+  if (GTEST_FLAG_GET(print_time)) {
     printf(" (%s ms total)",
            internal::StreamableToString(unit_test.elapsed_time()).c_str());
   }
@@ -3558,7 +3688,7 @@ void PrettyUnitTestResultPrinter::OnTestIterationEnd(const UnitTest& unit_test,
   }
 
   int num_disabled = unit_test.reportable_disabled_test_count();
-  if (num_disabled && !GTEST_FLAG(also_run_disabled_tests)) {
+  if (num_disabled && !GTEST_FLAG_GET(also_run_disabled_tests)) {
     if (unit_test.Passed()) {
       printf("\n");  // Add a spacer if no FAILURE banner is displayed.
     }
@@ -3576,7 +3706,7 @@ void PrettyUnitTestResultPrinter::OnTestIterationEnd(const UnitTest& unit_test,
 // Class BriefUnitTestResultPrinter is copyable.
 class BriefUnitTestResultPrinter : public TestEventListener {
  public:
-  BriefUnitTestResultPrinter() {}
+  BriefUnitTestResultPrinter() = default;
   static void PrintTestName(const char* test_suite, const char* test) {
     printf("%s.%s", test_suite, test);
   }
@@ -3594,6 +3724,7 @@ class BriefUnitTestResultPrinter : public TestEventListener {
 #endif  // OnTestCaseStart
 
   void OnTestStart(const TestInfo& /*test_info*/) override {}
+  void OnTestDisabled(const TestInfo& /*test_info*/) override {}
 
   void OnTestPartResult(const TestPartResult& result) override;
   void OnTestEnd(const TestInfo& test_info) override;
@@ -3630,7 +3761,7 @@ void BriefUnitTestResultPrinter::OnTestEnd(const TestInfo& test_info) {
     PrintTestName(test_info.test_suite_name(), test_info.name());
     PrintFullTestCommentIfPresent(test_info);
 
-    if (GTEST_FLAG(print_time)) {
+    if (GTEST_FLAG_GET(print_time)) {
       printf(" (%s ms)\n",
              internal::StreamableToString(test_info.result()->elapsed_time())
                  .c_str());
@@ -3647,7 +3778,7 @@ void BriefUnitTestResultPrinter::OnTestIterationEnd(const UnitTest& unit_test,
   printf("%s from %s ran.",
          FormatTestCount(unit_test.test_to_run_count()).c_str(),
          FormatTestSuiteCount(unit_test.test_suite_to_run_count()).c_str());
-  if (GTEST_FLAG(print_time)) {
+  if (GTEST_FLAG_GET(print_time)) {
     printf(" (%s ms total)",
            internal::StreamableToString(unit_test.elapsed_time()).c_str());
   }
@@ -3662,7 +3793,7 @@ void BriefUnitTestResultPrinter::OnTestIterationEnd(const UnitTest& unit_test,
   }
 
   int num_disabled = unit_test.reportable_disabled_test_count();
-  if (num_disabled && !GTEST_FLAG(also_run_disabled_tests)) {
+  if (num_disabled && !GTEST_FLAG_GET(also_run_disabled_tests)) {
     if (unit_test.Passed()) {
       printf("\n");  // Add a spacer if no FAILURE banner is displayed.
     }
@@ -3690,27 +3821,28 @@ class TestEventRepeater : public TestEventListener {
   bool forwarding_enabled() const { return forwarding_enabled_; }
   void set_forwarding_enabled(bool enable) { forwarding_enabled_ = enable; }
 
-  void OnTestProgramStart(const UnitTest& unit_test) override;
+  void OnTestProgramStart(const UnitTest& parameter) override;
   void OnTestIterationStart(const UnitTest& unit_test, int iteration) override;
-  void OnEnvironmentsSetUpStart(const UnitTest& unit_test) override;
-  void OnEnvironmentsSetUpEnd(const UnitTest& unit_test) override;
+  void OnEnvironmentsSetUpStart(const UnitTest& parameter) override;
+  void OnEnvironmentsSetUpEnd(const UnitTest& parameter) override;
 //  Legacy API is deprecated but still available
 #ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
   void OnTestCaseStart(const TestSuite& parameter) override;
 #endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
   void OnTestSuiteStart(const TestSuite& parameter) override;
-  void OnTestStart(const TestInfo& test_info) override;
-  void OnTestPartResult(const TestPartResult& result) override;
-  void OnTestEnd(const TestInfo& test_info) override;
+  void OnTestStart(const TestInfo& parameter) override;
+  void OnTestDisabled(const TestInfo& parameter) override;
+  void OnTestPartResult(const TestPartResult& parameter) override;
+  void OnTestEnd(const TestInfo& parameter) override;
 //  Legacy API is deprecated but still available
 #ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
   void OnTestCaseEnd(const TestCase& parameter) override;
 #endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
   void OnTestSuiteEnd(const TestSuite& parameter) override;
-  void OnEnvironmentsTearDownStart(const UnitTest& unit_test) override;
-  void OnEnvironmentsTearDownEnd(const UnitTest& unit_test) override;
+  void OnEnvironmentsTearDownStart(const UnitTest& parameter) override;
+  void OnEnvironmentsTearDownEnd(const UnitTest& parameter) override;
   void OnTestIterationEnd(const UnitTest& unit_test, int iteration) override;
-  void OnTestProgramEnd(const UnitTest& unit_test) override;
+  void OnTestProgramEnd(const UnitTest& parameter) override;
 
  private:
   // Controls whether events will be forwarded to listeners_. Set to false
@@ -3719,7 +3851,8 @@ class TestEventRepeater : public TestEventListener {
   // The list of listeners that receive events.
   std::vector<TestEventListener*> listeners_;
 
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestEventRepeater);
+  TestEventRepeater(const TestEventRepeater&) = delete;
+  TestEventRepeater& operator=(const TestEventRepeater&) = delete;
 };
 
 TestEventRepeater::~TestEventRepeater() {
@@ -3770,6 +3903,7 @@ GTEST_REPEATER_METHOD_(OnTestCaseStart, TestSuite)
 #endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
 GTEST_REPEATER_METHOD_(OnTestSuiteStart, TestSuite)
 GTEST_REPEATER_METHOD_(OnTestStart, TestInfo)
+GTEST_REPEATER_METHOD_(OnTestDisabled, TestInfo)
 GTEST_REPEATER_METHOD_(OnTestPartResult, TestPartResult)
 GTEST_REPEATER_METHOD_(OnEnvironmentsTearDownStart, UnitTest)
 GTEST_REVERSE_REPEATER_METHOD_(OnEnvironmentsSetUpEnd, UnitTest)
@@ -3805,6 +3939,7 @@ void TestEventRepeater::OnTestIterationEnd(const UnitTest& unit_test,
 
 // End TestEventRepeater
 
+#if GTEST_HAS_FILE_SYSTEM
 // This class generates an XML output file.
 class XmlUnitTestResultPrinter : public EmptyTestEventListener {
  public:
@@ -3820,12 +3955,13 @@ class XmlUnitTestResultPrinter : public EmptyTestEventListener {
  private:
   // Is c a whitespace character that is normalized to a space character
   // when it appears in an XML attribute value?
-  static bool IsNormalizableWhitespace(char c) {
-    return c == 0x9 || c == 0xA || c == 0xD;
+  static bool IsNormalizableWhitespace(unsigned char c) {
+    return c == '\t' || c == '\n' || c == '\r';
   }
 
   // May c appear in a well-formed XML document?
-  static bool IsValidXmlCharacter(char c) {
+  // https://www.w3.org/TR/REC-xml/#charsets
+  static bool IsValidXmlCharacter(unsigned char c) {
     return IsNormalizableWhitespace(c) || c >= 0x20;
   }
 
@@ -3864,6 +4000,12 @@ class XmlUnitTestResultPrinter : public EmptyTestEventListener {
   static void OutputXmlTestSuiteForTestResult(::std::ostream* stream,
                                               const TestResult& result);
 
+  // Streams a test case XML stanza containing the given test result.
+  //
+  // Requires: result.Failed()
+  static void OutputXmlTestCaseForTestResult(::std::ostream* stream,
+                                             const TestResult& result);
+
   // Streams an XML representation of a TestResult object.
   static void OutputXmlTestResult(::std::ostream* stream,
                                   const TestResult& result);
@@ -3881,21 +4023,17 @@ class XmlUnitTestResultPrinter : public EmptyTestEventListener {
   static void PrintXmlUnitTest(::std::ostream* stream,
                                const UnitTest& unit_test);
 
-  // Produces a string representing the test properties in a result as space
-  // delimited XML attributes based on the property key="value" pairs.
-  // When the std::string is not empty, it includes a space at the beginning,
-  // to delimit this attribute from prior attributes.
-  static std::string TestPropertiesAsXmlAttributes(const TestResult& result);
-
   // Streams an XML representation of the test properties of a TestResult
   // object.
   static void OutputXmlTestProperties(std::ostream* stream,
-                                      const TestResult& result);
+                                      const TestResult& result,
+                                      const std::string& indent);
 
   // The output file.
   const std::string output_file_;
 
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(XmlUnitTestResultPrinter);
+  XmlUnitTestResultPrinter(const XmlUnitTestResultPrinter&) = delete;
+  XmlUnitTestResultPrinter& operator=(const XmlUnitTestResultPrinter&) = delete;
 };
 
 // Creates a new XmlUnitTestResultPrinter.
@@ -3964,8 +4102,9 @@ std::string XmlUnitTestResultPrinter::EscapeXml(const std::string& str,
           m << '"';
         break;
       default:
-        if (IsValidXmlCharacter(ch)) {
-          if (is_attribute && IsNormalizableWhitespace(ch))
+        if (IsValidXmlCharacter(static_cast<unsigned char>(ch))) {
+          if (is_attribute &&
+              IsNormalizableWhitespace(static_cast<unsigned char>(ch)))
             m << "&#x" << String::FormatByte(static_cast<unsigned char>(ch))
               << ";";
           else
@@ -3986,14 +4125,14 @@ std::string XmlUnitTestResultPrinter::RemoveInvalidXmlCharacters(
   std::string output;
   output.reserve(str.size());
   for (std::string::const_iterator it = str.begin(); it != str.end(); ++it)
-    if (IsValidXmlCharacter(*it)) output.push_back(*it);
+    if (IsValidXmlCharacter(static_cast<unsigned char>(*it)))
+      output.push_back(*it);
 
   return output;
 }
 
 // The following routines generate an XML representation of a UnitTest
 // object.
-// GOOGLETEST_CM0009 DO NOT DELETE
 //
 // This is how Google Test concepts map to the DTD:
 //
@@ -4011,6 +4150,13 @@ std::string XmlUnitTestResultPrinter::RemoveInvalidXmlCharacters(
 // Formats the given time in milliseconds as seconds.
 std::string FormatTimeInMillisAsSeconds(TimeInMillis ms) {
   ::std::stringstream ss;
+  // For the exact N seconds, makes sure output has a trailing decimal point.
+  // Sets precision so that we won't have many trailing zeros (e.g., 300 ms
+  // will be just 0.3, 410 ms 0.41, and so on)
+  ss << std::fixed
+     << std::setprecision(
+            ms % 1000 == 0 ? 0 : (ms % 100 == 0 ? 1 : (ms % 10 == 0 ? 2 : 3)))
+     << std::showpoint;
   ss << (static_cast<double>(ms) * 1e-3);
   return ss.str();
 }
@@ -4102,6 +4248,15 @@ void XmlUnitTestResultPrinter::OutputXmlTestSuiteForTestResult(
       FormatEpochTimeInMillisAsIso8601(result.start_timestamp()));
   *stream << ">";
 
+  OutputXmlTestCaseForTestResult(stream, result);
+
+  // Complete the test suite.
+  *stream << "  </testsuite>\n";
+}
+
+// Streams a test case XML stanza containing the given test result.
+void XmlUnitTestResultPrinter::OutputXmlTestCaseForTestResult(
+    ::std::ostream* stream, const TestResult& result) {
   // Output the boilerplate for a minimal test case with a single test.
   *stream << "    <testcase";
   OutputXmlAttribute(stream, "testcase", "name", "");
@@ -4116,9 +4271,6 @@ void XmlUnitTestResultPrinter::OutputXmlTestSuiteForTestResult(
 
   // Output the actual test result.
   OutputXmlTestResult(stream, result);
-
-  // Complete the test suite.
-  *stream << "  </testsuite>\n";
 }
 
 // Prints an XML representation of a TestInfo object.
@@ -4143,10 +4295,11 @@ void XmlUnitTestResultPrinter::OutputXmlTestInfo(::std::ostream* stream,
     OutputXmlAttribute(stream, kTestsuite, "type_param",
                        test_info.type_param());
   }
-  if (GTEST_FLAG(list_tests)) {
-    OutputXmlAttribute(stream, kTestsuite, "file", test_info.file());
-    OutputXmlAttribute(stream, kTestsuite, "line",
-                       StreamableToString(test_info.line()));
+
+  OutputXmlAttribute(stream, kTestsuite, "file", test_info.file());
+  OutputXmlAttribute(stream, kTestsuite, "line",
+                     StreamableToString(test_info.line()));
+  if (GTEST_FLAG_GET(list_tests)) {
     *stream << " />\n";
     return;
   }
@@ -4208,7 +4361,7 @@ void XmlUnitTestResultPrinter::OutputXmlTestResult(::std::ostream* stream,
     if (failures == 0 && skips == 0) {
       *stream << ">\n";
     }
-    OutputXmlTestProperties(stream, result);
+    OutputXmlTestProperties(stream, result, /*indent=*/"      ");
     *stream << "    </testcase>\n";
   }
 }
@@ -4221,7 +4374,7 @@ void XmlUnitTestResultPrinter::PrintXmlTestSuite(std::ostream* stream,
   OutputXmlAttribute(stream, kTestsuite, "name", test_suite.name());
   OutputXmlAttribute(stream, kTestsuite, "tests",
                      StreamableToString(test_suite.reportable_test_count()));
-  if (!GTEST_FLAG(list_tests)) {
+  if (!GTEST_FLAG_GET(list_tests)) {
     OutputXmlAttribute(stream, kTestsuite, "failures",
                        StreamableToString(test_suite.failed_test_count()));
     OutputXmlAttribute(
@@ -4237,13 +4390,18 @@ void XmlUnitTestResultPrinter::PrintXmlTestSuite(std::ostream* stream,
     OutputXmlAttribute(
         stream, kTestsuite, "timestamp",
         FormatEpochTimeInMillisAsIso8601(test_suite.start_timestamp()));
-    *stream << TestPropertiesAsXmlAttributes(test_suite.ad_hoc_test_result());
   }
   *stream << ">\n";
+  OutputXmlTestProperties(stream, test_suite.ad_hoc_test_result(),
+                          /*indent=*/"    ");
   for (int i = 0; i < test_suite.total_test_count(); ++i) {
     if (test_suite.GetTestInfo(i)->is_reportable())
       OutputXmlTestInfo(stream, test_suite.name(), *test_suite.GetTestInfo(i));
   }
+  if (test_suite.ad_hoc_test_result().Failed()) {
+    OutputXmlTestCaseForTestResult(stream, test_suite.ad_hoc_test_result());
+  }
+
   *stream << "  </" << kTestsuite << ">\n";
 }
 
@@ -4269,15 +4427,16 @@ void XmlUnitTestResultPrinter::PrintXmlUnitTest(std::ostream* stream,
       stream, kTestsuites, "timestamp",
       FormatEpochTimeInMillisAsIso8601(unit_test.start_timestamp()));
 
-  if (GTEST_FLAG(shuffle)) {
+  if (GTEST_FLAG_GET(shuffle)) {
     OutputXmlAttribute(stream, kTestsuites, "random_seed",
                        StreamableToString(unit_test.random_seed()));
   }
-  *stream << TestPropertiesAsXmlAttributes(unit_test.ad_hoc_test_result());
 
   OutputXmlAttribute(stream, kTestsuites, "name", "AllTests");
   *stream << ">\n";
 
+  OutputXmlTestProperties(stream, unit_test.ad_hoc_test_result(),
+                          /*indent=*/"  ");
   for (int i = 0; i < unit_test.total_test_suite_count(); ++i) {
     if (unit_test.GetTestSuite(i)->reportable_test_count() > 0)
       PrintXmlTestSuite(stream, *unit_test.GetTestSuite(i));
@@ -4314,21 +4473,8 @@ void XmlUnitTestResultPrinter::PrintXmlTestsList(
   *stream << "</" << kTestsuites << ">\n";
 }
 
-// Produces a string representing the test properties in a result as space
-// delimited XML attributes based on the property key="value" pairs.
-std::string XmlUnitTestResultPrinter::TestPropertiesAsXmlAttributes(
-    const TestResult& result) {
-  Message attributes;
-  for (int i = 0; i < result.test_property_count(); ++i) {
-    const TestProperty& property = result.GetTestProperty(i);
-    attributes << " " << property.key() << "="
-               << "\"" << EscapeXmlAttribute(property.value()) << "\"";
-  }
-  return attributes.GetString();
-}
-
 void XmlUnitTestResultPrinter::OutputXmlTestProperties(
-    std::ostream* stream, const TestResult& result) {
+    std::ostream* stream, const TestResult& result, const std::string& indent) {
   const std::string kProperties = "properties";
   const std::string kProperty = "property";
 
@@ -4336,19 +4482,21 @@ void XmlUnitTestResultPrinter::OutputXmlTestProperties(
     return;
   }
 
-  *stream << "<" << kProperties << ">\n";
+  *stream << indent << "<" << kProperties << ">\n";
   for (int i = 0; i < result.test_property_count(); ++i) {
     const TestProperty& property = result.GetTestProperty(i);
-    *stream << "<" << kProperty;
+    *stream << indent << "  <" << kProperty;
     *stream << " name=\"" << EscapeXmlAttribute(property.key()) << "\"";
     *stream << " value=\"" << EscapeXmlAttribute(property.value()) << "\"";
     *stream << "/>\n";
   }
-  *stream << "</" << kProperties << ">\n";
+  *stream << indent << "</" << kProperties << ">\n";
 }
 
 // End XmlUnitTestResultPrinter
+#endif  // GTEST_HAS_FILE_SYSTEM
 
+#if GTEST_HAS_FILE_SYSTEM
 // This class generates an JSON output file.
 class JsonUnitTestResultPrinter : public EmptyTestEventListener {
  public:
@@ -4381,6 +4529,12 @@ class JsonUnitTestResultPrinter : public EmptyTestEventListener {
   static void OutputJsonTestSuiteForTestResult(::std::ostream* stream,
                                                const TestResult& result);
 
+  // Streams a test case JSON stanza containing the given test result.
+  //
+  // Requires: result.Failed()
+  static void OutputJsonTestCaseForTestResult(::std::ostream* stream,
+                                              const TestResult& result);
+
   // Streams a JSON representation of a TestResult object.
   static void OutputJsonTestResult(::std::ostream* stream,
                                    const TestResult& result);
@@ -4406,7 +4560,9 @@ class JsonUnitTestResultPrinter : public EmptyTestEventListener {
   // The output file.
   const std::string output_file_;
 
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(JsonUnitTestResultPrinter);
+  JsonUnitTestResultPrinter(const JsonUnitTestResultPrinter&) = delete;
+  JsonUnitTestResultPrinter& operator=(const JsonUnitTestResultPrinter&) =
+      delete;
 };
 
 // Creates a new JsonUnitTestResultPrinter.
@@ -4535,7 +4691,7 @@ void JsonUnitTestResultPrinter::OutputJsonTestSuiteForTestResult(
   *stream << Indent(4) << "{\n";
   OutputJsonKey(stream, "testsuite", "name", "NonTestSuiteFailure", Indent(6));
   OutputJsonKey(stream, "testsuite", "tests", 1, Indent(6));
-  if (!GTEST_FLAG(list_tests)) {
+  if (!GTEST_FLAG_GET(list_tests)) {
     OutputJsonKey(stream, "testsuite", "failures", 1, Indent(6));
     OutputJsonKey(stream, "testsuite", "disabled", 0, Indent(6));
     OutputJsonKey(stream, "testsuite", "skipped", 0, Indent(6));
@@ -4549,6 +4705,15 @@ void JsonUnitTestResultPrinter::OutputJsonTestSuiteForTestResult(
   }
   *stream << Indent(6) << "\"testsuite\": [\n";
 
+  OutputJsonTestCaseForTestResult(stream, result);
+
+  // Finish the test suite.
+  *stream << "\n" << Indent(6) << "]\n" << Indent(4) << "}";
+}
+
+// Streams a test case JSON stanza containing the given test result.
+void JsonUnitTestResultPrinter::OutputJsonTestCaseForTestResult(
+    ::std::ostream* stream, const TestResult& result) {
   // Output the boilerplate for a new test case.
   *stream << Indent(8) << "{\n";
   OutputJsonKey(stream, "testcase", "name", "", Indent(10));
@@ -4565,9 +4730,6 @@ void JsonUnitTestResultPrinter::OutputJsonTestSuiteForTestResult(
 
   // Output the actual test result.
   OutputJsonTestResult(stream, result);
-
-  // Finish the test suite.
-  *stream << "\n" << Indent(6) << "]\n" << Indent(4) << "}";
 }
 
 // Prints a JSON representation of a TestInfo object.
@@ -4589,11 +4751,14 @@ void JsonUnitTestResultPrinter::OutputJsonTestInfo(::std::ostream* stream,
     OutputJsonKey(stream, kTestsuite, "type_param", test_info.type_param(),
                   kIndent);
   }
-  if (GTEST_FLAG(list_tests)) {
-    OutputJsonKey(stream, kTestsuite, "file", test_info.file(), kIndent);
-    OutputJsonKey(stream, kTestsuite, "line", test_info.line(), kIndent, false);
+
+  OutputJsonKey(stream, kTestsuite, "file", test_info.file(), kIndent);
+  OutputJsonKey(stream, kTestsuite, "line", test_info.line(), kIndent, false);
+  if (GTEST_FLAG_GET(list_tests)) {
     *stream << "\n" << Indent(8) << "}";
     return;
+  } else {
+    *stream << ",\n";
   }
 
   OutputJsonKey(stream, kTestsuite, "status",
@@ -4619,28 +4784,53 @@ void JsonUnitTestResultPrinter::OutputJsonTestResult(::std::ostream* stream,
                                                      const TestResult& result) {
   const std::string kIndent = Indent(10);
 
-  int failures = 0;
-  for (int i = 0; i < result.total_part_count(); ++i) {
-    const TestPartResult& part = result.GetTestPartResult(i);
-    if (part.failed()) {
-      *stream << ",\n";
-      if (++failures == 1) {
-        *stream << kIndent << "\""
-                << "failures"
-                << "\": [\n";
+  {
+    int failures = 0;
+    for (int i = 0; i < result.total_part_count(); ++i) {
+      const TestPartResult& part = result.GetTestPartResult(i);
+      if (part.failed()) {
+        *stream << ",\n";
+        if (++failures == 1) {
+          *stream << kIndent << "\"" << "failures" << "\": [\n";
+        }
+        const std::string location =
+            internal::FormatCompilerIndependentFileLocation(part.file_name(),
+                                                            part.line_number());
+        const std::string message =
+            EscapeJson(location + "\n" + part.message());
+        *stream << kIndent << "  {\n"
+                << kIndent << "    \"failure\": \"" << message << "\",\n"
+                << kIndent << "    \"type\": \"\"\n"
+                << kIndent << "  }";
+      }
+    }
+
+    if (failures > 0) *stream << "\n" << kIndent << "]";
+  }
+
+  {
+    int skipped = 0;
+    for (int i = 0; i < result.total_part_count(); ++i) {
+      const TestPartResult& part = result.GetTestPartResult(i);
+      if (part.skipped()) {
+        *stream << ",\n";
+        if (++skipped == 1) {
+          *stream << kIndent << "\"" << "skipped" << "\": [\n";
+        }
+        const std::string location =
+            internal::FormatCompilerIndependentFileLocation(part.file_name(),
+                                                            part.line_number());
+        const std::string message =
+            EscapeJson(location + "\n" + part.message());
+        *stream << kIndent << "  {\n"
+                << kIndent << "    \"message\": \"" << message << "\"\n"
+                << kIndent << "  }";
       }
-      const std::string location =
-          internal::FormatCompilerIndependentFileLocation(part.file_name(),
-                                                          part.line_number());
-      const std::string message = EscapeJson(location + "\n" + part.message());
-      *stream << kIndent << "  {\n"
-              << kIndent << "    \"failure\": \"" << message << "\",\n"
-              << kIndent << "    \"type\": \"\"\n"
-              << kIndent << "  }";
     }
+
+    if (skipped > 0) *stream << "\n" << kIndent << "]";
   }
 
-  if (failures > 0) *stream << "\n" << kIndent << "]";
   *stream << "\n" << Indent(8) << "}";
 }
 
@@ -4654,7 +4844,7 @@ void JsonUnitTestResultPrinter::PrintJsonTestSuite(
   OutputJsonKey(stream, kTestsuite, "name", test_suite.name(), kIndent);
   OutputJsonKey(stream, kTestsuite, "tests", test_suite.reportable_test_count(),
                 kIndent);
-  if (!GTEST_FLAG(list_tests)) {
+  if (!GTEST_FLAG_GET(list_tests)) {
     OutputJsonKey(stream, kTestsuite, "failures",
                   test_suite.failed_test_count(), kIndent);
     OutputJsonKey(stream, kTestsuite, "disabled",
@@ -4684,6 +4874,16 @@ void JsonUnitTestResultPrinter::PrintJsonTestSuite(
       OutputJsonTestInfo(stream, test_suite.name(), *test_suite.GetTestInfo(i));
     }
   }
+
+  // If there was a failure in the test suite setup or teardown include that in
+  // the output.
+  if (test_suite.ad_hoc_test_result().Failed()) {
+    if (comma) {
+      *stream << ",\n";
+    }
+    OutputJsonTestCaseForTestResult(stream, test_suite.ad_hoc_test_result());
+  }
+
   *stream << "\n" << kIndent << "]\n" << Indent(4) << "}";
 }
 
@@ -4701,7 +4901,7 @@ void JsonUnitTestResultPrinter::PrintJsonUnitTest(std::ostream* stream,
   OutputJsonKey(stream, kTestsuites, "disabled",
                 unit_test.reportable_disabled_test_count(), kIndent);
   OutputJsonKey(stream, kTestsuites, "errors", 0, kIndent);
-  if (GTEST_FLAG(shuffle)) {
+  if (GTEST_FLAG_GET(shuffle)) {
     OutputJsonKey(stream, kTestsuites, "random_seed", unit_test.random_seed(),
                   kIndent);
   }
@@ -4733,6 +4933,9 @@ void JsonUnitTestResultPrinter::PrintJsonUnitTest(std::ostream* stream,
   // If there was a test failure outside of one of the test suites (like in a
   // test environment) include that in the output.
   if (unit_test.ad_hoc_test_result().Failed()) {
+    if (comma) {
+      *stream << ",\n";
+    }
     OutputJsonTestSuiteForTestResult(stream, unit_test.ad_hoc_test_result());
   }
 
@@ -4774,13 +4977,14 @@ std::string JsonUnitTestResultPrinter::TestPropertiesAsJson(
   for (int i = 0; i < result.test_property_count(); ++i) {
     const TestProperty& property = result.GetTestProperty(i);
     attributes << ",\n"
-               << indent << "\"" << property.key() << "\": "
-               << "\"" << EscapeJson(property.value()) << "\"";
+               << indent << "\"" << property.key() << "\": " << "\""
+               << EscapeJson(property.value()) << "\"";
   }
   return attributes.GetString();
 }
 
 // End JsonUnitTestResultPrinter
+#endif  // GTEST_HAS_FILE_SYSTEM
 
 #if GTEST_CAN_STREAM_RESULTS_
 
@@ -4798,7 +5002,8 @@ std::string StreamingListener::UrlEncode(const char* str) {
       case '=':
       case '&':
       case '\n':
-        result.append("%" + String::FormatByte(static_cast<unsigned char>(ch)));
+        result.push_back('%');
+        result.append(String::FormatByte(static_cast<unsigned char>(ch)));
         break;
       default:
         result.push_back(ch);
@@ -4859,7 +5064,7 @@ const char* const OsStackTraceGetterInterface::kElidedFramesMarker =
 
 std::string OsStackTraceGetter::CurrentStackTrace(int max_depth, int skip_count)
     GTEST_LOCK_EXCLUDED_(mutex_) {
-#if GTEST_HAS_ABSL
+#ifdef GTEST_HAS_ABSL
   std::string result;
 
   if (max_depth <= 0) {
@@ -4881,7 +5086,7 @@ std::string OsStackTraceGetter::CurrentStackTrace(int max_depth, int skip_count)
 
   for (int i = 0; i < raw_stack_size; ++i) {
     if (raw_stack[i] == caller_frame &&
-        !GTEST_FLAG(show_internal_stack_frames)) {
+        !GTEST_FLAG_GET(show_internal_stack_frames)) {
       // Add a marker to the trace and stop adding frames.
       absl::StrAppend(&result, kElidedFramesMarker, "\n");
       break;
@@ -4908,7 +5113,7 @@ std::string OsStackTraceGetter::CurrentStackTrace(int max_depth, int skip_count)
 }
 
 void OsStackTraceGetter::UponLeavingGTest() GTEST_LOCK_EXCLUDED_(mutex_) {
-#if GTEST_HAS_ABSL
+#ifdef GTEST_HAS_ABSL
   void* caller_frame = nullptr;
   if (absl::GetStackTrace(&caller_frame, 1, 3) <= 0) {
     caller_frame = nullptr;
@@ -4919,6 +5124,7 @@ void OsStackTraceGetter::UponLeavingGTest() GTEST_LOCK_EXCLUDED_(mutex_) {
 #endif  // GTEST_HAS_ABSL
 }
 
+#ifdef GTEST_HAS_DEATH_TEST
 // A helper class that creates the premature-exit file in its
 // constructor and deletes the file in its destructor.
 class ScopedPrematureExitFile {
@@ -4931,14 +5137,14 @@ class ScopedPrematureExitFile {
       // create the file with a single "0" character in it.  I/O
       // errors are ignored as there's nothing better we can do and we
       // don't want to fail the test because of this.
-      FILE* pfile = posix::FOpen(premature_exit_filepath, "w");
+      FILE* pfile = posix::FOpen(premature_exit_filepath_.c_str(), "w");
       fwrite("0", 1, 1, pfile);
       fclose(pfile);
     }
   }
 
   ~ScopedPrematureExitFile() {
-#if !defined GTEST_OS_ESP8266
+#ifndef GTEST_OS_ESP8266
     if (!premature_exit_filepath_.empty()) {
       int retval = remove(premature_exit_filepath_.c_str());
       if (retval) {
@@ -4953,8 +5159,10 @@ class ScopedPrematureExitFile {
  private:
   const std::string premature_exit_filepath_;
 
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ScopedPrematureExitFile);
+  ScopedPrematureExitFile(const ScopedPrematureExitFile&) = delete;
+  ScopedPrematureExitFile& operator=(const ScopedPrematureExitFile&) = delete;
 };
+#endif  // GTEST_HAS_DEATH_TEST
 
 }  // namespace internal
 
@@ -5026,8 +5234,8 @@ bool TestEventListeners::EventForwardingEnabled() const {
   return repeater_->forwarding_enabled();
 }
 
-void TestEventListeners::SuppressEventForwarding() {
-  repeater_->set_forwarding_enabled(false);
+void TestEventListeners::SuppressEventForwarding(bool suppress) {
+  repeater_->set_forwarding_enabled(!suppress);
 }
 
 // class UnitTest
@@ -5168,6 +5376,22 @@ TestSuite* UnitTest::GetMutableTestSuite(int i) {
   return impl()->GetMutableSuiteCase(i);
 }
 
+void UnitTest::UponLeavingGTest() {
+  impl()->os_stack_trace_getter()->UponLeavingGTest();
+}
+
+// Sets the TestSuite object for the test that's currently running.
+void UnitTest::set_current_test_suite(TestSuite* a_current_test_suite) {
+  internal::MutexLock lock(&mutex_);
+  impl_->set_current_test_suite(a_current_test_suite);
+}
+
+// Sets the TestInfo object for the test that's currently running.
+void UnitTest::set_current_test_info(TestInfo* a_current_test_info) {
+  internal::MutexLock lock(&mutex_);
+  impl_->set_current_test_info(a_current_test_info);
+}
+
 // Returns the list of event listeners that can be used to track events
 // inside Google Test.
 TestEventListeners& UnitTest::listeners() { return *impl()->listeners(); }
@@ -5204,7 +5428,7 @@ void UnitTest::AddTestPartResult(TestPartResult::Type result_type,
   msg << message;
 
   internal::MutexLock lock(&mutex_);
-  if (impl_->gtest_trace_stack().size() > 0) {
+  if (!impl_->gtest_trace_stack().empty()) {
     msg << "\n" << GTEST_NAME_ << " trace:";
 
     for (size_t i = impl_->gtest_trace_stack().size(); i > 0; --i) {
@@ -5217,6 +5441,8 @@ void UnitTest::AddTestPartResult(TestPartResult::Type result_type,
 
   if (os_stack_trace.c_str() != nullptr && !os_stack_trace.empty()) {
     msg << internal::kStackTraceMarker << os_stack_trace;
+  } else {
+    msg << "\n";
   }
 
   const TestPartResult result = TestPartResult(
@@ -5231,8 +5457,9 @@ void UnitTest::AddTestPartResult(TestPartResult::Type result_type,
     // in the code (perhaps in order to use Google Test assertions
     // with another testing framework) and specify the former on the
     // command line for debugging.
-    if (GTEST_FLAG(break_on_failure)) {
-#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT
+    if (GTEST_FLAG_GET(break_on_failure)) {
+#if defined(GTEST_OS_WINDOWS) && !defined(GTEST_OS_WINDOWS_PHONE) && \
+    !defined(GTEST_OS_WINDOWS_RT)
       // Using DebugBreak on Windows allows gtest to still break into a debugger
       // when a failure happens and both the --gtest_break_on_failure and
       // the --gtest_catch_exceptions flags are specified.
@@ -5242,13 +5469,17 @@ void UnitTest::AddTestPartResult(TestPartResult::Type result_type,
      (defined(__x86_64__) || defined(__i386__)))
       // with clang/gcc we can achieve the same effect on x86 by invoking int3
       asm("int3");
+#elif GTEST_HAS_BUILTIN(__builtin_trap)
+      __builtin_trap();
+#elif defined(SIGTRAP)
+      raise(SIGTRAP);
 #else
       // Dereference nullptr through a volatile pointer to prevent the compiler
       // from removing. We use this rather than abort() or __builtin_trap() for
       // portability: some debuggers don't correctly trap abort().
       *static_cast<volatile int*>(nullptr) = 1;
 #endif  // GTEST_OS_WINDOWS
-    } else if (GTEST_FLAG(throw_on_failure)) {
+    } else if (GTEST_FLAG_GET(throw_on_failure)) {
 #if GTEST_HAS_EXCEPTIONS
       throw internal::GoogleTestFailureException(result);
 #else
@@ -5276,8 +5507,9 @@ void UnitTest::RecordProperty(const std::string& key,
 // We don't protect this under mutex_, as we only support calling it
 // from the main thread.
 int UnitTest::Run() {
+#ifdef GTEST_HAS_DEATH_TEST
   const bool in_death_test_child_process =
-      internal::GTEST_FLAG(internal_run_death_test).length() > 0;
+      !GTEST_FLAG_GET(internal_run_death_test).empty();
 
   // Google Test implements this protocol for catching that a test
   // program exits before returning control to Google Test:
@@ -5304,37 +5536,42 @@ int UnitTest::Run() {
       in_death_test_child_process
           ? nullptr
           : internal::posix::GetEnv("TEST_PREMATURE_EXIT_FILE"));
+#else
+  const bool in_death_test_child_process = false;
+#endif  // GTEST_HAS_DEATH_TEST
 
   // Captures the value of GTEST_FLAG(catch_exceptions).  This value will be
   // used for the duration of the program.
-  impl()->set_catch_exceptions(GTEST_FLAG(catch_exceptions));
+  impl()->set_catch_exceptions(GTEST_FLAG_GET(catch_exceptions));
 
-#if GTEST_OS_WINDOWS
+#ifdef GTEST_OS_WINDOWS
   // Either the user wants Google Test to catch exceptions thrown by the
   // tests or this is executing in the context of death test child
   // process. In either case the user does not want to see pop-up dialogs
   // about crashes - they are expected.
   if (impl()->catch_exceptions() || in_death_test_child_process) {
-#if !GTEST_OS_WINDOWS_MOBILE && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT
+#if !defined(GTEST_OS_WINDOWS_MOBILE) && !defined(GTEST_OS_WINDOWS_PHONE) && \
+    !defined(GTEST_OS_WINDOWS_RT) && !defined(GTEST_OS_WINDOWS_GAMES)
     // SetErrorMode doesn't exist on CE.
     SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOALIGNMENTFAULTEXCEPT |
                  SEM_NOGPFAULTERRORBOX | SEM_NOOPENFILEERRORBOX);
 #endif  // !GTEST_OS_WINDOWS_MOBILE
 
-#if (defined(_MSC_VER) || GTEST_OS_WINDOWS_MINGW) && !GTEST_OS_WINDOWS_MOBILE
+#if (defined(_MSC_VER) || defined(GTEST_OS_WINDOWS_MINGW)) && \
+    !defined(GTEST_OS_WINDOWS_MOBILE)
     // Death test children can be terminated with _abort().  On Windows,
     // _abort() can show a dialog with a warning message.  This forces the
     // abort message to go to stderr instead.
     _set_error_mode(_OUT_TO_STDERR);
 #endif
 
-#if defined(_MSC_VER) && !GTEST_OS_WINDOWS_MOBILE
+#if defined(_MSC_VER) && !defined(GTEST_OS_WINDOWS_MOBILE)
     // In the debug version, Visual Studio pops up a separate dialog
     // offering a choice to debug the aborted program. We need to suppress
     // this dialog or it will pop up for every EXPECT/ASSERT_DEATH statement
     // executed. Google Test will notify the user of any unexpected
     // failure via stderr.
-    if (!GTEST_FLAG(break_on_failure))
+    if (!GTEST_FLAG_GET(break_on_failure))
       _set_abort_behavior(
           0x0,                                    // Clear the following flags:
           _WRITE_ABORT_MSG | _CALL_REPORTFAULT);  // pop-up window, core dump.
@@ -5350,6 +5587,8 @@ int UnitTest::Run() {
     }
 #endif
   }
+#else
+  (void)in_death_test_child_process;  // Needed inside the #if block above
 #endif  // GTEST_OS_WINDOWS
 
   return internal::HandleExceptionsInMethodIfSupported(
@@ -5359,11 +5598,13 @@ int UnitTest::Run() {
              : 1;
 }
 
+#if GTEST_HAS_FILE_SYSTEM
 // Returns the working directory when the first TEST() or TEST_F() was
 // executed.
 const char* UnitTest::original_working_dir() const {
   return impl_->original_working_dir_.c_str();
 }
+#endif  // GTEST_HAS_FILE_SYSTEM
 
 // Returns the TestSuite object for the test that's currently running,
 // or NULL if no test is running.
@@ -5427,7 +5668,7 @@ UnitTestImpl::UnitTestImpl(UnitTest* parent)
       GTEST_DISABLE_MSC_WARNINGS_PUSH_(4355 /* using this in initializer */)
           default_global_test_part_result_reporter_(this),
       default_per_thread_test_part_result_reporter_(this),
-      GTEST_DISABLE_MSC_WARNINGS_POP_() global_test_part_result_repoter_(
+      GTEST_DISABLE_MSC_WARNINGS_POP_() global_test_part_result_reporter_(
           &default_global_test_part_result_reporter_),
       per_thread_test_part_result_reporter_(
           &default_per_thread_test_part_result_reporter_),
@@ -5443,7 +5684,7 @@ UnitTestImpl::UnitTestImpl(UnitTest* parent)
       random_(0),       // Will be reseeded before first use.
       start_timestamp_(0),
       elapsed_time_(0),
-#if GTEST_HAS_DEATH_TEST
+#ifdef GTEST_HAS_DEATH_TEST
       death_test_factory_(new DefaultDeathTestFactory),
 #endif
       // Will be overridden by the flag before first use.
@@ -5483,12 +5724,12 @@ void UnitTestImpl::RecordProperty(const TestProperty& test_property) {
   test_result->RecordProperty(xml_element, test_property);
 }
 
-#if GTEST_HAS_DEATH_TEST
+#ifdef GTEST_HAS_DEATH_TEST
 // Disables event forwarding if the control is currently in a death test
 // subprocess. Must not be called before InitGoogleTest.
 void UnitTestImpl::SuppressTestEventsIfInSubprocess() {
-  if (internal_run_death_test_flag_.get() != nullptr)
-    listeners()->SuppressEventForwarding();
+  if (internal_run_death_test_flag_ != nullptr)
+    listeners()->SuppressEventForwarding(true);
 }
 #endif  // GTEST_HAS_DEATH_TEST
 
@@ -5496,23 +5737,30 @@ void UnitTestImpl::SuppressTestEventsIfInSubprocess() {
 // UnitTestOptions. Must not be called before InitGoogleTest.
 void UnitTestImpl::ConfigureXmlOutput() {
   const std::string& output_format = UnitTestOptions::GetOutputFormat();
+#if GTEST_HAS_FILE_SYSTEM
   if (output_format == "xml") {
     listeners()->SetDefaultXmlGenerator(new XmlUnitTestResultPrinter(
         UnitTestOptions::GetAbsolutePathToOutputFile().c_str()));
   } else if (output_format == "json") {
     listeners()->SetDefaultXmlGenerator(new JsonUnitTestResultPrinter(
         UnitTestOptions::GetAbsolutePathToOutputFile().c_str()));
-  } else if (output_format != "") {
+  } else if (!output_format.empty()) {
     GTEST_LOG_(WARNING) << "WARNING: unrecognized output format \""
                         << output_format << "\" ignored.";
   }
+#else
+  if (!output_format.empty()) {
+    GTEST_LOG_(ERROR) << "ERROR: alternative output formats require "
+                      << "GTEST_HAS_FILE_SYSTEM to be enabled";
+  }
+#endif  // GTEST_HAS_FILE_SYSTEM
 }
 
 #if GTEST_CAN_STREAM_RESULTS_
 // Initializes event listeners for streaming test results in string form.
 // Must not be called before InitGoogleTest.
 void UnitTestImpl::ConfigureStreamingOutput() {
-  const std::string& target = GTEST_FLAG(stream_result_to);
+  const std::string& target = GTEST_FLAG_GET(stream_result_to);
   if (!target.empty()) {
     const size_t pos = target.find(':');
     if (pos != std::string::npos) {
@@ -5541,7 +5789,7 @@ void UnitTestImpl::PostFlagParsingInit() {
     listeners()->Append(new GTEST_CUSTOM_TEST_EVENT_LISTENER_());
 #endif  // defined(GTEST_CUSTOM_TEST_EVENT_LISTENER_)
 
-#if GTEST_HAS_DEATH_TEST
+#ifdef GTEST_HAS_DEATH_TEST
     InitDeathTestSubprocessControlInfo();
     SuppressTestEventsIfInSubprocess();
 #endif  // GTEST_HAS_DEATH_TEST
@@ -5555,7 +5803,7 @@ void UnitTestImpl::PostFlagParsingInit() {
     // to shut down the default XML output before invoking RUN_ALL_TESTS.
     ConfigureXmlOutput();
 
-    if (GTEST_FLAG(brief)) {
+    if (GTEST_FLAG_GET(brief)) {
       listeners()->SetDefaultResultPrinter(new BriefUnitTestResultPrinter);
     }
 
@@ -5564,8 +5812,8 @@ void UnitTestImpl::PostFlagParsingInit() {
     ConfigureStreamingOutput();
 #endif  // GTEST_CAN_STREAM_RESULTS_
 
-#if GTEST_HAS_ABSL
-    if (GTEST_FLAG(install_failure_signal_handler)) {
+#ifdef GTEST_HAS_ABSL
+    if (GTEST_FLAG_GET(install_failure_signal_handler)) {
       absl::FailureSignalHandlerOptions options;
       absl::InstallFailureSignalHandler(options);
     }
@@ -5573,29 +5821,6 @@ void UnitTestImpl::PostFlagParsingInit() {
   }
 }
 
-// A predicate that checks the name of a TestSuite against a known
-// value.
-//
-// This is used for implementation of the UnitTest class only.  We put
-// it in the anonymous namespace to prevent polluting the outer
-// namespace.
-//
-// TestSuiteNameIs is copyable.
-class TestSuiteNameIs {
- public:
-  // Constructor.
-  explicit TestSuiteNameIs(const std::string& name) : name_(name) {}
-
-  // Returns true if and only if the name of test_suite matches name_.
-  bool operator()(const TestSuite* test_suite) const {
-    return test_suite != nullptr &&
-           strcmp(test_suite->name(), name_.c_str()) == 0;
-  }
-
- private:
-  std::string name_;
-};
-
 // Finds and returns a TestSuite with the given name.  If one doesn't
 // exist, creates one and returns it.  It's the CALLER'S
 // RESPONSIBILITY to ensure that this function is only called WHEN THE
@@ -5609,23 +5834,31 @@ class TestSuiteNameIs {
 //   set_up_tc:       pointer to the function that sets up the test suite
 //   tear_down_tc:    pointer to the function that tears down the test suite
 TestSuite* UnitTestImpl::GetTestSuite(
-    const char* test_suite_name, const char* type_param,
+    const std::string& test_suite_name, const char* type_param,
     internal::SetUpTestSuiteFunc set_up_tc,
     internal::TearDownTestSuiteFunc tear_down_tc) {
-  // Can we find a TestSuite with the given name?
-  const auto test_suite =
-      std::find_if(test_suites_.rbegin(), test_suites_.rend(),
-                   TestSuiteNameIs(test_suite_name));
+  // During initialization, all TestInfos for a given suite are added in
+  // sequence. To optimize this case, see if the most recently added suite is
+  // the one being requested now.
+  if (!test_suites_.empty() &&
+      (*test_suites_.rbegin())->name_ == test_suite_name) {
+    return *test_suites_.rbegin();
+  }
 
-  if (test_suite != test_suites_.rend()) return *test_suite;
+  // Fall back to searching the collection.
+  auto item_it = test_suites_by_name_.find(test_suite_name);
+  if (item_it != test_suites_by_name_.end()) {
+    return item_it->second;
+  }
 
-  // No.  Let's create one.
+  // Not found. Create a new instance.
   auto* const new_test_suite =
       new TestSuite(test_suite_name, type_param, set_up_tc, tear_down_tc);
+  test_suites_by_name_.emplace(test_suite_name, new_test_suite);
 
+  const UnitTestFilter death_test_suite_filter(kDeathTestSuiteFilter);
   // Is this a death test suite?
-  if (internal::UnitTestOptions::MatchesFilter(test_suite_name,
-                                               kDeathTestSuiteFilter)) {
+  if (death_test_suite_filter.MatchesName(test_suite_name)) {
     // Yes.  Inserts the test suite after the last death test suite
     // defined so far.  This only works when the test suites haven't
     // been shuffled.  Otherwise we may end up running a death test
@@ -5647,6 +5880,23 @@ TestSuite* UnitTestImpl::GetTestSuite(
 static void SetUpEnvironment(Environment* env) { env->SetUp(); }
 static void TearDownEnvironment(Environment* env) { env->TearDown(); }
 
+// If the environment variable TEST_WARNINGS_OUTPUT_FILE was provided, appends
+// `str` to the file, creating the file if necessary.
+#if GTEST_HAS_FILE_SYSTEM
+static void AppendToTestWarningsOutputFile(const std::string& str) {
+  const char* const filename = posix::GetEnv(kTestWarningsOutputFile);
+  if (filename == nullptr) {
+    return;
+  }
+  auto* const file = posix::FOpen(filename, "a");
+  if (file == nullptr) {
+    return;
+  }
+  GTEST_CHECK_(fwrite(str.data(), 1, str.size(), file) == str.size());
+  GTEST_CHECK_(posix::FClose(file) == 0);
+}
+#endif  // GTEST_HAS_FILE_SYSTEM
+
 // Runs all tests in this UnitTest object, prints the result, and
 // returns true if all tests are successful.  If any exception is
 // thrown during a test, the test is considered to be failed, but the
@@ -5668,18 +5918,41 @@ bool UnitTestImpl::RunAllTests() {
   // user didn't call InitGoogleTest.
   PostFlagParsingInit();
 
+  // Handle the case where the program has no tests linked.
+  // Sometimes this is a programmer mistake, but sometimes it is intended.
+  if (total_test_count() == 0) {
+    constexpr char kNoTestLinkedMessage[] =
+        "This test program does NOT link in any test case.";
+    constexpr char kNoTestLinkedFatal[] =
+        "This is INVALID. Please make sure to link in at least one test case.";
+    constexpr char kNoTestLinkedWarning[] =
+        "Please make sure this is intended.";
+    const bool fail_if_no_test_linked = GTEST_FLAG_GET(fail_if_no_test_linked);
+    ColoredPrintf(
+        GTestColor::kRed, "%s %s\n", kNoTestLinkedMessage,
+        fail_if_no_test_linked ? kNoTestLinkedFatal : kNoTestLinkedWarning);
+    if (fail_if_no_test_linked) {
+      return false;
+    }
+#if GTEST_HAS_FILE_SYSTEM
+    AppendToTestWarningsOutputFile(std::string(kNoTestLinkedMessage) + ' ' +
+                                   kNoTestLinkedWarning + '\n');
+#endif  // GTEST_HAS_FILE_SYSTEM
+  }
+
+#if GTEST_HAS_FILE_SYSTEM
   // Even if sharding is not on, test runners may want to use the
   // GTEST_SHARD_STATUS_FILE to query whether the test supports the sharding
   // protocol.
   internal::WriteToShardStatusFileIfNeeded();
+#endif  // GTEST_HAS_FILE_SYSTEM
 
   // True if and only if we are in a subprocess for running a thread-safe-style
   // death test.
   bool in_subprocess_for_death_test = false;
 
-#if GTEST_HAS_DEATH_TEST
-  in_subprocess_for_death_test =
-      (internal_run_death_test_flag_.get() != nullptr);
+#ifdef GTEST_HAS_DEATH_TEST
+  in_subprocess_for_death_test = (internal_run_death_test_flag_ != nullptr);
 #if defined(GTEST_EXTRA_DEATH_TEST_CHILD_SETUP_)
   if (in_subprocess_for_death_test) {
     GTEST_EXTRA_DEATH_TEST_CHILD_SETUP_();
@@ -5697,14 +5970,13 @@ bool UnitTestImpl::RunAllTests() {
                                : IGNORE_SHARDING_PROTOCOL) > 0;
 
   // Lists the tests and exits if the --gtest_list_tests flag was specified.
-  if (GTEST_FLAG(list_tests)) {
+  if (GTEST_FLAG_GET(list_tests)) {
     // This must be called *after* FilterTests() has been called.
     ListTestsMatchingFilter();
     return true;
   }
 
-  random_seed_ =
-      GTEST_FLAG(shuffle) ? GetRandomSeedFromFlag(GTEST_FLAG(random_seed)) : 0;
+  random_seed_ = GetRandomSeedFromFlag(GTEST_FLAG_GET(random_seed));
 
   // True if and only if at least one test has failed.
   bool failed = false;
@@ -5716,9 +5988,21 @@ bool UnitTestImpl::RunAllTests() {
 
   // How many times to repeat the tests?  We don't want to repeat them
   // when we are inside the subprocess of a death test.
-  const int repeat = in_subprocess_for_death_test ? 1 : GTEST_FLAG(repeat);
+  const int repeat = in_subprocess_for_death_test ? 1 : GTEST_FLAG_GET(repeat);
+
   // Repeats forever if the repeat count is negative.
   const bool gtest_repeat_forever = repeat < 0;
+
+  // Should test environments be set up and torn down for each repeat, or only
+  // set up on the first and torn down on the last iteration? If there is no
+  // "last" iteration because the tests will repeat forever, always recreate the
+  // environments to avoid leaks in case one of the environments is using
+  // resources that are external to this process. Without this check there would
+  // be no way to clean up those external resources automatically.
+  const bool recreate_environments_when_repeating =
+      GTEST_FLAG_GET(recreate_environments_when_repeating) ||
+      gtest_repeat_forever;
+
   for (int i = 0; gtest_repeat_forever || i != repeat; i++) {
     // We want to preserve failures generated by ad-hoc test
     // assertions executed before RUN_ALL_TESTS().
@@ -5727,7 +6011,7 @@ bool UnitTestImpl::RunAllTests() {
     Timer timer;
 
     // Shuffles test suites and tests if requested.
-    if (has_tests_to_run && GTEST_FLAG(shuffle)) {
+    if (has_tests_to_run && GTEST_FLAG_GET(shuffle)) {
       random()->Reseed(static_cast<uint32_t>(random_seed_));
       // This should be done before calling OnTestIterationStart(),
       // such that a test event listener can see the actual test order
@@ -5740,10 +6024,13 @@ bool UnitTestImpl::RunAllTests() {
 
     // Runs each test suite if there is at least one test to run.
     if (has_tests_to_run) {
-      // Sets up all environments beforehand.
-      repeater->OnEnvironmentsSetUpStart(*parent_);
-      ForEach(environments_, SetUpEnvironment);
-      repeater->OnEnvironmentsSetUpEnd(*parent_);
+      // Sets up all environments beforehand. If test environments aren't
+      // recreated for each iteration, only do so on the first iteration.
+      if (i == 0 || recreate_environments_when_repeating) {
+        repeater->OnEnvironmentsSetUpStart(*parent_);
+        ForEach(environments_, SetUpEnvironment);
+        repeater->OnEnvironmentsSetUpEnd(*parent_);
+      }
 
       // Runs the tests only if there was no fatal failure or skip triggered
       // during global set-up.
@@ -5765,7 +6052,7 @@ bool UnitTestImpl::RunAllTests() {
         for (int test_index = 0; test_index < total_test_suite_count();
              test_index++) {
           GetMutableSuiteCase(test_index)->Run();
-          if (GTEST_FLAG(fail_fast) &&
+          if (GTEST_FLAG_GET(fail_fast) &&
               GetMutableSuiteCase(test_index)->Failed()) {
             for (int j = test_index + 1; j < total_test_suite_count(); j++) {
               GetMutableSuiteCase(j)->Skip();
@@ -5783,11 +6070,15 @@ bool UnitTestImpl::RunAllTests() {
         }
       }
 
-      // Tears down all environments in reverse order afterwards.
-      repeater->OnEnvironmentsTearDownStart(*parent_);
-      std::for_each(environments_.rbegin(), environments_.rend(),
-                    TearDownEnvironment);
-      repeater->OnEnvironmentsTearDownEnd(*parent_);
+      // Tears down all environments in reverse order afterwards. If test
+      // environments aren't recreated for each iteration, only do so on the
+      // last iteration.
+      if (i == repeat - 1 || recreate_environments_when_repeating) {
+        repeater->OnEnvironmentsTearDownStart(*parent_);
+        std::for_each(environments_.rbegin(), environments_.rend(),
+                      TearDownEnvironment);
+        repeater->OnEnvironmentsTearDownEnd(*parent_);
+      }
     }
 
     elapsed_time_ = timer.Elapsed();
@@ -5808,13 +6099,30 @@ bool UnitTestImpl::RunAllTests() {
     // (it's always safe to unshuffle the tests).
     UnshuffleTests();
 
-    if (GTEST_FLAG(shuffle)) {
+    if (GTEST_FLAG_GET(shuffle)) {
       // Picks a new random seed for each iteration.
       random_seed_ = GetNextRandomSeed(random_seed_);
     }
   }
 
   repeater->OnTestProgramEnd(*parent_);
+  // Destroy environments in normal code, not in static teardown.
+  bool delete_environment_on_teardown = true;
+  if (delete_environment_on_teardown) {
+    ForEach(environments_, internal::Delete<Environment>);
+    environments_.clear();
+  }
+
+  // Try to warn the user if no tests matched the test filter.
+  if (ShouldWarnIfNoTestsMatchFilter()) {
+    const std::string filter_warning =
+        std::string("filter \"") + GTEST_FLAG_GET(filter) +
+        "\" did not match any test; no tests were run\n";
+    ColoredPrintf(GTestColor::kRed, "WARNING: %s", filter_warning.c_str());
+#if GTEST_HAS_FILE_SYSTEM
+    AppendToTestWarningsOutputFile(filter_warning);
+#endif  // GTEST_HAS_FILE_SYSTEM
+  }
 
   if (!gtest_is_initialized_before_run_all_tests) {
     ColoredPrintf(
@@ -5824,15 +6132,12 @@ bool UnitTestImpl::RunAllTests() {
         "() before calling RUN_ALL_TESTS(). This is INVALID. Soon " GTEST_NAME_
         " will start to enforce the valid usage. "
         "Please fix it ASAP, or IT WILL START TO FAIL.\n");  // NOLINT
-#if GTEST_FOR_GOOGLE_
-    ColoredPrintf(GTestColor::kRed,
-                  "For more details, see http://wiki/Main/ValidGUnitMain.\n");
-#endif  // GTEST_FOR_GOOGLE_
   }
 
   return !failed;
 }
 
+#if GTEST_HAS_FILE_SYSTEM
 // Reads the GTEST_SHARD_STATUS_FILE environment variable, and creates the file
 // if the variable is present. If a file already exists at this location, this
 // function will write over it. If the variable is present, but the file cannot
@@ -5852,6 +6157,7 @@ void WriteToShardStatusFileIfNeeded() {
     fclose(file);
   }
 }
+#endif  // GTEST_HAS_FILE_SYSTEM
 
 // Checks whether sharding is enabled by examining the relevant
 // environment variable values. If the variables are present,
@@ -5930,7 +6236,7 @@ bool ShouldRunTestOnShard(int total_shards, int shard_index, int test_id) {
 // each TestSuite and TestInfo object.
 // If shard_tests == true, further filters tests based on sharding
 // variables in the environment - see
-// https://github.com/google/googletest/blob/master/googletest/docs/advanced.md
+// https://github.com/google/googletest/blob/main/docs/advanced.md
 // . Returns the number of tests that should run.
 int UnitTestImpl::FilterTests(ReactionToSharding shard_tests) {
   const int32_t total_shards = shard_tests == HONOR_SHARDING_PROTOCOL
@@ -5940,6 +6246,9 @@ int UnitTestImpl::FilterTests(ReactionToSharding shard_tests) {
                                   ? Int32FromEnvOrDie(kTestShardIndex, -1)
                                   : -1;
 
+  const PositiveAndNegativeUnitTestFilter gtest_flag_filter(
+      GTEST_FLAG_GET(filter));
+  const UnitTestFilter disable_test_filter(kDisableTestFilter);
   // num_runnable_tests are the number of tests that will
   // run across all shards (i.e., match filter and are not disabled).
   // num_selected_tests are the number of tests to be run on
@@ -5947,26 +6256,24 @@ int UnitTestImpl::FilterTests(ReactionToSharding shard_tests) {
   int num_runnable_tests = 0;
   int num_selected_tests = 0;
   for (auto* test_suite : test_suites_) {
-    const std::string& test_suite_name = test_suite->name();
+    const std::string& test_suite_name = test_suite->name_;
     test_suite->set_should_run(false);
 
-    for (size_t j = 0; j < test_suite->test_info_list().size(); j++) {
-      TestInfo* const test_info = test_suite->test_info_list()[j];
-      const std::string test_name(test_info->name());
+    for (TestInfo* test_info : test_suite->test_info_list()) {
+      const std::string& test_name = test_info->name_;
       // A test is disabled if test suite name or test name matches
       // kDisableTestFilter.
-      const bool is_disabled = internal::UnitTestOptions::MatchesFilter(
-                                   test_suite_name, kDisableTestFilter) ||
-                               internal::UnitTestOptions::MatchesFilter(
-                                   test_name, kDisableTestFilter);
+      const bool is_disabled =
+          disable_test_filter.MatchesName(test_suite_name) ||
+          disable_test_filter.MatchesName(test_name);
       test_info->is_disabled_ = is_disabled;
 
-      const bool matches_filter = internal::UnitTestOptions::FilterMatchesTest(
-          test_suite_name, test_name);
+      const bool matches_filter =
+          gtest_flag_filter.MatchesTest(test_suite_name, test_name);
       test_info->matches_filter_ = matches_filter;
 
       const bool is_runnable =
-          (GTEST_FLAG(also_run_disabled_tests) || !is_disabled) &&
+          (GTEST_FLAG_GET(also_run_disabled_tests) || !is_disabled) &&
           matches_filter;
 
       const bool is_in_another_shard =
@@ -5985,6 +6292,30 @@ int UnitTestImpl::FilterTests(ReactionToSharding shard_tests) {
   return num_selected_tests;
 }
 
+// Returns true if a warning should be issued if no tests match the test filter
+// flag. We can't simply count the number of tests that ran because, for
+// instance, test sharding and death tests might mean no tests are expected to
+// run in this process, but will run in another process.
+bool UnitTestImpl::ShouldWarnIfNoTestsMatchFilter() const {
+  if (total_test_count() == 0) {
+    // No tests were linked in to program.
+    // This case is handled by a different warning.
+    return false;
+  }
+  const PositiveAndNegativeUnitTestFilter gtest_flag_filter(
+      GTEST_FLAG_GET(filter));
+  for (auto* test_suite : test_suites_) {
+    const std::string& test_suite_name = test_suite->name_;
+    for (TestInfo* test_info : test_suite->test_info_list()) {
+      const std::string& test_name = test_info->name_;
+      if (gtest_flag_filter.MatchesTest(test_suite_name, test_name)) {
+        return false;
+      }
+    }
+  }
+  return true;
+}
+
 // Prints the given C-string on a single line by replacing all '\n'
 // characters with string "\\n".  If the output takes more than
 // max_length characters, only prints the first max_length characters
@@ -6041,10 +6372,11 @@ void UnitTestImpl::ListTestsMatchingFilter() {
     }
   }
   fflush(stdout);
+#if GTEST_HAS_FILE_SYSTEM
   const std::string& output_format = UnitTestOptions::GetOutputFormat();
   if (output_format == "xml" || output_format == "json") {
-    FILE* fileout = OpenFileForWriting(
-        UnitTestOptions::GetAbsolutePathToOutputFile().c_str());
+    FILE* fileout =
+        OpenFileForWriting(UnitTestOptions::GetAbsolutePathToOutputFile());
     std::stringstream stream;
     if (output_format == "xml") {
       XmlUnitTestResultPrinter(
@@ -6058,6 +6390,7 @@ void UnitTestImpl::ListTestsMatchingFilter() {
     fprintf(fileout, "%s", StringStreamToString(&stream).c_str());
     fclose(fileout);
   }
+#endif  // GTEST_HAS_FILE_SYSTEM
 }
 
 // Sets the OS stack trace getter.
@@ -6135,8 +6468,8 @@ void UnitTestImpl::UnshuffleTests() {
 // For example, if Foo() calls Bar(), which in turn calls
 // GetCurrentOsStackTraceExceptTop(..., 1), Foo() will be included in
 // the trace but Bar() and GetCurrentOsStackTraceExceptTop() won't.
-std::string GetCurrentOsStackTraceExceptTop(UnitTest* /*unit_test*/,
-                                            int skip_count) {
+GTEST_NO_INLINE_ GTEST_NO_TAIL_CALL_ std::string
+GetCurrentOsStackTraceExceptTop(int skip_count) {
   // We pass skip_count + 1 to skip this wrapper function in addition
   // to what the user really wants to skip.
   return GetUnitTestImpl()->CurrentOsStackTraceExceptTop(skip_count + 1);
@@ -6176,13 +6509,14 @@ bool SkipPrefix(const char* prefix, const char** pstr) {
 // part can be omitted.
 //
 // Returns the value of the flag, or NULL if the parsing failed.
-static const char* ParseFlagValue(const char* str, const char* flag,
+static const char* ParseFlagValue(const char* str, const char* flag_name,
                                   bool def_optional) {
   // str and flag must not be NULL.
-  if (str == nullptr || flag == nullptr) return nullptr;
+  if (str == nullptr || flag_name == nullptr) return nullptr;
 
   // The flag must start with "--" followed by GTEST_FLAG_PREFIX_.
-  const std::string flag_str = std::string("--") + GTEST_FLAG_PREFIX_ + flag;
+  const std::string flag_str =
+      std::string("--") + GTEST_FLAG_PREFIX_ + flag_name;
   const size_t flag_len = flag_str.length();
   if (strncmp(str, flag_str.c_str(), flag_len) != 0) return nullptr;
 
@@ -6213,9 +6547,9 @@ static const char* ParseFlagValue(const char* str, const char* flag,
 //
 // On success, stores the value of the flag in *value, and returns
 // true.  On failure, returns false without changing *value.
-static bool ParseBoolFlag(const char* str, const char* flag, bool* value) {
+static bool ParseFlag(const char* str, const char* flag_name, bool* value) {
   // Gets the value of the flag as a string.
-  const char* const value_str = ParseFlagValue(str, flag, true);
+  const char* const value_str = ParseFlagValue(str, flag_name, true);
 
   // Aborts if the parsing failed.
   if (value_str == nullptr) return false;
@@ -6229,15 +6563,15 @@ static bool ParseBoolFlag(const char* str, const char* flag, bool* value) {
 //
 // On success, stores the value of the flag in *value, and returns
 // true.  On failure, returns false without changing *value.
-bool ParseInt32Flag(const char* str, const char* flag, int32_t* value) {
+bool ParseFlag(const char* str, const char* flag_name, int32_t* value) {
   // Gets the value of the flag as a string.
-  const char* const value_str = ParseFlagValue(str, flag, false);
+  const char* const value_str = ParseFlagValue(str, flag_name, false);
 
   // Aborts if the parsing failed.
   if (value_str == nullptr) return false;
 
   // Sets *value to the value of the flag.
-  return ParseInt32(Message() << "The value of flag --" << flag, value_str,
+  return ParseInt32(Message() << "The value of flag --" << flag_name, value_str,
                     value);
 }
 
@@ -6246,9 +6580,9 @@ bool ParseInt32Flag(const char* str, const char* flag, int32_t* value) {
 // On success, stores the value of the flag in *value, and returns
 // true.  On failure, returns false without changing *value.
 template <typename String>
-static bool ParseStringFlag(const char* str, const char* flag, String* value) {
+static bool ParseFlag(const char* str, const char* flag_name, String* value) {
   // Gets the value of the flag as a string.
-  const char* const value_str = ParseFlagValue(str, flag, false);
+  const char* const value_str = ParseFlagValue(str, flag_name, false);
 
   // Aborts if the parsing failed.
   if (value_str == nullptr) return false;
@@ -6348,6 +6682,10 @@ static const char kColorEncodedHelpMessage[] =
     "random_seed=@Y[NUMBER]@D\n"
     "      Random number seed to use for shuffling test orders (between 1 and\n"
     "      99999, or 0 to use a seed based on the current time).\n"
+    "  @G--" GTEST_FLAG_PREFIX_
+    "recreate_environments_when_repeating@D\n"
+    "      Sets up and tears down the global test environment on each repeat\n"
+    "      of the test.\n"
     "\n"
     "Test Output:\n"
     "  @G--" GTEST_FLAG_PREFIX_
@@ -6372,7 +6710,7 @@ static const char kColorEncodedHelpMessage[] =
 #endif  // GTEST_CAN_STREAM_RESULTS_
     "\n"
     "Assertion Behavior:\n"
-#if GTEST_HAS_DEATH_TEST && !GTEST_OS_WINDOWS
+#if defined(GTEST_HAS_DEATH_TEST) && !defined(GTEST_OS_WINDOWS)
     "  @G--" GTEST_FLAG_PREFIX_
     "death_test_style=@Y(@Gfast@Y|@Gthreadsafe@Y)@D\n"
     "      Set the default death test style.\n"
@@ -6408,41 +6746,45 @@ static const char kColorEncodedHelpMessage[] =
     "@G<" GTEST_DEV_EMAIL_ ">@D.\n";
 
 static bool ParseGoogleTestFlag(const char* const arg) {
-  return ParseBoolFlag(arg, kAlsoRunDisabledTestsFlag,
-                       &GTEST_FLAG(also_run_disabled_tests)) ||
-         ParseBoolFlag(arg, kBreakOnFailureFlag,
-                       &GTEST_FLAG(break_on_failure)) ||
-         ParseBoolFlag(arg, kCatchExceptionsFlag,
-                       &GTEST_FLAG(catch_exceptions)) ||
-         ParseStringFlag(arg, kColorFlag, &GTEST_FLAG(color)) ||
-         ParseStringFlag(arg, kDeathTestStyleFlag,
-                         &GTEST_FLAG(death_test_style)) ||
-         ParseBoolFlag(arg, kDeathTestUseFork,
-                       &GTEST_FLAG(death_test_use_fork)) ||
-         ParseBoolFlag(arg, kFailFast, &GTEST_FLAG(fail_fast)) ||
-         ParseStringFlag(arg, kFilterFlag, &GTEST_FLAG(filter)) ||
-         ParseStringFlag(arg, kInternalRunDeathTestFlag,
-                         &GTEST_FLAG(internal_run_death_test)) ||
-         ParseBoolFlag(arg, kListTestsFlag, &GTEST_FLAG(list_tests)) ||
-         ParseStringFlag(arg, kOutputFlag, &GTEST_FLAG(output)) ||
-         ParseBoolFlag(arg, kBriefFlag, &GTEST_FLAG(brief)) ||
-         ParseBoolFlag(arg, kPrintTimeFlag, &GTEST_FLAG(print_time)) ||
-         ParseBoolFlag(arg, kPrintUTF8Flag, &GTEST_FLAG(print_utf8)) ||
-         ParseInt32Flag(arg, kRandomSeedFlag, &GTEST_FLAG(random_seed)) ||
-         ParseInt32Flag(arg, kRepeatFlag, &GTEST_FLAG(repeat)) ||
-         ParseBoolFlag(arg, kShuffleFlag, &GTEST_FLAG(shuffle)) ||
-         ParseInt32Flag(arg, kStackTraceDepthFlag,
-                        &GTEST_FLAG(stack_trace_depth)) ||
-         ParseStringFlag(arg, kStreamResultToFlag,
-                         &GTEST_FLAG(stream_result_to)) ||
-         ParseBoolFlag(arg, kThrowOnFailureFlag, &GTEST_FLAG(throw_on_failure));
+#define GTEST_INTERNAL_PARSE_FLAG(flag_name)  \
+  do {                                        \
+    auto value = GTEST_FLAG_GET(flag_name);   \
+    if (ParseFlag(arg, #flag_name, &value)) { \
+      GTEST_FLAG_SET(flag_name, value);       \
+      return true;                            \
+    }                                         \
+  } while (false)
+
+  GTEST_INTERNAL_PARSE_FLAG(also_run_disabled_tests);
+  GTEST_INTERNAL_PARSE_FLAG(break_on_failure);
+  GTEST_INTERNAL_PARSE_FLAG(catch_exceptions);
+  GTEST_INTERNAL_PARSE_FLAG(color);
+  GTEST_INTERNAL_PARSE_FLAG(death_test_style);
+  GTEST_INTERNAL_PARSE_FLAG(death_test_use_fork);
+  GTEST_INTERNAL_PARSE_FLAG(fail_fast);
+  GTEST_INTERNAL_PARSE_FLAG(fail_if_no_test_linked);
+  GTEST_INTERNAL_PARSE_FLAG(filter);
+  GTEST_INTERNAL_PARSE_FLAG(internal_run_death_test);
+  GTEST_INTERNAL_PARSE_FLAG(list_tests);
+  GTEST_INTERNAL_PARSE_FLAG(output);
+  GTEST_INTERNAL_PARSE_FLAG(brief);
+  GTEST_INTERNAL_PARSE_FLAG(print_time);
+  GTEST_INTERNAL_PARSE_FLAG(print_utf8);
+  GTEST_INTERNAL_PARSE_FLAG(random_seed);
+  GTEST_INTERNAL_PARSE_FLAG(repeat);
+  GTEST_INTERNAL_PARSE_FLAG(recreate_environments_when_repeating);
+  GTEST_INTERNAL_PARSE_FLAG(shuffle);
+  GTEST_INTERNAL_PARSE_FLAG(stack_trace_depth);
+  GTEST_INTERNAL_PARSE_FLAG(stream_result_to);
+  GTEST_INTERNAL_PARSE_FLAG(throw_on_failure);
+  return false;
 }
 
-#if GTEST_USE_OWN_FLAGFILE_FLAG_
+#if GTEST_USE_OWN_FLAGFILE_FLAG_ && GTEST_HAS_FILE_SYSTEM
 static void LoadFlagsFromFile(const std::string& path) {
   FILE* flagfile = posix::FOpen(path.c_str(), "r");
   if (!flagfile) {
-    GTEST_LOG_(FATAL) << "Unable to open file \"" << GTEST_FLAG(flagfile)
+    GTEST_LOG_(FATAL) << "Unable to open file \"" << GTEST_FLAG_GET(flagfile)
                       << "\"";
   }
   std::string contents(ReadEntireFile(flagfile));
@@ -6454,49 +6796,47 @@ static void LoadFlagsFromFile(const std::string& path) {
     if (!ParseGoogleTestFlag(lines[i].c_str())) g_help_flag = true;
   }
 }
-#endif  // GTEST_USE_OWN_FLAGFILE_FLAG_
+#endif  // GTEST_USE_OWN_FLAGFILE_FLAG_ && GTEST_HAS_FILE_SYSTEM
 
 // Parses the command line for Google Test flags, without initializing
 // other parts of Google Test.  The type parameter CharType can be
 // instantiated to either char or wchar_t.
 template <typename CharType>
 void ParseGoogleTestFlagsOnlyImpl(int* argc, CharType** argv) {
+  std::string flagfile_value;
   for (int i = 1; i < *argc; i++) {
     const std::string arg_string = StreamableToString(argv[i]);
     const char* const arg = arg_string.c_str();
 
-    using internal::ParseBoolFlag;
-    using internal::ParseInt32Flag;
-    using internal::ParseStringFlag;
+    using internal::ParseFlag;
 
     bool remove_flag = false;
     if (ParseGoogleTestFlag(arg)) {
       remove_flag = true;
-#if GTEST_USE_OWN_FLAGFILE_FLAG_
-    } else if (ParseStringFlag(arg, kFlagfileFlag, &GTEST_FLAG(flagfile))) {
-      LoadFlagsFromFile(GTEST_FLAG(flagfile));
+#if GTEST_USE_OWN_FLAGFILE_FLAG_ && GTEST_HAS_FILE_SYSTEM
+    } else if (ParseFlag(arg, "flagfile", &flagfile_value)) {
+      GTEST_FLAG_SET(flagfile, flagfile_value);
+      LoadFlagsFromFile(flagfile_value);
       remove_flag = true;
-#endif  // GTEST_USE_OWN_FLAGFILE_FLAG_
-    } else if (arg_string == "--help" || arg_string == "-h" ||
-               arg_string == "-?" || arg_string == "/?" ||
-               HasGoogleTestFlagPrefix(arg)) {
+#endif  // GTEST_USE_OWN_FLAGFILE_FLAG_ && GTEST_HAS_FILE_SYSTEM
+    } else if (arg_string == "--help" || HasGoogleTestFlagPrefix(arg)) {
       // Both help flag and unrecognized Google Test flags (excluding
       // internal ones) trigger help display.
       g_help_flag = true;
     }
 
     if (remove_flag) {
-      // Shift the remainder of the argv list left by one.  Note
-      // that argv has (*argc + 1) elements, the last one always being
-      // NULL.  The following loop moves the trailing NULL element as
-      // well.
-      for (int j = i; j != *argc; j++) {
-        argv[j] = argv[j + 1];
+      // Shift the remainder of the argv list left by one.
+      for (int j = i + 1; j < *argc; ++j) {
+        argv[j - 1] = argv[j];
       }
 
       // Decrements the argument count.
       (*argc)--;
 
+      // Terminate the array with nullptr.
+      argv[*argc] = nullptr;
+
       // We also need to decrement the iterator as we just removed
       // an element.
       i--;
@@ -6512,14 +6852,68 @@ void ParseGoogleTestFlagsOnlyImpl(int* argc, CharType** argv) {
 }
 
 // Parses the command line for Google Test flags, without initializing
-// other parts of Google Test.
+// other parts of Google Test. This function updates argc and argv by removing
+// flags that are known to GoogleTest (including other user flags defined using
+// ABSL_FLAG if GoogleTest is built with GTEST_USE_ABSL). Other arguments
+// remain in place. Unrecognized flags are not reported and do not cause the
+// program to exit.
 void ParseGoogleTestFlagsOnly(int* argc, char** argv) {
+#ifdef GTEST_HAS_ABSL_FLAGS
+  if (*argc <= 0) return;
+
+  std::vector<char*> positional_args;
+  std::vector<absl::UnrecognizedFlag> unrecognized_flags;
+  absl::ParseAbseilFlagsOnly(*argc, argv, positional_args, unrecognized_flags);
+  absl::flat_hash_set<absl::string_view> unrecognized;
+  for (const auto& flag : unrecognized_flags) {
+    unrecognized.insert(flag.flag_name);
+  }
+  absl::flat_hash_set<char*> positional;
+  for (const auto& arg : positional_args) {
+    positional.insert(arg);
+  }
+
+  int out_pos = 1;
+  int in_pos = 1;
+  for (; in_pos < *argc; ++in_pos) {
+    char* arg = argv[in_pos];
+    absl::string_view arg_str(arg);
+    if (absl::ConsumePrefix(&arg_str, "--")) {
+      // Flag-like argument. If the flag was unrecognized, keep it.
+      // If it was a GoogleTest flag, remove it.
+      if (unrecognized.contains(arg_str)) {
+        argv[out_pos++] = argv[in_pos];
+        continue;
+      }
+    }
+
+    if (arg_str.empty()) {
+      ++in_pos;
+      break;  // '--' indicates that the rest of the arguments are positional
+    }
+
+    // Probably a positional argument. If it is in fact positional, keep it.
+    // If it was a value for the flag argument, remove it.
+    if (positional.contains(arg)) {
+      argv[out_pos++] = arg;
+    }
+  }
+
+  // The rest are positional args for sure.
+  while (in_pos < *argc) {
+    argv[out_pos++] = argv[in_pos++];
+  }
+
+  *argc = out_pos;
+  argv[out_pos] = nullptr;
+#else
   ParseGoogleTestFlagsOnlyImpl(argc, argv);
+#endif
 
   // Fix the value of *_NSGetArgc() on macOS, but if and only if
   // *_NSGetArgv() == argv
   // Only applicable to char** version of argv
-#if GTEST_OS_MAC
+#ifdef GTEST_OS_MAC
 #ifndef GTEST_OS_IOS
   if (*_NSGetArgv() == argv) {
     *_NSGetArgc() = *argc;
@@ -6547,8 +6941,16 @@ void InitGoogleTestImpl(int* argc, CharType** argv) {
     g_argvs.push_back(StreamableToString(argv[i]));
   }
 
-#if GTEST_HAS_ABSL
+#ifdef GTEST_HAS_ABSL
   absl::InitializeSymbolizer(g_argvs[0].c_str());
+
+#ifdef GTEST_HAS_ABSL_FLAGS
+  // When using the Abseil Flags library, set the program usage message to the
+  // help message, but remove the color-encoding from the message first.
+  absl::SetProgramUsageMessage(absl::StrReplaceAll(
+      kColorEncodedHelpMessage,
+      {{"@D", ""}, {"@R", ""}, {"@G", ""}, {"@Y", ""}, {"@@", "@"}}));
+#endif  // GTEST_HAS_ABSL_FLAGS
 #endif  // GTEST_HAS_ABSL
 
   ParseGoogleTestFlagsOnly(argc, argv);
@@ -6600,38 +7002,65 @@ void InitGoogleTest() {
 #endif  // defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
 }
 
+#if !defined(GTEST_CUSTOM_TEMPDIR_FUNCTION_) || \
+    !defined(GTEST_CUSTOM_SRCDIR_FUNCTION_)
+// Returns the value of the first environment variable that is set and contains
+// a non-empty string. If there are none, returns the "fallback" string. Adds
+// the director-separator character as a suffix if not provided in the
+// environment variable value.
+static std::string GetDirFromEnv(
+    std::initializer_list<const char*> environment_variables,
+    const char* fallback, char separator) {
+  for (const char* variable_name : environment_variables) {
+    const char* value = internal::posix::GetEnv(variable_name);
+    if (value != nullptr && value[0] != '\0') {
+      if (value[strlen(value) - 1] != separator) {
+        return std::string(value).append(1, separator);
+      }
+      return value;
+    }
+  }
+  return fallback;
+}
+#endif
+
 std::string TempDir() {
 #if defined(GTEST_CUSTOM_TEMPDIR_FUNCTION_)
   return GTEST_CUSTOM_TEMPDIR_FUNCTION_();
-#elif GTEST_OS_WINDOWS_MOBILE
-  return "\\temp\\";
-#elif GTEST_OS_WINDOWS
-  const char* temp_dir = internal::posix::GetEnv("TEMP");
-  if (temp_dir == nullptr || temp_dir[0] == '\0') {
-    return "\\temp\\";
-  } else if (temp_dir[strlen(temp_dir) - 1] == '\\') {
-    return temp_dir;
-  } else {
-    return std::string(temp_dir) + "\\";
-  }
-#elif GTEST_OS_LINUX_ANDROID
-  const char* temp_dir = internal::posix::GetEnv("TEST_TMPDIR");
-  if (temp_dir == nullptr || temp_dir[0] == '\0') {
-    return "/data/local/tmp/";
-  } else {
-    return temp_dir;
-  }
-#elif GTEST_OS_LINUX
-  const char* temp_dir = internal::posix::GetEnv("TEST_TMPDIR");
-  if (temp_dir == nullptr || temp_dir[0] == '\0') {
-    return "/tmp/";
-  } else {
-    return temp_dir;
-  }
+#elif defined(GTEST_OS_WINDOWS) || defined(GTEST_OS_WINDOWS_MOBILE)
+  return GetDirFromEnv({"TEST_TMPDIR", "TEMP"}, "\\temp\\", '\\');
+#elif defined(GTEST_OS_LINUX_ANDROID)
+  return GetDirFromEnv({"TEST_TMPDIR", "TMPDIR"}, "/data/local/tmp/", '/');
 #else
-  return "/tmp/";
-#endif  // GTEST_OS_WINDOWS_MOBILE
+  return GetDirFromEnv({"TEST_TMPDIR", "TMPDIR"}, "/tmp/", '/');
+#endif
+}
+
+#if GTEST_HAS_FILE_SYSTEM && !defined(GTEST_CUSTOM_SRCDIR_FUNCTION_)
+// Returns the directory path (including terminating separator) of the current
+// executable as derived from argv[0].
+static std::string GetCurrentExecutableDirectory() {
+  internal::FilePath argv_0(internal::GetArgvs()[0]);
+  return argv_0.RemoveFileName().string();
 }
+#endif
+
+#if GTEST_HAS_FILE_SYSTEM
+std::string SrcDir() {
+#if defined(GTEST_CUSTOM_SRCDIR_FUNCTION_)
+  return GTEST_CUSTOM_SRCDIR_FUNCTION_();
+#elif defined(GTEST_OS_WINDOWS) || defined(GTEST_OS_WINDOWS_MOBILE)
+  return GetDirFromEnv({"TEST_SRCDIR"}, GetCurrentExecutableDirectory().c_str(),
+                       '\\');
+#elif defined(GTEST_OS_LINUX_ANDROID)
+  return GetDirFromEnv({"TEST_SRCDIR"}, GetCurrentExecutableDirectory().c_str(),
+                       '/');
+#else
+  return GetDirFromEnv({"TEST_SRCDIR"}, GetCurrentExecutableDirectory().c_str(),
+                       '/');
+#endif
+}
+#endif
 
 // Class ScopedTrace
 
diff --git a/external/googletest/googletest/src/gtest_main.cc b/external/googletest/googletest/src/gtest_main.cc
index 44976375..8141caf4 100644
--- a/external/googletest/googletest/src/gtest_main.cc
+++ b/external/googletest/googletest/src/gtest_main.cc
@@ -31,19 +31,32 @@
 
 #include "gtest/gtest.h"
 
-#if GTEST_OS_ESP8266 || GTEST_OS_ESP32
-#if GTEST_OS_ESP8266
+#if defined(GTEST_OS_ESP8266) || defined(GTEST_OS_ESP32) || \
+    (defined(GTEST_OS_NRF52) && defined(ARDUINO))
+// Arduino-like platforms: program entry points are setup/loop instead of main.
+
+#ifdef GTEST_OS_ESP8266
 extern "C" {
 #endif
+
 void setup() { testing::InitGoogleTest(); }
 
 void loop() { RUN_ALL_TESTS(); }
 
-#if GTEST_OS_ESP8266
+#ifdef GTEST_OS_ESP8266
 }
 #endif
 
+#elif defined(GTEST_OS_QURT)
+// QuRT: program entry point is main, but argc/argv are unusable.
+
+GTEST_API_ int main() {
+  printf("Running main() from %s\n", __FILE__);
+  testing::InitGoogleTest();
+  return RUN_ALL_TESTS();
+}
 #else
+// Normal platforms: program entry point is main, argc/argv are initialized.
 
 GTEST_API_ int main(int argc, char **argv) {
   printf("Running main() from %s\n", __FILE__);
diff --git a/external/googletest/googletest/test/BUILD.bazel b/external/googletest/googletest/test/BUILD.bazel
index b06a00a1..c561ef8b 100644
--- a/external/googletest/googletest/test/BUILD.bazel
+++ b/external/googletest/googletest/test/BUILD.bazel
@@ -30,7 +30,6 @@
 #
 # Bazel BUILD for The Google C++ Testing Framework (Google Test)
 
-load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_test")
 load("@rules_python//python:defs.bzl", "py_library", "py_test")
 
 licenses(["notice"])
@@ -46,35 +45,38 @@ cc_test(
             "gtest-*.cc",
             "googletest-*.cc",
             "*.h",
-            "googletest/include/gtest/**/*.h",
         ],
         exclude = [
-            "gtest-unittest-api_test.cc",
-            "googletest/src/gtest-all.cc",
-            "gtest_all_test.cc",
-            "gtest-death-test_ex_test.cc",
-            "gtest-listener_test.cc",
-            "gtest-unittest-api_test.cc",
-            "googletest-param-test-test.cc",
-            "googletest-param-test2-test.cc",
+            # go/keep-sorted start
+            "googletest-break-on-failure-unittest_.cc",
             "googletest-catch-exceptions-test_.cc",
             "googletest-color-test_.cc",
+            "googletest-death-test_ex_test.cc",
             "googletest-env-var-test_.cc",
+            "googletest-fail-if-no-test-linked-test-with-disabled-test_.cc",
+            "googletest-fail-if-no-test-linked-test-with-enabled-test_.cc",
             "googletest-failfast-unittest_.cc",
             "googletest-filter-unittest_.cc",
             "googletest-global-environment-unittest_.cc",
-            "googletest-break-on-failure-unittest_.cc",
+            "googletest-list-tests-unittest_.cc",
             "googletest-listener-test.cc",
+            "googletest-message-test.cc",
             "googletest-output-test_.cc",
-            "googletest-list-tests-unittest_.cc",
-            "googletest-shuffle-test_.cc",
-            "googletest-setuptestsuite-test_.cc",
-            "googletest-uninitialized-test_.cc",
-            "googletest-death-test_ex_test.cc",
-            "googletest-param-test-test",
-            "googletest-throw-on-failure-test_.cc",
             "googletest-param-test-invalid-name1-test_.cc",
             "googletest-param-test-invalid-name2-test_.cc",
+            "googletest-param-test-test",
+            "googletest-param-test-test.cc",
+            "googletest-param-test2-test.cc",
+            "googletest-setuptestsuite-test_.cc",
+            "googletest-shuffle-test_.cc",
+            "googletest-throw-on-failure-test_.cc",
+            "googletest-uninitialized-test_.cc",
+            "googletest/src/gtest-all.cc",
+            "gtest-death-test_ex_test.cc",
+            "gtest-listener_test.cc",
+            "gtest-unittest-api_test.cc",
+            "gtest_all_test.cc",
+            # go/keep-sorted end
         ],
     ) + select({
         "//:windows": [],
@@ -95,6 +97,7 @@ cc_test(
         "googletest/test",
     ],
     linkopts = select({
+        "//:qnx": [],
         "//:windows": [],
         "//conditions:default": ["-pthread"],
     }),
@@ -174,6 +177,10 @@ py_test(
     name = "gtest_help_test",
     size = "small",
     srcs = ["gtest_help_test.py"],
+    args = select({
+        "//:has_absl": ["--has_absl_flags"],
+        "//conditions:default": [],
+    }),
     data = [":gtest_help_test_"],
     deps = [":gtest_test_utils"],
 )
@@ -319,6 +326,26 @@ cc_binary(
     deps = ["//:gtest"],
 )
 
+cc_binary(
+    name = "googletest-fail-if-no-test-linked-test-without-test_",
+    testonly = 1,
+    deps = ["//:gtest_main"],
+)
+
+cc_binary(
+    name = "googletest-fail-if-no-test-linked-test-with-disabled-test_",
+    testonly = 1,
+    srcs = ["googletest-fail-if-no-test-linked-test-with-disabled-test_.cc"],
+    deps = ["//:gtest_main"],
+)
+
+cc_binary(
+    name = "googletest-fail-if-no-test-linked-test-with-enabled-test_",
+    testonly = 1,
+    srcs = ["googletest-fail-if-no-test-linked-test-with-enabled-test_.cc"],
+    deps = ["//:gtest_main"],
+)
+
 cc_test(
     name = "gtest_skip_test",
     size = "small",
@@ -359,6 +386,18 @@ py_test(
     deps = [":gtest_test_utils"],
 )
 
+py_test(
+    name = "googletest-fail-if-no-test-linked-test",
+    size = "small",
+    srcs = ["googletest-fail-if-no-test-linked-test.py"],
+    data = [
+        ":googletest-fail-if-no-test-linked-test-with-disabled-test_",
+        ":googletest-fail-if-no-test-linked-test-with-enabled-test_",
+        ":googletest-fail-if-no-test-linked-test-without-test_",
+    ],
+    deps = [":gtest_test_utils"],
+)
+
 cc_binary(
     name = "googletest-shuffle-test_",
     srcs = ["googletest-shuffle-test_.cc"],
diff --git a/external/googletest/googletest/test/googletest-break-on-failure-unittest.py b/external/googletest/googletest/test/googletest-break-on-failure-unittest.py
old mode 100644
new mode 100755
index e58271f0..e314b5cc
--- a/external/googletest/googletest/test/googletest-break-on-failure-unittest.py
+++ b/external/googletest/googletest/test/googletest-break-on-failure-unittest.py
@@ -39,7 +39,7 @@
 """
 
 import os
-import gtest_test_utils
+from googletest.test import gtest_test_utils
 
 # Constants.
 
@@ -59,7 +59,9 @@
 
 # Path to the googletest-break-on-failure-unittest_ program.
 EXE_PATH = gtest_test_utils.GetTestExecutablePath(
-    'googletest-break-on-failure-unittest_')
+    'googletest-break-on-failure-unittest_'
+)
+
 
 environ = gtest_test_utils.environ
 SetEnvVar = gtest_test_utils.SetEnvVar
@@ -73,135 +75,121 @@
 
 
 def Run(command):
-    """Runs a command; returns 1 if it was killed by a signal, or 0 otherwise."""
+  """Runs a command; returns 1 if it was killed by a signal, or 0 otherwise."""
 
-    p = gtest_test_utils.Subprocess(command, env=environ)
-    if p.terminated_by_signal:
-        return 1
-    else:
-        return 0
+  p = gtest_test_utils.Subprocess(command, env=environ)
+  if p.terminated_by_signal:
+    return 1
+  else:
+    return 0
 
 
 # The tests.
 
 
 class GTestBreakOnFailureUnitTest(gtest_test_utils.TestCase):
-    """Tests using the GTEST_BREAK_ON_FAILURE environment variable or
-    the --gtest_break_on_failure flag to turn assertion failures into
-    segmentation faults.
+  """Unit test for Google Test's break-on-failure mode.
+
+  Tests using the GTEST_BREAK_ON_FAILURE environment variable or
+  the --gtest_break_on_failure flag to turn assertion failures into
+  segmentation faults.
+  """
+
+  def RunAndVerify(self, env_var_value, flag_value, expect_seg_fault):
+    """Runs googletest-break-on-failure-unittest_ and verifies its behavior.
+
+    Runs googletest-break-on-failure-unittest_ and verifies that it does
+    (or does not) have a seg-fault.
+
+    Args:
+      env_var_value:    value of the GTEST_BREAK_ON_FAILURE environment
+        variable; None if the variable should be unset.
+      flag_value:       value of the --gtest_break_on_failure flag; None if the
+        flag should not be present.
+      expect_seg_fault: 1 if the program is expected to generate a seg-fault; 0
+        otherwise.
     """
 
-    def RunAndVerify(self, env_var_value, flag_value, expect_seg_fault):
-        """Runs googletest-break-on-failure-unittest_ and verifies that it does
-        (or does not) have a seg-fault.
-
-        Args:
-          env_var_value:    value of the GTEST_BREAK_ON_FAILURE environment
-                            variable; None if the variable should be unset.
-          flag_value:       value of the --gtest_break_on_failure flag;
-                            None if the flag should not be present.
-          expect_seg_fault: 1 if the program is expected to generate a seg-fault;
-                            0 otherwise.
-        """
-
-        SetEnvVar(BREAK_ON_FAILURE_ENV_VAR, env_var_value)
-
-        if env_var_value is None:
-            env_var_value_msg = ' is not set'
-        else:
-            env_var_value_msg = '=' + env_var_value
-
-        if flag_value is None:
-            flag = ''
-        elif flag_value == '0':
-            flag = '--%s=0' % BREAK_ON_FAILURE_FLAG
-        else:
-            flag = '--%s' % BREAK_ON_FAILURE_FLAG
-
-        command = [EXE_PATH]
-        if flag:
-            command.append(flag)
-
-        if expect_seg_fault:
-            should_or_not = 'should'
-        else:
-            should_or_not = 'should not'
-
-        has_seg_fault = Run(command)
-
-        SetEnvVar(BREAK_ON_FAILURE_ENV_VAR, None)
-
-        msg = ('when %s%s, an assertion failure in "%s" %s cause a seg-fault.' %
-               (BREAK_ON_FAILURE_ENV_VAR, env_var_value_msg, ' '.join(command),
-                should_or_not))
-        self.assert_(has_seg_fault == expect_seg_fault, msg)
-
-    def testDefaultBehavior(self):
-        """Tests the behavior of the default mode."""
-
-        self.RunAndVerify(env_var_value=None,
-                          flag_value=None,
-                          expect_seg_fault=0)
-
-    def testEnvVar(self):
-        """Tests using the GTEST_BREAK_ON_FAILURE environment variable."""
-
-        self.RunAndVerify(env_var_value='0',
-                          flag_value=None,
-                          expect_seg_fault=0)
-        self.RunAndVerify(env_var_value='1',
-                          flag_value=None,
-                          expect_seg_fault=1)
-
-    def testFlag(self):
-        """Tests using the --gtest_break_on_failure flag."""
-
-        self.RunAndVerify(env_var_value=None,
-                          flag_value='0',
-                          expect_seg_fault=0)
-        self.RunAndVerify(env_var_value=None,
-                          flag_value='1',
-                          expect_seg_fault=1)
-
-    def testFlagOverridesEnvVar(self):
-        """Tests that the flag overrides the environment variable."""
-
-        self.RunAndVerify(env_var_value='0',
-                          flag_value='0',
-                          expect_seg_fault=0)
-        self.RunAndVerify(env_var_value='0',
-                          flag_value='1',
-                          expect_seg_fault=1)
-        self.RunAndVerify(env_var_value='1',
-                          flag_value='0',
-                          expect_seg_fault=0)
-        self.RunAndVerify(env_var_value='1',
-                          flag_value='1',
-                          expect_seg_fault=1)
-
-    def testBreakOnFailureOverridesThrowOnFailure(self):
-        """Tests that gtest_break_on_failure overrides gtest_throw_on_failure."""
-
-        SetEnvVar(THROW_ON_FAILURE_ENV_VAR, '1')
-        try:
-            self.RunAndVerify(env_var_value=None,
-                              flag_value='1',
-                              expect_seg_fault=1)
-        finally:
-            SetEnvVar(THROW_ON_FAILURE_ENV_VAR, None)
-
-    if IS_WINDOWS:
-        def testCatchExceptionsDoesNotInterfere(self):
-            """Tests that gtest_catch_exceptions doesn't interfere."""
-
-            SetEnvVar(CATCH_EXCEPTIONS_ENV_VAR, '1')
-            try:
-                self.RunAndVerify(env_var_value='1',
-                                  flag_value='1',
-                                  expect_seg_fault=1)
-            finally:
-                SetEnvVar(CATCH_EXCEPTIONS_ENV_VAR, None)
+    SetEnvVar(BREAK_ON_FAILURE_ENV_VAR, env_var_value)
+
+    if env_var_value is None:
+      env_var_value_msg = ' is not set'
+    else:
+      env_var_value_msg = '=' + env_var_value
+
+    if flag_value is None:
+      flag = ''
+    elif flag_value == '0':
+      flag = '--%s=0' % BREAK_ON_FAILURE_FLAG
+    else:
+      flag = '--%s' % BREAK_ON_FAILURE_FLAG
+
+    command = [EXE_PATH]
+    if flag:
+      command.append(flag)
+
+    if expect_seg_fault:
+      should_or_not = 'should'
+    else:
+      should_or_not = 'should not'
+
+    has_seg_fault = Run(command)
+
+    SetEnvVar(BREAK_ON_FAILURE_ENV_VAR, None)
+
+    msg = 'when %s%s, an assertion failure in "%s" %s cause a seg-fault.' % (
+        BREAK_ON_FAILURE_ENV_VAR,
+        env_var_value_msg,
+        ' '.join(command),
+        should_or_not,
+    )
+    self.assertTrue(has_seg_fault == expect_seg_fault, msg)
+
+  def testDefaultBehavior(self):
+    """Tests the behavior of the default mode."""
+
+    self.RunAndVerify(env_var_value=None, flag_value=None, expect_seg_fault=0)
+
+  def testEnvVar(self):
+    """Tests using the GTEST_BREAK_ON_FAILURE environment variable."""
+
+    self.RunAndVerify(env_var_value='0', flag_value=None, expect_seg_fault=0)
+    self.RunAndVerify(env_var_value='1', flag_value=None, expect_seg_fault=1)
+
+  def testFlag(self):
+    """Tests using the --gtest_break_on_failure flag."""
+
+    self.RunAndVerify(env_var_value=None, flag_value='0', expect_seg_fault=0)
+    self.RunAndVerify(env_var_value=None, flag_value='1', expect_seg_fault=1)
+
+  def testFlagOverridesEnvVar(self):
+    """Tests that the flag overrides the environment variable."""
+
+    self.RunAndVerify(env_var_value='0', flag_value='0', expect_seg_fault=0)
+    self.RunAndVerify(env_var_value='0', flag_value='1', expect_seg_fault=1)
+    self.RunAndVerify(env_var_value='1', flag_value='0', expect_seg_fault=0)
+    self.RunAndVerify(env_var_value='1', flag_value='1', expect_seg_fault=1)
+
+  def testBreakOnFailureOverridesThrowOnFailure(self):
+    """Tests that gtest_break_on_failure overrides gtest_throw_on_failure."""
+
+    SetEnvVar(THROW_ON_FAILURE_ENV_VAR, '1')
+    try:
+      self.RunAndVerify(env_var_value=None, flag_value='1', expect_seg_fault=1)
+    finally:
+      SetEnvVar(THROW_ON_FAILURE_ENV_VAR, None)
+
+  if IS_WINDOWS:
+
+    def testCatchExceptionsDoesNotInterfere(self):
+      """Tests that gtest_catch_exceptions doesn't interfere."""
+
+      SetEnvVar(CATCH_EXCEPTIONS_ENV_VAR, '1')
+      try:
+        self.RunAndVerify(env_var_value='1', flag_value='1', expect_seg_fault=1)
+      finally:
+        SetEnvVar(CATCH_EXCEPTIONS_ENV_VAR, None)
 
 
 if __name__ == '__main__':
-    gtest_test_utils.Main()
+  gtest_test_utils.Main()
diff --git a/external/googletest/googletest/test/googletest-break-on-failure-unittest_.cc b/external/googletest/googletest/test/googletest-break-on-failure-unittest_.cc
index 324294f3..337e34c3 100644
--- a/external/googletest/googletest/test/googletest-break-on-failure-unittest_.cc
+++ b/external/googletest/googletest/test/googletest-break-on-failure-unittest_.cc
@@ -39,7 +39,7 @@
 
 #include "gtest/gtest.h"
 
-#if GTEST_OS_WINDOWS
+#ifdef GTEST_OS_WINDOWS
 #include <stdlib.h>
 #include <windows.h>
 #endif
@@ -49,7 +49,7 @@ namespace {
 // A test that's expected to fail.
 TEST(Foo, Bar) { EXPECT_EQ(2, 3); }
 
-#if GTEST_HAS_SEH && !GTEST_OS_WINDOWS_MOBILE
+#if GTEST_HAS_SEH && !defined(GTEST_OS_WINDOWS_MOBILE)
 // On Windows Mobile global exception handlers are not supported.
 LONG WINAPI
 ExitWithExceptionCode(struct _EXCEPTION_POINTERS* exception_pointers) {
@@ -60,12 +60,12 @@ ExitWithExceptionCode(struct _EXCEPTION_POINTERS* exception_pointers) {
 }  // namespace
 
 int main(int argc, char** argv) {
-#if GTEST_OS_WINDOWS
+#ifdef GTEST_OS_WINDOWS
   // Suppresses display of the Windows error dialog upon encountering
   // a general protection fault (segment violation).
   SetErrorMode(SEM_NOGPFAULTERRORBOX | SEM_FAILCRITICALERRORS);
 
-#if GTEST_HAS_SEH && !GTEST_OS_WINDOWS_MOBILE
+#if GTEST_HAS_SEH && !defined(GTEST_OS_WINDOWS_MOBILE)
 
   // The default unhandled exception filter does not always exit
   // with the exception code as exit code - for example it exits with
diff --git a/external/googletest/googletest/test/googletest-catch-exceptions-test.py b/external/googletest/googletest/test/googletest-catch-exceptions-test.py
old mode 100644
new mode 100755
index c03f0457..180e18de
--- a/external/googletest/googletest/test/googletest-catch-exceptions-test.py
+++ b/external/googletest/googletest/test/googletest-catch-exceptions-test.py
@@ -35,7 +35,7 @@
 Google Test) and verifies their output.
 """
 
-import gtest_test_utils
+from googletest.test import gtest_test_utils
 
 # Constants.
 FLAG_PREFIX = '--gtest_'
@@ -46,12 +46,14 @@
 # Path to the googletest-catch-exceptions-ex-test_ binary, compiled with
 # exceptions enabled.
 EX_EXE_PATH = gtest_test_utils.GetTestExecutablePath(
-    'googletest-catch-exceptions-ex-test_')
+    'googletest-catch-exceptions-ex-test_'
+)
 
 # Path to the googletest-catch-exceptions-test_ binary, compiled with
 # exceptions disabled.
 EXE_PATH = gtest_test_utils.GetTestExecutablePath(
-    'googletest-catch-exceptions-no-ex-test_')
+    'googletest-catch-exceptions-no-ex-test_'
+)
 
 environ = gtest_test_utils.environ
 SetEnvVar = gtest_test_utils.SetEnvVar
@@ -64,170 +66,250 @@
 SetEnvVar(gtest_test_utils.PREMATURE_EXIT_FILE_ENV_VAR, None)
 
 TEST_LIST = gtest_test_utils.Subprocess(
-    [EXE_PATH, LIST_TESTS_FLAG], env=environ).output
+    [EXE_PATH, LIST_TESTS_FLAG], env=environ
+).output
 
 SUPPORTS_SEH_EXCEPTIONS = 'ThrowsSehException' in TEST_LIST
 
 if SUPPORTS_SEH_EXCEPTIONS:
-    BINARY_OUTPUT = gtest_test_utils.Subprocess([EXE_PATH], env=environ).output
+  BINARY_OUTPUT = gtest_test_utils.Subprocess([EXE_PATH], env=environ).output
 
 EX_BINARY_OUTPUT = gtest_test_utils.Subprocess(
-    [EX_EXE_PATH], env=environ).output
+    [EX_EXE_PATH], env=environ
+).output
+
 
 # The tests.
 if SUPPORTS_SEH_EXCEPTIONS:
-    # pylint:disable-msg=C6302
-    class CatchSehExceptionsTest(gtest_test_utils.TestCase):
-        """Tests exception-catching behavior."""
-
-        def TestSehExceptions(self, test_output):
-            self.assert_('SEH exception with code 0x2a thrown '
-                         'in the test fixture\'s constructor'
-                         in test_output)
-            self.assert_('SEH exception with code 0x2a thrown '
-                         'in the test fixture\'s destructor'
-                         in test_output)
-            self.assert_('SEH exception with code 0x2a thrown in SetUpTestSuite()'
-                         in test_output)
-            self.assert_('SEH exception with code 0x2a thrown in TearDownTestSuite()'
-                         in test_output)
-            self.assert_('SEH exception with code 0x2a thrown in SetUp()'
-                         in test_output)
-            self.assert_('SEH exception with code 0x2a thrown in TearDown()'
-                         in test_output)
-            self.assert_('SEH exception with code 0x2a thrown in the test body'
-                         in test_output)
-
-        def testCatchesSehExceptionsWithCxxExceptionsEnabled(self):
-            self.TestSehExceptions(EX_BINARY_OUTPUT)
-
-        def testCatchesSehExceptionsWithCxxExceptionsDisabled(self):
-            self.TestSehExceptions(BINARY_OUTPUT)
+
+  class CatchSehExceptionsTest(gtest_test_utils.TestCase):
+    """Tests exception-catching behavior."""
+
+    def TestSehExceptions(self, test_output):
+      self.assertIn(
+          (
+              'SEH exception with code 0x2a thrown '
+              "in the test fixture's constructor"
+          ),
+          test_output,
+      )
+      self.assertIn(
+          (
+              'SEH exception with code 0x2a thrown '
+              "in the test fixture's destructor"
+          ),
+          test_output,
+      )
+      self.assertIn(
+          'SEH exception with code 0x2a thrown in SetUpTestSuite()', test_output
+      )
+      self.assertIn(
+          'SEH exception with code 0x2a thrown in TearDownTestSuite()',
+          test_output,
+      )
+      self.assertIn(
+          'SEH exception with code 0x2a thrown in SetUp()', test_output
+      )
+      self.assertIn(
+          'SEH exception with code 0x2a thrown in TearDown()', test_output
+      )
+      self.assertIn(
+          'SEH exception with code 0x2a thrown in the test body', test_output
+      )
+
+    def testCatchesSehExceptionsWithCxxExceptionsEnabled(self):
+      self.TestSehExceptions(EX_BINARY_OUTPUT)
+
+    def testCatchesSehExceptionsWithCxxExceptionsDisabled(self):
+      self.TestSehExceptions(BINARY_OUTPUT)
 
 
 class CatchCxxExceptionsTest(gtest_test_utils.TestCase):
-    """Tests C++ exception-catching behavior.
-
-       Tests in this test case verify that:
-       * C++ exceptions are caught and logged as C++ (not SEH) exceptions
-       * Exception thrown affect the remainder of the test work flow in the
-         expected manner.
-    """
-
-    def testCatchesCxxExceptionsInFixtureConstructor(self):
-        self.assertTrue(
-            'C++ exception with description '
-            '"Standard C++ exception" thrown '
-            'in the test fixture\'s constructor' in EX_BINARY_OUTPUT,
-            EX_BINARY_OUTPUT)
-        self.assert_('unexpected' not in EX_BINARY_OUTPUT,
-                     'This failure belongs in this test only if '
-                     '"CxxExceptionInConstructorTest" (no quotes) '
-                     'appears on the same line as words "called unexpectedly"')
-
-    if ('CxxExceptionInDestructorTest.ThrowsExceptionInDestructor' in
-            EX_BINARY_OUTPUT):
-        def testCatchesCxxExceptionsInFixtureDestructor(self):
-            self.assertTrue(
-                'C++ exception with description '
-                '"Standard C++ exception" thrown '
-                'in the test fixture\'s destructor' in EX_BINARY_OUTPUT,
-                EX_BINARY_OUTPUT)
-            self.assertTrue(
-                'CxxExceptionInDestructorTest::TearDownTestSuite() '
-                'called as expected.' in EX_BINARY_OUTPUT, EX_BINARY_OUTPUT)
-
-    def testCatchesCxxExceptionsInSetUpTestCase(self):
-        self.assertTrue(
-            'C++ exception with description "Standard C++ exception"'
-            ' thrown in SetUpTestSuite()' in EX_BINARY_OUTPUT, EX_BINARY_OUTPUT)
-        self.assertTrue(
-            'CxxExceptionInConstructorTest::TearDownTestSuite() '
-            'called as expected.' in EX_BINARY_OUTPUT, EX_BINARY_OUTPUT)
-        self.assertTrue(
-            'CxxExceptionInSetUpTestSuiteTest constructor '
-            'called as expected.' in EX_BINARY_OUTPUT, EX_BINARY_OUTPUT)
-        self.assertTrue(
-            'CxxExceptionInSetUpTestSuiteTest destructor '
-            'called as expected.' in EX_BINARY_OUTPUT, EX_BINARY_OUTPUT)
-        self.assertTrue(
-            'CxxExceptionInSetUpTestSuiteTest::SetUp() '
-            'called as expected.' in EX_BINARY_OUTPUT, EX_BINARY_OUTPUT)
-        self.assertTrue(
-            'CxxExceptionInSetUpTestSuiteTest::TearDown() '
-            'called as expected.' in EX_BINARY_OUTPUT, EX_BINARY_OUTPUT)
-        self.assertTrue(
-            'CxxExceptionInSetUpTestSuiteTest test body '
-            'called as expected.' in EX_BINARY_OUTPUT, EX_BINARY_OUTPUT)
-
-    def testCatchesCxxExceptionsInTearDownTestCase(self):
-        self.assertTrue(
-            'C++ exception with description "Standard C++ exception"'
-            ' thrown in TearDownTestSuite()' in EX_BINARY_OUTPUT, EX_BINARY_OUTPUT)
-
-    def testCatchesCxxExceptionsInSetUp(self):
-        self.assertTrue(
-            'C++ exception with description "Standard C++ exception"'
-            ' thrown in SetUp()' in EX_BINARY_OUTPUT, EX_BINARY_OUTPUT)
-        self.assertTrue(
-            'CxxExceptionInSetUpTest::TearDownTestSuite() '
-            'called as expected.' in EX_BINARY_OUTPUT, EX_BINARY_OUTPUT)
-        self.assertTrue(
-            'CxxExceptionInSetUpTest destructor '
-            'called as expected.' in EX_BINARY_OUTPUT, EX_BINARY_OUTPUT)
-        self.assertTrue(
-            'CxxExceptionInSetUpTest::TearDown() '
-            'called as expected.' in EX_BINARY_OUTPUT, EX_BINARY_OUTPUT)
-        self.assert_('unexpected' not in EX_BINARY_OUTPUT,
-                     'This failure belongs in this test only if '
-                     '"CxxExceptionInSetUpTest" (no quotes) '
-                     'appears on the same line as words "called unexpectedly"')
-
-    def testCatchesCxxExceptionsInTearDown(self):
-        self.assertTrue(
-            'C++ exception with description "Standard C++ exception"'
-            ' thrown in TearDown()' in EX_BINARY_OUTPUT, EX_BINARY_OUTPUT)
-        self.assertTrue(
-            'CxxExceptionInTearDownTest::TearDownTestSuite() '
-            'called as expected.' in EX_BINARY_OUTPUT, EX_BINARY_OUTPUT)
-        self.assertTrue(
-            'CxxExceptionInTearDownTest destructor '
-            'called as expected.' in EX_BINARY_OUTPUT, EX_BINARY_OUTPUT)
-
-    def testCatchesCxxExceptionsInTestBody(self):
-        self.assertTrue(
-            'C++ exception with description "Standard C++ exception"'
-            ' thrown in the test body' in EX_BINARY_OUTPUT, EX_BINARY_OUTPUT)
-        self.assertTrue(
-            'CxxExceptionInTestBodyTest::TearDownTestSuite() '
-            'called as expected.' in EX_BINARY_OUTPUT, EX_BINARY_OUTPUT)
-        self.assertTrue(
-            'CxxExceptionInTestBodyTest destructor '
-            'called as expected.' in EX_BINARY_OUTPUT, EX_BINARY_OUTPUT)
-        self.assertTrue(
-            'CxxExceptionInTestBodyTest::TearDown() '
-            'called as expected.' in EX_BINARY_OUTPUT, EX_BINARY_OUTPUT)
-
-    def testCatchesNonStdCxxExceptions(self):
-        self.assertTrue(
-            'Unknown C++ exception thrown in the test body' in EX_BINARY_OUTPUT,
-            EX_BINARY_OUTPUT)
-
-    def testUnhandledCxxExceptionsAbortTheProgram(self):
-        # Filters out SEH exception tests on Windows. Unhandled SEH exceptions
-        # cause tests to show pop-up windows there.
-        FITLER_OUT_SEH_TESTS_FLAG = FILTER_FLAG + '=-*Seh*'
-        # By default, Google Test doesn't catch the exceptions.
-        uncaught_exceptions_ex_binary_output = gtest_test_utils.Subprocess(
-            [EX_EXE_PATH,
-             NO_CATCH_EXCEPTIONS_FLAG,
-             FITLER_OUT_SEH_TESTS_FLAG],
-            env=environ).output
-
-        self.assert_('Unhandled C++ exception terminating the program'
-                     in uncaught_exceptions_ex_binary_output)
-        self.assert_('unexpected' not in uncaught_exceptions_ex_binary_output)
+  """Tests C++ exception-catching behavior.
+
+  Tests in this test case verify that:
+  * C++ exceptions are caught and logged as C++ (not SEH) exceptions
+  * Exception thrown affect the remainder of the test work flow in the
+    expected manner.
+  """
+
+  def testCatchesCxxExceptionsInFixtureConstructor(self):
+    self.assertTrue(
+        'C++ exception with description '
+        '"Standard C++ exception" thrown '
+        "in the test fixture's constructor"
+        in EX_BINARY_OUTPUT,
+        EX_BINARY_OUTPUT,
+    )
+    self.assertTrue(
+        'unexpected' not in EX_BINARY_OUTPUT,
+        (
+            'This failure belongs in this test only if '
+            '"CxxExceptionInConstructorTest" (no quotes) '
+            'appears on the same line as words "called unexpectedly"'
+        ),
+    )
+
+  if (
+      'CxxExceptionInDestructorTest.ThrowsExceptionInDestructor'
+      in EX_BINARY_OUTPUT
+  ):
+
+    def testCatchesCxxExceptionsInFixtureDestructor(self):
+      self.assertTrue(
+          'C++ exception with description '
+          '"Standard C++ exception" thrown '
+          "in the test fixture's destructor"
+          in EX_BINARY_OUTPUT,
+          EX_BINARY_OUTPUT,
+      )
+      self.assertTrue(
+          'CxxExceptionInDestructorTest::TearDownTestSuite() '
+          'called as expected.'
+          in EX_BINARY_OUTPUT,
+          EX_BINARY_OUTPUT,
+      )
+
+  def testCatchesCxxExceptionsInSetUpTestCase(self):
+    self.assertTrue(
+        'C++ exception with description "Standard C++ exception"'
+        ' thrown in SetUpTestSuite()'
+        in EX_BINARY_OUTPUT,
+        EX_BINARY_OUTPUT,
+    )
+    self.assertTrue(
+        'CxxExceptionInConstructorTest::TearDownTestSuite() called as expected.'
+        in EX_BINARY_OUTPUT,
+        EX_BINARY_OUTPUT,
+    )
+    self.assertFalse(
+        'CxxExceptionInSetUpTestSuiteTest constructor called as expected.'
+        in EX_BINARY_OUTPUT,
+        EX_BINARY_OUTPUT,
+    )
+    self.assertFalse(
+        'CxxExceptionInSetUpTestSuiteTest destructor called as expected.'
+        in EX_BINARY_OUTPUT,
+        EX_BINARY_OUTPUT,
+    )
+    self.assertFalse(
+        'CxxExceptionInSetUpTestSuiteTest::SetUp() called as expected.'
+        in EX_BINARY_OUTPUT,
+        EX_BINARY_OUTPUT,
+    )
+    self.assertFalse(
+        'CxxExceptionInSetUpTestSuiteTest::TearDown() called as expected.'
+        in EX_BINARY_OUTPUT,
+        EX_BINARY_OUTPUT,
+    )
+    self.assertFalse(
+        'CxxExceptionInSetUpTestSuiteTest test body called as expected.'
+        in EX_BINARY_OUTPUT,
+        EX_BINARY_OUTPUT,
+    )
+
+  def testCatchesCxxExceptionsInTearDownTestCase(self):
+    self.assertTrue(
+        'C++ exception with description "Standard C++ exception"'
+        ' thrown in TearDownTestSuite()'
+        in EX_BINARY_OUTPUT,
+        EX_BINARY_OUTPUT,
+    )
+
+  def testCatchesCxxExceptionsInSetUp(self):
+    self.assertTrue(
+        'C++ exception with description "Standard C++ exception"'
+        ' thrown in SetUp()'
+        in EX_BINARY_OUTPUT,
+        EX_BINARY_OUTPUT,
+    )
+    self.assertTrue(
+        'CxxExceptionInSetUpTest::TearDownTestSuite() called as expected.'
+        in EX_BINARY_OUTPUT,
+        EX_BINARY_OUTPUT,
+    )
+    self.assertTrue(
+        'CxxExceptionInSetUpTest destructor called as expected.'
+        in EX_BINARY_OUTPUT,
+        EX_BINARY_OUTPUT,
+    )
+    self.assertTrue(
+        'CxxExceptionInSetUpTest::TearDown() called as expected.'
+        in EX_BINARY_OUTPUT,
+        EX_BINARY_OUTPUT,
+    )
+    self.assertTrue(
+        'unexpected' not in EX_BINARY_OUTPUT,
+        (
+            'This failure belongs in this test only if '
+            '"CxxExceptionInSetUpTest" (no quotes) '
+            'appears on the same line as words "called unexpectedly"'
+        ),
+    )
+
+  def testCatchesCxxExceptionsInTearDown(self):
+    self.assertTrue(
+        'C++ exception with description "Standard C++ exception"'
+        ' thrown in TearDown()'
+        in EX_BINARY_OUTPUT,
+        EX_BINARY_OUTPUT,
+    )
+    self.assertTrue(
+        'CxxExceptionInTearDownTest::TearDownTestSuite() called as expected.'
+        in EX_BINARY_OUTPUT,
+        EX_BINARY_OUTPUT,
+    )
+    self.assertTrue(
+        'CxxExceptionInTearDownTest destructor called as expected.'
+        in EX_BINARY_OUTPUT,
+        EX_BINARY_OUTPUT,
+    )
+
+  def testCatchesCxxExceptionsInTestBody(self):
+    self.assertTrue(
+        'C++ exception with description "Standard C++ exception"'
+        ' thrown in the test body'
+        in EX_BINARY_OUTPUT,
+        EX_BINARY_OUTPUT,
+    )
+    self.assertTrue(
+        'CxxExceptionInTestBodyTest::TearDownTestSuite() called as expected.'
+        in EX_BINARY_OUTPUT,
+        EX_BINARY_OUTPUT,
+    )
+    self.assertTrue(
+        'CxxExceptionInTestBodyTest destructor called as expected.'
+        in EX_BINARY_OUTPUT,
+        EX_BINARY_OUTPUT,
+    )
+    self.assertTrue(
+        'CxxExceptionInTestBodyTest::TearDown() called as expected.'
+        in EX_BINARY_OUTPUT,
+        EX_BINARY_OUTPUT,
+    )
+
+  def testCatchesNonStdCxxExceptions(self):
+    self.assertTrue(
+        'Unknown C++ exception thrown in the test body' in EX_BINARY_OUTPUT,
+        EX_BINARY_OUTPUT,
+    )
+
+  def testUnhandledCxxExceptionsAbortTheProgram(self):
+    # Filters out SEH exception tests on Windows. Unhandled SEH exceptions
+    # cause tests to show pop-up windows there.
+    filter_out_seh_tests_flag = FILTER_FLAG + '=-*Seh*'
+    # By default, Google Test doesn't catch the exceptions.
+    uncaught_exceptions_ex_binary_output = gtest_test_utils.Subprocess(
+        [EX_EXE_PATH, NO_CATCH_EXCEPTIONS_FLAG, filter_out_seh_tests_flag],
+        env=environ,
+    ).output
+
+    self.assertIn(
+        'Unhandled C++ exception terminating the program',
+        uncaught_exceptions_ex_binary_output,
+    )
+    self.assertNotIn('unexpected', uncaught_exceptions_ex_binary_output)
 
 
 if __name__ == '__main__':
-    gtest_test_utils.Main()
+  gtest_test_utils.Main()
diff --git a/external/googletest/googletest/test/googletest-color-test.py b/external/googletest/googletest/test/googletest-color-test.py
old mode 100644
new mode 100755
index 58e9a6df..8968cf1f
--- a/external/googletest/googletest/test/googletest-color-test.py
+++ b/external/googletest/googletest/test/googletest-color-test.py
@@ -32,7 +32,7 @@
 """Verifies that Google Test correctly determines whether to use colors."""
 
 import os
-import gtest_test_utils
+from googletest.test import gtest_test_utils
 
 IS_WINDOWS = os.name == 'nt'
 
@@ -42,86 +42,89 @@
 
 
 def SetEnvVar(env_var, value):
-    """Sets the env variable to 'value'; unsets it when 'value' is None."""
+  """Sets the env variable to 'value'; unsets it when 'value' is None."""
 
-    if value is not None:
-        os.environ[env_var] = value
-    elif env_var in os.environ:
-        del os.environ[env_var]
+  if value is not None:
+    os.environ[env_var] = value
+  elif env_var in os.environ:
+    del os.environ[env_var]
 
 
 def UsesColor(term, color_env_var, color_flag):
-    """Runs googletest-color-test_ and returns its exit code."""
+  """Runs googletest-color-test_ and returns its exit code."""
 
-    SetEnvVar('TERM', term)
-    SetEnvVar(COLOR_ENV_VAR, color_env_var)
+  SetEnvVar('TERM', term)
+  SetEnvVar(COLOR_ENV_VAR, color_env_var)
 
-    if color_flag is None:
-        args = []
-    else:
-        args = ['--%s=%s' % (COLOR_FLAG, color_flag)]
-    p = gtest_test_utils.Subprocess([COMMAND] + args)
-    return not p.exited or p.exit_code
+  if color_flag is None:
+    args = []
+  else:
+    args = ['--%s=%s' % (COLOR_FLAG, color_flag)]
+  p = gtest_test_utils.Subprocess([COMMAND] + args)
+  return not p.exited or p.exit_code
 
 
 class GTestColorTest(gtest_test_utils.TestCase):
-    def testNoEnvVarNoFlag(self):
-        """Tests the case when there's neither GTEST_COLOR nor --gtest_color."""
-
-        if not IS_WINDOWS:
-            self.assert_(not UsesColor('dumb', None, None))
-            self.assert_(not UsesColor('emacs', None, None))
-            self.assert_(not UsesColor('xterm-mono', None, None))
-            self.assert_(not UsesColor('unknown', None, None))
-            self.assert_(not UsesColor(None, None, None))
-        self.assert_(UsesColor('linux', None, None))
-        self.assert_(UsesColor('cygwin', None, None))
-        self.assert_(UsesColor('xterm', None, None))
-        self.assert_(UsesColor('xterm-color', None, None))
-        self.assert_(UsesColor('xterm-256color', None, None))
-
-    def testFlagOnly(self):
-        """Tests the case when there's --gtest_color but not GTEST_COLOR."""
-
-        self.assert_(not UsesColor('dumb', None, 'no'))
-        self.assert_(not UsesColor('xterm-color', None, 'no'))
-        if not IS_WINDOWS:
-            self.assert_(not UsesColor('emacs', None, 'auto'))
-        self.assert_(UsesColor('xterm', None, 'auto'))
-        self.assert_(UsesColor('dumb', None, 'yes'))
-        self.assert_(UsesColor('xterm', None, 'yes'))
-
-    def testEnvVarOnly(self):
-        """Tests the case when there's GTEST_COLOR but not --gtest_color."""
-
-        self.assert_(not UsesColor('dumb', 'no', None))
-        self.assert_(not UsesColor('xterm-color', 'no', None))
-        if not IS_WINDOWS:
-            self.assert_(not UsesColor('dumb', 'auto', None))
-        self.assert_(UsesColor('xterm-color', 'auto', None))
-        self.assert_(UsesColor('dumb', 'yes', None))
-        self.assert_(UsesColor('xterm-color', 'yes', None))
-
-    def testEnvVarAndFlag(self):
-        """Tests the case when there are both GTEST_COLOR and --gtest_color."""
-
-        self.assert_(not UsesColor('xterm-color', 'no', 'no'))
-        self.assert_(UsesColor('dumb', 'no', 'yes'))
-        self.assert_(UsesColor('xterm-color', 'no', 'auto'))
-
-    def testAliasesOfYesAndNo(self):
-        """Tests using aliases in specifying --gtest_color."""
-
-        self.assert_(UsesColor('dumb', None, 'true'))
-        self.assert_(UsesColor('dumb', None, 'YES'))
-        self.assert_(UsesColor('dumb', None, 'T'))
-        self.assert_(UsesColor('dumb', None, '1'))
-
-        self.assert_(not UsesColor('xterm', None, 'f'))
-        self.assert_(not UsesColor('xterm', None, 'false'))
-        self.assert_(not UsesColor('xterm', None, '0'))
-        self.assert_(not UsesColor('xterm', None, 'unknown'))
+
+  def testNoEnvVarNoFlag(self):
+    """Tests the case when there's neither GTEST_COLOR nor --gtest_color."""
+
+    if not IS_WINDOWS:
+      self.assertTrue(not UsesColor('dumb', None, None))
+      self.assertTrue(not UsesColor('emacs', None, None))
+      self.assertTrue(not UsesColor('xterm-mono', None, None))
+      self.assertTrue(not UsesColor('unknown', None, None))
+      self.assertTrue(not UsesColor(None, None, None))
+    self.assertTrue(UsesColor('linux', None, None))
+    self.assertTrue(UsesColor('cygwin', None, None))
+    self.assertTrue(UsesColor('xterm', None, None))
+    self.assertTrue(UsesColor('xterm-color', None, None))
+    self.assertTrue(UsesColor('xterm-kitty', None, None))
+    self.assertTrue(UsesColor('alacritty', None, None))
+    self.assertTrue(UsesColor('xterm-256color', None, None))
+
+  def testFlagOnly(self):
+    """Tests the case when there's --gtest_color but not GTEST_COLOR."""
+
+    self.assertTrue(not UsesColor('dumb', None, 'no'))
+    self.assertTrue(not UsesColor('xterm-color', None, 'no'))
+    if not IS_WINDOWS:
+      self.assertTrue(not UsesColor('emacs', None, 'auto'))
+    self.assertTrue(UsesColor('xterm', None, 'auto'))
+    self.assertTrue(UsesColor('dumb', None, 'yes'))
+    self.assertTrue(UsesColor('xterm', None, 'yes'))
+
+  def testEnvVarOnly(self):
+    """Tests the case when there's GTEST_COLOR but not --gtest_color."""
+
+    self.assertTrue(not UsesColor('dumb', 'no', None))
+    self.assertTrue(not UsesColor('xterm-color', 'no', None))
+    if not IS_WINDOWS:
+      self.assertTrue(not UsesColor('dumb', 'auto', None))
+    self.assertTrue(UsesColor('xterm-color', 'auto', None))
+    self.assertTrue(UsesColor('dumb', 'yes', None))
+    self.assertTrue(UsesColor('xterm-color', 'yes', None))
+
+  def testEnvVarAndFlag(self):
+    """Tests the case when there are both GTEST_COLOR and --gtest_color."""
+
+    self.assertTrue(not UsesColor('xterm-color', 'no', 'no'))
+    self.assertTrue(UsesColor('dumb', 'no', 'yes'))
+    self.assertTrue(UsesColor('xterm-color', 'no', 'auto'))
+
+  def testAliasesOfYesAndNo(self):
+    """Tests using aliases in specifying --gtest_color."""
+
+    self.assertTrue(UsesColor('dumb', None, 'true'))
+    self.assertTrue(UsesColor('dumb', None, 'YES'))
+    self.assertTrue(UsesColor('dumb', None, 'T'))
+    self.assertTrue(UsesColor('dumb', None, '1'))
+
+    self.assertTrue(not UsesColor('xterm', None, 'f'))
+    self.assertTrue(not UsesColor('xterm', None, 'false'))
+    self.assertTrue(not UsesColor('xterm', None, '0'))
+    self.assertTrue(not UsesColor('xterm', None, 'unknown'))
 
 
 if __name__ == '__main__':
-    gtest_test_utils.Main()
+  gtest_test_utils.Main()
diff --git a/external/googletest/googletest/test/googletest-death-test-test.cc b/external/googletest/googletest/test/googletest-death-test-test.cc
index c0b3d1f2..44b80464 100644
--- a/external/googletest/googletest/test/googletest-death-test-test.cc
+++ b/external/googletest/googletest/test/googletest-death-test-test.cc
@@ -30,35 +30,39 @@
 //
 // Tests for death tests.
 
-#include "gtest/gtest-death-test.h"
+#include <stdlib.h>
 
+#include "gtest/gtest-death-test.h"
 #include "gtest/gtest.h"
 #include "gtest/internal/gtest-filepath.h"
 
 using testing::internal::AlwaysFalse;
 using testing::internal::AlwaysTrue;
 
-#if GTEST_HAS_DEATH_TEST
+#ifdef GTEST_HAS_DEATH_TEST
+
+#ifdef GTEST_OS_WINDOWS
+#include <direct.h>  // For chdir().
+#include <fcntl.h>   // For O_BINARY
+#include <io.h>
+#else
+#include <sys/wait.h>  // For waitpid.
+#include <unistd.h>
+#endif  // GTEST_OS_WINDOWS
 
-# if GTEST_OS_WINDOWS
-#  include <fcntl.h>           // For O_BINARY
-#  include <direct.h>          // For chdir().
-#  include <io.h>
-# else
-#  include <unistd.h>
-#  include <sys/wait.h>        // For waitpid.
-# endif  // GTEST_OS_WINDOWS
+#include <limits.h>
+#include <signal.h>
+#include <stdio.h>
 
-# include <limits.h>
-# include <signal.h>
-# include <stdio.h>
+#include <string>
+#include <vector>
 
-# if GTEST_OS_LINUX
-#  include <sys/time.h>
-# endif  // GTEST_OS_LINUX
+#ifdef GTEST_OS_LINUX
+#include <sys/time.h>
+#endif  // GTEST_OS_LINUX
 
-# include "gtest/gtest-spi.h"
-# include "src/gtest-internal-inl.h"
+#include "gtest/gtest-spi.h"
+#include "src/gtest-internal-inl.h"
 
 namespace posix = ::testing::internal::posix;
 
@@ -90,6 +94,7 @@ class ReplaceDeathTestFactory {
     unit_test_impl_->death_test_factory_.release();
     unit_test_impl_->death_test_factory_.reset(old_factory_);
   }
+
  private:
   // Prevents copying ReplaceDeathTestFactory objects.
   ReplaceDeathTestFactory(const ReplaceDeathTestFactory&);
@@ -108,16 +113,15 @@ void DieWithMessage(const ::std::string& message) {
   fprintf(stderr, "%s", message.c_str());
   fflush(stderr);  // Make sure the text is printed before the process exits.
 
-  // We call _exit() instead of exit(), as the former is a direct
+  // We call _Exit() instead of exit(), as the former is a direct
   // system call and thus safer in the presence of threads.  exit()
   // will invoke user-defined exit-hooks, which may do dangerous
   // things that conflict with death tests.
   //
-  // Some compilers can recognize that _exit() never returns and issue the
+  // Some compilers can recognize that _Exit() never returns and issue the
   // 'unreachable code' warning for code following this function, unless
   // fooled by a fake condition.
-  if (AlwaysTrue())
-    _exit(1);
+  if (AlwaysTrue()) _Exit(1);
 }
 
 void DieInside(const ::std::string& function) {
@@ -137,8 +141,7 @@ class TestForDeathTest : public testing::Test {
 
   // A method of the test fixture that may die.
   void MemberFunction() {
-    if (should_die_)
-      DieInside("MemberFunction");
+    if (should_die_) DieInside("MemberFunction");
   }
 
   // True if and only if MemberFunction() should die.
@@ -153,8 +156,7 @@ class MayDie {
 
   // A member function that may die.
   void MemberFunction() const {
-    if (should_die_)
-      DieInside("MayDie::MemberFunction");
+    if (should_die_) DieInside("MayDie::MemberFunction");
   }
 
  private:
@@ -173,8 +175,7 @@ int NonVoidFunction() {
 
 // A unary function that may die.
 void DieIf(bool should_die) {
-  if (should_die)
-    DieInside("DieIf");
+  if (should_die) DieInside("DieIf");
 }
 
 // A binary function that may die.
@@ -195,16 +196,16 @@ void DeathTestSubroutine() {
 int DieInDebugElse12(int* sideeffect) {
   if (sideeffect) *sideeffect = 12;
 
-# ifndef NDEBUG
+#ifndef NDEBUG
 
   DieInside("DieInDebugElse12");
 
-# endif  // NDEBUG
+#endif  // NDEBUG
 
   return 12;
 }
 
-# if GTEST_OS_WINDOWS
+#ifdef GTEST_OS_WINDOWS
 
 // Death in dbg due to Windows CRT assertion failure, not opt.
 int DieInCRTDebugElse12(int* sideeffect) {
@@ -224,7 +225,7 @@ int DieInCRTDebugElse12(int* sideeffect) {
 
 #endif  // GTEST_OS_WINDOWS
 
-# if GTEST_OS_WINDOWS || GTEST_OS_FUCHSIA
+#if defined(GTEST_OS_WINDOWS) || defined(GTEST_OS_FUCHSIA)
 
 // Tests the ExitedWithCode predicate.
 TEST(ExitStatusPredicateTest, ExitedWithCode) {
@@ -237,15 +238,15 @@ TEST(ExitStatusPredicateTest, ExitedWithCode) {
   EXPECT_FALSE(testing::ExitedWithCode(1)(0));
 }
 
-# else
+#else
 
-// Returns the exit status of a process that calls _exit(2) with a
+// Returns the exit status of a process that calls _Exit(2) with a
 // given exit code.  This is a helper function for the
 // ExitStatusPredicateTest test suite.
 static int NormalExitStatus(int exit_code) {
   pid_t child_pid = fork();
   if (child_pid == 0) {
-    _exit(exit_code);
+    _Exit(exit_code);
   }
   int status;
   waitpid(child_pid, &status, 0);
@@ -261,7 +262,7 @@ static int KilledExitStatus(int signum) {
   pid_t child_pid = fork();
   if (child_pid == 0) {
     raise(signum);
-    _exit(1);
+    _Exit(1);
   }
   int status;
   waitpid(child_pid, &status, 0);
@@ -270,14 +271,14 @@ static int KilledExitStatus(int signum) {
 
 // Tests the ExitedWithCode predicate.
 TEST(ExitStatusPredicateTest, ExitedWithCode) {
-  const int status0  = NormalExitStatus(0);
-  const int status1  = NormalExitStatus(1);
+  const int status0 = NormalExitStatus(0);
+  const int status1 = NormalExitStatus(1);
   const int status42 = NormalExitStatus(42);
   const testing::ExitedWithCode pred0(0);
   const testing::ExitedWithCode pred1(1);
   const testing::ExitedWithCode pred42(42);
-  EXPECT_PRED1(pred0,  status0);
-  EXPECT_PRED1(pred1,  status1);
+  EXPECT_PRED1(pred0, status0);
+  EXPECT_PRED1(pred1, status1);
   EXPECT_PRED1(pred42, status42);
   EXPECT_FALSE(pred0(status1));
   EXPECT_FALSE(pred42(status0));
@@ -290,13 +291,15 @@ TEST(ExitStatusPredicateTest, KilledBySignal) {
   const int status_kill = KilledExitStatus(SIGKILL);
   const testing::KilledBySignal pred_segv(SIGSEGV);
   const testing::KilledBySignal pred_kill(SIGKILL);
+#if !(defined(GTEST_OS_LINUX_ANDROID) && __ANDROID_API__ <= 21)
   EXPECT_PRED1(pred_segv, status_segv);
+#endif
   EXPECT_PRED1(pred_kill, status_kill);
   EXPECT_FALSE(pred_segv(status_kill));
   EXPECT_FALSE(pred_kill(status_segv));
 }
 
-# endif  // GTEST_OS_WINDOWS || GTEST_OS_FUCHSIA
+#endif  // GTEST_OS_WINDOWS || GTEST_OS_FUCHSIA
 
 // The following code intentionally tests a suboptimal syntax.
 #ifdef __GNUC__
@@ -314,41 +317,23 @@ TEST_F(TestForDeathTest, SingleStatement) {
     ASSERT_DEATH(return, "");
 
   if (AlwaysTrue())
-    EXPECT_DEATH(_exit(1), "");
+    EXPECT_DEATH(_Exit(1), "");
   else
     // This empty "else" branch is meant to ensure that EXPECT_DEATH
     // doesn't expand into an "if" statement without an "else"
     ;
 
-  if (AlwaysFalse())
-    ASSERT_DEATH(return, "") << "did not die";
+  if (AlwaysFalse()) ASSERT_DEATH(return, "") << "did not die";
 
   if (AlwaysFalse())
     ;
   else
-    EXPECT_DEATH(_exit(1), "") << 1 << 2 << 3;
+    EXPECT_DEATH(_Exit(1), "") << 1 << 2 << 3;
 }
 #ifdef __GNUC__
 #pragma GCC diagnostic pop
 #endif
 
-# if GTEST_USES_PCRE
-
-void DieWithEmbeddedNul() {
-  fprintf(stderr, "Hello%cmy null world.\n", '\0');
-  fflush(stderr);
-  _exit(1);
-}
-
-// Tests that EXPECT_DEATH and ASSERT_DEATH work when the error
-// message has a NUL character in it.
-TEST_F(TestForDeathTest, EmbeddedNulInMessage) {
-  EXPECT_DEATH(DieWithEmbeddedNul(), "my null world");
-  ASSERT_DEATH(DieWithEmbeddedNul(), "my null world");
-}
-
-# endif  // GTEST_USES_PCRE
-
 // Tests that death test macros expand to code which interacts well with switch
 // statements.
 TEST_F(TestForDeathTest, SwitchStatement) {
@@ -357,12 +342,12 @@ TEST_F(TestForDeathTest, SwitchStatement) {
   GTEST_DISABLE_MSC_WARNINGS_PUSH_(4065)
 
   switch (0)
-    default:
-      ASSERT_DEATH(_exit(1), "") << "exit in default switch handler";
+  default:
+    ASSERT_DEATH(_Exit(1), "") << "exit in default switch handler";
 
   switch (0)
-    case 0:
-      EXPECT_DEATH(_exit(1), "") << "exit in switch case";
+  case 0:
+    EXPECT_DEATH(_Exit(1), "") << "exit in switch case";
 
   GTEST_DISABLE_MSC_WARNINGS_POP_()
 }
@@ -370,14 +355,14 @@ TEST_F(TestForDeathTest, SwitchStatement) {
 // Tests that a static member function can be used in a "fast" style
 // death test.
 TEST_F(TestForDeathTest, StaticMemberFunctionFastStyle) {
-  testing::GTEST_FLAG(death_test_style) = "fast";
+  GTEST_FLAG_SET(death_test_style, "fast");
   ASSERT_DEATH(StaticMemberFunction(), "death.*StaticMember");
 }
 
 // Tests that a method of the test fixture can be used in a "fast"
 // style death test.
 TEST_F(TestForDeathTest, MemberFunctionFastStyle) {
-  testing::GTEST_FLAG(death_test_style) = "fast";
+  GTEST_FLAG_SET(death_test_style, "fast");
   should_die_ = true;
   EXPECT_DEATH(MemberFunction(), "inside.*MemberFunction");
 }
@@ -387,17 +372,18 @@ void ChangeToRootDir() { posix::ChDir(GTEST_PATH_SEP_); }
 // Tests that death tests work even if the current directory has been
 // changed.
 TEST_F(TestForDeathTest, FastDeathTestInChangedDir) {
-  testing::GTEST_FLAG(death_test_style) = "fast";
+  GTEST_FLAG_SET(death_test_style, "fast");
 
   ChangeToRootDir();
-  EXPECT_EXIT(_exit(1), testing::ExitedWithCode(1), "");
+  EXPECT_EXIT(_Exit(1), testing::ExitedWithCode(1), "");
 
   ChangeToRootDir();
-  ASSERT_DEATH(_exit(1), "");
+  ASSERT_DEATH(_Exit(1), "");
 }
 
-# if GTEST_OS_LINUX
-void SigprofAction(int, siginfo_t*, void*) { /* no op */ }
+#ifdef GTEST_OS_LINUX
+void SigprofAction(int, siginfo_t*, void*) { /* no op */
+}
 
 // Sets SIGPROF action and ITIMER_PROF timer (interval: 1ms).
 void SetSigprofActionAndTimer() {
@@ -432,80 +418,78 @@ void DisableSigprofActionAndTimer(struct sigaction* old_signal_action) {
 
 // Tests that death tests work when SIGPROF handler and timer are set.
 TEST_F(TestForDeathTest, FastSigprofActionSet) {
-  testing::GTEST_FLAG(death_test_style) = "fast";
+  GTEST_FLAG_SET(death_test_style, "fast");
   SetSigprofActionAndTimer();
-  EXPECT_DEATH(_exit(1), "");
+  EXPECT_DEATH(_Exit(1), "");
   struct sigaction old_signal_action;
   DisableSigprofActionAndTimer(&old_signal_action);
   EXPECT_TRUE(old_signal_action.sa_sigaction == SigprofAction);
 }
 
 TEST_F(TestForDeathTest, ThreadSafeSigprofActionSet) {
-  testing::GTEST_FLAG(death_test_style) = "threadsafe";
+  GTEST_FLAG_SET(death_test_style, "threadsafe");
   SetSigprofActionAndTimer();
-  EXPECT_DEATH(_exit(1), "");
+  EXPECT_DEATH(_Exit(1), "");
   struct sigaction old_signal_action;
   DisableSigprofActionAndTimer(&old_signal_action);
   EXPECT_TRUE(old_signal_action.sa_sigaction == SigprofAction);
 }
-# endif  // GTEST_OS_LINUX
+#endif  // GTEST_OS_LINUX
 
 // Repeats a representative sample of death tests in the "threadsafe" style:
 
 TEST_F(TestForDeathTest, StaticMemberFunctionThreadsafeStyle) {
-  testing::GTEST_FLAG(death_test_style) = "threadsafe";
+  GTEST_FLAG_SET(death_test_style, "threadsafe");
   ASSERT_DEATH(StaticMemberFunction(), "death.*StaticMember");
 }
 
 TEST_F(TestForDeathTest, MemberFunctionThreadsafeStyle) {
-  testing::GTEST_FLAG(death_test_style) = "threadsafe";
+  GTEST_FLAG_SET(death_test_style, "threadsafe");
   should_die_ = true;
   EXPECT_DEATH(MemberFunction(), "inside.*MemberFunction");
 }
 
 TEST_F(TestForDeathTest, ThreadsafeDeathTestInLoop) {
-  testing::GTEST_FLAG(death_test_style) = "threadsafe";
+  GTEST_FLAG_SET(death_test_style, "threadsafe");
 
   for (int i = 0; i < 3; ++i)
-    EXPECT_EXIT(_exit(i), testing::ExitedWithCode(i), "") << ": i = " << i;
+    EXPECT_EXIT(_Exit(i), testing::ExitedWithCode(i), "") << ": i = " << i;
 }
 
 TEST_F(TestForDeathTest, ThreadsafeDeathTestInChangedDir) {
-  testing::GTEST_FLAG(death_test_style) = "threadsafe";
+  GTEST_FLAG_SET(death_test_style, "threadsafe");
 
   ChangeToRootDir();
-  EXPECT_EXIT(_exit(1), testing::ExitedWithCode(1), "");
+  EXPECT_EXIT(_Exit(1), testing::ExitedWithCode(1), "");
 
   ChangeToRootDir();
-  ASSERT_DEATH(_exit(1), "");
+  ASSERT_DEATH(_Exit(1), "");
 }
 
 TEST_F(TestForDeathTest, MixedStyles) {
-  testing::GTEST_FLAG(death_test_style) = "threadsafe";
-  EXPECT_DEATH(_exit(1), "");
-  testing::GTEST_FLAG(death_test_style) = "fast";
-  EXPECT_DEATH(_exit(1), "");
+  GTEST_FLAG_SET(death_test_style, "threadsafe");
+  EXPECT_DEATH(_Exit(1), "");
+  GTEST_FLAG_SET(death_test_style, "fast");
+  EXPECT_DEATH(_Exit(1), "");
 }
 
-# if GTEST_HAS_CLONE && GTEST_HAS_PTHREAD
+#if GTEST_HAS_CLONE && GTEST_HAS_PTHREAD
 
 bool pthread_flag;
 
-void SetPthreadFlag() {
-  pthread_flag = true;
-}
+void SetPthreadFlag() { pthread_flag = true; }
 
 TEST_F(TestForDeathTest, DoesNotExecuteAtforkHooks) {
-  if (!testing::GTEST_FLAG(death_test_use_fork)) {
-    testing::GTEST_FLAG(death_test_style) = "threadsafe";
+  if (!GTEST_FLAG_GET(death_test_use_fork)) {
+    GTEST_FLAG_SET(death_test_style, "threadsafe");
     pthread_flag = false;
     ASSERT_EQ(0, pthread_atfork(&SetPthreadFlag, nullptr, nullptr));
-    ASSERT_DEATH(_exit(1), "");
+    ASSERT_DEATH(_Exit(1), "");
     ASSERT_FALSE(pthread_flag);
   }
 }
 
-# endif  // GTEST_HAS_CLONE && GTEST_HAS_PTHREAD
+#endif  // GTEST_HAS_CLONE && GTEST_HAS_PTHREAD
 
 // Tests that a method of another class can be used in a death test.
 TEST_F(TestForDeathTest, MethodOfAnotherClass) {
@@ -527,16 +511,12 @@ TEST_F(TestForDeathTest, AcceptsAnythingConvertibleToRE) {
   const testing::internal::RE regex(regex_c_str);
   EXPECT_DEATH(GlobalFunction(), regex);
 
-# if !GTEST_USES_PCRE
-
   const ::std::string regex_std_str(regex_c_str);
   EXPECT_DEATH(GlobalFunction(), regex_std_str);
 
   // This one is tricky; a temporary pointer into another temporary.  Reference
   // lifetime extension of the pointer is not sufficient.
   EXPECT_DEATH(GlobalFunction(), ::std::string(regex_c_str).c_str());
-
-# endif  // !GTEST_USES_PCRE
 }
 
 // Tests that a non-void function can be used in a death test.
@@ -551,9 +531,7 @@ TEST_F(TestForDeathTest, FunctionWithParameter) {
 }
 
 // Tests that ASSERT_DEATH can be used outside a TEST, TEST_F, or test fixture.
-TEST_F(TestForDeathTest, OutsideFixture) {
-  DeathTestSubroutine();
-}
+TEST_F(TestForDeathTest, OutsideFixture) { DeathTestSubroutine(); }
 
 // Tests that death tests can be done inside a loop.
 TEST_F(TestForDeathTest, InsideLoop) {
@@ -564,25 +542,28 @@ TEST_F(TestForDeathTest, InsideLoop) {
 
 // Tests that a compound statement can be used in a death test.
 TEST_F(TestForDeathTest, CompoundStatement) {
-  EXPECT_DEATH({  // NOLINT
-    const int x = 2;
-    const int y = x + 1;
-    DieIfLessThan(x, y);
-  },
-  "DieIfLessThan");
+  EXPECT_DEATH(
+      {  // NOLINT
+        const int x = 2;
+        const int y = x + 1;
+        DieIfLessThan(x, y);
+      },
+      "DieIfLessThan");
 }
 
 // Tests that code that doesn't die causes a death test to fail.
 TEST_F(TestForDeathTest, DoesNotDie) {
-  EXPECT_NONFATAL_FAILURE(EXPECT_DEATH(DieIf(false), "DieIf"),
-                          "failed to die");
+  EXPECT_NONFATAL_FAILURE(EXPECT_DEATH(DieIf(false), "DieIf"), "failed to die");
 }
 
 // Tests that a death test fails when the error message isn't expected.
 TEST_F(TestForDeathTest, ErrorMessageMismatch) {
-  EXPECT_NONFATAL_FAILURE({  // NOLINT
-    EXPECT_DEATH(DieIf(true), "DieIfLessThan") << "End of death test message.";
-  }, "died but not with expected error");
+  EXPECT_NONFATAL_FAILURE(
+      {  // NOLINT
+        EXPECT_DEATH(DieIf(true), "DieIfLessThan")
+            << "End of death test message.";
+      },
+      "died but not with expected error");
 }
 
 // On exit, *aborted will be true if and only if the EXPECT_DEATH()
@@ -596,19 +577,20 @@ void ExpectDeathTestHelper(bool* aborted) {
 // Tests that EXPECT_DEATH doesn't abort the test on failure.
 TEST_F(TestForDeathTest, EXPECT_DEATH) {
   bool aborted = true;
-  EXPECT_NONFATAL_FAILURE(ExpectDeathTestHelper(&aborted),
-                          "failed to die");
+  EXPECT_NONFATAL_FAILURE(ExpectDeathTestHelper(&aborted), "failed to die");
   EXPECT_FALSE(aborted);
 }
 
 // Tests that ASSERT_DEATH does abort the test on failure.
 TEST_F(TestForDeathTest, ASSERT_DEATH) {
   static bool aborted;
-  EXPECT_FATAL_FAILURE({  // NOLINT
-    aborted = true;
-    ASSERT_DEATH(DieIf(false), "DieIf");  // This assertion should fail.
-    aborted = false;
-  }, "failed to die");
+  EXPECT_FATAL_FAILURE(
+      {  // NOLINT
+        aborted = true;
+        ASSERT_DEATH(DieIf(false), "DieIf");  // This assertion should fail.
+        aborted = false;
+      },
+      "failed to die");
   EXPECT_TRUE(aborted);
 }
 
@@ -653,52 +635,36 @@ TEST_F(TestForDeathTest, TestExpectDebugDeath) {
   EXPECT_DEBUG_DEATH(DieInDebugElse12(&sideeffect), regex)
       << "Must accept a streamed message";
 
-# ifdef NDEBUG
+#ifdef NDEBUG
 
   // Checks that the assignment occurs in opt mode (sideeffect).
   EXPECT_EQ(12, sideeffect);
 
-# else
+#else
 
   // Checks that the assignment does not occur in dbg mode (no sideeffect).
   EXPECT_EQ(0, sideeffect);
 
-# endif
+#endif
 }
 
-# if GTEST_OS_WINDOWS
+#ifdef GTEST_OS_WINDOWS
 
-// Tests that EXPECT_DEBUG_DEATH works as expected when in debug mode
-// the Windows CRT crashes the process with an assertion failure.
+// https://docs.microsoft.com/en-us/cpp/c-runtime-library/reference/crtsetreportmode
+// In debug mode, the calls to _CrtSetReportMode and _CrtSetReportFile enable
+// the dumping of assertions to stderr. Tests that EXPECT_DEATH works as
+// expected when in CRT debug mode (compiled with /MTd or /MDd, which defines
+// _DEBUG) the Windows CRT crashes the process with an assertion failure.
 // 1. Asserts on death.
 // 2. Has no side effect (doesn't pop up a window or wait for user input).
-//
-// And in opt mode, it:
-// 1.  Has side effects but does not assert.
+#ifdef _DEBUG
 TEST_F(TestForDeathTest, CRTDebugDeath) {
-  int sideeffect = 0;
-
-  // Put the regex in a local variable to make sure we don't get an "unused"
-  // warning in opt mode.
-  const char* regex = "dup.* : Assertion failed";
-
-  EXPECT_DEBUG_DEATH(DieInCRTDebugElse12(&sideeffect), regex)
+  EXPECT_DEATH(DieInCRTDebugElse12(nullptr), "dup.* : Assertion failed")
       << "Must accept a streamed message";
-
-# ifdef NDEBUG
-
-  // Checks that the assignment occurs in opt mode (sideeffect).
-  EXPECT_EQ(12, sideeffect);
-
-# else
-
-  // Checks that the assignment does not occur in dbg mode (no sideeffect).
-  EXPECT_EQ(0, sideeffect);
-
-# endif
 }
+#endif  // _DEBUG
 
-# endif  // GTEST_OS_WINDOWS
+#endif  // GTEST_OS_WINDOWS
 
 // Tests that ASSERT_DEBUG_DEATH works as expected, that is, you can stream a
 // message to it, and in debug mode it:
@@ -713,20 +679,20 @@ TEST_F(TestForDeathTest, TestAssertDebugDeath) {
   ASSERT_DEBUG_DEATH(DieInDebugElse12(&sideeffect), "death.*DieInDebugElse12")
       << "Must accept a streamed message";
 
-# ifdef NDEBUG
+#ifdef NDEBUG
 
   // Checks that the assignment occurs in opt mode (sideeffect).
   EXPECT_EQ(12, sideeffect);
 
-# else
+#else
 
   // Checks that the assignment does not occur in dbg mode (no sideeffect).
   EXPECT_EQ(0, sideeffect);
 
-# endif
+#endif
 }
 
-# ifndef NDEBUG
+#ifndef NDEBUG
 
 void ExpectDebugDeathHelper(bool* aborted) {
   *aborted = true;
@@ -734,18 +700,21 @@ void ExpectDebugDeathHelper(bool* aborted) {
   *aborted = false;
 }
 
-#  if GTEST_OS_WINDOWS
+#ifdef GTEST_OS_WINDOWS
 TEST(PopUpDeathTest, DoesNotShowPopUpOnAbort) {
-  printf("This test should be considered failing if it shows "
-         "any pop-up dialogs.\n");
+  printf(
+      "This test should be considered failing if it shows "
+      "any pop-up dialogs.\n");
   fflush(stdout);
 
-  EXPECT_DEATH({
-    testing::GTEST_FLAG(catch_exceptions) = false;
-    abort();
-  }, "");
+  EXPECT_DEATH(
+      {
+        GTEST_FLAG_SET(catch_exceptions, false);
+        abort();
+      },
+      "");
 }
-#  endif  // GTEST_OS_WINDOWS
+#endif  // GTEST_OS_WINDOWS
 
 // Tests that EXPECT_DEBUG_DEATH in debug mode does not abort
 // the function.
@@ -836,83 +805,86 @@ TEST_F(TestForDeathTest, AssertDebugDeathAborts10) {
   EXPECT_TRUE(aborted);
 }
 
-# endif  // _NDEBUG
+#endif  // _NDEBUG
 
 // Tests the *_EXIT family of macros, using a variety of predicates.
 static void TestExitMacros() {
-  EXPECT_EXIT(_exit(1),  testing::ExitedWithCode(1),  "");
-  ASSERT_EXIT(_exit(42), testing::ExitedWithCode(42), "");
+  EXPECT_EXIT(_Exit(1), testing::ExitedWithCode(1), "");
+  ASSERT_EXIT(_Exit(42), testing::ExitedWithCode(42), "");
 
-# if GTEST_OS_WINDOWS
+#ifdef GTEST_OS_WINDOWS
 
   // Of all signals effects on the process exit code, only those of SIGABRT
   // are documented on Windows.
   // See https://msdn.microsoft.com/en-us/query-bi/m/dwwzkt4c.
   EXPECT_EXIT(raise(SIGABRT), testing::ExitedWithCode(3), "") << "b_ar";
 
-# elif !GTEST_OS_FUCHSIA
+#elif !defined(GTEST_OS_FUCHSIA)
 
   // Fuchsia has no unix signals.
   EXPECT_EXIT(raise(SIGKILL), testing::KilledBySignal(SIGKILL), "") << "foo";
   ASSERT_EXIT(raise(SIGUSR2), testing::KilledBySignal(SIGUSR2), "") << "bar";
 
-  EXPECT_FATAL_FAILURE({  // NOLINT
-    ASSERT_EXIT(_exit(0), testing::KilledBySignal(SIGSEGV), "")
-      << "This failure is expected, too.";
-  }, "This failure is expected, too.");
+  EXPECT_FATAL_FAILURE(
+      {  // NOLINT
+        ASSERT_EXIT(_Exit(0), testing::KilledBySignal(SIGSEGV), "")
+            << "This failure is expected, too.";
+      },
+      "This failure is expected, too.");
 
-# endif  // GTEST_OS_WINDOWS
+#endif  // GTEST_OS_WINDOWS
 
-  EXPECT_NONFATAL_FAILURE({  // NOLINT
-    EXPECT_EXIT(raise(SIGSEGV), testing::ExitedWithCode(0), "")
-      << "This failure is expected.";
-  }, "This failure is expected.");
+  EXPECT_NONFATAL_FAILURE(
+      {  // NOLINT
+        EXPECT_EXIT(raise(SIGSEGV), testing::ExitedWithCode(0), "")
+            << "This failure is expected.";
+      },
+      "This failure is expected.");
 }
 
-TEST_F(TestForDeathTest, ExitMacros) {
-  TestExitMacros();
-}
+TEST_F(TestForDeathTest, ExitMacros) { TestExitMacros(); }
 
 TEST_F(TestForDeathTest, ExitMacrosUsingFork) {
-  testing::GTEST_FLAG(death_test_use_fork) = true;
+  GTEST_FLAG_SET(death_test_use_fork, true);
   TestExitMacros();
 }
 
 TEST_F(TestForDeathTest, InvalidStyle) {
-  testing::GTEST_FLAG(death_test_style) = "rococo";
-  EXPECT_NONFATAL_FAILURE({  // NOLINT
-    EXPECT_DEATH(_exit(0), "") << "This failure is expected.";
-  }, "This failure is expected.");
+  GTEST_FLAG_SET(death_test_style, "rococo");
+  EXPECT_NONFATAL_FAILURE(
+      {  // NOLINT
+        EXPECT_DEATH(_Exit(0), "") << "This failure is expected.";
+      },
+      "This failure is expected.");
 }
 
 TEST_F(TestForDeathTest, DeathTestFailedOutput) {
-  testing::GTEST_FLAG(death_test_style) = "fast";
+  GTEST_FLAG_SET(death_test_style, "fast");
   EXPECT_NONFATAL_FAILURE(
-      EXPECT_DEATH(DieWithMessage("death\n"),
-                   "expected message"),
+      EXPECT_DEATH(DieWithMessage("death\n"), "expected message"),
       "Actual msg:\n"
       "[  DEATH   ] death\n");
 }
 
 TEST_F(TestForDeathTest, DeathTestUnexpectedReturnOutput) {
-  testing::GTEST_FLAG(death_test_style) = "fast";
-  EXPECT_NONFATAL_FAILURE(
-      EXPECT_DEATH({
-          fprintf(stderr, "returning\n");
-          fflush(stderr);
-          return;
-        }, ""),
-      "    Result: illegal return in test statement.\n"
-      " Error msg:\n"
-      "[  DEATH   ] returning\n");
+  GTEST_FLAG_SET(death_test_style, "fast");
+  EXPECT_NONFATAL_FAILURE(EXPECT_DEATH(
+                              {
+                                fprintf(stderr, "returning\n");
+                                fflush(stderr);
+                                return;
+                              },
+                              ""),
+                          "    Result: illegal return in test statement.\n"
+                          " Error msg:\n"
+                          "[  DEATH   ] returning\n");
 }
 
 TEST_F(TestForDeathTest, DeathTestBadExitCodeOutput) {
-  testing::GTEST_FLAG(death_test_style) = "fast";
+  GTEST_FLAG_SET(death_test_style, "fast");
   EXPECT_NONFATAL_FAILURE(
       EXPECT_EXIT(DieWithMessage("exiting with rc 1\n"),
-                  testing::ExitedWithCode(3),
-                  "expected message"),
+                  testing::ExitedWithCode(3), "expected message"),
       "    Result: died but not with expected exit code:\n"
       "            Exited with exit status 1\n"
       "Actual msg:\n"
@@ -920,7 +892,7 @@ TEST_F(TestForDeathTest, DeathTestBadExitCodeOutput) {
 }
 
 TEST_F(TestForDeathTest, DeathTestMultiLineMatchFail) {
-  testing::GTEST_FLAG(death_test_style) = "fast";
+  GTEST_FLAG_SET(death_test_style, "fast");
   EXPECT_NONFATAL_FAILURE(
       EXPECT_DEATH(DieWithMessage("line 1\nline 2\nline 3\n"),
                    "line 1\nxyz\nline 3\n"),
@@ -931,7 +903,7 @@ TEST_F(TestForDeathTest, DeathTestMultiLineMatchFail) {
 }
 
 TEST_F(TestForDeathTest, DeathTestMultiLineMatchPass) {
-  testing::GTEST_FLAG(death_test_style) = "fast";
+  GTEST_FLAG_SET(death_test_style, "fast");
   EXPECT_DEATH(DieWithMessage("line 1\nline 2\nline 3\n"),
                "line 1\nline 2\nline 3\n");
 }
@@ -945,8 +917,8 @@ class MockDeathTestFactory : public DeathTestFactory {
               int line, DeathTest** test) override;
 
   // Sets the parameters for subsequent calls to Create.
-  void SetParameters(bool create, DeathTest::TestRole role,
-                     int status, bool passed);
+  void SetParameters(bool create, DeathTest::TestRole role, int status,
+                     bool passed);
 
   // Accessors.
   int AssumeRoleCalls() const { return assume_role_calls_; }
@@ -988,17 +960,15 @@ class MockDeathTestFactory : public DeathTestFactory {
   bool test_deleted_;
 };
 
-
 // A DeathTest implementation useful in testing.  It returns values set
 // at its creation from its various inherited DeathTest methods, and
 // reports calls to those methods to its parent MockDeathTestFactory
 // object.
 class MockDeathTest : public DeathTest {
  public:
-  MockDeathTest(MockDeathTestFactory *parent,
-                TestRole role, int status, bool passed) :
-      parent_(parent), role_(role), status_(status), passed_(passed) {
-  }
+  MockDeathTest(MockDeathTestFactory* parent, TestRole role, int status,
+                bool passed)
+      : parent_(parent), role_(role), status_(status), passed_(passed) {}
   ~MockDeathTest() override { parent_->test_deleted_ = true; }
   TestRole AssumeRole() override {
     ++parent_->assume_role_calls_;
@@ -1023,7 +993,6 @@ class MockDeathTest : public DeathTest {
   const bool passed_;
 };
 
-
 // MockDeathTestFactory constructor.
 MockDeathTestFactory::MockDeathTestFactory()
     : create_(true),
@@ -1033,13 +1002,10 @@ MockDeathTestFactory::MockDeathTestFactory()
       assume_role_calls_(0),
       wait_calls_(0),
       passed_args_(),
-      abort_args_() {
-}
-
+      abort_args_() {}
 
 // Sets the parameters for subsequent calls to Create.
-void MockDeathTestFactory::SetParameters(bool create,
-                                         DeathTest::TestRole role,
+void MockDeathTestFactory::SetParameters(bool create, DeathTest::TestRole role,
                                          int status, bool passed) {
   create_ = create;
   role_ = role;
@@ -1052,7 +1018,6 @@ void MockDeathTestFactory::SetParameters(bool create,
   abort_args_.clear();
 }
 
-
 // Sets test to NULL (if create_ is false) or to the address of a new
 // MockDeathTest object with parameters taken from the last call
 // to SetParameters (if create_ is true).  Always returns true.
@@ -1092,10 +1057,12 @@ class MacroLogicDeathTest : public testing::Test {
   // test cannot be run directly from a test routine that uses a
   // MockDeathTest, or the remainder of the routine will not be executed.
   static void RunReturningDeathTest(bool* flag) {
-    ASSERT_DEATH({  // NOLINT
-      *flag = true;
-      return;
-    }, "");
+    ASSERT_DEATH(
+        {  // NOLINT
+          *flag = true;
+          return;
+        },
+        "");
   }
 };
 
@@ -1177,11 +1144,10 @@ TEST_F(MacroLogicDeathTest, ChildDoesNotDie) {
   // This time there are two calls to Abort: one since the test didn't
   // die, and another from the ReturnSentinel when it's destroyed.  The
   // sentinel normally isn't destroyed if a test doesn't die, since
-  // _exit(2) is called in that case by ForkingDeathTest, but not by
+  // _Exit(2) is called in that case by ForkingDeathTest, but not by
   // our MockDeathTest.
   ASSERT_EQ(2U, factory_->AbortCalls());
-  EXPECT_EQ(DeathTest::TEST_DID_NOT_DIE,
-            factory_->AbortArgument(0));
+  EXPECT_EQ(DeathTest::TEST_DID_NOT_DIE, factory_->AbortArgument(0));
   EXPECT_EQ(DeathTest::TEST_ENCOUNTERED_RETURN_STATEMENT,
             factory_->AbortArgument(1));
   EXPECT_TRUE(factory_->TestDeleted());
@@ -1190,19 +1156,23 @@ TEST_F(MacroLogicDeathTest, ChildDoesNotDie) {
 // Tests that a successful death test does not register a successful
 // test part.
 TEST(SuccessRegistrationDeathTest, NoSuccessPart) {
-  EXPECT_DEATH(_exit(1), "");
+  EXPECT_DEATH(_Exit(1), "");
   EXPECT_EQ(0, GetUnitTestImpl()->current_test_result()->total_part_count());
 }
 
 TEST(StreamingAssertionsDeathTest, DeathTest) {
-  EXPECT_DEATH(_exit(1), "") << "unexpected failure";
-  ASSERT_DEATH(_exit(1), "") << "unexpected failure";
-  EXPECT_NONFATAL_FAILURE({  // NOLINT
-    EXPECT_DEATH(_exit(0), "") << "expected failure";
-  }, "expected failure");
-  EXPECT_FATAL_FAILURE({  // NOLINT
-    ASSERT_DEATH(_exit(0), "") << "expected failure";
-  }, "expected failure");
+  EXPECT_DEATH(_Exit(1), "") << "unexpected failure";
+  ASSERT_DEATH(_Exit(1), "") << "unexpected failure";
+  EXPECT_NONFATAL_FAILURE(
+      {  // NOLINT
+        EXPECT_DEATH(_Exit(0), "") << "expected failure";
+      },
+      "expected failure");
+  EXPECT_FATAL_FAILURE(
+      {  // NOLINT
+        ASSERT_DEATH(_Exit(0), "") << "expected failure";
+      },
+      "expected failure");
 }
 
 // Tests that GetLastErrnoDescription returns an empty string when the
@@ -1214,7 +1184,7 @@ TEST(GetLastErrnoDescription, GetLastErrnoDescriptionWorks) {
   EXPECT_STREQ("", GetLastErrnoDescription().c_str());
 }
 
-# if GTEST_OS_WINDOWS
+#ifdef GTEST_OS_WINDOWS
 TEST(AutoHandleTest, AutoHandleWorks) {
   HANDLE handle = ::CreateEvent(NULL, FALSE, FALSE, NULL);
   ASSERT_NE(INVALID_HANDLE_VALUE, handle);
@@ -1239,15 +1209,15 @@ TEST(AutoHandleTest, AutoHandleWorks) {
   testing::internal::AutoHandle auto_handle2;
   EXPECT_EQ(INVALID_HANDLE_VALUE, auto_handle2.Get());
 }
-# endif  // GTEST_OS_WINDOWS
+#endif  // GTEST_OS_WINDOWS
 
-# if GTEST_OS_WINDOWS
+#ifdef GTEST_OS_WINDOWS
 typedef unsigned __int64 BiggestParsable;
 typedef signed __int64 BiggestSignedParsable;
-# else
+#else
 typedef unsigned long long BiggestParsable;
 typedef signed long long BiggestSignedParsable;
-# endif  // GTEST_OS_WINDOWS
+#endif  // GTEST_OS_WINDOWS
 
 // We cannot use std::numeric_limits<T>::max() as it clashes with the
 // max() macro defined by <windows.h>.
@@ -1338,11 +1308,11 @@ TEST(ParseNaturalNumberTest, WorksForShorterIntegers) {
   EXPECT_EQ(123, char_result);
 }
 
-# if GTEST_OS_WINDOWS
+#ifdef GTEST_OS_WINDOWS
 TEST(EnvironmentTest, HandleFitsIntoSizeT) {
   ASSERT_TRUE(sizeof(HANDLE) <= sizeof(size_t));
 }
-# endif  // GTEST_OS_WINDOWS
+#endif  // GTEST_OS_WINDOWS
 
 // Tests that EXPECT_DEATH_IF_SUPPORTED/ASSERT_DEATH_IF_SUPPORTED trigger
 // failures when death tests are available on the system.
@@ -1358,35 +1328,39 @@ TEST(ConditionalDeathMacrosDeathTest, ExpectsDeathWhenDeathTestsAvailable) {
 }
 
 TEST(InDeathTestChildDeathTest, ReportsDeathTestCorrectlyInFastStyle) {
-  testing::GTEST_FLAG(death_test_style) = "fast";
+  GTEST_FLAG_SET(death_test_style, "fast");
   EXPECT_FALSE(InDeathTestChild());
-  EXPECT_DEATH({
-    fprintf(stderr, InDeathTestChild() ? "Inside" : "Outside");
-    fflush(stderr);
-    _exit(1);
-  }, "Inside");
+  EXPECT_DEATH(
+      {
+        fprintf(stderr, InDeathTestChild() ? "Inside" : "Outside");
+        fflush(stderr);
+        _Exit(1);
+      },
+      "Inside");
 }
 
 TEST(InDeathTestChildDeathTest, ReportsDeathTestCorrectlyInThreadSafeStyle) {
-  testing::GTEST_FLAG(death_test_style) = "threadsafe";
+  GTEST_FLAG_SET(death_test_style, "threadsafe");
   EXPECT_FALSE(InDeathTestChild());
-  EXPECT_DEATH({
-    fprintf(stderr, InDeathTestChild() ? "Inside" : "Outside");
-    fflush(stderr);
-    _exit(1);
-  }, "Inside");
+  EXPECT_DEATH(
+      {
+        fprintf(stderr, InDeathTestChild() ? "Inside" : "Outside");
+        fflush(stderr);
+        _Exit(1);
+      },
+      "Inside");
 }
 
 void DieWithMessage(const char* message) {
   fputs(message, stderr);
   fflush(stderr);  // Make sure the text is printed before the process exits.
-  _exit(1);
+  _Exit(1);
 }
 
 TEST(MatcherDeathTest, DoesNotBreakBareRegexMatching) {
   // googletest tests this, of course; here we ensure that including googlemock
   // has not broken it.
-#if GTEST_USES_POSIX_RE
+#ifdef GTEST_USES_POSIX_RE
   EXPECT_DEATH(DieWithMessage("O, I die, Horatio."), "I d[aeiou]e");
 #else
   EXPECT_DEATH(DieWithMessage("O, I die, Horatio."), "I di?e");
@@ -1496,19 +1470,18 @@ TEST(ConditionalDeathMacrosSyntaxDeathTest, SingleStatement) {
     ASSERT_DEATH_IF_SUPPORTED(return, "");
 
   if (AlwaysTrue())
-    EXPECT_DEATH_IF_SUPPORTED(_exit(1), "");
+    EXPECT_DEATH_IF_SUPPORTED(_Exit(1), "");
   else
     // This empty "else" branch is meant to ensure that EXPECT_DEATH
     // doesn't expand into an "if" statement without an "else"
     ;  // NOLINT
 
-  if (AlwaysFalse())
-    ASSERT_DEATH_IF_SUPPORTED(return, "") << "did not die";
+  if (AlwaysFalse()) ASSERT_DEATH_IF_SUPPORTED(return, "") << "did not die";
 
   if (AlwaysFalse())
     ;  // NOLINT
   else
-    EXPECT_DEATH_IF_SUPPORTED(_exit(1), "") << 1 << 2 << 3;
+    EXPECT_DEATH_IF_SUPPORTED(_Exit(1), "") << 1 << 2 << 3;
 }
 #ifdef __GNUC__
 #pragma GCC diagnostic pop
@@ -1522,21 +1495,18 @@ TEST(ConditionalDeathMacrosSyntaxDeathTest, SwitchStatement) {
   GTEST_DISABLE_MSC_WARNINGS_PUSH_(4065)
 
   switch (0)
-    default:
-      ASSERT_DEATH_IF_SUPPORTED(_exit(1), "")
-          << "exit in default switch handler";
+  default:
+    ASSERT_DEATH_IF_SUPPORTED(_Exit(1), "") << "exit in default switch handler";
 
   switch (0)
-    case 0:
-      EXPECT_DEATH_IF_SUPPORTED(_exit(1), "") << "exit in switch case";
+  case 0:
+    EXPECT_DEATH_IF_SUPPORTED(_Exit(1), "") << "exit in switch case";
 
   GTEST_DISABLE_MSC_WARNINGS_POP_()
 }
 
 // Tests that a test case whose name ends with "DeathTest" works fine
 // on Windows.
-TEST(NotADeathTest, Test) {
-  SUCCEED();
-}
+TEST(NotADeathTest, Test) { SUCCEED(); }
 
 }  // namespace
diff --git a/external/googletest/googletest/test/googletest-death-test_ex_test.cc b/external/googletest/googletest/test/googletest-death-test_ex_test.cc
index 45040b25..34d55013 100644
--- a/external/googletest/googletest/test/googletest-death-test_ex_test.cc
+++ b/external/googletest/googletest/test/googletest-death-test_ex_test.cc
@@ -33,7 +33,7 @@
 #include "gtest/gtest-death-test.h"
 #include "gtest/gtest.h"
 
-#if GTEST_HAS_DEATH_TEST
+#ifdef GTEST_HAS_DEATH_TEST
 
 #if GTEST_HAS_SEH
 #include <windows.h>  // For RaiseException().
@@ -53,7 +53,7 @@ TEST(CxxExceptionDeathTest, ExceptionIsFailure) {
   } catch (...) {  // NOLINT
     FAIL() << "An exception escaped a death test macro invocation "
            << "with catch_exceptions "
-           << (testing::GTEST_FLAG(catch_exceptions) ? "enabled" : "disabled");
+           << (GTEST_FLAG_GET(catch_exceptions) ? "enabled" : "disabled");
   }
 }
 
@@ -78,7 +78,7 @@ TEST(CxxExceptionDeathTest, PrintsMessageForStdExceptions) {
 TEST(SehExceptionDeasTest, CatchExceptionsDoesNotInterfere) {
   EXPECT_DEATH(RaiseException(42, 0x0, 0, NULL), "")
       << "with catch_exceptions "
-      << (testing::GTEST_FLAG(catch_exceptions) ? "enabled" : "disabled");
+      << (GTEST_FLAG_GET(catch_exceptions) ? "enabled" : "disabled");
 }
 #endif
 
@@ -86,6 +86,6 @@ TEST(SehExceptionDeasTest, CatchExceptionsDoesNotInterfere) {
 
 int main(int argc, char** argv) {
   testing::InitGoogleTest(&argc, argv);
-  testing::GTEST_FLAG(catch_exceptions) = GTEST_ENABLE_CATCH_EXCEPTIONS_ != 0;
+  GTEST_FLAG_SET(catch_exceptions, GTEST_ENABLE_CATCH_EXCEPTIONS_ != 0);
   return RUN_ALL_TESTS();
 }
diff --git a/external/googletest/googletest/test/googletest-env-var-test.py b/external/googletest/googletest/test/googletest-env-var-test.py
old mode 100644
new mode 100755
index e8b96ad8..24d8edbb
--- a/external/googletest/googletest/test/googletest-env-var-test.py
+++ b/external/googletest/googletest/test/googletest-env-var-test.py
@@ -32,7 +32,8 @@
 """Verifies that Google Test correctly parses environment variables."""
 
 import os
-import gtest_test_utils
+from googletest.test import gtest_test_utils
+
 
 IS_WINDOWS = os.name == 'nt'
 IS_LINUX = os.name == 'posix' and os.uname()[0] == 'Linux'
@@ -43,77 +44,77 @@
 
 
 def AssertEq(expected, actual):
-    if expected != actual:
-        print('Expected: %s' % (expected,))
-        print('  Actual: %s' % (actual,))
-        raise AssertionError
+  if expected != actual:
+    print('Expected: %s' % (expected,))
+    print('  Actual: %s' % (actual,))
+    raise AssertionError
 
 
 def SetEnvVar(env_var, value):
-    """Sets the env variable to 'value'; unsets it when 'value' is None."""
+  """Sets the env variable to 'value'; unsets it when 'value' is None."""
 
-    if value is not None:
-        environ[env_var] = value
-    elif env_var in environ:
-        del environ[env_var]
+  if value is not None:
+    environ[env_var] = value
+  elif env_var in environ:
+    del environ[env_var]
 
 
 def GetFlag(flag):
-    """Runs googletest-env-var-test_ and returns its output."""
+  """Runs googletest-env-var-test_ and returns its output."""
 
-    args = [COMMAND]
-    if flag is not None:
-        args += [flag]
-    return gtest_test_utils.Subprocess(args, env=environ).output
+  args = [COMMAND]
+  if flag is not None:
+    args += [flag]
+  return gtest_test_utils.Subprocess(args, env=environ).output
 
 
 def TestFlag(flag, test_val, default_val):
-    """Verifies that the given flag is affected by the corresponding env var."""
+  """Verifies that the given flag is affected by the corresponding env var."""
 
-    env_var = 'GTEST_' + flag.upper()
-    SetEnvVar(env_var, test_val)
-    AssertEq(test_val, GetFlag(flag))
-    SetEnvVar(env_var, None)
-    AssertEq(default_val, GetFlag(flag))
+  env_var = 'GTEST_' + flag.upper()
+  SetEnvVar(env_var, test_val)
+  AssertEq(test_val, GetFlag(flag))
+  SetEnvVar(env_var, None)
+  AssertEq(default_val, GetFlag(flag))
 
 
 class GTestEnvVarTest(gtest_test_utils.TestCase):
 
-    def testEnvVarAffectsFlag(self):
-        """Tests that environment variable should affect the corresponding flag."""
+  def testEnvVarAffectsFlag(self):
+    """Tests that environment variable should affect the corresponding flag."""
 
-        TestFlag('break_on_failure', '1', '0')
-        TestFlag('color', 'yes', 'auto')
-        SetEnvVar('TESTBRIDGE_TEST_RUNNER_FAIL_FAST', None)  # For 'fail_fast' test
-        TestFlag('fail_fast', '1', '0')
-        TestFlag('filter', 'FooTest.Bar', '*')
-        SetEnvVar('XML_OUTPUT_FILE', None)  # For 'output' test
-        TestFlag('output', 'xml:tmp/foo.xml', '')
-        TestFlag('brief', '1', '0')
-        TestFlag('print_time', '0', '1')
-        TestFlag('repeat', '999', '1')
-        TestFlag('throw_on_failure', '1', '0')
-        TestFlag('death_test_style', 'threadsafe', 'fast')
-        TestFlag('catch_exceptions', '0', '1')
+    TestFlag('break_on_failure', '1', '0')
+    TestFlag('color', 'yes', 'auto')
+    SetEnvVar('TESTBRIDGE_TEST_RUNNER_FAIL_FAST', None)  # For 'fail_fast' test
+    TestFlag('fail_fast', '1', '0')
+    TestFlag('filter', 'FooTest.Bar', '*')
+    SetEnvVar('XML_OUTPUT_FILE', None)  # For 'output' test
+    TestFlag('output', 'xml:tmp/foo.xml', '')
+    TestFlag('brief', '1', '0')
+    TestFlag('print_time', '0', '1')
+    TestFlag('repeat', '999', '1')
+    TestFlag('throw_on_failure', '1', '0')
+    TestFlag('death_test_style', 'threadsafe', 'fast')
+    TestFlag('catch_exceptions', '0', '1')
 
-        if IS_LINUX:
-            TestFlag('death_test_use_fork', '1', '0')
-            TestFlag('stack_trace_depth', '0', '100')
+    if IS_LINUX:
+      TestFlag('death_test_use_fork', '1', '0')
+      TestFlag('stack_trace_depth', '0', '100')
 
-    def testXmlOutputFile(self):
-        """Tests that $XML_OUTPUT_FILE affects the output flag."""
+  def testXmlOutputFile(self):
+    """Tests that $XML_OUTPUT_FILE affects the output flag."""
 
-        SetEnvVar('GTEST_OUTPUT', None)
-        SetEnvVar('XML_OUTPUT_FILE', 'tmp/bar.xml')
-        AssertEq('xml:tmp/bar.xml', GetFlag('output'))
+    SetEnvVar('GTEST_OUTPUT', None)
+    SetEnvVar('XML_OUTPUT_FILE', 'tmp/bar.xml')
+    AssertEq('xml:tmp/bar.xml', GetFlag('output'))
 
-    def testXmlOutputFileOverride(self):
-        """Tests that $XML_OUTPUT_FILE is overridden by $GTEST_OUTPUT."""
+  def testXmlOutputFileOverride(self):
+    """Tests that $XML_OUTPUT_FILE is overridden by $GTEST_OUTPUT."""
 
-        SetEnvVar('GTEST_OUTPUT', 'xml:tmp/foo.xml')
-        SetEnvVar('XML_OUTPUT_FILE', 'tmp/bar.xml')
-        AssertEq('xml:tmp/foo.xml', GetFlag('output'))
+    SetEnvVar('GTEST_OUTPUT', 'xml:tmp/foo.xml')
+    SetEnvVar('XML_OUTPUT_FILE', 'tmp/bar.xml')
+    AssertEq('xml:tmp/foo.xml', GetFlag('output'))
 
 
 if __name__ == '__main__':
-    gtest_test_utils.Main()
+  gtest_test_utils.Main()
diff --git a/external/googletest/googletest/test/googletest-env-var-test_.cc b/external/googletest/googletest/test/googletest-env-var-test_.cc
index 52f95864..36533750 100644
--- a/external/googletest/googletest/test/googletest-env-var-test_.cc
+++ b/external/googletest/googletest/test/googletest-env-var-test_.cc
@@ -27,7 +27,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
 // A helper program for testing that Google Test parses the environment
 // variables correctly.
 
@@ -43,72 +42,71 @@ namespace testing {
 // The purpose of this is to make the test more realistic by ensuring
 // that the UnitTest singleton is created before main() is entered.
 // We don't actual run the TEST itself.
-TEST(GTestEnvVarTest, Dummy) {
-}
+TEST(GTestEnvVarTest, Dummy) {}
 
 void PrintFlag(const char* flag) {
   if (strcmp(flag, "break_on_failure") == 0) {
-    cout << GTEST_FLAG(break_on_failure);
+    cout << GTEST_FLAG_GET(break_on_failure);
     return;
   }
 
   if (strcmp(flag, "catch_exceptions") == 0) {
-    cout << GTEST_FLAG(catch_exceptions);
+    cout << GTEST_FLAG_GET(catch_exceptions);
     return;
   }
 
   if (strcmp(flag, "color") == 0) {
-    cout << GTEST_FLAG(color);
+    cout << GTEST_FLAG_GET(color);
     return;
   }
 
   if (strcmp(flag, "death_test_style") == 0) {
-    cout << GTEST_FLAG(death_test_style);
+    cout << GTEST_FLAG_GET(death_test_style);
     return;
   }
 
   if (strcmp(flag, "death_test_use_fork") == 0) {
-    cout << GTEST_FLAG(death_test_use_fork);
+    cout << GTEST_FLAG_GET(death_test_use_fork);
     return;
   }
 
   if (strcmp(flag, "fail_fast") == 0) {
-    cout << GTEST_FLAG(fail_fast);
+    cout << GTEST_FLAG_GET(fail_fast);
     return;
   }
 
   if (strcmp(flag, "filter") == 0) {
-    cout << GTEST_FLAG(filter);
+    cout << GTEST_FLAG_GET(filter);
     return;
   }
 
   if (strcmp(flag, "output") == 0) {
-    cout << GTEST_FLAG(output);
+    cout << GTEST_FLAG_GET(output);
     return;
   }
 
   if (strcmp(flag, "brief") == 0) {
-    cout << GTEST_FLAG(brief);
+    cout << GTEST_FLAG_GET(brief);
     return;
   }
 
   if (strcmp(flag, "print_time") == 0) {
-    cout << GTEST_FLAG(print_time);
+    cout << GTEST_FLAG_GET(print_time);
     return;
   }
 
   if (strcmp(flag, "repeat") == 0) {
-    cout << GTEST_FLAG(repeat);
+    cout << GTEST_FLAG_GET(repeat);
     return;
   }
 
   if (strcmp(flag, "stack_trace_depth") == 0) {
-    cout << GTEST_FLAG(stack_trace_depth);
+    cout << GTEST_FLAG_GET(stack_trace_depth);
     return;
   }
 
   if (strcmp(flag, "throw_on_failure") == 0) {
-    cout << GTEST_FLAG(throw_on_failure);
+    cout << GTEST_FLAG_GET(throw_on_failure);
     return;
   }
 
diff --git a/external/googletest/googletest/test/googletest-fail-if-no-test-linked-test-with-disabled-test_.cc b/external/googletest/googletest/test/googletest-fail-if-no-test-linked-test-with-disabled-test_.cc
new file mode 100644
index 00000000..56d26901
--- /dev/null
+++ b/external/googletest/googletest/test/googletest-fail-if-no-test-linked-test-with-disabled-test_.cc
@@ -0,0 +1,38 @@
+// Copyright 2025, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Unit test for Google Test's --gtest_fail_if_no_test_linked flag.
+//
+// This program will be invoked from a Python test.
+// Don't run it directly.
+
+#include "gtest/gtest.h"
+
+// A dummy test that is disabled.
+TEST(SomeTest, DISABLED_Test1) {}
diff --git a/external/googletest/googletest/test/googletest-fail-if-no-test-linked-test-with-enabled-test_.cc b/external/googletest/googletest/test/googletest-fail-if-no-test-linked-test-with-enabled-test_.cc
new file mode 100644
index 00000000..1ed20343
--- /dev/null
+++ b/external/googletest/googletest/test/googletest-fail-if-no-test-linked-test-with-enabled-test_.cc
@@ -0,0 +1,38 @@
+// Copyright 2025, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Unit test for Google Test's --gtest_fail_if_no_test_linked flag.
+//
+// This program will be invoked from a Python test.
+// Don't run it directly.
+
+#include "gtest/gtest.h"
+
+// A dummy test that is enabled.
+TEST(SomeTest, Test1) {}
diff --git a/external/googletest/googletest/test/googletest-fail-if-no-test-linked-test.py b/external/googletest/googletest/test/googletest-fail-if-no-test-linked-test.py
new file mode 100755
index 00000000..f5854ba9
--- /dev/null
+++ b/external/googletest/googletest/test/googletest-fail-if-no-test-linked-test.py
@@ -0,0 +1,169 @@
+#!/usr/bin/env python3  # pylint: disable=g-interpreter-mismatch
+#
+# Copyright 2025, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""Tests for Google Test's --gtest_fail_if_no_test_linked flag."""
+
+import os
+from googletest.test import gtest_test_utils
+
+# The command line flag for enabling the fail-if-no-test-linked behavior.
+FAIL_IF_NO_TEST_LINKED_FLAG = "gtest_fail_if_no_test_linked"
+
+# The environment variable for the test output warnings file.
+TEST_WARNINGS_OUTPUT_FILE = "TEST_WARNINGS_OUTPUT_FILE"
+
+
+class GTestFailIfNoTestLinkedTest(gtest_test_utils.TestCase):
+  """Tests the --gtest_fail_if_no_test_linked flag."""
+
+  def Run(self, program_name, flag=None, env=None):
+    """Run the given program with the given flag.
+
+    Args:
+      program_name: Name of the program to run.
+      flag: The command line flag to pass to the program, or None.
+      env: Dictionary with environment to pass to the subprocess.
+
+    Returns:
+      True if the program exits with code 0, false otherwise.
+    """
+
+    exe_path = gtest_test_utils.GetTestExecutablePath(program_name)
+    args = [exe_path]
+    if flag is not None:
+      args += [flag]
+    process = gtest_test_utils.Subprocess(args, capture_stderr=False, env=env)
+    return process.exited and process.exit_code == 0
+
+  def testSucceedsIfNoTestLinkedAndFlagNotSpecified(self):
+    """Tests the behavior of no test linked and flag not specified."""
+    self.assertTrue(
+        self.Run("googletest-fail-if-no-test-linked-test-without-test_")
+    )
+
+  def testSucceedsIfNoTestLinkedAndFlagNotSpecifiedWithWarningFile(self):
+    """Tests that no test linked results in warning file output."""
+
+    warning_file = os.path.join(gtest_test_utils.GetTempDir(), "NO_TEST_LINKED")
+    self.assertTrue(
+        self.Run(
+            "googletest-fail-if-no-test-linked-test-without-test_",
+            env={TEST_WARNINGS_OUTPUT_FILE: warning_file},
+        )
+    )
+    warning_file_contents = open(warning_file, "r").read()
+    self.assertEqual(
+        warning_file_contents,
+        "This test program does NOT link in any test case. Please make sure"
+        " this is intended.\n",
+    )
+
+  def testFailsIfNoTestLinkedAndFlagSpecified(self):
+    """Tests the behavior of no test linked and flag specified."""
+
+    warning_file = os.path.join(
+        gtest_test_utils.GetTempDir(), "SHOULD_NOT_EXIST"
+    )
+    self.assertFalse(
+        self.Run(
+            "googletest-fail-if-no-test-linked-test-without-test_",
+            f"--{FAIL_IF_NO_TEST_LINKED_FLAG}",
+            env={TEST_WARNINGS_OUTPUT_FILE: warning_file},
+        )
+    )
+    with self.assertRaises(FileNotFoundError):
+      open(warning_file, "r")
+
+  def testSucceedsIfEnabledTestLinkedAndFlagNotSpecified(self):
+    """Tests the behavior of enabled test linked and flag not specified."""
+
+    warning_file = os.path.join(
+        gtest_test_utils.GetTempDir(), "SHOULD_NOT_EXIST"
+    )
+    self.assertTrue(
+        self.Run(
+            "googletest-fail-if-no-test-linked-test-with-enabled-test_",
+            env={TEST_WARNINGS_OUTPUT_FILE: warning_file},
+        )
+    )
+    with self.assertRaises(FileNotFoundError):
+      open(warning_file, "r")
+
+  def testSucceedsIfEnabledTestLinkedAndFlagSpecified(self):
+    """Tests the behavior of enabled test linked and flag specified."""
+
+    warning_file = os.path.join(
+        gtest_test_utils.GetTempDir(), "SHOULD_NOT_EXIST"
+    )
+    self.assertTrue(
+        self.Run(
+            "googletest-fail-if-no-test-linked-test-with-enabled-test_",
+            f"--{FAIL_IF_NO_TEST_LINKED_FLAG}",
+            env={TEST_WARNINGS_OUTPUT_FILE: warning_file},
+        )
+    )
+    with self.assertRaises(FileNotFoundError):
+      open(warning_file, "r")
+
+  def testSucceedsIfDisabledTestLinkedAndFlagNotSpecified(self):
+    """Tests the behavior of disabled test linked and flag not specified."""
+
+    warning_file = os.path.join(
+        gtest_test_utils.GetTempDir(), "SHOULD_NOT_EXIST"
+    )
+    self.assertTrue(
+        self.Run(
+            "googletest-fail-if-no-test-linked-test-with-disabled-test_",
+            env={TEST_WARNINGS_OUTPUT_FILE: warning_file},
+        )
+    )
+    with self.assertRaises(FileNotFoundError):
+      open(warning_file, "r")
+
+  def testSucceedsIfDisabledTestLinkedAndFlagSpecified(self):
+    """Tests the behavior of disabled test linked and flag specified."""
+
+    warning_file = os.path.join(
+        gtest_test_utils.GetTempDir(), "SHOULD_NOT_EXIST"
+    )
+    self.assertTrue(
+        self.Run(
+            "googletest-fail-if-no-test-linked-test-with-disabled-test_",
+            f"--{FAIL_IF_NO_TEST_LINKED_FLAG}",
+            env={TEST_WARNINGS_OUTPUT_FILE: warning_file},
+        )
+    )
+    with self.assertRaises(FileNotFoundError):
+      open(warning_file, "r")
+
+
+if __name__ == "__main__":
+  gtest_test_utils.Main()
diff --git a/external/googletest/googletest/test/googletest-failfast-unittest.py b/external/googletest/googletest/test/googletest-failfast-unittest.py
old mode 100644
new mode 100755
index d871fa22..cdbce0c5
--- a/external/googletest/googletest/test/googletest-failfast-unittest.py
+++ b/external/googletest/googletest/test/googletest-failfast-unittest.py
@@ -41,7 +41,7 @@
 """
 
 import os
-import gtest_test_utils
+from googletest.test import gtest_test_utils
 
 # Constants.
 
@@ -62,15 +62,18 @@
 
 # Command to run the googletest-failfast-unittest_ program.
 COMMAND = gtest_test_utils.GetTestExecutablePath(
-    'googletest-failfast-unittest_')
+    'googletest-failfast-unittest_'
+)
 
 # The command line flag to tell Google Test to output the list of tests it
 # will run.
 LIST_TESTS_FLAG = '--gtest_list_tests'
 
 # Indicates whether Google Test supports death tests.
-SUPPORTS_DEATH_TESTS = 'HasDeathTest' in gtest_test_utils.Subprocess(
-    [COMMAND, LIST_TESTS_FLAG]).output
+SUPPORTS_DEATH_TESTS = (
+    'HasDeathTest'
+    in gtest_test_utils.Subprocess([COMMAND, LIST_TESTS_FLAG]).output
+)
 
 # Utilities.
 
@@ -78,332 +81,381 @@
 
 
 def SetEnvVar(env_var, value):
-    """Sets the env variable to 'value'; unsets it when 'value' is None."""
+  """Sets the env variable to 'value'; unsets it when 'value' is None."""
 
-    if value is not None:
-        environ[env_var] = value
-    elif env_var in environ:
-        del environ[env_var]
+  if value is not None:
+    environ[env_var] = value
+  elif env_var in environ:
+    del environ[env_var]
 
 
 def RunAndReturnOutput(test_suite=None, fail_fast=None, run_disabled=False):
-    """Runs the test program and returns its output."""
-
-    args = []
-    xml_path = os.path.join(gtest_test_utils.GetTempDir(),
-                            '.GTestFailFastUnitTest.xml')
-    args += ['--gtest_output=xml:' + xml_path]
-    if fail_fast is not None:
-        if isinstance(fail_fast, str):
-            args += ['--%s=%s' % (FAIL_FAST_FLAG, fail_fast)]
-        elif fail_fast:
-            args += ['--%s' % FAIL_FAST_FLAG]
-        else:
-            args += ['--no%s' % FAIL_FAST_FLAG]
-    if test_suite:
-        args += ['--%s=%s.*' % (FILTER_FLAG, test_suite)]
-    if run_disabled:
-        args += ['--%s' % RUN_DISABLED_FLAG]
-    txt_out = gtest_test_utils.Subprocess([COMMAND] + args, env=environ).output
-    with open(xml_path) as xml_file:
-        return txt_out, xml_file.read()
+  """Runs the test program and returns its output."""
+
+  args = []
+  xml_path = os.path.join(
+      gtest_test_utils.GetTempDir(), '.GTestFailFastUnitTest.xml'
+  )
+  args += ['--gtest_output=xml:' + xml_path]
+  if fail_fast is not None:
+    if isinstance(fail_fast, str):
+      args += ['--%s=%s' % (FAIL_FAST_FLAG, fail_fast)]
+    elif fail_fast:
+      args += ['--%s' % FAIL_FAST_FLAG]
+    else:
+      args += ['--no%s' % FAIL_FAST_FLAG]
+  if test_suite:
+    args += ['--%s=%s.*' % (FILTER_FLAG, test_suite)]
+  if run_disabled:
+    args += ['--%s' % RUN_DISABLED_FLAG]
+  txt_out = gtest_test_utils.Subprocess([COMMAND] + args, env=environ).output
+  with open(xml_path) as xml_file:
+    return txt_out, xml_file.read()
 
 
 # The unit test.
 class GTestFailFastUnitTest(gtest_test_utils.TestCase):
-    """Tests the env variable or the command line flag for fail_fast."""
-
-    def testDefaultBehavior(self):
-        """Tests the behavior of not specifying the fail_fast."""
-
-        txt, _ = RunAndReturnOutput()
-        self.assertIn('22 FAILED TEST', txt)
-
-    def testGoogletestFlag(self):
-        txt, _ = RunAndReturnOutput(test_suite='HasSimpleTest', fail_fast=True)
-        self.assertIn('1 FAILED TEST', txt)
-        self.assertIn('[  SKIPPED ] 3 tests', txt)
-
-        txt, _ = RunAndReturnOutput(test_suite='HasSimpleTest', fail_fast=False)
-        self.assertIn('4 FAILED TEST', txt)
-        self.assertNotIn('[  SKIPPED ]', txt)
-
-    def testGoogletestEnvVar(self):
-        """Tests the behavior of specifying fail_fast via Googletest env var."""
-
-        try:
-            SetEnvVar(FAIL_FAST_ENV_VAR, '1')
-            txt, _ = RunAndReturnOutput('HasSimpleTest')
-            self.assertIn('1 FAILED TEST', txt)
-            self.assertIn('[  SKIPPED ] 3 tests', txt)
-
-            SetEnvVar(FAIL_FAST_ENV_VAR, '0')
-            txt, _ = RunAndReturnOutput('HasSimpleTest')
-            self.assertIn('4 FAILED TEST', txt)
-            self.assertNotIn('[  SKIPPED ]', txt)
-        finally:
-            SetEnvVar(FAIL_FAST_ENV_VAR, None)
-
-    def testBazelEnvVar(self):
-        """Tests the behavior of specifying fail_fast via Bazel testbridge."""
-
-        try:
-            SetEnvVar(BAZEL_FAIL_FAST_ENV_VAR, '1')
-            txt, _ = RunAndReturnOutput('HasSimpleTest')
-            self.assertIn('1 FAILED TEST', txt)
-            self.assertIn('[  SKIPPED ] 3 tests', txt)
-
-            SetEnvVar(BAZEL_FAIL_FAST_ENV_VAR, '0')
-            txt, _ = RunAndReturnOutput('HasSimpleTest')
-            self.assertIn('4 FAILED TEST', txt)
-            self.assertNotIn('[  SKIPPED ]', txt)
-        finally:
-            SetEnvVar(BAZEL_FAIL_FAST_ENV_VAR, None)
-
-    def testFlagOverridesEnvVar(self):
-        """Tests precedence of flag over env var."""
-
-        try:
-            SetEnvVar(FAIL_FAST_ENV_VAR, '0')
-            txt, _ = RunAndReturnOutput('HasSimpleTest', True)
-            self.assertIn('1 FAILED TEST', txt)
-            self.assertIn('[  SKIPPED ] 3 tests', txt)
-        finally:
-            SetEnvVar(FAIL_FAST_ENV_VAR, None)
-
-    def testGoogletestEnvVarOverridesBazelEnvVar(self):
-        """Tests that the Googletest native env var over Bazel testbridge."""
-
-        try:
-            SetEnvVar(BAZEL_FAIL_FAST_ENV_VAR, '0')
-            SetEnvVar(FAIL_FAST_ENV_VAR, '1')
-            txt, _ = RunAndReturnOutput('HasSimpleTest')
-            self.assertIn('1 FAILED TEST', txt)
-            self.assertIn('[  SKIPPED ] 3 tests', txt)
-        finally:
-            SetEnvVar(FAIL_FAST_ENV_VAR, None)
-            SetEnvVar(BAZEL_FAIL_FAST_ENV_VAR, None)
-
-    def testEventListener(self):
-        txt, _ = RunAndReturnOutput(test_suite='HasSkipTest', fail_fast=True)
-        self.assertIn('1 FAILED TEST', txt)
-        self.assertIn('[  SKIPPED ] 3 tests', txt)
-        for expected_count, callback in [(1, 'OnTestSuiteStart'),
-                                         (5, 'OnTestStart'),
-                                         (5, 'OnTestEnd'),
-                                         (5, 'OnTestPartResult'),
-                                         (1, 'OnTestSuiteEnd')]:
-            self.assertEqual(
-                expected_count, txt.count(callback),
-                'Expected %d calls to callback %s match count on output: %s ' %
-                (expected_count, callback, txt))
-
-        txt, _ = RunAndReturnOutput(test_suite='HasSkipTest', fail_fast=False)
-        self.assertIn('3 FAILED TEST', txt)
-        self.assertIn('[  SKIPPED ] 1 test', txt)
-        for expected_count, callback in [(1, 'OnTestSuiteStart'),
-                                         (5, 'OnTestStart'),
-                                         (5, 'OnTestEnd'),
-                                         (5, 'OnTestPartResult'),
-                                         (1, 'OnTestSuiteEnd')]:
-            self.assertEqual(
-                expected_count, txt.count(callback),
-                'Expected %d calls to callback %s match count on output: %s ' %
-                (expected_count, callback, txt))
-
-    def assertXmlResultCount(self, result, count, xml):
-        self.assertEqual(
-            count, xml.count('result="%s"' % result),
-            'Expected \'result="%s"\' match count of %s: %s ' %
-            (result, count, xml))
-
-    def assertXmlStatusCount(self, status, count, xml):
-        self.assertEqual(
-            count, xml.count('status="%s"' % status),
-            'Expected \'status="%s"\' match count of %s: %s ' %
-            (status, count, xml))
-
-    def assertFailFastXmlAndTxtOutput(self,
-                                      fail_fast,
-                                      test_suite,
-                                      passed_count,
-                                      failure_count,
-                                      skipped_count,
-                                      suppressed_count,
-                                      run_disabled=False):
-        """Assert XML and text output of a test execution."""
-
-        txt, xml = RunAndReturnOutput(test_suite, fail_fast, run_disabled)
-        if failure_count > 0:
-            self.assertIn('%s FAILED TEST' % failure_count, txt)
-        if suppressed_count > 0:
-            self.assertIn('%s DISABLED TEST' % suppressed_count, txt)
-        if skipped_count > 0:
-            self.assertIn('[  SKIPPED ] %s tests' % skipped_count, txt)
-        self.assertXmlStatusCount('run',
-                                  passed_count + failure_count + skipped_count, xml)
-        self.assertXmlStatusCount('notrun', suppressed_count, xml)
-        self.assertXmlResultCount('completed', passed_count + failure_count, xml)
-        self.assertXmlResultCount('skipped', skipped_count, xml)
-        self.assertXmlResultCount('suppressed', suppressed_count, xml)
-
-    def assertFailFastBehavior(self,
-                               test_suite,
-                               passed_count,
-                               failure_count,
-                               skipped_count,
-                               suppressed_count,
-                               run_disabled=False):
-        """Assert --fail_fast via flag."""
-
-        for fail_fast in ('true', '1', 't', True):
-            self.assertFailFastXmlAndTxtOutput(fail_fast, test_suite, passed_count,
-                                               failure_count, skipped_count,
-                                               suppressed_count, run_disabled)
-
-    def assertNotFailFastBehavior(self,
-                                  test_suite,
-                                  passed_count,
-                                  failure_count,
-                                  skipped_count,
-                                  suppressed_count,
-                                  run_disabled=False):
-        """Assert --nofail_fast via flag."""
-
-        for fail_fast in ('false', '0', 'f', False):
-            self.assertFailFastXmlAndTxtOutput(fail_fast, test_suite, passed_count,
-                                               failure_count, skipped_count,
-                                               suppressed_count, run_disabled)
-
-    def testFlag_HasFixtureTest(self):
-        """Tests the behavior of fail_fast and TEST_F."""
-        self.assertFailFastBehavior(
-            test_suite='HasFixtureTest',
-            passed_count=1,
-            failure_count=1,
-            skipped_count=3,
-            suppressed_count=0)
-        self.assertNotFailFastBehavior(
-            test_suite='HasFixtureTest',
-            passed_count=1,
-            failure_count=4,
-            skipped_count=0,
-            suppressed_count=0)
-
-    def testFlag_HasSimpleTest(self):
-        """Tests the behavior of fail_fast and TEST."""
-        self.assertFailFastBehavior(
-            test_suite='HasSimpleTest',
-            passed_count=1,
-            failure_count=1,
-            skipped_count=3,
-            suppressed_count=0)
-        self.assertNotFailFastBehavior(
-            test_suite='HasSimpleTest',
-            passed_count=1,
-            failure_count=4,
-            skipped_count=0,
-            suppressed_count=0)
-
-    def testFlag_HasParametersTest(self):
-        """Tests the behavior of fail_fast and TEST_P."""
-        self.assertFailFastBehavior(
-            test_suite='HasParametersSuite/HasParametersTest',
-            passed_count=0,
-            failure_count=1,
-            skipped_count=3,
-            suppressed_count=0)
-        self.assertNotFailFastBehavior(
-            test_suite='HasParametersSuite/HasParametersTest',
-            passed_count=0,
-            failure_count=4,
-            skipped_count=0,
-            suppressed_count=0)
-
-    def testFlag_HasDisabledTest(self):
-        """Tests the behavior of fail_fast and Disabled test cases."""
-        self.assertFailFastBehavior(
-            test_suite='HasDisabledTest',
-            passed_count=1,
-            failure_count=1,
-            skipped_count=2,
-            suppressed_count=1,
-            run_disabled=False)
-        self.assertNotFailFastBehavior(
-            test_suite='HasDisabledTest',
-            passed_count=1,
-            failure_count=3,
-            skipped_count=0,
-            suppressed_count=1,
-            run_disabled=False)
-
-    def testFlag_HasDisabledRunDisabledTest(self):
-        """Tests the behavior of fail_fast and Disabled test cases enabled."""
-        self.assertFailFastBehavior(
-            test_suite='HasDisabledTest',
-            passed_count=1,
-            failure_count=1,
-            skipped_count=3,
-            suppressed_count=0,
-            run_disabled=True)
-        self.assertNotFailFastBehavior(
-            test_suite='HasDisabledTest',
-            passed_count=1,
-            failure_count=4,
-            skipped_count=0,
-            suppressed_count=0,
-            run_disabled=True)
-
-    def testFlag_HasDisabledSuiteTest(self):
-        """Tests the behavior of fail_fast and Disabled test suites."""
-        self.assertFailFastBehavior(
-            test_suite='DISABLED_HasDisabledSuite',
-            passed_count=0,
-            failure_count=0,
-            skipped_count=0,
-            suppressed_count=5,
-            run_disabled=False)
-        self.assertNotFailFastBehavior(
-            test_suite='DISABLED_HasDisabledSuite',
-            passed_count=0,
-            failure_count=0,
-            skipped_count=0,
-            suppressed_count=5,
-            run_disabled=False)
-
-    def testFlag_HasDisabledSuiteRunDisabledTest(self):
-        """Tests the behavior of fail_fast and Disabled test suites enabled."""
-        self.assertFailFastBehavior(
-            test_suite='DISABLED_HasDisabledSuite',
-            passed_count=1,
-            failure_count=1,
-            skipped_count=3,
-            suppressed_count=0,
-            run_disabled=True)
-        self.assertNotFailFastBehavior(
-            test_suite='DISABLED_HasDisabledSuite',
-            passed_count=1,
-            failure_count=4,
-            skipped_count=0,
-            suppressed_count=0,
-            run_disabled=True)
-
-    if SUPPORTS_DEATH_TESTS:
-        def testFlag_HasDeathTest(self):
-            """Tests the behavior of fail_fast and death tests."""
-            self.assertFailFastBehavior(
-                test_suite='HasDeathTest',
-                passed_count=1,
-                failure_count=1,
-                skipped_count=3,
-                suppressed_count=0)
-            self.assertNotFailFastBehavior(
-                test_suite='HasDeathTest',
-                passed_count=1,
-                failure_count=4,
-                skipped_count=0,
-                suppressed_count=0)
+  """Tests the env variable or the command line flag for fail_fast."""
+
+  def testDefaultBehavior(self):
+    """Tests the behavior of not specifying the fail_fast."""
+
+    txt, _ = RunAndReturnOutput()
+    self.assertIn('22 FAILED TEST', txt)
+
+  def testGoogletestFlag(self):
+    txt, _ = RunAndReturnOutput(test_suite='HasSimpleTest', fail_fast=True)
+    self.assertIn('1 FAILED TEST', txt)
+    self.assertIn('[  SKIPPED ] 3 tests', txt)
+
+    txt, _ = RunAndReturnOutput(test_suite='HasSimpleTest', fail_fast=False)
+    self.assertIn('4 FAILED TEST', txt)
+    self.assertNotIn('[  SKIPPED ]', txt)
+
+  def testGoogletestEnvVar(self):
+    """Tests the behavior of specifying fail_fast via Googletest env var."""
+
+    try:
+      SetEnvVar(FAIL_FAST_ENV_VAR, '1')
+      txt, _ = RunAndReturnOutput('HasSimpleTest')
+      self.assertIn('1 FAILED TEST', txt)
+      self.assertIn('[  SKIPPED ] 3 tests', txt)
+
+      SetEnvVar(FAIL_FAST_ENV_VAR, '0')
+      txt, _ = RunAndReturnOutput('HasSimpleTest')
+      self.assertIn('4 FAILED TEST', txt)
+      self.assertNotIn('[  SKIPPED ]', txt)
+    finally:
+      SetEnvVar(FAIL_FAST_ENV_VAR, None)
+
+  def testBazelEnvVar(self):
+    """Tests the behavior of specifying fail_fast via Bazel testbridge."""
+
+    try:
+      SetEnvVar(BAZEL_FAIL_FAST_ENV_VAR, '1')
+      txt, _ = RunAndReturnOutput('HasSimpleTest')
+      self.assertIn('1 FAILED TEST', txt)
+      self.assertIn('[  SKIPPED ] 3 tests', txt)
+
+      SetEnvVar(BAZEL_FAIL_FAST_ENV_VAR, '0')
+      txt, _ = RunAndReturnOutput('HasSimpleTest')
+      self.assertIn('4 FAILED TEST', txt)
+      self.assertNotIn('[  SKIPPED ]', txt)
+    finally:
+      SetEnvVar(BAZEL_FAIL_FAST_ENV_VAR, None)
+
+  def testFlagOverridesEnvVar(self):
+    """Tests precedence of flag over env var."""
+
+    try:
+      SetEnvVar(FAIL_FAST_ENV_VAR, '0')
+      txt, _ = RunAndReturnOutput('HasSimpleTest', True)
+      self.assertIn('1 FAILED TEST', txt)
+      self.assertIn('[  SKIPPED ] 3 tests', txt)
+    finally:
+      SetEnvVar(FAIL_FAST_ENV_VAR, None)
+
+  def testGoogletestEnvVarOverridesBazelEnvVar(self):
+    """Tests that the Googletest native env var over Bazel testbridge."""
+
+    try:
+      SetEnvVar(BAZEL_FAIL_FAST_ENV_VAR, '0')
+      SetEnvVar(FAIL_FAST_ENV_VAR, '1')
+      txt, _ = RunAndReturnOutput('HasSimpleTest')
+      self.assertIn('1 FAILED TEST', txt)
+      self.assertIn('[  SKIPPED ] 3 tests', txt)
+    finally:
+      SetEnvVar(FAIL_FAST_ENV_VAR, None)
+      SetEnvVar(BAZEL_FAIL_FAST_ENV_VAR, None)
+
+  def testEventListener(self):
+    txt, _ = RunAndReturnOutput(test_suite='HasSkipTest', fail_fast=True)
+    self.assertIn('1 FAILED TEST', txt)
+    self.assertIn('[  SKIPPED ] 3 tests', txt)
+    for expected_count, callback in [
+        (1, 'OnTestSuiteStart'),
+        (5, 'OnTestStart'),
+        (5, 'OnTestEnd'),
+        (5, 'OnTestPartResult'),
+        (1, 'OnTestSuiteEnd'),
+    ]:
+      self.assertEqual(
+          expected_count,
+          txt.count(callback),
+          'Expected %d calls to callback %s match count on output: %s '
+          % (expected_count, callback, txt),
+      )
+
+    txt, _ = RunAndReturnOutput(test_suite='HasSkipTest', fail_fast=False)
+    self.assertIn('3 FAILED TEST', txt)
+    self.assertIn('[  SKIPPED ] 1 test', txt)
+    for expected_count, callback in [
+        (1, 'OnTestSuiteStart'),
+        (5, 'OnTestStart'),
+        (5, 'OnTestEnd'),
+        (5, 'OnTestPartResult'),
+        (1, 'OnTestSuiteEnd'),
+    ]:
+      self.assertEqual(
+          expected_count,
+          txt.count(callback),
+          'Expected %d calls to callback %s match count on output: %s '
+          % (expected_count, callback, txt),
+      )
+
+  def assertXmlResultCount(self, result, count, xml):
+    self.assertEqual(
+        count,
+        xml.count('result="%s"' % result),
+        'Expected \'result="%s"\' match count of %s: %s '
+        % (result, count, xml),
+    )
+
+  def assertXmlStatusCount(self, status, count, xml):
+    self.assertEqual(
+        count,
+        xml.count('status="%s"' % status),
+        'Expected \'status="%s"\' match count of %s: %s '
+        % (status, count, xml),
+    )
+
+  def assertFailFastXmlAndTxtOutput(
+      self,
+      fail_fast,
+      test_suite,
+      passed_count,
+      failure_count,
+      skipped_count,
+      suppressed_count,
+      run_disabled=False,
+  ):
+    """Assert XML and text output of a test execution."""
+
+    txt, xml = RunAndReturnOutput(test_suite, fail_fast, run_disabled)
+    if failure_count > 0:
+      self.assertIn('%s FAILED TEST' % failure_count, txt)
+    if suppressed_count > 0:
+      self.assertIn('%s DISABLED TEST' % suppressed_count, txt)
+    if skipped_count > 0:
+      self.assertIn('[  SKIPPED ] %s tests' % skipped_count, txt)
+    self.assertXmlStatusCount(
+        'run', passed_count + failure_count + skipped_count, xml
+    )
+    self.assertXmlStatusCount('notrun', suppressed_count, xml)
+    self.assertXmlResultCount('completed', passed_count + failure_count, xml)
+    self.assertXmlResultCount('skipped', skipped_count, xml)
+    self.assertXmlResultCount('suppressed', suppressed_count, xml)
+
+  def assertFailFastBehavior(
+      self,
+      test_suite,
+      passed_count,
+      failure_count,
+      skipped_count,
+      suppressed_count,
+      run_disabled=False,
+  ):
+    """Assert --fail_fast via flag."""
+
+    for fail_fast in ('true', '1', 't', True):
+      self.assertFailFastXmlAndTxtOutput(
+          fail_fast,
+          test_suite,
+          passed_count,
+          failure_count,
+          skipped_count,
+          suppressed_count,
+          run_disabled,
+      )
+
+  def assertNotFailFastBehavior(
+      self,
+      test_suite,
+      passed_count,
+      failure_count,
+      skipped_count,
+      suppressed_count,
+      run_disabled=False,
+  ):
+    """Assert --nofail_fast via flag."""
+
+    for fail_fast in ('false', '0', 'f', False):
+      self.assertFailFastXmlAndTxtOutput(
+          fail_fast,
+          test_suite,
+          passed_count,
+          failure_count,
+          skipped_count,
+          suppressed_count,
+          run_disabled,
+      )
+
+  def testFlag_HasFixtureTest(self):
+    """Tests the behavior of fail_fast and TEST_F."""
+    self.assertFailFastBehavior(
+        test_suite='HasFixtureTest',
+        passed_count=1,
+        failure_count=1,
+        skipped_count=3,
+        suppressed_count=0,
+    )
+    self.assertNotFailFastBehavior(
+        test_suite='HasFixtureTest',
+        passed_count=1,
+        failure_count=4,
+        skipped_count=0,
+        suppressed_count=0,
+    )
+
+  def testFlag_HasSimpleTest(self):
+    """Tests the behavior of fail_fast and TEST."""
+    self.assertFailFastBehavior(
+        test_suite='HasSimpleTest',
+        passed_count=1,
+        failure_count=1,
+        skipped_count=3,
+        suppressed_count=0,
+    )
+    self.assertNotFailFastBehavior(
+        test_suite='HasSimpleTest',
+        passed_count=1,
+        failure_count=4,
+        skipped_count=0,
+        suppressed_count=0,
+    )
+
+  def testFlag_HasParametersTest(self):
+    """Tests the behavior of fail_fast and TEST_P."""
+    self.assertFailFastBehavior(
+        test_suite='HasParametersSuite/HasParametersTest',
+        passed_count=0,
+        failure_count=1,
+        skipped_count=3,
+        suppressed_count=0,
+    )
+    self.assertNotFailFastBehavior(
+        test_suite='HasParametersSuite/HasParametersTest',
+        passed_count=0,
+        failure_count=4,
+        skipped_count=0,
+        suppressed_count=0,
+    )
+
+  def testFlag_HasDisabledTest(self):
+    """Tests the behavior of fail_fast and Disabled test cases."""
+    self.assertFailFastBehavior(
+        test_suite='HasDisabledTest',
+        passed_count=1,
+        failure_count=1,
+        skipped_count=2,
+        suppressed_count=1,
+        run_disabled=False,
+    )
+    self.assertNotFailFastBehavior(
+        test_suite='HasDisabledTest',
+        passed_count=1,
+        failure_count=3,
+        skipped_count=0,
+        suppressed_count=1,
+        run_disabled=False,
+    )
+
+  def testFlag_HasDisabledRunDisabledTest(self):
+    """Tests the behavior of fail_fast and Disabled test cases enabled."""
+    self.assertFailFastBehavior(
+        test_suite='HasDisabledTest',
+        passed_count=1,
+        failure_count=1,
+        skipped_count=3,
+        suppressed_count=0,
+        run_disabled=True,
+    )
+    self.assertNotFailFastBehavior(
+        test_suite='HasDisabledTest',
+        passed_count=1,
+        failure_count=4,
+        skipped_count=0,
+        suppressed_count=0,
+        run_disabled=True,
+    )
+
+  def testFlag_HasDisabledSuiteTest(self):
+    """Tests the behavior of fail_fast and Disabled test suites."""
+    self.assertFailFastBehavior(
+        test_suite='DISABLED_HasDisabledSuite',
+        passed_count=0,
+        failure_count=0,
+        skipped_count=0,
+        suppressed_count=5,
+        run_disabled=False,
+    )
+    self.assertNotFailFastBehavior(
+        test_suite='DISABLED_HasDisabledSuite',
+        passed_count=0,
+        failure_count=0,
+        skipped_count=0,
+        suppressed_count=5,
+        run_disabled=False,
+    )
+
+  def testFlag_HasDisabledSuiteRunDisabledTest(self):
+    """Tests the behavior of fail_fast and Disabled test suites enabled."""
+    self.assertFailFastBehavior(
+        test_suite='DISABLED_HasDisabledSuite',
+        passed_count=1,
+        failure_count=1,
+        skipped_count=3,
+        suppressed_count=0,
+        run_disabled=True,
+    )
+    self.assertNotFailFastBehavior(
+        test_suite='DISABLED_HasDisabledSuite',
+        passed_count=1,
+        failure_count=4,
+        skipped_count=0,
+        suppressed_count=0,
+        run_disabled=True,
+    )
+
+  if SUPPORTS_DEATH_TESTS:
+
+    def testFlag_HasDeathTest(self):
+      """Tests the behavior of fail_fast and death tests."""
+      self.assertFailFastBehavior(
+          test_suite='HasDeathTest',
+          passed_count=1,
+          failure_count=1,
+          skipped_count=3,
+          suppressed_count=0,
+      )
+      self.assertNotFailFastBehavior(
+          test_suite='HasDeathTest',
+          passed_count=1,
+          failure_count=4,
+          skipped_count=0,
+          suppressed_count=0,
+      )
 
 
 if __name__ == '__main__':
-    gtest_test_utils.Main()
+  gtest_test_utils.Main()
diff --git a/external/googletest/googletest/test/googletest-filepath-test.cc b/external/googletest/googletest/test/googletest-filepath-test.cc
index 62f1b2ef..3e9c79f0 100644
--- a/external/googletest/googletest/test/googletest-filepath-test.cc
+++ b/external/googletest/googletest/test/googletest-filepath-test.cc
@@ -35,13 +35,15 @@
 // This file is #included from gtest-internal.h.
 // Do not #include this file anywhere else!
 
+#include <string>
+
 #include "gtest/gtest.h"
 #include "gtest/internal/gtest-filepath.h"
 #include "src/gtest-internal-inl.h"
 
-#if GTEST_OS_WINDOWS_MOBILE
+#ifdef GTEST_OS_WINDOWS_MOBILE
 #include <windows.h>  // NOLINT
-#elif GTEST_OS_WINDOWS
+#elif defined(GTEST_OS_WINDOWS)
 #include <direct.h>  // NOLINT
 #endif               // GTEST_OS_WINDOWS_MOBILE
 
@@ -49,7 +51,7 @@ namespace testing {
 namespace internal {
 namespace {
 
-#if GTEST_OS_WINDOWS_MOBILE
+#ifdef GTEST_OS_WINDOWS_MOBILE
 
 // Windows CE doesn't have the remove C function.
 int remove(const char* path) {
@@ -78,7 +80,7 @@ TEST(GetCurrentDirTest, ReturnsCurrentDir) {
   const FilePath cwd = FilePath::GetCurrentDir();
   posix::ChDir(original_dir.c_str());
 
-#if GTEST_OS_WINDOWS || GTEST_OS_OS2
+#if defined(GTEST_OS_WINDOWS) || defined(GTEST_OS_OS2)
 
   // Skips the ":".
   const char* const cwd_without_drive = strchr(cwd.c_str(), ':');
@@ -172,7 +174,7 @@ TEST(RemoveDirectoryNameTest, ShouldAlsoGiveFileNameForAlternateSeparator) {
 
 // RemoveFileName "" -> "./"
 TEST(RemoveFileNameTest, EmptyName) {
-#if GTEST_OS_WINDOWS_MOBILE
+#ifdef GTEST_OS_WINDOWS_MOBILE
   // On Windows CE, we use the root as the current directory.
   EXPECT_EQ(GTEST_PATH_SEP_, FilePath("").RemoveFileName().string());
 #else
@@ -355,7 +357,7 @@ TEST(RemoveTrailingPathSeparatorTest, ShouldReturnUnmodified) {
 }
 
 TEST(DirectoryTest, RootDirectoryExists) {
-#if GTEST_OS_WINDOWS              // We are on Windows.
+#ifdef GTEST_OS_WINDOWS           // We are on Windows.
   char current_drive[_MAX_PATH];  // NOLINT
   current_drive[0] = static_cast<char>(_getdrive() + 'A' - 1);
   current_drive[1] = ':';
@@ -367,7 +369,7 @@ TEST(DirectoryTest, RootDirectoryExists) {
 #endif  // GTEST_OS_WINDOWS
 }
 
-#if GTEST_OS_WINDOWS
+#ifdef GTEST_OS_WINDOWS
 TEST(DirectoryTest, RootOfWrongDriveDoesNotExists) {
   const int saved_drive_ = _getdrive();
   // Find a drive that doesn't exist. Start with 'Z' to avoid common ones.
@@ -385,7 +387,7 @@ TEST(DirectoryTest, RootOfWrongDriveDoesNotExists) {
 }
 #endif  // GTEST_OS_WINDOWS
 
-#if !GTEST_OS_WINDOWS_MOBILE
+#ifndef GTEST_OS_WINDOWS_MOBILE
 // Windows CE _does_ consider an empty directory to exist.
 TEST(DirectoryTest, EmptyPathDirectoryDoesNotExist) {
   EXPECT_FALSE(FilePath("").DirectoryExists());
@@ -393,7 +395,7 @@ TEST(DirectoryTest, EmptyPathDirectoryDoesNotExist) {
 #endif  // !GTEST_OS_WINDOWS_MOBILE
 
 TEST(DirectoryTest, CurrentDirectoryExists) {
-#if GTEST_OS_WINDOWS  // We are on Windows.
+#ifdef GTEST_OS_WINDOWS  // We are on Windows.
 #ifndef _WIN32_CE     // Windows CE doesn't have a current directory.
 
   EXPECT_TRUE(FilePath(".").DirectoryExists());
@@ -407,7 +409,7 @@ TEST(DirectoryTest, CurrentDirectoryExists) {
 }
 
 // "foo/bar" == foo//bar" == "foo///bar"
-TEST(NormalizeTest, MultipleConsecutiveSepaparatorsInMidstring) {
+TEST(NormalizeTest, MultipleConsecutiveSeparatorsInMidstring) {
   EXPECT_EQ("foo" GTEST_PATH_SEP_ "bar",
             FilePath("foo" GTEST_PATH_SEP_ "bar").string());
   EXPECT_EQ("foo" GTEST_PATH_SEP_ "bar",
@@ -419,17 +421,22 @@ TEST(NormalizeTest, MultipleConsecutiveSepaparatorsInMidstring) {
 }
 
 // "/bar" == //bar" == "///bar"
-TEST(NormalizeTest, MultipleConsecutiveSepaparatorsAtStringStart) {
+TEST(NormalizeTest, MultipleConsecutiveSeparatorsAtStringStart) {
   EXPECT_EQ(GTEST_PATH_SEP_ "bar", FilePath(GTEST_PATH_SEP_ "bar").string());
+#ifdef GTEST_OS_WINDOWS
+  EXPECT_EQ(GTEST_PATH_SEP_ GTEST_PATH_SEP_ "bar",
+            FilePath(GTEST_PATH_SEP_ GTEST_PATH_SEP_ "bar").string());
+#else
   EXPECT_EQ(GTEST_PATH_SEP_ "bar",
             FilePath(GTEST_PATH_SEP_ GTEST_PATH_SEP_ "bar").string());
+#endif
   EXPECT_EQ(
       GTEST_PATH_SEP_ "bar",
       FilePath(GTEST_PATH_SEP_ GTEST_PATH_SEP_ GTEST_PATH_SEP_ "bar").string());
 }
 
 // "foo/" == foo//" == "foo///"
-TEST(NormalizeTest, MultipleConsecutiveSepaparatorsAtStringEnd) {
+TEST(NormalizeTest, MultipleConsecutiveSeparatorsAtStringEnd) {
   EXPECT_EQ("foo" GTEST_PATH_SEP_, FilePath("foo" GTEST_PATH_SEP_).string());
   EXPECT_EQ("foo" GTEST_PATH_SEP_,
             FilePath("foo" GTEST_PATH_SEP_ GTEST_PATH_SEP_).string());
@@ -508,7 +515,7 @@ class DirectoryCreationTest : public Test {
   }
 
   // Strings representing a directory and a file, with identical paths
-  // except for the trailing separator character that distinquishes
+  // except for the trailing separator character that distinguishes
   // a directory named 'test' from a file named 'test'. Example names:
   FilePath testdata_path_;  // "/tmp/directory_creation/test/"
   FilePath testdata_file_;  // "/tmp/directory_creation/test"
@@ -613,7 +620,7 @@ TEST(FilePathTest, IsDirectory) {
 TEST(FilePathTest, IsAbsolutePath) {
   EXPECT_FALSE(FilePath("is" GTEST_PATH_SEP_ "relative").IsAbsolutePath());
   EXPECT_FALSE(FilePath("").IsAbsolutePath());
-#if GTEST_OS_WINDOWS
+#ifdef GTEST_OS_WINDOWS
   EXPECT_TRUE(
       FilePath("c:\\" GTEST_PATH_SEP_ "is_not" GTEST_PATH_SEP_ "relative")
           .IsAbsolutePath());
@@ -621,6 +628,9 @@ TEST(FilePathTest, IsAbsolutePath) {
   EXPECT_TRUE(
       FilePath("c:/" GTEST_PATH_SEP_ "is_not" GTEST_PATH_SEP_ "relative")
           .IsAbsolutePath());
+  EXPECT_TRUE(FilePath("d:/Windows").IsAbsolutePath());
+  EXPECT_TRUE(FilePath("\\\\Host\\Share").IsAbsolutePath());
+  EXPECT_TRUE(FilePath("\\\\Host\\Share\\Folder").IsAbsolutePath());
 #else
   EXPECT_TRUE(FilePath(GTEST_PATH_SEP_ "is_not" GTEST_PATH_SEP_ "relative")
                   .IsAbsolutePath());
@@ -628,7 +638,7 @@ TEST(FilePathTest, IsAbsolutePath) {
 }
 
 TEST(FilePathTest, IsRootDirectory) {
-#if GTEST_OS_WINDOWS
+#ifdef GTEST_OS_WINDOWS
   EXPECT_TRUE(FilePath("a:\\").IsRootDirectory());
   EXPECT_TRUE(FilePath("Z:/").IsRootDirectory());
   EXPECT_TRUE(FilePath("e://").IsRootDirectory());
@@ -637,6 +647,16 @@ TEST(FilePathTest, IsRootDirectory) {
   EXPECT_FALSE(FilePath("b:a").IsRootDirectory());
   EXPECT_FALSE(FilePath("8:/").IsRootDirectory());
   EXPECT_FALSE(FilePath("c|/").IsRootDirectory());
+  EXPECT_TRUE(FilePath("c:/").IsRootDirectory());
+  EXPECT_FALSE(FilePath("d:/Windows").IsRootDirectory());
+
+  // This is for backward compatibility, since callers (even in this library)
+  // have assumed IsRootDirectory() implies a trailing directory separator.
+  EXPECT_FALSE(FilePath("\\\\Host\\Share").IsRootDirectory());
+
+  EXPECT_TRUE(FilePath("\\\\Host\\Share\\").IsRootDirectory());
+  EXPECT_FALSE(FilePath("\\\\Host\\Share\\.").IsRootDirectory());
+  EXPECT_FALSE(FilePath("\\\\Host\\Share\\C$\\").IsRootDirectory());
 #else
   EXPECT_TRUE(FilePath("/").IsRootDirectory());
   EXPECT_TRUE(FilePath("//").IsRootDirectory());
diff --git a/external/googletest/googletest/test/googletest-filter-unittest.py b/external/googletest/googletest/test/googletest-filter-unittest.py
old mode 100644
new mode 100755
index b625d106..a44882a6
--- a/external/googletest/googletest/test/googletest-filter-unittest.py
+++ b/external/googletest/googletest/test/googletest-filter-unittest.py
@@ -44,11 +44,11 @@
 import re
 
 try:
-    from sets import Set as set  # For Python 2.3 compatibility
+  from sets import Set as set  # For Python 2.3 compatibility
 except ImportError:
-    pass
+  pass
 import sys
-import gtest_test_utils
+from googletest.test import gtest_test_utils
 
 # Constants.
 
@@ -59,10 +59,12 @@
 # exception is thrown if the input is anything other than 'True' nor 'False'.
 CAN_PASS_EMPTY_ENV = False
 if sys.executable:
-    os.environ['EMPTY_VAR'] = ''
-    child = gtest_test_utils.Subprocess(
-        [sys.executable, '-c', 'import os; print(\'EMPTY_VAR\' in os.environ)'])
-    CAN_PASS_EMPTY_ENV = eval(child.output)
+  os.environ['EMPTY_VAR'] = ''
+  child = gtest_test_utils.Subprocess(
+      [sys.executable, '-c', "import os; print('EMPTY_VAR' in os.environ)"]
+  )
+  CAN_PASS_EMPTY_ENV = eval(child.output)
+
 
 # Check if this platform can unset environment variables in child processes.
 # We set an env variable to a non-empty string, unset it, and invoke
@@ -72,18 +74,20 @@
 # is thrown if the input is neither 'True' nor 'False'.
 CAN_UNSET_ENV = False
 if sys.executable:
-    os.environ['UNSET_VAR'] = 'X'
-    del os.environ['UNSET_VAR']
-    child = gtest_test_utils.Subprocess(
-        [sys.executable, '-c', 'import os; print(\'UNSET_VAR\' not in os.environ)'
-         ])
-    CAN_UNSET_ENV = eval(child.output)
+  os.environ['UNSET_VAR'] = 'X'
+  del os.environ['UNSET_VAR']
+  child = gtest_test_utils.Subprocess(
+      [sys.executable, '-c', "import os; print('UNSET_VAR' not in os.environ)"]
+  )
+  CAN_UNSET_ENV = eval(child.output)
+
 
 # Checks if we should test with an empty filter. This doesn't
 # make sense on platforms that cannot pass empty env variables (Win32)
 # and on platforms that cannot unset variables (since we cannot tell
 # the difference between "" and NULL -- Borland and Solaris < 5.10)
-CAN_TEST_EMPTY_FILTER = (CAN_PASS_EMPTY_ENV and CAN_UNSET_ENV)
+CAN_TEST_EMPTY_FILTER = CAN_PASS_EMPTY_ENV and CAN_UNSET_ENV
+
 
 # The environment variable for specifying the test filters.
 FILTER_ENV_VAR = 'GTEST_FILTER'
@@ -93,6 +97,9 @@
 SHARD_INDEX_ENV_VAR = 'GTEST_SHARD_INDEX'
 SHARD_STATUS_FILE_ENV_VAR = 'GTEST_SHARD_STATUS_FILE'
 
+# The environment variable for the test warnings output file.
+TEST_WARNINGS_OUTPUT_FILE = 'TEST_WARNINGS_OUTPUT_FILE'
+
 # The command line flag for specifying the test filters.
 FILTER_FLAG = 'gtest_filter'
 
@@ -111,13 +118,18 @@
 # Regex for parsing test names from Google Test's output.
 TEST_REGEX = re.compile(r'^\[\s*RUN\s*\].*\.(\w+(/\w+)?)')
 
+# Regex for parsing disabled banner from Google Test's output
+DISABLED_BANNER_REGEX = re.compile(r'^\[\s*DISABLED\s*\] (.*)')
+
 # The command line flag to tell Google Test to output the list of tests it
 # will run.
 LIST_TESTS_FLAG = '--gtest_list_tests'
 
 # Indicates whether Google Test supports death tests.
-SUPPORTS_DEATH_TESTS = 'HasDeathTest' in gtest_test_utils.Subprocess(
-    [COMMAND, LIST_TESTS_FLAG]).output
+SUPPORTS_DEATH_TESTS = (
+    'HasDeathTest'
+    in gtest_test_utils.Subprocess([COMMAND, LIST_TESTS_FLAG]).output
+)
 
 # Full names of all tests in googletest-filter-unittests_.
 PARAM_TESTS = [
@@ -141,26 +153,28 @@
 ]
 
 if SUPPORTS_DEATH_TESTS:
-    DEATH_TESTS = [
-        'HasDeathTest.Test1',
-        'HasDeathTest.Test2',
-    ]
+  DEATH_TESTS = [
+      'HasDeathTest.Test1',
+      'HasDeathTest.Test2',
+  ]
 else:
-    DEATH_TESTS = []
+  DEATH_TESTS = []
 
 # All the non-disabled tests.
-ACTIVE_TESTS = [
-                   'FooTest.Abc',
-                   'FooTest.Xyz',
-
-                   'BarTest.TestOne',
-                   'BarTest.TestTwo',
-                   'BarTest.TestThree',
-
-                   'BazTest.TestOne',
-                   'BazTest.TestA',
-                   'BazTest.TestB',
-               ] + DEATH_TESTS + PARAM_TESTS
+ACTIVE_TESTS = (
+    [
+        'FooTest.Abc',
+        'FooTest.Xyz',
+        'BarTest.TestOne',
+        'BarTest.TestTwo',
+        'BarTest.TestThree',
+        'BazTest.TestOne',
+        'BazTest.TestA',
+        'BazTest.TestB',
+    ]
+    + DEATH_TESTS
+    + PARAM_TESTS
+)
 
 param_tests_present = None
 
@@ -170,470 +184,582 @@
 
 
 def SetEnvVar(env_var, value):
-    """Sets the env variable to 'value'; unsets it when 'value' is None."""
+  """Sets the env variable to 'value'; unsets it when 'value' is None."""
 
-    if value is not None:
-        environ[env_var] = value
-    elif env_var in environ:
-        del environ[env_var]
+  if value is not None:
+    environ[env_var] = value
+  elif env_var in environ:
+    del environ[env_var]
 
 
 def RunAndReturnOutput(args=None):
-    """Runs the test program and returns its output."""
+  """Runs the test program and returns its output."""
 
-    return gtest_test_utils.Subprocess([COMMAND] + (args or []),
-                                       env=environ).output
+  return gtest_test_utils.Subprocess(
+      [COMMAND] + (args or []), env=environ
+  ).output
 
 
 def RunAndExtractTestList(args=None):
-    """Runs the test program and returns its exit code and a list of tests run."""
-
-    p = gtest_test_utils.Subprocess([COMMAND] + (args or []), env=environ)
-    tests_run = []
-    test_case = ''
-    test = ''
-    for line in p.output.split('\n'):
-        match = TEST_CASE_REGEX.match(line)
-        if match is not None:
-            test_case = match.group(1)
-        else:
-            match = TEST_REGEX.match(line)
-            if match is not None:
-                test = match.group(1)
-                tests_run.append(test_case + '.' + test)
-    return (tests_run, p.exit_code)
+  """Runs the test program and returns its exit code and a list of tests run."""
+
+  p = gtest_test_utils.Subprocess([COMMAND] + (args or []), env=environ)
+  tests_run = []
+  test_case = ''
+  test = ''
+  for line in p.output.split('\n'):
+    match = TEST_CASE_REGEX.match(line)
+    if match is not None:
+      test_case = match.group(1)
+    else:
+      match = TEST_REGEX.match(line)
+      if match is not None:
+        test = match.group(1)
+        tests_run.append(test_case + '.' + test)
+  return (tests_run, p.exit_code)
+
+
+def RunAndExtractDisabledBannerList(args=None):
+  """Runs the test program and returns tests that printed a disabled banner."""
+  p = gtest_test_utils.Subprocess([COMMAND] + (args or []), env=environ)
+  banners_printed = []
+  for line in p.output.split('\n'):
+    match = DISABLED_BANNER_REGEX.match(line)
+    if match is not None:
+      banners_printed.append(match.group(1))
+  return banners_printed
 
 
 def InvokeWithModifiedEnv(extra_env, function, *args, **kwargs):
-    """Runs the given function and arguments in a modified environment."""
-    try:
-        original_env = environ.copy()
-        environ.update(extra_env)
-        return function(*args, **kwargs)
-    finally:
-        environ.clear()
-        environ.update(original_env)
+  """Runs the given function and arguments in a modified environment."""
+  try:
+    original_env = environ.copy()
+    environ.update(extra_env)
+    return function(*args, **kwargs)
+  finally:
+    environ.clear()
+    environ.update(original_env)
 
 
 def RunWithSharding(total_shards, shard_index, command):
-    """Runs a test program shard and returns exit code and a list of tests run."""
+  """Runs a test program shard and returns exit code and a list of tests run."""
 
-    extra_env = {SHARD_INDEX_ENV_VAR: str(shard_index),
-                 TOTAL_SHARDS_ENV_VAR: str(total_shards)}
-    return InvokeWithModifiedEnv(extra_env, RunAndExtractTestList, command)
+  extra_env = {
+      SHARD_INDEX_ENV_VAR: str(shard_index),
+      TOTAL_SHARDS_ENV_VAR: str(total_shards),
+  }
+  return InvokeWithModifiedEnv(extra_env, RunAndExtractTestList, command)
 
 
 # The unit test.
 
 
 class GTestFilterUnitTest(gtest_test_utils.TestCase):
-    """Tests the env variable or the command line flag to filter tests."""
-
-    # Utilities.
-
-    def AssertSetEqual(self, lhs, rhs):
-        """Asserts that two sets are equal."""
-
-        for elem in lhs:
-            self.assert_(elem in rhs, '%s in %s' % (elem, rhs))
-
-        for elem in rhs:
-            self.assert_(elem in lhs, '%s in %s' % (elem, lhs))
-
-    def AssertPartitionIsValid(self, set_var, list_of_sets):
-        """Asserts that list_of_sets is a valid partition of set_var."""
-
-        full_partition = []
-        for slice_var in list_of_sets:
-            full_partition.extend(slice_var)
-        self.assertEqual(len(set_var), len(full_partition))
-        self.assertEqual(set(set_var), set(full_partition))
-
-    def AdjustForParameterizedTests(self, tests_to_run):
-        """Adjust tests_to_run in case value parameterized tests are disabled."""
-
-        global param_tests_present
-        if not param_tests_present:
-            return list(set(tests_to_run) - set(PARAM_TESTS))
-        else:
-            return tests_to_run
-
-    def RunAndVerify(self, gtest_filter, tests_to_run):
-        """Checks that the binary runs correct set of tests for a given filter."""
-
-        tests_to_run = self.AdjustForParameterizedTests(tests_to_run)
-
-        # First, tests using the environment variable.
-
-        # Windows removes empty variables from the environment when passing it
-        # to a new process.  This means it is impossible to pass an empty filter
-        # into a process using the environment variable.  However, we can still
-        # test the case when the variable is not supplied (i.e., gtest_filter is
-        # None).
-        # pylint: disable-msg=C6403
-        if CAN_TEST_EMPTY_FILTER or gtest_filter != '':
-            SetEnvVar(FILTER_ENV_VAR, gtest_filter)
-            tests_run = RunAndExtractTestList()[0]
-            SetEnvVar(FILTER_ENV_VAR, None)
-            self.AssertSetEqual(tests_run, tests_to_run)
-        # pylint: enable-msg=C6403
-
-        # Next, tests using the command line flag.
-
-        if gtest_filter is None:
-            args = []
-        else:
-            args = ['--%s=%s' % (FILTER_FLAG, gtest_filter)]
-
-        tests_run = RunAndExtractTestList(args)[0]
-        self.AssertSetEqual(tests_run, tests_to_run)
-
-    def RunAndVerifyWithSharding(self, gtest_filter, total_shards, tests_to_run,
-                                 args=None, check_exit_0=False):
-        """Checks that binary runs correct tests for the given filter and shard.
-
-        Runs all shards of googletest-filter-unittest_ with the given filter, and
-        verifies that the right set of tests were run. The union of tests run
-        on each shard should be identical to tests_to_run, without duplicates.
-        If check_exit_0, .
-
-        Args:
-          gtest_filter: A filter to apply to the tests.
-          total_shards: A total number of shards to split test run into.
-          tests_to_run: A set of tests expected to run.
-          args   :      Arguments to pass to the to the test binary.
-          check_exit_0: When set to a true value, make sure that all shards
-                        return 0.
-        """
-
-        tests_to_run = self.AdjustForParameterizedTests(tests_to_run)
-
-        # Windows removes empty variables from the environment when passing it
-        # to a new process.  This means it is impossible to pass an empty filter
-        # into a process using the environment variable.  However, we can still
-        # test the case when the variable is not supplied (i.e., gtest_filter is
-        # None).
-        # pylint: disable-msg=C6403
-        if CAN_TEST_EMPTY_FILTER or gtest_filter != '':
-            SetEnvVar(FILTER_ENV_VAR, gtest_filter)
-            partition = []
-            for i in range(0, total_shards):
-                (tests_run, exit_code) = RunWithSharding(total_shards, i, args)
-                if check_exit_0:
-                    self.assertEqual(0, exit_code)
-                partition.append(tests_run)
-
-            self.AssertPartitionIsValid(tests_to_run, partition)
-            SetEnvVar(FILTER_ENV_VAR, None)
-        # pylint: enable-msg=C6403
+  """Tests the env variable or the command line flag to filter tests."""
+
+  # Utilities.
+
+  def AssertSetEqual(self, lhs, rhs):
+    """Asserts that two sets are equal."""
+
+    for elem in lhs:
+      self.assertTrue(elem in rhs, '%s in %s' % (elem, rhs))
+
+    for elem in rhs:
+      self.assertTrue(elem in lhs, '%s in %s' % (elem, lhs))
+
+  def AssertPartitionIsValid(self, set_var, list_of_sets):
+    """Asserts that list_of_sets is a valid partition of set_var."""
+
+    full_partition = []
+    for slice_var in list_of_sets:
+      full_partition.extend(slice_var)
+    self.assertEqual(len(set_var), len(full_partition))
+    self.assertEqual(set(set_var), set(full_partition))
+
+  def AdjustForParameterizedTests(self, tests_to_run):
+    """Adjust tests_to_run in case value parameterized tests are disabled."""
+
+    global param_tests_present
+    if not param_tests_present:
+      return list(set(tests_to_run) - set(PARAM_TESTS))
+    else:
+      return tests_to_run
+
+  def RunAndVerify(self, gtest_filter, tests_to_run):
+    """Checks that the binary runs correct set of tests for a given filter."""
+
+    tests_to_run = self.AdjustForParameterizedTests(tests_to_run)
+
+    # First, tests using the environment variable.
+
+    # Windows removes empty variables from the environment when passing it
+    # to a new process.  This means it is impossible to pass an empty filter
+    # into a process using the environment variable.  However, we can still
+    # test the case when the variable is not supplied (i.e., gtest_filter is
+    # None).
+    # pylint: disable=g-explicit-bool-comparison
+    if CAN_TEST_EMPTY_FILTER or gtest_filter != '':
+      SetEnvVar(FILTER_ENV_VAR, gtest_filter)
+      tests_run = RunAndExtractTestList()[0]
+      SetEnvVar(FILTER_ENV_VAR, None)
+      self.AssertSetEqual(tests_run, tests_to_run)
+    # pylint: enable=g-explicit-bool-comparison
+
+    # Next, tests using the command line flag.
+
+    if gtest_filter is None:
+      args = []
+    else:
+      args = ['--%s=%s' % (FILTER_FLAG, gtest_filter)]
+
+    tests_run = RunAndExtractTestList(args)[0]
+    self.AssertSetEqual(tests_run, tests_to_run)
+
+  def RunAndVerifyWithSharding(
+      self,
+      gtest_filter,
+      total_shards,
+      tests_to_run,
+      args=None,
+      check_exit_0=False,
+  ):
+    """Checks that binary runs correct tests for the given filter and shard.
+
+    Runs all shards of googletest-filter-unittest_ with the given filter, and
+    verifies that the right set of tests were run. The union of tests run
+    on each shard should be identical to tests_to_run, without duplicates.
+    If check_exit_0, .
+
+    Args:
+      gtest_filter: A filter to apply to the tests.
+      total_shards: A total number of shards to split test run into.
+      tests_to_run: A set of tests expected to run.
+      args: Arguments to pass to the to the test binary.
+      check_exit_0: When set to a true value, make sure that all shards return
+        0.
+    """
+
+    tests_to_run = self.AdjustForParameterizedTests(tests_to_run)
+
+    # Windows removes empty variables from the environment when passing it
+    # to a new process.  This means it is impossible to pass an empty filter
+    # into a process using the environment variable.  However, we can still
+    # test the case when the variable is not supplied (i.e., gtest_filter is
+    # None).
+    # pylint: disable=g-explicit-bool-comparison
+    if CAN_TEST_EMPTY_FILTER or gtest_filter != '':
+      SetEnvVar(FILTER_ENV_VAR, gtest_filter)
+      partition = []
+      for i in range(0, total_shards):
+        (tests_run, exit_code) = RunWithSharding(total_shards, i, args)
+        if check_exit_0:
+          self.assertEqual(0, exit_code)
+        partition.append(tests_run)
+
+      self.AssertPartitionIsValid(tests_to_run, partition)
+      SetEnvVar(FILTER_ENV_VAR, None)
+    # pylint: enable=g-explicit-bool-comparison
+
+  def RunAndVerifyAllowingDisabled(self, gtest_filter, tests_to_run):
+    """Checks that the binary runs correct set of tests for the given filter.
+
+    Runs googletest-filter-unittest_ with the given filter, and enables
+    disabled tests. Verifies that the right set of tests were run.
+
+    Args:
+      gtest_filter: A filter to apply to the tests.
+      tests_to_run: A set of tests expected to run.
+    """
+
+    tests_to_run = self.AdjustForParameterizedTests(tests_to_run)
+
+    # Construct the command line.
+    args = ['--%s' % ALSO_RUN_DISABLED_TESTS_FLAG]
+    if gtest_filter is not None:
+      args.append('--%s=%s' % (FILTER_FLAG, gtest_filter))
+
+    tests_run = RunAndExtractTestList(args)[0]
+    self.AssertSetEqual(tests_run, tests_to_run)
+
+  def setUp(self):
+    """Sets up test case.
+
+    Determines whether value-parameterized tests are enabled in the binary and
+    sets the flags accordingly.
+    """
+
+    global param_tests_present
+    if param_tests_present is None:
+      param_tests_present = (
+          PARAM_TEST_REGEX.search(RunAndReturnOutput()) is not None
+      )
+
+  def testDefaultBehavior(self):
+    """Tests the behavior of not specifying the filter."""
+
+    self.RunAndVerify(None, ACTIVE_TESTS)
+
+  def testDefaultBehaviorWithShards(self):
+    """Tests the behavior without the filter, with sharding enabled."""
+
+    self.RunAndVerifyWithSharding(None, 1, ACTIVE_TESTS)
+    self.RunAndVerifyWithSharding(None, 2, ACTIVE_TESTS)
+    self.RunAndVerifyWithSharding(None, len(ACTIVE_TESTS) - 1, ACTIVE_TESTS)
+    self.RunAndVerifyWithSharding(None, len(ACTIVE_TESTS), ACTIVE_TESTS)
+    self.RunAndVerifyWithSharding(None, len(ACTIVE_TESTS) + 1, ACTIVE_TESTS)
+
+  def testEmptyFilter(self):
+    """Tests an empty filter."""
+
+    self.RunAndVerify('', [])
+    self.RunAndVerifyWithSharding('', 1, [])
+    self.RunAndVerifyWithSharding('', 2, [])
+
+  def testBadFilter(self):
+    """Tests a filter that matches nothing."""
+
+    self.RunAndVerify('BadFilter', [])
+    self.RunAndVerifyAllowingDisabled('BadFilter', [])
+
+  def testBadFilterWithWarningFile(self):
+    """Tests the warning file when a filter that matches nothing."""
+
+    warning_file = os.path.join(
+        gtest_test_utils.GetTempDir(), 'testBadFilterWithWarningFile'
+    )
+    extra_env = {TEST_WARNINGS_OUTPUT_FILE: warning_file}
+    args = ['--%s=%s' % (FILTER_FLAG, 'BadFilter')]
+    InvokeWithModifiedEnv(extra_env, RunAndReturnOutput, args)
+    with open(warning_file, 'r') as f:
+      warning_file_contents = f.read()
+      self.assertEqual(
+          warning_file_contents,
+          'filter "BadFilter" did not match any test; no tests were run\n',
+      )
+
+  def testFullName(self):
+    """Tests filtering by full name."""
+
+    self.RunAndVerify('FooTest.Xyz', ['FooTest.Xyz'])
+    self.RunAndVerifyAllowingDisabled('FooTest.Xyz', ['FooTest.Xyz'])
+    self.RunAndVerifyWithSharding('FooTest.Xyz', 5, ['FooTest.Xyz'])
+
+  def testUniversalFilters(self):
+    """Tests filters that match everything."""
+
+    self.RunAndVerify('*', ACTIVE_TESTS)
+    self.RunAndVerify('*.*', ACTIVE_TESTS)
+    self.RunAndVerifyWithSharding('*.*', len(ACTIVE_TESTS) - 3, ACTIVE_TESTS)
+    self.RunAndVerifyAllowingDisabled('*', ACTIVE_TESTS + DISABLED_TESTS)
+    self.RunAndVerifyAllowingDisabled('*.*', ACTIVE_TESTS + DISABLED_TESTS)
 
-    def RunAndVerifyAllowingDisabled(self, gtest_filter, tests_to_run):
-        """Checks that the binary runs correct set of tests for the given filter.
+  def testFilterByTestCase(self):
+    """Tests filtering by test case name."""
 
-        Runs googletest-filter-unittest_ with the given filter, and enables
-        disabled tests. Verifies that the right set of tests were run.
+    self.RunAndVerify('FooTest.*', ['FooTest.Abc', 'FooTest.Xyz'])
 
-        Args:
-          gtest_filter: A filter to apply to the tests.
-          tests_to_run: A set of tests expected to run.
-        """
-
-        tests_to_run = self.AdjustForParameterizedTests(tests_to_run)
+    BAZ_TESTS = ['BazTest.TestOne', 'BazTest.TestA', 'BazTest.TestB']
+    self.RunAndVerify('BazTest.*', BAZ_TESTS)
+    self.RunAndVerifyAllowingDisabled(
+        'BazTest.*', BAZ_TESTS + ['BazTest.DISABLED_TestC']
+    )
 
-        # Construct the command line.
-        args = ['--%s' % ALSO_RUN_DISABLED_TESTS_FLAG]
-        if gtest_filter is not None:
-            args.append('--%s=%s' % (FILTER_FLAG, gtest_filter))
-
-        tests_run = RunAndExtractTestList(args)[0]
-        self.AssertSetEqual(tests_run, tests_to_run)
+  def testFilterByTest(self):
+    """Tests filtering by test name."""
 
-    def setUp(self):
-        """Sets up test case.
-
-        Determines whether value-parameterized tests are enabled in the binary and
-        sets the flags accordingly.
-        """
-
-        global param_tests_present
-        if param_tests_present is None:
-            param_tests_present = PARAM_TEST_REGEX.search(
-                RunAndReturnOutput()) is not None
+    self.RunAndVerify('*.TestOne', ['BarTest.TestOne', 'BazTest.TestOne'])
 
-    def testDefaultBehavior(self):
-        """Tests the behavior of not specifying the filter."""
-
-        self.RunAndVerify(None, ACTIVE_TESTS)
-
-    def testDefaultBehaviorWithShards(self):
-        """Tests the behavior without the filter, with sharding enabled."""
-
-        self.RunAndVerifyWithSharding(None, 1, ACTIVE_TESTS)
-        self.RunAndVerifyWithSharding(None, 2, ACTIVE_TESTS)
-        self.RunAndVerifyWithSharding(None, len(ACTIVE_TESTS) - 1, ACTIVE_TESTS)
-        self.RunAndVerifyWithSharding(None, len(ACTIVE_TESTS), ACTIVE_TESTS)
-        self.RunAndVerifyWithSharding(None, len(ACTIVE_TESTS) + 1, ACTIVE_TESTS)
+  def testFilterDisabledTests(self):
+    """Select only the disabled tests to run."""
 
-    def testEmptyFilter(self):
-        """Tests an empty filter."""
+    self.RunAndVerify('DISABLED_FoobarTest.Test1', [])
+    self.RunAndVerifyAllowingDisabled(
+        'DISABLED_FoobarTest.Test1', ['DISABLED_FoobarTest.Test1']
+    )
 
-        self.RunAndVerify('', [])
-        self.RunAndVerifyWithSharding('', 1, [])
-        self.RunAndVerifyWithSharding('', 2, [])
+    self.RunAndVerify('*DISABLED_*', [])
+    self.RunAndVerifyAllowingDisabled('*DISABLED_*', DISABLED_TESTS)
 
-    def testBadFilter(self):
-        """Tests a filter that matches nothing."""
-
-        self.RunAndVerify('BadFilter', [])
-        self.RunAndVerifyAllowingDisabled('BadFilter', [])
-
-    def testFullName(self):
-        """Tests filtering by full name."""
-
-        self.RunAndVerify('FooTest.Xyz', ['FooTest.Xyz'])
-        self.RunAndVerifyAllowingDisabled('FooTest.Xyz', ['FooTest.Xyz'])
-        self.RunAndVerifyWithSharding('FooTest.Xyz', 5, ['FooTest.Xyz'])
-
-    def testUniversalFilters(self):
-        """Tests filters that match everything."""
-
-        self.RunAndVerify('*', ACTIVE_TESTS)
-        self.RunAndVerify('*.*', ACTIVE_TESTS)
-        self.RunAndVerifyWithSharding('*.*', len(ACTIVE_TESTS) - 3, ACTIVE_TESTS)
-        self.RunAndVerifyAllowingDisabled('*', ACTIVE_TESTS + DISABLED_TESTS)
-        self.RunAndVerifyAllowingDisabled('*.*', ACTIVE_TESTS + DISABLED_TESTS)
-
-    def testFilterByTestCase(self):
-        """Tests filtering by test case name."""
-
-        self.RunAndVerify('FooTest.*', ['FooTest.Abc', 'FooTest.Xyz'])
-
-        BAZ_TESTS = ['BazTest.TestOne', 'BazTest.TestA', 'BazTest.TestB']
-        self.RunAndVerify('BazTest.*', BAZ_TESTS)
-        self.RunAndVerifyAllowingDisabled('BazTest.*',
-                                          BAZ_TESTS + ['BazTest.DISABLED_TestC'])
-
-    def testFilterByTest(self):
-        """Tests filtering by test name."""
-
-        self.RunAndVerify('*.TestOne', ['BarTest.TestOne', 'BazTest.TestOne'])
-
-    def testFilterDisabledTests(self):
-        """Select only the disabled tests to run."""
-
-        self.RunAndVerify('DISABLED_FoobarTest.Test1', [])
-        self.RunAndVerifyAllowingDisabled('DISABLED_FoobarTest.Test1',
-                                          ['DISABLED_FoobarTest.Test1'])
-
-        self.RunAndVerify('*DISABLED_*', [])
-        self.RunAndVerifyAllowingDisabled('*DISABLED_*', DISABLED_TESTS)
-
-        self.RunAndVerify('*.DISABLED_*', [])
-        self.RunAndVerifyAllowingDisabled('*.DISABLED_*', [
+    self.RunAndVerify('*.DISABLED_*', [])
+    self.RunAndVerifyAllowingDisabled(
+        '*.DISABLED_*',
+        [
             'BarTest.DISABLED_TestFour',
             'BarTest.DISABLED_TestFive',
             'BazTest.DISABLED_TestC',
             'DISABLED_FoobarTest.DISABLED_Test2',
-        ])
+        ],
+    )
 
-        self.RunAndVerify('DISABLED_*', [])
-        self.RunAndVerifyAllowingDisabled('DISABLED_*', [
+    self.RunAndVerify('DISABLED_*', [])
+    self.RunAndVerifyAllowingDisabled(
+        'DISABLED_*',
+        [
             'DISABLED_FoobarTest.Test1',
             'DISABLED_FoobarTest.DISABLED_Test2',
             'DISABLED_FoobarbazTest.TestA',
-        ])
+        ],
+    )
 
-    def testWildcardInTestCaseName(self):
-        """Tests using wildcard in the test case name."""
+  def testWildcardInTestCaseName(self):
+    """Tests using wildcard in the test case name."""
 
-        self.RunAndVerify('*a*.*', [
+    self.RunAndVerify(
+        '*a*.*',
+        [
             'BarTest.TestOne',
             'BarTest.TestTwo',
             'BarTest.TestThree',
-
             'BazTest.TestOne',
             'BazTest.TestA',
-            'BazTest.TestB', ] + DEATH_TESTS + PARAM_TESTS)
+            'BazTest.TestB',
+        ]
+        + DEATH_TESTS
+        + PARAM_TESTS,
+    )
 
-    def testWildcardInTestName(self):
-        """Tests using wildcard in the test name."""
+  def testWildcardInTestName(self):
+    """Tests using wildcard in the test name."""
 
-        self.RunAndVerify('*.*A*', ['FooTest.Abc', 'BazTest.TestA'])
+    self.RunAndVerify('*.*A*', ['FooTest.Abc', 'BazTest.TestA'])
 
-    def testFilterWithoutDot(self):
-        """Tests a filter that has no '.' in it."""
+  def testFilterWithoutDot(self):
+    """Tests a filter that has no '.' in it."""
 
-        self.RunAndVerify('*z*', [
+    self.RunAndVerify(
+        '*z*',
+        [
             'FooTest.Xyz',
-
             'BazTest.TestOne',
             'BazTest.TestA',
             'BazTest.TestB',
-        ])
+        ],
+    )
 
-    def testTwoPatterns(self):
-        """Tests filters that consist of two patterns."""
+  def testTwoPatterns(self):
+    """Tests filters that consist of two patterns."""
 
-        self.RunAndVerify('Foo*.*:*A*', [
+    self.RunAndVerify(
+        'Foo*.*:*A*',
+        [
             'FooTest.Abc',
             'FooTest.Xyz',
-
             'BazTest.TestA',
-        ])
+        ],
+    )
 
-        # An empty pattern + a non-empty one
-        self.RunAndVerify(':*A*', ['FooTest.Abc', 'BazTest.TestA'])
+    # An empty pattern + a non-empty one
+    self.RunAndVerify(':*A*', ['FooTest.Abc', 'BazTest.TestA'])
 
-    def testThreePatterns(self):
-        """Tests filters that consist of three patterns."""
+  def testThreePatterns(self):
+    """Tests filters that consist of three patterns."""
 
-        self.RunAndVerify('*oo*:*A*:*One', [
+    self.RunAndVerify(
+        '*oo*:*A*:*One',
+        [
             'FooTest.Abc',
             'FooTest.Xyz',
-
             'BarTest.TestOne',
-
             'BazTest.TestOne',
             'BazTest.TestA',
-        ])
+        ],
+    )
 
-        # The 2nd pattern is empty.
-        self.RunAndVerify('*oo*::*One', [
+    # The 2nd pattern is empty.
+    self.RunAndVerify(
+        '*oo*::*One',
+        [
             'FooTest.Abc',
             'FooTest.Xyz',
-
             'BarTest.TestOne',
-
             'BazTest.TestOne',
-        ])
+        ],
+    )
 
-        # The last 2 patterns are empty.
-        self.RunAndVerify('*oo*::', [
+    # The last 2 patterns are empty.
+    self.RunAndVerify(
+        '*oo*::',
+        [
             'FooTest.Abc',
             'FooTest.Xyz',
-        ])
+        ],
+    )
 
-    def testNegativeFilters(self):
-        self.RunAndVerify('*-BazTest.TestOne', [
+  def testNegativeFilters(self):
+    self.RunAndVerify(
+        '*-BazTest.TestOne',
+        [
             'FooTest.Abc',
             'FooTest.Xyz',
-
             'BarTest.TestOne',
             'BarTest.TestTwo',
             'BarTest.TestThree',
-
             'BazTest.TestA',
             'BazTest.TestB',
-        ] + DEATH_TESTS + PARAM_TESTS)
-
-        self.RunAndVerify('*-FooTest.Abc:BazTest.*', [
+        ]
+        + DEATH_TESTS
+        + PARAM_TESTS,
+    )
+
+    self.RunAndVerify(
+        '*-FooTest.Abc:BazTest.*',
+        [
             'FooTest.Xyz',
-
             'BarTest.TestOne',
             'BarTest.TestTwo',
             'BarTest.TestThree',
-        ] + DEATH_TESTS + PARAM_TESTS)
-
-        self.RunAndVerify('BarTest.*-BarTest.TestOne', [
+        ]
+        + DEATH_TESTS
+        + PARAM_TESTS,
+    )
+
+    self.RunAndVerify(
+        'BarTest.*-BarTest.TestOne',
+        [
             'BarTest.TestTwo',
             'BarTest.TestThree',
-        ])
+        ],
+    )
 
-        # Tests without leading '*'.
-        self.RunAndVerify('-FooTest.Abc:FooTest.Xyz:BazTest.*', [
+    # Tests without leading '*'.
+    self.RunAndVerify(
+        '-FooTest.Abc:FooTest.Xyz:BazTest.*',
+        [
             'BarTest.TestOne',
             'BarTest.TestTwo',
             'BarTest.TestThree',
-        ] + DEATH_TESTS + PARAM_TESTS)
-
-        # Value parameterized tests.
-        self.RunAndVerify('*/*', PARAM_TESTS)
-
-        # Value parameterized tests filtering by the sequence name.
-        self.RunAndVerify('SeqP/*', [
+        ]
+        + DEATH_TESTS
+        + PARAM_TESTS,
+    )
+
+    # Value parameterized tests.
+    self.RunAndVerify('*/*', PARAM_TESTS)
+
+    # Value parameterized tests filtering by the sequence name.
+    self.RunAndVerify(
+        'SeqP/*',
+        [
             'SeqP/ParamTest.TestX/0',
             'SeqP/ParamTest.TestX/1',
             'SeqP/ParamTest.TestY/0',
             'SeqP/ParamTest.TestY/1',
-        ])
+        ],
+    )
 
-        # Value parameterized tests filtering by the test name.
-        self.RunAndVerify('*/0', [
+    # Value parameterized tests filtering by the test name.
+    self.RunAndVerify(
+        '*/0',
+        [
             'SeqP/ParamTest.TestX/0',
             'SeqP/ParamTest.TestY/0',
             'SeqQ/ParamTest.TestX/0',
             'SeqQ/ParamTest.TestY/0',
-        ])
-
-    def testFlagOverridesEnvVar(self):
-        """Tests that the filter flag overrides the filtering env. variable."""
-
-        SetEnvVar(FILTER_ENV_VAR, 'Foo*')
-        args = ['--%s=%s' % (FILTER_FLAG, '*One')]
-        tests_run = RunAndExtractTestList(args)[0]
-        SetEnvVar(FILTER_ENV_VAR, None)
-
-        self.AssertSetEqual(tests_run, ['BarTest.TestOne', 'BazTest.TestOne'])
-
-    def testShardStatusFileIsCreated(self):
-        """Tests that the shard file is created if specified in the environment."""
-
-        shard_status_file = os.path.join(gtest_test_utils.GetTempDir(),
-                                         'shard_status_file')
-        self.assert_(not os.path.exists(shard_status_file))
-
-        extra_env = {SHARD_STATUS_FILE_ENV_VAR: shard_status_file}
-        try:
-            InvokeWithModifiedEnv(extra_env, RunAndReturnOutput)
-        finally:
-            self.assert_(os.path.exists(shard_status_file))
-            os.remove(shard_status_file)
-
-    def testShardStatusFileIsCreatedWithListTests(self):
-        """Tests that the shard file is created with the "list_tests" flag."""
-
-        shard_status_file = os.path.join(gtest_test_utils.GetTempDir(),
-                                         'shard_status_file2')
-        self.assert_(not os.path.exists(shard_status_file))
-
-        extra_env = {SHARD_STATUS_FILE_ENV_VAR: shard_status_file}
-        try:
-            output = InvokeWithModifiedEnv(extra_env,
-                                           RunAndReturnOutput,
-                                           [LIST_TESTS_FLAG])
-        finally:
-            # This assertion ensures that Google Test enumerated the tests as
-            # opposed to running them.
-            self.assert_('[==========]' not in output,
-                         'Unexpected output during test enumeration.\n'
-                         'Please ensure that LIST_TESTS_FLAG is assigned the\n'
-                         'correct flag value for listing Google Test tests.')
-
-            self.assert_(os.path.exists(shard_status_file))
-            os.remove(shard_status_file)
-
-    if SUPPORTS_DEATH_TESTS:
-        def testShardingWorksWithDeathTests(self):
-            """Tests integration with death tests and sharding."""
-
-            gtest_filter = 'HasDeathTest.*:SeqP/*'
-            expected_tests = [
-                'HasDeathTest.Test1',
-                'HasDeathTest.Test2',
-
-                'SeqP/ParamTest.TestX/0',
-                'SeqP/ParamTest.TestX/1',
-                'SeqP/ParamTest.TestY/0',
-                'SeqP/ParamTest.TestY/1',
-            ]
-
-            for flag in ['--gtest_death_test_style=threadsafe',
-                         '--gtest_death_test_style=fast']:
-                self.RunAndVerifyWithSharding(gtest_filter, 3, expected_tests,
-                                              check_exit_0=True, args=[flag])
-                self.RunAndVerifyWithSharding(gtest_filter, 5, expected_tests,
-                                              check_exit_0=True, args=[flag])
+        ],
+    )
+
+  def testFlagOverridesEnvVar(self):
+    """Tests that the filter flag overrides the filtering env. variable."""
+
+    SetEnvVar(FILTER_ENV_VAR, 'Foo*')
+    args = ['--%s=%s' % (FILTER_FLAG, '*One')]
+    tests_run = RunAndExtractTestList(args)[0]
+    SetEnvVar(FILTER_ENV_VAR, None)
+
+    self.AssertSetEqual(tests_run, ['BarTest.TestOne', 'BazTest.TestOne'])
+
+  def testShardStatusFileIsCreated(self):
+    """Tests that the shard file is created if specified in the environment."""
+
+    shard_status_file = os.path.join(
+        gtest_test_utils.GetTempDir(), 'shard_status_file'
+    )
+    self.assertTrue(not os.path.exists(shard_status_file))
+
+    extra_env = {SHARD_STATUS_FILE_ENV_VAR: shard_status_file}
+    try:
+      InvokeWithModifiedEnv(extra_env, RunAndReturnOutput)
+    finally:
+      self.assertTrue(os.path.exists(shard_status_file))
+      os.remove(shard_status_file)
+
+  def testShardStatusFileIsCreatedWithListTests(self):
+    """Tests that the shard file is created with the "list_tests" flag."""
+
+    shard_status_file = os.path.join(
+        gtest_test_utils.GetTempDir(), 'shard_status_file2'
+    )
+    self.assertTrue(not os.path.exists(shard_status_file))
+
+    extra_env = {SHARD_STATUS_FILE_ENV_VAR: shard_status_file}
+    try:
+      output = InvokeWithModifiedEnv(
+          extra_env, RunAndReturnOutput, [LIST_TESTS_FLAG]
+      )
+    finally:
+      # This assertion ensures that Google Test enumerated the tests as
+      # opposed to running them.
+      self.assertTrue(
+          '[==========]' not in output,
+          (
+              'Unexpected output during test enumeration.\n'
+              'Please ensure that LIST_TESTS_FLAG is assigned the\n'
+              'correct flag value for listing Google Test tests.'
+          ),
+      )
+
+      self.assertTrue(os.path.exists(shard_status_file))
+      os.remove(shard_status_file)
+
+  def testDisabledBanner(self):
+    """Tests that the disabled banner prints only tests that match filter."""
+    make_filter = lambda s: ['--%s=%s' % (FILTER_FLAG, s)]
+
+    banners = RunAndExtractDisabledBannerList(make_filter('*'))
+    self.AssertSetEqual(
+        banners,
+        [
+            'BarTest.DISABLED_TestFour',
+            'BarTest.DISABLED_TestFive',
+            'BazTest.DISABLED_TestC',
+        ],
+    )
+
+    banners = RunAndExtractDisabledBannerList(make_filter('Bar*'))
+    self.AssertSetEqual(
+        banners, ['BarTest.DISABLED_TestFour', 'BarTest.DISABLED_TestFive']
+    )
+
+    banners = RunAndExtractDisabledBannerList(make_filter('*-Bar*'))
+    self.AssertSetEqual(banners, ['BazTest.DISABLED_TestC'])
+
+  if SUPPORTS_DEATH_TESTS:
+
+    def testShardingWorksWithDeathTests(self):
+      """Tests integration with death tests and sharding."""
+
+      gtest_filter = 'HasDeathTest.*:SeqP/*'
+      expected_tests = [
+          'HasDeathTest.Test1',
+          'HasDeathTest.Test2',
+          'SeqP/ParamTest.TestX/0',
+          'SeqP/ParamTest.TestX/1',
+          'SeqP/ParamTest.TestY/0',
+          'SeqP/ParamTest.TestY/1',
+      ]
+
+      for flag in [
+          '--gtest_death_test_style=threadsafe',
+          '--gtest_death_test_style=fast',
+      ]:
+        self.RunAndVerifyWithSharding(
+            gtest_filter, 3, expected_tests, check_exit_0=True, args=[flag]
+        )
+        self.RunAndVerifyWithSharding(
+            gtest_filter, 5, expected_tests, check_exit_0=True, args=[flag]
+        )
 
 
 if __name__ == '__main__':
-    gtest_test_utils.Main()
+  gtest_test_utils.Main()
diff --git a/external/googletest/googletest/test/googletest-global-environment-unittest.py b/external/googletest/googletest/test/googletest-global-environment-unittest.py
index 8f55c12d..bd73a2e1 100644
--- a/external/googletest/googletest/test/googletest-global-environment-unittest.py
+++ b/external/googletest/googletest/test/googletest-global-environment-unittest.py
@@ -35,38 +35,107 @@
 googletest-global-environment-unittest_ (a program written with Google Test).
 """
 
-import gtest_test_utils
+import re
+from googletest.test import gtest_test_utils
 
 
-def RunAndReturnOutput():
-    """Runs the test program and returns its output."""
+def RunAndReturnOutput(args=None):
+  """Runs the test program and returns its output."""
 
-    return gtest_test_utils.Subprocess([
-        gtest_test_utils.GetTestExecutablePath(
-            'googletest-global-environment-unittest_')
-    ]).output
+  return gtest_test_utils.Subprocess(
+      [
+          gtest_test_utils.GetTestExecutablePath(
+              'googletest-global-environment-unittest_'
+          )
+      ]
+      + (args or [])
+  ).output
 
 
 class GTestGlobalEnvironmentUnitTest(gtest_test_utils.TestCase):
-    """Tests global test environment failures."""
+  """Tests global test environment failures."""
 
-    def testEnvironmentSetUpFails(self):
-        """Tests the behavior of not specifying the fail_fast."""
+  def testEnvironmentSetUpFails(self):
+    """Tests the behavior of not specifying the fail_fast."""
 
-        # Run the test.
-        txt = RunAndReturnOutput()
+    # Run the test.
+    txt = RunAndReturnOutput()
 
-        # We should see the text of the global environment setup error.
-        self.assertIn('Canned environment setup error', txt)
+    # We should see the text of the global environment setup error.
+    self.assertIn('Canned environment setup error', txt)
 
-        # Our test should have been skipped due to the error, and not treated as a
-        # pass.
-        self.assertIn('[  SKIPPED ] 1 test', txt)
-        self.assertIn('[  PASSED  ] 0 tests', txt)
+    # Our test should have been skipped due to the error, and not treated as a
+    # pass.
+    self.assertIn('[  SKIPPED ] 1 test', txt)
+    self.assertIn('[  PASSED  ] 0 tests', txt)
 
-        # The test case shouldn't have been run.
-        self.assertNotIn('Unexpected call', txt)
+    # The test case shouldn't have been run.
+    self.assertNotIn('Unexpected call', txt)
+
+  def testEnvironmentSetUpAndTornDownForEachRepeat(self):
+    """Tests the behavior of test environments and gtest_repeat."""
+
+    # When --gtest_recreate_environments_when_repeating is true, the global test
+    # environment should be set up and torn down for each iteration.
+    txt = RunAndReturnOutput([
+        '--gtest_repeat=2',
+        '--gtest_recreate_environments_when_repeating=true',
+    ])
+
+    expected_pattern = (
+        '(.|\n)*'
+        r'Repeating all tests \(iteration 1\)'
+        '(.|\n)*'
+        'Global test environment set-up.'
+        '(.|\n)*'
+        'SomeTest.DoesFoo'
+        '(.|\n)*'
+        'Global test environment tear-down'
+        '(.|\n)*'
+        r'Repeating all tests \(iteration 2\)'
+        '(.|\n)*'
+        'Global test environment set-up.'
+        '(.|\n)*'
+        'SomeTest.DoesFoo'
+        '(.|\n)*'
+        'Global test environment tear-down'
+        '(.|\n)*'
+    )
+    self.assertRegex(txt, expected_pattern)
+
+  def testEnvironmentSetUpAndTornDownOnce(self):
+    """Tests environment and --gtest_recreate_environments_when_repeating."""
+
+    # By default the environment should only be set up and torn down once, at
+    # the start and end of the test respectively.
+    txt = RunAndReturnOutput(
+        [
+            '--gtest_repeat=2',
+        ]
+    )
+
+    expected_pattern = (
+        '(.|\n)*'
+        r'Repeating all tests \(iteration 1\)'
+        '(.|\n)*'
+        'Global test environment set-up.'
+        '(.|\n)*'
+        'SomeTest.DoesFoo'
+        '(.|\n)*'
+        r'Repeating all tests \(iteration 2\)'
+        '(.|\n)*'
+        'SomeTest.DoesFoo'
+        '(.|\n)*'
+        'Global test environment tear-down'
+        '(.|\n)*'
+    )
+    self.assertRegex(txt, expected_pattern)
+
+    self.assertEqual(len(re.findall('Global test environment set-up', txt)), 1)
+    self.assertEqual(
+        len(re.findall('Global test environment tear-down', txt)), 1
+    )
 
 
 if __name__ == '__main__':
-    gtest_test_utils.Main()
+  gtest_test_utils.Main()
diff --git a/external/googletest/googletest/test/googletest-json-outfiles-test.py b/external/googletest/googletest/test/googletest-json-outfiles-test.py
index dcbda09c..5626004e 100644
--- a/external/googletest/googletest/test/googletest-json-outfiles-test.py
+++ b/external/googletest/googletest/test/googletest-json-outfiles-test.py
@@ -32,160 +32,149 @@
 
 import json
 import os
-import gtest_json_test_utils
-import gtest_test_utils
+from googletest.test import gtest_json_test_utils
+from googletest.test import gtest_test_utils
 
 GTEST_OUTPUT_SUBDIR = 'json_outfiles'
 GTEST_OUTPUT_1_TEST = 'gtest_xml_outfile1_test_'
 GTEST_OUTPUT_2_TEST = 'gtest_xml_outfile2_test_'
 
 EXPECTED_1 = {
-    u'tests':
-        1,
-    u'failures':
-        0,
-    u'disabled':
-        0,
-    u'errors':
-        0,
-    u'time':
-        u'*',
-    u'timestamp':
-        u'*',
-    u'name':
-        u'AllTests',
-    u'testsuites': [{
-        u'name':
-            u'PropertyOne',
-        u'tests':
-            1,
-        u'failures':
-            0,
-        u'disabled':
-            0,
-        u'errors':
-            0,
-        u'time':
-            u'*',
-        u'timestamp':
-            u'*',
-        u'testsuite': [{
-            u'name': u'TestSomeProperties',
-            u'status': u'RUN',
-            u'result': u'COMPLETED',
-            u'time': u'*',
-            u'timestamp': u'*',
-            u'classname': u'PropertyOne',
-            u'SetUpProp': u'1',
-            u'TestSomeProperty': u'1',
-            u'TearDownProp': u'1',
+    'tests': 1,
+    'failures': 0,
+    'disabled': 0,
+    'errors': 0,
+    'time': '*',
+    'timestamp': '*',
+    'name': 'AllTests',
+    'testsuites': [{
+        'name': 'PropertyOne',
+        'tests': 1,
+        'failures': 0,
+        'disabled': 0,
+        'errors': 0,
+        'time': '*',
+        'timestamp': '*',
+        'testsuite': [{
+            'name': 'TestSomeProperties',
+            'file': 'gtest_xml_outfile1_test_.cc',
+            'line': 41,
+            'status': 'RUN',
+            'result': 'COMPLETED',
+            'time': '*',
+            'timestamp': '*',
+            'classname': 'PropertyOne',
+            'SetUpProp': '1',
+            'TestSomeProperty': '1',
+            'TearDownProp': '1',
         }],
     }],
 }
 
 EXPECTED_2 = {
-    u'tests':
-        1,
-    u'failures':
-        0,
-    u'disabled':
-        0,
-    u'errors':
-        0,
-    u'time':
-        u'*',
-    u'timestamp':
-        u'*',
-    u'name':
-        u'AllTests',
-    u'testsuites': [{
-        u'name':
-            u'PropertyTwo',
-        u'tests':
-            1,
-        u'failures':
-            0,
-        u'disabled':
-            0,
-        u'errors':
-            0,
-        u'time':
-            u'*',
-        u'timestamp':
-            u'*',
-        u'testsuite': [{
-            u'name': u'TestSomeProperties',
-            u'status': u'RUN',
-            u'result': u'COMPLETED',
-            u'timestamp': u'*',
-            u'time': u'*',
-            u'classname': u'PropertyTwo',
-            u'SetUpProp': u'2',
-            u'TestSomeProperty': u'2',
-            u'TearDownProp': u'2',
+    'tests': 1,
+    'failures': 0,
+    'disabled': 0,
+    'errors': 0,
+    'time': '*',
+    'timestamp': '*',
+    'name': 'AllTests',
+    'testsuites': [{
+        'name': 'PropertyTwo',
+        'tests': 1,
+        'failures': 0,
+        'disabled': 0,
+        'errors': 0,
+        'time': '*',
+        'timestamp': '*',
+        'testsuite': [{
+            'name': 'TestInt64ConvertibleProperties',
+            'file': 'gtest_xml_outfile2_test_.cc',
+            'line': 43,
+            'status': 'RUN',
+            'result': 'COMPLETED',
+            'timestamp': '*',
+            'time': '*',
+            'classname': 'PropertyTwo',
+            'SetUpProp': '2',
+            'TestFloatProperty': '3.25',
+            'TestDoubleProperty': '4.75',
+            'TestSizetProperty': '5',
+            'TestBoolProperty': 'true',
+            'TestCharProperty': 'A',
+            'TestInt16Property': '6',
+            'TestInt32Property': '7',
+            'TestInt64Property': '8',
+            'TestEnumProperty': '9',
+            'TestAtomicIntProperty': '10',
+            'TearDownProp': '2',
         }],
     }],
 }
 
 
 class GTestJsonOutFilesTest(gtest_test_utils.TestCase):
-    """Unit test for Google Test's JSON output functionality."""
-
-    def setUp(self):
-        # We want the trailing '/' that the last "" provides in os.path.join, for
-        # telling Google Test to create an output directory instead of a single file
-        # for xml output.
-        self.output_dir_ = os.path.join(gtest_test_utils.GetTempDir(),
-                                        GTEST_OUTPUT_SUBDIR, '')
-        self.DeleteFilesAndDir()
-
-    def tearDown(self):
-        self.DeleteFilesAndDir()
-
-    def DeleteFilesAndDir(self):
-        try:
-            os.remove(os.path.join(self.output_dir_, GTEST_OUTPUT_1_TEST + '.json'))
-        except os.error:
-            pass
-        try:
-            os.remove(os.path.join(self.output_dir_, GTEST_OUTPUT_2_TEST + '.json'))
-        except os.error:
-            pass
-        try:
-            os.rmdir(self.output_dir_)
-        except os.error:
-            pass
-
-    def testOutfile1(self):
-        self._TestOutFile(GTEST_OUTPUT_1_TEST, EXPECTED_1)
-
-    def testOutfile2(self):
-        self._TestOutFile(GTEST_OUTPUT_2_TEST, EXPECTED_2)
-
-    def _TestOutFile(self, test_name, expected):
-        gtest_prog_path = gtest_test_utils.GetTestExecutablePath(test_name)
-        command = [gtest_prog_path, '--gtest_output=json:%s' % self.output_dir_]
-        p = gtest_test_utils.Subprocess(command,
-                                        working_dir=gtest_test_utils.GetTempDir())
-        self.assert_(p.exited)
-        self.assertEquals(0, p.exit_code)
-
-        output_file_name1 = test_name + '.json'
-        output_file1 = os.path.join(self.output_dir_, output_file_name1)
-        output_file_name2 = 'lt-' + output_file_name1
-        output_file2 = os.path.join(self.output_dir_, output_file_name2)
-        self.assert_(os.path.isfile(output_file1) or os.path.isfile(output_file2),
-                     output_file1)
-
-        if os.path.isfile(output_file1):
-            with open(output_file1) as f:
-                actual = json.load(f)
-        else:
-            with open(output_file2) as f:
-                actual = json.load(f)
-        self.assertEqual(expected, gtest_json_test_utils.normalize(actual))
+  """Unit test for Google Test's JSON output functionality."""
+
+  def setUp(self):
+    # We want the trailing '/' that the last "" provides in os.path.join, for
+    # telling Google Test to create an output directory instead of a single file
+    # for xml output.
+    self.output_dir_ = os.path.join(
+        gtest_test_utils.GetTempDir(), GTEST_OUTPUT_SUBDIR, ''
+    )
+    self.DeleteFilesAndDir()
+
+  def tearDown(self):
+    self.DeleteFilesAndDir()
+
+  def DeleteFilesAndDir(self):
+    try:
+      os.remove(os.path.join(self.output_dir_, GTEST_OUTPUT_1_TEST + '.json'))
+    except os.error:
+      pass
+    try:
+      os.remove(os.path.join(self.output_dir_, GTEST_OUTPUT_2_TEST + '.json'))
+    except os.error:
+      pass
+    try:
+      os.rmdir(self.output_dir_)
+    except os.error:
+      pass
+
+  def testOutfile1(self):
+    self._TestOutFile(GTEST_OUTPUT_1_TEST, EXPECTED_1)
+
+  def testOutfile2(self):
+    self._TestOutFile(GTEST_OUTPUT_2_TEST, EXPECTED_2)
+
+  def _TestOutFile(self, test_name, expected):
+    gtest_prog_path = gtest_test_utils.GetTestExecutablePath(test_name)
+    command = [gtest_prog_path, '--gtest_output=json:%s' % self.output_dir_]
+    p = gtest_test_utils.Subprocess(
+        command, working_dir=gtest_test_utils.GetTempDir()
+    )
+    self.assertTrue(p.exited)
+    self.assertEqual(0, p.exit_code)
+
+    output_file_name1 = test_name + '.json'
+    output_file1 = os.path.join(self.output_dir_, output_file_name1)
+    output_file_name2 = 'lt-' + output_file_name1
+    output_file2 = os.path.join(self.output_dir_, output_file_name2)
+    self.assertTrue(
+        os.path.isfile(output_file1) or os.path.isfile(output_file2),
+        output_file1,
+    )
+
+    if os.path.isfile(output_file1):
+      with open(output_file1) as f:
+        actual = json.load(f)
+    else:
+      with open(output_file2) as f:
+        actual = json.load(f)
+    self.assertEqual(expected, gtest_json_test_utils.normalize(actual))
 
 
 if __name__ == '__main__':
-    os.environ['GTEST_STACK_TRACE_DEPTH'] = '0'
-    gtest_test_utils.Main()
+  os.environ['GTEST_STACK_TRACE_DEPTH'] = '0'
+  gtest_test_utils.Main()
diff --git a/external/googletest/googletest/test/googletest-json-output-unittest.py b/external/googletest/googletest/test/googletest-json-output-unittest.py
index d69653b9..c75051c8 100644
--- a/external/googletest/googletest/test/googletest-json-output-unittest.py
+++ b/external/googletest/googletest/test/googletest-json-output-unittest.py
@@ -37,8 +37,8 @@
 import re
 import sys
 
-import gtest_json_test_utils
-import gtest_test_utils
+from googletest.test import gtest_json_test_utils
+from googletest.test import gtest_test_utils
 
 GTEST_FILTER_FLAG = '--gtest_filter'
 GTEST_LIST_TESTS_FLAG = '--gtest_list_tests'
@@ -52,796 +52,863 @@
 SUPPORTS_STACK_TRACES = NO_STACKTRACE_SUPPORT_FLAG not in sys.argv
 
 if SUPPORTS_STACK_TRACES:
-    STACK_TRACE_TEMPLATE = '\nStack trace:\n*'
+  STACK_TRACE_TEMPLATE = '\nStack trace:\n*'
 else:
-    STACK_TRACE_TEMPLATE = ''
+  STACK_TRACE_TEMPLATE = '\n'
 
 EXPECTED_NON_EMPTY = {
-    u'tests':
-        26,
-    u'failures':
-        5,
-    u'disabled':
-        2,
-    u'errors':
-        0,
-    u'timestamp':
-        u'*',
-    u'time':
-        u'*',
-    u'ad_hoc_property':
-        u'42',
-    u'name':
-        u'AllTests',
-    u'testsuites': [{
-        u'name':
-            u'SuccessfulTest',
-        u'tests':
-            1,
-        u'failures':
-            0,
-        u'disabled':
-            0,
-        u'errors':
-            0,
-        u'time':
-            u'*',
-        u'timestamp':
-            u'*',
-        u'testsuite': [{
-            u'name': u'Succeeds',
-            u'status': u'RUN',
-            u'result': u'COMPLETED',
-            u'time': u'*',
-            u'timestamp': u'*',
-            u'classname': u'SuccessfulTest'
-        }]
-    }, {
-        u'name':
-            u'FailedTest',
-        u'tests':
-            1,
-        u'failures':
-            1,
-        u'disabled':
-            0,
-        u'errors':
-            0,
-        u'time':
-            u'*',
-        u'timestamp':
-            u'*',
-        u'testsuite': [{
-            u'name':
-                u'Fails',
-            u'status':
-                u'RUN',
-            u'result':
-                u'COMPLETED',
-            u'time':
-                u'*',
-            u'timestamp':
-                u'*',
-            u'classname':
-                u'FailedTest',
-            u'failures': [{
-                u'failure': u'gtest_xml_output_unittest_.cc:*\n'
-                            u'Expected equality of these values:\n'
-                            u'  1\n  2' + STACK_TRACE_TEMPLATE,
-                u'type': u''
-            }]
-        }]
-    }, {
-        u'name':
-            u'DisabledTest',
-        u'tests':
-            1,
-        u'failures':
-            0,
-        u'disabled':
-            1,
-        u'errors':
-            0,
-        u'time':
-            u'*',
-        u'timestamp':
-            u'*',
-        u'testsuite': [{
-            u'name': u'DISABLED_test_not_run',
-            u'status': u'NOTRUN',
-            u'result': u'SUPPRESSED',
-            u'time': u'*',
-            u'timestamp': u'*',
-            u'classname': u'DisabledTest'
-        }]
-    }, {
-        u'name':
-            u'SkippedTest',
-        u'tests':
-            3,
-        u'failures':
-            1,
-        u'disabled':
-            0,
-        u'errors':
-            0,
-        u'time':
-            u'*',
-        u'timestamp':
-            u'*',
-        u'testsuite': [{
-            u'name': u'Skipped',
-            u'status': u'RUN',
-            u'result': u'SKIPPED',
-            u'time': u'*',
-            u'timestamp': u'*',
-            u'classname': u'SkippedTest'
-        }, {
-            u'name': u'SkippedWithMessage',
-            u'status': u'RUN',
-            u'result': u'SKIPPED',
-            u'time': u'*',
-            u'timestamp': u'*',
-            u'classname': u'SkippedTest'
-        }, {
-            u'name':
-                u'SkippedAfterFailure',
-            u'status':
-                u'RUN',
-            u'result':
-                u'COMPLETED',
-            u'time':
-                u'*',
-            u'timestamp':
-                u'*',
-            u'classname':
-                u'SkippedTest',
-            u'failures': [{
-                u'failure': u'gtest_xml_output_unittest_.cc:*\n'
-                            u'Expected equality of these values:\n'
-                            u'  1\n  2' + STACK_TRACE_TEMPLATE,
-                u'type': u''
-            }]
-        }]
-    }, {
-        u'name':
-            u'MixedResultTest',
-        u'tests':
-            3,
-        u'failures':
-            1,
-        u'disabled':
-            1,
-        u'errors':
-            0,
-        u'time':
-            u'*',
-        u'timestamp':
-            u'*',
-        u'testsuite': [{
-            u'name': u'Succeeds',
-            u'status': u'RUN',
-            u'result': u'COMPLETED',
-            u'time': u'*',
-            u'timestamp': u'*',
-            u'classname': u'MixedResultTest'
-        }, {
-            u'name':
-                u'Fails',
-            u'status':
-                u'RUN',
-            u'result':
-                u'COMPLETED',
-            u'time':
-                u'*',
-            u'timestamp':
-                u'*',
-            u'classname':
-                u'MixedResultTest',
-            u'failures': [{
-                u'failure': u'gtest_xml_output_unittest_.cc:*\n'
-                            u'Expected equality of these values:\n'
-                            u'  1\n  2' + STACK_TRACE_TEMPLATE,
-                u'type': u''
-            }, {
-                u'failure': u'gtest_xml_output_unittest_.cc:*\n'
-                            u'Expected equality of these values:\n'
-                            u'  2\n  3' + STACK_TRACE_TEMPLATE,
-                u'type': u''
-            }]
-        }, {
-            u'name': u'DISABLED_test',
-            u'status': u'NOTRUN',
-            u'result': u'SUPPRESSED',
-            u'time': u'*',
-            u'timestamp': u'*',
-            u'classname': u'MixedResultTest'
-        }]
-    }, {
-        u'name':
-            u'XmlQuotingTest',
-        u'tests':
-            1,
-        u'failures':
-            1,
-        u'disabled':
-            0,
-        u'errors':
-            0,
-        u'time':
-            u'*',
-        u'timestamp':
-            u'*',
-        u'testsuite': [{
-            u'name':
-                u'OutputsCData',
-            u'status':
-                u'RUN',
-            u'result':
-                u'COMPLETED',
-            u'time':
-                u'*',
-            u'timestamp':
-                u'*',
-            u'classname':
-                u'XmlQuotingTest',
-            u'failures': [{
-                u'failure': u'gtest_xml_output_unittest_.cc:*\n'
-                            u'Failed\nXML output: <?xml encoding="utf-8">'
-                            u'<top><![CDATA[cdata text]]></top>' +
-                            STACK_TRACE_TEMPLATE,
-                u'type': u''
-            }]
-        }]
-    }, {
-        u'name':
-            u'InvalidCharactersTest',
-        u'tests':
-            1,
-        u'failures':
-            1,
-        u'disabled':
-            0,
-        u'errors':
-            0,
-        u'time':
-            u'*',
-        u'timestamp':
-            u'*',
-        u'testsuite': [{
-            u'name':
-                u'InvalidCharactersInMessage',
-            u'status':
-                u'RUN',
-            u'result':
-                u'COMPLETED',
-            u'time':
-                u'*',
-            u'timestamp':
-                u'*',
-            u'classname':
-                u'InvalidCharactersTest',
-            u'failures': [{
-                u'failure': u'gtest_xml_output_unittest_.cc:*\n'
-                            u'Failed\nInvalid characters in brackets'
-                            u' [\x01\x02]' + STACK_TRACE_TEMPLATE,
-                u'type': u''
-            }]
-        }]
-    }, {
-        u'name':
-            u'PropertyRecordingTest',
-        u'tests':
-            4,
-        u'failures':
-            0,
-        u'disabled':
-            0,
-        u'errors':
-            0,
-        u'time':
-            u'*',
-        u'timestamp':
-            u'*',
-        u'SetUpTestSuite':
-            u'yes',
-        u'TearDownTestSuite':
-            u'aye',
-        u'testsuite': [{
-            u'name': u'OneProperty',
-            u'status': u'RUN',
-            u'result': u'COMPLETED',
-            u'time': u'*',
-            u'timestamp': u'*',
-            u'classname': u'PropertyRecordingTest',
-            u'key_1': u'1'
-        }, {
-            u'name': u'IntValuedProperty',
-            u'status': u'RUN',
-            u'result': u'COMPLETED',
-            u'time': u'*',
-            u'timestamp': u'*',
-            u'classname': u'PropertyRecordingTest',
-            u'key_int': u'1'
-        }, {
-            u'name': u'ThreeProperties',
-            u'status': u'RUN',
-            u'result': u'COMPLETED',
-            u'time': u'*',
-            u'timestamp': u'*',
-            u'classname': u'PropertyRecordingTest',
-            u'key_1': u'1',
-            u'key_2': u'2',
-            u'key_3': u'3'
-        }, {
-            u'name': u'TwoValuesForOneKeyUsesLastValue',
-            u'status': u'RUN',
-            u'result': u'COMPLETED',
-            u'time': u'*',
-            u'timestamp': u'*',
-            u'classname': u'PropertyRecordingTest',
-            u'key_1': u'2'
-        }]
-    }, {
-        u'name':
-            u'NoFixtureTest',
-        u'tests':
-            3,
-        u'failures':
-            0,
-        u'disabled':
-            0,
-        u'errors':
-            0,
-        u'time':
-            u'*',
-        u'timestamp':
-            u'*',
-        u'testsuite': [{
-            u'name': u'RecordProperty',
-            u'status': u'RUN',
-            u'result': u'COMPLETED',
-            u'time': u'*',
-            u'timestamp': u'*',
-            u'classname': u'NoFixtureTest',
-            u'key': u'1'
-        }, {
-            u'name': u'ExternalUtilityThatCallsRecordIntValuedProperty',
-            u'status': u'RUN',
-            u'result': u'COMPLETED',
-            u'time': u'*',
-            u'timestamp': u'*',
-            u'classname': u'NoFixtureTest',
-            u'key_for_utility_int': u'1'
-        }, {
-            u'name': u'ExternalUtilityThatCallsRecordStringValuedProperty',
-            u'status': u'RUN',
-            u'result': u'COMPLETED',
-            u'time': u'*',
-            u'timestamp': u'*',
-            u'classname': u'NoFixtureTest',
-            u'key_for_utility_string': u'1'
-        }]
-    }, {
-        u'name':
-            u'TypedTest/0',
-        u'tests':
-            1,
-        u'failures':
-            0,
-        u'disabled':
-            0,
-        u'errors':
-            0,
-        u'time':
-            u'*',
-        u'timestamp':
-            u'*',
-        u'testsuite': [{
-            u'name': u'HasTypeParamAttribute',
-            u'type_param': u'int',
-            u'status': u'RUN',
-            u'result': u'COMPLETED',
-            u'time': u'*',
-            u'timestamp': u'*',
-            u'classname': u'TypedTest/0'
-        }]
-    }, {
-        u'name':
-            u'TypedTest/1',
-        u'tests':
-            1,
-        u'failures':
-            0,
-        u'disabled':
-            0,
-        u'errors':
-            0,
-        u'time':
-            u'*',
-        u'timestamp':
-            u'*',
-        u'testsuite': [{
-            u'name': u'HasTypeParamAttribute',
-            u'type_param': u'long',
-            u'status': u'RUN',
-            u'result': u'COMPLETED',
-            u'time': u'*',
-            u'timestamp': u'*',
-            u'classname': u'TypedTest/1'
-        }]
-    }, {
-        u'name':
-            u'Single/TypeParameterizedTestSuite/0',
-        u'tests':
-            1,
-        u'failures':
-            0,
-        u'disabled':
-            0,
-        u'errors':
-            0,
-        u'time':
-            u'*',
-        u'timestamp':
-            u'*',
-        u'testsuite': [{
-            u'name': u'HasTypeParamAttribute',
-            u'type_param': u'int',
-            u'status': u'RUN',
-            u'result': u'COMPLETED',
-            u'time': u'*',
-            u'timestamp': u'*',
-            u'classname': u'Single/TypeParameterizedTestSuite/0'
-        }]
-    }, {
-        u'name':
-            u'Single/TypeParameterizedTestSuite/1',
-        u'tests':
-            1,
-        u'failures':
-            0,
-        u'disabled':
-            0,
-        u'errors':
-            0,
-        u'time':
-            u'*',
-        u'timestamp':
-            u'*',
-        u'testsuite': [{
-            u'name': u'HasTypeParamAttribute',
-            u'type_param': u'long',
-            u'status': u'RUN',
-            u'result': u'COMPLETED',
-            u'time': u'*',
-            u'timestamp': u'*',
-            u'classname': u'Single/TypeParameterizedTestSuite/1'
-        }]
-    }, {
-        u'name':
-            u'Single/ValueParamTest',
-        u'tests':
-            4,
-        u'failures':
-            0,
-        u'disabled':
-            0,
-        u'errors':
-            0,
-        u'time':
-            u'*',
-        u'timestamp':
-            u'*',
-        u'testsuite': [{
-            u'name': u'HasValueParamAttribute/0',
-            u'value_param': u'33',
-            u'status': u'RUN',
-            u'result': u'COMPLETED',
-            u'time': u'*',
-            u'timestamp': u'*',
-            u'classname': u'Single/ValueParamTest'
-        }, {
-            u'name': u'HasValueParamAttribute/1',
-            u'value_param': u'42',
-            u'status': u'RUN',
-            u'result': u'COMPLETED',
-            u'time': u'*',
-            u'timestamp': u'*',
-            u'classname': u'Single/ValueParamTest'
-        }, {
-            u'name': u'AnotherTestThatHasValueParamAttribute/0',
-            u'value_param': u'33',
-            u'status': u'RUN',
-            u'result': u'COMPLETED',
-            u'time': u'*',
-            u'timestamp': u'*',
-            u'classname': u'Single/ValueParamTest'
-        }, {
-            u'name': u'AnotherTestThatHasValueParamAttribute/1',
-            u'value_param': u'42',
-            u'status': u'RUN',
-            u'result': u'COMPLETED',
-            u'time': u'*',
-            u'timestamp': u'*',
-            u'classname': u'Single/ValueParamTest'
-        }]
-    }]
+    'tests': 28,
+    'failures': 5,
+    'disabled': 2,
+    'errors': 0,
+    'timestamp': '*',
+    'time': '*',
+    'ad_hoc_property': '42',
+    'name': 'AllTests',
+    'testsuites': [
+        {
+            'name': 'SuccessfulTest',
+            'tests': 1,
+            'failures': 0,
+            'disabled': 0,
+            'errors': 0,
+            'time': '*',
+            'timestamp': '*',
+            'testsuite': [{
+                'name': 'Succeeds',
+                'file': 'gtest_xml_output_unittest_.cc',
+                'line': 53,
+                'status': 'RUN',
+                'result': 'COMPLETED',
+                'time': '*',
+                'timestamp': '*',
+                'classname': 'SuccessfulTest',
+            }],
+        },
+        {
+            'name': 'FailedTest',
+            'tests': 1,
+            'failures': 1,
+            'disabled': 0,
+            'errors': 0,
+            'time': '*',
+            'timestamp': '*',
+            'testsuite': [{
+                'name': 'Fails',
+                'file': 'gtest_xml_output_unittest_.cc',
+                'line': 61,
+                'status': 'RUN',
+                'result': 'COMPLETED',
+                'time': '*',
+                'timestamp': '*',
+                'classname': 'FailedTest',
+                'failures': [{
+                    'failure': (
+                        'gtest_xml_output_unittest_.cc:*\n'
+                        'Expected equality of these values:\n'
+                        '  1\n  2'
+                        + STACK_TRACE_TEMPLATE
+                    ),
+                    'type': '',
+                }],
+            }],
+        },
+        {
+            'name': 'DisabledTest',
+            'tests': 1,
+            'failures': 0,
+            'disabled': 1,
+            'errors': 0,
+            'time': '*',
+            'timestamp': '*',
+            'testsuite': [{
+                'name': 'DISABLED_test_not_run',
+                'file': 'gtest_xml_output_unittest_.cc',
+                'line': 68,
+                'status': 'NOTRUN',
+                'result': 'SUPPRESSED',
+                'time': '*',
+                'timestamp': '*',
+                'classname': 'DisabledTest',
+            }],
+        },
+        {
+            'name': 'SkippedTest',
+            'tests': 3,
+            'failures': 1,
+            'disabled': 0,
+            'errors': 0,
+            'time': '*',
+            'timestamp': '*',
+            'testsuite': [
+                {
+                    'name': 'Skipped',
+                    'file': 'gtest_xml_output_unittest_.cc',
+                    'line': 75,
+                    'status': 'RUN',
+                    'result': 'SKIPPED',
+                    'time': '*',
+                    'timestamp': '*',
+                    'classname': 'SkippedTest',
+                    'skipped': [
+                        {'message': 'gtest_xml_output_unittest_.cc:*\n\n'}
+                    ],
+                },
+                {
+                    'name': 'SkippedWithMessage',
+                    'file': 'gtest_xml_output_unittest_.cc',
+                    'line': 79,
+                    'status': 'RUN',
+                    'result': 'SKIPPED',
+                    'time': '*',
+                    'timestamp': '*',
+                    'classname': 'SkippedTest',
+                    'skipped': [{
+                        'message': (
+                            'gtest_xml_output_unittest_.cc:*\n'
+                            'It is good practice to tell why you skip a test.\n'
+                        )
+                    }],
+                },
+                {
+                    'name': 'SkippedAfterFailure',
+                    'file': 'gtest_xml_output_unittest_.cc',
+                    'line': 83,
+                    'status': 'RUN',
+                    'result': 'COMPLETED',
+                    'time': '*',
+                    'timestamp': '*',
+                    'classname': 'SkippedTest',
+                    'failures': [{
+                        'failure': (
+                            'gtest_xml_output_unittest_.cc:*\n'
+                            'Expected equality of these values:\n'
+                            '  1\n  2'
+                            + STACK_TRACE_TEMPLATE
+                        ),
+                        'type': '',
+                    }],
+                    'skipped': [{
+                        'message': (
+                            'gtest_xml_output_unittest_.cc:*\n'
+                            'It is good practice to tell why you skip a test.\n'
+                        )
+                    }],
+                },
+            ],
+        },
+        {
+            'name': 'MixedResultTest',
+            'tests': 3,
+            'failures': 1,
+            'disabled': 1,
+            'errors': 0,
+            'time': '*',
+            'timestamp': '*',
+            'testsuite': [
+                {
+                    'name': 'Succeeds',
+                    'file': 'gtest_xml_output_unittest_.cc',
+                    'line': 88,
+                    'status': 'RUN',
+                    'result': 'COMPLETED',
+                    'time': '*',
+                    'timestamp': '*',
+                    'classname': 'MixedResultTest',
+                },
+                {
+                    'name': 'Fails',
+                    'file': 'gtest_xml_output_unittest_.cc',
+                    'line': 93,
+                    'status': 'RUN',
+                    'result': 'COMPLETED',
+                    'time': '*',
+                    'timestamp': '*',
+                    'classname': 'MixedResultTest',
+                    'failures': [
+                        {
+                            'failure': (
+                                'gtest_xml_output_unittest_.cc:*\n'
+                                'Expected equality of these values:\n'
+                                '  1\n  2'
+                                + STACK_TRACE_TEMPLATE
+                            ),
+                            'type': '',
+                        },
+                        {
+                            'failure': (
+                                'gtest_xml_output_unittest_.cc:*\n'
+                                'Expected equality of these values:\n'
+                                '  2\n  3'
+                                + STACK_TRACE_TEMPLATE
+                            ),
+                            'type': '',
+                        },
+                    ],
+                },
+                {
+                    'name': 'DISABLED_test',
+                    'file': 'gtest_xml_output_unittest_.cc',
+                    'line': 98,
+                    'status': 'NOTRUN',
+                    'result': 'SUPPRESSED',
+                    'time': '*',
+                    'timestamp': '*',
+                    'classname': 'MixedResultTest',
+                },
+            ],
+        },
+        {
+            'name': 'XmlQuotingTest',
+            'tests': 1,
+            'failures': 1,
+            'disabled': 0,
+            'errors': 0,
+            'time': '*',
+            'timestamp': '*',
+            'testsuite': [{
+                'name': 'OutputsCData',
+                'file': 'gtest_xml_output_unittest_.cc',
+                'line': 102,
+                'status': 'RUN',
+                'result': 'COMPLETED',
+                'time': '*',
+                'timestamp': '*',
+                'classname': 'XmlQuotingTest',
+                'failures': [{
+                    'failure': (
+                        'gtest_xml_output_unittest_.cc:*\n'
+                        'Failed\nXML output: <?xml encoding="utf-8">'
+                        '<top><![CDATA[cdata text]]></top>'
+                        + STACK_TRACE_TEMPLATE
+                    ),
+                    'type': '',
+                }],
+            }],
+        },
+        {
+            'name': 'InvalidCharactersTest',
+            'tests': 1,
+            'failures': 1,
+            'disabled': 0,
+            'errors': 0,
+            'time': '*',
+            'timestamp': '*',
+            'testsuite': [{
+                'name': 'InvalidCharactersInMessage',
+                'file': 'gtest_xml_output_unittest_.cc',
+                'line': 109,
+                'status': 'RUN',
+                'result': 'COMPLETED',
+                'time': '*',
+                'timestamp': '*',
+                'classname': 'InvalidCharactersTest',
+                'failures': [{
+                    'failure': (
+                        'gtest_xml_output_unittest_.cc:*\n'
+                        'Failed\nInvalid characters in brackets'
+                        ' [\x01\x02]'
+                        + STACK_TRACE_TEMPLATE
+                    ),
+                    'type': '',
+                }],
+            }],
+        },
+        {
+            'name': 'PropertyRecordingTest',
+            'tests': 4,
+            'failures': 0,
+            'disabled': 0,
+            'errors': 0,
+            'time': '*',
+            'timestamp': '*',
+            'SetUpTestSuite': 'yes',
+            'SetUpTestSuite (with whitespace)': 'yes and yes',
+            'TearDownTestSuite': 'aye',
+            'TearDownTestSuite (with whitespace)': 'aye and aye',
+            'testsuite': [
+                {
+                    'name': 'OneProperty',
+                    'file': 'gtest_xml_output_unittest_.cc',
+                    'line': 125,
+                    'status': 'RUN',
+                    'result': 'COMPLETED',
+                    'time': '*',
+                    'timestamp': '*',
+                    'classname': 'PropertyRecordingTest',
+                    'key_1': '1',
+                },
+                {
+                    'name': 'IntValuedProperty',
+                    'file': 'gtest_xml_output_unittest_.cc',
+                    'line': 129,
+                    'status': 'RUN',
+                    'result': 'COMPLETED',
+                    'time': '*',
+                    'timestamp': '*',
+                    'classname': 'PropertyRecordingTest',
+                    'key_int': '1',
+                },
+                {
+                    'name': 'ThreeProperties',
+                    'file': 'gtest_xml_output_unittest_.cc',
+                    'line': 133,
+                    'status': 'RUN',
+                    'result': 'COMPLETED',
+                    'time': '*',
+                    'timestamp': '*',
+                    'classname': 'PropertyRecordingTest',
+                    'key_1': '1',
+                    'key_2': '2',
+                    'key_3': '3',
+                },
+                {
+                    'name': 'TwoValuesForOneKeyUsesLastValue',
+                    'file': 'gtest_xml_output_unittest_.cc',
+                    'line': 139,
+                    'status': 'RUN',
+                    'result': 'COMPLETED',
+                    'time': '*',
+                    'timestamp': '*',
+                    'classname': 'PropertyRecordingTest',
+                    'key_1': '2',
+                },
+            ],
+        },
+        {
+            'name': 'NoFixtureTest',
+            'tests': 3,
+            'failures': 0,
+            'disabled': 0,
+            'errors': 0,
+            'time': '*',
+            'timestamp': '*',
+            'testsuite': [
+                {
+                    'name': 'RecordProperty',
+                    'file': 'gtest_xml_output_unittest_.cc',
+                    'line': 144,
+                    'status': 'RUN',
+                    'result': 'COMPLETED',
+                    'time': '*',
+                    'timestamp': '*',
+                    'classname': 'NoFixtureTest',
+                    'key': '1',
+                },
+                {
+                    'name': 'ExternalUtilityThatCallsRecordIntValuedProperty',
+                    'file': 'gtest_xml_output_unittest_.cc',
+                    'line': 157,
+                    'status': 'RUN',
+                    'result': 'COMPLETED',
+                    'time': '*',
+                    'timestamp': '*',
+                    'classname': 'NoFixtureTest',
+                    'key_for_utility_int': '1',
+                },
+                {
+                    'name': (
+                        'ExternalUtilityThatCallsRecordStringValuedProperty'
+                    ),
+                    'file': 'gtest_xml_output_unittest_.cc',
+                    'line': 161,
+                    'status': 'RUN',
+                    'result': 'COMPLETED',
+                    'time': '*',
+                    'timestamp': '*',
+                    'classname': 'NoFixtureTest',
+                    'key_for_utility_string': '1',
+                },
+            ],
+        },
+        {
+            'name': 'SetupFailTest',
+            'tests': 1,
+            'failures': 0,
+            'disabled': 0,
+            'errors': 0,
+            'time': '*',
+            'timestamp': '*',
+            'testsuite': [
+                {
+                    'name': 'NoopPassingTest',
+                    'file': 'gtest_xml_output_unittest_.cc',
+                    'line': 172,
+                    'status': 'RUN',
+                    'result': 'SKIPPED',
+                    'timestamp': '*',
+                    'time': '*',
+                    'classname': 'SetupFailTest',
+                    'skipped': [
+                        {'message': 'gtest_xml_output_unittest_.cc:*\n'}
+                    ],
+                },
+                {
+                    'name': '',
+                    'status': 'RUN',
+                    'result': 'COMPLETED',
+                    'timestamp': '*',
+                    'time': '*',
+                    'classname': '',
+                    'failures': [{
+                        'failure': (
+                            'gtest_xml_output_unittest_.cc:*\nExpected equality'
+                            ' of these values:\n  1\n  2'
+                            + STACK_TRACE_TEMPLATE
+                        ),
+                        'type': '',
+                    }],
+                },
+            ],
+        },
+        {
+            'name': 'TearDownFailTest',
+            'tests': 1,
+            'failures': 0,
+            'disabled': 0,
+            'errors': 0,
+            'timestamp': '*',
+            'time': '*',
+            'testsuite': [
+                {
+                    'name': 'NoopPassingTest',
+                    'file': 'gtest_xml_output_unittest_.cc',
+                    'line': 179,
+                    'status': 'RUN',
+                    'result': 'COMPLETED',
+                    'timestamp': '*',
+                    'time': '*',
+                    'classname': 'TearDownFailTest',
+                },
+                {
+                    'name': '',
+                    'status': 'RUN',
+                    'result': 'COMPLETED',
+                    'timestamp': '*',
+                    'time': '*',
+                    'classname': '',
+                    'failures': [{
+                        'failure': (
+                            'gtest_xml_output_unittest_.cc:*\nExpected equality'
+                            ' of these values:\n  1\n  2'
+                            + STACK_TRACE_TEMPLATE
+                        ),
+                        'type': '',
+                    }],
+                },
+            ],
+        },
+        {
+            'name': 'TypedTest/0',
+            'tests': 1,
+            'failures': 0,
+            'disabled': 0,
+            'errors': 0,
+            'time': '*',
+            'timestamp': '*',
+            'testsuite': [{
+                'name': 'HasTypeParamAttribute',
+                'type_param': 'int',
+                'file': 'gtest_xml_output_unittest_.cc',
+                'line': 193,
+                'status': 'RUN',
+                'result': 'COMPLETED',
+                'time': '*',
+                'timestamp': '*',
+                'classname': 'TypedTest/0',
+            }],
+        },
+        {
+            'name': 'TypedTest/1',
+            'tests': 1,
+            'failures': 0,
+            'disabled': 0,
+            'errors': 0,
+            'time': '*',
+            'timestamp': '*',
+            'testsuite': [{
+                'name': 'HasTypeParamAttribute',
+                'type_param': 'long',
+                'file': 'gtest_xml_output_unittest_.cc',
+                'line': 193,
+                'status': 'RUN',
+                'result': 'COMPLETED',
+                'time': '*',
+                'timestamp': '*',
+                'classname': 'TypedTest/1',
+            }],
+        },
+        {
+            'name': 'Single/TypeParameterizedTestSuite/0',
+            'tests': 1,
+            'failures': 0,
+            'disabled': 0,
+            'errors': 0,
+            'time': '*',
+            'timestamp': '*',
+            'testsuite': [{
+                'name': 'HasTypeParamAttribute',
+                'type_param': 'int',
+                'file': 'gtest_xml_output_unittest_.cc',
+                'line': 200,
+                'status': 'RUN',
+                'result': 'COMPLETED',
+                'time': '*',
+                'timestamp': '*',
+                'classname': 'Single/TypeParameterizedTestSuite/0',
+            }],
+        },
+        {
+            'name': 'Single/TypeParameterizedTestSuite/1',
+            'tests': 1,
+            'failures': 0,
+            'disabled': 0,
+            'errors': 0,
+            'time': '*',
+            'timestamp': '*',
+            'testsuite': [{
+                'name': 'HasTypeParamAttribute',
+                'type_param': 'long',
+                'file': 'gtest_xml_output_unittest_.cc',
+                'line': 200,
+                'status': 'RUN',
+                'result': 'COMPLETED',
+                'time': '*',
+                'timestamp': '*',
+                'classname': 'Single/TypeParameterizedTestSuite/1',
+            }],
+        },
+        {
+            'name': 'Single/ValueParamTest',
+            'tests': 4,
+            'failures': 0,
+            'disabled': 0,
+            'errors': 0,
+            'time': '*',
+            'timestamp': '*',
+            'testsuite': [
+                {
+                    'name': 'HasValueParamAttribute/0',
+                    'value_param': '33',
+                    'file': 'gtest_xml_output_unittest_.cc',
+                    'line': 184,
+                    'status': 'RUN',
+                    'result': 'COMPLETED',
+                    'time': '*',
+                    'timestamp': '*',
+                    'classname': 'Single/ValueParamTest',
+                },
+                {
+                    'name': 'HasValueParamAttribute/1',
+                    'value_param': '42',
+                    'file': 'gtest_xml_output_unittest_.cc',
+                    'line': 184,
+                    'status': 'RUN',
+                    'result': 'COMPLETED',
+                    'time': '*',
+                    'timestamp': '*',
+                    'classname': 'Single/ValueParamTest',
+                },
+                {
+                    'name': 'AnotherTestThatHasValueParamAttribute/0',
+                    'value_param': '33',
+                    'file': 'gtest_xml_output_unittest_.cc',
+                    'line': 185,
+                    'status': 'RUN',
+                    'result': 'COMPLETED',
+                    'time': '*',
+                    'timestamp': '*',
+                    'classname': 'Single/ValueParamTest',
+                },
+                {
+                    'name': 'AnotherTestThatHasValueParamAttribute/1',
+                    'value_param': '42',
+                    'file': 'gtest_xml_output_unittest_.cc',
+                    'line': 185,
+                    'status': 'RUN',
+                    'result': 'COMPLETED',
+                    'time': '*',
+                    'timestamp': '*',
+                    'classname': 'Single/ValueParamTest',
+                },
+            ],
+        },
+    ],
 }
 
 EXPECTED_FILTERED = {
-    u'tests':
-        1,
-    u'failures':
-        0,
-    u'disabled':
-        0,
-    u'errors':
-        0,
-    u'time':
-        u'*',
-    u'timestamp':
-        u'*',
-    u'name':
-        u'AllTests',
-    u'ad_hoc_property':
-        u'42',
-    u'testsuites': [{
-        u'name':
-            u'SuccessfulTest',
-        u'tests':
-            1,
-        u'failures':
-            0,
-        u'disabled':
-            0,
-        u'errors':
-            0,
-        u'time':
-            u'*',
-        u'timestamp':
-            u'*',
-        u'testsuite': [{
-            u'name': u'Succeeds',
-            u'status': u'RUN',
-            u'result': u'COMPLETED',
-            u'time': u'*',
-            u'timestamp': u'*',
-            u'classname': u'SuccessfulTest',
-        }]
+    'tests': 1,
+    'failures': 0,
+    'disabled': 0,
+    'errors': 0,
+    'time': '*',
+    'timestamp': '*',
+    'name': 'AllTests',
+    'ad_hoc_property': '42',
+    'testsuites': [{
+        'name': 'SuccessfulTest',
+        'tests': 1,
+        'failures': 0,
+        'disabled': 0,
+        'errors': 0,
+        'time': '*',
+        'timestamp': '*',
+        'testsuite': [{
+            'name': 'Succeeds',
+            'file': 'gtest_xml_output_unittest_.cc',
+            'line': 53,
+            'status': 'RUN',
+            'result': 'COMPLETED',
+            'time': '*',
+            'timestamp': '*',
+            'classname': 'SuccessfulTest',
+        }],
     }],
 }
 
 EXPECTED_NO_TEST = {
-    u'tests':
-        0,
-    u'failures':
-        0,
-    u'disabled':
-        0,
-    u'errors':
-        0,
-    u'time':
-        u'*',
-    u'timestamp':
-        u'*',
-    u'name':
-        u'AllTests',
-    u'testsuites': [{
-        u'name':
-            u'NonTestSuiteFailure',
-        u'tests':
-            1,
-        u'failures':
-            1,
-        u'disabled':
-            0,
-        u'skipped':
-            0,
-        u'errors':
-            0,
-        u'time':
-            u'*',
-        u'timestamp':
-            u'*',
-        u'testsuite': [{
-            u'name':
-                u'',
-            u'status':
-                u'RUN',
-            u'result':
-                u'COMPLETED',
-            u'time':
-                u'*',
-            u'timestamp':
-                u'*',
-            u'classname':
-                u'',
-            u'failures': [{
-                u'failure': u'gtest_no_test_unittest.cc:*\n'
-                            u'Expected equality of these values:\n'
-                            u'  1\n  2' + STACK_TRACE_TEMPLATE,
-                u'type': u'',
-            }]
-        }]
+    'tests': 0,
+    'failures': 0,
+    'disabled': 0,
+    'errors': 0,
+    'time': '*',
+    'timestamp': '*',
+    'name': 'AllTests',
+    'testsuites': [{
+        'name': 'NonTestSuiteFailure',
+        'tests': 1,
+        'failures': 1,
+        'disabled': 0,
+        'skipped': 0,
+        'errors': 0,
+        'time': '*',
+        'timestamp': '*',
+        'testsuite': [{
+            'name': '',
+            'status': 'RUN',
+            'result': 'COMPLETED',
+            'time': '*',
+            'timestamp': '*',
+            'classname': '',
+            'failures': [{
+                'failure': (
+                    'gtest_no_test_unittest.cc:*\n'
+                    'Expected equality of these values:\n'
+                    '  1\n  2'
+                    + STACK_TRACE_TEMPLATE
+                ),
+                'type': '',
+            }],
+        }],
     }],
 }
 
 GTEST_PROGRAM_PATH = gtest_test_utils.GetTestExecutablePath(GTEST_PROGRAM_NAME)
 
-SUPPORTS_TYPED_TESTS = 'TypedTest' in gtest_test_utils.Subprocess(
-    [GTEST_PROGRAM_PATH, GTEST_LIST_TESTS_FLAG], capture_stderr=False).output
+SUPPORTS_TYPED_TESTS = (
+    'TypedTest'
+    in gtest_test_utils.Subprocess(
+        [GTEST_PROGRAM_PATH, GTEST_LIST_TESTS_FLAG], capture_stderr=False
+    ).output
+)
 
 
 class GTestJsonOutputUnitTest(gtest_test_utils.TestCase):
-    """Unit test for Google Test's JSON output functionality.
+  """Unit test for Google Test's JSON output functionality."""
+
+  # This test currently breaks on platforms that do not support typed and
+  # type-parameterized tests, so we don't run it under them.
+  if SUPPORTS_TYPED_TESTS:
+
+    def testNonEmptyJsonOutput(self):
+      """Verifies JSON output for a Google Test binary with non-empty output.
+
+      Runs a test program that generates a non-empty JSON output, and
+      tests that the JSON output is expected.
+      """
+      self._TestJsonOutput(GTEST_PROGRAM_NAME, EXPECTED_NON_EMPTY, 1)
+
+  def testNoTestJsonOutput(self):
+    """Verifies JSON output for a Google Test binary without actual tests.
+
+    Runs a test program that generates an JSON output for a binary with no
+    tests, and tests that the JSON output is expected.
+    """
+
+    self._TestJsonOutput('gtest_no_test_unittest', EXPECTED_NO_TEST, 0)
+
+  def testTimestampValue(self):
+    """Checks whether the timestamp attribute in the JSON output is valid.
+
+    Runs a test program that generates an empty JSON output, and checks if
+    the timestamp attribute in the testsuites tag is valid.
+    """
+    actual = self._GetJsonOutput('gtest_no_test_unittest', [], 0)
+    date_time_str = actual['timestamp']
+    # datetime.strptime() is only available in Python 2.5+ so we have to
+    # parse the expected datetime manually.
+    match = re.match(r'(\d+)-(\d\d)-(\d\d)T(\d\d):(\d\d):(\d\d)', date_time_str)
+    self.assertTrue(
+        re.match,
+        'JSON datettime string %s has incorrect format' % date_time_str,
+    )
+    date_time_from_json = datetime.datetime(
+        year=int(match.group(1)),
+        month=int(match.group(2)),
+        day=int(match.group(3)),
+        hour=int(match.group(4)),
+        minute=int(match.group(5)),
+        second=int(match.group(6)),
+    )
+
+    time_delta = abs(datetime.datetime.now() - date_time_from_json)
+    # timestamp value should be near the current local time
+    self.assertTrue(
+        time_delta < datetime.timedelta(seconds=600),
+        'time_delta is %s' % time_delta,
+    )
+
+  def testDefaultOutputFile(self):
+    """Verifies the default output file name.
+
+    Confirms that Google Test produces an JSON output file with the expected
+    default name if no name is explicitly specified.
+    """
+    output_file = os.path.join(
+        gtest_test_utils.GetTempDir(), GTEST_DEFAULT_OUTPUT_FILE
+    )
+    gtest_prog_path = gtest_test_utils.GetTestExecutablePath(
+        'gtest_no_test_unittest'
+    )
+    try:
+      os.remove(output_file)
+    except OSError:
+      e = sys.exc_info()[1]
+      if e.errno != errno.ENOENT:
+        raise
+
+    p = gtest_test_utils.Subprocess(
+        [gtest_prog_path, '%s=json' % GTEST_OUTPUT_FLAG],
+        working_dir=gtest_test_utils.GetTempDir(),
+    )
+    self.assertTrue(p.exited)
+    self.assertEqual(0, p.exit_code)
+    self.assertTrue(os.path.isfile(output_file))
+
+  def testSuppressedJsonOutput(self):
+    """Verifies that no JSON output is generated.
+
+    Tests that no JSON file is generated if the default JSON listener is
+    shut down before RUN_ALL_TESTS is invoked.
+    """
+
+    json_path = os.path.join(
+        gtest_test_utils.GetTempDir(), GTEST_PROGRAM_NAME + 'out.json'
+    )
+    if os.path.isfile(json_path):
+      os.remove(json_path)
+
+    command = [
+        GTEST_PROGRAM_PATH,
+        '%s=json:%s' % (GTEST_OUTPUT_FLAG, json_path),
+        '--shut_down_xml',
+    ]
+    p = gtest_test_utils.Subprocess(command)
+    if p.terminated_by_signal:
+      # p.signal is available only if p.terminated_by_signal is True.
+      self.assertFalse(
+          p.terminated_by_signal,
+          '%s was killed by signal %d' % (GTEST_PROGRAM_NAME, p.signal),
+      )
+    else:
+      self.assertTrue(p.exited)
+      self.assertEqual(
+          1,
+          p.exit_code,
+          "'%s' exited with code %s, which doesn't match "
+          'the expected exit code %s.' % (command, p.exit_code, 1),
+      )
+
+    self.assertTrue(not os.path.isfile(json_path))
+
+  def testFilteredTestJsonOutput(self):
+    """Verifies JSON output when a filter is applied.
+
+    Runs a test program that executes only some tests and verifies that
+    non-selected tests do not show up in the JSON output.
+    """
+
+    self._TestJsonOutput(
+        GTEST_PROGRAM_NAME,
+        EXPECTED_FILTERED,
+        0,
+        extra_args=['%s=SuccessfulTest.*' % GTEST_FILTER_FLAG],
+    )
+
+  def _GetJsonOutput(self, gtest_prog_name, extra_args, expected_exit_code):
+    """Returns the JSON output generated by running the program gtest_prog_name.
+
+    Furthermore, the program's exit code must be expected_exit_code.
+
+    Args:
+      gtest_prog_name: Google Test binary name.
+      extra_args: extra arguments to binary invocation.
+      expected_exit_code: program's exit code.
+    """
+    json_path = os.path.join(
+        gtest_test_utils.GetTempDir(), gtest_prog_name + 'out.json'
+    )
+    gtest_prog_path = gtest_test_utils.GetTestExecutablePath(gtest_prog_name)
+
+    command = [
+        gtest_prog_path,
+        '%s=json:%s' % (GTEST_OUTPUT_FLAG, json_path),
+    ] + extra_args
+    p = gtest_test_utils.Subprocess(command)
+    if p.terminated_by_signal:
+      self.assertTrue(
+          False, '%s was killed by signal %d' % (gtest_prog_name, p.signal)
+      )
+    else:
+      self.assertTrue(p.exited)
+      self.assertEqual(
+          expected_exit_code,
+          p.exit_code,
+          "'%s' exited with code %s, which doesn't match "
+          'the expected exit code %s.'
+          % (command, p.exit_code, expected_exit_code),
+      )
+    with open(json_path) as f:
+      actual = json.load(f)
+    return actual
+
+  def _TestJsonOutput(
+      self, gtest_prog_name, expected, expected_exit_code, extra_args=None
+  ):
+    """Checks the JSON output generated by the Google Test binary.
+
+    Asserts that the JSON document generated by running the program
+    gtest_prog_name matches expected_json, a string containing another
+    JSON document.  Furthermore, the program's exit code must be
+    expected_exit_code.
+
+    Args:
+      gtest_prog_name: Google Test binary name.
+      expected: expected output.
+      expected_exit_code: program's exit code.
+      extra_args: extra arguments to binary invocation.
     """
 
-    # This test currently breaks on platforms that do not support typed and
-    # type-parameterized tests, so we don't run it under them.
-    if SUPPORTS_TYPED_TESTS:
-        def testNonEmptyJsonOutput(self):
-            """Verifies JSON output for a Google Test binary with non-empty output.
-
-            Runs a test program that generates a non-empty JSON output, and
-            tests that the JSON output is expected.
-            """
-            self._TestJsonOutput(GTEST_PROGRAM_NAME, EXPECTED_NON_EMPTY, 1)
-
-    def testNoTestJsonOutput(self):
-        """Verifies JSON output for a Google Test binary without actual tests.
-
-        Runs a test program that generates an JSON output for a binary with no
-        tests, and tests that the JSON output is expected.
-        """
-
-        self._TestJsonOutput('gtest_no_test_unittest', EXPECTED_NO_TEST, 0)
-
-    def testTimestampValue(self):
-        """Checks whether the timestamp attribute in the JSON output is valid.
-
-        Runs a test program that generates an empty JSON output, and checks if
-        the timestamp attribute in the testsuites tag is valid.
-        """
-        actual = self._GetJsonOutput('gtest_no_test_unittest', [], 0)
-        date_time_str = actual['timestamp']
-        # datetime.strptime() is only available in Python 2.5+ so we have to
-        # parse the expected datetime manually.
-        match = re.match(r'(\d+)-(\d\d)-(\d\d)T(\d\d):(\d\d):(\d\d)', date_time_str)
-        self.assertTrue(
-            re.match,
-            'JSON datettime string %s has incorrect format' % date_time_str)
-        date_time_from_json = datetime.datetime(
-            year=int(match.group(1)), month=int(match.group(2)),
-            day=int(match.group(3)), hour=int(match.group(4)),
-            minute=int(match.group(5)), second=int(match.group(6)))
-
-        time_delta = abs(datetime.datetime.now() - date_time_from_json)
-        # timestamp value should be near the current local time
-        self.assertTrue(time_delta < datetime.timedelta(seconds=600),
-                        'time_delta is %s' % time_delta)
-
-    def testDefaultOutputFile(self):
-        """Verifies the default output file name.
-
-        Confirms that Google Test produces an JSON output file with the expected
-        default name if no name is explicitly specified.
-        """
-        output_file = os.path.join(gtest_test_utils.GetTempDir(),
-                                   GTEST_DEFAULT_OUTPUT_FILE)
-        gtest_prog_path = gtest_test_utils.GetTestExecutablePath(
-            'gtest_no_test_unittest')
-        try:
-            os.remove(output_file)
-        except OSError:
-            e = sys.exc_info()[1]
-            if e.errno != errno.ENOENT:
-                raise
-
-        p = gtest_test_utils.Subprocess(
-            [gtest_prog_path, '%s=json' % GTEST_OUTPUT_FLAG],
-            working_dir=gtest_test_utils.GetTempDir())
-        self.assert_(p.exited)
-        self.assertEquals(0, p.exit_code)
-        self.assert_(os.path.isfile(output_file))
-
-    def testSuppressedJsonOutput(self):
-        """Verifies that no JSON output is generated.
-
-        Tests that no JSON file is generated if the default JSON listener is
-        shut down before RUN_ALL_TESTS is invoked.
-        """
-
-        json_path = os.path.join(gtest_test_utils.GetTempDir(),
-                                 GTEST_PROGRAM_NAME + 'out.json')
-        if os.path.isfile(json_path):
-            os.remove(json_path)
-
-        command = [GTEST_PROGRAM_PATH,
-                   '%s=json:%s' % (GTEST_OUTPUT_FLAG, json_path),
-                   '--shut_down_xml']
-        p = gtest_test_utils.Subprocess(command)
-        if p.terminated_by_signal:
-            # p.signal is available only if p.terminated_by_signal is True.
-            self.assertFalse(
-                p.terminated_by_signal,
-                '%s was killed by signal %d' % (GTEST_PROGRAM_NAME, p.signal))
-        else:
-            self.assert_(p.exited)
-            self.assertEquals(1, p.exit_code,
-                              "'%s' exited with code %s, which doesn't match "
-                              'the expected exit code %s.'
-                              % (command, p.exit_code, 1))
-
-        self.assert_(not os.path.isfile(json_path))
-
-    def testFilteredTestJsonOutput(self):
-        """Verifies JSON output when a filter is applied.
-
-        Runs a test program that executes only some tests and verifies that
-        non-selected tests do not show up in the JSON output.
-        """
-
-        self._TestJsonOutput(GTEST_PROGRAM_NAME, EXPECTED_FILTERED, 0,
-                             extra_args=['%s=SuccessfulTest.*' % GTEST_FILTER_FLAG])
-
-    def _GetJsonOutput(self, gtest_prog_name, extra_args, expected_exit_code):
-        """Returns the JSON output generated by running the program gtest_prog_name.
-
-        Furthermore, the program's exit code must be expected_exit_code.
-
-        Args:
-          gtest_prog_name: Google Test binary name.
-          extra_args: extra arguments to binary invocation.
-          expected_exit_code: program's exit code.
-        """
-        json_path = os.path.join(gtest_test_utils.GetTempDir(),
-                                 gtest_prog_name + 'out.json')
-        gtest_prog_path = gtest_test_utils.GetTestExecutablePath(gtest_prog_name)
-
-        command = (
-                [gtest_prog_path, '%s=json:%s' % (GTEST_OUTPUT_FLAG, json_path)] +
-                extra_args
-        )
-        p = gtest_test_utils.Subprocess(command)
-        if p.terminated_by_signal:
-            self.assert_(False,
-                         '%s was killed by signal %d' % (gtest_prog_name, p.signal))
-        else:
-            self.assert_(p.exited)
-            self.assertEquals(expected_exit_code, p.exit_code,
-                              "'%s' exited with code %s, which doesn't match "
-                              'the expected exit code %s.'
-                              % (command, p.exit_code, expected_exit_code))
-        with open(json_path) as f:
-            actual = json.load(f)
-        return actual
-
-    def _TestJsonOutput(self, gtest_prog_name, expected,
-                        expected_exit_code, extra_args=None):
-        """Checks the JSON output generated by the Google Test binary.
-
-        Asserts that the JSON document generated by running the program
-        gtest_prog_name matches expected_json, a string containing another
-        JSON document.  Furthermore, the program's exit code must be
-        expected_exit_code.
-
-        Args:
-          gtest_prog_name: Google Test binary name.
-          expected: expected output.
-          expected_exit_code: program's exit code.
-          extra_args: extra arguments to binary invocation.
-        """
-
-        actual = self._GetJsonOutput(gtest_prog_name, extra_args or [],
-                                     expected_exit_code)
-        self.assertEqual(expected, gtest_json_test_utils.normalize(actual))
+    actual = self._GetJsonOutput(
+        gtest_prog_name, extra_args or [], expected_exit_code
+    )
+    self.assertEqual(expected, gtest_json_test_utils.normalize(actual))
 
 
 if __name__ == '__main__':
-    if NO_STACKTRACE_SUPPORT_FLAG in sys.argv:
-        # unittest.main() can't handle unknown flags
-        sys.argv.remove(NO_STACKTRACE_SUPPORT_FLAG)
+  if NO_STACKTRACE_SUPPORT_FLAG in sys.argv:
+    # unittest.main() can't handle unknown flags
+    sys.argv.remove(NO_STACKTRACE_SUPPORT_FLAG)
 
-    os.environ['GTEST_STACK_TRACE_DEPTH'] = '1'
-    gtest_test_utils.Main()
+  os.environ['GTEST_STACK_TRACE_DEPTH'] = '1'
+  gtest_test_utils.Main()
diff --git a/external/googletest/googletest/test/googletest-list-tests-unittest.py b/external/googletest/googletest/test/googletest-list-tests-unittest.py
old mode 100644
new mode 100755
index f71de02c..977e57f0
--- a/external/googletest/googletest/test/googletest-list-tests-unittest.py
+++ b/external/googletest/googletest/test/googletest-list-tests-unittest.py
@@ -38,7 +38,7 @@
 """
 
 import re
-import gtest_test_utils
+from googletest.test import gtest_test_utils
 
 # Constants.
 
@@ -46,11 +46,14 @@
 LIST_TESTS_FLAG = 'gtest_list_tests'
 
 # Path to the googletest-list-tests-unittest_ program.
-EXE_PATH = gtest_test_utils.GetTestExecutablePath('googletest-list-tests-unittest_')
+EXE_PATH = gtest_test_utils.GetTestExecutablePath(
+    'googletest-list-tests-unittest_'
+)
 
 # The expected output when running googletest-list-tests-unittest_ with
 # --gtest_list_tests
-EXPECTED_OUTPUT_NO_FILTER_RE = re.compile(r"""FooDeathTest\.
+EXPECTED_OUTPUT_NO_FILTER_RE = re.compile(
+    r"""FooDeathTest\.
   Test1
 Foo\.
   Bar1
@@ -90,11 +93,13 @@
   TestB/0  # GetParam\(\) = one line
   TestB/1  # GetParam\(\) = two\\nlines
   TestB/2  # GetParam\(\) = a very\\nlo{241}\.\.\.
-""")
+"""
+)
 
 # The expected output when running googletest-list-tests-unittest_ with
 # --gtest_list_tests and --gtest_filter=Foo*.
-EXPECTED_OUTPUT_FILTER_FOO_RE = re.compile(r"""FooDeathTest\.
+EXPECTED_OUTPUT_FILTER_FOO_RE = re.compile(
+    r"""FooDeathTest\.
   Test1
 Foo\.
   Bar1
@@ -106,101 +111,115 @@
   Test1
   DISABLED_Test2
   Test3
-""")
-
+"""
+)
 
 # Utilities.
 
 
 def Run(args):
-    """Runs googletest-list-tests-unittest_ and returns the list of tests printed."""
+  """Runs googletest-list-tests-unittest_ and returns the list of tests printed."""
 
-    return gtest_test_utils.Subprocess([EXE_PATH] + args,
-                                       capture_stderr=False).output
+  return gtest_test_utils.Subprocess(
+      [EXE_PATH] + args, capture_stderr=False
+  ).output
 
 
 # The unit test.
 
 
 class GTestListTestsUnitTest(gtest_test_utils.TestCase):
-    """Tests using the --gtest_list_tests flag to list all tests."""
-
-    def RunAndVerify(self, flag_value, expected_output_re, other_flag):
-        """Runs googletest-list-tests-unittest_ and verifies that it prints
-        the correct tests.
-
-        Args:
-          flag_value:         value of the --gtest_list_tests flag;
-                              None if the flag should not be present.
-          expected_output_re: regular expression that matches the expected
-                              output after running command;
-          other_flag:         a different flag to be passed to command
-                              along with gtest_list_tests;
-                              None if the flag should not be present.
-        """
-
-        if flag_value is None:
-            flag = ''
-            flag_expression = 'not set'
-        elif flag_value == '0':
-            flag = '--%s=0' % LIST_TESTS_FLAG
-            flag_expression = '0'
-        else:
-            flag = '--%s' % LIST_TESTS_FLAG
-            flag_expression = '1'
-
-        args = [flag]
-
-        if other_flag is not None:
-            args += [other_flag]
-
-        output = Run(args)
-
-        if expected_output_re:
-            self.assert_(
-                expected_output_re.match(output),
-                ('when %s is %s, the output of "%s" is "%s",\n'
-                 'which does not match regex "%s"' %
-                 (LIST_TESTS_FLAG, flag_expression, ' '.join(args), output,
-                  expected_output_re.pattern)))
-        else:
-            self.assert_(
-                not EXPECTED_OUTPUT_NO_FILTER_RE.match(output),
-                ('when %s is %s, the output of "%s" is "%s"' %
-                 (LIST_TESTS_FLAG, flag_expression, ' '.join(args), output)))
-
-    def testDefaultBehavior(self):
-        """Tests the behavior of the default mode."""
-
-        self.RunAndVerify(flag_value=None,
-                          expected_output_re=None,
-                          other_flag=None)
-
-    def testFlag(self):
-        """Tests using the --gtest_list_tests flag."""
-
-        self.RunAndVerify(flag_value='0',
-                          expected_output_re=None,
-                          other_flag=None)
-        self.RunAndVerify(flag_value='1',
-                          expected_output_re=EXPECTED_OUTPUT_NO_FILTER_RE,
-                          other_flag=None)
-
-    def testOverrideNonFilterFlags(self):
-        """Tests that --gtest_list_tests overrides the non-filter flags."""
-
-        self.RunAndVerify(flag_value='1',
-                          expected_output_re=EXPECTED_OUTPUT_NO_FILTER_RE,
-                          other_flag='--gtest_break_on_failure')
-
-    def testWithFilterFlags(self):
-        """Tests that --gtest_list_tests takes into account the
-        --gtest_filter flag."""
-
-        self.RunAndVerify(flag_value='1',
-                          expected_output_re=EXPECTED_OUTPUT_FILTER_FOO_RE,
-                          other_flag='--gtest_filter=Foo*')
+  """Tests using the --gtest_list_tests flag to list all tests."""
+
+  def RunAndVerify(self, flag_value, expected_output_re, other_flag):
+    """Run googletest-list-tests-unittest_ and verify the output.
+
+    Runs googletest-list-tests-unittest_ and verifies that it prints
+    the correct tests.
+
+    Args:
+      flag_value:         value of the --gtest_list_tests flag; None if the flag
+        should not be present.
+      expected_output_re: regular expression that matches the expected output
+        after running command;
+      other_flag:         a different flag to be passed to command along with
+        gtest_list_tests; None if the flag should not be present.
+    """
+
+    if flag_value is None:
+      flag = ''
+      flag_expression = 'not set'
+    elif flag_value == '0':
+      flag = '--%s=0' % LIST_TESTS_FLAG
+      flag_expression = '0'
+    else:
+      flag = '--%s' % LIST_TESTS_FLAG
+      flag_expression = '1'
+
+    args = [flag]
+
+    if other_flag is not None:
+      args += [other_flag]
+
+    output = Run(args)
+
+    if expected_output_re:
+      self.assertTrue(
+          expected_output_re.match(output),
+          'when %s is %s, the output of "%s" is "%s",\n'
+          'which does not match regex "%s"'
+          % (
+              LIST_TESTS_FLAG,
+              flag_expression,
+              ' '.join(args),
+              output,
+              expected_output_re.pattern,
+          ),
+      )
+    else:
+      self.assertTrue(
+          not EXPECTED_OUTPUT_NO_FILTER_RE.match(output),
+          'when %s is %s, the output of "%s" is "%s"'
+          % (LIST_TESTS_FLAG, flag_expression, ' '.join(args), output),
+      )
+
+  def testDefaultBehavior(self):
+    """Tests the behavior of the default mode."""
+
+    self.RunAndVerify(flag_value=None, expected_output_re=None, other_flag=None)
+
+  def testFlag(self):
+    """Tests using the --gtest_list_tests flag."""
+
+    self.RunAndVerify(flag_value='0', expected_output_re=None, other_flag=None)
+    self.RunAndVerify(
+        flag_value='1',
+        expected_output_re=EXPECTED_OUTPUT_NO_FILTER_RE,
+        other_flag=None,
+    )
+
+  def testOverrideNonFilterFlags(self):
+    """Tests that --gtest_list_tests overrides the non-filter flags."""
+
+    self.RunAndVerify(
+        flag_value='1',
+        expected_output_re=EXPECTED_OUTPUT_NO_FILTER_RE,
+        other_flag='--gtest_break_on_failure',
+    )
+
+  def testWithFilterFlags(self):
+    """Tests that --gtest_list_tests takes into account the filter flags.
+
+    Tests that --gtest_list_tests takes into account the
+    --gtest_filter flag.
+    """
+
+    self.RunAndVerify(
+        flag_value='1',
+        expected_output_re=EXPECTED_OUTPUT_FILTER_FOO_RE,
+        other_flag='--gtest_filter=Foo*',
+    )
 
 
 if __name__ == '__main__':
-    gtest_test_utils.Main()
+  gtest_test_utils.Main()
diff --git a/external/googletest/googletest/test/googletest-list-tests-unittest_.cc b/external/googletest/googletest/test/googletest-list-tests-unittest_.cc
index 5577e896..a1ea6cf4 100644
--- a/external/googletest/googletest/test/googletest-list-tests-unittest_.cc
+++ b/external/googletest/googletest/test/googletest-list-tests-unittest_.cc
@@ -36,6 +36,9 @@
 // This program will be invoked from a Python unit test.
 // Don't run it directly.
 
+#include <ostream>
+#include <string>
+
 #include "gtest/gtest.h"
 
 // Several different test cases and tests that will be listed.
diff --git a/external/googletest/googletest/test/googletest-listener-test.cc b/external/googletest/googletest/test/googletest-listener-test.cc
index 10457afe..d7c47c21 100644
--- a/external/googletest/googletest/test/googletest-listener-test.cc
+++ b/external/googletest/googletest/test/googletest-listener-test.cc
@@ -32,19 +32,14 @@
 // This file verifies Google Test event listeners receive events at the
 // right times.
 
+#include <string>
 #include <vector>
 
 #include "gtest/gtest.h"
 #include "gtest/internal/custom/gtest.h"
 
 using ::testing::AddGlobalTestEnvironment;
-using ::testing::Environment;
 using ::testing::InitGoogleTest;
-using ::testing::Test;
-using ::testing::TestSuite;
-using ::testing::TestEventListener;
-using ::testing::TestInfo;
-using ::testing::TestPartResult;
 using ::testing::UnitTest;
 
 // Used by tests to register their events.
@@ -65,8 +60,8 @@ class EventRecordingListener : public TestEventListener {
   void OnTestIterationStart(const UnitTest& /*unit_test*/,
                             int iteration) override {
     Message message;
-    message << GetFullMethodName("OnTestIterationStart")
-            << "(" << iteration << ")";
+    message << GetFullMethodName("OnTestIterationStart") << "(" << iteration
+            << ")";
     g_events->push_back(message.GetString());
   }
 
@@ -112,8 +107,8 @@ class EventRecordingListener : public TestEventListener {
   void OnTestIterationEnd(const UnitTest& /*unit_test*/,
                           int iteration) override {
     Message message;
-    message << GetFullMethodName("OnTestIterationEnd")
-            << "("  << iteration << ")";
+    message << GetFullMethodName("OnTestIterationEnd") << "(" << iteration
+            << ")";
     g_events->push_back(message.GetString());
   }
 
@@ -122,9 +117,7 @@ class EventRecordingListener : public TestEventListener {
   }
 
  private:
-  std::string GetFullMethodName(const char* name) {
-    return name_ + "." + name;
-  }
+  std::string GetFullMethodName(const char* name) { return name_ + "." + name; }
 
   std::string name_;
 };
@@ -252,22 +245,21 @@ void VerifyResults(const std::vector<std::string>& data,
   EXPECT_EQ(expected_data_size, actual_size);
 
   // Compares the common prefix.
-  const size_t shorter_size = expected_data_size <= actual_size ?
-      expected_data_size : actual_size;
+  const size_t shorter_size =
+      expected_data_size <= actual_size ? expected_data_size : actual_size;
   size_t i = 0;
   for (; i < shorter_size; ++i) {
-    ASSERT_STREQ(expected_data[i], data[i].c_str())
-        << "at position " << i;
+    ASSERT_STREQ(expected_data[i], data[i].c_str()) << "at position " << i;
   }
 
   // Prints extra elements in the actual data.
   for (; i < actual_size; ++i) {
-    printf("  Actual event #%lu: %s\n",
-        static_cast<unsigned long>(i), data[i].c_str());
+    printf("  Actual event #%lu: %s\n", static_cast<unsigned long>(i),
+           data[i].c_str());
   }
 }
 
-int main(int argc, char **argv) {
+int main(int argc, char** argv) {
   std::vector<std::string> events;
   g_events = &events;
   InitGoogleTest(&argc, argv);
@@ -281,10 +273,11 @@ int main(int argc, char **argv) {
 
   AddGlobalTestEnvironment(new EnvironmentInvocationCatcher);
 
-  GTEST_CHECK_(events.size() == 0)
+  GTEST_CHECK_(events.empty())
       << "AddGlobalTestEnvironment should not generate any events itself.";
 
-  ::testing::GTEST_FLAG(repeat) = 2;
+  GTEST_FLAG_SET(repeat, 2);
+  GTEST_FLAG_SET(recreate_environments_when_repeating, true);
   int ret_val = RUN_ALL_TESTS();
 
 #ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
@@ -505,14 +498,12 @@ int main(int argc, char **argv) {
                                          "1st.OnTestProgramEnd"};
 #endif  // GTEST_REMOVE_LEGACY_TEST_CASEAPI_
 
-  VerifyResults(events,
-                expected_events,
-                sizeof(expected_events)/sizeof(expected_events[0]));
+  VerifyResults(events, expected_events,
+                sizeof(expected_events) / sizeof(expected_events[0]));
 
   // We need to check manually for ad hoc test failures that happen after
   // RUN_ALL_TESTS finishes.
-  if (UnitTest::GetInstance()->Failed())
-    ret_val = 1;
+  if (UnitTest::GetInstance()->Failed()) ret_val = 1;
 
   return ret_val;
 }
diff --git a/external/googletest/googletest/test/googletest-message-test.cc b/external/googletest/googletest/test/googletest-message-test.cc
index 962d5191..bf1f094c 100644
--- a/external/googletest/googletest/test/googletest-message-test.cc
+++ b/external/googletest/googletest/test/googletest-message-test.cc
@@ -30,14 +30,32 @@
 //
 // Tests for the Message class.
 
-#include "gtest/gtest-message.h"
+#include <sstream>
+#include <string>
 
+#include "gtest/gtest-message.h"
 #include "gtest/gtest.h"
 
+#ifdef GTEST_HAS_ABSL
+#include "absl/strings/str_format.h"
+#endif  // GTEST_HAS_ABSL
+
 namespace {
 
 using ::testing::Message;
 
+#ifdef GTEST_HAS_ABSL
+struct AbslStringifiablePoint {
+  template <typename Sink>
+  friend void AbslStringify(Sink& sink, const AbslStringifiablePoint& p) {
+    absl::Format(&sink, "(%d, %d)", p.x, p.y);
+  }
+
+  int x;
+  int y;
+};
+#endif  // GTEST_HAS_ABSL
+
 // Tests the testing::Message class
 
 // Tests the default constructor.
@@ -69,8 +87,9 @@ TEST(MessageTest, StreamsFloat) {
 
 // Tests streaming a double.
 TEST(MessageTest, StreamsDouble) {
-  const std::string s = (Message() << 1260570880.4555497 << " "
-                                  << 1260572265.1954534).GetString();
+  const std::string s =
+      (Message() << 1260570880.4555497 << " " << 1260572265.1954534)
+          .GetString();
   // Both numbers should be printed with enough precision.
   EXPECT_PRED_FORMAT2(testing::IsSubstring, "1260570880.45", s.c_str());
   EXPECT_PRED_FORMAT2(testing::IsSubstring, " 1260572265.19", s.c_str());
@@ -108,8 +127,7 @@ TEST(MessageTest, StreamsString) {
 
 // Tests that we can output strings containing embedded NULs.
 TEST(MessageTest, StreamsStringWithEmbeddedNUL) {
-  const char char_array_with_nul[] =
-      "Here's a NUL\0 and some more string";
+  const char char_array_with_nul[] = "Here's a NUL\0 and some more string";
   const ::std::string string_with_nul(char_array_with_nul,
                                       sizeof(char_array_with_nul) - 1);
   EXPECT_EQ("Here's a NUL\\0 and some more string",
@@ -126,13 +144,21 @@ TEST(MessageTest, StreamsInt) {
   EXPECT_EQ("123", (Message() << 123).GetString());
 }
 
+#ifdef GTEST_HAS_ABSL
+// Tests streaming a type with an AbslStringify definition.
+TEST(MessageTest, StreamsAbslStringify) {
+  EXPECT_EQ("(1, 2)", (Message() << AbslStringifiablePoint{1, 2}).GetString());
+}
+#endif  // GTEST_HAS_ABSL
+
 // Tests that basic IO manipulators (endl, ends, and flush) can be
 // streamed to Message.
 TEST(MessageTest, StreamsBasicIoManip) {
-  EXPECT_EQ("Line 1.\nA NUL char \\0 in line 2.",
-               (Message() << "Line 1." << std::endl
-                         << "A NUL char " << std::ends << std::flush
-                         << " in line 2.").GetString());
+  EXPECT_EQ(
+      "Line 1.\nA NUL char \\0 in line 2.",
+      (Message() << "Line 1." << std::endl
+                 << "A NUL char " << std::ends << std::flush << " in line 2.")
+          .GetString());
 }
 
 // Tests Message::GetString()
diff --git a/external/googletest/googletest/test/googletest-options-test.cc b/external/googletest/googletest/test/googletest-options-test.cc
index 24f6d035..91d06a50 100644
--- a/external/googletest/googletest/test/googletest-options-test.cc
+++ b/external/googletest/googletest/test/googletest-options-test.cc
@@ -36,13 +36,15 @@
 // make-files on Windows and other platforms. Do not #include this file
 // anywhere else!
 
+#include <string>
+
 #include "gtest/gtest.h"
 
-#if GTEST_OS_WINDOWS_MOBILE
+#ifdef GTEST_OS_WINDOWS_MOBILE
 #include <windows.h>
-#elif GTEST_OS_WINDOWS
+#elif defined(GTEST_OS_WINDOWS)
 #include <direct.h>
-#elif GTEST_OS_OS2
+#elif defined(GTEST_OS_OS2)
 // For strcasecmp on OS/2
 #include <strings.h>
 #endif  // GTEST_OS_WINDOWS_MOBILE
@@ -61,36 +63,36 @@ FilePath GetAbsolutePathOf(const FilePath& relative_path) {
 // Testing UnitTestOptions::GetOutputFormat/GetOutputFile.
 
 TEST(XmlOutputTest, GetOutputFormatDefault) {
-  GTEST_FLAG(output) = "";
+  GTEST_FLAG_SET(output, "");
   EXPECT_STREQ("", UnitTestOptions::GetOutputFormat().c_str());
 }
 
 TEST(XmlOutputTest, GetOutputFormat) {
-  GTEST_FLAG(output) = "xml:filename";
+  GTEST_FLAG_SET(output, "xml:filename");
   EXPECT_STREQ("xml", UnitTestOptions::GetOutputFormat().c_str());
 }
 
 TEST(XmlOutputTest, GetOutputFileDefault) {
-  GTEST_FLAG(output) = "";
+  GTEST_FLAG_SET(output, "");
   EXPECT_EQ(GetAbsolutePathOf(FilePath("test_detail.xml")).string(),
             UnitTestOptions::GetAbsolutePathToOutputFile());
 }
 
 TEST(XmlOutputTest, GetOutputFileSingleFile) {
-  GTEST_FLAG(output) = "xml:filename.abc";
+  GTEST_FLAG_SET(output, "xml:filename.abc");
   EXPECT_EQ(GetAbsolutePathOf(FilePath("filename.abc")).string(),
             UnitTestOptions::GetAbsolutePathToOutputFile());
 }
 
 TEST(XmlOutputTest, GetOutputFileFromDirectoryPath) {
-  GTEST_FLAG(output) = "xml:path" GTEST_PATH_SEP_;
+  GTEST_FLAG_SET(output, "xml:path" GTEST_PATH_SEP_);
   const std::string expected_output_file =
       GetAbsolutePathOf(FilePath(std::string("path") + GTEST_PATH_SEP_ +
                                  GetCurrentExecutableName().string() + ".xml"))
           .string();
   const std::string& output_file =
       UnitTestOptions::GetAbsolutePathToOutputFile();
-#if GTEST_OS_WINDOWS
+#ifdef GTEST_OS_WINDOWS
   EXPECT_STRCASEEQ(expected_output_file.c_str(), output_file.c_str());
 #else
   EXPECT_EQ(expected_output_file, output_file.c_str());
@@ -99,29 +101,32 @@ TEST(XmlOutputTest, GetOutputFileFromDirectoryPath) {
 
 TEST(OutputFileHelpersTest, GetCurrentExecutableName) {
   const std::string exe_str = GetCurrentExecutableName().string();
-#if GTEST_OS_WINDOWS
+#ifdef GTEST_OS_WINDOWS
   const bool success =
       _strcmpi("googletest-options-test", exe_str.c_str()) == 0 ||
       _strcmpi("gtest-options-ex_test", exe_str.c_str()) == 0 ||
       _strcmpi("gtest_all_test", exe_str.c_str()) == 0 ||
       _strcmpi("gtest_dll_test", exe_str.c_str()) == 0;
-#elif GTEST_OS_OS2
+#elif defined(GTEST_OS_OS2)
   const bool success =
       strcasecmp("googletest-options-test", exe_str.c_str()) == 0 ||
       strcasecmp("gtest-options-ex_test", exe_str.c_str()) == 0 ||
       strcasecmp("gtest_all_test", exe_str.c_str()) == 0 ||
       strcasecmp("gtest_dll_test", exe_str.c_str()) == 0;
-#elif GTEST_OS_FUCHSIA
+#elif defined(GTEST_OS_FUCHSIA)
   const bool success = exe_str == "app";
+#elif defined(__EMSCRIPTEN__)
+  const bool success = exe_str == "patched_googletest-options-test.js";
 #else
   const bool success =
       exe_str == "googletest-options-test" || exe_str == "gtest_all_test" ||
       exe_str == "lt-gtest_all_test" || exe_str == "gtest_dll_test";
-#endif  // GTEST_OS_WINDOWS
+#endif  // platform ifdefs
+
   if (!success) FAIL() << "GetCurrentExecutableName() returns " << exe_str;
 }
 
-#if !GTEST_OS_FUCHSIA
+#ifndef GTEST_OS_FUCHSIA
 
 class XmlOutputChangeDirTest : public Test {
  protected:
@@ -141,7 +146,7 @@ class XmlOutputChangeDirTest : public Test {
 };
 
 TEST_F(XmlOutputChangeDirTest, PreserveOriginalWorkingDirWithDefault) {
-  GTEST_FLAG(output) = "";
+  GTEST_FLAG_SET(output, "");
   EXPECT_EQ(
       FilePath::ConcatPaths(original_working_dir_, FilePath("test_detail.xml"))
           .string(),
@@ -149,7 +154,7 @@ TEST_F(XmlOutputChangeDirTest, PreserveOriginalWorkingDirWithDefault) {
 }
 
 TEST_F(XmlOutputChangeDirTest, PreserveOriginalWorkingDirWithDefaultXML) {
-  GTEST_FLAG(output) = "xml";
+  GTEST_FLAG_SET(output, "xml");
   EXPECT_EQ(
       FilePath::ConcatPaths(original_working_dir_, FilePath("test_detail.xml"))
           .string(),
@@ -157,7 +162,7 @@ TEST_F(XmlOutputChangeDirTest, PreserveOriginalWorkingDirWithDefaultXML) {
 }
 
 TEST_F(XmlOutputChangeDirTest, PreserveOriginalWorkingDirWithRelativeFile) {
-  GTEST_FLAG(output) = "xml:filename.abc";
+  GTEST_FLAG_SET(output, "xml:filename.abc");
   EXPECT_EQ(
       FilePath::ConcatPaths(original_working_dir_, FilePath("filename.abc"))
           .string(),
@@ -165,7 +170,7 @@ TEST_F(XmlOutputChangeDirTest, PreserveOriginalWorkingDirWithRelativeFile) {
 }
 
 TEST_F(XmlOutputChangeDirTest, PreserveOriginalWorkingDirWithRelativePath) {
-  GTEST_FLAG(output) = "xml:path" GTEST_PATH_SEP_;
+  GTEST_FLAG_SET(output, "xml:path" GTEST_PATH_SEP_);
   const std::string expected_output_file =
       FilePath::ConcatPaths(
           original_working_dir_,
@@ -174,7 +179,7 @@ TEST_F(XmlOutputChangeDirTest, PreserveOriginalWorkingDirWithRelativePath) {
           .string();
   const std::string& output_file =
       UnitTestOptions::GetAbsolutePathToOutputFile();
-#if GTEST_OS_WINDOWS
+#ifdef GTEST_OS_WINDOWS
   EXPECT_STRCASEEQ(expected_output_file.c_str(), output_file.c_str());
 #else
   EXPECT_EQ(expected_output_file, output_file.c_str());
@@ -182,31 +187,31 @@ TEST_F(XmlOutputChangeDirTest, PreserveOriginalWorkingDirWithRelativePath) {
 }
 
 TEST_F(XmlOutputChangeDirTest, PreserveOriginalWorkingDirWithAbsoluteFile) {
-#if GTEST_OS_WINDOWS
-  GTEST_FLAG(output) = "xml:c:\\tmp\\filename.abc";
+#ifdef GTEST_OS_WINDOWS
+  GTEST_FLAG_SET(output, "xml:c:\\tmp\\filename.abc");
   EXPECT_EQ(FilePath("c:\\tmp\\filename.abc").string(),
             UnitTestOptions::GetAbsolutePathToOutputFile());
 #else
-  GTEST_FLAG(output) = "xml:/tmp/filename.abc";
+  GTEST_FLAG_SET(output, "xml:/tmp/filename.abc");
   EXPECT_EQ(FilePath("/tmp/filename.abc").string(),
             UnitTestOptions::GetAbsolutePathToOutputFile());
 #endif
 }
 
 TEST_F(XmlOutputChangeDirTest, PreserveOriginalWorkingDirWithAbsolutePath) {
-#if GTEST_OS_WINDOWS
+#ifdef GTEST_OS_WINDOWS
   const std::string path = "c:\\tmp\\";
 #else
   const std::string path = "/tmp/";
 #endif
 
-  GTEST_FLAG(output) = "xml:" + path;
+  GTEST_FLAG_SET(output, "xml:" + path);
   const std::string expected_output_file =
       path + GetCurrentExecutableName().string() + ".xml";
   const std::string& output_file =
       UnitTestOptions::GetAbsolutePathToOutputFile();
 
-#if GTEST_OS_WINDOWS
+#ifdef GTEST_OS_WINDOWS
   EXPECT_STRCASEEQ(expected_output_file.c_str(), output_file.c_str());
 #else
   EXPECT_EQ(expected_output_file, output_file.c_str());
diff --git a/external/googletest/googletest/test/googletest-output-test-golden-lin.txt b/external/googletest/googletest/test/googletest-output-test-golden-lin.txt
index 3fab3b97..533eb8c6 100644
--- a/external/googletest/googletest/test/googletest-output-test-golden-lin.txt
+++ b/external/googletest/googletest/test/googletest-output-test-golden-lin.txt
@@ -12,7 +12,7 @@ Expected equality of these values:
   3
 Stack trace: (omitted)
 
-[==========] Running 88 tests from 41 test suites.
+[==========] Running 90 tests from 43 test suites.
 [----------] Global test environment set-up.
 FooEnvironment::SetUp() called.
 BarEnvironment::SetUp() called.
@@ -696,7 +696,6 @@ Expected: 1 fatal failure
   Actual:
 googletest-output-test_.cc:#: Success:
 Succeeded
-Stack trace: (omitted)
 
 
 Stack trace: (omitted)
@@ -733,7 +732,6 @@ Expected: 1 non-fatal failure
   Actual:
 googletest-output-test_.cc:#: Success:
 Succeeded
-Stack trace: (omitted)
 
 
 Stack trace: (omitted)
@@ -770,7 +768,6 @@ Expected: 1 fatal failure
   Actual:
 googletest-output-test_.cc:#: Success:
 Succeeded
-Stack trace: (omitted)
 
 
 Stack trace: (omitted)
@@ -807,7 +804,6 @@ Expected: 1 non-fatal failure
   Actual:
 googletest-output-test_.cc:#: Success:
 Succeeded
-Stack trace: (omitted)
 
 
 Stack trace: (omitted)
@@ -956,6 +952,25 @@ Stack trace: (omitted)
 ~DynamicFixture()
 [  FAILED  ] BadDynamicFixture2.Derived
 DynamicFixture::TearDownTestSuite
+[----------] 1 test from TestSuiteThatFailsToSetUp
+googletest-output-test_.cc:#: Failure
+Value of: false
+  Actual: false
+Expected: true
+Stack trace: (omitted)
+
+[ RUN      ] TestSuiteThatFailsToSetUp.ShouldNotRun
+googletest-output-test_.cc:#: Skipped
+
+[  SKIPPED ] TestSuiteThatFailsToSetUp.ShouldNotRun
+[----------] 1 test from TestSuiteThatSkipsInSetUp
+googletest-output-test_.cc:#: Skipped
+Skip entire test suite
+
+[ RUN      ] TestSuiteThatSkipsInSetUp.ShouldNotRun
+googletest-output-test_.cc:#: Skipped
+
+[  SKIPPED ] TestSuiteThatSkipsInSetUp.ShouldNotRun
 [----------] 1 test from PrintingFailingParams/FailingParamTest
 [ RUN      ] PrintingFailingParams/FailingParamTest.Fails/0
 googletest-output-test_.cc:#: Failure
@@ -1032,8 +1047,11 @@ Failed
 Expected fatal failure.
 Stack trace: (omitted)
 
-[==========] 88 tests from 41 test suites ran.
+[==========] 90 tests from 43 test suites ran.
 [  PASSED  ] 31 tests.
+[  SKIPPED ] 2 tests, listed below:
+[  SKIPPED ] TestSuiteThatFailsToSetUp.ShouldNotRun
+[  SKIPPED ] TestSuiteThatSkipsInSetUp.ShouldNotRun
 [  FAILED  ] 57 tests, listed below:
 [  FAILED  ] NonfatalFailureTest.EscapesStringOperands
 [  FAILED  ] NonfatalFailureTest.DiffForLongStrings
@@ -1094,6 +1112,9 @@ Stack trace: (omitted)
 [  FAILED  ] GoogleTestVerification.UninstantiatedTypeParameterizedTestSuite<DetectNotInstantiatedTypesTest>
 
 57 FAILED TESTS
+[  FAILED  ] TestSuiteThatFailsToSetUp: SetUpTestSuite or TearDownTestSuite
+
+ 1 FAILED TEST SUITE
   YOU HAVE 1 DISABLED TEST
 
 Note: Google Test filter = FatalFailureTest.*:LoggingTest.*
diff --git a/external/googletest/googletest/test/googletest-output-test.py b/external/googletest/googletest/test/googletest-output-test.py
old mode 100644
new mode 100755
index 705f6f03..6d80d532
--- a/external/googletest/googletest/test/googletest-output-test.py
+++ b/external/googletest/googletest/test/googletest-output-test.py
@@ -42,7 +42,8 @@
 import os
 import re
 import sys
-import gtest_test_utils
+from googletest.test import gtest_test_utils
+
 
 # The flag for generating the golden file
 GENGOLDEN_FLAG = '--gengolden'
@@ -62,188 +63,208 @@
 # 'internal_skip_environment_and_ad_hoc_tests' argument.
 COMMAND_LIST_TESTS = ({}, [PROGRAM_PATH, '--gtest_list_tests'])
 COMMAND_WITH_COLOR = ({}, [PROGRAM_PATH, '--gtest_color=yes'])
-COMMAND_WITH_TIME = ({}, [PROGRAM_PATH,
-                          '--gtest_print_time',
-                          'internal_skip_environment_and_ad_hoc_tests',
-                          '--gtest_filter=FatalFailureTest.*:LoggingTest.*'])
+COMMAND_WITH_TIME = (
+    {},
+    [
+        PROGRAM_PATH,
+        '--gtest_print_time',
+        'internal_skip_environment_and_ad_hoc_tests',
+        '--gtest_filter=FatalFailureTest.*:LoggingTest.*',
+    ],
+)
 COMMAND_WITH_DISABLED = (
-    {}, [PROGRAM_PATH,
-         '--gtest_also_run_disabled_tests',
-         'internal_skip_environment_and_ad_hoc_tests',
-         '--gtest_filter=*DISABLED_*'])
+    {},
+    [
+        PROGRAM_PATH,
+        '--gtest_also_run_disabled_tests',
+        'internal_skip_environment_and_ad_hoc_tests',
+        '--gtest_filter=*DISABLED_*',
+    ],
+)
 COMMAND_WITH_SHARDING = (
     {'GTEST_SHARD_INDEX': '1', 'GTEST_TOTAL_SHARDS': '2'},
-    [PROGRAM_PATH,
-     'internal_skip_environment_and_ad_hoc_tests',
-     '--gtest_filter=PassingTest.*'])
+    [
+        PROGRAM_PATH,
+        'internal_skip_environment_and_ad_hoc_tests',
+        '--gtest_filter=PassingTest.*',
+    ],
+)
 
 GOLDEN_PATH = os.path.join(gtest_test_utils.GetSourceDir(), GOLDEN_NAME)
 
 
 def ToUnixLineEnding(s):
-    """Changes all Windows/Mac line endings in s to UNIX line endings."""
+  """Changes all Windows/Mac line endings in s to UNIX line endings."""
 
-    return s.replace('\r\n', '\n').replace('\r', '\n')
+  return s.replace('\r\n', '\n').replace('\r', '\n')
 
 
 def RemoveLocations(test_output):
-    """Removes all file location info from a Google Test program's output.
+  """Removes all file location info from a Google Test program's output.
 
-    Args:
-         test_output:  the output of a Google Test program.
+  Args:
+       test_output:  the output of a Google Test program.
 
-    Returns:
-         output with all file location info (in the form of
-         'DIRECTORY/FILE_NAME:LINE_NUMBER: 'or
-         'DIRECTORY\\FILE_NAME(LINE_NUMBER): ') replaced by
-         'FILE_NAME:#: '.
-    """
+  Returns:
+       output with all file location info (in the form of
+       'DIRECTORY/FILE_NAME:LINE_NUMBER: 'or
+       'DIRECTORY\\FILE_NAME(LINE_NUMBER): ') replaced by
+       'FILE_NAME:#: '.
+  """
 
-    return re.sub(r'.*[/\\]((googletest-output-test_|gtest).cc)(\:\d+|\(\d+\))\: ',
-                  r'\1:#: ', test_output)
+  return re.sub(
+      r'.*[/\\]((googletest-output-test_|gtest).cc)(\:\d+|\(\d+\))\: ',
+      r'\1:#: ',
+      test_output,
+  )
 
 
 def RemoveStackTraceDetails(output):
-    """Removes all stack traces from a Google Test program's output."""
+  """Removes all stack traces from a Google Test program's output."""
 
-    # *? means "find the shortest string that matches".
-    return re.sub(r'Stack trace:(.|\n)*?\n\n',
-                  'Stack trace: (omitted)\n\n', output)
+  # *? means "find the shortest string that matches".
+  return re.sub(
+      r'Stack trace:(.|\n)*?\n\n', 'Stack trace: (omitted)\n\n', output
+  )
 
 
 def RemoveStackTraces(output):
-    """Removes all traces of stack traces from a Google Test program's output."""
+  """Removes all traces of stack traces from a Google Test program's output."""
 
-    # *? means "find the shortest string that matches".
-    return re.sub(r'Stack trace:(.|\n)*?\n\n', '', output)
+  # *? means "find the shortest string that matches".
+  return re.sub(r'Stack trace:(.|\n)*?\n', '', output)
 
 
 def RemoveTime(output):
-    """Removes all time information from a Google Test program's output."""
+  """Removes all time information from a Google Test program's output."""
 
-    return re.sub(r'\(\d+ ms', '(? ms', output)
+  return re.sub(r'\(\d+ ms', '(? ms', output)
 
 
 def RemoveTypeInfoDetails(test_output):
-    """Removes compiler-specific type info from Google Test program's output.
+  """Removes compiler-specific type info from Google Test program's output.
 
-    Args:
-         test_output:  the output of a Google Test program.
+  Args:
+       test_output:  the output of a Google Test program.
 
-    Returns:
-         output with type information normalized to canonical form.
-    """
+  Returns:
+       output with type information normalized to canonical form.
+  """
 
-    # some compilers output the name of type 'unsigned int' as 'unsigned'
-    return re.sub(r'unsigned int', 'unsigned', test_output)
+  # some compilers output the name of type 'unsigned int' as 'unsigned'
+  return re.sub(r'unsigned int', 'unsigned', test_output)
 
 
 def NormalizeToCurrentPlatform(test_output):
-    """Normalizes platform specific output details for easier comparison."""
+  """Normalizes platform specific output details for easier comparison."""
 
-    if IS_WINDOWS:
-        # Removes the color information that is not present on Windows.
-        test_output = re.sub('\x1b\\[(0;3\d)?m', '', test_output)
-        # Changes failure message headers into the Windows format.
-        test_output = re.sub(r': Failure\n', r': error: ', test_output)
-        # Changes file(line_number) to file:line_number.
-        test_output = re.sub(r'((\w|\.)+)\((\d+)\):', r'\1:\3:', test_output)
+  if IS_WINDOWS:
+    # Removes the color information that is not present on Windows.
+    test_output = re.sub('\x1b\\[(0;3\d)?m', '', test_output)
+    # Changes failure message headers into the Windows format.
+    test_output = re.sub(r': Failure\n', r': error: ', test_output)
+    # Changes file(line_number) to file:line_number.
+    test_output = re.sub(r'((\w|\.)+)\((\d+)\):', r'\1:\3:', test_output)
 
-    return test_output
+  return test_output
 
 
 def RemoveTestCounts(output):
-    """Removes test counts from a Google Test program's output."""
+  """Removes test counts from a Google Test program's output."""
 
-    output = re.sub(r'\d+ tests?, listed below',
-                    '? tests, listed below', output)
-    output = re.sub(r'\d+ FAILED TESTS',
-                    '? FAILED TESTS', output)
-    output = re.sub(r'\d+ tests? from \d+ test cases?',
-                    '? tests from ? test cases', output)
-    output = re.sub(r'\d+ tests? from ([a-zA-Z_])',
-                    r'? tests from \1', output)
-    return re.sub(r'\d+ tests?\.', '? tests.', output)
+  output = re.sub(r'\d+ tests?, listed below', '? tests, listed below', output)
+  output = re.sub(r'\d+ FAILED TESTS', '? FAILED TESTS', output)
+  output = re.sub(
+      r'\d+ tests? from \d+ test cases?', '? tests from ? test cases', output
+  )
+  output = re.sub(r'\d+ tests? from ([a-zA-Z_])', r'? tests from \1', output)
+  return re.sub(r'\d+ tests?\.', '? tests.', output)
 
 
 def RemoveMatchingTests(test_output, pattern):
-    """Removes output of specified tests from a Google Test program's output.
+  """Removes output of specified tests from a Google Test program's output.
 
-    This function strips not only the beginning and the end of a test but also
-    all output in between.
+  This function strips not only the beginning and the end of a test but also
+  all output in between.
 
-    Args:
-      test_output:       A string containing the test output.
-      pattern:           A regex string that matches names of test cases or
-                         tests to remove.
+  Args:
+    test_output:       A string containing the test output.
+    pattern:           A regex string that matches names of test cases or tests
+      to remove.
 
-    Returns:
-      Contents of test_output with tests whose names match pattern removed.
-    """
+  Returns:
+    Contents of test_output with tests whose names match pattern removed.
+  """
 
-    test_output = re.sub(
-        r'.*\[ RUN      \] .*%s(.|\n)*?\[(  FAILED  |       OK )\] .*%s.*\n' % (
-            pattern, pattern),
-        '',
-        test_output)
-    return re.sub(r'.*%s.*\n' % pattern, '', test_output)
+  test_output = re.sub(
+      r'.*\[ RUN      \] .*%s(.|\n)*?\[(  FAILED  |       OK )\] .*%s.*\n'
+      % (pattern, pattern),
+      '',
+      test_output,
+  )
+  return re.sub(r'.*%s.*\n' % pattern, '', test_output)
 
 
 def NormalizeOutput(output):
-    """Normalizes output (the output of googletest-output-test_.exe)."""
+  """Normalizes output (the output of googletest-output-test_.exe)."""
 
-    output = ToUnixLineEnding(output)
-    output = RemoveLocations(output)
-    output = RemoveStackTraceDetails(output)
-    output = RemoveTime(output)
-    return output
+  output = ToUnixLineEnding(output)
+  output = RemoveLocations(output)
+  output = RemoveStackTraceDetails(output)
+  output = RemoveTime(output)
+  return output
 
 
 def GetShellCommandOutput(env_cmd):
-    """Runs a command in a sub-process, and returns its output in a string.
+  """Runs a command in a sub-process, and returns its output in a string.
 
-    Args:
-      env_cmd: The shell command. A 2-tuple where element 0 is a dict of extra
-               environment variables to set, and element 1 is a string with
-               the command and any flags.
+  Args:
+    env_cmd: The shell command. A 2-tuple where element 0 is a dict of extra
+      environment variables to set, and element 1 is a string with the command
+      and any flags.
 
-    Returns:
-      A string with the command's combined standard and diagnostic output.
-    """
+  Returns:
+    A string with the command's combined standard and diagnostic output.
+  """
 
-    # Spawns cmd in a sub-process, and gets its standard I/O file objects.
-    # Set and save the environment properly.
-    environ = os.environ.copy()
-    environ.update(env_cmd[0])
-    p = gtest_test_utils.Subprocess(env_cmd[1], env=environ)
+  # Spawns cmd in a sub-process, and gets its standard I/O file objects.
+  # Set and save the environment properly.
+  environ = os.environ.copy()
+  environ.update(env_cmd[0])
+  p = gtest_test_utils.Subprocess(env_cmd[1], env=environ)
 
-    return p.output
+  return p.output
 
 
 def GetCommandOutput(env_cmd):
-    """Runs a command and returns its output with all file location
-    info stripped off.
+  """Runs a command and returns output with all file location info stripped off.
 
-    Args:
-      env_cmd:  The shell command. A 2-tuple where element 0 is a dict of extra
-                environment variables to set, and element 1 is a string with
-                the command and any flags.
-    """
+  Args:
+    env_cmd:  The shell command. A 2-tuple where element 0 is a dict of extra
+      environment variables to set, and element 1 is a string with the command
+      and any flags.
 
-    # Disables exception pop-ups on Windows.
-    environ, cmdline = env_cmd
-    environ = dict(environ)  # Ensures we are modifying a copy.
-    environ[CATCH_EXCEPTIONS_ENV_VAR_NAME] = '1'
-    return NormalizeOutput(GetShellCommandOutput((environ, cmdline)))
+  Returns:
+    A string with the command's combined standard and diagnostic output. File
+    location info is stripped.
+  """
+
+  # Disables exception pop-ups on Windows.
+  environ, cmdline = env_cmd
+  environ = dict(environ)  # Ensures we are modifying a copy.
+  environ[CATCH_EXCEPTIONS_ENV_VAR_NAME] = '1'
+  return NormalizeOutput(GetShellCommandOutput((environ, cmdline)))
 
 
 def GetOutputOfAllCommands():
-    """Returns concatenated output from several representative commands."""
+  """Returns concatenated output from several representative commands."""
 
-    return (GetCommandOutput(COMMAND_WITH_COLOR) +
-            GetCommandOutput(COMMAND_WITH_TIME) +
-            GetCommandOutput(COMMAND_WITH_DISABLED) +
-            GetCommandOutput(COMMAND_WITH_SHARDING))
+  return (
+      GetCommandOutput(COMMAND_WITH_COLOR)
+      + GetCommandOutput(COMMAND_WITH_TIME)
+      + GetCommandOutput(COMMAND_WITH_DISABLED)
+      + GetCommandOutput(COMMAND_WITH_SHARDING)
+  )
 
 
 test_list = GetShellCommandOutput(COMMAND_LIST_TESTS)
@@ -252,95 +273,113 @@ def GetOutputOfAllCommands():
 SUPPORTS_THREADS = 'ExpectFailureWithThreadsTest' in test_list
 SUPPORTS_STACK_TRACES = NO_STACKTRACE_SUPPORT_FLAG not in sys.argv
 
-CAN_GENERATE_GOLDEN_FILE = (SUPPORTS_DEATH_TESTS and
-                            SUPPORTS_TYPED_TESTS and
-                            SUPPORTS_THREADS and
-                            SUPPORTS_STACK_TRACES)
+CAN_GENERATE_GOLDEN_FILE = (
+    SUPPORTS_DEATH_TESTS
+    and SUPPORTS_TYPED_TESTS
+    and SUPPORTS_THREADS
+    and SUPPORTS_STACK_TRACES
+)
 
 
 class GTestOutputTest(gtest_test_utils.TestCase):
-    def RemoveUnsupportedTests(self, test_output):
-        if not SUPPORTS_DEATH_TESTS:
-            test_output = RemoveMatchingTests(test_output, 'DeathTest')
-        if not SUPPORTS_TYPED_TESTS:
-            test_output = RemoveMatchingTests(test_output, 'TypedTest')
-            test_output = RemoveMatchingTests(test_output, 'TypedDeathTest')
-            test_output = RemoveMatchingTests(test_output, 'TypeParamDeathTest')
-        if not SUPPORTS_THREADS:
-            test_output = RemoveMatchingTests(test_output,
-                                              'ExpectFailureWithThreadsTest')
-            test_output = RemoveMatchingTests(test_output,
-                                              'ScopedFakeTestPartResultReporterTest')
-            test_output = RemoveMatchingTests(test_output,
-                                              'WorksConcurrently')
-        if not SUPPORTS_STACK_TRACES:
-            test_output = RemoveStackTraces(test_output)
-
-        return test_output
-
-    def testOutput(self):
-        output = GetOutputOfAllCommands()
-
-        golden_file = open(GOLDEN_PATH, 'rb')
-        # A mis-configured source control system can cause \r appear in EOL
-        # sequences when we read the golden file irrespective of an operating
-        # system used. Therefore, we need to strip those \r's from newlines
-        # unconditionally.
-        golden = ToUnixLineEnding(golden_file.read().decode())
-        golden_file.close()
-
-        # We want the test to pass regardless of certain features being
-        # supported or not.
-
-        # We still have to remove type name specifics in all cases.
-        normalized_actual = RemoveTypeInfoDetails(output)
-        normalized_golden = RemoveTypeInfoDetails(golden)
-
-        if CAN_GENERATE_GOLDEN_FILE:
-            self.assertEqual(normalized_golden, normalized_actual,
-                             '\n'.join(difflib.unified_diff(
-                                 normalized_golden.split('\n'),
-                                 normalized_actual.split('\n'),
-                                 'golden', 'actual')))
-        else:
-            normalized_actual = NormalizeToCurrentPlatform(
-                RemoveTestCounts(normalized_actual))
-            normalized_golden = NormalizeToCurrentPlatform(
-                RemoveTestCounts(self.RemoveUnsupportedTests(normalized_golden)))
-
-            # This code is very handy when debugging golden file differences:
-            if os.getenv('DEBUG_GTEST_OUTPUT_TEST'):
-                open(os.path.join(
-                    gtest_test_utils.GetSourceDir(),
-                    '_googletest-output-test_normalized_actual.txt'), 'wb').write(
-                    normalized_actual)
-                open(os.path.join(
-                    gtest_test_utils.GetSourceDir(),
-                    '_googletest-output-test_normalized_golden.txt'), 'wb').write(
-                    normalized_golden)
-
-            self.assertEqual(normalized_golden, normalized_actual)
+
+  def RemoveUnsupportedTests(self, test_output):
+    if not SUPPORTS_DEATH_TESTS:
+      test_output = RemoveMatchingTests(test_output, 'DeathTest')
+    if not SUPPORTS_TYPED_TESTS:
+      test_output = RemoveMatchingTests(test_output, 'TypedTest')
+      test_output = RemoveMatchingTests(test_output, 'TypedDeathTest')
+      test_output = RemoveMatchingTests(test_output, 'TypeParamDeathTest')
+    if not SUPPORTS_THREADS:
+      test_output = RemoveMatchingTests(
+          test_output, 'ExpectFailureWithThreadsTest'
+      )
+      test_output = RemoveMatchingTests(
+          test_output, 'ScopedFakeTestPartResultReporterTest'
+      )
+      test_output = RemoveMatchingTests(test_output, 'WorksConcurrently')
+    if not SUPPORTS_STACK_TRACES:
+      test_output = RemoveStackTraces(test_output)
+
+    return test_output
+
+  def testOutput(self):
+    output = GetOutputOfAllCommands()
+
+    golden_file = open(GOLDEN_PATH, 'rb')
+    # A mis-configured source control system can cause \r appear in EOL
+    # sequences when we read the golden file irrespective of an operating
+    # system used. Therefore, we need to strip those \r's from newlines
+    # unconditionally.
+    golden = ToUnixLineEnding(golden_file.read().decode())
+    golden_file.close()
+
+    # We want the test to pass regardless of certain features being
+    # supported or not.
+
+    # We still have to remove type name specifics in all cases.
+    normalized_actual = RemoveTypeInfoDetails(output)
+    normalized_golden = RemoveTypeInfoDetails(golden)
+
+    if CAN_GENERATE_GOLDEN_FILE:
+      self.assertEqual(
+          normalized_golden,
+          normalized_actual,
+          '\n'.join(
+              difflib.unified_diff(
+                  normalized_golden.split('\n'),
+                  normalized_actual.split('\n'),
+                  'golden',
+                  'actual',
+              )
+          ),
+      )
+    else:
+      normalized_actual = NormalizeToCurrentPlatform(
+          RemoveTestCounts(normalized_actual)
+      )
+      normalized_golden = NormalizeToCurrentPlatform(
+          RemoveTestCounts(self.RemoveUnsupportedTests(normalized_golden))
+      )
+
+      # This code is very handy when debugging golden file differences:
+      if os.getenv('DEBUG_GTEST_OUTPUT_TEST'):
+        open(
+            os.path.join(
+                gtest_test_utils.GetSourceDir(),
+                '_googletest-output-test_normalized_actual.txt',
+            ),
+            'wb',
+        ).write(normalized_actual)
+        open(
+            os.path.join(
+                gtest_test_utils.GetSourceDir(),
+                '_googletest-output-test_normalized_golden.txt',
+            ),
+            'wb',
+        ).write(normalized_golden)
+
+      self.assertEqual(normalized_golden, normalized_actual)
 
 
 if __name__ == '__main__':
-    if NO_STACKTRACE_SUPPORT_FLAG in sys.argv:
-        # unittest.main() can't handle unknown flags
-        sys.argv.remove(NO_STACKTRACE_SUPPORT_FLAG)
-
-    if GENGOLDEN_FLAG in sys.argv:
-        if CAN_GENERATE_GOLDEN_FILE:
-            output = GetOutputOfAllCommands()
-            golden_file = open(GOLDEN_PATH, 'wb')
-            golden_file.write(output.encode())
-            golden_file.close()
-        else:
-            message = (
-                """Unable to write a golden file when compiled in an environment
-      that does not support all the required features (death tests,
-      typed tests, stack traces, and multiple threads).
-      Please build this test and generate the golden file using Blaze on Linux.""")
-
-            sys.stderr.write(message)
-            sys.exit(1)
+  if NO_STACKTRACE_SUPPORT_FLAG in sys.argv:
+    # unittest.main() can't handle unknown flags
+    sys.argv.remove(NO_STACKTRACE_SUPPORT_FLAG)
+
+  if GENGOLDEN_FLAG in sys.argv:
+    if CAN_GENERATE_GOLDEN_FILE:
+      output = GetOutputOfAllCommands()
+      golden_file = open(GOLDEN_PATH, 'wb')
+      golden_file.write(output.encode())
+      golden_file.close()
     else:
-        gtest_test_utils.Main()
+      message = """Unable to write a golden file when compiled in an environment
+that does not support all the required features (death tests,
+typed tests, stack traces, and multiple threads).
+Please build this test and generate the golden file using Blaze on Linux."""
+
+      sys.stderr.write(message)
+      sys.exit(1)
+  else:
+    gtest_test_utils.Main()
diff --git a/external/googletest/googletest/test/googletest-output-test_.cc b/external/googletest/googletest/test/googletest-output-test_.cc
index 017c2bcb..e3560c01 100644
--- a/external/googletest/googletest/test/googletest-output-test_.cc
+++ b/external/googletest/googletest/test/googletest-output-test_.cc
@@ -35,15 +35,16 @@
 
 #include <stdlib.h>
 
+#include <algorithm>
+#include <string>
+
 #include "gtest/gtest-spi.h"
 #include "gtest/gtest.h"
 #include "src/gtest-internal-inl.h"
 
-#if _MSC_VER
 GTEST_DISABLE_MSC_WARNINGS_PUSH_(4127 /* conditional expression is constant */)
-#endif  //  _MSC_VER
 
-#if GTEST_IS_THREADSAFE
+#ifdef GTEST_IS_THREADSAFE
 using testing::ScopedFakeTestPartResultReporter;
 using testing::TestPartResultArray;
 
@@ -249,7 +250,7 @@ TEST(SCOPED_TRACETest, CanBeRepeated) {
                 << "contain trace point A, B, and D.";
 }
 
-#if GTEST_IS_THREADSAFE
+#ifdef GTEST_IS_THREADSAFE
 // Tests that SCOPED_TRACE()s can be used concurrently from multiple
 // threads.  Namely, an assertion should be affected by
 // SCOPED_TRACE()s in its own thread only.
@@ -775,7 +776,7 @@ REGISTER_TYPED_TEST_SUITE_P(DetectNotInstantiatedTypesTest, Used);
 // typedef ::testing::Types<char, int, unsigned int> MyTypes;
 // INSTANTIATE_TYPED_TEST_SUITE_P(All, DetectNotInstantiatedTypesTest, MyTypes);
 
-#if GTEST_HAS_DEATH_TEST
+#ifdef GTEST_HAS_DEATH_TEST
 
 // We rely on the golden file to verify that tests whose test case
 // name ends with DeathTest are run first.
@@ -853,7 +854,7 @@ TEST_F(ExpectFailureTest, ExpectNonFatalFailure) {
                           "failure.");
 }
 
-#if GTEST_IS_THREADSAFE
+#ifdef GTEST_IS_THREADSAFE
 
 class ExpectFailureWithThreadsTest : public ExpectFailureTest {
  protected:
@@ -1000,31 +1001,43 @@ class BarEnvironment : public testing::Environment {
   }
 };
 
+class TestSuiteThatFailsToSetUp : public testing::Test {
+ public:
+  static void SetUpTestSuite() { EXPECT_TRUE(false); }
+};
+TEST_F(TestSuiteThatFailsToSetUp, ShouldNotRun) { std::abort(); }
+
+class TestSuiteThatSkipsInSetUp : public testing::Test {
+ public:
+  static void SetUpTestSuite() { GTEST_SKIP() << "Skip entire test suite"; }
+};
+TEST_F(TestSuiteThatSkipsInSetUp, ShouldNotRun) { std::abort(); }
+
 // The main function.
 //
 // The idea is to use Google Test to run all the tests we have defined (some
 // of them are intended to fail), and then compare the test results
 // with the "golden" file.
 int main(int argc, char** argv) {
-  testing::GTEST_FLAG(print_time) = false;
+  GTEST_FLAG_SET(print_time, false);
 
   // We just run the tests, knowing some of them are intended to fail.
   // We will use a separate Python script to compare the output of
   // this program with the golden file.
 
   // It's hard to test InitGoogleTest() directly, as it has many
-  // global side effects.  The following line serves as a sanity test
+  // global side effects.  The following line serves as a test
   // for it.
   testing::InitGoogleTest(&argc, argv);
   bool internal_skip_environment_and_ad_hoc_tests =
       std::count(argv, argv + argc,
                  std::string("internal_skip_environment_and_ad_hoc_tests")) > 0;
 
-#if GTEST_HAS_DEATH_TEST
-  if (testing::internal::GTEST_FLAG(internal_run_death_test) != "") {
+#ifdef GTEST_HAS_DEATH_TEST
+  if (!GTEST_FLAG_GET(internal_run_death_test).empty()) {
     // Skip the usual output capturing if we're running as the child
     // process of an threadsafe-style death test.
-#if GTEST_OS_WINDOWS
+#if defined(GTEST_OS_WINDOWS)
     posix::FReopen("nul:", "w", stdout);
 #else
     posix::FReopen("/dev/null", "w", stdout);
@@ -1040,8 +1053,6 @@ int main(int argc, char** argv) {
   // are registered, and torn down in the reverse order.
   testing::AddGlobalTestEnvironment(new FooEnvironment);
   testing::AddGlobalTestEnvironment(new BarEnvironment);
-#if _MSC_VER
   GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4127
-#endif                               //  _MSC_VER
   return RunAllTests();
 }
diff --git a/external/googletest/googletest/test/googletest-param-test-invalid-name1-test.py b/external/googletest/googletest/test/googletest-param-test-invalid-name1-test.py
index a1900ef4..4886e49e 100644
--- a/external/googletest/googletest/test/googletest-param-test-invalid-name1-test.py
+++ b/external/googletest/googletest/test/googletest-param-test-invalid-name1-test.py
@@ -30,34 +30,34 @@
 
 """Verifies that Google Test warns the user when not initialized properly."""
 
-import gtest_test_utils
+from googletest.test import gtest_test_utils
 
 binary_name = 'googletest-param-test-invalid-name1-test_'
 COMMAND = gtest_test_utils.GetTestExecutablePath(binary_name)
 
 
 def Assert(condition):
-    if not condition:
-        raise AssertionError
+  if not condition:
+    raise AssertionError
 
 
 def TestExitCodeAndOutput(command):
-    """Runs the given command and verifies its exit code and output."""
+  """Runs the given command and verifies its exit code and output."""
 
-    err = ('Parameterized test name \'"InvalidWithQuotes"\' is invalid')
+  err = 'Parameterized test name \'"InvalidWithQuotes"\' is invalid'
 
-    p = gtest_test_utils.Subprocess(command)
-    Assert(p.terminated_by_signal)
+  p = gtest_test_utils.Subprocess(command)
+  Assert(p.terminated_by_signal)
 
-    # Verify the output message contains appropriate output
-    Assert(err in p.output)
+  # Verify the output message contains appropriate output
+  Assert(err in p.output)
 
 
 class GTestParamTestInvalidName1Test(gtest_test_utils.TestCase):
 
-    def testExitCodeAndOutput(self):
-        TestExitCodeAndOutput(COMMAND)
+  def testExitCodeAndOutput(self):
+    TestExitCodeAndOutput(COMMAND)
 
 
 if __name__ == '__main__':
-    gtest_test_utils.Main()
+  gtest_test_utils.Main()
diff --git a/external/googletest/googletest/test/googletest-param-test-invalid-name2-test.py b/external/googletest/googletest/test/googletest-param-test-invalid-name2-test.py
index 19f21269..bcd8ddf0 100644
--- a/external/googletest/googletest/test/googletest-param-test-invalid-name2-test.py
+++ b/external/googletest/googletest/test/googletest-param-test-invalid-name2-test.py
@@ -30,34 +30,34 @@
 
 """Verifies that Google Test warns the user when not initialized properly."""
 
-import gtest_test_utils
+from googletest.test import gtest_test_utils
 
 binary_name = 'googletest-param-test-invalid-name2-test_'
 COMMAND = gtest_test_utils.GetTestExecutablePath(binary_name)
 
 
 def Assert(condition):
-    if not condition:
-        raise AssertionError
+  if not condition:
+    raise AssertionError
 
 
 def TestExitCodeAndOutput(command):
-    """Runs the given command and verifies its exit code and output."""
+  """Runs the given command and verifies its exit code and output."""
 
-    err = ('Duplicate parameterized test name \'a\'')
+  err = "Duplicate parameterized test name 'a'"
 
-    p = gtest_test_utils.Subprocess(command)
-    Assert(p.terminated_by_signal)
+  p = gtest_test_utils.Subprocess(command)
+  Assert(p.terminated_by_signal)
 
-    # Check for appropriate output
-    Assert(err in p.output)
+  # Check for appropriate output
+  Assert(err in p.output)
 
 
 class GTestParamTestInvalidName2Test(gtest_test_utils.TestCase):
 
-    def testExitCodeAndOutput(self):
-        TestExitCodeAndOutput(COMMAND)
+  def testExitCodeAndOutput(self):
+    TestExitCodeAndOutput(COMMAND)
 
 
 if __name__ == '__main__':
-    gtest_test_utils.Main()
+  gtest_test_utils.Main()
diff --git a/external/googletest/googletest/test/googletest-param-test-invalid-name2-test_.cc b/external/googletest/googletest/test/googletest-param-test-invalid-name2-test_.cc
index d0c44da5..6d88a9ce 100644
--- a/external/googletest/googletest/test/googletest-param-test-invalid-name2-test_.cc
+++ b/external/googletest/googletest/test/googletest-param-test-invalid-name2-test_.cc
@@ -27,6 +27,8 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#include <string>
+
 #include "gtest/gtest.h"
 
 namespace {
diff --git a/external/googletest/googletest/test/googletest-param-test-test.cc b/external/googletest/googletest/test/googletest-param-test-test.cc
index 4e9323fd..bc130601 100644
--- a/external/googletest/googletest/test/googletest-param-test-test.cc
+++ b/external/googletest/googletest/test/googletest-param-test-test.cc
@@ -35,11 +35,17 @@
 #include "test/googletest-param-test-test.h"
 
 #include <algorithm>
+#include <cstddef>
+#include <cstdint>
+#include <functional>
 #include <iostream>
 #include <list>
 #include <set>
 #include <sstream>
 #include <string>
+#include <string_view>
+#include <tuple>
+#include <type_traits>
 #include <vector>
 
 #include "gtest/gtest.h"
@@ -51,6 +57,7 @@ using ::std::vector;
 using ::testing::AddGlobalTestEnvironment;
 using ::testing::Bool;
 using ::testing::Combine;
+using ::testing::ConvertGenerator;
 using ::testing::Message;
 using ::testing::Range;
 using ::testing::TestWithParam;
@@ -219,7 +226,7 @@ class DogAdder {
   }
   DogAdder operator+(const DogAdder& other) const {
     Message msg;
-    msg << value_.c_str() << other.value_.c_str();
+    msg << value_ << other.value_;
     return DogAdder(msg.GetString().c_str());
   }
   bool operator<(const DogAdder& other) const { return value_ < other.value_; }
@@ -402,7 +409,7 @@ TEST(BoolTest, BoolWorks) {
 TEST(CombineTest, CombineWithTwoParameters) {
   const char* foo = "foo";
   const char* bar = "bar";
-  const ParamGenerator<std::tuple<const char*, int> > gen =
+  const ParamGenerator<std::tuple<const char*, int>> gen =
       Combine(Values(foo, bar), Values(3, 4));
 
   std::tuple<const char*, int> expected_values[] = {
@@ -413,7 +420,7 @@ TEST(CombineTest, CombineWithTwoParameters) {
 
 // Tests that Combine() with three parameters generates the expected sequence.
 TEST(CombineTest, CombineWithThreeParameters) {
-  const ParamGenerator<std::tuple<int, int, int> > gen =
+  const ParamGenerator<std::tuple<int, int, int>> gen =
       Combine(Values(0, 1), Values(3, 4), Values(5, 6));
   std::tuple<int, int, int> expected_values[] = {
       std::make_tuple(0, 3, 5), std::make_tuple(0, 3, 6),
@@ -427,7 +434,7 @@ TEST(CombineTest, CombineWithThreeParameters) {
 // sequence generates a sequence with the number of elements equal to the
 // number of elements in the sequence generated by the second parameter.
 TEST(CombineTest, CombineWithFirstParameterSingleValue) {
-  const ParamGenerator<std::tuple<int, int> > gen =
+  const ParamGenerator<std::tuple<int, int>> gen =
       Combine(Values(42), Values(0, 1));
 
   std::tuple<int, int> expected_values[] = {std::make_tuple(42, 0),
@@ -439,7 +446,7 @@ TEST(CombineTest, CombineWithFirstParameterSingleValue) {
 // sequence generates a sequence with the number of elements equal to the
 // number of elements in the sequence generated by the first parameter.
 TEST(CombineTest, CombineWithSecondParameterSingleValue) {
-  const ParamGenerator<std::tuple<int, int> > gen =
+  const ParamGenerator<std::tuple<int, int>> gen =
       Combine(Values(0, 1), Values(42));
 
   std::tuple<int, int> expected_values[] = {std::make_tuple(0, 42),
@@ -450,7 +457,7 @@ TEST(CombineTest, CombineWithSecondParameterSingleValue) {
 // Tests that when the first parameter produces an empty sequence,
 // Combine() produces an empty sequence, too.
 TEST(CombineTest, CombineWithFirstParameterEmptyRange) {
-  const ParamGenerator<std::tuple<int, int> > gen =
+  const ParamGenerator<std::tuple<int, int>> gen =
       Combine(Range(0, 0), Values(0, 1));
   VerifyGeneratorIsEmpty(gen);
 }
@@ -458,7 +465,7 @@ TEST(CombineTest, CombineWithFirstParameterEmptyRange) {
 // Tests that when the second parameter produces an empty sequence,
 // Combine() produces an empty sequence, too.
 TEST(CombineTest, CombineWithSecondParameterEmptyRange) {
-  const ParamGenerator<std::tuple<int, int> > gen =
+  const ParamGenerator<std::tuple<int, int>> gen =
       Combine(Values(0, 1), Range(1, 1));
   VerifyGeneratorIsEmpty(gen);
 }
@@ -469,7 +476,7 @@ TEST(CombineTest, CombineWithMaxNumberOfParameters) {
   const char* foo = "foo";
   const char* bar = "bar";
   const ParamGenerator<
-      std::tuple<const char*, int, int, int, int, int, int, int, int, int> >
+      std::tuple<const char*, int, int, int, int, int, int, int, int, int>>
       gen =
           Combine(Values(foo, bar), Values(1), Values(2), Values(3), Values(4),
                   Values(5), Values(6), Values(7), Values(8), Values(9));
@@ -497,11 +504,11 @@ class NonDefaultConstructAssignString {
 };
 
 TEST(CombineTest, NonDefaultConstructAssign) {
-  const ParamGenerator<std::tuple<int, NonDefaultConstructAssignString> > gen =
+  const ParamGenerator<std::tuple<int, NonDefaultConstructAssignString>> gen =
       Combine(Values(0, 1), Values(NonDefaultConstructAssignString("A"),
                                    NonDefaultConstructAssignString("B")));
 
-  ParamGenerator<std::tuple<int, NonDefaultConstructAssignString> >::iterator
+  ParamGenerator<std::tuple<int, NonDefaultConstructAssignString>>::iterator
       it = gen.begin();
 
   EXPECT_EQ(0, std::get<0>(*it));
@@ -523,6 +530,129 @@ TEST(CombineTest, NonDefaultConstructAssign) {
   EXPECT_TRUE(it == gen.end());
 }
 
+template <typename T>
+class ConstructFromT {
+ public:
+  explicit ConstructFromT(const T& t) : t_(t) {}
+  template <typename... Args,
+            typename std::enable_if<sizeof...(Args) != 1, int>::type = 0>
+  ConstructFromT(Args&&... args) : t_(std::forward<Args>(args)...) {}
+
+  bool operator==(const ConstructFromT& other) const { return other.t_ == t_; }
+
+  const T& get() const { return t_; }
+
+ private:
+  T t_;
+};
+
+TEST(ConvertTest, CombineWithTwoParameters) {
+  const char* foo = "foo";
+  const char* bar = "bar";
+  const ParamGenerator<ConstructFromT<std::tuple<const char*, int>>> gen =
+      ConvertGenerator<std::tuple<const char*, int>>(
+          Combine(Values(foo, bar), Values(3, 4)));
+
+  ConstructFromT<std::tuple<const char*, int>> expected_values[] = {
+      {foo, 3}, {foo, 4}, {bar, 3}, {bar, 4}};
+  VerifyGenerator(gen, expected_values);
+}
+
+TEST(ConvertTest, NonDefaultConstructAssign) {
+  const ParamGenerator<
+      ConstructFromT<std::tuple<int, NonDefaultConstructAssignString>>>
+      gen = ConvertGenerator<std::tuple<int, NonDefaultConstructAssignString>>(
+          Combine(Values(0, 1), Values(NonDefaultConstructAssignString("A"),
+                                       NonDefaultConstructAssignString("B"))));
+
+  ParamGenerator<ConstructFromT<
+      std::tuple<int, NonDefaultConstructAssignString>>>::iterator it =
+      gen.begin();
+
+  EXPECT_EQ(0, std::get<0>(it->get()));
+  EXPECT_EQ("A", std::get<1>(it->get()).str());
+  ++it;
+
+  EXPECT_EQ(0, std::get<0>(it->get()));
+  EXPECT_EQ("B", std::get<1>(it->get()).str());
+  ++it;
+
+  EXPECT_EQ(1, std::get<0>(it->get()));
+  EXPECT_EQ("A", std::get<1>(it->get()).str());
+  ++it;
+
+  EXPECT_EQ(1, std::get<0>(it->get()));
+  EXPECT_EQ("B", std::get<1>(it->get()).str());
+  ++it;
+
+  EXPECT_TRUE(it == gen.end());
+}
+
+TEST(ConvertTest, WithConverterLambdaAndDeducedType) {
+  const ParamGenerator<ConstructFromT<int8_t>> gen =
+      ConvertGenerator(Values("0", std::string("1")), [](const std::string& s) {
+        size_t pos;
+        int64_t value = std::stoll(s, &pos);
+        EXPECT_EQ(pos, s.size());
+        return value;
+      });
+
+  ConstructFromT<int8_t> expected_values[] = {ConstructFromT<int8_t>(0),
+                                              ConstructFromT<int8_t>(1)};
+  VerifyGenerator(gen, expected_values);
+}
+
+TEST(ConvertTest, WithConverterLambdaAndExplicitType) {
+  auto convert_generator = ConvertGenerator<std::string>(
+      Values("0", std::string("1")), [](std::string_view s) {
+        size_t pos;
+        int64_t value = std::stoll(std::string(s), &pos);
+        EXPECT_EQ(pos, s.size());
+        return value;
+      });
+  constexpr bool is_correct_type = std::is_same_v<
+      decltype(convert_generator),
+      testing::internal::ParamConverterGenerator<
+          std::string, std::function<int64_t(std::string_view)>>>;
+  EXPECT_TRUE(is_correct_type);
+  const ParamGenerator<ConstructFromT<int8_t>> gen = convert_generator;
+
+  ConstructFromT<int8_t> expected_values[] = {ConstructFromT<int8_t>(0),
+                                              ConstructFromT<int8_t>(1)};
+  VerifyGenerator(gen, expected_values);
+}
+
+TEST(ConvertTest, WithConverterFunctionPointer) {
+  int64_t (*func_ptr)(const std::string&) = [](const std::string& s) {
+    size_t pos;
+    int64_t value = std::stoll(s, &pos);
+    EXPECT_EQ(pos, s.size());
+    return value;
+  };
+  const ParamGenerator<ConstructFromT<int8_t>> gen =
+      ConvertGenerator(Values("0", std::string("1")), func_ptr);
+
+  ConstructFromT<int8_t> expected_values[] = {ConstructFromT<int8_t>(0),
+                                              ConstructFromT<int8_t>(1)};
+  VerifyGenerator(gen, expected_values);
+}
+
+TEST(ConvertTest, WithConverterFunctionReference) {
+  int64_t (*func_ptr)(const std::string&) = [](const std::string& s) {
+    size_t pos;
+    int64_t value = std::stoll(s, &pos);
+    EXPECT_EQ(pos, s.size());
+    return value;
+  };
+  int64_t (&func_ref)(const std::string&) = *func_ptr;
+  const ParamGenerator<ConstructFromT<int8_t>> gen =
+      ConvertGenerator(Values("0", std::string("1")), func_ref);
+
+  ConstructFromT<int8_t> expected_values[] = {ConstructFromT<int8_t>(0),
+                                              ConstructFromT<int8_t>(1)};
+  VerifyGenerator(gen, expected_values);
+}
+
 // Tests that an generator produces correct sequence after being
 // assigned from another generator.
 TEST(ParamGeneratorTest, AssignmentWorks) {
@@ -598,7 +728,9 @@ class TestGenerationEnvironment : public ::testing::Environment {
   int tear_down_count_;
   int test_body_count_;
 
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestGenerationEnvironment);
+  TestGenerationEnvironment(const TestGenerationEnvironment&) = delete;
+  TestGenerationEnvironment& operator=(const TestGenerationEnvironment&) =
+      delete;
 };
 
 const int test_generation_params[] = {36, 42, 72};
@@ -663,7 +795,8 @@ class TestGenerationTest : public TestWithParam<int> {
   static vector<int> collected_parameters_;
 
  private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestGenerationTest);
+  TestGenerationTest(const TestGenerationTest&) = delete;
+  TestGenerationTest& operator=(const TestGenerationTest&) = delete;
 };
 vector<int> TestGenerationTest::collected_parameters_;
 
@@ -818,7 +951,7 @@ TEST_F(PREFIX_WITH_MACRO(NamingTestNonParametrized),
 TEST(MacroNameing, LookupNames) {
   std::set<std::string> know_suite_names, know_test_names;
 
-  auto ins = testing::UnitTest::GetInstance();
+  const auto& ins = testing::UnitTest::GetInstance();
   int ts = 0;
   while (const testing::TestSuite* suite = ins->GetTestSuite(ts++)) {
     know_suite_names.insert(suite->name());
@@ -894,7 +1027,7 @@ INSTANTIATE_TEST_SUITE_P(CustomParamNameLambda, CustomLambdaNamingTest,
                          });
 
 TEST(CustomNamingTest, CheckNameRegistry) {
-  ::testing::UnitTest* unit_test = ::testing::UnitTest::GetInstance();
+  const auto& unit_test = ::testing::UnitTest::GetInstance();
   std::set<std::string> test_names;
   for (int suite_num = 0; suite_num < unit_test->total_test_suite_count();
        ++suite_num) {
diff --git a/external/googletest/googletest/test/googletest-port-test.cc b/external/googletest/googletest/test/googletest-port-test.cc
index 556337dc..9f05a019 100644
--- a/external/googletest/googletest/test/googletest-port-test.cc
+++ b/external/googletest/googletest/test/googletest-port-test.cc
@@ -32,12 +32,15 @@
 
 #include "gtest/internal/gtest-port.h"
 
-#if GTEST_OS_MAC
+#ifdef GTEST_OS_MAC
 #include <time.h>
 #endif  // GTEST_OS_MAC
 
+#include <chrono>  // NOLINT
 #include <list>
 #include <memory>
+#include <string>
+#include <thread>   // NOLINT
 #include <utility>  // For std::pair and std::make_pair.
 #include <vector>
 
@@ -94,7 +97,7 @@ class Base {
   explicit Base(int n) : member_(n) {}
   Base(const Base&) = default;
   Base& operator=(const Base&) = default;
-  virtual ~Base() {}
+  virtual ~Base() = default;
   int member() { return member_; }
 
  private:
@@ -278,9 +281,11 @@ TEST(FormatCompilerIndependentFileLocationTest, FormatsUknownFileAndLine) {
   EXPECT_EQ("unknown file", FormatCompilerIndependentFileLocation(nullptr, -1));
 }
 
-#if GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_QNX || GTEST_OS_FUCHSIA || \
-    GTEST_OS_DRAGONFLY || GTEST_OS_FREEBSD || GTEST_OS_GNU_KFREEBSD ||    \
-    GTEST_OS_NETBSD || GTEST_OS_OPENBSD
+#if defined(GTEST_OS_LINUX) || defined(GTEST_OS_MAC) ||           \
+    defined(GTEST_OS_QNX) || defined(GTEST_OS_FUCHSIA) ||         \
+    defined(GTEST_OS_DRAGONFLY) || defined(GTEST_OS_FREEBSD) ||   \
+    defined(GTEST_OS_GNU_KFREEBSD) || defined(GTEST_OS_NETBSD) || \
+    defined(GTEST_OS_OPENBSD) || defined(GTEST_OS_GNU_HURD)
 void* ThreadFunc(void* data) {
   internal::Mutex* mutex = static_cast<internal::Mutex*>(data);
   mutex->Lock();
@@ -289,35 +294,61 @@ void* ThreadFunc(void* data) {
 }
 
 TEST(GetThreadCountTest, ReturnsCorrectValue) {
-  const size_t starting_count = GetThreadCount();
-  pthread_t thread_id;
+  size_t starting_count;
+  size_t thread_count_after_create;
+  size_t thread_count_after_join = 0;
+
+  // We can't guarantee that no other thread was created or destroyed between
+  // any two calls to GetThreadCount(). We make multiple attempts, hoping that
+  // background noise is not constant and we would see the "right" values at
+  // some point.
+  for (int attempt = 0; attempt < 20; ++attempt) {
+    starting_count = GetThreadCount();
+    pthread_t thread_id;
+
+    internal::Mutex mutex;
+    {
+      internal::MutexLock lock(&mutex);
+      pthread_attr_t attr;
+      ASSERT_EQ(0, pthread_attr_init(&attr));
+      ASSERT_EQ(0, pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE));
 
-  internal::Mutex mutex;
-  {
-    internal::MutexLock lock(&mutex);
-    pthread_attr_t attr;
-    ASSERT_EQ(0, pthread_attr_init(&attr));
-    ASSERT_EQ(0, pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE));
-
-    const int status = pthread_create(&thread_id, &attr, &ThreadFunc, &mutex);
-    ASSERT_EQ(0, pthread_attr_destroy(&attr));
-    ASSERT_EQ(0, status);
-    EXPECT_EQ(starting_count + 1, GetThreadCount());
-  }
+      const int status = pthread_create(&thread_id, &attr, &ThreadFunc, &mutex);
+      ASSERT_EQ(0, pthread_attr_destroy(&attr));
+      ASSERT_EQ(0, status);
+
+      thread_count_after_create = GetThreadCount();
+    }
 
-  void* dummy;
-  ASSERT_EQ(0, pthread_join(thread_id, &dummy));
+    void* dummy;
+    ASSERT_EQ(0, pthread_join(thread_id, &dummy));
+
+    // Join before we decide whether we need to retry the test. Retry if an
+    // arbitrary other thread was created or destroyed in the meantime.
+    if (thread_count_after_create != starting_count + 1) continue;
+
+    // The OS may not immediately report the updated thread count after
+    // joining a thread, causing flakiness in this test. To counter that, we
+    // wait for up to .5 seconds for the OS to report the correct value.
+    bool thread_count_matches = false;
+    for (int i = 0; i < 5; ++i) {
+      thread_count_after_join = GetThreadCount();
+      if (thread_count_after_join == starting_count) {
+        thread_count_matches = true;
+        break;
+      }
+
+      std::this_thread::sleep_for(std::chrono::milliseconds(100));
+    }
 
-  // The OS may not immediately report the updated thread count after
-  // joining a thread, causing flakiness in this test. To counter that, we
-  // wait for up to .5 seconds for the OS to report the correct value.
-  for (int i = 0; i < 5; ++i) {
-    if (GetThreadCount() == starting_count) break;
+    // Retry if an arbitrary other thread was created or destroyed.
+    if (!thread_count_matches) continue;
 
-    SleepMilliseconds(100);
+    break;
   }
 
-  EXPECT_EQ(starting_count, GetThreadCount());
+  EXPECT_EQ(thread_count_after_create, starting_count + 1);
+  EXPECT_EQ(thread_count_after_join, starting_count);
 }
 #else
 TEST(GetThreadCountTest, ReturnsZeroWhenUnableToCountThreads) {
@@ -330,7 +361,7 @@ TEST(GtestCheckDeathTest, DiesWithCorrectOutputOnFailure) {
   const char regex[] =
 #ifdef _MSC_VER
       "googletest-port-test\\.cc\\(\\d+\\):"
-#elif GTEST_USES_POSIX_RE
+#elif defined(GTEST_USES_POSIX_RE)
       "googletest-port-test\\.cc:[0-9]+"
 #else
       "googletest-port-test\\.cc:\\d+"
@@ -341,7 +372,7 @@ TEST(GtestCheckDeathTest, DiesWithCorrectOutputOnFailure) {
                             regex);
 }
 
-#if GTEST_HAS_DEATH_TEST
+#ifdef GTEST_HAS_DEATH_TEST
 
 TEST(GtestCheckDeathTest, LivesSilentlyOnSuccess) {
   EXPECT_EXIT(
@@ -359,20 +390,16 @@ TEST(GtestCheckDeathTest, LivesSilentlyOnSuccess) {
 // the platform. The test will produce compiler errors in case of failure.
 // For simplicity, we only cover the most important platforms here.
 TEST(RegexEngineSelectionTest, SelectsCorrectRegexEngine) {
-#if !GTEST_USES_PCRE
-#if GTEST_HAS_POSIX_RE
-
+#ifdef GTEST_HAS_ABSL
+  EXPECT_TRUE(GTEST_USES_RE2);
+#elif GTEST_HAS_POSIX_RE
   EXPECT_TRUE(GTEST_USES_POSIX_RE);
-
 #else
-
   EXPECT_TRUE(GTEST_USES_SIMPLE_RE);
-
 #endif
-#endif  // !GTEST_USES_PCRE
 }
 
-#if GTEST_USES_POSIX_RE
+#ifdef GTEST_USES_POSIX_RE
 
 template <typename Str>
 class RETest : public ::testing::Test {};
@@ -429,7 +456,7 @@ TYPED_TEST(RETest, PartialMatchWorks) {
   EXPECT_FALSE(RE::PartialMatch(TypeParam("zza"), re));
 }
 
-#elif GTEST_USES_SIMPLE_RE
+#elif defined(GTEST_USES_SIMPLE_RE)
 
 TEST(IsInSetTest, NulCharIsNotInAnySet) {
   EXPECT_FALSE(IsInSet('\0', ""));
@@ -891,7 +918,7 @@ TEST(RETest, PartialMatchWorks) {
 
 #endif  // GTEST_USES_POSIX_RE
 
-#if !GTEST_OS_WINDOWS_MOBILE
+#ifndef GTEST_OS_WINDOWS_MOBILE
 
 TEST(CaptureTest, CapturesStdout) {
   CaptureStdout();
@@ -952,14 +979,14 @@ TEST(ThreadLocalTest, SingleParamConstructorInitializesToParam) {
   EXPECT_EQ(&i, t2.get());
 }
 
-class NoDefaultContructor {
+class NoDefaultConstructor {
  public:
-  explicit NoDefaultContructor(const char*) {}
-  NoDefaultContructor(const NoDefaultContructor&) {}
+  explicit NoDefaultConstructor(const char*) {}
+  NoDefaultConstructor(const NoDefaultConstructor&) = default;
 };
 
 TEST(ThreadLocalTest, ValueDefaultContructorIsNotRequiredForParamVersion) {
-  ThreadLocal<NoDefaultContructor> bar(NoDefaultContructor("foo"));
+  ThreadLocal<NoDefaultConstructor> bar(NoDefaultConstructor("foo"));
   bar.pointer();
 }
 
@@ -984,7 +1011,7 @@ TEST(ThreadLocalTest, PointerAndConstPointerReturnSameValue) {
   EXPECT_EQ(thread_local_string.pointer(), const_thread_local_string.pointer());
 }
 
-#if GTEST_IS_THREADSAFE
+#ifdef GTEST_IS_THREADSAFE
 
 void AddTwo(int* param) { *param += 2; }
 
@@ -1023,7 +1050,7 @@ class AtomicCounterWithMutex {
     int temp = value_;
     {
       // We need to put up a memory barrier to prevent reads and writes to
-      // value_ rearranged with the call to SleepMilliseconds when observed
+      // value_ rearranged with the call to sleep_for when observed
       // from other threads.
 #if GTEST_HAS_PTHREAD
       // On POSIX, locking a mutex puts up a memory barrier.  We cannot use
@@ -1034,15 +1061,17 @@ class AtomicCounterWithMutex {
           pthread_mutex_init(&memory_barrier_mutex, nullptr));
       GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_lock(&memory_barrier_mutex));
 
-      SleepMilliseconds(static_cast<int>(random_.Generate(30)));
+      std::this_thread::sleep_for(
+          std::chrono::milliseconds(random_.Generate(30)));
 
       GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_unlock(&memory_barrier_mutex));
       GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_destroy(&memory_barrier_mutex));
-#elif GTEST_OS_WINDOWS
+#elif defined(GTEST_OS_WINDOWS)
       // On Windows, performing an interlocked access puts up a memory barrier.
       volatile LONG dummy = 0;
       ::InterlockedIncrement(&dummy);
-      SleepMilliseconds(static_cast<int>(random_.Generate(30)));
+      std::this_thread::sleep_for(
+          std::chrono::milliseconds(random_.Generate(30)));
       ::InterlockedIncrement(&dummy);
 #else
 #error "Memory barrier not implemented on this platform."
@@ -1075,9 +1104,9 @@ TEST(MutexTest, OnlyOneThreadCanLockAtATime) {
   // Creates and runs kThreadCount threads that increment locked_counter
   // kCycleCount times each.
   for (int i = 0; i < kThreadCount; ++i) {
-    counting_threads[i].reset(new ThreadType(
+    counting_threads[i] = std::make_unique<ThreadType>(
         &CountingThreadFunc, make_pair(&locked_counter, kCycleCount),
-        &threads_can_start));
+        &threads_can_start);
   }
   threads_can_start.Notify();
   for (int i = 0; i < kThreadCount; ++i) counting_threads[i]->Join();
@@ -1119,14 +1148,14 @@ class DestructorCall {
  public:
   DestructorCall() {
     invoked_ = false;
-#if GTEST_OS_WINDOWS
+#ifdef GTEST_OS_WINDOWS
     wait_event_.Reset(::CreateEvent(NULL, TRUE, FALSE, NULL));
     GTEST_CHECK_(wait_event_.Get() != NULL);
 #endif
   }
 
   bool CheckDestroyed() const {
-#if GTEST_OS_WINDOWS
+#ifdef GTEST_OS_WINDOWS
     if (::WaitForSingleObject(wait_event_.Get(), 1000) != WAIT_OBJECT_0)
       return false;
 #endif
@@ -1135,7 +1164,7 @@ class DestructorCall {
 
   void ReportDestroyed() {
     invoked_ = true;
-#if GTEST_OS_WINDOWS
+#ifdef GTEST_OS_WINDOWS
     ::SetEvent(wait_event_.Get());
 #endif
   }
@@ -1151,12 +1180,13 @@ class DestructorCall {
 
  private:
   bool invoked_;
-#if GTEST_OS_WINDOWS
+#ifdef GTEST_OS_WINDOWS
   AutoHandle wait_event_;
 #endif
   static std::vector<DestructorCall*>* const list_;
 
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(DestructorCall);
+  DestructorCall(const DestructorCall&) = delete;
+  DestructorCall& operator=(const DestructorCall&) = delete;
 };
 
 std::vector<DestructorCall*>* const DestructorCall::list_ =
@@ -1250,12 +1280,12 @@ TEST(ThreadLocalTest, ThreadLocalMutationsAffectOnlyCurrentThread) {
 
 #endif  // GTEST_IS_THREADSAFE
 
-#if GTEST_OS_WINDOWS
+#ifdef GTEST_OS_WINDOWS
 TEST(WindowsTypesTest, HANDLEIsVoidStar) {
   StaticAssertTypeEq<HANDLE, void*>();
 }
 
-#if GTEST_OS_WINDOWS_MINGW && !defined(__MINGW64_VERSION_MAJOR)
+#if defined(GTEST_OS_WINDOWS_MINGW) && !defined(__MINGW64_VERSION_MAJOR)
 TEST(WindowsTypesTest, _CRITICAL_SECTIONIs_CRITICAL_SECTION) {
   StaticAssertTypeEq<CRITICAL_SECTION, _CRITICAL_SECTION>();
 }
diff --git a/external/googletest/googletest/test/googletest-printers-test.cc b/external/googletest/googletest/test/googletest-printers-test.cc
index e1e8e1c7..52b2c497 100644
--- a/external/googletest/googletest/test/googletest-printers-test.cc
+++ b/external/googletest/googletest/test/googletest-printers-test.cc
@@ -27,7 +27,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
 // Google Test - The Google C++ Testing and Mocking Framework
 //
 // This file tests the universal value printer.
@@ -38,13 +37,16 @@
 #include <cstring>
 #include <deque>
 #include <forward_list>
+#include <functional>
 #include <limits>
 #include <list>
 #include <map>
 #include <memory>
+#include <ostream>
 #include <set>
 #include <sstream>
 #include <string>
+#include <tuple>
 #include <unordered_map>
 #include <unordered_set>
 #include <utility>
@@ -52,34 +54,37 @@
 
 #include "gtest/gtest-printers.h"
 #include "gtest/gtest.h"
+#include "gtest/internal/gtest-port.h"
+
+#ifdef GTEST_HAS_ABSL
+#include "absl/strings/str_format.h"
+#endif
+
+#if GTEST_INTERNAL_HAS_STD_SPAN
+#include <span>  // NOLINT
+#endif  // GTEST_INTERNAL_HAS_STD_SPAN
+
+#if GTEST_INTERNAL_HAS_COMPARE_LIB
+#include <compare>  // NOLINT
+#endif              // GTEST_INTERNAL_HAS_COMPARE_LIB
 
 // Some user-defined types for testing the universal value printer.
 
 // An anonymous enum type.
-enum AnonymousEnum {
-  kAE1 = -1,
-  kAE2 = 1
-};
+enum AnonymousEnum { kAE1 = -1, kAE2 = 1 };
 
 // An enum without a user-defined printer.
-enum EnumWithoutPrinter {
-  kEWP1 = -2,
-  kEWP2 = 42
-};
+enum EnumWithoutPrinter { kEWP1 = -2, kEWP2 = 42 };
 
 // An enum with a << operator.
-enum EnumWithStreaming {
-  kEWS1 = 10
-};
+enum EnumWithStreaming { kEWS1 = 10 };
 
 std::ostream& operator<<(std::ostream& os, EnumWithStreaming e) {
   return os << (e == kEWS1 ? "kEWS1" : "invalid");
 }
 
 // An enum with a PrintTo() function.
-enum EnumWithPrintTo {
-  kEWPT1 = 1
-};
+enum EnumWithPrintTo { kEWPT1 = 1 };
 
 void PrintTo(EnumWithPrintTo e, std::ostream* os) {
   *os << (e == kEWPT1 ? "kEWPT1" : "invalid");
@@ -108,6 +113,7 @@ template <typename T>
 class UnprintableTemplateInGlobal {
  public:
   UnprintableTemplateInGlobal() : value_() {}
+
  private:
   T value_;
 };
@@ -115,7 +121,10 @@ class UnprintableTemplateInGlobal {
 // A user-defined streamable type in the global namespace.
 class StreamableInGlobal {
  public:
-  virtual ~StreamableInGlobal() {}
+  StreamableInGlobal() = default;
+  StreamableInGlobal(const StreamableInGlobal&) = default;
+  StreamableInGlobal& operator=(const StreamableInGlobal&) = default;
+  virtual ~StreamableInGlobal() = default;
 };
 
 inline void operator<<(::std::ostream& os, const StreamableInGlobal& /* x */) {
@@ -126,6 +135,19 @@ void operator<<(::std::ostream& os, const StreamableInGlobal* /* x */) {
   os << "StreamableInGlobal*";
 }
 
+#ifdef GTEST_HAS_ABSL
+// A user-defined type with AbslStringify
+struct Point {
+  template <typename Sink>
+  friend void AbslStringify(Sink& sink, const Point& p) {
+    absl::Format(&sink, "(%d, %d)", p.x, p.y);
+  }
+
+  int x = 10;
+  int y = 20;
+};
+#endif
+
 namespace foo {
 
 // A user-defined unprintable type in a user namespace.
@@ -133,6 +155,7 @@ class UnprintableInFoo {
  public:
   UnprintableInFoo() : z_(0) { memcpy(xy_, "\xEF\x12\x0\x0\x34\xAB\x0\x0", 8); }
   double z() const { return z_; }
+
  private:
   char xy_[8];
   double z_;
@@ -149,8 +172,7 @@ void PrintTo(const PrintableViaPrintTo& x, ::std::ostream* os) {
 }
 
 // A type with a user-defined << for printing its pointer.
-struct PointerPrintable {
-};
+struct PointerPrintable {};
 
 ::std::ostream& operator<<(::std::ostream& os,
                            const PointerPrintable* /* x */) {
@@ -164,6 +186,7 @@ class PrintableViaPrintToTemplate {
   explicit PrintableViaPrintToTemplate(const T& a_value) : value_(a_value) {}
 
   const T& value() const { return value_; }
+
  private:
   T value_;
 };
@@ -180,6 +203,7 @@ class StreamableTemplateInFoo {
   StreamableTemplateInFoo() : value_() {}
 
   const T& value() const { return value_; }
+
  private:
   T value_;
 };
@@ -201,6 +225,11 @@ OutputStream& operator<<(OutputStream& os,
   return os;
 }
 
+struct StreamableInLocal {};
+void operator<<(::std::ostream& os, const StreamableInLocal& /* x */) {
+  os << "StreamableInLocal";
+}
+
 // A user-defined streamable but recursively-defined container type in
 // a user namespace, it mimics therefore std::filesystem::path or
 // boost::filesystem::path.
@@ -216,7 +245,7 @@ class PathLike {
   using value_type = char;
   using const_iterator = iterator;
 
-  PathLike() {}
+  PathLike() = default;
 
   iterator begin() const { return iterator(); }
   iterator end() const { return iterator(); }
@@ -255,7 +284,6 @@ class UniversalPrinter<Wrapper<T>> {
 };
 }  // namespace internal
 
-
 namespace gtest_printers_test {
 
 using ::std::deque;
@@ -269,7 +297,6 @@ using ::std::set;
 using ::std::vector;
 using ::testing::PrintToString;
 using ::testing::internal::FormatForComparisonFailureMessage;
-using ::testing::internal::ImplicitCast_;
 using ::testing::internal::NativeArray;
 using ::testing::internal::RelationToSourceReference;
 using ::testing::internal::Strings;
@@ -319,6 +346,11 @@ TEST(PrintEnumTest, EnumWithPrintTo) {
   EXPECT_EQ("invalid", Print(static_cast<EnumWithPrintTo>(0)));
 }
 
+#ifdef GTEST_HAS_ABSL
+// Tests printing a class that defines AbslStringify
+TEST(PrintClassTest, AbslStringify) { EXPECT_EQ("(10, 20)", Print(Point())); }
+#endif
+
 // Tests printing a class implicitly convertible to BiggestInt.
 
 TEST(PrintClassTest, BiggestIntConvertible) {
@@ -350,29 +382,21 @@ TEST(PrintCharTest, PlainChar) {
 // signed char.
 TEST(PrintCharTest, SignedChar) {
   EXPECT_EQ("'\\0'", Print(static_cast<signed char>('\0')));
-  EXPECT_EQ("'\\xCE' (-50)",
-            Print(static_cast<signed char>(-50)));
+  EXPECT_EQ("'\\xCE' (-50)", Print(static_cast<signed char>(-50)));
 }
 
 // unsigned char.
 TEST(PrintCharTest, UnsignedChar) {
   EXPECT_EQ("'\\0'", Print(static_cast<unsigned char>('\0')));
-  EXPECT_EQ("'b' (98, 0x62)",
-            Print(static_cast<unsigned char>('b')));
+  EXPECT_EQ("'b' (98, 0x62)", Print(static_cast<unsigned char>('b')));
 }
 
-TEST(PrintCharTest, Char16) {
-  EXPECT_EQ("U+0041", Print(u'A'));
-}
+TEST(PrintCharTest, Char16) { EXPECT_EQ("U+0041", Print(u'A')); }
 
-TEST(PrintCharTest, Char32) {
-  EXPECT_EQ("U+0041", Print(U'A'));
-}
+TEST(PrintCharTest, Char32) { EXPECT_EQ("U+0041", Print(U'A')); }
 
-#ifdef __cpp_char8_t
-TEST(PrintCharTest, Char8) {
-  EXPECT_EQ("U+0041", Print(u8'A'));
-}
+#ifdef __cpp_lib_char8_t
+TEST(PrintCharTest, Char8) { EXPECT_EQ("U+0041", Print(u8'A')); }
 #endif
 
 // Tests printing other simple, built-in types.
@@ -414,8 +438,8 @@ TEST(PrintTypeSizeTest, Wchar_t) {
 TEST(PrintBuiltInTypeTest, Integer) {
   EXPECT_EQ("'\\xFF' (255)", Print(static_cast<unsigned char>(255)));  // uint8
   EXPECT_EQ("'\\x80' (-128)", Print(static_cast<signed char>(-128)));  // int8
-  EXPECT_EQ("65535", Print(std::numeric_limits<uint16_t>::max()));  // uint16
-  EXPECT_EQ("-32768", Print(std::numeric_limits<int16_t>::min()));  // int16
+  EXPECT_EQ("65535", Print(std::numeric_limits<uint16_t>::max()));     // uint16
+  EXPECT_EQ("-32768", Print(std::numeric_limits<int16_t>::min()));     // int16
   EXPECT_EQ("4294967295",
             Print(std::numeric_limits<uint32_t>::max()));  // uint32
   EXPECT_EQ("-2147483648",
@@ -424,7 +448,7 @@ TEST(PrintBuiltInTypeTest, Integer) {
             Print(std::numeric_limits<uint64_t>::max()));  // uint64
   EXPECT_EQ("-9223372036854775808",
             Print(std::numeric_limits<int64_t>::min()));  // int64
-#ifdef __cpp_char8_t
+#ifdef __cpp_lib_char8_t
   EXPECT_EQ("U+0000",
             Print(std::numeric_limits<char8_t>::min()));  // char8_t
   EXPECT_EQ("U+00FF",
@@ -443,18 +467,54 @@ TEST(PrintBuiltInTypeTest, Integer) {
 // Size types.
 TEST(PrintBuiltInTypeTest, Size_t) {
   EXPECT_EQ("1", Print(sizeof('a')));  // size_t.
-#if !GTEST_OS_WINDOWS
+#ifndef GTEST_OS_WINDOWS
   // Windows has no ssize_t type.
   EXPECT_EQ("-2", Print(static_cast<ssize_t>(-2)));  // ssize_t.
-#endif  // !GTEST_OS_WINDOWS
+#endif                                               // !GTEST_OS_WINDOWS
 }
 
+// gcc/clang __{u,}int128_t values.
+#if defined(__SIZEOF_INT128__)
+TEST(PrintBuiltInTypeTest, Int128) {
+  // Small ones
+  EXPECT_EQ("0", Print(__int128_t{0}));
+  EXPECT_EQ("0", Print(__uint128_t{0}));
+  EXPECT_EQ("12345", Print(__int128_t{12345}));
+  EXPECT_EQ("12345", Print(__uint128_t{12345}));
+  EXPECT_EQ("-12345", Print(__int128_t{-12345}));
+
+  // Large ones
+  EXPECT_EQ("340282366920938463463374607431768211455", Print(~__uint128_t{}));
+  __int128_t max_128 = static_cast<__int128_t>(~__uint128_t{} / 2);
+  EXPECT_EQ("-170141183460469231731687303715884105728", Print(~max_128));
+  EXPECT_EQ("170141183460469231731687303715884105727", Print(max_128));
+}
+#endif  // __SIZEOF_INT128__
+
 // Floating-points.
 TEST(PrintBuiltInTypeTest, FloatingPoints) {
-  EXPECT_EQ("1.5", Print(1.5f));   // float
+  // float (32-bit precision)
+  EXPECT_EQ("1.5", Print(1.5f));
+
+  EXPECT_EQ("1.0999999", Print(1.09999990f));
+  EXPECT_EQ("1.1", Print(1.10000002f));
+  EXPECT_EQ("1.10000014", Print(1.10000014f));
+  EXPECT_EQ("9e+09", Print(9e9f));
+
+  // double
   EXPECT_EQ("-2.5", Print(-2.5));  // double
 }
 
+#if GTEST_HAS_RTTI
+TEST(PrintBuiltInTypeTest, TypeInfo) {
+  struct MyStruct {};
+  auto res = Print(typeid(MyStruct{}));
+  // We can't guarantee that we can demangle the name, but either name should
+  // contain the substring "MyStruct".
+  EXPECT_NE(res.find("MyStruct"), res.npos) << res;
+}
+#endif  // GTEST_HAS_RTTI
+
 // Since ::std::stringstream::operator<<(const void *) formats the pointer
 // output differently with different compilers, we have to create the expected
 // output first and use it as our expectation.
@@ -488,12 +548,13 @@ TEST(PrintCStringTest, Null) {
 // Tests that C strings are escaped properly.
 TEST(PrintCStringTest, EscapesProperly) {
   const char* p = "'\"?\\\a\b\f\n\r\t\v\x7F\xFF a";
-  EXPECT_EQ(PrintPointer(p) + " pointing to \"'\\\"?\\\\\\a\\b\\f"
-            "\\n\\r\\t\\v\\x7F\\xFF a\"",
+  EXPECT_EQ(PrintPointer(p) +
+                " pointing to \"'\\\"?\\\\\\a\\b\\f"
+                "\\n\\r\\t\\v\\x7F\\xFF a\"",
             Print(p));
 }
 
-#ifdef __cpp_char8_t
+#ifdef __cpp_lib_char8_t
 // const char8_t*.
 TEST(PrintU8StringTest, Const) {
   const char8_t* p = u8"界";
@@ -514,6 +575,8 @@ TEST(PrintU8StringTest, Null) {
 }
 
 // Tests that u8 strings are escaped properly.
+// TODO(b/396121064) - Fix this test under MSVC
+#ifndef _MSC_VER
 TEST(PrintU8StringTest, EscapesProperly) {
   const char8_t* p = u8"'\"?\\\a\b\f\n\r\t\v\x7F\xFF hello 世界";
   EXPECT_EQ(PrintPointer(p) +
@@ -521,7 +584,8 @@ TEST(PrintU8StringTest, EscapesProperly) {
                 "hello \\xE4\\xB8\\x96\\xE7\\x95\\x8C\"",
             Print(p));
 }
-#endif
+#endif  // _MSC_VER
+#endif  // __cpp_lib_char8_t
 
 // const char16_t*.
 TEST(PrintU16StringTest, Const) {
@@ -608,10 +672,12 @@ TEST(PrintWideCStringTest, Null) {
 
 // Tests that wide C strings are escaped properly.
 TEST(PrintWideCStringTest, EscapesProperly) {
-  const wchar_t s[] = {'\'', '"', '?', '\\', '\a', '\b', '\f', '\n', '\r',
-                       '\t', '\v', 0xD3, 0x576, 0x8D3, 0xC74D, ' ', 'a', '\0'};
-  EXPECT_EQ(PrintPointer(s) + " pointing to L\"'\\\"?\\\\\\a\\b\\f"
-            "\\n\\r\\t\\v\\xD3\\x576\\x8D3\\xC74D a\"",
+  const wchar_t s[] = {'\'',  '"',   '?',    '\\', '\a', '\b',
+                       '\f',  '\n',  '\r',   '\t', '\v', 0xD3,
+                       0x576, 0x8D3, 0xC74D, ' ',  'a',  '\0'};
+  EXPECT_EQ(PrintPointer(s) +
+                " pointing to L\"'\\\"?\\\\\\a\\b\\f"
+                "\\n\\r\\t\\v\\xD3\\x576\\x8D3\\xC74D a\"",
             Print(static_cast<const wchar_t*>(s)));
 }
 #endif  // native wchar_t
@@ -693,10 +759,9 @@ TEST(PrintPointerTest, NonMemberFunctionPointer) {
   // standard disallows casting between pointers to functions and
   // pointers to objects, and some compilers (e.g. GCC 3.4) enforce
   // this limitation.
-  EXPECT_EQ(
-      PrintPointer(reinterpret_cast<const void*>(
-          reinterpret_cast<internal::BiggestInt>(&MyFunction))),
-      Print(&MyFunction));
+  EXPECT_EQ(PrintPointer(reinterpret_cast<const void*>(
+                reinterpret_cast<internal::BiggestInt>(&MyFunction))),
+            Print(&MyFunction));
   int (*p)(bool) = NULL;  // NOLINT
   EXPECT_EQ("NULL", Print(p));
 }
@@ -705,14 +770,13 @@ TEST(PrintPointerTest, NonMemberFunctionPointer) {
 // another.
 template <typename StringType>
 AssertionResult HasPrefix(const StringType& str, const StringType& prefix) {
-  if (str.find(prefix, 0) == 0)
-    return AssertionSuccess();
+  if (str.find(prefix, 0) == 0) return AssertionSuccess();
 
   const bool is_wide_string = sizeof(prefix[0]) > 1;
   const char* const begin_string_quote = is_wide_string ? "L\"" : "\"";
   return AssertionFailure()
-      << begin_string_quote << prefix << "\" is not a prefix of "
-      << begin_string_quote << str << "\"\n";
+         << begin_string_quote << prefix << "\" is not a prefix of "
+         << begin_string_quote << str << "\"\n";
 }
 
 // Tests printing member variable pointers.  Although they are called
@@ -722,7 +786,7 @@ AssertionResult HasPrefix(const StringType& str, const StringType& prefix) {
 
 struct Foo {
  public:
-  virtual ~Foo() {}
+  virtual ~Foo() = default;
   int MyMethod(char x) { return x + 1; }
   virtual char MyVirtualMethod(int /* n */) { return 'a'; }
 
@@ -733,8 +797,7 @@ TEST(PrintPointerTest, MemberVariablePointer) {
   EXPECT_TRUE(HasPrefix(Print(&Foo::value),
                         Print(sizeof(&Foo::value)) + "-byte object "));
   int Foo::*p = NULL;  // NOLINT
-  EXPECT_TRUE(HasPrefix(Print(p),
-                        Print(sizeof(p)) + "-byte object "));
+  EXPECT_TRUE(HasPrefix(Print(p), Print(sizeof(p)) + "-byte object "));
 }
 
 // Tests printing member function pointers.  Although they are called
@@ -748,8 +811,7 @@ TEST(PrintPointerTest, MemberFunctionPointer) {
       HasPrefix(Print(&Foo::MyVirtualMethod),
                 Print(sizeof((&Foo::MyVirtualMethod))) + "-byte object "));
   int (Foo::*p)(char) = NULL;  // NOLINT
-  EXPECT_TRUE(HasPrefix(Print(p),
-                        Print(sizeof(p)) + "-byte object "));
+  EXPECT_TRUE(HasPrefix(Print(p), Print(sizeof(p)) + "-byte object "));
 }
 
 // Tests printing C arrays.
@@ -763,29 +825,26 @@ std::string PrintArrayHelper(T (&a)[N]) {
 
 // One-dimensional array.
 TEST(PrintArrayTest, OneDimensionalArray) {
-  int a[5] = { 1, 2, 3, 4, 5 };
+  int a[5] = {1, 2, 3, 4, 5};
   EXPECT_EQ("{ 1, 2, 3, 4, 5 }", PrintArrayHelper(a));
 }
 
 // Two-dimensional array.
 TEST(PrintArrayTest, TwoDimensionalArray) {
-  int a[2][5] = {
-    { 1, 2, 3, 4, 5 },
-    { 6, 7, 8, 9, 0 }
-  };
+  int a[2][5] = {{1, 2, 3, 4, 5}, {6, 7, 8, 9, 0}};
   EXPECT_EQ("{ { 1, 2, 3, 4, 5 }, { 6, 7, 8, 9, 0 } }", PrintArrayHelper(a));
 }
 
 // Array of const elements.
 TEST(PrintArrayTest, ConstArray) {
-  const bool a[1] = { false };
+  const bool a[1] = {false};
   EXPECT_EQ("{ false }", PrintArrayHelper(a));
 }
 
 // char array without terminating NUL.
 TEST(PrintArrayTest, CharArrayWithNoTerminatingNul) {
   // Array a contains '\0' in the middle and doesn't end with '\0'.
-  char a[] = { 'H', '\0', 'i' };
+  char a[] = {'H', '\0', 'i'};
   EXPECT_EQ("\"H\\0i\" (no terminating NUL)", PrintArrayHelper(a));
 }
 
@@ -795,7 +854,7 @@ TEST(PrintArrayTest, CharArrayWithTerminatingNul) {
   EXPECT_EQ("\"\\0Hi\"", PrintArrayHelper(a));
 }
 
-#ifdef __cpp_char8_t
+#ifdef __cpp_lib_char8_t
 // char_t array without terminating NUL.
 TEST(PrintArrayTest, Char8ArrayWithNoTerminatingNul) {
   // Array a contains '\0' in the middle and doesn't end with '\0'.
@@ -806,9 +865,7 @@ TEST(PrintArrayTest, Char8ArrayWithNoTerminatingNul) {
 // char8_t array with terminating NUL.
 TEST(PrintArrayTest, Char8ArrayWithTerminatingNul) {
   const char8_t a[] = u8"\0世界";
-  EXPECT_EQ(
-      "u8\"\\0\\xE4\\xB8\\x96\\xE7\\x95\\x8C\"",
-      PrintArrayHelper(a));
+  EXPECT_EQ("u8\"\\0\\xE4\\xB8\\x96\\xE7\\x95\\x8C\"", PrintArrayHelper(a));
 }
 #endif
 
@@ -861,7 +918,7 @@ TEST(PrintArrayTest, ObjectArray) {
 
 // Array with many elements.
 TEST(PrintArrayTest, BigArray) {
-  int a[100] = { 1, 2, 3 };
+  int a[100] = {1, 2, 3};
   EXPECT_EQ("{ 1, 2, 3, 0, 0, 0, 0, 0, ..., 0, 0, 0, 0, 0, 0, 0, 0 }",
             PrintArrayHelper(a));
 }
@@ -881,11 +938,14 @@ TEST(PrintStringTest, StringAmbiguousHex) {
   // '\x6', '\x6B', or '\x6BA'.
 
   // a hex escaping sequence following by a decimal digit
-  EXPECT_EQ("\"0\\x12\" \"3\"", Print(::std::string("0\x12" "3")));
+  EXPECT_EQ("\"0\\x12\" \"3\"", Print(::std::string("0\x12"
+                                                    "3")));
   // a hex escaping sequence following by a hex digit (lower-case)
-  EXPECT_EQ("\"mm\\x6\" \"bananas\"", Print(::std::string("mm\x6" "bananas")));
+  EXPECT_EQ("\"mm\\x6\" \"bananas\"", Print(::std::string("mm\x6"
+                                                          "bananas")));
   // a hex escaping sequence following by a hex digit (upper-case)
-  EXPECT_EQ("\"NOM\\x6\" \"BANANA\"", Print(::std::string("NOM\x6" "BANANA")));
+  EXPECT_EQ("\"NOM\\x6\" \"BANANA\"", Print(::std::string("NOM\x6"
+                                                          "BANANA")));
   // a hex escaping sequence following by a non-xdigit
   EXPECT_EQ("\"!\\x5-!\"", Print(::std::string("!\x5-!")));
 }
@@ -895,24 +955,26 @@ TEST(PrintStringTest, StringAmbiguousHex) {
 // ::std::wstring.
 TEST(PrintWideStringTest, StringInStdNamespace) {
   const wchar_t s[] = L"'\"?\\\a\b\f\n\0\r\t\v\xD3\x576\x8D3\xC74D a";
-  const ::std::wstring str(s, sizeof(s)/sizeof(wchar_t));
-  EXPECT_EQ("L\"'\\\"?\\\\\\a\\b\\f\\n\\0\\r\\t\\v"
-            "\\xD3\\x576\\x8D3\\xC74D a\\0\"",
-            Print(str));
+  const ::std::wstring str(s, sizeof(s) / sizeof(wchar_t));
+  EXPECT_EQ(
+      "L\"'\\\"?\\\\\\a\\b\\f\\n\\0\\r\\t\\v"
+      "\\xD3\\x576\\x8D3\\xC74D a\\0\"",
+      Print(str));
 }
 
 TEST(PrintWideStringTest, StringAmbiguousHex) {
   // same for wide strings.
-  EXPECT_EQ("L\"0\\x12\" L\"3\"", Print(::std::wstring(L"0\x12" L"3")));
-  EXPECT_EQ("L\"mm\\x6\" L\"bananas\"",
-            Print(::std::wstring(L"mm\x6" L"bananas")));
-  EXPECT_EQ("L\"NOM\\x6\" L\"BANANA\"",
-            Print(::std::wstring(L"NOM\x6" L"BANANA")));
+  EXPECT_EQ("L\"0\\x12\" L\"3\"", Print(::std::wstring(L"0\x12"
+                                                       L"3")));
+  EXPECT_EQ("L\"mm\\x6\" L\"bananas\"", Print(::std::wstring(L"mm\x6"
+                                                             L"bananas")));
+  EXPECT_EQ("L\"NOM\\x6\" L\"BANANA\"", Print(::std::wstring(L"NOM\x6"
+                                                             L"BANANA")));
   EXPECT_EQ("L\"!\\x5-!\"", Print(::std::wstring(L"!\x5-!")));
 }
 #endif  // GTEST_HAS_STD_WSTRING
 
-#ifdef __cpp_char8_t
+#ifdef __cpp_lib_char8_t
 TEST(PrintStringTest, U8String) {
   std::u8string str = u8"Hello, 世界";
   EXPECT_EQ(str, str);  // Verify EXPECT_EQ compiles with this type.
@@ -1021,7 +1083,6 @@ TEST(PrintStlContainerTest, NonEmptyDeque) {
   EXPECT_EQ("{ 1, 3 }", Print(non_empty));
 }
 
-
 TEST(PrintStlContainerTest, OneElementHashMap) {
   ::std::unordered_map<int, char> map1;
   map1[1] = 'a';
@@ -1037,11 +1098,9 @@ TEST(PrintStlContainerTest, HashMultiMap) {
   const std::string result = Print(map1);
   EXPECT_TRUE(result == "{ (5, true), (5, false) }" ||
               result == "{ (5, false), (5, true) }")
-                  << " where Print(map1) returns \"" << result << "\".";
+      << " where Print(map1) returns \"" << result << "\".";
 }
 
-
-
 TEST(PrintStlContainerTest, HashSet) {
   ::std::unordered_set<int> set1;
   set1.insert(1);
@@ -1050,7 +1109,7 @@ TEST(PrintStlContainerTest, HashSet) {
 
 TEST(PrintStlContainerTest, HashMultiSet) {
   const int kSize = 5;
-  int a[kSize] = { 1, 1, 2, 5, 1 };
+  int a[kSize] = {1, 1, 2, 5, 1};
   ::std::unordered_multiset<int> set1(a, a + kSize);
 
   // Elements of hash_multiset can be printed in any order.
@@ -1066,8 +1125,8 @@ TEST(PrintStlContainerTest, HashMultiSet) {
       ASSERT_NE(isdigit(static_cast<unsigned char>(result[i])), 0);
       numbers.push_back(result[i] - '0');
     } else {
-      EXPECT_EQ(expected_pattern[i], result[i]) << " where result is "
-                                                << result;
+      EXPECT_EQ(expected_pattern[i], result[i])
+          << " where result is " << result;
     }
   }
 
@@ -1077,7 +1136,6 @@ TEST(PrintStlContainerTest, HashMultiSet) {
   EXPECT_TRUE(std::equal(a, a + kSize, numbers.begin()));
 }
 
-
 TEST(PrintStlContainerTest, List) {
   const std::string a[] = {"hello", "world"};
   const list<std::string> strings(a, a + 2);
@@ -1107,20 +1165,19 @@ TEST(PrintStlContainerTest, MultiMap) {
 }
 
 TEST(PrintStlContainerTest, Set) {
-  const unsigned int a[] = { 3, 0, 5 };
+  const unsigned int a[] = {3, 0, 5};
   set<unsigned int> set1(a, a + 3);
   EXPECT_EQ("{ 0, 3, 5 }", Print(set1));
 }
 
 TEST(PrintStlContainerTest, MultiSet) {
-  const int a[] = { 1, 1, 2, 5, 1 };
+  const int a[] = {1, 1, 2, 5, 1};
   multiset<int> set1(a, a + 5);
   EXPECT_EQ("{ 1, 1, 1, 2, 5 }", Print(set1));
 }
 
-
 TEST(PrintStlContainerTest, SinglyLinkedList) {
-  int a[] = { 9, 2, 8 };
+  int a[] = {9, 2, 8};
   const std::forward_list<int> ints(a, a + 3);
   EXPECT_EQ("{ 9, 2, 8 }", Print(ints));
 }
@@ -1137,33 +1194,46 @@ TEST(PrintStlContainerTest, Vector) {
   EXPECT_EQ("{ 1, 2 }", Print(v));
 }
 
+TEST(PrintStlContainerTest, StdSpan) {
+#if GTEST_INTERNAL_HAS_STD_SPAN
+  int a[] = {3, 6, 5};
+  std::span<int> s = a;
+
+  EXPECT_EQ("{ 3, 6, 5 }", Print(s));
+#else
+  GTEST_SKIP() << "Does not have std::span.";
+#endif  // GTEST_INTERNAL_HAS_STD_SPAN
+}
+
 TEST(PrintStlContainerTest, LongSequence) {
-  const int a[100] = { 1, 2, 3 };
+  const int a[100] = {1, 2, 3};
   const vector<int> v(a, a + 100);
-  EXPECT_EQ("{ 1, 2, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "
-            "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ... }", Print(v));
+  EXPECT_EQ(
+      "{ 1, 2, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "
+      "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ... }",
+      Print(v));
 }
 
 TEST(PrintStlContainerTest, NestedContainer) {
-  const int a1[] = { 1, 2 };
-  const int a2[] = { 3, 4, 5 };
+  const int a1[] = {1, 2};
+  const int a2[] = {3, 4, 5};
   const list<int> l1(a1, a1 + 2);
   const list<int> l2(a2, a2 + 3);
 
-  vector<list<int> > v;
+  vector<list<int>> v;
   v.push_back(l1);
   v.push_back(l2);
   EXPECT_EQ("{ { 1, 2 }, { 3, 4, 5 } }", Print(v));
 }
 
 TEST(PrintStlContainerTest, OneDimensionalNativeArray) {
-  const int a[3] = { 1, 2, 3 };
+  const int a[3] = {1, 2, 3};
   NativeArray<int> b(a, 3, RelationToSourceReference());
   EXPECT_EQ("{ 1, 2, 3 }", Print(b));
 }
 
 TEST(PrintStlContainerTest, TwoDimensionalNativeArray) {
-  const int a[2][3] = { { 1, 2, 3 }, { 4, 5, 6 } };
+  const int a[2][3] = {{1, 2, 3}, {4, 5, 6}};
   NativeArray<int[3]> b(a, 2, RelationToSourceReference());
   EXPECT_EQ("{ { 1, 2, 3 }, { 4, 5, 6 } }", Print(b));
 }
@@ -1215,20 +1285,18 @@ TEST(PrintStdTupleTest, VariousSizes) {
       t10(false, 'a', static_cast<short>(3), 4, 5, 1.5F, -2.5, str,  // NOLINT
           nullptr, "10");
   EXPECT_EQ("(false, 'a' (97, 0x61), 3, 4, 5, 1.5, -2.5, " + PrintPointer(str) +
-            " pointing to \"8\", NULL, \"10\")",
+                " pointing to \"8\", NULL, \"10\")",
             Print(t10));
 }
 
 // Nested tuples.
 TEST(PrintStdTupleTest, NestedTuple) {
-  ::std::tuple< ::std::tuple<int, bool>, char> nested(
-      ::std::make_tuple(5, true), 'a');
+  ::std::tuple<::std::tuple<int, bool>, char> nested(::std::make_tuple(5, true),
+                                                     'a');
   EXPECT_EQ("((5, true), 'a' (97, 0x61))", Print(nested));
 }
 
-TEST(PrintNullptrT, Basic) {
-  EXPECT_EQ("(nullptr)", Print(nullptr));
-}
+TEST(PrintNullptrT, Basic) { EXPECT_EQ("(nullptr)", Print(nullptr)); }
 
 TEST(PrintReferenceWrapper, Printable) {
   int x = 5;
@@ -1252,8 +1320,7 @@ TEST(PrintReferenceWrapper, Unprintable) {
 
 // Unprintable types in the global namespace.
 TEST(PrintUnprintableTypeTest, InGlobalNamespace) {
-  EXPECT_EQ("1-byte object <00>",
-            Print(UnprintableTemplateInGlobal<char>()));
+  EXPECT_EQ("1-byte object <00>", Print(UnprintableTemplateInGlobal<char>()));
 }
 
 // Unprintable types in a user namespace.
@@ -1270,14 +1337,15 @@ struct Big {
 };
 
 TEST(PrintUnpritableTypeTest, BigObject) {
-  EXPECT_EQ("257-byte object <00-00 00-00 00-00 00-00 00-00 00-00 "
-            "00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 "
-            "00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 "
-            "00-00 00-00 00-00 00-00 00-00 00-00 ... 00-00 00-00 00-00 "
-            "00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 "
-            "00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 "
-            "00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 00>",
-            Print(Big()));
+  EXPECT_EQ(
+      "257-byte object <00-00 00-00 00-00 00-00 00-00 00-00 "
+      "00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 "
+      "00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 "
+      "00-00 00-00 00-00 00-00 00-00 00-00 ... 00-00 00-00 00-00 "
+      "00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 "
+      "00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 "
+      "00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 00>",
+      Print(Big()));
 }
 
 // Tests printing user-defined streamable types.
@@ -1320,8 +1388,7 @@ TEST(PrintStreamableTypeTest, PathLikeInUserNamespace) {
 
 // Tests printing user-defined types that have a PrintTo() function.
 TEST(PrintPrintableTypeTest, InUserNamespace) {
-  EXPECT_EQ("PrintableViaPrintTo: 0",
-            Print(::foo::PrintableViaPrintTo()));
+  EXPECT_EQ("PrintableViaPrintTo: 0", Print(::foo::PrintableViaPrintTo()));
 }
 
 // Tests printing a pointer to a user-defined type that has a <<
@@ -1343,16 +1410,14 @@ TEST(PrintReferenceTest, PrintsAddressAndValue) {
   int n = 5;
   EXPECT_EQ("@" + PrintPointer(&n) + " 5", PrintByRef(n));
 
-  int a[2][3] = {
-    { 0, 1, 2 },
-    { 3, 4, 5 }
-  };
+  int a[2][3] = {{0, 1, 2}, {3, 4, 5}};
   EXPECT_EQ("@" + PrintPointer(a) + " { { 0, 1, 2 }, { 3, 4, 5 } }",
             PrintByRef(a));
 
   const ::foo::UnprintableInFoo x;
-  EXPECT_EQ("@" + PrintPointer(&x) + " 16-byte object "
-            "<EF-12 00-00 34-AB 00-00 00-00 00-00 00-00 00-00>",
+  EXPECT_EQ("@" + PrintPointer(&x) +
+                " 16-byte object "
+                "<EF-12 00-00 34-AB 00-00 00-00 00-00 00-00 00-00>",
             PrintByRef(x));
 }
 
@@ -1368,33 +1433,29 @@ TEST(PrintReferenceTest, HandlesFunctionPointer) {
   // this limitation.
   const std::string fp_string = PrintPointer(reinterpret_cast<const void*>(
       reinterpret_cast<internal::BiggestInt>(fp)));
-  EXPECT_EQ("@" + fp_pointer_string + " " + fp_string,
-            PrintByRef(fp));
+  EXPECT_EQ("@" + fp_pointer_string + " " + fp_string, PrintByRef(fp));
 }
 
 // Tests that the universal printer prints a member function pointer
 // passed by reference.
 TEST(PrintReferenceTest, HandlesMemberFunctionPointer) {
   int (Foo::*p)(char ch) = &Foo::MyMethod;
-  EXPECT_TRUE(HasPrefix(
-      PrintByRef(p),
-      "@" + PrintPointer(reinterpret_cast<const void*>(&p)) + " " +
-          Print(sizeof(p)) + "-byte object "));
+  EXPECT_TRUE(HasPrefix(PrintByRef(p),
+                        "@" + PrintPointer(reinterpret_cast<const void*>(&p)) +
+                            " " + Print(sizeof(p)) + "-byte object "));
 
   char (Foo::*p2)(int n) = &Foo::MyVirtualMethod;
-  EXPECT_TRUE(HasPrefix(
-      PrintByRef(p2),
-      "@" + PrintPointer(reinterpret_cast<const void*>(&p2)) + " " +
-          Print(sizeof(p2)) + "-byte object "));
+  EXPECT_TRUE(HasPrefix(PrintByRef(p2),
+                        "@" + PrintPointer(reinterpret_cast<const void*>(&p2)) +
+                            " " + Print(sizeof(p2)) + "-byte object "));
 }
 
 // Tests that the universal printer prints a member variable pointer
 // passed by reference.
 TEST(PrintReferenceTest, HandlesMemberVariablePointer) {
   int Foo::*p = &Foo::value;  // NOLINT
-  EXPECT_TRUE(HasPrefix(
-      PrintByRef(p),
-      "@" + PrintPointer(&p) + " " + Print(sizeof(p)) + "-byte object "));
+  EXPECT_TRUE(HasPrefix(PrintByRef(p), "@" + PrintPointer(&p) + " " +
+                                           Print(sizeof(p)) + "-byte object "));
 }
 
 // Tests that FormatForComparisonFailureMessage(), which is used to print
@@ -1403,8 +1464,7 @@ TEST(PrintReferenceTest, HandlesMemberVariablePointer) {
 
 // scalar
 TEST(FormatForComparisonFailureMessageTest, WorksForScalar) {
-  EXPECT_STREQ("123",
-               FormatForComparisonFailureMessage(123, 124).c_str());
+  EXPECT_STREQ("123", FormatForComparisonFailureMessage(123, 124).c_str());
 }
 
 // non-char pointer
@@ -1418,9 +1478,8 @@ TEST(FormatForComparisonFailureMessageTest, WorksForNonCharPointer) {
 TEST(FormatForComparisonFailureMessageTest, FormatsNonCharArrayAsPointer) {
   // In expression 'array == x', 'array' is compared by pointer.
   // Therefore we want to print an array operand as a pointer.
-  int n[] = { 1, 2, 3 };
-  EXPECT_EQ(PrintPointer(n),
-            FormatForComparisonFailureMessage(n, n).c_str());
+  int n[] = {1, 2, 3};
+  EXPECT_EQ(PrintPointer(n), FormatForComparisonFailureMessage(n, n).c_str());
 }
 
 // Tests formatting a char pointer when it's compared with another pointer.
@@ -1436,8 +1495,7 @@ TEST(FormatForComparisonFailureMessageTest, WorksForCharPointerVsPointer) {
 
   // const char*
   const char* s = "hello";
-  EXPECT_EQ(PrintPointer(s),
-            FormatForComparisonFailureMessage(s, s).c_str());
+  EXPECT_EQ(PrintPointer(s), FormatForComparisonFailureMessage(s, s).c_str());
 
   // char*
   char ch = 'a';
@@ -1454,8 +1512,7 @@ TEST(FormatForComparisonFailureMessageTest, WorksForWCharPointerVsPointer) {
 
   // const wchar_t*
   const wchar_t* s = L"hello";
-  EXPECT_EQ(PrintPointer(s),
-            FormatForComparisonFailureMessage(s, s).c_str());
+  EXPECT_EQ(PrintPointer(s), FormatForComparisonFailureMessage(s, s).c_str());
 
   // wchar_t*
   wchar_t ch = L'a';
@@ -1552,13 +1609,11 @@ TEST(FormatForComparisonFailureMessageTest, WorksForWCharArrayVsStdWString) {
 // Useful for testing PrintToString().  We cannot use EXPECT_EQ()
 // there as its implementation uses PrintToString().  The caller must
 // ensure that 'value' has no side effect.
-#define EXPECT_PRINT_TO_STRING_(value, expected_string)         \
-  EXPECT_TRUE(PrintToString(value) == (expected_string))        \
+#define EXPECT_PRINT_TO_STRING_(value, expected_string)  \
+  EXPECT_TRUE(PrintToString(value) == (expected_string)) \
       << " where " #value " prints as " << (PrintToString(value))
 
-TEST(PrintToStringTest, WorksForScalar) {
-  EXPECT_PRINT_TO_STRING_(123, "123");
-}
+TEST(PrintToStringTest, WorksForScalar) { EXPECT_PRINT_TO_STRING_(123, "123"); }
 
 TEST(PrintToStringTest, WorksForPointerToConstChar) {
   const char* p = "hello";
@@ -1583,7 +1638,7 @@ TEST(PrintToStringTest, EscapesForPointerToNonConstChar) {
 }
 
 TEST(PrintToStringTest, WorksForArray) {
-  int n[3] = { 1, 2, 3 };
+  int n[3] = {1, 2, 3};
   EXPECT_PRINT_TO_STRING_(n, "{ 1, 2, 3 }");
 }
 
@@ -1600,8 +1655,8 @@ TEST(PrintToStringTest, WorksForCharArrayWithEmbeddedNul) {
   EXPECT_PRINT_TO_STRING_(mutable_str_with_nul, "\"hello\\0 world\"");
 }
 
-  TEST(PrintToStringTest, ContainsNonLatin) {
-  // Sanity test with valid UTF-8. Prints both in hex and as text.
+TEST(PrintToStringTest, ContainsNonLatin) {
+  // Test with valid UTF-8. Prints both in hex and as text.
   std::string non_ascii_str = ::std::string("오전 4:30");
   EXPECT_PRINT_TO_STRING_(non_ascii_str,
                           "\"\\xEC\\x98\\xA4\\xEC\\xA0\\x84 4:30\"\n"
@@ -1612,62 +1667,86 @@ TEST(PrintToStringTest, WorksForCharArrayWithEmbeddedNul) {
                           "\n    As Text: \"From ä — ẑ\"");
 }
 
+TEST(PrintToStringTest, PrintStreamableInLocal) {
+  EXPECT_STREQ("StreamableInLocal",
+               PrintToString(foo::StreamableInLocal()).c_str());
+}
+
+TEST(PrintToStringTest, PrintReferenceToStreamableInLocal) {
+  foo::StreamableInLocal s;
+  std::reference_wrapper<foo::StreamableInLocal> r(s);
+  EXPECT_STREQ("StreamableInLocal", PrintToString(r).c_str());
+}
+
+TEST(PrintToStringTest, PrintReferenceToStreamableInGlobal) {
+  StreamableInGlobal s;
+  std::reference_wrapper<StreamableInGlobal> r(s);
+  EXPECT_STREQ("StreamableInGlobal", PrintToString(r).c_str());
+}
+
+#ifdef GTEST_HAS_ABSL
+TEST(PrintToStringTest, AbslStringify) {
+  EXPECT_PRINT_TO_STRING_(Point(), "(10, 20)");
+}
+#endif
+
 TEST(IsValidUTF8Test, IllFormedUTF8) {
   // The following test strings are ill-formed UTF-8 and are printed
   // as hex only (or ASCII, in case of ASCII bytes) because IsValidUTF8() is
   // expected to fail, thus output does not contain "As Text:".
 
-  static const char *const kTestdata[][2] = {
-    // 2-byte lead byte followed by a single-byte character.
-    {"\xC3\x74", "\"\\xC3t\""},
-    // Valid 2-byte character followed by an orphan trail byte.
-    {"\xC3\x84\xA4", "\"\\xC3\\x84\\xA4\""},
-    // Lead byte without trail byte.
-    {"abc\xC3", "\"abc\\xC3\""},
-    // 3-byte lead byte, single-byte character, orphan trail byte.
-    {"x\xE2\x70\x94", "\"x\\xE2p\\x94\""},
-    // Truncated 3-byte character.
-    {"\xE2\x80", "\"\\xE2\\x80\""},
-    // Truncated 3-byte character followed by valid 2-byte char.
-    {"\xE2\x80\xC3\x84", "\"\\xE2\\x80\\xC3\\x84\""},
-    // Truncated 3-byte character followed by a single-byte character.
-    {"\xE2\x80\x7A", "\"\\xE2\\x80z\""},
-    // 3-byte lead byte followed by valid 3-byte character.
-    {"\xE2\xE2\x80\x94", "\"\\xE2\\xE2\\x80\\x94\""},
-    // 4-byte lead byte followed by valid 3-byte character.
-    {"\xF0\xE2\x80\x94", "\"\\xF0\\xE2\\x80\\x94\""},
-    // Truncated 4-byte character.
-    {"\xF0\xE2\x80", "\"\\xF0\\xE2\\x80\""},
-     // Invalid UTF-8 byte sequences embedded in other chars.
-    {"abc\xE2\x80\x94\xC3\x74xyc", "\"abc\\xE2\\x80\\x94\\xC3txyc\""},
-    {"abc\xC3\x84\xE2\x80\xC3\x84xyz",
-     "\"abc\\xC3\\x84\\xE2\\x80\\xC3\\x84xyz\""},
-    // Non-shortest UTF-8 byte sequences are also ill-formed.
-    // The classics: xC0, xC1 lead byte.
-    {"\xC0\x80", "\"\\xC0\\x80\""},
-    {"\xC1\x81", "\"\\xC1\\x81\""},
-    // Non-shortest sequences.
-    {"\xE0\x80\x80", "\"\\xE0\\x80\\x80\""},
-    {"\xf0\x80\x80\x80", "\"\\xF0\\x80\\x80\\x80\""},
-    // Last valid code point before surrogate range, should be printed as text,
-    // too.
-    {"\xED\x9F\xBF", "\"\\xED\\x9F\\xBF\"\n    As Text: \"퟿\""},
-    // Start of surrogate lead. Surrogates are not printed as text.
-    {"\xED\xA0\x80", "\"\\xED\\xA0\\x80\""},
-    // Last non-private surrogate lead.
-    {"\xED\xAD\xBF", "\"\\xED\\xAD\\xBF\""},
-    // First private-use surrogate lead.
-    {"\xED\xAE\x80", "\"\\xED\\xAE\\x80\""},
-    // Last private-use surrogate lead.
-    {"\xED\xAF\xBF", "\"\\xED\\xAF\\xBF\""},
-    // Mid-point of surrogate trail.
-    {"\xED\xB3\xBF", "\"\\xED\\xB3\\xBF\""},
-    // First valid code point after surrogate range, should be printed as text,
-    // too.
-    {"\xEE\x80\x80", "\"\\xEE\\x80\\x80\"\n    As Text: \"\""}
-  };
-
-  for (int i = 0; i < int(sizeof(kTestdata)/sizeof(kTestdata[0])); ++i) {
+  static const char* const kTestdata[][2] = {
+      // 2-byte lead byte followed by a single-byte character.
+      {"\xC3\x74", "\"\\xC3t\""},
+      // Valid 2-byte character followed by an orphan trail byte.
+      {"\xC3\x84\xA4", "\"\\xC3\\x84\\xA4\""},
+      // Lead byte without trail byte.
+      {"abc\xC3", "\"abc\\xC3\""},
+      // 3-byte lead byte, single-byte character, orphan trail byte.
+      {"x\xE2\x70\x94", "\"x\\xE2p\\x94\""},
+      // Truncated 3-byte character.
+      {"\xE2\x80", "\"\\xE2\\x80\""},
+      // Truncated 3-byte character followed by valid 2-byte char.
+      {"\xE2\x80\xC3\x84", "\"\\xE2\\x80\\xC3\\x84\""},
+      // Truncated 3-byte character followed by a single-byte character.
+      {"\xE2\x80\x7A", "\"\\xE2\\x80z\""},
+      // 3-byte lead byte followed by valid 3-byte character.
+      {"\xE2\xE2\x80\x94", "\"\\xE2\\xE2\\x80\\x94\""},
+      // 4-byte lead byte followed by valid 3-byte character.
+      {"\xF0\xE2\x80\x94", "\"\\xF0\\xE2\\x80\\x94\""},
+      // Truncated 4-byte character.
+      {"\xF0\xE2\x80", "\"\\xF0\\xE2\\x80\""},
+      // Invalid UTF-8 byte sequences embedded in other chars.
+      {"abc\xE2\x80\x94\xC3\x74xyc", "\"abc\\xE2\\x80\\x94\\xC3txyc\""},
+      {"abc\xC3\x84\xE2\x80\xC3\x84xyz",
+       "\"abc\\xC3\\x84\\xE2\\x80\\xC3\\x84xyz\""},
+      // Non-shortest UTF-8 byte sequences are also ill-formed.
+      // The classics: xC0, xC1 lead byte.
+      {"\xC0\x80", "\"\\xC0\\x80\""},
+      {"\xC1\x81", "\"\\xC1\\x81\""},
+      // Non-shortest sequences.
+      {"\xE0\x80\x80", "\"\\xE0\\x80\\x80\""},
+      {"\xf0\x80\x80\x80", "\"\\xF0\\x80\\x80\\x80\""},
+      // Last valid code point before surrogate range, should be printed as
+      // text,
+      // too.
+      {"\xED\x9F\xBF", "\"\\xED\\x9F\\xBF\"\n    As Text: \"퟿\""},
+      // Start of surrogate lead. Surrogates are not printed as text.
+      {"\xED\xA0\x80", "\"\\xED\\xA0\\x80\""},
+      // Last non-private surrogate lead.
+      {"\xED\xAD\xBF", "\"\\xED\\xAD\\xBF\""},
+      // First private-use surrogate lead.
+      {"\xED\xAE\x80", "\"\\xED\\xAE\\x80\""},
+      // Last private-use surrogate lead.
+      {"\xED\xAF\xBF", "\"\\xED\\xAF\\xBF\""},
+      // Mid-point of surrogate trail.
+      {"\xED\xB3\xBF", "\"\\xED\\xB3\\xBF\""},
+      // First valid code point after surrogate range, should be printed as
+      // text,
+      // too.
+      {"\xEE\x80\x80", "\"\\xEE\\x80\\x80\"\n    As Text: \"\""}};
+
+  for (int i = 0; i < int(sizeof(kTestdata) / sizeof(kTestdata[0])); ++i) {
     EXPECT_PRINT_TO_STRING_(kTestdata[i][0], kTestdata[i][1]);
   }
 }
@@ -1772,7 +1851,8 @@ TEST(UniversalPrintTest, SmartPointers) {
   std::shared_ptr<int> p3(new int(1979));
   EXPECT_EQ("(ptr = " + PrintPointer(p3.get()) + ", value = 1979)",
             PrintToString(p3));
-#if __cpp_lib_shared_ptr_arrays >= 201611L
+#if defined(__cpp_lib_shared_ptr_arrays) && \
+    (__cpp_lib_shared_ptr_arrays >= 201611L)
   std::shared_ptr<int[]> p4(new int[2]);
   EXPECT_EQ("(" + PrintPointer(p4.get()) + ")", PrintToString(p4));
 #endif
@@ -1791,7 +1871,8 @@ TEST(UniversalPrintTest, SmartPointers) {
   EXPECT_EQ("(nullptr)", PrintToString(std::shared_ptr<const int>()));
   EXPECT_EQ("(nullptr)", PrintToString(std::shared_ptr<volatile int>()));
   EXPECT_EQ("(nullptr)", PrintToString(std::shared_ptr<volatile const int>()));
-#if __cpp_lib_shared_ptr_arrays >= 201611L
+#if defined(__cpp_lib_shared_ptr_arrays) && \
+    (__cpp_lib_shared_ptr_arrays >= 201611L)
   EXPECT_EQ("(nullptr)", PrintToString(std::shared_ptr<int[]>()));
   EXPECT_EQ("(nullptr)", PrintToString(std::shared_ptr<const int[]>()));
   EXPECT_EQ("(nullptr)", PrintToString(std::shared_ptr<volatile int[]>()));
@@ -1816,15 +1897,15 @@ TEST(UniversalTersePrintTupleFieldsToStringsTestWithStd, PrintsEmptyTuple) {
 }
 
 TEST(UniversalTersePrintTupleFieldsToStringsTestWithStd, PrintsOneTuple) {
-  Strings result = UniversalTersePrintTupleFieldsToStrings(
-      ::std::make_tuple(1));
+  Strings result =
+      UniversalTersePrintTupleFieldsToStrings(::std::make_tuple(1));
   ASSERT_EQ(1u, result.size());
   EXPECT_EQ("1", result[0]);
 }
 
 TEST(UniversalTersePrintTupleFieldsToStringsTestWithStd, PrintsTwoTuple) {
-  Strings result = UniversalTersePrintTupleFieldsToStrings(
-      ::std::make_tuple(1, 'a'));
+  Strings result =
+      UniversalTersePrintTupleFieldsToStrings(::std::make_tuple(1, 'a'));
   ASSERT_EQ(2u, result.size());
   EXPECT_EQ("1", result[0]);
   EXPECT_EQ("'a' (97, 0x61)", result[1]);
@@ -1873,6 +1954,7 @@ TEST_F(PrintAnyTest, NonEmpty) {
 
 #if GTEST_INTERNAL_HAS_OPTIONAL
 TEST(PrintOptionalTest, Basic) {
+  EXPECT_EQ("(nullopt)", PrintToString(internal::Nullopt()));
   internal::Optional<int> value;
   EXPECT_EQ("(nullopt)", PrintToString(value));
   value = {7};
@@ -1898,6 +1980,26 @@ TEST(PrintOneofTest, Basic) {
       PrintToString(Type(NonPrintable{})));
 }
 #endif  // GTEST_INTERNAL_HAS_VARIANT
+
+#if GTEST_INTERNAL_HAS_COMPARE_LIB
+TEST(PrintOrderingTest, Basic) {
+  EXPECT_EQ("(less)", PrintToString(std::strong_ordering::less));
+  EXPECT_EQ("(greater)", PrintToString(std::strong_ordering::greater));
+  // equal == equivalent for strong_ordering.
+  EXPECT_EQ("(equal)", PrintToString(std::strong_ordering::equivalent));
+  EXPECT_EQ("(equal)", PrintToString(std::strong_ordering::equal));
+
+  EXPECT_EQ("(less)", PrintToString(std::weak_ordering::less));
+  EXPECT_EQ("(greater)", PrintToString(std::weak_ordering::greater));
+  EXPECT_EQ("(equivalent)", PrintToString(std::weak_ordering::equivalent));
+
+  EXPECT_EQ("(less)", PrintToString(std::partial_ordering::less));
+  EXPECT_EQ("(greater)", PrintToString(std::partial_ordering::greater));
+  EXPECT_EQ("(equivalent)", PrintToString(std::partial_ordering::equivalent));
+  EXPECT_EQ("(unordered)", PrintToString(std::partial_ordering::unordered));
+}
+#endif
+
 namespace {
 class string_ref;
 
diff --git a/external/googletest/googletest/test/googletest-setuptestsuite-test.py b/external/googletest/googletest/test/googletest-setuptestsuite-test.py
old mode 100644
new mode 100755
index 6be14dc6..899531f3
--- a/external/googletest/googletest/test/googletest-setuptestsuite-test.py
+++ b/external/googletest/googletest/test/googletest-setuptestsuite-test.py
@@ -31,25 +31,28 @@
 
 """Verifies that SetUpTestSuite and TearDownTestSuite errors are noticed."""
 
-import gtest_test_utils
+from googletest.test import gtest_test_utils
 
 COMMAND = gtest_test_utils.GetTestExecutablePath(
-    'googletest-setuptestsuite-test_')
+    'googletest-setuptestsuite-test_'
+)
 
 
 class GTestSetUpTestSuiteTest(gtest_test_utils.TestCase):
 
-    def testSetupErrorAndTearDownError(self):
-        p = gtest_test_utils.Subprocess(COMMAND)
-        self.assertNotEqual(p.exit_code, 0, msg=p.output)
+  def testSetupErrorAndTearDownError(self):
+    p = gtest_test_utils.Subprocess(COMMAND)
+    self.assertNotEqual(p.exit_code, 0, msg=p.output)
 
-        self.assertIn(
-            '[  FAILED  ] SetupFailTest: SetUpTestSuite or TearDownTestSuite\n'
-            '[  FAILED  ] TearDownFailTest: SetUpTestSuite or TearDownTestSuite\n'
-            '\n'
-            ' 2 FAILED TEST SUITES\n',
-            p.output)
+    self.assertIn(
+        (
+            '[  FAILED  ] SetupFailTest: SetUpTestSuite or TearDownTestSuite\n['
+            '  FAILED  ] TearDownFailTest: SetUpTestSuite or'
+            ' TearDownTestSuite\n\n 2 FAILED TEST SUITES\n'
+        ),
+        p.output,
+    )
 
 
 if __name__ == '__main__':
-    gtest_test_utils.Main()
+  gtest_test_utils.Main()
diff --git a/external/googletest/googletest/test/googletest-setuptestsuite-test_.cc b/external/googletest/googletest/test/googletest-setuptestsuite-test_.cc
index d20899f5..f4c43ccb 100644
--- a/external/googletest/googletest/test/googletest-setuptestsuite-test_.cc
+++ b/external/googletest/googletest/test/googletest-setuptestsuite-test_.cc
@@ -31,14 +31,14 @@
 
 class SetupFailTest : public ::testing::Test {
  protected:
-  static void SetUpTestSuite() { ASSERT_EQ("", "SET_UP_FAIL"); }
+  static void SetUpTestSuite() { ASSERT_STREQ("", "SET_UP_FAIL"); }
 };
 
 TEST_F(SetupFailTest, NoopPassingTest) {}
 
 class TearDownFailTest : public ::testing::Test {
  protected:
-  static void TearDownTestSuite() { ASSERT_EQ("", "TEAR_DOWN_FAIL"); }
+  static void TearDownTestSuite() { ASSERT_STREQ("", "TEAR_DOWN_FAIL"); }
 };
 
 TEST_F(TearDownFailTest, NoopPassingTest) {}
diff --git a/external/googletest/googletest/test/googletest-shuffle-test.py b/external/googletest/googletest/test/googletest-shuffle-test.py
old mode 100644
new mode 100755
index e56db2c8..61e3a15e
--- a/external/googletest/googletest/test/googletest-shuffle-test.py
+++ b/external/googletest/googletest/test/googletest-shuffle-test.py
@@ -31,7 +31,7 @@
 """Verifies that test shuffling works."""
 
 import os
-import gtest_test_utils
+from googletest.test import gtest_test_utils
 
 # Command to run the googletest-shuffle-test_ program.
 COMMAND = gtest_test_utils.GetTestExecutablePath('googletest-shuffle-test_')
@@ -54,271 +54,325 @@
 
 
 def AlsoRunDisabledTestsFlag():
-    return '--gtest_also_run_disabled_tests'
+  return '--gtest_also_run_disabled_tests'
 
 
 def FilterFlag(test_filter):
-    return '--gtest_filter=%s' % (test_filter,)
+  return '--gtest_filter=%s' % (test_filter,)
 
 
 def RepeatFlag(n):
-    return '--gtest_repeat=%s' % (n,)
+  return '--gtest_repeat=%s' % (n,)
 
 
 def ShuffleFlag():
-    return '--gtest_shuffle'
+  return '--gtest_shuffle'
 
 
 def RandomSeedFlag(n):
-    return '--gtest_random_seed=%s' % (n,)
+  return '--gtest_random_seed=%s' % (n,)
 
 
 def RunAndReturnOutput(extra_env, args):
-    """Runs the test program and returns its output."""
+  """Runs the test program and returns its output."""
 
-    environ_copy = os.environ.copy()
-    environ_copy.update(extra_env)
+  environ_copy = os.environ.copy()
+  environ_copy.update(extra_env)
 
-    return gtest_test_utils.Subprocess([COMMAND] + args, env=environ_copy).output
+  return gtest_test_utils.Subprocess([COMMAND] + args, env=environ_copy).output
 
 
 def GetTestsForAllIterations(extra_env, args):
-    """Runs the test program and returns a list of test lists.
+  """Runs the test program and returns a list of test lists.
 
-    Args:
-      extra_env: a map from environment variables to their values
-      args: command line flags to pass to googletest-shuffle-test_
+  Args:
+    extra_env: a map from environment variables to their values
+    args: command line flags to pass to googletest-shuffle-test_
 
-    Returns:
-      A list where the i-th element is the list of tests run in the i-th
-      test iteration.
-    """
+  Returns:
+    A list where the i-th element is the list of tests run in the i-th
+    test iteration.
+  """
 
-    test_iterations = []
-    for line in RunAndReturnOutput(extra_env, args).split('\n'):
-        if line.startswith('----'):
-            tests = []
-            test_iterations.append(tests)
-        elif line.strip():
-            tests.append(line.strip())  # 'TestCaseName.TestName'
+  test_iterations = []
+  for line in RunAndReturnOutput(extra_env, args).split('\n'):
+    if line.startswith('----'):
+      tests = []
+      test_iterations.append(tests)
+    elif line.strip():
+      tests.append(line.strip())  # 'TestCaseName.TestName'
 
-    return test_iterations
+  return test_iterations
 
 
 def GetTestCases(tests):
-    """Returns a list of test cases in the given full test names.
+  """Returns a list of test cases in the given full test names.
 
-    Args:
-      tests: a list of full test names
+  Args:
+    tests: a list of full test names
 
-    Returns:
-      A list of test cases from 'tests', in their original order.
-      Consecutive duplicates are removed.
-    """
+  Returns:
+    A list of test cases from 'tests', in their original order.
+    Consecutive duplicates are removed.
+  """
 
-    test_cases = []
-    for test in tests:
-        test_case = test.split('.')[0]
-        if not test_case in test_cases:
-            test_cases.append(test_case)
+  test_cases = []
+  for test in tests:
+    test_case = test.split('.')[0]
+    if not test_case in test_cases:
+      test_cases.append(test_case)
 
-    return test_cases
+  return test_cases
 
 
 def CalculateTestLists():
-    """Calculates the list of tests run under different flags."""
-
-    if not ALL_TESTS:
-        ALL_TESTS.extend(
-            GetTestsForAllIterations({}, [AlsoRunDisabledTestsFlag()])[0])
-
-    if not ACTIVE_TESTS:
-        ACTIVE_TESTS.extend(GetTestsForAllIterations({}, [])[0])
-
-    if not FILTERED_TESTS:
-        FILTERED_TESTS.extend(
-            GetTestsForAllIterations({}, [FilterFlag(TEST_FILTER)])[0])
-
-    if not SHARDED_TESTS:
-        SHARDED_TESTS.extend(
-            GetTestsForAllIterations({TOTAL_SHARDS_ENV_VAR: '3',
-                                      SHARD_INDEX_ENV_VAR: '1'},
-                                     [])[0])
-
-    if not SHUFFLED_ALL_TESTS:
-        SHUFFLED_ALL_TESTS.extend(GetTestsForAllIterations(
-            {}, [AlsoRunDisabledTestsFlag(), ShuffleFlag(), RandomSeedFlag(1)])[0])
-
-    if not SHUFFLED_ACTIVE_TESTS:
-        SHUFFLED_ACTIVE_TESTS.extend(GetTestsForAllIterations(
-            {}, [ShuffleFlag(), RandomSeedFlag(1)])[0])
-
-    if not SHUFFLED_FILTERED_TESTS:
-        SHUFFLED_FILTERED_TESTS.extend(GetTestsForAllIterations(
-            {}, [ShuffleFlag(), RandomSeedFlag(1), FilterFlag(TEST_FILTER)])[0])
-
-    if not SHUFFLED_SHARDED_TESTS:
-        SHUFFLED_SHARDED_TESTS.extend(
-            GetTestsForAllIterations({TOTAL_SHARDS_ENV_VAR: '3',
-                                      SHARD_INDEX_ENV_VAR: '1'},
-                                     [ShuffleFlag(), RandomSeedFlag(1)])[0])
+  """Calculates the list of tests run under different flags."""
+
+  if not ALL_TESTS:
+    ALL_TESTS.extend(
+        GetTestsForAllIterations({}, [AlsoRunDisabledTestsFlag()])[0]
+    )
+
+  if not ACTIVE_TESTS:
+    ACTIVE_TESTS.extend(GetTestsForAllIterations({}, [])[0])
+
+  if not FILTERED_TESTS:
+    FILTERED_TESTS.extend(
+        GetTestsForAllIterations({}, [FilterFlag(TEST_FILTER)])[0]
+    )
+
+  if not SHARDED_TESTS:
+    SHARDED_TESTS.extend(
+        GetTestsForAllIterations(
+            {TOTAL_SHARDS_ENV_VAR: '3', SHARD_INDEX_ENV_VAR: '1'}, []
+        )[0]
+    )
+
+  if not SHUFFLED_ALL_TESTS:
+    SHUFFLED_ALL_TESTS.extend(
+        GetTestsForAllIterations(
+            {}, [AlsoRunDisabledTestsFlag(), ShuffleFlag(), RandomSeedFlag(1)]
+        )[0]
+    )
+
+  if not SHUFFLED_ACTIVE_TESTS:
+    SHUFFLED_ACTIVE_TESTS.extend(
+        GetTestsForAllIterations({}, [ShuffleFlag(), RandomSeedFlag(1)])[0]
+    )
+
+  if not SHUFFLED_FILTERED_TESTS:
+    SHUFFLED_FILTERED_TESTS.extend(
+        GetTestsForAllIterations(
+            {}, [ShuffleFlag(), RandomSeedFlag(1), FilterFlag(TEST_FILTER)]
+        )[0]
+    )
+
+  if not SHUFFLED_SHARDED_TESTS:
+    SHUFFLED_SHARDED_TESTS.extend(
+        GetTestsForAllIterations(
+            {TOTAL_SHARDS_ENV_VAR: '3', SHARD_INDEX_ENV_VAR: '1'},
+            [ShuffleFlag(), RandomSeedFlag(1)],
+        )[0]
+    )
 
 
 class GTestShuffleUnitTest(gtest_test_utils.TestCase):
-    """Tests test shuffling."""
-
-    def setUp(self):
-        CalculateTestLists()
-
-    def testShufflePreservesNumberOfTests(self):
-        self.assertEqual(len(ALL_TESTS), len(SHUFFLED_ALL_TESTS))
-        self.assertEqual(len(ACTIVE_TESTS), len(SHUFFLED_ACTIVE_TESTS))
-        self.assertEqual(len(FILTERED_TESTS), len(SHUFFLED_FILTERED_TESTS))
-        self.assertEqual(len(SHARDED_TESTS), len(SHUFFLED_SHARDED_TESTS))
-
-    def testShuffleChangesTestOrder(self):
-        self.assert_(SHUFFLED_ALL_TESTS != ALL_TESTS, SHUFFLED_ALL_TESTS)
-        self.assert_(SHUFFLED_ACTIVE_TESTS != ACTIVE_TESTS, SHUFFLED_ACTIVE_TESTS)
-        self.assert_(SHUFFLED_FILTERED_TESTS != FILTERED_TESTS,
-                     SHUFFLED_FILTERED_TESTS)
-        self.assert_(SHUFFLED_SHARDED_TESTS != SHARDED_TESTS,
-                     SHUFFLED_SHARDED_TESTS)
-
-    def testShuffleChangesTestCaseOrder(self):
-        self.assert_(GetTestCases(SHUFFLED_ALL_TESTS) != GetTestCases(ALL_TESTS),
-                     GetTestCases(SHUFFLED_ALL_TESTS))
-        self.assert_(
-            GetTestCases(SHUFFLED_ACTIVE_TESTS) != GetTestCases(ACTIVE_TESTS),
-            GetTestCases(SHUFFLED_ACTIVE_TESTS))
-        self.assert_(
-            GetTestCases(SHUFFLED_FILTERED_TESTS) != GetTestCases(FILTERED_TESTS),
-            GetTestCases(SHUFFLED_FILTERED_TESTS))
-        self.assert_(
-            GetTestCases(SHUFFLED_SHARDED_TESTS) != GetTestCases(SHARDED_TESTS),
-            GetTestCases(SHUFFLED_SHARDED_TESTS))
-
-    def testShuffleDoesNotRepeatTest(self):
-        for test in SHUFFLED_ALL_TESTS:
-            self.assertEqual(1, SHUFFLED_ALL_TESTS.count(test),
-                             '%s appears more than once' % (test,))
-        for test in SHUFFLED_ACTIVE_TESTS:
-            self.assertEqual(1, SHUFFLED_ACTIVE_TESTS.count(test),
-                             '%s appears more than once' % (test,))
-        for test in SHUFFLED_FILTERED_TESTS:
-            self.assertEqual(1, SHUFFLED_FILTERED_TESTS.count(test),
-                             '%s appears more than once' % (test,))
-        for test in SHUFFLED_SHARDED_TESTS:
-            self.assertEqual(1, SHUFFLED_SHARDED_TESTS.count(test),
-                             '%s appears more than once' % (test,))
-
-    def testShuffleDoesNotCreateNewTest(self):
-        for test in SHUFFLED_ALL_TESTS:
-            self.assert_(test in ALL_TESTS, '%s is an invalid test' % (test,))
-        for test in SHUFFLED_ACTIVE_TESTS:
-            self.assert_(test in ACTIVE_TESTS, '%s is an invalid test' % (test,))
-        for test in SHUFFLED_FILTERED_TESTS:
-            self.assert_(test in FILTERED_TESTS, '%s is an invalid test' % (test,))
-        for test in SHUFFLED_SHARDED_TESTS:
-            self.assert_(test in SHARDED_TESTS, '%s is an invalid test' % (test,))
-
-    def testShuffleIncludesAllTests(self):
-        for test in ALL_TESTS:
-            self.assert_(test in SHUFFLED_ALL_TESTS, '%s is missing' % (test,))
-        for test in ACTIVE_TESTS:
-            self.assert_(test in SHUFFLED_ACTIVE_TESTS, '%s is missing' % (test,))
-        for test in FILTERED_TESTS:
-            self.assert_(test in SHUFFLED_FILTERED_TESTS, '%s is missing' % (test,))
-        for test in SHARDED_TESTS:
-            self.assert_(test in SHUFFLED_SHARDED_TESTS, '%s is missing' % (test,))
-
-    def testShuffleLeavesDeathTestsAtFront(self):
-        non_death_test_found = False
-        for test in SHUFFLED_ACTIVE_TESTS:
-            if 'DeathTest.' in test:
-                self.assert_(not non_death_test_found,
-                             '%s appears after a non-death test' % (test,))
-            else:
-                non_death_test_found = True
-
-    def _VerifyTestCasesDoNotInterleave(self, tests):
-        test_cases = []
-        for test in tests:
-            [test_case, _] = test.split('.')
-            if test_cases and test_cases[-1] != test_case:
-                test_cases.append(test_case)
-                self.assertEqual(1, test_cases.count(test_case),
-                                 'Test case %s is not grouped together in %s' %
-                                 (test_case, tests))
-
-    def testShuffleDoesNotInterleaveTestCases(self):
-        self._VerifyTestCasesDoNotInterleave(SHUFFLED_ALL_TESTS)
-        self._VerifyTestCasesDoNotInterleave(SHUFFLED_ACTIVE_TESTS)
-        self._VerifyTestCasesDoNotInterleave(SHUFFLED_FILTERED_TESTS)
-        self._VerifyTestCasesDoNotInterleave(SHUFFLED_SHARDED_TESTS)
-
-    def testShuffleRestoresOrderAfterEachIteration(self):
-        # Get the test lists in all 3 iterations, using random seed 1, 2,
-        # and 3 respectively.  Google Test picks a different seed in each
-        # iteration, and this test depends on the current implementation
-        # picking successive numbers.  This dependency is not ideal, but
-        # makes the test much easier to write.
-        [tests_in_iteration1, tests_in_iteration2, tests_in_iteration3] = (
-            GetTestsForAllIterations(
-                {}, [ShuffleFlag(), RandomSeedFlag(1), RepeatFlag(3)]))
-
-        # Make sure running the tests with random seed 1 gets the same
-        # order as in iteration 1 above.
-        [tests_with_seed1] = GetTestsForAllIterations(
-            {}, [ShuffleFlag(), RandomSeedFlag(1)])
-        self.assertEqual(tests_in_iteration1, tests_with_seed1)
-
-        # Make sure running the tests with random seed 2 gets the same
-        # order as in iteration 2 above.  Success means that Google Test
-        # correctly restores the test order before re-shuffling at the
-        # beginning of iteration 2.
-        [tests_with_seed2] = GetTestsForAllIterations(
-            {}, [ShuffleFlag(), RandomSeedFlag(2)])
-        self.assertEqual(tests_in_iteration2, tests_with_seed2)
-
-        # Make sure running the tests with random seed 3 gets the same
-        # order as in iteration 3 above.  Success means that Google Test
-        # correctly restores the test order before re-shuffling at the
-        # beginning of iteration 3.
-        [tests_with_seed3] = GetTestsForAllIterations(
-            {}, [ShuffleFlag(), RandomSeedFlag(3)])
-        self.assertEqual(tests_in_iteration3, tests_with_seed3)
-
-    def testShuffleGeneratesNewOrderInEachIteration(self):
-        [tests_in_iteration1, tests_in_iteration2, tests_in_iteration3] = (
-            GetTestsForAllIterations(
-                {}, [ShuffleFlag(), RandomSeedFlag(1), RepeatFlag(3)]))
-
-        self.assert_(tests_in_iteration1 != tests_in_iteration2,
-                     tests_in_iteration1)
-        self.assert_(tests_in_iteration1 != tests_in_iteration3,
-                     tests_in_iteration1)
-        self.assert_(tests_in_iteration2 != tests_in_iteration3,
-                     tests_in_iteration2)
-
-    def testShuffleShardedTestsPreservesPartition(self):
-        # If we run M tests on N shards, the same M tests should be run in
-        # total, regardless of the random seeds used by the shards.
-        [tests1] = GetTestsForAllIterations({TOTAL_SHARDS_ENV_VAR: '3',
-                                             SHARD_INDEX_ENV_VAR: '0'},
-                                            [ShuffleFlag(), RandomSeedFlag(1)])
-        [tests2] = GetTestsForAllIterations({TOTAL_SHARDS_ENV_VAR: '3',
-                                             SHARD_INDEX_ENV_VAR: '1'},
-                                            [ShuffleFlag(), RandomSeedFlag(20)])
-        [tests3] = GetTestsForAllIterations({TOTAL_SHARDS_ENV_VAR: '3',
-                                             SHARD_INDEX_ENV_VAR: '2'},
-                                            [ShuffleFlag(), RandomSeedFlag(25)])
-        sorted_sharded_tests = tests1 + tests2 + tests3
-        sorted_sharded_tests.sort()
-        sorted_active_tests = []
-        sorted_active_tests.extend(ACTIVE_TESTS)
-        sorted_active_tests.sort()
-        self.assertEqual(sorted_active_tests, sorted_sharded_tests)
+  """Tests test shuffling."""
+
+  def setUp(self):
+    CalculateTestLists()
+
+  def testShufflePreservesNumberOfTests(self):
+    self.assertEqual(len(ALL_TESTS), len(SHUFFLED_ALL_TESTS))
+    self.assertEqual(len(ACTIVE_TESTS), len(SHUFFLED_ACTIVE_TESTS))
+    self.assertEqual(len(FILTERED_TESTS), len(SHUFFLED_FILTERED_TESTS))
+    self.assertEqual(len(SHARDED_TESTS), len(SHUFFLED_SHARDED_TESTS))
+
+  def testShuffleChangesTestOrder(self):
+    self.assertTrue(SHUFFLED_ALL_TESTS != ALL_TESTS, SHUFFLED_ALL_TESTS)
+    self.assertTrue(
+        SHUFFLED_ACTIVE_TESTS != ACTIVE_TESTS, SHUFFLED_ACTIVE_TESTS
+    )
+    self.assertTrue(
+        SHUFFLED_FILTERED_TESTS != FILTERED_TESTS, SHUFFLED_FILTERED_TESTS
+    )
+    self.assertTrue(
+        SHUFFLED_SHARDED_TESTS != SHARDED_TESTS, SHUFFLED_SHARDED_TESTS
+    )
+
+  def testShuffleChangesTestCaseOrder(self):
+    self.assertTrue(
+        GetTestCases(SHUFFLED_ALL_TESTS) != GetTestCases(ALL_TESTS),
+        GetTestCases(SHUFFLED_ALL_TESTS),
+    )
+    self.assertTrue(
+        GetTestCases(SHUFFLED_ACTIVE_TESTS) != GetTestCases(ACTIVE_TESTS),
+        GetTestCases(SHUFFLED_ACTIVE_TESTS),
+    )
+    self.assertTrue(
+        GetTestCases(SHUFFLED_FILTERED_TESTS) != GetTestCases(FILTERED_TESTS),
+        GetTestCases(SHUFFLED_FILTERED_TESTS),
+    )
+    self.assertTrue(
+        GetTestCases(SHUFFLED_SHARDED_TESTS) != GetTestCases(SHARDED_TESTS),
+        GetTestCases(SHUFFLED_SHARDED_TESTS),
+    )
+
+  def testShuffleDoesNotRepeatTest(self):
+    for test in SHUFFLED_ALL_TESTS:
+      self.assertEqual(
+          1,
+          SHUFFLED_ALL_TESTS.count(test),
+          '%s appears more than once' % (test,),
+      )
+    for test in SHUFFLED_ACTIVE_TESTS:
+      self.assertEqual(
+          1,
+          SHUFFLED_ACTIVE_TESTS.count(test),
+          '%s appears more than once' % (test,),
+      )
+    for test in SHUFFLED_FILTERED_TESTS:
+      self.assertEqual(
+          1,
+          SHUFFLED_FILTERED_TESTS.count(test),
+          '%s appears more than once' % (test,),
+      )
+    for test in SHUFFLED_SHARDED_TESTS:
+      self.assertEqual(
+          1,
+          SHUFFLED_SHARDED_TESTS.count(test),
+          '%s appears more than once' % (test,),
+      )
+
+  def testShuffleDoesNotCreateNewTest(self):
+    for test in SHUFFLED_ALL_TESTS:
+      self.assertTrue(test in ALL_TESTS, '%s is an invalid test' % (test,))
+    for test in SHUFFLED_ACTIVE_TESTS:
+      self.assertTrue(test in ACTIVE_TESTS, '%s is an invalid test' % (test,))
+    for test in SHUFFLED_FILTERED_TESTS:
+      self.assertTrue(test in FILTERED_TESTS, '%s is an invalid test' % (test,))
+    for test in SHUFFLED_SHARDED_TESTS:
+      self.assertTrue(test in SHARDED_TESTS, '%s is an invalid test' % (test,))
+
+  def testShuffleIncludesAllTests(self):
+    for test in ALL_TESTS:
+      self.assertTrue(test in SHUFFLED_ALL_TESTS, '%s is missing' % (test,))
+    for test in ACTIVE_TESTS:
+      self.assertTrue(test in SHUFFLED_ACTIVE_TESTS, '%s is missing' % (test,))
+    for test in FILTERED_TESTS:
+      self.assertTrue(
+          test in SHUFFLED_FILTERED_TESTS, '%s is missing' % (test,)
+      )
+    for test in SHARDED_TESTS:
+      self.assertTrue(test in SHUFFLED_SHARDED_TESTS, '%s is missing' % (test,))
+
+  def testShuffleLeavesDeathTestsAtFront(self):
+    non_death_test_found = False
+    for test in SHUFFLED_ACTIVE_TESTS:
+      if 'DeathTest.' in test:
+        self.assertTrue(
+            not non_death_test_found,
+            '%s appears after a non-death test' % (test,),
+        )
+      else:
+        non_death_test_found = True
+
+  def _VerifyTestCasesDoNotInterleave(self, tests):
+    test_cases = []
+    for test in tests:
+      [test_case, _] = test.split('.')
+      if test_cases and test_cases[-1] != test_case:
+        test_cases.append(test_case)
+        self.assertEqual(
+            1,
+            test_cases.count(test_case),
+            'Test case %s is not grouped together in %s' % (test_case, tests),
+        )
+
+  def testShuffleDoesNotInterleaveTestCases(self):
+    self._VerifyTestCasesDoNotInterleave(SHUFFLED_ALL_TESTS)
+    self._VerifyTestCasesDoNotInterleave(SHUFFLED_ACTIVE_TESTS)
+    self._VerifyTestCasesDoNotInterleave(SHUFFLED_FILTERED_TESTS)
+    self._VerifyTestCasesDoNotInterleave(SHUFFLED_SHARDED_TESTS)
+
+  def testShuffleRestoresOrderAfterEachIteration(self):
+    # Get the test lists in all 3 iterations, using random seed 1, 2,
+    # and 3 respectively.  Google Test picks a different seed in each
+    # iteration, and this test depends on the current implementation
+    # picking successive numbers.  This dependency is not ideal, but
+    # makes the test much easier to write.
+    # pylint: disable-next=unbalanced-tuple-unpacking
+    [tests_in_iteration1, tests_in_iteration2, tests_in_iteration3] = (
+        GetTestsForAllIterations(
+            {}, [ShuffleFlag(), RandomSeedFlag(1), RepeatFlag(3)]
+        )
+    )
+
+    # Make sure running the tests with random seed 1 gets the same
+    # order as in iteration 1 above.
+    tests_with_seed1 = GetTestsForAllIterations(
+        {}, [ShuffleFlag(), RandomSeedFlag(1)]
+    )[0]
+    self.assertEqual(tests_in_iteration1, tests_with_seed1)
+
+    # Make sure running the tests with random seed 2 gets the same
+    # order as in iteration 2 above.  Success means that Google Test
+    # correctly restores the test order before re-shuffling at the
+    # beginning of iteration 2.
+    tests_with_seed2 = GetTestsForAllIterations(
+        {}, [ShuffleFlag(), RandomSeedFlag(2)]
+    )[0]
+    self.assertEqual(tests_in_iteration2, tests_with_seed2)
+
+    # Make sure running the tests with random seed 3 gets the same
+    # order as in iteration 3 above.  Success means that Google Test
+    # correctly restores the test order before re-shuffling at the
+    # beginning of iteration 3.
+    tests_with_seed3 = GetTestsForAllIterations(
+        {}, [ShuffleFlag(), RandomSeedFlag(3)]
+    )[0]
+    self.assertEqual(tests_in_iteration3, tests_with_seed3)
+
+  def testShuffleGeneratesNewOrderInEachIteration(self):
+    # pylint: disable-next=unbalanced-tuple-unpacking
+    [tests_in_iteration1, tests_in_iteration2, tests_in_iteration3] = (
+        GetTestsForAllIterations(
+            {}, [ShuffleFlag(), RandomSeedFlag(1), RepeatFlag(3)]
+        )
+    )
+
+    self.assertTrue(
+        tests_in_iteration1 != tests_in_iteration2, tests_in_iteration1
+    )
+    self.assertTrue(
+        tests_in_iteration1 != tests_in_iteration3, tests_in_iteration1
+    )
+    self.assertTrue(
+        tests_in_iteration2 != tests_in_iteration3, tests_in_iteration2
+    )
+
+  def testShuffleShardedTestsPreservesPartition(self):
+    # If we run M tests on N shards, the same M tests should be run in
+    # total, regardless of the random seeds used by the shards.
+    tests1 = GetTestsForAllIterations(
+        {TOTAL_SHARDS_ENV_VAR: '3', SHARD_INDEX_ENV_VAR: '0'},
+        [ShuffleFlag(), RandomSeedFlag(1)],
+    )[0]
+    tests2 = GetTestsForAllIterations(
+        {TOTAL_SHARDS_ENV_VAR: '3', SHARD_INDEX_ENV_VAR: '1'},
+        [ShuffleFlag(), RandomSeedFlag(20)],
+    )[0]
+    tests3 = GetTestsForAllIterations(
+        {TOTAL_SHARDS_ENV_VAR: '3', SHARD_INDEX_ENV_VAR: '2'},
+        [ShuffleFlag(), RandomSeedFlag(25)],
+    )[0]
+    sorted_sharded_tests = tests1 + tests2 + tests3
+    sorted_sharded_tests.sort()
+    sorted_active_tests = []
+    sorted_active_tests.extend(ACTIVE_TESTS)
+    sorted_active_tests.sort()
+    self.assertEqual(sorted_active_tests, sorted_sharded_tests)
 
 
 if __name__ == '__main__':
-    gtest_test_utils.Main()
+  gtest_test_utils.Main()
diff --git a/external/googletest/googletest/test/googletest-shuffle-test_.cc b/external/googletest/googletest/test/googletest-shuffle-test_.cc
index 4505663a..b570c488 100644
--- a/external/googletest/googletest/test/googletest-shuffle-test_.cc
+++ b/external/googletest/googletest/test/googletest-shuffle-test_.cc
@@ -27,7 +27,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
 // Verifies that test shuffling works.
 
 #include "gtest/gtest.h"
@@ -36,7 +35,6 @@ namespace {
 
 using ::testing::EmptyTestEventListener;
 using ::testing::InitGoogleTest;
-using ::testing::Message;
 using ::testing::Test;
 using ::testing::TestEventListeners;
 using ::testing::TestInfo;
@@ -88,7 +86,7 @@ class TestNamePrinter : public EmptyTestEventListener {
 
 }  // namespace
 
-int main(int argc, char **argv) {
+int main(int argc, char** argv) {
   InitGoogleTest(&argc, argv);
 
   // Replaces the default printer with TestNamePrinter, which prints
diff --git a/external/googletest/googletest/test/googletest-throw-on-failure-test.py b/external/googletest/googletest/test/googletest-throw-on-failure-test.py
old mode 100644
new mode 100755
index 415b439f..106b0044
--- a/external/googletest/googletest/test/googletest-throw-on-failure-test.py
+++ b/external/googletest/googletest/test/googletest-throw-on-failure-test.py
@@ -36,7 +36,8 @@
 """
 
 import os
-import gtest_test_utils
+from googletest.test import gtest_test_utils
+
 
 # Constants.
 
@@ -46,122 +47,120 @@
 # Path to the googletest-throw-on-failure-test_ program, compiled with
 # exceptions disabled.
 EXE_PATH = gtest_test_utils.GetTestExecutablePath(
-    'googletest-throw-on-failure-test_')
+    'googletest-throw-on-failure-test_'
+)
 
 
 # Utilities.
 
 
 def SetEnvVar(env_var, value):
-    """Sets an environment variable to a given value; unsets it when the
-    given value is None.
-    """
+  """Sets an environment variable.
+
+  Sets an environment variable to a given value; unsets it when the
+  given value is None.
 
-    env_var = env_var.upper()
-    if value is not None:
-        os.environ[env_var] = value
-    elif env_var in os.environ:
-        del os.environ[env_var]
+  Args:
+    env_var: environment variable.
+    value: value to set.
+  """
+
+  env_var = env_var.upper()
+  if value is not None:
+    os.environ[env_var] = value
+  elif env_var in os.environ:
+    del os.environ[env_var]
 
 
 def Run(command):
-    """Runs a command; returns True/False if its exit code is/isn't 0."""
+  """Runs a command; returns True/False if its exit code is/isn't 0."""
 
-    print('Running "%s". . .' % ' '.join(command))
-    p = gtest_test_utils.Subprocess(command)
-    return p.exited and p.exit_code == 0
+  print('Running "%s". . .' % ' '.join(command))
+  p = gtest_test_utils.Subprocess(command)
+  return p.exited and p.exit_code == 0
 
 
 # The tests.
 class ThrowOnFailureTest(gtest_test_utils.TestCase):
-    """Tests the throw-on-failure mode."""
-
-    def RunAndVerify(self, env_var_value, flag_value, should_fail):
-        """Runs googletest-throw-on-failure-test_ and verifies that it does
-        (or does not) exit with a non-zero code.
-
-        Args:
-          env_var_value:    value of the GTEST_BREAK_ON_FAILURE environment
-                            variable; None if the variable should be unset.
-          flag_value:       value of the --gtest_break_on_failure flag;
-                            None if the flag should not be present.
-          should_fail:      True if and only if the program is expected to fail.
-        """
-
-        SetEnvVar(THROW_ON_FAILURE, env_var_value)
-
-        if env_var_value is None:
-            env_var_value_msg = ' is not set'
-        else:
-            env_var_value_msg = '=' + env_var_value
-
-        if flag_value is None:
-            flag = ''
-        elif flag_value == '0':
-            flag = '--%s=0' % THROW_ON_FAILURE
-        else:
-            flag = '--%s' % THROW_ON_FAILURE
-
-        command = [EXE_PATH]
-        if flag:
-            command.append(flag)
-
-        if should_fail:
-            should_or_not = 'should'
-        else:
-            should_or_not = 'should not'
-
-        failed = not Run(command)
-
-        SetEnvVar(THROW_ON_FAILURE, None)
-
-        msg = ('when %s%s, an assertion failure in "%s" %s cause a non-zero '
-               'exit code.' %
-               (THROW_ON_FAILURE, env_var_value_msg, ' '.join(command),
-                should_or_not))
-        self.assert_(failed == should_fail, msg)
-
-    def testDefaultBehavior(self):
-        """Tests the behavior of the default mode."""
-
-        self.RunAndVerify(env_var_value=None, flag_value=None, should_fail=False)
-
-    def testThrowOnFailureEnvVar(self):
-        """Tests using the GTEST_THROW_ON_FAILURE environment variable."""
-
-        self.RunAndVerify(env_var_value='0',
-                          flag_value=None,
-                          should_fail=False)
-        self.RunAndVerify(env_var_value='1',
-                          flag_value=None,
-                          should_fail=True)
-
-    def testThrowOnFailureFlag(self):
-        """Tests using the --gtest_throw_on_failure flag."""
-
-        self.RunAndVerify(env_var_value=None,
-                          flag_value='0',
-                          should_fail=False)
-        self.RunAndVerify(env_var_value=None,
-                          flag_value='1',
-                          should_fail=True)
-
-    def testThrowOnFailureFlagOverridesEnvVar(self):
-        """Tests that --gtest_throw_on_failure overrides GTEST_THROW_ON_FAILURE."""
-
-        self.RunAndVerify(env_var_value='0',
-                          flag_value='0',
-                          should_fail=False)
-        self.RunAndVerify(env_var_value='0',
-                          flag_value='1',
-                          should_fail=True)
-        self.RunAndVerify(env_var_value='1',
-                          flag_value='0',
-                          should_fail=False)
-        self.RunAndVerify(env_var_value='1',
-                          flag_value='1',
-                          should_fail=True)
+  """Tests the throw-on-failure mode."""
+
+  def RunAndVerify(self, env_var_value, flag_value, should_fail):
+    """Runs googletest-throw-on-failure-test_ and verifies its behavior.
+
+    Runs googletest-throw-on-failure-test_ and verifies that it does
+    (or does not) exit with a non-zero code.
+
+    Args:
+      env_var_value:    value of the GTEST_BREAK_ON_FAILURE environment
+        variable; None if the variable should be unset.
+      flag_value:       value of the --gtest_break_on_failure flag; None if the
+        flag should not be present.
+      should_fail:      True if and only if the program is expected to fail.
+    """
+
+    SetEnvVar(THROW_ON_FAILURE, env_var_value)
+
+    if env_var_value is None:
+      env_var_value_msg = ' is not set'
+    else:
+      env_var_value_msg = '=' + env_var_value
+
+    if flag_value is None:
+      flag = ''
+    elif flag_value == '0':
+      flag = '--%s=0' % THROW_ON_FAILURE
+    else:
+      flag = '--%s' % THROW_ON_FAILURE
+
+    command = [EXE_PATH]
+    if flag:
+      command.append(flag)
+
+    if should_fail:
+      should_or_not = 'should'
+    else:
+      should_or_not = 'should not'
+
+    failed = not Run(command)
+
+    SetEnvVar(THROW_ON_FAILURE, None)
+
+    msg = (
+        'when %s%s, an assertion failure in "%s" %s cause a non-zero exit code.'
+        % (
+            THROW_ON_FAILURE,
+            env_var_value_msg,
+            ' '.join(command),
+            should_or_not,
+        )
+    )
+    self.assertTrue(failed == should_fail, msg)
+
+  def testDefaultBehavior(self):
+    """Tests the behavior of the default mode."""
+
+    self.RunAndVerify(env_var_value=None, flag_value=None, should_fail=False)
+
+  def testThrowOnFailureEnvVar(self):
+    """Tests using the GTEST_THROW_ON_FAILURE environment variable."""
+
+    self.RunAndVerify(env_var_value='0', flag_value=None, should_fail=False)
+    self.RunAndVerify(env_var_value='1', flag_value=None, should_fail=True)
+
+  def testThrowOnFailureFlag(self):
+    """Tests using the --gtest_throw_on_failure flag."""
+
+    self.RunAndVerify(env_var_value=None, flag_value='0', should_fail=False)
+    self.RunAndVerify(env_var_value=None, flag_value='1', should_fail=True)
+
+  def testThrowOnFailureFlagOverridesEnvVar(self):
+    """Tests that --gtest_throw_on_failure overrides GTEST_THROW_ON_FAILURE."""
+
+    self.RunAndVerify(env_var_value='0', flag_value='0', should_fail=False)
+    self.RunAndVerify(env_var_value='0', flag_value='1', should_fail=True)
+    self.RunAndVerify(env_var_value='1', flag_value='0', should_fail=False)
+    self.RunAndVerify(env_var_value='1', flag_value='1', should_fail=True)
 
 
 if __name__ == '__main__':
-    gtest_test_utils.Main()
+  gtest_test_utils.Main()
diff --git a/external/googletest/googletest/test/googletest-uninitialized-test.py b/external/googletest/googletest/test/googletest-uninitialized-test.py
old mode 100644
new mode 100755
index aa1d57ed..e5af7c84
--- a/external/googletest/googletest/test/googletest-uninitialized-test.py
+++ b/external/googletest/googletest/test/googletest-uninitialized-test.py
@@ -31,37 +31,40 @@
 
 """Verifies that Google Test warns the user when not initialized properly."""
 
-import gtest_test_utils
+from googletest.test import gtest_test_utils
 
-COMMAND = gtest_test_utils.GetTestExecutablePath('googletest-uninitialized-test_')
+COMMAND = gtest_test_utils.GetTestExecutablePath(
+    'googletest-uninitialized-test_'
+)
 
 
 def Assert(condition):
-    if not condition:
-        raise AssertionError
+  if not condition:
+    raise AssertionError
 
 
 def AssertEq(expected, actual):
-    if expected != actual:
-        print('Expected: %s' % (expected,))
-        print('  Actual: %s' % (actual,))
-        raise AssertionError
+  if expected != actual:
+    print('Expected: %s' % (expected,))
+    print('  Actual: %s' % (actual,))
+    raise AssertionError
 
 
 def TestExitCodeAndOutput(command):
-    """Runs the given command and verifies its exit code and output."""
+  """Runs the given command and verifies its exit code and output."""
 
-    # Verifies that 'command' exits with code 1.
-    p = gtest_test_utils.Subprocess(command)
-    if p.exited and p.exit_code == 0:
-        Assert('IMPORTANT NOTICE' in p.output);
-    Assert('InitGoogleTest' in p.output)
+  # Verifies that 'command' exits with code 1.
+  p = gtest_test_utils.Subprocess(command)
+  if p.exited and p.exit_code == 0:
+    Assert('IMPORTANT NOTICE' in p.output)
+  Assert('InitGoogleTest' in p.output)
 
 
 class GTestUninitializedTest(gtest_test_utils.TestCase):
-    def testExitCodeAndOutput(self):
-        TestExitCodeAndOutput(COMMAND)
+
+  def testExitCodeAndOutput(self):
+    TestExitCodeAndOutput(COMMAND)
 
 
 if __name__ == '__main__':
-    gtest_test_utils.Main()
+  gtest_test_utils.Main()
diff --git a/external/googletest/googletest/test/gtest-typed-test_test.cc b/external/googletest/googletest/test/gtest-typed-test_test.cc
index af23f86d..0cc8b211 100644
--- a/external/googletest/googletest/test/gtest-typed-test_test.cc
+++ b/external/googletest/googletest/test/gtest-typed-test_test.cc
@@ -30,14 +30,13 @@
 #include "test/gtest-typed-test_test.h"
 
 #include <set>
+#include <string>
 #include <type_traits>
 #include <vector>
 
 #include "gtest/gtest.h"
 
-#if _MSC_VER
 GTEST_DISABLE_MSC_WARNINGS_PUSH_(4127 /* conditional expression is constant */)
-#endif  //  _MSC_VER
 
 using testing::Test;
 
@@ -420,3 +419,5 @@ typedef Types<int, double, MyPair<int, int> > TrimTypes;
 INSTANTIATE_TYPED_TEST_SUITE_P(My, TrimmedTest, TrimTypes);
 
 }  // namespace library2
+
+GTEST_DISABLE_MSC_WARNINGS_POP_()  // 4127
diff --git a/external/googletest/googletest/test/gtest-unittest-api_test.cc b/external/googletest/googletest/test/gtest-unittest-api_test.cc
index 8ef50583..2ea69273 100644
--- a/external/googletest/googletest/test/gtest-unittest-api_test.cc
+++ b/external/googletest/googletest/test/gtest-unittest-api_test.cc
@@ -32,11 +32,12 @@
 // This file contains tests verifying correctness of data provided via
 // UnitTest's public methods.
 
-#include "gtest/gtest.h"
-
 #include <string.h>  // For strcmp.
+
 #include <algorithm>
 
+#include "gtest/gtest.h"
+
 using ::testing::InitGoogleTest;
 
 namespace testing {
@@ -56,13 +57,12 @@ class UnitTestHelper {
   static TestSuite const** GetSortedTestSuites() {
     UnitTest& unit_test = *UnitTest::GetInstance();
     auto const** const test_suites = new const TestSuite*[static_cast<size_t>(
-      unit_test.total_test_suite_count())];
+        unit_test.total_test_suite_count())];
 
     for (int i = 0; i < unit_test.total_test_suite_count(); ++i)
       test_suites[i] = unit_test.GetTestSuite(i);
 
-    std::sort(test_suites,
-              test_suites + unit_test.total_test_suite_count(),
+    std::sort(test_suites, test_suites + unit_test.total_test_suite_count(),
               LessByName<TestSuite>());
     return test_suites;
   }
@@ -73,8 +73,7 @@ class UnitTestHelper {
     UnitTest& unit_test = *UnitTest::GetInstance();
     for (int i = 0; i < unit_test.total_test_suite_count(); ++i) {
       const TestSuite* test_suite = unit_test.GetTestSuite(i);
-      if (0 == strcmp(test_suite->name(), name))
-        return test_suite;
+      if (0 == strcmp(test_suite->name(), name)) return test_suite;
     }
     return nullptr;
   }
@@ -84,7 +83,7 @@ class UnitTestHelper {
   // array.
   static TestInfo const** GetSortedTests(const TestSuite* test_suite) {
     TestInfo const** const tests = new const TestInfo*[static_cast<size_t>(
-      test_suite->total_test_count())];
+        test_suite->total_test_count())];
 
     for (int i = 0; i < test_suite->total_test_count(); ++i)
       tests[i] = test_suite->GetTestInfo(i);
@@ -95,7 +94,8 @@ class UnitTestHelper {
   }
 };
 
-template <typename T> class TestSuiteWithCommentTest : public Test {};
+template <typename T>
+class TestSuiteWithCommentTest : public Test {};
 TYPED_TEST_SUITE(TestSuiteWithCommentTest, Types<int>);
 TYPED_TEST(TestSuiteWithCommentTest, Dummy) {}
 
@@ -106,7 +106,7 @@ const int kTypedTests = 1;
 // Since tests can be run in any order, the values the accessors that track
 // test execution (such as failed_test_count) can not be predicted.
 TEST(ApiTest, UnitTestImmutableAccessorsWork) {
-  UnitTest* unit_test = UnitTest::GetInstance();
+  const auto& unit_test = UnitTest::GetInstance();
 
   ASSERT_EQ(2 + kTypedTestSuites, unit_test->total_test_suite_count());
   EXPECT_EQ(1 + kTypedTestSuites, unit_test->test_suite_to_run_count());
@@ -224,7 +224,7 @@ TEST(DISABLED_Test, Dummy2) {}
 class FinalSuccessChecker : public Environment {
  protected:
   void TearDown() override {
-    UnitTest* unit_test = UnitTest::GetInstance();
+    const auto& unit_test = UnitTest::GetInstance();
 
     EXPECT_EQ(1 + kTypedTestSuites, unit_test->successful_test_suite_count());
     EXPECT_EQ(3 + kTypedTests, unit_test->successful_test_count());
@@ -319,7 +319,7 @@ class FinalSuccessChecker : public Environment {
 }  // namespace internal
 }  // namespace testing
 
-int main(int argc, char **argv) {
+int main(int argc, char** argv) {
   InitGoogleTest(&argc, argv);
 
   AddGlobalTestEnvironment(new testing::internal::FinalSuccessChecker());
diff --git a/external/googletest/googletest/test/gtest_dirs_test.cc b/external/googletest/googletest/test/gtest_dirs_test.cc
new file mode 100644
index 00000000..1a5b63d3
--- /dev/null
+++ b/external/googletest/googletest/test/gtest_dirs_test.cc
@@ -0,0 +1,101 @@
+#include <sys/stat.h>
+
+#include <cstdlib>
+#include <cstring>
+#include <string>
+
+#include "gtest/gtest.h"
+#include "gtest/internal/gtest-port.h"
+
+#if GTEST_HAS_FILE_SYSTEM
+
+namespace {
+
+class SetEnv {
+ public:
+  // Sets the environment value with name `name` to `value`, unless `value` is
+  // nullptr, in which case it unsets it. Restores the original value on
+  // destruction.
+  SetEnv(const char* name, const char* value) : name_(name) {
+    const char* old_value = getenv(name);
+    if (old_value != nullptr) {
+      saved_value_ = old_value;
+      have_saved_value_ = true;
+    }
+    if (value == nullptr) {
+      GTEST_CHECK_POSIX_SUCCESS_(unsetenv(name));
+    } else {
+      GTEST_CHECK_POSIX_SUCCESS_(setenv(name, value, 1 /*overwrite*/));
+    }
+  }
+
+  ~SetEnv() {
+    if (have_saved_value_) {
+      GTEST_CHECK_POSIX_SUCCESS_(
+          setenv(name_.c_str(), saved_value_.c_str(), 1 /*overwrite*/));
+    } else {
+      GTEST_CHECK_POSIX_SUCCESS_(unsetenv(name_.c_str()));
+    }
+  }
+
+ private:
+  std::string name_;
+  bool have_saved_value_ = false;
+  std::string saved_value_;
+};
+
+class MakeTempDir {
+ public:
+  // Creates a directory with a unique name including `testname`.
+  // The destructor removes it.
+  explicit MakeTempDir(const std::string& testname) {
+    // mkdtemp requires that the last 6 characters of the input pattern
+    // are Xs, and the string is modified by replacing those characters.
+    std::string pattern = "/tmp/" + testname + "_XXXXXX";
+    GTEST_CHECK_(mkdtemp(pattern.data()) != nullptr);
+    dirname_ = pattern;
+  }
+
+  ~MakeTempDir() { GTEST_CHECK_POSIX_SUCCESS_(rmdir(dirname_.c_str())); }
+
+  const char* DirName() const { return dirname_.c_str(); }
+
+ private:
+  std::string dirname_;
+};
+
+bool StartsWith(const std::string& str, const std::string& prefix) {
+  return str.substr(0, prefix.size()) == prefix;
+}
+
+TEST(TempDirTest, InEnvironment) {
+  // Since the test infrastructure might be verifying directory existence or
+  // even creating subdirectories, we need to be careful that the directories we
+  // specify are actually valid.
+  MakeTempDir temp_dir("TempDirTest_InEnvironment");
+  SetEnv set_env("TEST_TMPDIR", temp_dir.DirName());
+  EXPECT_TRUE(StartsWith(testing::TempDir(), temp_dir.DirName()));
+}
+
+TEST(TempDirTest, NotInEnvironment) {
+  SetEnv set_env("TEST_TMPDIR", nullptr);
+  EXPECT_NE(testing::TempDir(), "");
+}
+
+TEST(SrcDirTest, InEnvironment) {
+  // Since the test infrastructure might be verifying directory existence or
+  // even creating subdirectories, we need to be careful that the directories we
+  // specify are actually valid.
+  MakeTempDir temp_dir("SrcDirTest_InEnvironment");
+  SetEnv set_env("TEST_SRCDIR", temp_dir.DirName());
+  EXPECT_TRUE(StartsWith(testing::SrcDir(), temp_dir.DirName()));
+}
+
+TEST(SrcDirTest, NotInEnvironment) {
+  SetEnv set_env("TEST_SRCDIR", nullptr);
+  EXPECT_NE(testing::SrcDir(), "");
+}
+
+#endif  // GTEST_HAS_FILE_SYSTEM
+
+}  // namespace
diff --git a/external/googletest/googletest/test/gtest_environment_test.cc b/external/googletest/googletest/test/gtest_environment_test.cc
index d2b21b0a..03657c7d 100644
--- a/external/googletest/googletest/test/gtest_environment_test.cc
+++ b/external/googletest/googletest/test/gtest_environment_test.cc
@@ -36,24 +36,25 @@
 #include "gtest/gtest.h"
 #include "src/gtest-internal-inl.h"
 
-namespace testing {
-GTEST_DECLARE_string_(filter);
-}
-
 namespace {
 
 enum FailureType { NO_FAILURE, NON_FATAL_FAILURE, FATAL_FAILURE };
 
+// Was SetUp run?
+bool set_up_was_run;
+// Was TearDown run?
+bool tear_down_was_run;
+// Was the TEST run?
+bool test_was_run;
+
 // For testing using global test environments.
 class MyEnvironment : public testing::Environment {
  public:
-  MyEnvironment() { Reset(); }
-
   // Depending on the value of failure_in_set_up_, SetUp() will
   // generate a non-fatal failure, generate a fatal failure, or
   // succeed.
   void SetUp() override {
-    set_up_was_run_ = true;
+    set_up_was_run = true;
 
     switch (failure_in_set_up_) {
       case NON_FATAL_FAILURE:
@@ -69,36 +70,18 @@ class MyEnvironment : public testing::Environment {
 
   // Generates a non-fatal failure.
   void TearDown() override {
-    tear_down_was_run_ = true;
+    tear_down_was_run = true;
     ADD_FAILURE() << "Expected non-fatal failure in global tear-down.";
   }
 
-  // Resets the state of the environment s.t. it can be reused.
-  void Reset() {
-    failure_in_set_up_ = NO_FAILURE;
-    set_up_was_run_ = false;
-    tear_down_was_run_ = false;
-  }
-
   // We call this function to set the type of failure SetUp() should
   // generate.
   void set_failure_in_set_up(FailureType type) { failure_in_set_up_ = type; }
 
-  // Was SetUp() run?
-  bool set_up_was_run() const { return set_up_was_run_; }
-
-  // Was TearDown() run?
-  bool tear_down_was_run() const { return tear_down_was_run_; }
-
  private:
   FailureType failure_in_set_up_;
-  bool set_up_was_run_;
-  bool tear_down_was_run_;
 };
 
-// Was the TEST run?
-bool test_was_run;
-
 // The sole purpose of this TEST is to enable us to check whether it
 // was run.
 TEST(FooTest, Bar) { test_was_run = true; }
@@ -116,67 +99,88 @@ void Check(bool condition, const char* msg) {
 // The 'failure' parameter specifies the type of failure that should
 // be generated by the global set-up.
 int RunAllTests(MyEnvironment* env, FailureType failure) {
-  env->Reset();
-  env->set_failure_in_set_up(failure);
+  set_up_was_run = false;
+  tear_down_was_run = false;
   test_was_run = false;
+  env->set_failure_in_set_up(failure);
   testing::internal::GetUnitTestImpl()->ClearAdHocTestResult();
   return RUN_ALL_TESTS();
 }
 
-}  // namespace
-
-int main(int argc, char** argv) {
-  testing::InitGoogleTest(&argc, argv);
-
-  // Registers a global test environment, and verifies that the
-  // registration function returns its argument.
+// Registers a global test environment, and verifies that the
+// registration function returns its argument.
+MyEnvironment* RegisterTestEnv() {
   MyEnvironment* const env = new MyEnvironment;
   Check(testing::AddGlobalTestEnvironment(env) == env,
         "AddGlobalTestEnvironment() should return its argument.");
+  return env;
+}
 
-  // Verifies that RUN_ALL_TESTS() runs the tests when the global
-  // set-up is successful.
+// Verifies that RUN_ALL_TESTS() runs the tests when the global
+// set-up is successful.
+void TestGlobalSetUp() {
+  MyEnvironment* const env = RegisterTestEnv();
   Check(RunAllTests(env, NO_FAILURE) != 0,
         "RUN_ALL_TESTS() should return non-zero, as the global tear-down "
         "should generate a failure.");
   Check(test_was_run,
         "The tests should run, as the global set-up should generate no "
         "failure");
-  Check(env->tear_down_was_run(),
+  Check(tear_down_was_run,
         "The global tear-down should run, as the global set-up was run.");
+}
 
-  // Verifies that RUN_ALL_TESTS() runs the tests when the global
-  // set-up generates no fatal failure.
+// Verifies that RUN_ALL_TESTS() runs the tests when the global
+// set-up generates no fatal failure.
+void TestTestsRun() {
+  MyEnvironment* const env = RegisterTestEnv();
   Check(RunAllTests(env, NON_FATAL_FAILURE) != 0,
         "RUN_ALL_TESTS() should return non-zero, as both the global set-up "
         "and the global tear-down should generate a non-fatal failure.");
   Check(test_was_run,
         "The tests should run, as the global set-up should generate no "
         "fatal failure.");
-  Check(env->tear_down_was_run(),
+  Check(tear_down_was_run,
         "The global tear-down should run, as the global set-up was run.");
+}
 
-  // Verifies that RUN_ALL_TESTS() runs no test when the global set-up
-  // generates a fatal failure.
+// Verifies that RUN_ALL_TESTS() runs no test when the global set-up
+// generates a fatal failure.
+void TestNoTestsRunSetUpFailure() {
+  MyEnvironment* const env = RegisterTestEnv();
   Check(RunAllTests(env, FATAL_FAILURE) != 0,
         "RUN_ALL_TESTS() should return non-zero, as the global set-up "
         "should generate a fatal failure.");
   Check(!test_was_run,
         "The tests should not run, as the global set-up should generate "
         "a fatal failure.");
-  Check(env->tear_down_was_run(),
+  Check(tear_down_was_run,
         "The global tear-down should run, as the global set-up was run.");
+}
 
-  // Verifies that RUN_ALL_TESTS() doesn't do global set-up or
-  // tear-down when there is no test to run.
-  testing::GTEST_FLAG(filter) = "-*";
+// Verifies that RUN_ALL_TESTS() doesn't do global set-up or
+// tear-down when there is no test to run.
+void TestNoTestsSkipsSetUp() {
+  MyEnvironment* const env = RegisterTestEnv();
+  GTEST_FLAG_SET(filter, "-*");
   Check(RunAllTests(env, NO_FAILURE) == 0,
         "RUN_ALL_TESTS() should return zero, as there is no test to run.");
-  Check(!env->set_up_was_run(),
+  Check(!set_up_was_run,
         "The global set-up should not run, as there is no test to run.");
-  Check(!env->tear_down_was_run(),
+  Check(!tear_down_was_run,
         "The global tear-down should not run, "
         "as the global set-up was not run.");
+}
+
+}  // namespace
+
+int main(int argc, char** argv) {
+  testing::InitGoogleTest(&argc, argv);
+
+  TestGlobalSetUp();
+  TestTestsRun();
+  TestNoTestsRunSetUpFailure();
+  TestNoTestsSkipsSetUp();
 
   printf("PASS\n");
   return 0;
diff --git a/external/googletest/googletest/test/gtest_help_test.py b/external/googletest/googletest/test/gtest_help_test.py
old mode 100644
new mode 100755
index 1b4f32c8..38fc90ff
--- a/external/googletest/googletest/test/gtest_help_test.py
+++ b/external/googletest/googletest/test/gtest_help_test.py
@@ -39,133 +39,145 @@
 
 import os
 import re
-import gtest_test_utils
+import sys
+from googletest.test import gtest_test_utils
 
+
+FREEBSD = ('FreeBSD', 'GNU/kFreeBSD')
+NETBSD = ('NetBSD',)
+OPENBSD = ('OpenBSD',)
+
+
+def is_bsd_based_os() -> bool:
+  """Determine whether or not the OS is BSD-based."""
+  if os.name != 'posix':
+    return False
+
+  return os.uname()[0] in (FREEBSD + NETBSD + OPENBSD)
+
+
+IS_DARWIN = os.name == 'posix' and os.uname()[0] == 'Darwin'
 IS_LINUX = os.name == 'posix' and os.uname()[0] == 'Linux'
-IS_GNUKFREEBSD = os.name == 'posix' and os.uname()[0] == 'GNU/kFreeBSD'
+IS_GNUHURD = os.name == 'posix' and os.uname()[0] == 'GNU'
 IS_WINDOWS = os.name == 'nt'
 
 PROGRAM_PATH = gtest_test_utils.GetTestExecutablePath('gtest_help_test_')
 FLAG_PREFIX = '--gtest_'
 DEATH_TEST_STYLE_FLAG = FLAG_PREFIX + 'death_test_style'
 STREAM_RESULT_TO_FLAG = FLAG_PREFIX + 'stream_result_to'
-UNKNOWN_FLAG = FLAG_PREFIX + 'unknown_flag_for_testing'
 LIST_TESTS_FLAG = FLAG_PREFIX + 'list_tests'
-INCORRECT_FLAG_VARIANTS = [re.sub('^--', '-', LIST_TESTS_FLAG),
-                           re.sub('^--', '/', LIST_TESTS_FLAG),
-                           re.sub('_', '-', LIST_TESTS_FLAG)]
 INTERNAL_FLAG_FOR_TESTING = FLAG_PREFIX + 'internal_flag_for_testing'
 
-SUPPORTS_DEATH_TESTS = "DeathTest" in gtest_test_utils.Subprocess(
-    [PROGRAM_PATH, LIST_TESTS_FLAG]).output
+SUPPORTS_DEATH_TESTS = (
+    'DeathTest'
+    in gtest_test_utils.Subprocess([PROGRAM_PATH, LIST_TESTS_FLAG]).output
+)
+
+HAS_ABSL_FLAGS = '--has_absl_flags' in sys.argv
 
 # The help message must match this regex.
 HELP_REGEX = re.compile(
-    FLAG_PREFIX + r'list_tests.*' +
-    FLAG_PREFIX + r'filter=.*' +
-    FLAG_PREFIX + r'also_run_disabled_tests.*' +
-    FLAG_PREFIX + r'repeat=.*' +
-    FLAG_PREFIX + r'shuffle.*' +
-    FLAG_PREFIX + r'random_seed=.*' +
-    FLAG_PREFIX + r'color=.*' +
-    FLAG_PREFIX + r'brief.*' +
-    FLAG_PREFIX + r'print_time.*' +
-    FLAG_PREFIX + r'output=.*' +
-    FLAG_PREFIX + r'break_on_failure.*' +
-    FLAG_PREFIX + r'throw_on_failure.*' +
-    FLAG_PREFIX + r'catch_exceptions=0.*',
-    re.DOTALL)
-
-
-def RunWithFlag(flag):
-    """Runs gtest_help_test_ with the given flag.
-
-    Returns:
-      the exit code and the text output as a tuple.
-    Args:
-      flag: the command-line flag to pass to gtest_help_test_, or None.
-    """
-
-    if flag is None:
-        command = [PROGRAM_PATH]
-    else:
-        command = [PROGRAM_PATH, flag]
-    child = gtest_test_utils.Subprocess(command)
-    return child.exit_code, child.output
+    FLAG_PREFIX
+    + r'list_tests.*'
+    + FLAG_PREFIX
+    + r'filter=.*'
+    + FLAG_PREFIX
+    + r'also_run_disabled_tests.*'
+    + FLAG_PREFIX
+    + r'repeat=.*'
+    + FLAG_PREFIX
+    + r'shuffle.*'
+    + FLAG_PREFIX
+    + r'random_seed=.*'
+    + FLAG_PREFIX
+    + r'color=.*'
+    + FLAG_PREFIX
+    + r'brief.*'
+    + FLAG_PREFIX
+    + r'print_time.*'
+    + FLAG_PREFIX
+    + r'output=.*'
+    + FLAG_PREFIX
+    + r'break_on_failure.*'
+    + FLAG_PREFIX
+    + r'throw_on_failure.*'
+    + FLAG_PREFIX
+    + r'catch_exceptions=0.*',
+    re.DOTALL,
+)
+
+
+def run_with_flag(flag):
+  """Runs gtest_help_test_ with the given flag.
+
+  Returns:
+    the exit code and the text output as a tuple.
+  Args:
+    flag: the command-line flag to pass to gtest_help_test_, or None.
+  """
+
+  if flag is None:
+    command = [PROGRAM_PATH]
+  else:
+    command = [PROGRAM_PATH, flag]
+  child = gtest_test_utils.Subprocess(command)
+  return child.exit_code, child.output
 
 
 class GTestHelpTest(gtest_test_utils.TestCase):
-    """Tests the --help flag and its equivalent forms."""
-
-    def TestHelpFlag(self, flag):
-        """Verifies correct behavior when help flag is specified.
-
-        The right message must be printed and the tests must
-        skipped when the given flag is specified.
+  """Tests the --help flag and its equivalent forms."""
 
-        Args:
-          flag:  A flag to pass to the binary or None.
-        """
+  def test_prints_help_with_full_flag(self):
+    """Verifies correct behavior when help flag is specified.
 
-        exit_code, output = RunWithFlag(flag)
-        self.assertEquals(0, exit_code)
-        self.assert_(HELP_REGEX.search(output), output)
-
-        if IS_LINUX or IS_GNUKFREEBSD:
-            self.assert_(STREAM_RESULT_TO_FLAG in output, output)
-        else:
-            self.assert_(STREAM_RESULT_TO_FLAG not in output, output)
-
-        if SUPPORTS_DEATH_TESTS and not IS_WINDOWS:
-            self.assert_(DEATH_TEST_STYLE_FLAG in output, output)
-        else:
-            self.assert_(DEATH_TEST_STYLE_FLAG not in output, output)
-
-    def TestNonHelpFlag(self, flag):
-        """Verifies correct behavior when no help flag is specified.
-
-        Verifies that when no help flag is specified, the tests are run
-        and the help message is not printed.
-
-        Args:
-          flag:  A flag to pass to the binary or None.
-        """
-
-        exit_code, output = RunWithFlag(flag)
-        self.assert_(exit_code != 0)
-        self.assert_(not HELP_REGEX.search(output), output)
+    The right message must be printed and the tests must
+    skipped when the given flag is specified.
+    """
 
-    def testPrintsHelpWithFullFlag(self):
-        self.TestHelpFlag('--help')
+    exit_code, output = run_with_flag('--help')
+    if HAS_ABSL_FLAGS:
+      # The Abseil flags library prints the ProgramUsageMessage() with
+      # --help and returns 1.
+      self.assertEqual(1, exit_code)
+    else:
+      self.assertEqual(0, exit_code)
 
-    def testPrintsHelpWithShortFlag(self):
-        self.TestHelpFlag('-h')
+    self.assertTrue(HELP_REGEX.search(output), output)
 
-    def testPrintsHelpWithQuestionFlag(self):
-        self.TestHelpFlag('-?')
+    if IS_DARWIN or IS_LINUX or IS_GNUHURD or is_bsd_based_os():
+      self.assertIn(STREAM_RESULT_TO_FLAG, output)
+    else:
+      self.assertNotIn(STREAM_RESULT_TO_FLAG, output)
 
-    def testPrintsHelpWithWindowsStyleQuestionFlag(self):
-        self.TestHelpFlag('/?')
+    if SUPPORTS_DEATH_TESTS and not IS_WINDOWS:
+      self.assertIn(DEATH_TEST_STYLE_FLAG, output)
+    else:
+      self.assertNotIn(DEATH_TEST_STYLE_FLAG, output)
 
-    def testPrintsHelpWithUnrecognizedGoogleTestFlag(self):
-        self.TestHelpFlag(UNKNOWN_FLAG)
+  def test_runs_tests_without_help_flag(self):
+    """Verifies correct behavior when no help flag is specified.
 
-    def testPrintsHelpWithIncorrectFlagStyle(self):
-        for incorrect_flag in INCORRECT_FLAG_VARIANTS:
-            self.TestHelpFlag(incorrect_flag)
+    Verifies that when no help flag is specified, the tests are run
+    and the help message is not printed.
+    """
 
-    def testRunsTestsWithoutHelpFlag(self):
-        """Verifies that when no help flag is specified, the tests are run
-        and the help message is not printed."""
+    exit_code, output = run_with_flag(None)
+    self.assertNotEqual(exit_code, 0)
+    self.assertFalse(HELP_REGEX.search(output), output)
 
-        self.TestNonHelpFlag(None)
+  def test_runs_tests_with_gtest_internal_flag(self):
+    """Verifies correct behavior when internal testing flag is specified.
 
-    def testRunsTestsWithGtestInternalFlag(self):
-        """Verifies that the tests are run and no help message is printed when
-        a flag starting with Google Test prefix and 'internal_' is supplied."""
+    Verifies that the tests are run and no help message is printed when
+    a flag starting with Google Test prefix and 'internal_' is supplied.
+    """
 
-        self.TestNonHelpFlag(INTERNAL_FLAG_FOR_TESTING)
+    exit_code, output = run_with_flag(INTERNAL_FLAG_FOR_TESTING)
+    self.assertNotEqual(exit_code, 0)
+    self.assertFalse(HELP_REGEX.search(output), output)
 
 
 if __name__ == '__main__':
-    gtest_test_utils.Main()
+  if '--has_absl_flags' in sys.argv:
+    sys.argv.remove('--has_absl_flags')
+  gtest_test_utils.Main()
diff --git a/external/googletest/googletest/test/gtest_help_test_.cc b/external/googletest/googletest/test/gtest_help_test_.cc
index da289f05..18b5f3cd 100644
--- a/external/googletest/googletest/test/gtest_help_test_.cc
+++ b/external/googletest/googletest/test/gtest_help_test_.cc
@@ -39,6 +39,6 @@ TEST(HelpFlagTest, ShouldNotBeRun) {
   ASSERT_TRUE(false) << "Tests shouldn't be run when --help is specified.";
 }
 
-#if GTEST_HAS_DEATH_TEST
+#ifdef GTEST_HAS_DEATH_TEST
 TEST(DeathTest, UsedByPythonScriptToDetectSupportForDeathTestsInThisBinary) {}
 #endif
diff --git a/external/googletest/googletest/test/gtest_json_test_utils.py b/external/googletest/googletest/test/gtest_json_test_utils.py
index 550bfe48..694a7a60 100644
--- a/external/googletest/googletest/test/gtest_json_test_utils.py
+++ b/external/googletest/googletest/test/gtest_json_test_utils.py
@@ -33,30 +33,35 @@
 
 
 def normalize(obj):
-    """Normalize output object.
-
-    Args:
-       obj: Google Test's JSON output object to normalize.
-
-    Returns:
-       Normalized output without any references to transient information that may
-       change from run to run.
-    """
-
-    def _normalize(key, value):
-        if key == 'time':
-            return re.sub(r'^\d+(\.\d+)?s$', '*', value)
-        elif key == 'timestamp':
-            return re.sub(r'^\d{4}-\d\d-\d\dT\d\d:\d\d:\d\dZ$', '*', value)
-        elif key == 'failure':
-            value = re.sub(r'^.*[/\\](.*:)\d+\n', '\\1*\n', value)
-            return re.sub(r'Stack trace:\n(.|\n)*', 'Stack trace:\n*', value)
-        else:
-            return normalize(value)
-
-    if isinstance(obj, dict):
-        return {k: _normalize(k, v) for k, v in obj.items()}
-    if isinstance(obj, list):
-        return [normalize(x) for x in obj]
+  """Normalize output object.
+
+  Args:
+     obj: Google Test's JSON output object to normalize.
+
+  Returns:
+     Normalized output without any references to transient information that may
+     change from run to run.
+  """
+
+  def _normalize(key, value):
+    if key == 'time':
+      return re.sub(r'^\d+(\.\d+)?s$', '*', value)
+    elif key == 'timestamp':
+      return re.sub(r'^\d{4}-\d\d-\d\dT\d\d:\d\d:\d\dZ$', '*', value)
+    elif key == 'failure':
+      value = re.sub(r'^.*[/\\](.*:)\d+\n', '\\1*\n', value)
+      return re.sub(r'Stack trace:\n(.|\n)*', 'Stack trace:\n*', value)
+    elif key == 'message':
+      value = re.sub(r'^.*[/\\](.*:)\d+\n', '\\1*\n', value)
+      return re.sub(r'Stack trace:\n(.|\n)*', 'Stack trace:\n*', value)
+    elif key == 'file':
+      return re.sub(r'^.*[/\\](.*)', '\\1', value)
     else:
-        return obj
+      return normalize(value)
+
+  if isinstance(obj, dict):
+    return {k: _normalize(k, v) for k, v in obj.items()}
+  if isinstance(obj, list):
+    return [normalize(x) for x in obj]
+  else:
+    return obj
diff --git a/external/googletest/googletest/test/gtest_list_output_unittest.py b/external/googletest/googletest/test/gtest_list_output_unittest.py
index 3c006f19..afd521d2 100644
--- a/external/googletest/googletest/test/gtest_list_output_unittest.py
+++ b/external/googletest/googletest/test/gtest_list_output_unittest.py
@@ -40,7 +40,7 @@
 
 import os
 import re
-import gtest_test_utils
+from googletest.test import gtest_test_utils
 
 GTEST_LIST_TESTS_FLAG = '--gtest_list_tests'
 GTEST_OUTPUT_FLAG = '--gtest_output'
@@ -224,63 +224,66 @@
 
 
 class GTestListTestsOutputUnitTest(gtest_test_utils.TestCase):
-    """Unit test for Google Test's list tests with output to file functionality.
-    """
+  """Unit test for Google Test's list tests with output to file functionality."""
 
-    def testXml(self):
-        """Verifies XML output for listing tests in a Google Test binary.
+  def testXml(self):
+    """Verifies XML output for listing tests in a Google Test binary.
 
-        Runs a test program that generates an empty XML output, and
-        tests that the XML output is expected.
-        """
-        self._TestOutput('xml', EXPECTED_XML)
+    Runs a test program that generates an empty XML output, and
+    tests that the XML output is expected.
+    """
+    self._TestOutput('xml', EXPECTED_XML)
 
-    def testJSON(self):
-        """Verifies XML output for listing tests in a Google Test binary.
+  def testJSON(self):
+    """Verifies XML output for listing tests in a Google Test binary.
 
-        Runs a test program that generates an empty XML output, and
-        tests that the XML output is expected.
-        """
-        self._TestOutput('json', EXPECTED_JSON)
+    Runs a test program that generates an empty XML output, and
+    tests that the XML output is expected.
+    """
+    self._TestOutput('json', EXPECTED_JSON)
 
-    def _GetOutput(self, out_format):
-        file_path = os.path.join(gtest_test_utils.GetTempDir(),
-                                 'test_out.' + out_format)
-        gtest_prog_path = gtest_test_utils.GetTestExecutablePath(
-            'gtest_list_output_unittest_')
+  def _GetOutput(self, out_format):
+    file_path = os.path.join(
+        gtest_test_utils.GetTempDir(), 'test_out.' + out_format
+    )
+    gtest_prog_path = gtest_test_utils.GetTestExecutablePath(
+        'gtest_list_output_unittest_'
+    )
 
-        command = ([
-            gtest_prog_path,
-            '%s=%s:%s' % (GTEST_OUTPUT_FLAG, out_format, file_path),
-            '--gtest_list_tests'
-        ])
-        environ_copy = os.environ.copy()
-        p = gtest_test_utils.Subprocess(
-            command, env=environ_copy, working_dir=gtest_test_utils.GetTempDir())
+    command = [
+        gtest_prog_path,
+        '%s=%s:%s' % (GTEST_OUTPUT_FLAG, out_format, file_path),
+        '--gtest_list_tests',
+    ]
+    environ_copy = os.environ.copy()
+    p = gtest_test_utils.Subprocess(
+        command, env=environ_copy, working_dir=gtest_test_utils.GetTempDir()
+    )
 
-        self.assertTrue(p.exited)
-        self.assertEqual(0, p.exit_code)
-        self.assertTrue(os.path.isfile(file_path))
-        with open(file_path) as f:
-            result = f.read()
-        return result
+    self.assertTrue(p.exited)
+    self.assertEqual(0, p.exit_code)
+    self.assertTrue(os.path.isfile(file_path))
+    with open(file_path) as f:
+      result = f.read()
+    return result
 
-    def _TestOutput(self, test_format, expected_output):
-        actual = self._GetOutput(test_format)
-        actual_lines = actual.splitlines()
-        expected_lines = expected_output.splitlines()
-        line_count = 0
-        for actual_line in actual_lines:
-            expected_line = expected_lines[line_count]
-            expected_line_re = re.compile(expected_line.strip())
-            self.assertTrue(
-                expected_line_re.match(actual_line.strip()),
-                ('actual output of "%s",\n'
-                 'which does not match expected regex of "%s"\n'
-                 'on line %d' % (actual, expected_output, line_count)))
-            line_count = line_count + 1
+  def _TestOutput(self, test_format, expected_output):
+    actual = self._GetOutput(test_format)
+    actual_lines = actual.splitlines()
+    expected_lines = expected_output.splitlines()
+    line_count = 0
+    for actual_line in actual_lines:
+      expected_line = expected_lines[line_count]
+      expected_line_re = re.compile(expected_line.strip())
+      self.assertTrue(
+          expected_line_re.match(actual_line.strip()),
+          'actual output of "%s",\n'
+          'which does not match expected regex of "%s"\n'
+          'on line %d' % (actual, expected_output, line_count),
+      )
+      line_count = line_count + 1
 
 
 if __name__ == '__main__':
-    os.environ['GTEST_STACK_TRACE_DEPTH'] = '1'
-    gtest_test_utils.Main()
+  os.environ['GTEST_STACK_TRACE_DEPTH'] = '1'
+  gtest_test_utils.Main()
diff --git a/external/googletest/googletest/test/gtest_pred_impl_unittest.cc b/external/googletest/googletest/test/gtest_pred_impl_unittest.cc
index 4c5d9f84..033e2d9f 100644
--- a/external/googletest/googletest/test/gtest_pred_impl_unittest.cc
+++ b/external/googletest/googletest/test/gtest_pred_impl_unittest.cc
@@ -27,9 +27,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-// This file is AUTOMATICALLY GENERATED on 11/05/2019 by command
-// 'gen_gtest_pred_impl.py 5'.  DO NOT EDIT BY HAND!
-
 // Regression test for gtest_pred_impl.h
 //
 // This file is generated by a script and quite long.  If you intend to
@@ -48,6 +45,7 @@
 // stand-alone regression test.
 
 #include <iostream>
+#include <ostream>
 
 #include "gtest/gtest-spi.h"
 #include "gtest/gtest.h"
@@ -126,7 +124,7 @@ class Predicate1Test : public testing::Test {
 
     // Verifies that the control flow in the test function is expected.
     if (expected_to_finish_ && !finished_) {
-      FAIL() << "The predicate assertion unexpactedly aborted the test.";
+      FAIL() << "The predicate assertion unexpectedly aborted the test.";
     } else if (!expected_to_finish_ && finished_) {
       FAIL() << "The failed predicate assertion didn't abort the test "
                 "as expected.";
@@ -507,7 +505,7 @@ class Predicate2Test : public testing::Test {
 
     // Verifies that the control flow in the test function is expected.
     if (expected_to_finish_ && !finished_) {
-      FAIL() << "The predicate assertion unexpactedly aborted the test.";
+      FAIL() << "The predicate assertion unexpectedly aborted the test.";
     } else if (!expected_to_finish_ && finished_) {
       FAIL() << "The failed predicate assertion didn't abort the test "
                 "as expected.";
@@ -895,7 +893,7 @@ class Predicate3Test : public testing::Test {
 
     // Verifies that the control flow in the test function is expected.
     if (expected_to_finish_ && !finished_) {
-      FAIL() << "The predicate assertion unexpactedly aborted the test.";
+      FAIL() << "The predicate assertion unexpectedly aborted the test.";
     } else if (!expected_to_finish_ && finished_) {
       FAIL() << "The failed predicate assertion didn't abort the test "
                 "as expected.";
@@ -1301,7 +1299,7 @@ class Predicate4Test : public testing::Test {
 
     // Verifies that the control flow in the test function is expected.
     if (expected_to_finish_ && !finished_) {
-      FAIL() << "The predicate assertion unexpactedly aborted the test.";
+      FAIL() << "The predicate assertion unexpectedly aborted the test.";
     } else if (!expected_to_finish_ && finished_) {
       FAIL() << "The failed predicate assertion didn't abort the test "
                 "as expected.";
@@ -1722,7 +1720,7 @@ class Predicate5Test : public testing::Test {
 
     // Verifies that the control flow in the test function is expected.
     if (expected_to_finish_ && !finished_) {
-      FAIL() << "The predicate assertion unexpactedly aborted the test.";
+      FAIL() << "The predicate assertion unexpectedly aborted the test.";
     } else if (!expected_to_finish_ && finished_) {
       FAIL() << "The failed predicate assertion didn't abort the test "
                 "as expected.";
diff --git a/external/googletest/googletest/test/gtest_prod_test.cc b/external/googletest/googletest/test/gtest_prod_test.cc
index 3b2616eb..ede81a0d 100644
--- a/external/googletest/googletest/test/gtest_prod_test.cc
+++ b/external/googletest/googletest/test/gtest_prod_test.cc
@@ -30,8 +30,8 @@
 //
 // Unit test for gtest_prod.h.
 
-#include "gtest/gtest.h"
 #include "production.h"
+#include "gtest/gtest.h"
 
 // Tests that private members can be accessed from a TEST declared as
 // a friend of the class.
diff --git a/external/googletest/googletest/test/gtest_repeat_test.cc b/external/googletest/googletest/test/gtest_repeat_test.cc
index ad2e3e9a..55103d0e 100644
--- a/external/googletest/googletest/test/gtest_repeat_test.cc
+++ b/external/googletest/googletest/test/gtest_repeat_test.cc
@@ -36,18 +36,6 @@
 #include "gtest/gtest.h"
 #include "src/gtest-internal-inl.h"
 
-namespace testing {
-
-GTEST_DECLARE_string_(death_test_style);
-GTEST_DECLARE_string_(filter);
-GTEST_DECLARE_int32_(repeat);
-
-}  // namespace testing
-
-using testing::GTEST_FLAG(death_test_style);
-using testing::GTEST_FLAG(filter);
-using testing::GTEST_FLAG(repeat);
-
 namespace {
 
 // We need this when we are testing Google Test itself and therefore
@@ -73,7 +61,6 @@ int g_environment_tear_down_count = 0;
 
 class MyEnvironment : public testing::Environment {
  public:
-  MyEnvironment() {}
   void SetUp() override { g_environment_set_up_count++; }
   void TearDown() override { g_environment_tear_down_count++; }
 };
@@ -101,10 +88,10 @@ int g_death_test_count = 0;
 TEST(BarDeathTest, ThreadSafeAndFast) {
   g_death_test_count++;
 
-  GTEST_FLAG(death_test_style) = "threadsafe";
+  GTEST_FLAG_SET(death_test_style, "threadsafe");
   EXPECT_DEATH_IF_SUPPORTED(::testing::internal::posix::Abort(), "");
 
-  GTEST_FLAG(death_test_style) = "fast";
+  GTEST_FLAG_SET(death_test_style, "fast");
   EXPECT_DEATH_IF_SUPPORTED(::testing::internal::posix::Abort(), "");
 }
 
@@ -129,6 +116,7 @@ void ResetCounts() {
   g_should_pass_count = 0;
   g_death_test_count = 0;
   g_param_test_count = 0;
+  testing::AddGlobalTestEnvironment(new MyEnvironment);
 }
 
 // Checks that the count for each test is expected.
@@ -150,7 +138,8 @@ void TestRepeatUnspecified() {
 
 // Tests the behavior of Google Test when --gtest_repeat has the given value.
 void TestRepeat(int repeat) {
-  GTEST_FLAG(repeat) = repeat;
+  GTEST_FLAG_SET(repeat, repeat);
+  GTEST_FLAG_SET(recreate_environments_when_repeating, true);
 
   ResetCounts();
   GTEST_CHECK_INT_EQ_(repeat > 0 ? 1 : 0, RUN_ALL_TESTS());
@@ -160,8 +149,9 @@ void TestRepeat(int repeat) {
 // Tests using --gtest_repeat when --gtest_filter specifies an empty
 // set of tests.
 void TestRepeatWithEmptyFilter(int repeat) {
-  GTEST_FLAG(repeat) = repeat;
-  GTEST_FLAG(filter) = "None";
+  GTEST_FLAG_SET(repeat, repeat);
+  GTEST_FLAG_SET(recreate_environments_when_repeating, true);
+  GTEST_FLAG_SET(filter, "None");
 
   ResetCounts();
   GTEST_CHECK_INT_EQ_(0, RUN_ALL_TESTS());
@@ -171,8 +161,9 @@ void TestRepeatWithEmptyFilter(int repeat) {
 // Tests using --gtest_repeat when --gtest_filter specifies a set of
 // successful tests.
 void TestRepeatWithFilterForSuccessfulTests(int repeat) {
-  GTEST_FLAG(repeat) = repeat;
-  GTEST_FLAG(filter) = "*-*ShouldFail";
+  GTEST_FLAG_SET(repeat, repeat);
+  GTEST_FLAG_SET(recreate_environments_when_repeating, true);
+  GTEST_FLAG_SET(filter, "*-*ShouldFail");
 
   ResetCounts();
   GTEST_CHECK_INT_EQ_(0, RUN_ALL_TESTS());
@@ -187,8 +178,9 @@ void TestRepeatWithFilterForSuccessfulTests(int repeat) {
 // Tests using --gtest_repeat when --gtest_filter specifies a set of
 // failed tests.
 void TestRepeatWithFilterForFailedTests(int repeat) {
-  GTEST_FLAG(repeat) = repeat;
-  GTEST_FLAG(filter) = "*ShouldFail";
+  GTEST_FLAG_SET(repeat, repeat);
+  GTEST_FLAG_SET(recreate_environments_when_repeating, true);
+  GTEST_FLAG_SET(filter, "*ShouldFail");
 
   ResetCounts();
   GTEST_CHECK_INT_EQ_(1, RUN_ALL_TESTS());
@@ -205,8 +197,6 @@ void TestRepeatWithFilterForFailedTests(int repeat) {
 int main(int argc, char **argv) {
   testing::InitGoogleTest(&argc, argv);
 
-  testing::AddGlobalTestEnvironment(new MyEnvironment);
-
   TestRepeatUnspecified();
   TestRepeat(0);
   TestRepeat(1);
diff --git a/external/googletest/googletest/test/gtest_skip_check_output_test.py b/external/googletest/googletest/test/gtest_skip_check_output_test.py
old mode 100644
new mode 100755
index 760cab13..b30a1650
--- a/external/googletest/googletest/test/gtest_skip_check_output_test.py
+++ b/external/googletest/googletest/test/gtest_skip_check_output_test.py
@@ -35,7 +35,7 @@
 
 import re
 
-import gtest_test_utils
+from googletest.test import gtest_test_utils
 
 # Path to the gtest_skip_in_environment_setup_test binary
 EXE_PATH = gtest_test_utils.GetTestExecutablePath('gtest_skip_test')
@@ -46,14 +46,15 @@
 # Test.
 class SkipEntireEnvironmentTest(gtest_test_utils.TestCase):
 
-    def testSkipEntireEnvironmentTest(self):
-        self.assertIn('Skipped\nskipping single test\n', OUTPUT)
-        skip_fixture = 'Skipped\nskipping all tests for this fixture\n'
-        self.assertIsNotNone(
-            re.search(skip_fixture + '.*' + skip_fixture, OUTPUT, flags=re.DOTALL),
-            repr(OUTPUT))
-        self.assertNotIn('FAILED', OUTPUT)
+  def testSkipEntireEnvironmentTest(self):
+    self.assertIn('Skipped\nskipping single test\n', OUTPUT)
+    skip_fixture = 'Skipped\nskipping all tests for this fixture\n'
+    self.assertIsNotNone(
+        re.search(skip_fixture + '.*' + skip_fixture, OUTPUT, flags=re.DOTALL),
+        repr(OUTPUT),
+    )
+    self.assertNotIn('FAILED', OUTPUT)
 
 
 if __name__ == '__main__':
-    gtest_test_utils.Main()
+  gtest_test_utils.Main()
diff --git a/external/googletest/googletest/test/gtest_skip_environment_check_output_test.py b/external/googletest/googletest/test/gtest_skip_environment_check_output_test.py
old mode 100644
new mode 100755
index 1e6383cb..388a4e95
--- a/external/googletest/googletest/test/gtest_skip_environment_check_output_test.py
+++ b/external/googletest/googletest/test/gtest_skip_environment_check_output_test.py
@@ -33,11 +33,12 @@
 output.
 """
 
-import gtest_test_utils
+from googletest.test import gtest_test_utils
 
 # Path to the gtest_skip_in_environment_setup_test binary
 EXE_PATH = gtest_test_utils.GetTestExecutablePath(
-    'gtest_skip_in_environment_setup_test')
+    'gtest_skip_in_environment_setup_test'
+)
 
 OUTPUT = gtest_test_utils.Subprocess([EXE_PATH]).output
 
@@ -45,10 +46,10 @@
 # Test.
 class SkipEntireEnvironmentTest(gtest_test_utils.TestCase):
 
-    def testSkipEntireEnvironmentTest(self):
-        self.assertIn('Skipping the entire environment', OUTPUT)
-        self.assertNotIn('FAILED', OUTPUT)
+  def testSkipEntireEnvironmentTest(self):
+    self.assertIn('Skipping the entire environment', OUTPUT)
+    self.assertNotIn('FAILED', OUTPUT)
 
 
 if __name__ == '__main__':
-    gtest_test_utils.Main()
+  gtest_test_utils.Main()
diff --git a/external/googletest/googletest/test/gtest_stress_test.cc b/external/googletest/googletest/test/gtest_stress_test.cc
index 24b173ff..af8e757d 100644
--- a/external/googletest/googletest/test/gtest_stress_test.cc
+++ b/external/googletest/googletest/test/gtest_stress_test.cc
@@ -30,12 +30,15 @@
 // Tests that SCOPED_TRACE() and various Google Test assertions can be
 // used in a large number of threads concurrently.
 
+#include <algorithm>
+#include <memory>
+#include <string>
 #include <vector>
 
 #include "gtest/gtest.h"
 #include "src/gtest-internal-inl.h"
 
-#if GTEST_IS_THREADSAFE
+#ifdef GTEST_IS_THREADSAFE
 
 namespace testing {
 namespace {
@@ -118,8 +121,8 @@ TEST(StressTest, CanUseScopedTraceAndAssertionsInManyThreads) {
     std::unique_ptr<ThreadWithParam<int> > threads[kThreadCount];
     Notification threads_can_start;
     for (int i = 0; i != kThreadCount; i++)
-      threads[i].reset(
-          new ThreadWithParam<int>(&ManyAsserts, i, &threads_can_start));
+      threads[i] = std::make_unique<ThreadWithParam<int>>(&ManyAsserts, i,
+                                                          &threads_can_start);
 
     threads_can_start.Notify();
 
diff --git a/external/googletest/googletest/test/gtest_test_utils.py b/external/googletest/googletest/test/gtest_test_utils.py
old mode 100644
new mode 100755
index a1e5a74e..964fa9fa
--- a/external/googletest/googletest/test/gtest_test_utils.py
+++ b/external/googletest/googletest/test/gtest_test_utils.py
@@ -29,9 +29,10 @@
 
 """Unit test utilities for Google C++ Testing and Mocking Framework."""
 # Suppresses the 'Import not at the top of the file' lint complaint.
-# pylint: disable-msg=C6204
+# pylint: disable=g-import-not-at-top
 
 import os
+import subprocess
 import sys
 
 IS_WINDOWS = os.name == 'nt'
@@ -42,16 +43,7 @@
 import shutil
 import tempfile
 import unittest as _test_module
-
-try:
-    import subprocess
-
-    _SUBPROCESS_MODULE_AVAILABLE = True
-except:
-    import popen2
-
-    _SUBPROCESS_MODULE_AVAILABLE = False
-# pylint: enable-msg=C6204
+# pylint: enable=g-import-not-at-top
 
 GTEST_OUTPUT_VAR_NAME = 'GTEST_OUTPUT'
 
@@ -62,255 +54,209 @@
 
 
 def SetEnvVar(env_var, value):
-    """Sets/unsets an environment variable to a given value."""
+  """Sets/unsets an environment variable to a given value."""
 
-    if value is not None:
-        environ[env_var] = value
-    elif env_var in environ:
-        del environ[env_var]
+  if value is not None:
+    environ[env_var] = value
+  elif env_var in environ:
+    del environ[env_var]
 
 
 # Here we expose a class from a particular module, depending on the
-# environment. The comment suppresses the 'Invalid variable name' lint
-# complaint.
-TestCase = _test_module.TestCase  # pylint: disable=C6409
+# environment.
+TestCase = _test_module.TestCase
 
 # Initially maps a flag to its default value. After
 # _ParseAndStripGTestFlags() is called, maps a flag to its actual value.
-_flag_map = {'source_dir': os.path.dirname(sys.argv[0]),
-             'build_dir': os.path.dirname(sys.argv[0])}
+_flag_map = {
+    'source_dir': os.path.dirname(sys.argv[0]),
+    'build_dir': os.path.dirname(sys.argv[0]),
+}
 _gtest_flags_are_parsed = False
 
 
 def _ParseAndStripGTestFlags(argv):
-    """Parses and strips Google Test flags from argv.  This is idempotent."""
-
-    # Suppresses the lint complaint about a global variable since we need it
-    # here to maintain module-wide state.
-    global _gtest_flags_are_parsed  # pylint: disable=W0603
-    if _gtest_flags_are_parsed:
-        return
-
-    _gtest_flags_are_parsed = True
-    for flag in _flag_map:
-        # The environment variable overrides the default value.
-        if flag.upper() in os.environ:
-            _flag_map[flag] = os.environ[flag.upper()]
-
-        # The command line flag overrides the environment variable.
-        i = 1  # Skips the program name.
-        while i < len(argv):
-            prefix = '--' + flag + '='
-            if argv[i].startswith(prefix):
-                _flag_map[flag] = argv[i][len(prefix):]
-                del argv[i]
-                break
-            else:
-                # We don't increment i in case we just found a --gtest_* flag
-                # and removed it from argv.
-                i += 1
+  """Parses and strips Google Test flags from argv.  This is idempotent."""
+
+  global _gtest_flags_are_parsed
+  if _gtest_flags_are_parsed:
+    return
+
+  _gtest_flags_are_parsed = True
+  for flag in _flag_map:
+    # The environment variable overrides the default value.
+    if flag.upper() in os.environ:
+      _flag_map[flag] = os.environ[flag.upper()]
+
+    # The command line flag overrides the environment variable.
+    i = 1  # Skips the program name.
+    while i < len(argv):
+      prefix = '--' + flag + '='
+      if argv[i].startswith(prefix):
+        _flag_map[flag] = argv[i][len(prefix) :]
+        del argv[i]
+        break
+      else:
+        # We don't increment i in case we just found a --gtest_* flag
+        # and removed it from argv.
+        i += 1
 
 
 def GetFlag(flag):
-    """Returns the value of the given flag."""
+  """Returns the value of the given flag."""
 
-    # In case GetFlag() is called before Main(), we always call
-    # _ParseAndStripGTestFlags() here to make sure the --gtest_* flags
-    # are parsed.
-    _ParseAndStripGTestFlags(sys.argv)
+  # In case GetFlag() is called before Main(), we always call
+  # _ParseAndStripGTestFlags() here to make sure the --gtest_* flags
+  # are parsed.
+  _ParseAndStripGTestFlags(sys.argv)
 
-    return _flag_map[flag]
+  return _flag_map[flag]
 
 
 def GetSourceDir():
-    """Returns the absolute path of the directory where the .py files are."""
+  """Returns the absolute path of the directory where the .py files are."""
 
-    return os.path.abspath(GetFlag('source_dir'))
+  return os.path.abspath(GetFlag('source_dir'))
 
 
 def GetBuildDir():
-    """Returns the absolute path of the directory where the test binaries are."""
+  """Returns the absolute path of the directory where the test binaries are."""
 
-    return os.path.abspath(GetFlag('build_dir'))
+  return os.path.abspath(GetFlag('build_dir'))
 
 
 _temp_dir = None
 
-
 def _RemoveTempDir():
-    if _temp_dir:
-        shutil.rmtree(_temp_dir, ignore_errors=True)
-
+  if _temp_dir:
+    shutil.rmtree(_temp_dir, ignore_errors=True)
 
 atexit.register(_RemoveTempDir)
 
 
 def GetTempDir():
-    global _temp_dir
-    if not _temp_dir:
-        _temp_dir = tempfile.mkdtemp()
-    return _temp_dir
+  global _temp_dir
+  if not _temp_dir:
+    _temp_dir = tempfile.mkdtemp()
+  return _temp_dir
 
 
 def GetTestExecutablePath(executable_name, build_dir=None):
-    """Returns the absolute path of the test binary given its name.
+  """Returns the absolute path of the test binary given its name.
 
-    The function will print a message and abort the program if the resulting file
-    doesn't exist.
+  The function will print a message and abort the program if the resulting file
+  doesn't exist.
 
-    Args:
-      executable_name: name of the test binary that the test script runs.
-      build_dir:       directory where to look for executables, by default
-                       the result of GetBuildDir().
+  Args:
+    executable_name: name of the test binary that the test script runs.
+    build_dir:       directory where to look for executables, by default the
+      result of GetBuildDir().
 
-    Returns:
-      The absolute path of the test binary.
-    """
+  Returns:
+    The absolute path of the test binary.
+  """
 
-    path = os.path.abspath(os.path.join(build_dir or GetBuildDir(),
-                                        executable_name))
-    if (IS_WINDOWS or IS_CYGWIN or IS_OS2) and not path.endswith('.exe'):
-        path += '.exe'
+  path = os.path.abspath(
+      os.path.join(build_dir or GetBuildDir(), executable_name)
+  )
+  if (IS_WINDOWS or IS_CYGWIN or IS_OS2) and not path.endswith('.exe'):
+    path += '.exe'
 
-    if not os.path.exists(path):
-        message = (
-                'Unable to find the test binary "%s". Please make sure to provide\n'
-                'a path to the binary via the --build_dir flag or the BUILD_DIR\n'
-                'environment variable.' % path)
-        print >> sys.stderr, message
-        sys.exit(1)
+  if not os.path.exists(path):
+    message = (
+        'Unable to find the test binary "%s". Please make sure to provide\n'
+        'a path to the binary via the --build_dir flag or the BUILD_DIR\n'
+        'environment variable.' % path
+    )
+    print(message, file=sys.stderr)
+    sys.exit(1)
 
-    return path
+  return path
 
 
 def GetExitStatus(exit_code):
-    """Returns the argument to exit(), or -1 if exit() wasn't called.
+  """Returns the argument to exit(), or -1 if exit() wasn't called.
+
+  Args:
+    exit_code: the result value of os.system(command).
+  """
+
+  if os.name == 'nt':
+    # On Windows, os.WEXITSTATUS() doesn't work and os.system() returns
+    # the argument to exit() directly.
+    return exit_code
+  else:
+    # On Unix, os.WEXITSTATUS() must be used to extract the exit status
+    # from the result of os.system().
+    if os.WIFEXITED(exit_code):
+      return os.WEXITSTATUS(exit_code)
+    else:
+      return -1
+
+
+class Subprocess:
+
+  def __init__(self, command, working_dir=None, capture_stderr=True, env=None):
+    """Changes into a specified directory, if provided, and executes a command.
+
+    Restores the old directory afterwards.
 
     Args:
-      exit_code: the result value of os.system(command).
+      command:        The command to run, in the form of sys.argv.
+      working_dir:    The directory to change into.
+      capture_stderr: Determines whether to capture stderr in the output member
+        or to discard it.
+      env:            Dictionary with environment to pass to the subprocess.
+
+    Returns:
+      An object that represents outcome of the executed process. It has the
+      following attributes:
+        terminated_by_signal   True if and only if the child process has been
+                               terminated by a signal.
+        exited                 True if and only if the child process exited
+                               normally.
+        exit_code              The code with which the child process exited.
+        output                 Child process's stdout and stderr output
+                               combined in a string.
     """
 
-    if os.name == 'nt':
-        # On Windows, os.WEXITSTATUS() doesn't work and os.system() returns
-        # the argument to exit() directly.
-        return exit_code
+    if capture_stderr:
+      stderr = subprocess.STDOUT
     else:
-        # On Unix, os.WEXITSTATUS() must be used to extract the exit status
-        # from the result of os.system().
-        if os.WIFEXITED(exit_code):
-            return os.WEXITSTATUS(exit_code)
-        else:
-            return -1
-
-
-class Subprocess:
-    def __init__(self, command, working_dir=None, capture_stderr=True, env=None):
-        """Changes into a specified directory, if provided, and executes a command.
-
-        Restores the old directory afterwards.
-
-        Args:
-          command:        The command to run, in the form of sys.argv.
-          working_dir:    The directory to change into.
-          capture_stderr: Determines whether to capture stderr in the output member
-                          or to discard it.
-          env:            Dictionary with environment to pass to the subprocess.
-
-        Returns:
-          An object that represents outcome of the executed process. It has the
-          following attributes:
-            terminated_by_signal   True if and only if the child process has been
-                                   terminated by a signal.
-            exited                 True if and only if the child process exited
-                                   normally.
-            exit_code              The code with which the child process exited.
-            output                 Child process's stdout and stderr output
-                                   combined in a string.
-        """
-
-        # The subprocess module is the preferrable way of running programs
-        # since it is available and behaves consistently on all platforms,
-        # including Windows. But it is only available starting in python 2.4.
-        # In earlier python versions, we revert to the popen2 module, which is
-        # available in python 2.0 and later but doesn't provide required
-        # functionality (Popen4) under Windows. This allows us to support Mac
-        # OS X 10.4 Tiger, which has python 2.3 installed.
-        if _SUBPROCESS_MODULE_AVAILABLE:
-            if capture_stderr:
-                stderr = subprocess.STDOUT
-            else:
-                stderr = subprocess.PIPE
-
-            p = subprocess.Popen(command,
-                                 stdout=subprocess.PIPE, stderr=stderr,
-                                 cwd=working_dir, universal_newlines=True, env=env)
-            # communicate returns a tuple with the file object for the child's
-            # output.
-            self.output = p.communicate()[0]
-            self._return_code = p.returncode
-        else:
-            old_dir = os.getcwd()
-
-            def _ReplaceEnvDict(dest, src):
-                # Changes made by os.environ.clear are not inheritable by child
-                # processes until Python 2.6. To produce inheritable changes we have
-                # to delete environment items with the del statement.
-                for key in dest.keys():
-                    del dest[key]
-                dest.update(src)
-
-            # When 'env' is not None, backup the environment variables and replace
-            # them with the passed 'env'. When 'env' is None, we simply use the
-            # current 'os.environ' for compatibility with the subprocess.Popen
-            # semantics used above.
-            if env is not None:
-                old_environ = os.environ.copy()
-                _ReplaceEnvDict(os.environ, env)
-
-            try:
-                if working_dir is not None:
-                    os.chdir(working_dir)
-                if capture_stderr:
-                    p = popen2.Popen4(command)
-                else:
-                    p = popen2.Popen3(command)
-                p.tochild.close()
-                self.output = p.fromchild.read()
-                ret_code = p.wait()
-            finally:
-                os.chdir(old_dir)
-
-                # Restore the old environment variables
-                # if they were replaced.
-                if env is not None:
-                    _ReplaceEnvDict(os.environ, old_environ)
-
-            # Converts ret_code to match the semantics of
-            # subprocess.Popen.returncode.
-            if os.WIFSIGNALED(ret_code):
-                self._return_code = -os.WTERMSIG(ret_code)
-            else:  # os.WIFEXITED(ret_code) should return True here.
-                self._return_code = os.WEXITSTATUS(ret_code)
-
-        if bool(self._return_code & 0x80000000):
-            self.terminated_by_signal = True
-            self.exited = False
-        else:
-            self.terminated_by_signal = False
-            self.exited = True
-            self.exit_code = self._return_code
+      stderr = subprocess.PIPE
+
+    p = subprocess.Popen(
+        command,
+        stdout=subprocess.PIPE,
+        stderr=stderr,
+        cwd=working_dir,
+        universal_newlines=True,
+        env=env,
+    )
+    # communicate returns a tuple with the file object for the child's
+    # output.
+    self.output = p.communicate()[0]
+    self._return_code = p.returncode
+
+    if bool(self._return_code & 0x80000000):
+      self.terminated_by_signal = True
+      self.exited = False
+    else:
+      self.terminated_by_signal = False
+      self.exited = True
+      self.exit_code = self._return_code
 
 
 def Main():
-    """Runs the unit test."""
-
-    # We must call _ParseAndStripGTestFlags() before calling
-    # unittest.main().  Otherwise the latter will be confused by the
-    # --gtest_* flags.
-    _ParseAndStripGTestFlags(sys.argv)
-    # The tested binaries should not be writing XML output files unless the
-    # script explicitly instructs them to.
-    if GTEST_OUTPUT_VAR_NAME in os.environ:
-        del os.environ[GTEST_OUTPUT_VAR_NAME]
-
-    _test_module.main()
+  """Runs the unit test."""
+
+  # We must call _ParseAndStripGTestFlags() before calling
+  # unittest.main().  Otherwise the latter will be confused by the
+  # --gtest_* flags.
+  _ParseAndStripGTestFlags(sys.argv)
+  # The tested binaries should not be writing XML output files unless the
+  # script explicitly instructs them to.
+  if GTEST_OUTPUT_VAR_NAME in os.environ:
+    del os.environ[GTEST_OUTPUT_VAR_NAME]
+
+  _test_module.main()
diff --git a/external/googletest/googletest/test/gtest_testbridge_test.py b/external/googletest/googletest/test/gtest_testbridge_test.py
old mode 100644
new mode 100755
index f61249ea..0d58758b
--- a/external/googletest/googletest/test/gtest_testbridge_test.py
+++ b/external/googletest/googletest/test/gtest_testbridge_test.py
@@ -31,7 +31,7 @@
 
 import os
 
-import gtest_test_utils
+from googletest.test import gtest_test_utils
 
 binary_name = 'gtest_testbridge_test_'
 COMMAND = gtest_test_utils.GetTestExecutablePath(binary_name)
@@ -39,25 +39,25 @@
 
 
 def Assert(condition):
-    if not condition:
-        raise AssertionError
+  if not condition:
+    raise AssertionError
 
 
 class GTestTestFilterTest(gtest_test_utils.TestCase):
 
-    def testTestExecutionIsFiltered(self):
-        """Tests that the test filter is picked up from the testbridge env var."""
-        subprocess_env = os.environ.copy()
+  def testTestExecutionIsFiltered(self):
+    """Tests that the test filter is picked up from the testbridge env var."""
+    subprocess_env = os.environ.copy()
 
-        subprocess_env[TESTBRIDGE_NAME] = '*.TestThatSucceeds'
-        p = gtest_test_utils.Subprocess(COMMAND, env=subprocess_env)
+    subprocess_env[TESTBRIDGE_NAME] = '*.TestThatSucceeds'
+    p = gtest_test_utils.Subprocess(COMMAND, env=subprocess_env)
 
-        self.assertEquals(0, p.exit_code)
+    self.assertEqual(0, p.exit_code)
 
-        Assert('filter = *.TestThatSucceeds' in p.output)
-        Assert('[       OK ] TestFilterTest.TestThatSucceeds' in p.output)
-        Assert('[  PASSED  ] 1 test.' in p.output)
+    Assert('filter = *.TestThatSucceeds' in p.output)
+    Assert('[       OK ] TestFilterTest.TestThatSucceeds' in p.output)
+    Assert('[  PASSED  ] 1 test.' in p.output)
 
 
 if __name__ == '__main__':
-    gtest_test_utils.Main()
+  gtest_test_utils.Main()
diff --git a/external/googletest/googletest/test/gtest_throw_on_failure_ex_test.cc b/external/googletest/googletest/test/gtest_throw_on_failure_ex_test.cc
index 3236bab0..25d7c797 100644
--- a/external/googletest/googletest/test/gtest_throw_on_failure_ex_test.cc
+++ b/external/googletest/googletest/test/gtest_throw_on_failure_ex_test.cc
@@ -50,7 +50,7 @@ void Fail(const char* msg) {
 // Tests that an assertion failure throws a subclass of
 // std::runtime_error.
 void TestFailureThrowsRuntimeError() {
-  testing::GTEST_FLAG(throw_on_failure) = true;
+  GTEST_FLAG_SET(throw_on_failure, true);
 
   // A successful assertion shouldn't throw.
   try {
diff --git a/external/googletest/googletest/test/gtest_unittest.cc b/external/googletest/googletest/test/gtest_unittest.cc
index 1730e8b8..559d34c0 100644
--- a/external/googletest/googletest/test/gtest_unittest.cc
+++ b/external/googletest/googletest/test/gtest_unittest.cc
@@ -37,22 +37,19 @@
 // code once "gtest.h" has been #included.
 // Do not move it after other gtest #includes.
 TEST(CommandLineFlagsTest, CanBeAccessedInCodeOnceGTestHIsIncluded) {
-  bool dummy = testing::GTEST_FLAG(also_run_disabled_tests) ||
-               testing::GTEST_FLAG(break_on_failure) ||
-               testing::GTEST_FLAG(catch_exceptions) ||
-               testing::GTEST_FLAG(color) != "unknown" ||
-               testing::GTEST_FLAG(fail_fast) ||
-               testing::GTEST_FLAG(filter) != "unknown" ||
-               testing::GTEST_FLAG(list_tests) ||
-               testing::GTEST_FLAG(output) != "unknown" ||
-               testing::GTEST_FLAG(brief) || testing::GTEST_FLAG(print_time) ||
-               testing::GTEST_FLAG(random_seed) ||
-               testing::GTEST_FLAG(repeat) > 0 ||
-               testing::GTEST_FLAG(show_internal_stack_frames) ||
-               testing::GTEST_FLAG(shuffle) ||
-               testing::GTEST_FLAG(stack_trace_depth) > 0 ||
-               testing::GTEST_FLAG(stream_result_to) != "unknown" ||
-               testing::GTEST_FLAG(throw_on_failure);
+  bool dummy =
+      GTEST_FLAG_GET(also_run_disabled_tests) ||
+      GTEST_FLAG_GET(break_on_failure) || GTEST_FLAG_GET(catch_exceptions) ||
+      GTEST_FLAG_GET(color) != "unknown" || GTEST_FLAG_GET(fail_fast) ||
+      GTEST_FLAG_GET(filter) != "unknown" || GTEST_FLAG_GET(list_tests) ||
+      GTEST_FLAG_GET(output) != "unknown" || GTEST_FLAG_GET(brief) ||
+      GTEST_FLAG_GET(print_time) || GTEST_FLAG_GET(random_seed) ||
+      GTEST_FLAG_GET(repeat) > 0 ||
+      GTEST_FLAG_GET(recreate_environments_when_repeating) ||
+      GTEST_FLAG_GET(show_internal_stack_frames) || GTEST_FLAG_GET(shuffle) ||
+      GTEST_FLAG_GET(stack_trace_depth) > 0 ||
+      GTEST_FLAG_GET(stream_result_to) != "unknown" ||
+      GTEST_FLAG_GET(throw_on_failure);
   EXPECT_TRUE(dummy || !dummy);  // Suppresses warning that dummy is unused.
 }
 
@@ -63,15 +60,34 @@ TEST(CommandLineFlagsTest, CanBeAccessedInCodeOnceGTestHIsIncluded) {
 
 #include <cstdint>
 #include <map>
+#include <memory>
 #include <ostream>
+#include <set>
+#include <stdexcept>
 #include <string>
 #include <type_traits>
 #include <unordered_set>
+#include <utility>
 #include <vector>
 
 #include "gtest/gtest-spi.h"
 #include "src/gtest-internal-inl.h"
 
+struct ConvertibleGlobalType {
+  // The inner enable_if is to ensure invoking is_constructible doesn't fail.
+  // The outer enable_if is to ensure the overload resolution doesn't encounter
+  // an ambiguity.
+  template <
+      class T,
+      std::enable_if_t<
+          false, std::enable_if_t<std::is_constructible<T>::value, int>> = 0>
+  operator T() const;  // NOLINT(google-explicit-constructor)
+};
+void operator<<(ConvertibleGlobalType&, int);
+static_assert(sizeof(decltype(std::declval<ConvertibleGlobalType&>()
+                              << 1)(*)()) > 0,
+              "error in operator<< overload resolution");
+
 namespace testing {
 namespace internal {
 
@@ -114,15 +130,15 @@ TEST_F(StreamingListenerTest, OnTestIterationEnd) {
   EXPECT_EQ("event=TestIterationEnd&passed=1&elapsed_time=0ms\n", *output());
 }
 
-TEST_F(StreamingListenerTest, OnTestCaseStart) {
+TEST_F(StreamingListenerTest, OnTestSuiteStart) {
   *output() = "";
-  streamer_.OnTestCaseStart(TestCase("FooTest", "Bar", nullptr, nullptr));
+  streamer_.OnTestSuiteStart(TestSuite("FooTest", "Bar", nullptr, nullptr));
   EXPECT_EQ("event=TestCaseStart&name=FooTest\n", *output());
 }
 
-TEST_F(StreamingListenerTest, OnTestCaseEnd) {
+TEST_F(StreamingListenerTest, OnTestSuiteEnd) {
   *output() = "";
-  streamer_.OnTestCaseEnd(TestCase("FooTest", "Bar", nullptr, nullptr));
+  streamer_.OnTestSuiteEnd(TestSuite("FooTest", "Bar", nullptr, nullptr));
   EXPECT_EQ("event=TestCaseEnd&passed=1&elapsed_time=0ms\n", *output());
 }
 
@@ -140,8 +156,8 @@ TEST_F(StreamingListenerTest, OnTestEnd) {
 
 TEST_F(StreamingListenerTest, OnTestPartResult) {
   *output() = "";
-  streamer_.OnTestPartResult(TestPartResult(
-      TestPartResult::kFatalFailure, "foo.cc", 42, "failed=\n&%"));
+  streamer_.OnTestPartResult(TestPartResult(TestPartResult::kFatalFailure,
+                                            "foo.cc", 42, "failed=\n&%"));
 
   // Meta characters in the failure message should be properly escaped.
   EXPECT_EQ(
@@ -173,7 +189,7 @@ class TestEventListenersAccessor {
   }
 
   static void SuppressEventForwarding(TestEventListeners* listeners) {
-    listeners->SuppressEventForwarding();
+    listeners->SuppressEventForwarding(true);
   }
 };
 
@@ -199,24 +215,6 @@ using testing::DoubleLE;
 using testing::EmptyTestEventListener;
 using testing::Environment;
 using testing::FloatLE;
-using testing::GTEST_FLAG(also_run_disabled_tests);
-using testing::GTEST_FLAG(break_on_failure);
-using testing::GTEST_FLAG(catch_exceptions);
-using testing::GTEST_FLAG(color);
-using testing::GTEST_FLAG(death_test_use_fork);
-using testing::GTEST_FLAG(fail_fast);
-using testing::GTEST_FLAG(filter);
-using testing::GTEST_FLAG(list_tests);
-using testing::GTEST_FLAG(output);
-using testing::GTEST_FLAG(brief);
-using testing::GTEST_FLAG(print_time);
-using testing::GTEST_FLAG(random_seed);
-using testing::GTEST_FLAG(repeat);
-using testing::GTEST_FLAG(show_internal_stack_frames);
-using testing::GTEST_FLAG(shuffle);
-using testing::GTEST_FLAG(stack_trace_depth);
-using testing::GTEST_FLAG(stream_result_to);
-using testing::GTEST_FLAG(throw_on_failure);
 using testing::IsNotSubstring;
 using testing::IsSubstring;
 using testing::kMaxStackTraceDepth;
@@ -230,7 +228,6 @@ using testing::TestPartResult;
 using testing::TestPartResultArray;
 using testing::TestProperty;
 using testing::TestResult;
-using testing::TestSuite;
 using testing::TimeInMillis;
 using testing::UnitTest;
 using testing::internal::AlwaysFalse;
@@ -246,7 +243,6 @@ using testing::internal::FloatingPoint;
 using testing::internal::ForEach;
 using testing::internal::FormatEpochTimeInMillisAsIso8601;
 using testing::internal::FormatTimeInMillisAsSeconds;
-using testing::internal::GetCurrentOsStackTraceExceptTop;
 using testing::internal::GetElementOr;
 using testing::internal::GetNextRandomSeed;
 using testing::internal::GetRandomSeedFromFlag;
@@ -263,9 +259,7 @@ using testing::internal::IsNotContainer;
 using testing::internal::kMaxRandomSeed;
 using testing::internal::kTestTypeIdInGoogleTest;
 using testing::internal::NativeArray;
-using testing::internal::OsStackTraceGetter;
-using testing::internal::OsStackTraceGetterInterface;
-using testing::internal::ParseInt32Flag;
+using testing::internal::ParseFlag;
 using testing::internal::RelationToSourceCopy;
 using testing::internal::RelationToSourceReference;
 using testing::internal::ShouldRunTestOnShard;
@@ -278,7 +272,6 @@ using testing::internal::StreamableToString;
 using testing::internal::String;
 using testing::internal::TestEventListenersAccessor;
 using testing::internal::TestResultAccessor;
-using testing::internal::UnitTestImpl;
 using testing::internal::WideStringToUtf8;
 using testing::internal::edit_distance::CalculateOptimalEdits;
 using testing::internal::edit_distance::CreateUnifiedDiff;
@@ -289,15 +282,13 @@ using testing::internal::CaptureStdout;
 using testing::internal::GetCapturedStdout;
 #endif
 
-#if GTEST_IS_THREADSAFE
+#ifdef GTEST_IS_THREADSAFE
 using testing::internal::ThreadWithParam;
 #endif
 
-class TestingVector : public std::vector<int> {
-};
+class TestingVector : public std::vector<int> {};
 
-::std::ostream& operator<<(::std::ostream& os,
-                           const TestingVector& vector) {
+::std::ostream& operator<<(::std::ostream& os, const TestingVector& vector) {
   os << "{ ";
   for (size_t i = 0; i < vector.size(); i++) {
     os << vector[i] << " ";
@@ -404,7 +395,7 @@ TEST(CanonicalizeForStdLibVersioning, ElidesDoubleUnderNames) {
 // Tests FormatTimeInMillisAsSeconds().
 
 TEST(FormatTimeInMillisAsSecondsTest, FormatsZero) {
-  EXPECT_EQ("0", FormatTimeInMillisAsSeconds(0));
+  EXPECT_EQ("0.", FormatTimeInMillisAsSeconds(0));
 }
 
 TEST(FormatTimeInMillisAsSecondsTest, FormatsPositiveNumber) {
@@ -412,7 +403,11 @@ TEST(FormatTimeInMillisAsSecondsTest, FormatsPositiveNumber) {
   EXPECT_EQ("0.01", FormatTimeInMillisAsSeconds(10));
   EXPECT_EQ("0.2", FormatTimeInMillisAsSeconds(200));
   EXPECT_EQ("1.2", FormatTimeInMillisAsSeconds(1200));
-  EXPECT_EQ("3", FormatTimeInMillisAsSeconds(3000));
+  EXPECT_EQ("3.", FormatTimeInMillisAsSeconds(3000));
+  EXPECT_EQ("10.", FormatTimeInMillisAsSeconds(10000));
+  EXPECT_EQ("100.", FormatTimeInMillisAsSeconds(100000));
+  EXPECT_EQ("123.456", FormatTimeInMillisAsSeconds(123456));
+  EXPECT_EQ("1234567.89", FormatTimeInMillisAsSeconds(1234567890));
 }
 
 TEST(FormatTimeInMillisAsSecondsTest, FormatsNegativeNumber) {
@@ -420,14 +415,21 @@ TEST(FormatTimeInMillisAsSecondsTest, FormatsNegativeNumber) {
   EXPECT_EQ("-0.01", FormatTimeInMillisAsSeconds(-10));
   EXPECT_EQ("-0.2", FormatTimeInMillisAsSeconds(-200));
   EXPECT_EQ("-1.2", FormatTimeInMillisAsSeconds(-1200));
-  EXPECT_EQ("-3", FormatTimeInMillisAsSeconds(-3000));
+  EXPECT_EQ("-3.", FormatTimeInMillisAsSeconds(-3000));
+  EXPECT_EQ("-10.", FormatTimeInMillisAsSeconds(-10000));
+  EXPECT_EQ("-100.", FormatTimeInMillisAsSeconds(-100000));
+  EXPECT_EQ("-123.456", FormatTimeInMillisAsSeconds(-123456));
+  EXPECT_EQ("-1234567.89", FormatTimeInMillisAsSeconds(-1234567890));
 }
 
+// TODO: b/287046337 - In emscripten, local time zone modification is not
+// supported.
+#if !defined(__EMSCRIPTEN__)
 // Tests FormatEpochTimeInMillisAsIso8601().  The correctness of conversion
 // for particular dates below was verified in Python using
-// datetime.datetime.fromutctimestamp(<timetamp>/1000).
+// datetime.datetime.fromutctimestamp(<timestamp>/1000).
 
-// FormatEpochTimeInMillisAsIso8601 depends on the current timezone, so we
+// FormatEpochTimeInMillisAsIso8601 depends on the local timezone, so we
 // have to set up a particular timezone to obtain predictable results.
 class FormatEpochTimeInMillisAsIso8601Test : public Test {
  public:
@@ -438,30 +440,29 @@ class FormatEpochTimeInMillisAsIso8601Test : public Test {
 
  private:
   void SetUp() override {
-    saved_tz_ = nullptr;
+    saved_tz_.reset();
 
-    GTEST_DISABLE_MSC_DEPRECATED_PUSH_(/* getenv, strdup: deprecated */)
-    if (getenv("TZ"))
-      saved_tz_ = strdup(getenv("TZ"));
+    GTEST_DISABLE_MSC_DEPRECATED_PUSH_(/* getenv: deprecated */)
+    if (const char* tz = getenv("TZ")) {
+      saved_tz_ = std::make_unique<std::string>(tz);
+    }
     GTEST_DISABLE_MSC_DEPRECATED_POP_()
 
-    // Set up the time zone for FormatEpochTimeInMillisAsIso8601 to use.  We
-    // cannot use the local time zone because the function's output depends
-    // on the time zone.
+    // Set the local time zone for FormatEpochTimeInMillisAsIso8601 to be
+    // a fixed time zone for reproducibility purposes.
     SetTimeZone("UTC+00");
   }
 
   void TearDown() override {
-    SetTimeZone(saved_tz_);
-    free(const_cast<char*>(saved_tz_));
-    saved_tz_ = nullptr;
+    SetTimeZone(saved_tz_ != nullptr ? saved_tz_->c_str() : nullptr);
+    saved_tz_.reset();
   }
 
   static void SetTimeZone(const char* time_zone) {
     // tzset() distinguishes between the TZ variable being present and empty
     // and not being present, so we have to consider the case of time_zone
     // being NULL.
-#if _MSC_VER || GTEST_OS_WINDOWS_MINGW
+#if defined(_MSC_VER) || defined(GTEST_OS_WINDOWS_MINGW)
     // ...Unless it's MSVC, whose standard library's _putenv doesn't
     // distinguish between an empty and a missing variable.
     const std::string env_var =
@@ -471,6 +472,12 @@ class FormatEpochTimeInMillisAsIso8601Test : public Test {
     tzset();
     GTEST_DISABLE_MSC_WARNINGS_POP_()
 #else
+#if defined(GTEST_OS_LINUX_ANDROID) && __ANDROID_API__ < 21
+    // Work around KitKat bug in tzset by setting "UTC" before setting "UTC+00".
+    // See https://github.com/android/ndk/issues/1604.
+    setenv("TZ", "UTC", 1);
+    tzset();
+#endif
     if (time_zone) {
       setenv(("TZ"), time_zone, 1);
     } else {
@@ -480,7 +487,7 @@ class FormatEpochTimeInMillisAsIso8601Test : public Test {
 #endif
   }
 
-  const char* saved_tz_;
+  std::unique_ptr<std::string> saved_tz_;  // Empty and null are different here
 };
 
 const TimeInMillis FormatEpochTimeInMillisAsIso8601Test::kMillisPerSec;
@@ -491,9 +498,8 @@ TEST_F(FormatEpochTimeInMillisAsIso8601Test, PrintsTwoDigitSegments) {
 }
 
 TEST_F(FormatEpochTimeInMillisAsIso8601Test, IncludesMillisecondsAfterDot) {
-  EXPECT_EQ(
-      "2011-10-31T18:52:42.234",
-      FormatEpochTimeInMillisAsIso8601(1320087162 * kMillisPerSec + 234));
+  EXPECT_EQ("2011-10-31T18:52:42.234",
+            FormatEpochTimeInMillisAsIso8601(1320087162 * kMillisPerSec + 234));
 }
 
 TEST_F(FormatEpochTimeInMillisAsIso8601Test, PrintsLeadingZeroes) {
@@ -510,10 +516,12 @@ TEST_F(FormatEpochTimeInMillisAsIso8601Test, PrintsEpochStart) {
   EXPECT_EQ("1970-01-01T00:00:00.000", FormatEpochTimeInMillisAsIso8601(0));
 }
 
-# ifdef __BORLANDC__
+#endif  // __EMSCRIPTEN__
+
+#ifdef __BORLANDC__
 // Silences warnings: "Condition is always true", "Unreachable code"
-#  pragma option push -w-ccc -w-rch
-# endif
+#pragma option push -w-ccc -w-rch
+#endif
 
 // Tests that the LHS of EXPECT_EQ or ASSERT_EQ can be used as a null literal
 // when the RHS is a pointer type.
@@ -587,10 +595,10 @@ TEST(NullLiteralTest, NoConversionNoWarning) {
 #pragma clang diagnostic pop
 #endif
 
-# ifdef __BORLANDC__
+#ifdef __BORLANDC__
 // Restores warnings after previous "#pragma option push" suppressed them.
-#  pragma option pop
-# endif
+#pragma option pop
+#endif
 
 //
 // Tests CodePointToUtf8().
@@ -618,20 +626,17 @@ TEST(CodePointToUtf8Test, CanEncode8To11Bits) {
   // Some compilers (e.g., GCC on MinGW) cannot handle non-ASCII codepoints
   // in wide strings and wide chars. In order to accommodate them, we have to
   // introduce such character constants as integers.
-  EXPECT_EQ("\xD5\xB6",
-            CodePointToUtf8(static_cast<wchar_t>(0x576)));
+  EXPECT_EQ("\xD5\xB6", CodePointToUtf8(static_cast<wchar_t>(0x576)));
 }
 
 // Tests that Unicode code-points that have 12 to 16 bits are encoded
 // as 1110xxxx 10xxxxxx 10xxxxxx.
 TEST(CodePointToUtf8Test, CanEncode12To16Bits) {
   // 0000 1000 1101 0011 => 1110-0000 10-100011 10-010011
-  EXPECT_EQ("\xE0\xA3\x93",
-            CodePointToUtf8(static_cast<wchar_t>(0x8D3)));
+  EXPECT_EQ("\xE0\xA3\x93", CodePointToUtf8(static_cast<wchar_t>(0x8D3)));
 
   // 1100 0111 0100 1101 => 1110-1100 10-011101 10-001101
-  EXPECT_EQ("\xEC\x9D\x8D",
-            CodePointToUtf8(static_cast<wchar_t>(0xC74D)));
+  EXPECT_EQ("\xEC\x9D\x8D", CodePointToUtf8(static_cast<wchar_t>(0xC74D)));
 }
 
 #if !GTEST_WIDE_STRING_USES_UTF16_
@@ -683,7 +688,7 @@ TEST(WideStringToUtf8Test, CanEncode8To11Bits) {
   EXPECT_STREQ("\xC3\x93", WideStringToUtf8(L"\xD3", -1).c_str());
 
   // 101 0111 0110 => 110-10101 10-110110
-  const wchar_t s[] = { 0x576, '\0' };
+  const wchar_t s[] = {0x576, '\0'};
   EXPECT_STREQ("\xD5\xB6", WideStringToUtf8(s, 1).c_str());
   EXPECT_STREQ("\xD5\xB6", WideStringToUtf8(s, -1).c_str());
 }
@@ -692,12 +697,12 @@ TEST(WideStringToUtf8Test, CanEncode8To11Bits) {
 // as 1110xxxx 10xxxxxx 10xxxxxx.
 TEST(WideStringToUtf8Test, CanEncode12To16Bits) {
   // 0000 1000 1101 0011 => 1110-0000 10-100011 10-010011
-  const wchar_t s1[] = { 0x8D3, '\0' };
+  const wchar_t s1[] = {0x8D3, '\0'};
   EXPECT_STREQ("\xE0\xA3\x93", WideStringToUtf8(s1, 1).c_str());
   EXPECT_STREQ("\xE0\xA3\x93", WideStringToUtf8(s1, -1).c_str());
 
   // 1100 0111 0100 1101 => 1110-1100 10-011101 10-001101
-  const wchar_t s2[] = { 0xC74D, '\0' };
+  const wchar_t s2[] = {0xC74D, '\0'};
   EXPECT_STREQ("\xEC\x9D\x8D", WideStringToUtf8(s2, 1).c_str());
   EXPECT_STREQ("\xEC\x9D\x8D", WideStringToUtf8(s2, -1).c_str());
 }
@@ -732,11 +737,11 @@ TEST(WideStringToUtf8Test, CanEncodeInvalidCodePoint) {
   EXPECT_STREQ("(Invalid Unicode 0xABCDFF)",
                WideStringToUtf8(L"\xABCDFF", -1).c_str());
 }
-#else  // !GTEST_WIDE_STRING_USES_UTF16_
+#else   // !GTEST_WIDE_STRING_USES_UTF16_
 // Tests that surrogate pairs are encoded correctly on the systems using
 // UTF-16 encoding in the wide strings.
 TEST(WideStringToUtf8Test, CanEncodeValidUtf16SUrrogatePairs) {
-  const wchar_t s[] = { 0xD801, 0xDC00, '\0' };
+  const wchar_t s[] = {0xD801, 0xDC00, '\0'};
   EXPECT_STREQ("\xF0\x90\x90\x80", WideStringToUtf8(s, -1).c_str());
 }
 
@@ -744,13 +749,13 @@ TEST(WideStringToUtf8Test, CanEncodeValidUtf16SUrrogatePairs) {
 // generates the expected result.
 TEST(WideStringToUtf8Test, CanEncodeInvalidUtf16SurrogatePair) {
   // Leading surrogate is at the end of the string.
-  const wchar_t s1[] = { 0xD800, '\0' };
+  const wchar_t s1[] = {0xD800, '\0'};
   EXPECT_STREQ("\xED\xA0\x80", WideStringToUtf8(s1, -1).c_str());
   // Leading surrogate is not followed by the trailing surrogate.
-  const wchar_t s2[] = { 0xD800, 'M', '\0' };
+  const wchar_t s2[] = {0xD800, 'M', '\0'};
   EXPECT_STREQ("\xED\xA0\x80M", WideStringToUtf8(s2, -1).c_str());
   // Trailing surrogate appearas without a leading surrogate.
-  const wchar_t s3[] = { 0xDC00, 'P', 'Q', 'R', '\0' };
+  const wchar_t s3[] = {0xDC00, 'P', 'Q', 'R', '\0'};
   EXPECT_STREQ("\xED\xB0\x80PQR", WideStringToUtf8(s3, -1).c_str());
 }
 #endif  // !GTEST_WIDE_STRING_USES_UTF16_
@@ -758,21 +763,24 @@ TEST(WideStringToUtf8Test, CanEncodeInvalidUtf16SurrogatePair) {
 // Tests that codepoint concatenation works correctly.
 #if !GTEST_WIDE_STRING_USES_UTF16_
 TEST(WideStringToUtf8Test, ConcatenatesCodepointsCorrectly) {
-  const wchar_t s[] = { 0x108634, 0xC74D, '\n', 0x576, 0x8D3, 0x108634, '\0'};
+  const wchar_t s[] = {0x108634, 0xC74D, '\n', 0x576, 0x8D3, 0x108634, '\0'};
   EXPECT_STREQ(
       "\xF4\x88\x98\xB4"
-          "\xEC\x9D\x8D"
-          "\n"
-          "\xD5\xB6"
-          "\xE0\xA3\x93"
-          "\xF4\x88\x98\xB4",
+      "\xEC\x9D\x8D"
+      "\n"
+      "\xD5\xB6"
+      "\xE0\xA3\x93"
+      "\xF4\x88\x98\xB4",
       WideStringToUtf8(s, -1).c_str());
 }
 #else
 TEST(WideStringToUtf8Test, ConcatenatesCodepointsCorrectly) {
-  const wchar_t s[] = { 0xC74D, '\n', 0x576, 0x8D3, '\0'};
+  const wchar_t s[] = {0xC74D, '\n', 0x576, 0x8D3, '\0'};
   EXPECT_STREQ(
-      "\xEC\x9D\x8D" "\n" "\xD5\xB6" "\xE0\xA3\x93",
+      "\xEC\x9D\x8D"
+      "\n"
+      "\xD5\xB6"
+      "\xE0\xA3\x93",
       WideStringToUtf8(s, -1).c_str());
 }
 #endif  // !GTEST_WIDE_STRING_USES_UTF16_
@@ -781,9 +789,8 @@ TEST(WideStringToUtf8Test, ConcatenatesCodepointsCorrectly) {
 
 TEST(RandomDeathTest, GeneratesCrashesOnInvalidRange) {
   testing::internal::Random random(42);
-  EXPECT_DEATH_IF_SUPPORTED(
-      random.Generate(0),
-      "Cannot generate a number in the range \\[0, 0\\)");
+  EXPECT_DEATH_IF_SUPPORTED(random.Generate(0),
+                            "Cannot generate a number in the range \\[0, 0\\)");
   EXPECT_DEATH_IF_SUPPORTED(
       random.Generate(testing::internal::Random::kMaxRange + 1),
       "Generation of a number in \\[0, 2147483649\\) was requested, "
@@ -912,7 +919,7 @@ class VectorShuffleTest : public Test {
       return true;
     }
 
-    bool found_in_vector[kVectorSize] = { false };
+    bool found_in_vector[kVectorSize] = {false};
     for (size_t i = 0; i < vector.size(); i++) {
       const int e = vector[i];
       if (e < 0 || e >= static_cast<int>(kVectorSize) || found_in_vector[e]) {
@@ -939,8 +946,8 @@ class VectorShuffleTest : public Test {
     return false;
   }
 
-  static bool RangeIsUnshuffled(
-      const TestingVector& vector, int begin, int end) {
+  static bool RangeIsUnshuffled(const TestingVector& vector, int begin,
+                                int end) {
     return !RangeIsShuffled(vector, begin, end);
   }
 
@@ -965,7 +972,7 @@ TEST_F(VectorShuffleTest, HandlesEmptyRange) {
   ASSERT_PRED1(VectorIsUnshuffled, vector_);
 
   // ...in the middle...
-  ShuffleRange(&random_, kVectorSize/2, kVectorSize/2, &vector_);
+  ShuffleRange(&random_, kVectorSize / 2, kVectorSize / 2, &vector_);
   ASSERT_PRED1(VectorIsNotCorrupt, vector_);
   ASSERT_PRED1(VectorIsUnshuffled, vector_);
 
@@ -987,7 +994,7 @@ TEST_F(VectorShuffleTest, HandlesRangeOfSizeOne) {
   ASSERT_PRED1(VectorIsUnshuffled, vector_);
 
   // ...in the middle...
-  ShuffleRange(&random_, kVectorSize/2, kVectorSize/2 + 1, &vector_);
+  ShuffleRange(&random_, kVectorSize / 2, kVectorSize / 2 + 1, &vector_);
   ASSERT_PRED1(VectorIsNotCorrupt, vector_);
   ASSERT_PRED1(VectorIsUnshuffled, vector_);
 
@@ -1012,7 +1019,7 @@ TEST_F(VectorShuffleTest, ShufflesEntireVector) {
 }
 
 TEST_F(VectorShuffleTest, ShufflesStartOfVector) {
-  const int kRangeSize = kVectorSize/2;
+  const int kRangeSize = kVectorSize / 2;
 
   ShuffleRange(&random_, 0, kRangeSize, &vector_);
 
@@ -1034,11 +1041,11 @@ TEST_F(VectorShuffleTest, ShufflesEndOfVector) {
 
 TEST_F(VectorShuffleTest, ShufflesMiddleOfVector) {
   const int kRangeSize = static_cast<int>(kVectorSize) / 3;
-  ShuffleRange(&random_, kRangeSize, 2*kRangeSize, &vector_);
+  ShuffleRange(&random_, kRangeSize, 2 * kRangeSize, &vector_);
 
   ASSERT_PRED1(VectorIsNotCorrupt, vector_);
   EXPECT_PRED3(RangeIsUnshuffled, vector_, 0, kRangeSize);
-  EXPECT_PRED3(RangeIsShuffled, vector_, kRangeSize, 2*kRangeSize);
+  EXPECT_PRED3(RangeIsShuffled, vector_, kRangeSize, 2 * kRangeSize);
   EXPECT_PRED3(RangeIsUnshuffled, vector_, 2 * kRangeSize,
                static_cast<int>(kVectorSize));
 }
@@ -1099,17 +1106,16 @@ TEST(StringTest, CaseInsensitiveWideCStringEquals) {
   EXPECT_TRUE(String::CaseInsensitiveWideCStringEquals(L"FOOBAR", L"foobar"));
 }
 
-#if GTEST_OS_WINDOWS
+#ifdef GTEST_OS_WINDOWS
 
 // Tests String::ShowWideCString().
 TEST(StringTest, ShowWideCString) {
-  EXPECT_STREQ("(null)",
-               String::ShowWideCString(NULL).c_str());
+  EXPECT_STREQ("(null)", String::ShowWideCString(NULL).c_str());
   EXPECT_STREQ("", String::ShowWideCString(L"").c_str());
   EXPECT_STREQ("foo", String::ShowWideCString(L"foo").c_str());
 }
 
-# if GTEST_OS_WINDOWS_MOBILE
+#ifdef GTEST_OS_WINDOWS_MOBILE
 TEST(StringTest, AnsiAndUtf16Null) {
   EXPECT_EQ(NULL, String::AnsiToUtf16(NULL));
   EXPECT_EQ(NULL, String::Utf16ToAnsi(NULL));
@@ -1118,21 +1124,21 @@ TEST(StringTest, AnsiAndUtf16Null) {
 TEST(StringTest, AnsiAndUtf16ConvertBasic) {
   const char* ansi = String::Utf16ToAnsi(L"str");
   EXPECT_STREQ("str", ansi);
-  delete [] ansi;
+  delete[] ansi;
   const WCHAR* utf16 = String::AnsiToUtf16("str");
   EXPECT_EQ(0, wcsncmp(L"str", utf16, 3));
-  delete [] utf16;
+  delete[] utf16;
 }
 
 TEST(StringTest, AnsiAndUtf16ConvertPathChars) {
   const char* ansi = String::Utf16ToAnsi(L".:\\ \"*?");
   EXPECT_STREQ(".:\\ \"*?", ansi);
-  delete [] ansi;
+  delete[] ansi;
   const WCHAR* utf16 = String::AnsiToUtf16(".:\\ \"*?");
   EXPECT_EQ(0, wcsncmp(L".:\\ \"*?", utf16, 3));
-  delete [] utf16;
+  delete[] utf16;
 }
-# endif  // GTEST_OS_WINDOWS_MOBILE
+#endif  // GTEST_OS_WINDOWS_MOBILE
 
 #endif  // GTEST_OS_WINDOWS
 
@@ -1154,9 +1160,7 @@ TEST(TestPropertyTest, ReplaceStringValue) {
 // AddFatalFailure() and AddNonfatalFailure() must be stand-alone
 // functions (i.e. their definitions cannot be inlined at the call
 // sites), or C++Builder won't compile the code.
-static void AddFatalFailure() {
-  FAIL() << "Expected fatal failure.";
-}
+static void AddFatalFailure() { FAIL() << "Expected fatal failure."; }
 
 static void AddNonfatalFailure() {
   ADD_FAILURE() << "Expected non-fatal failure.";
@@ -1164,10 +1168,7 @@ static void AddNonfatalFailure() {
 
 class ScopedFakeTestPartResultReporterTest : public Test {
  public:  // Must be public and not protected due to a bug in g++ 3.4.2.
-  enum FailureMode {
-    FATAL_FAILURE,
-    NONFATAL_FAILURE
-  };
+  enum FailureMode { FATAL_FAILURE, NONFATAL_FAILURE };
   static void AddFailure(FailureMode failure) {
     if (failure == FATAL_FAILURE) {
       AddFatalFailure();
@@ -1204,10 +1205,10 @@ TEST_F(ScopedFakeTestPartResultReporterTest, DeprecatedConstructor) {
   EXPECT_EQ(1, results.size());
 }
 
-#if GTEST_IS_THREADSAFE
+#ifdef GTEST_IS_THREADSAFE
 
 class ScopedFakeTestPartResultReporterWithThreadsTest
-  : public ScopedFakeTestPartResultReporterTest {
+    : public ScopedFakeTestPartResultReporterTest {
  protected:
   static void AddFailureInOtherThread(FailureMode failure) {
     ThreadWithParam<FailureMode> thread(&AddFailure, failure, nullptr);
@@ -1260,7 +1261,7 @@ TEST_F(ExpectFatalFailureTest, CatchesFatalFailureOnAllThreads) {
 
 #ifdef __BORLANDC__
 // Silences warnings: "Condition is always true"
-# pragma option push -w-ccc
+#pragma option push -w-ccc
 #endif
 
 // Tests that EXPECT_FATAL_FAILURE() can be used in a non-void
@@ -1288,7 +1289,7 @@ void DoesNotAbortHelper(bool* aborted) {
 
 #ifdef __BORLANDC__
 // Restores warnings after previous "#pragma option push" suppressed them.
-# pragma option pop
+#pragma option pop
 #endif
 
 TEST_F(ExpectFatalFailureTest, DoesNotAbort) {
@@ -1307,16 +1308,20 @@ static int global_var = 0;
 TEST_F(ExpectFatalFailureTest, AcceptsMacroThatExpandsToUnprotectedComma) {
 #ifndef __BORLANDC__
   // ICE's in C++Builder.
-  EXPECT_FATAL_FAILURE({
-    GTEST_USE_UNPROTECTED_COMMA_;
-    AddFatalFailure();
-  }, "");
+  EXPECT_FATAL_FAILURE(
+      {
+        GTEST_USE_UNPROTECTED_COMMA_;
+        AddFatalFailure();
+      },
+      "");
 #endif
 
-  EXPECT_FATAL_FAILURE_ON_ALL_THREADS({
-    GTEST_USE_UNPROTECTED_COMMA_;
-    AddFatalFailure();
-  }, "");
+  EXPECT_FATAL_FAILURE_ON_ALL_THREADS(
+      {
+        GTEST_USE_UNPROTECTED_COMMA_;
+        AddFatalFailure();
+      },
+      "");
 }
 
 // Tests EXPECT_NONFATAL_FAILURE{,ON_ALL_THREADS}.
@@ -1324,8 +1329,7 @@ TEST_F(ExpectFatalFailureTest, AcceptsMacroThatExpandsToUnprotectedComma) {
 typedef ScopedFakeTestPartResultReporterTest ExpectNonfatalFailureTest;
 
 TEST_F(ExpectNonfatalFailureTest, CatchesNonfatalFailure) {
-  EXPECT_NONFATAL_FAILURE(AddNonfatalFailure(),
-                          "Expected non-fatal failure.");
+  EXPECT_NONFATAL_FAILURE(AddNonfatalFailure(), "Expected non-fatal failure.");
 }
 
 TEST_F(ExpectNonfatalFailureTest, AcceptsStdStringObject) {
@@ -1344,18 +1348,22 @@ TEST_F(ExpectNonfatalFailureTest, CatchesNonfatalFailureOnAllThreads) {
 // statement that contains a macro which expands to code containing an
 // unprotected comma.
 TEST_F(ExpectNonfatalFailureTest, AcceptsMacroThatExpandsToUnprotectedComma) {
-  EXPECT_NONFATAL_FAILURE({
-    GTEST_USE_UNPROTECTED_COMMA_;
-    AddNonfatalFailure();
-  }, "");
+  EXPECT_NONFATAL_FAILURE(
+      {
+        GTEST_USE_UNPROTECTED_COMMA_;
+        AddNonfatalFailure();
+      },
+      "");
 
-  EXPECT_NONFATAL_FAILURE_ON_ALL_THREADS({
-    GTEST_USE_UNPROTECTED_COMMA_;
-    AddNonfatalFailure();
-  }, "");
+  EXPECT_NONFATAL_FAILURE_ON_ALL_THREADS(
+      {
+        GTEST_USE_UNPROTECTED_COMMA_;
+        AddNonfatalFailure();
+      },
+      "");
 }
 
-#if GTEST_IS_THREADSAFE
+#ifdef GTEST_IS_THREADSAFE
 
 typedef ScopedFakeTestPartResultReporterWithThreadsTest
     ExpectFailureWithThreadsTest;
@@ -1396,21 +1404,18 @@ class TestResultTest : public Test {
   typedef std::vector<TestPartResult> TPRVector;
 
   // We make use of 2 TestPartResult objects,
-  TestPartResult * pr1, * pr2;
+  TestPartResult *pr1, *pr2;
 
   // ... and 3 TestResult objects.
-  TestResult * r0, * r1, * r2;
+  TestResult *r0, *r1, *r2;
 
   void SetUp() override {
     // pr1 is for success.
-    pr1 = new TestPartResult(TestPartResult::kSuccess,
-                             "foo/bar.cc",
-                             10,
+    pr1 = new TestPartResult(TestPartResult::kSuccess, "foo/bar.cc", 10,
                              "Success!");
 
     // pr2 is for fatal failure.
-    pr2 = new TestPartResult(TestPartResult::kFatalFailure,
-                             "foo/bar.cc",
+    pr2 = new TestPartResult(TestPartResult::kFatalFailure, "foo/bar.cc",
                              -1,  // This line number means "unknown"
                              "Failure!");
 
@@ -1423,10 +1428,10 @@ class TestResultTest : public Test {
     // state, in particular the TestPartResult vector it holds.
     // test_part_results() returns a const reference to this vector.
     // We cast it to a non-const object s.t. it can be modified
-    TPRVector* results1 = const_cast<TPRVector*>(
-        &TestResultAccessor::test_part_results(*r1));
-    TPRVector* results2 = const_cast<TPRVector*>(
-        &TestResultAccessor::test_part_results(*r2));
+    TPRVector* results1 =
+        const_cast<TPRVector*>(&TestResultAccessor::test_part_results(*r1));
+    TPRVector* results2 =
+        const_cast<TPRVector*>(&TestResultAccessor::test_part_results(*r2));
 
     // r0 is an empty TestResult.
 
@@ -1597,23 +1602,24 @@ class GTestFlagSaverTest : public Test {
   static void SetUpTestSuite() {
     saver_ = new GTestFlagSaver;
 
-    GTEST_FLAG(also_run_disabled_tests) = false;
-    GTEST_FLAG(break_on_failure) = false;
-    GTEST_FLAG(catch_exceptions) = false;
-    GTEST_FLAG(death_test_use_fork) = false;
-    GTEST_FLAG(color) = "auto";
-    GTEST_FLAG(fail_fast) = false;
-    GTEST_FLAG(filter) = "";
-    GTEST_FLAG(list_tests) = false;
-    GTEST_FLAG(output) = "";
-    GTEST_FLAG(brief) = false;
-    GTEST_FLAG(print_time) = true;
-    GTEST_FLAG(random_seed) = 0;
-    GTEST_FLAG(repeat) = 1;
-    GTEST_FLAG(shuffle) = false;
-    GTEST_FLAG(stack_trace_depth) = kMaxStackTraceDepth;
-    GTEST_FLAG(stream_result_to) = "";
-    GTEST_FLAG(throw_on_failure) = false;
+    GTEST_FLAG_SET(also_run_disabled_tests, false);
+    GTEST_FLAG_SET(break_on_failure, false);
+    GTEST_FLAG_SET(catch_exceptions, false);
+    GTEST_FLAG_SET(death_test_use_fork, false);
+    GTEST_FLAG_SET(color, "auto");
+    GTEST_FLAG_SET(fail_fast, false);
+    GTEST_FLAG_SET(filter, "");
+    GTEST_FLAG_SET(list_tests, false);
+    GTEST_FLAG_SET(output, "");
+    GTEST_FLAG_SET(brief, false);
+    GTEST_FLAG_SET(print_time, true);
+    GTEST_FLAG_SET(random_seed, 0);
+    GTEST_FLAG_SET(repeat, 1);
+    GTEST_FLAG_SET(recreate_environments_when_repeating, true);
+    GTEST_FLAG_SET(shuffle, false);
+    GTEST_FLAG_SET(stack_trace_depth, kMaxStackTraceDepth);
+    GTEST_FLAG_SET(stream_result_to, "");
+    GTEST_FLAG_SET(throw_on_failure, false);
   }
 
   // Restores the Google Test flags that the tests have modified.  This will
@@ -1626,41 +1632,43 @@ class GTestFlagSaverTest : public Test {
   // Verifies that the Google Test flags have their default values, and then
   // modifies each of them.
   void VerifyAndModifyFlags() {
-    EXPECT_FALSE(GTEST_FLAG(also_run_disabled_tests));
-    EXPECT_FALSE(GTEST_FLAG(break_on_failure));
-    EXPECT_FALSE(GTEST_FLAG(catch_exceptions));
-    EXPECT_STREQ("auto", GTEST_FLAG(color).c_str());
-    EXPECT_FALSE(GTEST_FLAG(death_test_use_fork));
-    EXPECT_FALSE(GTEST_FLAG(fail_fast));
-    EXPECT_STREQ("", GTEST_FLAG(filter).c_str());
-    EXPECT_FALSE(GTEST_FLAG(list_tests));
-    EXPECT_STREQ("", GTEST_FLAG(output).c_str());
-    EXPECT_FALSE(GTEST_FLAG(brief));
-    EXPECT_TRUE(GTEST_FLAG(print_time));
-    EXPECT_EQ(0, GTEST_FLAG(random_seed));
-    EXPECT_EQ(1, GTEST_FLAG(repeat));
-    EXPECT_FALSE(GTEST_FLAG(shuffle));
-    EXPECT_EQ(kMaxStackTraceDepth, GTEST_FLAG(stack_trace_depth));
-    EXPECT_STREQ("", GTEST_FLAG(stream_result_to).c_str());
-    EXPECT_FALSE(GTEST_FLAG(throw_on_failure));
-
-    GTEST_FLAG(also_run_disabled_tests) = true;
-    GTEST_FLAG(break_on_failure) = true;
-    GTEST_FLAG(catch_exceptions) = true;
-    GTEST_FLAG(color) = "no";
-    GTEST_FLAG(death_test_use_fork) = true;
-    GTEST_FLAG(fail_fast) = true;
-    GTEST_FLAG(filter) = "abc";
-    GTEST_FLAG(list_tests) = true;
-    GTEST_FLAG(output) = "xml:foo.xml";
-    GTEST_FLAG(brief) = true;
-    GTEST_FLAG(print_time) = false;
-    GTEST_FLAG(random_seed) = 1;
-    GTEST_FLAG(repeat) = 100;
-    GTEST_FLAG(shuffle) = true;
-    GTEST_FLAG(stack_trace_depth) = 1;
-    GTEST_FLAG(stream_result_to) = "localhost:1234";
-    GTEST_FLAG(throw_on_failure) = true;
+    EXPECT_FALSE(GTEST_FLAG_GET(also_run_disabled_tests));
+    EXPECT_FALSE(GTEST_FLAG_GET(break_on_failure));
+    EXPECT_FALSE(GTEST_FLAG_GET(catch_exceptions));
+    EXPECT_STREQ("auto", GTEST_FLAG_GET(color).c_str());
+    EXPECT_FALSE(GTEST_FLAG_GET(death_test_use_fork));
+    EXPECT_FALSE(GTEST_FLAG_GET(fail_fast));
+    EXPECT_STREQ("", GTEST_FLAG_GET(filter).c_str());
+    EXPECT_FALSE(GTEST_FLAG_GET(list_tests));
+    EXPECT_STREQ("", GTEST_FLAG_GET(output).c_str());
+    EXPECT_FALSE(GTEST_FLAG_GET(brief));
+    EXPECT_TRUE(GTEST_FLAG_GET(print_time));
+    EXPECT_EQ(0, GTEST_FLAG_GET(random_seed));
+    EXPECT_EQ(1, GTEST_FLAG_GET(repeat));
+    EXPECT_TRUE(GTEST_FLAG_GET(recreate_environments_when_repeating));
+    EXPECT_FALSE(GTEST_FLAG_GET(shuffle));
+    EXPECT_EQ(kMaxStackTraceDepth, GTEST_FLAG_GET(stack_trace_depth));
+    EXPECT_STREQ("", GTEST_FLAG_GET(stream_result_to).c_str());
+    EXPECT_FALSE(GTEST_FLAG_GET(throw_on_failure));
+
+    GTEST_FLAG_SET(also_run_disabled_tests, true);
+    GTEST_FLAG_SET(break_on_failure, true);
+    GTEST_FLAG_SET(catch_exceptions, true);
+    GTEST_FLAG_SET(color, "no");
+    GTEST_FLAG_SET(death_test_use_fork, true);
+    GTEST_FLAG_SET(fail_fast, true);
+    GTEST_FLAG_SET(filter, "abc");
+    GTEST_FLAG_SET(list_tests, true);
+    GTEST_FLAG_SET(output, "xml:foo.xml");
+    GTEST_FLAG_SET(brief, true);
+    GTEST_FLAG_SET(print_time, false);
+    GTEST_FLAG_SET(random_seed, 1);
+    GTEST_FLAG_SET(repeat, 100);
+    GTEST_FLAG_SET(recreate_environments_when_repeating, false);
+    GTEST_FLAG_SET(shuffle, true);
+    GTEST_FLAG_SET(stack_trace_depth, 1);
+    GTEST_FLAG_SET(stream_result_to, "localhost:1234");
+    GTEST_FLAG_SET(throw_on_failure, true);
   }
 
  private:
@@ -1674,21 +1682,17 @@ GTestFlagSaver* GTestFlagSaverTest::saver_ = nullptr;
 // tests are designed to work regardless of their order.
 
 // Modifies the Google Test flags in the test body.
-TEST_F(GTestFlagSaverTest, ModifyGTestFlags) {
-  VerifyAndModifyFlags();
-}
+TEST_F(GTestFlagSaverTest, ModifyGTestFlags) { VerifyAndModifyFlags(); }
 
 // Verifies that the Google Test flags in the body of the previous test were
 // restored to their original values.
-TEST_F(GTestFlagSaverTest, VerifyGTestFlags) {
-  VerifyAndModifyFlags();
-}
+TEST_F(GTestFlagSaverTest, VerifyGTestFlags) { VerifyAndModifyFlags(); }
 
 // Sets an environment variable with the given name to the given
 // value.  If the value argument is "", unsets the environment
 // variable.  The caller must ensure that both arguments are not NULL.
 static void SetEnv(const char* name, const char* value) {
-#if GTEST_OS_WINDOWS_MOBILE
+#ifdef GTEST_OS_WINDOWS_MOBILE
   // Environment variables are not supported on Windows CE.
   return;
 #elif defined(__BORLANDC__) || defined(__SunOS_5_8) || defined(__SunOS_5_9)
@@ -1699,19 +1703,19 @@ static void SetEnv(const char* name, const char* value) {
 
   // Because putenv stores a pointer to the string buffer, we can't delete the
   // previous string (if present) until after it's replaced.
-  std::string *prev_env = NULL;
+  std::string* prev_env = NULL;
   if (added_env.find(name) != added_env.end()) {
     prev_env = added_env[name];
   }
-  added_env[name] = new std::string(
-      (Message() << name << "=" << value).GetString());
+  added_env[name] =
+      new std::string((Message() << name << "=" << value).GetString());
 
   // The standard signature of putenv accepts a 'char*' argument. Other
   // implementations, like C++Builder's, accept a 'const char*'.
   // We cast away the 'const' since that would work for both variants.
   putenv(const_cast<char*>(added_env[name]->c_str()));
   delete prev_env;
-#elif GTEST_OS_WINDOWS  // If we are on Windows proper.
+#elif defined(GTEST_OS_WINDOWS)  // If we are on Windows proper.
   _putenv((Message() << name << "=" << value).GetString().c_str());
 #else
   if (*value == '\0') {
@@ -1722,7 +1726,7 @@ static void SetEnv(const char* name, const char* value) {
 #endif  // GTEST_OS_WINDOWS_MOBILE
 }
 
-#if !GTEST_OS_WINDOWS_MOBILE
+#ifndef GTEST_OS_WINDOWS_MOBILE
 // Environment variables are not supported on Windows CE.
 
 using testing::internal::Int32FromGTestEnv;
@@ -1736,7 +1740,7 @@ TEST(Int32FromGTestEnvTest, ReturnsDefaultWhenVariableIsNotSet) {
   EXPECT_EQ(10, Int32FromGTestEnv("temp", 10));
 }
 
-# if !defined(GTEST_GET_INT32_FROM_ENV_)
+#if !defined(GTEST_GET_INT32_FROM_ENV_)
 
 // Tests that Int32FromGTestEnv() returns the default value when the
 // environment variable overflows as an Int32.
@@ -1762,7 +1766,7 @@ TEST(Int32FromGTestEnvTest, ReturnsDefaultWhenValueIsInvalid) {
   EXPECT_EQ(50, Int32FromGTestEnv("temp", 50));
 }
 
-# endif  // !defined(GTEST_GET_INT32_FROM_ENV_)
+#endif  // !defined(GTEST_GET_INT32_FROM_ENV_)
 
 // Tests that Int32FromGTestEnv() parses and returns the value of the
 // environment variable when it represents a valid decimal integer in
@@ -1776,29 +1780,29 @@ TEST(Int32FromGTestEnvTest, ParsesAndReturnsValidValue) {
 }
 #endif  // !GTEST_OS_WINDOWS_MOBILE
 
-// Tests ParseInt32Flag().
+// Tests ParseFlag().
 
 // Tests that ParseInt32Flag() returns false and doesn't change the
 // output value when the flag has wrong format
 TEST(ParseInt32FlagTest, ReturnsFalseForInvalidFlag) {
   int32_t value = 123;
-  EXPECT_FALSE(ParseInt32Flag("--a=100", "b", &value));
+  EXPECT_FALSE(ParseFlag("--a=100", "b", &value));
   EXPECT_EQ(123, value);
 
-  EXPECT_FALSE(ParseInt32Flag("a=100", "a", &value));
+  EXPECT_FALSE(ParseFlag("a=100", "a", &value));
   EXPECT_EQ(123, value);
 }
 
-// Tests that ParseInt32Flag() returns false and doesn't change the
+// Tests that ParseFlag() returns false and doesn't change the
 // output value when the flag overflows as an Int32.
 TEST(ParseInt32FlagTest, ReturnsDefaultWhenValueOverflows) {
   printf("(expecting 2 warnings)\n");
 
   int32_t value = 123;
-  EXPECT_FALSE(ParseInt32Flag("--abc=12345678987654321", "abc", &value));
+  EXPECT_FALSE(ParseFlag("--abc=12345678987654321", "abc", &value));
   EXPECT_EQ(123, value);
 
-  EXPECT_FALSE(ParseInt32Flag("--abc=-12345678987654321", "abc", &value));
+  EXPECT_FALSE(ParseFlag("--abc=-12345678987654321", "abc", &value));
   EXPECT_EQ(123, value);
 }
 
@@ -1809,10 +1813,10 @@ TEST(ParseInt32FlagTest, ReturnsDefaultWhenValueIsInvalid) {
   printf("(expecting 2 warnings)\n");
 
   int32_t value = 123;
-  EXPECT_FALSE(ParseInt32Flag("--abc=A1", "abc", &value));
+  EXPECT_FALSE(ParseFlag("--abc=A1", "abc", &value));
   EXPECT_EQ(123, value);
 
-  EXPECT_FALSE(ParseInt32Flag("--abc=12X", "abc", &value));
+  EXPECT_FALSE(ParseFlag("--abc=12X", "abc", &value));
   EXPECT_EQ(123, value);
 }
 
@@ -1821,18 +1825,17 @@ TEST(ParseInt32FlagTest, ReturnsDefaultWhenValueIsInvalid) {
 // the range of an Int32.
 TEST(ParseInt32FlagTest, ParsesAndReturnsValidValue) {
   int32_t value = 123;
-  EXPECT_TRUE(ParseInt32Flag("--" GTEST_FLAG_PREFIX_ "abc=456", "abc", &value));
+  EXPECT_TRUE(ParseFlag("--" GTEST_FLAG_PREFIX_ "abc=456", "abc", &value));
   EXPECT_EQ(456, value);
 
-  EXPECT_TRUE(ParseInt32Flag("--" GTEST_FLAG_PREFIX_ "abc=-789",
-                             "abc", &value));
+  EXPECT_TRUE(ParseFlag("--" GTEST_FLAG_PREFIX_ "abc=-789", "abc", &value));
   EXPECT_EQ(-789, value);
 }
 
 // Tests that Int32FromEnvOrDie() parses the value of the var or
 // returns the correct default.
 // Environment variables are not supported on Windows CE.
-#if !GTEST_OS_WINDOWS_MOBILE
+#ifndef GTEST_OS_WINDOWS_MOBILE
 TEST(Int32FromEnvOrDieTest, ParsesAndReturnsValidValue) {
   EXPECT_EQ(333, Int32FromEnvOrDie(GTEST_FLAG_PREFIX_UPPER_ "UnsetVar", 333));
   SetEnv(GTEST_FLAG_PREFIX_UPPER_ "UnsetVar", "123");
@@ -1847,8 +1850,7 @@ TEST(Int32FromEnvOrDieTest, ParsesAndReturnsValidValue) {
 TEST(Int32FromEnvOrDieDeathTest, AbortsOnFailure) {
   SetEnv(GTEST_FLAG_PREFIX_UPPER_ "VAR", "xxx");
   EXPECT_DEATH_IF_SUPPORTED(
-      Int32FromEnvOrDie(GTEST_FLAG_PREFIX_UPPER_ "VAR", 123),
-      ".*");
+      Int32FromEnvOrDie(GTEST_FLAG_PREFIX_UPPER_ "VAR", 123), ".*");
 }
 
 // Tests that Int32FromEnvOrDie() aborts with an error message
@@ -1856,8 +1858,7 @@ TEST(Int32FromEnvOrDieDeathTest, AbortsOnFailure) {
 TEST(Int32FromEnvOrDieDeathTest, AbortsOnInt32Overflow) {
   SetEnv(GTEST_FLAG_PREFIX_UPPER_ "VAR", "1234567891234567891234");
   EXPECT_DEATH_IF_SUPPORTED(
-      Int32FromEnvOrDie(GTEST_FLAG_PREFIX_UPPER_ "VAR", 123),
-      ".*");
+      Int32FromEnvOrDie(GTEST_FLAG_PREFIX_UPPER_ "VAR", 123), ".*");
 }
 
 // Tests that ShouldRunTestOnShard() selects all tests
@@ -1907,7 +1908,7 @@ TEST_F(ShouldShardTest, ReturnsFalseWhenTotalShardIsOne) {
 // Tests that sharding is enabled if total_shards > 1 and
 // we are not in a death test subprocess.
 // Environment variables are not supported on Windows CE.
-#if !GTEST_OS_WINDOWS_MOBILE
+#ifndef GTEST_OS_WINDOWS_MOBILE
 TEST_F(ShouldShardTest, WorksWhenShardEnvVarsAreValid) {
   SetEnv(index_var_, "4");
   SetEnv(total_var_, "22");
@@ -1964,7 +1965,8 @@ TEST(ShouldRunTestOnShardTest, IsPartitionWhenThereAreFiveShards) {
           prev_selected_shard_index = shard_index;
         } else {
           ADD_FAILURE() << "Shard " << prev_selected_shard_index << " and "
-            << shard_index << " are both selected to run test " << test_id;
+                        << shard_index << " are both selected to run test "
+                        << test_id;
         }
       }
     }
@@ -1976,7 +1978,7 @@ TEST(ShouldRunTestOnShardTest, IsPartitionWhenThereAreFiveShards) {
     int num_tests_on_shard = 0;
     for (int test_id = 0; test_id < num_tests; test_id++) {
       num_tests_on_shard +=
-        ShouldRunTestOnShard(num_shards, shard_index, test_id);
+          ShouldRunTestOnShard(num_shards, shard_index, test_id);
     }
     EXPECT_GE(num_tests_on_shard, num_tests / num_shards);
   }
@@ -2008,8 +2010,8 @@ TEST(UnitTestTest, ReturnsPlausibleTimestamp) {
 void ExpectNonFatalFailureRecordingPropertyWithReservedKey(
     const TestResult& test_result, const char* key) {
   EXPECT_NONFATAL_FAILURE(Test::RecordProperty(key, "1"), "Reserved key");
-  ASSERT_EQ(0, test_result.test_property_count()) << "Property for key '" << key
-                                                  << "' recorded unexpectedly.";
+  ASSERT_EQ(0, test_result.test_property_count())
+      << "Property for key '" << key << "' recorded unexpectedly.";
 }
 
 void ExpectNonFatalFailureRecordingPropertyWithReservedKeyForCurrentTest(
@@ -2036,10 +2038,10 @@ void ExpectNonFatalFailureRecordingPropertyWithReservedKeyOutsideOfTestSuite(
 }
 
 // Tests that property recording functions in UnitTest outside of tests
-// functions correcly.  Creating a separate instance of UnitTest ensures it
+// functions correctly.  Creating a separate instance of UnitTest ensures it
 // is in a state similar to the UnitTest's singleton's between tests.
-class UnitTestRecordPropertyTest :
-    public testing::internal::UnitTestRecordPropertyTestHelper {
+class UnitTestRecordPropertyTest
+    : public testing::internal::UnitTestRecordPropertyTestHelper {
  public:
   static void SetUpTestSuite() {
     ExpectNonFatalFailureRecordingPropertyWithReservedKeyForCurrentTestSuite(
@@ -2078,8 +2080,7 @@ TEST_F(UnitTestRecordPropertyTest, OnePropertyFoundWhenAdded) {
 
   EXPECT_STREQ("key_1",
                unit_test_.ad_hoc_test_result().GetTestProperty(0).key());
-  EXPECT_STREQ("1",
-               unit_test_.ad_hoc_test_result().GetTestProperty(0).value());
+  EXPECT_STREQ("1", unit_test_.ad_hoc_test_result().GetTestProperty(0).value());
 }
 
 // Tests TestResult has multiple properties when added.
@@ -2120,16 +2121,13 @@ TEST_F(UnitTestRecordPropertyTest, OverridesValuesForDuplicateKeys) {
 
 TEST_F(UnitTestRecordPropertyTest,
        AddFailureInsideTestsWhenUsingTestSuiteReservedKeys) {
-  ExpectNonFatalFailureRecordingPropertyWithReservedKeyForCurrentTest(
-      "name");
+  ExpectNonFatalFailureRecordingPropertyWithReservedKeyForCurrentTest("name");
   ExpectNonFatalFailureRecordingPropertyWithReservedKeyForCurrentTest(
       "value_param");
   ExpectNonFatalFailureRecordingPropertyWithReservedKeyForCurrentTest(
       "type_param");
-  ExpectNonFatalFailureRecordingPropertyWithReservedKeyForCurrentTest(
-      "status");
-  ExpectNonFatalFailureRecordingPropertyWithReservedKeyForCurrentTest(
-      "time");
+  ExpectNonFatalFailureRecordingPropertyWithReservedKeyForCurrentTest("status");
+  ExpectNonFatalFailureRecordingPropertyWithReservedKeyForCurrentTest("time");
   ExpectNonFatalFailureRecordingPropertyWithReservedKeyForCurrentTest(
       "classname");
 }
@@ -2165,7 +2163,7 @@ class UnitTestRecordPropertyTestEnvironment : public Environment {
 };
 
 // This will test property recording outside of any test or test case.
-static Environment* record_property_env GTEST_ATTRIBUTE_UNUSED_ =
+[[maybe_unused]] static Environment* record_property_env =
     AddGlobalTestEnvironment(new UnitTestRecordPropertyTestEnvironment);
 
 // This group of tests is for predicate assertions (ASSERT_PRED*, etc)
@@ -2177,9 +2175,7 @@ static Environment* record_property_env GTEST_ATTRIBUTE_UNUSED_ =
 // First, some predicates and predicate-formatters needed by the tests.
 
 // Returns true if and only if the argument is an even number.
-bool IsEven(int n) {
-  return (n % 2) == 0;
-}
+bool IsEven(int n) { return (n % 2) == 0; }
 
 // A functor that returns true if and only if the argument is an even number.
 struct IsEvenFunctor {
@@ -2226,41 +2222,37 @@ struct AssertIsEvenFunctor {
 };
 
 // Returns true if and only if the sum of the arguments is an even number.
-bool SumIsEven2(int n1, int n2) {
-  return IsEven(n1 + n2);
-}
+bool SumIsEven2(int n1, int n2) { return IsEven(n1 + n2); }
 
 // A functor that returns true if and only if the sum of the arguments is an
 // even number.
 struct SumIsEven3Functor {
-  bool operator()(int n1, int n2, int n3) {
-    return IsEven(n1 + n2 + n3);
-  }
+  bool operator()(int n1, int n2, int n3) { return IsEven(n1 + n2 + n3); }
 };
 
 // A predicate-formatter function that asserts the sum of the
 // arguments is an even number.
-AssertionResult AssertSumIsEven4(
-    const char* e1, const char* e2, const char* e3, const char* e4,
-    int n1, int n2, int n3, int n4) {
+AssertionResult AssertSumIsEven4(const char* e1, const char* e2, const char* e3,
+                                 const char* e4, int n1, int n2, int n3,
+                                 int n4) {
   const int sum = n1 + n2 + n3 + n4;
   if (IsEven(sum)) {
     return AssertionSuccess();
   }
 
   Message msg;
-  msg << e1 << " + " << e2 << " + " << e3 << " + " << e4
-      << " (" << n1 << " + " << n2 << " + " << n3 << " + " << n4
-      << ") evaluates to " << sum << ", which is not even.";
+  msg << e1 << " + " << e2 << " + " << e3 << " + " << e4 << " (" << n1 << " + "
+      << n2 << " + " << n3 << " + " << n4 << ") evaluates to " << sum
+      << ", which is not even.";
   return AssertionFailure(msg);
 }
 
 // A predicate-formatter functor that asserts the sum of the arguments
 // is an even number.
 struct AssertSumIsEven5Functor {
-  AssertionResult operator()(
-      const char* e1, const char* e2, const char* e3, const char* e4,
-      const char* e5, int n1, int n2, int n3, int n4, int n5) {
+  AssertionResult operator()(const char* e1, const char* e2, const char* e3,
+                             const char* e4, const char* e5, int n1, int n2,
+                             int n3, int n4, int n5) {
     const int sum = n1 + n2 + n3 + n4 + n5;
     if (IsEven(sum)) {
       return AssertionSuccess();
@@ -2268,14 +2260,12 @@ struct AssertSumIsEven5Functor {
 
     Message msg;
     msg << e1 << " + " << e2 << " + " << e3 << " + " << e4 << " + " << e5
-        << " ("
-        << n1 << " + " << n2 << " + " << n3 << " + " << n4 << " + " << n5
-        << ") evaluates to " << sum << ", which is not even.";
+        << " (" << n1 << " + " << n2 << " + " << n3 << " + " << n4 << " + "
+        << n5 << ") evaluates to " << sum << ", which is not even.";
     return AssertionFailure(msg);
   }
 };
 
-
 // Tests unary predicate assertions.
 
 // Tests unary predicate assertions that don't use a custom formatter.
@@ -2285,11 +2275,12 @@ TEST(Pred1Test, WithoutFormat) {
   ASSERT_PRED1(IsEven, 4);
 
   // Failure cases.
-  EXPECT_NONFATAL_FAILURE({  // NOLINT
-    EXPECT_PRED1(IsEven, 5) << "This failure is expected.";
-  }, "This failure is expected.");
-  EXPECT_FATAL_FAILURE(ASSERT_PRED1(IsEvenFunctor(), 5),
-                       "evaluates to false");
+  EXPECT_NONFATAL_FAILURE(
+      {  // NOLINT
+        EXPECT_PRED1(IsEven, 5) << "This failure is expected.";
+      },
+      "This failure is expected.");
+  EXPECT_FATAL_FAILURE(ASSERT_PRED1(IsEvenFunctor(), 5), "evaluates to false");
 }
 
 // Tests unary predicate assertions that use a custom formatter.
@@ -2297,15 +2288,17 @@ TEST(Pred1Test, WithFormat) {
   // Success cases.
   EXPECT_PRED_FORMAT1(AssertIsEven, 2);
   ASSERT_PRED_FORMAT1(AssertIsEvenFunctor(), 4)
-    << "This failure is UNEXPECTED!";
+      << "This failure is UNEXPECTED!";
 
   // Failure cases.
   const int n = 5;
   EXPECT_NONFATAL_FAILURE(EXPECT_PRED_FORMAT1(AssertIsEvenFunctor(), n),
                           "n evaluates to 5, which is not even.");
-  EXPECT_FATAL_FAILURE({  // NOLINT
-    ASSERT_PRED_FORMAT1(AssertIsEven, 5) << "This failure is expected.";
-  }, "This failure is expected.");
+  EXPECT_FATAL_FAILURE(
+      {  // NOLINT
+        ASSERT_PRED_FORMAT1(AssertIsEven, 5) << "This failure is expected.";
+      },
+      "This failure is expected.");
 }
 
 // Tests that unary predicate assertions evaluates their arguments
@@ -2317,14 +2310,15 @@ TEST(Pred1Test, SingleEvaluationOnFailure) {
   EXPECT_EQ(1, n) << "The argument is not evaluated exactly once.";
 
   // A failure case.
-  EXPECT_FATAL_FAILURE({  // NOLINT
-    ASSERT_PRED_FORMAT1(AssertIsEvenFunctor(), n++)
-        << "This failure is expected.";
-  }, "This failure is expected.");
+  EXPECT_FATAL_FAILURE(
+      {  // NOLINT
+        ASSERT_PRED_FORMAT1(AssertIsEvenFunctor(), n++)
+            << "This failure is expected.";
+      },
+      "This failure is expected.");
   EXPECT_EQ(2, n) << "The argument is not evaluated exactly once.";
 }
 
-
 // Tests predicate assertions whose arity is >= 2.
 
 // Tests predicate assertions that don't use a custom formatter.
@@ -2336,19 +2330,23 @@ TEST(PredTest, WithoutFormat) {
   // Failure cases.
   const int n1 = 1;
   const int n2 = 2;
-  EXPECT_NONFATAL_FAILURE({  // NOLINT
-    EXPECT_PRED2(SumIsEven2, n1, n2) << "This failure is expected.";
-  }, "This failure is expected.");
-  EXPECT_FATAL_FAILURE({  // NOLINT
-    ASSERT_PRED3(SumIsEven3Functor(), 1, 2, 4);
-  }, "evaluates to false");
+  EXPECT_NONFATAL_FAILURE(
+      {  // NOLINT
+        EXPECT_PRED2(SumIsEven2, n1, n2) << "This failure is expected.";
+      },
+      "This failure is expected.");
+  EXPECT_FATAL_FAILURE(
+      {  // NOLINT
+        ASSERT_PRED3(SumIsEven3Functor(), 1, 2, 4);
+      },
+      "evaluates to false");
 }
 
 // Tests predicate assertions that use a custom formatter.
 TEST(PredTest, WithFormat) {
   // Success cases.
-  ASSERT_PRED_FORMAT4(AssertSumIsEven4, 4, 6, 8, 10) <<
-    "This failure is UNEXPECTED!";
+  ASSERT_PRED_FORMAT4(AssertSumIsEven4, 4, 6, 8, 10)
+      << "This failure is UNEXPECTED!";
   EXPECT_PRED_FORMAT5(AssertSumIsEven5Functor(), 2, 4, 6, 8, 10);
 
   // Failure cases.
@@ -2356,13 +2354,17 @@ TEST(PredTest, WithFormat) {
   const int n2 = 2;
   const int n3 = 4;
   const int n4 = 6;
-  EXPECT_NONFATAL_FAILURE({  // NOLINT
-    EXPECT_PRED_FORMAT4(AssertSumIsEven4, n1, n2, n3, n4);
-  }, "evaluates to 13, which is not even.");
-  EXPECT_FATAL_FAILURE({  // NOLINT
-    ASSERT_PRED_FORMAT5(AssertSumIsEven5Functor(), 1, 2, 4, 6, 8)
-        << "This failure is expected.";
-  }, "This failure is expected.");
+  EXPECT_NONFATAL_FAILURE(
+      {  // NOLINT
+        EXPECT_PRED_FORMAT4(AssertSumIsEven4, n1, n2, n3, n4);
+      },
+      "evaluates to 13, which is not even.");
+  EXPECT_FATAL_FAILURE(
+      {  // NOLINT
+        ASSERT_PRED_FORMAT5(AssertSumIsEven5Functor(), 1, 2, 4, 6, 8)
+            << "This failure is expected.";
+      },
+      "This failure is expected.");
 }
 
 // Tests that predicate assertions evaluates their arguments
@@ -2380,9 +2382,8 @@ TEST(PredTest, SingleEvaluationOnFailure) {
   int n3 = 0;
   int n4 = 0;
   int n5 = 0;
-  ASSERT_PRED_FORMAT5(AssertSumIsEven5Functor(),
-                      n1++, n2++, n3++, n4++, n5++)
-                        << "This failure is UNEXPECTED!";
+  ASSERT_PRED_FORMAT5(AssertSumIsEven5Functor(), n1++, n2++, n3++, n4++, n5++)
+      << "This failure is UNEXPECTED!";
   EXPECT_EQ(1, n1) << "Argument 1 is not evaluated exactly once.";
   EXPECT_EQ(1, n2) << "Argument 2 is not evaluated exactly once.";
   EXPECT_EQ(1, n3) << "Argument 3 is not evaluated exactly once.";
@@ -2391,19 +2392,23 @@ TEST(PredTest, SingleEvaluationOnFailure) {
 
   // A failure case.
   n1 = n2 = n3 = 0;
-  EXPECT_NONFATAL_FAILURE({  // NOLINT
-    EXPECT_PRED3(SumIsEven3Functor(), ++n1, n2++, n3++)
-        << "This failure is expected.";
-  }, "This failure is expected.");
+  EXPECT_NONFATAL_FAILURE(
+      {  // NOLINT
+        EXPECT_PRED3(SumIsEven3Functor(), ++n1, n2++, n3++)
+            << "This failure is expected.";
+      },
+      "This failure is expected.");
   EXPECT_EQ(1, n1) << "Argument 1 is not evaluated exactly once.";
   EXPECT_EQ(1, n2) << "Argument 2 is not evaluated exactly once.";
   EXPECT_EQ(1, n3) << "Argument 3 is not evaluated exactly once.";
 
   // Another failure case.
   n1 = n2 = n3 = n4 = 0;
-  EXPECT_NONFATAL_FAILURE({  // NOLINT
-    EXPECT_PRED_FORMAT4(AssertSumIsEven4, ++n1, n2++, n3++, n4++);
-  }, "evaluates to 1, which is not even.");
+  EXPECT_NONFATAL_FAILURE(
+      {  // NOLINT
+        EXPECT_PRED_FORMAT4(AssertSumIsEven4, ++n1, n2++, n3++, n4++);
+      },
+      "evaluates to 1, which is not even.");
   EXPECT_EQ(1, n1) << "Argument 1 is not evaluated exactly once.";
   EXPECT_EQ(1, n2) << "Argument 2 is not evaluated exactly once.";
   EXPECT_EQ(1, n3) << "Argument 3 is not evaluated exactly once.";
@@ -2414,7 +2419,7 @@ TEST(PredTest, SingleEvaluationOnFailure) {
 TEST(PredTest, ExpectPredEvalFailure) {
   std::set<int> set_a = {2, 1, 3, 4, 5};
   std::set<int> set_b = {0, 4, 8};
-  const auto compare_sets = [] (std::set<int>, std::set<int>) { return false; };
+  const auto compare_sets = [](std::set<int>, std::set<int>) { return false; };
   EXPECT_NONFATAL_FAILURE(
       EXPECT_PRED2(compare_sets, set_a, set_b),
       "compare_sets(set_a, set_b) evaluates to false, where\nset_a evaluates "
@@ -2424,9 +2429,7 @@ TEST(PredTest, ExpectPredEvalFailure) {
 // Some helper functions for testing using overloaded/template
 // functions with ASSERT_PREDn and EXPECT_PREDn.
 
-bool IsPositive(double x) {
-  return x > 0;
-}
+bool IsPositive(double x) { return x > 0; }
 
 template <typename T>
 bool IsNegative(T x) {
@@ -2442,7 +2445,7 @@ bool GreaterThan(T1 x1, T2 x2) {
 // their types are explicitly specified.
 TEST(PredicateAssertionTest, AcceptsOverloadedFunction) {
   // C++Builder requires C-style casts rather than static_cast.
-  EXPECT_PRED1((bool (*)(int))(IsPositive), 5);  // NOLINT
+  EXPECT_PRED1((bool (*)(int))(IsPositive), 5);       // NOLINT
   ASSERT_PRED1((bool (*)(double))(IsPositive), 6.0);  // NOLINT
 }
 
@@ -2455,31 +2458,27 @@ TEST(PredicateAssertionTest, AcceptsTemplateFunction) {
   ASSERT_PRED2((GreaterThan<int, int>), 5, 0);
 }
 
-
 // Some helper functions for testing using overloaded/template
 // functions with ASSERT_PRED_FORMATn and EXPECT_PRED_FORMATn.
 
 AssertionResult IsPositiveFormat(const char* /* expr */, int n) {
-  return n > 0 ? AssertionSuccess() :
-      AssertionFailure(Message() << "Failure");
+  return n > 0 ? AssertionSuccess() : AssertionFailure(Message() << "Failure");
 }
 
 AssertionResult IsPositiveFormat(const char* /* expr */, double x) {
-  return x > 0 ? AssertionSuccess() :
-      AssertionFailure(Message() << "Failure");
+  return x > 0 ? AssertionSuccess() : AssertionFailure(Message() << "Failure");
 }
 
 template <typename T>
 AssertionResult IsNegativeFormat(const char* /* expr */, T x) {
-  return x < 0 ? AssertionSuccess() :
-      AssertionFailure(Message() << "Failure");
+  return x < 0 ? AssertionSuccess() : AssertionFailure(Message() << "Failure");
 }
 
 template <typename T1, typename T2>
 AssertionResult EqualsFormat(const char* /* expr1 */, const char* /* expr2 */,
                              const T1& x1, const T2& x2) {
-  return x1 == x2 ? AssertionSuccess() :
-      AssertionFailure(Message() << "Failure");
+  return x1 == x2 ? AssertionSuccess()
+                  : AssertionFailure(Message() << "Failure");
 }
 
 // Tests that overloaded functions can be used in *_PRED_FORMAT*
@@ -2496,20 +2495,18 @@ TEST(PredicateFormatAssertionTest, AcceptsTemplateFunction) {
   ASSERT_PRED_FORMAT2(EqualsFormat, 3, 3);
 }
 
-
 // Tests string assertions.
 
 // Tests ASSERT_STREQ with non-NULL arguments.
 TEST(StringAssertionTest, ASSERT_STREQ) {
-  const char * const p1 = "good";
+  const char* const p1 = "good";
   ASSERT_STREQ(p1, p1);
 
   // Let p2 have the same content as p1, but be at a different address.
   const char p2[] = "good";
   ASSERT_STREQ(p1, p2);
 
-  EXPECT_FATAL_FAILURE(ASSERT_STREQ("bad", "good"),
-                       "  \"bad\"\n  \"good\"");
+  EXPECT_FATAL_FAILURE(ASSERT_STREQ("bad", "good"), "  \"bad\"\n  \"good\"");
 }
 
 // Tests ASSERT_STREQ with NULL arguments.
@@ -2532,8 +2529,7 @@ TEST(StringAssertionTest, ASSERT_STRNE) {
   ASSERT_STRNE(nullptr, "");
   ASSERT_STRNE("", "Hi");
   ASSERT_STRNE("Hi", "");
-  EXPECT_FATAL_FAILURE(ASSERT_STRNE("Hi", "Hi"),
-                       "\"Hi\" vs \"Hi\"");
+  EXPECT_FATAL_FAILURE(ASSERT_STRNE("Hi", "Hi"), "\"Hi\" vs \"Hi\"");
 }
 
 // Tests ASSERT_STRCASEEQ.
@@ -2542,8 +2538,7 @@ TEST(StringAssertionTest, ASSERT_STRCASEEQ) {
   ASSERT_STRCASEEQ(static_cast<const char*>(nullptr), nullptr);
 
   ASSERT_STRCASEEQ("", "");
-  EXPECT_FATAL_FAILURE(ASSERT_STRCASEEQ("Hi", "hi2"),
-                       "Ignoring case");
+  EXPECT_FATAL_FAILURE(ASSERT_STRCASEEQ("Hi", "hi2"), "Ignoring case");
 }
 
 // Tests ASSERT_STRCASENE.
@@ -2555,8 +2550,7 @@ TEST(StringAssertionTest, ASSERT_STRCASENE) {
   ASSERT_STRCASENE(nullptr, "");
   ASSERT_STRCASENE("", "Hi");
   ASSERT_STRCASENE("Hi", "");
-  EXPECT_FATAL_FAILURE(ASSERT_STRCASENE("Hi", "hi"),
-                       "(ignoring case)");
+  EXPECT_FATAL_FAILURE(ASSERT_STRCASENE("Hi", "hi"), "(ignoring case)");
 }
 
 // Tests *_STREQ on wide strings.
@@ -2574,17 +2568,17 @@ TEST(StringAssertionTest, STREQ_Wide) {
   EXPECT_STREQ(L"Hi", L"Hi");
 
   // Unequal strings.
-  EXPECT_NONFATAL_FAILURE(EXPECT_STREQ(L"abc", L"Abc"),
-                          "Abc");
+  EXPECT_NONFATAL_FAILURE(EXPECT_STREQ(L"abc", L"Abc"), "Abc");
 
   // Strings containing wide characters.
-  EXPECT_NONFATAL_FAILURE(EXPECT_STREQ(L"abc\x8119", L"abc\x8120"),
-                          "abc");
+  EXPECT_NONFATAL_FAILURE(EXPECT_STREQ(L"abc\x8119", L"abc\x8120"), "abc");
 
   // The streaming variation.
-  EXPECT_NONFATAL_FAILURE({  // NOLINT
-    EXPECT_STREQ(L"abc\x8119", L"abc\x8121") << "Expected failure";
-  }, "Expected failure");
+  EXPECT_NONFATAL_FAILURE(
+      {  // NOLINT
+        EXPECT_STREQ(L"abc\x8119", L"abc\x8121") << "Expected failure";
+      },
+      "Expected failure");
 }
 
 // Tests *_STRNE on wide strings.
@@ -2597,22 +2591,19 @@ TEST(StringAssertionTest, STRNE_Wide) {
       "");
 
   // Empty strings.
-  EXPECT_NONFATAL_FAILURE(EXPECT_STRNE(L"", L""),
-                          "L\"\"");
+  EXPECT_NONFATAL_FAILURE(EXPECT_STRNE(L"", L""), "L\"\"");
 
   // Non-null vs NULL.
   ASSERT_STRNE(L"non-null", nullptr);
 
   // Equal strings.
-  EXPECT_NONFATAL_FAILURE(EXPECT_STRNE(L"Hi", L"Hi"),
-                          "L\"Hi\"");
+  EXPECT_NONFATAL_FAILURE(EXPECT_STRNE(L"Hi", L"Hi"), "L\"Hi\"");
 
   // Unequal strings.
   EXPECT_STRNE(L"abc", L"Abc");
 
   // Strings containing wide characters.
-  EXPECT_NONFATAL_FAILURE(EXPECT_STRNE(L"abc\x8119", L"abc\x8119"),
-                          "abc");
+  EXPECT_NONFATAL_FAILURE(EXPECT_STRNE(L"abc\x8119", L"abc\x8119"), "abc");
 
   // The streaming variation.
   ASSERT_STRNE(L"abc\x8119", L"abc\x8120") << "This shouldn't happen";
@@ -2646,12 +2637,13 @@ TEST(IsSubstringTest, ReturnsCorrectResultForWideCString) {
 // Tests that IsSubstring() generates the correct message when the input
 // argument type is const char*.
 TEST(IsSubstringTest, GeneratesCorrectMessageForCString) {
-  EXPECT_STREQ("Value of: needle_expr\n"
-               "  Actual: \"needle\"\n"
-               "Expected: a substring of haystack_expr\n"
-               "Which is: \"haystack\"",
-               IsSubstring("needle_expr", "haystack_expr",
-                           "needle", "haystack").failure_message());
+  EXPECT_STREQ(
+      "Value of: needle_expr\n"
+      "  Actual: \"needle\"\n"
+      "Expected: a substring of haystack_expr\n"
+      "Which is: \"haystack\"",
+      IsSubstring("needle_expr", "haystack_expr", "needle", "haystack")
+          .failure_message());
 }
 
 // Tests that IsSubstring returns the correct result when the input
@@ -2672,13 +2664,14 @@ TEST(IsSubstringTest, ReturnsCorrectResultForStdWstring) {
 // Tests that IsSubstring() generates the correct message when the input
 // argument type is ::std::wstring.
 TEST(IsSubstringTest, GeneratesCorrectMessageForWstring) {
-  EXPECT_STREQ("Value of: needle_expr\n"
-               "  Actual: L\"needle\"\n"
-               "Expected: a substring of haystack_expr\n"
-               "Which is: L\"haystack\"",
-               IsSubstring(
-                   "needle_expr", "haystack_expr",
-                   ::std::wstring(L"needle"), L"haystack").failure_message());
+  EXPECT_STREQ(
+      "Value of: needle_expr\n"
+      "  Actual: L\"needle\"\n"
+      "Expected: a substring of haystack_expr\n"
+      "Which is: L\"haystack\"",
+      IsSubstring("needle_expr", "haystack_expr", ::std::wstring(L"needle"),
+                  L"haystack")
+          .failure_message());
 }
 
 #endif  // GTEST_HAS_STD_WSTRING
@@ -2702,13 +2695,13 @@ TEST(IsNotSubstringTest, ReturnsCorrectResultForWideCString) {
 // Tests that IsNotSubstring() generates the correct message when the input
 // argument type is const wchar_t*.
 TEST(IsNotSubstringTest, GeneratesCorrectMessageForWideCString) {
-  EXPECT_STREQ("Value of: needle_expr\n"
-               "  Actual: L\"needle\"\n"
-               "Expected: not a substring of haystack_expr\n"
-               "Which is: L\"two needles\"",
-               IsNotSubstring(
-                   "needle_expr", "haystack_expr",
-                   L"needle", L"two needles").failure_message());
+  EXPECT_STREQ(
+      "Value of: needle_expr\n"
+      "  Actual: L\"needle\"\n"
+      "Expected: not a substring of haystack_expr\n"
+      "Which is: L\"two needles\"",
+      IsNotSubstring("needle_expr", "haystack_expr", L"needle", L"two needles")
+          .failure_message());
 }
 
 // Tests that IsNotSubstring returns the correct result when the input
@@ -2721,13 +2714,14 @@ TEST(IsNotSubstringTest, ReturnsCorrectResultsForStdString) {
 // Tests that IsNotSubstring() generates the correct message when the input
 // argument type is ::std::string.
 TEST(IsNotSubstringTest, GeneratesCorrectMessageForStdString) {
-  EXPECT_STREQ("Value of: needle_expr\n"
-               "  Actual: \"needle\"\n"
-               "Expected: not a substring of haystack_expr\n"
-               "Which is: \"two needles\"",
-               IsNotSubstring(
-                   "needle_expr", "haystack_expr",
-                   ::std::string("needle"), "two needles").failure_message());
+  EXPECT_STREQ(
+      "Value of: needle_expr\n"
+      "  Actual: \"needle\"\n"
+      "Expected: not a substring of haystack_expr\n"
+      "Which is: \"two needles\"",
+      IsNotSubstring("needle_expr", "haystack_expr", ::std::string("needle"),
+                     "two needles")
+          .failure_message());
 }
 
 #if GTEST_HAS_STD_WSTRING
@@ -2774,20 +2768,20 @@ class FloatingPointTest : public Test {
     const Bits zero_bits = Floating(0).bits();
 
     // Makes some numbers close to 0.0.
-    values_.close_to_positive_zero = Floating::ReinterpretBits(
-        zero_bits + max_ulps/2);
-    values_.close_to_negative_zero = -Floating::ReinterpretBits(
-        zero_bits + max_ulps - max_ulps/2);
-    values_.further_from_negative_zero = -Floating::ReinterpretBits(
-        zero_bits + max_ulps + 1 - max_ulps/2);
+    values_.close_to_positive_zero =
+        Floating::ReinterpretBits(zero_bits + max_ulps / 2);
+    values_.close_to_negative_zero =
+        -Floating::ReinterpretBits(zero_bits + max_ulps - max_ulps / 2);
+    values_.further_from_negative_zero =
+        -Floating::ReinterpretBits(zero_bits + max_ulps + 1 - max_ulps / 2);
 
     // The bits that represent 1.0.
     const Bits one_bits = Floating(1).bits();
 
     // Makes some numbers close to 1.0.
     values_.close_to_one = Floating::ReinterpretBits(one_bits + max_ulps);
-    values_.further_from_one = Floating::ReinterpretBits(
-        one_bits + max_ulps + 1);
+    values_.further_from_one =
+        Floating::ReinterpretBits(one_bits + max_ulps + 1);
 
     // +infinity.
     values_.infinity = Floating::Infinity();
@@ -2796,23 +2790,23 @@ class FloatingPointTest : public Test {
     const Bits infinity_bits = Floating(values_.infinity).bits();
 
     // Makes some numbers close to infinity.
-    values_.close_to_infinity = Floating::ReinterpretBits(
-        infinity_bits - max_ulps);
-    values_.further_from_infinity = Floating::ReinterpretBits(
-        infinity_bits - max_ulps - 1);
+    values_.close_to_infinity =
+        Floating::ReinterpretBits(infinity_bits - max_ulps);
+    values_.further_from_infinity =
+        Floating::ReinterpretBits(infinity_bits - max_ulps - 1);
 
     // Makes some NAN's.  Sets the most significant bit of the fraction so that
     // our NaN's are quiet; trying to process a signaling NaN would raise an
     // exception if our environment enables floating point exceptions.
-    values_.nan1 = Floating::ReinterpretBits(Floating::kExponentBitMask
-        | (static_cast<Bits>(1) << (Floating::kFractionBitCount - 1)) | 1);
-    values_.nan2 = Floating::ReinterpretBits(Floating::kExponentBitMask
-        | (static_cast<Bits>(1) << (Floating::kFractionBitCount - 1)) | 200);
+    values_.nan1 = Floating::ReinterpretBits(
+        Floating::kExponentBitMask |
+        (static_cast<Bits>(1) << (Floating::kFractionBitCount - 1)) | 1);
+    values_.nan2 = Floating::ReinterpretBits(
+        Floating::kExponentBitMask |
+        (static_cast<Bits>(1) << (Floating::kFractionBitCount - 1)) | 200);
   }
 
-  void TestSize() {
-    EXPECT_EQ(sizeof(RawType), sizeof(Bits));
-  }
+  void TestSize() { EXPECT_EQ(sizeof(RawType), sizeof(Bits)); }
 
   static TestValues values_;
 };
@@ -2825,17 +2819,13 @@ typename FloatingPointTest<RawType>::TestValues
 typedef FloatingPointTest<float> FloatTest;
 
 // Tests that the size of Float::Bits matches the size of float.
-TEST_F(FloatTest, Size) {
-  TestSize();
-}
+TEST_F(FloatTest, Size) { TestSize(); }
 
 // Tests comparing with +0 and -0.
 TEST_F(FloatTest, Zeros) {
   EXPECT_FLOAT_EQ(0.0, -0.0);
-  EXPECT_NONFATAL_FAILURE(EXPECT_FLOAT_EQ(-0.0, 1.0),
-                          "1.0");
-  EXPECT_FATAL_FAILURE(ASSERT_FLOAT_EQ(0.0, 1.5),
-                       "1.5");
+  EXPECT_NONFATAL_FAILURE(EXPECT_FLOAT_EQ(-0.0, 1.0), "1.0");
+  EXPECT_FATAL_FAILURE(ASSERT_FLOAT_EQ(0.0, 1.5), "1.5");
 }
 
 // Tests comparing numbers close to 0.
@@ -2856,10 +2846,11 @@ TEST_F(FloatTest, AlmostZeros) {
   EXPECT_FLOAT_EQ(-0.0, v.close_to_negative_zero);
   EXPECT_FLOAT_EQ(v.close_to_positive_zero, v.close_to_negative_zero);
 
-  EXPECT_FATAL_FAILURE({  // NOLINT
-    ASSERT_FLOAT_EQ(v.close_to_positive_zero,
-                    v.further_from_negative_zero);
-  }, "v.further_from_negative_zero");
+  EXPECT_FATAL_FAILURE(
+      {  // NOLINT
+        ASSERT_FLOAT_EQ(v.close_to_positive_zero, v.further_from_negative_zero);
+      },
+      "v.further_from_negative_zero");
 }
 
 // Tests comparing numbers close to each other.
@@ -2871,8 +2862,7 @@ TEST_F(FloatTest, SmallDiff) {
 
 // Tests comparing numbers far apart.
 TEST_F(FloatTest, LargeDiff) {
-  EXPECT_NONFATAL_FAILURE(EXPECT_FLOAT_EQ(2.5, 3.0),
-                          "3.0");
+  EXPECT_NONFATAL_FAILURE(EXPECT_FLOAT_EQ(2.5, 3.0), "3.0");
 }
 
 // Tests comparing with infinity.
@@ -2880,6 +2870,8 @@ TEST_F(FloatTest, LargeDiff) {
 // This ensures that no overflow occurs when comparing numbers whose
 // absolute value is very large.
 TEST_F(FloatTest, Infinity) {
+  EXPECT_FLOAT_EQ(values_.infinity, values_.infinity);
+  EXPECT_FLOAT_EQ(-values_.infinity, -values_.infinity);
   EXPECT_FLOAT_EQ(values_.infinity, values_.close_to_infinity);
   EXPECT_FLOAT_EQ(-values_.infinity, -values_.close_to_infinity);
   EXPECT_NONFATAL_FAILURE(EXPECT_FLOAT_EQ(values_.infinity, -values_.infinity),
@@ -2901,15 +2893,16 @@ TEST_F(FloatTest, NaN) {
   // (parentheses).
   static const FloatTest::TestValues& v = this->values_;
 
-  EXPECT_NONFATAL_FAILURE(EXPECT_FLOAT_EQ(v.nan1, v.nan1),
-                          "v.nan1");
-  EXPECT_NONFATAL_FAILURE(EXPECT_FLOAT_EQ(v.nan1, v.nan2),
-                          "v.nan2");
-  EXPECT_NONFATAL_FAILURE(EXPECT_FLOAT_EQ(1.0, v.nan1),
+  EXPECT_NONFATAL_FAILURE(EXPECT_FLOAT_EQ(v.nan1, v.nan1), "v.nan1");
+  EXPECT_NONFATAL_FAILURE(EXPECT_FLOAT_EQ(v.nan1, v.nan2), "v.nan2");
+  EXPECT_NONFATAL_FAILURE(EXPECT_FLOAT_EQ(1.0, v.nan1), "v.nan1");
+  EXPECT_NONFATAL_FAILURE(EXPECT_NEAR(1.0f, v.nan1, 1.0f), "v.nan1");
+  EXPECT_NONFATAL_FAILURE(EXPECT_NEAR(1.0f, v.nan1, v.infinity), "v.nan1");
+  EXPECT_NONFATAL_FAILURE(EXPECT_NEAR(v.infinity, v.nan1, 1.0f), "v.nan1");
+  EXPECT_NONFATAL_FAILURE(EXPECT_NEAR(v.infinity, v.nan1, v.infinity),
                           "v.nan1");
 
-  EXPECT_FATAL_FAILURE(ASSERT_FLOAT_EQ(v.nan1, v.infinity),
-                       "v.infinity");
+  EXPECT_FATAL_FAILURE(ASSERT_FLOAT_EQ(v.nan1, v.infinity), "v.infinity");
 }
 
 // Tests that *_FLOAT_EQ are reflexive.
@@ -2931,11 +2924,28 @@ TEST_F(FloatTest, Commutative) {
 
 // Tests EXPECT_NEAR.
 TEST_F(FloatTest, EXPECT_NEAR) {
+  static const FloatTest::TestValues& v = this->values_;
+
   EXPECT_NEAR(-1.0f, -1.1f, 0.2f);
   EXPECT_NEAR(2.0f, 3.0f, 1.0f);
+  EXPECT_NEAR(v.infinity, v.infinity, 0.0f);
+  EXPECT_NEAR(-v.infinity, -v.infinity, 0.0f);
+  EXPECT_NEAR(0.0f, 1.0f, v.infinity);
+  EXPECT_NEAR(v.infinity, -v.infinity, v.infinity);
+  EXPECT_NEAR(-v.infinity, v.infinity, v.infinity);
   EXPECT_NONFATAL_FAILURE(EXPECT_NEAR(1.0f, 1.5f, 0.25f),  // NOLINT
                           "The difference between 1.0f and 1.5f is 0.5, "
                           "which exceeds 0.25f");
+  EXPECT_NONFATAL_FAILURE(EXPECT_NEAR(v.infinity, -v.infinity, 0.0f),  // NOLINT
+                          "The difference between v.infinity and -v.infinity "
+                          "is inf, which exceeds 0.0f");
+  EXPECT_NONFATAL_FAILURE(EXPECT_NEAR(-v.infinity, v.infinity, 0.0f),  // NOLINT
+                          "The difference between -v.infinity and v.infinity "
+                          "is inf, which exceeds 0.0f");
+  EXPECT_NONFATAL_FAILURE(
+      EXPECT_NEAR(v.infinity, v.close_to_infinity, v.further_from_infinity),
+      "The difference between v.infinity and v.close_to_infinity is inf, which "
+      "exceeds v.further_from_infinity");
 }
 
 // Tests ASSERT_NEAR.
@@ -2963,36 +2973,40 @@ TEST_F(FloatTest, FloatLEFails) {
                           "(2.0f) <= (1.0f)");
 
   // or by a small yet non-negligible margin,
-  EXPECT_NONFATAL_FAILURE({  // NOLINT
-    EXPECT_PRED_FORMAT2(FloatLE, values_.further_from_one, 1.0f);
-  }, "(values_.further_from_one) <= (1.0f)");
+  EXPECT_NONFATAL_FAILURE(
+      {  // NOLINT
+        EXPECT_PRED_FORMAT2(FloatLE, values_.further_from_one, 1.0f);
+      },
+      "(values_.further_from_one) <= (1.0f)");
 
-  EXPECT_NONFATAL_FAILURE({  // NOLINT
-    EXPECT_PRED_FORMAT2(FloatLE, values_.nan1, values_.infinity);
-  }, "(values_.nan1) <= (values_.infinity)");
-  EXPECT_NONFATAL_FAILURE({  // NOLINT
-    EXPECT_PRED_FORMAT2(FloatLE, -values_.infinity, values_.nan1);
-  }, "(-values_.infinity) <= (values_.nan1)");
-  EXPECT_FATAL_FAILURE({  // NOLINT
-    ASSERT_PRED_FORMAT2(FloatLE, values_.nan1, values_.nan1);
-  }, "(values_.nan1) <= (values_.nan1)");
+  EXPECT_NONFATAL_FAILURE(
+      {  // NOLINT
+        EXPECT_PRED_FORMAT2(FloatLE, values_.nan1, values_.infinity);
+      },
+      "(values_.nan1) <= (values_.infinity)");
+  EXPECT_NONFATAL_FAILURE(
+      {  // NOLINT
+        EXPECT_PRED_FORMAT2(FloatLE, -values_.infinity, values_.nan1);
+      },
+      "(-values_.infinity) <= (values_.nan1)");
+  EXPECT_FATAL_FAILURE(
+      {  // NOLINT
+        ASSERT_PRED_FORMAT2(FloatLE, values_.nan1, values_.nan1);
+      },
+      "(values_.nan1) <= (values_.nan1)");
 }
 
 // Instantiates FloatingPointTest for testing *_DOUBLE_EQ.
 typedef FloatingPointTest<double> DoubleTest;
 
 // Tests that the size of Double::Bits matches the size of double.
-TEST_F(DoubleTest, Size) {
-  TestSize();
-}
+TEST_F(DoubleTest, Size) { TestSize(); }
 
 // Tests comparing with +0 and -0.
 TEST_F(DoubleTest, Zeros) {
   EXPECT_DOUBLE_EQ(0.0, -0.0);
-  EXPECT_NONFATAL_FAILURE(EXPECT_DOUBLE_EQ(-0.0, 1.0),
-                          "1.0");
-  EXPECT_FATAL_FAILURE(ASSERT_DOUBLE_EQ(0.0, 1.0),
-                       "1.0");
+  EXPECT_NONFATAL_FAILURE(EXPECT_DOUBLE_EQ(-0.0, 1.0), "1.0");
+  EXPECT_FATAL_FAILURE(ASSERT_DOUBLE_EQ(0.0, 1.0), "1.0");
 }
 
 // Tests comparing numbers close to 0.
@@ -3013,10 +3027,12 @@ TEST_F(DoubleTest, AlmostZeros) {
   EXPECT_DOUBLE_EQ(-0.0, v.close_to_negative_zero);
   EXPECT_DOUBLE_EQ(v.close_to_positive_zero, v.close_to_negative_zero);
 
-  EXPECT_FATAL_FAILURE({  // NOLINT
-    ASSERT_DOUBLE_EQ(v.close_to_positive_zero,
-                     v.further_from_negative_zero);
-  }, "v.further_from_negative_zero");
+  EXPECT_FATAL_FAILURE(
+      {  // NOLINT
+        ASSERT_DOUBLE_EQ(v.close_to_positive_zero,
+                         v.further_from_negative_zero);
+      },
+      "v.further_from_negative_zero");
 }
 
 // Tests comparing numbers close to each other.
@@ -3028,8 +3044,7 @@ TEST_F(DoubleTest, SmallDiff) {
 
 // Tests comparing numbers far apart.
 TEST_F(DoubleTest, LargeDiff) {
-  EXPECT_NONFATAL_FAILURE(EXPECT_DOUBLE_EQ(2.0, 3.0),
-                          "3.0");
+  EXPECT_NONFATAL_FAILURE(EXPECT_DOUBLE_EQ(2.0, 3.0), "3.0");
 }
 
 // Tests comparing with infinity.
@@ -3037,6 +3052,8 @@ TEST_F(DoubleTest, LargeDiff) {
 // This ensures that no overflow occurs when comparing numbers whose
 // absolute value is very large.
 TEST_F(DoubleTest, Infinity) {
+  EXPECT_DOUBLE_EQ(values_.infinity, values_.infinity);
+  EXPECT_DOUBLE_EQ(-values_.infinity, -values_.infinity);
   EXPECT_DOUBLE_EQ(values_.infinity, values_.close_to_infinity);
   EXPECT_DOUBLE_EQ(-values_.infinity, -values_.close_to_infinity);
   EXPECT_NONFATAL_FAILURE(EXPECT_DOUBLE_EQ(values_.infinity, -values_.infinity),
@@ -3053,12 +3070,16 @@ TEST_F(DoubleTest, NaN) {
   static const DoubleTest::TestValues& v = this->values_;
 
   // Nokia's STLport crashes if we try to output infinity or NaN.
-  EXPECT_NONFATAL_FAILURE(EXPECT_DOUBLE_EQ(v.nan1, v.nan1),
-                          "v.nan1");
+  EXPECT_NONFATAL_FAILURE(EXPECT_DOUBLE_EQ(v.nan1, v.nan1), "v.nan1");
   EXPECT_NONFATAL_FAILURE(EXPECT_DOUBLE_EQ(v.nan1, v.nan2), "v.nan2");
   EXPECT_NONFATAL_FAILURE(EXPECT_DOUBLE_EQ(1.0, v.nan1), "v.nan1");
-  EXPECT_FATAL_FAILURE(ASSERT_DOUBLE_EQ(v.nan1, v.infinity),
-                       "v.infinity");
+  EXPECT_NONFATAL_FAILURE(EXPECT_NEAR(1.0, v.nan1, 1.0), "v.nan1");
+  EXPECT_NONFATAL_FAILURE(EXPECT_NEAR(1.0, v.nan1, v.infinity), "v.nan1");
+  EXPECT_NONFATAL_FAILURE(EXPECT_NEAR(v.infinity, v.nan1, 1.0), "v.nan1");
+  EXPECT_NONFATAL_FAILURE(EXPECT_NEAR(v.infinity, v.nan1, v.infinity),
+                          "v.nan1");
+
+  EXPECT_FATAL_FAILURE(ASSERT_DOUBLE_EQ(v.nan1, v.infinity), "v.infinity");
 }
 
 // Tests that *_DOUBLE_EQ are reflexive.
@@ -3080,11 +3101,28 @@ TEST_F(DoubleTest, Commutative) {
 
 // Tests EXPECT_NEAR.
 TEST_F(DoubleTest, EXPECT_NEAR) {
+  static const DoubleTest::TestValues& v = this->values_;
+
   EXPECT_NEAR(-1.0, -1.1, 0.2);
   EXPECT_NEAR(2.0, 3.0, 1.0);
+  EXPECT_NEAR(v.infinity, v.infinity, 0.0);
+  EXPECT_NEAR(-v.infinity, -v.infinity, 0.0);
+  EXPECT_NEAR(0.0, 1.0, v.infinity);
+  EXPECT_NEAR(v.infinity, -v.infinity, v.infinity);
+  EXPECT_NEAR(-v.infinity, v.infinity, v.infinity);
   EXPECT_NONFATAL_FAILURE(EXPECT_NEAR(1.0, 1.5, 0.25),  // NOLINT
                           "The difference between 1.0 and 1.5 is 0.5, "
                           "which exceeds 0.25");
+  EXPECT_NONFATAL_FAILURE(EXPECT_NEAR(v.infinity, -v.infinity, 0.0),
+                          "The difference between v.infinity and -v.infinity "
+                          "is inf, which exceeds 0.0");
+  EXPECT_NONFATAL_FAILURE(EXPECT_NEAR(-v.infinity, v.infinity, 0.0),
+                          "The difference between -v.infinity and v.infinity "
+                          "is inf, which exceeds 0.0");
+  EXPECT_NONFATAL_FAILURE(
+      EXPECT_NEAR(v.infinity, v.close_to_infinity, v.further_from_infinity),
+      "The difference between v.infinity and v.close_to_infinity is inf, which "
+      "exceeds v.further_from_infinity");
   // At this magnitude adjacent doubles are 512.0 apart, so this triggers a
   // slightly different failure reporting path.
   EXPECT_NONFATAL_FAILURE(
@@ -3119,22 +3157,29 @@ TEST_F(DoubleTest, DoubleLEFails) {
                           "(2.0) <= (1.0)");
 
   // or by a small yet non-negligible margin,
-  EXPECT_NONFATAL_FAILURE({  // NOLINT
-    EXPECT_PRED_FORMAT2(DoubleLE, values_.further_from_one, 1.0);
-  }, "(values_.further_from_one) <= (1.0)");
+  EXPECT_NONFATAL_FAILURE(
+      {  // NOLINT
+        EXPECT_PRED_FORMAT2(DoubleLE, values_.further_from_one, 1.0);
+      },
+      "(values_.further_from_one) <= (1.0)");
 
-  EXPECT_NONFATAL_FAILURE({  // NOLINT
-    EXPECT_PRED_FORMAT2(DoubleLE, values_.nan1, values_.infinity);
-  }, "(values_.nan1) <= (values_.infinity)");
-  EXPECT_NONFATAL_FAILURE({  // NOLINT
-    EXPECT_PRED_FORMAT2(DoubleLE, -values_.infinity, values_.nan1);
-  }, " (-values_.infinity) <= (values_.nan1)");
-  EXPECT_FATAL_FAILURE({  // NOLINT
-    ASSERT_PRED_FORMAT2(DoubleLE, values_.nan1, values_.nan1);
-  }, "(values_.nan1) <= (values_.nan1)");
+  EXPECT_NONFATAL_FAILURE(
+      {  // NOLINT
+        EXPECT_PRED_FORMAT2(DoubleLE, values_.nan1, values_.infinity);
+      },
+      "(values_.nan1) <= (values_.infinity)");
+  EXPECT_NONFATAL_FAILURE(
+      {  // NOLINT
+        EXPECT_PRED_FORMAT2(DoubleLE, -values_.infinity, values_.nan1);
+      },
+      " (-values_.infinity) <= (values_.nan1)");
+  EXPECT_FATAL_FAILURE(
+      {  // NOLINT
+        ASSERT_PRED_FORMAT2(DoubleLE, values_.nan1, values_.nan1);
+      },
+      "(values_.nan1) <= (values_.nan1)");
 }
 
-
 // Verifies that a test or test case whose name starts with DISABLED_ is
 // not run.
 
@@ -3146,9 +3191,7 @@ TEST(DisabledTest, DISABLED_TestShouldNotRun) {
 
 // A test whose name does not start with DISABLED_.
 // Should run.
-TEST(DisabledTest, NotDISABLED_TestShouldRun) {
-  EXPECT_EQ(1, 1);
-}
+TEST(DisabledTest, NotDISABLED_TestShouldRun) { EXPECT_EQ(1, 1); }
 
 // A test case whose name starts with DISABLED_.
 // Should not run.
@@ -3188,8 +3231,7 @@ TEST_F(DisabledTestsTest, DISABLED_TestShouldNotRun_2) {
 // Tests that disabled typed tests aren't run.
 
 template <typename T>
-class TypedTest : public Test {
-};
+class TypedTest : public Test {};
 
 typedef testing::Types<int, double> NumericTypes;
 TYPED_TEST_SUITE(TypedTest, NumericTypes);
@@ -3199,8 +3241,7 @@ TYPED_TEST(TypedTest, DISABLED_ShouldNotRun) {
 }
 
 template <typename T>
-class DISABLED_TypedTest : public Test {
-};
+class DISABLED_TypedTest : public Test {};
 
 TYPED_TEST_SUITE(DISABLED_TypedTest, NumericTypes);
 
@@ -3211,8 +3252,7 @@ TYPED_TEST(DISABLED_TypedTest, ShouldNotRun) {
 // Tests that disabled type-parameterized tests aren't run.
 
 template <typename T>
-class TypedTestP : public Test {
-};
+class TypedTestP : public Test {};
 
 TYPED_TEST_SUITE_P(TypedTestP);
 
@@ -3226,8 +3266,7 @@ REGISTER_TYPED_TEST_SUITE_P(TypedTestP, DISABLED_ShouldNotRun);
 INSTANTIATE_TYPED_TEST_SUITE_P(My, TypedTestP, NumericTypes);
 
 template <typename T>
-class DISABLED_TypedTestP : public Test {
-};
+class DISABLED_TypedTestP : public Test {};
 
 TYPED_TEST_SUITE_P(DISABLED_TypedTestP);
 
@@ -3247,15 +3286,11 @@ class SingleEvaluationTest : public Test {
   // This helper function is needed by the FailedASSERT_STREQ test
   // below.  It's public to work around C++Builder's bug with scoping local
   // classes.
-  static void CompareAndIncrementCharPtrs() {
-    ASSERT_STREQ(p1_++, p2_++);
-  }
+  static void CompareAndIncrementCharPtrs() { ASSERT_STREQ(p1_++, p2_++); }
 
   // This helper function is needed by the FailedASSERT_NE test below.  It's
   // public to work around C++Builder's bug with scoping local classes.
-  static void CompareAndIncrementInts() {
-    ASSERT_NE(a_++, b_++);
-  }
+  static void CompareAndIncrementInts() { ASSERT_NE(a_++, b_++); }
 
  protected:
   SingleEvaluationTest() {
@@ -3298,8 +3333,7 @@ TEST_F(SingleEvaluationTest, ASSERT_STR) {
   EXPECT_EQ(s2_ + 1, p2_);
 
   // failed EXPECT_STRCASEEQ
-  EXPECT_NONFATAL_FAILURE(EXPECT_STRCASEEQ(p1_++, p2_++),
-                          "Ignoring case");
+  EXPECT_NONFATAL_FAILURE(EXPECT_STRCASEEQ(p1_++, p2_++), "Ignoring case");
   EXPECT_EQ(s1_ + 2, p1_);
   EXPECT_EQ(s2_ + 2, p2_);
 }
@@ -3347,11 +3381,7 @@ TEST_F(SingleEvaluationTest, OtherCases) {
 
 #if GTEST_HAS_RTTI
 
-#ifdef _MSC_VER
-#define ERROR_DESC "class std::runtime_error"
-#else
 #define ERROR_DESC "std::runtime_error"
-#endif
 
 #else  // GTEST_HAS_RTTI
 
@@ -3359,34 +3389,39 @@ TEST_F(SingleEvaluationTest, OtherCases) {
 
 #endif  // GTEST_HAS_RTTI
 
-void ThrowAnInteger() {
-  throw 1;
-}
-void ThrowRuntimeError(const char* what) {
-  throw std::runtime_error(what);
-}
+void ThrowAnInteger() { throw 1; }
+void ThrowRuntimeError(const char* what) { throw std::runtime_error(what); }
 
 // Tests that assertion arguments are evaluated exactly once.
 TEST_F(SingleEvaluationTest, ExceptionTests) {
   // successful EXPECT_THROW
-  EXPECT_THROW({  // NOLINT
-    a_++;
-    ThrowAnInteger();
-  }, int);
+  EXPECT_THROW(
+      {  // NOLINT
+        a_++;
+        ThrowAnInteger();
+      },
+      int);
   EXPECT_EQ(1, a_);
 
   // failed EXPECT_THROW, throws different
-  EXPECT_NONFATAL_FAILURE(EXPECT_THROW({  // NOLINT
-    a_++;
-    ThrowAnInteger();
-  }, bool), "throws a different type");
+  EXPECT_NONFATAL_FAILURE(EXPECT_THROW(
+                              {  // NOLINT
+                                a_++;
+                                ThrowAnInteger();
+                              },
+                              bool),
+                          "throws a different type");
   EXPECT_EQ(2, a_);
 
   // failed EXPECT_THROW, throws runtime error
-  EXPECT_NONFATAL_FAILURE(EXPECT_THROW({  // NOLINT
-    a_++;
-    ThrowRuntimeError("A description");
-  }, bool), "throws " ERROR_DESC " with description \"A description\"");
+  EXPECT_NONFATAL_FAILURE(EXPECT_THROW(
+                              {  // NOLINT
+                                a_++;
+                                ThrowRuntimeError("A description");
+                              },
+                              bool),
+                          "throws " ERROR_DESC
+                          " with description \"A description\"");
   EXPECT_EQ(3, a_);
 
   // failed EXPECT_THROW, throws nothing
@@ -3399,9 +3434,10 @@ TEST_F(SingleEvaluationTest, ExceptionTests) {
 
   // failed EXPECT_NO_THROW
   EXPECT_NONFATAL_FAILURE(EXPECT_NO_THROW({  // NOLINT
-    a_++;
-    ThrowAnInteger();
-  }), "it throws");
+                            a_++;
+                            ThrowAnInteger();
+                          }),
+                          "it throws");
   EXPECT_EQ(6, a_);
 
   // successful EXPECT_ANY_THROW
@@ -3422,12 +3458,8 @@ TEST_F(SingleEvaluationTest, ExceptionTests) {
 class NoFatalFailureTest : public Test {
  protected:
   void Succeeds() {}
-  void FailsNonFatal() {
-    ADD_FAILURE() << "some non-fatal failure";
-  }
-  void Fails() {
-    FAIL() << "some fatal failure";
-  }
+  void FailsNonFatal() { ADD_FAILURE() << "some non-fatal failure"; }
+  void Fails() { FAIL() << "some fatal failure"; }
 
   void DoAssertNoFatalFailureOnFails() {
     ASSERT_NO_FATAL_FAILURE(Fails());
@@ -3446,12 +3478,10 @@ TEST_F(NoFatalFailureTest, NoFailure) {
 }
 
 TEST_F(NoFatalFailureTest, NonFatalIsNoFailure) {
-  EXPECT_NONFATAL_FAILURE(
-      EXPECT_NO_FATAL_FAILURE(FailsNonFatal()),
-      "some non-fatal failure");
-  EXPECT_NONFATAL_FAILURE(
-      ASSERT_NO_FATAL_FAILURE(FailsNonFatal()),
-      "some non-fatal failure");
+  EXPECT_NONFATAL_FAILURE(EXPECT_NO_FATAL_FAILURE(FailsNonFatal()),
+                          "some non-fatal failure");
+  EXPECT_NONFATAL_FAILURE(ASSERT_NO_FATAL_FAILURE(FailsNonFatal()),
+                          "some non-fatal failure");
 }
 
 TEST_F(NoFatalFailureTest, AssertNoFatalFailureOnFatalFailure) {
@@ -3496,10 +3526,10 @@ TEST_F(NoFatalFailureTest, MessageIsStreamable) {
   TestPartResultArray gtest_failures;
   {
     ScopedFakeTestPartResultReporter gtest_reporter(&gtest_failures);
-    EXPECT_NO_FATAL_FAILURE(FAIL() << "foo") << "my message";
+    EXPECT_NO_FATAL_FAILURE([] { FAIL() << "foo"; }()) << "my message";
   }
   ASSERT_EQ(2, gtest_failures.size());
-  EXPECT_EQ(TestPartResult::kNonFatalFailure,
+  EXPECT_EQ(TestPartResult::kFatalFailure,
             gtest_failures.GetTestPartResult(0).type());
   EXPECT_EQ(TestPartResult::kNonFatalFailure,
             gtest_failures.GetTestPartResult(1).type());
@@ -3574,8 +3604,9 @@ TEST(EditDistance, TestSuites) {
                 EditsToString(CalculateOptimalEdits(CharsToIndices(c->left),
                                                     CharsToIndices(c->right))))
         << "Left <" << c->left << "> Right <" << c->right << "> Edits <"
-        << EditsToString(CalculateOptimalEdits(
-               CharsToIndices(c->left), CharsToIndices(c->right))) << ">";
+        << EditsToString(CalculateOptimalEdits(CharsToIndices(c->left),
+                                               CharsToIndices(c->right)))
+        << ">";
     EXPECT_TRUE(c->expected_diff == CreateUnifiedDiff(CharsToLines(c->left),
                                                       CharsToLines(c->right)))
         << "Left <" << c->left << "> Right <" << c->right << "> Diff <"
@@ -3588,8 +3619,7 @@ TEST(EditDistance, TestSuites) {
 TEST(AssertionTest, EqFailure) {
   const std::string foo_val("5"), bar_val("6");
   const std::string msg1(
-      EqFailure("foo", "bar", foo_val, bar_val, false)
-      .failure_message());
+      EqFailure("foo", "bar", foo_val, bar_val, false).failure_message());
   EXPECT_STREQ(
       "Expected equality of these values:\n"
       "  foo\n"
@@ -3599,8 +3629,7 @@ TEST(AssertionTest, EqFailure) {
       msg1.c_str());
 
   const std::string msg2(
-      EqFailure("foo", "6", foo_val, bar_val, false)
-      .failure_message());
+      EqFailure("foo", "6", foo_val, bar_val, false).failure_message());
   EXPECT_STREQ(
       "Expected equality of these values:\n"
       "  foo\n"
@@ -3609,8 +3638,7 @@ TEST(AssertionTest, EqFailure) {
       msg2.c_str());
 
   const std::string msg3(
-      EqFailure("5", "bar", foo_val, bar_val, false)
-      .failure_message());
+      EqFailure("5", "bar", foo_val, bar_val, false).failure_message());
   EXPECT_STREQ(
       "Expected equality of these values:\n"
       "  5\n"
@@ -3627,9 +3655,8 @@ TEST(AssertionTest, EqFailure) {
       msg4.c_str());
 
   const std::string msg5(
-      EqFailure("foo", "bar",
-                std::string("\"x\""), std::string("\"y\""),
-                true).failure_message());
+      EqFailure("foo", "bar", std::string("\"x\""), std::string("\"y\""), true)
+          .failure_message());
   EXPECT_STREQ(
       "Expected equality of these values:\n"
       "  foo\n"
@@ -3664,24 +3691,21 @@ TEST(AssertionTest, AppendUserMessage) {
   const std::string foo("foo");
 
   Message msg;
-  EXPECT_STREQ("foo",
-               AppendUserMessage(foo, msg).c_str());
+  EXPECT_STREQ("foo", AppendUserMessage(foo, msg).c_str());
 
   msg << "bar";
-  EXPECT_STREQ("foo\nbar",
-               AppendUserMessage(foo, msg).c_str());
+  EXPECT_STREQ("foo\nbar", AppendUserMessage(foo, msg).c_str());
 }
 
 #ifdef __BORLANDC__
 // Silences warnings: "Condition is always true", "Unreachable code"
-# pragma option push -w-ccc -w-rch
+#pragma option push -w-ccc -w-rch
 #endif
 
 // Tests ASSERT_TRUE.
 TEST(AssertionTest, ASSERT_TRUE) {
   ASSERT_TRUE(2 > 1);  // NOLINT
-  EXPECT_FATAL_FAILURE(ASSERT_TRUE(2 < 1),
-                       "2 < 1");
+  EXPECT_FATAL_FAILURE(ASSERT_TRUE(2 < 1), "2 < 1");
 }
 
 // Tests ASSERT_TRUE(predicate) for predicates returning AssertionResult.
@@ -3729,7 +3753,7 @@ TEST(AssertionTest, AssertFalseWithAssertionResult) {
 
 #ifdef __BORLANDC__
 // Restores warnings after previous "#pragma option push" suppressed them
-# pragma option pop
+#pragma option pop
 #endif
 
 // Tests using ASSERT_EQ on double values.  The purpose is to make
@@ -3740,18 +3764,19 @@ TEST(ExpectTest, ASSERT_EQ_Double) {
   ASSERT_EQ(5.6, 5.6);
 
   // A failure.
-  EXPECT_FATAL_FAILURE(ASSERT_EQ(5.1, 5.2),
-                       "5.1");
+  EXPECT_FATAL_FAILURE(ASSERT_EQ(5.1, 5.2), "5.1");
 }
 
 // Tests ASSERT_EQ.
 TEST(AssertionTest, ASSERT_EQ) {
   ASSERT_EQ(5, 2 + 3);
+  // clang-format off
   EXPECT_FATAL_FAILURE(ASSERT_EQ(5, 2*3),
                        "Expected equality of these values:\n"
                        "  5\n"
                        "  2*3\n"
                        "    Which is: 6");
+  // clang-format on
 }
 
 // Tests ASSERT_EQ(NULL, pointer).
@@ -3776,8 +3801,7 @@ TEST(ExpectTest, ASSERT_EQ_0) {
   ASSERT_EQ(0, n);
 
   // A failure.
-  EXPECT_FATAL_FAILURE(ASSERT_EQ(0, 5.6),
-                       "  0\n  5.6");
+  EXPECT_FATAL_FAILURE(ASSERT_EQ(0, 5.6), "  0\n  5.6");
 }
 
 // Tests ASSERT_NE.
@@ -3792,30 +3816,26 @@ TEST(AssertionTest, ASSERT_NE) {
 TEST(AssertionTest, ASSERT_LE) {
   ASSERT_LE(2, 3);
   ASSERT_LE(2, 2);
-  EXPECT_FATAL_FAILURE(ASSERT_LE(2, 0),
-                       "Expected: (2) <= (0), actual: 2 vs 0");
+  EXPECT_FATAL_FAILURE(ASSERT_LE(2, 0), "Expected: (2) <= (0), actual: 2 vs 0");
 }
 
 // Tests ASSERT_LT.
 TEST(AssertionTest, ASSERT_LT) {
   ASSERT_LT(2, 3);
-  EXPECT_FATAL_FAILURE(ASSERT_LT(2, 2),
-                       "Expected: (2) < (2), actual: 2 vs 2");
+  EXPECT_FATAL_FAILURE(ASSERT_LT(2, 2), "Expected: (2) < (2), actual: 2 vs 2");
 }
 
 // Tests ASSERT_GE.
 TEST(AssertionTest, ASSERT_GE) {
   ASSERT_GE(2, 1);
   ASSERT_GE(2, 2);
-  EXPECT_FATAL_FAILURE(ASSERT_GE(2, 3),
-                       "Expected: (2) >= (3), actual: 2 vs 3");
+  EXPECT_FATAL_FAILURE(ASSERT_GE(2, 3), "Expected: (2) >= (3), actual: 2 vs 3");
 }
 
 // Tests ASSERT_GT.
 TEST(AssertionTest, ASSERT_GT) {
   ASSERT_GT(2, 1);
-  EXPECT_FATAL_FAILURE(ASSERT_GT(2, 2),
-                       "Expected: (2) > (2), actual: 2 vs 2");
+  EXPECT_FATAL_FAILURE(ASSERT_GT(2, 2), "Expected: (2) > (2), actual: 2 vs 2");
 }
 
 #if GTEST_HAS_EXCEPTIONS
@@ -3826,7 +3846,7 @@ void ThrowNothing() {}
 TEST(AssertionTest, ASSERT_THROW) {
   ASSERT_THROW(ThrowAnInteger(), int);
 
-# ifndef __BORLANDC__
+#ifndef __BORLANDC__
 
   // ICE's in C++Builder 2007 and 2009.
   EXPECT_FATAL_FAILURE(
@@ -3837,9 +3857,10 @@ TEST(AssertionTest, ASSERT_THROW) {
       ASSERT_THROW(ThrowRuntimeError("A description"), std::logic_error),
       "Expected: ThrowRuntimeError(\"A description\") "
       "throws an exception of type std::logic_error.\n  "
-      "Actual: it throws " ERROR_DESC " "
+      "Actual: it throws " ERROR_DESC
+      " "
       "with description \"A description\".");
-# endif
+#endif
 
   EXPECT_FATAL_FAILURE(
       ASSERT_THROW(ThrowNothing(), bool),
@@ -3856,17 +3877,17 @@ TEST(AssertionTest, ASSERT_NO_THROW) {
   EXPECT_FATAL_FAILURE(ASSERT_NO_THROW(ThrowRuntimeError("A description")),
                        "Expected: ThrowRuntimeError(\"A description\") "
                        "doesn't throw an exception.\n  "
-                       "Actual: it throws " ERROR_DESC " "
+                       "Actual: it throws " ERROR_DESC
+                       " "
                        "with description \"A description\".");
 }
 
 // Tests ASSERT_ANY_THROW.
 TEST(AssertionTest, ASSERT_ANY_THROW) {
   ASSERT_ANY_THROW(ThrowAnInteger());
-  EXPECT_FATAL_FAILURE(
-      ASSERT_ANY_THROW(ThrowNothing()),
-      "Expected: ThrowNothing() throws an exception.\n"
-      "  Actual: it doesn't.");
+  EXPECT_FATAL_FAILURE(ASSERT_ANY_THROW(ThrowNothing()),
+                       "Expected: ThrowNothing() throws an exception.\n"
+                       "  Actual: it doesn't.");
 }
 
 #endif  // GTEST_HAS_EXCEPTIONS
@@ -3880,14 +3901,11 @@ TEST(AssertionTest, AssertPrecedence) {
 }
 
 // A subroutine used by the following test.
-void TestEq1(int x) {
-  ASSERT_EQ(1, x);
-}
+void TestEq1(int x) { ASSERT_EQ(1, x); }
 
 // Tests calling a test subroutine that's not part of a fixture.
 TEST(AssertionTest, NonFixtureSubroutine) {
-  EXPECT_FATAL_FAILURE(TestEq1(2),
-                       "  x\n    Which is: 2");
+  EXPECT_FATAL_FAILURE(TestEq1(2), "  x\n    Which is: 2");
 }
 
 // An uncopyable class.
@@ -3899,6 +3917,7 @@ class Uncopyable {
   bool operator==(const Uncopyable& rhs) const {
     return value() == rhs.value();
   }
+
  private:
   // This constructor deliberately has no implementation, as we don't
   // want this class to be copyable.
@@ -3911,10 +3930,7 @@ ::std::ostream& operator<<(::std::ostream& os, const Uncopyable& value) {
   return os << value.value();
 }
 
-
-bool IsPositiveUncopyable(const Uncopyable& x) {
-  return x.value() > 0;
-}
+bool IsPositiveUncopyable(const Uncopyable& x) { return x.value() > 0; }
 
 // A subroutine used by the following test.
 void TestAssertNonPositive() {
@@ -3933,8 +3949,9 @@ TEST(AssertionTest, AssertWorksWithUncopyableObject) {
   Uncopyable x(5);
   ASSERT_PRED1(IsPositiveUncopyable, x);
   ASSERT_EQ(x, x);
-  EXPECT_FATAL_FAILURE(TestAssertNonPositive(),
-    "IsPositiveUncopyable(y) evaluates to false, where\ny evaluates to -1");
+  EXPECT_FATAL_FAILURE(
+      TestAssertNonPositive(),
+      "IsPositiveUncopyable(y) evaluates to false, where\ny evaluates to -1");
   EXPECT_FATAL_FAILURE(TestAssertEqualsUncopyable(),
                        "Expected equality of these values:\n"
                        "  x\n    Which is: 5\n  y\n    Which is: -1");
@@ -3945,18 +3962,16 @@ TEST(AssertionTest, ExpectWorksWithUncopyableObject) {
   Uncopyable x(5);
   EXPECT_PRED1(IsPositiveUncopyable, x);
   Uncopyable y(-1);
-  EXPECT_NONFATAL_FAILURE(EXPECT_PRED1(IsPositiveUncopyable, y),
-    "IsPositiveUncopyable(y) evaluates to false, where\ny evaluates to -1");
+  EXPECT_NONFATAL_FAILURE(
+      EXPECT_PRED1(IsPositiveUncopyable, y),
+      "IsPositiveUncopyable(y) evaluates to false, where\ny evaluates to -1");
   EXPECT_EQ(x, x);
   EXPECT_NONFATAL_FAILURE(EXPECT_EQ(x, y),
                           "Expected equality of these values:\n"
                           "  x\n    Which is: 5\n  y\n    Which is: -1");
 }
 
-enum NamedEnum {
-  kE1 = 0,
-  kE2 = 1
-};
+enum NamedEnum { kE1 = 0, kE2 = 1 };
 
 TEST(AssertionTest, NamedEnum) {
   EXPECT_EQ(kE1, kE1);
@@ -3972,7 +3987,7 @@ TEST(AssertionTest, NamedEnum) {
 enum {
   kCaseA = -1,
 
-# if GTEST_OS_LINUX
+#ifdef GTEST_OS_LINUX
 
   // We want to test the case where the size of the anonymous enum is
   // larger than sizeof(int), to make sure our implementation of the
@@ -3985,21 +4000,21 @@ enum {
   // assertions.
   kCaseB = testing::internal::kMaxBiggestInt,
 
-# else
+#else
 
   kCaseB = INT_MAX,
 
-# endif  // GTEST_OS_LINUX
+#endif  // GTEST_OS_LINUX
 
   kCaseC = 42
 };
 
 TEST(AssertionTest, AnonymousEnum) {
-# if GTEST_OS_LINUX
+#ifdef GTEST_OS_LINUX
 
   EXPECT_EQ(static_cast<int>(kCaseA), static_cast<int>(kCaseB));
 
-# endif  // GTEST_OS_LINUX
+#endif  // GTEST_OS_LINUX
 
   EXPECT_EQ(kCaseA, kCaseA);
   EXPECT_NE(kCaseA, kCaseB);
@@ -4007,10 +4022,8 @@ TEST(AssertionTest, AnonymousEnum) {
   EXPECT_LE(kCaseA, kCaseB);
   EXPECT_GT(kCaseB, kCaseA);
   EXPECT_GE(kCaseA, kCaseA);
-  EXPECT_NONFATAL_FAILURE(EXPECT_GE(kCaseA, kCaseB),
-                          "(kCaseA) >= (kCaseB)");
-  EXPECT_NONFATAL_FAILURE(EXPECT_GE(kCaseA, kCaseC),
-                          "-1 vs 42");
+  EXPECT_NONFATAL_FAILURE(EXPECT_GE(kCaseA, kCaseB), "(kCaseA) >= (kCaseB)");
+  EXPECT_NONFATAL_FAILURE(EXPECT_GE(kCaseA, kCaseC), "-1 vs 42");
 
   ASSERT_EQ(kCaseA, kCaseA);
   ASSERT_NE(kCaseA, kCaseB);
@@ -4019,34 +4032,25 @@ TEST(AssertionTest, AnonymousEnum) {
   ASSERT_GT(kCaseB, kCaseA);
   ASSERT_GE(kCaseA, kCaseA);
 
-# ifndef __BORLANDC__
+#ifndef __BORLANDC__
 
   // ICE's in C++Builder.
-  EXPECT_FATAL_FAILURE(ASSERT_EQ(kCaseA, kCaseB),
-                       "  kCaseB\n    Which is: ");
-  EXPECT_FATAL_FAILURE(ASSERT_EQ(kCaseA, kCaseC),
-                       "\n    Which is: 42");
-# endif
+  EXPECT_FATAL_FAILURE(ASSERT_EQ(kCaseA, kCaseB), "  kCaseB\n    Which is: ");
+  EXPECT_FATAL_FAILURE(ASSERT_EQ(kCaseA, kCaseC), "\n    Which is: 42");
+#endif
 
-  EXPECT_FATAL_FAILURE(ASSERT_EQ(kCaseA, kCaseC),
-                       "\n    Which is: -1");
+  EXPECT_FATAL_FAILURE(ASSERT_EQ(kCaseA, kCaseC), "\n    Which is: -1");
 }
 
 #endif  // !GTEST_OS_MAC && !defined(__SUNPRO_CC)
 
-#if GTEST_OS_WINDOWS
+#ifdef GTEST_OS_WINDOWS
 
-static HRESULT UnexpectedHRESULTFailure() {
-  return E_UNEXPECTED;
-}
+static HRESULT UnexpectedHRESULTFailure() { return E_UNEXPECTED; }
 
-static HRESULT OkHRESULTSuccess() {
-  return S_OK;
-}
+static HRESULT OkHRESULTSuccess() { return S_OK; }
 
-static HRESULT FalseHRESULTSuccess() {
-  return S_FALSE;
-}
+static HRESULT FalseHRESULTSuccess() { return S_FALSE; }
 
 // HRESULT assertion tests test both zero and non-zero
 // success codes as well as failure message for each.
@@ -4057,8 +4061,8 @@ TEST(HRESULTAssertionTest, EXPECT_HRESULT_SUCCEEDED) {
   EXPECT_HRESULT_SUCCEEDED(S_FALSE);
 
   EXPECT_NONFATAL_FAILURE(EXPECT_HRESULT_SUCCEEDED(UnexpectedHRESULTFailure()),
-    "Expected: (UnexpectedHRESULTFailure()) succeeds.\n"
-    "  Actual: 0x8000FFFF");
+                          "Expected: (UnexpectedHRESULTFailure()) succeeds.\n"
+                          "  Actual: 0x8000FFFF");
 }
 
 TEST(HRESULTAssertionTest, ASSERT_HRESULT_SUCCEEDED) {
@@ -4066,35 +4070,35 @@ TEST(HRESULTAssertionTest, ASSERT_HRESULT_SUCCEEDED) {
   ASSERT_HRESULT_SUCCEEDED(S_FALSE);
 
   EXPECT_FATAL_FAILURE(ASSERT_HRESULT_SUCCEEDED(UnexpectedHRESULTFailure()),
-    "Expected: (UnexpectedHRESULTFailure()) succeeds.\n"
-    "  Actual: 0x8000FFFF");
+                       "Expected: (UnexpectedHRESULTFailure()) succeeds.\n"
+                       "  Actual: 0x8000FFFF");
 }
 
 TEST(HRESULTAssertionTest, EXPECT_HRESULT_FAILED) {
   EXPECT_HRESULT_FAILED(E_UNEXPECTED);
 
   EXPECT_NONFATAL_FAILURE(EXPECT_HRESULT_FAILED(OkHRESULTSuccess()),
-    "Expected: (OkHRESULTSuccess()) fails.\n"
-    "  Actual: 0x0");
+                          "Expected: (OkHRESULTSuccess()) fails.\n"
+                          "  Actual: 0x0");
   EXPECT_NONFATAL_FAILURE(EXPECT_HRESULT_FAILED(FalseHRESULTSuccess()),
-    "Expected: (FalseHRESULTSuccess()) fails.\n"
-    "  Actual: 0x1");
+                          "Expected: (FalseHRESULTSuccess()) fails.\n"
+                          "  Actual: 0x1");
 }
 
 TEST(HRESULTAssertionTest, ASSERT_HRESULT_FAILED) {
   ASSERT_HRESULT_FAILED(E_UNEXPECTED);
 
-# ifndef __BORLANDC__
+#ifndef __BORLANDC__
 
   // ICE's in C++Builder 2007 and 2009.
   EXPECT_FATAL_FAILURE(ASSERT_HRESULT_FAILED(OkHRESULTSuccess()),
-    "Expected: (OkHRESULTSuccess()) fails.\n"
-    "  Actual: 0x0");
-# endif
+                       "Expected: (OkHRESULTSuccess()) fails.\n"
+                       "  Actual: 0x0");
+#endif
 
   EXPECT_FATAL_FAILURE(ASSERT_HRESULT_FAILED(FalseHRESULTSuccess()),
-    "Expected: (FalseHRESULTSuccess()) fails.\n"
-    "  Actual: 0x1");
+                       "Expected: (FalseHRESULTSuccess()) fails.\n"
+                       "  Actual: 0x1");
 }
 
 // Tests that streaming to the HRESULT macros works.
@@ -4104,25 +4108,23 @@ TEST(HRESULTAssertionTest, Streaming) {
   EXPECT_HRESULT_FAILED(E_UNEXPECTED) << "unexpected failure";
   ASSERT_HRESULT_FAILED(E_UNEXPECTED) << "unexpected failure";
 
-  EXPECT_NONFATAL_FAILURE(
-      EXPECT_HRESULT_SUCCEEDED(E_UNEXPECTED) << "expected failure",
-      "expected failure");
+  EXPECT_NONFATAL_FAILURE(EXPECT_HRESULT_SUCCEEDED(E_UNEXPECTED)
+                              << "expected failure",
+                          "expected failure");
 
-# ifndef __BORLANDC__
+#ifndef __BORLANDC__
 
   // ICE's in C++Builder 2007 and 2009.
-  EXPECT_FATAL_FAILURE(
-      ASSERT_HRESULT_SUCCEEDED(E_UNEXPECTED) << "expected failure",
-      "expected failure");
-# endif
+  EXPECT_FATAL_FAILURE(ASSERT_HRESULT_SUCCEEDED(E_UNEXPECTED)
+                           << "expected failure",
+                       "expected failure");
+#endif
 
-  EXPECT_NONFATAL_FAILURE(
-      EXPECT_HRESULT_FAILED(S_OK) << "expected failure",
-      "expected failure");
+  EXPECT_NONFATAL_FAILURE(EXPECT_HRESULT_FAILED(S_OK) << "expected failure",
+                          "expected failure");
 
-  EXPECT_FATAL_FAILURE(
-      ASSERT_HRESULT_FAILED(S_OK) << "expected failure",
-      "expected failure");
+  EXPECT_FATAL_FAILURE(ASSERT_HRESULT_FAILED(S_OK) << "expected failure",
+                       "expected failure");
 }
 
 #endif  // GTEST_OS_WINDOWS
@@ -4145,8 +4147,7 @@ TEST(AssertionSyntaxTest, BasicAssertionsBehavesLikeSingleStatement) {
   else
     ;  // NOLINT
 
-  if (AlwaysFalse())
-    ASSERT_LT(1, 3);
+  if (AlwaysFalse()) ASSERT_LT(1, 3);
 
   if (AlwaysFalse())
     ;  // NOLINT
@@ -4165,7 +4166,7 @@ TEST(ExpectThrowTest, DoesNotGenerateUnreachableCodeWarning) {
 
   EXPECT_THROW(throw 1, int);
   EXPECT_NONFATAL_FAILURE(EXPECT_THROW(n++, int), "");
-  EXPECT_NONFATAL_FAILURE(EXPECT_THROW(throw 1, const char*), "");
+  EXPECT_NONFATAL_FAILURE(EXPECT_THROW(throw n, const char*), "");
   EXPECT_NO_THROW(n++);
   EXPECT_NONFATAL_FAILURE(EXPECT_NO_THROW(throw 1), "");
   EXPECT_ANY_THROW(throw 1);
@@ -4184,24 +4185,21 @@ TEST(ExpectThrowTest, DoesNotGenerateDuplicateCatchClauseWarning) {
 #pragma GCC diagnostic ignored "-Wpragmas"
 #endif
 TEST(AssertionSyntaxTest, ExceptionAssertionsBehavesLikeSingleStatement) {
-  if (AlwaysFalse())
-    EXPECT_THROW(ThrowNothing(), bool);
+  if (AlwaysFalse()) EXPECT_THROW(ThrowNothing(), bool);
 
   if (AlwaysTrue())
     EXPECT_THROW(ThrowAnInteger(), int);
   else
     ;  // NOLINT
 
-  if (AlwaysFalse())
-    EXPECT_NO_THROW(ThrowAnInteger());
+  if (AlwaysFalse()) EXPECT_NO_THROW(ThrowAnInteger());
 
   if (AlwaysTrue())
     EXPECT_NO_THROW(ThrowNothing());
   else
     ;  // NOLINT
 
-  if (AlwaysFalse())
-    EXPECT_ANY_THROW(ThrowNothing());
+  if (AlwaysFalse()) EXPECT_ANY_THROW(ThrowNothing());
 
   if (AlwaysTrue())
     EXPECT_ANY_THROW(ThrowAnInteger());
@@ -4223,8 +4221,8 @@ TEST(AssertionSyntaxTest, ExceptionAssertionsBehavesLikeSingleStatement) {
 #endif
 TEST(AssertionSyntaxTest, NoFatalFailureAssertionsBehavesLikeSingleStatement) {
   if (AlwaysFalse())
-    EXPECT_NO_FATAL_FAILURE(FAIL()) << "This should never be executed. "
-                                    << "It's a compilation test only.";
+    EXPECT_NO_FATAL_FAILURE(FAIL())
+        << "This should never be executed. " << "It's a compilation test only.";
   else
     ;  // NOLINT
 
@@ -4257,8 +4255,8 @@ TEST(AssertionSyntaxTest, WorksWithSwitch) {
   }
 
   switch (0)
-    case 0:
-      EXPECT_FALSE(false) << "EXPECT_FALSE failed in switch case";
+  case 0:
+    EXPECT_FALSE(false) << "EXPECT_FALSE failed in switch case";
 
   // Binary assertions are implemented using a different code path
   // than the Boolean assertions.  Hence we test them separately.
@@ -4269,22 +4267,20 @@ TEST(AssertionSyntaxTest, WorksWithSwitch) {
   }
 
   switch (0)
-    case 0:
-      EXPECT_NE(1, 2);
+  case 0:
+    EXPECT_NE(1, 2);
 }
 
 #if GTEST_HAS_EXCEPTIONS
 
-void ThrowAString() {
-    throw "std::string";
-}
+void ThrowAString() { throw "std::string"; }
 
 // Test that the exception assertion macros compile and work with const
 // type qualifier.
 TEST(AssertionSyntaxTest, WorksWithConst) {
-    ASSERT_THROW(ThrowAString(), const char*);
+  ASSERT_THROW(ThrowAString(), const char*);
 
-    EXPECT_THROW(ThrowAString(), const char*);
+  EXPECT_THROW(ThrowAString(), const char*);
 }
 
 #endif  // GTEST_HAS_EXCEPTIONS
@@ -4382,22 +4378,19 @@ TEST(AssertionWithMessageTest, ASSERT_FLOATING) {
 // Tests using ASSERT_FALSE with a streamed message.
 TEST(AssertionWithMessageTest, ASSERT_FALSE) {
   ASSERT_FALSE(false) << "This shouldn't fail.";
-  EXPECT_FATAL_FAILURE({  // NOLINT
-    ASSERT_FALSE(true) << "Expected failure: " << 2 << " > " << 1
-                       << " evaluates to " << true;
-  }, "Expected failure");
+  EXPECT_FATAL_FAILURE(
+      {  // NOLINT
+        ASSERT_FALSE(true) << "Expected failure: " << 2 << " > " << 1
+                           << " evaluates to " << true;
+      },
+      "Expected failure");
 }
 
 // Tests using FAIL with a streamed message.
-TEST(AssertionWithMessageTest, FAIL) {
-  EXPECT_FATAL_FAILURE(FAIL() << 0,
-                       "0");
-}
+TEST(AssertionWithMessageTest, FAIL) { EXPECT_FATAL_FAILURE(FAIL() << 0, "0"); }
 
 // Tests using SUCCEED with a streamed message.
-TEST(AssertionWithMessageTest, SUCCEED) {
-  SUCCEED() << "Success == " << 1;
-}
+TEST(AssertionWithMessageTest, SUCCEED) { SUCCEED() << "Success == " << 1; }
 
 // Tests using ASSERT_TRUE with a streamed message.
 TEST(AssertionWithMessageTest, ASSERT_TRUE) {
@@ -4411,16 +4404,19 @@ TEST(AssertionWithMessageTest, ASSERT_TRUE) {
       "(null)(null)");
 }
 
-#if GTEST_OS_WINDOWS
+#ifdef GTEST_OS_WINDOWS
 // Tests using wide strings in assertion messages.
 TEST(AssertionWithMessageTest, WideStringMessage) {
-  EXPECT_NONFATAL_FAILURE({  // NOLINT
-    EXPECT_TRUE(false) << L"This failure is expected.\x8119";
-  }, "This failure is expected.");
-  EXPECT_FATAL_FAILURE({  // NOLINT
-    ASSERT_EQ(1, 2) << "This failure is "
-                    << L"expected too.\x8120";
-  }, "This failure is expected too.");
+  EXPECT_NONFATAL_FAILURE(
+      {  // NOLINT
+        EXPECT_TRUE(false) << L"This failure is expected.\x8119";
+      },
+      "This failure is expected.");
+  EXPECT_FATAL_FAILURE(
+      {  // NOLINT
+        ASSERT_EQ(1, 2) << "This failure is " << L"expected too.\x8120";
+      },
+      "This failure is expected too.");
 }
 #endif  // GTEST_OS_WINDOWS
 
@@ -4436,8 +4432,7 @@ TEST(ExpectTest, EXPECT_TRUE) {
                           "Value of: 2 < 1\n"
                           "  Actual: false\n"
                           "Expected: true");
-  EXPECT_NONFATAL_FAILURE(EXPECT_TRUE(2 > 3),
-                          "2 > 3");
+  EXPECT_NONFATAL_FAILURE(EXPECT_TRUE(2 > 3), "2 > 3");
 }
 
 // Tests EXPECT_TRUE(predicate) for predicates returning AssertionResult.
@@ -4466,8 +4461,7 @@ TEST(ExpectTest, EXPECT_FALSE) {
                           "Value of: 2 > 1\n"
                           "  Actual: true\n"
                           "Expected: false");
-  EXPECT_NONFATAL_FAILURE(EXPECT_FALSE(2 < 3),
-                          "2 < 3");
+  EXPECT_NONFATAL_FAILURE(EXPECT_FALSE(2 < 3), "2 < 3");
 }
 
 // Tests EXPECT_FALSE(predicate) for predicates returning AssertionResult.
@@ -4486,19 +4480,20 @@ TEST(ExpectTest, ExpectFalseWithAssertionResult) {
 
 #ifdef __BORLANDC__
 // Restores warnings after previous "#pragma option push" suppressed them
-# pragma option pop
+#pragma option pop
 #endif
 
 // Tests EXPECT_EQ.
 TEST(ExpectTest, EXPECT_EQ) {
   EXPECT_EQ(5, 2 + 3);
+  // clang-format off
   EXPECT_NONFATAL_FAILURE(EXPECT_EQ(5, 2*3),
                           "Expected equality of these values:\n"
                           "  5\n"
                           "  2*3\n"
                           "    Which is: 6");
-  EXPECT_NONFATAL_FAILURE(EXPECT_EQ(5, 2 - 3),
-                          "2 - 3");
+  EXPECT_NONFATAL_FAILURE(EXPECT_EQ(5, 2 - 3), "2 - 3");
+  // clang-format on
 }
 
 // Tests using EXPECT_EQ on double values.  The purpose is to make
@@ -4509,8 +4504,7 @@ TEST(ExpectTest, EXPECT_EQ_Double) {
   EXPECT_EQ(5.6, 5.6);
 
   // A failure.
-  EXPECT_NONFATAL_FAILURE(EXPECT_EQ(5.1, 5.2),
-                          "5.1");
+  EXPECT_NONFATAL_FAILURE(EXPECT_EQ(5.1, 5.2), "5.1");
 }
 
 // Tests EXPECT_EQ(NULL, pointer).
@@ -4535,8 +4529,7 @@ TEST(ExpectTest, EXPECT_EQ_0) {
   EXPECT_EQ(0, n);
 
   // A failure.
-  EXPECT_NONFATAL_FAILURE(EXPECT_EQ(0, 5.6),
-                          "  0\n  5.6");
+  EXPECT_NONFATAL_FAILURE(EXPECT_EQ(0, 5.6), "  0\n  5.6");
 }
 
 // Tests EXPECT_NE.
@@ -4546,19 +4539,16 @@ TEST(ExpectTest, EXPECT_NE) {
   EXPECT_NONFATAL_FAILURE(EXPECT_NE('a', 'a'),
                           "Expected: ('a') != ('a'), "
                           "actual: 'a' (97, 0x61) vs 'a' (97, 0x61)");
-  EXPECT_NONFATAL_FAILURE(EXPECT_NE(2, 2),
-                          "2");
+  EXPECT_NONFATAL_FAILURE(EXPECT_NE(2, 2), "2");
   char* const p0 = nullptr;
-  EXPECT_NONFATAL_FAILURE(EXPECT_NE(p0, p0),
-                          "p0");
+  EXPECT_NONFATAL_FAILURE(EXPECT_NE(p0, p0), "p0");
   // Only way to get the Nokia compiler to compile the cast
   // is to have a separate void* variable first. Putting
   // the two casts on the same line doesn't work, neither does
   // a direct C-style to char*.
   void* pv1 = (void*)0x1234;  // NOLINT
   char* const p1 = reinterpret_cast<char*>(pv1);
-  EXPECT_NONFATAL_FAILURE(EXPECT_NE(p1, p1),
-                          "p1");
+  EXPECT_NONFATAL_FAILURE(EXPECT_NE(p1, p1), "p1");
 }
 
 // Tests EXPECT_LE.
@@ -4567,8 +4557,7 @@ TEST(ExpectTest, EXPECT_LE) {
   EXPECT_LE(2, 2);
   EXPECT_NONFATAL_FAILURE(EXPECT_LE(2, 0),
                           "Expected: (2) <= (0), actual: 2 vs 0");
-  EXPECT_NONFATAL_FAILURE(EXPECT_LE(1.1, 0.9),
-                          "(1.1) <= (0.9)");
+  EXPECT_NONFATAL_FAILURE(EXPECT_LE(1.1, 0.9), "(1.1) <= (0.9)");
 }
 
 // Tests EXPECT_LT.
@@ -4576,8 +4565,7 @@ TEST(ExpectTest, EXPECT_LT) {
   EXPECT_LT(2, 3);
   EXPECT_NONFATAL_FAILURE(EXPECT_LT(2, 2),
                           "Expected: (2) < (2), actual: 2 vs 2");
-  EXPECT_NONFATAL_FAILURE(EXPECT_LT(2, 1),
-                          "(2) < (1)");
+  EXPECT_NONFATAL_FAILURE(EXPECT_LT(2, 1), "(2) < (1)");
 }
 
 // Tests EXPECT_GE.
@@ -4586,8 +4574,7 @@ TEST(ExpectTest, EXPECT_GE) {
   EXPECT_GE(2, 2);
   EXPECT_NONFATAL_FAILURE(EXPECT_GE(2, 3),
                           "Expected: (2) >= (3), actual: 2 vs 3");
-  EXPECT_NONFATAL_FAILURE(EXPECT_GE(0.9, 1.1),
-                          "(0.9) >= (1.1)");
+  EXPECT_NONFATAL_FAILURE(EXPECT_GE(0.9, 1.1), "(0.9) >= (1.1)");
 }
 
 // Tests EXPECT_GT.
@@ -4595,8 +4582,7 @@ TEST(ExpectTest, EXPECT_GT) {
   EXPECT_GT(2, 1);
   EXPECT_NONFATAL_FAILURE(EXPECT_GT(2, 2),
                           "Expected: (2) > (2), actual: 2 vs 2");
-  EXPECT_NONFATAL_FAILURE(EXPECT_GT(2, 3),
-                          "(2) > (3)");
+  EXPECT_NONFATAL_FAILURE(EXPECT_GT(2, 3), "(2) > (3)");
 }
 
 #if GTEST_HAS_EXCEPTIONS
@@ -4607,12 +4593,13 @@ TEST(ExpectTest, EXPECT_THROW) {
   EXPECT_NONFATAL_FAILURE(EXPECT_THROW(ThrowAnInteger(), bool),
                           "Expected: ThrowAnInteger() throws an exception of "
                           "type bool.\n  Actual: it throws a different type.");
-  EXPECT_NONFATAL_FAILURE(EXPECT_THROW(ThrowRuntimeError("A description"),
-                                       std::logic_error),
-                          "Expected: ThrowRuntimeError(\"A description\") "
-                          "throws an exception of type std::logic_error.\n  "
-                          "Actual: it throws " ERROR_DESC " "
-                          "with description \"A description\".");
+  EXPECT_NONFATAL_FAILURE(
+      EXPECT_THROW(ThrowRuntimeError("A description"), std::logic_error),
+      "Expected: ThrowRuntimeError(\"A description\") "
+      "throws an exception of type std::logic_error.\n  "
+      "Actual: it throws " ERROR_DESC
+      " "
+      "with description \"A description\".");
   EXPECT_NONFATAL_FAILURE(
       EXPECT_THROW(ThrowNothing(), bool),
       "Expected: ThrowNothing() throws an exception of type bool.\n"
@@ -4628,17 +4615,17 @@ TEST(ExpectTest, EXPECT_NO_THROW) {
   EXPECT_NONFATAL_FAILURE(EXPECT_NO_THROW(ThrowRuntimeError("A description")),
                           "Expected: ThrowRuntimeError(\"A description\") "
                           "doesn't throw an exception.\n  "
-                          "Actual: it throws " ERROR_DESC " "
+                          "Actual: it throws " ERROR_DESC
+                          " "
                           "with description \"A description\".");
 }
 
 // Tests EXPECT_ANY_THROW.
 TEST(ExpectTest, EXPECT_ANY_THROW) {
   EXPECT_ANY_THROW(ThrowAnInteger());
-  EXPECT_NONFATAL_FAILURE(
-      EXPECT_ANY_THROW(ThrowNothing()),
-      "Expected: ThrowNothing() throws an exception.\n"
-      "  Actual: it doesn't.");
+  EXPECT_NONFATAL_FAILURE(EXPECT_ANY_THROW(ThrowNothing()),
+                          "Expected: ThrowNothing() throws an exception.\n"
+                          "  Actual: it doesn't.");
 }
 
 #endif  // GTEST_HAS_EXCEPTIONS
@@ -4650,7 +4637,6 @@ TEST(ExpectTest, ExpectPrecedence) {
                           "  true && false\n    Which is: false");
 }
 
-
 // Tests the StreamableToString() function.
 
 // Tests using StreamableToString() on a scalar.
@@ -4688,8 +4674,7 @@ TEST(StreamableToStringTest, NullCString) {
 TEST(StreamableTest, string) {
   static const std::string str(
       "This failure message is a std::string, and is expected.");
-  EXPECT_FATAL_FAILURE(FAIL() << str,
-                       str.c_str());
+  EXPECT_FATAL_FAILURE(FAIL() << str, str.c_str());
 }
 
 // Tests that we can output strings containing embedded NULs.
@@ -4697,25 +4682,24 @@ TEST(StreamableTest, string) {
 TEST(StreamableTest, stringWithEmbeddedNUL) {
   static const char char_array_with_nul[] =
       "Here's a NUL\0 and some more string";
-  static const std::string string_with_nul(char_array_with_nul,
-                                           sizeof(char_array_with_nul)
-                                           - 1);  // drops the trailing NUL
+  static const std::string string_with_nul(
+      char_array_with_nul,
+      sizeof(char_array_with_nul) - 1);  // drops the trailing NUL
   EXPECT_FATAL_FAILURE(FAIL() << string_with_nul,
                        "Here's a NUL\\0 and some more string");
 }
 
 // Tests that we can output a NUL char.
 TEST(StreamableTest, NULChar) {
-  EXPECT_FATAL_FAILURE({  // NOLINT
-    FAIL() << "A NUL" << '\0' << " and some more string";
-  }, "A NUL\\0 and some more string");
+  EXPECT_FATAL_FAILURE(
+      {  // NOLINT
+        FAIL() << "A NUL" << '\0' << " and some more string";
+      },
+      "A NUL\\0 and some more string");
 }
 
 // Tests using int as an assertion message.
-TEST(StreamableTest, int) {
-  EXPECT_FATAL_FAILURE(FAIL() << 900913,
-                       "900913");
-}
+TEST(StreamableTest, int) { EXPECT_FATAL_FAILURE(FAIL() << 900913, "900913"); }
 
 // Tests using NULL char pointer as an assertion message.
 //
@@ -4729,10 +4713,12 @@ TEST(StreamableTest, NullCharPtr) {
 // Tests that basic IO manipulators (endl, ends, and flush) can be
 // streamed to testing::Message.
 TEST(StreamableTest, BasicIoManip) {
-  EXPECT_FATAL_FAILURE({  // NOLINT
-    FAIL() << "Line 1." << std::endl
-           << "A NUL char " << std::ends << std::flush << " in line 2.";
-  }, "Line 1.\nA NUL char \\0 in line 2.");
+  EXPECT_FATAL_FAILURE(
+      {  // NOLINT
+        FAIL() << "Line 1." << std::endl
+               << "A NUL char " << std::ends << std::flush << " in line 2.";
+      },
+      "Line 1.\nA NUL char \\0 in line 2.");
 }
 
 // Tests the macros that haven't been covered so far.
@@ -4746,8 +4732,7 @@ void AddFailureHelper(bool* aborted) {
 // Tests ADD_FAILURE.
 TEST(MacroTest, ADD_FAILURE) {
   bool aborted = true;
-  EXPECT_NONFATAL_FAILURE(AddFailureHelper(&aborted),
-                          "Intentional failure.");
+  EXPECT_NONFATAL_FAILURE(AddFailureHelper(&aborted), "Intentional failure.");
   EXPECT_FALSE(aborted);
 }
 
@@ -4768,8 +4753,7 @@ TEST(MacroTest, ADD_FAILURE_AT) {
 
 // Tests FAIL.
 TEST(MacroTest, FAIL) {
-  EXPECT_FATAL_FAILURE(FAIL(),
-                       "Failed");
+  EXPECT_FATAL_FAILURE(FAIL(), "Failed");
   EXPECT_FATAL_FAILURE(FAIL() << "Intentional failure.",
                        "Intentional failure.");
 }
@@ -4802,37 +4786,34 @@ TEST(MacroTest, SUCCEED) {
 
 // Tests using bool values in {EXPECT|ASSERT}_EQ.
 TEST(EqAssertionTest, Bool) {
-  EXPECT_EQ(true,  true);
-  EXPECT_FATAL_FAILURE({
-      bool false_value = false;
-      ASSERT_EQ(false_value, true);
-    }, "  false_value\n    Which is: false\n  true");
+  EXPECT_EQ(true, true);
+  EXPECT_FATAL_FAILURE(
+      {
+        bool false_value = false;
+        ASSERT_EQ(false_value, true);
+      },
+      "  false_value\n    Which is: false\n  true");
 }
 
 // Tests using int values in {EXPECT|ASSERT}_EQ.
 TEST(EqAssertionTest, Int) {
   ASSERT_EQ(32, 32);
-  EXPECT_NONFATAL_FAILURE(EXPECT_EQ(32, 33),
-                          "  32\n  33");
+  EXPECT_NONFATAL_FAILURE(EXPECT_EQ(32, 33), "  32\n  33");
 }
 
 // Tests using time_t values in {EXPECT|ASSERT}_EQ.
 TEST(EqAssertionTest, Time_T) {
-  EXPECT_EQ(static_cast<time_t>(0),
-            static_cast<time_t>(0));
-  EXPECT_FATAL_FAILURE(ASSERT_EQ(static_cast<time_t>(0),
-                                 static_cast<time_t>(1234)),
-                       "1234");
+  EXPECT_EQ(static_cast<time_t>(0), static_cast<time_t>(0));
+  EXPECT_FATAL_FAILURE(
+      ASSERT_EQ(static_cast<time_t>(0), static_cast<time_t>(1234)), "1234");
 }
 
 // Tests using char values in {EXPECT|ASSERT}_EQ.
 TEST(EqAssertionTest, Char) {
   ASSERT_EQ('z', 'z');
   const char ch = 'b';
-  EXPECT_NONFATAL_FAILURE(EXPECT_EQ('\0', ch),
-                          "  ch\n    Which is: 'b'");
-  EXPECT_NONFATAL_FAILURE(EXPECT_EQ('a', ch),
-                          "  ch\n    Which is: 'b'");
+  EXPECT_NONFATAL_FAILURE(EXPECT_EQ('\0', ch), "  ch\n    Which is: 'b'");
+  EXPECT_NONFATAL_FAILURE(EXPECT_EQ('a', ch), "  ch\n    Which is: 'b'");
 }
 
 // Tests using wchar_t values in {EXPECT|ASSERT}_EQ.
@@ -4848,8 +4829,7 @@ TEST(EqAssertionTest, WideChar) {
 
   static wchar_t wchar;
   wchar = L'b';
-  EXPECT_NONFATAL_FAILURE(EXPECT_EQ(L'a', wchar),
-                          "wchar");
+  EXPECT_NONFATAL_FAILURE(EXPECT_EQ(L'a', wchar), "wchar");
   wchar = 0x8119;
   EXPECT_FATAL_FAILURE(ASSERT_EQ(static_cast<wchar_t>(0x8120), wchar),
                        "  wchar\n    Which is: L'");
@@ -4868,13 +4848,11 @@ TEST(EqAssertionTest, StdString) {
 
   // Compares a const char* to an std::string that has different
   // content
-  EXPECT_NONFATAL_FAILURE(EXPECT_EQ("Test", ::std::string("test")),
-                          "\"test\"");
+  EXPECT_NONFATAL_FAILURE(EXPECT_EQ("Test", ::std::string("test")), "\"test\"");
 
   // Compares an std::string to a char* that has different content.
   char* const p1 = const_cast<char*>("foo");
-  EXPECT_NONFATAL_FAILURE(EXPECT_EQ(::std::string("bar"), p1),
-                          "p1");
+  EXPECT_NONFATAL_FAILURE(EXPECT_EQ(::std::string("bar"), p1), "p1");
 
   // Compares two std::strings that have different contents, one of
   // which having a NUL character in the middle.  This should fail.
@@ -4895,28 +4873,31 @@ TEST(EqAssertionTest, StdWideString) {
 
   // Compares an std::wstring to a const wchar_t* that has identical
   // content.
-  const wchar_t kTestX8119[] = { 'T', 'e', 's', 't', 0x8119, '\0' };
+  const wchar_t kTestX8119[] = {'T', 'e', 's', 't', 0x8119, '\0'};
   EXPECT_EQ(::std::wstring(kTestX8119), kTestX8119);
 
   // Compares an std::wstring to a const wchar_t* that has different
   // content.
-  const wchar_t kTestX8120[] = { 'T', 'e', 's', 't', 0x8120, '\0' };
-  EXPECT_NONFATAL_FAILURE({  // NOLINT
-    EXPECT_EQ(::std::wstring(kTestX8119), kTestX8120);
-  }, "kTestX8120");
+  const wchar_t kTestX8120[] = {'T', 'e', 's', 't', 0x8120, '\0'};
+  EXPECT_NONFATAL_FAILURE(
+      {  // NOLINT
+        EXPECT_EQ(::std::wstring(kTestX8119), kTestX8120);
+      },
+      "kTestX8120");
 
   // Compares two std::wstrings that have different contents, one of
   // which having a NUL character in the middle.
   ::std::wstring wstr3(wstr1);
   wstr3.at(2) = L'\0';
-  EXPECT_NONFATAL_FAILURE(EXPECT_EQ(wstr1, wstr3),
-                          "wstr3");
+  EXPECT_NONFATAL_FAILURE(EXPECT_EQ(wstr1, wstr3), "wstr3");
 
   // Compares a wchar_t* to an std::wstring that has different
   // content.
-  EXPECT_FATAL_FAILURE({  // NOLINT
-    ASSERT_EQ(const_cast<wchar_t*>(L"foo"), ::std::wstring(L"bar"));
-  }, "");
+  EXPECT_FATAL_FAILURE(
+      {  // NOLINT
+        ASSERT_EQ(const_cast<wchar_t*>(L"foo"), ::std::wstring(L"bar"));
+      },
+      "");
 }
 
 #endif  // GTEST_HAS_STD_WSTRING
@@ -4934,10 +4915,8 @@ TEST(EqAssertionTest, CharPointer) {
   char* const p2 = reinterpret_cast<char*>(pv2);
   ASSERT_EQ(p1, p1);
 
-  EXPECT_NONFATAL_FAILURE(EXPECT_EQ(p0, p2),
-                          "  p2\n    Which is:");
-  EXPECT_NONFATAL_FAILURE(EXPECT_EQ(p1, p2),
-                          "  p2\n    Which is:");
+  EXPECT_NONFATAL_FAILURE(EXPECT_EQ(p0, p2), "  p2\n    Which is:");
+  EXPECT_NONFATAL_FAILURE(EXPECT_EQ(p1, p2), "  p2\n    Which is:");
   EXPECT_FATAL_FAILURE(ASSERT_EQ(reinterpret_cast<char*>(0x1234),
                                  reinterpret_cast<char*>(0xABC0)),
                        "ABC0");
@@ -4956,16 +4935,13 @@ TEST(EqAssertionTest, WideCharPointer) {
   wchar_t* const p2 = reinterpret_cast<wchar_t*>(pv2);
   EXPECT_EQ(p0, p0);
 
-  EXPECT_NONFATAL_FAILURE(EXPECT_EQ(p0, p2),
-                          "  p2\n    Which is:");
-  EXPECT_NONFATAL_FAILURE(EXPECT_EQ(p1, p2),
-                          "  p2\n    Which is:");
+  EXPECT_NONFATAL_FAILURE(EXPECT_EQ(p0, p2), "  p2\n    Which is:");
+  EXPECT_NONFATAL_FAILURE(EXPECT_EQ(p1, p2), "  p2\n    Which is:");
   void* pv3 = (void*)0x1234;  // NOLINT
   void* pv4 = (void*)0xABC0;  // NOLINT
   const wchar_t* p3 = reinterpret_cast<const wchar_t*>(pv3);
   const wchar_t* p4 = reinterpret_cast<const wchar_t*>(pv4);
-  EXPECT_NONFATAL_FAILURE(EXPECT_EQ(p3, p4),
-                          "p4");
+  EXPECT_NONFATAL_FAILURE(EXPECT_EQ(p3, p4), "p4");
 }
 
 // Tests using other types of pointers in {EXPECT|ASSERT}_EQ.
@@ -4987,15 +4963,11 @@ class UnprintableChar {
   bool operator!=(const UnprintableChar& rhs) const {
     return char_ != rhs.char_;
   }
-  bool operator<(const UnprintableChar& rhs) const {
-    return char_ < rhs.char_;
-  }
+  bool operator<(const UnprintableChar& rhs) const { return char_ < rhs.char_; }
   bool operator<=(const UnprintableChar& rhs) const {
     return char_ <= rhs.char_;
   }
-  bool operator>(const UnprintableChar& rhs) const {
-    return char_ > rhs.char_;
-  }
+  bool operator>(const UnprintableChar& rhs) const { return char_ > rhs.char_; }
   bool operator>=(const UnprintableChar& rhs) const {
     return char_ >= rhs.char_;
   }
@@ -5044,7 +5016,7 @@ TEST(ComparisonAssertionTest, AcceptsUnprintableArgs) {
 // both in a TEST and in a TEST_F.
 class Foo {
  public:
-  Foo() {}
+  Foo() = default;
 
  private:
   int Bar() const { return 1; }
@@ -5057,9 +5029,7 @@ class Foo {
 
 // Tests that the FRIEND_TEST declaration allows a TEST to access a
 // class's private members.  This should compile.
-TEST(FRIEND_TEST_Test, TEST) {
-  ASSERT_EQ(1, Foo().Bar());
-}
+TEST(FRIEND_TEST_Test, TEST) { ASSERT_EQ(1, Foo().Bar()); }
 
 // The fixture needed to test using FRIEND_TEST with TEST_F.
 class FRIEND_TEST_Test2 : public Test {
@@ -5069,9 +5039,7 @@ class FRIEND_TEST_Test2 : public Test {
 
 // Tests that the FRIEND_TEST declaration allows a TEST_F to access a
 // class's private members.  This should compile.
-TEST_F(FRIEND_TEST_Test2, TEST_F) {
-  ASSERT_EQ(1, foo.Bar());
-}
+TEST_F(FRIEND_TEST_Test2, TEST_F) { ASSERT_EQ(1, foo.Bar()); }
 
 // Tests the life cycle of Test objects.
 
@@ -5206,15 +5174,14 @@ class Base {
  public:
   explicit Base(int an_x) : x_(an_x) {}
   int x() const { return x_; }
+
  private:
   int x_;
 };
-std::ostream& operator<<(std::ostream& os,
-                         const Base& val) {
+std::ostream& operator<<(std::ostream& os, const Base& val) {
   return os << val.x();
 }
-std::ostream& operator<<(std::ostream& os,
-                         const Base* pointer) {
+std::ostream& operator<<(std::ostream& os, const Base* pointer) {
   return os << "(" << pointer->x() << ")";
 }
 
@@ -5231,7 +5198,7 @@ TEST(MessageTest, CanStreamUserTypeInGlobalNameSpace) {
 namespace {
 class MyTypeInUnnamedNameSpace : public Base {
  public:
-  explicit MyTypeInUnnamedNameSpace(int an_x): Base(an_x) {}
+  explicit MyTypeInUnnamedNameSpace(int an_x) : Base(an_x) {}
 };
 std::ostream& operator<<(std::ostream& os,
                          const MyTypeInUnnamedNameSpace& val) {
@@ -5256,14 +5223,12 @@ TEST(MessageTest, CanStreamUserTypeInUnnamedNameSpace) {
 namespace namespace1 {
 class MyTypeInNameSpace1 : public Base {
  public:
-  explicit MyTypeInNameSpace1(int an_x): Base(an_x) {}
+  explicit MyTypeInNameSpace1(int an_x) : Base(an_x) {}
 };
-std::ostream& operator<<(std::ostream& os,
-                         const MyTypeInNameSpace1& val) {
+std::ostream& operator<<(std::ostream& os, const MyTypeInNameSpace1& val) {
   return os << val.x();
 }
-std::ostream& operator<<(std::ostream& os,
-                         const MyTypeInNameSpace1* pointer) {
+std::ostream& operator<<(std::ostream& os, const MyTypeInNameSpace1* pointer) {
   return os << "(" << pointer->x() << ")";
 }
 }  // namespace namespace1
@@ -5281,7 +5246,7 @@ TEST(MessageTest, CanStreamUserTypeInUserNameSpace) {
 namespace namespace2 {
 class MyTypeInNameSpace2 : public ::Base {
  public:
-  explicit MyTypeInNameSpace2(int an_x): Base(an_x) {}
+  explicit MyTypeInNameSpace2(int an_x) : Base(an_x) {}
 };
 }  // namespace namespace2
 std::ostream& operator<<(std::ostream& os,
@@ -5312,21 +5277,18 @@ TEST(MessageTest, NullPointers) {
   Message* p6 = nullptr;
 
   msg << p1 << p2 << p3 << p4 << p5 << p6;
-  ASSERT_STREQ("(null)(null)(null)(null)(null)(null)",
-               msg.GetString().c_str());
+  ASSERT_STREQ("(null)(null)(null)(null)(null)(null)", msg.GetString().c_str());
 }
 
 // Tests streaming wide strings to testing::Message.
 TEST(MessageTest, WideStrings) {
   // Streams a NULL of type const wchar_t*.
   const wchar_t* const_wstr = nullptr;
-  EXPECT_STREQ("(null)",
-               (Message() << const_wstr).GetString().c_str());
+  EXPECT_STREQ("(null)", (Message() << const_wstr).GetString().c_str());
 
   // Streams a NULL of type wchar_t*.
   wchar_t* wstr = nullptr;
-  EXPECT_STREQ("(null)",
-               (Message() << wstr).GetString().c_str());
+  EXPECT_STREQ("(null)", (Message() << wstr).GetString().c_str());
 
   // Streams a non-NULL of type const wchar_t*.
   const_wstr = L"abc\x8119";
@@ -5335,11 +5297,9 @@ TEST(MessageTest, WideStrings) {
 
   // Streams a non-NULL of type wchar_t*.
   wstr = const_cast<wchar_t*>(const_wstr);
-  EXPECT_STREQ("abc\xe8\x84\x99",
-               (Message() << wstr).GetString().c_str());
+  EXPECT_STREQ("abc\xe8\x84\x99", (Message() << wstr).GetString().c_str());
 }
 
-
 // This line tests that we can define tests in the testing namespace.
 namespace testing {
 
@@ -5353,14 +5313,12 @@ class TestInfoTest : public Test {
 
     for (int i = 0; i < test_suite->total_test_count(); ++i) {
       const TestInfo* const test_info = test_suite->GetTestInfo(i);
-      if (strcmp(test_name, test_info->name()) == 0)
-        return test_info;
+      if (strcmp(test_name, test_info->name()) == 0) return test_info;
     }
     return nullptr;
   }
 
-  static const TestResult* GetTestResult(
-      const TestInfo* test_info) {
+  static const TestResult* GetTestResult(const TestInfo* test_info) {
     return test_info->result();
   }
 };
@@ -5384,26 +5342,25 @@ TEST_F(TestInfoTest, result) {
   ASSERT_EQ(0, GetTestResult(test_info)->total_part_count());
 }
 
-#define VERIFY_CODE_LOCATION \
-  const int expected_line = __LINE__ - 1; \
+#define VERIFY_CODE_LOCATION                                                \
+  const int expected_line = __LINE__ - 1;                                   \
   const TestInfo* const test_info = GetUnitTestImpl()->current_test_info(); \
-  ASSERT_TRUE(test_info); \
-  EXPECT_STREQ(__FILE__, test_info->file()); \
+  ASSERT_TRUE(test_info);                                                   \
+  EXPECT_STREQ(__FILE__, test_info->file());                                \
   EXPECT_EQ(expected_line, test_info->line())
 
+// clang-format off
 TEST(CodeLocationForTEST, Verify) {
   VERIFY_CODE_LOCATION;
 }
 
-class CodeLocationForTESTF : public Test {
-};
+class CodeLocationForTESTF : public Test {};
 
 TEST_F(CodeLocationForTESTF, Verify) {
   VERIFY_CODE_LOCATION;
 }
 
-class CodeLocationForTESTP : public TestWithParam<int> {
-};
+class CodeLocationForTESTP : public TestWithParam<int> {};
 
 TEST_P(CodeLocationForTESTP, Verify) {
   VERIFY_CODE_LOCATION;
@@ -5412,8 +5369,7 @@ TEST_P(CodeLocationForTESTP, Verify) {
 INSTANTIATE_TEST_SUITE_P(, CodeLocationForTESTP, Values(0));
 
 template <typename T>
-class CodeLocationForTYPEDTEST : public Test {
-};
+class CodeLocationForTYPEDTEST : public Test {};
 
 TYPED_TEST_SUITE(CodeLocationForTYPEDTEST, int);
 
@@ -5422,8 +5378,7 @@ TYPED_TEST(CodeLocationForTYPEDTEST, Verify) {
 }
 
 template <typename T>
-class CodeLocationForTYPEDTESTP : public Test {
-};
+class CodeLocationForTYPEDTESTP : public Test {};
 
 TYPED_TEST_SUITE_P(CodeLocationForTYPEDTESTP);
 
@@ -5436,6 +5391,7 @@ REGISTER_TYPED_TEST_SUITE_P(CodeLocationForTYPEDTESTP, Verify);
 INSTANTIATE_TYPED_TEST_SUITE_P(My, CodeLocationForTYPEDTESTP, int);
 
 #undef VERIFY_CODE_LOCATION
+// clang-format on
 
 // Tests setting up and tearing down a test case.
 // Legacy API is deprecated but still available
@@ -5495,9 +5451,7 @@ const char* SetUpTestCaseTest::shared_resource_ = nullptr;
 TEST_F(SetUpTestCaseTest, Test1) { EXPECT_STRNE(nullptr, shared_resource_); }
 
 // Another test that uses the shared resource.
-TEST_F(SetUpTestCaseTest, Test2) {
-  EXPECT_STREQ("123", shared_resource_);
-}
+TEST_F(SetUpTestCaseTest, Test2) { EXPECT_STREQ("123", shared_resource_); }
 #endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
 
 // Tests SetupTestSuite/TearDown TestSuite
@@ -5580,6 +5534,7 @@ struct Flags {
         print_time(true),
         random_seed(0),
         repeat(1),
+        recreate_environments_when_repeating(true),
         shuffle(false),
         stack_trace_depth(kMaxStackTraceDepth),
         stream_result_to(""),
@@ -5683,6 +5638,16 @@ struct Flags {
     return flags;
   }
 
+  // Creates a Flags struct where the gtest_recreate_environments_when_repeating
+  // flag has the given value.
+  static Flags RecreateEnvironmentsWhenRepeating(
+      bool recreate_environments_when_repeating) {
+    Flags flags;
+    flags.recreate_environments_when_repeating =
+        recreate_environments_when_repeating;
+    return flags;
+  }
+
   // Creates a Flags struct where the gtest_shuffle flag has the given
   // value.
   static Flags Shuffle(bool shuffle) {
@@ -5728,6 +5693,7 @@ struct Flags {
   bool print_time;
   int32_t random_seed;
   int32_t repeat;
+  bool recreate_environments_when_repeating;
   bool shuffle;
   int32_t stack_trace_depth;
   const char* stream_result_to;
@@ -5739,22 +5705,23 @@ class ParseFlagsTest : public Test {
  protected:
   // Clears the flags before each test.
   void SetUp() override {
-    GTEST_FLAG(also_run_disabled_tests) = false;
-    GTEST_FLAG(break_on_failure) = false;
-    GTEST_FLAG(catch_exceptions) = false;
-    GTEST_FLAG(death_test_use_fork) = false;
-    GTEST_FLAG(fail_fast) = false;
-    GTEST_FLAG(filter) = "";
-    GTEST_FLAG(list_tests) = false;
-    GTEST_FLAG(output) = "";
-    GTEST_FLAG(brief) = false;
-    GTEST_FLAG(print_time) = true;
-    GTEST_FLAG(random_seed) = 0;
-    GTEST_FLAG(repeat) = 1;
-    GTEST_FLAG(shuffle) = false;
-    GTEST_FLAG(stack_trace_depth) = kMaxStackTraceDepth;
-    GTEST_FLAG(stream_result_to) = "";
-    GTEST_FLAG(throw_on_failure) = false;
+    GTEST_FLAG_SET(also_run_disabled_tests, false);
+    GTEST_FLAG_SET(break_on_failure, false);
+    GTEST_FLAG_SET(catch_exceptions, false);
+    GTEST_FLAG_SET(death_test_use_fork, false);
+    GTEST_FLAG_SET(fail_fast, false);
+    GTEST_FLAG_SET(filter, "");
+    GTEST_FLAG_SET(list_tests, false);
+    GTEST_FLAG_SET(output, "");
+    GTEST_FLAG_SET(brief, false);
+    GTEST_FLAG_SET(print_time, true);
+    GTEST_FLAG_SET(random_seed, 0);
+    GTEST_FLAG_SET(repeat, 1);
+    GTEST_FLAG_SET(recreate_environments_when_repeating, true);
+    GTEST_FLAG_SET(shuffle, false);
+    GTEST_FLAG_SET(stack_trace_depth, kMaxStackTraceDepth);
+    GTEST_FLAG_SET(stream_result_to, "");
+    GTEST_FLAG_SET(throw_on_failure, false);
   }
 
   // Asserts that two narrow or wide string arrays are equal.
@@ -5771,45 +5738,48 @@ class ParseFlagsTest : public Test {
   // Verifies that the flag values match the expected values.
   static void CheckFlags(const Flags& expected) {
     EXPECT_EQ(expected.also_run_disabled_tests,
-              GTEST_FLAG(also_run_disabled_tests));
-    EXPECT_EQ(expected.break_on_failure, GTEST_FLAG(break_on_failure));
-    EXPECT_EQ(expected.catch_exceptions, GTEST_FLAG(catch_exceptions));
-    EXPECT_EQ(expected.death_test_use_fork, GTEST_FLAG(death_test_use_fork));
-    EXPECT_EQ(expected.fail_fast, GTEST_FLAG(fail_fast));
-    EXPECT_STREQ(expected.filter, GTEST_FLAG(filter).c_str());
-    EXPECT_EQ(expected.list_tests, GTEST_FLAG(list_tests));
-    EXPECT_STREQ(expected.output, GTEST_FLAG(output).c_str());
-    EXPECT_EQ(expected.brief, GTEST_FLAG(brief));
-    EXPECT_EQ(expected.print_time, GTEST_FLAG(print_time));
-    EXPECT_EQ(expected.random_seed, GTEST_FLAG(random_seed));
-    EXPECT_EQ(expected.repeat, GTEST_FLAG(repeat));
-    EXPECT_EQ(expected.shuffle, GTEST_FLAG(shuffle));
-    EXPECT_EQ(expected.stack_trace_depth, GTEST_FLAG(stack_trace_depth));
+              GTEST_FLAG_GET(also_run_disabled_tests));
+    EXPECT_EQ(expected.break_on_failure, GTEST_FLAG_GET(break_on_failure));
+    EXPECT_EQ(expected.catch_exceptions, GTEST_FLAG_GET(catch_exceptions));
+    EXPECT_EQ(expected.death_test_use_fork,
+              GTEST_FLAG_GET(death_test_use_fork));
+    EXPECT_EQ(expected.fail_fast, GTEST_FLAG_GET(fail_fast));
+    EXPECT_STREQ(expected.filter, GTEST_FLAG_GET(filter).c_str());
+    EXPECT_EQ(expected.list_tests, GTEST_FLAG_GET(list_tests));
+    EXPECT_STREQ(expected.output, GTEST_FLAG_GET(output).c_str());
+    EXPECT_EQ(expected.brief, GTEST_FLAG_GET(brief));
+    EXPECT_EQ(expected.print_time, GTEST_FLAG_GET(print_time));
+    EXPECT_EQ(expected.random_seed, GTEST_FLAG_GET(random_seed));
+    EXPECT_EQ(expected.repeat, GTEST_FLAG_GET(repeat));
+    EXPECT_EQ(expected.recreate_environments_when_repeating,
+              GTEST_FLAG_GET(recreate_environments_when_repeating));
+    EXPECT_EQ(expected.shuffle, GTEST_FLAG_GET(shuffle));
+    EXPECT_EQ(expected.stack_trace_depth, GTEST_FLAG_GET(stack_trace_depth));
     EXPECT_STREQ(expected.stream_result_to,
-                 GTEST_FLAG(stream_result_to).c_str());
-    EXPECT_EQ(expected.throw_on_failure, GTEST_FLAG(throw_on_failure));
+                 GTEST_FLAG_GET(stream_result_to).c_str());
+    EXPECT_EQ(expected.throw_on_failure, GTEST_FLAG_GET(throw_on_failure));
   }
 
   // Parses a command line (specified by argc1 and argv1), then
   // verifies that the flag values are expected and that the
   // recognized flags are removed from the command line.
   template <typename CharType>
-  static void TestParsingFlags(int argc1, const CharType** argv1,
-                               int argc2, const CharType** argv2,
-                               const Flags& expected, bool should_print_help) {
+  static void TestParsingFlags(int argc1, const CharType** argv1, int argc2,
+                               const CharType** argv2, const Flags& expected,
+                               bool should_print_help) {
     const bool saved_help_flag = ::testing::internal::g_help_flag;
     ::testing::internal::g_help_flag = false;
 
-# if GTEST_HAS_STREAM_REDIRECTION
+#if GTEST_HAS_STREAM_REDIRECTION
     CaptureStdout();
-# endif
+#endif
 
     // Parses the command line.
     internal::ParseGoogleTestFlagsOnly(&argc1, const_cast<CharType**>(argv1));
 
-# if GTEST_HAS_STREAM_REDIRECTION
+#if GTEST_HAS_STREAM_REDIRECTION
     const std::string captured_stdout = GetCapturedStdout();
-# endif
+#endif
 
     // Verifies the flag values.
     CheckFlags(expected);
@@ -5822,16 +5792,16 @@ class ParseFlagsTest : public Test {
     // help message for the flags it recognizes.
     EXPECT_EQ(should_print_help, ::testing::internal::g_help_flag);
 
-# if GTEST_HAS_STREAM_REDIRECTION
+#if GTEST_HAS_STREAM_REDIRECTION
     const char* const expected_help_fragment =
         "This program contains tests written using";
     if (should_print_help) {
       EXPECT_PRED_FORMAT2(IsSubstring, expected_help_fragment, captured_stdout);
     } else {
-      EXPECT_PRED_FORMAT2(IsNotSubstring,
-                          expected_help_fragment, captured_stdout);
+      EXPECT_PRED_FORMAT2(IsNotSubstring, expected_help_fragment,
+                          captured_stdout);
     }
-# endif  // GTEST_HAS_STREAM_REDIRECTION
+#endif  // GTEST_HAS_STREAM_REDIRECTION
 
     ::testing::internal::g_help_flag = saved_help_flag;
   }
@@ -5839,10 +5809,10 @@ class ParseFlagsTest : public Test {
   // This macro wraps TestParsingFlags s.t. the user doesn't need
   // to specify the array sizes.
 
-# define GTEST_TEST_PARSING_FLAGS_(argv1, argv2, expected, should_print_help) \
-  TestParsingFlags(sizeof(argv1)/sizeof(*argv1) - 1, argv1, \
-                   sizeof(argv2)/sizeof(*argv2) - 1, argv2, \
-                   expected, should_print_help)
+#define GTEST_TEST_PARSING_FLAGS_(argv1, argv2, expected, should_print_help) \
+  TestParsingFlags(sizeof(argv1) / sizeof(*argv1) - 1, argv1,                \
+                   sizeof(argv2) / sizeof(*argv2) - 1, argv2, expected,      \
+                   should_print_help)
 };
 
 // Tests parsing an empty command line.
@@ -5872,15 +5842,6 @@ TEST_F(ParseFlagsTest, FailFast) {
   GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::FailFast(true), false);
 }
 
-// Tests parsing a bad --gtest_filter flag.
-TEST_F(ParseFlagsTest, FilterBad) {
-  const char* argv[] = {"foo.exe", "--gtest_filter", nullptr};
-
-  const char* argv2[] = {"foo.exe", "--gtest_filter", nullptr};
-
-  GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::Filter(""), true);
-}
-
 // Tests parsing an empty --gtest_filter flag.
 TEST_F(ParseFlagsTest, FilterEmpty) {
   const char* argv[] = {"foo.exe", "--gtest_filter=", nullptr};
@@ -6033,15 +5994,6 @@ TEST_F(ParseFlagsTest, ListTestsFalse_F) {
   GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::ListTests(false), false);
 }
 
-// Tests parsing --gtest_output (invalid).
-TEST_F(ParseFlagsTest, OutputEmpty) {
-  const char* argv[] = {"foo.exe", "--gtest_output", nullptr};
-
-  const char* argv2[] = {"foo.exe", "--gtest_output", nullptr};
-
-  GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags(), true);
-}
-
 // Tests parsing --gtest_output=xml
 TEST_F(ParseFlagsTest, OutputXml) {
   const char* argv[] = {"foo.exe", "--gtest_output=xml", nullptr};
@@ -6067,8 +6019,8 @@ TEST_F(ParseFlagsTest, OutputXmlDirectory) {
 
   const char* argv2[] = {"foo.exe", nullptr};
 
-  GTEST_TEST_PARSING_FLAGS_(argv, argv2,
-                            Flags::Output("xml:directory/path/"), false);
+  GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::Output("xml:directory/path/"),
+                            false);
 }
 
 // Tests having a --gtest_brief flag
@@ -6161,6 +6113,20 @@ TEST_F(ParseFlagsTest, Repeat) {
   GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::Repeat(1000), false);
 }
 
+// Tests parsing --gtest_recreate_environments_when_repeating
+TEST_F(ParseFlagsTest, RecreateEnvironmentsWhenRepeating) {
+  const char* argv[] = {
+      "foo.exe",
+      "--gtest_recreate_environments_when_repeating=0",
+      nullptr,
+  };
+
+  const char* argv2[] = {"foo.exe", nullptr};
+
+  GTEST_TEST_PARSING_FLAGS_(
+      argv, argv2, Flags::RecreateEnvironmentsWhenRepeating(false), false);
+}
+
 // Tests having a --gtest_also_run_disabled_tests flag
 TEST_F(ParseFlagsTest, AlsoRunDisabledTestsFlag) {
   const char* argv[] = {"foo.exe", "--gtest_also_run_disabled_tests", nullptr};
@@ -6235,8 +6201,8 @@ TEST_F(ParseFlagsTest, StreamResultTo) {
 
   const char* argv2[] = {"foo.exe", nullptr};
 
-  GTEST_TEST_PARSING_FLAGS_(
-      argv, argv2, Flags::StreamResultTo("localhost:1234"), false);
+  GTEST_TEST_PARSING_FLAGS_(argv, argv2,
+                            Flags::StreamResultTo("localhost:1234"), false);
 }
 
 // Tests parsing --gtest_throw_on_failure.
@@ -6267,23 +6233,78 @@ TEST_F(ParseFlagsTest, ThrowOnFailureTrue) {
   GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::ThrowOnFailure(true), false);
 }
 
-# if GTEST_OS_WINDOWS
+// Tests parsing a bad --gtest_filter flag.
+TEST_F(ParseFlagsTest, FilterBad) {
+  const char* argv[] = {"foo.exe", "--gtest_filter", nullptr};
+
+  const char* argv2[] = {"foo.exe", "--gtest_filter", nullptr};
+
+#if defined(GTEST_HAS_ABSL) && defined(GTEST_HAS_DEATH_TEST)
+  // Invalid flag arguments are a fatal error when using the Abseil Flags.
+  EXPECT_EXIT(GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::Filter(""), true),
+              testing::ExitedWithCode(1),
+              "ERROR: Missing the value for the flag 'gtest_filter'");
+#elif !defined(GTEST_HAS_ABSL)
+  GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::Filter(""), true);
+#else
+  static_cast<void>(argv);
+  static_cast<void>(argv2);
+#endif
+}
+
+// Tests parsing --gtest_output (invalid).
+TEST_F(ParseFlagsTest, OutputEmpty) {
+  const char* argv[] = {"foo.exe", "--gtest_output", nullptr};
+
+  const char* argv2[] = {"foo.exe", "--gtest_output", nullptr};
+
+#if defined(GTEST_HAS_ABSL) && defined(GTEST_HAS_DEATH_TEST)
+  // Invalid flag arguments are a fatal error when using the Abseil Flags.
+  EXPECT_EXIT(GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags(), true),
+              testing::ExitedWithCode(1),
+              "ERROR: Missing the value for the flag 'gtest_output'");
+#elif !defined(GTEST_HAS_ABSL)
+  GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags(), true);
+#else
+  static_cast<void>(argv);
+  static_cast<void>(argv2);
+#endif
+}
+
+#ifdef GTEST_HAS_ABSL
+TEST_F(ParseFlagsTest, AbseilPositionalFlags) {
+  const char* argv[] = {"foo.exe", "--gtest_throw_on_failure=1", "--",
+                        "--other_flag", nullptr};
+
+  // When using Abseil flags, it should be possible to pass flags not recognized
+  // using "--" to delimit positional arguments. These flags should be returned
+  // though argv.
+  const char* argv2[] = {"foo.exe", "--other_flag", nullptr};
+
+  GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::ThrowOnFailure(true), false);
+}
+#endif
+
+TEST_F(ParseFlagsTest, UnrecognizedFlags) {
+  const char* argv[] = {"foo.exe", "--gtest_filter=abcd", "--other_flag",
+                        nullptr};
+
+  const char* argv2[] = {"foo.exe", "--other_flag", nullptr};
+
+  GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::Filter("abcd"), false);
+}
+
+#ifdef GTEST_OS_WINDOWS
 // Tests parsing wide strings.
 TEST_F(ParseFlagsTest, WideStrings) {
-  const wchar_t* argv[] = {
-    L"foo.exe",
-    L"--gtest_filter=Foo*",
-    L"--gtest_list_tests=1",
-    L"--gtest_break_on_failure",
-    L"--non_gtest_flag",
-    NULL
-  };
+  const wchar_t* argv[] = {L"foo.exe",
+                           L"--gtest_filter=Foo*",
+                           L"--gtest_list_tests=1",
+                           L"--gtest_break_on_failure",
+                           L"--non_gtest_flag",
+                           NULL};
 
-  const wchar_t* argv2[] = {
-    L"foo.exe",
-    L"--non_gtest_flag",
-    NULL
-  };
+  const wchar_t* argv2[] = {L"foo.exe", L"--non_gtest_flag", NULL};
 
   Flags expected_flags;
   expected_flags.break_on_failure = true;
@@ -6292,7 +6313,7 @@ TEST_F(ParseFlagsTest, WideStrings) {
 
   GTEST_TEST_PARSING_FLAGS_(argv, argv2, expected_flags, false);
 }
-# endif  // GTEST_OS_WINDOWS
+#endif  // GTEST_OS_WINDOWS
 
 #if GTEST_USE_OWN_FLAGFILE_FLAG_
 class FlagfileTest : public ParseFlagsTest {
@@ -6340,8 +6361,8 @@ TEST_F(FlagfileTest, Empty) {
 
 // Tests passing a non-empty --gtest_filter flag via --gtest_flagfile.
 TEST_F(FlagfileTest, FilterNonEmpty) {
-  internal::FilePath flagfile_path(CreateFlagfile(
-      "--"  GTEST_FLAG_PREFIX_  "filter=abc"));
+  internal::FilePath flagfile_path(
+      CreateFlagfile("--" GTEST_FLAG_PREFIX_ "filter=abc"));
   std::string flagfile_flag =
       std::string("--" GTEST_FLAG_PREFIX_ "flagfile=") + flagfile_path.c_str();
 
@@ -6354,10 +6375,10 @@ TEST_F(FlagfileTest, FilterNonEmpty) {
 
 // Tests passing several flags via --gtest_flagfile.
 TEST_F(FlagfileTest, SeveralFlags) {
-  internal::FilePath flagfile_path(CreateFlagfile(
-      "--"  GTEST_FLAG_PREFIX_  "filter=abc\n"
-      "--"  GTEST_FLAG_PREFIX_  "break_on_failure\n"
-      "--"  GTEST_FLAG_PREFIX_  "list_tests"));
+  internal::FilePath flagfile_path(
+      CreateFlagfile("--" GTEST_FLAG_PREFIX_ "filter=abc\n"
+                     "--" GTEST_FLAG_PREFIX_ "break_on_failure\n"
+                     "--" GTEST_FLAG_PREFIX_ "list_tests"));
   std::string flagfile_flag =
       std::string("--" GTEST_FLAG_PREFIX_ "flagfile=") + flagfile_path.c_str();
 
@@ -6381,8 +6402,7 @@ class CurrentTestInfoTest : public Test {
   // the test case is run.
   static void SetUpTestSuite() {
     // There should be no tests running at this point.
-    const TestInfo* test_info =
-      UnitTest::GetInstance()->current_test_info();
+    const TestInfo* test_info = UnitTest::GetInstance()->current_test_info();
     EXPECT_TRUE(test_info == nullptr)
         << "There should be no tests running at this point.";
   }
@@ -6390,8 +6410,7 @@ class CurrentTestInfoTest : public Test {
   // Tests that current_test_info() returns NULL after the last test in
   // the test case has run.
   static void TearDownTestSuite() {
-    const TestInfo* test_info =
-      UnitTest::GetInstance()->current_test_info();
+    const TestInfo* test_info = UnitTest::GetInstance()->current_test_info();
     EXPECT_TRUE(test_info == nullptr)
         << "There should be no tests running at this point.";
   }
@@ -6400,8 +6419,7 @@ class CurrentTestInfoTest : public Test {
 // Tests that current_test_info() returns TestInfo for currently running
 // test by checking the expected test name against the actual one.
 TEST_F(CurrentTestInfoTest, WorksForFirstTestInATestSuite) {
-  const TestInfo* test_info =
-    UnitTest::GetInstance()->current_test_info();
+  const TestInfo* test_info = UnitTest::GetInstance()->current_test_info();
   ASSERT_TRUE(nullptr != test_info)
       << "There is a test running so we should have a valid TestInfo.";
   EXPECT_STREQ("CurrentTestInfoTest", test_info->test_suite_name())
@@ -6415,8 +6433,7 @@ TEST_F(CurrentTestInfoTest, WorksForFirstTestInATestSuite) {
 // use this test to see that the TestInfo object actually changed from
 // the previous invocation.
 TEST_F(CurrentTestInfoTest, WorksForSecondTestInATestSuite) {
-  const TestInfo* test_info =
-    UnitTest::GetInstance()->current_test_info();
+  const TestInfo* test_info = UnitTest::GetInstance()->current_test_info();
   ASSERT_TRUE(nullptr != test_info)
       << "There is a test running so we should have a valid TestInfo.";
   EXPECT_STREQ("CurrentTestInfoTest", test_info->test_suite_name())
@@ -6427,7 +6444,6 @@ TEST_F(CurrentTestInfoTest, WorksForSecondTestInATestSuite) {
 
 }  // namespace testing
 
-
 // These two lines test that we can define tests in a namespace that
 // has the name "testing" and is nested in another namespace.
 namespace my_namespace {
@@ -6476,13 +6492,12 @@ TEST(StreamingAssertionsTest, Unconditional) {
   SUCCEED() << "expected success";
   EXPECT_NONFATAL_FAILURE(ADD_FAILURE() << "expected failure",
                           "expected failure");
-  EXPECT_FATAL_FAILURE(FAIL() << "expected failure",
-                       "expected failure");
+  EXPECT_FATAL_FAILURE(FAIL() << "expected failure", "expected failure");
 }
 
 #ifdef __BORLANDC__
 // Silences warnings: "Condition is always true", "Unreachable code"
-# pragma option push -w-ccc -w-rch
+#pragma option push -w-ccc -w-rch
 #endif
 
 TEST(StreamingAssertionsTest, Truth) {
@@ -6505,7 +6520,7 @@ TEST(StreamingAssertionsTest, Truth2) {
 
 #ifdef __BORLANDC__
 // Restores warnings after previous "#pragma option push" suppressed them
-# pragma option pop
+#pragma option pop
 #endif
 
 TEST(StreamingAssertionsTest, IntegerEquals) {
@@ -6576,28 +6591,32 @@ TEST(StreamingAssertionsTest, FloatingPointEquals) {
 TEST(StreamingAssertionsTest, Throw) {
   EXPECT_THROW(ThrowAnInteger(), int) << "unexpected failure";
   ASSERT_THROW(ThrowAnInteger(), int) << "unexpected failure";
-  EXPECT_NONFATAL_FAILURE(EXPECT_THROW(ThrowAnInteger(), bool) <<
-                          "expected failure", "expected failure");
-  EXPECT_FATAL_FAILURE(ASSERT_THROW(ThrowAnInteger(), bool) <<
-                       "expected failure", "expected failure");
+  EXPECT_NONFATAL_FAILURE(EXPECT_THROW(ThrowAnInteger(), bool)
+                              << "expected failure",
+                          "expected failure");
+  EXPECT_FATAL_FAILURE(ASSERT_THROW(ThrowAnInteger(), bool)
+                           << "expected failure",
+                       "expected failure");
 }
 
 TEST(StreamingAssertionsTest, NoThrow) {
   EXPECT_NO_THROW(ThrowNothing()) << "unexpected failure";
   ASSERT_NO_THROW(ThrowNothing()) << "unexpected failure";
-  EXPECT_NONFATAL_FAILURE(EXPECT_NO_THROW(ThrowAnInteger()) <<
-                          "expected failure", "expected failure");
-  EXPECT_FATAL_FAILURE(ASSERT_NO_THROW(ThrowAnInteger()) <<
-                       "expected failure", "expected failure");
+  EXPECT_NONFATAL_FAILURE(EXPECT_NO_THROW(ThrowAnInteger())
+                              << "expected failure",
+                          "expected failure");
+  EXPECT_FATAL_FAILURE(ASSERT_NO_THROW(ThrowAnInteger()) << "expected failure",
+                       "expected failure");
 }
 
 TEST(StreamingAssertionsTest, AnyThrow) {
   EXPECT_ANY_THROW(ThrowAnInteger()) << "unexpected failure";
   ASSERT_ANY_THROW(ThrowAnInteger()) << "unexpected failure";
-  EXPECT_NONFATAL_FAILURE(EXPECT_ANY_THROW(ThrowNothing()) <<
-                          "expected failure", "expected failure");
-  EXPECT_FATAL_FAILURE(ASSERT_ANY_THROW(ThrowNothing()) <<
-                       "expected failure", "expected failure");
+  EXPECT_NONFATAL_FAILURE(EXPECT_ANY_THROW(ThrowNothing())
+                              << "expected failure",
+                          "expected failure");
+  EXPECT_FATAL_FAILURE(ASSERT_ANY_THROW(ThrowNothing()) << "expected failure",
+                       "expected failure");
 }
 
 #endif  // GTEST_HAS_EXCEPTIONS
@@ -6605,67 +6624,67 @@ TEST(StreamingAssertionsTest, AnyThrow) {
 // Tests that Google Test correctly decides whether to use colors in the output.
 
 TEST(ColoredOutputTest, UsesColorsWhenGTestColorFlagIsYes) {
-  GTEST_FLAG(color) = "yes";
+  GTEST_FLAG_SET(color, "yes");
 
-  SetEnv("TERM", "xterm");  // TERM supports colors.
-  EXPECT_TRUE(ShouldUseColor(true));  // Stdout is a TTY.
+  SetEnv("TERM", "xterm");             // TERM supports colors.
+  EXPECT_TRUE(ShouldUseColor(true));   // Stdout is a TTY.
   EXPECT_TRUE(ShouldUseColor(false));  // Stdout is not a TTY.
 
-  SetEnv("TERM", "dumb");  // TERM doesn't support colors.
-  EXPECT_TRUE(ShouldUseColor(true));  // Stdout is a TTY.
+  SetEnv("TERM", "dumb");              // TERM doesn't support colors.
+  EXPECT_TRUE(ShouldUseColor(true));   // Stdout is a TTY.
   EXPECT_TRUE(ShouldUseColor(false));  // Stdout is not a TTY.
 }
 
 TEST(ColoredOutputTest, UsesColorsWhenGTestColorFlagIsAliasOfYes) {
   SetEnv("TERM", "dumb");  // TERM doesn't support colors.
 
-  GTEST_FLAG(color) = "True";
+  GTEST_FLAG_SET(color, "True");
   EXPECT_TRUE(ShouldUseColor(false));  // Stdout is not a TTY.
 
-  GTEST_FLAG(color) = "t";
+  GTEST_FLAG_SET(color, "t");
   EXPECT_TRUE(ShouldUseColor(false));  // Stdout is not a TTY.
 
-  GTEST_FLAG(color) = "1";
+  GTEST_FLAG_SET(color, "1");
   EXPECT_TRUE(ShouldUseColor(false));  // Stdout is not a TTY.
 }
 
 TEST(ColoredOutputTest, UsesNoColorWhenGTestColorFlagIsNo) {
-  GTEST_FLAG(color) = "no";
+  GTEST_FLAG_SET(color, "no");
 
-  SetEnv("TERM", "xterm");  // TERM supports colors.
-  EXPECT_FALSE(ShouldUseColor(true));  // Stdout is a TTY.
+  SetEnv("TERM", "xterm");              // TERM supports colors.
+  EXPECT_FALSE(ShouldUseColor(true));   // Stdout is a TTY.
   EXPECT_FALSE(ShouldUseColor(false));  // Stdout is not a TTY.
 
-  SetEnv("TERM", "dumb");  // TERM doesn't support colors.
-  EXPECT_FALSE(ShouldUseColor(true));  // Stdout is a TTY.
+  SetEnv("TERM", "dumb");               // TERM doesn't support colors.
+  EXPECT_FALSE(ShouldUseColor(true));   // Stdout is a TTY.
   EXPECT_FALSE(ShouldUseColor(false));  // Stdout is not a TTY.
 }
 
 TEST(ColoredOutputTest, UsesNoColorWhenGTestColorFlagIsInvalid) {
   SetEnv("TERM", "xterm");  // TERM supports colors.
 
-  GTEST_FLAG(color) = "F";
+  GTEST_FLAG_SET(color, "F");
   EXPECT_FALSE(ShouldUseColor(true));  // Stdout is a TTY.
 
-  GTEST_FLAG(color) = "0";
+  GTEST_FLAG_SET(color, "0");
   EXPECT_FALSE(ShouldUseColor(true));  // Stdout is a TTY.
 
-  GTEST_FLAG(color) = "unknown";
+  GTEST_FLAG_SET(color, "unknown");
   EXPECT_FALSE(ShouldUseColor(true));  // Stdout is a TTY.
 }
 
 TEST(ColoredOutputTest, UsesColorsWhenStdoutIsTty) {
-  GTEST_FLAG(color) = "auto";
+  GTEST_FLAG_SET(color, "auto");
 
-  SetEnv("TERM", "xterm");  // TERM supports colors.
+  SetEnv("TERM", "xterm");              // TERM supports colors.
   EXPECT_FALSE(ShouldUseColor(false));  // Stdout is not a TTY.
   EXPECT_TRUE(ShouldUseColor(true));    // Stdout is a TTY.
 }
 
 TEST(ColoredOutputTest, UsesColorsWhenTermSupportsColors) {
-  GTEST_FLAG(color) = "auto";
+  GTEST_FLAG_SET(color, "auto");
 
-#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MINGW
+#if defined(GTEST_OS_WINDOWS) && !defined(GTEST_OS_WINDOWS_MINGW)
   // On Windows, we ignore the TERM variable as it's usually not set.
 
   SetEnv("TERM", "dumb");
@@ -6680,57 +6699,63 @@ TEST(ColoredOutputTest, UsesColorsWhenTermSupportsColors) {
   // On non-Windows platforms, we rely on TERM to determine if the
   // terminal supports colors.
 
-  SetEnv("TERM", "dumb");  // TERM doesn't support colors.
+  SetEnv("TERM", "dumb");              // TERM doesn't support colors.
   EXPECT_FALSE(ShouldUseColor(true));  // Stdout is a TTY.
 
-  SetEnv("TERM", "emacs");  // TERM doesn't support colors.
+  SetEnv("TERM", "emacs");             // TERM doesn't support colors.
   EXPECT_FALSE(ShouldUseColor(true));  // Stdout is a TTY.
 
-  SetEnv("TERM", "vt100");  // TERM doesn't support colors.
+  SetEnv("TERM", "vt100");             // TERM doesn't support colors.
   EXPECT_FALSE(ShouldUseColor(true));  // Stdout is a TTY.
 
-  SetEnv("TERM", "xterm-mono");  // TERM doesn't support colors.
+  SetEnv("TERM", "xterm-mono");        // TERM doesn't support colors.
   EXPECT_FALSE(ShouldUseColor(true));  // Stdout is a TTY.
 
-  SetEnv("TERM", "xterm");  // TERM supports colors.
+  SetEnv("TERM", "xterm");            // TERM supports colors.
+  EXPECT_TRUE(ShouldUseColor(true));  // Stdout is a TTY.
+
+  SetEnv("TERM", "xterm-color");      // TERM supports colors.
+  EXPECT_TRUE(ShouldUseColor(true));  // Stdout is a TTY.
+
+  SetEnv("TERM", "xterm-kitty");      // TERM supports colors.
   EXPECT_TRUE(ShouldUseColor(true));  // Stdout is a TTY.
 
-  SetEnv("TERM", "xterm-color");  // TERM supports colors.
+  SetEnv("TERM", "alacritty");        // TERM supports colors.
   EXPECT_TRUE(ShouldUseColor(true));  // Stdout is a TTY.
 
-  SetEnv("TERM", "xterm-256color");  // TERM supports colors.
+  SetEnv("TERM", "xterm-256color");   // TERM supports colors.
   EXPECT_TRUE(ShouldUseColor(true));  // Stdout is a TTY.
 
-  SetEnv("TERM", "screen");  // TERM supports colors.
+  SetEnv("TERM", "screen");           // TERM supports colors.
   EXPECT_TRUE(ShouldUseColor(true));  // Stdout is a TTY.
 
   SetEnv("TERM", "screen-256color");  // TERM supports colors.
   EXPECT_TRUE(ShouldUseColor(true));  // Stdout is a TTY.
 
-  SetEnv("TERM", "tmux");  // TERM supports colors.
+  SetEnv("TERM", "tmux");             // TERM supports colors.
   EXPECT_TRUE(ShouldUseColor(true));  // Stdout is a TTY.
 
-  SetEnv("TERM", "tmux-256color");  // TERM supports colors.
+  SetEnv("TERM", "tmux-256color");    // TERM supports colors.
   EXPECT_TRUE(ShouldUseColor(true));  // Stdout is a TTY.
 
-  SetEnv("TERM", "rxvt-unicode");  // TERM supports colors.
+  SetEnv("TERM", "rxvt-unicode");     // TERM supports colors.
   EXPECT_TRUE(ShouldUseColor(true));  // Stdout is a TTY.
 
   SetEnv("TERM", "rxvt-unicode-256color");  // TERM supports colors.
-  EXPECT_TRUE(ShouldUseColor(true));  // Stdout is a TTY.
+  EXPECT_TRUE(ShouldUseColor(true));        // Stdout is a TTY.
 
-  SetEnv("TERM", "linux");  // TERM supports colors.
+  SetEnv("TERM", "linux");            // TERM supports colors.
   EXPECT_TRUE(ShouldUseColor(true));  // Stdout is a TTY.
 
-  SetEnv("TERM", "cygwin");  // TERM supports colors.
+  SetEnv("TERM", "cygwin");           // TERM supports colors.
   EXPECT_TRUE(ShouldUseColor(true));  // Stdout is a TTY.
 #endif  // GTEST_OS_WINDOWS
 }
 
 // Verifies that StaticAssertTypeEq works in a namespace scope.
 
-static bool dummy1 GTEST_ATTRIBUTE_UNUSED_ = StaticAssertTypeEq<bool, bool>();
-static bool dummy2 GTEST_ATTRIBUTE_UNUSED_ =
+[[maybe_unused]] static bool dummy1 = StaticAssertTypeEq<bool, bool>();
+[[maybe_unused]] static bool dummy2 =
     StaticAssertTypeEq<const int, const int>();
 
 // Verifies that StaticAssertTypeEq works in a class.
@@ -6842,12 +6867,10 @@ class TestListener : public EmptyTestEventListener {
  public:
   TestListener() : on_start_counter_(nullptr), is_destroyed_(nullptr) {}
   TestListener(int* on_start_counter, bool* is_destroyed)
-      : on_start_counter_(on_start_counter),
-        is_destroyed_(is_destroyed) {}
+      : on_start_counter_(on_start_counter), is_destroyed_(is_destroyed) {}
 
   ~TestListener() override {
-    if (is_destroyed_)
-      *is_destroyed_ = true;
+    if (is_destroyed_) *is_destroyed_ = true;
   }
 
  protected:
@@ -6904,8 +6927,8 @@ TEST(TestEventListenersTest, Append) {
   {
     TestEventListeners listeners;
     listeners.Append(listener);
-    TestEventListenersAccessor::GetRepeater(&listeners)->OnTestProgramStart(
-        *UnitTest::GetInstance());
+    TestEventListenersAccessor::GetRepeater(&listeners)
+        ->OnTestProgramStart(*UnitTest::GetInstance());
     EXPECT_EQ(1, on_start_counter);
   }
   EXPECT_TRUE(is_destroyed);
@@ -6948,7 +6971,8 @@ class SequenceTestingListener : public EmptyTestEventListener {
   std::vector<std::string>* vector_;
   const char* const id_;
 
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(SequenceTestingListener);
+  SequenceTestingListener(const SequenceTestingListener&) = delete;
+  SequenceTestingListener& operator=(const SequenceTestingListener&) = delete;
 };
 
 TEST(EventListenerTest, AppendKeepsOrder) {
@@ -6958,32 +6982,32 @@ TEST(EventListenerTest, AppendKeepsOrder) {
   listeners.Append(new SequenceTestingListener(&vec, "2nd"));
   listeners.Append(new SequenceTestingListener(&vec, "3rd"));
 
-  TestEventListenersAccessor::GetRepeater(&listeners)->OnTestProgramStart(
-      *UnitTest::GetInstance());
+  TestEventListenersAccessor::GetRepeater(&listeners)
+      ->OnTestProgramStart(*UnitTest::GetInstance());
   ASSERT_EQ(3U, vec.size());
   EXPECT_STREQ("1st.OnTestProgramStart", vec[0].c_str());
   EXPECT_STREQ("2nd.OnTestProgramStart", vec[1].c_str());
   EXPECT_STREQ("3rd.OnTestProgramStart", vec[2].c_str());
 
   vec.clear();
-  TestEventListenersAccessor::GetRepeater(&listeners)->OnTestProgramEnd(
-      *UnitTest::GetInstance());
+  TestEventListenersAccessor::GetRepeater(&listeners)
+      ->OnTestProgramEnd(*UnitTest::GetInstance());
   ASSERT_EQ(3U, vec.size());
   EXPECT_STREQ("3rd.OnTestProgramEnd", vec[0].c_str());
   EXPECT_STREQ("2nd.OnTestProgramEnd", vec[1].c_str());
   EXPECT_STREQ("1st.OnTestProgramEnd", vec[2].c_str());
 
   vec.clear();
-  TestEventListenersAccessor::GetRepeater(&listeners)->OnTestIterationStart(
-      *UnitTest::GetInstance(), 0);
+  TestEventListenersAccessor::GetRepeater(&listeners)
+      ->OnTestIterationStart(*UnitTest::GetInstance(), 0);
   ASSERT_EQ(3U, vec.size());
   EXPECT_STREQ("1st.OnTestIterationStart", vec[0].c_str());
   EXPECT_STREQ("2nd.OnTestIterationStart", vec[1].c_str());
   EXPECT_STREQ("3rd.OnTestIterationStart", vec[2].c_str());
 
   vec.clear();
-  TestEventListenersAccessor::GetRepeater(&listeners)->OnTestIterationEnd(
-      *UnitTest::GetInstance(), 0);
+  TestEventListenersAccessor::GetRepeater(&listeners)
+      ->OnTestIterationEnd(*UnitTest::GetInstance(), 0);
   ASSERT_EQ(3U, vec.size());
   EXPECT_STREQ("3rd.OnTestIterationEnd", vec[0].c_str());
   EXPECT_STREQ("2nd.OnTestIterationEnd", vec[1].c_str());
@@ -7003,8 +7027,8 @@ TEST(TestEventListenersTest, Release) {
     TestEventListeners listeners;
     listeners.Append(listener);
     EXPECT_EQ(listener, listeners.Release(listener));
-    TestEventListenersAccessor::GetRepeater(&listeners)->OnTestProgramStart(
-        *UnitTest::GetInstance());
+    TestEventListenersAccessor::GetRepeater(&listeners)
+        ->OnTestProgramStart(*UnitTest::GetInstance());
     EXPECT_TRUE(listeners.Release(listener) == nullptr);
   }
   EXPECT_EQ(0, on_start_counter);
@@ -7022,17 +7046,20 @@ TEST(EventListenerTest, SuppressEventForwarding) {
   ASSERT_TRUE(TestEventListenersAccessor::EventForwardingEnabled(listeners));
   TestEventListenersAccessor::SuppressEventForwarding(&listeners);
   ASSERT_FALSE(TestEventListenersAccessor::EventForwardingEnabled(listeners));
-  TestEventListenersAccessor::GetRepeater(&listeners)->OnTestProgramStart(
-      *UnitTest::GetInstance());
+  TestEventListenersAccessor::GetRepeater(&listeners)
+      ->OnTestProgramStart(*UnitTest::GetInstance());
   EXPECT_EQ(0, on_start_counter);
 }
 
 // Tests that events generated by Google Test are not forwarded in
 // death test subprocesses.
-TEST(EventListenerDeathTest, EventsNotForwardedInDeathTestSubprecesses) {
-  EXPECT_DEATH_IF_SUPPORTED({
-      GTEST_CHECK_(TestEventListenersAccessor::EventForwardingEnabled(
-          *GetUnitTestImpl()->listeners())) << "expected failure";},
+TEST(EventListenerDeathTest, EventsNotForwardedInDeathTestSubprocesses) {
+  EXPECT_DEATH_IF_SUPPORTED(
+      {
+        GTEST_CHECK_(TestEventListenersAccessor::EventForwardingEnabled(
+            *GetUnitTestImpl()->listeners()))
+            << "expected failure";
+      },
       "expected failure");
 }
 
@@ -7049,8 +7076,8 @@ TEST(EventListenerTest, default_result_printer) {
 
   EXPECT_EQ(listener, listeners.default_result_printer());
 
-  TestEventListenersAccessor::GetRepeater(&listeners)->OnTestProgramStart(
-      *UnitTest::GetInstance());
+  TestEventListenersAccessor::GetRepeater(&listeners)
+      ->OnTestProgramStart(*UnitTest::GetInstance());
 
   EXPECT_EQ(1, on_start_counter);
 
@@ -7063,8 +7090,8 @@ TEST(EventListenerTest, default_result_printer) {
 
   // After broadcasting an event the counter is still the same, indicating
   // the listener is not in the list anymore.
-  TestEventListenersAccessor::GetRepeater(&listeners)->OnTestProgramStart(
-      *UnitTest::GetInstance());
+  TestEventListenersAccessor::GetRepeater(&listeners)
+      ->OnTestProgramStart(*UnitTest::GetInstance());
   EXPECT_EQ(1, on_start_counter);
 }
 
@@ -7086,8 +7113,8 @@ TEST(EventListenerTest, RemovingDefaultResultPrinterWorks) {
     EXPECT_FALSE(is_destroyed);
 
     // Broadcasting events now should not affect default_result_printer.
-    TestEventListenersAccessor::GetRepeater(&listeners)->OnTestProgramStart(
-        *UnitTest::GetInstance());
+    TestEventListenersAccessor::GetRepeater(&listeners)
+        ->OnTestProgramStart(*UnitTest::GetInstance());
     EXPECT_EQ(0, on_start_counter);
   }
   // Destroying the list should not affect the listener now, too.
@@ -7108,8 +7135,8 @@ TEST(EventListenerTest, default_xml_generator) {
 
   EXPECT_EQ(listener, listeners.default_xml_generator());
 
-  TestEventListenersAccessor::GetRepeater(&listeners)->OnTestProgramStart(
-      *UnitTest::GetInstance());
+  TestEventListenersAccessor::GetRepeater(&listeners)
+      ->OnTestProgramStart(*UnitTest::GetInstance());
 
   EXPECT_EQ(1, on_start_counter);
 
@@ -7122,8 +7149,8 @@ TEST(EventListenerTest, default_xml_generator) {
 
   // After broadcasting an event the counter is still the same, indicating
   // the listener is not in the list anymore.
-  TestEventListenersAccessor::GetRepeater(&listeners)->OnTestProgramStart(
-      *UnitTest::GetInstance());
+  TestEventListenersAccessor::GetRepeater(&listeners)
+      ->OnTestProgramStart(*UnitTest::GetInstance());
   EXPECT_EQ(1, on_start_counter);
 }
 
@@ -7145,8 +7172,8 @@ TEST(EventListenerTest, RemovingDefaultXmlGeneratorWorks) {
     EXPECT_FALSE(is_destroyed);
 
     // Broadcasting events now should not affect default_xml_generator.
-    TestEventListenersAccessor::GetRepeater(&listeners)->OnTestProgramStart(
-        *UnitTest::GetInstance());
+    TestEventListenersAccessor::GetRepeater(&listeners)
+        ->OnTestProgramStart(*UnitTest::GetInstance());
     EXPECT_EQ(0, on_start_counter);
   }
   // Destroying the list should not affect the listener now, too.
@@ -7154,7 +7181,7 @@ TEST(EventListenerTest, RemovingDefaultXmlGeneratorWorks) {
   delete listener;
 }
 
-// Sanity tests to ensure that the alternative, verbose spellings of
+// Tests to ensure that the alternative, verbose spellings of
 // some of the macros work.  We don't test them thoroughly as that
 // would be quite involved.  Since their implementations are
 // straightforward, and they are rarely used, we'll just rely on the
@@ -7234,28 +7261,26 @@ struct IncompleteType;
 // Tests that HasDebugStringAndShortDebugString<T>::value is a compile-time
 // constant.
 TEST(HasDebugStringAndShortDebugStringTest, ValueIsCompileTimeConstant) {
-  GTEST_COMPILE_ASSERT_(
-      HasDebugStringAndShortDebugString<HasDebugStringMethods>::value,
-      const_true);
-  GTEST_COMPILE_ASSERT_(
+  static_assert(HasDebugStringAndShortDebugString<HasDebugStringMethods>::value,
+                "const_true");
+  static_assert(
       HasDebugStringAndShortDebugString<InheritsDebugStringMethods>::value,
-      const_true);
-  GTEST_COMPILE_ASSERT_(HasDebugStringAndShortDebugString<
-                            const InheritsDebugStringMethods>::value,
-                        const_true);
-  GTEST_COMPILE_ASSERT_(
+      "const_true");
+  static_assert(HasDebugStringAndShortDebugString<
+                    const InheritsDebugStringMethods>::value,
+                "const_true");
+  static_assert(
       !HasDebugStringAndShortDebugString<WrongTypeDebugStringMethod>::value,
-      const_false);
-  GTEST_COMPILE_ASSERT_(
+      "const_false");
+  static_assert(
       !HasDebugStringAndShortDebugString<NotConstDebugStringMethod>::value,
-      const_false);
-  GTEST_COMPILE_ASSERT_(
+      "const_false");
+  static_assert(
       !HasDebugStringAndShortDebugString<MissingDebugStringMethod>::value,
-      const_false);
-  GTEST_COMPILE_ASSERT_(
-      !HasDebugStringAndShortDebugString<IncompleteType>::value, const_false);
-  GTEST_COMPILE_ASSERT_(!HasDebugStringAndShortDebugString<int>::value,
-                        const_false);
+      "const_false");
+  static_assert(!HasDebugStringAndShortDebugString<IncompleteType>::value,
+                "const_false");
+  static_assert(!HasDebugStringAndShortDebugString<int>::value, "const_false");
 }
 
 // Tests that HasDebugStringAndShortDebugString<T>::value is true when T has
@@ -7306,7 +7331,6 @@ TEST(GTestReferenceToConstTest, Works) {
   TestGTestReferenceToConst<const std::string&, const std::string&>();
 }
 
-
 // Tests IsContainerTest.
 
 class NonContainer {};
@@ -7318,10 +7342,9 @@ TEST(IsContainerTestTest, WorksForNonContainer) {
 }
 
 TEST(IsContainerTestTest, WorksForContainer) {
+  EXPECT_EQ(sizeof(IsContainer), sizeof(IsContainerTest<std::vector<bool>>(0)));
   EXPECT_EQ(sizeof(IsContainer),
-            sizeof(IsContainerTest<std::vector<bool> >(0)));
-  EXPECT_EQ(sizeof(IsContainer),
-            sizeof(IsContainerTest<std::map<int, double> >(0)));
+            sizeof(IsContainerTest<std::map<int, double>>(0)));
 }
 
 struct ConstOnlyContainerWithPointerIterator {
@@ -7370,8 +7393,8 @@ TEST(ArrayEqTest, WorksForDegeneratedArrays) {
 
 TEST(ArrayEqTest, WorksForOneDimensionalArrays) {
   // Note that a and b are distinct but compatible types.
-  const int a[] = { 0, 1 };
-  long b[] = { 0, 1 };
+  const int a[] = {0, 1};
+  long b[] = {0, 1};
   EXPECT_TRUE(ArrayEq(a, b));
   EXPECT_TRUE(ArrayEq(a, 2, b));
 
@@ -7381,9 +7404,9 @@ TEST(ArrayEqTest, WorksForOneDimensionalArrays) {
 }
 
 TEST(ArrayEqTest, WorksForTwoDimensionalArrays) {
-  const char a[][3] = { "hi", "lo" };
-  const char b[][3] = { "hi", "lo" };
-  const char c[][3] = { "hi", "li" };
+  const char a[][3] = {"hi", "lo"};
+  const char b[][3] = {"hi", "lo"};
+  const char c[][3] = {"hi", "li"};
 
   EXPECT_TRUE(ArrayEq(a, b));
   EXPECT_TRUE(ArrayEq(a, 2, b));
@@ -7401,11 +7424,11 @@ TEST(ArrayAwareFindTest, WorksForOneDimensionalArray) {
 }
 
 TEST(ArrayAwareFindTest, WorksForTwoDimensionalArray) {
-  int a[][2] = { { 0, 1 }, { 2, 3 }, { 4, 5 } };
-  const int b[2] = { 2, 3 };
+  int a[][2] = {{0, 1}, {2, 3}, {4, 5}};
+  const int b[2] = {2, 3};
   EXPECT_EQ(a + 1, ArrayAwareFind(a, a + 3, b));
 
-  const int c[2] = { 6, 7 };
+  const int c[2] = {6, 7};
   EXPECT_EQ(a + 3, ArrayAwareFind(a, a + 3, c));
 }
 
@@ -7431,7 +7454,7 @@ TEST(CopyArrayTest, WorksForOneDimensionalArrays) {
 }
 
 TEST(CopyArrayTest, WorksForTwoDimensionalArrays) {
-  const int a[2][3] = { { 0, 1, 2 }, { 3, 4, 5 } };
+  const int a[2][3] = {{0, 1, 2}, {3, 4, 5}};
   int b[2][3];
 #ifndef __BORLANDC__  // C++Builder cannot compile some array size deductions.
   CopyArray(a, &b);
@@ -7446,7 +7469,7 @@ TEST(CopyArrayTest, WorksForTwoDimensionalArrays) {
 // Tests NativeArray.
 
 TEST(NativeArrayTest, ConstructorFromArrayWorks) {
-  const int a[3] = { 0, 1, 2 };
+  const int a[3] = {0, 1, 2};
   NativeArray<int> na(a, 3, RelationToSourceReference());
   EXPECT_EQ(3U, na.size());
   EXPECT_EQ(a, na.begin());
@@ -7476,7 +7499,7 @@ TEST(NativeArrayTest, TypeMembersAreCorrect) {
 }
 
 TEST(NativeArrayTest, MethodsWork) {
-  const int a[3] = { 0, 1, 2 };
+  const int a[3] = {0, 1, 2};
   NativeArray<int> na(a, 3, RelationToSourceCopy());
   ASSERT_EQ(3U, na.size());
   EXPECT_EQ(3, na.end() - na.begin());
@@ -7495,35 +7518,19 @@ TEST(NativeArrayTest, MethodsWork) {
   NativeArray<int> na2(a, 3, RelationToSourceReference());
   EXPECT_TRUE(na == na2);
 
-  const int b1[3] = { 0, 1, 1 };
-  const int b2[4] = { 0, 1, 2, 3 };
+  const int b1[3] = {0, 1, 1};
+  const int b2[4] = {0, 1, 2, 3};
   EXPECT_FALSE(na == NativeArray<int>(b1, 3, RelationToSourceReference()));
   EXPECT_FALSE(na == NativeArray<int>(b2, 4, RelationToSourceCopy()));
 }
 
 TEST(NativeArrayTest, WorksForTwoDimensionalArray) {
-  const char a[2][3] = { "hi", "lo" };
+  const char a[2][3] = {"hi", "lo"};
   NativeArray<char[3]> na(a, 2, RelationToSourceReference());
   ASSERT_EQ(2U, na.size());
   EXPECT_EQ(a, na.begin());
 }
 
-// IndexSequence
-TEST(IndexSequence, MakeIndexSequence) {
-  using testing::internal::IndexSequence;
-  using testing::internal::MakeIndexSequence;
-  EXPECT_TRUE(
-      (std::is_same<IndexSequence<>, MakeIndexSequence<0>::type>::value));
-  EXPECT_TRUE(
-      (std::is_same<IndexSequence<0>, MakeIndexSequence<1>::type>::value));
-  EXPECT_TRUE(
-      (std::is_same<IndexSequence<0, 1>, MakeIndexSequence<2>::type>::value));
-  EXPECT_TRUE((
-      std::is_same<IndexSequence<0, 1, 2>, MakeIndexSequence<3>::type>::value));
-  EXPECT_TRUE(
-      (std::is_base_of<IndexSequence<0, 1, 2>, MakeIndexSequence<3>>::value));
-}
-
 // ElemFromList
 TEST(ElemFromList, Basic) {
   using testing::internal::ElemFromList;
@@ -7767,7 +7774,7 @@ auto* dynamic_test = testing::RegisterTest(
     __LINE__, []() -> DynamicUnitTestFixture* { return new DynamicTest; });
 
 TEST(RegisterTest, WasRegistered) {
-  auto* unittest = testing::UnitTest::GetInstance();
+  const auto& unittest = testing::UnitTest::GetInstance();
   for (int i = 0; i < unittest->total_test_suite_count(); ++i) {
     auto* tests = unittest->GetTestSuite(i);
     if (tests->name() != std::string("DynamicUnitTestFixture")) continue;
@@ -7782,3 +7789,35 @@ TEST(RegisterTest, WasRegistered) {
 
   FAIL() << "Didn't find the test!";
 }
+
+// Test that the pattern globbing algorithm is linear. If not, this test should
+// time out.
+TEST(PatternGlobbingTest, MatchesFilterLinearRuntime) {
+  std::string name(100, 'a');  // Construct the string (a^100)b
+  name.push_back('b');
+
+  std::string pattern;  // Construct the string ((a*)^100)b
+  for (int i = 0; i < 100; ++i) {
+    pattern.append("a*");
+  }
+  pattern.push_back('b');
+
+  EXPECT_TRUE(
+      testing::internal::UnitTestOptions::MatchesFilter(name, pattern.c_str()));
+}
+
+TEST(PatternGlobbingTest, MatchesFilterWithMultiplePatterns) {
+  const std::string name = "aaaa";
+  EXPECT_TRUE(testing::internal::UnitTestOptions::MatchesFilter(name, "a*"));
+  EXPECT_TRUE(testing::internal::UnitTestOptions::MatchesFilter(name, "a*:"));
+  EXPECT_FALSE(testing::internal::UnitTestOptions::MatchesFilter(name, "ab"));
+  EXPECT_FALSE(testing::internal::UnitTestOptions::MatchesFilter(name, "ab:"));
+  EXPECT_TRUE(testing::internal::UnitTestOptions::MatchesFilter(name, "ab:a*"));
+}
+
+TEST(PatternGlobbingTest, MatchesFilterEdgeCases) {
+  EXPECT_FALSE(testing::internal::UnitTestOptions::MatchesFilter("", "*a"));
+  EXPECT_TRUE(testing::internal::UnitTestOptions::MatchesFilter("", "*"));
+  EXPECT_FALSE(testing::internal::UnitTestOptions::MatchesFilter("a", ""));
+  EXPECT_TRUE(testing::internal::UnitTestOptions::MatchesFilter("", ""));
+}
diff --git a/external/googletest/googletest/test/gtest_xml_outfile2_test_.cc b/external/googletest/googletest/test/gtest_xml_outfile2_test_.cc
index f9a2a6e9..4a76429c 100644
--- a/external/googletest/googletest/test/gtest_xml_outfile2_test_.cc
+++ b/external/googletest/googletest/test/gtest_xml_outfile2_test_.cc
@@ -30,6 +30,8 @@
 // gtest_xml_outfile2_test_ writes some xml via TestProperty used by
 // gtest_xml_outfiles_test.py
 
+#include <atomic>
+
 #include "gtest/gtest.h"
 
 class PropertyTwo : public testing::Test {
@@ -38,6 +40,38 @@ class PropertyTwo : public testing::Test {
   void TearDown() override { RecordProperty("TearDownProp", 2); }
 };
 
-TEST_F(PropertyTwo, TestSomeProperties) {
-  RecordProperty("TestSomeProperty", 2);
+TEST_F(PropertyTwo, TestInt64ConvertibleProperties) {
+  float float_prop = 3.25;
+  RecordProperty("TestFloatProperty", float_prop);
+
+  double double_prop = 4.75;
+  RecordProperty("TestDoubleProperty", double_prop);
+
+  // Validate we can write an unsigned size_t as a property
+  size_t size_t_prop = 5;
+  RecordProperty("TestSizetProperty", size_t_prop);
+
+  bool bool_prop = true;
+  RecordProperty("TestBoolProperty", bool_prop);
+
+  char char_prop = 'A';
+  RecordProperty("TestCharProperty", char_prop);
+
+  int16_t int16_prop = 6;
+  RecordProperty("TestInt16Property", int16_prop);
+
+  int32_t int32_prop = 7;
+  RecordProperty("TestInt32Property", int32_prop);
+
+  int64_t int64_prop = 8;
+  RecordProperty("TestInt64Property", int64_prop);
+
+  enum Foo {
+    NINE = 9,
+  };
+  Foo enum_prop = NINE;
+  RecordProperty("TestEnumProperty", enum_prop);
+
+  std::atomic<int> atomic_int_prop(10);
+  RecordProperty("TestAtomicIntProperty", atomic_int_prop);
 }
diff --git a/external/googletest/googletest/test/gtest_xml_outfiles_test.py b/external/googletest/googletest/test/gtest_xml_outfiles_test.py
old mode 100644
new mode 100755
index 53cb4af1..d17cc0c9
--- a/external/googletest/googletest/test/gtest_xml_outfiles_test.py
+++ b/external/googletest/googletest/test/gtest_xml_outfiles_test.py
@@ -33,8 +33,8 @@
 
 import os
 from xml.dom import minidom, Node
-import gtest_test_utils
-import gtest_xml_test_utils
+from googletest.test import gtest_test_utils
+from googletest.test import gtest_xml_test_utils
 
 GTEST_OUTPUT_SUBDIR = "xml_outfiles"
 GTEST_OUTPUT_1_TEST = "gtest_xml_outfile1_test_"
@@ -43,7 +43,7 @@
 EXPECTED_XML_1 = """<?xml version="1.0" encoding="UTF-8"?>
 <testsuites tests="1" failures="0" disabled="0" errors="0" time="*" timestamp="*" name="AllTests">
   <testsuite name="PropertyOne" tests="1" failures="0" skipped="0" disabled="0" errors="0" time="*" timestamp="*">
-    <testcase name="TestSomeProperties" status="run" result="completed" time="*" timestamp="*" classname="PropertyOne">
+    <testcase name="TestSomeProperties" file="gtest_xml_outfile1_test_.cc" line="41" status="run" result="completed" time="*" timestamp="*" classname="PropertyOne">
       <properties>
         <property name="SetUpProp" value="1"/>
         <property name="TestSomeProperty" value="1"/>
@@ -57,10 +57,19 @@
 EXPECTED_XML_2 = """<?xml version="1.0" encoding="UTF-8"?>
 <testsuites tests="1" failures="0" disabled="0" errors="0" time="*" timestamp="*" name="AllTests">
   <testsuite name="PropertyTwo" tests="1" failures="0" skipped="0" disabled="0" errors="0" time="*" timestamp="*">
-    <testcase name="TestSomeProperties" status="run" result="completed" time="*" timestamp="*" classname="PropertyTwo">
+    <testcase name="TestInt64ConvertibleProperties" file="gtest_xml_outfile2_test_.cc" line="43" status="run" result="completed" time="*" timestamp="*" classname="PropertyTwo">
       <properties>
         <property name="SetUpProp" value="2"/>
-        <property name="TestSomeProperty" value="2"/>
+        <property name="TestFloatProperty" value="3.25"/>
+        <property name="TestDoubleProperty" value="4.75"/>
+        <property name="TestSizetProperty" value="5"/>
+        <property name="TestBoolProperty" value="true"/>
+        <property name="TestCharProperty" value="A"/>
+        <property name="TestInt16Property" value="6"/>
+        <property name="TestInt32Property" value="7"/>
+        <property name="TestInt64Property" value="8"/>
+        <property name="TestEnumProperty" value="9"/>
+        <property name="TestAtomicIntProperty" value="10"/>
         <property name="TearDownProp" value="2"/>
       </properties>
     </testcase>
@@ -70,66 +79,69 @@
 
 
 class GTestXMLOutFilesTest(gtest_xml_test_utils.GTestXMLTestCase):
-    """Unit test for Google Test's XML output functionality."""
-
-    def setUp(self):
-        # We want the trailing '/' that the last "" provides in os.path.join, for
-        # telling Google Test to create an output directory instead of a single file
-        # for xml output.
-        self.output_dir_ = os.path.join(gtest_test_utils.GetTempDir(),
-                                        GTEST_OUTPUT_SUBDIR, "")
-        self.DeleteFilesAndDir()
-
-    def tearDown(self):
-        self.DeleteFilesAndDir()
-
-    def DeleteFilesAndDir(self):
-        try:
-            os.remove(os.path.join(self.output_dir_, GTEST_OUTPUT_1_TEST + ".xml"))
-        except os.error:
-            pass
-        try:
-            os.remove(os.path.join(self.output_dir_, GTEST_OUTPUT_2_TEST + ".xml"))
-        except os.error:
-            pass
-        try:
-            os.rmdir(self.output_dir_)
-        except os.error:
-            pass
-
-    def testOutfile1(self):
-        self._TestOutFile(GTEST_OUTPUT_1_TEST, EXPECTED_XML_1)
-
-    def testOutfile2(self):
-        self._TestOutFile(GTEST_OUTPUT_2_TEST, EXPECTED_XML_2)
-
-    def _TestOutFile(self, test_name, expected_xml):
-        gtest_prog_path = gtest_test_utils.GetTestExecutablePath(test_name)
-        command = [gtest_prog_path, "--gtest_output=xml:%s" % self.output_dir_]
-        p = gtest_test_utils.Subprocess(command,
-                                        working_dir=gtest_test_utils.GetTempDir())
-        self.assert_(p.exited)
-        self.assertEquals(0, p.exit_code)
-
-        output_file_name1 = test_name + ".xml"
-        output_file1 = os.path.join(self.output_dir_, output_file_name1)
-        output_file_name2 = 'lt-' + output_file_name1
-        output_file2 = os.path.join(self.output_dir_, output_file_name2)
-        self.assert_(os.path.isfile(output_file1) or os.path.isfile(output_file2),
-                     output_file1)
-
-        expected = minidom.parseString(expected_xml)
-        if os.path.isfile(output_file1):
-            actual = minidom.parse(output_file1)
-        else:
-            actual = minidom.parse(output_file2)
-        self.NormalizeXml(actual.documentElement)
-        self.AssertEquivalentNodes(expected.documentElement,
-                                   actual.documentElement)
-        expected.unlink()
-        actual.unlink()
+  """Unit test for Google Test's XML output functionality."""
+
+  def setUp(self):
+    # We want the trailing '/' that the last "" provides in os.path.join, for
+    # telling Google Test to create an output directory instead of a single file
+    # for xml output.
+    self.output_dir_ = os.path.join(
+        gtest_test_utils.GetTempDir(), GTEST_OUTPUT_SUBDIR, ""
+    )
+    self.DeleteFilesAndDir()
+
+  def tearDown(self):
+    self.DeleteFilesAndDir()
+
+  def DeleteFilesAndDir(self):
+    try:
+      os.remove(os.path.join(self.output_dir_, GTEST_OUTPUT_1_TEST + ".xml"))
+    except os.error:
+      pass
+    try:
+      os.remove(os.path.join(self.output_dir_, GTEST_OUTPUT_2_TEST + ".xml"))
+    except os.error:
+      pass
+    try:
+      os.rmdir(self.output_dir_)
+    except os.error:
+      pass
+
+  def testOutfile1(self):
+    self._TestOutFile(GTEST_OUTPUT_1_TEST, EXPECTED_XML_1)
+
+  def testOutfile2(self):
+    self._TestOutFile(GTEST_OUTPUT_2_TEST, EXPECTED_XML_2)
+
+  def _TestOutFile(self, test_name, expected_xml):
+    gtest_prog_path = gtest_test_utils.GetTestExecutablePath(test_name)
+    command = [gtest_prog_path, "--gtest_output=xml:%s" % self.output_dir_]
+    p = gtest_test_utils.Subprocess(
+        command, working_dir=gtest_test_utils.GetTempDir()
+    )
+    self.assertTrue(p.exited)
+    self.assertEqual(0, p.exit_code)
+
+    output_file_name1 = test_name + ".xml"
+    output_file1 = os.path.join(self.output_dir_, output_file_name1)
+    output_file_name2 = "lt-" + output_file_name1
+    output_file2 = os.path.join(self.output_dir_, output_file_name2)
+    self.assertTrue(
+        os.path.isfile(output_file1) or os.path.isfile(output_file2),
+        output_file1,
+    )
+
+    expected = minidom.parseString(expected_xml)
+    if os.path.isfile(output_file1):
+      actual = minidom.parse(output_file1)
+    else:
+      actual = minidom.parse(output_file2)
+    self.NormalizeXml(actual.documentElement)
+    self.AssertEquivalentNodes(expected.documentElement, actual.documentElement)
+    expected.unlink()
+    actual.unlink()
 
 
 if __name__ == "__main__":
-    os.environ["GTEST_STACK_TRACE_DEPTH"] = "0"
-    gtest_test_utils.Main()
+  os.environ["GTEST_STACK_TRACE_DEPTH"] = "0"
+  gtest_test_utils.Main()
diff --git a/external/googletest/googletest/test/gtest_xml_output_unittest.py b/external/googletest/googletest/test/gtest_xml_output_unittest.py
old mode 100644
new mode 100755
index 351f9030..87a7683a
--- a/external/googletest/googletest/test/gtest_xml_output_unittest.py
+++ b/external/googletest/googletest/test/gtest_xml_output_unittest.py
@@ -29,17 +29,17 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-"""Unit test for the gtest_xml_output module"""
+"""Unit test for the gtest_xml_output module."""
 
 import datetime
 import errno
 import os
 import re
 import sys
-from xml.dom import minidom, Node
+from xml.dom import minidom
 
-import gtest_test_utils
-import gtest_xml_test_utils
+from googletest.test import gtest_test_utils
+from googletest.test import gtest_xml_test_utils
 
 GTEST_FILTER_FLAG = '--gtest_filter'
 GTEST_LIST_TESTS_FLAG = '--gtest_list_tests'
@@ -58,161 +58,208 @@
 SUPPORTS_STACK_TRACES = NO_STACKTRACE_SUPPORT_FLAG not in sys.argv
 
 if SUPPORTS_STACK_TRACES:
-    STACK_TRACE_TEMPLATE = '\nStack trace:\n*'
+  STACK_TRACE_TEMPLATE = '\nStack trace:\n*'
+  STACK_TRACE_ENTITY_TEMPLATE = ''
 else:
-    STACK_TRACE_TEMPLATE = ''
-    # unittest.main() can't handle unknown flags
-    sys.argv.remove(NO_STACKTRACE_SUPPORT_FLAG)
+  STACK_TRACE_TEMPLATE = '\n'
+  STACK_TRACE_ENTITY_TEMPLATE = '&#x0A;'
+  # unittest.main() can't handle unknown flags
+  sys.argv.remove(NO_STACKTRACE_SUPPORT_FLAG)
 
 EXPECTED_NON_EMPTY_XML = """<?xml version="1.0" encoding="UTF-8"?>
-<testsuites tests="26" failures="5" disabled="2" errors="0" time="*" timestamp="*" name="AllTests" ad_hoc_property="42">
+<testsuites tests="28" failures="5" disabled="2" errors="0" time="*" timestamp="*" name="AllTests">
+  <properties>
+    <property name="ad_hoc_property" value="42"/>
+  </properties>
   <testsuite name="SuccessfulTest" tests="1" failures="0" disabled="0" skipped="0" errors="0" time="*" timestamp="*">
-    <testcase name="Succeeds" status="run" result="completed" time="*" timestamp="*" classname="SuccessfulTest"/>
+    <testcase name="Succeeds" file="gtest_xml_output_unittest_.cc" line="53" status="run" result="completed" time="*" timestamp="*" classname="SuccessfulTest"/>
   </testsuite>
   <testsuite name="FailedTest" tests="1" failures="1" disabled="0" skipped="0" errors="0" time="*" timestamp="*">
-    <testcase name="Fails" status="run" result="completed" time="*" timestamp="*" classname="FailedTest">
-      <failure message="gtest_xml_output_unittest_.cc:*&#x0A;Expected equality of these values:&#x0A;  1&#x0A;  2" type=""><![CDATA[gtest_xml_output_unittest_.cc:*
+    <testcase name="Fails" file="gtest_xml_output_unittest_.cc" line="61" status="run" result="completed" time="*" timestamp="*" classname="FailedTest">
+      <failure message="gtest_xml_output_unittest_.cc:*&#x0A;Expected equality of these values:&#x0A;  1&#x0A;  2%(stack_entity)s" type=""><![CDATA[gtest_xml_output_unittest_.cc:*
 Expected equality of these values:
   1
   2%(stack)s]]></failure>
     </testcase>
   </testsuite>
   <testsuite name="MixedResultTest" tests="3" failures="1" disabled="1" skipped="0" errors="0" time="*" timestamp="*">
-    <testcase name="Succeeds" status="run" result="completed" time="*" timestamp="*" classname="MixedResultTest"/>
-    <testcase name="Fails" status="run" result="completed" time="*" timestamp="*" classname="MixedResultTest">
-      <failure message="gtest_xml_output_unittest_.cc:*&#x0A;Expected equality of these values:&#x0A;  1&#x0A;  2" type=""><![CDATA[gtest_xml_output_unittest_.cc:*
+    <testcase name="Succeeds" file="gtest_xml_output_unittest_.cc" line="88" status="run" result="completed" time="*" timestamp="*" classname="MixedResultTest"/>
+    <testcase name="Fails" file="gtest_xml_output_unittest_.cc" line="93" status="run" result="completed" time="*" timestamp="*" classname="MixedResultTest">
+      <failure message="gtest_xml_output_unittest_.cc:*&#x0A;Expected equality of these values:&#x0A;  1&#x0A;  2%(stack_entity)s" type=""><![CDATA[gtest_xml_output_unittest_.cc:*
 Expected equality of these values:
   1
   2%(stack)s]]></failure>
-      <failure message="gtest_xml_output_unittest_.cc:*&#x0A;Expected equality of these values:&#x0A;  2&#x0A;  3" type=""><![CDATA[gtest_xml_output_unittest_.cc:*
+      <failure message="gtest_xml_output_unittest_.cc:*&#x0A;Expected equality of these values:&#x0A;  2&#x0A;  3%(stack_entity)s" type=""><![CDATA[gtest_xml_output_unittest_.cc:*
 Expected equality of these values:
   2
   3%(stack)s]]></failure>
     </testcase>
-    <testcase name="DISABLED_test" status="notrun" result="suppressed" time="*" timestamp="*" classname="MixedResultTest"/>
+    <testcase name="DISABLED_test" file="gtest_xml_output_unittest_.cc" line="98" status="notrun" result="suppressed" time="*" timestamp="*" classname="MixedResultTest"/>
   </testsuite>
   <testsuite name="XmlQuotingTest" tests="1" failures="1" disabled="0" skipped="0" errors="0" time="*" timestamp="*">
-    <testcase name="OutputsCData" status="run" result="completed" time="*" timestamp="*" classname="XmlQuotingTest">
-      <failure message="gtest_xml_output_unittest_.cc:*&#x0A;Failed&#x0A;XML output: &lt;?xml encoding=&quot;utf-8&quot;&gt;&lt;top&gt;&lt;![CDATA[cdata text]]&gt;&lt;/top&gt;" type=""><![CDATA[gtest_xml_output_unittest_.cc:*
+    <testcase name="OutputsCData" file="gtest_xml_output_unittest_.cc" line="102" status="run" result="completed" time="*" timestamp="*" classname="XmlQuotingTest">
+      <failure message="gtest_xml_output_unittest_.cc:*&#x0A;Failed&#x0A;XML output: &lt;?xml encoding=&quot;utf-8&quot;&gt;&lt;top&gt;&lt;![CDATA[cdata text]]&gt;&lt;/top&gt;%(stack_entity)s" type=""><![CDATA[gtest_xml_output_unittest_.cc:*
 Failed
 XML output: <?xml encoding="utf-8"><top><![CDATA[cdata text]]>]]&gt;<![CDATA[</top>%(stack)s]]></failure>
     </testcase>
   </testsuite>
   <testsuite name="InvalidCharactersTest" tests="1" failures="1" disabled="0" skipped="0" errors="0" time="*" timestamp="*">
-    <testcase name="InvalidCharactersInMessage" status="run" result="completed" time="*" timestamp="*" classname="InvalidCharactersTest">
-      <failure message="gtest_xml_output_unittest_.cc:*&#x0A;Failed&#x0A;Invalid characters in brackets []" type=""><![CDATA[gtest_xml_output_unittest_.cc:*
+    <testcase name="InvalidCharactersInMessage" file="gtest_xml_output_unittest_.cc" line="109" status="run" result="completed" time="*" timestamp="*" classname="InvalidCharactersTest">
+      <failure message="gtest_xml_output_unittest_.cc:*&#x0A;Failed&#x0A;Invalid characters in brackets []%(stack_entity)s" type=""><![CDATA[gtest_xml_output_unittest_.cc:*
 Failed
 Invalid characters in brackets []%(stack)s]]></failure>
     </testcase>
   </testsuite>
   <testsuite name="DisabledTest" tests="1" failures="0" disabled="1" skipped="0" errors="0" time="*" timestamp="*">
-    <testcase name="DISABLED_test_not_run" status="notrun" result="suppressed" time="*" timestamp="*" classname="DisabledTest"/>
+    <testcase name="DISABLED_test_not_run" file="gtest_xml_output_unittest_.cc" line="68" status="notrun" result="suppressed" time="*" timestamp="*" classname="DisabledTest"/>
   </testsuite>
   <testsuite name="SkippedTest" tests="3" failures="1" disabled="0" skipped="2" errors="0" time="*" timestamp="*">
-    <testcase name="Skipped" status="run" result="skipped" time="*" timestamp="*" classname="SkippedTest">
-      <skipped message="gtest_xml_output_unittest_.cc:*&#x0A;"><![CDATA[gtest_xml_output_unittest_.cc:*
-%(stack)s]]></skipped>
+    <testcase name="Skipped" status="run" file="gtest_xml_output_unittest_.cc" line="75" result="skipped" time="*" timestamp="*" classname="SkippedTest">
+      <skipped message="gtest_xml_output_unittest_.cc:*&#x0A;&#x0A;"><![CDATA[gtest_xml_output_unittest_.cc:*
+
+]]></skipped>
     </testcase>
-    <testcase name="SkippedWithMessage" status="run" result="skipped" time="*" timestamp="*" classname="SkippedTest">
-      <skipped message="gtest_xml_output_unittest_.cc:*&#x0A;It is good practice to tell why you skip a test."><![CDATA[gtest_xml_output_unittest_.cc:*
-It is good practice to tell why you skip a test.%(stack)s]]></skipped>
+    <testcase name="SkippedWithMessage" file="gtest_xml_output_unittest_.cc" line="79" status="run" result="skipped" time="*" timestamp="*" classname="SkippedTest">
+      <skipped message="gtest_xml_output_unittest_.cc:*&#x0A;It is good practice to tell why you skip a test.&#x0A;"><![CDATA[gtest_xml_output_unittest_.cc:*
+It is good practice to tell why you skip a test.
+]]></skipped>
     </testcase>
-    <testcase name="SkippedAfterFailure" status="run" result="completed" time="*" timestamp="*" classname="SkippedTest">
-      <failure message="gtest_xml_output_unittest_.cc:*&#x0A;Expected equality of these values:&#x0A;  1&#x0A;  2" type=""><![CDATA[gtest_xml_output_unittest_.cc:*
+    <testcase name="SkippedAfterFailure" file="gtest_xml_output_unittest_.cc" line="83" status="run" result="completed" time="*" timestamp="*" classname="SkippedTest">
+      <failure message="gtest_xml_output_unittest_.cc:*&#x0A;Expected equality of these values:&#x0A;  1&#x0A;  2%(stack_entity)s" type=""><![CDATA[gtest_xml_output_unittest_.cc:*
 Expected equality of these values:
   1
   2%(stack)s]]></failure>
-      <skipped message="gtest_xml_output_unittest_.cc:*&#x0A;It is good practice to tell why you skip a test."><![CDATA[gtest_xml_output_unittest_.cc:*
-It is good practice to tell why you skip a test.%(stack)s]]></skipped>
+      <skipped message="gtest_xml_output_unittest_.cc:*&#x0A;It is good practice to tell why you skip a test.&#x0A;"><![CDATA[gtest_xml_output_unittest_.cc:*
+It is good practice to tell why you skip a test.
+]]></skipped>
     </testcase>
 
   </testsuite>
-  <testsuite name="PropertyRecordingTest" tests="4" failures="0" disabled="0" skipped="0" errors="0" time="*" timestamp="*" SetUpTestSuite="yes" TearDownTestSuite="aye">
-    <testcase name="OneProperty" status="run" result="completed" time="*" timestamp="*" classname="PropertyRecordingTest">
+  <testsuite name="PropertyRecordingTest" tests="4" failures="0" disabled="0" skipped="0" errors="0" time="*" timestamp="*">
+    <properties>
+      <property name="SetUpTestSuite" value="yes"/>
+      <property name="SetUpTestSuite (with whitespace)" value="yes and yes"/>
+      <property name="TearDownTestSuite" value="aye"/>
+      <property name="TearDownTestSuite (with whitespace)" value="aye and aye"/>
+    </properties>
+    <testcase name="OneProperty" file="gtest_xml_output_unittest_.cc" line="125" status="run" result="completed" time="*" timestamp="*" classname="PropertyRecordingTest">
       <properties>
         <property name="key_1" value="1"/>
       </properties>
     </testcase>
-    <testcase name="IntValuedProperty" status="run" result="completed" time="*" timestamp="*" classname="PropertyRecordingTest">
+    <testcase name="IntValuedProperty" file="gtest_xml_output_unittest_.cc" line="129" status="run" result="completed" time="*" timestamp="*" classname="PropertyRecordingTest">
       <properties>
         <property name="key_int" value="1"/>
       </properties>
     </testcase>
-    <testcase name="ThreeProperties" status="run" result="completed" time="*" timestamp="*" classname="PropertyRecordingTest">
+    <testcase name="ThreeProperties" file="gtest_xml_output_unittest_.cc" line="133" status="run" result="completed" time="*" timestamp="*" classname="PropertyRecordingTest">
       <properties>
         <property name="key_1" value="1"/>
         <property name="key_2" value="2"/>
         <property name="key_3" value="3"/>
       </properties>
     </testcase>
-    <testcase name="TwoValuesForOneKeyUsesLastValue" status="run" result="completed" time="*" timestamp="*" classname="PropertyRecordingTest">
+    <testcase name="TwoValuesForOneKeyUsesLastValue" file="gtest_xml_output_unittest_.cc" line="139" status="run" result="completed" time="*" timestamp="*" classname="PropertyRecordingTest">
       <properties>
         <property name="key_1" value="2"/>
       </properties>
     </testcase>
   </testsuite>
   <testsuite name="NoFixtureTest" tests="3" failures="0" disabled="0" skipped="0" errors="0" time="*" timestamp="*">
-     <testcase name="RecordProperty" status="run" result="completed" time="*" timestamp="*" classname="NoFixtureTest">
+     <testcase name="RecordProperty" file="gtest_xml_output_unittest_.cc" line="144" status="run" result="completed" time="*" timestamp="*" classname="NoFixtureTest">
        <properties>
          <property name="key" value="1"/>
        </properties>
      </testcase>
-     <testcase name="ExternalUtilityThatCallsRecordIntValuedProperty" status="run" result="completed" time="*" timestamp="*" classname="NoFixtureTest">
+     <testcase name="ExternalUtilityThatCallsRecordIntValuedProperty" file="gtest_xml_output_unittest_.cc" line="157" status="run" result="completed" time="*" timestamp="*" classname="NoFixtureTest">
        <properties>
          <property name="key_for_utility_int" value="1"/>
        </properties>
      </testcase>
-     <testcase name="ExternalUtilityThatCallsRecordStringValuedProperty" status="run" result="completed" time="*" timestamp="*" classname="NoFixtureTest">
+     <testcase name="ExternalUtilityThatCallsRecordStringValuedProperty" file="gtest_xml_output_unittest_.cc" line="161" status="run" result="completed" time="*" timestamp="*" classname="NoFixtureTest">
        <properties>
          <property name="key_for_utility_string" value="1"/>
        </properties>
      </testcase>
   </testsuite>
+  <testsuite name="SetupFailTest" tests="1" failures="0" disabled="0" skipped="1" errors="0" time="*" timestamp="*">
+    <testcase name="NoopPassingTest" file="gtest_xml_output_unittest_.cc" line="172" status="run" result="skipped" time="*" timestamp="*" classname="SetupFailTest">
+      <skipped message="gtest_xml_output_unittest_.cc:*&#x0A;"><![CDATA[gtest_xml_output_unittest_.cc:*
+]]></skipped>
+    </testcase>
+    <testcase name="" status="run" result="completed" classname="" time="*" timestamp="*">
+      <failure message="gtest_xml_output_unittest_.cc:*&#x0A;Expected equality of these values:&#x0A;  1&#x0A;  2%(stack_entity)s" type=""><![CDATA[gtest_xml_output_unittest_.cc:*
+Expected equality of these values:
+  1
+  2%(stack)s]]></failure>
+    </testcase>
+  </testsuite>
+  <testsuite name="TearDownFailTest" tests="1" failures="0" disabled="0" skipped="0" errors="0" time="*" timestamp="*">
+    <testcase name="NoopPassingTest" file="gtest_xml_output_unittest_.cc" line="179" status="run" result="completed" time="*" timestamp="*" classname="TearDownFailTest"/>
+    <testcase name="" status="run" result="completed" classname="" time="*" timestamp="*">
+      <failure message="gtest_xml_output_unittest_.cc:*&#x0A;Expected equality of these values:&#x0A;  1&#x0A;  2%(stack_entity)s" type=""><![CDATA[gtest_xml_output_unittest_.cc:*
+Expected equality of these values:
+  1
+  2%(stack)s]]></failure>
+    </testcase>
+  </testsuite>
   <testsuite name="Single/ValueParamTest" tests="4" failures="0" disabled="0" skipped="0" errors="0" time="*" timestamp="*">
-    <testcase name="HasValueParamAttribute/0" value_param="33" status="run" result="completed" time="*" timestamp="*" classname="Single/ValueParamTest" />
-    <testcase name="HasValueParamAttribute/1" value_param="42" status="run" result="completed" time="*" timestamp="*" classname="Single/ValueParamTest" />
-    <testcase name="AnotherTestThatHasValueParamAttribute/0" value_param="33" status="run" result="completed" time="*" timestamp="*" classname="Single/ValueParamTest" />
-    <testcase name="AnotherTestThatHasValueParamAttribute/1" value_param="42" status="run" result="completed" time="*" timestamp="*" classname="Single/ValueParamTest" />
+    <testcase name="HasValueParamAttribute/0" file="gtest_xml_output_unittest_.cc" line="184" value_param="33" status="run" result="completed" time="*" timestamp="*" classname="Single/ValueParamTest" />
+    <testcase name="HasValueParamAttribute/1" file="gtest_xml_output_unittest_.cc" line="184" value_param="42" status="run" result="completed" time="*" timestamp="*" classname="Single/ValueParamTest" />
+    <testcase name="AnotherTestThatHasValueParamAttribute/0" file="gtest_xml_output_unittest_.cc" line="185" value_param="33" status="run" result="completed" time="*" timestamp="*" classname="Single/ValueParamTest" />
+    <testcase name="AnotherTestThatHasValueParamAttribute/1" file="gtest_xml_output_unittest_.cc" line="185" value_param="42" status="run" result="completed" time="*" timestamp="*" classname="Single/ValueParamTest" />
   </testsuite>
   <testsuite name="TypedTest/0" tests="1" failures="0" disabled="0" skipped="0" errors="0" time="*" timestamp="*">
-    <testcase name="HasTypeParamAttribute" type_param="*" status="run" result="completed" time="*" timestamp="*" classname="TypedTest/0" />
+    <testcase name="HasTypeParamAttribute" file="gtest_xml_output_unittest_.cc" line="193" type_param="*" status="run" result="completed" time="*" timestamp="*" classname="TypedTest/0" />
   </testsuite>
   <testsuite name="TypedTest/1" tests="1" failures="0" disabled="0" skipped="0" errors="0" time="*" timestamp="*">
-    <testcase name="HasTypeParamAttribute" type_param="*" status="run" result="completed" time="*" timestamp="*" classname="TypedTest/1" />
+    <testcase name="HasTypeParamAttribute" file="gtest_xml_output_unittest_.cc" line="193" type_param="*" status="run" result="completed" time="*" timestamp="*" classname="TypedTest/1" />
   </testsuite>
   <testsuite name="Single/TypeParameterizedTestSuite/0" tests="1" failures="0" disabled="0" skipped="0" errors="0" time="*" timestamp="*">
-    <testcase name="HasTypeParamAttribute" type_param="*" status="run" result="completed" time="*" timestamp="*" classname="Single/TypeParameterizedTestSuite/0" />
+    <testcase name="HasTypeParamAttribute" file="gtest_xml_output_unittest_.cc" line="200" type_param="*" status="run" result="completed" time="*" timestamp="*" classname="Single/TypeParameterizedTestSuite/0" />
   </testsuite>
   <testsuite name="Single/TypeParameterizedTestSuite/1" tests="1" failures="0" disabled="0" skipped="0" errors="0" time="*" timestamp="*">
-    <testcase name="HasTypeParamAttribute" type_param="*" status="run" result="completed" time="*" timestamp="*" classname="Single/TypeParameterizedTestSuite/1" />
+    <testcase name="HasTypeParamAttribute" file="gtest_xml_output_unittest_.cc" line="200" type_param="*" status="run" result="completed" time="*" timestamp="*" classname="Single/TypeParameterizedTestSuite/1" />
   </testsuite>
 </testsuites>""" % {
-    'stack': STACK_TRACE_TEMPLATE
+    'stack': STACK_TRACE_TEMPLATE,
+    'stack_entity': STACK_TRACE_ENTITY_TEMPLATE,
 }
 
 EXPECTED_FILTERED_TEST_XML = """<?xml version="1.0" encoding="UTF-8"?>
-<testsuites tests="1" failures="0" disabled="0" errors="0" time="*"
-            timestamp="*" name="AllTests" ad_hoc_property="42">
+<testsuites tests="1" failures="0" disabled="0" errors="0" time="*" timestamp="*" name="AllTests">
+  <properties>
+    <property name="ad_hoc_property" value="42"/>
+  </properties>
   <testsuite name="SuccessfulTest" tests="1" failures="0" disabled="0" skipped="0"
              errors="0" time="*" timestamp="*">
-    <testcase name="Succeeds" status="run" result="completed" time="*" timestamp="*" classname="SuccessfulTest"/>
+    <testcase name="Succeeds" file="gtest_xml_output_unittest_.cc" line="53" status="run" result="completed" time="*" timestamp="*" classname="SuccessfulTest"/>
   </testsuite>
 </testsuites>"""
 
 EXPECTED_SHARDED_TEST_XML = """<?xml version="1.0" encoding="UTF-8"?>
-<testsuites tests="3" failures="0" disabled="0" errors="0" time="*" timestamp="*" name="AllTests" ad_hoc_property="42">
+<testsuites tests="3" failures="0" disabled="0" errors="0" time="*" timestamp="*" name="AllTests">
+  <properties>
+    <property name="ad_hoc_property" value="42"/>
+  </properties>
   <testsuite name="SuccessfulTest" tests="1" failures="0" disabled="0" skipped="0" errors="0" time="*" timestamp="*">
-    <testcase name="Succeeds" status="run" result="completed" time="*" timestamp="*" classname="SuccessfulTest"/>
+    <testcase name="Succeeds" file="gtest_xml_output_unittest_.cc" line="53" status="run" result="completed" time="*" timestamp="*" classname="SuccessfulTest"/>
   </testsuite>
-  <testsuite name="PropertyRecordingTest" tests="1" failures="0" disabled="0" skipped="0" errors="0" time="*" timestamp="*" SetUpTestSuite="yes" TearDownTestSuite="aye">
-    <testcase name="IntValuedProperty" status="run" result="completed" time="*" timestamp="*" classname="PropertyRecordingTest">
+  <testsuite name="PropertyRecordingTest" tests="1" failures="0" disabled="0" skipped="0" errors="0" time="*" timestamp="*">
+    <properties>
+      <property name="SetUpTestSuite" value="yes"/>
+      <property name="SetUpTestSuite (with whitespace)" value="yes and yes"/>
+      <property name="TearDownTestSuite" value="aye"/>
+      <property name="TearDownTestSuite (with whitespace)" value="aye and aye"/>
+    </properties>
+    <testcase name="IntValuedProperty" file="gtest_xml_output_unittest_.cc" line="129" status="run" result="completed" time="*" timestamp="*" classname="PropertyRecordingTest">
       <properties>
         <property name="key_int" value="1"/>
       </properties>
     </testcase>
   </testsuite>
-  <testsuite name="Single/ValueParamTest" tests="1" failures="0" disabled="0" skipped="0" errors="0" time="*" timestamp="*">
-    <testcase name="HasValueParamAttribute/0" value_param="33" status="run" result="completed" time="*" timestamp="*" classname="Single/ValueParamTest" />
+  <testsuite name="Single/TypeParameterizedTestSuite/0" tests="1" failures="0" disabled="0" skipped="0" errors="0" time="*" timestamp="*">
+    <testcase name="HasTypeParamAttribute" type_param="*" file="gtest_xml_output_unittest_.cc" line="200" status="run" result="completed" time="*" timestamp="*" classname="Single/TypeParameterizedTestSuite/0" />
   </testsuite>
 </testsuites>"""
 
@@ -221,195 +268,246 @@
             timestamp="*" name="AllTests">
   <testsuite name="NonTestSuiteFailure" tests="1" failures="1" disabled="0" skipped="0" errors="0" time="*" timestamp="*">
     <testcase name="" status="run" result="completed" time="*" timestamp="*" classname="">
-      <failure message="gtest_no_test_unittest.cc:*&#x0A;Expected equality of these values:&#x0A;  1&#x0A;  2" type=""><![CDATA[gtest_no_test_unittest.cc:*
+      <failure message="gtest_no_test_unittest.cc:*&#x0A;Expected equality of these values:&#x0A;  1&#x0A;  2%(stack_entity)s" type=""><![CDATA[gtest_no_test_unittest.cc:*
 Expected equality of these values:
   1
   2%(stack)s]]></failure>
     </testcase>
   </testsuite>
 </testsuites>""" % {
-    'stack': STACK_TRACE_TEMPLATE
+    'stack': STACK_TRACE_TEMPLATE,
+    'stack_entity': STACK_TRACE_ENTITY_TEMPLATE,
 }
 
 GTEST_PROGRAM_PATH = gtest_test_utils.GetTestExecutablePath(GTEST_PROGRAM_NAME)
 
-SUPPORTS_TYPED_TESTS = 'TypedTest' in gtest_test_utils.Subprocess(
-    [GTEST_PROGRAM_PATH, GTEST_LIST_TESTS_FLAG], capture_stderr=False).output
+SUPPORTS_TYPED_TESTS = (
+    'TypedTest'
+    in gtest_test_utils.Subprocess(
+        [GTEST_PROGRAM_PATH, GTEST_LIST_TESTS_FLAG], capture_stderr=False
+    ).output
+)
 
 
 class GTestXMLOutputUnitTest(gtest_xml_test_utils.GTestXMLTestCase):
+  """Unit test for Google Test's XML output functionality."""
+
+  # This test currently breaks on platforms that do not support typed and
+  # type-parameterized tests, so we don't run it under them.
+  if SUPPORTS_TYPED_TESTS:
+
+    def testNonEmptyXmlOutput(self):
+      """Generates non-empty XML and verifies it matches the expected output.
+
+      Runs a test program that generates a non-empty XML output, and
+      tests that the XML output is expected.
+      """
+      self._TestXmlOutput(GTEST_PROGRAM_NAME, EXPECTED_NON_EMPTY_XML, 1)
+
+  def testNoTestXmlOutput(self):
+    """Verifies XML output for a Google Test binary without actual tests.
+
+    Runs a test program that generates an XML output for a binary without tests,
+    and tests that the XML output is expected.
+    """
+
+    self._TestXmlOutput('gtest_no_test_unittest', EXPECTED_NO_TEST_XML, 0)
+
+  def testTimestampValue(self):
+    """Checks whether the timestamp attribute in the XML output is valid.
+
+    Runs a test program that generates an empty XML output, and checks if
+    the timestamp attribute in the testsuites tag is valid.
+    """
+    actual = self._GetXmlOutput('gtest_no_test_unittest', [], {}, 0)
+    date_time_str = actual.documentElement.getAttributeNode('timestamp').value
+    # datetime.strptime() is only available in Python 2.5+ so we have to
+    # parse the expected datetime manually.
+    match = re.match(r'(\d+)-(\d\d)-(\d\d)T(\d\d):(\d\d):(\d\d)', date_time_str)
+    self.assertTrue(
+        re.match, 'XML datettime string %s has incorrect format' % date_time_str
+    )
+    date_time_from_xml = datetime.datetime(
+        year=int(match.group(1)),
+        month=int(match.group(2)),
+        day=int(match.group(3)),
+        hour=int(match.group(4)),
+        minute=int(match.group(5)),
+        second=int(match.group(6)),
+    )
+
+    time_delta = abs(datetime.datetime.now() - date_time_from_xml)
+    # timestamp value should be near the current local time
+    self.assertLess(time_delta, datetime.timedelta(seconds=600))
+    actual.unlink()
+
+  def testDefaultOutputFile(self):
+    """Tests XML file with default name is created when name is not specified.
+
+    Confirms that Google Test produces an XML output file with the expected
+    default name if no name is explicitly specified.
+    """
+    output_file = os.path.join(
+        gtest_test_utils.GetTempDir(), GTEST_DEFAULT_OUTPUT_FILE
+    )
+    gtest_prog_path = gtest_test_utils.GetTestExecutablePath(
+        'gtest_no_test_unittest'
+    )
+    try:
+      os.remove(output_file)
+    except OSError:
+      e = sys.exc_info()[1]
+      if e.errno != errno.ENOENT:
+        raise
+
+    p = gtest_test_utils.Subprocess(
+        [gtest_prog_path, '%s=xml' % GTEST_OUTPUT_FLAG],
+        working_dir=gtest_test_utils.GetTempDir(),
+    )
+    self.assertTrue(p.exited)
+    self.assertEqual(0, p.exit_code)
+    self.assertTrue(os.path.isfile(output_file))
+
+  def testSuppressedXmlOutput(self):
+    """Verifies XML output is suppressed if default listener is shut down.
+
+    Tests that no XML file is generated if the default XML listener is
+    shut down before RUN_ALL_TESTS is invoked.
+    """
+
+    xml_path = os.path.join(
+        gtest_test_utils.GetTempDir(), GTEST_PROGRAM_NAME + 'out.xml'
+    )
+    if os.path.isfile(xml_path):
+      os.remove(xml_path)
+
+    command = [
+        GTEST_PROGRAM_PATH,
+        '%s=xml:%s' % (GTEST_OUTPUT_FLAG, xml_path),
+        '--shut_down_xml',
+    ]
+    p = gtest_test_utils.Subprocess(command)
+    if p.terminated_by_signal:
+      # p.signal is available only if p.terminated_by_signal is True.
+      self.assertFalse(
+          p.terminated_by_signal,
+          '%s was killed by signal %d' % (GTEST_PROGRAM_NAME, p.signal),
+      )
+    else:
+      self.assertTrue(p.exited)
+      self.assertEqual(
+          1,
+          p.exit_code,
+          "'%s' exited with code %s, which doesn't match "
+          'the expected exit code %s.' % (command, p.exit_code, 1),
+      )
+
+    self.assertFalse(os.path.isfile(xml_path))
+
+  def testFilteredTestXmlOutput(self):
+    """Verifies XML output when a filter is applied.
+
+    Runs a test program that executes only some tests and verifies that
+    non-selected tests do not show up in the XML output.
+    """
+
+    self._TestXmlOutput(
+        GTEST_PROGRAM_NAME,
+        EXPECTED_FILTERED_TEST_XML,
+        0,
+        extra_args=['%s=SuccessfulTest.*' % GTEST_FILTER_FLAG],
+    )
+
+  def testShardedTestXmlOutput(self):
+    """Verifies XML output when run using multiple shards.
+
+    Runs a test program that executes only one shard and verifies that tests
+    from other shards do not show up in the XML output.
+    """
+
+    self._TestXmlOutput(
+        GTEST_PROGRAM_NAME,
+        EXPECTED_SHARDED_TEST_XML,
+        0,
+        extra_env={SHARD_INDEX_ENV_VAR: '0', TOTAL_SHARDS_ENV_VAR: '10'},
+    )
+
+  def _GetXmlOutput(
+      self, gtest_prog_name, extra_args, extra_env, expected_exit_code
+  ):
+    """Returns the XML output generated by running the program gtest_prog_name.
+
+    Furthermore, the program's exit code must be expected_exit_code.
+
+    Args:
+      gtest_prog_name: Program to run.
+      extra_args: Optional arguments to pass to program.
+      extra_env: Optional environment variables to set.
+      expected_exit_code: Expected exit code from running gtest_prog_name.
     """
-    Unit test for Google Test's XML output functionality.
+    xml_path = os.path.join(
+        gtest_test_utils.GetTempDir(), gtest_prog_name + 'out.xml'
+    )
+    gtest_prog_path = gtest_test_utils.GetTestExecutablePath(gtest_prog_name)
+
+    command = [
+        gtest_prog_path,
+        '%s=xml:%s' % (GTEST_OUTPUT_FLAG, xml_path),
+    ] + extra_args
+    environ_copy = os.environ.copy()
+    if extra_env:
+      environ_copy.update(extra_env)
+    p = gtest_test_utils.Subprocess(command, env=environ_copy)
+
+    if p.terminated_by_signal:
+      self.assertTrue(
+          False, '%s was killed by signal %d' % (gtest_prog_name, p.signal)
+      )
+    else:
+      self.assertTrue(p.exited)
+      self.assertEqual(
+          expected_exit_code,
+          p.exit_code,
+          "'%s' exited with code %s, which doesn't match "
+          'the expected exit code %s.'
+          % (command, p.exit_code, expected_exit_code),
+      )
+    actual = minidom.parse(xml_path)
+    return actual
+
+  def _TestXmlOutput(
+      self,
+      gtest_prog_name,
+      expected_xml,
+      expected_exit_code,
+      extra_args=None,
+      extra_env=None,
+  ):
+    """Asserts that the XML document matches.
+
+    Asserts that the XML document generated by running the program
+    gtest_prog_name matches expected_xml, a string containing another
+    XML document.  Furthermore, the program's exit code must be
+    expected_exit_code.
+
+    Args:
+      gtest_prog_name: Program to run.
+      expected_xml: Path to XML document to match.
+      expected_exit_code: Expected exit code from running gtest_prog_name.
+      extra_args: Optional arguments to pass to program.
+      extra_env: Optional environment variables to set.
     """
 
-    # This test currently breaks on platforms that do not support typed and
-    # type-parameterized tests, so we don't run it under them.
-    if SUPPORTS_TYPED_TESTS:
-        def testNonEmptyXmlOutput(self):
-            """
-            Runs a test program that generates a non-empty XML output, and
-            tests that the XML output is expected.
-            """
-            self._TestXmlOutput(GTEST_PROGRAM_NAME, EXPECTED_NON_EMPTY_XML, 1)
-
-    def testNoTestXmlOutput(self):
-        """Verifies XML output for a Google Test binary without actual tests.
-
-        Runs a test program that generates an XML output for a binary without tests,
-        and tests that the XML output is expected.
-        """
-
-        self._TestXmlOutput('gtest_no_test_unittest', EXPECTED_NO_TEST_XML, 0)
-
-    def testTimestampValue(self):
-        """Checks whether the timestamp attribute in the XML output is valid.
-
-        Runs a test program that generates an empty XML output, and checks if
-        the timestamp attribute in the testsuites tag is valid.
-        """
-        actual = self._GetXmlOutput('gtest_no_test_unittest', [], {}, 0)
-        date_time_str = actual.documentElement.getAttributeNode('timestamp').value
-        # datetime.strptime() is only available in Python 2.5+ so we have to
-        # parse the expected datetime manually.
-        match = re.match(r'(\d+)-(\d\d)-(\d\d)T(\d\d):(\d\d):(\d\d)', date_time_str)
-        self.assertTrue(
-            re.match,
-            'XML datettime string %s has incorrect format' % date_time_str)
-        date_time_from_xml = datetime.datetime(
-            year=int(match.group(1)), month=int(match.group(2)),
-            day=int(match.group(3)), hour=int(match.group(4)),
-            minute=int(match.group(5)), second=int(match.group(6)))
-
-        time_delta = abs(datetime.datetime.now() - date_time_from_xml)
-        # timestamp value should be near the current local time
-        self.assertTrue(time_delta < datetime.timedelta(seconds=600),
-                        'time_delta is %s' % time_delta)
-        actual.unlink()
-
-    def testDefaultOutputFile(self):
-        """
-        Confirms that Google Test produces an XML output file with the expected
-        default name if no name is explicitly specified.
-        """
-        output_file = os.path.join(gtest_test_utils.GetTempDir(),
-                                   GTEST_DEFAULT_OUTPUT_FILE)
-        gtest_prog_path = gtest_test_utils.GetTestExecutablePath(
-            'gtest_no_test_unittest')
-        try:
-            os.remove(output_file)
-        except OSError:
-            e = sys.exc_info()[1]
-            if e.errno != errno.ENOENT:
-                raise
-
-        p = gtest_test_utils.Subprocess(
-            [gtest_prog_path, '%s=xml' % GTEST_OUTPUT_FLAG],
-            working_dir=gtest_test_utils.GetTempDir())
-        self.assert_(p.exited)
-        self.assertEquals(0, p.exit_code)
-        self.assert_(os.path.isfile(output_file))
-
-    def testSuppressedXmlOutput(self):
-        """
-        Tests that no XML file is generated if the default XML listener is
-        shut down before RUN_ALL_TESTS is invoked.
-        """
-
-        xml_path = os.path.join(gtest_test_utils.GetTempDir(),
-                                GTEST_PROGRAM_NAME + 'out.xml')
-        if os.path.isfile(xml_path):
-            os.remove(xml_path)
-
-        command = [GTEST_PROGRAM_PATH,
-                   '%s=xml:%s' % (GTEST_OUTPUT_FLAG, xml_path),
-                   '--shut_down_xml']
-        p = gtest_test_utils.Subprocess(command)
-        if p.terminated_by_signal:
-            # p.signal is available only if p.terminated_by_signal is True.
-            self.assertFalse(
-                p.terminated_by_signal,
-                '%s was killed by signal %d' % (GTEST_PROGRAM_NAME, p.signal))
-        else:
-            self.assert_(p.exited)
-            self.assertEquals(1, p.exit_code,
-                              "'%s' exited with code %s, which doesn't match "
-                              'the expected exit code %s.'
-                              % (command, p.exit_code, 1))
-
-        self.assert_(not os.path.isfile(xml_path))
-
-    def testFilteredTestXmlOutput(self):
-        """Verifies XML output when a filter is applied.
-
-        Runs a test program that executes only some tests and verifies that
-        non-selected tests do not show up in the XML output.
-        """
-
-        self._TestXmlOutput(GTEST_PROGRAM_NAME, EXPECTED_FILTERED_TEST_XML, 0,
-                            extra_args=['%s=SuccessfulTest.*' % GTEST_FILTER_FLAG])
-
-    def testShardedTestXmlOutput(self):
-        """Verifies XML output when run using multiple shards.
-
-        Runs a test program that executes only one shard and verifies that tests
-        from other shards do not show up in the XML output.
-        """
-
-        self._TestXmlOutput(
-            GTEST_PROGRAM_NAME,
-            EXPECTED_SHARDED_TEST_XML,
-            0,
-            extra_env={SHARD_INDEX_ENV_VAR: '0',
-                       TOTAL_SHARDS_ENV_VAR: '10'})
-
-    def _GetXmlOutput(self, gtest_prog_name, extra_args, extra_env,
-                      expected_exit_code):
-        """
-        Returns the xml output generated by running the program gtest_prog_name.
-        Furthermore, the program's exit code must be expected_exit_code.
-        """
-        xml_path = os.path.join(gtest_test_utils.GetTempDir(),
-                                gtest_prog_name + 'out.xml')
-        gtest_prog_path = gtest_test_utils.GetTestExecutablePath(gtest_prog_name)
-
-        command = ([gtest_prog_path, '%s=xml:%s' % (GTEST_OUTPUT_FLAG, xml_path)] +
-                   extra_args)
-        environ_copy = os.environ.copy()
-        if extra_env:
-            environ_copy.update(extra_env)
-        p = gtest_test_utils.Subprocess(command, env=environ_copy)
-
-        if p.terminated_by_signal:
-            self.assert_(False,
-                         '%s was killed by signal %d' % (gtest_prog_name, p.signal))
-        else:
-            self.assert_(p.exited)
-            self.assertEquals(expected_exit_code, p.exit_code,
-                              "'%s' exited with code %s, which doesn't match "
-                              'the expected exit code %s.'
-                              % (command, p.exit_code, expected_exit_code))
-        actual = minidom.parse(xml_path)
-        return actual
-
-    def _TestXmlOutput(self, gtest_prog_name, expected_xml,
-                       expected_exit_code, extra_args=None, extra_env=None):
-        """
-        Asserts that the XML document generated by running the program
-        gtest_prog_name matches expected_xml, a string containing another
-        XML document.  Furthermore, the program's exit code must be
-        expected_exit_code.
-        """
-
-        actual = self._GetXmlOutput(gtest_prog_name, extra_args or [],
-                                    extra_env or {}, expected_exit_code)
-        expected = minidom.parseString(expected_xml)
-        self.NormalizeXml(actual.documentElement)
-        self.AssertEquivalentNodes(expected.documentElement,
-                                   actual.documentElement)
-        expected.unlink()
-        actual.unlink()
+    actual = self._GetXmlOutput(
+        gtest_prog_name, extra_args or [], extra_env or {}, expected_exit_code
+    )
+    expected = minidom.parseString(expected_xml)
+    self.NormalizeXml(actual.documentElement)
+    self.AssertEquivalentNodes(expected.documentElement, actual.documentElement)
+    expected.unlink()
+    actual.unlink()
 
 
 if __name__ == '__main__':
-    os.environ['GTEST_STACK_TRACE_DEPTH'] = '1'
-    gtest_test_utils.Main()
+  os.environ['GTEST_STACK_TRACE_DEPTH'] = '1'
+  gtest_test_utils.Main()
diff --git a/external/googletest/googletest/test/gtest_xml_output_unittest_.cc b/external/googletest/googletest/test/gtest_xml_output_unittest_.cc
index 65e66a32..fe196b63 100644
--- a/external/googletest/googletest/test/gtest_xml_output_unittest_.cc
+++ b/external/googletest/googletest/test/gtest_xml_output_unittest_.cc
@@ -35,6 +35,9 @@
 //
 // This program will be invoked from a Python unit test.  Don't run it
 // directly.
+// clang-format off
+
+#include <string>
 
 #include "gtest/gtest.h"
 
@@ -52,19 +55,26 @@ TEST_F(SuccessfulTest, Succeeds) {
   ASSERT_EQ(1, 1);
 }
 
-class FailedTest : public Test {};
+class FailedTest : public Test {
+};
 
-TEST_F(FailedTest, Fails) { ASSERT_EQ(1, 2); }
+TEST_F(FailedTest, Fails) {
+  ASSERT_EQ(1, 2);
+}
 
-class DisabledTest : public Test {};
+class DisabledTest : public Test {
+};
 
 TEST_F(DisabledTest, DISABLED_test_not_run) {
   FAIL() << "Unexpected failure: Disabled test should not be run";
 }
 
-class SkippedTest : public Test {};
+class SkippedTest : public Test {
+};
 
-TEST_F(SkippedTest, Skipped) { GTEST_SKIP(); }
+TEST_F(SkippedTest, Skipped) {
+  GTEST_SKIP();
+}
 
 TEST_F(SkippedTest, SkippedWithMessage) {
   GTEST_SKIP() << "It is good practice to tell why you skip a test.";
@@ -102,13 +112,19 @@ TEST(InvalidCharactersTest, InvalidCharactersInMessage) {
 
 class PropertyRecordingTest : public Test {
  public:
-  static void SetUpTestSuite() { RecordProperty("SetUpTestSuite", "yes"); }
+  static void SetUpTestSuite() {
+    RecordProperty("SetUpTestSuite (with whitespace)", "yes and yes");
+    RecordProperty("SetUpTestSuite", "yes");
+  }
   static void TearDownTestSuite() {
+    RecordProperty("TearDownTestSuite (with whitespace)", "aye and aye");
     RecordProperty("TearDownTestSuite", "aye");
   }
 };
 
-TEST_F(PropertyRecordingTest, OneProperty) { RecordProperty("key_1", "1"); }
+TEST_F(PropertyRecordingTest, OneProperty) {
+  RecordProperty("key_1", "1");
+}
 
 TEST_F(PropertyRecordingTest, IntValuedProperty) {
   RecordProperty("key_int", 1);
@@ -125,7 +141,9 @@ TEST_F(PropertyRecordingTest, TwoValuesForOneKeyUsesLastValue) {
   RecordProperty("key_1", "2");
 }
 
-TEST(NoFixtureTest, RecordProperty) { RecordProperty("key", "1"); }
+TEST(NoFixtureTest, RecordProperty) {
+  RecordProperty("key", "1");
+}
 
 void ExternalUtilityThatCallsRecordProperty(const std::string& key, int value) {
   testing::Test::RecordProperty(key, value);
@@ -144,6 +162,22 @@ TEST(NoFixtureTest, ExternalUtilityThatCallsRecordStringValuedProperty) {
   ExternalUtilityThatCallsRecordProperty("key_for_utility_string", "1");
 }
 
+// Ensures that SetUpTestSuite and TearDownTestSuite failures are reported in
+// the XML output.
+class SetupFailTest : public ::testing::Test {
+ protected:
+  static void SetUpTestSuite() { ASSERT_EQ(1, 2); }
+};
+
+TEST_F(SetupFailTest, NoopPassingTest) {}
+
+class TearDownFailTest : public ::testing::Test {
+ protected:
+  static void TearDownTestSuite() { ASSERT_EQ(1, 2); }
+};
+
+TEST_F(TearDownFailTest, NoopPassingTest) {}
+
 // Verifies that the test parameter value is output in the 'value_param'
 // XML attribute for value-parameterized tests.
 class ValueParamTest : public TestWithParam<int> {};
@@ -153,8 +187,7 @@ INSTANTIATE_TEST_SUITE_P(Single, ValueParamTest, Values(33, 42));
 
 // Verifies that the type parameter name is output in the 'type_param'
 // XML attribute for typed tests.
-template <typename T>
-class TypedTest : public Test {};
+template <typename T> class TypedTest : public Test {};
 typedef testing::Types<int, long> TypedTestTypes;
 TYPED_TEST_SUITE(TypedTest, TypedTestTypes);
 TYPED_TEST(TypedTest, HasTypeParamAttribute) {}
@@ -180,3 +213,5 @@ int main(int argc, char** argv) {
   testing::Test::RecordProperty("ad_hoc_property", "42");
   return RUN_ALL_TESTS();
 }
+
+// clang-format on
diff --git a/external/googletest/googletest/test/gtest_xml_test_utils.py b/external/googletest/googletest/test/gtest_xml_test_utils.py
old mode 100644
new mode 100755
index e32288a6..74e0f4a0
--- a/external/googletest/googletest/test/gtest_xml_test_utils.py
+++ b/external/googletest/googletest/test/gtest_xml_test_utils.py
@@ -31,167 +31,212 @@
 
 import re
 from xml.dom import minidom, Node
-import gtest_test_utils
+from googletest.test import gtest_test_utils
 
 GTEST_DEFAULT_OUTPUT_FILE = 'test_detail.xml'
 
 
 class GTestXMLTestCase(gtest_test_utils.TestCase):
+  """Base class for tests of Google Test's XML output functionality."""
+
+  def AssertEquivalentNodes(self, expected_node, actual_node):
+    """Asserts that actual_node is equivalent to expected_node.
+
+    Asserts that actual_node (a DOM node object) is equivalent to
+    expected_node (another DOM node object), in that either both of
+    them are CDATA nodes and have the same value, or both are DOM
+    elements and actual_node meets all of the following conditions:
+
+    *  It has the same tag name as expected_node.
+    *  It has the same set of attributes as expected_node, each with
+       the same value as the corresponding attribute of expected_node.
+       Exceptions are any attribute named "time", which needs only be
+       convertible to a floating-point number and any attribute named
+       "type_param" which only has to be non-empty.
+    *  It has an equivalent set of child nodes (including elements and
+       CDATA sections) as expected_node.  Note that we ignore the
+       order of the children as they are not guaranteed to be in any
+       particular order.
+
+    Args:
+      expected_node: expected DOM node object
+      actual_node: actual DOM node object
     """
-    Base class for tests of Google Test's XML output functionality.
+
+    if expected_node.nodeType == Node.CDATA_SECTION_NODE:
+      self.assertEqual(Node.CDATA_SECTION_NODE, actual_node.nodeType)
+      self.assertEqual(expected_node.nodeValue, actual_node.nodeValue)
+      return
+
+    self.assertEqual(Node.ELEMENT_NODE, actual_node.nodeType)
+    self.assertEqual(Node.ELEMENT_NODE, expected_node.nodeType)
+    self.assertEqual(expected_node.tagName, actual_node.tagName)
+
+    expected_attributes = expected_node.attributes
+    actual_attributes = actual_node.attributes
+    self.assertEqual(
+        expected_attributes.length,
+        actual_attributes.length,
+        'attribute numbers differ in element %s:\nExpected: %r\nActual: %r'
+        % (
+            actual_node.tagName,
+            expected_attributes.keys(),
+            actual_attributes.keys(),
+        ),
+    )
+    for i in range(expected_attributes.length):
+      expected_attr = expected_attributes.item(i)
+      actual_attr = actual_attributes.get(expected_attr.name)
+      self.assertTrue(
+          actual_attr is not None,
+          'expected attribute %s not found in element %s'
+          % (expected_attr.name, actual_node.tagName),
+      )
+      self.assertEqual(
+          expected_attr.value,
+          actual_attr.value,
+          ' values of attribute %s in element %s differ: %s vs %s'
+          % (
+              expected_attr.name,
+              actual_node.tagName,
+              expected_attr.value,
+              actual_attr.value,
+          ),
+      )
+
+    expected_children = self._GetChildren(expected_node)
+    actual_children = self._GetChildren(actual_node)
+    self.assertEqual(
+        len(expected_children),
+        len(actual_children),
+        'number of child elements differ in element ' + actual_node.tagName,
+    )
+    for child_id, child in expected_children.items():
+      self.assertTrue(
+          child_id in actual_children,
+          '<%s> is not in <%s> (in element %s)'
+          % (child_id, actual_children, actual_node.tagName),
+      )
+      self.AssertEquivalentNodes(child, actual_children[child_id])
+
+  identifying_attribute = {
+      'testsuites': 'name',
+      'testsuite': 'name',
+      'testcase': 'name',
+      'failure': 'message',
+      'skipped': 'message',
+      'property': 'name',
+  }
+
+  def _GetChildren(self, element):
+    """Fetches all of the child nodes of element, a DOM Element object.
+
+    Returns them as the values of a dictionary keyed by the IDs of the children.
+    For <testsuites>, <testsuite>, <testcase>, and <property> elements, the ID
+    is the value of their "name" attribute; for <failure> elements, it is the
+    value of the "message" attribute; for <properties> elements, it is the value
+    of their parent's "name" attribute plus the literal string "properties";
+    CDATA sections and non-whitespace text nodes are concatenated into a single
+    CDATA section with ID "detail".  An exception is raised if any element other
+    than the above four is encountered, if two child elements with the same
+    identifying attributes are encountered, or if any other type of node is
+    encountered.
+
+    Args:
+      element: DOM Element object
+
+    Returns:
+      Dictionary where keys are the IDs of the children.
+    """
+
+    children = {}
+    for child in element.childNodes:
+      if child.nodeType == Node.ELEMENT_NODE:
+        if child.tagName == 'properties':
+          self.assertTrue(
+              child.parentNode is not None,
+              'Encountered <properties> element without a parent',
+          )
+          child_id = child.parentNode.getAttribute('name') + '-properties'
+        else:
+          self.assertTrue(
+              child.tagName in self.identifying_attribute,
+              'Encountered unknown element <%s>' % child.tagName,
+          )
+          child_id = child.getAttribute(
+              self.identifying_attribute[child.tagName]
+          )
+        self.assertNotIn(child_id, children)
+        children[child_id] = child
+      elif child.nodeType in [Node.TEXT_NODE, Node.CDATA_SECTION_NODE]:
+        if 'detail' not in children:
+          if (
+              child.nodeType == Node.CDATA_SECTION_NODE
+              or not child.nodeValue.isspace()
+          ):
+            children['detail'] = child.ownerDocument.createCDATASection(
+                child.nodeValue
+            )
+        else:
+          children['detail'].nodeValue += child.nodeValue
+      else:
+        self.fail('Encountered unexpected node type %d' % child.nodeType)
+    return children
+
+  def NormalizeXml(self, element):
+    """Normalizes XML that may change from run to run.
+
+    Normalizes Google Test's XML output to eliminate references to transient
+    information that may change from run to run.
+
+    *  The "time" attribute of <testsuites>, <testsuite> and <testcase>
+       elements is replaced with a single asterisk, if it contains
+       only digit characters.
+    *  The "timestamp" attribute of <testsuites> elements is replaced with a
+       single asterisk, if it contains a valid ISO8601 datetime value.
+    *  The "type_param" attribute of <testcase> elements is replaced with a
+       single asterisk (if it sn non-empty) as it is the type name returned
+       by the compiler and is platform dependent.
+    *  The line info reported in the first line of the "message"
+       attribute and CDATA section of <failure> elements is replaced with the
+       file's basename and a single asterisk for the line number.
+    *  The directory names in file paths are removed.
+    *  The stack traces are removed.
+
+    Args:
+      element: DOM element to normalize
     """
 
-    def AssertEquivalentNodes(self, expected_node, actual_node):
-        """
-        Asserts that actual_node (a DOM node object) is equivalent to
-        expected_node (another DOM node object), in that either both of
-        them are CDATA nodes and have the same value, or both are DOM
-        elements and actual_node meets all of the following conditions:
-
-        *  It has the same tag name as expected_node.
-        *  It has the same set of attributes as expected_node, each with
-           the same value as the corresponding attribute of expected_node.
-           Exceptions are any attribute named "time", which needs only be
-           convertible to a floating-point number and any attribute named
-           "type_param" which only has to be non-empty.
-        *  It has an equivalent set of child nodes (including elements and
-           CDATA sections) as expected_node.  Note that we ignore the
-           order of the children as they are not guaranteed to be in any
-           particular order.
-        """
-
-        if expected_node.nodeType == Node.CDATA_SECTION_NODE:
-            self.assertEquals(Node.CDATA_SECTION_NODE, actual_node.nodeType)
-            self.assertEquals(expected_node.nodeValue, actual_node.nodeValue)
-            return
-
-        self.assertEquals(Node.ELEMENT_NODE, actual_node.nodeType)
-        self.assertEquals(Node.ELEMENT_NODE, expected_node.nodeType)
-        self.assertEquals(expected_node.tagName, actual_node.tagName)
-
-        expected_attributes = expected_node.attributes
-        actual_attributes = actual_node.attributes
-        self.assertEquals(
-            expected_attributes.length, actual_attributes.length,
-            'attribute numbers differ in element %s:\nExpected: %r\nActual: %r' % (
-                actual_node.tagName, expected_attributes.keys(),
-                actual_attributes.keys()))
-        for i in range(expected_attributes.length):
-            expected_attr = expected_attributes.item(i)
-            actual_attr = actual_attributes.get(expected_attr.name)
-            self.assert_(
-                actual_attr is not None,
-                'expected attribute %s not found in element %s' %
-                (expected_attr.name, actual_node.tagName))
-            self.assertEquals(
-                expected_attr.value, actual_attr.value,
-                ' values of attribute %s in element %s differ: %s vs %s' %
-                (expected_attr.name, actual_node.tagName,
-                 expected_attr.value, actual_attr.value))
-
-        expected_children = self._GetChildren(expected_node)
-        actual_children = self._GetChildren(actual_node)
-        self.assertEquals(
-            len(expected_children), len(actual_children),
-            'number of child elements differ in element ' + actual_node.tagName)
-        for child_id, child in expected_children.items():
-            self.assert_(child_id in actual_children,
-                         '<%s> is not in <%s> (in element %s)' %
-                         (child_id, actual_children, actual_node.tagName))
-            self.AssertEquivalentNodes(child, actual_children[child_id])
-
-    identifying_attribute = {
-        'testsuites': 'name',
-        'testsuite': 'name',
-        'testcase': 'name',
-        'failure': 'message',
-        'skipped': 'message',
-        'property': 'name',
-    }
-
-    def _GetChildren(self, element):
-        """
-        Fetches all of the child nodes of element, a DOM Element object.
-        Returns them as the values of a dictionary keyed by the IDs of the
-        children.  For <testsuites>, <testsuite>, <testcase>, and <property>
-        elements, the ID is the value of their "name" attribute; for <failure>
-        elements, it is the value of the "message" attribute; for <properties>
-        elements, it is the value of their parent's "name" attribute plus the
-        literal string "properties"; CDATA sections and non-whitespace
-        text nodes are concatenated into a single CDATA section with ID
-        "detail".  An exception is raised if any element other than the above
-        four is encountered, if two child elements with the same identifying
-        attributes are encountered, or if any other type of node is encountered.
-        """
-
-        children = {}
-        for child in element.childNodes:
-            if child.nodeType == Node.ELEMENT_NODE:
-                if child.tagName == 'properties':
-                    self.assert_(child.parentNode is not None,
-                                 'Encountered <properties> element without a parent')
-                    child_id = child.parentNode.getAttribute('name') + '-properties'
-                else:
-                    self.assert_(child.tagName in self.identifying_attribute,
-                                 'Encountered unknown element <%s>' % child.tagName)
-                    child_id = child.getAttribute(
-                        self.identifying_attribute[child.tagName])
-                self.assert_(child_id not in children)
-                children[child_id] = child
-            elif child.nodeType in [Node.TEXT_NODE, Node.CDATA_SECTION_NODE]:
-                if 'detail' not in children:
-                    if (child.nodeType == Node.CDATA_SECTION_NODE or
-                            not child.nodeValue.isspace()):
-                        children['detail'] = child.ownerDocument.createCDATASection(
-                            child.nodeValue)
-                else:
-                    children['detail'].nodeValue += child.nodeValue
-            else:
-                self.fail('Encountered unexpected node type %d' % child.nodeType)
-        return children
-
-    def NormalizeXml(self, element):
-        """
-        Normalizes Google Test's XML output to eliminate references to transient
-        information that may change from run to run.
-
-        *  The "time" attribute of <testsuites>, <testsuite> and <testcase>
-           elements is replaced with a single asterisk, if it contains
-           only digit characters.
-        *  The "timestamp" attribute of <testsuites> elements is replaced with a
-           single asterisk, if it contains a valid ISO8601 datetime value.
-        *  The "type_param" attribute of <testcase> elements is replaced with a
-           single asterisk (if it sn non-empty) as it is the type name returned
-           by the compiler and is platform dependent.
-        *  The line info reported in the first line of the "message"
-           attribute and CDATA section of <failure> elements is replaced with the
-           file's basename and a single asterisk for the line number.
-        *  The directory names in file paths are removed.
-        *  The stack traces are removed.
-        """
-
-        if element.tagName in ('testsuites', 'testsuite', 'testcase'):
-            timestamp = element.getAttributeNode('timestamp')
-            timestamp.value = re.sub(r'^\d{4}-\d\d-\d\dT\d\d:\d\d:\d\d\.\d\d\d$',
-                                     '*', timestamp.value)
-        if element.tagName in ('testsuites', 'testsuite', 'testcase'):
-            time = element.getAttributeNode('time')
-            time.value = re.sub(r'^\d+(\.\d+)?$', '*', time.value)
-            type_param = element.getAttributeNode('type_param')
-            if type_param and type_param.value:
-                type_param.value = '*'
-        elif element.tagName == 'failure' or element.tagName == 'skipped':
-            source_line_pat = r'^.*[/\\](.*:)\d+\n'
-            # Replaces the source line information with a normalized form.
-            message = element.getAttributeNode('message')
-            message.value = re.sub(source_line_pat, '\\1*\n', message.value)
-            for child in element.childNodes:
-                if child.nodeType == Node.CDATA_SECTION_NODE:
-                    # Replaces the source line information with a normalized form.
-                    cdata = re.sub(source_line_pat, '\\1*\n', child.nodeValue)
-                    # Removes the actual stack trace.
-                    child.nodeValue = re.sub(r'Stack trace:\n(.|\n)*',
-                                             'Stack trace:\n*', cdata)
-        for child in element.childNodes:
-            if child.nodeType == Node.ELEMENT_NODE:
-                self.NormalizeXml(child)
+    if element.tagName == 'testcase':
+      source_file = element.getAttributeNode('file')
+      if source_file:
+        source_file.value = re.sub(r'^.*[/\\](.*)', '\\1', source_file.value)
+    if element.tagName in ('testsuites', 'testsuite', 'testcase'):
+      timestamp = element.getAttributeNode('timestamp')
+      timestamp.value = re.sub(
+          r'^\d{4}-\d\d-\d\dT\d\d:\d\d:\d\d\.\d\d\d$', '*', timestamp.value
+      )
+    if element.tagName in ('testsuites', 'testsuite', 'testcase'):
+      time = element.getAttributeNode('time')
+      # The value for exact N seconds has a trailing decimal point (e.g., "10."
+      # instead of "10")
+      time.value = re.sub(r'^\d+\.(\d+)?$', '*', time.value)
+      type_param = element.getAttributeNode('type_param')
+      if type_param and type_param.value:
+        type_param.value = '*'
+    elif element.tagName == 'failure' or element.tagName == 'skipped':
+      source_line_pat = r'^.*[/\\](.*:)\d+\n'
+      # Replaces the source line information with a normalized form.
+      message = element.getAttributeNode('message')
+      message.value = re.sub(source_line_pat, '\\1*\n', message.value)
+      for child in element.childNodes:
+        if child.nodeType == Node.CDATA_SECTION_NODE:
+          # Replaces the source line information with a normalized form.
+          cdata = re.sub(source_line_pat, '\\1*\n', child.nodeValue)
+          # Removes the actual stack trace.
+          child.nodeValue = re.sub(
+              r'Stack trace:\n(.|\n)*', 'Stack trace:\n*', cdata
+          )
+    for child in element.childNodes:
+      if child.nodeType == Node.ELEMENT_NODE:
+        self.NormalizeXml(child)
diff --git a/external/googletest/googletest_deps.bzl b/external/googletest/googletest_deps.bzl
new file mode 100644
index 00000000..cadc244e
--- /dev/null
+++ b/external/googletest/googletest_deps.bzl
@@ -0,0 +1,28 @@
+"""Load dependencies needed to use the googletest library as a 3rd-party consumer."""
+
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+load("//:fake_fuchsia_sdk.bzl", "fake_fuchsia_sdk")
+
+def googletest_deps():
+    """Loads common dependencies needed to use the googletest library."""
+
+    if not native.existing_rule("re2"):
+        http_archive(
+            name = "re2",
+            sha256 = "eb2df807c781601c14a260a507a5bb4509be1ee626024cb45acbd57cb9d4032b",
+            strip_prefix = "re2-2024-07-02",
+            urls = ["https://github.com/google/re2/releases/download/2024-07-02/re2-2024-07-02.tar.gz"],
+        )
+
+    if not native.existing_rule("abseil-cpp"):
+        http_archive(
+            name = "abseil-cpp",
+            sha256 = "b396401fd29e2e679cace77867481d388c807671dc2acc602a0259eeb79b7811",
+            strip_prefix = "abseil-cpp-20250127.1",
+            urls = ["https://github.com/abseil/abseil-cpp/releases/download/20250127.1/abseil-cpp-20250127.1.tar.gz"],
+        )
+
+    if not native.existing_rule("fuchsia_sdk"):
+        fake_fuchsia_sdk(
+            name = "fuchsia_sdk",
+        )
diff --git a/external/googletest/library.json b/external/googletest/library.json
deleted file mode 100644
index e20161fc..00000000
--- a/external/googletest/library.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "name": "googletest",
-  "keywords": "unittest, unit, test, gtest, gmock",
-  "description": "googletest is a testing framework developed by the Testing Technology team with Google's specific requirements and constraints in mind. No matter whether you work on Linux, Windows, or a Mac, if you write C++ code, googletest can help you. And it supports any kind of tests, not just unit tests.",
-  "license": "BSD-3-Clause",
-  "homepage": "https://github.com/google/googletest/blob/master/README.md",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/google/googletest.git"
-  },
-  "version": "1.10.0",
-  "frameworks": "arduino",
-  "platforms": [
-    "espressif32",
-    "espressif8266"
-  ],
-  "export": {
-    "include": [
-      "googlemock/include/*",
-      "googlemock/src/*",
-      "googletest/include/*",
-      "googletest/src/*"
-    ],
-    "exclude": [
-      "ci",
-      "googlemock/cmake",
-      "googlemock/scripts",
-      "googlemock/test",
-      "googlemock/CMakeLists.txt",
-      "googletest/cmake",
-      "googletest/scripts",
-      "googletest/test",
-      "googletest/CMakeLists.txt"
-    ]
-  },
-  "build": {
-    "flags": [
-      "-Igooglemock/include",
-      "-Igooglemock",
-      "-Igoogletest/include",
-      "-Igoogletest"
-    ],
-    "srcFilter": [
-      "+<*>",
-      "-<.git/>",
-      "-<googlemock>",
-      "-<googlemock/test/>",
-      "-<googlemock/src>",
-      "+<googlemock/src/gmock-all.cc>",
-      "+<googletest/src/gtest-all.cc>",
-      "+<googlemock/src/gmock_main.cc>",
-      "-<googletest>",
-      "-<googletest/codegear/>",
-      "-<googletest/samples>",
-      "-<googletest/test/>",
-      "-<googletest/xcode>",
-      "-<googletest/src>",
-      "+<googletest/src/gtest-all.cc>",
-      "+<googletest/src/gtest_main.cc>"
-    ]
-  }
-}
diff --git a/external/tbb/CMakeLists.txt b/external/tbb/CMakeLists.txt
index 75ed10eb..348e7356 100644
--- a/external/tbb/CMakeLists.txt
+++ b/external/tbb/CMakeLists.txt
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.1...3.28)
 
 # Enable CMake policies
 
diff --git a/external/tecio/teciompisrc/CMakeLists.txt b/external/tecio/teciompisrc/CMakeLists.txt
index 17c9edec..775e4dbe 100644
--- a/external/tecio/teciompisrc/CMakeLists.txt
+++ b/external/tecio/teciompisrc/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.12) # requiring 2.8.12 sets the CMP0022 policy to new (non-transitive linking, i.e. just the interfaces) by default
+cmake_minimum_required(VERSION 2.8.12...3.28) # requiring 2.8.12 sets the CMP0022 policy to new (non-transitive linking, i.e. just the interfaces) by default
 
 if (NOT CMAKE_BUILD_TYPE)
     set (CMAKE_BUILD_TYPE Release CACHE STRING "CMake build type (Debug|Release)" FORCE)
diff --git a/external/tecio/teciosrc/CMakeLists.txt b/external/tecio/teciosrc/CMakeLists.txt
index 0cd76192..60228e6f 100644
--- a/external/tecio/teciosrc/CMakeLists.txt
+++ b/external/tecio/teciosrc/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.12) # requiring 2.8.12 sets the CMP0022 policy to new (non-transitive linking, i.e. just the interfaces) by default
+cmake_minimum_required(VERSION 2.8.12...3.28) # requiring 2.8.12 sets the CMP0022 policy to new (non-transitive linking, i.e. just the interfaces) by default
 
 if (NOT CMAKE_BUILD_TYPE)
     set (CMAKE_BUILD_TYPE Release CACHE STRING "CMake build type (Debug|Release)" FORCE)

From f4ae8147dfaae4163e6ae2559278d276be679b15 Mon Sep 17 00:00:00 2001
From: Luohao Wang <luohaothu@live.com>
Date: Mon, 2 Jun 2025 13:06:01 +0800
Subject: [PATCH 08/31] [Core] Update the cmake version to 4.0.2

---
 CMakeLists.txt | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8f3f5189..823574dc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,13 @@
 #
 # ----------------------------------------------------------------------------
 
-cmake_minimum_required(VERSION 3.13)
+cmake_minimum_required(VERSION 4.0.2 FATAL_ERROR)
+# The specific value used for CMake==4.0.2
+set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
+  # This specific value changes as experimental support evolves. See
+  # `Help/dev/experimental.rst` in the CMake source corresponding to
+  # your CMake build for the exact value to use.
+  "a9e1cf81-9932-4810-974b-6eccaf14e457")
 
 # ----------------------------------------------------------------------------
 # Start opflow project
@@ -33,6 +39,11 @@ project(opflow VERSION ${OPFLOW_VERSION} LANGUAGES C CXX)
 set(OPFLOW_VERSION_STRING "${OPFLOW_VERSION} - ${SHORT_SHA1} - ${GIT_CHANGE}")
 message(STATUS "Build opflow: ${OPFLOW_VERSION_STRING}")
 
+set(CMAKE_EXPERIMENTAL_EXPORT_BUILD_DATABASE 4bd552e2-b7fb-429a-ab23-c83ef53f3f13)
+set(CMAKE_EXPORT_BUILD_DATABASE 1)
+
+set(CMAKE_CXX_MODULE_STD 1)
+
 include(GNUInstallDirs)
 
 # ----------------------------------------------------------------------------
@@ -61,6 +72,15 @@ elseif(CMAKE_C_STANDARD LESS 11)
     set(CMAKE_C_STANDARD_REQUIRED ON)
 endif()
 
+if(NOT CMAKE_CXX_STANDARD)
+    set(CMAKE_CXX_STANDARD 23)
+    set(CMAKE_CXX_STANDARD_REQUIRED ON)
+elseif(CMAKE_CXX_STANDARD LESS 23)
+    message(WARNING "OpFlow needs C++23 to compile. Changing the standard to C++23.")
+    set(CMAKE_CXX_STANDARD 23)
+    set(CMAKE_CXX_STANDARD_REQUIRED ON)
+endif()
+
 # make sure __cplusplus is defined when using msvc
 if(MSVC)
     string(APPEND CMAKE_CXX_FLAGS " /Zc:__cplusplus /wd4267 /wd4390 /wd4244")
@@ -136,6 +156,7 @@ option(OPFLOW_SANITIZE_UB "Enable undefined behavior sanitizer in tests" OFF)
 # compile options
 option(OPFLOW_BUILD_WARNINGS "Enable compiler warnings" OFF)
 option(OPFLOW_NO_EXCEPTIONS "Compile with -fno-exceptions" OFF)
+option(OPFLOW_ENABLE_MODULE "Enable C++ modules support" OFF)
 
 # install options
 option(OPFLOW_INSTALL "Generate the install target" ${OPFLOW_MASTER_PROJECT})
@@ -156,15 +177,6 @@ if(OPFLOW_TIDY)
     message(STATUS "Enabled clang-tidy")
 endif()
 
-# ----------------------------------------------------------------------------
-# Compile options
-# ----------------------------------------------------------------------------
-include(CheckCXXCompilerFlag)
-check_cxx_compiler_flag(-std=c++26 c++26support)
-if(NOT c++26support)
-    message(FATAL_ERROR "OpFlow requires C++26 to compile.")
-endif()
-
 message(STATUS "Build type: " ${CMAKE_BUILD_TYPE})
 add_subdirectory(src)
 

From 0c07aadd90d29f40e956246362961f7dc8dcd3df Mon Sep 17 00:00:00 2001
From: Luohao Wang <luohaothu@live.com>
Date: Thu, 5 Jun 2025 17:03:06 +0800
Subject: [PATCH 09/31] [Core] Add macro guard for module

---
 CMakeLists.txt                                |  59 +--------
 cmake/Version.hpp.in                          |   2 +
 external/CMakeLists.txt                       | 120 +++++++++---------
 src/CMakeLists.txt                            |  54 ++++++--
 src/Core/AMR/AMRGen.hpp                       |   6 +-
 src/Core/BC/BCBase.hpp                        |   2 +
 src/Core/BC/DircBC.hpp                        |  10 +-
 src/Core/BC/InternalBC.hpp                    |   2 +
 src/Core/BC/NeumBC.hpp                        |  10 +-
 src/Core/BasicDataTypes.hpp                   |   2 +
 src/Core/Environment.hpp                      |   4 +-
 src/Core/Equation/AMGCLBackend.hpp            |   8 +-
 src/Core/Equation/AMGCLEqnSolveHandler.hpp    |  14 +-
 src/Core/Equation/CSRMatrixGenerator.hpp      |   2 +
 src/Core/Equation/Equation.hpp                |   2 +
 src/Core/Equation/EquationHolder.hpp          |   2 +
 src/Core/Equation/HYPREEqnSolveHandler.hpp    |  12 +-
 src/Core/Equation/UnifiedSolve.hpp            |   2 +-
 src/Core/Expr/Expr.hpp                        |  68 ++++++----
 src/Core/Expr/ExprTrait.hpp                   |   6 +-
 src/Core/Expr/ScalarExpr.hpp                  |   5 +-
 .../SemiStructured/CartAMRFieldExpr.hpp       |   2 +
 .../SemiStructuredFieldExpr.hpp               |   2 +
 src/Core/Field/MeshBased/StencilField.hpp     |  29 +++--
 .../MeshBased/Structured/CartesianField.hpp   |  30 ++---
 .../Structured/StructuredFieldExpr.hpp        |   2 +
 src/Core/Interfaces/MDIndexable.hpp           |   2 +
 src/Core/Interfaces/Serializable.hpp          |   9 +-
 src/Core/Interfaces/Stringifiable.hpp         |  20 +--
 src/Core/Loops/RangeFor.hpp                   |   8 +-
 src/Core/Loops/StructReduce.hpp               |   2 +
 src/Core/Macros.hpp                           |  30 +++--
 src/Core/Mesh/MeshTrait.hpp                   |   2 +
 .../Mesh/SemiStructured/CartesianAMRMesh.hpp  |  12 +-
 .../SemiStructured/CartesianAMRMeshView.hpp   |   7 +-
 src/Core/Mesh/Structured/CartesianMesh.hpp    |   6 +-
 .../Mesh/Structured/CartesianMeshBase.hpp     |  18 +--
 .../Mesh/Structured/CartesianMeshView.hpp     |   6 +-
 .../Mesh/Structured/StructuredMeshTrait.hpp   |   2 +
 src/Core/Meta.hpp                             |  20 ++-
 src/Core/Operator/Arithmetic/AMDS.hpp         |   2 +
 src/Core/Operator/Arithmetic/MinMax.hpp       |   2 +
 src/Core/Operator/Conditional.hpp             |  16 +--
 src/Core/Operator/Convolution/Convolution.hpp |  27 ++--
 .../D1FirstOrderBiasedDownwind.hpp            |   4 +-
 .../FDMOperators/D1FirstOrderBiasedUpwind.hpp |   4 +-
 .../FDMOperators/D1FirstOrderCentered.hpp     |   2 +-
 .../FDMOperators/D1WENO53Downwind.hpp         |   4 +-
 .../Operator/FDMOperators/D1WENO53Upwind.hpp  |   4 +-
 .../FDMOperators/D2SecondOrderCentered.hpp    |   4 +-
 src/Core/Operator/IdentityOp.hpp              |   5 +-
 .../Operator/Interpolator/D1FluxLimiter.hpp   |  21 ++-
 src/Core/Operator/Interpolator/D1Linear.hpp   |   4 +-
 .../Interpolator/FluxLimiterKernels.hpp       |   2 +
 src/Core/Operator/Logical/Classify.hpp        |   2 +
 src/Core/Operator/Logical/Compare.hpp         |   2 +
 src/Core/Operator/PerElemOpAdaptor.hpp        |   4 +-
 src/Core/Parallel/AbstractSplitStrategy.hpp   |   2 +
 src/Core/Parallel/EvenSplitStrategy.hpp       |   4 +
 src/Core/Parallel/ManualSplitStrategy.hpp     |   4 +
 src/Core/Parallel/ParallelInfo.hpp            |   6 +
 .../Parallel/ParticleGuidedSplitStrategy.hpp  |   4 +
 src/Core/Solvers/IJ/IJSolver.hpp              |  10 ++
 .../Solvers/SemiStruct/SemiStructSolver.hpp   |   4 +
 src/Core/Solvers/Struct/StructSolver.hpp      |   2 +
 src/Core/Solvers/Struct/StructSolverPFMG.hpp  |   2 +
 src/DataStructures/Arrays/Arrays.hpp          |   2 +
 src/DataStructures/Arrays/CoordVector.hpp     |   2 +
 src/DataStructures/Arrays/OffsetVector.hpp    |   6 +-
 .../Arrays/Tensor/FixedSizeTensor.hpp         |  15 ++-
 .../Arrays/Tensor/PlainTensor.hpp             |  23 ++--
 .../Arrays/Tensor/TensorTrait.hpp             |   2 +
 src/DataStructures/Geometry/2DGeometry.hpp    |   2 +
 src/DataStructures/Geometry/3DGeometry.hpp    |   2 +
 src/DataStructures/Geometry/BasicElements.hpp |   9 +-
 src/DataStructures/Index/ColoredIndex.hpp     |  28 ++--
 src/DataStructures/Index/LevelMDIndex.hpp     |   8 +-
 .../LinearMapper/BlockedMDRangeMapper.hpp     |   2 +
 .../GeneralBlockedMDRangeMapper.hpp           |   2 +
 .../Index/LinearMapper/LevelMDRangeMapper.hpp |   2 +
 src/DataStructures/Index/MDIndex.hpp          |  16 +--
 src/DataStructures/Matrix/CSRMatrix.hpp       |  22 ++--
 src/DataStructures/Range/LevelRanges.hpp      |   4 +-
 src/DataStructures/Range/Ranges.hpp           |   9 +-
 src/DataStructures/StencilPad.hpp             |   6 +-
 src/Math/Function/Numeric.hpp                 |   2 +
 src/Utils/Allocator/AlignedAllocator.hpp      |   2 +
 src/Utils/Allocator/StaticAllocator.hpp       |   5 +-
 src/Utils/Allocator/VirtualMemAllocator.hpp   |   2 +
 src/Utils/ConstexprString.hpp                 |   5 +-
 src/Utils/NamedFunctor.hpp                    |  11 +-
 src/Utils/RandomStringGenerator.hpp           |   2 +
 src/Utils/Serializer/EnumTypes.hpp            |   2 +
 src/Utils/Serializer/STDContainers.hpp        |  22 ++--
 src/Utils/StackTracer.hpp                     |   8 +-
 src/Utils/Writers/FieldWriter.hpp             |   2 +
 src/Utils/Writers/HDF5Stream.hpp              |  22 ++--
 src/Utils/Writers/IOGroup.hpp                 |   5 +-
 src/Utils/Writers/RawBinaryStream.hpp         |  12 +-
 src/Utils/Writers/StreamTrait.hpp             |   6 +-
 src/Utils/Writers/Streams.hpp                 |   2 +
 src/Utils/Writers/TecplotASCIIStream.hpp      |  56 ++++----
 src/Utils/Writers/TecplotBinaryStream.hpp     |  24 ++--
 src/Utils/Writers/TecplotSZPLTStream.hpp      |  24 ++--
 src/Utils/Writers/VTKAMRStream.hpp            |   8 +-
 src/opflow.cppm                               |  14 ++
 106 files changed, 685 insertions(+), 461 deletions(-)
 create mode 100644 src/opflow.cppm

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 823574dc..6b8d808b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,10 +17,10 @@
 cmake_minimum_required(VERSION 4.0.2 FATAL_ERROR)
 # The specific value used for CMake==4.0.2
 set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
-  # This specific value changes as experimental support evolves. See
-  # `Help/dev/experimental.rst` in the CMake source corresponding to
-  # your CMake build for the exact value to use.
-  "a9e1cf81-9932-4810-974b-6eccaf14e457")
+    # This specific value changes as experimental support evolves. See
+    # `Help/dev/experimental.rst` in the CMake source corresponding to
+    # your CMake build for the exact value to use.
+    "a9e1cf81-9932-4810-974b-6eccaf14e457")
 
 # ----------------------------------------------------------------------------
 # Start opflow project
@@ -63,24 +63,6 @@ endif()
 # ----------------------------------------------------------------------------
 # Compiler config
 # ----------------------------------------------------------------------------
-if(NOT CMAKE_C_STANDARD)
-    set(CMAKE_C_STANDARD 11)
-    set(CMAKE_C_STANDARD_REQUIRED ON)
-elseif(CMAKE_C_STANDARD LESS 11)
-    message(WARNING "OpFlow needs C11 to compile. Changing the standard to C11.")
-    set(CMAKE_C_STANDARD 11)
-    set(CMAKE_C_STANDARD_REQUIRED ON)
-endif()
-
-if(NOT CMAKE_CXX_STANDARD)
-    set(CMAKE_CXX_STANDARD 23)
-    set(CMAKE_CXX_STANDARD_REQUIRED ON)
-elseif(CMAKE_CXX_STANDARD LESS 23)
-    message(WARNING "OpFlow needs C++23 to compile. Changing the standard to C++23.")
-    set(CMAKE_CXX_STANDARD 23)
-    set(CMAKE_CXX_STANDARD_REQUIRED ON)
-endif()
-
 # make sure __cplusplus is defined when using msvc
 if(MSVC)
     string(APPEND CMAKE_CXX_FLAGS " /Zc:__cplusplus /wd4267 /wd4390 /wd4244")
@@ -109,18 +91,6 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     #set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++ -lc++abi")
 endif()
 
-# ----------------------------------------------------------------------------
-# Set OPFLOW_MASTER_PROJECT to ON if we are building opflow
-# ----------------------------------------------------------------------------
-# Check if opflow is being used directly or via add_subdirectory, but allow overriding
-if(NOT DEFINED OPFLOW_MASTER_PROJECT)
-    if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
-        set(OPFLOW_MASTER_PROJECT ON)
-    else()
-        set(OPFLOW_MASTER_PROJECT OFF)
-    endif()
-endif()
-
 option(OPFLOW_BUILD_ALL "Build all artifacts" OFF)
 
 # example options
@@ -159,7 +129,7 @@ option(OPFLOW_NO_EXCEPTIONS "Compile with -fno-exceptions" OFF)
 option(OPFLOW_ENABLE_MODULE "Enable C++ modules support" OFF)
 
 # install options
-option(OPFLOW_INSTALL "Generate the install target" ${OPFLOW_MASTER_PROJECT})
+option(OPFLOW_INSTALL "Generate the install target" ${PROJECT_IS_TOP_LEVEL})
 # the default behavior is to use bundled HYPRE, VTK & TBB
 option(OPFLOW_WITH_VTK "Build OpFlow with VTK" OFF)
 option(OPFLOW_HYPRE_EXTERNAL "Use external HYPRE library instead of bundled" OFF)
@@ -368,35 +338,16 @@ if(OPFLOW_INSTALL)
     ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
     set(project_config_in "${CMAKE_CURRENT_LIST_DIR}/cmake/opflowConfig.cmake.in")
     set(project_config_out "${CMAKE_CURRENT_BINARY_DIR}/opflowConfig.cmake")
-    set(config_targets_file "opflowConfigTargets.cmake")
     set(version_config_file "${CMAKE_CURRENT_BINARY_DIR}/opflowConfigVersion.cmake")
     set(export_dest_dir "${CMAKE_INSTALL_LIBDIR}/cmake/opflow")
     set(pkgconfig_install_dir "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
     set(pkg_config "${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc")
 
-    # ----------------------------------------------------------------------------
-    # Include files
-    # ----------------------------------------------------------------------------
-    install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/include/ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
-    install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/src/ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/src")
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Version.hpp DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
-    install(
-        TARGETS opflow
-        EXPORT opflow
-        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-
     if(OPFLOW_WITH_VTK AND NOT OPFLOW_VTK_EXTERNAL)
         install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/vtk/
             DESTINATION "${CMAKE_INSTALL_PREFIX}")
     endif()
 
-    # ----------------------------------------------------------------------------
-    # Install CMake config files
-    # ----------------------------------------------------------------------------
-    install(EXPORT opflow DESTINATION ${export_dest_dir} NAMESPACE opflow:: FILE ${config_targets_file})
-
     include(CMakePackageConfigHelpers)
     configure_file("${project_config_in}" "${project_config_out}" @ONLY)
 
diff --git a/cmake/Version.hpp.in b/cmake/Version.hpp.in
index d1b122fb..41ec56a2 100644
--- a/cmake/Version.hpp.in
+++ b/cmake/Version.hpp.in
@@ -1,4 +1,6 @@
+#ifndef OPFLOW_INSIDE_MODULE
 #include <string_view>
+#endif
 
 namespace OpFlow::internal {
     inline constexpr static auto OPFLOW_VERSION_STRING = std::string_view {"@OPFLOW_VERSION_STRING@"};
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index 7c43cc4b..6aa09b1d 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -3,115 +3,115 @@
 # ----------------------------------------------------------------------------
 
 # Use spdlog package
-if (OPFLOW_INSTALL)
+if(OPFLOW_INSTALL)
     # Same as libfmt
     include(${CMAKE_SOURCE_DIR}/cmake/SPDLOGConfig.cmake)
     CONFIG_AND_INSTALL_SPDLOG()
     find_package(spdlog REQUIRED PATHS ${CMAKE_INSTALL_PREFIX} NO_DEFAULT_PATH)
-else ()
+else()
     add_subdirectory(${CMAKE_SOURCE_DIR}/external/spdlog EXCLUDE_FROM_ALL)
-endif ()
-target_link_libraries(opflow INTERFACE spdlog::spdlog)
+endif()
+target_link_libraries(opflow PUBLIC spdlog::spdlog)
 
 # Use AMGCL
-if (OPFLOW_INSTALL)
+if(OPFLOW_INSTALL)
     include(${CMAKE_SOURCE_DIR}/cmake/AMGCLConfig.cmake)
     CONFIG_AND_INSTALL_AMGCL()
     find_package(amgcl REQUIRED PATHS ${CMAKE_INSTALL_PREFIX} NO_DEFAULT_PATH)
-else ()
+else()
     add_subdirectory(${CMAKE_SOURCE_DIR}/external/amgcl EXCLUDE_FROM_ALL)
-endif ()
-target_link_libraries(opflow INTERFACE amgcl::amgcl)
+endif()
+target_link_libraries(opflow PUBLIC amgcl::amgcl)
 
 # Use TBB
-if (OPFLOW_TBB_EXTERNAL)
-    if (NOT DEFINED TBB_DIR)
+if(OPFLOW_TBB_EXTERNAL)
+    if(NOT DEFINED TBB_DIR)
         message(FATAL "Variable TBB_DIR not defined. Use -DTBB_DIR to specify TBB's install path.")
-    endif ()
+    endif()
     find_package(TBB REQUIRED PATHS ${TBB_DIR} NO_DEFAULT_PATH)
-else ()
-    if (OPFLOW_INSTALL)
+else()
+    if(OPFLOW_INSTALL)
         include(${CMAKE_SOURCE_DIR}/cmake/TBBConfig.cmake)
         CONFIG_AND_INSTALL_TBB()
         find_package(tbb NAMES tbb TBB REQUIRED PATHS ${CMAKE_INSTALL_PREFIX} NO_DEFAULT_PATH)
-    else ()
+    else()
         set(BUILD_SHARED_LIBS ON)
         set(TBB_TEST OFF)
         set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
         add_subdirectory(${CMAKE_SOURCE_DIR}/external/tbb EXCLUDE_FROM_ALL)
         find_package(tbb NAMES tbb TBB REQUIRED)
-    endif ()
-endif ()
-target_link_libraries(opflow INTERFACE TBB::tbb)
+    endif()
+endif()
+target_link_libraries(opflow PUBLIC TBB::tbb)
 
 # Use HYPRE package
-if (OPFLOW_HYPRE_EXTERNAL)
-    if (NOT DEFINED HYPRE_DIR)
+if(OPFLOW_HYPRE_EXTERNAL)
+    if(NOT DEFINED HYPRE_DIR)
         message(FATAL "Variable HYPRE_DIR not set. Use -DHYPRE_DIR to specify HYPRE's install path")
-    endif ()
+    endif()
     # Use external HYPRE
     find_package(HYPRE REQUIRED PATHS ${HYPRE_DIR} NO_DEFAULT_PATH)
     # Here we hard link to the found HYPRE to avoid find again at client
-    target_link_libraries(opflow INTERFACE HYPRE)
-else ()
+    target_link_libraries(opflow PUBLIC HYPRE)
+else()
     # Use bundled HYPRE
-    if (OPFLOW_INSTALL)
+    if(OPFLOW_INSTALL)
         include(${CMAKE_SOURCE_DIR}/cmake/HYPREConfig.cmake)
         CONFIG_AND_INSTALL_HYPRE()
         find_package(HYPRE REQUIRED PATHS ${CMAKE_INSTALL_PREFIX} NO_DEFAULT_PATH)
         # HYPRE::HYPRE is only exported on install
-        target_link_libraries(opflow INTERFACE HYPRE::HYPRE)
-    else ()
+        target_link_libraries(opflow PUBLIC HYPRE::HYPRE)
+    else()
         set(HYPRE_BUILD_TYPE Debug)
         set(HYPRE_WITH_OPENMP ${OPFLOW_WITH_OPENMP})
         set(HYPRE_ENABLE_SINGLE ${OPFLOW_SINGLE_PRECISION})
         set(HYPRE_WITH_MPI ${OPFLOW_WITH_MPI})
         add_subdirectory(${CMAKE_SOURCE_DIR}/external/hypre/src EXCLUDE_FROM_ALL)
-        target_link_libraries(opflow INTERFACE HYPRE)
-    endif ()
-endif ()
+        target_link_libraries(opflow PUBLIC HYPRE)
+    endif()
+endif()
 
 # Use VTK package
-if (OPFLOW_WITH_VTK)
-    target_compile_definitions(opflow INTERFACE OPFLOW_WITH_VTK)
-    if (OPFLOW_VTK_EXTERNAL)
-        if (NOT TARGET VTK)
-            if (NOT DEFINED VTK_DIR)
+if(OPFLOW_WITH_VTK)
+    target_compile_definitions(opflow PUBLIC OPFLOW_WITH_VTK)
+    if(OPFLOW_VTK_EXTERNAL)
+        if(NOT TARGET VTK)
+            if(NOT DEFINED VTK_DIR)
                 message(FATAL "Variable VTK_DIR not defined. Use -DVTK_DIR to specify VTK's install path")
-            endif ()
+            endif()
             find_package(VTK REQUIRED PATHS ${VTK_DIR} NO_DEFAULT_PATH)
-            target_compile_definitions(opflow INTERFACE OPFLOW_VTK_EXTERNAL)
-        endif ()
-    else ()
+            target_compile_definitions(opflow PUBLIC OPFLOW_VTK_EXTERNAL)
+        endif()
+    else()
         include(${CMAKE_SOURCE_DIR}/cmake/VTKConfig.cmake)
         CONFIG_VTK()
-    endif ()
+    endif()
     list(APPEND PKG_CONFIG_REQUIRES VTK)
-    target_include_directories(opflow INTERFACE ${VTK_INCLUDE_DIRS})
-    target_link_directories(opflow INTERFACE ${VTK_LIBRARY_DIRS})
-    target_link_libraries(opflow INTERFACE ${VTK_LIBRARIES})
-endif ()
+    target_include_directories(opflow PUBLIC ${VTK_INCLUDE_DIRS})
+    target_link_directories(opflow PUBLIC ${VTK_LIBRARY_DIRS})
+    target_link_libraries(opflow PUBLIC ${VTK_LIBRARIES})
+endif()
 
 # Use TecIO library
-if (OPFLOW_INSTALL)
+if(OPFLOW_INSTALL)
     include(${CMAKE_SOURCE_DIR}/cmake/TECIOConfig.cmake)
     CONFIG_AND_INSTALL_TECIO()
-    target_include_directories(opflow INTERFACE ${CMAKE_INSTALL_PREFIX}/include/tecio)
-    target_link_directories(opflow INTERFACE ${CMAKE_INSTALL_PREFIX}/lib)
-    if (OPFLOW_WITH_MPI)
-        target_link_libraries(opflow INTERFACE teciompi)
-        target_compile_definitions(opflow INTERFACE TECIOMPI)
-    else ()
-        target_link_libraries(opflow INTERFACE tecio)
-    endif ()
-else ()
-    if (OPFLOW_WITH_MPI)
+    target_include_directories(opflow PUBLIC ${CMAKE_INSTALL_PREFIX}/include/tecio)
+    target_link_directories(opflow PUBLIC ${CMAKE_INSTALL_PREFIX}/lib)
+    if(OPFLOW_WITH_MPI)
+        target_link_libraries(opflow PUBLIC teciompi)
+        target_compile_definitions(opflow PUBLIC TECIOMPI)
+    else()
+        target_link_libraries(opflow PUBLIC tecio)
+    endif()
+else()
+    if(OPFLOW_WITH_MPI)
         add_subdirectory(${CMAKE_SOURCE_DIR}/external/tecio/teciompisrc EXCLUDE_FROM_ALL)
-        target_include_directories(opflow INTERFACE ${CMAKE_SOURCE_DIR}/external/tecio/teciompisrc)
-        target_link_libraries(opflow INTERFACE teciompi)
-    else ()
+        target_include_directories(opflow PUBLIC ${CMAKE_SOURCE_DIR}/external/tecio/teciompisrc)
+        target_link_libraries(opflow PUBLIC teciompi)
+    else()
         add_subdirectory(${CMAKE_SOURCE_DIR}/external/tecio/teciosrc EXCLUDE_FROM_ALL)
-        include_directories(${CMAKE_SOURCE_DIR}/external/tecio/teciosrc)
-        target_link_libraries(opflow INTERFACE tecio)
-    endif ()
-endif ()
+        target_include_directories(opflow PUBLIC ${CMAKE_SOURCE_DIR}/external/tecio/teciosrc)
+        target_link_libraries(opflow PUBLIC tecio)
+    endif()
+endif()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6c45b1fa..f511c787 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,19 +3,57 @@
 # ----------------------------------------------------------------------------
 cmake_minimum_required(VERSION 3.16)
 
-# ----------------------------------------------------------------------------
-# Header only version
-# ----------------------------------------------------------------------------
-add_library(opflow INTERFACE)
-add_library(opflow::opflow ALIAS opflow)
+file(GLOB_RECURSE OPFLOW_HEADERS
+    ${CMAKE_SOURCE_DIR}/src/*.hpp)
+list(APPEND OPFLOW_HEADERS
+    ${CMAKE_SOURCE_DIR}/include/Core
+    ${CMAKE_SOURCE_DIR}/include/Math
+    ${CMAKE_SOURCE_DIR}/include/DS
+    ${CMAKE_SOURCE_DIR}/include/Utils
+    ${CMAKE_SOURCE_DIR}/include/Version
+    ${CMAKE_SOURCE_DIR}/include/OpFlow)
 
-target_compile_options(opflow INTERFACE -std=c++26)
-set_property(TARGET opflow PROPERTY CXX_SCAN_FOR_MODULES ON)
+if(OPFLOW_ENABLE_MODULE)
+    # ----------------------------------------------------------------------------
+    # C++20 module version
+    # ----------------------------------------------------------------------------
+    add_library(opflow)
+
+    target_compile_definitions(opflow INTERFACE OPFLOW_USE_MODULE)
+    target_compile_features(opflow PUBLIC cxx_std_26)
+    set_property(TARGET opflow PROPERTY CXX_SCAN_FOR_MODULES ON)
+    target_sources(opflow
+        PUBLIC FILE_SET CXX_MODULES
+        FILES ${CMAKE_SOURCE_DIR}/src/opflow.cppm)
+    target_sources(opflow
+        PUBLIC FILE_SET HEADERS
+        BASE_DIRS
+        ${CMAKE_SOURCE_DIR}/include
+        ${CMAKE_SOURCE_DIR}/src
+        FILES ${OPFLOW_HEADERS})
+    install(TARGETS opflow
+        EXPORT opflow-targets
+        FILE_SET CXX_MODULES DESTINATION ${CMAKE_INSTALL_LIBDIR}/cxx/opflow
+        FILE_SET HEADERS DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+else()
+    # ----------------------------------------------------------------------------
+    # C++20 header only version
+    # ----------------------------------------------------------------------------
+    add_library(opflow INTERFACE)
+    set_property(TARGET opflow PROPERTY CXX_SCAN_FOR_MODULES OFF)
+    target_compile_features(opflow INTERFACE cxx_std_20)
+    target_sources(opflow
+        INTERFACE FILE_SET HEADERS ${OPFLOW_HEADERS})
+    install(TARGETS opflow
+        EXPORT opflow-targets)
+    install(FILES ${OPFLOW_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/opflow)
+endif()
+add_library(opflow::opflow ALIAS opflow)
 
 # Create & include the version header
 configure_file(${CMAKE_CURRENT_LIST_DIR}/../cmake/Version.hpp.in ${CMAKE_BINARY_DIR}/Version.hpp @ONLY)
 
-target_include_directories(opflow INTERFACE
+target_include_directories(opflow PUBLIC
     "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/../include>"
     "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/../src>"
     "$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/>"
diff --git a/src/Core/AMR/AMRGen.hpp b/src/Core/AMR/AMRGen.hpp
index 0a8834b8..45835d58 100644
--- a/src/Core/AMR/AMRGen.hpp
+++ b/src/Core/AMR/AMRGen.hpp
@@ -19,11 +19,13 @@
 #include "DataStructures/Geometry/BasicElements.hpp"
 #include "DataStructures/Geometry/KdTree.hpp"
 #include "DataStructures/Range/Ranges.hpp"
+#ifndef OPFLOW_INSIDE_MODULE
 #include <algorithm>
 #include <deque>
 #include <vtkPoints.h>
 #include <vtkPolyData.h>
 #include <vtkXMLPolyDataWriter.h>
+#endif
 
 namespace OpFlow {
     inline auto int_pow(int a, int n) {
@@ -306,8 +308,8 @@ namespace OpFlow {
 #ifndef NDEBUG
             OP_DEBUG("Points at level {}:", level);
             for (const auto &p : points) { OP_DEBUG("{}", p.toString()); }
-            dump_points(points, 1. / int_pow(ratio, level), fmt::format("p_level{}.vtp", level));
-            dump_points(p_add, 1. / int_pow(ratio, level), fmt::format("padd_level{}.vtp", level));
+            dump_points(points, 1. / int_pow(ratio, level), std::format("p_level{}.vtp", level));
+            dump_points(p_add, 1. / int_pow(ratio, level), std::format("padd_level{}.vtp", level));
 #endif
             auto tree = DS::KdTree<int, dim>(points);
             auto boxes = domainPartition(tree, th, 2);
diff --git a/src/Core/BC/BCBase.hpp b/src/Core/BC/BCBase.hpp
index 1c2a33f4..8663b411 100644
--- a/src/Core/BC/BCBase.hpp
+++ b/src/Core/BC/BCBase.hpp
@@ -16,7 +16,9 @@
 #include "Core/Field/FieldExprTrait.hpp"
 #include "Core/Field/MeshBased/Structured/StructuredFieldExprTrait.hpp"
 #include "Core/Mesh/MeshBase.hpp"
+#ifndef OPFLOW_INSIDE_MODULE
 #include <memory>
+#endif
 
 namespace OpFlow {
     enum class BCType { Undefined, Dirc, Neum, Periodic, Internal, Symm, ASymm };
diff --git a/src/Core/BC/DircBC.hpp b/src/Core/BC/DircBC.hpp
index 6d36d86a..e18c9ee3 100644
--- a/src/Core/BC/DircBC.hpp
+++ b/src/Core/BC/DircBC.hpp
@@ -29,9 +29,9 @@ namespace OpFlow {
         using BCBase<F>::operator=;
         [[nodiscard]] BCType getBCType() const override { return type; }
 
-        [[nodiscard]] virtual std::unique_ptr<BCBase<F>>
-        getFunctorBC(std::function<typename BCBase<F>::elem_type(const typename BCBase<F>::index_type&)> f)
-                const = 0;
+        [[nodiscard]] virtual std::unique_ptr<BCBase<F>> getFunctorBC(
+                std::function<typename BCBase<F>::elem_type(const typename BCBase<F>::index_type&)> f) const
+                = 0;
     };
 
     template <MeshBasedFieldExprType F>
@@ -52,9 +52,9 @@ namespace OpFlow {
             std::string ret, prefix;
             for (auto i = 0; i < level; ++i) prefix += "\t";
             ret += prefix + "Type: ConstDirc\n";
-            if constexpr (Meta::is_numerical_v<decltype(_c)>) ret += prefix + fmt::format("Value: {}", _c);
+            if constexpr (Meta::is_numerical_v<decltype(_c)>) ret += prefix + std::format("Value: {}", _c);
             else
-                ret += prefix + fmt::format("Value: {}", _c.toString());
+                ret += prefix + std::format("Value: {}", _c.toString());
             return ret;
         }
 
diff --git a/src/Core/BC/InternalBC.hpp b/src/Core/BC/InternalBC.hpp
index ca795f4d..50ef90a1 100644
--- a/src/Core/BC/InternalBC.hpp
+++ b/src/Core/BC/InternalBC.hpp
@@ -14,8 +14,10 @@
 #define OPFLOW_INTERNALBC_HPP
 
 #include "Core/BC/BCBase.hpp"
+#ifndef OPFLOW_INSIDE_MODULE
 #include <map>
 #include <mpi.h>
+#endif
 
 namespace OpFlow::Core::BC {
     template <typename F>
diff --git a/src/Core/BC/NeumBC.hpp b/src/Core/BC/NeumBC.hpp
index a3fa2bbd..c6d510ac 100644
--- a/src/Core/BC/NeumBC.hpp
+++ b/src/Core/BC/NeumBC.hpp
@@ -28,9 +28,9 @@ namespace OpFlow {
         using BCBase<F>::operator=;
         [[nodiscard]] BCType getBCType() const override { return type; }
 
-        [[nodiscard]] virtual std::unique_ptr<BCBase<F>>
-        getFunctorBC(std::function<typename BCBase<F>::elem_type(const typename BCBase<F>::index_type&)> f)
-                const = 0;
+        [[nodiscard]] virtual std::unique_ptr<BCBase<F>> getFunctorBC(
+                std::function<typename BCBase<F>::elem_type(const typename BCBase<F>::index_type&)> f) const
+                = 0;
     };
 
     template <MeshBasedFieldExprType F>
@@ -52,9 +52,9 @@ namespace OpFlow {
             std::string ret, prefix;
             for (auto i = 0; i < level; ++i) prefix += "\t";
             ret += prefix + "Type: ConstNeum\n";
-            if constexpr (Meta::is_numerical_v<decltype(_c)>) ret += prefix + fmt::format("Value: {}", _c);
+            if constexpr (Meta::is_numerical_v<decltype(_c)>) ret += prefix + std::format("Value: {}", _c);
             else
-                ret += prefix + fmt::format("Value: {}", _c.toString());
+                ret += prefix + std::format("Value: {}", _c.toString());
             return ret;
         }
 
diff --git a/src/Core/BasicDataTypes.hpp b/src/Core/BasicDataTypes.hpp
index 33b48592..15158bbe 100644
--- a/src/Core/BasicDataTypes.hpp
+++ b/src/Core/BasicDataTypes.hpp
@@ -13,8 +13,10 @@
 #ifndef OPFLOW_BASICDATATYPES_HPP
 #define OPFLOW_BASICDATATYPES_HPP
 
+#ifndef OPFLOW_INSIDE_MODULE
 #include <complex>
 #include <exception>
+#endif
 
 namespace OpFlow {
 
diff --git a/src/Core/Environment.hpp b/src/Core/Environment.hpp
index cfc784b6..9280cd26 100644
--- a/src/Core/Environment.hpp
+++ b/src/Core/Environment.hpp
@@ -13,12 +13,14 @@
 #ifndef OPFLOW_ENVIRONMENT_HPP
 #define OPFLOW_ENVIRONMENT_HPP
 
+#ifndef OPFLOW_INSIDE_MODULE
 #ifdef OPFLOW_WITH_MPI
 #include <mpi.h>
 #endif
-#include "Version.hpp"// generated by CMake
 #include <iostream>
 #include <omp.h>
+#endif
+#include "Version.hpp"// generated by CMake
 
 #include "Core/Parallel/ParallelInfo.hpp"
 #include "Core/Parallel/ParallelPlan.hpp"
diff --git a/src/Core/Equation/AMGCLBackend.hpp b/src/Core/Equation/AMGCLBackend.hpp
index b7cad57a..1e6c995c 100644
--- a/src/Core/Equation/AMGCLBackend.hpp
+++ b/src/Core/Equation/AMGCLBackend.hpp
@@ -14,14 +14,18 @@
 #define OPFLOW_AMGCLBACKEND_HPP
 
 #include "DataStructures/Matrix/CSRMatrix.hpp"
+#ifndef OPFLOW_INSIDE_MODULE
 #include <amgcl/adapter/zero_copy.hpp>
+#include <optional>
+#include <tuple>
+#endif
 #ifdef OPFLOW_WITH_MPI
+#ifndef OPFLOW_INSIDE_MODULE
 #include <amgcl/mpi/distributed_matrix.hpp>
 #include <amgcl/mpi/make_solver.hpp>
 #endif
+#endif
 #include "EqnSolveHandler.hpp"
-#include <optional>
-#include <tuple>
 
 namespace OpFlow {
     template <typename Solver, typename D>
diff --git a/src/Core/Equation/AMGCLEqnSolveHandler.hpp b/src/Core/Equation/AMGCLEqnSolveHandler.hpp
index 33a6f920..833da6e5 100644
--- a/src/Core/Equation/AMGCLEqnSolveHandler.hpp
+++ b/src/Core/Equation/AMGCLEqnSolveHandler.hpp
@@ -27,16 +27,20 @@
 #include "Core/Meta.hpp"
 #include "DataStructures/Index/LinearMapper/MDRangeMapper.hpp"
 #include "DataStructures/Matrix/CSRMatrix.hpp"
+#ifndef OPFLOW_INSIDE_MODULE
 #include <atomic>
 #include <cstddef>
 #include <cstdlib>
 #include <fstream>
 #include <oneapi/tbb/concurrent_vector.h>
 #include <vector>
+#endif
 
 #ifdef OPFLOW_WITH_MPI
+#ifndef OPFLOW_INSIDE_MODULE
 #include <mpi.h>
 #endif
+#endif
 
 #include "Core/Solvers/IJ/IJSolver.hpp"
 
@@ -48,8 +52,8 @@ namespace OpFlow {
     template <typename... Fs, typename... Ts, typename M, typename S>
     struct AMGCLEqnSolveHandler<std::tuple<Fs...>, std::tuple<Ts...>, M, S> : virtual public EqnSolveHandler {
     public:
-        using eqn_holder_type = decltype(
-                makeEqnHolder(std::declval<std::tuple<Fs...>&>(), std::declval<std::tuple<Ts...>&>()));
+        using eqn_holder_type = decltype(makeEqnHolder(std::declval<std::tuple<Fs...>&>(),
+                                                       std::declval<std::tuple<Ts...>&>()));
         using st_holder_type = decltype(makeStencilHolder(std::declval<eqn_holder_type&>()));
         constexpr static int size = sizeof...(Ts);
 
@@ -89,7 +93,7 @@ namespace OpFlow {
             mat = CSRMatrixGenerator::generate(*st_holder, mapper, pin);
             if (params[0].dumpPath) {
 #ifdef OPFLOW_WITH_MPI
-                std::ofstream of(params[0].dumpPath.value() + fmt::format(".rank{}", getWorkerId()));
+                std::ofstream of(params[0].dumpPath.value() + std::format(".rank{}", getWorkerId()));
 #else
                 std::ofstream of(params[0].dumpPath.value());
 #endif
@@ -179,7 +183,9 @@ namespace OpFlow {
     }
 
     template <typename S>
-    std::unique_ptr<EqnSolveHandler> makeEqnSolveHandler(auto&&... fs) requires(sizeof...(fs) >= 6) {
+    std::unique_ptr<EqnSolveHandler> makeEqnSolveHandler(auto&&... fs)
+        requires(sizeof...(fs) >= 6)
+    {
         auto t = std::forward_as_tuple(OP_PERFECT_FOWD(fs)...);
         auto&& [getters, rest1] = Meta::tuple_split<sizeof...(fs) / 2 - 1>(t);
         auto&& [targets, rest2] = Meta::tuple_split<sizeof...(fs) / 2 - 1>(rest1);
diff --git a/src/Core/Equation/CSRMatrixGenerator.hpp b/src/Core/Equation/CSRMatrixGenerator.hpp
index c218b362..58c2caeb 100644
--- a/src/Core/Equation/CSRMatrixGenerator.hpp
+++ b/src/Core/Equation/CSRMatrixGenerator.hpp
@@ -17,7 +17,9 @@
 #include "Core/Meta.hpp"
 #include "DataStructures/Index/LinearMapper/MDRangeMapper.hpp"
 #include "DataStructures/Matrix/CSRMatrix.hpp"
+#ifndef OPFLOW_INSIDE_MODULE
 #include <vector>
+#endif
 
 namespace OpFlow {
     struct CSRMatrixGenerator {
diff --git a/src/Core/Equation/Equation.hpp b/src/Core/Equation/Equation.hpp
index 59c781c6..239f585f 100644
--- a/src/Core/Equation/Equation.hpp
+++ b/src/Core/Equation/Equation.hpp
@@ -19,7 +19,9 @@
 #include "Core/Expr/ScalarExpr.hpp"
 #include "Core/Field/FieldExprTrait.hpp"
 #include "DataStructures/Range/Ranges.hpp"
+#ifndef OPFLOW_INSIDE_MODULE
 #include <tuple>
+#endif
 
 namespace OpFlow {
     template <ExprType Lhs, ExprType Rhs>
diff --git a/src/Core/Equation/EquationHolder.hpp b/src/Core/Equation/EquationHolder.hpp
index 5a30e6c3..54a8da3c 100644
--- a/src/Core/Equation/EquationHolder.hpp
+++ b/src/Core/Equation/EquationHolder.hpp
@@ -16,11 +16,13 @@
 #include "Core/Equation/Equation.hpp"
 #include "Core/Meta.hpp"
 #include "DataStructures/StencilPad.hpp"
+#ifndef OPFLOW_INSIDE_MODULE
 #include <any>
 #include <boost/core/demangle.hpp>
 #include <functional>
 #include <unordered_map>
 #include <vector>
+#endif
 
 namespace OpFlow {
     template <typename E, typename T>
diff --git a/src/Core/Equation/HYPREEqnSolveHandler.hpp b/src/Core/Equation/HYPREEqnSolveHandler.hpp
index 42f83c45..01f5aaf1 100644
--- a/src/Core/Equation/HYPREEqnSolveHandler.hpp
+++ b/src/Core/Equation/HYPREEqnSolveHandler.hpp
@@ -27,6 +27,7 @@
 #include "Core/Solvers/Struct/StructSolver.hpp"
 #include "DataStructures/Index/LevelMDIndex.hpp"
 #include "DataStructures/Index/MDIndex.hpp"
+#ifndef OPFLOW_INSIDE_MODULE
 #include <memory>
 #include <numeric>
 #include <vector>
@@ -34,6 +35,7 @@
 #include <HYPRE.h>
 #include <HYPRE_sstruct_ls.h>
 #include <HYPRE_sstruct_mv.h>
+#endif
 
 namespace OpFlow {
     template <typename F, typename T, typename S>
@@ -293,7 +295,7 @@ namespace OpFlow {
                             if (k.l != l) {
                                 HYPRE_SStructGraphAddEntries(graph, l, i.c_arr(), c_var, k.l, k.c_arr(),
                                                              c_var);
-                                fmt::print("GraphAddEntry: {} -> {}\n", i, k);
+                                std::print("GraphAddEntry: {} -> {}\n", i, k);
                             }
                         }
                     });
@@ -331,8 +333,8 @@ namespace OpFlow {
                         for (auto& [k, v] : offsetStencil.pad) {
                             if (k.l == l) { k -= i; }
                         }
-                        fmt::print("index = {}\n", i);
-                        fmt::print("current stencil:{}\noffset stencil:{}\n", currentStencil, offsetStencil);
+                        std::print("index = {}\n", i);
+                        std::print("current stencil:{}\noffset stencil:{}\n", currentStencil, offsetStencil);
                         auto extendedStencil = offsetStencil;
                         for (auto& [k, v] : commStencil.pad) {
                             auto _target_k = k;
@@ -344,7 +346,7 @@ namespace OpFlow {
                                 extendedStencil.pad[_target_k] = 0;
                             }
                         }
-                        fmt::print("extended stencil:{}\n", extendedStencil);
+                        std::print("extended stencil:{}\n", extendedStencil);
                         std::vector<Real> vals;
                         std::vector<int> entries(commStencil.pad.size());
                         std::iota(entries.begin(), entries.end(), 0);
@@ -364,7 +366,7 @@ namespace OpFlow {
                                 int entry[] = {count++};
                                 Real val[] = {v};
                                 HYPRE_SStructMatrixSetValues(A, l, i.c_arr(), 0, 1, entry, val);
-                                fmt::print("A[{}, {}] = {}\n", i, k, v);
+                                std::print("A[{}, {}] = {}\n", i, k, v);
                             }
                         }
                         auto bias = -extendedStencil.bias;
diff --git a/src/Core/Equation/UnifiedSolve.hpp b/src/Core/Equation/UnifiedSolve.hpp
index 34f90e9f..e00f0f0b 100644
--- a/src/Core/Equation/UnifiedSolve.hpp
+++ b/src/Core/Equation/UnifiedSolve.hpp
@@ -80,7 +80,7 @@ namespace OpFlow {
         auto mat = CSRMatrixGenerator::generate(st_holder, mapper, pin);
         if (params[0].dumpPath && !params[0].dumpPath.value().empty()) {
 #ifdef OPFLOW_WITH_MPI
-            std::ofstream of(params[0].dumpPath.value() + "A.mat" + fmt::format(".rank{}", getWorkerId()));
+            std::ofstream of(params[0].dumpPath.value() + "A.mat" + std::format(".rank{}", getWorkerId()));
 #else
             std::ofstream of(params[0].dumpPath.value() + "A.mat");
 #endif
diff --git a/src/Core/Expr/Expr.hpp b/src/Core/Expr/Expr.hpp
index 0f52614e..fcbff706 100644
--- a/src/Core/Expr/Expr.hpp
+++ b/src/Core/Expr/Expr.hpp
@@ -17,7 +17,9 @@
 #include "Core/Expr/ExprTrait.hpp"
 #include "Core/Macros.hpp"
 #include "Core/Meta.hpp"
+#ifndef OPFLOW_INSIDE_MODULE
 #include <string>
+#endif
 
 namespace OpFlow {
 
@@ -49,67 +51,78 @@ namespace OpFlow {
         }
 
         template <typename Other>
-                requires ExprType<Other> || Meta::Numerical<Other> auto& operator=(Other&& other) {
+            requires ExprType<Other> || Meta::Numerical<Other>
+        auto& operator=(Other&& other) {
             this->derived().template assignImpl_final<BasicArithOp::Eq>(std::forward<Other>(other));
             return *this;
         }
 
         template <typename Other>
-                requires ExprType<Other> || Meta::Numerical<Other> auto& operator+=(Other&& other) {
+            requires ExprType<Other> || Meta::Numerical<Other>
+        auto& operator+=(Other&& other) {
             this->derived().template assignImpl_final<BasicArithOp::Add>(OP_PERFECT_FOWD(other));
             return *this;
         }
 
         template <typename Other>
-                requires ExprType<Other> || Meta::Numerical<Other> auto& operator-=(Other&& other) {
+            requires ExprType<Other> || Meta::Numerical<Other>
+        auto& operator-=(Other&& other) {
             this->derived().template assignImpl_final<BasicArithOp::Minus>(OP_PERFECT_FOWD(other));
             return *this;
         }
 
         template <typename Other>
-                requires ExprType<Other> || Meta::Numerical<Other> auto& operator*=(Other&& other) {
+            requires ExprType<Other> || Meta::Numerical<Other>
+        auto& operator*=(Other&& other) {
             this->derived().template assignImpl_final<BasicArithOp::Mul>(OP_PERFECT_FOWD(other));
             return *this;
         }
 
         template <typename Other>
-                requires ExprType<Other> || Meta::Numerical<Other> auto& operator/=(Other&& other) {
+            requires ExprType<Other> || Meta::Numerical<Other>
+        auto& operator/=(Other&& other) {
             this->derived().template assignImpl_final<BasicArithOp::Div>(OP_PERFECT_FOWD(other));
             return *this;
         }
 
         template <typename Other>
-        requires ExprType<Other> auto& operator%=(Other&& other) {
+            requires ExprType<Other>
+        auto& operator%=(Other&& other) {
             this->derived().template assignImpl_final<BasicArithOp::Mod>(OP_PERFECT_FOWD(other));
             return *this;
         }
 
         template <typename Other>
-        requires ExprType<Other> auto& operator&=(Other&& other) {
+            requires ExprType<Other>
+        auto& operator&=(Other&& other) {
             this->derived().template assignImpl_final<BasicArithOp::And>(OP_PERFECT_FOWD(other));
             return *this;
         }
 
         template <typename Other>
-        requires ExprType<Other> auto& operator|=(Other&& other) {
+            requires ExprType<Other>
+        auto& operator|=(Other&& other) {
             this->derived().template assignImpl_final<BasicArithOp::Or>(OP_PERFECT_FOWD(other));
             return *this;
         }
 
         template <typename Other>
-        requires ExprType<Other> auto& operator^=(Other&& other) {
+            requires ExprType<Other>
+        auto& operator^=(Other&& other) {
             this->derived().template assignImpl_final<BasicArithOp::Xor>(OP_PERFECT_FOWD(other));
             return *this;
         }
 
         template <typename Other>
-        requires ExprType<Other> auto& operator<<=(Other&& other) {
+            requires ExprType<Other>
+        auto& operator<<=(Other&& other) {
             this->derived().template assignImpl_final<BasicArithOp::LShift>(OP_PERFECT_FOWD(other));
             return *this;
         }
 
         template <typename Other>
-        requires ExprType<Other> auto& operator>>=(Other&& other) {
+            requires ExprType<Other>
+        auto& operator>>=(Other&& other) {
             this->derived().template assignImpl_final<BasicArithOp::RShift>(OP_PERFECT_FOWD(other));
             return *this;
         }
@@ -162,67 +175,78 @@ namespace OpFlow {
         }
 
         template <typename Other>
-                requires ExprType<Other> || Meta::Numerical<Other> auto& operator=(Other&& other) {
+            requires ExprType<Other> || Meta::Numerical<Other>
+        auto& operator=(Other&& other) {
             this->derived().template assignImpl_final<BasicArithOp::Eq>(std::forward<Other>(other));
             return *this;
         }
 
         template <typename Other>
-                requires ExprType<Other> || Meta::Numerical<Other> auto& operator+=(Other&& other) {
+            requires ExprType<Other> || Meta::Numerical<Other>
+        auto& operator+=(Other&& other) {
             this->derived().template assignImpl_final<BasicArithOp::Add>(OP_PERFECT_FOWD(other));
             return *this;
         }
 
         template <typename Other>
-                requires ExprType<Other> || Meta::Numerical<Other> auto& operator-=(Other&& other) {
+            requires ExprType<Other> || Meta::Numerical<Other>
+        auto& operator-=(Other&& other) {
             this->derived().template assignImpl_final<BasicArithOp::Minus>(OP_PERFECT_FOWD(other));
             return *this;
         }
 
         template <typename Other>
-                requires ExprType<Other> || Meta::Numerical<Other> auto& operator*=(Other&& other) {
+            requires ExprType<Other> || Meta::Numerical<Other>
+        auto& operator*=(Other&& other) {
             this->derived().template assignImpl_final<BasicArithOp::Mul>(OP_PERFECT_FOWD(other));
             return *this;
         }
 
         template <typename Other>
-                requires ExprType<Other> || Meta::Numerical<Other> auto& operator/=(Other&& other) {
+            requires ExprType<Other> || Meta::Numerical<Other>
+        auto& operator/=(Other&& other) {
             this->derived().template assignImpl_final<BasicArithOp::Div>(OP_PERFECT_FOWD(other));
             return *this;
         }
 
         template <typename Other>
-        requires ExprType<Other> auto& operator%=(Other&& other) {
+            requires ExprType<Other>
+        auto& operator%=(Other&& other) {
             this->derived().template assignImpl_final<BasicArithOp::Mod>(OP_PERFECT_FOWD(other));
             return *this;
         }
 
         template <typename Other>
-        requires ExprType<Other> auto& operator&=(Other&& other) {
+            requires ExprType<Other>
+        auto& operator&=(Other&& other) {
             this->derived().template assignImpl_final<BasicArithOp::And>(OP_PERFECT_FOWD(other));
             return *this;
         }
 
         template <typename Other>
-        requires ExprType<Other> auto& operator|=(Other&& other) {
+            requires ExprType<Other>
+        auto& operator|=(Other&& other) {
             this->derived().template assignImpl_final<BasicArithOp::Or>(OP_PERFECT_FOWD(other));
             return *this;
         }
 
         template <typename Other>
-        requires ExprType<Other> auto& operator^=(Other&& other) {
+            requires ExprType<Other>
+        auto& operator^=(Other&& other) {
             this->derived().template assignImpl_final<BasicArithOp::Xor>(OP_PERFECT_FOWD(other));
             return *this;
         }
 
         template <typename Other>
-        requires ExprType<Other> auto& operator<<=(Other&& other) {
+            requires ExprType<Other>
+        auto& operator<<=(Other&& other) {
             this->derived().template assignImpl_final<BasicArithOp::LShift>(OP_PERFECT_FOWD(other));
             return *this;
         }
 
         template <typename Other>
-        requires ExprType<Other> auto& operator>>=(Other&& other) {
+            requires ExprType<Other>
+        auto& operator>>=(Other&& other) {
             this->derived().template assignImpl_final<BasicArithOp::RShift>(OP_PERFECT_FOWD(other));
             return *this;
         }
diff --git a/src/Core/Expr/ExprTrait.hpp b/src/Core/Expr/ExprTrait.hpp
index e5d205a4..b69c38a9 100644
--- a/src/Core/Expr/ExprTrait.hpp
+++ b/src/Core/Expr/ExprTrait.hpp
@@ -15,7 +15,9 @@
 
 #include "Core/Constants.hpp"
 #include "Core/Meta.hpp"
+#ifndef OPFLOW_INSIDE_MODULE
 #include <type_traits>
+#endif
 
 namespace OpFlow {
     namespace internal {
@@ -40,8 +42,8 @@ namespace OpFlow {
         struct ExprTrait<T&&> : ExprTrait<T> {};
     }// namespace internal
 
-    template <typename Derived, bool rw = bool(internal::ExprTrait<Derived>::access_flag& HasWriteAccess),
-              bool dir = bool(internal::ExprTrait<Derived>::access_flag& HasDirectAccess)>
+    template <typename Derived, bool rw = bool(internal::ExprTrait<Derived>::access_flag & HasWriteAccess),
+              bool dir = bool(internal::ExprTrait<Derived>::access_flag & HasDirectAccess)>
     struct Expr;
 
     template <typename T>
diff --git a/src/Core/Expr/ScalarExpr.hpp b/src/Core/Expr/ScalarExpr.hpp
index 0847c01d..0103d0a9 100644
--- a/src/Core/Expr/ScalarExpr.hpp
+++ b/src/Core/Expr/ScalarExpr.hpp
@@ -16,7 +16,9 @@
 #include "Core/Expr/Expr.hpp"
 #include "Core/Expr/ScalarExprTrait.hpp"
 #include "Core/Meta.hpp"
+#ifndef OPFLOW_INSIDE_MODULE
 #include <type_traits>
+#endif
 
 namespace OpFlow {
     template <typename T>
@@ -50,7 +52,8 @@ namespace OpFlow {
         static constexpr bool isConcrete() { return true; }
         void prepareImpl_final() const {}
         template <typename O>
-        requires(!std::same_as<O, ScalarExpr>) bool containsImpl_final(const O&) const {
+            requires(!std::same_as<O, ScalarExpr>)
+        bool containsImpl_final(const O&) const {
             return false;
         }
 
diff --git a/src/Core/Field/MeshBased/SemiStructured/CartAMRFieldExpr.hpp b/src/Core/Field/MeshBased/SemiStructured/CartAMRFieldExpr.hpp
index 55221f6e..af3a87c4 100644
--- a/src/Core/Field/MeshBased/SemiStructured/CartAMRFieldExpr.hpp
+++ b/src/Core/Field/MeshBased/SemiStructured/CartAMRFieldExpr.hpp
@@ -16,7 +16,9 @@
 #include "Core/Field/MeshBased/SemiStructured/CartAMRFieldExprTrait.hpp"
 #include "Core/Macros.hpp"
 #include "SemiStructuredFieldExprTrait.hpp"
+#ifndef OPFLOW_INSIDE_MODULE
 #include <vector>
+#endif
 
 namespace OpFlow {
 
diff --git a/src/Core/Field/MeshBased/SemiStructured/SemiStructuredFieldExpr.hpp b/src/Core/Field/MeshBased/SemiStructured/SemiStructuredFieldExpr.hpp
index ab3b15c3..5fc6d154 100644
--- a/src/Core/Field/MeshBased/SemiStructured/SemiStructuredFieldExpr.hpp
+++ b/src/Core/Field/MeshBased/SemiStructured/SemiStructuredFieldExpr.hpp
@@ -16,7 +16,9 @@
 #include "Core/Field/MeshBased/MeshBasedFieldExpr.hpp"
 #include "DataStructures/Pair.hpp"
 #include "SemiStructuredFieldExprTrait.hpp"
+#ifndef OPFLOW_INSIDE_MODULE
 #include <array>
+#endif
 
 namespace OpFlow {
 
diff --git a/src/Core/Field/MeshBased/StencilField.hpp b/src/Core/Field/MeshBased/StencilField.hpp
index 3d1bf951..de7fd735 100644
--- a/src/Core/Field/MeshBased/StencilField.hpp
+++ b/src/Core/Field/MeshBased/StencilField.hpp
@@ -49,7 +49,7 @@ namespace OpFlow {
         }
         StencilField(StencilField&&) noexcept = default;
         explicit StencilField(const T& base, int color = 0) : base(&base), color(color) {
-            this->name = fmt::format("StencilField({})", base.name);
+            this->name = std::format("StencilField({})", base.name);
             if constexpr (StructuredFieldExprType<T>) this->loc = base.loc;
             this->mesh = base.mesh.getView();
             this->localRange = base.localRange;
@@ -124,16 +124,15 @@ namespace OpFlow {
             OP_ASSERT_MSG(base, "base ptr of stencil field is nullptr");
             // inner case, return a stencil pad
             if (DS::inRange(this->assignableRange, index)) [[likely]] {
-                    auto ret = typename internal::ExprTrait<StencilField>::elem_type {0};
-                    // note: here solution is pinned at base->assignableRange.start
-                    // rather than this->assignableRange.start; This is because
-                    // for periodic case the assignableRange of this will be changed
-                    // to logicalRange for HYPRE solver to get exact offset.
-                    if (!(pinned && index == index_type(base->assignableRange.start)))
-                        [[likely]] ret.pad[colored_index_type {index, color}] = 1.0;
-                    return ret;
-                }
-            else if (!DS::inRange(this->logicalRange, index)) {// corner case, error & abort
+                auto ret = typename internal::ExprTrait<StencilField>::elem_type {0};
+                // note: here solution is pinned at base->assignableRange.start
+                // rather than this->assignableRange.start; This is because
+                // for periodic case the assignableRange of this will be changed
+                // to logicalRange for HYPRE solver to get exact offset.
+                if (!(pinned && index == index_type(base->assignableRange.start))) [[likely]]
+                    ret.pad[colored_index_type {index, color}] = 1.0;
+                return ret;
+            } else if (!DS::inRange(this->logicalRange, index)) {// corner case, error & abort
                 OP_ERROR("Index {} out of range {}", index, this->logicalRange.toString());
                 OP_ABORT;
             } else {// needs boundary condition info to continue
@@ -351,7 +350,8 @@ namespace OpFlow {
         void prepareImpl_final() const {}
 
         template <typename Other>
-        requires(!std::same_as<Other, StencilField>) bool containsImpl_final(const Other& o) const {
+            requires(!std::same_as<Other, StencilField>)
+        bool containsImpl_final(const Other& o) const {
             return false;
         }
         bool containsImpl_final(const StencilField& o) const { return this == &o; }
@@ -387,7 +387,7 @@ namespace OpFlow {
             : CartAMRFieldExpr<StencilField>(std::move(other)), data(std::move(other.data)),
               block_mark(std::move(other.block_mark)), offset(std::move(other.offset)) {}
         explicit StencilField(const T& base, int color) : color(color) {
-            this->name = fmt::format("StencilField({})", base.name);
+            this->name = std::format("StencilField({})", base.name);
             this->loc = base.loc;
             this->mesh = base.mesh;
             this->localRanges = base.localRanges;
@@ -535,7 +535,8 @@ namespace OpFlow {
         const auto& blocked(const index_type& i) const { return block_mark[i.l][i.p][i - offset[i.l][i.p]]; }
 
         template <typename Other>
-        requires(!std::same_as<Other, StencilField>) bool containsImpl_final(const Other& o) const {
+            requires(!std::same_as<Other, StencilField>)
+        bool containsImpl_final(const Other& o) const {
             return false;
         }
         bool containsImpl_final(const StencilField& o) const { return this == &o; }
diff --git a/src/Core/Field/MeshBased/Structured/CartesianField.hpp b/src/Core/Field/MeshBased/Structured/CartesianField.hpp
index 28c72b92..14e2ffe8 100644
--- a/src/Core/Field/MeshBased/Structured/CartesianField.hpp
+++ b/src/Core/Field/MeshBased/Structured/CartesianField.hpp
@@ -29,7 +29,9 @@
 #include "Core/Parallel/AbstractSplitStrategy.hpp"
 #include "Core/Parallel/ParallelPlan.hpp"
 #include "Math/Interpolator/Interpolator.hpp"
+#ifndef OPFLOW_INSIDE_MODULE
 #include <memory>
+#endif
 
 namespace OpFlow {
     template <typename D, typename M, typename C = DS::PlainTensor<D, internal::MeshTrait<M>::dim>>
@@ -79,8 +81,8 @@ namespace OpFlow {
         }
 
         template <typename T>
-        requires std::same_as<T, CartesianField> void
-        resplitWithStrategy(AbstractSplitStrategy<T>* strategy) {
+            requires std::same_as<T, CartesianField>
+        void resplitWithStrategy(AbstractSplitStrategy<T>* strategy) {
             // this method only acts when MPI is enabled
 #if defined(OPFLOW_WITH_MPI) && defined(OPFLOW_DISTRIBUTE_MODEL_MPI)
             if (!strategy) return;
@@ -365,14 +367,10 @@ namespace OpFlow {
             // the latter padding op pads the outer range of the former padding zone
             std::array<int, dim> start, end;
             if constexpr (requires(D v) {
-                              { v + v }
-                              ->std::same_as<D>;
-                              { v - v }
-                              ->std::same_as<D>;
-                              { v * 1.0 }
-                              ->std::same_as<D>;
-                              { v / 1.0 }
-                              ->std::same_as<D>;
+                              { v + v } -> std::same_as<D>;
+                              { v - v } -> std::same_as<D>;
+                              { v * 1.0 } -> std::same_as<D>;
+                              { v / 1.0 } -> std::same_as<D>;
                           }) {
                 for (int i = 0; i < dim; ++i) {
                     // lower side
@@ -784,7 +782,8 @@ namespace OpFlow {
         }
 
         template <typename Other>
-        requires(!std::same_as<Other, CartesianField>) bool containsImpl_final(const Other& o) const {
+            requires(!std::same_as<Other, CartesianField>)
+        bool containsImpl_final(const Other& o) const {
             return false;
         }
 
@@ -867,10 +866,11 @@ namespace OpFlow {
 
         // set a functor bc
         template <typename F>
-        requires requires(F f) {
-            { f(std::declval<typename internal::ExprTrait<CartesianField<D, M, C>>::index_type>()) }
-            ->std::convertible_to<typename internal::ExprTrait<CartesianField<D, M, C>>::elem_type>;
-        }
+            requires requires(F f) {
+                {
+                    f(std::declval<typename internal::ExprTrait<CartesianField<D, M, C>>::index_type>())
+                } -> std::convertible_to<typename internal::ExprTrait<CartesianField<D, M, C>>::elem_type>;
+            }
         auto& setBC(int d, DimPos pos, BCType type, F&& functor) {
             OP_ASSERT(d < dim);
             auto& targetBC = pos == DimPos::start ? f.bc[d].start : f.bc[d].end;
diff --git a/src/Core/Field/MeshBased/Structured/StructuredFieldExpr.hpp b/src/Core/Field/MeshBased/Structured/StructuredFieldExpr.hpp
index 6524c3bd..b92fc129 100644
--- a/src/Core/Field/MeshBased/Structured/StructuredFieldExpr.hpp
+++ b/src/Core/Field/MeshBased/Structured/StructuredFieldExpr.hpp
@@ -16,10 +16,12 @@
 #include "Core/Field/MeshBased/MeshBasedFieldExpr.hpp"
 #include "DataStructures/Pair.hpp"
 #include "StructuredFieldExprTrait.hpp"
+#ifndef OPFLOW_INSIDE_MODULE
 #include <array>
 #include <memory>
 #include <utility>
 #include <vector>
+#endif
 
 namespace OpFlow {
     namespace internal {
diff --git a/src/Core/Interfaces/MDIndexable.hpp b/src/Core/Interfaces/MDIndexable.hpp
index 62433a8a..3f6c0282 100644
--- a/src/Core/Interfaces/MDIndexable.hpp
+++ b/src/Core/Interfaces/MDIndexable.hpp
@@ -16,9 +16,11 @@
 #include "Core/Macros.hpp"
 #include "Core/Meta.hpp"
 #include "DataStructures/Index/MDIndex.hpp"
+#ifndef OPFLOW_INSIDE_MODULE
 #include <array>
 #include <type_traits>
 #include <vector>
+#endif
 
 namespace OpFlow {
 
diff --git a/src/Core/Interfaces/Serializable.hpp b/src/Core/Interfaces/Serializable.hpp
index bde9ecf2..d997fe51 100644
--- a/src/Core/Interfaces/Serializable.hpp
+++ b/src/Core/Interfaces/Serializable.hpp
@@ -13,7 +13,9 @@
 #ifndef OPFLOW_SERIALIZABLE_HPP
 #define OPFLOW_SERIALIZABLE_HPP
 
+#ifndef OPFLOW_INSIDE_MODULE
 #include <vector>
+#endif
 
 namespace OpFlow {
 
@@ -28,10 +30,9 @@ namespace OpFlow {
 
     template <typename T>
     concept Serializable = std::is_base_of_v<SerializableObj, T> || requires(T t) {
-        { t.serialize() }
-        ->std::same_as<std::vector<std::byte>>;
-        {t.deserialize(std::vector<std::byte> {})};
-        {t.deserialize(std::declval<const std::byte*>(), std::size_t(0))};
+        { t.serialize() } -> std::same_as<std::vector<std::byte>>;
+        { t.deserialize(std::vector<std::byte> {}) };
+        { t.deserialize(std::declval<const std::byte*>(), std::size_t(0)) };
     };
 }// namespace OpFlow
 
diff --git a/src/Core/Interfaces/Stringifiable.hpp b/src/Core/Interfaces/Stringifiable.hpp
index b10f40b1..53083096 100644
--- a/src/Core/Interfaces/Stringifiable.hpp
+++ b/src/Core/Interfaces/Stringifiable.hpp
@@ -15,9 +15,11 @@
 
 #include "Core/Macros.hpp"
 #include "Core/Meta.hpp"
-#include <fmt/format.h>
+#ifndef OPFLOW_INSIDE_MODULE
+#include <format>
 #include <iostream>
 #include <string>
+#endif
 
 namespace OpFlow {
 
@@ -34,13 +36,11 @@ namespace OpFlow {
     concept Stringifiable = std::is_base_of_v<StringifiableObj, T>;
 }// namespace OpFlow
 
-namespace fmt {
-    template <typename T>
-    requires std::derived_from<T, OpFlow::StringifiableObj> struct formatter<T> : formatter<std::string> {
-        template <typename FormatCtx>
-        auto format(const OpFlow::StringifiableObj& a, FormatCtx& ctx) {
-            return fmt::formatter<std::string>::format(a.toString(), ctx);
-        }
-    };
-}// namespace fmt
+template <typename T>
+    requires std::derived_from<T, OpFlow::StringifiableObj>
+struct std::formatter<T> : formatter<std::string> {
+    auto format(const OpFlow::StringifiableObj& a, auto& ctx) {
+        return std::formatter<std::string>::format(a.toString(), ctx);
+    }
+};
 #endif//OPFLOW_STRINGIFIABLE_HPP
diff --git a/src/Core/Loops/RangeFor.hpp b/src/Core/Loops/RangeFor.hpp
index 75fd65ee..97076654 100644
--- a/src/Core/Loops/RangeFor.hpp
+++ b/src/Core/Loops/RangeFor.hpp
@@ -19,11 +19,15 @@
 #include "Core/Meta.hpp"
 #include "DataStructures/Index/RangedIndex.hpp"
 #include "DataStructures/Range/Ranges.hpp"
+#ifndef OPFLOW_INSIDE_MODULE
 #include <omp.h>
 #include <tbb/tbb.h>
+#endif
 #define TBB_PREVIEW_BLOCKED_RANGE_ND 1
+#ifndef OPFLOW_INSIDE_MODULE
 #include <oneapi/tbb/blocked_rangeNd.h>
 #include <oneapi/tbb/detail/_range_common.h>
+#endif
 
 namespace OpFlow {
     /// \brief Serial version of range for
@@ -122,8 +126,8 @@ namespace OpFlow {
         auto local_result = rangeReduce(range, op, func);
         std::vector<decltype(local_result)> results(getWorkerCount());
         results[getWorkerId()] = local_result;
-        static_assert(std::is_standard_layout_v<decltype(
-                                      local_result)> && std::is_trivial_v<decltype(local_result)>,
+        static_assert(std::is_standard_layout_v<decltype(local_result)>
+                              && std::is_trivial_v<decltype(local_result)>,
                       "local_result must be pod type");
         MPI_Allgather(MPI_IN_PLACE, sizeof(decltype(local_result)), MPI_BYTE, results.data(),
                       sizeof(decltype(local_result)), MPI_BYTE, MPI_COMM_WORLD);
diff --git a/src/Core/Loops/StructReduce.hpp b/src/Core/Loops/StructReduce.hpp
index 674f8782..fe39fcd9 100644
--- a/src/Core/Loops/StructReduce.hpp
+++ b/src/Core/Loops/StructReduce.hpp
@@ -18,7 +18,9 @@
 #include "Core/Macros.hpp"
 #include "Core/Meta.hpp"
 #include "RangeFor.hpp"
+#ifndef OPFLOW_INSIDE_MODULE
 #include <omp.h>
+#endif
 
 namespace OpFlow {
     template <FieldExprType E, typename Func, typename ReOp>
diff --git a/src/Core/Macros.hpp b/src/Core/Macros.hpp
index 251e27ed..3623b8f8 100644
--- a/src/Core/Macros.hpp
+++ b/src/Core/Macros.hpp
@@ -13,7 +13,12 @@
 #ifndef OPFLOW_MACROS_HPP
 #define OPFLOW_MACROS_HPP
 
+#ifndef OPFLOW_INSIDE_MODULE
+#include "spdlog/spdlog.h"
 #include <cassert>
+#include <cstring>
+#include <utility>
+#endif
 #define OPFLOW_INLINE inline
 
 #if defined(__INTEL_COMPILER) || defined(__clang__)// Intel / Clang compiler
@@ -37,6 +42,12 @@
 #define OPFLOW_CPP20
 #endif
 
+#ifdef OPFLOW_USE_MODULE
+#define OPFLOW_MODULE_EXPORT export
+#else
+#define OPFLOW_MODULE_EXPORT
+#endif// OPFLOW_USE_MODULE
+
 // Field Macros
 #include "Core/Field/FieldMacros.hpp"
 
@@ -45,24 +56,22 @@
     "High order schemes on boundary is not supported in OpFlow."                                             \
     " Please consider use composed operators with low order decades."
 
-#include <cstring>
-
 #define __FILENAME__ (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__)
 
-#include "spdlog/spdlog.h"
-
 #ifdef OPFLOW_WITH_MPI
+#ifndef OPFLOW_INSIDE_MODULE
 #include <mpi.h>
+#endif
 namespace OpFlow {
     inline static int getWorkerId(MPI_Comm comm);
 }
 #define SPD_AUGMENTED_LOG(X, ...)                                                                            \
-    spdlog::X(fmt::format("[{}:{}@{}][Rank{}] ", __FILENAME__, __FUNCTION__, __LINE__,                       \
+    spdlog::X(std::format("[{}:{}@{}][Rank{}] ", __FILENAME__, __FUNCTION__, __LINE__,                       \
                           OpFlow::getWorkerId(MPI_COMM_WORLD))                                               \
-              + fmt::format(__VA_ARGS__))
+              + std::format(__VA_ARGS__))
 #else
 #define SPD_AUGMENTED_LOG(X, ...)                                                                            \
-    spdlog::X(fmt::format("[{}:{}@{}] ", __FILENAME__, __FUNCTION__, __LINE__) + fmt::format(__VA_ARGS__))
+    spdlog::X(std::format("[{}:{}@{}] ", __FILENAME__, __FUNCTION__, __LINE__) + std::format(__VA_ARGS__))
 #endif
 
 #ifndef OP_DEBUGLEVEL
@@ -106,11 +115,11 @@ namespace OpFlow {
 
 #define OP_STACK_PUSH(...)                                                                                   \
     do {                                                                                                     \
-        OpFlow::stackTracer.push(fmt::format("[{}:{}@{}] ", __FILENAME__, __FUNCTION__, __LINE__)            \
-                                 + fmt::format(__VA_ARGS__));                                                \
+        OpFlow::stackTracer.push(std::format("[{}:{}@{}] ", __FILENAME__, __FUNCTION__, __LINE__)            \
+                                 + std::format(__VA_ARGS__));                                                \
     } while (0)
 #define OP_STACK_APPEND(...)                                                                                 \
-    do { OpFlow::stackTracer.append(fmt::format(__VA_ARGS__)); } while (0)
+    do { OpFlow::stackTracer.append(std::format(__VA_ARGS__)); } while (0)
 #define OP_STACK_POP                                                                                         \
     do { OpFlow::stackTracer.pop(); } while (0)
 #define OP_DUMPSTACK                                                                                         \
@@ -266,7 +275,6 @@ namespace OpFlow {
     struct X##Trait;                                                                                         \
     DEFINE_TRAITS_CVR(X)
 
-#include <utility>
 #define OP_PERFECT_FOWD(X) std::forward<decltype(X)>(X)
 
 #endif//OPFLOW_MACROS_HPP
diff --git a/src/Core/Mesh/MeshTrait.hpp b/src/Core/Mesh/MeshTrait.hpp
index aeef2b9c..6a855a34 100644
--- a/src/Core/Mesh/MeshTrait.hpp
+++ b/src/Core/Mesh/MeshTrait.hpp
@@ -14,7 +14,9 @@
 #define OPFLOW_MESHTRAIT_HPP
 
 #include "Core/Meta.hpp"
+#ifndef OPFLOW_INSIDE_MODULE
 #include <type_traits>
+#endif
 
 namespace OpFlow {
     template <typename Derived>
diff --git a/src/Core/Mesh/SemiStructured/CartesianAMRMesh.hpp b/src/Core/Mesh/SemiStructured/CartesianAMRMesh.hpp
index ab9acc23..c43d0171 100644
--- a/src/Core/Mesh/SemiStructured/CartesianAMRMesh.hpp
+++ b/src/Core/Mesh/SemiStructured/CartesianAMRMesh.hpp
@@ -22,14 +22,18 @@
 #include "DataStructures/Index/LevelMDIndex.hpp"
 #include "DataStructures/Range/LevelRanges.hpp"
 #include "Math/Function/Numeric.hpp"
+#ifndef OPFLOW_INSIDE_MODULE
 #include <deque>
 #include <map>
 #include <vector>
+#endif
 #ifdef OPFLOW_WITH_VTK
+#ifndef OPFLOW_INSIDE_MODULE
 #include <vtkPoints.h>
 #include <vtkPolyData.h>
 #include <vtkXMLPolyDataWriter.h>
 #endif
+#endif
 
 namespace OpFlow {
     template <typename Dim>
@@ -230,9 +234,9 @@ namespace OpFlow {
                 OP_DEBUG("Points at _level {}:", _level);
                 for (const auto &p : points) { OP_DEBUG("{}", p.toString()); }
                 dump_points(points, 1. / Math::int_pow(ratio, _level - 1),
-                            fmt::format("p_level{}.vtp", _level));
+                            std::format("p_level{}.vtp", _level));
                 dump_points(p_add, 1. / Math::int_pow(ratio, _level - 1),
-                            fmt::format("padd_level{}.vtp", _level));
+                            std::format("padd_level{}.vtp", _level));
 #endif
                 auto tree = MarkerTree(points);
                 auto boxes = domainPartition(tree, ret.fillRateThreshold, ret.slimThreshold);
@@ -319,9 +323,9 @@ namespace OpFlow {
                 OP_DEBUG("Points at _level {}:", _level);
                 for (const auto &p : points) { OP_DEBUG("{}", p.toString()); }
                 dump_points(points, 1. / Math::int_pow(ratio, _level - 1),
-                            fmt::format("p_level{}.vtp", _level));
+                            std::format("p_level{}.vtp", _level));
                 dump_points(p_add, 1. / Math::int_pow(ratio, _level - 1),
-                            fmt::format("padd_level{}.vtp", _level));
+                            std::format("padd_level{}.vtp", _level));
 #endif
                 auto tree = MarkerTree(points);
                 auto boxes = domainPartition(tree, ret.fillRateThreshold, ret.slimThreshold);
diff --git a/src/Core/Mesh/SemiStructured/CartesianAMRMeshView.hpp b/src/Core/Mesh/SemiStructured/CartesianAMRMeshView.hpp
index 66b5f751..4e9d9484 100644
--- a/src/Core/Mesh/SemiStructured/CartesianAMRMeshView.hpp
+++ b/src/Core/Mesh/SemiStructured/CartesianAMRMeshView.hpp
@@ -16,13 +16,14 @@
 #include "Core/Mesh/SemiStructured/CartesianAMRMeshBase.hpp"
 #include "Core/Mesh/SemiStructured/CartesianAMRMeshTrait.hpp"
 #include "DataStructures/Index/LevelMDIndex.hpp"
+#ifndef OPFLOW_INSIDE_MODULE
 #include <memory>
+#endif
 
 namespace OpFlow {
     template <typename T>
-    requires CartesianAMRMeshType<T>&&
-            Meta::isTemplateInstance<CartesianAMRMesh, T>::value struct CartesianAMRMeshView
-        : CartesianAMRMeshBase<CartesianAMRMeshView<T>> {
+        requires CartesianAMRMeshType<T> && Meta::isTemplateInstance<CartesianAMRMesh, T>::value
+    struct CartesianAMRMeshView : CartesianAMRMeshBase<CartesianAMRMeshView<T>> {
     private:
         std::add_pointer_t<typename std::add_const<T>::type> base = nullptr;
         static constexpr auto dim = internal::MeshTrait<T>::dim;
diff --git a/src/Core/Mesh/Structured/CartesianMesh.hpp b/src/Core/Mesh/Structured/CartesianMesh.hpp
index 0904e9a2..01be5b03 100644
--- a/src/Core/Mesh/Structured/CartesianMesh.hpp
+++ b/src/Core/Mesh/Structured/CartesianMesh.hpp
@@ -23,9 +23,11 @@
 #include "DataStructures/Pair.hpp"
 #include "DataStructures/Range/Ranges.hpp"
 #include "Math/Function/Integral.hpp"
+#ifndef OPFLOW_INSIDE_MODULE
 #include <array>
 #include <concepts>
 #include <cstdarg>
+#endif
 
 namespace OpFlow {
     enum class MeshExtMode { Undefined, Symm, Periodic, Uniform };
@@ -72,8 +74,8 @@ namespace OpFlow {
         }
 
         template <typename Other>
-        requires(internal::MeshTrait<Other>::dim == dim) auto&
-        operator=(const CartesianMeshView<Other>& view) {
+            requires(internal::MeshTrait<Other>::dim == dim)
+        auto& operator=(const CartesianMeshView<Other>& view) {
             _dims = view.getDims();
             _range = view.getRange();
             _ext_range = view.getExtRange();
diff --git a/src/Core/Mesh/Structured/CartesianMeshBase.hpp b/src/Core/Mesh/Structured/CartesianMeshBase.hpp
index b216c821..9c0f9fb6 100644
--- a/src/Core/Mesh/Structured/CartesianMeshBase.hpp
+++ b/src/Core/Mesh/Structured/CartesianMeshBase.hpp
@@ -17,7 +17,9 @@
 #include "Core/Mesh/Structured/StructuredMeshBase.hpp"
 #include "Core/Mesh/Structured/StructuredMeshTrait.hpp"
 #include "DataStructures/Range/Ranges.hpp"
+#ifndef OPFLOW_INSIDE_MODULE
 #include <array>
+#endif
 
 namespace OpFlow {
     template <typename Dim>
@@ -59,23 +61,23 @@ namespace OpFlow {
             static constexpr auto dim = internal::MeshTrait<Derived>::dim;
             std::string prefix;
             for (auto i = 0; i < level; ++i) prefix += "\t";
-            std::string ret = prefix + fmt::format("CartesianMesh<{}> :\n", dim);
+            std::string ret = prefix + std::format("CartesianMesh<{}> :\n", dim);
             prefix += "\t";
-            ret += prefix + fmt::format("dims: {}\n", this->dims);
-            ret += prefix + fmt::format("offsets: {}\n", this->offsets);
-            ret += prefix + fmt::format("range: {}\n", this->range.toString());
+            ret += prefix + std::format("dims: {}\n", this->dims);
+            ret += prefix + std::format("offsets: {}\n", this->offsets);
+            ret += prefix + std::format("range: {}\n", this->range.toString());
             auto range = getRange();
             for (auto i = 0; i < dim; ++i) {
-                ret += prefix + fmt::format("x[{}][{}] : ", i, range.end[i] - range.start[i]);
+                ret += prefix + std::format("x[{}][{}] : ", i, range.end[i] - range.start[i]);
                 for (auto j = range.start[i]; j < range.end[i]; ++j) {
-                    ret += fmt::format("{} ", this->x(i, j));
+                    ret += std::format("{} ", this->x(i, j));
                 }
                 ret += "\n";
             }
             for (auto i = 0; i < dim; ++i) {
-                ret += prefix + fmt::format("dx[{}][{}] : ", i, range.end[i] - range.start[i] - 1);
+                ret += prefix + std::format("dx[{}][{}] : ", i, range.end[i] - range.start[i] - 1);
                 for (auto j = range.start[i]; j < range.end[i] - 1; ++j) {
-                    ret += fmt::format("{} ", this->dx(i, j));
+                    ret += std::format("{} ", this->dx(i, j));
                 }
                 ret += "\n";
             }
diff --git a/src/Core/Mesh/Structured/CartesianMeshView.hpp b/src/Core/Mesh/Structured/CartesianMeshView.hpp
index 93c42aaf..889c535c 100644
--- a/src/Core/Mesh/Structured/CartesianMeshView.hpp
+++ b/src/Core/Mesh/Structured/CartesianMeshView.hpp
@@ -15,12 +15,14 @@
 
 #include "Core/Mesh/Structured/CartesianMeshBase.hpp"
 #include "Core/Mesh/Structured/CartesianMeshTrait.hpp"
+#ifndef OPFLOW_INSIDE_MODULE
 #include <memory>
+#endif
 
 namespace OpFlow {
     template <typename T>
-    requires CartesianMeshType<T>&& Meta::isTemplateInstance<CartesianMesh, T>::value struct CartesianMeshView
-        : CartesianMeshBase<CartesianMeshView<T>> {
+        requires CartesianMeshType<T> && Meta::isTemplateInstance<CartesianMesh, T>::value
+    struct CartesianMeshView : CartesianMeshBase<CartesianMeshView<T>> {
     private:
         std::add_pointer_t<typename std::add_const<T>::type> base = nullptr;
         static constexpr auto dim = internal::MeshTrait<T>::dim;
diff --git a/src/Core/Mesh/Structured/StructuredMeshTrait.hpp b/src/Core/Mesh/Structured/StructuredMeshTrait.hpp
index 6ae38dec..0521e9bb 100644
--- a/src/Core/Mesh/Structured/StructuredMeshTrait.hpp
+++ b/src/Core/Mesh/Structured/StructuredMeshTrait.hpp
@@ -15,7 +15,9 @@
 
 #include "Core/Mesh/MeshTrait.hpp"
 #include "Core/Meta.hpp"
+#ifndef OPFLOW_INSIDE_MODULE
 #include <type_traits>
+#endif
 
 namespace OpFlow {
     template <typename Derived>
diff --git a/src/Core/Meta.hpp b/src/Core/Meta.hpp
index f8cd4c46..c952f321 100644
--- a/src/Core/Meta.hpp
+++ b/src/Core/Meta.hpp
@@ -13,12 +13,14 @@
 #ifndef OPFLOW_META_HPP
 #define OPFLOW_META_HPP
 
+#ifndef OPFLOW_INSIDE_MODULE
 #include <array>
 #include <concepts>
 #include <functional>
 #include <tuple>
 #include <type_traits>
 #include <utility>
+#endif
 
 namespace OpFlow::Meta {
 
@@ -99,10 +101,8 @@ namespace OpFlow::Meta {
 
     template <typename T>
     concept StdRatio = requires {
-        { T::num }
-        ->std::convertible_to<int>;
-        { T::den }
-        ->std::convertible_to<int>;
+        { T::num } -> std::convertible_to<int>;
+        { T::den } -> std::convertible_to<int>;
         typename T::type;
     };
 
@@ -112,9 +112,7 @@ namespace OpFlow::Meta {
     };
 
     template <typename T>
-    concept BracketIndexable = requires(T t) {
-        t[0];
-    };
+    concept BracketIndexable = requires(T t) { t[0]; };
 
     template <bool b>
     struct bool_type : std::false_type {};
@@ -147,16 +145,16 @@ namespace OpFlow::Meta {
     struct make_integer_seq_impl;
 
     template <typename T, T start, T end, T step>
-            requires(step > 0 && start < end)
-            || (step<0 && start> end) struct make_integer_seq_impl<T, start, end, step> {
+        requires(step > 0 && start < end) || (step<0 && start> end)
+    struct make_integer_seq_impl<T, start, end, step> {
         using type = typename integer_seq_cat<
                 T, std::integer_sequence<T, start>,
                 typename make_integer_seq_impl<T, start + step, end, step>::type>::type;
     };
 
     template <typename T, T start, T end, T step>
-            requires(step > 0 && start >= end)
-            || (step < 0 && start <= end) struct make_integer_seq_impl<T, start, end, step> {
+        requires(step > 0 && start >= end) || (step < 0 && start <= end)
+    struct make_integer_seq_impl<T, start, end, step> {
         using type = std::integer_sequence<T>;
     };
 
diff --git a/src/Core/Operator/Arithmetic/AMDS.hpp b/src/Core/Operator/Arithmetic/AMDS.hpp
index b01f0d85..df40c3cf 100644
--- a/src/Core/Operator/Arithmetic/AMDS.hpp
+++ b/src/Core/Operator/Arithmetic/AMDS.hpp
@@ -23,9 +23,11 @@
 #include "Core/Operator/BinOpDefMacros.hpp.in"
 #include "Core/Operator/Operator.hpp"
 #include "Core/Operator/UniOpDefMacros.hpp.in"
+#ifndef OPFLOW_INSIDE_MODULE
 #include <cmath>
 #include <type_traits>
 #include <utility>
+#endif
 
 namespace OpFlow {
 
diff --git a/src/Core/Operator/Arithmetic/MinMax.hpp b/src/Core/Operator/Arithmetic/MinMax.hpp
index 466e82d6..64be5f63 100644
--- a/src/Core/Operator/Arithmetic/MinMax.hpp
+++ b/src/Core/Operator/Arithmetic/MinMax.hpp
@@ -21,9 +21,11 @@
 #include "Core/Operator/BinOpDefMacros.hpp.in"
 #include "Core/Operator/Operator.hpp"
 #include "Core/Operator/UniOpDefMacros.hpp.in"
+#ifndef OPFLOW_INSIDE_MODULE
 #include <cmath>
 #include <type_traits>
 #include <utility>
+#endif
 
 namespace OpFlow {
 
diff --git a/src/Core/Operator/Conditional.hpp b/src/Core/Operator/Conditional.hpp
index f0c8d28f..2efd0686 100644
--- a/src/Core/Operator/Conditional.hpp
+++ b/src/Core/Operator/Conditional.hpp
@@ -42,9 +42,9 @@ namespace OpFlow {
         template <FieldExprType C, FieldExprType T1, FieldExprType T2>
         static void prepare(const Expression<CondOp, C, T1, T2>& expr) {
             expr.initPropsFrom(expr.arg2);
-            expr.name = fmt::format("{} ? {} : {}", expr.arg1.name, expr.arg2.name, expr.arg3.name);
-            if constexpr (MeshBasedFieldExprType<
-                                  T1> && MeshBasedFieldExprType<T2> && MeshBasedFieldExprType<C>) {
+            expr.name = std::format("{} ? {} : {}", expr.arg1.name, expr.arg2.name, expr.arg3.name);
+            if constexpr (MeshBasedFieldExprType<T1> && MeshBasedFieldExprType<T2>
+                          && MeshBasedFieldExprType<C>) {
                 OP_ASSERT(expr.arg1.mesh == expr.arg2.mesh);
                 OP_ASSERT(expr.arg1.mesh == expr.arg3.mesh);
                 if constexpr (StructuredFieldExprType<T1> || SemiStructuredFieldExprType<T1>) {
@@ -83,7 +83,7 @@ namespace OpFlow {
             if constexpr (MeshBasedFieldExprType<T1> && MeshBasedFieldExprType<T2>)
                 OP_ASSERT(expr.arg2.mesh == expr.arg3.mesh);
             expr.initPropsFrom(expr.arg2);
-            expr.name = fmt::format("{} ? {} : {}", expr.arg1.name, expr.arg2.name, expr.arg3.name);
+            expr.name = std::format("{} ? {} : {}", expr.arg1.name, expr.arg2.name, expr.arg3.name);
             if constexpr (StructuredFieldExprType<T1>) {
                 expr.accessibleRange = DS::commonRange(expr.arg2.accessibleRange, expr.arg3.accessibleRange);
                 expr.assignableRange.setEmpty();
@@ -109,9 +109,9 @@ namespace OpFlow {
                 if (expr.arg1.get()) {
                     expr.name = expr.arg2.name;
                 } else
-                    expr.name = fmt::format("{}", expr.arg3.get());
+                    expr.name = std::format("{}", expr.arg3.get());
             } else
-                expr.name = fmt::format("{} ? {} : {}", expr.arg1.name, expr.arg2.name, expr.arg3.get());
+                expr.name = std::format("{} ? {} : {}", expr.arg1.name, expr.arg2.name, expr.arg3.get());
         }
 
         template <typename C, Meta::Numerical T1, FieldExprType T2>
@@ -119,11 +119,11 @@ namespace OpFlow {
             expr.initPropsFrom(expr.arg3);
             if constexpr (ScalarExprType<C>) {
                 if (expr.arg1.get()) {
-                    expr.name = fmt::format("{}", expr.arg2.get());
+                    expr.name = std::format("{}", expr.arg2.get());
                 } else
                     expr.name = expr.arg3.name;
             } else
-                expr.name = fmt::format("{} ? {} : {}", expr.arg1.name, expr.arg2.get(), expr.arg3.name);
+                expr.name = std::format("{} ? {} : {}", expr.arg1.name, expr.arg2.get(), expr.arg3.name);
         }
     };
 
diff --git a/src/Core/Operator/Convolution/Convolution.hpp b/src/Core/Operator/Convolution/Convolution.hpp
index 6b75df71..85b204b2 100644
--- a/src/Core/Operator/Convolution/Convolution.hpp
+++ b/src/Core/Operator/Convolution/Convolution.hpp
@@ -44,8 +44,9 @@ namespace OpFlow {
         }
 
         template <StructuredFieldExprType E, typename T, typename I>
-        requires(internal::ExprTrait<E>::dim == d) OPFLOW_STRONG_INLINE
-                static auto eval(const E& e, const ScalarExpr<DS::FixedSizeTensor<T, ns...>>& kernel, I&& i) {
+            requires(internal::ExprTrait<E>::dim == d)
+        OPFLOW_STRONG_INLINE static auto
+        eval(const E& e, const ScalarExpr<DS::FixedSizeTensor<T, ns...>>& kernel, I&& i) {
             DS::Range<d> range;
             for (auto j = 0; j < d; ++j) {
                 range.start[j] = i[j] - dims[j] / 2;
@@ -62,8 +63,9 @@ namespace OpFlow {
         }
 
         template <CartAMRFieldExprType E, typename T, typename I>
-        requires(internal::ExprTrait<E>::dim == d) OPFLOW_STRONG_INLINE
-                static auto eval(const E& e, const ScalarExpr<DS::FixedSizeTensor<T, ns...>>& kernel, I&& i) {
+            requires(internal::ExprTrait<E>::dim == d)
+        OPFLOW_STRONG_INLINE static auto
+        eval(const E& e, const ScalarExpr<DS::FixedSizeTensor<T, ns...>>& kernel, I&& i) {
             DS::LevelRange<d> range;
             for (auto j = 0; j < d; ++j) {
                 range.start[j] = i[j] - dims[j] / 2;
@@ -82,12 +84,13 @@ namespace OpFlow {
         }
 
         template <StructuredFieldExprType E, typename T>
-        requires(internal::ExprTrait<E>::dim == d) static void prepare(
-                const Expression<Convolution, E, ScalarExpr<DS::FixedSizeTensor<T, ns...>>>& expr) {
+            requires(internal::ExprTrait<E>::dim == d)
+        static void
+        prepare(const Expression<Convolution, E, ScalarExpr<DS::FixedSizeTensor<T, ns...>>>& expr) {
             expr.initPropsFrom(expr.arg1);
 
             // name
-            expr.name = fmt::format("Convolution<{}>({})", d, expr.arg1.name);
+            expr.name = std::format("Convolution<{}>({})", d, expr.arg1.name);
 
             // ranges
             for (auto i = 0; i < d; ++i) {
@@ -102,12 +105,13 @@ namespace OpFlow {
         }
 
         template <CartAMRFieldExprType E, typename T>
-        requires(internal::ExprTrait<E>::dim == d) static void prepare(
-                const Expression<Convolution, E, ScalarExpr<DS::FixedSizeTensor<T, ns...>>>& expr) {
+            requires(internal::ExprTrait<E>::dim == d)
+        static void
+        prepare(const Expression<Convolution, E, ScalarExpr<DS::FixedSizeTensor<T, ns...>>>& expr) {
             expr.initPropsFrom(expr.arg1);
 
             // name
-            expr.name = fmt::format("Convolution<{}>({})", d, expr.arg1.name);
+            expr.name = std::format("Convolution<{}>({})", d, expr.arg1.name);
 
             // ranges
             for (auto& l : expr.accessibleRanges)
@@ -162,7 +166,8 @@ namespace OpFlow {
     }// namespace internal
 
     template <std::integral auto... ns, typename E, typename D>
-            requires StructuredFieldExprType<E> || CartAMRFieldExprType<E> auto conv(E&& expr, const DS::FixedSizeTensor<D, ns...>& kernel) {
+        requires StructuredFieldExprType<E> || CartAMRFieldExprType<E>
+    auto conv(E&& expr, const DS::FixedSizeTensor<D, ns...>& kernel) {
         static_assert(((ns % 2 == 1) && ...), "Only odd sized conv kernel is allowed.");
         return makeExpression<Convolution<ns...>>(expr, ScalarExpr(kernel));
     }
diff --git a/src/Core/Operator/FDMOperators/D1FirstOrderBiasedDownwind.hpp b/src/Core/Operator/FDMOperators/D1FirstOrderBiasedDownwind.hpp
index 9e9ea004..93af56e6 100644
--- a/src/Core/Operator/FDMOperators/D1FirstOrderBiasedDownwind.hpp
+++ b/src/Core/Operator/FDMOperators/D1FirstOrderBiasedDownwind.hpp
@@ -69,7 +69,7 @@ namespace OpFlow {
             expr.initPropsFrom(expr.arg1);
 
             // name
-            expr.name = fmt::format("d1<D1FirstOrderBiasedDownwind<{}>>({})", d, expr.arg1.name);
+            expr.name = std::format("d1<D1FirstOrderBiasedDownwind<{}>>({})", d, expr.arg1.name);
 
             // mesh
             expr.mesh = expr.arg1.mesh.getView();
@@ -89,7 +89,7 @@ namespace OpFlow {
             expr.initPropsFrom(expr.arg1);
 
             // name
-            expr.name = fmt::format("d1<D1FirstOrderBiasedDownwind<{}>>({})", d, expr.arg1.name);
+            expr.name = std::format("d1<D1FirstOrderBiasedDownwind<{}>>({})", d, expr.arg1.name);
 
             // ranges
             if (expr.arg1.loc[d] == LocOnMesh::Corner) {
diff --git a/src/Core/Operator/FDMOperators/D1FirstOrderBiasedUpwind.hpp b/src/Core/Operator/FDMOperators/D1FirstOrderBiasedUpwind.hpp
index 12428bc1..6a3a766a 100644
--- a/src/Core/Operator/FDMOperators/D1FirstOrderBiasedUpwind.hpp
+++ b/src/Core/Operator/FDMOperators/D1FirstOrderBiasedUpwind.hpp
@@ -69,7 +69,7 @@ namespace OpFlow {
         static inline void prepare(const Expression<D1FirstOrderBiasedUpwind, E>& expr) {
             expr.initPropsFrom(expr.arg1);
             // name
-            expr.name = fmt::format("d1<D1FirstOrderBiasedUpwind<{}>>(", d) + expr.arg1.name + ")";
+            expr.name = std::format("d1<D1FirstOrderBiasedUpwind<{}>>(", d) + expr.arg1.name + ")";
 
             // mesh
             expr.mesh = expr.arg1.mesh.getView();
@@ -88,7 +88,7 @@ namespace OpFlow {
             expr.initPropsFrom(expr.arg1);
 
             // name
-            expr.name = fmt::format("d1<D1FirstOrderBiasedUpwind<{}>>({})", d, expr.arg1.name);
+            expr.name = std::format("d1<D1FirstOrderBiasedUpwind<{}>>({})", d, expr.arg1.name);
 
             // ranges
             if (expr.arg1.loc[d] == LocOnMesh::Corner) {
diff --git a/src/Core/Operator/FDMOperators/D1FirstOrderCentered.hpp b/src/Core/Operator/FDMOperators/D1FirstOrderCentered.hpp
index f39f8cab..ac1cd04e 100644
--- a/src/Core/Operator/FDMOperators/D1FirstOrderCentered.hpp
+++ b/src/Core/Operator/FDMOperators/D1FirstOrderCentered.hpp
@@ -38,7 +38,7 @@ namespace OpFlow {
         template <CartesianFieldExprType E>
         static inline void prepare(const Expression<D1FirstOrderCentered, E>& expr) {
             // name
-            expr.name = fmt::format("d1<D1FirstOrderCentered<{}>>(", d) + expr.arg1.name + ")";
+            expr.name = std::format("d1<D1FirstOrderCentered<{}>>(", d) + expr.arg1.name + ")";
 
             // mesh
             expr.mesh = expr.arg1.mesh.getView();
diff --git a/src/Core/Operator/FDMOperators/D1WENO53Downwind.hpp b/src/Core/Operator/FDMOperators/D1WENO53Downwind.hpp
index bea4eecb..90d0c6cf 100644
--- a/src/Core/Operator/FDMOperators/D1WENO53Downwind.hpp
+++ b/src/Core/Operator/FDMOperators/D1WENO53Downwind.hpp
@@ -102,7 +102,7 @@ namespace OpFlow {
             expr.initPropsFrom(expr.arg1);
 
             // name
-            expr.name = fmt::format("d1<D1WENO53Downwind<{}>>({})", d, expr.arg1.name);
+            expr.name = std::format("d1<D1WENO53Downwind<{}>>({})", d, expr.arg1.name);
 
             // ranges
             expr.accessibleRange.start[d] += 3;
@@ -117,7 +117,7 @@ namespace OpFlow {
             expr.initPropsFrom(expr.arg1);
 
             // name
-            expr.name = fmt::format("d1<D1WENO53Downwind<{}>>({})", d, expr.arg1.name);
+            expr.name = std::format("d1<D1WENO53Downwind<{}>>({})", d, expr.arg1.name);
             // ranges
             auto levels = expr.getLevels();
             for (auto l = 0; l < levels; ++l) {
diff --git a/src/Core/Operator/FDMOperators/D1WENO53Upwind.hpp b/src/Core/Operator/FDMOperators/D1WENO53Upwind.hpp
index cf2757be..14031624 100644
--- a/src/Core/Operator/FDMOperators/D1WENO53Upwind.hpp
+++ b/src/Core/Operator/FDMOperators/D1WENO53Upwind.hpp
@@ -99,7 +99,7 @@ namespace OpFlow {
             constexpr auto dim = internal::CartesianFieldExprTrait<E>::dim;
             expr.initPropsFrom(expr.arg1);
             // name
-            expr.name = fmt::format("d1<D1WENO53Upwind<{}>>({})", d, expr.arg1.name);
+            expr.name = std::format("d1<D1WENO53Upwind<{}>>({})", d, expr.arg1.name);
             // ranges
             expr.accessibleRange.start[d] += 3;
             expr.accessibleRange.end[d] -= 3;
@@ -113,7 +113,7 @@ namespace OpFlow {
             expr.initPropsFrom(expr.arg1);
 
             // name
-            expr.name = fmt::format("d1<D1WENO53Upwind<{}>>({})", d, expr.arg1.name);
+            expr.name = std::format("d1<D1WENO53Upwind<{}>>({})", d, expr.arg1.name);
 
             // ranges
             auto levels = expr.getLevels();
diff --git a/src/Core/Operator/FDMOperators/D2SecondOrderCentered.hpp b/src/Core/Operator/FDMOperators/D2SecondOrderCentered.hpp
index 66f4c667..b0677075 100644
--- a/src/Core/Operator/FDMOperators/D2SecondOrderCentered.hpp
+++ b/src/Core/Operator/FDMOperators/D2SecondOrderCentered.hpp
@@ -187,7 +187,7 @@ namespace OpFlow {
         OPFLOW_STRONG_INLINE static void prepare(const Expression<D2SecondOrderCentered, E>& expr) {
             expr.initPropsFrom(expr.arg1);
             // name
-            expr.name = fmt::format("d2<D2SecondOrderCentered<{}>>({})", d, expr.arg1.name);
+            expr.name = std::format("d2<D2SecondOrderCentered<{}>>({})", d, expr.arg1.name);
 
             // mesh
             expr.mesh = expr.arg1.mesh.getView();
@@ -209,7 +209,7 @@ namespace OpFlow {
             expr.initPropsFrom(expr.arg1);
 
             // name
-            expr.name = fmt::format("d2<D2SecondOrderCentered<{}>>({})", d, expr.arg1.name);
+            expr.name = std::format("d2<D2SecondOrderCentered<{}>>({})", d, expr.arg1.name);
 
             // ranges
             if (expr.arg1.loc[d] == LocOnMesh::Corner) {
diff --git a/src/Core/Operator/IdentityOp.hpp b/src/Core/Operator/IdentityOp.hpp
index b160102b..b5314ecc 100644
--- a/src/Core/Operator/IdentityOp.hpp
+++ b/src/Core/Operator/IdentityOp.hpp
@@ -25,7 +25,8 @@ namespace OpFlow {
         constexpr static auto bc_width = 0;
 
         template <typename E>
-                requires FieldExprType<E> || ScalarExprType<E> OPFLOW_STRONG_INLINE static auto eval(const E& e, auto&& i) {
+            requires FieldExprType<E> || ScalarExprType<E>
+        OPFLOW_STRONG_INLINE static auto eval(const E& e, auto&& i) {
             return e.evalAt(OP_PERFECT_FOWD(i));
         }
 
@@ -33,7 +34,7 @@ namespace OpFlow {
         static void prepare(const Expression<IdentityOp, E>& expr) {
             expr.initPropsFrom(expr.arg1);
             // name
-            expr.name = fmt::format("Identity({})", expr.arg1.name);
+            expr.name = std::format("Identity({})", expr.arg1.name);
         }
     };
 
diff --git a/src/Core/Operator/Interpolator/D1FluxLimiter.hpp b/src/Core/Operator/Interpolator/D1FluxLimiter.hpp
index 6d8a384a..7e9d803f 100644
--- a/src/Core/Operator/Interpolator/D1FluxLimiter.hpp
+++ b/src/Core/Operator/Interpolator/D1FluxLimiter.hpp
@@ -22,20 +22,17 @@
 namespace OpFlow {
     template <typename K>
     concept FluxLimiterKernel = requires(double r) {
-        { K::eval(r) }
-        ->std::same_as<double>;
+        { K::eval(r) } -> std::same_as<double>;
     };
 
     template <typename K>
     concept LinearFluxLimiterKernel
-            = FluxLimiterKernel<K>&& requires(DS::StencilPad<DS::MDIndex<2>> pad, double r) {
-        // should take slop_u & slop_f in a type only support + and * to a number
-        { K::eval(pad, pad) }
-        ->std::same_as<DS::StencilPad<DS::MDIndex<2>>>;
-        // should take normal separate slops instead of ratio
-        { K::eval(r, r) }
-        ->std::same_as<double>;
-    };
+            = FluxLimiterKernel<K> && requires(DS::StencilPad<DS::MDIndex<2>> pad, double r) {
+                  // should take slop_u & slop_f in a type only support + and * to a number
+                  { K::eval(pad, pad) } -> std::same_as<DS::StencilPad<DS::MDIndex<2>>>;
+                  // should take normal separate slops instead of ratio
+                  { K::eval(r, r) } -> std::same_as<double>;
+              };
 
     namespace internal {
         template <FluxLimiterKernel Kernel, std::size_t d, IntpDirection dir>
@@ -154,7 +151,7 @@ namespace OpFlow {
                               "D1FluxLimiterIntp error: Expression {} located in corner in dimension = {}",
                               expr.arg2.getName(), d);
                 expr.initPropsFrom(expr.arg2);
-                expr.name = fmt::format("D1Intp<D1FluxLimiter, {}, Cen2Cor>({})", d, expr.arg2.name);
+                expr.name = std::format("D1Intp<D1FluxLimiter, {}, Cen2Cor>({})", d, expr.arg2.name);
                 expr.loc[d] = LocOnMesh ::Corner;
                 expr.accessibleRange.start[d] += 2;
                 expr.accessibleRange.end[d] -= 1;
@@ -188,7 +185,7 @@ namespace OpFlow {
                               "D1FluxLimiterIntp error: Expression {} located in center in dimension = {}",
                               expr.arg2.getName(), d);
                 expr.initPropsFrom(expr.arg2);
-                expr.name = fmt::format("D1Intp<D1FluxLimiter, {}, Cor2Cen>({})", d, expr.arg2.name);
+                expr.name = std::format("D1Intp<D1FluxLimiter, {}, Cor2Cen>({})", d, expr.arg2.name);
                 expr.loc[d] = LocOnMesh ::Center;
                 expr.accessibleRange.start[d] += 1;
                 expr.accessibleRange.end[d] -= 2;
diff --git a/src/Core/Operator/Interpolator/D1Linear.hpp b/src/Core/Operator/Interpolator/D1Linear.hpp
index 29411b5b..e7ba66ce 100644
--- a/src/Core/Operator/Interpolator/D1Linear.hpp
+++ b/src/Core/Operator/Interpolator/D1Linear.hpp
@@ -49,7 +49,7 @@ namespace OpFlow {
         static void prepare(const Expression<D1Linear, T>& expr) {
             if constexpr (dir == IntpDirection::Cen2Cor) {
                 expr.initPropsFrom(expr.arg1);
-                expr.name = fmt::format("D1Intp<D1Linear, {}, Cen2Cor>({})", d, expr.arg1.name);
+                expr.name = std::format("D1Intp<D1Linear, {}, Cen2Cor>({})", d, expr.arg1.name);
                 expr.loc = expr.arg1.loc;
                 expr.loc[d] = LocOnMesh::Corner;
                 expr.mesh = expr.arg1.mesh.getView();
@@ -59,7 +59,7 @@ namespace OpFlow {
                 expr.assignableRange.setEmpty();
             } else {
                 expr.initPropsFrom(expr.arg1);
-                expr.name = fmt::format("D1Intp<D1Linear, {}, Cor2Cen>({})", d, expr.arg1.name);
+                expr.name = std::format("D1Intp<D1Linear, {}, Cor2Cen>({})", d, expr.arg1.name);
                 expr.loc = expr.arg1.loc;
                 expr.loc[d] = LocOnMesh::Center;
                 expr.mesh = expr.arg1.mesh.getView();
diff --git a/src/Core/Operator/Interpolator/FluxLimiterKernels.hpp b/src/Core/Operator/Interpolator/FluxLimiterKernels.hpp
index f9934a3f..09614a28 100644
--- a/src/Core/Operator/Interpolator/FluxLimiterKernels.hpp
+++ b/src/Core/Operator/Interpolator/FluxLimiterKernels.hpp
@@ -13,9 +13,11 @@
 #ifndef OPFLOW_FLUXLIMITERKERNELS_HPP
 #define OPFLOW_FLUXLIMITERKERNELS_HPP
 
+#ifndef OPFLOW_INSIDE_MODULE
 #include <algorithm>
 #include <cmath>
 #include <ratio>
+#endif
 
 namespace OpFlow {
     enum class KappaScheme {
diff --git a/src/Core/Operator/Logical/Classify.hpp b/src/Core/Operator/Logical/Classify.hpp
index c656654a..6e7f6da1 100644
--- a/src/Core/Operator/Logical/Classify.hpp
+++ b/src/Core/Operator/Logical/Classify.hpp
@@ -20,9 +20,11 @@
 #include "Core/Operator/BinOpDefMacros.hpp.in"
 #include "Core/Operator/Operator.hpp"
 #include "Core/Operator/UniOpDefMacros.hpp.in"
+#ifndef OPFLOW_INSIDE_MODULE
 #include <cmath>
 #include <type_traits>
 #include <utility>
+#endif
 
 #ifndef OPFLOW_CLASSIFY_HPP
 #define OPFLOW_CLASSIFY_HPP
diff --git a/src/Core/Operator/Logical/Compare.hpp b/src/Core/Operator/Logical/Compare.hpp
index 84555723..076c45de 100644
--- a/src/Core/Operator/Logical/Compare.hpp
+++ b/src/Core/Operator/Logical/Compare.hpp
@@ -19,7 +19,9 @@
 #include "Core/Operator/BinOpDefMacros.hpp.in"
 #include "Core/Operator/Operator.hpp"
 
+#ifndef OPFLOW_INSIDE_MODULE
 #include <cmath>
+#endif
 
 namespace OpFlow {
     DEFINE_BINOP(GreaterThan, >)
diff --git a/src/Core/Operator/PerElemOpAdaptor.hpp b/src/Core/Operator/PerElemOpAdaptor.hpp
index ba6c475c..ebc0a2f6 100644
--- a/src/Core/Operator/PerElemOpAdaptor.hpp
+++ b/src/Core/Operator/PerElemOpAdaptor.hpp
@@ -44,7 +44,7 @@ namespace OpFlow {
         static void prepare(const Expression<UniOpAdaptor, E>& expr) {
             expr.initPropsFrom(expr.arg1);
             // name
-            expr.name = fmt::format("{}({})", Functor.getName().to_string(), expr.arg1.name);
+            expr.name = std::format("{}({})", Functor.getName().to_string(), expr.arg1.name);
         }
     };
 
@@ -86,7 +86,7 @@ namespace OpFlow {
         static void prepare(const Expression<BinOpAdaptor, E1, E2>& expr) {
             expr.initPropsFrom(expr.arg1);
             // name
-            expr.name = fmt::format("{}({}, {})", Functor.getName().to_string(), expr.arg1.name,
+            expr.name = std::format("{}({}, {})", Functor.getName().to_string(), expr.arg1.name,
                                     expr.arg2.name);
         }
     };
diff --git a/src/Core/Parallel/AbstractSplitStrategy.hpp b/src/Core/Parallel/AbstractSplitStrategy.hpp
index ea1697b9..dc31c98d 100644
--- a/src/Core/Parallel/AbstractSplitStrategy.hpp
+++ b/src/Core/Parallel/AbstractSplitStrategy.hpp
@@ -15,8 +15,10 @@
 
 #include "Core/Field/FieldExprTrait.hpp"
 #include "Core/Parallel/ParallelPlan.hpp"
+#ifndef OPFLOW_INSIDE_MODULE
 #include <string>
 #include <vector>
+#endif
 
 namespace OpFlow {
     template <FieldExprType F>
diff --git a/src/Core/Parallel/EvenSplitStrategy.hpp b/src/Core/Parallel/EvenSplitStrategy.hpp
index 600cf12d..27588ff3 100644
--- a/src/Core/Parallel/EvenSplitStrategy.hpp
+++ b/src/Core/Parallel/EvenSplitStrategy.hpp
@@ -16,14 +16,18 @@
 #include "Core/Field/FieldExprTrait.hpp"
 #include "Core/Field/MeshBased/Structured/StructuredFieldExprTrait.hpp"
 #include "Core/Parallel/AbstractSplitStrategy.hpp"
+#ifndef OPFLOW_INSIDE_MODULE
 #include <algorithm>
 #include <array>
 #include <string>
 #include <utility>
 #include <vector>
+#endif
 #ifdef OPFLOW_WITH_MPI
+#ifndef OPFLOW_INSIDE_MODULE
 #include <mpi.h>
 #endif
+#endif
 
 namespace OpFlow {
     template <FieldExprType F>
diff --git a/src/Core/Parallel/ManualSplitStrategy.hpp b/src/Core/Parallel/ManualSplitStrategy.hpp
index 4cfb1549..4a6209e7 100644
--- a/src/Core/Parallel/ManualSplitStrategy.hpp
+++ b/src/Core/Parallel/ManualSplitStrategy.hpp
@@ -16,11 +16,15 @@
 #include "Core/Field/FieldExprTrait.hpp"
 #include "Core/Parallel/AbstractSplitStrategy.hpp"
 #ifdef OPFLOW_WITH_MPI
+#ifndef OPFLOW_INSIDE_MODULE
 #include <mpi.h>
 #endif
+#endif
+#ifndef OPFLOW_INSIDE_MODULE
 #include <array>
 #include <string>
 #include <vector>
+#endif
 
 namespace OpFlow {
     /// \brief Manually specified split ranges strategy
diff --git a/src/Core/Parallel/ParallelInfo.hpp b/src/Core/Parallel/ParallelInfo.hpp
index 4ee750cd..2fdb7001 100644
--- a/src/Core/Parallel/ParallelInfo.hpp
+++ b/src/Core/Parallel/ParallelInfo.hpp
@@ -15,12 +15,18 @@
 
 #include "Core/Parallel/ParallelType.hpp"
 #ifdef OPFLOW_WITH_MPI
+#ifndef OPFLOW_INSIDE_MODULE
 #include <mpi.h>
 #endif
+#endif
 #ifdef OPFLOW_WITH_OPENMP
+#ifndef OPFLOW_INSIDE_MODULE
 #include <omp.h>
 #endif
+#endif
+#ifndef OPFLOW_INSIDE_MODULE
 #include <oneapi/tbb.h>
+#endif
 
 namespace OpFlow {
     struct NodeInfo {
diff --git a/src/Core/Parallel/ParticleGuidedSplitStrategy.hpp b/src/Core/Parallel/ParticleGuidedSplitStrategy.hpp
index 83e5ed74..549795aa 100644
--- a/src/Core/Parallel/ParticleGuidedSplitStrategy.hpp
+++ b/src/Core/Parallel/ParticleGuidedSplitStrategy.hpp
@@ -16,12 +16,16 @@
 #include "Core/Field/MeshBased/Structured/CartesianFieldTrait.hpp"
 #include "Core/Parallel/AbstractSplitStrategy.hpp"
 #ifdef OPFLOW_WITH_MPI
+#ifndef OPFLOW_INSIDE_MODULE
 #include <mpi.h>
 #endif
+#endif
+#ifndef OPFLOW_INSIDE_MODULE
 #include <array>
 #include <bit>
 #include <string>
 #include <vector>
+#endif
 
 namespace OpFlow {
     template <int d>
diff --git a/src/Core/Solvers/IJ/IJSolver.hpp b/src/Core/Solvers/IJ/IJSolver.hpp
index 5aae9c97..39004ddc 100644
--- a/src/Core/Solvers/IJ/IJSolver.hpp
+++ b/src/Core/Solvers/IJ/IJSolver.hpp
@@ -13,6 +13,7 @@
 #ifndef OPFLOW_IJSOLVER_HPP
 #define OPFLOW_IJSOLVER_HPP
 
+#ifndef OPFLOW_INSIDE_MODULE
 #include <optional>
 
 #include <cstddef>
@@ -22,8 +23,10 @@
 
 #include <amgcl/adapter/crs_tuple.hpp>
 #include <amgcl/backend/builtin.hpp>
+#endif
 
 #ifdef OPFLOW_WITH_MPI
+#ifndef OPFLOW_INSIDE_MODULE
 #include <amgcl/mpi/amg.hpp>
 #include <amgcl/mpi/coarsening/smoothed_aggregation.hpp>
 #include <amgcl/mpi/distributed_matrix.hpp>
@@ -37,7 +40,9 @@
 #include <amgcl/mpi/solver/preonly.hpp>
 #include <mpi.h>
 #endif
+#endif
 
+#ifndef OPFLOW_INSIDE_MODULE
 #include <amgcl/amg.hpp>
 #include <amgcl/coarsening/smoothed_aggregation.hpp>
 #include <amgcl/make_solver.hpp>
@@ -53,12 +58,17 @@
 #include <amgcl/adapter/zero_copy.hpp>
 #include <amgcl/io/binary.hpp>
 #include <amgcl/profiler.hpp>
+#endif
 
 #if defined(AMGCL_HAVE_PARMETIS)
+#ifndef OPFLOW_INSIDE_MODULE
 #include <amgcl/mpi/partition/parmetis.hpp>
+#endif
 #elif defined(AMGCL_HAVE_SCOTCH)
+#ifndef OPFLOW_INSIDE_MODULE
 #include <amgcl/mpi/partition/ptscotch.hpp>
 #endif
+#endif
 
 namespace OpFlow {
     template <typename Solver>
diff --git a/src/Core/Solvers/SemiStruct/SemiStructSolver.hpp b/src/Core/Solvers/SemiStruct/SemiStructSolver.hpp
index f495205a..42417b84 100644
--- a/src/Core/Solvers/SemiStruct/SemiStructSolver.hpp
+++ b/src/Core/Solvers/SemiStruct/SemiStructSolver.hpp
@@ -14,9 +14,13 @@
 #define OPFLOW_SEMISTRUCTSOLVER_HPP
 
 #ifdef OPFLOW_WITH_MPI
+#ifndef OPFLOW_INSIDE_MODULE
 #include <mpi.h>
 #endif
+#endif
+#ifndef OPFLOW_INSIDE_MODULE
 #include <optional>
+#endif
 
 namespace OpFlow {
     enum class SemiStructSolverType {
diff --git a/src/Core/Solvers/Struct/StructSolver.hpp b/src/Core/Solvers/Struct/StructSolver.hpp
index e7a74e37..ed01f628 100644
--- a/src/Core/Solvers/Struct/StructSolver.hpp
+++ b/src/Core/Solvers/Struct/StructSolver.hpp
@@ -13,8 +13,10 @@
 #ifndef OPFLOW_STRUCTSOLVER_HPP
 #define OPFLOW_STRUCTSOLVER_HPP
 
+#ifndef OPFLOW_INSIDE_MODULE
 #include <HYPRE.h>
 #include <optional>
+#endif
 
 namespace OpFlow {
 
diff --git a/src/Core/Solvers/Struct/StructSolverPFMG.hpp b/src/Core/Solvers/Struct/StructSolverPFMG.hpp
index 1b339ca5..63602f9b 100644
--- a/src/Core/Solvers/Struct/StructSolverPFMG.hpp
+++ b/src/Core/Solvers/Struct/StructSolverPFMG.hpp
@@ -13,7 +13,9 @@
 #ifndef OPFLOW_STRUCTSOLVERPFMG_HPP
 #define OPFLOW_STRUCTSOLVERPFMG_HPP
 
+#ifndef OPFLOW_INSIDE_MODULE
 #include <utility>
+#endif
 
 #include "StructSolver.hpp"
 
diff --git a/src/DataStructures/Arrays/Arrays.hpp b/src/DataStructures/Arrays/Arrays.hpp
index b72a8ebe..bf36fccd 100644
--- a/src/DataStructures/Arrays/Arrays.hpp
+++ b/src/DataStructures/Arrays/Arrays.hpp
@@ -19,7 +19,9 @@
 #include "DataStructures/Arrays/Tensor/PlainTensor.hpp"
 #include "DataStructures/Index/MDIndex.hpp"
 #include "DataStructures/Index/RangedIndex.hpp"
+#ifndef OPFLOW_INSIDE_MODULE
 #include <utility>
+#endif
 
 namespace OpFlow::DS {
     // General array
diff --git a/src/DataStructures/Arrays/CoordVector.hpp b/src/DataStructures/Arrays/CoordVector.hpp
index 41cc21ed..b43619a9 100644
--- a/src/DataStructures/Arrays/CoordVector.hpp
+++ b/src/DataStructures/Arrays/CoordVector.hpp
@@ -15,7 +15,9 @@
 
 #include "Core/Meta.hpp"
 #include "OffsetVector.hpp"
+#ifndef OPFLOW_INSIDE_MODULE
 #include <cmath>
+#endif
 
 namespace OpFlow::DS {
     template <Meta::Numerical T>
diff --git a/src/DataStructures/Arrays/OffsetVector.hpp b/src/DataStructures/Arrays/OffsetVector.hpp
index 6fd5981f..f39fba5d 100644
--- a/src/DataStructures/Arrays/OffsetVector.hpp
+++ b/src/DataStructures/Arrays/OffsetVector.hpp
@@ -13,10 +13,12 @@
 #ifndef OPFLOW_OFFSETVECTOR_HPP
 #define OPFLOW_OFFSETVECTOR_HPP
 
-#include "fmt/format.h"
+#include <format>
+#ifndef OPFLOW_INSIDE_MODULE
 #include <cmath>
 #include <string>
 #include <vector>
+#endif
 
 namespace OpFlow::DS {
     template <typename T>
@@ -55,7 +57,7 @@ namespace OpFlow::DS {
 
         auto toString() const {
             std::string ret;
-            ret += fmt::format("offset = {} data = {}", offset, val);
+            ret += std::format("offset = {} data = {}", offset, val);
             return ret;
         }
 
diff --git a/src/DataStructures/Arrays/Tensor/FixedSizeTensor.hpp b/src/DataStructures/Arrays/Tensor/FixedSizeTensor.hpp
index 52f9e9b6..d6c5d295 100644
--- a/src/DataStructures/Arrays/Tensor/FixedSizeTensor.hpp
+++ b/src/DataStructures/Arrays/Tensor/FixedSizeTensor.hpp
@@ -16,7 +16,9 @@
 #include "Core/Meta.hpp"
 #include "DataStructures/Arrays/Tensor/TensorBase.hpp"
 #include "DataStructures/Index/MDIndex.hpp"
+#ifndef OPFLOW_INSIDE_MODULE
 #include <array>
+#endif
 
 namespace OpFlow::DS {
     namespace internal {
@@ -32,10 +34,12 @@ namespace OpFlow::DS {
 
     }// namespace internal
     template <Meta::Numerical T, auto... n>
-    requires(std::integral<decltype(n)>&&...) struct FixedSizeTensor;
+        requires(std::integral<decltype(n)> && ...)
+    struct FixedSizeTensor;
     namespace internal {
         template <Meta::Numerical T, auto... n>
-        requires(std::integral<decltype(n)>&&...) struct TensorTrait<FixedSizeTensor<T, n...>> {
+            requires(std::integral<decltype(n)> && ...)
+        struct TensorTrait<FixedSizeTensor<T, n...>> {
             using scalar_type = T;
             static constexpr auto dim = sizeof...(n);
         };
@@ -44,15 +48,16 @@ namespace OpFlow::DS {
         struct is_fixed_size_tensor : std::false_type {};
 
         template <Meta::Numerical T, auto... n>
-        requires(std::integral<decltype(n)>&&...) struct is_fixed_size_tensor<FixedSizeTensor<T, n...>>
-            : std::true_type {};
+            requires(std::integral<decltype(n)> && ...)
+        struct is_fixed_size_tensor<FixedSizeTensor<T, n...>> : std::true_type {};
     }// namespace internal
 
     template <typename T>
     concept FixedSizeTensorType = internal::is_fixed_size_tensor<Meta::RealType<T>>::value;
 
     template <Meta::Numerical T, auto... n>
-    requires(std::integral<decltype(n)>&&...) struct FixedSizeTensor : Tensor<FixedSizeTensor<T, n...>> {
+        requires(std::integral<decltype(n)> && ...)
+    struct FixedSizeTensor : Tensor<FixedSizeTensor<T, n...>> {
         constexpr static auto N = sizeof...(n);
         constexpr FixedSizeTensor() = default;
         constexpr explicit FixedSizeTensor(T val) { _val.fill(val); }
diff --git a/src/DataStructures/Arrays/Tensor/PlainTensor.hpp b/src/DataStructures/Arrays/Tensor/PlainTensor.hpp
index 36f91ebf..a10efc5a 100644
--- a/src/DataStructures/Arrays/Tensor/PlainTensor.hpp
+++ b/src/DataStructures/Arrays/Tensor/PlainTensor.hpp
@@ -21,18 +21,21 @@
 #include "TensorBase.hpp"
 #include "Utils/Allocator/AlignedAllocator.hpp"
 #include "Utils/Allocator/StaticAllocator.hpp"
+#ifndef OPFLOW_INSIDE_MODULE
 #include <array>
 #include <concepts>
 #include <memory>
+#endif
 
 namespace OpFlow::DS {
     template <typename ScalarType, int d, typename Allocator>
-    requires Utils::StaticAllocatorType<ScalarType, Allocator> struct PlainTensor;
+        requires Utils::StaticAllocatorType<ScalarType, Allocator>
+    struct PlainTensor;
 
     namespace internal {
         template <typename ScalarType, int d, typename Allocator>
-        requires Utils::StaticAllocatorType<ScalarType, Allocator> struct TensorTrait<
-                PlainTensor<ScalarType, d, Allocator>> {
+            requires Utils::StaticAllocatorType<ScalarType, Allocator>
+        struct TensorTrait<PlainTensor<ScalarType, d, Allocator>> {
             using scalar_type = ScalarType;
             static constexpr auto dim = d;
             using allocator_type = Allocator;
@@ -47,8 +50,8 @@ namespace OpFlow::DS {
     }// namespace internal
 
     template <typename ScalarType, int d, typename Allocator = Utils::AlignedAllocator<ScalarType>>
-    requires Utils::StaticAllocatorType<ScalarType, Allocator> struct PlainTensor
-        : public Tensor<PlainTensor<ScalarType, d, Allocator>> {
+        requires Utils::StaticAllocatorType<ScalarType, Allocator>
+    struct PlainTensor : public Tensor<PlainTensor<ScalarType, d, Allocator>> {
     private:
         ScalarType* data = nullptr;
 
@@ -135,8 +138,8 @@ namespace OpFlow::DS {
 
         // operator= is simply treated as assignment
         template <typename OtherScalar>
-        requires(!std::is_same_v<Scalar, OtherScalar>) auto&
-        operator=(const PlainTensor<OtherScalar, d>& other) {
+            requires(!std::is_same_v<Scalar, OtherScalar>)
+        auto& operator=(const PlainTensor<OtherScalar, d>& other) {
             OP_ASSERT(other.raw());// assign to an empty tensor is an error
             if (!data) {
                 reShape(other);
@@ -212,8 +215,8 @@ namespace OpFlow::DS {
         auto getOffset(int index) const { return index; }
 
         template <typename... I>
-                requires(std::integral<Meta::RealType<I>>&&...)
-                && (sizeof...(I) > 1) auto getOffset(I&&... i) const {
+            requires(std::integral<Meta::RealType<I>> && ...) && (sizeof...(I) > 1)
+        auto getOffset(I&&... i) const {
             return getOffset(DS::MDIndex<d> {i...});
         }
 
@@ -282,7 +285,7 @@ namespace OpFlow::DS {
             return *this;
         }
 
-        auto& operator=(const PlainTensor& other) { return this->template operator=<Scalar>(other); }
+        auto& operator=(const PlainTensor& other) { return this->template operator= <Scalar>(other); }
 
         auto& operator==(const PlainTensor& other) const { return this->val == other.val; }
 
diff --git a/src/DataStructures/Arrays/Tensor/TensorTrait.hpp b/src/DataStructures/Arrays/Tensor/TensorTrait.hpp
index 011587e7..6d25bc71 100644
--- a/src/DataStructures/Arrays/Tensor/TensorTrait.hpp
+++ b/src/DataStructures/Arrays/Tensor/TensorTrait.hpp
@@ -13,7 +13,9 @@
 #ifndef OPFLOW_TENSORTRAIT_HPP
 #define OPFLOW_TENSORTRAIT_HPP
 
+#ifndef OPFLOW_INSIDE_MODULE
 #include <type_traits>
+#endif
 
 namespace OpFlow::DS {
     template <typename Derived>
diff --git a/src/DataStructures/Geometry/2DGeometry.hpp b/src/DataStructures/Geometry/2DGeometry.hpp
index 27c5156a..9d6c96ba 100644
--- a/src/DataStructures/Geometry/2DGeometry.hpp
+++ b/src/DataStructures/Geometry/2DGeometry.hpp
@@ -17,10 +17,12 @@
 #include "Core/Constants.hpp"
 #include "Core/DesignPatterns.hpp"
 #include "Utils/Writers/Streams.hpp"
+#ifndef OPFLOW_INSIDE_MODULE
 #include <cassert>
 #include <fstream>
 #include <string>
 #include <vector>
+#endif
 
 namespace OpFlow::DS {
 
diff --git a/src/DataStructures/Geometry/3DGeometry.hpp b/src/DataStructures/Geometry/3DGeometry.hpp
index 738ac2c0..54004463 100644
--- a/src/DataStructures/Geometry/3DGeometry.hpp
+++ b/src/DataStructures/Geometry/3DGeometry.hpp
@@ -14,7 +14,9 @@
 #define OPFLOW_3DGEOMETRY_HPP
 
 #include "BasicElements.hpp"
+#ifndef OPFLOW_INSIDE_MODULE
 #include <vector>
+#endif
 
 namespace OpFlow::DS {
 
diff --git a/src/DataStructures/Geometry/BasicElements.hpp b/src/DataStructures/Geometry/BasicElements.hpp
index 3cd0431d..912588ba 100644
--- a/src/DataStructures/Geometry/BasicElements.hpp
+++ b/src/DataStructures/Geometry/BasicElements.hpp
@@ -16,9 +16,11 @@
 #include "Core/Macros.hpp"
 #include "Core/Meta.hpp"
 #include "Utils/Serializer/STDContainers.hpp"
+#ifndef OPFLOW_INSIDE_MODULE
 #include <array>
-#include <fmt/format.h>
+#include <format>
 #include <vector>
+#endif
 
 namespace OpFlow::DS {
 
@@ -96,7 +98,7 @@ namespace OpFlow::DS {
         std::array<T, d> lo, hi;
 
         auto toString() const {
-            return fmt::format("[{} -> {}]", Point<T, d>(lo).toString(), Point<T, d>(hi).toString());
+            return std::format("[{} -> {}]", Point<T, d>(lo).toString(), Point<T, d>(hi).toString());
         }
 
         auto operator==(const Box &other) const { return lo == other.lo && hi == other.hi; }
@@ -109,7 +111,8 @@ namespace OpFlow::DS {
     }
 
     template <typename T>
-    requires Meta::BracketIndexable<T> auto boxMerge(const T &boxes) {
+        requires Meta::BracketIndexable<T>
+    auto boxMerge(const T &boxes) {
         OP_ASSERT(boxes.size() > 0);
         auto ret = boxes[0];
         constexpr static auto dim = decltype(ret)::dim;
diff --git a/src/DataStructures/Index/ColoredIndex.hpp b/src/DataStructures/Index/ColoredIndex.hpp
index d6c2df04..015a6407 100644
--- a/src/DataStructures/Index/ColoredIndex.hpp
+++ b/src/DataStructures/Index/ColoredIndex.hpp
@@ -16,8 +16,10 @@
 #include "Core/Interfaces/Stringifiable.hpp"
 #include "DataStructures/Index/LevelMDIndex.hpp"
 #include "DataStructures/Index/MDIndex.hpp"
-#include "fmt/format.h"
+#include <format>
+#ifndef OPFLOW_INSIDE_MODULE
 #include <string>
+#endif
 
 namespace OpFlow::DS {
     template <typename T>
@@ -104,9 +106,7 @@ namespace OpFlow::DS {
         constexpr auto copy() const { return *this; }
 
         template <std::size_t dim = 0>
-        requires requires {
-            dim < d;
-        }
+            requires requires { dim < d; }
         constexpr auto next(int steps = 1) const {
             auto c = copy();
             c.idx[dim] += steps;
@@ -114,9 +114,7 @@ namespace OpFlow::DS {
         }
 
         template <std::size_t dim = 0>
-        requires requires {
-            dim < d;
-        }
+            requires requires { dim < d; }
         constexpr auto prev(int steps = 1) const {
             auto c = copy();
             c.idx[dim] -= steps;
@@ -133,9 +131,9 @@ namespace OpFlow::DS {
             std::string ret;
             for (auto i = 0; i < n; ++i) ret += prefix;
             ret += "{";
-            if constexpr (d > 0) ret += fmt::format("{}", idx[0]);
-            for (auto i = 1; i < d; ++i) ret += fmt::format(", {}", idx[i]);
-            ret += fmt::format(", c = {}", color);
+            if constexpr (d > 0) ret += std::format("{}", idx[0]);
+            for (auto i = 1; i < d; ++i) ret += std::format(", {}", idx[i]);
+            ret += std::format(", c = {}", color);
             ret += "}";
             return ret;
         }
@@ -233,9 +231,9 @@ namespace OpFlow::DS {
         [[nodiscard]] std::string toString(int n, const std::string& prefix) const override {
             std::string ret;
             for (auto i = 0; i < n; ++i) ret += prefix;
-            ret += "{" + fmt::format("{}, {}", l, p);
-            if constexpr (d > 0) ret += fmt::format(", {}", this->idx[0]);
-            for (auto i = 1; i < d; ++i) ret += fmt::format(", {}", this->idx[i]);
+            ret += "{" + std::format("{}, {}", l, p);
+            if constexpr (d > 0) ret += std::format(", {}", this->idx[0]);
+            for (auto i = 1; i < d; ++i) ret += std::format(", {}", this->idx[i]);
             ret += "}";
             return ret;
         }
@@ -275,8 +273,8 @@ namespace std {
 
     template <std::size_t d>
     struct hash<OpFlow::DS::ColoredIndex<OpFlow::DS::LevelMDIndex<d>>> {
-        std::size_t operator()(const OpFlow::DS::ColoredIndex<OpFlow::DS::LevelMDIndex<d>>& i) const
-                noexcept {
+        std::size_t
+        operator()(const OpFlow::DS::ColoredIndex<OpFlow::DS::LevelMDIndex<d>>& i) const noexcept {
             auto idx = i.get();
             return XXHash64::hash(idx.data(), idx.size() * sizeof(int), 0);
         }
diff --git a/src/DataStructures/Index/LevelMDIndex.hpp b/src/DataStructures/Index/LevelMDIndex.hpp
index 725f65ec..f8d12133 100644
--- a/src/DataStructures/Index/LevelMDIndex.hpp
+++ b/src/DataStructures/Index/LevelMDIndex.hpp
@@ -17,7 +17,9 @@
 #include "DataStructures/Index/MDIndex.hpp"
 #include "Math/Function/Numeric.hpp"
 #include "Utils/xxHash.hpp"
+#ifndef OPFLOW_INSIDE_MODULE
 #include <array>
+#endif
 
 namespace OpFlow::DS {
     template <std::size_t d>
@@ -82,9 +84,9 @@ namespace OpFlow::DS {
         [[nodiscard]] std::string toString(int n, const std::string& prefix) const override {
             std::string ret;
             for (int i = 0; i < n; ++i) ret += prefix;
-            ret += "{" + fmt::format("{}, {}", l, p);
-            if constexpr (d > 0) ret += fmt::format(", {}", this->idx[0]);
-            for (auto i = 1; i < d; ++i) ret += fmt::format(", {}", this->idx[i]);
+            ret += "{" + std::format("{}, {}", l, p);
+            if constexpr (d > 0) ret += std::format(", {}", this->idx[0]);
+            for (auto i = 1; i < d; ++i) ret += std::format(", {}", this->idx[i]);
             ret += "}";
             return ret;
         }
diff --git a/src/DataStructures/Index/LinearMapper/BlockedMDRangeMapper.hpp b/src/DataStructures/Index/LinearMapper/BlockedMDRangeMapper.hpp
index 1022ded7..05bce071 100644
--- a/src/DataStructures/Index/LinearMapper/BlockedMDRangeMapper.hpp
+++ b/src/DataStructures/Index/LinearMapper/BlockedMDRangeMapper.hpp
@@ -14,9 +14,11 @@
 #define OPFLOW_BLOCKEDMDRANGEMAPPER_HPP
 
 #include "DataStructures/Range/Ranges.hpp"
+#ifndef OPFLOW_INSIDE_MODULE
 #include <algorithm>
 #include <array>
 #include <vector>
+#endif
 
 namespace OpFlow::DS {
     /**
diff --git a/src/DataStructures/Index/LinearMapper/GeneralBlockedMDRangeMapper.hpp b/src/DataStructures/Index/LinearMapper/GeneralBlockedMDRangeMapper.hpp
index ed506e9a..e714f238 100644
--- a/src/DataStructures/Index/LinearMapper/GeneralBlockedMDRangeMapper.hpp
+++ b/src/DataStructures/Index/LinearMapper/GeneralBlockedMDRangeMapper.hpp
@@ -14,9 +14,11 @@
 #define OPFLOW_GENERALBlockedMDRangeMapper_HPP
 
 #include "DataStructures/Range/Ranges.hpp"
+#ifndef OPFLOW_INSIDE_MODULE
 #include <algorithm>
 #include <array>
 #include <vector>
+#endif
 
 namespace OpFlow::DS {
     /**
diff --git a/src/DataStructures/Index/LinearMapper/LevelMDRangeMapper.hpp b/src/DataStructures/Index/LinearMapper/LevelMDRangeMapper.hpp
index f3fca7d2..b2031747 100644
--- a/src/DataStructures/Index/LinearMapper/LevelMDRangeMapper.hpp
+++ b/src/DataStructures/Index/LinearMapper/LevelMDRangeMapper.hpp
@@ -15,7 +15,9 @@
 
 #include "DataStructures/Index/LevelMDIndex.hpp"
 #include "DataStructures/Range/LevelRanges.hpp"
+#ifndef OPFLOW_INSIDE_MODULE
 #include <vector>
+#endif
 
 namespace OpFlow::DS {
     template <std::size_t d>
diff --git a/src/DataStructures/Index/MDIndex.hpp b/src/DataStructures/Index/MDIndex.hpp
index ab77e297..28b7fb4d 100644
--- a/src/DataStructures/Index/MDIndex.hpp
+++ b/src/DataStructures/Index/MDIndex.hpp
@@ -16,14 +16,16 @@
 #include "Core/Interfaces/Stringifiable.hpp"
 #include "Core/Macros.hpp"
 #include "Utils/xxHash.hpp"
-#include "fmt/format.h"
+#ifndef OPFLOW_INSIDE_MODULE
 #include <array>
 #include <cassert>
 #include <compare>
 #include <concepts>
+#include <format>
 #include <initializer_list>
 #include <memory>
 #include <vector>
+#endif
 
 namespace OpFlow::DS {
 
@@ -101,9 +103,7 @@ namespace OpFlow::DS {
         constexpr auto copy() const { return *this; }
 
         template <std::size_t dim = 0>
-        requires requires {
-            dim < d;
-        }
+            requires requires { dim < d; }
         constexpr auto next(int steps = 1) const {
             auto c = copy();
             c.idx[dim] += steps;
@@ -111,9 +111,7 @@ namespace OpFlow::DS {
         }
 
         template <std::size_t dim = 0>
-        requires requires {
-            dim < d;
-        }
+            requires requires { dim < d; }
         constexpr auto prev(int steps = 1) const {
             auto c = copy();
             c.idx[dim] -= steps;
@@ -130,8 +128,8 @@ namespace OpFlow::DS {
             std::string ret;
             while (n-- > 0) ret += prefix;
             ret += "{";
-            if constexpr (d > 0) ret += fmt::format("{}", idx[0]);
-            for (auto i = 1; i < d; ++i) ret += fmt::format(", {}", idx[i]);
+            if constexpr (d > 0) ret += std::format("{}", idx[0]);
+            for (auto i = 1; i < d; ++i) ret += std::format(", {}", idx[i]);
             ret += "}";
             return ret;
         }
diff --git a/src/DataStructures/Matrix/CSRMatrix.hpp b/src/DataStructures/Matrix/CSRMatrix.hpp
index aa526aec..0598aba6 100644
--- a/src/DataStructures/Matrix/CSRMatrix.hpp
+++ b/src/DataStructures/Matrix/CSRMatrix.hpp
@@ -15,8 +15,10 @@
 
 #include "Core/BasicDataTypes.hpp"
 #include "DataStructures/Arrays/Arrays.hpp"
-#include <fmt/format.h>
+#ifndef OPFLOW_INSIDE_MODULE
+#include <format>
 #include <oneapi/tbb/parallel_for.h>
+#endif
 
 namespace OpFlow::DS {
     struct CSRMatrix {
@@ -97,28 +99,28 @@ namespace OpFlow::DS {
                 max_nnz_per_row = std::max(max_nnz_per_row, int(row[i + 1] - row[i]));
             }
             for (auto r : row) {
-                max_rank_width = std::max(max_rank_width, (int) fmt::formatted_size("{}", r));
+                max_rank_width = std::max(max_rank_width, (int) std::formatted_size("{}", r));
             }
             for (auto c : col) {
-                max_col_width = std::max(max_col_width, (int) fmt::formatted_size("{}", c));
+                max_col_width = std::max(max_col_width, (int) std::formatted_size("{}", c));
             }
             for (auto v : val) {
-                max_val_width = std::max(max_val_width, (int) fmt::formatted_size("{}", v));
+                max_val_width = std::max(max_val_width, (int) std::formatted_size("{}", v));
             }
             max_val_width = std::min(max_val_width, 10);
             for (int irow = 0; irow < row.size() - 1; ++irow) {
-                ret += fmt::format("row {:>{}}: [{:>{}}, {:> {}.4E}] ", irow, max_rank_width, col[row[irow]],
+                ret += std::format("row {:>{}}: [{:>{}}, {:> {}.4E}] ", irow, max_rank_width, col[row[irow]],
                                    max_col_width, val[row[irow]], max_val_width);
                 for (int icol = row[irow] + 1; icol < row[irow + 1]; ++icol) {
-                    ret += fmt::format("[{:>{}}, {:> {}.4E}] ", col[icol], max_col_width, val[icol],
+                    ret += std::format("[{:>{}}, {:> {}.4E}] ", col[icol], max_col_width, val[icol],
                                        max_val_width);
                 }
                 for (int icol = row[irow + 1]; icol < row[irow] + max_nnz_per_row; ++icol) {
-                    ret += std::string(fmt::formatted_size("[{:>{}}, {:> {}.4E}] ", 0, max_col_width, 1.0,
+                    ret += std::string(std::formatted_size("[{:>{}}, {:> {}.4E}] ", 0, max_col_width, 1.0,
                                                            max_val_width),
                                        ' ');
                 }
-                ret += fmt::format("rhs: {:> {}.4E}\n", rhs[irow], max_val_width);
+                ret += std::format("rhs: {:> {}.4E}\n", rhs[irow], max_val_width);
             }
             return ret;
         }
@@ -142,9 +144,9 @@ namespace OpFlow::DS {
                 std::string ret = "";
                 for (int irow = 0; irow < mat_size; ++irow) {
                     for (int icol = 0; icol < mat_size; ++icol) {
-                        ret += fmt::format("{:>6.2f} ", mat(irow, icol));
+                        ret += std::format("{:>6.2f} ", mat(irow, icol));
                     }
-                    ret += fmt::format("rhs[{}] = {:>6.2f}\n", irow, rhs[irow]);
+                    ret += std::format("rhs[{}] = {:>6.2f}\n", irow, rhs[irow]);
                 }
                 return ret;
             }
diff --git a/src/DataStructures/Range/LevelRanges.hpp b/src/DataStructures/Range/LevelRanges.hpp
index 80669aff..12c6f693 100644
--- a/src/DataStructures/Range/LevelRanges.hpp
+++ b/src/DataStructures/Range/LevelRanges.hpp
@@ -16,8 +16,10 @@
 #include "Core/Macros.hpp"
 #include "DataStructures/Index/LevelMDIndex.hpp"
 #include "Ranges.hpp"
+#ifndef OPFLOW_INSIDE_MODULE
 #include <array>
 #include <concepts>
+#endif
 
 namespace OpFlow::DS {
     template <std::size_t dim>
@@ -128,7 +130,7 @@ namespace OpFlow::DS {
 
         auto toString() const {
             std::string ret;
-            ret = fmt::format("{{l = {}, p = {}, {} - {} by {}}}", level, part, start, end, stride);
+            ret = std::format("{{l = {}, p = {}, {} - {} by {}}}", level, part, start, end, stride);
             return ret;
         }
 
diff --git a/src/DataStructures/Range/Ranges.hpp b/src/DataStructures/Range/Ranges.hpp
index aaf8e4b6..a929e134 100644
--- a/src/DataStructures/Range/Ranges.hpp
+++ b/src/DataStructures/Range/Ranges.hpp
@@ -17,12 +17,14 @@
 #include "DataStructures/Index/MDIndex.hpp"
 #include "Utils/Serializer/STDContainers.hpp"
 #include "Utils/xxHash.hpp"
+#ifndef OPFLOW_INSIDE_MODULE
 #include <array>
 #include <concepts>
 #include <cstddef>
 #include <functional>
 #include <oneapi/tbb/detail/_range_common.h>
 #include <vector>
+#endif
 
 namespace OpFlow::DS {
     template <std::size_t dim>
@@ -134,7 +136,7 @@ namespace OpFlow::DS {
 
         auto toString() const {
             std::string ret;
-            ret = fmt::format("{{{} - {} by {}}}", Utils::Serializer::serialize(start),
+            ret = std::format("{{{} - {} by {}}}", Utils::Serializer::serialize(start),
                               Utils::Serializer::serialize(end), Utils::Serializer::serialize(stride));
             return ret;
         }
@@ -223,10 +225,7 @@ namespace OpFlow::DS {
     };
 
     template <typename T>
-    concept isRange = requires {
-        T::dim;
-    }
-    &&std::is_same_v<std::remove_cvref_t<T>, Range<T::dim>>;
+    concept isRange = requires { T::dim; } && std::is_same_v<std::remove_cvref_t<T>, Range<T::dim>>;
 
     template <std::size_t dim1, std::size_t dim2>
     constexpr auto commonRange(const Range<dim1>& a, const Range<dim2>& b) {
diff --git a/src/DataStructures/StencilPad.hpp b/src/DataStructures/StencilPad.hpp
index e4a1e61d..fdf2a99f 100644
--- a/src/DataStructures/StencilPad.hpp
+++ b/src/DataStructures/StencilPad.hpp
@@ -17,8 +17,10 @@
 #include "Core/Interfaces/Serializable.hpp"
 #include "Core/Interfaces/Stringifiable.hpp"
 #include "Core/Meta.hpp"
+#ifndef OPFLOW_INSIDE_MODULE
 #include <algorithm>
 #include <unordered_map>
+#endif
 
 namespace OpFlow::DS {
     template <std::size_t max_size, typename K, typename V>
@@ -171,8 +173,8 @@ namespace OpFlow::DS {
             std::string _prefix;
             for (auto i = 0; i < n; ++i) _prefix += prefix;
             std::string ret = "\n" + _prefix + "pad:\n";
-            for (const auto& [k, v] : pad) { ret += _prefix + "\t" + fmt::format("({})\t {}\n", k, v); }
-            ret += _prefix + fmt::format("bias: {}", bias);
+            for (const auto& [k, v] : pad) { ret += _prefix + "\t" + std::format("({})\t {}\n", k, v); }
+            ret += _prefix + std::format("bias: {}", bias);
             return ret;
         }
 
diff --git a/src/Math/Function/Numeric.hpp b/src/Math/Function/Numeric.hpp
index aed781ad..d98e9f9d 100644
--- a/src/Math/Function/Numeric.hpp
+++ b/src/Math/Function/Numeric.hpp
@@ -16,8 +16,10 @@
 #include "Core/BasicDataTypes.hpp"
 #include "Core/Constants.hpp"
 #include "Core/Meta.hpp"
+#ifndef OPFLOW_INSIDE_MODULE
 #include <cmath>
 #include <type_traits>
+#endif
 
 namespace OpFlow::Math {
 
diff --git a/src/Utils/Allocator/AlignedAllocator.hpp b/src/Utils/Allocator/AlignedAllocator.hpp
index e10f2c06..1b46b8ec 100644
--- a/src/Utils/Allocator/AlignedAllocator.hpp
+++ b/src/Utils/Allocator/AlignedAllocator.hpp
@@ -15,7 +15,9 @@
 
 #include "Core/Meta.hpp"
 #include "Utils/Allocator/AllocatorTrait.hpp"
+#ifndef OPFLOW_INSIDE_MODULE
 #include <cstdlib>
+#endif
 
 namespace OpFlow::Utils {
     template <typename T, std::size_t align = 64>
diff --git a/src/Utils/Allocator/StaticAllocator.hpp b/src/Utils/Allocator/StaticAllocator.hpp
index 050a0bc9..b9702940 100644
--- a/src/Utils/Allocator/StaticAllocator.hpp
+++ b/src/Utils/Allocator/StaticAllocator.hpp
@@ -13,15 +13,16 @@
 #ifndef OPFLOW_STATICALLOCATOR_HPP
 #define OPFLOW_STATICALLOCATOR_HPP
 
+#ifndef OPFLOW_INSIDE_MODULE
 #include <concepts>
 #include <type_traits>
 #include <utility>
+#endif
 
 namespace OpFlow::Utils {
     template <typename D, typename T>
     concept StaticAllocatorType = requires(std::size_t s) {
-        { T::allocate(s) }
-        ->std::same_as<D*>;
+        { T::allocate(s) } -> std::same_as<D*>;
         T::deallocate(std::declval<D*>(), s);
     };
 }// namespace OpFlow::Utils
diff --git a/src/Utils/Allocator/VirtualMemAllocator.hpp b/src/Utils/Allocator/VirtualMemAllocator.hpp
index a233dff0..b698be5e 100644
--- a/src/Utils/Allocator/VirtualMemAllocator.hpp
+++ b/src/Utils/Allocator/VirtualMemAllocator.hpp
@@ -14,8 +14,10 @@
 #define OPFLOW_VIRTUALMEMALLOCATOR_HPP
 
 #ifdef OPFLOW_HAS_MMAN_H
+#ifndef OPFLOW_INSIDE_MODULE
 #include <sys/mman.h>
 #endif
+#endif
 
 namespace OpFlow::Utils {
 #ifdef OPFLOW_HAS_MMAN_H
diff --git a/src/Utils/ConstexprString.hpp b/src/Utils/ConstexprString.hpp
index b7a64016..a5799d79 100644
--- a/src/Utils/ConstexprString.hpp
+++ b/src/Utils/ConstexprString.hpp
@@ -13,8 +13,10 @@
 #ifndef OPFLOW_CONSTEXPRSTRING_HPP
 #define OPFLOW_CONSTEXPRSTRING_HPP
 
+#ifndef OPFLOW_INSIDE_MODULE
 #include <array>
 #include <string>
+#endif
 
 namespace OpFlow::Utils {
     template <std::size_t N>
@@ -32,7 +34,8 @@ namespace OpFlow::Utils {
         constexpr bool operator==(const CXprString& other) const { return _str == other._str; }
 
         template <std::size_t NN>
-        requires(NN != N) constexpr bool operator==(const CXprString<NN>& other) const {
+            requires(NN != N)
+        constexpr bool operator==(const CXprString<NN>& other) const {
             return false;
         }
 
diff --git a/src/Utils/NamedFunctor.hpp b/src/Utils/NamedFunctor.hpp
index c797ba7f..ea608ba5 100644
--- a/src/Utils/NamedFunctor.hpp
+++ b/src/Utils/NamedFunctor.hpp
@@ -15,14 +15,17 @@
 
 #include "Core/Meta.hpp"
 #include "Utils/ConstexprString.hpp"
+#ifndef OPFLOW_INSIDE_MODULE
 #include <concepts>
+#endif
 
 namespace OpFlow::Utils {
     template <auto Functor, auto Name, typename... Args>
-            // Invokable check. Omit Args to mute this check
-            requires((sizeof...(Args) == 0) || std::invocable<Meta::RealType<decltype(Functor)>, Args...>)
-            // Name type check. Must be a valid constexpr string
-            && (CXprStringType<Meta::RealType<decltype(Name)>>) struct NamedFunctor {
+    // Invokable check. Omit Args to mute this check
+        requires((sizeof...(Args) == 0) || std::invocable<Meta::RealType<decltype(Functor)>, Args...>)
+                // Name type check. Must be a valid constexpr string
+                && (CXprStringType<Meta::RealType<decltype(Name)>>)
+    struct NamedFunctor {
         constexpr NamedFunctor() = default;
 
         constexpr static auto getFunc() { return _func; }
diff --git a/src/Utils/RandomStringGenerator.hpp b/src/Utils/RandomStringGenerator.hpp
index 3a211b49..eac3383b 100644
--- a/src/Utils/RandomStringGenerator.hpp
+++ b/src/Utils/RandomStringGenerator.hpp
@@ -13,12 +13,14 @@
 #ifndef OPFLOW_RANDOMSTRINGGENERATOR_HPP
 #define OPFLOW_RANDOMSTRINGGENERATOR_HPP
 
+#ifndef OPFLOW_INSIDE_MODULE
 #include <algorithm>
 #include <array>
 #include <cstring>
 #include <functional>
 #include <random>
 #include <string>
+#endif
 
 namespace OpFlow::Utils {
     // copied from https://stackoverflow.com/a/444614
diff --git a/src/Utils/Serializer/EnumTypes.hpp b/src/Utils/Serializer/EnumTypes.hpp
index cb11f737..1fa13063 100644
--- a/src/Utils/Serializer/EnumTypes.hpp
+++ b/src/Utils/Serializer/EnumTypes.hpp
@@ -15,8 +15,10 @@
 
 #include "Core/BC/BCBase.hpp"
 #include "Core/Constants.hpp"
+#ifndef OPFLOW_INSIDE_MODULE
 #include <ostream>
 #include <string>
+#endif
 
 namespace OpFlow {
 
diff --git a/src/Utils/Serializer/STDContainers.hpp b/src/Utils/Serializer/STDContainers.hpp
index d509ba7d..ec6dd06d 100644
--- a/src/Utils/Serializer/STDContainers.hpp
+++ b/src/Utils/Serializer/STDContainers.hpp
@@ -14,23 +14,23 @@
 #define OPFLOW_STDCONTAINERS_HPP
 
 #include "Core/Meta.hpp"
-#include "fmt/format.h"
+#ifndef OPFLOW_INSIDE_MODULE
+#include <format>
 #include <string>
+#endif
 
 namespace OpFlow::Utils::Serializer {
     template <typename T>
-    requires Meta::BracketIndexable<T>&& requires(T t) {
-        { t.empty() }
-        ->std::same_as<bool>;
-        { t.size() }
-        ->std::same_as<std::size_t>;
-    }
+        requires Meta::BracketIndexable<T> && requires(T t) {
+            { t.empty() } -> std::same_as<bool>;
+            { t.size() } -> std::same_as<std::size_t>;
+        }
     auto serialize_impl(const T& arr, const std::string& prefix, const std::string& postfix,
                         const std::string& splitter) {
         std::string ret = prefix;
         if (arr.empty()) return ret + postfix;
-        ret += fmt::to_string(arr[0]);
-        for (std::size_t i = 1; i < arr.size(); ++i) { ret += fmt::format("{}{}", splitter, arr[i]); }
+        ret += std::to_string(arr[0]);
+        for (std::size_t i = 1; i < arr.size(); ++i) { ret += std::format("{}{}", splitter, arr[i]); }
         ret += postfix;
         return ret;
     }
@@ -40,8 +40,8 @@ namespace OpFlow::Utils::Serializer {
                         const std::string& splitter) {
         std::string ret = prefix;
         if (N == 0) return ret + postfix;
-        ret += fmt::to_string(arr[0]);
-        for (std::size_t i = 1; i < N; ++i) { ret += fmt::format("{}{}", splitter, arr[i]); }
+        ret += std::to_string(arr[0]);
+        for (std::size_t i = 1; i < N; ++i) { ret += std::format("{}{}", splitter, arr[i]); }
         ret += postfix;
         return ret;
     }
diff --git a/src/Utils/StackTracer.hpp b/src/Utils/StackTracer.hpp
index d76b2df6..254040c8 100644
--- a/src/Utils/StackTracer.hpp
+++ b/src/Utils/StackTracer.hpp
@@ -10,9 +10,11 @@
 //
 //  ----------------------------------------------------------------------------
 
-#include <fmt/format.h>
+#ifndef OPFLOW_INSIDE_MODULE
+#include <format>
 #include <string>
 #include <vector>
+#endif
 
 #ifndef OPFLOW_STACKTRACER_HPP
 #define OPFLOW_STACKTRACER_HPP
@@ -27,9 +29,9 @@ namespace OpFlow::Utils {
 
         [[nodiscard]] std::string dump() const {
             std::string str;
-            str += fmt::format("\nCall stack:\n");
+            str += std::format("\nCall stack:\n");
             int size = msg.size();
-            for (int i = size - 1; i >= 0; --i) { str += fmt::format("  [{:2}] {}\n", i, msg[i]); }
+            for (int i = size - 1; i >= 0; --i) { str += std::format("  [{:2}] {}\n", i, msg[i]); }
             return str;
         }
     };
diff --git a/src/Utils/Writers/FieldWriter.hpp b/src/Utils/Writers/FieldWriter.hpp
index 1dac9d69..b1f19ea9 100644
--- a/src/Utils/Writers/FieldWriter.hpp
+++ b/src/Utils/Writers/FieldWriter.hpp
@@ -18,9 +18,11 @@
 #include "Core/Field/FieldExpr.hpp"
 #include "Core/Macros.hpp"
 #include "Streams.hpp"
+#ifndef OPFLOW_INSIDE_MODULE
 #include <functional>
 #include <iostream>
 #include <string>
+#endif
 
 namespace OpFlow::Utils::Writer {
     template <typename FieldType>
diff --git a/src/Utils/Writers/HDF5Stream.hpp b/src/Utils/Writers/HDF5Stream.hpp
index 9ea83996..82e24daf 100644
--- a/src/Utils/Writers/HDF5Stream.hpp
+++ b/src/Utils/Writers/HDF5Stream.hpp
@@ -16,15 +16,19 @@
 #include "Core/Environment.hpp"
 #include "Core/Field/MeshBased/Structured/CartesianFieldExprTrait.hpp"
 #include "Utils/Writers/FieldStream.hpp"
-#include "fmt/format.h"
+#include <format>
+#ifndef OPFLOW_INSIDE_MODULE
 #include <cstdlib>
 #include <filesystem>
 #include <fstream>
+#include <string>
+#include <utility>
+#endif
 #ifdef OPFLOW_WITH_HDF5
+#ifndef OPFLOW_INSIDE_MODULE
 #include <hdf5.h>
 #endif
-#include <string>
-#include <utility>
+#endif
 
 namespace OpFlow::Utils {
     struct H5Stream;
@@ -70,9 +74,9 @@ namespace OpFlow::Utils {
                 // add time stamp between filename and extension
                 std::string ext = std::filesystem::path(path).extension();
                 filename.erase(filename.end() - ext.size(), filename.end());
-                if (numberingType == NumberingType::ByTime) filename += fmt::format("_{:.6f}", time.time);
+                if (numberingType == NumberingType::ByTime) filename += std::format("_{:.6f}", time.time);
                 else
-                    filename += fmt::format("_{}", time.step.value());
+                    filename += std::format("_{}", time.step.value());
                 filename += ext;
             }
 #if defined(OPFLOW_WITH_MPI) && defined(OPFLOW_DISTRIBUTE_MODEL_MPI)
@@ -133,7 +137,7 @@ namespace OpFlow::Utils {
             } else {
                 first_run = false;
             }
-            std::string group_name = fmt::format("/T={}", time.time);
+            std::string group_name = std::format("/T={}", time.time);
             current_group = H5Gcreate(file, group_name.c_str(), H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
             group_inited = true;
 #else
@@ -204,7 +208,7 @@ namespace OpFlow::Utils {
         if (write_mesh) {
             std::string mesh_name[dim];
             for (auto i = 0; i < dim; ++i)
-                mesh_name[i] = fmt::format("/T={}/{}_x{}", time.time, f.getName(), i);
+                mesh_name[i] = std::format("/T={}/{}_x{}", time.time, f.getName(), i);
             std::vector<double> x_buffer;
             for (auto i = 0; i < dim; ++i) {
                 // write each dim's mesh vector
@@ -261,7 +265,7 @@ namespace OpFlow::Utils {
             H5Tset_order(datatype, H5T_ORDER_LE);
 
             // create a new data set
-            std::string dataset_name = fmt::format("/T={}/{}", time.time, f.getName());
+            std::string dataset_name = std::format("/T={}/{}", time.time, f.getName());
             auto dataset = H5Dcreate(file, dataset_name.c_str(), datatype, dataspace, H5P_DEFAULT,
                                      H5P_DEFAULT, H5P_DEFAULT);
 #if defined(OPFLOW_WITH_MPI) && defined(OPFLOW_DISTRIBUTE_MODEL_MPI)
@@ -327,7 +331,7 @@ namespace OpFlow::Utils {
         H5Tset_order(datatype, H5T_ORDER_LE);
 
         // open the dataset
-        std::string dataset_name = fmt::format("/T={}/{}", time.time, f.getName());
+        std::string dataset_name = std::format("/T={}/{}", time.time, f.getName());
         auto dataset = H5Dopen(file, dataset_name.c_str(), H5P_DEFAULT);
         OP_ASSERT_MSG(dataset >= 0, "HDF5Stream: cannot open data set with name {}", dataset_name);
 #if defined(OPFLOW_WITH_MPI) && defined(OPFLOW_DISTRIBUTE_MODEL_MPI)
diff --git a/src/Utils/Writers/IOGroup.hpp b/src/Utils/Writers/IOGroup.hpp
index f0fdb4ff..e0265576 100644
--- a/src/Utils/Writers/IOGroup.hpp
+++ b/src/Utils/Writers/IOGroup.hpp
@@ -15,7 +15,9 @@
 
 #include "Utils/RandomStringGenerator.hpp"
 #include "Utils/Writers/Streams.hpp"
+#ifndef OPFLOW_INSIDE_MODULE
 #include <tuple>
+#endif
 
 namespace OpFlow::Utils {
     struct IOGroupInterface {
@@ -91,8 +93,7 @@ namespace OpFlow::Utils {
                     streams.back() << t;
                     [&, this]<int... Is>(std::integer_sequence<int, Is...>) {
                         streams.back().dumpMultiple(std::get<Is>(exprs)...);
-                    }
-                    (std::make_integer_sequence<int, sizeof...(Exprs)>());
+                    }(std::make_integer_sequence<int, sizeof...(Exprs)>());
                 } else {
                     Meta::static_for<sizeof...(Exprs)>(
                             [&]<int k>(Meta::int_<k>) { streams[k] << t << std::get<k>(exprs); });
diff --git a/src/Utils/Writers/RawBinaryStream.hpp b/src/Utils/Writers/RawBinaryStream.hpp
index 0e82d32f..3ac061d6 100644
--- a/src/Utils/Writers/RawBinaryStream.hpp
+++ b/src/Utils/Writers/RawBinaryStream.hpp
@@ -16,11 +16,13 @@
 #include "Core/Environment.hpp"
 #include "Core/Field/MeshBased/Structured/CartesianFieldExprTrait.hpp"
 #include "Utils/Writers/FieldStream.hpp"
-#include "fmt/format.h"
+#include <format>
+#ifndef OPFLOW_INSIDE_MODULE
 #include <cstdlib>
 #include <filesystem>
 #include <fstream>
 #include <string>
+#endif
 
 namespace OpFlow::Utils {
     struct RawBinaryOStream;
@@ -103,9 +105,9 @@ namespace OpFlow::Utils {
             rank = getWorkerId();
         }
         std::string root;
-        if (nproc > 1) root = fmt::format("{}/{}_{}_{}.cart", path.string(), f.getName(), count, rank);
+        if (nproc > 1) root = std::format("{}/{}_{}_{}.cart", path.string(), f.getName(), count, rank);
         else
-            root = fmt::format("{}/{}_{}.cart", path.string(), f.getName(), count);
+            root = std::format("{}/{}_{}.cart", path.string(), f.getName(), count);
         FILE* data;
         data = fopen(root.c_str(), "wb");
         std::string name = f.getName();
@@ -157,9 +159,9 @@ namespace OpFlow::Utils {
             rank = getWorkerId();
         }
         std::string root;
-        if (nproc > 1) root = fmt::format("{}/{}_{}_{}.cart", path.string(), f.getName(), count, rank);
+        if (nproc > 1) root = std::format("{}/{}_{}_{}.cart", path.string(), f.getName(), count, rank);
         else
-            root = fmt::format("{}/{}_{}.cart", path.string(), f.getName(), count);
+            root = std::format("{}/{}_{}.cart", path.string(), f.getName(), count);
         FILE* data;
         data = fopen(root.c_str(), "rb");
 
diff --git a/src/Utils/Writers/StreamTrait.hpp b/src/Utils/Writers/StreamTrait.hpp
index 5f36f089..b52109ea 100644
--- a/src/Utils/Writers/StreamTrait.hpp
+++ b/src/Utils/Writers/StreamTrait.hpp
@@ -14,7 +14,9 @@
 #define OPFLOW_STREAMTRAIT_HPP
 
 #include "Core/Constants.hpp"
+#ifndef OPFLOW_INSIDE_MODULE
 #include <type_traits>
+#endif
 
 namespace OpFlow::Utils {
     namespace internal {
@@ -23,9 +25,9 @@ namespace OpFlow::Utils {
     }
 
     template <typename T>
-    concept RStreamType = bool(internal::StreamTrait<T>::mode_flag& StreamIn);
+    concept RStreamType = bool(internal::StreamTrait<T>::mode_flag & StreamIn);
 
     template <typename T>
-    concept WStreamType = bool(internal::StreamTrait<T>::mode_flag& StreamOut);
+    concept WStreamType = bool(internal::StreamTrait<T>::mode_flag & StreamOut);
 }// namespace OpFlow::Utils
 #endif//OPFLOW_STREAMTRAIT_HPP
diff --git a/src/Utils/Writers/Streams.hpp b/src/Utils/Writers/Streams.hpp
index b39ed48c..44f111b2 100644
--- a/src/Utils/Writers/Streams.hpp
+++ b/src/Utils/Writers/Streams.hpp
@@ -17,12 +17,14 @@
 #include "Core/Constants.hpp"
 #include "Core/Macros.hpp"
 #include "StreamTrait.hpp"
+#ifndef OPFLOW_INSIDE_MODULE
 #include <fstream>
 #include <functional>
 #include <iomanip>
 #include <optional>
 #include <string>
 #include <utility>
+#endif
 
 namespace OpFlow::Utils {
 
diff --git a/src/Utils/Writers/TecplotASCIIStream.hpp b/src/Utils/Writers/TecplotASCIIStream.hpp
index 702a8ced..99ec5b45 100644
--- a/src/Utils/Writers/TecplotASCIIStream.hpp
+++ b/src/Utils/Writers/TecplotASCIIStream.hpp
@@ -15,10 +15,12 @@
 
 #include "Core/Field/MeshBased/Structured/CartesianField.hpp"
 #include "Utils/Writers/FieldStream.hpp"
-#include "fmt/format.h"
+#include <format>
+#ifndef OPFLOW_INSIDE_MODULE
 #include <filesystem>
 #include <fstream>
 #include <string>
+#endif
 
 namespace OpFlow::Utils {
     struct TecplotASCIIStream;
@@ -68,37 +70,37 @@ namespace OpFlow::Utils {
                 std::string filename = path;
                 std::string ext = std::filesystem::path(path).extension();
                 filename.erase(filename.end() - ext.size(), filename.end());
-                if (numberingType == NumberingType::ByTime) filename += fmt::format("_{:.6f}", time.time);
+                if (numberingType == NumberingType::ByTime) filename += std::format("_{:.6f}", time.time);
                 else
-                    filename += fmt::format("_{}", time.step.value());
+                    filename += std::format("_{}", time.step.value());
                 filename += ext;
                 reOpen(filename);
             }
             if (of.tellp() == 0) {
-                of << fmt::format("TITLE = \"Solution of {} \"\n", f.name);
-                if constexpr (dim == 1) of << fmt::format("VARIABLES = {}, \"{}\"\n", R"("X")", f.name);
+                of << std::format("TITLE = \"Solution of {} \"\n", f.name);
+                if constexpr (dim == 1) of << std::format("VARIABLES = {}, \"{}\"\n", R"("X")", f.name);
                 else if constexpr (dim == 2)
-                    of << fmt::format("VARIABLES = {}, \"{}\"\n", R"("X", "Y")", f.name);
+                    of << std::format("VARIABLES = {}, \"{}\"\n", R"("X", "Y")", f.name);
                 else if constexpr (dim == 3)
-                    of << fmt::format("VARIABLES = {}, \"{}\"\n", R"("X", "Y", "Z")", f.name);
+                    of << std::format("VARIABLES = {}, \"{}\"\n", R"("X", "Y", "Z")", f.name);
             }
             of << "ZONE\n";
             of << "ZONETYPE = ORDERED DATAPACKING = BLOCK\n";
             if constexpr (dim == 1)
-                of << fmt::format("I = {}\n", f.localRange.end[0] - f.localRange.start[0]);
+                of << std::format("I = {}\n", f.localRange.end[0] - f.localRange.start[0]);
             else if constexpr (dim == 2)
-                of << fmt::format("I = {} J = {}\n", f.localRange.end[0] - f.localRange.start[0],
+                of << std::format("I = {} J = {}\n", f.localRange.end[0] - f.localRange.start[0],
                                   f.localRange.end[1] - f.localRange.start[1]);
             else if constexpr (dim == 3)
-                of << fmt::format("I = {} J = {} K = {}\n", f.localRange.end[0] - f.localRange.start[0],
+                of << std::format("I = {} J = {} K = {}\n", f.localRange.end[0] - f.localRange.start[0],
                                   f.localRange.end[1] - f.localRange.start[1],
                                   f.localRange.end[2] - f.localRange.start[2]);
             of << std::scientific << std::setprecision(10);
-            of << fmt::format("SOLUTIONTIME = {}\n", time.time);
+            of << std::format("SOLUTIONTIME = {}\n", time.time);
             if (!writeMesh) {
                 if constexpr (dim == 1) of << "VARSHARELIST=([1]=1)\n";
                 else
-                    of << fmt::format("VARSHARELIST=([1-{}]=1)\n", dim);
+                    of << std::format("VARSHARELIST=([1-{}]=1)\n", dim);
             } else {
                 auto m = f.getMesh();
                 const auto& loc = f.loc;
@@ -131,7 +133,7 @@ namespace OpFlow::Utils {
                 auto getName = [&](auto&& f) {
                     static int count = 0;
                     std::string name = f.getName();
-                    if (name.empty()) name = fmt::format("unnamed{}", count++);
+                    if (name.empty()) name = std::format("unnamed{}", count++);
                     auto ptr = std::remove(name.begin(), name.end(), ' ');
                     name.erase(ptr, name.end());
                     std::replace(name.begin(), name.end(), ',', '_');
@@ -142,25 +144,25 @@ namespace OpFlow::Utils {
                     std::string filename = path;
                     std::string ext = std::filesystem::path(path).extension();
                     filename.erase(filename.end() - ext.size(), filename.end());
-                    if (numberingType == NumberingType::ByTime) filename += fmt::format("_{:.6f}", time.time);
+                    if (numberingType == NumberingType::ByTime) filename += std::format("_{:.6f}", time.time);
                     else
-                        filename += fmt::format("_{}", time.step.value());
+                        filename += std::format("_{}", time.step.value());
                     filename += ext;
                     reOpen(filename);
                 }
                 if (of.tellp() == 0) {
-                    of << fmt::format("TITLE = \"Solution of AllInOne\"\n");
+                    of << std::format("TITLE = \"Solution of AllInOne\"\n");
                     if constexpr (dim == 1)
-                        of << (fmt::format("VARIABLES = {}", R"("X")") + ...
-                               + fmt::format(",\"{}\"", getName(fs)))
+                        of << (std::format("VARIABLES = {}", R"("X")") + ...
+                               + std::format(",\"{}\"", getName(fs)))
                            << "\n";
                     else if constexpr (dim == 2)
-                        of << (fmt::format("VARIABLES = {}", R"("X", "Y")") + ...
-                               + fmt::format(",\"{}\"", getName(fs)))
+                        of << (std::format("VARIABLES = {}", R"("X", "Y")") + ...
+                               + std::format(",\"{}\"", getName(fs)))
                            << "\n";
                     else if constexpr (dim == 3)
-                        of << (fmt::format("VARIABLES = {}", R"("X", "Y", "Z")") + ...
-                               + fmt::format(",\"{}\"", getName(fs)))
+                        of << (std::format("VARIABLES = {}", R"("X", "Y", "Z")") + ...
+                               + std::format(",\"{}\"", getName(fs)))
                            << "\n";
                 }
                 of << "ZONE\n";
@@ -168,19 +170,19 @@ namespace OpFlow::Utils {
                 auto range = dumpLogicalRange ? maxCommonRange(std::vector {fs.logicalRange...})
                                               : maxCommonRange(std::vector {fs.localRange...});
 
-                if constexpr (dim == 1) of << fmt::format("I = {}\n", range.end[0] - range.start[0]);
+                if constexpr (dim == 1) of << std::format("I = {}\n", range.end[0] - range.start[0]);
                 else if constexpr (dim == 2)
-                    of << fmt::format("I = {} J = {}\n", range.end[0] - range.start[0],
+                    of << std::format("I = {} J = {}\n", range.end[0] - range.start[0],
                                       range.end[1] - range.start[1]);
                 else if constexpr (dim == 3)
-                    of << fmt::format("I = {} J = {} K = {}\n", range.end[0] - range.start[0],
+                    of << std::format("I = {} J = {} K = {}\n", range.end[0] - range.start[0],
                                       range.end[1] - range.start[1], range.end[2] - range.start[2]);
                 of << std::scientific << std::setprecision(10);
-                of << fmt::format("SOLUTIONTIME = {}\n", time.time);
+                of << std::format("SOLUTIONTIME = {}\n", time.time);
                 if (!writeMesh) {
                     if constexpr (dim == 1) of << "VARSHARELIST=([1]=1)\n";
                     else
-                        of << fmt::format("VARSHARELIST=([1-{}]=1)\n", dim);
+                        of << std::format("VARSHARELIST=([1-{}]=1)\n", dim);
                 } else {
                     auto m = std::get<0>(fs_tuple)->getMesh();
                     const auto& loc = std::get<0>(fs_tuple)->loc;
diff --git a/src/Utils/Writers/TecplotBinaryStream.hpp b/src/Utils/Writers/TecplotBinaryStream.hpp
index 37410261..3297fd78 100644
--- a/src/Utils/Writers/TecplotBinaryStream.hpp
+++ b/src/Utils/Writers/TecplotBinaryStream.hpp
@@ -15,11 +15,13 @@
 
 #include "Core/Field/MeshBased/Structured/CartesianField.hpp"
 #include "Utils/Writers/FieldStream.hpp"
+#ifndef OPFLOW_INSIDE_MODULE
 #include <TECIO.h>
 #include <filesystem>
-#include <fmt/format.h>
+#include <format>
 #include <string>
 #include <utility>
+#endif
 
 namespace OpFlow::Utils {
     struct TecplotBinaryStream;
@@ -126,16 +128,16 @@ namespace OpFlow::Utils {
                 auto ptr = std::remove(name.begin(), name.end(), ' ');
                 name.erase(ptr, name.end());
             }
-            std::string title = fmt::format("TITLE = \"Solution of {}\"", name);
-            std::string var_list = (dim == 2) ? fmt::format("X,Y,{}", name) : fmt::format("X,Y,Z,{}", name);
+            std::string title = std::format("TITLE = \"Solution of {}\"", name);
+            std::string var_list = (dim == 2) ? std::format("X,Y,{}", name) : std::format("X,Y,Z,{}", name);
             std::string filename = path;
             if (separate_file) {
                 // add time stamp between filename and extension
                 std::string ext = std::filesystem::path(path).extension();
                 filename.erase(filename.end() - ext.size(), filename.end());
-                if (numberingType == NumberingType::ByTime) filename += fmt::format("_{:.6f}", time.time);
+                if (numberingType == NumberingType::ByTime) filename += std::format("_{:.6f}", time.time);
                 else
-                    filename += fmt::format("_{}", time.step.value());
+                    filename += std::format("_{}", time.step.value());
                 filename += ext;
             }
             int file_format = 1,                 // 0: Tecplot binary (.plt), 1: Tecplot subzone (.szplt)
@@ -264,23 +266,23 @@ namespace OpFlow::Utils {
                 auto getName = [&](auto&& f) {
                     static int count = 0;
                     std::string name = f.getName();
-                    if (name.empty()) name = fmt::format("unnamed{}", count++);
+                    if (name.empty()) name = std::format("unnamed{}", count++);
                     auto ptr = std::remove(name.begin(), name.end(), ' ');
                     name.erase(ptr, name.end());
                     std::replace(name.begin(), name.end(), ',', '_');
                     return name;
                 };
-                std::string title = fmt::format("TITLE = \"Solution of all fields\"");
-                std::string var_list = (dim == 2) ? ("X,Y" + ... + fmt::format(",{}", getName(fs)))
-                                                  : ("X,Y,Z" + ... + fmt::format(",{}", getName(fs)));
+                std::string title = std::format("TITLE = \"Solution of all fields\"");
+                std::string var_list = (dim == 2) ? ("X,Y" + ... + std::format(",{}", getName(fs)))
+                                                  : ("X,Y,Z" + ... + std::format(",{}", getName(fs)));
                 std::string filename = path;
                 if (separate_file) {
                     // add time stamp between filename and extension
                     std::string ext = std::filesystem::path(path).extension();
                     filename.erase(filename.end() - ext.size(), filename.end());
-                    if (numberingType == NumberingType::ByTime) filename += fmt::format("_{:.6f}", time.time);
+                    if (numberingType == NumberingType::ByTime) filename += std::format("_{:.6f}", time.time);
                     else
-                        filename += fmt::format("_{}", time.step.value());
+                        filename += std::format("_{}", time.step.value());
                     filename += ext;
                 }
                 int file_format = 1,                 // 0: Tecplot binary (.plt), 1: Tecplot subzone (.szplt)
diff --git a/src/Utils/Writers/TecplotSZPLTStream.hpp b/src/Utils/Writers/TecplotSZPLTStream.hpp
index bc343c3c..0322ab05 100644
--- a/src/Utils/Writers/TecplotSZPLTStream.hpp
+++ b/src/Utils/Writers/TecplotSZPLTStream.hpp
@@ -15,11 +15,13 @@
 
 #include "Core/Field/MeshBased/Structured/CartesianField.hpp"
 #include "Utils/Writers/FieldStream.hpp"
+#ifndef OPFLOW_INSIDE_MODULE
 #include <TECIO.h>
 #include <filesystem>
-#include <fmt/format.h>
+#include <format>
 #include <string>
 #include <utility>
+#endif
 
 namespace OpFlow::Utils {
     struct TecplotSZPLTStream;
@@ -74,16 +76,16 @@ namespace OpFlow::Utils {
                 auto ptr = std::remove(name.begin(), name.end(), ' ');
                 name.erase(ptr, name.end());
             }
-            std::string title = fmt::format("TITLE = \"Solution of {}\"", name);
-            std::string var_list = (dim == 2) ? fmt::format("X,Y,{}", name) : fmt::format("X,Y,Z,{}", name);
+            std::string title = std::format("TITLE = \"Solution of {}\"", name);
+            std::string var_list = (dim == 2) ? std::format("X,Y,{}", name) : std::format("X,Y,Z,{}", name);
             std::string filename = path;
             if (separate_file) {
                 // add time stamp between filename and extension
                 std::string ext = std::filesystem::path(path).extension();
                 filename.erase(filename.end() - ext.size(), filename.end());
-                if (numberingType == NumberingType::ByTime) filename += fmt::format("_{:.6f}", time.time);
+                if (numberingType == NumberingType::ByTime) filename += std::format("_{:.6f}", time.time);
                 else
-                    filename += fmt::format("_{}", time.step.value());
+                    filename += std::format("_{}", time.step.value());
                 filename += ext;
             }
             int file_format = 1,                 // 0: Tecplot binary (.plt), 1: Tecplot subzone (.szplt)
@@ -194,23 +196,23 @@ namespace OpFlow::Utils {
                 auto getName = [&](auto&& f) {
                     static int count = 0;
                     std::string name = f.getName();
-                    if (name.empty()) name = fmt::format("unnamed{}", count++);
+                    if (name.empty()) name = std::format("unnamed{}", count++);
                     auto ptr = std::remove(name.begin(), name.end(), ' ');
                     name.erase(ptr, name.end());
                     std::replace(name.begin(), name.end(), ',', '_');
                     return name;
                 };
-                std::string title = fmt::format("TITLE = \"Solution of all fields\"");
-                std::string var_list = (dim == 2) ? ("X,Y" + ... + fmt::format(",{}", getName(fs)))
-                                                  : ("X,Y,Z" + ... + fmt::format(",{}", getName(fs)));
+                std::string title = std::format("TITLE = \"Solution of all fields\"");
+                std::string var_list = (dim == 2) ? ("X,Y" + ... + std::format(",{}", getName(fs)))
+                                                  : ("X,Y,Z" + ... + std::format(",{}", getName(fs)));
                 std::string filename = path;
                 if (separate_file) {
                     // add time stamp between filename and extension
                     std::string ext = std::filesystem::path(path).extension();
                     filename.erase(filename.end() - ext.size(), filename.end());
-                    if (numberingType == NumberingType::ByTime) filename += fmt::format("_{:.6f}", time.time);
+                    if (numberingType == NumberingType::ByTime) filename += std::format("_{:.6f}", time.time);
                     else
-                        filename += fmt::format("_{}", time.step.value());
+                        filename += std::format("_{}", time.step.value());
                     filename += ext;
                 }
                 int file_format = 1,                 // 0: Tecplot binary (.plt), 1: Tecplot subzone (.szplt)
diff --git a/src/Utils/Writers/VTKAMRStream.hpp b/src/Utils/Writers/VTKAMRStream.hpp
index 6c4702b7..93b031e2 100644
--- a/src/Utils/Writers/VTKAMRStream.hpp
+++ b/src/Utils/Writers/VTKAMRStream.hpp
@@ -15,12 +15,15 @@
 
 #include "Core/Field/MeshBased/SemiStructured/CartAMRField.hpp"
 #include "Utils/Writers/FieldStream.hpp"
-#include "fmt/format.h"
+#include <format>
+#ifndef OPFLOW_INSIDE_MODULE
 #include <fstream>
 #include <string>
 #include <utility>
+#endif
 
 #ifdef OPFLOW_WITH_VTK
+#ifndef OPFLOW_INSIDE_MODULE
 #include <vtkAMRBox.h>
 #include <vtkAMRUtilities.h>
 #include <vtkCell.h>
@@ -43,6 +46,7 @@
 #include <vtkXMLImageDataWriter.h>
 #include <vtkXMLMultiBlockDataWriter.h>
 #endif
+#endif
 
 namespace OpFlow::Utils {
     struct VTKAMRStream;
@@ -122,7 +126,7 @@ namespace OpFlow::Utils {
             vtkAMRUtilities::BlankCells(data);
             data->Audit();
             auto writer = vtkSmartPointer<vtkXMLHierarchicalBoxDataWriter>::New();
-            auto name = fmt::format("{}_{}.vthb", path, (int) time.time * 100);
+            auto name = std::format("{}_{}.vthb", path, (int) time.time * 100);
             writer->SetFileName(name.c_str());
             writer->SetInputData(data);
             writer->Write();
diff --git a/src/opflow.cppm b/src/opflow.cppm
new file mode 100644
index 00000000..291cd812
--- /dev/null
+++ b/src/opflow.cppm
@@ -0,0 +1,14 @@
+module;
+/*
+#include <oneapi/tbb/detail/_range_common.h>
+
+export module opflow;
+
+#define OPFLOW_INSIDE_MODULE
+
+#include "OpFlow"
+*/
+
+#include <iostream>
+
+export module AAA;

From 68d3b37b06fcedec5d75247251085e5cc71b3475 Mon Sep 17 00:00:00 2001
From: Luohao Wang <luohaothu@live.com>
Date: Fri, 6 Jun 2025 18:22:04 +0800
Subject: [PATCH 10/31] [Ext] Use std::format for spdlog

---
 cmake/AMGCLConfig.cmake  | 25 ++++++++++++++-----------
 cmake/SPDLOGConfig.cmake | 37 ++++++++++++++++++++-----------------
 2 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/cmake/AMGCLConfig.cmake b/cmake/AMGCLConfig.cmake
index c96f55c3..257f8332 100644
--- a/cmake/AMGCLConfig.cmake
+++ b/cmake/AMGCLConfig.cmake
@@ -16,19 +16,22 @@
 
 macro(CONFIG_AND_INSTALL_AMGCL)
     file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/amgcl-build)
-    execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}"
-            -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-            -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
-            -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} ${CMAKE_CURRENT_LIST_DIR}/../external/amgcl
-            RESULT_VARIABLE result
-            WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/amgcl-build)
-    if (result)
+    execute_process(COMMAND ${CMAKE_COMMAND}
+        -G "${CMAKE_GENERATOR}"
+        -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+        -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+        -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
+        -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+        ${CMAKE_CURRENT_LIST_DIR}/../external/amgcl
+        RESULT_VARIABLE result
+        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/amgcl-build)
+    if(result)
         message(FATAL_ERROR "CMake step for AMGCL failed: ${result}")
     endif()
     execute_process(COMMAND ${CMAKE_COMMAND} --install .
-            RESULT_VARIABLE result
-            WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/amgcl-build)
-    if (result)
+        RESULT_VARIABLE result
+        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/amgcl-build)
+    if(result)
         message(FATAL_ERROR "Build & install step for AMGCL failed: ${result}")
     endif()
-endmacro()
\ No newline at end of file
+endmacro()
diff --git a/cmake/SPDLOGConfig.cmake b/cmake/SPDLOGConfig.cmake
index 254ea995..7987d36e 100644
--- a/cmake/SPDLOGConfig.cmake
+++ b/cmake/SPDLOGConfig.cmake
@@ -17,25 +17,28 @@
 macro(CONFIG_AND_INSTALL_SPDLOG)
     file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/spdlog-build)
     execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}"
-            -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-            -DSPDLOG_BUILD_EXAMPLE=OFF
-            -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
-            -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} ${CMAKE_CURRENT_LIST_DIR}/../external/spdlog
-            RESULT_VARIABLE result
-            WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/spdlog-build)
-    if (result)
+        -DCMAKE_CXX_STANDARD=20
+        -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+        -DSPDLOG_BUILD_EXAMPLE=OFF
+        -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
+        -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+        -DSPDLOG_USE_STD_FORMAT=ON
+        ${CMAKE_CURRENT_LIST_DIR}/../external/spdlog
+        RESULT_VARIABLE result
+        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/spdlog-build)
+    if(result)
         message(FATAL_ERROR "CMake step for spdlog failed: ${result}")
-    endif ()
+    endif()
     execute_process(COMMAND ${CMAKE_COMMAND} --build . -j
-            RESULT_VARIABLE result
-            WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/spdlog-build)
-    if (result)
+        RESULT_VARIABLE result
+        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/spdlog-build)
+    if(result)
         message(FATAL_ERROR "Build step for spdlog failed: ${result}")
-    endif ()
+    endif()
     execute_process(COMMAND ${CMAKE_COMMAND} --install .
-            RESULT_VARIABLE result
-            WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/spdlog-build)
-    if (result)
+        RESULT_VARIABLE result
+        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/spdlog-build)
+    if(result)
         message(FATAL_ERROR "Install step for spdlog failed: ${result}")
-    endif ()
-endmacro()
\ No newline at end of file
+    endif()
+endmacro()

From f93f47615ffb89df197c1cdc3f75d79b7fa8d50e Mon Sep 17 00:00:00 2001
From: Luohao Wang <luohaothu@live.com>
Date: Fri, 6 Jun 2025 18:23:01 +0800
Subject: [PATCH 11/31] [Core] Remove redundent file

---
 src/Core/Field/FieldMacros.hpp | 18 ------------------
 1 file changed, 18 deletions(-)
 delete mode 100644 src/Core/Field/FieldMacros.hpp

diff --git a/src/Core/Field/FieldMacros.hpp b/src/Core/Field/FieldMacros.hpp
deleted file mode 100644
index 10acbcf3..00000000
--- a/src/Core/Field/FieldMacros.hpp
+++ /dev/null
@@ -1,18 +0,0 @@
-// ----------------------------------------------------------------------------
-//
-// Copyright (c) 2019 - 2023 by the OpFlow developers
-//
-// This file is part of OpFlow.
-//
-// OpFlow is free software and is distributed under the MPL v2.0 license.
-// The full text of the license can be found in the file LICENSE at the top
-// level directory of OpFlow.
-//
-// ----------------------------------------------------------------------------
-
-#ifndef OPFLOW_FIELDMACROS_HPP
-#define OPFLOW_FIELDMACROS_HPP
-
-#include "Core/Meta.hpp"
-
-#endif//OPFLOW_FIELDMACROS_HPP

From 756856b8c44c5586ce1000429eec9290aeffb8ce Mon Sep 17 00:00:00 2001
From: Luohao Wang <luohaothu@live.com>
Date: Fri, 6 Jun 2025 18:23:25 +0800
Subject: [PATCH 12/31] [CI] Export build database

---
 CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6b8d808b..c394e8ed 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,6 +21,8 @@ set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
     # `Help/dev/experimental.rst` in the CMake source corresponding to
     # your CMake build for the exact value to use.
     "a9e1cf81-9932-4810-974b-6eccaf14e457")
+set(CMAKE_EXPERIMENTAL_EXPORT_BUILD_DATABASE 4bd552e2-b7fb-429a-ab23-c83ef53f3f13)
+set(CMAKE_EXPORT_BUILD_DATABASE 1)
 
 # ----------------------------------------------------------------------------
 # Start opflow project

From 04ca0bd8a5620be6f44a701e73c5b3a264b610fa Mon Sep 17 00:00:00 2001
From: Luohao Wang <luohaothu@live.com>
Date: Fri, 6 Jun 2025 18:24:28 +0800
Subject: [PATCH 13/31] [Core] Use C++26 feature inplace of tuple_element

---
 src/Core/Meta.hpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Core/Meta.hpp b/src/Core/Meta.hpp
index c952f321..cce2de0c 100644
--- a/src/Core/Meta.hpp
+++ b/src/Core/Meta.hpp
@@ -52,7 +52,7 @@ namespace OpFlow::Meta {
 
     template <typename... T>
     struct firstOf {
-        using type = typename std::tuple_element<0, std::tuple<T...>>::type;
+        using type = T...[0];
     };
 
     template <typename... Ts>
@@ -61,7 +61,7 @@ namespace OpFlow::Meta {
     template <typename... T>
     struct lastOf {
         // last type in the type list
-        using type = typename std::tuple_element<sizeof...(T) - 1, std::tuple<T...>>::type;
+        using type = T...[sizeof...(T) - 1];
     };
 
     template <typename... T>
@@ -172,8 +172,8 @@ namespace OpFlow::Meta {
     }
 
     template <std::size_t... Ints, std::size_t... IntsRemain, typename... Ts>
-    inline auto tuple_split_impl(std::index_sequence<Ints...>, std::index_sequence<IntsRemain...>,
-                                 std::tuple<Ts...>& t) {
+    auto tuple_split_impl(std::index_sequence<Ints...>, std::index_sequence<IntsRemain...>,
+                          std::tuple<Ts...>& t) {
         return std::make_tuple(std::forward_as_tuple(std::get<Ints>(t)...),
                                std::forward_as_tuple(std::get<IntsRemain>(t)...));
     }

From ec2400e972cf2ce1ce100b8b908ae8e426aacc21 Mon Sep 17 00:00:00 2001
From: Luohao Wang <luohaothu@live.com>
Date: Fri, 6 Jun 2025 18:25:35 +0800
Subject: [PATCH 14/31] [Core] Fix gcc ICE by explicitly specifying
 optimization flags

---
 src/CMakeLists.txt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f511c787..636f3d4d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -13,6 +13,10 @@ list(APPEND OPFLOW_HEADERS
     ${CMAKE_SOURCE_DIR}/include/Version
     ${CMAKE_SOURCE_DIR}/include/OpFlow)
 
+set(CMAKE_CXX_FLAGS_DEBUG "-Og -g")
+set(CMAKE_CXX_FLAGS_RELEASE "-O2")
+set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
+
 if(OPFLOW_ENABLE_MODULE)
     # ----------------------------------------------------------------------------
     # C++20 module version
@@ -20,7 +24,6 @@ if(OPFLOW_ENABLE_MODULE)
     add_library(opflow)
 
     target_compile_definitions(opflow INTERFACE OPFLOW_USE_MODULE)
-    target_compile_features(opflow PUBLIC cxx_std_26)
     set_property(TARGET opflow PROPERTY CXX_SCAN_FOR_MODULES ON)
     target_sources(opflow
         PUBLIC FILE_SET CXX_MODULES
@@ -31,6 +34,7 @@ if(OPFLOW_ENABLE_MODULE)
         ${CMAKE_SOURCE_DIR}/include
         ${CMAKE_SOURCE_DIR}/src
         FILES ${OPFLOW_HEADERS})
+    target_compile_features(opflow PUBLIC cxx_std_23)
     install(TARGETS opflow
         EXPORT opflow-targets
         FILE_SET CXX_MODULES DESTINATION ${CMAKE_INSTALL_LIBDIR}/cxx/opflow

From 053d21f64fb326b40198fcaffad8f56ac6c3037a Mon Sep 17 00:00:00 2001
From: Luohao Wang <luohaothu@live.com>
Date: Fri, 6 Jun 2025 18:26:12 +0800
Subject: [PATCH 15/31] [Core] Add missing header

---
 src/Core/Operator/Interpolator/D1FluxLimiter.hpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Core/Operator/Interpolator/D1FluxLimiter.hpp b/src/Core/Operator/Interpolator/D1FluxLimiter.hpp
index 7e9d803f..6d722b31 100644
--- a/src/Core/Operator/Interpolator/D1FluxLimiter.hpp
+++ b/src/Core/Operator/Interpolator/D1FluxLimiter.hpp
@@ -17,6 +17,7 @@
 #include "Core/Macros.hpp"
 #include "Core/Operator/Conditional.hpp"
 #include "DataStructures/StencilPad.hpp"
+#include "IntpInterface.hpp"
 #include "Math/Interpolator/Interpolator.hpp"
 
 namespace OpFlow {

From dc902a3dcb79b668c4fbb6d28949591d7f97b40c Mon Sep 17 00:00:00 2001
From: Luohao Wang <luohaothu@live.com>
Date: Fri, 6 Jun 2025 18:28:09 +0800
Subject: [PATCH 16/31] [Core] Fix calling non-constexpr function by if
 consteval

---
 src/Core/Macros.hpp | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/Core/Macros.hpp b/src/Core/Macros.hpp
index 3623b8f8..b65b2c6d 100644
--- a/src/Core/Macros.hpp
+++ b/src/Core/Macros.hpp
@@ -14,9 +14,9 @@
 #define OPFLOW_MACROS_HPP
 
 #ifndef OPFLOW_INSIDE_MODULE
-#include "spdlog/spdlog.h"
 #include <cassert>
 #include <cstring>
+#include <spdlog/spdlog.h>
 #include <utility>
 #endif
 #define OPFLOW_INLINE inline
@@ -49,7 +49,7 @@
 #endif// OPFLOW_USE_MODULE
 
 // Field Macros
-#include "Core/Field/FieldMacros.hpp"
+#include "Core/Meta.hpp"
 
 #define OP_ERRMSG_DIM_MISMATCH "Specified dims count & Tensor dims count mismatch."
 #define OP_ERRMSG_HIOD_SCHEME_ON_BD                                                                          \
@@ -66,12 +66,21 @@ namespace OpFlow {
     inline static int getWorkerId(MPI_Comm comm);
 }
 #define SPD_AUGMENTED_LOG(X, ...)                                                                            \
-    spdlog::X(std::format("[{}:{}@{}][Rank{}] ", __FILENAME__, __FUNCTION__, __LINE__,                       \
-                          OpFlow::getWorkerId(MPI_COMM_WORLD))                                               \
-              + std::format(__VA_ARGS__))
+    do {                                                                                                     \
+        if consteval {                                                                                       \
+            spdlog::X(std::format("[{}:{}@{}][Rank{}] ", __FILENAME__, __FUNCTION__, __LINE__,               \
+                                  OpFlow::getWorkerId(MPI_COMM_WORLD))                                       \
+                      + std::format(__VA_ARGS__));                                                           \
+        }                                                                                                    \
+    } while (0)
 #else
 #define SPD_AUGMENTED_LOG(X, ...)                                                                            \
-    spdlog::X(std::format("[{}:{}@{}] ", __FILENAME__, __FUNCTION__, __LINE__) + std::format(__VA_ARGS__))
+    do {                                                                                                     \
+        if consteval {                                                                                       \
+            spdlog::X(std::format("[{}:{}@{}] ", __FILENAME__, __FUNCTION__, __LINE__)                       \
+                      + std::format(__VA_ARGS__));                                                           \
+        }                                                                                                    \
+    } while (0)
 #endif
 
 #ifndef OP_DEBUGLEVEL

From 544d691b7bd08be8a127828ca7e0df9816430564 Mon Sep 17 00:00:00 2001
From: Luohao Wang <luohaothu@live.com>
Date: Fri, 6 Jun 2025 18:32:06 +0800
Subject: [PATCH 17/31] [Core] Refactor code

---
 src/Core/Interfaces/Stringifiable.hpp |  4 ++--
 src/DataStructures/Range/Ranges.hpp   | 26 ++++++++++++--------------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/Core/Interfaces/Stringifiable.hpp b/src/Core/Interfaces/Stringifiable.hpp
index 53083096..749564ab 100644
--- a/src/Core/Interfaces/Stringifiable.hpp
+++ b/src/Core/Interfaces/Stringifiable.hpp
@@ -38,8 +38,8 @@ namespace OpFlow {
 
 template <typename T>
     requires std::derived_from<T, OpFlow::StringifiableObj>
-struct std::formatter<T> : formatter<std::string> {
-    auto format(const OpFlow::StringifiableObj& a, auto& ctx) {
+struct std::formatter<T> : std::formatter<std::string> {
+    auto format(const OpFlow::StringifiableObj& a, auto& ctx) const {
         return std::formatter<std::string>::format(a.toString(), ctx);
     }
 };
diff --git a/src/DataStructures/Range/Ranges.hpp b/src/DataStructures/Range/Ranges.hpp
index a929e134..84df48ba 100644
--- a/src/DataStructures/Range/Ranges.hpp
+++ b/src/DataStructures/Range/Ranges.hpp
@@ -329,19 +329,17 @@ namespace OpFlow::DS {
 
 }// namespace OpFlow::DS
 
-namespace std {
-    template <std::size_t dim>
-    struct hash<OpFlow::DS::Range<dim>> {
-    public:
-        std::size_t operator()(const OpFlow::DS::Range<dim>& r) const noexcept {
-            std::array<int, 3 * dim> arr;
-            for (std::size_t i = 0; i < dim; ++i) {
-                arr[i] = r.start[i];
-                arr[i + dim] = r.end[i];
-                arr[i + 2 * dim] = r.stride[i];
-            }
-            return XXHash64::hash(arr.data(), sizeof(arr), 0);
+template <std::size_t dim>
+struct std::hash<OpFlow::DS::Range<dim>> {
+public:
+    std::size_t operator()(const OpFlow::DS::Range<dim>& r) const noexcept {
+        std::array<int, 3 * dim> arr;
+        for (std::size_t i = 0; i < dim; ++i) {
+            arr[i] = r.start[i];
+            arr[i + dim] = r.end[i];
+            arr[i + 2 * dim] = r.stride[i];
         }
-    };
-}// namespace std
+        return XXHash64::hash(arr.data(), sizeof(arr), 0);
+    }
+};
 #endif//OPFLOW_RANGES_HPP

From ace7896d2a9a0a31825cbfe37ab9ac377071877a Mon Sep 17 00:00:00 2001
From: Luohao Wang <luohaothu@live.com>
Date: Fri, 6 Jun 2025 21:00:16 +0800
Subject: [PATCH 18/31] [Ext] Update TBB to v2022.1.0

---
 external/tbb/.bazelrc                         |    2 +-
 external/tbb/.bazelversion                    |    2 +-
 external/tbb/.github/CODEOWNERS               |    7 +
 .../tbb/.github/ISSUE_TEMPLATE/1_question.md  |    7 +
 .../.github/ISSUE_TEMPLATE/2_bug_report.md    |   32 +
 .../ISSUE_TEMPLATE/3_feature_request.md       |   19 +
 .../.github/ISSUE_TEMPLATE/4_documentation.md |   20 +
 external/tbb/.github/dependabot.yml           |    6 +
 external/tbb/.github/issue_labeler.yml        |   27 +
 external/tbb/.github/labeler.yml              |   17 +
 external/tbb/.github/pull_request_template.md |   14 +-
 external/tbb/.github/scripts/codespell.sh     |    0
 external/tbb/.github/workflows/ci.yml         |  152 +-
 external/tbb/.github/workflows/codeql.yml     |   86 +
 external/tbb/.github/workflows/coverity.yml   |   62 +
 .../tbb/.github/workflows/issue_labeler.yml   |   36 +
 external/tbb/.github/workflows/labeler.yml    |   30 +
 .../tbb/.github/workflows/ossf-scorecard.yml  |   83 +
 external/tbb/BUILD.bazel                      |   73 +-
 external/tbb/Bazel.md                         |   90 +-
 external/tbb/CMakeLists.txt                   |  208 +-
 external/tbb/CODEOWNERS                       |   26 +
 external/tbb/CODE_OF_CONDUCT.md               |  134 +
 external/tbb/CONTRIBUTING.md                  |   28 +-
 external/tbb/INSTALL.md                       |  135 +
 external/tbb/MAINTAINERS.md                   |  143 +
 external/tbb/MODULE.bazel                     |   24 +
 external/tbb/MODULE.bazel.lock                |   65 +
 external/tbb/README.md                        |   74 +-
 external/tbb/RELEASE_NOTES.md                 |   51 +
 external/tbb/SECURITY.md                      |   66 +
 external/tbb/SUPPORT.md                       |   35 +
 external/tbb/SYSTEM_REQUIREMENTS.md           |   86 +
 external/tbb/VERSION                          |    1 -
 external/tbb/WASM_Support.md                  |   81 +
 external/tbb/WORKSPACE.bazel                  |    4 +-
 external/tbb/cmake/README.md                  |  307 +-
 external/tbb/cmake/android/environment.cmake  |    8 +-
 .../tbb/cmake/android/test_launcher.cmake     |    6 +-
 external/tbb/cmake/compilers/AppleClang.cmake |   22 +-
 external/tbb/cmake/compilers/Clang.cmake      |   52 +-
 external/tbb/cmake/compilers/GNU.cmake        |   84 +-
 external/tbb/cmake/compilers/Intel.cmake      |   18 +-
 external/tbb/cmake/compilers/IntelLLVM.cmake  |   11 +-
 external/tbb/cmake/compilers/MSVC.cmake       |   48 +-
 external/tbb/cmake/config_generation.cmake    |   95 +-
 external/tbb/cmake/hwloc_detection.cmake      |   50 +-
 external/tbb/cmake/memcheck.cmake             |  146 +-
 external/tbb/cmake/packaging.cmake            |    7 +-
 .../tbb/cmake/post_install/CMakeLists.txt     |    3 +-
 external/tbb/cmake/python/test_launcher.cmake |   19 +-
 external/tbb/cmake/resumable_tasks.cmake      |   31 +
 external/tbb/cmake/sanitize.cmake             |   15 +-
 .../scripts/cmake_gen_github_configs.cmake    |   27 +-
 .../tbb/cmake/suppressions/tsan.suppressions  |    4 +
 .../tbb/cmake/templates/TBBConfig.cmake.in    |   44 +-
 external/tbb/cmake/test_spec.cmake            |   14 +-
 external/tbb/cmake/toolchains/mips.cmake      |    2 +-
 external/tbb/cmake/toolchains/riscv64.cmake   |   34 +
 external/tbb/cmake/utils.cmake                |   62 +-
 external/tbb/cmake/vars_utils.cmake           |   38 +-
 external/tbb/doc/DoxygenLayout.xml            |  376 +-
 .../tbb/doc/GSG/Images/how-oneTBB-works.png   |  Bin 0 -> 53481 bytes
 external/tbb/doc/GSG/_static/custom.js        |   37 -
 .../tbb/doc/GSG/_static/theme_overrides.css   |   13 -
 external/tbb/doc/GSG/get_started.rst          |   20 +
 external/tbb/doc/GSG/index.rst                |  121 -
 external/tbb/doc/GSG/installation.rst         |    7 +
 external/tbb/doc/GSG/integrate.rst            |   68 +
 external/tbb/doc/GSG/intro_gsg.rst            |   29 +
 external/tbb/doc/GSG/next_steps.rst           |  158 +
 external/tbb/doc/GSG/samples.rst              |   49 +
 external/tbb/doc/GSG/system_requirements.rst  |    6 +
 external/tbb/doc/README.md                    |   34 +
 external/tbb/doc/_static/custom.js            |   37 +
 .../tbb/doc/{GSG => }/_static/favicons.png    |  Bin
 .../{GSG => }/_static/oneAPI-rgb-rev-100.png  |  Bin
 external/tbb/doc/_static/theme_overrides.css  |   13 +
 external/tbb/doc/{GSG => }/conf.py            |   80 +-
 external/tbb/doc/index.rst                    |   15 +
 external/tbb/doc/index/index_intro.rst        |    5 +
 external/tbb/doc/index/toctree.rst            |   42 +
 external/tbb/doc/index/useful_topics.rst      |    5 +
 external/tbb/doc/main/_static/custom.js       |   37 -
 external/tbb/doc/main/_static/favicons.png    |  Bin 467 -> 0 bytes
 .../doc/main/_static/oneAPI-rgb-rev-100.png   |  Bin 7414 -> 0 bytes
 .../tbb/doc/main/_static/theme_overrides.css  |   13 -
 external/tbb/doc/main/_templates/layout.html  |   29 +-
 external/tbb/doc/main/conf.py                 |  289 -
 .../doc/main/examples_testing/CMakeLists.txt  |   41 +
 external/tbb/doc/main/index.rst               |   37 -
 external/tbb/doc/main/intro/Benefits.rst      |    2 +-
 external/tbb/doc/main/intro/help_support.rst  |   15 +-
 .../main/intro/{intro.rst => intro_os.rst}    |    4 -
 .../tbb/doc/main/intro/introducing_main.rst   |   39 -
 external/tbb/doc/main/intro/limitations.rst   |   63 +
 .../main/intro/notices_and_disclaimers.rst    |   49 -
 .../tbb/doc/main/intro/testing_approach.rst   |   31 +
 .../main/reference/blocked_nd_range_ctad.rst  |  149 +
 .../doc/main/reference/custom_mutex_chmap.rst |   95 +-
 .../blocked_nd_range_ctad_example.cpp         |   61 +
 .../examples/custom_mutex_chmap_example.cpp   |  129 +
 .../reference/examples/fixed_pool_example.cpp |   28 +
 ..._expressing_graphs_preview_api_example.cpp |   54 +
 ..._expressing_graphs_regular_api_example.cpp |   60 +
 .../examples/make_edges_function_example.cpp  |   49 +
 .../malloc_replacement_log_example.cpp        |   41 +
 .../memory_pool_allocator_example.cpp         |   30 +
 .../examples/memory_pool_example.cpp          |   27 +
 .../examples/parallel_phase_example.cpp       |   53 +
 ...parallel_sort_ranges_extension_example.cpp |   37 +
 .../main/reference/examples/rvalue_reduce.cpp |   50 +
 .../examples/try_put_and_wait_example.cpp     |   75 +
 .../helpers_for_expressing_graphs.rst         |   77 +-
 .../main/reference/make_edges_function.rst    |   30 +-
 .../reference/parallel_for_each_semantics.rst |    2 +-
 .../parallel_phase_for_task_arena.rst         |  172 +
 .../parallel_sort_ranges_extension.rst        |   20 +-
 external/tbb/doc/main/reference/reference.rst |   18 +-
 .../tbb/doc/main/reference/rvalue_reduce.rst  |   68 +
 .../main/reference/scalable_memory_pools.rst  |    1 +
 .../scalable_memory_pools/fixed_pool_cls.rst  |   14 +-
 .../malloc_replacement_log.rst                |   69 +
 .../memory_pool_allocator_cls.rst             |   12 +-
 .../scalable_memory_pools/memory_pool_cls.rst |   12 +-
 .../main/reference/task_arena_extensions.rst  |   61 -
 .../main/reference/task_group_extensions.rst  |   60 +-
 .../task_group_extensions/task_handle.rst     |  101 -
 .../reference/this_task_arena_extensions.rst  |   71 -
 .../doc/main/reference/try_put_and_wait.rst   |  286 +
 .../reference/type_specified_message_keys.rst |    2 +-
 ..._Topic_Other_Kinds_of_Iteration_Spaces.rst |   64 +-
 ...st => Bandwidth_and_Cache_Affinity_os.rst} |    6 -
 .../doc/main/tbb_userguide/Constraints.rst    |    2 +-
 ...unking.rst => Controlling_Chunking_os.rst} |    6 -
 .../main/tbb_userguide/Dependence_Graph.rst   |   14 +-
 external/tbb/doc/main/tbb_userguide/Edges.rst |    6 +-
 .../Exceptions_and_Cancellation.rst           |    9 +-
 .../tbb_userguide/Floating_Point_Settings.rst |   60 +
 .../Flow-Graph-exception-tips.rst             |   17 +
 .../tbb_userguide/Flow-Graph-waiting-tips.rst |   11 +
 .../tbb_userguide/Flow_Graph_Reservation.rst  |   10 +-
 .../main/tbb_userguide/Flow_Graph_Tips.rst    |    4 +-
 .../Flow_Graph_resource_tips.rst              |    3 +-
 .../doc/main/tbb_userguide/Graph_Object.rst   |    7 +
 .../Guiding_Task_Scheduler_Execution.rst      |   21 +-
 .../How_Task_Scheduler_Works.rst              |   50 +
 .../main/tbb_userguide/Lambda_Expressions.rst |   68 +-
 .../tbb/doc/main/tbb_userguide/Linux_OS.rst   |    8 +-
 .../main/tbb_userguide/Memory_Allocation.rst  |    2 +-
 .../Migration_Guide/Mixing_Two_Runtimes.rst   |    1 +
 .../Migration_Guide/Task_API.rst              |    8 +-
 .../Migration_Guide/Task_Scheduler_Init.rst   |   18 +-
 external/tbb/doc/main/tbb_userguide/Nodes.rst |    6 +-
 ...e_Contents.rst => Package_Contents_os.rst} |    3 +-
 .../Parallelizing_Complex_Loops.rst           |    2 +-
 ....rst => Parallelizing_Simple_Loops_os.rst} |   12 +-
 .../Parallelizing_Simple_Loops_toctree.rst    |   11 +
 .../tbb_userguide/Predefined_Node_Types.rst   |   36 +-
 .../tbb_userguide/Task_Scheduler_Bypass.rst   |   20 +
 .../tbb_userguide/Task_Scheduler_Summary.rst  |   11 -
 .../main/tbb_userguide/The_Task_Scheduler.rst |    3 +-
 ...C_Dynamic_Memory_Interface_Replacement.rst |    4 +-
 .../doc/main/tbb_userguide/Windows_OS_ug.rst  |   10 +-
 .../Working_on_the_Assembly_Line_pipeline.rst |   16 +-
 .../tbb_userguide/always_use_wait_for_all.rst |    8 +-
 .../attach_flow_graph_to_arena.rst            |   46 +
 .../automatically-replacing-malloc.rst        |   22 +
 .../main/tbb_userguide/broadcast_or_send.rst  |   34 +-
 .../doc/main/tbb_userguide/cancel_a_graph.rst |    4 +-
 .../cancelling_nested_parallelism.rst         |    4 +-
 .../tbb_userguide/communicate_with_nodes.rst  |   28 +-
 .../tbb_userguide/concurrent_hash_map.rst     |    6 +-
 .../create_token_based_system.rst             |    2 +-
 .../design_patterns/Design_Patterns.rst       |    1 +
 .../design_patterns/Images/image008a.jpg      |  Bin 0 -> 30488 bytes
 .../design_patterns/Images/image009a.jpg      |  Bin 0 -> 21793 bytes
 .../design_patterns/Lazy_Initialization.rst   |  109 +
 .../destroy_graphs_outside_main_thread.rst    |    4 +-
 .../examples/blocked_nd_range_example.cpp     |   92 +
 .../examples/flow_graph_examples.cpp          |   72 +
 .../parallel_for_lambda_example_1.cpp         |   39 +
 .../parallel_for_lambda_example_2.cpp         |   36 +
 .../examples/parallel_for_os_example.cpp      |   51 +
 .../{parallel_for.rst => parallel_for_os.rst} |   52 +-
 .../tbb_userguide/parallel_for_toctree.rst    |   10 +
 .../snippets/blocked_nd_range_example.cpp     |   37 +
 .../snippets/blocked_nd_range_example.h       |   37 +
 .../snippets/flow_graph_examples.cpp          |   72 +
 .../tbb/doc/main/tbb_userguide/std_invoke.rst |  217 +
 external/tbb/doc/main/tbb_userguide/title.rst |    6 +-
 .../main/tbb_userguide/use_graph_reset.rst    |    6 +-
 .../doc/main/tbb_userguide/use_input_node.rst |    4 +-
 .../doc/main/tbb_userguide/use_make_edge.rst  |   10 +-
 external/tbb/doc/make.bat                     |   53 +
 external/tbb/examples/.clang-format           |   18 +-
 external/tbb/examples/CMakeLists.txt          |   19 +-
 external/tbb/examples/README.md               |   38 +-
 .../tbb/examples/common/cmake/common.cmake    |   12 +-
 .../common/cmake/modules/FindTBB.cmake        |   40 +-
 .../tbb/examples/common/gui/CMakeLists.txt    |   61 +-
 external/tbb/examples/common/gui/convideo.cpp |   17 +-
 external/tbb/examples/common/gui/d2dvideo.cpp |   15 +-
 external/tbb/examples/common/gui/gdivideo.cpp |   26 +-
 external/tbb/examples/common/gui/macvideo.cpp |   25 +-
 external/tbb/examples/common/gui/winvideo.hpp |   24 +-
 .../common/gui/xcode/tbbExample/OpenGLView.h  |   22 +-
 .../common/gui/xcode/tbbExample/OpenGLView.m  |   87 +-
 .../common/gui/xcode/tbbExample/main.m        |   13 +-
 .../gui/xcode/tbbExample/tbbAppDelegate.h     |    8 +-
 .../gui/xcode/tbbExample/tbbAppDelegate.m     |   15 +-
 external/tbb/examples/common/gui/xvideo.cpp   |   14 +-
 .../tbb/examples/common/utility/utility.hpp   |   62 +-
 .../examples/concurrent_hash_map/README.md    |    1 -
 .../count_strings/CMakeLists.txt              |    4 +-
 .../count_strings/README.md                   |   10 +-
 .../count_strings/count_strings.cpp           |    4 +-
 .../concurrent_priority_queue/README.md       |    1 -
 .../shortpath/CMakeLists.txt                  |    4 +-
 .../shortpath/README.md                       |   30 +-
 .../tbb/examples/getting_started/README.md    |    4 +-
 .../sub_string_finder/CMakeLists.txt          |    4 +-
 .../sub_string_finder/README.md               |   15 +-
 external/tbb/examples/graph/README.md         |    1 -
 .../tbb/examples/graph/binpack/CMakeLists.txt |    4 +-
 external/tbb/examples/graph/binpack/README.md |   20 +-
 .../examples/graph/cholesky/CMakeLists.txt    |   22 +-
 .../tbb/examples/graph/cholesky/README.md     |   40 +-
 .../graph/dining_philosophers/CMakeLists.txt  |    4 +-
 .../graph/dining_philosophers/README.md       |   20 +-
 .../tbb/examples/graph/fgbzip2/CMakeLists.txt |   32 +-
 external/tbb/examples/graph/fgbzip2/README.md |   14 +-
 .../examples/graph/logic_sim/CMakeLists.txt   |    4 +-
 .../tbb/examples/graph/logic_sim/README.md    |   13 +-
 .../tbb/examples/graph/som/CMakeLists.txt     |    4 +-
 external/tbb/examples/graph/som/README.md     |   20 +-
 external/tbb/examples/migration/README.md     |    6 +
 .../recursive_fibonacci/CMakeLists.txt        |   40 +
 .../migration/recursive_fibonacci/README.md   |   23 +
 .../recursive_fibonacci/fibonacci.cpp         |   61 +
 .../fibonacci_single_task.h                   |   97 +
 .../recursive_fibonacci/fibonacci_two_tasks.h |   79 +
 .../task_emulation_layer.h                    |  225 +
 external/tbb/examples/parallel_for/README.md  |    1 -
 .../parallel_for/game_of_life/CMakeLists.txt  |    4 +-
 .../parallel_for/game_of_life/Evolution.cpp   |    4 +-
 .../parallel_for/game_of_life/Evolution.hpp   |    4 +-
 .../game_of_life/Game_of_life.cpp             |    4 +-
 .../parallel_for/game_of_life/README.md       |   14 +-
 .../polygon_overlay/CMakeLists.txt            |    6 +-
 .../parallel_for/polygon_overlay/README.md    |   59 +-
 .../polygon_overlay/gui/polygon_overlay.rc    |   39 +-
 .../parallel_for/polygon_overlay/polymain.cpp |    4 +-
 .../parallel_for/polygon_overlay/polymain.hpp |    8 +-
 .../polygon_overlay/pover_video.hpp           |    4 +-
 .../parallel_for/seismic/CMakeLists.txt       |    6 +-
 .../examples/parallel_for/seismic/README.md   |   19 +-
 .../parallel_for/seismic/gui/seismic.rc       |  172 +-
 .../examples/parallel_for/seismic/main.cpp    |   31 +-
 .../parallel_for/tachyon/CMakeLists.txt       |   75 +-
 .../examples/parallel_for/tachyon/README.md   |   40 +-
 .../parallel_for/tachyon/gui/tachyon.rc       |   80 +-
 .../parallel_for/tachyon/src/imageio.cpp      |    7 +-
 .../parallel_for/tachyon/src/imageio.hpp      |    4 +-
 .../parallel_for/tachyon/src/jpeg.cpp         |    4 +-
 .../parallel_for/tachyon/src/main.cpp         |    4 +-
 .../examples/parallel_for/tachyon/src/ppm.cpp |    4 +-
 .../examples/parallel_for/tachyon/src/ppm.hpp |    4 +-
 .../parallel_for/tachyon/src/render.cpp       |    4 +-
 .../tbb/examples/parallel_for_each/README.md  |    1 -
 .../parallel_preorder/CMakeLists.txt          |    4 +-
 .../parallel_preorder/README.md               |   30 +-
 .../tbb/examples/parallel_pipeline/README.md  |    1 -
 .../parallel_pipeline/square/CMakeLists.txt   |    6 +-
 .../parallel_pipeline/square/README.md        |   13 +-
 .../tbb/examples/parallel_reduce/README.md    |    2 +-
 .../convex_hull/CMakeLists.txt                |    4 +-
 .../parallel_reduce/convex_hull/README.md     |   17 +-
 .../parallel_reduce/pi/CMakeLists.txt         |   33 +
 .../tbb/examples/parallel_reduce/pi/README.md |   24 +
 .../tbb/examples/parallel_reduce/pi/common.h  |   51 +
 .../tbb/examples/parallel_reduce/pi/main.cpp  |  100 +
 .../tbb/examples/parallel_reduce/pi/pi.cpp    |   55 +
 .../parallel_reduce/primes/CMakeLists.txt     |    4 +-
 .../examples/parallel_reduce/primes/README.md |   10 +-
 external/tbb/examples/task_arena/README.md    |    1 -
 .../task_arena/fractal/CMakeLists.txt         |    6 +-
 .../tbb/examples/task_arena/fractal/README.md |   19 +-
 .../task_arena/fractal/fractal_video.hpp      |    4 +-
 .../task_arena/fractal/gui/fractal.rc         |   80 +-
 external/tbb/examples/task_group/README.md    |    1 -
 .../examples/task_group/sudoku/CMakeLists.txt |    6 +-
 .../tbb/examples/task_group/sudoku/README.md  |   20 +-
 .../tbb/examples/task_group/sudoku/sudoku.cpp |   74 +-
 external/tbb/examples/test_all/README.md      |    1 -
 .../test_all/fibonacci/CMakeLists.txt         |   10 +-
 .../tbb/examples/test_all/fibonacci/README.md |   16 +-
 .../examples/test_all/fibonacci/fibonacci.cpp |    8 +-
 external/tbb/include/oneapi/tbb.h             |   10 +-
 .../tbb/include/oneapi/tbb/blocked_nd_range.h |  195 +
 .../tbb/include/oneapi/tbb/blocked_range.h    |  230 +-
 .../tbb/include/oneapi/tbb/blocked_range2d.h  |  152 +-
 .../tbb/include/oneapi/tbb/blocked_range3d.h  |  194 +-
 .../tbb/include/oneapi/tbb/blocked_rangeNd.h  |  205 +-
 .../oneapi/tbb/cache_aligned_allocator.h      |  258 +-
 .../oneapi/tbb/collaborative_call_once.h      |  409 +-
 external/tbb/include/oneapi/tbb/combinable.h  |   69 +-
 .../include/oneapi/tbb/concurrent_hash_map.h  | 3195 ++++----
 .../include/oneapi/tbb/concurrent_lru_cache.h |  680 +-
 .../tbb/include/oneapi/tbb/concurrent_map.h   |  632 +-
 .../oneapi/tbb/concurrent_priority_queue.h    |  844 +--
 .../tbb/include/oneapi/tbb/concurrent_queue.h | 1224 +--
 .../tbb/include/oneapi/tbb/concurrent_set.h   |  463 +-
 .../oneapi/tbb/concurrent_unordered_map.h     |  765 +-
 .../oneapi/tbb/concurrent_unordered_set.h     |  592 +-
 .../include/oneapi/tbb/concurrent_vector.h    | 2085 +++---
 .../include/oneapi/tbb/detail/_aggregator.h   |  276 +-
 .../oneapi/tbb/detail/_aligned_space.h        |   32 +-
 .../oneapi/tbb/detail/_allocator_traits.h     |  158 +-
 .../tbb/include/oneapi/tbb/detail/_assert.h   |   55 +-
 .../tbb/include/oneapi/tbb/detail/_attach.h   |   32 +
 .../tbb/detail/_concurrent_queue_base.h       | 1219 ++-
 .../oneapi/tbb/detail/_concurrent_skip_list.h | 2399 +++---
 .../tbb/detail/_concurrent_unordered_base.h   | 2913 ++++----
 .../tbb/include/oneapi/tbb/detail/_config.h   |  456 +-
 .../oneapi/tbb/detail/_containers_helpers.h   |   88 +-
 .../include/oneapi/tbb/detail/_exception.h    |  129 +-
 .../tbb/include/oneapi/tbb/detail/_export.h   |   30 +-
 .../oneapi/tbb/detail/_flow_graph_body_impl.h |  327 +-
 .../tbb/detail/_flow_graph_cache_impl.h       |  322 +-
 .../oneapi/tbb/detail/_flow_graph_impl.h      |  946 +--
 .../tbb/detail/_flow_graph_indexer_impl.h     |  621 +-
 .../tbb/detail/_flow_graph_item_buffer_impl.h |  305 +-
 .../oneapi/tbb/detail/_flow_graph_join_impl.h | 3145 ++++----
 .../oneapi/tbb/detail/_flow_graph_node_impl.h |  737 +-
 .../tbb/detail/_flow_graph_node_set_impl.h    |  116 +-
 .../tbb/detail/_flow_graph_nodes_deduction.h  |  373 +-
 .../detail/_flow_graph_tagged_buffer_impl.h   |  332 +-
 .../tbb/detail/_flow_graph_trace_impl.h       |  623 +-
 .../tbb/detail/_flow_graph_types_impl.h       |  362 +-
 .../include/oneapi/tbb/detail/_hash_compare.h |  186 +-
 .../oneapi/tbb/detail/_intrusive_list_node.h  |   26 +-
 .../tbb/include/oneapi/tbb/detail/_machine.h  |  523 +-
 .../include/oneapi/tbb/detail/_mutex_common.h |   69 +-
 .../oneapi/tbb/detail/_namespace_injection.h  |    2 +-
 .../include/oneapi/tbb/detail/_node_handle.h  |  280 +-
 .../oneapi/tbb/detail/_pipeline_filters.h     |  883 ++-
 .../tbb/detail/_pipeline_filters_deduction.h  |   39 +-
 .../include/oneapi/tbb/detail/_range_common.h |  198 +-
 .../include/oneapi/tbb/detail/_rtm_mutex.h    |  223 +-
 .../include/oneapi/tbb/detail/_rtm_rw_mutex.h |  351 +-
 .../include/oneapi/tbb/detail/_scoped_lock.h  |  300 +-
 .../oneapi/tbb/detail/_segment_table.h        | 1075 +--
 .../oneapi/tbb/detail/_small_object_pool.h    |  165 +-
 .../tbb/include/oneapi/tbb/detail/_task.h     |  458 +-
 .../include/oneapi/tbb/detail/_task_handle.h  |  194 +-
 .../oneapi/tbb/detail/_template_helpers.h     |  689 +-
 .../tbb/include/oneapi/tbb/detail/_utils.h    |  649 +-
 .../oneapi/tbb/detail/_waitable_atomic.h      |  142 +-
 .../oneapi/tbb/enumerable_thread_specific.h   | 2051 ++---
 external/tbb/include/oneapi/tbb/flow_graph.h  | 6596 +++++++++--------
 .../oneapi/tbb/flow_graph_abstractions.h      |   47 +-
 .../tbb/include/oneapi/tbb/global_control.h   |  311 +-
 external/tbb/include/oneapi/tbb/info.h        |  195 +-
 external/tbb/include/oneapi/tbb/memory_pool.h |  440 +-
 external/tbb/include/oneapi/tbb/mutex.h       |  139 +-
 external/tbb/include/oneapi/tbb/null_mutex.h  |  106 +-
 .../tbb/include/oneapi/tbb/null_rw_mutex.h    |  120 +-
 .../tbb/include/oneapi/tbb/parallel_for.h     |  891 ++-
 .../include/oneapi/tbb/parallel_for_each.h    | 1270 ++--
 .../tbb/include/oneapi/tbb/parallel_invoke.h  |  391 +-
 .../include/oneapi/tbb/parallel_pipeline.h    |  244 +-
 .../tbb/include/oneapi/tbb/parallel_reduce.h  | 1455 ++--
 .../tbb/include/oneapi/tbb/parallel_scan.h    | 1117 +--
 .../tbb/include/oneapi/tbb/parallel_sort.h    |  479 +-
 external/tbb/include/oneapi/tbb/partitioner.h | 1260 ++--
 external/tbb/include/oneapi/tbb/profiling.h   |  378 +-
 .../tbb/include/oneapi/tbb/queuing_mutex.h    |  298 +-
 .../tbb/include/oneapi/tbb/queuing_rw_mutex.h |  295 +-
 external/tbb/include/oneapi/tbb/rw_mutex.h    |  376 +-
 .../include/oneapi/tbb/scalable_allocator.h   |  345 +-
 external/tbb/include/oneapi/tbb/spin_mutex.h  |  157 +-
 external/tbb/include/oneapi/tbb/task_arena.h  |  221 +-
 external/tbb/include/oneapi/tbb/task_group.h  |  246 +-
 external/tbb/include/oneapi/tbb/version.h     |   52 +-
 external/tbb/include/tbb/blocked_nd_range.h   |   17 +
 external/tbb/include/tbb/mutex.h              |   17 +
 external/tbb/include/tbb/rw_mutex.h           |   17 +
 external/tbb/integration/linux/env/vars.sh    |   26 +-
 .../tbb/integration/linux/modulefiles/tbb     |   99 +-
 .../tbb/integration/linux/modulefiles/tbb32   |  101 +-
 external/tbb/integration/linux/oneapi/vars.sh |   34 +
 external/tbb/integration/pkg-config/tbb.pc.in |    6 +-
 external/tbb/integration/windows/env/vars.bat |   63 +-
 .../windows/nuget/inteltbb.devel.win.targets  |   20 +-
 .../tbb/integration/windows/oneapi/vars.bat   |   56 +
 external/tbb/python/CMakeLists.txt            |    7 +-
 external/tbb/python/README.md                 |    2 +-
 external/tbb/python/TBB.py                    |    4 +-
 external/tbb/python/rml/ipc_server.cpp        | 1848 ++---
 external/tbb/python/rml/ipc_utils.cpp         |  202 +-
 external/tbb/python/setup.py                  |    6 +-
 external/tbb/python/tbb/__init__.py           |   15 +-
 external/tbb/python/tbb/__main__.py           |    4 +-
 external/tbb/python/tbb/pool.py               |   50 +-
 external/tbb/python/tbb/test.py               |   67 +-
 external/tbb/rfcs/README.md                   |   77 +
 external/tbb/rfcs/archived/README.md          |   14 +
 external/tbb/rfcs/experimental/README.md      |   28 +
 .../blocked_nd_range_ctad/README.md           |  227 +
 .../parallel_phase_for_task_arena/README.md   |  306 +
 .../alternative_proposal.png                  |  Bin 0 -> 111506 bytes
 .../completely_disable_new_behavior.png       |  Bin 0 -> 171804 bytes
 .../parallel_phase_introduction.png           |  Bin 0 -> 99675 bytes
 .../parallel_phase_sequence_diagram.png       |  Bin 0 -> 124339 bytes
 .../parallel_phase_state_final.png            |  Bin 0 -> 219191 bytes
 .../parallel_phase_state_initial.png          |  Bin 0 -> 169595 bytes
 external/tbb/rfcs/proposed/README.md          |    9 +
 .../loading-dependencies-by-module-name.org   |  104 +
 .../tbb/rfcs/proposed/numa_support/README.md  |  156 +
 .../tbbbind-link-static-hwloc.org             |  120 +
 external/tbb/rfcs/supported/README.md         |   11 +
 external/tbb/rfcs/template.md                 |   56 +
 external/tbb/src/tbb/CMakeLists.txt           |  148 +-
 external/tbb/src/tbb/address_waiter.cpp       |  162 +-
 external/tbb/src/tbb/allocator.cpp            |  396 +-
 external/tbb/src/tbb/arena.cpp                | 1605 ++--
 external/tbb/src/tbb/arena.h                  |  371 +-
 external/tbb/src/tbb/arena_slot.cpp           |  376 +-
 external/tbb/src/tbb/arena_slot.h             |   31 +-
 .../tbb/src/tbb/cancellation_disseminator.h   |   85 +
 external/tbb/src/tbb/co_context.h             |   40 +-
 .../tbb/src/tbb/concurrent_bounded_queue.cpp  |  130 +-
 external/tbb/src/tbb/concurrent_monitor.h     |   25 +-
 external/tbb/src/tbb/def/lin32-tbb.def        |    7 +-
 external/tbb/src/tbb/def/lin64-tbb.def        |    6 +-
 external/tbb/src/tbb/def/mac64-tbb.def        |    7 +-
 external/tbb/src/tbb/def/win32-tbb.def        |    6 +-
 external/tbb/src/tbb/def/win64-tbb.def        |    6 +-
 external/tbb/src/tbb/dynamic_link.cpp         |  697 +-
 external/tbb/src/tbb/dynamic_link.h           |   10 +-
 external/tbb/src/tbb/environment.h            |    6 +-
 external/tbb/src/tbb/exception.cpp            |  262 +-
 external/tbb/src/tbb/global_control.cpp       |  476 +-
 external/tbb/src/tbb/governor.cpp             |  955 +--
 external/tbb/src/tbb/governor.h               |   11 +-
 external/tbb/src/tbb/itt_notify.cpp           |   58 +-
 external/tbb/src/tbb/itt_notify.h             |    5 +-
 external/tbb/src/tbb/mailbox.h                |    4 +-
 external/tbb/src/tbb/main.cpp                 |  245 +-
 external/tbb/src/tbb/market.cpp               |  733 +-
 external/tbb/src/tbb/market.h                 |  292 +-
 .../tbb/src/tbb/market_concurrent_monitor.h   |    2 +-
 external/tbb/src/tbb/misc.cpp                 |  178 +-
 external/tbb/src/tbb/misc.h                   |   13 +-
 external/tbb/src/tbb/misc_ex.cpp              |  598 +-
 external/tbb/src/tbb/observer_proxy.cpp       |  527 +-
 external/tbb/src/tbb/observer_proxy.h         |   14 +-
 external/tbb/src/tbb/parallel_pipeline.cpp    |  849 ++-
 external/tbb/src/tbb/permit_manager.h         |   61 +
 external/tbb/src/tbb/pm_client.h              |   76 +
 external/tbb/src/tbb/private_server.cpp       |  673 +-
 external/tbb/src/tbb/profiling.cpp            |  438 +-
 external/tbb/src/tbb/queuing_rw_mutex.cpp     | 1175 ++-
 external/tbb/src/tbb/rml_tbb.cpp              |  126 +-
 external/tbb/src/tbb/rml_thread_monitor.h     |   94 +-
 external/tbb/src/tbb/rtm_mutex.cpp            |  177 +-
 external/tbb/src/tbb/rtm_rw_mutex.cpp         |  484 +-
 external/tbb/src/tbb/scheduler_common.h       |  127 +-
 external/tbb/src/tbb/semaphore.cpp            |  128 +-
 external/tbb/src/tbb/semaphore.h              |   87 +-
 external/tbb/src/tbb/small_object_pool.cpp    |  257 +-
 external/tbb/src/tbb/task.cpp                 |  399 +-
 external/tbb/src/tbb/task_dispatcher.cpp      |  429 +-
 external/tbb/src/tbb/task_dispatcher.h        |   47 +-
 external/tbb/src/tbb/task_group_context.cpp   |  604 +-
 external/tbb/src/tbb/task_stream.h            |   43 +-
 external/tbb/src/tbb/tbb.rc                   |   74 +
 external/tbb/src/tbb/tcm.h                    |  174 +
 external/tbb/src/tbb/tcm_adaptor.cpp          |  327 +
 external/tbb/src/tbb/tcm_adaptor.h            |   63 +
 external/tbb/src/tbb/thread_control_monitor.h |  116 +
 external/tbb/src/tbb/thread_data.h            |   92 +-
 external/tbb/src/tbb/thread_dispatcher.cpp    |  236 +
 external/tbb/src/tbb/thread_dispatcher.h      |  107 +
 .../tbb/src/tbb/thread_dispatcher_client.h    |   69 +
 .../tbb/src/tbb/thread_request_serializer.cpp |  139 +
 .../tbb/src/tbb/thread_request_serializer.h   |   84 +
 external/tbb/src/tbb/threading_control.cpp    |  411 +
 external/tbb/src/tbb/threading_control.h      |  154 +
 .../tbb/src/tbb/threading_control_client.h    |   58 +
 external/tbb/src/tbb/tls.h                    |    6 +-
 .../tbb/src/tbb/tools_api/disable_warnings.h  |    8 +-
 external/tbb/src/tbb/tools_api/ittnotify.h    |  417 +-
 .../tbb/src/tbb/tools_api/ittnotify_config.h  |  214 +-
 .../tbb/src/tbb/tools_api/ittnotify_static.c  |  582 +-
 .../tbb/src/tbb/tools_api/ittnotify_static.h  |   24 +-
 .../tbb/src/tbb/tools_api/ittnotify_types.h   |    2 +-
 .../tbb/src/tbb/tools_api/legacy/ittnotify.h  |   49 +-
 external/tbb/src/tbb/version.cpp              |    4 +-
 external/tbb/src/tbb/waiters.h                |   55 +-
 external/tbb/src/tbbbind/CMakeLists.txt       |   30 +-
 .../tbb/src/tbbbind/def/mac64-tbbbind.def     |   18 +
 .../tbb/src/tbbbind/def/win32-tbbbind.def     |    1 -
 .../tbb/src/tbbbind/def/win64-tbbbind.def     |    1 -
 external/tbb/src/tbbbind/tbb_bind.cpp         | 1000 +--
 external/tbb/src/tbbbind/tbb_bind.rc          |   74 +
 external/tbb/src/tbbmalloc/CMakeLists.txt     |   33 +-
 external/tbb/src/tbbmalloc/Customize.h        |    6 +-
 external/tbb/src/tbbmalloc/MapMemory.h        |   16 +-
 external/tbb/src/tbbmalloc/Statistics.h       |    4 +-
 external/tbb/src/tbbmalloc/Synchronize.h      |    6 +-
 external/tbb/src/tbbmalloc/TypeDefinitions.h  |    4 +-
 external/tbb/src/tbbmalloc/backend.cpp        | 2679 +++----
 external/tbb/src/tbbmalloc/backend.h          |    3 +-
 external/tbb/src/tbbmalloc/backref.cpp        |  639 +-
 external/tbb/src/tbbmalloc/frontend.cpp       | 4696 ++++++------
 external/tbb/src/tbbmalloc/large_objects.cpp  | 1850 ++---
 external/tbb/src/tbbmalloc/large_objects.h    |   22 +-
 external/tbb/src/tbbmalloc/shared_utils.h     |    2 +-
 external/tbb/src/tbbmalloc/tbbmalloc.cpp      |  103 +-
 external/tbb/src/tbbmalloc/tbbmalloc.rc       |   74 +
 .../tbb/src/tbbmalloc/tbbmalloc_internal.h    |   56 +-
 .../tbb/src/tbbmalloc_proxy/CMakeLists.txt    |   16 +-
 .../tbbmalloc_proxy/function_replacement.cpp  |  309 +-
 .../tbbmalloc_proxy/function_replacement.h    |    6 +-
 external/tbb/src/tbbmalloc_proxy/proxy.cpp    |  624 +-
 external/tbb/src/tbbmalloc_proxy/proxy.h      |    4 +-
 .../src/tbbmalloc_proxy/proxy_overload_osx.h  |   10 +-
 .../src/tbbmalloc_proxy/tbbmalloc_proxy.rc    |   74 +
 external/tbb/test/CMakeLists.txt              |  239 +-
 .../tbb/test/common/allocator_test_common.h   |    6 +-
 .../test/common/common_arena_constraints.h    |   20 +-
 external/tbb/test/common/concepts_common.h    |   41 +-
 .../tbb/test/common/concurrency_tracker.h     |    6 +-
 .../common/concurrent_associative_common.h    |   33 +-
 .../test/common/concurrent_lru_cache_common.h |   14 +-
 .../test/common/concurrent_unordered_common.h |   20 +-
 external/tbb/test/common/config.h             |   14 +-
 external/tbb/test/common/cpu_usertime.h       |    4 +-
 external/tbb/test/common/custom_allocators.h  |    2 +-
 external/tbb/test/common/doctest.h            | 3085 ++++----
 external/tbb/test/common/dummy_body.h         |    2 +-
 external/tbb/test/common/exception_handling.h |   12 +-
 external/tbb/test/common/graph_utils.h        |  153 +-
 .../test/common/initializer_list_support.h    |    4 +
 external/tbb/test/common/memory_usage.h       |   33 +-
 .../test/common/parallel_for_each_common.h    |    6 +-
 external/tbb/test/common/test_invoke.h        |  145 +
 .../test_join_node_multiple_predecessors.h    |  117 +
 external/tbb/test/common/tls_limit.h          |    6 +-
 external/tbb/test/common/utils.h              |   40 +-
 external/tbb/test/common/utils_assert.h       |    6 +-
 .../tbb/test/common/utils_concurrency_limit.h |   66 +-
 external/tbb/test/common/utils_dynamic_libs.h |   25 +-
 external/tbb/test/common/utils_env.h          |    4 +-
 external/tbb/test/common/utils_report.h       |   10 +-
 .../conformance/conformance_allocators.cpp    |   13 +-
 .../conformance_arena_constraints.cpp         |   44 +-
 .../conformance/conformance_async_node.cpp    |  102 +-
 .../conformance_blocked_nd_range.cpp          |  293 +
 .../conformance/conformance_blocked_range.cpp |   95 +-
 .../conformance_blocked_range2d.cpp           |  147 +-
 .../conformance_blocked_range3d.cpp           |  216 +-
 .../conformance_blocked_rangeNd.cpp           |  135 +-
 .../conformance_broadcast_node.cpp            |   20 +-
 .../conformance/conformance_buffer_node.cpp   |   18 +-
 .../conformance_collaborative_call_once.cpp   |  125 +
 .../conformance/conformance_combinable.cpp    |  240 +-
 .../conformance_composite_node.cpp            |   93 +-
 .../conformance_concurrent_hash_map.cpp       | 1278 ++--
 .../conformance_concurrent_lru_cache.cpp      |   36 +-
 .../conformance_concurrent_map.cpp            |  103 +-
 .../conformance_concurrent_priority_queue.cpp |  244 +-
 .../conformance_concurrent_queue.cpp          | 1172 +--
 .../conformance_concurrent_set.cpp            |   73 +-
 .../conformance_concurrent_unordered_map.cpp  |  133 +-
 .../conformance_concurrent_unordered_set.cpp  |  124 +-
 .../conformance_concurrent_vector.cpp         | 1271 ++--
 .../conformance/conformance_continue_node.cpp |   66 +-
 ...conformance_enumerable_thread_specific.cpp |  763 +-
 .../test/conformance/conformance_flowgraph.h  |   31 +-
 .../conformance/conformance_function_node.cpp |  105 +-
 .../conformance_global_control.cpp            |  318 +-
 .../test/conformance/conformance_graph.cpp    |   89 +-
 .../conformance/conformance_indexer_node.cpp  |   74 +-
 .../conformance/conformance_input_node.cpp    |   84 +-
 .../conformance/conformance_join_node.cpp     |  170 +-
 .../conformance/conformance_limiter_node.cpp  |  113 +-
 .../conformance_multifunction_node.cpp        |  123 +-
 .../test/conformance/conformance_mutex.cpp    |   41 +-
 .../tbb/test/conformance/conformance_mutex.h  |   12 +-
 .../conformance_overwrite_node.cpp            |   27 +-
 .../conformance/conformance_parallel_for.cpp  |  319 +-
 .../conformance_parallel_for_each.cpp         |  108 +-
 .../conformance_parallel_invoke.cpp           |   80 +-
 .../conformance_parallel_pipeline.cpp         |  442 +-
 .../conformance_parallel_reduce.cpp           |  291 +-
 .../conformance/conformance_parallel_scan.cpp |  133 +-
 .../conformance/conformance_parallel_sort.cpp |   47 +-
 .../conformance_priority_queue_node.cpp       |   12 +-
 .../conformance/conformance_queue_node.cpp    |   17 +-
 .../conformance_resumable_tasks.cpp           |    2 +-
 .../conformance_sequencer_node.cpp            |   85 +-
 .../conformance/conformance_split_node.cpp    |   47 +-
 .../conformance/conformance_task_arena.cpp    |  161 +-
 .../conformance/conformance_task_group.cpp    |  283 +
 .../conformance_task_group_context.cpp        |   13 +-
 .../conformance/conformance_tick_count.cpp    |   15 +-
 .../test/conformance/conformance_version.cpp  |   18 +-
 .../conformance_write_once_node.cpp           |   21 +-
 external/tbb/test/tbb/test_adaptive_mutex.cpp |   14 +-
 external/tbb/test/tbb/test_allocators.cpp     |   49 +-
 .../tbb/test/tbb/test_arena_constraints.cpp   |  112 +-
 .../tbb/test/tbb/test_arena_priorities.cpp    |  503 +-
 external/tbb/test/tbb/test_async_node.cpp     |  597 +-
 external/tbb/test/tbb/test_blocked_range.cpp  |  266 +-
 external/tbb/test/tbb/test_broadcast_node.cpp |  358 +-
 external/tbb/test/tbb/test_buffer_node.cpp    |  463 +-
 .../tbb/test_buffering_try_put_and_wait.h     |  189 +
 .../test/tbb/test_collaborative_call_once.cpp |  124 +-
 external/tbb/test/tbb/test_composite_node.cpp |  439 +-
 .../tbb/test/tbb/test_concurrent_hash_map.cpp |  926 +--
 .../test/tbb/test_concurrent_lru_cache.cpp    |   77 +-
 external/tbb/test/tbb/test_concurrent_map.cpp |   90 +-
 .../tbb/test/tbb/test_concurrent_monitor.cpp  |   40 +-
 .../tbb/test_concurrent_priority_queue.cpp    |   98 +-
 .../tbb/test/tbb/test_concurrent_queue.cpp    |  237 +-
 .../tbb/test_concurrent_queue_whitebox.cpp    |   45 +-
 external/tbb/test/tbb/test_concurrent_set.cpp |   84 +-
 .../tbb/test_concurrent_unordered_map.cpp     |  129 +-
 .../tbb/test_concurrent_unordered_set.cpp     |   97 +-
 .../tbb/test/tbb/test_concurrent_vector.cpp   |  530 +-
 external/tbb/test/tbb/test_continue_node.cpp  |  436 +-
 external/tbb/test/tbb/test_dynamic_link.cpp   |   36 +-
 external/tbb/test/tbb/test_eh_algorithms.cpp  | 1291 ++--
 external/tbb/test/tbb/test_eh_flow_graph.cpp  | 1887 ++---
 external/tbb/test/tbb/test_eh_thread.cpp      |   86 +-
 .../tbb/test_enumerable_thread_specific.cpp   |  341 +-
 .../test/tbb/test_environment_whitebox.cpp    |   64 +-
 external/tbb/test/tbb/test_flow_graph.cpp     |  210 +-
 .../test/tbb/test_flow_graph_priorities.cpp   | 1219 +--
 .../tbb/test/tbb/test_flow_graph_whitebox.cpp |  617 +-
 external/tbb/test/tbb/test_function_node.cpp  |  804 +-
 external/tbb/test/tbb/test_fuzzing.cpp        |   41 +
 external/tbb/test/tbb/test_global_control.cpp |  272 +-
 external/tbb/test/tbb/test_handle_perror.cpp  |   24 +-
 external/tbb/test/tbb/test_hw_concurrency.cpp |   42 +-
 .../tbb/test_implicit_linkage_on_windows.cpp  |    6 +-
 external/tbb/test/tbb/test_indexer_node.cpp   |  559 +-
 external/tbb/test/tbb/test_input_node.cpp     |  223 +-
 external/tbb/test/tbb/test_intrusive_list.cpp |   55 +-
 external/tbb/test/tbb/test_join_node.cpp      |  238 +-
 external/tbb/test/tbb/test_join_node.h        |   15 +-
 .../test/tbb/test_join_node_key_matching.cpp  |  141 +-
 .../test_join_node_key_matching_n_args.cpp    |   54 +
 .../tbb/test_join_node_msg_key_matching.cpp   |   84 +-
 ...test_join_node_msg_key_matching_n_args.cpp |   57 +
 .../tbb/test/tbb/test_join_node_preview.cpp   |  356 +
 external/tbb/test/tbb/test_limiter_node.cpp   |  587 +-
 .../tbb/test/tbb/test_multifunction_node.cpp  |  518 +-
 external/tbb/test/tbb/test_mutex.cpp          |   96 +-
 external/tbb/test/tbb/test_numa_dist.cpp      |  162 +
 external/tbb/test/tbb/test_openmp.cpp         |   77 +-
 external/tbb/test/tbb/test_overwrite_node.cpp |  345 +-
 external/tbb/test/tbb/test_parallel_for.cpp   |  448 +-
 .../tbb/test/tbb/test_parallel_for_each.cpp   |  233 +-
 .../tbb/test/tbb/test_parallel_invoke.cpp     |   29 +-
 external/tbb/test/tbb/test_parallel_phase.cpp |  355 +
 .../tbb/test/tbb/test_parallel_pipeline.cpp   |  594 +-
 .../tbb/test/tbb/test_parallel_reduce.cpp     |  654 +-
 external/tbb/test/tbb/test_parallel_scan.cpp  |  419 +-
 external/tbb/test/tbb/test_parallel_sort.cpp  |  350 +-
 external/tbb/test/tbb/test_partitioner.cpp    |  256 +-
 external/tbb/test/tbb/test_partitioner.h      |   66 +-
 .../tbb/test/tbb/test_priority_queue_node.cpp |  462 +-
 external/tbb/test/tbb/test_profiling.cpp      |   62 +-
 external/tbb/test/tbb/test_queue_node.cpp     |  540 +-
 .../tbb/test/tbb/test_resumable_tasks.cpp     |  143 +-
 external/tbb/test/tbb/test_scheduler_mix.cpp  |  337 +-
 external/tbb/test/tbb/test_semaphore.cpp      |  130 +-
 external/tbb/test/tbb/test_sequencer_node.cpp |  488 +-
 external/tbb/test/tbb/test_split_node.cpp     |  358 +-
 external/tbb/test/tbb/test_tagged_msg.cpp     |  207 +-
 external/tbb/test/tbb/test_task.cpp           |  471 +-
 external/tbb/test/tbb/test_task_arena.cpp     | 1273 ++--
 external/tbb/test/tbb/test_task_group.cpp     |  982 ++-
 external/tbb/test/tbb/test_tbb_fork.cpp       |  172 +-
 external/tbb/test/tbb/test_tbb_header.cpp     |  379 +-
 .../test/tbb/test_tbb_header_secondary.cpp    |   17 +-
 external/tbb/test/tbb/test_tick_count.cpp     |   12 +-
 .../tbb/test/tbb/test_write_once_node.cpp     |  306 +-
 .../tbb/test/tbbmalloc/test_malloc_atexit.cpp |   65 +-
 .../test/tbbmalloc/test_malloc_compliance.cpp |  935 +--
 .../tbbmalloc/test_malloc_init_shutdown.cpp   |   69 +-
 .../test/tbbmalloc/test_malloc_lib_unload.cpp |  154 +-
 .../tbbmalloc/test_malloc_new_handler.cpp     |   18 +-
 .../test/tbbmalloc/test_malloc_overload.cpp   |  244 +-
 .../test_malloc_overload_disable.cpp          |   23 +-
 .../tbb/test/tbbmalloc/test_malloc_pools.cpp  |  577 +-
 .../test/tbbmalloc/test_malloc_regression.cpp |  121 +-
 .../tbbmalloc/test_malloc_shutdown_hang.cpp   |   55 +-
 .../tbbmalloc/test_malloc_used_by_lib.cpp     |   65 +-
 .../test/tbbmalloc/test_malloc_whitebox.cpp   |  909 +--
 .../tbbmalloc/test_scalable_allocator.cpp     |  172 +-
 external/tbb/third-party-programs.txt         |  413 +-
 706 files changed, 81207 insertions(+), 62419 deletions(-)
 create mode 100644 external/tbb/.github/CODEOWNERS
 create mode 100644 external/tbb/.github/ISSUE_TEMPLATE/1_question.md
 create mode 100644 external/tbb/.github/ISSUE_TEMPLATE/2_bug_report.md
 create mode 100644 external/tbb/.github/ISSUE_TEMPLATE/3_feature_request.md
 create mode 100644 external/tbb/.github/ISSUE_TEMPLATE/4_documentation.md
 create mode 100644 external/tbb/.github/dependabot.yml
 create mode 100644 external/tbb/.github/issue_labeler.yml
 create mode 100644 external/tbb/.github/labeler.yml
 mode change 100644 => 100755 external/tbb/.github/scripts/codespell.sh
 create mode 100644 external/tbb/.github/workflows/codeql.yml
 create mode 100644 external/tbb/.github/workflows/coverity.yml
 create mode 100644 external/tbb/.github/workflows/issue_labeler.yml
 create mode 100644 external/tbb/.github/workflows/labeler.yml
 create mode 100644 external/tbb/.github/workflows/ossf-scorecard.yml
 create mode 100644 external/tbb/CODEOWNERS
 create mode 100644 external/tbb/CODE_OF_CONDUCT.md
 create mode 100644 external/tbb/INSTALL.md
 create mode 100644 external/tbb/MAINTAINERS.md
 create mode 100644 external/tbb/MODULE.bazel
 create mode 100644 external/tbb/MODULE.bazel.lock
 create mode 100644 external/tbb/RELEASE_NOTES.md
 create mode 100644 external/tbb/SECURITY.md
 create mode 100644 external/tbb/SUPPORT.md
 create mode 100644 external/tbb/SYSTEM_REQUIREMENTS.md
 delete mode 100644 external/tbb/VERSION
 create mode 100644 external/tbb/WASM_Support.md
 create mode 100644 external/tbb/cmake/resumable_tasks.cmake
 create mode 100644 external/tbb/cmake/suppressions/tsan.suppressions
 create mode 100644 external/tbb/cmake/toolchains/riscv64.cmake
 create mode 100644 external/tbb/doc/GSG/Images/how-oneTBB-works.png
 delete mode 100644 external/tbb/doc/GSG/_static/custom.js
 delete mode 100644 external/tbb/doc/GSG/_static/theme_overrides.css
 create mode 100644 external/tbb/doc/GSG/get_started.rst
 delete mode 100644 external/tbb/doc/GSG/index.rst
 create mode 100644 external/tbb/doc/GSG/installation.rst
 create mode 100644 external/tbb/doc/GSG/integrate.rst
 create mode 100644 external/tbb/doc/GSG/intro_gsg.rst
 create mode 100644 external/tbb/doc/GSG/next_steps.rst
 create mode 100644 external/tbb/doc/GSG/samples.rst
 create mode 100644 external/tbb/doc/GSG/system_requirements.rst
 create mode 100644 external/tbb/doc/README.md
 create mode 100644 external/tbb/doc/_static/custom.js
 rename external/tbb/doc/{GSG => }/_static/favicons.png (100%)
 rename external/tbb/doc/{GSG => }/_static/oneAPI-rgb-rev-100.png (100%)
 create mode 100644 external/tbb/doc/_static/theme_overrides.css
 rename external/tbb/doc/{GSG => }/conf.py (76%)
 create mode 100644 external/tbb/doc/index.rst
 create mode 100644 external/tbb/doc/index/index_intro.rst
 create mode 100644 external/tbb/doc/index/toctree.rst
 create mode 100644 external/tbb/doc/index/useful_topics.rst
 delete mode 100644 external/tbb/doc/main/_static/custom.js
 delete mode 100644 external/tbb/doc/main/_static/favicons.png
 delete mode 100644 external/tbb/doc/main/_static/oneAPI-rgb-rev-100.png
 delete mode 100644 external/tbb/doc/main/_static/theme_overrides.css
 delete mode 100644 external/tbb/doc/main/conf.py
 create mode 100644 external/tbb/doc/main/examples_testing/CMakeLists.txt
 delete mode 100644 external/tbb/doc/main/index.rst
 rename external/tbb/doc/main/intro/{intro.rst => intro_os.rst} (82%)
 delete mode 100644 external/tbb/doc/main/intro/introducing_main.rst
 create mode 100644 external/tbb/doc/main/intro/limitations.rst
 delete mode 100644 external/tbb/doc/main/intro/notices_and_disclaimers.rst
 create mode 100644 external/tbb/doc/main/intro/testing_approach.rst
 create mode 100644 external/tbb/doc/main/reference/blocked_nd_range_ctad.rst
 create mode 100644 external/tbb/doc/main/reference/examples/blocked_nd_range_ctad_example.cpp
 create mode 100644 external/tbb/doc/main/reference/examples/custom_mutex_chmap_example.cpp
 create mode 100644 external/tbb/doc/main/reference/examples/fixed_pool_example.cpp
 create mode 100644 external/tbb/doc/main/reference/examples/helpers_for_expressing_graphs_preview_api_example.cpp
 create mode 100644 external/tbb/doc/main/reference/examples/helpers_for_expressing_graphs_regular_api_example.cpp
 create mode 100644 external/tbb/doc/main/reference/examples/make_edges_function_example.cpp
 create mode 100644 external/tbb/doc/main/reference/examples/malloc_replacement_log_example.cpp
 create mode 100644 external/tbb/doc/main/reference/examples/memory_pool_allocator_example.cpp
 create mode 100644 external/tbb/doc/main/reference/examples/memory_pool_example.cpp
 create mode 100644 external/tbb/doc/main/reference/examples/parallel_phase_example.cpp
 create mode 100644 external/tbb/doc/main/reference/examples/parallel_sort_ranges_extension_example.cpp
 create mode 100644 external/tbb/doc/main/reference/examples/rvalue_reduce.cpp
 create mode 100644 external/tbb/doc/main/reference/examples/try_put_and_wait_example.cpp
 create mode 100644 external/tbb/doc/main/reference/parallel_phase_for_task_arena.rst
 create mode 100644 external/tbb/doc/main/reference/rvalue_reduce.rst
 create mode 100644 external/tbb/doc/main/reference/scalable_memory_pools/malloc_replacement_log.rst
 delete mode 100644 external/tbb/doc/main/reference/task_arena_extensions.rst
 delete mode 100644 external/tbb/doc/main/reference/task_group_extensions/task_handle.rst
 delete mode 100644 external/tbb/doc/main/reference/this_task_arena_extensions.rst
 create mode 100644 external/tbb/doc/main/reference/try_put_and_wait.rst
 rename external/tbb/doc/main/tbb_userguide/{Bandwidth_and_Cache_Affinity.rst => Bandwidth_and_Cache_Affinity_os.rst} (93%)
 rename external/tbb/doc/main/tbb_userguide/{Controlling_Chunking.rst => Controlling_Chunking_os.rst} (96%)
 create mode 100644 external/tbb/doc/main/tbb_userguide/Floating_Point_Settings.rst
 create mode 100644 external/tbb/doc/main/tbb_userguide/Flow-Graph-exception-tips.rst
 create mode 100644 external/tbb/doc/main/tbb_userguide/Flow-Graph-waiting-tips.rst
 create mode 100644 external/tbb/doc/main/tbb_userguide/How_Task_Scheduler_Works.rst
 rename external/tbb/doc/main/tbb_userguide/{Package_Contents.rst => Package_Contents_os.rst} (93%)
 rename external/tbb/doc/main/tbb_userguide/{Parallelizing_Simple_Loops.rst => Parallelizing_Simple_Loops_os.rst} (75%)
 create mode 100644 external/tbb/doc/main/tbb_userguide/Parallelizing_Simple_Loops_toctree.rst
 create mode 100644 external/tbb/doc/main/tbb_userguide/Task_Scheduler_Bypass.rst
 delete mode 100644 external/tbb/doc/main/tbb_userguide/Task_Scheduler_Summary.rst
 create mode 100644 external/tbb/doc/main/tbb_userguide/attach_flow_graph_to_arena.rst
 create mode 100644 external/tbb/doc/main/tbb_userguide/automatically-replacing-malloc.rst
 create mode 100644 external/tbb/doc/main/tbb_userguide/design_patterns/Images/image008a.jpg
 create mode 100644 external/tbb/doc/main/tbb_userguide/design_patterns/Images/image009a.jpg
 create mode 100644 external/tbb/doc/main/tbb_userguide/design_patterns/Lazy_Initialization.rst
 create mode 100644 external/tbb/doc/main/tbb_userguide/examples/blocked_nd_range_example.cpp
 create mode 100644 external/tbb/doc/main/tbb_userguide/examples/flow_graph_examples.cpp
 create mode 100644 external/tbb/doc/main/tbb_userguide/examples/parallel_for_lambda_example_1.cpp
 create mode 100644 external/tbb/doc/main/tbb_userguide/examples/parallel_for_lambda_example_2.cpp
 create mode 100644 external/tbb/doc/main/tbb_userguide/examples/parallel_for_os_example.cpp
 rename external/tbb/doc/main/tbb_userguide/{parallel_for.rst => parallel_for_os.rst} (81%)
 create mode 100644 external/tbb/doc/main/tbb_userguide/parallel_for_toctree.rst
 create mode 100644 external/tbb/doc/main/tbb_userguide/snippets/blocked_nd_range_example.cpp
 create mode 100644 external/tbb/doc/main/tbb_userguide/snippets/blocked_nd_range_example.h
 create mode 100644 external/tbb/doc/main/tbb_userguide/snippets/flow_graph_examples.cpp
 create mode 100644 external/tbb/doc/main/tbb_userguide/std_invoke.rst
 create mode 100644 external/tbb/doc/make.bat
 create mode 100644 external/tbb/examples/migration/README.md
 create mode 100644 external/tbb/examples/migration/recursive_fibonacci/CMakeLists.txt
 create mode 100644 external/tbb/examples/migration/recursive_fibonacci/README.md
 create mode 100644 external/tbb/examples/migration/recursive_fibonacci/fibonacci.cpp
 create mode 100644 external/tbb/examples/migration/recursive_fibonacci/fibonacci_single_task.h
 create mode 100644 external/tbb/examples/migration/recursive_fibonacci/fibonacci_two_tasks.h
 create mode 100644 external/tbb/examples/migration/recursive_fibonacci/task_emulation_layer.h
 create mode 100644 external/tbb/examples/parallel_reduce/pi/CMakeLists.txt
 create mode 100644 external/tbb/examples/parallel_reduce/pi/README.md
 create mode 100644 external/tbb/examples/parallel_reduce/pi/common.h
 create mode 100644 external/tbb/examples/parallel_reduce/pi/main.cpp
 create mode 100644 external/tbb/examples/parallel_reduce/pi/pi.cpp
 create mode 100644 external/tbb/include/oneapi/tbb/blocked_nd_range.h
 create mode 100644 external/tbb/include/oneapi/tbb/detail/_attach.h
 create mode 100644 external/tbb/include/tbb/blocked_nd_range.h
 create mode 100644 external/tbb/include/tbb/mutex.h
 create mode 100644 external/tbb/include/tbb/rw_mutex.h
 create mode 100644 external/tbb/integration/linux/oneapi/vars.sh
 create mode 100644 external/tbb/integration/windows/oneapi/vars.bat
 create mode 100644 external/tbb/rfcs/README.md
 create mode 100644 external/tbb/rfcs/archived/README.md
 create mode 100644 external/tbb/rfcs/experimental/README.md
 create mode 100644 external/tbb/rfcs/experimental/blocked_nd_range_ctad/README.md
 create mode 100644 external/tbb/rfcs/experimental/parallel_phase_for_task_arena/README.md
 create mode 100644 external/tbb/rfcs/experimental/parallel_phase_for_task_arena/alternative_proposal.png
 create mode 100644 external/tbb/rfcs/experimental/parallel_phase_for_task_arena/completely_disable_new_behavior.png
 create mode 100644 external/tbb/rfcs/experimental/parallel_phase_for_task_arena/parallel_phase_introduction.png
 create mode 100644 external/tbb/rfcs/experimental/parallel_phase_for_task_arena/parallel_phase_sequence_diagram.png
 create mode 100644 external/tbb/rfcs/experimental/parallel_phase_for_task_arena/parallel_phase_state_final.png
 create mode 100644 external/tbb/rfcs/experimental/parallel_phase_for_task_arena/parallel_phase_state_initial.png
 create mode 100644 external/tbb/rfcs/proposed/README.md
 create mode 100644 external/tbb/rfcs/proposed/loading-dependencies/loading-dependencies-by-module-name.org
 create mode 100755 external/tbb/rfcs/proposed/numa_support/README.md
 create mode 100755 external/tbb/rfcs/proposed/numa_support/tbbbind-link-static-hwloc.org
 create mode 100644 external/tbb/rfcs/supported/README.md
 create mode 100644 external/tbb/rfcs/template.md
 create mode 100644 external/tbb/src/tbb/cancellation_disseminator.h
 create mode 100644 external/tbb/src/tbb/permit_manager.h
 create mode 100644 external/tbb/src/tbb/pm_client.h
 create mode 100644 external/tbb/src/tbb/tbb.rc
 create mode 100644 external/tbb/src/tbb/tcm.h
 create mode 100644 external/tbb/src/tbb/tcm_adaptor.cpp
 create mode 100644 external/tbb/src/tbb/tcm_adaptor.h
 create mode 100644 external/tbb/src/tbb/thread_control_monitor.h
 create mode 100644 external/tbb/src/tbb/thread_dispatcher.cpp
 create mode 100644 external/tbb/src/tbb/thread_dispatcher.h
 create mode 100644 external/tbb/src/tbb/thread_dispatcher_client.h
 create mode 100644 external/tbb/src/tbb/thread_request_serializer.cpp
 create mode 100644 external/tbb/src/tbb/thread_request_serializer.h
 create mode 100644 external/tbb/src/tbb/threading_control.cpp
 create mode 100644 external/tbb/src/tbb/threading_control.h
 create mode 100644 external/tbb/src/tbb/threading_control_client.h
 create mode 100755 external/tbb/src/tbbbind/def/mac64-tbbbind.def
 create mode 100644 external/tbb/src/tbbbind/tbb_bind.rc
 create mode 100644 external/tbb/src/tbbmalloc/tbbmalloc.rc
 create mode 100644 external/tbb/src/tbbmalloc_proxy/tbbmalloc_proxy.rc
 create mode 100644 external/tbb/test/common/test_invoke.h
 create mode 100644 external/tbb/test/common/test_join_node_multiple_predecessors.h
 create mode 100644 external/tbb/test/conformance/conformance_blocked_nd_range.cpp
 create mode 100644 external/tbb/test/conformance/conformance_collaborative_call_once.cpp
 create mode 100644 external/tbb/test/conformance/conformance_task_group.cpp
 create mode 100644 external/tbb/test/tbb/test_buffering_try_put_and_wait.h
 create mode 100644 external/tbb/test/tbb/test_fuzzing.cpp
 create mode 100644 external/tbb/test/tbb/test_join_node_key_matching_n_args.cpp
 create mode 100644 external/tbb/test/tbb/test_join_node_msg_key_matching_n_args.cpp
 create mode 100644 external/tbb/test/tbb/test_join_node_preview.cpp
 create mode 100644 external/tbb/test/tbb/test_numa_dist.cpp
 create mode 100644 external/tbb/test/tbb/test_parallel_phase.cpp

diff --git a/external/tbb/.bazelrc b/external/tbb/.bazelrc
index 31612e9c..0445fd82 100644
--- a/external/tbb/.bazelrc
+++ b/external/tbb/.bazelrc
@@ -16,4 +16,4 @@
 # use Bazel internally. The Bazel build can have security risks or 
 # optimization gaps.
 
-build --symlink_prefix=/ # Out of source build
\ No newline at end of file
+build --symlink_prefix=/ # Out of source build
diff --git a/external/tbb/.bazelversion b/external/tbb/.bazelversion
index 99eba4de..b26a34e4 100644
--- a/external/tbb/.bazelversion
+++ b/external/tbb/.bazelversion
@@ -1 +1 @@
-4.1.0
\ No newline at end of file
+7.2.1
diff --git a/external/tbb/.github/CODEOWNERS b/external/tbb/.github/CODEOWNERS
new file mode 100644
index 00000000..31805797
--- /dev/null
+++ b/external/tbb/.github/CODEOWNERS
@@ -0,0 +1,7 @@
+# Lines starting with '#' are comments.
+# Each line is a file pattern followed by one or more owners.
+
+# More details are here: https://help.github.com/articles/about-codeowners/
+
+src/tbbmalloc @ldorau @lplewa @kfilipek
+src/tbbmalloc_proxy @ldorau @lplewa @kfilipek
diff --git a/external/tbb/.github/ISSUE_TEMPLATE/1_question.md b/external/tbb/.github/ISSUE_TEMPLATE/1_question.md
new file mode 100644
index 00000000..bee63c24
--- /dev/null
+++ b/external/tbb/.github/ISSUE_TEMPLATE/1_question.md
@@ -0,0 +1,7 @@
+---
+name: Ask a question
+about: Use this template for any questions
+title: ''
+labels: 'question'
+assignees: ''
+---
\ No newline at end of file
diff --git a/external/tbb/.github/ISSUE_TEMPLATE/2_bug_report.md b/external/tbb/.github/ISSUE_TEMPLATE/2_bug_report.md
new file mode 100644
index 00000000..4e135815
--- /dev/null
+++ b/external/tbb/.github/ISSUE_TEMPLATE/2_bug_report.md
@@ -0,0 +1,32 @@
+---
+name: Report a bug or a performance issue
+about: Use this template to report unexpected behavior
+title: ''
+labels: 'bug'
+assignees: ''
+---
+
+# Summary
+Provide a short summary of the issue. 
+See the sections below
+for factors important for the reproduction of an issue.
+
+# Version
+Report oneTBB version used to reproduce the problem.
+
+# Environment
+Provide any environmental details that you consider significant for reproducing the issue.
+The following information is important:
+* Hardware
+* OS name and version
+* Compiler version
+
+# Observed Behavior
+Document behavior you observe.
+
+# Expected Behavior
+Document behavior you expect.
+
+# Steps To Reproduce
+Check that the issue is reproducible with the latest revision
+of the master branch. Include all the steps to reproduce the issue.
\ No newline at end of file
diff --git a/external/tbb/.github/ISSUE_TEMPLATE/3_feature_request.md b/external/tbb/.github/ISSUE_TEMPLATE/3_feature_request.md
new file mode 100644
index 00000000..c4f8cfcb
--- /dev/null
+++ b/external/tbb/.github/ISSUE_TEMPLATE/3_feature_request.md
@@ -0,0 +1,19 @@
+---
+name: Request a feature
+about: Use this template to request new functionality or change the behavior of the library
+title: ''
+labels: 'new feature'
+assignees: ''
+---
+
+# Summary
+Include a short summary of the request. 
+
+See the sections below
+for factors important for a feature request.
+
+# Problem Statement
+Describe the problem you want to solve with a reasonable level of detail.
+
+# Preferred Solution
+Provide your ideas regarding problem solutions.
\ No newline at end of file
diff --git a/external/tbb/.github/ISSUE_TEMPLATE/4_documentation.md b/external/tbb/.github/ISSUE_TEMPLATE/4_documentation.md
new file mode 100644
index 00000000..3788d13b
--- /dev/null
+++ b/external/tbb/.github/ISSUE_TEMPLATE/4_documentation.md
@@ -0,0 +1,20 @@
+---
+name: Request a documentation change
+about: Use this template to report documentation issue or request documentation changes
+title: ''
+labels: 'documentation'
+assignees: ''
+---
+
+# Summary
+Include a short summary of the issue or request. 
+See the sections below
+for factors important for a documentation
+issue.
+
+# URLs
+Include pointers to documents that are impacted.
+
+# Additional Details
+Provide a detailed description of the expected changes in documentation
+and suggestions you have.
\ No newline at end of file
diff --git a/external/tbb/.github/dependabot.yml b/external/tbb/.github/dependabot.yml
new file mode 100644
index 00000000..5ace4600
--- /dev/null
+++ b/external/tbb/.github/dependabot.yml
@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
diff --git a/external/tbb/.github/issue_labeler.yml b/external/tbb/.github/issue_labeler.yml
new file mode 100644
index 00000000..cf956edb
--- /dev/null
+++ b/external/tbb/.github/issue_labeler.yml
@@ -0,0 +1,27 @@
+# Copyright (c) 2023 Intel Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# PR template regexp's for issue labeler
+bug fix:
+    - '\[(x|X)\]\sbug\sfix'
+enhancement:
+    - '\[(x|X)\]\snew\sfeature'
+tests:
+    - '\[(x|X)\]\stests'
+infrastructure:
+    - '\[(x|X)\]\sinfrastructure'
+documentation:
+    - '\[(x|X)\]\sdocumentation'
+allocator:
+    - '\[(x|X)\]\sallocator'
\ No newline at end of file
diff --git a/external/tbb/.github/labeler.yml b/external/tbb/.github/labeler.yml
new file mode 100644
index 00000000..839d7f36
--- /dev/null
+++ b/external/tbb/.github/labeler.yml
@@ -0,0 +1,17 @@
+# Copyright (c) 2023-2024 Intel Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+allocator:
+- changed-files:
+  - any-glob-to-any-file: ['src/tbbmalloc/**/*', 'src/tbbmalloc_proxy/**/*', 'test/tbbmalloc/**/*']
diff --git a/external/tbb/.github/pull_request_template.md b/external/tbb/.github/pull_request_template.md
index 74b17436..f986d31a 100644
--- a/external/tbb/.github/pull_request_template.md
+++ b/external/tbb/.github/pull_request_template.md
@@ -1,6 +1,6 @@
-### Description
+### Description 
+_Add a comprehensive description of proposed changes_
 
-_Add comprehensive description of proposed changes_
 
 Fixes # - _issue number(s) if exists_
 
@@ -8,17 +8,17 @@ Fixes # - _issue number(s) if exists_
 
 _Choose one or multiple, leave empty if none of the other choices apply_
 
-_Add respective label(s) to PR if you have permissions_
+_Add a respective label(s) to PR if you have permissions_
 
-- [ ] bug fix - _change which fixes an issue_
-- [ ] new feature - _change which adds functionality_
+- [ ] bug fix - _change that fixes an issue_
+- [ ] new feature - _change that adds functionality_
 - [ ] tests - _change in tests_
 - [ ] infrastructure - _change in infrastructure and CI_
 - [ ] documentation - _documentation update_
 
 ### Tests
 
-- [ ] added - _required for new features and for some bug fixes_
+- [ ] added - _required for new features and some bug fixes_
 - [ ] not needed
 
 ### Documentation
@@ -28,13 +28,11 @@ _Add respective label(s) to PR if you have permissions_
 - [ ] not needed
 
 ### Breaks backward compatibility
-
 - [ ] Yes
 - [ ] No
 - [ ] Unknown
 
 ### Notify the following users
-
 _List users with `@` to send notifications_
 
 ### Other information
diff --git a/external/tbb/.github/scripts/codespell.sh b/external/tbb/.github/scripts/codespell.sh
old mode 100644
new mode 100755
diff --git a/external/tbb/.github/workflows/ci.yml b/external/tbb/.github/workflows/ci.yml
index 22ced32e..abda1e14 100644
--- a/external/tbb/.github/workflows/ci.yml
+++ b/external/tbb/.github/workflows/ci.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Intel Corporation
+# Copyright (c) 2021-2024 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,15 +16,17 @@ name: oneTBB CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [master]
 
   pull_request:
-    branches: [ master ]
+    branches: [master]
     types:
       - opened
       - synchronize
       - reopened
 
+permissions: read-all
+
 env:
   BUILD_CONCURRENCY: 2
   MACOS_BUILD_CONCURRENCY: 3
@@ -32,63 +34,70 @@ env:
 
 jobs:
   codespell:
-    runs-on: [ ubuntu-20.04 ]
+    runs-on: [ubuntu-20.04]
     timeout-minutes: 10
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Run scan
         run: |
           sudo apt update && sudo apt install -y codespell
           ${GITHUB_WORKSPACE}/.github/scripts/codespell.sh `pwd`
 
   examples_clang-format:
-    runs-on: [ ubuntu-20.04 ]
+    runs-on: [ubuntu-20.04]
     timeout-minutes: 10
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Run scan
         run: |
+          command -v clang-format-10
           cp -r examples examples_formatted
-          find examples_formatted -regex '.*\.\(cpp\|hpp\)' -exec clang-format-9 -style=file -i {} \;
+          find examples_formatted -regex '.*\.\(cpp\|hpp\)' -exec clang-format-10 -style=file -i {} \;
           diff -r examples examples_formatted
 
   documentation:
-    needs: [ codespell ]
+    needs: [codespell]
     env:
       BUILD_TYPE: oss
-    runs-on: [ ubuntu-20.04 ]
+    runs-on: [ubuntu-22.04]
     timeout-minutes: 10
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Install prerequisites
         run: |
+          pip3 install -U Jinja2
           pip3 install git+https://github.com/executablebooks/sphinx-book-theme.git
+          pip3 install sphinx-tabs
           echo GITHUB_SHA_SHORT=${GITHUB_SHA::8} >> $GITHUB_ENV
           mkdir html
       - name: Build documentation
         run: |
-          export BUILD_TYPE=${BUILD_TYPE} && sphinx-build doc/main html
+          export BUILD_TYPE=${BUILD_TYPE} && sphinx-build doc html
           tar -czvf html.tar.gz html/
       - name: Save docs
-        uses: actions/upload-artifact@v2.2.1
+        uses: actions/upload-artifact@v4
         with:
           name: oneTBB-html-docs-${{ env.GITHUB_SHA_SHORT }}
           path: html.tar.gz
 
   pages:
     if: ${{ github.ref == 'refs/heads/master' }}
+    permissions:
+      contents: write
+      pages: write
+      id-token: write
     runs-on: ubuntu-latest
-    needs: [ documentation ]
+    needs: [documentation]
     steps:
       - name: Checkout gh-pages
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           ref: gh-pages
           path: gh-pages
       - name: Set env
         run: echo GITHUB_SHA_SHORT=${GITHUB_SHA::8} >> $GITHUB_ENV
       - name: Download documetation
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: oneTBB-html-docs-${{ env.GITHUB_SHA_SHORT }}
       - name: Publish to github pages
@@ -104,11 +113,31 @@ jobs:
           git commit --reset-author --amend -m "Update from GitHub Actions"
           git push --force origin gh-pages
 
-  python_module_test_ubuntu18-04:
-    runs-on: [ ubuntu-18.04 ]
+  copyright_check:
+    if: ${{ github.ref != 'refs/heads/master' }}
+    runs-on: [ubuntu-20.04]
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Run check
+        run: |
+          sed -i \
+            -e "/Copyright (c) .* Intel Corporation/s/ \([0-9]\+\)[-0-9]*/ \\1-$(date +%Y)/" \
+            -e "/Copyright (c) .* Intel Corporation/s/$(date +%Y)-$(date +%Y)/$(date +%Y)/" \
+            $(git diff --diff-filter=d --name-only ${{ github.event.pull_request.base.sha }})
+          git checkout -- third-party-programs.txt
+          git diff > years.diff
+          if [[ -s years.diff ]]; then
+            echo "Wrong copyright years"
+            cat years.diff
+            exit 1
+          fi
+  python_module_test_ubuntu_latest:
+    runs-on: [ubuntu-latest]
     timeout-minutes: 15
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Run testing
         run: |
           mkdir build && cd build
@@ -117,14 +146,14 @@ jobs:
           ctest -R python_test --output-on-failure --timeout ${TEST_TIMEOUT}
 
   linux-testing:
-    name: ${{ matrix.os }}_${{ matrix.cxx_compiler }}_cxx${{ matrix.std }}_${{ matrix.build_type }}_preview=${{ matrix.preview }}
-    runs-on: [ '${{ matrix.os }}' ]
+    name: ${{ matrix.os }}_${{ matrix.cxx_compiler }}_cxx${{ matrix.std }}_${{ matrix.build_type }}_preview=${{ matrix.preview }}${{ matrix.cmake_static }}
+    runs-on: ['${{ matrix.os }}']
     timeout-minutes: 45
     strategy:
       fail-fast: false
       matrix:
         include:
-          - os: ubuntu-18.04
+          - os: ubuntu-latest
             c_compiler: gcc
             cxx_compiler: g++
             std: 14
@@ -142,75 +171,98 @@ jobs:
             std: 20
             build_type: debug
             preview: 'ON'
+          - os: ubuntu-22.04
+            c_compiler: gcc-11
+            cxx_compiler: g++-11
+            std: 20
+            build_type: release
+            preview: 'ON'
+            cmake_static: -DBUILD_SHARED_LIBS=OFF
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Run testing
         shell: bash
         run: |
           set -x
           mkdir build && cd build
-          cmake -DCMAKE_CXX_STANDARD=${{ matrix.std }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \
+          cmake -DCMAKE_CXX_STANDARD=${{ matrix.std }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} ${{ matrix.cmake_static }} \
             -DCMAKE_CXX_COMPILER=${{ matrix.cxx_compiler }} -DCMAKE_C_COMPILER=${{ matrix.c_compiler }} -DTBB_CPF=${{ matrix.preview }} ..
           make VERBOSE=1 -j${BUILD_CONCURRENCY}
           ctest --timeout ${TEST_TIMEOUT} --output-on-failure
 
   macos-testing:
-    name: ${{ matrix.os }}_${{ matrix.cxx_compiler }}_cxx${{ matrix.std }}_${{ matrix.build_type }}_preview=${{ matrix.preview }}
-    runs-on: [ '${{ matrix.os }}' ]
+    name: ${{ matrix.os }}_${{ matrix.cxx_compiler }}_cxx${{ matrix.std }}_${{ matrix.build_type }}_preview=${{ matrix.preview }}${{ matrix.cmake_static }}
+    runs-on: ['${{ matrix.os }}']
     timeout-minutes: 45
     strategy:
       fail-fast: false
       matrix:
         include:
-          - os: macos-10.15
+          - os: macos-14
             c_compiler: clang
             cxx_compiler: clang++
             std: 14
             build_type: relwithdebinfo
             preview: 'ON'
+          - os: macos-13
+            c_compiler: clang
+            cxx_compiler: clang++
+            std: 20
+            build_type: release
+            preview: 'ON'
+            cmake_static: -DBUILD_SHARED_LIBS=OFF
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Run testing
         shell: bash
         run: |
           set -x
           mkdir build && cd build
-          cmake -DCMAKE_CXX_STANDARD=${{ matrix.std }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \
+          cmake -DCMAKE_CXX_STANDARD=${{ matrix.std }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} ${{ matrix.cmake_static }} \
             -DCMAKE_CXX_COMPILER=${{ matrix.cxx_compiler }} -DCMAKE_C_COMPILER=${{ matrix.c_compiler }} -DTBB_CPF=${{ matrix.preview }} ..
           make VERBOSE=1 -j${MACOS_BUILD_CONCURRENCY}
           ctest --timeout ${TEST_TIMEOUT} --output-on-failure
 
   windows-testing:
     name: ${{ matrix.job_name }}
-    runs-on: [ '${{ matrix.os }}' ]
+    runs-on: ['${{ matrix.os }}']
     timeout-minutes: 45
     strategy:
       fail-fast: false
       matrix:
         include:
-          - os: windows-2016
-            generator: Visual Studio 15 2017
+          - os: windows-2019
+            generator: Visual Studio 16 2019
             c_compiler: cl
             cxx_compiler: cl
             std: 14
             build_type: relwithdebinfo
             preview: 'ON'
-            job_name: windows_cl2017_cxx14_relwithdebinfo_preview=ON
+            job_name: windows_cl2019_cxx14_relwithdebinfo_preview=ON
           - os: windows-2019
             generator: Visual Studio 16 2019
             c_compiler: cl
             cxx_compiler: cl
+            std: 20
+            build_type: release
+            preview: 'ON'
+            job_name: windows_cl2019_cxx20_release_preview=ON-DBUILD_SHARED_LIBS=OFF
+            cmake_static: -DBUILD_SHARED_LIBS=OFF
+          - os: windows-2022
+            generator: Visual Studio 17 2022
+            c_compiler: cl
+            cxx_compiler: cl
             std: 17
             build_type: relwithdebinfo
             preview: 'OFF'
-            job_name: windows_cl2019_cxx17_relwithdebinfo_preview=OFF
+            job_name: windows_cl2022_cxx17_relwithdebinfo_preview=OFF
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Run testing
         run: |
           mkdir build
           cd build
-          cmake -G "${{ matrix.generator }}" -A x64 -DCMAKE_CXX_STANDARD=${{ matrix.std }} `
+          cmake -G "${{ matrix.generator }}" -A x64 -DCMAKE_CXX_STANDARD=${{ matrix.std }} ${{ matrix.cmake_static }} `
             -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_CXX_COMPILER=${{ matrix.cxx_compiler }} `
             -DCMAKE_C_COMPILER=${{ matrix.c_compiler }} -DTBB_CPF=${{ matrix.preview }} ..
           cmake --build . --config ${{ matrix.build_type }} -j -v
@@ -218,13 +270,13 @@ jobs:
 
   linux-examples-testing:
     name: examples_${{ matrix.os }}_${{ matrix.cxx_compiler }}_cxx${{ matrix.std }}_${{ matrix.build_type }}_preview=${{ matrix.preview }}
-    runs-on: [ '${{ matrix.os }}' ]
+    runs-on: ['${{ matrix.os }}']
     timeout-minutes: 20
     strategy:
       fail-fast: false
       matrix:
         include:
-          - os: ubuntu-18.04
+          - os: ubuntu-latest
             c_compiler: gcc
             cxx_compiler: g++
             std: 14
@@ -243,7 +295,7 @@ jobs:
             build_type: debug
             preview: 'ON'
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Run testing
         shell: bash
         run: |
@@ -256,20 +308,20 @@ jobs:
 
   macos-examples-testing:
     name: examples_${{ matrix.os }}_${{ matrix.cxx_compiler }}_cxx${{ matrix.std }}_${{ matrix.build_type }}_preview=${{ matrix.preview }}
-    runs-on: [ '${{ matrix.os }}' ]
+    runs-on: ['${{ matrix.os }}']
     timeout-minutes: 20
     strategy:
       fail-fast: false
       matrix:
         include:
-          - os: macos-10.15
+          - os: macos-15
             c_compiler: clang
             cxx_compiler: clang++
             std: 14
             build_type: relwithdebinfo
             preview: 'ON'
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Run testing
         shell: bash
         run: |
@@ -282,30 +334,30 @@ jobs:
 
   windows-examples-testing:
     name: ${{ matrix.job_name }}
-    runs-on: [ '${{ matrix.os }}' ]
+    runs-on: ['${{ matrix.os }}']
     timeout-minutes: 20
     strategy:
       fail-fast: false
       matrix:
         include:
-          - os: windows-2016
-            generator: Visual Studio 15 2017
+          - os: windows-2019
+            generator: Visual Studio 16 2019
             c_compiler: cl
             cxx_compiler: cl
             std: 14
             build_type: relwithdebinfo
             preview: 'ON'
-            job_name: examples_windows_cl2017_cxx14_relwithdebinfo_preview=ON
-          - os: windows-2019
-            generator: Visual Studio 16 2019
+            job_name: examples_windows_cl2019_cxx14_relwithdebinfo_preview=ON
+          - os: windows-2022
+            generator: Visual Studio 17 2022
             c_compiler: cl
             cxx_compiler: cl
             std: 17
             build_type: relwithdebinfo
             preview: 'OFF'
-            job_name: examples_windows_cl2019_cxx17_relwithdebinfo_preview=OFF
+            job_name: examples_windows_cl2022_cxx17_relwithdebinfo_preview=OFF
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Run testing
         run: |
           mkdir build
diff --git a/external/tbb/.github/workflows/codeql.yml b/external/tbb/.github/workflows/codeql.yml
new file mode 100644
index 00000000..7a9d2e33
--- /dev/null
+++ b/external/tbb/.github/workflows/codeql.yml
@@ -0,0 +1,86 @@
+# Copyright (c) 2024-2025 Intel Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+  schedule:
+    - cron: '0 0 * * 1'
+
+permissions:
+  contents: read
+  
+jobs:
+  analyze:
+    name: Analyze (${{ matrix.language }})
+    runs-on: ubuntu-latest
+    # timeout-minutes: 
+    permissions:
+      # required for all workflows
+      security-events: write
+      # required to fetch internal or private CodeQL packs
+      packages: read
+      # only required for workflows in private repositories
+      actions: read
+      contents: read
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: ["cpp", "python"]
+    
+    steps:
+      - name: Harden Runner
+        uses: step-security/harden-runner@v2.10.4
+        with:
+          egress-policy: audit
+          
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+    # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v3
+        with:
+          languages: ${{ matrix.language }}
+ 
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v3.24.10
+    
+    # If the analyze step fails for one of the languages you are analyzing with
+    # "We were unable to automatically build your code", modify the matrix above
+    # to set the build mode to "manual" for that language. Then modify this step
+    # to build your code.
+    # Command-line programs to run using the OS shell.
+    # See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+    #- if: matrix.build-mode == 'manual'
+    #  shell: bash
+    #  run: |
+    #    echo 'If you are using a "manual" build mode for one or more of the' \
+    #      'languages you are analyzing, replace this with the commands to build' \
+    #      'your code, for example:'
+    #    echo '  make bootstrap'
+    #    echo '  make release'
+    #    exit 1
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v3
+        with:
+          category: "/language:${{matrix.language}}"
diff --git a/external/tbb/.github/workflows/coverity.yml b/external/tbb/.github/workflows/coverity.yml
new file mode 100644
index 00000000..264a3044
--- /dev/null
+++ b/external/tbb/.github/workflows/coverity.yml
@@ -0,0 +1,62 @@
+# Copyright (c) 2024-2025 Intel Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name: Coverity Scan
+
+on:
+
+# Only run on push to master branch
+  push:
+    branches: [master]
+
+permissions: read-all
+
+env:
+  BUILD_CONCURRENCY: 4
+  COVERITY_PROJECT: oneapi-src%2FoneTBB
+
+jobs:
+  coverity_linux:
+    name: Coverity Linux
+    if: github.repository == 'uxlfoundation/oneTBB'
+    runs-on: [ubuntu-latest]
+    steps:
+      - uses: actions/checkout@v4
+      - name: Download Linux 64 Coverity Tool
+        run: |
+          curl https://scan.coverity.com/download/cxx/linux64 --output ${GITHUB_WORKSPACE}/cov-linux64-tool.tar.gz \
+            --data "token=${{secrets.COVERITY_TOKEN}}&project=${{env.COVERITY_PROJECT}}"
+          mkdir cov-linux64-tool
+          tar -xzf cov-linux64-tool.tar.gz --strip 1 -C cov-linux64-tool
+      - name: Build with cov-build
+        run: |
+          export PATH="${PWD}/cov-linux64-tool/bin:${PATH}"
+          mkdir build && cd build
+          cmake -DCMAKE_CXX_STANDARD=20 -DCMAKE_BUILD_TYPE=relwithdebinfo \
+            -DCMAKE_CXX_COMPILER=g++ -DCMAKE_C_COMPILER=gcc -DTBB_CPF=ON ..
+          cov-build --dir cov-int make VERBOSE=1 -j${{env.BUILD_CONCURRENCY}}
+      - name: Archive Coverity build results
+        run: |
+          cd build
+          tar -czvf cov-int.tgz cov-int
+      - name: Submit Coverity results for analysis
+        run: |
+          cd build
+          curl \
+            --form token="${{ secrets.COVERITY_TOKEN }}" \
+            --form email="${{ secrets.COVERITY_EMAIL }}" \
+            --form file=@cov-int.tgz \
+            --form version="${GITHUB_SHA}" \
+            --form description="" \
+              "https://scan.coverity.com/builds?project=${{env.COVERITY_PROJECT}}"
diff --git a/external/tbb/.github/workflows/issue_labeler.yml b/external/tbb/.github/workflows/issue_labeler.yml
new file mode 100644
index 00000000..1f8e9f78
--- /dev/null
+++ b/external/tbb/.github/workflows/issue_labeler.yml
@@ -0,0 +1,36 @@
+# Copyright (c) 2023-2024 Intel Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name: "Issue Labeler"
+on:
+  issues:
+    types: [opened, edited]
+  pull_request:
+    types: [opened, edited]
+
+permissions: read-all
+
+jobs:
+  triage:
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+      issues: write
+      contents: read
+    steps:
+    - uses: github/issue-labeler@v3.4 #May not be the latest version
+      with:
+        repo-token: "${{ secrets.GITHUB_TOKEN }}"
+        configuration-path: .github/issue_labeler.yml
+        enable-versioned-regex: 0
diff --git a/external/tbb/.github/workflows/labeler.yml b/external/tbb/.github/workflows/labeler.yml
new file mode 100644
index 00000000..770c2117
--- /dev/null
+++ b/external/tbb/.github/workflows/labeler.yml
@@ -0,0 +1,30 @@
+# Copyright (c) 2023-2024 Intel Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+name: "Pull Request Labeler"
+on:
+  - pull_request_target
+
+permissions: read-all
+
+jobs:
+  triage:
+    permissions:
+      contents: read
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/labeler@v5
+      with:
+        configuration-path: .github/labeler.yml
diff --git a/external/tbb/.github/workflows/ossf-scorecard.yml b/external/tbb/.github/workflows/ossf-scorecard.yml
new file mode 100644
index 00000000..e03dbb75
--- /dev/null
+++ b/external/tbb/.github/workflows/ossf-scorecard.yml
@@ -0,0 +1,83 @@
+# Copyright (c) 2024 Intel Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name: OSSF Scorecard
+on:
+  # For Branch-Protection check. Only the default branch is supported. See
+  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#branch-protection
+  branch_protection_rule:
+  # To guarantee Maintained check is occasionally updated. See
+  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#maintained
+  schedule:
+    - cron: '00 02 * * *'
+  push:
+    branches: [ "master" ]
+
+# Declare default permissions as read only.
+permissions: read-all
+
+jobs:
+  analysis:
+    name: Scorecard analysis
+    runs-on: ubuntu-latest
+    permissions:
+      # Needed to upload the results to code-scanning dashboard.
+      security-events: write
+      # Needed to publish results and get a badge (see publish_results below).
+      id-token: write
+      # Uncomment the permissions below if installing in a private repository.
+      # contents: read
+      # actions: read
+
+    steps:
+      - name: "Checkout code"
+        uses: actions/checkout@v4.1.1
+        with:
+          persist-credentials: false
+
+      - name: "Run analysis"
+        uses: ossf/scorecard-action@v2.4.0
+        with:
+          results_file: results.sarif
+          results_format: sarif
+          # (Optional) "write" PAT token. Uncomment the `repo_token` line below if:
+          # - you want to enable the Branch-Protection check on a *public* repository, or
+          # - you are installing Scorecard on a *private* repository
+          # To create the PAT, follow the steps in https://github.com/ossf/scorecard-action?tab=readme-ov-file#authentication-with-fine-grained-pat-optional.
+          # repo_token: ${{ secrets.SCORECARD_TOKEN }}
+
+          # Public repositories:
+          #   - Publish results to OpenSSF REST API for easy access by consumers
+          #   - Allows the repository to include the Scorecard badge.
+          #   - See https://github.com/ossf/scorecard-action#publishing-results.
+          # For private repositories:
+          #   - `publish_results` will always be set to `false`, regardless
+          #     of the value entered here.
+          publish_results: true
+
+      # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
+      # format to the repository Actions tab.
+      #- name: "Upload artifact"
+      #  uses: actions/upload-artifact@97a0fba1372883ab732affbe8f94b823f91727db # v3.pre.node20
+      #  with:
+      #    name: SARIF file
+      #    path: results.sarif
+      #    retention-days: 5
+
+      # Upload the results to GitHub's code scanning dashboard (optional).
+      # Commenting out will disable upload of results to your repo's Code Scanning dashboard
+      #- name: "Upload to code-scanning"
+      #  uses: github/codeql-action/upload-sarif@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
+      #  with:
+      #    sarif_file: results.sarif
diff --git a/external/tbb/BUILD.bazel b/external/tbb/BUILD.bazel
index 67366a65..7c479ca3 100644
--- a/external/tbb/BUILD.bazel
+++ b/external/tbb/BUILD.bazel
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Intel Corporation
+# Copyright (c) 2021-2024 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -35,27 +35,34 @@ cc_library(
         "include/oneapi/tbb/*.h",
         "include/oneapi/tbb/detail/*.h",
     ]),
-    copts = [
-        "-w",
-    ],
+    copts = ["-w"] + select({
+        "@platforms//os:windows": [""],
+        "@platforms//cpu:arm64": [""],
+        "//conditions:default": ["-mwaitpkg"],
+    }),
     defines =
         select({
             "@platforms//cpu:x86_64": ["__TBB_NO_IMPLICIT_LINKAGE"],
             "//conditions:default": [
                 "USE_PTHREAD",
             ],
+        }) +
+        select({
+            "@platforms//os:osx": ["_XOPEN_SOURCE"],
+            "//conditions:default": [],
         }),
     includes = [
         "include",
     ],
     linkopts =
         select({
-            "@bazel_tools//platforms:windows": [],
-            "//conditions:default": [
+            "@platforms//os:windows": [],
+            "@platforms//os:linux": [
                 "-ldl",
                 "-pthread",
                 "-lrt",
             ],
+            "//conditions:default": ["-pthread"],
         }),
     local_defines = select({
         "@platforms//cpu:x86_64": [
@@ -110,3 +117,57 @@ cc_library(
         ":tbbmalloc",
     ],
 )
+
+cc_test(
+    name = "test_mutex",
+    srcs = [
+        "test/tbb/test_mutex.cpp",
+        "test/tbb/test_mutex.h"
+    ] + glob([
+        "test/common/*.h",
+    ]),
+    includes = ["test"],
+    deps = [
+        ":tbb",
+    ],
+)
+
+cc_test(
+    name = "test_parallel_for",
+    srcs = [
+        "test/tbb/test_parallel_for.cpp",
+        "test/tbb/test_partitioner.h"
+    ] + glob([
+        "test/common/*.h",
+    ]),
+    includes = ["test"],
+    deps = [
+        ":tbb",
+    ],
+)
+
+cc_test(
+    name = "test_parallel_reduce",
+    srcs = [
+        "test/tbb/test_parallel_reduce.cpp",
+    ] + glob([
+        "test/common/*.h",
+    ]),
+    includes = ["test"],
+    deps = [
+        ":tbb",
+    ],
+)
+
+cc_test(
+    name = "test_task",
+    srcs = [
+        "test/tbb/test_task.cpp",
+    ] + glob([
+        "test/common/*.h",
+    ]),
+    includes = ["test"],
+    deps = [
+        ":tbb",
+    ],
+)
diff --git a/external/tbb/Bazel.md b/external/tbb/Bazel.md
index 638c20e1..13b112ee 100644
--- a/external/tbb/Bazel.md
+++ b/external/tbb/Bazel.md
@@ -1,35 +1,54 @@
-# Bazel build support
+# Bazel* build support
 
-The main build system of oneTBB is CMake.
-Bazel support is community-based.
-The maintainers do not use Bazel internally.
-The Bazel configuration may not include recommended compiler and linker flags used in official CMake configuration.
+The main build system of oneTBB is CMake*.
+[Bazel*](https://bazel.build/) support is community-based.
+The Bazel configuration may not include recommended compiler and/or linker flags used in the official CMake configuration.
 
-The Bazel build of oneTBB currently only aims for a subset of oneTBB that suffices restricted use cases of the usage of oneTBB.
-Pull requests to improve the Bazel build experience are welcomed.
+---
+**NOTE**
 
-The standard approach of how Bazel handles third-party libraries is static linking. 
-Even this is not recommended by the oneTBB maintainers this is chosen since this is considered as the best practice in the Bazel ecosystem.
+Bazel is not recommended for use by oneTBB maintainers. Thus, it is not used internally. 
 
-## Example usage
+---
 
-1. [Install Bazel](https://docs.bazel.build/versions/main/install.html).
 
-2. Create the following files in one folder (this folder will be considered as the workspace folder):
+The Bazel oneTBB build is currently only intended for a subset of oneTBB that suffices restricted use cases.
+Pull requests to improve the Bazel build experience are welcome.
 
-_WORKSPACE.bazel_:
+The standard Bazel approach to handling third-party libraries is static linking. It is the best practice within the Bazel ecosystem.
+
+## Using oneTBB as a dependency
+
+### Traditional WORKSPACE approach
+
+This example demonstrates how to use oneTBB as a dependency within a Bazel project.
+
+The following file structure is assumed:
+
+```
+example
+├── .bazelrc
+├── BUILD.bazel
+├── main.cpp
+└── WORKSPACE.bazel
 ```
-load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
+
+_WORKSPACE.bazel_:
+```python
+load("@platforms//tools/build_defs/repo:git.bzl", "git_repository")
 
 git_repository(
     name = "oneTBB",
     branch = "master",
-    remote = "https://github.com/oneapi-src/oneTBB/",
+    remote = "https://github.com/uxlfoundation/oneTBB/",
 )
 ```
 
-_BUILD_:
-```
+In the *WORKSPACE* file, the oneTBB GitHub* repository is fetched. 
+
+_BUILD.bazel_:
+
+```python
 cc_binary(
     name = "Demo",
     srcs = ["main.cpp"],
@@ -37,8 +56,11 @@ cc_binary(
 )
 ```
 
+The *BUILD* file defines a binary named `Demo` that has a dependency to oneTBB.
+
 _main.cpp_:
-```
+
+```c++
 #include "oneapi/tbb/version.h"
 
 #include <iostream>
@@ -54,7 +76,33 @@ int main() {
 }
 ```
 
-3. Switch to the folder where you create the files.
+The expected output of this program is the current version of oneTBB.
+
+Switch to the folder with the files created earlier and run the binary with `bazel run //:Demo`.
+
+### Bzlmod
+
+If you use Bzlmod, you can fetch oneTBB with the [Bazel Central Registry](https://registry.bazel.build/).
+
+Add the following line to your `MODULE.bazel` file:
+
+```bazel
+bazel_dep(name = "onetbb", version = "2021.13.0")
+```
+
+## Build oneTBB using Bazel
+
+Run ```bazel build //...``` in the oneTBB root directory.
+
+## Compiler support
+
+The Bazel build uses the compiler flag `-mwaitpkg` in non-Windows* builds.
+This flag is supported by the GNU* Compiler Collection (GCC) version 9.3, Clang* 12, and newer versions of those tools.
+
+
+---
+**NOTE**
+
+To use the Bazel build with earlier versions of GCC, remove `-mwaitpkg` flag as it leads to errors during compilation.
 
-4. Execute the command `bazel run //:Demo`.
-As an expected output, you should see the oneTBB version.
+---
diff --git a/external/tbb/CMakeLists.txt b/external/tbb/CMakeLists.txt
index 348e7356..12273b3e 100644
--- a/external/tbb/CMakeLists.txt
+++ b/external/tbb/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Intel Corporation
+# Copyright (c) 2020-2025 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,10 +12,23 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-cmake_minimum_required(VERSION 3.1...3.28)
+# If the running version of CMake is older than 3.12, the extra ... dots will be seen as version component separators,
+# resulting in the ...<max> part being ignored and preserving the pre-3.12 behavior of basing policies on <min>.
+cmake_minimum_required(VERSION 3.5.0...3.31.3)
 
 # Enable CMake policies
 
+if (POLICY CMP0063)
+    # The NEW behavior for this policy is to honor the visibility properties for all target types.
+    cmake_policy(SET CMP0063 NEW)
+    set(CMAKE_POLICY_DEFAULT_CMP0063 NEW)
+endif()
+
+if (POLICY CMP0068)
+    # RPATH settings do not affect install_name on macOS since CMake 3.9
+    cmake_policy(SET CMP0068 NEW)
+endif()
+
 if (POLICY CMP0091)
     # The NEW behavior for this policy is to not place MSVC runtime library flags in the default
     # CMAKE_<LANG>_FLAGS_<CONFIG> cache entries and use CMAKE_MSVC_RUNTIME_LIBRARY abstraction instead.
@@ -24,6 +37,11 @@ elseif (DEFINED CMAKE_MSVC_RUNTIME_LIBRARY)
     message(FATAL_ERROR "CMAKE_MSVC_RUNTIME_LIBRARY was defined while policy CMP0091 is not available. Use CMake 3.15 or newer.")
 endif()
 
+if (POLICY CMP0148)
+    # CMake 3.27: The FindPythonInterp and FindPythonLibs modules are removed
+    cmake_policy(SET CMP0148 OLD)
+endif()
+
 if (TBB_WINDOWS_DRIVER AND (NOT ("${CMAKE_MSVC_RUNTIME_LIBRARY}" STREQUAL MultiThreaded OR "${CMAKE_MSVC_RUNTIME_LIBRARY}" STREQUAL MultiThreadedDebug)))
     message(FATAL_ERROR "Enabled TBB_WINDOWS_DRIVER requires CMAKE_MSVC_RUNTIME_LIBRARY to be set to MultiThreaded or MultiThreadedDebug.")
 endif()
@@ -37,16 +55,6 @@ if (APPLE)
         set(CMAKE_C_OSX_DEPLOYMENT_TARGET_FLAG "-mmacosx-version-min=" CACHE STRING "Minimum macOS version flag")
     endif()
 endif()
-# temporary fix for macOS 14 & CLT 15
-if (CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin"
-        AND CMAKE_HOST_SYSTEM_VERSION VERSION_GREATER_EQUAL 23)
-    add_link_options(-Wl,-ld_classic)
-endif ()
-# Until CMake 3.4.0 FindThreads.cmake requires C language enabled.
-# Enable C language before CXX to avoid possible override of CMAKE_SIZEOF_VOID_P.
-if (CMAKE_VERSION VERSION_LESS 3.4)
-    enable_language(C)
-endif()
 
 file(READ include/oneapi/tbb/version.h _tbb_version_info)
 string(REGEX REPLACE ".*#define TBB_VERSION_MAJOR ([0-9]+).*" "\\1" _tbb_ver_major "${_tbb_version_info}")
@@ -54,7 +62,7 @@ string(REGEX REPLACE ".*#define TBB_VERSION_MINOR ([0-9]+).*" "\\1" _tbb_ver_min
 string(REGEX REPLACE ".*#define TBB_VERSION_PATCH ([0-9]+).*" "\\1" _tbb_ver_patch "${_tbb_version_info}")
 string(REGEX REPLACE ".*#define TBB_INTERFACE_VERSION ([0-9]+).*" "\\1" TBB_INTERFACE_VERSION "${_tbb_version_info}")
 string(REGEX REPLACE ".*#define __TBB_BINARY_VERSION ([0-9]+).*" "\\1" TBB_BINARY_VERSION "${_tbb_version_info}")
-set(TBB_BINARY_MINOR_VERSION ${_tbb_ver_minor})
+string(REGEX REPLACE "..(..)." "\\1" TBB_BINARY_MINOR_VERSION "${TBB_INTERFACE_VERSION}")
 set(TBBMALLOC_BINARY_VERSION 2)
 set(TBBBIND_BINARY_VERSION 3)
 
@@ -64,6 +72,7 @@ unset(_tbb_ver_minor)
 
 include(CheckCXXCompilerFlag)
 include(GNUInstallDirs)
+include(CMakeDependentOption)
 
 # ---------------------------------------------------------------------------------------------------------
 # Handle C++ standard version.
@@ -88,6 +97,11 @@ endif()
 
 set(CMAKE_CXX_EXTENSIONS OFF) # use -std=c++... instead of -std=gnu++...
 # ---------------------------------------------------------------------------------------------------------
+# Setup symbol visibility properties.
+
+set(CMAKE_VISIBILITY_INLINES_HIDDEN TRUE)
+set(CMAKE_CXX_VISIBILITY_PRESET "hidden")
+# ---------------------------------------------------------------------------------------------------------
 
 # Detect architecture (bitness).
 if (CMAKE_SIZEOF_VOID_P EQUAL 4)
@@ -104,16 +118,30 @@ option(TBB_NO_APPCONTAINER "Apply /APPCONTAINER:NO (for testing binaries for Win
 option(TBB4PY_BUILD "Enable tbb4py build" OFF)
 option(TBB_BUILD "Enable tbb build" ON)
 option(TBBMALLOC_BUILD "Enable tbbmalloc build" ON)
+cmake_dependent_option(TBBMALLOC_PROXY_BUILD "Enable tbbmalloc_proxy build" ON "TBBMALLOC_BUILD" OFF)
 option(TBB_CPF "Enable preview features of the library" OFF)
 option(TBB_FIND_PACKAGE "Enable search for external oneTBB using find_package instead of build from sources" OFF)
-option(TBB_DISABLE_HWLOC_AUTOMATIC_SEARCH "Disable HWLOC automatic search by pkg-config tool" OFF)
+option(TBB_DISABLE_HWLOC_AUTOMATIC_SEARCH "Disable HWLOC automatic search by pkg-config tool" ${CMAKE_CROSSCOMPILING})
+option(TBB_ENABLE_IPO "Enable Interprocedural Optimization (IPO) during the compilation" ON)
+option(TBB_CONTROL_FLOW_GUARD "Enable Control Flow Guard (CFG) during the compilation" OFF)
+option(TBB_FUZZ_TESTING "Enable fuzz testing" OFF)
+option(TBB_INSTALL "Enable installation" ON)
+option(TBB_FILE_TRIM "Enable __FILE__ trim" ON)
+if(LINUX)
+option(TBB_LINUX_SEPARATE_DBG "Enable separation of the debug symbols during the build" OFF)
+endif()
+if(APPLE)
+option(TBB_BUILD_APPLE_FRAMEWORKS "Build as Apple Frameworks" OFF)
+endif()
 
 if (NOT DEFINED BUILD_SHARED_LIBS)
     set(BUILD_SHARED_LIBS ON)
 endif()
 
 if (NOT BUILD_SHARED_LIBS)
-    set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+    if(NOT DEFINED CMAKE_POSITION_INDEPENDENT_CODE)
+        set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+    endif()
     message(WARNING "You are building oneTBB as a static library. This is highly discouraged and such configuration is not supported. Consider building a dynamic library to avoid unforeseen issues.")
 endif()
 
@@ -124,6 +152,14 @@ if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
     set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
 endif()
 
+if (CMAKE_BUILD_TYPE)
+    string(TOLOWER ${CMAKE_BUILD_TYPE} _tbb_build_type)
+    if (_tbb_build_type STREQUAL "debug")
+        set(TBB_ENABLE_IPO OFF)
+    endif()
+    unset(_tbb_build_type)
+endif()
+
 # -------------------------------------------------------------------
 # Files and folders naming
 set(CMAKE_DEBUG_POSTFIX _debug)
@@ -172,10 +208,22 @@ foreach(output_type LIBRARY ARCHIVE PDB RUNTIME)
     endif()
 endforeach()
 
+if (CMAKE_CONFIGURATION_TYPES)
+    # We can't use generator expressions in a cmake variable name.
+    set(TBB_TEST_WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/${TBB_OUTPUT_DIR_BASE}_$<LOWER_CASE:$<CONFIG>>)
+else()
+    set(TBB_TEST_WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+endif()
+
 # -------------------------------------------------------------------
 
 # -------------------------------------------------------------------
 # Common dependencies
+#force -pthread during compilation for Emscripten
+if (EMSCRIPTEN AND NOT EMSCRIPTEN_WITHOUT_PTHREAD)
+   set(THREADS_HAVE_PTHREAD_ARG TRUE)
+endif()
+
 set(THREADS_PREFER_PTHREAD_FLAG TRUE)
 find_package(Threads REQUIRED)
 # -------------------------------------------------------------------
@@ -185,6 +233,32 @@ foreach(FILE_WITH_EXTRA_TARGETS ${FILES_WITH_EXTRA_TARGETS})
     include(${FILE_WITH_EXTRA_TARGETS})
 endforeach()
 
+# - Enabling LTO on Android causes the NDK bug.
+#   NDK throws the warning: "argument unused during compilation: '-Wa,--noexecstack'"
+# - For some reason GCC does not instrument code with Thread Sanitizer when lto is enabled and C linker is used.
+if (TBB_ENABLE_IPO AND BUILD_SHARED_LIBS AND NOT ANDROID_PLATFORM AND NOT TBB_SANITIZE MATCHES "thread")
+    if (NOT CMAKE_VERSION VERSION_LESS 3.9)
+        cmake_policy(SET CMP0069 NEW)
+        include(CheckIPOSupported)
+        check_ipo_supported(RESULT TBB_IPO_PROPERTY)
+    else()
+        set(TBB_IPO_FLAGS TRUE)
+    endif()
+    if (TBB_IPO_PROPERTY OR TBB_IPO_FLAGS)
+        message(STATUS "IPO enabled")
+    endif()
+endif()
+
+if (TBB_FILE_TRIM)
+    file(RELATIVE_PATH TBB_RELATIVE_BIN_PATH ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR})
+    file(TO_NATIVE_PATH ${CMAKE_SOURCE_DIR} NATIVE_TBB_PROJECT_ROOT_DIR)
+    file(TO_NATIVE_PATH ${TBB_RELATIVE_BIN_PATH} NATIVE_TBB_RELATIVE_BIN_PATH)
+endif ()
+
+if (TBB_CONTROL_FLOW_GUARD)
+    message(STATUS "Control Flow Guard (CFG) enabled")
+endif()
+
 set(TBB_COMPILER_SETTINGS_FILE ${CMAKE_CURRENT_SOURCE_DIR}/cmake/compilers/${CMAKE_CXX_COMPILER_ID}.cmake)
 if (EXISTS ${TBB_COMPILER_SETTINGS_FILE})
     include(${TBB_COMPILER_SETTINGS_FILE})
@@ -192,7 +266,7 @@ else()
     message(WARNING "TBB compiler settings not found ${TBB_COMPILER_SETTINGS_FILE}")
 endif()
 
-if (TBB_FIND_PACKAGE OR TBB_DIR)
+if (TBB_FIND_PACKAGE AND TBB_DIR)
     # Allow specifying external TBB to test with.
     # Do not add main targets and installation instructions in that case.
     message(STATUS "Using external TBB for testing")
@@ -201,45 +275,50 @@ else()
     if (TBB_BUILD)
         add_subdirectory(src/tbb)
     endif()
-    if (NOT "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "mips")
-        if (TBBMALLOC_BUILD)
-            add_subdirectory(src/tbbmalloc)
+    if (TBBMALLOC_BUILD)
+        add_subdirectory(src/tbbmalloc)
+        if(TBBMALLOC_PROXY_BUILD AND NOT "${MSVC_CXX_ARCHITECTURE_ID}" MATCHES "ARM64")
             add_subdirectory(src/tbbmalloc_proxy)
         endif()
-        if (APPLE)
-            message(STATUS "TBBBind build targets are disabled due to unsupported environment")
-        else()
-            add_subdirectory(src/tbbbind)
-        endif()
     endif()
+    if (NOT BUILD_SHARED_LIBS)
+        message(STATUS "TBBBind build targets are disabled due to unsupported environment")
+    else()
+        add_subdirectory(src/tbbbind)
+    endif()
+    if (TBB_INSTALL)
+        # -------------------------------------------------------------------
+        # Installation instructions
+        include(CMakePackageConfigHelpers)
+
+        install(DIRECTORY include/
+                DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+                COMPONENT devel)
+
+        install(EXPORT ${PROJECT_NAME}Targets
+                NAMESPACE TBB::
+                DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
+                COMPONENT devel)
+        file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
+                   "include(\${CMAKE_CURRENT_LIST_DIR}/${PROJECT_NAME}Targets.cmake)\n")
+        if (NOT BUILD_SHARED_LIBS)
+            file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
+                       "include(CMakeFindDependencyMacro)\nfind_dependency(Threads)\n")
+        endif()
+
+        write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
+                                         COMPATIBILITY AnyNewerVersion)
+
+        install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
+                      "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
+                DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
+                COMPONENT devel)
 
-    # -------------------------------------------------------------------
-    # Installation instructions
-    include(CMakePackageConfigHelpers)
-
-    install(DIRECTORY include/
-            DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-            COMPONENT devel)
-
-    install(EXPORT ${PROJECT_NAME}Targets
-            NAMESPACE TBB::
-            DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
-            COMPONENT devel)
-    file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
-               "include(\${CMAKE_CURRENT_LIST_DIR}/${PROJECT_NAME}Targets.cmake)\n")
-
-    write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
-                                     COMPATIBILITY AnyNewerVersion)
-
-    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
-                  "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
-            DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
-            COMPONENT devel)
-
-    install(FILES "README.md"
-            DESTINATION ${CMAKE_INSTALL_DOCDIR}
-            COMPONENT devel)
-    # -------------------------------------------------------------------
+        install(FILES "README.md"
+                DESTINATION ${CMAKE_INSTALL_DOCDIR}
+                COMPONENT devel)
+        # -------------------------------------------------------------------
+    endif()
 endif()
 
 if (TBB_TEST)
@@ -261,11 +340,28 @@ if (TBB_BENCH)
 endif()
 
 if (ANDROID_PLATFORM)
-    if (${ANDROID_STL} STREQUAL "c++_shared")
-        configure_file(
-        "${ANDROID_NDK}/sources/cxx-stl/llvm-libc++/libs/${ANDROID_ABI}/libc++_shared.so"
-        "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libc++_shared.so"
-        COPYONLY)
+    if ("${ANDROID_STL}" STREQUAL "c++_shared")
+        if (${ANDROID_NDK_MAJOR} GREATER_EQUAL "25")
+            if(ANDROID_ABI STREQUAL "arm64-v8a")
+                set(ANDROID_TOOLCHAIN_NAME "aarch64-linux-android")
+            elseif(ANDROID_ABI STREQUAL "x86_64")
+                set(ANDROID_TOOLCHAIN_NAME "x86_64-linux-android")
+            elseif(ANDROID_ABI STREQUAL "armeabi-v7a")
+                set(ANDROID_TOOLCHAIN_NAME "arm-linux-androideabi")
+            elseif(ANDROID_ABI STREQUAL "x86")
+                set(ANDROID_TOOLCHAIN_NAME "i686-linux-android")
+            endif()
+
+            configure_file(
+            "${ANDROID_TOOLCHAIN_ROOT}/sysroot/usr/lib/${ANDROID_TOOLCHAIN_NAME}/libc++_shared.so"
+            "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libc++_shared.so"
+            COPYONLY)
+        else()
+            configure_file(
+                "${ANDROID_NDK}/sources/cxx-stl/llvm-libc++/libs/${ANDROID_ABI}/libc++_shared.so"
+                "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libc++_shared.so"
+                COPYONLY)
+        endif()
     endif()
     # This custom target may be implemented without separate CMake script, but it requires
     # ADB(Android Debug Bridge) executable file availability, so to incapsulate this requirement
diff --git a/external/tbb/CODEOWNERS b/external/tbb/CODEOWNERS
new file mode 100644
index 00000000..27e301dc
--- /dev/null
+++ b/external/tbb/CODEOWNERS
@@ -0,0 +1,26 @@
+# Where component owners are known, add them here.
+
+/oneTBB/src/tbb/ @pavelkumbrasev
+/oneTBB/src/tbb/ @dnmokhov
+/oneTBB/src/tbb/ @sarathnandu
+/oneTBB/include/oneapi/tbb/parallel_* @pavelkumbrasev
+/oneTBB/include/oneapi/tbb/concurrent_* @kboyarinov
+/oneTBB/include/oneapi/tbb/flow_graph* @kboyarinov
+/oneTBB/include/oneapi/tbb/flow_graph* @aleksei-fedotov
+/oneTBB/include/oneapi/tbb/detail/_flow_graph* @kboyarinov
+/oneTBB/include/oneapi/tbb/detail/_flow_graph* @aleksei-fedotov
+/oneTBB/include/oneapi/tbb/detail/_concurrent* @kboyarinov
+/oneTBB/src/doc @aepanchi
+/oneTBB/src/tbbbind/ @isaevil
+/oneTBB/src/tbbmalloc/ @lplewa
+/oneTBB/src/tbbmalloc_proxy/ @lplewa
+/oneTBB/cmake/ @isaevil
+/oneTBB/*CMakeLists.txt @isaevil
+/oneTBB/python/ @sarathnandu
+/oneTBB/python/ @isaevil
+
+# Bazel build related files.
+/oneTBB/.bazelversion @Vertexwahn
+/oneTBB/Bazel.md @Vertexwahn
+/oneTBB/BUILD.bazel @Vertexwahn
+/oneTBB/MODULE.bazel @Vertexwahn
diff --git a/external/tbb/CODE_OF_CONDUCT.md b/external/tbb/CODE_OF_CONDUCT.md
new file mode 100644
index 00000000..c1697073
--- /dev/null
+++ b/external/tbb/CODE_OF_CONDUCT.md
@@ -0,0 +1,134 @@
+
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, caste, color, religion, or sexual
+identity and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the overall
+  community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or advances of
+  any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email address,
+  without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official email address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+oneTBBCodeOfConduct At intel DOT com.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series of
+actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or permanent
+ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior, harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within the
+community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.1, available at
+[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
+
+Community Impact Guidelines were inspired by
+[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
+
+For answers to common questions about this code of conduct, see the FAQ at
+[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
+[https://www.contributor-covenant.org/translations][translations].
+
+[homepage]: https://www.contributor-covenant.org
+[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
+[Mozilla CoC]: https://github.com/mozilla/diversity
+[FAQ]: https://www.contributor-covenant.org/faq
+[translations]: https://www.contributor-covenant.org/translations
+
diff --git a/external/tbb/CONTRIBUTING.md b/external/tbb/CONTRIBUTING.md
index 74063b7b..3414b9ea 100644
--- a/external/tbb/CONTRIBUTING.md
+++ b/external/tbb/CONTRIBUTING.md
@@ -19,37 +19,27 @@ As an open source project, we welcome community contributions to oneAPI Threadin
 
 ## Licensing 
 
-Licensing is very important to open source projects. It helps ensure the software continues to be available under the terms that the author desired. The oneTBB project uses the [Apache 2.0 License](https://github.com/oneapi-src/oneTBB/blob/master/LICENSE.txt), a permissive open source license that allows you to freely use, modify, and distribute your own products that include Apache 2.0 licensed software. By contributing to the oneTBB project, you agree to the license and copyright terms therein and release your own contributions under these terms. 
+Licensing is very important to open source projects. It helps ensure the software continues to be available under the terms that the author desired. The oneTBB project uses the [Apache 2.0 License](https://github.com/uxlfoundation/oneTBB/blob/master/LICENSE.txt), a permissive open source license that allows you to freely use, modify, and distribute your own products that include Apache 2.0 licensed software. By contributing to the oneTBB project, you agree to the license and copyright terms therein and release your own contributions under these terms. 
 
-Some imported or reused components within oneTBB use other licenses, as described in [third-party-programs.txt](https://github.com/oneapi-src/oneTBB/blob/master/third-party-programs.txt). By carefully reviewing potential contributions and enforcing a [Developer Certification of Origin (DCO)](https://developercertificate.org/) for contributed code, we can ensure that the community can develop products with oneTBB without concerns over patent or copyright issues. 
-
-The DCO is an attestation attached to every contribution made by every developer. In the commit message of the contribution, (described later), the developer simply adds a Signed-off-by statement and thereby agrees to the DCO. 
+Some imported or reused components within oneTBB use other licenses, as described in [third-party-programs.txt](https://github.com/uxlfoundation/oneTBB/blob/master/third-party-programs.txt). By carefully reviewing potential contributions, we can ensure that the community can develop products with oneTBB without concerns over patent or copyright issues. 
 
 ## Prerequisites 
 
-As a contributor, you’ll want to be familiar with the oneTBB project and the repository layout. You should also know how to use it as explained in the [oneTBB documentation](https://oneapi-src.github.io/oneTBB/) and how to set up your build development environment to configure, build, and test oneTBB as explained in the [oneTBB Build System Description](cmake/README.md). 
-
-## Issues 
-If you face a problem, first check out open [oneTBB GitHub issues](https://github.com/oneapi-src/oneTBB/issues) to see if the issue you’d like to address is already reported. You may find users that have encountered the bug you’re finding or have similar ideas for changes or additions.
-
-You can use issues to report a problem, make a feature request, or add comments on an existing issue. 
+As a contributor, you'll want to be familiar with the oneTBB project and the repository layout. You should also know how to use it as explained in the [oneTBB documentation](https://uxlfoundation.github.io/oneTBB/) and how to set up your build development environment to configure, build, and test oneTBB as explained in the [oneTBB Build System Description](cmake/README.md). 
 
 ## Pull Requests 
 
-You can find all [open oneTBB pull requests](https://github.com/oneapi-src/oneTBB/pulls) on GitHub. 
-
-No anonymous contributions are accepted. The name in the commit message Signed-of-by line and your email must match the change authorship information.  Make sure your .gitconfig is set up correctly so you can use `git commit -s` for signing your patches: 
-
-`git config --global user.name "Taylor Developer"`
-
-`git config --global user.email taylor.developer@company.com`
+You can find all [open oneTBB pull requests](https://github.com/uxlfoundation/oneTBB/pulls) on GitHub. 
  
-
-Before contributing changes directly to the oneTBB repository: 
+### Before contributing changes directly to the oneTBB repository
 
 * Make sure you can build the product and run all the tests with your patch. 
 * For a larger feature, provide a relevant test. 
 * Document your code. The oneTBB project uses reStructuredText for documentation.  
+* Update the copyright year in the first line of the changing file(s). 
+  For example, if you commit your changes in 2022:
+  * the copyright year should be `2005-2022` for existing files
+  * the copyright year should be `2022` for new files
 * Submit a pull request into the master branch. You can submit changes with a pull request (preferred) or by sending an email patch.  
 
 Continuous Integration (CI) testing is enabled for the repository. Your pull request must pass all checks before it can be merged. We will review your contribution and may provide feedback to guide you if any additional fixes or modifications are necessary. When reviewed and accepted, your pull request will be merged into our GitHub repository. 
diff --git a/external/tbb/INSTALL.md b/external/tbb/INSTALL.md
new file mode 100644
index 00000000..c33a2c72
--- /dev/null
+++ b/external/tbb/INSTALL.md
@@ -0,0 +1,135 @@
+# Installation from Sources
+
+
+## Prerequisites 
+   
+   - Make sure you have installed CMake version 3.1 (or newer) on your system. oneTBB uses CMake build configuration.
+   - Configure and build oneTBB. To work with build configurations, see [Build System Description](cmake/README.md). 
+
+
+## Configure oneTBB
+
+At the command prompt, type:
+```
+cmake <options> <repo_root>
+```
+
+You may want to use some additional options for configuration:
+
+| Option                    | Purpose                   | Description                                                                        |
+| ------                    |------                     | ------                                                                             |
+| `-G <generator>`          | Specify project generator | For more information, run cmake `–help`.                                           |
+|`-DCMAKE_BUILD_TYPE=Debug` | Specify for Debug build   | Not applicable for multi-configuration generators such as Visual Studio generator. |
+
+
+## Build oneTBB
+ 
+To build the system, run:
+```
+cmake --build . <options>
+```
+
+Some useful build options:
+- `--target <target>` - specific target, "all" is default.
+-	`--config <Release|Debug>` - build configuration, applicable only for multi-config generators such as Visual Studio generator.
+
+
+## Install and Pack oneTBB
+
+---
+**NOTE**
+
+Be careful about installing prefix. It defaults to `/usr/local` on UNIX* and `c:/Program Files/${PROJECT_NAME}` on Windows* OS.
+You can define custom `CMAKE_INSTALL_PREFIX` during configuration:
+
+```
+cmake -DCMAKE_INSTALL_PREFIX=/my/install/prefix ..
+```
+
+---
+
+Installation can also be done using:
+
+```
+cmake --install <project-binary-dir>
+```
+
+Special ``--install`` target can alternatively be used for installation, e.g. ``make install``.
+
+You can use the ``install`` components for partial installation.
+
+The following install components are supported:
+- `runtime` - oneTBB runtime package (core shared libraries and `.dll` files on Windows* OS).
+- `devel` - oneTBB development package (header files, CMake integration files, library symbolic links, and `.lib` files on Windows* OS).
+- `tbb4py` - [oneTBB Module for Python](https://github.com/uxlfoundation/oneTBB/blob/master/python/README.md).
+
+If you want to install specific components after configuration and build, run:
+
+```bash
+cmake -DCOMPONENT=<component> [-DBUILD_TYPE=<build-type>] -P cmake_install.cmake
+```
+
+Simple packaging using CPack is supported.
+The following commands allow you to create a simple portable package that includes header files, libraries, and integration files for CMake:
+
+```bash
+cmake <options> ..
+cpack
+```
+
+## Installation from vcpkg
+
+You can download and install oneTBB using the [vcpkg](https://github.com/Microsoft/vcpkg) dependency manager:
+```sh
+  git clone https://github.com/Microsoft/vcpkg.git
+  cd vcpkg
+  ./bootstrap-vcpkg.sh #.\bootstrap-vcpkg.bat(for Windows)
+  ./vcpkg integrate install
+  ./vcpkg install tbb
+```
+
+The oneTBB port in vcpkg is kept up to date by Microsoft* team members and community contributors. If the version is out of date, create an issue or pull request on the [vcpkg repository](https://github.com/Microsoft/vcpkg).
+
+## Example of Installation
+
+### Single-configuration generators
+
+The following example demonstrates how to install oneTBB for single-configuration generators (e.g. GNU Make, Ninja, etc.).
+```bash
+# Do our experiments in /tmp
+cd /tmp
+# Clone oneTBB repository
+git clone https://github.com/uxlfoundation/oneTBB.git
+cd oneTBB
+# Create binary directory for out-of-source build
+mkdir build && cd build
+# Configure: customize CMAKE_INSTALL_PREFIX and disable TBB_TEST to avoid tests build
+cmake -DCMAKE_INSTALL_PREFIX=/tmp/my_installed_onetbb -DTBB_TEST=OFF ..
+# Build
+cmake --build .
+# Install
+cmake --install .
+# Well done! Your installed oneTBB is in /tmp/my_installed_onetbb
+```
+
+### Multi-configuration generators
+
+The following example demonstrates how to install oneTBB for multi-configuration generators such as Visual Studio*. 
+
+Choose the configuration during the build and install steps:
+```batch
+REM Do our experiments in %TMP%
+cd %TMP%
+REM Clone oneTBB repository
+git clone https://github.com/uxlfoundation/oneTBB.git
+cd oneTBB
+REM Create binary directory for out-of-source build
+mkdir build && cd build
+REM Configure: customize CMAKE_INSTALL_PREFIX and disable TBB_TEST to avoid tests build
+cmake -DCMAKE_INSTALL_PREFIX=%TMP%\my_installed_onetbb -DTBB_TEST=OFF ..
+REM Build "release with debug information" configuration 
+cmake --build . --config relwithdebinfo
+REM Install "release with debug information" configuration 
+cmake --install . --config relwithdebinfo
+REM Well done! Your installed oneTBB is in %TMP%\my_installed_onetbb
+```
diff --git a/external/tbb/MAINTAINERS.md b/external/tbb/MAINTAINERS.md
new file mode 100644
index 00000000..99c0a1dc
--- /dev/null
+++ b/external/tbb/MAINTAINERS.md
@@ -0,0 +1,143 @@
+<!--
+******************************************************************************
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*******************************************************************************/-->
+
+# Introduction
+
+This document defines roles in the oneTBB project.
+
+# Roles and Responsibilities
+
+oneTBB project defines three main roles:
+ * [Contributor](#contributor)
+ * [Code Owner](#code-Owner)
+ * [Maintainer](#maintainer)
+
+[permissions]: https://docs.github.com/en/organizations/managing-user-access-to-your-organizations-repositories/managing-repository-roles/repository-roles-for-an-organization#permissions-for-each-role
+
+|                                                                                                                                             |       Contributor       |       Code Owner        |       Maintainer        |
+| :------------------------------------------------------------------------------------------------------------------------------------------ | :---------------------: | :---------------------: | :---------------------: |
+| _Responsibilities_                                                                                                                          |                         |                         |                         |
+| Follow the [Code of Conduct](./CODE_OF_CONDUCT.md)                                                                                          |            ✓            |            ✓           |            ✓            |
+| Follow [Contribution Guidelines](./CONTRIBUTING.md)                                                                                         |            ✓            |            ✓           |            ✓            |
+| Ensure [Contribution Guidelines](./CONTRIBUTING.md) are followed                                                                            |            ✗            |            ✓           |            ✓            |
+| Co-own component or aspect of the library,<br>  including contributing: bug fixes, implementing features,<br> and performance optimizations |            ✗            |            ✓           |            ✓            |
+| Co-own on technical direction of component or<br> aspect of the library including work on RFCs                                              |            ✗            |            ✓           |            ✓            |
+| Co-own the project as a whole,<br> including determining strategy and policy for the project                                                |            ✗            |            ✗           |            ✓            |
+| _Privileges_                                                                                                                                |                         |                         |                         |
+| Permission granted                                                                                                                          |   [Read][permissions]   |   [Write][permissions]  | [Maintain][permissions] |
+| Eligible to become                                                                                                                          |       Code Owner        |       Maintainer        |            ✗            |
+| Can recommend Contributors<br> to become Code Owner                                                                                         |            ✗            |            ✓           |            ✓            |
+| Can participate in promotions of<br> Code Owners and  Maintainers                                                                           |            ✗            |            ✗           |            ✓            |
+| Can suggest Milestones during planning                                                                                                      |            ✓            |            ✓           |            ✓            |
+| Can choose Milestones for specific component                                                                                                |            ✗            |            ✓           |            ✓            |
+| Make a decision on project's Milestones during planning                                                                                     |            ✗            |            ✗           |            ✓            |
+| Can propose new RFC or<br> participate in review of existing RFC                                                                            |            ✓            |            ✓           |            ✓            |
+| Can request rework of RFCs<br> in represented area of responsibility                                                                        |            ✗            |            ✓           |            ✓            |
+| Can request rework of RFCs<br> in any part of the project                                                                                   |            ✗            |            ✗           |            ✓            |
+| Can manage release process of the project                                                                                                   |            ✗            |            ✗           |            ✓            |
+| Can represent the project in public as a Maintainer                                                                                         |            ✗            |            ✗           |            ✓            |
+
+These roles are merit based. Refer to the corresponding section for specific
+requirements and the nomination process.
+
+## Contributor
+
+A Contributor invests time and resources to improve oneTBB project.
+Anyone can become a Contributor by bringing value in any following way:
+  * Answer questions from community members.
+  * Propose changes to the design.
+  * Provide feedback on design proposals.
+  * Review and/or test pull requests.
+  * Test releases and report bugs.
+  * Contribute code, including bug fixes, features implementations,
+and performance optimizations.
+
+## Code Owner
+
+A Code Owner has responsibility for a specific project component or a functional
+area. Code Owners are collectively responsible
+for developing and maintaining their component or functional areas, including
+reviewing all changes to corresponding areas of responsibility and indicating
+whether those changes are ready to be merged. Code Owners have a track record of
+contribution and review in the project.
+
+**Requirements:**
+  * Track record of accepted code contributions to a specific project component.
+  * Track record of contributions to the code review process.
+  * Demonstrate in-depth knowledge of the architecture of a specific project
+    component.
+  * Commit to being responsible for that specific area.
+
+How to become a Code Owner?
+1. A Contributor is nominated by opening a PR modifying the MAINTAINERS.md file
+including name, Github username, and affiliation.
+2. At least two specific component Maintainers approve the PR.
+3. [CODEOWNERS](./CODEOWNERS) file is updated to represent corresponding areas of responsibility.
+
+## Maintainer
+Maintainers are the most established contributors responsible for the 
+project technical direction. They participate in making decisions about the
+strategy and priorities of the project.
+
+**Requirements:**
+  * Have experience as a Code Owner.
+  * Track record of major project contributions to a specific project component.
+  * Demonstrate deep knowledge of a specific project component.
+  * Demonstrate broad knowledge of the project across multiple areas.
+  * Commit to using privileges responsibly for the good of the project.
+  * Be able to exercise judgment for the good of the project, independent of
+    their employer, friends, or team.
+
+Process of becoming a maintainer:
+1. A Maintainer may nominate a current code owner to become a new Maintainer by 
+opening a PR against MAINTAINERS.md file.
+2. A majority of the current Maintainers must then approve the PR.
+
+# Code Owners and Maintainers List
+
+## oneTBB core (API, Architecture, Tests)
+
+| Name                  | Github ID             | Affiliation       | Role       |
+| --------------------- | --------------------- | ----------------- | ---------- |
+| Ilya Isaev            | @isaevil              | Intel Corporation | Code Owner |
+| Sarath Nandu R        | @sarathnandu          | Intel Corporation | Code Owner |
+| Dmitri Mokhov         | @dnmokhov             | Intel Corporation | Code Owner |
+| Alexey Kukanov        | @akukanov             | Intel Corporation | Code Owner |
+| Konstantin Boyarinov  | @kboyarinov           | Intel Corporation | Maintainer |
+| Aleksei Fedotov       | @aleksei-fedotov      | Intel Corporation | Maintainer |
+| Michael Voss          | @vossmjp              | Intel Corporation | Maintainer |
+| Pavel Kumbrasev       | @pavelkumbrasev       | Intel Corporation | Maintainer |
+
+## oneTBB TBBMALLOC (API, Architecture, Tests)
+
+| Name                  | Github ID             | Affiliation       | Role       |
+| --------------------- | --------------------- | ----------------- | ---------- |
+| Łukasz Plewa          | @lplewa               | Intel Corporation | Maintainer |
+
+
+## oneTBB Documentation
+
+| Name                   | Github ID             | Affiliation       | Role       |
+| ---------------------- | --------------------- | ----------------- | ---------- |
+| Alexandra Epanchinzeva | @aepanchi             | Intel Corporation | Code Owner |
+
+
+## oneTBB Release Management
+
+| Name               | Github ID             | Affiliation       | Role       |
+| ------------------ | --------------------- | ----------------- | ---------- |
+| Olga Malysheva     | @omalyshe             | Intel Corporation | Maintainer |
+
diff --git a/external/tbb/MODULE.bazel b/external/tbb/MODULE.bazel
new file mode 100644
index 00000000..063bc2f4
--- /dev/null
+++ b/external/tbb/MODULE.bazel
@@ -0,0 +1,24 @@
+# Copyright (c) 2021-2024 Intel Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# DISCLAIMER: Bazel support is community-based. The maintainers do not
+# use Bazel internally. The Bazel build can have security risks or
+# optimization gaps.
+
+module(
+    name = "onetbb",
+    compatibility_level = 1,
+)
+
+bazel_dep(name = "platforms", version = "0.0.10")
diff --git a/external/tbb/MODULE.bazel.lock b/external/tbb/MODULE.bazel.lock
new file mode 100644
index 00000000..06f90980
--- /dev/null
+++ b/external/tbb/MODULE.bazel.lock
@@ -0,0 +1,65 @@
+{
+  "lockFileVersion": 11,
+  "registryFileHashes": {
+    "https://bcr.bazel.build/bazel_registry.json": "8a28e4aff06ee60aed2a8c281907fb8bcbf3b753c91fb5a5c57da3215d5b3497",
+    "https://bcr.bazel.build/modules/abseil-cpp/20210324.2/MODULE.bazel": "7cd0312e064fde87c8d1cd79ba06c876bd23630c83466e9500321be55c96ace2",
+    "https://bcr.bazel.build/modules/abseil-cpp/20211102.0/MODULE.bazel": "70390338f7a5106231d20620712f7cccb659cd0e9d073d1991c038eb9fc57589",
+    "https://bcr.bazel.build/modules/abseil-cpp/20211102.0/source.json": "7e3a9adf473e9af076ae485ed649d5641ad50ec5c11718103f34de03170d94ad",
+    "https://bcr.bazel.build/modules/apple_support/1.5.0/MODULE.bazel": "50341a62efbc483e8a2a6aec30994a58749bd7b885e18dd96aa8c33031e558ef",
+    "https://bcr.bazel.build/modules/apple_support/1.5.0/source.json": "eb98a7627c0bc486b57f598ad8da50f6625d974c8f723e9ea71bd39f709c9862",
+    "https://bcr.bazel.build/modules/bazel_features/1.11.0/MODULE.bazel": "f9382337dd5a474c3b7d334c2f83e50b6eaedc284253334cf823044a26de03e8",
+    "https://bcr.bazel.build/modules/bazel_features/1.11.0/source.json": "c9320aa53cd1c441d24bd6b716da087ad7e4ff0d9742a9884587596edfe53015",
+    "https://bcr.bazel.build/modules/bazel_skylib/1.0.3/MODULE.bazel": "bcb0fd896384802d1ad283b4e4eb4d718eebd8cb820b0a2c3a347fb971afd9d8",
+    "https://bcr.bazel.build/modules/bazel_skylib/1.2.1/MODULE.bazel": "f35baf9da0efe45fa3da1696ae906eea3d615ad41e2e3def4aeb4e8bc0ef9a7a",
+    "https://bcr.bazel.build/modules/bazel_skylib/1.3.0/MODULE.bazel": "20228b92868bf5cfc41bda7afc8a8ba2a543201851de39d990ec957b513579c5",
+    "https://bcr.bazel.build/modules/bazel_skylib/1.6.1/MODULE.bazel": "8fdee2dbaace6c252131c00e1de4b165dc65af02ea278476187765e1a617b917",
+    "https://bcr.bazel.build/modules/bazel_skylib/1.6.1/source.json": "082ed5f9837901fada8c68c2f3ddc958bb22b6d654f71dd73f3df30d45d4b749",
+    "https://bcr.bazel.build/modules/buildozer/7.1.2/MODULE.bazel": "2e8dd40ede9c454042645fd8d8d0cd1527966aa5c919de86661e62953cd73d84",
+    "https://bcr.bazel.build/modules/buildozer/7.1.2/source.json": "c9028a501d2db85793a6996205c8de120944f50a0d570438fcae0457a5f9d1f8",
+    "https://bcr.bazel.build/modules/googletest/1.11.0/MODULE.bazel": "3a83f095183f66345ca86aa13c58b59f9f94a2f81999c093d4eeaa2d262d12f4",
+    "https://bcr.bazel.build/modules/googletest/1.11.0/source.json": "c73d9ef4268c91bd0c1cd88f1f9dfa08e814b1dbe89b5f594a9f08ba0244d206",
+    "https://bcr.bazel.build/modules/platforms/0.0.10/MODULE.bazel": "8cb8efaf200bdeb2150d93e162c40f388529a25852b332cec879373771e48ed5",
+    "https://bcr.bazel.build/modules/platforms/0.0.10/source.json": "f22828ff4cf021a6b577f1bf6341cb9dcd7965092a439f64fc1bb3b7a5ae4bd5",
+    "https://bcr.bazel.build/modules/platforms/0.0.4/MODULE.bazel": "9b328e31ee156f53f3c416a64f8491f7eb731742655a47c9eec4703a71644aee",
+    "https://bcr.bazel.build/modules/platforms/0.0.5/MODULE.bazel": "5733b54ea419d5eaf7997054bb55f6a1d0b5ff8aedf0176fef9eea44f3acda37",
+    "https://bcr.bazel.build/modules/platforms/0.0.6/MODULE.bazel": "ad6eeef431dc52aefd2d77ed20a4b353f8ebf0f4ecdd26a807d2da5aa8cd0615",
+    "https://bcr.bazel.build/modules/platforms/0.0.7/MODULE.bazel": "72fd4a0ede9ee5c021f6a8dd92b503e089f46c227ba2813ff183b71616034814",
+    "https://bcr.bazel.build/modules/platforms/0.0.9/MODULE.bazel": "4a87a60c927b56ddd67db50c89acaa62f4ce2a1d2149ccb63ffd871d5ce29ebc",
+    "https://bcr.bazel.build/modules/protobuf/21.7/MODULE.bazel": "a5a29bb89544f9b97edce05642fac225a808b5b7be74038ea3640fae2f8e66a7",
+    "https://bcr.bazel.build/modules/protobuf/21.7/source.json": "bbe500720421e582ff2d18b0802464205138c06056f443184de39fbb8187b09b",
+    "https://bcr.bazel.build/modules/protobuf/3.19.0/MODULE.bazel": "6b5fbb433f760a99a22b18b6850ed5784ef0e9928a72668b66e4d7ccd47db9b0",
+    "https://bcr.bazel.build/modules/protobuf/3.19.6/MODULE.bazel": "9233edc5e1f2ee276a60de3eaa47ac4132302ef9643238f23128fea53ea12858",
+    "https://bcr.bazel.build/modules/rules_cc/0.0.1/MODULE.bazel": "cb2aa0747f84c6c3a78dad4e2049c154f08ab9d166b1273835a8174940365647",
+    "https://bcr.bazel.build/modules/rules_cc/0.0.2/MODULE.bazel": "6915987c90970493ab97393024c156ea8fb9f3bea953b2f3ec05c34f19b5695c",
+    "https://bcr.bazel.build/modules/rules_cc/0.0.8/MODULE.bazel": "964c85c82cfeb6f3855e6a07054fdb159aced38e99a5eecf7bce9d53990afa3e",
+    "https://bcr.bazel.build/modules/rules_cc/0.0.9/MODULE.bazel": "836e76439f354b89afe6a911a7adf59a6b2518fafb174483ad78a2a2fde7b1c5",
+    "https://bcr.bazel.build/modules/rules_cc/0.0.9/source.json": "1f1ba6fea244b616de4a554a0f4983c91a9301640c8fe0dd1d410254115c8430",
+    "https://bcr.bazel.build/modules/rules_java/4.0.0/MODULE.bazel": "5a78a7ae82cd1a33cef56dc578c7d2a46ed0dca12643ee45edbb8417899e6f74",
+    "https://bcr.bazel.build/modules/rules_java/7.6.1/MODULE.bazel": "2f14b7e8a1aa2f67ae92bc69d1ec0fa8d9f827c4e17ff5e5f02e91caa3b2d0fe",
+    "https://bcr.bazel.build/modules/rules_java/7.6.1/source.json": "8f3f3076554e1558e8e468b2232991c510ecbcbed9e6f8c06ac31c93bcf38362",
+    "https://bcr.bazel.build/modules/rules_jvm_external/4.4.2/MODULE.bazel": "a56b85e418c83eb1839819f0b515c431010160383306d13ec21959ac412d2fe7",
+    "https://bcr.bazel.build/modules/rules_jvm_external/4.4.2/source.json": "a075731e1b46bc8425098512d038d416e966ab19684a10a34f4741295642fc35",
+    "https://bcr.bazel.build/modules/rules_license/0.0.3/MODULE.bazel": "627e9ab0247f7d1e05736b59dbb1b6871373de5ad31c3011880b4133cafd4bd0",
+    "https://bcr.bazel.build/modules/rules_license/0.0.7/MODULE.bazel": "088fbeb0b6a419005b89cf93fe62d9517c0a2b8bb56af3244af65ecfe37e7d5d",
+    "https://bcr.bazel.build/modules/rules_license/0.0.7/source.json": "355cc5737a0f294e560d52b1b7a6492d4fff2caf0bef1a315df5a298fca2d34a",
+    "https://bcr.bazel.build/modules/rules_pkg/0.7.0/MODULE.bazel": "df99f03fc7934a4737122518bb87e667e62d780b610910f0447665a7e2be62dc",
+    "https://bcr.bazel.build/modules/rules_pkg/0.7.0/source.json": "c2557066e0c0342223ba592510ad3d812d4963b9024831f7f66fd0584dd8c66c",
+    "https://bcr.bazel.build/modules/rules_proto/4.0.0/MODULE.bazel": "a7a7b6ce9bee418c1a760b3d84f83a299ad6952f9903c67f19e4edd964894e06",
+    "https://bcr.bazel.build/modules/rules_proto/5.3.0-21.7/MODULE.bazel": "e8dff86b0971688790ae75528fe1813f71809b5afd57facb44dad9e8eca631b7",
+    "https://bcr.bazel.build/modules/rules_proto/5.3.0-21.7/source.json": "d57902c052424dfda0e71646cb12668d39c4620ee0544294d9d941e7d12bc3a9",
+    "https://bcr.bazel.build/modules/rules_python/0.10.2/MODULE.bazel": "cc82bc96f2997baa545ab3ce73f196d040ffb8756fd2d66125a530031cd90e5f",
+    "https://bcr.bazel.build/modules/rules_python/0.22.1/MODULE.bazel": "26114f0c0b5e93018c0c066d6673f1a2c3737c7e90af95eff30cfee38d0bbac7",
+    "https://bcr.bazel.build/modules/rules_python/0.22.1/source.json": "57226905e783bae7c37c2dd662be078728e48fa28ee4324a7eabcafb5a43d014",
+    "https://bcr.bazel.build/modules/rules_python/0.4.0/MODULE.bazel": "9208ee05fd48bf09ac60ed269791cf17fb343db56c8226a720fbb1cdf467166c",
+    "https://bcr.bazel.build/modules/stardoc/0.5.1/MODULE.bazel": "1a05d92974d0c122f5ccf09291442580317cdd859f07a8655f1db9a60374f9f8",
+    "https://bcr.bazel.build/modules/stardoc/0.5.1/source.json": "a96f95e02123320aa015b956f29c00cb818fa891ef823d55148e1a362caacf29",
+    "https://bcr.bazel.build/modules/upb/0.0.0-20220923-a547704/MODULE.bazel": "7298990c00040a0e2f121f6c32544bab27d4452f80d9ce51349b1a28f3005c43",
+    "https://bcr.bazel.build/modules/upb/0.0.0-20220923-a547704/source.json": "f1ef7d3f9e0e26d4b23d1c39b5f5de71f584dd7d1b4ef83d9bbba6ec7a6a6459",
+    "https://bcr.bazel.build/modules/zlib/1.2.11/MODULE.bazel": "07b389abc85fdbca459b69e2ec656ae5622873af3f845e1c9d80fe179f3effa0",
+    "https://bcr.bazel.build/modules/zlib/1.2.12/MODULE.bazel": "3b1a8834ada2a883674be8cbd36ede1b6ec481477ada359cd2d3ddc562340b27",
+    "https://bcr.bazel.build/modules/zlib/1.3/MODULE.bazel": "6a9c02f19a24dcedb05572b2381446e27c272cd383aed11d41d99da9e3167a72",
+    "https://bcr.bazel.build/modules/zlib/1.3/source.json": "b6b43d0737af846022636e6e255fd4a96fee0d34f08f3830e6e0bac51465c37c"
+  },
+  "selectedYankedVersions": {},
+  "moduleExtensions": {}
+}
diff --git a/external/tbb/README.md b/external/tbb/README.md
index dd05398f..6f0b7d59 100644
--- a/external/tbb/README.md
+++ b/external/tbb/README.md
@@ -1,40 +1,70 @@
-# oneAPI Threading Building Blocks
-[![Apache License Version 2.0](https://img.shields.io/badge/license-Apache_2.0-green.svg)](LICENSE.txt) [![oneTBB CI](https://github.com/oneapi-src/oneTBB/actions/workflows/ci.yml/badge.svg)](https://github.com/oneapi-src/oneTBB/actions/workflows/ci.yml?query=branch%3Amaster)
+# oneAPI Threading Building Blocks (oneTBB) <img align="right" width="200" height="100" src="https://raw.githubusercontent.com/uxlfoundation/artwork/e98f1a7a3d305c582d02c5f532e41487b710d470/foundation/uxl-foundation-logo-horizontal-color.svg">
+[![Apache License Version 2.0](https://img.shields.io/badge/license-Apache_2.0-green.svg)](LICENSE.txt) [![oneTBB CI](https://github.com/uxlfoundation/oneTBB/actions/workflows/ci.yml/badge.svg)](https://github.com/uxlfoundation/oneTBB/actions/workflows/ci.yml?query=branch%3Amaster)
+[![Join the community on GitHub Discussions](https://badgen.net/badge/join%20the%20discussion/on%20github/blue?icon=github)](https://github.com/uxlfoundation/oneTBB/discussions)
+[![OpenSSF Best Practices](https://www.bestpractices.dev/projects/9125/badge)](https://www.bestpractices.dev/projects/9125)
+[![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/uxlfoundation/oneTBB/badge)](https://securityscorecards.dev/viewer/?uri=github.com/uxlfoundation/oneTBB)
+[![Gurubase](https://img.shields.io/badge/Gurubase-Ask%20oneTBB%20Guru-006BFF)](https://gurubase.io/g/onetbb)
+[![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/oneapi-src/oneTBB/badge)](https://securityscorecards.dev/viewer/?uri=github.com/oneapi-src/oneTBB)
+[![Coverity Scan Build Status](https://img.shields.io/coverity/scan/30373.svg)](https://scan.coverity.com/projects/oneapi-src-onetbb)
 
-oneAPI Threading Building Blocks (oneTBB) lets you easily write parallel C++ programs that take
-full advantage of multicore performance, that are portable, composable and have future-proof scalability.
+oneTBB is a flexible C++ library that simplifies the work of adding parallelism
+to complex applications, even if you are not a threading expert.  
+
+The library lets you easily write parallel programs that take full advantage of the multi-core performance. Such programs are portable, 
+composable and have a future-proof scalability. oneTBB provides you with functions, interfaces, and classes to parallelize and scale the code.
+All you have to do is to use the templates. 
+
+The library differs from typical threading packages in the following ways:
+* oneTBB enables you to specify logical parallelism instead of threads.
+* oneTBB targets threading for performance.
+* oneTBB is compatible with other threading packages.
+* oneTBB emphasizes scalable, data parallel programming.
+* oneTBB relies on generic programming.
+
+
+Refer to oneTBB [examples](examples) and [samples](https://github.com/oneapi-src/oneAPI-samples/tree/master/Libraries/oneTBB) to see how you can use the library.
+
+oneTBB is a part of the [UXL Foundation](http://www.uxlfoundation.org) and is an implementation of [oneAPI specification](https://oneapi.io).
+
+> **_NOTE:_** Threading Building Blocks (TBB) is now called oneAPI Threading Building Blocks (oneTBB) to highlight that the tool is a part of the oneAPI ecosystem.
 
 ## Release Information
-Here are [Release Notes]( https://software.intel.com/en-us/articles/intel-oneapi-threading-building-blocks-release-notes) and
-[System Requirements](https://software.intel.com/en-us/articles/intel-oneapi-threading-building-blocks-system-requirements).
+
+See [Release Notes](RELEASE_NOTES.md) and [System Requirements](SYSTEM_REQUIREMENTS.md).
 
 ## Documentation
 * [oneTBB Specification](https://spec.oneapi.com/versions/latest/elements/oneTBB/source/nested-index.html)
-* [oneTBB Developer Guide and Reference](https://software.intel.com/en-us/oneapi-tbb-documentation)
-* [Migrating from TBB to oneTBB](https://software.intel.com/content/www/us/en/develop/documentation/onetbb-documentation/top/onetbb-developer-guide/migrating-from-threading-building-blocks-tbb.html)
-* README for build system: [cmake/README.md](cmake/README.md)
+* [oneTBB Developer Guide and Reference](https://uxlfoundation.github.io/oneTBB)
+* [Migrating from TBB to oneTBB](https://uxlfoundation.github.io/oneTBB/main/tbb_userguide/Migration_Guide.html)
+* [README for the CMake build system](cmake/README.md)
+* [oneTBB Testing Approach](https://uxlfoundation.github.io/oneTBB/main/intro/testing_approach.html)
 * [Basic support for the Bazel build system](Bazel.md)
+* [oneTBB Discussions](https://github.com/uxlfoundation/oneTBB/discussions)
+* [WASM Support](WASM_Support.md)
+
+## Installation 
+See [Installation from Sources](INSTALL.md) to learn how to install oneTBB. 
+
+## Governance
+
+The oneTBB project is governed by the UXL Foundation.
+You can get involved in this project in following ways:
+* Join the [Open Source and Specification Working Group](https://github.com/uxlfoundation/foundation/tree/main?tab=readme-ov-file#working-groups) meetings.
+* Join the mailing lists for the [UXL Foundation](https://lists.uxlfoundation.org/g/main/subgroups) to receive meetings schedule and latest updates.
+* Contribute to oneTBB project or oneTBB specification. Read [CONTRIBUTING](./CONTRIBUTING.md) for more information.
 
 ## Support
-Please report issues and suggestions via
-[GitHub issues](https://github.com/oneapi-src/oneTBB/issues) or start a topic on the
-[oneTBB forum](https://community.intel.com/t5/Intel-oneAPI-Threading-Building/bd-p/oneapi-threading-building-blocks).
+See our [documentation](./SUPPORT.md) to learn how to request help.
 
 ## How to Contribute
-We welcome community contributions, so check our [contributing guidelines](CONTRIBUTING.md)
+We welcome community contributions, so check our [Contributing Guidelines](CONTRIBUTING.md)
 to learn more.
 
+Use GitHub Issues for feature requests, bug reports, and minor inquiries. For broader questions and development-related discussions, use GitHub Discussions.
+
 ## License
 oneAPI Threading Building Blocks is licensed under [Apache License, Version 2.0](LICENSE.txt).
 By its terms, contributions submitted to the project are also done under that license.
 
-## Security
-To report security issues please go to https://intel.com/security.
-
-## Engineering team contacts
-* [E-mail us.](mailto:inteltbbdevelopers@intel.com)
-
 ------------------------------------------------------------------------
-Intel and the Intel logo are trademarks of Intel Corporation or its subsidiaries in the U.S. and/or other countries.
-
-\* Other names and brands may be claimed as the property of others.
+\* All names and brands may be claimed as the property of others.
diff --git a/external/tbb/RELEASE_NOTES.md b/external/tbb/RELEASE_NOTES.md
new file mode 100644
index 00000000..16f04e0b
--- /dev/null
+++ b/external/tbb/RELEASE_NOTES.md
@@ -0,0 +1,51 @@
+<!--
+******************************************************************************
+* 
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*******************************************************************************/-->
+
+# Release Notes <!-- omit in toc -->
+This document contains changes of oneTBB compared to the last release.
+
+## Table of Contents <!-- omit in toc -->
+- [Preview Features](#preview-features)
+- [Known Limitations](#known-limitations)
+- [Issues Fixed](#issues-fixed)
+- [Open-Source Contributions Integrated](#open-source-contributions-integrated)
+
+## :tada: Preview Features
+- Extended the Flow Graph receiving nodes with a new ``try_put_and_wait`` API that submits a message to the graph and waits for its completion.
+
+## :rotating_light: Known Limitations
+- The ``oneapi::tbb::info`` namespace interfaces might unexpectedly change the process affinity mask on Windows* OS systems (see https://github.com/open-mpi/hwloc/issues/366 for details) when using hwloc version lower than 2.5.
+- Using a hwloc version other than 1.11, 2.0, or 2.5 may cause an undefined behavior on Windows OS. See https://github.com/open-mpi/hwloc/issues/477 for details.
+- The NUMA topology may be detected incorrectly on Windows* OS machines where the number of NUMA node threads exceeds the size of 1 processor group.
+- On Windows OS on ARM64*, when compiling an application using oneTBB with the Microsoft* Compiler, the compiler issues a warning C4324 that a structure was padded due to the alignment specifier. Consider suppressing the warning by specifying /wd4324 to the compiler command line.
+- C++ exception handling mechanism on Windows* OS on ARM64* might corrupt memory if an exception is thrown from any oneTBB parallel algorithm (see Windows* OS on ARM64* compiler issue: https://developercommunity.visualstudio.com/t/ARM64-incorrect-stack-unwinding-for-alig/1544293.
+- When CPU resource coordination is enabled, tasks from a lower-priority ``task_arena`` might be executed before tasks from a higher-priority ``task_arena``.
+- Using oneTBB on WASM*, may cause applications to run in a single thread. See [Limitations of WASM Support](https://github.com/uxlfoundation/oneTBB/blob/master/WASM_Support.md#limitations).
+
+> **_NOTE:_**  To see known limitations that impact all versions of oneTBB, refer to [oneTBB Documentation](https://uxlfoundation.github.io/oneTBB/main/intro/limitations.html).
+
+
+## :hammer: Issues Fixed
+- Fixed the missed signal for thread request for enqueue operation.
+- Significantly improved scalability of ``task_group``, ``flow_graph``, and ``parallel_for_each``.
+- Removed usage of ``std::aligned_storage`` deprecated in C++23 (Inspired by Valery Matskevich https://github.com/uxlfoundation/oneTBB/pull/1394).
+- Fixed the issue where ``oneapi::tbb::info`` interfaces might interfere with the process affinity mask on the Windows* OS systems with multiple processor groups.
+
+
+## :octocat: Open-Source Contributions Integrated
+- Detect the GNU Binutils version to determine WAITPKG support better. Contributed by Martijn Courteaux (https://github.com/uxlfoundation/oneTBB/pull/1347).
+- Fixed the build on non-English locales. Contributed by Vladislav Shchapov (https://github.com/uxlfoundation/oneTBB/pull/1450). 
+- Improved Bazel support. Contributed by Julian Amann (https://github.com/uxlfoundation/oneTBB/pull/1434).
diff --git a/external/tbb/SECURITY.md b/external/tbb/SECURITY.md
new file mode 100644
index 00000000..c9be5beb
--- /dev/null
+++ b/external/tbb/SECURITY.md
@@ -0,0 +1,66 @@
+# Security Policy
+As an open-source project, we understand the importance of and responsibility
+for security. This Security Policy outlines our guidelines and procedures to
+ensure the highest level of security and trust for oneTBB users. 
+
+## Supported Versions
+Security vulnerabilities are fixed in the [latest version][1]
+and delivered as a patch release. We don't guarantee security fixes to be
+back-ported to older oneTBB versions.
+
+## Report a Vulnerability
+We are very grateful to the security researchers and users that report back
+security vulnerabilities. We investigate every report thoroughly.
+We strongly encourage you to report security vulnerabilities to us privately,
+before disclosing them on public forums or opening a public GitHub* issue. 
+
+Report a vulnerability to us in one of two ways:
+* Open a draft **[GitHub* Security Advisory][2]**
+* Send an e-mail to: **security@uxlfoundation.org**.
+Along with the report, provide the following info:
+  * A descriptive title.
+  * Your name and affiliation (if any).
+  * A description of the technical details of the vulnerabilities.
+  * A minimal example of the vulnerability so we can reproduce your findings.
+  * An explanation of who can exploit this vulnerability, and what they gain
+  doing so. 
+  * Whether this vulnerability is public or known to third parties. If it is,
+  provide details.
+
+### When Should I Report a Vulnerability?
+* You think you discovered a potential security vulnerability in oneTBB.
+* You are unsure how the potential vulnerability affects oneTBB.
+* You think you discovered a vulnerability in another project or 3rd party
+component on which oneTBB depends. If the issue is not fixed in the 3rd party
+component, try to report directly there first.
+
+### When Should I NOT Report a Vulnerability?
+* You got an automated scan hit and are unable to provide details.
+* You need help using oneTBB for security.
+* You need help applying security-related updates.
+* Your issue is not security-related.
+
+## Security Reports Review Process
+We aim to respond quickly to your inquiry and coordinate a fix and
+disclosure with you. All confirmed security vulnerabilities will be addressed
+according to severity level and impact on oneTBB. Normally, security issues
+are fixed in the next planned release.
+
+## Disclosure Policy
+We will publish security advisories using the 
+[**GitHub Security Advisories feature**][3]
+to keep our community well-informed, and will credit you for your findings
+unless you prefer to stay anonymous. We request that you refrain from
+exploiting the vulnerability or making it public before the official disclosure.
+
+We will disclose the vulnerabilities and bugs as soon as possible once
+mitigation is implemented and available. 
+
+## Feedback on This Policy
+If you have any suggestions on how this Policy could be improved, submit
+an issue or a pull request to this repository. **Do not** report
+potential vulnerabilities or security flaws via a pull request.
+
+[1]: https://github.com/uxlfoundation/oneTBB/releases/latest
+[2]: https://github.com/uxlfoundation/oneTBB/security/advisories/new
+[3]: https://github.com/uxlfoundation/oneTBB/security/advisories
diff --git a/external/tbb/SUPPORT.md b/external/tbb/SUPPORT.md
new file mode 100644
index 00000000..bbf24f28
--- /dev/null
+++ b/external/tbb/SUPPORT.md
@@ -0,0 +1,35 @@
+<!--
+******************************************************************************
+* 
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*******************************************************************************/-->
+
+# oneTBB Support
+
+We are committed to providing support and assistance to help you make the most out of oneTBB. 
+Use the following methods if you face any challenges. 
+
+## Issues
+
+If you have a problem, check out the [GitHub Issues](https://github.com/uxlfoundation/oneTBB/issues) to see if the issue you want to address is already reported. 
+You may find users that have encountered the same bug or have similar ideas for changes or updates.
+
+You can use issues to report a problem, make a feature request, or add comments on an existing issue.
+
+## Discussions 
+
+Visit the [GitHub Discussions](https://github.com/uxlfoundation/oneTBB/discussions) to engage with the community, ask questions, or help others. 
+
+## Email
+
+Reach out to us privately via [email](mailto:inteltbbdevelopers@intel.com). 
\ No newline at end of file
diff --git a/external/tbb/SYSTEM_REQUIREMENTS.md b/external/tbb/SYSTEM_REQUIREMENTS.md
new file mode 100644
index 00000000..7f9d8161
--- /dev/null
+++ b/external/tbb/SYSTEM_REQUIREMENTS.md
@@ -0,0 +1,86 @@
+<!--
+******************************************************************************
+* 
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*******************************************************************************/-->
+
+# System Requirements <!-- omit in toc -->
+This document provides details about hardware, operating system, and software prerequisites for the oneAPI Threading Building Blocks (oneTBB). 
+
+## Table of Contents <!-- omit in toc -->
+- [Supported Hardware](#supported-hardware)
+- [Software](#software)
+  - [Supported Operating Systems](#supported-operating-systems)
+  - [Community-Supported Platforms](#community-supported-platforms)
+  - [Supported Compilers](#supported-compilers)
+- [Limitations](#limitations)
+
+
+## Supported Hardware
+- Intel(R) Celeron(R) processor family
+- Intel(R) Core* processor family
+- Intel(R) Xeon(R) processor family
+- Intel(R) Atom* processor family
+- Non-Intel(R) processors compatible with the processors listed above
+
+
+## Software
+
+### Supported Operating Systems
+- Systems with Microsoft* Windows* operating systems:
+  - Microsoft* Windows* 10
+  - Microsoft* Windows* 11
+  - Microsoft* Windows* Server 2019
+  - Microsoft* Windows* Server 2022
+- Systems with Linux* operating systems:
+  - Oracle Linux* 8
+  - Amazon* Linux 2, 2022
+  - Debian* 9, 10, 11
+  - Fedora* 36, 37, 38
+  - Rocky* Linux* 8, 9
+  - Red Hat* Enterprise Linux* 8, 9
+  - SuSE* Linux* Enterprise Server 15
+  - Ubuntu* 20.04, 22.04
+- Systems with macOS* operating systems:
+  - macOS* 12.x, 13.x
+- Systems with Android* operating systems:
+  - Android* 9
+
+### Community-Supported Platforms
+- MinGW*
+- FreeBSD*
+- Microsoft* Windows* on ARM*/ARM64*
+- macOS* on ARM64*
+
+### Supported Compilers
+- Intel* oneAPI DPC++/C++ Compiler
+- Intel® C++ Compiler Classic 2021.1 - 2021.9
+- Microsoft* Visual C++ 14.2 (Microsoft* Visual Studio* 2019, Windows* OS only)
+- Microsoft* Visual C++ 14.3 (Microsoft* Visual Studio* 2022, Windows* OS only)
+- For each supported Linux* operating system, the standard gcc version provided with that operating system is supported:
+  - GNU Compilers (gcc) 8.x – 12.x
+  - GNU C Library (glibc) version 2.28 – 2.36
+  - Clang* 6.0.0 - 13.0.0
+
+## Limitations
+There are some cases where we cannot provide support for your platforms. It includes: 
+
+1. The platform is out of official support (met end of life). When you use an unsupported platform, you can face a security risk that can be difficult to resolve.
+2. We do not have the infrastructure to test a platform. Therefore we cannot guarantee that oneTBB works correctly on that platform. 
+3. Changes affect more code than just platform-specific macros.
+4. The platform is incompatible with oneTBB. Some platforms may have limitations that prevent oneTBB from working correctly. We cannot provide support in these cases as the issue is beyond our control.
+5. The platform is modified or customized. If you made significant updates to your platform, it might be hard for us to find the root cause of the issue. Therefore, we may not be able to provide support as the modification could affect the oneTBB functionality. 
+
+
+We understand that these limitations can be frustrating. Thus, we suggest creating a branch specifically for the unsupported platform, allowing other users to contribute to or use your implementation.
+
diff --git a/external/tbb/VERSION b/external/tbb/VERSION
deleted file mode 100644
index b917d142..00000000
--- a/external/tbb/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-oneTBB 2021.5.0
\ No newline at end of file
diff --git a/external/tbb/WASM_Support.md b/external/tbb/WASM_Support.md
new file mode 100644
index 00000000..9c49b0fa
--- /dev/null
+++ b/external/tbb/WASM_Support.md
@@ -0,0 +1,81 @@
+<!--
+******************************************************************************
+* 
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*******************************************************************************/-->
+
+# WASM Support
+
+oneTBB extends its capabilities by offering robust support for ``WASM`` (see ``Limitation`` sections).
+
+``WASM`` stands for WebAssembly, a low-level binary format for executing code in web browsers. 
+It is designed to be a portable target for compilers and efficient to parse and execute. 
+
+Using oneTBB with WASM, you can take full advantage of parallelism and concurrency while working on web-based applications, interactive websites, and a variety of other WASM-compatible platforms.
+
+oneTBB offers WASM support through the integration with [Emscripten*](https://emscripten.org/docs/introducing_emscripten/index.html), a powerful toolchain for compiling C and C++ code into WASM-compatible runtimes. 
+
+## Build
+
+**Prerequisites:** Download and install Emscripten*. See the [instructions](https://emscripten.org/docs/getting_started/downloads.html). 
+
+To build the system, run:
+
+```
+mkdir build && cd build
+emcmake cmake .. -DCMAKE_CXX_COMPILER=em++ -DCMAKE_C_COMPILER=emcc -DTBB_STRICT=OFF -DCMAKE_CXX_FLAGS=-Wno-unused-command-line-argument -DTBB_DISABLE_HWLOC_AUTOMATIC_SEARCH=ON -DBUILD_SHARED_LIBS=OFF -DTBB_EXAMPLES=ON -DTBB_TEST=ON
+```
+To compile oneTBB without ``pthreads``, set the flag ``-DEMSCRIPTEN_WITHOUT_PTHREAD=true`` in the command above. By default, oneTBB uses the ``pthreads``.
+```
+cmake --build . <options>
+cmake --install . <options>
+```
+Where:
+
+* ``emcmake`` - a tool that sets up the environment for Emscripten*. 
+* ``-DCMAKE_CXX_COMPILER=em++`` - specifies the C++ compiler as Emscripten* C++ compiler. 
+* ``-DCMAKE_C_COMPILER=emcc`` - specifies the C compiler as Emscripten* C compiler.
+
+
+> **_NOTE:_** See [CMake documentation](https://github.com/uxlfoundation/oneTBB/blob/master/cmake/README.md) to learn about other options. 
+
+
+## Run Test
+
+To run tests, use:
+
+```
+ctest
+```
+
+# Limitations
+
+You can successfully build your application with oneTBB using WASM, but you may not achieve optimal performance immediately. This is due to the limitation with nested Web Workers: a Web Worker cannot schedule another worker without help from a browser thread. This can lead to unexpected performance outcomes, such as the application running in serial.
+Find more information in the [issue](https://github.com/emscripten-core/emscripten/discussions/21963) in the Emscripten repository.
+To workaround this issue, try one of the following ways:
+1. **Recommended Solution: Use the ``-sPROXY_TO_PTHREAD`` Flag**. 
+This flag splits the initial thread into a browser thread and a main thread (proxied by a Web Worker), effectively resolving the issue as the browser thread is always present in the event loop and can participate in Web Workers scheduling. Refer to the [Emscripten documentation](https://emscripten.org/docs/porting/pthreads.html) for more details about ``-sPROXY_TO_PTHREAD`` since using this flag may require refactoring the code.
+2. **Alternative Solution: Warm Up the oneTBB Thread Pool**
+Initialize the oneTBB thread pool before making the first call to oneTBB. This approach forces the browser thread to participate in Web Workers scheduling.
+```cpp
+    int num_threads = tbb::this_task_arena::max_concurrency();
+    std::atomic<int> barrier{num_threads};
+    tbb::parallel_for(0, num_threads, [&barrier] (int) {
+        barrier--;
+        while (barrier > 0) {
+            // Send browser thread to event loop
+            std::this_thread::yield();
+        }
+    }, tbb::static_partitioner{});
+```
+> **_NOTE:_** Be aware that it might cause delays on the browser side.
diff --git a/external/tbb/WORKSPACE.bazel b/external/tbb/WORKSPACE.bazel
index f89d9499..59ba39f7 100644
--- a/external/tbb/WORKSPACE.bazel
+++ b/external/tbb/WORKSPACE.bazel
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Intel Corporation
+# Copyright (c) 2021-2024 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +16,4 @@
 # use Bazel internally. The Bazel build can have security risks or 
 # optimization gaps.
 
-workspace(name = "oneTBB")
\ No newline at end of file
+# WORKSPACE marker file needed by Bazel
diff --git a/external/tbb/cmake/README.md b/external/tbb/cmake/README.md
index 92d90cf7..4e0d8d54 100644
--- a/external/tbb/cmake/README.md
+++ b/external/tbb/cmake/README.md
@@ -1,33 +1,36 @@
-# Build system description
+# Build System Description
 
-The project uses CMake build configuration.
+The project uses CMake* build configuration.
 
 The following controls are available during the configure stage:
-
 ```
 TBB_TEST:BOOL - Enable testing (ON by default)
 TBB_STRICT:BOOL - Treat compiler warnings as errors (ON by default)
 TBB_SANITIZE:STRING - Sanitizer parameter, passed to compiler/linker
-TBB_SIGNTOOL:FILEPATH - Tool for digital signing, used in post install step for libraries if provided.
+TBB_SIGNTOOL:FILEPATH - Tool for digital signing, used in post-install step for libraries if provided.
 TBB_SIGNTOOL_ARGS:STRING - Additional arguments for TBB_SIGNTOOL, used if TBB_SIGNTOOL is set.
 TBB_BUILD:BOOL - Enable Intel(R) oneAPI Threading Building Blocks (oneTBB) build (ON by default)
+TBB_FIND_PACKAGE - Enable search for external oneTBB using find_package instead of build from sources (OFF by default)
 TBBMALLOC_BUILD:BOOL - Enable Intel(R) oneAPI Threading Building Blocks (oneTBB) memory allocator build (ON by default)
+TBBMALLOC_PROXY_BUILD:BOOL - Enable Intel(R) oneAPI Threading Building Blocks (oneTBB) memory allocator proxy build (requires TBBMALLOC_BUILD. ON by default)
 TBB4PY_BUILD:BOOL - Enable Intel(R) oneAPI Threading Building Blocks (oneTBB) Python module build (OFF by default)
 TBB_CPF:BOOL - Enable preview features of the library (OFF by default)
+TBB_INSTALL:BOOL - Enable installation (ON by default)
 TBB_INSTALL_VARS:BOOL - Enable auto-generated vars installation(packages generated by `cpack` and `make install` will also include the vars script)(OFF by default)
 TBB_VALGRIND_MEMCHECK:BOOL - Enable scan for memory leaks using Valgrind (OFF by default)
 TBB_DISABLE_HWLOC_AUTOMATIC_SEARCH - Disable HWLOC automatic search by pkg-config tool (OFF by default)
+TBB_ENABLE_IPO - Enable Interprocedural Optimization (IPO) during the compilation (ON by default)
+TBB_CONTROL_FLOW_GUARD:BOOL - Enable Control Flow Guard (CFG) during the compilation (OFF by default)
+TBB_BUILD_APPLE_FRAMEWORKS - Enable the Apple* frameworks instead of dylibs, only available on the Apple platform. (OFF by default)
+TBB_FILE_TRIM - Enable __FILE__ trim, replace a build-time full path with a relative path in the debug info and macro __FILE__; use it to make
+           reproducible location-independent builds (ON by default)
 ```
 
-## Configure, build and test
-
-### Prerequisites
-
-* CMake >= 3.1
+## Configure, Build, and Test
 
 ### Preparation
 
-In order to perform out-of-source build you have to create a build directory and go there:
+To perform an out-of-source build, create a build directory and go there:
 
 ```bash
 mkdir /tmp/my-build
@@ -41,37 +44,47 @@ cmake <options> <repo_root>
 ```
 
 Some useful options:
+- `-G <generator>` - specify particular project generator. See `cmake --help` for details.
+- `-DCMAKE_BUILD_TYPE=Debug` - specify for Debug build. It is not applicable for multi-config generators, e.g., Microsoft* Visual Studio* generator.
+
+#### TBBBind Library Configuration
+
+> **_TIP:_** It is recommended to install the HWLOC* library. See [oneTBB documentation](https://uxlfoundation.github.io/oneTBB/GSG/next_steps.html#hybrid-cpu-and-numa-support) for details.
+
+The TBBbind library has three versions: `tbbbind`, `tbbbind_2_0`, and `tbbbind_2_5`. Each of these versions is linked with the corresponding HWLOC* library version: 
+- `tbbbind` links with `HWLOC 1.11.x`
+- `tbbbind_2_0` links with `HWLOC 2.1–2.4`
+- `tbbbind_2_5` links with `HWLOC 2.5` and later
 
-- `-G <generator>` - specify particular project generator, see `cmake --help` for details.
-- `-DCMAKE_BUILD_TYPE=Debug` - specify for Debug build, it isn't applicable for multi-config generators, e.g. for Visual
-  Studio generator).
+The search for a suitable version of the HWLOC library is enabled by default. If you want to use a specific version of the library, you can specify the path to it manually using the following CMake variables:
 
-#### TBBBind library configuration
+ - `CMAKE_HWLOC_<HWLOC_VER>_LIBRARY_PATH` - path to the corresponding HWLOC version shared library on Linux* OS or path to `.lib` file on Windows* OS
+ - `CMAKE_HWLOC_<HWLOC_VER>_INCLUDE_PATH` - path to the corresponding HWLOC version including directory
 
-The TBBbind library has three versions: `tbbbind`, `tbbbind_2_0` and `tbbbind_2_5`. Each of these versions is linked
-with corresponding HWLOC library version: `tbbbind` links with HWLOC 1.11.x , `tbbbind_2_0` links with HWLOC
-2.1-2.4, `tbbbind_2_5` links with HWLOC 2.5 and later.
 
-The search for a suitable version of the HWLOC library is enabled by default, but if you want to use a specific version
-of the library, you can specify the path to it manually using the following CMake variables:
+---
+**NOTE:** Automatic HWLOC searching requires CMake version 3.6 or higher.
 
-- `CMAKE_HWLOC_<HWLOC_VER>_LIBRARY_PATH` - path to the corresponding HWLOC version shared library on Linux or path
-  to `.lib` file on Windows.
-- `CMAKE_HWLOC_<HWLOC_VER>_INCLUDE_PATH` - path to the corresponding HWLOC version includes directory.
+---
 
-Automatic HWLOC searching requires CMake >= 3.6.
 
-Windows requires one additional variable for correct TBBBind library building:
+Windows* OS requires an additional variable for correct TBBBind library building:
+ - `CMAKE_HWLOC_<HWLOC_VER>_DLL_PATH` - path to the corresponding HWLOC version `.dll` file.
 
-- `CMAKE_HWLOC_<HWLOC_VER>_DLL_PATH` - path to the corresponding HWLOC version `.dll` file.
+The `HWLOC_VER` substring used earlier can be replaced with one of the three values:
+- `1_11` for the `tbbbind` library configuration
+- `2` for the `tbbbind_2_0` library configuration
+- `2_5` for the `tbbbind_2_5` library configuration
 
-`HWLOC_VER` substring used above can be replaced with one of the three values: `1_11` for the `tbbbind` library
-configuration, `2` for the `tbbbind_2_0`, and `2_5` for the `tbbbind_2_5` library configuration.
+If you specify variables for several TBBBind versions, the building process for all of these versions is performed during a single build session.
 
-If you specify variables for several TBBBind versions, then building process for all of these versions will be performed
-during single build session.
+---
+**TIP**
+
+Specify the `TBB_DISABLE_HWLOC_AUTOMATIC_SEARCH` to turn off the HWLOC library's automatic search.
+
+---
 
-Specify the `TBB_DISABLE_HWLOC_AUTOMATIC_SEARCH` to disable HWLOC libraries automatic search.
 
 ### Build
 
@@ -80,97 +93,114 @@ cmake --build . <options>
 ```
 
 Some useful options:
+- `--target <target>` - specific target, "all" is the default.
+- `--config <Release|Debug>` - build configuration, applicable only for multi-config generators, e.g., Visual Studio* generator.
+
+The binaries are placed to `./<compiler-id>_<compiler-ver>_cxx<stdver>_<build-type>`. For example, `./gnu_4.8_cxx11_release`.
 
-- `--target <target>` - specific target, "all" is default.
-- `--config <Release|Debug>` - build configuration, applicable only for multi-config generators, e.g. Visual Studio
-  generator.
+#### Build For 32-bit
 
-Binaries are placed to `./<compiler-id>_<compiler-ver>_cxx<stdver>_<build-type>` (for
-example, `./gnu_4.8_cxx11_release`)
+* **Intel(R) Compiler**. Source Intel(R) C++ Compiler with `ia32` and build as usual.
+* **MSVC**. Use switch for [generator](https://cmake.org/cmake/help/latest/manual/cmake-generators.7.html) (e.g., `-A Win32` for [VS2019](https://cmake.org/cmake/help/latest/generator/Visual%20Studio%2016%202019.html)) during the configuration stage and then build as usual.
+* **GCC/Clang**. Specify `-m32` during the configuration. It can be `CXXFLAGS=-m32 cmake ..` or `cmake -DCMAKE_CXX_FLAGS=-m32 ..`
+* For any other compiler, which builds for 64-bit by default, specify a 32-bit compiler key during the configuration as above.
 
-#### Build for 32-bit
+#### Windows* OS-Specific Builds
 
-* Intel Compiler: just source Intel(R) C++ Compiler with `ia32` and build as usual.
-* MSVC: use switch for [generator](https://cmake.org/cmake/help/latest/manual/cmake-generators.7.html) (e.g. `-A Win32`
-  for [VS2019](https://cmake.org/cmake/help/latest/generator/Visual%20Studio%2016%202019.html)) during the configuration
-  stage and then build as usual.
-* GCC/Clang: specify `-m32` during the configuration: `CXXFLAGS=-m32 cmake ..` or `cmake -DCMAKE_CXX_FLAGS=-m32 ..`
-* Any other compiler which builds for 64-bit by default: specify 32-bit compiler key during the configuration as above.
+---
+**NOTE**
 
-#### Windows specific builds (CMake 3.15 or newer is required)
+The following builds require CMake version 3.15 or higher. 
 
-* Dynamic linkage with CRT: default behavior, can be explicitly specified by setting `CMAKE_MSVC_RUNTIME_LIBRARY`
-  to `MultiThreadedDLL` or `MultiThreadedDebugDLL`.
+---
 
+* **Dynamic linkage with C Runtime Library (CRT)**. The default behavior can be explicitly specified by setting `CMAKE_MSVC_RUNTIME_LIBRARY` to `MultiThreadedDLL` or `MultiThreadedDebugDLL`.
 ```bash
 cmake ..  # dynamic linkage is used by default
 ```
-
 ```bash
 cmake -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDLL ..
 ```
-
 ```bash
 cmake -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDebugDLL -DCMAKE_BUILD_TYPE=Debug ..
 ```
-
-* Static linkage with CRT: set `CMAKE_MSVC_RUNTIME_LIBRARY` to `MultiThreaded` or `MultiThreadedDebug`.
-
+* **Static linkage with CRT**. Set `CMAKE_MSVC_RUNTIME_LIBRARY` to `MultiThreaded` or `MultiThreadedDebug`.
 ```bash
 cmake -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded ..
 ```
-
 ```bash
 cmake -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDebug -DCMAKE_BUILD_TYPE=Debug ..
 ```
+* **Windows OS 10 Universal Windows application build**. Set `CMAKE_SYSTEM_NAME` to `WindowsStore` and `CMAKE_SYSTEM_VERSION` to `10.0`.
 
-* Windows 10 Universal Windows application build: set `CMAKE_SYSTEM_NAME` to `WindowsStore` and `CMAKE_SYSTEM_VERSION`
-  to `10.0`.
+---
+**NOTE**
 
-_Note: set `TBB_NO_APPCONTAINER` to `ON` in order to apply `/APPCONTAINER:NO` option during the compilation (used for
-testing)._
+Set `TBB_NO_APPCONTAINER` to `ON` to apply the `/APPCONTAINER:NO` option during the compilation (used for testing).
+
+---
 
 ```bash
 cmake -DCMAKE_SYSTEM_NAME:STRING=WindowsStore -DCMAKE_SYSTEM_VERSION:STRING=10.0 ..
 ```
 
-* Universal Windows Driver build: set `TBB_WINDOWS_DRIVER` to `ON` and use static linkage with CRT (see above).
+* **Universal Windows OS Driver build**. Set `TBB_WINDOWS_DRIVER` to `ON` and use static linkage with CRT.
 
 ```bash
 cmake -DTBB_WINDOWS_DRIVER=ON -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded ..
 ```
 
-### Test
+#### Example
 
-#### Build test
+```bash
+cmake -DCMAKE_CXX_COMPILER=icpc -DCMAKE_C_COMPILER=icc -DTBB_TEST=off -DCMAKE_HWLOC_1_11_LIBRARY_PATH=<path_to_hwloc_library_file>/libhwloc.so.15
+-DCMAKE_HWLOC_1_11_INCLUDE_PATH=<path_to_hwloc_header_directory> -DCMAKE_INSTALL_PREFIX=<path_to_install_oneTBB>/oneTBB_install ..
+make -j8 && make install
+```
 
-Using default ('all') target:
+---
+**NOTE**
 
+The library path points to a file, while the include path points to a directory and not to ``hwloc.h``.
+
+---
+
+### Test
+
+#### Build test
+To build a test, use the default target ``all``:
 ```
 cmake --build .
 ```
 
-or using specific test target:
-
+Or use a specific test target:
 ```
 cmake --build . --target <test> # e.g. test_version
 ```
 
-#### Run test
-
-Using CTest:
+#### Run Test
 
+You can run a test by using CTest:
 ```bash
 ctest
 ```
 
-or using 'test' target:
+Or by using the ``test`` target:
+```bash
+cmake --build . --target test # currently does not work on Windows* OS
+```
+
+## Installation
+See [Installation from Sources](../INSTALL.md) to learn how to install oneTBB.
 
+To install oneTBB from the release packages, use the following commands: 
 ```bash
-cmake --build . --target test # currently doesn't work on Windows
+tar -xvf oneapi-tbb-xxx.xx.x-*.tgz
+source env/vars.sh
 ```
 
-## Sanitizers - сonfigure, build and run
+
+## Sanitizers - Configure, Build, and Run
 
 ```bash
 mkdir build
@@ -180,14 +210,11 @@ make -j
 ctest -V
 ```
 
-## Valgrind memcheck - configure, build and run
+## Valgrind Memcheck - Configure, Build, and Run
 
 ### Prerequisites
-
 * Valgrind tool executable
-
 ### Example
-
 ```bash
 mkdir build
 cd build
@@ -195,7 +222,9 @@ cmake -DTBB_VALGRIND_MEMCHECK=ON ..
 make -j memcheck-<test name> # or memcheck-all to scan all tests 
 ```
 
-## Test specification (Doxygen)
+## Test Specification
+
+Use Doxygen* to generate oneTBB test specification:
 
 ```bash
 mkdir build
@@ -204,44 +233,14 @@ cmake -DTBB_TEST_SPEC=ON ..
 make test_spec
 ```
 
-## Intallation and packaging
-
-**NOTE: be careful about installation: avoid commands like `make install` unless you fully understand the
-consequences.**
+## TBBConfig - Integration of Binary Packages
 
-The following install components are supported:
+It is a configuration module that is used for the integration of prebuilt oneTBB. It consists of two files (``TBBConfig.cmake`` and ``TBBConfigVersion.cmake``) and can be used via the [find_package](https://cmake.org/cmake/help/latest/command/find_package.html) function.
 
-- `runtime` - oneTBB runtime package (core shared libraries and `.dll` files on Windows).
-- `devel` - oneTBB development package (header files, CMake integration files, library symbolic links and `.lib` files
-  on Windows).
-- `tbb4py` - [oneTBB Module for Python](#onetbb-python-module-support).
-
-How to install specific components after configuration and build:
-
-```bash
-cmake -DCOMPONENT=<component> [-DBUILD_TYPE=<build-type>] -P cmake_install.cmake
-```
-
-Simple packaging using CPack is supported. The following commands allow to create a simple portable package which
-includes header files, libraries and integration files for CMake:
-
-```bash
-cmake <options> ..
-cpack
-```
-
-## TBBConfig - integration of binary packages
-
-It is a configuration module that is used for integration of prebuilt oneTBB. It consists of two files (TBBConfig.cmake
-and TBBConfigVersion.cmake) and can be used
-via [find_package](https://cmake.org/cmake/help/latest/command/find_package.html) function.
-
-How to use this module in your CMake project:
-
-1. Let CMake know where to search for TBBConfig, e.g. specify location of TBBConfig.cmake in `TBB_DIR` (for more details
-   about search paths see [find_package](https://cmake.org/cmake/help/latest/command/find_package.html)).
-2. Use [find_package](https://cmake.org/cmake/help/latest/command/find_package.html) to find oneTBB.
-3. Use provided variables and/or imported targets (described below) to work with the found oneTBB.
+To use this module in your CMake project:
+ 1. Let CMake know where to search for TBBConfig, e.g. specify the location of ``TBBConfig.cmake`` in `TBB_DIR` (for more details about search paths, see [find_package](https://cmake.org/cmake/help/latest/command/find_package.html)).
+ 2. Use [find_package](https://cmake.org/cmake/help/latest/command/find_package.html) to find oneTBB.
+ 3. Use provided variables and/or imported targets (described below) to work with the found oneTBB.
 
 Example:
 
@@ -251,20 +250,17 @@ find_package(TBB)
 target_link_libraries(foo TBB::tbb)
 ```
 
-oneTBB components can be passed to [find_package](https://cmake.org/cmake/help/latest/command/find_package.html) after
-keyword ``COMPONENTS`` or ``REQUIRED``. Use basic names of components (`tbb`, `tbbmalloc`, etc.).
+oneTBB components can be passed to [find_package](https://cmake.org/cmake/help/latest/command/find_package.html) after keyword ``COMPONENTS`` or ``REQUIRED``.
+Use basic names of components (`tbb`, `tbbmalloc`, etc.).
 
-If components are not specified then the default set is used: `tbb`, `tbbmalloc` and ``tbbmalloc_proxy``.
+If components are not specified, then the default set is used: `tbb`, `tbbmalloc`, and ``tbbmalloc_proxy``.
 
-If `tbbmalloc_proxy` is requested, `tbbmalloc` component will also be added and set as dependency for `tbbmalloc_proxy`.
+If `tbbmalloc_proxy` is requested, the `tbbmalloc` component is also added and set as a dependency for `tbbmalloc_proxy`.
 
-TBBConfig
-creates [imported targets](https://cmake.org/cmake/help/latest/manual/cmake-buildsystem.7.html#imported-targets>) as
-shared libraries using the following format: `TBB::<component>` (for example, `TBB::tbb`, `TBB::tbbmalloc`).
+TBBConfig creates [imported targets](https://cmake.org/cmake/help/latest/manual/cmake-buildsystem.7.html#imported-targets>) as
+shared libraries using the following format: `TBB::<component>`. For example, `TBB::tbb` or `TBB::tbbmalloc`.
 
-Set `TBB_FIND_RELEASE_ONLY` to `TRUE` before calling `find_package` in order to search only for release oneTBB version.
-This variable helps to avoid simultaneous linkage of release and debug oneTBB versions when CMake configuration
-is `Debug` but a third-party component depends on release oneTBB version.
+To search only for release oneTBB version, set `TBB_FIND_RELEASE_ONLY` to `TRUE` before calling `find_package`. This variable helps to avoid simultaneous linkage of release and debug oneTBB versions when CMake configuration is `Debug,` but a third-party component depends on the release oneTBB version.
 
 Variables set during TBB configuration:
 
@@ -275,72 +271,65 @@ Variable | Description
 `TBB_VERSION`           | oneTBB version (format: `<major>.<minor>.<patch>.<tweak>`)
 `TBB_IMPORTED_TARGETS`  | All created oneTBB imported targets (not supported for builds from source code)
 
-Starting from [oneTBB 2021.1](https://github.com/oneapi-src/oneTBB/releases/tag/v2021.1) GitHub release TBBConfig files
-in the binary packages are located under `<tbb-root>/lib/cmake/TBB`. For example, `TBB_DIR` should be set
-to `<tbb-root>/lib/cmake/TBB`.
+Starting from [oneTBB 2021.1](https://github.com/uxlfoundation/oneTBB/releases/tag/v2021.1), GitHub* release TBBConfig files in the binary packages are located under `<tbb-root>/lib/cmake/TBB`.
+For example, `TBB_DIR` should be set to `<tbb-root>/lib/cmake/TBB`.
 
-TBBConfig files are automatically created during the build from source code and can be installed together with the
-library. Also oneTBB provides a helper function that creates TBBConfig files from predefined templates:
-see `tbb_generate_config` in `cmake/config_generation.cmake`.
+TBBConfig files are automatically created during the build from source code and can be installed together with the library.
+Also, oneTBB provides a helper function that creates TBBConfig files from predefined templates. See `tbb_generate_config` in `cmake/config_generation.cmake`.
 
-## oneTBB Python Module support
-
-`TBB4PY_BUILD` Cmake option provides ability to build Python module for oneTBB.
+## oneTBB Python Module Support
+The `TBB4PY_BUILD` Cmake option provides the ability to build a Python module for oneTBB.
 
 ### Targets:
-
-- `irml` - build IPC RML server
-- `python_build` - build oneTBB module for Python
+ - `irml` - build IPC RML server
+ - `python_build` - build oneTBB module for Python
 
 `python_build` target requirements:
+ - Python version 3.5 or newer
+ - SWIG version 3.0.6 or newer
 
-- Python version 3.5 or newer
-- SWIG version 3.0.6 or newer
-
-## CMake files
+## CMake Files
 
-### Compile/link options
+### Compile and Link Options
 
 Compile and link options may be specific for certain compilers. This part is handled in `cmake/compilers/*` files.
 
 Options in TBB CMake are handled via variables in two ways for convenience:
 
-* by options group
-* by specific option
+*  by options group
+*  by the specific option
 
-#### Options group
+#### Options Group
 
-Naming convention is the following: `TBB_<SCOPE>_<STAGE>_<CATEGORY>`, where
+Naming convention is the following: `TBB_<SCOPE>_<STAGE>_<CATEGORY>`, where:
 
-* `<SCOPE>` could be
-  * `LIB` - options applied during libraries build.
-  * `TEST` - options applied during test build.
-  * `BENCH` - options applied during benchmarks build.
-  * `COMMON` - options applied during all (libraries, test, benchmarks) builds.
-* `<STAGE>` could be
-  * `COMPILE` - options applied during the compilation.
-  * `LINK` - options applied during the linkage.
-* `<CATEGORY>` could be
-  * `FLAGS` - list of flags
-  * `LIBS` - list of libraries
+*  `<SCOPE>` can be:
+    *  `LIB` - options applied during libraries build.
+    *  `TEST` - options applied during test build.
+    *  `BENCH` - options applied during benchmarks build.
+    *  `COMMON` - options applied during all (libraries, test, benchmarks) builds.
+*  `<STAGE>` can be:
+    *  `COMPILE` - options applied during the compilation.
+    *  `LINK` - options applied during the linkage.
+*  `<CATEGORY>` can be:
+    *  `FLAGS` - list of flags
+    *  `LIBS` - list of libraries
 
 *Examples*
 
 Variable | Description
 --- | ---
-`TBB_COMMON_COMPILE_FLAGS` | Applied to libraries, tests and benchmarks as compile options
+`TBB_COMMON_COMPILE_FLAGS` | Applied to libraries, tests, and benchmarks as compile options
 `TBB_LIB_LINK_FLAGS`       | Applied to libraries as link options
 `TBB_LIB_LINK_LIBS `       | Applied to libraries as link libraries
 `TBB_TEST_COMPILE_FLAGS`   | Applied to tests as compile options
 
-Please specify the `LINK` options prefixed with dash(-) for MSVC(Visual Studio) compiler with CMake < 3.13 to avoid
-issues caused by `target_link_libraries` CMake command usage.
+Specify the `LINK` options prefixed with a dash(-) for MSVC(Visual Studio) compiler with CMake < 3.13 to avoid issues caused by `target_link_libraries` CMake command usage.
 
-#### Specific options
+#### Specific Options
 
-If the option used only in part of the places (library, tests, benchmarks) as well as adding this option to the group of
-other options is not possible, then the option must be named using common sense.
+If the option is used only in part of the places (library, tests, benchmarks) and adding this option to the group of other options is not possible,
+then the option must be named using common sense.
 
-Warnings supperssions should be added into `TBB_WARNING_SUPPRESS` variable which is applied during the compilation of
-libraries, tests and benchmarks. Additional warnings should be added into `TBB_WARNING_TEST_FLAGS` variable which is
-applied during the compilation of tests.
+Warning suppressions should be added to the `TBB_WARNING_SUPPRESS` variable, which is applied during the compilation of libraries, tests, and benchmarks.
+Additional warnings should be added to the `TBB_WARNING_TEST_FLAGS` variable, which is applied during the compilation of tests.
diff --git a/external/tbb/cmake/android/environment.cmake b/external/tbb/cmake/android/environment.cmake
index 57358f1a..c209dfc5 100644
--- a/external/tbb/cmake/android/environment.cmake
+++ b/external/tbb/cmake/android/environment.cmake
@@ -17,19 +17,19 @@ set(ANDROID_DEVICE_TESTING_DIRECTORY "/data/local/tmp/tbb_testing")
 find_program(adb_executable adb)
 if (NOT adb_executable)
     message(FATAL_ERROR "Could not find adb")
-endif ()
+endif()
 
 macro(execute_on_device cmd)
     execute_process(COMMAND ${adb_executable} shell ${cmd} RESULT_VARIABLE CMD_RESULT)
     if (CMD_RESULT)
         message(FATAL_ERROR "Error while on device execution: ${cmd} error_code: ${CMD_RESULT}")
-    endif ()
+    endif()
 endmacro()
 
 macro(transfer_data data_path)
     execute_process(COMMAND ${adb_executable} push --sync ${data_path} ${ANDROID_DEVICE_TESTING_DIRECTORY}
-            RESULT_VARIABLE CMD_RESULT OUTPUT_QUIET)
+                    RESULT_VARIABLE CMD_RESULT OUTPUT_QUIET)
     if (CMD_RESULT)
         message(FATAL_ERROR "Error while data transferring: ${data_path} error_code: ${CMD_RESULT}")
-    endif ()
+    endif()
 endmacro()
diff --git a/external/tbb/cmake/android/test_launcher.cmake b/external/tbb/cmake/android/test_launcher.cmake
index d993fa37..843d9bef 100644
--- a/external/tbb/cmake/android/test_launcher.cmake
+++ b/external/tbb/cmake/android/test_launcher.cmake
@@ -17,10 +17,10 @@ include(${CMAKE_CURRENT_LIST_DIR}/environment.cmake)
 # transfer data to device
 execute_on_device("mkdir -m 755 -p ${ANDROID_DEVICE_TESTING_DIRECTORY}")
 
-file(GLOB_RECURSE BINARIES_LIST "${BINARIES_PATH}/*.so*" "${BINARIES_PATH}/${TEST_NAME}")
-foreach (BINARY_FILE ${BINARIES_LIST})
+file (GLOB_RECURSE BINARIES_LIST "${BINARIES_PATH}/*.so*" "${BINARIES_PATH}/${TEST_NAME}")
+foreach(BINARY_FILE ${BINARIES_LIST})
     transfer_data(${BINARY_FILE})
-endforeach ()
+endforeach()
 
 # execute binary
 execute_on_device("chmod -R 755 ${ANDROID_DEVICE_TESTING_DIRECTORY}")
diff --git a/external/tbb/cmake/compilers/AppleClang.cmake b/external/tbb/cmake/compilers/AppleClang.cmake
index 4c356e9f..9cf0b086 100644
--- a/external/tbb/cmake/compilers/AppleClang.cmake
+++ b/external/tbb/cmake/compilers/AppleClang.cmake
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Intel Corporation
+# Copyright (c) 2020-2024 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -24,16 +24,26 @@ set(TBB_COMMON_COMPILE_FLAGS -D_XOPEN_SOURCE)
 # Don't add -MMD to avoid conflicts in such cases.
 if (NOT CMAKE_GENERATOR MATCHES "Ninja" AND NOT CMAKE_CXX_DEPENDS_USE_COMPILER)
     set(TBB_MMD_FLAG -MMD)
-endif ()
+endif()
 
 # Ignore -Werror set through add_compile_options() or added to CMAKE_CXX_FLAGS if TBB_STRICT is disabled.
 if (NOT TBB_STRICT AND COMMAND tbb_remove_compile_flag)
     tbb_remove_compile_flag(-Werror)
-endif ()
+endif()
+
+# Enable Intel(R) Transactional Synchronization Extensions (-mrtm) and WAITPKG instructions support (-mwaitpkg) on relevant processors
+if (CMAKE_OSX_ARCHITECTURES)
+    set(_tbb_target_architectures "${CMAKE_OSX_ARCHITECTURES}")
+else()
+    set(_tbb_target_architectures "${CMAKE_SYSTEM_PROCESSOR}")
+endif()
+if ("${_tbb_target_architectures}" MATCHES "(x86_64|amd64|AMD64)") # OSX systems are 64-bit only
+    set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -mrtm $<$<NOT:$<VERSION_LESS:${CMAKE_CXX_COMPILER_VERSION},12.0>>:-mwaitpkg>)
+endif()
+unset(_tbb_target_architectures)
 
-# Enable Intel(R) Transactional Synchronization Extensions (-mrtm) on relevant processors
-if (NOT "${CMAKE_OSX_ARCHITECTURES}" MATCHES "^arm64$" AND CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64|AMD64)") # OSX systems are 64-bit only
-    set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -mrtm)
+if (TBB_FILE_TRIM AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 10)
+    set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -ffile-prefix-map=${NATIVE_TBB_PROJECT_ROOT_DIR}/= -ffile-prefix-map=${NATIVE_TBB_RELATIVE_BIN_PATH}/=)
 endif ()
 
 # TBB malloc settings
diff --git a/external/tbb/cmake/compilers/Clang.cmake b/external/tbb/cmake/compilers/Clang.cmake
index 82f37803..a0297faa 100644
--- a/external/tbb/cmake/compilers/Clang.cmake
+++ b/external/tbb/cmake/compilers/Clang.cmake
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Intel Corporation
+# Copyright (c) 2020-2024 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,6 +12,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+if (EMSCRIPTEN)
+    set(TBB_EMSCRIPTEN 1)
+    set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -fexceptions)
+    set(TBB_TEST_LINK_FLAGS  ${TBB_COMMON_LINK_FLAGS} -fexceptions -sINITIAL_MEMORY=65536000 -sALLOW_MEMORY_GROWTH=1 -sMALLOC=mimalloc -sEXIT_RUNTIME=1)
+    if (NOT EMSCRIPTEN_WITHOUT_PTHREAD)
+        set_property(TARGET Threads::Threads PROPERTY INTERFACE_LINK_LIBRARIES "-pthread")
+    endif()
+    set(TBB_EMSCRIPTEN_STACK_SIZE 65536)
+    set(TBB_LIB_COMPILE_FLAGS -D__TBB_EMSCRIPTEN_STACK_SIZE=${TBB_EMSCRIPTEN_STACK_SIZE})
+    set(TBB_TEST_LINK_FLAGS ${TBB_TEST_LINK_FLAGS} -sTOTAL_STACK=${TBB_EMSCRIPTEN_STACK_SIZE})
+    unset(TBB_EMSCRIPTEN_STACK_SIZE)
+endif()
+
 if (MINGW)
     set(TBB_LINK_DEF_FILE_FLAG "")
     set(TBB_DEF_FILE_PREFIX "")
@@ -24,16 +37,17 @@ elseif (APPLE)
 elseif (MSVC)
     include(${CMAKE_CURRENT_LIST_DIR}/MSVC.cmake)
     return()
-else ()
+else()
     set(TBB_LINK_DEF_FILE_FLAG -Wl,--version-script=)
     set(TBB_DEF_FILE_PREFIX lin${TBB_ARCH})
-endif ()
+    set(TBB_TEST_COMPILE_FLAGS ${TBB_TEST_COMPILE_FLAGS} $<$<NOT:$<VERSION_LESS:${CMAKE_CXX_COMPILER_VERSION},10.0>>:-ffp-model=precise>)
+endif()
 
 # Depfile options (e.g. -MD) are inserted automatically in some cases.
 # Don't add -MMD to avoid conflicts in such cases.
 if (NOT CMAKE_GENERATOR MATCHES "Ninja" AND NOT CMAKE_CXX_DEPENDS_USE_COMPILER)
     set(TBB_MMD_FLAG -MMD)
-endif ()
+endif()
 
 set(TBB_WARNING_LEVEL -Wall -Wextra $<$<BOOL:${TBB_STRICT}>:-Werror>)
 set(TBB_TEST_WARNING_FLAGS -Wshadow -Wcast-qual -Woverloaded-virtual -Wnon-virtual-dtor)
@@ -41,29 +55,37 @@ set(TBB_TEST_WARNING_FLAGS -Wshadow -Wcast-qual -Woverloaded-virtual -Wnon-virtu
 # Ignore -Werror set through add_compile_options() or added to CMAKE_CXX_FLAGS if TBB_STRICT is disabled.
 if (NOT TBB_STRICT AND COMMAND tbb_remove_compile_flag)
     tbb_remove_compile_flag(-Werror)
-endif ()
+endif()
 
 # Enable Intel(R) Transactional Synchronization Extensions (-mrtm) and WAITPKG instructions support (-mwaitpkg) on relevant processors
-if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64)")
+if (CMAKE_SYSTEM_PROCESSOR MATCHES "(AMD64|amd64|i.86|x86)" AND NOT EMSCRIPTEN)
     set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -mrtm $<$<NOT:$<VERSION_LESS:${CMAKE_CXX_COMPILER_VERSION},12.0>>:-mwaitpkg>)
-endif ()
+endif()
+
+# Clang flags to prevent compiler from optimizing out security checks
+set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -Wformat -Wformat-security -Werror=format-security -fPIC $<$<NOT:$<BOOL:${EMSCRIPTEN}>>:-fstack-protector-strong>)
+
+# -z switch is not supported on MacOS
+if (NOT APPLE)
+    set(TBB_LIB_LINK_FLAGS ${TBB_LIB_LINK_FLAGS} -Wl,-z,relro,-z,now)
+endif()
 
 set(TBB_COMMON_LINK_LIBS ${CMAKE_DL_LIBS})
 
-if (ANDROID_PLATFORM)
-    set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} $<$<NOT:$<CONFIG:Debug>>:-D_FORTIFY_SOURCE=2>)
+if (NOT CMAKE_CXX_FLAGS MATCHES "_FORTIFY_SOURCE")
+  set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} $<$<NOT:$<CONFIG:Debug>>:-D_FORTIFY_SOURCE=2>)
 endif ()
 
 if (MINGW)
     list(APPEND TBB_COMMON_COMPILE_FLAGS -U__STRICT_ANSI__)
-endif ()
+endif()
 
-# Enabling LTO on Android causes the NDK bug.
-# NDK throws the warning: "argument unused during compilation: '-Wa,--noexecstack'"
-if (NOT ANDROID_PLATFORM AND BUILD_SHARED_LIBS)
-    set(TBB_IPO_COMPILE_FLAGS $<$<NOT:$<CONFIG:Debug>>:-flto>)
-    set(TBB_IPO_LINK_FLAGS $<$<NOT:$<CONFIG:Debug>>:-flto>)
+if (TBB_FILE_TRIM AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 10)
+    set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -ffile-prefix-map=${NATIVE_TBB_PROJECT_ROOT_DIR}/= -ffile-prefix-map=${NATIVE_TBB_RELATIVE_BIN_PATH}/=)
 endif ()
 
+set(TBB_IPO_COMPILE_FLAGS $<$<NOT:$<CONFIG:Debug>>:-flto>)
+set(TBB_IPO_LINK_FLAGS $<$<NOT:$<CONFIG:Debug>>:-flto>)
+
 # TBB malloc settings
 set(TBBMALLOC_LIB_COMPILE_FLAGS -fno-rtti -fno-exceptions)
diff --git a/external/tbb/cmake/compilers/GNU.cmake b/external/tbb/cmake/compilers/GNU.cmake
index dd7911cc..da6b408a 100644
--- a/external/tbb/cmake/compilers/GNU.cmake
+++ b/external/tbb/cmake/compilers/GNU.cmake
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Intel Corporation
+# Copyright (c) 2020-2024 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,10 +21,10 @@ elseif (APPLE)
 
     # For correct ucontext.h structures layout
     set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -D_XOPEN_SOURCE)
-else ()
+else()
     set(TBB_LINK_DEF_FILE_FLAG -Wl,--version-script=)
     set(TBB_DEF_FILE_PREFIX lin${TBB_ARCH})
-endif ()
+endif()
 
 set(TBB_WARNING_LEVEL -Wall -Wextra $<$<BOOL:${TBB_STRICT}>:-Werror> -Wfatal-errors)
 set(TBB_TEST_WARNING_FLAGS -Wshadow -Wcast-qual -Woverloaded-virtual -Wnon-virtual-dtor)
@@ -33,40 +33,88 @@ set(TBB_TEST_WARNING_FLAGS -Wshadow -Wcast-qual -Woverloaded-virtual -Wnon-virtu
 # Don't add -MMD to avoid conflicts in such cases.
 if (NOT CMAKE_GENERATOR MATCHES "Ninja" AND NOT CMAKE_CXX_DEPENDS_USE_COMPILER)
     set(TBB_MMD_FLAG -MMD)
-endif ()
+endif()
+
+
+# Binutils < 2.31.1 do not support the tpause instruction. When compiling with
+# a modern version of GCC (supporting it) but relying on an outdated assembler,
+# will result in an error reporting "no such instruction: tpause".
+# The following code invokes the GNU assembler to extract the version number
+# and convert it to an integer that can be used in the C++ code to compare
+# against, and conditionally disable the __TBB_WAITPKG_INTRINSICS_PRESENT
+# macro if the version is incompatible. Binutils only report the version in the
+# MAJOR.MINOR format, therefore the version checked is >=2.32 (instead of
+# >=2.31.1). Capturing the output in CMake can be done like below. The version
+# information is written to either stdout or stderr. To not make any
+# assumptions, both are captured.
+execute_process(
+    COMMAND ${CMAKE_COMMAND} -E env "LANG=C" ${CMAKE_CXX_COMPILER} -xc -c /dev/null -Wa,-v -o/dev/null
+    OUTPUT_VARIABLE ASSEMBLER_VERSION_LINE_OUT
+    ERROR_VARIABLE ASSEMBLER_VERSION_LINE_ERR
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+    ERROR_STRIP_TRAILING_WHITESPACE
+)
+set(ASSEMBLER_VERSION_LINE ${ASSEMBLER_VERSION_LINE_OUT}${ASSEMBLER_VERSION_LINE_ERR})
+string(REGEX REPLACE ".*GNU assembler version ([0-9]+)\\.([0-9]+).*" "\\1" _tbb_gnu_asm_major_version "${ASSEMBLER_VERSION_LINE}")
+string(REGEX REPLACE ".*GNU assembler version ([0-9]+)\\.([0-9]+).*" "\\2" _tbb_gnu_asm_minor_version "${ASSEMBLER_VERSION_LINE}")
+unset(ASSEMBLER_VERSION_LINE_OUT)
+unset(ASSEMBLER_VERSION_LINE_ERR)
+unset(ASSEMBLER_VERSION_LINE)
+message(TRACE "Extracted GNU assembler version: major=${_tbb_gnu_asm_major_version} minor=${_tbb_gnu_asm_minor_version}")
+
+math(EXPR _tbb_gnu_asm_version_number  "${_tbb_gnu_asm_major_version} * 1000 + ${_tbb_gnu_asm_minor_version}")
+set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} "-D__TBB_GNU_ASM_VERSION=${_tbb_gnu_asm_version_number}")
+message(STATUS "GNU Assembler version: ${_tbb_gnu_asm_major_version}.${_tbb_gnu_asm_minor_version}  (${_tbb_gnu_asm_version_number})")
 
 # Enable Intel(R) Transactional Synchronization Extensions (-mrtm) and WAITPKG instructions support (-mwaitpkg) on relevant processors
-if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64)")
+if (CMAKE_SYSTEM_PROCESSOR MATCHES "(AMD64|amd64|i.86|x86)" AND NOT EMSCRIPTEN)
     set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -mrtm $<$<AND:$<NOT:$<CXX_COMPILER_ID:Intel>>,$<NOT:$<VERSION_LESS:${CMAKE_CXX_COMPILER_VERSION},11.0>>>:-mwaitpkg>)
-endif ()
+endif()
 
-if (NOT MINGW)
-    set(TBB_COMMON_LINK_LIBS dl)
-endif ()
+set(TBB_COMMON_LINK_LIBS ${CMAKE_DL_LIBS})
 
 # Ignore -Werror set through add_compile_options() or added to CMAKE_CXX_FLAGS if TBB_STRICT is disabled.
 if (NOT TBB_STRICT AND COMMAND tbb_remove_compile_flag)
     tbb_remove_compile_flag(-Werror)
-endif ()
+endif()
 
 if (NOT ${CMAKE_CXX_COMPILER_ID} STREQUAL Intel)
     # gcc 6.0 and later have -flifetime-dse option that controls elimination of stores done outside the object lifetime
     set(TBB_DSE_FLAG $<$<NOT:$<VERSION_LESS:${CMAKE_CXX_COMPILER_VERSION},6.0>>:-flifetime-dse=1>)
-endif ()
+    set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} $<$<NOT:$<VERSION_LESS:${CMAKE_CXX_COMPILER_VERSION},8.0>>:-fstack-clash-protection>)
+
+    # Suppress GCC 12.x-14.x warning here that to_wait_node(n)->my_is_in_list might have size 0
+    set(TBB_COMMON_LINK_FLAGS ${TBB_COMMON_LINK_FLAGS} $<$<AND:$<NOT:$<VERSION_LESS:${CMAKE_CXX_COMPILER_VERSION},12.0>>,$<VERSION_LESS:${CMAKE_CXX_COMPILER_VERSION},15.0>>:-Wno-stringop-overflow>)
+endif()
 
 # Workaround for heavy tests and too many symbols in debug (rellocation truncated to fit: R_MIPS_CALL16)
 if ("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "mips")
-    set(TBB_TEST_COMPILE_FLAGS ${TBB_TEST_COMPILE_FLAGS} -DTBB_TEST_LOW_WORKLOAD $<$<CONFIG:DEBUG>:-mxgot>)
+    set(TBB_TEST_COMPILE_FLAGS ${TBB_TEST_COMPILE_FLAGS} -DTBB_TEST_LOW_WORKLOAD $<$<CONFIG:DEBUG>:-fPIE -mxgot>)
+    set(TBB_TEST_LINK_FLAGS ${TBB_TEST_LINK_FLAGS} $<$<CONFIG:DEBUG>:-pie>)
+endif()
+
+set(TBB_IPO_COMPILE_FLAGS $<$<NOT:$<CONFIG:Debug>>:-flto>)
+set(TBB_IPO_LINK_FLAGS $<$<NOT:$<CONFIG:Debug>>:-flto>)
+
+
+if (MINGW AND CMAKE_SYSTEM_PROCESSOR MATCHES "i.86")
+    list (APPEND TBB_COMMON_COMPILE_FLAGS -msse2)
 endif ()
 
-if (MINGW)
-    list(APPEND TBB_COMMON_COMPILE_FLAGS -U__STRICT_ANSI__)
+# Gnu flags to prevent compiler from optimizing out security checks
+set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -fno-strict-overflow -fno-delete-null-pointer-checks -fwrapv)
+set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -Wformat -Wformat-security -Werror=format-security
+    -fstack-protector-strong )
+# -z switch is not supported on MacOS and MinGW
+if (NOT APPLE AND NOT MINGW)
+    set(TBB_LIB_LINK_FLAGS ${TBB_LIB_LINK_FLAGS} -Wl,-z,relro,-z,now,-z,noexecstack)
+endif()
+if (NOT CMAKE_CXX_FLAGS MATCHES "_FORTIFY_SOURCE")
+  set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} $<$<NOT:$<CONFIG:Debug>>:-D_FORTIFY_SOURCE=2> )
 endif ()
 
-# For some reason GCC does not instrument code with Thread Sanitizer when lto is enabled and C linker is used.
-if (NOT TBB_SANITIZE MATCHES "thread")
-    set(TBB_IPO_COMPILE_FLAGS $<$<NOT:$<CONFIG:Debug>>:-flto>)
-    set(TBB_IPO_LINK_FLAGS $<$<NOT:$<CONFIG:Debug>>:-flto>)
+if (TBB_FILE_TRIM AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8)
+    set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -ffile-prefix-map=${NATIVE_TBB_PROJECT_ROOT_DIR}/= -ffile-prefix-map=${NATIVE_TBB_RELATIVE_BIN_PATH}/=)
 endif ()
 
 # TBB malloc settings
diff --git a/external/tbb/cmake/compilers/Intel.cmake b/external/tbb/cmake/compilers/Intel.cmake
index 58c07541..531e078e 100644
--- a/external/tbb/cmake/compilers/Intel.cmake
+++ b/external/tbb/cmake/compilers/Intel.cmake
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Intel Corporation
+# Copyright (c) 2020-2024 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,16 +21,18 @@ if (MSVC)
 elseif (APPLE)
     include(${CMAKE_CURRENT_LIST_DIR}/AppleClang.cmake)
     set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -fstack-protector -Wformat -Wformat-security
-            $<$<NOT:$<CONFIG:Debug>>:-fno-omit-frame-pointer -qno-opt-report-embed -D_FORTIFY_SOURCE=2>)
+                                 $<$<NOT:$<CONFIG:Debug>>:-fno-omit-frame-pointer -qno-opt-report-embed>)
+    if (NOT CMAKE_CXX_FLAGS MATCHES "_FORTIFY_SOURCE")
+        set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} $<$<NOT:$<CONFIG:Debug>>:-D_FORTIFY_SOURCE=2>)
+    endif ()
+
     set(TBB_OPENMP_FLAG -qopenmp)
     set(TBB_IPO_COMPILE_FLAGS $<$<NOT:$<CONFIG:Debug>>:-ipo>)
-else ()
+else()
     include(${CMAKE_CURRENT_LIST_DIR}/GNU.cmake)
-    set(TBB_LIB_LINK_FLAGS ${TBB_LIB_LINK_FLAGS} -static-intel -Wl,-z,relro,-z,now,)
-    set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -fstack-protector -Wformat -Wformat-security
-            $<$<NOT:$<CONFIG:Debug>>:-qno-opt-report-embed -D_FORTIFY_SOURCE=2>
-            $<$<EQUAL:${TBB_ARCH},32>:-falign-stack=maintain-16-byte>)
+    set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} $<$<EQUAL:${TBB_ARCH},32>:-falign-stack=maintain-16-byte>)
+    set(TBB_LIB_LINK_FLAGS ${TBB_LIB_LINK_FLAGS} -static-intel)
     set(TBB_OPENMP_FLAG -qopenmp)
     set(TBB_IPO_COMPILE_FLAGS $<$<NOT:$<CONFIG:Debug>>:-ipo>)
-endif ()
+endif()
 set(TBB_IPO_LINK_FLAGS ${TBB_IPO_LINK_FLAGS} ${TBB_IPO_COMPILE_FLAGS})
diff --git a/external/tbb/cmake/compilers/IntelLLVM.cmake b/external/tbb/cmake/compilers/IntelLLVM.cmake
index b42a9df6..b5143781 100644
--- a/external/tbb/cmake/compilers/IntelLLVM.cmake
+++ b/external/tbb/cmake/compilers/IntelLLVM.cmake
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Intel Corporation
+# Copyright (c) 2020-2024 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,10 +14,15 @@
 
 if (WIN32)
     include(${CMAKE_CURRENT_LIST_DIR}/MSVC.cmake)
+    set(TBB_OPENMP_FLAG /Qopenmp)
     set(TBB_IPO_COMPILE_FLAGS $<$<NOT:$<CONFIG:Debug>>:/Qipo>)
     set(TBB_IPO_LINK_FLAGS $<$<NOT:$<CONFIG:Debug>>:/INCREMENTAL:NO>)
-else ()
+else()
     include(${CMAKE_CURRENT_LIST_DIR}/Clang.cmake)
     set(TBB_IPO_COMPILE_FLAGS $<$<NOT:$<CONFIG:Debug>>:-ipo>)
-endif ()
+     # "--exclude-libs,ALL" is used to avoid accidental exporting of symbols
+    #  from statically linked libraries
+    set(TBB_LIB_LINK_FLAGS ${TBB_LIB_LINK_FLAGS} -static-intel -Wl,--exclude-libs,ALL)
+    set(TBB_OPENMP_FLAG -qopenmp)
+endif()
 set(TBB_IPO_LINK_FLAGS ${TBB_IPO_LINK_FLAGS} ${TBB_IPO_COMPILE_FLAGS})
diff --git a/external/tbb/cmake/compilers/MSVC.cmake b/external/tbb/cmake/compilers/MSVC.cmake
index 893e8077..07cdc271 100644
--- a/external/tbb/cmake/compilers/MSVC.cmake
+++ b/external/tbb/cmake/compilers/MSVC.cmake
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Intel Corporation
+# Copyright (c) 2020-2025 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -24,32 +24,38 @@ set(TBB_WARNING_LEVEL $<$<NOT:$<CXX_COMPILER_ID:Intel>>:/W4> $<$<BOOL:${TBB_STRI
 # Warning suppression C4324: structure was padded due to alignment specifier
 set(TBB_WARNING_SUPPRESS /wd4324)
 
-set(TBB_TEST_COMPILE_FLAGS /bigobj)
+set(TBB_TEST_COMPILE_FLAGS ${TBB_TEST_COMPILE_FLAGS} /bigobj)
 if (MSVC_VERSION LESS_EQUAL 1900)
     # Warning suppression C4503 for VS2015 and earlier:
     # decorated name length exceeded, name was truncated.
     # More info can be found at
     # https://docs.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-1-c4503
     set(TBB_TEST_COMPILE_FLAGS ${TBB_TEST_COMPILE_FLAGS} /wd4503)
-endif ()
+endif()
 set(TBB_LIB_COMPILE_FLAGS -D_CRT_SECURE_NO_WARNINGS /GS)
-set(TBB_COMMON_COMPILE_FLAGS /volatile:iso /FS /EHsc)
+set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} /volatile:iso /FS /EHsc)
+
+set(TBB_LIB_LINK_FLAGS ${TBB_LIB_LINK_FLAGS} /DEPENDENTLOADFLAG:0x2000 /DYNAMICBASE /NXCOMPAT)
+
+if (TBB_ARCH EQUAL 32)
+    set(TBB_LIB_LINK_FLAGS ${TBB_LIB_LINK_FLAGS} /SAFESEH )
+endif()
 
 # Ignore /WX set through add_compile_options() or added to CMAKE_CXX_FLAGS if TBB_STRICT is disabled.
 if (NOT TBB_STRICT AND COMMAND tbb_remove_compile_flag)
     tbb_remove_compile_flag(/WX)
-endif ()
+endif()
 
 if (WINDOWS_STORE OR TBB_WINDOWS_DRIVER)
     set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} /D_WIN32_WINNT=0x0A00)
     set(TBB_COMMON_LINK_FLAGS -NODEFAULTLIB:kernel32.lib -INCREMENTAL:NO)
     set(TBB_COMMON_LINK_LIBS OneCore.lib)
-endif ()
+endif()
 
 if (WINDOWS_STORE)
     if (NOT CMAKE_SYSTEM_VERSION EQUAL 10.0)
         message(FATAL_ERROR "CMAKE_SYSTEM_VERSION must be equal to 10.0")
-    endif ()
+    endif()
 
     set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} /ZW /ZW:nostdlib)
 
@@ -58,8 +64,8 @@ if (WINDOWS_STORE)
 
     if (TBB_NO_APPCONTAINER)
         set(TBB_LIB_LINK_FLAGS ${TBB_LIB_LINK_FLAGS} -APPCONTAINER:NO)
-    endif ()
-endif ()
+    endif()
+endif()
 
 if (TBB_WINDOWS_DRIVER)
     # Since this is universal driver disable this variable
@@ -69,17 +75,29 @@ if (TBB_WINDOWS_DRIVER)
     set(CMAKE_CXX_STANDARD_LIBRARIES "")
 
     set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} /D _UNICODE /DUNICODE /DWINAPI_FAMILY=WINAPI_FAMILY_APP /D__WRL_NO_DEFAULT_LIB__)
-endif ()
+endif()
+
+if (TBB_FILE_TRIM AND NOT CMAKE_CXX_COMPILER_ID MATCHES "(Intel|IntelLLVM|Clang)")
+    add_compile_options(
+        "$<$<COMPILE_LANGUAGE:CXX>:/d1trimfile:${NATIVE_TBB_PROJECT_ROOT_DIR}\\>"
+        "$<$<COMPILE_LANGUAGE:CXX>:/d1trimfile:${CMAKE_SOURCE_DIR}/>")
+endif()
+
+if (TBB_CONTROL_FLOW_GUARD)
+    set(TBB_LIB_COMPILE_FLAGS ${TBB_LIB_COMPILE_FLAGS} /guard:cf)
+    set(TBB_LIB_LINK_FLAGS ${TBB_LIB_LINK_FLAGS} /guard:cf)
+endif()
 
 if (CMAKE_CXX_COMPILER_ID MATCHES "(Clang|IntelLLVM)")
-    if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64)")
+    if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64|i.86)")
         set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -mrtm -mwaitpkg)
-    endif ()
-    set(TBB_OPENMP_NO_LINK_FLAG TRUE)
+    endif()
     set(TBB_IPO_COMPILE_FLAGS $<$<NOT:$<CONFIG:Debug>>:-flto>)
-else ()
+    set(TBB_IPO_LINK_FLAGS $<$<NOT:$<CONFIG:Debug>>:-flto>)
+else()
     set(TBB_IPO_COMPILE_FLAGS $<$<NOT:$<CONFIG:Debug>>:/GL>)
     set(TBB_IPO_LINK_FLAGS $<$<NOT:$<CONFIG:Debug>>:-LTCG> $<$<NOT:$<CONFIG:Debug>>:-INCREMENTAL:NO>)
-endif ()
+endif()
 
 set(TBB_OPENMP_FLAG /openmp)
+set(TBB_OPENMP_NO_LINK_FLAG TRUE) # TBB_OPENMP_FLAG will be used only on compilation but not on linkage
diff --git a/external/tbb/cmake/config_generation.cmake b/external/tbb/cmake/config_generation.cmake
index 103b1335..e4ef7bce 100644
--- a/external/tbb/cmake/config_generation.cmake
+++ b/external/tbb/cmake/config_generation.cmake
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Intel Corporation
+# Copyright (c) 2020-2023 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,15 +19,15 @@ set(_tbb_gen_cfg_path ${CMAKE_CURRENT_LIST_DIR})
 include(CMakeParseArguments)
 
 function(tbb_generate_config)
-    set(options HANDLE_SUBDIRS)
+    set(options      HANDLE_SUBDIRS)
     set(oneValueArgs INSTALL_DIR
-            SYSTEM_NAME
-            LIB_REL_PATH INC_REL_PATH DLL_REL_PATH
-            VERSION
-            TBB_BINARY_VERSION
-            TBBMALLOC_BINARY_VERSION
-            TBBMALLOC_PROXY_BINARY_VERSION
-            TBBBIND_BINARY_VERSION)
+                     SYSTEM_NAME
+                     LIB_REL_PATH INC_REL_PATH
+                     VERSION
+                     TBB_BINARY_VERSION
+                     TBBMALLOC_BINARY_VERSION
+                     TBBMALLOC_PROXY_BINARY_VERSION
+                     TBBBIND_BINARY_VERSION)
 
     cmake_parse_arguments(tbb_gen_cfg "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
 
@@ -35,7 +35,6 @@ function(tbb_generate_config)
     file(MAKE_DIRECTORY ${config_install_dir})
 
     file(TO_CMAKE_PATH "${tbb_gen_cfg_LIB_REL_PATH}" TBB_LIB_REL_PATH)
-    file(TO_CMAKE_PATH "${tbb_gen_cfg_DLL_REL_PATH}" TBB_DLL_REL_PATH)
     file(TO_CMAKE_PATH "${tbb_gen_cfg_INC_REL_PATH}" TBB_INC_REL_PATH)
 
     set(TBB_VERSION ${tbb_gen_cfg_VERSION})
@@ -54,45 +53,61 @@ set(_tbbbind_bin_version ${tbb_gen_cfg_TBBBIND_BINARY_VERSION})
     if (tbb_gen_cfg_SYSTEM_NAME STREQUAL "Linux")
         set(TBB_LIB_PREFIX "lib")
         set(TBB_LIB_EXT "so.\${_\${_tbb_component}_bin_version}")
-        set(TBB_IMPLIB_RELEASE "")
-        set(TBB_IMPLIB_DEBUG "")
-        if (tbb_gen_cfg_HANDLE_SUBDIRS)
-            set(TBB_HANDLE_SUBDIRS "
-if (CMAKE_SIZEOF_VOID_P STREQUAL \"8\")
-    set(_tbb_subdir intel64/gcc4.8)
-else ()
-    set(_tbb_subdir ia32/gcc4.8)
-endif()
+
+        set (TBB_HANDLE_IMPLIB "
+            set (_tbb_release_dll \${_tbb_release_lib})
+            set (_tbb_debug_dll \${_tbb_debug_lib})
 ")
+        if (tbb_gen_cfg_HANDLE_SUBDIRS)
+            set(TBB_HANDLE_SUBDIRS "set(_tbb_subdir gcc4.8)")
 
             set(_libdir_for_pc_file "\${prefix}/lib/intel64/gcc4.8")
+            set(_tbb_pc_extra_libdir "-L\${prefix}/lib")
             configure_file(${_tbb_gen_cfg_path}/../integration/pkg-config/tbb.pc.in ${config_install_dir}/tbb.pc @ONLY)
 
             set(_libdir_for_pc_file "\${prefix}/lib/ia32/gcc4.8")
+            set(_tbb_pc_extra_libdir "-L\${prefix}/lib32")
             configure_file(${_tbb_gen_cfg_path}/../integration/pkg-config/tbb.pc.in ${config_install_dir}/tbb32.pc @ONLY)
-        endif ()
+        endif()
     elseif (tbb_gen_cfg_SYSTEM_NAME STREQUAL "Darwin")
         set(TBB_LIB_PREFIX "lib")
         set(TBB_LIB_EXT "\${_\${_tbb_component}_bin_version}.dylib")
-        set(TBB_IMPLIB_RELEASE "")
-        set(TBB_IMPLIB_DEBUG "")
+
+        set (TBB_HANDLE_IMPLIB "
+            set (_tbb_release_dll \${_tbb_release_lib})
+            set (_tbb_debug_dll \${_tbb_debug_lib})
+")
         set(_libdir_for_pc_file "\${prefix}/lib")
         configure_file(${_tbb_gen_cfg_path}/../integration/pkg-config/tbb.pc.in ${config_install_dir}/tbb.pc @ONLY)
     elseif (tbb_gen_cfg_SYSTEM_NAME STREQUAL "Windows")
         set(TBB_LIB_PREFIX "")
-        set(TBB_LIB_EXT "dll")
+        set(TBB_LIB_EXT "lib")
         set(TBB_COMPILE_DEFINITIONS "
                                   INTERFACE_COMPILE_DEFINITIONS \"__TBB_NO_IMPLICIT_LINKAGE=1\"")
-
-        # .lib files installed to TBB_LIB_REL_PATH (e.g. <prefix>/lib);
-        # .dll files installed to TBB_DLL_REL_PATH (e.g. <prefix>/bin);
-        # Expand TBB_LIB_REL_PATH here in IMPORTED_IMPLIB property and
-        # redefine it with TBB_DLL_REL_PATH value to properly fill IMPORTED_LOCATION property in TBBConfig.cmake.in template.
-        set(TBB_IMPLIB_RELEASE "
-                                      IMPORTED_IMPLIB_RELEASE \"\${_tbb_root}/${TBB_LIB_REL_PATH}/\${_tbb_subdir}/\${_tbb_component}\${_bin_version}.lib\"")
-        set(TBB_IMPLIB_DEBUG "
-                                      IMPORTED_IMPLIB_DEBUG \"\${_tbb_root}/${TBB_LIB_REL_PATH}/\${_tbb_subdir}/\${_tbb_component}\${_bin_version}_debug.lib\"")
-        set(TBB_LIB_REL_PATH ${TBB_DLL_REL_PATH})
+        
+        # .lib - installed to TBB_LIB_REL_PATH (e.g. <prefix>/lib) and are passed as IMPORTED_IMPLIB_<CONFIG> property to target
+        # .dll - installed to <prefix>/bin or <prefix>/redist and are passed as IMPORTED_LOCATION_<CONFIG> property to target
+        set (TBB_HANDLE_IMPLIB "
+            find_file(_tbb_release_dll
+                NAMES \${_tbb_component}\${_bin_version}.dll
+                PATHS \${_tbb_root}
+                PATH_SUFFIXES \"redist/\${_tbb_intel_arch}/\${_tbb_subdir}\" \"bin\${_tbb_arch_suffix}/\${_tbb_subdir}\" \"bin\${_tbb_arch_suffix}/\" \"bin\"
+                NO_DEFAULT_PATH
+            )
+
+            if (EXISTS \"\${_tbb_debug_lib}\")
+                find_file(_tbb_debug_dll
+                    NAMES \${_tbb_component}\${_bin_version}_debug.dll
+                    PATHS \${_tbb_root}
+                    PATH_SUFFIXES \"redist/\${_tbb_intel_arch}/\${_tbb_subdir}\" \"bin\${_tbb_arch_suffix}/\${_tbb_subdir}\" \"bin\${_tbb_arch_suffix}/\" \"bin\"
+                    NO_DEFAULT_PATH
+                )
+            endif()
+")
+            set(TBB_IMPLIB_RELEASE "
+                                        IMPORTED_IMPLIB_RELEASE \"\${_tbb_release_lib}\"")
+            set(TBB_IMPLIB_DEBUG "
+                                        IMPORTED_IMPLIB_DEBUG \"\${_tbb_debug_lib}\"")
 
         if (tbb_gen_cfg_HANDLE_SUBDIRS)
             set(TBB_HANDLE_SUBDIRS "
@@ -100,21 +115,17 @@ set(_tbb_subdir vc14)
 if (WINDOWS_STORE)
     set(_tbb_subdir \${_tbb_subdir}_uwp)
 endif()
-
-if (CMAKE_SIZEOF_VOID_P STREQUAL \"8\")
-    set(_tbb_subdir intel64/\${_tbb_subdir})
-else ()
-    set(_tbb_subdir ia32/\${_tbb_subdir})
-endif()
 ")
             set(_tbb_pc_lib_name ${_tbb_pc_lib_name}${TBB_BINARY_VERSION})
 
             set(_libdir_for_pc_file "\${prefix}/lib/intel64/vc14")
+            set(_tbb_pc_extra_libdir "-L\${prefix}/lib")
             configure_file(${_tbb_gen_cfg_path}/../integration/pkg-config/tbb.pc.in ${config_install_dir}/tbb.pc @ONLY)
 
             set(_libdir_for_pc_file "\${prefix}/lib/ia32/vc14")
+            set(_tbb_pc_extra_libdir "-L\${prefix}/lib32")
             configure_file(${_tbb_gen_cfg_path}/../integration/pkg-config/tbb.pc.in ${config_install_dir}/tbb32.pc @ONLY)
-        endif ()
+        endif()
 
         set(TBB_HANDLE_BIN_VERSION "
     unset(_bin_version)
@@ -122,9 +133,9 @@ endif()
         set(_bin_version \${_tbb_bin_version})
     endif()
 ")
-    else ()
+    else()
         message(FATAL_ERROR "Unsupported OS name: ${tbb_system_name}")
-    endif ()
+    endif()
 
     configure_file(${_tbb_gen_cfg_path}/templates/TBBConfig.cmake.in ${config_install_dir}/TBBConfig.cmake @ONLY)
     configure_file(${_tbb_gen_cfg_path}/templates/TBBConfigVersion.cmake.in ${config_install_dir}/TBBConfigVersion.cmake @ONLY)
diff --git a/external/tbb/cmake/hwloc_detection.cmake b/external/tbb/cmake/hwloc_detection.cmake
index 0b0e6ce8..aaca5a59 100644
--- a/external/tbb/cmake/hwloc_detection.cmake
+++ b/external/tbb/cmake/hwloc_detection.cmake
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Intel Corporation
+# Copyright (c) 2020-2023 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,53 +14,51 @@
 
 list(APPEND HWLOC_REQUIRED_VERSIONS 1_11 2 2_5)
 
-foreach (hwloc_version ${HWLOC_REQUIRED_VERSIONS})
+foreach(hwloc_version ${HWLOC_REQUIRED_VERSIONS})
     if (NOT WIN32)
         set(CMAKE_HWLOC_${hwloc_version}_DLL_PATH STUB)
-    endif ()
+    endif()
     set(HWLOC_TARGET_NAME HWLOC::hwloc_${hwloc_version})
 
     if (NOT TARGET ${HWLOC_TARGET_NAME} AND
-            CMAKE_HWLOC_${hwloc_version}_LIBRARY_PATH AND
-            CMAKE_HWLOC_${hwloc_version}_DLL_PATH AND
-            CMAKE_HWLOC_${hwloc_version}_INCLUDE_PATH
-            )
+        CMAKE_HWLOC_${hwloc_version}_LIBRARY_PATH AND
+        CMAKE_HWLOC_${hwloc_version}_DLL_PATH AND
+        CMAKE_HWLOC_${hwloc_version}_INCLUDE_PATH
+    )
         add_library(${HWLOC_TARGET_NAME} SHARED IMPORTED)
         set_target_properties(${HWLOC_TARGET_NAME} PROPERTIES INTERFACE_INCLUDE_DIRECTORIES
-                "${CMAKE_HWLOC_${hwloc_version}_INCLUDE_PATH}")
+            "${CMAKE_HWLOC_${hwloc_version}_INCLUDE_PATH}")
         if (WIN32)
             set_target_properties(${HWLOC_TARGET_NAME} PROPERTIES
-                    IMPORTED_LOCATION "${CMAKE_HWLOC_${hwloc_version}_DLL_PATH}"
-                    IMPORTED_IMPLIB "${CMAKE_HWLOC_${hwloc_version}_LIBRARY_PATH}")
-        else ()
+                                  IMPORTED_LOCATION "${CMAKE_HWLOC_${hwloc_version}_DLL_PATH}"
+                                  IMPORTED_IMPLIB   "${CMAKE_HWLOC_${hwloc_version}_LIBRARY_PATH}")
+        else()
             set_target_properties(${HWLOC_TARGET_NAME} PROPERTIES
-                    IMPORTED_LOCATION "${CMAKE_HWLOC_${hwloc_version}_LIBRARY_PATH}")
-        endif ()
-    endif ()
+                                  IMPORTED_LOCATION "${CMAKE_HWLOC_${hwloc_version}_LIBRARY_PATH}")
+        endif()
+    endif()
 
     if (TARGET ${HWLOC_TARGET_NAME})
         set(HWLOC_TARGET_EXPLICITLY_DEFINED TRUE)
-    endif ()
-endforeach ()
+    endif()
+endforeach()
 
 unset(HWLOC_TARGET_NAME)
 
 if (NOT HWLOC_TARGET_EXPLICITLY_DEFINED AND
-        # No hwloc auto detection for cross compilation
-        NOT CMAKE_CROSSCOMPILING AND
-        NOT TBB_DISABLE_HWLOC_AUTOMATIC_SEARCH
-        )
+    NOT TBB_DISABLE_HWLOC_AUTOMATIC_SEARCH
+)
     find_package(PkgConfig QUIET)
     if (PKG_CONFIG_FOUND AND NOT CMAKE_VERSION VERSION_LESS 3.6)
         pkg_search_module(HWLOC hwloc IMPORTED_TARGET)
         if (TARGET PkgConfig::HWLOC)
             if (HWLOC_VERSION VERSION_LESS 2)
                 set(TBBBIND_LIBRARY_NAME tbbbind)
-            elseif (HWLOC_VERSION VERSION_LESS 2.5)
+            elseif(HWLOC_VERSION VERSION_LESS 2.5)
                 set(TBBBIND_LIBRARY_NAME tbbbind_2_0)
-            else ()
+            else()
                 set(TBBBIND_LIBRARY_NAME tbbbind_2_5)
-            endif ()
-        endif ()
-    endif ()
-endif ()
+            endif()
+        endif()
+    endif()
+endif()
diff --git a/external/tbb/cmake/memcheck.cmake b/external/tbb/cmake/memcheck.cmake
index 97e27cb4..fd5e920c 100644
--- a/external/tbb/cmake/memcheck.cmake
+++ b/external/tbb/cmake/memcheck.cmake
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Intel Corporation
+# Copyright (c) 2020-2023 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,89 +16,97 @@ option(TBB_VALGRIND_MEMCHECK "Enable scan for memory leaks using Valgrind" OFF)
 
 if (NOT TBB_VALGRIND_MEMCHECK)
     return()
-endif ()
+endif()
 
 add_custom_target(memcheck-all
-        COMMENT "Run memcheck on all tests")
+    COMMENT "Run memcheck on all tests")
 
 find_program(VALGRIND_EXE valgrind)
 
 if (NOT VALGRIND_EXE)
     message(FATAL_ERROR "Valgrind executable is not found, add tool to PATH or turn off TBB_VALGRIND_MEMCHECK")
-else ()
+else()
     message(STATUS "Found Valgrind to run memory leak scan")
-endif ()
+endif()
 
 file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/memcheck)
 
-function(_tbb_run_memcheck test_target)
+function(_tbb_run_memcheck test_target subdir)
     set(target_name memcheck-${test_target})
-    add_custom_target(${target_name}
-            COMMAND ${VALGRIND_EXE} --leak-check=full --show-leak-kinds=all --log-file=${CMAKE_BINARY_DIR}/memcheck/${target_name}.log -v $<TARGET_FILE:${test_target}>)
+    if(${subdir} STREQUAL "tbbmalloc")
+	# Valgring intercepts all allocation symbols with its own by default,
+	# so it disables using tbbmalloc. In case of tbbmalloc tests
+	# intercept allocation symbols only in the default system libraries,
+	# but not in any other shared library or the executable
+	# defining public malloc or operator new related functions.
+	set(option "--soname-synonyms=somalloc=nouserintercepts")
+    endif()
+    add_custom_target(${target_name} 
+        COMMAND ${VALGRIND_EXE} ${option} --leak-check=full --show-leak-kinds=all --log-file=${CMAKE_BINARY_DIR}/memcheck/${target_name}.log -v $<TARGET_FILE:${test_target}>)
     add_dependencies(memcheck-all ${target_name})
 endfunction()
 
 add_custom_target(memcheck-short
-        COMMENT "Run memcheck scan on specified list")
+    COMMENT "Run memcheck scan on specified list")
 
 # List of reasonable and quick enough tests to use in automated memcheck
-add_dependencies(memcheck-short
-        memcheck-test_allocators
-        memcheck-test_arena_constraints
-        memcheck-test_dynamic_link
-        memcheck-test_concurrent_lru_cache
-        memcheck-conformance_concurrent_unordered_map
-        memcheck-conformance_concurrent_unordered_set
-        memcheck-conformance_concurrent_map
-        memcheck-conformance_concurrent_set
-        memcheck-conformance_concurrent_priority_queue
-        memcheck-conformance_concurrent_vector
-        memcheck-conformance_concurrent_queue
-        memcheck-conformance_concurrent_hash_map
-        memcheck-test_parallel_for
-        memcheck-test_parallel_for_each
-        memcheck-test_parallel_reduce
-        memcheck-test_parallel_sort
-        memcheck-test_parallel_invoke
-        memcheck-test_parallel_scan
-        memcheck-test_parallel_pipeline
-        memcheck-test_eh_algorithms
-        memcheck-test_task_group
-        memcheck-test_task_arena
-        memcheck-test_enumerable_thread_specific
-        memcheck-test_resumable_tasks
-        memcheck-conformance_mutex
-        memcheck-test_function_node
-        memcheck-test_multifunction_node
-        memcheck-test_broadcast_node
-        memcheck-test_buffer_node
-        memcheck-test_composite_node
-        memcheck-test_continue_node
-        memcheck-test_eh_flow_graph
-        memcheck-test_flow_graph
-        memcheck-test_flow_graph_priorities
-        memcheck-test_flow_graph_whitebox
-        memcheck-test_indexer_node
-        memcheck-test_join_node
-        memcheck-test_join_node_key_matching
-        memcheck-test_join_node_msg_key_matching
-        memcheck-test_priority_queue_node
-        memcheck-test_sequencer_node
-        memcheck-test_split_node
-        memcheck-test_tagged_msg
-        memcheck-test_overwrite_node
-        memcheck-test_write_once_node
-        memcheck-test_async_node
-        memcheck-test_input_node
-        memcheck-test_profiling
-        memcheck-test_concurrent_queue_whitebox
-        memcheck-test_intrusive_list
-        memcheck-test_semaphore
-        memcheck-test_environment_whitebox
-        memcheck-test_handle_perror
-        memcheck-test_hw_concurrency
-        memcheck-test_eh_thread
-        memcheck-test_global_control
-        memcheck-test_task
-        memcheck-test_concurrent_monitor
-        )
+add_dependencies(memcheck-short 
+    memcheck-test_allocators
+    memcheck-test_arena_constraints
+    memcheck-test_dynamic_link
+    memcheck-test_concurrent_lru_cache
+    memcheck-conformance_concurrent_unordered_map
+    memcheck-conformance_concurrent_unordered_set
+    memcheck-conformance_concurrent_map
+    memcheck-conformance_concurrent_set
+    memcheck-conformance_concurrent_priority_queue
+    memcheck-conformance_concurrent_vector
+    memcheck-conformance_concurrent_queue
+    memcheck-conformance_concurrent_hash_map
+    memcheck-test_parallel_for
+    memcheck-test_parallel_for_each
+    memcheck-test_parallel_reduce
+    memcheck-test_parallel_sort
+    memcheck-test_parallel_invoke
+    memcheck-test_parallel_scan
+    memcheck-test_parallel_pipeline
+    memcheck-test_eh_algorithms
+    memcheck-test_task_group
+    memcheck-test_task_arena
+    memcheck-test_enumerable_thread_specific
+    memcheck-test_resumable_tasks
+    memcheck-conformance_mutex
+    memcheck-test_function_node
+    memcheck-test_multifunction_node
+    memcheck-test_broadcast_node
+    memcheck-test_buffer_node
+    memcheck-test_composite_node
+    memcheck-test_continue_node
+    memcheck-test_eh_flow_graph
+    memcheck-test_flow_graph
+    memcheck-test_flow_graph_priorities
+    memcheck-test_flow_graph_whitebox
+    memcheck-test_indexer_node
+    memcheck-test_join_node
+    memcheck-test_join_node_key_matching
+    memcheck-test_join_node_msg_key_matching
+    memcheck-test_priority_queue_node
+    memcheck-test_sequencer_node
+    memcheck-test_split_node
+    memcheck-test_tagged_msg
+    memcheck-test_overwrite_node
+    memcheck-test_write_once_node
+    memcheck-test_async_node
+    memcheck-test_input_node
+    memcheck-test_profiling
+    memcheck-test_concurrent_queue_whitebox
+    memcheck-test_intrusive_list
+    memcheck-test_semaphore
+    memcheck-test_environment_whitebox
+    memcheck-test_handle_perror
+    memcheck-test_hw_concurrency
+    memcheck-test_eh_thread
+    memcheck-test_global_control
+    memcheck-test_task
+    memcheck-test_concurrent_monitor
+)
diff --git a/external/tbb/cmake/packaging.cmake b/external/tbb/cmake/packaging.cmake
index 7b713973..aa2acc4d 100644
--- a/external/tbb/cmake/packaging.cmake
+++ b/external/tbb/cmake/packaging.cmake
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Intel Corporation
+# Copyright (c) 2020-2023 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,4 +18,7 @@ set(CPACK_PACKAGE_NAME "${PROJECT_NAME}")
 set(CPACK_PACKAGE_VERSION "${TBB_VERSION}")
 string(TOLOWER ${CPACK_PACKAGE_NAME}-${PROJECT_VERSION}-${CMAKE_SYSTEM_NAME}_${TBB_OUTPUT_DIR_BASE}_${CMAKE_BUILD_TYPE} CPACK_PACKAGE_FILE_NAME)
 set(CPACK_GENERATOR ZIP)
-include(CPack)
+# Note: this is an internal non-documented variable set by CPack 
+if (NOT CPack_CMake_INCLUDED)
+    include(CPack)
+endif()
diff --git a/external/tbb/cmake/post_install/CMakeLists.txt b/external/tbb/cmake/post_install/CMakeLists.txt
index 2c7df583..a7a02545 100644
--- a/external/tbb/cmake/post_install/CMakeLists.txt
+++ b/external/tbb/cmake/post_install/CMakeLists.txt
@@ -14,8 +14,9 @@
 
 # Add code signing as post-install step.
 if (DEFINED TBB_SIGNTOOL)
+    file(TO_CMAKE_PATH "${TBB_SIGNTOOL}" TBB_SIGNTOOL)
     install(CODE "
     file(GLOB_RECURSE FILES_TO_SIGN \${CMAKE_INSTALL_PREFIX}/*${CMAKE_SHARED_LIBRARY_SUFFIX})
     execute_process(COMMAND ${TBB_SIGNTOOL} \${FILES_TO_SIGN} ${TBB_SIGNTOOL_ARGS})
 ")
-endif ()
+endif()
diff --git a/external/tbb/cmake/python/test_launcher.cmake b/external/tbb/cmake/python/test_launcher.cmake
index d578cc9f..a9aa6309 100644
--- a/external/tbb/cmake/python/test_launcher.cmake
+++ b/external/tbb/cmake/python/test_launcher.cmake
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Intel Corporation
+# Copyright (c) 2020-2025 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,27 +12,32 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+if (POLICY CMP0148)
+    # CMake 3.27: The FindPythonInterp and FindPythonLibs modules are removed
+    cmake_policy(SET CMP0148 OLD)
+endif()
+
 find_package(PythonInterp 3.5 REQUIRED)
 
-file(GLOB_RECURSE MODULES_LIST "${PYTHON_MODULE_BUILD_PATH}/*TBB.py*")
+file(GLOB_RECURSE MODULES_LIST "${PYTHON_MODULE_BUILD_PATH}/*TBB.py*" )
 list(LENGTH MODULES_LIST MODULES_COUNT)
 
 if (MODULES_COUNT EQUAL 0)
     message(FATAL_ERROR "Cannot find oneTBB Python module")
 elseif (MODULES_COUNT GREATER 1)
     message(WARNING "Found more than oneTBB Python modules, the only first found module will be tested")
-endif ()
+endif()
 
 list(GET MODULES_LIST 0 PYTHON_MODULE)
 get_filename_component(PYTHON_MODULE_PATH ${PYTHON_MODULE} DIRECTORY)
 
 execute_process(
-        COMMAND
+    COMMAND
         ${CMAKE_COMMAND} -E env LD_LIBRARY_PATH=${TBB_BINARIES_PATH}
         ${PYTHON_EXECUTABLE} -m tbb test
-        WORKING_DIRECTORY ${PYTHON_MODULE_PATH}
-        RESULT_VARIABLE CMD_RESULT
+    WORKING_DIRECTORY ${PYTHON_MODULE_PATH}
+    RESULT_VARIABLE CMD_RESULT
 )
 if (CMD_RESULT)
     message(FATAL_ERROR "Error while test execution: ${cmd} error_code: ${CMD_RESULT}")
-endif ()
+endif()
diff --git a/external/tbb/cmake/resumable_tasks.cmake b/external/tbb/cmake/resumable_tasks.cmake
new file mode 100644
index 00000000..d379d4ed
--- /dev/null
+++ b/external/tbb/cmake/resumable_tasks.cmake
@@ -0,0 +1,31 @@
+# Copyright (c) 2023 Intel Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+include(CheckSymbolExists)
+
+if (UNIX)
+    set(CMAKE_REQUIRED_FLAGS -Wno-deprecated-declarations)
+    if (APPLE)
+        set(CMAKE_REQUIRED_DEFINITIONS -D_XOPEN_SOURCE)
+    endif()
+
+    check_symbol_exists("getcontext" "ucontext.h" _tbb_have_ucontext)
+    if (NOT _tbb_have_ucontext)
+        set(TBB_RESUMABLE_TASKS_USE_THREADS "__TBB_RESUMABLE_TASKS_USE_THREADS=1")
+    endif()
+
+    unset(_tbb_have_ucontext)
+    unset(CMAKE_REQUIRED_DEFINITIONS)
+    unset(CMAKE_REQUIRED_FLAGS)
+endif()
diff --git a/external/tbb/cmake/sanitize.cmake b/external/tbb/cmake/sanitize.cmake
index 27733b50..d07b3298 100644
--- a/external/tbb/cmake/sanitize.cmake
+++ b/external/tbb/cmake/sanitize.cmake
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Intel Corporation
+# Copyright (c) 2020-2022 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@ set_property(CACHE TBB_SANITIZE PROPERTY STRINGS "thread" "memory" "leak" "addre
 
 if (NOT TBB_SANITIZE)
     return()
-endif ()
+endif()
 
 set(TBB_SANITIZE_OPTION -fsanitize=${TBB_SANITIZE})
 
@@ -30,11 +30,14 @@ string(MAKE_C_IDENTIFIER ${TBB_SANITIZE_OPTION} FLAG_DISPLAY_NAME)
 check_cxx_compiler_flag(${TBB_SANITIZE_OPTION} ${FLAG_DISPLAY_NAME})
 if (NOT ${FLAG_DISPLAY_NAME})
     message(FATAL_ERROR
-            "${TBB_SANITIZE_OPTION} is not supported by compiler ${CMAKE_CXX_COMPILER_ID}:${CMAKE_CXX_COMPILER_VERSION}, "
-            "please try another compiler or omit TBB_SANITIZE variable")
-endif ()
+    "${TBB_SANITIZE_OPTION} is not supported by compiler ${CMAKE_CXX_COMPILER_ID}:${CMAKE_CXX_COMPILER_VERSION}, "
+    "please try another compiler or omit TBB_SANITIZE variable")
+endif()
 
-set(TBB_TESTS_ENVIRONMENT ${TBB_TESTS_ENVIRONMENT} "LSAN_OPTIONS=suppressions=${CMAKE_CURRENT_SOURCE_DIR}/cmake/suppressions/lsan.suppressions")
+set(TBB_TESTS_ENVIRONMENT ${TBB_TESTS_ENVIRONMENT}
+    "TSAN_OPTIONS=suppressions=${CMAKE_CURRENT_SOURCE_DIR}/cmake/suppressions/tsan.suppressions"
+    "LSAN_OPTIONS=suppressions=${CMAKE_CURRENT_SOURCE_DIR}/cmake/suppressions/lsan.suppressions")
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TBB_SANITIZE_OPTION}")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${TBB_SANITIZE_OPTION}")
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${TBB_SANITIZE_OPTION}")
diff --git a/external/tbb/cmake/scripts/cmake_gen_github_configs.cmake b/external/tbb/cmake/scripts/cmake_gen_github_configs.cmake
index bd5dfef5..4d9eb73d 100644
--- a/external/tbb/cmake/scripts/cmake_gen_github_configs.cmake
+++ b/external/tbb/cmake/scripts/cmake_gen_github_configs.cmake
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Intel Corporation
+# Copyright (c) 2020-2023 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@ set(TBB_ROOT_REL_PATH "../../..")
 # Paths relative to TBB root directory
 set(INC_REL_PATH "include")
 set(LIB_REL_PATH "lib")
-set(DLL_REL_PATH "redist")
 
 # Parse version info
 file(READ ${CMAKE_CURRENT_LIST_DIR}/../../include/oneapi/tbb/version.h _tbb_version_info)
@@ -34,17 +33,17 @@ set(TBBMALLOC_PROXY_BINARY_VERSION ${TBBMALLOC_BINARY_VERSION})
 string(REGEX REPLACE ".*TBBBIND_BINARY_VERSION ([0-9]+).*" "\\1" TBBBIND_BINARY_VERSION "${_tbb_cmakelist}")
 
 set(COMMON_ARGS
-        TBB_ROOT_REL_PATH ${TBB_ROOT_REL_PATH}
-        INC_REL_PATH ${INC_REL_PATH}
-        LIB_REL_PATH ${LIB_REL_PATH}
-        VERSION ${_tbb_ver_major}.${_tbb_ver_minor}.${_tbb_ver_patch}
-        TBB_BINARY_VERSION ${TBB_BINARY_VERSION}
-        TBBMALLOC_BINARY_VERSION ${TBBMALLOC_BINARY_VERSION}
-        TBBMALLOC_PROXY_BINARY_VERSION ${TBBMALLOC_PROXY_BINARY_VERSION}
-        TBBBIND_BINARY_VERSION ${TBBBIND_BINARY_VERSION}
-        )
+    TBB_ROOT_REL_PATH ${TBB_ROOT_REL_PATH}
+    INC_REL_PATH ${INC_REL_PATH}
+    LIB_REL_PATH ${LIB_REL_PATH}
+    VERSION ${_tbb_ver_major}.${_tbb_ver_minor}.${_tbb_ver_patch}
+    TBB_BINARY_VERSION ${TBB_BINARY_VERSION}
+    TBBMALLOC_BINARY_VERSION ${TBBMALLOC_BINARY_VERSION}
+    TBBMALLOC_PROXY_BINARY_VERSION ${TBBMALLOC_PROXY_BINARY_VERSION}
+    TBBBIND_BINARY_VERSION ${TBBBIND_BINARY_VERSION}
+)
 
-tbb_generate_config(INSTALL_DIR ${INSTALL_DIR}/linux SYSTEM_NAME Linux HANDLE_SUBDIRS ${COMMON_ARGS})
-tbb_generate_config(INSTALL_DIR ${INSTALL_DIR}/windows SYSTEM_NAME Windows HANDLE_SUBDIRS DLL_REL_PATH ${DLL_REL_PATH} ${COMMON_ARGS})
-tbb_generate_config(INSTALL_DIR ${INSTALL_DIR}/darwin SYSTEM_NAME Darwin ${COMMON_ARGS})
+tbb_generate_config(INSTALL_DIR ${INSTALL_DIR}/linux   SYSTEM_NAME Linux   HANDLE_SUBDIRS ${COMMON_ARGS})
+tbb_generate_config(INSTALL_DIR ${INSTALL_DIR}/windows SYSTEM_NAME Windows HANDLE_SUBDIRS ${COMMON_ARGS})
+tbb_generate_config(INSTALL_DIR ${INSTALL_DIR}/darwin  SYSTEM_NAME Darwin                 ${COMMON_ARGS})
 message(STATUS "TBBConfig files were created in ${INSTALL_DIR}")
diff --git a/external/tbb/cmake/suppressions/tsan.suppressions b/external/tbb/cmake/suppressions/tsan.suppressions
new file mode 100644
index 00000000..1bbb833b
--- /dev/null
+++ b/external/tbb/cmake/suppressions/tsan.suppressions
@@ -0,0 +1,4 @@
+# TSAN suppression for known issues.
+# Possible data race during ittnotify initialization. Low impact.
+race:__itt_nullify_all_pointers
+race:__itt_init_ittlib
diff --git a/external/tbb/cmake/templates/TBBConfig.cmake.in b/external/tbb/cmake/templates/TBBConfig.cmake.in
index 880a9330..3131e3dd 100644
--- a/external/tbb/cmake/templates/TBBConfig.cmake.in
+++ b/external/tbb/cmake/templates/TBBConfig.cmake.in
@@ -1,4 +1,4 @@
-# Copyright (c) 2017-2021 Intel Corporation
+# Copyright (c) 2017-2023 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -43,14 +43,38 @@ if (NOT _tbbmalloc_proxy_ix EQUAL -1)
     set(TBB_FIND_REQUIRED_tbbmalloc ${TBB_FIND_REQUIRED_tbbmalloc_proxy})
 endif()
 unset(_tbbmalloc_proxy_ix)
+
+if (CMAKE_SIZEOF_VOID_P STREQUAL "8")
+    set(_tbb_intel_arch intel64)
+else ()
+    set(_tbb_intel_arch ia32)
+    set(_tbb_arch_suffix 32)
+endif()
+
 @TBB_HANDLE_SUBDIRS@
 foreach (_tbb_component ${TBB_FIND_COMPONENTS})
+    unset(_tbb_release_dll CACHE)
+    unset(_tbb_debug_dll   CACHE)
+    unset(_tbb_release_lib CACHE)
+    unset(_tbb_debug_lib   CACHE)
+
     set(TBB_${_tbb_component}_FOUND 0)
     @TBB_HANDLE_BIN_VERSION@
-    get_filename_component(_tbb_release_lib "${_tbb_root}/@TBB_LIB_REL_PATH@/${_tbb_subdir}/@TBB_LIB_PREFIX@${_tbb_component}${_bin_version}.@TBB_LIB_EXT@" ABSOLUTE)
+
+    find_library(_tbb_release_lib
+        NAMES @TBB_LIB_PREFIX@${_tbb_component}${_bin_version}.@TBB_LIB_EXT@
+        PATHS ${_tbb_root}
+        PATH_SUFFIXES "@TBB_LIB_REL_PATH@/${_tbb_intel_arch}/${_tbb_subdir}" "@TBB_LIB_REL_PATH@${_tbb_arch_suffix}/${_tbb_subdir}" "@TBB_LIB_REL_PATH@${_tbb_arch_suffix}" "@TBB_LIB_REL_PATH@"
+        NO_DEFAULT_PATH
+    )
 
     if (NOT TBB_FIND_RELEASE_ONLY)
-        get_filename_component(_tbb_debug_lib "${_tbb_root}/@TBB_LIB_REL_PATH@/${_tbb_subdir}/@TBB_LIB_PREFIX@${_tbb_component}${_bin_version}_debug.@TBB_LIB_EXT@" ABSOLUTE)
+        find_library(_tbb_debug_lib
+            NAMES @TBB_LIB_PREFIX@${_tbb_component}${_bin_version}_debug.@TBB_LIB_EXT@
+            PATHS ${_tbb_root}
+            PATH_SUFFIXES "@TBB_LIB_REL_PATH@/${_tbb_intel_arch}/${_tbb_subdir}" "@TBB_LIB_REL_PATH@${_tbb_arch_suffix}/${_tbb_subdir}" "@TBB_LIB_REL_PATH@${_tbb_arch_suffix}" "@TBB_LIB_REL_PATH@"
+            NO_DEFAULT_PATH
+        )
     endif()
 
     if (EXISTS "${_tbb_release_lib}" OR EXISTS "${_tbb_debug_lib}")
@@ -63,15 +87,17 @@ foreach (_tbb_component ${TBB_FIND_COMPONENTS})
             unset(_tbb_current_realpath)
             unset(_tbb_include_dir)
 
-            if (EXISTS "${_tbb_release_lib}")
+            @TBB_HANDLE_IMPLIB@
+
+            if (EXISTS "${_tbb_release_dll}")
                 set_target_properties(TBB::${_tbb_component} PROPERTIES
-                                      IMPORTED_LOCATION_RELEASE "${_tbb_release_lib}"@TBB_IMPLIB_RELEASE@)
+                                      IMPORTED_LOCATION_RELEASE "${_tbb_release_dll}"@TBB_IMPLIB_RELEASE@)
                 set_property(TARGET TBB::${_tbb_component} APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
             endif()
 
-            if (EXISTS "${_tbb_debug_lib}")
+            if (EXISTS "${_tbb_debug_dll}")
                 set_target_properties(TBB::${_tbb_component} PROPERTIES
-                                      IMPORTED_LOCATION_DEBUG "${_tbb_debug_lib}"@TBB_IMPLIB_DEBUG@)
+                                      IMPORTED_LOCATION_DEBUG "${_tbb_debug_dll}"@TBB_IMPLIB_DEBUG@)
                 set_property(TARGET TBB::${_tbb_component} APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
             endif()
 
@@ -93,6 +119,10 @@ foreach (_tbb_component ${TBB_FIND_COMPONENTS})
     endif()
 endforeach()
 list(REMOVE_DUPLICATES TBB_IMPORTED_TARGETS)
+unset(_tbb_release_dll)
+unset(_tbb_debug_dll)
 unset(_tbb_release_lib)
 unset(_tbb_debug_lib)
 unset(_tbb_root)
+unset(_tbb_intel_arch)
+unset(_tbb_arch_suffix)
diff --git a/external/tbb/cmake/test_spec.cmake b/external/tbb/cmake/test_spec.cmake
index 71cdc6a7..9ac811f5 100644
--- a/external/tbb/cmake/test_spec.cmake
+++ b/external/tbb/cmake/test_spec.cmake
@@ -18,18 +18,18 @@ if (TBB_TEST_SPEC)
     find_package(Doxygen REQUIRED)
 
     set(DOXYGEN_PREDEFINED_MACROS
-            "TBB_USE_EXCEPTIONS \
+      "TBB_USE_EXCEPTIONS \
       __TBB_RESUMABLE_TASKS \
       __TBB_HWLOC_PRESENT \
       __TBB_CPP17_DEDUCTION_GUIDES_PRESENT \
       __TBB_CPP17_MEMORY_RESOURCE_PRESENT \
       __TBB_CPP14_GENERIC_LAMBDAS_PRESENT"
-            )
+    )
 
     add_custom_target(
-            test_spec ALL
-            COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
-            COMMENT "Generating test specification with Doxygen"
-            VERBATIM)
+      test_spec ALL
+      COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
+      COMMENT "Generating test specification with Doxygen"
+      VERBATIM)
     configure_file(${CMAKE_CURRENT_SOURCE_DIR}/doc/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
-endif ()
+endif()
diff --git a/external/tbb/cmake/toolchains/mips.cmake b/external/tbb/cmake/toolchains/mips.cmake
index 84b13219..13af9519 100644
--- a/external/tbb/cmake/toolchains/mips.cmake
+++ b/external/tbb/cmake/toolchains/mips.cmake
@@ -15,7 +15,7 @@
 # Prevent double invocation.
 if (MIPS_TOOLCHAIN_INCLUDED)
     return()
-endif ()
+endif()
 set(MIPS_TOOLCHAIN_INCLUDED TRUE)
 
 set(CMAKE_SYSTEM_NAME Linux)
diff --git a/external/tbb/cmake/toolchains/riscv64.cmake b/external/tbb/cmake/toolchains/riscv64.cmake
new file mode 100644
index 00000000..96c0014b
--- /dev/null
+++ b/external/tbb/cmake/toolchains/riscv64.cmake
@@ -0,0 +1,34 @@
+# Copyright (c) 2023 Intel Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Prevent double invocation.
+if (RISCV_TOOLCHAIN_INCLUDED)
+    return()
+endif()
+set(RISCV_TOOLCHAIN_INCLUDED TRUE)
+
+set(CMAKE_SYSTEM_NAME Linux)
+set(CMAKE_SYSTEM_VERSION 1)
+set(CMAKE_SYSTEM_PROCESSOR riscv)
+
+# User can use -DCMAKE_FIND_ROOT_PATH to specific toolchain path
+set(CMAKE_C_COMPILER ${CMAKE_FIND_ROOT_PATH}/bin/riscv64-unknown-linux-gnu-clang)
+set(CMAKE_CXX_COMPILER ${CMAKE_FIND_ROOT_PATH}/bin/riscv64-unknown-linux-gnu-clang++)
+set(CMAKE_LINKER ${CMAKE_FIND_ROOT_PATH}/bin/riscv64-unknown-linux-gnu-ld)
+
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+
+# Most linux on riscv64 support rv64imafd_zba_zbb extensions
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=rv64imafd_zba_zbb -mabi=lp64d " CACHE INTERNAL "")
diff --git a/external/tbb/cmake/utils.cmake b/external/tbb/cmake/utils.cmake
index 32b4994c..21101989 100644
--- a/external/tbb/cmake/utils.cmake
+++ b/external/tbb/cmake/utils.cmake
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Intel Corporation
+# Copyright (c) 2020-2024 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,29 +18,57 @@ macro(tbb_remove_compile_flag flag)
     set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY COMPILE_OPTIONS ${_tbb_compile_options})
     unset(_tbb_compile_options)
     if (CMAKE_CXX_FLAGS)
-        string(REGEX REPLACE ${flag} "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
-    endif ()
+        string(REGEX REPLACE "(^|[ \t\r\n]+)${flag}($|[ \t\r\n]+)" " " CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+    endif()
 endmacro()
 
 macro(tbb_install_target target)
-    install(TARGETS ${target}
+    if (TBB_INSTALL)
+        install(TARGETS ${target}
             EXPORT TBBTargets
             LIBRARY
-            DESTINATION ${CMAKE_INSTALL_LIBDIR}
-            NAMELINK_SKIP
-            COMPONENT runtime
+                DESTINATION ${CMAKE_INSTALL_LIBDIR}
+                NAMELINK_SKIP
+                COMPONENT runtime
             RUNTIME
-            DESTINATION ${CMAKE_INSTALL_BINDIR}
-            COMPONENT runtime
+                DESTINATION ${CMAKE_INSTALL_BINDIR}
+                COMPONENT runtime
             ARCHIVE
-            DESTINATION ${CMAKE_INSTALL_LIBDIR}
-            COMPONENT devel)
+                DESTINATION ${CMAKE_INSTALL_LIBDIR}
+                COMPONENT devel
+            FRAMEWORK
+                DESTINATION ${CMAKE_INSTALL_LIBDIR}
+                COMPONENT runtime
+                OPTIONAL)
 
-    if (BUILD_SHARED_LIBS)
-        install(TARGETS ${target}
+        if (BUILD_SHARED_LIBS)
+            install(TARGETS ${target}
                 LIBRARY
-                DESTINATION ${CMAKE_INSTALL_LIBDIR}
-                NAMELINK_ONLY
-                COMPONENT devel)
-    endif ()
+                    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+                    NAMELINK_ONLY
+                    COMPONENT devel)
+        endif()
+        if (MSVC AND BUILD_SHARED_LIBS)
+            install(FILES $<TARGET_PDB_FILE:${target}>
+                DESTINATION ${CMAKE_INSTALL_BINDIR}
+                COMPONENT devel
+                OPTIONAL)
+        endif()
+    endif()
+endmacro()
+
+macro(tbb_handle_ipo target)
+    if (TBB_IPO_PROPERTY)
+        set_target_properties(${target} PROPERTIES 
+            INTERPROCEDURAL_OPTIMIZATION TRUE
+            INTERPROCEDURAL_OPTIMIZATION_DEBUG FALSE
+        )
+    elseif (TBB_IPO_FLAGS)
+        target_compile_options(${target} PRIVATE ${TBB_IPO_COMPILE_FLAGS})
+        if (COMMAND target_link_options)
+            target_link_options(${target} PRIVATE ${TBB_IPO_LINK_FLAGS})
+        else()
+            target_link_libraries(${target} PRIVATE ${TBB_IPO_LINK_FLAGS})
+        endif()
+    endif()
 endmacro()
diff --git a/external/tbb/cmake/vars_utils.cmake b/external/tbb/cmake/vars_utils.cmake
index 78e20d39..54a9fda1 100644
--- a/external/tbb/cmake/vars_utils.cmake
+++ b/external/tbb/cmake/vars_utils.cmake
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Intel Corporation
+# Copyright (c) 2020-2024 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,31 +18,39 @@ if (WIN32)
     set(TBB_VARS_TEMPLATE "windows/env/vars.bat.in")
 elseif (APPLE)
     set(TBB_VARS_TEMPLATE "mac/env/vars.sh.in")
-else ()
+else()
     set(TBB_VARS_TEMPLATE "linux/env/vars.sh.in")
-endif ()
+endif()
 
 get_filename_component(TBB_VARS_TEMPLATE_NAME ${PROJECT_SOURCE_DIR}/integration/${TBB_VARS_TEMPLATE} NAME)
 string(REPLACE ".in" "" TBB_VARS_NAME ${TBB_VARS_TEMPLATE_NAME})
 
 macro(tbb_gen_vars target)
+    if (NOT TBB_BUILD_APPLE_FRAMEWORKS)
+        set(BIN_PATH $<TARGET_FILE_DIR:${target}>)
+    else()
+        # For Apple* frameworks, the binaries are placed in a framework bundle. 
+        # When using an Apple* framework, you refer to the bundle, not the binary inside, so we take the bundle's path and go up one level.
+        # This path will then be used to generate the vars file, and the contents of the vars file will use the bundle's parent directory.
+        set(BIN_PATH $<TARGET_BUNDLE_DIR:${target}>/..)
+    endif()
     if (${CMAKE_PROJECT_NAME} STREQUAL ${PROJECT_NAME})
         add_custom_command(TARGET ${target} POST_BUILD COMMAND
-                ${CMAKE_COMMAND}
-                -DBINARY_DIR=${CMAKE_BINARY_DIR}
-                -DSOURCE_DIR=${PROJECT_SOURCE_DIR}
-                -DBIN_PATH=$<TARGET_FILE_DIR:${target}>
-                -DVARS_TEMPLATE=${TBB_VARS_TEMPLATE}
-                -DVARS_NAME=${TBB_VARS_NAME}
-                -DTBB_INSTALL_VARS=${TBB_INSTALL_VARS}
-                -DTBB_CMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
-                -P ${PROJECT_SOURCE_DIR}/integration/cmake/generate_vars.cmake
-                )
-    endif ()
+            ${CMAKE_COMMAND}
+            -DBINARY_DIR=${CMAKE_BINARY_DIR}
+            -DSOURCE_DIR=${PROJECT_SOURCE_DIR}
+            -DBIN_PATH=${BIN_PATH}
+            -DVARS_TEMPLATE=${TBB_VARS_TEMPLATE}
+            -DVARS_NAME=${TBB_VARS_NAME}
+            -DTBB_INSTALL_VARS=${TBB_INSTALL_VARS}
+            -DTBB_CMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
+            -P ${PROJECT_SOURCE_DIR}/integration/cmake/generate_vars.cmake
+        )
+    endif()
 endmacro(tbb_gen_vars)
 
 if (TBB_INSTALL_VARS)
     install(PROGRAMS "${CMAKE_BINARY_DIR}/internal_install_vars"
             DESTINATION env
             RENAME ${TBB_VARS_NAME})
-endif ()
+endif()
diff --git a/external/tbb/doc/DoxygenLayout.xml b/external/tbb/doc/DoxygenLayout.xml
index 0d6ed70b..cb906b00 100644
--- a/external/tbb/doc/DoxygenLayout.xml
+++ b/external/tbb/doc/DoxygenLayout.xml
@@ -1,195 +1,195 @@
 <doxygenlayout version="1.0">
-    <!-- Generated by doxygen 1.8.14 -->
-    <!-- Navigation index tabs for HTML output -->
-    <navindex>
-        <tab type="mainpage" visible="no" title=""/>
-        <tab type="pages" visible="no" title="" intro=""/>
-        <tab type="modules" visible="yes" title="" intro=""/>
-        <tab type="namespaces" visible="yes" title="">
-            <tab type="namespacelist" visible="yes" title="" intro=""/>
-            <tab type="namespacemembers" visible="yes" title="" intro=""/>
-        </tab>
-        <tab type="classes" visible="no" title="">
-            <tab type="classlist" visible="yes" title="" intro=""/>
-            <tab type="classindex" visible="$ALPHABETICAL_INDEX" title=""/>
-            <tab type="hierarchy" visible="yes" title="" intro=""/>
-            <tab type="classmembers" visible="yes" title="" intro=""/>
-        </tab>
-        <tab type="files" visible="yes" title="Test Suites">
-            <tab type="filelist" visible="no" title="" intro=""/>
-            <tab type="globals" visible="no" title="" intro=""/>
-        </tab>
-        <tab type="user" url="@ref test_classification" visible="yes" title="Test Classification"/>
-        <tab type="examples" visible="yes" title="" intro=""/>
-    </navindex>
+  <!-- Generated by doxygen 1.8.14 -->
+  <!-- Navigation index tabs for HTML output -->
+  <navindex>
+    <tab type="mainpage" visible="no" title=""/>
+    <tab type="pages" visible="no" title="" intro=""/>
+    <tab type="modules" visible="yes" title="" intro=""/>
+    <tab type="namespaces" visible="yes" title="">
+      <tab type="namespacelist" visible="yes" title="" intro=""/>
+      <tab type="namespacemembers" visible="yes" title="" intro=""/>
+    </tab>
+    <tab type="classes" visible="no" title="">
+      <tab type="classlist" visible="yes" title="" intro=""/>
+      <tab type="classindex" visible="$ALPHABETICAL_INDEX" title=""/> 
+      <tab type="hierarchy" visible="yes" title="" intro=""/>
+      <tab type="classmembers" visible="yes" title="" intro=""/>
+    </tab>
+    <tab type="files" visible="yes" title="Test Suites">
+      <tab type="filelist" visible="no" title="" intro=""/>
+      <tab type="globals" visible="no" title="" intro=""/>
+    </tab>
+    <tab type="user" url="@ref test_classification" visible="yes" title="Test Classification"/>
+    <tab type="examples" visible="yes" title="" intro=""/>  
+  </navindex>
 
-    <!-- Layout definition for a class page -->
-    <class>
-        <briefdescription visible="yes"/>
-        <includes visible="$SHOW_INCLUDE_FILES"/>
-        <inheritancegraph visible="$CLASS_GRAPH"/>
-        <collaborationgraph visible="$COLLABORATION_GRAPH"/>
-        <memberdecl>
-            <nestedclasses visible="yes" title=""/>
-            <publictypes title=""/>
-            <services title=""/>
-            <interfaces title=""/>
-            <publicslots title=""/>
-            <signals title=""/>
-            <publicmethods title=""/>
-            <publicstaticmethods title=""/>
-            <publicattributes title=""/>
-            <publicstaticattributes title=""/>
-            <protectedtypes title=""/>
-            <protectedslots title=""/>
-            <protectedmethods title=""/>
-            <protectedstaticmethods title=""/>
-            <protectedattributes title=""/>
-            <protectedstaticattributes title=""/>
-            <packagetypes title=""/>
-            <packagemethods title=""/>
-            <packagestaticmethods title=""/>
-            <packageattributes title=""/>
-            <packagestaticattributes title=""/>
-            <properties title=""/>
-            <events title=""/>
-            <privatetypes title=""/>
-            <privateslots title=""/>
-            <privatemethods title=""/>
-            <privatestaticmethods title=""/>
-            <privateattributes title=""/>
-            <privatestaticattributes title=""/>
-            <friends title=""/>
-            <related title="" subtitle=""/>
-            <membergroups visible="yes"/>
-        </memberdecl>
-        <detaileddescription title=""/>
-        <memberdef>
-            <inlineclasses title=""/>
-            <typedefs title=""/>
-            <enums title=""/>
-            <services title=""/>
-            <interfaces title=""/>
-            <constructors title=""/>
-            <functions title=""/>
-            <related title=""/>
-            <variables title=""/>
-            <properties title=""/>
-            <events title=""/>
-        </memberdef>
-        <allmemberslink visible="yes"/>
-        <usedfiles visible="$SHOW_USED_FILES"/>
-        <authorsection visible="yes"/>
-    </class>
+  <!-- Layout definition for a class page -->
+  <class>
+    <briefdescription visible="yes"/>
+    <includes visible="$SHOW_INCLUDE_FILES"/>
+    <inheritancegraph visible="$CLASS_GRAPH"/>
+    <collaborationgraph visible="$COLLABORATION_GRAPH"/>
+    <memberdecl>
+      <nestedclasses visible="yes" title=""/>
+      <publictypes title=""/>
+      <services title=""/>
+      <interfaces title=""/>
+      <publicslots title=""/>
+      <signals title=""/>
+      <publicmethods title=""/>
+      <publicstaticmethods title=""/>
+      <publicattributes title=""/>
+      <publicstaticattributes title=""/>
+      <protectedtypes title=""/>
+      <protectedslots title=""/>
+      <protectedmethods title=""/>
+      <protectedstaticmethods title=""/>
+      <protectedattributes title=""/>
+      <protectedstaticattributes title=""/>
+      <packagetypes title=""/>
+      <packagemethods title=""/>
+      <packagestaticmethods title=""/>
+      <packageattributes title=""/>
+      <packagestaticattributes title=""/>
+      <properties title=""/>
+      <events title=""/>
+      <privatetypes title=""/>
+      <privateslots title=""/>
+      <privatemethods title=""/>
+      <privatestaticmethods title=""/>
+      <privateattributes title=""/>
+      <privatestaticattributes title=""/>
+      <friends title=""/>
+      <related title="" subtitle=""/>
+      <membergroups visible="yes"/>
+    </memberdecl>
+    <detaileddescription title=""/>
+    <memberdef>
+      <inlineclasses title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <services title=""/>
+      <interfaces title=""/>
+      <constructors title=""/>
+      <functions title=""/>
+      <related title=""/>
+      <variables title=""/>
+      <properties title=""/>
+      <events title=""/>
+    </memberdef>
+    <allmemberslink visible="yes"/>
+    <usedfiles visible="$SHOW_USED_FILES"/>
+    <authorsection visible="yes"/>
+  </class>
 
-    <!-- Layout definition for a namespace page -->
-    <namespace>
-        <briefdescription visible="yes"/>
-        <memberdecl>
-            <nestednamespaces visible="yes" title=""/>
-            <constantgroups visible="yes" title=""/>
-            <classes visible="yes" title=""/>
-            <typedefs title=""/>
-            <enums title=""/>
-            <functions title=""/>
-            <variables title=""/>
-            <membergroups visible="yes"/>
-        </memberdecl>
-        <detaileddescription title=""/>
-        <memberdef>
-            <inlineclasses title=""/>
-            <typedefs title=""/>
-            <enums title=""/>
-            <functions title=""/>
-            <variables title=""/>
-        </memberdef>
-        <authorsection visible="yes"/>
-    </namespace>
+  <!-- Layout definition for a namespace page -->
+  <namespace>
+    <briefdescription visible="yes"/>
+    <memberdecl>
+      <nestednamespaces visible="yes" title=""/>
+      <constantgroups visible="yes" title=""/>
+      <classes visible="yes" title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <functions title=""/>
+      <variables title=""/>
+      <membergroups visible="yes"/>
+    </memberdecl>
+    <detaileddescription title=""/>
+    <memberdef>
+      <inlineclasses title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <functions title=""/>
+      <variables title=""/>
+    </memberdef>
+    <authorsection visible="yes"/>
+  </namespace>
 
-    <!-- Layout definition for a file page -->
-    <file>
-        <briefdescription visible="yes"/>
-        <includes visible="$SHOW_INCLUDE_FILES"/>
-        <includegraph visible="$INCLUDE_GRAPH"/>
-        <includedbygraph visible="$INCLUDED_BY_GRAPH"/>
-        <sourcelink visible="yes"/>
-        <memberdecl>
-            <classes visible="yes" title=""/>
-            <namespaces visible="yes" title=""/>
-            <constantgroups visible="yes" title=""/>
-            <defines title=""/>
-            <typedefs title=""/>
-            <enums title=""/>
-            <functions title=""/>
-            <variables title=""/>
-            <membergroups visible="yes"/>
-        </memberdecl>
-        <detaileddescription title=""/>
-        <memberdef>
-            <inlineclasses title=""/>
-            <defines title=""/>
-            <typedefs title=""/>
-            <enums title=""/>
-            <functions title=""/>
-            <variables title=""/>
-        </memberdef>
-        <authorsection/>
-    </file>
+  <!-- Layout definition for a file page -->
+  <file>
+    <briefdescription visible="yes"/>
+    <includes visible="$SHOW_INCLUDE_FILES"/>
+    <includegraph visible="$INCLUDE_GRAPH"/>
+    <includedbygraph visible="$INCLUDED_BY_GRAPH"/>
+    <sourcelink visible="yes"/>
+    <memberdecl>
+      <classes visible="yes" title=""/>
+      <namespaces visible="yes" title=""/>
+      <constantgroups visible="yes" title=""/>
+      <defines title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <functions title=""/>
+      <variables title=""/>
+      <membergroups visible="yes"/>
+    </memberdecl>
+    <detaileddescription title=""/>
+    <memberdef>
+      <inlineclasses title=""/>
+      <defines title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <functions title=""/>
+      <variables title=""/>
+    </memberdef>
+    <authorsection/>
+  </file>
 
-    <!-- Layout definition for a group page -->
-    <group>
-        <briefdescription visible="yes"/>
-        <groupgraph visible="$GROUP_GRAPHS"/>
-        <memberdecl>
-            <nestedgroups visible="yes" title=""/>
-            <dirs visible="yes" title=""/>
-            <files visible="yes" title=""/>
-            <namespaces visible="yes" title=""/>
-            <classes visible="yes" title=""/>
-            <defines title=""/>
-            <typedefs title=""/>
-            <enums title=""/>
-            <enumvalues title=""/>
-            <functions title=""/>
-            <variables title=""/>
-            <signals title=""/>
-            <publicslots title=""/>
-            <protectedslots title=""/>
-            <privateslots title=""/>
-            <events title=""/>
-            <properties title=""/>
-            <friends title=""/>
-            <membergroups visible="yes"/>
-        </memberdecl>
-        <detaileddescription title=""/>
-        <memberdef>
-            <pagedocs/>
-            <inlineclasses title=""/>
-            <defines title=""/>
-            <typedefs title=""/>
-            <enums title=""/>
-            <enumvalues title=""/>
-            <functions title=""/>
-            <variables title=""/>
-            <signals title=""/>
-            <publicslots title=""/>
-            <protectedslots title=""/>
-            <privateslots title=""/>
-            <events title=""/>
-            <properties title=""/>
-            <friends title=""/>
-        </memberdef>
-        <authorsection visible="yes"/>
-    </group>
+  <!-- Layout definition for a group page -->
+  <group>
+    <briefdescription visible="yes"/>
+    <groupgraph visible="$GROUP_GRAPHS"/>
+    <memberdecl>
+      <nestedgroups visible="yes" title=""/>
+      <dirs visible="yes" title=""/>
+      <files visible="yes" title=""/>
+      <namespaces visible="yes" title=""/>
+      <classes visible="yes" title=""/>
+      <defines title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <enumvalues title=""/>
+      <functions title=""/>
+      <variables title=""/>
+      <signals title=""/>
+      <publicslots title=""/>
+      <protectedslots title=""/>
+      <privateslots title=""/>
+      <events title=""/>
+      <properties title=""/>
+      <friends title=""/>
+      <membergroups visible="yes"/>
+    </memberdecl>
+    <detaileddescription title=""/>
+    <memberdef>
+      <pagedocs/>
+      <inlineclasses title=""/>
+      <defines title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <enumvalues title=""/>
+      <functions title=""/>
+      <variables title=""/>
+      <signals title=""/>
+      <publicslots title=""/>
+      <protectedslots title=""/>
+      <privateslots title=""/>
+      <events title=""/>
+      <properties title=""/>
+      <friends title=""/>
+    </memberdef>
+    <authorsection visible="yes"/>
+  </group>
 
-    <!-- Layout definition for a directory page -->
-    <directory>
-        <briefdescription visible="yes"/>
-        <directorygraph visible="yes"/>
-        <memberdecl>
-            <dirs visible="yes"/>
-            <files visible="yes"/>
-        </memberdecl>
-        <detaileddescription title=""/>
-    </directory>
+  <!-- Layout definition for a directory page -->
+  <directory>
+    <briefdescription visible="yes"/>
+    <directorygraph visible="yes"/>
+    <memberdecl>
+      <dirs visible="yes"/>
+      <files visible="yes"/>
+    </memberdecl>
+    <detaileddescription title=""/>
+  </directory>
 </doxygenlayout>
diff --git a/external/tbb/doc/GSG/Images/how-oneTBB-works.png b/external/tbb/doc/GSG/Images/how-oneTBB-works.png
new file mode 100644
index 0000000000000000000000000000000000000000..f72427a81429a79c3bd783d0a8813dd5427c6800
GIT binary patch
literal 53481
zcmeFa2V7L!k~g{$5ETW<nN|To5m0hQM3M+d5G1yUN*2kfp#=mas|YAjK_r7@B(+Eq
zm7Ju>L2^qsp=s#!HlBO#%<<ee_uTKz%$sk1w(Q>0z4qR#YSpT$RqI~``73!EIDSP#
zTLYk=pa33&{{ZqBpaxJLII#Z%zNo+->O<7jR8-VQXlM=|I(p>jQQ9N4w8!Wej~}CB
zprfTd&U&1IiJ66k<tRNHJ1a9gBQp#0{!J(-!E30f4^vYgW<ExHjQL-Fk>3LhhbVfe
z-%?VX0uC@xP%==ETLB0FP*8)t-S6<<UK9twJ|3hwbodA@*r4h-aDal6@&Fa(ey_pS
zf#CN56$3Tn$qT9nnG9@bPPs9Q2S0gri0@KaGmBv#nqT6Ud&uD<tZeKYoC2o>h0dIn
zl#-T_m6KPytgfM{rG3T7__~Sd4Ks7w+js8T**iFTczSvJ`1<*WJ`4+wcoZ4+G~rod
zQu6Z`DOuUCbKd0U<rkD!R902j)V{0x(9+u0-tn>XQ~$u=(D2CDQRK|*-2AtN#iivH
z%*N){Hg*TMySGml1wi>5S%0VOC%PCwx(-lLQBu+D(?xN>2RtYlsHjg~ILN4KKx5;^
zbV@w<5c8!cugaPa^GO(@S#G)a9bx5{oDsn6llFtMzeZTd{}E+>C+y$oLIOuADZs&_
zWB^nEqES|q5b*2x#e-im@Jj}M$-w^x8Q64<f$&O-g_PU(t#Sqx=4luDO<r2Q-*JZ5
zq-!ixo(%M;#@M}DHaE(ZFTWO2f7k1*Mw;cq+LL8T)9y_4xHTOacxBs025@2#WFX#v
z3><5lUf*L?gpz>}92~dpO$O{{$-v^6oH8Pe3}imq6OGy(AaO-EPi>v^MUVk%G#S9G
zsLa$h@Q{H^9noX}4W%aoyxDjaHZq|6H4siq22>cftXMX42{LS<h@~4CIEi+K49pF}
zTikpVNMZ3{!|5gnNl6nMBt{B+yGLRp1@SG_2`}p7?upUBd&|Hc5ZGGCKt~=K2%km!
z5NUbE$Urkph2S5*Mt~CVHroU-0ztFS^RH0_8O0%Xu`R1O=q@fkYpFE-AN2pvG*)2X
zo2ZBpG-4A2QSXDw|Ec?bqVG4>(U;D^7iX2Dvzk2r-2FdMNa_KHqo*1I{Q#a?1KHGJ
z%YPab$e%}!m<h5z)A|3BQ402jW4q81k6`Mr?faH^1*>X@#7>rlTNKI~Uf_>o@PWvt
z-QIklM={%oedpL)sG4IUE$?8GYi6BR!fc>^(;0jN{@P)w+13-CqS;(Zhjfzf$|0f}
zhh}edu%>cq3qJq&UDnPZMk8R6-_7*UmDkU1m5eezb7=dd*U8iP7sS<S>W3J0tNa?@
zU$gKx{rR6Z3uC5g^h1j0#C2v6tZkgzc4ZGJa4%MuRu+mQ3L|Q&VoN*?ORqE%(@Jk<
zMG2>k3uQ$C|M+M~o<*R}%=A3u6{_j=vJ$o!6tk<a_$F`F;Qlf;z1Pk&%Hx?**~f*d
z+$&x=ow`;pjPs8eETonzIsP?0U()kK0o#fF(u=>WS4ZA|mi5BugZ@ZWL|D@)+`v_I
zTU_)k7cEh(YvcBy$gMcBiS~YJt!Eig{*;|8D6dYF*ei_R@`}0(uICTOOUZbGmf@D;
zUo#JX)r|c0b}Sok6zHn(L0a_jkz`=$xashpKPr6&M;MXnBtCV)#|z+A2Gf!T>Opxy
zxBjiu7C}sC>x#MbOHLw;J*b*%A4cdQDNkn48?%0X%X7nRBqj37c|AjKt=e`Y#|x%+
z1(*#?E*hva0|wT?*)WxXD#*U`7kxWr*-Myq36&LT276j`tJ9`NZnx)>f@$Wk<Vt(?
z)A&*EAjE)lzMk=*WnEzyv*{~enrZkWnBT3sG`QV>q_Ri8^(U6|bX<V@ebv?A4)e3a
zxtA2T1#UCv8yAaSaa`L(3fJP^p$AAT&_^iGSNXBV`gfCq?uUM&^r%C%FZ7Iedra2)
zdlr1CWVv#0IVwl4FEv-{Zb+0+@m28c<pJ=ZZDJ(@PZQC2QoD-^8PGgJJXzYcP7Ck6
zf(s-Aw$hnoAUiDR@yH@Uo#5*a@p%kCVEsy++4K|S+P`t@KOP>?mZLzYihra9f|W1_
z$0RjsPqfLCSc{lX!P%19ouEV}H|sbkX-9u>x`PbV4Q?r0f_im3d*kiDEt3Y&Q{meX
zHYbxky#yC*<E1&DM7nL=G2^mtk0`?g6OeBV4fY2ludOq$&8k8?sw~f8b6GyDD{(OB
z`cP%@(Xx4-lGouJ+`OvG*O%X<)G_HQoX?6n^GK-lBF+``qV+HlVKA5cNnJ1IJ%LB>
zYHn~`s&{!j(`=}<OLIwKBy;$DAxHN$iw=0oyUP4e3^9}aW9x4X)V)cEa6Y!Px~CUS
zh6o0^z8+UY^!Z;@ocoTW`S$3zR`d3nZ?55M2hEfKke!e72NKQPTi~njS`DmU6~Z_w
zGC#<WPNH+8TpElVa$|QM7Z;A{GJ0$}-_ny6OuKzR!_69Mbfr<gvsS5QLTbZ5(IjT6
z@=eWdX`?;J{d+fm9|Bw77LxjB1dfIjUbPnwP3ApM2A;UDlPJLTMR8E}NQ;|bhtA?2
z#HnS9T0eOOybR{B-K@@hjp832P-fByVgo8Ug=f7*2Kw_0QI5D=Y$GTqyKl(A*9taL
zqOLVon}mnFn6*>+?!L>b4@$&x?!wI9@5a)YgM(NM!({TDhP|!56LQmQWOyCLlJ3(_
zoMYeSp~!nSNA0J;#{TJEpXqt~tf=yRSv(N6rOydd7=S6DKYvg@Rh_ZC?iEOaxz{}(
z;gJSj#<!+y*0m?z7><{eu7`S*Rhb)Ri<)`subUnbDm99q5eq9aL5eud>LuTS%hGg~
zR|V7#@bP&@y%(eMI`F30*Pupedo7iaz;jljI7lxY2~E{ZGO$W+?FpBeI_5<yyHFQu
zFtDDrS+ri<(<zS0P+)i*5OaQ^7Fp+Y()@_$#K5T>x&DNQLn%juvZ^G&w+H)&g4hH2
zhFit~GEhSXh<s0*2&E79`QF*?OG}y}16y%d@EZuZS^Ax}C4|uycQkQefec&(<$EDM
z>-U@d!?SQIW~7yeex@neHQzU6xv1#$I}2!~pYuvw^P_Xjj5MG8I^gZqlIgcvpaV0A
z0Wp_t+B4y{wN+1U$97auhMLQJT)WQMx4on<>G#ex-#tpG=+ke{DeZzV1@&cC^28IE
z86?Lb;r>-)9W$NkH7!+`L58oB?*$%<zP5}%$sN4I;S-yk0^k?h;T(z(^iF#a9Xj`s
zRQy{fl30pUAY;$kfHt<~;mOCYm(M<D6cjb)#-wqgoHnPhv$*GqOqdF+0;VI@^94ak
zsc@xc?@heZ2}H`UcSvhvkqdikH^1vS@#zcA><1g^+oo#bV}qE%^)4=S)^u%mR*ae;
z)mRrd?wh!sYEd6;bCSY(;nN9o-iB}(mc#i7fM<=u&?5`68Rf+1O{@;qa)CTB?Of}X
z>bih)K3U`ZMl`O9${ph@Mhf>OGO`K?Y{aYv8%$|ipS}$`!lW;Vb;6=kDI&Hi_6oZ|
zJtfiNbcSXc-(%RP`K=R=B`)%As>3q<@UFOs4r`&2N<=UjppkNoMtX;O4x7gzh-I#?
z9Z2pmbrzq+Ycfn@g5zGsguLF1Ut7m(FGDIJ5!<6KTP`{+)~C^^IS1r=xR?5Y?;oZQ
zTuS2>ujX=cOV16C0=D;r=f|dyt8)U|Io&lgh*4;pe?-`c$%R#u5fRS`^*KZL&YPb$
zE}URwX4Ge2wH`vN%`JunDZx$-1f9YK&7igv@?QHT;SSAL_;xbBZkT31>qkR%Geq^^
z1Eo{7#WZt*p#)uwLhBU0<b*9s`8;~?yrpBE>*yQ(3jUAfmtpOyT;ENN9^TUMYc5S!
zRKa`UKF_wbVe`=u)2xjc+V@GOj20@9Z-$F25tZfK5*DiB3Fo(3D8D{%7Y-)IH1Xen
zSrQQ{_HY)5YV+_^>V<^Y>H=|v_iolzWw4(NvA?6XV<ixES$VY$2qc<i@MAP$r%}9f
zCL`NUJoHy;xZX4kmKaVRiYQcg{4!A2VdOoenr%(x^$O%zlPF9N(-W^~Hit6R@83SA
zsXE}r)pNE*`-4JjKC|z*QE*zAvwN;2#ZFN0>@l%6bE!9_S&k<D?Fqgi7EUN-&y2&5
zw{AZ<Y{EM|9Olcm#zY2Ad!SQE@1MYzbgl6hshJJ_!-Lmlc0B}vPWFvjHz5NLH`|e7
zNNM=XWzLQ#PP~KHcbRP3z2`SO`FD!oI6KH*0fbQn{gMozyw)U5J>9-OQr8gg^Ap>U
z%iw*Mj#LaFadeOhB3k1KLMnJG2)bKk+gO<&KBGzokgH$q3rM}KWI$#b@ez7Gdu;Qc
zHP6PYF%hOh$iRucV&172b5nn~-x3(%a3cc+uP}UM;0Qfw#JWWtf@IHJAh7My4B2A|
zJ-k1+fU1xNA#^G;P+a_bIL6pFp*7P94=2RPM<5&0BiZ&4&s-+zGp!1jq4!5RK_y2|
zh=Ctd`7THXUaDHZF^efRWz%Cy9N4gmmk@uY$A0B$)ClSD4~Hr)$o+Tw#Ihy0mN~17
z9L~um19z6QI|ml(NWGxvvFwWf7?IR(_iRzYZSctM_r?G$bl7<-^U-FTpBqoj*w(Jg
zNe4aVk5=rWfm&*Wx|EGg*?_A8>Q1A)85YV{EqPG+pL^z3kNLFuo4m@$scBjWTNW;-
zD4y;T^+>OOtIdA_a_xfkyJ>_%d(f!}tzi=VsDn8*+P-bODS@AHjPN>KVlG2NTzZ=z
zoQX4<?hIlk-0pvgdB%#p>w5=(v`1V~S8&3FidSNjqMnA|%_{TZ7W9!keXEdEJhyMo
zTIKb3U(2eqpS$vGJSn<gcvDnMG4DM`hmp00c=72p2dUSABVV?sW^}wW$iTe+^DACP
zh6NerLuL*&t&^SE-6TeWVxL%(lp_f;^q{e-AGz!@{o+G({;6lD3jHzf%1AwL)Op1*
zuLfQXdQQM+^kQF27GRK{k7b*8GTlVEo`)ATH_riclc}@%;qpy6nCw<>I8xf2HCyTn
zGBMQ3>JVYu?|C~zGXDh**_8{{i8B@|Y&f5my)8J4tH=U6YgAs7hk)ske0tmE!drnj
z4Y!1Ph5Kg<O(G<n<jz=WPSooUOHY!40TxcfZ;1kITyjpgM~IDq#YDbHTtL<oE*k5K
zG0A*mt`is_U3R47=vlM)^SAMU96uW9EZ~(c?^QmIQzJ3lseC)!VCSEuduh*}(dK56
zY}_f$PhZzZ(#P*yM4)%f5$N@`so7$+tMy6kSe{#~arQR~>27}9p}Ma+9U5wcOVF;u
z5vQv$CQlBi&*_SvPsxelBPl<l<G;TBUUt3N`hMkL4(Fy9PyS~89#R^Syjq)PoTqL?
z5<FFtGl5#%bM_T6cQM@F+Is8sIlN3$TqHlSA;)$oWD&p*nF}wkWh{106vsOgixBfc
zeTX$$dQxmkgI;3=wjA`L@ET;`?Kzb_X-ACwrhCthd{9L83wYz;HfT#5CAxmM+-&*-
z@M^_7)1T?9EWZ*9q2-|{6L&w4mb#1ebIv>^5|0Cp3$OM3QC(ojKp0{^2c}F0%2M^o
zK;H+1meZ`q7hQ9fto(W_h|80{uq)#3R{DRMw3-Boc;a>XNC@s499xIw6kb47UQp@6
ziESvyuT%yE*~P<KWXZtLHQW>M88l?TDf<svDBu_~-2N6k6%Cz-{QshLekMTZ?^;l~
zP_t&icjpfTs?4OpSMp$5WZ*+6xGo)e+oy>Q7u-cqlT^3Ol@Jmgh(9*yBLhe0$iQ{A
zSxpi%gjmuT9;Na({?Hfnp>{Krergc^$AMXsG$6i;B)K-j9|xMmyMDo}|KWSjpP5@~
zlNFCTs=paTO9=h%Xa8zD+|l*n6gn6u(*pXS=oh{<t=4xDt~8@wC?nK0QQH?a1#9eX
zHNc*P|H#+vKd;8Vzn^m&Z2cgf6pPhlm7&*@b?6jvhQ0gEr?>gtr?>9FpT|Y7K^ZDh
zf_MqNOjNOOU|m4q$TgP`wMUsMLbA<sk9B>&`5+E>73$LyZlJeOTgxtv<=R|2CqLx-
zrc(&M{Y>Y7WTrz6Y2&Cd(nr#~cO<BXNzb&pa8nFsh-qson~P4hKpb1@HD5+nPI@>D
zFH8osnrYohx~MJiKrzN$yJW7V?pu3Ru>)GL*@+oFG#JV7+<{SBT%(m<0>yRzKApe!
z>STqKK4s6eO6;)wV$_Km=&`9)as6YXFL+NMZR>s8ebMlfo`$TFx_8sbUebxuR;O4W
zLyV4t^`V+N{FMpyytUxs>pSOe@!vFyn(^b#Sd2m!3}&y*95NrT(OVDtH1-*zRA;>E
z(e2T=TQrn3F@c2!FN&ZCF1;mYvwe^e?R*uOuVtD*Rd`WAtH$eFRBow~N0+PbdTSp}
z%zE&gl>WoIv-TH0_Ktly_eK25%Na|{yc6>t??3ibUB`_~D>Meo!QutBlM-!<HMx`I
z!zMmF%Dl}`B7T@pR5~Wk<4FptiF*mo06SBl7$h->x{JPSppDI!60ZHumnhBcERsYi
zJM;EJ##u*`=v=+Zh1a`mbz{0s#ZuVP9K@;o{-^ndF(+o<WmM}5^hxe{y=x{=SEU-F
z_1k1cL^2!}2Ut$k1e=XMFZz0&`)L5(n^d=#%MdCUtKK^s+aljN(|Au-na8g&%NV%d
zv-x|gJ?`gakLrRBl1wks9?o7WsVz`h6W5nh{`B;1-(J53ar$c)I~uib^#=7#(mGj$
z$B8|XKX<w1!Utj#!&m&`20t$)gSqjuq*JeRa}+vK5g&@-!s{dr&pEbBX*R_=I>|My
z>#hneB)edy+63ZRodAbYQNEB#!3;n4Q<|JfcWrwC`4rLOoQm3{Nna$#tOxg#kLN$V
zpAJzt?zEH{9CQrPN8+5q)nDw-8g97m!)I~hb@!v{k95PZca(CStKH20BQ?=&nzTAd
z<vJ1P62cx|`-hpF$o!9Wj(hcDqTgtF1eB=>LKse`iY#10D;9Al;)*HtOiW=3wnL96
z67`<P!<xc6b#^^8lkqiY@*^*zxONnu<%E@P0Oi~39D)Zf-3O*AdT$=tJljL{a<JfR
zlzYNZarM}I?1eaob~?HXQGH6pAaH(}zV>VW+blaM6QeS3Sx*KYz?Yn$9)D6a;V>IA
zaO&F>fszcUnG-cj<9f<i?DaA$yuszU+L}1$wfrM#t7U(|ErgZ+O@(R>694Dxxc>vk
z_P^G|jC`4@qzQq~P~tl6Y>17;xacpvjPNR_kxa*Q54TfmCdl)l_bzVV-7ak^oXte;
zkaQMO$-u2I(7o$Y0djhxRnC^Sa#pZ-h;+7I2BTrr;D*0Y7UGhM^6w7Ckv+Q^c&s#m
z0;4p7WsQQDV_W9AR3@xum=@E0U~3+ob2+ds>s7Q2uMiG87f*xKJ>n!2e78E>;ecN@
za9m=^7(R8W0oKou$a2Ox2U54PSem3~P&DY{K*aXWDoV@=bCq&H9Zjui2DS?eD-R54
zm&In+L|p^~Y`AI;Q1Eka_OPr3@uJ5wnIr=PbTITS(XNNA)b8$>$QLIi3OuE;1Y#`K
zc|Bq_DDPiL>Bez^{-C}AW-1~_8mS*=-YvTY?mugN7H09jS#+3Y{jzV5zT;XD<5G}V
zua^^!;5sXpdTp>+pyqAgy=|3BiJGJRF5|{Gg(zvVdD97LF7|CbqmpUHE`{|bdKe1}
zME7EDX!aQ){AFZ<PoJ5SlT0HXR^-?59(s5=B{RIisF;U$s&$W)Q6M52{g~qrpTeii
z#tdIDoWP^&VXc69EuZw{bYebCrJo>IB3zg=lvpuZF6wuXZ-g&SPpP6`{{Z0vMrnJY
zz*E<HL<e&^*?qV;S7ax_v(245-zbC<c-Kv@i0R4k{Z<uCAL5@_+FBTGMo{BlCMGc0
zXDpvL6+F{^p<Xb9?(qDP)qKO_Z5|#T6UCwf*3ozC5Q7U31r^1_#6%K?J9Afd^s|VE
zsxm27$iVTY<FNAso~d^eqgB$C2fn?Jkn>TBfO^ExIX%Et75ds~R#l@T!ivr<M(fKq
zjBrvpMdxc?E4MvKA@~Z*O&374?MSI<nR=)~yRCF~X6|gyqH67~$IF#Cg}A0UIhM}^
zOSE44tS+6(qb7zJo>Oa!2IU5uW?%HbXz@@8W?oX|mSMNypEFS&nO;a1!@UC+DY?5T
zvspR1c(M2-88SeBc5EArrMEj(pjBG#U~+Pi&^BI3-*HR7gU1YaKBdK+naq!W4*SX-
z^H|*t-7b)Lysn+&f#~iBe42NuaUC(0pntzl_oaTWZ}QbtYO$h{x$Bfep$u_EiT=iM
zU3;S|;`tw^Ou^8KT3btBqQ<yQcd|Mepfs|>J}YnNTO)8~6~8Xdc92%Fs~%#{x2P6o
zza^azLuE~`m@%G7U+RQw_Hvkkhx4+cxl_{QOWx&nkI1+><L4gm;Nq1L4exoQ(~d@A
zuC$0ChMsQv?+mSOj*p$M8RoJ|O0P7BRquQ7YJd0OrJLAst|Z3wSnH$x@G2=0HWb7K
z3=8**Dn{pF#}r`kp)n}X#nD=anvsE@yz9~z%0Gwvn&{=*OtPcC<q8Xnc1+Ay+8ELL
zi5C3@PqKmjZ?0r~z<<9l`9Dt2{%5=LyS8&RYkkF&zRJT>EhIrqa`gH)L~Kw?@ycw#
zZL883T4!G}bbQgrK+KmAcJR@7Bb<(>l$B8%o37u9FDWLeCoRO?;wSGx8u)5x<Nfzo
zqn49gqLLshT_vVXDHQ_2*_=&CWEiu7^@Yj(;0FtO;T>%Yh|>u`Z)(-Ex<)wnB@ooQ
z({2Zyg`dU8HR#W+uO&=RA?dApVe0vg%HUo=bfuJiB^hAy)i=P?y*ldbZp-L$(^Q}?
zCbla?hWmjp9M$;798?})w9L!Z??}&))w-f)?%S?0H$Fz7?-=1sZNbNBU7LEF+gh%n
zMf$=wMmp`CxI{WZOol1UmNLM2Mygx_T2sP{(M>YC;@=lG<n9b|%!bP(Z6i<hfBZmw
z>yy#BFZ$N<`teX|PZgx#jB-7Cr#0C;EGfFkj~BLQ8Oifu*Qi5&%}&!GDN^-Q#^EJD
z0KyhDWsrFs-mDbFpy|7|u(#P#C{aSmgN?0?SL-ZoXs~*t2cs@_*i*E=-h;h8jCE7n
zK*7%>oo`B;V_8&TQMu!Km|%rdm~jo?YkyTVW*@|p)b6Ac%`vN!?4<R@Z8xS*{ITlp
z+ibx%!lU+-8)SfVco~hDV~ZsNcN;|rlz2_S2U~b9{AUXU2zmNIZ<D8;JAU}Z3u^~U
zt+t`3`p=Kj9FaAE>JYey8QbflrpCAqjB7ibfghJ%v|8uvAO7-I?`(fGm(U%XusD-T
zX6GBu&T%ZBt|Iv0sd2Pz*0Mv2HZxPlaRW1UkE-m%S9~&n5w5Fvj|?5HR5N#N{zOXt
zr|#NPO9&bjI|MC^2|Zbsy)5CxIf5NTc@#|fMjIwydxv=TGNv+S@!l0`qpFK1H9Rgt
zE)aN{h_4Y2;4-~hg=Ju_DH0ujaVV^<?M+0kuf~W`91<yKC8MkKIfUKsc7|J=?~-B<
zRyE?<5MnwR&dsEgp?itsr+C>mg?eKWhCC@??0HUNBi_=qw^{|Qn;D*BIl?NPA%qKc
znvRZ4ae&d#N9O1r-r+8<r0_`;%oFQ&8dN?=`aH=@%<w|6Tlroh0~Qfl7=fuVixwZ5
zs6CVPljkgv7mxc{lv8xxV*uV?6QWE2!D+sZDWds!4uY6GSL-l#&!MJP>(Q=glICX1
z(W4g<JUocge%<<ygFc&A#}>nzwGa-g#Yb-3eTzSxPOC`8BGJKZFz&9f`&l$_(>lU~
z3{WlNyzFL0G_RpEqhN6KqVC|L69}lH_f=?hwRtlk5s2!e=BFHREPo&i0MtHEDsXF(
z3`AsBOtsP<$CWm-?$lYP3}-sz>gMcz9Cj0^J6rg2bipsS#-l>v-mR{|6ac$|aUC-v
z>GI9)5Tn`1z@9)M(kU7D3caI;t3a=}1|1z*sH^VZUOilie^Hcf;u)uYwvAR;$eCCC
zb-*>6#Gq!C4Lg;?h_%CPq=!T6RUct|INKZoJI-lloytC$E!kWz!m&DOz>zLq;U#~_
zHx}cJ0HKnmA6rC!cj^ANW%M8ZzN><r0mDx5Gr2@CF1&R}c=gC`0JaZ3Szo*|3Dos%
z9W%9x>%pt_a9TY}KB%+`SdFQ+-*?NXRZd*_W@ykp@GLzEk)YVnEqde1lPGW{5fY!4
zSBOAI`*x5bcR;41b!2b`WZ+Ou416hbA45o00S^m$v0VV^Zra=|Ef^tb?lAxJD<I~t
z2&?P#zncGvm;YNhL-Xh0<mTt*AX-ddM=PANQ!tpIf5+9S^y|2;o7d|uZnyS|Gk5Qf
zJpkqt-UA~`E->jpLl$Ax<|#FlySzuP#udkXy9gBxJn;i4u@9E`Cx>ZwW(^x50eTev
zwabYNWZe^9szZy7Nwn-C9tCmRGb|z1NmXvHrDNmTu5ZQ^Hx3PRG`kcWZr9>ieyZez
z00!NR$G+d6OGx5$@K)B#Dgn)c$Q)!(aB?5LdTwe)lW=PC0(jrRSrFjL*hOO5OCHXH
z%j0{xlnbG|ka5F*ehG7+W5i}@!>{)LFD(6E#UBslpI{XW-i_0)oGU3;v1Kq7jAQ5N
zakf4?%5a);yy<c*%<i~xn6}Y<pQ$Zn#K~NFx4bvSH9w#ik=v@j2UUMQ|0C$dDz+M3
z`e<7$26-<h$Jf?kcr84br(QQ_dBgHlCpPkV{vCE2DsDT)c=H``2MzYxPkNt?+Pmh?
z%m}a-Hqx{Hb0KEg6Z=i>dq}_J{vWG`|5bAQuj(~V1ORSd&M8up0aws-(i8~Xh0?+(
z(D6~XaNE-pm+&8WPxd>DD32~$Ida~9+nQQ@`}${w;Dq4L74^UYC`CrM)P*b8d`zJE
zJ7(tu^pDI5*!k>%oA6NifSI2sz^~u`F(&I5Uw-lBKT`&vXGsH7Yy_`qMAR@RTezY+
zG1}&IG|y@WmR)e-WQMVz_({GnYusF})b@3l5#AaEw7~}8Yi8gA;>w#+C!yRUU#pHp
zty=Z)N#)DmFcngecmXb9cQHPsh$%ug7$L*dsmuhytUv(b4jB*{h7<19B89i;*VZ6}
zJ*XQRj$}vd?vXaZE%twQl@O`B8BE5>*`dLPi;;p54Qq&>?i`PUX0pMT0?EK9DG;#A
zRU#dwQt=kPxg6L`d<FJ6vvgfS?58%_B(}x2sXYjMBi4=#w6Dfy#sAi~`{2$vm~yp>
z@BaM9CSYvrk6oR!&&Df&o9oKS;~>c9zmS}Jt7?Nqo_MF#bmf)FPpiu6U*48?h{~_s
zIzJU=@VcD9U7ZW5b%n%O48r|J;U5S%aM`D}PBJJ0Gs`9*XoRvT8R*56foD!CBpFK=
z5M}opcRrAM_p_ZwcG8mxVm;A_Ef9(DjkAXg#DZZr+RfQ@B0XYPqXJA8^J)jT+`Z{Z
zfnv4bPC9&Zo49!ArzW01KiI9(fS4W%a$n~=7}A6ih<~kfaJ!oz`}^^scr|dHt^%F(
zhW<o>=1-j+;Zlc;epT7sYMTC?pp4IG%{h3h3w%y9%#$ae4T?mXyuy~sPvPZ}+`HcW
z@`R7UO=zQL9^thV9Q`zekY@J)fg*!;PHVmtAv_~dC%H8H>`a@$otiIr=ZxYjU+vC5
zt*@V&2ZMUPG<Cn@n*P-@%RB_4tgMUHTWm=}`+ATVIlSU4QP3J%SFukF8JKE!er)^X
zZYi`BjIrE<?6Q+M;p6%sS~R4QyD8=Zd!AulN#-tZkaFdcO|D^T1#|&SMUzJmne+*z
zf@FXro5U3XhSRgaXj0-lIBHVUlBSbzn`wA5#;z6aVhaL3G!gKY`(X5NOIKy1A(L=7
z9(RuiN{Y-SnSzgu8F>H>GcV09oE0*5V`_oGus-$A9$-L>2qr<>BCx|Uy9la)9fAy9
zDH*stKn8?CxLCVAh&P)V0zuy?@Na%9xGrB1dGez}HpHq}5MjYf1k>wU3PJFTBshCF
z;FuIJ8PE&9cRF*|TAw6gO{os~>I?Zsxbds||7dvsKXM<Ufpf+7A%+R2FYR}%0a8!A
z$)L*?#)DX1zI)f~z&+$ij&|*K4YxtlL8;xw8Q0x2P<q7LU2t%>?w9s+?sCr^)}%2x
zpH-BiTzIDKdYj?1g8Ir2Q9`A_&ZWO482kq8{w>+yU;n>wSn8ZlNHOWWD!NYB$u(|a
z08wSzAM{y8`W@ewO>aLdV?zCoTmJ)v0^!9TBqjDChV4Tpl5$!sxH45lbWR(CBE53T
z?+Rd!RTMs8@$9_#$AZ@{QWX;Gj@lx6J%5Toz;@9i`*(;zIP1qij)*x|);1_i<Bv(N
zd{~)0Lp@&X=6bY5!1m-NO0BQR==U5w=D;3Zl<+qc99x3RE?C`b%WQ#;B3eo32P6yg
zofn6sCd{W=`nvd?ugBI|3QOiczIgK>*jeRQSq++4Ct`jj9C@-qKSw$&-&dwRgY}(-
zu4{{V`;_v~nD?-WHP2xainsEf&4z(>|2&K++|^)(HU+n@7_3&N&>6mC>UfQwEgrrb
z8zQ#ID8wme+3xWSKmLsE_@AIp_1T(qvuOpRpm9s<&M{tlh0ADB|BvxkLjl|}1QO^G
z+-S^k-QB@uf3+{={TWyK$L)8eI4%+#K3}Bt>jJlbkI((ZrMjO*!|6|OiPArS0e4fe
z577FA6L5}mYbrHW2nN5D1Nzuv|4o!p$vu9ns4<P>E+2V|Cac!INiKD;u^mb4>C5iu
z$~C;9edf}XL^POrvBkGJo%Oe3ETu3sTeA|AB~GW%F*zkX`gHNBqNI@y1Fxv}EJo!p
zSV4>6iO}H&y2i1YND#aYJs$4289@r=@so=w&`7hAbI11)%vSEKq!nlz#}Y?&xevyp
zldofFqNI+o=^*-D+oBE&4%##v>^%v5r_;D`dwTl5BdG!{V>SR&2`KuyQYZMRXieiD
zqO25#4ZGNRPC70$VTyZD<wy`W(sx+N$6%=HjAR$BMvYmiHT8sW`1o~W`1`|4{&aF5
zw=;vIr;Uny!^LPJjM{SjcbQ@>Rk3$<KgkO!R17FZn@S6_nS>_9lzw)?*TE+CcAY(K
z-d3*W<!g+O)HIfMTI6OdM*7muWK>`noqE=$D#nnbF9TA?Mq#zLXk^E~Do4CTnG&v}
z;YR3=h%pOYi_61Xtxs&92A;-UWr%#=eX&RR1<4CO<I~zD)*??=Gn2`1!_s<*vzk-0
z{AR`F7D_(;1F}504%kp86HKU2w1FpZ7D2sQzJj!hF0evce=wZoek}1AaBWbah)GK`
zy}UXc&X<(^Ew<m>N+o^Ehx8)GzCWGL(J95mXSfSiR|wY{#pQsRWK1)q#41u%GcIB#
zD1QcofFQpYy4l?!zUpd9<*PwXz!4Sq4$RRceOE{`?d9d=Wm2IJVxea_d}TKltDI@K
zS<#U`b<Zts6hChIh~ORH>PFBQq=~ffYL=_Mu-LgF?(KJT%eujTQE`OzU_*}4SIx_5
zsR*ban7>oXrEwvmCaE|t=iB#U=#n4GU$D6p7{le7z8l(3n8(?w>sLWPwM4xC_{e{e
zJNT>r6HC#=H(f=JN#3l@x^07<R5o!37j9+?)|_ri#6_Z$+q{(z_bW2Z9D|_zjc;16
zm`>S;^ZB@CJd_B1py9{!7=FxWuIxhYXU%l=o<i^P6=Hy2+KqFH1s*2f+zplzzwe3Z
zku)#hO(#!h7y250m)w}kyt;Xv9v$u+yf+d$(g&@q3Er;mgDDi!o?G72d%@B;Kj|2>
za_Q4cTW^b}2aOq^@`K+DW8OZ#=2JB?tJp7oBVSI~dg`%(I?HOtwZBE^DMn$GWFR31
z%|-<Gi<Y?)cfJLA5iX#o2m(`_4IHn@fTN?i7*ctRl>XY%kIev8?Y#@3;TQ|;IPqk%
zsp4nT0HsMc%2vF-V*Jh9ic5K2;MrVQrEMV8=%1Sr^zX`I=a=RAW1`0|L-Hp>@;}fi
zaROImV-X|`mGI0RCU8xDq7+=+{c#}way|~2d~@ZYo9FmhD{O@oy@YtW=EJ-kS}~}^
zm%OYfA~#|F_lg9<y~+%Pla09i0^LJNb5{qlV<QKf+6UAZ&gf6rxyOEm&B?uAwuW1y
z@O&#Z*&WIL_6@b1Ze>Xx4huDj3$Bk`N7L?gaJ0Kw2iX|ra7(TjdOPsoI6YTy+301}
zIb*skTI4$-zJ-ezX*UhrP9+*zjVWqez3&}PsidiIUgI_mVM3ZUj+3~DUR9}&4|Lj|
zeM$N5R&AT3uU+e;B!)g#(m|4V1#dbs^Eg_p>WiI_mO|MABk*1h%Ym|9o(`1hkk@au
zI6V?{YN;lkzg~1pTk6)vTRtw6W3SXa`R)m4GDYV{Snr6S0<2b-b7%KbXV8@xdOauW
zk#d3;K>;GFb~KrZ-+)hB_^t6}stTs}fR9uKeA<=K!NkQUV1{VeJ*07Uht=>D#cFMd
z@KA$DKF(tXf#NCVQD+>{)ro#ooO7F6<hJ{fG>Q)o%-rP<F2<xFW{(NZHYMN5cSLGN
zkF}+!e^5zPPWKc%AWo<CXkL(m444j}vwW95+W4P3NX{c0_XM5nWp8G8o*r|NF6L6O
zC^T)#6`Rpz)2}6_6I}9jY@9^1T?6kuo>V-0H}>k|5SEW0shE0qq!y5_5!+UdTrVn#
z(i?kRcP12*dKIIO&wq;wt-SBQ$BCVKs0;xi*oD(#F_M`zNQX>^!Qv5=X}@#id31(;
zemn48i)SUdJ>8&*W0`e|&QsW-2wZ5NxhGaS?h>f}+})l2%#%>k_sQsPNjLFW|7RzQ
z((2X{vwg?_FkHfOB}{&^|E!XH{pY=RGux{qs$Q6IE{tc8U^WW@YZu)cZ!4gc<-<D<
zk3D;BSHOMWEMD(xmmjr%au`Ws6l7zoHD_uIYf5XMRaL)sp4`*%vTj=S;ChaBi8!KD
zJr`%i!|VK$1z7Kak{V4`I^#Jx`B)L2lG4&QZv-P7%%;1HG&07t&=9Nuo@HYlQGL30
zG@L3n=DfSOQbo$F@C3>hOi9%bZxU?OKekNb#?VK+#6#0_E}sg&jr^jjisGX4hzX%L
zux8L;baT9>oy%6>(v&{tf8)Znr*5eZ`68U!L5D@ag=*==>EAIKqBslE71Ne=JO_xu
zB616Fg(D;@i86TGcI%^W@z=ZJkyUsh<sm!4WJQJ7v`x~@$T>NhvI9+D{xpx7GK_NM
z`>+Y$1}f~vZo8-1e@>Dac?YHl{*&As*hpCmyl0(|n5l^phW8-ac>mdYtZ(i9)Fv3-
z6R`Pp!M{t3`YCJZ7nlB9WQk`zuIa=Q{Mc4~piV2B?j0McPe@|+XFFr>qpCMwK2|pB
zRv<~0y<TPIBxN2Wy$Ep4GrKCm(^eGCe^2Q-H|K7`e<nT?mBB>yHe<+iXS;ulP-9)H
zmLY|qL-6H(-$879ESU>sHSqQSnE8ZCjQ-jX5nNnQONN5G4d^Q6)8<6Pho@kubZmI?
z)M&xj_ar0ijob~Aj$0gGbGyFOUNV$2sGnD$jF<+Wex-Z_*ET2XMXM4aGs%!}In%nP
z{OJOhLfN_8+gVa~fx@=9!wPW}$omwrcz^pQAvC;Q|LdYE+B#o3e>PPiR`bfhc07X$
za=}lrQJKDKLWbAr!PS!cGRJ)vSv;@>I17vf)&QsPgUN1zLtufkR&dq2%4FmI25sMj
zWj4%bH|C>dqXlO#$!O&QH5|<}3&mh|acG-7G)~1)>}zyuionR2r`4@><H2+HU^VgG
zAr=7~e1RpDqSu3401ZE2Bmksb6ZG+!aH(YAeh*RJ{2Gk__!$STZx%vJ`k29hSq$|`
zSG$O48ul!#O4ez3%KG%o$)`q4^2g1%zJ1D|lQ+$U3E(b(SQ?5cL>ql1f)!>qD|Q@&
z;On~O;oK*eZ=z8d^OK#&o?BnN$YMr&PquS@qz7KTL&#pAPA0;A!EG4rV}bbDW4vMv
z_VP)I3YGV#EOZ>#GJS<#8EQ5i1A<&&61XZSyu}SiYeif#-l(QIR(S<$za>WHYuZ-r
zFVdCR;A~)xN=tr{7BdrmsO119HPnk37Np>0Esue;LBq`vaUwzd@l+FIWZ<?hvTOF4
zqqOOv1*LTkp$!cq>R>tk5WVrtv?j`N7%MS>AmNApj7`H`f9240qR;g^V@tb#a;T|M
z^@xbI8vnhT!&Gr!WD)`5(4p5MN8(F@j;%oHVSeb+S>9qa*9;-(Kto1<0M{{dv7@KM
z>(V|PJg>{-=Xg8zw!8RymYY*zmo6$McR&trO>nMYf=&dDXPiQlf!3pnk<7|x%KFZo
zeEihZJH7Uv>U%!-MVdEG6~qLDlZa_sW|>9}MyA8CqtJ1ZKHeboT0;eesR90!s~NLU
zyVaEg7lCR$Ko%kv^rcCGm_~xYctH3_EB!;%?0P)rv%8lH-6}7A0vJ}{YEQY8dMAZV
z-NZ0dAesB=;rSi-+vG5sIF;LEATAS-VgONs>#ee`UOFyn+D|9?BsaYd#T}fg%s!2q
zdU(tGjXw)NWeG8Zbc|p`EKufNMzAURU<Nue7zZ0J-frmkgiufAglF2gG(Nnf6?H!K
zqz`Nyb%Ie(_b#b*I7n;&?&^v>-O=IyOnxL1B{?CEoHGs?zbMA1m8B(kA&wz~C2~}g
z;ze1THeQr8X3a{>Brz<h941M8U7b9H3!AYY(~j3o(5QPy>W`B?#a3<qq~$=4soW8*
zPwB6X;J4tcP8o{C286u|qi<+SO%rqDkYxJV1s-9;Yc<D_&$C$DuX77OzwG>Z=tg;l
z>Pz}w`ROJpm^&J}hMx||WbvIdi`MF&-92Trsp}<rm_d#G+xXneC2?(lQ2|Ma#);vL
zVYIkXOePff8Gi{kKoay$2_3_!HSd^TM@?kJ->$#vF)L&({VWsSP&9wL<UM`93b?OD
zfvaePFe(cN^;(Pc38J6l!W3z<?M-ze=gJ=0oPNfu>cub@oL=;`MI`W*wGLVaTZ}Wq
zYg;*D$p9V9fD9aFMqW`D0F{#6g!!({$(s=pt*PY(P2b((oQCuM%Zdw^M!}t?cEwU$
ziP0C}%f>_4sy}ZD2k?`D!1ym1iOd~2SiInVlx<-1{_jz?lJ%L=w$tciC8fDm%hy)x
zMDy8oQaN5<n2(tb2j)UNI&!a?9#*$Cc_ys-A*)U**TnO7F3nwkm9QWYq_2$i2t*$}
z2tmg>V$Mk{c}yr~JLYp=X%S5F_^1-V6I{Gb4}%ZDxMU+*CJ$8%Nalyqj)BS8731^A
zv%Bwn1fIHuj#T*$v2-cY@#gH#1*{hik3p@Vse{Ym(v1r4^%gFy$*4EcpKY7aJ*_TW
zmq;TOb?Ce41xv{zB8uJ>A3p@ReY|Xjwm9-SW=@WOG3DK?ehlk~^|90sBu?}YB5W%)
zpDI~Z)OyzJttwCtxILCg+v=c{+cZBr$rzoIYQA1yHDX~sa`IL|p1a_iG2zjz#!}mA
zjDBk=P8&u!Q+f<;7nq9Y^4T-Ztnco@D`-r88JY-~?ZvpZ;6*5{`r(yQI+W2$PAG*t
zvA(-z-aK=ZGz%ObGO`7GgmSmRs!(y=tAUfC(Hf&&z3x>%VTLLnBSApk3m1J;aE;7l
zM9kcR+km>I9<PEI?{p>uBfCv^RieMg1j_A=FsZX7%HPkXJ|xWVWca#JyZasr#A%wp
z00BBbs$}pazgO9n?V*5!I+OII6B=at9{y)MP#T5?Kf49Z-=k9}EpNhKg7KqG&A#97
z@h_iYnfUu;;A00^+iDiRN5!%o_VXvJ-yrLQWS}HwqXN2fHgm)n+*ve$7C@eZo&T-6
zhd<5xb%;4k4l~c0@iNX?APkjj-)_e8R?W8QNSu<yR;fx>S@9LA<xkJB{#=HIXQlWI
zxw1!K60`J&2!goO94F4x^)inteHc63-*nC-jk4SLIlC$@o}i<cOBw3-q7S#G#pGiw
zl?9qGRI~FvuDLm(t+(t1Jrrswu;2M@xr2urq@!k&4odiVBqA%ut}o_h>hQR=f8rDp
z;Thgj5rNf>Z^yGheJQPRW%(;?$VMV5G+*N`o3wNn)0kcd`^~v?1qa<}6e766DkQ-K
zHPAXtqlR;fmxInUV3Y{e>(otY)r=OUUsQQ*RcP3`V|?B#9zjP5flmy1y(nrS;3B2-
zZTALWtXpc{D_*CXKu<)^=DXz#PE6dBTmmh|C!$1@(0GfqaoDA}Ay;9@`c%h#F3lqo
zTFd5p(0GE%9Jr)G&Gc|Vxp+*kS}x1itMR{%xv7C?PP<R>asK8uhq9cy<y+%#KHjOx
zQhT|#D>uqd%YJ%NUhW`j;pvE4UChf3(ePNej+mK{nQ4DFlWOm!YkLjdj-Z>78nCDu
zYS?uSVL7OAkjAyW;d|6dq3)pe8QDE}bDdoNpz+wfGkc&vkkJu1r+<i`go79Q`ZVt(
zb7FIfg`)7+YacXowo_0Wu-m<IrVGNz$sTBMk2)*V8_P9XJz3m1dcE*dRmoGG%Sj)>
zD9Ezhhrew`{x?)R`&S_W{~hgF<`FDlnhb&t2F0j1H5RPYO{ND>r+m%p|IQbA)babA
zLbh$%yY)C4mQ`bu%9ZYzcgyt>XP?cOC{~zif`y7(n)VA7XSRWGlJgNDOaMfO98~}d
z6>|`vWFYhq9M=UF%Ju#YH!~*}^ePMleb|F_irIa@I>iz=FlKxZ^aJ;|_9I|CAT&h<
z#N?oD=t0CnY1R^0(Pkg#!5*ka3qoo7z&gd}*TFi)c3_?2qbETSgCx9#4yQm0hl8!A
zKR`$lQ1$)t4<Hig{9ZU4DKHzXQ*1K@)+z4UhjFv3{S9=$1J)@%N)iL%oDWq9cblU3
zD>Og}1e@)nVg&qOCh7;S2iLN~4&BAZgLR63?tk{5Xap-X|3JuKA_mVRHc=3;PVpbR
zulW;wQd?I0#W+CB%N%{44SW%)><Lc1KXyO<X9}H`>cEm2;DGeBL#}-QPnG+1ihmju
z$e#voq|XzqYyomVGe-IUf>DZsseoR%2zs?W#V&HqtMvHP)H2C6f%lac^OK+r>DY3r
zi(9t6aTiOSvZCe-&2#)bjD75`p9Q!5l2XdSbzPa%?_r&P`HU__+D*qt28mhY^j2Gv
z{jXQ1s2~Y_1=?p1ZeCXPUeoB7miCC7aGJ0$UNXtx%_`LQv^9@$8t`1KP(A~W-=+PH
zDpj#V@F{#LNlKF-&ekTjci2}A+%}(pV+!!*QDA0mH3rdz<2A)f)9=EWW;1cO#iF2F
zjOYju6H^CDzA?PzB+L*jw3Pf%Wt})e1~^Nr^0M)+T!g6ya9hxuOve1hXQ}*n63wp%
z{qJU-Ji2r(0mGz+$qkpX(lJE0m^t`YmApEO>~UKVZ#!}K2<JJb2X0U0I!-mUWkqe4
z-KeYWJagU0e(U^K^BXs6`^~|Mn8J@%|K-W@SMu6^wfW~Do?krr#iL&`@Si3F=S^Gc
z9*hJ{fngK9A{Uu;(&r0i#7uVlyA8#0aD&S%(_gefA<xn&8V-r_a<aI#w5Ss$EOGDB
z+*zHAcUo>P?!1_vj=RvP?t~KfHg<;ujhlBDTdtrnMlZa|bBy$%iSlw0ryfh?x>1B=
zZC*UB#k0E}!TUAa8vXrMk(H)MF8Dp2lx{ffp`uat`SjK<s@M#-X3F3W%XNcG`2sGL
z8_;>~Xz1o$!AFv`sJmL`1Fdy$LdrroBylK9?F`hS>dBATQ_1GNu2nh#H&6}Q1@`NQ
zTDtD=6iO24pk2Z5m-Iie<zw52m=iUMt21;6Rl5;qLAs=GIhs>%W0M^m=p(&!<$VuC
ziWO&9Nm$z4*NHrFn?o`EQNz~z*`!s~rrO@=w_sJ>oT|awtb?<0gX20e=;oIfHZx~b
zdjl37qm;4-T;I{0C8b`V3kJdUhj0Uk8G#|{Ne^Q2Hze^jVYGdU?^C-nbURRKH>al8
z^;Peiw{S+sgb6KeD?=@mdMhlB`P>1~i8&?xYU#Xeq>3nBY=a<8cbzDG%VCdtJ0roz
zPA1Yz2On8cajiCPP#0VczJGkqjwbU3S3<WYbDeT%;2U$R7LQq7Ba^2#4{ICZhOFrh
zeLD0~UCCqf;F40Ci-B6+1a_no{@A^Axq?ZxSFF-IZ335UJVNz=nhk?2O^n%Sy2`NO
zK`>j^?NwCBv)>Wd@tKXau+q@Y;<+TOep!y@{>IIi#Tx!Ne-jk*gth{z^eGt-QC9tw
zi0FDQuOH!cOvW&vFrIk@S#*@0R=BokSfFz{l=%?Blf!mB<s2wM=BuuOVxR<lHu14}
zqs#KV=Gy3okjLkqTVj%XDET+jSA?)nea61;kM^E(Gn8(H(h97wDIi}~IfcNVYqP_`
zY`-sl+;p2F-VFpZT))3^D~aC1=oP!z^FZ*TLPcHgfTJbml%iZznUi)2A+qh;%mLbd
z-lOp3x!S)jk=B}0ze(i9@W~It(i(DtZW5||c8_IG+?Vavp3Dj}yfWr6kN7CZwlx|#
zd+Y$->?vy{Ml}Cr(amsOWd&14yL!J~EqA3y+2*}sphRk+8g%w0^5nPjxS^CF8nK1<
z)4YdwFKsJ-9m@(cD0Io)=VOq~r*tyV^}H@AG%zq{6xj?8rCtV*rL$^}x;nyc$vCUU
zaZq3IR;ki?+1GWwVkMFa0qg{w0`mzCRTn)Wlx}OI@6BFzw7c>OUFej8ry(|8w`rcc
zaL>8T<sc3h=s7d1d(E0Mq3{qYs6WVg&h^PR&t3S?7H>np>Px8FE8UwUfg!<qkHjJV
zxIs(JkFwWJFxbX;aI6HD)u{9K?fQURoO!!1JZ$>CVntigg>v9TgO2Og-+krAlb3Py
z!EX}z<lPU6Oi>OFd^0-H;x=owFOiSFi}6*N)=bB|jG{91>*?ltiF#t;X@KHtLhg!f
z{E+h{d1`DtHogj%U_7Gu{s6H_;rd2dhG}Pr@;lPGEgrcy_PjiUk^wIS>M<I{CE2I@
z=w7j8WpRhr`kmMC7<;OzB<vk^?{)gVj3;HD_-5|sS3#o*%E%i>eGiY>bPJQPPzpOg
zmXy|aa#ZXuH9szica+LyeQv1>E2-Y;$K{$dRM~lR-tIGt_Bxg(bml;3SPusbEv_#&
znHBFK7+Cc~3H>IPv?as_@B$~@Z)BkSiwWGWUHSWE-g`9A?H4;)tKc2m>%<1y<g2P)
zdcxOgvnr(L0r7YCM{AuK;eHu<hvv8j4NwA2>DAD0xbOQT)I3N~$b+tQ{?L@t6W$9S
zhJ__)ZA-2`mQ34eiFY<A_4T<nEXJ1t-n2S`^QD@r4NEE?cS7xpmrp7_avzuFw&VZz
zs&db{6+;uTzWu@`K%a3Xg)!@K-!cYyK4GF^iC=DyL8o|023aIsh6GvNmvUU~v+dtC
zWjp-@?I7OPG3rXT$(X(X$(+!VsIa?R!DQGgR$BR4;fA74fy2OiX6*nMp8TXa+7L@^
z$`kw>-e)%lD5ESI5AMxft|{Bsl*Rj+a^~MO<&&Ljp1ixrta$savG1y%5O2O{^opgn
ztme`)u0(s&=@s!+;k9=wLYg!aV_=AtJ$h>gn_kzf-aBtyK|N{p?$b&<PhPE_>iYu}
zY|i^qS-7utH`c+lD6y8C-=G6`PiMY_nl0^^c=#q8H`S&pNYOq*T}Iyqq^W{!W%*RZ
zWdzgW&UnTi#Oqenhs?F6yeU4{!Z1Fm=~%AX%%RGBD7Pf&&b^E@lOg5+jrHm#Ejd$g
zdcRy^L#iN^M?fjI+`M=gi$j@qw);U(AKK7^M=Q}ZS-kZ12LBj9?Nc2D(@NcnIO_Nc
zgZbH4J(Ijw8Pc%xPkOFQWTpP5c=v_!%A~b(b00X^4k-!a<Ddu)y}J3{Y*PJhnW&!X
zK_P|>`J-j4-S%am*g6y|Z8e=4Ds_309-gXba*LWq_L?De0&Rx)?)2>pC;up(ziHqT
z^C0m@a6Z?pd{B#R@)hQ;V#K6d6?o+fJMJeo?}L9{p{S>k4V*itN7VOxb4@~e<q=p*
zH?vfCfWxx#pr!O-m4+TcD!15u?Yn{6XK2U${d>~o&P-e)1137PibjPF)vGnqtYv1;
zEqL5-2ftoy;tseK>(f#fUL44c1^Zd4m3V;5iM<FZbK-|smb=p&JqXOn3HnE|Xbb;P
zaX&gL_()L&Ui6t3364^4B6E1Weq7(fA11t~H%hAU0Ny0LPXq?)%dSHw=gUBS2@C$b
z`&NsBUBy#u@=pqrKp2fKu$MuGr#d*%L`vyO`vQ#C$PUN;@gFwalS7dZwQs|pZeDD9
z*C(=O3#w@cF9zyuA=@e$rklL%k_XSzX-@1L@q1C$eakiDp^0$a=fy9lWFiLic=?A|
zF?v5lQwP>MUAnI^edAwlFFfTru%~p;N(t2Ky55Vz1r6Q^haaNJD%)`(Be&_$7%1n2
znx@YnlK6)Pe%tF>v=vZz1_o+O%P%+HWdEiyfs3FGr@DPlV?J&ECRM*DElRrmJ8e8T
zWs53eG(CKH3OZeX$mZ+K%yf$<%WW=wnw9tPPV+x{SqJ(W*~DyA5dV-=k0g-k8aD(>
zvrF8#887z{Ke}`w&b^DWrDjj5^{Evu^ZJNEvVFw0sJ`oTLFj*P$M<DjhfujobJk>I
z^DbTN%!HcGApg5}pjj>a@abYjLsZu-L#-2_9pB}VyCt_Mc>@%+%HfPXDD%ol^_T7z
z-3;Li2SWe7#*}JQr~6G2Ki;>x2UX}+4ws~E&Ze8|{Lq+4VU>#M`1&U_slg+}yS^*-
zwV=F9|4^BgtifOoRQX)gm$Apdr*ALCXWnWP7yM-TVq6V0E0gyAoh>&6FA6Lam{$gc
z5AStWFVltPMOfJ&6aO*6t|>aDGL3qW6qBa70I;J-{wu-9s$xuBxE^bdU+vWzm7@%&
z1l-aR8r6@yPOKi-cZ<ND(zo(L5W{yPQHr_+_E)0RG;`bRKcDO|0v*hr-eA2ENiLMR
zuyGaUbbeOliHN8FPkV134|Uu2k55r5Wm5JqWl2a<_H9xjiAlC1rjjfZLiS-orL09#
zWJ~sC5@Tm<5wdR~`@RfgA7<%y>bkD`zUsPv&wbzD=lMO)?|FUuqrBAl+27~;cpt}k
zoX1h4U~qbp8y`*oz>H!35xKVSkly7qsV%uWj{PjBi;s<xkkZ;tzTAG75C?#l)Ck$G
z*>II$WE^<n)X4YBa?cH8UU6R;u$1XG5-SY^A5!eZ+rwpvd!3U;?$TB5^iJUX1Q%iQ
z<(O2^`@21_w%NW>q8xc|@kC05wS&`59&E4igwT#lyap$o7deKQHYDFq$+S+LnkI~B
zT`|s=<4UhZt-ToI-m!mIvDvF;`t^#;v}0=_4IXp&bhq#Ltj^xD=v(;IOf&uZSwl<B
z^*eQL-=fYMuiLg7O==JmA(gWByS76G;PKNMPVy<F7Z40Iy@1FZQdP#w=kvGwZ_)df
z$o#H^C3&`!FBm^}0n}-H>cRfOTI(|H)AbuC)k7VW*XDhb<q%Mk`xbY;{Ea*130HBu
zGFdNAE<lg&YVvTnu$EabTog2DgO1p+T4K`69H02ia|kd_M2g0DgKqffh4*)Z{_fdt
z-04v5*ksub*!9}1xQ7hTnX`8+__YiCKc9)4gs^zuu3T%F40bf`xIClr{j3apw5XG2
z#QC_$X*@vDyW9aJS?n!f&Ryif{cZ(3m@bRpq^BhcDVkXUt6)CtOIpRu<^BfEv2t^e
z+p=)Fu7ca(XO;O+ky-c~GDo_BIS)7xr;9RUjZzys;Brv%fV8%K)wc4#@+Ry%Z#Ew6
zb&dL+H~m{*o{LFt@;Mh9zdhnQP@0wmgKpp$`M3D+%$ecLl<gZfT7D-^xn_=^q~_n4
zGup~#i#bnO0_HT@V$K_8Cj`7(ZZ9v1EKkY4D*;L~*BHeCsP5X=Y8B6m9E3~DH<%wo
z>D0CXY>KP2zag}0_Db3Ot~J9{%Iu&?F^U>#g1v8|ubJV<Thy8ATR*jhP4{IDHg8W}
z-=i@Df}MiJX3x`df1^$vNB{@N#OVqpqFO(Thx&Nw8nUw_@4GJiG9}aHF4g&>OrTTT
z_RewLD=`W>ikuLL_u;Eey9EBko${6Q1Eb&tq#hr7GM_byyCz2BKgRFP@@9EC-9bq<
zvj~9R1h@2Ee3&q(l(n&qnE(aU^|_oLMIz``1&$?$(YrON5A?6ANi-P`gR)x4sr3VO
zE+d|XCh8{XY(Q_OaZ`uKDma^MHF!G<Rb_OF|Lz2pl=S$%1>D%Sy8FZlv~D_T|A%n4
zi0o?_)*1}=B+djq4|J#oS)@CI;6Nb8d|1x`wzw?sj)UavlZ@&;O!u~3V7nxKx6F0&
zXZnOO%`nd<QA>2wHLXfx$zmg02$jA5gua0D6LrFMEb=H|!V^W}08P2lQCsxc2AuOV
zbfRI~A{aP-Gw#NJR-9YTRfnQNis|fbHz=4UjOKtn?O0!XXLlSRO1`os*>?x(WC6+9
ziA^ZL0pP!_PGRZ&^6^e<A^msnJnYTA@}GPmAeQ__pwPkDgQ|kbPjM!@b(}%vNQ1yE
z#}0r($Cbk#y14$GWP{*N8(;)2AMZbh3v|w~XgY~(@;M{nyY5UKeX|&pc1)iuuNSn0
z=$_zC9c*rV6`ADinPRo(+ydl6`_Tv61p70bGsS9l{*6Dwray|U`Fc9N?YsIB&|T96
zALGnrb!&?#h!2P2K8_}p4ITHrX3v~c5(!&pKD?zA1tNDWPccseth{pp1Zp1KO%Pu`
z=#vB$<&YhbDCb$SGHbC*Xt~|qR~`8-;;w^~0T?0tNp{a+=KJ44y77+)G*i+z>Td*k
zaf?95AX@}__y%y&Lmi(#VAp7|%OxmpfiyBHRkHla{QP&2)?8NKexzb@(qPQp-dInE
zz+3G3>AU!h2jcUhiC8xXPTc(rQ7a4Xyu{HgJXXQ0@rm45HdP~6?~18f-&AY^5VbKh
zG5iCft6Soe`d5T*x#{A-O&7l$Is%kpUN)n!j+F;%WX-#0E_5urdN^v2s|y__{zjoF
zsM{8WlJ6W>i?wHc<?YzA9eC=dJ&x^fx>i}_fuD{Pq^W!YLY@PykfNRywFZD9mb8YM
z%lB`dBOM-gIDBBpf`9$>XsBgWRnf!9DLgR5twwf+w1x{AwB`pp4Uf{DU^)dnB3HhA
z5cAM%$ZMeBd8(cR0VeO~=fv25Q~U@x=gqr`8tsIUoRiY>KBhav_6;)0FZxSinP#|>
z;(0#igV+%->*b`jdQs`1Cj#?Fukw6w4CY|k2^j;oDH8hKi}^m~;rm^^zCo@=3X1{j
zK6Nnw_qKf`*WB@U3Z?7)&Y`z)#z-K)jy&8?08SC-axj4BCFVciS@bhJi}HLuQ>NEm
zuF(WKB@5#r8ZK5m=^FMmTkzb8fb(I6+Wj>N+cy_f^F9Pr7bS*&7GUp)3+`x^-bOF$
z%5{<nz|)P6gOg!PeQpH;zB683+@MBWZ8G+$)P?zuv6*yW;E|#C^vZ8d*;kuAP*~RB
z^+re1N4fz`A=t+qbS(i#zKAX#I_6tnvr{gRh(L4wO@HRUtl09kjCpo$cB>X<M*z=k
z{PVjP9m&BR2&OZTV;9&?2OeDJcam#{9F2%WT5Woc=YlwZlw2~sx{DJ}T7%v5z_?)g
zvns#C6S(Yuz%w8o2=7ZSnob~4VSF0Gj7`Al?mQhD176pgkkaD$K(jabRWumBbz;lF
zTNlj~{bAr!w)E%BKeX>qVBf<$1wVF!&uV@2?AxwQQK_Kahv#>4@ZSwId&wVGb5A81
zknD#p-X%LAK-WHB4N@Kf0(3HN$Kh)yOFv8|%Vo|Sa}xNjYJIn`bP@~?Fp(hu`H9k+
z`v&Q;1A!-q@1su-G`-)13|M%Fy1lhynmK@aO9ia0YE=qE03V=O;2pi%TOeBp<mZt8
zRt!LF<<HJhJaCSduW5b($6W0bJtFT^VsK|C9VdOszN3fAV2b~z5Cw|pYJtBd0(g@L
z_z0G{q)g81lM68U-Ao?$&a5S)diSkm<yE!=26=LmUg4^`b<N$;9h517nv-7hgC&kJ
z5;)a8e|OzclM|n{jL(#H+!YfeP=M?1P!0*5X;Ux=9euEcQI+Q3FltQLxw)){0~n12
z7!}m~PNA_7A8tUQb%&!<O1uO2`r=f@Ejxi${;uu>Tg2bBn6(4J@y-x%sQwm**2#+8
zkT7H5R+FVG)3~~FXq-r%o~({c=+FMt8L5EG#eQbm{zNg$*G?h^ij~4`MV0J4BQ|Wt
zzlW6$G@mKMwc6e_2e5W?6c&^cPQV?kdbX2AfRU4qp7N<5VS2L2)Ymh4y4$%O*zJyq
zH_SZa9nR@uWooB<WSN<uaQS@YgzqAB_4gQq7W7P6n^}=D7R>4POAz(HQ7DJNnCH;o
zeKYQHMffn8%4KD`P~DqUlofZ}{h@(>_M6`+l=UCj`1mawZ}+aC2yj#8`A>RAgTQ@{
z7vL$cqPO{O<6WC}Ne(j2u*v5PXo0xX<@{UKR_hYio){`YB+5Ua0Y(RZGV$Vwwi9zW
zg@#mIF_|PJ7hFFqR&79;+;v6Jae6t&AdyAyqPF(jy9|&5bK#E+o$dc6Wdr_C%MJWG
z?$`VOg@ONi4Ad;L2PrBIfx1JWgdD2(&eOG^0mNF+m^01xt8HKDWBWqK;Mcr3keI}n
zJPfK1d4U~t6(2#~7`u^(V`$MOzbnkncju<EPSe;CRfC(nl+z&ZEC5405kfM7Lorhx
z#AX_k7)Vbm@~Tf>!WWo!!9E8!`H#Yf?^BdO>e@mToFtq74KlJ-!>OIPPV>X>1=(aH
zU}-QQp+}EqxXys{TjtMsThRRT3IBSEHGOzEwSsVy^66i?Bc*V}IOd+mRm>>`dC|as
zaQ(kLlez8&@+<GJNBGlc{dd1Y@&{7kkj=#<Mok2ltNYCSh^jxwk<J@#0?xAf`p{5~
z!w~t2kl)^O8-U6O&>S=9zaIAgc`AVlQPXgl=c@4A&^jqrhU-S=6u9})e8z-j;-&tx
z$tYp^+XrNoc4LF^!@`RpR2CRJfc1>sA{Gn3E50EEX9L@pl4&o`ArBe$-)6Duh?kK~
z#!iL!H;d{eo9;P)LUcx8empXPb|97mlw(o>`Ik(f-78n3swceD62nIhiQ4SMOk&(z
zejWk;@eFBtI;%#oPh~^@8;9%ThLH>?Ug?h8*{wFpeNNnB3hEQ@TvZPrj5zGXA6(L*
z34QG2@ZySQOUj7EL2HSyyCBbRHv-hsj@!y}WzfY0!H6$NwKRX|R+6ie45?E@gqD78
zgZ(R_EBzZpf!u)q@&7?G?T^P_c^i_}LQ`F5_}?+U)AL-7^6A|6c?-l7<rCs8mxiQq
z(x<j5F6-zkp=f8izd=?PglIn2=8xhn=EV!_tGkQV2M4_T(EOzZ9c3(}6Z7+KwpsI%
z#=>`EEW`zZTaMhhqZq0o5Y{c#WyncH(k?7`!{_M0{)Kmo-4@8uPMSdJwarAhkFvKa
zi-8*W>o1id8N9uEVh(pwl!&8e!qhq!R*VCJyaom|gQUlYp4GH8U7WwdbZT4eCGTk@
zFdCJ*peXb)<*iiVj=@o+rq@^Gk``J5l$e*o(w-JzBScsB1_#N%GHw!{X@1z0u9y5Y
zSD@?BAn797>>EUt0c7El<fAB{(%Hl08u-d(G!hu6RD4aU4)Wahi7;C6zjG$o4^d6K
zEAs{fUbfo?ILhVu&o-VbI>SNei>{iN5is+AdXw0iFL?zYuTy<X(CeDatq6*sGI(!q
zeYY~Pd9-Mfm>=J*UP}6ACUgvG4>!V678XEN!XN)%{ioxlF8V8fpE|Jrug2#l5xcN9
z?~+ob!#&wvAK50(+g~jf^UC3*<7%oaTG7RytNIpi+im1OowDgOx$x(nmH#y#y1Bc=
zanwXyBW6bY39pzHf8T@6jxmRFXFGS#KX>{*SlOauqvH9o>fp6HA({2qloim%{;b!Q
zKLz<mf6%YVj#WH0rNk~dvukE{gyZQchbb?qLFh$lKr+Z7e}tuOAc@$w_#a9Smh8k|
zsypDyG1$BemuoV<T4&s_1Tvg&fqe7jVbnK>mm%dC?PEL0U$5+@QLrTadeQ!IlaPb2
z*Z<>D$Hq;3|GUOam*{}qGdjc=?_q-J66%^5?vts9`J-1wA`b;*MIdn5DTMpei_F&I
zF8LGJ^~T=3Y;X+v^E2uE`30rF&|k``c2pjR&zZn!Xfez}Jy3P9FGUy%$><woFdVer
zEmY-BfB&BzGFu`@T(0(#cVj=>W`V!j#H(7VmK@BOy$8x4IFUul85R#Hf!-3A%49=n
zYE@jCnHCXNl3}^E({q-=$R{?(;d*}-cKuMA{#T{90pkl6b|u5`Y_PdtgNXYE!Hd#Z
zFn|7tBIB%hk-3|n$uB@V(*Ix-i$hk$Uk0%z3=x#O+DGiFCVhH2u9G4VI}!qgYu}XI
z6A>x?v2I}2bv?uPG0~jukHXf7-D&U(mT&zj52!c(C|B}t|I9E!)eP_u2XF~fn|b)e
zY4^O`1zwON;>LY?@YIeI@6|qYosEw;qEa&)gTwvQ_}M_rFQ`Nz%{5k+*#8orIN%zf
zd0`CSCbq!uQLO5;H|Y40{5W&-!|yrinY$iHr@Zxt{7biom0oo5_Bt}l%U4{|QYHj=
zP9aevr>-3{49hQCy61mrJ-8z3I49U<!;=o9u||B1-4ugwSodNU_4~P%gjHosMeEzC
zhaKf}wCkfVB(PIPz+)dP=<1hIb{uFkt8b7712E(K6Mj4vslT=9fSC*?^C!kW1kDpp
ziTDNyReJ0X`c4@j*)UVNpulT7IQ*jy0BOTWGnFltg0q2>(v;IRX+Hexh;NW*P#aK6
z^&4afSYFUs7W7uVh6eR~--7GC%mim<Ri}uG2f$a1FiV}_bR#L7nc|zfLi*vfGfLq1
zNiePsv%&vcF{el7ix#v11kETfmZA^)%k9tP;-~oF_W>j!Yv8z8aCt#cYCPoT+Y*l-
z9!(EZ`GJ%JtSz_!F=GTxBqXg3Y>aq91xJn1{m(usAH0u|rq%orzXm8V@mY6G=L(b{
zG=zNO4zEBmo1*Xszd?ri+7iez(LhgE!tGF#cP0+wOVo}R+{&yqDOf<l4SUD*MzsSw
z?j&Z-P)pjB#TCQCEoInpXKiU(U_T@B61wG&Qe0orJS{6)F11|O<p+{^{KfhUA9oo`
z7ie~$N?AI@ea!at-C(z@*wOWeCBpHf1j7i;u6W-o*KX+!&w5G>2k(%`y6_C`mvaL;
zlEpq8MNfJ@tY-E=3UwAi&AT|OENj)API2#?<2Mi1Oi#CDjfxXvIdhQE=(>Dma|um2
zVL(XCMK#c%uV+<iXS5uSZiJTQ_iTKFlrIS&AC?`+^+4GmMr>c(q+E*IaDEx$xaVL`
z(q2}tO#g8TlGtoW3<*jgR;TlHj#t&>g`OW2tNhe=IdG+JH0B{J(;XI+;l+!VSY)8^
zGgL&x2zO+5Nhp2Ye3SRFzw_GJj2pgHOjYfXQEL$;MQvUpuBJ1U(mrc_nz)w(CuLqd
zw|J4Ve%O08%bg>#EuB8fKGMeVSZ3y(%*;}4|1a)3$<l4wVnX#}>-`GTm~;GBNJ7J<
zbeFl*au&I25#49$1hHRkyC&Q^{W$6#o$pt=cK>#2l;lcV*>O~!mCKGz<LP_}#wY_Z
zmV!`;LJe-;FKsHLaC-FZZh{ROG29T%U+w<zc`vAgW~FOxdhX$sseZZgsalQ+9Bmir
z5(zqrf3hNXhux<^`}O$;HUo)oZ?4GRjCG&Lyn^jaYtI^li_Nv=r=gOwl2y6x)3UV_
z=?mR5@Ap%=JUt~9@x%DaX^I<fqNgLe=%{y6_3fh0qfd&2YtD*{+1_=m7&7ait2M2q
zmkCSEXtckZb>30Y%UFK$v1nLeaF5giP2?m+n<Q$D-p9UX9_&B9D!#9#Z!qb6RN2a_
z@ef|>LJKEECnHyh;mIaVy3RTI;&w<GJnF8SY})0w@f@Q4$S8brD487NODrDV*Zffo
zj*M)+9NaW{>FULE$K5mnA8nSYl}lU5DxokMB-Xd2x0=OJsOx5}VYf}fiMs}kqd|*3
zf?|((XP~Cm&E*?0&_~}OY^Ks8gFP*QAx;GhD^ich(%CRBMJ3-rY66@D6|*-;e^SP0
zpK6XUH>ae|#`ma2GhPmicTwseT$V~oj%wcfGDl-?N^8R*misq-GMIKLukzSY&gj5G
z6fdNmOi#W308U6Z*x~UkLQ=0dMsl=4h_^zOMgQ5BCSpYZ6a7pI)b{bH0|XLTsJDvU
zpaY7%yCimVck0W}Df1yM7#~1?>ge6yAU6&{sY1cU@*AVWm@53!?!kSEg7!BT9m&#_
zHhgWG9^xdmOmnj09TrjEr5>9EI{UFvsrH|_3NMoS_}!!sVRWm_*Am0b{aHjPyx0Td
z@-K38^WSNb4)Kee|2;btPA$NXMUu>DH7F$Ypgr=0VGgZh0J>P~M>#ay7jl3CaseNH
zsKAk3+ZxDhjAEf26MR~Wq1up}`N@qjoujPlZpZl%`x-cfQAPNfFbech)4TDf#Rlz}
zc(qDUIx0?atLy^Zpz=<Vc%@No)gZgcjQpd_kJIg6zcL1$tnWRu{f3|#938%m_=?|>
z2h~I<VTiXLIH@J1xfmT-WYI&}kV27o8`)uQ+vVzR$Z-cQPn*P+^T%$Z7^pPl`F}B;
zT-W^ud6I=1im2*`*A~sk^_GNYMI`o0jV&6#(KxZI()Wu~Ge)}*25%IRvX>In=`qgf
z7Z(qu*cHw%)nqCv@@tt47WLraQIvhgFdumt|0897m8P<|#huxxgBS0wWqX(%=5bb#
z*tbf@9jxYf9b0AhI3LMuhxHjyNt`Z1?;KgbTrhs*61V;Hu!{Me+a|kv%C?hyD>iGZ
zb)bIeeMg^58Z6=0!e&B08z?h09zrL`(P25UV#MTX<3YbNkwt;0$sg0LWUyjo@n*6c
z0%zxT8Z%gJJQ>@6jyd?%5o1;%gBNz6Ls3yLHy83^A~u5W-)mjdH@7wDMVEB7+pMnU
zf3htlE>w0EvChZ8rKr5`Ov)v9Irh|93A`C)ek@Qp`M$OwE5sC(uQ4DFQvG6q2r5X<
z_bp*wJY8wZ*Ht2Bg&A(tJfA1y!lqj{Y5b}9+7knTyn8{x(FIxQ6<&NTXmR49N|^yZ
z(D-wX-Q)(l8}B(9>8bMy8seo}D>t*l%&4UB=Hf-2$kul;&05EUtaL&o*8<HM(rhxj
ziuz-&Wm1Fzige4R-PelKFc#J>lhQ`wJ?jm8_RGb#hjuc#^ClFQFK@2mdqMN646hSN
zW-U)@_FL;u*yKU=&nVtge52kEG++bVtNkGYSTlwz`j%;-;eFlh4daukW23?~;fC50
zACMuj%?;<eo6AK#;EYo-{GbdQD$#Pi3*{);%~oBaUC(*z{N78+hl<SRS28f1lp_J>
zh!1&%ThJ;DPjipHICp&UOpD@i`=C!6{Gkl8{QSYF1k$*@5JeR6=p@6<-E9pons<~G
zoDpz;fS9mC3&i8iV-HP67rhg}3_4eq6gg${HnAou450Hq;0hxN9+c*b_bnZp0&k+!
z){9Fw>;}3N6Drs4&6pl-6FYJ6bAHSc$Gc0<3$K;)^FOa3n26Uj@0%WA2JIH7<+bvA
zB*_?|dOr{4{uZ^`mjW?YV-W6bB(p`2k3~Dy9u1TC8GmZqH)kJ($vHbHTF)5tk<qbW
zeZeHZRy>e)3Y6&xayj2F6_R6Re_Z65=S%i-SLUdR+hTQQgQfSIk_63IZiN?`zG*J%
z9v)m+l^aGtSJj1Oyv(s8b1S4gT81043d`N+3e_nrjXIOvZDCoSFH^`jaK?dqFE`CE
zY1gE3!y;Xcyk7|XP6{p>Y_rj|zIm}ciur6Y1X4Gr5V?_8+Ph5CI@&<1^!o-;Q&N);
zk}?Q4_Gq#<BsWwTL?s%8QwIzP>%0d+ckcq%_^lY#)q#_sub;yLZ5vpS$h_P2=T6_(
zI!K&}@E};q3aAeEv(o)Zxf_nd{v`8ZX=Gqjnt?0^yDgT~-?y5A^^PBuJ^U~Fz0(TQ
za^7nijNe882P((XG=XOSt<2ny(jNG=KM43gU6=tV`c2FRh?@N?u8E$fK?IdveI88B
z!@RwqGY63Ec*^td)$snw^MYV9a)lWNyz2)Z|KpG9=0~Uk9g$&G2=Y_V)L_5igYG0+
z2QTNMou8um5S(;T5ky3G`$eyTr7lc$+96oZFyA08Bbxl7)ZJzsdkWj);F@xipQBC#
zl~$U+tU+Tazq91<u?}a07Z(Le-?VjPt9}VggCs=T-%Pqg#Wd6UX$@p8{91Cv7*N`l
zjb-RSN|`AE@A1Z>OtfxAOmvtQpJlyl&DE5dWN9$G@5R3DrQ<c~pBaxGd&fNei9bm+
zhj{!HlJ?n40hbpvSzvOO^OAk)onEf(+6*^XLx!xAD+ZaY_LHC=O~p%Fb*u9?jRl-H
z?<U;8!EN5-_NnUNr=cShW$S%9`s1G$nr*md8wL@gYs&ssUHAFxGwVEcryKi_3NE5`
z#K8)hIMFsg!&OwLvujy3fFNTa-=_XDfc~W}N3E(*>a=g5FYqLpXooC|@V-tV?4;Ps
z#knmj8;{=mX{%a|KO+pW(QjK$p&<CVH$$qL_ajN^!x7b@(~3fGNnW3(mfy*6X?f?7
zHQlb<K3Fi%SgZZ8`vqEIF(d%ZI82@`<`J+iV=H`?_*Ld*63XDlP6zdV*~5+%qrUzr
zdez!eR%%8yn$B38Lxy?Or{VI<;qsxuK}uoyVYs#V%ZtIWL#(Ygi-~#Z8B&Wc_@_5B
zb{8CFLb^i|=$Ygcsi;CyW|9dC2~~z({ZhUTEQzB!i$q|K#Qqz)isr+3D2T>z56EQ`
zmt8N?7;*X1t=UT_I>HY<+b_FOltN?UUge=64~i*skr2a*-MvnwjnVxNpEo$S&KKZJ
z-utx5+;BlxaT9pM!!IsVJ5q&&)vg#gmu{Fw7)Q1zzy{P3bOICDoji<Rqb#yV;Rj20
zgFH?@18J_y9Vet<?1XFLU7QE!UiNVI1QiF|pK*8eekR(K-l{B#RwyFcJz<LHX`d-N
zno%>+tZT8XSUxCWU^{oZo8+e)=hpAxD(Bc5xKW7h-t6rUImF6)u`NVgtO#Sg8MC;^
zI1H^Ce6*Qjf->%!cswG7vQe%+zkYS9P2s~M#u!MsB5!FS)E~2V1;1wslrk@oOKD6c
zc^K^F_jpF1T|i?i=bY+)yeD#in!%C(@mPf%9pWLBJUxS8_Xg!Ea)!);F}af<q7flA
zc5}u6tPxx3*);Yf=cNLwoas)!s4v<Uc;K?3$qI_{8S4XMTGd>5VhStlL`%5Y$2FFz
zM=m3raraMVs|iL}(Gw0+Md?Nu9!T|zSH~PFM(&%Dj#M<v$#o3iJkZa#%+z+swxys(
z;XbI1=L2Jw(u9Fi<#nPFZgz21WipSKFFWDR?|-j)B+3#(fOu}5DrB`^7n~{=dB9r6
zT`@l=;~wKQZ~w?LQwzIu+t#VF3aA#d!E5;<3;i^q<7L=Y)zXbv+XkXsAChI3P5yY1
zYFV<AU6Philwih{aP_-p0!$^_YH=R$$}e`gFmEq~vTgy_T!q<lJEQhh2pZk`u<uiH
zl1bR}j#Q=eSd#8gG!#Juw;NJ|WV}AL=HMpn48hcX{p!TiEwK0ga8CJT7%6B`^BO5E
z<#@yrqsK07vHMf9k9SO+RLFxrp>c5QT=TTGeI#g^RG2uCF;_w^^L<B4-(i$c5{XW)
zn|2xRagyBxUC_g7zwi0~DN>iFSLB)5zaCh^X?N3u8ikR@oAZ<|ybvTSK0d>y<@dPv
zo^uS7#Pu)HmW^&avUa2AI;dj*G;o6#`+K~IdhUNVa`S&tkm~=YM{UO~9JDfJ&(DuF
z>=0Y&bDJ=BohW*y_W0~>#scE*UU#af#?@0kOe$l{NC8?Ka<3QI&?|buj$&s&`YuYx
zUv?!539Yi7IE(e$$1GOP5d4O0h#*T)_()Mh$KoTZmHEg_PxHr#vm;X>BsP2K_2J#k
z?t~cRSy@De$f84WyNTxsP_<^lv6fY*drdnm-&2xeLmK?Fc^0^fyH<R*GTiVAXmwCs
zlWs99h-|$T9tK=+^t$VTLDlECi6;3Ehdd2trf)y@>OU~qh;o2bxp`|t8<21HiCym#
zF+<o$&chD|p&Wt1_|jLGcd8R27DX?7AW_L&qy<xB>~72ARU4yuF?aEt>sE_6+>0Qd
zYBvSJON86>&&s{SOye*^3BU|XQc)NEs(IN+-osF)nfA=GSg>rz>}sp2#5)~z=;Fo3
zVyh;H%Qt{bkg5c$r|j(|=HzQ$pSZL$ZS&pHMH8t4?=PGRb-Pn}CPN|h*eR&abCX&M
z>#1JhZ;+dqC(Q!Z3yjmDYM)Q(;Bzw#`CEoxdG3yb-lWFCEfITZjRTDD7ZLt9I!@eA
zZ`2;t)J;<74i42SM!k1YdA~#8na0Y_!i7h%xco;nN%Wbhs<QpW$$(W8E~!`8pa`|w
zL`oxPm4M6LDvyJ2Zr<yEijBYz#q-()z=vXh{4HxgT89%Igl>E|*2JZ$UI&RaSj85u
zW{RN?5%HJXOQh}|kI-x#^VQ13U2-$ME^t02p?wb|4$8XNO_&}M-$QEGCno!qD2yWf
z<-3Aurs>cJ_oX}95w;G3o-=ViyA(7k=y_G>+RJuRyoeTrZ9{b>n#23f8b@hfi|JbH
zn%Vhyrv5&p<n(zp{c`>e-s<jhJP~1x?A3tZi9WhMe3c|Q04pmiiE%4IP*a?)oj|V{
z%BVq~<*_=C#)>yI%VFc;cfcC*-~qS==w^quCuJ{gfke}81m!A)iV~+U?W<tytrd<`
z;a*JL@nUj8;*QuG`!j3{_@RV>9s9q|7zqKD>aTp9n3;`H_-G{laNP5R<k@qd%%8XV
z1ae20+~{rrZMVFRl29Y--uJN_B!pgo0dXyvJ=)HN*YLr`5AS6~>MO!u4EgMmTEbRg
zf?+sz0_PAJ$&HpG##T1(aXqACWvH3AnAk~KZ?6oM^fF_-%&c<E>k3@L2kp0Zwi9O~
zPTTFWm^G;teG8w1Vdj7#1ZtVY^unO)dgiapl0oYv5i)I$C~?V-+1kkEk)r4*2y$$C
zMVwYiK@IF9jt)+DW#L^Fi#wjl&+Fe%Km6R(oXkf#+oCK2*6CI7mPl5Tv5uCZO2>*4
zlP2n&fl0ZMar*X*Z3YGgSKe*k^UU2a7gM1q8GT5D8c1UgV!pNix>eG|@Ce;xp&NJ8
zRUd~+t%hcPOKvl|PZ;xl@e3dgW9VIMF175*bM@O@Mfd05KVT;uP-ltYQP^k%ed^D^
zoD4^W=6n|&t6@2aS{NIMiQgLBRiZhHYTiA&<a2SlTZPhxO6Ga6eBC1Ug=USj#hNW%
z4ulW~A8xYOLcQ_17;lOOL-acouUyCB=P$M|N`H!!)8*gRT3HmU&$109N>rHf+@?Mw
zm~foRe|r3hxg5Ql?lSUz_sBXyZqeA}JvGEB_5p?&U?L!hI9a_Wovq35m}X_FH+ZM;
z(o%)~a}C<;d5s2cua=f={~#;k-}yI&Ag?dTC0j3$9+8ir9)DaWjs1Z6IiqNhxIiwU
zV$P$*_hWc@W7C0#D0{zg1BAo2LSoxBJ)Yj3=Zo3RCH(frG#~e=_j2^S)m-yvi^VX5
z#ffMZu9(*e)S^=lty_#(N)+6or(Nj2Y`f0N8aUOSDkvvrP}7<&t6C|pUO1CUR(B27
z&yVyxty0t(7t#=LHKtsu*FNxZ{{t^y-p(K_`c60Hd?a_i#Fwnpcc&z|J{V6B)+Q}o
zZk^j3Y9DA3IW(2Q?^9JVa1z<Qnw^{d>Z$0(yQ`0=@1(|y$S!N_kH0~1YXn*ctqGJI
z+*}x>N?fmf<Rvm2!?JiMenj>&S8%E)%X5U_QqInSdX35tLzD!b2ZZZRETg_vA7xWS
zm0-y?UY;n442vr2m{#1eNM}HD%-W}W!IjegSnf!)rm9HH=WPsGQ2P5BnJ)TV6WK19
zH3byiy@_*ncQUe%C^<hC@Q$&Mq1>?7JC@lgD_r!{dgY|k(V^7*xAJz3lrtS@p*UB+
z3ptOwG;JJMe8!X1PWZ={A3FzuHo5!urn?H&u*c9XD!nXD{z%{L9JMA`pQGl&f8^5@
zsG8Dd7b{CNm)&crMZ3vF{E@Ww>zQyrJ2AVB2&w2RCXQFjIxO@w7KB1aR0H?NM+fXb
zh2T`iY5R-nz0iLiW>ftBt-tV-tu;@P7_ex37<jjv>tP_iCgqSii(J}?{|3Rj!B-CI
zioMq9hs6Pt1|0if(m`6eG;9;W<Lp#}W(T1Og&_nP@&z-k=+x6a>V$bJZs1j@NwQy2
z*~;Mg9v%4!uMB@_{XSm58L|cpR48gVgv^<VS<(84E<`5WhRw%HdwIrSO3}cuViT3`
zZ{6%PddDK8A;~elEdE`Id1By4N%mc)!g|Y(uLn~r7?!2dZ5DkE+7&GoH50E|$xF5R
z&Mg^Duf>?;rf6%A)zt~nznS#DF2>q;T#2);UPlXOF%kS^M5IzgB0SVZJx!gg<{Dfx
zB7DE}^tqN6#AGv5l-amo`;CwRO7;86Y=(gk_hW;&Cj3UUj1AxCwh?soL~K{aa$)9S
zmgO57U*!adUtcQY%3H5xu<;x%WGjwTymKUXW56$dcJR<@saaJ%7f(!d0?9?I5I((s
zDi33^?B`_nis&)QIo;0p9;<xVS_TiDLmwvg21&Qg4XBGGxPAO&@8e<ylOud_yxz!a
zU!~)7QDPPo>mc|fUHWTc+u(^>izJF(XNDr9%P?o=98Qey)-|>z8H;?gCNuM!fxK?b
za;tm=^~W-AYP0m+GbqD$)H@032nu;v21k9w?3aRZSPsD2#gE|p_Z=9V>mqDFX>t8n
z!}t@SF&@YQqTP$n+6ei;3AsykN4izfi&=ZgtiU@4S03(Ac+W83ouZ`W(4j}(gHGcv
z62e3;Y(x;!9Oag+JIf66w;F2N-eB$0SQOQb82)Oy_oNZVycXU|Uva3pzaZ~)vF#}Y
zv0F&hLf$^r*4#q@t9zj%Tw$r$#CYpS%RArKbb>~q8|)yPXb85+)z$dt6q#s*ccd<<
zbu$FS;YJx|hkt_EAC$;Y2Y3!j3B>G!&kKQNAr(_P({-|ABTpGfmeII<H33ODp7RW{
zAx4he7$u{?GIcB&Nv7aOkx93Mj_<Xb+=zWMDO_?pb9{sSSQ@6!2txt&*Fi4GI7py`
z=YeH$5W3k)x@e$D%`cyrd|FTbXX7LtPYl<Sd5{kk-LNF48B`F%l`ur8IpfhzLqobG
zeQyR%*-_Al#B9;*BPfn2j+-^Pb3saT&NE3rSn0#i4cidgCW%^Z#~IWkS}#~6pQLru
zKnVm=D;1Xv;)PT!m4;l*5WM&>>c!hAcO|x@)^sD`V|DNHI;Y&vp`8}LMt(L*aD8m%
z#;vsnCL-p2)u*bVFDEqNjfJ<KA{<<_jIF3RR<mm|50z?U6=tn?ch14sY<pa&$DU#Q
z4-YJfv9SWFLf;^OJ1`LxYcK5Md~pGrsem<7z_MdK4Y;K@7e%WFl&<QUbSC114;J$E
zX2;z%Q@FhCjZ2N26vAjR7&{^+s?qMmh|j%dC6Q}j?{=Z=O5WGNlpSR=)Dd^X(|>-b
zgg<{DL$3QbLIbbl^;u0>h=kwi3$rCJU{kx{)jVFvUD(G0_~l$xn`zW>iL$CUlq^Gs
z<tcUD+3N(||Mz#69%xlbNfn*B^k&i)Rm>w3plFs(8rA1|neVdJHz;;%8T~F~oU^<V
zq7c)OA0ydiM-ep}E?iJ-WUDcV9O$lB$*#MlJyaZWqF-b7dhJ>lh={`1@ar3xnh-)J
zoQ5G_7M4H*-iwa}UR*ISc5{cuq}ys0mr|&jFZAJm9s&CiW!<k`PLF$roF(FGFr2QZ
z)k8E}S3|PDsC{l=@41O)lT-X~uzMhLW)P<6mSyGQ?zC1s+0%c%r4jaJ$mCNM{cW{f
zLu*nK$RAJo6Ljl|Uo1|z>>4Z$Z%TYpow6ic-=Ed+AK%u@gh`XB;g>?y|KOD-ymny%
zLk!VCZ3v1EuTukiF|=UTpg(`rOc;YTTR!HX7fgWt<Y%zQ)lHP!J6Lgi()W5ns`yPM
z_tVLHV)GwI>ul<RsXoRq`^VJ&w|*iOy;@>F*i3!|l|MO25kvSVz<TX1<F}NyORCD~
zyQ-dYPAcKFOt@G{VA>F;K#jJt<Fk7bD@rWehLq*0ucQ!91{6uVN2qqSFzc=|&ZlE#
zQRE}KWM{Ydd=0_g(6m1DIC0!L?}-~X#FY>P4Wc-WOLqwIw2T{L1N6Nd6}N^Yy{3i{
zOc7yDEZ-nA`AKsd#$Lplx#d8Z{@Vx2uB1USsIy)<MvX-uB-YXn;O8(TwdD4rv`$*n
zGOc~>LZItXNoNmUj$CV3>Iqe4*|y{~IH!Phg?=nr!x3dhnbL_~?WRR2!Z{UMZGPv<
zpwfeWfs>c?&TA`JJb+X_V926~l0;KU>J?r`S`}?Z33ekvwNJRtVeB(Abk3$MZfLRW
zuYo*1mGFW-FjVans`FSJG>9Tb-a+cCFoj{ZO~vNIpXLreylbvXtmaZpDGlc2$f=He
zs(efM_@EQRfYcN|2Qe4UKG$bA8p{OQ`Qa8GZ?1lgFmidgAo-=dU9sHYHp=Jo`kuP+
zEN;m5`+~1x<EG-EA!sS`Zr6rko{wwc#E{YTCyLvKL>pe8Fs?dn+0`4LH{j4<V=wWU
zzl9)Fc-#SDLYARbZyL^ZFFMwgooc1%rl6z;1haAZFPrrO8ytiJ>7+hK2-by9grOha
zz0CMbwj7%Xyz-LMYx>kzAY144{pLfxm`V*0%NL>u3>+!w&Zqj$;qNT#tA~e3tdH6a
zjLJ=keg!ucim}0xgt8uyZ&^p~%!fSz2Qw}neSOHNF{L&spu){odpxMSF>stC+n~SP
znM01=(?*r$r@piQ_V3$(!DE=_RVI!P_+pJbi#3XSCXF|+yo9VQ{Hgs_d(&K%(m#Vc
z3Grgav?PLN(4x&WCDR5~n?0RY>1VaXkDAF#&L}hq<0W0YDH02n;+rh^r9`)HklGYb
zx>kv#`VDe6f~JRslU6;%Sd+W5VatouxsdeB!0w^u)q^lqyc9mLiUpR9L=0mo?ja<z
z!H38dVa)hN!1E!7A6nIaKSnw89L*D3$O{rK_IeNlXph7xsiv648TeoB4Q5o0X|7#=
zzlnoxtd))Z3pd8%iDCxi2^*-I>3~o6lAn(viM9A$_^B(PlXUpxHwZ7N&b&U%PThmt
zxKaY@>2}WL>a1p{Qz#e@=&xt_@B1#As;zSrg@i9wMrgRj`|SMSt^uCUef+9>(q9U^
zf$Y>cn$@c6C_Rud)ps7qxg&oo;QvP<fAEvLIfQnI<Tw%>!W2H@sX*4QJoKpO0(yh5
z+WXqMJJPzXU(94D3ZQ?%p>buY5$feZD>rE~5y`YI$e*jh|A;;HA7?;%k7fF17eCDl
zUiy618n#UE{IrPu@w^~+@&_=l86Erm2*1u0Ofzns|DRtYVfJds28p%?Gl&N(u-#un
zxPG2_u%Ez;HGdnDc?&){O8(+$<VPVR9TZVN;=AMLd0G0>Ul|7|DK=!`=C5b@Z~HDF
z4pON7?DsIp&rMnA4po~n64wKjo2jL7(~*Nc>u&H~Y5T8k#@WTTtFld<P4YwT2I3T9
zj30i5Z>uR1Jy=Yps5;*_@P9Xw5p|^fVRWx-GYOC!*!XxJY<%2J02@&J;lrBWw>lmK
zTOEb+L0+zC&f8dADy4aW{e#~UwgBvf{As{3u(~e}_Ch{HZ0&`N8Qe-TYVudgL`+~@
zJ&s{S$ib&+EO@Zpl3DRISTXa!(D*|Ba@o15gx(IC#k$|Gi~O&7T_PUh550D_+Z`^>
zB_jPYZ3$!7ZpQG4(1*(ChMV7bO}~E^NE*m^8-mi^h#lZ<g4Kh_%KtyNM{fUBEg<gK
zJNVCUv;FlBf4#$B82I-w0R7hEbaPSveP(@NMo%MhpXPxV)-}^G5JIhjf)&dZAX1im
zzB`CF2}qhhl6F~l%RlU5F|=DNQ=oZyA;;{$LCkO9CkH2K79a>qtm?&6S@4uN5Tx94
z-#iS#&ZCHLkQX2tGTOQNhy{Zh#ZOL-(^RP8K0w%FVmD&{`PFo&*kCX?He!Qe&47{S
zNyAK_LELSxQaVUI0#0oGp6@QH9}crAjM-2@(3Fr@b=3d3Ls-vM@r`v5z<s@hp`2X9
zf?Y@;>+zWI@9r{hCrAVYPWJc?;4XXKRE71D7B)6EFwZc*p6h@3dyT;$v~7(<?a6AF
zgQO7J0Zylo99z5h0e0eb2bkKV9R${D1~#xr&<e%6Guo{voTpD|k6ygmo@lAtK3kIK
W>@RuoOJ4lKz%LB^FU9~c(f<!keib4B

literal 0
HcmV?d00001

diff --git a/external/tbb/doc/GSG/_static/custom.js b/external/tbb/doc/GSG/_static/custom.js
deleted file mode 100644
index dd8573b7..00000000
--- a/external/tbb/doc/GSG/_static/custom.js
+++ /dev/null
@@ -1,37 +0,0 @@
-window.MathJax = {
-    TeX: {
-        Macros: {
-            src: '\\operatorname{src}',
-            srclayer: '\\operatorname{src\\_layer}',
-            srciter: '\\operatorname{src\\_iter}',
-            srciterc: '\\operatorname{src\\_iter\\_c}',
-            weights: '\\operatorname{weights}',
-            weightslayer: '\\operatorname{weights\\_layer}',
-            weightsiter: '\\operatorname{weights\\_iter}',
-            weightspeephole: '\\operatorname{weights\\_peephole}',
-            weightsprojection: '\\operatorname{weights\\_projection}',
-            bias: '\\operatorname{bias}',
-            dst: '\\operatorname{dst}',
-            dstlayer: '\\operatorname{dst\\_layer}',
-            dstiter: '\\operatorname{dst\\_iter}',
-            dstiterc: '\\operatorname{dst\\_iter\\_c}',
-            diffsrc: '\\operatorname{diff\\_src}',
-            diffsrclayer: '\\operatorname{diff\\_src\\_layer}',
-            diffsrciter: '\\operatorname{diff\\_src\\_iter}',
-            diffsrciterc: '\\operatorname{diff\\_src\\_iter\\_c}',
-            diffweights: '\\operatorname{diff\\_weights}',
-            diffweightslayer: '\\operatorname{diff\\_weights\\_layer}',
-            diffweightsiter: '\\operatorname{diff\\_weights\\_iter}',
-            diffweightspeephole: '\\operatorname{diff\\_weights\\_peephole}',
-            diffweightsprojection: '\\operatorname{diff\\_weights\\_projection}',
-            diffbias: '\\operatorname{diff\\_bias}',
-            diffdst: '\\operatorname{diff\\_dst}',
-            diffdstlayer: '\\operatorname{diff\\_dst\\_layer}',
-            diffdstiter: '\\operatorname{diff\\_dst\\_iter}',
-            diffdstiterc: '\\operatorname{diff\\_dst\\_iter\\_c}',
-            diffgamma: '\\operatorname{diff\\_\\gamma}',
-            diffbeta: '\\operatorname{diff\\_\\beta}',
-            workspace: '\\operatorname{workspace}'
-        }
-    }
-}
\ No newline at end of file
diff --git a/external/tbb/doc/GSG/_static/theme_overrides.css b/external/tbb/doc/GSG/_static/theme_overrides.css
deleted file mode 100644
index 4e782fb5..00000000
--- a/external/tbb/doc/GSG/_static/theme_overrides.css
+++ /dev/null
@@ -1,13 +0,0 @@
-/* override table width restrictions */
-@media screen and (min-width: 767px) {
-
-    .wy-table-responsive table td {
-        /* !important prevents the common CSS stylesheets from overriding
-           this as on RTD they are loaded after this stylesheet */
-        white-space: normal !important;
-    }
-
-    .wy-table-responsive {
-        overflow: visible !important;
-    }
-}
diff --git a/external/tbb/doc/GSG/get_started.rst b/external/tbb/doc/GSG/get_started.rst
new file mode 100644
index 00000000..b8bad34b
--- /dev/null
+++ b/external/tbb/doc/GSG/get_started.rst
@@ -0,0 +1,20 @@
+.. _Get_Started_Guide:
+
+Get Started with |full_name|
+=============================
+
+.. include:: /GSG/intro_gsg.rst
+
+To start using oneTBB, follow the next steps:
+*********************************************
+
+#. See the :ref:`System Requirements<system_requirements>`. 
+#. :ref:`Install oneTBB<installation>`.
+#. Run your program using oneTBB following the :ref:`Next Steps <next_steps>`. 
+#. Learn how to :ref:`Integrate oneTBB into your project <integrate>` using CMake* and pkg-config tool. 
+#. See :ref:`oneTBB Samples <samples>`. 
+
+
+   
+   
+
diff --git a/external/tbb/doc/GSG/index.rst b/external/tbb/doc/GSG/index.rst
deleted file mode 100644
index 0488ff1f..00000000
--- a/external/tbb/doc/GSG/index.rst
+++ /dev/null
@@ -1,121 +0,0 @@
-.. _Get_Started_Guide
-
-Get Started with |full_name|
-============================
-
-
-|full_name| enables you to simplify parallel programming by breaking 
-computation into parallel running tasks. oneTBB is available as a stand-alone
-product and as part of the |base_tk|.
-
-|short_name| is a runtime-based parallel programming model for C++ code that uses threads.
-It consists of a template-based runtime library to help you harness the latent performance
-of multi-core processors. Use |short_name| to write scalable applications that:
-
-- Specify logical parallel structure instead of threads
-- Emphasize data parallel programming
-- Take advantage of concurrent collections and parallel algorithms
-
-System Requirements
-*******************
-
-Refer to the `oneTBB System Requirements <https://software.intel.com/content/www/us/en/develop/articles/intel-oneapi-threading-building-blocks-system-requirements.html>`_.
-
-
-Before You Begin
-****************
-
-Download |short_name| as a `stand-alone product <https://software.intel.com/content/www/us/en/develop/articles/oneapi-standalone-components.html#onetbb>`_ 
-or as a part of the `Intel(R) oneAPI Base Toolkit <https://software.intel.com/content/www/us/en/develop/tools/oneapi/base-toolkit/download.html>`_.
-
-After installing |short_name|, you need to set the environment variables:
-  
-#. Go to the oneTBB installation directory (``<install_dir>``). By default, ``<install_dir>`` is the following:
-     
-   * On Linux* OS:
-	 
-     * For superusers (root): ``/opt/intel/oneapi``
-     * For ordinary users (non-root): ``$HOME/intel/oneapi``
-     
-   * On Windows* OS:
-
-     * ``<Program Files>\Intel\oneAPI``
-
-#. Set the environment variables, using the script in <install_dir>, by running
-     
-   * On Linux* OS:
-	 
-     ``vars.{sh|csh} in <install_dir>/tbb/latest/env``
-	   
-   * On Windows* OS:
-	 
-     ``vars.bat in <install_dir>/tbb/latest/env``
-
-
-Example
-*******
-
-Below you can find a typical example for a |short_name| algorithm. 
-The sample calculates a sum of all integer numbers from 1 to 100. 
-
-.. code:: cpp
-
-   int sum = oneapi::tbb::parallel_reduce(oneapi::tbb::blocked_range<int>(1,101), 0,
-      [](oneapi::tbb::blocked_range<int> const& r, int init) -> int {
-         for (int v = r.begin(); v != r.end(); v++  ) {
-            init += v;
-         }
-         return init;
-      },
-      [](int lhs, int rhs) -> int {
-         return lhs + rhs;
-      }
-   );
-
-Find more
-*********
-
-.. list-table:: 
-   :widths: 40 60
-   :header-rows: 0
-
-
-   * - 
-	   - `oneTBB Community Forum <https://community.intel.com/>`_
-	   - `Product FAQs <https://software.intel.com/content/www/us/en/develop/support/faq-product.html>`_
-	   - `Support requests <https://software.intel.com/content/www/us/en/develop/articles/how-to-create-a-support-request-at-online-service-center.html>`_
-     - Use these resources if you need support with oneTBB.
-   
-   * - `Release Notes <https://software.intel.com/content/www/us/en/develop/articles/intel-oneapi-threading-building-blocks-release-notes.html>`_
-     - Find up-to-date information about the product, including detailed notes, known issues, and changes.
-   
-   * - `Documentation <https://software.intel.com/content/www/us/en/develop/documentation/onetbb-documentation/top.html>`_: `Developer Guide <https://software.intel.com/content/www/us/en/develop/documentation/onetbb-documentation/top/onetbb-developer-guide.html>`_ and `API Reference <https://software.intel.com/content/www/us/en/develop/documentation/onetbb-documentation/top/onetbb-api-reference.html>`_
-     - Learn to use oneTBB.   
-   * - `GitHub* <https://github.com/oneapi-src/oneTBB>`_
-     - Find oneTBB implementation in open source.
-   
-
-Notices and Disclaimers
-***********************
-
-Intel technologies may require enabled hardware, software or service activation.
-
-No product or component can be absolutely secure.
-
-Your costs and results may vary.
-
-© Intel Corporation. Intel, the Intel logo, and other Intel marks are trademarks
-of Intel Corporation or its subsidiaries. Other names and brands may be claimed
-as the property of others.
-
-No license (express or implied, by estoppel or otherwise) to any intellectual
-property rights is granted by this document.
-
-The products described may contain design defects or errors known as errata which
-ay cause the product to deviate from published specifications. Current
-characterized errata are available on request.
-
-Intel disclaims all express and implied warranties, including without limitation,
-the implied warranties of merchantability, fitness for a particular purpose,
-and non-infringement, as well as any warranty arising from course of performance,
-course of dealing, or usage in trade.
diff --git a/external/tbb/doc/GSG/installation.rst b/external/tbb/doc/GSG/installation.rst
new file mode 100644
index 00000000..d8f19332
--- /dev/null
+++ b/external/tbb/doc/GSG/installation.rst
@@ -0,0 +1,7 @@
+.. _installation:
+
+Installation
+============
+
+See the `installation instructions <https://github.com/uxlfoundation/oneTBB/blob/master/INSTALL.md>`_ 
+that will help you to install |short_name| successfully.  
\ No newline at end of file
diff --git a/external/tbb/doc/GSG/integrate.rst b/external/tbb/doc/GSG/integrate.rst
new file mode 100644
index 00000000..2b38dba2
--- /dev/null
+++ b/external/tbb/doc/GSG/integrate.rst
@@ -0,0 +1,68 @@
+.. _integrate:
+
+Integrate oneTBB
+================
+
+If you want to improve the performance and scalability of your application, you can integrate oneTBB into your project. 
+For example, you may want to integrate oneTBB if your application needs to process large amounts of data in parallel. 
+
+To integrate oneTBB, you need to:
+
+* Link oneTBB with the project's source code. 
+* Provide the necessary compiler and linker flags.
+
+However, you can use CMake* and the pkg-config tool to simplify the process of integrating oneTBB into your project and handling its dependencies.
+See the instructions below to learn how to use the tools. 
+
+CMake*
+*******
+
+CMake* is a cross-platform build tool that helps you manage dependencies and build systems. 
+Integrating oneTBB into your project using CMake*:
+
+* Simplifies the process of building and linking against the library.
+* Ensures that your project can be built and run on multiple platforms.
+* Lets you manage oneTBB dependencies.
+
+To add oneTBB to another project using CMake*, add the following commands to your ``CMakeLists.txt`` file:
+
+.. code-block:: cmake
+
+       find_package(TBB REQUIRED)
+       target_link_libraries(my_executable TBB::tbb)
+
+After that, configure your project with CMake* as usual.
+
+
+Compile a Program Using pkg-config
+***********************************
+
+The pkg-config tool is used to simplify the compilation line by retrieving information about packages
+from special metadata files. It helps avoid large hard-coded paths and makes compilation more portable.
+
+To compile a test program ``test.cpp`` with oneTBB on Linux* OS, 
+provide the full path to search for included files and libraries, or provide a line as the following: 
+
+.. code-block::
+   
+       g++ -o test test.cpp $(pkg-config --libs --cflags tbb)
+
+Where:
+
+``--cflags`` provides oneTBB library include path:
+
+.. code-block::
+
+       $ pkg-config --cflags tbb
+       -I<path-to>/tbb/latest/lib/pkgconfig/../..//include
+
+``--libs`` provides the Intel(R) oneTBB library name and the search path to find it:
+
+.. code-block::
+   
+       $ pkg-config –libs tbb
+       -L<path to>tbb/latest/lib/pkgconfig/../..//lib/intel64/gcc4.8 -ltbb
+
+.. note::
+
+   For Windows* OS, additionally, use the ``--msvc-syntax`` option flag that converts the compiling and linking flags in an appropriate mode.
diff --git a/external/tbb/doc/GSG/intro_gsg.rst b/external/tbb/doc/GSG/intro_gsg.rst
new file mode 100644
index 00000000..64a8e7b1
--- /dev/null
+++ b/external/tbb/doc/GSG/intro_gsg.rst
@@ -0,0 +1,29 @@
+|short_name| Get Started Guide provides the information you need to begin working with oneTBB. 
+It is helpful for new users of parallel programming and experienced developers that want to improve code performance. 
+
+It is recommended for you to have a basic knowledge of C++ programming and some experience with parallel programming concepts. 
+
+|full_name| is a runtime-based parallel programming model for C++ code that uses tasks.
+The template-based runtime library can help you harness the latent performance of multi-core processors.
+
+oneTBB enables you to simplify parallel programming by breaking computation into parallel running tasks. Within a single process, 
+parallelism is carried out by mapping tasks to threads. Threads are an operating system mechanism that allows the same or different sets of instructions 
+to be executed simultaneously. Using threads can make your program work faster and more efficiently.
+
+Here you can see one of the possible executions of tasks by threads.
+
+.. figure:: /GSG/Images/how-oneTBB-works.png
+   :scale: 70%
+   :align: center
+
+Use oneTBB to write scalable applications that:
+
+* Specify logical parallel structure instead of threads.
+* Emphasize data-parallel programming.
+* Take advantage of concurrent collections and parallel algorithms.
+
+oneTBB supports nested parallelism and load balancing. It means that you can use the library without worrying about oversubscribing a system, which happens when more tasks are assigned to a system than it can handle efficiently. 
+
+oneTBB is used in different areas, such as scientific simulations, gaming, data analysis, etc. 
+
+It is available as a stand-alone product and as part of the |base_tk|.
diff --git a/external/tbb/doc/GSG/next_steps.rst b/external/tbb/doc/GSG/next_steps.rst
new file mode 100644
index 00000000..46f24bb0
--- /dev/null
+++ b/external/tbb/doc/GSG/next_steps.rst
@@ -0,0 +1,158 @@
+.. _next_steps:
+
+Next Steps
+===========
+
+After installing oneTBB, complete the following steps to start working with the library.
+
+Set the Environment Variables
+*****************************
+
+After installing |short_name|, set the environment variables:
+  
+#. Go to the oneTBB installation directory. 
+
+#. Set the environment variables using the script in ``<install_dir>`` by running:
+     
+   * On Linux* OS: ``vars.{sh|csh} in <install_dir>/tbb/latest/env``
+   * On Windows* OS: ``vars.bat in <install_dir>/tbb/latest/env``
+
+.. tip::
+
+   oneTBB can coordinate with Intel(R) OpenMP on CPU resources usage 
+   to avoid excessive oversubscription when both runtimes are used within a process.
+   To enable this feature set up ``TCM_ENABLE`` environment variable to ``1``.
+
+
+Build and Run a Sample 
+**********************
+
+.. tab-set::
+
+    .. tab-item:: Windows* OS
+
+        #. Create a new C++ project using your IDE. In this example, Microsoft* Visual Studio* Code is used. 
+        #. Create an ``example.cpp`` file in the project. 
+        #. Copy and paste the code below. It is a typical example of a |short_name| algorithm. The sample calculates a sum of all integer numbers from 1 to 100. 
+   
+           .. code:: 
+
+              #include <oneapi/tbb.h>
+            
+              int main (){
+                  int sum = oneapi::tbb::parallel_reduce(
+                      oneapi::tbb::blocked_range<int>(1,101), 0,
+                      [](oneapi::tbb::blocked_range<int> const& r, int init) -> int {
+                          for (int v = r.begin(); v != r.end(); v++) {
+                              init += v;
+                          }
+                          return init;
+                      },
+                      [](int lhs, int rhs) -> int {
+                          return lhs + rhs;
+                      }
+                  );
+      
+                  printf("Sum: %d\n", sum);
+                  return 0;
+              }
+      
+        #. Open the ``tasks.json`` file in the ``.vscode`` directory and paste the following lines to the args array:
+
+           * ``-Ipath/to/oneTBB/include`` to add oneTBB include directory. 
+           * ``path/to/oneTBB/`` to add oneTBB. 
+
+           For example:
+
+           .. code-block::
+
+                  { 
+                     "tasks": [
+                          {
+                             "label": "build & run",
+                             "type": "cppbuild",
+                             "group": {
+                             "args": [ 
+                                 "/IC:\\Program Files (x86)\\Intel\\oneAPI\\tbb\\2022.0.0\\include",
+                                 "C:\\Program Files (x86)\\Intel\\oneAPI\\tbb\\2022.0.0\\lib\\tbb12.lib"
+                           
+
+        #. Build the project. 
+        #. Run the example. 
+        #. If oneTBB is configured correctly, the output displays ``Sum: 5050``.  
+
+    .. tab-item:: Linux* OS
+
+        #. Create an ``example.cpp`` file in the project. 
+        #. Copy and paste the code below. It is a typical example of a |short_name| algorithm. The sample calculates a sum of all integer numbers from 1 to 100. 
+         
+           .. code:: 
+
+              #include <oneapi/tbb.h>
+
+              int main(){
+                  int sum = oneapi::tbb::parallel_reduce(
+                      oneapi::tbb::blocked_range<int>(1,101), 0,
+                      [](oneapi::tbb::blocked_range<int> const& r, int init) -> int {
+                          for (int v = r.begin(); v != r.end(); v++) {
+                              init += v;
+                          }
+                          return init;
+                      },
+                      [](int lhs, int rhs) -> int {
+                          return lhs + rhs;
+                      }
+                  );
+      
+                  printf("Sum: %d\n", sum);
+                  return 0;
+              }
+
+        #. Compile the code using oneTBB. For example, 
+
+           .. code-block:: 
+
+                  g++ -std=c++11 example.cpp -o example -ltbb
+
+      
+        #. Run the executable:
+
+           .. code-block:: 
+
+                  ./example
+      
+        #. If oneTBB is configured correctly, the output displays ``Sum: 5050``. 
+
+
+
+Hybrid CPU and NUMA Support
+****************************
+
+If you need NUMA/Hybrid CPU support in oneTBB, you need to make sure that HWLOC* is installed on your system.
+
+HWLOC* (Hardware Locality) is a library that provides a portable abstraction of the hierarchical topology of modern architectures (NUMA, hybrid CPU systems, etc). oneTBB relies on HWLOC* to identify the underlying topology of the system to optimize thread scheduling and memory allocation.
+
+Without HWLOC*, oneTBB may not take advantage of NUMA/Hybrid CPU support. Therefore, it's important to make sure that HWLOC* is installed before using oneTBB on such systems.
+
+Check HWLOC* on the System
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+To check if HWLOC* is already installed on your system, run ``hwloc-ls``:
+
+* For Linux* OS, in the command line.
+* For Windows* OS, in the command prompt.
+
+If HWLOC* is installed, the command displays information about the hardware topology of your system. If it is not installed, you receive an error message saying that the command ``hwloc-ls`` could not be found.
+
+.. note:: For Hybrid CPU support, make sure that HWLOC* is version 2.5 or higher. For NUMA support, install HWLOC* version 1.11 or higher.
+
+Install HWLOC*
+^^^^^^^^^^^^^^
+
+To install HWLOC*, visit the official Portable Hardware Locality website (https://www-lb.open-mpi.org/projects/hwloc/).
+
+* For Windows* OS, binaries are available for download.
+* For Linux* OS, only the source code is provided and binaries should be built.
+
+On Linux* OS, HWLOC* can be also installed with package managers, such as APT*, YUM*, etc. To do so, run: sudo apt install hwloc.
+
+.. note:: For Hybrid CPU support, make sure that HWLOC* is version 2.5 or higher. For NUMA support, install HWLOC* version 1.11 or higher.
diff --git a/external/tbb/doc/GSG/samples.rst b/external/tbb/doc/GSG/samples.rst
new file mode 100644
index 00000000..18bf8128
--- /dev/null
+++ b/external/tbb/doc/GSG/samples.rst
@@ -0,0 +1,49 @@
+.. _samples:
+
+oneTBB Samples
+==============
+
+To become an expert in using oneTBB, explore its samples and examples to learn how 
+to properly utilize the features and functionality of oneTBB and avoid common mistakes that may impede your performance.
+
+The following samples are available:
+
+* **Containers** 
+
+  * `concurrent_hash_map <https://github.com/uxlfoundation/oneTBB/tree/master/examples/concurrent_hash_map>`_ 
+  * `concurrent_priority_queue <https://github.com/uxlfoundation/oneTBB/tree/master/examples/concurrent_priority_queue>`_ 
+
+* `Flow Graph <https://github.com/uxlfoundation/oneTBB/tree/master/examples/graph>`_ 
+   * `A solution to the binpacking problem using a queue_node, a buffer_node, and function_node. <https://github.com/uxlfoundation/oneTBB/tree/master/examples/graph/binpack>`_ 
+   * `Cholesky Factorization algorithm <https://github.com/uxlfoundation/oneTBB/tree/master/examples/graph/cholesky>`_
+   * `An implementation of dining philosophers in graph using the reserving join_node <https://github.com/uxlfoundation/oneTBB/tree/master/examples/graph/dining_philosophers>`_
+   * `A parallel implementation of bzip2 block-sorting file compressor <https://github.com/uxlfoundation/oneTBB/tree/master/examples/graph/fgbzip2>`_
+   * `An example of a collection of digital logic gates that can be easily composed into larger circuits <https://github.com/uxlfoundation/oneTBB/tree/master/examples/graph/logic_sim>`_
+   * `An example of a Kohonen Self-Organizing Map using cancellation <https://github.com/uxlfoundation/oneTBB/tree/master/examples/graph/som>`_
+   * `Split computational kernel for execution between CPU and GPU <https://github.com/oneapi-src/oneAPI-samples/tree/master/Libraries/oneTBB/tbb-async-sycl>`_
+
+* **Algorithms**
+
+  * `parallel_for <https://github.com/uxlfoundation/oneTBB/tree/master/examples/parallel_for>`_
+     * `Game of life overlay <https://github.com/uxlfoundation/oneTBB/tree/master/examples/parallel_for/game_of_life>`_
+     * `Polygon overlay <https://github.com/uxlfoundation/oneTBB/tree/master/examples/parallel_for/polygon_overlay>`_
+     * `Parallel seismic wave simulation <https://github.com/uxlfoundation/oneTBB/tree/master/examples/parallel_for/seismic>`_
+     * `Parallel 2-D raytracer/renderer <https://github.com/uxlfoundation/oneTBB/tree/master/examples/parallel_for/tachyon>`_
+     * `Find largest matching substrings <https://github.com/uxlfoundation/oneTBB/tree/master/examples/getting_started>`_
+     * `Resumable task: Split computational kernel for execution between CPU and GPU <https://github.com/oneapi-src/oneAPI-samples/tree/master/Libraries/oneTBB/tbb-resumable-tasks-sycl>`_
+  * `parallel_for_each <https://github.com/uxlfoundation/oneTBB/tree/master/examples/parallel_for_each>`_
+  * `parallel_pipeline <https://github.com/uxlfoundation/oneTBB/tree/master/examples/parallel_pipeline>`_
+  * `parallel_reduce <https://github.com/uxlfoundation/oneTBB/tree/master/examples/parallel_reduce>`_
+
+* **Task Scheduler**
+
+  * `task_arena <https://github.com/uxlfoundation/oneTBB/tree/master/examples/task_arena>`_
+  * `task_group <https://github.com/uxlfoundation/oneTBB/tree/master/examples/task_group>`_
+  * `Execute similar computational kernels, with one task executing the SYCL* code and the other task executing the oneTBB code <https://github.com/oneapi-src/oneAPI-samples/tree/master/Libraries/oneTBB/tbb-task-sycl>`_
+
+* **Other**
+
+  * `Compute Fibonacci numbers in different ways <https://github.com/uxlfoundation/oneTBB/tree/master/examples/test_all>`_
+
+
+.. note:: You can also refer to the `oneAPI Samples <https://oneapi-src.github.io/oneAPI-samples/>`_ to learn more about the ecosystem. 
\ No newline at end of file
diff --git a/external/tbb/doc/GSG/system_requirements.rst b/external/tbb/doc/GSG/system_requirements.rst
new file mode 100644
index 00000000..59368014
--- /dev/null
+++ b/external/tbb/doc/GSG/system_requirements.rst
@@ -0,0 +1,6 @@
+.. _System_Requirements:
+
+System Requirements
+*******************
+
+Refer to the `oneTBB System Requirements <https://github.com/uxlfoundation/oneTBB/blob/master/SYSTEM_REQUIREMENTS.md>`_.
\ No newline at end of file
diff --git a/external/tbb/doc/README.md b/external/tbb/doc/README.md
new file mode 100644
index 00000000..0e17d2e2
--- /dev/null
+++ b/external/tbb/doc/README.md
@@ -0,0 +1,34 @@
+# How to build oneTBB documentation
+
+Our documentation is written in restructured text markup (.rst) and built using [Sphinx](http://www.sphinx-doc.org/en/master/). 
+
+This document explains how to build oneTBB documentation locally. 
+
+## Prerequisites
+- Python 3.7.0 or higher
+- Sphinx 
+
+## Build documentation
+
+Do the following to generate HTML output of the documentation: 
+
+1. Clone oneTBB repository:
+
+```
+git clone https://github.com/uxlfoundation/oneTBB.git
+```
+
+2. Go to the `doc` folder:
+
+```
+cd oneTBB/doc
+```
+
+3. Run in the command line:
+
+```
+make html
+```
+
+
+That's it! Your built documentation is located in the ``build/html`` folder. 
diff --git a/external/tbb/doc/_static/custom.js b/external/tbb/doc/_static/custom.js
new file mode 100644
index 00000000..a7d312de
--- /dev/null
+++ b/external/tbb/doc/_static/custom.js
@@ -0,0 +1,37 @@
+window.MathJax = {
+    TeX: {
+    Macros: {
+        src: '\\operatorname{src}',
+        srclayer: '\\operatorname{src\\_layer}',
+        srciter: '\\operatorname{src\\_iter}',
+        srciterc: '\\operatorname{src\\_iter\\_c}',
+        weights: '\\operatorname{weights}',
+        weightslayer: '\\operatorname{weights\\_layer}',
+        weightsiter: '\\operatorname{weights\\_iter}',
+        weightspeephole: '\\operatorname{weights\\_peephole}',
+        weightsprojection: '\\operatorname{weights\\_projection}',
+        bias: '\\operatorname{bias}',
+        dst: '\\operatorname{dst}',
+        dstlayer: '\\operatorname{dst\\_layer}',
+        dstiter: '\\operatorname{dst\\_iter}',
+        dstiterc: '\\operatorname{dst\\_iter\\_c}',
+        diffsrc: '\\operatorname{diff\\_src}',
+        diffsrclayer: '\\operatorname{diff\\_src\\_layer}',
+        diffsrciter: '\\operatorname{diff\\_src\\_iter}',
+        diffsrciterc: '\\operatorname{diff\\_src\\_iter\\_c}',
+        diffweights: '\\operatorname{diff\\_weights}',
+        diffweightslayer: '\\operatorname{diff\\_weights\\_layer}',
+        diffweightsiter: '\\operatorname{diff\\_weights\\_iter}',
+        diffweightspeephole: '\\operatorname{diff\\_weights\\_peephole}',
+        diffweightsprojection: '\\operatorname{diff\\_weights\\_projection}',
+        diffbias: '\\operatorname{diff\\_bias}',
+        diffdst: '\\operatorname{diff\\_dst}',
+        diffdstlayer: '\\operatorname{diff\\_dst\\_layer}',
+        diffdstiter: '\\operatorname{diff\\_dst\\_iter}',
+        diffdstiterc: '\\operatorname{diff\\_dst\\_iter\\_c}',
+        diffgamma: '\\operatorname{diff\\_\\gamma}',
+        diffbeta: '\\operatorname{diff\\_\\beta}',
+        workspace: '\\operatorname{workspace}'
+    }
+    }
+}
\ No newline at end of file
diff --git a/external/tbb/doc/GSG/_static/favicons.png b/external/tbb/doc/_static/favicons.png
similarity index 100%
rename from external/tbb/doc/GSG/_static/favicons.png
rename to external/tbb/doc/_static/favicons.png
diff --git a/external/tbb/doc/GSG/_static/oneAPI-rgb-rev-100.png b/external/tbb/doc/_static/oneAPI-rgb-rev-100.png
similarity index 100%
rename from external/tbb/doc/GSG/_static/oneAPI-rgb-rev-100.png
rename to external/tbb/doc/_static/oneAPI-rgb-rev-100.png
diff --git a/external/tbb/doc/_static/theme_overrides.css b/external/tbb/doc/_static/theme_overrides.css
new file mode 100644
index 00000000..63ee6cc7
--- /dev/null
+++ b/external/tbb/doc/_static/theme_overrides.css
@@ -0,0 +1,13 @@
+/* override table width restrictions */
+@media screen and (min-width: 767px) {
+
+   .wy-table-responsive table td {
+      /* !important prevents the common CSS stylesheets from overriding
+         this as on RTD they are loaded after this stylesheet */
+      white-space: normal !important;
+   }
+
+   .wy-table-responsive {
+      overflow: visible !important;
+   }
+}
diff --git a/external/tbb/doc/GSG/conf.py b/external/tbb/doc/conf.py
similarity index 76%
rename from external/tbb/doc/GSG/conf.py
rename to external/tbb/doc/conf.py
index 665fac3f..5f26eae2 100644
--- a/external/tbb/doc/GSG/conf.py
+++ b/external/tbb/doc/conf.py
@@ -13,7 +13,6 @@
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #
 import os
-
 # import sys
 # sys.path.insert(0, os.path.abspath('.'))
 
@@ -26,12 +25,11 @@
 
 # -- Project information -----------------------------------------------------
 
-
 if BUILD_TYPE == 'oneapi' or BUILD_TYPE == 'dita':
     project = u'Intel® oneAPI Threading Building Blocks (oneTBB)'
 else:
-    project = u'oneAPI Threading Building Blocks (oneTBB)'
-copyright = u'2021, Intel Corporation'
+    project = u'oneTBB'
+copyright = u'Intel Corporation'
 author = u'Intel'
 
 # The short X.Y version
@@ -39,6 +37,7 @@
 # The full version, including alpha/beta/rc tags
 release = u''
 
+
 # -- General configuration ---------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
@@ -57,11 +56,12 @@
     'sphinx.ext.imgmath',
     'sphinx.ext.ifconfig',
     'sphinx.ext.viewcode',
-    'sphinx.ext.githubpages',
+    'sphinx.ext.githubpages', 
+    'sphinx_design'
 ]
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
+templates_path = ['main/_templates']
 
 # The suffix(es) of source filenames.
 # You can specify multiple suffix as a list of string:
@@ -70,7 +70,7 @@
 source_suffix = '.rst'
 
 # The master toctree document.
-# master_doc = 'main/title_main'
+#master_doc = 'main/title_main'
 master_doc = 'index'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
@@ -78,7 +78,7 @@
 #
 # This is also used if you do content translation via gettext catalogs.
 # Usually you set "language" from the command line for these cases.
-language = None
+language = 'en'
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
@@ -89,7 +89,7 @@
 pygments_style = None
 
 # Syntax highlighting for the :: directive
-highlight_language = 'cpp'
+highlight_language = 'cpp' 
 
 if BUILD_TYPE == 'oneapi' or BUILD_TYPE == 'dita':
     rst_prolog = """
@@ -121,25 +121,34 @@
 # further.  For a list of options available for each theme, see the
 # documentation.
 #
-if BUILD_TYPE == 'oneapi' or BUILD_TYPE == 'dita':
-    html_theme = 'sphinx_rtd_theme'
+
+html_theme = 'sphinx_book_theme'
+
+if BUILD_TYPE == 'dita':
+    html_theme_options = {
+        'repository_url': 'https://github.com/uxlfoundation/oneTBB',
+        'path_to_docs': 'doc',
+        'repository_branch': 'master'
+    }
 else:
-    html_theme = 'sphinx_book_theme'
     html_theme_options = {
-        'repository_url': 'https://github.com/oneapi-src/oneTBB',
-        'path_to_docs': 'doc/main',
+        'repository_url': 'https://github.com/uxlfoundation/oneTBB',
+        'path_to_docs': 'doc',
         'use_issues_button': True,
         'use_edit_page_button': True,
         'repository_branch': 'master',
-        'extra_footer': '<p align="right"><a href="https://www.intel.com/content/www/us/en/privacy/intel-cookie-notice.html">Cookies</a></p>'
     }
 
+if BUILD_TYPE != 'oneapi' and BUILD_TYPE != 'dita':
+   html_theme_options["extra_footer"]="<div><a href='https://www.intel.com/content/www/us/en/privacy/intel-cookie-notice.html' data-cookie-notice='true'>Cookies</a> <a href='https://www.intel.com/content/www/us/en/privacy/intel-privacy-notice.html'>| Privacy</a> <a data-wap_ref='dns' id='wap_dns' href='https://www.intel.com/content/www/us/en/privacy/intel-cookie- notice.html'>| Do Not Share My Personal Information</a> </div><div>&copy; Intel Corporation. Intel, the Intel logo, and other Intel marks are trademarks of Intel Corporation or its subsidiaries. Other names and brands may be claimed as the property of others. No license (express or implied, by estoppel or otherwise) to any intellectual property rights is granted by this document, with the sole exception that code included in this document is licensed subject to the Zero-Clause BSD open source license (OBSD), <a href='http://opensource.org/licenses/0BSD'>http://opensource.org/licenses/0BSD</a>. </div><br><div>oneTBB is licensed under Apache License Version 2.0. Refer to the <a href='https://github.com/uxlfoundation/oneTBB/blob/master/LICENSE.txt'>LICENSE </a> file for the full license text and copyright notice.</div>"
+
+    
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
 html_static_path = ['_static']
 
-if BUILD_TYPE == 'oneapi' or BUILD_TYPE == 'dita':
+if BUILD_TYPE == 'oneapi'  or BUILD_TYPE == 'dita':
     html_context = {
         'css_files': [
             '_static/theme_overrides.css',  # override wide tables in RTD theme
@@ -147,10 +156,13 @@
     }
 else:
     html_js_files = ['custom.js']
-    html_logo = '_static/oneAPI-rgb-rev-100.png'
 
+html_theme_options["logo"] = {"text": "oneTBB Documentation"}
+    
+html_logo = '_static/oneAPI-rgb-rev-100.png'
 html_favicon = '_static/favicons.png'
 
+
 # Custom sidebar templates, must be a dictionary that maps document names
 # to template names.
 #
@@ -167,19 +179,20 @@
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'sphinx-infodevdoc'
 
+
 # -- Options for LaTeX output ------------------------------------------------
 
-# latex_engine = 'xelatex'
-# PDF_TITLE = 'Information Development Template'
+#latex_engine = 'xelatex'
+#PDF_TITLE = 'Information Development Template'
 #
-# with open(PREAMBLE_FILE, 'r', encoding='utf-8') as f:
+#with open(PREAMBLE_FILE, 'r', encoding='utf-8') as f:
 #    PREAMBLE = f.read()
 #
-# with open(TITLE_PAGE_FILE, 'r', encoding='utf-8') as f:
+#with open(TITLE_PAGE_FILE, 'r', encoding='utf-8') as f:
 #    TITLE_PAGE = f.read().replace('<PDF_TITLE>', PDF_TITLE)
 #
 #
-# latex_elements = {
+#latex_elements = {
 #    # The paper size ('letterpaper' or 'a4paper').
 #    #
 #    'extraclassoptions': 'openany,oneside',
@@ -213,31 +226,31 @@
 #        OuterLinkColor={rgb}{0,0.686,0.941}',
 #
 #    'tableofcontents':' '
-# }
+#}
 #
-# latex_logo = '_latex/intel_logo.png'
+#latex_logo = '_latex/intel_logo.png'
 ## Grouping the document tree into LaTeX files. List of tuples
 ## (source start file, target name, title,
 ##  author, documentclass [howto, manual, or own class]).
-# latex_documents = [
+#latex_documents = [
 #    (master_doc, 'sphinx-infodev.tex', u'sphinx-infodev Documentation',
 #     u'Intel', 'manual'),
-# ]
+#]
 
-# breathe_projects = {                                       #todd-mod
+#breathe_projects = {                                       #todd-mod
 #    project: "../doxygen/xml"
-# }
-# breathe_default_project = project
+#}
+#breathe_default_project = project
 
 # Setup the exhale extension
-# exhale_args = {                                            #todd-mod
+#exhale_args = {                                            #todd-mod
 #    # These arguments are required
 #    "containmentFolder":     "./api",
 #    "rootFileName":          "library_root.rst",
 #    "rootFileTitle":         "Library API",
 #    "doxygenStripFromPath":  "..",
 #    "fullApiSubSectionTitle": 'Full API'
-# }
+#}
 
 
 # -- Options for manual page output ------------------------------------------
@@ -249,6 +262,7 @@
      [author], 1)
 ]
 
+
 # -- Options for Texinfo output ----------------------------------------------
 
 # Grouping the document tree into Texinfo files. List of tuples
@@ -260,6 +274,7 @@
      'Miscellaneous'),
 ]
 
+
 # -- Options for Epub output -------------------------------------------------
 
 # Bibliographic Dublin Core info.
@@ -277,12 +292,13 @@
 # A list of files that should not be packed into the epub file.
 epub_exclude_files = ['search.html']
 
+
 # -- Extension configuration -------------------------------------------------
 
 # -- Options for intersphinx extension ---------------------------------------
 
 # Example configuration for intersphinx: refer to the Python standard library.
-intersphinx_mapping = {'https://docs.python.org/': None}
+intersphinx_mapping = {'python': ('https://docs.python.org/3', None)}
 
 # -- Options for todo extension ----------------------------------------------
 
diff --git a/external/tbb/doc/index.rst b/external/tbb/doc/index.rst
new file mode 100644
index 00000000..e49c5c1c
--- /dev/null
+++ b/external/tbb/doc/index.rst
@@ -0,0 +1,15 @@
+|full_name|
+===========
+
+.. include:: index/index_intro.rst
+
+
+The following are some important topics for the ``novice user``:
+
+* :ref:`Get_Started_Guide` gives you a brief explanation of what oneTBB is. 
+* :ref:`Benefits` describes how |short_name| differs from typical threading packages.
+* :ref:`Package_Contents` describes dynamic library files and header files for Windows*, Linux*, and macOS* operating systems used in |short_name|.
+
+.. include:: index/useful_topics.rst
+
+.. include:: index/toctree.rst
diff --git a/external/tbb/doc/index/index_intro.rst b/external/tbb/doc/index/index_intro.rst
new file mode 100644
index 00000000..72055fe8
--- /dev/null
+++ b/external/tbb/doc/index/index_intro.rst
@@ -0,0 +1,5 @@
+.. _index_intro:
+
+This document contains information about |short_name|. 
+It is a flexible performance library that let you break computation into parallel running tasks. 
+
diff --git a/external/tbb/doc/index/toctree.rst b/external/tbb/doc/index/toctree.rst
new file mode 100644
index 00000000..6b351b11
--- /dev/null
+++ b/external/tbb/doc/index/toctree.rst
@@ -0,0 +1,42 @@
+.. _toctree:
+
+.. toctree::
+   :caption: About
+   :hidden:
+   :maxdepth: 1
+
+   /main/intro/help_support
+   /main/intro/notation
+   /main/intro/intro_os
+   /main/intro/Benefits
+   /main/intro/testing_approach
+   /main/intro/limitations.rst
+
+
+.. toctree::
+   :caption: Get Started
+   :hidden:
+   :maxdepth: 1
+
+   /GSG/get_started
+   /GSG/system_requirements
+   /GSG/installation
+   /GSG/next_steps 
+   /GSG/integrate
+   /GSG/samples
+
+
+.. toctree::
+   :maxdepth: 3
+   :hidden:
+   :caption: Developer Guide
+
+   /main/tbb_userguide/title
+
+
+.. toctree::
+   :maxdepth: 3
+   :hidden:
+   :caption: Developer Reference
+
+   /main/reference/reference
diff --git a/external/tbb/doc/index/useful_topics.rst b/external/tbb/doc/index/useful_topics.rst
new file mode 100644
index 00000000..8def9339
--- /dev/null
+++ b/external/tbb/doc/index/useful_topics.rst
@@ -0,0 +1,5 @@
+.. _Usefull_Topics:
+
+The following is an important topic for the ``experienced user``:
+
+:ref:`Migration_Guide` describes how to migrate from TBB to oneTBB.
\ No newline at end of file
diff --git a/external/tbb/doc/main/_static/custom.js b/external/tbb/doc/main/_static/custom.js
deleted file mode 100644
index dd8573b7..00000000
--- a/external/tbb/doc/main/_static/custom.js
+++ /dev/null
@@ -1,37 +0,0 @@
-window.MathJax = {
-    TeX: {
-        Macros: {
-            src: '\\operatorname{src}',
-            srclayer: '\\operatorname{src\\_layer}',
-            srciter: '\\operatorname{src\\_iter}',
-            srciterc: '\\operatorname{src\\_iter\\_c}',
-            weights: '\\operatorname{weights}',
-            weightslayer: '\\operatorname{weights\\_layer}',
-            weightsiter: '\\operatorname{weights\\_iter}',
-            weightspeephole: '\\operatorname{weights\\_peephole}',
-            weightsprojection: '\\operatorname{weights\\_projection}',
-            bias: '\\operatorname{bias}',
-            dst: '\\operatorname{dst}',
-            dstlayer: '\\operatorname{dst\\_layer}',
-            dstiter: '\\operatorname{dst\\_iter}',
-            dstiterc: '\\operatorname{dst\\_iter\\_c}',
-            diffsrc: '\\operatorname{diff\\_src}',
-            diffsrclayer: '\\operatorname{diff\\_src\\_layer}',
-            diffsrciter: '\\operatorname{diff\\_src\\_iter}',
-            diffsrciterc: '\\operatorname{diff\\_src\\_iter\\_c}',
-            diffweights: '\\operatorname{diff\\_weights}',
-            diffweightslayer: '\\operatorname{diff\\_weights\\_layer}',
-            diffweightsiter: '\\operatorname{diff\\_weights\\_iter}',
-            diffweightspeephole: '\\operatorname{diff\\_weights\\_peephole}',
-            diffweightsprojection: '\\operatorname{diff\\_weights\\_projection}',
-            diffbias: '\\operatorname{diff\\_bias}',
-            diffdst: '\\operatorname{diff\\_dst}',
-            diffdstlayer: '\\operatorname{diff\\_dst\\_layer}',
-            diffdstiter: '\\operatorname{diff\\_dst\\_iter}',
-            diffdstiterc: '\\operatorname{diff\\_dst\\_iter\\_c}',
-            diffgamma: '\\operatorname{diff\\_\\gamma}',
-            diffbeta: '\\operatorname{diff\\_\\beta}',
-            workspace: '\\operatorname{workspace}'
-        }
-    }
-}
\ No newline at end of file
diff --git a/external/tbb/doc/main/_static/favicons.png b/external/tbb/doc/main/_static/favicons.png
deleted file mode 100644
index f450376b19e2d945e6d2da8b329de8aed320a9b7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 467
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJbFq_W2nPqp?T7vkfZQzsJ|V8|
z1wPZ8J^^{vNsoafCh*ie2o%(1S)bwZ*nr{i!pV<{eBW$c`~#v=hGA`t*<A*PHR&Gr
z85kxoFsx)?FosBNUHa9I;Sz*Bq2_Ih`;}R3pO*B0%W}QVz_6=0;+hr1rFq?-v;FTz
znq6y7d8@{-jget`XX&fiZJ(W_j{-F|B)yhlI9(8OUzXtvGs7eXhJGG~C7Txh-0CsI
z3n*<<666=m@bTJ%%=6PWtg7m`^Jw|A`Lp(JKeqqir|u7ZO<W}nYxXaQd;IMA#aYu9
zoq2Tg&*pOrem{F(v~%ODz3oj~4{(;*{REoR?CIhdA~Ci0^id%uLjl)|=X@sl9lKjl
zUjF0%|0HL}s>65p27hI++iAAt!F9FH-3in5x7jA&dYmBX!*k>8p9}maQ@6zPbDmk8
z>2hFgpElF;@Hqk%_dazSu3wYHs?8U_V)m|`)BA<~sXKg?ZB<y)_k6C)GS%aZMZD8O
iB3A{mt17i`t7CS$$kD(2WV8n;xIA6`T-G@yGywpIRl08g

diff --git a/external/tbb/doc/main/_static/oneAPI-rgb-rev-100.png b/external/tbb/doc/main/_static/oneAPI-rgb-rev-100.png
deleted file mode 100644
index 58d2d5c54e586b53d027d39236038dc60f5fea94..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7414
zcmZ`;Wl$7Q*QT4LySt^OL11Z?TtHf+mr^=cP&%YhKtf7FQc`wl1f;uUK~i#;ZuoeA
zee?c!=gzs$oafGS|C}@ToHIAhKu?31fSv#i4UJe!6KM2=CQoL8hx4=#71Jj_0hY5e
zNEr>SKAG^&4*SVxwbwKPp`itHqoIXIqM_Y9QQ`m4(ELQu(Dq)Tp~-$mL!)`~<)@+i
z(*e$F9StDb<9}8m{9F1Hga1a;+y@Qq8OMJNJ+M^C|B1x))dH#EZlW_$J!eCYZ+fB_
zwzPoC;J~HByr9q4CfP^t+z#R6GJX(6$&yMjuu*18L<;E(97j?{0~gYN{vFkaZzerG
zs63GH!g4dq`u_blmhgByVj5>kHBx2~UOhZJ0G1}67IB3($eH<~wd29QAdOv&mM!1u
zDt||Qr~*E>v>H4w1#?3-jTy-&Y?hQM{IMmRNuc4e&Ds5-_=RplqtVH?Q1E%X$+gug
z`E5tR{T0apb35@Xz6n4^giImbAUfh=?GCf@+pJ6BgO!ZvxrhQLU$DE6w^`?XHC2qX
z#&;S1Nf^Yqs3{=3X|h4a8zO(RGEo_k9dd-gr~^m?r15AmYybyXCqCPsaKUCPE_Dx9
zao-t>i`(Tgj1_9R?6drYCj~8>CR=)5zo}MT6}!btlHFNe{cf=f=IO!{AxK2WrC><8
zlk{z3Af77_u*v9u>Eu`8^jr@)+jv;#3TaL;uv^YKC}&q<8}OjjI}7&i*=(*a*bKLf
zzzZbBi^%Sbt{JB{aGR8PmD3ZSiwbblHt+8PsE!v=Rz#{nWnV+QQoQd)zWUKDe>k;%
zRb&&kS6i|F0|#tdh9+KCB1Ux++@@5;yUDH|Ao16Qkd4y_@$B%kOi8`rp*bd`ORyvH
zP`mOkGWN4irb^t~<9jT6%->b~9?z2g)E!7yMDN{vA9|2EwG_Jn#_=LbDe+5tObpz_
zDp|j7{$kfI0F;JSe5LoO$U_)dn-q5kgAuCnr+9pPQAX%h#CN2DhxXd%r~oX=1AyPc
z&yqbvq2^Twz9);_a*e52+Rkaxk>-Z7bw4db*1`-VZAh?T?4N}@(<-8viKm|l+C_4k
zwP4@kUh}5k<DStzsUE5-ZcOno^^tl1`<UW>U6$UKTkfjq@Z@Yo<CwLNM_kD7593}2
z`n&WTXQiE0tJlA$B*)yMrDRQ!g-H!5p<{nc2XjasP^VFr(eqr6XC0a?PBWs1D>sBX
zfQDqN4n&z-7dug`6L(R8UQ#sjEja`^AUrD3s85_!G4R~O&gZQVt{?0cc7(oj@bz2^
z9t!VW&wRd;Ae0H2)VWJB3m{o=tHSn)orCo^%m!Iw&gD?;Gnq23*PXHE=5u8|XLH-R
zpnbIe<d2YOx`zKz47TgNnVmRb(fr8qWk0wQdNK1_D>cu5P=B$p5x>Ie%@2cor!FBB
zfFc~(7E2o{rPkzP$oCRVNUtLRdtW5a@vXyd_Ke0D1Zhsahwzr?XRC<_mFBF{CGtbK
zMh`wubV{iC{7{qONj&f!8pQ#}qtCvg25VN&smQGU9?{In@8E296cuL{tryrkTPf!v
z${#4a5&J+&2?pl?tbWWaR}GHR`>!C=eHn{*OZGBRy<%UF@dh#JYbg!*V-A=IU9`*I
zG=gZ=u+~BLG1%v!+>ae2tW#NPAS+ibk91N9#SE&))ZLM72Co$Lg0+nW2o9iwsOHS<
zyJwo)_wk%r^FuL`!Y>l1{$@6X^35+z%^Dam<dipT&o}OVh~-@&vBSl}71)w1rzdNh
z__Vkmx{a80%k$m}^c_-2IFx#*eC64$^~Nl`T?K5yKoIFr^_8-ND(7UUF7$G4sfwNe
z(#uEH<-H$9d&eD9vmt0<`<-i-Ry07ZHCHIdN2V#8?o@nf=IhzsG~Qr<tb>iyWP_F#
zyTR*wJ-&NOgC>t{7KW8P%$*0G(o2IHdbn>kyav83+rd>VYa|pL5_wnIGM*2A*u&`j
z603D{)2#nDgn#5L>Uxej-D9*IXk3*p{_7%*@9%2ORY)PBhNrWtKHa!6G(`Wi+kUE*
zPy5ATq)B;(uZvvW;mxlP!7l{QH!nmRq9&N>_3keb%C{T|W=jbnSr(j@U|Qf^nbC6=
z==i|$Q6RF)nYLYy{Y`0clTN{M`-p7FB7J+Yb4Ap23B-ogER(<+k!Er+*fKVnuIKV6
zo~Susm+;1P!CBDSUdr)Cut)Rc+Who<_ZT%DSHk~pFMj8xuEH}vsY7e6v>{YxLKfG<
z>QZqU-0h>TNb8v0tHHTLc(9tw%rNw%T06w9#}~*ZTra4IK-j~B`n&alXa53JW2DbW
zmi2soSs-s2Z@Yw`=>#UVwi_nR#fo`!b$ZN*f6`R|pO^KBGOr0ex?aP6x@^V0j7^V2
z@tr!yO&Q>WLiYNnVyWF;+2pWd8Ve?MBNrXJMFJq1N%yGecVO6**4_lItp>SkDHG6L
z7wh#46*U8uwji65CfOdn^1;tt7>3$Br1k?_iSf%chpj<~D;5?$Tg0C-LSogk7vc1p
zAC=qND-7~1jtBieSVrxxcn}eByFwax#|Y$D&Ia{xGk&C63+}{~MDLX1!>IWeC5+|L
zIE|l+Z$z)i$;U4mWHv-tS2`(21wzG@tD~k8C)$B^jZP4=zRljrbzYIYOqhJji*v4o
z@=BH*i)ZDLGyc3~>Kscs(<SNn?^%n$6@RZy-Vbu5$m6g`A&vO4518;>T=mlHJSsgk
zn@oEPgmnPQ<)gurCu|#XsuojxjKe)X#Gd~$69H9~-6h*-FZYOWFnDd<3>Er64+7j2
zsamKsxD5C?GgL-DwOJC+R;PkPlv%v0bl*`%T~QUhE{!*(FU3&da|p}6&Fp51D`~b$
zmF_mp)}@RN<Vp_Zi!&{3Bw6ZYn_iYQ9?7C7*b~n$-yW%TF^(ZMTw=QlTk|sDpWr1?
zjeFt5^K?Z4)gsh}a33m57q-K1DY;72t&RGWZ~_Kq$6`b{ATJ${R?M$gqO{Na)Y>)%
zsE68#kGM1DIa+~~c-iSM8anYx?^2CiWtA+h`M5m8j=~8H>;*jbT*eJ<GmYl-O4(Np
zmMIKj&sZ-f;}2TZ)6bfty}oJ@YyY6nM`gEluYuH!Du70z(iuG@7$+=;o1ZO*<z1Ko
zO6s|YS6Q-1sI(gtzNjfgqg6_)wFTv9N+3pb(jO13xO}lbsU^mw1fUWtHS&61oDfs?
zR%aRgzHt0yCM`y7bN1Q07DU)$`nSBh?E&n3KC$gjK3ct79hO~VotcxWe}|f^SNb8u
z$#2PD?*QRlJgU)eS%MlHpRU+G00%aM3L*(T-S0T-|I))6{Jt0sEnp6R>9mz_c^ppr
zaPakrE6WrR;%3s;3YM_dE(7nv#%;%k-~$wajm>`hBxi#42pJLgOFzM>U$o48G$T<V
z{!wO)ja8^0O8-1v3g~ZMY(>t5IRsBHG(WajhmFlgOL1p0p0N)w%l6gZ#C*R1S1Fn{
zTF5lX{U%u&Cg%pn$ZDO(=@vjQQR+NDZU!TpP7DT)Z0#=bzWg(D3|aLKSti&~bzeMZ
zWPiNnQ1p>+2x(}mYQJ@7Tq!%mYOdBSp&V)~s<xI{bPZA!tJc?V*)!tWY2jCs&7R}T
zr5xf`<7d(rw6OSoQAnQ;zdl(Sm!mPCRllgJFU*nA{CxD<#55_HzpJN~*E@uDrHF5Y
zK&}N_HyL-g$2Vn+=A=+1(y0-`eZtx~&^?tC#}vJ*F~aXLX+4xXxg%7bKZ0gRi#6Ld
z&R@wjIurZ#hXQ9_!?9JbRgFsZ_Fr7)juG_e%KfxFLfR1Cl4_wS`$e!0*;XY@WaL+)
zanX}brS)M!gWTwCOVwjD^^Wf0n@yil=_U0H{Z}VY*6YLQB?sP2Xf-*m>vT3Age=pd
z>&%y2htB|g0a2|tmH*sMRn$YUoN7`1ea8#lcaui5y=3o*D-$QwUr9vo>2hZ3w;x=4
zf|&WFeVgTcJBG?m$SnQ*2}gmiBO+r7n8E0_Jv>BPGS7>bSonrabIwI{4g)}0BUzRi
zX_Qy^s$2|dw;q~Du*!pnd{ez3=d0avYbMi*?3ETi#})hXCUr0v_*S+kw3_VlU3kaz
zC%PkI#N1OQ95Y78p>+n$V+Pt3HC4<qe$lMJvhc8M29G14&Vz^j6pt@2SZj7#L43@i
z3rH==Ww*S@!vw8A1-j9tLUOm+4y}_bu6IVi(~Uw}heqFmA@|2Cy>qy?F$bV*=<pQ2
ze_%&wwU4XstZRk))v=dTpx*#iQ$zi!`TqA0^X88;axS&*$hlPBwknIPN1yYt<5k$>
z3|&X4hra6VjDd~<Tib_^x&*7q9}np?ZR)*^z27|5g0NwaMogdSG7$y3u(y{A-Hz=@
zqHP%cN-Rur+Br|WanjW?s9bg2D1n#!S3o2O2T8P-UQ6X_l050jtgQrK;n%a<Nn?32
zb1kAXBAC)-5w4|ddZWL~($Cl4UOavwqg!`#o~I<)Tu#CMf(QMBQ`-Q?rU1945Q)45
ziRS8ZDmunRdiW#F)3b;(zXavDoqcsuz?CWjFI_sY3*n)xxD{-i3v^U7_R)O^@JRSR
zv@&^e2W*6W7Qi4Ib9l;26|o9Deu8SsbP@ue;_bSRo-3AogIA~2;PDZRQ~)gJ;*$S2
z_9((yB_M!e)HN5fDALrTU3#$b6AHV~j>@PKa&Qj)#q9o7oI>eZ*omXT-1e3mycEWq
z{`kU)^p4JDiCX>dNgX@5ifx+0m2p@dbzEG8RhE)mzNPw`N&Cx35u(gb$-I;*<n3uM
zmoPB;PMTd~vUkqa3Cu1EwdNz&=LJpV$nQK;34S%&^>3~c^I2~XAM}%z!r7Gzo_ar5
z<FKk~StIq|SgFK@Sif^kqHE)vtsEuij2N^ZPQ3+$f+cGb4;r<QVBiPs>uMD)q9Fyw
z6nK~O1x6Ho80*!GdSey^GEM&<q$BuEThZFaz<MX%KNMQ$e<mnvpZbM>;M%a8-wMRn
z!paYl!_sp%WE|VyvQ3>|eJITX$_%cyh~J<hN2~DK9+Dl6VR)Z}h<1~OJpFG-Or@cV
z!mD!bEO~IzE1I>Iq$9lzWrbf$y?cJo7hT0Oc3TjL_7UjY9d-{(t)p|yw#_>)-PNG6
zZ0pd!m7X?Ph~90;M{%5=0Hl=z93E01rs<|0<8mEV4e7|-t@mHK$Nl8BI(d1AeJ(Aj
z7Sf_m`+3&-KJM{lz2e)m-ylFj)-o?c!w)Aje{R{!h}B!A+u!Fav(wavpylV^nlAql
zX0aT6r(If`fCDLTL}bVjV)f!TF+hst044CodM=IBcUxi*IBlt)Nt`3t9vSU3#WXi*
zogk^8BN+V2oHK_~i0+4q1kGh_qu1>>3g>~GWpn;$j^%bgou^b+8y2D_wm42>mv-7C
zJB@e@G5ia6?r2?<Xs{*Tt}v&T8--H^97VRt^ly6R&H)IA=Ojucqs%`e*o30+Wrl?4
z`M3CA@$MLJUhp@BNPMiWm!Q1hB}hM+qKL^2uEJitg<;PoOBt1@%<J5481T82`Qs<x
z7)gBd;8*Ltiq#QC8dqbr+QCwbj9l52mVftMIQ^vQXW(lH;V9#N?=(-6-f=0<{dk^4
zX<i~tk2Bf8TE$DH@+;t%TSX%N+g@@gIFbD=JVk}PUTBrLTrYY=FNX7w^P?k0Hfb@O
z%rW=iH0SPiB%Cu|<!?jm9$C@*jJQgyGAe;O(n{`(_0b3iVNtLK(UCW3dfDAXP8sD(
zIs1kKHwu00r*`ge5yU{7GlziyqB`_$>@Ld`o)z2k9J_=4<+qI0_m!0?R*ETYI+zW}
z=@L&mVqtm@L${;zY`D!EOQNO^KojHW_rSCj2E!XG-YqYB$lt7`RSC+OP8C$!PbdTN
z7XldW)t<ff*@*?lwy#`Ft=_*H8b0#4uE2mDy7u|6iv{bGQDpb9sFc@5YSoMX%16}I
zdPtHM(;T<IVrhx@^IWt&YD5%Z7T|<-p*b^8FtdnUDwX<Rtfo7Zt;*IHYjieLTLzR_
zY%@#5S1F#ZfR@J<kA0urI0|DPtPOTNmmhERy;z9xz1Zbg`q`AODL@4j%ipcPe1M+H
z++97Of1I-?B9TfRkG9T(&y|fq-Ha_i0lrAoAafOlGM+)V8m2#s#`vgsf60Zn2Z0{{
zR>=iFTqk~13kLlJ?O=KGQaM3)rGMW}`QbVRO`tDnipE<?f)p_0PH$trTngDDB`&M$
zG)t&58{}UK=8&xVrH5GScQS$g?4;+WQdQH1DL)e2e&5>naGoqoYECs8x+{B`LXvly
zt>O7@`UdKxA@TY>hivdUO;)wvM<&F-@}pAfCGK+YmWGe<WE;zs?(Na^Eq4V~Kjd)c
zo3G#$%`?l5?>5bIWpIrR(-JXpvalfckgJL^(=F(B`}kd1g0p-XbMDWitPAeCKlA=)
zvIW-lirF?n<-KdNF&$gfLUb!k_&jp>aDRVJ`bz38-_q-s8p(d^Yu(L~FwyRYrsoMb
zPowtq2j#w@7~*E)HZ}7N(;g|EzUyp7x84aHjcWNByG2M0!m&A1bN_=IRnTH`hlNeN
zAw#ASQoCd(hK6`aC+4~Icj-Q-A^zMNbOA$wVX`RKpmGKK6{#;*qydQvKlW<?UFz}X
z&HC~V!Vm`8DkBb)L0L*C57}U>YD#6TzuVwXmYdb&d>BfsD9j$#IJ5flOsp0n;M+xu
zEalD-B^@l~H8Q){B2Lf6G7C}&7uy@EYf-}}Er4i*Y#;DFa-Nj3<5Q2&a;syvfGTCU
z?Gz|eMrJ=6`KiVV{_HwY7%t7qz?Y`?S+IRNtUGeeM94c`#NRf)8Ng7BQ7jkc#I5i<
zDmFg1Uo#0J1ZtYm_AJVt<kB+Y%QZ4xxUbXk=PootRRo$xrocB`dss`PnI_w%qpF3t
z)m69$<oTmgyoZXZM+%$b1FW1avk|kvG9L6)r}fm7-O2LWT3a4S=D$TW2({`EG03my
zQWZuAVsoYqE6)b^C?|ehH$lA@v)d#y>LOh?k>{U{-Hl7}t&EHGponIhy>9r$!AZjV
zK3?B3pl<}IX)M+?ML&Oe{GI^%l1<_n8#Z`z%?XnrD)v|dV`_*qs{!>PoYYH2O3kKv
zTYj39@pBmXeSBeXDOYAESx+Or6|9c9J?#Zwa!QXc>va`-#UHnFKY=qh!OTSmPJ;-f
z;raf4F$$mW;B53DnfQn!dMSlHD63km_ZL=Vjm~0{lu@BPzV4BpZG#yh!acHmvgn#f
z=NfKExi$~UfB-D$COl1CeM;YgHW!AR8E2g34IM{oU5)qghYqodyOne+SmV4!DN)%g
zdpZ{^-$scaYbIJs&rfozPEg})|ET{+mREZ4lBFhNG)P^ig$?xQJs!pnSJA9I+(+pD
zxw@Zfk|IR#cQZ&-mT|-bHx+CfRxcd45B&WW#>++}El(zq(0l{yOM)YH6m?uBX)1?9
z4XyUy)2|uAaV3oRUxQD?0ek2ikH=#!!l?#u;d+yO0f`EL0SVn*mD#_`qhOI6-u52C
z$r9QIB_L;0R^(oAl<DpUWi#d<J5)`RYeBYT?jl22@-shj_yymU*tFa9+se`$0Hy%i
zH3)d94r+iY$QNj86aAC&R=JV;vz;&JFb&Nq%`p`q4~p_DR=EeDT5z0M%8xo(g$D^w
z-oySM-pROL5oCVjV8@ssfKk1~a>uU08re83t^8z5a(B3KW*yFt!h0ikEL@vl1nEG~
zuldQJ3y(?pj&@IzlVv}`tbp3&!<g(1jes7C*&ui<@T8ACZV*6r9Udzo)H+VbPCjU?
zGl5E?)HkL?(HBNtecLfZ=fU`tfT!PZs*fJD#_*!~!5ZDVODCKL{Sk*VoG`BX3c4o$
zS|=$S)Rh~KfjY-Nl;0QfGheCX25x@y)48sX<zyMRpm|vtJ6IkoSRmZe#V)6|S#>Vf
zuC`eiwjBJ$-&9c0ew?N<0aK7$F`y*w>QAcZ`s#4<wgy!BIxD!XT=6y8F&&pcgiRNh
zqJ@20aOjd*+fQG#;Rxn+Rlu(}{R|X(ehEVBJS2>y6)%wQc#?TPy#2yCh5AfL<L>9B
z?yHmqNDETm(%)Lyr1s8cEwHd15cnb#)s@s`rncD;w)YM%&>ntji*balhy(kqVeO4|
zCH5vR7K;!=sZVQrw97Jl_8eWbuf~_6e%~Vu!%Xk^U;DOOxMeKGh*lr62N@hsigFOc
zKfu0;h`6t@mfD)$ce-;p36Ev$>;jRddI`2d6Jp)N-v3l1lkq9|dC2aa8hfShJ>Cv<
zSP9Jw^Ho#<ZUY@|L%l0`Xvk76)i_U`TMtioc&EA8FK33s-n?6}r7%t$CvTVc6S#it
zdgOipU0tvIa0?$l6!#`X`g0yX4fr^UTCjNbm#<R2*6Y3K5!kRi>CKsNFH9tsqV5+;
zGywLPU3c#p_U{4$hgi4^G+~^$?<<7k&4}XGqabG0u=Xqbx4cW|pI+|K(7aR!0TF!c
zKNaae#@-2&;qT9LkOj?SxZU0;W}PoybF#5Bu{Q*DH-+p`hsO$1r+N_9gas)p05=`k
zjmmA8n<mKj=AWYLPxe-Aa})cVk?h(Nj*!~9JqBm}T(eIYv>>})#K@yT)|M`H^<3g#
z)`iO_Xrfu6!;-G7ctBr>o^gNtMCe%Q`Pb$?gt;|Y`j;{zCdK)qSGlF+izsQR|I9hr
ztE?+v{`2+77NUiw7soX7%dHfx9uWX^6va9Pjg3v`KyR|Mj-NnhiiU#W>|=A>g4>TS
z?5_NKNpO1&3U<Icwod4XvtW&z8GIe&RA=B6u^aZ#j5<g5B-S&2ez%c@@sOvXirsgF
z=zK9y7FLs|%=r9>dpqlt!I1cP?WkgPgQ~0d<Qu+DZ2J1D0$@RHUHO6i4O89f(Ac)&
zeuQ-MAwwklYlws}KJ#PL*T4F4ND9~VKi_nhH)ir$3i*?n{@F1%JxHNDE9l)aoxiii
zv@-Rww}o%Vp8h(+P;l#`^d7joe<Z(nMUgym_r6G%sV=G}&#I8~{6s%M)#GCzYTNm_
z7mxq+K(3jF{Bv_y+Giy_GM@5*++HM?-ggZ$p7vEGK)K19bJvmcjg*=Dx^775{ViLc
zxtD|T9sRc9Jnn+Je38CJGX;rW$o(|o9cBK4*xpSesU=Ha;@0bj8MhL|Hc5DK#B{_e
zl7ukuXHlH%G;FIHV~p!#?&vv^1$$eH+oXIT`y1aS8HL|o;TJ*}^FON8ZP@|&vN4Gz
zYP5#9g_~dd!5NuGQBf@G-Sn6>)$=lr5fAUE>LZZk?K7@@p2vFYBQl^7EgJ3yfe7by
z-T`tH_Urir3{$jE<n2Kp7ua#*D8R(6FdL-r>#-2Y<FiYBhwj9~;5E!Hi`V*h-L{qP
zaJcfCqhBKXYvJ&PD;wOA*jS8*!EsaVyB9qn@3TQBz-Kh6=t1jrvv9(|e|I~Cgf(6?
zsSnumjj=Fup#N_Q9W|h0bNDjCc4wqEJ<Q4c_C4#deY@M<VQB4`U4ggyIp^WwWpQUr
zT-(3>IM-kFtRUUoW^$#v)_4u^6PP=jo~Md#`vvG#09gzTTmJ40^~-eh4pl}1g!bK_
zCw~3qX6)`%K-_#5rZ4&Flr3gww%3kU367P~V}RF6&yPNmf=+#1bb(vDx{bcM2e3|Q
z(IZyX%G5CFHNET8A0U^n+Dl&tJ6}gxdvC`lKob)Y6A=;-6%vyHi;2ogO2~?f3yDa|
liiiy6IiLKOz{AVI)hXzI3);F?^_~Q1T55X08kJY?{|_}8aQy%P

diff --git a/external/tbb/doc/main/_static/theme_overrides.css b/external/tbb/doc/main/_static/theme_overrides.css
deleted file mode 100644
index 4e782fb5..00000000
--- a/external/tbb/doc/main/_static/theme_overrides.css
+++ /dev/null
@@ -1,13 +0,0 @@
-/* override table width restrictions */
-@media screen and (min-width: 767px) {
-
-    .wy-table-responsive table td {
-        /* !important prevents the common CSS stylesheets from overriding
-           this as on RTD they are loaded after this stylesheet */
-        white-space: normal !important;
-    }
-
-    .wy-table-responsive {
-        overflow: visible !important;
-    }
-}
diff --git a/external/tbb/doc/main/_templates/layout.html b/external/tbb/doc/main/_templates/layout.html
index 00289133..eb4d31dd 100644
--- a/external/tbb/doc/main/_templates/layout.html
+++ b/external/tbb/doc/main/_templates/layout.html
@@ -1,20 +1,15 @@
 {% extends "!layout.html" %}
 {% block extrahead %}
-<script defer type="text/javascript"
-        src="https://www.intel.com/content/dam/www/global/wap/performance-config.js"></script>
-<script type="text/javascript">
-    // Configure TMS settings
-    var wapLocalCode = 'us-en'; // Dynamically set per localized site, see mapping table for values
-    var wapSection = "oneapi-tbb"; // WAP team will give you a unique section for your site
-    // Load TMS
-    (function () {
-        var url = 'https://www.intel.com/content/dam/www/global/wap/tms-loader.js'; // WAP file URL
-        var po = document.createElement('script');
-        po.type = 'text/javascript';
-        po.async = true;
-        po.src = url;
-        var s = document.getElementsByTagName('script')[0];
-        s.parentNode.insertBefore(po, s);
-    })();
-</script>
+    <script defer type="text/javascript" src="https://www.intel.com/content/dam/www/global/wap/performance-config.js" ></script>
+    <script type="text/javascript">
+        // Configure TMS settings
+        var wapLocalCode = 'us-en'; // Dynamically set per localized site, see mapping table for values
+        var wapSection = "oneapi-tbb"; // WAP team will give you a unique section for your site
+        // Load TMS
+        (function () {
+            var url = 'https://www.intel.com/content/dam/www/global/wap/tms-loader.js'; // WAP file URL
+            var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true; po.src = url;
+            var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);
+        })();
+      </script>
 {% endblock %}
diff --git a/external/tbb/doc/main/conf.py b/external/tbb/doc/main/conf.py
deleted file mode 100644
index ae7bee40..00000000
--- a/external/tbb/doc/main/conf.py
+++ /dev/null
@@ -1,289 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Configuration file for the Sphinx documentation builder.
-#
-# This file does only contain a selection of the most common options. For a
-# full list see the documentation:
-# http://www.sphinx-doc.org/en/master/config
-
-# -- Path setup --------------------------------------------------------------
-
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-#
-import os
-
-# import sys
-# sys.path.insert(0, os.path.abspath('.'))
-
-SOURCE_DIR = os.path.dirname(__file__)
-LATEX_DIR = os.path.join(SOURCE_DIR, '_latex')
-PREAMBLE_FILE = os.path.join(LATEX_DIR, 'preamble.tex')
-TITLE_PAGE_FILE = os.path.join(LATEX_DIR, 'title_page.tex')
-
-BUILD_TYPE = os.getenv("BUILD_TYPE")
-
-# -- Project information -----------------------------------------------------
-
-if BUILD_TYPE == 'oneapi' or BUILD_TYPE == 'dita':
-    project = u'Intel® oneAPI Threading Building Blocks (oneTBB)'
-else:
-    project = u'oneAPI Threading Building Blocks (oneTBB)'
-copyright = u'2021, Intel Corporation'
-author = u'Intel'
-
-# The short X.Y version
-version = u''
-# The full version, including alpha/beta/rc tags
-release = u''
-
-# -- General configuration ---------------------------------------------------
-
-# If your documentation needs a minimal Sphinx version, state it here.
-#
-# needs_sphinx = '1.0'
-
-# Add any Sphinx extension module names here, as strings. They can be
-# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
-# ones.
-extensions = [
-    'sphinx.ext.autodoc',
-    'sphinx.ext.doctest',
-    'sphinx.ext.intersphinx',
-    'sphinx.ext.todo',
-    'sphinx.ext.coverage',
-    'sphinx.ext.imgmath',
-    'sphinx.ext.ifconfig',
-    'sphinx.ext.viewcode',
-    'sphinx.ext.githubpages'
-]
-
-# Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
-
-# The suffix(es) of source filenames.
-# You can specify multiple suffix as a list of string:
-#
-# source_suffix = ['.rst', '.md']
-source_suffix = '.rst'
-
-# The master toctree document.
-# master_doc = 'main/title_main'
-master_doc = 'index'
-
-# The language for content autogenerated by Sphinx. Refer to documentation
-# for a list of supported languages.
-#
-# This is also used if you do content translation via gettext catalogs.
-# Usually you set "language" from the command line for these cases.
-language = None
-
-# List of patterns, relative to source directory, that match files and
-# directories to ignore when looking for source files.
-# This pattern also affects html_static_path and html_extra_path.
-exclude_patterns = []
-
-# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = None
-
-# Syntax highlighting for the :: directive
-highlight_language = 'cpp'
-
-if BUILD_TYPE == 'oneapi' or BUILD_TYPE == 'dita':
-    rst_prolog = """
-.. |full_name| replace:: Intel\ |reg|\  oneAPI Threading Building Blocks (oneTBB)
-.. |short_name| replace:: oneTBB
-.. |product| replace:: oneTBB
-.. |reg| unicode:: U+000AE
-.. |copy| unicode:: U+000A9
-.. |base_tk| replace:: Intel\ |reg|\  oneAPI Base Toolkit
-.. |dpcpp| replace:: Intel\ |reg|\  oneAPI DPC++/C++ Compiler
-    """
-else:
-    rst_prolog = """
-.. |full_name| replace:: oneAPI Threading Building Blocks (oneTBB)
-.. |short_name| replace:: oneTBB
-.. |product| replace:: oneTBB
-.. |reg| unicode:: U+000AE
-.. |copy| unicode:: U+000A9
-.. |base_tk| replace:: Intel\ |reg|\  oneAPI Base Toolkit
-.. |dpcpp| replace:: Intel\ |reg|\  oneAPI DPC++/C++ Compiler
-    """
-
-# -- Options for HTML output -------------------------------------------------
-
-# The theme to use for HTML and HTML Help pages.  See the documentation for
-# a list of builtin themes.
-#
-# Theme options are theme-specific and customize the look and feel of a theme
-# further.  For a list of options available for each theme, see the
-# documentation.
-#
-if BUILD_TYPE == 'oneapi' or BUILD_TYPE == 'dita':
-    html_theme = 'sphinx_rtd_theme'
-else:
-    html_theme = 'sphinx_book_theme'
-    html_theme_options = {
-        'repository_url': 'https://github.com/oneapi-src/oneTBB',
-        'path_to_docs': 'doc/main',
-        'use_issues_button': True,
-        'use_edit_page_button': True,
-        'repository_branch': 'master',
-        'extra_footer': '<p align="right"><a href="https://www.intel.com/content/www/us/en/privacy/intel-cookie-notice.html">Cookies</a></p>'
-    }
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
-
-if BUILD_TYPE == 'oneapi' or BUILD_TYPE == 'dita':
-    html_context = {
-        'css_files': [
-            '_static/theme_overrides.css',  # override wide tables in RTD theme
-        ],
-    }
-else:
-    html_js_files = ['custom.js']
-    html_logo = '_static/oneAPI-rgb-rev-100.png'
-
-html_favicon = '_static/favicons.png'
-
-# Custom sidebar templates, must be a dictionary that maps document names
-# to template names.
-#
-# The default sidebars (for documents that don't match any pattern) are
-# defined by theme itself.  Builtin themes are using these templates by
-# default: ``['localtoc.html', 'relations.html', 'sourcelink.html',
-# 'searchbox.html']``.
-#
-# html_sidebars = {}
-
-
-# -- Options for HTMLHelp output ---------------------------------------------
-
-# Output file base name for HTML help builder.
-htmlhelp_basename = 'sphinx-infodevdoc'
-
-# -- Options for LaTeX output ------------------------------------------------
-
-# latex_engine = 'xelatex'
-# PDF_TITLE = 'Information Development Template'
-#
-# with open(PREAMBLE_FILE, 'r', encoding='utf-8') as f:
-#    PREAMBLE = f.read()
-#
-# with open(TITLE_PAGE_FILE, 'r', encoding='utf-8') as f:
-#    TITLE_PAGE = f.read().replace('<PDF_TITLE>', PDF_TITLE)
-#
-#
-# latex_elements = {
-#    # The paper size ('letterpaper' or 'a4paper').
-#    #
-#    'extraclassoptions': 'openany,oneside',
-#    'babel' : '\\usepackage[english]{babel}',
-#    'papersize': 'a4paper',
-#    'releasename':" ",
-#    # Sonny, Lenny, Glenn, Conny, Rejne, Bjarne and Bjornstrup
-#    # 'fncychap': '\\usepackage[Lenny]{fncychap}',
-#    'fncychap':  '',
-#    #'fontpkg': '\\usepackage{amsmath,amsfonts,amssymb,amsthm}',
-#
-#    'figure_align':'htbp',
-#    # The font size ('10pt', '11pt' or '12pt').
-#    #
-#    'pointsize': '12pt',
-#
-#    # Additional stuff for the LaTeX preamble.
-#    #
-#    'preamble': PREAMBLE,
-#
-#    'maketitle': TITLE_PAGE,
-#    # Latex figure (float) alignment
-#    #
-#    # 'figure_align': 'htbp',
-#    'sphinxsetup': \
-#        'hmargin={0.7in,0.7in}, vmargin={1in,1in}, \
-#        verbatimwithframe=true, \
-#        TitleColor={rgb}{0,0.686,0.941}, \
-#        HeaderFamily=\\rmfamily\\bfseries, \
-#        InnerLinkColor={rgb}{0,0.686,0.941}, \
-#        OuterLinkColor={rgb}{0,0.686,0.941}',
-#
-#    'tableofcontents':' '
-# }
-#
-# latex_logo = '_latex/intel_logo.png'
-## Grouping the document tree into LaTeX files. List of tuples
-## (source start file, target name, title,
-##  author, documentclass [howto, manual, or own class]).
-# latex_documents = [
-#    (master_doc, 'sphinx-infodev.tex', u'sphinx-infodev Documentation',
-#     u'Intel', 'manual'),
-# ]
-
-# breathe_projects = {                                       #todd-mod
-#    project: "../doxygen/xml"
-# }
-# breathe_default_project = project
-
-# Setup the exhale extension
-# exhale_args = {                                            #todd-mod
-#    # These arguments are required
-#    "containmentFolder":     "./api",
-#    "rootFileName":          "library_root.rst",
-#    "rootFileTitle":         "Library API",
-#    "doxygenStripFromPath":  "..",
-#    "fullApiSubSectionTitle": 'Full API'
-# }
-
-
-# -- Options for manual page output ------------------------------------------
-
-# One entry per manual page. List of tuples
-# (source start file, name, description, authors, manual section).
-man_pages = [
-    (master_doc, 'sphinx-infodev', u'sphinx-infodev Documentation',
-     [author], 1)
-]
-
-# -- Options for Texinfo output ----------------------------------------------
-
-# Grouping the document tree into Texinfo files. List of tuples
-# (source start file, target name, title, author,
-#  dir menu entry, description, category)
-texinfo_documents = [
-    (master_doc, 'sphinx-infodev', u'sphinx-infodev Documentation',
-     author, 'sphinx-infodev', 'One line description of project.',
-     'Miscellaneous'),
-]
-
-# -- Options for Epub output -------------------------------------------------
-
-# Bibliographic Dublin Core info.
-epub_title = project
-
-# The unique identifier of the text. This can be a ISBN number
-# or the project homepage.
-#
-# epub_identifier = ''
-
-# A unique identification for the text.
-#
-# epub_uid = ''
-
-# A list of files that should not be packed into the epub file.
-epub_exclude_files = ['search.html']
-
-# -- Extension configuration -------------------------------------------------
-
-# -- Options for intersphinx extension ---------------------------------------
-
-# Example configuration for intersphinx: refer to the Python standard library.
-intersphinx_mapping = {'https://docs.python.org/': None}
-
-# -- Options for todo extension ----------------------------------------------
-
-# If true, `todo` and `todoList` produce output, else they produce nothing.
-todo_include_todos = True
diff --git a/external/tbb/doc/main/examples_testing/CMakeLists.txt b/external/tbb/doc/main/examples_testing/CMakeLists.txt
new file mode 100644
index 00000000..133132c5
--- /dev/null
+++ b/external/tbb/doc/main/examples_testing/CMakeLists.txt
@@ -0,0 +1,41 @@
+# Copyright (c) 2025 Intel Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+cmake_minimum_required(VERSION 3.11)
+project(doc_examples_testing LANGUAGES CXX)
+
+set(_reference_examples_path "${CMAKE_CURRENT_SOURCE_DIR}/../reference/examples")
+set(_userguide_examples_path "${CMAKE_CURRENT_SOURCE_DIR}/../tbb_userguide/examples")
+
+add_custom_target(build-doc-examples
+    COMMENT "Build oneTBB documentation samples")
+set(doc_examples_test_label "doc-examples")
+
+macro(add_doc_example _doc_example_path)
+    get_filename_component(_doc_example_name "${_doc_example_path}" NAME_WE)
+    add_executable(${_doc_example_name} EXCLUDE_FROM_ALL "${_doc_example_path}")
+
+    add_dependencies(${_doc_example_name} TBB::tbb TBB::tbbmalloc TBB::tbbmalloc_proxy)
+    target_link_libraries(${_doc_example_name} TBB::tbb TBB::tbbmalloc TBB::tbbmalloc_proxy)
+
+    add_dependencies(build-doc-examples ${_doc_example_name})
+    add_test(NAME ${_doc_example_name} COMMAND ${_doc_example_name})
+    set_tests_properties(${_doc_example_name} PROPERTIES LABELS "${doc_examples_test_label}")
+endmacro()
+
+file(GLOB_RECURSE DOC_EXAMPLES_LIST "${_reference_examples_path}/*.cpp" "${_userguide_examples_path}/*.cpp")
+
+foreach(_doc_example_path IN LISTS DOC_EXAMPLES_LIST)
+    add_doc_example(${_doc_example_path})
+endforeach()
diff --git a/external/tbb/doc/main/index.rst b/external/tbb/doc/main/index.rst
deleted file mode 100644
index 51982c9f..00000000
--- a/external/tbb/doc/main/index.rst
+++ /dev/null
@@ -1,37 +0,0 @@
-|full_name|
-===========
-
-This document contains information about |full_name|. 
-|short_name| is a flexible performance library that can be found in the |base_tk|
-or as a stand-alone product. More information and specifications can be found on the
-|full_name| main page.
-
-Documentation for older versions of |short_name| is available for download only. 
-For a list of available documentation downloads by product version, see these pages:
-
-* `Download Documentation for Intel Parallel Studio XE <https://software.intel.com/content/www/us/en/develop/articles/download-documentation-intel-parallel-studio-xe-current-previous.html>`_
-* `Download Documentation for Intel System Studio <https://software.intel.com/content/www/us/en/develop/articles/download-documentation-intel-system-studio-current-previous.html>`_
-
-
-The following are some important topics for the ``novice user``:
-
-* `Get Started with oneTBB <https://software.intel.com/content/www/us/en/develop/documentation/get-started-with-onetbb/top.html>`_ gives you a brief explanation of what oneTBB is. 
-* :ref:`Benefits` describes how |short_name| differs from typical threading packages.
-* :ref:`Package_Contents` describes dynamic library files and header files for Windows*, Linux*, and macOS* operating systems used in |short_name|.
-
-
-The following is an important topic for the ``experienced user``:
-
-:ref:`Migration_Guide` describes how to migrate from TBB to oneTBB.
-
-
-.. toctree::
-   :maxdepth: 2
-
-   intro/help_support
-   intro/notation
-   intro/intro
-   intro/Benefits
-   tbb_userguide/title
-   reference/reference
-   intro/notices_and_disclaimers
diff --git a/external/tbb/doc/main/intro/Benefits.rst b/external/tbb/doc/main/intro/Benefits.rst
index b66ea5d1..5058cc71 100644
--- a/external/tbb/doc/main/intro/Benefits.rst
+++ b/external/tbb/doc/main/intro/Benefits.rst
@@ -20,7 +20,7 @@ it with any compiler supporting ISO C++. The library differs from
 typical threading packages in the following ways:
 
 
--  **oneTBB enables you to specify logical paralleism instead of
+-  **oneTBB enables you to specify logical parallelism instead of
    threads**. Most threading packages require you to specify threads.
    Programming directly in terms of threads can be tedious and lead to
    inefficient programs, because threads are low-level, heavy constructs
diff --git a/external/tbb/doc/main/intro/help_support.rst b/external/tbb/doc/main/intro/help_support.rst
index cdfedcb9..a1ab4097 100644
--- a/external/tbb/doc/main/intro/help_support.rst
+++ b/external/tbb/doc/main/intro/help_support.rst
@@ -4,23 +4,12 @@ Getting Help and Support
 ========================
 
 
-
-
-
 .. container:: section
 
 
    .. rubric:: Getting Technical Support
       :class: sectiontitle
 
-   If you did not register your Intel® software product during
-   installation, please do so now at the Intel® Software Development
-   Products Registration Center. Registration entitles you to free
-   technical support, product updates and upgrades for the duration of
-   the support term.
-
-
-   For general information about Intel technical support, product
+   For general information about oneTBB technical support, product
    updates, user forums, FAQs, tips and tricks and other support
-   questions, go to: http://www.intel.com/software/products/support/.
-
+   questions, go to `GitHub issues <https://github.com/uxlfoundation/oneTBB/issues>`_.
diff --git a/external/tbb/doc/main/intro/intro.rst b/external/tbb/doc/main/intro/intro_os.rst
similarity index 82%
rename from external/tbb/doc/main/intro/intro.rst
rename to external/tbb/doc/main/intro/intro_os.rst
index 652113c2..b1741200 100644
--- a/external/tbb/doc/main/intro/intro.rst
+++ b/external/tbb/doc/main/intro/intro_os.rst
@@ -30,10 +30,6 @@ more conveniently than using raw threads, and at the same time can
 improve performance.
 
 
-.. admonition:: Product and Performance Information 
-
-   Performance varies by use, configuration and other factors. Learn more at `www.intel.com/PerformanceIndex <https://www.intel.com/PerformanceIndex>`_.
-   Notice revision #20201201 
 
 
 
diff --git a/external/tbb/doc/main/intro/introducing_main.rst b/external/tbb/doc/main/intro/introducing_main.rst
deleted file mode 100644
index 311709df..00000000
--- a/external/tbb/doc/main/intro/introducing_main.rst
+++ /dev/null
@@ -1,39 +0,0 @@
-.. _introducing_main:
-
-Introduction
-============
-
-
-|full_name| is a library that supports scalable parallel programming using
-standard ISO C++ code. It does not require special languages or
-compilers. It is designed to promote scalable data parallel programming.
-Additionally, it fully supports nested parallelism, so you can build
-larger parallel components from smaller parallel components. To use the
-library, you specify tasks, not threads, and let the library map tasks
-onto threads in an efficient manner.
-
-
-Many of the library interfaces employ generic programming, in which
-interfaces are defined by requirements on types and not specific types.
-The C++ Standard Template Library (STL) is an example of generic
-programming. Generic programming enables oneTBB to be flexible yet
-efficient. The generic interfaces enable you to customize components to
-your specific needs.
-
-
-.. note:: 
-   |full_name| requires C++11 standard compiler support.
-
-
-The net result is that oneTBB enables you to specify parallelism far
-more conveniently than using raw threads, and at the same time can
-improve performance.
-
-
-.. admonition:: Product and Performance Information 
-
-   Performance varies by use, configuration and other factors. Learn more at `www.intel.com/PerformanceIndex <https://www.intel.com/PerformanceIndex>`_.
-   Notice revision #20201201 
-
-
-
diff --git a/external/tbb/doc/main/intro/limitations.rst b/external/tbb/doc/main/intro/limitations.rst
new file mode 100644
index 00000000..3c98e5a5
--- /dev/null
+++ b/external/tbb/doc/main/intro/limitations.rst
@@ -0,0 +1,63 @@
+.. _limitations:
+
+Known Limitations
+*****************
+
+This page outlines the known limitations of oneTBB to help you better understand its capabilities. 
+
+Debug TBB In The SYCL Program
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+**Limitation:** The application may crash when using the Debug version of oneTBB in a SYCL program compiled with Intel(R) oneAPI DPC++/C++ Compiler. This happens because both ``tbb`` (Release version) and ``tbb_debug`` (Debug version) libraries load simultaneously, causing conflicts.
+
+**Solution:** Do one of the following:
+
+* Link the application with the Release version ``tbb`` instead of ``tbb_debug``.
+* Use the ``qtbb`` flag provided by the Intel(R) oneAPI DPC++/C++ Compiler.
+
+Freestanding Compilation Mode
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+**Limitation:** oneTBB does not support the freestanding compilation mode. 
+
+**Risk:** Compiling an application that utilizes oneTBB headers using the Intel(R) oneAPI DPC++/C++ Compiler may result in failure on Windows* OS if the ``/Qfreestanding`` compiler option is employed.
+
+Static Assert
+^^^^^^^^^^^^^
+
+**Limitation:** A static assert causes the compilation failures in oneTBB headers if the following conditions are satisfied:
+  
+* Compilation is done with Clang 12.0.0 or a more recent version. 
+* The LLVM standard library is employed, coupled with the use of the ``-ffreestanding`` flag and C++11/14 compiler options.
+
+**Risk:** The compilation failures. 
+
+Interface Incompatibilities: TBB vs oneTBB
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+**Limitation:** An application using Parallel STL algorithms in the ``libstdc++`` versions 9 and 10 may fail to compile due to incompatible interface changes between earlier versions of Threading Building Blocks (TBB) and oneAPI Threading Building Blocks (oneTBB). 
+
+**Solution:** Disable support for Parallel STL algorithms by defining ``PSTL_USE_PARALLEL_POLICIES`` (in libstdc++ 9) or ``_GLIBCXX_USE_TBB_PAR_BACKEND`` (in libstdc++ 10) macro to zero before inclusion of the first standard header file in each translation unit.
+
+Incorrect Installation Location
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+**Limitation:** On Linux* OS, if oneAPI Threading Building Blocks (oneTBB) or Threading Building Blocks (TBB) are installed in a system folder, such as ``/usr/lib64``, the application may fail to link due to the order in which the linker searches for libraries.  
+
+**Risk:** The issue does not affect the program execution.
+
+**Solution:** Use the ``-L`` linker option to specify the correct location of oneTBB library. 
+
+``fork()`` Support 
+^^^^^^^^^^^^^^^^^^^
+
+**Limitation:** oneTBB does not support ``fork()``. 
+
+**Solution:** To work-around the issue, consider using ``task_scheduler_handle`` to join oneTBB worker threads before using ``fork()``.
+
+Dynamic Malloc Replacement and Topology API Incompatibilities
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+**Limitation:** On Linux* OS, using dynamic malloc replacement with ``tbb::info`` and ``tbb::task_arena::constraints`` APIs may result in runtime failures.
+
+**Solution:** Set ``TBB_ENABLE_SANITIZERS=1`` in the environment. This informs that dynamic malloc replacement is used.
diff --git a/external/tbb/doc/main/intro/notices_and_disclaimers.rst b/external/tbb/doc/main/intro/notices_and_disclaimers.rst
deleted file mode 100644
index 0fe0cc6b..00000000
--- a/external/tbb/doc/main/intro/notices_and_disclaimers.rst
+++ /dev/null
@@ -1,49 +0,0 @@
-.. _notices_and_disclaimers:
-
-Notices and Disclaimers
-=======================
-
-
-Intel technologies may require enabled hardware, software or service
-activation.
-
-
-No product or component can be absolutely secure.
-
-
-Your costs and results may vary.
-
-
-© Intel Corporation. Intel, the Intel logo, and other Intel marks are
-trademarks of Intel Corporation or its subsidiaries. Other names and
-brands may be claimed as the property of others.
-
-
-Intel's compilers may or may not optimize to the same degree for
-non-Intel microprocessors for optimizations that are not unique to Intel
-microprocessors. These optimizations include SSE2, SSE3, and SSSE3
-instruction sets and other optimizations. Intel does not guarantee the
-availability, functionality, or effectiveness of any optimization on
-microprocessors not manufactured by Intel. Microprocessor-dependent
-optimizations in this product are intended for use with Intel
-microprocessors. Certain optimizations not specific to Intel
-microarchitecture are reserved for Intel microprocessors. Please refer
-to the applicable product User and Reference Guides for more information
-regarding the specific instruction sets covered by this notice.
-
-
-No license (express or implied, by estoppel or otherwise) to any
-intellectual property rights is granted by this document.
-
-
-The products described may contain design defects or errors known as
-errata which may cause the product to deviate from published
-specifications. Current characterized errata are available on request.
-
-
-Intel disclaims all express and implied warranties, including without
-limitation, the implied warranties of merchantability, fitness for a
-particular purpose, and non-infringement, as well as any warranty
-arising from course of performance, course of dealing, or usage in
-trade.
-
diff --git a/external/tbb/doc/main/intro/testing_approach.rst b/external/tbb/doc/main/intro/testing_approach.rst
new file mode 100644
index 00000000..7914c325
--- /dev/null
+++ b/external/tbb/doc/main/intro/testing_approach.rst
@@ -0,0 +1,31 @@
+.. _testing_approach:
+
+Testing Approach 
+================
+
+There are four main types of errors/hazards you can encounter in the development of libraries for parallelism:
+
+* Interface correspondence to specification
+* Memory errors
+* Data race
+* Race conditions and deadlocks
+
+|short_name| testing approach is designed to provide high coverage of these error types. 
+All types of errors are covered with unit testing and review.
+
+Code coverage metrics are tracked to ensure high code coverage with tests. Uncovered branches are analyzed manually.
+Memory errors and data races are additionally covered by special tools that include thread and memory sanitizers.
+
+Race conditions and deadlocks are the most complicated errors.
+They are covered by:
+
+* **Unit tests** that, however, have limited capability to catch such errors
+* **Integration tests**. Multiple different functionalities are heavily combined to emulate user use cases that may trigger such errors based on prior knowledge and expertise. 
+* **Stress testing with different possible combinations**. It ensures that even rarely triggered error conditions are caught by testing.
+
+.. note:: Every fix is required to be covered by a test to guarantee the detection of such issues in the future.
+
+Continuous Integration triggers all the tests on each commit. This ensures that:
+
+* Issues are detected, starting from the early development phase and up to the moment of integration of changes into the library.
+* The highest quality of the library is maintained even in such error-prone domains as parallelism.
diff --git a/external/tbb/doc/main/reference/blocked_nd_range_ctad.rst b/external/tbb/doc/main/reference/blocked_nd_range_ctad.rst
new file mode 100644
index 00000000..b585db57
--- /dev/null
+++ b/external/tbb/doc/main/reference/blocked_nd_range_ctad.rst
@@ -0,0 +1,149 @@
+.. _blocked_nd_range_ctad:
+
+Deduction Guides for ``blocked_nd_range``
+=========================================
+
+.. note::
+    To enable this feature, define the ``TBB_PREVIEW_BLOCKED_ND_RANGE_DEDUCTION_GUIDES`` macro to 1.
+
+.. contents::
+    :local:
+    :depth: 1
+
+Description
+***********
+
+The ``blocked_nd_range`` class represents a recursively divisible N-dimensional half-open interval for the oneTBB
+parallel algorithms. This feature extends ``blocked_nd_range`` to support Class Template Argument
+Deduction (starting from C++17). With that, you do not need to specify template arguments explicitly
+while creating a ``blocked_nd_range`` object if they can be inferred from the constructor arguments:
+
+.. literalinclude:: ./examples/blocked_nd_range_ctad_example.cpp
+    :language: c++
+    :start-after: /*begin_blocked_nd_range_ctad_example_1*/
+    :end-before: /*end_blocked_nd_range_ctad_example_1*/
+
+.. note::
+    For more detailed description of the implementation of this feature or to leave comments or feedback on the API, please
+    refer to the [corresponding RFC](https://github.com/uxlfoundation/oneTBB/tree/master/rfcs/experimental/blocked_nd_range_ctad).
+
+API
+***
+
+Header
+------
+
+.. code:: cpp
+    
+    #include <oneapi/tbb/blocked_nd_range.h>
+
+Synopsis
+--------
+
+.. code:: cpp
+
+    namespace oneapi {
+    namespace tbb {
+
+        template <typename Value, unsigned int N>
+        class blocked_nd_range {
+        public:
+            // Member types and constructors defined as part of oneTBB specification
+            using value_type = Value;
+            using dim_range_type = blocked_range<value_type>;
+            using size_type = typename dim_range_type::size_type;
+
+            blocked_nd_range(const dim_range_type& dim0, /*exactly N arguments of type const dim_range_type&*/); // [1]
+            blocked_nd_range(const value_type (&dim_size)[N], size_type grainsize = 1);                          // [2]
+            blocked_nd_range(blocked_nd_range& r, split);                                                        // [3]
+            blocked_nd_range(blocked_nd_range& r, proportional_split);                                           // [4]
+        }; // class blocked_nd_range
+
+        // Explicit deduction guides
+        template <typename Value, typename... Values>
+        blocked_nd_range(blocked_range<Value>, blocked_range<Values>...)
+        -> blocked_nd_range<Value, 1 + sizeof...(Values)>;
+
+        template <typename Value, unsigned int... Ns>
+        blocked_nd_range(const Value (&...)[Ns])
+        -> blocked_nd_range<Value, sizeof...(Ns)>;
+
+        template <typename Value, unsigned int N>
+        blocked_nd_range(const Value (&)[N], typename blocked_nd_range<Value, N>::size_type = 1)
+        -> blocked_nd_range<Value, N>;
+
+        template <typename Value, unsigned int N>
+        blocked_nd_range(blocked_nd_range<Value, N>, split)
+        -> blocked_nd_range<Value, N>;
+
+        template <typename Value, unsigned int N>
+        blocked_nd_range(blocked_nd_range<Value, N>, proportional_split)
+        -> blocked_nd_range<Value, N>;
+    } // namespace tbb
+    } // namespace oneapi
+
+Deduction Guides
+----------------
+
+The copy and move constructors of ``blocked_nd_range`` provide implicitly generated deduction guides. 
+In addition, the following explicit deduction guides are provided:
+
+.. code:: cpp
+
+    template <typename Value, typename... Values>
+    blocked_nd_range(blocked_range<Value>, blocked_range<Values>...)
+    -> blocked_nd_range<Value, 1 + sizeof...(Values)>;
+
+**Effects**: Enables deduction when a set of ``blocked_range`` objects is passed to the ``blocked_nd_range`` constructor ``[1]``.
+
+**Constraints**: Participates in overload resolution only if all of the types in `Values` are same as `Value`.
+
+.. code:: cpp
+
+    template <typename Value, unsigned int... Ns>
+    blocked_nd_range(const Value (&...)[Ns])
+    -> blocked_nd_range<Value, sizeof...(Ns)>;
+
+**Effects**: Enables deduction when a set of ``blocked_range`` objects is provided as braced-init-lists 
+to the ``blocked_nd_range`` constructor ``[1]``.
+
+**Constraints**: Participates in overload resolution only if ``sizeof...(Ns) >= 2``, and each integer ``Ni`` in ``Ns``
+is either ``2`` or ``3``, corresponding to ``blocked_range`` constructors with 2 and 3 arguments, respectively.
+
+.. note:: 
+    The guide allows a deduction only from braced-init-lists containing objects of the same type. 
+    For ranges with non-integral ``value_type``, setting an explicit grainsize argument
+    is not supported by the deduction guides and requires specifying explicit template arguments.
+
+.. code:: cpp
+
+    template <typename Value, unsigned int N>
+    blocked_nd_range(const Value (&)[N], typename blocked_nd_range<Value, N>::size_type = 1)
+    -> blocked_nd_range<Value, N>;
+
+**Effects**: Allows deduction from a single C array object indicating a set of dimension sizes to constructor 
+``2`` of ``blocked_nd_range``.
+
+.. code:: cpp
+
+    template <typename Value, unsigned int N>
+    blocked_nd_range(blocked_nd_range<Value, N>, split)
+    -> blocked_nd_range<Value, N>;
+
+**Effects**: Allows deduction while using the splitting constructor ``3`` of ``blocked_nd_range``.
+
+.. code:: cpp
+
+    template <typename Value, unsigned int N>
+    blocked_nd_range(blocked_nd_range<Value, N>, proportional_split)
+    -> blocked_nd_range<Value, N>;
+
+**Effects**: Allows deduction while using the proportional splitting constructor ``4`` of ``blocked_nd_range``.
+
+Example
+-------
+
+.. literalinclude:: ./examples/blocked_nd_range_ctad_example.cpp
+    :language: c++
+    :start-after: /*begin_blocked_nd_range_ctad_example_2*/
+    :end-before: /*end_blocked_nd_range_ctad_example_2*/
diff --git a/external/tbb/doc/main/reference/custom_mutex_chmap.rst b/external/tbb/doc/main/reference/custom_mutex_chmap.rst
index 152320fd..f3abbe7f 100644
--- a/external/tbb/doc/main/reference/custom_mutex_chmap.rst
+++ b/external/tbb/doc/main/reference/custom_mutex_chmap.rst
@@ -50,7 +50,7 @@ Type requirements
 -----------------
 
 The type of the mutex passed as a template argument for ``concurrent_hash_map`` should
-meet the requirements of `ReaderWriterMutex <https://spec.oneapi.com/versions/latest/elements/oneTBB/source/named_requirements/mutexes/rw_mutex.html>`_.
+meet the requirements of `ReaderWriterMutex <https://oneapi-spec.uxlfoundation.org/specifications/oneapi/latest/elements/onetbb/source/named_requirements/mutexes/rw_mutex>`_.
 It should also provide the following API:
 
 .. cpp:function:: bool ReaderWriterMutex::scoped_lock::is_writer() const;
@@ -67,92 +67,7 @@ and ``oneapi::tbb::rw_mutex`` meet the requirements above.
 The example below demonstrates how to wrap ``std::shared_mutex`` (C++17) to meet the requirements
 of `ReaderWriterMutex` and how to customize ``concurrent_hash_map`` to use this mutex.
 
-.. code:: cpp
-
-    #define TBB_PREVIEW_CONCURRENT_HASH_MAP_EXTENSIONS 1
-    #include "oneapi/tbb/concurrent_hash_map.h"
-    #include <shared_mutex>
-
-    class SharedMutexWrapper {
-    public:
-        // ReaderWriterMutex requirements
-
-        static constexpr bool is_rw_mutex = true;
-        static constexpr bool is_recursive_mutex = false;
-        static constexpr bool is_fair_mutex = false;
-
-        class scoped_lock {
-        public:
-            scoped_lock() : my_mutex_ptr(nullptr), my_writer_flag(false) {}
-            scoped_lock(SharedMutexWrapper& mutex, bool write = true)
-                : my_mutex_ptr(&mutex), my_writer_flag(write)
-            {
-                if (my_writer_flag) {
-                    my_mutex_ptr->my_mutex.lock();
-                } else {
-                    my_mutex_ptr->my_mutex.lock_shared();
-                }
-            }
-
-            ~scoped_lock() {
-                if (my_mutex_ptr) release();
-            }
-
-            void acquire(SharedMutexWrapper& mutex, bool write = true) {
-                if (my_mutex_ptr) release();
-
-                my_mutex_ptr = &mutex;
-                my_writer_flag = write;
-
-                if (my_writer_flag) {
-                    my_mutex_ptr->my_mutex.lock();
-                } else {
-                    my_mutex_ptr->my_mutex.lock_shared();
-                }
-            }
-
-            void release() {
-                if (my_writer_flag) {
-                    my_mutex_ptr->my_mutex.unlock();
-                } else {
-                    my_mutex_ptr->my_mutex.unlock_shared();
-                }
-            }
-
-            bool upgrade_to_writer() {
-                // std::shared_mutex does not have the upgrade/downgrade parallel_for_each_semantics
-                if (my_writer_flag) return true; // Already a writer
-
-                my_mutex_ptr->my_mutex.unlock_shared();
-                my_mutex_ptr->my_mutex.lock();
-                return false; // The lock was reacquired
-            }
-
-            bool downgrade_to_reader() {
-                if (!my_writer_flag) return true; // Already a reader
-
-                my_mutex_ptr->my_mutex.unlock();
-                my_mutex_ptr->my_mutex.lock_shared();
-                return false;
-            }
-
-            bool is_writer() const {
-                return my_writer_flag;
-            }
-
-        private:
-            SharedMutexWrapper* my_mutex_ptr;
-            bool                my_writer_flag;
-        };
-    private:
-        std::shared_mutex my_mutex;
-    }; // struct SharedMutexWrapper
-
-    int main() {
-        using map_type = oneapi::tbb::concurrent_hash_map<int, int,
-                                                          oneapi::tbb::tbb_hash_compare<int>,
-                                                          oneapi::tbb::tbb_allocator<std::pair<const int, int>>,
-                                                          SharedMutexWrapper>;
-
-        map_type map; // This object will use SharedMutexWrapper for thread safety of insert/find/erase operations
-    }
+.. literalinclude:: ./examples/custom_mutex_chmap_example.cpp
+    :language: c++
+    :start-after: /*begin_custom_mutex_chmap_example*/
+    :end-before: /*end_custom_mutex_chmap_example*/
diff --git a/external/tbb/doc/main/reference/examples/blocked_nd_range_ctad_example.cpp b/external/tbb/doc/main/reference/examples/blocked_nd_range_ctad_example.cpp
new file mode 100644
index 00000000..d80d6cd9
--- /dev/null
+++ b/external/tbb/doc/main/reference/examples/blocked_nd_range_ctad_example.cpp
@@ -0,0 +1,61 @@
+/*
+    Copyright (c) 2025 Intel Corporation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#if __cplusplus >= 201703L
+
+#define TBB_PREVIEW_BLOCKED_ND_RANGE_DEDUCTION_GUIDES 1
+#include <oneapi/tbb/blocked_nd_range.h>
+
+int main() {
+    {
+        /*begin_blocked_nd_range_ctad_example_1*/
+        oneapi::tbb::blocked_range<int> range1(0, 100);
+        oneapi::tbb::blocked_range<int> range2(0, 200);
+        oneapi::tbb::blocked_range<int> range3(0, 300);
+
+        // Since 3 unidimensional ranges of type int are provided, the type of nd_range
+        // can be deduced as oneapi::tbb::blocked_nd_range<int, 3>
+        oneapi::tbb::blocked_nd_range nd_range(range1, range2, range3);
+        /*end_blocked_nd_range_ctad_example_1*/
+    }
+    /*begin_blocked_nd_range_ctad_example_2*/
+    {
+        oneapi::tbb::blocked_range<int> range1(0, 100);
+        oneapi::tbb::blocked_range<int> range2(0, 200);
+
+        // Deduced as blocked_nd_range<int, 2>
+        oneapi::tbb::blocked_nd_range nd_range(range1, range2);
+    }
+    {
+        // Deduced as blocked_nd_range<int, 2>
+        oneapi::tbb::blocked_nd_range nd_range({0, 100}, {0, 200, 5});
+    }
+    {
+        int endings[3] = {100, 200, 300};
+
+        // Deduced as blocked_nd_range<int, 3>
+        oneapi::tbb::blocked_nd_range nd_range1(endings);
+
+        // Deduced as blocked_nd_range<int, 3>
+        oneapi::tbb::blocked_nd_range nd_range2({100, 200, 300}, /*grainsize = */10);
+    }
+    /*end_blocked_nd_range_ctad_example_2*/
+}
+
+#else 
+// Skip
+int main() {}
+#endif
diff --git a/external/tbb/doc/main/reference/examples/custom_mutex_chmap_example.cpp b/external/tbb/doc/main/reference/examples/custom_mutex_chmap_example.cpp
new file mode 100644
index 00000000..b136241a
--- /dev/null
+++ b/external/tbb/doc/main/reference/examples/custom_mutex_chmap_example.cpp
@@ -0,0 +1,129 @@
+/*
+    Copyright (c) 2025 Intel Corporation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#if __cplusplus >= 201703L
+
+/*begin_custom_mutex_chmap_example*/
+#define TBB_PREVIEW_CONCURRENT_HASH_MAP_EXTENSIONS 1
+#include "oneapi/tbb/concurrent_hash_map.h"
+#include <shared_mutex>
+
+class SharedMutexWrapper {
+public:
+    // ReaderWriterMutex requirements
+
+    static constexpr bool is_rw_mutex = true;
+    static constexpr bool is_recursive_mutex = false;
+    static constexpr bool is_fair_mutex = false;
+
+    class scoped_lock {
+    public:
+        scoped_lock() : my_mutex_ptr(nullptr), my_writer_flag(false) {}
+        scoped_lock(SharedMutexWrapper& mutex, bool write = true)
+            : my_mutex_ptr(&mutex), my_writer_flag(write)
+        {
+            if (my_writer_flag) {
+                my_mutex_ptr->my_mutex.lock();
+            } else {
+                my_mutex_ptr->my_mutex.lock_shared();
+            }
+        }
+
+        ~scoped_lock() {
+            if (my_mutex_ptr) release();
+        }
+
+        void acquire(SharedMutexWrapper& mutex, bool write = true) {
+            if (my_mutex_ptr) release();
+
+            my_mutex_ptr = &mutex;
+            my_writer_flag = write;
+
+            if (my_writer_flag) {
+                my_mutex_ptr->my_mutex.lock();
+            } else {
+                my_mutex_ptr->my_mutex.lock_shared();
+            }
+        }
+
+        bool try_acquire(SharedMutexWrapper& mutex, bool write = true) {
+            if (my_mutex_ptr) release();
+
+            my_mutex_ptr = &mutex;
+
+            bool result = false;
+
+            if (my_writer_flag) {
+                result = my_mutex_ptr->my_mutex.try_lock();
+            } else {
+                result = my_mutex_ptr->my_mutex.try_lock_shared();
+            }
+
+            if (result) my_writer_flag = write;
+            return result;
+        }
+
+        void release() {
+            if (my_writer_flag) {
+                my_mutex_ptr->my_mutex.unlock();
+            } else {
+                my_mutex_ptr->my_mutex.unlock_shared();
+            }
+        }
+
+        bool upgrade_to_writer() {
+            // std::shared_mutex does not have the upgrade/downgrade semantics
+            if (my_writer_flag) return true; // Already a writer
+
+            my_mutex_ptr->my_mutex.unlock_shared();
+            my_mutex_ptr->my_mutex.lock();
+            return false; // The lock was reacquired
+        }
+
+        bool downgrade_to_reader() {
+            if (!my_writer_flag) return true; // Already a reader
+
+            my_mutex_ptr->my_mutex.unlock();
+            my_mutex_ptr->my_mutex.lock_shared();
+            return false;
+        }
+
+        bool is_writer() const {
+            return my_writer_flag;
+        }
+
+    private:
+        SharedMutexWrapper* my_mutex_ptr;
+        bool                my_writer_flag;
+    };
+private:
+    std::shared_mutex my_mutex;
+}; // struct SharedMutexWrapper
+
+int main() {
+    using map_type = oneapi::tbb::concurrent_hash_map<int, int,
+                                                      oneapi::tbb::tbb_hash_compare<int>,
+                                                      oneapi::tbb::tbb_allocator<std::pair<const int, int>>,
+                                                      SharedMutexWrapper>;
+
+    map_type map; // This object will use SharedMutexWrapper for thread safety of insert/find/erase operations
+}
+/*end_custom_mutex_chmap_example*/
+
+#else // C++17
+// Skip
+int main() {}
+#endif
diff --git a/external/tbb/doc/main/reference/examples/fixed_pool_example.cpp b/external/tbb/doc/main/reference/examples/fixed_pool_example.cpp
new file mode 100644
index 00000000..263fe219
--- /dev/null
+++ b/external/tbb/doc/main/reference/examples/fixed_pool_example.cpp
@@ -0,0 +1,28 @@
+/*
+    Copyright (c) 2025 Intel Corporation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/*begin_fixed_pool_example*/
+#define TBB_PREVIEW_MEMORY_POOL 1
+#include "oneapi/tbb/memory_pool.h"
+
+int main() {
+    char buf[1024];
+    oneapi::tbb::fixed_pool my_pool(buf, 1024);
+
+    void* my_ptr = my_pool.malloc(10);
+    my_pool.free(my_ptr);
+}
+/*end_fixed_pool_example*/
diff --git a/external/tbb/doc/main/reference/examples/helpers_for_expressing_graphs_preview_api_example.cpp b/external/tbb/doc/main/reference/examples/helpers_for_expressing_graphs_preview_api_example.cpp
new file mode 100644
index 00000000..6b7eb414
--- /dev/null
+++ b/external/tbb/doc/main/reference/examples/helpers_for_expressing_graphs_preview_api_example.cpp
@@ -0,0 +1,54 @@
+/*
+    Copyright (c) 2025 Intel Corporation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#if __cplusplus >= 201703L
+
+/*begin_helpers_for_expressing_graphs_preview_api_example*/
+#define TBB_PREVIEW_FLOW_GRAPH_FEATURES 1
+#include <oneapi/tbb/flow_graph.h>
+
+int main() {
+    using namespace oneapi::tbb::flow;
+
+    graph g;
+
+    function_node doubler(g, unlimited, [](const int& v) { return 2 * v; });
+    function_node squarer(g, unlimited, [](const int& v) { return v * v; });
+    function_node cuber(g, unlimited, [](const int& v) { return v * v * v; });
+
+    auto handlers = make_node_set(doubler, squarer, cuber);
+
+    broadcast_node input(precedes(handlers));
+    join_node join(follows(handlers));
+
+    int sum = 0;
+    function_node summer(follows(join), serial,
+                            [&](const std::tuple<int, int, int>& v) {
+                                int sub_sum = std::get<0>(v) + std::get<1>(v) + std::get<2>(v);
+                                sum += sub_sum;
+                                return sub_sum;
+                            });
+
+    for (int i = 1; i <= 10; ++i) {
+        input.try_put(i);
+    }
+    g.wait_for_all();
+}
+/*end_helpers_for_expressing_graphs_preview_api_example*/
+#else
+// Skip
+int main() {}
+#endif
diff --git a/external/tbb/doc/main/reference/examples/helpers_for_expressing_graphs_regular_api_example.cpp b/external/tbb/doc/main/reference/examples/helpers_for_expressing_graphs_regular_api_example.cpp
new file mode 100644
index 00000000..578f6347
--- /dev/null
+++ b/external/tbb/doc/main/reference/examples/helpers_for_expressing_graphs_regular_api_example.cpp
@@ -0,0 +1,60 @@
+/*
+    Copyright (c) 2025 Intel Corporation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#if __cplusplus >= 201703L
+
+/*begin_helpers_for_expressing_graphs_regular_api_example*/
+#include <oneapi/tbb/flow_graph.h>
+
+int main() {
+    using namespace oneapi::tbb::flow;
+
+    graph g;
+
+    broadcast_node<int> input(g);
+
+    function_node doubler(g, unlimited, [](const int& v) { return 2 * v; });
+    function_node squarer(g, unlimited, [](const int& v) { return v * v; });
+    function_node cuber(g, unlimited, [](const int& v) { return v * v * v; });
+
+    join_node<std::tuple<int, int, int>> join(g);
+
+    int sum = 0;
+    function_node summer(g, serial, [&](const std::tuple<int, int, int>& v) {
+        int sub_sum = std::get<0>(v) + std::get<1>(v) + std::get<2>(v);
+        sum += sub_sum;
+        return sub_sum;
+    });
+
+    make_edge(input, doubler);
+    make_edge(input, squarer);
+    make_edge(input, cuber);
+    make_edge(doubler, std::get<0>(join.input_ports()));
+    make_edge(squarer, std::get<1>(join.input_ports()));
+    make_edge(cuber, std::get<2>(join.input_ports()));
+    make_edge(join, summer);
+
+    for (int i = 1; i <= 10; ++i) {
+        input.try_put(i);
+    }
+    g.wait_for_all();
+}
+/*end_helpers_for_expressing_graphs_regular_api_example*/
+
+#else
+// Skip
+int main() {}
+#endif
diff --git a/external/tbb/doc/main/reference/examples/make_edges_function_example.cpp b/external/tbb/doc/main/reference/examples/make_edges_function_example.cpp
new file mode 100644
index 00000000..d2ee0c83
--- /dev/null
+++ b/external/tbb/doc/main/reference/examples/make_edges_function_example.cpp
@@ -0,0 +1,49 @@
+/*
+    Copyright (c) 2025 Intel Corporation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#if __cplusplus >= 201703L
+
+/*begin_make_edges_function_example*/
+#define TBB_PREVIEW_FLOW_GRAPH_FEATURES 1
+#include <oneapi/tbb/flow_graph.h>
+
+int main() {
+    using namespace oneapi::tbb::flow;
+
+    graph g;
+    broadcast_node<int> input(g);
+
+    function_node doubler(g, unlimited, [](const int& i) { return 2 * i; });
+    function_node squarer(g, unlimited, [](const int& i) { return i * i; });
+    function_node cuber(g, unlimited, [](const int& i) { return i * i * i; });
+
+    buffer_node<int> buffer(g);
+
+    auto handlers = make_node_set(doubler, squarer, cuber);
+    make_edges(input, handlers);
+    make_edges(handlers, buffer);
+
+    for (int i = 1; i <= 10; ++i) {
+        input.try_put(i);
+    }
+    g.wait_for_all();
+}
+/*end_make_edges_function_example*/
+
+#else
+// Skip
+int main() {}
+#endif
diff --git a/external/tbb/doc/main/reference/examples/malloc_replacement_log_example.cpp b/external/tbb/doc/main/reference/examples/malloc_replacement_log_example.cpp
new file mode 100644
index 00000000..4c6aba83
--- /dev/null
+++ b/external/tbb/doc/main/reference/examples/malloc_replacement_log_example.cpp
@@ -0,0 +1,41 @@
+/*
+    Copyright (c) 2025 Intel Corporation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#if _WIN32
+
+/*begin_malloc_replacement_log_example*/
+#include "oneapi/tbb/tbbmalloc_proxy.h"
+#include <stdio.h>
+
+int main(){
+    char **func_replacement_log;
+    int func_replacement_status = TBB_malloc_replacement_log(&func_replacement_log);
+
+    if (func_replacement_status != 0) {
+        printf("tbbmalloc_proxy cannot replace memory allocation routines\n");
+        for (char** log_string = func_replacement_log; *log_string != 0; log_string++) {
+            printf("%s\n",*log_string);
+        }
+    }
+
+    return 0;
+}
+/*end_malloc_replacement_log_example*/
+
+#else
+// Skip
+int main() {}
+#endif
diff --git a/external/tbb/doc/main/reference/examples/memory_pool_allocator_example.cpp b/external/tbb/doc/main/reference/examples/memory_pool_allocator_example.cpp
new file mode 100644
index 00000000..9cd971b7
--- /dev/null
+++ b/external/tbb/doc/main/reference/examples/memory_pool_allocator_example.cpp
@@ -0,0 +1,30 @@
+/*
+    Copyright (c) 2025 Intel Corporation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/*begin_memory_pool_allocator_example*/
+#define TBB_PREVIEW_MEMORY_POOL 1
+#include "oneapi/tbb/memory_pool.h"
+#include <list>
+
+int main() {
+    oneapi::tbb::memory_pool<std::allocator<int>> my_pool;
+
+    typedef oneapi::tbb::memory_pool_allocator<int> pool_allocator_t;
+    std::list<int, pool_allocator_t> my_list(pool_allocator_t{my_pool});
+
+    my_list.emplace_back(1);
+}
+/*end_memory_pool_allocator_example*/
diff --git a/external/tbb/doc/main/reference/examples/memory_pool_example.cpp b/external/tbb/doc/main/reference/examples/memory_pool_example.cpp
new file mode 100644
index 00000000..0382343d
--- /dev/null
+++ b/external/tbb/doc/main/reference/examples/memory_pool_example.cpp
@@ -0,0 +1,27 @@
+/*
+    Copyright (c) 2025 Intel Corporation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/*begin_memory_pool_example*/
+#define TBB_PREVIEW_MEMORY_POOL 1
+#include "oneapi/tbb/memory_pool.h"
+
+int main() {
+    oneapi::tbb::memory_pool<std::allocator<char>> my_pool;
+
+    void* my_ptr = my_pool.malloc(10);
+    my_pool.free(my_ptr);
+}
+/*end_memory_pool_example*/
diff --git a/external/tbb/doc/main/reference/examples/parallel_phase_example.cpp b/external/tbb/doc/main/reference/examples/parallel_phase_example.cpp
new file mode 100644
index 00000000..d5228143
--- /dev/null
+++ b/external/tbb/doc/main/reference/examples/parallel_phase_example.cpp
@@ -0,0 +1,53 @@
+/*
+    Copyright (c) 2025 Intel Corporation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/*begin_parallel_phase_example*/
+#define TBB_PREVIEW_PARALLEL_PHASE 1
+
+#include "oneapi/tbb/task_arena.h"
+#include "oneapi/tbb/parallel_for.h"
+#include "oneapi/tbb/parallel_sort.h"
+
+#include <vector>
+
+int main() {
+    oneapi::tbb::task_arena ta {
+        tbb::task_arena::automatic, /*reserved_for_masters=*/1,
+        tbb::task_arena::priority::normal,
+        tbb::task_arena::leave_policy::fast
+    };
+
+    std::vector<int> data(1000);
+
+    {
+        oneapi::tbb::task_arena::scoped_parallel_phase phase{ta};
+        ta.execute([&data]() {
+            oneapi::tbb::parallel_for(std::size_t(0), data.size(), [&data](std::size_t i) {
+                data[i] = static_cast<int>(i*i);
+            });
+        });
+
+        for (std::size_t i = 1; i < data.size(); ++i) {
+            data[i] += data[i-1];
+        }
+
+        ta.execute([&data]() {
+            oneapi::tbb::parallel_sort(data.begin(), data.end());
+        });
+
+    }
+}
+/*end_parallel_phase_example*/
diff --git a/external/tbb/doc/main/reference/examples/parallel_sort_ranges_extension_example.cpp b/external/tbb/doc/main/reference/examples/parallel_sort_ranges_extension_example.cpp
new file mode 100644
index 00000000..74a1292b
--- /dev/null
+++ b/external/tbb/doc/main/reference/examples/parallel_sort_ranges_extension_example.cpp
@@ -0,0 +1,37 @@
+/*
+    Copyright (c) 2025 Intel Corporation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#if __cplusplus >= 202002L
+
+/*begin_parallel_sort_ranges_extension_example*/
+#include <array>
+#include <span> // requires C++20
+#include <oneapi/tbb/parallel_sort.h>
+
+std::span<int> get_span() {
+    static std::array<int, 3> arr = {3, 2, 1};
+    return std::span<int>(arr);
+}
+
+int main() {
+    tbb::parallel_sort(get_span());
+}
+/*end_parallel_sort_ranges_extension_example*/
+
+#else
+// Skip
+int main() {}
+#endif
diff --git a/external/tbb/doc/main/reference/examples/rvalue_reduce.cpp b/external/tbb/doc/main/reference/examples/rvalue_reduce.cpp
new file mode 100644
index 00000000..330498e1
--- /dev/null
+++ b/external/tbb/doc/main/reference/examples/rvalue_reduce.cpp
@@ -0,0 +1,50 @@
+/*
+    Copyright (c) 2025 Intel Corporation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#if __cplusplus >= 201703L
+
+/*begin_rvalue_reduce_example*/
+// C++17
+#include <oneapi/tbb/parallel_reduce.h>
+#include <oneapi/tbb/blocked_range.h>
+#include <vector>
+#include <set>
+
+int main() {
+    std::vector<std::set<int>> sets;
+
+    oneapi::tbb::parallel_reduce(oneapi::tbb::blocked_range<size_t>(0, sets.size()),
+                                    std::set<int>{}, // identity element - empty set
+                                    [&](const oneapi::tbb::blocked_range<size_t>& range, std::set<int>&& value) {
+                                        for (size_t i = range.begin(); i < range.end(); ++i) {
+                                            // Having value as a non-const rvalue reference allows to efficiently
+                                            // transfer nodes from sets[i] without copying/moving the data
+                                            value.merge(std::move(sets[i]));
+                                        }
+                                        return value;
+                                    },
+                                    [&](std::set<int>&& x, std::set<int>&& y) {
+                                        x.merge(std::move(y));
+                                        return x;
+                                    }
+                                    );
+}
+/*end_rvalue_reduce_example*/
+
+#else
+// Skip
+int main() {}
+#endif
diff --git a/external/tbb/doc/main/reference/examples/try_put_and_wait_example.cpp b/external/tbb/doc/main/reference/examples/try_put_and_wait_example.cpp
new file mode 100644
index 00000000..d86f8e07
--- /dev/null
+++ b/external/tbb/doc/main/reference/examples/try_put_and_wait_example.cpp
@@ -0,0 +1,75 @@
+/*
+    Copyright (c) 2025 Intel Corporation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#include <tuple>
+
+// dummy bodies
+struct f1_body {
+    int operator()(int input) { return input; };
+};
+
+struct f2_body : f1_body {};
+struct f3_body : f1_body {};
+
+struct f4_body {
+    int operator()(const std::tuple<int, int>& input) {
+        return 0;
+    }
+};
+
+/*begin_try_put_and_wait_example*/
+#define TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT 1
+#include <oneapi/tbb/flow_graph.h>
+#include <oneapi/tbb/parallel_for.h>
+#include <tuple>
+
+struct f1_body;
+struct f2_body;
+struct f3_body;
+struct f4_body;
+
+int main() {
+    using namespace oneapi::tbb;
+
+    flow::graph g;
+    flow::broadcast_node<int> start_node(g);
+
+    flow::function_node<int, int> f1(g, flow::unlimited, f1_body{});
+    flow::function_node<int, int> f2(g, flow::unlimited, f2_body{});
+    flow::function_node<int, int> f3(g, flow::unlimited, f3_body{});
+
+    flow::join_node<std::tuple<int, int>> join(g);
+
+    flow::function_node<std::tuple<int, int>, int> f4(g, flow::serial, f4_body{});
+
+    flow::make_edge(start_node, f1);
+    flow::make_edge(f1, f2);
+
+    flow::make_edge(start_node, f3);
+
+    flow::make_edge(f2, flow::input_port<0>(join));
+    flow::make_edge(f3, flow::input_port<1>(join));
+
+    flow::make_edge(join, f4);
+
+    // Submit work into the graph
+    parallel_for(0, 100, [&](int input) {
+        start_node.try_put_and_wait(input);
+
+        // Post processing the result of input
+    });
+}
+/*end_try_put_and_wait_example*/
diff --git a/external/tbb/doc/main/reference/helpers_for_expressing_graphs.rst b/external/tbb/doc/main/reference/helpers_for_expressing_graphs.rst
index 537fda0f..ef42331a 100644
--- a/external/tbb/doc/main/reference/helpers_for_expressing_graphs.rst
+++ b/external/tbb/doc/main/reference/helpers_for_expressing_graphs.rst
@@ -44,75 +44,14 @@ to avoid template parameter specification where possible.
 
 **Regular API**
 
-.. code:: cpp
-
-    #include <oneapi/tbb/flow_graph.h>
-
-    int main() {
-        using namespace oneapi::tbb::flow;
-
-        graph g;
-
-        broadcast_node<int> input(g);
-
-        function_node doubler(g, unlimited, [](const int& v) { return 2 * v; });
-        function_node squarer(g, unlimited, [](const int&) { return v * v; });
-        function_node cuber(g, unlimited, [](const int& v) { return v * v * v; });
-
-        join_node<std::tuple<int, int, int>> join(g);
-
-        int sum = 0;
-        function_node summer(g, serial, [&](const std::tuple<int, int, int>& v) {
-            int sub_sum = std::get<0>(v) + std::get<1>(v) + std::get<2>(v);
-            sum += sub_sum;
-            return sub_sum;
-        });
-
-        make_edge(input, doubler);
-        make_edge(input, squarer);
-        make_edge(input, cuber);
-        make_edge(doubler, std::get<0>(join.input_ports()));
-        make_edge(squarer, std::get<1>(join.input_ports()));
-        make_edge(cuber, std::get<2>(join.input_ports()));
-        make_edge(join, summer);
-
-        for (int i = 1; i <= 10; ++i) {
-            input.try_put(i);
-        }
-        g.wait_for_all();
-    }
+.. literalinclude:: ./examples/helpers_for_expressing_graphs_regular_api_example.cpp
+    :language: c++
+    :start-after: /*begin_helpers_for_expressing_graphs_regular_api_example*/
+    :end-before: /*end_helpers_for_expressing_graphs_regular_api_example*/
 
 **Preview API**
 
-.. code:: cpp
-
-    #define TBB_PREVIEW_FLOW_GRAPH_FEATURES 1
-    #include <oneapi/tbb/flow_graph.h>
-
-    int main() {
-        using namespace oneapi::tbb::flow;
-
-        graph g;
-
-        function_node doubler(g, unlimited, [](const int& v) { return 2 * v; });
-        function_node squarer(g, unlimited, [](const int&) { return v * v; });
-        function_node cuber(g, unlimited, [](const int& v) { return v * v * v; });
-
-        auto handlers = make_node_set(doubler, squarer, cuber);
-
-        broadcast_node input(precedes(handlers));
-        join_node join(follows(handlers));
-
-        int sum = 0;
-        function_node summer(follows(join), serial,
-                             [&](const std::tuple<int, int, int>& v) {
-                                 int sub_sum = std::get<0>(v) + std::get<1>(v) + std::get<2>(v);
-                                 sum += sub_sum;
-                                 return sub_sum;
-                             });
-
-        for (int i = 1; i <= 10; ++i) {
-            input.try_put(i);
-        }
-        g.wait_for_all();
-    }
+.. literalinclude:: ./examples/helpers_for_expressing_graphs_preview_api_example.cpp
+    :language: c++
+    :start-after: /*begin_helpers_for_expressing_graphs_preview_api_example*/
+    :end-before: /*end_helpers_for_expressing_graphs_preview_api_example*/
diff --git a/external/tbb/doc/main/reference/make_edges_function.rst b/external/tbb/doc/main/reference/make_edges_function.rst
index 4035463d..63fb6e28 100644
--- a/external/tbb/doc/main/reference/make_edges_function.rst
+++ b/external/tbb/doc/main/reference/make_edges_function.rst
@@ -53,29 +53,7 @@ The example implements the graph structure in the picture below.
 .. figure:: ./Resources/make_edges_example.png
     :align: center
 
-.. code:: cpp
-
-    #define TBB_PREVIEW_FLOW_GRAPH_FEATURES 1
-    #include <oneapi/tbb/flow_graph.h>
-
-    int main() {
-        using namespace oneapi::tbb::flow;
-
-        graph g;
-        broadcast_node<int> input(g);
-
-        function_node doubler(g, unlimited, [](const int& i) { return 2 * i; });
-        function_node squarer(g, unlimited, [](const int& i) { return i * i; });
-        function_node cuber(g, unlimited, [](const int& i) { return i * i * i; });
-
-        buffer_node<int> buffer(g);
-
-        auto handlers = make_node_set(doubler, squarer, cuber);
-        make_edges(input, handlers);
-        make_edges(handlers, buffer);
-
-        for (int i = 1; i <= 10; ++i) {
-            input.try_put(i);
-        }
-        g.wait_for_all();
-    }
+.. literalinclude:: ./examples/make_edges_function_example.cpp
+    :language: c++
+    :start-after: /*begin_make_edges_function_example*/
+    :end-before: /*end_make_edges_function_example*/
diff --git a/external/tbb/doc/main/reference/parallel_for_each_semantics.rst b/external/tbb/doc/main/reference/parallel_for_each_semantics.rst
index 1f8815b3..c007066b 100644
--- a/external/tbb/doc/main/reference/parallel_for_each_semantics.rst
+++ b/external/tbb/doc/main/reference/parallel_for_each_semantics.rst
@@ -10,7 +10,7 @@ parallel_for_each Body semantics and requirements
 Description
 ***********
 
-This page clarifies `ParallelForEachBody <https://spec.oneapi.com/versions/latest/elements/oneTBB/source/named_requirements/algorithms/par_for_each_body.html>`_
+This page clarifies `ParallelForEachBody <https://oneapi-spec.uxlfoundation.org/specifications/oneapi/latest/elements/onetbb/source/named_requirements/algorithms/par_for_each_body>`_
 named requirements for ``tbb::parallel_for_each`` algorithm specification.
 
 .. code:: cpp
diff --git a/external/tbb/doc/main/reference/parallel_phase_for_task_arena.rst b/external/tbb/doc/main/reference/parallel_phase_for_task_arena.rst
new file mode 100644
index 00000000..1a0bbca7
--- /dev/null
+++ b/external/tbb/doc/main/reference/parallel_phase_for_task_arena.rst
@@ -0,0 +1,172 @@
+.. _parallel_phase_for_task_arena:
+
+``parallel_phase`` Interface for Task Arena
+====================================================================
+
+.. note::
+    To enable this feature, set ``TBB_PREVIEW_PARALLEL_PHASE`` macro to 1.
+
+.. contents::
+    :local:
+    :depth: 1
+
+Description
+***********
+
+This feature extends the `tbb::task_arena specification <https://oneapi-spec.uxlfoundation.org/specifications/oneapi/latest/elements/onetbb/source/task_scheduler/task_arena/task_arena_cls>`_
+with the following API:
+
+* Adds the ``leave_policy`` enumeration class to ``task_arena``.
+* Adds ``leave_policy`` as the last parameter in ``task_arena`` constructors and ``task_arena::initialize`` methods.
+  This allows you to inform the scheduler about the preferred policy for worker threads
+  when they are about to leave `task_arena` due to a lack of available work.
+* Adds new ``start_parallel_phase`` and ``end_parallel_phase`` interfaces to the ``task_arena`` class
+  and the ``this_task_arena`` namespace. These interfaces work as hints to the scheduler to mark the start and end
+  of parallel work submission into the arena, enabling different worker thread retention policies.
+* Adds the Resource Acquisition is Initialization (RAII) class ``scoped_parallel_phase`` to ``task_arena``.
+
+More details about motivation, semantics and conditions for becoming fully supported functionality can be found in the corresponding
+`Request For Comments document for parallel_phase <https://github.com/uxlfoundation/oneTBB/tree/master/rfcs/experimental/parallel_phase_for_task_arena>`_.
+
+API
+***
+
+Header
+------
+
+.. code:: cpp
+
+    #define TBB_PREVIEW_PARALLEL_PHASE 1
+    #include <oneapi/tbb/task_arena.h>
+
+Synopsis
+--------
+
+.. code:: cpp
+
+    namespace oneapi {
+        namespace tbb {
+
+            class task_arena {
+            public:
+
+                enum class leave_policy : /* unspecified type */ {
+                    automatic = /* unspecifed */,
+                    fast = /* unspecifed */,
+                };
+
+                task_arena(int max_concurrency = automatic, unsigned reserved_for_masters = 1,
+                           priority a_priority = priority::normal,
+                           leave_policy a_leave_policy = leave_policy::automatic);
+
+                task_arena(const constraints& constraints_, unsigned reserved_for_masters = 1,
+                           priority a_priority = priority::normal,
+                           leave_policy a_leave_policy = leave_policy::automatic);
+
+                void initialize(int max_concurrency, unsigned reserved_for_masters = 1,
+                                priority a_priority = priority::normal,
+                                leave_policy a_leave_policy = leave_policy::automatic);
+
+                void initialize(constraints a_constraints, unsigned reserved_for_masters = 1,
+                                priority a_priority = priority::normal,
+                                leave_policy a_leave_policy = leave_policy::automatic);
+
+                void start_parallel_phase();
+                void end_parallel_phase(bool with_fast_leave = false);
+
+                class scoped_parallel_phase {
+                public:
+                    scoped_parallel_phase(task_arena& ta, bool with_fast_leave = false);
+                };
+            }; // class task_arena
+
+            namespace this_task_arena {
+                void start_parallel_phase();
+                void end_parallel_phase(bool with_fast_leave = false);
+            } // namespace this_task_arena
+
+        } // namespace tbb
+    } // namespace oneapi
+
+Member Types
+----------------
+
+.. cpp:enum:: leave_policy::automatic
+
+When passed to a constructor or the ``initialize`` method, the initialized ``task_arena`` has
+the default (possibly system specific) policy for how quickly worker threads leave the arena
+when there is no more work available in the arena and when the arena is not in a parallel phase.
+
+.. note:: Worker threads in ``task_arena`` might be retained based on internal heuristics.
+
+.. cpp:enum:: leave_policy::fast
+
+When passed to a constructor or the ``initialize`` method, the initialized ``task_arena``
+has policy that allows worker threads to more quickly leave the arena when there is no more work
+available in the arena and when the arena is not in a parallel phase.
+
+.. cpp:class:: scoped_parallel_phase
+
+The RAII class to map a parallel phase to a code scope.
+
+.. cpp:function:: scoped_parallel_phase::scoped_parallel_phase(task_arena& ta, bool with_fast_leave = false)
+
+Constructs a ``scoped_parallel_phase`` object that starts a parallel phase in the specified ``task_arena``.
+If ``with_fast_leave`` is ``true``, the worker threads leave policy is temporarily set to ``fast``.
+
+.. note:: For ``task_arena`` initialized with ``leave_policy::fast``, ``with_fast_leave`` setting has no effect.
+
+.. note::
+   When worker threads enter the arena with no active parallel phases,
+   the leave policy is reset to the value set during the initialization of the arena.
+
+Member Functions
+----------------
+
+.. cpp:function:: task_arena(const task_arena&)
+
+Copies settings from ``task_arena`` instance including the ``leave_policy``.
+
+.. cpp:function:: void start_parallel_phase()
+
+Indicates a point from where the scheduler can use a hint to keep threads in the arena for longer.
+
+.. note:: This function can also be a warm-up hint for the scheduler. It allows the scheduler to wake up worker threads in advance.
+
+.. cpp:function:: void end_parallel_phase(bool with_fast_leave = false)
+
+Indicates the point when the scheduler may drop a hint and no longer retain threads in the arena.
+If ``with_fast_leave`` is ``true``, worker threads leave policy is temporarily set to ``fast``.
+
+.. note:: For ``task_arena`` initialized with ``leave_policy::fast``, ``with_fast_leave`` setting has no effect.
+
+.. note::
+   When worker threads enter the arena with no active parallel phases,
+   the leave policy is reset to the value set during the initialization of the arena.
+
+Functions
+---------
+
+.. cpp:function:: void this_task_arena::start_parallel_phase()
+
+Indicates the start of the parallel phase in the current ``task_arena``.
+
+.. cpp:function:: void this_task_arena::end_parallel_phase(bool with_fast_leave = false)
+
+Indicates the end of the parallel phase in the current ``task_arena``.
+If ``with_fast_leave`` is ``true``, worker threads leave policy is temporarily set to ``fast``.
+
+Example
+*******
+
+.. literalinclude:: .examples/parallel_phase_example.cpp
+   :language: c++
+   :start-after: /*begin_parallel_phase_example*/
+   :end-before: /*end_parallel_phase_example*/
+
+In this example, ``task_arena`` is created with ``leave_policy::fast``. It means that
+worker threads are not expected to remain in ``task_arena`` once parallel work is completed.
+
+However, the workflow includes a sequence of parallel work (initializing and sorting data) interceded by serial work (prefix sum).
+To hint the start and end of parallel work, ``scoped_parallel_phase`` is used. This provides a hint to the scheduler
+that worker threads might need to remain in ``task_arena`` since there is more parallel work to come.
diff --git a/external/tbb/doc/main/reference/parallel_sort_ranges_extension.rst b/external/tbb/doc/main/reference/parallel_sort_ranges_extension.rst
index 52f2283a..cd8fb6ee 100644
--- a/external/tbb/doc/main/reference/parallel_sort_ranges_extension.rst
+++ b/external/tbb/doc/main/reference/parallel_sort_ranges_extension.rst
@@ -10,7 +10,7 @@ parallel_sort ranges interface extension
 Description
 ***********
 
-|full_name| implementation extends the `oneapi::tbb::parallel_sort specification <https://spec.oneapi.io/versions/latest/elements/oneTBB/source/algorithms/functions/parallel_sort_func.html>`_
+|full_name| implementation extends the `oneapi::tbb::parallel_sort specification <https://oneapi-spec.uxlfoundation.org/specifications/oneapi/latest/elements/onetbb/source/algorithms/functions/parallel_sort_func>`_
 with overloads that takes the container by forwarding reference.
 
 
@@ -56,17 +56,7 @@ Example
 
 This interface may be used for sorting rvalue or constant views:
 
-.. code:: cpp
-
-    #include <array>
-    #include <span> // requires C++20
-    #include <oneapi/tbb/parallel_sort.h>
-
-    std::span<int> get_span() {
-        static std::array<int, 3> arr = {3, 2, 1};
-        return std::span<int>(arr);
-    }
-
-    int main() {
-        tbb::parallel_sort(get_span());
-    }
+.. literalinclude:: ./examples/parallel_sort_ranges_extension_example.cpp
+    :language: c++
+    :start-after: /*begin_parallel_sort_ranges_extension_example*/
+    :end-before: /*end_parallel_sort_ranges_extension_example*/
diff --git a/external/tbb/doc/main/reference/reference.rst b/external/tbb/doc/main/reference/reference.rst
index 63b29ad7..2e5c967e 100644
--- a/external/tbb/doc/main/reference/reference.rst
+++ b/external/tbb/doc/main/reference/reference.rst
@@ -3,22 +3,23 @@
 |short_name| API Reference
 ==========================
 
-For oneTBB API Reference, refer to `oneAPI Specification <https://spec.oneapi.com/>`_. The current supported
+For oneTBB API Reference, refer to `oneAPI Specification <https://github.com/uxlfoundation/oneAPI-spec>`_. The current supported
 version of oneAPI Specification is 1.0.
 
 Specification extensions
 ************************
 
-|full_name| implements the `oneTBB specification <https://spec.oneapi.com/versions/latest/elements/oneTBB/source/nested-index.html>`_.
+|full_name| implements the `oneTBB specification <https://oneapi-spec.uxlfoundation.org/specifications/oneapi/latest/elements/onetbb/source/nested-index>`_.
 This document provides additional details or restrictions where necessary.
 It also describes features that are not included in the oneTBB specification.
 
 .. toctree::
     :titlesonly:
 
-    info_namespace
     parallel_for_each_semantics
     parallel_sort_ranges_extension
+    scalable_memory_pools/malloc_replacement_log
+    rvalue_reduce
 
 Preview features
 ****************
@@ -44,16 +45,11 @@ The key properties of a preview feature are:
     :titlesonly:
 
     type_specified_message_keys
-    blocking_terminate
     scalable_memory_pools
     helpers_for_expressing_graphs
     concurrent_lru_cache_cls
-    constraints_extensions
-    info_namespace_extensions
     task_group_extensions
-    task_arena_extensions 
-    this_task_arena_extensions
-    mutex_cls
-    rw_mutex_cls
-    heterogeneous_extensions_chmap
     custom_mutex_chmap
+    try_put_and_wait
+    parallel_phase_for_task_arena
+    blocked_nd_range_ctad
diff --git a/external/tbb/doc/main/reference/rvalue_reduce.rst b/external/tbb/doc/main/reference/rvalue_reduce.rst
new file mode 100644
index 00000000..311a3f5c
--- /dev/null
+++ b/external/tbb/doc/main/reference/rvalue_reduce.rst
@@ -0,0 +1,68 @@
+.. _rvalue_reduce:
+
+Parallel Reduction for rvalues
+==============================
+
+.. contents::
+    :local:
+    :depth: 1
+
+Description
+***********
+
+|full_name| implementation extends the `ParallelReduceFunc <https://oneapi-spec.uxlfoundation.org/specifications/oneapi/latest/elements/onetbb/source/named_requirements/algorithms/par_reduce_func>`_ and
+`ParallelReduceReduction <https://oneapi-spec.uxlfoundation.org/specifications/oneapi/latest/elements/onetbb/source/named_requirements/algorithms/par_reduce_reduction>`_
+to optimize operating with ``rvalues`` using functional form of ``tbb::parallel_reduce`` and ``tbb::parallel_deterministic_reduce`` algorithms.
+
+API
+***
+
+Header
+------
+
+.. code:: cpp
+
+    #include <oneapi/tbb/parallel_reduce.h>
+
+ParallelReduceFunc Requirements: Pseudo-Signature, Semantics
+------------------------------------------------------------
+
+.. cpp:function:: Value Func::operator()(const Range& range, Value&& x) const
+
+or
+
+.. cpp:function:: Value Func::operator()(const Range& range, const Value& x) const
+
+    Accumulates the result for a subrange, starting with initial value ``x``. The ``Range`` type must meet the
+    `Range requirements <https://oneapi-spec.uxlfoundation.org/specifications/oneapi/latest/elements/onetbb/source/named_requirements/algorithms/range>`_.
+    The ``Value`` type must be the same as a corresponding template parameter for the `parallel_reduce algorithm <https://oneapi-spec.uxlfoundation.org/specifications/oneapi/latest/elements/onetbb/source/algorithms/functions/parallel_reduce_func>`_.
+
+    If both ``rvalue`` and ``lvalue`` forms are provided, the ``rvalue`` is preferred.
+
+ParallelReduceReduction Requirements: Pseudo-Signature, Semantics
+-----------------------------------------------------------------
+
+.. cpp:function:: Value Reduction::operator()(Value&& x, Value&& y) const
+
+or
+
+.. cpp:function:: Value Reduction::operator()(const Value& x, const Value& y) const
+
+    Combines the ``x`` and ``y`` results. The ``Value`` type must be the same as a corresponding template parameter for the `parallel_reduce algorithm <https://oneapi-spec.uxlfoundation.org/specifications/oneapi/latest/elements/onetbb/source/algorithms/functions/parallel_reduce_func>`_.
+
+    If both ``rvalue`` and ``lvalue`` forms are provided, the ``rvalue`` is preferred.
+
+Example
+*******
+
+.. literalinclude:: ./examples/rvalue_reduce.cpp
+    :language: c++
+    :start-after: /*begin_rvalue_reduce_example*/
+    :end-before: /*end_rvalue_reduce_example*/
+
+.. rubric:: See also
+
+* `oneapi::tbb::parallel_reduce specification <https://oneapi-spec.uxlfoundation.org/specifications/oneapi/latest/elements/onetbb/source/algorithms/functions/parallel_reduce_func>`_
+* `oneapi::tbb::parallel_deterministic_reduce specification <https://oneapi-spec.uxlfoundation.org/specifications/oneapi/latest/elements/onetbb/source/algorithms/functions/parallel_deterministic_reduce_func>`_
+* `ParallelReduceFunc specification <https://oneapi-spec.uxlfoundation.org/specifications/oneapi/latest/elements/onetbb/source/named_requirements/algorithms/par_reduce_func>`_
+* `ParallelReduceReduction specification <https://oneapi-spec.uxlfoundation.org/specifications/oneapi/latest/elements/onetbb/source/named_requirements/algorithms/par_reduce_reduction>`_
diff --git a/external/tbb/doc/main/reference/scalable_memory_pools.rst b/external/tbb/doc/main/reference/scalable_memory_pools.rst
index 6cf81139..d04cd54a 100644
--- a/external/tbb/doc/main/reference/scalable_memory_pools.rst
+++ b/external/tbb/doc/main/reference/scalable_memory_pools.rst
@@ -41,3 +41,4 @@ Here, ``P`` represents an instance of the memory pool class.
     scalable_memory_pools/memory_pool_cls
     scalable_memory_pools/fixed_pool_cls
     scalable_memory_pools/memory_pool_allocator_cls
+    
diff --git a/external/tbb/doc/main/reference/scalable_memory_pools/fixed_pool_cls.rst b/external/tbb/doc/main/reference/scalable_memory_pools/fixed_pool_cls.rst
index 28384257..df7b24d7 100644
--- a/external/tbb/doc/main/reference/scalable_memory_pools/fixed_pool_cls.rst
+++ b/external/tbb/doc/main/reference/scalable_memory_pools/fixed_pool_cls.rst
@@ -64,13 +64,7 @@ Examples
 
 The code below provides a simple example of allocation from a fixed pool.
 
-.. code:: cpp
-
-    #define TBB_PREVIEW_MEMORY_POOL 1
-    #include "oneapi/tbb/memory_pool.h"
-    ...
-    char buf[1024*1024];
-    oneapi::tbb::fixed_pool my_pool(buf, 1024*1024);
-    void* my_ptr = my_pool.malloc(10);
-    my_pool.free(my_ptr);}
-
+.. literalinclude:: ../examples/fixed_pool_example.cpp
+    :language: c++
+    :start-after: /*begin_fixed_pool_example*/
+    :end-before: /*end_fixed_pool_example*/
diff --git a/external/tbb/doc/main/reference/scalable_memory_pools/malloc_replacement_log.rst b/external/tbb/doc/main/reference/scalable_memory_pools/malloc_replacement_log.rst
new file mode 100644
index 00000000..4c14503d
--- /dev/null
+++ b/external/tbb/doc/main/reference/scalable_memory_pools/malloc_replacement_log.rst
@@ -0,0 +1,69 @@
+.. _malloc_replacement_log:
+
+TBB_malloc_replacement_log Function
+===================================
+
+.. note:: This function is for Windows* OS only.
+
+Summary
+*******
+
+Provides information about the status of dynamic memory allocation replacement.
+
+Syntax
+*******
+
+::
+
+   extern "C" int TBB_malloc_replacement_log(char *** log_ptr);
+
+
+Header
+******
+
+::
+
+   #include "oneapi/tbb/tbbmalloc_proxy.h"
+
+
+Description
+***********
+
+Dynamic replacement of memory allocation functions on Windows* OS uses in-memory binary instrumentation techniques.
+To make sure that such instrumentation is safe, oneTBB first searches for a subset of replaced functions in the Visual C++* runtime DLLs
+and checks if each one has a known bytecode pattern. If any required function is not found or its bytecode pattern is unknown, the replacement is skipped,
+and the program continues to use the standard memory allocation functions.
+
+The ``TBB_malloc_replacement_log`` function allows the program to check if the dynamic memory replacement happens and to get a log of the performed checks.
+
+**Returns:**
+
+* 0, if all necessary functions are successfully found and the replacement takes place.
+* 1, otherwise.
+
+The ``log_ptr`` parameter must be an address of a char** variable or be ``NULL``. If it is not ``NULL``, the function writes there the address of an array of
+NULL-terminated strings containing detailed information about the searched functions in the following format:
+
+::
+
+   search_status: function_name (dll_name), byte pattern: <bytecodes>
+
+
+For more information about the replacement of dynamic memory allocation functions, see :ref:`Windows_C_Dynamic_Memory_Interface_Replacement`.
+
+
+Example
+*******
+
+.. literalinclude:: ../examples/malloc_replacement_log_example.cpp
+    :language: c++
+    :start-after: /*begin_malloc_replacement_log_example*/
+    :end-before: /*end_malloc_replacement_log_example*/
+
+Example output:
+
+::
+
+   tbbmalloc_proxy cannot replace memory allocation routines
+   Success: free (ucrtbase.dll), byte pattern: <C7442410000000008B4424>
+   Fail: _msize (ucrtbase.dll), byte pattern: <E90B000000CCCCCCCCCCCC>
diff --git a/external/tbb/doc/main/reference/scalable_memory_pools/memory_pool_allocator_cls.rst b/external/tbb/doc/main/reference/scalable_memory_pools/memory_pool_allocator_cls.rst
index d275c02f..0e957b59 100644
--- a/external/tbb/doc/main/reference/scalable_memory_pools/memory_pool_allocator_cls.rst
+++ b/external/tbb/doc/main/reference/scalable_memory_pools/memory_pool_allocator_cls.rst
@@ -107,11 +107,7 @@ Examples
 
 The code below provides a simple example of container construction with the use of a memory pool.
 
-.. code:: cpp
-
-    #define TBB_PREVIEW_MEMORY_POOL 1
-    #include "oneapi/tbb/memory_pool.h"
-    ...
-    typedef oneapi::tbb::memory_pool_allocator<int>
-    pool_allocator_t;
-    std::list<int, pool_allocator_t> my_list(pool_allocator_t( my_pool ));
+.. literalinclude:: ../examples/memory_pool_allocator_example.cpp
+    :language: c++
+    :start-after: /*begin_memory_pool_allocator_example*/
+    :end-before: /*end_memory_pool_allocator_example*/
diff --git a/external/tbb/doc/main/reference/scalable_memory_pools/memory_pool_cls.rst b/external/tbb/doc/main/reference/scalable_memory_pools/memory_pool_cls.rst
index fefade1c..7e6afbcf 100644
--- a/external/tbb/doc/main/reference/scalable_memory_pools/memory_pool_cls.rst
+++ b/external/tbb/doc/main/reference/scalable_memory_pools/memory_pool_cls.rst
@@ -70,11 +70,7 @@ Examples
 
 The code below provides a simple example of allocation from an extensible memory pool.
 
-.. code:: cpp
-
-    #define TBB_PREVIEW_MEMORY_POOL 1
-    #include "oneapi/tbb/memory_pool.h"
-    ...
-    oneapi::tbb::memory_pool<std::allocator<char> > my_pool;
-    void* my_ptr = my_pool.malloc(10);
-    my_pool.free(my_ptr);
+.. literalinclude:: ../examples/memory_pool_example.cpp
+    :language: c++
+    :start-after: /*begin_memory_pool_example*/
+    :end-before: /*end_memory_pool_example*/
diff --git a/external/tbb/doc/main/reference/task_arena_extensions.rst b/external/tbb/doc/main/reference/task_arena_extensions.rst
deleted file mode 100644
index 8cde3b29..00000000
--- a/external/tbb/doc/main/reference/task_arena_extensions.rst
+++ /dev/null
@@ -1,61 +0,0 @@
-.. _task_arena_extensions:
-
-task_arena extensions
-=====================
-
-.. note::
-    To enable these extensions, set the ``TBB_PREVIEW_TASK_GROUP_EXTENSIONS`` macro to 1.
-
-.. contents::
-    :local:
-    :depth: 1
-
-Description
-***********
-
-|full_name| implementation extends the `tbb::task_arena specification <https://spec.oneapi.com/versions/latest/elements/oneTBB/source/task_scheduler/task_arena/task_arena_cls.html>`_ 
-with an overload of ``enqueue`` method accepting ``task_handle``. 
-   
-
-API
-***
-
-Header
-------
-
-.. code:: cpp
-
-    #include <oneapi/tbb/task_arena.h>
-
-Synopsis
---------
-
-.. code:: cpp
-
-    namespace oneapi {
-        namespace tbb {
-   
-           class task_arena {
-           public:
-               void enqueue(task_handle&& h);        
-           }; 
-
-        } // namespace tbb
-    } // namespace oneapi
-
-Member Functions
-----------------
-
-.. cpp:function:: void enqueue(task_handle&& h)   
-     
-Enqueues a task owned by ``h`` into the ``task_arena`` for procession.
- 
-Behavior of this function is identical to generic version (``template<typename F> void task_arena::enqueue(F&& f)``) except parameter type. 
-
-.. note:: 
-   ``h`` should not be empty to avoid undefined behavior.
-             
-.. rubric:: See also
-
-* `oneapi::tbb::task_arena specification <https://spec.oneapi.com/versions/latest/elements/oneTBB/source/task_scheduler/task_arena/task_arena_cls.html>`_
-* :ref:`task_handle` 
diff --git a/external/tbb/doc/main/reference/task_group_extensions.rst b/external/tbb/doc/main/reference/task_group_extensions.rst
index ea4a7437..47795f95 100644
--- a/external/tbb/doc/main/reference/task_group_extensions.rst
+++ b/external/tbb/doc/main/reference/task_group_extensions.rst
@@ -13,11 +13,7 @@ task_group extensions
 Description
 ***********
 
-|full_name| implementation extends the `tbb::task_group specification <https://spec.oneapi.com/versions/latest/elements/oneTBB/source/task_scheduler/task_group/task_group_cls.html>`_ with the following members:
-
-  - constructor that takes a custom ``tbb::task_group_context`` object as an argument
-  - methods to create and run deferred tasks with ``task_handle`` 
-  - requirements for a user-provided function object
+|full_name| implementation extends the `tbb::task_group specification <https://oneapi-spec.uxlfoundation.org/specifications/oneapi/latest/elements/onetbb/source/task_scheduler/task_group/task_group_cls>`_ with the requirements for a user-provided function object.
    
 
 API
@@ -40,15 +36,15 @@ Synopsis
    
            class task_group {
            public:
-               task_group(task_group_context& context);
-               
+
+               //only the requirements for the return type of function F are changed              
                template<typename F>
                task_handle defer(F&& f);
                    
-               void run(task_handle&& h);
-               
-               task_group_status run_and_wait(task_handle&&);
-
+               //only the requirements for the return type of function F are changed
+               template<typename F>
+               task_group_status run_and_wait(const F& f);
+    
                //only the requirements for the return type of function F are changed              
                template<typename F>
                void run(F&& f);
@@ -62,43 +58,19 @@ Synopsis
 Member Functions
 ----------------
 
-.. cpp:function:: task_group(task_group_context& context)
-
-Constructs an empty ``task_group``, which tasks are associated with the ``context``.
-
-
 .. cpp:function:: template<typename F> task_handle  defer(F&& f)
 
-Creates a deferred task to compute ``f()`` and returns ``task_handle`` pointing to it.
-
-The task is not scheduled for execution until explicitly requested. For example, with the ``task_group::run`` method.
-However, the task is still added into the ``task_group``, thus the ``task_group::wait`` method waits until the ``task_handle`` is either scheduled or destroyed.
-
-The ``F`` type must meet the `Function Objects` requirements described in the [function.objects] section of the ISO C++ Standard.
-
 As an optimization hint, ``F`` might return a ``task_handle``, which task object can be executed next.
 
 .. note::
-   The ``task_handle`` returned by the function must be created with ``*this`` ``task_group``. It means, with the one for which run method is called, otherwise it is an undefined behavior. 
-
-**Returns:** ``task_handle`` object pointing to task to compute ``f()``.
-
-
-.. cpp:function:: void run(task_handle&& h)
+   The ``task_handle`` returned by the function must be created using ``*this`` ``task_group``. That is, the one for which the run method is called, otherwise it is undefined behavior. 
 
-Schedules the task object pointed by the ``h`` for execution.
+.. cpp:function:: template<typename F> task_group_status run_and_wait(const F& f)
 
-.. caution:: If ``h`` is empty or ``*this`` is not the same ``task_group`` that ``h`` is created with, the behavior is undefined.
-
-
-.. cpp:function:: task_group_status run_and_wait(task_handle&& h)
-
-Equivalent to ``{run(std::move(h)); return wait();}``.
- 
-**Returns**: The status of ``task_group``.
+As an optimization hint, ``F`` might return a ``task_handle``, which task object can be executed next.
 
-.. caution::
-   If ``h`` is empty or ``*this`` is not the same ``task_group`` that ``h`` is created with, the behavior is undefined.
+.. note::
+   The ``task_handle`` returned by the function must be created using ``*this`` ``task_group``. That is, the one for which the run method is called, otherwise it is undefined behavior. 
 
  
 .. cpp:function:: template<typename F> void  run(F&& f)
@@ -111,7 +83,7 @@ As an optimization hint, ``F`` might return a ``task_handle``, which task object
                
 .. rubric:: See also
 
-* `oneapi::tbb::task_group specification <https://spec.oneapi.com/versions/latest/elements/oneTBB/source/task_scheduler/task_group/task_group_cls.html>`_
-* `oneapi::tbb::task_group_context specification <https://spec.oneapi.com/versions/latest/elements/oneTBB/source/task_scheduler/scheduling_controls/task_group_context_cls.html>`_
-* `oneapi::tbb::task_group_status specification <https://spec.oneapi.com/versions/latest/elements/oneTBB/source/task_scheduler/task_group/task_group_status_enum.html>`_ 
-* :doc:`oneapi::tbb::task_handle class <task_group_extensions/task_handle>`
+* `oneapi::tbb::task_group specification <https://oneapi-spec.uxlfoundation.org/specifications/oneapi/latest/elements/onetbb/source/task_scheduler/task_group/task_group_cls>`_
+* `oneapi::tbb::task_group_context specification <https://oneapi-spec.uxlfoundation.org/specifications/oneapi/latest/elements/onetbb/source/task_scheduler/scheduling_controls/task_group_context_cls>`_
+* `oneapi::tbb::task_group_status specification <https://oneapi-spec.uxlfoundation.org/specifications/oneapi/latest/elements/onetbb/source/task_scheduler/task_group/task_group_status_enum>`_ 
+* `oneapi::tbb::task_handle class <https://oneapi-spec.uxlfoundation.org/specifications/oneapi/latest/elements/onetbb/source/task_scheduler/task_group/task_handle>`_
diff --git a/external/tbb/doc/main/reference/task_group_extensions/task_handle.rst b/external/tbb/doc/main/reference/task_group_extensions/task_handle.rst
deleted file mode 100644
index b9b576d4..00000000
--- a/external/tbb/doc/main/reference/task_group_extensions/task_handle.rst
+++ /dev/null
@@ -1,101 +0,0 @@
-.. _task_handle:
-
-task_handle
-===========
-
-.. note::    To enable these extensions, set the ``TBB_PREVIEW_TASK_GROUP_EXTENSIONS`` macro to 1.
-
-
-.. contents::
-    :local:
-    :depth: 1
-
-Description
-***********
-
-This class owns a deferred task object. 
-
-API
-***
-
-Header
-------
-
-.. code:: cpp
-
-    #include <oneapi/tbb/task_group.h>
-
-Synopsis
---------
-
-.. code:: cpp
-
-    namespace oneapi {
-        namespace tbb {
-      
-            class task_handle {
-            public:
-                task_handle();
-                task_handle(task_handle&& src);
-                
-                ~task_handle();
-                
-                task_handle& operator=(task_handle&& src);
-            
-                explicit operator bool() const noexcept;
-            }; 
-            
-            bool operator==(task_handle const& h, std::nullptr_t) noexcept;
-            bool operator==(std::nullptr_t, task_handle const& h) noexcept;
-            
-            bool operator!=(task_handle const& h, std::nullptr_t) noexcept;
-            bool operator!=(std::nullptr_t, task_handle const& h) noexcept;
-                      
-        } // namespace tbb
-    } // namespace oneapi
-
-Member Functions
-----------------
-
-.. cpp:function:: task_handle()
-
-Creates an empty ``task_handle`` object.
-
-.. cpp:function:: task_handle(task_handle&& src)
-
-Constructs ``task_handle`` object with the content of ``src`` using move semantics. ``src`` is left in an empty state.
-
-.. cpp:function:: ~task_handle()
-
-Destroys the ``task_handle`` object and associated task if it exists. 
-
-.. cpp:function:: task_handle& operator=(task_handle&& src)
-
-Replaces the content of ``task_handle`` object with the content of ``src`` using move semantics. ``src`` is left in an empty state.
-The previously associated task object, if any, is destroyed before the assignment. 
-
-**Returns:** Reference to ``*this``.
-
-.. cpp:function:: explicit operator bool() const noexcept
-
-Checks if ``*this`` has an associated task object.
-
-**Returns:** ``true`` if ``*this`` is not empty, ``false`` otherwise.
-
-Non-Member Functions
---------------------
-
-.. code:: cpp
-
-    bool operator==(task_handle const& h, std::nullptr_t) noexcept
-    bool operator==(std::nullptr_t, task_handle const& h) noexcept
-
-**Returns**: ``true`` if ``h`` is empty, ``false`` otherwise.
-
-.. code:: cpp
-
-    bool operator!=(task_handle const& h, std::nullptr_t) noexcept
-    bool operator!=(std::nullptr_t, task_handle const& h) noexcept
-
-**Returns**: ``true`` if ``h`` is not empty, ``false`` otherwise.
-   
diff --git a/external/tbb/doc/main/reference/this_task_arena_extensions.rst b/external/tbb/doc/main/reference/this_task_arena_extensions.rst
deleted file mode 100644
index ddd0c314..00000000
--- a/external/tbb/doc/main/reference/this_task_arena_extensions.rst
+++ /dev/null
@@ -1,71 +0,0 @@
-.. _this_task_arena_extensions:
-
-this_task_arena extensions
-==========================
-
-.. note::
-    To enable these extensions, set the ``TBB_PREVIEW_TASK_GROUP_EXTENSIONS`` macro to 1.
-
-.. contents::
-    :local:
-    :depth: 1
-
-Description
-***********
-
-|full_name| implementation extends the `tbb::this_task_arena specification <https://spec.oneapi.com/versions/latest/elements/oneTBB/source/task_scheduler/task_arena/this_task_arena_ns.html>`_
-with an overloaded ``enqueue`` function. 
-   
-
-API
-***
-
-Header
-------
-
-.. code:: cpp
-
-    #include <oneapi/tbb/task_arena.h>
-
-Synopsis
---------
-
-.. code:: cpp
-
-    namespace oneapi {
-        namespace tbb {
-            namespace this_task_arena {
-                void enqueue(task_handle&& h);
-      
-                template<typename F>
-                void enqueue(F&& f) ;
-            } // namespace this_task_arena
-        } // namespace tbb
-    } // namespace oneapi
-
-Member Functions
-----------------
-
-   
-.. cpp:function:: template<typename F> void enqueue(F&& f)
-  
-Enqueues a task into the ``task_arena`` currently used by the calling thread to process the specified functor, then immediately returns.
-The ``F`` type must meet the `Function Objects` requirements described in the [function.objects] section of the ISO C++ Standard.
-
-Behavior of this function is identical to ``template<typename F> void task_arena::enqueue(F&& f)`` applied to ``task_arena`` object constructed with ``attach`` parameter.     
-
-.. cpp:function:: void enqueue(task_handle&& h)   
-     
-Enqueues a task owned by ``h`` into the ``task_arena`` that is currently used by the calling thread.
-
-Behavior of this function is identical to generic version (``template<typename F> void enqueue(F&& f)``) except the parameter type. 
-
-.. note:: 
-   ``h`` should not be empty to avoid undefined behavior.
- 
-        
-.. rubric:: See also:
-
-* `oneapi::tbb::this_task_arena specification <https://spec.oneapi.com/versions/latest/elements/oneTBB/source/task_scheduler/task_arena/this_task_arena_ns.html>`_
-* `oneapi::tbb::task_arena specification <https://spec.oneapi.com/versions/latest/elements/oneTBB/source/task_scheduler/task_arena/task_arena_cls.html>`_
-* :ref:`task_handle` 
diff --git a/external/tbb/doc/main/reference/try_put_and_wait.rst b/external/tbb/doc/main/reference/try_put_and_wait.rst
new file mode 100644
index 00000000..7efbb659
--- /dev/null
+++ b/external/tbb/doc/main/reference/try_put_and_wait.rst
@@ -0,0 +1,286 @@
+.. _try_put_and_wait:
+
+Waiting for Single Messages in Flow Graph
+=========================================
+
+.. contents::
+    :local:
+    :depth: 1
+
+Description
+***********
+
+This feature adds a new ``try_put_and_wait`` interface to the receiving nodes in the Flow Graph.
+This function puts a message as an input into a Flow Graph and waits until all work related to
+that message is complete.
+``try_put_and_wait`` may reduce latency compared to calling ``graph::wait_for_all`` since
+``graph::wait_for_all`` waits for all work, including work that is unrelated to the input message, to complete.
+
+``node.try_put_and_wait(msg)`` performs ``node.try_put(msg)`` on the node and waits until the work on ``msg`` is completed.
+Therefore, the following conditions are true:
+
+* Any task initiated by any node in the Flow Graph that involves working with ``msg`` or any other intermediate result
+  computed from ``msg`` is completed.
+* No intermediate results computed from ``msg`` remain in any buffers in the graph.
+
+.. caution::
+
+    To prevent ``try_put_and_wait`` calls from infinite waiting, avoid using buffering nodes at the end of the Flow Graph since the final result
+    will not be automatically consumed by the Flow Graph.
+
+.. caution::
+
+    The ``multifunction_node`` and ``async_node`` classes are not currently supported by this feature. Including one of these nodes in the
+    Flow Graph may cause ``try_put_and_wait`` to exit early, even if the computations on the initial input message are
+    still in progress.
+
+API
+***
+
+Header
+------
+
+.. code:: cpp
+
+    #define TBB_PREVIEW_FLOW_GRAPH_FEATURES // macro option 1
+    #define TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT // macro option 2
+    #include <oneapi/tbb/flow_graph.h>
+
+Synopsis
+--------
+
+.. code:: cpp
+
+    namespace oneapi {
+        namespace tbb {
+            template <typename Output, typename Policy = /*default-policy*/>
+            class continue_node {
+            public:
+                bool try_put_and_wait(const continue_msg& input);
+            }; // class continue_node
+
+            template <typename Input, typename Output = continue_msg, typename Policy = /*default-policy*/>
+            class function_node {
+            public:
+                bool try_put_and_wait(const Input& input);
+            }; // class function_node
+
+            template <typename T>
+            class overwrite_node {
+            public:
+                bool try_put_and_wait(const T& input);
+            }; // class overwrite_node
+
+            template <typename T>
+            class write_once_node {
+            public:
+                bool try_put_and_wait(const T& input);
+            }; // class write_once_node
+
+            template <typename T>
+            class buffer_node {
+            public:
+                bool try_put_and_wait(const T& input);
+            }; // class buffer_node
+
+            template <typename T>
+            class queue_node {
+            public:
+                bool try_put_and_wait(const T& input);
+            }; // class queue_node
+
+            template <typename T, typename Compare = std::less<T>>
+            class priority_queue_node {
+            public:
+                bool try_put_and_wait(const T& input);
+            }; // class priority_queue_node
+
+            template <typename T>
+            class sequencer_node {
+            public:
+                bool try_put_and_wait(const T& input);
+            }; // class sequencer_node
+
+            template <typename T, typename DecrementType = continue_msg>
+            class limiter_node {
+            public:
+                bool try_put_and_wait(const T& input);
+            }; // class limiter_node
+
+            template <typename T>
+            class broadcast_node {
+            public:
+                bool try_put_and_wait(const T& input);
+            }; // class broadcast_node
+
+            template <typename TupleType>
+            class split_node {
+            public:
+                bool try_put_and_wait(const TupleType& input);
+            }; // class split_node
+        } // namespace tbb
+    } // namespace oneapi
+
+Member Functions
+----------------
+
+.. code:: cpp
+
+    template <typename Output, typename Policy>
+    bool continue_node<Output, Policy>::try_put_and_wait(const continue_msg& input)
+
+**Effects**: Increments the count of input signals received. If the incremented count is equal to the number
+of known predecessors, performs the ``body`` function object execution.
+
+Waits for the completion of the ``input`` in the Flow Graph, meaning all tasks created by each node and
+related to ``input`` are executed, and no related objects remain in any buffer within the graph.
+
+**Returns**: ``true``.
+
+.. code:: cpp
+
+    template <typename Input, typename Output, typename Policy>
+    bool function_node<Input, Output, Policy>::try_put_and_wait(const Input& input)
+
+**Effects**: If the concurrency limit allows, executes the user-provided body on the incoming message ``input``.
+Otherwise, depending on the ``Policy`` of the node, either queues the incoming message ``input`` or rejects it.
+
+Waits for the completion of the ``input`` in the Flow Graph, meaning all tasks created by each node and
+related to ``input`` are executed, and no related objects remain in any buffer within the graph.
+
+**Returns**: ``true`` if the input is accepted, ``false`` otherwise.
+
+.. code:: cpp
+
+    template <typename T>
+    bool overwrite_node<T>::try_put_and_wait(const T& input)
+
+**Effects**: Stores ``input`` in the internal single-item buffer and broadcasts it to all successors.
+
+Waits for the completion of the ``input`` in the Flow Graph, meaning all tasks created by each node and
+related to ``input`` are executed, and no related objects remain in any buffer within the graph.
+
+**Returns**: ``true``.
+
+.. caution::
+
+    Since the input element is not retrieved from ``overwrite_node`` once accepted by the successor,
+    retrieve it by explicitly calling the ``clear()`` method or by overwriting with another element to prevent
+    ``try_put_and_wait`` from indefinite waiting.
+
+.. code:: cpp
+
+    template <typename T>
+    bool write_once_node<T>::try_put_and_wait(const T& input)
+
+**Effects**: Stores ``input`` in the internal single-item buffer if it does not contain a valid value already.
+If a new value is set, the node broadcasts it to all successors.
+
+Waits for the completion of the ``input`` in the Flow Graph, meaning all tasks created by each node and
+related to ``input`` are executed, and no related objects remain in any buffer within the graph.
+
+**Returns**: ``true`` for the first time after construction or a call to ``clear()``.
+
+.. caution::
+
+    Since the input element is not retrieved from the ``write_once_node`` once accepted by the successor,
+    retrieve it by explicitly calling the ``clear()`` method to prevent ``try_put_and_wait`` from indefinite waiting.
+
+.. code:: cpp
+
+    template <typename T>
+    bool buffer_node<T>::try_put_and_wait(const T& input)
+
+**Effects**: Adds ``input`` to the set of items managed by the node and tries forwarding it to a successor.
+
+Waits for the completion of the ``input`` in the Flow Graph, meaning all tasks created by each node and
+related to ``input`` are executed, and no related objects remain in any buffer within the graph.
+
+**Returns**: ``true``.
+
+.. code:: cpp
+
+    template <typename T>
+    bool queue_node<T>::try_put_and_wait(const T& input)
+
+**Effects**: Adds ``input`` to the set of items managed by the node and tries forwarding the least recently added item
+to a successor.
+
+Waits for the completion of the ``input`` in the Flow Graph, meaning all tasks created by each node and
+related to ``input`` are executed, and no related objects remain in any buffer within the graph.
+
+**Returns**: ``true``.
+
+.. code:: cpp
+
+    template <typename T, typename Compare>
+    bool priority_queue_node<T>::try_put_and_wait(const T& input)
+
+**Effects**: Adds ``input`` to the ``priority_queue_node`` and attempts to forward the item with the highest
+priority among all items added to the node but not yet forwarded to the successors.
+
+Waits for the completion of the ``input`` in the Flow Graph, meaning all tasks created by each node and
+related to ``input`` are executed, and no related objects remain in any buffer within the graph.
+
+**Returns**: ``true``.
+
+.. code:: cpp
+
+    template <typename T>
+    bool sequencer_node<T>::try_put_and_wait(const T& input)
+
+**Effects**: Adds ``input`` to the ``sequencer_node`` and tries forwarding the next item in sequence to a successor.
+
+Waits for the completion of the ``input`` in the Flow Graph, meaning all tasks created by each node and
+related to ``input`` are executed, and no related objects remain in any buffer within the graph.
+
+**Returns**: ``true``.
+
+.. code:: cpp
+
+    template <typename T, typename DecrementType>
+    bool limiter_node<T, DecrementType>::try_put_and_wait(const T& input)
+
+**Effects**: If the broadcast count is below the threshold, broadcasts ``input`` to all successors.
+
+Waits for the completion of the ``input`` in the Flow Graph, meaning all tasks created by each node and
+related to ``input`` are executed, and no related objects remain in any buffer within the graph.
+
+**Returns**: ``true`` if ``input`` is broadcasted; ``false`` otherwise.
+
+.. code:: cpp
+
+    template <typename T>
+    bool broadcast_node<T>::try_put_and_wait(const T& input)
+
+**Effects**: Broadcasts ``input`` to all successors.
+
+Waits for the completion of the ``input`` in the Flow Graph, meaning all tasks created by each node and
+related to ``input`` are executed, and no related objects remain in any buffer within the graph.
+
+**Returns**: ``true`` even if the node cannot successfully forward the message to any of its successors.
+
+.. code:: cpp
+
+    template <typename TupleType>
+    bool split_node<TupleType>::try_put_and_wait(const TupleType& input);
+
+**Effects**: Broadcasts each element in the incoming tuple to the nodes connected to the ``split_node`` output ports.
+The element at index ``i`` of ``input`` is broadcasted through the output port number ``i``.
+
+Waits for the completion of the ``input`` in the Flow Graph, meaning all tasks created by each node and
+related to ``input`` are executed, and no related objects remain in any buffer within the graph.
+
+**Returns**: ``true``.
+
+Example
+*******
+
+.. literalinclude:: ./examples/try_put_and_wait_example.cpp
+    :language: c++
+    :start-after: /*begin_try_put_and_wait_example*/
+    :end-before: /*end_try_put_and_wait_example*/
+
+Each iteration of ``parallel_for`` submits an input into the Flow Graph. After returning from ``try_put_and_wait(input)``, it is
+guaranteed that all of the work related to the completion of ``input`` is done by all of the nodes in the graph. Tasks related to inputs
+submitted by other calls are not guaranteed to be completed.
diff --git a/external/tbb/doc/main/reference/type_specified_message_keys.rst b/external/tbb/doc/main/reference/type_specified_message_keys.rst
index 3b1dbc56..a50cd7f4 100644
--- a/external/tbb/doc/main/reference/type_specified_message_keys.rst
+++ b/external/tbb/doc/main/reference/type_specified_message_keys.rst
@@ -66,4 +66,4 @@ lookup and used in place of the default implementation.
 See Also
 ********
 
-`join_node Specification <https://spec.oneapi.com/versions/latest/elements/oneTBB/source/flow_graph/join_node_cls.html>`_
+`join_node Specification <https://oneapi-spec.uxlfoundation.org/specifications/oneapi/latest/elements/onetbb/source/flow_graph/join_node_cls>`_
diff --git a/external/tbb/doc/main/tbb_userguide/Advanced_Topic_Other_Kinds_of_Iteration_Spaces.rst b/external/tbb/doc/main/tbb_userguide/Advanced_Topic_Other_Kinds_of_Iteration_Spaces.rst
index e5d572c3..056ff4a1 100644
--- a/external/tbb/doc/main/tbb_userguide/Advanced_Topic_Other_Kinds_of_Iteration_Spaces.rst
+++ b/external/tbb/doc/main/tbb_userguide/Advanced_Topic_Other_Kinds_of_Iteration_Spaces.rst
@@ -4,15 +4,13 @@ Advanced Topic: Other Kinds of Iteration Spaces
 ===============================================
 
 
-The examples so far have used the class ``blocked_range<T>`` to specify
-ranges. This class is useful in many situations, but it does not fit
-every situation. You can use |full_name|
-to define your own iteration space objects. The object must specify how
-it can be split into subspaces by providing a basic splitting
-constructor, an optional proportional splitting constructor (accompanied
-with a trait value that enables its usage), and two predicate methods.
-If your class is called ``R``, the methods and constructors should be as
-follows:
+The examples so far have used the class ``blocked_range<T>`` to specify ranges.
+This class is useful in many situations, but it does not fit every situation.
+You can use |full_name| to define your own iteration space objects. The object
+must specify how it can be split into subspaces by providing a basic splitting
+constructor, an optional proportional splitting constructor, and two predicate
+methods. If your class is called ``R``, the methods and constructors should be
+as follows:
 
 
 ::
@@ -25,10 +23,8 @@ follows:
        bool is_divisible() const;
        // Splits r into subranges r and *this
        R( R& r, split );
-       // Splits r into subranges r and *this in proportion p
+       // (optional) Splits r into subranges r and *this in proportion p
        R( R& r, proportional_split p );
-       // Allows usage of proportional splitting constructor
-       static const bool is_splittable_in_proportion = true;
        ...
    };
        
@@ -60,9 +56,7 @@ constructor is optional and takes the second argument of type
 that return the values of the proportion. These values should be used to
 split ``r`` accordingly, so that the updated ``r`` corresponds to the
 left part of the proportion, and the constructed object corresponds to
-the right part. The proportional splitting constructor will be used only
-if the static constant ``is_splittable_in_proportion`` is defined in the
-class and assigned the value of ``true``.
+the right part.
 
 
 Both splitting constructors should guarantee that the updated ``r`` part
@@ -78,4 +72,42 @@ along its longest axis. When used with ``parallel_for``, it causes the
 loop to be "recursively blocked" in a way that improves cache usage.
 This nice cache behavior means that using ``parallel_for`` over a
 ``blocked_range2d<T>`` can make a loop run faster than the sequential
-equivalent, even on a single processor.
+equivalent, even on a single processor. 
+
+The ``blocked_range2d`` allows you to use different value types for
+its first dimension, *rows*, and the second one, *columns*.
+That means you can combine indexes, pointers, and iterators into a joint
+iteration space. Use the methods ``rows()`` and ``cols()`` to obtain
+``blocked_range`` objects that represent the respective dimensions.
+
+The ``blocked_range3d`` class template extends this approach to 3D by adding
+``pages()`` as the first dimension, followed by ``rows()`` and ``cols()``.
+
+The ``blocked_nd_range<T,N>`` class template represents a blocked iteration
+space of any dimensionality. Unlike the previously described 2D and 3D ranges,
+``blocked_nd_range`` uses the same value type for all its axes, and its
+constructor requires you to pass N instances of ``blocked_range<T>`` instead of
+individual boundary values. The change in the naming pattern reflects these
+differences.
+
+
+Example of a Multidimensional Iteration Space
+------------------------------------------------
+
+The example demonstrates calculation of a 3-dimensional filter over the pack
+of feature maps.
+
+The ``convolution3d`` function iterates over the output cells, assigning to
+each cell the result of the ``kernel3d`` function that combines the values
+from a range in the feature maps.
+
+To run the computation in parallel, ``tbb::parallel_for`` is called with
+``tbb::blocked_nd_range<int,3>`` as an argument. The body function processes
+the received 3D subrange in nested loops, using the method ``dim`` to get
+the loop boundaries for each dimension.
+
+
+.. literalinclude:: ./examples/blocked_nd_range_example.cpp
+   :language: c++
+   :start-after: /*begin_blocked_nd_range_example*/
+   :end-before: /*end_blocked_nd_range_example*/
\ No newline at end of file
diff --git a/external/tbb/doc/main/tbb_userguide/Bandwidth_and_Cache_Affinity.rst b/external/tbb/doc/main/tbb_userguide/Bandwidth_and_Cache_Affinity_os.rst
similarity index 93%
rename from external/tbb/doc/main/tbb_userguide/Bandwidth_and_Cache_Affinity.rst
rename to external/tbb/doc/main/tbb_userguide/Bandwidth_and_Cache_Affinity_os.rst
index 60e6d690..274b220a 100644
--- a/external/tbb/doc/main/tbb_userguide/Bandwidth_and_Cache_Affinity.rst
+++ b/external/tbb/doc/main/tbb_userguide/Bandwidth_and_Cache_Affinity_os.rst
@@ -96,12 +96,6 @@ of computations to memory accesses.
    |image1|
 
 
-.. admonition:: Product and Performance Information 
-
-   Performance varies by use, configuration and other factors. Learn more at `www.Intel.com/PerformanceIndex <https://www.intel.com/PerformanceIndex>`_.
-   Notice revision #20201201
-
-
 
 
 .. |image0| image:: Images/image007.jpg
diff --git a/external/tbb/doc/main/tbb_userguide/Constraints.rst b/external/tbb/doc/main/tbb_userguide/Constraints.rst
index d37ce120..1928fe8e 100644
--- a/external/tbb/doc/main/tbb_userguide/Constraints.rst
+++ b/external/tbb/doc/main/tbb_userguide/Constraints.rst
@@ -4,7 +4,7 @@ Constrained APIs
 ================
 
 Starting from C++20, most of |full_name| APIs are constrained to
-enforce `named requirements <https://spec.oneapi.com/versions/latest/elements/oneTBB/source/named_requirements.html>`_ on
+enforce `named requirements <https://oneapi-spec.uxlfoundation.org/specifications/oneapi/latest/elements/onetbb/source/named_requirements>`_ on
 template arguments types.
 
 The violations of these requirements are detected at a compile time during the template instantiation.
diff --git a/external/tbb/doc/main/tbb_userguide/Controlling_Chunking.rst b/external/tbb/doc/main/tbb_userguide/Controlling_Chunking_os.rst
similarity index 96%
rename from external/tbb/doc/main/tbb_userguide/Controlling_Chunking.rst
rename to external/tbb/doc/main/tbb_userguide/Controlling_Chunking_os.rst
index 487292b4..7cfbc82e 100644
--- a/external/tbb/doc/main/tbb_userguide/Controlling_Chunking.rst
+++ b/external/tbb/doc/main/tbb_userguide/Controlling_Chunking_os.rst
@@ -157,11 +157,6 @@ quite well.
    work than an iteration of an inner loop.
 
 
-.. admonition:: Product and Performance Information 
-
-   Performance varies by use, configuration and other factors. Learn more at `www.intel.com/PerformanceIndex <https://www.intel.com/PerformanceIndex>`_.
-   Notice revision #20201201
-
 
 .. |image0| image:: Images/image002.jpg
    :width: 161px
@@ -172,4 +167,3 @@ quite well.
 .. |image2| image:: Images/image006.jpg
    :width: 462px
    :height: 193px
-
diff --git a/external/tbb/doc/main/tbb_userguide/Dependence_Graph.rst b/external/tbb/doc/main/tbb_userguide/Dependence_Graph.rst
index bbe02450..2fb38f56 100644
--- a/external/tbb/doc/main/tbb_userguide/Dependence_Graph.rst
+++ b/external/tbb/doc/main/tbb_userguide/Dependence_Graph.rst
@@ -26,7 +26,7 @@ application that could be expressed using a dependence graph.
 
 
 Dependence graphs are a special case of data flow graphs, where the data
-passed between nodes are of type oneapi::tbb::flow::continue_msg. Unlike a
+passed between nodes are of type ``oneapi::tbb::flow::continue_msg``. Unlike a
 general data flow graph, nodes in a dependence graph do not spawn a task
 for each message they receive. Instead, they are aware of the number of
 predecessors they have, count the messages they receive and only spawn a
@@ -58,7 +58,7 @@ B and E or C and F.
 
 
 To implement this as a flow graph, continue_node objects are used for
-the nodes and continue_msg objects as the messages. A continue_node
+the nodes and ``continue_msg`` objects as the messages. A continue_node
 constructor takes two arguments:
 
 
@@ -69,8 +69,8 @@ constructor takes two arguments:
 
 
 The first argument is the graph it belongs to and the second is a
-function object or lambda expression. Unlike a function_node, a
-continue_node is always assumed to have unlimited concurrency and will
+function object or lambda expression. Unlike a ``function_node``, a
+``continue_node`` is always assumed to have unlimited concurrency and will
 immediately spawn a task whenever its dependencies are met.
 
 
@@ -107,7 +107,7 @@ figure.
 
 One possible execution of this graph is shown below. The execution of D
 does not start until both B and E are finished. While a task is waiting
-in the wait_for_all, its thread can participate in executing other tasks
+in the ``wait_for_all``, its thread can participate in executing other tasks
 from the oneTBB work pool.
 
 
@@ -124,11 +124,11 @@ from the oneTBB work pool.
 
 
 Again, it is important to note that all execution in the flow graph
-happens asynchronously. The call to A.try_put returns control to the
+happens asynchronously. The call to ``A.try_put`` returns control to the
 calling thread quickly, after incrementing the counter and spawning a
 task to execute the body of A. Likewise, the body tasks execute the
 lambda expressions and then put a continue_msg to all successor nodes,
-if any. Only the call to wait_for_all blocks, as it should, and even in
+if any. Only the call to ``wait_for_all`` blocks, as it should, and even in
 this case the calling thread may be used to execute tasks from the
 oneTBB work pool while it is waiting.
 
diff --git a/external/tbb/doc/main/tbb_userguide/Edges.rst b/external/tbb/doc/main/tbb_userguide/Edges.rst
index 5cdaa895..c2c6cdf8 100644
--- a/external/tbb/doc/main/tbb_userguide/Edges.rst
+++ b/external/tbb/doc/main/tbb_userguide/Edges.rst
@@ -8,7 +8,7 @@ Most applications contain multiple nodes with edges connecting them to
 each other. In the flow graph interface, edges are directed channels
 over which messages are passed. They are created by calling the function
 ``make_edge( p, s )`` with two arguments: ``p``, the predecessor, and ``s``, the
-successor. You can modify the example used in the **Nodes** topic to
+successor. You can modify the example used in the :ref:`Nodes` topic to
 include a second node that squares the value it receives before printing
 it and then connect that to the first node with an edge.
 
@@ -37,8 +37,8 @@ it and then connect that to the first node with an edge.
        g.wait_for_all();
 
 
-Now there are two ``function_node``s, ``n`` and ``m``. The call to ``make_edge`` creates
-an edge from ``n`` to ``m``. The node n is created with unlimited concurrency,
+Now there are two ``function_node`` ``s``, ``n`` and ``m``. The call to ``make_edge`` creates
+an edge from ``n`` to ``m``. The node ``n`` is created with unlimited concurrency,
 while ``m`` has a concurrency limit of 1. The invocations of ``n`` can all
 proceed in parallel, while the invocations of ``m`` will be serialized.
 Because there is an edge from ``n`` to ``m``, each value ``v``, returned by ``n``, will
diff --git a/external/tbb/doc/main/tbb_userguide/Exceptions_and_Cancellation.rst b/external/tbb/doc/main/tbb_userguide/Exceptions_and_Cancellation.rst
index 724b8b6e..290f2f2c 100644
--- a/external/tbb/doc/main/tbb_userguide/Exceptions_and_Cancellation.rst
+++ b/external/tbb/doc/main/tbb_userguide/Exceptions_and_Cancellation.rst
@@ -22,14 +22,11 @@ the following steps generally occur:
    thread that invoked the algorithm.
 
 
-The exception thrown in step 3 might be the original exception, or might
-merely be a summary of type ``captured_exception``. The latter usually
-occurs on current systems because propagating exceptions between threads
-requires support for the C++ ``std::exception_ptr`` functionality. As
-compilers evolve to support this functionality, future versions of
+As compilers evolve to support this functionality, future versions of
 oneTBB might throw the original exception. So be sure your code can
 catch either type of exception. The following example demonstrates
-exception handling.
+exception handling:
+
 
 
 ::
diff --git a/external/tbb/doc/main/tbb_userguide/Floating_Point_Settings.rst b/external/tbb/doc/main/tbb_userguide/Floating_Point_Settings.rst
new file mode 100644
index 00000000..4618f56a
--- /dev/null
+++ b/external/tbb/doc/main/tbb_userguide/Floating_Point_Settings.rst
@@ -0,0 +1,60 @@
+.. _Floating_Point_Settings:
+
+Floating-point Settings
+=======================
+
+To propagate CPU-specific settings for floating-point computations to tasks executed by the task scheduler, you can use one of the following two methods:
+
+* When a ``task_arena`` or a task scheduler for a given application thread is initialized, they capture the current floating-point settings of the thread. 
+* The ``task_group_context`` class has a method to capture the current floating-point settings. 
+
+By default, worker threads use floating-point settings obtained during the initialization of a ``task_arena`` or the implicit arena of the application thread. The settings are applied to all computations within that ``task_arena`` or started by that application thread.
+
+
+For better control over floating point behavior, a thread may capture the current settings in a task group context. Do it at context creation with a special flag passed to the constructor:
+
+::
+    
+    task_group_context ctx( task_group_context::isolated,
+                        task_group_context::default_traits | task_group_context::fp_settings );
+
+
+Or call the ``capture_fp_settings`` method:
+
+::
+    
+     task_group_context ctx;
+    ctx.capture_fp_settings();
+
+
+You can then pass the task group context to most parallel algorithms, including ``flow::graph``, to ensure that all tasks related to this algorithm use the specified floating-point settings. 
+It is possible to execute the parallel algorithms with different floating-point settings captured to separate contexts, even at the same time.
+
+Floating-point settings captured to a task group context prevail over the settings captured during task scheduler initialization. It means, if a context is passed to a parallel algorithm, the floating-point settings captured to the context are used. 
+Otherwise, if floating-point settings are not captured to the context, or a context is not explicitly specified, the settings captured during the task arena initialization are used.
+
+In a nested call to a parallel algorithm that does not use the context of a task group with explicitly captured floating-point settings, the outer-level settings are used. 
+If none of the outer-level contexts capture floating-point settings, the settings captured during task arena initialization are used.
+
+It guarantees that: 
+
+* Floating-point settings are applied to all tasks executed within a task arena, if they are captured: 
+
+  * To a task group context. 
+  * During the arena initialization. 
+
+* A call to a oneTBB parallel algorithm does not change the floating-point settings of the calling thread, even if the algorithm uses different settings.
+
+.. note:: 
+    The guarantees above apply only to the following conditions:
+    
+    * A user code inside a task should: 
+      
+      * Not change the floating-point settings.
+      * Revert any modifications. 
+      * Restore previous settings before the end of the task.
+
+    * oneTBB task scheduler observers are not used to set or modify floating point settings.
+
+    Otherwise, the stated guarantees are not valid and the behavior related to floating-point settings is undefined.
+
diff --git a/external/tbb/doc/main/tbb_userguide/Flow-Graph-exception-tips.rst b/external/tbb/doc/main/tbb_userguide/Flow-Graph-exception-tips.rst
new file mode 100644
index 00000000..88b0aea3
--- /dev/null
+++ b/external/tbb/doc/main/tbb_userguide/Flow-Graph-exception-tips.rst
@@ -0,0 +1,17 @@
+.. _Flow_Graph_exception_tips:
+
+Flow Graph Tips for Exception Handling and Cancellation
+=======================================================
+
+
+The execution of a flow graph can be canceled directly or as a result of
+an exception that propagates beyond a node's body. You can then
+optionally reset the graph so that it can be re-executed.
+
+.. toctree::
+   :maxdepth: 4
+
+   ../tbb_userguide/catching_exceptions
+   ../tbb_userguide/cancel_a_graph
+   ../tbb_userguide/use_graph_reset
+   ../tbb_userguide/cancelling_nested_parallelism
diff --git a/external/tbb/doc/main/tbb_userguide/Flow-Graph-waiting-tips.rst b/external/tbb/doc/main/tbb_userguide/Flow-Graph-waiting-tips.rst
new file mode 100644
index 00000000..176fe7bb
--- /dev/null
+++ b/external/tbb/doc/main/tbb_userguide/Flow-Graph-waiting-tips.rst
@@ -0,0 +1,11 @@
+.. _Flow_Graph_waiting_tips:
+
+Flow Graph Tips for Waiting for and Destroying a Flow Graph
+===========================================================
+
+.. toctree::
+   :maxdepth: 4
+
+   ../tbb_userguide/always_use_wait_for_all
+   ../tbb_userguide/avoid_dynamic_node_removal
+   ../tbb_userguide/destroy_graphs_outside_main_thread
diff --git a/external/tbb/doc/main/tbb_userguide/Flow_Graph_Reservation.rst b/external/tbb/doc/main/tbb_userguide/Flow_Graph_Reservation.rst
index 8487c449..44fc2f0a 100644
--- a/external/tbb/doc/main/tbb_userguide/Flow_Graph_Reservation.rst
+++ b/external/tbb/doc/main/tbb_userguide/Flow_Graph_Reservation.rst
@@ -63,7 +63,7 @@ messages and do not support ``try_get()`` or ``try_reserve()``.
        broadcast_node<int> bn(g);
        buffer_node<int> buf1(g);
        buffer_node<int> buf2(g);
-       typedef join_node<tuple<int,int> reserving> join_type;
+       typedef join_node<tuple<int,int>, reserving> join_type;
        join_type jn(g);
        buffer_node<join_type::output_type> buf_out(g);
        join_type::output_type tuple_out;
@@ -71,9 +71,9 @@ messages and do not support ``try_get()`` or ``try_reserve()``.
 
 
        // join_node predecessors are both reservable buffer_nodes
-       make_edge(buf1,input_port<0>jn));
-       make_edge(bn,input_port<0>jn));      // attach a broadcast_node
-       make_edge(buf2,input_port<1>jn));
+       make_edge(buf1,input_port<0>(jn));
+       make_edge(bn,input_port<0>(jn));      // attach a broadcast_node
+       make_edge(buf2,input_port<1>(jn));
        make_edge(jn, buf_out);
        bn.try_put(2);
        buf1.try_put(3);
@@ -81,7 +81,7 @@ messages and do not support ``try_get()`` or ``try_reserve()``.
        buf2.try_put(7);
        g.wait_for_all();
        while (buf_out.try_get(tuple_out)) {
-           printf("join_node output == (%d,%d)\n",get<0>tuple_out), get<1>tuple_out) );
+           printf("join_node output == (%d,%d)\n",get<0>(tuple_out), get<1>(tuple_out) );
        }
        if(buf1.try_get(icnt)) printf("buf1 had %d\n", icnt);
        else printf("buf1 was empty\n");
diff --git a/external/tbb/doc/main/tbb_userguide/Flow_Graph_Tips.rst b/external/tbb/doc/main/tbb_userguide/Flow_Graph_Tips.rst
index 96d95122..7cda5022 100644
--- a/external/tbb/doc/main/tbb_userguide/Flow_Graph_Tips.rst
+++ b/external/tbb/doc/main/tbb_userguide/Flow_Graph_Tips.rst
@@ -6,8 +6,8 @@ Flow Graph Tips and Tricks
 .. toctree::
    :maxdepth: 4
 
-   ../tbb_userguide/Flow_Graph_waiting_tips
+   ../tbb_userguide/Flow-Graph-waiting-tips
    ../tbb_userguide/Flow_Graph_making_edges_tips
    ../tbb_userguide/Flow_Graph_nested_parallelism_tips
    ../tbb_userguide/Flow_Graph_resource_tips
-   ../tbb_userguide/Flow_Graph_exception_tips
\ No newline at end of file
+   ../tbb_userguide/Flow-Graph-exception-tips
\ No newline at end of file
diff --git a/external/tbb/doc/main/tbb_userguide/Flow_Graph_resource_tips.rst b/external/tbb/doc/main/tbb_userguide/Flow_Graph_resource_tips.rst
index b202fc22..27dd524c 100644
--- a/external/tbb/doc/main/tbb_userguide/Flow_Graph_resource_tips.rst
+++ b/external/tbb/doc/main/tbb_userguide/Flow_Graph_resource_tips.rst
@@ -14,4 +14,5 @@ in a flow graph.
 
    ../tbb_userguide/use_limiter_node
    ../tbb_userguide/use_concurrency_limits
-   ../tbb_userguide/create_token_based_system
\ No newline at end of file
+   ../tbb_userguide/create_token_based_system
+   ../tbb_userguide/attach_flow_graph_to_arena
\ No newline at end of file
diff --git a/external/tbb/doc/main/tbb_userguide/Graph_Object.rst b/external/tbb/doc/main/tbb_userguide/Graph_Object.rst
index 8993e1a1..06fd5331 100644
--- a/external/tbb/doc/main/tbb_userguide/Graph_Object.rst
+++ b/external/tbb/doc/main/tbb_userguide/Graph_Object.rst
@@ -25,3 +25,10 @@ or edges, and therefore no tasks are spawned.
    graph g;
    g.wait_for_all();
 
+The graph object does not own the nodes associated with it. You need to make sure that the graph object's lifetime is longer than the lifetimes of all nodes added to the graph and any activity associated with the graph. 
+
+.. tip:: Call ``wait_for_all`` on a graph object before destroying it to make sure all activities are complete. 
+
+ Even when using smart pointers, be aware of the order of destruction for nodes and the graph to make sure that nodes are not deleted before the graph.
+
+
diff --git a/external/tbb/doc/main/tbb_userguide/Guiding_Task_Scheduler_Execution.rst b/external/tbb/doc/main/tbb_userguide/Guiding_Task_Scheduler_Execution.rst
index 3d770c79..25d4f85f 100644
--- a/external/tbb/doc/main/tbb_userguide/Guiding_Task_Scheduler_Execution.rst
+++ b/external/tbb/doc/main/tbb_userguide/Guiding_Task_Scheduler_Execution.rst
@@ -6,12 +6,13 @@ Guiding Task Scheduler Execution
 By default, the task scheduler tries to use all available computing resources. In some cases,
 you may want to configure the task scheduler to use only some of them.
 
-.. caution::
+.. caution:: Guiding the execution of the task scheduler may cause composability issues.
 
-    Guiding the execution of the task scheduler may cause composability issues.
 
 |full_name| provides the ``task_arena`` interface to guide tasks execution within the arena by:
+  
     - setting the preferred computation units;
+  
     - restricting part of computation units.
 
 Such customizations are encapsulated within the ``task_arena::constraints`` structure.
@@ -32,9 +33,10 @@ not returned by ``tbb::info::numa_nodes()`` interface.
 
 The following examples show how to use these interfaces:
 
-.. rubric:: Setting the preferred NUMA node
+Set NUMA Node
+*************
 
-The execution on systems with non-uniform memory access (`NUMA <https://en.wikipedia.org/wiki/Non-uniform_memory_access>`_ systems)
+The execution on systems with non-uniform memory access (NUMA https://en.wikipedia.org/wiki/Non-uniform_memory_access systems)
 may cause a performance penalty if threads from one NUMA node access the memory allocated on
 a different NUMA node. To reduce this overhead, the work may be divided among several ``task_arena``
 instances, whose execution preference is set to different NUMA nodes. To set execution preference,
@@ -57,12 +59,14 @@ assign a NUMA node identifier to the ``task_arena::constraints::numa_id`` field.
         arenas[j].execute([&task_groups, &j](){ task_groups[j].wait(); });
     }
 
-.. rubric:: Setting the preferred core type
+Set Core Type
+*************
 
 The processors with `Intel® Hybrid Technology <https://www.intel.com/content/www/us/en/products/docs/processors/core/core-processors-with-hybrid-technology-brief.html>`_
 contain several core types, each is suited for different purposes.
-For example, some applications may improve their performance by preferring execution on the most performant cores.
-To set execution preference, assign specific core type identifier to the ``task_arena::constraints::core_type`` field.
+In most cases, systems with hybrid CPU architecture show reasonable performance without involving additional API calls.
+However, in some exceptional scenarios, performance may be tuned by setting the preferred core type.
+To set the preferred core type for the execution, assign a specific core type identifier to the ``task_arena::constraints::core_type`` field.
 
 The example shows how to set the most performant core type as preferable for work execution:
 
@@ -77,7 +81,8 @@ The example shows how to set the most performant core type as preferable for wor
         /*the most performant core type is defined as preferred.*/
     });
 
-.. rubric:: Limiting the maximum number of threads simultaneously scheduled to one core
+Limit The Maximum Number of Threads Simultaneously Scheduled To One Core
+****************************************************************************
 
 The processors with `Intel® Hyper-Threading Technology <https://www.intel.com/content/www/us/en/architecture-and-technology/hyper-threading/hyper-threading-technology.html>`_
 allow more than one thread to run on each core simultaneously. However, there might be situations
diff --git a/external/tbb/doc/main/tbb_userguide/How_Task_Scheduler_Works.rst b/external/tbb/doc/main/tbb_userguide/How_Task_Scheduler_Works.rst
new file mode 100644
index 00000000..744794fc
--- /dev/null
+++ b/external/tbb/doc/main/tbb_userguide/How_Task_Scheduler_Works.rst
@@ -0,0 +1,50 @@
+.. _How_Task_Scheduler_Works.rst:
+
+How Task Scheduler Works
+========================
+
+
+While the task scheduler is not bound to any particular type of parallelism, 
+it was designed to work efficiently for fork-join parallelism with lots of forks.
+This type of parallelism is typical for parallel algorithms such as `oneapi::tbb::parallel_for
+<https://oneapi-spec.uxlfoundation.org/specifications/oneapi/latest/elements/onetbb/source/algorithms/functions/parallel_for_func>`_.
+
+Let's consider the mapping of fork-join parallelism on the task scheduler in more detail. 
+
+The scheduler runs tasks in a way that tries to achieve several targets simultaneously: 
+ - Enable as many threads as possible, by creating enough job, to achieve actual parallelism
+ - Preserve data locality to make a single thread execution more efficient  
+ - Minimize both memory demands and cross-thread communication to reduce an overhead 
+
+To achieve this, a balance between depth-first and breadth-first execution strategies 
+must be reached. Assuming that the task graph is finite, depth-first is better for 
+a sequential execution because:
+
+- **Strike when the cache is hot**. The deepest tasks are the most recently created tasks and therefore are the hottest in the cache.
+  Also, if they can be completed, tasks that depend on it can continue executing, and though not the hottest in a cache, 
+  they are still warmer than the older tasks deeper in the dequeue.
+ 
+- **Minimize space**. Execution of the shallowest task leads to the breadth-first unfolding of a graph. It creates an exponential
+  number of nodes that co-exist simultaneously. In contrast, depth-first execution creates the same number 
+  of nodes, but only a linear number can exists at the same time, since it creates a stack of other ready 
+  tasks.
+  
+Each thread has its deque of tasks that are ready to run. When a 
+thread spawns a task, it pushes it onto the bottom of its deque.
+
+When a thread participates in the evaluation of tasks, it constantly executes 
+a task obtained by the first rule that applies from the roughly equivalent ruleset:
+
+- Get the task returned by the previous one, if any.
+
+- Take a task from the bottom of its deque, if any.
+
+- Steal a task from the top of another randomly chosen deque. If the 
+  selected deque is empty, the thread tries again to execute this rule until it succeeds.
+
+Rule 1 is described in :doc:`Task Scheduler Bypass <Task_Scheduler_Bypass>`. 
+The overall effect of rule 2 is to execute the *youngest* task spawned by the thread, 
+which causes the depth-first execution until the thread runs out of work. 
+Then rule 3 applies. It steals the *oldest* task spawned by another thread, 
+which causes temporary breadth-first execution that converts potential parallelism 
+into actual parallelism.
diff --git a/external/tbb/doc/main/tbb_userguide/Lambda_Expressions.rst b/external/tbb/doc/main/tbb_userguide/Lambda_Expressions.rst
index e2408c1e..647a2e1c 100644
--- a/external/tbb/doc/main/tbb_userguide/Lambda_Expressions.rst
+++ b/external/tbb/doc/main/tbb_userguide/Lambda_Expressions.rst
@@ -4,7 +4,7 @@ Lambda Expressions
 ==================
 
 
-C++11 lambda expressions make the |full_name| 
+C++11 lambda expressions make the |full_name|
 ``parallel_for`` much easier to use. A lambda expression lets
 the compiler do the tedious work of creating a function object.
 
@@ -14,24 +14,10 @@ expression. The lambda expression, replaces both the declaration and constructio
 example of the previous section.
 
 
-::
-
-
-   #include "oneapi/tbb.h"
-    
-
-   using namespace oneapi::tbb;
-    
-
-   void ParallelApplyFoo( float* a, size_t n ) {
-      parallel_for( blocked_range<size_t>(0,n), 
-         [=](const blocked_range<size_t>& r) {
-                         for(size_t i=r.begin(); i!=r.end(); ++i) 
-                             Foo(a[i]); 
-                     }
-       );
-   }
-
+.. literalinclude:: ./examples/parallel_for_lambda_example_1.cpp
+    :language: c++
+    :start-after: /*begin_parallel_for_lambda_1*/
+    :end-before: /*end_parallel_for_lambda_1*/
 
 The [=] introduces the lambda expression. The expression creates a
 function object very similar to ``ApplyFoo``. When local variables like
@@ -54,18 +40,18 @@ shows the option for turning it on.
 .. container:: tablenoborder
 
 
-   .. list-table:: 
+   .. list-table::
       :header-rows: 1
 
-      * -     Environment     
-        -     Intel® C++ Compiler Classic    
-        -     Intel® oneAPI DPC++/C++ Compiler    
-      * -     Windows\* OS systems     
-        -     \ ``icl /Qstd=c++11 foo.cpp``     
-        -     \ ``icx /Qstd=c++11 foo.cpp``     
-      * -     Linux\* OS systems     
-        -     \ ``icc -std=c++11 foo.cpp``     
-        -     \ ``icx -std=c++11 foo.cpp``     
+      * -     Environment
+        -     Intel® C++ Compiler Classic
+        -     Intel® oneAPI DPC++/C++ Compiler
+      * -     Windows\* OS systems
+        -     \ ``icl /Qstd=c++11 foo.cpp``
+        -     \ ``icx /Qstd=c++11 foo.cpp``
+      * -     Linux\* OS systems
+        -     \ ``icc -std=c++11 foo.cpp``
+        -     \ ``icx -std=c++11 foo.cpp``
 
 
 
@@ -73,30 +59,16 @@ shows the option for turning it on.
 For further compactness, oneTBB has a form of ``parallel_for`` expressly
 for parallel looping over a consecutive range of integers. The
 expression ``parallel_for(first,last,step,f)`` is like writing
-``for(auto i=first;         i<last;       i+=step)f(i)`` except that
+``for(auto i=first; i<last; i+=step)f(i)`` except that
 each f(i) can be evaluated in parallel if resources permit. The ``step``
 parameter is optional. Here is the previous example rewritten in the
 compact form:
 
-
-::
-
-
-   #include "oneapi/tbb.h"
-    
-
-   using namespace oneapi::tbb;
-    
-
-   #pragma warning(disable: 588)
-    
-
-   void ParallelApplyFoo(float a[], size_t n) {
-       parallel_for(size_t(0), n, [=](size_t i) {Foo(a[i]);});
-   }
-
+.. literalinclude:: ./examples/parallel_for_lambda_example_2.cpp
+    :language: c++
+    :start-after: /*begin_parallel_for_lambda_2*/
+    :end-before: /*end_parallel_for_lambda_2*/
 
 The compact form supports only unidimensional iteration spaces of
 integers and the automatic chunking feature detailed on the following
 section.
-
diff --git a/external/tbb/doc/main/tbb_userguide/Linux_OS.rst b/external/tbb/doc/main/tbb_userguide/Linux_OS.rst
index 1d25a04d..0f0c2457 100644
--- a/external/tbb/doc/main/tbb_userguide/Linux_OS.rst
+++ b/external/tbb/doc/main/tbb_userguide/Linux_OS.rst
@@ -25,12 +25,12 @@ structure for Linux\*, relative to *<tbb_install_dir>*
       - | ``LIBRARY_PATH``
 	| ``LD_LIBRARY_PATH``
 
-where
+Where:
 
 * ``<arch>`` - ``ia32`` or ``intel64``
+  
+   .. note:: Starting with oneTBB 2022.0, 32-bit binaries are supported only by the open-source version of the library. 
 
 * ``<lib>`` - ``libtbb``, ``libtbbmalloc``, ``libtbbmalloc_proxy`` or ``libtbbbind``
-
 * ``<variant>`` - ``_debug`` or empty
-
-* ``<version>`` - binary version in a form of ``<major>.<minor>``
\ No newline at end of file
+* ``<version>`` - binary version in a form of ``<major>.<minor>``
diff --git a/external/tbb/doc/main/tbb_userguide/Memory_Allocation.rst b/external/tbb/doc/main/tbb_userguide/Memory_Allocation.rst
index 2ea4f740..745f0258 100644
--- a/external/tbb/doc/main/tbb_userguide/Memory_Allocation.rst
+++ b/external/tbb/doc/main/tbb_userguide/Memory_Allocation.rst
@@ -68,4 +68,4 @@ redirect the standard routines to these functions.
 
    ../tbb_userguide/Which_Dynamic_Libraries_to_Use
    ../tbb_userguide/Allocator_Configuration
-   ../tbb_userguide/Automically_Replacing_malloc
+   ../tbb_userguide/automatically-replacing-malloc
diff --git a/external/tbb/doc/main/tbb_userguide/Migration_Guide/Mixing_Two_Runtimes.rst b/external/tbb/doc/main/tbb_userguide/Migration_Guide/Mixing_Two_Runtimes.rst
index 57582aac..8d467fb6 100644
--- a/external/tbb/doc/main/tbb_userguide/Migration_Guide/Mixing_Two_Runtimes.rst
+++ b/external/tbb/doc/main/tbb_userguide/Migration_Guide/Mixing_Two_Runtimes.rst
@@ -46,3 +46,4 @@ TBB possible output:
     TBB: RML	private
     TBB: Tools support	disabled
 
+.. note:: The ``tbbmalloc`` library in oneTBB is fully binary compatible with TBB. 
diff --git a/external/tbb/doc/main/tbb_userguide/Migration_Guide/Task_API.rst b/external/tbb/doc/main/tbb_userguide/Migration_Guide/Task_API.rst
index 08d66b5c..e96e4324 100644
--- a/external/tbb/doc/main/tbb_userguide/Migration_Guide/Task_API.rst
+++ b/external/tbb/doc/main/tbb_userguide/Migration_Guide/Task_API.rst
@@ -361,14 +361,13 @@ is not guaranteed to be executed next by the current thread.
         
         tbb::task_spawn(child);
         
-        root.wait_for_all();;
+        root.wait_for_all();
     }
 
-In oneTBB this can be done using the preview feature of ``oneapi::tbb::task_group``. 
+In oneTBB, this can be done using ``oneapi::tbb::task_group``. 
 
 .. code:: cpp
    
-    #define TBB_PREVIEW_TASK_GROUP_EXTENSIONS 1
     #include <oneapi/tbb/task_group.h>
     
     // Assuming OtherTask is defined.
@@ -421,11 +420,10 @@ and waiting on it is implemented as follows:
         // i.e. after the callback is called  
     }
 
-In oneTBB this can be done using the preview feature of ``oneapi::tbb::task_group``.
+In oneTBB, this can be done using ``oneapi::tbb::task_group``.
 
 .. code:: cpp
 
-    #define TBB_PREVIEW_TASK_GROUP_EXTENSIONS 1
     #include <oneapi/tbb/task_group.h>
 
     int main(){
diff --git a/external/tbb/doc/main/tbb_userguide/Migration_Guide/Task_Scheduler_Init.rst b/external/tbb/doc/main/tbb_userguide/Migration_Guide/Task_Scheduler_Init.rst
index bdac7665..6acdb272 100644
--- a/external/tbb/doc/main/tbb_userguide/Migration_Guide/Task_Scheduler_Init.rst
+++ b/external/tbb/doc/main/tbb_userguide/Migration_Guide/Task_Scheduler_Init.rst
@@ -14,27 +14,27 @@ Querying the default number of threads
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 * `oneapi::tbb::info::default_concurrency()
-  <https://spec.oneapi.com/versions/latest/elements/oneTBB/source/info_namespace.html>`_
+  <https://oneapi-spec.uxlfoundation.org/specifications/oneapi/latest/elements/onetbb/source/info_namespace>`_
   returns the maximum concurrency that will be created by *default* in implicit or explicit ``task_arena``.
 
 * `oneapi::tbb::this_task_arena::max_concurrency()
-  <https://spec.oneapi.com/versions/latest/elements/oneTBB/source/task_scheduler/task_arena/this_task_arena_ns.html>`_
+  <https://oneapi-spec.uxlfoundation.org/specifications/oneapi/latest/elements/onetbb/source/task_scheduler/task_arena/this_task_arena_ns>`_
   returns the maximum number of threads available for the parallel algorithms within the current context
   (or *default* if an implicit arena is not initialized)
 
 * `oneapi::tbb::global_control::active_value(tbb::global_control::max_allowed_parallelism)
-  <https://spec.oneapi.com/versions/latest/elements/oneTBB/source/task_scheduler/scheduling_controls/global_control_cls.html>`_
+  <https://oneapi-spec.uxlfoundation.org/specifications/oneapi/latest/elements/onetbb/source/task_scheduler/scheduling_controls/global_control_cls>`_
   returns the current limit of the thread pool (or *default* if oneTBB scheduler is not initialized)
 
 Setting the maximum concurrency
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 * `task_arena(/* max_concurrency */)
-  <https://spec.oneapi.com/versions/latest/elements/oneTBB/source/task_scheduler/task_arena/this_task_arena_ns.html>`_
+  <https://oneapi-spec.uxlfoundation.org/specifications/oneapi/latest/elements/onetbb/source/task_scheduler/task_arena/this_task_arena_ns>`_
   limits the maximum concurrency of the parallel algorithm running inside ``task_arena``
 
 * `tbb::global_control(tbb::global_control::max_allowed_parallelism, /* max_concurrency */)
-  <https://spec.oneapi.com/versions/latest/elements/oneTBB/source/task_scheduler/scheduling_controls/global_control_cls.html>`_
+  <https://oneapi-spec.uxlfoundation.org/specifications/oneapi/latest/elements/onetbb/source/task_scheduler/scheduling_controls/global_control_cls>`_
   limits the total number of oneTBB worker threads
 
 Examples
@@ -116,7 +116,7 @@ The limited parallelism:
 Setting thread stack size
 ---------------------------------------
 Use `oneapi::tbb::global_control(oneapi::tbb::global_control::thread_stack_size, /* stack_size */)
-<https://spec.oneapi.com/versions/latest/elements/oneTBB/source/task_scheduler/scheduling_controls/global_control_cls.html>`_
+<https://oneapi-spec.uxlfoundation.org/specifications/oneapi/latest/elements/onetbb/source/task_scheduler/scheduling_controls/global_control_cls>`_
 to set the stack size for oneTBB worker threads:
 
 .. code:: cpp
@@ -140,17 +140,17 @@ to set the stack size for oneTBB worker threads:
 
 Terminating oneTBB scheduler
 ---------------------------------------
-:ref:`task_scheduler_handle_reference`
+
+`task_scheduler_handle <https://oneapi-spec.uxlfoundation.org/specifications/oneapi/latest/elements/onetbb/source/task_scheduler/scheduling_controls/task_scheduler_handle_cls>`_
 allows waiting for oneTBB worker threads completion:
 
 .. code:: cpp
 
-    #define TBB_PREVIEW_WAITING_FOR_WORKERS 1
     #include <oneapi/tbb/global_control.h>
     #include <oneapi/tbb/parallel_for.h>
 
     int main() {
-        oneapi::tbb::task_scheduler_handle handle = oneapi::tbb::task_scheduler_handle::get();
+        oneapi::tbb::task_scheduler_handle handle{tbb::attach{}};
         // Do some parallel work here
         oneapi::tbb::parallel_for(/* ... */);
         oneapi::tbb::finalize(handle);
diff --git a/external/tbb/doc/main/tbb_userguide/Nodes.rst b/external/tbb/doc/main/tbb_userguide/Nodes.rst
index 1e8333bb..54c70023 100644
--- a/external/tbb/doc/main/tbb_userguide/Nodes.rst
+++ b/external/tbb/doc/main/tbb_userguide/Nodes.rst
@@ -4,8 +4,8 @@ Flow Graph Basics: Nodes
 ========================
 
 
-A node is a class that inherits from oneapi::tbb::flow::graph_node and also
-typically inherits from oneapi::tbb::flow::sender<T> , oneapi::tbb::flow::receiver<T> or
+A node is a class that inherits from ``oneapi::tbb::flow::graph_node`` and also
+typically inherits from ``oneapi::tbb::flow::sender<T>``, ``oneapi::tbb::flow::receiver<T>``, or
 both. A node performs some operation, usually on an incoming message and
 may generate zero or more output messages. Some nodes require more than
 one input message or generate more than one output message.
@@ -83,7 +83,7 @@ section.
 
 
 You can then wait for the messages to be processed by calling
-wait_for_all on the graph object:
+``wait_for_all`` on the graph object:
 
 
 ::
diff --git a/external/tbb/doc/main/tbb_userguide/Package_Contents.rst b/external/tbb/doc/main/tbb_userguide/Package_Contents_os.rst
similarity index 93%
rename from external/tbb/doc/main/tbb_userguide/Package_Contents.rst
rename to external/tbb/doc/main/tbb_userguide/Package_Contents_os.rst
index 30d75c09..2d9e0a2f 100644
--- a/external/tbb/doc/main/tbb_userguide/Package_Contents.rst
+++ b/external/tbb/doc/main/tbb_userguide/Package_Contents_os.rst
@@ -14,4 +14,5 @@ and macOS\* operating systems as described in this section.
    ../tbb_userguide/Scalable_Memory_Allocator
    ../tbb_userguide/Windows_OS_ug
    ../tbb_userguide/Linux_OS
-   ../tbb_userguide/Mac_OS
\ No newline at end of file
+   ../tbb_userguide/Mac_OS
+
diff --git a/external/tbb/doc/main/tbb_userguide/Parallelizing_Complex_Loops.rst b/external/tbb/doc/main/tbb_userguide/Parallelizing_Complex_Loops.rst
index 88b1cdba..7c12d7b0 100644
--- a/external/tbb/doc/main/tbb_userguide/Parallelizing_Complex_Loops.rst
+++ b/external/tbb/doc/main/tbb_userguide/Parallelizing_Complex_Loops.rst
@@ -5,7 +5,7 @@ Parallelizing Complex Loops
 
 
 You can successfully parallelize many applications using only the
-constructs in the **Parallelizing Simple Loops** section. However, some
+constructs in the :ref:`Parallelizing_Simple_Loops` section. However, some
 situations call for other parallel patterns. This section describes the
 support for some of these alternate patterns.
 
diff --git a/external/tbb/doc/main/tbb_userguide/Parallelizing_Simple_Loops.rst b/external/tbb/doc/main/tbb_userguide/Parallelizing_Simple_Loops_os.rst
similarity index 75%
rename from external/tbb/doc/main/tbb_userguide/Parallelizing_Simple_Loops.rst
rename to external/tbb/doc/main/tbb_userguide/Parallelizing_Simple_Loops_os.rst
index c4b8fbfa..4c58aca0 100644
--- a/external/tbb/doc/main/tbb_userguide/Parallelizing_Simple_Loops.rst
+++ b/external/tbb/doc/main/tbb_userguide/Parallelizing_Simple_Loops_os.rst
@@ -19,7 +19,7 @@ following sections demonstrate how to parallelize simple loops.
 When compiling oneTBB programs, be sure to link in the oneTBB shared
 library, otherwise undefined references will occur. The following table
 shows compilation commands that use the debug version of the library.
-Remove the "``_debug``" portion to link against the production version
+Remove the ``_debug`` portion to link against the production version
 of the library.
 
 
@@ -37,12 +37,4 @@ of the library.
         -      ``icc example.cpp -ltbb_debug``     
 
 
-
-.. toctree::
-   :maxdepth: 4
-
-   ../tbb_userguide/Initializing_and_Terminating_the_Library
-   ../tbb_userguide/parallel_for
-   ../tbb_userguide/parallel_reduce
-   ../tbb_userguide/Advanced_Example
-   ../tbb_userguide/Advanced_Topic_Other_Kinds_of_Iteration_Spaces
+.. include:: Parallelizing_Simple_Loops_toctree.rst
\ No newline at end of file
diff --git a/external/tbb/doc/main/tbb_userguide/Parallelizing_Simple_Loops_toctree.rst b/external/tbb/doc/main/tbb_userguide/Parallelizing_Simple_Loops_toctree.rst
new file mode 100644
index 00000000..f83bb1b2
--- /dev/null
+++ b/external/tbb/doc/main/tbb_userguide/Parallelizing_Simple_Loops_toctree.rst
@@ -0,0 +1,11 @@
+.. _Parallelizing_Simple_Loops_toctree:
+
+
+.. toctree::
+   :maxdepth: 4
+
+   ../tbb_userguide/Initializing_and_Terminating_the_Library
+   ../tbb_userguide/parallel_for_os
+   ../tbb_userguide/parallel_reduce
+   ../tbb_userguide/Advanced_Example
+   ../tbb_userguide/Advanced_Topic_Other_Kinds_of_Iteration_Spaces
\ No newline at end of file
diff --git a/external/tbb/doc/main/tbb_userguide/Predefined_Node_Types.rst b/external/tbb/doc/main/tbb_userguide/Predefined_Node_Types.rst
index 14c009f0..53535d27 100644
--- a/external/tbb/doc/main/tbb_userguide/Predefined_Node_Types.rst
+++ b/external/tbb/doc/main/tbb_userguide/Predefined_Node_Types.rst
@@ -21,34 +21,34 @@ detailed description of each node.
 
       * - Predefined Node Type 
         - Description 
-      * - input_node 
+      * - ``input_node``
         - A single-output node, with a generic output type.
           When activated, it executes a user body to generate its output. Its body is invoked if downstream nodes have accepted the previous generated output.
           Otherwise, the previous output is temporarily buffered until it is accepted downstream and then the body is again invoked.
-      * - function_node 
-        - A single-input single-output node that broadcasts its output to all successors. Has generic input and output types. Executes a user body, and has controllable concurrency level and buffering policy.   For each input exactly one output is returned.
-      * - continue_node 
-        - A single-input, single-output node that broadcasts its output to    all successors. It has a single input that requires 1 or more inputs   of type continue_msg and has a generic output type. It executes a   user body when it receives N continue_msg objects at its input. N is   equal to the number of predecessors plus any additional offset   assigned at construction time.
-      * - multifunction_node 
+      * - ``function_node``
+        - A single-input single-output node that broadcasts its output to all successors. Has generic input and output types. Executes a user body and has controllable concurrency level and buffering policy. For each input exactly one output is returned.
+      * - ``continue_node`` 
+        - A single-input, single-output node that broadcasts its output to all successors. It has a single input that requires 1 or more inputs   of type ``continue_msg`` and has a generic output type. It executes a   user body when it receives N ``continue_msg objects`` at its input. N is   equal to the number of predecessors plus any additional offset   assigned at construction time.
+      * - ``multifunction_node``
         - A single-input multi-output node. It has a generic input type and    several generic output types. It executes a user body, and has   controllable concurrency level and buffering policy. The body can   output zero or more messages on each output port.
-      * - broadcast_node 
+      * - ``broadcast_node`` 
         - A single-input, single-output node that broadcasts each message    received to all successors. Its input and output are of the same   generic type. It does not buffer messages.
-      * - buffer_node, queue_node, priority_queue_node, and sequencer_node. 
+      * - ``buffer_node``, ``queue_node``, ``priority_queue_node``, and ``sequencer_node``. 
         - Single-input, single-output nodes that buffer messages and send    their output to one successor. The order in which the messages are   sent are node specific (see the Developer Reference). These nodes are   unique in that they send to only a single successor and not all   successors.
-      * - join_node 
+      * - ``join_node``
         - A multi-input, single-output node. There are several generic    input types and the output type is a tuple of these generic types.   The node combines one message from each input port to create a tuple   that is broadcast to all successors. The policy used to combine   messages is selectable as queueing, reserving or tag-matching.
-      * - split_node 
+      * - ``split_node`` 
         - A single-input, multi-output node. The input type is a tuple of    generic types and there is one output port for each of the types in   the tuple. The node receives a tuple of values and outputs each   element of the tuple on a corresponding output port.
-      * - write_once_node, overwrite_node 
-        - Single-input, single-output nodes that buffer a single message    and broadcast their outputs to all successors. After broadcast, the   nodes retain the last message received, so it is available to any   future successor. A write_once_node will only accept the first   message it receives, while the overwrite_node will accept all   messages, broadcasting them to all successors, and replacing the old   value with the new.
-      * - limiter_node 
+      * - ``write_once_node``, ``overwrite_node`` 
+        - Single-input, single-output nodes that buffer a single message    and broadcast their outputs to all successors. After broadcast, the   nodes retain the last message received, so it is available to any   future successor. A ``write_once_node`` will only accept the first   message it receives, while the ``overwrite_node`` will accept all   messages, broadcasting them to all successors, and replacing the old   value with the new.
+      * - ``limiter_node`` 
         - A multi-input, single output node that broadcasts its output to    all successors. The main input type and output type are of the same   generic type. The node increments an internal counter when it   broadcasts a message. If the increment causes it to reach its   user-assigned threshold, it will broadcast no more messages. A   special input port can be used to adjust the internal count, allowing   further messages to be broadcast. The node does not buffer messages.
-      * - indexer_node 
-        - A multi-input, single-output node that broadcasts its output    message to all of its successors. The input type is a list of generic   types and the output type is a tagged_msg. The message is of one of   the types listed in the input and the tag identifies the port on   which the message was received. Messages are broadcast individually   as they arrive at the input ports.
-      * - composite_node 
-        - A node that might have 0, 1 or multiple ports for both input and    output. The composite_node packages a group of other nodes together   and maintains a tuple of references to ports that border it. This   allows for the corresponding ports of the composite_node to be used   to make edges which hitherto would have been made from the actual   nodes in the composite_node.
+      * - ``indexer_node`` 
+        - A multi-input, single-output node that broadcasts its output    message to all of its successors. The input type is a list of generic   types and the output type is a ``tagged_msg``. The message is of one of   the types listed in the input and the tag identifies the port on   which the message was received. Messages are broadcast individually   as they arrive at the input ports.
+      * - ``composite_node`` 
+        - A node that might have 0, 1 or multiple ports for both input and    output. The ``composite_node`` packages a group of other nodes together   and maintains a tuple of references to ports that border it. This   allows for the corresponding ports of the ``composite_node`` to be used   to make edges which hitherto would have been made from the actual   nodes in the ``composite_node``.
       * - async_node (preview feature) 
-        - A node that allows a flow graph to communicate with an external    activity managed by the user or another runtime. This node receives   messages of generic type, invokes the user-provided body to submit a   message to an external activity. The external activity can use a   special interface to return a generic type and put it to all   successors of async_node.
+        - A node that allows a flow graph to communicate with an external    activity managed by the user or another runtime. This node receives   messages of generic type, invokes the user-provided body to submit a   message to an external activity. The external activity can use a   special interface to return a generic type and put it to all   successors of ``async_node``.
 
 
 
diff --git a/external/tbb/doc/main/tbb_userguide/Task_Scheduler_Bypass.rst b/external/tbb/doc/main/tbb_userguide/Task_Scheduler_Bypass.rst
new file mode 100644
index 00000000..c198f6ac
--- /dev/null
+++ b/external/tbb/doc/main/tbb_userguide/Task_Scheduler_Bypass.rst
@@ -0,0 +1,20 @@
+.. _Task_Scheduler_Bypass:
+
+Task Scheduler Bypass
+=====================
+
+Scheduler bypass is an optimization where you directly specify the next task to run. 
+According to the rules of execution described in :doc:`How Task Scheduler Works <How_Task_Scheduler_Works>`, 
+the spawning of the new task to be executed by the current thread involves the next steps:
+
+ -  Push a new task onto the thread's deque.
+ -  Continue to execute the current task until it is completed.
+ -  Take a task from the thread's deque, unless it is stolen by another thread.
+
+Steps 1 and 3 introduce unnecessary deque operations or, even worse, allow stealing that can hurt 
+locality without adding significant parallelism. These problems can be avoided by using "Task Scheduler Bypass" technique to directly point the preferable task to be executed next 
+instead of spawning it. When, as described in :doc:`How Task Scheduler Works <How_Task_Scheduler_Works>`,
+the returned task becomes the first candidate for the next task to be executed by the thread. Furthermore, this approach almost guarantees that 
+the task is executed by the current thread and not by any other thread.
+
+Please note that at the moment the only way to use this optimization is to use `preview feature of ``onepai::tbb::task_group`` 
\ No newline at end of file
diff --git a/external/tbb/doc/main/tbb_userguide/Task_Scheduler_Summary.rst b/external/tbb/doc/main/tbb_userguide/Task_Scheduler_Summary.rst
deleted file mode 100644
index 7c77d8f9..00000000
--- a/external/tbb/doc/main/tbb_userguide/Task_Scheduler_Summary.rst
+++ /dev/null
@@ -1,11 +0,0 @@
-.. _Task_Scheduler_Summary:
-
-Task Scheduler Summary
-======================
-
-
-The task scheduler works most efficiently for fork-join parallelism with
-lots of forks, so that the task-stealing can cause sufficient
-breadth-first behavior to occupy threads, which then conduct themselves
-in a depth-first manner until they need to steal more work.
-
diff --git a/external/tbb/doc/main/tbb_userguide/The_Task_Scheduler.rst b/external/tbb/doc/main/tbb_userguide/The_Task_Scheduler.rst
index ac57e020..d9e6056e 100644
--- a/external/tbb/doc/main/tbb_userguide/The_Task_Scheduler.rst
+++ b/external/tbb/doc/main/tbb_userguide/The_Task_Scheduler.rst
@@ -16,5 +16,6 @@ onto one of the high-level templates, use the task scheduler.
 
    ../tbb_userguide/Task-Based_Programming
    ../tbb_userguide/When_Task-Based_Programming_Is_Inappropriate
-   ../tbb_userguide/Task_Scheduler_Summary
+   ../tbb_userguide/How_Task_Scheduler_Works
+   ../tbb_userguide/Task_Scheduler_Bypass
    ../tbb_userguide/Guiding_Task_Scheduler_Execution
\ No newline at end of file
diff --git a/external/tbb/doc/main/tbb_userguide/Windows_C_Dynamic_Memory_Interface_Replacement.rst b/external/tbb/doc/main/tbb_userguide/Windows_C_Dynamic_Memory_Interface_Replacement.rst
index f4f78ae5..cd2d2e1a 100644
--- a/external/tbb/doc/main/tbb_userguide/Windows_C_Dynamic_Memory_Interface_Replacement.rst
+++ b/external/tbb/doc/main/tbb_userguide/Windows_C_Dynamic_Memory_Interface_Replacement.rst
@@ -44,7 +44,6 @@ To do the replacement use one of the following methods:
 -  Alternatively, add the following parameters to the linker options for
    the .exe or .dll file that is loaded during application startup.
 
-
    For 32-bit code (note the triple underscore):
 
 
@@ -52,8 +51,7 @@ To do the replacement use one of the following methods:
 
 
       tbbmalloc_proxy.lib /INCLUDE:"___TBB_malloc_proxy"
-
-
+   
    For 64-bit code (note the double underscore):
 
 
diff --git a/external/tbb/doc/main/tbb_userguide/Windows_OS_ug.rst b/external/tbb/doc/main/tbb_userguide/Windows_OS_ug.rst
index 3fc4a5a2..85fc3306 100644
--- a/external/tbb/doc/main/tbb_userguide/Windows_OS_ug.rst
+++ b/external/tbb/doc/main/tbb_userguide/Windows_OS_ug.rst
@@ -30,12 +30,13 @@ structure for Windows\*, relative to <*tbb_install_dir*>.
         - Same as corresponding ``.dll`` file.
         - \
 
-where
+Where
 
 * ``<arch>`` - ``ia32`` or ``intel64``
 
-* ``<lib>`` - ``tbb``, ``tbbmalloc``, ``tbbmalloc_proxy`` or ``tbbbind``
+  .. note:: Starting with oneTBB 2022.0, 32-bit binaries are supported only by the open-source version of the library.
 
+* ``<lib>`` - ``tbb``, ``tbbmalloc``, ``tbbmalloc_proxy`` or ``tbbbind``
 * ``<vcversion>`` 
 
   - ``14`` - use for dynamic linkage  with the CRT
@@ -47,11 +48,10 @@ where
   - ``_mt`` - use for static linkage with the CRT
 
 * ``<variant>`` - ``_debug`` or empty
-
 * ``<version>`` - binary version
  
-The last column shows which environment variables are used by the
-Microsoft\* Visual C++\* or Intel® C++ Compiler Classic or Intel® oneAPI DPC++/C++ Compiler to find these
+The last column shows, which environment variables are used by the
+Microsoft\* Visual C++\* or Intel® C++ Compiler Classic or Intel® oneAPI DPC++/C++ Compiler, to find these
 subdirectories.
 
 .. CAUTION:: 
diff --git a/external/tbb/doc/main/tbb_userguide/Working_on_the_Assembly_Line_pipeline.rst b/external/tbb/doc/main/tbb_userguide/Working_on_the_Assembly_Line_pipeline.rst
index 75e3d6be..0c98081b 100644
--- a/external/tbb/doc/main/tbb_userguide/Working_on_the_Assembly_Line_pipeline.rst
+++ b/external/tbb/doc/main/tbb_userguide/Working_on_the_Assembly_Line_pipeline.rst
@@ -25,7 +25,7 @@ pipeline.
 
 .. CAUTION:: 
    Since the body object provided to the filters of the
-   ``parallel_pipline`` might be copied, its ``operator()`` should not
+   ``parallel_pipeline`` might be copied, its ``operator()`` should not
    modify the body. Otherwise the modification might or might not become
    visible to the thread that invoked ``parallel_pipeline``, depending
    upon whether ``operator()`` is acting on the original or a copy. As a
@@ -115,13 +115,13 @@ the overhead of copying a ``TextSlice``.
        oneapi::tbb::parallel_pipeline(
            ntoken,
            oneapi::tbb::make_filter<void,TextSlice*>(
-               oneapi::tbb::filter::serial_in_order, MyInputFunc(input_file) )
+               oneapi::tbb::filter_mode::serial_in_order, MyInputFunc(input_file) )
        &
            oneapi::tbb::make_filter<TextSlice*,TextSlice*>(
-               oneapi::tbb::filter::parallel, MyTransformFunc() )
+               oneapi::tbb::filter_mode::parallel, MyTransformFunc() )
        &
            oneapi::tbb::make_filter<TextSlice*,void>(
-               oneapi::tbb::filter::serial_in_order, MyOutputFunc(output_file) ) );
+               oneapi::tbb::filter_mode::serial_in_order, MyOutputFunc(output_file) ) );
    } 
 
 
@@ -172,11 +172,11 @@ equivalent version of the previous example that does this follows:
 
 
    void RunPipeline( int ntoken, FILE* input_file, FILE* output_file ) {
-       oneapi::tbb::filter<void,TextSlice*> f1( oneapi::tbb::filter::serial_in_order, 
+       oneapi::tbb::filter<void,TextSlice*> f1( oneapi::tbb::filter_mode::serial_in_order, 
                                           MyInputFunc(input_file) );
-       oneapi::tbb::filter<TextSlice*,TextSlice*> f2(oneapi::tbb::filter::parallel, 
+       oneapi::tbb::filter<TextSlice*,TextSlice*> f2(oneapi::tbb::filter_mode::parallel, 
                                                MyTransformFunc() );
-       oneapi::tbb::filter<TextSlice*,void> f3(oneapi::tbb::filter::serial_in_order, 
+       oneapi::tbb::filter<TextSlice*,void> f3(oneapi::tbb::filter_mode::serial_in_order, 
                                          MyOutputFunc(output_file) );
        oneapi::tbb::filter<void,void> f = f1 & f2 & f3;
        oneapi::tbb::parallel_pipeline(ntoken,f);
@@ -281,7 +281,7 @@ crossing into the next slice, it copies the partial numeral to the next
 slice. Furthermore, it has to indicate when the end of input is reached.
 It does this by invoking method ``stop()`` on a special argument of type
 ``flow_control``. This idiom is required for any functor used for the
-first filter of a pipline.
+first filter of a pipeline.
 
 ::
 
diff --git a/external/tbb/doc/main/tbb_userguide/always_use_wait_for_all.rst b/external/tbb/doc/main/tbb_userguide/always_use_wait_for_all.rst
index be6f89fa..88a5b0ff 100644
--- a/external/tbb/doc/main/tbb_userguide/always_use_wait_for_all.rst
+++ b/external/tbb/doc/main/tbb_userguide/always_use_wait_for_all.rst
@@ -5,10 +5,10 @@ Always Use wait_for_all()
 
 
 One of the most common mistakes made in flow graph programming is to
-forget to call wait_for_all. The function graph::wait_for_all blocks
+forget to call ``wait_for_all``. The function ``graph::wait_for_all`` blocks
 until all tasks spawned by the graph are complete. This is not only
 useful when you want to wait until the computation is done, but it is
-necessary to call wait_for_all before destroying the graph, or any of
+necessary to call ``wait_for_all`` before destroying the graph, or any of
 its nodes. For example, the following function will lead to a program
 failure:
 
@@ -34,10 +34,10 @@ end of the function's scope. However, the task spawned to execute f's
 body is still in flight. When the task completes, it will look for any
 successors connected to its node, but by then both the graph and the
 node have been deleted out from underneath it. Placing a
-g.wait_for_all() at the end of the function prevents the premature
+``g.wait_for_all()`` at the end of the function prevents the premature
 destruction of the graph and node.
 
 
 If you use a flow graph and see mysterious behavior, check first to see
-that you have called wait_for_all.
+that you have called ``wait_for_all``.
 
diff --git a/external/tbb/doc/main/tbb_userguide/attach_flow_graph_to_arena.rst b/external/tbb/doc/main/tbb_userguide/attach_flow_graph_to_arena.rst
new file mode 100644
index 00000000..41d2dbd6
--- /dev/null
+++ b/external/tbb/doc/main/tbb_userguide/attach_flow_graph_to_arena.rst
@@ -0,0 +1,46 @@
+.. _attach_flow_graph_to_arena:
+
+Attach Flow Graph to an Arbitrary Task Arena
+=============================================
+
+
+|short_name| ``task_arena`` interface provides mechanisms to guide tasks
+execution within the arena by setting the preferred computation units,
+restricting part of computation units, or limiting arena concurrency. In some
+cases, you may want to apply such mechanisms when a flow graph executes.
+
+During its construction, a ``graph`` object attaches to the arena, in which the constructing
+thread occupies a slot.
+
+This example shows how to set the most performant core type as the preferred one
+for a graph execution:
+
+
+.. literalinclude:: ./examples/flow_graph_examples.cpp
+   :language: c++
+   :start-after: /*begin_attach_to_arena_1*/
+   :end-before: /*end_attach_to_arena_1*/
+
+
+A ``graph`` object can be reattached to a different ``task_arena`` by calling
+the ``graph::reset()`` function. It reinitializes and reattaches the ``graph`` to
+the task arena instance, inside which the ``graph::reset()`` method is executed.
+
+This example shows how to reattach existing graph to an arena with the most performant
+core type as the preferred one for a work execution. Whenever a task is spawned on behalf
+of the graph, it is spawned in the arena of a graph it is attached to, disregarding
+the arena of the thread that the task is spawned from:
+
+
+.. literalinclude:: ./examples/flow_graph_examples.cpp
+   :language: c++
+   :start-after: /*begin_attach_to_arena_2*/
+   :end-before: /*end_attach_to_arena_2*/
+
+See the following topics to learn more:
+
+.. toctree::
+   :maxdepth: 4
+
+   ../tbb_userguide/Guiding_Task_Scheduler_Execution
+   ../tbb_userguide/work_isolation
diff --git a/external/tbb/doc/main/tbb_userguide/automatically-replacing-malloc.rst b/external/tbb/doc/main/tbb_userguide/automatically-replacing-malloc.rst
new file mode 100644
index 00000000..30788422
--- /dev/null
+++ b/external/tbb/doc/main/tbb_userguide/automatically-replacing-malloc.rst
@@ -0,0 +1,22 @@
+.. _automatically-replacing-malloc:
+
+Automatically Replacing ``malloc`` and Other C/C++ Functions for Dynamic Memory Allocation
+==========================================================================================
+
+
+On Windows*, Linux\* operating systems, it is possible to automatically
+replace all calls to standard functions for dynamic memory allocation
+(such as ``malloc``) with the |full_name| scalable equivalents.
+Doing so can sometimes improve application performance.
+
+
+Replacements are provided by the proxy library (the library names can be
+found in platform-specific sections below). A proxy library and a
+scalable memory allocator library should be taken from the same release
+of oneTBB, otherwise the libraries may be mutually incompatible.
+
+.. toctree::
+   :maxdepth: 4
+
+   ../tbb_userguide/Windows_C_Dynamic_Memory_Interface_Replacement
+   ../tbb_userguide/Linux_C_Dynamic_Memory_Interface_Replacement
diff --git a/external/tbb/doc/main/tbb_userguide/broadcast_or_send.rst b/external/tbb/doc/main/tbb_userguide/broadcast_or_send.rst
index 68baa754..fa455b85 100644
--- a/external/tbb/doc/main/tbb_userguide/broadcast_or_send.rst
+++ b/external/tbb/doc/main/tbb_userguide/broadcast_or_send.rst
@@ -9,10 +9,10 @@ their output to a single successor or broadcast to all successors. The
 following predefined nodes push messages to a single successor:
 
 
--  buffer_node
--  queue_node
--  priority_queue_node
--  sequencer_node
+-  ``buffer_node``
+-  ``queue_node``
+-  ``priority_queue_node``
+-  ``sequencer_node``
 
 
 Other nodes push messages to all successors that will accept them.
@@ -57,39 +57,39 @@ downstream. Consider the example below:
 
 
 First, function_nodes by default queue up the messages they receive at
-their input. To make a priority_queue_node work properly with a
-function_node, the example above constructs its function_nodes with its
-buffer policy set to rejecting. So, f1 and f2 do not internally buffer
+their input. To make a ``priority_queue_node`` work properly with a
+``function_node``, the example above constructs its ``function_nodes`` with its
+buffer policy set to rejecting. So, ``f1`` and ``f2`` do not internally buffer
 incoming messages, but instead rely on upstream buffering in the
-priority_queue_node.
+``priority_queue_node``.
 
 
-In the above example, each message buffered by the priority_queue_node
-is sent to either f1 or f2, but not both.
+In the above example, each message buffered by the ``priority_queue_node``
+is sent to either ``f1`` or ``f2``, but not both.
 
 
 Let's consider the alternative behavior; that is; what if the
-priority_queue_node broadcasts to all successors. What if some, but not
+``priority_queue_node`` broadcasts to all successors. What if some, but not
 all, nodes accept a message? Should the message be buffered until all
 nodes accept it, or be only delivered to the accepting subset? If the
 node continues to buffer the message, should it eventually deliver the
 messages in the same order to all nodes or in the current priority order
 at the time the node accepts the next message? For example, assume a
-priority_queue_node only contains "9" when a successor node, f1, accepts
-"9" but another successor node, f2, rejects it. Later a value "100"
-arrives and f2 is available to accept messages. Should f2 receive "9"
+``priority_queue_node`` only contains "9" when a successor node, ``f1``, accepts
+"9" but another successor node, ``f2``, rejects it. Later a value "100"
+arrives and ``f2`` is available to accept messages. Should ``f2`` receive "9"
 next or "100", which has a higher priority? In any case, trying to
 ensure that all successors receive each message creates a garbage
 collection problem and complicates reasoning. Therefore, these buffering
 nodes push each message to only one successor. And, you can use this
 characteristic to create useful graph structures such as the one shown
 in the graph above, where each message will be processed in priority
-order, by either f1 or f2.
+order, by either ``f1`` or ``f2``.
 
 
-But what if you really do want both f1 and f2 to receive all of the
+But what if you really do want both ``f1`` and ``f2`` to receive all of the
 values, and in priority order? You can easily create this behavior by
-creating one priority_queue_node for each function_node, and pushing
+creating one ``priority_queue_node`` for each ``function_node``, and pushing
 each value to both queues through a broadcast_node, as shown below:
 
 
diff --git a/external/tbb/doc/main/tbb_userguide/cancel_a_graph.rst b/external/tbb/doc/main/tbb_userguide/cancel_a_graph.rst
index 4ae598d7..7c484a81 100644
--- a/external/tbb/doc/main/tbb_userguide/cancel_a_graph.rst
+++ b/external/tbb/doc/main/tbb_userguide/cancel_a_graph.rst
@@ -6,7 +6,7 @@ Cancel a Graph Explicitly
 
 To cancel a graph execution without an exception, you can create the
 graph using an explicit task_group_context, and then call
-cancel_group_execution() on that object. This is done in the example
+``cancel_group_execution()`` on that object. This is done in the example
 below:
 
 
@@ -81,6 +81,6 @@ belongs to:
      g.wait_for_all();
 
 
-You can get the task_group_context from a node's body even if the graph
+You can get the ``task_group_context`` from a node's body even if the graph
 was not explicitly passed one at construction time.
 
diff --git a/external/tbb/doc/main/tbb_userguide/cancelling_nested_parallelism.rst b/external/tbb/doc/main/tbb_userguide/cancelling_nested_parallelism.rst
index 6fc3ed15..904e41f0 100644
--- a/external/tbb/doc/main/tbb_userguide/cancelling_nested_parallelism.rst
+++ b/external/tbb/doc/main/tbb_userguide/cancelling_nested_parallelism.rst
@@ -15,7 +15,7 @@ canceled.
 
 
 As with all of the library's nested parallelism, you can control
-cancellation relationships by use of explicit task_group_context
-objects. If you do not provide an explicit task_group_context to a flow
+cancellation relationships by use of explicit ``task_group_context``
+objects. If you do not provide an explicit ``task_group_context`` to a flow
 graph, it is created with an isolated context by default.
 
diff --git a/external/tbb/doc/main/tbb_userguide/communicate_with_nodes.rst b/external/tbb/doc/main/tbb_userguide/communicate_with_nodes.rst
index 062c35bb..232c2b64 100644
--- a/external/tbb/doc/main/tbb_userguide/communicate_with_nodes.rst
+++ b/external/tbb/doc/main/tbb_userguide/communicate_with_nodes.rst
@@ -9,7 +9,7 @@ arguments to their constructor. It is only safe to construct edges
 between nodes that are part of the same graph. An edge expresses the
 topology of your graph to the runtime library. Connecting two nodes in
 different graphs can make it difficult to reason about whole graph
-operations, such as calls to graph::wait_for_all and exception handling.
+operations, such as calls to ``graph::wait_for_all`` and exception handling.
 To optimize performance, the library may make calls to a node's
 predecessor or successor at times that are unexpected by the user.
 
@@ -67,26 +67,26 @@ whole graph operations. For example, consider the graphs below:
        // even though wait_for_all was called on both graphs
 
 
-In the example above, m1.try_put(1) sends a message to node m1, which
-runs its body and then sends a message to node m2. Next, node m2 runs
-its body and sends a message to n1 using an explicit try_put. In turn,
-n1 runs its body and sends a message to n2. The runtime library does not
-consider m2 to be a predecessor of n1 since no edge exists.
+In the example above, ``m1.try_put(1)`` sends a message to node m1, which
+runs its body and then sends a message to node ``m2``. Next, node ``m2`` runs
+its body and sends a message to ``n1`` using an explicit ``try_put``. In turn,
+``n1`` runs its body and sends a message to n2. The runtime library does not
+consider ``m2`` to be a predecessor of ``n1`` since no edge exists.
 
 
 If you want to wait until all of the tasks spawned by these graphs are
-done, you need to call the function wait_for_all on both graphs.
+done, you need to call the function ``wait_for_all`` on both graphs.
 However, because there is cross-graph communication, the order of the
 calls is important. In the (incorrect) code segment above, the first
-call to g.wait_for_all() returns immediately because there are no tasks
-yet active in g; the only tasks that have been spawned by then belong to
-g2. The call to g2.wait_for_all returns after both m1 and m2 are done,
-since they belong to g2; the call does not however wait for n1 and n2,
-since they belong to g. The end of this code segment is therefore
-reached before n1 and n2 are done.
+call to ``g.wait_for_all()`` returns immediately because there are no tasks
+yet active in ``g``; the only tasks that have been spawned by then belong to
+``g2``. The call to ``g2.wait_for_all`` returns after both ``m1`` and ``m2`` are done,
+since they belong to ``g2``; the call does not however wait for ``n1`` and ``n2``,
+since they belong to ``g``. The end of this code segment is therefore
+reached before ``n1`` and ``n2`` are done.
 
 
-If the calls to wait_for_all are swapped, the code works as expected:
+If the calls to ``wait_for_all`` are swapped, the code works as expected:
 
 
 ::
diff --git a/external/tbb/doc/main/tbb_userguide/concurrent_hash_map.rst b/external/tbb/doc/main/tbb_userguide/concurrent_hash_map.rst
index cd8482ff..8d9ba3a1 100644
--- a/external/tbb/doc/main/tbb_userguide/concurrent_hash_map.rst
+++ b/external/tbb/doc/main/tbb_userguide/concurrent_hash_map.rst
@@ -30,14 +30,14 @@ string occurs in the array ``Data``.
 
    // Structure that defines hashing and comparison operations for user's type.
    struct MyHashCompare {
-       static size_t hash( const string& x ) {
+       size_t hash( const string& x ) const {
            size_t h = 0;
            for( const char* s = x.c_str(); *s; ++s )
                h = (h*17)^*s;
            return h;
        }
        //! True if strings are equal
-       static bool equal( const string& x, const string& y ) {
+       bool equal( const string& x, const string& y ) const {
            return x==y;
        }
    };
@@ -128,4 +128,4 @@ any other extant accesses on ``key``.
 .. toctree::
    :maxdepth: 4
 
-   ../tbb_userguide/More_on_HashCompare
\ No newline at end of file
+   ../tbb_userguide/More_on_HashCompare
diff --git a/external/tbb/doc/main/tbb_userguide/create_token_based_system.rst b/external/tbb/doc/main/tbb_userguide/create_token_based_system.rst
index 6d9d6425..26025002 100644
--- a/external/tbb/doc/main/tbb_userguide/create_token_based_system.rst
+++ b/external/tbb/doc/main/tbb_userguide/create_token_based_system.rst
@@ -14,7 +14,7 @@ a new message that will then be allowed to enter.
 
 The ``oneapi::tbb::parallel_pipeline`` algorithm relies on a token-based system. In
 the flow graph interface, there is no explicit support for tokens, but
-``join_node``s can be used to create an analogous system. A ``join_node`` has
+``join_node`` can be used to create an analogous system. A ``join_node`` has
 two template arguments, the tuple that describes the types of its inputs
 and a buffer policy:
 
diff --git a/external/tbb/doc/main/tbb_userguide/design_patterns/Design_Patterns.rst b/external/tbb/doc/main/tbb_userguide/design_patterns/Design_Patterns.rst
index 48d04618..5daa696b 100644
--- a/external/tbb/doc/main/tbb_userguide/design_patterns/Design_Patterns.rst
+++ b/external/tbb/doc/main/tbb_userguide/design_patterns/Design_Patterns.rst
@@ -51,6 +51,7 @@ expressions into equivalent C++03 code.
    ../../tbb_userguide/design_patterns/Divide_and_Conquer
    ../../tbb_userguide/design_patterns/GUI_Thread
    ../../tbb_userguide/design_patterns/Non-Preemptive_Priorities
+   ../../tbb_userguide/design_patterns/Lazy_Initialization
    ../../tbb_userguide/design_patterns/Local_Serializer
    ../../tbb_userguide/design_patterns/Fenced_Data_Transfer
    ../../tbb_userguide/design_patterns/Reference_Counting
diff --git a/external/tbb/doc/main/tbb_userguide/design_patterns/Images/image008a.jpg b/external/tbb/doc/main/tbb_userguide/design_patterns/Images/image008a.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..f1199dbaef58e49168a2d87cdeac29c9139097ae
GIT binary patch
literal 30488
zcmdqJcU)83wkRCM4yY&*q`E002}Qaz(JdVT0|}v{bOND=UMyRrBOo9xC@my`ASEC{
zK&3YkNGPHAUZvL;&$;Jp&pG$pci-=O_x<sW{F00{=9+EHG3Q*P%yry%JPNq1sj8t0
zIB^01I6?aWj>k{l(s=N|;*p-Ns>VZ=za*Sw1<>HsZ2$o2?CGwj_WKP(BjX!CX@7$!
zRvxZ@!~c_iTDe<2KT8Jyx`qFf^#2{{ytR#o744=~+Sk*aRynP))-;^i?ytDdPu%ja
zc;rvq9jf<$cF#K+e#`C`-0~OP+tbyPc2CpK`>kBvf8v8QTmk8X`dQac_}O9x8)uk4
z?cb30<p6j9^Z;sr-)Z>&Rrr&iE|~zpolO9M?)9HE%VYqc{3QUuO8t|@_YMHK^alV?
z*5UfZ{mEY%bBgwR($*FLSjPYWj79*!)$ahn1(Uxu^v}G1j>W&}>kV2S4q885XdgR(
z6Tk*=1E2wL23P?^XqY(QHb4v@eLMho0H8bh6Mp{E(csjXQ$OL{nKP%)oIiKr!ufOO
z&tG7;#BhQBBK`UEj7*FdFI~RObom0qm8(}SU!~!fe-?7$XHL3P=V%!()1RlOQU4F&
z_%nd%+=*7YOu7?1fRjuo=$K9%*8w<x$}X*4C;r9&0N~u2v!_m<pgVt(mTYzzK&zOR
zewKlO{@jU^XKBNIlJ3;$GiRC3UAg+3*m-7Fnfs+(Ko%Zxh~X1^FYnxvYu9-N@4(&S
z6B3gqC1iisGcdAz_6F0*_dwr0_I)?mN;!`IrX=e5i%eSa%s*$;Kf+Hc)4x)w00vqc
zPcqRl0h9oHx&N5w|Ky7ClG{YdA7JgTxfHkFHghx~+OE6f>Qu0#yI4!FRA3AO1mXz3
z^o_A<^=;uy_6FeH38kGNSLDhc^}&h)?-Z2oNN<0&tU<?rKl$|3F<@->OL_HG;K2s^
z>FUAgz{vUVBR}1H7XVj}0k3Ax4DURI|LF3gtNro9CEzA_cTN#-3!r<%oyP7zCT7v0
zF?;F%RYe>T-kfQ_nGu+K@LtuHn?O{&IQm>NcsDzCS(S)g^oPMNGyYsR{-@!j%(DMu
zLy-rW{lJ!Ez{@@Y%DJOhT4*zI);88SA-Z1{O)-0o33MneTyqEy3d!9#e+;Oo8W*^+
z`?*<RO*5ZCzb94m7;x<^W)|Uc&#&9TV!WIAkWqW~x*;9&W^PwaeXighTk3bNQYw6>
zv|j0fzTX)GK)vFh1)eRCPB;=4)BR2!ewOf5OxG9*J}|b-c#o|*v7nt39Pv<pLrUhI
z&Ex;cnoe3S|1oMPqL}${v*pXnzJdf~M^OXchS%(qST<tRknCHs*_-0?aMFWu0q)(;
z4F_xQVE6u~M}}5Dzs~e_XxfVzI=&zEpyErT3&u+%tt@5(quXuqw<>L^m^W0U^uB;E
zUkqB7KhIl!0dylQYIfXjxo}ClYyk{X)UPC&B2qT9d^gb;z6x#U*<8$fJhG_h>#kmI
zu`vic9&&cwU21S1w=IPukGM*VTC%~hJ)GvX6YXv|t(Q^^M3konr>B$kr;Q)gEVwML
z$$m5T1i9^geNUBnIYX&qfNplzV7w8+wji_KEtvr6FoMxrtt578?qtWEn%;Wo8Cy|=
zTmP{My4e!`zW9FrZJpm-^N$pjQU;u>AZl2H^WyC63-6)|4Ey?q=Y4^3@`;|-c}LJ`
zM3z}e5;6)6;5-wYV!SbPu6m}N<cD3_*{t?YfO_UT<_18-%qJ~n+Yy!4^D6EFUqgT~
z3sLL4kp{Lv4yAeR;{Ma=E|P>KvLBWpG^tk1=5uTLs^%P;vL)=nhE{=^zmtA<+eseo
zB%AB#_t}1N8%JO8yx)mrP+XlJ%WGuDp26YIOKIly<%mHLnOLyE#)%s}4{g6Bny;2o
zSIQj;iqV1b@GlPUjGM3P%yBh6af0Al`PNCYes`$#BUxVa=_VmQjG}7w(%kck^AmAn
z$w3k(QN07V3Z?NmQXtB}M4`tOG)`wbFHz)G|MHYmw7;xbTOG7-a5fK15}AGH3m~)h
zUZxo3s(6)HvT^3II0nWY1El56{G%QDpb+Tq8`g!BDdR1#REKuU)nP4Y3a;uNauqR8
zxZ$?or5$aV6e%NGW?&<$;sr*cP!+F>jj#^cc_=+__7J(yT4ypgZ_0gX5h4R^k*HEG
zn%gr>_Ih57!|;C6Hxee7I$7l;X4=3;>}2yIt=M+CDwm_I%2do^9|-cB&s_>l3!b54
z|Iv{8dwggmxR|P7ypQp1kOfXp!R<Z_u0WYLO1E)Tucqw>x>vptAI@0oRm*fRJd7<E
zB0vpRGC%frEE;EhMYE(&MB<`D7SbnToTMH)3OrjXoQxARrnpNj`kVIhfO41267=)w
z75*PgwX<zibYDss1}=9cj-zDxi^`T<+7RGEFHKeiUuj(_B}&7bcv+i{ZAP}}hZbA8
z_aeF(qL~VFW#~$U?D)9gl69O1F50=_Ny7{Ff<2l(+=zTf?nkB2)h}0>I;@f2szVgx
zaNN|8pU5v$`ompc2lJH4+szngUr)@`$D?dx@q_2ZKVHMFD3Xy6{WKhtGUKXM`8-s>
zIWbu|8o;I*zObwM{mFO5Fr<>aG@jYR4E7I}vcl+EyF7d|QpSX+!c0s;c=|tfGywvC
z*XV?9#N|7yf?7Gu9Ey{~x-EBtWM6htOo}29kGgu`P}7{3#Z`+dVZ+6m(^(0S&>4Js
z%TQ`%0^};{q-giTHDAZCKHvs%Q*)DR8g_-jfe`T2+-Ug&n>_2P)n?16PIcU@@3=t)
z>tTHQfCn=daW=#o+q(y@7RD)ANp6s<R``_ytlc(ZreQPG-hlG@zC83dflB-UviN2z
zu2w8%kn}<xPb@Q8B82+~a++lOZCrjhEoVSXUFWH=vR$5<?yqzyoArL|P+;`6*jVK1
z`rt)DM6t<)*ahktxkR~^Fg(VPBdm!UHjgl$0cG;sbuh1n3x*7rmOnz8-n5bS`?M|B
z<}AahgaQgbpFoyn%^|MEIES;&<~>gD80m9wnq$G2q~_;*=2nncl1?F1KEk?JF|@7p
z%9o)n$*h4eX(_lK)p0{ouL#e)WLXyCgWj0N`Ze@*dwNEV*bEzMc{Z=6!+MM(i-*kO
zCbtf}Sw3nw6Zv!rgs3-H#12ntZi&s$jpwN@Z>YF~TxuXX=`wvGa>?HP1IWSh`trRu
z^SRo*ewya-+3Le}-n?5u^ArzQ`?NbxrtH8UW_YJhL!PN&57G5e)?S0W{Pox>EoU`*
z+`CH3q>BbS4-stKLVOuMFRdE0pK2Pd?q%f#HbD!<SyOFPqV=YGBaIgq0_FKX4)A2f
zdHN}bZh>Ik9o*m~PuT2k*&<Y*)au%1Cs+2xu4M`N5u)GIZF-$<(x0{D3$IPsH&vWR
zmU&NQ!T`}ryHjV8QT}UBq^&V~j&uO81lf2oju4XYp+LMW{*yh7Ya6707o>jE!>lbF
zFJ9%XQ}DX>jz`zfz4A$;WfhN(l6>dq$OoScYNJU5$mr)|I&*9Vsp!m?6rE`0Bd7<F
z#l;faqxbII$wN#(qqKIE>H3mDOCjqLSGkRhKT(o(3g)edb3{F0mwy*6BWKS=P*zs0
z;2(+2+jN)muM%%q>5I0=iZfkgVeq(=M;0o3Xx{0O6DUb$mST<<X4azX<kpFvO7HwS
zUDR2$WCw;xYrUQ;c6z|s_W1n^p7H`MWYPuy9QIVn*VPyD%-T7k0-PP=ZH9m{{q1n6
zrUIDCIodwwa^0(9%{Ap!zEAZ#D`}2v#e`nWTZ+LY9~-_BS%P(WIB9uv#TMKb-q*Q~
z0fBg&a8)-6<hK<*(t$83$qy!A)RtzdBNs(`E<HHDUy5Z{#7}*4ha=<lp0<J*`2oMe
zr@=U);W8Wyx6w|r(J4K^_NbfsjvFqYujS%=HSX18vUDwN;(Bg&uH)cQv}C?cuOjRl
z%#30>1^WvO(*IPX{-@y-c5ry@>g#|}YqU>}fo6L93X|;FZ)Y@S!eNj9vF=}=mU5t)
zRbAXnca8zy&dAI}oy7g)t^XreCw|bL_=Q!+FTG+=JqBPB2H6oJYF$%FsiiU(&SSGe
z3=tsHEvFc-!_;6hb(mFdVTGPzvE~^R3j^?5FmR%_U(Ofqkd)MY9xoJr5`_iVckZcZ
zLm;{urxK*}8yUo;EcoJN*?OepVKBc~M&3LHm(}!Kk$~$uB&&<KC|@%T$2^nt-{p7l
zK#=-$;pfSFw}b!lQq^*NW?Lj&D(o+vqn4z390TZFD>~I46WePn%Wyex{LoNX(L_8+
zA8SrU@^!X)*0ekI?w86RS!}_PheMD34{oD+hgonn<FkjnC%?&KN*uDk<&e49+#h=7
z)Er8+@)PgN9jOn26oV@mdOxe(Xg^x0JA2KKh~_;8gp@ym7uO?Fho-Z0RgRX>sqFN+
zKD=W}T0OFEiWlnlr$x$OgV@BWN4>$a{5T^n$`0hw`Nqr3g)oGYdb{Kp9aJ1^h@)%@
zhQZiCq81WkQL|yI=(b7{7S;Xs3Q}Wq09F)4C^vm)>{D|ju5}gCyqZ*c`MwstAofW#
zt0h7zwt?(uOkPx0o>x|Kb~LA0QKM;7Per@)(K+_3%SHVX$rD+18)r7%aY<CY`Zv@#
z?;!O=Xz*cF+BY$&Z>m}SpPg~C1no{eLKH-QXsdzTaYtt?OJ7cHn#3M5D3BWDS4Pcz
zjvYA$1gQ519|Ke|!5*nvMHsn2CW@J17naF4>jitOfU)*rV=bi1qkMGwp5iaU@Ot%2
zuZ52}?idh}wGpFMaMqJWcW+fh@I(8(+!z9gV*$9LqI~3tvxiyx9RnP^6nuVPt9ZK4
z`DpYjM@pR1n8;f$T}IV?uXV`7bn#<=|LcotAs0#eUpL_gX585dzl_`um7$ws%Ofz(
za@Z2viyYLtD3AWMVLA--V?V8vuRwVR22uL0^7h>u8=_D->AB@XOP1Z7fy9)MwNnY_
z@RObjL%i@&gUn|+0lyRqbGx25cz=yEw9j+>)eEFbqnuE2yI0DXg_Pv$dPYSp^TW>Q
zk&@s&mYx5RDfnlh4BSe+!fai6!-wh=1vtC^)ztSDW=}%wf?Kbqf1BE23(t+qTMo0Y
zU-!KwX>pMpWrDX#R4igJ$Teg;1}wG9DK`)m2-@B2&-9+dHhU(vA&Sv-wK_lyvwQGa
z3$%5s32*Ab^5#1opP|Df(B{_Wr87Dp6kY#<09!v}b)1EZWA}ifVl2-#Bmv(cQ3H<8
zyP(V8TBIO8xKRBhp6Ub@9!bH?m;i+Y%bizZn=-Z~xgbNA$24nQO@J>Rfh7F9Ryqf6
z@0+O%8`Vq(2pPhEyqaNO_IAbFeJtCL8>LhXE#R{&re*w6ON(i1T(iaZ!s+(ih_Sap
zOfFhFEa66r%)$c*M>7U!(aj<BSLw{)zVk&snd31^TWn%qM07Q@L`zAC(^Pa_UwqRH
zWO)~zK?nC}EO7B;fgC1!*99@=zHvVWoPY3q!nrWn=wNu40QGd<Hmx(S{+3w)(EQ*n
zC+UA9J%KuarfFgnsb-#Xa0`z6VK3&#Z_lh$%YzzlxFCHmhplJ!(Ql-cOriwp#rmzZ
z<1(L97*H2?%w$B>r*=%I^zZ&TVgNs|y*&Y1{AkdA6qlR)srZ4U{g$F)Jz^8Y2A3ZV
z{-Z#Bj`NK@7k{@FsXB8&ZQg0w0%e_TIE-J#rPiGg2rS$aQd>^BURPE$HzTkLy*x?p
zMl2Z|PJGXj>hf~T6+Op=-keD3&hf))vFv}sa3{7KZ23o_uH*-d&?mWo5<*XEuj0p3
zPi?W)e{L{RR0tX#du}dRhz0qYQVrIdMw(`vy{?JO30xo&mx`xl6}JJEm1RRohM=YO
z@}cQq-c08a`j*gz!jH>JZyw#H#Pt>QA_NtQQYbKp$9u}E6B0aoR_i6AI%)o)AOu5-
zikxgS_~GJEdEX!}<AUlG^ysJ-ED+gSvHfMsL%hde_GMzHVMGU~!QDBeXc%pf5qj0q
zF1yCL;8FSXF?7d+J8hIf?d!daz-63J$jGISk(fNyOqo&mEnp}gC388+VZ}^pK~2i`
z`Q73DTx`+c)ImD;zJ&LVH`jG)#~=QTuA}}?p|%*Dahr~2Kw>iXU|a6A9dAH2O!toq
zO;>IChnUCCg7BLljDf>iYATFf>Y}y^1QEyL9}}?Xq;U)w&fRN}cqlLZep8pBRj7AQ
zs^5RS*8&JN3q-fbfPx1vPX02u|DRDhLXEZ0mat3Uh(L`=0kfFDA8s#Kziy;u8^;q&
zzF2p)On>Oam=?!J;pkp$ew!$mq=KxoxBJvCj){%VwaPpO;J?oW-1->Zp%@+Ms{ghu
zMJIQ#WFcKzp2K0%uN%}X(LJi2<l=fE@}Ox;xls#DZ4d)~^GLE*)}g@or@E_WFTUTL
zW;?`CtuzG6a=sRo4}pLY2MKwF?!4UPj&Fx^7MZs1dRFrJBTzMvO(g@{A+A~X0Nndq
zDJw^E2%E5c=fi+1huwP}DEdgkwbBaf2#H<=y$f%X>^eJpasu_?gNA}}8cf09hjg{!
zbIFIT_kD~h`P&&g^ii;aGVsIUX$lIFv2CZvo}~LR==+kOdasUT($&V?C~3_UcBmLx
z^y^%OpPJ}bg8t(ZLIrA`j*yzC<qkJv26C3>rt_MdzX$0k+kne<0x&N}Q*XD&XZI3B
zP!<wu#{fo`QdoU7by^p6HzfgwL(i1_jse&o&^;Gnmh4>2Ymk&+4K!g%2aCK}@W86=
zn#WP{W7I&qkVivrHa0e1t7&PRa;?1ziEU(u6j<pOF<r%8-uf>GT#lh!_k+-0{3nS|
zH^0PoEwz3hD)>Mtaq&nrs9<D_-<G|jR@3WOV&CoHMqdIm0EY;BV#~Cy90Q)jDrM>(
zeSHhi7(Poqe6g>{Jdpvhw~X156Y7di<qy+8;#SCO6sy+m1VS#+2QDYht-u=3bRHUI
z#!w3~ryy1zTQUY#Vz#_!8?22q_{OQ!v60tfBObkXnWSD_Pz|OxyYFPPJaDP99d@!D
zzb@r1A;cbozASZm2~*-&CjUThYSP$$V8kJ|@W_^ei~<g9qCf}iZ%%~F$cbgkr8G)F
zBx``pu;y~buFlgBX|onQO!0t^si@H1EFE^*-eX<%0vB*LM4Nw{7Zh;nR9ctC<<)G;
z{z3FwM!MD!yUcIXd%<&ijpTZ2E;b`(ZB*95#xr-NmsZ6tkL`%9p`Pt4@=ZM7bkB{U
zns~IHRvgID<+)oVovZ{l={aqAUZ$6wB!j`1nba<)%%g<NsR8o*aTK|d-BwO_QHio6
zE&T$&*MT3}tgh~(D`wApm`f?yF&;=1-@`iwQjiZXEPLvrSWjCsiauM*_?nxu;Z%p3
zxt!uqHamw0cRhc<u*@f=$Pr$1R<J^F{s#V8f@Ddfq&ShInb%#GfY<_oP@ofwXMh=w
z7f<ADx0yGihx=_GekEw32xWL%Jvm~5nt1X$ZiypKCf%sL#I&fQGAkj<3-Moy%731C
zlDpA%{1{-4DmNB-E6Q@Wyo}-OEt{0*16y>Cl`dCDokFXGKE=$#pj(<#7T!&#Kc9zx
znTYOK03HKw<sSof&%S8n%;*6hL5z+8>nC6*VXHn9C42S3Enuai`=e`(cAMeHfHwxg
z2Tx)55(2pHEFKkEtcQ0T177<mxb+`e)=U92jsZ7-kN7RlM$0SZ!w)h`jscTgmpHtF
z4GVWw?2Z9VXSONrkGl&PzJiJL`s)Zs;gpxsM*L=zXqbvYErY{iPV9h48v?Wm+N9Z?
zUW~Oy=YwIZ0jY+YO8gCy3(Rr*!sRUQtITd-@F~&f`rGwE6-VDR`216wxn_qW5`e9h
z>A6z-6)y`9euv%<B!82#NE{OWASAu#*Cs9>$f1rWEw&)gs-Ru-Sa6c{NMJltEAy}|
z8obf^h^NHBni}j>tlg!>rLX;pD*mdgEi^53mf%(oxoTF7ku)77K!;>u9ruVh|94bw
zFSI5n&j-ZCe1nE5tIV%!#<-7E+EbD)*eZ;Dxq>S%)UV2GXNG*q3Nt8X`H@j5-ObeF
zAPeJ>x=adxhUaD37YRO;*QrhoIl41D8l4zVV&}MAN49or%)VwzjMAx7){s_Ktp1gE
zX9ayw<0VR4#^nvLo(>Js)x-jYB7LfyDC)YIsD|7z!0%?`-TJ}pvF9P9t;<ishENwa
zMvxxuE-<)n_AwwiuI9aY&5=azza3V+JJl?&9&c@wjv1z>a=+Iu%O!qS(YS)_U*tsy
z97a$6mxKPBSy1iA#qUFGtx_(vBb1sVe}DX;?q)$rw|B!g<;gkUjOKxXmYUbarRxh8
z0iVTEhkAn0Wn*@kIBZfv!AzpM;Y_7%CXX`?U(6%$@yxydT*m*2N|)cf5^Kdu8Q?>o
z?EvP6_|4SSD|-wuJNprV{y<3Om7w1mL-OqU+AGCteR#<O#KffwP>4ZykDic611>Kb
zf!lHp*JmpkFBIQZa{J-H2>Z-Eili}1U}CTFSvXDWEdK=li`My|_N-aem@)oHB&G}W
z;S_f41z~u#0Co&uQJcHO!0EO967d&B75DkFxo;w5-dp`(yFx9_+%72yfeQ!Q1#E6D
z$$P~rRWzjLb<R1JR9C9`$c?|!1f_kNU3_rITI|O@!FnYD$kIZF>Iy(MAD>vYh=|e}
zM@%8#eP@Jyn(?-U!S4H%8H!i(S8S`B*Ck5pw1mS+-uRR`qmq=+N%&G<j?x$1%L)N=
zwzt~AkR4O9(>_a17}f!Y%Z__Kq1;Z&R3j7R$2rTU)SRX<Rtb4Mm~KBIM~<=~eBst&
z(14aF32Z<ryP)2$2nRz7=B$;cgPM9WJwS`0VUzMV_;r8j<}aL4F#sgcbf|%0;9s=g
z-+tu`(C{S9_S);>WAIny?N!LdO8>9Kzvx}C$LIBbVJa7^+|tU0|4{y)@@omOCwmiA
zftZw6U%#PV1f~rsYLpK;Q=qMv9!A0o^?@)iWl%9};%s9fea4-uyQ$%M|0Em#_VNVC
zHE?1eTq*6GLOacRlE&?`H6Al_@{)u-@TZ^tSD?AsVmdw#7~Iuu-i(wc#QWfDgLDTz
zQ6*q*yF2WN#^&9-MIn?f7od+z^S*bgD$S|(-vK&iN(Rt3sd+ypRUJV9(2Na8fn6o;
z9tA4t--zP9e=at`=gZo{*O_mpj%>$q{N}d<{8lS|JX1>kh<p0axBk29E10vxiXXFf
zKfh?B!tB}>Gk8f>z)$MECZhd}Iq?gLU^Nq|=QzTJxm#0->GAbf^C%#o1zW|ZB7Yf|
z5(w<krQ92DJlbMT)t2Ty-+tEPXv$1UK9X`uckv#K8!#_StUkjd)!R3jK*q%(h1{g_
z6F#-UiQdprtCV9v#@sg*T<`wj^DMqvVdHm+n$-FHXLI^?Ie9i55Mh3BroZ*Gm}Jwf
z{15AyxT0bZ?u7Ysx9)QU(suZ~&V6?>Lsv>jr5xdXW=@e=`h7)3AVE2I<qrRr$g`Vq
z=ec<&JY8V1L9^rmq>B?df8<=}fg_k?yG^YOVaKiYiEQCoBTFb<CXRS{Dj4+@zA_Sj
zA7~~|GIxkItuxRP8RC83bB54+@x~hG>0Bao%F}FhpmHjj`xtQBaLFIc1oT@bZiF5K
zoYEn9ib7s$?jahDC`f{rcA4(8hLOqf#kgCY<t8XU;@S@>m_Rv{++AqwB@KhFXTkFr
zc9?q4CPk{<>K=6DtF(|J%%oO#!(nD7-XCq2OLTdJLZ_^WA|@t>(Sx7Tnn}*&p^Fh(
zn=VjCcjRq+_n!Z>W@|{|AOUaJ;vwq`x*0v)utAh^$_>_15|A+5$X(BZ84eAet~-x8
z+k>bIq6FSeWvd)2TDbZF^a)o+ZT7W6A(h*+qXl6y(aIPDGU1z=ltt50Rk%z3;<kVK
zh{2B`;P*o)nSC?k>X(JFwqlbq4Y={nIvgZ?MX#NgB<K4!D#6AEZ279+ecib|h2^qT
zPz+*27ISeYx@36HSyZb`Uc)m#{P~a~O0#Kppo`CQqb;CVRQjkvS~jq*Z+?R=%<*EC
zU&ZM&{BivVr)|W(pZ8|?6eDdfYl+Q{&{q_Kh{Ih--QYw6R8~Cp-r&<1unTL!kFY9e
z!zRyu0g!oXckx3%)(tdRam#){m`x~c&er?>B?$@#UKF%dXgiOR+r`QXNB>ASSv`0m
zk)2<HxR~*1ouI|@g%2okzw5p(H~3n591&Jb>{5>dCzut3-d$_rH+wivce~oKkP0zz
zFy)rEwXv+j36u`=;iGO5M6AP%v|!)A@S1+eZd-_owvIAOfH1WV%)tDrY{qM~=A7BW
zI>)?|38kfmOVu(B{nr_5GBAXMZ*Zt)v8=BVg`FwNt7Q{*Z*k|~fRSi5d5~dPi<pxM
z|0FYcSlOP%C+yQwxEUbs=72Fe{k5!SQF=_y1m_4!hk(8tG@dqv;D<;{>{E%-L^w7d
zA)v<tT>kr7bX)wxznkIzKxfU(-@&(4>kbA`f4?)PrH67BmL8i?-k>gp_P?*5Yp=b5
z`)DB~C8H)qCc4)3Wks`5p~~)15DuTdq>s-p+O(@Tw^<LGnC@a~ykIKbPqfqi=u385
zV5xI=QseGUeVOYITMtVh7*oSPT8G$=B?_pN7%}G&;Joq4OiU2?<9F*-P%^_Mp?9?|
zMt3i{f4oT_&@}%fq{B5k50B6C)Zln6k(0uTjpdt)je`o|X2gsr?d2vI4vWXKB5(Dq
zlZD$$D<lmyZKXDZh&_6G<j+ml`BvViczL2AMIDYDA6i9uDwtZr{XL>No#BewCDuL)
ztW!yBB@Xrb^tokqz54tLlxU1`Q24D(!+tt;`dBY0bW5SY;%0WuYC^$voy6~ByA*SN
z`rA=rm6irchG38#dc_2;-jt|eBFU7a;G|vw37xALob=20cRx|OZl=|{FC9fC2F<y5
z3mJsGVD?gplb%vBF~sZTYg|`5DV@pu@>4`pN!2>8O5fgVUOru>cOlU(&*w<gx2T(n
zl~A~nBv$<UWN={Jq@Ot9d;&b-AYDq1Xxy_Y>#b8NNywSq!nr|WW~atmb;E}@5-E1s
z6+>?9)oL*NxFt_3rhFUy(f8QlTQFP%i^1}Y%7C@BlR+f`(r}UA9sNA~<<1$jf%uZ{
z1Bn?723G;S7kjVSj3Z!471D&QWW}X|i1L7bBa6#yjL(L18%m;(pWOzk<c;SFwoT*0
z<8me4ohhDrO*98E2;`h@?>VTB$W_VNlh;R&ij+VHEsT&kS&3ux^H?Ae26@m0=1G)M
zWGeQ!*(DQ1D5+@K&|+*`(YILM&fi1hyoiKoN*>FCnK-Y$^%N#MKm1xD+?W`Ot8yfz
z%Uoeoa_iCN#CC(hOD*#$txhpob;TMCr5l?N4KSa#P_!TE&LFy(B^ll?YMjUE<(A-h
z^Nqt{qhPxfw>BQ3H|Cs^ow2Ah<C6Wd1ST%X4z?=DPgJYmE&=8>5C_29&hzPa+3TI<
z4kpBFQ8!8SS_QJLMPNl0;auVdzMX@f4h*99c6Yb)#jlrS2dE!qTfrbY&bZa)@IlYS
z35*~AA7h5la&Q%4>JgRQ$&2bx*+URCE#{XrZ$5~vD1ae0aW`kvZO;acWf&ErDyDhn
z7ey45lse{$NfF@&6hF*;HF_-iLvcpco~%u*!!G1d(&37z%n-cqof87-+O{xFUWiu2
zpsw>@<o0{PUi950p@=fL&~>XPSL0^vAqR9Z&Q{F4Ku0+oUMT1OK6KnvXPQX5pDS0C
z)Gx$*+s4SEZ~FdenTOMz*%XPcZn?8~66L0~uzLlNBibxBT|HUgB2=fL82RM0BTpQN
zYTA?ggIj%azl!rK>vV{1CTjhMXVEftDbo+NRDt&}`>knBgnOg$RYVT*w9b7WvgY;O
zSx&xKegzh_!6`rRTguk$`eGcB2^dgi^72W7%{3tbHj>S*qPMTH5IL?F4)xTH&wMV8
zM=u-jR1ENd7Rj*f%i9q1TZA4t|HE8sbX-|%!kaEI2RTlrh^x^lFFZ9fb1^U6GNm>%
z1xe_8X>c8Tr;0SEEqPT%TVD~VuqnOEXIW&I6VO@3lfdMM4kJ0elF%*1({%;>t{|%8
zW}+Sb{0^iL$;cpCwFXj+G@4d7?5T$HLQD_KVRVM8KT;Q#@nc?`u;voRyO^S(E4fDb
z<U22&P}){}aneL$Ohr{_Wf1}HO<GQ+X&~Wm(em|ERE9#`rCpRt$c$C<>i+P33$utm
z!lrw5W^@@VFH%^EhnyeC5hoP-L3W_XG(1uT*5>0r=6Jp{lIwetqS6<ArJUzDxwhzj
z#H;FDqwLs`qk>LxZ|6oSmS7L(QmJp(Yo$LqM0IGdI~naTj@QuFiN0Mza(-Pg(qL33
zQr2`D8zlt!p^n$taQLhtm@E?$XP2aORd1+?O%VKL*JEH}Yqe}ZqsaAymW7gGa>*BV
zJ^ojAG70NiymEsPC02f5?*;9^&^2Lv5(#w8w7@Xi`{DM9k9LMgAt>tH8?(itLZ6<(
z0QqXug1l!2h9u^Zbf#1RG0I~S-x3=+O6F@ZKFu5C^h$SyH45gbJ&PT2NBwTl%;DsY
zBND9U<)oMKtyeZtf_+wgN(uHunHdl%gN2w@WapA%g_Qv)B2c+l+ZE%@I|7F`*0MWH
z8t8rg7A}<_1IH;cLEc$XDS6WE@RpB~WW2nu{kjvj{7!Q3qMV6eg-LHO8HYWr$K7K|
zySw?!*oUoNTs;-o6T|C>w?u&W^qYU*<*FMg?5mhh4-8Z}`iCv<zq$x5)zvIovY-U<
zt+gc<PiSi+DV0)t0^ge&6e-LQnvQQ;Xw_+07{$~S8jh`QiRdxO#(vq3alUordgF)m
zvuY{$&+H#e{+7FHz@_tUh^p9fUMAK?S=+rTM#ZvPQjLdZx7Y`X8a;)(#{6MgEZ;s{
zBHhkcI_axmgq+|sZn4mJ#Ag~NGP`@%=rp~ZHC$Gowp7%2kW-$Qc}=H0O63kF8cXD#
z(Hc4iTrJm1CR^`J{opDLVS8z#pQ_Jm+Q=6fEVP^+9qnVrPAxEpdtofnR!4W;(sXs)
z8U_oQfxA;TP2P?;C%oRKXw7A><Rn5J4SPu%?=ex=8IV@SVT;D(TaN*oF#TdeB7zpm
z(wyb#Y_OFHa;gj_Z#@-bl<8)_m^4SkYdHbEFGRpHV>cdY8}V{KnwB-i5j<FXaQpm=
z2mw1tzJrfk?c&Bxm!)x1h86K+uB?8<quzn}Su^k~CL=c~$B7)Lyp7vu_7*78Da({)
zYOcA*b|L0f{b$srOWM-e*vz{3U%{^ak>8<3j`pn4*5m~3I6F|);GvwXuQe<n(ml6n
zO74@y%hp#HjkV$|Ny2E`WOkb}(<>t}Lk6uJC>gd89KSLV()mC>TMZ;C8IN;H1&OpP
zXWwJ>ike%Jj-ONI&3zN2))?78hx{~K`Ga(;li<Bw0Sx}s<kWZgiZdiLgS*&dDHcX<
zHGyz)O5AWFUJ;dyt6~j}_D?GKW==Gx$OF#sMmnUwV*Vz6a5MzB;IEa8i`Lx9jg4T?
z(!Qj^tsGkC;q7AlLv|=I)r(cy_iJv(JkVCx0#!4);V}ir^KTVw0A1^55l93DqYkr#
zS-}j`_HmWFxNeW90uL8L5D~UO&rjnl{ykRc<~PP3=bdGmvFtDp^s_bMo90e6U2S^5
zGu6_(M(n=nZBs+06VBFtj#jNDrt*)RQ7o(?cdX{8-ai-QRY%Xi^%J~eZBSuW;xB7D
zTmyQa^pwZ>w~Ze>^*hk<c-dC_$*hVQSOWYU)&j!Odiu2d<D6_Adx~*dXKmN|GA>=D
zwRkxU?(p{~QYkoh#<Q~gfQ<MBR;1a@HF(HDM!9e4W1GkS)g=3SnwYlH8az25<Ku2=
z2yXP!s&rRy{Mw;aJ05=*^g}d$n_K!d#q`9{8LIAjkW#)6^WQW62XY=B$<6giBw$o`
z+8LDj|2H*%=z2o5X~yMhD_5N+{z?;sy%D$*mhV|48#<-DqzrdfCq1bx<l0ktYPiwM
zIL`7gt9XKpRa0(>G<L97?}X_m&#zcl;x?Z-oP=$DT8`cyFU4=FTB!RCd#eSm8N>Fn
zM6*vr&%=9ukmOgwy9z1S1Akla9pc=scYx1FR=@sfp*8t7yHX9-tby8WyegRS^d14`
zSm4C>?!oT8*o=qxlzyjI!poI6*oOD9ZGlH~l7K0iEpK#pBp2OV1uP7f5ShL(26j!9
z5~+mH5m$LSNajfc*D%8Lm2iWJ15(c`vtIYp57}s)#w;K%q9^ZNpy1iow34vpS@Y=0
zr4MV@V`;u{ib6A^i2fFHxd{iZN_!fc<42P6j>U6J4>_y8Im52eXr5^(xSn<?LJ`=6
z1Zr%92AuEAhniMHr>!Wo<-}Oj*cSpQdIsA2rQ3=w@>$h81)xJnQrAh`Dg3Y9{*_f1
z@~#yA((MPou<8cK<DJbhkC~If5^gZ2{X2;9UKvWD^fy$A@dqsmM%N|6FC@DANn)IX
z>1?8mz}@-uh$*3emfwGSeQF_NThZqpg`;ID?|M(HA11gODhvy>z;CPjIl!2JgRxLz
z)V%V%Bjm!Z6QDzUG%cE*DMO=>d*5ow)Ky?7a!=dm7%%{OcM88nxO4SDHSp%A;H4O%
z+vkjNi8-kWno%N4LSg${cdAe_S8!5)QLCw$PCm(?QR~{#xSWbIY@120w@I7j?yP~-
z+d;dA9iuLeUSsF)RhB3-LKOL$z4i7@LLP!w?%-26WnKQmMGNZ3QQfuc8!2nYfU?KN
z*e^-$mCDE?ETUTYNyFP|q1alZw?kc-w#R_AdsJegMN<RzjURb!g@Erud?WUIT5)C+
z^l+R6Vo4Pl?TKTc!xrU*tw$B@7SsF5%ZaYMwW<k&cbndQrg<CD8;MS@gwmZi*IQ}3
zUkb9X@fd)Rmbw?BXtQHR*)-N+l1KaM*l2^+8xySirN*1Bl#c;n>^b<EJcO@tTFj2T
zOl#@H$7Y*Kv+8D4x#+u+T5#+!z=~BSpg`!Zx%uJ8yGChf6&<s~#$8>EIvK%h92y!{
z%;S6MM!-PN-3e7RjNBMIE21@z(w55_ik`aCq3@Ir)wL&HmQA>wxeEg>EW4-7zfixU
z)Fs#CHY~ZrS>;ei@PA@!WY<*aZR(6|spKUY;s$qseq~X9YCQfnE>AYICwjj>8oGrk
z8=QTYpN);OM4z9~;7tfm1=E6Svtsp$%;)LomwmToHo3l>(SJHuh54-%dJH&if^2gp
zGJ$qY+FI(B-CcSp3%a1+hJTd^y9M#(pt(({y@35!3=M~w*CX-Y=F==KjsXl<cad3Y
zghv8TKyV+;e~k<GjHo-yk|w*PT}OzJfw&n5VeHsYY^@4znEjSY$1)GNbGc$#Y`HVx
zv3$m_!W8(61lo>u5_n5>L+Oo&B$FO3!6{LpyR-c~^(GH94obUtZDI=XDCgEmn6&zp
z!e6E4E~W8gaA-$%Z_Hsa4xm|sn0TgCXV>M}c+{^;MMAI1!+>#=v-ee8Fwu!AB6jj|
zx2RE8-tIU;Q)ns<w~zVn&o0_Qvn9NO=WJq{1<T2LOa;QgpNDiu%t<`i85YQc0%>l!
zaL9`cHqCg@v>xnpnNt%<VL5Xs841kTG2je#VV}Dm#BLNzuB&NA*HHCwnOpU}lb(-}
z?JhLO+I`7022>BH<^*4kmdKoj{LX?vYOb2Usx<m;8Mr2{7|d3!B6YU^5|^pYK7&E6
zS}mGhpE92?%~#k0dT$}*IrK0GroFAUUWG3vwm27D9(!<q$3Lvwq58ZQ<FK{)UUe^s
zG6YInah@SJS9T}+QSzr~v#MEo_Ud%hs?2*i72kasJh9i#h+L>KFWy$2<Lu4SPFo!!
z1U`g8{5cx3w&vl2_n)5S8gqG9`KZH*^u4<WLQyT!)rDNO4mSWf6?mA2N2}<Nq5S!c
z6|}fK<HAk0mtVKM1HK=8h0VnFob^ofYZNe+&K%sFO>5t08#WMd;eCU@$JFZcZrtt_
zzb2PRDWvxRamkYO64OZ{Bt+_NC%n<2s$VTK-I#Jd)OHM4(j=B>Y<~Tkd^3KgEHd#W
z(=}LDhOYy~pIuUfs&00eM8vONFL%+4PsF?amf63#i=sQbsjuZROX+$LKZc@rNjI-@
z>{f2iOy;N_@X8uY*F5@gYgEl4@4#iXt?D9S)YY+pNt;|D&8b6mJXFv)AVs+EUr(}L
zjKIp9@uZe0f6V<(_)Rc<!3N!FVESIg7%yzFQ7#8_Dbo<lrfR2DW>)0o56PvyLq7et
zOZ2}a_`p;%D_TOsdT`l?xHKQv_8i)g3oDB3f_r{K$L#yYwL1n&7D6?vyHAFtmG;FI
zai>qYIVYLe#EmFYH{EmIz0a|1R@8>Jhu=y`CwL6zMd`kT#wEdawtAtnrAf;9B#9VZ
z^1xQG9NCPcV@Az6?Cum#u(WLjetAC)Z{ab(-sXJS+EgEL<X9kMNYkF<=8Wg*g~a_o
zeAlmFN)OUOA$CouXB|?!A8hap_yw_Nf3TLTP1wv5HWaSdK9jk{o1vHbd*leQ&0|Z4
z_~5-o8MqLXdh@s1Y6-|d&%n{|MTLig{iNWgE!=)p!o}-PNB2BzV>myH(M!uZ#ZbG9
zXRUG~f>9=HJfMAC6~g<o){dP=<L}7ww?8<I^O}eeVC{rn)A`B$7i?9y9(|GTSu%@`
z)Wb?9P2*k!v0r%A*r|+ae1Xk?&sAUVYhPv<wy&osFO<B)bn(&Ocun`fk^9u%+5B>g
z;`ugr40GGKU%PI?cmmjwR4;R&5~pMZuD;GTHBj`Z_dGY(fix)Jow^hKRqz-Pw~53H
z=7uTOFNEW*w|%qyFzZ@?6YnMcqY6$__RIVHMJYaBj_h4*k-EaUCT3lN@WTPCSYI3O
zFYIZRUYYERy?(W|JrN5_S>!<D?pB?94Pr*8A9i}8Jez7(5v&D?cdKhGCso#$?XAZa
z!jHIEs(q|`O1~BP$aS9~J8;TpMJWw+nI@M;_RGC(Tra9JZ5aiB*Ls`8&8k?vulw9h
z@DGcP2g1pIcgCBI+8ywIUIkLkVc(nTj{GawCx<khpI3*>shn=<H#u#_uXV-H?zwWD
ztRa>}iygqp0_A~#|6afl%2z}`>WP<Tev)XDaG93&RoQt*0`MUQ^Rjv&+b>IhpM3HA
z28Gh~U9a8DOdqJID9<TWqPbzkYk6~iM%FKuNsa=2vmD@RzNtydVj1mFTi$zb#2j&|
zU&Wu(slgtdu1UZqu+34b5Jg371f8;q#@wXmgU0})dCTfGOaYvshtJ>E_G(nMmVuPc
zq*-U7Bd`SKUT8I3;EfQOJ&R0UTX;dSz)8}AT?eJN3wGaVHSGmBFbPAQVf~yicXv;*
zl6~zN?Y)FYv+$5_0v{uF_QuPNdVvifxuK^Hi_y8^>b-|UNdNLUWVf|Hdt1GESw)W8
z%h8YKX?=ogre}dfs~$g#(Y%7vNX$$8lsA}($+Qwx;nz!q>1;5tXq3vRZ;02uosNHe
zEz&s(as`(CYI*ZQdUT4N3*WaL^BKYPzeyqh&_(M1vh~8TUEig`nXhax^E54B`P%iw
z5%1hsMSNH0-Ew?D7?0xBrjU7n+ELD0f2~YO@!;%E)E9?iz@Gez0q2%E9^L7VUQYAo
z9^8=wS0xXxc5Id@V%DJ8EQv8>+bGm_P4PEuU2%&|nVDtk5xZ4<U(3pK8CkCd=z{>Z
z38OoxPGoRt4#vQ9uQzbEFCUX1;0Q#DCM`>e;k39d%-h|0b|LrrMqhU;f2<z+;y>}K
zz`z!7$$aSW$NXtk%4$PKQx-|aW&{~qkigCkQF@cBi}~a|hn(Sw(Ai9E_wCGII%*`F
zHi&FJe?OGk)kFCHu-+_|0JE%s_Yv>q+~2k8=Vj+}aeO<eCe?1%3GoLqAO6Xn{}em(
zZrmy?|7?f?XR?TqIBaM+Zad+5BXb@#wZL*Qv|(#qm3E?H9S0Hv$|bb)RD#Lv_FYIe
z;$9KX@70qA!8D4egKNIEdwV%T<=Vk|;pYb2vy_t$;-d%guxwP#A0iyZhiX=7MJ4=|
zYV(}WY6hHsWXhRU!cxVC$98nscB*<djdos-yFb)yS2BH@oAk9*Xwtk#!!_ZW-OV8#
zL>9HmUzEh2WcaagZ05cZpI-*f%f!t8swc4?L^0*8u_b@V%2Br9!9!}!=N^E3-u2Xc
zbglV1g(~h=f*N_{XqJ)g!WQG?Zi?zkun;*KMeR%iLi#(GFMV|Tj%hT(kjxxHmg{Fw
z(^YsgH;>+ej+JCehb3+kCuTf!5HfZ0zRM}&WPD3Pn%SDvn`z0eeL*qPCxOaEJi)cG
zMNWGmnAn!c;M(Qyaz^h+5}5|a0DVu4w$q(%U}*ErtZW37_Iy=R>1%UP=$<_Luk5G8
zwBBCSQY?a6U9XmKtf7Ls9cG=Ok=W<DFAX=KLkbbpKU&ScoZi>O-)#CQ)#KQctg}t>
z6?2RjLN(xq@ubY|HbTIKsS#gR0#qkA6Zrb1#;eFE?M@9VqFd_wUIv3$g8I=nH|b`t
zMw^8JG!!AU5n8QU#WA(ie>r<qQS~!X^~*JVjM2+1zS8z3#1hddJ+#sv?v7ipP$=+f
zK|>$hNW6s!Th(Q^j#kBUHRdjPz_AdB|D)8BZ*-;Tx!2lxY%-`S`(bBV{Mr1s>q>sL
z^5r9mxnXz5B!DnjyK0eHjmet}kFMw;I<5yO95$M4kTML{KtULrw+!cj!?(J3Q3e<g
z?+_LD0VI}}j>sjE(enmzmMJB<y$^K-!*?;e{8Fe&A<Qgacy+yA^OIQwAI4u#6)ZcY
zCWAzi-HE0}L_qbkhO)te?NpTTaJSiMB%`MgHW!PD<qNk*lRdZ^1@u#<aX+KEKpe0C
zbqr_}4)*%>))<Iz%Q3(wvrJE_sUBVY{xvPEt!~;c)A^mpvv9w~Ig1HV=0geXxfru_
z@PW;EMy^8@&3|W!u9SoCwAL#<?Dn(jwbMKXT=&7urMNs~$Y;e6z9k%qujzJ64kzdB
zyq_@9xZ~B88iLe*W4JEA7+Tt+B?W8{%+ANtd|7ks2`2P`B_oqM*;_h@Th2S;2MD|n
z{tLE{d40tG){_d@_o9L3(~^b$Jh5{JZ~QZ3*=vl~@62xs7)bW26>U$+Wu#KY@Fp^<
z9j;g>M{umnWE7eTrwvOe!NPS1`&H&zO08Ru(=c1RUF~XQgdxa*+vA&iiU4^pV|Yl0
zPcr}LMEGPn8#&qJiu5%pAWOofY&o~ur1Lw~_qpC9obkq+E(-G=#T?zg<q`}{BdW>d
zZ@~}fnEa@r6c2@Hy453))Qkni{*EF|_=>)L!sZz*x|=MSMjWlj#VS!j@y?}QO`+J5
z<f8rwh4Y5Rj_uMO_0E~*#FCrO4kaafUA7!g)Ateumx>Bi$`PVU5~egK7xRb)o()P?
zE!QjhdB8!dT_)Fev%jmR!CY|9Hnp3Mr))sD3~|99h91#=prXO1qN}Za)iV61fR$lG
zCND&>PCHuT*P%=1te$YGggkI3!u5OfpfYH|xhbdErV$iv#|8!6ll^DmI3t#4Y=a>c
z#b|{i46fTZ3yUw~wcK)?+O5h4(!;TpTxc~Sq<Io5uQjb3WyPd&SL5}7u$a!2wJrf4
zeWt1@6(?nmB`qy;D*Y)5Z?8t|sP!Pv#P;50M3v=^IE2BD%6BWLD*6V8hojMfJ(;me
zQ*aP&v*Plikb-CD7~IcPG$QbJ)huNzQ~5c4j@`bqyoEp|V*{UoOt4cyEE8*ZTF2nX
z@Sk#McXB^%)=S?3`@y<Dn$f$=pvVfFN%+{=ajMN?vRbCXcyb2_Xf0rgP`&SzTV?3{
z#v2@H?I0{=#<!Gm{cTmW6&2Sj@HO0ZQ8q{_-e4G62Ci2$Ggma5M|Pc&Uw)II$j+xe
zJWPf~s}G}9)Og;rP0Mj-kt7Eavsa7iQCX@2&p1uY>{7N**RtkAm*(tkV*O;~sact3
z1J!M|``k*N#{d$09$R4j(!Ry~7_rCLz2D(haiv*oN&S6y3?@V_XfM}BwM$&LBENGZ
zG+HIL&8unV2Dk5tr<T;i%;ZE_WJ^99CZe4dX&{bEUm<;A-{nYMoR)2xmX)VPlR#;p
z@}TrrK>?o;Tqwy2j{Ky*L6adxFVDiYr0}5R+>OsIUw##kf1KMvzomdelNGKMt7jt=
zW2|D0r*Y2V;pusKfWxPM7nQ3R7Pj63HZz~D1NjHY9hk~703v=qKPp}*ykNt1{d2KY
zOKF$X(t^s6SMcQe8zYe0i;01k9ckwe+CTg5&(#1evaMEf4`4yD36D;~{<{P_t}*=~
zXl5pwkTUdjDWFKqv<2a9(WL=XilfA~S%PS1X__+58v*X}x(U}_@@zFE%2F$^az-#C
zk7rg$Vi|o7M`=%Amb+|hS6$1iR(9iU59g&p!n8X+2_>yd&mrpO;DvPdb^l(#mMWHw
zSD#<lj2nrE4%vAP6nhDU?`bGhf8(~M=-RY=!t?@8VK@TGZ>^keH-1g!wSp8l>hmZg
z1T1-cFCPYOjD#0<iT|`61j>x#HzNP{gr+;{JyrG;_J+JCq$!uL*p)r+*AJ{c-=@Kw
zvQkq{#eP%4#&&oc=eCw83B1V+gTGke8iX8--k(PP%elA{_#HHb{wRF*q6_XVk+T}N
z6lFYQqQUr8raFB^O-ed8-=729Qx&bUqYaKR-_P?Ee%>GZUF|E`v)A~J;}h%V*ICqN
z!x)4t6O75r-K7}kGNms!@ncn*5);23XvK)n9tN$B#BZ%gM>3w+?hXRgs5g#i@8Ax3
ze_HweN@&_Qt$b_h>PC-cQG}2cl{*{FmJvPqP$}<of}>$o52K~|FBF3HTV`YzsI=$#
zj)KSMcweQTSx#OZ!?-$xh^4sF!gP&p*#^8h|C&6ENeq`EEHLPXuvX8sw@o_6wuDdh
zL!_1a|AW1_r&kL9+5+ys^7}s_uz_EgId*K$s3RmeAC^ySc<*sMpRvx1u4nG-Ec9#b
z{2_KTc4Yx-PK1u&vGR=bnpHn-6-Jl-dQ9=&-$nl~$ax8pjZ0>w>koUPsY5?R!zkT~
z{G;v|;K=8KQ?0<Sf<W($;xL}C>U5NTJd4^LKasF=VimdKUmq+XkgEXLk>0KvuSt&Y
zz6GF}OGnRsDX&@q9<-s~uF{PT3~z@Y+3G%g_w(f=Pr1(wZ-0XS5cjkCeCdUY|1fwr
zSyB8c?d2nY0CxZ3HH)_9xfsA*#;O&c!fES`769!nC;zUZN-W3u)t3(4ZJ7(s-xYqo
zF{RZEaw<RUptGroYq~-)2?63sW&s30D~mtKh*{u5ni;Mc{i{pl^Sgg!1puIy=3~kF
zEfB{c{iGrx1-)cbX$NE8EQOuJbF3BcCKyj@lggE)x&Q2otzg5Y7-yEdt^z+~fQJ8<
zyZPVbr|sJbi5DW*R=HTDc*Scybva9i3#8#>TC8o|M%;O(C1nqoX_Y@HNmgm??~#*F
ze|0SV>3RbE;$u36{iSRFu<ZTwNmsxr{GaaH1PEyL?=hbL`j!xZBPAs|q~WfTK+kO|
zNqfAIaaYOthkZM&ab^^W=N6dUYhZ_Ke1eVD2rLaFS+D;Y7J43DQ8Nzy?XRz0$xHB0
zJ>n_mPGgAgVE*U0%PYT#E6@n!tsbCEGtS>(9YNm!8lJtf<oUjcx*!VI*t-A@R7ik{
zuU8Dl(v+kjT4be{GOV8odeKlSgtsmvaYphk-m3Mja3Oh4q`jhNw6}$grAsWGr>O-O
zuKN4oKo8lGVs`LGzp|DXqy1wcM>y$9)BaIealLlj7Z%?R7R9pnEq!*ws!~^zjj>Jm
zZ)k&e*Wbx$wsl{B*NWT`hIJNH58av<VJ>xGADq#@H!ZEfF{$Fn79AT_nIHq}m+AMa
zpZ)l}vl1=y+EzM$J*2uZ!Zfba>tmOi(8dNubCy~#V+G?P8yQCXdt3SKrlk@3q*)cD
z+C3ocv^{i)X2ZC2<3zXtA~*dzLbyf)<W4=+=KMx)&>_FguR6!UYO7nZKxMX{8U<g^
zO5lhZf_Sxju9vc^xBY9d85{no(&qt<Bi+W$7->SjPySy+*dD-K&+f20C^hdK6^;Jg
zjP$pu#IJKZz~A*h0%Du>X}-k4|L`S#0L*%PnqldFs5+NET`pj<=w&ZIUY1k3{;jBy
zbaReF+cU<Da@CdyFZ@u)GcKcb)F>(&_@y6(ZhxF(gG3=0&Q%TYI*I(R_P#T!sjXcX
z-EQ3$Y=9t$Zjqt^af2jM1XMZ*2qc6SP&x?#=_Qn{ZYfbf(13KM1d;%eKtc~H(wjhv
zlz>VP1f+L7@tl3!xWD_IanC*97<b$;?)sC=HP#wy&S%aw=R4o`d7tGCJORY##9?7{
z)yE+nnlL(O>L=$1ry9rykG5Tc4xmJ<R#<f>6EhCxsLslS&a7qWWf{4Ug|~*iRX*Ue
zJW10vItPEHvy|!)o|LI=V_peuATomEXJ02>)tBN@^8`<@${(+3^9D)cn@0PcizdsR
zd0rP<P3AIFwWuow@vXeTmc;>oka<6RQYvC(1cC%=@@Y1^<-jTvoJ+!-k(^X&Fwajv
z)ss67F5i4xwx@ygkWkg7oQtNv#Gx~CY4hTK7qPem&>QfCBiIplaIm-vw@IMw4K&^i
z3)|aQJRfFUaOWC#F8M1Aymu$j`7iq6PR_G_+U?cl|BRg_<O!*%mfNho&TJdl2d$GV
zmc_C%m%SQJ#kBS&+FhKxZ9;RnTR<x%(~rFoM6D!+17wZ?TShRa^3fw;4W{eo%eRzD
zDfq5<N6TkQhdrNL7V*ctvd%}y9(!MCdR@0+k#NXOBnu&O8T%+*I2L2smY@2S=Z0?_
z!)#xEom!Ks<>YJ<qBCSA55*ZGlW2<}X|v1em!v@3tx2J&)Mf%Q?X06Bz3k9UGxJHD
z><4p5ypsYMXfYmQMx#!O&&~$j(N9!KP|I{OZ(^z^;T(qYl@@Ju)WIb&zcnZf;_+|G
z2oGnnC0|x{YYfreTRnZ55#6q%8WT)w-8-*6E><jHv6T_4{E()4t!_20p;UF9X_js~
zj~6NISVJ19{(MnQ?iypk6#V*w!({R_>r@E&vT?T*$q4p-u{SWJ%5^*6Ed!|svBnI*
zrRVi+Qf7H;+T8uFgz3kw&-yEE38*+>W5sn;2V#7ba%{^ksa#vV-JuxXN@88FWZSAF
zGn~kDLF=uzHXvM5-#ai=%TNG{H<gRmp*@Z+Wuv2_`$;ccY_7uV>(sgc?v1hu!G!t*
z#KWxBbt^$NOTu}8cwYK+-b4JT4@1IRM+5?am6#PDiaX4>siRyS9O+atu0U7i!;V+q
zPHNRsm-c5V2lwe_jZLvV)#aC_ACaEh9SlZ5;#@UkdRft^aam%O-3)_(k-sE`hj`PJ
zGhEZq={GS#V*pe>uFv_o{~r@!>4R!bT(e&Li@Wnwm-6B5lHpQch^Po<%tenM83340
z#cs$p?R`S8fh~zd2iII}3(Q%{s{i=zf^2Dcz^m?+Q3N|TR&&zhS&5H(13Ab7SLXJP
z8H#LEm|^7~z0+45P;TxJ?CDwiUhiToOW{(2etleRca}n*o4CFEt6XKx=#pecmE=-Z
zH+6w2jV)QP>0~DY4da4S2djKT1vJJcD{aGS*4Bc8_>g5R)FDAjMVNn~txsx|PopJM
zp$=E9fIvnocNG9V@@JnxFgP*dl}ln-NXlmGhkejgFROmgPnkVE_DO`pK4=RZVdBE2
zxgL4x$S~F0*@Wo#2GZt&M$v7J^ZFe*AxMa(ty&3u-_aD5e|M`PiPX{mv)_EZOOq#^
zH&%b6MoWWUqQ$FX5pP!FES)LYPt;{J#PoJ3*O-2KpjdOq>d~`7`E~c!%Y_XS9E&ZW
zL@x5#+#AnK>Zgb8lUSee6!R=SfV3qi$lhKoi&HRe%qo1|u>Wr8TkPv8)fqab@&EzF
zaFN;HQQ8?Z<B;XO;Eo@G!1JuZhb1%F66-|R(j{GzN?e#k;z8JU+i0F6LV!xT((r1A
zW)!A3ISTfk;bfBV(~%;wpT{HH&X^VU87IIauIL06B8@|+)~rK!ttB1`)$m$T9Yf@s
zJJLl2s;Zo(KMYTHoDIT%hJu%@#t~d{f8vl!{Y8YC(L@4X*}T<6VQ#kUDni1l_{;}_
zNW2PvZ-C4Z{;DyM&Gs;S((}WTD&!)Cm=|BO2l5LoxjJgZp&~wJ$_HZRQCRt!mSzoy
z^&87QK3&;^<GkiD+uq)1`q!3KgRn0Wm26hdO=TtSMVS*-o>z&6q{LizdG&GSkU{hY
z<;5+>AeO{SW^k|pZ`V_DS8c|<?pyVS{Bro>Q<GM`lJKG?^dpix3(`Gg)Atw@4h=Qj
zIMzHVuUf^#&KBJxU3t0885zo1-fl(K;AenPgHRv%Z@pWvr7P1qQaMe_v$m<!%Dqj4
zk^N;)!=CnUT%;@$%7yJBJ1%&v7)WG2Fh{Qa3|>2peBxj}oqRrjm?BPFS~ASd3f5e1
zVfr3DXR3A2!6#mLQh=R**VV7gYymHGBeo}5&(RRvNjx!y43!WS$DBZkQk5vW$1NPA
z7xdSi@s-YcB%`ewf{Dts)F0B@N*5#Q!|8ZbgXrxx*^}=;&%Fkh@QI&H%uE!#n!)5t
z@SX<t9|2-F;(U5*bs0qMG*!j-X^Gj!g@FaY?#~tG&s+qp27)JHh!i}!Xn&@B@oZ#H
zB=t^0O0m^Qtn++Rr+ch@>EXi}b0X;j2n9UhY(*hVU`nQGacncbOS8e)D=UPPTf{nc
z0vH}tBTxvoFW9DoJTH~~wJB4g2lII~dWRnENfpEkEN^<As~oqK;Lrd~002WNEx*XH
zpKlaj2&Jew1&Di0d5e{Q{8t))mgl}y5!`S~3Ye1tLQf&1Q>e-}lKVupfr3{RmdxZ8
z6VpreY+@#!GXXjIqy1q>^vBn}>iS#GzT2k+>9gj_fc5p6^;z4MAu2p4GwEsiHZx~*
zD3yp@HeB8v`Yterc40nUK7!@n>{EGg)ABy!y@mtj7Su-KB~JTV1KC;EUiWEo{%C&8
z=_vG99>)>4SLe$kJ@Up=Oze9^o-Ha^s)`PYRbPi13Wlr{?z^Zmk@2V_UT?^(_*5Zm
zdt?R*;Cg~Ur;p87%Vr;}`eaq3p%?Hr{YmA1L@@@B#V?s==bAV3!H2y;3hZThu?iDG
ze=NsNTdr=ZR0mv&Ubz!H9EQz#*(4*_|A%kv5VgpZR6{4prLp)u^6zn`Y|R%7b(Ek^
zw?^FjU(EfS47VlT?p;FWi58MAkmSHEYS$@0Js0jP{1D!(@VF1_Xx`Xa>1$o)T!y6g
zi)fJTvu`QzouXe&OmJoz!zVqy+%h!)FVpMVMK$arPE_g%=EQ6kI0&@TqFC#3?@~f#
z_h+z;%CFl&{F2TVo7`vxN>p^;Y`j$uY8EDU_;$oQ_6j}L($X}l={R%P>W<pQx<sx{
z*F&eAd_0~^wH~G5CEE|QgU8#i9&zZwwCm`P0l4f({~(^`S1kK?B~?`gi3ZwUhPOVz
zl&K5%2RZzkg<vhs3`)Xz%wRLf<%;|gUMx$tuhj-9ZBu;FwMSau{z1{aT~tR}B6_`y
z7&72NOgx$6d(*xwA?1X4So21uPK8-gd?CcYz0UWNX6e|>^aEqxfPM8du@7k-g(VKO
zXOM$@7=f;Wcx@(^UW><3TS=(MJg@?hDLHo^R%5%QGA%6;d3IuhJEKrzFE~sDjC<<T
z8q|V1ru#jpFFJqc`EhftNf;QK6L_-u@A5$4|Fnt!{Kcr`sEK)f<w-l_*?AP-Z1$I$
zA`iX|3fVLtQ{R4bcOfA8)^6B)U0`tMTL^v*)iH;Eq-o`y&^O7k;6Q$U8$YSlE|O`^
zUb7Y>^O0XQ;Hv=MoZ=Vf<v0CS^lcu1fmYnixdG`?;dY3Df8<&G3j(3iw?tWd_W6jz
zcyj0Rs|t1k9xr{S4BCBk&%>9rUfUdmq?Q}g8c<0c&VF74e2cbq-NKknp|+xMEn|cX
zMs}AHL_nmM=2uR=5^e44@<;}D(bs%BIAtvai<G!}5&g?;WD&nMFviH7tW41~L}LlY
z(`4o7>$tXzqJuR8MX1aDe9xcI&GgQRYqy~3-h|WbeT6>$WBwai(}A=?brKtU%&%uU
zA&Vq!$OiQ=LGc`iu?OizA%G&p(**6TVwN?*W<*PC>e^eGyX-KnI&GQfnD)h!F}6yG
zcz~T9@3~Y!op2LDfd*-V<9$$Yw<|+U)MnKbk=Q8?8b8BvYYByN^I{BwgKM<BCI-;k
z@&4FiYk}0PlERME(8~B!Ko#Qp9`O4{Lt_yKv}CqW1D2b9=^m9ifZ|D>e|+Xxy&}EG
zpg|?h<Q8-!u`Po-3*ko@THkuoO+F*d>{W5j0_GD+%y7pJ+~$!p{9ig7xctl0(wF~t
z_?J8POe8Qj&9dyzG|K{B(S~{5>htUynq%ZCHzTN0b<?9B9TMInHSbNOP)8X9VJr9+
z8xYn+7HbB+O=&fjz!L?F=^xnVnHdV+1#v{255~mgm~|J2*<TBh<yrfbI_k?f)d<5+
zS8R>Z^Ctru#_N#J0#eXAwzAS1M(O*mi^P*BIBSm49E?!?_^2nvb_$r?>bcAbs<C+y
z4=7M3Mh$ovItaA%OYoalMw@`9ES}Tz<3rMoha86xv<75wxKoKsS^JH$PN;ytj*gze
z-MlduR1@37H`c?}*70egmOT;F!YCv74*XJgi;e7+Oq|<?TV**4P(&Dhaps@P0MO#a
zl>>doX2bd^K^FLgvOIh3IIZRPMXmG-O9XGW`RsFygj&MjmR?P+#+j>Be2?|YBTP_g
zH`r?Crkx{h+H@}wT4q!~<M)%1+?GLZN&mbXAYIF)y4y~~fUhr})~UapaH1_1PI%sX
zEWsU3AB#yxiDivmL&OLcPYI+7mv<u$Yp`?stjK=igM{t@WkqFBmXxY0_5))>+<U&j
z*tTYE8H{kg_)EHMvN_s~PN@*ZOxAQtCtc3crR0}2tQd;GOglcLUQN(m#q^68+WPxQ
zS$co-m;L4R;NSKCy)#_z%=a1dkeT^ab7woL88zfteECnCyrr2Vo8cA<aCRfQt#xFp
zu{{R}{maAm^Y<J7{ImOq7YC#GW{&e`$}ZvirT@D9c1n0u*hw$jbDtX2nl6Vh`3v94
z9=G8HoH7~}<#jZps%e2SbGn7SDgxDnFZarK0akZ!`YGbKvbSfh?g~>*gM@W`<q7yk
zn*Dfij`o?b9Jf*a<>ytl7i2?cYv3DU_V-JTW@uuc`poca!C_oIlyhd~F5pGTCIcq-
zY2#Y94^X{Q<6SQ0V-&jert&i~^rS#29+W8TVnA9FQ?iPgngS~<$;QsP6w;4L@%AzW
zgjn}xwLHx5!ATN_<Qr!iukX2VYZ>oH=6Gi<c|`4FT)W2g0M|x`zsfMCNDykBwuf?-
zoIkNWUB1|)FLf_}<*6Q94OTy!gZD)}Qaz5tC?<3$<~Pe6tAX?yCBkhm@9R%*_v!Ed
zWEBDAE9~@1iDr_{pRv5Yu%KPq7|98ZDd;&odE|JK^!+RX=Q7;1d%yv_+{CuTrOGxl
z&?E3N0uJ1-##1Y51gLfW%2Rdkn<U0}Kmxy`_l;`(9T2a-z!TW%gv|bag^$zSxjI?t
zy2ncD`6sCe3}bZVmze;ASWEBNN|I&o88JXhQ#RBi9Y5o=dhMI2{13-Jab0$r6DLC-
zSe5pi?XJd>J{h<*yE4#4h>*ul8bbI-)gGwRG}{~wJnyyfVtOau>VSpodBxVxi76>5
zpt?i9vBl)#i*Y4Zj9gGt6!%Eijr#faKWP+~JI-Sln<rpb8qR9`J|aGTlLYx|6rKJ*
zNA2*~SDvVX$p27V&bGR{@uHk~SUGgcC(6$IVEyp{fQPra9Xva~ATfy5E=JWIjuEX~
znr*GMn!&sOEfIDPjwKOW_GZ4{TFb56Ce)~12DqT1p}!toDTEIi9C0|t^|YE2xIrcN
z$Q$7=*9q(KmfH_FPbQ2P)gj@g((3QOg+2PuzR#Qp!*A!9hrifxROZ_{Lbs!#I~V_*
zf!*XQwSER)ixbG4Q0qPX$5$SWCFqh^$<~2<E_a(Gx_>*8O=N4itRJChyi|X`1=-T&
z3a#Au7RUPMk380ZV(ss;iQL;%aANujI34O;O7D6d_m&_`Ptdh#n5puUWT!iKel%j;
zE&cK^H*u<vS4$M88UZr+S<@(1m({VI2jp%^*9^b>FmS#V;#L=%`1W@yhR~GzMcKn{
z4VU%N8%a3OnzSVP^pg34w>G*4ABkMv(JaWd{m`9|gzjjSz_(cA4oJ@IXw*Y64<>9U
zB>Q#%`SP2(<4#Df|5uNsZJN)KbNj05icr{c4*?v>mLy^@F_CN%X|5&QR0PkvOsCd^
zw5HVV@yLbBL|BE&z56vos!_&Y1a-QRY|`#+RxBVOSZs3r*^hvH!E@=w(^1CjnT^JW
z`w;#cd^s&}pT`w57M~hkwLooUk2j?k&)2PhR5mW5pdWYNQ?{uB)_plB(<|xotj}u$
zqW*<krrb37!t*sT-sH-v3ix@_h2aI;o~K9ZyavzAMQ_L^AE(Scp#rBve35-ZP?lrA
z($!d%5QB<^?1GxQ6olWD1mkg$x+7+-5QWEO*-78YGJNS63cDH1rI+o4`3*03r9wMn
zzP!vi>0iRi3VzF87k05O0MGj)FNSKE;FyfmE10H7CDnO+45=8=zzqs@ZkI9k`Qnym
zy>ACF7S~0bcdlryj`3$1Y5NrS6J73DT3_^Um7pFpOko*Z*U*0#djM`>&2J*7!WGdx
zCY-tZY|BrEu0#7aRa`X-%RdSuJ&;q$b`s0OHGUm>g5QWum`?kOVEW0HZ^R}pp1i<<
zv@>5gMe~)znUmxSW|3n^K)?Uu6~z%FN-gz{c@3LBr5S!XU|u-;TNU?hQ0{r{GR6fi
zin`bP$paH`#d-60D(XvP{aJ=O^Kw;Eo_B0{#HXNVD32wnhdj|+zqXdzbELaZFqzz-
zseS&_5?8_`H}j23W>ptz8L~z%gy;b47B*y*Bzd3pc^`!6e1T9}n%K7kUdP2ixSeuq
zTGqeHX=X?jyWo*ae2KSjR0V=BCSI_pDfBsojy1k_D@A^0ydzF+3FP*2rTVEBi5t4Z
z3&DJFZccXRoU<Skc4s`M?d1epe!j8)tUOh{^rX^dnM)$fP5VsBWULY;<X&+eVkA54
zOWUm1lNrLOSE^g2=v5Usq<`9ocmeljeoX0Hs&LyR%%xmQY+0xE%D~|4bn%Sc?+5mr
zK4xO(3+poe^~ZtvuP*KC89Nyv_q&7O)gA?^spYhPZ~z1fg{UVgI(WkIYY?cTrXd|-
za!denv|b_4Y7S}AE#g7WPN<7zS(-ujF!ii=%g11j>+pA1w8X@vKSt06{5{qBi~953
zf4iA{=8Q7TGBES#`>PI;jOrADkx<YXP11X_swT4FKF%I5;zA!$1Mh#Z(W7!h^%@Oz
z;*Vjo4TS9JXdfyS$Z;$?2|^3z#eWf7_TN?GX9n{{X(Gc2Y-+Z}T>dF~$jw5$W`?iP
zAbRht4B?Ahk(mZjFr}-2Fjy_|g%wz3J;sic?|?9@0b<Jr{07@y;EqnWmYKn9)o$wk
z)qw8Qyk0Fyq3KL%RDvbRz33$ql}5_j=tvCh7ugo-t3&OQ$lKeOS70y{VlyWi-aL^z
z_4LR)0e63XV;R$e@BqAvM@MimD-`>cr-zrn8+M{}Jv!G4<<Q{9Ro8iRU6)~?#(E?}
zs7@fhT~P|-1OCu+hosFG&Gh`RJ#0z*BqvTX7Xc|Q3_WKjBeGmzitW~{J$Q<~dXu(G
zg2=5xHeo2_oR?^L!}+YKxFfA}&qM)ZaTA%$fLs^n8T%R*EbrOp1uF$N6!Vdh2=PQ}
zh^ncxg?#0b6WFNNDO$bnf@MEvExng!e)|xg{t{D%T*+ippTU7~688#qT3P@(mLIjI
zCvW?AzpMSJkAAsCgPpf0L<L^hGo6*k8+H*>+$y64lDaje)xjl5kLw+7=O)e^iV1p9
zws*Md#?#bYG{oL2hg&FXkS&colq&2mFZ~Cq{_+;HBf9?s*H(CXYIxirfA*-o@Y-X?
zz6(!pRzJqJolgWDhzv5%_}Kn2L17z(i9*JhGpel(79&Or;Ul#U6s#G<7+7T95tkjR
z>D8)W1SdF-IItv}s#KmLdqUrXgp@;cWE*^@?R%3yl~r2TB+MDLR0{XGEa)g08RZ%S
zF2$R0H5|A^9W9OWAE5u26n6X4JwS3WSvn#j*3>oQl}o?|jG8hIT|ODp=!+JT8j6RN
za!|oNNP1N2G9Z0lB=a2+P3&!)-4~;>EyuE1t9=!UXernat(*D`t%ptzuiX2zG$+lq
zti3kgd|LsJ5Toq`>`LMW|GM>OFwg36BL(mEu>N5~=FvBS_KY@^Vd3UeiOQ10MNWnt
zIOTOXwoxP{s-ErWx&j1^L&m_`!HR*U{qCzZNvA(A{Lyh?p&t{?+N)|GQ3p}IpOFZf
zVQO6)&Fj--4NS~nL^+rM*wg9!-8UK)dm3I%T@_kB_ZrG~!T<*Fexv2lJu&$rTD76^
z)C6sNL`D636~9?DtDzzKTv|$6*cb2OST#B8u@|2!eV*K%D=IhiaJsuB&$LXmH|cjB
zQU_F+IELQ9Pe)f~TaB(B_<e_1(MQ0Gzje-TyXMu^diUT57`G1fx`xUzdO5O=)|%@q
z6|Li)?YNmgq8X3*<=fX7ViC}ffZgDa8;xcB;fhCtQm-w12lVxq^;OIqWJ7W5BiCv>
zq0^87eBL|WNSfJQ{=BA-{WLLHIyOniY!7ZmSxL&Axbl+E>xf&~pxmPlmA8WX)670X
zMc9icdC>@7@QIU?Ifet1uEJ!IrYb3^OPVpu&6U{3-rM^cPw)0Kdo0U00~Ctzt2;q)
zR7Tz%Pe#%L{e0L+i~+O9l%m^5*CCn>L&=0%<xBDawUHm{Mf^TSe)>Kr?sLsS>KVJ^
zR6woEnd&1u5m%lx77;4SXOnAn0E@;JzZq<G51IMoY+P;_Cf6$*MRpVp2B@+Sl!<!7
z4akA>7(c$%MukUX+h2K>3jP7-zrp_BD@qvd9MTwt+0{lrpRw&XOGLnTqk9j5%hj;`
zlZIjfn0qkH{F9>g51(n-vm>=0W4S|*>%|UQhXhP>TdrMft+sXxaUlQyQsaQOB=!s>
zuR?Zz#3u`_Jh7^A=z&ThRWP*~fyGW-U<9ak>lm1hd&Gb>wf)zOot&}ky+BBGUx|%~
zKz6w!1oEEN=-HNf`GWoZ^d7k{xrRUmx@Wj-N33F5j9@av<d9F4p=dRmk~Jv`RtRvh
zDDJOmz%M}&)OI&qE?Qqohc6X)wF~Umluy@9Bak*^3p+qLuJv2JiE%|ouKQJ379ZGn
z#}rP@UAAIBKWTDZ+>0<)n7q(l9jBc~3MQ*Iyf_Jpoa4Jcr6%E0SszqvHLnswqz4x`
zmF2?``EF};+_?`?y-I?Pwtg`<M#R2kuRNE!MYyOHOpyu`uhN476MJur#se<Wmi8a8
z0l<~jViN_=Wd+!&P}%R`s$iz_otMhpn?AaCrv}qHAGTsC{lhcRaB#j9`r~>_kbP_-
ze;%eAPsnvANq=a_dY48F8vOi0%_L(5#8GyNwpRJdBkpm|(0*1nMG=B<b96Ur?37Mn
z%u`SD1pxeaQJLnrNwR%?Zke=vPnATY3)NaWAv>AWyeFQLm2BCRR)mm@o|thOGYZQY
zfxvz@PNrX7+B9|zjYt%ffJHQiRt=mQEJdfjh)5P5HR^D4^k9XCJfdvkaRXDv2Lex2
zIF|Nmn|MtC+}uQT8@ABHP}L8yP|t1~4#rH%I_U#N({nih0^!YmKAPw*C{*FJ_7mQ8
z2yxFPv&PL4m)w-D`{8qRQAivFtcfszaJy4FvK_Is_Lfj0@wO-s-!(W@u#FuUalrQu
z&T22*WT1pbVC%y=Di{;9<eNPQ>d*h?uH6~YH!^vCy41_$+RPFbJLZVg&RPT)YwZcu
z<JiYMHa=&f91~P$z7I3GeI@CZ6Qk%$#$@WyCH}{g!$~<g`T64!hQmJbN~z42Dy6IW
zzazVUNSFVw=iVKYseS=QQEiS>f2L#4Y3KKVl3VZ-#V*T+w@W5w(kBPi!^&-@1y1h4
z1Qev8z`xb=Pd{|fjEKN>dK0>WyKpq@kiy{{S6HJ-d2*wV0a@+3F}nY5U%xMT*#=wG
zei>m073n=*iOv#^BwH|LS?+AZ_2r)^o#Y{z9(@3FWR>^6eygp39ft8nBdJj=XR%Xr
z)*?IM7q&!nQ&pkyH3m5pUFN58mV_8fv3+Ho;bxp<F&?Js;xzb`$0Ms!17ZT#x!xmV
zMkcg1x}&2z7<kSHxM=8m?si+UWybsC@&N*-*f(|oZE6hhcQ4Vqn_|HbvXi(;kRBK#
zL!9Cv>S<dvrf_DK)tl#&9T02TOz@qs7p{dy{Lf;E+3A-c)df!js~9@?>%upd$&R{%
zgv-=19AocL?HnSI)F)Qan5(Kl3AvG^*miy>*xcBKLQ`rM`4!>D8uB|;d~+s-b<jWB
z<TO4%qWv8?nDvb9tbu)mw1Ph}#P^52!0A==dX>?$yCgJ6jdbL72OF;h_(_Xa`iSw3
z`C(6v*&V+A+|5>@f_HDJTMR)E2{$*Z6G(CGc5;FlNMhnb4hlG6O!p)hxl%@qJRFqX
zy2s>v9<w&gJ<Yy(&Y+M2?~ND4bhm?7uGQN~CnyJ0d5|@OFG1x!_)Q)l_G0yNKh#Tf
z-+x`!TK{=U$D!03HF+V~#M(?uE?RtmIFSYSQJvLRZDOck;$SJ2<KV#GdXN_Fhy}t{
z&&#56akq17b#ls_3ZWR|Drg@7AWF+@#q|42Hj^Z^-W|>y2|6u-W_|+sR<mBYC-gos
z>kkgZWx@nhFeMryX$22S1;)X}rwiheh0$YT3%@$1XyLrsPUuk+pJGsR$SWAWARyJ(
zFLX&j)$sr~;y4grP+U>u&^H<r3-<P45KYojG9wE_&ed~z!%UJaVNTq*u$HryM3H{f
zcw)qbWASzT#OTgw$BEDIs%%srdQ{VgGSJVXUm3mWkfOB^9=^`t`svtGbFprM?OR`Y
zrY!zpvHI_=lz+QgKP6z(p|WBj{PsGNyVAK0&Be0E+qWJ}*?wE;4hs~ux{$OKPFNd?
z?(qX2hqSd=i10aO==kVK$LFVY`d}d6gh<FrFAnp`Py%P>9S@auQ6_;ZZsJ9{!k8oX
zil88gryfrBN*!R24Y3Mni_bM~1@x<TNEjR^a%otB|3SmznwNh&cF144K@xT-LjG*d
z!xQLZHAb+B%EytimI0@)ol?=t=($bl=`8?N8X&3h>7uF<;=B<;mYWQ@{1|x1FOg`K
ziy16yn0Hy9>m+{0Ti%KtbsHg$M+rSf<a$fag5l>(VAQ6l^hkwo)!6kT?wW-B%m$?#
zyDKYSc?$19{#McdQE}G~z&m2{D=*Zu;-UvKVXHyqt{W4ikgy@gjMU4CW2BNAj7<^Z
z!a44i7zLT4k7y+Q2Lt;x{vKfK-+AbA|AQ0JJ9JI{<W@JbOU+_oCUlNWn_tVPm*8by
zl_pV?Z(v$kgt=imU$&14z`;k9h9h}&wvOy>`8y60Mn|eqUOEf+_9d6%n;1!2ilg0J
znWL+X8Xm#|Cbwxf@0C#+6Ac1G9j_LHKxEStP;rfJ6?S%$dQIlVk9_*y0RMs$!aH9q
z2{#7XD=6f1fDkk6Y>}{9i;TmW^4?#ubrKah#955axwMvYx}cL0E!Z!Jzwp}M+xGun
I`D^dL0qy(f1ONa4

literal 0
HcmV?d00001

diff --git a/external/tbb/doc/main/tbb_userguide/design_patterns/Images/image009a.jpg b/external/tbb/doc/main/tbb_userguide/design_patterns/Images/image009a.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..02cd19606791c00b1344b68af34b84f5440cf937
GIT binary patch
literal 21793
zcmeIa2Uyd|);}Hv8w!eug}O_X(3TQ<QEAdk2%)3W3B3y<qAN&f0tTdGC<zGxDWMmU
z4gyj_@0|dlNRj@JyT7~Z?%ntK-S__Qz0dpppa022GH1T?opR>P%$YNv;bib+5^zOL
zSydTu>J$KQiu?hbOrO53s-R$@qo=K`s-g7DgVQ$wWTN~D0B~~lbk|e4_k*F4@ekkP
z{zeZiJzW15{)=C7zB~Qjat8o<`Tyei|1Ii*m9>W@Ing@#&(ob;IJvS`<nT4yU&FrN
z!jFCphkpyZ>+30y)1;Hbw{5=*Kl(20<LT;2PSf%&y``)Bx9})AEaT+p^{uRL^sUC1
zteqiX@~<KJj|t!b&;zId?vca)Qu<w<E=T}CVjBRUc>R0aqXYn;^d$grbNKf-j&uOv
z^3MQ3Ntf$G_lLh!hLZe!+QtR|*hB#U)J6aR-Dd!R%H(eq{r%nF`{KW7>ks62n8@vP
zA%AQEjsR=G4**qwGr$rcKn@85egX&q#7;&43IK}J-{{*n1(_(%QhuZJXV0EFd*M74
z)rIpHE>K;%e2MBJ&BY5BsA;KbE?>Dqdxh%KRl2KJ=*ZzK-!eJ%?M({G^W+z=T)c3R
z9Q)s-lMeve^QYP=kQArb0H<kBQP7?`X#lX0b(gHxrzyVa_OEpQ+*!&qr%qp>pdvpv
zx&k1VOs@HP+H+JC=PAgkPMxNpJahKkdD^RVKVG{jBraj+({q9T2Al9*sNqBJ*!b+C
zV*KoNb{<`~AjB;ZNj;-SZ&1B`_oC}L6u_45?;5(f6h9V_v%dCwk$)@tTP*Ew75Oc8
z7;uSP@M&5KT7W#@=$oGXlXUj7+l0+$oH$hyq}f8q&#yu<O<P7AaoF9`%xg;6uI|&<
zmw7tTk>o!mWDytp>GU(o6Trw`k;@Y<-p!uJFG|1IjDOXD&Sic9q@R-CId&YGxBx#a
zPJOU?I8<6gN55w;^Wio?`=~ZaZ1>}%T7K@g(t%=5Yd<$WHP-%#3P5)PaGCF@UVoe4
zt~yWipDBh#sWKqxUZp7y&S3RPBN4dFWi3N14E>_YJ{kc7_wPa=SEwidNooFfUZZqb
z^nYL|pnx2rZ#x0J9L)1_?kW`H+m2hbi8e+=P9}Fb<WurY=sEH3iZ;r>06+fu1hDAh
z6WSt^Zk6V!hoyM4&DB%up#lC15`QbJTAV-Hd+nH7bDr7of6WsO^H*ADp3e;PMw#Z`
zG=mQrj2<vO(pGT}zD0{Q9OwDegk0Ba;j~Z;snU|4qhLI+yn}i6-x2XYnN}?|c-J@i
zMcY}`okn2c<)ME3h-bX=?cBnL30%6~9e8b?;$f#9t&gg#GVba+B%gl$yL61*4cpWC
zBoqy^wY3Vy$45N^Y+mdlSJXEf&x0Gg*0%+6DiM>g0P6RvD?wy*J{)T)SEfMB=kdnL
zzCjZduY0Ps-V=9NSzr-*raWkCEEaixIm4230hO{|4Y|3?ea6#Se|e@33}@SBiK7ne
zT@o$j=r>Nl+7+1Ez}|TDL+%Y8a2D&;@Nfi4R(mjWI6FF2RUN5?*6HetzP7o^HRYOn
zEGwTl;#{q(l4Ec|n2~WgJpyMqI5<vxOdlg1=V^sL)}MFCFso~?4?;aVm)`Y7-8^~f
z#^}zjHbl0TrL@Z(6N!lM?1FRgj)tp9;-IctnNYSTx7`en%O(WhHrhPYEj>~#G5Mhg
zH;?Gq*M@)^lV9y9XrE#JXm2JmT!YWE1P?=$h!pzgs6!l9Lqt1V45^t@x9@trH{p+0
z>xcFha=>^qJZ7Sv%bLcBN4M-?b!q*gO#_6ft(qKfS+8Am$~*9`m>FD{13kH(cqTXc
z4Jmph_<AElZlN}BMtnv@uDL8@8OF<vX8mS0%hLN3fa)5QDgILXM&hV*&5+V#ycti9
zLEZ$j|Jyg)dfu{%1)g%XVTeM>l{p^~T5wPi5{bHIemniiGpn2ZQ<x$R_^M5VsI-ni
z{{iQ*qj$wFQ~!N568&<q)uI*Dh@gq6dR&$XoYQ_pFi!`qTN6xznsGy7l5q2%Mr($Q
z-ptVt;_!t2`FpK4S=lk~2>0`1!*a}9Qd-${+vcX0btN!fx5kl%TSt5vm3NIG;OKFl
z+&H4Km{3o<t}td}asfmeZfU_j5Ood4Tu1NA7NVzC6MES<Ik4@l_)b&eORnjaymq?{
z7%64p<}5S`VU}9&QLO{+=^e+~kFbwX%cx5cL{g&FzD~#p2`iU|nWAwsFI{Zq3mhW*
z)~nW-to1#`P1l(GA7U(xWG*`eazv~3W25sehv&;_Arg3BAj<IiH~Z+{O_x7aQ`8k*
z8oAOFH|-_KSx~a-^2vcW-&^gb14nT~F(E?L9DhZVf?+|j;EOs#Y1mipJbk@vf+>Y)
zc3(i1c&`RZ+$lt)j4<ZnReWukQ|2<>02GBb2Kqh-eYH?1R+-^KZ-B&<`{pCJ#48(S
zS#*T8OL!nbdvjTSu-ElmDPT)u`M8<=XuI}Js`k#iW>NY*LPATNdFF7ny_?Y;*Ye`z
zA`u)=_T(52O>J|}uT81MPNdTfm6fk!FKAmGcNk@r%+>8H#xS?Dax1|ZBNWDiXv|eD
zI4Toi=`LhoIK8YzW!jwGxPItyF#}U-dA;vlR&E};T>YZ8|IiR!wH2a61(-qG1(ilr
zF*dfLLmTgeZS6Ov8n34yW^M@x@`rI04b&E*5u01<ChrRSgw0#53X~T!A)YcDyr$uS
zlnXvIk6!dwU+LVIIsqv8G~!h@ZBi5C3uaL(;gNFDhiz4d{66hZ%o-K9H)O}m+e0Wd
z1+bTzVD7|Aq`dwimy!ye)h#dQ=;hCMMcytM_q)w1xi@tR%*{`ZGx@qHj0HtFbkfIk
zJIV8Zn2y78)`(oerCa7$=AsiTyn<SiBhabYStNH18~Z$Bd9_?iY&)ysg~PB7*cRL6
zk=r!m*1M~#Hz*)B;vg6I&hD$HPP38%B`J{AsGU92Ja0kVNd1|-jL523VqT?Aj(hc`
zPiq6xC8>}4ZU#WaKv2D5*p{eX0ruMJqmp3X)UEj(zox-nxRmn7WMy2;nD7&Bh*w+&
zUn$h8T(*|Ek#yArr%Jbs&9J5n54;mo9qw1*i=nMDf0d`CCF2M8+?t5FNwl7bcPe$C
zxIVE2#w3VFEb;hhMYH?Ujz&!$0|_3Gj(K-Bq~z#50YZtnbA@KPMrvb(mG>w+XJbw^
zud|9BCcTm{>!QlYhUYbI!@q<R#gwBCM@%E{`wCT2^)JA!62ua8E#H*mXRcRDO=z_`
zi?yI<Q&^(eWZ?+UFU@Up)9`9mahhpl>N0=5P%?4kOd2n~WJ*cfMAOyka`eihF3N~F
zZb^om&Io^F64cFMUF$Zgl7e}-KitNcF-z<TyGWn$N=#lb;yq5dB=)@>gk={9mIL1B
z@-X`Z#|l^bqM(!#9py{T=_Z?eyKLnPL;d1+#omqcK5RB~Drvs!it>yw=;+eDM?|Tx
z1vWCRDorgzq}udP0W69Se#~wyz^0mI?m=dlGx}Gu*Sxb|Fk$i*@S4tOOIuIcrUgw3
zLd&aH0~}S48KR)<(6OaB@uv;$M@%sb56Udx1}ML?E_}2TmcqM~o&FA;nP7)BWO=pk
z>BC2gya9@gh=NHP=hO)(^jZxDOTVpCIIHAh95*6xZC6cP%>KtG^g5M^k_=x*2e{8n
z!;^g_G4tj081y^VrPUdM0ohTmcgrk-=$joOXL7OlrFjtK#rQ2%zD`&I|8!nuf&VS|
z4qJ)nlbkmAt7Lj;W;>osz${4)lbC48kEl4{)Wk<Qpcrf|X16<($QD<ZDpMLo><(*Y
zZ#}c3Fu1*=l@}5@=T4sbT+OLc><_@XuS*v~Ez7tD*H`4}N(v|JiWhEnfH+0W7q;B8
z9{HGVLnR@;nDREvH^Met{I-$$cN1mK_ckD>wt|0^*4;S@j)O;tZ#&KJ=rm;OzJJ5a
zv5rt}i6|x%+Wq4iUDV#4rsKiS!1V9Z{kwv!X$S6oPIasGw6#lfWUJ{0`;vQm$1vkd
z%D(P;J`lZtzXbbOb9w!-4Q}K`UJcpIIRV^IS)kWB4Oy)lu<$j<oB+ZyzJxf_R2+QV
zh8~)+ChHUEuWh|n1w&+9>**kys_fA?OK=4S+xO~`)QjpPlzmv*S#aLldQ65nRL_`r
zeL*Mk7}Ka0BZ*y?yh6iTdd@6h$`5-i5Y@?CCbhhFkzldm`PA(Y8gNV5X%Ba5SS)ve
z=>+g;RKQbrkl(|N#Or{8_|;lm=cbs6?dIvrw-$@Bo2#%OmcWjNS>#KP+eoaHxtG_z
zuRhatx5d<s>{zLI9q-;4OFaJxU^~x<A9G<~M|nwi`QY`czoPr4i7%DU#!_*%uTB69
zxIX%o0^{tXCw*^PYAav#2EDT<wd|y2Ei;v+zI=2Pd&2}s(r<T1!)kM52z*fvhquv`
z?G9UJi<|1QZ3m&N>bh(CV(`b9Wy~U>NUw)1n4WgN?xy*sCVZZIxnDFbL{ouf;%uIE
z+(jF3q@#;I@2YsBg!46eS3)-y$TRmyPLgrCG7^@Uv(EFLggMXSos}!v_rCd(kUi;M
zzY3!+4yHFEPpPPtsj%-PU1zC$m^L%vbLTAN`)1ROGJEa5B<6puke9$byPE%9r%Ahd
z4UFHw)J`uRPGbOS)xS&L_4|H?qfY^MCYST81R;Tq-Fr=tvJT}@mYD)ZnpB;Y5nZ>=
zFuo$Q>@sMFCWnxMw%$N3TxirkIdIlu^53Pv|0iFGCno^YVwhTn|2Dh+hN;tvmUHl&
zSMaTr6F@e%bV~a=h+ac2qx))i*zBf`T@7;%L#aVC-xHxr2HA!TCxEpMDa9tdY$^A(
zqjddrL;$4p0G(QTYD9}3b<I6c+#=Pg-Gn{q$hk3H%XjQ(0Jy#D7XsrVdQl84b8Qzg
z25{7L4xmc>{MnTDyAjwfky=<Rno66qy+B5Ibh+kX?69Lg|4awO0|$@0HZ?ZA#}s-3
zC=Z%rc@^B3D}JWH5Og|2yjqYYawue&D6rXa0(iGx@X+FoT-n6CF}#UvW9ex8SzPCu
znHgu7P-Wj(R{ROTgfsA7EtkvNnp+`L*SCtNe6v#P?u|3?;5>!&8j__`3&oIuE0lwk
z$T60{Wl>A=(#y$L^Kl7%!@-~Kk+ywj#`Iol8U-|TgJ`n&oG72yxy$;(K8vZgQ)jYl
z1UqjK2rYymm>FwL-i8f~5`mv7vFF}(XADuU<n@n!0fU@#@>J=|%^^DbHr4Vumo74Z
zs{A7$`bXJAsNpk6DV@P1Ezz`V&DIeToJwafH;K&a70%|-?d#=js3*VlSzD>)WI=AK
z_9km3icxFbu)CJ~>+aZR>cOvkFz(pH5YkdpZ`E~Cm)2w1T~B~R`oB|wSSpU9X9n@r
zyH8S&oQriDSBO|*f;L?sY#dGQsGnqCaXX^APYuUOx|%TOgN@#rL*YtJ4R*Fw9m1&M
zX0T9qV8^1L`7nR8ZEC5q82D{TqE_~3(Q=BIG?V?RtUbaiVQHQF%+&rfbXRVam4;_w
zb*?3?>4Ky$8=DVAKR#aT=nAvK@+Z)Nc5zdTwzc|8OP30L-W$jC=zMo}*7}Nh@f`o>
z@(K&;g(@W|lWkV;wvF@cU4_^=$OXlLz`0&9pQfen_U1Nfm7=<jf6fV}9(TV;)}!%<
zoKRo6$VfadF|ju1LAEM~(h*LAW}G+Mb`N)ExF2U*MV?4a9dJ$s#x_T$Kq5hY*H({F
zAkFDOp*V}(OrpnBn<Y_n5+N#vwnSUJ>~-IYw0LQn{fx2@&+@82BT&e>N0YTweQaqS
z-QxWDX{Vw!Z`l*Mq4i3xPa;-Jpk*Ja{Dh1XKx*kQaJt#agS#XuJIeusB5p70PhOG-
z3|;RN?Os7QiHh6|Fu9S!EAVF7BS+=HMb)8SB?A#qtS{E)=jV5yJuCCM#KTZ@%S;5i
zzaVE+QIV)9{|9}b0FFgHZz_B&-}01{{N3~?{+B9t>R;`jQ24qsQah01)E~xmu`&%j
za+czaaK~Mz!yx=vS;JRGHbHek_I(6I*1a6MeQ?JVfbcgLA38$T&e5kG-5uVj=~|^f
z0o=|#0T53?$m^=_gzXOe1n|ZnaQhsr=|H|1dWbAK0ie(5Ux4Cg0@8+gk9Cbs0Da8)
zj4Q|87Mt*{<8*o*PV<3?oj|+%Jtf-{fR1;SOVNQ+U>mRe{xj$O@>~Y5cW;%v-#I+h
z)U+<rL7j<#%y4XCfF(CAwaxe<C#!DuL5L8dB1Ge|vkCDd-r`&<J_@{PYN=JADp)w;
z=Eq3rq4Fz7PevpYgt2MMvoR{=RnZ&DTc+qda{+Im{PE!HwWO=ai==E9$evTr$mx0)
zRBk<cX?Fv>3i^Tv^Y|uqwVDkoNIBE|+_lxy;&aQ`(*y@f1BXvZ+N*J@6{?nP_U{jr
zb@q*->7tqGJ0&n|uri>BQb*gI7EfEA-x(Zu@r7N$@Z;N_@H(_qfe9lbGVEfb17-$x
z0;rb3MRK?-yUXfcIX1`oFZ5kDL5)0WbY(D-nl4+|Q_)%w->!fMVcBmS<OLp9qVlsx
zo_<}NjEsxzrj9)S$U#_QrstxFaTCgo_NvzTknQh#0I(VFT$$T-<c(VcF570t@3kAG
z8s@Ar-&j_Ls`qHsR?`J73|3zbc&{^hE8vrmblyAjq?NqKI3i|EG;KeDcb|Uw1kf%k
z{(VPE|K9y~c$h3M*1z}nGj`3@>WKP`qPf;zaXyDli@D2)QCEIPwiUSZdsn{rzWYyO
zD0%Y-y$?jil?yveR(H47HqFP0Cjj*$b;qr-=(?8V6hV<a>FROF(Mtp>-uPhtRQNcl
zXluLlqAWc`qYCFDQ+Tggc9h{&Xd?vroQ<1E@rOb6%Y=Ih;oMwD_C2J{%KK=ErA!uN
zJk{P<t4wDsSU2p~=H9zJ)*FHH<+GcJJ@h9n0tk10dFx;GbpdQUc2ue|clvTcF{br9
zhAQ_@MUWldwOtfWhF@#B`+p*MCRLj=Zaf{^vHOG#Og%eXu<=wo_aSCU+^<S}`lxcH
zJBaY?PZ<CJ|Ct4erS`|_o*9FSsVWvsg<xa!JTBoil6SP_ZN58*UYFh%<m;xdB{zI(
z<rLe@@vE^Hd_{Uzz9rqepvT1n&Aocik##P8aGywd2UB>CLA6voj$UVnxz?Q1AG23>
zc<0+RFp+<?n($=w=?~sVz6cU_er5vzxr6Y3TBWuN`Qr99Xk>dDT9Ka=)$q$?v%kSR
z2JL8`KIbwJYEG<imcR0Cnkijw$oH}kXMOcQG3%?@U6lvUQEim0miAwMYt7ZhH2u7I
zN0|Bc=^=Hrgot1T0j^|nw-xGGTc;xWUPV@9Cd02!Or<H$MTHKr{OQ#=5PgpLij(OJ
zd)-f~Jn7YwUWo%|KsJF9Cfp`tyBsA0*tz_mR}o%2lAK<^%w*0;E__UB0(>W*UYmkx
z;P3>X<<4(VJF!B4i|dvHfwItG0Ah7nElHMN;r4W>J&zgP2*;%-Z3}qo5ClCWA{wGY
zwM7^CR>^Ci3aaORF)rQaO&@58;6+W(4__f(SX#unbBaH#6U2F55Pf}rkCidQFE?zj
z2}N_Ox=63+3A@ThZr)PTgahfOGq(9b<uF!2xC^T4l$X0=ha0$H(Oks!99ZGwS=Gx{
z{wg=loSFT3|5>v<#up8q*Aod~M7Ots^IDul;NkOT*krCEWVvFXhy5tVOF3VEr&|KW
zYKuz5S`$`9<K>#zyg(c)7`UiY|Cl-M$&(I<>M8*wy4;`A)P_kN2KhZ(3u1QM+;}y|
z;2&WX51Yr2e(@Q0AY!r3yO*l_?PryunR4T@+F^mXsrJ@S$>1<BoFz<s+eIJd?(`G3
zci(?rtvxtyG!JXr<{|kQ$Q3!?w1o#bW(TUvbBh>mW$$!ja$RnmayxBbx1E@8fw$1k
zZpzzr^lMn5$_L^~3eAnoOms!;+2If^p_VtqVZ`LD2jnnvY8f19Yg;)=+AmFA%nKoA
zr%&X5O}%VEV;wVAs8%u198<1q7ZYdC+}-=B!4b>LV{%QdGCnp;LR8=f>wQ`5=lLX`
z2CvjzbvHk=f?@S6EB)(B%NPR{<?(2CRJP?@^y9Mq!NIvB)eqZ#r^;b8)qao9oaKxe
za&X*rIPmlKg3nRQ6oA{JGsD2Le7eF=x9Q@xIYf%xEKx`7jtZhQ++eS~TEA(V?EpuA
zZD()g{ZNh@aJ2lk-3UJeU-FWT&)v%+1SYH?a2HzMs143fjExywlO)t$ZV{1EYZpsj
z+P(~&E#$j;7c9!macyI>z<!7qV!~_25z1B$8Ks2)O6~%QHj^S3=io<K^d*S8FE%y?
zd}>I4&1to=9{BY9eZ(8Q*`=$Xb}Eg|vcdWLgh|Y+NDG$~2yr{!o54cewNESRVpWG%
z7P8rCqeiTy#p&=!)-%t&0ttz3Z|g)4hQrEu2@r~*wJ#q=4CDk`x5GhZTx-zaLyOXY
zMB#e_;bdn3v_x~*zW=T(F8?s1Oe>C<*oM+qE2b}~gI;skbu*`}F|vd~{1TgxUTi;_
z{|}gu&+%YoiC+Z6c3F$=d)a=+oQ1rXr*Pu_TFcrmlYZd@@Zjm$VeO5l^0|-i{N2*=
zErN}ot|!+Yx^3a^JFjl!mYrQf97{Z+TePxdA;ND@qeJtc1&g`RrdP9yO8PT(x_<4R
z2(f^P5znVOKO8XL83#et3RW%Nn{0fFE1c2PbgCY4>6Qyt79ydMIo67r?$uFBk7`6!
z*w}z57OJp*SNai^j{-)_^J_*)HZjKTGO2te8<99`!7MzXn@^oeQkoS--f8gpaCiu@
z<b2eMmWpUO_4DK~YarfOB=@ZP*a?8HR6U{3>g(JWmi%Cbm)77UFuQ3pM|dC~DJ3$}
z*Nkx(XAboN4=hN#J}K+uMoG*#L*Z11o3Z?#TuRki{DE0pJ>GilKu|7hjN@}}Q+Tjg
z0Zwrn=Wy*OKp+s~4e9AnWh=iW>KxHFPGm!!nK}W8>_3yF7Vl-GiC@BF)g9@5sKOw~
z=q(*hBX(Auc}Y`Dp2y98%>En+L|5KtBU&j{zq0kU=aF%InkBw0TM`_mGcZD2G~-=F
zrDexwIrhaU?qc@)e7JF1B}hry)|zKO0cC3hDA2xs_IOUs>zp*SCND;9o@a%b+-dOO
z%EUOvN<v5rOWp15Y}i>#garGWZC{%K0Y>*8(^&d$$1kESBm9MvafeTdC5AIOWqlxB
zASWggert?PQulFY3i!FJzB#pG<{c*Qh^1Ar*d=B5>^D&=&EZ2!PF0IlkH@ar4M^{n
z(+58OJXCN%BTcO&CvR0c!iLR>D?v(0+1wd&;4ru6^b?|G+7&cOu6C#<$UdWpZW8UR
zhuhwI8t9D8kC{qTRpERBzTX(knH_?RLMlFztTO4Z>h!Vj2yvY%>cH3^zcaAf-ZeSa
zR*{4F6<Rn<+=X7!3eN7w8GF7o;4}b1Lc1Cv69j`KiPN5)B^|nsAM@gq@2&ZL@)!~h
z(|X9?v<G5$$n*FtCsvpsb$e;)oy(nprUn?hi%5BL6{HjNDN57vu{SKlfw~hpbEf%H
zfNAkhN*wldW8lk5Y#Q(Z-ZJs>w)yP?hY)i>Xz68C!gWEsW{<6;6Vn?X8Db%3ik_Fq
zp70<Y<#??)w1WW)PL%L7HwWhQteanKyqeeJyzT4Kc;GXXA&firWprq6+><K^#%7KY
z*C)bu){2zR8T{S&`p@j|n6h(sv7c%LN1t~5NJ##j`QetqhePV(wCTe@!_8;hM?qg1
z?d2Q49v960T}6M1_-<IM<$lN9!F>4B3)%;V>tckcu+0EVYN%=@VXF4V>V!>rTj}1U
z6PESH?0yqNUaSwc{;A+dO~*~<KlzTynO(wq%Uxt>ojn2kcu?V1ymlsnaWgO~U<~lr
z`{A>gKULr#WZe^s#`A^0*18>th8TRuJhL{TSQqOF4BI%eYy+h2oSSsYB>RVF_M6}Q
zWzMI)x{fZJr8`7gd-q*hzF#d;I|00osmbp>$dnbuyn>VNV~oiQq!$SN@)`gU7&G(e
z=~S9(J}aqt)6`LWRAdP>b2J12a9Yfk4W^aZ_Q0AC3J&8L>2@#eYx<r5ymb>&{eQOa
zh|`FYZ(kXl%M(BunDJU>g+&on?xW$gIdr%Hq+R*`kB0r0ZfT6eov-IBdc9vR(_vOU
zozsgHxQU4s@6h4PJA3rlRq3*G@!#j|YMfIfc&}2?={UimhW}yH+j+j|dZV{vJxH4q
zz}%f-e4NE#Q%;}Xo3#luXeJ>AR=C(CEpL)5LCFjD@{q^!e}o+Ng$^vg^GK{E9GQ{g
z995hcpst6=7Ze&;F8>~*LZ(8m%7J#lV{Xw=!{!r!pBU&)u&mNfC6-v6q_`!sncS8L
znTrCp7Qz~1n#g{sP{u6m0@}gfNlWFBxl`6V+3!-E34UZV-o$<XqKt4k>z>dHZ?&HK
z)y*BJy3J3sI|xbNW7L7|QV)pXRX>uA%~es`Ztt}2i_gV_#XqTBOXS)cZOSm?O8|{A
zZ7c4mx9f*CKBZLrdgVB+)vZ9@wJUQVYS&u-pXnILoeR)C0WogUt*yk3<CQ?priP<>
zxma`gF$DP};aEK)^dLBZt17UP=Rgzlyx9R+Xq>)y8@IL5)2sAp!Ci?_muwLNG3$zo
z(-`c27vJA&*MDZCN&`0VC(K*iAj#XjCU$<uT*7{5AJ83tH(&gHRRNb@>O1fzqhF;s
zV6=yGYN?CtH3Mh2wfsi0oF4nP-43<rE1_gPVC9psv^)V+vJa>0sDyb|jPS+nkp{2`
z{xj6P*HwuQ*^au3eWda(cO*!TUQf*oI#E)AQp&90wC+y!dzw8_wAYVZoDVdX_Eg==
zq1!J4byy7SS79yQtwzj?pBLuubvTCM#0^tpN@A9bi5K~VpO)G2jK1oug{2tRjQFSf
zYxH(s{v77C^wl}0?)5Sav_BmGpk!f`A#7AdE=%HG_{^9G)A5CVv>*MkuGwS#$+y8{
z8;Ox?CN6taO|_dS+iNF)&pVjonmL8w2NH70LmADkm+o~$ny~MP##P*0dNi|7C_u91
zFGH5W6Q=~HQbQtt9&r(xm%{5t!>$`7(+`*uXAfR5R1;u4@ju`0lx?ccpBh!-ftg_j
ztV-+b3rFnjZrdA1*J-L>d<5r0x#28zX>-=uSakkE=6{I#-?5(DIy)~8dbS#M&PF{>
z1L5PJS^e@sK_gHsd)csx_U8B+hZ7WJ0Yqldf^$r9u!?Gp{s^vatObezh4yB8l+XcH
zj;Cr;;Tx6Cxn}x!&LSuRLQzZ^!gb(|Gl=d#dgs(G*yk<T&M0hB{4{!y@o1+@ial#;
z%)r&MR(DGiPuevh*p3D-a5UuhZnwhipYY!6R3a6s|BNn@l<<<oL^*7)Tl6yu6gbzq
zNKv)2_Z@)?hnEMF^#-nCA+A0w3si=>JxIY~OrOg~%K*G|dVlRFr$88@zg^=<*LoNM
z9A4ammUDP&n5WtZdNDN%df;lha~F5IN@m_^N0w@PR`gPjg>^1>_#0GAFXWq~4T)e=
z8zIa3kMLCi8P=!oI=A3Opa@=ZpYmLkP<H%)DtzYR5@#qGtw^KXShr2BZQm9iSiir>
z%=g*sRyS{8Rs}e_gvlP>U=^#|0|Ihs9}bN*83n>dQGS0=j{lnZk9dgw$qfm&<|xd(
z*xqYKeSMX>bP96gNU?>hP)wr`SlV6Re!67<*n5AV6n6u@9=Nj8#)lApF);#5)!{y1
ze71MQQv<BM-@K%`0ohmnHdSwBf5jZJvu24mLYHoRTW@=krm<V$Pv1<?TV(#S0;svb
z^Ls>^%k=kwZ}h>0UXzka3qB2~aAL~9Rt!Y@t8t-ZxRS-1B;6G659g-E=1S@p6JXa-
z(ohh$IuI-1%I8#4Qs<cwmpF3GSw&dNFhOU}5@t?v7MLdEybz{U`aRwS_|;*vB$HIr
zVqWF!Pxinbsfr`3(piGI(O7*L_oJ5l%-E6b_5FE_9|<xiZwk1Y?6%MIQ`6wXC<n)g
z2xUA@Ba{}M(xABW`rywM7up9ufjo`=w)XrNZI`0XB#YA_Vn+X`G569b{oNz!mLChH
zG_-&vx*Z*-?=P_RwJcQPz|Yrh$>O|?@cw-#_Ya*eSeyK%1NH36lk1?^)?<ZT&l&si
ziwxpq%Z}xs0s#8IPHBIswG?j%soRg^8xNv}GNp>XV<>=wtU)EQhZa%GEIMT0>33UQ
zaz<CP*ZmKiJle<)EZrb6-*K+=f3`tS0ap%cOBN5)@9u~pbiZSQAb(k<KSlme9#Wi|
zle;^^3vVtQH%()|V<u(Ihd`lTVk>0Fe#BJEXmx`1=EU_g%*x_a9qQ_4x=gg*@(;b;
zk#%&Yd8)c?WLT4;d`gB}Vo*mG-XJ`T?bEv!k0&2HTr-`Xk0}_rM!s~2p;8vlGPJxu
zMrSybB5JzW=ZWdGR-D-4zJH|jlV7;V=8N9c)IIO29qmWn@-!W|I8?^$Lg4$Q$C73H
zBy$<Y=I7QW9q+6p2&I=azy?b>0)qySXlqeC$Z)|5+*h;2v9|K~p<0}Dj9l7ttQ9P+
zy{}+{cv&vYt&6}nqahR_j={Xg5vTmot!U@s*E?RK*E1Jwksi8Tmgacjx~BW1vj%Kf
z*1E-+K7n_{v#e!@Fog-6mn2~g_^x7fEv~QVvtIAaHEI_Srv`PfTtaGfcXK;f^oY%G
zc5XUkqi}U|HDmu>_G3IJ#2M;_&Tr*$hgFH~3KjH??E$5E3kDaq^jG5&C8C*j-9ew`
zqy0u}yn|L>NQ@kt#Sy6o^fpF2i}>@<6%(YZQ+SP<el}zU&<;~A932jq%e2x&>FX<M
zt)00;D%rr^xOAYHQ^ZuEO3c5mns+^HX35TU&n7n=9h2%)n0g(H=rTmKGC4sYK4(#G
zG*LAD8Y)s%ek#^Q3!(&By6lCj2l4Gn^1QxoTB#*5x63Q`le#`tKcV&IX<T*DbSPLo
zZ=EDvAZRs5*d?P&2=3WRvs-O>#v$Mix@d4tOa@b<c0W9&x46ETTVac|v8RCA7k^<X
zZXWvC+bfMZ1BqT7t4~Pb(8Z5p>m*Pt7wZ5GAQxx=*Jw3)6_n20W^0^m;1MVeOncw6
zV+|u_MJg^izbW!?wKT5E)t?%Z(e&vbt=C!|4m!(>z2X1TMm&4x;D|D2aJBc|9!IX>
zfh>?+i%ylD?)k?zOINwiiQs&>mX)#sLh_)Rwp#~jy?hQyEL)`ozMcW}3iC@9=1*&6
z4y&p{>qA(0M<vXxhL`aUUy{d0Ql&b}vzawRGfW&+`y(D=y;Q7_xj0q&$K{Xd=|X5^
z+D9n}^CLK?q*Gl>O9kqL5XnY9eZtnY_^(R|^z}t7?{x_ci<}7TMU>*a<sPT4o}3s4
zDHxSI98{($TWN2dJ!E9-^t@v4QPHe8F}RsCU>y05ID`yN$-SR5R0m&Zt%q+#INFWV
zxDmJ29d9)*Q}vl<Z^ZZ77^OIit2i_-<?!=5q9QLoIf}m|;G!v#Cewqzs;X<;W!X+g
zOMk<-)AML}DEvYExly1aP0{$Okx4qHwA#k~L-Ml5*YSBNZb9)gP&O<?YB=3DF%TV3
ztoG@vW@{nIzKt{F_c;)WONq`k*l(F&sBc6kAIA2!q35PamnSh*SIEjdy87i@-?De?
zY~s6!?s1q2ct|jASApqz>qBKh1%vzq)=PyRDCI_%8?NRH6wSTK_r5^N&A<d$N?t`U
z+$13F8Xl)9jZ{M~neZ$2HaCaJz&MQySVtidEh&wnm2v0bW?vWu0^RVQr7M1^n79#W
zZ_D^|;Li>k<BIM=qb*I_<(Qm$Y>444u2sCiD(Y?1Wi$J}ok{QI`G<F5l@=p|Ogw1L
zNT_Vf{$f^8Y9qFDUXWs-72S8;pXRb_L#e!XAJwHO>C9rOHEq?06~f*X;$J>Xsol&$
z27?UPQ+Q1{Iv|s;&{cGr1T+3^O?18O)^5*4D^qGL`_y2yxV0yBboJ#T7jBl=p?wmQ
zEPR6jn^lv8zv+0Kx^J?_9@}H}MEXYdN?uT*_`4ma*_j@Hd9(VE0`ngp9XuK1A78R6
z)^X^l{Q;B4-cfkTVJw!Dp2@o*F|{VAxLEss>X0$%Ii<t>_k7Oo>}G7$kjrO7OuXc!
zkPWw2CEvs;5;XQVoJ$6JbbC~FZ3{+blAhm*sprs6g!Y0Uy~0`-q`&%KNBXaD+d&WA
zO{mF-=ve*TaH+btrXsJLewwKcgYbVuW+UxpVsaeJ38)Cdd6MEwmW86I`~CUKsVvEM
zTI#x}{wf28B{x&7nn)PVne6|@cR-Y&lwApiyY)Q^LqD}@8sgklL>^n&7ODstpL>C-
zjOZkR5+RV+qy2gC?KmqxkEiz+k(S(L-E!VN18#~+5f+0kN-)SxtbBnM_1s6CNk@-a
z262AQ;mgh#jI^7)kw?C%(ATyEtdNrEZY!+(Sr<>=F`efler6lzLvw}}`c9n5hr63v
zvcT`5g-g?>be>m?`PjYO=SZAoLK}Q`dN7S2;!s`ig}0pD$0VA*`Nz@}**d&DL>wCG
zz{2U!lDlnm$jr&ylu)G7{649!B~sgXcBXH3a@M?9|Fl(4nvzribfC>-ykcQ%SU0Qe
zP!9?=T-AplipGfDy6=_1y4n|KJs3YNF};dbCPm;3q~VA!0oVA$WF@jIM0RI<JWl{e
zS+d?SeylsxC9rL|e5V5eEPiI-Hdm>YL`si}HszZ_zxj&94BV=xyRbOEke%QwSxtu6
z8{|Ddhrv!ov{jGuE1kB`R{UZqK!WAU*RociP5{>qP)MhOQXkNG{O%x$?C@yf$x46c
zQ<xDH=x7&kodEMGEa}N#eOY^S3WP#FELiXXO^59c<*A+kn&pvxoc=%fc$hn#0BU;O
zw2vi~`6JubtZk7NBU)X@QOKFHgK7kPw6+A1c63Sxg;XyT_W_ZH4ptFMCxAQTlJ6Em
zeL$PN2aCM1$Dwxw_`{`#EaUJ;#cn5nt$-Vs8&XyZ{O=tP->&-nlm3=+i4JMLW~erR
z`B7lE+|nX^1vl0aSnzb;f$R^<bPoG@Dssm#0uks$X>Pw|dhx7JVLhMvfz#)`^hZ34
zAuIT?jt}IWehu&qId!1o);;eBr1?p=uJNJX<AfrC)CV*>hGKHHB}3;D18!(~&W*PN
zng(`;)4$wl?(L==imgm~(G=+SDeVMsZcO~B2<jt#A?)d%mG%kXg|V4nued+IbkmKU
zVV=YK#R}c5yd7g0Jb$$ay!Xsn_Al>z5dwa{sdV}GyG_rm&Hn%7|KF30M&;{qQtxI*
zl|v+dBrF?b;axT5QyFlEL%7;PR~K~YQ>562i&v+It{lBM_3vO08f;&Z+EIs)_GI7q
z!=4^Jz0Z2}ckgP_gFvEA!8ad15{fR!sl&m*IkaS=%b^7vfB2K}|Btc%<c9b=gZ+=z
zJMjIV$~_Gk+6{E--n;W+#R-V~jye5Ly37BR|9`<sY8tIU6P{R<9VIGYzhmwQ<Gwp#
z&_4Li!%n`$3UoPFTQVS%uDv5pZxlshbu7!9nQD^1E%IdG8m>X$s_Ci^lhzzFwH3HV
zPDvlJaUVCC(&z#_{K1h7JG=YDOC0hg>Z{xE#hILn{N%v;pl^V)GaG$l&`$ZOW;?;i
zY+?<0hNJlg0x7=H4EC~+I01w(r`Jd&VfLC2CFphJ<w5Zp-bd-W<%wyFuSt3%u8K<5
z+01Ij*l>7FBcnRCNY-Ta{YZlhzkR|bzjzfNTO5IwYorL*XX$;en!a2shiLldr*_um
z$mi$v-mU5{!-nUSh|{mmE&uRC;OyFH?W{KUW~js3Twu|XtYn#=$>=dGwy?r{?Px)~
zzWYF#lYD)rs2i97b~kDw3aeAPK)k_OiSeACLMqKes&{30b;xJS<s=VXsjqB7`)!xI
zIv9GHYhf!+HgEknq~DaA($ibmC+Wq-%`l(}RrESEhJ3k=d80Aod0Aki-$d~N69n9O
z{*~yAU0_|G`CSrZ&=vMK;YEJ7VAdo&nK@>nLVxE0Q2AYq_9ng~0=%U+-2?BFJBSz8
zPNE$p#WNMoF?(4R70M|>5Yftc(<uZW;cp%EZ=`>65CH(^K4RG1$OfVIep*dRr9EzB
zQ!ADyr&D;L+%klrp2y6$Or6cgaxUbHqtCASPX328r~OPTLG|kw`G&YW-VD1PK;*yR
zOQl+t(p^5}N9#%)G84Es+kE!&?OQ{p%19F%p$G9Ap(eg977V+r%#6MYRL3Qnb*-xs
zJ7449eaXnJu1|z{EpzsV=gFHQ_Hh1~9HfQQ`)=;@MyyaUOO)cyv+V)1<6#kpy^U(L
z{aLfzUAxrx6*a*L{mb++DV<jb`aldR0rquOd5Y#VJ6&{r+<sCUd#eGXXXFwsd$()p
zdnNj%P|CII9Uk%F5k531cF92!?<k2LQ8?gOXfjzmgzGE5CYpPHGCS*Kff5~ES$_fg
zRo_?I%eODVly?G4oz5dlnJ6@I9n~JZvo)i>1E#a&4eW7ig6R%#JWe+mH?zuko7}UO
z#;rw1m9VP3vW0yoXRqZ1R_2|trr-sp(EfoP4d6hvakX94ybG&co9sQGjC3+;_A~zn
zFwtE0oQaT`MuZi{(f$N*NnE1r{(>vfK|VTSGG%<q9Kf+`Z~}0;srlsQ`0~~Zf$p&4
z{QD*rW*W;8aHQ74dF&GT6u$;PJ#K(R-SD>-d^KP8G|)PPqpmPX>#hU(*r8;|h*^W?
zEA0jb#rmQm<bC<@YJBCBourP6xSHUcFs3bnPKjaGqg~^9NqVNV)9*yB$3r@!<hI4^
z-|be#DixN?`effU^T@Hcwy-bK1#SsORW^nzvmHFp{~?BscVg!SH<$Ix8NU-iIC$6j
z?M#ww3nPP%1t;UzdXZZ2kJH%Iven}H0BP?&Z0T%@IT-w6?vuNU7$~8qqRSPoL{e!N
zpC4Z%6_6~RQBks<N9Q!&fb(qr8wUyiFbA@&Hn-k*I<sR>ll$t3mfF9+qY&I}V{kFx
zx@LAl3biuGuLRQE-44rtqP<A`0sY8BJS)N!K9DigbY?QbNFpfD@$!ce)nmct?Wo%n
zn<Jk$#|)5jzSX5n)sUfe%^ROTxfRV0B!Dwhmvl&;&(F1OP0`Vh_P8sKdo4yMcP`PQ
z7RBByoAYC&6rB2t-3{GFut0~&#3kMb%DRQf`_qX~N!@}k1rdJ8{Ig%yr>i8;b`KJS
zWe=CUtf!wS+}Q|EGTyX<MsE!UTy4LrwPx=iaCwT-Eq{ABUx6TfX2Q8*|L9Ji|Mj0|
zzz4hnETJAXH6T)<Nq92b%cWI0O7jI*>H!F7K&4oDV5tU61Vu3fbwC^1hBH+c6iHh;
z;^Bq)ADYTFn0+4O7}~1CimOY_1^V|YGCma{yyDtkRkuD04P2$yAo<fkef%PK)poQ?
z19&Q)>gzp>Y~3s^=S<>iBQpDxw*v#mJ&QIRUA|hvs0T0bi#cKZ8mi+fQ<^O{{doLl
z>o?ArFu$Z5fkUFcY-^C#JqVG@q@?4wcG)qDcvO!juy=$-L~TC9%9u*I(CDkrbt7na
zO#a7R$)|MqKj;SyFL(>A>XqHQ#D!T}jpE9JK?-mI>=t}X{@80dAMeLcStizA7=Ffq
zA1cXNB<`4Zmof)7-9|1)U2Z41#L;Uz+>X=k>M1I3`~<DURy@gG17#@37x>thEH`FP
zT-HyByOdXL1fi?sE8sptB2p%7Kam!6jh;zp@(!4>^e<av@9U!bW#Z1_S$S_`qHTk2
zl=plfU2UkP7$!&;og-*QuZ}>R(-8C$unk9Cq|w9H0;v#V0XMbU-4qTPM)u=d4CMP&
z)HSPAT8`&*a~W16?yfiv`Rfflb+jL~f}a1{C_=ssLhhSgK<+7F%cQ*?qIAQ};2O(Y
zVsNWoL3W-ZDo*(GcjLpoqqmwauxl@u8wM9(h6lpzpS~W&<4ogMy!+Z5a^~@EL)}|0
z=txPM&<==Wa=3ryWLVv3GTBXao8hLc9DBT_<c^Tzr}Yu?F22<lWo<_7B(j&0$jz;X
zDhXQ!3Z79?Qc~2{m;LYu>HkX@x@@eAC4JATL7CkgSLpItpFsS`Ql3{}^xILN`|qAV
zm4TD!@T<#OOpsT}{%}<K>fcbUmm{Q)qsL4)10U=UAPleO{|0iE{u><j`M29nf5Xq-
zO?5u!-p~BOj-;EJaJ{Wmt3_~208SNRUn<-~0O_u4rR_v6bHbSGM-=r*Jl@abyZTj7
z(xtH~e15dSPAKTAAzr54w-)5O{KBfnoV7l@$i1O9@g*+ub_PWMaN<5XDv(#4y2{w8
z<cWEEl=Bz+BvhBP0k`MPZ8#&f{tlI&;Yed1Jg8m!qvABl(?>0GN39C_{At@W4n7Y*
z-+pG>7c33l^yOikc?ih|$WnVx&(Df!IR(v9AbEF|uHQhrz;sINZ@5?%1EE?n^bjqP
zmpsczUY)o~h0FYmV7cu=w^xf@(h#QTLb-PkUp6;=m}%`PovV54{`;%H`u<(%|9tFl
zN^thzYonvz3xs{Ad})MN2iA2YBr9I+llIlfIpx+p-Ih>xAT1a!cufU_U8g?<bo}jb
zAn13fF3oQcW%4bw>nhbUFrlKZDC-fb(MHmMesWQ_sb_`MTTbo1#n}|&+UoO3t~*Hq
zGdHVdD(?;3EUoiKZ2MgbZUhBmE?(N|;l3edd={s2>&A0;_pSRAR>=?v*1`{$o0)$m
zX0Ml|xuF|Ga0M_Mh3o;E$8lpSAyB#OA^qwA5U*7PPTy}^4&-lK^|<?SwC*nVZ`$$g
z4D2^){sw`*OFjwv3v~4veL#vQ%Kv5_nuxDe0d8p<{-l1?GXeI<JS=LO!8eLtaa}Oj
zNa^x1UY`!vpBdA?jfC`RFERB9a_^o1a1Z~XbCQ2_7@Y#zPi#dJ7h(_2^;eN0^IBww
zf)7+CZBPzB_dBi%;qzi*;MdbXIQl#0+25UA{UZo`N-R39M>5k~d+h{Z{1L-xrg$9P
z!L}I~xZnSG3iOY*<1f=)%_d*xyHCn{EdM?L)|QJ9UE5dj@@PGJv1|@`VC~nAEjLJ=
zE#qQ*`S5x&d@aQkxcFeJ=YTUWF)1BoG`g$G%&(r($bfzoPCBsN%IzDw(}XFIHh{f&
zRP1vJj;UaHySf)^W6h@nuCS52mXn>Gh+CVRT$~9Dx2tNyyz)r;xqGA&>mU$KP*Cyq
z3S+Jub;yT!SFZGvuP$dIJ>4XWz#a4|rtk>;(6*`@172=2PWQXR4vP3$O<A5VyB9s8
z-wn+JiL0;R2|o!VpWmN>c9@7PB!x#Qqw@Ul@?agBB!ykN=gV@OwiS(!3ye3VBl3Iw
za;;0z4luO+9wCQ)@YRsyjpu?=O?}G>FFuu`Z0olin2pUOYRot)Rn0(gL-*#Qf&6{j
z7pP2u4pMTFaW~kJJ{HooQVkBW`kkKj_q?*c&cB`-sFqB-7_aG6+B}+foS>skU$^~c
zvyqvPN1Hbb0#zHbf)+$5g-V)#8J`}M(@ouH^iC0Oz@?<ch|^{lc;C=u0^*Ac#du~G
z5FN0`7MDUB+fqJ=;|Ul)C&L1Jr?yYUq*k|~wYauf^t@x?T@EL7wt+i0Z(=LbPdedo
zY+8;aJ@gLuCt|AKQI}mnaNG?}v*6Z%%2B5AVt7(|a00`e)`DoEc!-4s+xiR{a=u{f
zjS7OrscXKmzQOW5J1)97++{Wo<T2ggUKyq8Q3BCOakelXqOBd9#$XsCE#r*dn?9P0
zpQXuB56C-{`m`}CCfk<Hi`^2=RlX?;(WS*HK_H3}xEh!Rwv*m0L4e+)(I9fy%yz3}
zft}f)v)NBP(Wa=snQdb^f{6rC(z2G;;Jub!SHLL82#d|kDC}-jqNu!{n3NEWX9(-o
zYrICg&0PQ&6OzqFdfl2IelL@+y-`*1LICegxvMe0=bLG(%~Z|FsiYz!>=x0fIPYQs
zTzB`kdj`wIR<Rscnr;Tk4~{|<zhlUA%AZIrNp5YmLjLxZfQT%E@0fIm&0Vx{W7-ht
zc~?e-56bswf6C*%zSUL8c%l8OPW?4-A$`PE1_qRDTfWk=GD<IT?-^0~<){~<hXl#q
z8`Z+IVdBha;v84g{)RA=?F1vv__INE^%Zn>uncok{hgUJ10OCsrNL^9vfn`RTh|#W
z5ph+(T3+1q5Wz?#)uq(X!2%Ty+CFu<XkVQ6oql|PLn-{-=ONG+O+iEcE>To_u176P
zQQ=x(sjk_N7&M+eeJPG-m@scy#)kC3W2&Ts74j?S(`JXvI!#&XAnqjs(c^Avs>HmG
zIC}v)b%y$jvpEQB|Kxs5ZXpo0oz|!^1Kv_M6k(QZ!&>(e!v%Y&>2p5DL=(0=vWTUK
z7`LzjE5A(IOhK4|Vg#{B`in!#1K94-@Hk(|t30<QZB72PD_NZ)RN~`^*r8QCjk|IS
z!?2IHnF=3RI>YDQI4zK!0J+lZ#&2F~EtT+k2{~eri0pMJnLq>eoV`t*w(Yi5btS>k
zpJK!dI;KfkmSrg6ALVR~AEsKb&)y0~%&5Qq3{!qPT;ScGWi2CQlpVok0O>2VH{AVD
zU?2(kL6u`ZEQHO&gSnH=%883)T|BHy%KRu=F=B&DpnYt{N6_}X1lbvl?yVk`BG4{Y
zo3=LG&Is<O)`(RvfU9Sn337=KYwV9~wkz4u0}CTdvK1|_s+L=HEB4L%kB9q5=lbxn
zR56ryqF3rQ@s^<c&iq}i;EKuU%<#kThUGGMA%?Wn{9=85=^XhP#He&=odlbwNl@=$
z6njH~@gY}dd{PN@jEOLnzl%1#$TAY;USenIfp}d430*T_Cq#c?*EMZ0x1x!?j~6i0
zC@{qccyp0Yz%Jq;kzbr6^9zxv+#qlgGARZWCl31LZ(2~$7OBPWu+7{WySjX~Wy9aw
z;*E7b)X2HKU)LyF6&8b(oO=gXv~q3ao%WbEl9EWwTO8j(mg_Q+m^2?;fa=O;dfcx{
zn>fb5)K{wrJz`H(nms1p*U$ae{(l5c&F?Hlqd%;o9{>Or`n-1ALM74bCYsEYUZAUx
zPi=;bbk?aV9;&?2=;SUB1f<g(Z;qGweD3FV{#5Cz1PXpprwUE2VO8Fkvsnt0FhobF
z)zqh470I@UnL7HmnxXk;<PrYe+WY@zA^z%NJdZVfh0dwd^@oSFP}CP2t%_ZAl1;3K
zWtNOA-Rkb`(YrJF@MRjol8pRBeR%amcgS&vIJ}Ig=~dB$dPK(z=qpedae@aMEX{bM
zC8~AN5lTKR=U=7Ncl<IB{Za7$Is1iI*AwjHE!#P}zgC(Q990v>-MqS^x>O|T4C9r)
z1!<cvj1g6w#*RVrp~WHbzoL4+xitTP>iOo&{2tMClYC3=4~V7*<oj`fzaX0a4=^YQ
z@&_~c*W5avVwJ?(F;dl836bTdqQKNT)MJW#=P0_k^|sb>q^Gk3r-rj-1ww-R`qK%!
zi{E@cf1vM>;A*)M_MYG;6=v9d)Z0a;`g<5YhS1kyJA<38E|+sd;<%dnF<|9>@thlQ
zx4_k%XN5t)<6p2>mcO>+n-}ue#zy^$%%VbH&Hoj?CI3r1egdYe)&2tCy7_D6zxgx&
zkj1G#*lZj)scy}23vuaiSj|)(gIpV*C2QHx583sc<(c^_2o?6^wlczv=O{0h6!RVg
O`VZ~;U&*kZ4E;ZP>d9RI

literal 0
HcmV?d00001

diff --git a/external/tbb/doc/main/tbb_userguide/design_patterns/Lazy_Initialization.rst b/external/tbb/doc/main/tbb_userguide/design_patterns/Lazy_Initialization.rst
new file mode 100644
index 00000000..6812e6c5
--- /dev/null
+++ b/external/tbb/doc/main/tbb_userguide/design_patterns/Lazy_Initialization.rst
@@ -0,0 +1,109 @@
+.. _Lazy_Initialization:
+
+Lazy Initialization
+====================
+
+
+.. container:: section
+
+
+   .. rubric:: Problem
+      :class: sectiontitle
+
+   Delay the creation of an object, potentially expensive, until it is accessed.
+   In parallel programming, initialization must also be guarded against race conditions.
+
+
+.. container:: section
+
+
+   .. rubric:: Context
+      :class: sectiontitle
+
+   The cost of operations that take place during the initialization
+   of the object may be considerably high. In that case, the object
+   should be initialized only when needed. Lazy initialization is
+   the common tactic that allows implementing such an approach.
+
+
+.. container:: section
+
+
+   .. rubric:: Solution
+      :class: sectiontitle
+
+   Using ``oneapi::tbb::collaborative_call_once`` with ``oneapi::tbb::collaborative_once_flag``
+   helps to implement thread-safe lazy initialization for a user object.
+
+
+   In addition, ``collaborative_call_once`` allows other thread blocked on
+   the same ``collaborative_once_flag`` to join other |short_name|
+   parallel constructions called within the initializing function.
+
+
+.. container:: section
+
+
+   .. rubric:: Example
+      :class: sectiontitle
+
+   This example illustrates the implementation of lazy initialization
+   for the calculation of the Fibonacci numbers. Here is a graphical
+   representation of the Fibonacci recursion tree for N=4.
+
+
+   |image0|
+
+
+   As seen in the diagram, some elements are recalculated more than once. These operations are redundant,
+   so the "lazy initialized" Fibonacci numbers are relevant here.
+
+
+   An implementation without the use of lazy initialization would have *O(2^N)* time complexity due to
+   the full recursion tree traversal and recalculation of values. Since all the nodes are traversed once,
+   the tree becomes a list, making the time complexity *O(N)*.
+
+
+   |image1|
+
+
+   Here you can see the code for the implementation. Already calculated values are stored in a buffer
+   paired with ``collaborative_once_flag`` and will not be recalculated when ``collaborative_call_once``
+   is invoked when initialization has already been done.
+
+
+   ::
+
+
+      using FibBuffer = std::vector<std::pair<oneapi::tbb::collaborative_once_flag, std::uint64_t>>;
+
+      std::uint64_t LazyFibHelper(int n, FibBuffer& buffer) {
+         // Base case
+         if (n <= 1) {
+            return n;
+         }
+         // Calculate nth value only once and store it in the buffer.
+         // Other threads won't be blocked on already taken collaborative_once_flag
+         // but join parallelism inside functor
+         oneapi::tbb::collaborative_call_once(buffer[n].first, [&]() {
+            std::uint64_t a, b;
+            oneapi::tbb::parallel_invoke([&] { a = LazyFibHelper(n - 2, buffer); },
+                                         [&] { b = LazyFibHelper(n - 1, buffer); });
+            buffer[n].second = a + b;
+         });
+
+         return buffer[n].second;
+      }
+
+      std::uint64_t Fib(int n) {
+         FibBuffer buffer(n+1);
+         return LazyFibHelper(n, buffer);
+      }
+
+
+.. |image0| image:: Images/image008a.jpg
+   :width: 744px
+   :height: 367px
+.. |image1| image:: Images/image009a.jpg
+   :width: 744px
+   :height: 367px
diff --git a/external/tbb/doc/main/tbb_userguide/destroy_graphs_outside_main_thread.rst b/external/tbb/doc/main/tbb_userguide/destroy_graphs_outside_main_thread.rst
index c505b07b..cbba64fa 100644
--- a/external/tbb/doc/main/tbb_userguide/destroy_graphs_outside_main_thread.rst
+++ b/external/tbb/doc/main/tbb_userguide/destroy_graphs_outside_main_thread.rst
@@ -6,10 +6,10 @@ Destroying Graphs That Run Outside the Main Thread
 Make sure to enqueue a task to wait for and destroy graphs that run outside the main thread.
 
 You may not always want to block the main application thread by calling
-wait_for_all(). However, it is safest to call wait_for_all on a graph
+``wait_for_all()``. However, it is safest to call ``wait_for_all`` on a graph
 before destroying it. A common solution is to enqueue a task to build
 and wait for the graph to complete. For example, assume you really do
-not want to call a wait_for_all in the example from :ref:`always_use_wait_for_all`,
+not want to call a ``wait_for_all`` in the example from :ref:`always_use_wait_for_all`,
 Instead you can enqueue a task that creates the graph and waits for it:
 
 
diff --git a/external/tbb/doc/main/tbb_userguide/examples/blocked_nd_range_example.cpp b/external/tbb/doc/main/tbb_userguide/examples/blocked_nd_range_example.cpp
new file mode 100644
index 00000000..4fc1473b
--- /dev/null
+++ b/external/tbb/doc/main/tbb_userguide/examples/blocked_nd_range_example.cpp
@@ -0,0 +1,92 @@
+/*
+    Copyright (c) 2025 Intel Corporation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/*begin_blocked_nd_range_example*/
+#include "oneapi/tbb/blocked_nd_range.h"
+#include "oneapi/tbb/parallel_for.h"
+
+template<typename Features>
+float kernel3d(const Features& feature_maps, int i, int j, int k,
+               int kernel_length, int kernel_width, int kernel_height) {
+    float result = 0.f;
+
+    for (int feature_i = i; feature_i < i + kernel_length; ++feature_i)
+        for (int feature_j = j; feature_j < j + kernel_width; ++feature_j)
+            for (int feature_k = k; feature_k < k + kernel_width; ++feature_k)
+                result += feature_maps[feature_i][feature_j][feature_k];
+
+    return result;
+}
+
+template<typename Features, typename Output>
+void convolution3d(const Features& feature_maps, Output& out,
+                   int out_length, int out_width, int out_heigth,
+                   int kernel_length, int kernel_width, int kernel_height) {
+    using range_t = oneapi::tbb::blocked_nd_range<int, 3>;
+
+    oneapi::tbb::parallel_for(
+        range_t({0, out_length}, {0, out_width}, {0, out_heigth}),
+        [&](const range_t& out_range) {
+            auto out_x = out_range.dim(0);
+            auto out_y = out_range.dim(1);
+            auto out_z = out_range.dim(2);
+
+            for (int i = out_x.begin(); i < out_x.end(); ++i)
+                for (int j = out_y.begin(); j < out_y.end(); ++j)
+                    for (int k = out_z.begin(); k < out_z.end(); ++k)
+                        out[i][j][k] = kernel3d(feature_maps, i, j, k,
+                                                kernel_length, kernel_width, kernel_height);
+        }
+    );
+}
+/*end_blocked_nd_range_example*/
+
+#include <vector>
+#include <cassert>
+
+int main() {
+    const int kernel_length = 9;
+    const int kernel_width = 5;
+    const int kernel_height = 5;
+
+    const int feature_maps_length = 128;
+    const int feature_maps_width = 16;
+    const int feature_maps_heigth = 16;
+
+    const int out_length = feature_maps_length - kernel_length + 1;
+    const int out_width = feature_maps_width - kernel_width + 1;
+    const int out_heigth = feature_maps_heigth - kernel_height + 1;
+
+    // Initializes feature maps with 1 in each cell and out with zeros.
+    std::vector<std::vector<std::vector<float>>> feature_maps(feature_maps_length, std::vector<std::vector<float>>(feature_maps_width, std::vector<float>(feature_maps_heigth, 1.0f)));
+    std::vector<std::vector<std::vector<float>>> out(out_length, std::vector<std::vector<float>>(out_width, std::vector<float>(out_heigth, 0.f)));
+
+    // 3D convolution calculates the sum of all elements in the kernel
+    convolution3d(feature_maps, out,
+                  out_length, out_width, out_heigth,
+                  kernel_length, kernel_width, kernel_height);
+
+    // Checks correctness of convolution by equality to the expected sum of elements
+    float expected = float(kernel_length * kernel_height * kernel_width);
+    for (auto i : out) {
+        for (auto j : i) {
+            for (auto k : j) {
+                assert(k == expected && "convolution failed to calculate correctly");
+            }
+        }
+    }
+    return 0;
+}
diff --git a/external/tbb/doc/main/tbb_userguide/examples/flow_graph_examples.cpp b/external/tbb/doc/main/tbb_userguide/examples/flow_graph_examples.cpp
new file mode 100644
index 00000000..5c66a9c8
--- /dev/null
+++ b/external/tbb/doc/main/tbb_userguide/examples/flow_graph_examples.cpp
@@ -0,0 +1,72 @@
+/*
+    Copyright (c) 2022-2025 Intel Corporation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/* Flow Graph Code Example for the Userguide.
+*/
+
+#include <oneapi/tbb/flow_graph.h>
+#include <vector>
+
+using namespace tbb::flow;
+
+//! Example shows how to set the most performant core type as the preferred one
+//! for a graph execution.
+static void flow_graph_attach_to_arena_1() {
+/*begin_attach_to_arena_1*/
+    std::vector<tbb::core_type_id> core_types = tbb::info::core_types();
+    tbb::task_arena arena(
+        tbb::task_arena::constraints{}.set_core_type(core_types.back())
+    );
+
+    arena.execute( [&]() {
+        graph g;
+        function_node< int > f( g, unlimited, []( int ) {
+             /*the most performant core type is defined as preferred.*/
+        } );
+        f.try_put(1);
+        g.wait_for_all();
+    } );
+/*end_attach_to_arena_1*/
+}
+
+//! Reattach existing graph to an arena with the most performant core type as
+//! the preferred one for a work execution.
+static void flow_graph_attach_to_arena_2() {
+/*begin_attach_to_arena_2*/
+    graph g;
+    function_node< int > f( g, unlimited, []( int ) {
+        /*the most performant core type is defined as preferred.*/
+    } );
+
+    std::vector<tbb::core_type_id> core_types = tbb::info::core_types();
+    tbb::task_arena arena(
+        tbb::task_arena::constraints{}.set_core_type(core_types.back())
+    );
+
+    arena.execute( [&]() {
+        g.reset();
+    } );
+    f.try_put(1);
+    g.wait_for_all();
+/*end_attach_to_arena_2*/
+}
+
+int main() {
+    flow_graph_attach_to_arena_1();
+    flow_graph_attach_to_arena_2();
+
+    return 0;
+}
diff --git a/external/tbb/doc/main/tbb_userguide/examples/parallel_for_lambda_example_1.cpp b/external/tbb/doc/main/tbb_userguide/examples/parallel_for_lambda_example_1.cpp
new file mode 100644
index 00000000..6d14eec1
--- /dev/null
+++ b/external/tbb/doc/main/tbb_userguide/examples/parallel_for_lambda_example_1.cpp
@@ -0,0 +1,39 @@
+/*
+    Copyright (c) 2025 Intel Corporation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+void Foo(float) {}
+
+/*begin_parallel_for_lambda_1*/
+#include "oneapi/tbb.h"
+
+using namespace oneapi::tbb;
+
+void ParallelApplyFoo( float* a, size_t n ) {
+    parallel_for( blocked_range<size_t>(0,n),
+        [=](const blocked_range<size_t>& r) {
+            for(size_t i=r.begin(); i!=r.end(); ++i)
+                Foo(a[i]);
+        }
+    );
+}
+/*end_parallel_for_lambda_1*/
+
+int main() {
+    constexpr std::size_t size = 10;
+    float array[size] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
+
+    ParallelApplyFoo(array, size);
+}
diff --git a/external/tbb/doc/main/tbb_userguide/examples/parallel_for_lambda_example_2.cpp b/external/tbb/doc/main/tbb_userguide/examples/parallel_for_lambda_example_2.cpp
new file mode 100644
index 00000000..043abb77
--- /dev/null
+++ b/external/tbb/doc/main/tbb_userguide/examples/parallel_for_lambda_example_2.cpp
@@ -0,0 +1,36 @@
+/*
+    Copyright (c) 2025 Intel Corporation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+void Foo(float) {}
+
+/*begin_parallel_for_lambda_2*/
+#include "oneapi/tbb.h"
+
+using namespace oneapi::tbb;
+
+#pragma warning(disable: 588)
+
+void ParallelApplyFoo(float a[], size_t n) {
+    parallel_for(size_t(0), n, [=](size_t i) {Foo(a[i]);});
+}
+/*end_parallel_for_lambda_2*/
+
+int main() {
+    constexpr std::size_t size = 10;
+    float array[size] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
+
+    ParallelApplyFoo(array, size);
+}
diff --git a/external/tbb/doc/main/tbb_userguide/examples/parallel_for_os_example.cpp b/external/tbb/doc/main/tbb_userguide/examples/parallel_for_os_example.cpp
new file mode 100644
index 00000000..66759388
--- /dev/null
+++ b/external/tbb/doc/main/tbb_userguide/examples/parallel_for_os_example.cpp
@@ -0,0 +1,51 @@
+/*
+    Copyright (c) 2025 Intel Corporation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+void Foo(float) {}
+
+/*begin_parallel_for_os_1*/
+#include "oneapi/tbb.h"
+
+using namespace oneapi::tbb;
+
+class ApplyFoo {
+    float *const my_a;
+public:
+    void operator()( const blocked_range<size_t>& r ) const {
+        float *a = my_a;
+        for( size_t i=r.begin(); i!=r.end(); ++i )
+            Foo(a[i]);
+    }
+    ApplyFoo( float a[] ) :
+        my_a(a)
+    {}
+};
+/*end_parallel_for_os_1*/
+
+/*begin_parallel_for_os_2*/
+#include "oneapi/tbb.h"
+
+void ParallelApplyFoo( float a[], size_t n ) {
+    parallel_for(blocked_range<size_t>(0,n), ApplyFoo(a));
+}
+/*end_parallel_for_os_2*/
+
+int main() {
+    constexpr std::size_t size = 10;
+    float array[size] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
+
+    ParallelApplyFoo(array, size);
+}
diff --git a/external/tbb/doc/main/tbb_userguide/parallel_for.rst b/external/tbb/doc/main/tbb_userguide/parallel_for_os.rst
similarity index 81%
rename from external/tbb/doc/main/tbb_userguide/parallel_for.rst
rename to external/tbb/doc/main/tbb_userguide/parallel_for_os.rst
index 766a4259..3880c1f5 100644
--- a/external/tbb/doc/main/tbb_userguide/parallel_for.rst
+++ b/external/tbb/doc/main/tbb_userguide/parallel_for_os.rst
@@ -26,25 +26,10 @@ that operates on a chunk. The form is an STL-style function object,
 called the *body* object, in which ``operator()`` processes a chunk. The
 following code declares the body object.
 
-::
-
-   #include "oneapi/tbb.h"
-
-   using namespace oneapi::tbb;
-
-   class ApplyFoo {
-       float *const my_a;
-   public:
-       void operator()( const blocked_range<size_t>& r ) const {
-           float *a = my_a;
-           for( size_t i=r.begin(); i!=r.end(); ++i ) 
-              Foo(a[i]);
-       }
-       ApplyFoo( float a[] ) :
-           my_a(a)
-       {}
-   };
-
+.. literalinclude:: ./examples/parallel_for_os_example.cpp
+    :language: c++
+    :start-after: /*begin_parallel_for_os_1*/
+    :end-before: /*end_parallel_for_os_1*/
 
 The ``using`` directive in the example enables you to use the library
 identifiers without having to write out the namespace prefix ``oneapi::tbb``
@@ -55,8 +40,9 @@ before each identifier. The rest of the examples assume that such a
 Note the argument to ``operator()``. A ``blocked_range<T>`` is a
 template class provided by the library. It describes a one-dimensional
 iteration space over type ``T``. Class ``parallel_for`` works with other
-kinds of iteration spaces too. The library provides ``blocked_range2d``
-for two-dimensional spaces. You can define your own spaces as explained
+kinds of iteration spaces too. The library provides ``blocked_range2d``,
+``blocked_range3d``, and ``blocked_nd_range`` for multidimensional spaces.
+You can define your own spaces as explained
 in :ref:`Advanced_Topic_Other_Kinds_of_Iteration_Spaces`.
 
 
@@ -97,17 +83,10 @@ example:
 Once you have the loop body written as a body object, invoke the
 template function ``parallel_for``, as follows:
 
-
-::
-
-
-   #include "oneapi/tbb.h"
-    
-
-   void ParallelApplyFoo( float a[], size_t n ) {
-       parallel_for(blocked_range<size_t>(0,n), ApplyFoo(a));
-   }
-
+.. literalinclude:: ./examples/parallel_for_os_example.cpp
+    :language: c++
+    :start-after: /*begin_parallel_for_os_2*/
+    :end-before: /*end_parallel_for_os_2*/
 
 The ``blocked_range`` constructed here represents the entire iteration
 space from 0 to n-1, which ``parallel_for`` divides into subspaces for
@@ -120,11 +99,4 @@ example uses the default grainsize of 1 because by default
 ``parallel_for`` applies a heuristic that works well with the default
 grainsize.
 
-.. toctree::
-   :maxdepth: 4
-
-   ../tbb_userguide/Lambda_Expressions
-   ../tbb_userguide/Automatic_Chunking
-   ../tbb_userguide/Controlling_Chunking
-   ../tbb_userguide/Bandwidth_and_Cache_Affinity
-   ../tbb_userguide/Partitioner_Summary
+.. include:: parallel_for_toctree.rst
diff --git a/external/tbb/doc/main/tbb_userguide/parallel_for_toctree.rst b/external/tbb/doc/main/tbb_userguide/parallel_for_toctree.rst
new file mode 100644
index 00000000..75e8fb5c
--- /dev/null
+++ b/external/tbb/doc/main/tbb_userguide/parallel_for_toctree.rst
@@ -0,0 +1,10 @@
+.. _parallel_for_toctree:
+
+.. toctree::
+   :maxdepth: 4
+
+   ../tbb_userguide/Lambda_Expressions
+   ../tbb_userguide/Automatic_Chunking
+   ../tbb_userguide/Controlling_Chunking_os
+   ../tbb_userguide/Bandwidth_and_Cache_Affinity_os
+   ../tbb_userguide/Partitioner_Summary
\ No newline at end of file
diff --git a/external/tbb/doc/main/tbb_userguide/snippets/blocked_nd_range_example.cpp b/external/tbb/doc/main/tbb_userguide/snippets/blocked_nd_range_example.cpp
new file mode 100644
index 00000000..74171239
--- /dev/null
+++ b/external/tbb/doc/main/tbb_userguide/snippets/blocked_nd_range_example.cpp
@@ -0,0 +1,37 @@
+#include "blocked_nd_range_example.h"
+#include <vector>
+#include <cassert>
+
+int main() {
+    const int kernel_length = 9;
+    const int kernel_width = 5;
+    const int kernel_height = 5;
+
+    const int feature_maps_length = 128;
+    const int feature_maps_width = 16;
+    const int feature_maps_heigth = 16;
+
+    const int out_length = feature_maps_length - kernel_length + 1;
+    const int out_width = feature_maps_width - kernel_width + 1;
+    const int out_heigth = feature_maps_heigth - kernel_height + 1;
+
+    // Initializes feature maps with 1 in each cell and out with zeros.
+    std::vector<std::vector<std::vector<float>>> feature_maps(feature_maps_length, std::vector<std::vector<float>>(feature_maps_width, std::vector<float>(feature_maps_heigth, 1.0f)));
+    std::vector<std::vector<std::vector<float>>> out(out_length, std::vector<std::vector<float>>(out_width, std::vector<float>(out_heigth, 0.f)));
+
+    // 3D convolution calculates the sum of all elements in the kernel
+    convolution3d(feature_maps, out,
+                  out_length, out_width, out_heigth,
+                  kernel_length, kernel_width, kernel_height);
+
+    // Checks correctness of convolution by equality to the expected sum of elements
+    float expected = float(kernel_length * kernel_height * kernel_width);
+    for (auto i : out) {
+        for (auto j : i) {
+            for (auto k : j) {
+                assert(k == expected && "convolution failed to calculate correctly");
+            }
+        }
+    }
+    return 0;
+}
diff --git a/external/tbb/doc/main/tbb_userguide/snippets/blocked_nd_range_example.h b/external/tbb/doc/main/tbb_userguide/snippets/blocked_nd_range_example.h
new file mode 100644
index 00000000..ded2a09c
--- /dev/null
+++ b/external/tbb/doc/main/tbb_userguide/snippets/blocked_nd_range_example.h
@@ -0,0 +1,37 @@
+#include "oneapi/tbb/blocked_nd_range.h"
+#include "oneapi/tbb/parallel_for.h"
+
+template<typename Features>
+float kernel3d(const Features& feature_maps, int i, int j, int k,
+               int kernel_length, int kernel_width, int kernel_height) {
+    float result = 0.f;
+
+    for (int feature_i = i; feature_i < i + kernel_length; ++feature_i)
+        for (int feature_j = j; feature_j < j + kernel_width; ++feature_j)
+            for (int feature_k = k; feature_k < k + kernel_width; ++feature_k)
+                result += feature_maps[feature_i][feature_j][feature_k];
+
+    return result;
+}
+
+template<typename Features, typename Output>
+void convolution3d(const Features& feature_maps, Output& out,
+                   int out_length, int out_width, int out_heigth,
+                   int kernel_length, int kernel_width, int kernel_height) {
+    using range_t = oneapi::tbb::blocked_nd_range<int, 3>;
+
+    oneapi::tbb::parallel_for(
+        range_t({0, out_length}, {0, out_width}, {0, out_heigth}),
+        [&](const range_t& out_range) {
+            auto out_x = out_range.dim(0);
+            auto out_y = out_range.dim(1);
+            auto out_z = out_range.dim(2);
+
+            for (int i = out_x.begin(); i < out_x.end(); ++i)
+                for (int j = out_y.begin(); j < out_y.end(); ++j)
+                    for (int k = out_z.begin(); k < out_z.end(); ++k)
+                        out[i][j][k] = kernel3d(feature_maps, i, j, k,
+                                                kernel_length, kernel_width, kernel_height);
+        }
+    );
+}
diff --git a/external/tbb/doc/main/tbb_userguide/snippets/flow_graph_examples.cpp b/external/tbb/doc/main/tbb_userguide/snippets/flow_graph_examples.cpp
new file mode 100644
index 00000000..72c594c5
--- /dev/null
+++ b/external/tbb/doc/main/tbb_userguide/snippets/flow_graph_examples.cpp
@@ -0,0 +1,72 @@
+/*
+    Copyright (c) 2022 Intel Corporation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/* Flow Graph Code Example for the Userguide.
+*/
+
+#include <oneapi/tbb/flow_graph.h>
+#include <vector>
+
+using namespace tbb::flow;
+
+//! Example shows how to set the most performant core type as the preferred one
+//! for a graph execution.
+static void flow_graph_attach_to_arena_1() {
+/*begin_attach_to_arena_1*/
+    std::vector<tbb::core_type_id> core_types = tbb::info::core_types();
+    tbb::task_arena arena(
+        tbb::task_arena::constraints{}.set_core_type(core_types.back())
+    );
+
+    arena.execute( [&]() {
+        graph g;
+        function_node< int > f( g, unlimited, []( int ) {
+             /*the most performant core type is defined as preferred.*/
+        } );
+        f.try_put(1);
+        g.wait_for_all();
+    } );
+/*end_attach_to_arena_1*/
+}
+
+//! Reattach existing graph to an arena with the most performant core type as
+//! the preferred one for a work execution.
+static void flow_graph_attach_to_arena_2() {
+/*begin_attach_to_arena_2*/
+    graph g;
+    function_node< int > f( g, unlimited, []( int ) {
+        /*the most performant core type is defined as preferred.*/
+    } );
+
+    std::vector<tbb::core_type_id> core_types = tbb::info::core_types();
+    tbb::task_arena arena(
+        tbb::task_arena::constraints{}.set_core_type(core_types.back())
+    );
+
+    arena.execute( [&]() {
+        g.reset();
+    } );
+    f.try_put(1);
+    g.wait_for_all();
+/*end_attach_to_arena_2*/
+}
+
+int main() {
+    flow_graph_attach_to_arena_1();
+    flow_graph_attach_to_arena_2();
+
+    return 0;
+}
diff --git a/external/tbb/doc/main/tbb_userguide/std_invoke.rst b/external/tbb/doc/main/tbb_userguide/std_invoke.rst
new file mode 100644
index 00000000..d536eae8
--- /dev/null
+++ b/external/tbb/doc/main/tbb_userguide/std_invoke.rst
@@ -0,0 +1,217 @@
+.. _std_invoke:
+
+Invoke a Callable Object
+==========================
+
+Starting from C++17, the requirements for callable objects passed to algorithms or Flow Graph nodes are relaxed. It allows using additional types of bodies. 
+Previously, the body of the algorithm or Flow Graph node needed to be a Function Object (see `C++ Standard Function Object <https://en.cppreference.com/w/cpp/utility/functional>`_) and provide an 
+``operator()`` that accepts input parameters. 
+
+Now the body needs to meet the more relaxed requirements of being Callable (see `C++ Standard Callable <https://en.cppreference.com/w/cpp/named_req/Callable>`_) that covers three types of objects:
+
+* **Function Objects that provide operator(arg1, arg2, ...)**, which accepts the input parameters
+* **Pointers to member functions** that you can use as the body of the algorithm or the Flow Graph node
+* **Pointers to member objects** work as the body of the algorithm or parallel construct
+
+You can use it not only for a Flow Graph but also for algorithms. See the example below: 
+
+.. code::
+   
+    // The class models oneTBB Range 
+    class StrideRange {
+    public:
+        StrideRange(int* s, std::size_t sz, std::size_t str)
+            : start(s), size(sz), stride(str) {}
+
+        // A copy constructor
+        StrideRange(const StrideRange&) = default;
+
+        // A splitting constructor
+        StrideRange(StrideRange& other, oneapi::tbb::split) 
+            : start(other.start), size(other.size / 2)
+        {
+            other.size -= size;
+            other.start += size;
+        }
+
+        ~StrideRange() = default;
+
+        // Indicate if the range is empty
+        bool empty() const {
+            return size == 0;
+        }
+
+        // Indicate if the range can be divided
+        bool is_divisible() const {
+            return size >= stride;
+        }
+
+        void iterate() const {
+            for (std::size_t i = 0; i < size; i += stride) {
+                // Performed an action for each element of the range,
+                // implement the code based on your requirements
+            }
+        }
+
+    private:
+        int* start;
+        std::size_t size;
+        std::size_t stride;
+    };
+
+Where:
+
+* The ``StrideRange`` class models oneTBB range that should be iterated with a specified stride during its initial construction. 
+* The ``stride`` value is stored in a private field within the range. Therefore, the class provides the member function ``iterate() const`` that implements a loop with the specified stride. 
+
+``range.iterate()``
+*******************
+
+Before C++17, to utilize a range in a parallel algorithm, such as ``parallel_for``, it was required to provide a ``Function Object`` as the algorithm's body. This Function Object defined the operations to be executed on each iteration of the range:
+
+.. code:: 
+
+    int main() {
+        std::size_t array_size = 1000;
+
+        int* array_to_iterate = new int[array_size];
+        
+        StrideRange range(array_to_iterate, array_size, /* stride = */ 2);
+
+        // Define a lambda function as the body of the parallel_for loop
+        auto pfor_body = [] (const StrideRange& range) {
+            range.iterate();
+        };
+
+        // Perform parallel iteration 
+        oneapi::tbb::parallel_for(range, pfor_body);
+
+        delete[] array_to_iterate;
+    }
+
+An additional lambda function ``pfor_body`` was also required. This lambda function invoked the ``rage.iterate()`` function.
+
+Now with C++17, you can directly utilize a pointer to ``range.iterate()`` as the body of the algorithm:
+
+.. code::
+   
+    int main() {
+        std::size_t array_size = 1000;
+
+        int* array_to_iterate = new int[array_size];
+
+        // Performs the iteration over the array elements with the specified stride
+        StrideRange range(array_to_iterate, array_size, /* stride = */ 2);
+
+        // Parallelize the iteration over the range object
+        oneapi::tbb::parallel_for(range, &StrideRange::iterate);
+
+        delete[] array_to_iterate;
+    }
+
+``std::invoke``
+****************
+
+``std::invoke`` is a function template that provides a syntax for invoking different types of callable objects with a set of arguments.
+
+oneTBB implementation uses the C++ standard function ``std::invoke(&StrideRange::iterate, range)`` to execute the body. It is the equivalent of ``range.iterate()``.
+Therefore, it allows you to invoke a callable object, such as a function object, with the provided arguments. 
+
+.. tip:: Refer to `C++ Standard <https://en.cppreference.com/w/cpp/utility/functional/invoke>`_ to learn more about ``std::invoke``. 
+
+Example
+^^^^^^^^
+
+Consider a specific scenario with ``function_node`` within a Flow Graph.
+
+In the example below, a ``function_node`` takes an object as an input to read a member object of that input and proceed it to the next node in the graph:
+
+.. code:: 
+
+    struct Object {
+        int number;
+    };
+
+    int main() {
+        using namespace oneapi::tbb::flow;
+
+        // Lambda function to read the member object of the input Object
+        auto number_reader = [] (const Object& obj) {
+            return obj.number;
+        };
+
+        // Lambda function to process the received integer
+        auto number_processor = [] (int i) { /* processing integer */ };
+
+        graph g;
+
+        // Function node that takes an Object as input and produces an integer
+        function_node<Object, int> func1(g, unlimited, number_reader);
+
+        // Function node that takes an integer as input and processes it
+        function_node<int, int> func2(g, unlimited, number_processor);
+
+        // Connect the function nodes
+        make_edge(func1, func2);
+
+        // Provide produced input to the graph
+        func1.try_put(Object{1});
+
+        // Wait for the graph to complete
+        g.wait_for_all();
+    }
+
+
+Before C++17, the ``function_node`` in the Flow Graph required the body to be a Function Object. A lambda function was required to extract the number from the Object. 
+
+With C++17, you can use ``std::invoke`` with a pointer to the member number directly as the body. 
+
+You can update the previous example as follows:
+
+.. code::
+
+    struct Object {
+        int number;
+    };
+
+    int main() {
+        using namespace oneapi::tbb::flow;
+ 
+        // The processing logic for the received integer
+        auto number_processor = [] (int i) { /* processing integer */ };
+
+        // Create a graph object g to hold the flow graph
+        graph g;
+
+        // Use a member function pointer to the number member of the Object struct as the body
+        function_node<Object, int> func1(g, unlimited, &Object::number);
+
+        // Use the number_processor lambda function as the body
+        function_node<int, int> func2(g, unlimited, number_processor);
+
+        // Connect the function nodes
+        make_edge(func1, func2);
+
+        // Connect the function nodes
+        func1.try_put(Object{1});
+
+       // Wait for the graph to complete
+       g.wait_for_all();
+    }
+
+Find More 
+*********
+
+The following APIs supports Callable object as Bodies: 
+
+* `parallel_for <https://uxlfoundation.github.io/oneAPI-spec/spec/elements/oneTBB/source/algorithms/functions/parallel_for_func.html>`_
+* `parallel_reduce <https://uxlfoundation.github.io/oneAPI-spec/spec/elements/oneTBB/source/algorithms/functions/parallel_reduce_func.html>`_
+* `parallel_deterministic_reduce <https://uxlfoundation.github.io/oneAPI-spec/spec/elements/oneTBB/source/algorithms/functions/parallel_deterministic_reduce_func.html>`_
+* `parallel_for_each <https://uxlfoundation.github.io/oneAPI-spec/spec/elements/oneTBB/source/algorithms/functions/parallel_for_each_func.html>`_
+* `parallel_scan <https://uxlfoundation.github.io/oneAPI-spec/spec/elements/oneTBB/source/algorithms/functions/parallel_scan_func.html>`_ 
+* `parallel_pipeline <https://uxlfoundation.github.io/oneAPI-spec/spec/elements/oneTBB/source/algorithms/functions/parallel_pipeline_func.html>`_ 
+* `function_node <https://uxlfoundation.github.io/oneAPI-spec/spec/elements/oneTBB/source/flow_graph/func_node_cls.html>`_ 
+* `multifunction_node <https://uxlfoundation.github.io/oneAPI-spec/spec/elements/oneTBB/source/flow_graph/multifunc_node_cls.html>`_ 
+* `async_node <https://uxlfoundation.github.io/oneAPI-spec/spec/elements/oneTBB/source/flow_graph/async_node_cls.html>`_ 
+* `sequencer_node <https://uxlfoundation.github.io/oneAPI-spec/spec/elements/oneTBB/source/flow_graph/sequencer_node_cls.html>`_ 
+* `join_node with key_matching policy <https://uxlfoundation.github.io/oneAPI-spec/spec/elements/oneTBB/source/flow_graph/join_node_cls.html>`_ 
diff --git a/external/tbb/doc/main/tbb_userguide/title.rst b/external/tbb/doc/main/tbb_userguide/title.rst
index e03211a1..8adb7093 100644
--- a/external/tbb/doc/main/tbb_userguide/title.rst
+++ b/external/tbb/doc/main/tbb_userguide/title.rst
@@ -8,12 +8,13 @@
 .. toctree::
    :maxdepth: 4
 
-   ../tbb_userguide/Package_Contents
-   ../tbb_userguide/Parallelizing_Simple_Loops
+   ../tbb_userguide/Package_Contents_os
+   ../tbb_userguide/Parallelizing_Simple_Loops_os
    ../tbb_userguide/Parallelizing_Complex_Loops
    ../tbb_userguide/Flow_Graph
    ../tbb_userguide/work_isolation
    ../tbb_userguide/Exceptions_and_Cancellation
+   ../tbb_userguide/Floating_Point_Settings
    ../tbb_userguide/Containers
    ../tbb_userguide/Mutual_Exclusion
    ../tbb_userguide/Timing
@@ -22,6 +23,7 @@
    ../tbb_userguide/design_patterns/Design_Patterns
    ../tbb_userguide/Migration_Guide
    ../tbb_userguide/Constraints
+   ../tbb_userguide/std_invoke
    ../tbb_userguide/appendix_A
    ../tbb_userguide/appendix_B
    ../tbb_userguide/References
diff --git a/external/tbb/doc/main/tbb_userguide/use_graph_reset.rst b/external/tbb/doc/main/tbb_userguide/use_graph_reset.rst
index 2fbcf286..1941462b 100644
--- a/external/tbb/doc/main/tbb_userguide/use_graph_reset.rst
+++ b/external/tbb/doc/main/tbb_userguide/use_graph_reset.rst
@@ -1,11 +1,11 @@
 .. _use_graph_reset:
 
-Use graph::reset() to Reset a Canceled Graph
-============================================
+Use ``graph::reset()`` to Reset a Canceled Graph
+================================================
 
 
 When a graph execution is canceled either because of an unhandled
-exception or because its task_group_context is canceled explicitly, the
+exception or because its ``task_group_context`` is canceled explicitly, the
 graph and its nodes may be left in an indeterminate state. For example,
 in the code samples shown in :ref:`cancel_a_graph` the input 2 may be
 left in a buffer. But even beyond remnants in the buffers, there are
diff --git a/external/tbb/doc/main/tbb_userguide/use_input_node.rst b/external/tbb/doc/main/tbb_userguide/use_input_node.rst
index 79e4952f..31f71cf0 100644
--- a/external/tbb/doc/main/tbb_userguide/use_input_node.rst
+++ b/external/tbb/doc/main/tbb_userguide/use_input_node.rst
@@ -58,10 +58,10 @@ However, this approach serializes graph construction and graph
 execution.
 
 
-Some graphs can be constructed safely with ``input_node``s active, allowing
+Some graphs can be constructed safely with ``input_node`` active, allowing
 the overlap of construction and execution. If your graph is a directed
 acyclic graph (DAG), and each ``input_node`` has only one successor, you
-can activate your ``input_node``s just after their construction if you construct the
+can activate your ``input_node`` just after their construction if you construct the
 edges in reverse topological order; that is, make the edges at the
 largest depth in the tree first, and work back to the shallowest edges.
 For example, if src is an ``input_node`` and ``func1`` and ``func2`` are both
diff --git a/external/tbb/doc/main/tbb_userguide/use_make_edge.rst b/external/tbb/doc/main/tbb_userguide/use_make_edge.rst
index 01b97609..94facdee 100644
--- a/external/tbb/doc/main/tbb_userguide/use_make_edge.rst
+++ b/external/tbb/doc/main/tbb_userguide/use_make_edge.rst
@@ -7,18 +7,18 @@ Use make_edge and remove_edge
 These are the basic guidelines for creating and removing edges:
 
 
--  use make_edge and remove_edge
+-  Use ``make_edge`` and ``remove_edge``
 
 
--  Avoid using register_successor and register_predecessor
+-  Avoid using ``register_successor`` and ``register_predecessor``
 
 
--  Avoid using remove_successor and remove_predecessor
+-  Avoid using ``remove_successor`` and ``remove_predecessor``
 
 
 As a convention, to communicate the topology, use only functions
-flow::make_edge and flow::remove_edge. The runtime library uses node
-functions, such as sender<T>::register_successor, to create these edges,
+``flow::make_edge`` and ``flow::remove_edge``. The runtime library uses node
+functions, such as ``sender<T>::register_successor``, to create these edges,
 but those functions should not be called directly. The runtime library
 calls these node functions directly to implement optimizations on the
 topology at runtime.
diff --git a/external/tbb/doc/make.bat b/external/tbb/doc/make.bat
new file mode 100644
index 00000000..14d399a5
--- /dev/null
+++ b/external/tbb/doc/make.bat
@@ -0,0 +1,53 @@
+@ECHO OFF
+
+rem ============================================================================
+rem Copyright (C) 2022 Intel Corporation
+rem
+rem Licensed under the Apache License, Version 2.0 (the "License");
+rem you may not use this file except in compliance with the License.
+rem You may obtain a copy of the License at
+rem
+rem     http://www.apache.org/licenses/LICENSE-2.0
+rem
+rem Unless required by applicable law or agreed to in writing, software
+rem distributed under the License is distributed on an "AS IS" BASIS,
+rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+rem See the License for the specific language governing permissions and
+rem limitations under the License.
+rem ============================================================================
+
+
+
+pushd %~dp0
+
+REM Command file for Sphinx documentation
+
+if "%SPHINXBUILD%" == "" (
+	set SPHINXBUILD=sphinx-build
+)
+set SOURCEDIR=.
+set BUILDDIR=build
+
+if "%1" == "" goto help
+
+%SPHINXBUILD% >NUL 2>NUL
+if errorlevel 9009 (
+	echo.
+	echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
+	echo.installed, then set the SPHINXBUILD environment variable to point
+	echo.to the full path of the 'sphinx-build' executable. Alternatively you
+	echo.may add the Sphinx directory to PATH.
+	echo.
+	echo.If you don't have Sphinx installed, grab it from
+	echo.http://sphinx-doc.org/
+	exit /b 1
+)
+
+%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
+goto end
+
+:help
+%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
+
+:end
+popd
diff --git a/external/tbb/examples/.clang-format b/external/tbb/examples/.clang-format
index d8e3925c..c0b28604 100644
--- a/external/tbb/examples/.clang-format
+++ b/external/tbb/examples/.clang-format
@@ -76,14 +76,14 @@ ForEachMacros:
   - BOOST_FOREACH
 IncludeBlocks: Preserve
 IncludeCategories:
-  - Regex: '^<ext/.*\.h>'
-    Priority: 2
-  - Regex: '^<.*\.h>'
-    Priority: 1
-  - Regex: '^<.*'
-    Priority: 2
-  - Regex: '.*'
-    Priority: 3
+  - Regex:           '^<ext/.*\.h>'
+    Priority:        2
+  - Regex:           '^<.*\.h>'
+    Priority:        1
+  - Regex:           '^<.*'
+    Priority:        2
+  - Regex:           '.*'
+    Priority:        3
 IncludeIsMainRegex: '([-_](test|unittest))?$'
 IndentCaseLabels: true
 IndentPPDirectives: None
@@ -91,7 +91,7 @@ IndentWidth: 4
 IndentWrappedFunctionNames: false
 KeepEmptyLinesAtTheStartOfBlocks: false
 MacroBlockBegin: ''
-MacroBlockEnd: ''
+MacroBlockEnd:   ''
 MaxEmptyLinesToKeep: 1
 NamespaceIndentation: None
 PenaltyBreakAssignment: 2
diff --git a/external/tbb/examples/CMakeLists.txt b/external/tbb/examples/CMakeLists.txt
index 594ddfe1..6cc15353 100644
--- a/external/tbb/examples/CMakeLists.txt
+++ b/external/tbb/examples/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Intel Corporation
+# Copyright (c) 2020-2025 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.5.0...3.31.3)
 
 project(tbb_examples CXX)
 
@@ -29,9 +29,9 @@ macro(tbb_add_example subdir name)
     add_dependencies(run_examples run_${name})
     if (TARGET light_test_${name})
         add_dependencies(light_test_examples light_test_${name})
-    else ()
+    else()
         add_dependencies(light_test_examples run_${name})
-    endif ()
+    endif()
 endmacro()
 
 tbb_add_example(concurrent_hash_map count_strings)
@@ -44,12 +44,12 @@ tbb_add_example(graph binpack)
 # TODO: Consider using FindMKL module
 find_library(MKL_INTEL_LP64_LIB mkl_intel_lp64 PATHS ENV LIBRARY_PATH)
 find_library(MKL_SEQUENTIAL_LIB mkl_sequential PATHS ENV LIBRARY_PATH)
-find_library(MKL_CORE_LIB mkl_core PATHS ENV LIBRARY_PATH)
-if (MKL_INTEL_LP64_LIB AND MKL_SEQUENTIAL_LIB AND MKL_CORE_LIB)
+find_library(MKL_CORE_LIB       mkl_core PATHS ENV LIBRARY_PATH)
+if(MKL_INTEL_LP64_LIB AND MKL_SEQUENTIAL_LIB AND MKL_CORE_LIB)
     tbb_add_example(graph cholesky)
-else ()
+else()
     message(WARNING "Intel(R) Math Kernel Library (Intel(R) MKL) libraries were not found, graph/cholesky example is excluded from the build.")
-endif ()
+endif()
 
 tbb_add_example(graph dining_philosophers)
 tbb_add_example(graph fgbzip2)
@@ -66,6 +66,7 @@ tbb_add_example(parallel_for_each parallel_preorder)
 tbb_add_example(parallel_pipeline square)
 
 tbb_add_example(parallel_reduce convex_hull)
+tbb_add_example(parallel_reduce pi)
 tbb_add_example(parallel_reduce primes)
 
 tbb_add_example(task_arena fractal)
@@ -73,3 +74,5 @@ tbb_add_example(task_arena fractal)
 tbb_add_example(task_group sudoku)
 
 tbb_add_example(test_all fibonacci)
+
+tbb_add_example(migration recursive_fibonacci)
diff --git a/external/tbb/examples/README.md b/external/tbb/examples/README.md
index c9190562..bf38ffba 100644
--- a/external/tbb/examples/README.md
+++ b/external/tbb/examples/README.md
@@ -1,48 +1,42 @@
 # Code Samples of oneAPI Threading Building Blocks (oneTBB)
-
 This directory contains example usages of oneAPI Threading Building Blocks.
 
 | Code sample name | Description
 |:--- |:---
-| getting_started/sub_string_finder | Example referenced by the [oneAPI Threading Building Blocks Get Started Guide](https://software.intel.com/content/www/us/en/develop/documentation/get-started-with-onetbb/top.html). Finds largest matching substrings.
+| getting_started/sub_string_finder | Example referenced by the [oneAPI Threading Building Blocks Get Started Guide](https://uxlfoundation.github.io/oneTBB/GSG/get_started.html#get-started-guide). Finds the largest matching substrings.
 | concurrent_hash_map/count_strings | Concurrently inserts strings into a `concurrent_hash_map` container.
 | concurrent_priority_queue/shortpath | Solves the single source shortest path problem using a  `concurrent_priority_queue` container.
-| graph/binpack | A solution to the binpacking problem using a `queue_node`, a `buffer_node` and `function_node`s.
+| graph/binpack | A solution to the binpacking problem using a `queue_node`, a `buffer_node`, and `function_node`s.
 | graph/cholesky | Several versions of Cholesky Factorization algorithm implementation.
-| graph/dining_philosophers | An implementation of dining philosophers in graph using the reserving `join_node`.
+| graph/dining_philosophers | An implementation of dining philosophers in a graph using the reserving `join_node`.
 | graph/fgbzip2 | A parallel implementation of bzip2 block-sorting file compressor.
 | graph/logic_sim | An example of a collection of digital logic gates that can be easily composed into larger circuits.
 | graph/som | An example of a Kohonen Self-Organizing Map using cancellation.
 | parallel_for/game_of_life | Game of life overlay.
-| parallel_for/polygon_overlay | polygon overlay.
+| parallel_for/polygon_overlay | Polygon overlay.
 | parallel_for/seismic | Parallel seismic wave simulation.
 | parallel_for/tachyon | Parallel 2-D raytracer/renderer.
 | parallel_for_each/parallel_preorder | Parallel preorder traversal of a graph.
 | parallel_pipeline/square | Another string transformation example that squares numbers read from a file.
 | parallel_reduce/convex_hull | Parallel version of convex hull algorithm (quick hull).
+| parallel_reduce/pi | Parallel version of calculating &pi; by numerical integration.
 | parallel_reduce/primes | Parallel version of the Sieve of Eratosthenes.
 | task_arena/fractal |The example calculates two classical Mandelbrot fractals with different concurrency limits.
 | task_group/sudoku | Compute all solutions for a Sudoku board.
 | test_all/fibonacci | Compute Fibonacci numbers in different ways.
 
 ## System Requirements
-
-"Refer to
-the [System Requirements](https://software.intel.com/content/www/us/en/develop/articles/intel-oneapi-threading-building-blocks-system-requirements.html)
-for the list of supported hardware and software".
+Refer to the [System Requirements](https://github.com/uxlfoundation/oneTBB/blob/master/SYSTEM_REQUIREMENTS.md) for the list of supported hardware and software.
 
 ### Graphical User Interface (GUI)
-
-Some examples (fractal, seismic, tachyon, polygon_overlay) supports different GUI modes, which may be defined via
-the `EXAMPLES_UI_MODE` CMake variable. Supported values are:
-
+Some examples (e.g., fractal, seismic, tachyon, polygon_overlay) support different GUI modes, which may be defined via the `EXAMPLES_UI_MODE` CMake variable. 
+Supported values are:
 - Cross-platform:
-  - `con` - Console mode (Default).
-- Windows:
-  - `gdi` - `GDI+` based implementation.
-  - `d2d` - `Direct 2D` based implementation. May offer superior performance, but can only be used if the Microsoft*
-    DirectX* SDK is installed on your system(`DXSDK_DIR` should be defined).
-- Linux:
-  - `x` - `X11` based implementation. Also `libXext` may be required to display the output correctly.
-- MacOS:
-  - `mac` - `OpenGL` based implementation. Also requires the `Foundation` and `Cocoa` libraries availability.
+    - `con` - Console mode (Default).
+- Windows* OS:
+    - `gdi` - `GDI+` based implementation.
+    - `d2d` - `Direct 2D` based implementation. May offer superior performance but can only be used if the Microsoft* DirectX* SDK is installed on your system(`DXSDK_DIR` should be defined).
+- Linux* OS:
+    - `x` - `X11` based implementation. Also `libXext` may be required to display the output correctly.
+- macOS*:
+    - `mac` - `OpenGL` based implementation. Also requires the `Foundation` and `Cocoa` libraries availability.
diff --git a/external/tbb/examples/common/cmake/common.cmake b/external/tbb/examples/common/cmake/common.cmake
index 95f386ad..e420a72e 100644
--- a/external/tbb/examples/common/cmake/common.cmake
+++ b/external/tbb/examples/common/cmake/common.cmake
@@ -19,7 +19,7 @@ macro(set_common_project_settings required_components)
     if (NOT TARGET TBB::tbb)
         list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../common/cmake/modules)
         find_package(TBB REQUIRED COMPONENTS ${required_components})
-    endif ()
+    endif()
     find_package(Threads REQUIRED)
 
     # ---------------------------------------------------------------------------------------------------------
@@ -27,11 +27,11 @@ macro(set_common_project_settings required_components)
     if (NOT MSVC)  # no need to cover MSVC as it uses C++14 by default.
         if (NOT CMAKE_CXX_STANDARD)
             set(CMAKE_CXX_STANDARD 11)
-        endif ()
+        endif()
         if (CMAKE_CXX${CMAKE_CXX_STANDARD}_STANDARD_COMPILE_OPTION)  # if standard option was detected by CMake
             set(CMAKE_CXX_STANDARD_REQUIRED ON)
-        endif ()
-    endif ()
+        endif()
+    endif()
 
     set(CMAKE_CXX_EXTENSIONS OFF) # use -std=c++... instead of -std=gnu++...
     # ---------------------------------------------------------------------------------------------------------
@@ -40,9 +40,9 @@ endmacro()
 macro(add_execution_target TARGET_NAME TARGET_DEPENDENCIES EXECUTABLE ARGS)
     if (WIN32)
         add_custom_target(${TARGET_NAME} set "PATH=$<TARGET_FILE_DIR:TBB::tbb>\\;$ENV{PATH}" & ${EXECUTABLE} ${ARGS})
-    else ()
+    else()
         add_custom_target(${TARGET_NAME} ${EXECUTABLE} ${ARGS})
-    endif ()
+    endif()
 
     add_dependencies(${TARGET_NAME} ${TARGET_DEPENDENCIES})
 endmacro()
diff --git a/external/tbb/examples/common/cmake/modules/FindTBB.cmake b/external/tbb/examples/common/cmake/modules/FindTBB.cmake
index 610f3f29..559b3045 100644
--- a/external/tbb/examples/common/cmake/modules/FindTBB.cmake
+++ b/external/tbb/examples/common/cmake/modules/FindTBB.cmake
@@ -19,22 +19,22 @@ find_package(TBB QUIET CONFIG)
 if (TBB_FOUND)
     find_package_handle_standard_args(TBB CONFIG_MODE)
     return()
-endif ()
+endif()
 
 if (NOT TBB_FIND_COMPONENTS)
     set(TBB_FIND_COMPONENTS tbb tbbmalloc)
     foreach (_tbb_component ${TBB_FIND_COMPONENTS})
         set(TBB_FIND_REQUIRED_${_tbb_component} 1)
-    endforeach ()
-endif ()
+    endforeach()
+endif()
 
 if (WIN32)
     list(APPEND ADDITIONAL_LIB_DIRS ENV PATH ENV LIB)
     list(APPEND ADDITIONAL_INCLUDE_DIRS ENV INCLUDE ENV CPATH)
-else ()
+else()
     list(APPEND ADDITIONAL_LIB_DIRS ENV LIBRARY_PATH ENV LD_LIBRARY_PATH ENV DYLD_LIBRARY_PATH)
     list(APPEND ADDITIONAL_INCLUDE_DIRS ENV CPATH ENV C_INCLUDE_PATH ENV CPLUS_INCLUDE_PATH ENV INCLUDE_PATH)
-endif ()
+endif()
 
 find_path(_tbb_include_dir NAMES tbb/tbb.h PATHS ${ADDITIONAL_INCLUDE_DIRS})
 
@@ -48,42 +48,42 @@ if (_tbb_include_dir)
             add_library(TBB::${_tbb_component} SHARED IMPORTED)
             set_property(TARGET TBB::${_tbb_component} APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${_tbb_include_dir})
 
-            foreach (_TBB_BUILD_MODE ${_TBB_BUILD_MODES})
+            foreach(_TBB_BUILD_MODE ${_TBB_BUILD_MODES})
                 set(_tbb_component_lib_name ${_tbb_component}${_TBB_${_TBB_BUILD_MODE}_SUFFIX})
                 if (WIN32)
                     find_library(${_tbb_component_lib_name}_lib ${_tbb_component_lib_name} PATHS ${ADDITIONAL_LIB_DIRS})
                     find_file(${_tbb_component_lib_name}_dll ${_tbb_component_lib_name}.dll PATHS ${ADDITIONAL_LIB_DIRS})
 
                     set_target_properties(TBB::${_tbb_component} PROPERTIES
-                            IMPORTED_LOCATION_${_TBB_BUILD_MODE} "${${_tbb_component_lib_name}_dll}"
-                            IMPORTED_IMPLIB_${_TBB_BUILD_MODE} "${${_tbb_component_lib_name}_lib}"
-                            )
-                else ()
+                                          IMPORTED_LOCATION_${_TBB_BUILD_MODE} "${${_tbb_component_lib_name}_dll}"
+                                          IMPORTED_IMPLIB_${_TBB_BUILD_MODE}   "${${_tbb_component_lib_name}_lib}"
+                                          )
+                else()
                     find_library(${_tbb_component_lib_name}_so ${_tbb_component_lib_name} PATHS ${ADDITIONAL_LIB_DIRS})
 
                     set_target_properties(TBB::${_tbb_component} PROPERTIES
-                            IMPORTED_LOCATION_${_TBB_BUILD_MODE} "${${_tbb_component_lib_name}_so}"
-                            )
-                endif ()
+                                          IMPORTED_LOCATION_${_TBB_BUILD_MODE} "${${_tbb_component_lib_name}_so}"
+                                          )
+                endif()
                 if (${_tbb_component_lib_name}_lib AND ${_tbb_component_lib_name}_dll OR ${_tbb_component_lib_name}_so)
                     set_property(TARGET TBB::${_tbb_component} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${_TBB_BUILD_MODE})
                     list(APPEND TBB_IMPORTED_TARGETS TBB::${_tbb_component})
                     set(TBB_${_tbb_component}_FOUND 1)
-                endif ()
+                endif()
                 unset(${_tbb_component_lib_name}_lib CACHE)
                 unset(${_tbb_component_lib_name}_dll CACHE)
                 unset(${_tbb_component_lib_name}_so CACHE)
                 unset(_tbb_component_lib_name)
-            endforeach ()
-        endif ()
-    endforeach ()
+            endforeach()
+        endif()
+    endforeach()
     unset(_TBB_BUILD_MODESS)
     unset(_TBB_DEBUG_SUFFIX)
-endif ()
+endif()
 unset(_tbb_include_dir CACHE)
 
 list(REMOVE_DUPLICATES TBB_IMPORTED_TARGETS)
 
 find_package_handle_standard_args(TBB
-        REQUIRED_VARS TBB_IMPORTED_TARGETS
-        HANDLE_COMPONENTS)
+                                  REQUIRED_VARS TBB_IMPORTED_TARGETS
+                                  HANDLE_COMPONENTS)
diff --git a/external/tbb/examples/common/gui/CMakeLists.txt b/external/tbb/examples/common/gui/CMakeLists.txt
index 3568aaa9..c06088f2 100644
--- a/external/tbb/examples/common/gui/CMakeLists.txt
+++ b/external/tbb/examples/common/gui/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Intel Corporation
+# Copyright (c) 2020-2025 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.5.0...3.31.3)
 
 set(EXAMPLES_UI_MODE "con" CACHE STRING "EXAMPLES_UI_MODE")
 
@@ -20,45 +20,45 @@ if (WIN32)
     set_property(CACHE EXAMPLES_UI_MODE PROPERTY STRINGS "con" "gdi" "d2d")
 elseif (APPLE)
     set_property(CACHE EXAMPLES_UI_MODE PROPERTY STRINGS "con" "mac")
-else ()
+else()
     set_property(CACHE EXAMPLES_UI_MODE PROPERTY STRINGS "con" "x")
-endif ()
+endif()
 
 get_property(_available_ui_modes CACHE EXAMPLES_UI_MODE PROPERTY STRINGS)
 
 list(FIND _available_ui_modes ${EXAMPLES_UI_MODE} _find_index)
-if (NOT _find_index EQUAL -1)
+if  (NOT _find_index EQUAL -1)
     add_library(UI_LIB_${PROJECT_NAME} STATIC ${CMAKE_CURRENT_LIST_DIR}/${EXAMPLES_UI_MODE}video.cpp)
 
     if (EXAMPLES_UI_MODE STREQUAL "mac")
         enable_language(C)
-        add_library(UI_LIB_OBJECT_${PROJECT_NAME} OBJECT
-                ${CMAKE_CURRENT_LIST_DIR}/xcode/tbbExample/main.m
-                ${CMAKE_CURRENT_LIST_DIR}/xcode/tbbExample/OpenGLView.m
-                ${CMAKE_CURRENT_LIST_DIR}/xcode/tbbExample/tbbAppDelegate.m
-                )
+        add_library(UI_LIB_OBJECT_${PROJECT_NAME} OBJECT  
+            ${CMAKE_CURRENT_LIST_DIR}/xcode/tbbExample/main.m 
+            ${CMAKE_CURRENT_LIST_DIR}/xcode/tbbExample/OpenGLView.m 
+            ${CMAKE_CURRENT_LIST_DIR}/xcode/tbbExample/tbbAppDelegate.m
+        )
         target_sources(UI_LIB_${PROJECT_NAME} PUBLIC $<TARGET_OBJECTS:UI_LIB_OBJECT_${PROJECT_NAME}>)
-    endif ()
-else ()
+    endif()
+else()
     string(REPLACE ";" ", " _available_ui_modes "${_available_ui_modes}")
     message(FATAL_ERROR
-            "Selected UI mode (${EXAMPLES_UI_MODE}) is not supported on ${CMAKE_SYSTEM_NAME}.
+        "Selected UI mode (${EXAMPLES_UI_MODE}) is not supported on ${CMAKE_SYSTEM_NAME}. 
         Supported UI modes: ${_available_ui_modes}"
-            )
-endif ()
+    )
+endif()
 
 macro(set_gdi_ui_project_settings)
     find_program(RC rc REQUIRED)
     add_custom_command(TARGET UI_LIB_${PROJECT_NAME} PRE_BUILD COMMAND
-            ${RC} /r -fo ${PROJECT_BINARY_DIR}/${PROJECT_NAME}.res ${PROJECT_SOURCE_DIR}/gui/${PROJECT_NAME}.rc
-            )
+        ${RC} /r -fo ${PROJECT_BINARY_DIR}/${PROJECT_NAME}.res ${PROJECT_SOURCE_DIR}/gui/${PROJECT_NAME}.rc
+    )
 
     set_target_properties(${PROJECT_NAME} PROPERTIES WIN32_EXECUTABLE TRUE)
     if (COMMAND target_link_options)
         target_link_options(UI_LIB_${PROJECT_NAME} PUBLIC ${PROJECT_BINARY_DIR}/${PROJECT_NAME}.res)
-    else ()
+    else()
         set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS ${PROJECT_BINARY_DIR}/${PROJECT_NAME}.res)
-    endif ()
+    endif()
 endmacro()
 
 macro(set_d2d_ui_project_settings)
@@ -67,22 +67,22 @@ macro(set_d2d_ui_project_settings)
     if (IS_DIRECTORY $ENV{DXSDK_DIR})
         target_include_directories(UI_LIB_${PROJECT_NAME} PUBLIC $ENV{DXSDK_DIR}\\include)
         target_link_directories(UI_LIB_${PROJECT_NAME} PUBLIC $ENV{DXSDK_DIR}\\lib\\x64)
-    else ()
+    else()
         message(FATAL_ERROR "Cannot find the DirectX library (required by the 'd2d' UI mode)")
-    endif ()
+    endif()
 endmacro()
 
 macro(set_x_ui_project_settings)
     find_package(X11 REQUIRED)
-    target_link_libraries(UI_LIB_${PROJECT_NAME} PUBLIC ${X11_LIBRARIES})
+    target_link_libraries(UI_LIB_${PROJECT_NAME} PUBLIC  ${X11_LIBRARIES})
     target_include_directories(UI_LIB_${PROJECT_NAME} PUBLIC ${X11_INCLUDE_DIR})
 
     find_library(LIB_Xext Xext PATHS ENV LIBRARY_PATH ENV LD_LIBRARY_PATH ENV DYLD_LIBRARY_PATH)
     if (LIB_Xext)
-        target_link_libraries(UI_LIB_${PROJECT_NAME} PUBLIC ${LIB_Xext})
-    else ()
+        target_link_libraries(UI_LIB_${PROJECT_NAME} PUBLIC  ${LIB_Xext})
+    else()
         target_compile_definitions(UI_LIB_${PROJECT_NAME} PUBLIC -DX_NOSHMEM)
-    endif ()
+    endif()
 endmacro()
 
 macro(set_mac_ui_project_settings)
@@ -91,12 +91,12 @@ macro(set_mac_ui_project_settings)
     find_library(FOUNDATION_LIBRARY Foundation PATHS ENV LIBRARY_PATH ENV LD_LIBRARY_PATH ENV DYLD_LIBRARY_PATH)
     if (NOT FOUNDATION_LIBRARY)
         message(FATAL_ERROR "Cannot find the Foundation library (required by the 'mac' UI mode)")
-    endif ()
+    endif()
 
     find_library(COCOA_LIBRARY Cocoa PATHS ENV LIBRARY_PATH ENV LD_LIBRARY_PATH ENV DYLD_LIBRARY_PATH)
     if (NOT COCOA_LIBRARY)
         message(FATAL_ERROR "Cannot find the Cocoa library (required by the 'mac' UI mode)")
-    endif ()
+    endif()
 
     target_link_libraries(UI_LIB_${PROJECT_NAME} PUBLIC ${OPENGL_LIBRARIES} ${FOUNDATION_LIBRARY} ${COCOA_LIBRARY})
     target_include_directories(UI_LIB_${PROJECT_NAME} PUBLIC ${OPENGL_INCLUDE_DIR})
@@ -111,7 +111,7 @@ macro(set_mac_ui_project_settings)
     set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "MacUI/${PROJECT_NAME}.app/Contents/MacOS/")
 endmacro()
 
-if (NOT _find_index EQUAL -1)
+if  (NOT _find_index EQUAL -1)
     if ("${EXAMPLES_UI_MODE}" STREQUAL "gdi")
         set_gdi_ui_project_settings()
     elseif ("${EXAMPLES_UI_MODE}" STREQUAL "d2d")
@@ -120,8 +120,9 @@ if (NOT _find_index EQUAL -1)
         set_mac_ui_project_settings()
     elseif ("${EXAMPLES_UI_MODE}" STREQUAL "x")
         set_x_ui_project_settings()
-    endif ()
-endif ()
+    endif()
+    target_compile_options(UI_LIB_${PROJECT_NAME} PRIVATE ${TBB_CXX_STD_FLAG})
+endif()
 
 unset(_available_ui_modes)
 unset(_find_index)
diff --git a/external/tbb/examples/common/gui/convideo.cpp b/external/tbb/examples/common/gui/convideo.cpp
index f9e69710..bf270736 100644
--- a/external/tbb/examples/common/gui/convideo.cpp
+++ b/external/tbb/examples/common/gui/convideo.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -19,9 +19,9 @@
 
 #include "video.hpp"
 
-unsigned int *g_pImg = 0;
+unsigned int *g_pImg = nullptr;
 int g_sizex, g_sizey;
-static video *g_video = 0;
+static video *g_video = nullptr;
 static int g_fps = 0;
 
 #if _WIN32 || _WIN64
@@ -52,7 +52,7 @@ video::video()
           red_mask(0xff),
           green_mask(0xff00),
           blue_mask(0xff0000) {
-    assert(g_video == 0);
+    assert(g_video == nullptr);
     g_video = this;
     title = "Video";
     updating = calc_fps = false;
@@ -87,12 +87,11 @@ void video::terminate() {
         printf("%s: %.1f fps\n", title, fps);
     }
 #endif
-    g_video = 0;
+    g_video = nullptr;
     running = false;
-    if (g_pImg) {
-        delete[] g_pImg;
-        g_pImg = 0;
-    }
+
+    delete[] g_pImg;
+    g_pImg = nullptr;
 }
 
 video::~video() {
diff --git a/external/tbb/examples/common/gui/d2dvideo.cpp b/external/tbb/examples/common/gui/d2dvideo.cpp
index e3467534..063e0b84 100644
--- a/external/tbb/examples/common/gui/d2dvideo.cpp
+++ b/external/tbb/examples/common/gui/d2dvideo.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -59,7 +59,7 @@ void DrawBitmap() {
     if (m_pRenderTarget) {
         m_pRenderTarget->BeginDraw();
         if (m_pBitmap)
-            hr = m_pBitmap->CopyFromMemory(NULL, (BYTE *)g_pImg, 4 * g_sizex);
+            hr = m_pBitmap->CopyFromMemory(nullptr, (BYTE *)g_pImg, 4 * g_sizex);
         DisplayError("DrawBitmap error", hr);
         m_pRenderTarget->DrawBitmap(m_pBitmap);
         m_pRenderTarget->EndDraw();
@@ -82,7 +82,7 @@ LRESULT CALLBACK InternalWndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lPa
             // Check to make sure our window exists before we tell it to repaint.
             // This will fail the first time (while the window is being created).
             if (hwnd) {
-                InvalidateRect(hwnd, NULL, FALSE);
+                InvalidateRect(hwnd, nullptr, FALSE);
                 UpdateWindow(hwnd);
             }
             return 0L;
@@ -162,12 +162,11 @@ void video::terminate() {
         m_pRenderTarget->Release();
     if (m_pD2DFactory)
         m_pD2DFactory->Release();
-    g_video = 0;
+    g_video = nullptr;
     running = false;
-    if (g_pImg) {
-        delete[] g_pImg;
-        g_pImg = 0;
-    }
+
+    delete[] g_pImg;
+    g_pImg = nullptr;
 }
 
 //////////// drawing area constructor & destructor /////////////
diff --git a/external/tbb/examples/common/gui/gdivideo.cpp b/external/tbb/examples/common/gui/gdivideo.cpp
index dd19e4da..ec963e35 100644
--- a/external/tbb/examples/common/gui/gdivideo.cpp
+++ b/external/tbb/examples/common/gui/gdivideo.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -40,12 +40,12 @@ bool DisplayError(LPSTR lpstrErr, HRESULT hres) {
             hres = GetLastError();
         FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM |
                           FORMAT_MESSAGE_IGNORE_INSERTS,
-                      NULL,
+                      nullptr,
                       hres,
                       MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
                       (LPTSTR)&lpMsgBuf,
                       0,
-                      NULL);
+                      nullptr);
         retval = MessageBox(g_hAppWnd, lpstrErr, lpMsgBuf, MB_OK | MB_ICONERROR);
         LocalFree((HLOCAL)lpMsgBuf);
         InError = false;
@@ -60,7 +60,7 @@ LRESULT CALLBACK InternalWndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lPa
             // Check to make sure our window exists before we tell it to repaint.
             // This will fail the first time (while the window is being created).
             if (hwnd) {
-                InvalidateRect(hwnd, NULL, FALSE);
+                InvalidateRect(hwnd, nullptr, FALSE);
                 UpdateWindow(hwnd);
             }
             return 0L;
@@ -114,7 +114,7 @@ bool video::init_window(int sizex, int sizey) {
         return false;
     }
     ShowWindow(g_hAppWnd, SW_SHOW);
-    Gdiplus::GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL);
+    Gdiplus::GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, nullptr);
     g_pImg = new unsigned int[sizex * sizey];
     g_pBitmap =
         new Gdiplus::Bitmap(g_sizex, g_sizey, 4 * g_sizex, PixelFormat32bppRGB, (BYTE*)g_pImg);
@@ -123,17 +123,15 @@ bool video::init_window(int sizex, int sizey) {
 }
 
 void video::terminate() {
-    if (g_pBitmap) {
-        delete g_pBitmap;
-        g_pBitmap = 0;
-    }
+    delete g_pBitmap;
+    g_pBitmap = nullptr;
+
     Gdiplus::GdiplusShutdown(gdiplusToken);
-    g_video = 0;
+    g_video = nullptr;
     running = false;
-    if (g_pImg) {
-        delete[] g_pImg;
-        g_pImg = 0;
-    }
+
+    delete[] g_pImg;
+    g_pImg = nullptr;
 }
 
 //////////// drawing area constructor & destructor /////////////
diff --git a/external/tbb/examples/common/gui/macvideo.cpp b/external/tbb/examples/common/gui/macvideo.cpp
index 072d08d7..b7727da3 100644
--- a/external/tbb/examples/common/gui/macvideo.cpp
+++ b/external/tbb/examples/common/gui/macvideo.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -20,11 +20,11 @@
 #include <iostream>
 #include <pthread.h>
 
-unsigned int *g_pImg = 0;
+unsigned int *g_pImg = nullptr;
 int g_sizex = 0, g_sizey = 0;
-static video *g_video = 0;
+static video *g_video = nullptr;
 static int g_fps = 0;
-char *window_title = NULL;
+char *window_title = nullptr;
 #define WINDOW_TITLE_SIZE 256
 int cocoa_update = 0;
 
@@ -51,7 +51,7 @@ video::video()
           blue_mask(0xff)
 #endif
 {
-    assert(g_video == 0);
+    assert(g_video == nullptr);
     g_video = this;
     title = "Video";
     cocoa_update = 1;
@@ -63,7 +63,7 @@ bool video::init_window(int x, int y) {
     g_sizex = x;
     g_sizey = y;
     g_pImg = new unsigned int[x * y];
-    if (window_title == NULL)
+    if (window_title == nullptr)
         window_title = (char *)malloc(WINDOW_TITLE_SIZE);
     strncpy(window_title, title, WINDOW_TITLE_SIZE - 1);
     running = true;
@@ -85,12 +85,11 @@ void video::terminate() {
                (g_time.tv_sec + 1.0 * g_time.tv_usec / 1000000.0);
         printf("%s: %.1f fps\n", title, fps);
     }
-    g_video = 0;
+    g_video = nullptr;
     running = false;
-    if (g_pImg) {
-        delete[] g_pImg;
-        g_pImg = 0;
-    }
+
+    delete[] g_pImg;
+    g_pImg = nullptr;
 }
 
 video::~video() {
@@ -151,9 +150,9 @@ void video::main_loop() {
     pthread_t handle;
     pthread_attr_t attr;
     pthread_attr_init(&attr);
-    pthread_create(&handle, &attr, &thread_func, (void *)NULL);
+    pthread_create(&handle, &attr, &thread_func, (void *)nullptr);
     pthread_detach(handle);
-    cocoa_main(0, NULL);
+    cocoa_main(0, nullptr);
 }
 
 //! Change window title
diff --git a/external/tbb/examples/common/gui/winvideo.hpp b/external/tbb/examples/common/gui/winvideo.hpp
index e694541e..4f4fc6b2 100644
--- a/external/tbb/examples/common/gui/winvideo.hpp
+++ b/external/tbb/examples/common/gui/winvideo.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -73,7 +73,7 @@ bool WinInit(HINSTANCE hInstance,
     }
     else {
         memset(&wndclass, 0, sizeof(wndclass));
-        wndclass.hCursor = LoadCursor(NULL, IDC_ARROW);
+        wndclass.hCursor = LoadCursor(nullptr, IDC_ARROW);
         wndclass.lpszClassName = title;
     }
     wndclass.cbSize = sizeof(wndclass);
@@ -99,11 +99,11 @@ bool WinInit(HINSTANCE hInstance,
                               0, // Initial y pos: not used here
                               g_sizex + xaddend, // Initial x size
                               g_sizey + yaddend, // Initial y size
-                              NULL, // parent window handle
-                              NULL, // window menu handle
+                              nullptr, // parent window handle
+                              nullptr, // window menu handle
                               hInstance, // program instance handle
-                              NULL); // Creation parameters
-    return g_hAppWnd != NULL;
+                              nullptr); // Creation parameters
+    return g_hAppWnd != nullptr;
 }
 
 //! create console window with redirection
@@ -127,7 +127,7 @@ static bool RedirectIOToConsole(void) {
         return false;
     fp = _fdopen(hConHandle, "w");
     *stdout = *fp;
-    setvbuf(stdout, NULL, _IONBF, 0);
+    setvbuf(stdout, nullptr, _IONBF, 0);
 
     // redirect unbuffered STDERR to the console
     lStdHandle = (size_t)GetStdHandle(STD_ERROR_HANDLE);
@@ -135,7 +135,7 @@ static bool RedirectIOToConsole(void) {
     if (hConHandle > 0) {
         fp = _fdopen(hConHandle, "w");
         *stderr = *fp;
-        setvbuf(stderr, NULL, _IONBF, 0);
+        setvbuf(stderr, nullptr, _IONBF, 0);
     }
 
     // redirect unbuffered STDIN to the console
@@ -144,7 +144,7 @@ static bool RedirectIOToConsole(void) {
     if (hConHandle > 0) {
         fp = _fdopen(hConHandle, "r");
         *stdin = *fp;
-        setvbuf(stdin, NULL, _IONBF, 0);
+        setvbuf(stdin, nullptr, _IONBF, 0);
     }
 
     // make cout, wcout, cin, wcin, wcerr, cerr, wclog and clog
@@ -229,7 +229,7 @@ static bool loop_once(video *v) {
     }
     // event processing, including painting
     MSG msg;
-    if (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) {
+    if (PeekMessage(&msg, nullptr, 0, 0, PM_REMOVE)) {
         if (msg.message == WM_QUIT) {
             v->running = false;
             return false;
@@ -255,7 +255,7 @@ void video::main_loop() {
     g_msec = GetTickCount();
     // now, start main process
     if (threaded) {
-        g_handles[0] = CreateThread(NULL, // LPSECURITY_ATTRIBUTES security_attrs
+        g_handles[0] = CreateThread(nullptr, // LPSECURITY_ATTRIBUTES security_attrs
                                     0, // SIZE_T stacksize
                                     (LPTHREAD_START_ROUTINE)thread_video,
                                     this, // argument
@@ -266,7 +266,7 @@ void video::main_loop() {
             return;
         }
         else // harmless race is possible here
-            g_handles[1] = CreateEvent(NULL, false, false, NULL);
+            g_handles[1] = CreateEvent(nullptr, false, false, nullptr);
         while (running) {
             while (loop_once(this))
                 ;
diff --git a/external/tbb/examples/common/gui/xcode/tbbExample/OpenGLView.h b/external/tbb/examples/common/gui/xcode/tbbExample/OpenGLView.h
index 9f865e87..9dacbeac 100644
--- a/external/tbb/examples/common/gui/xcode/tbbExample/OpenGLView.h
+++ b/external/tbb/examples/common/gui/xcode/tbbExample/OpenGLView.h
@@ -26,11 +26,11 @@
     CGRect imageRect;
 }
 
-@property(nonatomic, retain) NSTimer *timer;
-@property(nonatomic) CGRect imageRect;
+@property (nonatomic, retain) NSTimer *timer;
+@property (nonatomic) CGRect imageRect;
 
-- (void)drawRect:(CGRect)rect;
-- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event;
+- (void) drawRect:(CGRect)rect;
+- (void) touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event;
 
 @end
 
@@ -39,17 +39,17 @@
 #import <Foundation/Foundation.h>
 #import <Cocoa/Cocoa.h>
 
-@interface OpenGLView : NSOpenGLView {
+@interface OpenGLView : NSOpenGLView{
     NSTimer *timer;
 }
 
-@property(nonatomic, retain) NSTimer *timer;
+@property (nonatomic,retain) NSTimer *timer;
 
-- (void)drawRect:(NSRect)start;
-- (void)mouseDown:(NSEvent *)theEvent;
-- (void)keyDown:(NSEvent *)theEvent;
-- (BOOL)acceptsFirstResponder;
-- (void)viewDidEndLiveResize;
+- (void) drawRect:(NSRect)start;
+- (void) mouseDown:(NSEvent *)theEvent;
+- (void) keyDown:(NSEvent *)theEvent;
+- (BOOL) acceptsFirstResponder;
+- (void) viewDidEndLiveResize;
 
 @end
 
diff --git a/external/tbb/examples/common/gui/xcode/tbbExample/OpenGLView.m b/external/tbb/examples/common/gui/xcode/tbbExample/OpenGLView.m
index 15cbeaa3..79dcdc6a 100644
--- a/external/tbb/examples/common/gui/xcode/tbbExample/OpenGLView.m
+++ b/external/tbb/examples/common/gui/xcode/tbbExample/OpenGLView.m
@@ -14,11 +14,11 @@
     limitations under the License.
 */
 
-#import "OpenGLView.h"
 #import <Foundation/Foundation.h>
+#import "OpenGLView.h"
 
 // defined in macvideo.cpp
-extern char *window_title;
+extern char* window_title;
 extern int cocoa_update;
 extern int g_sizex, g_sizey;
 extern unsigned int *g_pImg;
@@ -36,28 +36,23 @@ @implementation OpenGLView
 @synthesize timer;
 @synthesize imageRect;
 
-- (void)drawRect:(CGRect)start {
+- (void)drawRect:(CGRect)start
+{
     if (initialized == false) {
         NSLog(@"INITIALIZE");
-        timer = [NSTimer scheduledTimerWithTimeInterval:0.03
-                                                 target:self
-                                               selector:@selector(update_window)
-                                               userInfo:nil
-                                                repeats:YES];
+        timer = [NSTimer scheduledTimerWithTimeInterval:0.03 target:self selector:@selector(update_window) userInfo:nil repeats:YES];
         imageRect = [[UIScreen mainScreen] bounds];
         CGFloat full_height = imageRect.size.height;
-        const float ratio = (float) g_sizex / g_sizey;
-        imageRect.size.height = imageRect.size.width / ratio;
-        imageRect.origin.y = (full_height - imageRect.size.height) / 2;
+        const float ratio=(float)g_sizex/g_sizey;
+        imageRect.size.height=imageRect.size.width/ratio;
+        imageRect.origin.y=(full_height-imageRect.size.height)/2;
         initialized = true;
     }
 
     CGColorSpaceRef colourSpace = CGColorSpaceCreateDeviceRGB();
-    CGDataProviderRef dataProvider = CGDataProviderCreateWithData(NULL, g_pImg, 4 * g_sizex * g_sizey, NULL);
+    CGDataProviderRef dataProvider = CGDataProviderCreateWithData(NULL, g_pImg, 4*g_sizex*g_sizey, NULL);
 
-    CGImageRef inputImage = CGImageCreate(g_sizex, g_sizey, 8, 32, g_sizex * 4, colourSpace,
-                                          (CGBitmapInfo) kCGImageAlphaNoneSkipLast, dataProvider, NULL, NO,
-                                          kCGRenderingIntentDefault);
+    CGImageRef inputImage = CGImageCreate(g_sizex, g_sizey, 8, 32, g_sizex * 4, colourSpace,(CGBitmapInfo)kCGImageAlphaNoneSkipLast, dataProvider, NULL, NO, kCGRenderingIntentDefault);
     UIImage *image = [UIImage imageWithCGImage:inputImage];
 
     CGDataProviderRelease(dataProvider);
@@ -65,20 +60,21 @@ - (void)drawRect:(CGRect)start {
     CGImageRelease(inputImage);
 
     [image drawInRect:imageRect];
+
 }
 
-- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event {
+- (void) touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event
+{
     CGPoint point = [[touches anyObject] locationInView:self];
     const int x = point.x;
     const int y = point.y;
-    if ((y - imageRect.origin.y) > 0 && y < (imageRect.origin.y + imageRect.size.height))
-        on_mouse_func(x * g_sizex / (imageRect.size.width),
-                      (y - imageRect.origin.y) * g_sizey / imageRect.size.height, 1);
+    if ( (y-imageRect.origin.y) > 0 && y < (imageRect.origin.y + imageRect.size.height ))
+    on_mouse_func( x*g_sizex/(imageRect.size.width), (y-imageRect.origin.y)*g_sizey/imageRect.size.height,1);
     [self setNeedsDisplay];
 }
 
-- (void)update_window {
-    if (cocoa_update) [self setNeedsDisplay];
+-(void) update_window{
+    if( cocoa_update ) [self setNeedsDisplay];
 }
 
 @end
@@ -91,56 +87,55 @@ @implementation OpenGLView
 
 @synthesize timer;
 
-- (void)drawRect:(NSRect)start {
+- (void) drawRect:(NSRect)start
+{
     if (initialized == false) {
         NSLog(@"INITIALIZE");
-        timer = [NSTimer scheduledTimerWithTimeInterval:0.03
-                                                 target:self
-                                               selector:@selector(update_window)
-                                               userInfo:nil
-                                                repeats:YES];
+        timer = [NSTimer scheduledTimerWithTimeInterval:0.03 target:self selector:@selector(update_window) userInfo:nil repeats:YES];
         initialized = true;
     }
-    glWindowPos2i(0, (int) self.visibleRect.size.height);
-    glPixelZoom((float) self.visibleRect.size.width / (float) g_sizex,
-                -(float) self.visibleRect.size.height / (float) g_sizey);
+    glWindowPos2i(0, (int)self.visibleRect.size.height);
+    glPixelZoom( (float)self.visibleRect.size.width /(float)g_sizex,
+                -(float)self.visibleRect.size.height/(float)g_sizey);
     glDrawPixels(g_sizex, g_sizey, GL_BGRA_EXT, GL_UNSIGNED_INT_8_8_8_8_REV, g_pImg);
     glFlush();
 }
 
-- (void)update_window {
-    if (cocoa_update) [self setNeedsDisplay:YES];
-    if (window_title) [self.window setTitle:[NSString stringWithFormat:@"%s", window_title]];
+-(void) update_window{
+    if( cocoa_update ) [self setNeedsDisplay:YES];
+    if( window_title ) [self.window setTitle:[NSString stringWithFormat:@"%s", window_title]];
 }
 
-- (void)keyDown:(NSEvent *)theEvent {
+-(void) keyDown:(NSEvent *)theEvent{
     on_key_func([theEvent.characters characterAtIndex:0]);
 }
 
-- (void)mouseDown:(NSEvent *)theEvent {
+-(void) mouseDown:(NSEvent *)theEvent{
     // mouse event for seismic and fractal
-    NSPoint point = theEvent.locationInWindow;
-    const int x = (int) point.x;
-    const int y = (int) point.y;
+    NSPoint point= theEvent.locationInWindow;
+    const int x = (int)point.x;
+    const int y = (int)point.y;
     NSRect rect = self.visibleRect;
-    on_mouse_func(x * g_sizex / (int) rect.size.width,
-                  ((int) rect.size.height - y) * g_sizey / (int) rect.size.height, 1);
+    on_mouse_func(x*g_sizex/(int)rect.size.width,((int)rect.size.height-y)*g_sizey/(int)rect.size.height,1);
     [self setNeedsDisplay:YES];
 }
 
-- (BOOL)acceptsFirstResponder {
+- (BOOL) acceptsFirstResponder
+{
     return YES;
 }
 
-- (void)rightMouseDown:(NSEvent *)theEvent {
+- (void) rightMouseDown:(NSEvent *)theEvent
+{
     return;
 }
 
-- (void)viewDidEndLiveResize {
+-(void) viewDidEndLiveResize
+{
     NSRect rect = self.visibleRect;
-    const int x = (int) rect.size.width;
-    const int y = (int) rect.size.height;
-    [self.window setTitle:[NSString stringWithFormat:@"X=%d Y=%d", x, y]];
+    const int x=(int)rect.size.width;
+    const int y=(int)rect.size.height;
+    [self.window setTitle:[NSString stringWithFormat:@"X=%d Y=%d", x,y]];
 }
 
 @end
diff --git a/external/tbb/examples/common/gui/xcode/tbbExample/main.m b/external/tbb/examples/common/gui/xcode/tbbExample/main.m
index 1e59fd5c..0f7a9eac 100644
--- a/external/tbb/examples/common/gui/xcode/tbbExample/main.m
+++ b/external/tbb/examples/common/gui/xcode/tbbExample/main.m
@@ -19,18 +19,18 @@
 
 #if TARGET_OS_IPHONE
 
-#import "tbbAppDelegate.h"
 #import <UIKit/UIKit.h>
+#import "tbbAppDelegate.h"
 
 void get_screen_resolution(int *x, int *y) {
     // Getting landscape screen resolution in any case
     CGRect imageRect = [[UIScreen mainScreen] bounds];
-    *x = imageRect.size.width > imageRect.size.height ? imageRect.size.width : imageRect.size.height;
-    *y = imageRect.size.width < imageRect.size.height ? imageRect.size.width : imageRect.size.height;
+    *x=imageRect.size.width>imageRect.size.height?imageRect.size.width:imageRect.size.height;
+    *y=imageRect.size.width<imageRect.size.height?imageRect.size.width:imageRect.size.height;
     return;
 }
 
-int cocoa_main(int argc, char *argv[]) {
+int cocoa_main(int argc, char * argv[]) {
     @autoreleasepool {
         return UIApplicationMain(argc, argv, nil, NSStringFromClass([tbbAppDelegate class]));
     }
@@ -40,5 +40,8 @@ int cocoa_main(int argc, char *argv[]) {
 
 #import <Cocoa/Cocoa.h>
 
-int cocoa_main(int argc, char *argv[]) { return NSApplicationMain(argc, (const char **) argv); }
+int cocoa_main(int argc, char *argv[])
+{
+    return NSApplicationMain(argc, (const char **)argv);
+}
 #endif
diff --git a/external/tbb/examples/common/gui/xcode/tbbExample/tbbAppDelegate.h b/external/tbb/examples/common/gui/xcode/tbbExample/tbbAppDelegate.h
index ba36934f..3708a218 100644
--- a/external/tbb/examples/common/gui/xcode/tbbExample/tbbAppDelegate.h
+++ b/external/tbb/examples/common/gui/xcode/tbbExample/tbbAppDelegate.h
@@ -26,7 +26,7 @@
 
 @interface tbbAppDelegate : UIResponder <UIApplicationDelegate>
 
-@property(strong, nonatomic) UIWindow *window;
+@property (strong, nonatomic) UIWindow *window;
 
 @end
 
@@ -34,13 +34,13 @@
 
 #import <Cocoa/Cocoa.h>
 
-@interface tbbAppDelegate : NSObject <NSApplicationDelegate> {
+@interface tbbAppDelegate : NSObject <NSApplicationDelegate>{
     __unsafe_unretained NSWindow *_window;
 }
 
-@property(assign) IBOutlet NSWindow *window;
+@property (assign) IBOutlet NSWindow *window;
 
-- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)sender;
+- (BOOL) applicationShouldTerminateAfterLastWindowClosed:(NSApplication *) sender;
 
 @end
 
diff --git a/external/tbb/examples/common/gui/xcode/tbbExample/tbbAppDelegate.m b/external/tbb/examples/common/gui/xcode/tbbExample/tbbAppDelegate.m
index 6f39e7de..4f7e556d 100644
--- a/external/tbb/examples/common/gui/xcode/tbbExample/tbbAppDelegate.m
+++ b/external/tbb/examples/common/gui/xcode/tbbExample/tbbAppDelegate.m
@@ -20,11 +20,13 @@
 
 @implementation tbbAppDelegate
 
-- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
+- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
+{
     return YES;
 }
 
-- (void)applicationDidEnterBackground:(UIApplication *)application {
+- (void)applicationDidEnterBackground:(UIApplication *)application
+{
     exit(EXIT_SUCCESS);
 }
 
@@ -39,16 +41,19 @@ @implementation tbbAppDelegate
 //declared in macvideo.cpp file
 extern int g_sizex, g_sizey;
 
-- (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
+- (void)applicationDidFinishLaunching:(NSNotification *)aNotification
+{
     // Insert code here to initialize your application
     NSRect windowSize;
     windowSize.size.height = g_sizey;
     windowSize.size.width = g_sizex;
-    windowSize.origin = _window.frame.origin;
+    windowSize.origin=_window.frame.origin;
     [_window setFrame:windowSize display:YES];
+
 }
 
-- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)sender {
+- (BOOL) applicationShouldTerminateAfterLastWindowClosed:(NSApplication *) sender
+{
     return YES;
 }
 
diff --git a/external/tbb/examples/common/gui/xvideo.cpp b/external/tbb/examples/common/gui/xvideo.cpp
index 5d46b5e5..bf792b3c 100644
--- a/external/tbb/examples/common/gui/xvideo.cpp
+++ b/external/tbb/examples/common/gui/xvideo.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -56,8 +56,8 @@ static Pixmap pixmap = 0;
 static bool already_called_X_ShmAttach = false;
 static bool already_advised_about_NOSHMEM_workarounds = false;
 #endif
-static char *display_name = NULL;
-static Display *dpy = NULL;
+static char *display_name = nullptr;
+static Display *dpy = nullptr;
 static Screen *scrn;
 static Visual *vis;
 static Colormap cmap;
@@ -181,7 +181,7 @@ bool video::init_window(int xsize, int ysize) {
         sh.flags = PSize | PMinSize | PMaxSize;
         sh.width = sh.min_width = sh.max_width = xsize;
         sh.height = sh.min_height = sh.max_height = ysize;
-        XSetStandardProperties(dpy, win, g_video->title, g_video->title, None, NULL, 0, &sh);
+        XSetStandardProperties(dpy, win, g_video->title, g_video->title, None, nullptr, 0, &sh);
         _XA_WM_DELETE_WINDOW = XInternAtom(dpy, "WM_DELETE_WINDOW", false);
         XSetWMProtocols(dpy, win, &_XA_WM_DELETE_WINDOW, 1);
         gc = XCreateGC(dpy, win, 0L, &xgcv);
@@ -206,7 +206,7 @@ bool video::init_window(int xsize, int ysize) {
             g_pImg = (unsigned int *)(shmseginfo.shmaddr = (char *)shmat(shmseginfo.shmid, 0, 0));
             if (g_pImg == (unsigned int *)-1) {
                 fprintf(stderr, "Warning: Can't attach to shared memory: %s\n", strerror(errno));
-                shmctl(shmseginfo.shmid, IPC_RMID, NULL);
+                shmctl(shmseginfo.shmid, IPC_RMID, nullptr);
                 goto generic;
             }
             shmseginfo.readOnly = false;
@@ -218,7 +218,7 @@ bool video::init_window(int xsize, int ysize) {
                         err,
                         x_error);
                 shmdt(shmseginfo.shmaddr);
-                shmctl(shmseginfo.shmid, IPC_RMID, NULL);
+                shmctl(shmseginfo.shmid, IPC_RMID, nullptr);
                 goto generic;
             }
             already_called_X_ShmAttach = true;
@@ -323,7 +323,7 @@ void video::terminate() {
             g_pImg = 0;
         }
         if (shmseginfo.shmid >= 0)
-            shmctl(shmseginfo.shmid, IPC_RMID, NULL);
+            shmctl(shmseginfo.shmid, IPC_RMID, nullptr);
 #endif
         if (gc)
             XFreeGC(dpy, gc);
diff --git a/external/tbb/examples/common/utility/utility.hpp b/external/tbb/examples/common/utility/utility.hpp
index 024f3e99..0630c813 100644
--- a/external/tbb/examples/common/utility/utility.hpp
+++ b/external/tbb/examples/common/utility/utility.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
 #include <cassert>
 #include <cstring>
 #include <cstdlib>
+#include <cmath>
 
 #include <utility>
 #include <string>
@@ -32,6 +33,7 @@
 #include <stdexcept>
 #include <memory>
 #include <iostream>
+#include <chrono>
 // TBB headers should not be used, as some examples may need to be built without TBB.
 
 namespace utility {
@@ -356,6 +358,59 @@ class cli_argument_pack {
     }
 }; // class cli_argument_pack
 
+// utility class to aid relative error measurement of samples
+class measurements {
+public:
+    measurements() = default;
+
+    measurements(unsigned iterations) {
+        _time_intervals.reserve(iterations);
+    }
+
+    inline void start() {
+        _startTime = std::chrono::steady_clock::now();
+    }
+    inline void stop() {
+        auto _endTime = std::chrono::steady_clock::now();
+        // store the end time and start time
+        _time_intervals.push_back(std::make_pair(_startTime, _endTime));
+    }
+    double computeRelError() {
+        // Accumulate the total duration in microseconds using std::accumulate with a lambda function
+        assert(0 != _time_intervals.size());
+        auto total_duration = std::accumulate(
+            _time_intervals.begin(),
+            _time_intervals.end(),
+            0, // Start with 0 count
+            [](long long total, const std::pair<time_point, time_point>& interval) {
+                // Compute the difference and add it to the total
+                return total + std::chrono::duration_cast<std::chrono::microseconds>(
+                                   interval.second - interval.first)
+                                   .count();
+            });
+        unsigned long long averageTimePerFrame = total_duration / _time_intervals.size();
+        unsigned long long sumOfSquareDiff = 0;
+        std::for_each(_time_intervals.begin(),
+                      _time_intervals.end(),
+                      [&](const std::pair<time_point, time_point>& interval) {
+                          unsigned long long duration =
+                              std::chrono::duration_cast<std::chrono::microseconds>(
+                                  interval.second - interval.first)
+                                  .count();
+                          long long diff = duration - averageTimePerFrame;
+                          sumOfSquareDiff += diff * diff;
+                      });
+        double stdDev = std::sqrt(sumOfSquareDiff / _time_intervals.size());
+        double relError = 100 * (stdDev / averageTimePerFrame);
+        return relError;
+    }
+
+private:
+    using time_point = std::chrono::steady_clock::time_point;
+    time_point _startTime;
+    std::vector<std::pair<time_point, time_point>> _time_intervals;
+};
+
 namespace internal {
 template <typename T>
 bool is_power_of_2(T val) {
@@ -547,6 +602,11 @@ inline void report_skipped() {
               << "\n";
 }
 
+inline void report_relative_error(double err) {
+    std::cout << "Relative_Err : " << err << " %"
+              << "\n";
+}
+
 inline void parse_cli_arguments(int argc, const char* argv[], utility::cli_argument_pack cli_pack) {
     bool show_help = false;
     cli_pack.arg(show_help, "-h", "show this message");
diff --git a/external/tbb/examples/concurrent_hash_map/README.md b/external/tbb/examples/concurrent_hash_map/README.md
index df601ed8..19d8e151 100644
--- a/external/tbb/examples/concurrent_hash_map/README.md
+++ b/external/tbb/examples/concurrent_hash_map/README.md
@@ -1,5 +1,4 @@
 # Code Samples of oneAPI Threading Building Blocks (oneTBB)
-
 This directory contains examples of the `concurrent_hash_map` container.
 
 | Code sample name | Description
diff --git a/external/tbb/examples/concurrent_hash_map/count_strings/CMakeLists.txt b/external/tbb/examples/concurrent_hash_map/count_strings/CMakeLists.txt
index 14d25fa7..01261272 100644
--- a/external/tbb/examples/concurrent_hash_map/count_strings/CMakeLists.txt
+++ b/external/tbb/examples/concurrent_hash_map/count_strings/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Intel Corporation
+# Copyright (c) 2020-2025 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.5.0...3.31.3)
 
 project(count_strings CXX)
 
diff --git a/external/tbb/examples/concurrent_hash_map/count_strings/README.md b/external/tbb/examples/concurrent_hash_map/count_strings/README.md
index 32414e1f..76933d51 100644
--- a/external/tbb/examples/concurrent_hash_map/count_strings/README.md
+++ b/external/tbb/examples/concurrent_hash_map/count_strings/README.md
@@ -1,32 +1,24 @@
 # Count_strings sample
-
 The example counts the number of unique words in a text.
 
 ## Building the example
-
 ```
 cmake <path_to_example>
 cmake --build .
 ```
 
 ## Running the sample
-
 ### Predefined make targets
-
 * `make run_count_strings` - executes the example with predefined parameters.
 * `make perf_run_count_strings` - executes the example with suggested parameters to measure the oneTBB performance.
 
 ### Application parameters
-
 Usage:
-
 ```
 count_strings [n-of-threads=value] [n-of-strings=value] [verbose] [silent] [count_collisions] [-h] [n-of-threads [n-of-strings]]
 ```
-
 * `-h` - prints the help for command line options.
-* `n-of-threads` - number of threads to use; a range of the form low\[:high\], where low and optional high are
-  non-negative integers or `auto` for a platform-specific default number.
+* `n-of-threads` - number of threads to use; a range of the form low\[:high\], where low and optional high are non-negative integers or `auto` for a platform-specific default number.
 * `n-of-strings` - number of strings.
 * `verbose` - prints diagnostic output to screen.
 * `silent` - no output except elapsed time.
diff --git a/external/tbb/examples/concurrent_hash_map/count_strings/count_strings.cpp b/external/tbb/examples/concurrent_hash_map/count_strings/count_strings.cpp
index 2b563cd5..0a230846 100644
--- a/external/tbb/examples/concurrent_hash_map/count_strings/count_strings.cpp
+++ b/external/tbb/examples/concurrent_hash_map/count_strings/count_strings.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -42,7 +42,7 @@ class hash<std::basic_string<CharT, Traits, Allocator>> {
         (sizeof(std::size_t) == sizeof(unsigned)) ? 2654435769U : 11400714819323198485ULL);
 
     std::hash<CharT> char_hash;
-}; // strunt hash<std::basic_string>
+}; // struct hash<std::basic_string>
 
 } // namespace std
 
diff --git a/external/tbb/examples/concurrent_priority_queue/README.md b/external/tbb/examples/concurrent_priority_queue/README.md
index 8b913f65..6466a61d 100644
--- a/external/tbb/examples/concurrent_priority_queue/README.md
+++ b/external/tbb/examples/concurrent_priority_queue/README.md
@@ -1,5 +1,4 @@
 # Code Samples of oneAPI Threading Building Blocks (oneTBB)
-
 This directory contains examples of the `concurrent_priority_queue` container.
 
 | Code sample name | Description
diff --git a/external/tbb/examples/concurrent_priority_queue/shortpath/CMakeLists.txt b/external/tbb/examples/concurrent_priority_queue/shortpath/CMakeLists.txt
index 8a6d78a0..311f4507 100644
--- a/external/tbb/examples/concurrent_priority_queue/shortpath/CMakeLists.txt
+++ b/external/tbb/examples/concurrent_priority_queue/shortpath/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Intel Corporation
+# Copyright (c) 2020-2025 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.5.0...3.31.3)
 
 project(shortpath CXX)
 
diff --git a/external/tbb/examples/concurrent_priority_queue/shortpath/README.md b/external/tbb/examples/concurrent_priority_queue/shortpath/README.md
index 47461685..faa120d7 100644
--- a/external/tbb/examples/concurrent_priority_queue/shortpath/README.md
+++ b/external/tbb/examples/concurrent_priority_queue/shortpath/README.md
@@ -1,52 +1,34 @@
 # Shortpath sample
-
 This directory contains an example that solves the single source shortest path problem.
 
-It is parameterized by `N`, a number of nodes, and a start and end node in `[0..N)`. A graph is generated with `N` nodes
-and some random number of connections between those nodes. A parallel algorithm based on `A*` is used to find the
-shortest path.
+It is parameterized by `N`, a number of nodes, and a start and end node in `[0..N)`. A graph is generated with `N` nodes and some random number of connections between those nodes. A parallel algorithm based on `A*` is used to find the shortest path.
 
-This algorithm varies from serial `A*` in that it needs to add nodes back to the open set when the `g` estimate (
-shortest path from start to the node) is improved, even if the node has already been "visited". This is because nodes
-are added and removed from the open-set in parallel, resulting in some less optimal paths being explored. The open-set
-is implemented with the `concurrent_priority_queue`.
+This algorithm varies from serial `A*` in that it needs to add nodes back to the open set when the `g` estimate (shortest path from start to the node) is improved, even if the node has already been "visited". This is because nodes are added and removed from the open-set in parallel, resulting in some less optimal paths being explored. The open-set is implemented with the `concurrent_priority_queue`.
 
-Note that since we re-visit nodes, the `f` estimate (on which the priority queue is sorted) is not technically needed,
-so we could use this same parallel algorithm with just a `concurrent_queue`. However, keeping the `f` estimate and
-using `concurrent_priority_queue` results in much better performance.
+Note that since we re-visit nodes, the `f` estimate (on which the priority queue is sorted) is not technically needed, so we could use this same parallel algorithm with just a `concurrent_queue`. However, keeping the `f` estimate and using `concurrent_priority_queue` results in much better performance.
 
-Silent mode prints run time only, regular mode prints the shortest path length, and verbose mode prints out the shortest
-path.
+Silent mode prints run time only, regular mode prints the shortest path length, and verbose mode prints out the shortest path.
 
-The generated graph follows a pattern in which the closer two pairs of node ids are together, the fewer hops there are
-in a typical path between those nodes. So, for example, the path between 5 and 7 likely has few hops whereas 14 to 78
-has more and 0 to 9999 has even more, etc.
+The generated graph follows a pattern in which the closer two pairs of node ids are together, the fewer hops there are in a typical path between those nodes. So, for example, the path between 5 and 7 likely has few hops whereas 14 to 78 has more and 0 to 9999 has even more, etc.
 
 ## Building the example
-
 ```
 cmake <path_to_example>
 cmake --build .
 ```
 
 ## Running the sample
-
 ### Predefined make targets
-
 * `make run_shortpath` - executes the example with predefined parameters.
 * `make perf_run_shortpath` - executes the example with suggested parameters to measure the oneTBB performance.
 
 ### Application parameters
-
 Usage:
-
 ```
 shortpath [#threads=value] [verbose] [silent] [N=value] [start=value] [end=value] [-h] [#threads]
 ```
-
 * `-h` - prints the help for command line options.
-* `n-of-threads` - number of threads to use; a range of the form low[:high], where low and optional high are
-  non-negative integers or `auto` for a platform-specific default number.
+* `n-of-threads` - number of threads to use; a range of the form low[:high], where low and optional high are non-negative integers or `auto` for a platform-specific default number.
 * `verbose` - prints diagnostic output to screen.
 * `silent` - no output except elapsed time.
 * `N` - number of nodes in graph.
diff --git a/external/tbb/examples/getting_started/README.md b/external/tbb/examples/getting_started/README.md
index 92559670..def9429a 100644
--- a/external/tbb/examples/getting_started/README.md
+++ b/external/tbb/examples/getting_started/README.md
@@ -1,7 +1,5 @@
 # Code Samples of oneAPI Threading Building Blocks (oneTBB)
-
-This directory contains the examples referenced by
-the [oneAPI Threading Building Blocks Get Started Guide](https://software.intel.com/content/www/us/en/develop/documentation/get-started-with-onetbb/top.html)
+This directory contains the examples referenced by the [oneAPI Threading Building Blocks Get Started Guide](https://www.intel.com/content/www/us/en/docs/onetbb/get-started-guide/current/overview.html)
 
 | Code sample name | Description
 |:--- |:---
diff --git a/external/tbb/examples/getting_started/sub_string_finder/CMakeLists.txt b/external/tbb/examples/getting_started/sub_string_finder/CMakeLists.txt
index cf4e6a1b..602d4d8f 100644
--- a/external/tbb/examples/getting_started/sub_string_finder/CMakeLists.txt
+++ b/external/tbb/examples/getting_started/sub_string_finder/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Intel Corporation
+# Copyright (c) 2020-2025 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.5.0...3.31.3)
 
 project(sub_string_finder_simple CXX)
 project(sub_string_finder_extended CXX)
diff --git a/external/tbb/examples/getting_started/sub_string_finder/README.md b/external/tbb/examples/getting_started/sub_string_finder/README.md
index 208f5113..f57a92ac 100644
--- a/external/tbb/examples/getting_started/sub_string_finder/README.md
+++ b/external/tbb/examples/getting_started/sub_string_finder/README.md
@@ -1,38 +1,27 @@
 # Sub_string_finder sample
+An example that uses the `parallel_for` template in a substring matching program. The [oneAPI Threading Building Blocks Get Started Guide](https://www.intel.com/content/www/us/en/docs/onetbb/get-started-guide/current/overview.html) describes this example.
 
-An example that uses the `parallel_for` template in a substring matching program. The [oneAPI Threading Building
-Blocks [](https://software.intel.com/content/www/us/en/develop/documentation/get-started-with-onetbb/top.html) describes
-this example.
-
-For each position in a string, the program displays the length of the largest matching substring elsewhere in the
-string. The program also displays the location of a largest match for each position. Consider the string "babba" as an
-example. Starting at position 0, "ba" is the largest substring with a match elsewhere in the string (position 3).
+For each position in a string, the program displays the length of the largest matching substring elsewhere in the string. The program also displays the location of a largest match for each position. Consider the string "babba" as an example. Starting at position 0, "ba" is the largest substring with a match elsewhere in the string (position 3).
 
 ## Building the example
-
 ```
 cmake <path_to_example>
 cmake --build .
 ```
 
 ### Predefined make targets
-
 * `make sub_string_finder_simple` - builds the example as it appears in the Get Started Guide.
 * `make sub_string_finder_extended` - builds the similar example with more attractive printing of the results.
 * `make sub_string_finder_pretty` - builds the example extended with a sequential implementation.
 * `make sub_string_finder` - builds all sample versions.
 
 ## Running the sample
-
 ### Predefined make targets
-
 * `make run_sub_string_finder` - executes the example with predefined parameters.
 * `make light_test_sub_string_finder` - executes the example with suggested parameters to reduce execution time.
 
 ### Application parameters
-
 Usage:
-
 ```
 sub_string_finder_simple
 sub_string_finder_extended
diff --git a/external/tbb/examples/graph/README.md b/external/tbb/examples/graph/README.md
index c0d9d032..057927da 100644
--- a/external/tbb/examples/graph/README.md
+++ b/external/tbb/examples/graph/README.md
@@ -1,5 +1,4 @@
 # Code Samples of oneAPI Threading Building Blocks (oneTBB)
-
 Examples using oneTBB Flow Graph feature.
 
 | Code sample name | Description
diff --git a/external/tbb/examples/graph/binpack/CMakeLists.txt b/external/tbb/examples/graph/binpack/CMakeLists.txt
index 5fc979a5..e1053918 100644
--- a/external/tbb/examples/graph/binpack/CMakeLists.txt
+++ b/external/tbb/examples/graph/binpack/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Intel Corporation
+# Copyright (c) 2020-2025 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.5.0...3.31.3)
 
 project(binpack CXX)
 
diff --git a/external/tbb/examples/graph/binpack/README.md b/external/tbb/examples/graph/binpack/README.md
index e221501c..18b34956 100644
--- a/external/tbb/examples/graph/binpack/README.md
+++ b/external/tbb/examples/graph/binpack/README.md
@@ -1,40 +1,26 @@
 # Binpack sample
+This directory contains an `oneapi::tbb::flow` example that performs binpacking of `N` integer values into a near-optimal number of bins of capacity `V`.
 
-This directory contains an `oneapi::tbb::flow` example that performs binpacking of `N` integer values into a
-near-optimal number of bins of capacity `V`.
-
-It features a `source_node` which passes randomly generated integer values of `size <= V` to a `queue_node`. Multiple
-function nodes set about taking values from this `queue_node` and packing them into bins according to a best-fit policy.
-Items that cannot be made to fit are rejected and returned to the queue. When a bin is packed as well as it can be, it
-is passed to a `buffer_node` where it waits to be picked up by another `function_node`. This final function node gathers
-stats about the bin and optionally prints its contents. When all bins are accounted for, it optionally prints a summary
-of the quality of the bin-packing.
+It features a `source_node` which passes randomly generated integer values of `size <= V` to a `queue_node`. Multiple function nodes set about taking values from this `queue_node` and packing them into bins according to a best-fit policy. Items that cannot be made to fit are rejected and returned to the queue. When a bin is packed as well as it can be, it is passed to a `buffer_node` where it waits to be picked up by another `function_node`. This final function node gathers stats about the bin and optionally prints its contents. When all bins are accounted for, it optionally prints a summary of the quality of the bin-packing.
 
 ## Building the example
-
 ```
 cmake <path_to_example>
 cmake --build .
 ```
 
 ## Running the sample
-
 ### Predefined make targets
-
 * `make run_binpack` - executes the example with predefined parameters.
 * `make perf_run_binpack` - executes the example with suggested parameters to measure the oneTBB performance.
 
 ### Application parameters
-
 Usage:
-
 ```
 binpack [#threads=value] [verbose] [silent] [elements_num=value] [bin_capacity=value] [#packers=value] [optimality=value] [-h] [#threads]
 ```
-
 * `-h` - prints the help for command line options.
-* `#threads` - the number of threads to use; a range of the form low\[:high\] where low and optional high are
-  non-negative integers, or `auto` for a platform-specific default number.
+* `#threads` - the number of threads to use; a range of the form low\[:high\] where low and optional high are non-negative integers, or `auto` for a platform-specific default number.
 * `verbose` - prints diagnostic output to screen.
 * `silent` - limits output to timing info; overrides verbose.
 * `N` - number of values to pack.
diff --git a/external/tbb/examples/graph/cholesky/CMakeLists.txt b/external/tbb/examples/graph/cholesky/CMakeLists.txt
index d331de86..5a70abc4 100644
--- a/external/tbb/examples/graph/cholesky/CMakeLists.txt
+++ b/external/tbb/examples/graph/cholesky/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Intel Corporation
+# Copyright (c) 2020-2025 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.5.0...3.31.3)
 
 project(cholesky CXX)
 
@@ -23,19 +23,19 @@ set_common_project_settings(tbb)
 # TODO: Consider using FindMKL module
 find_library(MKL_INTEL_LP64_LIB mkl_intel_lp64 PATHS ENV LIBRARY_PATH)
 find_library(MKL_SEQUENTIAL_LIB mkl_sequential PATHS ENV LIBRARY_PATH)
-find_library(MKL_CORE_LIB mkl_core PATHS ENV LIBRARY_PATH)
-if (NOT (MKL_INTEL_LP64_LIB OR MKL_SEQUENTIAL_LIB OR MKL_CORE_LIB))
+find_library(MKL_CORE_LIB       mkl_core PATHS ENV LIBRARY_PATH)
+if(NOT (MKL_INTEL_LP64_LIB OR MKL_SEQUENTIAL_LIB OR MKL_CORE_LIB))
     message(FATAL_ERROR "Cannot find Intel(R) Math Kernel Library (Intel(R) MKL).")
-endif ()
+endif()
 
 add_executable(cholesky init.cpp cholesky.cpp)
 target_link_libraries(cholesky
-        ${MKL_INTEL_LP64_LIB}
-        ${MKL_SEQUENTIAL_LIB}
-        ${MKL_CORE_LIB}
-        TBB::tbb
-        Threads::Threads
-        )
+    ${MKL_INTEL_LP64_LIB}
+    ${MKL_SEQUENTIAL_LIB}
+    ${MKL_CORE_LIB}
+    TBB::tbb
+    Threads::Threads
+)
 target_compile_options(cholesky PRIVATE ${TBB_CXX_STD_FLAG})
 
 set(EXECUTABLE "$<TARGET_FILE:cholesky>")
diff --git a/external/tbb/examples/graph/cholesky/README.md b/external/tbb/examples/graph/cholesky/README.md
index f33223de..011d5cf8 100644
--- a/external/tbb/examples/graph/cholesky/README.md
+++ b/external/tbb/examples/graph/cholesky/README.md
@@ -1,60 +1,36 @@
 # Cholesky sample
-
 This directory contains an example of several versions of Cholesky Factorization algorithm.
 
-**dpotrf**: An implementation that calls the oneAPI Math Kernel Library (oneMKL) `dpotrf` function to directly perform
-the factorization. This can be a serial implementation or threaded implementation depending on the version of the oneMKL
-library that is linked against.
-
-**crout**: A serial implementation that uses the Crout-Cholesky algorithm for factorization. The same approach is
-parallelized for the other oneAPI Threading Building Blocks (oneTBB) based approaches below.
-
-**depend**: A parallel version of Crout-Cholesky factorization that uses the oneTBB flow graph. This version uses a
-dependency graph made solely of `continue_node` objects. This an inspector-executor approach, where a loop nest that is
-similar to the serial implementation is used to create an unrolled version of the computation. Where the oneMKL calls
-would have been made in the original serial implementation of Crout-Cholesky, graph nodes are created instead and these
-nodes are linked by edges to the other nodes they are dependent upon. The resulting graph is relatively large, with a
-node for each instance of each oneMKL call. For example, there are many nodes that call `dtrsm`; one for each invocation
-of `dtrsm` in the serial implementation. The is very little overhead in message management for this version and so it is
-often the highest performing.
-
-**join**: A parallel version of Crout-Cholesky factorization that uses the oneTBB flow graph. This version uses a data
-flow approach. This is a small, compact graph that passes tiles along its edges. There is one node per type of oneMKL
-call, plus `join_node`s that combine the inputs required for each call. So for example, there is only a single node that
-applies all calls to `dtrsm`. This node is invoked when the tiles that hold the inputs and outputs for an invocation are
-matched together in the tag-matching `join_node` that precedes it. The tag represents the iteration values of the `i`
-, `j`, `k` loops in the serial implementation at that invocation of the call. There is some overhead in message matching
-and forwarding, so it may not perform as well as the dependency graph implementation.
+**dpotrf**: An implementation that calls the oneAPI Math Kernel Library (oneMKL) `dpotrf` function to directly perform the factorization. This can be a serial implementation or threaded implementation depending on the version of the oneMKL library that is linked against.
+
+**crout**: A serial implementation that uses the Crout-Cholesky algorithm for factorization. The same approach is parallelized for the other oneAPI Threading Building Blocks (oneTBB) based approaches below.
+
+**depend**: A parallel version of Crout-Cholesky factorization that uses the oneTBB flow graph. This version uses a dependency graph made solely of `continue_node` objects. This an inspector-executor approach, where a loop nest that is similar to the serial implementation is used to create an unrolled version of the computation. Where the oneMKL calls would have been made in the original serial implementation of Crout-Cholesky, graph nodes are created instead and these nodes are linked by edges to the other nodes they are dependent upon. The resulting graph is relatively large, with a node for each instance of each oneMKL call. For example, there are many nodes that call `dtrsm`; one for each invocation of `dtrsm` in the serial implementation. The is very little overhead in message management for this version and so it is often the highest performing.
+
+**join**: A parallel version of Crout-Cholesky factorization that uses the oneTBB flow graph. This version uses a data flow approach. This is a small, compact graph that passes tiles along its edges. There is one node per type of oneMKL call, plus `join_node`s that combine the inputs required for each call. So for example, there is only a single node that applies all calls to `dtrsm`. This node is invoked when the tiles that hold the inputs and outputs for an invocation are matched together in the tag-matching `join_node` that precedes it. The tag represents the iteration values of the `i`, `j`, `k` loops in the serial implementation at that invocation of the call. There is some overhead in message matching and forwarding, so it may not perform as well as the dependency graph implementation.
 
 This sample code requires a oneTBB library and also the oneMKL library.
 
 ## Building the example
-
 ```
 cmake <path_to_example>
 cmake --build .
 ```
 
 ## Running the sample
-
 ### Predefined make targets
-
 * `make run_cholesky` - executes the example with predefined parameters.
 
 ### Application parameters
-
 Usage:
-
 ```
 cholesky [size=value] [blocksize=value] [num_trials=value] [output_prefix=value] [algorithm=value] [num_tbb_threads=value] [input_file=value] [-x] [-h] [size [blocksize [num_trials [output_prefix [algorithm [num_tbb_threads]]]]]]
 ```
-
 * `-h` - prints the help for command line options.
 * `size` - the row/column size of `NxN` matrix (size <= 46000).
 * `blocksize` - the block size; size must be a multiple of the blocksize.
 * `num_trials` - the number of times to run each algorithm.
-* `output_prefix` - if provided the prefix will be prepended to output files: <output_prefix>_posdef.txt and <
-  output_prefix>_X.txt; where `X` is the algorithm used. If `output_prefix` is not provided, no output will be written.
+* `output_prefix` - if provided the prefix will be prepended to output files: <output_prefix>_posdef.txt and <output_prefix>_X.txt; where `X` is the algorithm used. If `output_prefix` is not provided, no output will be written.
 * `algorithm` - name of the used algorithm - can be dpotrf, crout, depend or join.
 * `num_tbb_threads` - number of oneTBB threads.
 * `input_file` - input matrix (optional). If omitted, randomly generated values are used.
diff --git a/external/tbb/examples/graph/dining_philosophers/CMakeLists.txt b/external/tbb/examples/graph/dining_philosophers/CMakeLists.txt
index 95f7a483..6be17caa 100644
--- a/external/tbb/examples/graph/dining_philosophers/CMakeLists.txt
+++ b/external/tbb/examples/graph/dining_philosophers/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Intel Corporation
+# Copyright (c) 2020-2025 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.5.0...3.31.3)
 
 project(dining_philosophers CXX)
 
diff --git a/external/tbb/examples/graph/dining_philosophers/README.md b/external/tbb/examples/graph/dining_philosophers/README.md
index 75ac5a5d..3631958f 100644
--- a/external/tbb/examples/graph/dining_philosophers/README.md
+++ b/external/tbb/examples/graph/dining_philosophers/README.md
@@ -1,37 +1,25 @@
 # Dining_philosophers sample
+The Dining Philosophers problem demonstrates `oneapi::tbb::flow` and the use of the reserving `join_node` to solve the potential deadlock.
 
-The Dining Philosophers problem demonstrates `oneapi::tbb::flow` and the use of the reserving `join_node` to solve the
-potential deadlock.
-
-This program runs some number of philosophers in parallel, each thinking and then waiting for chopsticks to be available
-before eating. Eating and thinking are implemented with `sleep()`. The chopstick positions are represented by
-a `queue_node` with one item.
+This program runs some number of philosophers in parallel, each thinking and then waiting for chopsticks to be available before eating. Eating and thinking are implemented with `sleep()`. The chopstick positions are represented by a `queue_node` with one item.
 
 ## Building the example
-
 ```
 cmake <path_to_example>
 cmake --build .
 ```
 
 ## Running the sample
-
 ### Predefined make targets
-
 * `make run_dining_philosophers` - executes the example with predefined parameters.
-* `make light_test_dining_philosophers` - executes the example with suggested parameters to reduce execution time.
+* `make light_test_dining_philosophers` -  executes the example with suggested parameters to reduce execution time.
 
 ### Application parameters
-
 Usage:
-
 ```
 dining_philosophers [n-of_threads=value] [n-of-philosophers=value] [verbose] [-h] [n-of_threads [n-of-philosophers]]
 ```
-
 * `-h` - prints the help for command line options.
-* `n-of_threads` - number of threads to use; a range of the form low\[:high\[:(+|*|#)step\]\], where low and optional
-  high are non-negative integers or 'auto' for the default choice, and optional step expression specifies how thread
-  numbers are chosen within the range.
+* `n-of_threads` - number of threads to use; a range of the form low\[:high\[:(+|*|#)step\]\], where low and optional high are non-negative integers or 'auto' for the default choice, and optional step expression specifies how thread numbers are chosen within the range.
 * `n-of-philosophers` - how many philosophers, from 2-26.
 * `verbose` - prints diagnostic output to screen.
diff --git a/external/tbb/examples/graph/fgbzip2/CMakeLists.txt b/external/tbb/examples/graph/fgbzip2/CMakeLists.txt
index 96b26ef3..694942e2 100644
--- a/external/tbb/examples/graph/fgbzip2/CMakeLists.txt
+++ b/external/tbb/examples/graph/fgbzip2/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Intel Corporation
+# Copyright (c) 2020-2025 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.5.0...3.31.3)
 
 project(fgbzip2 CXX)
 
@@ -21,30 +21,30 @@ include(../../common/cmake/common.cmake)
 set_common_project_settings(tbb)
 
 add_executable(fgbzip2
-        blocksort.cpp
-        bzlib.cpp
-        compress.cpp
-        crctable.cpp
-        decompress.cpp
-        fgbzip2.cpp
-        huffman.cpp
-        randtable.cpp
-        )
+    blocksort.cpp
+    bzlib.cpp
+    compress.cpp
+    crctable.cpp
+    decompress.cpp
+    fgbzip2.cpp
+    huffman.cpp
+    randtable.cpp
+)
 
 target_link_libraries(fgbzip2 TBB::tbb Threads::Threads)
 target_compile_options(fgbzip2 PRIVATE ${TBB_CXX_STD_FLAG})
 
 if (MSVC AND CMAKE_CXX_COMPILER_ID STREQUAL IntelLLVM)
     target_compile_options(fgbzip2 PRIVATE -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE)
-endif ()
+endif()
 
-if (MSVC AND CMAKE_CXX_COMPILER_ID STREQUAL Intel)
+if (MSVC AND (CMAKE_CXX_COMPILER_ID STREQUAL Intel OR CMAKE_CXX_COMPILER_ID STREQUAL IntelLLVM))
     if (COMMAND target_link_options)
         target_link_options(fgbzip2 PRIVATE /FORCE:MULTIPLE /INCREMENTAL:NO)
-    else ()
+    else()
         set_target_properties(fgbzip2 PROPERTIES LINK_FLAGS /FORCE:MULTIPLE /INCREMENTAL:NO)
-    endif ()
-endif ()
+    endif()
+endif()
 
 set(EXECUTABLE "$<TARGET_FILE:fgbzip2>")
 set(ARGS -b=9 -async "$<TARGET_FILE:fgbzip2>")
diff --git a/external/tbb/examples/graph/fgbzip2/README.md b/external/tbb/examples/graph/fgbzip2/README.md
index f7728d57..a59a7f20 100644
--- a/external/tbb/examples/graph/fgbzip2/README.md
+++ b/external/tbb/examples/graph/fgbzip2/README.md
@@ -1,33 +1,25 @@
 # fgbzip2 sample
+fgbzip2 is a parallel implementation of bzip2 block-sorting file compressor that uses `oneapi::tbb::flow`. The output of this application is fully compatible with bzip2 v1.0.6 or newer.
 
-fgbzip2 is a parallel implementation of bzip2 block-sorting file compressor that uses `oneapi::tbb::flow`. The output of
-this application is fully compatible with bzip2 v1.0.6 or newer.
-
-This example includes software developed by Julian R Seward. See here for copyright information. It exemplifies support
-for asynchronous capabilities in the flow graph API.
+This example includes software developed by Julian R Seward. See here for copyright information.
+It exemplifies support for asynchronous capabilities in the flow graph API.
 
 ## Building the example
-
 ```
 cmake <path_to_example>
 cmake --build .
 ```
 
 ## Running the sample
-
 ### Predefined make targets
-
 * `make run_fgbzip2` - executes the example with predefined parameters.
 * `make perf_run_fgbzip2` - executes the example with suggested parameters to measure the oneTBB performance.
 
 ### Application parameters
-
 Usage:
-
 ```
 fgbzip2 [-b=value] [-v] [-l=value] [-async] [filename=value] [-h] [filename]
 ```
-
 * `-h` - prints the help for command line options.
 * `-b` - block size in 100 KB chunks, [1 .. 9].
 * `-v` - prints diagnostic output to screen.
diff --git a/external/tbb/examples/graph/logic_sim/CMakeLists.txt b/external/tbb/examples/graph/logic_sim/CMakeLists.txt
index b33f9156..5538f3f2 100644
--- a/external/tbb/examples/graph/logic_sim/CMakeLists.txt
+++ b/external/tbb/examples/graph/logic_sim/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Intel Corporation
+# Copyright (c) 2020-2025 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.5.0...3.31.3)
 
 project(logic_sim CXX)
 
diff --git a/external/tbb/examples/graph/logic_sim/README.md b/external/tbb/examples/graph/logic_sim/README.md
index c5817e7d..4c862687 100644
--- a/external/tbb/examples/graph/logic_sim/README.md
+++ b/external/tbb/examples/graph/logic_sim/README.md
@@ -1,32 +1,23 @@
 # Logic_sim sample
-
-This directory contains  `oneapi::tbb::flow` example that performs simplistic digital logic simulations with basic logic
-gates that can be easily composed to create more interesting circuits.
+This directory contains  `oneapi::tbb::flow` example that performs simplistic digital logic simulations with basic logic gates that can be easily composed to create more interesting circuits.
 
 ## Building the example
-
 ```
 cmake <path_to_example>
 cmake --build .
 ```
 
 ## Running the sample
-
 ### Predefined make targets
-
 * `make run_logic_sim` - executes the example with predefined parameters.
 * `make perf_run_logic_sim` - executes the example with suggested parameters to measure the oneTBB performance.
 
 ### Application parameters
-
 Usage:
-
 ```
 logic_sim [#threads=value] [verbose] [silent] [-h] [#threads]
 ```
-
 * `-h` - prints the help for command line options.
-* `#threads` - the number of threads to use; a range of the form low[:high] where low and optional high are non-negative
-  integers, or `auto` for a platform-specific default number.
+* `#threads` - the number of threads to use; a range of the form low[:high] where low and optional high are non-negative integers, or `auto` for a platform-specific default number.
 * `verbose` - prints diagnostic output to screen.
 * `silent` limits output to timing info; overrides verbose
diff --git a/external/tbb/examples/graph/som/CMakeLists.txt b/external/tbb/examples/graph/som/CMakeLists.txt
index 6e759331..a9426950 100644
--- a/external/tbb/examples/graph/som/CMakeLists.txt
+++ b/external/tbb/examples/graph/som/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Intel Corporation
+# Copyright (c) 2020-2025 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.5.0...3.31.3)
 
 include(../../common/cmake/common.cmake)
 project(som CXX)
diff --git a/external/tbb/examples/graph/som/README.md b/external/tbb/examples/graph/som/README.md
index 71c4c218..7abbdd8b 100644
--- a/external/tbb/examples/graph/som/README.md
+++ b/external/tbb/examples/graph/som/README.md
@@ -1,40 +1,28 @@
 # Self-Organizing Map (SOM) sample
+The Self-Organizing Map demonstrates `oneapi::tbb::flow` and the use of cancellation in scheduling multiple iterations of map updates.
 
-The Self-Organizing Map demonstrates `oneapi::tbb::flow` and the use of cancellation in scheduling multiple iterations
-of map updates.
+For tutorials on Self-organizing Maps, see [here](http://www.ai-junkie.com/ann/som/som1.html) and [here](http://davis.wpi.edu/~matt/courses/soms/).
 
-For tutorials on Self-organizing Maps, see [here](http://www.ai-junkie.com/ann/som/som1.html)
-and [here](http://davis.wpi.edu/~matt/courses/soms/).
-
-The program trains the map with several examples, splitting the map into subsections and looking for best-match for
-multiple examples. When an example is used to update the map, the graphs examining the sections being updated for the
-next example are cancelled and restarted after the update.
+The program trains the map with several examples, splitting the map into subsections and looking for best-match for multiple examples. When an example is used to update the map, the graphs examining the sections being updated for the next example are cancelled and restarted after the update.
 
 ## Building the example
-
 ```
 cmake <path_to_example>
 cmake --build .
 ```
 
 ## Running the sample
-
 ### Predefined make targets
-
 * `make run_som` - executes the example with predefined parameters.
 * `make light_test_som` - executes the example with suggested parameters to reduce execution time.
 
 ### Application parameters
-
 Usage:
-
 ```
 som [n-of-threads=value] [radius-fraction=value] [number-of-epochs=value] [cancel-test] [debug] [nospeculate] [-h] [n-of-threads [radius-fraction [number-of-epochs]]]
 ```
-
 * `-h` - prints the help for command line options.
-* `n-of-threads` - number of threads to use; a range of the form low\[:high\], where low and optional high are
-  non-negative integers or `auto` for the oneTBB default.
+* `n-of-threads` - number of threads to use; a range of the form low\[:high\], where low and optional high are non-negative integers or `auto` for the oneTBB default.
 * `radius-fraction` - size of radius at which to start speculating.
 * `number-of-epochs` - number of examples used in learning phase.
 * `cancel-test` - test for cancel signal while finding BMU.
diff --git a/external/tbb/examples/migration/README.md b/external/tbb/examples/migration/README.md
new file mode 100644
index 00000000..7bfca1b6
--- /dev/null
+++ b/external/tbb/examples/migration/README.md
@@ -0,0 +1,6 @@
+# Code Samples of oneAPI Threading Building Blocks (oneTBB)
+Examples of migrating from TBB APIs to the oneTBB APIs.
+
+| Code sample name | Description
+|:--- |:---
+| recursive_fibonacci | Compute Fibonacci number in recursive way.
diff --git a/external/tbb/examples/migration/recursive_fibonacci/CMakeLists.txt b/external/tbb/examples/migration/recursive_fibonacci/CMakeLists.txt
new file mode 100644
index 00000000..47757c5e
--- /dev/null
+++ b/external/tbb/examples/migration/recursive_fibonacci/CMakeLists.txt
@@ -0,0 +1,40 @@
+# Copyright (c) 2023-2025 Intel Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+cmake_minimum_required(VERSION 3.5.0...3.31.3)
+
+project(recursive_fibonacci CXX)
+
+include(../../common/cmake/common.cmake)
+
+set_common_project_settings(tbb)
+
+add_executable(recursive_fibonacci fibonacci.cpp)
+target_link_libraries(recursive_fibonacci
+                      TBB::tbb
+                      Threads::Threads
+                      $<$<PLATFORM_ID:Linux>:rt>)  # Link "rt" library on Linux
+target_compile_options(recursive_fibonacci PRIVATE ${TBB_CXX_STD_FLAG})
+
+set(EXECUTABLE "$<TARGET_FILE:recursive_fibonacci>")
+
+# Parameters of executable N C I:
+# `N` - specifies the fibonacci number which would be calculated.
+# `C` - cutoff that will be used to stop recursive split.
+# `I` - number of iteration to measure benchmark time.
+set(ARGS 30 16 20 1)
+set(PERF_ARGS 50 5 20)
+
+add_execution_target(run_recursive_fibonacci recursive_fibonacci ${EXECUTABLE} "${ARGS}")
+add_execution_target(perf_run_recursive_fibonacci recursive_fibonacci ${EXECUTABLE} "${PERF_ARGS}")
diff --git a/external/tbb/examples/migration/recursive_fibonacci/README.md b/external/tbb/examples/migration/recursive_fibonacci/README.md
new file mode 100644
index 00000000..1f0341c1
--- /dev/null
+++ b/external/tbb/examples/migration/recursive_fibonacci/README.md
@@ -0,0 +1,23 @@
+# Fibonacci sample
+This directory contains an example that computes Fibonacci numbers using emulation for TBB Task API.
+
+## Building the example
+```
+cmake <path_to_example>
+cmake --build .
+```
+
+## Running the sample
+### Predefined make targets
+* `make run_recursive_fibonacci` - executes the example with predefined parameters (extended testing enabled).
+* `make perf_run_recursive_fibonacci` - executes the example with suggested parameters to measure the oneTBB performance.
+
+### Application parameters
+Usage:
+```
+recursive_fibonacci N C I T
+```
+* `N` - specifies the fibonacci number which would be calculated.
+* `C` - cutoff that will be used to stop recursive split.
+* `I` - number of iteration to measure benchmark time.
+* `T` - enables extended testing (recycle task in a loop).
diff --git a/external/tbb/examples/migration/recursive_fibonacci/fibonacci.cpp b/external/tbb/examples/migration/recursive_fibonacci/fibonacci.cpp
new file mode 100644
index 00000000..e4a7c12e
--- /dev/null
+++ b/external/tbb/examples/migration/recursive_fibonacci/fibonacci.cpp
@@ -0,0 +1,61 @@
+/*
+    Copyright (c) 2023 Intel Corporation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#include "fibonacci_single_task.h"
+#include "fibonacci_two_tasks.h"
+
+#include <iostream>
+#include <numeric>
+#include <utility>
+
+int cutoff;
+bool testing_enabled;
+
+template <typename F>
+std::pair</* result */ unsigned long, /* time */ unsigned long> measure(F&& f,
+                                                                        int number,
+                                                                        unsigned long ntrial) {
+    std::vector<unsigned long> times;
+
+    unsigned long result;
+    for (unsigned long i = 0; i < ntrial; ++i) {
+        auto t1 = std::chrono::steady_clock::now();
+        result = f(number);
+        auto t2 = std::chrono::steady_clock::now();
+
+        auto time = std::chrono::duration_cast<std::chrono::milliseconds>(t2 - t1).count();
+        times.push_back(time);
+    }
+
+    return std::make_pair(
+        result,
+        static_cast<unsigned long>(std::accumulate(times.begin(), times.end(), 0) / times.size()));
+}
+
+int main(int argc, char* argv[]) {
+    int numbers = argc > 1 ? strtol(argv[1], nullptr, 0) : 50;
+    cutoff = argc > 2 ? strtol(argv[2], nullptr, 0) : 16;
+    unsigned long ntrial = argc > 3 ? (unsigned long)strtoul(argv[3], nullptr, 0) : 20;
+    testing_enabled = argc > 4 ? (bool)strtol(argv[4], nullptr, 0) : false;
+
+    auto res = measure(fibonacci_two_tasks, numbers, ntrial);
+    std::cout << "Fibonacci two tasks impl N = " << res.first << " Avg time = " << res.second
+              << " ms" << std::endl;
+
+    res = measure(fibonacci_single_task, numbers, ntrial);
+    std::cout << "Fibonacci single task impl N = " << res.first << " Avg time = " << res.second
+              << " ms" << std::endl;
+}
diff --git a/external/tbb/examples/migration/recursive_fibonacci/fibonacci_single_task.h b/external/tbb/examples/migration/recursive_fibonacci/fibonacci_single_task.h
new file mode 100644
index 00000000..dae8895b
--- /dev/null
+++ b/external/tbb/examples/migration/recursive_fibonacci/fibonacci_single_task.h
@@ -0,0 +1,97 @@
+/*
+    Copyright (c) 2023 Intel Corporation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#ifndef SINGLE_TASK_HEADER
+#define SINGLE_TASK_HEADER
+
+#include "task_emulation_layer.h"
+
+#include <iostream>
+#include <numeric>
+#include <utility>
+
+extern int cutoff;
+extern bool testing_enabled;
+
+long serial_fib_1(int n) {
+    return n < 2 ? n : serial_fib_1(n - 1) + serial_fib_1(n - 2);
+}
+
+struct single_fib_task : task_emulation::base_task {
+    enum class state {
+        compute,
+        sum
+    };
+
+    single_fib_task(int n, int* x) : n(n), x(x), s(state::compute)
+    {}
+
+    task_emulation::base_task* execute() override {
+        task_emulation::base_task* bypass = nullptr;
+        switch (s) {
+            case state::compute : {
+                bypass = compute_impl();
+                break;
+            }
+            case state::sum : {
+                *x = x_l + x_r;
+
+                if (testing_enabled) {
+                    if (n == cutoff && num_recycles > 0) {
+                        --num_recycles;
+                        bypass = compute_impl();
+                    }
+                }
+
+                break;
+            }
+        }
+        return bypass;
+    }
+
+    task_emulation::base_task* compute_impl() {
+        task_emulation::base_task* bypass = nullptr;
+        if (n < cutoff) {
+            *x = serial_fib_1(n);
+        }
+        else {
+            bypass = this->allocate_child_and_increment<single_fib_task>(n - 2, &x_r);
+            task_emulation::run_task(this->allocate_child_and_increment<single_fib_task>(n - 1, &x_l));
+
+            // Recycling
+            this->s = state::sum;
+            this->recycle_as_continuation();
+        }
+        return bypass;
+    }
+
+
+    int n;
+    int* x;
+    state s;
+
+    int x_l{ 0 }, x_r{ 0 };
+    int num_recycles{5};
+};
+
+int fibonacci_single_task(int n) {
+    int sum{};
+    tbb::task_group tg;
+    task_emulation::run_and_wait(tg, task_emulation::allocate_root_task<single_fib_task>(/* for root task = */ tg, n, &sum));
+    return sum;
+}
+
+#endif // SINGLE_TASK_HEADER
diff --git a/external/tbb/examples/migration/recursive_fibonacci/fibonacci_two_tasks.h b/external/tbb/examples/migration/recursive_fibonacci/fibonacci_two_tasks.h
new file mode 100644
index 00000000..5d7fd022
--- /dev/null
+++ b/external/tbb/examples/migration/recursive_fibonacci/fibonacci_two_tasks.h
@@ -0,0 +1,79 @@
+/*
+    Copyright (c) 2023 Intel Corporation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#ifndef TWO_TASKS_HEADER
+#define TWO_TASKS_HEADER
+
+#include "task_emulation_layer.h"
+
+#include <iostream>
+#include <numeric>
+#include <utility>
+#include <functional>
+
+extern int cutoff;
+
+long serial_fib(int n) {
+    return n < 2 ? n : serial_fib(n - 1) + serial_fib(n - 2);
+}
+
+struct fib_continuation : task_emulation::base_task {
+    fib_continuation(int& s) : sum(s) {}
+
+    task_emulation::base_task* execute() override {
+        sum = x + y;
+        return nullptr;
+    }
+
+    int x{ 0 }, y{ 0 };
+    int& sum;
+};
+
+struct fib_computation : task_emulation::base_task {
+    fib_computation(int n, int* x) : n(n), x(x) {}
+
+    task_emulation::base_task* execute() override {
+        task_emulation::base_task* bypass = nullptr;
+        if (n < cutoff) {
+            *x = serial_fib(n);
+        }
+        else {
+            // Continuation passing
+            auto& c = *this->allocate_continuation<fib_continuation>(/* children_counter = */ 2, *x);
+            task_emulation::run_task(c.create_child<fib_computation>(n - 1, &c.x));
+
+            // Recycling
+            this->recycle_as_child_of(c);
+            n = n - 2;
+            x = &c.y;
+            bypass = this;
+        }
+        return bypass;
+    }
+
+    int n;
+    int* x;
+};
+
+int fibonacci_two_tasks(int n) {
+    int sum{};
+    tbb::task_group tg;
+    tg.run_and_wait(
+        task_emulation::create_root_task<fib_computation>(/* for root task = */ tg, n, &sum));
+    return sum;
+}
+
+#endif // TWO_TASKS_HEADER
diff --git a/external/tbb/examples/migration/recursive_fibonacci/task_emulation_layer.h b/external/tbb/examples/migration/recursive_fibonacci/task_emulation_layer.h
new file mode 100644
index 00000000..e3b67b93
--- /dev/null
+++ b/external/tbb/examples/migration/recursive_fibonacci/task_emulation_layer.h
@@ -0,0 +1,225 @@
+/*
+    Copyright (c) 2023-2024 Intel Corporation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#ifndef __TBB_task_emulation_layer_H
+#define __TBB_task_emulation_layer_H
+
+#include "tbb/task_group.h"
+#include "tbb/task_arena.h"
+
+#include <atomic>
+
+namespace task_emulation {
+
+struct task_group_pool {
+    task_group_pool() : pool_size(tbb::this_task_arena::max_concurrency()), task_submitters(new tbb::task_group[pool_size]) {}
+
+    ~task_group_pool() {
+        for (std::size_t i = 0; i < pool_size; ++i) {
+            task_submitters[i].wait();
+        }
+
+        delete [] task_submitters;
+    }
+
+    tbb::task_group& operator[] (std::size_t idx) { return task_submitters[idx]; }
+
+    const std::size_t pool_size;
+    tbb::task_group* task_submitters;
+};
+
+static task_group_pool tg_pool;
+
+class base_task {
+public:
+    base_task() = default;
+
+    base_task(const base_task& t) : m_type(t.m_type), m_parent(t.m_parent), m_child_counter(t.m_child_counter.load())
+    {}
+
+    virtual ~base_task() = default;
+
+    void operator() () const {
+        task_type type_snapshot = m_type;
+
+        base_task* bypass = const_cast<base_task*>(this)->execute();
+
+        if (m_parent && m_type != task_type::recycled) {
+            if (m_parent->remove_child_reference() == 0) {
+                m_parent->operator()();
+            }
+        }
+
+        if (m_type == task_type::allocated) {
+            delete this;
+        }
+
+        if (bypass != nullptr) {
+            m_type = type_snapshot;
+
+            // Bypass is not supported by task_emulation and next_task executed directly.
+            // However, the old-TBB bypass behavior can be achieved with
+            // `return task_group::defer()` (check Migration Guide).
+            // Consider submit another task if recursion call is not acceptable
+            // i.e. instead of Direct Body call
+            // submit task_emulation::run_task();
+            bypass->operator()();
+        }
+    }
+
+    virtual base_task* execute() = 0;
+
+    template <typename C, typename... Args>
+    C* allocate_continuation(std::uint64_t ref, Args&&... args) {
+        C* continuation = new C{std::forward<Args>(args)...};
+        continuation->m_type = task_type::allocated;
+        continuation->reset_parent(reset_parent());
+        continuation->m_child_counter = ref;
+        return continuation;
+    }
+
+    template <typename F, typename... Args>
+    F create_child(Args&&... args) {
+        return create_child_impl<F>(std::forward<Args>(args)...);
+    }
+
+    template <typename F, typename... Args>
+    F create_child_and_increment(Args&&... args) {
+        add_child_reference();
+        return create_child_impl<F>(std::forward<Args>(args)...);
+    }
+
+    template <typename F, typename... Args>
+    F* allocate_child(Args&&... args) {
+        return allocate_child_impl<F>(std::forward<Args>(args)...);
+    }
+
+    template <typename F, typename... Args>
+    F* allocate_child_and_increment(Args&&... args) {
+        add_child_reference();
+        return allocate_child_impl<F>(std::forward<Args>(args)...);
+    }
+
+    template <typename C>
+    void recycle_as_child_of(C& c) {
+        m_type = task_type::recycled;
+        reset_parent(&c);
+    }
+
+    void recycle_as_continuation() {
+        m_type = task_type::recycled;
+    }
+
+    void add_child_reference() {
+        ++m_child_counter;
+    }
+
+    std::uint64_t remove_child_reference() {
+        return --m_child_counter;
+    }
+
+protected:
+    enum class task_type {
+        stack_based,
+        allocated,
+        recycled
+    };
+
+    mutable task_type m_type;
+
+private:
+    template <typename F, typename... Args>
+    friend F create_root_task(tbb::task_group& tg, Args&&... args);
+
+    template <typename F, typename... Args>
+    friend F* allocate_root_task(tbb::task_group& tg, Args&&... args);
+
+    template <typename F, typename... Args>
+    F create_child_impl(Args&&... args) {
+        F obj{std::forward<Args>(args)...};
+        obj.m_type = task_type::stack_based;
+        obj.reset_parent(this);
+        return obj;
+    }
+
+    template <typename F, typename... Args>
+    F* allocate_child_impl(Args&&... args) {
+        F* obj = new F{std::forward<Args>(args)...};
+        obj->m_type = task_type::allocated;
+        obj->reset_parent(this);
+        return obj;
+    }
+
+    base_task* reset_parent(base_task* ptr = nullptr) {
+        auto p = m_parent;
+        m_parent = ptr;
+        return p;
+    }
+
+    base_task* m_parent{nullptr};
+    std::atomic<std::uint64_t> m_child_counter{0};
+};
+
+class root_task : public base_task {
+public:
+    root_task(tbb::task_group& tg) : m_tg(tg), m_callback(m_tg.defer([] { /* Create empty callback to preserve reference for wait. */})) {
+        add_child_reference();
+        m_type = base_task::task_type::allocated;
+    }
+
+private:
+    base_task* execute() override {
+        m_tg.run(std::move(m_callback));
+        return nullptr;
+    }
+
+    tbb::task_group& m_tg;
+    tbb::task_handle m_callback;
+};
+
+template <typename F, typename... Args>
+F create_root_task(tbb::task_group& tg, Args&&... args) {
+    F obj{std::forward<Args>(args)...};
+    obj.m_type = base_task::task_type::stack_based;
+    obj.reset_parent(new root_task{tg});
+    return obj;
+}
+
+template <typename F, typename... Args>
+F* allocate_root_task(tbb::task_group& tg, Args&&... args) {
+    F* obj = new F{std::forward<Args>(args)...};
+    obj->m_type = base_task::task_type::allocated;
+    obj->reset_parent(new root_task{tg});
+    return obj;
+}
+
+template <typename F>
+void run_task(F&& f) {
+    tg_pool[tbb::this_task_arena::current_thread_index()].run(std::forward<F>(f));
+}
+
+template <typename F>
+void run_task(F* f) {
+    tg_pool[tbb::this_task_arena::current_thread_index()].run(std::ref(*f));
+}
+
+template <typename F>
+void run_and_wait(tbb::task_group& tg, F* f) {
+   tg.run_and_wait(std::ref(*f));
+}
+} // namespace task_emulation
+
+#endif // __TBB_task_emulation_layer_H
diff --git a/external/tbb/examples/parallel_for/README.md b/external/tbb/examples/parallel_for/README.md
index e3837b47..b1f18997 100644
--- a/external/tbb/examples/parallel_for/README.md
+++ b/external/tbb/examples/parallel_for/README.md
@@ -1,5 +1,4 @@
 # Code Samples of oneAPI Threading Building Blocks (oneTBB)
-
 Examples using `parallel_for` algorithm.
 
 | Code sample name | Description
diff --git a/external/tbb/examples/parallel_for/game_of_life/CMakeLists.txt b/external/tbb/examples/parallel_for/game_of_life/CMakeLists.txt
index 47f7ca7b..df5dd9d8 100644
--- a/external/tbb/examples/parallel_for/game_of_life/CMakeLists.txt
+++ b/external/tbb/examples/parallel_for/game_of_life/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Intel Corporation
+# Copyright (c) 2020-2025 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.5.0...3.31.3)
 
 project(game_of_life CXX)
 
diff --git a/external/tbb/examples/parallel_for/game_of_life/Evolution.cpp b/external/tbb/examples/parallel_for/game_of_life/Evolution.cpp
index 11cb2299..72afd208 100644
--- a/external/tbb/examples/parallel_for/game_of_life/Evolution.cpp
+++ b/external/tbb/examples/parallel_for/game_of_life/Evolution.cpp
@@ -125,8 +125,8 @@ void ParallelEvolution::Run(double execution_time, int nthread) {
             break;
         }
     }
-    if (pGlobControl)
-        delete pGlobControl;
+    delete pGlobControl;
+    pGlobControl = nullptr;
 }
 
 /**
diff --git a/external/tbb/examples/parallel_for/game_of_life/Evolution.hpp b/external/tbb/examples/parallel_for/game_of_life/Evolution.hpp
index 17e46468..019ba658 100644
--- a/external/tbb/examples/parallel_for/game_of_life/Evolution.hpp
+++ b/external/tbb/examples/parallel_for/game_of_life/Evolution.hpp
@@ -124,8 +124,8 @@ class ParallelEvolution : public Evolution {
 
     ~ParallelEvolution() {
         //! delete global_control object
-        if (m_pGlobControl != nullptr)
-            delete m_pGlobControl;
+        delete m_pGlobControl;
+        m_pGlobControl = nullptr;
     }
     virtual void Run(double execution_time, int nthread);
     virtual void Step();
diff --git a/external/tbb/examples/parallel_for/game_of_life/Game_of_life.cpp b/external/tbb/examples/parallel_for/game_of_life/Game_of_life.cpp
index 666986f3..2d7a79b8 100644
--- a/external/tbb/examples/parallel_for/game_of_life/Game_of_life.cpp
+++ b/external/tbb/examples/parallel_for/game_of_life/Game_of_life.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -98,7 +98,7 @@ bool ParseCommandLine(int argc, char* argv[]) {
         high = strtol(s, &end, 0);
     low = strtol(s, &end, 0);
     switch (*end) {
-        case ':': high = strtol(end + 1, 0, 0); break;
+        case ':': high = strtol(end + 1, nullptr, 0); break;
         case '\0': break;
         default: PrintUsage(); return false;
     }
diff --git a/external/tbb/examples/parallel_for/game_of_life/README.md b/external/tbb/examples/parallel_for/game_of_life/README.md
index a7e6c15f..a02fc3e1 100644
--- a/external/tbb/examples/parallel_for/game_of_life/README.md
+++ b/external/tbb/examples/parallel_for/game_of_life/README.md
@@ -1,34 +1,24 @@
 # Game_of_life sample
+The "Game of life" example demonstrates interoperability of oneAPI Threading Building Blocks (oneTBB) and Microsoft* .NET*.
 
-The "Game of life" example demonstrates interoperability of oneAPI Threading Building Blocks (oneTBB) and Microsoft*
-.NET*.
-
-This program runs 2 simultaneous instances of the classic Conway's "Game of Life". One of these instances uses serial
-calculations to update the board. The other one calculates in parallel with oneTBB. The visualization is written in
-managed C++ and uses .NET CLR.
+This program runs 2 simultaneous instances of the classic Conway's "Game of Life". One of these instances uses serial calculations to update the board. The other one calculates in parallel with oneTBB. The visualization is written in managed C++ and uses .NET CLR.
 
 ## Building the example
-
 ```
 cmake <path_to_example>
 cmake --build .
 ```
 
 ## Running the sample
-
 ### Predefined make targets
-
 * `make run_game_of_life` - executes the example with predefined parameters.
 * `make light_test_game_of_life` - executes the example with suggested parameters to reduce execution time.
 
 ### Application parameters
-
 Usage:
-
 ```
 game_of_life [M[:N] -t execution_time] [-h]
 ```
-
 * `-h` - prints the help for command line options.
 * `M:N` - range of numbers of threads to be used.
 * `execution_time` - time (in sec) for execution `game_of_life` iterations.
diff --git a/external/tbb/examples/parallel_for/polygon_overlay/CMakeLists.txt b/external/tbb/examples/parallel_for/polygon_overlay/CMakeLists.txt
index f0a5ec3a..ee62e3d5 100644
--- a/external/tbb/examples/parallel_for/polygon_overlay/CMakeLists.txt
+++ b/external/tbb/examples/parallel_for/polygon_overlay/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Intel Corporation
+# Copyright (c) 2020-2025 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.5.0...3.31.3)
 
 project(polygon_overlay CXX)
 
@@ -28,7 +28,7 @@ target_link_libraries(polygon_overlay TBB::tbb TBB::tbbmalloc Threads::Threads U
 target_compile_options(polygon_overlay PRIVATE ${TBB_CXX_STD_FLAG})
 if (MSVC)
     target_compile_options(polygon_overlay PRIVATE -DNOMINMAX)
-endif ()
+endif()
 
 set(EXECUTABLE "$<TARGET_FILE:polygon_overlay>")
 set(ARGS "")
diff --git a/external/tbb/examples/parallel_for/polygon_overlay/README.md b/external/tbb/examples/parallel_for/polygon_overlay/README.md
index 5eaba6d2..1cb0f7e9 100644
--- a/external/tbb/examples/parallel_for/polygon_overlay/README.md
+++ b/external/tbb/examples/parallel_for/polygon_overlay/README.md
@@ -1,86 +1,49 @@
 # Polygon_overlay sample
-
 Polygon Overlay example that demonstrates the use of `parallel_for`.
 
-This example is a simple implementation of polygon overlay, as described in Parallelizing
-the [Polygon Overlay Problem Using Orca, by H.F. Langendoen](http://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.46.9538)
-.
+This example is a simple implementation of polygon overlay, as described in Parallelizing the [Polygon Overlay Problem Using Orca, by H.F. Langendoen](http://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.46.9538).
 
 The solution was implemented in three forms:
-
 * The naive serial solution.
-* The naive parallel solution, by splitting list of polygons from one map and intersecting each sub-list against the
-  entire list of polygons from the second map.
-* A parallel solution where each map is split into submaps, with each resulting submap being intersected against the
-  corresponding submap from the other map. This solution requires some redundancy (some polygons are members of more
-  than one submap). To prevent multiple copies of a polygon from being placed in the solution map, if both polygons are
-  duplicated (that is, if they both appear in more than one map), they are intersected but the result is not placed in
-  the solution map.
-
-The only optimization in each solution is that the area of the generated sub-polygons are subtracted from the original
-area of one of the source polygons. When the remaining area is zero, the intersection process is halted.
+* The naive parallel solution, by splitting list of polygons from one map and intersecting each sub-list against the entire list of polygons from the second map.
+* A parallel solution where each map is split into submaps, with each resulting submap being intersected against the corresponding submap from the other map. This solution requires some redundancy (some polygons are members of more than one submap). To prevent multiple copies of a polygon from being placed in the solution map, if both polygons are duplicated (that is, if they both appear in more than one map), they are intersected but the result is not placed in the solution map.
 
-A word about the speedup of the submap case. One may get superlinear speedup in this case (for instance a laptop with
-Intel® Core(TM) Duo processor got a speedup of about 20 percent over serial.) This results from two effects:
+The only optimization in each solution is that the area of the generated sub-polygons are subtracted from the original area of one of the source polygons. When the remaining area is zero, the intersection process is halted.
 
+A word about the speedup of the submap case. One may get superlinear speedup in this case (for instance a laptop with Intel® Core(TM) Duo processor got a speedup of about 20 percent over serial.) This results from two effects:
 * the number of threads used, and
 * the fact that for each submap, the number of polygons is smaller than that for the other two cases.
 
-If there are, say, 400 polygons in each map, then on average the number of intersections calculated is approximately
-80,000 (400 * 200, where 200 is the average number of polygons examined before stopping.) If the maps are split into 2
-submaps, the time for each submap is about 200*100, or 20,000. So even comparing the two sets of submaps serially should
-result in a speedup somewhere around 2. This number is affected by the number of redundant polygons being compared; this
-effect would eventually swamp the gain from comparing smaller numbers of polygons per submap. And remember the submaps
-are created by intersecting each map with a rectangular polygon covering the submap being generated, which is additional
-work taking about `N * O(400)` in the case above, where `N` is the number of submaps generated, that can be done in
-parallel.
+If there are, say, 400 polygons in each map, then on average the number of intersections calculated is approximately 80,000 (400 * 200, where 200 is the average number of polygons examined before stopping.) If the maps are split into 2 submaps, the time for each submap is about 200*100, or 20,000. So even comparing the two sets of submaps serially should result in a speedup somewhere around 2. This number is affected by the number of redundant polygons being compared; this effect would eventually swamp the gain from comparing smaller numbers of polygons per submap. And remember the submaps are created by intersecting each map with a rectangular polygon covering the submap being generated, which is additional work taking about `N * O(400)` in the case above, where `N` is the number of submaps generated, that can be done in parallel.
 
-Running the default release pover while varying the number of submaps from 1 to 1000, the speedup on the submap case for
-a 2-processor system looks like
+Running the default release pover while varying the number of submaps from 1 to 1000, the speedup on the submap case for a 2-processor system looks like
 
 ![Speedup vs Submap count](speedup.gif)
 
-One further optimization would be to sort one map, say map1, by maxY, and sort the other map (map2) by minY. For p1 in
-map1, start testing for intersection at the first p2 in map2 that intersected the last polygon tested in map1. This
-would speed up the intersection process greatly, but the optimization would apply to all the methods, and the sort would
-have to be accounted for in the timing.
+One further optimization would be to sort one map, say map1, by maxY, and sort the other map (map2) by minY. For p1 in map1, start testing for intersection at the first p2 in map2 that intersected the last polygon tested in map1. This would speed up the intersection process greatly, but the optimization would apply to all the methods, and the sort would have to be accounted for in the timing.
 
-The source maps are generated pseudo-randomly in the manner described in the paper above. That is, if we need `N`
-polygons, then `N` "boxes" are chosen at random, then one-at-a-time the areas are expanded in one of fours directions
-until the area hits an adjacent polygon. When this process is finished, the resulting map is inspected and any remaining
-unoccupied "boxes" are made into additional polygons, as large as possible in each case. So the actual number of
-polygons in each map will in general be larger than the number of polygons requested (sometimes by 10% or more.)
+The source maps are generated pseudo-randomly in the manner described in the paper above. That is, if we need `N` polygons, then `N` "boxes" are chosen at random, then one-at-a-time the areas are expanded in one of fours directions until the area hits an adjacent polygon. When this process is finished, the resulting map is inspected and any remaining unoccupied "boxes" are made into additional polygons, as large as possible in each case. So the actual number of polygons in each map will in general be larger than the number of polygons requested (sometimes by 10% or more.)
 
-One limitation of the program is that if the number of polygons in the source map is greater than the number of "
-boxes" (pixels in the GUI case), the maps cannot be generated.
+One limitation of the program is that if the number of polygons in the source map is greater than the number of "boxes" (pixels in the GUI case), the maps cannot be generated.
 
 ## Building the example
-
 ```
 cmake <path_to_example> [EXAMPLES_UI_MODE=value]
 cmake --build .
 ```
-
 ### Predefined CMake variables
-
-* `EXAMPLES_UI_MODE` - defines the GUI mode, supported values are `gdi`, `d2d`, `con` on Windows, `x`,`con` on Linux
-  and `mac`,`con` on macOS. The default mode is `con`. See the [common page](../../README.md) to get more information.
+* `EXAMPLES_UI_MODE` - defines the GUI mode, supported values are `gdi`, `d2d`, `con` on Windows, `x`,`con` on Linux and `mac`,`con` on macOS. The default mode is `con`. See the [common page](../../README.md) to get more information.
 
 ## Running the sample
-
 ### Predefined make targets
-
 * `make run_polygon_overlay` - executes the example with predefined parameters.
 * `make light_test_polygon_overlay` - executes the example with suggested parameters to reduce execution time.
 
 ### Application parameters
-
 Usage:
-
 ```
 polygon_overlay [threads[:threads2]] [--polys npolys] [--size nnnxnnn] [--seed nnn] [--csv filename] [--grainsize n] [--use_malloc]
 ```
-
 * `-h` - prints the help for command line options.
 * `threads[:threads2]` - number of threads to run.
 * `--polys npolys` - number of polygons in each map.
diff --git a/external/tbb/examples/parallel_for/polygon_overlay/gui/polygon_overlay.rc b/external/tbb/examples/parallel_for/polygon_overlay/gui/polygon_overlay.rc
index 7cb2f5a8..06fb0858 100644
--- a/external/tbb/examples/parallel_for/polygon_overlay/gui/polygon_overlay.rc
+++ b/external/tbb/examples/parallel_for/polygon_overlay/gui/polygon_overlay.rc
@@ -20,31 +20,42 @@ LANGUAGE 9, 1
 #pragma code_page(1252)
 
 #ifdef APSTUDIO_INVOKED
-    /////////////////////////////////////////////////////////////////////////////
-    //
-    // TEXTINCLUDE
-    //
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
 
-    1 TEXTINCLUDE BEGIN "resource.h\0" END
+1 TEXTINCLUDE  
+BEGIN
+    "resource.h\0"
+END
 
-    2 TEXTINCLUDE BEGIN "#include "
-                        "windows.h"
-                        "\r\n"
-                        "\0" END
+2 TEXTINCLUDE  
+BEGIN
+    "#include ""windows.h""\r\n"
+    "\0"
+END
 
-    3 TEXTINCLUDE BEGIN "\r\n"
-                        "\0" END
+3 TEXTINCLUDE  
+BEGIN
+    "\r\n"
+    "\0"
+END
 
-#endif // APSTUDIO_INVOKED
+#endif    // APSTUDIO_INVOKED
 
-#endif // English (U.S.) resources
+#endif    // English (U.S.) resources
 /////////////////////////////////////////////////////////////////////////////
 
+
+
 #ifndef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
 //
 // Generated from the TEXTINCLUDE 3 resource.
 //
 
+
 /////////////////////////////////////////////////////////////////////////////
-#endif // not APSTUDIO_INVOKED
+#endif    // not APSTUDIO_INVOKED
+
diff --git a/external/tbb/examples/parallel_for/polygon_overlay/polymain.cpp b/external/tbb/examples/parallel_for/polygon_overlay/polymain.cpp
index 7ef95771..dd7bf89e 100644
--- a/external/tbb/examples/parallel_for/polygon_overlay/polymain.cpp
+++ b/external/tbb/examples/parallel_for/polygon_overlay/polymain.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -167,7 +167,7 @@ bool ParseCmdLine(int argc, char *argv[]) {
         char *end;
         gThreadsHigh = gThreadsLow = (int)strtol(argv[0], &end, 0);
         switch (*end) {
-            case ':': gThreadsHigh = (int)strtol(end + 1, 0, 0); break;
+            case ':': gThreadsHigh = (int)strtol(end + 1, nullptr, 0); break;
             case '\0': break;
             default:
                 std::cout << "Unexpected character in thread specifier: " << *end << "\n";
diff --git a/external/tbb/examples/parallel_for/polygon_overlay/polymain.hpp b/external/tbb/examples/parallel_for/polygon_overlay/polymain.hpp
index 1168a668..2dc1923c 100644
--- a/external/tbb/examples/parallel_for/polygon_overlay/polymain.hpp
+++ b/external/tbb/examples/parallel_for/polygon_overlay/polymain.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -19,9 +19,9 @@
 
 #include "pover_global.hpp" // for declaration of DEFINE and INIT
 
-DEFINE Polygon_map_t *gPolymap1 INIT(0);
-DEFINE Polygon_map_t *gPolymap2 INIT(0);
-DEFINE Polygon_map_t *gResultMap INIT(0);
+DEFINE Polygon_map_t *gPolymap1 INIT(nullptr);
+DEFINE Polygon_map_t *gPolymap2 INIT(nullptr);
+DEFINE Polygon_map_t *gResultMap INIT(nullptr);
 
 extern void Usage(int argc, char *argv[]);
 
diff --git a/external/tbb/examples/parallel_for/polygon_overlay/pover_video.hpp b/external/tbb/examples/parallel_for/polygon_overlay/pover_video.hpp
index 975c6c6d..1d22c3d6 100644
--- a/external/tbb/examples/parallel_for/polygon_overlay/pover_video.hpp
+++ b/external/tbb/examples/parallel_for/polygon_overlay/pover_video.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@
 
 #include "pover_global.hpp" // for declaration of DEFINE and INIT
 
-DEFINE class video *gVideo INIT(0);
+DEFINE class video *gVideo INIT(nullptr);
 
 DEFINE int n_next_frame_calls INIT(0);
 DEFINE int frame_skips INIT(10);
diff --git a/external/tbb/examples/parallel_for/seismic/CMakeLists.txt b/external/tbb/examples/parallel_for/seismic/CMakeLists.txt
index 7567cf4e..f2b4f538 100644
--- a/external/tbb/examples/parallel_for/seismic/CMakeLists.txt
+++ b/external/tbb/examples/parallel_for/seismic/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Intel Corporation
+# Copyright (c) 2020-2025 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.5.0...3.31.3)
 
 project(seismic CXX)
 
@@ -29,7 +29,7 @@ target_compile_options(seismic PRIVATE ${TBB_CXX_STD_FLAG})
 
 if (EXAMPLES_UI_MODE STREQUAL "con")
     target_compile_definitions(seismic PRIVATE _CONSOLE)
-endif ()
+endif()
 
 set(EXECUTABLE "$<TARGET_FILE:seismic>")
 set(ARGS auto 0)
diff --git a/external/tbb/examples/parallel_for/seismic/README.md b/external/tbb/examples/parallel_for/seismic/README.md
index cea0afdf..3f053f01 100644
--- a/external/tbb/examples/parallel_for/seismic/README.md
+++ b/external/tbb/examples/parallel_for/seismic/README.md
@@ -1,46 +1,33 @@
 # Seismic sample
-
 Parallel seismic wave simulation that demonstrates use of `parallel_for` and `affinity_partitioner`.
 
 ## Building the example
-
 ```
 cmake <path_to_example> [EXAMPLES_UI_MODE=value]
 cmake --build .
 ```
-
 ### Predefined CMake variables
-
-* `EXAMPLES_UI_MODE` - defines the GUI mode, supported values are `gdi`, `d2d`, `con` on Windows, `x`,`con` on Linux
-  and `mac`,`con` on macOS. The default mode is `con`. See the [common page](../../README.md) to get more information.
+* `EXAMPLES_UI_MODE` - defines the GUI mode, supported values are `gdi`, `d2d`, `con` on Windows, `x`,`con` on Linux and `mac`,`con` on macOS. The default mode is `con`. See the [common page](../../README.md) to get more information.
 
 ## Running the sample
-
 ### Predefined make targets
-
 * `make run_seismic` - executes the example with predefined parameters.
 * `make perf_run_seismic` ` - executes the example with suggested parameters to measure the oneTBB performance.
 * `make light_test_seismic` - executes the example with suggested parameters to reduce execution time.
 
 ### Application parameters
-
 Usage:
-
 ```
 seismic [n-of-threads=value] [n-of-frames=value] [silent] [serial] [-h] [n-of-threads [n-of-frames]]
 ```
-
 * `-h` - prints the help for command line options.
-* `n-of-threads` -e number of threads to use; a range of the form low\[:high\], where low and optional high are
-  non-negative integers or `auto` for a platform-specific default number.
+* `n-of-threads` -e number of threads to use; a range of the form low\[:high\], where low and optional high are non-negative integers or `auto` for a platform-specific default number.
 * `n-of-frames` - number of frames the example processes internally.
 * `silent` - no output except elapsed time.
 * `serial` - in GUI mode start with serial version of algorithm.
 
 ### Interactive graphical user interface
-
-The following hot keys can be used in interactive execution mode when the example is compiled with the graphical user
-interface:
+The following hot keys can be used in interactive execution mode when the example is compiled with the graphical user interface:
 
 * `left mouse button` - starts new seismic wave in place specified by mouse cursor.
 * `space` - toggles between parallel and serial execution modes.
diff --git a/external/tbb/examples/parallel_for/seismic/gui/seismic.rc b/external/tbb/examples/parallel_for/seismic/gui/seismic.rc
index 02eeee82..c2003347 100644
--- a/external/tbb/examples/parallel_for/seismic/gui/seismic.rc
+++ b/external/tbb/examples/parallel_for/seismic/gui/seismic.rc
@@ -19,93 +19,127 @@
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
 #ifdef _WIN32
-LANGUAGE LANG_ENGLISH,
-    SUBLANG_ENGLISH_US
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 #pragma code_page(1252)
 #endif //_WIN32
 
-        /////////////////////////////////////////////////////////////////////////////
-        //
-        // Icon
-        //
-
-        // Icon with lowest ID value placed first to ensure application icon
-        // remains consistent on all systems.
-        IDI_SEISMICSIMULATION ICON "SeismicSimulation.ico" IDI_SMALL ICON "small.ico"
-
-    /////////////////////////////////////////////////////////////////////////////
-    //
-    // Menu
-    //
-
-    IDC_SEISMICSIMULATION MENU BEGIN POPUP "&File" BEGIN MENUITEM "&Parallel",
-    ID_FILE_PARALLEL MENUITEM "&Serial", ID_FILE_SERIAL MENUITEM SEPARATOR MENUITEM "&Enable GUI",
-    ID_FILE_ENABLEGUI MENUITEM "&Disable GUI",
-    ID_FILE_DISABLEGUI MENUITEM SEPARATOR MENUITEM "E&xit",
-    IDM_EXIT END POPUP "&Help" BEGIN MENUITEM "&About ...",
-    IDM_ABOUT END END
-
-        /////////////////////////////////////////////////////////////////////////////
-        //
-        // Accelerator
-        //
-
-        IDC_SEISMICSIMULATION ACCELERATORS BEGIN VK_OEM_2,
-    IDM_ABOUT, VIRTKEY, ALT, NOINVERT "P", ID_FILE_PARALLEL, VIRTKEY, ALT, NOINVERT "S",
-    ID_FILE_SERIAL, VIRTKEY, ALT, NOINVERT "D", ID_FILE_DISABLEGUI, VIRTKEY, ALT, NOINVERT "E",
-    ID_FILE_ENABLEGUI, VIRTKEY, ALT,
-    NOINVERT END
-
-        /////////////////////////////////////////////////////////////////////////////
-        //
-        // Dialog
-        //
-
-        IDD_ABOUTBOX DIALOG 22,
-    17, 230, 75 STYLE DS_SETFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "About" FONT 8,
-    "System" BEGIN ICON IDI_SEISMICSIMULATION, IDC_MYICON, 14, 9, 16,
-    16 LTEXT "SeismicSimulation Version 1.1", IDC_STATIC, 49, 10, 119, 8,
-    SS_NOPREFIX LTEXT "Copyright (C) 2005-2008", IDC_STATIC, 49, 20, 119, 8 DEFPUSHBUTTON "OK",
-    IDOK, 195, 6, 30, 11,
-    WS_GROUP END
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
 
-#ifdef APSTUDIO_INVOKED
-    /////////////////////////////////////////////////////////////////////////////
-    //
-    // TEXTINCLUDE
-    //
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_SEISMICSIMULATION   ICON                    "SeismicSimulation.ico"
+IDI_SMALL               ICON                    "small.ico"
 
-    1 TEXTINCLUDE BEGIN "resource.h\0" END
+/////////////////////////////////////////////////////////////////////////////
+//
+// Menu
+//
 
-    2 TEXTINCLUDE BEGIN "#define APSTUDIO_HIDDEN_SYMBOLS\r\n"
-                        "#include "
-                        "windows.h"
-                        "\r\n"
-                        "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n"
-                        "\0" END
+IDC_SEISMICSIMULATION MENU 
+BEGIN
+    POPUP "&File"
+    BEGIN
+        MENUITEM "&Parallel",                   ID_FILE_PARALLEL
+        MENUITEM "&Serial",                     ID_FILE_SERIAL
+        MENUITEM SEPARATOR
+        MENUITEM "&Enable GUI",                 ID_FILE_ENABLEGUI
+        MENUITEM "&Disable GUI",                ID_FILE_DISABLEGUI
+        MENUITEM SEPARATOR
+        MENUITEM "E&xit",                       IDM_EXIT
+    END
+    POPUP "&Help"
+    BEGIN
+        MENUITEM "&About ...",                  IDM_ABOUT
+    END
+END
 
-    3 TEXTINCLUDE BEGIN
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Accelerator
+//
+
+IDC_SEISMICSIMULATION ACCELERATORS 
+BEGIN
+    VK_OEM_2,       IDM_ABOUT,              VIRTKEY, ALT, NOINVERT
+    "P",            ID_FILE_PARALLEL,       VIRTKEY, ALT, NOINVERT
+    "S",            ID_FILE_SERIAL,         VIRTKEY, ALT, NOINVERT
+    "D",            ID_FILE_DISABLEGUI,     VIRTKEY, ALT, NOINVERT
+    "E",            ID_FILE_ENABLEGUI,      VIRTKEY, ALT, NOINVERT
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_ABOUTBOX DIALOG  22, 17, 230, 75
+STYLE DS_SETFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+CAPTION "About"
+FONT 8, "System"
+BEGIN
+    ICON            IDI_SEISMICSIMULATION,IDC_MYICON,14,9,16,16
+    LTEXT           "SeismicSimulation Version 1.1",IDC_STATIC,49,10,119,8,SS_NOPREFIX
+    LTEXT           "Copyright (C) 2005-2008",IDC_STATIC,49,20,119,8
+    DEFPUSHBUTTON   "OK",IDOK,195,6,30,11,WS_GROUP
+END
+
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+    "#define APSTUDIO_HIDDEN_SYMBOLS\r\n"
+    "#include ""windows.h""\r\n"
+    "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
     "\r\n"
-    "\0" END
+    "\0"
+END
 
-#endif // APSTUDIO_INVOKED
+#endif    // APSTUDIO_INVOKED
 
-        /////////////////////////////////////////////////////////////////////////////
-        //
-        // String Table
-        //
 
-        STRINGTABLE BEGIN IDS_APP_TITLE "SeismicSimulation" IDC_SEISMICSIMULATION
-    "SEISMICSIMULATION" END
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+STRINGTABLE 
+BEGIN
+    IDS_APP_TITLE           "SeismicSimulation"
+    IDC_SEISMICSIMULATION   "SEISMICSIMULATION"
+END
 
-#endif // English (U.S.) resources
+#endif    // English (U.S.) resources
 /////////////////////////////////////////////////////////////////////////////
 
+
+
 #ifndef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
 //
 // Generated from the TEXTINCLUDE 3 resource.
 //
 
+
 /////////////////////////////////////////////////////////////////////////////
-#endif // not APSTUDIO_INVOKED
+#endif    // not APSTUDIO_INVOKED
+
diff --git a/external/tbb/examples/parallel_for/seismic/main.cpp b/external/tbb/examples/parallel_for/seismic/main.cpp
index cc30bbd3..4f08de93 100644
--- a/external/tbb/examples/parallel_for/seismic/main.cpp
+++ b/external/tbb/examples/parallel_for/seismic/main.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -35,14 +35,17 @@ struct RunOptions {
     //!                  threads.second - initialization value for scheduler
     utility::thread_number_range threads;
     int numberOfFrames;
+    int numberOfIterations;
     bool silent;
     bool parallel;
     RunOptions(utility::thread_number_range threads_,
                int number_of_frames_,
+               int number_of_iterations_,
                bool silent_,
                bool parallel_)
             : threads(threads_),
               numberOfFrames(number_of_frames_),
+              numberOfIterations(number_of_iterations_),
               silent(silent_),
               parallel(parallel_) {}
 };
@@ -53,6 +56,7 @@ RunOptions ParseCommandLine(int argc, char *argv[]) {
         utility::get_default_num_threads, 0, utility::get_default_num_threads());
 
     int numberOfFrames = 0;
+    int numberOfIterations = 0;
     bool silent = false;
     bool serial = false;
 
@@ -65,15 +69,19 @@ RunOptions ParseCommandLine(int argc, char *argv[]) {
             .positional_arg(numberOfFrames,
                             "n-of-frames",
                             "number of frames the example processes internally (0 means unlimited)")
+            .positional_arg(numberOfIterations,
+                            "n-of-iterations",
+                            "number of iterations the example runs internally")
             .arg(silent, "silent", "no output except elapsed time")
             .arg(serial, "serial", "in GUI mode start with serial version of algorithm"));
-    return RunOptions(threads, numberOfFrames, silent, !serial);
+    return RunOptions(threads, numberOfFrames, numberOfIterations, silent, !serial);
 }
 
 int main(int argc, char *argv[]) {
     oneapi::tbb::tick_count mainStartTime = oneapi::tbb::tick_count::now();
     RunOptions options = ParseCommandLine(argc, argv);
     SeismicVideo video(u, options.numberOfFrames, options.threads.last, options.parallel);
+    double rel_error;
 
     // video layer init
     if (video.init_window(u.UniverseWidth, u.UniverseHeight)) {
@@ -91,11 +99,19 @@ int main(int argc, char *argv[]) {
             std::cout << "Substituting 1000 for unlimited frames because not running interactively"
                       << "\n";
         }
+        // TODO : Extend utility::cli_argument_pack() to allow specifying the default value.
+        if (options.numberOfIterations <= 0) {
+            options.numberOfIterations = 10;
+            std::cout << "Setting the number of iterations = 10 default"
+                      << "\n";
+        }
         for (int p = options.threads.first; p <= options.threads.last;
              p = options.threads.step(p)) {
             oneapi::tbb::tick_count xwayParallelismStartTime = oneapi::tbb::tick_count::now();
             u.InitializeUniverse(video);
             int numberOfFrames = options.numberOfFrames;
+            assert(options.numberOfIterations > 0 && "Number of iterations cannot be <= 0");
+            unsigned numberOfIterations = unsigned(options.numberOfIterations);
 
             if (p == 0) {
                 //run a serial version
@@ -106,9 +122,15 @@ int main(int argc, char *argv[]) {
             else {
                 oneapi::tbb::global_control c(oneapi::tbb::global_control::max_allowed_parallelism,
                                               p);
-                for (int i = 0; i < numberOfFrames; ++i) {
-                    u.ParallelUpdateUniverse();
+                utility::measurements mu(numberOfIterations);
+                for (int iter = 0; iter < numberOfIterations; ++iter) {
+                    mu.start();
+                    for (int i = 0; i < numberOfFrames; ++i) {
+                        u.ParallelUpdateUniverse();
+                    }
+                    mu.stop();
                 }
+                rel_error = mu.computeRelError();
             }
 
             if (!options.silent) {
@@ -129,5 +151,6 @@ int main(int argc, char *argv[]) {
     }
     video.terminate();
     utility::report_elapsed_time((oneapi::tbb::tick_count::now() - mainStartTime).seconds());
+    utility::report_relative_error(rel_error);
     return 0;
 }
diff --git a/external/tbb/examples/parallel_for/tachyon/CMakeLists.txt b/external/tbb/examples/parallel_for/tachyon/CMakeLists.txt
index d8aec9d1..7303ce10 100644
--- a/external/tbb/examples/parallel_for/tachyon/CMakeLists.txt
+++ b/external/tbb/examples/parallel_for/tachyon/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Intel Corporation
+# Copyright (c) 2020-2025 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.5.0...3.31.3)
 
 project(tachyon CXX)
 
@@ -23,41 +23,40 @@ set_common_project_settings(tbb)
 set(TACHYON_VERSION tbb CACHE STRING "Defines the version of the tachyon example")
 
 add_executable(
-        tachyon src/trace.${TACHYON_VERSION}.cpp
-        src/main.cpp src/pthread.cpp
-        src/tachyon_video.cpp src/api.cpp
-        src/apigeom.cpp
-        src/apitrigeom.cpp
-        src/bndbox.cpp
-        src/box.cpp
-        src/camera.cpp
-        src/coordsys.cpp
-        src/cylinder.cpp
-        src/extvol.cpp
-        src/global.cpp
-        src/grid.cpp
-        src/imageio.cpp
-        src/imap.cpp
-        src/intersect.cpp
-        src/jpeg.cpp
-        src/light.cpp
-        src/objbound.cpp
-        src/parse.cpp
-        src/plane.cpp
-        src/ppm.cpp
-        src/quadric.cpp
-        src/render.cpp
-        src/ring.cpp
-        src/shade.cpp
-        src/sphere.cpp
-        src/texture.cpp
-        src/tgafile.cpp
-        src/trace_rest.cpp
-        src/triangle.cpp
-        src/ui.cpp
-        src/util.cpp
-        src/vector.cpp
-        src/vol.cpp
+    tachyon src/trace.${TACHYON_VERSION}.cpp
+    src/main.cpp src/pthread.cpp
+    src/tachyon_video.cpp src/api.cpp
+    src/apigeom.cpp
+    src/apitrigeom.cpp
+    src/bndbox.cpp
+    src/box.cpp
+    src/camera.cpp
+    src/coordsys.cpp
+    src/cylinder.cpp
+    src/extvol.cpp
+    src/global.cpp
+    src/grid.cpp
+    src/imageio.cpp
+    src/imap.cpp
+    src/intersect.cpp
+    src/light.cpp
+    src/objbound.cpp
+    src/parse.cpp
+    src/plane.cpp
+    src/ppm.cpp
+    src/quadric.cpp
+    src/render.cpp
+    src/ring.cpp
+    src/shade.cpp
+    src/sphere.cpp
+    src/texture.cpp
+    src/tgafile.cpp
+    src/trace_rest.cpp
+    src/triangle.cpp
+    src/ui.cpp
+    src/util.cpp
+    src/vector.cpp
+    src/vol.cpp 
 )
 
 add_subdirectory(../../common/gui gui)
@@ -67,7 +66,7 @@ target_compile_options(tachyon PRIVATE ${TBB_CXX_STD_FLAG})
 
 if (MSVC AND CMAKE_CXX_COMPILER_ID STREQUAL IntelLLVM)
     target_compile_options(tachyon PRIVATE -D_CRT_SECURE_NO_WARNINGS)
-endif ()
+endif()
 
 set(EXECUTABLE "$<TARGET_FILE:tachyon>")
 set(ARGS ${CMAKE_CURRENT_SOURCE_DIR}/dat/balls.dat)
diff --git a/external/tbb/examples/parallel_for/tachyon/README.md b/external/tbb/examples/parallel_for/tachyon/README.md
index 9a117b7d..1cc7404f 100644
--- a/external/tbb/examples/parallel_for/tachyon/README.md
+++ b/external/tbb/examples/parallel_for/tachyon/README.md
@@ -1,50 +1,34 @@
 # Tachyon sample
-
 Parallel raytracer / renderer that demonstrates the use of parallel_for.
 
 *This example includes software developed by John E. Stone.*
 
-This example is a 2-D raytracer/renderer that visually shows different parallel scheduling methods and their resulting
-speedup. The code was parallelized by speculating that each pixel could be rendered in parallel. The resulting parallel
-code was then checked for correctness by using Intel® Thread Checker, which pointed out where synchronization was
-needed. Minimal synchronization was then inserted into the parallel code. The resulting parallel code exhibits good
-speedup.
+This example is a 2-D raytracer/renderer that visually shows different parallel scheduling methods and their resulting speedup. The code was parallelized by speculating that each pixel could be rendered in parallel. The resulting parallel code was then checked for correctness by using Intel® Thread Checker, which pointed out where synchronization was needed. Minimal synchronization was then inserted into the parallel code. The resulting parallel code exhibits good speedup.
 
 ## Building the example
-
 ```
 cmake <path_to_example> [EXAMPLES_UI_MODE=value]
 cmake --build .
 ```
-
 ### Predefined CMake variables
-
-* `EXAMPLES_UI_MODE` - defines the GUI mode, supported values are `gdi`, `d2d`, `con` on Windows, `x`,`con` on Linux
-  and `mac`,`con` on macOS. The default mode is `con`. See the [common page](../../README.md) to get more information.
+* `EXAMPLES_UI_MODE` - defines the GUI mode, supported values are `gdi`, `d2d`, `con` on Windows, `x`,`con` on Linux and `mac`,`con` on macOS. The default mode is `con`. See the [common page](../../README.md) to get more information.
 
 * `TACHYON_VERSION` - this examples contains several version that may be changed via `TACHYON_VERSION` Cmake variable.
     * **serial** - Original sequential version.
-    * **tbb1d** - Parallel version that uses oneAPI Threading Building Blocks (oneTBB) and `blocked_range` to
-      parallelize over tasks that are groups of scan-lines.
-    * **tbb** (Default) - Parallel version that uses oneTBB and `blocked_range2d` to parallelize over tasks that are
-      rectangular sub-areas.
+    * **tbb1d** - Parallel version that uses oneAPI Threading Building Blocks (oneTBB) and `blocked_range` to parallelize over tasks that are groups of scan-lines.
+    * **tbb** (Default) - Parallel version that uses oneTBB and `blocked_range2d` to parallelize over tasks that are rectangular sub-areas.
 
 ## Running the sample
-
 ### Predefined make targets
-
 * `make run_tachyon` - executes the example with predefined parameters.
 * `make perf_run_tachyon` ` - executes the example with suggested parameters to measure the oneTBB performance.
 * `make light_test_tachyon` - executes the example with suggested parameters to reduce execution time.
 
 ### Application parameters
-
 Usage:
-
 ```
 tachyon [dataset=value] [boundthresh=value] [no-display-updating] [no-bounding] [silent] [-h] [dataset [boundthresh]]
 ```
-
 * `-h` - Prints the help for command line options.
 * `dataset` - path/name of one of the *.dat files in the dat directory for the example.
 * `boundthresh` - bounding threshold value.
@@ -52,21 +36,13 @@ tachyon [dataset=value] [boundthresh=value] [no-display-updating] [no-bounding]
 * `no-bounding` - disable bounding technique.
 
 ### Environment variables
-
 The `tbb` and `tbb1d` version of examples has the following settings that may be handled by environment variables:
-
-* By default, these versions use one thread per available processor. To change this default, set the `TBB_NUM_THREADS`
-  environment variable to the desired number of threads before running.
-* These versions use `auto_partitioner` by default. To change this default, set the `TBB_PARTITIONER` environment
-  variable to the `aff` value to use `affinity_partitioner` and to `simp` to use `simple_partitioner`.
-* These versions use a reasonable task grain size by default. To change this default, set the `TBB_GRAINSIZE`
-  environment variable to the desired grain size before running. The grain size corresponds to the number of pixels (in
-  the `X` or `Y` direction, for a rectangular sub-area) in each parallel task.
+* By default, these versions use one thread per available processor. To change this default, set the `TBB_NUM_THREADS` environment variable to the desired number of threads before running.
+* These versions use `auto_partitioner` by default. To change this default, set the `TBB_PARTITIONER` environment variable to the `aff` value to use `affinity_partitioner` and to `simp` to use `simple_partitioner`.
+* These versions use a reasonable task grain size by default. To change this default, set the `TBB_GRAINSIZE` environment variable to the desired grain size before running. The grain size corresponds to the number of pixels (in the `X` or `Y` direction, for a rectangular sub-area) in each parallel task.
 
 ### Interactive graphical user interface
-
-The following hot keys can be used in interactive execution mode when the example is compiled with the graphical user
-interface:
+The following hot keys can be used in interactive execution mode when the example is compiled with the graphical user interface:
 
 * `any key` - enable repetition of rendering after the pause. Press ESC to stop the application.
 * `space` - toggle run-time display updating mode while rendering (see no-display-updating above).
diff --git a/external/tbb/examples/parallel_for/tachyon/gui/tachyon.rc b/external/tbb/examples/parallel_for/tachyon/gui/tachyon.rc
index b1708cca..5a13d046 100644
--- a/external/tbb/examples/parallel_for/tachyon/gui/tachyon.rc
+++ b/external/tbb/examples/parallel_for/tachyon/gui/tachyon.rc
@@ -19,56 +19,72 @@
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
 #ifdef _WIN32
-LANGUAGE LANG_ENGLISH,
-    SUBLANG_ENGLISH_US
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 #pragma code_page(1252)
 #endif //_WIN32
 
-        /////////////////////////////////////////////////////////////////////////////
-        //
-        // Icon
-        //
-
-        // Icon with lowest ID value placed first to ensure application icon
-        // remains consistent on all systems.
-        IDI_GUI ICON "gui.ico" IDI_SMALL ICON "small.ico"
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
 
-#ifdef APSTUDIO_INVOKED
-    /////////////////////////////////////////////////////////////////////////////
-    //
-    // TEXTINCLUDE
-    //
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_GUI   ICON                    "gui.ico"
+IDI_SMALL               ICON                    "small.ico"
 
-    1 TEXTINCLUDE BEGIN "resource.h\0" END
 
-    2 TEXTINCLUDE BEGIN "#define APSTUDIO_HIDDEN_SYMBOLS\r\n"
-                        "#include "
-                        "windows.h"
-                        "\r\n"
-                        "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n"
-                        "\0" END
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
 
-    3 TEXTINCLUDE BEGIN
+1 TEXTINCLUDE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+    "#define APSTUDIO_HIDDEN_SYMBOLS\r\n"
+    "#include ""windows.h""\r\n"
+    "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
     "\r\n"
-    "\0" END
+    "\0"
+END
 
-#endif // APSTUDIO_INVOKED
+#endif    // APSTUDIO_INVOKED
 
-        /////////////////////////////////////////////////////////////////////////////
-        //
-        // String Table
-        //
 
-        STRINGTABLE BEGIN IDS_APP_TITLE "gui" IDC_GUI "GUI" END
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+STRINGTABLE 
+BEGIN
+    IDS_APP_TITLE           "gui"
+    IDC_GUI   "GUI"
+END
 
-#endif // English (U.S.) resources
+#endif    // English (U.S.) resources
 /////////////////////////////////////////////////////////////////////////////
 
+
+
 #ifndef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
 //
 // Generated from the TEXTINCLUDE 3 resource.
 //
 
+
 /////////////////////////////////////////////////////////////////////////////
-#endif // not APSTUDIO_INVOKED
+#endif    // not APSTUDIO_INVOKED
+
diff --git a/external/tbb/examples/parallel_for/tachyon/src/imageio.cpp b/external/tbb/examples/parallel_for/tachyon/src/imageio.cpp
index a379c4dc..c1c9d762 100644
--- a/external/tbb/examples/parallel_for/tachyon/src/imageio.cpp
+++ b/external/tbb/examples/parallel_for/tachyon/src/imageio.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -47,7 +47,7 @@
  *  imageio.cpp - This file deals with reading/writing image files
  */
 
-/* For our puposes, we're interested only in the 3 byte per pixel 24 bit
+/* For our purposes, we're interested only in the 3 byte per pixel 24 bit
  * truecolor sort of file..
  */
 
@@ -59,7 +59,6 @@
 #include "imageio.hpp"
 #include "ppm.hpp" /* PPM files */
 #include "tgafile.hpp" /* Truevision Targa files */
-#include "jpeg.hpp" /* JPEG files */
 
 static int fakeimage(char *name, int *xres, int *yres, unsigned char **imgdata) {
     int i, imgsize;
@@ -90,7 +89,7 @@ int readimage(rawimage *img) {
         rc = readtga(name, &xres, &yres, &imgdata);
     }
     else if (strstr(name, ".jpg")) {
-        rc = readjpeg(name, &xres, &yres, &imgdata);
+        rc = IMAGEUNSUP;
     }
     else if (strstr(name, ".gif")) {
         rc = IMAGEUNSUP;
diff --git a/external/tbb/examples/parallel_for/tachyon/src/imageio.hpp b/external/tbb/examples/parallel_for/tachyon/src/imageio.hpp
index 31864006..8ad8c4be 100644
--- a/external/tbb/examples/parallel_for/tachyon/src/imageio.hpp
+++ b/external/tbb/examples/parallel_for/tachyon/src/imageio.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2023 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -49,7 +49,7 @@
  *  $Id: imageio.h,v 1.2 2007-02-22 17:54:15 Exp $
  */
 
-/* For our puposes, we're interested only in the 3 byte per pixel 24 bit
+/* For our purposes, we're interested only in the 3 byte per pixel 24 bit
    truecolor sort of file.. */
 
 #define IMAGENOERR    0 /* no error */
diff --git a/external/tbb/examples/parallel_for/tachyon/src/jpeg.cpp b/external/tbb/examples/parallel_for/tachyon/src/jpeg.cpp
index 5a5885f4..ed066364 100644
--- a/external/tbb/examples/parallel_for/tachyon/src/jpeg.cpp
+++ b/external/tbb/examples/parallel_for/tachyon/src/jpeg.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2023 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -49,7 +49,7 @@
 
 /*
  * This code requires support from the Independent JPEG Group's libjpeg.
- * For our puposes, we're interested only in the 3 byte per pixel 24 bit
+ * For our purposes, we're interested only in the 3 byte per pixel 24 bit
  * RGB output.  Probably won't implement any decent checking at this point.
  */
 
diff --git a/external/tbb/examples/parallel_for/tachyon/src/main.cpp b/external/tbb/examples/parallel_for/tachyon/src/main.cpp
index 67464b51..b4f73e4b 100644
--- a/external/tbb/examples/parallel_for/tachyon/src/main.cpp
+++ b/external/tbb/examples/parallel_for/tachyon/src/main.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -74,7 +74,7 @@ bool global_usegraphics;
 
 bool silent_mode = false; /* silent mode */
 
-class tachyon_video *video = 0;
+class tachyon_video *video = nullptr;
 
 typedef struct {
     int foundfilename; /* was a model file name found in the args? */
diff --git a/external/tbb/examples/parallel_for/tachyon/src/ppm.cpp b/external/tbb/examples/parallel_for/tachyon/src/ppm.cpp
index fb898369..4802f76c 100644
--- a/external/tbb/examples/parallel_for/tachyon/src/ppm.cpp
+++ b/external/tbb/examples/parallel_for/tachyon/src/ppm.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2023 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -47,7 +47,7 @@
  *  ppm.cpp - This file deals with PPM format image files (reading/writing)
  */
 
-/* For our puposes, we're interested only in the 3 byte per pixel 24 bit
+/* For our purposes, we're interested only in the 3 byte per pixel 24 bit
    truecolor sort of file..  Probably won't implement any decent checking
    at this point, probably choke on things like the # comments.. */
 
diff --git a/external/tbb/examples/parallel_for/tachyon/src/ppm.hpp b/external/tbb/examples/parallel_for/tachyon/src/ppm.hpp
index 7c09b0c2..cb306b91 100644
--- a/external/tbb/examples/parallel_for/tachyon/src/ppm.hpp
+++ b/external/tbb/examples/parallel_for/tachyon/src/ppm.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2023 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -49,7 +49,7 @@
  *  $Id: ppm.h,v 1.2 2007-02-22 17:54:16 Exp $
  */
 
-/* For our puposes, we're interested only in the 3 byte per pixel 24 bit
+/* For our purposes, we're interested only in the 3 byte per pixel 24 bit
    truecolor sort of file..  Probably won't implement any decent checking
    at this point, probably choke on things like the # comments.. */
 
diff --git a/external/tbb/examples/parallel_for/tachyon/src/render.cpp b/external/tbb/examples/parallel_for/tachyon/src/render.cpp
index d563a161..3bcde3d3 100644
--- a/external/tbb/examples/parallel_for/tachyon/src/render.cpp
+++ b/external/tbb/examples/parallel_for/tachyon/src/render.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -82,6 +82,6 @@ void renderscene(scenedef scene) {
   outfile = opentgafile(scene.outfilename);
   */
 
-    trace_region(scene, 0 /*outfile*/, 0, 0, scene.hres, scene.vres);
+    trace_region(scene, nullptr /*outfile*/, 0, 0, scene.hres, scene.vres);
     //fclose((FILE *)outfile);
 } /* end of renderscene() */
diff --git a/external/tbb/examples/parallel_for_each/README.md b/external/tbb/examples/parallel_for_each/README.md
index 657b3500..927173b3 100644
--- a/external/tbb/examples/parallel_for_each/README.md
+++ b/external/tbb/examples/parallel_for_each/README.md
@@ -1,5 +1,4 @@
 # Code Samples of oneAPI Threading Building Blocks (oneTBB)
-
 Examples using `parallel_for_each` algorithm.
 
 | Code sample name | Description
diff --git a/external/tbb/examples/parallel_for_each/parallel_preorder/CMakeLists.txt b/external/tbb/examples/parallel_for_each/parallel_preorder/CMakeLists.txt
index 235604ab..1232474f 100644
--- a/external/tbb/examples/parallel_for_each/parallel_preorder/CMakeLists.txt
+++ b/external/tbb/examples/parallel_for_each/parallel_preorder/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Intel Corporation
+# Copyright (c) 2020-2025 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.5.0...3.31.3)
 
 project(parallel_preorder CXX)
 
diff --git a/external/tbb/examples/parallel_for_each/parallel_preorder/README.md b/external/tbb/examples/parallel_for_each/parallel_preorder/README.md
index b9050bb3..9c45c8bc 100644
--- a/external/tbb/examples/parallel_for_each/parallel_preorder/README.md
+++ b/external/tbb/examples/parallel_for_each/parallel_preorder/README.md
@@ -1,16 +1,12 @@
 # Parallel_preorder sample
-
 Example that uses `parallel_for_each` to do parallel preorder traversal of a sparse graph.
 
-Each vertex in the graph is called a "cell". Each cell has a value. The value is a matrix. Some of the cells have
-operators that compute the cell's value, using other cell's values as input. A cell that uses the value of cell `x` is
-called a successor of `x`.
+Each vertex in the graph is called a "cell". Each cell has a value. The value is a matrix. Some of the cells have operators that compute the cell's value, using other cell's values as input. A cell that uses the value of cell `x` is called a successor of `x`.
 
 The algorithm works as follows.
 
 1. Compute the set of cells that have no inputs. This set is called `root_set`.
-2. Each cell has an associated field `ref_count` that is an atomic integer. Initialize `ref_count` to the number of
-   inputs for the `Cell`.
+2. Each cell has an associated field `ref_count` that is an atomic integer. Initialize `ref_count` to the number of inputs for the `Cell`.
 3. Update each cell in `root_set`, by applying a `parallel_for_each` to a `root_set`.
 4. After updating a cell, for each of its successors
     1. Atomically decrement the successor's ref_count
@@ -18,43 +14,31 @@ The algorithm works as follows.
 
 The times printed are for the traversal and update, and do not include time for computing the `root_set`.
 
-The example is using custom synchronization via ref_count atomic variable. Correctness checking tools might not take
-this into account, and report data races between different tasks that are actually synchronized.
-
-**Note:** It is important to understand that this example is unlikely to show speedup if the cell values are changed to
-type "float". The reason is twofold.
+The example is using custom synchronization via ref_count atomic variable. Correctness checking tools might not take this into account, and report data races between different tasks that are actually synchronized.
 
-* The smaller value type causes each `Cell` to be significantly smaller than a cache line, which leads to false sharing
-  conflicts.
-* The time to update the cells becomes very small, and consequently the overhead of `parallel_for_each` swamps the
-  useful work.
+**Note:** It is important to understand that this example is unlikely to show speedup if the cell values are changed to type "float". The reason is twofold.
+* The smaller value type causes each `Cell` to be significantly smaller than a cache line, which leads to false sharing conflicts.
+* The time to update the cells becomes very small, and consequently the overhead of `parallel_for_each` swamps the useful work.
 
 ## Building the example
-
 ```
 cmake <path_to_example>
 cmake --build .
 ```
 
 ## Running the sample
-
 ### Predefined make targets
-
 * `make run_parallel_preorder` - executes the example with predefined parameters
 * `make perf_run_parallel_preorder` - executes the example with suggested parameters to measure the oneTBB performance
 * `make light_test_parallel_preorder` - executes the example with suggested parameters to reduce execution time.
 
 ### Application parameters
-
 Usage:
-
 ```
 parallel_preorder [n-of-threads=value] [n-of-nodes=value] [n-of-traversals=value] [silent] [-h] [n-of-threads [n-of-nodes [n-of-traversals]]]
 ```
-
 * `-h` - prints the help for command line options.
-* `n-of-threads` - the number of threads to use; a range of the form low\[:high\], where low and optional high are
-  non-negative integers or `auto` for a platform-specific default number.
+* `n-of-threads` - the number of threads to use; a range of the form low\[:high\], where low and optional high are non-negative integers or `auto` for a platform-specific default number.
 * `n-of-nodes` - the number of nodes in the graph. Default value is 1000.
 * `n-of-traversals` - the number of times to evaluate the graph. Default value is 500.
 * `silent` - no output except elapsed time.
diff --git a/external/tbb/examples/parallel_pipeline/README.md b/external/tbb/examples/parallel_pipeline/README.md
index 21c7ed4e..53a442af 100644
--- a/external/tbb/examples/parallel_pipeline/README.md
+++ b/external/tbb/examples/parallel_pipeline/README.md
@@ -1,5 +1,4 @@
 # Code Samples of oneAPI Threading Building Blocks (oneTBB)
-
 Examples using `parallel_pipeline` algorithm.
 
 | Code sample name | Description
diff --git a/external/tbb/examples/parallel_pipeline/square/CMakeLists.txt b/external/tbb/examples/parallel_pipeline/square/CMakeLists.txt
index d52966db..f4545901 100644
--- a/external/tbb/examples/parallel_pipeline/square/CMakeLists.txt
+++ b/external/tbb/examples/parallel_pipeline/square/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Intel Corporation
+# Copyright (c) 2020-2025 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.5.0...3.31.3)
 
 project(square CXX)
 
@@ -27,7 +27,7 @@ target_compile_options(square PRIVATE ${TBB_CXX_STD_FLAG})
 
 if (MSVC AND CMAKE_CXX_COMPILER_ID STREQUAL IntelLLVM)
     target_compile_options(square PRIVATE -D_CRT_SECURE_NO_WARNINGS)
-endif ()
+endif()
 
 set(EXECUTABLE "$<TARGET_FILE:square>")
 set(ARGS 0 input.txt output.txt)
diff --git a/external/tbb/examples/parallel_pipeline/square/README.md b/external/tbb/examples/parallel_pipeline/square/README.md
index 7d3997b6..143e5ba3 100644
--- a/external/tbb/examples/parallel_pipeline/square/README.md
+++ b/external/tbb/examples/parallel_pipeline/square/README.md
@@ -1,34 +1,25 @@
 # Square sample
-
-Text filter that demonstrates the use of `parallel_pipeline`. Example program reads a file containing decimal integers
-in text format, and changes each to its square.
+Text filter that demonstrates the use of `parallel_pipeline`. Example program reads a file containing decimal integers in text format, and changes each to its square.
 
 ## Building the example
-
 ```
 cmake <path_to_example>
 cmake --build .
 ```
 
 ## Running the sample
-
 ### Predefined make targets
-
 * `make run_square` - executes the example with predefined parameters
 * `make perf_run_square` - executes the example with suggested parameters to measure the oneTBB performance
 * `make light_test_square` - executes the example with suggested parameters to reduce execution time.
 
 ### Application parameters
-
 Usage:
-
 ```
 square [n-of-threads=value] [input-file=value] [output-file=value] [max-slice-size=value] [silent] [-h] [n-of-threads [input-file [output-file [max-slice-size]]]]
 ```
-
 * `-h` - prints the help for command line options.
-* `n-of-threads` - the number of threads to use; a range of the form low\[:high\], where low and optional high are
-  non-negative integers or `auto` for a platform-specific default number.
+* `n-of-threads` - the number of threads to use; a range of the form low\[:high\], where low and optional high are non-negative integers or `auto` for a platform-specific default number.
 * `input`- file is an input file name.
 * `output`- file is an output file name.
 * `max-slice-size` - the maximum number of characters in one slice.
diff --git a/external/tbb/examples/parallel_reduce/README.md b/external/tbb/examples/parallel_reduce/README.md
index b5358dea..0dba80ca 100644
--- a/external/tbb/examples/parallel_reduce/README.md
+++ b/external/tbb/examples/parallel_reduce/README.md
@@ -1,8 +1,8 @@
 # Code Samples of oneAPI Threading Building Blocks (oneTBB)
-
 Examples using `parallel_reduce` algorithm.
 
 | Code sample name | Description
 |:--- |:---
 | convex_hull | Parallel version of convex hull algorithm (quick hull).
+| pi | Parallel version of calculating &pi; by numerical integration.
 | primes | Parallel version of the Sieve of Eratosthenes.
diff --git a/external/tbb/examples/parallel_reduce/convex_hull/CMakeLists.txt b/external/tbb/examples/parallel_reduce/convex_hull/CMakeLists.txt
index de32d1de..d5f00856 100644
--- a/external/tbb/examples/parallel_reduce/convex_hull/CMakeLists.txt
+++ b/external/tbb/examples/parallel_reduce/convex_hull/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Intel Corporation
+# Copyright (c) 2020-2025 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.5.0...3.31.3)
 
 project(convex_hull_bench CXX)
 project(convex_hull_sample CXX)
diff --git a/external/tbb/examples/parallel_reduce/convex_hull/README.md b/external/tbb/examples/parallel_reduce/convex_hull/README.md
index 8d41c608..dcd11e40 100644
--- a/external/tbb/examples/parallel_reduce/convex_hull/README.md
+++ b/external/tbb/examples/parallel_reduce/convex_hull/README.md
@@ -1,41 +1,30 @@
 # Convex_hull sample
-
 Parallel version of convex hull algorithm (quick hull).
 
 ## Building the example
-
 ```
 cmake <path_to_example>
 cmake --build .
 ```
 
 This sample contains two additional predefined build targets:
-
-- `convex_hull_sample` - builds parallel version of the example which uses `parallel_reduce`, `parallel_for`
-  and `concurrent_vector`.
-- `convex_hull_bench` - build version of the example that compares serial and parallel buffered and unbuffered
-  implementations.
+- `convex_hull_sample` -  builds parallel version of the example which uses `parallel_reduce`, `parallel_for` and `concurrent_vector`.
+- `convex_hull_bench` - build version of the example that compares serial and parallel buffered and unbuffered implementations.
 
 ## Running the sample
-
 ### Predefined make targets
-
 * `make run_convex_hull` - executes the example with predefined parameters.
 * `make perf_run_convex_hull` - executes the example with suggested parameters to measure the oneTBB performance.
 * `make light_test_convex_hull` - executes the example with suggested parameters to reduce execution time.
 
 ### Application parameters
-
 Usage:
-
 ```
 convex_hull_sample [n-of-threads=value] [n-of-points=value] [silent] [verbose] [-h] [n-of-threads [n-of-points]]
 convex_hull_bench [n-of-threads=value] [n-of-points=value] [silent] [verbose] [-h] [n-of-threads [n-of-points]]
 ```
-
 * `-h` - prints the help for command line options.
-* `n-of-threads` - the number of threads to use; a range of the form low\[:high\], where low and optional high are
-  non-negative integers or `auto` for a platform-specific default number.
+* `n-of-threads` - the number of threads to use; a range of the form low\[:high\], where low and optional high are non-negative integers or `auto` for a platform-specific default number.
 * `n-of-points` - number of points.
 * `silent` - no output except elapsed time.
 * `verbose` - turns verbose ON.
diff --git a/external/tbb/examples/parallel_reduce/pi/CMakeLists.txt b/external/tbb/examples/parallel_reduce/pi/CMakeLists.txt
new file mode 100644
index 00000000..01dd07d0
--- /dev/null
+++ b/external/tbb/examples/parallel_reduce/pi/CMakeLists.txt
@@ -0,0 +1,33 @@
+# Copyright (c) 2023-2025 Intel Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+cmake_minimum_required(VERSION 3.5.0...3.31.3)
+
+project(pi CXX)
+
+include(../../common/cmake/common.cmake)
+
+set_common_project_settings(tbb)
+
+add_executable(pi main.cpp pi.cpp)
+
+target_link_libraries(pi TBB::tbb Threads::Threads)
+target_compile_options(pi PRIVATE ${TBB_CXX_STD_FLAG})
+
+set(EXECUTABLE "$<TARGET_FILE:pi>")
+set(ARGS "")
+set(PERF_ARGS auto 100000000000)
+
+add_execution_target(run_pi pi ${EXECUTABLE} "${ARGS}")
+add_execution_target(perf_run_pi pi ${EXECUTABLE} "${PERF_ARGS}")
diff --git a/external/tbb/examples/parallel_reduce/pi/README.md b/external/tbb/examples/parallel_reduce/pi/README.md
new file mode 100644
index 00000000..be7ce0d4
--- /dev/null
+++ b/external/tbb/examples/parallel_reduce/pi/README.md
@@ -0,0 +1,24 @@
+# Pi Sample
+Parallel version of calculating &pi; by numerical integration.
+
+## Build
+To build the sample, run the following commands:
+```
+cmake <path_to_example>
+cmake --build .
+```
+
+## Run
+### Predefined Make Targets
+* `make run_pi` - executes the example with predefined parameters
+* `make perf_run_pi` - executes the example with suggested parameters to measure the oneTBB performance
+
+### Application Parameters
+You can use the following application parameters:
+```
+pi [n-of-threads=value] [n-of-intervals=value] [silent] [-h] [n-of-threads [n-of-intervals]]
+```
+* `-h` - prints the help for command-line options.
+* `n-of-threads` - the number of threads to use. This number is specified in the low\[:high\] range format, where both ``low`` and, optionally, ``high`` are non-negative integers. You can also use ``auto`` to let the system choose a default number of threads suitable for the platform.
+* `n-of-intervals` - the number of intervals to subdivide into. Must be a positive integer.
+* `silent` - no output except the elapsed time.
diff --git a/external/tbb/examples/parallel_reduce/pi/common.h b/external/tbb/examples/parallel_reduce/pi/common.h
new file mode 100644
index 00000000..0e316854
--- /dev/null
+++ b/external/tbb/examples/parallel_reduce/pi/common.h
@@ -0,0 +1,51 @@
+/*
+    Copyright (c) 2023 Intel Corporation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#ifndef TBB_examples_pi_H
+#define TBB_examples_pi_H
+
+#include <cstdlib>
+
+typedef std::size_t number_t;
+typedef double pi_t;
+
+extern const number_t chunk_size;
+extern number_t num_intervals;
+extern pi_t step;
+
+extern bool silent;
+
+inline pi_t pi_kernel(number_t i) {
+    pi_t dx = (pi_t(i) + pi_t(0.5)) * step;
+    return pi_t(4.0) / (pi_t(1.0) + dx * dx);
+}
+
+inline double pi_slice_kernel(number_t slice, number_t slice_size = chunk_size) {
+    pi_t pi = pi_t(0.0);
+    for (number_t i = slice; i < slice + slice_size; ++i) {
+        pi += pi_kernel(i);
+    }
+    return pi;
+}
+
+struct threading {
+    threading(int p);
+    ~threading();
+};
+
+double compute_pi_parallel();
+
+#endif //  TBB_examples_pi_H
diff --git a/external/tbb/examples/parallel_reduce/pi/main.cpp b/external/tbb/examples/parallel_reduce/pi/main.cpp
new file mode 100644
index 00000000..81690617
--- /dev/null
+++ b/external/tbb/examples/parallel_reduce/pi/main.cpp
@@ -0,0 +1,100 @@
+/*
+    Copyright (c) 2023 Intel Corporation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#include "oneapi/tbb/tick_count.h"
+
+#include "common/utility/get_default_num_threads.hpp"
+#include "common/utility/utility.hpp"
+
+#include "common.h"
+
+const number_t chunk_size = 4096; // Multiple of 16, to fit float datatype to a vector register.
+
+// number of intervals
+number_t num_intervals = 1000000000;
+pi_t step = pi_t(0.0);
+
+bool silent = false;
+
+double compute_pi_serial() {
+    double ret = 0;
+
+    step = pi_t(1.0) / num_intervals;
+
+    number_t tail = num_intervals % chunk_size;
+    number_t last = num_intervals - tail;
+
+    for (number_t slice = 0; slice < last; slice += chunk_size) {
+        ret += pi_slice_kernel(slice);
+    }
+    ret += pi_slice_kernel(last, tail);
+    ret *= step;
+
+    return ret;
+}
+
+int main(int argc, char* argv[]) {
+    try {
+        tbb::tick_count main_start_time = tbb::tick_count::now();
+        // zero number of threads means to run serial version
+        utility::thread_number_range threads(utility::get_default_num_threads, 0);
+
+        utility::parse_cli_arguments(
+            argc,
+            argv,
+            utility::cli_argument_pack()
+                //"-h" option for for displaying help is present implicitly
+                .positional_arg(threads, "n-of-threads", utility::thread_number_range_desc)
+                .positional_arg(num_intervals, "n-of-intervals", "number of intervals")
+                .arg(silent, "silent", "no output except time elapsed"));
+
+        for (int p = threads.first; p <= threads.last; p = threads.step(p)) {
+            pi_t pi;
+            double compute_time;
+            if (p == 0) {
+                //run a serial version
+                tbb::tick_count compute_start_time = tbb::tick_count::now();
+                pi = compute_pi_serial();
+                compute_time = (tbb::tick_count::now() - compute_start_time).seconds();
+            }
+            else {
+                //run a parallel version
+                threading tp(p);
+                tbb::tick_count compute_start_time = tbb::tick_count::now();
+                pi = compute_pi_parallel();
+                compute_time = (tbb::tick_count::now() - compute_start_time).seconds();
+            }
+
+            if (!silent) {
+                if (p == 0) {
+                    std::cout << "Serial run:\tpi = " << pi << "\tcompute time = " << compute_time
+                              << " sec\n";
+                }
+                else {
+                    std::cout << "Parallel run:\tpi = " << pi << "\tcompute time = " << compute_time
+                              << " sec\t on " << p << " threads\n";
+                }
+            }
+        }
+
+        utility::report_elapsed_time((tbb::tick_count::now() - main_start_time).seconds());
+        return 0;
+    }
+    catch (std::exception& e) {
+        std::cerr << "error occurred. error text is :\"" << e.what() << "\"\n";
+        return 1;
+    }
+}
diff --git a/external/tbb/examples/parallel_reduce/pi/pi.cpp b/external/tbb/examples/parallel_reduce/pi/pi.cpp
new file mode 100644
index 00000000..230752a9
--- /dev/null
+++ b/external/tbb/examples/parallel_reduce/pi/pi.cpp
@@ -0,0 +1,55 @@
+/*
+    Copyright (c) 2023 Intel Corporation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#include "common.h"
+#include "oneapi/tbb/blocked_range.h"
+#include "oneapi/tbb/global_control.h"
+#include "oneapi/tbb/parallel_reduce.h"
+
+struct reduce_body {
+    double my_pi;
+    reduce_body() : my_pi(0) {}
+    reduce_body(reduce_body& x, tbb::split) : my_pi(0) {}
+    void operator()(const tbb::blocked_range<number_t>& r) {
+        my_pi += pi_slice_kernel(r.begin(), r.size());
+    }
+    void join(const reduce_body& y) {
+        my_pi += y.my_pi;
+    }
+};
+
+double compute_pi_parallel() {
+    step = pi_t(1.0) / num_intervals;
+
+    double ret = 0.0;
+
+    reduce_body body;
+    tbb::parallel_reduce(tbb::blocked_range<number_t>(0, num_intervals), body);
+
+    ret = body.my_pi * step;
+
+    return ret;
+}
+
+static std::unique_ptr<tbb::global_control> gc;
+
+threading::threading(int p) {
+    gc.reset(new tbb::global_control(tbb::global_control::max_allowed_parallelism, p));
+}
+
+threading::~threading() {
+    gc.reset();
+}
diff --git a/external/tbb/examples/parallel_reduce/primes/CMakeLists.txt b/external/tbb/examples/parallel_reduce/primes/CMakeLists.txt
index dabd9682..23b98586 100644
--- a/external/tbb/examples/parallel_reduce/primes/CMakeLists.txt
+++ b/external/tbb/examples/parallel_reduce/primes/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Intel Corporation
+# Copyright (c) 2020-2025 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.5.0...3.31.3)
 
 project(primes CXX)
 
diff --git a/external/tbb/examples/parallel_reduce/primes/README.md b/external/tbb/examples/parallel_reduce/primes/README.md
index 6c616f47..f092b78b 100644
--- a/external/tbb/examples/parallel_reduce/primes/README.md
+++ b/external/tbb/examples/parallel_reduce/primes/README.md
@@ -1,32 +1,24 @@
 # Primes sample
-
 Parallel version of the Sieve of Eratosthenes.
 
 ## Building the example
-
 ```
 cmake <path_to_example>
 cmake --build .
 ```
 
 ## Running the sample
-
 ### Predefined make targets
-
 * `make run_primes` - executes the example with predefined parameters
 * `make perf_run_primes` - executes the example with suggested parameters to measure the oneTBB performance
 
 ### Application parameters
-
 Usage:
-
 ```
 primes [n-of-threads=value] [number=value] [grain-size=value] [n-of-repeats=value] [silent] [-h] [n-of-threads [number [grain-size [n-of-repeats]]]]
 ```
-
 * `-h` - prints the help for command line options.
-* `n-of-threads` - the number of threads to use; a range of the form low\[:high\], where low and optional high are
-  non-negative integers or `auto` for a platform-specific default number.
+* `n-of-threads` - the number of threads to use; a range of the form low\[:high\], where low and optional high are non-negative integers or `auto` for a platform-specific default number.
 * `number` - the upper bound of range to search primes in, must be a positive integer.
 * `grain-size` - the optional grain size, must be a positive integer.
 * `n-of-repeats` - the number of the calculation repeats, must be a positive integer.
diff --git a/external/tbb/examples/task_arena/README.md b/external/tbb/examples/task_arena/README.md
index d67d7ce5..3f4e4e69 100644
--- a/external/tbb/examples/task_arena/README.md
+++ b/external/tbb/examples/task_arena/README.md
@@ -1,5 +1,4 @@
 # Code Samples of oneAPI Threading Building Blocks (oneTBB)
-
 Examples using the `task_arena` feature.
 
 | Code sample name | Description
diff --git a/external/tbb/examples/task_arena/fractal/CMakeLists.txt b/external/tbb/examples/task_arena/fractal/CMakeLists.txt
index 1ce7c30d..c8eef2d0 100644
--- a/external/tbb/examples/task_arena/fractal/CMakeLists.txt
+++ b/external/tbb/examples/task_arena/fractal/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Intel Corporation
+# Copyright (c) 2020-2025 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.5.0...3.31.3)
 
 project(fractal CXX)
 
@@ -20,7 +20,7 @@ include(../../common/cmake/common.cmake)
 
 set_common_project_settings(tbb)
 
-add_executable(fractal fractal.cpp main.cpp)
+add_executable(fractal fractal.cpp main.cpp ) 
 
 add_subdirectory(../../common/gui gui)
 
diff --git a/external/tbb/examples/task_arena/fractal/README.md b/external/tbb/examples/task_arena/fractal/README.md
index 0c48472e..6288395a 100644
--- a/external/tbb/examples/task_arena/fractal/README.md
+++ b/external/tbb/examples/task_arena/fractal/README.md
@@ -1,41 +1,30 @@
 # Fractal sample
-
 The example calculates two classical Mandelbrot fractals with different concurrency levels.
 
 The application window is divided into two areas where fractals are rendered. The example also has the console mode.
 
 ## Building the example
-
 ```
 cmake <path_to_example> [EXAMPLES_UI_MODE=value]
 cmake --build .
 
 ```
-
 ### Predefined CMake variables
-
-* `EXAMPLES_UI_MODE` - defines the GUI mode, supported values are `gdi`, `d2d`, `con` on Windows, `x`,`con` on Linux
-  and `mac`,`con` on macOS. The default mode is `con`. See the [common page](../../README.md) to get more information.
+* `EXAMPLES_UI_MODE` - defines the GUI mode, supported values are `gdi`, `d2d`, `con` on Windows, `x`,`con` on Linux and `mac`,`con` on macOS. The default mode is `con`. See the [common page](../../README.md) to get more information.
 
 ## Running the sample
-
 ### Predefined make targets
-
 * `make run_fractal` - executes the example with predefined parameters.
 * `make perf_run_fractal` - executes the example with suggested parameters to measure the oneTBB performance.
 * `make light_test_fractal` - executes the example with suggested parameters to reduce execution time.
 
 ### Application parameters
-
 Usage:
-
 ```
 fractal [n-of-threads=value] [n-of-frames=value] [max-of-iterations=value] [grain-size=value] [use-auto-partitioner] [silent] [single] [-h] [n-of-threads [n-of-frames [max-of-iterations [grain-size]]]]
 ```
-
 * `-h` - prints the help for command line options.
-* `n-of-threads` - the number of threads to use; a range of the form low\[:high\], where low and optional high are
-  non-negative integers or `auto` for a platform-specific default number.
+* `n-of-threads` - the number of threads to use; a range of the form low\[:high\], where low and optional high are non-negative integers or `auto` for a platform-specific default number.
 * `n-of-frames` - the number of frames the example processes internally.
 * `max-of-iterations` - the maximum number of the fractal iterations.
 * `grain-size` - the optional grain size, must be a positive integer.
@@ -44,9 +33,7 @@ fractal [n-of-threads=value] [n-of-frames=value] [max-of-iterations=value] [grai
 * `single` - process only one fractal.
 
 ### Interactive graphical user interface
-
-The following hot keys can be used in interactive execution mode when the example is compiled with the graphical user
-interface:
+The following hot keys can be used in interactive execution mode when the example is compiled with the graphical user interface:
 
 * `left mouse button` - make the fractal active.
 * `w` - move the active fractal up.
diff --git a/external/tbb/examples/task_arena/fractal/fractal_video.hpp b/external/tbb/examples/task_arena/fractal/fractal_video.hpp
index 2129f762..b15b5d00 100644
--- a/external/tbb/examples/task_arena/fractal/fractal_video.hpp
+++ b/external/tbb/examples/task_arena/fractal/fractal_video.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -87,7 +87,7 @@ class fractal_video : public video {
     }
 
 public:
-    fractal_video() : fg(0) {
+    fractal_video() : fg(nullptr) {
         title = "oneTBB: Fractal Example";
         v = this;
     }
diff --git a/external/tbb/examples/task_arena/fractal/gui/fractal.rc b/external/tbb/examples/task_arena/fractal/gui/fractal.rc
index b1708cca..5a13d046 100644
--- a/external/tbb/examples/task_arena/fractal/gui/fractal.rc
+++ b/external/tbb/examples/task_arena/fractal/gui/fractal.rc
@@ -19,56 +19,72 @@
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
 #ifdef _WIN32
-LANGUAGE LANG_ENGLISH,
-    SUBLANG_ENGLISH_US
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 #pragma code_page(1252)
 #endif //_WIN32
 
-        /////////////////////////////////////////////////////////////////////////////
-        //
-        // Icon
-        //
-
-        // Icon with lowest ID value placed first to ensure application icon
-        // remains consistent on all systems.
-        IDI_GUI ICON "gui.ico" IDI_SMALL ICON "small.ico"
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
 
-#ifdef APSTUDIO_INVOKED
-    /////////////////////////////////////////////////////////////////////////////
-    //
-    // TEXTINCLUDE
-    //
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_GUI   ICON                    "gui.ico"
+IDI_SMALL               ICON                    "small.ico"
 
-    1 TEXTINCLUDE BEGIN "resource.h\0" END
 
-    2 TEXTINCLUDE BEGIN "#define APSTUDIO_HIDDEN_SYMBOLS\r\n"
-                        "#include "
-                        "windows.h"
-                        "\r\n"
-                        "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n"
-                        "\0" END
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
 
-    3 TEXTINCLUDE BEGIN
+1 TEXTINCLUDE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+    "#define APSTUDIO_HIDDEN_SYMBOLS\r\n"
+    "#include ""windows.h""\r\n"
+    "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
     "\r\n"
-    "\0" END
+    "\0"
+END
 
-#endif // APSTUDIO_INVOKED
+#endif    // APSTUDIO_INVOKED
 
-        /////////////////////////////////////////////////////////////////////////////
-        //
-        // String Table
-        //
 
-        STRINGTABLE BEGIN IDS_APP_TITLE "gui" IDC_GUI "GUI" END
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+STRINGTABLE 
+BEGIN
+    IDS_APP_TITLE           "gui"
+    IDC_GUI   "GUI"
+END
 
-#endif // English (U.S.) resources
+#endif    // English (U.S.) resources
 /////////////////////////////////////////////////////////////////////////////
 
+
+
 #ifndef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
 //
 // Generated from the TEXTINCLUDE 3 resource.
 //
 
+
 /////////////////////////////////////////////////////////////////////////////
-#endif // not APSTUDIO_INVOKED
+#endif    // not APSTUDIO_INVOKED
+
diff --git a/external/tbb/examples/task_group/README.md b/external/tbb/examples/task_group/README.md
index e19f27f3..3901083b 100644
--- a/external/tbb/examples/task_group/README.md
+++ b/external/tbb/examples/task_group/README.md
@@ -1,5 +1,4 @@
 # Code Samples of oneAPI Threading Building Blocks (oneTBB)
-
 Examples using `task_group` interface.
 
 | Code sample name | Description
diff --git a/external/tbb/examples/task_group/sudoku/CMakeLists.txt b/external/tbb/examples/task_group/sudoku/CMakeLists.txt
index 3e5ecea1..8ce40a58 100644
--- a/external/tbb/examples/task_group/sudoku/CMakeLists.txt
+++ b/external/tbb/examples/task_group/sudoku/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Intel Corporation
+# Copyright (c) 2020-2025 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.5.0...3.31.3)
 
 project(sudoku CXX)
 
@@ -27,7 +27,7 @@ target_compile_options(sudoku PRIVATE ${TBB_CXX_STD_FLAG})
 
 if (MSVC AND CMAKE_CXX_COMPILER_ID STREQUAL IntelLLVM)
     target_compile_options(sudoku PRIVATE -D_CRT_SECURE_NO_WARNINGS)
-endif ()
+endif()
 
 set(EXECUTABLE "$<TARGET_FILE:sudoku>")
 set(ARGS 4 ${CMAKE_CURRENT_SOURCE_DIR}/input1 verbose)
diff --git a/external/tbb/examples/task_group/sudoku/README.md b/external/tbb/examples/task_group/sudoku/README.md
index 02d0f083..9f59bbb4 100644
--- a/external/tbb/examples/task_group/sudoku/README.md
+++ b/external/tbb/examples/task_group/sudoku/README.md
@@ -1,36 +1,26 @@
-# Fractal sample
-
+# Sudoku sample
 This directory contains an example that finds all solutions to a Sudoku board.
 
-It uses a straightforward state-space search algorithm that exhibits OR-parallelism. It can be optionally run until it
-obtains just the first solution. The point of the example is to teach how to use the `task_group` interface.
+It uses a straightforward state-space search algorithm that exhibits OR-parallelism. It can be optionally run until it obtains just the first solution. The point of the example is to teach how to use the `task_group` interface.
 
 ## Building the example
-
 ```
 cmake <path_to_example>
 cmake --build .
 ```
 
 ## Running the sample
-
 ### Predefined make targets
-
-* `make run_fractal` - executes the example with predefined parameters.
-* `make perf_run_fractal` - executes the example with suggested parameters to measure the oneTBB performance.
-* `make light_test_fractal` - executes the example with suggested parameters to reduce execution time.
+* `make run_sudoku` - executes the example with predefined parameters.
+* `make perf_run_sudoku` - executes the example with suggested parameters to measure the oneTBB performance.
 
 ### Application parameters
-
 Usage:
-
 ```
 sudoku [n-of-threads=value] [filename=value] [verbose] [silent] [find-one] [-h] [n-of-threads [filename]]
 ```
-
 * `-h` - prints the help for command line options.
-* `n-of-threads` - the number of threads to use; a range of the form low\[:high\], where low and optional high are
-  non-negative integers or `auto` for a platform-specific default number.
+* `n-of-threads` - the number of threads to use; a range of the form low\[:high\], where low and optional high are non-negative integers or `auto` for a platform-specific default number.
 * `filename` - the input filename.
 * `verbose` - prints the first solution.
 * `silent` - no output except elapsed time.
diff --git a/external/tbb/examples/task_group/sudoku/sudoku.cpp b/external/tbb/examples/task_group/sudoku/sudoku.cpp
index cdf1551d..a36f8757 100644
--- a/external/tbb/examples/task_group/sudoku/sudoku.cpp
+++ b/external/tbb/examples/task_group/sudoku/sudoku.cpp
@@ -39,7 +39,6 @@ unsigned short init_values[BOARD_SIZE] = { 1, 0, 0, 9, 0, 0, 0, 8, 0, 0, 8, 0, 2
                                            0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 7, 4, 0, 0, 7, 0, 0,
                                            0, 3, 0, 0, 3, 0, 0, 0, 2, 0, 0, 5, 0, 0, 0, 0, 0,
                                            0, 1, 0, 0, 5, 0, 0, 0, 1, 0, 0, 0, 0 };
-oneapi::tbb::task_group *g;
 double solve_time;
 
 typedef struct {
@@ -47,8 +46,8 @@ typedef struct {
     unsigned potential_set;
 } board_element;
 
-void read_board(const char *filename) {
-    FILE *fp;
+void read_board(const char* filename) {
+    FILE* fp;
     int input;
     fp = fopen(filename, "r");
     if (!fp) {
@@ -66,7 +65,7 @@ void read_board(const char *filename) {
     fclose(fp);
 }
 
-void print_board(board_element *b) {
+void print_board(const std::vector<board_element>& b) {
     for (unsigned row = 0; row < BOARD_DIM; ++row) {
         for (unsigned col = 0; col < BOARD_DIM; ++col) {
             printf(" %d", b[row * BOARD_DIM + col].solved_element);
@@ -79,7 +78,7 @@ void print_board(board_element *b) {
     }
 }
 
-void print_potential_board(board_element *b) {
+void print_potential_board(const std::vector<board_element>& b) {
     for (unsigned row = 0; row < BOARD_DIM; ++row) {
         for (unsigned col = 0; col < BOARD_DIM; ++col) {
             if (b[row * BOARD_DIM + col].solved_element)
@@ -95,50 +94,45 @@ void print_potential_board(board_element *b) {
     }
 }
 
-void init_board(board_element *b) {
+void init_board(std::vector<board_element>& b) {
     for (unsigned i = 0; i < BOARD_SIZE; ++i)
         b[i].solved_element = b[i].potential_set = 0;
 }
 
-void init_board(board_element *b, unsigned short arr[81]) {
+void init_board(std::vector<board_element>& b, unsigned short arr[BOARD_SIZE]) {
     for (unsigned i = 0; i < BOARD_SIZE; ++i) {
         b[i].solved_element = arr[i];
         b[i].potential_set = 0;
     }
 }
 
-void init_potentials(board_element *b) {
+void init_potentials(std::vector<board_element>& b) {
     for (unsigned i = 0; i < BOARD_SIZE; ++i)
         b[i].potential_set = 0;
 }
 
-void copy_board(board_element *src, board_element *dst) {
-    for (unsigned i = 0; i < BOARD_SIZE; ++i)
-        dst[i].solved_element = src[i].solved_element;
-}
-
-bool fixed_board(board_element *b) {
+bool fixed_board(const std::vector<board_element>& b) {
     for (int i = BOARD_SIZE - 1; i >= 0; --i)
         if (b[i].solved_element == 0)
             return false;
     return true;
 }
 
-bool in_row(board_element *b, unsigned row, unsigned col, unsigned short p) {
+bool in_row(const std::vector<board_element>& b, unsigned row, unsigned col, unsigned short p) {
     for (unsigned c = 0; c < BOARD_DIM; ++c)
         if (c != col && b[row * BOARD_DIM + c].solved_element == p)
             return true;
     return false;
 }
 
-bool in_col(board_element *b, unsigned row, unsigned col, unsigned short p) {
+bool in_col(const std::vector<board_element>& b, unsigned row, unsigned col, unsigned short p) {
     for (unsigned r = 0; r < BOARD_DIM; ++r)
         if (r != row && b[r * BOARD_DIM + col].solved_element == p)
             return true;
     return false;
 }
 
-bool in_block(board_element *b, unsigned row, unsigned col, unsigned short p) {
+bool in_block(const std::vector<board_element>& b, unsigned row, unsigned col, unsigned short p) {
     unsigned b_row = row / 3 * 3, b_col = col / 3 * 3;
     for (unsigned i = b_row; i < b_row + 3; ++i)
         for (unsigned j = b_col; j < b_col + 3; ++j)
@@ -147,7 +141,7 @@ bool in_block(board_element *b, unsigned row, unsigned col, unsigned short p) {
     return false;
 }
 
-void calculate_potentials(board_element *b) {
+void calculate_potentials(std::vector<board_element>& b) {
     for (unsigned i = 0; i < BOARD_SIZE; ++i) {
         b[i].potential_set = 0;
         if (!b[i].solved_element) { // element is not yet fixed
@@ -161,7 +155,7 @@ void calculate_potentials(board_element *b) {
     }
 }
 
-bool valid_board(board_element *b) {
+bool valid_board(const std::vector<board_element>& b) {
     bool success = true;
     for (unsigned i = 0; i < BOARD_SIZE; ++i) {
         if (success && b[i].solved_element) { // element is fixed
@@ -175,7 +169,7 @@ bool valid_board(board_element *b) {
     return success;
 }
 
-bool examine_potentials(board_element *b, bool *progress) {
+bool examine_potentials(std::vector<board_element>& b, bool& progress) {
     bool singletons = false;
     for (unsigned i = 0; i < BOARD_SIZE; ++i) {
         if (b[i].solved_element == 0 && b[i].potential_set == 0) // empty set
@@ -228,62 +222,58 @@ bool examine_potentials(board_element *b, bool *progress) {
             }
         }
     }
-    *progress = singletons;
+    progress = singletons;
     return valid_board(b);
 }
 
-void partial_solve(board_element *b, unsigned first_potential_set) {
+void partial_solve(oneapi::tbb::task_group& g,
+                   std::vector<board_element>& b,
+                   unsigned first_potential_set) {
     if (fixed_board(b)) {
         if (find_one)
-            g->cancel();
+            g.cancel();
         if (++nSols == 1 && verbose) {
             print_board(b);
         }
-        free(b);
         return;
     }
     calculate_potentials(b);
     bool progress = true;
-    bool success = examine_potentials(b, &progress);
+    bool success = examine_potentials(b, progress);
     if (success && progress) {
-        partial_solve(b, first_potential_set);
+        partial_solve(g, b, first_potential_set);
     }
     else if (success && !progress) {
-        board_element *new_board;
         while (b[first_potential_set].solved_element != 0)
             ++first_potential_set;
         for (unsigned short potential = 1; potential <= BOARD_DIM; ++potential) {
             if (1 << (potential - 1) & b[first_potential_set].potential_set) {
-                new_board = (board_element *)malloc(BOARD_SIZE * sizeof(board_element));
-                copy_board(b, new_board);
-                new_board[first_potential_set].solved_element = potential;
-                g->run([=] {
-                    partial_solve(new_board, first_potential_set);
+                g.run([&g, b /*make a copy of the board*/, first_potential_set, potential]() {
+                    //as task_group treat passed in functor as const - const_cast is needed
+                    //to allow modification of the copy
+                    auto& new_board = const_cast<std::vector<board_element>&>(b);
+                    new_board[first_potential_set].solved_element = potential;
+                    partial_solve(g, new_board, first_potential_set);
                 });
             }
         }
-        free(b);
-    }
-    else {
-        free(b);
     }
 }
 
 unsigned solve(int p) {
     oneapi::tbb::global_control c(oneapi::tbb::global_control::max_allowed_parallelism, p);
     nSols = 0;
-    board_element *start_board = (board_element *)malloc(BOARD_SIZE * sizeof(board_element));
+    std::vector<board_element> start_board(BOARD_SIZE);
     init_board(start_board, init_values);
-    g = new oneapi::tbb::task_group;
+    oneapi::tbb::task_group g;
     oneapi::tbb::tick_count t0 = oneapi::tbb::tick_count::now();
-    partial_solve(start_board, 0);
-    g->wait();
+    partial_solve(g, start_board, 0);
+    g.wait();
     solve_time = (oneapi::tbb::tick_count::now() - t0).seconds();
-    delete g;
     return nSols;
 }
 
-int main(int argc, char *argv[]) {
+int main(int argc, char* argv[]) {
     oneapi::tbb::tick_count mainStartTime = oneapi::tbb::tick_count::now();
 
     utility::thread_number_range threads(utility::get_default_num_threads);
diff --git a/external/tbb/examples/test_all/README.md b/external/tbb/examples/test_all/README.md
index bd8dfd38..3b180d77 100644
--- a/external/tbb/examples/test_all/README.md
+++ b/external/tbb/examples/test_all/README.md
@@ -1,5 +1,4 @@
 # Code Samples of oneAPI Threading Building Blocks (oneTBB)
-
 Examples that test various components of oneTBB.
 
 | Code sample name | Description
diff --git a/external/tbb/examples/test_all/fibonacci/CMakeLists.txt b/external/tbb/examples/test_all/fibonacci/CMakeLists.txt
index 647ee342..80e937f2 100644
--- a/external/tbb/examples/test_all/fibonacci/CMakeLists.txt
+++ b/external/tbb/examples/test_all/fibonacci/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2021 Intel Corporation
+# Copyright (c) 2019-2025 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.5.0...3.31.3)
 
 project(fibonacci CXX)
 
@@ -22,9 +22,9 @@ set_common_project_settings(tbb)
 
 add_executable(fibonacci fibonacci.cpp)
 target_link_libraries(fibonacci
-        TBB::tbb
-        Threads::Threads
-        $<$<PLATFORM_ID:Linux>:rt>)  # Link "rt" library on Linux
+                      TBB::tbb
+                      Threads::Threads
+                      $<$<PLATFORM_ID:Linux>:rt>)  # Link "rt" library on Linux
 target_compile_options(fibonacci PRIVATE ${TBB_CXX_STD_FLAG})
 
 set(EXECUTABLE "$<TARGET_FILE:fibonacci>")
diff --git a/external/tbb/examples/test_all/fibonacci/README.md b/external/tbb/examples/test_all/fibonacci/README.md
index ac85b343..f65edcec 100644
--- a/external/tbb/examples/test_all/fibonacci/README.md
+++ b/external/tbb/examples/test_all/fibonacci/README.md
@@ -1,33 +1,23 @@
-# Fractal sample
-
+# Fibonacci sample
 This directory contains an example that computes Fibonacci numbers in several different ways.
 
-The purpose of the example is to exercise every include file and class in Intel® oneAPI Threading Building Blocks. Most
-of the computations are deliberately silly and not expected to show any speedup on multiprocessors.
+The purpose of the example is to exercise every include file and class in Intel® oneAPI Threading Building Blocks. Most of the computations are deliberately silly and not expected to show any speedup on multiprocessors.
 
 ## Building the example
-
 ```
 cmake <path_to_example>
 cmake --build .
 ```
 
 ## Running the sample
-
 ### Predefined make targets
-
-* `make run_fractal` - executes the example with predefined parameters.
-* `make perf_run_fractal` - executes the example with suggested parameters to measure the oneTBB performance.
-* `make light_test_fractal` - executes the example with suggested parameters to reduce execution time.
+* `make run_fibonacci` - executes the example with predefined parameters.
 
 ### Application parameters
-
 Usage:
-
 ```
 fibonacci K [M[:N]] [R]
 ```
-
 * `K` - specifies the fibonacci number which would be calculated.
 * `[M:N]` -a range of numbers of threads to be used.
 * `R` - the number of times to repeat the calculation.
diff --git a/external/tbb/examples/test_all/fibonacci/fibonacci.cpp b/external/tbb/examples/test_all/fibonacci/fibonacci.cpp
index ec9fbe9c..456a7dfc 100644
--- a/external/tbb/examples/test_all/fibonacci/fibonacci.cpp
+++ b/external/tbb/examples/test_all/fibonacci/fibonacci.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -421,7 +421,7 @@ void IntRange::set_from_string(const char *s) {
     char *end;
     high = low = strtol(s, &end, 0);
     switch (*end) {
-        case ':': high = strtol(end + 1, 0, 0); break;
+        case ':': high = strtol(end + 1, nullptr, 0); break;
         case '\0': break;
         default: printf("unexpected character = %c\n", *end);
     }
@@ -451,11 +451,11 @@ value Measure(const char *name, MeasureFunc func, int n) {
 int main(int argc, char *argv[]) {
     if (argc > 1)
         Verbose = true;
-    int NumbersCount = argc > 1 ? strtol(argv[1], 0, 0) : 500;
+    int NumbersCount = argc > 1 ? strtol(argv[1], nullptr, 0) : 500;
     IntRange NThread(1, 4); // Number of threads to use.
     if (argc > 2)
         NThread.set_from_string(argv[2]);
-    unsigned long ntrial = argc > 3 ? (unsigned long)strtoul(argv[3], 0, 0) : 1;
+    unsigned long ntrial = argc > 3 ? (unsigned long)strtoul(argv[3], nullptr, 0) : 1;
     value result, sum;
 
     if (Verbose)
diff --git a/external/tbb/include/oneapi/tbb.h b/external/tbb/include/oneapi/tbb.h
index 9617fd64..c52eb9e2 100644
--- a/external/tbb/include/oneapi/tbb.h
+++ b/external/tbb/include/oneapi/tbb.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -28,18 +28,14 @@
 #include "oneapi/tbb/blocked_range.h"
 #include "oneapi/tbb/blocked_range2d.h"
 #include "oneapi/tbb/blocked_range3d.h"
-#if TBB_PREVIEW_BLOCKED_RANGE_ND
-#include "tbb/blocked_rangeNd.h"
-#endif
+#include "oneapi/tbb/blocked_nd_range.h"
 #include "oneapi/tbb/cache_aligned_allocator.h"
 #include "oneapi/tbb/combinable.h"
 #include "oneapi/tbb/concurrent_hash_map.h"
 #if TBB_PREVIEW_CONCURRENT_LRU_CACHE
 #include "tbb/concurrent_lru_cache.h"
 #endif
-#if TBB_PREVIEW_COLLABORATIVE_CALL_ONCE
 #include "oneapi/tbb/collaborative_call_once.h"
-#endif
 #include "oneapi/tbb/concurrent_priority_queue.h"
 #include "oneapi/tbb/concurrent_queue.h"
 #include "oneapi/tbb/concurrent_unordered_map.h"
@@ -65,6 +61,8 @@
 #include "oneapi/tbb/queuing_rw_mutex.h"
 #include "oneapi/tbb/spin_mutex.h"
 #include "oneapi/tbb/spin_rw_mutex.h"
+#include "oneapi/tbb/mutex.h"
+#include "oneapi/tbb/rw_mutex.h"
 #include "oneapi/tbb/task.h"
 #include "oneapi/tbb/task_arena.h"
 #include "oneapi/tbb/task_group.h"
diff --git a/external/tbb/include/oneapi/tbb/blocked_nd_range.h b/external/tbb/include/oneapi/tbb/blocked_nd_range.h
new file mode 100644
index 00000000..0d499d54
--- /dev/null
+++ b/external/tbb/include/oneapi/tbb/blocked_nd_range.h
@@ -0,0 +1,195 @@
+/*
+    Copyright (c) 2017-2025 Intel Corporation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#ifndef __TBB_blocked_nd_range_H
+#define __TBB_blocked_nd_range_H
+
+#include <algorithm>    // std::any_of
+#include <array>
+#include <cstddef>
+#include <type_traits>  // std::is_same, std::enable_if
+
+#include "detail/_config.h"
+#include "detail/_template_helpers.h" // index_sequence, make_index_sequence
+#include "detail/_namespace_injection.h"
+#include "detail/_range_common.h"
+
+#include "blocked_range.h"
+
+namespace tbb {
+namespace detail {
+namespace d1 {
+
+/*
+    The blocked_nd_range_impl uses make_index_sequence<N> to automatically generate a ctor with
+    exactly N arguments of the type tbb::blocked_range<Value>. Such ctor provides an opportunity
+    to use braced-init-list parameters to initialize each dimension.
+    Use of parameters, whose representation is a braced-init-list, but they're not
+    std::initializer_list or a reference to one, produces a non-deduced context
+    within template argument deduction.
+
+    NOTE: blocked_nd_range must be exactly a templated alias to the blocked_nd_range_impl
+    (and not e.g. a derived class), otherwise it would need to declare its own ctor
+    facing the same problem that the impl class solves.
+*/
+
+template<typename Value, unsigned int N, typename = detail::make_index_sequence<N>>
+class blocked_nd_range_impl;
+
+template<typename Value, unsigned int N, std::size_t... Is>
+class blocked_nd_range_impl<Value, N, detail::index_sequence<Is...>> {
+public:
+    //! Type of a value.
+    using value_type = Value;
+
+    //! Type of a dimension range.
+    using dim_range_type = tbb::blocked_range<value_type>;
+
+    //! Type for the size of a range.
+    using size_type = typename dim_range_type::size_type;
+
+    blocked_nd_range_impl() = delete;
+
+    //! Constructs N-dimensional range over N half-open intervals each represented as tbb::blocked_range<Value>.
+    blocked_nd_range_impl(const indexed_t<dim_range_type, Is>&... args) : my_dims{ {args...} } {}
+
+#if __clang__ && __TBB_CLANG_VERSION < 140000
+    // On clang prior to version 14.0.0, passing a single braced init list to the constructor of blocked_nd_range<T, 1>
+    // matches better on the C array constructor and generates compile-time error because of unexpected size
+    // Adding constraints for this constructor to force the compiler to drop it from overload resolution if the size is unexpected
+    template <unsigned int M, typename = typename std::enable_if<M == N>::type>
+    blocked_nd_range_impl(const value_type (&size)[M], size_type grainsize = 1) :
+#else
+    blocked_nd_range_impl(const value_type (&size)[N], size_type grainsize = 1) :
+#endif
+        my_dims { dim_range_type(0, size[Is], grainsize)... } {}
+
+    //! Dimensionality of a range.
+    static constexpr unsigned int dim_count() { return N; }
+
+    //! Range in certain dimension.
+    const dim_range_type& dim(unsigned int dimension) const {
+        __TBB_ASSERT(dimension < N, "out of bound");
+        return my_dims[dimension];
+    }
+
+    //------------------------------------------------------------------------
+    // Methods that implement Range concept
+    //------------------------------------------------------------------------
+
+    //! True if at least one dimension is empty.
+    bool empty() const {
+        return std::any_of(my_dims.begin(), my_dims.end(), [](const dim_range_type& d) {
+            return d.empty();
+        });
+    }
+
+    //! True if at least one dimension is divisible.
+    bool is_divisible() const {
+        return std::any_of(my_dims.begin(), my_dims.end(), [](const dim_range_type& d) {
+            return d.is_divisible();
+        });
+    }
+
+    blocked_nd_range_impl(blocked_nd_range_impl& r, proportional_split proportion) : my_dims(r.my_dims) {
+        do_split(r, proportion);
+    }
+
+    blocked_nd_range_impl(blocked_nd_range_impl& r, split proportion) : my_dims(r.my_dims) {
+        do_split(r, proportion);
+    }
+
+private:
+    static_assert(N != 0, "zero dimensional blocked_nd_range can't be constructed");
+
+    //! Ranges in each dimension.
+    std::array<dim_range_type, N> my_dims;
+
+    template<typename split_type>
+    void do_split(blocked_nd_range_impl& r, split_type proportion) {
+        static_assert((std::is_same<split_type, split>::value || std::is_same<split_type, proportional_split>::value),
+                      "type of split object is incorrect");
+        __TBB_ASSERT(r.is_divisible(), "can't split not divisible range");
+
+        auto my_it = std::max_element(my_dims.begin(), my_dims.end(), [](const dim_range_type& first, const dim_range_type& second) {
+            return (first.size() * double(second.grainsize()) < second.size() * double(first.grainsize()));
+        });
+
+        auto r_it = r.my_dims.begin() + (my_it - my_dims.begin());
+
+        my_it->my_begin = dim_range_type::do_split(*r_it, proportion);
+
+        // (!(my_it->my_begin < r_it->my_end) && !(r_it->my_end < my_it->my_begin)) equals to
+        // (my_it->my_begin == r_it->my_end), but we can't use operator== due to Value concept
+        __TBB_ASSERT(!(my_it->my_begin < r_it->my_end) && !(r_it->my_end < my_it->my_begin),
+                     "blocked_range has been split incorrectly");
+    }
+};
+
+template<typename Value, unsigned int N>
+         __TBB_requires(blocked_range_value<Value>)
+class blocked_nd_range : public blocked_nd_range_impl<Value, N> {
+    using base = blocked_nd_range_impl<Value, N>;
+    // Making constructors of base class visible
+    using base::base;
+};
+
+#if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT && __TBB_PREVIEW_BLOCKED_ND_RANGE_DEDUCTION_GUIDES
+// blocked_nd_range(const dim_range_type& dim0, const dim_range_type& dim1, ...)
+// while the arguments are passed as braced-init-lists
+// Works only for 2 and more arguments since the deduction from
+// single braced-init-list or single C-array argument prefers the multi-dimensional range
+// Only braced-init-lists of size 2 and 3 are allowed since dim_range_type may only
+// be constructed from 2 or 3 arguments
+template <typename Value, unsigned int... Ns,
+          typename = std::enable_if_t<sizeof...(Ns) >= 2>,
+          typename = std::enable_if_t<(... && (Ns == 2 || Ns == 3))>>
+blocked_nd_range(const Value (&... dim)[Ns])
+-> blocked_nd_range<Value, sizeof...(Ns)>;
+
+// blocked_nd_range(const dim_range_type& dim0, const dim_range_type& dim1, ...)
+// while the arguments are passed as blocked_range objects of the same type
+template <typename Value, typename... Values,
+          typename = std::enable_if_t<(... && std::is_same_v<Value, Values>)>>
+blocked_nd_range(blocked_range<Value>, blocked_range<Values>...)
+-> blocked_nd_range<Value, 1 + sizeof...(Values)>;
+
+// blocked_nd_range(const value_type (&size)[N], size_type grainsize = 1)
+template <typename Value, unsigned int N>
+blocked_nd_range(const Value (&)[N], typename blocked_nd_range<Value, N>::size_type = 1)
+-> blocked_nd_range<Value, N>;
+
+// blocked_nd_range(blocked_nd_range<Value, N>&, oneapi::tbb::split)
+template <typename Value, unsigned int N>
+blocked_nd_range(blocked_nd_range<Value, N>, oneapi::tbb::split)
+-> blocked_nd_range<Value, N>;
+
+// blocked_nd_range(blocked_nd_range<Value, N>&, oneapi::tbb::proportional_split)
+template <typename Value, unsigned int N>
+blocked_nd_range(blocked_nd_range<Value, N>, oneapi::tbb::proportional_split)
+-> blocked_nd_range<Value, N>;
+
+#endif // __TBB_CPP17_DEDUCTION_GUIDES_PRESENT && __TBB_PREVIEW_BLOCKED_ND_RANGE_DEDUCTION_GUIDES
+
+} // namespace d1
+} // namespace detail
+
+inline namespace v1 {
+using detail::d1::blocked_nd_range;
+} // namespace v1
+} // namespace tbb
+
+#endif /* __TBB_blocked_nd_range_H */
diff --git a/external/tbb/include/oneapi/tbb/blocked_range.h b/external/tbb/include/oneapi/tbb/blocked_range.h
index dcb44940..0bc8693c 100644
--- a/external/tbb/include/oneapi/tbb/blocked_range.h
+++ b/external/tbb/include/oneapi/tbb/blocked_range.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2025 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -19,16 +19,16 @@
 
 #include <cstddef>
 
-#include "detail/_namespace_injection.h"
 #include "detail/_range_common.h"
+#include "detail/_namespace_injection.h"
 
 #include "version.h"
 
 namespace tbb {
-    namespace detail {
-        namespace d1 {
+namespace detail {
+namespace d1 {
 
-            /** \page range_req Requirements on range concept
+/** \page range_req Requirements on range concept
     Class \c R implementing the concept of range must define:
     - \code R::R( const R& ); \endcode               Copy constructor
     - \code R::~R(); \endcode                        Destructor
@@ -37,123 +37,133 @@ namespace tbb {
     - \code R::R( R& r, split ); \endcode            Split range \c r into two subranges.
 **/
 
-            //! A range over which to iterate.
-            /** @ingroup algorithms */
-            template <typename Value>
-            __TBB_requires(blocked_range_value<Value>) class blocked_range {
-            public:
-                //! Type of a value
-                /** Called a const_iterator for sake of algorithms that need to treat a blocked_range
+//! A range over which to iterate.
+/** @ingroup algorithms */
+template<typename Value>
+    __TBB_requires(blocked_range_value<Value>)
+class blocked_range {
+public:
+    //! Type of a value
+    /** Called a const_iterator for sake of algorithms that need to treat a blocked_range
         as an STL container. */
-                using const_iterator = Value;
+    using const_iterator = Value;
 
-                //! Type for size of a range
-                using size_type = std::size_t;
+    //! Type for size of a range
+    using size_type = std::size_t;
 
-                //! Construct range over half-open interval [begin,end), with the given grainsize.
-                blocked_range(Value begin_, Value end_, size_type grainsize_ = 1)
-                    : my_end(end_), my_begin(begin_), my_grainsize(grainsize_) {
-                    __TBB_ASSERT(my_grainsize > 0, "grainsize must be positive");
-                }
+    //! Construct range over half-open interval [begin,end), with the given grainsize.
+    blocked_range( Value begin_, Value end_, size_type grainsize_=1 ) :
+        my_end(end_), my_begin(begin_), my_grainsize(grainsize_)
+    {
+        __TBB_ASSERT( my_grainsize>0, "grainsize must be positive" );
+    }
 
-                //! Beginning of range.
-                const_iterator begin() const { return my_begin; }
+    //! Beginning of range.
+    const_iterator begin() const { return my_begin; }
 
-                //! One past last value in range.
-                const_iterator end() const { return my_end; }
+    //! One past last value in range.
+    const_iterator end() const { return my_end; }
 
-                //! Size of the range
-                /** Unspecified if end()<begin(). */
-                size_type size() const {
-                    __TBB_ASSERT(!(end() < begin()), "size() unspecified if end()<begin()");
-                    return size_type(my_end - my_begin);
-                }
+    //! Size of the range
+    /** Unspecified if end()<begin(). */
+    size_type size() const {
+        __TBB_ASSERT( !(end()<begin()), "size() unspecified if end()<begin()" );
+        return size_type(my_end-my_begin);
+    }
 
-                //! The grain size for this range.
-                size_type grainsize() const { return my_grainsize; }
+    //! The grain size for this range.
+    size_type grainsize() const { return my_grainsize; }
 
-                //------------------------------------------------------------------------
-                // Methods that implement Range concept
-                //------------------------------------------------------------------------
+    //------------------------------------------------------------------------
+    // Methods that implement Range concept
+    //------------------------------------------------------------------------
 
-                //! True if range is empty.
-                bool empty() const { return !(my_begin < my_end); }
+    //! True if range is empty.
+    bool empty() const { return !(my_begin<my_end); }
 
-                //! True if range is divisible.
-                /** Unspecified if end()<begin(). */
-                bool is_divisible() const { return my_grainsize < size(); }
+    //! True if range is divisible.
+    /** Unspecified if end()<begin(). */
+    bool is_divisible() const { return my_grainsize<size(); }
 
-                //! Split range.
-                /** The new Range *this has the second part, the old range r has the first part.
+    //! Split range.
+    /** The new Range *this has the second part, the old range r has the first part.
         Unspecified if end()<begin() or !is_divisible(). */
-                blocked_range(blocked_range& r, split)
-                    : my_end(r.my_end), my_begin(do_split(r, split())), my_grainsize(r.my_grainsize) {
-                    // only comparison 'less than' is required from values of blocked_range objects
-                    __TBB_ASSERT(!(my_begin < r.my_end) && !(r.my_end < my_begin),
-                                 "blocked_range has been split incorrectly");
-                }
-
-                //! Split range.
-                /** The new Range *this has the second part split according to specified proportion, the old range r has the first part.
+    blocked_range( blocked_range& r, split ) :
+        my_end(r.my_end),
+        my_begin(do_split(r, split())),
+        my_grainsize(r.my_grainsize)
+    {
+        // only comparison 'less than' is required from values of blocked_range objects
+        __TBB_ASSERT( !(my_begin < r.my_end) && !(r.my_end < my_begin), "blocked_range has been split incorrectly" );
+    }
+
+    //! Split range.
+    /** The new Range *this has the second part split according to specified proportion, the old range r has the first part.
         Unspecified if end()<begin() or !is_divisible(). */
-                blocked_range(blocked_range& r, proportional_split& proportion)
-                    : my_end(r.my_end), my_begin(do_split(r, proportion)), my_grainsize(r.my_grainsize) {
-                    // only comparison 'less than' is required from values of blocked_range objects
-                    __TBB_ASSERT(!(my_begin < r.my_end) && !(r.my_end < my_begin),
-                                 "blocked_range has been split incorrectly");
-                }
-
-            private:
-                /** NOTE: my_end MUST be declared before my_begin, otherwise the splitting constructor will break. */
-                Value my_end;
-                Value my_begin;
-                size_type my_grainsize;
-
-                //! Auxiliary function used by the splitting constructor.
-                static Value do_split(blocked_range& r, split) {
-                    __TBB_ASSERT(r.is_divisible(), "cannot split blocked_range that is not divisible");
-                    Value middle = r.my_begin + (r.my_end - r.my_begin) / 2u;
-                    r.my_end = middle;
-                    return middle;
-                }
-
-                static Value do_split(blocked_range& r, proportional_split& proportion) {
-                    __TBB_ASSERT(r.is_divisible(), "cannot split blocked_range that is not divisible");
-
-                    // usage of 32-bit floating point arithmetic is not enough to handle ranges of
-                    // more than 2^24 iterations accurately. However, even on ranges with 2^64
-                    // iterations the computational error approximately equals to 0.000001% which
-                    // makes small impact on uniform distribution of such range's iterations (assuming
-                    // all iterations take equal time to complete). See 'test_partitioner_whitebox'
-                    // for implementation of an exact split algorithm
-                    size_type right_part = size_type(float(r.size()) * float(proportion.right())
-                                                             / float(proportion.left() + proportion.right())
-                                                     + 0.5f);
-                    return r.my_end = Value(r.my_end - right_part);
-                }
-
-                template <typename RowValue, typename ColValue>
-                __TBB_requires(blocked_range_value<RowValue>&&
-                                       blocked_range_value<ColValue>) friend class blocked_range2d;
-
-                template <typename RowValue, typename ColValue, typename PageValue>
-                __TBB_requires(blocked_range_value<RowValue>&& blocked_range_value<ColValue>&&
-                                       blocked_range_value<PageValue>) friend class blocked_range3d;
-
-                template <typename DimValue, unsigned int N, typename>
-                __TBB_requires(blocked_range_value<DimValue>) friend class blocked_rangeNd_impl;
-            };
-
-        }// namespace d1
-    }    // namespace detail
-
-    inline namespace v1 {
-        using detail::d1::blocked_range;
-        // Split types
-        using detail::proportional_split;
-        using detail::split;
-    }// namespace v1
-
-}// namespace tbb
+    blocked_range( blocked_range& r, proportional_split& proportion ) :
+        my_end(r.my_end),
+        my_begin(do_split(r, proportion)),
+        my_grainsize(r.my_grainsize)
+    {
+        // only comparison 'less than' is required from values of blocked_range objects
+        __TBB_ASSERT( !(my_begin < r.my_end) && !(r.my_end < my_begin), "blocked_range has been split incorrectly" );
+    }
+
+private:
+    /** NOTE: my_end MUST be declared before my_begin, otherwise the splitting constructor will break. */
+    Value my_end;
+    Value my_begin;
+    size_type my_grainsize;
+
+    //! Auxiliary function used by the splitting constructor.
+    static Value do_split( blocked_range& r, split )
+    {
+        __TBB_ASSERT( r.is_divisible(), "cannot split blocked_range that is not divisible" );
+        Value middle = r.my_begin + (r.my_end - r.my_begin) / 2u;
+        r.my_end = middle;
+        return middle;
+    }
+
+    static Value do_split( blocked_range& r, proportional_split& proportion )
+    {
+        __TBB_ASSERT( r.is_divisible(), "cannot split blocked_range that is not divisible" );
+
+        // usage of 32-bit floating point arithmetic is not enough to handle ranges of
+        // more than 2^24 iterations accurately. However, even on ranges with 2^64
+        // iterations the computational error approximately equals to 0.000001% which
+        // makes small impact on uniform distribution of such range's iterations (assuming
+        // all iterations take equal time to complete). See 'test_partitioner_whitebox'
+        // for implementation of an exact split algorithm
+        size_type right_part = size_type(float(r.size()) * float(proportion.right())
+                                         / float(proportion.left() + proportion.right()) + 0.5f);
+        return r.my_end = Value(r.my_end - right_part);
+    }
+
+    template<typename RowValue, typename ColValue>
+        __TBB_requires(blocked_range_value<RowValue> &&
+                       blocked_range_value<ColValue>)
+    friend class blocked_range2d;
+
+    template<typename RowValue, typename ColValue, typename PageValue>
+        __TBB_requires(blocked_range_value<RowValue> &&
+                       blocked_range_value<ColValue> &&
+                       blocked_range_value<PageValue>)
+    friend class blocked_range3d;
+
+    template<typename DimValue, unsigned int N, typename>
+    friend class blocked_nd_range_impl;
+};
+
+} // namespace d1
+} // namespace detail
+
+inline namespace v1 {
+using detail::d1::blocked_range;
+// Split types
+using detail::split;
+using detail::proportional_split;
+} // namespace v1
+
+} // namespace tbb
 
 #endif /* __TBB_blocked_range_H */
diff --git a/external/tbb/include/oneapi/tbb/blocked_range2d.h b/external/tbb/include/oneapi/tbb/blocked_range2d.h
index 6a07d631..41385db9 100644
--- a/external/tbb/include/oneapi/tbb/blocked_range2d.h
+++ b/external/tbb/include/oneapi/tbb/blocked_range2d.h
@@ -26,76 +26,86 @@
 #include "blocked_range.h"
 
 namespace tbb {
-    namespace detail {
-        namespace d1 {
-
-            //! A 2-dimensional range that models the Range concept.
-            /** @ingroup algorithms */
-            template <typename RowValue, typename ColValue = RowValue>
-            __TBB_requires(
-                    blocked_range_value<RowValue>&& blocked_range_value<ColValue>) class blocked_range2d {
-            public:
-                //! Type for size of an iteration range
-                using row_range_type = blocked_range<RowValue>;
-                using col_range_type = blocked_range<ColValue>;
-
-            private:
-                row_range_type my_rows;
-                col_range_type my_cols;
-
-            public:
-                blocked_range2d(RowValue row_begin, RowValue row_end,
-                                typename row_range_type::size_type row_grainsize, ColValue col_begin,
-                                ColValue col_end, typename col_range_type::size_type col_grainsize)
-                    : my_rows(row_begin, row_end, row_grainsize), my_cols(col_begin, col_end, col_grainsize) {
-                }
-
-                blocked_range2d(RowValue row_begin, RowValue row_end, ColValue col_begin, ColValue col_end)
-                    : my_rows(row_begin, row_end), my_cols(col_begin, col_end) {}
-
-                //! True if range is empty
-                bool empty() const {
-                    // Range is empty if at least one dimension is empty.
-                    return my_rows.empty() || my_cols.empty();
-                }
-
-                //! True if range is divisible into two pieces.
-                bool is_divisible() const { return my_rows.is_divisible() || my_cols.is_divisible(); }
-
-                blocked_range2d(blocked_range2d& r, split) : my_rows(r.my_rows), my_cols(r.my_cols) {
-                    split split_obj;
-                    do_split(r, split_obj);
-                }
-
-                blocked_range2d(blocked_range2d& r, proportional_split& proportion)
-                    : my_rows(r.my_rows), my_cols(r.my_cols) {
-                    do_split(r, proportion);
-                }
-
-                //! The rows of the iteration space
-                const row_range_type& rows() const { return my_rows; }
-
-                //! The columns of the iteration space
-                const col_range_type& cols() const { return my_cols; }
-
-            private:
-                template <typename Split>
-                void do_split(blocked_range2d& r, Split& split_obj) {
-                    if (my_rows.size() * double(my_cols.grainsize())
-                        < my_cols.size() * double(my_rows.grainsize())) {
-                        my_cols.my_begin = col_range_type::do_split(r.my_cols, split_obj);
-                    } else {
-                        my_rows.my_begin = row_range_type::do_split(r.my_rows, split_obj);
-                    }
-                }
-            };
-
-        }// namespace d1
-    }    // namespace detail
-
-    inline namespace v1 {
-        using detail::d1::blocked_range2d;
-    }// namespace v1
-}// namespace tbb
+namespace detail {
+namespace d1 {
+
+//! A 2-dimensional range that models the Range concept.
+/** @ingroup algorithms */
+template<typename RowValue, typename ColValue = RowValue>
+    __TBB_requires(blocked_range_value<RowValue> &&
+                   blocked_range_value<ColValue>)
+class blocked_range2d {
+public:
+    //! Type for size of an iteration range
+    using row_range_type = blocked_range<RowValue>;
+    using col_range_type = blocked_range<ColValue>;
+
+private:
+    row_range_type my_rows;
+    col_range_type my_cols;
+
+public:
+    blocked_range2d( RowValue row_begin, RowValue row_end, typename row_range_type::size_type row_grainsize,
+                     ColValue col_begin, ColValue col_end, typename col_range_type::size_type col_grainsize ) :
+        my_rows(row_begin,row_end,row_grainsize),
+        my_cols(col_begin,col_end,col_grainsize)
+    {}
+
+    blocked_range2d( RowValue row_begin, RowValue row_end,
+                     ColValue col_begin, ColValue col_end ) :
+        my_rows(row_begin,row_end),
+        my_cols(col_begin,col_end)
+    {}
+
+    //! True if range is empty
+    bool empty() const {
+        // Range is empty if at least one dimension is empty.
+        return my_rows.empty() || my_cols.empty();
+    }
+
+    //! True if range is divisible into two pieces.
+    bool is_divisible() const {
+        return my_rows.is_divisible() || my_cols.is_divisible();
+    }
+
+    blocked_range2d( blocked_range2d& r, split ) :
+        my_rows(r.my_rows),
+        my_cols(r.my_cols)
+    {
+        split split_obj;
+        do_split(r, split_obj);
+    }
+
+    blocked_range2d( blocked_range2d& r, proportional_split& proportion ) :
+        my_rows(r.my_rows),
+        my_cols(r.my_cols)
+    {
+        do_split(r, proportion);
+    }
+
+    //! The rows of the iteration space
+    const row_range_type& rows() const { return my_rows; }
+
+    //! The columns of the iteration space
+    const col_range_type& cols() const { return my_cols; }
+
+private:
+    template <typename Split>
+    void do_split( blocked_range2d& r, Split& split_obj ) {
+        if ( my_rows.size()*double(my_cols.grainsize()) < my_cols.size()*double(my_rows.grainsize()) ) {
+            my_cols.my_begin = col_range_type::do_split(r.my_cols, split_obj);
+        } else {
+            my_rows.my_begin = row_range_type::do_split(r.my_rows, split_obj);
+        }
+    }
+};
+
+} // namespace d1
+} // namespace detail
+
+inline namespace v1 {
+using detail::d1::blocked_range2d;
+} // namespace v1
+} // namespace tbb
 
 #endif /* __TBB_blocked_range2d_H */
diff --git a/external/tbb/include/oneapi/tbb/blocked_range3d.h b/external/tbb/include/oneapi/tbb/blocked_range3d.h
index 340ff27c..d8932192 100644
--- a/external/tbb/include/oneapi/tbb/blocked_range3d.h
+++ b/external/tbb/include/oneapi/tbb/blocked_range3d.h
@@ -25,98 +25,106 @@
 #include "blocked_range.h"
 
 namespace tbb {
-    namespace detail {
-        namespace d1 {
-
-            //! A 3-dimensional range that models the Range concept.
-            /** @ingroup algorithms */
-            template <typename PageValue, typename RowValue = PageValue, typename ColValue = RowValue>
-            __TBB_requires(blocked_range_value<PageValue>&& blocked_range_value<RowValue>&&
-                                   blocked_range_value<ColValue>) class blocked_range3d {
-            public:
-                //! Type for size of an iteration range
-                using page_range_type = blocked_range<PageValue>;
-                using row_range_type = blocked_range<RowValue>;
-                using col_range_type = blocked_range<ColValue>;
-
-            private:
-                page_range_type my_pages;
-                row_range_type my_rows;
-                col_range_type my_cols;
-
-            public:
-                blocked_range3d(PageValue page_begin, PageValue page_end, RowValue row_begin,
-                                RowValue row_end, ColValue col_begin, ColValue col_end)
-                    : my_pages(page_begin, page_end), my_rows(row_begin, row_end),
-                      my_cols(col_begin, col_end) {}
-
-                blocked_range3d(PageValue page_begin, PageValue page_end,
-                                typename page_range_type::size_type page_grainsize, RowValue row_begin,
-                                RowValue row_end, typename row_range_type::size_type row_grainsize,
-                                ColValue col_begin, ColValue col_end,
-                                typename col_range_type::size_type col_grainsize)
-                    : my_pages(page_begin, page_end, page_grainsize),
-                      my_rows(row_begin, row_end, row_grainsize), my_cols(col_begin, col_end, col_grainsize) {
-                }
-
-                //! True if range is empty
-                bool empty() const {
-                    // Range is empty if at least one dimension is empty.
-                    return my_pages.empty() || my_rows.empty() || my_cols.empty();
-                }
-
-                //! True if range is divisible into two pieces.
-                bool is_divisible() const {
-                    return my_pages.is_divisible() || my_rows.is_divisible() || my_cols.is_divisible();
-                }
-
-                blocked_range3d(blocked_range3d& r, split split_obj)
-                    : my_pages(r.my_pages), my_rows(r.my_rows), my_cols(r.my_cols) {
-                    do_split(r, split_obj);
-                }
-
-                blocked_range3d(blocked_range3d& r, proportional_split& proportion)
-                    : my_pages(r.my_pages), my_rows(r.my_rows), my_cols(r.my_cols) {
-                    do_split(r, proportion);
-                }
-
-                //! The pages of the iteration space
-                const page_range_type& pages() const { return my_pages; }
-
-                //! The rows of the iteration space
-                const row_range_type& rows() const { return my_rows; }
-
-                //! The columns of the iteration space
-                const col_range_type& cols() const { return my_cols; }
-
-            private:
-                template <typename Split>
-                void do_split(blocked_range3d& r, Split& split_obj) {
-                    if (my_pages.size() * double(my_rows.grainsize())
-                        < my_rows.size() * double(my_pages.grainsize())) {
-                        if (my_rows.size() * double(my_cols.grainsize())
-                            < my_cols.size() * double(my_rows.grainsize())) {
-                            my_cols.my_begin = col_range_type::do_split(r.my_cols, split_obj);
-                        } else {
-                            my_rows.my_begin = row_range_type::do_split(r.my_rows, split_obj);
-                        }
-                    } else {
-                        if (my_pages.size() * double(my_cols.grainsize())
-                            < my_cols.size() * double(my_pages.grainsize())) {
-                            my_cols.my_begin = col_range_type::do_split(r.my_cols, split_obj);
-                        } else {
-                            my_pages.my_begin = page_range_type::do_split(r.my_pages, split_obj);
-                        }
-                    }
-                }
-            };
-
-        }// namespace d1
-    }    // namespace detail
-
-    inline namespace v1 {
-        using detail::d1::blocked_range3d;
-    }// namespace v1
-}// namespace tbb
+namespace detail {
+namespace d1 {
+
+//! A 3-dimensional range that models the Range concept.
+/** @ingroup algorithms */
+template<typename PageValue, typename RowValue = PageValue, typename ColValue = RowValue>
+    __TBB_requires(blocked_range_value<PageValue> &&
+                   blocked_range_value<RowValue> &&
+                   blocked_range_value<ColValue>)
+class blocked_range3d {
+public:
+    //! Type for size of an iteration range
+    using page_range_type = blocked_range<PageValue>;
+    using row_range_type = blocked_range<RowValue>;
+    using col_range_type = blocked_range<ColValue>;
+
+private:
+    page_range_type my_pages;
+    row_range_type  my_rows;
+    col_range_type  my_cols;
+
+public:
+
+    blocked_range3d( PageValue page_begin, PageValue page_end,
+                     RowValue  row_begin,  RowValue row_end,
+                     ColValue  col_begin,  ColValue col_end ) :
+        my_pages(page_begin,page_end),
+        my_rows(row_begin,row_end),
+        my_cols(col_begin,col_end)
+    {}
+
+    blocked_range3d( PageValue page_begin, PageValue page_end, typename page_range_type::size_type page_grainsize,
+                     RowValue  row_begin,  RowValue row_end,   typename row_range_type::size_type row_grainsize,
+                     ColValue  col_begin,  ColValue col_end,   typename col_range_type::size_type col_grainsize ) :
+        my_pages(page_begin,page_end,page_grainsize),
+        my_rows(row_begin,row_end,row_grainsize),
+        my_cols(col_begin,col_end,col_grainsize)
+    {}
+
+    //! True if range is empty
+    bool empty() const {
+        // Range is empty if at least one dimension is empty.
+        return my_pages.empty() || my_rows.empty() || my_cols.empty();
+    }
+
+    //! True if range is divisible into two pieces.
+    bool is_divisible() const {
+        return  my_pages.is_divisible() || my_rows.is_divisible() || my_cols.is_divisible();
+    }
+
+    blocked_range3d( blocked_range3d& r, split split_obj ) :
+        my_pages(r.my_pages),
+        my_rows(r.my_rows),
+        my_cols(r.my_cols)
+    {
+        do_split(r, split_obj);
+    }
+
+    blocked_range3d( blocked_range3d& r, proportional_split& proportion ) :
+        my_pages(r.my_pages),
+        my_rows(r.my_rows),
+        my_cols(r.my_cols)
+    {
+        do_split(r, proportion);
+    }
+
+    //! The pages of the iteration space
+    const page_range_type& pages() const { return my_pages; }
+
+    //! The rows of the iteration space
+    const row_range_type& rows() const { return my_rows; }
+
+    //! The columns of the iteration space
+    const col_range_type& cols() const { return my_cols; }
+
+private:
+    template <typename Split>
+    void do_split( blocked_range3d& r, Split& split_obj) {
+        if ( my_pages.size()*double(my_rows.grainsize()) < my_rows.size()*double(my_pages.grainsize()) ) {
+            if ( my_rows.size()*double(my_cols.grainsize()) < my_cols.size()*double(my_rows.grainsize()) ) {
+                my_cols.my_begin = col_range_type::do_split(r.my_cols, split_obj);
+            } else {
+                my_rows.my_begin = row_range_type::do_split(r.my_rows, split_obj);
+            }
+        } else {
+            if ( my_pages.size()*double(my_cols.grainsize()) < my_cols.size()*double(my_pages.grainsize()) ) {
+                my_cols.my_begin = col_range_type::do_split(r.my_cols, split_obj);
+            } else {
+                my_pages.my_begin = page_range_type::do_split(r.my_pages, split_obj);
+            }
+        }
+    }
+};
+
+} // namespace d1
+} // namespace detail
+
+inline namespace v1 {
+using detail::d1::blocked_range3d;
+} // namespace v1
+} // namespace tbb
 
 #endif /* __TBB_blocked_range3d_H */
diff --git a/external/tbb/include/oneapi/tbb/blocked_rangeNd.h b/external/tbb/include/oneapi/tbb/blocked_rangeNd.h
index 116193f0..a7ba1375 100644
--- a/external/tbb/include/oneapi/tbb/blocked_rangeNd.h
+++ b/external/tbb/include/oneapi/tbb/blocked_rangeNd.h
@@ -18,25 +18,25 @@
 #define __TBB_blocked_rangeNd_H
 
 #if !TBB_PREVIEW_BLOCKED_RANGE_ND
-#error Set TBB_PREVIEW_BLOCKED_RANGE_ND to include blocked_rangeNd.h
+    #error Set TBB_PREVIEW_BLOCKED_RANGE_ND to include blocked_rangeNd.h
 #endif
 
-#include <algorithm>// std::any_of
+#include <algorithm>    // std::any_of
 #include <array>
 #include <cstddef>
-#include <type_traits>// std::is_same, std::enable_if
+#include <type_traits>  // std::is_same, std::enable_if
 
 #include "detail/_config.h"
+#include "detail/_template_helpers.h" // index_sequence, make_index_sequence
 #include "detail/_range_common.h"
-#include "detail/_template_helpers.h"// index_sequence, make_index_sequence
 
 #include "blocked_range.h"
 
 namespace tbb {
-    namespace detail {
-        namespace d1 {
+namespace detail {
+namespace d1 {
 
-            /*
+/*
     The blocked_rangeNd_impl uses make_index_sequence<N> to automatically generate a ctor with
     exactly N arguments of the type tbb::blocked_range<Value>. Such ctor provides an opportunity
     to use braced-init-list parameters to initialize each dimension.
@@ -49,102 +49,99 @@ namespace tbb {
     facing the same problem that the impl class solves.
 */
 
-            template <typename Value, unsigned int N, typename = detail::make_index_sequence<N>>
-            __TBB_requires(blocked_range_value<Value>) class blocked_rangeNd_impl;
-
-            template <typename Value, unsigned int N, std::size_t... Is>
-            __TBB_requires(blocked_range_value<Value>) class blocked_rangeNd_impl<
-                    Value, N, detail::index_sequence<Is...>> {
-            public:
-                //! Type of a value.
-                using value_type = Value;
-
-            private:
-                //! Helper type to construct range with N tbb::blocked_range<value_type> objects.
-                template <std::size_t>
-                using dim_type_helper = tbb::blocked_range<value_type>;
-
-            public:
-                blocked_rangeNd_impl() = delete;
-
-                //! Constructs N-dimensional range over N half-open intervals each represented as tbb::blocked_range<Value>.
-                blocked_rangeNd_impl(const dim_type_helper<Is>&... args) : my_dims {{args...}} {}
-
-                //! Dimensionality of a range.
-                static constexpr unsigned int ndims() { return N; }
-
-                //! Range in certain dimension.
-                const tbb::blocked_range<value_type>& dim(unsigned int dimension) const {
-                    __TBB_ASSERT(dimension < N, "out of bound");
-                    return my_dims[dimension];
-                }
-
-                //------------------------------------------------------------------------
-                // Methods that implement Range concept
-                //------------------------------------------------------------------------
-
-                //! True if at least one dimension is empty.
-                bool empty() const {
-                    return std::any_of(my_dims.begin(), my_dims.end(),
-                                       [](const tbb::blocked_range<value_type>& d) { return d.empty(); });
-                }
-
-                //! True if at least one dimension is divisible.
-                bool is_divisible() const {
-                    return std::any_of(
-                            my_dims.begin(), my_dims.end(),
-                            [](const tbb::blocked_range<value_type>& d) { return d.is_divisible(); });
-                }
-
-                blocked_rangeNd_impl(blocked_rangeNd_impl& r, proportional_split proportion)
-                    : my_dims(r.my_dims) {
-                    do_split(r, proportion);
-                }
-
-                blocked_rangeNd_impl(blocked_rangeNd_impl& r, split proportion) : my_dims(r.my_dims) {
-                    do_split(r, proportion);
-                }
-
-            private:
-                static_assert(N != 0, "zero dimensional blocked_rangeNd can't be constructed");
-
-                //! Ranges in each dimension.
-                std::array<tbb::blocked_range<value_type>, N> my_dims;
-
-                template <typename split_type>
-                void do_split(blocked_rangeNd_impl& r, split_type proportion) {
-                    static_assert((std::is_same<split_type, split>::value
-                                   || std::is_same<split_type, proportional_split>::value),
-                                  "type of split object is incorrect");
-                    __TBB_ASSERT(r.is_divisible(), "can't split not divisible range");
-
-                    auto my_it = std::max_element(my_dims.begin(), my_dims.end(),
-                                                  [](const tbb::blocked_range<value_type>& first,
-                                                     const tbb::blocked_range<value_type>& second) {
-                                                      return (first.size() * second.grainsize()
-                                                              < second.size() * first.grainsize());
-                                                  });
-
-                    auto r_it = r.my_dims.begin() + (my_it - my_dims.begin());
-
-                    my_it->my_begin = tbb::blocked_range<value_type>::do_split(*r_it, proportion);
-
-                    // (!(my_it->my_begin < r_it->my_end) && !(r_it->my_end < my_it->my_begin)) equals to
-                    // (my_it->my_begin == r_it->my_end), but we can't use operator== due to Value concept
-                    __TBB_ASSERT(!(my_it->my_begin < r_it->my_end) && !(r_it->my_end < my_it->my_begin),
-                                 "blocked_range has been split incorrectly");
-                }
-            };
-
-            template <typename Value, unsigned int N>
-            using blocked_rangeNd = blocked_rangeNd_impl<Value, N>;
-
-        }// namespace d1
-    }    // namespace detail
-
-    inline namespace v1 {
-        using detail::d1::blocked_rangeNd;
-    }// namespace v1
-}// namespace tbb
+template<typename Value, unsigned int N, typename = detail::make_index_sequence<N>>
+    __TBB_requires(blocked_range_value<Value>)
+class blocked_rangeNd_impl;
+
+template<typename Value, unsigned int N, std::size_t... Is>
+    __TBB_requires(blocked_range_value<Value>)
+class blocked_rangeNd_impl<Value, N, detail::index_sequence<Is...>> {
+public:
+    //! Type of a value.
+    using value_type = Value;
+
+private:
+    //! Helper type to construct range with N tbb::blocked_range<value_type> objects.
+    template<std::size_t>
+    using dim_type_helper = tbb::blocked_range<value_type>;
+
+public:
+    blocked_rangeNd_impl() = delete;
+
+    //! Constructs N-dimensional range over N half-open intervals each represented as tbb::blocked_range<Value>.
+    blocked_rangeNd_impl(const dim_type_helper<Is>&... args) : my_dims{ {args...} } {}
+
+    //! Dimensionality of a range.
+    static constexpr unsigned int ndims() { return N; }
+
+    //! Range in certain dimension.
+    const tbb::blocked_range<value_type>& dim(unsigned int dimension) const {
+        __TBB_ASSERT(dimension < N, "out of bound");
+        return my_dims[dimension];
+    }
+
+    //------------------------------------------------------------------------
+    // Methods that implement Range concept
+    //------------------------------------------------------------------------
+
+    //! True if at least one dimension is empty.
+    bool empty() const {
+        return std::any_of(my_dims.begin(), my_dims.end(), [](const tbb::blocked_range<value_type>& d) {
+            return d.empty();
+        });
+    }
+
+    //! True if at least one dimension is divisible.
+    bool is_divisible() const {
+        return std::any_of(my_dims.begin(), my_dims.end(), [](const tbb::blocked_range<value_type>& d) {
+            return d.is_divisible();
+        });
+    }
+
+    blocked_rangeNd_impl(blocked_rangeNd_impl& r, proportional_split proportion) : my_dims(r.my_dims) {
+        do_split(r, proportion);
+    }
+
+    blocked_rangeNd_impl(blocked_rangeNd_impl& r, split proportion) : my_dims(r.my_dims) {
+        do_split(r, proportion);
+    }
+
+private:
+    static_assert(N != 0, "zero dimensional blocked_rangeNd can't be constructed");
+
+    //! Ranges in each dimension.
+    std::array<tbb::blocked_range<value_type>, N> my_dims;
+
+    template<typename split_type>
+    void do_split(blocked_rangeNd_impl& r, split_type proportion) {
+        static_assert((std::is_same<split_type, split>::value || std::is_same<split_type, proportional_split>::value), "type of split object is incorrect");
+        __TBB_ASSERT(r.is_divisible(), "can't split not divisible range");
+
+        auto my_it = std::max_element(my_dims.begin(), my_dims.end(), [](const tbb::blocked_range<value_type>& first, const tbb::blocked_range<value_type>& second) {
+            return (first.size() * second.grainsize() < second.size() * first.grainsize());
+        });
+
+        auto r_it = r.my_dims.begin() + (my_it - my_dims.begin());
+
+        my_it->my_begin = tbb::blocked_range<value_type>::do_split(*r_it, proportion);
+
+        // (!(my_it->my_begin < r_it->my_end) && !(r_it->my_end < my_it->my_begin)) equals to
+        // (my_it->my_begin == r_it->my_end), but we can't use operator== due to Value concept
+        __TBB_ASSERT(!(my_it->my_begin < r_it->my_end) && !(r_it->my_end < my_it->my_begin),
+                     "blocked_range has been split incorrectly");
+    }
+};
+
+template<typename Value, unsigned int N>
+using blocked_rangeNd = blocked_rangeNd_impl<Value, N>;
+
+} // namespace d1
+} // namespace detail
+
+inline namespace v1 {
+using detail::d1::blocked_rangeNd;
+} // namespace v1
+} // namespace tbb
 
 #endif /* __TBB_blocked_rangeNd_H */
+
diff --git a/external/tbb/include/oneapi/tbb/cache_aligned_allocator.h b/external/tbb/include/oneapi/tbb/cache_aligned_allocator.h
index 2a162d34..0ff3972d 100644
--- a/external/tbb/include/oneapi/tbb/cache_aligned_allocator.h
+++ b/external/tbb/include/oneapi/tbb/cache_aligned_allocator.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -17,8 +17,8 @@
 #ifndef __TBB_cache_aligned_allocator_H
 #define __TBB_cache_aligned_allocator_H
 
-#include "detail/_namespace_injection.h"
 #include "detail/_utils.h"
+#include "detail/_namespace_injection.h"
 #include <cstdlib>
 #include <utility>
 
@@ -27,169 +27,163 @@
 #endif
 
 namespace tbb {
-    namespace detail {
+namespace detail {
 
-        namespace r1 {
-            TBB_EXPORT void* __TBB_EXPORTED_FUNC cache_aligned_allocate(std::size_t size);
-            TBB_EXPORT void __TBB_EXPORTED_FUNC cache_aligned_deallocate(void* p);
-            TBB_EXPORT std::size_t __TBB_EXPORTED_FUNC cache_line_size();
-        }// namespace r1
+namespace r1 {
+TBB_EXPORT void*       __TBB_EXPORTED_FUNC cache_aligned_allocate(std::size_t size);
+TBB_EXPORT void        __TBB_EXPORTED_FUNC cache_aligned_deallocate(void* p);
+TBB_EXPORT std::size_t __TBB_EXPORTED_FUNC cache_line_size();
+}
 
-        namespace d1 {
+namespace d1 {
 
-            template <typename T>
-            class cache_aligned_allocator {
-            public:
-                using value_type = T;
-                using propagate_on_container_move_assignment = std::true_type;
+template<typename T>
+class cache_aligned_allocator {
+public:
+    using value_type = T;
+    using propagate_on_container_move_assignment = std::true_type;
 
-                //! Always defined for TBB containers (supported since C++17 for std containers)
-                using is_always_equal = std::true_type;
+    //! Always defined for TBB containers (supported since C++17 for std containers)
+    using is_always_equal = std::true_type;
 
-                cache_aligned_allocator() = default;
-                template <typename U>
-                cache_aligned_allocator(const cache_aligned_allocator<U>&) noexcept {}
+    cache_aligned_allocator() = default;
+    template<typename U> cache_aligned_allocator(const cache_aligned_allocator<U>&) noexcept {}
 
-                //! Allocate space for n objects, starting on a cache/sector line.
-                __TBB_nodiscard T* allocate(std::size_t n) {
-                    return static_cast<T*>(r1::cache_aligned_allocate(n * sizeof(value_type)));
-                }
+    //! Allocate space for n objects, starting on a cache/sector line.
+    __TBB_nodiscard T* allocate(std::size_t n) {
+        return static_cast<T*>(r1::cache_aligned_allocate(n * sizeof(value_type)));
+    }
 
-                //! Free block of memory that starts on a cache line
-                void deallocate(T* p, std::size_t) { r1::cache_aligned_deallocate(p); }
+    //! Free block of memory that starts on a cache line
+    void deallocate(T* p, std::size_t) {
+        r1::cache_aligned_deallocate(p);
+    }
 
-                //! Largest value for which method allocate might succeed.
-                std::size_t max_size() const noexcept {
-                    return (~std::size_t(0) - r1::cache_line_size()) / sizeof(value_type);
-                }
+    //! Largest value for which method allocate might succeed.
+    std::size_t max_size() const noexcept {
+        return (~std::size_t(0) - r1::cache_line_size()) / sizeof(value_type);
+    }
 
 #if TBB_ALLOCATOR_TRAITS_BROKEN
-                using pointer = value_type*;
-                using const_pointer = const value_type*;
-                using reference = value_type&;
-                using const_reference = const value_type&;
-                using difference_type = std::ptrdiff_t;
-                using size_type = std::size_t;
-                template <typename U>
-                struct rebind {
-                    using other = cache_aligned_allocator<U>;
-                };
-                template <typename U, typename... Args>
-                void construct(U* p, Args&&... args) {
-                    ::new (p) U(std::forward<Args>(args)...);
-                }
-                void destroy(pointer p) { p->~value_type(); }
-                pointer address(reference x) const { return &x; }
-                const_pointer address(const_reference x) const { return &x; }
-#endif// TBB_ALLOCATOR_TRAITS_BROKEN
-            };
+    using pointer = value_type*;
+    using const_pointer = const value_type*;
+    using reference = value_type&;
+    using const_reference = const value_type&;
+    using difference_type = std::ptrdiff_t;
+    using size_type = std::size_t;
+    template<typename U> struct rebind {
+        using other = cache_aligned_allocator<U>;
+    };
+    template<typename U, typename... Args>
+    void construct(U *p, Args&&... args)
+        { ::new (p) U(std::forward<Args>(args)...); }
+    void destroy(pointer p) { p->~value_type(); }
+    pointer address(reference x) const { return &x; }
+    const_pointer address(const_reference x) const { return &x; }
+#endif // TBB_ALLOCATOR_TRAITS_BROKEN
+};
 
 #if TBB_ALLOCATOR_TRAITS_BROKEN
-            template <>
-            class cache_aligned_allocator<void> {
-            public:
-                using pointer = void*;
-                using const_pointer = const void*;
-                using value_type = void;
-                template <typename U>
-                struct rebind {
-                    using other = cache_aligned_allocator<U>;
-                };
-            };
+    template<>
+    class cache_aligned_allocator<void> {
+    public:
+        using pointer = void*;
+        using const_pointer = const void*;
+        using value_type = void;
+        template<typename U> struct rebind {
+            using other = cache_aligned_allocator<U>;
+        };
+    };
 #endif
 
-            template <typename T, typename U>
-            bool operator==(const cache_aligned_allocator<T>&, const cache_aligned_allocator<U>&) noexcept {
-                return true;
-            }
+template<typename T, typename U>
+bool operator==(const cache_aligned_allocator<T>&, const cache_aligned_allocator<U>&) noexcept { return true; }
 
 #if !__TBB_CPP20_COMPARISONS_PRESENT
-            template <typename T, typename U>
-            bool operator!=(const cache_aligned_allocator<T>&, const cache_aligned_allocator<U>&) noexcept {
-                return false;
-            }
+template<typename T, typename U>
+bool operator!=(const cache_aligned_allocator<T>&, const cache_aligned_allocator<U>&) noexcept { return false; }
 #endif
 
 #if __TBB_CPP17_MEMORY_RESOURCE_PRESENT
 
-            //! C++17 memory resource wrapper to ensure cache line size alignment
-            class cache_aligned_resource : public std::pmr::memory_resource {
-            public:
-                cache_aligned_resource() : cache_aligned_resource(std::pmr::get_default_resource()) {}
-                explicit cache_aligned_resource(std::pmr::memory_resource* upstream) : m_upstream(upstream) {}
-
-                std::pmr::memory_resource* upstream_resource() const { return m_upstream; }
-
-            private:
-                //! We don't know what memory resource set. Use padding to guarantee alignment
-                void* do_allocate(std::size_t bytes, std::size_t alignment) override {
-                    // TODO: make it common with tbb_allocator.cpp
-                    std::size_t cache_line_alignment = correct_alignment(alignment);
-                    std::size_t space = correct_size(bytes) + cache_line_alignment;
-                    std::uintptr_t base = reinterpret_cast<std::uintptr_t>(m_upstream->allocate(space));
-                    __TBB_ASSERT(base != 0, "Upstream resource returned NULL.");
-
-                    // Round up to the next cache line (align the base address)
-                    std::uintptr_t result = (base + cache_line_alignment) & ~(cache_line_alignment - 1);
-                    __TBB_ASSERT((result - base) >= sizeof(std::uintptr_t),
-                                 "Can`t store a base pointer to the header");
-                    __TBB_ASSERT(space - (result - base) >= bytes, "Not enough space for the storage");
-
-                    // Record where block actually starts.
-                    (reinterpret_cast<std::uintptr_t*>(result))[-1] = base;
-                    return reinterpret_cast<void*>(result);
-                }
-
-                void do_deallocate(void* ptr, std::size_t bytes, std::size_t alignment) override {
-                    if (ptr) {
-                        // Recover where block actually starts
-                        std::uintptr_t base = (reinterpret_cast<std::uintptr_t*>(ptr))[-1];
-                        m_upstream->deallocate(reinterpret_cast<void*>(base),
-                                               correct_size(bytes) + correct_alignment(alignment));
-                    }
-                }
-
-                bool do_is_equal(const std::pmr::memory_resource& other) const noexcept override {
-                    if (this == &other) { return true; }
+//! C++17 memory resource wrapper to ensure cache line size alignment
+class cache_aligned_resource : public std::pmr::memory_resource {
+public:
+    cache_aligned_resource() : cache_aligned_resource(std::pmr::get_default_resource()) {}
+    explicit cache_aligned_resource(std::pmr::memory_resource* upstream) : m_upstream(upstream) {}
+
+    std::pmr::memory_resource* upstream_resource() const {
+        return m_upstream;
+    }
+
+private:
+    //! We don't know what memory resource set. Use padding to guarantee alignment
+    void* do_allocate(std::size_t bytes, std::size_t alignment) override {
+        // TODO: make it common with tbb_allocator.cpp
+        std::size_t cache_line_alignment = correct_alignment(alignment);
+        std::size_t space = correct_size(bytes) + cache_line_alignment;
+        std::uintptr_t base = reinterpret_cast<std::uintptr_t>(m_upstream->allocate(space));
+        __TBB_ASSERT(base != 0, "Upstream resource returned nullptr.");
+
+        // Round up to the next cache line (align the base address)
+        std::uintptr_t result = (base + cache_line_alignment) & ~(cache_line_alignment - 1);
+        __TBB_ASSERT((result - base) >= sizeof(std::uintptr_t), "Can`t store a base pointer to the header");
+        __TBB_ASSERT(space - (result - base) >= bytes, "Not enough space for the storage");
+
+        // Record where block actually starts.
+        (reinterpret_cast<std::uintptr_t*>(result))[-1] = base;
+        return reinterpret_cast<void*>(result);
+    }
+
+    void do_deallocate(void* ptr, std::size_t bytes, std::size_t alignment) override {
+        if (ptr) {
+            // Recover where block actually starts
+            std::uintptr_t base = (reinterpret_cast<std::uintptr_t*>(ptr))[-1];
+            m_upstream->deallocate(reinterpret_cast<void*>(base), correct_size(bytes) + correct_alignment(alignment));
+        }
+    }
+
+    bool do_is_equal(const std::pmr::memory_resource& other) const noexcept override {
+        if (this == &other) { return true; }
 #if __TBB_USE_OPTIONAL_RTTI
-                    const cache_aligned_resource* other_res
-                            = dynamic_cast<const cache_aligned_resource*>(&other);
-                    return other_res && (upstream_resource() == other_res->upstream_resource());
+        const cache_aligned_resource* other_res = dynamic_cast<const cache_aligned_resource*>(&other);
+        return other_res && (upstream_resource() == other_res->upstream_resource());
 #else
-                    return false;
+        return false;
 #endif
-                }
+    }
 
-                std::size_t correct_alignment(std::size_t alignment) {
-                    __TBB_ASSERT(tbb::detail::is_power_of_two(alignment), "Alignment is not a power of 2");
+    std::size_t correct_alignment(std::size_t alignment) {
+        __TBB_ASSERT(tbb::detail::is_power_of_two(alignment), "Alignment is not a power of 2");
 #if __TBB_CPP17_HW_INTERFERENCE_SIZE_PRESENT
-                    std::size_t cache_line_size = std::hardware_destructive_interference_size;
+        std::size_t cache_line_size = std::hardware_destructive_interference_size;
 #else
-                    std::size_t cache_line_size = r1::cache_line_size();
+        std::size_t cache_line_size = r1::cache_line_size();
 #endif
-                    return alignment < cache_line_size ? cache_line_size : alignment;
-                }
+        return alignment < cache_line_size ? cache_line_size : alignment;
+    }
 
-                std::size_t correct_size(std::size_t bytes) {
-                    // To handle the case, when small size requested. There could be not
-                    // enough space to store the original pointer.
-                    return bytes < sizeof(std::uintptr_t) ? sizeof(std::uintptr_t) : bytes;
-                }
+    std::size_t correct_size(std::size_t bytes) {
+        // To handle the case, when small size requested. There could be not
+        // enough space to store the original pointer.
+        return bytes < sizeof(std::uintptr_t) ? sizeof(std::uintptr_t) : bytes;
+    }
 
-                std::pmr::memory_resource* m_upstream;
-            };
+    std::pmr::memory_resource* m_upstream;
+};
 
-#endif// __TBB_CPP17_MEMORY_RESOURCE_PRESENT
+#endif // __TBB_CPP17_MEMORY_RESOURCE_PRESENT
 
-        }// namespace d1
-    }    // namespace detail
+} // namespace d1
+} // namespace detail
 
-    inline namespace v1 {
-        using detail::d1::cache_aligned_allocator;
+inline namespace v1 {
+using detail::d1::cache_aligned_allocator;
 #if __TBB_CPP17_MEMORY_RESOURCE_PRESENT
-        using detail::d1::cache_aligned_resource;
+using detail::d1::cache_aligned_resource;
 #endif
-    }// namespace v1
-}// namespace tbb
+} // namespace v1
+} // namespace tbb
 
 #endif /* __TBB_cache_aligned_allocator_H */
+
diff --git a/external/tbb/include/oneapi/tbb/collaborative_call_once.h b/external/tbb/include/oneapi/tbb/collaborative_call_once.h
index 446c6a6f..18e3bbb2 100644
--- a/external/tbb/include/oneapi/tbb/collaborative_call_once.h
+++ b/external/tbb/include/oneapi/tbb/collaborative_call_once.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2021 Intel Corporation
+    Copyright (c) 2021-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -17,217 +17,240 @@
 #ifndef __TBB_collaborative_call_once_H
 #define __TBB_collaborative_call_once_H
 
-#if __TBB_PREVIEW_COLLABORATIVE_CALL_ONCE
-
-#include "task.h"
 #include "task_arena.h"
 #include "task_group.h"
 
 #include <atomic>
 
 namespace tbb {
-    namespace detail {
-        namespace d1 {
+namespace detail {
+namespace d1 {
 
 #if _MSC_VER && !defined(__INTEL_COMPILER)
-// Suppress warning: structure was padded due to alignment specifier
-#pragma warning(push)
-#pragma warning(disable : 4324)
+    // Suppress warning: structure was padded due to alignment specifier
+    #pragma warning (push)
+    #pragma warning (disable: 4324)
 #endif
 
-            constexpr std::uintptr_t collaborative_once_max_references = max_nfs_size;
-            constexpr std::uintptr_t collaborative_once_references_mask
-                    = collaborative_once_max_references - 1;
-
-            class alignas(max_nfs_size) collaborative_once_runner : no_copy {
-
-                struct storage_t {
-                    task_arena m_arena {task_arena::attach {}};
-                    wait_context m_wait_context {1};
-                };
-
-                std::atomic<std::int64_t> m_ref_count {0};
-                std::atomic<bool> m_is_ready {false};
-
-                // Storage with task_arena and wait_context must be initialized only by winner thread
-                union {
-                    storage_t m_storage;
-                };
-
-                template <typename Fn>
-                void isolated_execute(Fn f) {
-                    auto func = [f] {
-                        f();
-                        // delegate_base requires bool returning functor while isolate_within_arena ignores the result
-                        return true;
-                    };
-
-                    delegated_function<decltype(func)> delegate(func);
-
-                    r1::isolate_within_arena(delegate, reinterpret_cast<std::intptr_t>(this));
-                }
-
-            public:
-                class lifetime_guard : no_copy {
-                    collaborative_once_runner& m_runner;
-
-                public:
-                    lifetime_guard(collaborative_once_runner& r) : m_runner(r) { m_runner.m_ref_count++; }
-                    ~lifetime_guard() { m_runner.m_ref_count--; }
-                };
-
-                collaborative_once_runner() {}
-
-                ~collaborative_once_runner() {
-                    spin_wait_until_eq(m_ref_count, 0, std::memory_order_acquire);
-                    if (m_is_ready.load(std::memory_order_relaxed)) { m_storage.~storage_t(); }
-                }
-
-                std::uintptr_t to_bits() { return reinterpret_cast<std::uintptr_t>(this); }
-
-                static collaborative_once_runner* from_bits(std::uintptr_t bits) {
-                    __TBB_ASSERT((bits & collaborative_once_references_mask) == 0,
-                                 "invalid pointer, last log2(max_nfs_size) bits must be zero");
-                    return reinterpret_cast<collaborative_once_runner*>(bits);
-                }
-
-                template <typename F>
-                void run_once(F&& f) {
-                    __TBB_ASSERT(!m_is_ready.load(std::memory_order_relaxed),
-                                 "storage with task_arena and wait_context is already initialized");
-                    // Initialize internal state
-                    new (&m_storage) storage_t();
-                    m_storage.m_arena.execute([&] {
-                        isolated_execute([&] {
-                            task_group_context context {task_group_context::bound,
-                                                        task_group_context::default_traits
-                                                                | task_group_context::concurrent_wait};
-
-                            function_stack_task<F> t {std::forward<F>(f), m_storage.m_wait_context};
-
-                            // Set the ready flag after entering the execute body to prevent
-                            // moonlighting threads from occupying all slots inside the arena.
-                            m_is_ready.store(true, std::memory_order_release);
-                            execute_and_wait(t, context, m_storage.m_wait_context, context);
-                        });
-                    });
-                }
-
-                void assist() noexcept {
-                    // Do not join the arena until the winner thread takes the slot
-                    spin_wait_while_eq(m_is_ready, false);
-                    m_storage.m_arena.execute([&] {
-                        isolated_execute([&] {
-                            // We do not want to get an exception from user functor on moonlighting threads.
-                            // The exception is handled with the winner thread
-                            task_group_context stub_context;
-                            wait(m_storage.m_wait_context, stub_context);
-                        });
-                    });
-                }
-            };
-
-            class collaborative_once_flag : no_copy {
-                enum state : std::uintptr_t {
-                    uninitialized,
-                    done,
+template <typename F>
+class collaborative_call_stack_task : public task {
+    const F& m_func;
+    wait_context& m_wait_ctx;
+
+    void finalize() {
+        m_wait_ctx.release();
+    }
+    task* execute(d1::execution_data&) override {
+        task* res = d2::task_ptr_or_nullptr(m_func);
+        finalize();
+        return res;
+    }
+    task* cancel(d1::execution_data&) override {
+        finalize();
+        return nullptr;
+    }
+public:
+    collaborative_call_stack_task(const F& f, wait_context& wctx) : m_func(f), m_wait_ctx(wctx) {}
+};
+
+constexpr std::uintptr_t collaborative_once_max_references = max_nfs_size;
+constexpr std::uintptr_t collaborative_once_references_mask = collaborative_once_max_references-1;
+
+class alignas(max_nfs_size) collaborative_once_runner : no_copy {
+
+    struct storage_t {
+        task_arena m_arena{ task_arena::attach{} };
+        wait_context m_wait_context{1};
+    };
+
+    std::atomic<std::int64_t> m_ref_count{0};
+    std::atomic<bool> m_is_ready{false};
+
+    // Storage with task_arena and wait_context must be initialized only by winner thread
+    union {
+        storage_t m_storage;
+    };
+
+    template<typename Fn>
+    void isolated_execute(Fn f) {
+        auto func = [f] {
+            f();
+           // delegate_base requires bool returning functor while isolate_within_arena ignores the result
+            return true;
+        };
+
+        delegated_function<decltype(func)> delegate(func);
+
+        r1::isolate_within_arena(delegate, reinterpret_cast<std::intptr_t>(this));
+    }
+
+public:
+    class lifetime_guard : no_copy {
+        collaborative_once_runner& m_runner;
+    public:
+        lifetime_guard(collaborative_once_runner& r) : m_runner(r) {
+            m_runner.m_ref_count++;
+        }
+        ~lifetime_guard() {
+            m_runner.m_ref_count--;
+        }
+    };
+
+    collaborative_once_runner() {}
+
+    ~collaborative_once_runner() {
+        spin_wait_until_eq(m_ref_count, 0, std::memory_order_acquire);
+        if (m_is_ready.load(std::memory_order_relaxed)) {
+            m_storage.~storage_t();
+        }
+    }
+
+    std::uintptr_t to_bits() {
+        return reinterpret_cast<std::uintptr_t>(this);
+    }
+
+    static collaborative_once_runner* from_bits(std::uintptr_t bits) {
+        __TBB_ASSERT( (bits & collaborative_once_references_mask) == 0, "invalid pointer, last log2(max_nfs_size) bits must be zero" );
+        return reinterpret_cast<collaborative_once_runner*>(bits);
+    }
+
+    template <typename F>
+    void run_once(F&& f) {
+        __TBB_ASSERT(!m_is_ready.load(std::memory_order_relaxed), "storage with task_arena and wait_context is already initialized");
+        // Initialize internal state
+        new(&m_storage) storage_t();
+        m_storage.m_arena.execute([&] {
+            isolated_execute([&] {
+                task_group_context context{ task_group_context::bound,
+                    task_group_context::default_traits | task_group_context::concurrent_wait };
+
+                collaborative_call_stack_task<F> t{ std::forward<F>(f), m_storage.m_wait_context };
+
+                // Set the ready flag after entering the execute body to prevent
+                // moonlighting threads from occupying all slots inside the arena.
+                m_is_ready.store(true, std::memory_order_release);
+                execute_and_wait(t, context, m_storage.m_wait_context, context);
+            });
+        });
+    }
+
+    void assist() noexcept {
+        // Do not join the arena until the winner thread takes the slot
+        spin_wait_while_eq(m_is_ready, false);
+        m_storage.m_arena.execute([&] {
+            isolated_execute([&] {
+                // We do not want to get an exception from user functor on moonlighting threads.
+                // The exception is handled with the winner thread
+                task_group_context stub_context;
+                wait(m_storage.m_wait_context, stub_context);
+            });
+        });
+    }
+
+};
+
+class collaborative_once_flag : no_copy {
+    enum state : std::uintptr_t {
+        uninitialized,
+        done,
 #if TBB_USE_ASSERT
-                    dead
+        dead
 #endif
-                };
-                std::atomic<std::uintptr_t> m_state {state::uninitialized};
-
-                template <typename Fn, typename... Args>
-                friend void collaborative_call_once(collaborative_once_flag& flag, Fn&& f, Args&&... args);
-
-                void set_completion_state(std::uintptr_t runner_bits, std::uintptr_t desired) {
-                    std::uintptr_t expected = runner_bits;
-                    do {
-                        expected = runner_bits;
-                        // Possible inefficiency: when we start waiting,
-                        // some moonlighting threads might continue coming that will prolong our waiting.
-                        // Fortunately, there are limited number of threads on the system so wait time is limited.
-                        spin_wait_until_eq(m_state, expected);
-                    } while (!m_state.compare_exchange_strong(expected, desired));
-                }
-
-                template <typename Fn>
-                void do_collaborative_call_once(Fn&& f) {
-                    std::uintptr_t expected = m_state.load(std::memory_order_acquire);
-                    collaborative_once_runner runner;
-
-                    do {
-                        if (expected == state::uninitialized
-                            && m_state.compare_exchange_strong(expected, runner.to_bits())) {
-                            // Winner thread
-                            runner.run_once([&] {
-                                try_call([&] { std::forward<Fn>(f)(); }).on_exception([&] {
-                                    // Reset the state to uninitialized to allow other threads to try initialization again
-                                    set_completion_state(runner.to_bits(), state::uninitialized);
-                                });
-                                // We successfully executed functor
-                                set_completion_state(runner.to_bits(), state::done);
-                            });
-                            break;
-                        } else {
-                            // Moonlighting thread: we need to add a reference to the state to prolong runner lifetime.
-                            // However, the maximum number of references are limited with runner alignment.
-                            // So, we use CAS loop and spin_wait to guarantee that references never exceed "max_value".
-                            do {
-                                auto max_value = expected | collaborative_once_references_mask;
-                                expected = spin_wait_while_eq(m_state, max_value);
-                                // "expected > state::done" prevents storing values, when state is uninitialized or done
-                            } while (expected > state::done
-                                     && !m_state.compare_exchange_strong(expected, expected + 1));
-
-                            if (auto shared_runner = collaborative_once_runner::from_bits(
-                                        expected & ~collaborative_once_references_mask)) {
-                                collaborative_once_runner::lifetime_guard guard {*shared_runner};
-                                m_state.fetch_sub(1);
-
-                                // The moonlighting threads are not expected to handle exceptions from user functor.
-                                // Therefore, no exception is expected from assist().
-                                shared_runner->assist();
-                            }
-                        }
-                        __TBB_ASSERT(m_state.load(std::memory_order_relaxed) != state::dead,
-                                     "collaborative_once_flag has been prematurely destroyed");
-                    } while (expected != state::done);
+    };
+    std::atomic<std::uintptr_t> m_state{ state::uninitialized };
+
+    template <typename Fn, typename... Args>
+    friend void collaborative_call_once(collaborative_once_flag& flag, Fn&& f, Args&&... args);
+
+    void set_completion_state(std::uintptr_t runner_bits, std::uintptr_t desired) {
+        std::uintptr_t expected = runner_bits;
+        do {
+            expected = runner_bits;
+            // Possible inefficiency: when we start waiting,
+            // some moonlighting threads might continue coming that will prolong our waiting.
+            // Fortunately, there are limited number of threads on the system so wait time is limited.
+            spin_wait_until_eq(m_state, expected);
+        } while (!m_state.compare_exchange_strong(expected, desired));
+    }
+
+    template <typename Fn>
+    void do_collaborative_call_once(Fn&& f) {
+        std::uintptr_t expected = m_state.load(std::memory_order_acquire);
+        collaborative_once_runner runner;
+
+        do {
+            if (expected == state::uninitialized && m_state.compare_exchange_strong(expected, runner.to_bits())) {
+                // Winner thread
+                runner.run_once([&] {
+                    try_call([&] {
+                        std::forward<Fn>(f)();
+                    }).on_exception([&] {
+                        // Reset the state to uninitialized to allow other threads to try initialization again
+                        set_completion_state(runner.to_bits(), state::uninitialized);
+                    });
+                    // We successfully executed functor
+                    set_completion_state(runner.to_bits(), state::done);
+                });
+                break;
+            } else {
+                // Moonlighting thread: we need to add a reference to the state to prolong runner lifetime.
+                // However, the maximum number of references are limited with runner alignment.
+                // So, we use CAS loop and spin_wait to guarantee that references never exceed "max_value".
+                do {
+                    auto max_value = expected | collaborative_once_references_mask;
+                    expected = spin_wait_while_eq(m_state, max_value);
+                // "expected > state::done" prevents storing values, when state is uninitialized or done
+                } while (expected > state::done && !m_state.compare_exchange_strong(expected, expected + 1));
+
+                if (auto shared_runner = collaborative_once_runner::from_bits(expected & ~collaborative_once_references_mask)) {
+                    collaborative_once_runner::lifetime_guard guard{*shared_runner};
+                    m_state.fetch_sub(1);
+
+                    // The moonlighting threads are not expected to handle exceptions from user functor.
+                    // Therefore, no exception is expected from assist().
+                    shared_runner->assist();
                 }
+            }
+            __TBB_ASSERT(m_state.load(std::memory_order_relaxed) != state::dead,
+                         "collaborative_once_flag has been prematurely destroyed");
+        } while (expected != state::done);
+    }
 
 #if TBB_USE_ASSERT
-            public:
-                ~collaborative_once_flag() { m_state.store(state::dead, std::memory_order_relaxed); }
+public:
+    ~collaborative_once_flag() {
+        m_state.store(state::dead, std::memory_order_relaxed);
+    }
 #endif
-            };
-
-            template <typename Fn, typename... Args>
-            void collaborative_call_once(collaborative_once_flag& flag, Fn&& fn, Args&&... args) {
-                __TBB_ASSERT(flag.m_state.load(std::memory_order_relaxed) != collaborative_once_flag::dead,
-                             "collaborative_once_flag has been prematurely destroyed");
-                if (flag.m_state.load(std::memory_order_acquire) != collaborative_once_flag::done) {
-#if __TBB_GCC_PARAMETER_PACK_IN_LAMBDAS_BROKEN
-                    // Using stored_pack to suppress bug in GCC 4.8
-                    // with parameter pack expansion in lambda
-                    auto stored_pack = save_pack(std::forward<Args>(args)...);
-                    auto func = [&] { call(std::forward<Fn>(fn), std::move(stored_pack)); };
-#else
-                    auto func = [&] { fn(std::forward<Args>(args)...); };
-#endif
-                    flag.do_collaborative_call_once(func);
-                }
-            }
+};
+
+
+template <typename Fn, typename... Args>
+void collaborative_call_once(collaborative_once_flag& flag, Fn&& fn, Args&&... args) {
+    __TBB_ASSERT(flag.m_state.load(std::memory_order_relaxed) != collaborative_once_flag::dead,
+                 "collaborative_once_flag has been prematurely destroyed");
+    if (flag.m_state.load(std::memory_order_acquire) != collaborative_once_flag::done) {
+    #if __TBB_GCC_PARAMETER_PACK_IN_LAMBDAS_BROKEN
+        // Using stored_pack to suppress bug in GCC 4.8
+        // with parameter pack expansion in lambda
+        auto stored_pack = save_pack(std::forward<Args>(args)...);
+        auto func = [&] { call(std::forward<Fn>(fn), std::move(stored_pack)); };
+    #else
+        auto func = [&] { fn(std::forward<Args>(args)...); };
+    #endif
+        flag.do_collaborative_call_once(func);
+    }
+}
 
 #if _MSC_VER && !defined(__INTEL_COMPILER)
-#pragma warning(pop)// 4324 warning
+    #pragma warning (pop) // 4324 warning
 #endif
 
-        }// namespace d1
-    }    // namespace detail
+} // namespace d1
+} // namespace detail
 
-    using detail::d1::collaborative_call_once;
-    using detail::d1::collaborative_once_flag;
-}// namespace tbb
+using detail::d1::collaborative_call_once;
+using detail::d1::collaborative_once_flag;
+} // namespace tbb
 
-#endif// __TBB_PREVIEW_COLLABORATIVE_CALL_ONCE
-#endif// __TBB_collaborative_call_once_H
+#endif // __TBB_collaborative_call_once_H
diff --git a/external/tbb/include/oneapi/tbb/combinable.h b/external/tbb/include/oneapi/tbb/combinable.h
index f9239e55..b676a30c 100644
--- a/external/tbb/include/oneapi/tbb/combinable.h
+++ b/external/tbb/include/oneapi/tbb/combinable.h
@@ -19,54 +19,51 @@
 
 #include "detail/_namespace_injection.h"
 
-#include "cache_aligned_allocator.h"
 #include "enumerable_thread_specific.h"
+#include "cache_aligned_allocator.h"
 
 namespace tbb {
-    namespace detail {
-        namespace d1 {
-            /** \name combinable **/
-            //@{
-            //! Thread-local storage with optional reduction
-            /** @ingroup containers */
-            template <typename T>
-            class combinable {
-                using my_alloc = typename tbb::cache_aligned_allocator<T>;
-                using my_ets_type = typename tbb::enumerable_thread_specific<T, my_alloc, ets_no_key>;
-                my_ets_type my_ets;
+namespace detail {
+namespace d1 {
+/** \name combinable **/
+//@{
+//! Thread-local storage with optional reduction
+/** @ingroup containers */
+template <typename T>
+class combinable {
+    using my_alloc = typename tbb::cache_aligned_allocator<T>;
+    using my_ets_type = typename tbb::enumerable_thread_specific<T, my_alloc, ets_no_key>;
+    my_ets_type my_ets;
 
-            public:
-                combinable() = default;
+public:
+    combinable() = default;
 
-                template <typename Finit>
-                explicit combinable(Finit _finit) : my_ets(_finit) {}
+    template <typename Finit>
+    explicit combinable(Finit _finit) : my_ets(_finit) { }
 
-                void clear() { my_ets.clear(); }
+    void clear() { my_ets.clear(); }
 
-                T& local() { return my_ets.local(); }
+    T& local() { return my_ets.local(); }
 
-                T& local(bool& exists) { return my_ets.local(exists); }
+    T& local(bool& exists) { return my_ets.local(exists); }
 
-                // combine_func_t has signature T(T,T) or T(const T&, const T&)
-                template <typename CombineFunc>
-                T combine(CombineFunc f_combine) {
-                    return my_ets.combine(f_combine);
-                }
+    // combine_func_t has signature T(T,T) or T(const T&, const T&)
+    template <typename CombineFunc>
+    T combine(CombineFunc f_combine) { return my_ets.combine(f_combine); }
 
-                // combine_func_t has signature void(T) or void(const T&)
-                template <typename CombineFunc>
-                void combine_each(CombineFunc f_combine) {
-                    my_ets.combine_each(f_combine);
-                }
-            };
+    // combine_func_t has signature void(T) or void(const T&)
+    template <typename CombineFunc>
+    void combine_each(CombineFunc f_combine) { my_ets.combine_each(f_combine); }
+};
 
-        }// namespace d1
-    }    // namespace detail
+} // namespace d1
+} // namespace detail
 
-    inline namespace v1 {
-        using detail::d1::combinable;
-    }// namespace v1
+inline namespace v1 {
+using detail::d1::combinable;
+} // inline namespace v1
 
-}// namespace tbb
+} // namespace tbb
 
 #endif /* __TBB_combinable_H */
+
diff --git a/external/tbb/include/oneapi/tbb/concurrent_hash_map.h b/external/tbb/include/oneapi/tbb/concurrent_hash_map.h
index 971122fc..0c52b725 100644
--- a/external/tbb/include/oneapi/tbb/concurrent_hash_map.h
+++ b/external/tbb/include/oneapi/tbb/concurrent_hash_map.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2025 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -17,1705 +17,1652 @@
 #ifndef __TBB_concurrent_hash_map_H
 #define __TBB_concurrent_hash_map_H
 
-#include "detail/_allocator_traits.h"
+#include "detail/_namespace_injection.h"
+#include "detail/_utils.h"
 #include "detail/_assert.h"
+#include "detail/_allocator_traits.h"
 #include "detail/_containers_helpers.h"
+#include "detail/_template_helpers.h"
 #include "detail/_hash_compare.h"
-#include "detail/_namespace_injection.h"
 #include "detail/_range_common.h"
-#include "detail/_template_helpers.h"
-#include "detail/_utils.h"
-#include "spin_rw_mutex.h"
 #include "tbb_allocator.h"
+#include "spin_rw_mutex.h"
 
 #include <atomic>
-#include <cstring>// Need std::memset
 #include <initializer_list>
-#include <iterator>
 #include <tuple>
-#include <utility>// Need std::pair
+#include <iterator>
+#include <utility>      // Need std::pair
+#include <cstring>      // Need std::memset
 
 namespace tbb {
-    namespace detail {
-        namespace d2 {
+namespace detail {
+namespace d2 {
 
 #if __TBB_PREVIEW_CONCURRENT_HASH_MAP_EXTENSIONS && __TBB_CPP20_CONCEPTS_PRESENT
-            template <typename Mutex>
-            concept ch_map_rw_scoped_lockable
-                    = rw_scoped_lockable<Mutex> && requires(const typename Mutex::scoped_lock& sl) {
-                { sl.is_writer() } -> std::convertible_to<bool>;
-            };
+template <typename Mutex>
+concept ch_map_rw_scoped_lockable = rw_scoped_lockable<Mutex> &&
+	requires(const typename Mutex::scoped_lock& sl) {
+		{ sl.is_writer() } -> std::convertible_to<bool>;
+};
 #endif
 
-            template <typename MutexType>
-            struct hash_map_node_base : no_copy {
-                using mutex_type = MutexType;
-                // Scoped lock type for mutex
-                using scoped_type = typename MutexType::scoped_lock;
-                // Next node in chain
-                hash_map_node_base* next;
-                mutex_type mutex;
-            };
-
-            // Incompleteness flag value
-            static void* const rehash_req_flag = reinterpret_cast<void*>(std::size_t(3));
-            // Rehashed empty bucket flag
-            static void* const empty_rehashed_flag = reinterpret_cast<void*>(std::size_t(0));
-
-            template <typename MutexType>
-            bool rehash_required(hash_map_node_base<MutexType>* node_ptr) {
-                return reinterpret_cast<void*>(node_ptr) == rehash_req_flag;
-            }
+template <typename MutexType>
+struct hash_map_node_base : no_copy {
+    using mutex_type = MutexType;
+    // Scoped lock type for mutex
+    using scoped_type = typename MutexType::scoped_lock;
+    // Next node in chain
+    hash_map_node_base* next;
+    mutex_type mutex;
+};
+
+// Incompleteness flag value
+static void* const rehash_req_flag = reinterpret_cast<void*>(std::size_t(3));
+// Rehashed empty bucket flag
+static void* const empty_rehashed_flag = reinterpret_cast<void*>(std::size_t(0));
+
+template <typename MutexType>
+bool rehash_required( hash_map_node_base<MutexType>* node_ptr ) {
+    return reinterpret_cast<void*>(node_ptr) == rehash_req_flag;
+}
 
 #if TBB_USE_ASSERT
-            template <typename MutexType>
-            bool empty_rehashed(hash_map_node_base<MutexType>* node_ptr) {
-                return reinterpret_cast<void*>(node_ptr) == empty_rehashed_flag;
-            }
+template <typename MutexType>
+bool empty_rehashed( hash_map_node_base<MutexType>* node_ptr ) {
+    return reinterpret_cast<void*>(node_ptr) == empty_rehashed_flag;
+}
 #endif
 
-            // base class of concurrent_hash_map
-
-            template <typename Allocator, typename MutexType>
-            class hash_map_base {
-            public:
-                using size_type = std::size_t;
-                using hashcode_type = std::size_t;
-                using segment_index_type = std::size_t;
-                using node_base = hash_map_node_base<MutexType>;
-
-                struct bucket : no_copy {
-                    using mutex_type = MutexType;
-                    using scoped_type = typename mutex_type::scoped_lock;
-
-                    bucket() : node_list(nullptr) {}
-                    bucket(node_base* ptr) : node_list(ptr) {}
-
-                    mutex_type mutex;
-                    std::atomic<node_base*> node_list;
-                };
-
-                using allocator_type = Allocator;
-                using allocator_traits_type = tbb::detail::allocator_traits<allocator_type>;
-                using bucket_allocator_type = typename allocator_traits_type::template rebind_alloc<bucket>;
-                using bucket_allocator_traits = tbb::detail::allocator_traits<bucket_allocator_type>;
-
-                // Count of segments in the first block
-                static constexpr size_type embedded_block = 1;
-                // Count of segments in the first block
-                static constexpr size_type embedded_buckets = 1 << embedded_block;
-                // Count of segments in the first block
-                static constexpr size_type first_block
-                        = 8;//including embedded_block. perfect with bucket size 16, so the allocations are power of 4096
-                // Size of a pointer / table size
-                static constexpr size_type pointers_per_table
-                        = sizeof(segment_index_type) * 8;// one segment per bit
-
-                using segment_ptr_type = bucket*;
-                using atomic_segment_type = std::atomic<segment_ptr_type>;
-                using segments_table_type = atomic_segment_type[pointers_per_table];
-
-                hash_map_base(const allocator_type& alloc)
-                    : my_allocator(alloc), my_mask(embedded_buckets - 1), my_size(0) {
-                    for (size_type i = 0; i != embedded_buckets; ++i) {
-                        my_embedded_segment[i].node_list.store(nullptr, std::memory_order_relaxed);
-                    }
-
-                    for (size_type segment_index = 0; segment_index < pointers_per_table; ++segment_index) {
-                        auto argument = segment_index < embedded_block
-                                                ? my_embedded_segment + segment_base(segment_index)
-                                                : nullptr;
-                        my_table[segment_index].store(argument, std::memory_order_relaxed);
-                    }
-
-                    __TBB_ASSERT(embedded_block <= first_block,
-                                 "The first block number must include embedded blocks");
-                }
-
-                // segment index of given index in the array
-                static segment_index_type segment_index_of(size_type index) {
-                    return segment_index_type(tbb::detail::log2(index | 1));
-                }
-
-                // the first array index of given segment
-                static segment_index_type segment_base(segment_index_type k) {
-                    return (segment_index_type(1) << k & ~segment_index_type(1));
-                }
-
-                // segment size except for k == 0
-                static size_type segment_size(segment_index_type k) {
-                    return size_type(1) << k;// fake value for k==0
-                }
-
-                // true if ptr is valid pointer
-                static bool is_valid(void* ptr) { return reinterpret_cast<uintptr_t>(ptr) > uintptr_t(63); }
-
-                template <typename... Args>
-                void init_buckets_impl(segment_ptr_type ptr, size_type sz, Args&&... args) {
-                    for (size_type i = 0; i < sz; ++i) {
-                        bucket_allocator_traits::construct(my_allocator, ptr + i,
-                                                           std::forward<Args>(args)...);
-                    }
-                }
-
-                // Initialize buckets
-                void init_buckets(segment_ptr_type ptr, size_type sz, bool is_initial) {
-                    if (is_initial) {
-                        init_buckets_impl(ptr, sz);
-                    } else {
-                        init_buckets_impl(ptr, sz, reinterpret_cast<node_base*>(rehash_req_flag));
-                    }
-                }
-
-                // Add node n to bucket b
-                static void add_to_bucket(bucket* b, node_base* n) {
-                    __TBB_ASSERT(!rehash_required(b->node_list.load(std::memory_order_relaxed)), nullptr);
-                    n->next = b->node_list.load(std::memory_order_relaxed);
-                    b->node_list.store(n, std::memory_order_relaxed);// its under lock and flag is set
-                }
-
-                const bucket_allocator_type& get_allocator() const { return my_allocator; }
-
-                bucket_allocator_type& get_allocator() { return my_allocator; }
-
-                // Enable segment
-                void enable_segment(segment_index_type k, bool is_initial = false) {
-                    __TBB_ASSERT(k, "Zero segment must be embedded");
-                    size_type sz;
-                    __TBB_ASSERT(!is_valid(my_table[k].load(std::memory_order_relaxed)),
-                                 "Wrong concurrent assignment");
-                    if (k >= first_block) {
-                        sz = segment_size(k);
-                        segment_ptr_type ptr = nullptr;
-                        try_call([&] {
-                            ptr = bucket_allocator_traits::allocate(my_allocator, sz);
-                        }).on_exception([&] { my_table[k].store(nullptr, std::memory_order_relaxed); });
-
-                        __TBB_ASSERT(ptr, nullptr);
-                        init_buckets(ptr, sz, is_initial);
-                        my_table[k].store(ptr, std::memory_order_release);
-                        sz <<= 1;// double it to get entire capacity of the container
-                    } else {     // the first block
-                        __TBB_ASSERT(k == embedded_block, "Wrong segment index");
-                        sz = segment_size(first_block);
-                        segment_ptr_type ptr = nullptr;
-                        try_call([&] {
-                            ptr = bucket_allocator_traits::allocate(my_allocator, sz - embedded_buckets);
-                        }).on_exception([&] { my_table[k].store(nullptr, std::memory_order_relaxed); });
-
-                        __TBB_ASSERT(ptr, nullptr);
-                        init_buckets(ptr, sz - embedded_buckets, is_initial);
-                        ptr -= segment_base(embedded_block);
-                        for (segment_index_type i = embedded_block; i < first_block; i++)// calc the offsets
-                            my_table[i].store(ptr + segment_base(i), std::memory_order_release);
-                    }
-                    my_mask.store(sz - 1, std::memory_order_release);
-                }
-
-                void delete_segment(segment_index_type s) {
-                    segment_ptr_type buckets_ptr = my_table[s].load(std::memory_order_relaxed);
-                    size_type sz = segment_size(s ? s : 1);
-
-                    size_type deallocate_size = 0;
-
-                    if (s >= first_block) {// the first segment or the next
-                        deallocate_size = sz;
-                    } else if (s == embedded_block && embedded_block != first_block) {
-                        deallocate_size = segment_size(first_block) - embedded_buckets;
-                    }
-
-                    for (size_type i = 0; i < deallocate_size; ++i) {
-                        bucket_allocator_traits::destroy(my_allocator, buckets_ptr + i);
-                    }
-                    if (deallocate_size != 0) {
-                        bucket_allocator_traits::deallocate(my_allocator, buckets_ptr, deallocate_size);
-                    }
-
-                    if (s >= embedded_block) my_table[s].store(nullptr, std::memory_order_relaxed);
-                }
-
-                // Get bucket by (masked) hashcode
-                bucket* get_bucket(hashcode_type h) const noexcept {
-                    segment_index_type s = segment_index_of(h);
-                    h -= segment_base(s);
-                    segment_ptr_type seg = my_table[s].load(std::memory_order_acquire);
-                    __TBB_ASSERT(is_valid(seg), "hashcode must be cut by valid mask for allocated segments");
-                    return &seg[h];
-                }
-
-                // detail serial rehashing helper
-                void mark_rehashed_levels(hashcode_type h) noexcept {
-                    segment_index_type s = segment_index_of(h);
-                    while (segment_ptr_type seg = my_table[++s].load(std::memory_order_relaxed))
-                        if (rehash_required(seg[h].node_list.load(std::memory_order_relaxed))) {
-                            seg[h].node_list.store(reinterpret_cast<node_base*>(empty_rehashed_flag),
-                                                   std::memory_order_relaxed);
-                            mark_rehashed_levels(h + ((hashcode_type) 1 << s));// optimized segment_base(s)
-                        }
-                }
-
-                // Check for mask race
-                // Splitting into two functions should help inlining
-                inline bool check_mask_race(const hashcode_type h, hashcode_type& m) const {
-                    hashcode_type m_now, m_old = m;
-                    m_now = my_mask.load(std::memory_order_acquire);
-                    if (m_old != m_now) { return check_rehashing_collision(h, m_old, m = m_now); }
-                    return false;
-                }
-
-                // Process mask race, check for rehashing collision
-                bool check_rehashing_collision(const hashcode_type h, hashcode_type m_old,
-                                               hashcode_type m) const {
-                    __TBB_ASSERT(m_old != m,
-                                 nullptr);       // TODO?: m arg could be optimized out by passing h = h&m
-                    if ((h & m_old) != (h & m)) {// mask changed for this hashcode, rare event
-                        // condition above proves that 'h' has some other bits set beside 'm_old'
-                        // find next applicable mask after m_old    //TODO: look at bsl instruction
-                        for (++m_old; !(h & m_old);
-                             m_old <<= 1)// at maximum few rounds depending on the first block size
-                            ;
-                        m_old = (m_old << 1) - 1;// get full mask from a bit
-                        __TBB_ASSERT((m_old & (m_old + 1)) == 0 && m_old <= m, nullptr);
-                        // check whether it is rehashing/ed
-                        if (!rehash_required(
-                                    get_bucket(h & m_old)->node_list.load(std::memory_order_acquire))) {
-                            return true;
-                        }
-                    }
-                    return false;
-                }
-
-                // Insert a node and check for load factor. @return segment index to enable.
-                segment_index_type insert_new_node(bucket* b, node_base* n, hashcode_type mask) {
-                    size_type sz
-                            = ++my_size;// prefix form is to enforce allocation after the first item inserted
-                    add_to_bucket(b, n);
-                    // check load factor
-                    if (sz >= mask) {// TODO: add custom load_factor
-                        segment_index_type new_seg = tbb::detail::log2(mask + 1);//optimized segment_index_of
-                        __TBB_ASSERT(is_valid(my_table[new_seg - 1].load(std::memory_order_relaxed)),
-                                     "new allocations must not publish new mask until segment has allocated");
-                        static const segment_ptr_type is_allocating = segment_ptr_type(2);
-                        ;
-                        segment_ptr_type disabled = nullptr;
-                        if (!(my_table[new_seg].load(std::memory_order_acquire))
-                            && my_table[new_seg].compare_exchange_strong(disabled, is_allocating))
-                            return new_seg;// The value must be processed
-                    }
-                    return 0;
-                }
-
-                // Prepare enough segments for number of buckets
-                void reserve(size_type buckets) {
-                    if (!buckets--) return;
-                    bool is_initial = !my_size.load(std::memory_order_relaxed);
-                    for (size_type m = my_mask.load(std::memory_order_relaxed); buckets > m;
-                         m = my_mask.load(std::memory_order_relaxed)) {
-                        enable_segment(segment_index_of(m + 1), is_initial);
-                    }
-                }
-
-                // Swap hash_map_bases
-                void internal_swap_content(hash_map_base& table) {
-                    using std::swap;
-                    swap_atomics_relaxed(my_mask, table.my_mask);
-                    swap_atomics_relaxed(my_size, table.my_size);
-
-                    for (size_type i = 0; i < embedded_buckets; i++) {
-                        auto temp = my_embedded_segment[i].node_list.load(std::memory_order_relaxed);
-                        my_embedded_segment[i].node_list.store(
-                                table.my_embedded_segment[i].node_list.load(std::memory_order_relaxed),
-                                std::memory_order_relaxed);
-                        table.my_embedded_segment[i].node_list.store(temp, std::memory_order_relaxed);
-                    }
-                    for (size_type i = embedded_block; i < pointers_per_table; i++) {
-                        auto temp = my_table[i].load(std::memory_order_relaxed);
-                        my_table[i].store(table.my_table[i].load(std::memory_order_relaxed),
-                                          std::memory_order_relaxed);
-                        table.my_table[i].store(temp, std::memory_order_relaxed);
-                    }
-                }
-
-                void internal_move(hash_map_base&& other) {
-                    my_mask.store(other.my_mask.load(std::memory_order_relaxed), std::memory_order_relaxed);
-                    other.my_mask.store(embedded_buckets - 1, std::memory_order_relaxed);
-
-                    my_size.store(other.my_size.load(std::memory_order_relaxed), std::memory_order_relaxed);
-                    other.my_size.store(0, std::memory_order_relaxed);
-
-                    for (size_type i = 0; i < embedded_buckets; ++i) {
-                        my_embedded_segment[i].node_list.store(other.my_embedded_segment[i].node_list,
-                                                               std::memory_order_relaxed);
-                        other.my_embedded_segment[i].node_list.store(nullptr, std::memory_order_relaxed);
-                    }
-
-                    for (size_type i = embedded_block; i < pointers_per_table; ++i) {
-                        my_table[i].store(other.my_table[i].load(std::memory_order_relaxed),
-                                          std::memory_order_relaxed);
-                        other.my_table[i].store(nullptr, std::memory_order_relaxed);
-                    }
-                }
-
-            protected:
-                bucket_allocator_type my_allocator;
-                // Hash mask = sum of allocated segment sizes - 1
-                std::atomic<hashcode_type> my_mask;
-                // Size of container in stored items
-                std::atomic<size_type>
-                        my_size;// It must be in separate cache line from my_mask due to performance effects
-                // Zero segment
-                bucket my_embedded_segment[embedded_buckets];
-                // Segment pointers table. Also prevents false sharing between my_mask and my_size
-                segments_table_type my_table;
-            };
-
-            template <typename Iterator>
-            class hash_map_range;
-
-            // Meets requirements of a forward iterator for STL
-            // Value is either the T or const T type of the container.
-            template <typename Container, typename Value>
-            class hash_map_iterator {
-                using map_type = Container;
-                using node = typename Container::node;
-                using map_base = typename Container::base_type;
-                using node_base = typename map_base::node_base;
-                using bucket = typename map_base::bucket;
-
-            public:
-                using value_type = Value;
-                using size_type = typename Container::size_type;
-                using difference_type = typename Container::difference_type;
-                using pointer = value_type*;
-                using reference = value_type&;
-                using iterator_category = std::forward_iterator_tag;
-
-                // Construct undefined iterator
-                hash_map_iterator() : my_map(), my_index(), my_bucket(), my_node() {}
-                hash_map_iterator(const hash_map_iterator<Container, typename Container::value_type>& other)
-                    : my_map(other.my_map), my_index(other.my_index), my_bucket(other.my_bucket),
-                      my_node(other.my_node) {}
-
-                hash_map_iterator&
-                operator=(const hash_map_iterator<Container, typename Container::value_type>& other) {
-                    my_map = other.my_map;
-                    my_index = other.my_index;
-                    my_bucket = other.my_bucket;
-                    my_node = other.my_node;
-                    return *this;
-                }
-
-                Value& operator*() const {
-                    __TBB_ASSERT(map_base::is_valid(my_node),
-                                 "iterator uninitialized or at end of container?");
-                    return my_node->value();
-                }
-
-                Value* operator->() const { return &operator*(); }
-
-                hash_map_iterator& operator++() {
-                    my_node = static_cast<node*>(my_node->next);
-                    if (!my_node) advance_to_next_bucket();
-                    return *this;
-                }
-
-                // Post increment
-                hash_map_iterator operator++(int) {
-                    hash_map_iterator old(*this);
-                    operator++();
-                    return old;
-                }
-
-            private:
-                template <typename C, typename T, typename U>
-                friend bool operator==(const hash_map_iterator<C, T>& i, const hash_map_iterator<C, U>& j);
-
-                template <typename C, typename T, typename U>
-                friend bool operator!=(const hash_map_iterator<C, T>& i, const hash_map_iterator<C, U>& j);
-
-                template <typename C, typename T, typename U>
-                friend ptrdiff_t operator-(const hash_map_iterator<C, T>& i,
-                                           const hash_map_iterator<C, U>& j);
-
-                template <typename C, typename U>
-                friend class hash_map_iterator;
-
-                template <typename I>
-                friend class hash_map_range;
-
-                void advance_to_next_bucket() {// TODO?: refactor to iterator_base class
-                    size_t k = my_index + 1;
-                    __TBB_ASSERT(my_bucket, "advancing an invalid iterator?");
-                    while (k <= my_map->my_mask.load(std::memory_order_relaxed)) {
-                        // Following test uses 2's-complement wizardry
-                        if (k & (k - 2))// not the beginning of a segment
-                            ++my_bucket;
-                        else
-                            my_bucket = my_map->get_bucket(k);
-                        my_node = static_cast<node*>(my_bucket->node_list.load(std::memory_order_relaxed));
-                        if (map_base::is_valid(my_node)) {
-                            my_index = k;
-                            return;
-                        }
-                        ++k;
-                    }
-                    my_bucket = 0;
-                    my_node = 0;
-                    my_index = k;// the end
-                }
-
-                template <typename Key, typename T, typename HashCompare, typename A
-#if __TBB_PREVIEW_CONCURRENT_HASH_MAP_EXTENSIONS
-                          ,
-                          typename M>
-                __TBB_requires(tbb::detail::hash_compare<HashCompare, Key>&& ch_map_rw_scoped_lockable<M>)
-#else
-                          >
-                __TBB_requires(tbb::detail::hash_compare<HashCompare, Key>)
-#endif
-                        friend class concurrent_hash_map;
-
-                hash_map_iterator(const Container& map, std::size_t index, const bucket* b, node_base* n)
-                    : my_map(&map), my_index(index), my_bucket(b), my_node(static_cast<node*>(n)) {
-                    if (b && !map_base::is_valid(n)) advance_to_next_bucket();
-                }
-
-                // concurrent_hash_map over which we are iterating.
-                const Container* my_map;
-                // Index in hash table for current item
-                size_t my_index;
-                // Pointer to bucket
-                const bucket* my_bucket;
-                // Pointer to node that has current item
-                node* my_node;
-            };
-
-            template <typename Container, typename T, typename U>
-            bool operator==(const hash_map_iterator<Container, T>& i,
-                            const hash_map_iterator<Container, U>& j) {
-                return i.my_node == j.my_node && i.my_map == j.my_map;
+// base class of concurrent_hash_map
+
+template <typename Allocator, typename MutexType>
+class hash_map_base {
+public:
+    using size_type = std::size_t;
+    using hashcode_type = std::size_t;
+    using segment_index_type = std::size_t;
+    using node_base = hash_map_node_base<MutexType>;
+
+    struct bucket : no_copy {
+        using mutex_type = MutexType;
+        using scoped_type = typename mutex_type::scoped_lock;
+
+        bucket() : node_list(nullptr) {}
+        bucket( node_base* ptr ) : node_list(ptr) {}
+
+        mutex_type mutex;
+        std::atomic<node_base*> node_list;
+    };
+
+    using allocator_type = Allocator;
+    using allocator_traits_type = tbb::detail::allocator_traits<allocator_type>;
+    using bucket_allocator_type = typename allocator_traits_type::template rebind_alloc<bucket>;
+    using bucket_allocator_traits = tbb::detail::allocator_traits<bucket_allocator_type>;
+
+    // Count of segments in the first block
+    static constexpr size_type embedded_block = 1;
+    // Count of segments in the first block
+    static constexpr size_type embedded_buckets = 1 << embedded_block;
+    // Count of segments in the first block
+    static constexpr size_type first_block = 8; //including embedded_block. perfect with bucket size 16, so the allocations are power of 4096
+    // Size of a pointer / table size
+    static constexpr size_type pointers_per_table = sizeof(segment_index_type) * 8; // one segment per bit
+
+    using segment_ptr_type = bucket*;
+    using atomic_segment_type = std::atomic<segment_ptr_type>;
+    using segments_table_type = atomic_segment_type[pointers_per_table];
+
+    hash_map_base( const allocator_type& alloc ) : my_allocator(alloc), my_mask(embedded_buckets - 1), my_size(0) {
+        for (size_type i = 0; i != embedded_buckets; ++i) {
+            my_embedded_segment[i].node_list.store(nullptr, std::memory_order_relaxed);
+        }
+
+        for (size_type segment_index = 0; segment_index < pointers_per_table; ++segment_index) {
+            auto argument = segment_index < embedded_block ? my_embedded_segment + segment_base(segment_index) : nullptr;
+            my_table[segment_index].store(argument, std::memory_order_relaxed);
+        }
+
+        __TBB_ASSERT( embedded_block <= first_block, "The first block number must include embedded blocks");
+    }
+
+    // segment index of given index in the array
+    static segment_index_type segment_index_of( size_type index ) {
+        return segment_index_type(tbb::detail::log2( index|1 ));
+    }
+
+    // the first array index of given segment
+    static segment_index_type segment_base( segment_index_type k ) {
+        return (segment_index_type(1) << k & ~segment_index_type(1));
+    }
+
+    // segment size except for k == 0
+    static size_type segment_size( segment_index_type k ) {
+        return size_type(1) << k; // fake value for k==0
+    }
+
+    // true if ptr is valid pointer
+    static bool is_valid( void* ptr ) {
+        return reinterpret_cast<uintptr_t>(ptr) > uintptr_t(63);
+    }
+
+    template <typename... Args>
+    void init_buckets_impl( segment_ptr_type ptr, size_type sz, const Args&... args ) {
+        for (size_type i = 0; i < sz; ++i) {
+            bucket_allocator_traits::construct(my_allocator, ptr + i, args...);
+        }
+    }
+
+    // Initialize buckets
+    void init_buckets( segment_ptr_type ptr, size_type sz, bool is_initial ) {
+        if (is_initial) {
+            init_buckets_impl(ptr, sz);
+        } else {
+            init_buckets_impl(ptr, sz, reinterpret_cast<node_base*>(rehash_req_flag));
+        }
+    }
+
+    // Add node n to bucket b
+    static void add_to_bucket( bucket* b, node_base* n ) {
+        __TBB_ASSERT(!rehash_required(b->node_list.load(std::memory_order_relaxed)), nullptr);
+        n->next = b->node_list.load(std::memory_order_relaxed);
+        b->node_list.store(n, std::memory_order_relaxed); // its under lock and flag is set
+    }
+
+    const bucket_allocator_type& get_allocator() const {
+        return my_allocator;
+    }
+
+    bucket_allocator_type& get_allocator() {
+        return my_allocator;
+    }
+
+    // Enable segment
+    void enable_segment( segment_index_type k, bool is_initial = false ) {
+        __TBB_ASSERT( k, "Zero segment must be embedded" );
+        size_type sz;
+        __TBB_ASSERT( !is_valid(my_table[k].load(std::memory_order_relaxed)), "Wrong concurrent assignment");
+        if (k >= first_block) {
+            sz = segment_size(k);
+            segment_ptr_type ptr = nullptr;
+            try_call( [&] {
+                ptr = bucket_allocator_traits::allocate(my_allocator, sz);
+            } ).on_exception( [&] {
+                my_table[k].store(nullptr, std::memory_order_relaxed);
+            });
+
+            __TBB_ASSERT(ptr, nullptr);
+            init_buckets(ptr, sz, is_initial);
+            my_table[k].store(ptr, std::memory_order_release);
+            sz <<= 1;// double it to get entire capacity of the container
+        } else { // the first block
+            __TBB_ASSERT( k == embedded_block, "Wrong segment index" );
+            sz = segment_size(first_block);
+            segment_ptr_type ptr = nullptr;
+            try_call( [&] {
+                ptr = bucket_allocator_traits::allocate(my_allocator, sz - embedded_buckets);
+            } ).on_exception( [&] {
+                my_table[k].store(nullptr, std::memory_order_relaxed);
+            });
+
+            __TBB_ASSERT(ptr, nullptr);
+            init_buckets(ptr, sz - embedded_buckets, is_initial);
+            ptr -= segment_base(embedded_block);
+            for(segment_index_type i = embedded_block; i < first_block; i++) // calc the offsets
+                my_table[i].store(ptr + segment_base(i), std::memory_order_release);
+        }
+        my_mask.store(sz-1, std::memory_order_release);
+    }
+
+    void delete_segment( segment_index_type s ) {
+        segment_ptr_type buckets_ptr = my_table[s].load(std::memory_order_relaxed);
+        size_type sz = segment_size( s ? s : 1 );
+
+        size_type deallocate_size = 0;
+
+        if (s >= first_block) { // the first segment or the next
+            deallocate_size = sz;
+        } else if (s == embedded_block && embedded_block != first_block) {
+            deallocate_size = segment_size(first_block) - embedded_buckets;
+        }
+
+        for (size_type i = 0; i < deallocate_size; ++i) {
+            bucket_allocator_traits::destroy(my_allocator, buckets_ptr + i);
+        }
+        if (deallocate_size != 0) {
+            bucket_allocator_traits::deallocate(my_allocator, buckets_ptr, deallocate_size);
+        }
+
+        if (s >= embedded_block) my_table[s].store(nullptr, std::memory_order_relaxed);
+    }
+
+    // Get bucket by (masked) hashcode
+    bucket *get_bucket( hashcode_type h ) const noexcept {
+        segment_index_type s = segment_index_of( h );
+        h -= segment_base(s);
+        segment_ptr_type seg = my_table[s].load(std::memory_order_acquire);
+        __TBB_ASSERT( is_valid(seg), "hashcode must be cut by valid mask for allocated segments" );
+        return &seg[h];
+    }
+
+    // detail serial rehashing helper
+    void mark_rehashed_levels( hashcode_type h ) noexcept {
+        segment_index_type s = segment_index_of( h );
+        while (segment_ptr_type seg = my_table[++s].load(std::memory_order_relaxed))
+            if (rehash_required(seg[h].node_list.load(std::memory_order_relaxed))) {
+                seg[h].node_list.store(reinterpret_cast<node_base*>(empty_rehashed_flag), std::memory_order_relaxed);
+                mark_rehashed_levels( h + ((hashcode_type)1<<s) ); // optimized segment_base(s)
             }
-
-            template <typename Container, typename T, typename U>
-            bool operator!=(const hash_map_iterator<Container, T>& i,
-                            const hash_map_iterator<Container, U>& j) {
-                return i.my_node != j.my_node || i.my_map != j.my_map;
+    }
+
+    // Check for mask race
+    // Splitting into two functions should help inlining
+    inline bool check_mask_race( const hashcode_type h, hashcode_type &m ) const {
+        hashcode_type m_now, m_old = m;
+        m_now = my_mask.load(std::memory_order_acquire);
+        if (m_old != m_now) {
+            return check_rehashing_collision(h, m_old, m = m_now);
+        }
+        return false;
+    }
+
+    // Process mask race, check for rehashing collision
+    bool check_rehashing_collision( const hashcode_type h, hashcode_type m_old, hashcode_type m ) const {
+        __TBB_ASSERT(m_old != m, nullptr); // TODO?: m arg could be optimized out by passing h = h&m
+        if( (h & m_old) != (h & m) ) { // mask changed for this hashcode, rare event
+            // condition above proves that 'h' has some other bits set beside 'm_old'
+            // find next applicable mask after m_old    //TODO: look at bsl instruction
+            for( ++m_old; !(h & m_old); m_old <<= 1 ) // at maximum few rounds depending on the first block size
+                ;
+            m_old = (m_old<<1) - 1; // get full mask from a bit
+            __TBB_ASSERT((m_old&(m_old+1))==0 && m_old <= m, nullptr);
+            // check whether it is rehashing/ed
+            if (!rehash_required(get_bucket(h & m_old)->node_list.load(std::memory_order_acquire))) {
+                return true;
             }
-
-            // Range class used with concurrent_hash_map
-            template <typename Iterator>
-            class hash_map_range {
-                using map_type = typename Iterator::map_type;
-
-            public:
-                // Type for size of a range
-                using size_type = std::size_t;
-                using value_type = typename Iterator::value_type;
-                using reference = typename Iterator::reference;
-                using difference_type = typename Iterator::difference_type;
-                using iterator = Iterator;
-
-                // True if range is empty.
-                bool empty() const { return my_begin == my_end; }
-
-                // True if range can be partitioned into two subranges.
-                bool is_divisible() const { return my_midpoint != my_end; }
-
-                // Split range.
-                hash_map_range(hash_map_range& r, split) : my_end(r.my_end), my_grainsize(r.my_grainsize) {
-                    r.my_end = my_begin = r.my_midpoint;
-                    __TBB_ASSERT(!empty(), "Splitting despite the range is not divisible");
-                    __TBB_ASSERT(!r.empty(), "Splitting despite the range is not divisible");
-                    set_midpoint();
-                    r.set_midpoint();
-                }
-
-                // Init range with container and grainsize specified
-                hash_map_range(const map_type& map, size_type grainsize_ = 1)
-                    : my_begin(Iterator(map, 0, map.my_embedded_segment,
-                                        map.my_embedded_segment->node_list.load(std::memory_order_relaxed))),
-                      my_end(Iterator(map, map.my_mask.load(std::memory_order_relaxed) + 1, 0, 0)),
-                      my_grainsize(grainsize_) {
-                    __TBB_ASSERT(grainsize_ > 0, "grainsize must be positive");
-                    set_midpoint();
-                }
-
-                Iterator begin() const { return my_begin; }
-                Iterator end() const { return my_end; }
-                // The grain size for this range.
-                size_type grainsize() const { return my_grainsize; }
-
-            private:
-                Iterator my_begin;
-                Iterator my_end;
-                mutable Iterator my_midpoint;
-                size_t my_grainsize;
-                // Set my_midpoint to point approximately half way between my_begin and my_end.
-                void set_midpoint() const;
-                template <typename U>
-                friend class hash_map_range;
-            };
-
-            template <typename Iterator>
-            void hash_map_range<Iterator>::set_midpoint() const {
-                // Split by groups of nodes
-                size_t m = my_end.my_index - my_begin.my_index;
-                if (m > my_grainsize) {
-                    m = my_begin.my_index + m / 2u;
-                    auto b = my_begin.my_map->get_bucket(m);
-                    my_midpoint
-                            = Iterator(*my_begin.my_map, m, b, b->node_list.load(std::memory_order_relaxed));
-                } else {
-                    my_midpoint = my_end;
-                }
-                __TBB_ASSERT(my_begin.my_index <= my_midpoint.my_index, "my_begin is after my_midpoint");
-                __TBB_ASSERT(my_midpoint.my_index <= my_end.my_index, "my_midpoint is after my_end");
-                __TBB_ASSERT(my_begin != my_midpoint || my_begin == my_end,
-                             "[my_begin, my_midpoint) range should not be empty");
+        }
+        return false;
+    }
+
+    // Insert a node and check for load factor. @return segment index to enable.
+    segment_index_type insert_new_node( bucket *b, node_base *n, hashcode_type mask ) {
+        size_type sz = ++my_size; // prefix form is to enforce allocation after the first item inserted
+        add_to_bucket( b, n );
+        // check load factor
+        if( sz >= mask ) { // TODO: add custom load_factor
+            segment_index_type new_seg = tbb::detail::log2( mask+1 ); //optimized segment_index_of
+            __TBB_ASSERT( is_valid(my_table[new_seg-1].load(std::memory_order_relaxed)), "new allocations must not publish new mask until segment has allocated");
+            static const segment_ptr_type is_allocating = segment_ptr_type(2);
+            segment_ptr_type disabled = nullptr;
+            if (!(my_table[new_seg].load(std::memory_order_acquire))
+                && my_table[new_seg].compare_exchange_strong(disabled, is_allocating))
+                return new_seg; // The value must be processed
+        }
+        return 0;
+    }
+
+    // Prepare enough segments for number of buckets
+    void reserve(size_type buckets) {
+        if( !buckets-- ) return;
+        bool is_initial = !my_size.load(std::memory_order_relaxed);
+        for (size_type m = my_mask.load(std::memory_order_relaxed); buckets > m;
+            m = my_mask.load(std::memory_order_relaxed))
+        {
+            enable_segment( segment_index_of( m+1 ), is_initial );
+        }
+    }
+
+    // Swap hash_map_bases
+    void internal_swap_content(hash_map_base &table) {
+        using std::swap;
+        swap_atomics_relaxed(my_mask, table.my_mask);
+        swap_atomics_relaxed(my_size, table.my_size);
+
+        for(size_type i = 0; i < embedded_buckets; i++) {
+            auto temp = my_embedded_segment[i].node_list.load(std::memory_order_relaxed);
+            my_embedded_segment[i].node_list.store(table.my_embedded_segment[i].node_list.load(std::memory_order_relaxed),
+                std::memory_order_relaxed);
+            table.my_embedded_segment[i].node_list.store(temp, std::memory_order_relaxed);
+        }
+        for(size_type i = embedded_block; i < pointers_per_table; i++) {
+            auto temp = my_table[i].load(std::memory_order_relaxed);
+            my_table[i].store(table.my_table[i].load(std::memory_order_relaxed),
+                std::memory_order_relaxed);
+            table.my_table[i].store(temp, std::memory_order_relaxed);
+        }
+    }
+
+    void internal_move(hash_map_base&& other) {
+        my_mask.store(other.my_mask.load(std::memory_order_relaxed), std::memory_order_relaxed);
+        other.my_mask.store(embedded_buckets - 1, std::memory_order_relaxed);
+
+        my_size.store(other.my_size.load(std::memory_order_relaxed), std::memory_order_relaxed);
+        other.my_size.store(0, std::memory_order_relaxed);
+
+        for (size_type i = 0; i < embedded_buckets; ++i) {
+            my_embedded_segment[i].node_list.store(other.my_embedded_segment[i].node_list, std::memory_order_relaxed);
+            other.my_embedded_segment[i].node_list.store(nullptr, std::memory_order_relaxed);
+        }
+
+        for (size_type i = embedded_block; i < pointers_per_table; ++i) {
+            my_table[i].store(other.my_table[i].load(std::memory_order_relaxed),
+                std::memory_order_relaxed);
+            other.my_table[i].store(nullptr, std::memory_order_relaxed);
+        }
+    }
+
+protected:
+    bucket_allocator_type my_allocator;
+    // Hash mask = sum of allocated segment sizes - 1
+    std::atomic<hashcode_type> my_mask;
+    // Size of container in stored items
+    std::atomic<size_type> my_size; // It must be in separate cache line from my_mask due to performance effects
+    // Zero segment
+    bucket my_embedded_segment[embedded_buckets];
+    // Segment pointers table. Also prevents false sharing between my_mask and my_size
+    segments_table_type my_table;
+};
+
+template <typename Iterator>
+class hash_map_range;
+
+// Meets requirements of a forward iterator for STL
+// Value is either the T or const T type of the container.
+template <typename Container, typename Value>
+class hash_map_iterator {
+    using map_type = Container;
+    using node = typename Container::node;
+    using map_base = typename Container::base_type;
+    using node_base = typename map_base::node_base;
+    using bucket = typename map_base::bucket;
+public:
+    using value_type = Value;
+    using size_type = typename Container::size_type;
+    using difference_type = typename Container::difference_type;
+    using pointer = value_type*;
+    using reference = value_type&;
+    using iterator_category = std::forward_iterator_tag;
+
+    // Construct undefined iterator
+    hash_map_iterator(): my_map(), my_index(), my_bucket(), my_node() {}
+    hash_map_iterator( const hash_map_iterator<Container, typename Container::value_type>& other ) :
+        my_map(other.my_map),
+        my_index(other.my_index),
+        my_bucket(other.my_bucket),
+        my_node(other.my_node)
+    {}
+
+    hash_map_iterator& operator=( const hash_map_iterator<Container, typename Container::value_type>& other ) {
+        my_map = other.my_map;
+        my_index = other.my_index;
+        my_bucket = other.my_bucket;
+        my_node = other.my_node;
+        return *this;
+    }
+
+    Value& operator*() const {
+        __TBB_ASSERT( map_base::is_valid(my_node), "iterator uninitialized or at end of container?" );
+        return my_node->value();
+    }
+
+    Value* operator->() const {return &operator*();}
+
+    hash_map_iterator& operator++() {
+        my_node = static_cast<node*>( my_node->next );
+        if( !my_node ) advance_to_next_bucket();
+        return *this;
+    }
+
+    // Post increment
+    hash_map_iterator operator++(int) {
+        hash_map_iterator old(*this);
+        operator++();
+        return old;
+    }
+private:
+    template <typename C, typename T, typename U>
+    friend bool operator==( const hash_map_iterator<C,T>& i, const hash_map_iterator<C,U>& j );
+
+    template <typename C, typename T, typename U>
+    friend bool operator!=( const hash_map_iterator<C,T>& i, const hash_map_iterator<C,U>& j );
+
+    template <typename C, typename T, typename U>
+    friend ptrdiff_t operator-( const hash_map_iterator<C,T>& i, const hash_map_iterator<C,U>& j );
+
+    template <typename C, typename U>
+    friend class hash_map_iterator;
+
+    template <typename I>
+    friend class hash_map_range;
+
+    void advance_to_next_bucket() { // TODO?: refactor to iterator_base class
+        size_t k = my_index+1;
+        __TBB_ASSERT( my_bucket, "advancing an invalid iterator?");
+        while (k <= my_map->my_mask.load(std::memory_order_relaxed)) {
+            // Following test uses 2's-complement wizardry
+            if( k&(k-2) ) // not the beginning of a segment
+                ++my_bucket;
+            else my_bucket = my_map->get_bucket( k );
+            node_base *n = my_bucket->node_list.load(std::memory_order_relaxed);
+            if( map_base::is_valid(n) ) {
+                my_node = static_cast<node*>(n);
+                my_index = k;
+                return;
             }
+            ++k;
+        }
+        my_bucket = nullptr; my_node = nullptr; my_index = k; // the end
+    }
 
-            template <typename Key, typename T, typename HashCompare = d1::tbb_hash_compare<Key>,
-                      typename Allocator = tbb_allocator<std::pair<const Key, T>>
+    template <typename Key, typename T, typename HashCompare, typename A
 #if __TBB_PREVIEW_CONCURRENT_HASH_MAP_EXTENSIONS
-                      ,
-                      typename MutexType = spin_rw_mutex>
-            __TBB_requires(tbb::detail::hash_compare<HashCompare, Key>&& ch_map_rw_scoped_lockable<MutexType>)
+            , typename M
+             >
+        __TBB_requires(tbb::detail::hash_compare<HashCompare, Key> &&
+                       ch_map_rw_scoped_lockable<M>)
 #else
-                      >
-            __TBB_requires(tbb::detail::hash_compare<HashCompare, Key>)
+             >
+        __TBB_requires(tbb::detail::hash_compare<HashCompare, Key>)
 #endif
-                    class concurrent_hash_map
+    friend class concurrent_hash_map;
+
+    hash_map_iterator( const Container &map, std::size_t index, const bucket *b, node_base *n ) :
+        my_map(&map), my_index(index), my_bucket(b), my_node(nullptr)
+    {
+        // Cannot directly initialize to n, because it could be an invalid node pointer (e.g., when
+        // setting a midpoint for a 1-element range). If it is, try one from a subsequent bucket.
+        if( map_base::is_valid(n) )
+            my_node = static_cast<node*>(n);
+        else if( b )
+            advance_to_next_bucket();
+    }
+
+    // concurrent_hash_map over which we are iterating.
+    const Container *my_map;
+    // Index in hash table for current item
+    size_t my_index;
+    // Pointer to bucket
+    const bucket* my_bucket;
+    // Pointer to node that has current item
+    node* my_node;
+};
+
+template <typename Container, typename T, typename U>
+bool operator==( const hash_map_iterator<Container,T>& i, const hash_map_iterator<Container,U>& j ) {
+    return i.my_node == j.my_node && i.my_map == j.my_map;
+}
+
+template <typename Container, typename T, typename U>
+bool operator!=( const hash_map_iterator<Container,T>& i, const hash_map_iterator<Container,U>& j ) {
+    return i.my_node != j.my_node || i.my_map != j.my_map;
+}
+
+// Range class used with concurrent_hash_map
+template <typename Iterator>
+class hash_map_range {
+    using map_type = typename Iterator::map_type;
+public:
+    // Type for size of a range
+    using size_type = std::size_t;
+    using value_type = typename Iterator::value_type;
+    using reference = typename Iterator::reference;
+    using difference_type = typename Iterator::difference_type;
+    using iterator = Iterator;
+
+    // True if range is empty.
+    bool empty() const { return my_begin == my_end; }
+
+    // True if range can be partitioned into two subranges.
+    bool is_divisible() const {
+        return my_midpoint != my_end;
+    }
+
+    // Split range.
+    hash_map_range( hash_map_range& r, split ) :
+        my_end(r.my_end),
+        my_grainsize(r.my_grainsize)
+    {
+        r.my_end = my_begin = r.my_midpoint;
+        __TBB_ASSERT( !empty(), "Splitting despite the range is not divisible" );
+        __TBB_ASSERT( !r.empty(), "Splitting despite the range is not divisible" );
+        set_midpoint();
+        r.set_midpoint();
+    }
+
+    // Init range with container and grainsize specified
+    hash_map_range( const map_type &map, size_type grainsize_ = 1 ) :
+        my_begin( Iterator( map, 0, map.my_embedded_segment, map.my_embedded_segment->node_list.load(std::memory_order_relaxed) ) ),
+        my_end( Iterator( map, map.my_mask.load(std::memory_order_relaxed) + 1, nullptr, nullptr ) ),
+        my_grainsize( grainsize_ )
+    {
+        __TBB_ASSERT( grainsize_>0, "grainsize must be positive" );
+        set_midpoint();
+    }
+
+    Iterator begin() const { return my_begin; }
+    Iterator end() const { return my_end; }
+    // The grain size for this range.
+    size_type grainsize() const { return my_grainsize; }
+
+private:
+    Iterator my_begin;
+    Iterator my_end;
+    mutable Iterator my_midpoint;
+    size_t my_grainsize;
+    // Set my_midpoint to point approximately half way between my_begin and my_end.
+    void set_midpoint() const;
+    template <typename U> friend class hash_map_range;
+};
+
+template <typename Iterator>
+void hash_map_range<Iterator>::set_midpoint() const {
+    // Split by groups of nodes
+    size_t m = my_end.my_index-my_begin.my_index;
+    if( m > my_grainsize ) {
+        m = my_begin.my_index + m/2u;
+        auto b = my_begin.my_map->get_bucket(m);
+        my_midpoint = Iterator(*my_begin.my_map,m,b,b->node_list.load(std::memory_order_relaxed));
+    } else {
+        my_midpoint = my_end;
+    }
+    __TBB_ASSERT( my_begin.my_index <= my_midpoint.my_index,
+        "my_begin is after my_midpoint" );
+    __TBB_ASSERT( my_midpoint.my_index <= my_end.my_index,
+        "my_midpoint is after my_end" );
+    __TBB_ASSERT( my_begin != my_midpoint || my_begin == my_end,
+        "[my_begin, my_midpoint) range should not be empty" );
+}
+
+template <typename Key, typename T,
+          typename HashCompare = d1::tbb_hash_compare<Key>,
+          typename Allocator = tbb_allocator<std::pair<const Key, T>>
 #if __TBB_PREVIEW_CONCURRENT_HASH_MAP_EXTENSIONS
-                : protected hash_map_base<Allocator, MutexType>
+        , typename MutexType = spin_rw_mutex
+         >
+    __TBB_requires(tbb::detail::hash_compare<HashCompare, Key> &&
+                   ch_map_rw_scoped_lockable<MutexType>)
 #else
-                : protected hash_map_base<Allocator, spin_rw_mutex>
+         >
+    __TBB_requires(tbb::detail::hash_compare<HashCompare, Key>)
 #endif
-            {
-                template <typename Container, typename Value>
-                friend class hash_map_iterator;
+class concurrent_hash_map
+#if __TBB_PREVIEW_CONCURRENT_HASH_MAP_EXTENSIONS
+    : protected hash_map_base<Allocator, MutexType>
+#else
+    : protected hash_map_base<Allocator, spin_rw_mutex>
+#endif
+{
+    template <typename Container, typename Value>
+    friend class hash_map_iterator;
 
-                template <typename I>
-                friend class hash_map_range;
-                using allocator_traits_type = tbb::detail::allocator_traits<Allocator>;
+    template <typename I>
+    friend class hash_map_range;
+    using allocator_traits_type = tbb::detail::allocator_traits<Allocator>;
 
 #if __TBB_PREVIEW_CONCURRENT_HASH_MAP_EXTENSIONS
-                using base_type = hash_map_base<Allocator, MutexType>;
+    using base_type = hash_map_base<Allocator, MutexType>;
 #else
-                using base_type = hash_map_base<Allocator, spin_rw_mutex>;
+    using base_type = hash_map_base<Allocator, spin_rw_mutex>;
 #endif
-            public:
-                using key_type = Key;
-                using mapped_type = T;
-                // type_identity is needed to disable implicit deduction guides for std::initializer_list constructors
-                // and copy/move constructor with explicit allocator argument
-                using allocator_type = tbb::detail::type_identity_t<Allocator>;
-                using hash_compare_type = tbb::detail::type_identity_t<HashCompare>;
-                using value_type = std::pair<const Key, T>;
-                using size_type = typename base_type::size_type;
-                using difference_type = std::ptrdiff_t;
+public:
+    using key_type = Key;
+    using mapped_type = T;
+    // type_identity is needed to disable implicit deduction guides for std::initializer_list constructors
+    // and copy/move constructor with explicit allocator argument
+    using allocator_type = tbb::detail::type_identity_t<Allocator>;
+    using hash_compare_type = tbb::detail::type_identity_t<HashCompare>;
+    using value_type = std::pair<const Key, T>;
+    using size_type = typename base_type::size_type;
+    using difference_type = std::ptrdiff_t;
 #if __TBB_PREVIEW_CONCURRENT_HASH_MAP_EXTENSIONS
-                using mutex_type = MutexType;
+    using mutex_type = MutexType;
 #endif
-                using pointer = typename allocator_traits_type::pointer;
-                using const_pointer = typename allocator_traits_type::const_pointer;
-
-                using reference = value_type&;
-                using const_reference = const value_type&;
-                using iterator = hash_map_iterator<concurrent_hash_map, value_type>;
-                using const_iterator = hash_map_iterator<concurrent_hash_map, const value_type>;
-                using range_type = hash_map_range<iterator>;
-                using const_range_type = hash_map_range<const_iterator>;
-
-            protected:
-                static_assert(std::is_same<value_type, typename Allocator::value_type>::value,
-                              "value_type of the container must be the same as its allocator's");
-
-                friend class const_accessor;
-                class node;
-                using segment_index_type = typename base_type::segment_index_type;
-                using segment_ptr_type = typename base_type::segment_ptr_type;
-                using node_base = typename base_type::node_base;
-                using bucket = typename base_type::bucket;
-                using hashcode_type = typename base_type::hashcode_type;
-                using bucket_allocator_type = typename base_type::bucket_allocator_type;
-                using node_allocator_type =
-                        typename base_type::allocator_traits_type::template rebind_alloc<node>;
-                using node_allocator_traits = tbb::detail::allocator_traits<node_allocator_type>;
-                hash_compare_type my_hash_compare;
-
-                class node : public node_base {
-                public:
-                    node() {}
-                    ~node() {}
-                    pointer storage() { return &my_value; }
-                    value_type& value() { return *storage(); }
-
-                private:
-                    union {
-                        value_type my_value;
-                    };
-                };
-
-                void delete_node(node_base* n) {
-                    node_allocator_type node_allocator(this->get_allocator());
-                    node_allocator_traits::destroy(node_allocator, static_cast<node*>(n)->storage());
-                    node_allocator_traits::destroy(node_allocator, static_cast<node*>(n));
-                    node_allocator_traits::deallocate(node_allocator, static_cast<node*>(n), 1);
-                }
-
-                template <typename... Args>
-                static node* create_node(bucket_allocator_type& allocator, Args&&... args) {
-                    node_allocator_type node_allocator(allocator);
-                    node* node_ptr = node_allocator_traits::allocate(node_allocator, 1);
-                    auto guard = make_raii_guard([&] {
-                        node_allocator_traits::destroy(node_allocator, node_ptr);
-                        node_allocator_traits::deallocate(node_allocator, node_ptr, 1);
-                    });
-
-                    node_allocator_traits::construct(node_allocator, node_ptr);
-                    node_allocator_traits::construct(node_allocator, node_ptr->storage(),
-                                                     std::forward<Args>(args)...);
-                    guard.dismiss();
-                    return node_ptr;
-                }
-
-                static node* allocate_node_copy_construct(bucket_allocator_type& allocator, const Key& key,
-                                                          const T* t) {
-                    return create_node(allocator, key, *t);
-                }
-
-                static node* allocate_node_move_construct(bucket_allocator_type& allocator, const Key& key,
-                                                          const T* t) {
-                    return create_node(allocator, key, std::move(*const_cast<T*>(t)));
-                }
-
-                template <typename K = Key>
-                static node* allocate_node_default_construct(bucket_allocator_type& allocator, const K& key,
-                                                             const T*) {
-                    // Emplace construct an empty T object inside the pair
-                    return create_node(allocator, std::piecewise_construct, std::forward_as_tuple(key),
-                                       std::forward_as_tuple());
-                }
-
-                static node* do_not_allocate_node(bucket_allocator_type&, const Key&, const T*) {
-                    __TBB_ASSERT(false, "this dummy function should not be called");
-                    return nullptr;
+    using pointer = typename allocator_traits_type::pointer;
+    using const_pointer = typename allocator_traits_type::const_pointer;
+
+    using reference = value_type&;
+    using const_reference = const value_type&;
+    using iterator = hash_map_iterator<concurrent_hash_map, value_type>;
+    using const_iterator = hash_map_iterator<concurrent_hash_map, const value_type>;
+    using range_type = hash_map_range<iterator>;
+    using const_range_type = hash_map_range<const_iterator>;
+
+protected:
+    static_assert(std::is_same<value_type, typename Allocator::value_type>::value,
+        "value_type of the container must be the same as its allocator's");
+
+    friend class const_accessor;
+    class node;
+    using segment_index_type = typename base_type::segment_index_type;
+    using segment_ptr_type = typename base_type::segment_ptr_type;
+    using node_base = typename base_type::node_base;
+    using bucket = typename base_type::bucket;
+    using hashcode_type = typename base_type::hashcode_type;
+    using bucket_allocator_type = typename base_type::bucket_allocator_type;
+    using node_allocator_type = typename base_type::allocator_traits_type::template rebind_alloc<node>;
+    using node_allocator_traits = tbb::detail::allocator_traits<node_allocator_type>;
+    hash_compare_type my_hash_compare;
+
+    class node : public node_base {
+    public:
+        node() {}
+        ~node() {}
+        pointer storage() { return &my_value; }
+        value_type& value() { return *storage(); }
+    private:
+        union {
+            value_type my_value;
+        };
+    };
+
+    void delete_node( node_base *n ) {
+        node_allocator_type node_allocator(this->get_allocator());
+        node_allocator_traits::destroy(node_allocator, static_cast<node*>(n)->storage());
+        node_allocator_traits::destroy(node_allocator, static_cast<node*>(n));
+        node_allocator_traits::deallocate(node_allocator, static_cast<node*>(n), 1);
+    }
+
+    template <typename... Args>
+    static node* create_node(bucket_allocator_type& allocator, Args&&... args) {
+        node_allocator_type node_allocator(allocator);
+        node* node_ptr = node_allocator_traits::allocate(node_allocator, 1);
+        auto guard = make_raii_guard([&] {
+            node_allocator_traits::destroy(node_allocator, node_ptr);
+            node_allocator_traits::deallocate(node_allocator, node_ptr, 1);
+        });
+
+        node_allocator_traits::construct(node_allocator, node_ptr);
+        node_allocator_traits::construct(node_allocator, node_ptr->storage(), std::forward<Args>(args)...);
+        guard.dismiss();
+        return node_ptr;
+    }
+
+    static node* allocate_node_copy_construct(bucket_allocator_type& allocator, const Key &key, const T * t){
+        return create_node(allocator, key, *t);
+    }
+
+    static node* allocate_node_move_construct(bucket_allocator_type& allocator, const Key &key, const T * t){
+        return create_node(allocator, key, std::move(*const_cast<T*>(t)));
+    }
+
+    template <typename K = Key>
+    static node* allocate_node_default_construct(bucket_allocator_type& allocator, const K &key, const T * ){
+        // Emplace construct an empty T object inside the pair
+        return create_node(allocator, std::piecewise_construct,
+                           std::forward_as_tuple(key), std::forward_as_tuple());
+    }
+
+    static node* do_not_allocate_node(bucket_allocator_type& , const Key &, const T * ){
+        __TBB_ASSERT(false,"this dummy function should not be called");
+        return nullptr;
+    }
+
+    template <typename K>
+    node *search_bucket( const K &key, bucket *b ) const {
+        node *n = static_cast<node*>( b->node_list.load(std::memory_order_relaxed) );
+        while (this->is_valid(n) && !my_hash_compare.equal(key, n->value().first))
+            n = static_cast<node*>( n->next );
+        __TBB_ASSERT(!rehash_required(n), "Search can be executed only for rehashed bucket");
+        return n;
+    }
+
+    // bucket accessor is to find, rehash, acquire a lock, and access a bucket
+    class bucket_accessor : public bucket::scoped_type {
+        bucket *my_b;
+    public:
+        bucket_accessor( concurrent_hash_map *base, const hashcode_type h, bool writer = false ) { acquire( base, h, writer ); }
+        // find a bucket by masked hashcode, optionally rehash, and acquire the lock
+        inline void acquire( concurrent_hash_map *base, const hashcode_type h, bool writer = false ) {
+            my_b = base->get_bucket( h );
+            // TODO: actually, notification is unnecessary here, just hiding double-check
+            if (rehash_required(my_b->node_list.load(std::memory_order_acquire))
+                && bucket::scoped_type::try_acquire( my_b->mutex, /*write=*/true ) )
+            {
+                if (rehash_required(my_b->node_list.load(std::memory_order_relaxed))) base->rehash_bucket(my_b, h); // recursive rehashing
+            }
+            else bucket::scoped_type::acquire( my_b->mutex, writer );
+            __TBB_ASSERT(!rehash_required(my_b->node_list.load(std::memory_order_relaxed)), nullptr);
+        }
+
+        // get bucket pointer
+        bucket *operator() () { return my_b; }
+    };
+
+    // TODO refactor to hash_base
+    void rehash_bucket( bucket *b_new, const hashcode_type hash ) {
+        __TBB_ASSERT( hash > 1, "The lowermost buckets can't be rehashed" );
+        b_new->node_list.store(reinterpret_cast<node_base*>(empty_rehashed_flag), std::memory_order_release); // mark rehashed
+        hashcode_type mask = (hashcode_type(1) << tbb::detail::log2(hash)) - 1; // get parent mask from the topmost bit
+        bucket_accessor b_old( this, hash & mask );
+
+        mask = (mask<<1) | 1; // get full mask for new bucket
+        __TBB_ASSERT( (mask&(mask+1))==0 && (hash & mask) == hash, nullptr );
+    restart:
+        node_base* prev = nullptr;
+        node_base* curr = b_old()->node_list.load(std::memory_order_acquire);
+        while (this->is_valid(curr)) {
+            hashcode_type curr_node_hash = my_hash_compare.hash(static_cast<node*>(curr)->value().first);
+
+            if ((curr_node_hash & mask) == hash) {
+                if (!b_old.is_writer()) {
+                    if (!b_old.upgrade_to_writer()) {
+                        goto restart; // node ptr can be invalid due to concurrent erase
+                    }
                 }
-
-                template <typename K>
-                node* search_bucket(const K& key, bucket* b) const {
-                    node* n = static_cast<node*>(b->node_list.load(std::memory_order_relaxed));
-                    while (this->is_valid(n) && !my_hash_compare.equal(key, n->value().first))
-                        n = static_cast<node*>(n->next);
-                    __TBB_ASSERT(!rehash_required(n), "Search can be executed only for rehashed bucket");
-                    return n;
+                node_base* next = curr->next;
+                // exclude from b_old
+                if (prev == nullptr) {
+                    b_old()->node_list.store(curr->next, std::memory_order_relaxed);
+                } else {
+                    prev->next = curr->next;
                 }
+                this->add_to_bucket(b_new, curr);
+                curr = next;
+            } else {
+                prev = curr;
+                curr = curr->next;
+            }
+        }
+    }
 
-                // bucket accessor is to find, rehash, acquire a lock, and access a bucket
-                class bucket_accessor : public bucket::scoped_type {
-                    bucket* my_b;
-
-                public:
-                    bucket_accessor(concurrent_hash_map* base, const hashcode_type h, bool writer = false) {
-                        acquire(base, h, writer);
-                    }
-                    // find a bucket by masked hashcode, optionally rehash, and acquire the lock
-                    inline void acquire(concurrent_hash_map* base, const hashcode_type h,
-                                        bool writer = false) {
-                        my_b = base->get_bucket(h);
-                        // TODO: actually, notification is unnecessary here, just hiding double-check
-                        if (rehash_required(my_b->node_list.load(std::memory_order_acquire))
-                            && bucket::scoped_type::try_acquire(my_b->mutex, /*write=*/true)) {
-                            if (rehash_required(my_b->node_list.load(std::memory_order_relaxed)))
-                                base->rehash_bucket(my_b, h);// recursive rehashing
-                        } else
-                            bucket::scoped_type::acquire(my_b->mutex, writer);
-                        __TBB_ASSERT(!rehash_required(my_b->node_list.load(std::memory_order_relaxed)),
-                                     nullptr);
-                    }
-
-                    // get bucket pointer
-                    bucket* operator()() { return my_b; }
-                };
-
-                // TODO refactor to hash_base
-                void rehash_bucket(bucket* b_new, const hashcode_type hash) {
-                    __TBB_ASSERT(hash > 1, "The lowermost buckets can't be rehashed");
-                    b_new->node_list.store(reinterpret_cast<node_base*>(empty_rehashed_flag),
-                                           std::memory_order_release);// mark rehashed
-                    hashcode_type mask
-                            = (1u << tbb::detail::log2(hash)) - 1;// get parent mask from the topmost bit
-                    bucket_accessor b_old(this, hash & mask);
-
-                    mask = (mask << 1) | 1;// get full mask for new bucket
-                    __TBB_ASSERT((mask & (mask + 1)) == 0 && (hash & mask) == hash, nullptr);
-                restart:
-                    node_base* prev = nullptr;
-                    node_base* curr = b_old()->node_list.load(std::memory_order_acquire);
-                    while (this->is_valid(curr)) {
-                        hashcode_type curr_node_hash
-                                = my_hash_compare.hash(static_cast<node*>(curr)->value().first);
-
-                        if ((curr_node_hash & mask) == hash) {
-                            if (!b_old.is_writer()) {
-                                if (!b_old.upgrade_to_writer()) {
-                                    goto restart;// node ptr can be invalid due to concurrent erase
-                                }
-                            }
-                            node_base* next = curr->next;
-                            // exclude from b_old
-                            if (prev == nullptr) {
-                                b_old()->node_list.store(curr->next, std::memory_order_relaxed);
-                            } else {
-                                prev->next = curr->next;
-                            }
-                            this->add_to_bucket(b_new, curr);
-                            curr = next;
-                        } else {
-                            prev = curr;
-                            curr = curr->next;
-                        }
-                    }
-                }
+    template <typename U>
+    using hash_compare_is_transparent = dependent_bool<comp_is_transparent<hash_compare_type>, U>;
 
-                template <typename U>
-                using hash_compare_is_transparent = dependent_bool<comp_is_transparent<hash_compare_type>, U>;
+public:
 
-            public:
-                class accessor;
-                // Combines data access, locking, and garbage collection.
-                class const_accessor : private node::scoped_type /*which derived from no_copy*/ {
+    class accessor;
+    // Combines data access, locking, and garbage collection.
+    class const_accessor : private node::scoped_type /*which derived from no_copy*/ {
 #if __TBB_PREVIEW_CONCURRENT_HASH_MAP_EXTENSIONS
-                    friend class concurrent_hash_map<Key, T, HashCompare, Allocator, MutexType>;
+        friend class concurrent_hash_map<Key,T,HashCompare,Allocator,MutexType>;
 #else
-                    friend class concurrent_hash_map<Key, T, HashCompare, Allocator>;
+        friend class concurrent_hash_map<Key,T,HashCompare,Allocator>;
 #endif
-                    friend class accessor;
-
-                public:
-                    // Type of value
-                    using value_type = const typename concurrent_hash_map::value_type;
-
-                    // True if result is empty.
-                    bool empty() const { return !my_node; }
-
-                    // Set to null
-                    void release() {
-                        if (my_node) {
-                            node::scoped_type::release();
-                            my_node = 0;
-                        }
-                    }
-
-                    // Return reference to associated value in hash table.
-                    const_reference operator*() const {
-                        __TBB_ASSERT(my_node, "attempt to dereference empty accessor");
-                        return my_node->value();
-                    }
-
-                    // Return pointer to associated value in hash table.
-                    const_pointer operator->() const { return &operator*(); }
-
-                    // Create empty result
-                    const_accessor() : my_node(nullptr) {}
-
-                    // Destroy result after releasing the underlying reference.
-                    ~const_accessor() {
-                        my_node = nullptr;// scoped lock's release() is called in its destructor
-                    }
-
-                protected:
-                    bool is_writer() { return node::scoped_type::is_writer(); }
-                    node* my_node;
-                    hashcode_type my_hash;
-                };
-
-                // Allows write access to elements and combines data access, locking, and garbage collection.
-                class accessor : public const_accessor {
-                public:
-                    // Type of value
-                    using value_type = typename concurrent_hash_map::value_type;
-
-                    // Return reference to associated value in hash table.
-                    reference operator*() const {
-                        __TBB_ASSERT(this->my_node, "attempt to dereference empty accessor");
-                        return this->my_node->value();
-                    }
-
-                    // Return pointer to associated value in hash table.
-                    pointer operator->() const { return &operator*(); }
-                };
-
-                explicit concurrent_hash_map(const hash_compare_type& compare,
-                                             const allocator_type& a = allocator_type())
-                    : base_type(a), my_hash_compare(compare) {}
-
-                concurrent_hash_map() : concurrent_hash_map(hash_compare_type()) {}
-
-                explicit concurrent_hash_map(const allocator_type& a)
-                    : concurrent_hash_map(hash_compare_type(), a) {}
-
-                // Construct empty table with n preallocated buckets. This number serves also as initial concurrency level.
-                concurrent_hash_map(size_type n, const allocator_type& a = allocator_type())
-                    : concurrent_hash_map(a) {
-                    this->reserve(n);
-                }
-
-                concurrent_hash_map(size_type n, const hash_compare_type& compare,
-                                    const allocator_type& a = allocator_type())
-                    : concurrent_hash_map(compare, a) {
-                    this->reserve(n);
-                }
-
-                // Copy constructor
-                concurrent_hash_map(const concurrent_hash_map& table)
-                    : concurrent_hash_map(node_allocator_traits::select_on_container_copy_construction(
-                            table.get_allocator())) {
-                    try_call([&] { internal_copy(table); }).on_exception([&] { this->clear(); });
-                }
-
-                concurrent_hash_map(const concurrent_hash_map& table, const allocator_type& a)
-                    : concurrent_hash_map(a) {
-                    try_call([&] { internal_copy(table); }).on_exception([&] { this->clear(); });
-                }
-
-                // Move constructor
-                concurrent_hash_map(concurrent_hash_map&& table)
-                    : concurrent_hash_map(std::move(table.get_allocator())) {
-                    this->internal_move(std::move(table));
-                }
-
-                // Move constructor
-                concurrent_hash_map(concurrent_hash_map&& table, const allocator_type& a)
-                    : concurrent_hash_map(a) {
-                    using is_equal_type = typename node_allocator_traits::is_always_equal;
-                    internal_move_construct_with_allocator(std::move(table), a, is_equal_type());
-                }
-
-                // Construction with copying iteration range and given allocator instance
-                template <typename I>
-                concurrent_hash_map(I first, I last, const allocator_type& a = allocator_type())
-                    : concurrent_hash_map(a) {
-                    try_call([&] {
-                        internal_copy(first, last, std::distance(first, last));
-                    }).on_exception([&] { this->clear(); });
-                }
-
-                template <typename I>
-                concurrent_hash_map(I first, I last, const hash_compare_type& compare,
-                                    const allocator_type& a = allocator_type())
-                    : concurrent_hash_map(compare, a) {
-                    try_call([&] {
-                        internal_copy(first, last, std::distance(first, last));
-                    }).on_exception([&] { this->clear(); });
-                }
-
-                concurrent_hash_map(std::initializer_list<value_type> il,
-                                    const hash_compare_type& compare = hash_compare_type(),
-                                    const allocator_type& a = allocator_type())
-                    : concurrent_hash_map(compare, a) {
-                    try_call([&] { internal_copy(il.begin(), il.end(), il.size()); }).on_exception([&] {
-                        this->clear();
-                    });
-                }
-
-                concurrent_hash_map(std::initializer_list<value_type> il, const allocator_type& a)
-                    : concurrent_hash_map(il, hash_compare_type(), a) {}
-
-                // Assignment
-                concurrent_hash_map& operator=(const concurrent_hash_map& table) {
-                    if (this != &table) {
-                        clear();
-                        copy_assign_allocators(this->my_allocator, table.my_allocator);
-                        internal_copy(table);
-                    }
-                    return *this;
-                }
-
-                // Move Assignment
-                concurrent_hash_map& operator=(concurrent_hash_map&& table) {
-                    if (this != &table) {
-                        using pocma_type =
-                                typename node_allocator_traits::propagate_on_container_move_assignment;
-                        using is_equal_type = typename node_allocator_traits::is_always_equal;
-                        move_assign_allocators(this->my_allocator, table.my_allocator);
-                        internal_move_assign(std::move(table),
-                                             tbb::detail::disjunction<is_equal_type, pocma_type>());
-                    }
-                    return *this;
-                }
-
-                // Assignment
-                concurrent_hash_map& operator=(std::initializer_list<value_type> il) {
-                    clear();
-                    internal_copy(il.begin(), il.end(), il.size());
-                    return *this;
-                }
-
-                // Rehashes and optionally resizes the whole table.
-                /** Useful to optimize performance before or after concurrent operations.
+        friend class accessor;
+    public:
+        // Type of value
+        using value_type = const typename concurrent_hash_map::value_type;
+
+        // True if result is empty.
+        bool empty() const { return !my_node; }
+
+        // Set to null
+        void release() {
+            if( my_node ) {
+                node::scoped_type::release();
+                my_node = nullptr;
+            }
+        }
+
+        // Return reference to associated value in hash table.
+        const_reference operator*() const {
+            __TBB_ASSERT( my_node, "attempt to dereference empty accessor" );
+            return my_node->value();
+        }
+
+        // Return pointer to associated value in hash table.
+        const_pointer operator->() const {
+            return &operator*();
+        }
+
+        // Create empty result
+        const_accessor() : my_node(nullptr), my_hash() {}
+
+        // Destroy result after releasing the underlying reference.
+        ~const_accessor() {
+            my_node = nullptr; // scoped lock's release() is called in its destructor
+        }
+    protected:
+        bool is_writer() { return node::scoped_type::is_writer(); }
+        node *my_node;
+        hashcode_type my_hash;
+    };
+
+    // Allows write access to elements and combines data access, locking, and garbage collection.
+    class accessor: public const_accessor {
+    public:
+        // Type of value
+        using value_type = typename concurrent_hash_map::value_type;
+
+        // Return reference to associated value in hash table.
+        reference operator*() const {
+            __TBB_ASSERT( this->my_node, "attempt to dereference empty accessor" );
+            return this->my_node->value();
+        }
+
+        // Return pointer to associated value in hash table.
+        pointer operator->() const {
+            return &operator*();
+        }
+    };
+
+    explicit concurrent_hash_map( const hash_compare_type& compare, const allocator_type& a = allocator_type() )
+        : base_type(a)
+        , my_hash_compare(compare)
+    {}
+
+    concurrent_hash_map() : concurrent_hash_map(hash_compare_type()) {}
+
+    explicit concurrent_hash_map( const allocator_type& a )
+        : concurrent_hash_map(hash_compare_type(), a)
+    {}
+
+    // Construct empty table with n preallocated buckets. This number serves also as initial concurrency level.
+    concurrent_hash_map( size_type n, const allocator_type &a = allocator_type() )
+        : concurrent_hash_map(a)
+    {
+        this->reserve(n);
+    }
+
+    concurrent_hash_map( size_type n, const hash_compare_type& compare, const allocator_type& a = allocator_type() )
+        : concurrent_hash_map(compare, a)
+    {
+        this->reserve(n);
+    }
+
+    // Copy constructor
+    concurrent_hash_map( const concurrent_hash_map &table )
+        : concurrent_hash_map(node_allocator_traits::select_on_container_copy_construction(table.get_allocator()))
+    {
+        try_call( [&] {
+            internal_copy(table);
+        }).on_exception( [&] {
+            this->clear();
+        });
+    }
+
+    concurrent_hash_map( const concurrent_hash_map &table, const allocator_type &a)
+        : concurrent_hash_map(a)
+    {
+        try_call( [&] {
+            internal_copy(table);
+        }).on_exception( [&] {
+            this->clear();
+        });
+    }
+
+    // Move constructor
+    concurrent_hash_map( concurrent_hash_map &&table )
+        : concurrent_hash_map(std::move(table.get_allocator()))
+    {
+        this->internal_move(std::move(table));
+    }
+
+    // Move constructor
+    concurrent_hash_map( concurrent_hash_map &&table, const allocator_type &a )
+        : concurrent_hash_map(a)
+    {
+        using is_equal_type = typename node_allocator_traits::is_always_equal;
+        internal_move_construct_with_allocator(std::move(table), a, is_equal_type());
+    }
+
+    // Construction with copying iteration range and given allocator instance
+    template <typename I>
+    concurrent_hash_map( I first, I last, const allocator_type &a = allocator_type() )
+        : concurrent_hash_map(a)
+    {
+        try_call( [&] {
+            internal_copy(first, last, std::distance(first, last));
+        }).on_exception( [&] {
+            this->clear();
+        });
+    }
+
+    template <typename I>
+    concurrent_hash_map( I first, I last, const hash_compare_type& compare, const allocator_type& a = allocator_type() )
+        : concurrent_hash_map(compare, a)
+    {
+        try_call( [&] {
+            internal_copy(first, last, std::distance(first, last));
+        }).on_exception( [&] {
+            this->clear();
+        });
+    }
+
+    concurrent_hash_map( std::initializer_list<value_type> il, const hash_compare_type& compare = hash_compare_type(), const allocator_type& a = allocator_type() )
+        : concurrent_hash_map(compare, a)
+    {
+        try_call( [&] {
+            internal_copy(il.begin(), il.end(), il.size());
+        }).on_exception( [&] {
+            this->clear();
+        });
+    }
+
+    concurrent_hash_map( std::initializer_list<value_type> il, const allocator_type& a )
+        : concurrent_hash_map(il, hash_compare_type(), a) {}
+
+    // Assignment
+    concurrent_hash_map& operator=( const concurrent_hash_map &table ) {
+        if( this != &table ) {
+            clear();
+            copy_assign_allocators(this->my_allocator, table.my_allocator);
+            internal_copy(table);
+        }
+        return *this;
+    }
+
+    // Move Assignment
+    concurrent_hash_map& operator=( concurrent_hash_map &&table ) {
+        if( this != &table ) {
+            using pocma_type = typename node_allocator_traits::propagate_on_container_move_assignment;
+            using is_equal_type = typename node_allocator_traits::is_always_equal;
+            move_assign_allocators(this->my_allocator, table.my_allocator);
+            internal_move_assign(std::move(table), tbb::detail::disjunction<is_equal_type, pocma_type>());
+        }
+        return *this;
+    }
+
+    // Assignment
+    concurrent_hash_map& operator=( std::initializer_list<value_type> il ) {
+        clear();
+        internal_copy(il.begin(), il.end(), il.size());
+        return *this;
+    }
+
+    // Rehashes and optionally resizes the whole table.
+    /** Useful to optimize performance before or after concurrent operations.
         Also enables using of find() and count() concurrent methods in serial context. */
-                void rehash(size_type sz = 0) {
-                    this->reserve(sz);// TODO: add reduction of number of buckets as well
-                    hashcode_type mask = this->my_mask.load(std::memory_order_relaxed);
-                    hashcode_type b = (mask + 1) >> 1;        // size or first index of the last segment
-                    __TBB_ASSERT((b & (b - 1)) == 0, nullptr);// zero or power of 2
-                    bucket* bp = this->get_bucket(b);// only the last segment should be scanned for rehashing
-                    for (; b <= mask; b++, bp++) {
-                        node_base* n = bp->node_list.load(std::memory_order_relaxed);
-                        __TBB_ASSERT(this->is_valid(n) || empty_rehashed(n) || rehash_required(n),
-                                     "Broken internal structure");
-                        __TBB_ASSERT(
-                                *reinterpret_cast<intptr_t*>(&bp->mutex) == 0,
-                                "concurrent or unexpectedly terminated operation during rehash() execution");
-                        if (rehash_required(
-                                    n)) {// rehash bucket, conditional because rehashing of a previous bucket may affect this one
-                            hashcode_type h = b;
-                            bucket* b_old = bp;
-                            do {
-                                __TBB_ASSERT(h > 1, "The lowermost buckets can't be rehashed");
-                                hashcode_type m = (1u << tbb::detail::log2(h))
-                                                  - 1;// get parent mask from the topmost bit
-                                b_old = this->get_bucket(h &= m);
-                            } while (rehash_required(b_old->node_list.load(std::memory_order_relaxed)));
-                            // now h - is index of the root rehashed bucket b_old
-                            this->mark_rehashed_levels(
-                                    h);// mark all non-rehashed children recursively across all segments
-                            node_base* prev = nullptr;
-                            node_base* curr = b_old->node_list.load(std::memory_order_relaxed);
-                            while (this->is_valid(curr)) {
-                                hashcode_type curr_node_hash
-                                        = my_hash_compare.hash(static_cast<node*>(curr)->value().first);
-
-                                if ((curr_node_hash & mask) != h) {// should be rehashed
-                                    node_base* next = curr->next;
-                                    // exclude from b_old
-                                    if (prev == nullptr) {
-                                        b_old->node_list.store(curr->next, std::memory_order_relaxed);
-                                    } else {
-                                        prev->next = curr->next;
-                                    }
-                                    bucket* b_new = this->get_bucket(curr_node_hash & mask);
-                                    __TBB_ASSERT(
-                                            !rehash_required(
-                                                    b_new->node_list.load(std::memory_order_relaxed)),
-                                            "hash() function changed for key in table or internal error");
-                                    this->add_to_bucket(b_new, curr);
-                                    curr = next;
-                                } else {
-                                    prev = curr;
-                                    curr = curr->next;
-                                }
-                            }
-                        }
-                    }
-                }
-
-                // Clear table
-                void clear() {
-                    hashcode_type m = this->my_mask.load(std::memory_order_relaxed);
-                    __TBB_ASSERT((m & (m + 1)) == 0, "data structure is invalid");
-                    this->my_size.store(0, std::memory_order_relaxed);
-                    segment_index_type s = this->segment_index_of(m);
-                    __TBB_ASSERT(s + 1 == this->pointers_per_table
-                                         || !this->my_table[s + 1].load(std::memory_order_relaxed),
-                                 "wrong mask or concurrent grow");
-                    do {
-                        __TBB_ASSERT(this->is_valid(this->my_table[s].load(std::memory_order_relaxed)),
-                                     "wrong mask or concurrent grow");
-                        segment_ptr_type buckets_ptr = this->my_table[s].load(std::memory_order_relaxed);
-                        size_type sz = this->segment_size(s ? s : 1);
-                        for (segment_index_type i = 0; i < sz; i++)
-                            for (node_base* n = buckets_ptr[i].node_list.load(std::memory_order_relaxed);
-                                 this->is_valid(n);
-                                 n = buckets_ptr[i].node_list.load(std::memory_order_relaxed)) {
-                                buckets_ptr[i].node_list.store(n->next, std::memory_order_relaxed);
-                                delete_node(n);
-                            }
-                        this->delete_segment(s);
-                    } while (s-- > 0);
-                    this->my_mask.store(this->embedded_buckets - 1, std::memory_order_relaxed);
-                }
-
-                // Clear table and destroy it.
-                ~concurrent_hash_map() { clear(); }
-
-                //------------------------------------------------------------------------
-                // Parallel algorithm support
-                //------------------------------------------------------------------------
-                range_type range(size_type grainsize = 1) { return range_type(*this, grainsize); }
-                const_range_type range(size_type grainsize = 1) const {
-                    return const_range_type(*this, grainsize);
-                }
-
-                //------------------------------------------------------------------------
-                // STL support - not thread-safe methods
-                //------------------------------------------------------------------------
-                iterator begin() {
-                    return iterator(*this, 0, this->my_embedded_segment,
-                                    this->my_embedded_segment->node_list.load(std::memory_order_relaxed));
-                }
-                const_iterator begin() const {
-                    return const_iterator(
-                            *this, 0, this->my_embedded_segment,
-                            this->my_embedded_segment->node_list.load(std::memory_order_relaxed));
-                }
-                const_iterator cbegin() const {
-                    return const_iterator(
-                            *this, 0, this->my_embedded_segment,
-                            this->my_embedded_segment->node_list.load(std::memory_order_relaxed));
-                }
-                iterator end() { return iterator(*this, 0, 0, 0); }
-                const_iterator end() const { return const_iterator(*this, 0, 0, 0); }
-                const_iterator cend() const { return const_iterator(*this, 0, 0, 0); }
-                std::pair<iterator, iterator> equal_range(const Key& key) {
-                    return internal_equal_range(key, end());
-                }
-                std::pair<const_iterator, const_iterator> equal_range(const Key& key) const {
-                    return internal_equal_range(key, end());
-                }
-
-#if __TBB_PREVIEW_CONCURRENT_HASH_MAP_EXTENSIONS
-                template <typename K>
-                typename std::enable_if<hash_compare_is_transparent<K>::value,
-                                        std::pair<iterator, iterator>>::type
-                equal_range(const K& key) {
-                    return internal_equal_range(key, end());
-                }
-
-                template <typename K>
-                typename std::enable_if<hash_compare_is_transparent<K>::value,
-                                        std::pair<const_iterator, const_iterator>>::type
-                equal_range(const K& key) const {
-                    return internal_equal_range(key, end());
-                }
-#endif// __TBB_PREVIEW_CONCURRENT_HASH_MAP_EXTENSIONS
-
-                // Number of items in table.
-                size_type size() const { return this->my_size.load(std::memory_order_acquire); }
-
-                // True if size()==0.
-                __TBB_nodiscard bool empty() const { return size() == 0; }
-
-                // Upper bound on size.
-                size_type max_size() const {
-                    return allocator_traits_type::max_size(base_type::get_allocator());
-                }
-
-                // Returns the current number of buckets
-                size_type bucket_count() const { return this->my_mask.load(std::memory_order_relaxed) + 1; }
-
-                // return allocator object
-                allocator_type get_allocator() const { return base_type::get_allocator(); }
-
-                // swap two instances. Iterators are invalidated
-                void swap(concurrent_hash_map& table) {
-                    using pocs_type = typename node_allocator_traits::propagate_on_container_swap;
-                    using is_equal_type = typename node_allocator_traits::is_always_equal;
-                    swap_allocators(this->my_allocator, table.my_allocator);
-                    internal_swap(table, tbb::detail::disjunction<pocs_type, is_equal_type>());
-                }
-
-                //------------------------------------------------------------------------
-                // concurrent map operations
-                //------------------------------------------------------------------------
-
-                // Return count of items (0 or 1)
-                size_type count(const Key& key) const {
-                    return const_cast<concurrent_hash_map*>(this)->lookup</*insert*/ false>(
-                            key, nullptr, nullptr, /*write=*/false, &do_not_allocate_node);
-                }
-
-#if __TBB_PREVIEW_CONCURRENT_HASH_MAP_EXTENSIONS
-                template <typename K>
-                typename std::enable_if<hash_compare_is_transparent<K>::value, size_type>::type
-                count(const K& key) const {
-                    return const_cast<concurrent_hash_map*>(this)->lookup</*insert*/ false>(
-                            key, nullptr, nullptr, /*write=*/false, &do_not_allocate_node);
-                }
-#endif// __TBB_PREVIEW_CONCURRENT_HASH_MAP_EXTENSIONS
-
-                // Find item and acquire a read lock on the item.
-                /** Return true if item is found, false otherwise. */
-                bool find(const_accessor& result, const Key& key) const {
-                    result.release();
-                    return const_cast<concurrent_hash_map*>(this)->lookup</*insert*/ false>(
-                            key, nullptr, &result, /*write=*/false, &do_not_allocate_node);
-                }
-
-                // Find item and acquire a write lock on the item.
-                /** Return true if item is found, false otherwise. */
-                bool find(accessor& result, const Key& key) {
-                    result.release();
-                    return lookup</*insert*/ false>(key, nullptr, &result, /*write=*/true,
-                                                    &do_not_allocate_node);
-                }
-
-#if __TBB_PREVIEW_CONCURRENT_HASH_MAP_EXTENSIONS
-                template <typename K>
-                typename std::enable_if<hash_compare_is_transparent<K>::value, bool>::type
-                find(const_accessor& result, const K& key) {
-                    result.release();
-                    return lookup</*insert*/ false>(key, nullptr, &result, /*write=*/false,
-                                                    &do_not_allocate_node);
-                }
-
-                template <typename K>
-                typename std::enable_if<hash_compare_is_transparent<K>::value, bool>::type
-                find(accessor& result, const K& key) {
-                    result.release();
-                    return lookup</*insert*/ false>(key, nullptr, &result, /*write=*/true,
-                                                    &do_not_allocate_node);
-                }
-#endif// __TBB_PREVIEW_CONCURRENT_HASH_MAP_EXTENSIONS
-
-                // Insert item (if not already present) and acquire a read lock on the item.
-                /** Returns true if item is new. */
-                bool insert(const_accessor& result, const Key& key) {
-                    result.release();
-                    return lookup</*insert*/ true>(key, nullptr, &result, /*write=*/false,
-                                                   &allocate_node_default_construct<>);
-                }
-
-                // Insert item (if not already present) and acquire a write lock on the item.
-                /** Returns true if item is new. */
-                bool insert(accessor& result, const Key& key) {
-                    result.release();
-                    return lookup</*insert*/ true>(key, nullptr, &result, /*write=*/true,
-                                                   &allocate_node_default_construct<>);
-                }
-
-#if __TBB_PREVIEW_CONCURRENT_HASH_MAP_EXTENSIONS
-                template <typename K>
-                typename std::enable_if<hash_compare_is_transparent<K>::value
-                                                && std::is_constructible<key_type, const K&>::value,
-                                        bool>::type
-                insert(const_accessor& result, const K& key) {
-                    result.release();
-                    return lookup</*insert*/ true>(key, nullptr, &result, /*write=*/true,
-                                                   &allocate_node_default_construct<K>);
-                }
-
-                template <typename K>
-                typename std::enable_if<hash_compare_is_transparent<K>::value
-                                                && std::is_constructible<key_type, const K&>::value,
-                                        bool>::type
-                insert(accessor& result, const K& key) {
-                    result.release();
-                    return lookup</*insert*/ true>(key, nullptr, &result, /*write=*/true,
-                                                   &allocate_node_default_construct<K>);
-                }
-#endif// __TBB_PREVIEW_CONCURRENT_HASH_MAP_EXTENSIONS
-
-                // Insert item by copying if there is no such key present already and acquire a read lock on the item.
-                /** Returns true if item is new. */
-                bool insert(const_accessor& result, const value_type& value) {
-                    result.release();
-                    return lookup</*insert*/ true>(value.first, &value.second, &result, /*write=*/false,
-                                                   &allocate_node_copy_construct);
-                }
-
-                // Insert item by copying if there is no such key present already and acquire a write lock on the item.
-                /** Returns true if item is new. */
-                bool insert(accessor& result, const value_type& value) {
-                    result.release();
-                    return lookup</*insert*/ true>(value.first, &value.second, &result, /*write=*/true,
-                                                   &allocate_node_copy_construct);
-                }
-
-                // Insert item by copying if there is no such key present already
-                /** Returns true if item is inserted. */
-                bool insert(const value_type& value) {
-                    return lookup</*insert*/ true>(value.first, &value.second, nullptr, /*write=*/false,
-                                                   &allocate_node_copy_construct);
-                }
-
-                // Insert item by copying if there is no such key present already and acquire a read lock on the item.
-                /** Returns true if item is new. */
-                bool insert(const_accessor& result, value_type&& value) {
-                    return generic_move_insert(result, std::move(value));
-                }
-
-                // Insert item by copying if there is no such key present already and acquire a write lock on the item.
-                /** Returns true if item is new. */
-                bool insert(accessor& result, value_type&& value) {
-                    return generic_move_insert(result, std::move(value));
-                }
-
-                // Insert item by copying if there is no such key present already
-                /** Returns true if item is inserted. */
-                bool insert(value_type&& value) {
-                    return generic_move_insert(accessor_not_used(), std::move(value));
-                }
-
-                // Insert item by copying if there is no such key present already and acquire a read lock on the item.
-                /** Returns true if item is new. */
-                template <typename... Args>
-                bool emplace(const_accessor& result, Args&&... args) {
-                    return generic_emplace(result, std::forward<Args>(args)...);
-                }
-
-                // Insert item by copying if there is no such key present already and acquire a write lock on the item.
-                /** Returns true if item is new. */
-                template <typename... Args>
-                bool emplace(accessor& result, Args&&... args) {
-                    return generic_emplace(result, std::forward<Args>(args)...);
-                }
-
-                // Insert item by copying if there is no such key present already
-                /** Returns true if item is inserted. */
-                template <typename... Args>
-                bool emplace(Args&&... args) {
-                    return generic_emplace(accessor_not_used(), std::forward<Args>(args)...);
-                }
-
-                // Insert range [first, last)
-                template <typename I>
-                void insert(I first, I last) {
-                    for (; first != last; ++first) insert(*first);
-                }
-
-                // Insert initializer list
-                void insert(std::initializer_list<value_type> il) { insert(il.begin(), il.end()); }
-
-                // Erase item.
-                /** Return true if item was erased by particularly this call. */
-                bool erase(const Key& key) { return internal_erase(key); }
-
-#if __TBB_PREVIEW_CONCURRENT_HASH_MAP_EXTENSIONS
-                template <typename K>
-                typename std::enable_if<hash_compare_is_transparent<K>::value, bool>::type
-                erase(const K& key) {
-                    return internal_erase(key);
-                }
-#endif// __TBB_PREVIEW_CONCURRENT_HASH_MAP_EXTENSIONS
-
-                // Erase item by const_accessor.
-                /** Return true if item was erased by particularly this call. */
-                bool erase(const_accessor& item_accessor) { return exclude(item_accessor); }
-
-                // Erase item by accessor.
-                /** Return true if item was erased by particularly this call. */
-                bool erase(accessor& item_accessor) { return exclude(item_accessor); }
-
-            protected:
-                template <typename K, typename AllocateNodeType>
-                node* allocate_node_helper(const K& key, const T* t, AllocateNodeType allocate_node,
-                                           std::true_type) {
-                    return allocate_node(base_type::get_allocator(), key, t);
-                }
-
-                template <typename K, typename AllocateNodeType>
-                node* allocate_node_helper(const K&, const T*, AllocateNodeType, std::false_type) {
-                    __TBB_ASSERT(false, "allocate_node_helper with std::false_type should never been called");
-                    return nullptr;
-                }
-
-                // Insert or find item and optionally acquire a lock on the item.
-                template <bool OpInsert, typename K, typename AllocateNodeType>
-                bool lookup(const K& key, const T* t, const_accessor* result, bool write,
-                            AllocateNodeType allocate_node, node* tmp_n = 0) {
-                    __TBB_ASSERT(!result || !result->my_node, nullptr);
-                    bool return_value;
-                    hashcode_type const h = my_hash_compare.hash(key);
-                    hashcode_type m = this->my_mask.load(std::memory_order_acquire);
-                    segment_index_type grow_segment = 0;
-                    node* n;
-                restart : {//lock scope
-                    __TBB_ASSERT((m & (m + 1)) == 0, "data structure is invalid");
-                    return_value = false;
-                    // get bucket
-                    bucket_accessor b(this, h & m);
-                    // find a node
-                    n = search_bucket(key, b());
-                    if (OpInsert) {
-                        // [opt] insert a key
-                        if (!n) {
-                            if (!tmp_n) {
-                                tmp_n = allocate_node_helper(key, t, allocate_node,
-                                                             std::integral_constant<bool, OpInsert> {});
-                            }
-                            while (!b.is_writer() && !b.upgrade_to_writer()) {// TODO: improved insertion
-                                // Rerun search list, in case another thread inserted the intem during the upgrade
-                                n = search_bucket(key, b());
-                                if (this->is_valid(n)) {// unfortunately, it did
-                                    if (!b.downgrade_to_reader()) {
-                                        // If the lock was downgraded with reacquiring the mutex
-                                        // Rerun search list in case another thread removed the item during the downgrade
-                                        n = search_bucket(key, b());
-                                        if (!this->is_valid(n)) {
-                                            // Unfortunately, it did
-                                            // We need to try upgrading to writer again
-                                            continue;
-                                        }
-                                    }
-                                    goto exists;
-                                }
-                            }
-
-                            if (this->check_mask_race(h, m)) goto restart;// b.release() is done in ~b().
-                            // insert and set flag to grow the container
-                            grow_segment = this->insert_new_node(b(), n = tmp_n, m);
-                            tmp_n = 0;
-                            return_value = true;
-                        }
-                    } else {// find or count
-                        if (!n) {
-                            if (this->check_mask_race(h, m))
-                                goto restart;// b.release() is done in ~b(). TODO: replace by continue
-                            return false;
-                        }
-                        return_value = true;
-                    }
-                exists:
-                    if (!result) goto check_growth;
-                    // TODO: the following seems as generic/regular operation
-                    // acquire the item
-                    if (!result->try_acquire(n->mutex, write)) {
-                        for (tbb::detail::atomic_backoff backoff(true);;) {
-                            if (result->try_acquire(n->mutex, write)) break;
-                            if (!backoff.bounded_pause()) {
-                                // the wait takes really long, restart the operation
-                                b.release();
-                                __TBB_ASSERT(!OpInsert || !return_value,
-                                             "Can't acquire new item in locked bucket?");
-                                yield();
-                                m = this->my_mask.load(std::memory_order_acquire);
-                                goto restart;
-                            }
-                        }
-                    }
-                }//lock scope
-                    result->my_node = n;
-                    result->my_hash = h;
-                check_growth:
-                    // [opt] grow the container
-                    if (grow_segment) { this->enable_segment(grow_segment); }
-                    if (tmp_n)// if OpInsert only
-                        delete_node(tmp_n);
-                    return return_value;
-                }
-
-                struct accessor_not_used {
-                    void release() {}
-                };
-                friend const_accessor* accessor_location(accessor_not_used const&) { return nullptr; }
-                friend const_accessor* accessor_location(const_accessor& a) { return &a; }
-
-                friend bool is_write_access_needed(accessor const&) { return true; }
-                friend bool is_write_access_needed(const_accessor const&) { return false; }
-                friend bool is_write_access_needed(accessor_not_used const&) { return false; }
-
-                template <typename Accessor>
-                bool generic_move_insert(Accessor&& result, value_type&& value) {
-                    result.release();
-                    return lookup</*insert*/ true>(value.first, &value.second, accessor_location(result),
-                                                   is_write_access_needed(result),
-                                                   &allocate_node_move_construct);
-                }
-
-                template <typename Accessor, typename... Args>
-                bool generic_emplace(Accessor&& result, Args&&... args) {
-                    result.release();
-                    node* node_ptr = create_node(base_type::get_allocator(), std::forward<Args>(args)...);
-                    return lookup</*insert*/ true>(node_ptr->value().first, nullptr,
-                                                   accessor_location(result), is_write_access_needed(result),
-                                                   &do_not_allocate_node, node_ptr);
-                }
-
-                // delete item by accessor
-                bool exclude(const_accessor& item_accessor) {
-                    __TBB_ASSERT(item_accessor.my_node, nullptr);
-                    node_base* const exclude_node = item_accessor.my_node;
-                    hashcode_type const hash = item_accessor.my_hash;
-                    hashcode_type mask = this->my_mask.load(std::memory_order_acquire);
-                    do {
-                        // get bucket
-                        bucket_accessor b(this, hash & mask, /*writer=*/true);
-                        node_base* prev = nullptr;
-                        node_base* curr = b()->node_list.load(std::memory_order_relaxed);
-
-                        while (curr && curr != exclude_node) {
-                            prev = curr;
-                            curr = curr->next;
-                        }
-
-                        if (curr == nullptr) {// someone else was first
-                            if (this->check_mask_race(hash, mask)) continue;
-                            item_accessor.release();
-                            return false;
-                        }
-                        __TBB_ASSERT(curr == exclude_node, nullptr);
-                        // remove from container
+    void rehash(size_type sz = 0) {
+        this->reserve(sz); // TODO: add reduction of number of buckets as well
+        hashcode_type mask = this->my_mask.load(std::memory_order_relaxed);
+        hashcode_type b = (mask+1)>>1; // size or first index of the last segment
+        __TBB_ASSERT((b&(b-1))==0, nullptr); // zero or power of 2
+        bucket *bp = this->get_bucket( b ); // only the last segment should be scanned for rehashing
+        for(; b <= mask; b++, bp++ ) {
+            node_base *n = bp->node_list.load(std::memory_order_relaxed);
+            __TBB_ASSERT( this->is_valid(n) || empty_rehashed(n) || rehash_required(n), "Broken internal structure" );
+            __TBB_ASSERT( *reinterpret_cast<intptr_t*>(&bp->mutex) == 0, "concurrent or unexpectedly terminated operation during rehash() execution" );
+            if (rehash_required(n)) { // rehash bucket, conditional because rehashing of a previous bucket may affect this one
+                hashcode_type h = b; bucket *b_old = bp;
+                do {
+                    __TBB_ASSERT( h > 1, "The lowermost buckets can't be rehashed" );
+                    hashcode_type m = ( hashcode_type(1) << tbb::detail::log2( h ) ) - 1; // get parent mask from the topmost bit
+                    b_old = this->get_bucket( h &= m );
+                } while( rehash_required(b_old->node_list.load(std::memory_order_relaxed)) );
+                // now h - is index of the root rehashed bucket b_old
+                this->mark_rehashed_levels( h ); // mark all non-rehashed children recursively across all segments
+                node_base* prev = nullptr;
+                node_base* curr = b_old->node_list.load(std::memory_order_relaxed);
+                while (this->is_valid(curr)) {
+                    hashcode_type curr_node_hash = my_hash_compare.hash(static_cast<node*>(curr)->value().first);
+
+                    if ((curr_node_hash & mask) != h) { // should be rehashed
+                        node_base* next = curr->next;
+                        // exclude from b_old
                         if (prev == nullptr) {
-                            b()->node_list.store(curr->next, std::memory_order_relaxed);
+                            b_old->node_list.store(curr->next, std::memory_order_relaxed);
                         } else {
                             prev->next = curr->next;
                         }
-
-                        this->my_size--;
-                        break;
-                    } while (true);
-                    if (!item_accessor.is_writer()) {     // need to get exclusive lock
-                        item_accessor.upgrade_to_writer();// return value means nothing here
-                    }
-
-                    item_accessor.release();
-                    delete_node(exclude_node);// Only one thread can delete it
-                    return true;
-                }
-
-                template <typename K>
-                bool internal_erase(const K& key) {
-                    node_base* erase_node;
-                    hashcode_type const hash = my_hash_compare.hash(key);
-                    hashcode_type mask = this->my_mask.load(std::memory_order_acquire);
-                restart : {//lock scope
-                    // get bucket
-                    bucket_accessor b(this, hash & mask);
-                search:
-                    node_base* prev = nullptr;
-                    erase_node = b()->node_list.load(std::memory_order_relaxed);
-                    while (this->is_valid(erase_node)
-                           && !my_hash_compare.equal(key, static_cast<node*>(erase_node)->value().first)) {
-                        prev = erase_node;
-                        erase_node = erase_node->next;
-                    }
-
-                    if (erase_node == nullptr) {// not found, but mask could be changed
-                        if (this->check_mask_race(hash, mask)) goto restart;
-                        return false;
-                    } else if (!b.is_writer() && !b.upgrade_to_writer()) {
-                        if (this->check_mask_race(hash, mask))// contended upgrade, check mask
-                            goto restart;
-                        goto search;
-                    }
-
-                    // remove from container
-                    if (prev == nullptr) {
-                        b()->node_list.store(erase_node->next, std::memory_order_relaxed);
+                        bucket *b_new = this->get_bucket(curr_node_hash & mask);
+                        __TBB_ASSERT(!rehash_required(b_new->node_list.load(std::memory_order_relaxed)), "hash() function changed for key in table or internal error");
+                        this->add_to_bucket(b_new, curr);
+                        curr = next;
                     } else {
-                        prev->next = erase_node->next;
+                        prev = curr;
+                        curr = curr->next;
                     }
-                    this->my_size--;
-                }
-                    { typename node::scoped_type item_locker(erase_node->mutex, /*write=*/true); }
-                    // note: there should be no threads pretending to acquire this mutex again, do not try to upgrade const_accessor!
-                    delete_node(erase_node);// Only one thread can delete it due to write lock on the bucket
-                    return true;
                 }
-
-                // Returns an iterator for an item defined by the key, or for the next item after it (if upper==true)
-                template <typename K, typename I>
-                std::pair<I, I> internal_equal_range(const K& key, I end_) const {
-                    hashcode_type h = my_hash_compare.hash(key);
-                    hashcode_type m = this->my_mask.load(std::memory_order_relaxed);
-                    __TBB_ASSERT((m & (m + 1)) == 0, "data structure is invalid");
-                    h &= m;
-                    bucket* b = this->get_bucket(h);
-                    while (rehash_required(b->node_list.load(std::memory_order_relaxed))) {
-                        m = (1u << tbb::detail::log2(h)) - 1;// get parent mask from the topmost bit
-                        b = this->get_bucket(h &= m);
+            }
+        }
+    }
+
+    // Clear table
+    void clear() {
+        hashcode_type m = this->my_mask.load(std::memory_order_relaxed);
+        __TBB_ASSERT((m&(m+1))==0, "data structure is invalid");
+        this->my_size.store(0, std::memory_order_relaxed);
+        segment_index_type s = this->segment_index_of( m );
+        __TBB_ASSERT( s+1 == this->pointers_per_table || !this->my_table[s+1].load(std::memory_order_relaxed), "wrong mask or concurrent grow" );
+        do {
+            __TBB_ASSERT(this->is_valid(this->my_table[s].load(std::memory_order_relaxed)), "wrong mask or concurrent grow" );
+            segment_ptr_type buckets_ptr = this->my_table[s].load(std::memory_order_relaxed);
+            size_type sz = this->segment_size( s ? s : 1 );
+            for( segment_index_type i = 0; i < sz; i++ )
+                for( node_base *n = buckets_ptr[i].node_list.load(std::memory_order_relaxed);
+                    this->is_valid(n); n = buckets_ptr[i].node_list.load(std::memory_order_relaxed) )
+                {
+                    buckets_ptr[i].node_list.store(n->next, std::memory_order_relaxed);
+                    delete_node( n );
+                }
+            this->delete_segment(s);
+        } while(s-- > 0);
+        this->my_mask.store(this->embedded_buckets - 1, std::memory_order_relaxed);
+    }
+
+    // Clear table and destroy it.
+    ~concurrent_hash_map() { clear(); }
+
+    //------------------------------------------------------------------------
+    // Parallel algorithm support
+    //------------------------------------------------------------------------
+    range_type range( size_type grainsize=1 ) {
+        return range_type( *this, grainsize );
+    }
+    const_range_type range( size_type grainsize=1 ) const {
+        return const_range_type( *this, grainsize );
+    }
+
+    //------------------------------------------------------------------------
+    // STL support - not thread-safe methods
+    //------------------------------------------------------------------------
+    iterator begin() { return iterator( *this, 0, this->my_embedded_segment, this->my_embedded_segment->node_list.load(std::memory_order_relaxed) ); }
+    const_iterator begin() const { return const_iterator( *this, 0, this->my_embedded_segment, this->my_embedded_segment->node_list.load(std::memory_order_relaxed) ); }
+    const_iterator cbegin() const { return const_iterator( *this, 0, this->my_embedded_segment, this->my_embedded_segment->node_list.load(std::memory_order_relaxed) ); }
+    iterator end() { return iterator( *this, 0, nullptr, nullptr ); }
+    const_iterator end() const { return const_iterator( *this, 0, nullptr, nullptr ); }
+    const_iterator cend() const { return const_iterator( *this, 0, nullptr, nullptr ); }
+    std::pair<iterator, iterator> equal_range( const Key& key ) { return internal_equal_range( key, end() ); }
+    std::pair<const_iterator, const_iterator> equal_range( const Key& key ) const { return internal_equal_range( key, end() ); }
+
+    template <typename K>
+    typename std::enable_if<hash_compare_is_transparent<K>::value,
+                            std::pair<iterator, iterator>>::type equal_range( const K& key ) {
+        return internal_equal_range(key, end());
+    }
+
+    template <typename K>
+    typename std::enable_if<hash_compare_is_transparent<K>::value,
+                            std::pair<const_iterator, const_iterator>>::type equal_range( const K& key ) const {
+        return internal_equal_range(key, end());
+    }
+
+    // Number of items in table.
+    size_type size() const { return this->my_size.load(std::memory_order_acquire); }
+
+    // True if size()==0.
+    __TBB_nodiscard bool empty() const { return size() == 0; }
+
+    // Upper bound on size.
+    size_type max_size() const {
+        return allocator_traits_type::max_size(base_type::get_allocator());
+    }
+
+    // Returns the current number of buckets
+    size_type bucket_count() const { return this->my_mask.load(std::memory_order_relaxed) + 1; }
+
+    // return allocator object
+    allocator_type get_allocator() const { return base_type::get_allocator(); }
+
+    // swap two instances. Iterators are invalidated
+    void swap(concurrent_hash_map& table) {
+        using pocs_type = typename node_allocator_traits::propagate_on_container_swap;
+        using is_equal_type = typename node_allocator_traits::is_always_equal;
+        swap_allocators(this->my_allocator, table.my_allocator);
+        internal_swap(table, tbb::detail::disjunction<pocs_type, is_equal_type>());
+    }
+
+    //------------------------------------------------------------------------
+    // concurrent map operations
+    //------------------------------------------------------------------------
+
+    // Return count of items (0 or 1)
+    size_type count( const Key &key ) const {
+        return const_cast<concurrent_hash_map*>(this)->lookup</*insert*/false>(key, nullptr, nullptr, /*write=*/false, &do_not_allocate_node);
+    }
+
+    template <typename K>
+    typename std::enable_if<hash_compare_is_transparent<K>::value,
+                            size_type>::type count( const K& key ) const {
+        return const_cast<concurrent_hash_map*>(this)->lookup</*insert*/false>(key, nullptr, nullptr, /*write=*/false, &do_not_allocate_node);
+    }
+
+    // Find item and acquire a read lock on the item.
+    /** Return true if item is found, false otherwise. */
+    bool find( const_accessor &result, const Key &key ) const {
+        result.release();
+        return const_cast<concurrent_hash_map*>(this)->lookup</*insert*/false>(key, nullptr, &result, /*write=*/false, &do_not_allocate_node );
+    }
+
+    // Find item and acquire a write lock on the item.
+    /** Return true if item is found, false otherwise. */
+    bool find( accessor &result, const Key &key ) {
+        result.release();
+        return lookup</*insert*/false>(key, nullptr, &result, /*write=*/true, &do_not_allocate_node);
+    }
+
+    template <typename K>
+    typename std::enable_if<hash_compare_is_transparent<K>::value,
+                            bool>::type find( const_accessor& result, const K& key ) {
+        result.release();
+        return lookup</*insert*/false>(key, nullptr, &result, /*write=*/false, &do_not_allocate_node);
+    }
+
+    template <typename K>
+    typename std::enable_if<hash_compare_is_transparent<K>::value,
+                            bool>::type find( accessor& result, const K& key ) {
+        result.release();
+        return lookup</*insert*/false>(key, nullptr, &result, /*write=*/true, &do_not_allocate_node);
+    }
+
+    // Insert item (if not already present) and acquire a read lock on the item.
+    /** Returns true if item is new. */
+    bool insert( const_accessor &result, const Key &key ) {
+        result.release();
+        return lookup</*insert*/true>(key, nullptr, &result, /*write=*/false, &allocate_node_default_construct<>);
+    }
+
+    // Insert item (if not already present) and acquire a write lock on the item.
+    /** Returns true if item is new. */
+    bool insert( accessor &result, const Key &key ) {
+        result.release();
+        return lookup</*insert*/true>(key, nullptr, &result, /*write=*/true, &allocate_node_default_construct<>);
+    }
+
+    template <typename K>
+    typename std::enable_if<hash_compare_is_transparent<K>::value &&
+                            std::is_constructible<key_type, const K&>::value,
+                            bool>::type insert( const_accessor& result, const K& key ) {
+        result.release();
+        return lookup</*insert*/true>(key, nullptr, &result, /*write=*/false, &allocate_node_default_construct<K>);
+    }
+
+    template <typename K>
+    typename std::enable_if<hash_compare_is_transparent<K>::value &&
+                            std::is_constructible<key_type, const K&>::value,
+                            bool>::type insert( accessor& result, const K& key ) {
+        result.release();
+        return lookup</*insert*/true>(key, nullptr, &result, /*write=*/true, &allocate_node_default_construct<K>);
+    }
+
+    // Insert item by copying if there is no such key present already and acquire a read lock on the item.
+    /** Returns true if item is new. */
+    bool insert( const_accessor &result, const value_type &value ) {
+        result.release();
+        return lookup</*insert*/true>(value.first, &value.second, &result, /*write=*/false, &allocate_node_copy_construct);
+    }
+
+    // Insert item by copying if there is no such key present already and acquire a write lock on the item.
+    /** Returns true if item is new. */
+    bool insert( accessor &result, const value_type &value ) {
+        result.release();
+        return lookup</*insert*/true>(value.first, &value.second, &result, /*write=*/true, &allocate_node_copy_construct);
+    }
+
+    // Insert item by copying if there is no such key present already
+    /** Returns true if item is inserted. */
+    bool insert( const value_type &value ) {
+        return lookup</*insert*/true>(value.first, &value.second, nullptr, /*write=*/false, &allocate_node_copy_construct);
+    }
+
+    // Insert item by copying if there is no such key present already and acquire a read lock on the item.
+    /** Returns true if item is new. */
+    bool insert( const_accessor &result, value_type && value ) {
+        return generic_move_insert(result, std::move(value));
+    }
+
+    // Insert item by copying if there is no such key present already and acquire a write lock on the item.
+    /** Returns true if item is new. */
+    bool insert( accessor &result, value_type && value ) {
+        return generic_move_insert(result, std::move(value));
+    }
+
+    // Insert item by copying if there is no such key present already
+    /** Returns true if item is inserted. */
+    bool insert( value_type && value ) {
+        return generic_move_insert(accessor_not_used(), std::move(value));
+    }
+
+    // Insert item by copying if there is no such key present already and acquire a read lock on the item.
+    /** Returns true if item is new. */
+    template <typename... Args>
+    bool emplace( const_accessor &result, Args&&... args ) {
+        return generic_emplace(result, std::forward<Args>(args)...);
+    }
+
+    // Insert item by copying if there is no such key present already and acquire a write lock on the item.
+    /** Returns true if item is new. */
+    template <typename... Args>
+    bool emplace( accessor &result, Args&&... args ) {
+        return generic_emplace(result, std::forward<Args>(args)...);
+    }
+
+    // Insert item by copying if there is no such key present already
+    /** Returns true if item is inserted. */
+    template <typename... Args>
+    bool emplace( Args&&... args ) {
+        return generic_emplace(accessor_not_used(), std::forward<Args>(args)...);
+    }
+
+    // Insert range [first, last)
+    template <typename I>
+    void insert( I first, I last ) {
+        for ( ; first != last; ++first )
+            insert( *first );
+    }
+
+    // Insert initializer list
+    void insert( std::initializer_list<value_type> il ) {
+        insert( il.begin(), il.end() );
+    }
+
+    // Erase item.
+    /** Return true if item was erased by particularly this call. */
+    bool erase( const Key &key ) {
+        return internal_erase(key);
+    }
+
+    template <typename K>
+    typename std::enable_if<hash_compare_is_transparent<K>::value,
+                            bool>::type erase( const K& key ) {
+        return internal_erase(key);
+    }
+
+    // Erase item by const_accessor.
+    /** Return true if item was erased by particularly this call. */
+    bool erase( const_accessor& item_accessor ) {
+        return exclude( item_accessor );
+    }
+
+    // Erase item by accessor.
+    /** Return true if item was erased by particularly this call. */
+    bool erase( accessor& item_accessor ) {
+        return exclude( item_accessor );
+    }
+
+protected:
+    template <typename K, typename AllocateNodeType>
+    node* allocate_node_helper( const K& key, const T* t, AllocateNodeType allocate_node, std::true_type ) {
+        return allocate_node(base_type::get_allocator(), key, t);
+    }
+
+    template <typename K, typename AllocateNodeType>
+    node* allocate_node_helper( const K&, const T*, AllocateNodeType, std::false_type ) {
+        __TBB_ASSERT(false, "allocate_node_helper with std::false_type should never been called");
+        return nullptr;
+    }
+
+    // Insert or find item and optionally acquire a lock on the item.
+    template <bool OpInsert, typename K, typename AllocateNodeType>
+    bool lookup( const K &key, const T *t, const_accessor *result, bool write, AllocateNodeType allocate_node, node *tmp_n  = nullptr)
+    {
+        __TBB_ASSERT( !result || !result->my_node, nullptr );
+        bool return_value;
+        hashcode_type const h = my_hash_compare.hash( key );
+        hashcode_type m = this->my_mask.load(std::memory_order_acquire);
+        segment_index_type grow_segment = 0;
+        node *n;
+        restart:
+        {//lock scope
+            __TBB_ASSERT((m&(m+1))==0, "data structure is invalid");
+            return_value = false;
+            // get bucket
+            bucket_accessor b( this, h & m );
+            // find a node
+            n = search_bucket( key, b() );
+            if( OpInsert ) {
+                // [opt] insert a key
+                if( !n ) {
+                    if( !tmp_n ) {
+                        tmp_n = allocate_node_helper(key, t, allocate_node, std::integral_constant<bool, OpInsert>{});
                     }
-                    node* n = search_bucket(key, b);
-                    if (!n) return std::make_pair(end_, end_);
-                    iterator lower(*this, h, b, n), upper(lower);
-                    return std::make_pair(lower, ++upper);
-                }
-
-                // Copy "source" to *this, where *this must start out empty.
-                void internal_copy(const concurrent_hash_map& source) {
-                    hashcode_type mask = source.my_mask.load(std::memory_order_relaxed);
-                    if (this->my_mask.load(std::memory_order_relaxed) == mask) {      // optimized version
-                        this->reserve(source.my_size.load(std::memory_order_relaxed));// TODO: load_factor?
-                        bucket *dst = 0, *src = 0;
-                        bool rehashing_required = false;
-                        for (hashcode_type k = 0; k <= mask; k++) {
-                            if (k & (k - 2)) ++dst, src++;// not the beginning of a segment
-                            else {
-                                dst = this->get_bucket(k);
-                                src = source.get_bucket(k);
-                            }
-                            __TBB_ASSERT(!rehash_required(dst->node_list.load(std::memory_order_relaxed)),
-                                         "Invalid bucket in destination table");
-                            node* n = static_cast<node*>(src->node_list.load(std::memory_order_relaxed));
-                            if (rehash_required(n)) {// source is not rehashed, items are in previous buckets
-                                rehashing_required = true;
-                                dst->node_list.store(reinterpret_cast<node_base*>(rehash_req_flag),
-                                                     std::memory_order_relaxed);
-                            } else
-                                for (; n; n = static_cast<node*>(n->next)) {
-                                    node* node_ptr = create_node(base_type::get_allocator(), n->value().first,
-                                                                 n->value().second);
-                                    this->add_to_bucket(dst, node_ptr);
-                                    this->my_size.fetch_add(1, std::memory_order_relaxed);
+                    while ( !b.is_writer() && !b.upgrade_to_writer() ) { // TODO: improved insertion
+                        // Rerun search list, in case another thread inserted the intem during the upgrade
+                        n = search_bucket(key, b());
+                        if (this->is_valid(n)) { // unfortunately, it did
+                            if (!b.downgrade_to_reader()) {
+                                // If the lock was downgraded with reacquiring the mutex
+                                // Rerun search list in case another thread removed the item during the downgrade
+                                n = search_bucket(key, b());
+                                if (!this->is_valid(n)) {
+                                    // Unfortunately, it did
+                                    // We need to try upgrading to writer again
+                                    continue;
                                 }
+                            }
+                            goto exists;
                         }
-                        if (rehashing_required) rehash();
-                    } else
-                        internal_copy(source.begin(), source.end(),
-                                      source.my_size.load(std::memory_order_relaxed));
-                }
-
-                template <typename I>
-                void internal_copy(I first, I last, size_type reserve_size) {
-                    this->reserve(reserve_size);// TODO: load_factor?
-                    hashcode_type m = this->my_mask.load(std::memory_order_relaxed);
-                    for (; first != last; ++first) {
-                        hashcode_type h = my_hash_compare.hash((*first).first);
-                        bucket* b = this->get_bucket(h & m);
-                        __TBB_ASSERT(!rehash_required(b->node_list.load(std::memory_order_relaxed)),
-                                     "Invalid bucket in destination table");
-                        node* node_ptr
-                                = create_node(base_type::get_allocator(), (*first).first, (*first).second);
-                        this->add_to_bucket(b, node_ptr);
-                        ++this->my_size;// TODO: replace by non-atomic op
                     }
-                }
 
-                void internal_move_construct_with_allocator(concurrent_hash_map&& other,
-                                                            const allocator_type&,
-                                                            /*is_always_equal=*/std::true_type) {
-                    this->internal_move(std::move(other));
+                    if( this->check_mask_race(h, m) )
+                        goto restart; // b.release() is done in ~b().
+                    // insert and set flag to grow the container
+                    grow_segment = this->insert_new_node( b(), n = tmp_n, m );
+                    tmp_n = nullptr;
+                    return_value = true;
+                }
+            } else { // find or count
+                if( !n ) {
+                    if( this->check_mask_race( h, m ) )
+                        goto restart; // b.release() is done in ~b(). TODO: replace by continue
+                    return false;
                 }
-
-                void internal_move_construct_with_allocator(concurrent_hash_map&& other,
-                                                            const allocator_type& a,
-                                                            /*is_always_equal=*/std::false_type) {
-                    if (a == other.get_allocator()) {
-                        this->internal_move(std::move(other));
-                    } else {
-                        try_call([&] {
-                            internal_copy(std::make_move_iterator(other.begin()),
-                                          std::make_move_iterator(other.end()), other.size());
-                        }).on_exception([&] { this->clear(); });
+                return_value = true;
+            }
+        exists:
+            if( !result ) goto check_growth;
+            // TODO: the following seems as generic/regular operation
+            // acquire the item
+            if( !result->try_acquire( n->mutex, write ) ) {
+                for( tbb::detail::atomic_backoff backoff(true);; ) {
+                    if( result->try_acquire( n->mutex, write ) ) break;
+                    if( !backoff.bounded_pause() ) {
+                        // the wait takes really long, restart the operation
+                        b.release();
+                        __TBB_ASSERT( !OpInsert || !return_value, "Can't acquire new item in locked bucket?" );
+                        yield();
+                        m = this->my_mask.load(std::memory_order_acquire);
+                        goto restart;
                     }
                 }
+            }
+        }//lock scope
+        result->my_node = n;
+        result->my_hash = h;
+    check_growth:
+        // [opt] grow the container
+        if( grow_segment ) {
+            this->enable_segment( grow_segment );
+        }
+        if( tmp_n ) // if OpInsert only
+            delete_node( tmp_n );
+        return return_value;
+    }
+
+    struct accessor_not_used { void release(){}};
+    friend const_accessor* accessor_location( accessor_not_used const& ){ return nullptr;}
+    friend const_accessor* accessor_location( const_accessor & a )      { return &a;}
+
+    friend bool is_write_access_needed( accessor const& )           { return true;}
+    friend bool is_write_access_needed( const_accessor const& )     { return false;}
+    friend bool is_write_access_needed( accessor_not_used const& )  { return false;}
+
+    template <typename Accessor>
+    bool generic_move_insert( Accessor && result, value_type && value ) {
+        result.release();
+        return lookup</*insert*/true>(value.first, &value.second, accessor_location(result), is_write_access_needed(result), &allocate_node_move_construct);
+    }
+
+    template <typename Accessor, typename... Args>
+    bool generic_emplace( Accessor && result, Args &&... args ) {
+        result.release();
+        node * node_ptr = create_node(base_type::get_allocator(), std::forward<Args>(args)...);
+        return lookup</*insert*/true>(node_ptr->value().first, nullptr, accessor_location(result), is_write_access_needed(result), &do_not_allocate_node, node_ptr);
+    }
+
+    // delete item by accessor
+    bool exclude( const_accessor &item_accessor ) {
+        __TBB_ASSERT( item_accessor.my_node, nullptr );
+        node_base *const exclude_node = item_accessor.my_node;
+        hashcode_type const hash = item_accessor.my_hash;
+        hashcode_type mask = this->my_mask.load(std::memory_order_acquire);
+        do {
+            // get bucket
+            bucket_accessor b( this, hash & mask, /*writer=*/true );
+            node_base* prev = nullptr;
+            node_base* curr = b()->node_list.load(std::memory_order_relaxed);
+
+            while (curr && curr != exclude_node) {
+                prev = curr;
+                curr = curr->next;
+            }
 
-                void internal_move_assign(concurrent_hash_map&& other,
-                                          /*is_always_equal || POCMA = */ std::true_type) {
-                    this->internal_move(std::move(other));
-                }
+            if (curr == nullptr) { // someone else was first
+                if (this->check_mask_race(hash, mask))
+                    continue;
+                item_accessor.release();
+                return false;
+            }
+            __TBB_ASSERT( curr == exclude_node, nullptr );
+            // remove from container
+            if (prev == nullptr) {
+                b()->node_list.store(curr->next, std::memory_order_relaxed);
+            } else {
+                prev->next = curr->next;
+            }
 
-                void internal_move_assign(concurrent_hash_map&& other, /*is_always_equal=*/std::false_type) {
-                    if (this->my_allocator == other.my_allocator) {
-                        this->internal_move(std::move(other));
-                    } else {
-                        //do per element move
-                        internal_copy(std::make_move_iterator(other.begin()),
-                                      std::make_move_iterator(other.end()), other.size());
-                    }
-                }
+            this->my_size--;
+            break;
+        } while(true);
+        if (!item_accessor.is_writer()) { // need to get exclusive lock
+            item_accessor.upgrade_to_writer(); // return value means nothing here
+        }
+
+        item_accessor.release();
+        delete_node(exclude_node); // Only one thread can delete it
+        return true;
+    }
+
+    template <typename K>
+    bool internal_erase( const K& key ) {
+        node_base *erase_node;
+        hashcode_type const hash = my_hash_compare.hash(key);
+        hashcode_type mask = this->my_mask.load(std::memory_order_acquire);
+    restart:
+        {//lock scope
+            // get bucket
+            bucket_accessor b( this, hash & mask );
+        search:
+            node_base* prev = nullptr;
+            erase_node = b()->node_list.load(std::memory_order_relaxed);
+            while (this->is_valid(erase_node) && !my_hash_compare.equal(key, static_cast<node*>(erase_node)->value().first ) ) {
+                prev = erase_node;
+                erase_node = erase_node->next;
+            }
 
-                void internal_swap(concurrent_hash_map& other,
-                                   /*is_always_equal || POCS = */ std::true_type) {
-                    this->internal_swap_content(other);
-                }
+            if (erase_node == nullptr) { // not found, but mask could be changed
+                if (this->check_mask_race(hash, mask))
+                    goto restart;
+                return false;
+            } else if (!b.is_writer() && !b.upgrade_to_writer()) {
+                if (this->check_mask_race(hash, mask)) // contended upgrade, check mask
+                    goto restart;
+                goto search;
+            }
 
-                void internal_swap(concurrent_hash_map& other,
-                                   /*is_always_equal || POCS = */ std::false_type) {
-                    __TBB_ASSERT(this->my_allocator == other.my_allocator, nullptr);
-                    this->internal_swap_content(other);
+            // remove from container
+            if (prev == nullptr) {
+                b()->node_list.store(erase_node->next, std::memory_order_relaxed);
+            } else {
+                prev->next = erase_node->next;
+            }
+            this->my_size--;
+        }
+        {
+            typename node::scoped_type item_locker( erase_node->mutex, /*write=*/true );
+        }
+        // note: there should be no threads pretending to acquire this mutex again, do not try to upgrade const_accessor!
+        delete_node(erase_node); // Only one thread can delete it due to write lock on the bucket
+        return true;
+    }
+
+    // Returns an iterator for an item defined by the key, or for the next item after it (if upper==true)
+    template <typename K, typename I>
+    std::pair<I, I> internal_equal_range( const K& key, I end_ ) const {
+        hashcode_type h = my_hash_compare.hash( key );
+        hashcode_type m = this->my_mask.load(std::memory_order_relaxed);
+        __TBB_ASSERT((m&(m+1))==0, "data structure is invalid");
+        h &= m;
+        bucket *b = this->get_bucket( h );
+        while (rehash_required(b->node_list.load(std::memory_order_relaxed))) {
+            m = ( hashcode_type(1) << tbb::detail::log2( h ) ) - 1; // get parent mask from the topmost bit
+            b = this->get_bucket( h &= m );
+        }
+        node *n = search_bucket( key, b );
+        if( !n )
+            return std::make_pair(end_, end_);
+        iterator lower(*this, h, b, n), upper(lower);
+        return std::make_pair(lower, ++upper);
+    }
+
+    // Copy "source" to *this, where *this must start out empty.
+    void internal_copy( const concurrent_hash_map& source ) {
+        hashcode_type mask = source.my_mask.load(std::memory_order_relaxed);
+        if( this->my_mask.load(std::memory_order_relaxed) == mask ) { // optimized version
+            this->reserve(source.my_size.load(std::memory_order_relaxed)); // TODO: load_factor?
+            bucket *dst = nullptr, *src = nullptr;
+            bool rehashing_required = false;
+            for( hashcode_type k = 0; k <= mask; k++ ) {
+                if( k & (k-2) ) ++dst,src++; // not the beginning of a segment
+                else { dst = this->get_bucket( k ); src = source.get_bucket( k ); }
+                __TBB_ASSERT(!rehash_required(dst->node_list.load(std::memory_order_relaxed)), "Invalid bucket in destination table");
+                node *n = static_cast<node*>( src->node_list.load(std::memory_order_relaxed) );
+                if (rehash_required(n)) { // source is not rehashed, items are in previous buckets
+                    rehashing_required = true;
+                    dst->node_list.store(reinterpret_cast<node_base*>(rehash_req_flag), std::memory_order_relaxed);
+                } else for(; n; n = static_cast<node*>( n->next ) ) {
+                    node* node_ptr = create_node(base_type::get_allocator(), n->value().first, n->value().second);
+                    this->add_to_bucket( dst, node_ptr);
+                    this->my_size.fetch_add(1, std::memory_order_relaxed);
                 }
-
-                // Fast find when no concurrent erasure is used. For internal use inside TBB only!
-                /** Return pointer to item with given key, or nullptr if no such item exists.
+            }
+            if( rehashing_required ) rehash();
+        } else internal_copy(source.begin(), source.end(), source.my_size.load(std::memory_order_relaxed));
+    }
+
+    template <typename I>
+    void internal_copy( I first, I last, size_type reserve_size ) {
+        this->reserve(reserve_size); // TODO: load_factor?
+        hashcode_type m = this->my_mask.load(std::memory_order_relaxed);
+        for(; first != last; ++first) {
+            hashcode_type h = my_hash_compare.hash( (*first).first );
+            bucket *b = this->get_bucket( h & m );
+            __TBB_ASSERT(!rehash_required(b->node_list.load(std::memory_order_relaxed)), "Invalid bucket in destination table");
+            node* node_ptr = create_node(base_type::get_allocator(), (*first).first, (*first).second);
+            this->add_to_bucket( b, node_ptr );
+            ++this->my_size; // TODO: replace by non-atomic op
+        }
+    }
+
+    void internal_move_construct_with_allocator( concurrent_hash_map&& other, const allocator_type&,
+                                                /*is_always_equal=*/std::true_type )
+    {
+        this->internal_move(std::move(other));
+    }
+
+    void internal_move_construct_with_allocator( concurrent_hash_map&& other, const allocator_type& a,
+                                                /*is_always_equal=*/std::false_type )
+    {
+        if (a == other.get_allocator()){
+            this->internal_move(std::move(other));
+        } else {
+            try_call( [&] {
+                internal_copy(std::make_move_iterator(other.begin()), std::make_move_iterator(other.end()),
+                    other.size());
+            }).on_exception( [&] {
+                this->clear();
+            });
+        }
+    }
+
+    void internal_move_assign( concurrent_hash_map&& other,
+        /*is_always_equal || POCMA = */std::true_type)
+    {
+        this->internal_move(std::move(other));
+    }
+
+    void internal_move_assign(concurrent_hash_map&& other, /*is_always_equal=*/ std::false_type) {
+        if (this->my_allocator == other.my_allocator) {
+            this->internal_move(std::move(other));
+        } else {
+            //do per element move
+            internal_copy(std::make_move_iterator(other.begin()), std::make_move_iterator(other.end()),
+                other.size());
+        }
+    }
+
+    void internal_swap(concurrent_hash_map& other, /*is_always_equal || POCS = */ std::true_type) {
+        this->internal_swap_content(other);
+    }
+
+    void internal_swap(concurrent_hash_map& other, /*is_always_equal || POCS = */ std::false_type) {
+        __TBB_ASSERT(this->my_allocator == other.my_allocator, nullptr);
+        this->internal_swap_content(other);
+    }
+
+    // Fast find when no concurrent erasure is used. For internal use inside TBB only!
+    /** Return pointer to item with given key, or nullptr if no such item exists.
         Must not be called concurrently with erasure operations. */
-                const_pointer internal_fast_find(const Key& key) const {
-                    hashcode_type h = my_hash_compare.hash(key);
-                    hashcode_type m = this->my_mask.load(std::memory_order_acquire);
-                    node* n;
-                restart:
-                    __TBB_ASSERT((m & (m + 1)) == 0, "data structure is invalid");
-                    bucket* b = this->get_bucket(h & m);
-                    // TODO: actually, notification is unnecessary here, just hiding double-check
-                    if (rehash_required(b->node_list.load(std::memory_order_acquire))) {
-                        typename bucket::scoped_type lock;
-                        if (lock.try_acquire(b->mutex, /*write=*/true)) {
-                            if (rehash_required(b->node_list.load(std::memory_order_relaxed)))
-                                const_cast<concurrent_hash_map*>(this)->rehash_bucket(
-                                        b, h & m);//recursive rehashing
-                        } else
-                            lock.acquire(b->mutex, /*write=*/false);
-                        __TBB_ASSERT(!rehash_required(b->node_list.load(std::memory_order_relaxed)), nullptr);
-                    }
-                    n = search_bucket(key, b);
-                    if (n) return n->storage();
-                    else if (this->check_mask_race(h, m))
-                        goto restart;
-                    return 0;
-                }
-            };
+    const_pointer internal_fast_find( const Key& key ) const {
+        hashcode_type h = my_hash_compare.hash( key );
+        hashcode_type m = this->my_mask.load(std::memory_order_acquire);
+        node *n;
+    restart:
+        __TBB_ASSERT((m&(m+1))==0, "data structure is invalid");
+        bucket *b = this->get_bucket( h & m );
+        // TODO: actually, notification is unnecessary here, just hiding double-check
+        if (rehash_required(b->node_list.load(std::memory_order_acquire)))
+        {
+            typename bucket::scoped_type lock;
+            if( lock.try_acquire( b->mutex, /*write=*/true ) ) {
+                if (rehash_required(b->node_list.load(std::memory_order_relaxed)))
+                    const_cast<concurrent_hash_map*>(this)->rehash_bucket( b, h & m ); //recursive rehashing
+            }
+            else lock.acquire( b->mutex, /*write=*/false );
+            __TBB_ASSERT(!rehash_required(b->node_list.load(std::memory_order_relaxed)), nullptr);
+        }
+        n = search_bucket( key, b );
+        if( n )
+            return n->storage();
+        else if( this->check_mask_race( h, m ) )
+            goto restart;
+        return nullptr;
+    }
+};
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
-            template <typename It, typename HashCompare = d1::tbb_hash_compare<iterator_key_t<It>>,
-                      typename Alloc = tbb_allocator<iterator_alloc_pair_t<It>>,
-                      typename = std::enable_if_t<is_input_iterator_v<It>>,
-                      typename = std::enable_if_t<is_allocator_v<Alloc>>,
-                      typename = std::enable_if_t<!is_allocator_v<HashCompare>>>
-            concurrent_hash_map(It, It, HashCompare = HashCompare(), Alloc = Alloc())
-                    -> concurrent_hash_map<iterator_key_t<It>, iterator_mapped_t<It>, HashCompare, Alloc>;
-
-            template <typename It, typename Alloc, typename = std::enable_if_t<is_input_iterator_v<It>>,
-                      typename = std::enable_if_t<is_allocator_v<Alloc>>>
-            concurrent_hash_map(It, It, Alloc)
-                    -> concurrent_hash_map<iterator_key_t<It>, iterator_mapped_t<It>,
-                                           d1::tbb_hash_compare<iterator_key_t<It>>, Alloc>;
-
-            template <typename Key, typename T,
-                      typename HashCompare = d1::tbb_hash_compare<std::remove_const_t<Key>>,
-                      typename Alloc = tbb_allocator<std::pair<const Key, T>>,
-                      typename = std::enable_if_t<is_allocator_v<Alloc>>,
-                      typename = std::enable_if_t<!is_allocator_v<HashCompare>>>
-            concurrent_hash_map(std::initializer_list<std::pair<Key, T>>, HashCompare = HashCompare(),
-                                Alloc = Alloc())
-                    -> concurrent_hash_map<std::remove_const_t<Key>, T, HashCompare, Alloc>;
-
-            template <typename Key, typename T, typename Alloc,
-                      typename = std::enable_if_t<is_allocator_v<Alloc>>>
-            concurrent_hash_map(std::initializer_list<std::pair<Key, T>>, Alloc)
-                    -> concurrent_hash_map<std::remove_const_t<Key>, T,
-                                           d1::tbb_hash_compare<std::remove_const_t<Key>>, Alloc>;
+template <typename It,
+          typename HashCompare = d1::tbb_hash_compare<iterator_key_t<It>>,
+          typename Alloc = tbb_allocator<iterator_alloc_pair_t<It>>,
+          typename = std::enable_if_t<is_input_iterator_v<It>>,
+          typename = std::enable_if_t<is_allocator_v<Alloc>>,
+          typename = std::enable_if_t<!is_allocator_v<HashCompare>>>
+concurrent_hash_map( It, It, HashCompare = HashCompare(), Alloc = Alloc() )
+-> concurrent_hash_map<iterator_key_t<It>, iterator_mapped_t<It>, HashCompare, Alloc>;
+
+template <typename It, typename Alloc,
+          typename = std::enable_if_t<is_input_iterator_v<It>>,
+          typename = std::enable_if_t<is_allocator_v<Alloc>>>
+concurrent_hash_map( It, It, Alloc )
+-> concurrent_hash_map<iterator_key_t<It>, iterator_mapped_t<It>, d1::tbb_hash_compare<iterator_key_t<It>>, Alloc>;
+
+template <typename Key, typename T,
+          typename HashCompare = d1::tbb_hash_compare<std::remove_const_t<Key>>,
+          typename Alloc = tbb_allocator<std::pair<const Key, T>>,
+          typename = std::enable_if_t<is_allocator_v<Alloc>>,
+          typename = std::enable_if_t<!is_allocator_v<HashCompare>>>
+concurrent_hash_map( std::initializer_list<std::pair<Key, T>>, HashCompare = HashCompare(), Alloc = Alloc() )
+-> concurrent_hash_map<std::remove_const_t<Key>, T, HashCompare, Alloc>;
+
+template <typename Key, typename T, typename Alloc,
+          typename = std::enable_if_t<is_allocator_v<Alloc>>>
+concurrent_hash_map( std::initializer_list<std::pair<Key, T>>, Alloc )
+-> concurrent_hash_map<std::remove_const_t<Key>, T, d1::tbb_hash_compare<std::remove_const_t<Key>>, Alloc>;
 
 #endif /* __TBB_CPP17_DEDUCTION_GUIDES_PRESENT */
 
-            template <typename Key, typename T, typename HashCompare, typename A1, typename A2>
-            inline bool operator==(const concurrent_hash_map<Key, T, HashCompare, A1>& a,
-                                   const concurrent_hash_map<Key, T, HashCompare, A2>& b) {
-                if (a.size() != b.size()) return false;
-                typename concurrent_hash_map<Key, T, HashCompare, A1>::const_iterator i(a.begin()),
-                        i_end(a.end());
-                typename concurrent_hash_map<Key, T, HashCompare, A2>::const_iterator j, j_end(b.end());
-                for (; i != i_end; ++i) {
-                    j = b.equal_range(i->first).first;
-                    if (j == j_end || !(i->second == j->second)) return false;
-                }
-                return true;
-            }
+template <typename Key, typename T, typename HashCompare, typename A1, typename A2>
+inline bool operator==(const concurrent_hash_map<Key, T, HashCompare, A1> &a, const concurrent_hash_map<Key, T, HashCompare, A2> &b) {
+    if(a.size() != b.size()) return false;
+    typename concurrent_hash_map<Key, T, HashCompare, A1>::const_iterator i(a.begin()), i_end(a.end());
+    typename concurrent_hash_map<Key, T, HashCompare, A2>::const_iterator j, j_end(b.end());
+    for(; i != i_end; ++i) {
+        j = b.equal_range(i->first).first;
+        if( j == j_end || !(i->second == j->second) ) return false;
+    }
+    return true;
+}
 
 #if !__TBB_CPP20_COMPARISONS_PRESENT
-            template <typename Key, typename T, typename HashCompare, typename A1, typename A2>
-            inline bool operator!=(const concurrent_hash_map<Key, T, HashCompare, A1>& a,
-                                   const concurrent_hash_map<Key, T, HashCompare, A2>& b) {
-                return !(a == b);
-            }
-#endif// !__TBB_CPP20_COMPARISONS_PRESENT
+template <typename Key, typename T, typename HashCompare, typename A1, typename A2>
+inline bool operator!=(const concurrent_hash_map<Key, T, HashCompare, A1> &a, const concurrent_hash_map<Key, T, HashCompare, A2> &b)
+{    return !(a == b); }
+#endif // !__TBB_CPP20_COMPARISONS_PRESENT
 
-            template <typename Key, typename T, typename HashCompare, typename A>
-            inline void swap(concurrent_hash_map<Key, T, HashCompare, A>& a,
-                             concurrent_hash_map<Key, T, HashCompare, A>& b) {
-                a.swap(b);
-            }
+template <typename Key, typename T, typename HashCompare, typename A>
+inline void swap(concurrent_hash_map<Key, T, HashCompare, A> &a, concurrent_hash_map<Key, T, HashCompare, A> &b)
+{    a.swap( b ); }
 
-        }// namespace d2
-    }    // namespace detail
+} // namespace d2
+} // namespace detail
 
-    inline namespace v1 {
-        using detail::split;
-        using detail::d1::tbb_hash_compare;
-        using detail::d2::concurrent_hash_map;
-    }// namespace v1
+inline namespace v1 {
+    using detail::split;
+    using detail::d2::concurrent_hash_map;
+    using detail::d1::tbb_hash_compare;
+} // namespace v1
 
-}// namespace tbb
+} // namespace tbb
 
 #endif /* __TBB_concurrent_hash_map_H */
diff --git a/external/tbb/include/oneapi/tbb/concurrent_lru_cache.h b/external/tbb/include/oneapi/tbb/concurrent_lru_cache.h
index 218050fc..83d0576e 100644
--- a/external/tbb/include/oneapi/tbb/concurrent_lru_cache.h
+++ b/external/tbb/include/oneapi/tbb/concurrent_lru_cache.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -17,350 +17,358 @@
 #ifndef __TBB_concurrent_lru_cache_H
 #define __TBB_concurrent_lru_cache_H
 
-#if !TBB_PREVIEW_CONCURRENT_LRU_CACHE
-#error Set TBB_PREVIEW_CONCURRENT_LRU_CACHE to include concurrent_lru_cache.h
+#if ! TBB_PREVIEW_CONCURRENT_LRU_CACHE
+    #error Set TBB_PREVIEW_CONCURRENT_LRU_CACHE to include concurrent_lru_cache.h
 #endif
 
-#include "detail/_aggregator.h"
 #include "detail/_assert.h"
+#include "detail/_aggregator.h"
 
-#include <algorithm>// for std::find
-#include <atomic>   // for std::atomic<bool>
-#include <list>     // for std::list
-#include <map>      // for std::map
-#include <utility>  // for std::make_pair
+#include <map>       // for std::map
+#include <list>      // for std::list
+#include <utility>   // for std::make_pair
+#include <algorithm> // for std::find
+#include <atomic>    // for std::atomic<bool>
 
 namespace tbb {
 
-    namespace detail {
-        namespace d1 {
-
-            //-----------------------------------------------------------------------------
-            // Concurrent LRU cache
-            //-----------------------------------------------------------------------------
-
-            template <typename KeyT, typename ValT, typename KeyToValFunctorT = ValT (*)(KeyT)>
-            class concurrent_lru_cache : no_assign {
-                // incapsulated helper classes
-            private:
-                struct handle_object;
-                struct storage_map_value_type;
-
-                struct aggregator_operation;
-                struct retrieve_aggregator_operation;
-                struct signal_end_of_usage_aggregator_operation;
-
-                // typedefs
-            public:
-                using key_type = KeyT;
-                using value_type = ValT;
-                using pointer = ValT*;
-                using reference = ValT&;
-                using const_pointer = const ValT*;
-                using const_reference = const ValT&;
-
-                using value_function_type = KeyToValFunctorT;
-                using handle = handle_object;
-
-            private:
-                using lru_cache_type = concurrent_lru_cache<KeyT, ValT, KeyToValFunctorT>;
-
-                using storage_map_type = std::map<key_type, storage_map_value_type>;
-                using storage_map_iterator_type = typename storage_map_type::iterator;
-                using storage_map_pointer_type = typename storage_map_type::pointer;
-                using storage_map_reference_type = typename storage_map_type::reference;
-
-                using history_list_type = std::list<storage_map_iterator_type>;
-                using history_list_iterator_type = typename history_list_type::iterator;
-
-                using aggregator_operation_type = aggregator_operation;
-                using aggregator_function_type
-                        = aggregating_functor<lru_cache_type, aggregator_operation_type>;
-                using aggregator_type = aggregator<aggregator_function_type, aggregator_operation_type>;
-
-                friend class aggregating_functor<lru_cache_type, aggregator_operation_type>;
-
-                // fields
-            private:
-                value_function_type my_value_function;
-                aggregator_type my_aggregator;
-
-                storage_map_type my_storage_map;           // storage map for used objects
-                history_list_type my_history_list;         // history list for unused objects
-                const std::size_t my_history_list_capacity;// history list's allowed capacity
-
-                // interface
-            public:
-                concurrent_lru_cache(value_function_type value_function, std::size_t cache_capacity)
-                    : my_value_function(value_function), my_history_list_capacity(cache_capacity) {
-                    my_aggregator.initialize_handler(aggregator_function_type(this));
-                }
-
-                handle operator[](key_type key) {
-                    retrieve_aggregator_operation op(key);
-                    my_aggregator.execute(&op);
-
-                    if (op.is_new_value_needed()) {
-                        op.result().second.my_value = my_value_function(key);
-                        op.result().second.my_is_ready.store(true, std::memory_order_release);
-                    } else {
-                        spin_wait_while_eq(op.result().second.my_is_ready, false);
-                    }
-
-                    return handle(*this, op.result());
-                }
-
-            private:
-                void handle_operations(aggregator_operation* op_list) {
-                    while (op_list) {
-                        op_list->cast_and_handle(*this);
-                        aggregator_operation* prev_op = op_list;
-                        op_list = op_list->next;
-
-                        (prev_op->status).store(1, std::memory_order_release);
-                    }
-                }
-
-                void signal_end_of_usage(storage_map_reference_type map_record_ref) {
-                    signal_end_of_usage_aggregator_operation op(map_record_ref);
-                    my_aggregator.execute(&op);
-                }
-
-                void signal_end_of_usage_serial(storage_map_reference_type map_record_ref) {
-                    storage_map_iterator_type map_it = my_storage_map.find(map_record_ref.first);
-
-                    __TBB_ASSERT(map_it != my_storage_map.end(),
-                                 "cache should not return past-end iterators to outer world");
-                    __TBB_ASSERT(&(*map_it) == &map_record_ref,
-                                 "dangling reference has been returned to outside world: data race?");
-                    __TBB_ASSERT(std::find(my_history_list.begin(), my_history_list.end(), map_it)
-                                         == my_history_list.end(),
-                                 "object in use should not be in list of unused objects ");
-
-                    // if it was the last reference, put it to the LRU history
-                    if (!--(map_it->second.my_ref_counter)) {
-                        // if the LRU history is full, evict the oldest items to get space
-                        if (my_history_list.size() >= my_history_list_capacity) {
-                            std::size_t number_of_elements_to_evict
-                                    = 1 + my_history_list.size() - my_history_list_capacity;
-
-                            for (std::size_t i = 0; i < number_of_elements_to_evict; ++i) {
-                                storage_map_iterator_type map_it_to_evict = my_history_list.back();
-
-                                __TBB_ASSERT(map_it_to_evict->second.my_ref_counter == 0,
-                                             "item to be evicted should not have a live references");
-
-                                // TODO: can we use forward_list instead of list? pop_front / insert_after last
-                                my_history_list.pop_back();
-                                my_storage_map.erase(map_it_to_evict);
-                            }
-                        }
-
-                        // TODO: can we use forward_list instead of list? pop_front / insert_after last
-                        my_history_list.push_front(map_it);
-                        map_it->second.my_history_list_iterator = my_history_list.begin();
-                    }
-                }
-
-                storage_map_reference_type retrieve_serial(key_type key, bool& is_new_value_needed) {
-                    storage_map_iterator_type map_it = my_storage_map.find(key);
-
-                    if (map_it == my_storage_map.end()) {
-                        map_it = my_storage_map.emplace_hint(
-                                map_it, std::piecewise_construct, std::make_tuple(key),
-                                std::make_tuple(value_type(), 0, my_history_list.end(), false));
-                        is_new_value_needed = true;
-                    } else {
-                        history_list_iterator_type list_it = map_it->second.my_history_list_iterator;
-                        if (list_it != my_history_list.end()) {
-                            __TBB_ASSERT(map_it->second.my_ref_counter == 0,
-                                         "item to be evicted should not have a live references");
-
-                            // Item is going to be used. Therefore it is not a subject for eviction,
-                            // so we remove it from LRU history.
-                            my_history_list.erase(list_it);
-                            map_it->second.my_history_list_iterator = my_history_list.end();
-                        }
-                    }
-
-                    ++(map_it->second.my_ref_counter);
-                    return *map_it;
-                }
-            };
-
-            //-----------------------------------------------------------------------------
-            // Value type for storage map in concurrent LRU cache
-            //-----------------------------------------------------------------------------
-
-            template <typename KeyT, typename ValT, typename KeyToValFunctorT>
-            struct concurrent_lru_cache<KeyT, ValT, KeyToValFunctorT>::storage_map_value_type {
-                //typedefs
-            public:
-                using ref_counter_type = std::size_t;
-
-                // fields
-            public:
-                value_type my_value;
-                ref_counter_type my_ref_counter;
-                history_list_iterator_type my_history_list_iterator;
-                std::atomic<bool> my_is_ready;
-
-                // interface
-            public:
-                storage_map_value_type(value_type const& value, ref_counter_type ref_counter,
-                                       history_list_iterator_type history_list_iterator, bool is_ready)
-                    : my_value(value), my_ref_counter(ref_counter),
-                      my_history_list_iterator(history_list_iterator), my_is_ready(is_ready) {}
-            };
-
-            //-----------------------------------------------------------------------------
-            // Handle object for operator[] in concurrent LRU cache
-            //-----------------------------------------------------------------------------
-
-            template <typename KeyT, typename ValT, typename KeyToValFunctorT>
-            struct concurrent_lru_cache<KeyT, ValT, KeyToValFunctorT>::handle_object {
-                // fields
-            private:
-                lru_cache_type* my_lru_cache_ptr;
-                storage_map_pointer_type my_map_record_ptr;
-
-                // interface
-            public:
-                handle_object() : my_lru_cache_ptr(nullptr), my_map_record_ptr(nullptr) {}
-                handle_object(lru_cache_type& lru_cache_ref, storage_map_reference_type map_record_ref)
-                    : my_lru_cache_ptr(&lru_cache_ref), my_map_record_ptr(&map_record_ref) {}
-
-                handle_object(handle_object&) = delete;
-                void operator=(handle_object&) = delete;
-
-                handle_object(handle_object&& other)
-                    : my_lru_cache_ptr(other.my_lru_cache_ptr), my_map_record_ptr(other.my_map_record_ptr) {
-
-                    __TBB_ASSERT((other.my_lru_cache_ptr != nullptr && other.my_map_record_ptr != nullptr)
-                                         || (other.my_lru_cache_ptr == nullptr
-                                             && other.my_map_record_ptr == nullptr),
-                                 "invalid state of moving object?");
-
-                    other.my_lru_cache_ptr = nullptr;
-                    other.my_map_record_ptr = nullptr;
-                }
-
-                handle_object& operator=(handle_object&& other) {
-                    __TBB_ASSERT((other.my_lru_cache_ptr != nullptr && other.my_map_record_ptr != nullptr)
-                                         || (other.my_lru_cache_ptr == nullptr
-                                             && other.my_map_record_ptr == nullptr),
-                                 "invalid state of moving object?");
-
-                    if (my_lru_cache_ptr) my_lru_cache_ptr->signal_end_of_usage(*my_map_record_ptr);
-
-                    my_lru_cache_ptr = other.my_lru_cache_ptr;
-                    my_map_record_ptr = other.my_map_record_ptr;
-                    other.my_lru_cache_ptr = nullptr;
-                    other.my_map_record_ptr = nullptr;
-
-                    return *this;
+namespace detail {
+namespace d1 {
+
+//-----------------------------------------------------------------------------
+// Concurrent LRU cache
+//-----------------------------------------------------------------------------
+
+template<typename KeyT, typename ValT, typename KeyToValFunctorT = ValT (*) (KeyT)>
+class concurrent_lru_cache : no_assign {
+// incapsulated helper classes
+private:
+    struct handle_object;
+    struct storage_map_value_type;
+
+    struct aggregator_operation;
+    struct retrieve_aggregator_operation;
+    struct signal_end_of_usage_aggregator_operation;
+
+// typedefs
+public:
+    using key_type = KeyT;
+    using value_type = ValT;
+    using pointer = ValT*;
+    using reference = ValT&;
+    using const_pointer = const ValT*;
+    using const_reference = const ValT&;
+
+    using value_function_type = KeyToValFunctorT;
+    using handle = handle_object;
+private:
+    using lru_cache_type = concurrent_lru_cache<KeyT, ValT, KeyToValFunctorT>;
+
+    using storage_map_type = std::map<key_type, storage_map_value_type>;
+    using storage_map_iterator_type = typename storage_map_type::iterator;
+    using storage_map_pointer_type = typename storage_map_type::pointer;
+    using storage_map_reference_type = typename storage_map_type::reference;
+
+    using history_list_type = std::list<storage_map_iterator_type>;
+    using history_list_iterator_type = typename history_list_type::iterator;
+
+    using aggregator_operation_type = aggregator_operation;
+    using aggregator_function_type = aggregating_functor<lru_cache_type, aggregator_operation_type>;
+    using aggregator_type = aggregator<aggregator_function_type, aggregator_operation_type>;
+
+    friend class aggregating_functor<lru_cache_type,aggregator_operation_type>;
+
+// fields
+private:
+    value_function_type my_value_function;
+    aggregator_type my_aggregator;
+
+    storage_map_type my_storage_map;            // storage map for used objects
+    history_list_type my_history_list;          // history list for unused objects
+    const std::size_t my_history_list_capacity; // history list's allowed capacity
+
+// interface
+public:
+
+    concurrent_lru_cache(value_function_type value_function, std::size_t cache_capacity)
+        : my_value_function(value_function), my_history_list_capacity(cache_capacity) {
+        my_aggregator.initialize_handler(aggregator_function_type(this));
+    }
+
+    handle operator[](key_type key) {
+        retrieve_aggregator_operation op(key);
+        my_aggregator.execute(&op);
+
+        if (op.is_new_value_needed()) {
+            op.result().second.my_value = my_value_function(key);
+            op.result().second.my_is_ready.store(true, std::memory_order_release);
+        } else {
+            spin_wait_while_eq(op.result().second.my_is_ready, false);
+        }
+
+        return handle(*this, op.result());
+    }
+
+private:
+
+    void handle_operations(aggregator_operation* op_list) {
+        while (op_list) {
+            op_list->cast_and_handle(*this);
+            aggregator_operation* prev_op = op_list;
+            op_list = op_list->next;
+
+            (prev_op->status).store(1, std::memory_order_release);
+        }
+    }
+
+    void signal_end_of_usage(storage_map_reference_type map_record_ref) {
+        signal_end_of_usage_aggregator_operation op(map_record_ref);
+        my_aggregator.execute(&op);
+    }
+
+    void signal_end_of_usage_serial(storage_map_reference_type map_record_ref) {
+        storage_map_iterator_type map_it = my_storage_map.find(map_record_ref.first);
+
+        __TBB_ASSERT(map_it != my_storage_map.end(),
+            "cache should not return past-end iterators to outer world");
+        __TBB_ASSERT(&(*map_it) == &map_record_ref,
+            "dangling reference has been returned to outside world: data race?");
+        __TBB_ASSERT(std::find(my_history_list.begin(), my_history_list.end(), map_it) == my_history_list.end(),
+            "object in use should not be in list of unused objects ");
+
+        // if it was the last reference, put it to the LRU history
+        if (! --(map_it->second.my_ref_counter)) {
+            // if the LRU history is full, evict the oldest items to get space
+            if (my_history_list.size() >= my_history_list_capacity) {
+                if (my_history_list_capacity == 0) {
+                    // Since LRU history capacity is zero, there is no need to keep the element in history
+                    my_storage_map.erase(map_it);
+                    return;
                 }
+                std::size_t number_of_elements_to_evict = 1 + my_history_list.size() - my_history_list_capacity;
 
-                ~handle_object() {
-                    if (my_lru_cache_ptr) my_lru_cache_ptr->signal_end_of_usage(*my_map_record_ptr);
-                }
+                for (std::size_t i = 0; i < number_of_elements_to_evict; ++i) {
+                    storage_map_iterator_type map_it_to_evict = my_history_list.back();
 
-                operator bool() const { return (my_lru_cache_ptr && my_map_record_ptr); }
+                    __TBB_ASSERT(map_it_to_evict->second.my_ref_counter == 0,
+                        "item to be evicted should not have a live references");
 
-                value_type& value() {
-                    __TBB_ASSERT(my_lru_cache_ptr, "get value from already moved object?");
-                    __TBB_ASSERT(my_map_record_ptr, "get value from an invalid or already moved object?");
-
-                    return my_map_record_ptr->second.my_value;
-                }
-            };
-
-            //-----------------------------------------------------------------------------
-            // Aggregator operation for aggregator type in concurrent LRU cache
-            //-----------------------------------------------------------------------------
-
-            template <typename KeyT, typename ValT, typename KeyToValFunctorT>
-            struct concurrent_lru_cache<KeyT, ValT, KeyToValFunctorT>::aggregator_operation
-                : aggregated_operation<aggregator_operation> {
-                // incapsulated helper classes
-            public:
-                enum class op_type { retrieve, signal_end_of_usage };
-
-                // fields
-            private:
-                op_type my_op;
-
-                // interface
-            public:
-                aggregator_operation(op_type op) : my_op(op) {}
-
-                // TODO: aggregator_operation can be implemented
-                //   - as a statically typed variant type or CRTP? (static, dependent on the use case)
-                //   - or use pointer to function and apply_visitor (dynamic)
-                //   - or use virtual functions (dynamic)
-                void cast_and_handle(lru_cache_type& lru_cache_ref) {
-                    if (my_op == op_type::retrieve)
-                        static_cast<retrieve_aggregator_operation*>(this)->handle(lru_cache_ref);
-                    else
-                        static_cast<signal_end_of_usage_aggregator_operation*>(this)->handle(lru_cache_ref);
+                    // TODO: can we use forward_list instead of list? pop_front / insert_after last
+                    my_history_list.pop_back();
+                    my_storage_map.erase(map_it_to_evict);
                 }
-            };
-
-            template <typename KeyT, typename ValT, typename KeyToValFunctorT>
-            struct concurrent_lru_cache<KeyT, ValT, KeyToValFunctorT>::retrieve_aggregator_operation
-                : aggregator_operation,
-                  private no_assign {
-            public:
-                key_type my_key;
-                storage_map_pointer_type my_map_record_ptr;
-                bool my_is_new_value_needed;
-
-            public:
-                retrieve_aggregator_operation(key_type key)
-                    : aggregator_operation(aggregator_operation::op_type::retrieve), my_key(key),
-                      my_is_new_value_needed(false) {}
-
-                void handle(lru_cache_type& lru_cache_ref) {
-                    my_map_record_ptr = &lru_cache_ref.retrieve_serial(my_key, my_is_new_value_needed);
-                }
-
-                storage_map_reference_type result() { return *my_map_record_ptr; }
-
-                bool is_new_value_needed() { return my_is_new_value_needed; }
-            };
-
-            template <typename KeyT, typename ValT, typename KeyToValFunctorT>
-            struct concurrent_lru_cache<KeyT, ValT,
-                                        KeyToValFunctorT>::signal_end_of_usage_aggregator_operation
-                : aggregator_operation,
-                  private no_assign {
-
-            private:
-                storage_map_reference_type my_map_record_ref;
-
-            public:
-                signal_end_of_usage_aggregator_operation(storage_map_reference_type map_record_ref)
-                    : aggregator_operation(aggregator_operation::op_type::signal_end_of_usage),
-                      my_map_record_ref(map_record_ref) {}
-
-                void handle(lru_cache_type& lru_cache_ref) {
-                    lru_cache_ref.signal_end_of_usage_serial(my_map_record_ref);
-                }
-            };
-
-            // TODO: if we have guarantees that KeyToValFunctorT always have
-            //       ValT as a return type and KeyT as an argument type
-            //       we can deduce template parameters of concurrent_lru_cache
-            //       by pattern matching on KeyToValFunctorT
-
-        }// namespace d1
-    }    // namespace detail
-
-    inline namespace v1 {
-
-        using detail::d1::concurrent_lru_cache;
-
-    }// namespace v1
-}// namespace tbb
-
-#endif// __TBB_concurrent_lru_cache_H
+            }
+
+            // TODO: can we use forward_list instead of list? pop_front / insert_after last
+            my_history_list.push_front(map_it);
+            map_it->second.my_history_list_iterator = my_history_list.begin();
+        }
+    }
+
+    storage_map_reference_type retrieve_serial(key_type key, bool& is_new_value_needed) {
+        storage_map_iterator_type map_it = my_storage_map.find(key);
+
+        if (map_it == my_storage_map.end()) {
+            map_it = my_storage_map.emplace_hint(
+                map_it, std::piecewise_construct, std::make_tuple(key), std::make_tuple(value_type(), 0, my_history_list.end(), false));
+            is_new_value_needed = true;
+        } else {
+            history_list_iterator_type list_it = map_it->second.my_history_list_iterator;
+            if (list_it != my_history_list.end()) {
+                __TBB_ASSERT(map_it->second.my_ref_counter == 0,
+                    "item to be evicted should not have a live references");
+
+                // Item is going to be used. Therefore it is not a subject for eviction,
+                // so we remove it from LRU history.
+                my_history_list.erase(list_it);
+                map_it->second.my_history_list_iterator = my_history_list.end();
+            }
+        }
+
+        ++(map_it->second.my_ref_counter);
+        return *map_it;
+    }
+};
+
+//-----------------------------------------------------------------------------
+// Value type for storage map in concurrent LRU cache
+//-----------------------------------------------------------------------------
+
+template<typename KeyT, typename ValT, typename KeyToValFunctorT>
+struct concurrent_lru_cache<KeyT, ValT, KeyToValFunctorT>::storage_map_value_type {
+//typedefs
+public:
+    using ref_counter_type = std::size_t;
+
+// fields
+public:
+    value_type my_value;
+    ref_counter_type my_ref_counter;
+    history_list_iterator_type my_history_list_iterator;
+    std::atomic<bool> my_is_ready;
+
+// interface
+public:
+    storage_map_value_type(
+        value_type const& value, ref_counter_type ref_counter,
+        history_list_iterator_type history_list_iterator, bool is_ready)
+        : my_value(value), my_ref_counter(ref_counter),
+          my_history_list_iterator(history_list_iterator), my_is_ready(is_ready) {}
+};
+
+//-----------------------------------------------------------------------------
+// Handle object for operator[] in concurrent LRU cache
+//-----------------------------------------------------------------------------
+
+template<typename KeyT, typename ValT, typename KeyToValFunctorT>
+struct concurrent_lru_cache<KeyT, ValT, KeyToValFunctorT>::handle_object {
+// fields
+private:
+    lru_cache_type* my_lru_cache_ptr;
+    storage_map_pointer_type my_map_record_ptr;
+
+// interface
+public:
+    handle_object()
+        : my_lru_cache_ptr(nullptr), my_map_record_ptr(nullptr) {}
+    handle_object(lru_cache_type& lru_cache_ref, storage_map_reference_type map_record_ref)
+        : my_lru_cache_ptr(&lru_cache_ref), my_map_record_ptr(&map_record_ref) {}
+
+    handle_object(handle_object&) = delete;
+    void operator=(handle_object&) = delete;
+
+    handle_object(handle_object&& other)
+        : my_lru_cache_ptr(other.my_lru_cache_ptr), my_map_record_ptr(other.my_map_record_ptr) {
+
+        __TBB_ASSERT(
+            (other.my_lru_cache_ptr != nullptr && other.my_map_record_ptr != nullptr) ||
+            (other.my_lru_cache_ptr == nullptr && other.my_map_record_ptr == nullptr),
+            "invalid state of moving object?");
+
+        other.my_lru_cache_ptr = nullptr;
+        other.my_map_record_ptr = nullptr;
+    }
+
+    handle_object& operator=(handle_object&& other) {
+        __TBB_ASSERT(
+            (other.my_lru_cache_ptr != nullptr && other.my_map_record_ptr != nullptr) ||
+            (other.my_lru_cache_ptr == nullptr && other.my_map_record_ptr == nullptr),
+            "invalid state of moving object?");
+
+        if (my_lru_cache_ptr)
+            my_lru_cache_ptr->signal_end_of_usage(*my_map_record_ptr);
+
+        my_lru_cache_ptr = other.my_lru_cache_ptr;
+        my_map_record_ptr = other.my_map_record_ptr;
+        other.my_lru_cache_ptr = nullptr;
+        other.my_map_record_ptr = nullptr;
+
+        return *this;
+    }
+
+    ~handle_object() {
+        if (my_lru_cache_ptr)
+            my_lru_cache_ptr->signal_end_of_usage(*my_map_record_ptr);
+    }
+
+    operator bool() const {
+        return (my_lru_cache_ptr && my_map_record_ptr);
+    }
+
+    value_type& value() {
+        __TBB_ASSERT(my_lru_cache_ptr, "get value from already moved object?");
+        __TBB_ASSERT(my_map_record_ptr, "get value from an invalid or already moved object?");
+
+        return my_map_record_ptr->second.my_value;
+    }
+};
+
+//-----------------------------------------------------------------------------
+// Aggregator operation for aggregator type in concurrent LRU cache
+//-----------------------------------------------------------------------------
+
+template<typename KeyT, typename ValT, typename KeyToValFunctorT>
+struct concurrent_lru_cache<KeyT, ValT, KeyToValFunctorT>::aggregator_operation
+    : aggregated_operation<aggregator_operation> {
+// incapsulated helper classes
+public:
+    enum class op_type { retrieve, signal_end_of_usage };
+
+// fields
+private:
+    op_type my_op;
+
+// interface
+public:
+    aggregator_operation(op_type op) : my_op(op) {}
+
+    // TODO: aggregator_operation can be implemented
+    //   - as a statically typed variant type or CRTP? (static, dependent on the use case)
+    //   - or use pointer to function and apply_visitor (dynamic)
+    //   - or use virtual functions (dynamic)
+    void cast_and_handle(lru_cache_type& lru_cache_ref) {
+        if (my_op == op_type::retrieve)
+            static_cast<retrieve_aggregator_operation*>(this)->handle(lru_cache_ref);
+        else
+            static_cast<signal_end_of_usage_aggregator_operation*>(this)->handle(lru_cache_ref);
+    }
+};
+
+template<typename KeyT, typename ValT, typename KeyToValFunctorT>
+struct concurrent_lru_cache<KeyT, ValT, KeyToValFunctorT>::retrieve_aggregator_operation
+    : aggregator_operation, private no_assign {
+public:
+    key_type my_key;
+    storage_map_pointer_type my_map_record_ptr;
+    bool my_is_new_value_needed;
+
+public:
+    retrieve_aggregator_operation(key_type key)
+        : aggregator_operation(aggregator_operation::op_type::retrieve),
+          my_key(key), my_map_record_ptr(nullptr), my_is_new_value_needed(false) {}
+
+    void handle(lru_cache_type& lru_cache_ref) {
+        my_map_record_ptr = &lru_cache_ref.retrieve_serial(my_key, my_is_new_value_needed);
+    }
+
+    storage_map_reference_type result() {
+        __TBB_ASSERT(my_map_record_ptr, "Attempt to call result() before calling handle()");
+        return *my_map_record_ptr;
+    }
+
+    bool is_new_value_needed() { return my_is_new_value_needed; }
+};
+
+template<typename KeyT, typename ValT, typename KeyToValFunctorT>
+struct concurrent_lru_cache<KeyT, ValT, KeyToValFunctorT>::signal_end_of_usage_aggregator_operation
+    : aggregator_operation, private no_assign {
+
+private:
+    storage_map_reference_type my_map_record_ref;
+
+public:
+    signal_end_of_usage_aggregator_operation(storage_map_reference_type map_record_ref)
+        : aggregator_operation(aggregator_operation::op_type::signal_end_of_usage),
+          my_map_record_ref(map_record_ref) {}
+
+    void handle(lru_cache_type& lru_cache_ref) {
+        lru_cache_ref.signal_end_of_usage_serial(my_map_record_ref);
+    }
+};
+
+// TODO: if we have guarantees that KeyToValFunctorT always have
+//       ValT as a return type and KeyT as an argument type
+//       we can deduce template parameters of concurrent_lru_cache
+//       by pattern matching on KeyToValFunctorT
+
+} // namespace d1
+} // namespace detail
+
+inline namespace v1 {
+
+using detail::d1::concurrent_lru_cache;
+
+} // inline namespace v1
+} // namespace tbb
+
+#endif // __TBB_concurrent_lru_cache_H
diff --git a/external/tbb/include/oneapi/tbb/concurrent_map.h b/external/tbb/include/oneapi/tbb/concurrent_map.h
index 40d6c4c2..c1817a18 100644
--- a/external/tbb/include/oneapi/tbb/concurrent_map.h
+++ b/external/tbb/include/oneapi/tbb/concurrent_map.h
@@ -17,330 +17,334 @@
 #ifndef __TBB_concurrent_map_H
 #define __TBB_concurrent_map_H
 
-#include "detail/_concurrent_skip_list.h"
 #include "detail/_namespace_injection.h"
+#include "detail/_concurrent_skip_list.h"
 #include "tbb_allocator.h"
 #include <functional>
 #include <tuple>
 #include <utility>
 
 namespace tbb {
-    namespace detail {
-        namespace d2 {
-
-            template <typename Key, typename Value, typename KeyCompare, typename RandomGenerator,
-                      typename Allocator, bool AllowMultimapping>
-            struct map_traits {
-                static constexpr std::size_t max_level = RandomGenerator::max_level;
-                using random_level_generator_type = RandomGenerator;
-                using key_type = Key;
-                using mapped_type = Value;
-                using compare_type = KeyCompare;
-                using value_type = std::pair<const key_type, mapped_type>;
-                using reference = value_type&;
-                using const_reference = const value_type&;
-                using allocator_type = Allocator;
-
-                static constexpr bool allow_multimapping = AllowMultimapping;
-
-                class value_compare {
-                public:
-                    bool operator()(const value_type& lhs, const value_type& rhs) const {
-                        return comp(lhs.first, rhs.first);
-                    }
-
-                protected:
-                    value_compare(compare_type c) : comp(c) {}
-
-                    friend struct map_traits;
-
-                    compare_type comp;
-                };
-
-                static value_compare value_comp(compare_type comp) { return value_compare(comp); }
-
-                static const key_type& get_key(const_reference val) { return val.first; }
-            };// struct map_traits
-
-            template <typename Key, typename Value, typename Compare, typename Allocator>
-            class concurrent_multimap;
-
-            template <typename Key, typename Value, typename Compare = std::less<Key>,
-                      typename Allocator = tbb::tbb_allocator<std::pair<const Key, Value>>>
-            class concurrent_map
-                : public concurrent_skip_list<map_traits<
-                          Key, Value, Compare, concurrent_geometric_level_generator<32>, Allocator, false>> {
-                using base_type = concurrent_skip_list<map_traits<
-                        Key, Value, Compare, concurrent_geometric_level_generator<32>, Allocator, false>>;
-
-            public:
-                using key_type = Key;
-                using mapped_type = Value;
-                using value_type = typename base_type::value_type;
-                using size_type = typename base_type::size_type;
-                using difference_type = typename base_type::difference_type;
-                using key_compare = Compare;
-                using value_compare = typename base_type::value_compare;
-                using allocator_type = Allocator;
-
-                using reference = typename base_type::reference;
-                using const_reference = typename base_type::const_reference;
-                using pointer = typename base_type::pointer;
-                using const_pointer = typename base_type::const_pointer;
-
-                using iterator = typename base_type::iterator;
-                using const_iterator = typename base_type::const_iterator;
-
-                using node_type = typename base_type::node_type;
-
-                // Include constructors of base type
-                using base_type::base_type;
-                using base_type::operator=;
-
-                // Required for implicit deduction guides
-                concurrent_map() = default;
-                concurrent_map(const concurrent_map&) = default;
-                concurrent_map(const concurrent_map& other, const allocator_type& alloc)
-                    : base_type(other, alloc) {}
-                concurrent_map(concurrent_map&&) = default;
-                concurrent_map(concurrent_map&& other, const allocator_type& alloc)
-                    : base_type(std::move(other), alloc) {}
-                // Required to respect the rule of 5
-                concurrent_map& operator=(const concurrent_map&) = default;
-                concurrent_map& operator=(concurrent_map&&) = default;
-
-                // Observers
-                mapped_type& at(const key_type& key) {
-                    iterator it = this->find(key);
-
-                    if (it == this->end()) { throw_exception(exception_id::invalid_key); }
-                    return it->second;
-                }
-
-                const mapped_type& at(const key_type& key) const {
-                    return const_cast<concurrent_map*>(this)->at(key);
-                }
-
-                mapped_type& operator[](const key_type& key) {
-                    iterator it = this->find(key);
-
-                    if (it == this->end()) {
-                        it = this->emplace(std::piecewise_construct, std::forward_as_tuple(key),
-                                           std::tuple<>())
-                                     .first;
-                    }
-                    return it->second;
-                }
-
-                mapped_type& operator[](key_type&& key) {
-                    iterator it = this->find(key);
-
-                    if (it == this->end()) {
-                        it = this->emplace(std::piecewise_construct, std::forward_as_tuple(std::move(key)),
-                                           std::tuple<>())
-                                     .first;
-                    }
-                    return it->second;
-                }
-
-                using base_type::insert;
-
-                template <typename P>
-                typename std::enable_if<std::is_constructible<value_type, P&&>::value,
-                                        std::pair<iterator, bool>>::type
-                insert(P&& value) {
-                    return this->emplace(std::forward<P>(value));
-                }
-
-                template <typename P>
-                typename std::enable_if<std::is_constructible<value_type, P&&>::value, iterator>::type
-                insert(const_iterator hint, P&& value) {
-                    return this->emplace_hint(hint, std::forward<P>(value));
-                }
-
-                template <typename OtherCompare>
-                void merge(concurrent_map<key_type, mapped_type, OtherCompare, Allocator>& source) {
-                    this->internal_merge(source);
-                }
-
-                template <typename OtherCompare>
-                void merge(concurrent_map<key_type, mapped_type, OtherCompare, Allocator>&& source) {
-                    this->internal_merge(std::move(source));
-                }
-
-                template <typename OtherCompare>
-                void merge(concurrent_multimap<key_type, mapped_type, OtherCompare, Allocator>& source) {
-                    this->internal_merge(source);
-                }
-
-                template <typename OtherCompare>
-                void merge(concurrent_multimap<key_type, mapped_type, OtherCompare, Allocator>&& source) {
-                    this->internal_merge(std::move(source));
-                }
-            };// class concurrent_map
+namespace detail {
+namespace d2 {
+
+template<typename Key, typename Value, typename KeyCompare, typename RandomGenerator,
+         typename Allocator, bool AllowMultimapping>
+struct map_traits {
+    static constexpr std::size_t max_level = RandomGenerator::max_level;
+    using random_level_generator_type = RandomGenerator;
+    using key_type = Key;
+    using mapped_type = Value;
+    using compare_type = KeyCompare;
+    using value_type = std::pair<const key_type, mapped_type>;
+    using reference = value_type&;
+    using const_reference = const value_type&;
+    using allocator_type = Allocator;
+
+    static constexpr bool allow_multimapping = AllowMultimapping;
+
+    class value_compare {
+    public:
+        bool operator()(const value_type& lhs, const value_type& rhs) const {
+            return comp(lhs.first, rhs.first);
+        }
+
+    protected:
+        value_compare(compare_type c) : comp(c) {}
+
+        friend struct map_traits;
+
+        compare_type comp;
+    };
+
+    static value_compare value_comp(compare_type comp) { return value_compare(comp); }
+
+    static const key_type& get_key(const_reference val) {
+        return val.first;
+    }
+}; // struct map_traits
+
+template <typename Key, typename Value, typename Compare, typename Allocator>
+class concurrent_multimap;
+
+template <typename Key, typename Value, typename Compare = std::less<Key>, typename Allocator = tbb::tbb_allocator<std::pair<const Key, Value>>>
+class concurrent_map : public concurrent_skip_list<map_traits<Key, Value, Compare, concurrent_geometric_level_generator<32>, Allocator, false>> {
+    using base_type = concurrent_skip_list<map_traits<Key, Value, Compare, concurrent_geometric_level_generator<32>, Allocator, false>>;
+public:
+    using key_type = Key;
+    using mapped_type = Value;
+    using value_type = typename base_type::value_type;
+    using size_type = typename base_type::size_type;
+    using difference_type = typename base_type::difference_type;
+    using key_compare = Compare;
+    using value_compare = typename base_type::value_compare;
+    using allocator_type = Allocator;
+
+    using reference = typename base_type::reference;
+    using const_reference = typename base_type::const_reference;
+    using pointer = typename base_type::pointer;
+    using const_pointer = typename base_type::const_pointer;
+
+    using iterator = typename base_type::iterator;
+    using const_iterator = typename base_type::const_iterator;
+
+    using node_type = typename base_type::node_type;
+
+    // Include constructors of base type
+    using base_type::base_type;
+
+    // Required for implicit deduction guides
+    concurrent_map() = default;
+    concurrent_map( const concurrent_map& ) = default;
+    concurrent_map( const concurrent_map& other, const allocator_type& alloc ) : base_type(other, alloc) {}
+    concurrent_map( concurrent_map&& ) = default;
+    concurrent_map( concurrent_map&& other, const allocator_type& alloc ) : base_type(std::move(other), alloc) {}
+    // Required to respect the rule of 5
+    concurrent_map& operator=( const concurrent_map& ) = default;
+    concurrent_map& operator=( concurrent_map&& ) = default;
+
+    concurrent_map& operator=( std::initializer_list<value_type> il ) {
+        base_type::operator= (il);
+        return *this;
+    }
+
+    // Observers
+    mapped_type& at(const key_type& key) {
+        iterator it = this->find(key);
+
+        if (it == this->end()) {
+            throw_exception(exception_id::invalid_key);
+        }
+        return it->second;
+    }
+
+    const mapped_type& at(const key_type& key) const {
+        return const_cast<concurrent_map*>(this)->at(key);
+    }
+
+    mapped_type& operator[](const key_type& key) {
+        iterator it = this->find(key);
+
+        if (it == this->end()) {
+            it = this->emplace(std::piecewise_construct, std::forward_as_tuple(key), std::tuple<>()).first;
+        }
+        return it->second;
+    }
+
+    mapped_type& operator[](key_type&& key) {
+        iterator it = this->find(key);
+
+        if (it == this->end()) {
+            it = this->emplace(std::piecewise_construct, std::forward_as_tuple(std::move(key)), std::tuple<>()).first;
+        }
+        return it->second;
+    }
+
+    using base_type::insert;
+
+    template <typename P>
+    typename std::enable_if<std::is_constructible<value_type, P&&>::value,
+                            std::pair<iterator, bool>>::type insert( P&& value )
+    {
+        return this->emplace(std::forward<P>(value));
+    }
+
+    template <typename P>
+    typename std::enable_if<std::is_constructible<value_type, P&&>::value,
+                            iterator>::type insert( const_iterator hint, P&& value )
+    {
+        return this->emplace_hint(hint, std::forward<P>(value));
+    }
+
+    template<typename OtherCompare>
+    void merge(concurrent_map<key_type, mapped_type, OtherCompare, Allocator>& source) {
+        this->internal_merge(source);
+    }
+
+    template<typename OtherCompare>
+    void merge(concurrent_map<key_type, mapped_type, OtherCompare, Allocator>&& source) {
+        this->internal_merge(std::move(source));
+    }
+
+    template<typename OtherCompare>
+    void merge(concurrent_multimap<key_type, mapped_type, OtherCompare, Allocator>& source) {
+        this->internal_merge(source);
+    }
+
+    template<typename OtherCompare>
+    void merge(concurrent_multimap<key_type, mapped_type, OtherCompare, Allocator>&& source) {
+        this->internal_merge(std::move(source));
+    }
+}; // class concurrent_map
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 
-            template <typename It, typename Comp = std::less<iterator_key_t<It>>,
-                      typename Alloc = tbb::tbb_allocator<iterator_alloc_pair_t<It>>,
-                      typename = std::enable_if_t<is_input_iterator_v<It>>,
-                      typename = std::enable_if_t<is_allocator_v<Alloc>>,
-                      typename = std::enable_if_t<!is_allocator_v<Comp>>>
-            concurrent_map(It, It, Comp = Comp(), Alloc = Alloc())
-                    -> concurrent_map<iterator_key_t<It>, iterator_mapped_t<It>, Comp, Alloc>;
-
-            template <typename Key, typename T, typename Comp = std::less<std::remove_const_t<Key>>,
-                      typename Alloc = tbb::tbb_allocator<std::pair<const Key, T>>,
-                      typename = std::enable_if_t<is_allocator_v<Alloc>>,
-                      typename = std::enable_if_t<!is_allocator_v<Comp>>>
-            concurrent_map(std::initializer_list<std::pair<Key, T>>, Comp = Comp(), Alloc = Alloc())
-                    -> concurrent_map<std::remove_const_t<Key>, T, Comp, Alloc>;
-
-            template <typename It, typename Alloc, typename = std::enable_if_t<is_input_iterator_v<It>>,
-                      typename = std::enable_if_t<is_allocator_v<Alloc>>>
-            concurrent_map(It, It, Alloc) -> concurrent_map<iterator_key_t<It>, iterator_mapped_t<It>,
-                                                            std::less<iterator_key_t<It>>, Alloc>;
-
-            template <typename Key, typename T, typename Alloc,
-                      typename = std::enable_if_t<is_allocator_v<Alloc>>>
-            concurrent_map(std::initializer_list<std::pair<Key, T>>, Alloc)
-                    -> concurrent_map<std::remove_const_t<Key>, T, std::less<std::remove_const_t<Key>>,
-                                      Alloc>;
-
-#endif// __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
-
-            template <typename Key, typename Value, typename Compare, typename Allocator>
-            void swap(concurrent_map<Key, Value, Compare, Allocator>& lhs,
-                      concurrent_map<Key, Value, Compare, Allocator>& rhs) {
-                lhs.swap(rhs);
-            }
-
-            template <typename Key, typename Value, typename Compare = std::less<Key>,
-                      typename Allocator = tbb::tbb_allocator<std::pair<const Key, Value>>>
-            class concurrent_multimap
-                : public concurrent_skip_list<map_traits<
-                          Key, Value, Compare, concurrent_geometric_level_generator<32>, Allocator, true>> {
-                using base_type = concurrent_skip_list<map_traits<
-                        Key, Value, Compare, concurrent_geometric_level_generator<32>, Allocator, true>>;
-
-            public:
-                using key_type = Key;
-                using mapped_type = Value;
-                using value_type = typename base_type::value_type;
-                using size_type = typename base_type::size_type;
-                using difference_type = typename base_type::difference_type;
-                using key_compare = Compare;
-                using value_compare = typename base_type::value_compare;
-                using allocator_type = Allocator;
-
-                using reference = typename base_type::reference;
-                using const_reference = typename base_type::const_reference;
-                using pointer = typename base_type::pointer;
-                using const_pointer = typename base_type::const_pointer;
-
-                using iterator = typename base_type::iterator;
-                using const_iterator = typename base_type::const_iterator;
-
-                using node_type = typename base_type::node_type;
-
-                // Include constructors of base_type
-                using base_type::base_type;
-                using base_type::insert;
-                using base_type::operator=;
-
-                // Required for implicit deduction guides
-                concurrent_multimap() = default;
-                concurrent_multimap(const concurrent_multimap&) = default;
-                concurrent_multimap(const concurrent_multimap& other, const allocator_type& alloc)
-                    : base_type(other, alloc) {}
-                concurrent_multimap(concurrent_multimap&&) = default;
-                concurrent_multimap(concurrent_multimap&& other, const allocator_type& alloc)
-                    : base_type(std::move(other), alloc) {}
-                // Required to respect the rule of 5
-                concurrent_multimap& operator=(const concurrent_multimap&) = default;
-                concurrent_multimap& operator=(concurrent_multimap&&) = default;
-
-                template <typename P>
-                typename std::enable_if<std::is_constructible<value_type, P&&>::value,
-                                        std::pair<iterator, bool>>::type
-                insert(P&& value) {
-                    return this->emplace(std::forward<P>(value));
-                }
-
-                template <typename P>
-                typename std::enable_if<std::is_constructible<value_type, P&&>::value, iterator>::type
-                insert(const_iterator hint, P&& value) {
-                    return this->emplace_hint(hint, std::forward<P>(value));
-                }
-
-                template <typename OtherCompare>
-                void merge(concurrent_multimap<key_type, mapped_type, OtherCompare, Allocator>& source) {
-                    this->internal_merge(source);
-                }
-
-                template <typename OtherCompare>
-                void merge(concurrent_multimap<key_type, mapped_type, OtherCompare, Allocator>&& source) {
-                    this->internal_merge(std::move(source));
-                }
-
-                template <typename OtherCompare>
-                void merge(concurrent_map<key_type, mapped_type, OtherCompare, Allocator>& source) {
-                    this->internal_merge(source);
-                }
-
-                template <typename OtherCompare>
-                void merge(concurrent_map<key_type, mapped_type, OtherCompare, Allocator>&& source) {
-                    this->internal_merge(std::move(source));
-                }
-            };// class concurrent_multimap
+template <typename It,
+          typename Comp = std::less<iterator_key_t<It>>,
+          typename Alloc = tbb::tbb_allocator<iterator_alloc_pair_t<It>>,
+          typename = std::enable_if_t<is_input_iterator_v<It>>,
+          typename = std::enable_if_t<is_allocator_v<Alloc>>,
+          typename = std::enable_if_t<!is_allocator_v<Comp>>>
+concurrent_map( It, It, Comp = Comp(), Alloc = Alloc() )
+-> concurrent_map<iterator_key_t<It>, iterator_mapped_t<It>, Comp, Alloc>;
+
+template <typename Key, typename T,
+          typename Comp = std::less<std::remove_const_t<Key>>,
+          typename Alloc = tbb::tbb_allocator<std::pair<const Key, T>>,
+          typename = std::enable_if_t<is_allocator_v<Alloc>>,
+          typename = std::enable_if_t<!is_allocator_v<Comp>>>
+concurrent_map( std::initializer_list<std::pair<Key, T>>, Comp = Comp(), Alloc = Alloc() )
+-> concurrent_map<std::remove_const_t<Key>, T, Comp, Alloc>;
+
+template <typename It, typename Alloc,
+          typename = std::enable_if_t<is_input_iterator_v<It>>,
+          typename = std::enable_if_t<is_allocator_v<Alloc>>>
+concurrent_map( It, It, Alloc )
+-> concurrent_map<iterator_key_t<It>, iterator_mapped_t<It>,
+                  std::less<iterator_key_t<It>>, Alloc>;
+
+template <typename Key, typename T, typename Alloc,
+          typename = std::enable_if_t<is_allocator_v<Alloc>>>
+concurrent_map( std::initializer_list<std::pair<Key, T>>, Alloc )
+-> concurrent_map<std::remove_const_t<Key>, T, std::less<std::remove_const_t<Key>>, Alloc>;
+
+#endif // __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
+
+template <typename Key, typename Value, typename Compare, typename Allocator>
+void swap( concurrent_map<Key, Value, Compare, Allocator>& lhs,
+           concurrent_map<Key, Value, Compare, Allocator>& rhs )
+{
+    lhs.swap(rhs);
+}
+
+template <typename Key, typename Value, typename Compare = std::less<Key>, typename Allocator = tbb::tbb_allocator<std::pair<const Key, Value>>>
+class concurrent_multimap : public concurrent_skip_list<map_traits<Key, Value, Compare, concurrent_geometric_level_generator<32>, Allocator, true>> {
+    using base_type = concurrent_skip_list<map_traits<Key, Value, Compare, concurrent_geometric_level_generator<32>, Allocator, true>>;
+public:
+    using key_type = Key;
+    using mapped_type = Value;
+    using value_type = typename base_type::value_type;
+    using size_type = typename base_type::size_type;
+    using difference_type = typename base_type::difference_type;
+    using key_compare = Compare;
+    using value_compare = typename base_type::value_compare;
+    using allocator_type = Allocator;
+
+    using reference = typename base_type::reference;
+    using const_reference = typename base_type::const_reference;
+    using pointer = typename base_type::pointer;
+    using const_pointer = typename base_type::const_pointer;
+
+    using iterator = typename base_type::iterator;
+    using const_iterator = typename base_type::const_iterator;
+
+    using node_type = typename base_type::node_type;
+
+    // Include constructors of base_type
+    using base_type::base_type;
+    using base_type::insert;
+
+    // Required for implicit deduction guides
+    concurrent_multimap() = default;
+    concurrent_multimap( const concurrent_multimap& ) = default;
+    concurrent_multimap( const concurrent_multimap& other, const allocator_type& alloc ) : base_type(other, alloc) {}
+    concurrent_multimap( concurrent_multimap&& ) = default;
+    concurrent_multimap( concurrent_multimap&& other, const allocator_type& alloc ) : base_type(std::move(other), alloc) {}
+    // Required to respect the rule of 5
+    concurrent_multimap& operator=( const concurrent_multimap& ) = default;
+    concurrent_multimap& operator=( concurrent_multimap&& ) = default;
+
+    concurrent_multimap& operator=( std::initializer_list<value_type> il ) {
+        base_type::operator= (il);
+        return *this;
+    }
+
+    template <typename P>
+    typename std::enable_if<std::is_constructible<value_type, P&&>::value,
+                            std::pair<iterator, bool>>::type insert( P&& value )
+    {
+        return this->emplace(std::forward<P>(value));
+    }
+
+    template <typename P>
+    typename std::enable_if<std::is_constructible<value_type, P&&>::value,
+                            iterator>::type insert( const_iterator hint, P&& value )
+    {
+        return this->emplace_hint(hint, std::forward<P>(value));
+    }
+
+    template<typename OtherCompare>
+    void merge(concurrent_multimap<key_type, mapped_type, OtherCompare, Allocator>& source) {
+        this->internal_merge(source);
+    }
+
+    template<typename OtherCompare>
+    void merge(concurrent_multimap<key_type, mapped_type, OtherCompare, Allocator>&& source) {
+        this->internal_merge(std::move(source));
+    }
+
+    template<typename OtherCompare>
+    void merge(concurrent_map<key_type, mapped_type, OtherCompare, Allocator>& source) {
+        this->internal_merge(source);
+    }
+
+    template<typename OtherCompare>
+    void merge(concurrent_map<key_type, mapped_type, OtherCompare, Allocator>&& source) {
+        this->internal_merge(std::move(source));
+    }
+}; // class concurrent_multimap
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 
-            template <typename It, typename Comp = std::less<iterator_key_t<It>>,
-                      typename Alloc = tbb::tbb_allocator<iterator_alloc_pair_t<It>>,
-                      typename = std::enable_if_t<is_input_iterator_v<It>>,
-                      typename = std::enable_if_t<is_allocator_v<Alloc>>,
-                      typename = std::enable_if_t<!is_allocator_v<Comp>>>
-            concurrent_multimap(It, It, Comp = Comp(), Alloc = Alloc())
-                    -> concurrent_multimap<iterator_key_t<It>, iterator_mapped_t<It>, Comp, Alloc>;
-
-            template <typename Key, typename T, typename Comp = std::less<std::remove_const_t<Key>>,
-                      typename Alloc = tbb::tbb_allocator<std::pair<const Key, T>>,
-                      typename = std::enable_if_t<is_allocator_v<Alloc>>,
-                      typename = std::enable_if_t<!is_allocator_v<Comp>>>
-            concurrent_multimap(std::initializer_list<std::pair<Key, T>>, Comp = Comp(), Alloc = Alloc())
-                    -> concurrent_multimap<std::remove_const_t<Key>, T, Comp, Alloc>;
-
-            template <typename It, typename Alloc, typename = std::enable_if_t<is_input_iterator_v<It>>,
-                      typename = std::enable_if_t<is_allocator_v<Alloc>>>
-            concurrent_multimap(It, It, Alloc)
-                    -> concurrent_multimap<iterator_key_t<It>, iterator_mapped_t<It>,
-                                           std::less<iterator_key_t<It>>, Alloc>;
-
-            template <typename Key, typename T, typename Alloc,
-                      typename = std::enable_if_t<is_allocator_v<Alloc>>>
-            concurrent_multimap(std::initializer_list<std::pair<Key, T>>, Alloc)
-                    -> concurrent_multimap<std::remove_const_t<Key>, T, std::less<std::remove_const_t<Key>>,
-                                           Alloc>;
-
-#endif// __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
-
-            template <typename Key, typename Value, typename Compare, typename Allocator>
-            void swap(concurrent_multimap<Key, Value, Compare, Allocator>& lhs,
-                      concurrent_multimap<Key, Value, Compare, Allocator>& rhs) {
-                lhs.swap(rhs);
-            }
-
-        }// namespace d2
-    }    // namespace detail
-
-    inline namespace v1 {
-
-        using detail::split;
-        using detail::d2::concurrent_map;
-        using detail::d2::concurrent_multimap;
-
-    }// namespace v1
-}// namespace tbb
-
-#endif// __TBB_concurrent_map_H
+template <typename It,
+          typename Comp = std::less<iterator_key_t<It>>,
+          typename Alloc = tbb::tbb_allocator<iterator_alloc_pair_t<It>>,
+          typename = std::enable_if_t<is_input_iterator_v<It>>,
+          typename = std::enable_if_t<is_allocator_v<Alloc>>,
+          typename = std::enable_if_t<!is_allocator_v<Comp>>>
+concurrent_multimap( It, It, Comp = Comp(), Alloc = Alloc() )
+-> concurrent_multimap<iterator_key_t<It>, iterator_mapped_t<It>, Comp, Alloc>;
+
+template <typename Key, typename T,
+          typename Comp = std::less<std::remove_const_t<Key>>,
+          typename Alloc = tbb::tbb_allocator<std::pair<const Key, T>>,
+          typename = std::enable_if_t<is_allocator_v<Alloc>>,
+          typename = std::enable_if_t<!is_allocator_v<Comp>>>
+concurrent_multimap( std::initializer_list<std::pair<Key, T>>, Comp = Comp(), Alloc = Alloc() )
+-> concurrent_multimap<std::remove_const_t<Key>, T, Comp, Alloc>;
+
+template <typename It, typename Alloc,
+          typename = std::enable_if_t<is_input_iterator_v<It>>,
+          typename = std::enable_if_t<is_allocator_v<Alloc>>>
+concurrent_multimap( It, It, Alloc )
+-> concurrent_multimap<iterator_key_t<It>, iterator_mapped_t<It>,
+                       std::less<iterator_key_t<It>>, Alloc>;
+
+template <typename Key, typename T, typename Alloc,
+          typename = std::enable_if_t<is_allocator_v<Alloc>>>
+concurrent_multimap( std::initializer_list<std::pair<Key, T>>, Alloc )
+-> concurrent_multimap<std::remove_const_t<Key>, T, std::less<std::remove_const_t<Key>>, Alloc>;
+
+
+#endif // __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
+
+template <typename Key, typename Value, typename Compare, typename Allocator>
+void swap( concurrent_multimap<Key, Value, Compare, Allocator>& lhs,
+           concurrent_multimap<Key, Value, Compare, Allocator>& rhs )
+{
+    lhs.swap(rhs);
+}
+
+} // namespace d2
+} // namespace detail
+
+inline namespace v1 {
+
+using detail::d2::concurrent_map;
+using detail::d2::concurrent_multimap;
+using detail::split;
+
+} // inline namespace v1
+} // namespace tbb
+
+#endif // __TBB_concurrent_map_H
diff --git a/external/tbb/include/oneapi/tbb/concurrent_priority_queue.h b/external/tbb/include/oneapi/tbb/concurrent_priority_queue.h
index 0f6e3ee4..6d7eb3eb 100644
--- a/external/tbb/include/oneapi/tbb/concurrent_priority_queue.h
+++ b/external/tbb/include/oneapi/tbb/concurrent_priority_queue.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -17,393 +17,395 @@
 #ifndef __TBB_concurrent_priority_queue_H
 #define __TBB_concurrent_priority_queue_H
 
-#include "cache_aligned_allocator.h"
+#include "detail/_namespace_injection.h"
 #include "detail/_aggregator.h"
+#include "detail/_template_helpers.h"
 #include "detail/_allocator_traits.h"
-#include "detail/_containers_helpers.h"
-#include "detail/_exception.h"
-#include "detail/_namespace_injection.h"
 #include "detail/_range_common.h"
-#include "detail/_template_helpers.h"
+#include "detail/_exception.h"
 #include "detail/_utils.h"
+#include "detail/_containers_helpers.h"
+#include "cache_aligned_allocator.h"
+#include <vector>
+#include <iterator>
 #include <functional>
+#include <utility>
 #include <initializer_list>
-#include <iterator>
 #include <type_traits>
-#include <utility>
-#include <vector>
 
 namespace tbb {
-    namespace detail {
-        namespace d1 {
-
-            template <typename T, typename Compare = std::less<T>,
-                      typename Allocator = cache_aligned_allocator<T>>
-            class concurrent_priority_queue {
-            public:
-                using value_type = T;
-                using reference = T&;
-                using const_reference = const T&;
-
-                using size_type = std::size_t;
-                using difference_type = std::ptrdiff_t;
-
-                using allocator_type = Allocator;
-
-                concurrent_priority_queue() : concurrent_priority_queue(allocator_type {}) {}
-
-                explicit concurrent_priority_queue(const allocator_type& alloc)
-                    : mark(0), my_size(0), my_compare(), data(alloc) {
-                    my_aggregator.initialize_handler(functor {this});
-                }
-
-                explicit concurrent_priority_queue(const Compare& compare,
-                                                   const allocator_type& alloc = allocator_type())
-                    : mark(0), my_size(0), my_compare(compare), data(alloc) {
-                    my_aggregator.initialize_handler(functor {this});
-                }
-
-                explicit concurrent_priority_queue(size_type init_capacity,
-                                                   const allocator_type& alloc = allocator_type())
-                    : mark(0), my_size(0), my_compare(), data(alloc) {
-                    data.reserve(init_capacity);
-                    my_aggregator.initialize_handler(functor {this});
-                }
-
-                explicit concurrent_priority_queue(size_type init_capacity, const Compare& compare,
-                                                   const allocator_type& alloc = allocator_type())
-                    : mark(0), my_size(0), my_compare(compare), data(alloc) {
-                    data.reserve(init_capacity);
-                    my_aggregator.initialize_handler(functor {this});
-                }
-
-                template <typename InputIterator>
-                concurrent_priority_queue(InputIterator begin, InputIterator end, const Compare& compare,
-                                          const allocator_type& alloc = allocator_type())
-                    : mark(0), my_compare(compare), data(begin, end, alloc) {
-                    my_aggregator.initialize_handler(functor {this});
-                    heapify();
-                    my_size.store(data.size(), std::memory_order_relaxed);
-                }
-
-                template <typename InputIterator>
-                concurrent_priority_queue(InputIterator begin, InputIterator end,
-                                          const allocator_type& alloc = allocator_type())
-                    : concurrent_priority_queue(begin, end, Compare(), alloc) {}
-
-                concurrent_priority_queue(std::initializer_list<value_type> init, const Compare& compare,
-                                          const allocator_type& alloc = allocator_type())
-                    : concurrent_priority_queue(init.begin(), init.end(), compare, alloc) {}
-
-                concurrent_priority_queue(std::initializer_list<value_type> init,
-                                          const allocator_type& alloc = allocator_type())
-                    : concurrent_priority_queue(init, Compare(), alloc) {}
-
-                concurrent_priority_queue(const concurrent_priority_queue& other)
-                    : mark(other.mark), my_size(other.my_size.load(std::memory_order_relaxed)),
-                      my_compare(other.my_compare), data(other.data) {
-                    my_aggregator.initialize_handler(functor {this});
-                }
-
-                concurrent_priority_queue(const concurrent_priority_queue& other, const allocator_type& alloc)
-                    : mark(other.mark), my_size(other.my_size.load(std::memory_order_relaxed)),
-                      my_compare(other.my_compare), data(other.data, alloc) {
-                    my_aggregator.initialize_handler(functor {this});
-                }
-
-                concurrent_priority_queue(concurrent_priority_queue&& other)
-                    : mark(other.mark), my_size(other.my_size.load(std::memory_order_relaxed)),
-                      my_compare(other.my_compare), data(std::move(other.data)) {
-                    my_aggregator.initialize_handler(functor {this});
-                }
-
-                concurrent_priority_queue(concurrent_priority_queue&& other, const allocator_type& alloc)
-                    : mark(other.mark), my_size(other.my_size.load(std::memory_order_relaxed)),
-                      my_compare(other.my_compare), data(std::move(other.data), alloc) {
-                    my_aggregator.initialize_handler(functor {this});
-                }
-
-                concurrent_priority_queue& operator=(const concurrent_priority_queue& other) {
-                    if (this != &other) {
-                        data = other.data;
-                        mark = other.mark;
-                        my_size.store(other.my_size.load(std::memory_order_relaxed),
-                                      std::memory_order_relaxed);
-                    }
-                    return *this;
-                }
-
-                concurrent_priority_queue& operator=(concurrent_priority_queue&& other) {
-                    if (this != &other) {
-                        // TODO: check if exceptions from std::vector::operator=(vector&&) should be handled separately
-                        data = std::move(other.data);
-                        mark = other.mark;
-                        my_size.store(other.my_size.load(std::memory_order_relaxed),
-                                      std::memory_order_relaxed);
-                    }
-                    return *this;
-                }
-
-                concurrent_priority_queue& operator=(std::initializer_list<value_type> init) {
-                    assign(init.begin(), init.end());
-                    return *this;
-                }
-
-                template <typename InputIterator>
-                void assign(InputIterator begin, InputIterator end) {
-                    data.assign(begin, end);
-                    mark = 0;
-                    my_size.store(data.size(), std::memory_order_relaxed);
-                    heapify();
-                }
-
-                void assign(std::initializer_list<value_type> init) { assign(init.begin(), init.end()); }
-
-                /* Returned value may not reflect results of pending operations.
+namespace detail {
+namespace d1 {
+
+template <typename T, typename Compare = std::less<T>, typename Allocator = cache_aligned_allocator<T>>
+class concurrent_priority_queue {
+public:
+    using value_type = T;
+    using reference = T&;
+    using const_reference = const T&;
+
+    using size_type = std::size_t;
+    using difference_type = std::ptrdiff_t;
+
+    using allocator_type = Allocator;
+
+    concurrent_priority_queue() : concurrent_priority_queue(allocator_type{}) {}
+
+    explicit concurrent_priority_queue( const allocator_type& alloc )
+        : mark(0), my_size(0), my_compare(), data(alloc)
+    {
+        my_aggregator.initialize_handler(functor{this});
+    }
+
+    explicit concurrent_priority_queue( const Compare& compare, const allocator_type& alloc = allocator_type() )
+        : mark(0), my_size(0), my_compare(compare), data(alloc)
+    {
+        my_aggregator.initialize_handler(functor{this});
+    }
+
+    explicit concurrent_priority_queue( size_type init_capacity, const allocator_type& alloc = allocator_type() )
+        : mark(0), my_size(0), my_compare(), data(alloc)
+    {
+        data.reserve(init_capacity);
+        my_aggregator.initialize_handler(functor{this});
+    }
+
+    explicit concurrent_priority_queue( size_type init_capacity, const Compare& compare, const allocator_type& alloc = allocator_type() )
+        : mark(0), my_size(0), my_compare(compare), data(alloc)
+    {
+        data.reserve(init_capacity);
+        my_aggregator.initialize_handler(functor{this});
+    }
+
+    template <typename InputIterator>
+    concurrent_priority_queue( InputIterator begin, InputIterator end, const Compare& compare, const allocator_type& alloc = allocator_type() )
+        : mark(0), my_compare(compare), data(begin, end, alloc)
+    {
+        my_aggregator.initialize_handler(functor{this});
+        heapify();
+        my_size.store(data.size(), std::memory_order_relaxed);
+    }
+
+    template <typename InputIterator>
+    concurrent_priority_queue( InputIterator begin, InputIterator end, const allocator_type& alloc = allocator_type() )
+        : concurrent_priority_queue(begin, end, Compare(), alloc) {}
+
+    concurrent_priority_queue( std::initializer_list<value_type> init, const Compare& compare, const allocator_type& alloc = allocator_type() )
+        : concurrent_priority_queue(init.begin(), init.end(), compare, alloc) {}
+
+    concurrent_priority_queue( std::initializer_list<value_type> init, const allocator_type& alloc = allocator_type() )
+        : concurrent_priority_queue(init, Compare(), alloc) {}
+
+    concurrent_priority_queue( const concurrent_priority_queue& other )
+        : mark(other.mark), my_size(other.my_size.load(std::memory_order_relaxed)), my_compare(other.my_compare),
+          data(other.data)
+    {
+        my_aggregator.initialize_handler(functor{this});
+    }
+
+    concurrent_priority_queue( const concurrent_priority_queue& other, const allocator_type& alloc )
+        : mark(other.mark), my_size(other.my_size.load(std::memory_order_relaxed)), my_compare(other.my_compare),
+          data(other.data, alloc)
+    {
+        my_aggregator.initialize_handler(functor{this});
+    }
+
+    concurrent_priority_queue( concurrent_priority_queue&& other )
+        : mark(other.mark), my_size(other.my_size.load(std::memory_order_relaxed)), my_compare(other.my_compare),
+          data(std::move(other.data))
+    {
+        my_aggregator.initialize_handler(functor{this});
+    }
+
+    concurrent_priority_queue( concurrent_priority_queue&& other, const allocator_type& alloc )
+        : mark(other.mark), my_size(other.my_size.load(std::memory_order_relaxed)), my_compare(other.my_compare),
+          data(std::move(other.data), alloc)
+    {
+        my_aggregator.initialize_handler(functor{this});
+    }
+
+    concurrent_priority_queue& operator=( const concurrent_priority_queue& other ) {
+        if (this != &other) {
+            data = other.data;
+            mark = other.mark;
+            my_size.store(other.my_size.load(std::memory_order_relaxed), std::memory_order_relaxed);
+        }
+        return *this;
+    }
+
+    concurrent_priority_queue& operator=( concurrent_priority_queue&& other ) {
+        if (this != &other) {
+            // TODO: check if exceptions from std::vector::operator=(vector&&) should be handled separately
+            data = std::move(other.data);
+            mark = other.mark;
+            my_size.store(other.my_size.load(std::memory_order_relaxed), std::memory_order_relaxed);
+        }
+        return *this;
+    }
+
+    concurrent_priority_queue& operator=( std::initializer_list<value_type> init ) {
+        assign(init.begin(), init.end());
+        return *this;
+    }
+
+    template <typename InputIterator>
+    void assign( InputIterator begin, InputIterator end ) {
+        data.assign(begin, end);
+        mark = 0;
+        my_size.store(data.size(), std::memory_order_relaxed);
+        heapify();
+    }
+
+    void assign( std::initializer_list<value_type> init ) {
+        assign(init.begin(), init.end());
+    }
+
+    /* Returned value may not reflect results of pending operations.
        This operation reads shared data and will trigger a race condition. */
-                __TBB_nodiscard bool empty() const { return size() == 0; }
+    __TBB_nodiscard bool empty() const { return size() == 0; }
 
-                // Returns the current number of elements contained in the queue
-                /* Returned value may not reflect results of pending operations.
+    // Returns the current number of elements contained in the queue
+    /* Returned value may not reflect results of pending operations.
        This operation reads shared data and will trigger a race condition. */
-                size_type size() const { return my_size.load(std::memory_order_relaxed); }
-
-                /* This operation can be safely used concurrently with other push, try_pop or emplace operations. */
-                void push(const value_type& value) {
-                    cpq_operation op_data(value, PUSH_OP);
-                    my_aggregator.execute(&op_data);
-                    if (op_data.status == FAILED) throw_exception(exception_id::bad_alloc);
-                }
-
-                /* This operation can be safely used concurrently with other push, try_pop or emplace operations. */
-                void push(value_type&& value) {
-                    cpq_operation op_data(value, PUSH_RVALUE_OP);
-                    my_aggregator.execute(&op_data);
-                    if (op_data.status == FAILED) throw_exception(exception_id::bad_alloc);
-                }
-
-                /* This operation can be safely used concurrently with other push, try_pop or emplace operations. */
-                template <typename... Args>
-                void emplace(Args&&... args) {
-                    // TODO: support uses allocator construction in this place
-                    push(value_type(std::forward<Args>(args)...));
-                }
-
-                // Gets a reference to and removes highest priority element
-                /* If a highest priority element was found, sets elem and returns true,
+    size_type size() const { return my_size.load(std::memory_order_relaxed); }
+
+    /* This operation can be safely used concurrently with other push, try_pop or emplace operations. */
+    void push( const value_type& value ) {
+        cpq_operation op_data(value, PUSH_OP);
+        my_aggregator.execute(&op_data);
+        if (op_data.status == FAILED)
+            throw_exception(exception_id::bad_alloc);
+    }
+
+    /* This operation can be safely used concurrently with other push, try_pop or emplace operations. */
+    void push( value_type&& value ) {
+        cpq_operation op_data(value, PUSH_RVALUE_OP);
+        my_aggregator.execute(&op_data);
+        if (op_data.status == FAILED)
+            throw_exception(exception_id::bad_alloc);
+    }
+
+    /* This operation can be safely used concurrently with other push, try_pop or emplace operations. */
+    template <typename... Args>
+    void emplace( Args&&... args ) {
+        // TODO: support uses allocator construction in this place
+        push(value_type(std::forward<Args>(args)...));
+    }
+
+    // Gets a reference to and removes highest priority element
+    /* If a highest priority element was found, sets elem and returns true,
        otherwise returns false.
        This operation can be safely used concurrently with other push, try_pop or emplace operations. */
-                bool try_pop(value_type& value) {
-                    cpq_operation op_data(value, POP_OP);
-                    my_aggregator.execute(&op_data);
-                    return op_data.status == SUCCEEDED;
-                }
-
-                // This operation affects the whole container => it is not thread-safe
-                void clear() {
-                    data.clear();
-                    mark = 0;
-                    my_size.store(0, std::memory_order_relaxed);
-                }
+    bool try_pop( value_type& value ) {
+        cpq_operation op_data(value, POP_OP);
+        my_aggregator.execute(&op_data);
+        return op_data.status == SUCCEEDED;
+    }
+
+    // This operation affects the whole container => it is not thread-safe
+    void clear() {
+        data.clear();
+        mark = 0;
+        my_size.store(0, std::memory_order_relaxed);
+    }
+
+    // This operation affects the whole container => it is not thread-safe
+    void swap( concurrent_priority_queue& other ) {
+        if (this != &other) {
+            using std::swap;
+            swap(data, other.data);
+            swap(mark, other.mark);
+
+            size_type sz = my_size.load(std::memory_order_relaxed);
+            my_size.store(other.my_size.load(std::memory_order_relaxed), std::memory_order_relaxed);
+            other.my_size.store(sz, std::memory_order_relaxed);
+        }
+    }
+
+    allocator_type get_allocator() const { return data.get_allocator(); }
+private:
+    enum operation_type {INVALID_OP, PUSH_OP, POP_OP, PUSH_RVALUE_OP};
+    enum operation_status {WAIT = 0, SUCCEEDED, FAILED};
+
+    class cpq_operation : public aggregated_operation<cpq_operation> {
+    public:
+        operation_type type;
+        union {
+            value_type* elem;
+            size_type sz;
+        };
+        cpq_operation( const value_type& value, operation_type t )
+            : type(t), elem(const_cast<value_type*>(&value)) {}
+    }; // class cpq_operation
+
+    class functor {
+        concurrent_priority_queue* my_cpq;
+    public:
+        functor() : my_cpq(nullptr) {}
+        functor( concurrent_priority_queue* cpq ) : my_cpq(cpq) {}
+
+        void operator()(cpq_operation* op_list) {
+            __TBB_ASSERT(my_cpq != nullptr, "Invalid functor");
+            my_cpq->handle_operations(op_list);
+        }
+    }; // class functor
+
+    void handle_operations( cpq_operation* op_list ) {
+        call_itt_notify(acquired, this);
+        cpq_operation* tmp, *pop_list = nullptr;
+        __TBB_ASSERT(mark == data.size(), nullptr);
+
+        // First pass processes all constant (amortized; reallocation may happen) time pushes and pops.
+        while(op_list) {
+            // ITT note: &(op_list->status) tag is used to cover accesses to op_list
+            // node. This thread is going to handle the operation, and so will acquire it
+            // and perform the associated operation w/o triggering a race condition; the
+            // thread that created the operation is waiting on the status field, so when
+            // this thread is done with the operation, it will perform a
+            // store_with_release to give control back to the waiting thread in
+            // aggregator::insert_operation.
+            // TODO: enable
+            call_itt_notify(acquired, &(op_list->status));
+            __TBB_ASSERT(op_list->type != INVALID_OP, nullptr);
+
+            tmp = op_list;
+            op_list = op_list->next.load(std::memory_order_relaxed);
+            if (tmp->type == POP_OP) {
+                if (mark < data.size() &&
+                    my_compare(data[0], data.back()))
+                {
+                    // there are newly pushed elems and the last one is higher than top
+                    *(tmp->elem) = std::move(data.back());
+                    my_size.store(my_size.load(std::memory_order_relaxed) - 1, std::memory_order_relaxed);
+                    tmp->status.store(uintptr_t(SUCCEEDED), std::memory_order_release);
 
-                // This operation affects the whole container => it is not thread-safe
-                void swap(concurrent_priority_queue& other) {
-                    if (this != &other) {
-                        using std::swap;
-                        swap(data, other.data);
-                        swap(mark, other.mark);
-
-                        size_type sz = my_size.load(std::memory_order_relaxed);
-                        my_size.store(other.my_size.load(std::memory_order_relaxed),
-                                      std::memory_order_relaxed);
-                        other.my_size.store(sz, std::memory_order_relaxed);
-                    }
+                    data.pop_back();
+                    __TBB_ASSERT(mark <= data.size(), nullptr);
+                } else { // no convenient item to pop; postpone
+                    tmp->next.store(pop_list, std::memory_order_relaxed);
+                    pop_list = tmp;
                 }
-
-                allocator_type get_allocator() const { return data.get_allocator(); }
-
-            private:
-                enum operation_type { INVALID_OP, PUSH_OP, POP_OP, PUSH_RVALUE_OP };
-                enum operation_status { WAIT = 0, SUCCEEDED, FAILED };
-
-                class cpq_operation : public aggregated_operation<cpq_operation> {
-                public:
-                    operation_type type;
-                    union {
-                        value_type* elem;
-                        size_type sz;
-                    };
-                    cpq_operation(const value_type& value, operation_type t)
-                        : type(t), elem(const_cast<value_type*>(&value)) {}
-                };// class cpq_operation
-
-                class functor {
-                    concurrent_priority_queue* my_cpq;
-
-                public:
-                    functor() : my_cpq(nullptr) {}
-                    functor(concurrent_priority_queue* cpq) : my_cpq(cpq) {}
-
-                    void operator()(cpq_operation* op_list) {
-                        __TBB_ASSERT(my_cpq != nullptr, "Invalid functor");
-                        my_cpq->handle_operations(op_list);
-                    }
-                };// class functor
-
-                void handle_operations(cpq_operation* op_list) {
-                    call_itt_notify(acquired, this);
-                    cpq_operation *tmp, *pop_list = nullptr;
-                    __TBB_ASSERT(mark == data.size(), NULL);
-
-                    // First pass processes all constant (amortized; reallocation may happen) time pushes and pops.
-                    while (op_list) {
-                        // ITT note: &(op_list->status) tag is used to cover accesses to op_list
-                        // node. This thread is going to handle the operation, and so will acquire it
-                        // and perform the associated operation w/o triggering a race condition; the
-                        // thread that created the operation is waiting on the status field, so when
-                        // this thread is done with the operation, it will perform a
-                        // store_with_release to give control back to the waiting thread in
-                        // aggregator::insert_operation.
-                        // TODO: enable
-                        call_itt_notify(acquired, &(op_list->status));
-                        __TBB_ASSERT(op_list->type != INVALID_OP, NULL);
-
-                        tmp = op_list;
-                        op_list = op_list->next.load(std::memory_order_relaxed);
-                        if (tmp->type == POP_OP) {
-                            if (mark < data.size() && my_compare(data[0], data.back())) {
-                                // there are newly pushed elems and the last one is higher than top
-                                *(tmp->elem) = std::move(data.back());
-                                my_size.store(my_size.load(std::memory_order_relaxed) - 1,
-                                              std::memory_order_relaxed);
-                                tmp->status.store(uintptr_t(SUCCEEDED), std::memory_order_release);
-
-                                data.pop_back();
-                                __TBB_ASSERT(mark <= data.size(), NULL);
-                            } else {// no convenient item to pop; postpone
-                                tmp->next.store(pop_list, std::memory_order_relaxed);
-                                pop_list = tmp;
-                            }
-                        } else {// PUSH_OP or PUSH_RVALUE_OP
-                            __TBB_ASSERT(tmp->type == PUSH_OP || tmp->type == PUSH_RVALUE_OP,
-                                         "Unknown operation");
-#if TBB_USE_EXCEPTIONS
-                            try
-#endif
-                            {
-                                if (tmp->type == PUSH_OP) {
-                                    push_back_helper(*(tmp->elem));
-                                } else {
-                                    data.push_back(std::move(*(tmp->elem)));
-                                }
-                                my_size.store(my_size.load(std::memory_order_relaxed) + 1,
-                                              std::memory_order_relaxed);
-                                tmp->status.store(uintptr_t(SUCCEEDED), std::memory_order_release);
-                            }
+            } else { // PUSH_OP or PUSH_RVALUE_OP
+                __TBB_ASSERT(tmp->type == PUSH_OP || tmp->type == PUSH_RVALUE_OP, "Unknown operation");
 #if TBB_USE_EXCEPTIONS
-                            catch (...) {
-                                tmp->status.store(uintptr_t(FAILED), std::memory_order_release);
-                            }
+                try
 #endif
-                        }
+                {
+                    if (tmp->type == PUSH_OP) {
+                        push_back_helper(*(tmp->elem));
+                    } else {
+                        data.push_back(std::move(*(tmp->elem)));
                     }
-
-                    // Second pass processes pop operations
-                    while (pop_list) {
-                        tmp = pop_list;
-                        pop_list = pop_list->next.load(std::memory_order_relaxed);
-                        __TBB_ASSERT(tmp->type == POP_OP, NULL);
-                        if (data.empty()) {
-                            tmp->status.store(uintptr_t(FAILED), std::memory_order_release);
-                        } else {
-                            __TBB_ASSERT(mark <= data.size(), NULL);
-                            if (mark < data.size() && my_compare(data[0], data.back())) {
-                                // there are newly pushed elems and the last one is higher than top
-                                *(tmp->elem) = std::move(data.back());
-                                my_size.store(my_size.load(std::memory_order_relaxed) - 1,
-                                              std::memory_order_relaxed);
-                                tmp->status.store(uintptr_t(SUCCEEDED), std::memory_order_release);
-                                data.pop_back();
-                            } else {// extract top and push last element down heap
-                                *(tmp->elem) = std::move(data[0]);
-                                my_size.store(my_size.load(std::memory_order_relaxed) - 1,
-                                              std::memory_order_relaxed);
-                                tmp->status.store(uintptr_t(SUCCEEDED), std::memory_order_release);
-                                reheap();
-                            }
-                        }
-                    }
-
-                    // heapify any leftover pushed elements before doing the next
-                    // batch of operations
-                    if (mark < data.size()) heapify();
-                    __TBB_ASSERT(mark == data.size(), NULL);
-                    call_itt_notify(releasing, this);
+                    my_size.store(my_size.load(std::memory_order_relaxed) + 1, std::memory_order_relaxed);
+                    tmp->status.store(uintptr_t(SUCCEEDED), std::memory_order_release);
                 }
-
-                // Merge unsorted elements into heap
-                void heapify() {
-                    if (!mark && data.size() > 0) mark = 1;
-                    for (; mark < data.size(); ++mark) {
-                        // for each unheapified element under size
-                        size_type cur_pos = mark;
-                        value_type to_place = std::move(data[mark]);
-                        do {// push to_place up the heap
-                            size_type parent = (cur_pos - 1) >> 1;
-                            if (!my_compare(data[parent], to_place)) break;
-                            data[cur_pos] = std::move(data[parent]);
-                            cur_pos = parent;
-                        } while (cur_pos);
-                        data[cur_pos] = std::move(to_place);
-                    }
+#if TBB_USE_EXCEPTIONS
+                catch(...) {
+                    tmp->status.store(uintptr_t(FAILED), std::memory_order_release);
                 }
-
-                // Re-heapify after an extraction
-                // Re-heapify by pushing last element down the heap from the root.
-                void reheap() {
-                    size_type cur_pos = 0, child = 1;
-
-                    while (child < mark) {
-                        size_type target = child;
-                        if (child + 1 < mark && my_compare(data[child], data[child + 1])) ++target;
-                        // target now has the higher priority child
-                        if (my_compare(data[target], data.back())) break;
-                        data[cur_pos] = std::move(data[target]);
-                        cur_pos = target;
-                        child = (cur_pos << 1) + 1;
-                    }
-                    if (cur_pos != data.size() - 1) data[cur_pos] = std::move(data.back());
+#endif
+            }
+        }
+
+        // Second pass processes pop operations
+        while(pop_list) {
+            tmp = pop_list;
+            pop_list = pop_list->next.load(std::memory_order_relaxed);
+            __TBB_ASSERT(tmp->type == POP_OP, nullptr);
+            if (data.empty()) {
+                tmp->status.store(uintptr_t(FAILED), std::memory_order_release);
+            } else {
+                __TBB_ASSERT(mark <= data.size(), nullptr);
+                if (mark < data.size() &&
+                    my_compare(data[0], data.back()))
+                {
+                    // there are newly pushed elems and the last one is higher than top
+                    *(tmp->elem) = std::move(data.back());
+                    my_size.store(my_size.load(std::memory_order_relaxed) - 1, std::memory_order_relaxed);
+                    tmp->status.store(uintptr_t(SUCCEEDED), std::memory_order_release);
                     data.pop_back();
-                    if (mark > data.size()) mark = data.size();
-                }
-
-                void push_back_helper(const T& value) {
-                    push_back_helper_impl(value, std::is_copy_constructible<T> {});
+                } else { // extract top and push last element down heap
+                    *(tmp->elem) = std::move(data[0]);
+                    my_size.store(my_size.load(std::memory_order_relaxed) - 1, std::memory_order_relaxed);
+                    tmp->status.store(uintptr_t(SUCCEEDED), std::memory_order_release);
+                    reheap();
                 }
-
-                void push_back_helper_impl(const T& value, /*is_copy_constructible = */ std::true_type) {
-                    data.push_back(value);
-                }
-
-                void push_back_helper_impl(const T&, /*is_copy_constructible = */ std::false_type) {
-                    __TBB_ASSERT(false, "error: calling tbb::concurrent_priority_queue.push(const "
-                                        "value_type&) for move-only type");
-                }
-
-                using aggregator_type = aggregator<functor, cpq_operation>;
-
-                aggregator_type my_aggregator;
-                // Padding added to avoid false sharing
-                char padding1[max_nfs_size - sizeof(aggregator_type)];
-                // The point at which unsorted elements begin
-                size_type mark;
-                std::atomic<size_type> my_size;
-                Compare my_compare;
-
-                // Padding added to avoid false sharing
-                char padding2[max_nfs_size - (2 * sizeof(size_type)) - sizeof(Compare)];
-                //! Storage for the heap of elements in queue, plus unheapified elements
-                /** data has the following structure:
+            }
+        }
+
+        // heapify any leftover pushed elements before doing the next
+        // batch of operations
+        if (mark < data.size()) heapify();
+        __TBB_ASSERT(mark == data.size(), nullptr);
+        call_itt_notify(releasing, this);
+    }
+
+    // Merge unsorted elements into heap
+    void heapify() {
+        if (!mark && data.size() > 0) mark = 1;
+        for (; mark < data.size(); ++mark) {
+            // for each unheapified element under size
+            size_type cur_pos = mark;
+            value_type to_place = std::move(data[mark]);
+            do { // push to_place up the heap
+                size_type parent = (cur_pos - 1) >> 1;
+                if (!my_compare(data[parent], to_place))
+                    break;
+                data[cur_pos] = std::move(data[parent]);
+                cur_pos = parent;
+            } while(cur_pos);
+            data[cur_pos] = std::move(to_place);
+        }
+    }
+
+    // Re-heapify after an extraction
+    // Re-heapify by pushing last element down the heap from the root.
+    void reheap() {
+        size_type cur_pos = 0, child = 1;
+
+        while(child < mark) {
+            size_type target = child;
+            if (child + 1 < mark && my_compare(data[child], data[child + 1]))
+                ++target;
+            // target now has the higher priority child
+            if (my_compare(data[target], data.back()))
+                break;
+            data[cur_pos] = std::move(data[target]);
+            cur_pos = target;
+            child = (cur_pos << 1) + 1;
+        }
+        if (cur_pos != data.size() - 1)
+            data[cur_pos] = std::move(data.back());
+        data.pop_back();
+        if (mark > data.size()) mark = data.size();
+    }
+
+    void push_back_helper( const T& value ) {
+        push_back_helper_impl(value, std::is_copy_constructible<T>{});
+    }
+
+    void push_back_helper_impl( const T& value, /*is_copy_constructible = */std::true_type ) {
+        data.push_back(value);
+    }
+
+    void push_back_helper_impl( const T&, /*is_copy_constructible = */std::false_type ) {
+        __TBB_ASSERT(false, "error: calling tbb::concurrent_priority_queue.push(const value_type&) for move-only type");
+    }
+
+    using aggregator_type = aggregator<functor, cpq_operation>;
+
+    aggregator_type my_aggregator;
+    // Padding added to avoid false sharing
+    char padding1[max_nfs_size - sizeof(aggregator_type)];
+    // The point at which unsorted elements begin
+    size_type mark;
+    std::atomic<size_type> my_size;
+    Compare my_compare;
+
+    // Padding added to avoid false sharing
+    char padding2[max_nfs_size - (2*sizeof(size_type)) - sizeof(Compare)];
+    //! Storage for the heap of elements in queue, plus unheapified elements
+    /** data has the following structure:
 
          binary unheapified
           heap   elements
@@ -421,62 +423,68 @@ namespace tbb {
         that have not yet been inserted into the heap, in positions
         mark through my_size-1. */
 
-                using vector_type = std::vector<value_type, allocator_type>;
-                vector_type data;
+    using vector_type = std::vector<value_type, allocator_type>;
+    vector_type data;
 
-                friend bool operator==(const concurrent_priority_queue& lhs,
-                                       const concurrent_priority_queue& rhs) {
-                    return lhs.data == rhs.data;
-                }
+    friend bool operator==( const concurrent_priority_queue& lhs,
+                            const concurrent_priority_queue& rhs )
+    {
+        return lhs.data == rhs.data;
+    }
 
 #if !__TBB_CPP20_COMPARISONS_PRESENT
-                friend bool operator!=(const concurrent_priority_queue& lhs,
-                                       const concurrent_priority_queue& rhs) {
-                    return !(lhs == rhs);
-                }
+    friend bool operator!=( const concurrent_priority_queue& lhs,
+                            const concurrent_priority_queue& rhs )
+    {
+        return !(lhs == rhs);
+    }
 #endif
-            };// class concurrent_priority_queue
+}; // class concurrent_priority_queue
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
-            template <typename It, typename Comp = std::less<iterator_value_t<It>>,
-                      typename Alloc = tbb::cache_aligned_allocator<iterator_value_t<It>>,
-                      typename = std::enable_if_t<is_input_iterator_v<It>>,
-                      typename = std::enable_if_t<is_allocator_v<Alloc>>,
-                      typename = std::enable_if_t<!is_allocator_v<Comp>>>
-            concurrent_priority_queue(It, It, Comp = Comp(), Alloc = Alloc())
-                    -> concurrent_priority_queue<iterator_value_t<It>, Comp, Alloc>;
-
-            template <typename It, typename Alloc, typename = std::enable_if_t<is_input_iterator_v<It>>,
-                      typename = std::enable_if_t<is_allocator_v<Alloc>>>
-            concurrent_priority_queue(It, It, Alloc)
-                    -> concurrent_priority_queue<iterator_value_t<It>, std::less<iterator_value_t<It>>,
-                                                 Alloc>;
-
-            template <typename T, typename Comp = std::less<T>,
-                      typename Alloc = tbb::cache_aligned_allocator<T>,
-                      typename = std::enable_if_t<is_allocator_v<Alloc>>,
-                      typename = std::enable_if_t<!is_allocator_v<Comp>>>
-            concurrent_priority_queue(std::initializer_list<T>, Comp = Comp(), Alloc = Alloc())
-                    -> concurrent_priority_queue<T, Comp, Alloc>;
-
-            template <typename T, typename Alloc, typename = std::enable_if_t<is_allocator_v<Alloc>>>
-            concurrent_priority_queue(std::initializer_list<T>, Alloc)
-                    -> concurrent_priority_queue<T, std::less<T>, Alloc>;
-
-#endif// __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
-
-            template <typename T, typename Compare, typename Allocator>
-            void swap(concurrent_priority_queue<T, Compare, Allocator>& lhs,
-                      concurrent_priority_queue<T, Compare, Allocator>& rhs) {
-                lhs.swap(rhs);
-            }
-
-        }// namespace d1
-    }    // namespace detail
-    inline namespace v1 {
-        using detail::d1::concurrent_priority_queue;
-
-    }// namespace v1
-}// namespace tbb
-
-#endif// __TBB_concurrent_priority_queue_H
+template <typename It,
+          typename Comp = std::less<iterator_value_t<It>>,
+          typename Alloc = tbb::cache_aligned_allocator<iterator_value_t<It>>,
+          typename = std::enable_if_t<is_input_iterator_v<It>>,
+          typename = std::enable_if_t<is_allocator_v<Alloc>>,
+          typename = std::enable_if_t<!is_allocator_v<Comp>>>
+concurrent_priority_queue( It, It, Comp = Comp(), Alloc = Alloc() )
+-> concurrent_priority_queue<iterator_value_t<It>, Comp, Alloc>;
+
+template <typename It, typename Alloc,
+          typename = std::enable_if_t<is_input_iterator_v<It>>,
+          typename = std::enable_if_t<is_allocator_v<Alloc>>>
+concurrent_priority_queue( It, It, Alloc )
+-> concurrent_priority_queue<iterator_value_t<It>, std::less<iterator_value_t<It>>, Alloc>;
+
+template <typename T,
+          typename Comp = std::less<T>,
+          typename Alloc = tbb::cache_aligned_allocator<T>,
+          typename = std::enable_if_t<is_allocator_v<Alloc>>,
+          typename = std::enable_if_t<!is_allocator_v<Comp>>>
+concurrent_priority_queue( std::initializer_list<T>, Comp = Comp(), Alloc = Alloc() )
+-> concurrent_priority_queue<T, Comp, Alloc>;
+
+template <typename T, typename Alloc,
+          typename = std::enable_if_t<is_allocator_v<Alloc>>>
+concurrent_priority_queue( std::initializer_list<T>, Alloc )
+-> concurrent_priority_queue<T, std::less<T>, Alloc>;
+
+#endif // __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
+
+template <typename T, typename Compare, typename Allocator>
+void swap( concurrent_priority_queue<T, Compare, Allocator>& lhs,
+           concurrent_priority_queue<T, Compare, Allocator>& rhs )
+{
+    lhs.swap(rhs);
+}
+
+} // namespace d1
+} // namespace detail
+inline namespace v1 {
+using detail::d1::concurrent_priority_queue;
+
+} // inline namespace v1
+} // namespace tbb
+
+#endif // __TBB_concurrent_priority_queue_H
diff --git a/external/tbb/include/oneapi/tbb/concurrent_queue.h b/external/tbb/include/oneapi/tbb/concurrent_queue.h
index d51abb1a..c2b7a196 100644
--- a/external/tbb/include/oneapi/tbb/concurrent_queue.h
+++ b/external/tbb/include/oneapi/tbb/concurrent_queue.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2025 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -17,584 +17,688 @@
 #ifndef __TBB_concurrent_queue_H
 #define __TBB_concurrent_queue_H
 
-#include "cache_aligned_allocator.h"
-#include "detail/_allocator_traits.h"
+#include "detail/_namespace_injection.h"
 #include "detail/_concurrent_queue_base.h"
-#include "detail/_containers_helpers.h"
+#include "detail/_allocator_traits.h"
 #include "detail/_exception.h"
-#include "detail/_namespace_injection.h"
+#include "detail/_containers_helpers.h"
+#include "cache_aligned_allocator.h"
 
 namespace tbb {
-    namespace detail {
-        namespace d2 {
-
-            // A high-performance thread-safe non-blocking concurrent queue.
-            // Multiple threads may each push and pop concurrently.
-            // Assignment construction is not allowed.
-            template <typename T, typename Allocator = tbb::cache_aligned_allocator<T>>
-            class concurrent_queue {
-                using allocator_traits_type = tbb::detail::allocator_traits<Allocator>;
-                using queue_representation_type = concurrent_queue_rep<T, Allocator>;
-                using queue_allocator_type =
-                        typename allocator_traits_type::template rebind_alloc<queue_representation_type>;
-                using queue_allocator_traits = tbb::detail::allocator_traits<queue_allocator_type>;
-
-            public:
-                using size_type = std::size_t;
-                using value_type = T;
-                using reference = T&;
-                using const_reference = const T&;
-                using difference_type = std::ptrdiff_t;
-
-                using allocator_type = Allocator;
-                using pointer = typename allocator_traits_type::pointer;
-                using const_pointer = typename allocator_traits_type::const_pointer;
-
-                using iterator = concurrent_queue_iterator<concurrent_queue, T, Allocator>;
-                using const_iterator = concurrent_queue_iterator<concurrent_queue, const T, Allocator>;
-
-                concurrent_queue() : concurrent_queue(allocator_type()) {}
-
-                explicit concurrent_queue(const allocator_type& a)
-                    : my_allocator(a), my_queue_representation(nullptr) {
-                    my_queue_representation = static_cast<queue_representation_type*>(
-                            r1::cache_aligned_allocate(sizeof(queue_representation_type)));
-                    queue_allocator_traits::construct(my_allocator, my_queue_representation);
-
-                    __TBB_ASSERT(is_aligned(my_queue_representation, max_nfs_size), "alignment error");
-                    __TBB_ASSERT(is_aligned(&my_queue_representation->head_counter, max_nfs_size),
-                                 "alignment error");
-                    __TBB_ASSERT(is_aligned(&my_queue_representation->tail_counter, max_nfs_size),
-                                 "alignment error");
-                    __TBB_ASSERT(is_aligned(&my_queue_representation->array, max_nfs_size),
-                                 "alignment error");
-                }
-
-                template <typename InputIterator>
-                concurrent_queue(InputIterator begin, InputIterator end,
-                                 const allocator_type& a = allocator_type())
-                    : concurrent_queue(a) {
-                    for (; begin != end; ++begin) push(*begin);
-                }
-
-                concurrent_queue(const concurrent_queue& src, const allocator_type& a) : concurrent_queue(a) {
-                    my_queue_representation->assign(*src.my_queue_representation, my_allocator,
-                                                    copy_construct_item);
-                }
-
-                concurrent_queue(const concurrent_queue& src)
-                    : concurrent_queue(queue_allocator_traits::select_on_container_copy_construction(
-                            src.get_allocator())) {
-                    my_queue_representation->assign(*src.my_queue_representation, my_allocator,
-                                                    copy_construct_item);
-                }
-
-                // Move constructors
-                concurrent_queue(concurrent_queue&& src) : concurrent_queue(std::move(src.my_allocator)) {
-                    internal_swap(src);
-                }
-
-                concurrent_queue(concurrent_queue&& src, const allocator_type& a) : concurrent_queue(a) {
-                    // checking that memory allocated by one instance of allocator can be deallocated
-                    // with another
-                    if (my_allocator == src.my_allocator) {
-                        internal_swap(src);
-                    } else {
-                        // allocators are different => performing per-element move
-                        my_queue_representation->assign(*src.my_queue_representation, my_allocator,
-                                                        move_construct_item);
-                        src.clear();
-                    }
-                }
-
-                // Destroy queue
-                ~concurrent_queue() {
-                    clear();
-                    my_queue_representation->clear(my_allocator);
-                    queue_allocator_traits::destroy(my_allocator, my_queue_representation);
-                    r1::cache_aligned_deallocate(my_queue_representation);
-                }
-
-                // Enqueue an item at tail of queue.
-                void push(const T& value) { internal_push(value); }
-
-                void push(T&& value) { internal_push(std::move(value)); }
-
-                template <typename... Args>
-                void emplace(Args&&... args) {
-                    internal_push(std::forward<Args>(args)...);
-                }
-
-                // Attempt to dequeue an item from head of queue.
-                /** Does not wait for item to become available.
+namespace detail {
+namespace d2 {
+
+template <typename QueueRep, typename Allocator>
+std::pair<bool, ticket_type> internal_try_pop_impl(void* dst, QueueRep& queue, Allocator& alloc ) {
+    ticket_type ticket{};
+    do {
+        // Basically, we need to read `head_counter` before `tail_counter`. To achieve it we build happens-before on `head_counter`
+        ticket = queue.head_counter.load(std::memory_order_acquire);
+        do {
+            if (static_cast<std::ptrdiff_t>(queue.tail_counter.load(std::memory_order_relaxed) - ticket) <= 0) { // queue is empty
+                // Queue is empty
+                return { false, ticket };
+            }
+            // Queue had item with ticket k when we looked.  Attempt to get that item.
+            // Another thread snatched the item, retry.
+        } while (!queue.head_counter.compare_exchange_strong(ticket, ticket + 1));
+    } while (!queue.choose(ticket).pop(dst, ticket, queue, alloc));
+    return { true, ticket };
+}
+
+// A high-performance thread-safe non-blocking concurrent queue.
+// Multiple threads may each push and pop concurrently.
+template <typename T, typename Allocator = tbb::cache_aligned_allocator<T>>
+class concurrent_queue {
+    using allocator_traits_type = tbb::detail::allocator_traits<Allocator>;
+    using queue_representation_type = concurrent_queue_rep<T, Allocator>;
+    using queue_allocator_type = typename allocator_traits_type::template rebind_alloc<queue_representation_type>;
+    using queue_allocator_traits = tbb::detail::allocator_traits<queue_allocator_type>;
+public:
+    using size_type = std::size_t;
+    using value_type = T;
+    using reference = T&;
+    using const_reference = const T&;
+    using difference_type = std::ptrdiff_t;
+
+    using allocator_type = Allocator;
+    using pointer = typename allocator_traits_type::pointer;
+    using const_pointer = typename allocator_traits_type::const_pointer;
+
+    using iterator = concurrent_queue_iterator<concurrent_queue, T, Allocator>;
+    using const_iterator = concurrent_queue_iterator<concurrent_queue, const T, Allocator>;
+
+    concurrent_queue() : concurrent_queue(allocator_type()) {}
+
+    explicit concurrent_queue(const allocator_type& a) :
+        my_allocator(a), my_queue_representation(nullptr)
+    {
+        my_queue_representation = static_cast<queue_representation_type*>(r1::cache_aligned_allocate(sizeof(queue_representation_type)));
+        queue_allocator_traits::construct(my_allocator, my_queue_representation);
+
+        __TBB_ASSERT(is_aligned(my_queue_representation, max_nfs_size), "alignment error" );
+        __TBB_ASSERT(is_aligned(&my_queue_representation->head_counter, max_nfs_size), "alignment error" );
+        __TBB_ASSERT(is_aligned(&my_queue_representation->tail_counter, max_nfs_size), "alignment error" );
+        __TBB_ASSERT(is_aligned(&my_queue_representation->array, max_nfs_size), "alignment error" );
+    }
+
+    template <typename InputIterator>
+    concurrent_queue(InputIterator begin, InputIterator end, const allocator_type& a = allocator_type()) :
+        concurrent_queue(a)
+    {
+        for (; begin != end; ++begin)
+            push(*begin);
+    }
+
+    concurrent_queue( std::initializer_list<value_type> init, const allocator_type& alloc = allocator_type() ) :
+        concurrent_queue(init.begin(), init.end(), alloc)
+    {}
+
+    concurrent_queue(const concurrent_queue& src, const allocator_type& a) :
+        concurrent_queue(a)
+    {
+        my_queue_representation->assign(*src.my_queue_representation, my_allocator, copy_construct_item);
+    }
+
+    concurrent_queue(const concurrent_queue& src) :
+        concurrent_queue(queue_allocator_traits::select_on_container_copy_construction(src.get_allocator()))
+    {
+        my_queue_representation->assign(*src.my_queue_representation, my_allocator, copy_construct_item);
+    }
+
+    // Move constructors
+    concurrent_queue(concurrent_queue&& src) :
+        concurrent_queue(std::move(src.my_allocator))
+    {
+        internal_swap(src);
+    }
+
+    concurrent_queue(concurrent_queue&& src, const allocator_type& a) :
+        concurrent_queue(a)
+    {
+        // checking that memory allocated by one instance of allocator can be deallocated
+        // with another
+        if (my_allocator == src.my_allocator) {
+            internal_swap(src);
+        } else {
+            // allocators are different => performing per-element move
+            my_queue_representation->assign(*src.my_queue_representation, my_allocator, move_construct_item);
+            src.clear();
+        }
+    }
+
+    // Destroy queue
+    ~concurrent_queue() {
+        clear();
+        my_queue_representation->clear(my_allocator);
+        queue_allocator_traits::destroy(my_allocator, my_queue_representation);
+        r1::cache_aligned_deallocate(my_queue_representation);
+    }
+
+    concurrent_queue& operator=( const concurrent_queue& other ) {
+        //TODO: implement support for std::allocator_traits::propagate_on_container_copy_assignment
+        if (my_queue_representation != other.my_queue_representation) {
+            clear();
+            my_allocator = other.my_allocator;
+            my_queue_representation->assign(*other.my_queue_representation, my_allocator, copy_construct_item);
+        }
+        return *this;
+    }
+
+    concurrent_queue& operator=( concurrent_queue&& other ) {
+        //TODO: implement support for std::allocator_traits::propagate_on_container_move_assignment
+        if (my_queue_representation != other.my_queue_representation) {
+            clear();
+            if (my_allocator == other.my_allocator) {
+                internal_swap(other);
+            } else {
+                my_queue_representation->assign(*other.my_queue_representation, other.my_allocator, move_construct_item);
+                other.clear();
+                my_allocator = std::move(other.my_allocator);
+            }
+        }
+        return *this;
+    }
+
+    concurrent_queue& operator=( std::initializer_list<value_type> init ) {
+        assign(init);
+        return *this;
+    }
+
+    template <typename InputIterator>
+    void assign( InputIterator first, InputIterator last ) {
+        concurrent_queue src(first, last);
+        clear();
+        my_queue_representation->assign(*src.my_queue_representation, my_allocator, move_construct_item);
+    }
+
+    void assign( std::initializer_list<value_type> init ) {
+        assign(init.begin(), init.end());
+    }
+
+    void swap ( concurrent_queue& other ) {
+        //TODO: implement support for std::allocator_traits::propagate_on_container_swap
+        __TBB_ASSERT(my_allocator == other.my_allocator, "unequal allocators");
+        internal_swap(other);
+    }
+
+    // Enqueue an item at tail of queue.
+    void push(const T& value) {
+        internal_push(value);
+    }
+
+    void push(T&& value) {
+        internal_push(std::move(value));
+    }
+
+    template <typename... Args>
+    void emplace( Args&&... args ) {
+        internal_push(std::forward<Args>(args)...);
+    }
+
+    // Attempt to dequeue an item from head of queue.
+    /** Does not wait for item to become available.
         Returns true if successful; false otherwise. */
-                bool try_pop(T& result) { return internal_try_pop(&result); }
-
-                // Return the number of items in the queue; thread unsafe
-                size_type unsafe_size() const {
-                    std::ptrdiff_t size = my_queue_representation->size();
-                    return size < 0 ? 0 : size_type(size);
-                }
-
-                // Equivalent to size()==0.
-                __TBB_nodiscard bool empty() const { return my_queue_representation->empty(); }
-
-                // Clear the queue. not thread-safe.
-                void clear() {
-                    while (!empty()) {
-                        T value;
-                        try_pop(value);
-                    }
-                }
-
-                // Return allocator object
-                allocator_type get_allocator() const { return my_allocator; }
-
-                //------------------------------------------------------------------------
-                // The iterators are intended only for debugging.  They are slow and not thread safe.
-                //------------------------------------------------------------------------
-
-                iterator unsafe_begin() { return concurrent_queue_iterator_provider::get<iterator>(*this); }
-                iterator unsafe_end() { return iterator(); }
-                const_iterator unsafe_begin() const {
-                    return concurrent_queue_iterator_provider::get<const_iterator>(*this);
-                }
-                const_iterator unsafe_end() const { return const_iterator(); }
-                const_iterator unsafe_cbegin() const {
-                    return concurrent_queue_iterator_provider::get<const_iterator>(*this);
-                }
-                const_iterator unsafe_cend() const { return const_iterator(); }
-
-            private:
-                void internal_swap(concurrent_queue& src) {
-                    using std::swap;
-                    swap(my_queue_representation, src.my_queue_representation);
-                }
-
-                template <typename... Args>
-                void internal_push(Args&&... args) {
-                    ticket_type k = my_queue_representation->tail_counter++;
-                    my_queue_representation->choose(k).push(k, *my_queue_representation, my_allocator,
-                                                            std::forward<Args>(args)...);
-                }
-
-                bool internal_try_pop(void* dst) {
-                    ticket_type k;
-                    do {
-                        k = my_queue_representation->head_counter.load(std::memory_order_relaxed);
-                        do {
-                            if (static_cast<std::ptrdiff_t>(
-                                        my_queue_representation->tail_counter.load(std::memory_order_relaxed)
-                                        - k)
-                                <= 0) {
-                                // Queue is empty
-                                return false;
-                            }
-
-                            // Queue had item with ticket k when we looked. Attempt to get that item.
-                            // Another thread snatched the item, retry.
-                        } while (!my_queue_representation->head_counter.compare_exchange_strong(k, k + 1));
-                    } while (!my_queue_representation->choose(k).pop(dst, k, *my_queue_representation,
-                                                                     my_allocator));
-                    return true;
-                }
-
-                template <typename Container, typename Value, typename A>
-                friend class concurrent_queue_iterator;
-
-                static void copy_construct_item(T* location, const void* src) {
-                    // TODO: use allocator_traits for copy construction
-                    new (location) value_type(*static_cast<const value_type*>(src));
-                    // queue_allocator_traits::construct(my_allocator, location, *static_cast<const T*>(src));
-                }
-
-                static void move_construct_item(T* location, const void* src) {
-                    // TODO: use allocator_traits for move construction
-                    new (location) value_type(std::move(*static_cast<value_type*>(const_cast<void*>(src))));
-                }
-
-                queue_allocator_type my_allocator;
-                queue_representation_type* my_queue_representation;
-            };// class concurrent_queue
+    bool try_pop( T& result ) {
+        return internal_try_pop(&result);
+    }
+
+    // Return the number of items in the queue; thread unsafe
+    size_type unsafe_size() const {
+        std::ptrdiff_t size = my_queue_representation->size();
+        return size < 0 ? 0 :  size_type(size);
+    }
+
+    // Equivalent to size()==0.
+    __TBB_nodiscard bool empty() const {
+        return my_queue_representation->empty();
+    }
+
+    // Clear the queue. not thread-safe.
+    void clear() {
+        my_queue_representation->clear(my_allocator);
+    }
+
+    // Return allocator object
+    allocator_type get_allocator() const { return my_allocator; }
+
+    //------------------------------------------------------------------------
+    // The iterators are intended only for debugging.  They are slow and not thread safe.
+    //------------------------------------------------------------------------
+
+    iterator unsafe_begin() { return concurrent_queue_iterator_provider::get<iterator>(*this); }
+    iterator unsafe_end() { return iterator(); }
+    const_iterator unsafe_begin() const { return concurrent_queue_iterator_provider::get<const_iterator>(*this); }
+    const_iterator unsafe_end() const { return const_iterator(); }
+    const_iterator unsafe_cbegin() const { return concurrent_queue_iterator_provider::get<const_iterator>(*this); }
+    const_iterator unsafe_cend() const { return const_iterator(); }
+
+private:
+    void internal_swap(concurrent_queue& src) {
+        using std::swap;
+        swap(my_queue_representation, src.my_queue_representation);
+    }
+
+    template <typename... Args>
+    void internal_push( Args&&... args ) {
+        ticket_type k = my_queue_representation->tail_counter++;
+        my_queue_representation->choose(k).push(k, *my_queue_representation, my_allocator, std::forward<Args>(args)...);
+    }
+
+    bool internal_try_pop( void* dst ) {
+        return internal_try_pop_impl(dst, *my_queue_representation, my_allocator).first;
+    }
+
+    template <typename Container, typename Value, typename A>
+    friend class concurrent_queue_iterator;
+
+    static void copy_construct_item(T* location, const void* src) {
+        // TODO: use allocator_traits for copy construction
+        new (location) value_type(*static_cast<const value_type*>(src));
+        // queue_allocator_traits::construct(my_allocator, location, *static_cast<const T*>(src));
+    }
+
+    static void move_construct_item(T* location, const void* src) {
+        // TODO: use allocator_traits for move construction
+        new (location) value_type(std::move(*static_cast<value_type*>(const_cast<void*>(src))));
+    }
+
+    queue_allocator_type my_allocator;
+    queue_representation_type* my_queue_representation;
+
+    friend void swap( concurrent_queue& lhs, concurrent_queue& rhs ) {
+        lhs.swap(rhs);
+    }
+
+    friend bool operator==( const concurrent_queue& lhs, const concurrent_queue& rhs ) {
+        return lhs.unsafe_size() == rhs.unsafe_size() && std::equal(lhs.unsafe_begin(), lhs.unsafe_end(), rhs.unsafe_begin());
+    }
+
+#if !__TBB_CPP20_COMPARISONS_PRESENT
+    friend bool operator!=( const concurrent_queue& lhs,  const concurrent_queue& rhs ) {
+        return !(lhs == rhs);
+    }
+#endif // __TBB_CPP20_COMPARISONS_PRESENT
+}; // class concurrent_queue
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
-            // Deduction guide for the constructor from two iterators
-            template <typename It, typename Alloc = tbb::cache_aligned_allocator<iterator_value_t<It>>,
-                      typename = std::enable_if_t<is_input_iterator_v<It>>,
-                      typename = std::enable_if_t<is_allocator_v<Alloc>>>
-            concurrent_queue(It, It, Alloc = Alloc()) -> concurrent_queue<iterator_value_t<It>, Alloc>;
+// Deduction guide for the constructor from two iterators
+template <typename It, typename Alloc = tbb::cache_aligned_allocator<iterator_value_t<It>>,
+          typename = std::enable_if_t<is_input_iterator_v<It>>,
+          typename = std::enable_if_t<is_allocator_v<Alloc>>>
+concurrent_queue( It, It, Alloc = Alloc() )
+-> concurrent_queue<iterator_value_t<It>, Alloc>;
 
 #endif /* __TBB_CPP17_DEDUCTION_GUIDES_PRESENT */
 
-            class concurrent_monitor;
-
-            // The concurrent monitor tags for concurrent_bounded_queue.
-            static constexpr std::size_t cbq_slots_avail_tag = 0;
-            static constexpr std::size_t cbq_items_avail_tag = 1;
-        }// namespace d2
-
-        namespace r1 {
-            class concurrent_monitor;
-
-            TBB_EXPORT std::uint8_t* __TBB_EXPORTED_FUNC
-            allocate_bounded_queue_rep(std::size_t queue_rep_size);
-            TBB_EXPORT void __TBB_EXPORTED_FUNC deallocate_bounded_queue_rep(std::uint8_t* mem,
-                                                                             std::size_t queue_rep_size);
-            TBB_EXPORT void __TBB_EXPORTED_FUNC abort_bounded_queue_monitors(concurrent_monitor* monitors);
-            TBB_EXPORT void __TBB_EXPORTED_FUNC notify_bounded_queue_monitor(concurrent_monitor* monitors,
-                                                                             std::size_t monitor_tag,
-                                                                             std::size_t ticket);
-            TBB_EXPORT void __TBB_EXPORTED_FUNC wait_bounded_queue_monitor(concurrent_monitor* monitors,
-                                                                           std::size_t monitor_tag,
-                                                                           std::ptrdiff_t target,
-                                                                           d1::delegate_base& predicate);
-        }// namespace r1
-
-        namespace d2 {
-            // A high-performance thread-safe blocking concurrent bounded queue.
-            // Supports boundedness and blocking semantics.
-            // Multiple threads may each push and pop concurrently.
-            // Assignment construction is not allowed.
-            template <typename T, typename Allocator = tbb::cache_aligned_allocator<T>>
-            class concurrent_bounded_queue {
-                using allocator_traits_type = tbb::detail::allocator_traits<Allocator>;
-                using queue_representation_type = concurrent_queue_rep<T, Allocator>;
-                using queue_allocator_type =
-                        typename allocator_traits_type::template rebind_alloc<queue_representation_type>;
-                using queue_allocator_traits = tbb::detail::allocator_traits<queue_allocator_type>;
-
-                template <typename FuncType>
-                void internal_wait(r1::concurrent_monitor* monitors, std::size_t monitor_tag,
-                                   std::ptrdiff_t target, FuncType pred) {
-                    d1::delegated_function<FuncType> func(pred);
-                    r1::wait_bounded_queue_monitor(monitors, monitor_tag, target, func);
-                }
-
-            public:
-                using size_type = std::ptrdiff_t;
-                using value_type = T;
-                using reference = T&;
-                using const_reference = const T&;
-                using difference_type = std::ptrdiff_t;
-
-                using allocator_type = Allocator;
-                using pointer = typename allocator_traits_type::pointer;
-                using const_pointer = typename allocator_traits_type::const_pointer;
-
-                using iterator = concurrent_queue_iterator<concurrent_bounded_queue, T, Allocator>;
-                using const_iterator
-                        = concurrent_queue_iterator<concurrent_bounded_queue, const T, Allocator>;
-
-                concurrent_bounded_queue() : concurrent_bounded_queue(allocator_type()) {}
-
-                explicit concurrent_bounded_queue(const allocator_type& a)
-                    : my_allocator(a), my_capacity(0), my_abort_counter(0), my_queue_representation(nullptr) {
-                    my_queue_representation = reinterpret_cast<queue_representation_type*>(
-                            r1::allocate_bounded_queue_rep(sizeof(queue_representation_type)));
-                    my_monitors = reinterpret_cast<r1::concurrent_monitor*>(my_queue_representation + 1);
-                    queue_allocator_traits::construct(my_allocator, my_queue_representation);
-                    my_capacity = std::size_t(-1)
-                                  / (queue_representation_type::item_size > 1
-                                             ? queue_representation_type::item_size
-                                             : 2);
-
-                    __TBB_ASSERT(is_aligned(my_queue_representation, max_nfs_size), "alignment error");
-                    __TBB_ASSERT(is_aligned(&my_queue_representation->head_counter, max_nfs_size),
-                                 "alignment error");
-                    __TBB_ASSERT(is_aligned(&my_queue_representation->tail_counter, max_nfs_size),
-                                 "alignment error");
-                    __TBB_ASSERT(is_aligned(&my_queue_representation->array, max_nfs_size),
-                                 "alignment error");
-                }
-
-                template <typename InputIterator>
-                concurrent_bounded_queue(InputIterator begin, InputIterator end,
-                                         const allocator_type& a = allocator_type())
-                    : concurrent_bounded_queue(a) {
-                    for (; begin != end; ++begin) push(*begin);
-                }
-
-                concurrent_bounded_queue(const concurrent_bounded_queue& src, const allocator_type& a)
-                    : concurrent_bounded_queue(a) {
-                    my_queue_representation->assign(*src.my_queue_representation, my_allocator,
-                                                    copy_construct_item);
-                }
-
-                concurrent_bounded_queue(const concurrent_bounded_queue& src)
-                    : concurrent_bounded_queue(queue_allocator_traits::select_on_container_copy_construction(
-                            src.get_allocator())) {
-                    my_queue_representation->assign(*src.my_queue_representation, my_allocator,
-                                                    copy_construct_item);
-                }
-
-                // Move constructors
-                concurrent_bounded_queue(concurrent_bounded_queue&& src)
-                    : concurrent_bounded_queue(std::move(src.my_allocator)) {
-                    internal_swap(src);
-                }
-
-                concurrent_bounded_queue(concurrent_bounded_queue&& src, const allocator_type& a)
-                    : concurrent_bounded_queue(a) {
-                    // checking that memory allocated by one instance of allocator can be deallocated
-                    // with another
-                    if (my_allocator == src.my_allocator) {
-                        internal_swap(src);
-                    } else {
-                        // allocators are different => performing per-element move
-                        my_queue_representation->assign(*src.my_queue_representation, my_allocator,
-                                                        move_construct_item);
-                        src.clear();
-                    }
-                }
-
-                // Destroy queue
-                ~concurrent_bounded_queue() {
-                    clear();
-                    my_queue_representation->clear(my_allocator);
-                    queue_allocator_traits::destroy(my_allocator, my_queue_representation);
-                    r1::deallocate_bounded_queue_rep(reinterpret_cast<std::uint8_t*>(my_queue_representation),
-                                                     sizeof(queue_representation_type));
-                }
-
-                // Enqueue an item at tail of queue.
-                void push(const T& value) { internal_push(value); }
-
-                void push(T&& value) { internal_push(std::move(value)); }
-
-                // Enqueue an item at tail of queue if queue is not already full.
-                // Does not wait for queue to become not full.
-                // Returns true if item is pushed; false if queue was already full.
-                bool try_push(const T& value) { return internal_push_if_not_full(value); }
-
-                bool try_push(T&& value) { return internal_push_if_not_full(std::move(value)); }
-
-                template <typename... Args>
-                void emplace(Args&&... args) {
-                    internal_push(std::forward<Args>(args)...);
-                }
-
-                template <typename... Args>
-                bool try_emplace(Args&&... args) {
-                    return internal_push_if_not_full(std::forward<Args>(args)...);
-                }
-
-                // Attempt to dequeue an item from head of queue.
-                /** Does not wait for item to become available.
+class concurrent_monitor;
+
+// The concurrent monitor tags for concurrent_bounded_queue.
+static constexpr std::size_t cbq_slots_avail_tag = 0;
+static constexpr std::size_t cbq_items_avail_tag = 1;
+} // namespace d2
+
+
+namespace r1 {
+    class concurrent_monitor;
+
+    TBB_EXPORT std::uint8_t* __TBB_EXPORTED_FUNC allocate_bounded_queue_rep( std::size_t queue_rep_size );
+    TBB_EXPORT void __TBB_EXPORTED_FUNC deallocate_bounded_queue_rep( std::uint8_t* mem, std::size_t queue_rep_size );
+    TBB_EXPORT void __TBB_EXPORTED_FUNC abort_bounded_queue_monitors( concurrent_monitor* monitors );
+    TBB_EXPORT void __TBB_EXPORTED_FUNC notify_bounded_queue_monitor( concurrent_monitor* monitors, std::size_t monitor_tag
+                                                            , std::size_t ticket );
+    TBB_EXPORT void __TBB_EXPORTED_FUNC wait_bounded_queue_monitor( concurrent_monitor* monitors, std::size_t monitor_tag,
+                                                            std::ptrdiff_t target, d1::delegate_base& predicate );
+} // namespace r1
+
+
+namespace d2 {
+// A high-performance thread-safe blocking concurrent bounded queue.
+// Supports boundedness and blocking semantics.
+// Multiple threads may each push and pop concurrently.
+template <typename T, typename Allocator = tbb::cache_aligned_allocator<T>>
+class concurrent_bounded_queue {
+    using allocator_traits_type = tbb::detail::allocator_traits<Allocator>;
+    using queue_representation_type = concurrent_queue_rep<T, Allocator>;
+    using queue_allocator_type = typename allocator_traits_type::template rebind_alloc<queue_representation_type>;
+    using queue_allocator_traits = tbb::detail::allocator_traits<queue_allocator_type>;
+
+    template <typename FuncType>
+    void internal_wait(r1::concurrent_monitor* monitors, std::size_t monitor_tag, std::ptrdiff_t target, FuncType pred) {
+        d1::delegated_function<FuncType> func(pred);
+        r1::wait_bounded_queue_monitor(monitors, monitor_tag, target, func);
+    }
+public:
+    using size_type = std::ptrdiff_t;
+    using value_type = T;
+    using reference = T&;
+    using const_reference = const T&;
+    using difference_type = std::ptrdiff_t;
+
+    using allocator_type = Allocator;
+    using pointer = typename allocator_traits_type::pointer;
+    using const_pointer = typename allocator_traits_type::const_pointer;
+
+    using iterator = concurrent_queue_iterator<concurrent_bounded_queue, T, Allocator>;
+    using const_iterator = concurrent_queue_iterator<concurrent_bounded_queue, const T, Allocator> ;
+
+    concurrent_bounded_queue() : concurrent_bounded_queue(allocator_type()) {}
+
+    explicit concurrent_bounded_queue( const allocator_type& a ) :
+        my_allocator(a), my_capacity(0), my_abort_counter(0), my_queue_representation(nullptr)
+    {
+        my_queue_representation = reinterpret_cast<queue_representation_type*>(
+            r1::allocate_bounded_queue_rep(sizeof(queue_representation_type)));
+        my_monitors = reinterpret_cast<r1::concurrent_monitor*>(my_queue_representation + 1);
+        queue_allocator_traits::construct(my_allocator, my_queue_representation);
+        my_capacity = std::size_t(-1) / (queue_representation_type::item_size > 1 ? queue_representation_type::item_size : 2);
+
+        __TBB_ASSERT(is_aligned(my_queue_representation, max_nfs_size), "alignment error" );
+        __TBB_ASSERT(is_aligned(&my_queue_representation->head_counter, max_nfs_size), "alignment error" );
+        __TBB_ASSERT(is_aligned(&my_queue_representation->tail_counter, max_nfs_size), "alignment error" );
+        __TBB_ASSERT(is_aligned(&my_queue_representation->array, max_nfs_size), "alignment error" );
+    }
+
+    template <typename InputIterator>
+    concurrent_bounded_queue( InputIterator begin, InputIterator end, const allocator_type& a = allocator_type() ) :
+        concurrent_bounded_queue(a)
+    {
+        for (; begin != end; ++begin)
+            push(*begin);
+    }
+
+    concurrent_bounded_queue( std::initializer_list<value_type> init, const allocator_type& alloc = allocator_type() ):
+        concurrent_bounded_queue(init.begin(), init.end(), alloc)
+    {}
+
+    concurrent_bounded_queue( const concurrent_bounded_queue& src, const allocator_type& a ) :
+        concurrent_bounded_queue(a)
+    {
+        my_capacity = src.my_capacity;
+        my_queue_representation->assign(*src.my_queue_representation, my_allocator, copy_construct_item);
+    }
+
+    concurrent_bounded_queue( const concurrent_bounded_queue& src ) :
+        concurrent_bounded_queue(queue_allocator_traits::select_on_container_copy_construction(src.get_allocator()))
+    {
+        my_capacity = src.my_capacity;
+        my_queue_representation->assign(*src.my_queue_representation, my_allocator, copy_construct_item);
+    }
+
+    // Move constructors
+    concurrent_bounded_queue( concurrent_bounded_queue&& src ) :
+        concurrent_bounded_queue(std::move(src.my_allocator))
+    {
+        internal_swap(src);
+    }
+
+    concurrent_bounded_queue( concurrent_bounded_queue&& src, const allocator_type& a ) :
+        concurrent_bounded_queue(a)
+    {
+        // checking that memory allocated by one instance of allocator can be deallocated
+        // with another
+        if (my_allocator == src.my_allocator) {
+            internal_swap(src);
+        } else {
+            // allocators are different => performing per-element move
+            my_queue_representation->assign(*src.my_queue_representation, my_allocator, move_construct_item);
+            src.clear();
+        }
+    }
+
+    // Destroy queue
+    ~concurrent_bounded_queue() {
+        clear();
+        my_queue_representation->clear(my_allocator);
+        queue_allocator_traits::destroy(my_allocator, my_queue_representation);
+        r1::deallocate_bounded_queue_rep(reinterpret_cast<std::uint8_t*>(my_queue_representation),
+                                         sizeof(queue_representation_type));
+    }
+
+    concurrent_bounded_queue& operator=( const concurrent_bounded_queue& other ) {
+        //TODO: implement support for std::allocator_traits::propagate_on_container_copy_assignment
+        if (my_queue_representation != other.my_queue_representation) {
+            clear();
+            my_allocator = other.my_allocator;
+            my_capacity = other.my_capacity;
+            my_queue_representation->assign(*other.my_queue_representation, my_allocator, copy_construct_item);
+        }
+        return *this;
+    }
+
+    concurrent_bounded_queue& operator=( concurrent_bounded_queue&& other ) {
+        //TODO: implement support for std::allocator_traits::propagate_on_container_move_assignment
+        if (my_queue_representation != other.my_queue_representation) {
+            clear();
+            if (my_allocator == other.my_allocator) {
+                internal_swap(other);
+            } else {
+                my_queue_representation->assign(*other.my_queue_representation, other.my_allocator, move_construct_item);
+                other.clear();
+                my_allocator = std::move(other.my_allocator);
+                my_capacity = other.my_capacity;
+            }
+        }
+        return *this;
+    }
+
+    concurrent_bounded_queue& operator=( std::initializer_list<value_type> init ) {
+        assign(init);
+        return *this;
+    }
+
+    template <typename InputIterator>
+    void assign( InputIterator first, InputIterator last ) {
+        concurrent_bounded_queue src(first, last);
+        clear();
+        my_queue_representation->assign(*src.my_queue_representation, my_allocator, move_construct_item);
+    }
+
+    void assign( std::initializer_list<value_type> init ) {
+        assign(init.begin(), init.end());
+    }
+
+    void swap ( concurrent_bounded_queue& other ) {
+        //TODO: implement support for std::allocator_traits::propagate_on_container_swap
+        __TBB_ASSERT(my_allocator == other.my_allocator, "unequal allocators");
+        internal_swap(other);
+    }
+
+    // Enqueue an item at tail of queue.
+    void push( const T& value ) {
+        internal_push(value);
+    }
+
+    void push( T&& value ) {
+        internal_push(std::move(value));
+    }
+
+    // Enqueue an item at tail of queue if queue is not already full.
+    // Does not wait for queue to become not full.
+    // Returns true if item is pushed; false if queue was already full.
+    bool try_push( const T& value ) {
+        return internal_push_if_not_full(value);
+    }
+
+    bool try_push( T&& value ) {
+        return internal_push_if_not_full(std::move(value));
+    }
+
+    template <typename... Args>
+    void emplace( Args&&... args ) {
+        internal_push(std::forward<Args>(args)...);
+    }
+
+    template <typename... Args>
+    bool try_emplace( Args&&... args ) {
+        return internal_push_if_not_full(std::forward<Args>(args)...);
+    }
+
+    // Attempt to dequeue an item from head of queue.
+    void pop( T& result ) {
+        internal_pop(&result);
+    }
+
+    /** Does not wait for item to become available.
         Returns true if successful; false otherwise. */
-                bool pop(T& result) { return internal_pop(&result); }
-
-                bool try_pop(T& result) { return internal_pop_if_present(&result); }
-
-                void abort() { internal_abort(); }
-
-                // Return the number of items in the queue; thread unsafe
-                std::ptrdiff_t size() const { return my_queue_representation->size(); }
-
-                void set_capacity(size_type new_capacity) {
-                    std::ptrdiff_t c = new_capacity < 0 ? infinite_capacity : new_capacity;
-                    my_capacity = c;
-                }
-
-                size_type capacity() const { return my_capacity; }
-
-                // Equivalent to size()==0.
-                __TBB_nodiscard bool empty() const { return my_queue_representation->empty(); }
-
-                // Clear the queue. not thread-safe.
-                void clear() {
-                    while (!empty()) {
-                        T value;
-                        try_pop(value);
-                    }
-                }
-
-                // Return allocator object
-                allocator_type get_allocator() const { return my_allocator; }
-
-                //------------------------------------------------------------------------
-                // The iterators are intended only for debugging.  They are slow and not thread safe.
-                //------------------------------------------------------------------------
-
-                iterator unsafe_begin() { return concurrent_queue_iterator_provider::get<iterator>(*this); }
-                iterator unsafe_end() { return iterator(); }
-                const_iterator unsafe_begin() const {
-                    return concurrent_queue_iterator_provider::get<const_iterator>(*this);
-                }
-                const_iterator unsafe_end() const { return const_iterator(); }
-                const_iterator unsafe_cbegin() const {
-                    return concurrent_queue_iterator_provider::get<const_iterator>(*this);
-                }
-                const_iterator unsafe_cend() const { return const_iterator(); }
-
-            private:
-                void internal_swap(concurrent_bounded_queue& src) {
-                    std::swap(my_queue_representation, src.my_queue_representation);
-                    std::swap(my_monitors, src.my_monitors);
-                }
-
-                static constexpr std::ptrdiff_t infinite_capacity = std::ptrdiff_t(~size_type(0) / 2);
-
-                template <typename... Args>
-                void internal_push(Args&&... args) {
-                    unsigned old_abort_counter = my_abort_counter.load(std::memory_order_relaxed);
-                    ticket_type ticket = my_queue_representation->tail_counter++;
-                    std::ptrdiff_t target = ticket - my_capacity;
-
-                    if (static_cast<std::ptrdiff_t>(
-                                my_queue_representation->head_counter.load(std::memory_order_relaxed))
-                        <= target) {// queue is full
-                        auto pred = [&] {
-                            if (my_abort_counter.load(std::memory_order_relaxed) != old_abort_counter) {
-                                throw_exception(exception_id::user_abort);
-                            }
-
-                            return static_cast<std::ptrdiff_t>(my_queue_representation->head_counter.load(
-                                           std::memory_order_relaxed))
-                                   <= target;
-                        };
-
-                        try_call([&] {
-                            internal_wait(my_monitors, cbq_slots_avail_tag, target, pred);
-                        }).on_exception([&] {
-                            my_queue_representation->choose(ticket).abort_push(
-                                    ticket, *my_queue_representation, my_allocator);
-                        });
+    bool try_pop( T& result ) {
+        return internal_pop_if_present(&result);
+    }
+
+    void abort() {
+        internal_abort();
+    }
+
+    // Return the number of items in the queue; thread unsafe
+    std::ptrdiff_t size() const {
+        return my_queue_representation->size();
+    }
+
+    void set_capacity( size_type new_capacity ) {
+        std::ptrdiff_t c = new_capacity < 0 ? infinite_capacity : new_capacity;
+        my_capacity = c;
+    }
+
+    size_type capacity() const {
+        return my_capacity;
+    }
+
+    // Equivalent to size()==0.
+    __TBB_nodiscard bool empty() const {
+        return my_queue_representation->empty();
+    }
+
+    // Clear the queue. not thread-safe.
+    void clear() {
+        my_queue_representation->clear(my_allocator);
+    }
+
+    // Return allocator object
+    allocator_type get_allocator() const { return my_allocator; }
+
+    //------------------------------------------------------------------------
+    // The iterators are intended only for debugging.  They are slow and not thread safe.
+    //------------------------------------------------------------------------
+
+    iterator unsafe_begin() { return concurrent_queue_iterator_provider::get<iterator>(*this); }
+    iterator unsafe_end() { return iterator(); }
+    const_iterator unsafe_begin() const { return concurrent_queue_iterator_provider::get<const_iterator>(*this); }
+    const_iterator unsafe_end() const { return const_iterator(); }
+    const_iterator unsafe_cbegin() const { return concurrent_queue_iterator_provider::get<const_iterator>(*this); }
+    const_iterator unsafe_cend() const { return const_iterator(); }
+
+private:
+    void internal_swap( concurrent_bounded_queue& src ) {
+        using std::swap;
+        swap(my_queue_representation, src.my_queue_representation);
+        swap(my_capacity, src.my_capacity);
+        swap(my_monitors, src.my_monitors);
+    }
+
+    static constexpr std::ptrdiff_t infinite_capacity = std::ptrdiff_t(~size_type(0) / 2);
+
+    template <typename... Args>
+    void internal_push( Args&&... args ) {
+        unsigned old_abort_counter = my_abort_counter.load(std::memory_order_relaxed);
+        ticket_type ticket = my_queue_representation->tail_counter++;
+        std::ptrdiff_t target = ticket - my_capacity;
+
+        if (static_cast<std::ptrdiff_t>(my_queue_representation->head_counter.load(std::memory_order_relaxed)) <= target) { // queue is full
+            auto pred = [&] {
+                if (my_abort_counter.load(std::memory_order_relaxed) != old_abort_counter) {
+                    throw_exception(exception_id::user_abort);
+                }
+
+                return static_cast<std::ptrdiff_t>(my_queue_representation->head_counter.load(std::memory_order_relaxed)) <= target;
+            };
+
+            try_call( [&] {
+                internal_wait(my_monitors, cbq_slots_avail_tag, target, pred);
+            }).on_exception( [&] {
+                my_queue_representation->choose(ticket).abort_push(ticket, *my_queue_representation, my_allocator);
+            });
+
+        }
+        __TBB_ASSERT((static_cast<std::ptrdiff_t>(my_queue_representation->head_counter.load(std::memory_order_relaxed)) > target), nullptr);
+        my_queue_representation->choose(ticket).push(ticket, *my_queue_representation, my_allocator, std::forward<Args>(args)...);
+        r1::notify_bounded_queue_monitor(my_monitors, cbq_items_avail_tag, ticket);
+    }
+
+    template <typename... Args>
+    bool internal_push_if_not_full( Args&&... args ) {
+        ticket_type ticket = my_queue_representation->tail_counter.load(std::memory_order_relaxed);
+        do {
+            if (static_cast<std::ptrdiff_t>(ticket - my_queue_representation->head_counter.load(std::memory_order_relaxed)) >= my_capacity) {
+                // Queue is full
+                return false;
+            }
+            // Queue had empty slot with ticket k when we looked. Attempt to claim that slot.
+            // Another thread claimed the slot, so retry.
+        } while (!my_queue_representation->tail_counter.compare_exchange_strong(ticket, ticket + 1));
+
+        my_queue_representation->choose(ticket).push(ticket, *my_queue_representation, my_allocator, std::forward<Args>(args)...);
+        r1::notify_bounded_queue_monitor(my_monitors, cbq_items_avail_tag, ticket);
+        return true;
+    }
+
+    void internal_pop( void* dst ) {
+        std::ptrdiff_t target;
+        // This loop is a single pop operation; abort_counter should not be re-read inside
+        unsigned old_abort_counter = my_abort_counter.load(std::memory_order_relaxed);
+
+        do {
+            target = my_queue_representation->head_counter++;
+            if (static_cast<std::ptrdiff_t>(my_queue_representation->tail_counter.load(std::memory_order_relaxed)) <= target) {
+                auto pred = [&] {
+                    if (my_abort_counter.load(std::memory_order_relaxed) != old_abort_counter) {
+                            throw_exception(exception_id::user_abort);
                     }
-                    __TBB_ASSERT((static_cast<std::ptrdiff_t>(my_queue_representation->head_counter.load(
-                                          std::memory_order_relaxed))
-                                  > target),
-                                 nullptr);
-                    my_queue_representation->choose(ticket).push(ticket, *my_queue_representation,
-                                                                 my_allocator, std::forward<Args>(args)...);
-                    r1::notify_bounded_queue_monitor(my_monitors, cbq_items_avail_tag, ticket);
-                }
-
-                template <typename... Args>
-                bool internal_push_if_not_full(Args&&... args) {
-                    ticket_type ticket
-                            = my_queue_representation->tail_counter.load(std::memory_order_relaxed);
-                    do {
-                        if (static_cast<std::ptrdiff_t>(
-                                    ticket
-                                    - my_queue_representation->head_counter.load(std::memory_order_relaxed))
-                            >= my_capacity) {
-                            // Queue is full
-                            return false;
-                        }
-                        // Queue had empty slot with ticket k when we looked. Attempt to claim that slot.
-                        // Another thread claimed the slot, so retry.
-                    } while (!my_queue_representation->tail_counter.compare_exchange_strong(ticket,
-                                                                                            ticket + 1));
-
-                    my_queue_representation->choose(ticket).push(ticket, *my_queue_representation,
-                                                                 my_allocator, std::forward<Args>(args)...);
-                    r1::notify_bounded_queue_monitor(my_monitors, cbq_items_avail_tag, ticket);
-                    return true;
-                }
-
-                bool internal_pop(void* dst) {
-                    std::ptrdiff_t target;
-                    // This loop is a single pop operation; abort_counter should not be re-read inside
-                    unsigned old_abort_counter = my_abort_counter.load(std::memory_order_relaxed);
-
-                    do {
-                        target = my_queue_representation->head_counter++;
-                        if (static_cast<std::ptrdiff_t>(
-                                    my_queue_representation->tail_counter.load(std::memory_order_relaxed))
-                            <= target) {
-                            auto pred = [&] {
-                                if (my_abort_counter.load(std::memory_order_relaxed) != old_abort_counter) {
-                                    throw_exception(exception_id::user_abort);
-                                }
-
-                                return static_cast<std::ptrdiff_t>(my_queue_representation->tail_counter.load(
-                                               std::memory_order_relaxed))
-                                       <= target;
-                            };
-
-                            try_call([&] {
-                                internal_wait(my_monitors, cbq_items_avail_tag, target, pred);
-                            }).on_exception([&] { my_queue_representation->head_counter--; });
-                        }
-                        __TBB_ASSERT(static_cast<std::ptrdiff_t>(my_queue_representation->tail_counter.load(
-                                             std::memory_order_relaxed))
-                                             > target,
-                                     nullptr);
-                    } while (!my_queue_representation->choose(target).pop(
-                            dst, target, *my_queue_representation, my_allocator));
-
-                    r1::notify_bounded_queue_monitor(my_monitors, cbq_slots_avail_tag, target);
-                    return true;
-                }
-
-                bool internal_pop_if_present(void* dst) {
-                    ticket_type ticket;
-                    do {
-                        ticket = my_queue_representation->head_counter.load(std::memory_order_relaxed);
-                        do {
-                            if (static_cast<std::ptrdiff_t>(
-                                        my_queue_representation->tail_counter.load(std::memory_order_relaxed)
-                                        - ticket)
-                                <= 0) {// queue is empty
-                                // Queue is empty
-                                return false;
-                            }
-                            // Queue had item with ticket k when we looked.  Attempt to get that item.
-                            // Another thread snatched the item, retry.
-                        } while (!my_queue_representation->head_counter.compare_exchange_strong(ticket,
-                                                                                                ticket + 1));
-                    } while (!my_queue_representation->choose(ticket).pop(
-                            dst, ticket, *my_queue_representation, my_allocator));
-
-                    r1::notify_bounded_queue_monitor(my_monitors, cbq_slots_avail_tag, ticket);
-                    return true;
-                }
-
-                void internal_abort() {
-                    ++my_abort_counter;
-                    r1::abort_bounded_queue_monitors(my_monitors);
-                }
-
-                static void copy_construct_item(T* location, const void* src) {
-                    // TODO: use allocator_traits for copy construction
-                    new (location) value_type(*static_cast<const value_type*>(src));
-                }
-
-                static void move_construct_item(T* location, const void* src) {
-                    // TODO: use allocator_traits for move construction
-                    new (location) value_type(std::move(*static_cast<value_type*>(const_cast<void*>(src))));
-                }
-
-                template <typename Container, typename Value, typename A>
-                friend class concurrent_queue_iterator;
-
-                queue_allocator_type my_allocator;
-                std::ptrdiff_t my_capacity;
-                std::atomic<unsigned> my_abort_counter;
-                queue_representation_type* my_queue_representation;
 
-                r1::concurrent_monitor* my_monitors;
-            };// class concurrent_bounded_queue
+                    return static_cast<std::ptrdiff_t>(my_queue_representation->tail_counter.load(std::memory_order_relaxed)) <= target;
+                };
+
+                try_call( [&] {
+                    internal_wait(my_monitors, cbq_items_avail_tag, target, pred);
+                }).on_exception( [&] {
+                    my_queue_representation->head_counter--;
+                });
+            }
+            __TBB_ASSERT(static_cast<std::ptrdiff_t>(my_queue_representation->tail_counter.load(std::memory_order_relaxed)) > target, nullptr);
+        } while (!my_queue_representation->choose(target).pop(dst, target, *my_queue_representation, my_allocator));
+
+        r1::notify_bounded_queue_monitor(my_monitors, cbq_slots_avail_tag, target);
+    }
+
+    bool internal_pop_if_present( void* dst ) {
+        bool present{};
+        ticket_type ticket{};
+        std::tie(present, ticket) = internal_try_pop_impl(dst, *my_queue_representation, my_allocator);
+
+        if (present) {
+            r1::notify_bounded_queue_monitor(my_monitors, cbq_slots_avail_tag, ticket);
+        }
+        return present;
+    }
+
+    void internal_abort() {
+        ++my_abort_counter;
+        r1::abort_bounded_queue_monitors(my_monitors);
+    }
+
+    static void copy_construct_item(T* location, const void* src) {
+        // TODO: use allocator_traits for copy construction
+        new (location) value_type(*static_cast<const value_type*>(src));
+    }
+
+    static void move_construct_item(T* location, const void* src) {
+        // TODO: use allocator_traits for move construction
+        new (location) value_type(std::move(*static_cast<value_type*>(const_cast<void*>(src))));
+    }
+
+    template <typename Container, typename Value, typename A>
+    friend class concurrent_queue_iterator;
+
+    queue_allocator_type my_allocator;
+    std::ptrdiff_t my_capacity;
+    std::atomic<unsigned> my_abort_counter;
+    queue_representation_type* my_queue_representation;
+
+    r1::concurrent_monitor* my_monitors;
+
+    friend void swap( concurrent_bounded_queue& lhs, concurrent_bounded_queue& rhs ) {
+        lhs.swap(rhs);
+    }
+
+    friend bool operator==( const concurrent_bounded_queue& lhs, const concurrent_bounded_queue& rhs ) {
+        return lhs.size() == rhs.size() && std::equal(lhs.unsafe_begin(), lhs.unsafe_end(), rhs.unsafe_begin());
+    }
+
+#if !__TBB_CPP20_COMPARISONS_PRESENT
+    friend bool operator!=( const concurrent_bounded_queue& lhs, const concurrent_bounded_queue& rhs ) {
+        return !(lhs == rhs);
+    }
+#endif // __TBB_CPP20_COMPARISONS_PRESENT
+}; // class concurrent_bounded_queue
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
-            // Deduction guide for the constructor from two iterators
-            template <typename It, typename Alloc = tbb::cache_aligned_allocator<iterator_value_t<It>>>
-            concurrent_bounded_queue(It, It, Alloc = Alloc())
-                    -> concurrent_bounded_queue<iterator_value_t<It>, Alloc>;
+// Deduction guide for the constructor from two iterators
+template <typename It, typename Alloc = tbb::cache_aligned_allocator<iterator_value_t<It>>>
+concurrent_bounded_queue( It, It, Alloc = Alloc() )
+-> concurrent_bounded_queue<iterator_value_t<It>, Alloc>;
 
 #endif /* __TBB_CPP17_DEDUCTION_GUIDES_PRESENT */
 
-        }//namespace d2
-    }    // namespace detail
+} //namespace d2
+} // namespace detail
 
-    inline namespace v1 {
+inline namespace v1 {
 
-        using detail::d2::concurrent_bounded_queue;
-        using detail::d2::concurrent_queue;
-        using detail::r1::bad_last_alloc;
-        using detail::r1::user_abort;
+using detail::d2::concurrent_queue;
+using detail::d2::concurrent_bounded_queue;
+using detail::r1::user_abort;
+using detail::r1::bad_last_alloc;
 
-    }// namespace v1
-}// namespace tbb
+} // inline namespace v1
+} // namespace tbb
 
-#endif// __TBB_concurrent_queue_H
+#endif // __TBB_concurrent_queue_H
diff --git a/external/tbb/include/oneapi/tbb/concurrent_set.h b/external/tbb/include/oneapi/tbb/concurrent_set.h
index 94e0a6fe..dd143311 100644
--- a/external/tbb/include/oneapi/tbb/concurrent_set.h
+++ b/external/tbb/include/oneapi/tbb/concurrent_set.h
@@ -17,242 +17,251 @@
 #ifndef __TBB_concurrent_set_H
 #define __TBB_concurrent_set_H
 
-#include "detail/_concurrent_skip_list.h"
 #include "detail/_namespace_injection.h"
+#include "detail/_concurrent_skip_list.h"
 #include "tbb_allocator.h"
 #include <functional>
 #include <utility>
 
 namespace tbb {
-    namespace detail {
-        namespace d2 {
-
-            template <typename Key, typename KeyCompare, typename RandomGenerator, typename Allocator,
-                      bool AllowMultimapping>
-            struct set_traits {
-                static constexpr std::size_t max_level = RandomGenerator::max_level;
-                using random_level_generator_type = RandomGenerator;
-                using key_type = Key;
-                using value_type = key_type;
-                using compare_type = KeyCompare;
-                using value_compare = compare_type;
-                using reference = value_type&;
-                using const_reference = const value_type&;
-                using allocator_type = Allocator;
-
-                static constexpr bool allow_multimapping = AllowMultimapping;
-
-                static const key_type& get_key(const_reference val) { return val; }
-
-                static value_compare value_comp(compare_type comp) { return comp; }
-            };// struct set_traits
-
-            template <typename Key, typename Compare, typename Allocator>
-            class concurrent_multiset;
-
-            template <typename Key, typename Compare = std::less<Key>,
-                      typename Allocator = tbb::tbb_allocator<Key>>
-            class concurrent_set
-                : public concurrent_skip_list<set_traits<
-                          Key, Compare, concurrent_geometric_level_generator<32>, Allocator, false>> {
-                using base_type = concurrent_skip_list<
-                        set_traits<Key, Compare, concurrent_geometric_level_generator<32>, Allocator, false>>;
-
-            public:
-                using key_type = Key;
-                using value_type = typename base_type::value_type;
-                using size_type = typename base_type::size_type;
-                using difference_type = typename base_type::difference_type;
-                using key_compare = Compare;
-                using value_compare = typename base_type::value_compare;
-                using allocator_type = Allocator;
-
-                using reference = typename base_type::reference;
-                using const_reference = typename base_type::const_reference;
-                using pointer = typename base_type::pointer;
-                using const_pointer = typename base_type::const_pointer;
-
-                using iterator = typename base_type::iterator;
-                using const_iterator = typename base_type::const_iterator;
-
-                using node_type = typename base_type::node_type;
-
-                // Include constructors of base_type
-                using base_type::base_type;
-                using base_type::operator=;
-
-                // Required for implicit deduction guides
-                concurrent_set() = default;
-                concurrent_set(const concurrent_set&) = default;
-                concurrent_set(const concurrent_set& other, const allocator_type& alloc)
-                    : base_type(other, alloc) {}
-                concurrent_set(concurrent_set&&) = default;
-                concurrent_set(concurrent_set&& other, const allocator_type& alloc)
-                    : base_type(std::move(other), alloc) {}
-                // Required to respect the rule of 5
-                concurrent_set& operator=(const concurrent_set&) = default;
-                concurrent_set& operator=(concurrent_set&&) = default;
-
-                template <typename OtherCompare>
-                void merge(concurrent_set<key_type, OtherCompare, Allocator>& source) {
-                    this->internal_merge(source);
-                }
-
-                template <typename OtherCompare>
-                void merge(concurrent_set<key_type, OtherCompare, Allocator>&& source) {
-                    this->internal_merge(std::move(source));
-                }
-
-                template <typename OtherCompare>
-                void merge(concurrent_multiset<key_type, OtherCompare, Allocator>& source) {
-                    this->internal_merge(source);
-                }
-
-                template <typename OtherCompare>
-                void merge(concurrent_multiset<key_type, OtherCompare, Allocator>&& source) {
-                    this->internal_merge(std::move(source));
-                }
-            };// class concurrent_set
+namespace detail {
+namespace d2 {
+
+template<typename Key, typename KeyCompare, typename RandomGenerator, typename Allocator, bool AllowMultimapping>
+struct set_traits {
+    static constexpr std::size_t max_level = RandomGenerator::max_level;
+    using random_level_generator_type = RandomGenerator;
+    using key_type = Key;
+    using value_type = key_type;
+    using compare_type = KeyCompare;
+    using value_compare = compare_type;
+    using reference = value_type&;
+    using const_reference = const value_type&;
+    using allocator_type = Allocator;
+
+    static constexpr bool allow_multimapping = AllowMultimapping;
+
+    static const key_type& get_key(const_reference val) {
+        return val;
+    }
+
+    static value_compare value_comp(compare_type comp) { return comp; }
+}; // struct set_traits
+
+template <typename Key, typename Compare, typename Allocator>
+class concurrent_multiset;
+
+template <typename Key, typename Compare = std::less<Key>, typename Allocator = tbb::tbb_allocator<Key>>
+class concurrent_set : public concurrent_skip_list<set_traits<Key, Compare, concurrent_geometric_level_generator<32>, Allocator, false>> {
+    using base_type = concurrent_skip_list<set_traits<Key, Compare, concurrent_geometric_level_generator<32>, Allocator, false>>;
+public:
+    using key_type = Key;
+    using value_type = typename base_type::value_type;
+    using size_type = typename base_type::size_type;
+    using difference_type = typename base_type::difference_type;
+    using key_compare = Compare;
+    using value_compare = typename base_type::value_compare;
+    using allocator_type = Allocator;
+
+    using reference = typename base_type::reference;
+    using const_reference = typename base_type::const_reference;
+    using pointer = typename base_type::pointer;
+    using const_pointer = typename base_type::const_pointer;
+
+    using iterator = typename base_type::iterator;
+    using const_iterator = typename base_type::const_iterator;
+
+    using node_type = typename base_type::node_type;
+
+    // Include constructors of base_type
+    using base_type::base_type;
+
+    // Required for implicit deduction guides
+    concurrent_set() = default;
+    concurrent_set( const concurrent_set& ) = default;
+    concurrent_set( const concurrent_set& other, const allocator_type& alloc ) : base_type(other, alloc) {}
+    concurrent_set( concurrent_set&& ) = default;
+    concurrent_set( concurrent_set&& other, const allocator_type& alloc ) : base_type(std::move(other), alloc) {}
+    // Required to respect the rule of 5
+    concurrent_set& operator=( const concurrent_set& ) = default;
+    concurrent_set& operator=( concurrent_set&& ) = default;
+
+    concurrent_set& operator=( std::initializer_list<value_type> il ) {
+        base_type::operator= (il);
+        return *this;
+    }
+
+    template<typename OtherCompare>
+    void merge(concurrent_set<key_type, OtherCompare, Allocator>& source) {
+        this->internal_merge(source);
+    }
+
+    template<typename OtherCompare>
+    void merge(concurrent_set<key_type, OtherCompare, Allocator>&& source) {
+        this->internal_merge(std::move(source));
+    }
+
+    template<typename OtherCompare>
+    void merge(concurrent_multiset<key_type, OtherCompare, Allocator>& source) {
+        this->internal_merge(source);
+    }
+
+    template<typename OtherCompare>
+    void merge(concurrent_multiset<key_type, OtherCompare, Allocator>&& source) {
+        this->internal_merge(std::move(source));
+    }
+}; // class concurrent_set
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 
-            template <typename It, typename Comp = std::less<iterator_value_t<It>>,
-                      typename Alloc = tbb::tbb_allocator<iterator_value_t<It>>,
-                      typename = std::enable_if_t<is_input_iterator_v<It>>,
-                      typename = std::enable_if_t<is_allocator_v<Alloc>>,
-                      typename = std::enable_if_t<!is_allocator_v<Comp>>>
-            concurrent_set(It, It, Comp = Comp(), Alloc = Alloc())
-                    -> concurrent_set<iterator_value_t<It>, Comp, Alloc>;
-
-            template <typename Key, typename Comp = std::less<Key>, typename Alloc = tbb::tbb_allocator<Key>,
-                      typename = std::enable_if_t<is_allocator_v<Alloc>>,
-                      typename = std::enable_if_t<!is_allocator_v<Comp>>>
-            concurrent_set(std::initializer_list<Key>, Comp = Comp(), Alloc = Alloc())
-                    -> concurrent_set<Key, Comp, Alloc>;
-
-            template <typename It, typename Alloc, typename = std::enable_if_t<is_input_iterator_v<It>>,
-                      typename = std::enable_if_t<is_allocator_v<Alloc>>>
-            concurrent_set(It, It, Alloc)
-                    -> concurrent_set<iterator_value_t<It>, std::less<iterator_value_t<It>>, Alloc>;
-
-            template <typename Key, typename Alloc, typename = std::enable_if_t<is_allocator_v<Alloc>>>
-            concurrent_set(std::initializer_list<Key>, Alloc) -> concurrent_set<Key, std::less<Key>, Alloc>;
-
-#endif// __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
-
-            template <typename Key, typename Compare, typename Allocator>
-            void swap(concurrent_set<Key, Compare, Allocator>& lhs,
-                      concurrent_set<Key, Compare, Allocator>& rhs) {
-                lhs.swap(rhs);
-            }
-
-            template <typename Key, typename Compare = std::less<Key>,
-                      typename Allocator = tbb::tbb_allocator<Key>>
-            class concurrent_multiset
-                : public concurrent_skip_list<set_traits<
-                          Key, Compare, concurrent_geometric_level_generator<32>, Allocator, true>> {
-                using base_type = concurrent_skip_list<
-                        set_traits<Key, Compare, concurrent_geometric_level_generator<32>, Allocator, true>>;
-
-            public:
-                using key_type = Key;
-                using value_type = typename base_type::value_type;
-                using size_type = typename base_type::size_type;
-                using difference_type = typename base_type::difference_type;
-                using key_compare = Compare;
-                using value_compare = typename base_type::value_compare;
-                using allocator_type = Allocator;
-
-                using reference = typename base_type::reference;
-                using const_reference = typename base_type::const_reference;
-                using pointer = typename base_type::pointer;
-                using const_pointer = typename base_type::const_pointer;
-
-                using iterator = typename base_type::iterator;
-                using const_iterator = typename base_type::const_iterator;
-
-                using node_type = typename base_type::node_type;
-
-                // Include constructors of base_type;
-                using base_type::base_type;
-                using base_type::operator=;
-
-                // Required for implicit deduction guides
-                concurrent_multiset() = default;
-                concurrent_multiset(const concurrent_multiset&) = default;
-                concurrent_multiset(const concurrent_multiset& other, const allocator_type& alloc)
-                    : base_type(other, alloc) {}
-                concurrent_multiset(concurrent_multiset&&) = default;
-                concurrent_multiset(concurrent_multiset&& other, const allocator_type& alloc)
-                    : base_type(std::move(other), alloc) {}
-                // Required to respect the rule of 5
-                concurrent_multiset& operator=(const concurrent_multiset&) = default;
-                concurrent_multiset& operator=(concurrent_multiset&&) = default;
-
-                template <typename OtherCompare>
-                void merge(concurrent_set<key_type, OtherCompare, Allocator>& source) {
-                    this->internal_merge(source);
-                }
-
-                template <typename OtherCompare>
-                void merge(concurrent_set<key_type, OtherCompare, Allocator>&& source) {
-                    this->internal_merge(std::move(source));
-                }
-
-                template <typename OtherCompare>
-                void merge(concurrent_multiset<key_type, OtherCompare, Allocator>& source) {
-                    this->internal_merge(source);
-                }
-
-                template <typename OtherCompare>
-                void merge(concurrent_multiset<key_type, OtherCompare, Allocator>&& source) {
-                    this->internal_merge(std::move(source));
-                }
-            };// class concurrent_multiset
+template <typename It,
+          typename Comp = std::less<iterator_value_t<It>>,
+          typename Alloc = tbb::tbb_allocator<iterator_value_t<It>>,
+          typename = std::enable_if_t<is_input_iterator_v<It>>,
+          typename = std::enable_if_t<is_allocator_v<Alloc>>,
+          typename = std::enable_if_t<!is_allocator_v<Comp>>>
+concurrent_set( It, It, Comp = Comp(), Alloc = Alloc() )
+-> concurrent_set<iterator_value_t<It>, Comp, Alloc>;
+
+template <typename Key,
+          typename Comp = std::less<Key>,
+          typename Alloc = tbb::tbb_allocator<Key>,
+          typename = std::enable_if_t<is_allocator_v<Alloc>>,
+          typename = std::enable_if_t<!is_allocator_v<Comp>>>
+concurrent_set( std::initializer_list<Key>, Comp = Comp(), Alloc = Alloc() )
+-> concurrent_set<Key, Comp, Alloc>;
+
+template <typename It, typename Alloc,
+          typename = std::enable_if_t<is_input_iterator_v<It>>,
+          typename = std::enable_if_t<is_allocator_v<Alloc>>>
+concurrent_set( It, It, Alloc )
+-> concurrent_set<iterator_value_t<It>,
+                  std::less<iterator_value_t<It>>, Alloc>;
+
+template <typename Key, typename Alloc,
+          typename = std::enable_if_t<is_allocator_v<Alloc>>>
+concurrent_set( std::initializer_list<Key>, Alloc )
+-> concurrent_set<Key, std::less<Key>, Alloc>;
+
+#endif // __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
+
+template <typename Key, typename Compare, typename Allocator>
+void swap( concurrent_set<Key, Compare, Allocator>& lhs,
+           concurrent_set<Key, Compare, Allocator>& rhs )
+{
+    lhs.swap(rhs);
+}
+
+template <typename Key, typename Compare = std::less<Key>, typename Allocator = tbb::tbb_allocator<Key>>
+class concurrent_multiset : public concurrent_skip_list<set_traits<Key, Compare, concurrent_geometric_level_generator<32>, Allocator, true>> {
+    using base_type = concurrent_skip_list<set_traits<Key, Compare, concurrent_geometric_level_generator<32>, Allocator, true>>;
+public:
+    using key_type = Key;
+    using value_type = typename base_type::value_type;
+    using size_type = typename base_type::size_type;
+    using difference_type = typename base_type::difference_type;
+    using key_compare = Compare;
+    using value_compare = typename base_type::value_compare;
+    using allocator_type = Allocator;
+
+    using reference = typename base_type::reference;
+    using const_reference = typename base_type::const_reference;
+    using pointer = typename base_type::pointer;
+    using const_pointer = typename base_type::const_pointer;
+
+    using iterator = typename base_type::iterator;
+    using const_iterator = typename base_type::const_iterator;
+
+    using node_type = typename base_type::node_type;
+
+    // Include constructors of base_type;
+    using base_type::base_type;
+
+    // Required for implicit deduction guides
+    concurrent_multiset() = default;
+    concurrent_multiset( const concurrent_multiset& ) = default;
+    concurrent_multiset( const concurrent_multiset& other, const allocator_type& alloc ) : base_type(other, alloc) {}
+    concurrent_multiset( concurrent_multiset&& ) = default;
+    concurrent_multiset( concurrent_multiset&& other, const allocator_type& alloc ) : base_type(std::move(other), alloc) {}
+    // Required to respect the rule of 5
+    concurrent_multiset& operator=( const concurrent_multiset& ) = default;
+    concurrent_multiset& operator=( concurrent_multiset&& ) = default;
+
+    concurrent_multiset& operator=( std::initializer_list<value_type> il ) {
+        base_type::operator= (il);
+        return *this;
+    }
+
+    template<typename OtherCompare>
+    void merge(concurrent_set<key_type, OtherCompare, Allocator>& source) {
+        this->internal_merge(source);
+    }
+
+    template<typename OtherCompare>
+    void merge(concurrent_set<key_type, OtherCompare, Allocator>&& source) {
+        this->internal_merge(std::move(source));
+    }
+
+    template<typename OtherCompare>
+    void merge(concurrent_multiset<key_type, OtherCompare, Allocator>& source) {
+        this->internal_merge(source);
+    }
+
+    template<typename OtherCompare>
+    void merge(concurrent_multiset<key_type, OtherCompare, Allocator>&& source) {
+        this->internal_merge(std::move(source));
+    }
+}; // class concurrent_multiset
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 
-            template <typename It, typename Comp = std::less<iterator_value_t<It>>,
-                      typename Alloc = tbb::tbb_allocator<iterator_value_t<It>>,
-                      typename = std::enable_if_t<is_input_iterator_v<It>>,
-                      typename = std::enable_if_t<is_allocator_v<Alloc>>,
-                      typename = std::enable_if_t<!is_allocator_v<Comp>>>
-            concurrent_multiset(It, It, Comp = Comp(), Alloc = Alloc())
-                    -> concurrent_multiset<iterator_value_t<It>, Comp, Alloc>;
-
-            template <typename Key, typename Comp = std::less<Key>, typename Alloc = tbb::tbb_allocator<Key>,
-                      typename = std::enable_if_t<is_allocator_v<Alloc>>,
-                      typename = std::enable_if_t<!is_allocator_v<Comp>>>
-            concurrent_multiset(std::initializer_list<Key>, Comp = Comp(), Alloc = Alloc())
-                    -> concurrent_multiset<Key, Comp, Alloc>;
-
-            template <typename It, typename Alloc, typename = std::enable_if_t<is_input_iterator_v<It>>,
-                      typename = std::enable_if_t<is_allocator_v<Alloc>>>
-            concurrent_multiset(It, It, Alloc)
-                    -> concurrent_multiset<iterator_value_t<It>, std::less<iterator_value_t<It>>, Alloc>;
-
-            template <typename Key, typename Alloc, typename = std::enable_if_t<is_allocator_v<Alloc>>>
-            concurrent_multiset(std::initializer_list<Key>, Alloc)
-                    -> concurrent_multiset<Key, std::less<Key>, Alloc>;
-
-#endif// __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
-
-            template <typename Key, typename Compare, typename Allocator>
-            void swap(concurrent_multiset<Key, Compare, Allocator>& lhs,
-                      concurrent_multiset<Key, Compare, Allocator>& rhs) {
-                lhs.swap(rhs);
-            }
-
-        }// namespace d2
-    }    // namespace detail
-
-    inline namespace v1 {
-
-        using detail::split;
-        using detail::d2::concurrent_multiset;
-        using detail::d2::concurrent_set;
-
-    }// namespace v1
-}// namespace tbb
-
-#endif// __TBB_concurrent_set_H
+template <typename It,
+          typename Comp = std::less<iterator_value_t<It>>,
+          typename Alloc = tbb::tbb_allocator<iterator_value_t<It>>,
+          typename = std::enable_if_t<is_input_iterator_v<It>>,
+          typename = std::enable_if_t<is_allocator_v<Alloc>>,
+          typename = std::enable_if_t<!is_allocator_v<Comp>>>
+concurrent_multiset( It, It, Comp = Comp(), Alloc = Alloc() )
+-> concurrent_multiset<iterator_value_t<It>, Comp, Alloc>;
+
+template <typename Key,
+          typename Comp = std::less<Key>,
+          typename Alloc = tbb::tbb_allocator<Key>,
+          typename = std::enable_if_t<is_allocator_v<Alloc>>,
+          typename = std::enable_if_t<!is_allocator_v<Comp>>>
+concurrent_multiset( std::initializer_list<Key>, Comp = Comp(), Alloc = Alloc() )
+-> concurrent_multiset<Key, Comp, Alloc>;
+
+template <typename It, typename Alloc,
+          typename = std::enable_if_t<is_input_iterator_v<It>>,
+          typename = std::enable_if_t<is_allocator_v<Alloc>>>
+concurrent_multiset( It, It, Alloc )
+-> concurrent_multiset<iterator_value_t<It>, std::less<iterator_value_t<It>>, Alloc>;
+
+template <typename Key, typename Alloc,
+          typename = std::enable_if_t<is_allocator_v<Alloc>>>
+concurrent_multiset( std::initializer_list<Key>, Alloc )
+-> concurrent_multiset<Key, std::less<Key>, Alloc>;
+
+#endif // __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
+
+template <typename Key, typename Compare, typename Allocator>
+void swap( concurrent_multiset<Key, Compare, Allocator>& lhs,
+           concurrent_multiset<Key, Compare, Allocator>& rhs )
+{
+    lhs.swap(rhs);
+}
+
+} // namespace d2
+} // namespace detail
+
+inline namespace v1 {
+
+using detail::d2::concurrent_set;
+using detail::d2::concurrent_multiset;
+using detail::split;
+
+} // inline namespace v1
+} // namespace tbb
+
+#endif // __TBB_concurrent_set_H
diff --git a/external/tbb/include/oneapi/tbb/concurrent_unordered_map.h b/external/tbb/include/oneapi/tbb/concurrent_unordered_map.h
index 87d885c3..9cade0a9 100644
--- a/external/tbb/include/oneapi/tbb/concurrent_unordered_map.h
+++ b/external/tbb/include/oneapi/tbb/concurrent_unordered_map.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -17,391 +17,398 @@
 #ifndef __TBB_concurrent_unordered_map_H
 #define __TBB_concurrent_unordered_map_H
 
-#include "detail/_concurrent_unordered_base.h"
 #include "detail/_namespace_injection.h"
+#include "detail/_concurrent_unordered_base.h"
 #include "tbb_allocator.h"
 #include <functional>
 
 namespace tbb {
-    namespace detail {
-        namespace d1 {
-
-            template <typename Key, typename T, typename Hash, typename KeyEqual, typename Allocator,
-                      bool AllowMultimapping>
-            struct concurrent_unordered_map_traits {
-                using value_type = std::pair<const Key, T>;
-                using key_type = Key;
-                using allocator_type = Allocator;
-                using hash_compare_type = hash_compare<Key, Hash, KeyEqual>;
-                static constexpr bool allow_multimapping = AllowMultimapping;
-
-                static constexpr const key_type& get_key(const value_type& value) { return value.first; }
-            };// struct concurrent_unordered_map_traits
-
-            template <typename Key, typename T, typename Hash, typename KeyEqual, typename Allocator>
-            class concurrent_unordered_multimap;
-
-            template <typename Key, typename T, typename Hash = std::hash<Key>,
-                      typename KeyEqual = std::equal_to<Key>,
-                      typename Allocator = tbb::tbb_allocator<std::pair<const Key, T>>>
-            class concurrent_unordered_map
-                : public concurrent_unordered_base<
-                          concurrent_unordered_map_traits<Key, T, Hash, KeyEqual, Allocator, false>> {
-                using traits_type = concurrent_unordered_map_traits<Key, T, Hash, KeyEqual, Allocator, false>;
-                using base_type = concurrent_unordered_base<traits_type>;
-
-            public:
-                using key_type = typename base_type::key_type;
-                using mapped_type = T;
-                using value_type = typename base_type::value_type;
-                using size_type = typename base_type::size_type;
-                using difference_type = typename base_type::difference_type;
-                using hasher = typename base_type::hasher;
-                using key_equal = typename base_type::key_equal;
-                using allocator_type = typename base_type::allocator_type;
-                using reference = typename base_type::reference;
-                using const_reference = typename base_type::const_reference;
-                using pointer = typename base_type::pointer;
-                using const_pointer = typename base_type::const_pointer;
-                using iterator = typename base_type::iterator;
-                using const_iterator = typename base_type::const_iterator;
-                using local_iterator = typename base_type::local_iterator;
-                using const_local_iterator = typename base_type::const_local_iterator;
-                using node_type = typename base_type::node_type;
-
-                // Include constructors of base type
-                using base_type::base_type;
-                using base_type::operator=;
-
-                // Required for implicit deduction guides
-                concurrent_unordered_map() = default;
-                concurrent_unordered_map(const concurrent_unordered_map&) = default;
-                concurrent_unordered_map(const concurrent_unordered_map& other, const allocator_type& alloc)
-                    : base_type(other, alloc) {}
-                concurrent_unordered_map(concurrent_unordered_map&&) = default;
-                concurrent_unordered_map(concurrent_unordered_map&& other, const allocator_type& alloc)
-                    : base_type(std::move(other), alloc) {}
-                // Required to respect the rule of 5
-                concurrent_unordered_map& operator=(const concurrent_unordered_map&) = default;
-                concurrent_unordered_map& operator=(concurrent_unordered_map&&) = default;
-
-                // Observers
-                mapped_type& operator[](const key_type& key) {
-                    iterator where = this->find(key);
-
-                    if (where == this->end()) {
-                        where = this->emplace(std::piecewise_construct, std::forward_as_tuple(key),
-                                              std::tuple<>())
-                                        .first;
-                    }
-                    return where->second;
-                }
-
-                mapped_type& operator[](key_type&& key) {
-                    iterator where = this->find(key);
-
-                    if (where == this->end()) {
-                        where = this->emplace(std::piecewise_construct, std::forward_as_tuple(std::move(key)),
-                                              std::tuple<>())
-                                        .first;
-                    }
-                    return where->second;
-                }
-
-                mapped_type& at(const key_type& key) {
-                    iterator where = this->find(key);
-
-                    if (where == this->end()) { throw_exception(exception_id::invalid_key); }
-                    return where->second;
-                }
-
-                const mapped_type& at(const key_type& key) const {
-                    const_iterator where = this->find(key);
-
-                    if (where == this->end()) { throw_exception(exception_id::out_of_range); }
-                    return where->second;
-                }
-
-                using base_type::insert;
-
-                template <typename P>
-                typename std::enable_if<std::is_constructible<value_type, P&&>::value,
-                                        std::pair<iterator, bool>>::type
-                insert(P&& value) {
-                    return this->emplace(std::forward<P>(value));
-                }
-
-                template <typename P>
-                typename std::enable_if<std::is_constructible<value_type, P&&>::value, iterator>::type
-                insert(const_iterator hint, P&& value) {
-                    return this->emplace_hint(hint, std::forward<P>(value));
-                }
-
-                template <typename OtherHash, typename OtherKeyEqual>
-                void merge(concurrent_unordered_map<key_type, mapped_type, OtherHash, OtherKeyEqual,
-                                                    allocator_type>& source) {
-                    this->internal_merge(source);
-                }
-
-                template <typename OtherHash, typename OtherKeyEqual>
-                void merge(concurrent_unordered_map<key_type, mapped_type, OtherHash, OtherKeyEqual,
-                                                    allocator_type>&& source) {
-                    this->internal_merge(std::move(source));
-                }
-
-                template <typename OtherHash, typename OtherKeyEqual>
-                void merge(concurrent_unordered_multimap<key_type, mapped_type, OtherHash, OtherKeyEqual,
-                                                         allocator_type>& source) {
-                    this->internal_merge(source);
-                }
-
-                template <typename OtherHash, typename OtherKeyEqual>
-                void merge(concurrent_unordered_multimap<key_type, mapped_type, OtherHash, OtherKeyEqual,
-                                                         allocator_type>&& source) {
-                    this->internal_merge(std::move(source));
-                }
-            };// class concurrent_unordered_map
+namespace detail {
+namespace d2 {
+
+template <typename Key, typename T, typename Hash, typename KeyEqual, typename Allocator, bool AllowMultimapping>
+struct concurrent_unordered_map_traits {
+    using value_type = std::pair<const Key, T>;
+    using key_type = Key;
+    using allocator_type = Allocator;
+    using hash_compare_type = d1::hash_compare<Key, Hash, KeyEqual>;
+    static constexpr bool allow_multimapping = AllowMultimapping;
+
+    static constexpr const key_type& get_key( const value_type& value ) {
+        return value.first;
+    }
+}; // struct concurrent_unordered_map_traits
+
+template <typename Key, typename T, typename Hash, typename KeyEqual, typename Allocator>
+class concurrent_unordered_multimap;
+
+template <typename Key, typename T, typename Hash = std::hash<Key>, typename KeyEqual = std::equal_to<Key>,
+          typename Allocator = tbb::tbb_allocator<std::pair<const Key, T>> >
+class concurrent_unordered_map
+    : public concurrent_unordered_base<concurrent_unordered_map_traits<Key, T, Hash, KeyEqual, Allocator, false>>
+{
+    using traits_type = concurrent_unordered_map_traits<Key, T, Hash, KeyEqual, Allocator, false>;
+    using base_type = concurrent_unordered_base<traits_type>;
+public:
+    using key_type = typename base_type::key_type;
+    using mapped_type = T;
+    using value_type = typename base_type::value_type;
+    using size_type = typename base_type::size_type;
+    using difference_type = typename base_type::difference_type;
+    using hasher = typename base_type::hasher;
+    using key_equal = typename base_type::key_equal;
+    using allocator_type = typename base_type::allocator_type;
+    using reference = typename base_type::reference;
+    using const_reference = typename base_type::const_reference;
+    using pointer = typename base_type::pointer;
+    using const_pointer = typename base_type::const_pointer;
+    using iterator = typename base_type::iterator;
+    using const_iterator = typename base_type::const_iterator;
+    using local_iterator = typename base_type::local_iterator;
+    using const_local_iterator = typename base_type::const_local_iterator;
+    using node_type = typename base_type::node_type;
+
+    // Include constructors of base type
+    using base_type::base_type;
+
+    // Required for implicit deduction guides
+    concurrent_unordered_map() = default;
+    concurrent_unordered_map( const concurrent_unordered_map& ) = default;
+    concurrent_unordered_map( const concurrent_unordered_map& other, const allocator_type& alloc ) : base_type(other, alloc) {}
+    concurrent_unordered_map( concurrent_unordered_map&& ) = default;
+    concurrent_unordered_map( concurrent_unordered_map&& other, const allocator_type& alloc ) : base_type(std::move(other), alloc) {}
+    // Required to respect the rule of 5
+    concurrent_unordered_map& operator=( const concurrent_unordered_map& ) = default;
+    concurrent_unordered_map& operator=( concurrent_unordered_map&& ) = default;
+
+    concurrent_unordered_map& operator=( std::initializer_list<value_type> il ) {
+        base_type::operator= (il);
+        return *this;
+    }
+
+    // Observers
+    mapped_type& operator[]( const key_type& key ) {
+        iterator where = this->find(key);
+
+        if (where == this->end()) {
+            where = this->emplace(std::piecewise_construct, std::forward_as_tuple(key), std::tuple<>()).first;
+        }
+        return where->second;
+    }
+
+    mapped_type& operator[]( key_type&& key ) {
+        iterator where = this->find(key);
+
+        if (where == this->end()) {
+            where = this->emplace(std::piecewise_construct, std::forward_as_tuple(std::move(key)), std::tuple<>()).first;
+        }
+        return where->second;
+    }
+
+    mapped_type& at( const key_type& key ) {
+        iterator where = this->find(key);
+
+        if (where == this->end()) {
+            throw_exception(exception_id::invalid_key);
+        }
+        return where->second;
+    }
+
+    const mapped_type& at( const key_type& key ) const {
+        const_iterator where = this->find(key);
+
+        if (where == this->end()) {
+            throw_exception(exception_id::out_of_range);
+        }
+        return where->second;
+    }
+
+    using base_type::insert;
+
+    template<typename P>
+    typename std::enable_if<std::is_constructible<value_type, P&&>::value,
+                            std::pair<iterator, bool>>::type insert( P&& value ) {
+        return this->emplace(std::forward<P>(value));
+    }
+
+    template<typename P>
+    typename std::enable_if<std::is_constructible<value_type, P&&>::value,
+                            iterator>::type insert( const_iterator hint, P&& value ) {
+        return this->emplace_hint(hint, std::forward<P>(value));
+    }
+
+    template <typename OtherHash, typename OtherKeyEqual>
+    void merge( concurrent_unordered_map<key_type, mapped_type, OtherHash, OtherKeyEqual, allocator_type>& source ) {
+        this->internal_merge(source);
+    }
+
+    template <typename OtherHash, typename OtherKeyEqual>
+    void merge( concurrent_unordered_map<key_type, mapped_type, OtherHash, OtherKeyEqual, allocator_type>&& source ) {
+        this->internal_merge(std::move(source));
+    }
+
+    template <typename OtherHash, typename OtherKeyEqual>
+    void merge( concurrent_unordered_multimap<key_type, mapped_type, OtherHash, OtherKeyEqual, allocator_type>& source ) {
+        this->internal_merge(source);
+    }
+
+    template <typename OtherHash, typename OtherKeyEqual>
+    void merge( concurrent_unordered_multimap<key_type, mapped_type, OtherHash, OtherKeyEqual, allocator_type>&& source ) {
+        this->internal_merge(std::move(source));
+    }
+}; // class concurrent_unordered_map
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
-            template <typename It, typename Hash = std::hash<iterator_key_t<It>>,
-                      typename KeyEq = std::equal_to<iterator_key_t<It>>,
-                      typename Alloc = tbb::tbb_allocator<iterator_alloc_pair_t<It>>,
-                      typename = std::enable_if_t<is_input_iterator_v<It>>,
-                      typename = std::enable_if_t<is_allocator_v<Alloc>>,
-                      typename = std::enable_if_t<!is_allocator_v<Hash>>,
-                      typename = std::enable_if_t<!is_allocator_v<KeyEq>>,
-                      typename = std::enable_if_t<!std::is_integral_v<Hash>>>
-            concurrent_unordered_map(It, It, std::size_t = {}, Hash = Hash(), KeyEq = KeyEq(),
-                                     Alloc = Alloc())
-                    -> concurrent_unordered_map<iterator_key_t<It>, iterator_mapped_t<It>, Hash, KeyEq,
-                                                Alloc>;
-
-            template <typename Key, typename T, typename Hash = std::hash<std::remove_const_t<Key>>,
-                      typename KeyEq = std::equal_to<std::remove_const_t<Key>>,
-                      typename Alloc = tbb::tbb_allocator<std::pair<const Key, T>>,
-                      typename = std::enable_if_t<is_allocator_v<Alloc>>,
-                      typename = std::enable_if_t<!is_allocator_v<Hash>>,
-                      typename = std::enable_if_t<!is_allocator_v<KeyEq>>,
-                      typename = std::enable_if_t<!std::is_integral_v<Hash>>>
-            concurrent_unordered_map(std::initializer_list<std::pair<Key, T>>, std::size_t = {},
-                                     Hash = Hash(), KeyEq = KeyEq(), Alloc = Alloc())
-                    -> concurrent_unordered_map<std::remove_const_t<Key>, T, Hash, KeyEq, Alloc>;
-
-            template <typename It, typename Alloc, typename = std::enable_if_t<is_input_iterator_v<It>>,
-                      typename = std::enable_if_t<is_allocator_v<Alloc>>>
-            concurrent_unordered_map(It, It, std::size_t, Alloc)
-                    -> concurrent_unordered_map<iterator_key_t<It>, iterator_mapped_t<It>,
-                                                std::hash<iterator_key_t<It>>,
-                                                std::equal_to<iterator_key_t<It>>, Alloc>;
-
-            // TODO: investigate if a deduction guide for concurrent_unordered_map(It, It, Alloc) is needed
-
-            template <typename It, typename Hash, typename Alloc,
-                      typename = std::enable_if_t<is_input_iterator_v<It>>,
-                      typename = std::enable_if_t<is_allocator_v<Alloc>>,
-                      typename = std::enable_if_t<!is_allocator_v<Hash>>,
-                      typename = std::enable_if_t<!std::is_integral_v<Hash>>>
-            concurrent_unordered_map(It, It, std::size_t, Hash, Alloc)
-                    -> concurrent_unordered_map<iterator_key_t<It>, iterator_mapped_t<It>, Hash,
-                                                std::equal_to<iterator_key_t<It>>, Alloc>;
-
-            template <typename Key, typename T, typename Alloc,
-                      typename = std::enable_if_t<is_allocator_v<Alloc>>>
-            concurrent_unordered_map(std::initializer_list<std::pair<Key, T>>, std::size_t, Alloc)
-                    -> concurrent_unordered_map<std::remove_const_t<Key>, T,
-                                                std::hash<std::remove_const_t<Key>>,
-                                                std::equal_to<std::remove_const_t<Key>>, Alloc>;
-
-            template <typename Key, typename T, typename Alloc,
-                      typename = std::enable_if_t<is_allocator_v<Alloc>>>
-            concurrent_unordered_map(std::initializer_list<std::pair<Key, T>>, Alloc)
-                    -> concurrent_unordered_map<std::remove_const_t<Key>, T,
-                                                std::hash<std::remove_const_t<Key>>,
-                                                std::equal_to<std::remove_const_t<Key>>, Alloc>;
-
-            template <typename Key, typename T, typename Hash, typename Alloc,
-                      typename = std::enable_if_t<is_allocator_v<Alloc>>,
-                      typename = std::enable_if_t<!is_allocator_v<Hash>>,
-                      typename = std::enable_if_t<!std::is_integral_v<Hash>>>
-            concurrent_unordered_map(std::initializer_list<std::pair<Key, T>>, std::size_t, Hash, Alloc)
-                    -> concurrent_unordered_map<std::remove_const_t<Key>, T, Hash,
-                                                std::equal_to<std::remove_const_t<Key>>, Alloc>;
-
-#endif// __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
-
-            template <typename Key, typename T, typename Hash, typename KeyEqual, typename Allocator>
-            void swap(concurrent_unordered_map<Key, T, Hash, KeyEqual, Allocator>& lhs,
-                      concurrent_unordered_map<Key, T, Hash, KeyEqual, Allocator>& rhs) {
-                lhs.swap(rhs);
-            }
-
-            template <typename Key, typename T, typename Hash = std::hash<Key>,
-                      typename KeyEqual = std::equal_to<Key>,
-                      typename Allocator = tbb::tbb_allocator<std::pair<const Key, T>>>
-            class concurrent_unordered_multimap
-                : public concurrent_unordered_base<
-                          concurrent_unordered_map_traits<Key, T, Hash, KeyEqual, Allocator, true>> {
-                using traits_type = concurrent_unordered_map_traits<Key, T, Hash, KeyEqual, Allocator, true>;
-                using base_type = concurrent_unordered_base<traits_type>;
-
-            public:
-                using key_type = typename base_type::key_type;
-                using mapped_type = T;
-                using value_type = typename base_type::value_type;
-                using size_type = typename base_type::size_type;
-                using difference_type = typename base_type::difference_type;
-                using hasher = typename base_type::hasher;
-                using key_equal = typename base_type::key_equal;
-                using allocator_type = typename base_type::allocator_type;
-                using reference = typename base_type::reference;
-                using const_reference = typename base_type::const_reference;
-                using pointer = typename base_type::pointer;
-                using const_pointer = typename base_type::const_pointer;
-                using iterator = typename base_type::iterator;
-                using const_iterator = typename base_type::const_iterator;
-                using local_iterator = typename base_type::local_iterator;
-                using const_local_iterator = typename base_type::const_local_iterator;
-                using node_type = typename base_type::node_type;
-
-                // Include constructors of base type
-                using base_type::base_type;
-                using base_type::operator=;
-                using base_type::insert;
-
-                // Required for implicit deduction guides
-                concurrent_unordered_multimap() = default;
-                concurrent_unordered_multimap(const concurrent_unordered_multimap&) = default;
-                concurrent_unordered_multimap(const concurrent_unordered_multimap& other,
-                                              const allocator_type& alloc)
-                    : base_type(other, alloc) {}
-                concurrent_unordered_multimap(concurrent_unordered_multimap&&) = default;
-                concurrent_unordered_multimap(concurrent_unordered_multimap&& other,
-                                              const allocator_type& alloc)
-                    : base_type(std::move(other), alloc) {}
-                // Required to respect the rule of 5
-                concurrent_unordered_multimap& operator=(const concurrent_unordered_multimap&) = default;
-                concurrent_unordered_multimap& operator=(concurrent_unordered_multimap&&) = default;
-
-                template <typename P>
-                typename std::enable_if<std::is_constructible<value_type, P&&>::value,
-                                        std::pair<iterator, bool>>::type
-                insert(P&& value) {
-                    return this->emplace(std::forward<P>(value));
-                }
-
-                template <typename P>
-                typename std::enable_if<std::is_constructible<value_type, P&&>::value, iterator>::type
-                insert(const_iterator hint, P&& value) {
-                    return this->emplace_hint(hint, std::forward<P&&>(value));
-                }
-
-                template <typename OtherHash, typename OtherKeyEqual>
-                void merge(concurrent_unordered_map<key_type, mapped_type, OtherHash, OtherKeyEqual,
-                                                    allocator_type>& source) {
-                    this->internal_merge(source);
-                }
-
-                template <typename OtherHash, typename OtherKeyEqual>
-                void merge(concurrent_unordered_map<key_type, mapped_type, OtherHash, OtherKeyEqual,
-                                                    allocator_type>&& source) {
-                    this->internal_merge(std::move(source));
-                }
-
-                template <typename OtherHash, typename OtherKeyEqual>
-                void merge(concurrent_unordered_multimap<key_type, mapped_type, OtherHash, OtherKeyEqual,
-                                                         allocator_type>& source) {
-                    this->internal_merge(source);
-                }
-
-                template <typename OtherHash, typename OtherKeyEqual>
-                void merge(concurrent_unordered_multimap<key_type, mapped_type, OtherHash, OtherKeyEqual,
-                                                         allocator_type>&& source) {
-                    this->internal_merge(std::move(source));
-                }
-            };// class concurrent_unordered_multimap
+template <typename It,
+          typename Hash = std::hash<iterator_key_t<It>>,
+          typename KeyEq = std::equal_to<iterator_key_t<It>>,
+          typename Alloc = tbb::tbb_allocator<iterator_alloc_pair_t<It>>,
+          typename = std::enable_if_t<is_input_iterator_v<It>>,
+          typename = std::enable_if_t<is_allocator_v<Alloc>>,
+          typename = std::enable_if_t<!is_allocator_v<Hash>>,
+          typename = std::enable_if_t<!is_allocator_v<KeyEq>>,
+          typename = std::enable_if_t<!std::is_integral_v<Hash>>>
+concurrent_unordered_map( It, It, std::size_t =  {},
+                          Hash = Hash(), KeyEq = KeyEq(), Alloc = Alloc() )
+-> concurrent_unordered_map<iterator_key_t<It>, iterator_mapped_t<It>, Hash, KeyEq, Alloc>;
+
+template <typename Key, typename T,
+          typename Hash = std::hash<std::remove_const_t<Key>>,
+          typename KeyEq = std::equal_to<std::remove_const_t<Key>>,
+          typename Alloc = tbb::tbb_allocator<std::pair<const Key, T>>,
+          typename = std::enable_if_t<is_allocator_v<Alloc>>,
+          typename = std::enable_if_t<!is_allocator_v<Hash>>,
+          typename = std::enable_if_t<!is_allocator_v<KeyEq>>,
+          typename = std::enable_if_t<!std::is_integral_v<Hash>>>
+concurrent_unordered_map( std::initializer_list<std::pair<Key, T>>, std::size_t = {},
+                          Hash = Hash(), KeyEq = KeyEq(), Alloc = Alloc() )
+-> concurrent_unordered_map<std::remove_const_t<Key>, T, Hash, KeyEq, Alloc>;
+
+template <typename It, typename Alloc,
+          typename = std::enable_if_t<is_input_iterator_v<It>>,
+          typename = std::enable_if_t<is_allocator_v<Alloc>>>
+concurrent_unordered_map( It, It, std::size_t, Alloc )
+-> concurrent_unordered_map<iterator_key_t<It>, iterator_mapped_t<It>,
+                            std::hash<iterator_key_t<It>>,
+                            std::equal_to<iterator_key_t<It>>, Alloc>;
+
+// TODO: investigate if a deduction guide for concurrent_unordered_map(It, It, Alloc) is needed
+
+template <typename It, typename Hash, typename Alloc,
+          typename = std::enable_if_t<is_input_iterator_v<It>>,
+          typename = std::enable_if_t<is_allocator_v<Alloc>>,
+          typename = std::enable_if_t<!is_allocator_v<Hash>>,
+          typename = std::enable_if_t<!std::is_integral_v<Hash>>>
+concurrent_unordered_map( It, It, std::size_t, Hash, Alloc )
+-> concurrent_unordered_map<iterator_key_t<It>, iterator_mapped_t<It>,
+                            Hash, std::equal_to<iterator_key_t<It>>, Alloc>;
+
+template <typename Key, typename T, typename Alloc,
+          typename = std::enable_if_t<is_allocator_v<Alloc>>>
+concurrent_unordered_map( std::initializer_list<std::pair<Key, T>>, std::size_t, Alloc )
+-> concurrent_unordered_map<std::remove_const_t<Key>, T, std::hash<std::remove_const_t<Key>>,
+                            std::equal_to<std::remove_const_t<Key>>, Alloc>;
+
+template <typename Key, typename T, typename Alloc,
+          typename = std::enable_if_t<is_allocator_v<Alloc>>>
+concurrent_unordered_map( std::initializer_list<std::pair<Key, T>>, Alloc )
+-> concurrent_unordered_map<std::remove_const_t<Key>, T, std::hash<std::remove_const_t<Key>>,
+                            std::equal_to<std::remove_const_t<Key>>, Alloc>;
+
+template <typename Key, typename T, typename Hash, typename Alloc,
+          typename = std::enable_if_t<is_allocator_v<Alloc>>,
+          typename = std::enable_if_t<!is_allocator_v<Hash>>,
+          typename = std::enable_if_t<!std::is_integral_v<Hash>>>
+concurrent_unordered_map( std::initializer_list<std::pair<Key, T>>, std::size_t, Hash, Alloc )
+-> concurrent_unordered_map<std::remove_const_t<Key>, T, Hash,
+                            std::equal_to<std::remove_const_t<Key>>, Alloc>;
+
+#if __APPLE__ && __TBB_CLANG_VERSION == 100000
+// An explicit deduction guide is required for copy/move constructor with allocator for APPLE LLVM 10.0.0
+// due to an issue with generating an implicit deduction guide for these constructors under several strange surcumstances.
+// Currently the issue takes place because the last template parameter for Traits is boolean, it should not affect the deduction guides
+// The issue reproduces only on this version of the compiler
+template <typename Key, typename T, typename Hash, typename KeyEq, typename Alloc>
+concurrent_unordered_map( concurrent_unordered_map<Key, T, Hash, KeyEq, Alloc>, Alloc )
+-> concurrent_unordered_map<Key, T, Hash, KeyEq, Alloc>;
+#endif
+
+#endif // __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
+
+template <typename Key, typename T, typename Hash, typename KeyEqual, typename Allocator>
+void swap( concurrent_unordered_map<Key, T, Hash, KeyEqual, Allocator>& lhs,
+           concurrent_unordered_map<Key, T, Hash, KeyEqual, Allocator>& rhs ) {
+    lhs.swap(rhs);
+}
+
+template <typename Key, typename T, typename Hash = std::hash<Key>, typename KeyEqual = std::equal_to<Key>,
+          typename Allocator = tbb::tbb_allocator<std::pair<const Key, T>> >
+class concurrent_unordered_multimap
+    : public concurrent_unordered_base<concurrent_unordered_map_traits<Key, T, Hash, KeyEqual, Allocator, true>>
+{
+    using traits_type = concurrent_unordered_map_traits<Key, T, Hash, KeyEqual, Allocator, true>;
+    using base_type = concurrent_unordered_base<traits_type>;
+public:
+    using key_type = typename base_type::key_type;
+    using mapped_type = T;
+    using value_type = typename base_type::value_type;
+    using size_type = typename base_type::size_type;
+    using difference_type = typename base_type::difference_type;
+    using hasher = typename base_type::hasher;
+    using key_equal = typename base_type::key_equal;
+    using allocator_type = typename base_type::allocator_type;
+    using reference = typename base_type::reference;
+    using const_reference = typename base_type::const_reference;
+    using pointer = typename base_type::pointer;
+    using const_pointer = typename base_type::const_pointer;
+    using iterator = typename base_type::iterator;
+    using const_iterator = typename base_type::const_iterator;
+    using local_iterator = typename base_type::local_iterator;
+    using const_local_iterator = typename base_type::const_local_iterator;
+    using node_type = typename base_type::node_type;
+
+    // Include constructors of base type
+    using base_type::base_type;
+    using base_type::insert;
+
+    // Required for implicit deduction guides
+    concurrent_unordered_multimap() = default;
+    concurrent_unordered_multimap( const concurrent_unordered_multimap& ) = default;
+    concurrent_unordered_multimap( const concurrent_unordered_multimap& other, const allocator_type& alloc ) : base_type(other, alloc) {}
+    concurrent_unordered_multimap( concurrent_unordered_multimap&& ) = default;
+    concurrent_unordered_multimap( concurrent_unordered_multimap&& other, const allocator_type& alloc ) : base_type(std::move(other), alloc) {}
+    // Required to respect the rule of 5
+    concurrent_unordered_multimap& operator=( const concurrent_unordered_multimap& ) = default;
+    concurrent_unordered_multimap& operator=( concurrent_unordered_multimap&& ) = default;
+
+    concurrent_unordered_multimap& operator=( std::initializer_list<value_type> il ) {
+        base_type::operator= (il);
+        return *this;
+    }
+
+    template <typename P>
+    typename std::enable_if<std::is_constructible<value_type, P&&>::value,
+                            std::pair<iterator, bool>>::type insert( P&& value ) {
+        return this->emplace(std::forward<P>(value));
+    }
+
+    template<typename P>
+    typename std::enable_if<std::is_constructible<value_type, P&&>::value,
+                            iterator>::type insert( const_iterator hint, P&& value ) {
+        return this->emplace_hint(hint, std::forward<P&&>(value));
+    }
+
+    template <typename OtherHash, typename OtherKeyEqual>
+    void merge( concurrent_unordered_map<key_type, mapped_type, OtherHash, OtherKeyEqual, allocator_type>& source ) {
+        this->internal_merge(source);
+    }
+
+    template <typename OtherHash, typename OtherKeyEqual>
+    void merge( concurrent_unordered_map<key_type, mapped_type, OtherHash, OtherKeyEqual, allocator_type>&& source ) {
+        this->internal_merge(std::move(source));
+    }
+
+    template <typename OtherHash, typename OtherKeyEqual>
+    void merge( concurrent_unordered_multimap<key_type, mapped_type, OtherHash, OtherKeyEqual, allocator_type>& source ) {
+        this->internal_merge(source);
+    }
+
+    template <typename OtherHash, typename OtherKeyEqual>
+    void merge( concurrent_unordered_multimap<key_type, mapped_type, OtherHash, OtherKeyEqual, allocator_type>&& source ) {
+        this->internal_merge(std::move(source));
+    }
+}; // class concurrent_unordered_multimap
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 
-            template <typename It, typename Hash = std::hash<iterator_key_t<It>>,
-                      typename KeyEq = std::equal_to<iterator_key_t<It>>,
-                      typename Alloc = tbb::tbb_allocator<iterator_alloc_pair_t<It>>,
-                      typename = std::enable_if_t<is_input_iterator_v<It>>,
-                      typename = std::enable_if_t<is_allocator_v<Alloc>>,
-                      typename = std::enable_if_t<!is_allocator_v<Hash>>,
-                      typename = std::enable_if_t<!is_allocator_v<KeyEq>>,
-                      typename = std::enable_if_t<!std::is_integral_v<Hash>>>
-            concurrent_unordered_multimap(It, It, std::size_t = {}, Hash = Hash(), KeyEq = KeyEq(),
-                                          Alloc = Alloc())
-                    -> concurrent_unordered_multimap<iterator_key_t<It>, iterator_mapped_t<It>, Hash, KeyEq,
-                                                     Alloc>;
-
-            template <typename Key, typename T, typename Hash = std::hash<std::remove_const_t<Key>>,
-                      typename KeyEq = std::equal_to<std::remove_const_t<Key>>,
-                      typename Alloc = tbb::tbb_allocator<std::pair<const Key, T>>,
-                      typename = std::enable_if_t<is_allocator_v<Alloc>>,
-                      typename = std::enable_if_t<!is_allocator_v<Hash>>,
-                      typename = std::enable_if_t<!is_allocator_v<KeyEq>>,
-                      typename = std::enable_if_t<!std::is_integral_v<Hash>>>
-            concurrent_unordered_multimap(std::initializer_list<std::pair<Key, T>>, std::size_t = {},
-                                          Hash = Hash(), KeyEq = KeyEq(), Alloc = Alloc())
-                    -> concurrent_unordered_multimap<std::remove_const_t<Key>, T, Hash, KeyEq, Alloc>;
-
-            template <typename It, typename Alloc, typename = std::enable_if_t<is_input_iterator_v<It>>,
-                      typename = std::enable_if_t<is_allocator_v<Alloc>>>
-            concurrent_unordered_multimap(It, It, std::size_t, Alloc)
-                    -> concurrent_unordered_multimap<iterator_key_t<It>, iterator_mapped_t<It>,
-                                                     std::hash<iterator_key_t<It>>,
-                                                     std::equal_to<iterator_key_t<It>>, Alloc>;
-
-            template <typename It, typename Hash, typename Alloc,
-                      typename = std::enable_if_t<is_input_iterator_v<It>>,
-                      typename = std::enable_if_t<is_allocator_v<Alloc>>,
-                      typename = std::enable_if_t<!is_allocator_v<Hash>>,
-                      typename = std::enable_if_t<!std::is_integral_v<Hash>>>
-            concurrent_unordered_multimap(It, It, std::size_t, Hash, Alloc)
-                    -> concurrent_unordered_multimap<iterator_key_t<It>, iterator_mapped_t<It>, Hash,
-                                                     std::equal_to<iterator_key_t<It>>, Alloc>;
-
-            template <typename Key, typename T, typename Alloc,
-                      typename = std::enable_if_t<is_allocator_v<Alloc>>>
-            concurrent_unordered_multimap(std::initializer_list<std::pair<Key, T>>, std::size_t, Alloc)
-                    -> concurrent_unordered_multimap<std::remove_const_t<Key>, T,
-                                                     std::hash<std::remove_const_t<Key>>,
-                                                     std::equal_to<std::remove_const_t<Key>>, Alloc>;
-
-            template <typename Key, typename T, typename Alloc,
-                      typename = std::enable_if_t<is_allocator_v<Alloc>>>
-            concurrent_unordered_multimap(std::initializer_list<std::pair<Key, T>>, Alloc)
-                    -> concurrent_unordered_multimap<std::remove_const_t<Key>, T,
-                                                     std::hash<std::remove_const_t<Key>>,
-                                                     std::equal_to<std::remove_const_t<Key>>, Alloc>;
-
-            template <typename Key, typename T, typename Hash, typename Alloc,
-                      typename = std::enable_if_t<is_allocator_v<Alloc>>,
-                      typename = std::enable_if_t<!is_allocator_v<Hash>>,
-                      typename = std::enable_if_t<!std::is_integral_v<Hash>>>
-            concurrent_unordered_multimap(std::initializer_list<std::pair<Key, T>>, std::size_t, Hash, Alloc)
-                    -> concurrent_unordered_multimap<std::remove_const_t<Key>, T, Hash,
-                                                     std::equal_to<std::remove_const_t<Key>>, Alloc>;
-
-#endif// __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
-
-            template <typename Key, typename T, typename Hash, typename KeyEqual, typename Allocator>
-            void swap(concurrent_unordered_multimap<Key, T, Hash, KeyEqual, Allocator>& lhs,
-                      concurrent_unordered_multimap<Key, T, Hash, KeyEqual, Allocator>& rhs) {
-                lhs.swap(rhs);
-            }
-
-        }// namespace d1
-    }    // namespace detail
-
-    inline namespace v1 {
-
-        using detail::split;
-        using detail::d1::concurrent_unordered_map;
-        using detail::d1::concurrent_unordered_multimap;
-
-    }// namespace v1
-}// namespace tbb
-
-#endif// __TBB_concurrent_unordered_map_H
+template <typename It,
+          typename Hash = std::hash<iterator_key_t<It>>,
+          typename KeyEq = std::equal_to<iterator_key_t<It>>,
+          typename Alloc = tbb::tbb_allocator<iterator_alloc_pair_t<It>>,
+          typename = std::enable_if_t<is_input_iterator_v<It>>,
+          typename = std::enable_if_t<is_allocator_v<Alloc>>,
+          typename = std::enable_if_t<!is_allocator_v<Hash>>,
+          typename = std::enable_if_t<!is_allocator_v<KeyEq>>,
+          typename = std::enable_if_t<!std::is_integral_v<Hash>>>
+concurrent_unordered_multimap( It, It, std::size_t = {}, Hash = Hash(), KeyEq = KeyEq(), Alloc = Alloc() )
+-> concurrent_unordered_multimap<iterator_key_t<It>, iterator_mapped_t<It>, Hash, KeyEq, Alloc>;
+
+template <typename Key, typename T,
+          typename Hash = std::hash<std::remove_const_t<Key>>,
+          typename KeyEq = std::equal_to<std::remove_const_t<Key>>,
+          typename Alloc = tbb::tbb_allocator<std::pair<const Key, T>>,
+          typename = std::enable_if_t<is_allocator_v<Alloc>>,
+          typename = std::enable_if_t<!is_allocator_v<Hash>>,
+          typename = std::enable_if_t<!is_allocator_v<KeyEq>>,
+          typename = std::enable_if_t<!std::is_integral_v<Hash>>>
+concurrent_unordered_multimap( std::initializer_list<std::pair<Key, T>>, std::size_t = {},
+                               Hash = Hash(), KeyEq = KeyEq(), Alloc = Alloc() )
+-> concurrent_unordered_multimap<std::remove_const_t<Key>, T, Hash, KeyEq, Alloc>;
+
+template <typename It, typename Alloc,
+          typename = std::enable_if_t<is_input_iterator_v<It>>,
+          typename = std::enable_if_t<is_allocator_v<Alloc>>>
+concurrent_unordered_multimap( It, It, std::size_t, Alloc )
+-> concurrent_unordered_multimap<iterator_key_t<It>, iterator_mapped_t<It>,
+                                 std::hash<iterator_key_t<It>>,
+                                 std::equal_to<iterator_key_t<It>>, Alloc>;
+
+template <typename It, typename Hash, typename Alloc,
+          typename = std::enable_if_t<is_input_iterator_v<It>>,
+          typename = std::enable_if_t<is_allocator_v<Alloc>>,
+          typename = std::enable_if_t<!is_allocator_v<Hash>>,
+          typename = std::enable_if_t<!std::is_integral_v<Hash>>>
+concurrent_unordered_multimap( It, It, std::size_t, Hash, Alloc )
+-> concurrent_unordered_multimap<iterator_key_t<It>, iterator_mapped_t<It>, Hash,
+                                 std::equal_to<iterator_key_t<It>>, Alloc>;
+
+template <typename Key, typename T, typename Alloc,
+          typename = std::enable_if_t<is_allocator_v<Alloc>>>
+concurrent_unordered_multimap( std::initializer_list<std::pair<Key, T>>, std::size_t, Alloc )
+-> concurrent_unordered_multimap<std::remove_const_t<Key>, T, std::hash<std::remove_const_t<Key>>,
+                                 std::equal_to<std::remove_const_t<Key>>, Alloc>;
+
+template <typename Key, typename T, typename Alloc,
+          typename = std::enable_if_t<is_allocator_v<Alloc>>>
+concurrent_unordered_multimap( std::initializer_list<std::pair<Key, T>>, Alloc )
+-> concurrent_unordered_multimap<std::remove_const_t<Key>, T, std::hash<std::remove_const_t<Key>>,
+                                 std::equal_to<std::remove_const_t<Key>>, Alloc>;
+
+template <typename Key, typename T, typename Hash, typename Alloc,
+          typename = std::enable_if_t<is_allocator_v<Alloc>>,
+          typename = std::enable_if_t<!is_allocator_v<Hash>>,
+          typename = std::enable_if_t<!std::is_integral_v<Hash>>>
+concurrent_unordered_multimap( std::initializer_list<std::pair<Key, T>>, std::size_t, Hash, Alloc )
+-> concurrent_unordered_multimap<std::remove_const_t<Key>, T, Hash,
+                                 std::equal_to<std::remove_const_t<Key>>, Alloc>;
+
+#if __APPLE__ && __TBB_CLANG_VERSION == 100000
+// An explicit deduction guide is required for copy/move constructor with allocator for APPLE LLVM 10.0.0
+// due to an issue with generating an implicit deduction guide for these constructors under several strange surcumstances.
+// Currently the issue takes place because the last template parameter for Traits is boolean, it should not affect the deduction guides
+// The issue reproduces only on this version of the compiler
+template <typename Key, typename T, typename Hash, typename KeyEq, typename Alloc>
+concurrent_unordered_multimap( concurrent_unordered_multimap<Key, T, Hash, KeyEq, Alloc>, Alloc )
+-> concurrent_unordered_multimap<Key, T, Hash, KeyEq, Alloc>;
+#endif
+#endif // __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
+
+template <typename Key, typename T, typename Hash, typename KeyEqual, typename Allocator>
+void swap( concurrent_unordered_multimap<Key, T, Hash, KeyEqual, Allocator>& lhs,
+           concurrent_unordered_multimap<Key, T, Hash, KeyEqual, Allocator>& rhs ) {
+    lhs.swap(rhs);
+}
+
+} // namespace d2
+} // namespace detail
+
+inline namespace v1 {
+
+using detail::d2::concurrent_unordered_map;
+using detail::d2::concurrent_unordered_multimap;
+using detail::split;
+
+} // inline namespace v1
+} // namespace tbb
+
+#endif // __TBB_concurrent_unordered_map_H
diff --git a/external/tbb/include/oneapi/tbb/concurrent_unordered_set.h b/external/tbb/include/oneapi/tbb/concurrent_unordered_set.h
index 101ff16a..b7e4b4ca 100644
--- a/external/tbb/include/oneapi/tbb/concurrent_unordered_set.h
+++ b/external/tbb/include/oneapi/tbb/concurrent_unordered_set.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -17,297 +17,317 @@
 #ifndef __TBB_concurrent_unordered_set_H
 #define __TBB_concurrent_unordered_set_H
 
-#include "detail/_concurrent_unordered_base.h"
 #include "detail/_namespace_injection.h"
+#include "detail/_concurrent_unordered_base.h"
 #include "tbb_allocator.h"
 
 namespace tbb {
-    namespace detail {
-        namespace d1 {
-
-            template <typename Key, typename Hash, typename KeyEqual, typename Allocator,
-                      bool AllowMultimapping>
-            struct concurrent_unordered_set_traits {
-                using key_type = Key;
-                using value_type = key_type;
-                using allocator_type = Allocator;
-                using hash_compare_type = hash_compare<key_type, Hash, KeyEqual>;
-                static constexpr bool allow_multimapping = AllowMultimapping;
-
-                static constexpr const key_type& get_key(const value_type& value) { return value; }
-            };// class concurrent_unordered_set_traits
-
-            template <typename Key, typename Hash, typename KeyEqual, typename Allocator>
-            class concurrent_unordered_multiset;
-
-            template <typename Key, typename Hash = std::hash<Key>, typename KeyEqual = std::equal_to<Key>,
-                      typename Allocator = tbb::tbb_allocator<Key>>
-            class concurrent_unordered_set
-                : public concurrent_unordered_base<
-                          concurrent_unordered_set_traits<Key, Hash, KeyEqual, Allocator, false>> {
-                using traits_type = concurrent_unordered_set_traits<Key, Hash, KeyEqual, Allocator, false>;
-                using base_type = concurrent_unordered_base<traits_type>;
-
-            public:
-                using key_type = typename base_type::key_type;
-                using value_type = typename base_type::value_type;
-                using size_type = typename base_type::size_type;
-                using difference_type = typename base_type::difference_type;
-                using hasher = typename base_type::hasher;
-                using key_equal = typename base_type::key_equal;
-                using allocator_type = typename base_type::allocator_type;
-                using reference = typename base_type::reference;
-                using const_reference = typename base_type::const_reference;
-                using pointer = typename base_type::pointer;
-                using const_pointer = typename base_type::const_pointer;
-                using iterator = typename base_type::iterator;
-                using const_iterator = typename base_type::const_iterator;
-                using local_iterator = typename base_type::local_iterator;
-                using const_local_iterator = typename base_type::const_local_iterator;
-                using node_type = typename base_type::node_type;
-
-                // Include constructors of base_type;
-                using base_type::base_type;
-                using base_type::operator=;
-                // Required for implicit deduction guides
-                concurrent_unordered_set() = default;
-                concurrent_unordered_set(const concurrent_unordered_set&) = default;
-                concurrent_unordered_set(const concurrent_unordered_set& other, const allocator_type& alloc)
-                    : base_type(other, alloc) {}
-                concurrent_unordered_set(concurrent_unordered_set&&) = default;
-                concurrent_unordered_set(concurrent_unordered_set&& other, const allocator_type& alloc)
-                    : base_type(std::move(other), alloc) {}
-                // Required to respect the rule of 5
-                concurrent_unordered_set& operator=(const concurrent_unordered_set&) = default;
-                concurrent_unordered_set& operator=(concurrent_unordered_set&&) = default;
-
-                template <typename OtherHash, typename OtherKeyEqual>
-                void
-                merge(concurrent_unordered_set<key_type, OtherHash, OtherKeyEqual, allocator_type>& source) {
-                    this->internal_merge(source);
-                }
-
-                template <typename OtherHash, typename OtherKeyEqual>
-                void
-                merge(concurrent_unordered_set<key_type, OtherHash, OtherKeyEqual, allocator_type>&& source) {
-                    this->internal_merge(std::move(source));
-                }
-
-                template <typename OtherHash, typename OtherKeyEqual>
-                void merge(concurrent_unordered_multiset<key_type, OtherHash, OtherKeyEqual, allocator_type>&
-                                   source) {
-                    this->internal_merge(source);
-                }
-
-                template <typename OtherHash, typename OtherKeyEqual>
-                void merge(concurrent_unordered_multiset<key_type, OtherHash, OtherKeyEqual, allocator_type>&&
-                                   source) {
-                    this->internal_merge(std::move(source));
-                }
-            };// class concurrent_unordered_set
+namespace detail {
+namespace d2 {
+
+template <typename Key, typename Hash, typename KeyEqual, typename Allocator, bool AllowMultimapping>
+struct concurrent_unordered_set_traits {
+    using key_type = Key;
+    using value_type = key_type;
+    using allocator_type = Allocator;
+    using hash_compare_type = d1::hash_compare<key_type, Hash, KeyEqual>;
+    static constexpr bool allow_multimapping = AllowMultimapping;
+
+    static constexpr const key_type& get_key( const value_type& value ) {
+        return value;
+    }
+}; // class concurrent_unordered_set_traits
+
+template <typename Key, typename Hash, typename KeyEqual, typename Allocator>
+class concurrent_unordered_multiset;
+
+template <typename Key, typename Hash = std::hash<Key>, typename KeyEqual = std::equal_to<Key>,
+          typename Allocator = tbb::tbb_allocator<Key>>
+class concurrent_unordered_set
+    : public concurrent_unordered_base<concurrent_unordered_set_traits<Key, Hash, KeyEqual, Allocator, false>>
+{
+    using traits_type = concurrent_unordered_set_traits<Key, Hash, KeyEqual, Allocator, false>;
+    using base_type = concurrent_unordered_base<traits_type>;
+public:
+    using key_type = typename base_type::key_type;
+    using value_type = typename base_type::value_type;
+    using size_type = typename base_type::size_type;
+    using difference_type = typename base_type::difference_type;
+    using hasher = typename base_type::hasher;
+    using key_equal = typename base_type::key_equal;
+    using allocator_type = typename base_type::allocator_type;
+    using reference = typename base_type::reference;
+    using const_reference = typename base_type::const_reference;
+    using pointer = typename base_type::pointer;
+    using const_pointer = typename base_type::const_pointer;
+    using iterator = typename base_type::iterator;
+    using const_iterator = typename base_type::const_iterator;
+    using local_iterator = typename base_type::local_iterator;
+    using const_local_iterator = typename base_type::const_local_iterator;
+    using node_type = typename base_type::node_type;
+
+    // Include constructors of base_type;
+    using base_type::base_type;
+
+    // Required for implicit deduction guides
+    concurrent_unordered_set() = default;
+    concurrent_unordered_set( const concurrent_unordered_set& ) = default;
+    concurrent_unordered_set( const concurrent_unordered_set& other, const allocator_type& alloc ) : base_type(other, alloc) {}
+    concurrent_unordered_set( concurrent_unordered_set&& ) = default;
+    concurrent_unordered_set( concurrent_unordered_set&& other, const allocator_type& alloc ) : base_type(std::move(other), alloc) {}
+    // Required to respect the rule of 5
+    concurrent_unordered_set& operator=( const concurrent_unordered_set& ) = default;
+    concurrent_unordered_set& operator=( concurrent_unordered_set&& ) = default;
+
+    concurrent_unordered_set& operator=( std::initializer_list<value_type> il ) {
+        base_type::operator= (il);
+        return *this;
+    }
+
+    template <typename OtherHash, typename OtherKeyEqual>
+    void merge( concurrent_unordered_set<key_type, OtherHash, OtherKeyEqual, allocator_type>& source ) {
+        this->internal_merge(source);
+    }
+
+    template <typename OtherHash, typename OtherKeyEqual>
+    void merge( concurrent_unordered_set<key_type, OtherHash, OtherKeyEqual, allocator_type>&& source ) {
+        this->internal_merge(std::move(source));
+    }
+
+    template <typename OtherHash, typename OtherKeyEqual>
+    void merge( concurrent_unordered_multiset<key_type, OtherHash, OtherKeyEqual, allocator_type>& source ) {
+        this->internal_merge(source);
+    }
+
+    template <typename OtherHash, typename OtherKeyEqual>
+    void merge( concurrent_unordered_multiset<key_type, OtherHash, OtherKeyEqual, allocator_type>&& source ) {
+        this->internal_merge(std::move(source));
+    }
+}; // class concurrent_unordered_set
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 
-            template <typename It, typename Hash = std::hash<iterator_value_t<It>>,
-                      typename KeyEq = std::equal_to<iterator_value_t<It>>,
-                      typename Alloc = tbb::tbb_allocator<iterator_value_t<It>>,
-                      typename = std::enable_if_t<is_input_iterator_v<It>>,
-                      typename = std::enable_if_t<is_allocator_v<Alloc>>,
-                      typename = std::enable_if_t<!is_allocator_v<Hash>>,
-                      typename = std::enable_if_t<!is_allocator_v<KeyEq>>,
-                      typename = std::enable_if_t<!std::is_integral_v<Hash>>>
-            concurrent_unordered_set(It, It, std::size_t = {}, Hash = Hash(), KeyEq = KeyEq(),
-                                     Alloc = Alloc())
-                    -> concurrent_unordered_set<iterator_value_t<It>, Hash, KeyEq, Alloc>;
-
-            template <typename T, typename Hash = std::hash<T>, typename KeyEq = std::equal_to<T>,
-                      typename Alloc = tbb::tbb_allocator<T>,
-                      typename = std::enable_if_t<is_allocator_v<Alloc>>,
-                      typename = std::enable_if_t<!is_allocator_v<Hash>>,
-                      typename = std::enable_if_t<!is_allocator_v<KeyEq>>,
-                      typename = std::enable_if_t<!std::is_integral_v<Hash>>>
-            concurrent_unordered_set(std::initializer_list<T>, std::size_t = {}, Hash = Hash(),
-                                     KeyEq = KeyEq(), Alloc = Alloc())
-                    -> concurrent_unordered_set<T, Hash, KeyEq, Alloc>;
-
-            template <typename It, typename Alloc, typename = std::enable_if_t<is_input_iterator_v<It>>,
-                      typename = std::enable_if_t<is_allocator_v<Alloc>>>
-            concurrent_unordered_set(It, It, std::size_t, Alloc)
-                    -> concurrent_unordered_set<iterator_value_t<It>, std::hash<iterator_value_t<It>>,
-                                                std::equal_to<iterator_value_t<It>>, Alloc>;
-
-            template <typename It, typename Hash, typename Alloc,
-                      typename = std::enable_if_t<is_input_iterator_v<It>>,
-                      typename = std::enable_if_t<is_allocator_v<Alloc>>,
-                      typename = std::enable_if_t<!is_allocator_v<Hash>>,
-                      typename = std::enable_if_t<!std::is_integral_v<Hash>>>
-            concurrent_unordered_set(It, It, std::size_t, Hash, Alloc)
-                    -> concurrent_unordered_set<iterator_value_t<It>, Hash,
-                                                std::equal_to<iterator_value_t<It>>, Alloc>;
-
-            template <typename T, typename Alloc, typename = std::enable_if_t<is_allocator_v<Alloc>>>
-            concurrent_unordered_set(std::initializer_list<T>, std::size_t, Alloc)
-                    -> concurrent_unordered_set<T, std::hash<T>, std::equal_to<T>, Alloc>;
-
-            template <typename T, typename Alloc, typename = std::enable_if_t<is_allocator_v<Alloc>>>
-            concurrent_unordered_set(std::initializer_list<T>, Alloc)
-                    -> concurrent_unordered_set<T, std::hash<T>, std::equal_to<T>, Alloc>;
-
-            template <typename T, typename Hash, typename Alloc,
-                      typename = std::enable_if_t<is_allocator_v<Alloc>>,
-                      typename = std::enable_if_t<!is_allocator_v<Hash>>,
-                      typename = std::enable_if_t<!std::is_integral_v<Hash>>>
-            concurrent_unordered_set(std::initializer_list<T>, std::size_t, Hash, Alloc)
-                    -> concurrent_unordered_set<T, Hash, std::equal_to<T>, Alloc>;
-
-#endif// __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
-
-            template <typename Key, typename Hash, typename KeyEqual, typename Allocator>
-            void swap(concurrent_unordered_set<Key, Hash, KeyEqual, Allocator>& lhs,
-                      concurrent_unordered_set<Key, Hash, KeyEqual, Allocator>& rhs) {
-                lhs.swap(rhs);
-            }
-
-            template <typename Key, typename Hash = std::hash<Key>, typename KeyEqual = std::equal_to<Key>,
-                      typename Allocator = tbb::tbb_allocator<Key>>
-            class concurrent_unordered_multiset
-                : public concurrent_unordered_base<
-                          concurrent_unordered_set_traits<Key, Hash, KeyEqual, Allocator, true>> {
-                using traits_type = concurrent_unordered_set_traits<Key, Hash, KeyEqual, Allocator, true>;
-                using base_type = concurrent_unordered_base<traits_type>;
-
-            public:
-                using key_type = typename base_type::key_type;
-                using value_type = typename base_type::value_type;
-                using size_type = typename base_type::size_type;
-                using difference_type = typename base_type::difference_type;
-                using hasher = typename base_type::hasher;
-                using key_equal = typename base_type::key_equal;
-                using allocator_type = typename base_type::allocator_type;
-                using reference = typename base_type::reference;
-                using const_reference = typename base_type::const_reference;
-                using pointer = typename base_type::pointer;
-                using const_pointer = typename base_type::const_pointer;
-                using iterator = typename base_type::iterator;
-                using const_iterator = typename base_type::const_iterator;
-                using local_iterator = typename base_type::local_iterator;
-                using const_local_iterator = typename base_type::const_local_iterator;
-                using node_type = typename base_type::node_type;
-
-                // Include constructors of base_type;
-                using base_type::base_type;
-                using base_type::operator=;
-
-                // Required for implicit deduction guides
-                concurrent_unordered_multiset() = default;
-                concurrent_unordered_multiset(const concurrent_unordered_multiset&) = default;
-                concurrent_unordered_multiset(const concurrent_unordered_multiset& other,
-                                              const allocator_type& alloc)
-                    : base_type(other, alloc) {}
-                concurrent_unordered_multiset(concurrent_unordered_multiset&&) = default;
-                concurrent_unordered_multiset(concurrent_unordered_multiset&& other,
-                                              const allocator_type& alloc)
-                    : base_type(std::move(other), alloc) {}
-                // Required to respect the rule of 5
-                concurrent_unordered_multiset& operator=(const concurrent_unordered_multiset&) = default;
-                concurrent_unordered_multiset& operator=(concurrent_unordered_multiset&&) = default;
-
-                template <typename OtherHash, typename OtherKeyEqual>
-                void
-                merge(concurrent_unordered_set<key_type, OtherHash, OtherKeyEqual, allocator_type>& source) {
-                    this->internal_merge(source);
-                }
-
-                template <typename OtherHash, typename OtherKeyEqual>
-                void
-                merge(concurrent_unordered_set<key_type, OtherHash, OtherKeyEqual, allocator_type>&& source) {
-                    this->internal_merge(std::move(source));
-                }
-
-                template <typename OtherHash, typename OtherKeyEqual>
-                void merge(concurrent_unordered_multiset<key_type, OtherHash, OtherKeyEqual, allocator_type>&
-                                   source) {
-                    this->internal_merge(source);
-                }
-
-                template <typename OtherHash, typename OtherKeyEqual>
-                void merge(concurrent_unordered_multiset<key_type, OtherHash, OtherKeyEqual, allocator_type>&&
-                                   source) {
-                    this->internal_merge(std::move(source));
-                }
-            };// class concurrent_unordered_multiset
+template <typename It,
+          typename Hash = std::hash<iterator_value_t<It>>,
+          typename KeyEq = std::equal_to<iterator_value_t<It>>,
+          typename Alloc = tbb::tbb_allocator<iterator_value_t<It>>,
+          typename = std::enable_if_t<is_input_iterator_v<It>>,
+          typename = std::enable_if_t<is_allocator_v<Alloc>>,
+          typename = std::enable_if_t<!is_allocator_v<Hash>>,
+          typename = std::enable_if_t<!is_allocator_v<KeyEq>>,
+          typename = std::enable_if_t<!std::is_integral_v<Hash>>>
+concurrent_unordered_set( It, It, std::size_t = {}, Hash = Hash(), KeyEq = KeyEq(), Alloc = Alloc() )
+-> concurrent_unordered_set<iterator_value_t<It>, Hash, KeyEq, Alloc>;
+
+template <typename T,
+          typename Hash = std::hash<T>,
+          typename KeyEq = std::equal_to<T>,
+          typename Alloc = tbb::tbb_allocator<T>,
+          typename = std::enable_if_t<is_allocator_v<Alloc>>,
+          typename = std::enable_if_t<!is_allocator_v<Hash>>,
+          typename = std::enable_if_t<!is_allocator_v<KeyEq>>,
+          typename = std::enable_if_t<!std::is_integral_v<Hash>>>
+concurrent_unordered_set( std::initializer_list<T>, std::size_t = {},
+                          Hash = Hash(), KeyEq = KeyEq(), Alloc = Alloc() )
+-> concurrent_unordered_set<T, Hash, KeyEq, Alloc>;
+
+template <typename It, typename Alloc,
+          typename = std::enable_if_t<is_input_iterator_v<It>>,
+          typename = std::enable_if_t<is_allocator_v<Alloc>>>
+concurrent_unordered_set( It, It, std::size_t, Alloc )
+-> concurrent_unordered_set<iterator_value_t<It>, std::hash<iterator_value_t<It>>,
+                            std::equal_to<iterator_value_t<It>>, Alloc>;
+
+template <typename It, typename Hash, typename Alloc,
+          typename = std::enable_if_t<is_input_iterator_v<It>>,
+          typename = std::enable_if_t<is_allocator_v<Alloc>>,
+          typename = std::enable_if_t<!is_allocator_v<Hash>>,
+          typename = std::enable_if_t<!std::is_integral_v<Hash>>>
+concurrent_unordered_set( It, It, std::size_t, Hash, Alloc )
+-> concurrent_unordered_set<iterator_value_t<It>, Hash, std::equal_to<iterator_value_t<It>>, Alloc>;
+
+template <typename T, typename Alloc,
+          typename = std::enable_if_t<is_allocator_v<Alloc>>>
+concurrent_unordered_set( std::initializer_list<T>, std::size_t, Alloc )
+-> concurrent_unordered_set<T, std::hash<T>, std::equal_to<T>, Alloc>;
+
+template <typename T, typename Alloc,
+          typename = std::enable_if_t<is_allocator_v<Alloc>>>
+concurrent_unordered_set( std::initializer_list<T>, Alloc )
+-> concurrent_unordered_set<T, std::hash<T>, std::equal_to<T>, Alloc>;
+
+template <typename T, typename Hash, typename Alloc,
+          typename = std::enable_if_t<is_allocator_v<Alloc>>,
+          typename = std::enable_if_t<!is_allocator_v<Hash>>,
+          typename = std::enable_if_t<!std::is_integral_v<Hash>>>
+concurrent_unordered_set( std::initializer_list<T>, std::size_t, Hash, Alloc )
+-> concurrent_unordered_set<T, Hash, std::equal_to<T>, Alloc>;
+
+#if __APPLE__ && __TBB_CLANG_VERSION == 100000
+// An explicit deduction guide is required for copy/move constructor with allocator for APPLE LLVM 10.0.0
+// due to an issue with generating an implicit deduction guide for these constructors under several strange surcumstances.
+// Currently the issue takes place because the last template parameter for Traits is boolean, it should not affect the deduction guides
+// The issue reproduces only on this version of the compiler
+template <typename T, typename Hash, typename KeyEq, typename Alloc>
+concurrent_unordered_set( concurrent_unordered_set<T, Hash, KeyEq, Alloc>, Alloc )
+-> concurrent_unordered_set<T, Hash, KeyEq, Alloc>;
+#endif
+#endif // __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
+
+template <typename Key, typename Hash, typename KeyEqual, typename Allocator>
+void swap( concurrent_unordered_set<Key, Hash, KeyEqual, Allocator>& lhs,
+           concurrent_unordered_set<Key, Hash, KeyEqual, Allocator>& rhs ) {
+    lhs.swap(rhs);
+}
+
+template <typename Key, typename Hash = std::hash<Key>, typename KeyEqual = std::equal_to<Key>,
+          typename Allocator = tbb::tbb_allocator<Key>>
+class concurrent_unordered_multiset
+    : public concurrent_unordered_base<concurrent_unordered_set_traits<Key, Hash, KeyEqual, Allocator, true>>
+{
+    using traits_type = concurrent_unordered_set_traits<Key, Hash, KeyEqual, Allocator, true>;
+    using base_type = concurrent_unordered_base<traits_type>;
+public:
+    using key_type = typename base_type::key_type;
+    using value_type = typename base_type::value_type;
+    using size_type = typename base_type::size_type;
+    using difference_type = typename base_type::difference_type;
+    using hasher = typename base_type::hasher;
+    using key_equal = typename base_type::key_equal;
+    using allocator_type = typename base_type::allocator_type;
+    using reference = typename base_type::reference;
+    using const_reference = typename base_type::const_reference;
+    using pointer = typename base_type::pointer;
+    using const_pointer = typename base_type::const_pointer;
+    using iterator = typename base_type::iterator;
+    using const_iterator = typename base_type::const_iterator;
+    using local_iterator = typename base_type::local_iterator;
+    using const_local_iterator = typename base_type::const_local_iterator;
+    using node_type = typename base_type::node_type;
+
+    // Include constructors of base_type;
+    using base_type::base_type;
+
+    // Required for implicit deduction guides
+    concurrent_unordered_multiset() = default;
+    concurrent_unordered_multiset( const concurrent_unordered_multiset& ) = default;
+    concurrent_unordered_multiset( const concurrent_unordered_multiset& other, const allocator_type& alloc ) : base_type(other, alloc) {}
+    concurrent_unordered_multiset( concurrent_unordered_multiset&& ) = default;
+    concurrent_unordered_multiset( concurrent_unordered_multiset&& other, const allocator_type& alloc ) : base_type(std::move(other), alloc) {}
+    // Required to respect the rule of 5
+    concurrent_unordered_multiset& operator=( const concurrent_unordered_multiset& ) = default;
+    concurrent_unordered_multiset& operator=( concurrent_unordered_multiset&& ) = default;
+
+    concurrent_unordered_multiset& operator=( std::initializer_list<value_type> il ) {
+        base_type::operator= (il);
+        return *this;
+    }
+
+    template <typename OtherHash, typename OtherKeyEqual>
+    void merge( concurrent_unordered_set<key_type, OtherHash, OtherKeyEqual, allocator_type>& source ) {
+        this->internal_merge(source);
+    }
+
+    template <typename OtherHash, typename OtherKeyEqual>
+    void merge( concurrent_unordered_set<key_type, OtherHash, OtherKeyEqual, allocator_type>&& source ) {
+        this->internal_merge(std::move(source));
+    }
+
+    template <typename OtherHash, typename OtherKeyEqual>
+    void merge( concurrent_unordered_multiset<key_type, OtherHash, OtherKeyEqual, allocator_type>& source ) {
+        this->internal_merge(source);
+    }
+
+    template <typename OtherHash, typename OtherKeyEqual>
+    void merge( concurrent_unordered_multiset<key_type, OtherHash, OtherKeyEqual, allocator_type>&& source ) {
+        this->internal_merge(std::move(source));
+    }
+}; // class concurrent_unordered_multiset
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
-            template <typename It, typename Hash = std::hash<iterator_value_t<It>>,
-                      typename KeyEq = std::equal_to<iterator_value_t<It>>,
-                      typename Alloc = tbb::tbb_allocator<iterator_value_t<It>>,
-                      typename = std::enable_if_t<is_input_iterator_v<It>>,
-                      typename = std::enable_if_t<is_allocator_v<Alloc>>,
-                      typename = std::enable_if_t<!is_allocator_v<Hash>>,
-                      typename = std::enable_if_t<!is_allocator_v<KeyEq>>,
-                      typename = std::enable_if_t<!std::is_integral_v<Hash>>>
-            concurrent_unordered_multiset(It, It, std::size_t = {}, Hash = Hash(), KeyEq = KeyEq(),
-                                          Alloc = Alloc())
-                    -> concurrent_unordered_multiset<iterator_value_t<It>, Hash, KeyEq, Alloc>;
-
-            template <typename T, typename Hash = std::hash<T>, typename KeyEq = std::equal_to<T>,
-                      typename Alloc = tbb::tbb_allocator<T>,
-                      typename = std::enable_if_t<is_allocator_v<Alloc>>,
-                      typename = std::enable_if_t<!is_allocator_v<Hash>>,
-                      typename = std::enable_if_t<!is_allocator_v<KeyEq>>,
-                      typename = std::enable_if_t<!std::is_integral_v<Hash>>>
-            concurrent_unordered_multiset(std::initializer_list<T>, std::size_t = {}, Hash = Hash(),
-                                          KeyEq = KeyEq(), Alloc = Alloc())
-                    -> concurrent_unordered_multiset<T, Hash, KeyEq, Alloc>;
-
-            template <typename It, typename Alloc, typename = std::enable_if_t<is_input_iterator_v<It>>,
-                      typename = std::enable_if_t<is_allocator_v<Alloc>>>
-            concurrent_unordered_multiset(It, It, std::size_t, Alloc)
-                    -> concurrent_unordered_multiset<iterator_value_t<It>, std::hash<iterator_value_t<It>>,
-                                                     std::equal_to<iterator_value_t<It>>, Alloc>;
-
-            template <typename It, typename Hash, typename Alloc,
-                      typename = std::enable_if_t<is_input_iterator_v<It>>,
-                      typename = std::enable_if_t<is_allocator_v<Alloc>>,
-                      typename = std::enable_if_t<!is_allocator_v<Hash>>,
-                      typename = std::enable_if_t<!std::is_integral_v<Hash>>>
-            concurrent_unordered_multiset(It, It, std::size_t, Hash, Alloc)
-                    -> concurrent_unordered_multiset<iterator_value_t<It>, Hash,
-                                                     std::equal_to<iterator_value_t<It>>, Alloc>;
-
-            template <typename T, typename Alloc, typename = std::enable_if_t<is_allocator_v<Alloc>>>
-            concurrent_unordered_multiset(std::initializer_list<T>, std::size_t, Alloc)
-                    -> concurrent_unordered_multiset<T, std::hash<T>, std::equal_to<T>, Alloc>;
-
-            template <typename T, typename Alloc, typename = std::enable_if_t<is_allocator_v<Alloc>>>
-            concurrent_unordered_multiset(std::initializer_list<T>, Alloc)
-                    -> concurrent_unordered_multiset<T, std::hash<T>, std::equal_to<T>, Alloc>;
-
-            template <typename T, typename Hash, typename Alloc,
-                      typename = std::enable_if_t<is_allocator_v<Alloc>>,
-                      typename = std::enable_if_t<!is_allocator_v<Hash>>,
-                      typename = std::enable_if_t<!std::is_integral_v<Hash>>>
-            concurrent_unordered_multiset(std::initializer_list<T>, std::size_t, Hash, Alloc)
-                    -> concurrent_unordered_multiset<T, Hash, std::equal_to<T>, Alloc>;
-
-#endif// __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
-
-            template <typename Key, typename Hash, typename KeyEqual, typename Allocator>
-            void swap(concurrent_unordered_multiset<Key, Hash, KeyEqual, Allocator>& lhs,
-                      concurrent_unordered_multiset<Key, Hash, KeyEqual, Allocator>& rhs) {
-                lhs.swap(rhs);
-            }
-
-        }// namespace d1
-    }    // namespace detail
-
-    inline namespace v1 {
-
-        using detail::split;
-        using detail::d1::concurrent_unordered_multiset;
-        using detail::d1::concurrent_unordered_set;
-
-    }// namespace v1
-}// namespace tbb
-
-#endif// __TBB_concurrent_unordered_set_H
+template <typename It,
+          typename Hash = std::hash<iterator_value_t<It>>,
+          typename KeyEq = std::equal_to<iterator_value_t<It>>,
+          typename Alloc = tbb::tbb_allocator<iterator_value_t<It>>,
+          typename = std::enable_if_t<is_input_iterator_v<It>>,
+          typename = std::enable_if_t<is_allocator_v<Alloc>>,
+          typename = std::enable_if_t<!is_allocator_v<Hash>>,
+          typename = std::enable_if_t<!is_allocator_v<KeyEq>>,
+          typename = std::enable_if_t<!std::is_integral_v<Hash>>>
+concurrent_unordered_multiset( It, It, std::size_t = {}, Hash = Hash(), KeyEq = KeyEq(), Alloc = Alloc() )
+-> concurrent_unordered_multiset<iterator_value_t<It>, Hash, KeyEq, Alloc>;
+
+template <typename T,
+          typename Hash = std::hash<T>,
+          typename KeyEq = std::equal_to<T>,
+          typename Alloc = tbb::tbb_allocator<T>,
+          typename = std::enable_if_t<is_allocator_v<Alloc>>,
+          typename = std::enable_if_t<!is_allocator_v<Hash>>,
+          typename = std::enable_if_t<!is_allocator_v<KeyEq>>,
+          typename = std::enable_if_t<!std::is_integral_v<Hash>>>
+concurrent_unordered_multiset( std::initializer_list<T>, std::size_t = {},
+                          Hash = Hash(), KeyEq = KeyEq(), Alloc = Alloc() )
+-> concurrent_unordered_multiset<T, Hash, KeyEq, Alloc>;
+
+template <typename It, typename Alloc,
+          typename = std::enable_if_t<is_input_iterator_v<It>>,
+          typename = std::enable_if_t<is_allocator_v<Alloc>>>
+concurrent_unordered_multiset( It, It, std::size_t, Alloc )
+-> concurrent_unordered_multiset<iterator_value_t<It>, std::hash<iterator_value_t<It>>,
+                            std::equal_to<iterator_value_t<It>>, Alloc>;
+
+template <typename It, typename Hash, typename Alloc,
+          typename = std::enable_if_t<is_input_iterator_v<It>>,
+          typename = std::enable_if_t<is_allocator_v<Alloc>>,
+          typename = std::enable_if_t<!is_allocator_v<Hash>>,
+          typename = std::enable_if_t<!std::is_integral_v<Hash>>>
+concurrent_unordered_multiset( It, It, std::size_t, Hash, Alloc )
+-> concurrent_unordered_multiset<iterator_value_t<It>, Hash, std::equal_to<iterator_value_t<It>>, Alloc>;
+
+template <typename T, typename Alloc,
+          typename = std::enable_if_t<is_allocator_v<Alloc>>>
+concurrent_unordered_multiset( std::initializer_list<T>, std::size_t, Alloc )
+-> concurrent_unordered_multiset<T, std::hash<T>, std::equal_to<T>, Alloc>;
+
+template <typename T, typename Alloc,
+          typename = std::enable_if_t<is_allocator_v<Alloc>>>
+concurrent_unordered_multiset( std::initializer_list<T>, Alloc )
+-> concurrent_unordered_multiset<T, std::hash<T>, std::equal_to<T>, Alloc>;
+
+template <typename T, typename Hash, typename Alloc,
+          typename = std::enable_if_t<is_allocator_v<Alloc>>,
+          typename = std::enable_if_t<!is_allocator_v<Hash>>,
+          typename = std::enable_if_t<!std::is_integral_v<Hash>>>
+concurrent_unordered_multiset( std::initializer_list<T>, std::size_t, Hash, Alloc )
+-> concurrent_unordered_multiset<T, Hash, std::equal_to<T>, Alloc>;
+
+#if __APPLE__ && __TBB_CLANG_VERSION == 100000
+// An explicit deduction guide is required for copy/move constructor with allocator for APPLE LLVM 10.0.0
+// due to an issue with generating an implicit deduction guide for these constructors under several strange surcumstances.
+// Currently the issue takes place because the last template parameter for Traits is boolean, it should not affect the deduction guides
+// The issue reproduces only on this version of the compiler
+template <typename T, typename Hash, typename KeyEq, typename Alloc>
+concurrent_unordered_multiset( concurrent_unordered_multiset<T, Hash, KeyEq, Alloc>, Alloc )
+-> concurrent_unordered_multiset<T, Hash, KeyEq, Alloc>;
+#endif
+#endif // __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
+
+template <typename Key, typename Hash, typename KeyEqual, typename Allocator>
+void swap( concurrent_unordered_multiset<Key, Hash, KeyEqual, Allocator>& lhs,
+           concurrent_unordered_multiset<Key, Hash, KeyEqual, Allocator>& rhs ) {
+    lhs.swap(rhs);
+}
+
+} // namespace d2
+} // namespace detail
+
+inline namespace v1 {
+
+using detail::d2::concurrent_unordered_set;
+using detail::d2::concurrent_unordered_multiset;
+using detail::split;
+
+} // inline namespace v1
+} // namespace tbb
+
+#endif // __TBB_concurrent_unordered_set_H
diff --git a/external/tbb/include/oneapi/tbb/concurrent_vector.h b/external/tbb/include/oneapi/tbb/concurrent_vector.h
index ee8d85ee..27cdc473 100644
--- a/external/tbb/include/oneapi/tbb/concurrent_vector.h
+++ b/external/tbb/include/oneapi/tbb/concurrent_vector.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -17,1084 +17,1113 @@
 #ifndef __TBB_concurrent_vector_H
 #define __TBB_concurrent_vector_H
 
-#include "blocked_range.h"
-#include "cache_aligned_allocator.h"
-#include "detail/_allocator_traits.h"
-#include "detail/_assert.h"
-#include "detail/_containers_helpers.h"
 #include "detail/_namespace_injection.h"
-#include "detail/_segment_table.h"
 #include "detail/_utils.h"
+#include "detail/_assert.h"
+#include "detail/_allocator_traits.h"
+#include "detail/_segment_table.h"
+#include "detail/_containers_helpers.h"
+#include "blocked_range.h"
+#include "cache_aligned_allocator.h"
 
 #include <algorithm>
-#include <utility>// std::move_if_noexcept
+#include <utility> // std::move_if_noexcept
+#include <algorithm>
 #if __TBB_CPP20_COMPARISONS_PRESENT
 #include <compare>
 #endif
 
 namespace tbb {
-    namespace detail {
-        namespace d1 {
-
-            template <typename Vector, typename Value>
-            class vector_iterator {
-                using vector_type = Vector;
-
-            public:
-                using value_type = Value;
-                using size_type = typename vector_type::size_type;
-                using difference_type = typename vector_type::difference_type;
-                using pointer = value_type*;
-                using reference = value_type&;
-                using iterator_category = std::random_access_iterator_tag;
-
-                template <typename Vec, typename Val>
-                friend vector_iterator<Vec, Val>
-                operator+(typename vector_iterator<Vec, Val>::difference_type,
-                          const vector_iterator<Vec, Val>&);
-
-                template <typename Vec, typename Val1, typename Val2>
-                friend typename vector_iterator<Vec, Val1>::difference_type
-                operator-(const vector_iterator<Vec, Val1>&, const vector_iterator<Vec, Val2>&);
-
-                template <typename Vec, typename Val1, typename Val2>
-                friend bool operator==(const vector_iterator<Vec, Val1>&, const vector_iterator<Vec, Val2>&);
-
-                template <typename Vec, typename Val1, typename Val2>
-                friend bool operator<(const vector_iterator<Vec, Val1>&, const vector_iterator<Vec, Val2>&);
-
-                template <typename Vec, typename Val>
-                friend class vector_iterator;
-
-                template <typename T, typename Allocator>
-                friend class concurrent_vector;
-
-            private:
-                vector_iterator(const vector_type& vector, size_type index, value_type* item = nullptr)
-                    : my_vector(const_cast<vector_type*>(&vector)), my_index(index), my_item(item) {}
-
-            public:
-                vector_iterator() : my_vector(nullptr), my_index(~size_type(0)), my_item(nullptr) {}
-
-                vector_iterator(const vector_iterator<vector_type, typename vector_type::value_type>& other)
-                    : my_vector(other.my_vector), my_index(other.my_index), my_item(other.my_item) {}
-
-                vector_iterator&
-                operator=(const vector_iterator<vector_type, typename vector_type::value_type>& other) {
-                    my_vector = other.my_vector;
-                    my_index = other.my_index;
-                    my_item = other.my_item;
-                    return *this;
-                }
-
-                vector_iterator operator+(difference_type offset) const {
-                    return vector_iterator(*my_vector, my_index + offset);
-                }
-
-                vector_iterator& operator+=(difference_type offset) {
-                    my_index += offset;
-                    my_item = nullptr;
-                    return *this;
-                }
-
-                vector_iterator operator-(difference_type offset) const {
-                    return vector_iterator(*my_vector, my_index - offset);
-                }
-
-                vector_iterator& operator-=(difference_type offset) {
-                    my_index -= offset;
-                    my_item = nullptr;
-                    return *this;
-                }
-
-                reference operator*() const {
-                    value_type* item = my_item;
-                    if (item == nullptr) {
-                        item = &my_vector->internal_subscript(my_index);
-                    } else {
-                        __TBB_ASSERT(item == &my_vector->internal_subscript(my_index), "corrupt cache");
-                    }
-                    return *item;
-                }
-
-                pointer operator->() const { return &(operator*()); }
-
-                reference operator[](difference_type k) const {
-                    return my_vector->internal_subscript(my_index + k);
-                }
+namespace detail {
+namespace d1 {
+
+template <typename Vector, typename Value>
+class vector_iterator {
+    using vector_type = Vector;
+
+public:
+    using value_type = Value;
+    using size_type = typename vector_type::size_type;
+    using difference_type = typename vector_type::difference_type;
+    using pointer = value_type*;
+    using reference = value_type&;
+    using iterator_category = std::random_access_iterator_tag;
+
+    template <typename Vec, typename Val>
+    friend vector_iterator<Vec, Val> operator+( typename vector_iterator<Vec, Val>::difference_type, const vector_iterator<Vec, Val>& );
+
+    template <typename Vec, typename Val1, typename Val2>
+    friend typename vector_iterator<Vec, Val1>::difference_type operator-( const vector_iterator<Vec, Val1>&, const vector_iterator<Vec, Val2>& );
+
+    template <typename Vec, typename Val1, typename Val2>
+    friend bool operator==( const vector_iterator<Vec, Val1>&, const vector_iterator<Vec, Val2>& );
+
+    template <typename Vec, typename Val1, typename Val2>
+    friend bool operator<( const vector_iterator<Vec, Val1>&, const vector_iterator<Vec, Val2>& );
+
+    template <typename Vec, typename Val>
+    friend class vector_iterator;
+
+    template <typename T, typename Allocator>
+    friend class concurrent_vector;
+
+private:
+    vector_iterator( const vector_type& vector, size_type index, value_type* item = nullptr )
+        : my_vector(const_cast<vector_type*>(&vector)), my_index(index), my_item(item)
+    {}
+
+public:
+    vector_iterator() : my_vector(nullptr), my_index(~size_type(0)), my_item(nullptr)
+    {}
+
+    vector_iterator( const vector_iterator<vector_type, typename vector_type::value_type>& other )
+        : my_vector(other.my_vector), my_index(other.my_index), my_item(other.my_item)
+    {}
+
+    vector_iterator& operator=( const vector_iterator<vector_type, typename vector_type::value_type>& other ) {
+        my_vector = other.my_vector;
+        my_index = other.my_index;
+        my_item = other.my_item;
+        return *this;
+    }
+
+    vector_iterator operator+( difference_type offset ) const {
+        return vector_iterator(*my_vector, my_index + offset);
+    }
+
+    vector_iterator& operator+=( difference_type offset ) {
+        my_index += offset;
+        my_item = nullptr;
+        return *this;
+    }
+
+    vector_iterator operator-( difference_type offset ) const {
+        return vector_iterator(*my_vector, my_index - offset);
+    }
+
+    vector_iterator& operator-=( difference_type offset ) {
+        my_index -= offset;
+        my_item = nullptr;
+        return *this;
+    }
+
+    reference operator*() const {
+        value_type *item = my_item;
+        if (item == nullptr) {
+            item = &my_vector->internal_subscript(my_index);
+        } else {
+            __TBB_ASSERT(item == &my_vector->internal_subscript(my_index), "corrupt cache");
+        }
+        return *item;
+    }
+
+    pointer operator->() const { return &(operator*()); }
+
+    reference operator[]( difference_type k ) const {
+        return my_vector->internal_subscript(my_index + k);
+    }
+
+    vector_iterator& operator++() {
+        ++my_index;
+        if (my_item != nullptr) {
+            if (vector_type::is_first_element_in_segment(my_index)) {
+                // If the iterator crosses a segment boundary, the pointer become invalid
+                // as possibly next segment is in another memory location
+                my_item = nullptr;
+            } else {
+                ++my_item;
+            }
+        }
+        return *this;
+    }
+
+    vector_iterator operator++(int) {
+        vector_iterator result = *this;
+        ++(*this);
+        return result;
+    }
+
+    vector_iterator& operator--() {
+        __TBB_ASSERT(my_index > 0, "operator--() applied to iterator already at beginning of concurrent_vector");
+        --my_index;
+        if (my_item != nullptr) {
+            if (vector_type::is_first_element_in_segment(my_index)) {
+                // If the iterator crosses a segment boundary, the pointer become invalid
+                // as possibly next segment is in another memory location
+                my_item = nullptr;
+            } else {
+                --my_item;
+            }
+        }
+        return *this;
+    }
+
+    vector_iterator operator--(int) {
+        vector_iterator result = *this;
+        --(*this);
+        return result;
+    }
+
+private:
+    // concurrent_vector over which we are iterating.
+    vector_type* my_vector;
+
+    // Index into the vector
+    size_type my_index;
+
+    // Caches my_vector *it;
+    // If my_item == nullptr cached value is not available use internal_subscript(my_index)
+    mutable value_type* my_item;
+}; // class vector_iterator
+
+template <typename Vector, typename T>
+vector_iterator<Vector, T> operator+( typename vector_iterator<Vector, T>::difference_type offset,
+                                      const vector_iterator<Vector, T>& v )
+{
+    return vector_iterator<Vector, T>(*v.my_vector, v.my_index + offset);
+}
+
+template <typename Vector, typename T, typename U>
+typename vector_iterator<Vector, T>::difference_type operator-( const vector_iterator<Vector, T>& i,
+                                                                const vector_iterator<Vector, U>& j )
+{
+    using difference_type = typename vector_iterator<Vector, T>::difference_type;
+    return static_cast<difference_type>(i.my_index) - static_cast<difference_type>(j.my_index);
+}
+
+template <typename Vector, typename T, typename U>
+bool operator==( const vector_iterator<Vector, T>& i, const vector_iterator<Vector, U>& j ) {
+    return i.my_vector == j.my_vector && i.my_index == j.my_index;
+}
+
+template <typename Vector, typename T, typename U>
+bool operator!=( const vector_iterator<Vector, T>& i, const vector_iterator<Vector, U>& j ) {
+    return !(i == j);
+}
+
+template <typename Vector, typename T, typename U>
+bool operator<( const vector_iterator<Vector, T>& i, const vector_iterator<Vector, U>& j ) {
+    return i.my_index < j.my_index;
+}
+
+template <typename Vector, typename T, typename U>
+bool operator>( const vector_iterator<Vector, T>& i, const vector_iterator<Vector, U>& j ) {
+    return j < i;
+}
+
+template <typename Vector, typename T, typename U>
+bool operator>=( const vector_iterator<Vector, T>& i, const vector_iterator<Vector, U>& j ) {
+    return !(i < j);
+}
+
+template <typename Vector, typename T, typename U>
+bool operator<=( const vector_iterator<Vector, T>& i, const vector_iterator<Vector, U>& j ) {
+    return !(j < i);
+}
+
+static constexpr std::size_t embedded_table_num_segments = 3;
+
+template <typename T, typename Allocator = tbb::cache_aligned_allocator<T>>
+class concurrent_vector
+    : private segment_table<T, Allocator, concurrent_vector<T, Allocator>, embedded_table_num_segments>
+{
+    using self_type = concurrent_vector<T, Allocator>;
+    using base_type = segment_table<T, Allocator, self_type, embedded_table_num_segments>;
+
+    friend class segment_table<T, Allocator, self_type, embedded_table_num_segments>;
+
+    template <typename Iterator>
+    class generic_range_type : public tbb::blocked_range<Iterator> {
+        using base_type = tbb::blocked_range<Iterator>;
+    public:
+        using value_type = T;
+        using reference = T&;
+        using const_reference = const T&;
+        using iterator = Iterator;
+        using difference_type = std::ptrdiff_t;
+
+        using base_type::base_type;
+
+        template<typename U>
+        generic_range_type( const generic_range_type<U>& r) : blocked_range<Iterator>(r.begin(), r.end(), r.grainsize()) {}
+        generic_range_type( generic_range_type& r, split ) : blocked_range<Iterator>(r, split()) {}
+    }; // class generic_range_type
+
+    static_assert(std::is_same<T, typename Allocator::value_type>::value,
+                  "value_type of the container must be the same as its allocator's");
+    using allocator_traits_type = tbb::detail::allocator_traits<Allocator>;
+    // Segment table for concurrent_vector can be extended
+    static constexpr bool allow_table_extending = true;
+    static constexpr bool is_noexcept_assignment = allocator_traits_type::propagate_on_container_move_assignment::value ||
+                                                   allocator_traits_type::is_always_equal::value;
+    static constexpr bool is_noexcept_swap = allocator_traits_type::propagate_on_container_swap::value ||
+                                             allocator_traits_type::is_always_equal::value;
+
+public:
+    using value_type = T;
+    using allocator_type = Allocator;
+    using size_type = std::size_t;
+    using difference_type = std::ptrdiff_t;
+    using reference = value_type&;
+    using const_reference = const value_type&;
+
+    using pointer = typename allocator_traits_type::pointer;
+    using const_pointer = typename allocator_traits_type::const_pointer;
+
+    using iterator = vector_iterator<concurrent_vector, value_type>;
+    using const_iterator = vector_iterator<concurrent_vector, const value_type>;
+    using reverse_iterator = std::reverse_iterator<iterator>;
+    using const_reverse_iterator = std::reverse_iterator<const_iterator>;
+
+    using range_type = generic_range_type<iterator>;
+    using const_range_type = generic_range_type<const_iterator>;
+
+    concurrent_vector() : concurrent_vector(allocator_type()) {}
+
+    explicit concurrent_vector( const allocator_type& alloc ) noexcept
+        : base_type(alloc)
+    {}
+
+    explicit concurrent_vector( size_type count, const value_type& value,
+                                const allocator_type& alloc = allocator_type() )
+        : concurrent_vector(alloc)
+    {
+        try_call( [&] {
+            grow_by(count, value);
+        } ).on_exception( [&] {
+            base_type::clear();
+        });
+    }
+
+    explicit concurrent_vector( size_type count, const allocator_type& alloc = allocator_type() )
+        : concurrent_vector(alloc)
+    {
+        try_call( [&] {
+            grow_by(count);
+        } ).on_exception( [&] {
+            base_type::clear();
+        });
+    }
+
+    template <typename InputIterator>
+    concurrent_vector( InputIterator first, InputIterator last, const allocator_type& alloc = allocator_type() )
+        : concurrent_vector(alloc)
+    {
+        try_call( [&] {
+            grow_by(first, last);
+        } ).on_exception( [&] {
+            base_type::clear();
+        });
+    }
+
+    concurrent_vector( const concurrent_vector& other )
+        : base_type(segment_table_allocator_traits::select_on_container_copy_construction(other.get_allocator()))
+    {
+        try_call( [&] {
+            grow_by(other.begin(), other.end());
+        } ).on_exception( [&] {
+            base_type::clear();
+        });
+    }
+
+    concurrent_vector( const concurrent_vector& other, const allocator_type& alloc )
+        : base_type(other, alloc) {}
+
+    concurrent_vector(concurrent_vector&& other) noexcept
+        : base_type(std::move(other))
+    {}
+
+    concurrent_vector( concurrent_vector&& other, const allocator_type& alloc )
+        : base_type(std::move(other), alloc)
+    {}
+
+    concurrent_vector( std::initializer_list<value_type> init,
+                       const allocator_type& alloc = allocator_type() )
+        : concurrent_vector(init.begin(), init.end(), alloc)
+    {}
+
+    ~concurrent_vector() {}
+
+    // Assignment
+    concurrent_vector& operator=( const concurrent_vector& other ) {
+        base_type::operator=(other);
+        return *this;
+    }
+
+    concurrent_vector& operator=( concurrent_vector&& other ) noexcept(is_noexcept_assignment) {
+        base_type::operator=(std::move(other));
+        return *this;
+    }
+
+    concurrent_vector& operator=( std::initializer_list<value_type> init ) {
+        assign(init);
+        return *this;
+    }
+
+    void assign( size_type count, const value_type& value ) {
+        destroy_elements();
+        grow_by(count, value);
+    }
+
+    template <typename InputIterator>
+    typename std::enable_if<is_input_iterator<InputIterator>::value, void>::type
+    assign( InputIterator first, InputIterator last ) {
+        destroy_elements();
+        grow_by(first, last);
+    }
+
+    void assign( std::initializer_list<value_type> init ) {
+        destroy_elements();
+        assign(init.begin(), init.end());
+    }
+
+    // Concurrent growth
+    iterator grow_by( size_type delta ) {
+        return internal_grow_by_delta(delta);
+    }
+
+    iterator grow_by( size_type delta, const value_type& value ) {
+        return internal_grow_by_delta(delta, value);
+    }
+
+    template <typename ForwardIterator>
+    typename std::enable_if<is_input_iterator<ForwardIterator>::value, iterator>::type
+    grow_by( ForwardIterator first, ForwardIterator last ) {
+        auto delta = std::distance(first, last);
+        return internal_grow_by_delta(delta, first, last);
+    }
+
+    iterator grow_by( std::initializer_list<value_type> init ) {
+        return grow_by(init.begin(), init.end());
+    }
+
+    iterator grow_to_at_least( size_type n ) {
+        return internal_grow_to_at_least(n);
+    }
+    iterator grow_to_at_least( size_type n, const value_type& value ) {
+        return internal_grow_to_at_least(n, value);
+    }
+
+    iterator push_back( const value_type& item ) {
+        return internal_emplace_back(item);
+    }
+
+    iterator push_back( value_type&& item ) {
+        return internal_emplace_back(std::move(item));
+    }
+
+    template <typename... Args>
+    iterator emplace_back( Args&&... args ) {
+        return internal_emplace_back(std::forward<Args>(args)...);
+    }
+
+    // Items access
+    reference operator[]( size_type index ) {
+        return internal_subscript(index);
+    }
+    const_reference operator[]( size_type index ) const {
+        return internal_subscript(index);
+    }
+
+    reference at( size_type index ) {
+        return internal_subscript_with_exceptions(index);
+    }
+    const_reference at( size_type index ) const {
+        return internal_subscript_with_exceptions(index);
+    }
+
+    // Get range for iterating with parallel algorithms
+    range_type range( size_t grainsize = 1 ) {
+        return range_type(begin(), end(), grainsize);
+    }
+
+    // Get const range for iterating with parallel algorithms
+    const_range_type range( size_t grainsize = 1 ) const {
+        return const_range_type(begin(), end(), grainsize);
+    }
+
+    reference front() {
+        return internal_subscript(0);
+    }
+
+    const_reference front() const {
+        return internal_subscript(0);
+    }
+
+    reference back() {
+        return internal_subscript(size() - 1);
+    }
+
+    const_reference back() const {
+        return internal_subscript(size() - 1);
+    }
+
+    // Iterators
+    iterator begin() { return iterator(*this, 0); }
+    const_iterator begin() const { return const_iterator(*this, 0); }
+    const_iterator cbegin() const { return const_iterator(*this, 0); }
+
+    iterator end() { return iterator(*this, size()); }
+    const_iterator end() const { return const_iterator(*this, size()); }
+    const_iterator cend() const { return const_iterator(*this, size()); }
+
+    reverse_iterator rbegin() { return reverse_iterator(end()); }
+    const_reverse_iterator rbegin() const { return const_reverse_iterator(end()); }
+    const_reverse_iterator crbegin() const { return const_reverse_iterator(cend()); }
+
+    reverse_iterator rend() { return reverse_iterator(begin()); }
+    const_reverse_iterator rend() const { return const_reverse_iterator(begin()); }
+    const_reverse_iterator crend() const { return const_reverse_iterator(cbegin()); }
+
+    allocator_type get_allocator() const {
+        return base_type::get_allocator();
+    }
+
+    // Storage
+    bool empty() const noexcept {
+        return 0 == size();
+    }
+
+    size_type size() const noexcept {
+        return std::min(this->my_size.load(std::memory_order_acquire), capacity());
+    }
+
+    size_type max_size() const noexcept {
+        return allocator_traits_type::max_size(base_type::get_allocator());
+    }
+
+    size_type capacity() const noexcept {
+        return base_type::capacity();
+    }
+
+    void reserve( size_type n ) {
+        if (n == 0) return;
+
+        if (n > max_size()) {
+            tbb::detail::throw_exception(exception_id::reservation_length_error);
+        }
+
+        this->assign_first_block_if_necessary(this->segment_index_of(n - 1) + 1);
+        base_type::reserve(n);
+    }
+
+    void resize( size_type n ) {
+        internal_resize(n);
+    }
+
+    void resize( size_type n, const value_type& val ) {
+        internal_resize(n, val);
+    }
+
+    void shrink_to_fit() {
+        internal_compact();
+    }
+
+    void swap(concurrent_vector& other) noexcept(is_noexcept_swap) {
+        base_type::swap(other);
+    }
+
+    void clear() {
+        destroy_elements();
+    }
+
+private:
+    using segment_type = typename base_type::segment_type;
+    using segment_table_type = typename base_type::segment_table_type;
+    using segment_table_allocator_traits = typename base_type::segment_table_allocator_traits;
+    using segment_index_type = typename base_type::segment_index_type;
+
+    using segment_element_type = typename base_type::value_type;
+    using segment_element_allocator_type = typename allocator_traits_type::template rebind_alloc<segment_element_type>;
+    using segment_element_allocator_traits = tbb::detail::allocator_traits<segment_element_allocator_type>;
+
+    segment_table_type allocate_long_table( const typename base_type::atomic_segment* embedded_table, size_type start_index ) {
+        __TBB_ASSERT(start_index <= this->embedded_table_size, "Start index out of embedded table");
+
+        // If other threads are trying to set pointers in the short segment, wait for them to finish their
+        // assignments before we copy the short segment to the long segment. Note: grow_to_at_least depends on it
+        for (segment_index_type i = 0; this->segment_base(i) < start_index; ++i) {
+            spin_wait_while_eq(embedded_table[i], segment_type(nullptr));
+        }
+
+        // It is possible that the table was extend by a thread allocating first_block, need to check this.
+        if (this->get_table() != embedded_table) {
+            return nullptr;
+        }
+
+        // Allocate long segment table and fill with null pointers
+        segment_table_type new_segment_table = segment_table_allocator_traits::allocate(base_type::get_allocator(), this->pointers_per_long_table);
+        // Copy segment pointers from the embedded table
+        for (size_type segment_index = 0; segment_index < this->pointers_per_embedded_table; ++segment_index) {
+            segment_table_allocator_traits::construct(base_type::get_allocator(), &new_segment_table[segment_index],
+                embedded_table[segment_index].load(std::memory_order_relaxed));
+        }
+        for (size_type segment_index = this->pointers_per_embedded_table; segment_index < this->pointers_per_long_table; ++segment_index) {
+            segment_table_allocator_traits::construct(base_type::get_allocator(), &new_segment_table[segment_index], nullptr);
+        }
+
+        return new_segment_table;
+    }
+
+    // create_segment function is required by the segment_table base class
+    segment_type create_segment( segment_table_type table, segment_index_type seg_index, size_type index ) {
+        size_type first_block = this->my_first_block.load(std::memory_order_relaxed);
+        // First block allocation
+        if (seg_index < first_block) {
+            // If 0 segment is already allocated, then it remains to wait until the segments are filled to requested
+            if (table[0].load(std::memory_order_acquire) != nullptr) {
+                spin_wait_while_eq(table[seg_index], segment_type(nullptr));
+                return nullptr;
+            }
 
-                vector_iterator& operator++() {
-                    ++my_index;
-                    if (my_item != nullptr) {
-                        if (vector_type::is_first_element_in_segment(my_index)) {
-                            // If the iterator crosses a segment boundary, the pointer become invalid
-                            // as possibly next segment is in another memory location
-                            my_item = nullptr;
-                        } else {
-                            ++my_item;
-                        }
+            segment_element_allocator_type segment_allocator(base_type::get_allocator());
+            segment_type new_segment = nullptr;
+            size_type first_block_size = this->segment_size(first_block);
+            try_call( [&] {
+                new_segment = segment_element_allocator_traits::allocate(segment_allocator, first_block_size);
+            } ).on_exception( [&] {
+                segment_type disabled_segment = nullptr;
+                if (table[0].compare_exchange_strong(disabled_segment, this->segment_allocation_failure_tag)) {
+                    size_type end_segment = table == this->my_embedded_table ? this->pointers_per_embedded_table : first_block;
+                    for (size_type i = 1; i < end_segment; ++i) {
+                        table[i].store(this->segment_allocation_failure_tag, std::memory_order_release);
                     }
-                    return *this;
                 }
+            });
 
-                vector_iterator operator++(int) {
-                    vector_iterator result = *this;
-                    ++(*this);
-                    return result;
+            segment_type disabled_segment = nullptr;
+            if (table[0].compare_exchange_strong(disabled_segment, new_segment)) {
+                this->extend_table_if_necessary(table, /*start_index*/0, /*end_index*/first_block_size);
+                for (size_type i = 1; i < first_block; ++i) {
+                    table[i].store(new_segment, std::memory_order_release);
                 }
 
-                vector_iterator& operator--() {
-                    __TBB_ASSERT(
-                            my_index > 0,
-                            "operator--() applied to iterator already at beginning of concurrent_vector");
-                    --my_index;
-                    if (my_item != nullptr) {
-                        if (vector_type::is_first_element_in_segment(my_index)) {
-                            // If the iterator crosses a segment boundary, the pointer become invalid
-                            // as possibly next segment is in another memory location
-                            my_item = nullptr;
-                        } else {
-                            --my_item;
-                        }
-                    }
-                    return *this;
+                // Other threads can wait on a snapshot of an embedded table, need to fill it.
+                for (size_type i = 1; i < first_block && i < this->pointers_per_embedded_table; ++i) {
+                    this->my_embedded_table[i].store(new_segment, std::memory_order_release);
                 }
-
-                vector_iterator operator--(int) {
-                    vector_iterator result = *this;
-                    --(*this);
-                    return result;
-                }
-
-            private:
-                // concurrent_vector over which we are iterating.
-                vector_type* my_vector;
-
-                // Index into the vector
-                size_type my_index;
-
-                // Caches my_vector *it;
-                // If my_item == nullptr cached value is not available use internal_subscript(my_index)
-                mutable value_type* my_item;
-            };// class vector_iterator
-
-            template <typename Vector, typename T>
-            vector_iterator<Vector, T> operator+(typename vector_iterator<Vector, T>::difference_type offset,
-                                                 const vector_iterator<Vector, T>& v) {
-                return vector_iterator<Vector, T>(*v.my_vector, v.my_index + offset);
+            } else if (new_segment != this->segment_allocation_failure_tag) {
+                // Deallocate the memory
+                segment_element_allocator_traits::deallocate(segment_allocator, new_segment, first_block_size);
+                // 0 segment is already allocated, then it remains to wait until the segments are filled to requested
+                spin_wait_while_eq(table[seg_index], segment_type(nullptr));
             }
-
-            template <typename Vector, typename T, typename U>
-            typename vector_iterator<Vector, T>::difference_type
-            operator-(const vector_iterator<Vector, T>& i, const vector_iterator<Vector, U>& j) {
-                using difference_type = typename vector_iterator<Vector, T>::difference_type;
-                return static_cast<difference_type>(i.my_index) - static_cast<difference_type>(j.my_index);
+        } else {
+            size_type offset = this->segment_base(seg_index);
+            if (index == offset) {
+                __TBB_ASSERT(table[seg_index].load(std::memory_order_relaxed) == nullptr, "Only this thread can enable this segment");
+                segment_element_allocator_type segment_allocator(base_type::get_allocator());
+                segment_type new_segment = this->segment_allocation_failure_tag;
+                try_call( [&] {
+                    new_segment = segment_element_allocator_traits::allocate(segment_allocator,this->segment_size(seg_index));
+                    // Shift base address to simplify access by index
+                    new_segment -= this->segment_base(seg_index);
+                } ).on_completion( [&] {
+                    table[seg_index].store(new_segment, std::memory_order_release);
+                });
+            } else {
+                spin_wait_while_eq(table[seg_index], segment_type(nullptr));
             }
-
-            template <typename Vector, typename T, typename U>
-            bool operator==(const vector_iterator<Vector, T>& i, const vector_iterator<Vector, U>& j) {
-                return i.my_vector == j.my_vector && i.my_index == j.my_index;
-            }
-
-            template <typename Vector, typename T, typename U>
-            bool operator!=(const vector_iterator<Vector, T>& i, const vector_iterator<Vector, U>& j) {
-                return !(i == j);
+        }
+        return nullptr;
+    }
+
+    // Returns the number of elements in the segment to be destroy
+    size_type number_of_elements_in_segment( segment_index_type seg_index ) {
+        size_type curr_vector_size = this->my_size.load(std::memory_order_relaxed);
+        size_type curr_segment_base = this->segment_base(seg_index);
+
+        if (seg_index == 0) {
+            return std::min(curr_vector_size, this->segment_size(seg_index));
+        } else {
+            // Perhaps the segment is allocated, but there are no elements in it.
+            if (curr_vector_size < curr_segment_base) {
+                return 0;
             }
-
-            template <typename Vector, typename T, typename U>
-            bool operator<(const vector_iterator<Vector, T>& i, const vector_iterator<Vector, U>& j) {
-                return i.my_index < j.my_index;
+            return curr_segment_base * 2 > curr_vector_size ? curr_vector_size - curr_segment_base : curr_segment_base;
+        }
+    }
+
+    segment_type nullify_segment( segment_table_type table, size_type segment_index ) {
+        segment_type target_segment = table[segment_index].load(std::memory_order_relaxed);
+        if (segment_index >= this->my_first_block) {
+            table[segment_index].store(nullptr, std::memory_order_relaxed);
+        } else {
+            if (segment_index == 0) {
+                for (size_type i = 0; i < this->my_first_block; ++i) {
+                    table[i].store(nullptr, std::memory_order_relaxed);
+                }
             }
-
-            template <typename Vector, typename T, typename U>
-            bool operator>(const vector_iterator<Vector, T>& i, const vector_iterator<Vector, U>& j) {
-                return j < i;
+        }
+
+        return target_segment;
+    }
+
+    void deallocate_segment( segment_type address, segment_index_type seg_index ) {
+        segment_element_allocator_type segment_allocator(base_type::get_allocator());
+        size_type first_block = this->my_first_block.load(std::memory_order_relaxed);
+        if (seg_index >= first_block) {
+            segment_element_allocator_traits::deallocate(segment_allocator, address, this->segment_size(seg_index));
+        }
+        else if (seg_index == 0) {
+            size_type elements_to_deallocate = first_block > 0 ? this->segment_size(first_block) : this->segment_size(0);
+            segment_element_allocator_traits::deallocate(segment_allocator, address, elements_to_deallocate);
+        }
+    }
+
+    // destroy_segment function is required by the segment_table base class
+    void destroy_segment( segment_type address, segment_index_type seg_index ) {
+        size_type elements_to_destroy = number_of_elements_in_segment(seg_index);
+        segment_element_allocator_type segment_allocator(base_type::get_allocator());
+
+        for (size_type i = 0; i < elements_to_destroy; ++i) {
+            segment_element_allocator_traits::destroy(segment_allocator, address + i);
+        }
+
+        deallocate_segment(address, seg_index);
+    }
+
+    // copy_segment function is required by the segment_table base class
+    void copy_segment( segment_index_type seg_index, segment_type from, segment_type to ) {
+        size_type i = 0;
+        try_call( [&] {
+            for (; i != number_of_elements_in_segment(seg_index); ++i) {
+                segment_table_allocator_traits::construct(base_type::get_allocator(), to + i, from[i]);
             }
-
-            template <typename Vector, typename T, typename U>
-            bool operator>=(const vector_iterator<Vector, T>& i, const vector_iterator<Vector, U>& j) {
-                return !(i < j);
+        } ).on_exception( [&] {
+            // Zero-initialize items left not constructed after the exception
+            zero_unconstructed_elements(this->get_segment(seg_index) + i, this->segment_size(seg_index) - i);
+
+            segment_index_type last_segment = this->segment_index_of(this->my_size.load(std::memory_order_relaxed));
+            auto table = this->get_table();
+            for (segment_index_type j = seg_index + 1; j != last_segment; ++j) {
+                auto curr_segment = table[j].load(std::memory_order_relaxed);
+                if (curr_segment) {
+                    zero_unconstructed_elements(curr_segment + this->segment_base(j), this->segment_size(j));
+                }
             }
-
-            template <typename Vector, typename T, typename U>
-            bool operator<=(const vector_iterator<Vector, T>& i, const vector_iterator<Vector, U>& j) {
-                return !(j < i);
+            this->my_size.store(this->segment_size(seg_index) + i, std::memory_order_relaxed);
+        });
+    }
+
+    // move_segment function is required by the segment_table base class
+    void move_segment( segment_index_type seg_index, segment_type from, segment_type to ) {
+        size_type i = 0;
+        try_call( [&] {
+            for (; i != number_of_elements_in_segment(seg_index); ++i) {
+                segment_table_allocator_traits::construct(base_type::get_allocator(), to + i, std::move(from[i]));
             }
-
-            static constexpr std::size_t embedded_table_num_segments = 3;
-
-            template <typename T, typename Allocator = tbb::cache_aligned_allocator<T>>
-            class concurrent_vector : private segment_table<T, Allocator, concurrent_vector<T, Allocator>,
-                                                            embedded_table_num_segments> {
-                using self_type = concurrent_vector<T, Allocator>;
-                using base_type = segment_table<T, Allocator, self_type, embedded_table_num_segments>;
-
-                friend class segment_table<T, Allocator, self_type, embedded_table_num_segments>;
-
-                template <typename Iterator>
-                class generic_range_type : public tbb::blocked_range<Iterator> {
-                    using base_type = tbb::blocked_range<Iterator>;
-
-                public:
-                    using value_type = T;
-                    using reference = T&;
-                    using const_reference = const T&;
-                    using iterator = Iterator;
-                    using difference_type = std::ptrdiff_t;
-
-                    using base_type::base_type;
-
-                    template <typename U>
-                    generic_range_type(const generic_range_type<U>& r)
-                        : blocked_range<Iterator>(r.begin(), r.end(), r.grainsize()) {}
-                    generic_range_type(generic_range_type& r, split) : blocked_range<Iterator>(r, split()) {}
-                };// class generic_range_type
-
-                static_assert(std::is_same<T, typename Allocator::value_type>::value,
-                              "value_type of the container must be the same as its allocator's");
-                using allocator_traits_type = tbb::detail::allocator_traits<Allocator>;
-                // Segment table for concurrent_vector can be extended
-                static constexpr bool allow_table_extending = true;
-                static constexpr bool is_noexcept_assignment
-                        = allocator_traits_type::propagate_on_container_move_assignment::value
-                          || allocator_traits_type::is_always_equal::value;
-                static constexpr bool is_noexcept_swap
-                        = allocator_traits_type::propagate_on_container_swap::value
-                          || allocator_traits_type::is_always_equal::value;
-
-            public:
-                using value_type = T;
-                using allocator_type = Allocator;
-                using size_type = std::size_t;
-                using difference_type = std::ptrdiff_t;
-                using reference = value_type&;
-                using const_reference = const value_type&;
-
-                using pointer = typename allocator_traits_type::pointer;
-                using const_pointer = typename allocator_traits_type::const_pointer;
-
-                using iterator = vector_iterator<concurrent_vector, value_type>;
-                using const_iterator = vector_iterator<concurrent_vector, const value_type>;
-                using reverse_iterator = std::reverse_iterator<iterator>;
-                using const_reverse_iterator = std::reverse_iterator<const_iterator>;
-
-                using range_type = generic_range_type<iterator>;
-                using const_range_type = generic_range_type<const_iterator>;
-
-                concurrent_vector() : concurrent_vector(allocator_type()) {}
-
-                explicit concurrent_vector(const allocator_type& alloc) noexcept : base_type(alloc) {}
-
-                explicit concurrent_vector(size_type count, const value_type& value,
-                                           const allocator_type& alloc = allocator_type())
-                    : concurrent_vector(alloc) {
-                    try_call([&] { grow_by(count, value); }).on_exception([&] { base_type::clear(); });
-                }
-
-                explicit concurrent_vector(size_type count, const allocator_type& alloc = allocator_type())
-                    : concurrent_vector(alloc) {
-                    try_call([&] { grow_by(count); }).on_exception([&] { base_type::clear(); });
-                }
-
-                template <typename InputIterator>
-                concurrent_vector(InputIterator first, InputIterator last,
-                                  const allocator_type& alloc = allocator_type())
-                    : concurrent_vector(alloc) {
-                    try_call([&] { grow_by(first, last); }).on_exception([&] { base_type::clear(); });
-                }
-
-                concurrent_vector(const concurrent_vector& other)
-                    : base_type(segment_table_allocator_traits::select_on_container_copy_construction(
-                            other.get_allocator())) {
-                    try_call([&] { grow_by(other.begin(), other.end()); }).on_exception([&] {
-                        base_type::clear();
-                    });
+        } ).on_exception( [&] {
+            // Zero-initialize items left not constructed after the exception
+            zero_unconstructed_elements(this->get_segment(seg_index) + i, this->segment_size(seg_index) - i);
+
+            segment_index_type last_segment = this->segment_index_of(this->my_size.load(std::memory_order_relaxed));
+            auto table = this->get_table();
+            for (segment_index_type j = seg_index + 1; j != last_segment; ++j) {
+                auto curr_segment = table[j].load(std::memory_order_relaxed);
+                if (curr_segment) {
+                    zero_unconstructed_elements(curr_segment + this->segment_base(j), this->segment_size(j));
                 }
-
-                concurrent_vector(const concurrent_vector& other, const allocator_type& alloc)
-                    : base_type(other, alloc) {}
-
-                concurrent_vector(concurrent_vector&& other) noexcept : base_type(std::move(other)) {}
-
-                concurrent_vector(concurrent_vector&& other, const allocator_type& alloc)
-                    : base_type(std::move(other), alloc) {}
-
-                concurrent_vector(std::initializer_list<value_type> init,
-                                  const allocator_type& alloc = allocator_type())
-                    : concurrent_vector(init.begin(), init.end(), alloc) {}
-
-                ~concurrent_vector() {}
-
-                // Assignment
-                concurrent_vector& operator=(const concurrent_vector& other) {
-                    base_type::operator=(other);
-                    return *this;
-                }
-
-                concurrent_vector& operator=(concurrent_vector&& other) noexcept(is_noexcept_assignment) {
-                    base_type::operator=(std::move(other));
-                    return *this;
-                }
-
-                concurrent_vector& operator=(std::initializer_list<value_type> init) {
-                    assign(init);
-                    return *this;
-                }
-
-                void assign(size_type count, const value_type& value) {
-                    destroy_elements();
-                    grow_by(count, value);
-                }
-
-                template <typename InputIterator>
-                typename std::enable_if<is_input_iterator<InputIterator>::value, void>::type
-                assign(InputIterator first, InputIterator last) {
-                    destroy_elements();
-                    grow_by(first, last);
-                }
-
-                void assign(std::initializer_list<value_type> init) {
-                    destroy_elements();
-                    assign(init.begin(), init.end());
-                }
-
-                // Concurrent growth
-                iterator grow_by(size_type delta) { return internal_grow_by_delta(delta); }
-
-                iterator grow_by(size_type delta, const value_type& value) {
-                    return internal_grow_by_delta(delta, value);
-                }
-
-                template <typename ForwardIterator>
-                typename std::enable_if<is_input_iterator<ForwardIterator>::value, iterator>::type
-                grow_by(ForwardIterator first, ForwardIterator last) {
-                    auto delta = std::distance(first, last);
-                    return internal_grow_by_delta(delta, first, last);
-                }
-
-                iterator grow_by(std::initializer_list<value_type> init) {
-                    return grow_by(init.begin(), init.end());
-                }
-
-                iterator grow_to_at_least(size_type n) { return internal_grow_to_at_least(n); }
-                iterator grow_to_at_least(size_type n, const value_type& value) {
-                    return internal_grow_to_at_least(n, value);
-                }
-
-                iterator push_back(const value_type& item) { return internal_emplace_back(item); }
-
-                iterator push_back(value_type&& item) { return internal_emplace_back(std::move(item)); }
-
-                template <typename... Args>
-                iterator emplace_back(Args&&... args) {
-                    return internal_emplace_back(std::forward<Args>(args)...);
-                }
-
-                // Items access
-                reference operator[](size_type index) { return internal_subscript(index); }
-                const_reference operator[](size_type index) const { return internal_subscript(index); }
-
-                reference at(size_type index) { return internal_subscript_with_exceptions(index); }
-                const_reference at(size_type index) const {
-                    return internal_subscript_with_exceptions(index);
-                }
-
-                // Get range for iterating with parallel algorithms
-                range_type range(size_t grainsize = 1) { return range_type(begin(), end(), grainsize); }
-
-                // Get const range for iterating with parallel algorithms
-                const_range_type range(size_t grainsize = 1) const {
-                    return const_range_type(begin(), end(), grainsize);
-                }
-
-                reference front() { return internal_subscript(0); }
-
-                const_reference front() const { return internal_subscript(0); }
-
-                reference back() { return internal_subscript(size() - 1); }
-
-                const_reference back() const { return internal_subscript(size() - 1); }
-
-                // Iterators
-                iterator begin() { return iterator(*this, 0); }
-                const_iterator begin() const { return const_iterator(*this, 0); }
-                const_iterator cbegin() const { return const_iterator(*this, 0); }
-
-                iterator end() { return iterator(*this, size()); }
-                const_iterator end() const { return const_iterator(*this, size()); }
-                const_iterator cend() const { return const_iterator(*this, size()); }
-
-                reverse_iterator rbegin() { return reverse_iterator(end()); }
-                const_reverse_iterator rbegin() const { return const_reverse_iterator(end()); }
-                const_reverse_iterator crbegin() const { return const_reverse_iterator(cend()); }
-
-                reverse_iterator rend() { return reverse_iterator(begin()); }
-                const_reverse_iterator rend() const { return const_reverse_iterator(begin()); }
-                const_reverse_iterator crend() const { return const_reverse_iterator(cbegin()); }
-
-                allocator_type get_allocator() const { return base_type::get_allocator(); }
-
-                // Storage
-                bool empty() const noexcept { return 0 == size(); }
-
-                size_type size() const noexcept {
-                    return std::min(this->my_size.load(std::memory_order_acquire), capacity());
-                }
-
-                size_type max_size() const noexcept {
-                    return allocator_traits_type::max_size(base_type::get_allocator());
-                }
-
-                size_type capacity() const noexcept { return base_type::capacity(); }
-
-                void reserve(size_type n) {
-                    if (n == 0) return;
-
-                    if (n > max_size()) {
-                        tbb::detail::throw_exception(exception_id::reservation_length_error);
-                    }
-
-                    this->assign_first_block_if_necessary(this->segment_index_of(n - 1) + 1);
-                    base_type::reserve(n);
-                }
-
-                void resize(size_type n) { internal_resize(n); }
-
-                void resize(size_type n, const value_type& val) { internal_resize(n, val); }
-
-                void shrink_to_fit() { internal_compact(); }
-
-                void swap(concurrent_vector& other) noexcept(is_noexcept_swap) { base_type::swap(other); }
-
-                void clear() { destroy_elements(); }
-
-            private:
-                using segment_type = typename base_type::segment_type;
-                using segment_table_type = typename base_type::segment_table_type;
-                using segment_table_allocator_traits = typename base_type::segment_table_allocator_traits;
-                using segment_index_type = typename base_type::segment_index_type;
-
-                using segment_element_type = typename base_type::value_type;
-                using segment_element_allocator_type =
-                        typename allocator_traits_type::template rebind_alloc<segment_element_type>;
-                using segment_element_allocator_traits
-                        = tbb::detail::allocator_traits<segment_element_allocator_type>;
-
-                segment_table_type
-                allocate_long_table(const typename base_type::atomic_segment* embedded_table,
-                                    size_type start_index) {
-                    __TBB_ASSERT(start_index <= this->embedded_table_size,
-                                 "Start index out of embedded table");
-
-                    // If other threads are trying to set pointers in the short segment, wait for them to finish their
-                    // assignments before we copy the short segment to the long segment. Note: grow_to_at_least depends on it
-                    for (segment_index_type i = 0; this->segment_base(i) < start_index; ++i) {
-                        spin_wait_while_eq(embedded_table[i], segment_type(nullptr));
-                    }
-
-                    // It is possible that the table was extend by a thread allocating first_block, need to check this.
-                    if (this->get_table() != embedded_table) { return nullptr; }
-
-                    // Allocate long segment table and fill with null pointers
-                    segment_table_type new_segment_table = segment_table_allocator_traits::allocate(
-                            base_type::get_allocator(), this->pointers_per_long_table);
-                    // Copy segment pointers from the embedded table
-                    for (size_type segment_index = 0; segment_index < this->pointers_per_embedded_table;
-                         ++segment_index) {
-                        segment_table_allocator_traits::construct(
-                                base_type::get_allocator(), &new_segment_table[segment_index],
-                                embedded_table[segment_index].load(std::memory_order_relaxed));
-                    }
-                    for (size_type segment_index = this->pointers_per_embedded_table;
-                         segment_index < this->pointers_per_long_table; ++segment_index) {
-                        segment_table_allocator_traits::construct(base_type::get_allocator(),
-                                                                  &new_segment_table[segment_index], nullptr);
-                    }
-
-                    return new_segment_table;
-                }
-
-                // create_segment function is required by the segment_table base class
-                segment_type create_segment(segment_table_type table, segment_index_type seg_index,
-                                            size_type index) {
-                    size_type first_block = this->my_first_block.load(std::memory_order_relaxed);
-                    // First block allocation
-                    if (seg_index < first_block) {
-                        // If 0 segment is already allocated, then it remains to wait until the segments are filled to requested
-                        if (table[0].load(std::memory_order_acquire) != nullptr) {
-                            spin_wait_while_eq(table[seg_index], segment_type(nullptr));
-                            return nullptr;
-                        }
-
-                        segment_element_allocator_type segment_allocator(base_type::get_allocator());
-                        segment_type new_segment = nullptr;
-                        size_type first_block_size = this->segment_size(first_block);
-                        try_call([&] {
-                            new_segment = segment_element_allocator_traits::allocate(segment_allocator,
-                                                                                     first_block_size);
-                        }).on_exception([&] {
-                            segment_type disabled_segment = nullptr;
-                            if (table[0].compare_exchange_strong(disabled_segment,
-                                                                 this->segment_allocation_failure_tag)) {
-                                size_type end_segment = table == this->my_embedded_table
-                                                                ? this->pointers_per_embedded_table
-                                                                : first_block;
-                                for (size_type i = 1; i < end_segment; ++i) {
-                                    table[i].store(this->segment_allocation_failure_tag,
-                                                   std::memory_order_release);
-                                }
-                            }
-                        });
-
-                        segment_type disabled_segment = nullptr;
-                        if (table[0].compare_exchange_strong(disabled_segment, new_segment)) {
-                            this->extend_table_if_necessary(table, 0, first_block_size);
-                            for (size_type i = 1; i < first_block; ++i) {
-                                table[i].store(new_segment, std::memory_order_release);
-                            }
-
-                            // Other threads can wait on a snapshot of an embedded table, need to fill it.
-                            for (size_type i = 1; i < first_block && i < this->pointers_per_embedded_table;
-                                 ++i) {
-                                this->my_embedded_table[i].store(new_segment, std::memory_order_release);
-                            }
-                        } else if (new_segment != this->segment_allocation_failure_tag) {
-                            // Deallocate the memory
-                            segment_element_allocator_traits::deallocate(segment_allocator, new_segment,
-                                                                         first_block_size);
-                            // 0 segment is already allocated, then it remains to wait until the segments are filled to requested
-                            spin_wait_while_eq(table[seg_index], segment_type(nullptr));
-                        }
-                    } else {
-                        size_type offset = this->segment_base(seg_index);
-                        if (index == offset) {
-                            __TBB_ASSERT(table[seg_index].load(std::memory_order_relaxed) == nullptr,
-                                         "Only this thread can enable this segment");
-                            segment_element_allocator_type segment_allocator(base_type::get_allocator());
-                            segment_type new_segment = this->segment_allocation_failure_tag;
-                            try_call([&] {
-                                new_segment = segment_element_allocator_traits::allocate(
-                                        segment_allocator, this->segment_size(seg_index));
-                                // Shift base address to simplify access by index
-                                new_segment -= this->segment_base(seg_index);
-                            }).on_completion([&] {
-                                table[seg_index].store(new_segment, std::memory_order_release);
-                            });
-                        } else {
-                            spin_wait_while_eq(table[seg_index], segment_type(nullptr));
-                        }
-                    }
-                    return nullptr;
-                }
-
-                // Returns the number of elements in the segment to be destroy
-                size_type number_of_elements_in_segment(segment_index_type seg_index) {
-                    size_type curr_vector_size = this->my_size.load(std::memory_order_relaxed);
-                    size_type curr_segment_base = this->segment_base(seg_index);
-
-                    if (seg_index == 0) {
-                        return std::min(curr_vector_size, this->segment_size(seg_index));
-                    } else {
-                        // Perhaps the segment is allocated, but there are no elements in it.
-                        if (curr_vector_size < curr_segment_base) { return 0; }
-                        return curr_segment_base * 2 > curr_vector_size ? curr_vector_size - curr_segment_base
-                                                                        : curr_segment_base;
-                    }
-                }
-
-                void deallocate_segment(segment_type address, segment_index_type seg_index) {
-                    segment_element_allocator_type segment_allocator(base_type::get_allocator());
-                    size_type first_block = this->my_first_block.load(std::memory_order_relaxed);
-                    if (seg_index >= first_block) {
-                        segment_element_allocator_traits::deallocate(segment_allocator, address,
-                                                                     this->segment_size(seg_index));
-                    } else if (seg_index == 0) {
-                        size_type elements_to_deallocate
-                                = first_block > 0 ? this->segment_size(first_block) : this->segment_size(0);
-                        segment_element_allocator_traits::deallocate(segment_allocator, address,
-                                                                     elements_to_deallocate);
-                    }
-                }
-
-                // destroy_segment function is required by the segment_table base class
-                void destroy_segment(segment_type address, segment_index_type seg_index) {
-                    size_type elements_to_destroy = number_of_elements_in_segment(seg_index);
-                    segment_element_allocator_type segment_allocator(base_type::get_allocator());
-
-                    for (size_type i = 0; i < elements_to_destroy; ++i) {
-                        segment_element_allocator_traits::destroy(segment_allocator, address + i);
-                    }
-
-                    deallocate_segment(address, seg_index);
-                }
-
-                // copy_segment function is required by the segment_table base class
-                void copy_segment(segment_index_type seg_index, segment_type from, segment_type to) {
-                    size_type i = 0;
-                    try_call([&] {
-                        for (; i != number_of_elements_in_segment(seg_index); ++i) {
-                            segment_table_allocator_traits::construct(base_type::get_allocator(), to + i,
-                                                                      from[i]);
-                        }
-                    }).on_exception([&] {
-                        // Zero-initialize items left not constructed after the exception
-                        zero_unconstructed_elements(this->get_segment(seg_index) + i,
-                                                    this->segment_size(seg_index) - i);
-
-                        segment_index_type last_segment
-                                = this->segment_index_of(this->my_size.load(std::memory_order_relaxed));
-                        auto table = this->get_table();
-                        for (segment_index_type j = seg_index + 1; j != last_segment; ++j) {
-                            auto curr_segment = table[j].load(std::memory_order_relaxed);
-                            if (curr_segment) {
-                                zero_unconstructed_elements(curr_segment + this->segment_base(j),
-                                                            this->segment_size(j));
-                            }
-                        }
-                        this->my_size.store(this->segment_size(seg_index) + i, std::memory_order_relaxed);
-                    });
-                }
-
-                // move_segment function is required by the segment_table base class
-                void move_segment(segment_index_type seg_index, segment_type from, segment_type to) {
-                    size_type i = 0;
-                    try_call([&] {
-                        for (; i != number_of_elements_in_segment(seg_index); ++i) {
-                            segment_table_allocator_traits::construct(base_type::get_allocator(), to + i,
-                                                                      std::move(from[i]));
-                        }
-                    }).on_exception([&] {
-                        // Zero-initialize items left not constructed after the exception
-                        zero_unconstructed_elements(this->get_segment(seg_index) + i,
-                                                    this->segment_size(seg_index) - i);
-
-                        segment_index_type last_segment
-                                = this->segment_index_of(this->my_size.load(std::memory_order_relaxed));
-                        auto table = this->get_table();
-                        for (segment_index_type j = seg_index + 1; j != last_segment; ++j) {
-                            auto curr_segment = table[j].load(std::memory_order_relaxed);
-                            if (curr_segment) {
-                                zero_unconstructed_elements(curr_segment + this->segment_base(j),
-                                                            this->segment_size(j));
-                            }
-                        }
-                        this->my_size.store(this->segment_size(seg_index) + i, std::memory_order_relaxed);
-                    });
-                }
-
-                static constexpr bool is_first_element_in_segment(size_type index) {
-                    // An element is the first in a segment if its index is equal to a power of two
-                    return is_power_of_two_at_least(index, 2);
-                }
-
-                const_reference internal_subscript(size_type index) const {
-                    return const_cast<self_type*>(this)->internal_subscript(index);
+            }
+            this->my_size.store(this->segment_size(seg_index) + i, std::memory_order_relaxed);
+        });
+    }
+
+    static constexpr bool is_first_element_in_segment( size_type index ) {
+        // An element is the first in a segment if its index is equal to a power of two
+        return is_power_of_two_at_least(index, 2);
+    }
+
+    const_reference internal_subscript( size_type index ) const {
+        return const_cast<self_type*>(this)->internal_subscript(index);
+    }
+
+    reference internal_subscript( size_type index ) {
+        __TBB_ASSERT(index < this->my_size.load(std::memory_order_relaxed), "Invalid subscript index");
+        return base_type::template internal_subscript</*allow_out_of_range_access=*/false>(index);
+    }
+
+    const_reference internal_subscript_with_exceptions( size_type index ) const {
+        return const_cast<self_type*>(this)->internal_subscript_with_exceptions(index);
+    }
+
+    reference internal_subscript_with_exceptions( size_type index ) {
+        if (index >= this->my_size.load(std::memory_order_acquire)) {
+            tbb::detail::throw_exception(exception_id::out_of_range);
+        }
+
+        segment_table_type table = this->my_segment_table.load(std::memory_order_acquire);
+
+        size_type seg_index = this->segment_index_of(index);
+        if (base_type::number_of_segments(table) < seg_index) {
+            tbb::detail::throw_exception(exception_id::out_of_range);
+        }
+
+        if (table[seg_index] <= this->segment_allocation_failure_tag) {
+            tbb::detail::throw_exception(exception_id::out_of_range);
+        }
+
+        return base_type::template internal_subscript</*allow_out_of_range_access=*/false>(index);
+    }
+
+    static void zero_unconstructed_elements( pointer start, size_type count ) {
+        std::memset(static_cast<void *>(start), 0, count * sizeof(value_type));
+    }
+
+    template <typename... Args>
+    iterator internal_emplace_back( Args&&... args ) {
+        size_type old_size = this->my_size++;
+        this->assign_first_block_if_necessary(default_first_block_size);
+        auto element_address = &base_type::template internal_subscript</*allow_out_of_range_access=*/true>(old_size);
+
+        // try_call API is not convenient here due to broken
+        // variadic capture on GCC 4.8.5
+        auto value_guard = make_raii_guard([&] {
+            zero_unconstructed_elements(element_address, /*count =*/1);
+        });
+
+        segment_table_allocator_traits::construct(base_type::get_allocator(), element_address, std::forward<Args>(args)...);
+        value_guard.dismiss();
+        return iterator(*this, old_size, element_address);
+    }
+
+    template <typename... Args>
+    void internal_loop_construct( segment_table_type table, size_type start_idx, size_type end_idx, const Args&... args ) {
+        static_assert(sizeof...(Args) < 2, "Too many parameters");
+        for (size_type idx = start_idx; idx < end_idx; ++idx) {
+            auto element_address = &base_type::template internal_subscript</*allow_out_of_range_access=*/true>(idx);
+            // try_call API is not convenient here due to broken
+            // variadic capture on GCC 4.8.5
+            auto value_guard = make_raii_guard( [&] {
+                segment_index_type last_allocated_segment = this->find_last_allocated_segment(table);
+                size_type segment_size = this->segment_size(last_allocated_segment);
+                end_idx = end_idx < segment_size ? end_idx : segment_size;
+                for (size_type i = idx; i < end_idx; ++i) {
+                    zero_unconstructed_elements(&this->internal_subscript(i), /*count =*/1);
                 }
-
-                reference internal_subscript(size_type index) {
-                    __TBB_ASSERT(index < this->my_size.load(std::memory_order_relaxed),
-                                 "Invalid subscript index");
-                    return base_type::template internal_subscript</*allow_out_of_range_access=*/false>(index);
+            });
+            segment_table_allocator_traits::construct(base_type::get_allocator(), element_address, args...);
+            value_guard.dismiss();
+        }
+    }
+
+    template <typename ForwardIterator>
+    void internal_loop_construct( segment_table_type table, size_type start_idx, size_type end_idx, ForwardIterator first, ForwardIterator ) {
+        for (size_type idx = start_idx; idx < end_idx; ++idx) {
+            auto element_address = &base_type::template internal_subscript</*allow_out_of_range_access=*/true>(idx);
+            try_call( [&] {
+                segment_table_allocator_traits::construct(base_type::get_allocator(), element_address, *first++);
+            } ).on_exception( [&] {
+                segment_index_type last_allocated_segment = this->find_last_allocated_segment(table);
+                size_type segment_size = this->segment_size(last_allocated_segment);
+                end_idx = end_idx < segment_size ? end_idx : segment_size;
+                for (size_type i = idx; i < end_idx; ++i) {
+                    zero_unconstructed_elements(&this->internal_subscript(i), /*count =*/1);
                 }
-
-                const_reference internal_subscript_with_exceptions(size_type index) const {
-                    return const_cast<self_type*>(this)->internal_subscript_with_exceptions(index);
+            });
+        }
+    }
+
+    template <typename... Args>
+    iterator internal_grow( size_type start_idx, size_type end_idx, const Args&... args ) {
+        size_type seg_index = this->segment_index_of(end_idx - 1);
+        this->assign_first_block_if_necessary(seg_index + 1);
+        segment_table_type table = this->get_table();
+        this->extend_table_if_necessary(table, start_idx, end_idx);
+
+        if (seg_index > this->my_first_block.load(std::memory_order_relaxed)) {
+            // So that other threads be able to work with the last segment of grow_by, allocate it immediately.
+            // If the last segment is not less than the first block
+            if (table[seg_index].load(std::memory_order_relaxed) == nullptr) {
+                size_type first_element = this->segment_base(seg_index);
+                if (first_element >= start_idx && first_element < end_idx) {
+                    segment_type segment = table[seg_index].load(std::memory_order_relaxed);
+                    base_type::enable_segment(segment, table, seg_index, first_element);
                 }
-
-                reference internal_subscript_with_exceptions(size_type index) {
-                    if (index >= this->my_size.load(std::memory_order_acquire)) {
-                        tbb::detail::throw_exception(exception_id::out_of_range);
-                    }
-
-                    segment_table_type table = this->my_segment_table.load(std::memory_order_acquire);
-
-                    size_type seg_index = this->segment_index_of(index);
-                    if (base_type::number_of_segments(table) < seg_index) {
-                        tbb::detail::throw_exception(exception_id::out_of_range);
-                    }
-
-                    if (table[seg_index] <= this->segment_allocation_failure_tag) {
-                        tbb::detail::throw_exception(exception_id::out_of_range);
-                    }
-
-                    return base_type::template internal_subscript</*allow_out_of_range_access=*/false>(index);
-                }
-
-                static void zero_unconstructed_elements(pointer start, size_type count) {
-                    std::memset(static_cast<void*>(start), 0, count * sizeof(value_type));
+            }
+        }
+
+        internal_loop_construct(table, start_idx, end_idx, args...);
+
+        return iterator(*this, start_idx, &base_type::template internal_subscript</*allow_out_of_range_access=*/false>(start_idx));
+    }
+
+
+    template <typename... Args>
+    iterator internal_grow_by_delta( size_type delta, const Args&... args ) {
+        if (delta == size_type(0)) {
+            return end();
+        }
+        size_type start_idx = this->my_size.fetch_add(delta);
+        size_type end_idx = start_idx + delta;
+
+        return internal_grow(start_idx, end_idx, args...);
+    }
+
+    template <typename... Args>
+    iterator internal_grow_to_at_least( size_type new_size, const Args&... args ) {
+        size_type old_size = this->my_size.load(std::memory_order_relaxed);
+        if (new_size == size_type(0)) return iterator(*this, 0);
+        while (old_size < new_size && !this->my_size.compare_exchange_weak(old_size, new_size))
+        {}
+
+        int delta = static_cast<int>(new_size) - static_cast<int>(old_size);
+        if (delta > 0) {
+            return internal_grow(old_size, new_size, args...);
+        }
+
+        size_type end_segment = this->segment_index_of(new_size - 1);
+
+        // Check/wait for segments allocation completes
+        if (end_segment >= this->pointers_per_embedded_table &&
+            this->get_table() == this->my_embedded_table)
+        {
+            spin_wait_while_eq(this->my_segment_table, this->my_embedded_table);
+        }
+
+        for (segment_index_type seg_idx = 0; seg_idx <= end_segment; ++seg_idx) {
+            if (this->get_table()[seg_idx].load(std::memory_order_relaxed) == nullptr) {
+                atomic_backoff backoff(true);
+                while (this->get_table()[seg_idx].load(std::memory_order_relaxed) == nullptr) {
+                    backoff.pause();
                 }
+            }
+        }
+
+    #if TBB_USE_DEBUG
+        size_type cap = capacity();
+        __TBB_ASSERT( cap >= new_size, nullptr);
+    #endif
+        return iterator(*this, size());
+    }
+
+    template <typename... Args>
+    void internal_resize( size_type n, const Args&... args ) {
+        if (n == 0) {
+            clear();
+            return;
+        }
+
+        size_type old_size = this->my_size.load(std::memory_order_acquire);
+        if (n > old_size) {
+            reserve(n);
+            grow_to_at_least(n, args...);
+        } else {
+            if (old_size == n) {
+                return;
+            }
+            size_type last_segment = this->segment_index_of(old_size - 1);
+            // Delete segments
+            for (size_type seg_idx = this->segment_index_of(n - 1) + 1; seg_idx <= last_segment; ++seg_idx) {
+                this->delete_segment(seg_idx);
+            }
 
-                template <typename... Args>
-                iterator internal_emplace_back(Args&&... args) {
-                    size_type old_size = this->my_size++;
-                    this->assign_first_block_if_necessary(default_first_block_size);
-                    auto element_address
-                            = &base_type::template internal_subscript</*allow_out_of_range_access=*/true>(
-                                    old_size);
-
-                    // try_call API is not convenient here due to broken
-                    // variadic capture on GCC 4.8.5
-                    auto value_guard = make_raii_guard(
-                            [&] { zero_unconstructed_elements(element_address, /*count =*/1); });
+            // If n > segment_size(n) => we need to destroy all of the items in the first segment
+            // Otherwise, we need to destroy only items with the index < n
+            size_type n_segment = this->segment_index_of(n - 1);
+            size_type last_index_to_destroy = std::min(this->segment_base(n_segment) + this->segment_size(n_segment), old_size);
+            // Destroy elements in curr segment
+            for (size_type idx = n; idx < last_index_to_destroy; ++idx) {
+                segment_table_allocator_traits::destroy(base_type::get_allocator(), &base_type::template internal_subscript</*allow_out_of_range_access=*/false>(idx));
+            }
+            this->my_size.store(n, std::memory_order_release);
+        }
+    }
+
+    void destroy_elements() {
+        allocator_type alloc(base_type::get_allocator());
+        for (size_type i = 0; i < this->my_size.load(std::memory_order_relaxed); ++i) {
+            allocator_traits_type::destroy(alloc, &base_type::template internal_subscript</*allow_out_of_range_access=*/false>(i));
+        }
+        this->my_size.store(0, std::memory_order_relaxed);
+    }
+
+    static bool incompact_predicate( size_type size ) {
+        // memory page size
+        const size_type page_size = 4096;
+        return size < page_size || ((size - 1) % page_size < page_size / 2 && size < page_size * 128);
+    }
+
+    void internal_compact() {
+        const size_type curr_size = this->my_size.load(std::memory_order_relaxed);
+        segment_table_type table = this->get_table();
+        const segment_index_type k_end = this->find_last_allocated_segment(table);                   // allocated segments
+        const segment_index_type k_stop = curr_size ? this->segment_index_of(curr_size - 1) + 1 : 0; // number of segments to store existing items: 0=>0; 1,2=>1; 3,4=>2; [5-8]=>3;..
+        const segment_index_type first_block = this->my_first_block;                                 // number of merged segments, getting values from atomics
+
+        segment_index_type k = first_block;
+        if (k_stop < first_block) {
+            k = k_stop;
+        }
+        else {
+            while (k < k_stop && incompact_predicate(this->segment_size(k) * sizeof(value_type))) k++;
+        }
+
+        if (k_stop == k_end && k == first_block) {
+            return;
+        }
+
+        // First segment optimization
+        if (k != first_block && k) {
+            size_type max_block = std::max(first_block, k);
+
+            auto buffer_table = segment_table_allocator_traits::allocate(base_type::get_allocator(), max_block);
+
+            for (size_type seg_idx = 0; seg_idx < max_block; ++seg_idx) {
+                segment_table_allocator_traits::construct(base_type::get_allocator(), &buffer_table[seg_idx],
+                    table[seg_idx].load(std::memory_order_relaxed));
+                table[seg_idx].store(nullptr, std::memory_order_relaxed);
+            }
 
+            this->my_first_block.store(k, std::memory_order_relaxed);
+            size_type index = 0;
+            try_call( [&] {
+                for (; index < std::min(this->segment_size(max_block), curr_size); ++index) {
+                    auto element_address = &static_cast<base_type*>(this)->operator[](index);
+                    segment_index_type seg_idx = this->segment_index_of(index);
                     segment_table_allocator_traits::construct(base_type::get_allocator(), element_address,
-                                                              std::forward<Args>(args)...);
-                    value_guard.dismiss();
-                    return iterator(*this, old_size, element_address);
-                }
-
-                template <typename... Args>
-                void internal_loop_construct(segment_table_type table, size_type start_idx, size_type end_idx,
-                                             const Args&... args) {
-                    static_assert(sizeof...(Args) < 2, "Too many parameters");
-                    for (size_type idx = start_idx; idx < end_idx; ++idx) {
-                        auto element_address
-                                = &base_type::template internal_subscript</*allow_out_of_range_access=*/true>(
-                                        idx);
-                        // try_call API is not convenient here due to broken
-                        // variadic capture on GCC 4.8.5
-                        auto value_guard = make_raii_guard([&] {
-                            segment_index_type last_allocated_segment
-                                    = this->find_last_allocated_segment(table);
-                            size_type segment_size = this->segment_size(last_allocated_segment);
-                            end_idx = end_idx < segment_size ? end_idx : segment_size;
-                            for (size_type i = idx; i < end_idx; ++i) {
-                                zero_unconstructed_elements(&this->internal_subscript(i), /*count =*/1);
-                            }
-                        });
-                        segment_table_allocator_traits::construct(base_type::get_allocator(), element_address,
-                                                                  args...);
-                        value_guard.dismiss();
-                    }
+                    std::move_if_noexcept(buffer_table[seg_idx].load(std::memory_order_relaxed)[index]));
                 }
-
-                template <typename ForwardIterator>
-                void internal_loop_construct(segment_table_type table, size_type start_idx, size_type end_idx,
-                                             ForwardIterator first, ForwardIterator) {
-                    for (size_type idx = start_idx; idx < end_idx; ++idx) {
-                        auto element_address
-                                = &base_type::template internal_subscript</*allow_out_of_range_access=*/true>(
-                                        idx);
-                        try_call([&] {
-                            segment_table_allocator_traits::construct(base_type::get_allocator(),
-                                                                      element_address, *first++);
-                        }).on_exception([&] {
-                            segment_index_type last_allocated_segment
-                                    = this->find_last_allocated_segment(table);
-                            size_type segment_size = this->segment_size(last_allocated_segment);
-                            end_idx = end_idx < segment_size ? end_idx : segment_size;
-                            for (size_type i = idx; i < end_idx; ++i) {
-                                zero_unconstructed_elements(&this->internal_subscript(i), /*count =*/1);
-                            }
-                        });
-                    }
-                }
-
-                template <typename... Args>
-                iterator internal_grow(size_type start_idx, size_type end_idx, const Args&... args) {
-                    this->assign_first_block_if_necessary(this->segment_index_of(end_idx - 1) + 1);
-                    size_type seg_index = this->segment_index_of(end_idx - 1);
-                    segment_table_type table = this->get_table();
-                    this->extend_table_if_necessary(table, start_idx, end_idx);
-
-                    if (seg_index > this->my_first_block.load(std::memory_order_relaxed)) {
-                        // So that other threads be able to work with the last segment of grow_by, allocate it immediately.
-                        // If the last segment is not less than the first block
-                        if (table[seg_index].load(std::memory_order_relaxed) == nullptr) {
-                            size_type first_element = this->segment_base(seg_index);
-                            if (first_element >= start_idx && first_element < end_idx) {
-                                segment_type segment = table[seg_index].load(std::memory_order_relaxed);
-                                base_type::enable_segment(segment, table, seg_index, first_element);
-                            }
-                        }
-                    }
-
-                    internal_loop_construct(table, start_idx, end_idx, args...);
-
-                    return iterator(
-                            *this, start_idx,
-                            &base_type::template internal_subscript</*allow_out_of_range_access=*/false>(
-                                    start_idx));
-                }
-
-                template <typename... Args>
-                iterator internal_grow_by_delta(size_type delta, const Args&... args) {
-                    if (delta == size_type(0)) { return end(); }
-                    size_type start_idx = this->my_size.fetch_add(delta);
-                    size_type end_idx = start_idx + delta;
-
-                    return internal_grow(start_idx, end_idx, args...);
-                }
-
-                template <typename... Args>
-                iterator internal_grow_to_at_least(size_type new_size, const Args&... args) {
-                    size_type old_size = this->my_size.load(std::memory_order_relaxed);
-                    if (new_size == size_type(0)) return iterator(*this, 0);
-                    while (old_size < new_size && !this->my_size.compare_exchange_weak(old_size, new_size)) {}
-
-                    int delta = static_cast<int>(new_size) - static_cast<int>(old_size);
-                    if (delta > 0) { return internal_grow(old_size, new_size, args...); }
-
-                    size_type end_segment = this->segment_index_of(new_size - 1);
-
-                    // Check/wait for segments allocation completes
-                    if (end_segment >= this->pointers_per_embedded_table
-                        && this->get_table() == this->my_embedded_table) {
-                        spin_wait_while_eq(this->my_segment_table, this->my_embedded_table);
-                    }
-
-                    for (segment_index_type seg_idx = 0; seg_idx <= end_segment; ++seg_idx) {
-                        if (this->get_table()[seg_idx].load(std::memory_order_relaxed) == nullptr) {
-                            atomic_backoff backoff(true);
-                            while (this->get_table()[seg_idx].load(std::memory_order_relaxed) == nullptr) {
-                                backoff.pause();
-                            }
-                        }
-                    }
-
-#if TBB_USE_DEBUG
-                    size_type cap = capacity();
-                    __TBB_ASSERT(cap >= new_size, NULL);
-#endif
-                    return iterator(*this, size());
+            } ).on_exception( [&] {
+                segment_element_allocator_type allocator(base_type::get_allocator());
+                for (size_type i = 0; i < index; ++i) {
+                    auto element_adress = &this->operator[](i);
+                    segment_element_allocator_traits::destroy(allocator, element_adress);
                 }
+                segment_element_allocator_traits::deallocate(allocator,
+                    table[0].load(std::memory_order_relaxed), this->segment_size(max_block));
 
-                template <typename... Args>
-                void internal_resize(size_type n, const Args&... args) {
-                    if (n == 0) {
-                        clear();
-                        return;
-                    }
-
-                    size_type old_size = this->my_size.load(std::memory_order_acquire);
-                    if (n > old_size) {
-                        reserve(n);
-                        grow_to_at_least(n, args...);
-                    } else {
-                        if (old_size == n) { return; }
-                        size_type last_segment = this->segment_index_of(old_size - 1);
-                        // Delete segments
-                        for (size_type seg_idx = this->segment_index_of(n - 1) + 1; seg_idx <= last_segment;
-                             ++seg_idx) {
-                            this->delete_segment(seg_idx);
-                        }
-
-                        // If n > segment_size(n) => we need to destroy all of the items in the first segment
-                        // Otherwise, we need to destroy only items with the index < n
-                        size_type n_segment = this->segment_index_of(n - 1);
-                        size_type last_index_to_destroy = std::min(
-                                this->segment_base(n_segment) + this->segment_size(n_segment), old_size);
-                        // Destroy elements in curr segment
-                        for (size_type idx = n; idx < last_index_to_destroy; ++idx) {
-                            segment_table_allocator_traits::destroy(
-                                    base_type::get_allocator(),
-                                    &base_type::template internal_subscript<
-                                            /*allow_out_of_range_access=*/false>(idx));
-                        }
-                        this->my_size.store(n, std::memory_order_release);
-                    }
+                for (size_type seg_idx = 0; seg_idx < max_block; ++seg_idx) {
+                    table[seg_idx].store(buffer_table[seg_idx].load(std::memory_order_relaxed),
+                        std::memory_order_relaxed);
+                    buffer_table[seg_idx].store(nullptr, std::memory_order_relaxed);
                 }
-
-                void destroy_elements() {
-                    allocator_type alloc(base_type::get_allocator());
-                    for (size_type i = 0; i < this->my_size.load(std::memory_order_relaxed); ++i) {
-                        allocator_traits_type::destroy(
-                                alloc,
-                                &base_type::template internal_subscript</*allow_out_of_range_access=*/false>(
-                                        i));
-                    }
-                    this->my_size.store(0, std::memory_order_relaxed);
+                segment_table_allocator_traits::deallocate(base_type::get_allocator(),
+                    buffer_table, max_block);
+                this->my_first_block.store(first_block, std::memory_order_relaxed);
+            });
+
+            // Need to correct deallocate old segments
+            // Method destroy_segment respect active first_block, therefore,
+            // in order for the segment deletion to work correctly, set the first_block size that was earlier,
+            // destroy the unnecessary segments.
+            this->my_first_block.store(first_block, std::memory_order_relaxed);
+            for (size_type seg_idx = max_block; seg_idx > 0 ; --seg_idx) {
+                auto curr_segment = buffer_table[seg_idx - 1].load(std::memory_order_relaxed);
+                if (curr_segment != nullptr) {
+                    destroy_segment(buffer_table[seg_idx - 1].load(std::memory_order_relaxed) + this->segment_base(seg_idx - 1),
+                        seg_idx - 1);
                 }
+            }
 
-                static bool incompact_predicate(size_type size) {
-                    // memory page size
-                    const size_type page_size = 4096;
-                    return size < page_size
-                           || ((size - 1) % page_size < page_size / 2 && size < page_size * 128);
-                }
+            this->my_first_block.store(k, std::memory_order_relaxed);
 
-                void internal_compact() {
-                    const size_type curr_size = this->my_size.load(std::memory_order_relaxed);
-                    segment_table_type table = this->get_table();
-                    const segment_index_type k_end
-                            = this->find_last_allocated_segment(table);// allocated segments
-                    const segment_index_type k_stop
-                            = curr_size
-                                      ? this->segment_index_of(curr_size - 1) + 1
-                                      : 0;// number of segments to store existing items: 0=>0; 1,2=>1; 3,4=>2; [5-8]=>3;..
-                    const segment_index_type first_block
-                            = this->my_first_block;// number of merged segments, getting values from atomics
-
-                    segment_index_type k = first_block;
-                    if (k_stop < first_block) {
-                        k = k_stop;
-                    } else {
-                        while (k < k_stop && incompact_predicate(this->segment_size(k) * sizeof(value_type)))
-                            k++;
-                    }
+            for (size_type seg_idx = 0; seg_idx < max_block; ++seg_idx) {
+                segment_table_allocator_traits::destroy(base_type::get_allocator(), &buffer_table[seg_idx]);
+            }
 
-                    if (k_stop == k_end && k == first_block) { return; }
-
-                    // First segment optimization
-                    if (k != first_block && k) {
-                        size_type max_block = std::max(first_block, k);
-
-                        auto buffer_table = segment_table_allocator_traits::allocate(
-                                base_type::get_allocator(), max_block);
-
-                        for (size_type seg_idx = 0; seg_idx < max_block; ++seg_idx) {
-                            segment_table_allocator_traits::construct(
-                                    base_type::get_allocator(), &buffer_table[seg_idx],
-                                    table[seg_idx].load(std::memory_order_relaxed));
-                            table[seg_idx].store(nullptr, std::memory_order_relaxed);
-                        }
-
-                        this->my_first_block.store(k, std::memory_order_relaxed);
-                        size_type index = 0;
-                        try_call([&] {
-                            for (; index < std::min(this->segment_size(max_block), curr_size); ++index) {
-                                auto element_address = &static_cast<base_type*>(this)->operator[](index);
-                                segment_index_type seg_idx = this->segment_index_of(index);
-                                segment_table_allocator_traits::construct(
-                                        base_type::get_allocator(), element_address,
-                                        std::move_if_noexcept(buffer_table[seg_idx].load(
-                                                std::memory_order_relaxed)[index]));
-                            }
-                        }).on_exception([&] {
-                            segment_element_allocator_type allocator(base_type::get_allocator());
-                            for (size_type i = 0; i < index; ++i) {
-                                auto element_adress = &this->operator[](i);
-                                segment_element_allocator_traits::destroy(allocator, element_adress);
-                            }
-                            segment_element_allocator_traits::deallocate(
-                                    allocator, table[0].load(std::memory_order_relaxed),
-                                    this->segment_size(max_block));
-
-                            for (size_type seg_idx = 0; seg_idx < max_block; ++seg_idx) {
-                                table[seg_idx].store(buffer_table[seg_idx].load(std::memory_order_relaxed),
-                                                     std::memory_order_relaxed);
-                                buffer_table[seg_idx].store(nullptr, std::memory_order_relaxed);
-                            }
-                            segment_table_allocator_traits::deallocate(base_type::get_allocator(),
-                                                                       buffer_table, max_block);
-                            this->my_first_block.store(first_block, std::memory_order_relaxed);
-                        });
-
-                        // Need to correct deallocate old segments
-                        // Method destroy_segment respect active first_block, therefore,
-                        // in order for the segment deletion to work correctly, set the first_block size that was earlier,
-                        // destroy the unnecessary segments.
-                        this->my_first_block.store(first_block, std::memory_order_relaxed);
-                        for (size_type seg_idx = max_block; seg_idx > 0; --seg_idx) {
-                            auto curr_segment = buffer_table[seg_idx - 1].load(std::memory_order_relaxed);
-                            if (curr_segment != nullptr) {
-                                destroy_segment(buffer_table[seg_idx - 1].load(std::memory_order_relaxed)
-                                                        + this->segment_base(seg_idx - 1),
-                                                seg_idx - 1);
-                            }
-                        }
-
-                        this->my_first_block.store(k, std::memory_order_relaxed);
-
-                        for (size_type seg_idx = 0; seg_idx < max_block; ++seg_idx) {
-                            segment_table_allocator_traits::destroy(base_type::get_allocator(),
-                                                                    &buffer_table[seg_idx]);
-                        }
-
-                        segment_table_allocator_traits::deallocate(base_type::get_allocator(), buffer_table,
-                                                                   max_block);
-                    }
-                    // free unnecessary segments allocated by reserve() call
-                    if (k_stop < k_end) {
-                        for (size_type seg_idx = k_end; seg_idx != k_stop; --seg_idx) {
-                            if (table[seg_idx - 1].load(std::memory_order_relaxed) != nullptr) {
-                                this->delete_segment(seg_idx - 1);
-                            }
-                        }
-                        if (!k) this->my_first_block.store(0, std::memory_order_relaxed);
-                        ;
-                    }
+            segment_table_allocator_traits::deallocate(base_type::get_allocator(), buffer_table, max_block);
+        }
+        // free unnecessary segments allocated by reserve() call
+        if (k_stop < k_end) {
+            for (size_type seg_idx = k_end; seg_idx != k_stop; --seg_idx) {
+                if (table[seg_idx - 1].load(std::memory_order_relaxed) != nullptr) {
+                    this->delete_segment(seg_idx - 1);
                 }
+            }
+            if (!k) this->my_first_block.store(0, std::memory_order_relaxed);
+        }
+    }
 
-                // Lever for adjusting the size of first_block at the very first insertion.
-                // TODO: consider >1 value, check performance
-                static constexpr size_type default_first_block_size = 1;
+    // Lever for adjusting the size of first_block at the very first insertion.
+    // TODO: consider >1 value, check performance
+    static constexpr size_type default_first_block_size = 1;
 
-                template <typename Vector, typename Value>
-                friend class vector_iterator;
-            };// class concurrent_vector
+    template <typename Vector, typename Value>
+    friend class vector_iterator;
+}; // class concurrent_vector
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
-            // Deduction guide for the constructor from two iterators
-            template <typename It, typename Alloc = tbb::cache_aligned_allocator<iterator_value_t<It>>,
-                      typename = std::enable_if_t<is_input_iterator_v<It>>,
-                      typename = std::enable_if_t<is_allocator_v<Alloc>>>
-            concurrent_vector(It, It, Alloc = Alloc()) -> concurrent_vector<iterator_value_t<It>, Alloc>;
+// Deduction guide for the constructor from two iterators
+template <typename It, typename Alloc = tbb::cache_aligned_allocator<iterator_value_t<It>>,
+          typename = std::enable_if_t<is_input_iterator_v<It>>,
+          typename = std::enable_if_t<is_allocator_v<Alloc>>>
+concurrent_vector( It, It, Alloc = Alloc() )
+-> concurrent_vector<iterator_value_t<It>, Alloc>;
 #endif
 
-            template <typename T, typename Allocator>
-            void swap(concurrent_vector<T, Allocator>& lhs, concurrent_vector<T, Allocator>& rhs) {
-                lhs.swap(rhs);
-            }
+template <typename T, typename Allocator>
+void swap(concurrent_vector<T, Allocator> &lhs,
+          concurrent_vector<T, Allocator> &rhs)
+{
+    lhs.swap(rhs);
+}
 
-            template <typename T, typename Allocator>
-            bool operator==(const concurrent_vector<T, Allocator>& lhs,
-                            const concurrent_vector<T, Allocator>& rhs) {
-                return lhs.size() == rhs.size() && std::equal(lhs.begin(), lhs.end(), rhs.begin());
-            }
+template <typename T, typename Allocator>
+bool operator==(const concurrent_vector<T, Allocator> &lhs,
+                const concurrent_vector<T, Allocator> &rhs)
+{
+    return lhs.size() == rhs.size() && std::equal(lhs.begin(), lhs.end(), rhs.begin());
+}
 
 #if !__TBB_CPP20_COMPARISONS_PRESENT
-            template <typename T, typename Allocator>
-            bool operator!=(const concurrent_vector<T, Allocator>& lhs,
-                            const concurrent_vector<T, Allocator>& rhs) {
-                return !(lhs == rhs);
-            }
-#endif// !__TBB_CPP20_COMPARISONS_PRESENT
+template <typename T, typename Allocator>
+bool operator!=(const concurrent_vector<T, Allocator> &lhs,
+                const concurrent_vector<T, Allocator> &rhs)
+{
+    return !(lhs == rhs);
+}
+#endif // !__TBB_CPP20_COMPARISONS_PRESENT
 
 #if __TBB_CPP20_COMPARISONS_PRESENT && __TBB_CPP20_CONCEPTS_PRESENT
-            template <typename T, typename Allocator>
-            tbb::detail::synthesized_three_way_result<typename concurrent_vector<T, Allocator>::value_type>
-            operator<=>(const concurrent_vector<T, Allocator>& lhs,
-                        const concurrent_vector<T, Allocator>& rhs) {
-                return std::lexicographical_compare_three_way(
-                        lhs.begin(), lhs.end(), rhs.begin(), rhs.end(),
-                        tbb::detail::synthesized_three_way_comparator {});
-            }
+template <typename T, typename Allocator>
+tbb::detail::synthesized_three_way_result<typename concurrent_vector<T, Allocator>::value_type>
+operator<=>(const concurrent_vector<T, Allocator> &lhs,
+            const concurrent_vector<T, Allocator> &rhs)
+{
+    return std::lexicographical_compare_three_way(lhs.begin(), lhs.end(),
+                                                  rhs.begin(), rhs.end(),
+                                                  tbb::detail::synthesized_three_way_comparator{});
+}
 
 #else
 
-            template <typename T, typename Allocator>
-            bool operator<(const concurrent_vector<T, Allocator>& lhs,
-                           const concurrent_vector<T, Allocator>& rhs) {
-                return std::lexicographical_compare(lhs.begin(), lhs.end(), rhs.begin(), rhs.end());
-            }
-
-            template <typename T, typename Allocator>
-            bool operator<=(const concurrent_vector<T, Allocator>& lhs,
-                            const concurrent_vector<T, Allocator>& rhs) {
-                return !(rhs < lhs);
-            }
-
-            template <typename T, typename Allocator>
-            bool operator>(const concurrent_vector<T, Allocator>& lhs,
-                           const concurrent_vector<T, Allocator>& rhs) {
-                return rhs < lhs;
-            }
-
-            template <typename T, typename Allocator>
-            bool operator>=(const concurrent_vector<T, Allocator>& lhs,
-                            const concurrent_vector<T, Allocator>& rhs) {
-                return !(lhs < rhs);
-            }
-#endif// __TBB_CPP20_COMPARISONS_PRESENT && __TBB_CPP20_CONCEPTS_PRESENT
-
-        }// namespace d1
-    }    // namespace detail
-
-    inline namespace v1 {
-        using detail::d1::concurrent_vector;
-    }// namespace v1
-
-}// namespace tbb
-
-#endif// __TBB_concurrent_vector_H
+template <typename T, typename Allocator>
+bool operator<(const concurrent_vector<T, Allocator> &lhs,
+               const concurrent_vector<T, Allocator> &rhs)
+{
+    return std::lexicographical_compare(lhs.begin(), lhs.end(), rhs.begin(), rhs.end());
+}
+
+template <typename T, typename Allocator>
+bool operator<=(const concurrent_vector<T, Allocator> &lhs,
+                const concurrent_vector<T, Allocator> &rhs)
+{
+    return !(rhs < lhs);
+}
+
+template <typename T, typename Allocator>
+bool operator>(const concurrent_vector<T, Allocator> &lhs,
+               const concurrent_vector<T, Allocator> &rhs)
+{
+    return rhs < lhs;
+}
+
+template <typename T, typename Allocator>
+bool operator>=(const concurrent_vector<T, Allocator> &lhs,
+                const concurrent_vector<T, Allocator> &rhs)
+{
+    return !(lhs < rhs);
+}
+#endif // __TBB_CPP20_COMPARISONS_PRESENT && __TBB_CPP20_CONCEPTS_PRESENT
+
+} // namespace d1
+} // namespace detail
+
+inline namespace v1 {
+    using detail::d1::concurrent_vector;
+} // namespace v1
+
+} // namespace tbb
+
+#endif // __TBB_concurrent_vector_H
diff --git a/external/tbb/include/oneapi/tbb/detail/_aggregator.h b/external/tbb/include/oneapi/tbb/detail/_aggregator.h
index 08064fc5..2e3e5cc3 100644
--- a/external/tbb/include/oneapi/tbb/detail/_aggregator.h
+++ b/external/tbb/include/oneapi/tbb/detail/_aggregator.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -14,45 +14,46 @@
     limitations under the License.
 */
 
+
 #ifndef __TBB_detail__aggregator_H
 #define __TBB_detail__aggregator_H
 
 #include "_assert.h"
 #include "_utils.h"
 #include <atomic>
-#if !__TBBMALLOC_BUILD// TODO: check this macro with TBB Malloc
+#if !__TBBMALLOC_BUILD // TODO: check this macro with TBB Malloc
 #include "../profiling.h"
 #endif
 
 namespace tbb {
-    namespace detail {
-        namespace d1 {
-
-            // Base class for aggregated operation
-            template <typename Derived>
-            class aggregated_operation {
-            public:
-                // Zero value means "wait" status, all other values are "user" specified values and
-                // are defined into the scope of a class which uses "status"
-                std::atomic<uintptr_t> status;
-
-                std::atomic<Derived*> next;
-                aggregated_operation() : status {}, next(nullptr) {}
-            };// class aggregated_operation
-
-            // Aggregator base class
-            /* An aggregator for collecting operations coming from multiple sources and executing
+namespace detail {
+namespace d1 {
+
+// Base class for aggregated operation
+template <typename Derived>
+class aggregated_operation {
+public:
+    // Zero value means "wait" status, all other values are "user" specified values and
+    // are defined into the scope of a class which uses "status"
+    std::atomic<uintptr_t> status;
+
+    std::atomic<Derived*> next;
+    aggregated_operation() : status{}, next(nullptr) {}
+}; // class aggregated_operation
+
+// Aggregator base class
+/* An aggregator for collecting operations coming from multiple sources and executing
    them serially on a single thread.  OperationType must be derived from
    aggregated_operation. The parameter HandlerType is a functor that will be passed the
    list of operations and is expected to handle each operation appropriately, setting the
    status of each operation to non-zero. */
-            template <typename OperationType>
-            class aggregator_generic {
-            public:
-                aggregator_generic() : pending_operations(nullptr), handler_busy(false) {}
+template <typename OperationType>
+class aggregator_generic {
+public:
+    aggregator_generic() : pending_operations(nullptr), handler_busy(false) {}
 
-                // Execute an operation
-                /* Places an operation into the waitlist (pending_operations), and either handles the list,
+    // Execute an operation
+    /* Places an operation into the waitlist (pending_operations), and either handles the list,
        or waits for the operation to complete, or returns.
        The long_life_time parameter specifies the life time of the given operation object.
        Operations with long_life_time == true may be accessed after execution.
@@ -60,115 +61,116 @@ namespace tbb {
        during execution, and so any access to it after it was put into the waitlist,
        including status check, is invalid. As a consequence, waiting for completion
        of such operation causes undefined behavior. */
-                template <typename HandlerType>
-                void execute(OperationType* op, HandlerType& handle_operations, bool long_life_time = true) {
-                    // op->status should be read before inserting the operation into the
-                    // aggregator waitlist since it can become invalid after executing a
-                    // handler (if the operation has 'short' life time.)
-                    const uintptr_t status = op->status.load(std::memory_order_relaxed);
-
-                    // ITT note: &(op->status) tag is used to cover accesses to this op node. This
-                    // thread has created the operation, and now releases it so that the handler
-                    // thread may handle the associated operation w/o triggering a race condition;
-                    // thus this tag will be acquired just before the operation is handled in the
-                    // handle_operations functor.
-                    call_itt_notify(releasing, &(op->status));
-                    // insert the operation in the queue.
-                    OperationType* res = pending_operations.load(std::memory_order_relaxed);
-                    do {
-                        op->next.store(res, std::memory_order_relaxed);
-                    } while (!pending_operations.compare_exchange_strong(res, op));
-                    if (!res) {// first in the list; handle the operations
-                        // ITT note: &pending_operations tag covers access to the handler_busy flag,
-                        // which this waiting handler thread will try to set before entering
-                        // handle_operations.
-                        call_itt_notify(acquired, &pending_operations);
-                        start_handle_operations(handle_operations);
-                        // The operation with 'short' life time can already be destroyed
-                        if (long_life_time) __TBB_ASSERT(op->status.load(std::memory_order_relaxed), NULL);
-                    }
-                    // Not first; wait for op to be ready
-                    else if (!status) {// operation is blocking here.
-                        __TBB_ASSERT(
-                                long_life_time,
-                                "Waiting for an operation object that might be destroyed during processing");
-                        call_itt_notify(prepare, &(op->status));
-                        spin_wait_while_eq(op->status, uintptr_t(0));
-                    }
-                }
-
-            private:
-                // Trigger the handling of operations when the handler is free
-                template <typename HandlerType>
-                void start_handle_operations(HandlerType& handle_operations) {
-                    OperationType* op_list;
-
-                    // ITT note: &handler_busy tag covers access to pending_operations as it is passed
-                    // between active and waiting handlers.  Below, the waiting handler waits until
-                    // the active handler releases, and the waiting handler acquires &handler_busy as
-                    // it becomes the active_handler. The release point is at the end of this
-                    // function, when all operations in pending_operations have been handled by the
-                    // owner of this aggregator.
-                    call_itt_notify(prepare, &handler_busy);
-                    // get the handler_busy:
-                    // only one thread can possibly spin here at a time
-                    spin_wait_until_eq(handler_busy, uintptr_t(0));
-                    call_itt_notify(acquired, &handler_busy);
-                    // acquire fence not necessary here due to causality rule and surrounding atomics
-                    handler_busy.store(1, std::memory_order_relaxed);
-
-                    // ITT note: &pending_operations tag covers access to the handler_busy flag
-                    // itself. Capturing the state of the pending_operations signifies that
-                    // handler_busy has been set and a new active handler will now process that list's
-                    // operations.
-                    call_itt_notify(releasing, &pending_operations);
-                    // grab pending_operations
-                    op_list = pending_operations.exchange(nullptr);
-
-                    // handle all the operations
-                    handle_operations(op_list);
-
-                    // release the handler
-                    handler_busy.store(0, std::memory_order_release);
-                }
-
-                // An atomically updated list (aka mailbox) of pending operations
-                std::atomic<OperationType*> pending_operations;
-                // Controls threads access to handle_operations
-                std::atomic<uintptr_t> handler_busy;
-            };// class aggregator_generic
-
-            template <typename HandlerType, typename OperationType>
-            class aggregator : public aggregator_generic<OperationType> {
-                HandlerType handle_operations;
-
-            public:
-                aggregator() = default;
-
-                void initialize_handler(HandlerType h) { handle_operations = h; }
-
-                void execute(OperationType* op) {
-                    aggregator_generic<OperationType>::execute(op, handle_operations);
-                }
-            };// class aggregator
-
-            // the most-compatible friend declaration (vs, gcc, icc) is
-            // template<class U, class V> friend class aggregating_functor;
-            template <typename AggregatingClass, typename OperationList>
-            class aggregating_functor {
-                AggregatingClass* my_object;
-
-            public:
-                aggregating_functor() = default;
-                aggregating_functor(AggregatingClass* object) : my_object(object) {
-                    __TBB_ASSERT(my_object, nullptr);
-                }
-
-                void operator()(OperationList* op_list) { my_object->handle_operations(op_list); }
-            };// class aggregating_functor
-
-        }// namespace d1
-    }    // namespace detail
-}// namespace tbb
-
-#endif// __TBB_detail__aggregator_H
+    template <typename HandlerType>
+    void execute( OperationType* op, HandlerType& handle_operations, bool long_life_time = true ) {
+        // op->status should be read before inserting the operation into the
+        // aggregator waitlist since it can become invalid after executing a
+        // handler (if the operation has 'short' life time.)
+        const uintptr_t status = op->status.load(std::memory_order_relaxed);
+
+        // ITT note: &(op->status) tag is used to cover accesses to this op node. This
+        // thread has created the operation, and now releases it so that the handler
+        // thread may handle the associated operation w/o triggering a race condition;
+        // thus this tag will be acquired just before the operation is handled in the
+        // handle_operations functor.
+        call_itt_notify(releasing, &(op->status));
+        // insert the operation in the queue.
+        OperationType* res = pending_operations.load(std::memory_order_relaxed);
+        do {
+            op->next.store(res, std::memory_order_relaxed);
+        } while (!pending_operations.compare_exchange_strong(res, op));
+        if (!res) { // first in the list; handle the operations
+            // ITT note: &pending_operations tag covers access to the handler_busy flag,
+            // which this waiting handler thread will try to set before entering
+            // handle_operations.
+            call_itt_notify(acquired, &pending_operations);
+            start_handle_operations(handle_operations);
+            // The operation with 'short' life time can already be destroyed
+            if (long_life_time)
+                __TBB_ASSERT(op->status.load(std::memory_order_relaxed), nullptr);
+        }
+        // Not first; wait for op to be ready
+        else if (!status) { // operation is blocking here.
+            __TBB_ASSERT(long_life_time, "Waiting for an operation object that might be destroyed during processing");
+            call_itt_notify(prepare, &(op->status));
+            spin_wait_while_eq(op->status, uintptr_t(0));
+        }
+   }
+
+private:
+    // Trigger the handling of operations when the handler is free
+    template <typename HandlerType>
+    void start_handle_operations( HandlerType& handle_operations ) {
+        OperationType* op_list;
+
+        // ITT note: &handler_busy tag covers access to pending_operations as it is passed
+        // between active and waiting handlers.  Below, the waiting handler waits until
+        // the active handler releases, and the waiting handler acquires &handler_busy as
+        // it becomes the active_handler. The release point is at the end of this
+        // function, when all operations in pending_operations have been handled by the
+        // owner of this aggregator.
+        call_itt_notify(prepare, &handler_busy);
+        // get the handler_busy:
+        // only one thread can possibly spin here at a time
+        spin_wait_until_eq(handler_busy, uintptr_t(0));
+        call_itt_notify(acquired, &handler_busy);
+        // acquire fence not necessary here due to causality rule and surrounding atomics
+        handler_busy.store(1, std::memory_order_relaxed);
+
+        // ITT note: &pending_operations tag covers access to the handler_busy flag
+        // itself. Capturing the state of the pending_operations signifies that
+        // handler_busy has been set and a new active handler will now process that list's
+        // operations.
+        call_itt_notify(releasing, &pending_operations);
+        // grab pending_operations
+        op_list = pending_operations.exchange(nullptr);
+
+        // handle all the operations
+        handle_operations(op_list);
+
+        // release the handler
+        handler_busy.store(0, std::memory_order_release);
+    }
+
+    // An atomically updated list (aka mailbox) of pending operations
+    std::atomic<OperationType*> pending_operations;
+    // Controls threads access to handle_operations
+    std::atomic<uintptr_t> handler_busy;
+}; // class aggregator_generic
+
+template <typename HandlerType, typename OperationType>
+class aggregator : public aggregator_generic<OperationType> {
+    HandlerType handle_operations;
+public:
+    aggregator() = default;
+
+    void initialize_handler( HandlerType h ) { handle_operations = h; }
+
+    void execute(OperationType* op) {
+        aggregator_generic<OperationType>::execute(op, handle_operations);
+    }
+}; // class aggregator
+
+// the most-compatible friend declaration (vs, gcc, icc) is
+// template<class U, class V> friend class aggregating_functor;
+template <typename AggregatingClass, typename OperationList>
+class aggregating_functor {
+    AggregatingClass* my_object{nullptr};
+public:
+    aggregating_functor() = default;
+    aggregating_functor( AggregatingClass* object ) : my_object(object) {
+        __TBB_ASSERT(my_object, nullptr);
+    }
+
+    void operator()( OperationList* op_list ) {
+        __TBB_ASSERT(my_object, nullptr);
+        my_object->handle_operations(op_list);
+    }
+}; // class aggregating_functor
+
+
+} // namespace d1
+} // namespace detail
+} // namespace tbb
+
+#endif // __TBB_detail__aggregator_H
diff --git a/external/tbb/include/oneapi/tbb/detail/_aligned_space.h b/external/tbb/include/oneapi/tbb/detail/_aligned_space.h
index b7f3f3c9..13857c47 100644
--- a/external/tbb/include/oneapi/tbb/detail/_aligned_space.h
+++ b/external/tbb/include/oneapi/tbb/detail/_aligned_space.h
@@ -21,26 +21,26 @@
 #include "_template_helpers.h"
 
 namespace tbb {
-    namespace detail {
-        inline namespace d0 {
+namespace detail {
+inline namespace d0 {
 
-            //! Block of space aligned sufficiently to construct an array T with N elements.
-            /** The elements are not constructed or destroyed by this class.
+//! Block of space aligned sufficiently to construct an array T with N elements.
+/** The elements are not constructed or destroyed by this class.
     @ingroup memory_allocation */
-            template <typename T, std::size_t N = 1>
-            class aligned_space {
-                alignas(alignof(T)) std::uint8_t aligned_array[N * sizeof(T)];
+template<typename T, std::size_t N = 1>
+class aligned_space {
+    alignas(alignof(T)) std::uint8_t aligned_array[N * sizeof(T)];
 
-            public:
-                //! Pointer to beginning of array
-                T* begin() const { return punned_cast<T*>(&aligned_array); }
+public:
+    //! Pointer to beginning of array
+    T* begin() const { return punned_cast<T*>(&aligned_array); }
 
-                //! Pointer to one past last element in array.
-                T* end() const { return begin() + N; }
-            };
+    //! Pointer to one past last element in array.
+    T* end() const { return begin() + N; }
+};
 
-        }// namespace d0
-    }    // namespace detail
-}// namespace tbb
+} // namespace d0
+} // namespace detail
+} // namespace tbb
 
 #endif /* __TBB_aligned_space_H */
diff --git a/external/tbb/include/oneapi/tbb/detail/_allocator_traits.h b/external/tbb/include/oneapi/tbb/detail/_allocator_traits.h
index 176f92bc..8c60e25e 100644
--- a/external/tbb/include/oneapi/tbb/detail/_allocator_traits.h
+++ b/external/tbb/include/oneapi/tbb/detail/_allocator_traits.h
@@ -23,89 +23,85 @@
 #include <type_traits>
 
 namespace tbb {
-    namespace detail {
-        inline namespace d0 {
+namespace detail {
+inline namespace d0 {
 
 #if !__TBB_CPP17_ALLOCATOR_IS_ALWAYS_EQUAL_PRESENT
-            // Struct is_always_equal_detector provides the member type "type" which is
-            // Allocator::is_always_equal if it is present, std::false_type otherwise
-            template <typename Allocator, typename = void>
-            struct is_always_equal_detector {
-                using type = std::false_type;
-            };
-
-            template <typename Allocator>
-            struct is_always_equal_detector<Allocator,
-                                            tbb::detail::void_t<typename Allocator::is_always_equal>> {
-                using type = typename Allocator::is_always_equal;
-            };
-#endif// !__TBB_CPP17_ALLOCATOR_IS_ALWAYS_EQUAL_PRESENT
-
-            template <typename Allocator>
-            class allocator_traits : public std::allocator_traits<Allocator> {
-                using base_type = std::allocator_traits<Allocator>;
-
-            public:
+// Struct is_always_equal_detector provides the member type "type" which is
+// Allocator::is_always_equal if it is present, std::false_type otherwise
+template <typename Allocator, typename = void>
+struct is_always_equal_detector {
+    using type = std::false_type;
+};
+
+template <typename Allocator>
+struct is_always_equal_detector<Allocator, tbb::detail::void_t<typename Allocator::is_always_equal>>
+{
+    using type = typename Allocator::is_always_equal;
+};
+#endif // !__TBB_CPP17_ALLOCATOR_IS_ALWAYS_EQUAL_PRESENT
+
+template <typename Allocator>
+class allocator_traits : public std::allocator_traits<Allocator>
+{
+    using base_type = std::allocator_traits<Allocator>;
+public:
 #if !__TBB_CPP17_ALLOCATOR_IS_ALWAYS_EQUAL_PRESENT
-                using is_always_equal = typename is_always_equal_detector<Allocator>::type;
+    using is_always_equal = typename is_always_equal_detector<Allocator>::type;
 #endif
 
-                template <typename T>
-                using rebind_traits =
-                        typename tbb::detail::allocator_traits<typename base_type::template rebind_alloc<T>>;
-            };// struct allocator_traits
-
-            template <typename Allocator>
-            void copy_assign_allocators_impl(Allocator& lhs, const Allocator& rhs,
-                                             /*pocca = */ std::true_type) {
-                lhs = rhs;
-            }
-
-            template <typename Allocator>
-            void copy_assign_allocators_impl(Allocator&, const Allocator&, /*pocca = */ std::false_type) {}
-
-            // Copy assigns allocators only if propagate_on_container_copy_assignment is true
-            template <typename Allocator>
-            void copy_assign_allocators(Allocator& lhs, const Allocator& rhs) {
-                using pocca_type =
-                        typename allocator_traits<Allocator>::propagate_on_container_copy_assignment;
-                copy_assign_allocators_impl(lhs, rhs, pocca_type());
-            }
-
-            template <typename Allocator>
-            void move_assign_allocators_impl(Allocator& lhs, Allocator& rhs, /*pocma = */ std::true_type) {
-                lhs = std::move(rhs);
-            }
-
-            template <typename Allocator>
-            void move_assign_allocators_impl(Allocator&, Allocator&, /*pocma = */ std::false_type) {}
-
-            // Move assigns allocators only if propagate_on_container_move_assignment is true
-            template <typename Allocator>
-            void move_assign_allocators(Allocator& lhs, Allocator& rhs) {
-                using pocma_type =
-                        typename allocator_traits<Allocator>::propagate_on_container_move_assignment;
-                move_assign_allocators_impl(lhs, rhs, pocma_type());
-            }
-
-            template <typename Allocator>
-            void swap_allocators_impl(Allocator& lhs, Allocator& rhs, /*pocs = */ std::true_type) {
-                using std::swap;
-                swap(lhs, rhs);
-            }
-
-            template <typename Allocator>
-            void swap_allocators_impl(Allocator&, Allocator&, /*pocs = */ std::false_type) {}
-
-            // Swaps allocators only if propagate_on_container_swap is true
-            template <typename Allocator>
-            void swap_allocators(Allocator& lhs, Allocator& rhs) {
-                using pocs_type = typename allocator_traits<Allocator>::propagate_on_container_swap;
-                swap_allocators_impl(lhs, rhs, pocs_type());
-            }
-
-        }// namespace d0
-    }    // namespace detail
-}// namespace tbb
-
-#endif// __TBB_detail__allocator_traits_H
+    template <typename T>
+    using rebind_traits = typename tbb::detail::allocator_traits<typename base_type::template rebind_alloc<T>>;
+}; // struct allocator_traits
+
+template <typename Allocator>
+void copy_assign_allocators_impl( Allocator& lhs, const Allocator& rhs, /*pocca = */std::true_type ) {
+    lhs = rhs;
+}
+
+template <typename Allocator>
+void copy_assign_allocators_impl( Allocator&, const Allocator&, /*pocca = */ std::false_type ) {}
+
+// Copy assigns allocators only if propagate_on_container_copy_assignment is true
+template <typename Allocator>
+void copy_assign_allocators( Allocator& lhs, const Allocator& rhs ) {
+    using pocca_type = typename allocator_traits<Allocator>::propagate_on_container_copy_assignment;
+    copy_assign_allocators_impl(lhs, rhs, pocca_type());
+}
+
+template <typename Allocator>
+void move_assign_allocators_impl( Allocator& lhs, Allocator& rhs, /*pocma = */ std::true_type ) {
+    lhs = std::move(rhs);
+}
+
+template <typename Allocator>
+void move_assign_allocators_impl( Allocator&, Allocator&, /*pocma = */ std::false_type ) {}
+
+// Move assigns allocators only if propagate_on_container_move_assignment is true
+template <typename Allocator>
+void move_assign_allocators( Allocator& lhs, Allocator& rhs ) {
+    using pocma_type = typename allocator_traits<Allocator>::propagate_on_container_move_assignment;
+    move_assign_allocators_impl(lhs, rhs, pocma_type());
+}
+
+template <typename Allocator>
+void swap_allocators_impl( Allocator& lhs, Allocator& rhs, /*pocs = */ std::true_type ) {
+    using std::swap;
+    swap(lhs, rhs);
+}
+
+template <typename Allocator>
+void swap_allocators_impl( Allocator&, Allocator&, /*pocs = */ std::false_type ) {}
+
+// Swaps allocators only if propagate_on_container_swap is true
+template <typename Allocator>
+void swap_allocators( Allocator& lhs, Allocator& rhs ) {
+    using pocs_type = typename allocator_traits<Allocator>::propagate_on_container_swap;
+    swap_allocators_impl(lhs, rhs, pocs_type());
+}
+
+} // inline namespace d0
+} // namespace detail
+} // namespace tbb
+
+#endif // __TBB_detail__allocator_traits_H
diff --git a/external/tbb/include/oneapi/tbb/detail/_assert.h b/external/tbb/include/oneapi/tbb/detail/_assert.h
index 5e25cd31..fce714ff 100644
--- a/external/tbb/include/oneapi/tbb/detail/_assert.h
+++ b/external/tbb/include/oneapi/tbb/detail/_assert.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -20,50 +20,45 @@
 #include "_config.h"
 
 #if __TBBMALLOC_BUILD
-namespace rml {
-    namespace internal {
+namespace rml { namespace internal {
 #else
 namespace tbb {
-    namespace detail {
-        namespace r1 {
+namespace detail {
+namespace r1 {
 #endif
-        //! Process an assertion failure.
-        /** Normally called from __TBB_ASSERT macro.
+//! Process an assertion failure.
+/** Normally called from __TBB_ASSERT macro.
   If assertion handler is null, print message for assertion failure and abort.
   Otherwise call the assertion handler. */
-        TBB_EXPORT void __TBB_EXPORTED_FUNC assertion_failure(const char* location, int line,
-                                                              const char* expression, const char* comment);
+TBB_EXPORT void __TBB_EXPORTED_FUNC assertion_failure(const char* location, int line, const char* expression, const char* comment);
 #if __TBBMALLOC_BUILD
-    }
-}// namespaces rml::internal
+}} // namespaces rml::internal
 #else
-        }// namespace r1
-    }    // namespace detail
-}// namespace tbb
+} // namespace r1
+} // namespace detail
+} // namespace tbb
 #endif
 
 #if __TBBMALLOC_BUILD
 //! Release version of assertions
-#define __TBB_ASSERT_RELEASE(predicate, message)                                                             \
-    ((predicate) ? ((void) 0) : rml::internal::assertion_failure(__func__, __LINE__, #predicate, message))
+#define __TBB_ASSERT_RELEASE(predicate,message) ((predicate)?((void)0) : rml::internal::assertion_failure(__func__,__LINE__,#predicate,message))
 #else
-#define __TBB_ASSERT_RELEASE(predicate, message)                                                             \
-    ((predicate) ? ((void) 0) : tbb::detail::r1::assertion_failure(__func__, __LINE__, #predicate, message))
+#define __TBB_ASSERT_RELEASE(predicate,message) ((predicate)?((void)0) : tbb::detail::r1::assertion_failure(__func__,__LINE__,#predicate,message))
 #endif
 
 #if TBB_USE_ASSERT
-//! Assert that predicate is true.
-/** If predicate is false, print assertion failure message.
-        If the comment argument is not NULL, it is printed as part of the failure message.
+    //! Assert that predicate is true.
+    /** If predicate is false, print assertion failure message.
+        If the comment argument is not nullptr, it is printed as part of the failure message.
         The comment argument has no other effect. */
-#define __TBB_ASSERT(predicate, message) __TBB_ASSERT_RELEASE(predicate, message)
-//! "Extended" version
-#define __TBB_ASSERT_EX __TBB_ASSERT
+    #define __TBB_ASSERT(predicate,message) __TBB_ASSERT_RELEASE(predicate,message)
+    //! "Extended" version
+    #define __TBB_ASSERT_EX __TBB_ASSERT
 #else
- //! No-op version of __TBB_ASSERT.
-#define __TBB_ASSERT(predicate, comment) ((void) 0)
- //! "Extended" version is useful to suppress warnings if a variable is only used with an assert
-#define __TBB_ASSERT_EX(predicate, comment) ((void) (1 && (predicate)))
-#endif// TBB_USE_ASSERT
+    //! No-op version of __TBB_ASSERT.
+    #define __TBB_ASSERT(predicate,comment) ((void)0)
+    //! "Extended" version is useful to suppress warnings if a variable is only used with an assert
+    #define __TBB_ASSERT_EX(predicate,comment) ((void)(1 && (predicate)))
+#endif // TBB_USE_ASSERT
 
-#endif// __TBB_detail__assert_H
+#endif // __TBB_detail__assert_H
diff --git a/external/tbb/include/oneapi/tbb/detail/_attach.h b/external/tbb/include/oneapi/tbb/detail/_attach.h
new file mode 100644
index 00000000..45f29727
--- /dev/null
+++ b/external/tbb/include/oneapi/tbb/detail/_attach.h
@@ -0,0 +1,32 @@
+/*
+    Copyright (c) 2021 Intel Corporation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#ifndef __TBB_detail__attach_H
+#define __TBB_detail__attach_H
+
+#include "_config.h"
+
+namespace tbb {
+namespace detail {
+namespace d1 {
+
+    struct attach {};
+
+} // namespace d1
+} // namespace detail
+} // namespace tbb
+
+#endif // __TBB_detail__attach_H
diff --git a/external/tbb/include/oneapi/tbb/detail/_concurrent_queue_base.h b/external/tbb/include/oneapi/tbb/detail/_concurrent_queue_base.h
index efbd44bc..ee628e1e 100644
--- a/external/tbb/include/oneapi/tbb/detail/_concurrent_queue_base.h
+++ b/external/tbb/include/oneapi/tbb/detail/_concurrent_queue_base.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -17,673 +17,634 @@
 #ifndef __TBB_detail__concurrent_queue_base_H
 #define __TBB_detail__concurrent_queue_base_H
 
-#include "_allocator_traits.h"
+#include "_utils.h"
 #include "_exception.h"
 #include "_machine.h"
-#include "_utils.h"
+#include "_allocator_traits.h"
 
-#include "../cache_aligned_allocator.h"
 #include "../profiling.h"
 #include "../spin_mutex.h"
+#include "../cache_aligned_allocator.h"
 
 #include <atomic>
 
 namespace tbb {
-    namespace detail {
-        namespace d2 {
+namespace detail {
+namespace d2 {
 
-            using ticket_type = std::size_t;
+using ticket_type = std::size_t;
 
-            template <typename Page>
-            inline bool is_valid_page(const Page p) {
-                return reinterpret_cast<std::uintptr_t>(p) > 1;
-            }
+template <typename Page>
+inline bool is_valid_page(const Page p) {
+    return reinterpret_cast<std::uintptr_t>(p) > 1;
+}
 
-            template <typename T, typename Allocator>
-            struct concurrent_queue_rep;
+template <typename T, typename Allocator>
+struct concurrent_queue_rep;
 
-            template <typename Container, typename T, typename Allocator>
-            class micro_queue_pop_finalizer;
+template <typename Container, typename T, typename Allocator>
+class micro_queue_pop_finalizer;
 
 #if _MSC_VER && !defined(__INTEL_COMPILER)
 // unary minus operator applied to unsigned type, result still unsigned
-#pragma warning(push)
-#pragma warning(disable : 4146)
+#pragma warning( push )
+#pragma warning( disable: 4146 )
 #endif
 
-            // A queue using simple locking.
-            // For efficiency, this class has no constructor.
-            // The caller is expected to zero-initialize it.
-            template <typename T, typename Allocator>
-            class micro_queue {
-            private:
-                using queue_rep_type = concurrent_queue_rep<T, Allocator>;
-                using self_type = micro_queue<T, Allocator>;
-
-            public:
-                using size_type = std::size_t;
-                using value_type = T;
-                using reference = value_type&;
-                using const_reference = const value_type&;
-
-                using allocator_type = Allocator;
-                using allocator_traits_type = tbb::detail::allocator_traits<allocator_type>;
-                using queue_allocator_type =
-                        typename allocator_traits_type::template rebind_alloc<queue_rep_type>;
-
-                static constexpr size_type item_size = sizeof(T);
-                static constexpr size_type items_per_page = item_size <= 8     ? 32
-                                                            : item_size <= 16  ? 16
-                                                            : item_size <= 32  ? 8
-                                                            : item_size <= 64  ? 4
-                                                            : item_size <= 128 ? 2
-                                                                               : 1;
-
-                struct padded_page {
-                    padded_page() {}
-                    ~padded_page() {}
-
-                    reference operator[](std::size_t index) {
-                        __TBB_ASSERT(index < items_per_page, "Index out of range");
-                        return items[index];
-                    }
-
-                    const_reference operator[](std::size_t index) const {
-                        __TBB_ASSERT(index < items_per_page, "Index out of range");
-                        return items[index];
-                    }
-
-                    padded_page* next {nullptr};
-                    std::atomic<std::uintptr_t> mask {};
-
-                    union {
-                        value_type items[items_per_page];
-                    };
-                };// struct padded_page
-
-                using page_allocator_type =
-                        typename allocator_traits_type::template rebind_alloc<padded_page>;
-
-            protected:
-                using page_allocator_traits = tbb::detail::allocator_traits<page_allocator_type>;
-
-            public:
-                using item_constructor_type = void (*)(value_type* location, const void* src);
-                micro_queue() = default;
-                micro_queue(const micro_queue&) = delete;
-                micro_queue& operator=(const micro_queue&) = delete;
-
-                size_type prepare_page(ticket_type k, queue_rep_type& base,
-                                       page_allocator_type page_allocator, padded_page*& p) {
-                    __TBB_ASSERT(p == nullptr, "Invalid page argument for prepare_page");
-                    k &= -queue_rep_type::n_queue;
-                    size_type index = modulo_power_of_two(k / queue_rep_type::n_queue, items_per_page);
-                    if (!index) {
-                        try_call([&] {
-                            p = page_allocator_traits::allocate(page_allocator, 1);
-                        }).on_exception([&] {
-                            ++base.n_invalid_entries;
-                            invalidate_page(k);
-                        });
-                        page_allocator_traits::construct(page_allocator, p);
-                    }
-
-                    if (tail_counter.load(std::memory_order_relaxed) != k)
-                        spin_wait_until_my_turn(tail_counter, k, base);
-                    d1::call_itt_notify(d1::acquired, &tail_counter);
-
-                    if (p) {
-                        spin_mutex::scoped_lock lock(page_mutex);
-                        padded_page* q = tail_page.load(std::memory_order_relaxed);
-                        if (is_valid_page(q)) {
-                            q->next = p;
-                        } else {
-                            head_page.store(p, std::memory_order_relaxed);
-                        }
-                        tail_page.store(p, std::memory_order_release);
-                    } else {
-                        p = tail_page.load(std::memory_order_acquire);// TODO may be relaxed ?
-                    }
-                    return index;
-                }
-
-                template <typename... Args>
-                void push(ticket_type k, queue_rep_type& base, queue_allocator_type& allocator,
-                          Args&&... args) {
-                    padded_page* p = nullptr;
-                    page_allocator_type page_allocator(allocator);
-                    size_type index = prepare_page(k, base, page_allocator, p);
-                    __TBB_ASSERT(p != nullptr, "Page was not prepared");
-
-                    // try_call API is not convenient here due to broken
-                    // variadic capture on GCC 4.8.5
-                    auto value_guard = make_raii_guard([&] {
-                        ++base.n_invalid_entries;
-                        d1::call_itt_notify(d1::releasing, &tail_counter);
-                        tail_counter.fetch_add(queue_rep_type::n_queue);
-                    });
-
-                    page_allocator_traits::construct(page_allocator, &(*p)[index],
-                                                     std::forward<Args>(args)...);
-                    // If no exception was thrown, mark item as present.
-                    p->mask.store(p->mask.load(std::memory_order_relaxed) | uintptr_t(1) << index,
-                                  std::memory_order_relaxed);
-                    d1::call_itt_notify(d1::releasing, &tail_counter);
-
-                    value_guard.dismiss();
-                    tail_counter.fetch_add(queue_rep_type::n_queue);
-                }
-
-                void abort_push(ticket_type k, queue_rep_type& base, queue_allocator_type& allocator) {
-                    padded_page* p = nullptr;
-                    prepare_page(k, base, allocator, p);
-                    ++base.n_invalid_entries;
-                    tail_counter.fetch_add(queue_rep_type::n_queue);
-                }
-
-                bool pop(void* dst, ticket_type k, queue_rep_type& base, queue_allocator_type& allocator) {
-                    k &= -queue_rep_type::n_queue;
-                    spin_wait_until_eq(head_counter, k);
-                    d1::call_itt_notify(d1::acquired, &head_counter);
-                    spin_wait_while_eq(tail_counter, k);
-                    d1::call_itt_notify(d1::acquired, &tail_counter);
-                    padded_page* p = head_page.load(std::memory_order_acquire);
-                    __TBB_ASSERT(p, nullptr);
-                    size_type index = modulo_power_of_two(k / queue_rep_type::n_queue, items_per_page);
-                    bool success = false;
-                    {
-                        page_allocator_type page_allocator(allocator);
-                        micro_queue_pop_finalizer<self_type, value_type, page_allocator_type> finalizer(
-                                *this, page_allocator, k + queue_rep_type::n_queue,
-                                index == items_per_page - 1 ? p : nullptr);
-                        if (p->mask.load(std::memory_order_relaxed) & (std::uintptr_t(1) << index)) {
-                            success = true;
-                            assign_and_destroy_item(dst, *p, index);
-                        } else {
-                            --base.n_invalid_entries;
-                        }
-                    }
-                    return success;
-                }
-
-                micro_queue& assign(const micro_queue& src, queue_allocator_type& allocator,
-                                    item_constructor_type construct_item) {
-                    head_counter.store(src.head_counter.load(std::memory_order_relaxed),
-                                       std::memory_order_relaxed);
-                    tail_counter.store(src.tail_counter.load(std::memory_order_relaxed),
-                                       std::memory_order_relaxed);
-
-                    const padded_page* srcp = src.head_page.load(std::memory_order_relaxed);
-                    if (is_valid_page(srcp)) {
-                        ticket_type g_index = head_counter.load(std::memory_order_relaxed);
-                        size_type n_items = (tail_counter.load(std::memory_order_relaxed)
-                                             - head_counter.load(std::memory_order_relaxed))
-                                            / queue_rep_type::n_queue;
-                        size_type index = modulo_power_of_two(head_counter.load(std::memory_order_relaxed)
-                                                                      / queue_rep_type::n_queue,
-                                                              items_per_page);
-                        size_type end_in_first_page
-                                = (index + n_items < items_per_page) ? (index + n_items) : items_per_page;
-
-                        try_call([&] {
-                            head_page.store(make_copy(allocator, srcp, index, end_in_first_page, g_index,
-                                                      construct_item),
-                                            std::memory_order_relaxed);
-                        }).on_exception([&] {
-                            head_counter.store(0, std::memory_order_relaxed);
-                            tail_counter.store(0, std::memory_order_relaxed);
-                        });
-                        padded_page* cur_page = head_page.load(std::memory_order_relaxed);
-
-                        try_call([&] {
-                            if (srcp != src.tail_page.load(std::memory_order_relaxed)) {
-                                for (srcp = srcp->next; srcp != src.tail_page.load(std::memory_order_relaxed);
-                                     srcp = srcp->next) {
-                                    cur_page->next = make_copy(allocator, srcp, 0, items_per_page, g_index,
-                                                               construct_item);
-                                    cur_page = cur_page->next;
-                                }
-
-                                __TBB_ASSERT(srcp == src.tail_page.load(std::memory_order_relaxed), nullptr);
-                                size_type last_index
-                                        = modulo_power_of_two(tail_counter.load(std::memory_order_relaxed)
-                                                                      / queue_rep_type::n_queue,
-                                                              items_per_page);
-                                if (last_index == 0) last_index = items_per_page;
-
-                                cur_page->next
-                                        = make_copy(allocator, srcp, 0, last_index, g_index, construct_item);
-                                cur_page = cur_page->next;
-                            }
-                            tail_page.store(cur_page, std::memory_order_relaxed);
-                        }).on_exception([&] {
-                            padded_page* invalid_page = reinterpret_cast<padded_page*>(std::uintptr_t(1));
-                            tail_page.store(invalid_page, std::memory_order_relaxed);
-                        });
-                    } else {
-                        head_page.store(nullptr, std::memory_order_relaxed);
-                        tail_page.store(nullptr, std::memory_order_relaxed);
-                    }
-                    return *this;
-                }
-
-                padded_page* make_copy(queue_allocator_type& allocator, const padded_page* src_page,
-                                       size_type begin_in_page, size_type end_in_page, ticket_type& g_index,
-                                       item_constructor_type construct_item) {
-                    page_allocator_type page_allocator(allocator);
-                    padded_page* new_page = page_allocator_traits::allocate(page_allocator, 1);
-                    new_page->next = nullptr;
-                    new_page->mask.store(src_page->mask.load(std::memory_order_relaxed),
-                                         std::memory_order_relaxed);
-                    for (; begin_in_page != end_in_page; ++begin_in_page, ++g_index) {
-                        if (new_page->mask.load(std::memory_order_relaxed) & uintptr_t(1) << begin_in_page) {
-                            copy_item(*new_page, begin_in_page, *src_page, begin_in_page, construct_item);
-                        }
-                    }
-                    return new_page;
-                }
-
-                void invalidate_page(ticket_type k) {
-                    // Append an invalid page at address 1 so that no more pushes are allowed.
-                    padded_page* invalid_page = reinterpret_cast<padded_page*>(std::uintptr_t(1));
-                    {
-                        spin_mutex::scoped_lock lock(page_mutex);
-                        tail_counter.store(k + queue_rep_type::n_queue + 1, std::memory_order_relaxed);
-                        padded_page* q = tail_page.load(std::memory_order_relaxed);
-                        if (is_valid_page(q)) {
-                            q->next = invalid_page;
-                        } else {
-                            head_page.store(invalid_page, std::memory_order_relaxed);
-                        }
-                        tail_page.store(invalid_page, std::memory_order_relaxed);
-                    }
-                }
-
-                padded_page* get_tail_page() { return tail_page.load(std::memory_order_relaxed); }
-
-                padded_page* get_head_page() { return head_page.load(std::memory_order_relaxed); }
-
-                void set_tail_page(padded_page* pg) { tail_page.store(pg, std::memory_order_relaxed); }
-
-                void clear(queue_allocator_type& allocator) {
-                    padded_page* curr_page = head_page.load(std::memory_order_relaxed);
-                    std::size_t index = head_counter.load(std::memory_order_relaxed);
-                    page_allocator_type page_allocator(allocator);
-
-                    while (curr_page) {
-                        for (; index != items_per_page - 1; ++index) {
-                            curr_page->operator[](index).~value_type();
-                        }
-                        padded_page* next_page = curr_page->next;
-                        page_allocator_traits::destroy(page_allocator, curr_page);
-                        page_allocator_traits::deallocate(page_allocator, curr_page, 1);
-                        curr_page = next_page;
+// A queue using simple locking.
+// For efficiency, this class has no constructor.
+// The caller is expected to zero-initialize it.
+template <typename T, typename Allocator>
+class micro_queue {
+private:
+    using queue_rep_type = concurrent_queue_rep<T, Allocator>;
+    using self_type = micro_queue<T, Allocator>;
+public:
+    using size_type = std::size_t;
+    using value_type = T;
+    using reference = value_type&;
+    using const_reference = const value_type&;
+
+    using allocator_type = Allocator;
+    using allocator_traits_type = tbb::detail::allocator_traits<allocator_type>;
+    using queue_allocator_type = typename allocator_traits_type::template rebind_alloc<queue_rep_type>;
+
+    static constexpr size_type item_size = sizeof(T);
+    static constexpr size_type items_per_page = item_size <=   8 ? 32 :
+                                                item_size <=  16 ? 16 :
+                                                item_size <=  32 ?  8 :
+                                                item_size <=  64 ?  4 :
+                                                item_size <= 128 ?  2 : 1;
+
+    struct padded_page {
+        padded_page() {}
+        ~padded_page() {}
+
+        reference operator[] (std::size_t index) {
+            __TBB_ASSERT(index < items_per_page, "Index out of range");
+            return items[index];
+        }
+
+        const_reference operator[] (std::size_t index) const {
+            __TBB_ASSERT(index < items_per_page, "Index out of range");
+            return items[index];
+        }
+
+        padded_page* next{ nullptr };
+        std::atomic<std::uintptr_t> mask{};
+
+        union {
+            value_type items[items_per_page];
+        };
+    }; // struct padded_page
+
+    using page_allocator_type = typename allocator_traits_type::template rebind_alloc<padded_page>;
+protected:
+    using page_allocator_traits = tbb::detail::allocator_traits<page_allocator_type>;
+
+public:
+    using item_constructor_type = void (*)(value_type* location, const void* src);
+    micro_queue() = default;
+    micro_queue( const micro_queue& ) = delete;
+    micro_queue& operator=( const micro_queue& ) = delete;
+
+    size_type prepare_page( ticket_type k, queue_rep_type& base, page_allocator_type page_allocator,
+                            padded_page*& p ) {
+        __TBB_ASSERT(p == nullptr, "Invalid page argument for prepare_page");
+        k &= -queue_rep_type::n_queue;
+        size_type index = modulo_power_of_two(k / queue_rep_type::n_queue, items_per_page);
+        if (!index) {
+            try_call( [&] {
+                p = page_allocator_traits::allocate(page_allocator, 1);
+            }).on_exception( [&] {
+                ++base.n_invalid_entries;
+                invalidate_page( k );
+            });
+            page_allocator_traits::construct(page_allocator, p);
+        }
+
+        spin_wait_until_my_turn(tail_counter, k, base);
+        d1::call_itt_notify(d1::acquired, &tail_counter);
+
+        if (p) {
+            spin_mutex::scoped_lock lock( page_mutex );
+            padded_page* q = tail_page.load(std::memory_order_relaxed);
+            if (is_valid_page(q)) {
+                q->next = p;
+            } else {
+                head_page.store(p, std::memory_order_relaxed);
+            }
+            tail_page.store(p, std::memory_order_relaxed);
+        } else {
+            p = tail_page.load(std::memory_order_relaxed);
+        }
+        return index;
+    }
+
+    template<typename... Args>
+    void push( ticket_type k, queue_rep_type& base, queue_allocator_type& allocator, Args&&... args )
+    {
+        padded_page* p = nullptr;
+        page_allocator_type page_allocator(allocator);
+        size_type index = prepare_page(k, base, page_allocator, p);
+        __TBB_ASSERT(p != nullptr, "Page was not prepared");
+
+        // try_call API is not convenient here due to broken
+        // variadic capture on GCC 4.8.5
+        auto value_guard = make_raii_guard([&] {
+            ++base.n_invalid_entries;
+            d1::call_itt_notify(d1::releasing, &tail_counter);
+            tail_counter.fetch_add(queue_rep_type::n_queue);
+        });
+
+        page_allocator_traits::construct(page_allocator, &(*p)[index], std::forward<Args>(args)...);
+        // If no exception was thrown, mark item as present.
+        p->mask.store(p->mask.load(std::memory_order_relaxed) | uintptr_t(1) << index, std::memory_order_relaxed);
+        d1::call_itt_notify(d1::releasing, &tail_counter);
+
+        value_guard.dismiss();
+        tail_counter.fetch_add(queue_rep_type::n_queue);
+    }
+
+    void abort_push( ticket_type k, queue_rep_type& base, queue_allocator_type& allocator ) {
+        padded_page* p = nullptr;
+        prepare_page(k, base, allocator, p);
+        ++base.n_invalid_entries;
+        tail_counter.fetch_add(queue_rep_type::n_queue);
+    }
+
+    bool pop( void* dst, ticket_type k, queue_rep_type& base, queue_allocator_type& allocator ) {
+        k &= -queue_rep_type::n_queue;
+        spin_wait_until_eq(head_counter, k);
+        d1::call_itt_notify(d1::acquired, &head_counter);
+        spin_wait_while_eq(tail_counter, k);
+        d1::call_itt_notify(d1::acquired, &tail_counter);
+        padded_page *p = head_page.load(std::memory_order_relaxed);
+        __TBB_ASSERT( p, nullptr );
+        size_type index = modulo_power_of_two( k/queue_rep_type::n_queue, items_per_page );
+        bool success = false;
+        {
+            page_allocator_type page_allocator(allocator);
+            micro_queue_pop_finalizer<self_type, value_type, page_allocator_type> finalizer(*this, page_allocator,
+                k + queue_rep_type::n_queue, index == items_per_page - 1 ? p : nullptr );
+            if (p->mask.load(std::memory_order_relaxed) & (std::uintptr_t(1) << index)) {
+                success = true;
+                assign_and_destroy_item(dst, *p, index);
+            } else {
+                --base.n_invalid_entries;
+            }
+        }
+        return success;
+    }
+
+    micro_queue& assign( const micro_queue& src, queue_allocator_type& allocator,
+        item_constructor_type construct_item )
+    {
+        head_counter.store(src.head_counter.load(std::memory_order_relaxed), std::memory_order_relaxed);
+        tail_counter.store(src.tail_counter.load(std::memory_order_relaxed), std::memory_order_relaxed);
+
+        const padded_page* srcp = src.head_page.load(std::memory_order_relaxed);
+        if( is_valid_page(srcp) ) {
+            ticket_type g_index = head_counter.load(std::memory_order_relaxed);
+            size_type n_items  = (tail_counter.load(std::memory_order_relaxed) - head_counter.load(std::memory_order_relaxed))
+                / queue_rep_type::n_queue;
+            size_type index = modulo_power_of_two(head_counter.load(std::memory_order_relaxed) / queue_rep_type::n_queue, items_per_page);
+            size_type end_in_first_page = (index+n_items < items_per_page) ? (index + n_items) : items_per_page;
+
+            try_call( [&] {
+                head_page.store(make_copy(allocator, srcp, index, end_in_first_page, g_index, construct_item), std::memory_order_relaxed);
+            }).on_exception( [&] {
+                head_counter.store(0, std::memory_order_relaxed);
+                tail_counter.store(0, std::memory_order_relaxed);
+            });
+            padded_page* cur_page = head_page.load(std::memory_order_relaxed);
+
+            try_call( [&] {
+                if (srcp != src.tail_page.load(std::memory_order_relaxed)) {
+                    for (srcp = srcp->next; srcp != src.tail_page.load(std::memory_order_relaxed); srcp=srcp->next ) {
+                        cur_page->next = make_copy( allocator, srcp, 0, items_per_page, g_index, construct_item );
+                        cur_page = cur_page->next;
                     }
 
-                    padded_page* invalid_page = reinterpret_cast<padded_page*>(std::uintptr_t(1));
-                    head_page.store(invalid_page, std::memory_order_relaxed);
-                    tail_page.store(invalid_page, std::memory_order_relaxed);
-                }
+                    __TBB_ASSERT(srcp == src.tail_page.load(std::memory_order_relaxed), nullptr );
+                    size_type last_index = modulo_power_of_two(tail_counter.load(std::memory_order_relaxed) / queue_rep_type::n_queue, items_per_page);
+                    if( last_index==0 ) last_index = items_per_page;
 
-            private:
-                // template <typename U, typename A>
-                friend class micro_queue_pop_finalizer<self_type, value_type, page_allocator_type>;
-
-                // Class used to ensure exception-safety of method "pop"
-                class destroyer {
-                    value_type& my_value;
-
-                public:
-                    destroyer(reference value) : my_value(value) {}
-                    destroyer(const destroyer&) = delete;
-                    destroyer& operator=(const destroyer&) = delete;
-                    ~destroyer() { my_value.~T(); }
-                };// class destroyer
-
-                void copy_item(padded_page& dst, size_type dindex, const padded_page& src, size_type sindex,
-                               item_constructor_type construct_item) {
-                    auto& src_item = src[sindex];
-                    construct_item(&dst[dindex], static_cast<const void*>(&src_item));
+                    cur_page->next = make_copy( allocator, srcp, 0, last_index, g_index, construct_item );
+                    cur_page = cur_page->next;
                 }
-
-                void assign_and_destroy_item(void* dst, padded_page& src, size_type index) {
-                    auto& from = src[index];
-                    destroyer d(from);
-                    *static_cast<T*>(dst) = std::move(from);
+                tail_page.store(cur_page, std::memory_order_relaxed);
+            }).on_exception( [&] {
+                padded_page* invalid_page = reinterpret_cast<padded_page*>(std::uintptr_t(1));
+                tail_page.store(invalid_page, std::memory_order_relaxed);
+            });
+        } else {
+            head_page.store(nullptr, std::memory_order_relaxed);
+            tail_page.store(nullptr, std::memory_order_relaxed);
+        }
+        return *this;
+    }
+
+    padded_page* make_copy( queue_allocator_type& allocator, const padded_page* src_page, size_type begin_in_page,
+        size_type end_in_page, ticket_type& g_index, item_constructor_type construct_item )
+    {
+        page_allocator_type page_allocator(allocator);
+        padded_page* new_page = page_allocator_traits::allocate(page_allocator, 1);
+        new_page->next = nullptr;
+        new_page->mask.store(src_page->mask.load(std::memory_order_relaxed), std::memory_order_relaxed);
+        for (; begin_in_page!=end_in_page; ++begin_in_page, ++g_index) {
+            if (new_page->mask.load(std::memory_order_relaxed) & uintptr_t(1) << begin_in_page) {
+                copy_item(*new_page, begin_in_page, *src_page, begin_in_page, construct_item);
+            }
+        }
+        return new_page;
+    }
+
+    void invalidate_page( ticket_type k )  {
+        // Append an invalid page at address 1 so that no more pushes are allowed.
+        padded_page* invalid_page = reinterpret_cast<padded_page*>(std::uintptr_t(1));
+        {
+            spin_mutex::scoped_lock lock( page_mutex );
+            tail_counter.store(k + queue_rep_type::n_queue + 1, std::memory_order_relaxed);
+            padded_page* q = tail_page.load(std::memory_order_relaxed);
+            if (is_valid_page(q)) {
+                q->next = invalid_page;
+            } else {
+                head_page.store(invalid_page, std::memory_order_relaxed);
+            }
+            tail_page.store(invalid_page, std::memory_order_relaxed);
+        }
+    }
+
+    padded_page* get_head_page() {
+        return head_page.load(std::memory_order_relaxed);
+    }
+
+    void clear(queue_allocator_type& allocator, padded_page* new_head = nullptr, padded_page* new_tail = nullptr) {
+        padded_page* curr_page = get_head_page();
+        size_type index = (head_counter.load(std::memory_order_relaxed) / queue_rep_type::n_queue) % items_per_page;
+        page_allocator_type page_allocator(allocator);
+
+        while (curr_page && is_valid_page(curr_page)) {
+            while (index != items_per_page) {
+                if (curr_page->mask.load(std::memory_order_relaxed) & (std::uintptr_t(1) << index)) {
+                    page_allocator_traits::destroy(page_allocator, &curr_page->operator[](index));
                 }
+                ++index;
+            }
 
-                void spin_wait_until_my_turn(std::atomic<ticket_type>& counter, ticket_type k,
-                                             queue_rep_type& rb) const {
-                    for (atomic_backoff b(true);; b.pause()) {
-                        ticket_type c = counter;
-                        if (c == k) return;
-                        else if (c & 1) {
-                            ++rb.n_invalid_entries;
-                            throw_exception(exception_id::bad_last_alloc);
-                        }
-                    }
-                }
+            index = 0;
+            padded_page* next_page = curr_page->next;
+            page_allocator_traits::destroy(page_allocator, curr_page);
+            page_allocator_traits::deallocate(page_allocator, curr_page, 1);
+            curr_page = next_page;
+        }
+        head_counter.store(0, std::memory_order_relaxed);
+        tail_counter.store(0, std::memory_order_relaxed);
+        head_page.store(new_head, std::memory_order_relaxed);
+        tail_page.store(new_tail, std::memory_order_relaxed);
+    }
+
+    void clear_and_invalidate(queue_allocator_type& allocator) {
+        padded_page* invalid_page = reinterpret_cast<padded_page*>(std::uintptr_t(1));
+        clear(allocator, invalid_page, invalid_page);
+    }
+
+private:
+    // template <typename U, typename A>
+    friend class micro_queue_pop_finalizer<self_type, value_type, page_allocator_type>;
+
+    // Class used to ensure exception-safety of method "pop"
+    class destroyer  {
+        value_type& my_value;
+    public:
+        destroyer( reference value ) : my_value(value) {}
+        destroyer( const destroyer& ) = delete;
+        destroyer& operator=( const destroyer& ) = delete;
+        ~destroyer() {my_value.~T();}
+    }; // class destroyer
+
+    void copy_item( padded_page& dst, size_type dindex, const padded_page& src, size_type sindex,
+        item_constructor_type construct_item )
+    {
+        auto& src_item = src[sindex];
+        construct_item( &dst[dindex], static_cast<const void*>(&src_item) );
+    }
+
+    void assign_and_destroy_item( void* dst, padded_page& src, size_type index ) {
+        auto& from = src[index];
+        destroyer d(from);
+        *static_cast<T*>(dst) = std::move(from);
+    }
+
+    void spin_wait_until_my_turn( std::atomic<ticket_type>& counter, ticket_type k, queue_rep_type& rb ) const {
+        for (atomic_backoff b{};; b.pause()) {
+            ticket_type c = counter.load(std::memory_order_acquire);
+            if (c == k) return;
+            else if (c & 1) {
+                ++rb.n_invalid_entries;
+                throw_exception( exception_id::bad_last_alloc);
+            }
+        }
+    }
 
-                std::atomic<padded_page*> head_page {};
-                std::atomic<ticket_type> head_counter {};
+    std::atomic<padded_page*> head_page{};
+    std::atomic<ticket_type> head_counter{};
 
-                std::atomic<padded_page*> tail_page {};
-                std::atomic<ticket_type> tail_counter {};
+    std::atomic<padded_page*> tail_page{};
+    std::atomic<ticket_type> tail_counter{};
 
-                spin_mutex page_mutex {};
-            };// class micro_queue
+    spin_mutex page_mutex{};
+}; // class micro_queue
 
 #if _MSC_VER && !defined(__INTEL_COMPILER)
-#pragma warning(pop)
-#endif// warning 4146 is back
-
-            template <typename Container, typename T, typename Allocator>
-            class micro_queue_pop_finalizer {
-            public:
-                using padded_page = typename Container::padded_page;
-                using allocator_type = Allocator;
-                using allocator_traits_type = tbb::detail::allocator_traits<allocator_type>;
-
-                micro_queue_pop_finalizer(Container& queue, Allocator& alloc, ticket_type k, padded_page* p)
-                    : my_ticket_type(k), my_queue(queue), my_page(p), allocator(alloc) {}
-
-                micro_queue_pop_finalizer(const micro_queue_pop_finalizer&) = delete;
-                micro_queue_pop_finalizer& operator=(const micro_queue_pop_finalizer&) = delete;
-
-                ~micro_queue_pop_finalizer() {
-                    padded_page* p = my_page;
-                    if (is_valid_page(p)) {
-                        spin_mutex::scoped_lock lock(my_queue.page_mutex);
-                        padded_page* q = p->next;
-                        my_queue.head_page.store(q, std::memory_order_release);
-                        if (!is_valid_page(q)) {
-                            my_queue.tail_page.store(nullptr, std::memory_order_release);
-                        }
-                    }
-                    my_queue.head_counter.store(my_ticket_type, std::memory_order_release);
-                    if (is_valid_page(p)) {
-                        allocator_traits_type::destroy(allocator, static_cast<padded_page*>(p));
-                        allocator_traits_type::deallocate(allocator, static_cast<padded_page*>(p), 1);
-                    }
-                }
-
-            private:
-                ticket_type my_ticket_type;
-                Container& my_queue;
-                padded_page* my_page;
-                Allocator& allocator;
-            };// class micro_queue_pop_finalizer
+#pragma warning( pop )
+#endif // warning 4146 is back
+
+template <typename Container, typename T, typename Allocator>
+class micro_queue_pop_finalizer {
+public:
+    using padded_page = typename Container::padded_page;
+    using allocator_type = Allocator;
+    using allocator_traits_type = tbb::detail::allocator_traits<allocator_type>;
+
+    micro_queue_pop_finalizer( Container& queue, Allocator& alloc, ticket_type k, padded_page* p ) :
+        my_ticket_type(k), my_queue(queue), my_page(p), allocator(alloc)
+    {}
+
+    micro_queue_pop_finalizer( const micro_queue_pop_finalizer& ) = delete;
+    micro_queue_pop_finalizer& operator=( const micro_queue_pop_finalizer& ) = delete;
+
+    ~micro_queue_pop_finalizer() {
+        padded_page* p = my_page;
+        if( is_valid_page(p) ) {
+            spin_mutex::scoped_lock lock( my_queue.page_mutex );
+            padded_page* q = p->next;
+            my_queue.head_page.store(q, std::memory_order_relaxed);
+            if( !is_valid_page(q) ) {
+                my_queue.tail_page.store(nullptr, std::memory_order_relaxed);
+            }
+        }
+        my_queue.head_counter.store(my_ticket_type, std::memory_order_release);
+        if ( is_valid_page(p) ) {
+            allocator_traits_type::destroy(allocator, static_cast<padded_page*>(p));
+            allocator_traits_type::deallocate(allocator, static_cast<padded_page*>(p), 1);
+        }
+    }
+private:
+    ticket_type my_ticket_type;
+    Container& my_queue;
+    padded_page* my_page;
+    Allocator& allocator;
+}; // class micro_queue_pop_finalizer
 
 #if _MSC_VER && !defined(__INTEL_COMPILER)
 // structure was padded due to alignment specifier
-#pragma warning(push)
-#pragma warning(disable : 4324)
+#pragma warning( push )
+#pragma warning( disable: 4324 )
 #endif
 
-            template <typename T, typename Allocator>
-            struct concurrent_queue_rep {
-                using self_type = concurrent_queue_rep<T, Allocator>;
-                using size_type = std::size_t;
-                using micro_queue_type = micro_queue<T, Allocator>;
-                using allocator_type = Allocator;
-                using allocator_traits_type = tbb::detail::allocator_traits<allocator_type>;
-                using padded_page = typename micro_queue_type::padded_page;
-                using page_allocator_type = typename micro_queue_type::page_allocator_type;
-                using item_constructor_type = typename micro_queue_type::item_constructor_type;
-
-            private:
-                using page_allocator_traits = tbb::detail::allocator_traits<page_allocator_type>;
-                using queue_allocator_type = typename allocator_traits_type::template rebind_alloc<self_type>;
-
-            public:
-                // must be power of 2
-                static constexpr size_type n_queue = 8;
-                // Approximately n_queue/golden ratio
-                static constexpr size_type phi = 3;
-                static constexpr size_type item_size = micro_queue_type::item_size;
-                static constexpr size_type items_per_page = micro_queue_type::items_per_page;
-
-                concurrent_queue_rep() {}
-
-                concurrent_queue_rep(const concurrent_queue_rep&) = delete;
-                concurrent_queue_rep& operator=(const concurrent_queue_rep&) = delete;
-
-                void clear(queue_allocator_type& alloc) {
-                    page_allocator_type page_allocator(alloc);
-                    for (size_type i = 0; i < n_queue; ++i) {
-                        padded_page* tail_page = array[i].get_tail_page();
-                        if (is_valid_page(tail_page)) {
-                            __TBB_ASSERT(array[i].get_head_page() == tail_page,
-                                         "at most one page should remain");
-                            page_allocator_traits::destroy(page_allocator,
-                                                           static_cast<padded_page*>(tail_page));
-                            page_allocator_traits::deallocate(page_allocator,
-                                                              static_cast<padded_page*>(tail_page), 1);
-                            array[i].set_tail_page(nullptr);
-                        } else {
-                            __TBB_ASSERT(!is_valid_page(array[i].get_head_page()),
-                                         "head page pointer corrupt?");
-                        }
-                    }
-                }
-
-                void assign(const concurrent_queue_rep& src, queue_allocator_type& alloc,
-                            item_constructor_type construct_item) {
-                    head_counter.store(src.head_counter.load(std::memory_order_relaxed),
-                                       std::memory_order_relaxed);
-                    tail_counter.store(src.tail_counter.load(std::memory_order_relaxed),
-                                       std::memory_order_relaxed);
-                    n_invalid_entries.store(src.n_invalid_entries.load(std::memory_order_relaxed),
-                                            std::memory_order_relaxed);
-
-                    // copy or move micro_queues
-                    size_type queue_idx = 0;
-                    try_call([&] {
-                        for (; queue_idx < n_queue; ++queue_idx) {
-                            array[queue_idx].assign(src.array[queue_idx], alloc, construct_item);
-                        }
-                    }).on_exception([&] {
-                        for (size_type i = 0; i < queue_idx + 1; ++i) { array[i].clear(alloc); }
-                        head_counter.store(0, std::memory_order_relaxed);
-                        tail_counter.store(0, std::memory_order_relaxed);
-                        n_invalid_entries.store(0, std::memory_order_relaxed);
-                    });
-
-                    __TBB_ASSERT(head_counter.load(std::memory_order_relaxed)
-                                                 == src.head_counter.load(std::memory_order_relaxed)
-                                         && tail_counter.load(std::memory_order_relaxed)
-                                                    == src.tail_counter.load(std::memory_order_relaxed),
-                                 "the source concurrent queue should not be concurrently modified.");
-                }
-
-                bool empty() const {
-                    ticket_type tc = tail_counter.load(std::memory_order_acquire);
-                    ticket_type hc = head_counter.load(std::memory_order_relaxed);
-                    // if tc!=r.tail_counter, the queue was not empty at some point between the two reads.
-                    return tc == tail_counter.load(std::memory_order_relaxed)
-                           && std::ptrdiff_t(tc - hc - n_invalid_entries.load(std::memory_order_relaxed))
-                                      <= 0;
-                }
-
-                std::ptrdiff_t size() const {
-                    __TBB_ASSERT(sizeof(std::ptrdiff_t) <= sizeof(size_type), NULL);
-                    std::ptrdiff_t hc = head_counter.load(std::memory_order_acquire);
-                    std::ptrdiff_t tc = tail_counter.load(std::memory_order_relaxed);
-                    std::ptrdiff_t nie = n_invalid_entries.load(std::memory_order_relaxed);
-
-                    return tc - hc - nie;
-                }
-
-                friend class micro_queue<T, Allocator>;
-
-                // Map ticket_type to an array index
-                static size_type index(ticket_type k) { return k * phi % n_queue; }
-
-                micro_queue_type& choose(ticket_type k) {
-                    // The formula here approximates LRU in a cache-oblivious way.
-                    return array[index(k)];
-                }
-
-                alignas(max_nfs_size) micro_queue_type array[n_queue];
-
-                alignas(max_nfs_size) std::atomic<ticket_type> head_counter {};
-                alignas(max_nfs_size) std::atomic<ticket_type> tail_counter {};
-                alignas(max_nfs_size) std::atomic<size_type> n_invalid_entries {};
-            };// class concurrent_queue_rep
+template <typename T, typename Allocator>
+struct concurrent_queue_rep {
+    using self_type = concurrent_queue_rep<T, Allocator>;
+    using size_type = std::size_t;
+    using micro_queue_type = micro_queue<T, Allocator>;
+    using allocator_type = Allocator;
+    using allocator_traits_type = tbb::detail::allocator_traits<allocator_type>;
+    using padded_page = typename micro_queue_type::padded_page;
+    using page_allocator_type = typename micro_queue_type::page_allocator_type;
+    using item_constructor_type = typename micro_queue_type::item_constructor_type;
+private:
+    using page_allocator_traits = tbb::detail::allocator_traits<page_allocator_type>;
+    using queue_allocator_type = typename allocator_traits_type::template rebind_alloc<self_type>;
+
+public:
+    // must be power of 2
+    static constexpr size_type n_queue = 8;
+    // Approximately n_queue/golden ratio
+    static constexpr size_type phi = 3;
+    static constexpr size_type item_size = micro_queue_type::item_size;
+    static constexpr size_type items_per_page = micro_queue_type::items_per_page;
+
+    concurrent_queue_rep() {}
+
+    concurrent_queue_rep( const concurrent_queue_rep& ) = delete;
+    concurrent_queue_rep& operator=( const concurrent_queue_rep& ) = delete;
+
+    void clear( queue_allocator_type& alloc ) {
+        for (size_type index = 0; index < n_queue; ++index) {
+            array[index].clear(alloc);
+        }
+        head_counter.store(0, std::memory_order_relaxed);
+        tail_counter.store(0, std::memory_order_relaxed);
+        n_invalid_entries.store(0, std::memory_order_relaxed);
+    }
+
+    void assign( const concurrent_queue_rep& src, queue_allocator_type& alloc, item_constructor_type construct_item ) {
+        head_counter.store(src.head_counter.load(std::memory_order_relaxed), std::memory_order_relaxed);
+        tail_counter.store(src.tail_counter.load(std::memory_order_relaxed), std::memory_order_relaxed);
+        n_invalid_entries.store(src.n_invalid_entries.load(std::memory_order_relaxed), std::memory_order_relaxed);
+
+        // copy or move micro_queues
+        size_type queue_idx = 0;
+        try_call( [&] {
+            for (; queue_idx < n_queue; ++queue_idx) {
+                array[queue_idx].assign(src.array[queue_idx], alloc, construct_item);
+            }
+        }).on_exception( [&] {
+            for (size_type i = 0; i < queue_idx + 1; ++i) {
+                array[i].clear_and_invalidate(alloc);
+            }
+            head_counter.store(0, std::memory_order_relaxed);
+            tail_counter.store(0, std::memory_order_relaxed);
+            n_invalid_entries.store(0, std::memory_order_relaxed);
+        });
+
+        __TBB_ASSERT(head_counter.load(std::memory_order_relaxed) == src.head_counter.load(std::memory_order_relaxed) &&
+                     tail_counter.load(std::memory_order_relaxed) == src.tail_counter.load(std::memory_order_relaxed),
+                     "the source concurrent queue should not be concurrently modified." );
+    }
+
+    bool empty() const {
+        ticket_type tc = tail_counter.load(std::memory_order_acquire);
+        ticket_type hc = head_counter.load(std::memory_order_relaxed);
+        // if tc!=r.tail_counter, the queue was not empty at some point between the two reads.
+        return tc == tail_counter.load(std::memory_order_relaxed) &&
+               std::ptrdiff_t(tc - hc - n_invalid_entries.load(std::memory_order_relaxed)) <= 0;
+    }
+
+    std::ptrdiff_t size() const {
+        __TBB_ASSERT(sizeof(std::ptrdiff_t) <= sizeof(size_type), nullptr);
+        std::ptrdiff_t hc = head_counter.load(std::memory_order_acquire);
+        std::ptrdiff_t tc = tail_counter.load(std::memory_order_relaxed);
+        std::ptrdiff_t nie = n_invalid_entries.load(std::memory_order_relaxed);
+
+        return tc - hc - nie;
+    }
+
+    friend class micro_queue<T, Allocator>;
+
+    // Map ticket_type to an array index
+    static size_type index( ticket_type k ) {
+        return k * phi % n_queue;
+    }
+
+    micro_queue_type& choose( ticket_type k ) {
+        // The formula here approximates LRU in a cache-oblivious way.
+        return array[index(k)];
+    }
+
+    alignas(max_nfs_size) micro_queue_type array[n_queue];
+
+    alignas(max_nfs_size) std::atomic<ticket_type> head_counter{};
+    alignas(max_nfs_size) std::atomic<ticket_type> tail_counter{};
+    alignas(max_nfs_size) std::atomic<size_type> n_invalid_entries{};
+}; // class concurrent_queue_rep
 
 #if _MSC_VER && !defined(__INTEL_COMPILER)
-#pragma warning(pop)
+#pragma warning( pop )
 #endif
 
-            template <typename Value, typename Allocator>
-            class concurrent_queue_iterator_base {
-                using queue_rep_type = concurrent_queue_rep<Value, Allocator>;
-                using padded_page = typename queue_rep_type::padded_page;
-
-            protected:
-                concurrent_queue_iterator_base() = default;
-
-                concurrent_queue_iterator_base(const concurrent_queue_iterator_base& other) { assign(other); }
-
-                concurrent_queue_iterator_base(queue_rep_type* queue_rep)
-                    : my_queue_rep(queue_rep),
-                      my_head_counter(my_queue_rep->head_counter.load(std::memory_order_relaxed)) {
-                    for (std::size_t i = 0; i < queue_rep_type::n_queue; ++i) {
-                        my_array[i] = my_queue_rep->array[i].get_head_page();
-                    }
-
-                    if (!get_item(my_item, my_head_counter)) advance();
-                }
-
-                void assign(const concurrent_queue_iterator_base& other) {
-                    my_item = other.my_item;
-                    my_queue_rep = other.my_queue_rep;
-
-                    if (my_queue_rep != nullptr) {
-                        my_head_counter = other.my_head_counter;
-
-                        for (std::size_t i = 0; i < queue_rep_type::n_queue; ++i) {
-                            my_array[i] = other.my_array[i];
-                        }
-                    }
-                }
+template <typename Value, typename Allocator>
+class concurrent_queue_iterator_base {
+    using queue_rep_type = concurrent_queue_rep<Value, Allocator>;
+    using padded_page = typename queue_rep_type::padded_page;
+protected:
+    concurrent_queue_iterator_base() = default;
+
+    concurrent_queue_iterator_base( const concurrent_queue_iterator_base& other ) {
+        assign(other);
+    }
+
+    concurrent_queue_iterator_base( queue_rep_type* queue_rep )
+        : my_queue_rep(queue_rep),
+          my_head_counter(my_queue_rep->head_counter.load(std::memory_order_relaxed))
+    {
+        for (std::size_t i = 0; i < queue_rep_type::n_queue; ++i) {
+            my_array[i] = my_queue_rep->array[i].get_head_page();
+        }
+
+        if (!get_item(my_item, my_head_counter)) advance();
+    }
+
+    void assign( const concurrent_queue_iterator_base& other ) {
+        my_item = other.my_item;
+        my_queue_rep = other.my_queue_rep;
+
+        if (my_queue_rep != nullptr) {
+            my_head_counter = other.my_head_counter;
+
+            for (std::size_t i = 0; i < queue_rep_type::n_queue; ++i) {
+                my_array[i] = other.my_array[i];
+            }
+        }
+    }
 
-                void advance() {
-                    __TBB_ASSERT(my_item, "Attempt to increment iterator past end of the queue");
-                    std::size_t k = my_head_counter;
+    void advance() {
+        __TBB_ASSERT(my_item, "Attempt to increment iterator past end of the queue");
+        std::size_t k = my_head_counter;
 #if TBB_USE_ASSERT
-                    Value* tmp;
-                    get_item(tmp, k);
-                    __TBB_ASSERT(my_item == tmp, nullptr);
+        Value* tmp;
+        get_item(tmp, k);
+        __TBB_ASSERT(my_item == tmp, nullptr);
 #endif
-                    std::size_t i
-                            = modulo_power_of_two(k / queue_rep_type::n_queue, my_queue_rep->items_per_page);
-                    if (i == my_queue_rep->items_per_page - 1) {
-                        padded_page*& root = my_array[queue_rep_type::index(k)];
-                        root = root->next;
-                    }
-                    // Advance k
-                    my_head_counter = ++k;
-                    if (!get_item(my_item, k)) advance();
-                }
-
-                concurrent_queue_iterator_base& operator=(const concurrent_queue_iterator_base& other) {
-                    this->assign(other);
-                    return *this;
-                }
-
-                bool get_item(Value*& item, std::size_t k) {
-                    if (k == my_queue_rep->tail_counter.load(std::memory_order_relaxed)) {
-                        item = nullptr;
-                        return true;
-                    } else {
-                        padded_page* p = my_array[queue_rep_type::index(k)];
-                        __TBB_ASSERT(p, nullptr);
-                        std::size_t i = modulo_power_of_two(k / queue_rep_type::n_queue,
-                                                            my_queue_rep->items_per_page);
-                        item = &(*p)[i];
-                        return (p->mask & uintptr_t(1) << i) != 0;
-                    }
-                }
-
-                Value* my_item {nullptr};
-                queue_rep_type* my_queue_rep {nullptr};
-                ticket_type my_head_counter {};
-                padded_page* my_array[queue_rep_type::n_queue] {};
-            };// class concurrent_queue_iterator_base
-
-            struct concurrent_queue_iterator_provider {
-                template <typename Iterator, typename Container>
-                static Iterator get(const Container& container) {
-                    return Iterator(container);
-                }
-            };// struct concurrent_queue_iterator_provider
-
-            template <typename Container, typename Value, typename Allocator>
-            class concurrent_queue_iterator
-                : public concurrent_queue_iterator_base<typename std::remove_cv<Value>::type, Allocator> {
-                using base_type
-                        = concurrent_queue_iterator_base<typename std::remove_cv<Value>::type, Allocator>;
-
-            public:
-                using value_type = Value;
-                using pointer = value_type*;
-                using reference = value_type&;
-                using difference_type = std::ptrdiff_t;
-                using iterator_category = std::forward_iterator_tag;
-
-                concurrent_queue_iterator() = default;
-
-                /** If Value==Container::value_type, then this routine is the copy constructor.
+        std::size_t i = modulo_power_of_two(k / queue_rep_type::n_queue, my_queue_rep->items_per_page);
+        if (i == my_queue_rep->items_per_page - 1) {
+            padded_page*& root = my_array[queue_rep_type::index(k)];
+            root = root->next;
+        }
+        // Advance k
+        my_head_counter = ++k;
+        if (!get_item(my_item, k)) advance();
+    }
+
+    concurrent_queue_iterator_base& operator=( const concurrent_queue_iterator_base& other ) {
+        this->assign(other);
+        return *this;
+    }
+
+    bool get_item( Value*& item, std::size_t k ) {
+        if (k == my_queue_rep->tail_counter.load(std::memory_order_relaxed)) {
+            item = nullptr;
+            return true;
+        } else {
+            padded_page* p = my_array[queue_rep_type::index(k)];
+            __TBB_ASSERT(p, nullptr);
+            std::size_t i = modulo_power_of_two(k / queue_rep_type::n_queue, my_queue_rep->items_per_page);
+            item = &(*p)[i];
+            return (p->mask & uintptr_t(1) << i) != 0;
+        }
+    }
+
+    Value* my_item{ nullptr };
+    queue_rep_type* my_queue_rep{ nullptr };
+    ticket_type my_head_counter{};
+    padded_page* my_array[queue_rep_type::n_queue]{};
+}; // class concurrent_queue_iterator_base
+
+struct concurrent_queue_iterator_provider {
+    template <typename Iterator, typename Container>
+    static Iterator get( const Container& container ) {
+        return Iterator(container);
+    }
+}; // struct concurrent_queue_iterator_provider
+
+template <typename Container, typename Value, typename Allocator>
+class concurrent_queue_iterator : public concurrent_queue_iterator_base<typename std::remove_cv<Value>::type, Allocator> {
+    using base_type = concurrent_queue_iterator_base<typename std::remove_cv<Value>::type, Allocator>;
+public:
+    using value_type = Value;
+    using pointer = value_type*;
+    using reference = value_type&;
+    using difference_type = std::ptrdiff_t;
+    using iterator_category = std::forward_iterator_tag;
+
+    concurrent_queue_iterator() = default;
+
+    /** If Value==Container::value_type, then this routine is the copy constructor.
         If Value==const Container::value_type, then this routine is a conversion constructor. */
-                concurrent_queue_iterator(
-                        const concurrent_queue_iterator<Container, typename Container::value_type, Allocator>&
-                                other)
-                    : base_type(other) {}
-
-            private:
-                concurrent_queue_iterator(const Container& container)
-                    : base_type(container.my_queue_representation) {}
-
-            public:
-                concurrent_queue_iterator&
-                operator=(const concurrent_queue_iterator<Container, typename Container::value_type,
-                                                          Allocator>& other) {
-                    this->assign(other);
-                    return *this;
-                }
-
-                reference operator*() const { return *static_cast<pointer>(this->my_item); }
-
-                pointer operator->() const { return &operator*(); }
-
-                concurrent_queue_iterator& operator++() {
-                    this->advance();
-                    return *this;
-                }
-
-                concurrent_queue_iterator operator++(int) {
-                    concurrent_queue_iterator tmp = *this;
-                    ++*this;
-                    return tmp;
-                }
-
-                friend bool operator==(const concurrent_queue_iterator& lhs,
-                                       const concurrent_queue_iterator& rhs) {
-                    return lhs.my_item == rhs.my_item;
-                }
-
-                friend bool operator!=(const concurrent_queue_iterator& lhs,
-                                       const concurrent_queue_iterator& rhs) {
-                    return lhs.my_item != rhs.my_item;
-                }
-
-            private:
-                friend struct concurrent_queue_iterator_provider;
-            };// class concurrent_queue_iterator
-
-        }// namespace d2
-    }    // namespace detail
-}// namespace tbb
-
-#endif// __TBB_detail__concurrent_queue_base_H
+    concurrent_queue_iterator( const concurrent_queue_iterator<Container, typename Container::value_type, Allocator>& other )
+        : base_type(other) {}
+
+private:
+    concurrent_queue_iterator( const Container& container )
+        : base_type(container.my_queue_representation) {}
+public:
+    concurrent_queue_iterator& operator=( const concurrent_queue_iterator<Container, typename Container::value_type, Allocator>& other ) {
+        this->assign(other);
+        return *this;
+    }
+
+    reference operator*() const {
+        return *static_cast<pointer>(this->my_item);
+    }
+
+    pointer operator->() const { return &operator*(); }
+
+    concurrent_queue_iterator& operator++() {
+        this->advance();
+        return *this;
+    }
+
+    concurrent_queue_iterator operator++(int) {
+        concurrent_queue_iterator tmp = *this;
+        ++*this;
+        return tmp;
+    }
+
+    friend bool operator==( const concurrent_queue_iterator& lhs, const concurrent_queue_iterator& rhs ) {
+        return lhs.my_item == rhs.my_item;
+    }
+
+    friend bool operator!=( const concurrent_queue_iterator& lhs, const concurrent_queue_iterator& rhs ) {
+        return lhs.my_item != rhs.my_item;
+    }
+private:
+    friend struct concurrent_queue_iterator_provider;
+}; // class concurrent_queue_iterator
+
+} // namespace d2
+} // namespace detail
+} // tbb
+
+#endif // __TBB_detail__concurrent_queue_base_H
diff --git a/external/tbb/include/oneapi/tbb/detail/_concurrent_skip_list.h b/external/tbb/include/oneapi/tbb/detail/_concurrent_skip_list.h
index 03fdf1f5..eaaaac81 100644
--- a/external/tbb/include/oneapi/tbb/detail/_concurrent_skip_list.h
+++ b/external/tbb/include/oneapi/tbb/detail/_concurrent_skip_list.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2019-2021 Intel Corporation
+    Copyright (c) 2019-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -21,1225 +21,1270 @@
 #error Do not #include this internal file directly; use public TBB headers instead.
 #endif
 
-#include "../enumerable_thread_specific.h"
-#include "_allocator_traits.h"
-#include "_assert.h"
 #include "_config.h"
-#include "_containers_helpers.h"
-#include "_exception.h"
-#include "_node_handle.h"
 #include "_range_common.h"
+#include "_allocator_traits.h"
 #include "_template_helpers.h"
-#include <algorithm>// Need std::equal and std::lexicographical_compare
-#include <array>
-#include <atomic>
-#include <cstdint>
+#include "_node_handle.h"
+#include "_containers_helpers.h"
+#include "_assert.h"
+#include "_exception.h"
+#include "../enumerable_thread_specific.h"
+#include <utility>
 #include <initializer_list>
-#include <random>// Need std::geometric_distribution
+#include <atomic>
+#include <array>
 #include <type_traits>
-#include <utility>
+#include <random> // Need std::geometric_distribution
+#include <algorithm> // Need std::equal and std::lexicographical_compare
+#include <cstdint>
 #if __TBB_CPP20_COMPARISONS_PRESENT
 #include <compare>
 #endif
 
 #if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
 #pragma warning(push)
-#pragma warning(disable : 4127)// warning C4127: conditional expression is constant
+#pragma warning(disable: 4127) // warning C4127: conditional expression is constant
 #endif
 
 namespace tbb {
-    namespace detail {
-        namespace d2 {
-
-            template <typename Value, typename Allocator>
-            class skip_list_node {
-                using node_ptr = skip_list_node*;
-
-            public:
-                using value_type = Value;
-                using atomic_node_ptr = std::atomic<node_ptr>;
-                using size_type = std::size_t;
-                using container_allocator_type = Allocator;
-
-                using reference = value_type&;
-                using const_reference = const value_type&;
-
-            private:
-                using allocator_traits = tbb::detail::allocator_traits<container_allocator_type>;
-
-                // Allocator is the same as the container allocator=> allocates unitptr_t
-                // It is required to rebind it to value_type to get the correct pointer and const_pointer
-                using value_allocator_traits = typename allocator_traits::template rebind_traits<value_type>;
-
-            public:
-                using pointer = typename value_allocator_traits::pointer;
-                using const_pointer = typename value_allocator_traits::const_pointer;
-
-                //In perfect world these constructor and destructor would have been private,
-                //however this seems technically impractical due to use of allocator_traits.
-
-                //Should not be called directly, instead use create method
-                skip_list_node(size_type levels) : my_height(levels), my_index_number(0) {}
-
-                //Should not be called directly, instead use destroy method
-                ~skip_list_node() {}
-
-                skip_list_node(const skip_list_node&) = delete;
-                skip_list_node(skip_list_node&&) = delete;
-                skip_list_node& operator=(const skip_list_node&) = delete;
-                skip_list_node& operator=(skip_list_node&&) = delete;
-
-                static skip_list_node* create(container_allocator_type& alloc, size_type height) {
-                    size_type sz = calc_node_size(height);
-                    static_assert(std::is_same<typename allocator_traits::value_type, std::uint8_t>::value,
-                                  "skip_list_node assumes that passed in allocator operates on bytes");
-                    auto* node = reinterpret_cast<skip_list_node*>(allocator_traits::allocate(alloc, sz));
-
-                    //Construct the node itself
-                    allocator_traits::construct(alloc, node, height);
-
-                    //Construct the level pointers
-                    for (size_type l = 0; l < height; ++l) {
-                        allocator_traits::construct(alloc, &node->get_atomic_next(l), nullptr);
-                    }
-
-                    return node;
-                }
-
-                static void destroy(container_allocator_type& alloc, skip_list_node* node) {
-                    //Destroy the level pointers
-                    for (size_type l = 0; l < node->height(); ++l) {
-                        allocator_traits::destroy(alloc, &node->atomic_next(l));
-                    }
-                    size_type sz = calc_node_size(node->height());
-                    // Destroy the node itself
-                    allocator_traits::destroy(alloc, node);
-
-                    // Deallocate the node
-                    allocator_traits::deallocate(alloc, reinterpret_cast<std::uint8_t*>(node), sz);
-                }
-
-                pointer storage() { return &my_value; }
-
-                reference value() { return *storage(); }
-
-                node_ptr next(size_type level) const {
-                    node_ptr res = get_atomic_next(level).load(std::memory_order_acquire);
-                    __TBB_ASSERT(res == nullptr || res->height() > level, "Broken internal structure");
-                    return res;
-                }
-
-                atomic_node_ptr& atomic_next(size_type level) {
-                    atomic_node_ptr& res = get_atomic_next(level);
+namespace detail {
+namespace d2 {
+
+template <typename Value, typename Allocator>
+class skip_list_node {
+    using node_ptr = skip_list_node*;
+public:
+    using value_type = Value;
+    using atomic_node_ptr = std::atomic<node_ptr>;
+    using size_type = std::size_t;
+    using container_allocator_type = Allocator;
+
+    using reference = value_type&;
+    using const_reference = const value_type&;
+private:
+    using allocator_traits = tbb::detail::allocator_traits<container_allocator_type>;
+
+    // Allocator is the same as the container allocator=> allocates unitptr_t
+    // It is required to rebind it to value_type to get the correct pointer and const_pointer
+    using value_allocator_traits = typename allocator_traits::template rebind_traits<value_type>;
+public:
+    using pointer = typename value_allocator_traits::pointer;
+    using const_pointer = typename value_allocator_traits::const_pointer;
+
+    //In perfect world these constructor and destructor would have been private,
+    //however this seems technically impractical due to use of allocator_traits.
+
+    //Should not be called directly, instead use create method
+    skip_list_node( size_type levels )
+        : my_height(levels), my_index_number(0)
+    {}
+
+    //Should not be called directly, instead use destroy method
+    ~skip_list_node() {}
+
+    skip_list_node( const skip_list_node& ) = delete;
+    skip_list_node( skip_list_node&& ) = delete;
+    skip_list_node& operator=( const skip_list_node& ) = delete;
+    skip_list_node& operator=( skip_list_node&& ) = delete;
+
+    static skip_list_node* create( container_allocator_type& alloc, size_type height ) {
+        size_type sz = calc_node_size(height);
+        static_assert(std::is_same<typename allocator_traits::value_type, std::uint8_t>::value, "skip_list_node assumes that passed in allocator operates on bytes");
+        auto* node = reinterpret_cast<skip_list_node*>(allocator_traits::allocate(alloc, sz));
+
+        //Construct the node itself
+        allocator_traits::construct(alloc, node, height);
+
+        //Construct the level pointers
+        for (size_type l = 0; l < height; ++l) {
+            allocator_traits::construct(alloc, &node->get_atomic_next(l), nullptr);
+        }
+
+        return node;
+    }
+
+    static void destroy( container_allocator_type& alloc, skip_list_node* node ) {
+        //Destroy the level pointers
+        for (size_type l = 0; l < node->height(); ++l) {
+            allocator_traits::destroy(alloc, &node->atomic_next(l));
+        }
+        size_type sz = calc_node_size(node->height());
+        // Destroy the node itself
+        allocator_traits::destroy(alloc, node);
+
+        // Deallocate the node
+        allocator_traits::deallocate(alloc, reinterpret_cast<std::uint8_t*>(node), sz);
+    }
+
+
+    pointer storage() {
+        return &my_value;
+    }
+
+    reference value() {
+        return *storage();
+    }
+
+    node_ptr next( size_type level ) const {
+        node_ptr res = get_atomic_next(level).load(std::memory_order_acquire);
+        __TBB_ASSERT(res == nullptr || res->height() > level, "Broken internal structure");
+        return res;
+    }
+
+    atomic_node_ptr& atomic_next( size_type level ) {
+        atomic_node_ptr& res = get_atomic_next(level);
 #if TBB_USE_DEBUG
-                    node_ptr node = res.load(std::memory_order_acquire);
-                    __TBB_ASSERT(node == nullptr || node->height() > level, "Broken internal structure");
+        node_ptr node = res.load(std::memory_order_acquire);
+        __TBB_ASSERT(node == nullptr || node->height() > level, "Broken internal structure");
 #endif
-                    return res;
-                }
-
-                void set_next(size_type level, node_ptr n) {
-                    __TBB_ASSERT(n == nullptr || n->height() > level, "Broken internal structure");
-                    get_atomic_next(level).store(n, std::memory_order_relaxed);
-                }
-
-                size_type height() const { return my_height; }
-
-                void set_index_number(size_type index_num) { my_index_number = index_num; }
-
-                size_type index_number() const { return my_index_number; }
-
-            private:
-                static size_type calc_node_size(size_type height) {
-                    static_assert(alignof(skip_list_node) >= alignof(atomic_node_ptr), "Incorrect alignment");
-                    return sizeof(skip_list_node) + height * sizeof(atomic_node_ptr);
-                }
-
-                atomic_node_ptr& get_atomic_next(size_type level) {
-                    atomic_node_ptr* arr = reinterpret_cast<atomic_node_ptr*>(this + 1);
-                    return arr[level];
-                }
-
-                const atomic_node_ptr& get_atomic_next(size_type level) const {
-                    const atomic_node_ptr* arr = reinterpret_cast<const atomic_node_ptr*>(this + 1);
-                    return arr[level];
-                }
-
-                union {
-                    value_type my_value;
-                };
-                size_type my_height;
-                size_type my_index_number;
-            };// class skip_list_node
-
-            template <typename NodeType, typename ValueType>
-            class skip_list_iterator {
-                using node_type = NodeType;
-                using node_ptr = node_type*;
-
-            public:
-                using iterator_category = std::forward_iterator_tag;
-                using value_type = ValueType;
-
-                using difference_type = std::ptrdiff_t;
-                using pointer = value_type*;
-                using reference = value_type&;
-
-                skip_list_iterator() : skip_list_iterator(nullptr) {}
-
-                skip_list_iterator(const skip_list_iterator<node_type, typename node_type::value_type>& other)
-                    : my_node_ptr(other.my_node_ptr) {}
-
-                skip_list_iterator&
-                operator=(const skip_list_iterator<node_type, typename node_type::value_type>& other) {
-                    my_node_ptr = other.my_node_ptr;
-                    return *this;
-                }
-
-                reference operator*() const { return my_node_ptr->value(); }
-                pointer operator->() const { return my_node_ptr->storage(); }
-
-                skip_list_iterator& operator++() {
-                    __TBB_ASSERT(my_node_ptr != nullptr, nullptr);
-                    my_node_ptr = my_node_ptr->next(0);
-                    return *this;
-                }
-
-                skip_list_iterator operator++(int) {
-                    skip_list_iterator tmp = *this;
-                    ++*this;
-                    return tmp;
-                }
-
-            private:
-                skip_list_iterator(node_type* n) : my_node_ptr(n) {}
-
-                node_ptr my_node_ptr;
-
-                template <typename Traits>
-                friend class concurrent_skip_list;
-
-                template <typename N, typename V>
-                friend class skip_list_iterator;
-
-                friend class const_range;
-                friend class range;
-
-                friend bool operator==(const skip_list_iterator& lhs, const skip_list_iterator& rhs) {
-                    return lhs.my_node_ptr == rhs.my_node_ptr;
-                }
-
-                friend bool operator!=(const skip_list_iterator& lhs, const skip_list_iterator& rhs) {
-                    return lhs.my_node_ptr != rhs.my_node_ptr;
-                }
-            };// class skip_list_iterator
-
-            template <typename Traits>
-            class concurrent_skip_list {
-            protected:
-                using container_traits = Traits;
-                using self_type = concurrent_skip_list<container_traits>;
-                using allocator_type = typename container_traits::allocator_type;
-                using allocator_traits_type = tbb::detail::allocator_traits<allocator_type>;
-                using key_compare = typename container_traits::compare_type;
-                using value_compare = typename container_traits::value_compare;
-                using key_type = typename container_traits::key_type;
-                using value_type = typename container_traits::value_type;
-                static_assert(std::is_same<value_type, typename allocator_type::value_type>::value,
-                              "value_type of the container should be the same as its allocator");
-
-                using size_type = std::size_t;
-                using difference_type = std::ptrdiff_t;
-
-                static constexpr size_type max_level = container_traits::max_level;
-
-                using node_allocator_type =
-                        typename allocator_traits_type::template rebind_alloc<std::uint8_t>;
-                using node_allocator_traits = tbb::detail::allocator_traits<node_allocator_type>;
-
-                using list_node_type = skip_list_node<value_type, node_allocator_type>;
-                using node_type = d1::node_handle<key_type, value_type, list_node_type, allocator_type>;
-
-                using iterator = skip_list_iterator<list_node_type, value_type>;
-                using const_iterator = skip_list_iterator<list_node_type, const value_type>;
-
-                using reference = value_type&;
-                using const_reference = const value_type&;
-                using pointer = typename allocator_traits_type::pointer;
-                using const_pointer = typename allocator_traits_type::const_pointer;
-
-                using random_level_generator_type = typename container_traits::random_level_generator_type;
-
-                using node_ptr = list_node_type*;
-
-                using array_type = std::array<node_ptr, max_level>;
-
-            private:
-                template <typename T>
-                using is_transparent = dependent_bool<comp_is_transparent<key_compare>, T>;
-
-            public:
-                static constexpr bool allow_multimapping = container_traits::allow_multimapping;
-
-                concurrent_skip_list() : my_head_ptr(nullptr), my_size(0), my_max_height(0) {}
-
-                explicit concurrent_skip_list(const key_compare& comp,
-                                              const allocator_type& alloc = allocator_type())
-                    : my_node_allocator(alloc), my_compare(comp), my_head_ptr(nullptr), my_size(0),
-                      my_max_height(0) {}
-
-                explicit concurrent_skip_list(const allocator_type& alloc)
-                    : concurrent_skip_list(key_compare(), alloc) {}
-
-                template <typename InputIterator>
-                concurrent_skip_list(InputIterator first, InputIterator last,
-                                     const key_compare& comp = key_compare(),
-                                     const allocator_type& alloc = allocator_type())
-                    : concurrent_skip_list(comp, alloc) {
-                    internal_copy(first, last);
-                }
-
-                template <typename InputIterator>
-                concurrent_skip_list(InputIterator first, InputIterator last, const allocator_type& alloc)
-                    : concurrent_skip_list(first, last, key_compare(), alloc) {}
-
-                concurrent_skip_list(std::initializer_list<value_type> init,
-                                     const key_compare& comp = key_compare(),
-                                     const allocator_type& alloc = allocator_type())
-                    : concurrent_skip_list(init.begin(), init.end(), comp, alloc) {}
-
-                concurrent_skip_list(std::initializer_list<value_type> init, const allocator_type& alloc)
-                    : concurrent_skip_list(init, key_compare(), alloc) {}
-
-                concurrent_skip_list(const concurrent_skip_list& other)
-                    : my_node_allocator(node_allocator_traits::select_on_container_copy_construction(
-                            other.get_allocator())),
-                      my_compare(other.my_compare), my_rng(other.my_rng), my_head_ptr(nullptr), my_size(0),
-                      my_max_height(0) {
-                    internal_copy(other);
-                    __TBB_ASSERT(my_size == other.my_size, "Wrong size of copy-constructed container");
-                }
-
-                concurrent_skip_list(const concurrent_skip_list& other, const allocator_type& alloc)
-                    : my_node_allocator(alloc), my_compare(other.my_compare), my_rng(other.my_rng),
-                      my_head_ptr(nullptr), my_size(0), my_max_height(0) {
-                    internal_copy(other);
-                    __TBB_ASSERT(my_size == other.my_size, "Wrong size of copy-constructed container");
-                }
-
-                concurrent_skip_list(concurrent_skip_list&& other)
-                    : my_node_allocator(std::move(other.my_node_allocator)), my_compare(other.my_compare),
-                      my_rng(std::move(other.my_rng)),
-                      my_head_ptr(nullptr)// my_head_ptr would be stored in internal_move
-                {
-                    internal_move(std::move(other));
-                }
-
-                concurrent_skip_list(concurrent_skip_list&& other, const allocator_type& alloc)
-                    : my_node_allocator(alloc), my_compare(other.my_compare), my_rng(std::move(other.my_rng)),
-                      my_head_ptr(nullptr) {
-                    using is_always_equal = typename allocator_traits_type::is_always_equal;
-                    internal_move_construct_with_allocator(std::move(other), is_always_equal());
-                }
-
-                ~concurrent_skip_list() {
-                    clear();
-                    delete_head();
-                }
-
-                concurrent_skip_list& operator=(const concurrent_skip_list& other) {
-                    if (this != &other) {
-                        clear();
-                        copy_assign_allocators(my_node_allocator, other.my_node_allocator);
-                        my_compare = other.my_compare;
-                        my_rng = other.my_rng;
-                        internal_copy(other);
-                    }
-                    return *this;
-                }
-
-                concurrent_skip_list& operator=(concurrent_skip_list&& other) {
-                    if (this != &other) {
-                        clear();
-                        delete_head();
-
-                        my_compare = std::move(other.my_compare);
-                        my_rng = std::move(other.my_rng);
-
-                        move_assign_allocators(my_node_allocator, other.my_node_allocator);
-                        using pocma_type =
-                                typename node_allocator_traits::propagate_on_container_move_assignment;
-                        using is_always_equal = typename node_allocator_traits::is_always_equal;
-                        internal_move_assign(std::move(other),
-                                             tbb::detail::disjunction<pocma_type, is_always_equal>());
-                    }
-                    return *this;
-                }
-
-                concurrent_skip_list& operator=(std::initializer_list<value_type> il) {
-                    clear();
-                    insert(il.begin(), il.end());
-                    return *this;
-                }
-
-                std::pair<iterator, bool> insert(const value_type& value) { return internal_insert(value); }
-
-                std::pair<iterator, bool> insert(value_type&& value) {
-                    return internal_insert(std::move(value));
-                }
-
-                iterator insert(const_iterator, const_reference value) {
-                    // Ignore hint
-                    return insert(value).first;
-                }
-
-                iterator insert(const_iterator, value_type&& value) {
-                    // Ignore hint
-                    return insert(std::move(value)).first;
-                }
-
-                template <typename InputIterator>
-                void insert(InputIterator first, InputIterator last) {
-                    while (first != last) {
-                        insert(*first);
-                        ++first;
-                    }
-                }
-
-                void insert(std::initializer_list<value_type> init) { insert(init.begin(), init.end()); }
-
-                std::pair<iterator, bool> insert(node_type&& nh) {
-                    if (!nh.empty()) {
-                        auto insert_node = d1::node_handle_accessor::get_node_ptr(nh);
-                        std::pair<iterator, bool> insert_result = internal_insert_node(insert_node);
-                        if (insert_result.second) { d1::node_handle_accessor::deactivate(nh); }
-                        return insert_result;
-                    }
-                    return std::pair<iterator, bool>(end(), false);
-                }
-
-                iterator insert(const_iterator, node_type&& nh) {
-                    // Ignore hint
-                    return insert(std::move(nh)).first;
-                }
-
-                template <typename... Args>
-                std::pair<iterator, bool> emplace(Args&&... args) {
-                    return internal_insert(std::forward<Args>(args)...);
-                }
-
-                template <typename... Args>
-                iterator emplace_hint(const_iterator, Args&&... args) {
-                    // Ignore hint
-                    return emplace(std::forward<Args>(args)...).first;
-                }
-
-                iterator unsafe_erase(iterator pos) {
-                    std::pair<node_ptr, node_ptr> extract_result = internal_extract(pos);
-                    if (extract_result.first) {// node was extracted
-                        delete_value_node(extract_result.first);
-                        return extract_result.second;
-                    }
-                    return end();
-                }
-
-                iterator unsafe_erase(const_iterator pos) { return unsafe_erase(get_iterator(pos)); }
-
-                iterator unsafe_erase(const_iterator first, const_iterator last) {
-                    while (first != last) {
-                        // Unsafe erase returns the iterator which follows the erased one
-                        first = unsafe_erase(first);
-                    }
-                    return get_iterator(first);
-                }
-
-                size_type unsafe_erase(const key_type& key) { return internal_erase(key); }
-
-                template <typename K>
-                typename std::enable_if<is_transparent<K>::value
-                                                && !std::is_convertible<K, const_iterator>::value
-                                                && !std::is_convertible<K, iterator>::value,
-                                        size_type>::type
-                unsafe_erase(const K& key) {
-                    return internal_erase(key);
-                }
-
-                node_type unsafe_extract(const_iterator pos) {
-                    std::pair<node_ptr, node_ptr> extract_result = internal_extract(pos);
-                    return extract_result.first
-                                   ? d1::node_handle_accessor::construct<node_type>(extract_result.first)
-                                   : node_type();
-                }
-
-                node_type unsafe_extract(iterator pos) { return unsafe_extract(const_iterator(pos)); }
-
-                node_type unsafe_extract(const key_type& key) { return unsafe_extract(find(key)); }
-
-                template <typename K>
-                typename std::enable_if<is_transparent<K>::value
-                                                && !std::is_convertible<K, const_iterator>::value
-                                                && !std::is_convertible<K, iterator>::value,
-                                        node_type>::type
-                unsafe_extract(const K& key) {
-                    return unsafe_extract(find(key));
-                }
-
-                iterator lower_bound(const key_type& key) {
-                    return iterator(internal_get_bound(key, my_compare));
-                }
-
-                const_iterator lower_bound(const key_type& key) const {
-                    return const_iterator(internal_get_bound(key, my_compare));
-                }
-
-                template <typename K>
-                typename std::enable_if<is_transparent<K>::value, iterator>::type lower_bound(const K& key) {
-                    return iterator(internal_get_bound(key, my_compare));
-                }
-
-                template <typename K>
-                typename std::enable_if<is_transparent<K>::value, const_iterator>::type
-                lower_bound(const K& key) const {
-                    return const_iterator(internal_get_bound(key, my_compare));
-                }
-
-                iterator upper_bound(const key_type& key) {
-                    return iterator(internal_get_bound(key, not_greater_compare(my_compare)));
-                }
-
-                const_iterator upper_bound(const key_type& key) const {
-                    return const_iterator(internal_get_bound(key, not_greater_compare(my_compare)));
-                }
-
-                template <typename K>
-                typename std::enable_if<is_transparent<K>::value, iterator>::type upper_bound(const K& key) {
-                    return iterator(internal_get_bound(key, not_greater_compare(my_compare)));
-                }
-
-                template <typename K>
-                typename std::enable_if<is_transparent<K>::value, const_iterator>::type
-                upper_bound(const K& key) const {
-                    return const_iterator(internal_get_bound(key, not_greater_compare(my_compare)));
-                }
-
-                iterator find(const key_type& key) { return iterator(internal_find(key)); }
-
-                const_iterator find(const key_type& key) const { return const_iterator(internal_find(key)); }
-
-                template <typename K>
-                typename std::enable_if<is_transparent<K>::value, iterator>::type find(const K& key) {
-                    return iterator(internal_find(key));
-                }
-
-                template <typename K>
-                typename std::enable_if<is_transparent<K>::value, const_iterator>::type
-                find(const K& key) const {
-                    return const_iterator(internal_find(key));
-                }
-
-                size_type count(const key_type& key) const { return internal_count(key); }
-
-                template <typename K>
-                typename std::enable_if<is_transparent<K>::value, size_type>::type count(const K& key) const {
-                    return internal_count(key);
-                }
-
-                bool contains(const key_type& key) const { return find(key) != end(); }
-
-                template <typename K>
-                typename std::enable_if<is_transparent<K>::value, bool>::type contains(const K& key) const {
-                    return find(key) != end();
-                }
-
-                void clear() noexcept {
-                    // clear is not thread safe - load can be relaxed
-                    node_ptr head = my_head_ptr.load(std::memory_order_relaxed);
-
-                    if (head == nullptr) return;// Head is not allocated => container is empty
-
-                    node_ptr current = head->next(0);
-
-                    // Delete all value nodes in the container
-                    while (current) {
-                        node_ptr next = current->next(0);
-                        delete_value_node(current);
-                        current = next;
-                    }
-
-                    for (size_type level = 0; level < head->height(); ++level) {
-                        head->set_next(level, nullptr);
-                    }
-
-                    my_size.store(0, std::memory_order_relaxed);
-                    my_max_height.store(0, std::memory_order_relaxed);
-                }
-
-                iterator begin() { return iterator(internal_begin()); }
-
-                const_iterator begin() const { return const_iterator(internal_begin()); }
-
-                const_iterator cbegin() const { return const_iterator(internal_begin()); }
-
-                iterator end() { return iterator(nullptr); }
-
-                const_iterator end() const { return const_iterator(nullptr); }
-
-                const_iterator cend() const { return const_iterator(nullptr); }
-
-                size_type size() const { return my_size.load(std::memory_order_relaxed); }
-
-                size_type max_size() const { return node_allocator_traits::max_size(my_node_allocator); }
-
-                __TBB_nodiscard bool empty() const { return 0 == size(); }
-
-                allocator_type get_allocator() const { return my_node_allocator; }
-
-                void swap(concurrent_skip_list& other) {
-                    if (this != &other) {
-                        using pocs_type = typename node_allocator_traits::propagate_on_container_swap;
-                        using is_always_equal = typename node_allocator_traits::is_always_equal;
-                        internal_swap(other, tbb::detail::disjunction<pocs_type, is_always_equal>());
-                    }
-                }
-
-                std::pair<iterator, iterator> equal_range(const key_type& key) {
-                    return internal_equal_range(key);
-                }
-
-                std::pair<const_iterator, const_iterator> equal_range(const key_type& key) const {
-                    return internal_equal_range(key);
-                }
-
-                template <typename K>
-                typename std::enable_if<is_transparent<K>::value, std::pair<iterator, iterator>>::type
-                equal_range(const K& key) {
-                    return internal_equal_range(key);
-                }
-
-                template <typename K>
-                typename std::enable_if<is_transparent<K>::value,
-                                        std::pair<const_iterator, const_iterator>>::type
-                equal_range(const K& key) const {
-                    return internal_equal_range(key);
-                }
-
-                key_compare key_comp() const { return my_compare; }
-
-                value_compare value_comp() const { return container_traits::value_comp(my_compare); }
-
-                class const_range_type {
-                public:
-                    using size_type = typename concurrent_skip_list::size_type;
-                    using difference_type = typename concurrent_skip_list::difference_type;
-                    using iterator = typename concurrent_skip_list::const_iterator;
-                    using value_type = typename iterator::value_type;
-                    using reference = typename iterator::reference;
-
-                    bool empty() const { return my_begin.my_node_ptr->next(0) == my_end.my_node_ptr; }
-
-                    bool is_divisible() const {
-                        return my_level != 0 ? my_begin.my_node_ptr->next(my_level - 1) != my_end.my_node_ptr
-                                             : false;
-                    }
-
-                    size_type size() const { return std::distance(my_begin, my_end); }
-
-                    const_range_type(const_range_type& r, split) : my_end(r.my_end) {
-                        my_begin = iterator(r.my_begin.my_node_ptr->next(r.my_level - 1));
-                        my_level = my_begin.my_node_ptr->height();
-                        r.my_end = my_begin;
-                    }
-
-                    const_range_type(const concurrent_skip_list& l)
-                        : my_end(l.end()), my_begin(l.begin()), my_level(my_begin.my_node_ptr->height()) {}
-
-                    iterator begin() const { return my_begin; }
-                    iterator end() const { return my_end; }
-                    size_type grainsize() const { return 1; }
-
-                private:
-                    const_iterator my_end;
-                    const_iterator my_begin;
-                    size_type my_level;
-                };// class const_range_type
-
-                class range_type : public const_range_type {
-                public:
-                    using iterator = typename concurrent_skip_list::iterator;
-                    using value_type = typename iterator::value_type;
-                    using reference = typename iterator::reference;
-
-                    range_type(range_type& r, split) : const_range_type(r, split()) {}
-                    range_type(const concurrent_skip_list& l) : const_range_type(l) {}
-
-                    iterator begin() const {
-                        node_ptr node = const_range_type::begin().my_node_ptr;
-                        return iterator(node);
-                    }
-
-                    iterator end() const {
-                        node_ptr node = const_range_type::end().my_node_ptr;
-                        return iterator(node);
-                    }
-                };// class range_type
-
-                range_type range() { return range_type(*this); }
-                const_range_type range() const { return const_range_type(*this); }
-
-            private:
-                node_ptr internal_begin() const {
-                    node_ptr head = get_head();
-                    return head == nullptr ? head : head->next(0);
-                }
-
-                void internal_move(concurrent_skip_list&& other) {
-                    my_head_ptr.store(other.my_head_ptr.load(std::memory_order_relaxed),
-                                      std::memory_order_relaxed);
-                    other.my_head_ptr.store(nullptr, std::memory_order_relaxed);
-
-                    my_size.store(other.my_size.load(std::memory_order_relaxed), std::memory_order_relaxed);
-                    other.my_size.store(0, std::memory_order_relaxed);
-
-                    my_max_height.store(other.my_max_height.load(std::memory_order_relaxed),
-                                        std::memory_order_relaxed);
-                    other.my_max_height.store(0, std::memory_order_relaxed);
-                }
-
-                void internal_move_construct_with_allocator(concurrent_skip_list&& other,
-                                                            /*is_always_equal = */ std::true_type) {
-                    internal_move(std::move(other));
-                }
-
-                void internal_move_construct_with_allocator(concurrent_skip_list&& other,
-                                                            /*is_always_equal = */ std::false_type) {
-                    if (my_node_allocator == other.get_allocator()) {
-                        internal_move(std::move(other));
-                    } else {
-                        my_size.store(0, std::memory_order_relaxed);
-                        my_max_height.store(other.my_max_height.load(std::memory_order_relaxed),
-                                            std::memory_order_relaxed);
-                        internal_copy(std::make_move_iterator(other.begin()),
-                                      std::make_move_iterator(other.end()));
-                    }
-                }
-
-                static const key_type& get_key(node_ptr n) {
-                    __TBB_ASSERT(n, nullptr);
-                    return container_traits::get_key(static_cast<node_ptr>(n)->value());
-                }
-
-                template <typename K>
-                bool found(node_ptr node, const K& key) const {
-                    return node != nullptr && !my_compare(key, get_key(node));
-                }
-
-                template <typename K>
-                node_ptr internal_find(const K& key) const {
-                    return allow_multimapping ? internal_find_multi(key) : internal_find_unique(key);
-                }
-
-                template <typename K>
-                node_ptr internal_find_multi(const K& key) const {
-                    node_ptr prev = get_head();
-                    if (prev == nullptr) return nullptr;// If the head node is not allocated - exit
-
-                    node_ptr curr = nullptr;
-                    node_ptr old_curr = curr;
-
-                    for (size_type h = my_max_height.load(std::memory_order_acquire); h > 0; --h) {
-                        curr = internal_find_position(h - 1, prev, key, my_compare);
-
-                        if (curr != old_curr && found(curr, key)) { return curr; }
-                        old_curr = curr;
-                    }
-                    return nullptr;
-                }
-
-                template <typename K>
-                node_ptr internal_find_unique(const K& key) const {
-                    const_iterator it = lower_bound(key);
-                    return (it == end() || my_compare(key, container_traits::get_key(*it))) ? nullptr
-                                                                                            : it.my_node_ptr;
-                }
-
-                template <typename K>
-                size_type internal_count(const K& key) const {
-                    if (allow_multimapping) {
-                        // TODO: reimplement without double traversal
-                        std::pair<const_iterator, const_iterator> r = equal_range(key);
-                        return std::distance(r.first, r.second);
-                    }
-                    return size_type(contains(key) ? 1 : 0);
-                }
-
-                template <typename K>
-                std::pair<iterator, iterator> internal_equal_range(const K& key) const {
-                    iterator lb = get_iterator(lower_bound(key));
-                    auto result = std::make_pair(lb, lb);
-
-                    // If the lower bound points to the node with the requested key
-                    if (found(lb.my_node_ptr, key)) {
-
-                        if (!allow_multimapping) {
-                            // For unique containers - move the second iterator forward and exit
-                            ++result.second;
-                        } else {
-                            // For multi containers - find the upper bound starting from the lower bound
-                            node_ptr prev = lb.my_node_ptr;
-                            node_ptr curr = nullptr;
-                            not_greater_compare cmp(my_compare);
-
-                            // Start from the lower bound of the range
-                            for (size_type h = prev->height(); h > 0; --h) {
-                                curr = prev->next(h - 1);
-                                while (curr && cmp(get_key(curr), key)) {
-                                    prev = curr;
-                                    // If the height of the next node is greater than the current one - jump to its height
-                                    if (h < curr->height()) { h = curr->height(); }
-                                    curr = prev->next(h - 1);
-                                }
-                            }
-                            result.second = iterator(curr);
-                        }
-                    }
-
-                    return result;
-                }
-
-                // Finds position on the level using comparator cmp starting from the node prev
-                template <typename K, typename Comparator>
-                node_ptr internal_find_position(size_type level, node_ptr& prev, const K& key,
-                                                const Comparator& cmp) const {
-                    __TBB_ASSERT(level < prev->height(), "Wrong level to find position");
-                    node_ptr curr = prev->next(level);
-
+        return res;
+    }
+
+    void set_next( size_type level, node_ptr n ) {
+        __TBB_ASSERT(n == nullptr || n->height() > level, "Broken internal structure");
+        get_atomic_next(level).store(n, std::memory_order_relaxed);
+    }
+
+    size_type height() const {
+        return my_height;
+    }
+
+    void set_index_number( size_type index_num ) {
+        my_index_number = index_num;
+    }
+
+    size_type index_number() const {
+        return my_index_number;
+    }
+
+private:
+    static size_type calc_node_size( size_type height ) {
+        static_assert(alignof(skip_list_node) >= alignof(atomic_node_ptr), "Incorrect alignment");
+        return sizeof(skip_list_node) + height * sizeof(atomic_node_ptr);
+    }
+
+    atomic_node_ptr& get_atomic_next( size_type level ) {
+        atomic_node_ptr* arr = reinterpret_cast<atomic_node_ptr*>(this + 1);
+        return arr[level];
+    }
+
+    const atomic_node_ptr& get_atomic_next( size_type level ) const {
+        const atomic_node_ptr* arr = reinterpret_cast<const atomic_node_ptr*>(this + 1);
+        return arr[level];
+    }
+
+    union {
+        value_type my_value;
+    };
+    size_type my_height;
+    size_type my_index_number;
+}; // class skip_list_node
+
+template <typename NodeType, typename ValueType>
+class skip_list_iterator {
+    using node_type = NodeType;
+    using node_ptr = node_type*;
+public:
+    using iterator_category = std::forward_iterator_tag;
+    using value_type = ValueType;
+
+    using difference_type = std::ptrdiff_t;
+    using pointer = value_type*;
+    using reference = value_type&;
+
+    skip_list_iterator() : skip_list_iterator(nullptr) {}
+
+    skip_list_iterator( const skip_list_iterator<node_type, typename node_type::value_type>& other )
+        : my_node_ptr(other.my_node_ptr) {}
+
+    skip_list_iterator& operator=( const skip_list_iterator<node_type, typename node_type::value_type>& other ) {
+        my_node_ptr = other.my_node_ptr;
+        return *this;
+    }
+
+    reference operator*() const { return my_node_ptr->value(); }
+    pointer operator->() const { return my_node_ptr->storage(); }
+
+    skip_list_iterator& operator++() {
+        __TBB_ASSERT(my_node_ptr != nullptr, nullptr);
+        my_node_ptr = my_node_ptr->next(0);
+        return *this;
+    }
+
+    skip_list_iterator operator++(int) {
+        skip_list_iterator tmp = *this;
+        ++*this;
+        return tmp;
+    }
+
+private:
+    skip_list_iterator(node_type* n) : my_node_ptr(n) {}
+
+    node_ptr my_node_ptr;
+
+    template <typename Traits>
+    friend class concurrent_skip_list;
+
+    template <typename N, typename V>
+    friend class skip_list_iterator;
+
+    friend class const_range;
+    friend class range;
+
+    friend bool operator==( const skip_list_iterator& lhs, const skip_list_iterator& rhs ) {
+        return lhs.my_node_ptr == rhs.my_node_ptr;
+    }
+
+    friend bool operator!=( const skip_list_iterator& lhs, const skip_list_iterator& rhs ) {
+        return lhs.my_node_ptr != rhs.my_node_ptr;
+    }
+}; // class skip_list_iterator
+
+template <typename Traits>
+class concurrent_skip_list {
+protected:
+    using container_traits = Traits;
+    using self_type = concurrent_skip_list<container_traits>;
+    using allocator_type = typename container_traits::allocator_type;
+    using allocator_traits_type = tbb::detail::allocator_traits<allocator_type>;
+    using key_compare = typename container_traits::compare_type;
+    using value_compare = typename container_traits::value_compare;
+    using key_type = typename container_traits::key_type;
+    using value_type = typename container_traits::value_type;
+    static_assert(std::is_same<value_type, typename allocator_type::value_type>::value,
+                  "value_type of the container should be the same as its allocator");
+
+    using size_type = std::size_t;
+    using difference_type = std::ptrdiff_t;
+
+    static constexpr size_type max_level = container_traits::max_level;
+
+    using node_allocator_type = typename allocator_traits_type::template rebind_alloc<std::uint8_t>;
+    using node_allocator_traits = tbb::detail::allocator_traits<node_allocator_type>;
+
+    using list_node_type = skip_list_node<value_type, node_allocator_type>;
+    using node_type = d1::node_handle<key_type, value_type, list_node_type, allocator_type>;
+
+    using iterator = skip_list_iterator<list_node_type, value_type>;
+    using const_iterator = skip_list_iterator<list_node_type, const value_type>;
+
+    using reference = value_type&;
+    using const_reference = const value_type&;
+    using pointer = typename allocator_traits_type::pointer;
+    using const_pointer = typename allocator_traits_type::const_pointer;
+
+    using random_level_generator_type = typename container_traits::random_level_generator_type;
+
+    using node_ptr = list_node_type*;
+
+    using array_type = std::array<node_ptr, max_level>;
+private:
+    template <typename T>
+    using is_transparent = dependent_bool<comp_is_transparent<key_compare>, T>;
+public:
+    static constexpr bool allow_multimapping = container_traits::allow_multimapping;
+
+    concurrent_skip_list() : my_head_ptr(nullptr), my_size(0), my_max_height(0) {}
+
+    explicit concurrent_skip_list( const key_compare& comp, const allocator_type& alloc = allocator_type() )
+        : my_node_allocator(alloc), my_compare(comp), my_head_ptr(nullptr), my_size(0), my_max_height(0) {}
+
+    explicit concurrent_skip_list( const allocator_type& alloc )
+        : concurrent_skip_list(key_compare(), alloc) {}
+
+    template<typename InputIterator>
+    concurrent_skip_list( InputIterator first, InputIterator last, const key_compare& comp = key_compare(),
+                          const allocator_type& alloc = allocator_type() )
+        : concurrent_skip_list(comp, alloc)
+    {
+        internal_copy(first, last);
+    }
+
+    template <typename InputIterator>
+    concurrent_skip_list( InputIterator first, InputIterator last, const allocator_type& alloc )
+        : concurrent_skip_list(first, last, key_compare(), alloc) {}
+
+    concurrent_skip_list( std::initializer_list<value_type> init, const key_compare& comp = key_compare(),
+                          const allocator_type& alloc = allocator_type() )
+        : concurrent_skip_list(init.begin(), init.end(), comp, alloc) {}
+
+    concurrent_skip_list( std::initializer_list<value_type> init, const allocator_type& alloc )
+        : concurrent_skip_list(init, key_compare(), alloc) {}
+
+    concurrent_skip_list( const concurrent_skip_list& other )
+        : my_node_allocator(node_allocator_traits::select_on_container_copy_construction(other.get_allocator())),
+          my_compare(other.my_compare), my_rng(other.my_rng), my_head_ptr(nullptr),
+          my_size(0), my_max_height(0)
+    {
+        internal_copy(other);
+        __TBB_ASSERT(my_size == other.my_size, "Wrong size of copy-constructed container");
+    }
+
+    concurrent_skip_list( const concurrent_skip_list& other, const allocator_type& alloc )
+        : my_node_allocator(alloc), my_compare(other.my_compare), my_rng(other.my_rng), my_head_ptr(nullptr),
+          my_size(0), my_max_height(0)
+    {
+        internal_copy(other);
+        __TBB_ASSERT(my_size == other.my_size, "Wrong size of copy-constructed container");
+    }
+
+    concurrent_skip_list( concurrent_skip_list&& other )
+        : my_node_allocator(std::move(other.my_node_allocator)), my_compare(other.my_compare),
+          my_rng(std::move(other.my_rng)), my_head_ptr(nullptr) // my_head_ptr would be stored in internal_move
+    {
+        internal_move(std::move(other));
+    }
+
+    concurrent_skip_list( concurrent_skip_list&& other, const allocator_type& alloc )
+        : my_node_allocator(alloc), my_compare(other.my_compare),
+          my_rng(std::move(other.my_rng)), my_head_ptr(nullptr)
+    {
+        using is_always_equal = typename allocator_traits_type::is_always_equal;
+        internal_move_construct_with_allocator(std::move(other), is_always_equal());
+    }
+
+    ~concurrent_skip_list() {
+        clear();
+        delete_head();
+    }
+
+    concurrent_skip_list& operator=( const concurrent_skip_list& other ) {
+        if (this != &other) {
+            clear();
+            copy_assign_allocators(my_node_allocator, other.my_node_allocator);
+            my_compare = other.my_compare;
+            my_rng = other.my_rng;
+            internal_copy(other);
+        }
+        return *this;
+    }
+
+    concurrent_skip_list& operator=( concurrent_skip_list&& other ) {
+        if (this != &other) {
+            clear();
+            delete_head();
+
+            my_compare = std::move(other.my_compare);
+            my_rng = std::move(other.my_rng);
+
+            move_assign_allocators(my_node_allocator, other.my_node_allocator);
+            using pocma_type = typename node_allocator_traits::propagate_on_container_move_assignment;
+            using is_always_equal = typename node_allocator_traits::is_always_equal;
+            internal_move_assign(std::move(other), tbb::detail::disjunction<pocma_type, is_always_equal>());
+        }
+        return *this;
+    }
+
+    concurrent_skip_list& operator=( std::initializer_list<value_type> il )
+    {
+        clear();
+        insert(il.begin(),il.end());
+        return *this;
+    }
+
+    std::pair<iterator, bool> insert( const value_type& value ) {
+        return internal_insert(value);
+    }
+
+    std::pair<iterator, bool> insert( value_type&& value ) {
+        return internal_insert(std::move(value));
+    }
+
+    iterator insert( const_iterator, const_reference value ) {
+        // Ignore hint
+        return insert(value).first;
+    }
+
+    iterator insert( const_iterator, value_type&& value ) {
+        // Ignore hint
+        return insert(std::move(value)).first;
+    }
+
+    template<typename InputIterator>
+    void insert( InputIterator first, InputIterator last ) {
+        while (first != last) {
+            insert(*first);
+            ++first;
+        }
+    }
+
+    void insert( std::initializer_list<value_type> init ) {
+        insert(init.begin(), init.end());
+    }
+
+    std::pair<iterator, bool> insert( node_type&& nh ) {
+        if (!nh.empty()) {
+            auto insert_node = d1::node_handle_accessor::get_node_ptr(nh);
+            std::pair<iterator, bool> insert_result = internal_insert_node(insert_node);
+            if (insert_result.second) {
+                d1::node_handle_accessor::deactivate(nh);
+            }
+            return insert_result;
+        }
+        return std::pair<iterator, bool>(end(), false);
+    }
+
+    iterator insert( const_iterator, node_type&& nh ) {
+        // Ignore hint
+        return insert(std::move(nh)).first;
+    }
+
+    template<typename... Args>
+    std::pair<iterator, bool> emplace( Args&&... args ) {
+        return internal_insert(std::forward<Args>(args)...);
+    }
+
+    template<typename... Args>
+    iterator emplace_hint( const_iterator, Args&&... args ) {
+        // Ignore hint
+        return emplace(std::forward<Args>(args)...).first;
+    }
+
+    iterator unsafe_erase( iterator pos ) {
+        std::pair<node_ptr, node_ptr> extract_result = internal_extract(pos);
+        if (extract_result.first) { // node was extracted
+            delete_value_node(extract_result.first);
+            return extract_result.second;
+        }
+        return end();
+    }
+
+    iterator unsafe_erase( const_iterator pos ) {
+        return unsafe_erase(get_iterator(pos));
+    }
+
+    iterator unsafe_erase( const_iterator first, const_iterator last ) {
+        while (first != last) {
+            // Unsafe erase returns the iterator which follows the erased one
+            first = unsafe_erase(first);
+        }
+        return get_iterator(first);
+    }
+
+    size_type unsafe_erase( const key_type& key ) {
+        return internal_erase(key);
+    }
+
+    template <typename K>
+    typename std::enable_if<is_transparent<K>::value
+                            && !std::is_convertible<K, const_iterator>::value
+                            && !std::is_convertible<K, iterator>::value,
+                            size_type>::type unsafe_erase( const K& key )
+    {
+        return internal_erase(key);
+    }
+
+    node_type unsafe_extract( const_iterator pos ) {
+        std::pair<node_ptr, node_ptr> extract_result = internal_extract(pos);
+        return extract_result.first ? d1::node_handle_accessor::construct<node_type>(extract_result.first) : node_type();
+    }
+
+    node_type unsafe_extract( iterator pos ) {
+        return unsafe_extract(const_iterator(pos));
+    }
+
+    node_type unsafe_extract( const key_type& key ) {
+        return unsafe_extract(find(key));
+    }
+
+    template <typename K>
+    typename std::enable_if<is_transparent<K>::value
+                            && !std::is_convertible<K, const_iterator>::value
+                            && !std::is_convertible<K, iterator>::value,
+                            node_type>::type unsafe_extract( const K& key )
+    {
+        return unsafe_extract(find(key));
+    }
+
+    iterator lower_bound( const key_type& key ) {
+        return iterator(internal_get_bound(key, my_compare));
+    }
+
+    const_iterator lower_bound( const key_type& key ) const {
+        return const_iterator(internal_get_bound(key, my_compare));
+    }
+
+    template <typename K>
+    typename std::enable_if<is_transparent<K>::value, iterator>::type lower_bound( const K& key ) {
+        return iterator(internal_get_bound(key, my_compare));
+    }
+
+    template <typename K>
+    typename std::enable_if<is_transparent<K>::value, const_iterator>::type lower_bound( const K& key ) const {
+        return const_iterator(internal_get_bound(key, my_compare));
+    }
+
+    iterator upper_bound( const key_type& key ) {
+        return iterator(internal_get_bound(key, not_greater_compare(my_compare)));
+    }
+
+    const_iterator upper_bound( const key_type& key ) const {
+        return const_iterator(internal_get_bound(key, not_greater_compare(my_compare)));
+    }
+
+    template <typename K>
+    typename std::enable_if<is_transparent<K>::value, iterator>::type upper_bound( const K& key ) {
+        return iterator(internal_get_bound(key, not_greater_compare(my_compare)));
+    }
+
+    template <typename K>
+    typename std::enable_if<is_transparent<K>::value, const_iterator>::type upper_bound( const K& key ) const {
+        return const_iterator(internal_get_bound(key, not_greater_compare(my_compare)));
+    }
+
+    iterator find( const key_type& key ) {
+        return iterator(internal_find(key));
+    }
+
+    const_iterator find( const key_type& key ) const {
+        return const_iterator(internal_find(key));
+    }
+
+    template <typename K>
+    typename std::enable_if<is_transparent<K>::value, iterator>::type find( const K& key ) {
+        return iterator(internal_find(key));
+    }
+
+    template <typename K>
+    typename std::enable_if<is_transparent<K>::value, const_iterator>::type find( const K& key ) const {
+        return const_iterator(internal_find(key));
+    }
+
+    size_type count( const key_type& key ) const {
+        return internal_count(key);
+    }
+
+    template <typename K>
+    typename std::enable_if<is_transparent<K>::value, size_type>::type count( const K& key ) const {
+        return internal_count(key);
+    }
+
+    bool contains( const key_type& key ) const {
+        return find(key) != end();
+    }
+
+    template <typename K>
+    typename std::enable_if<is_transparent<K>::value, bool>::type contains( const K& key ) const {
+        return find(key) != end();
+    }
+
+    void clear() noexcept {
+        // clear is not thread safe - load can be relaxed
+        node_ptr head = my_head_ptr.load(std::memory_order_relaxed);
+
+        if (head == nullptr) return; // Head is not allocated => container is empty
+
+        node_ptr current = head->next(0);
+
+        // Delete all value nodes in the container
+        while (current) {
+            node_ptr next = current->next(0);
+            delete_value_node(current);
+            current = next;
+        }
+
+        for (size_type level = 0; level < head->height(); ++level) {
+            head->set_next(level, nullptr);
+        }
+
+        my_size.store(0, std::memory_order_relaxed);
+        my_max_height.store(0, std::memory_order_relaxed);
+    }
+
+    iterator begin() {
+        return iterator(internal_begin());
+    }
+
+    const_iterator begin() const {
+        return const_iterator(internal_begin());
+    }
+
+    const_iterator cbegin() const {
+        return const_iterator(internal_begin());
+    }
+
+    iterator end() {
+        return iterator(nullptr);
+    }
+
+    const_iterator end() const {
+        return const_iterator(nullptr);
+    }
+
+    const_iterator cend() const {
+        return const_iterator(nullptr);
+    }
+
+    size_type size() const {
+        return my_size.load(std::memory_order_relaxed);
+    }
+
+    size_type max_size() const {
+        return node_allocator_traits::max_size(my_node_allocator);
+    }
+
+    __TBB_nodiscard bool empty() const {
+        return 0 == size();
+    }
+
+    allocator_type get_allocator() const {
+        return my_node_allocator;
+    }
+
+    void swap(concurrent_skip_list& other) {
+        if (this != &other) {
+            using pocs_type = typename node_allocator_traits::propagate_on_container_swap;
+            using is_always_equal = typename node_allocator_traits::is_always_equal;
+            internal_swap(other, tbb::detail::disjunction<pocs_type, is_always_equal>());
+        }
+    }
+
+    std::pair<iterator, iterator> equal_range(const key_type& key) {
+        return internal_equal_range(key);
+    }
+
+    std::pair<const_iterator, const_iterator> equal_range(const key_type& key) const {
+        return internal_equal_range(key);
+    }
+
+    template <typename K>
+    typename std::enable_if<is_transparent<K>::value, std::pair<iterator, iterator>>::type equal_range( const K& key ) {
+        return internal_equal_range(key);
+    }
+
+    template <typename K>
+    typename std::enable_if<is_transparent<K>::value, std::pair<const_iterator, const_iterator>>::type equal_range( const K& key ) const {
+        return internal_equal_range(key);
+    }
+
+    key_compare key_comp() const { return my_compare; }
+
+    value_compare value_comp() const { return container_traits::value_comp(my_compare); }
+
+    class const_range_type {
+    public:
+        using size_type = typename concurrent_skip_list::size_type;
+        using difference_type = typename concurrent_skip_list::difference_type;
+        using iterator = typename concurrent_skip_list::const_iterator;
+        using value_type = typename iterator::value_type;
+        using reference = typename iterator::reference;
+
+        bool empty() const {
+            return my_begin.my_node_ptr ? (my_begin.my_node_ptr->next(0) == my_end.my_node_ptr)
+                                        : true;
+        }
+
+        bool is_divisible() const {
+            return my_begin.my_node_ptr && my_level != 0
+                        ? my_begin.my_node_ptr->next(my_level - 1) != my_end.my_node_ptr
+                        : false;
+        }
+
+        size_type size() const { return std::distance(my_begin, my_end); }
+
+        const_range_type( const_range_type& r, split)
+            : my_end(r.my_end) {
+            if (r.empty()) {
+                __TBB_ASSERT(my_end.my_node_ptr == nullptr, nullptr);
+                my_begin = my_end;
+                my_level = 0;
+            } else {
+                my_begin = iterator(r.my_begin.my_node_ptr->next(r.my_level - 1));
+                my_level = my_begin.my_node_ptr->height();
+            }
+            r.my_end = my_begin;
+        }
+
+        const_range_type( const concurrent_skip_list& l)
+            : my_end(l.end()), my_begin(l.begin()),
+              my_level(my_begin.my_node_ptr ? my_begin.my_node_ptr->height() : 0) {}
+
+        iterator begin() const { return my_begin; }
+        iterator end() const { return my_end; }
+        size_type grainsize() const { return 1; }
+
+    private:
+        const_iterator my_end;
+        const_iterator my_begin;
+        size_type my_level;
+    }; // class const_range_type
+
+    class range_type : public const_range_type {
+    public:
+        using iterator = typename concurrent_skip_list::iterator;
+        using value_type = typename iterator::value_type;
+        using reference = typename iterator::reference;
+
+        range_type(range_type& r, split) : const_range_type(r, split()) {}
+        range_type(const concurrent_skip_list& l) : const_range_type(l) {}
+
+        iterator begin() const {
+            node_ptr node = const_range_type::begin().my_node_ptr;
+            return iterator(node);
+        }
+
+        iterator end() const {
+            node_ptr node = const_range_type::end().my_node_ptr;
+            return iterator(node);
+        }
+    }; // class range_type
+
+    range_type range() { return range_type(*this); }
+    const_range_type range() const { return const_range_type(*this); }
+
+private:
+    node_ptr internal_begin() const {
+        node_ptr head = get_head();
+        return head == nullptr ? head : head->next(0);
+    }
+
+    void internal_move(concurrent_skip_list&& other) {
+        my_head_ptr.store(other.my_head_ptr.load(std::memory_order_relaxed), std::memory_order_relaxed);
+        other.my_head_ptr.store(nullptr, std::memory_order_relaxed);
+
+        my_size.store(other.my_size.load(std::memory_order_relaxed), std::memory_order_relaxed);
+        other.my_size.store(0, std::memory_order_relaxed);
+
+        my_max_height.store(other.my_max_height.load(std::memory_order_relaxed), std::memory_order_relaxed);
+        other.my_max_height.store(0, std::memory_order_relaxed);
+    }
+
+    void internal_move_construct_with_allocator(concurrent_skip_list&& other,
+                                                /*is_always_equal = */std::true_type) {
+        internal_move(std::move(other));
+    }
+
+    void internal_move_construct_with_allocator(concurrent_skip_list&& other,
+                                                /*is_always_equal = */std::false_type) {
+        if (my_node_allocator == other.get_allocator()) {
+            internal_move(std::move(other));
+        } else {
+            my_size.store(0, std::memory_order_relaxed);
+            my_max_height.store(other.my_max_height.load(std::memory_order_relaxed), std::memory_order_relaxed);
+            internal_copy(std::make_move_iterator(other.begin()), std::make_move_iterator(other.end()));
+        }
+    }
+
+    static const key_type& get_key( node_ptr n ) {
+        __TBB_ASSERT(n, nullptr);
+        return container_traits::get_key(static_cast<node_ptr>(n)->value());
+    }
+
+    template <typename K>
+    bool found( node_ptr node, const K& key ) const {
+        return node != nullptr && !my_compare(key, get_key(node));
+    }
+
+    template <typename K>
+    node_ptr internal_find(const K& key) const {
+        return allow_multimapping ? internal_find_multi(key) : internal_find_unique(key);
+    }
+
+    template <typename K>
+    node_ptr internal_find_multi( const K& key ) const {
+        node_ptr prev = get_head();
+        if (prev == nullptr) return nullptr; // If the head node is not allocated - exit
+
+        node_ptr curr = nullptr;
+        node_ptr old_curr = curr;
+
+        for (size_type h = my_max_height.load(std::memory_order_acquire); h > 0; --h) {
+            curr = internal_find_position(h - 1, prev, key, my_compare);
+
+            if (curr != old_curr && found(curr, key)) {
+                return curr;
+            }
+            old_curr = curr;
+        }
+        return nullptr;
+    }
+
+    template <typename K>
+    node_ptr internal_find_unique( const K& key ) const {
+        const_iterator it = lower_bound(key);
+        return (it == end() || my_compare(key, container_traits::get_key(*it))) ? nullptr : it.my_node_ptr;
+    }
+
+    template <typename K>
+    size_type internal_count( const K& key ) const {
+        if (allow_multimapping) {
+            // TODO: reimplement without double traversal
+            std::pair<const_iterator, const_iterator> r = equal_range(key);
+            return std::distance(r.first, r.second);
+        }
+        return size_type(contains(key) ? 1 : 0);
+    }
+
+    template <typename K>
+    std::pair<iterator, iterator> internal_equal_range(const K& key) const {
+        iterator lb = get_iterator(lower_bound(key));
+        auto result = std::make_pair(lb, lb);
+
+        // If the lower bound points to the node with the requested key
+        if (found(lb.my_node_ptr, key)) {
+
+            if (!allow_multimapping) {
+                // For unique containers - move the second iterator forward and exit
+                ++result.second;
+            } else {
+                // For multi containers - find the upper bound starting from the lower bound
+                node_ptr prev = lb.my_node_ptr;
+                node_ptr curr = nullptr;
+                not_greater_compare cmp(my_compare);
+
+                // Start from the lower bound of the range
+                for (size_type h = prev->height(); h > 0; --h) {
+                    curr = prev->next(h - 1);
                     while (curr && cmp(get_key(curr), key)) {
                         prev = curr;
-                        __TBB_ASSERT(level < prev->height(), nullptr);
-                        curr = prev->next(level);
-                    }
-
-                    return curr;
-                }
-
-                // The same as previous overload, but allows index_number comparison
-                template <typename Comparator>
-                node_ptr internal_find_position(size_type level, node_ptr& prev, node_ptr node,
-                                                const Comparator& cmp) const {
-                    __TBB_ASSERT(level < prev->height(), "Wrong level to find position");
-                    node_ptr curr = prev->next(level);
-
-                    while (curr && cmp(get_key(curr), get_key(node))) {
-                        if (allow_multimapping && cmp(get_key(node), get_key(curr))
-                            && curr->index_number() > node->index_number()) {
-                            break;
+                        // If the height of the next node is greater than the current one - jump to its height
+                        if (h < curr->height()) {
+                            h = curr->height();
                         }
-
-                        prev = curr;
-                        __TBB_ASSERT(level < prev->height(), nullptr);
-                        curr = prev->next(level);
+                        curr = prev->next(h - 1);
                     }
-                    return curr;
-                }
-
-                template <typename Comparator>
-                void fill_prev_curr_arrays(array_type& prev_nodes, array_type& curr_nodes, node_ptr node,
-                                           const key_type& key, const Comparator& cmp, node_ptr head) {
-
-                    size_type curr_max_height = my_max_height.load(std::memory_order_acquire);
-                    size_type node_height = node->height();
-                    if (curr_max_height < node_height) {
-                        std::fill(prev_nodes.begin() + curr_max_height, prev_nodes.begin() + node_height,
-                                  head);
-                        std::fill(curr_nodes.begin() + curr_max_height, curr_nodes.begin() + node_height,
-                                  nullptr);
-                    }
-
-                    node_ptr prev = head;
-                    for (size_type level = curr_max_height; level > 0; --level) {
-                        node_ptr curr = internal_find_position(level - 1, prev, key, cmp);
-                        prev_nodes[level - 1] = prev;
-                        curr_nodes[level - 1] = curr;
-                    }
-                }
-
-                void fill_prev_array_for_existing_node(array_type& prev_nodes, node_ptr node) {
-                    node_ptr head = create_head_if_necessary();
-                    prev_nodes.fill(head);
-
-                    node_ptr prev = head;
-                    for (size_type level = node->height(); level > 0; --level) {
-                        while (prev->next(level - 1) != node) { prev = prev->next(level - 1); }
-                        prev_nodes[level - 1] = prev;
-                    }
-                }
-
-                struct not_greater_compare {
-                    const key_compare& my_less_compare;
-
-                    not_greater_compare(const key_compare& less_compare) : my_less_compare(less_compare) {}
-
-                    template <typename K1, typename K2>
-                    bool operator()(const K1& first, const K2& second) const {
-                        return !my_less_compare(second, first);
-                    }
-                };
-
-                not_greater_compare select_comparator(/*allow_multimapping = */ std::true_type) {
-                    return not_greater_compare(my_compare);
-                }
-
-                key_compare select_comparator(/*allow_multimapping = */ std::false_type) {
-                    return my_compare;
-                }
-
-                template <typename... Args>
-                std::pair<iterator, bool> internal_insert(Args&&... args) {
-                    node_ptr new_node = create_value_node(std::forward<Args>(args)...);
-                    std::pair<iterator, bool> insert_result = internal_insert_node(new_node);
-                    if (!insert_result.second) { delete_value_node(new_node); }
-                    return insert_result;
-                }
-
-                std::pair<iterator, bool> internal_insert_node(node_ptr new_node) {
-                    array_type prev_nodes;
-                    array_type curr_nodes;
-                    size_type new_height = new_node->height();
-                    auto compare = select_comparator(std::integral_constant<bool, allow_multimapping> {});
-
-                    node_ptr head_node = create_head_if_necessary();
-
-                    for (;;) {
-                        fill_prev_curr_arrays(prev_nodes, curr_nodes, new_node, get_key(new_node), compare,
-                                              head_node);
-
-                        node_ptr prev = prev_nodes[0];
-                        node_ptr next = curr_nodes[0];
-
-                        if (allow_multimapping) {
-                            new_node->set_index_number(prev->index_number() + 1);
-                        } else {
-                            if (found(next, get_key(new_node))) {
-                                return std::pair<iterator, bool>(iterator(next), false);
-                            }
-                        }
-
-                        new_node->set_next(0, next);
-                        if (!prev->atomic_next(0).compare_exchange_strong(next, new_node)) { continue; }
-
-                        // If the node was successfully linked on the first level - it will be linked on other levels
-                        // Insertion cannot fail starting from this point
-
-                        // If the height of inserted node is greater than maximum - increase maximum
-                        size_type max_height = my_max_height.load(std::memory_order_acquire);
-                        for (;;) {
-                            if (new_height <= max_height
-                                || my_max_height.compare_exchange_strong(max_height, new_height)) {
-                                // If the maximum was successfully updated by current thread
-                                // or by an other thread for the value, greater or equal to new_height
-                                break;
-                            }
-                        }
-
-                        for (std::size_t level = 1; level < new_height; ++level) {
-                            // Link the node on upper levels
-                            for (;;) {
-                                prev = prev_nodes[level];
-                                next = static_cast<node_ptr>(curr_nodes[level]);
-
-                                new_node->set_next(level, next);
-                                __TBB_ASSERT(new_node->height() > level, "Internal structure break");
-                                if (prev->atomic_next(level).compare_exchange_strong(next, new_node)) {
-                                    break;
-                                }
-
-                                for (size_type lev = level; lev != new_height; ++lev) {
-                                    curr_nodes[lev]
-                                            = internal_find_position(lev, prev_nodes[lev], new_node, compare);
-                                }
-                            }
-                        }
-                        ++my_size;
-                        return std::pair<iterator, bool>(iterator(new_node), true);
-                    }
-                }
-
-                template <typename K, typename Comparator>
-                node_ptr internal_get_bound(const K& key, const Comparator& cmp) const {
-                    node_ptr prev = get_head();
-                    if (prev == nullptr) return nullptr;// If the head node is not allocated - exit
-
-                    node_ptr curr = nullptr;
-
-                    for (size_type h = my_max_height.load(std::memory_order_acquire); h > 0; --h) {
-                        curr = internal_find_position(h - 1, prev, key, cmp);
-                    }
-
-                    return curr;
-                }
-
-                template <typename K>
-                size_type internal_erase(const K& key) {
-                    auto eq = equal_range(key);
-                    size_type old_size = size();
-                    unsafe_erase(eq.first, eq.second);
-                    return old_size - size();
-                }
-
-                // Returns node_ptr to the extracted node and node_ptr to the next node after the extracted
-                std::pair<node_ptr, node_ptr> internal_extract(const_iterator it) {
-                    std::pair<node_ptr, node_ptr> result(nullptr, nullptr);
-                    if (it != end()) {
-                        array_type prev_nodes;
-
-                        node_ptr erase_node = it.my_node_ptr;
-                        node_ptr next_node = erase_node->next(0);
-                        fill_prev_array_for_existing_node(prev_nodes, erase_node);
-
-                        for (size_type level = 0; level < erase_node->height(); ++level) {
-                            prev_nodes[level]->set_next(level, erase_node->next(level));
-                            erase_node->set_next(level, nullptr);
-                        }
-                        my_size.fetch_sub(1, std::memory_order_relaxed);
-
-                        result.first = erase_node;
-                        result.second = next_node;
-                    }
-                    return result;
-                }
-
-            protected:
-                template <typename SourceType>
-                void internal_merge(SourceType&& source) {
-                    using source_type = typename std::decay<SourceType>::type;
-                    using source_iterator = typename source_type::iterator;
-                    static_assert((std::is_same<node_type, typename source_type::node_type>::value),
-                                  "Incompatible containers cannot be merged");
-
-                    for (source_iterator it = source.begin(); it != source.end();) {
-                        source_iterator where = it++;
-                        if (allow_multimapping || !contains(container_traits::get_key(*where))) {
-                            node_type handle = source.unsafe_extract(where);
-                            __TBB_ASSERT(!handle.empty(), "Extracted handle in merge is empty");
-
-                            if (!insert(std::move(handle)).second) {
-                                //If the insertion fails - return the node into source
-                                source.insert(std::move(handle));
-                            }
-                            __TBB_ASSERT(handle.empty(), "Node handle should be empty after the insertion");
-                        }
-                    }
-                }
-
-            private:
-                void internal_copy(const concurrent_skip_list& other) {
-                    internal_copy(other.begin(), other.end());
-                }
-
-                template <typename Iterator>
-                void internal_copy(Iterator first, Iterator last) {
-                    try_call([&] {
-                        for (auto it = first; it != last; ++it) { insert(*it); }
-                    }).on_exception([&] {
-                        clear();
-                        delete_head();
-                    });
                 }
+                result.second = iterator(curr);
+            }
+        }
+
+        return result;
+    }
+
+    // Finds position on the level using comparator cmp starting from the node prev
+    template <typename K, typename Comparator>
+    node_ptr internal_find_position( size_type level, node_ptr& prev, const K& key,
+                                     const Comparator& cmp ) const {
+        __TBB_ASSERT(level < prev->height(), "Wrong level to find position");
+        node_ptr curr = prev->next(level);
+
+        while (curr && cmp(get_key(curr), key)) {
+            prev = curr;
+            __TBB_ASSERT(level < prev->height(), nullptr);
+            curr = prev->next(level);
+        }
+
+        return curr;
+    }
+
+    // The same as previous overload, but allows index_number comparison
+    template <typename Comparator>
+    node_ptr internal_find_position( size_type level, node_ptr& prev, node_ptr node,
+                                     const Comparator& cmp ) const {
+        __TBB_ASSERT(level < prev->height(), "Wrong level to find position");
+        node_ptr curr = prev->next(level);
+
+        while (curr && cmp(get_key(curr), get_key(node))) {
+            if (allow_multimapping && cmp(get_key(node), get_key(curr)) && curr->index_number() > node->index_number()) {
+                break;
+            }
 
-                node_ptr create_node(size_type height) {
-                    return list_node_type::create(my_node_allocator, height);
+            prev = curr;
+            __TBB_ASSERT(level < prev->height(), nullptr);
+            curr = prev->next(level);
+        }
+        return curr;
+    }
+
+    template <typename Comparator>
+    void fill_prev_curr_arrays(array_type& prev_nodes, array_type& curr_nodes, node_ptr node, const key_type& key,
+                               const Comparator& cmp, node_ptr head ) {
+
+        size_type curr_max_height = my_max_height.load(std::memory_order_acquire);
+        size_type node_height = node->height();
+        if (curr_max_height < node_height) {
+            std::fill(prev_nodes.begin() + curr_max_height, prev_nodes.begin() + node_height, head);
+            std::fill(curr_nodes.begin() + curr_max_height, curr_nodes.begin() + node_height, nullptr);
+        }
+
+        node_ptr prev = head;
+        for (size_type level = curr_max_height; level > 0; --level) {
+            node_ptr curr = internal_find_position(level - 1, prev, key, cmp);
+            prev_nodes[level - 1] = prev;
+            curr_nodes[level - 1] = curr;
+        }
+    }
+
+    void fill_prev_array_for_existing_node( array_type& prev_nodes, node_ptr node ) {
+        node_ptr head = create_head_if_necessary();
+        prev_nodes.fill(head);
+
+        node_ptr prev = head;
+        for (size_type level = node->height(); level > 0; --level) {
+            while (prev->next(level - 1) != node) {
+                prev = prev->next(level - 1);
+            }
+            prev_nodes[level - 1] = prev;
+        }
+    }
+
+    struct not_greater_compare {
+        const key_compare& my_less_compare;
+
+        not_greater_compare( const key_compare& less_compare ) : my_less_compare(less_compare) {}
+
+        template <typename K1, typename K2>
+        bool operator()( const K1& first, const K2& second ) const {
+            return !my_less_compare(second, first);
+        }
+    };
+
+    not_greater_compare select_comparator( /*allow_multimapping = */ std::true_type ) {
+        return not_greater_compare(my_compare);
+    }
+
+    key_compare select_comparator( /*allow_multimapping = */ std::false_type ) {
+        return my_compare;
+    }
+
+    template<typename... Args>
+    std::pair<iterator, bool> internal_insert( Args&&... args ) {
+        node_ptr new_node = create_value_node(std::forward<Args>(args)...);
+        std::pair<iterator, bool> insert_result = internal_insert_node(new_node);
+        if (!insert_result.second) {
+            delete_value_node(new_node);
+        }
+        return insert_result;
+    }
+
+    std::pair<iterator, bool> internal_insert_node( node_ptr new_node ) {
+        array_type prev_nodes;
+        array_type curr_nodes;
+        size_type new_height = new_node->height();
+        auto compare = select_comparator(std::integral_constant<bool, allow_multimapping>{});
+
+        node_ptr head_node = create_head_if_necessary();
+
+        for (;;) {
+            fill_prev_curr_arrays(prev_nodes, curr_nodes, new_node, get_key(new_node), compare, head_node);
+
+            node_ptr prev = prev_nodes[0];
+            node_ptr next = curr_nodes[0];
+
+            if (allow_multimapping) {
+                new_node->set_index_number(prev->index_number() + 1);
+            } else {
+                if (found(next, get_key(new_node))) {
+                    return std::pair<iterator, bool>(iterator(next), false);
                 }
+            }
 
-                template <typename... Args>
-                node_ptr create_value_node(Args&&... args) {
-                    node_ptr node = create_node(my_rng());
-
-                    // try_call API is not convenient here due to broken
-                    // variadic capture on GCC 4.8.5
-                    auto value_guard = make_raii_guard([&] { delete_node(node); });
-
-                    // Construct the value inside the node
-                    node_allocator_traits::construct(my_node_allocator, node->storage(),
-                                                     std::forward<Args>(args)...);
-                    value_guard.dismiss();
-                    return node;
-                }
+            new_node->set_next(0, next);
+            if (!prev->atomic_next(0).compare_exchange_strong(next, new_node)) {
+                continue;
+            }
 
-                node_ptr create_head_node() { return create_node(max_level); }
+            // If the node was successfully linked on the first level - it will be linked on other levels
+            // Insertion cannot fail starting from this point
 
-                void delete_head() {
-                    node_ptr head = my_head_ptr.load(std::memory_order_relaxed);
-                    if (head != nullptr) {
-                        delete_node(head);
-                        my_head_ptr.store(nullptr, std::memory_order_relaxed);
-                    }
+            // If the height of inserted node is greater than maximum - increase maximum
+            size_type max_height = my_max_height.load(std::memory_order_acquire);
+            for (;;) {
+                if (new_height <= max_height || my_max_height.compare_exchange_strong(max_height, new_height)) {
+                    // If the maximum was successfully updated by current thread
+                    // or by an other thread for the value, greater or equal to new_height
+                    break;
                 }
+            }
 
-                void delete_node(node_ptr node) { list_node_type::destroy(my_node_allocator, node); }
-
-                void delete_value_node(node_ptr node) {
-                    // Destroy the value inside the node
-                    node_allocator_traits::destroy(my_node_allocator, node->storage());
-                    delete_node(node);
-                }
+            for (std::size_t level = 1; level < new_height; ++level) {
+                // Link the node on upper levels
+                for (;;) {
+                    prev = prev_nodes[level];
+                    next = static_cast<node_ptr>(curr_nodes[level]);
 
-                node_ptr get_head() const { return my_head_ptr.load(std::memory_order_acquire); }
-
-                node_ptr create_head_if_necessary() {
-                    node_ptr current_head = get_head();
-                    if (current_head == nullptr) {
-                        // Head node was not created - create it
-                        node_ptr new_head = create_head_node();
-                        if (my_head_ptr.compare_exchange_strong(current_head, new_head)) {
-                            current_head = new_head;
-                        } else {
-                            // If an other thread has already created the head node - destroy new_head
-                            // current_head now points to the actual head node
-                            delete_node(new_head);
-                        }
+                    new_node->set_next(level, next);
+                    __TBB_ASSERT(new_node->height() > level, "Internal structure break");
+                    if (prev->atomic_next(level).compare_exchange_strong(next, new_node)) {
+                        break;
                     }
-                    __TBB_ASSERT(my_head_ptr.load(std::memory_order_relaxed) != nullptr, nullptr);
-                    __TBB_ASSERT(current_head != nullptr, nullptr);
-                    return current_head;
-                }
-
-                static iterator get_iterator(const_iterator it) { return iterator(it.my_node_ptr); }
 
-                void internal_move_assign(concurrent_skip_list&& other,
-                                          /*POCMA || is_always_equal =*/std::true_type) {
-                    internal_move(std::move(other));
-                }
-
-                void internal_move_assign(concurrent_skip_list&& other,
-                                          /*POCMA || is_always_equal =*/std::false_type) {
-                    if (my_node_allocator == other.my_node_allocator) {
-                        internal_move(std::move(other));
-                    } else {
-                        internal_copy(std::make_move_iterator(other.begin()),
-                                      std::make_move_iterator(other.end()));
+                    for (size_type lev = level; lev != new_height; ++lev ) {
+                        curr_nodes[lev] = internal_find_position(lev, prev_nodes[lev], new_node, compare);
                     }
                 }
-
-                void internal_swap_fields(concurrent_skip_list& other) {
-                    using std::swap;
-                    swap_allocators(my_node_allocator, other.my_node_allocator);
-                    swap(my_compare, other.my_compare);
-                    swap(my_rng, other.my_rng);
-
-                    swap_atomics_relaxed(my_head_ptr, other.my_head_ptr);
-                    swap_atomics_relaxed(my_size, other.my_size);
-                    swap_atomics_relaxed(my_max_height, other.my_max_height);
-                }
-
-                void internal_swap(concurrent_skip_list& other,
-                                   /*POCMA || is_always_equal =*/std::true_type) {
-                    internal_swap_fields(other);
-                }
-
-                void internal_swap(concurrent_skip_list& other,
-                                   /*POCMA || is_always_equal =*/std::false_type) {
-                    __TBB_ASSERT(my_node_allocator == other.my_node_allocator,
-                                 "Swapping with unequal allocators is not allowed");
-                    internal_swap_fields(other);
-                }
-
-                node_allocator_type my_node_allocator;
-                key_compare my_compare;
-                random_level_generator_type my_rng;
-                std::atomic<list_node_type*> my_head_ptr;
-                std::atomic<size_type> my_size;
-                std::atomic<size_type> my_max_height;
-
-                template <typename OtherTraits>
-                friend class concurrent_skip_list;
-            };// class concurrent_skip_list
-
-            template <typename Traits>
-            bool operator==(const concurrent_skip_list<Traits>& lhs,
-                            const concurrent_skip_list<Traits>& rhs) {
-                if (lhs.size() != rhs.size()) return false;
+            }
+            ++my_size;
+            return std::pair<iterator, bool>(iterator(new_node), true);
+        }
+    }
+
+    template <typename K, typename Comparator>
+    node_ptr internal_get_bound( const K& key, const Comparator& cmp ) const {
+        node_ptr prev = get_head();
+        if (prev == nullptr) return nullptr; // If the head node is not allocated - exit
+
+        node_ptr curr = nullptr;
+
+        for (size_type h = my_max_height.load(std::memory_order_acquire); h > 0; --h) {
+            curr = internal_find_position(h - 1, prev, key, cmp);
+        }
+
+        return curr;
+    }
+
+    template <typename K>
+    size_type internal_erase( const K& key ) {
+        auto eq = equal_range(key);
+        size_type old_size = size();
+        unsafe_erase(eq.first, eq.second);
+        return old_size - size();
+    }
+
+    // Returns node_ptr to the extracted node and node_ptr to the next node after the extracted
+    std::pair<node_ptr, node_ptr> internal_extract( const_iterator it ) {
+        std::pair<node_ptr, node_ptr> result(nullptr, nullptr);
+        if ( it != end() ) {
+            array_type prev_nodes;
+
+            node_ptr erase_node = it.my_node_ptr;
+            node_ptr next_node = erase_node->next(0);
+            fill_prev_array_for_existing_node(prev_nodes, erase_node);
+
+            for (size_type level = 0; level < erase_node->height(); ++level) {
+                prev_nodes[level]->set_next(level, erase_node->next(level));
+                erase_node->set_next(level, nullptr);
+            }
+            my_size.fetch_sub(1, std::memory_order_relaxed);
+
+            result.first = erase_node;
+            result.second = next_node;
+        }
+        return result;
+    }
+
+protected:
+    template<typename SourceType>
+    void internal_merge( SourceType&& source ) {
+        using source_type = typename std::decay<SourceType>::type;
+        using source_iterator = typename source_type::iterator;
+        static_assert((std::is_same<node_type, typename source_type::node_type>::value), "Incompatible containers cannot be merged");
+
+        for (source_iterator it = source.begin(); it != source.end();) {
+            source_iterator where = it++;
+            if (allow_multimapping || !contains(container_traits::get_key(*where))) {
+                node_type handle = source.unsafe_extract(where);
+                __TBB_ASSERT(!handle.empty(), "Extracted handle in merge is empty");
+
+                if (!insert(std::move(handle)).second) {
+                    __TBB_ASSERT(!handle.empty(), "Handle should not be empty if insert fails");
+                    //If the insertion fails - return the node into source
+                    source.insert(std::move(handle));
+                }
+                __TBB_ASSERT(handle.empty(), "Node handle should be empty after the insertion");
+            }
+        }
+    }
+
+private:
+    void internal_copy( const concurrent_skip_list& other ) {
+        internal_copy(other.begin(), other.end());
+    }
+
+    template<typename Iterator>
+    void internal_copy( Iterator first, Iterator last ) {
+        try_call([&] {
+            for (auto it = first; it != last; ++it) {
+                insert(*it);
+            }
+        }).on_exception([&] {
+            clear();
+            delete_head();
+        });
+    }
+
+    node_ptr create_node( size_type height ) {
+        return list_node_type::create(my_node_allocator, height);
+    }
+
+    template <typename... Args>
+    node_ptr create_value_node( Args&&... args ) {
+        node_ptr node = create_node(my_rng());
+
+        // try_call API is not convenient here due to broken
+        // variadic capture on GCC 4.8.5
+        auto value_guard = make_raii_guard([&] {
+            delete_node(node);
+        });
+
+        // Construct the value inside the node
+        node_allocator_traits::construct(my_node_allocator, node->storage(), std::forward<Args>(args)...);
+        value_guard.dismiss();
+        return node;
+    }
+
+    node_ptr create_head_node() {
+        return create_node(max_level);
+    }
+
+    void delete_head() {
+        node_ptr head = my_head_ptr.load(std::memory_order_relaxed);
+        if (head != nullptr) {
+            delete_node(head);
+            my_head_ptr.store(nullptr, std::memory_order_relaxed);
+        }
+    }
+
+    void delete_node( node_ptr node ) {
+        list_node_type::destroy(my_node_allocator, node);
+    }
+
+    void delete_value_node( node_ptr node ) {
+        // Destroy the value inside the node
+        node_allocator_traits::destroy(my_node_allocator, node->storage());
+        delete_node(node);
+    }
+
+    node_ptr get_head() const {
+        return my_head_ptr.load(std::memory_order_acquire);
+    }
+
+    node_ptr create_head_if_necessary() {
+        node_ptr current_head = get_head();
+        if (current_head == nullptr) {
+            // Head node was not created - create it
+            node_ptr new_head = create_head_node();
+            if (my_head_ptr.compare_exchange_strong(current_head, new_head)) {
+                current_head = new_head;
+            } else {
+                // If an other thread has already created the head node - destroy new_head
+                // current_head now points to the actual head node
+                delete_node(new_head);
+            }
+        }
+        __TBB_ASSERT(my_head_ptr.load(std::memory_order_relaxed) != nullptr, nullptr);
+        __TBB_ASSERT(current_head != nullptr, nullptr);
+        return current_head;
+    }
+
+    static iterator get_iterator( const_iterator it ) {
+        return iterator(it.my_node_ptr);
+    }
+
+    void internal_move_assign( concurrent_skip_list&& other, /*POCMA || is_always_equal =*/std::true_type ) {
+        internal_move(std::move(other));
+    }
+
+    void internal_move_assign( concurrent_skip_list&& other, /*POCMA || is_always_equal =*/std::false_type ) {
+        if (my_node_allocator == other.my_node_allocator) {
+            internal_move(std::move(other));
+        } else {
+            internal_copy(std::make_move_iterator(other.begin()), std::make_move_iterator(other.end()));
+        }
+    }
+
+    void internal_swap_fields( concurrent_skip_list& other ) {
+        using std::swap;
+        swap_allocators(my_node_allocator, other.my_node_allocator);
+        swap(my_compare, other.my_compare);
+        swap(my_rng, other.my_rng);
+
+        swap_atomics_relaxed(my_head_ptr, other.my_head_ptr);
+        swap_atomics_relaxed(my_size, other.my_size);
+        swap_atomics_relaxed(my_max_height, other.my_max_height);
+    }
+
+    void internal_swap( concurrent_skip_list& other, /*POCMA || is_always_equal =*/std::true_type ) {
+        internal_swap_fields(other);
+    }
+
+    void internal_swap( concurrent_skip_list& other, /*POCMA || is_always_equal =*/std::false_type ) {
+        __TBB_ASSERT(my_node_allocator == other.my_node_allocator, "Swapping with unequal allocators is not allowed");
+        internal_swap_fields(other);
+    }
+
+    node_allocator_type my_node_allocator;
+    key_compare my_compare;
+    random_level_generator_type my_rng;
+    std::atomic<list_node_type*> my_head_ptr;
+    std::atomic<size_type> my_size;
+    std::atomic<size_type> my_max_height;
+
+    template<typename OtherTraits>
+    friend class concurrent_skip_list;
+}; // class concurrent_skip_list
+
+template <typename Traits>
+bool operator==( const concurrent_skip_list<Traits>& lhs, const concurrent_skip_list<Traits>& rhs ) {
+    if (lhs.size() != rhs.size()) return false;
 #if _MSC_VER
-                // Passing "unchecked" iterators to std::equal with 3 parameters
-                // causes compiler warnings.
-                // The workaround is to use overload with 4 parameters, which is
-                // available since C++14 - minimally supported version on MSVC
-                return std::equal(lhs.begin(), lhs.end(), rhs.begin(), rhs.end());
+    // Passing "unchecked" iterators to std::equal with 3 parameters
+    // causes compiler warnings.
+    // The workaround is to use overload with 4 parameters, which is
+    // available since C++14 - minimally supported version on MSVC
+    return std::equal(lhs.begin(), lhs.end(), rhs.begin(), rhs.end());
 #else
-                return std::equal(lhs.begin(), lhs.end(), rhs.begin());
+    return std::equal(lhs.begin(), lhs.end(), rhs.begin());
 #endif
-            }
+}
 
 #if !__TBB_CPP20_COMPARISONS_PRESENT
-            template <typename Traits>
-            bool operator!=(const concurrent_skip_list<Traits>& lhs,
-                            const concurrent_skip_list<Traits>& rhs) {
-                return !(lhs == rhs);
-            }
+template <typename Traits>
+bool operator!=( const concurrent_skip_list<Traits>& lhs, const concurrent_skip_list<Traits>& rhs ) {
+    return !(lhs == rhs);
+}
 #endif
 
 #if __TBB_CPP20_COMPARISONS_PRESENT && __TBB_CPP20_CONCEPTS_PRESENT
-            template <typename Traits>
-            tbb::detail::synthesized_three_way_result<typename Traits::value_type>
-            operator<=>(const concurrent_skip_list<Traits>& lhs, const concurrent_skip_list<Traits>& rhs) {
-                return std::lexicographical_compare_three_way(
-                        lhs.begin(), lhs.end(), rhs.begin(), rhs.end(),
-                        tbb::detail::synthesized_three_way_comparator {});
-            }
+template <typename Traits>
+tbb::detail::synthesized_three_way_result<typename Traits::value_type>
+operator<=>( const concurrent_skip_list<Traits>& lhs, const concurrent_skip_list<Traits>& rhs ) {
+    return std::lexicographical_compare_three_way(lhs.begin(), lhs.end(),
+                                                  rhs.begin(), rhs.end(),
+                                                  tbb::detail::synthesized_three_way_comparator{});
+}
 #else
-            template <typename Traits>
-            bool operator<(const concurrent_skip_list<Traits>& lhs, const concurrent_skip_list<Traits>& rhs) {
-                return std::lexicographical_compare(lhs.begin(), lhs.end(), rhs.begin(), rhs.end());
-            }
-
-            template <typename Traits>
-            bool operator>(const concurrent_skip_list<Traits>& lhs, const concurrent_skip_list<Traits>& rhs) {
-                return rhs < lhs;
-            }
-
-            template <typename Traits>
-            bool operator<=(const concurrent_skip_list<Traits>& lhs,
-                            const concurrent_skip_list<Traits>& rhs) {
-                return !(rhs < lhs);
-            }
-
-            template <typename Traits>
-            bool operator>=(const concurrent_skip_list<Traits>& lhs,
-                            const concurrent_skip_list<Traits>& rhs) {
-                return !(lhs < rhs);
-            }
-#endif// __TBB_CPP20_COMPARISONS_PRESENT && __TBB_CPP20_CONCEPTS_PRESENT
-
-            // Generates a number from the interval [0, MaxLevel).
-            template <std::size_t MaxLevel>
-            class concurrent_geometric_level_generator {
-            public:
-                static constexpr std::size_t max_level = MaxLevel;
-                // TODO: modify the algorithm to accept other values of max_level
-                static_assert(max_level == 32, "Incompatible max_level for rng");
-
-                concurrent_geometric_level_generator()
-                    : engines(std::minstd_rand::result_type(time(nullptr))) {}
-
-                std::size_t operator()() {
-                    // +1 is required to pass at least 1 into log2 (log2(0) is undefined)
-                    // -1 is required to have an ability to return 0 from the generator (max_level - log2(2^31) - 1)
-                    std::size_t result
-                            = max_level - std::size_t(tbb::detail::log2(engines.local()() + 1)) - 1;
-                    __TBB_ASSERT(result <= max_level, nullptr);
-                    return result;
-                }
-
-            private:
-                tbb::enumerable_thread_specific<std::minstd_rand> engines;
-            };
-
-        }// namespace d2
-
-    }// namespace detail
-}// namespace tbb
+template <typename Traits>
+bool operator<( const concurrent_skip_list<Traits>& lhs, const concurrent_skip_list<Traits>& rhs ) {
+    return std::lexicographical_compare(lhs.begin(), lhs.end(), rhs.begin(), rhs.end());
+}
+
+template <typename Traits>
+bool operator>( const concurrent_skip_list<Traits>& lhs, const concurrent_skip_list<Traits>& rhs ) {
+    return rhs < lhs;
+}
+
+template <typename Traits>
+bool operator<=( const concurrent_skip_list<Traits>& lhs, const concurrent_skip_list<Traits>& rhs ) {
+    return !(rhs < lhs);
+}
+
+template <typename Traits>
+bool operator>=( const concurrent_skip_list<Traits>& lhs, const concurrent_skip_list<Traits>& rhs ) {
+    return !(lhs < rhs);
+}
+#endif // __TBB_CPP20_COMPARISONS_PRESENT && __TBB_CPP20_CONCEPTS_PRESENT
+
+// Generates a number from the interval [0, MaxLevel).
+template <std::size_t MaxLevel>
+class concurrent_geometric_level_generator {
+public:
+    static constexpr std::size_t max_level = MaxLevel;
+    // TODO: modify the algorithm to accept other values of max_level
+    static_assert(max_level == 32, "Incompatible max_level for rng");
+
+    concurrent_geometric_level_generator() : engines(std::minstd_rand::result_type(time(nullptr))) {}
+
+    std::size_t operator()() {
+        // +1 is required to pass at least 1 into log2 (log2(0) is undefined)
+        // -1 is required to have an ability to return 0 from the generator (max_level - log2(2^31) - 1)
+        std::size_t result = max_level - std::size_t(tbb::detail::log2(engines.local()() + 1)) - 1;
+        __TBB_ASSERT(result <= max_level, nullptr);
+        return result;
+    }
+
+private:
+    tbb::enumerable_thread_specific<std::minstd_rand> engines;
+};
+
+} // namespace d2
+
+} // namespace detail
+} // namespace tbb
 
 #if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
-#pragma warning(pop)// warning 4127 is back
+#pragma warning(pop) // warning 4127 is back
 #endif
 
-#endif// __TBB_detail__concurrent_skip_list_H
+#endif // __TBB_detail__concurrent_skip_list_H
diff --git a/external/tbb/include/oneapi/tbb/detail/_concurrent_unordered_base.h b/external/tbb/include/oneapi/tbb/detail/_concurrent_unordered_base.h
index 14a47f4b..85f54d0a 100644
--- a/external/tbb/include/oneapi/tbb/detail/_concurrent_unordered_base.h
+++ b/external/tbb/include/oneapi/tbb/detail/_concurrent_unordered_base.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -21,1498 +21,1495 @@
 #error Do not #include this internal file directly; use public TBB headers instead.
 #endif
 
-#include "_allocator_traits.h"
-#include "_assert.h"
+#include "_range_common.h"
 #include "_containers_helpers.h"
-#include "_exception.h"
+#include "_segment_table.h"
 #include "_hash_compare.h"
+#include "_allocator_traits.h"
 #include "_node_handle.h"
-#include "_range_common.h"
-#include "_segment_table.h"
+#include "_assert.h"
 #include "_utils.h"
-#include <algorithm>
-#include <atomic>
+#include "_exception.h"
+#include <iterator>
+#include <utility>
 #include <functional>
 #include <initializer_list>
-#include <iterator>
-#include <memory>
+#include <atomic>
 #include <type_traits>
-#include <utility>
+#include <memory>
+#include <algorithm>
 
 #if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
 #pragma warning(push)
-#pragma warning(disable : 4127)// warning C4127: conditional expression is constant
+#pragma warning(disable: 4127) // warning C4127: conditional expression is constant
 #endif
 
 namespace tbb {
-    namespace detail {
-        namespace d1 {
-
-            template <typename Traits>
-            class concurrent_unordered_base;
-
-            template <typename Container, typename Value>
-            class solist_iterator {
-            private:
-                using node_ptr = typename Container::value_node_ptr;
-                template <typename T, typename Allocator>
-                friend class split_ordered_list;
-                template <typename M, typename V>
-                friend class solist_iterator;
-                template <typename Traits>
-                friend class concurrent_unordered_base;
-                template <typename M, typename T, typename U>
-                friend bool operator==(const solist_iterator<M, T>& i, const solist_iterator<M, U>& j);
-                template <typename M, typename T, typename U>
-                friend bool operator!=(const solist_iterator<M, T>& i, const solist_iterator<M, U>& j);
-
-            public:
-                using value_type = Value;
-                using difference_type = typename Container::difference_type;
-                using pointer = value_type*;
-                using reference = value_type&;
-                using iterator_category = std::forward_iterator_tag;
-
-                solist_iterator() : my_node_ptr(nullptr) {}
-                solist_iterator(const solist_iterator<Container, typename Container::value_type>& other)
-                    : my_node_ptr(other.my_node_ptr) {}
-
-                solist_iterator&
-                operator=(const solist_iterator<Container, typename Container::value_type>& other) {
-                    my_node_ptr = other.my_node_ptr;
-                    return *this;
-                }
-
-                reference operator*() const { return my_node_ptr->value(); }
-
-                pointer operator->() const { return my_node_ptr->storage(); }
-
-                solist_iterator& operator++() {
-                    auto next_node = my_node_ptr->next();
-                    while (next_node && next_node->is_dummy()) { next_node = next_node->next(); }
-                    my_node_ptr = static_cast<node_ptr>(next_node);
-                    return *this;
-                }
-
-                solist_iterator operator++(int) {
-                    solist_iterator tmp = *this;
-                    ++*this;
-                    return tmp;
-                }
-
-            private:
-                solist_iterator(node_ptr pnode) : my_node_ptr(pnode) {}
-
-                node_ptr get_node_ptr() const { return my_node_ptr; }
-
-                node_ptr my_node_ptr;
+namespace detail {
+namespace d2 {
+
+template <typename Traits>
+class concurrent_unordered_base;
+
+template<typename Container, typename Value>
+class solist_iterator {
+private:
+    using node_ptr = typename Container::value_node_ptr;
+    template <typename T, typename Allocator>
+    friend class split_ordered_list;
+    template<typename M, typename V>
+    friend class solist_iterator;
+    template <typename Traits>
+    friend class concurrent_unordered_base;
+    template<typename M, typename T, typename U>
+    friend bool operator==( const solist_iterator<M,T>& i, const solist_iterator<M,U>& j );
+    template<typename M, typename T, typename U>
+    friend bool operator!=( const solist_iterator<M,T>& i, const solist_iterator<M,U>& j );
+public:
+    using value_type = Value;
+    using difference_type = typename Container::difference_type;
+    using pointer = value_type*;
+    using reference = value_type&;
+    using iterator_category = std::forward_iterator_tag;
+
+    solist_iterator() : my_node_ptr(nullptr) {}
+    solist_iterator( const solist_iterator<Container, typename Container::value_type>& other )
+        : my_node_ptr(other.my_node_ptr) {}
+
+    solist_iterator& operator=( const solist_iterator<Container, typename Container::value_type>& other ) {
+        my_node_ptr = other.my_node_ptr;
+        return *this;
+    }
+
+    reference operator*() const {
+        return my_node_ptr->value();
+    }
+
+    pointer operator->() const {
+        return my_node_ptr->storage();
+    }
+
+    solist_iterator& operator++() {
+        auto next_node = my_node_ptr->next();
+        while(next_node && next_node->is_dummy()) {
+            next_node = next_node->next();
+        }
+        my_node_ptr = static_cast<node_ptr>(next_node);
+        return *this;
+    }
+
+    solist_iterator operator++(int) {
+        solist_iterator tmp = *this;
+        ++*this;
+        return tmp;
+    }
+
+private:
+    solist_iterator( node_ptr pnode ) : my_node_ptr(pnode) {}
+
+    node_ptr get_node_ptr() const { return my_node_ptr; }
+
+    node_ptr my_node_ptr;
+};
+
+template<typename Solist, typename T, typename U>
+bool operator==( const solist_iterator<Solist, T>& i, const solist_iterator<Solist, U>& j ) {
+    return i.my_node_ptr == j.my_node_ptr;
+}
+
+template<typename Solist, typename T, typename U>
+bool operator!=( const solist_iterator<Solist, T>& i, const solist_iterator<Solist, U>& j ) {
+    return i.my_node_ptr != j.my_node_ptr;
+}
+
+template <typename SokeyType>
+class list_node {
+public:
+    using node_ptr = list_node*;
+    using sokey_type = SokeyType;
+
+    list_node(sokey_type key) : my_next(nullptr), my_order_key(key) {}
+
+    void init( sokey_type key ) {
+        my_order_key = key;
+    }
+
+    sokey_type order_key() const {
+        return my_order_key;
+    }
+
+    bool is_dummy() {
+        // The last bit of order key is unset for dummy nodes
+        return (my_order_key & 0x1) == 0;
+    }
+
+    node_ptr next() const {
+        return my_next.load(std::memory_order_acquire);
+    }
+
+    void set_next( node_ptr next_node ) {
+        my_next.store(next_node, std::memory_order_release);
+    }
+
+    bool try_set_next( node_ptr expected_next, node_ptr new_next ) {
+        return my_next.compare_exchange_strong(expected_next, new_next);
+    }
+
+private:
+    std::atomic<node_ptr> my_next;
+    sokey_type my_order_key;
+}; // class list_node
+
+template <typename ValueType, typename SokeyType>
+class value_node : public list_node<SokeyType>
+{
+public:
+    using base_type = list_node<SokeyType>;
+    using sokey_type = typename base_type::sokey_type;
+    using value_type = ValueType;
+
+    value_node( sokey_type ord_key ) : base_type(ord_key) {}
+    ~value_node() {}
+    value_type* storage() {
+        return &my_value;
+    }
+
+    value_type& value() {
+        return *storage();
+    }
+
+private:
+    union {
+        value_type my_value;
+    };
+}; // class value_node
+
+template <typename Traits>
+class concurrent_unordered_base {
+    using self_type = concurrent_unordered_base<Traits>;
+    using traits_type = Traits;
+    using hash_compare_type = typename traits_type::hash_compare_type;
+    class unordered_segment_table;
+public:
+    using value_type = typename traits_type::value_type;
+    using key_type = typename traits_type::key_type;
+    using allocator_type = typename traits_type::allocator_type;
+
+private:
+    using allocator_traits_type = tbb::detail::allocator_traits<allocator_type>;
+    // TODO: check assert conditions for different C++ standards
+    static_assert(std::is_same<typename allocator_traits_type::value_type, value_type>::value,
+                  "value_type of the container must be the same as its allocator");
+    using sokey_type = std::size_t;
+
+public:
+    using size_type = std::size_t;
+    using difference_type = std::ptrdiff_t;
+
+    using iterator = solist_iterator<self_type, value_type>;
+    using const_iterator = solist_iterator<self_type, const value_type>;
+    using local_iterator = iterator;
+    using const_local_iterator = const_iterator;
+
+    using reference = value_type&;
+    using const_reference = const value_type&;
+    using pointer = typename allocator_traits_type::pointer;
+    using const_pointer = typename allocator_traits_type::const_pointer;
+
+    using hasher = typename hash_compare_type::hasher;
+    using key_equal = typename hash_compare_type::key_equal;
+
+private:
+    using list_node_type = list_node<sokey_type>;
+    using value_node_type = value_node<value_type, sokey_type>;
+    using node_ptr = list_node_type*;
+    using value_node_ptr = value_node_type*;
+
+    using value_node_allocator_type = typename allocator_traits_type::template rebind_alloc<value_node_type>;
+    using node_allocator_type = typename allocator_traits_type::template rebind_alloc<list_node_type>;
+
+    using node_allocator_traits = tbb::detail::allocator_traits<node_allocator_type>;
+    using value_node_allocator_traits = tbb::detail::allocator_traits<value_node_allocator_type>;
+
+    static constexpr size_type round_up_to_power_of_two( size_type bucket_count ) {
+        return size_type(1) << size_type(tbb::detail::log2(uintptr_t(bucket_count == 0 ? 1 : bucket_count) * 2 - 1));
+    }
+
+    template <typename T>
+    using is_transparent = dependent_bool<has_transparent_key_equal<key_type, hasher, key_equal>, T>;
+public:
+    using node_type = d1::node_handle<key_type, value_type, value_node_type, allocator_type>;
+
+    explicit concurrent_unordered_base( size_type bucket_count, const hasher& hash = hasher(),
+                                        const key_equal& equal = key_equal(), const allocator_type& alloc = allocator_type() )
+        : my_size(0),
+          my_bucket_count(round_up_to_power_of_two(bucket_count)),
+          my_max_load_factor(float(initial_max_load_factor)),
+          my_hash_compare(hash, equal),
+          my_head(sokey_type(0)),
+          my_segments(alloc) {}
+
+    concurrent_unordered_base() : concurrent_unordered_base(initial_bucket_count) {}
+
+    concurrent_unordered_base( size_type bucket_count, const allocator_type& alloc )
+        : concurrent_unordered_base(bucket_count, hasher(), key_equal(), alloc) {}
+
+    concurrent_unordered_base( size_type bucket_count, const hasher& hash, const allocator_type& alloc )
+        : concurrent_unordered_base(bucket_count, hash, key_equal(), alloc) {}
+
+    explicit concurrent_unordered_base( const allocator_type& alloc )
+        : concurrent_unordered_base(initial_bucket_count, hasher(), key_equal(), alloc) {}
+
+    template <typename InputIterator>
+    concurrent_unordered_base( InputIterator first, InputIterator last,
+                               size_type bucket_count = initial_bucket_count, const hasher& hash = hasher(),
+                               const key_equal& equal = key_equal(), const allocator_type& alloc = allocator_type() )
+        : concurrent_unordered_base(bucket_count, hash, equal, alloc)
+    {
+        insert(first, last);
+    }
+
+    template <typename InputIterator>
+    concurrent_unordered_base( InputIterator first, InputIterator last,
+                               size_type bucket_count, const allocator_type& alloc )
+        : concurrent_unordered_base(first, last, bucket_count, hasher(), key_equal(), alloc) {}
+
+    template <typename InputIterator>
+    concurrent_unordered_base( InputIterator first, InputIterator last,
+                               size_type bucket_count, const hasher& hash, const allocator_type& alloc )
+        : concurrent_unordered_base(first, last, bucket_count, hash, key_equal(), alloc) {}
+
+    concurrent_unordered_base( const concurrent_unordered_base& other )
+        : my_size(other.my_size.load(std::memory_order_relaxed)),
+          my_bucket_count(other.my_bucket_count.load(std::memory_order_relaxed)),
+          my_max_load_factor(other.my_max_load_factor),
+          my_hash_compare(other.my_hash_compare),
+          my_head(other.my_head.order_key()),
+          my_segments(other.my_segments)
+    {
+        try_call( [&] {
+            internal_copy(other);
+        } ).on_exception( [&] {
+            clear();
+        });
+    }
+
+    concurrent_unordered_base( const concurrent_unordered_base& other, const allocator_type& alloc )
+        : my_size(other.my_size.load(std::memory_order_relaxed)),
+          my_bucket_count(other.my_bucket_count.load(std::memory_order_relaxed)),
+          my_max_load_factor(other.my_max_load_factor),
+          my_hash_compare(other.my_hash_compare),
+          my_head(other.my_head.order_key()),
+          my_segments(other.my_segments, alloc)
+    {
+        try_call( [&] {
+            internal_copy(other);
+        } ).on_exception( [&] {
+            clear();
+        });
+    }
+
+    concurrent_unordered_base( concurrent_unordered_base&& other )
+        : my_size(other.my_size.load(std::memory_order_relaxed)),
+          my_bucket_count(other.my_bucket_count.load(std::memory_order_relaxed)),
+          my_max_load_factor(std::move(other.my_max_load_factor)),
+          my_hash_compare(std::move(other.my_hash_compare)),
+          my_head(other.my_head.order_key()),
+          my_segments(std::move(other.my_segments))
+    {
+        move_content(std::move(other));
+    }
+
+    concurrent_unordered_base( concurrent_unordered_base&& other, const allocator_type& alloc )
+        : my_size(other.my_size.load(std::memory_order_relaxed)),
+          my_bucket_count(other.my_bucket_count.load(std::memory_order_relaxed)),
+          my_max_load_factor(std::move(other.my_max_load_factor)),
+          my_hash_compare(std::move(other.my_hash_compare)),
+          my_head(other.my_head.order_key()),
+          my_segments(std::move(other.my_segments), alloc)
+    {
+        using is_always_equal = typename allocator_traits_type::is_always_equal;
+        internal_move_construct_with_allocator(std::move(other), alloc, is_always_equal());
+    }
+
+    concurrent_unordered_base( std::initializer_list<value_type> init,
+                               size_type bucket_count = initial_bucket_count,
+                               const hasher& hash = hasher(), const key_equal& equal = key_equal(),
+                               const allocator_type& alloc = allocator_type() )
+        : concurrent_unordered_base(init.begin(), init.end(), bucket_count, hash, equal, alloc) {}
+
+    concurrent_unordered_base( std::initializer_list<value_type> init,
+                               size_type bucket_count, const allocator_type& alloc )
+        : concurrent_unordered_base(init, bucket_count, hasher(), key_equal(), alloc) {}
+
+    concurrent_unordered_base( std::initializer_list<value_type> init,
+                               size_type bucket_count, const hasher& hash, const allocator_type& alloc )
+        : concurrent_unordered_base(init, bucket_count, hash, key_equal(), alloc) {}
+
+    ~concurrent_unordered_base() {
+        internal_clear();
+    }
+
+    concurrent_unordered_base& operator=( const concurrent_unordered_base& other ) {
+        if (this != &other) {
+            clear();
+            my_size.store(other.my_size.load(std::memory_order_relaxed), std::memory_order_relaxed);
+            my_bucket_count.store(other.my_bucket_count.load(std::memory_order_relaxed), std::memory_order_relaxed);
+            my_max_load_factor = other.my_max_load_factor;
+            my_hash_compare = other.my_hash_compare;
+            my_segments = other.my_segments;
+            internal_copy(other); // TODO: guards for exceptions?
+        }
+        return *this;
+    }
+
+    concurrent_unordered_base& operator=( concurrent_unordered_base&& other ) noexcept(unordered_segment_table::is_noexcept_assignment) {
+        if (this != &other) {
+            clear();
+            my_size.store(other.my_size.load(std::memory_order_relaxed), std::memory_order_relaxed);
+            my_bucket_count.store(other.my_bucket_count.load(std::memory_order_relaxed), std::memory_order_relaxed);
+            my_max_load_factor = std::move(other.my_max_load_factor);
+            my_hash_compare = std::move(other.my_hash_compare);
+            my_segments = std::move(other.my_segments);
+
+            using pocma_type = typename allocator_traits_type::propagate_on_container_move_assignment;
+            using is_always_equal = typename allocator_traits_type::is_always_equal;
+            internal_move_assign(std::move(other), tbb::detail::disjunction<pocma_type, is_always_equal>());
+        }
+        return *this;
+    }
+
+    concurrent_unordered_base& operator=( std::initializer_list<value_type> init ) {
+        clear();
+        insert(init);
+        return *this;
+    }
+
+    void swap( concurrent_unordered_base& other ) noexcept(unordered_segment_table::is_noexcept_swap) {
+        if (this != &other) {
+            using pocs_type = typename allocator_traits_type::propagate_on_container_swap;
+            using is_always_equal = typename allocator_traits_type::is_always_equal;
+            internal_swap(other, tbb::detail::disjunction<pocs_type, is_always_equal>());
+        }
+    }
+
+    allocator_type get_allocator() const noexcept { return my_segments.get_allocator(); }
+
+    iterator begin() noexcept { return iterator(first_value_node(&my_head)); }
+    const_iterator begin() const noexcept { return const_iterator(first_value_node(const_cast<node_ptr>(&my_head))); }
+    const_iterator cbegin() const noexcept { return const_iterator(first_value_node(const_cast<node_ptr>(&my_head))); }
+
+    iterator end() noexcept { return iterator(nullptr); }
+    const_iterator end() const noexcept { return const_iterator(nullptr); }
+    const_iterator cend() const noexcept { return const_iterator(nullptr); }
+
+    __TBB_nodiscard bool empty() const noexcept { return size() == 0; }
+    size_type size() const noexcept { return my_size.load(std::memory_order_relaxed); }
+    size_type max_size() const noexcept { return allocator_traits_type::max_size(get_allocator()); }
+
+    void clear() noexcept {
+        internal_clear();
+    }
+
+    std::pair<iterator, bool> insert( const value_type& value ) {
+        return internal_insert_value(value);
+    }
+
+    std::pair<iterator, bool> insert( value_type&& value ) {
+        return internal_insert_value(std::move(value));
+    }
+
+    iterator insert( const_iterator, const value_type& value ) {
+        // Ignore hint
+        return insert(value).first;
+    }
+
+    iterator insert( const_iterator, value_type&& value ) {
+        // Ignore hint
+        return insert(std::move(value)).first;
+    }
+
+    template <typename InputIterator>
+    void insert( InputIterator first, InputIterator last ) {
+        for (; first != last; ++first) {
+            insert(*first);
+        }
+    }
+
+    void insert( std::initializer_list<value_type> init ) {
+        insert(init.begin(), init.end());
+    }
+
+    std::pair<iterator, bool> insert( node_type&& nh ) {
+        if (!nh.empty()) {
+            value_node_ptr insert_node = d1::node_handle_accessor::get_node_ptr(nh);
+            auto init_node = [&insert_node]( sokey_type order_key )->value_node_ptr {
+                insert_node->init(order_key);
+                return insert_node;
             };
-
-            template <typename Solist, typename T, typename U>
-            bool operator==(const solist_iterator<Solist, T>& i, const solist_iterator<Solist, U>& j) {
-                return i.my_node_ptr == j.my_node_ptr;
-            }
-
-            template <typename Solist, typename T, typename U>
-            bool operator!=(const solist_iterator<Solist, T>& i, const solist_iterator<Solist, U>& j) {
-                return i.my_node_ptr != j.my_node_ptr;
+            auto insert_result = internal_insert(insert_node->value(), init_node);
+            if (insert_result.inserted) {
+                // If the insertion succeeded - set node handle to the empty state
+                __TBB_ASSERT(insert_result.remaining_node == nullptr,
+                            "internal_insert_node should not return the remaining node if the insertion succeeded");
+                d1::node_handle_accessor::deactivate(nh);
             }
-
-            template <typename SokeyType>
-            class list_node {
-            public:
-                using node_ptr = list_node*;
-                using sokey_type = SokeyType;
-
-                list_node(sokey_type key) : my_next(nullptr), my_order_key(key) {}
-
-                void init(sokey_type key) { my_order_key = key; }
-
-                sokey_type order_key() const { return my_order_key; }
-
-                bool is_dummy() {
-                    // The last bit of order key is unset for dummy nodes
-                    return (my_order_key & 0x1) == 0;
-                }
-
-                node_ptr next() const { return my_next.load(std::memory_order_acquire); }
-
-                void set_next(node_ptr next_node) { my_next.store(next_node, std::memory_order_release); }
-
-                bool try_set_next(node_ptr expected_next, node_ptr new_next) {
-                    return my_next.compare_exchange_strong(expected_next, new_next);
-                }
-
-            private:
-                std::atomic<node_ptr> my_next;
-                sokey_type my_order_key;
-            };// class list_node
-
-            template <typename ValueType, typename SokeyType>
-            class value_node : public list_node<SokeyType> {
-            public:
-                using base_type = list_node<SokeyType>;
-                using sokey_type = typename base_type::sokey_type;
-                using value_type = ValueType;
-
-                value_node(sokey_type ord_key) : base_type(ord_key) {}
-                ~value_node() {}
-                value_type* storage() { return reinterpret_cast<value_type*>(&my_value); }
-
-                value_type& value() { return *storage(); }
-
-            private:
-                using aligned_storage_type = typename std::aligned_storage<sizeof(value_type)>::type;
-                aligned_storage_type my_value;
-            };// class value_node
-
-            template <typename Traits>
-            class concurrent_unordered_base {
-                using self_type = concurrent_unordered_base<Traits>;
-                using traits_type = Traits;
-                using hash_compare_type = typename traits_type::hash_compare_type;
-                class unordered_segment_table;
-
-            public:
-                using value_type = typename traits_type::value_type;
-                using key_type = typename traits_type::key_type;
-                using allocator_type = typename traits_type::allocator_type;
-
-            private:
-                using allocator_traits_type = tbb::detail::allocator_traits<allocator_type>;
-                // TODO: check assert conditions for different C++ standards
-                static_assert(std::is_same<typename allocator_traits_type::value_type, value_type>::value,
-                              "value_type of the container must be the same as its allocator");
-                using sokey_type = std::size_t;
-
-            public:
-                using size_type = std::size_t;
-                using difference_type = std::ptrdiff_t;
-
-                using iterator = solist_iterator<self_type, value_type>;
-                using const_iterator = solist_iterator<self_type, const value_type>;
-                using local_iterator = iterator;
-                using const_local_iterator = const_iterator;
-
-                using reference = value_type&;
-                using const_reference = const value_type&;
-                using pointer = typename allocator_traits_type::pointer;
-                using const_pointer = typename allocator_traits_type::const_pointer;
-
-                using hasher = typename hash_compare_type::hasher;
-                using key_equal = typename hash_compare_type::key_equal;
-
-            private:
-                using list_node_type = list_node<sokey_type>;
-                using value_node_type = value_node<value_type, sokey_type>;
-                using node_ptr = list_node_type*;
-                using value_node_ptr = value_node_type*;
-
-                using value_node_allocator_type =
-                        typename allocator_traits_type::template rebind_alloc<value_node_type>;
-                using node_allocator_type =
-                        typename allocator_traits_type::template rebind_alloc<list_node_type>;
-
-                using node_allocator_traits = tbb::detail::allocator_traits<node_allocator_type>;
-                using value_node_allocator_traits = tbb::detail::allocator_traits<value_node_allocator_type>;
-
-                static constexpr size_type round_up_to_power_of_two(size_type bucket_count) {
-                    return size_type(1) << size_type(tbb::detail::log2(
-                                   uintptr_t(bucket_count == 0 ? 1 : bucket_count) * 2 - 1));
-                }
-
-                template <typename T>
-                using is_transparent
-                        = dependent_bool<has_transparent_key_equal<key_type, hasher, key_equal>, T>;
-
-            public:
-                using node_type = node_handle<key_type, value_type, value_node_type, allocator_type>;
-
-                explicit concurrent_unordered_base(size_type bucket_count, const hasher& hash = hasher(),
-                                                   const key_equal& equal = key_equal(),
-                                                   const allocator_type& alloc = allocator_type())
-                    : my_size(0), my_bucket_count(round_up_to_power_of_two(bucket_count)),
-                      my_max_load_factor(float(initial_max_load_factor)), my_hash_compare(hash, equal),
-                      my_head(sokey_type(0)), my_segments(alloc) {}
-
-                concurrent_unordered_base() : concurrent_unordered_base(initial_bucket_count) {}
-
-                concurrent_unordered_base(size_type bucket_count, const allocator_type& alloc)
-                    : concurrent_unordered_base(bucket_count, hasher(), key_equal(), alloc) {}
-
-                concurrent_unordered_base(size_type bucket_count, const hasher& hash,
-                                          const allocator_type& alloc)
-                    : concurrent_unordered_base(bucket_count, hash, key_equal(), alloc) {}
-
-                explicit concurrent_unordered_base(const allocator_type& alloc)
-                    : concurrent_unordered_base(initial_bucket_count, hasher(), key_equal(), alloc) {}
-
-                template <typename InputIterator>
-                concurrent_unordered_base(InputIterator first, InputIterator last,
-                                          size_type bucket_count = initial_bucket_count,
-                                          const hasher& hash = hasher(), const key_equal& equal = key_equal(),
-                                          const allocator_type& alloc = allocator_type())
-                    : concurrent_unordered_base(bucket_count, hash, equal, alloc) {
-                    insert(first, last);
-                }
-
-                template <typename InputIterator>
-                concurrent_unordered_base(InputIterator first, InputIterator last, size_type bucket_count,
-                                          const allocator_type& alloc)
-                    : concurrent_unordered_base(first, last, bucket_count, hasher(), key_equal(), alloc) {}
-
-                template <typename InputIterator>
-                concurrent_unordered_base(InputIterator first, InputIterator last, size_type bucket_count,
-                                          const hasher& hash, const allocator_type& alloc)
-                    : concurrent_unordered_base(first, last, bucket_count, hash, key_equal(), alloc) {}
-
-                concurrent_unordered_base(const concurrent_unordered_base& other)
-                    : my_size(other.my_size.load(std::memory_order_relaxed)),
-                      my_bucket_count(other.my_bucket_count.load(std::memory_order_relaxed)),
-                      my_max_load_factor(other.my_max_load_factor), my_hash_compare(other.my_hash_compare),
-                      my_head(other.my_head.order_key()), my_segments(other.my_segments) {
-                    try_call([&] { internal_copy(other); }).on_exception([&] { clear(); });
-                }
-
-                concurrent_unordered_base(const concurrent_unordered_base& other, const allocator_type& alloc)
-                    : my_size(other.my_size.load(std::memory_order_relaxed)),
-                      my_bucket_count(other.my_bucket_count.load(std::memory_order_relaxed)),
-                      my_max_load_factor(other.my_max_load_factor), my_hash_compare(other.my_hash_compare),
-                      my_head(other.my_head.order_key()), my_segments(other.my_segments, alloc) {
-                    try_call([&] { internal_copy(other); }).on_exception([&] { clear(); });
-                }
-
-                concurrent_unordered_base(concurrent_unordered_base&& other)
-                    : my_size(other.my_size.load(std::memory_order_relaxed)),
-                      my_bucket_count(other.my_bucket_count.load(std::memory_order_relaxed)),
-                      my_max_load_factor(std::move(other.my_max_load_factor)),
-                      my_hash_compare(std::move(other.my_hash_compare)), my_head(other.my_head.order_key()),
-                      my_segments(std::move(other.my_segments)) {
-                    move_content(std::move(other));
-                }
-
-                concurrent_unordered_base(concurrent_unordered_base&& other, const allocator_type& alloc)
-                    : my_size(other.my_size.load(std::memory_order_relaxed)),
-                      my_bucket_count(other.my_bucket_count.load(std::memory_order_relaxed)),
-                      my_max_load_factor(std::move(other.my_max_load_factor)),
-                      my_hash_compare(std::move(other.my_hash_compare)), my_head(other.my_head.order_key()),
-                      my_segments(std::move(other.my_segments), alloc) {
-                    using is_always_equal = typename allocator_traits_type::is_always_equal;
-                    internal_move_construct_with_allocator(std::move(other), alloc, is_always_equal());
-                }
-
-                concurrent_unordered_base(std::initializer_list<value_type> init,
-                                          size_type bucket_count = initial_bucket_count,
-                                          const hasher& hash = hasher(), const key_equal& equal = key_equal(),
-                                          const allocator_type& alloc = allocator_type())
-                    : concurrent_unordered_base(init.begin(), init.end(), bucket_count, hash, equal, alloc) {}
-
-                concurrent_unordered_base(std::initializer_list<value_type> init, size_type bucket_count,
-                                          const allocator_type& alloc)
-                    : concurrent_unordered_base(init, bucket_count, hasher(), key_equal(), alloc) {}
-
-                concurrent_unordered_base(std::initializer_list<value_type> init, size_type bucket_count,
-                                          const hasher& hash, const allocator_type& alloc)
-                    : concurrent_unordered_base(init, bucket_count, hash, key_equal(), alloc) {}
-
-                ~concurrent_unordered_base() { internal_clear(); }
-
-                concurrent_unordered_base& operator=(const concurrent_unordered_base& other) {
-                    if (this != &other) {
-                        clear();
-                        my_size.store(other.my_size.load(std::memory_order_relaxed),
-                                      std::memory_order_relaxed);
-                        my_bucket_count.store(other.my_bucket_count.load(std::memory_order_relaxed),
-                                              std::memory_order_relaxed);
-                        my_max_load_factor = other.my_max_load_factor;
-                        my_hash_compare = other.my_hash_compare;
-                        my_segments = other.my_segments;
-                        internal_copy(other);// TODO: guards for exceptions?
-                    }
-                    return *this;
-                }
-
-                concurrent_unordered_base& operator=(concurrent_unordered_base&& other) noexcept(
-                        unordered_segment_table::is_noexcept_assignment) {
-                    if (this != &other) {
-                        clear();
-                        my_size.store(other.my_size.load(std::memory_order_relaxed),
-                                      std::memory_order_relaxed);
-                        my_bucket_count.store(other.my_bucket_count.load(std::memory_order_relaxed),
-                                              std::memory_order_relaxed);
-                        my_max_load_factor = std::move(other.my_max_load_factor);
-                        my_hash_compare = std::move(other.my_hash_compare);
-                        my_segments = std::move(other.my_segments);
-
-                        using pocma_type =
-                                typename allocator_traits_type::propagate_on_container_move_assignment;
-                        using is_always_equal = typename allocator_traits_type::is_always_equal;
-                        internal_move_assign(std::move(other),
-                                             tbb::detail::disjunction<pocma_type, is_always_equal>());
-                    }
-                    return *this;
-                }
-
-                concurrent_unordered_base& operator=(std::initializer_list<value_type> init) {
-                    clear();
-                    insert(init);
-                    return *this;
-                }
-
-                void
-                swap(concurrent_unordered_base& other) noexcept(unordered_segment_table::is_noexcept_swap) {
-                    if (this != &other) {
-                        using pocs_type = typename allocator_traits_type::propagate_on_container_swap;
-                        using is_always_equal = typename allocator_traits_type::is_always_equal;
-                        internal_swap(other, tbb::detail::disjunction<pocs_type, is_always_equal>());
-                    }
-                }
-
-                allocator_type get_allocator() const noexcept { return my_segments.get_allocator(); }
-
-                iterator begin() noexcept { return iterator(first_value_node(&my_head)); }
-                const_iterator begin() const noexcept {
-                    return const_iterator(first_value_node(const_cast<node_ptr>(&my_head)));
-                }
-                const_iterator cbegin() const noexcept {
-                    return const_iterator(first_value_node(const_cast<node_ptr>(&my_head)));
-                }
-
-                iterator end() noexcept { return iterator(nullptr); }
-                const_iterator end() const noexcept { return const_iterator(nullptr); }
-                const_iterator cend() const noexcept { return const_iterator(nullptr); }
-
-                __TBB_nodiscard bool empty() const noexcept { return size() == 0; }
-                size_type size() const noexcept { return my_size.load(std::memory_order_relaxed); }
-                size_type max_size() const noexcept {
-                    return allocator_traits_type::max_size(get_allocator());
-                }
-
-                void clear() noexcept { internal_clear(); }
-
-                std::pair<iterator, bool> insert(const value_type& value) {
-                    return internal_insert_value(value);
-                }
-
-                std::pair<iterator, bool> insert(value_type&& value) {
-                    return internal_insert_value(std::move(value));
-                }
-
-                iterator insert(const_iterator, const value_type& value) {
-                    // Ignore hint
-                    return insert(value).first;
-                }
-
-                iterator insert(const_iterator, value_type&& value) {
-                    // Ignore hint
-                    return insert(std::move(value)).first;
-                }
-
-                template <typename InputIterator>
-                void insert(InputIterator first, InputIterator last) {
-                    for (; first != last; ++first) { insert(*first); }
-                }
-
-                void insert(std::initializer_list<value_type> init) { insert(init.begin(), init.end()); }
-
-                std::pair<iterator, bool> insert(node_type&& nh) {
-                    if (!nh.empty()) {
-                        value_node_ptr insert_node = node_handle_accessor::get_node_ptr(nh);
-                        auto init_node = [&insert_node](sokey_type order_key) -> value_node_ptr {
-                            insert_node->init(order_key);
-                            return insert_node;
-                        };
-                        auto insert_result = internal_insert(insert_node->value(), init_node);
-                        if (insert_result.inserted) {
-                            // If the insertion succeeded - set node handle to the empty state
-                            __TBB_ASSERT(insert_result.remaining_node == nullptr,
-                                         "internal_insert_node should not return the remaining node if the "
-                                         "insertion succeeded");
-                            node_handle_accessor::deactivate(nh);
-                        }
-                        return {iterator(insert_result.node_with_equal_key), insert_result.inserted};
-                    }
-                    return {end(), false};
-                }
-
-                iterator insert(const_iterator, node_type&& nh) {
-                    // Ignore hint
-                    return insert(std::move(nh)).first;
-                }
-
-                template <typename... Args>
-                std::pair<iterator, bool> emplace(Args&&... args) {
-                    // Create a node with temporary order_key 0, which will be reinitialize
-                    // in internal_insert after the hash calculation
-                    value_node_ptr insert_node = create_node(0, std::forward<Args>(args)...);
-
-                    auto init_node = [&insert_node](sokey_type order_key) -> value_node_ptr {
-                        insert_node->init(order_key);
-                        return insert_node;
-                    };
-
-                    auto insert_result = internal_insert(insert_node->value(), init_node);
-
-                    if (!insert_result.inserted) {
-                        // If the insertion failed - destroy the node which was created
-                        insert_node->init(split_order_key_regular(1));
-                        destroy_node(insert_node);
-                    }
-
-                    return {iterator(insert_result.node_with_equal_key), insert_result.inserted};
-                }
-
-                template <typename... Args>
-                iterator emplace_hint(const_iterator, Args&&... args) {
-                    // Ignore hint
-                    return emplace(std::forward<Args>(args)...).first;
-                }
-
-                iterator unsafe_erase(const_iterator pos) {
-                    return iterator(first_value_node(internal_erase(pos.get_node_ptr())));
-                }
-
-                iterator unsafe_erase(iterator pos) {
-                    return iterator(first_value_node(internal_erase(pos.get_node_ptr())));
-                }
-
-                iterator unsafe_erase(const_iterator first, const_iterator last) {
-                    while (first != last) { first = unsafe_erase(first); }
-                    return iterator(first.get_node_ptr());
-                }
-
-                size_type unsafe_erase(const key_type& key) { return internal_erase_by_key(key); }
-
-                template <typename K>
-                typename std::enable_if<is_transparent<K>::value
-                                                && !std::is_convertible<K, const_iterator>::value
-                                                && !std::is_convertible<K, iterator>::value,
-                                        size_type>::type
-                unsafe_erase(const K& key) {
-                    return internal_erase_by_key(key);
-                }
-
-                node_type unsafe_extract(const_iterator pos) {
-                    internal_extract(pos.get_node_ptr());
-                    return node_handle_accessor::construct<node_type>(pos.get_node_ptr());
-                }
-
-                node_type unsafe_extract(iterator pos) {
-                    internal_extract(pos.get_node_ptr());
-                    return node_handle_accessor::construct<node_type>(pos.get_node_ptr());
-                }
-
-                node_type unsafe_extract(const key_type& key) {
-                    iterator item = find(key);
-                    return item == end() ? node_type() : unsafe_extract(item);
-                }
-
-                template <typename K>
-                typename std::enable_if<is_transparent<K>::value
-                                                && !std::is_convertible<K, const_iterator>::value
-                                                && !std::is_convertible<K, iterator>::value,
-                                        node_type>::type
-                unsafe_extract(const K& key) {
-                    iterator item = find(key);
-                    return item == end() ? node_type() : unsafe_extract(item);
-                }
-
-                // Lookup functions
-                iterator find(const key_type& key) {
-                    value_node_ptr result = internal_find(key);
-                    return result == nullptr ? end() : iterator(result);
-                }
-
-                const_iterator find(const key_type& key) const {
-                    value_node_ptr result = const_cast<self_type*>(this)->internal_find(key);
-                    return result == nullptr ? end() : const_iterator(result);
-                }
-
-                template <typename K>
-                typename std::enable_if<is_transparent<K>::value, iterator>::type find(const K& key) {
-                    value_node_ptr result = internal_find(key);
-                    return result == nullptr ? end() : iterator(result);
-                }
-
-                template <typename K>
-                typename std::enable_if<is_transparent<K>::value, const_iterator>::type
-                find(const K& key) const {
-                    value_node_ptr result = const_cast<self_type*>(this)->internal_find(key);
-                    return result == nullptr ? end() : const_iterator(result);
-                }
-
-                std::pair<iterator, iterator> equal_range(const key_type& key) {
-                    auto result = internal_equal_range(key);
-                    return std::make_pair(iterator(result.first), iterator(result.second));
-                }
-
-                std::pair<const_iterator, const_iterator> equal_range(const key_type& key) const {
-                    auto result = const_cast<self_type*>(this)->internal_equal_range(key);
-                    return std::make_pair(const_iterator(result.first), const_iterator(result.second));
-                }
-
-                template <typename K>
-                typename std::enable_if<is_transparent<K>::value, std::pair<iterator, iterator>>::type
-                equal_range(const K& key) {
-                    auto result = internal_equal_range(key);
-                    return std::make_pair(iterator(result.first), iterator(result.second));
-                }
-
-                template <typename K>
-                typename std::enable_if<is_transparent<K>::value,
-                                        std::pair<const_iterator, const_iterator>>::type
-                equal_range(const K& key) const {
-                    auto result = const_cast<self_type*>(this)->internal_equal_range(key);
-                    return std::make_pair(iterator(result.first), iterator(result.second));
-                }
-
-                size_type count(const key_type& key) const { return internal_count(key); }
-
-                template <typename K>
-                typename std::enable_if<is_transparent<K>::value, size_type>::type count(const K& key) const {
-                    return internal_count(key);
-                }
-
-                bool contains(const key_type& key) const { return find(key) != end(); }
-
-                template <typename K>
-                typename std::enable_if<is_transparent<K>::value, bool>::type contains(const K& key) const {
-                    return find(key) != end();
-                }
-
-                // Bucket interface
-                local_iterator unsafe_begin(size_type n) {
-                    return local_iterator(first_value_node(get_bucket(n)));
-                }
-
-                const_local_iterator unsafe_begin(size_type n) const {
-                    auto bucket_begin = first_value_node(const_cast<self_type*>(this)->get_bucket(n));
-                    return const_local_iterator(bucket_begin);
-                }
-
-                const_local_iterator unsafe_cbegin(size_type n) const {
-                    auto bucket_begin = first_value_node(const_cast<self_type*>(this)->get_bucket(n));
-                    return const_local_iterator(bucket_begin);
-                }
-
-                local_iterator unsafe_end(size_type n) {
-                    size_type bucket_count = my_bucket_count.load(std::memory_order_relaxed);
-                    return n != bucket_count - 1 ? unsafe_begin(get_next_bucket_index(n))
-                                                 : local_iterator(nullptr);
-                }
-
-                const_local_iterator unsafe_end(size_type n) const {
-                    size_type bucket_count = my_bucket_count.load(std::memory_order_relaxed);
-                    return n != bucket_count - 1 ? unsafe_begin(get_next_bucket_index(n))
-                                                 : const_local_iterator(nullptr);
-                }
-
-                const_local_iterator unsafe_cend(size_type n) const {
-                    size_type bucket_count = my_bucket_count.load(std::memory_order_relaxed);
-                    return n != bucket_count - 1 ? unsafe_begin(get_next_bucket_index(n))
-                                                 : const_local_iterator(nullptr);
-                }
-
-                size_type unsafe_bucket_count() const {
-                    return my_bucket_count.load(std::memory_order_relaxed);
-                }
-
-                size_type unsafe_max_bucket_count() const { return max_size(); }
-
-                size_type unsafe_bucket_size(size_type n) const {
-                    return size_type(std::distance(unsafe_begin(n), unsafe_end(n)));
-                }
-
-                size_type unsafe_bucket(const key_type& key) const {
-                    return my_hash_compare(key) % my_bucket_count.load(std::memory_order_relaxed);
-                }
-
-                // Hash policy
-                float load_factor() const {
-                    return float(size() / float(my_bucket_count.load(std::memory_order_acquire)));
-                }
-
-                float max_load_factor() const { return my_max_load_factor; }
-
-                void max_load_factor(float mlf) {
-                    if (mlf != mlf || mlf < 0) {
-                        tbb::detail::throw_exception(exception_id::invalid_load_factor);
-                    }
-                    my_max_load_factor = mlf;
-                }// TODO: unsafe?
-
-                void rehash(size_type bucket_count) {
-                    size_type current_bucket_count = my_bucket_count.load(std::memory_order_acquire);
-                    if (current_bucket_count < bucket_count) {
-                        // TODO: do we need do-while here?
-                        my_bucket_count.compare_exchange_strong(current_bucket_count,
-                                                                round_up_to_power_of_two(bucket_count));
-                    }
-                }
-
-                void reserve(size_type elements_count) {
-                    size_type current_bucket_count = my_bucket_count.load(std::memory_order_acquire);
-                    size_type necessary_bucket_count = current_bucket_count;
-
-                    do {
-                        // TODO: Log2 seems useful here
-                        while (necessary_bucket_count * max_load_factor() < elements_count) {
-                            necessary_bucket_count <<= 1;
-                        }
-                    } while (current_bucket_count >= necessary_bucket_count
-                             || !my_bucket_count.compare_exchange_strong(current_bucket_count,
-                                                                         necessary_bucket_count));
-                }
-
-                // Observers
-                hasher hash_function() const { return my_hash_compare.hash_function(); }
-                key_equal key_eq() const { return my_hash_compare.key_eq(); }
-
-                class const_range_type {
-                private:
-                    const concurrent_unordered_base& my_instance;
-                    node_ptr my_begin_node;// may be node* const
-                    node_ptr my_end_node;
-                    mutable node_ptr my_midpoint_node;
-
-                public:
-                    using size_type = typename concurrent_unordered_base::size_type;
-                    using value_type = typename concurrent_unordered_base::value_type;
-                    using reference = typename concurrent_unordered_base::reference;
-                    using difference_type = typename concurrent_unordered_base::difference_type;
-                    using iterator = typename concurrent_unordered_base::const_iterator;
-
-                    bool empty() const { return my_begin_node == my_end_node; }
-
-                    bool is_divisible() const { return my_midpoint_node != my_end_node; }
-
-                    size_type grainsize() const { return 1; }
-
-                    const_range_type(const_range_type& range, split)
-                        : my_instance(range.my_instance), my_begin_node(range.my_midpoint_node),
-                          my_end_node(range.my_end_node) {
-                        range.my_end_node = my_begin_node;
-                        __TBB_ASSERT(!empty(), "Splitting despite the range is not divisible");
-                        __TBB_ASSERT(!range.empty(), "Splitting despite the range is not divisible");
-                        set_midpoint();
-                        range.set_midpoint();
-                    }
-
-                    iterator begin() const { return iterator(my_instance.first_value_node(my_begin_node)); }
-                    iterator end() const { return iterator(my_instance.first_value_node(my_end_node)); }
-
-                    const_range_type(const concurrent_unordered_base& table)
-                        : my_instance(table), my_begin_node(const_cast<node_ptr>(&table.my_head)),
-                          my_end_node(nullptr) {
-                        set_midpoint();
-                    }
-
-                private:
-                    void set_midpoint() const {
-                        if (my_begin_node == my_end_node) {
-                            my_midpoint_node = my_end_node;
-                        } else {
-                            sokey_type invalid_key = ~sokey_type(0);
-                            sokey_type begin_key
-                                    = my_begin_node != nullptr ? my_begin_node->order_key() : invalid_key;
-                            sokey_type end_key
-                                    = my_end_node != nullptr ? my_end_node->order_key() : invalid_key;
-
-                            size_type mid_bucket
-                                    = reverse_bits(begin_key + (end_key - begin_key) / 2)
-                                      % my_instance.my_bucket_count.load(std::memory_order_relaxed);
-                            while (my_instance.my_segments[mid_bucket].load(std::memory_order_relaxed)
-                                   == nullptr) {
-                                mid_bucket = my_instance.get_parent(mid_bucket);
-                            }
-                            if (reverse_bits(mid_bucket) > begin_key) {
-                                // Found a dummy node between begin and end
-                                my_midpoint_node = my_instance.first_value_node(
-                                        my_instance.my_segments[mid_bucket].load(std::memory_order_relaxed));
-                            } else {
-                                // Didn't find a dummy node between begin and end
-                                my_midpoint_node = my_end_node;
-                            }
-                        }
-                    }
-                };// class const_range_type
-
-                class range_type : public const_range_type {
-                public:
-                    using iterator = typename concurrent_unordered_base::iterator;
-                    using const_range_type::const_range_type;
-
-                    iterator begin() const { return iterator(const_range_type::begin().get_node_ptr()); }
-                    iterator end() const { return iterator(const_range_type::end().get_node_ptr()); }
-                };// class range_type
-
-                // Parallel iteration
-                range_type range() { return range_type(*this); }
-
-                const_range_type range() const { return const_range_type(*this); }
-
-            protected:
-                static constexpr bool allow_multimapping = traits_type::allow_multimapping;
-
-            private:
-                static constexpr size_type initial_bucket_count = 8;
-                static constexpr float initial_max_load_factor = 4;// TODO: consider 1?
-                static constexpr size_type pointers_per_embedded_table = sizeof(size_type) * 8 - 1;
-
-                class unordered_segment_table
-                    : public segment_table<std::atomic<node_ptr>, allocator_type, unordered_segment_table,
-                                           pointers_per_embedded_table> {
-                    using self_type = unordered_segment_table;
-                    using atomic_node_ptr = std::atomic<node_ptr>;
-                    using base_type = segment_table<std::atomic<node_ptr>, allocator_type,
-                                                    unordered_segment_table, pointers_per_embedded_table>;
-                    using segment_type = typename base_type::segment_type;
-                    using base_allocator_type = typename base_type::allocator_type;
-
-                    using segment_allocator_type =
-                            typename allocator_traits_type::template rebind_alloc<atomic_node_ptr>;
-                    using segment_allocator_traits = tbb::detail::allocator_traits<segment_allocator_type>;
-
-                public:
-                    // Segment table for unordered containers should not be extended in the wait- free implementation
-                    static constexpr bool allow_table_extending = false;
-                    static constexpr bool is_noexcept_assignment
-                            = std::is_nothrow_move_assignable<hasher>::value
-                              && std::is_nothrow_move_assignable<key_equal>::value
-                              && segment_allocator_traits::is_always_equal::value;
-                    static constexpr bool is_noexcept_swap
-                            = tbb::detail::is_nothrow_swappable<hasher>::value
-                              && tbb::detail::is_nothrow_swappable<key_equal>::value
-                              && segment_allocator_traits::is_always_equal::value;
-
-                    // TODO: using base_type::base_type is not compiling on Windows and Intel Compiler - investigate
-                    unordered_segment_table(const base_allocator_type& alloc = base_allocator_type())
-                        : base_type(alloc) {}
-
-                    unordered_segment_table(const unordered_segment_table&) = default;
-
-                    unordered_segment_table(const unordered_segment_table& other,
-                                            const base_allocator_type& alloc)
-                        : base_type(other, alloc) {}
-
-                    unordered_segment_table(unordered_segment_table&&) = default;
-
-                    unordered_segment_table(unordered_segment_table&& other, const base_allocator_type& alloc)
-                        : base_type(std::move(other), alloc) {}
-
-                    unordered_segment_table& operator=(const unordered_segment_table&) = default;
-
-                    unordered_segment_table& operator=(unordered_segment_table&&) = default;
-
-                    segment_type create_segment(typename base_type::segment_table_type,
-                                                typename base_type::segment_index_type segment_index,
-                                                size_type) {
-                        segment_allocator_type alloc(this->get_allocator());
-                        size_type seg_size = this->segment_size(segment_index);
-                        segment_type new_segment = segment_allocator_traits::allocate(alloc, seg_size);
-                        for (size_type i = 0; i != seg_size; ++i) {
-                            segment_allocator_traits::construct(alloc, new_segment + i, nullptr);
-                        }
-                        return new_segment;
-                    }
-
-                    // deallocate_segment is required by the segment_table base class, but
-                    // in unordered, it is also necessary to call the destructor during deallocation
-                    void deallocate_segment(segment_type address, size_type index) {
-                        destroy_segment(address, index);
-                    }
-
-                    void destroy_segment(segment_type address, size_type index) {
-                        segment_allocator_type alloc(this->get_allocator());
-                        for (size_type i = 0; i != this->segment_size(index); ++i) {
-                            segment_allocator_traits::destroy(alloc, address + i);
-                        }
-                        segment_allocator_traits::deallocate(alloc, address, this->segment_size(index));
-                    }
-
-                    void copy_segment(size_type index, segment_type, segment_type to) {
-                        if (index == 0) {
-                            // The first element in the first segment is embedded into the table (my_head)
-                            // so the first pointer should not be stored here
-                            // It would be stored during move ctor/assignment operation
-                            to[1].store(nullptr, std::memory_order_relaxed);
-                        } else {
-                            for (size_type i = 0; i != this->segment_size(index); ++i) {
-                                to[i].store(nullptr, std::memory_order_relaxed);
-                            }
-                        }
-                    }
-
-                    void move_segment(size_type index, segment_type from, segment_type to) {
-                        if (index == 0) {
-                            // The first element in the first segment is embedded into the table (my_head)
-                            // so the first pointer should not be stored here
-                            // It would be stored during move ctor/assignment operation
-                            to[1].store(from[1].load(std::memory_order_relaxed), std::memory_order_relaxed);
-                        } else {
-                            for (size_type i = 0; i != this->segment_size(index); ++i) {
-                                to[i].store(from[i].load(std::memory_order_relaxed),
-                                            std::memory_order_relaxed);
-                                from[i].store(nullptr, std::memory_order_relaxed);
-                            }
-                        }
-                    }
-
-                    // allocate_long_table is required by the segment_table base class, but unused for unordered containers
-                    typename base_type::segment_table_type
-                    allocate_long_table(const typename base_type::atomic_segment*, size_type) {
-                        __TBB_ASSERT(false, "This method should never been called");
-                        // TableType is a pointer
-                        return nullptr;
-                    }
-
-                    // destroy_elements is required by the segment_table base class, but unused for unordered containers
-                    // this function call but do nothing
-                    void destroy_elements() {}
-                };// struct unordered_segment_table
-
-                void internal_clear() {
-                    // TODO: consider usefulness of two versions of clear() - with dummy nodes deallocation and without it
-                    node_ptr next = my_head.next();
-                    node_ptr curr = next;
-
-                    my_head.set_next(nullptr);
-
-                    while (curr != nullptr) {
-                        next = curr->next();
-                        destroy_node(curr);
-                        curr = next;
-                    }
-
-                    my_size.store(0, std::memory_order_relaxed);
-                    my_segments.clear();
-                }
-
-                void destroy_node(node_ptr node) {
-                    if (node->is_dummy()) {
-                        node_allocator_type dummy_node_allocator(my_segments.get_allocator());
-                        // Destroy the node
-                        node_allocator_traits::destroy(dummy_node_allocator, node);
-                        // Deallocate the memory
-                        node_allocator_traits::deallocate(dummy_node_allocator, node, 1);
-                    } else {
-// GCC 11.1 issues a warning here that incorrect destructor might be called for dummy_nodes
-#if (__TBB_GCC_VERSION >= 110100 && __TBB_GCC_VERSION < 120000) && !__clang__ && !__INTEL_COMPILER
-                        volatile
-#endif
-                                value_node_ptr val_node
-                                = static_cast<value_node_ptr>(node);
-                        value_node_allocator_type value_node_allocator(my_segments.get_allocator());
-                        // Destroy the value
-                        value_node_allocator_traits::destroy(value_node_allocator, val_node->storage());
-                        // Destroy the node
-                        value_node_allocator_traits::destroy(value_node_allocator, val_node);
-                        // Deallocate the memory
-                        value_node_allocator_traits::deallocate(value_node_allocator, val_node, 1);
-                    }
-                }
-
-                struct internal_insert_return_type {
-                    // If the insertion failed - the remaining_node points to the node, which was failed to insert
-                    // This node can be allocated in process of insertion
-                    value_node_ptr remaining_node;
-                    // If the insertion failed - node_with_equal_key points to the node in the list with the
-                    // key, equivalent to the inserted, otherwise it points to the node, which was inserted.
-                    value_node_ptr node_with_equal_key;
-                    // Insertion status
-                    // NOTE: if it is true - remaining_node should be nullptr
-                    bool inserted;
-                };// struct internal_insert_return_type
-
-                // Inserts the value into the split ordered list
-                template <typename ValueType>
-                std::pair<iterator, bool> internal_insert_value(ValueType&& value) {
-
-                    auto create_value_node = [&value, this](sokey_type order_key) -> value_node_ptr {
-                        return create_node(order_key, std::forward<ValueType>(value));
-                    };
-
-                    auto insert_result = internal_insert(value, create_value_node);
-
-                    if (insert_result.remaining_node != nullptr) {
-                        // If the insertion fails - destroy the node which was failed to insert if it exist
-                        __TBB_ASSERT(
-                                !insert_result.inserted,
-                                "remaining_node should be nullptr if the node was successfully inserted");
-                        destroy_node(insert_result.remaining_node);
-                    }
-
-                    return {iterator(insert_result.node_with_equal_key), insert_result.inserted};
-                }
-
-                // Inserts the node into the split ordered list
-                // Creates a node using the specified callback after the place for insertion was found
-                // Returns internal_insert_return_type object, where:
-                //     - If the insertion succeeded:
-                //         - remaining_node is nullptr
-                //         - node_with_equal_key point to the inserted node
-                //         - inserted is true
-                //     - If the insertion failed:
-                //         - remaining_node points to the node, that was failed to insert if it was created.
-                //           nullptr if the node was not created, because the requested key was already
-                //           presented in the list
-                //         - node_with_equal_key point to the element in the list with the key, equivalent to
-                //           to the requested key
-                //         - inserted is false
-                template <typename ValueType, typename CreateInsertNode>
-                internal_insert_return_type internal_insert(ValueType&& value,
-                                                            CreateInsertNode create_insert_node) {
-                    static_assert(std::is_same<typename std::decay<ValueType>::type, value_type>::value,
-                                  "Incorrect type in internal_insert");
-                    const key_type& key = traits_type::get_key(value);
-                    sokey_type hash_key = sokey_type(my_hash_compare(key));
-
-                    sokey_type order_key = split_order_key_regular(hash_key);
-                    node_ptr prev = prepare_bucket(hash_key);
-                    __TBB_ASSERT(prev != nullptr, "Invalid head node");
-
-                    auto search_result = search_after(prev, order_key, key);
-
-                    if (search_result.second) {
-                        return internal_insert_return_type {nullptr, search_result.first, false};
-                    }
-
-                    value_node_ptr new_node = create_insert_node(order_key);
-                    node_ptr curr = search_result.first;
-
-                    while (!try_insert(prev, new_node, curr)) {
-                        search_result = search_after(prev, order_key, key);
-                        if (search_result.second) {
-                            return internal_insert_return_type {new_node, search_result.first, false};
-                        }
-                        curr = search_result.first;
-                    }
-
-                    auto sz = my_size.fetch_add(1);
-                    adjust_table_size(sz + 1, my_bucket_count.load(std::memory_order_acquire));
-                    return internal_insert_return_type {nullptr, static_cast<value_node_ptr>(new_node), true};
-                }
-
-                // Searches the node with the key, equivalent to key with requested order key after the node prev
-                // Returns the existing node and true if the node is already in the list
-                // Returns the first node with the order key, greater than requested and false if the node is not presented in the list
-                std::pair<value_node_ptr, bool> search_after(node_ptr& prev, sokey_type order_key,
-                                                             const key_type& key) {
-                    // NOTE: static_cast<value_node_ptr>(curr) should be done only after we would ensure
-                    // that the node is not a dummy node
-
-                    node_ptr curr = prev->next();
-
-                    while (curr != nullptr
-                           && (curr->order_key() < order_key
-                               || (curr->order_key() == order_key
-                                   && !my_hash_compare(
-                                           traits_type::get_key(static_cast<value_node_ptr>(curr)->value()),
-                                           key)))) {
-                        prev = curr;
-                        curr = curr->next();
-                    }
-
-                    if (curr != nullptr && curr->order_key() == order_key && !allow_multimapping) {
-                        return {static_cast<value_node_ptr>(curr), true};
-                    }
-                    return {static_cast<value_node_ptr>(curr), false};
-                }
-
-                void adjust_table_size(size_type total_elements, size_type current_size) {
-                    // Grow the table by a factor of 2 if possible and needed
-                    if ((float(total_elements) / float(current_size)) > my_max_load_factor) {
-                        // Double the size of the hash only if size hash not changed in between loads
-                        my_bucket_count.compare_exchange_strong(current_size, 2u * current_size);
-                    }
-                }
-
-                node_ptr insert_dummy_node(node_ptr parent_dummy_node, sokey_type order_key) {
-                    node_ptr prev_node = parent_dummy_node;
-
-                    node_ptr dummy_node = create_dummy_node(order_key);
-                    node_ptr next_node;
-
-                    do {
-                        next_node = prev_node->next();
-                        // Move forward through the list while the order key is less than requested
-                        while (next_node != nullptr && next_node->order_key() < order_key) {
-                            prev_node = next_node;
-                            next_node = next_node->next();
-                        }
-
-                        if (next_node != nullptr && next_node->order_key() == order_key) {
-                            // Another dummy node with the same order key was inserted by another thread
-                            // Destroy the node and exit
-                            destroy_node(dummy_node);
-                            return next_node;
-                        }
-                    } while (!try_insert(prev_node, dummy_node, next_node));
-
-                    return dummy_node;
-                }
-
-                // Try to insert a node between prev_node and expected next
-                // If the next is not equal to expected next - return false
-                static bool try_insert(node_ptr prev_node, node_ptr new_node, node_ptr current_next_node) {
-                    new_node->set_next(current_next_node);
-                    return prev_node->try_set_next(current_next_node, new_node);
-                }
-
-                // Returns the bucket, associated with the hash_key
-                node_ptr prepare_bucket(sokey_type hash_key) {
-                    size_type bucket = hash_key % my_bucket_count.load(std::memory_order_acquire);
-                    return get_bucket(bucket);
-                }
-
-                // Initialize the corresponding bucket if it is not initialized
-                node_ptr get_bucket(size_type bucket_index) {
-                    if (my_segments[bucket_index].load(std::memory_order_acquire) == nullptr) {
-                        init_bucket(bucket_index);
-                    }
-                    return my_segments[bucket_index].load(std::memory_order_acquire);
-                }
-
-                void init_bucket(size_type bucket) {
-                    if (bucket == 0) {
-                        // Atomicaly store the first bucket into my_head
-                        node_ptr disabled = nullptr;
-                        my_segments[0].compare_exchange_strong(disabled, &my_head);
-                        return;
-                    }
-
-                    size_type parent_bucket = get_parent(bucket);
-
-                    while (my_segments[parent_bucket].load(std::memory_order_acquire) == nullptr) {
-                        // Initialize all of the parent buckets
-                        init_bucket(parent_bucket);
-                    }
-
-                    __TBB_ASSERT(my_segments[parent_bucket].load(std::memory_order_acquire) != nullptr,
-                                 "Parent bucket should be initialized");
-                    node_ptr parent = my_segments[parent_bucket].load(std::memory_order_acquire);
-
-                    // Insert dummy node into the list
-                    node_ptr dummy_node = insert_dummy_node(parent, split_order_key_dummy(bucket));
-                    // TODO: consider returning pair<node_ptr, bool> to avoid store operation if the bucket was stored by an other thread
-                    // or move store to insert_dummy_node
-                    // Add dummy_node into the segment table
-                    my_segments[bucket].store(dummy_node, std::memory_order_release);
-                }
-
-                node_ptr create_dummy_node(sokey_type order_key) {
-                    node_allocator_type dummy_node_allocator(my_segments.get_allocator());
-                    node_ptr dummy_node = node_allocator_traits::allocate(dummy_node_allocator, 1);
-                    node_allocator_traits::construct(dummy_node_allocator, dummy_node, order_key);
-                    return dummy_node;
-                }
-
-                template <typename... Args>
-                value_node_ptr create_node(sokey_type order_key, Args&&... args) {
-                    value_node_allocator_type value_node_allocator(my_segments.get_allocator());
-                    // Allocate memory for the value_node
-                    value_node_ptr new_node = value_node_allocator_traits::allocate(value_node_allocator, 1);
-                    // Construct the node
-                    value_node_allocator_traits::construct(value_node_allocator, new_node, order_key);
-
-                    // try_call API is not convenient here due to broken
-                    // variadic capture on GCC 4.8.5
-                    auto value_guard = make_raii_guard([&] {
-                        value_node_allocator_traits::destroy(value_node_allocator, new_node);
-                        value_node_allocator_traits::deallocate(value_node_allocator, new_node, 1);
-                    });
-
-                    // Construct the value in the node
-                    value_node_allocator_traits::construct(value_node_allocator, new_node->storage(),
-                                                           std::forward<Args>(args)...);
-                    value_guard.dismiss();
-                    return new_node;
-                }
-
-                value_node_ptr first_value_node(node_ptr first_node) const {
-                    while (first_node != nullptr && first_node->is_dummy()) {
-                        first_node = first_node->next();
-                    }
-                    return static_cast<value_node_ptr>(first_node);
-                }
-
-                // Unsafe method, which removes the node from the list and returns the next node
-                node_ptr internal_erase(value_node_ptr node_to_erase) {
-                    __TBB_ASSERT(node_to_erase != nullptr, "Invalid iterator for erase");
-                    node_ptr next_node = node_to_erase->next();
-                    internal_extract(node_to_erase);
-                    destroy_node(node_to_erase);
-                    return next_node;
-                }
-
-                template <typename K>
-                size_type internal_erase_by_key(const K& key) {
-                    // TODO: consider reimplementation without equal_range - it is not effective to perform lookup over a bucket
-                    // for each unsafe_erase call
-                    auto eq_range = equal_range(key);
-                    size_type erased_count = 0;
-
-                    for (auto it = eq_range.first; it != eq_range.second;) {
-                        it = unsafe_erase(it);
-                        ++erased_count;
-                    }
-                    return erased_count;
-                }
-
-                // Unsafe method, which extracts the node from the list
-                void internal_extract(value_node_ptr node_to_extract) {
-                    const key_type& key = traits_type::get_key(node_to_extract->value());
-                    sokey_type hash_key = sokey_type(my_hash_compare(key));
-
-                    node_ptr prev_node = prepare_bucket(hash_key);
-
-                    for (node_ptr node = prev_node->next(); node != nullptr;
-                         prev_node = node, node = node->next()) {
-                        if (node == node_to_extract) {
-                            unlink_node(prev_node, node, node_to_extract->next());
-                            my_size.store(my_size.load(std::memory_order_relaxed) - 1,
-                                          std::memory_order_relaxed);
-                            return;
-                        }
-                        __TBB_ASSERT(node->order_key() <= node_to_extract->order_key(),
-                                     "node, which is going to be extracted should be presented in the list");
-                    }
-                }
-
-            protected:
-                template <typename SourceType>
-                void internal_merge(SourceType&& source) {
-                    static_assert(
-                            std::is_same<node_type, typename std::decay<SourceType>::type::node_type>::value,
-                            "Incompatible containers cannot be merged");
-
-                    for (node_ptr source_prev = &source.my_head; source_prev->next() != nullptr;) {
-                        if (!source_prev->next()->is_dummy()) {
-                            value_node_ptr curr = static_cast<value_node_ptr>(source_prev->next());
-                            // If the multimapping is allowed, or the key is not presented
-                            // in the *this container - extract the node from the list
-                            if (allow_multimapping || !contains(traits_type::get_key(curr->value()))) {
-                                node_ptr next_node = curr->next();
-                                source.unlink_node(source_prev, curr, next_node);
-
-                                // Remember the old order key
-                                sokey_type old_order_key = curr->order_key();
-
-                                // Node handle with curr cannot be used directly in insert call, because
-                                // the destructor of node_type will destroy curr
-                                node_type curr_node = node_handle_accessor::construct<node_type>(curr);
-
-                                // If the insertion fails - return ownership of the node to the source
-                                if (!insert(std::move(curr_node)).second) {
-                                    __TBB_ASSERT(!allow_multimapping,
-                                                 "Insertion should succeed for multicontainer");
-                                    __TBB_ASSERT(source_prev->next() == next_node,
-                                                 "Concurrent operations with the source container in merge "
-                                                 "are prohibited");
-
-                                    // Initialize the node with the old order key, because the order key
-                                    // can change during the insertion
-                                    curr->init(old_order_key);
-                                    __TBB_ASSERT(old_order_key >= source_prev->order_key()
-                                                         && (next_node == nullptr
-                                                             || old_order_key <= next_node->order_key()),
-                                                 "Wrong nodes order in the source container");
-                                    // Merge is unsafe for source container, so the insertion back can be done without compare_exchange
-                                    curr->set_next(next_node);
-                                    source_prev->set_next(curr);
-                                    source_prev = curr;
-                                    node_handle_accessor::deactivate(curr_node);
-                                } else {
-                                    source.my_size.fetch_sub(1, std::memory_order_relaxed);
-                                }
-                            } else {
-                                source_prev = curr;
-                            }
-                        } else {
-                            source_prev = source_prev->next();
-                        }
-                    }
-                }
-
-            private:
-                // Unsafe method, which unlinks the node between prev and next
-                void unlink_node(node_ptr prev_node, node_ptr node_to_unlink, node_ptr next_node) {
-                    __TBB_ASSERT(
-                            prev_node->next() == node_to_unlink && node_to_unlink->next() == next_node,
-                            "erasing and extracting nodes from the containers are unsafe in concurrent mode");
-                    prev_node->set_next(next_node);
-                    node_to_unlink->set_next(nullptr);
-                }
-
-                template <typename K>
-                value_node_ptr internal_find(const K& key) {
-                    sokey_type hash_key = sokey_type(my_hash_compare(key));
-                    sokey_type order_key = split_order_key_regular(hash_key);
-
-                    node_ptr curr = prepare_bucket(hash_key);
-
-                    while (curr != nullptr) {
-                        if (curr->order_key() > order_key) {
-                            // If the order key is greater than the requested order key,
-                            // the element is not in the hash table
-                            return nullptr;
-                        } else if (curr->order_key() == order_key
-                                   && my_hash_compare(
-                                           traits_type::get_key(static_cast<value_node_ptr>(curr)->value()),
-                                           key)) {
-                            // The fact that order keys match does not mean that the element is found.
-                            // Key function comparison has to be performed to check whether this is the
-                            // right element. If not, keep searching while order key is the same.
-                            return static_cast<value_node_ptr>(curr);
-                        }
-                        curr = curr->next();
-                    }
-
-                    return nullptr;
-                }
-
-                template <typename K>
-                std::pair<value_node_ptr, value_node_ptr> internal_equal_range(const K& key) {
-                    sokey_type hash_key = sokey_type(my_hash_compare(key));
-                    sokey_type order_key = split_order_key_regular(hash_key);
-
-                    node_ptr curr = prepare_bucket(hash_key);
-
-                    while (curr != nullptr) {
-                        if (curr->order_key() > order_key) {
-                            // If the order key is greater than the requested order key,
-                            // the element is not in the hash table
-                            return std::make_pair(nullptr, nullptr);
-                        } else if (curr->order_key() == order_key
-                                   && my_hash_compare(
-                                           traits_type::get_key(static_cast<value_node_ptr>(curr)->value()),
-                                           key)) {
-                            value_node_ptr first = static_cast<value_node_ptr>(curr);
-                            node_ptr last = first;
-                            do {
-                                last = last->next();
-                            } while (allow_multimapping && last != nullptr && !last->is_dummy()
-                                     && my_hash_compare(
-                                             traits_type::get_key(static_cast<value_node_ptr>(last)->value()),
-                                             key));
-                            return std::make_pair(first, first_value_node(last));
-                        }
-                        curr = curr->next();
-                    }
-                    return {nullptr, nullptr};
-                }
-
-                template <typename K>
-                size_type internal_count(const K& key) const {
-                    if (allow_multimapping) {
-                        // TODO: consider reimplementing the internal_equal_range with elements counting to avoid std::distance
-                        auto eq_range = equal_range(key);
-                        return std::distance(eq_range.first, eq_range.second);
-                    } else {
-                        return contains(key) ? 1 : 0;
-                    }
-                }
-
-                void internal_copy(const concurrent_unordered_base& other) {
-                    node_ptr last_node = &my_head;
-                    my_segments[0].store(&my_head, std::memory_order_relaxed);
-
-                    for (node_ptr node = other.my_head.next(); node != nullptr; node = node->next()) {
-                        node_ptr new_node;
-                        if (!node->is_dummy()) {
-                            // The node in the right table contains a value
-                            new_node = create_node(node->order_key(),
-                                                   static_cast<value_node_ptr>(node)->value());
-                        } else {
-                            // The node in the right table is a dummy node
-                            new_node = create_dummy_node(node->order_key());
-                            my_segments[reverse_bits(node->order_key())].store(new_node,
-                                                                               std::memory_order_relaxed);
-                        }
-
-                        last_node->set_next(new_node);
-                        last_node = new_node;
-                    }
-                }
-
-                void internal_move(concurrent_unordered_base&& other) {
-                    node_ptr last_node = &my_head;
-                    my_segments[0].store(&my_head, std::memory_order_relaxed);
-
-                    for (node_ptr node = other.my_head.next(); node != nullptr; node = node->next()) {
-                        node_ptr new_node;
-                        if (!node->is_dummy()) {
-                            // The node in the right table contains a value
-                            new_node = create_node(node->order_key(),
-                                                   std::move(static_cast<value_node_ptr>(node)->value()));
-                        } else {
-                            // TODO: do we need to destroy a dummy node in the right container?
-                            // The node in the right table is a dummy_node
-                            new_node = create_dummy_node(node->order_key());
-                            my_segments[reverse_bits(node->order_key())].store(new_node,
-                                                                               std::memory_order_relaxed);
-                        }
-
-                        last_node->set_next(new_node);
-                        last_node = new_node;
-                    }
-                }
-
-                void move_content(concurrent_unordered_base&& other) {
-                    // NOTE: allocators should be equal
-                    my_head.set_next(other.my_head.next());
-                    other.my_head.set_next(nullptr);
-                    my_segments[0].store(&my_head, std::memory_order_relaxed);
-
-                    other.my_bucket_count.store(initial_bucket_count, std::memory_order_relaxed);
-                    other.my_max_load_factor = initial_max_load_factor;
-                    other.my_size.store(0, std::memory_order_relaxed);
+            return { iterator(insert_result.node_with_equal_key), insert_result.inserted };
+        }
+        return {end(), false};
+    }
+
+    iterator insert( const_iterator, node_type&& nh ) {
+        // Ignore hint
+        return insert(std::move(nh)).first;
+    }
+
+    template <typename... Args>
+    std::pair<iterator, bool> emplace( Args&&... args ) {
+        // Create a node with temporary order_key 0, which will be reinitialize
+        // in internal_insert after the hash calculation
+        value_node_ptr insert_node = create_node(0, std::forward<Args>(args)...);
+
+        auto init_node = [&insert_node]( sokey_type order_key )->value_node_ptr {
+            insert_node->init(order_key);
+            return insert_node;
+        };
+
+        auto insert_result = internal_insert(insert_node->value(), init_node);
+
+        if (!insert_result.inserted) {
+            // If the insertion failed - destroy the node which was created
+            insert_node->init(split_order_key_regular(1));
+            destroy_node(insert_node);
+        }
+
+        return { iterator(insert_result.node_with_equal_key), insert_result.inserted };
+    }
+
+    template <typename... Args>
+    iterator emplace_hint( const_iterator, Args&&... args ) {
+        // Ignore hint
+        return emplace(std::forward<Args>(args)...).first;
+    }
+
+    iterator unsafe_erase( const_iterator pos ) {
+        return iterator(first_value_node(internal_erase(pos.get_node_ptr())));
+    }
+
+    iterator unsafe_erase( iterator pos ) {
+        return iterator(first_value_node(internal_erase(pos.get_node_ptr())));
+    }
+
+    iterator unsafe_erase( const_iterator first, const_iterator last ) {
+        while(first != last) {
+            first = unsafe_erase(first);
+        }
+        return iterator(first.get_node_ptr());
+    }
+
+    size_type unsafe_erase( const key_type& key ) {
+        return internal_erase_by_key(key);
+    }
+
+    template <typename K>
+    typename std::enable_if<is_transparent<K>::value
+                            && !std::is_convertible<K, const_iterator>::value
+                            && !std::is_convertible<K, iterator>::value,
+                            size_type>::type unsafe_erase( const K& key )
+    {
+        return internal_erase_by_key(key);
+    }
+
+    node_type unsafe_extract( const_iterator pos ) {
+        internal_extract(pos.get_node_ptr());
+        return d1::node_handle_accessor::construct<node_type>(pos.get_node_ptr());
+    }
+
+    node_type unsafe_extract( iterator pos ) {
+        internal_extract(pos.get_node_ptr());
+        return d1::node_handle_accessor::construct<node_type>(pos.get_node_ptr());
+    }
+
+    node_type unsafe_extract( const key_type& key ) {
+        iterator item = find(key);
+        return item == end() ? node_type() : unsafe_extract(item);
+    }
+
+    template <typename K>
+    typename std::enable_if<is_transparent<K>::value
+                            && !std::is_convertible<K, const_iterator>::value
+                            && !std::is_convertible<K, iterator>::value,
+                            node_type>::type unsafe_extract( const K& key )
+    {
+        iterator item = find(key);
+        return item == end() ? node_type() : unsafe_extract(item);
+    }
+
+    // Lookup functions
+    iterator find( const key_type& key ) {
+        value_node_ptr result = internal_find(key);
+        return result == nullptr ? end() : iterator(result);
+    }
+
+    const_iterator find( const key_type& key ) const {
+        value_node_ptr result = const_cast<self_type*>(this)->internal_find(key);
+        return result == nullptr ? end() : const_iterator(result);
+    }
+
+    template <typename K>
+    typename std::enable_if<is_transparent<K>::value, iterator>::type find( const K& key ) {
+        value_node_ptr result = internal_find(key);
+        return result == nullptr ? end() : iterator(result);
+    }
+
+    template <typename K>
+    typename std::enable_if<is_transparent<K>::value, const_iterator>::type find( const K& key ) const {
+        value_node_ptr result = const_cast<self_type*>(this)->internal_find(key);
+        return result == nullptr ? end() : const_iterator(result);
+    }
+
+    std::pair<iterator, iterator> equal_range( const key_type& key ) {
+        auto result = internal_equal_range(key);
+        return std::make_pair(iterator(result.first), iterator(result.second));
+    }
+
+    std::pair<const_iterator, const_iterator> equal_range( const key_type& key ) const {
+        auto result = const_cast<self_type*>(this)->internal_equal_range(key);
+        return std::make_pair(const_iterator(result.first), const_iterator(result.second));
+    }
+
+    template <typename K>
+    typename std::enable_if<is_transparent<K>::value, std::pair<iterator, iterator>>::type equal_range( const K& key ) {
+        auto result = internal_equal_range(key);
+        return std::make_pair(iterator(result.first), iterator(result.second));
+    }
+
+    template <typename K>
+    typename std::enable_if<is_transparent<K>::value, std::pair<const_iterator, const_iterator>>::type equal_range( const K& key ) const {
+        auto result = const_cast<self_type*>(this)->internal_equal_range(key);
+        return std::make_pair(iterator(result.first), iterator(result.second));
+    }
+
+    size_type count( const key_type& key ) const {
+        return internal_count(key);
+    }
+
+    template <typename K>
+    typename std::enable_if<is_transparent<K>::value, size_type>::type count( const K& key ) const {
+        return internal_count(key);
+    }
+
+    bool contains( const key_type& key ) const {
+        return find(key) != end();
+    }
+
+    template <typename K>
+    typename std::enable_if<is_transparent<K>::value, bool>::type contains( const K& key ) const {
+        return find(key) != end();
+    }
+
+    // Bucket interface
+    local_iterator unsafe_begin( size_type n ) {
+        return local_iterator(first_value_node(get_bucket(n)));
+    }
+
+    const_local_iterator unsafe_begin( size_type n ) const {
+        auto bucket_begin = first_value_node(const_cast<self_type*>(this)->get_bucket(n));
+        return const_local_iterator(bucket_begin);
+    }
+
+    const_local_iterator unsafe_cbegin( size_type n ) const {
+        auto bucket_begin = first_value_node(const_cast<self_type*>(this)->get_bucket(n));
+        return const_local_iterator(bucket_begin);
+    }
+
+    local_iterator unsafe_end( size_type n ) {
+        size_type bucket_count = my_bucket_count.load(std::memory_order_relaxed);
+        return n != bucket_count - 1 ? unsafe_begin(get_next_bucket_index(n)) : local_iterator(nullptr);
+    }
+
+    const_local_iterator unsafe_end( size_type n ) const {
+        size_type bucket_count = my_bucket_count.load(std::memory_order_relaxed);
+        return n != bucket_count - 1 ? unsafe_begin(get_next_bucket_index(n)) : const_local_iterator(nullptr);
+    }
+
+    const_local_iterator unsafe_cend( size_type n ) const {
+        size_type bucket_count = my_bucket_count.load(std::memory_order_relaxed);
+        return n != bucket_count - 1 ? unsafe_begin(get_next_bucket_index(n)) : const_local_iterator(nullptr);
+    }
+
+    size_type unsafe_bucket_count() const { return my_bucket_count.load(std::memory_order_relaxed); }
+
+    size_type unsafe_max_bucket_count() const {
+        return max_size();
+    }
+
+    size_type unsafe_bucket_size( size_type n ) const {
+        return size_type(std::distance(unsafe_begin(n), unsafe_end(n)));
+    }
+
+    size_type unsafe_bucket( const key_type& key ) const {
+        return my_hash_compare(key) % my_bucket_count.load(std::memory_order_relaxed);
+    }
+
+    // Hash policy
+    float load_factor() const {
+        return float(size() / float(my_bucket_count.load(std::memory_order_acquire)));
+    }
+
+    float max_load_factor() const { return my_max_load_factor; }
+
+    void max_load_factor( float mlf ) {
+        if (mlf != mlf || mlf < 0) {
+            tbb::detail::throw_exception(exception_id::invalid_load_factor);
+        }
+        my_max_load_factor = mlf;
+    } // TODO: unsafe?
+
+    void rehash( size_type bucket_count ) {
+        size_type current_bucket_count = my_bucket_count.load(std::memory_order_acquire);
+        if (current_bucket_count < bucket_count) {
+            // TODO: do we need do-while here?
+            my_bucket_count.compare_exchange_strong(current_bucket_count, round_up_to_power_of_two(bucket_count));
+        }
+    }
+
+    void reserve( size_type elements_count ) {
+        size_type current_bucket_count = my_bucket_count.load(std::memory_order_acquire);
+        size_type necessary_bucket_count = current_bucket_count;
+
+        // max_load_factor() is currently unsafe, so we can assume that my_max_load_factor
+        // would not be changed during the calculation
+        // TODO: Log2 seems useful here
+        while (necessary_bucket_count * max_load_factor() < elements_count) {
+                necessary_bucket_count <<= 1;
+        }
+
+        while (!my_bucket_count.compare_exchange_strong(current_bucket_count, necessary_bucket_count)) {
+            if (current_bucket_count >= necessary_bucket_count)
+                break;
+        }
+    }
+
+    // Observers
+    hasher hash_function() const { return my_hash_compare.hash_function(); }
+    key_equal key_eq() const { return my_hash_compare.key_eq(); }
+
+    class const_range_type {
+    private:
+        const concurrent_unordered_base& my_instance;
+        node_ptr my_begin_node; // may be node* const
+        node_ptr my_end_node;
+        mutable node_ptr my_midpoint_node;
+    public:
+        using size_type = typename concurrent_unordered_base::size_type;
+        using value_type = typename concurrent_unordered_base::value_type;
+        using reference = typename concurrent_unordered_base::reference;
+        using difference_type = typename concurrent_unordered_base::difference_type;
+        using iterator = typename concurrent_unordered_base::const_iterator;
+
+        bool empty() const { return my_begin_node == my_end_node; }
+
+        bool is_divisible() const {
+            return my_midpoint_node != my_end_node;
+        }
+
+        size_type grainsize() const { return 1; }
+
+        const_range_type( const_range_type& range, split )
+            : my_instance(range.my_instance),
+              my_begin_node(range.my_midpoint_node),
+              my_end_node(range.my_end_node)
+        {
+            range.my_end_node = my_begin_node;
+            __TBB_ASSERT(!empty(), "Splitting despite the range is not divisible");
+            __TBB_ASSERT(!range.empty(), "Splitting despite the range is not divisible");
+            set_midpoint();
+            range.set_midpoint();
+        }
+
+        iterator begin() const { return iterator(my_instance.first_value_node(my_begin_node)); }
+        iterator end() const { return iterator(my_instance.first_value_node(my_end_node)); }
+
+        const_range_type( const concurrent_unordered_base& table )
+            : my_instance(table), my_begin_node(my_instance.first_value_node(const_cast<node_ptr>(&table.my_head))), my_end_node(nullptr)
+        {
+            set_midpoint();
+        }
+    private:
+        void set_midpoint() const {
+            if (empty()) {
+                my_midpoint_node = my_end_node;
+            } else {
+                sokey_type invalid_key = ~sokey_type(0);
+                sokey_type begin_key = my_begin_node != nullptr ? my_begin_node->order_key() : invalid_key;
+                sokey_type end_key = my_end_node != nullptr ? my_end_node->order_key() : invalid_key;
+
+                size_type mid_bucket = reverse_bits(begin_key + (end_key - begin_key) / 2) %
+                    my_instance.my_bucket_count.load(std::memory_order_relaxed);
+                while( my_instance.my_segments[mid_bucket].load(std::memory_order_relaxed) == nullptr) {
+                    mid_bucket = my_instance.get_parent(mid_bucket);
+                }
+                if (reverse_bits(mid_bucket) > begin_key) {
+                    // Found a dummy node between begin and end
+                    my_midpoint_node = my_instance.first_value_node(
+                        my_instance.my_segments[mid_bucket].load(std::memory_order_relaxed));
+                } else {
+                    // Didn't find a dummy node between begin and end
+                    my_midpoint_node = my_end_node;
                 }
+            }
+        }
+    }; // class const_range_type
+
+    class range_type : public const_range_type {
+    public:
+        using iterator = typename concurrent_unordered_base::iterator;
+        using const_range_type::const_range_type;
+
+        iterator begin() const { return iterator(const_range_type::begin().get_node_ptr()); }
+        iterator end() const { return iterator(const_range_type::end().get_node_ptr()); }
+    }; // class range_type
+
+    // Parallel iteration
+    range_type range() {
+        return range_type(*this);
+    }
+
+    const_range_type range() const {
+        return const_range_type(*this);
+    }
+protected:
+    static constexpr bool allow_multimapping = traits_type::allow_multimapping;
+
+private:
+    static constexpr size_type initial_bucket_count = 8;
+    static constexpr float initial_max_load_factor = 4; // TODO: consider 1?
+    static constexpr size_type pointers_per_embedded_table = sizeof(size_type) * 8 - 1;
+
+    class unordered_segment_table
+        : public d1::segment_table<std::atomic<node_ptr>, allocator_type, unordered_segment_table, pointers_per_embedded_table>
+    {
+        using self_type = unordered_segment_table;
+        using atomic_node_ptr = std::atomic<node_ptr>;
+        using base_type = d1::segment_table<std::atomic<node_ptr>, allocator_type, unordered_segment_table, pointers_per_embedded_table>;
+        using segment_type = typename base_type::segment_type;
+        using base_allocator_type = typename base_type::allocator_type;
+
+        using segment_allocator_type = typename allocator_traits_type::template rebind_alloc<atomic_node_ptr>;
+        using segment_allocator_traits = tbb::detail::allocator_traits<segment_allocator_type>;
+    public:
+        // Segment table for unordered containers should not be extended in the wait- free implementation
+        static constexpr bool allow_table_extending = false;
+        static constexpr bool is_noexcept_assignment = std::is_nothrow_move_assignable<hasher>::value &&
+                                                       std::is_nothrow_move_assignable<key_equal>::value &&
+                                                       segment_allocator_traits::is_always_equal::value;
+        static constexpr bool is_noexcept_swap = tbb::detail::is_nothrow_swappable<hasher>::value &&
+                                                 tbb::detail::is_nothrow_swappable<key_equal>::value &&
+                                                 segment_allocator_traits::is_always_equal::value;
+
+        // TODO: using base_type::base_type is not compiling on Windows and Intel Compiler - investigate
+        unordered_segment_table( const base_allocator_type& alloc = base_allocator_type() )
+            : base_type(alloc) {}
+
+        unordered_segment_table( const unordered_segment_table& ) = default;
+
+        unordered_segment_table( const unordered_segment_table& other, const base_allocator_type& alloc )
+            : base_type(other, alloc) {}
+
+        unordered_segment_table( unordered_segment_table&& ) = default;
+
+        unordered_segment_table( unordered_segment_table&& other, const base_allocator_type& alloc )
+            : base_type(std::move(other), alloc) {}
+
+        unordered_segment_table& operator=( const unordered_segment_table& ) = default;
+
+        unordered_segment_table& operator=( unordered_segment_table&& ) = default;
+
+        segment_type create_segment( typename base_type::segment_table_type, typename base_type::segment_index_type segment_index, size_type ) {
+            segment_allocator_type alloc(this->get_allocator());
+            size_type seg_size = this->segment_size(segment_index);
+            segment_type new_segment = segment_allocator_traits::allocate(alloc, seg_size);
+            for (size_type i = 0; i != seg_size; ++i) {
+                segment_allocator_traits::construct(alloc, new_segment + i, nullptr);
+            }
+            return new_segment;
+        }
+
+        segment_type nullify_segment( typename base_type::segment_table_type table, size_type segment_index ) {
+            segment_type target_segment = table[segment_index].load(std::memory_order_relaxed);
+            table[segment_index].store(nullptr, std::memory_order_relaxed);
+            return target_segment;
+        }
+
+        // deallocate_segment is required by the segment_table base class, but
+        // in unordered, it is also necessary to call the destructor during deallocation
+        void deallocate_segment( segment_type address, size_type index ) {
+            destroy_segment(address, index);
+        }
+
+        void destroy_segment( segment_type address, size_type index ) {
+            segment_allocator_type alloc(this->get_allocator());
+            for (size_type i = 0; i != this->segment_size(index); ++i) {
+                segment_allocator_traits::destroy(alloc, address + i);
+            }
+            segment_allocator_traits::deallocate(alloc, address, this->segment_size(index));
+        }
 
-                void internal_move_construct_with_allocator(concurrent_unordered_base&& other,
-                                                            const allocator_type&,
-                                                            /*is_always_equal = */ std::true_type) {
-                    // Allocators are always equal - no need to compare for equality
-                    move_content(std::move(other));
-                }
 
-                void internal_move_construct_with_allocator(concurrent_unordered_base&& other,
-                                                            const allocator_type& alloc,
-                                                            /*is_always_equal = */ std::false_type) {
-                    // Allocators are not always equal
-                    if (alloc == other.my_segments.get_allocator()) {
-                        move_content(std::move(other));
-                    } else {
-                        try_call([&] { internal_move(std::move(other)); }).on_exception([&] { clear(); });
-                    }
+        void copy_segment( size_type index, segment_type, segment_type to ) {
+            if (index == 0) {
+                // The first element in the first segment is embedded into the table (my_head)
+                // so the first pointer should not be stored here
+                // It would be stored during move ctor/assignment operation
+                to[1].store(nullptr, std::memory_order_relaxed);
+            } else {
+                for (size_type i = 0; i != this->segment_size(index); ++i) {
+                    to[i].store(nullptr, std::memory_order_relaxed);
                 }
-
-                // Move assigns the hash table to other is any instances of allocator_type are always equal
-                // or propagate_on_container_move_assignment is true
-                void internal_move_assign(concurrent_unordered_base&& other,
-                                          /*is_always_equal || POCMA = */ std::true_type) {
-                    move_content(std::move(other));
+            }
+        }
+
+        void move_segment( size_type index, segment_type from, segment_type to ) {
+            if (index == 0) {
+                // The first element in the first segment is embedded into the table (my_head)
+                // so the first pointer should not be stored here
+                // It would be stored during move ctor/assignment operation
+                to[1].store(from[1].load(std::memory_order_relaxed), std::memory_order_relaxed);
+            } else {
+                for (size_type i = 0; i != this->segment_size(index); ++i) {
+                    to[i].store(from[i].load(std::memory_order_relaxed), std::memory_order_relaxed);
+                    from[i].store(nullptr, std::memory_order_relaxed);
                 }
+            }
+        }
+
+        // allocate_long_table is required by the segment_table base class, but unused for unordered containers
+        typename base_type::segment_table_type allocate_long_table( const typename base_type::atomic_segment*, size_type ) {
+            __TBB_ASSERT(false, "This method should never been called");
+            // TableType is a pointer
+            return nullptr;
+        }
+
+        // destroy_elements is required by the segment_table base class, but unused for unordered containers
+        // this function call but do nothing
+        void destroy_elements() {}
+    }; // struct unordered_segment_table
+
+    void internal_clear() {
+        // TODO: consider usefulness of two versions of clear() - with dummy nodes deallocation and without it
+        node_ptr next = my_head.next();
+        node_ptr curr = next;
+
+        my_head.set_next(nullptr);
+
+        while (curr != nullptr) {
+            next = curr->next();
+            destroy_node(curr);
+            curr = next;
+        }
+
+        my_size.store(0, std::memory_order_relaxed);
+        my_segments.clear();
+    }
+
+    void destroy_node( node_ptr node ) {
+        if (node->is_dummy()) {
+            node_allocator_type dummy_node_allocator(my_segments.get_allocator());
+            // Destroy the node
+            node_allocator_traits::destroy(dummy_node_allocator, node);
+            // Deallocate the memory
+            node_allocator_traits::deallocate(dummy_node_allocator, node, 1);
+        } else {
+            // GCC 11.1 issues a warning here that incorrect destructor might be called for dummy_nodes
+            #if (__TBB_GCC_VERSION >= 110100 && __TBB_GCC_VERSION < 150000 ) && !__clang__ && !__INTEL_COMPILER
+            volatile
+            #endif
+            value_node_ptr val_node = static_cast<value_node_ptr>(node);
+            value_node_allocator_type value_node_allocator(my_segments.get_allocator());
+            // Destroy the value
+            value_node_allocator_traits::destroy(value_node_allocator, val_node->storage());
+            // Destroy the node
+            value_node_allocator_traits::destroy(value_node_allocator, val_node);
+            // Deallocate the memory
+            value_node_allocator_traits::deallocate(value_node_allocator, val_node, 1);
+        }
+    }
+
+    struct internal_insert_return_type {
+        // If the insertion failed - the remaining_node points to the node, which was failed to insert
+        // This node can be allocated in process of insertion
+        value_node_ptr remaining_node;
+        // If the insertion failed - node_with_equal_key points to the node in the list with the
+        // key, equivalent to the inserted, otherwise it points to the node, which was inserted.
+        value_node_ptr node_with_equal_key;
+        // Insertion status
+        // NOTE: if it is true - remaining_node should be nullptr
+        bool inserted;
+    }; // struct internal_insert_return_type
+
+    // Inserts the value into the split ordered list
+    template <typename ValueType>
+    std::pair<iterator, bool> internal_insert_value( ValueType&& value ) {
+
+        auto create_value_node = [&value, this]( sokey_type order_key )->value_node_ptr {
+            return create_node(order_key, std::forward<ValueType>(value));
+        };
+
+        auto insert_result = internal_insert(value, create_value_node);
+
+        if (insert_result.remaining_node != nullptr) {
+            // If the insertion fails - destroy the node which was failed to insert if it exist
+            __TBB_ASSERT(!insert_result.inserted,
+                         "remaining_node should be nullptr if the node was successfully inserted");
+            destroy_node(insert_result.remaining_node);
+        }
+
+        return { iterator(insert_result.node_with_equal_key), insert_result.inserted };
+    }
+
+    // Inserts the node into the split ordered list
+    // Creates a node using the specified callback after the place for insertion was found
+    // Returns internal_insert_return_type object, where:
+    //     - If the insertion succeeded:
+    //         - remaining_node is nullptr
+    //         - node_with_equal_key point to the inserted node
+    //         - inserted is true
+    //     - If the insertion failed:
+    //         - remaining_node points to the node, that was failed to insert if it was created.
+    //           nullptr if the node was not created, because the requested key was already
+    //           presented in the list
+    //         - node_with_equal_key point to the element in the list with the key, equivalent to
+    //           to the requested key
+    //         - inserted is false
+    template <typename ValueType, typename CreateInsertNode>
+    internal_insert_return_type internal_insert( ValueType&& value, CreateInsertNode create_insert_node ) {
+        static_assert(std::is_same<typename std::decay<ValueType>::type, value_type>::value,
+                      "Incorrect type in internal_insert");
+        const key_type& key = traits_type::get_key(value);
+        sokey_type hash_key = sokey_type(my_hash_compare(key));
+
+        sokey_type order_key = split_order_key_regular(hash_key);
+        node_ptr prev = prepare_bucket(hash_key);
+        __TBB_ASSERT(prev != nullptr, "Invalid head node");
+
+        auto search_result = search_after(prev, order_key, key);
+
+        if (search_result.second) {
+            return internal_insert_return_type{ nullptr, search_result.first, false };
+        }
+
+        value_node_ptr new_node = create_insert_node(order_key);
+        node_ptr curr = search_result.first;
+
+        while (!try_insert(prev, new_node, curr)) {
+            search_result = search_after(prev, order_key, key);
+            if (search_result.second) {
+                return internal_insert_return_type{ new_node, search_result.first, false };
+            }
+            curr = search_result.first;
+        }
+
+        auto sz = my_size.fetch_add(1);
+        adjust_table_size(sz + 1, my_bucket_count.load(std::memory_order_acquire));
+        return internal_insert_return_type{ nullptr, static_cast<value_node_ptr>(new_node), true };
+    }
+
+    // Searches the node with the key, equivalent to key with requested order key after the node prev
+    // Returns the existing node and true if the node is already in the list
+    // Returns the first node with the order key, greater than requested and false if the node is not presented in the list
+    std::pair<value_node_ptr, bool> search_after( node_ptr& prev, sokey_type order_key, const key_type& key ) {
+        // NOTE: static_cast<value_node_ptr>(curr) should be done only after we would ensure
+        // that the node is not a dummy node
+
+        node_ptr curr = prev->next();
+
+        while (curr != nullptr && (curr->order_key() < order_key ||
+               (curr->order_key() == order_key && !my_hash_compare(traits_type::get_key(static_cast<value_node_ptr>(curr)->value()), key))))
+        {
+            prev = curr;
+            curr = curr->next();
+        }
+
+        if (curr != nullptr && curr->order_key() == order_key && !allow_multimapping) {
+            return { static_cast<value_node_ptr>(curr), true };
+        }
+        return { static_cast<value_node_ptr>(curr), false };
+    }
+
+    void adjust_table_size( size_type total_elements, size_type current_size ) {
+        // Grow the table by a factor of 2 if possible and needed
+        if ( (float(total_elements) / float(current_size)) > my_max_load_factor ) {
+            // Double the size of the hash only if size hash not changed in between loads
+            my_bucket_count.compare_exchange_strong(current_size, 2u * current_size);
+        }
+    }
+
+    node_ptr insert_dummy_node( node_ptr parent_dummy_node, sokey_type order_key ) {
+        node_ptr prev_node = parent_dummy_node;
+
+        node_ptr dummy_node = create_dummy_node(order_key);
+        node_ptr next_node;
+
+        do {
+            next_node = prev_node->next();
+            // Move forward through the list while the order key is less than requested
+            while (next_node != nullptr && next_node->order_key() < order_key) {
+                prev_node = next_node;
+                next_node = next_node->next();
+            }
 
-                // Move assigns the hash table to other is any instances of allocator_type are not always equal
-                // and propagate_on_container_move_assignment is false
-                void internal_move_assign(concurrent_unordered_base&& other,
-                                          /*is_always_equal || POCMA = */ std::false_type) {
-                    if (my_segments.get_allocator() == other.my_segments.get_allocator()) {
-                        move_content(std::move(other));
+            if (next_node != nullptr && next_node->order_key() == order_key) {
+                // Another dummy node with the same order key was inserted by another thread
+                // Destroy the node and exit
+                destroy_node(dummy_node);
+                return next_node;
+            }
+        } while (!try_insert(prev_node, dummy_node, next_node));
+
+        return dummy_node;
+    }
+
+    // Try to insert a node between prev_node and expected next
+    // If the next is not equal to expected next - return false
+    static bool try_insert( node_ptr prev_node, node_ptr new_node, node_ptr current_next_node ) {
+        new_node->set_next(current_next_node);
+        return prev_node->try_set_next(current_next_node, new_node);
+    }
+
+    // Returns the bucket, associated with the hash_key
+    node_ptr prepare_bucket( sokey_type hash_key ) {
+        size_type bucket = hash_key % my_bucket_count.load(std::memory_order_acquire);
+        return get_bucket(bucket);
+    }
+
+    // Initialize the corresponding bucket if it is not initialized
+    node_ptr get_bucket( size_type bucket_index ) {
+        if (my_segments[bucket_index].load(std::memory_order_acquire) == nullptr) {
+            init_bucket(bucket_index);
+        }
+        return my_segments[bucket_index].load(std::memory_order_acquire);
+    }
+
+    void init_bucket( size_type bucket ) {
+        if (bucket == 0) {
+            // Atomicaly store the first bucket into my_head
+            node_ptr disabled = nullptr;
+            my_segments[0].compare_exchange_strong(disabled, &my_head);
+            return;
+        }
+
+        size_type parent_bucket = get_parent(bucket);
+
+        while (my_segments[parent_bucket].load(std::memory_order_acquire) == nullptr) {
+            // Initialize all of the parent buckets
+            init_bucket(parent_bucket);
+        }
+
+        __TBB_ASSERT(my_segments[parent_bucket].load(std::memory_order_acquire) != nullptr, "Parent bucket should be initialized");
+        node_ptr parent = my_segments[parent_bucket].load(std::memory_order_acquire);
+
+        // Insert dummy node into the list
+        node_ptr dummy_node = insert_dummy_node(parent, split_order_key_dummy(bucket));
+        // TODO: consider returning pair<node_ptr, bool> to avoid store operation if the bucket was stored by an other thread
+        // or move store to insert_dummy_node
+        // Add dummy_node into the segment table
+        my_segments[bucket].store(dummy_node, std::memory_order_release);
+    }
+
+    node_ptr create_dummy_node( sokey_type order_key ) {
+        node_allocator_type dummy_node_allocator(my_segments.get_allocator());
+        node_ptr dummy_node = node_allocator_traits::allocate(dummy_node_allocator, 1);
+        node_allocator_traits::construct(dummy_node_allocator, dummy_node, order_key);
+        return dummy_node;
+    }
+
+    template <typename... Args>
+    value_node_ptr create_node( sokey_type order_key, Args&&... args ) {
+        value_node_allocator_type value_node_allocator(my_segments.get_allocator());
+        // Allocate memory for the value_node
+        value_node_ptr new_node = value_node_allocator_traits::allocate(value_node_allocator, 1);
+        // Construct the node
+        value_node_allocator_traits::construct(value_node_allocator, new_node, order_key);
+
+        // try_call API is not convenient here due to broken
+        // variadic capture on GCC 4.8.5
+        auto value_guard = make_raii_guard([&] {
+            value_node_allocator_traits::destroy(value_node_allocator, new_node);
+            value_node_allocator_traits::deallocate(value_node_allocator, new_node, 1);
+        });
+
+        // Construct the value in the node
+        value_node_allocator_traits::construct(value_node_allocator, new_node->storage(), std::forward<Args>(args)...);
+        value_guard.dismiss();
+        return new_node;
+    }
+
+    value_node_ptr first_value_node( node_ptr first_node ) const {
+        while (first_node != nullptr && first_node->is_dummy()) {
+            first_node = first_node->next();
+        }
+        return static_cast<value_node_ptr>(first_node);
+    }
+
+    // Unsafe method, which removes the node from the list and returns the next node
+    node_ptr internal_erase( value_node_ptr node_to_erase ) {
+        __TBB_ASSERT(node_to_erase != nullptr, "Invalid iterator for erase");
+        node_ptr next_node = node_to_erase->next();
+        internal_extract(node_to_erase);
+        destroy_node(node_to_erase);
+        return next_node;
+    }
+
+    template <typename K>
+    size_type internal_erase_by_key( const K& key ) {
+        // TODO: consider reimplementation without equal_range - it is not effective to perform lookup over a bucket
+        // for each unsafe_erase call
+        auto eq_range = equal_range(key);
+        size_type erased_count = 0;
+
+        for (auto it = eq_range.first; it != eq_range.second;) {
+            it = unsafe_erase(it);
+            ++erased_count;
+        }
+        return erased_count;
+    }
+
+    // Unsafe method, which extracts the node from the list
+    void internal_extract( value_node_ptr node_to_extract ) {
+        const key_type& key = traits_type::get_key(node_to_extract->value());
+        sokey_type hash_key = sokey_type(my_hash_compare(key));
+
+        node_ptr prev_node = prepare_bucket(hash_key);
+
+        for (node_ptr node = prev_node->next(); node != nullptr; prev_node = node, node = node->next()) {
+            if (node == node_to_extract) {
+                unlink_node(prev_node, node, node_to_extract->next());
+                my_size.store(my_size.load(std::memory_order_relaxed) - 1, std::memory_order_relaxed);
+                return;
+            }
+            __TBB_ASSERT(node->order_key() <= node_to_extract->order_key(),
+                         "node, which is going to be extracted should be presented in the list");
+        }
+    }
+
+protected:
+    template <typename SourceType>
+    void internal_merge( SourceType&& source ) {
+        static_assert(std::is_same<node_type, typename std::decay<SourceType>::type::node_type>::value,
+                      "Incompatible containers cannot be merged");
+
+        for (node_ptr source_prev = &source.my_head; source_prev->next() != nullptr;) {
+            if (!source_prev->next()->is_dummy()) {
+                value_node_ptr curr = static_cast<value_node_ptr>(source_prev->next());
+                // If the multimapping is allowed, or the key is not presented
+                // in the *this container - extract the node from the list
+                if (allow_multimapping || !contains(traits_type::get_key(curr->value()))) {
+                    node_ptr next_node = curr->next();
+                    source.unlink_node(source_prev, curr, next_node);
+
+                    // Remember the old order key
+                    sokey_type old_order_key = curr->order_key();
+
+                    // Node handle with curr cannot be used directly in insert call, because
+                    // the destructor of node_type will destroy curr
+                    node_type curr_node = d1::node_handle_accessor::construct<node_type>(curr);
+
+                    // If the insertion fails - return ownership of the node to the source
+                    if (!insert(std::move(curr_node)).second) {
+                        __TBB_ASSERT(!allow_multimapping, "Insertion should succeed for multicontainer");
+                        __TBB_ASSERT(source_prev->next() == next_node,
+                                     "Concurrent operations with the source container in merge are prohibited");
+
+                        // Initialize the node with the old order key, because the order key
+                        // can change during the insertion
+                        curr->init(old_order_key);
+                        __TBB_ASSERT(old_order_key >= source_prev->order_key() &&
+                                     (next_node == nullptr || old_order_key <= next_node->order_key()),
+                                     "Wrong nodes order in the source container");
+                        // Merge is unsafe for source container, so the insertion back can be done without compare_exchange
+                        curr->set_next(next_node);
+                        source_prev->set_next(curr);
+                        source_prev = curr;
+                        d1::node_handle_accessor::deactivate(curr_node);
                     } else {
-                        // TODO: guards for exceptions
-                        internal_move(std::move(other));
+                        source.my_size.fetch_sub(1, std::memory_order_relaxed);
                     }
+                } else {
+                    source_prev = curr;
                 }
+            } else {
+                source_prev = source_prev->next();
+            }
+        }
+    }
+
+private:
+    // Unsafe method, which unlinks the node between prev and next
+    void unlink_node( node_ptr prev_node, node_ptr node_to_unlink, node_ptr next_node ) {
+        __TBB_ASSERT(prev_node->next() == node_to_unlink &&
+                     node_to_unlink->next() == next_node,
+                     "erasing and extracting nodes from the containers are unsafe in concurrent mode");
+        prev_node->set_next(next_node);
+        node_to_unlink->set_next(nullptr);
+    }
+
+    template <typename K>
+    value_node_ptr internal_find( const K& key ) {
+        sokey_type hash_key = sokey_type(my_hash_compare(key));
+        sokey_type order_key = split_order_key_regular(hash_key);
+
+        node_ptr curr = prepare_bucket(hash_key);
+
+        while (curr != nullptr) {
+            if (curr->order_key() > order_key) {
+                // If the order key is greater than the requested order key,
+                // the element is not in the hash table
+                return nullptr;
+            } else if (curr->order_key() == order_key &&
+                       my_hash_compare(traits_type::get_key(static_cast<value_node_ptr>(curr)->value()), key)) {
+                // The fact that order keys match does not mean that the element is found.
+                // Key function comparison has to be performed to check whether this is the
+                // right element. If not, keep searching while order key is the same.
+                return static_cast<value_node_ptr>(curr);
+            }
+            curr = curr->next();
+        }
+
+        return nullptr;
+    }
+
+    template <typename K>
+    std::pair<value_node_ptr, value_node_ptr> internal_equal_range( const K& key ) {
+        sokey_type hash_key = sokey_type(my_hash_compare(key));
+        sokey_type order_key = split_order_key_regular(hash_key);
+
+        node_ptr curr = prepare_bucket(hash_key);
+
+        while (curr != nullptr) {
+            if (curr->order_key() > order_key) {
+                // If the order key is greater than the requested order key,
+                // the element is not in the hash table
+                return std::make_pair(nullptr, nullptr);
+            } else if (curr->order_key() == order_key &&
+                       my_hash_compare(traits_type::get_key(static_cast<value_node_ptr>(curr)->value()), key)) {
+                value_node_ptr first = static_cast<value_node_ptr>(curr);
+                node_ptr last = first;
+                do {
+                    last = last->next();
+                } while (allow_multimapping && last != nullptr && !last->is_dummy() &&
+                        my_hash_compare(traits_type::get_key(static_cast<value_node_ptr>(last)->value()), key));
+                return std::make_pair(first, first_value_node(last));
+            }
+            curr = curr->next();
+        }
+        return {nullptr, nullptr};
+    }
+
+    template <typename K>
+    size_type internal_count( const K& key ) const {
+        if (allow_multimapping) {
+            // TODO: consider reimplementing the internal_equal_range with elements counting to avoid std::distance
+            auto eq_range = equal_range(key);
+            return std::distance(eq_range.first, eq_range.second);
+        } else {
+            return contains(key) ? 1 : 0;
+        }
+    }
+
+    void internal_copy( const concurrent_unordered_base& other ) {
+        node_ptr last_node = &my_head;
+        my_segments[0].store(&my_head, std::memory_order_relaxed);
+
+        for (node_ptr node = other.my_head.next(); node != nullptr; node = node->next()) {
+            node_ptr new_node;
+            if (!node->is_dummy()) {
+                // The node in the right table contains a value
+                new_node = create_node(node->order_key(), static_cast<value_node_ptr>(node)->value());
+            } else {
+                // The node in the right table is a dummy node
+                new_node = create_dummy_node(node->order_key());
+                my_segments[reverse_bits(node->order_key())].store(new_node, std::memory_order_relaxed);
+            }
 
-                void internal_swap(concurrent_unordered_base& other,
-                                   /*is_always_equal || POCS = */ std::true_type) {
-                    internal_swap_fields(other);
-                }
-
-                void internal_swap(concurrent_unordered_base& other,
-                                   /*is_always_equal || POCS = */ std::false_type) {
-                    __TBB_ASSERT(my_segments.get_allocator() == other.my_segments.get_allocator(),
-                                 "Swapping with unequal allocators is not allowed");
-                    internal_swap_fields(other);
-                }
-
-                void internal_swap_fields(concurrent_unordered_base& other) {
-                    node_ptr first_node = my_head.next();
-                    my_head.set_next(other.my_head.next());
-                    other.my_head.set_next(first_node);
-
-                    size_type current_size = my_size.load(std::memory_order_relaxed);
-                    my_size.store(other.my_size.load(std::memory_order_relaxed), std::memory_order_relaxed);
-                    other.my_size.store(current_size, std::memory_order_relaxed);
-
-                    size_type bucket_count = my_bucket_count.load(std::memory_order_relaxed);
-                    my_bucket_count.store(other.my_bucket_count.load(std::memory_order_relaxed),
-                                          std::memory_order_relaxed);
-                    other.my_bucket_count.store(bucket_count, std::memory_order_relaxed);
-
-                    using std::swap;
-                    swap(my_max_load_factor, other.my_max_load_factor);
-                    swap(my_hash_compare, other.my_hash_compare);
-                    my_segments.swap(other.my_segments);
-
-                    // swap() method from segment table swaps all of the segments including the first segment
-                    // We should restore it to my_head. Without it the first segment of the container will point
-                    // to other.my_head.
-                    my_segments[0].store(&my_head, std::memory_order_relaxed);
-                    other.my_segments[0].store(&other.my_head, std::memory_order_relaxed);
-                }
-
-                // A regular order key has its original hash value reversed and the last bit set
-                static constexpr sokey_type split_order_key_regular(sokey_type hash) {
-                    return reverse_bits(hash) | 0x1;
-                }
-
-                // A dummy order key has its original hash value reversed and the last bit unset
-                static constexpr sokey_type split_order_key_dummy(sokey_type hash) {
-                    return reverse_bits(hash) & ~sokey_type(0x1);
-                }
-
-                size_type get_parent(size_type bucket) const {
-                    // Unset bucket's most significant turned-on bit
-                    __TBB_ASSERT(bucket != 0, "Unable to get_parent of the bucket 0");
-                    size_type msb = tbb::detail::log2(bucket);
-                    return bucket & ~(size_type(1) << msb);
-                }
-
-                size_type get_next_bucket_index(size_type bucket) const {
-                    size_type bits = tbb::detail::log2(my_bucket_count.load(std::memory_order_relaxed));
-                    size_type reversed_next = reverse_n_bits(bucket, bits) + 1;
-                    return reverse_n_bits(reversed_next, bits);
-                }
-
-                std::atomic<size_type> my_size;
-                std::atomic<size_type> my_bucket_count;
-                float my_max_load_factor;
-                hash_compare_type my_hash_compare;
-
-                list_node_type my_head;             // Head node for split ordered list
-                unordered_segment_table my_segments;// Segment table of pointers to nodes
-
-                template <typename Container, typename Value>
-                friend class solist_iterator;
-
-                template <typename OtherTraits>
-                friend class concurrent_unordered_base;
-            };// class concurrent_unordered_base
+            last_node->set_next(new_node);
+            last_node = new_node;
+        }
+    }
+
+    void internal_move( concurrent_unordered_base&& other ) {
+        node_ptr last_node = &my_head;
+        my_segments[0].store(&my_head, std::memory_order_relaxed);
+
+        for (node_ptr node = other.my_head.next(); node != nullptr; node = node->next()) {
+            node_ptr new_node;
+            if (!node->is_dummy()) {
+                // The node in the right table contains a value
+                new_node = create_node(node->order_key(), std::move(static_cast<value_node_ptr>(node)->value()));
+            } else {
+                // TODO: do we need to destroy a dummy node in the right container?
+                // The node in the right table is a dummy_node
+                new_node = create_dummy_node(node->order_key());
+                my_segments[reverse_bits(node->order_key())].store(new_node, std::memory_order_relaxed);
+            }
 
-            template <typename Traits>
-            bool operator==(const concurrent_unordered_base<Traits>& lhs,
-                            const concurrent_unordered_base<Traits>& rhs) {
-                if (&lhs == &rhs) { return true; }
-                if (lhs.size() != rhs.size()) { return false; }
+            last_node->set_next(new_node);
+            last_node = new_node;
+        }
+    }
+
+    void move_content( concurrent_unordered_base&& other ) {
+        // NOTE: allocators should be equal
+        my_head.set_next(other.my_head.next());
+        other.my_head.set_next(nullptr);
+        my_segments[0].store(&my_head, std::memory_order_relaxed);
+
+        other.my_bucket_count.store(initial_bucket_count, std::memory_order_relaxed);
+        other.my_max_load_factor = initial_max_load_factor;
+        other.my_size.store(0, std::memory_order_relaxed);
+    }
+
+    void internal_move_construct_with_allocator( concurrent_unordered_base&& other, const allocator_type&,
+                                                 /*is_always_equal = */std::true_type ) {
+        // Allocators are always equal - no need to compare for equality
+        move_content(std::move(other));
+    }
+
+    void internal_move_construct_with_allocator( concurrent_unordered_base&& other, const allocator_type& alloc,
+                                                 /*is_always_equal = */std::false_type ) {
+        // Allocators are not always equal
+        if (alloc == other.my_segments.get_allocator()) {
+            move_content(std::move(other));
+        } else {
+            try_call( [&] {
+                internal_move(std::move(other));
+            } ).on_exception( [&] {
+                clear();
+            });
+        }
+    }
+
+    // Move assigns the hash table to other is any instances of allocator_type are always equal
+    // or propagate_on_container_move_assignment is true
+    void internal_move_assign( concurrent_unordered_base&& other, /*is_always_equal || POCMA = */std::true_type ) {
+        move_content(std::move(other));
+    }
+
+    // Move assigns the hash table to other is any instances of allocator_type are not always equal
+    // and propagate_on_container_move_assignment is false
+    void internal_move_assign( concurrent_unordered_base&& other, /*is_always_equal || POCMA = */std::false_type ) {
+        if (my_segments.get_allocator() == other.my_segments.get_allocator()) {
+            move_content(std::move(other));
+        } else {
+            // TODO: guards for exceptions
+            internal_move(std::move(other));
+        }
+    }
+
+    void internal_swap( concurrent_unordered_base& other, /*is_always_equal || POCS = */std::true_type ) {
+        internal_swap_fields(other);
+    }
+
+    void internal_swap( concurrent_unordered_base& other, /*is_always_equal || POCS = */std::false_type ) {
+        __TBB_ASSERT(my_segments.get_allocator() == other.my_segments.get_allocator(),
+                     "Swapping with unequal allocators is not allowed");
+        internal_swap_fields(other);
+    }
+
+    void internal_swap_fields( concurrent_unordered_base& other ) {
+        node_ptr first_node = my_head.next();
+        my_head.set_next(other.my_head.next());
+        other.my_head.set_next(first_node);
+
+        size_type current_size = my_size.load(std::memory_order_relaxed);
+        my_size.store(other.my_size.load(std::memory_order_relaxed), std::memory_order_relaxed);
+        other.my_size.store(current_size, std::memory_order_relaxed);
+
+        size_type bucket_count = my_bucket_count.load(std::memory_order_relaxed);
+        my_bucket_count.store(other.my_bucket_count.load(std::memory_order_relaxed), std::memory_order_relaxed);
+        other.my_bucket_count.store(bucket_count, std::memory_order_relaxed);
+
+        using std::swap;
+        swap(my_max_load_factor, other.my_max_load_factor);
+        swap(my_hash_compare, other.my_hash_compare);
+        my_segments.swap(other.my_segments);
+
+        // swap() method from segment table swaps all of the segments including the first segment
+        // We should restore it to my_head. Without it the first segment of the container will point
+        // to other.my_head.
+        my_segments[0].store(&my_head, std::memory_order_relaxed);
+        other.my_segments[0].store(&other.my_head, std::memory_order_relaxed);
+    }
+
+    // A regular order key has its original hash value reversed and the last bit set
+    static constexpr sokey_type split_order_key_regular( sokey_type hash ) {
+        return reverse_bits(hash) | 0x1;
+    }
+
+    // A dummy order key has its original hash value reversed and the last bit unset
+    static constexpr sokey_type split_order_key_dummy( sokey_type hash ) {
+        return reverse_bits(hash) & ~sokey_type(0x1);
+    }
+
+    size_type get_parent( size_type bucket ) const {
+        // Unset bucket's most significant turned-on bit
+        __TBB_ASSERT(bucket != 0, "Unable to get_parent of the bucket 0");
+        size_type msb = tbb::detail::log2(bucket);
+        return bucket & ~(size_type(1) << msb);
+    }
+
+    size_type get_next_bucket_index( size_type bucket ) const {
+        size_type bits = tbb::detail::log2(my_bucket_count.load(std::memory_order_relaxed));
+        size_type reversed_next = reverse_n_bits(bucket, bits) + 1;
+        return reverse_n_bits(reversed_next, bits);
+    }
+
+    std::atomic<size_type> my_size;
+    std::atomic<size_type> my_bucket_count;
+    float my_max_load_factor;
+    hash_compare_type my_hash_compare;
+
+    list_node_type my_head; // Head node for split ordered list
+    unordered_segment_table my_segments; // Segment table of pointers to nodes
+
+    template <typename Container, typename Value>
+    friend class solist_iterator;
+
+    template <typename OtherTraits>
+    friend class concurrent_unordered_base;
+}; // class concurrent_unordered_base
+
+template <typename Traits>
+bool operator==( const concurrent_unordered_base<Traits>& lhs,
+                 const concurrent_unordered_base<Traits>& rhs ) {
+    if (&lhs == &rhs) { return true; }
+    if (lhs.size() != rhs.size()) { return false; }
 
 #if _MSC_VER
-                // Passing "unchecked" iterators to std::permutation with 3 parameters
-                // causes compiler warnings.
-                // The workaround is to use overload with 4 parameters, which is
-                // available since C++14 - minimally supported version on MSVC
-                return std::is_permutation(lhs.begin(), lhs.end(), rhs.begin(), rhs.end());
+    // Passing "unchecked" iterators to std::permutation with 3 parameters
+    // causes compiler warnings.
+    // The workaround is to use overload with 4 parameters, which is
+    // available since C++14 - minimally supported version on MSVC
+    return std::is_permutation(lhs.begin(), lhs.end(), rhs.begin(), rhs.end());
 #else
-                return std::is_permutation(lhs.begin(), lhs.end(), rhs.begin());
+    return std::is_permutation(lhs.begin(), lhs.end(), rhs.begin());
 #endif
-            }
+}
 
 #if !__TBB_CPP20_COMPARISONS_PRESENT
-            template <typename Traits>
-            bool operator!=(const concurrent_unordered_base<Traits>& lhs,
-                            const concurrent_unordered_base<Traits>& rhs) {
-                return !(lhs == rhs);
-            }
+template <typename Traits>
+bool operator!=( const concurrent_unordered_base<Traits>& lhs,
+                 const concurrent_unordered_base<Traits>& rhs ) {
+    return !(lhs == rhs);
+}
 #endif
 
 #if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
-#pragma warning(pop)// warning 4127 is back
+#pragma warning(pop) // warning 4127 is back
 #endif
 
-        }// namespace d1
-    }    // namespace detail
-}// namespace tbb
+} // namespace d2
+} // namespace detail
+} // namespace tbb
 
-#endif// __TBB_detail__concurrent_unordered_base_H
+#endif // __TBB_detail__concurrent_unordered_base_H
diff --git a/external/tbb/include/oneapi/tbb/detail/_config.h b/external/tbb/include/oneapi/tbb/detail/_config.h
index 014e8999..1bcd75fe 100644
--- a/external/tbb/include/oneapi/tbb/detail/_config.h
+++ b/external/tbb/include/oneapi/tbb/detail/_config.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2025 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -28,32 +28,38 @@
 /* Check which standard library we use. */
 #include <cstddef>
 
+#ifdef __has_include
+#if __has_include(<version>)
+#include <version>
+#endif
+#endif
+
 #include "_export.h"
 
 #if _MSC_VER
-#define __TBB_EXPORTED_FUNC __cdecl
-#define __TBB_EXPORTED_METHOD __thiscall
+    #define __TBB_EXPORTED_FUNC   __cdecl
+    #define __TBB_EXPORTED_METHOD __thiscall
 #else
-#define __TBB_EXPORTED_FUNC
-#define __TBB_EXPORTED_METHOD
+    #define __TBB_EXPORTED_FUNC
+    #define __TBB_EXPORTED_METHOD
 #endif
 
 #if defined(_MSVC_LANG)
-#define __TBB_LANG _MSVC_LANG
+    #define __TBB_LANG _MSVC_LANG
 #else
-#define __TBB_LANG __cplusplus
-#endif// _MSVC_LANG
+    #define __TBB_LANG __cplusplus
+#endif // _MSVC_LANG
 
 #define __TBB_CPP14_PRESENT (__TBB_LANG >= 201402L)
 #define __TBB_CPP17_PRESENT (__TBB_LANG >= 201703L)
 #define __TBB_CPP20_PRESENT (__TBB_LANG >= 202002L)
 
 #if __INTEL_COMPILER || _MSC_VER
-#define __TBB_NOINLINE(decl) __declspec(noinline) decl
+    #define __TBB_NOINLINE(decl) __declspec(noinline) decl
 #elif __GNUC__
-#define __TBB_NOINLINE(decl) decl __attribute__((noinline))
+    #define __TBB_NOINLINE(decl) decl __attribute__ ((noinline))
 #else
-#define __TBB_NOINLINE(decl) decl
+    #define __TBB_NOINLINE(decl) decl
 #endif
 
 #define __TBB_STRING_AUX(x) #x
@@ -68,213 +74,209 @@
 // Prior to GCC 7, GNU libstdc++ did not have a convenient version macro.
 // Therefore we use different ways to detect its version.
 #ifdef TBB_USE_GLIBCXX_VERSION
-// The version is explicitly specified in our public TBB_USE_GLIBCXX_VERSION macro.
-// Its format should match the __TBB_GCC_VERSION above, e.g. 70301 for libstdc++ coming with GCC 7.3.1.
-#define __TBB_GLIBCXX_VERSION TBB_USE_GLIBCXX_VERSION
+    // The version is explicitly specified in our public TBB_USE_GLIBCXX_VERSION macro.
+    // Its format should match the __TBB_GCC_VERSION above, e.g. 70301 for libstdc++ coming with GCC 7.3.1.
+    #define __TBB_GLIBCXX_VERSION TBB_USE_GLIBCXX_VERSION
 #elif _GLIBCXX_RELEASE && _GLIBCXX_RELEASE != __GNUC__
-// Reported versions of GCC and libstdc++ do not match; trust the latter
-#define __TBB_GLIBCXX_VERSION (_GLIBCXX_RELEASE * 10000)
+    // Reported versions of GCC and libstdc++ do not match; trust the latter
+    #define __TBB_GLIBCXX_VERSION (_GLIBCXX_RELEASE*10000)
 #elif __GLIBCPP__ || __GLIBCXX__
-// The version macro is not defined or matches the GCC version; use __TBB_GCC_VERSION
-#define __TBB_GLIBCXX_VERSION __TBB_GCC_VERSION
+    // The version macro is not defined or matches the GCC version; use __TBB_GCC_VERSION
+    #define __TBB_GLIBCXX_VERSION __TBB_GCC_VERSION
 #endif
 
 #if __clang__
-// according to clang documentation, version can be vendor specific
-#define __TBB_CLANG_VERSION (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__)
+    // according to clang documentation, version can be vendor specific
+    #define __TBB_CLANG_VERSION (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__)
 #endif
 
 /** Macro helpers **/
 
-#define __TBB_CONCAT_AUX(A, B) A##B
+#define __TBB_CONCAT_AUX(A,B) A##B
 // The additional level of indirection is needed to expand macros A and B (not to get the AB macro).
 // See [cpp.subst] and [cpp.concat] for more details.
-#define __TBB_CONCAT(A, B) __TBB_CONCAT_AUX(A, B)
+#define __TBB_CONCAT(A,B) __TBB_CONCAT_AUX(A,B)
 // The IGNORED argument and comma are needed to always have 2 arguments (even when A is empty).
-#define __TBB_IS_MACRO_EMPTY(A, IGNORED) __TBB_CONCAT_AUX(__TBB_MACRO_EMPTY, A)
+#define __TBB_IS_MACRO_EMPTY(A,IGNORED) __TBB_CONCAT_AUX(__TBB_MACRO_EMPTY,A)
 #define __TBB_MACRO_EMPTY 1
 
 #if _M_X64 || _M_ARM64
-#define __TBB_W(name) name##64
+    #define __TBB_W(name) name##64
 #else
-#define __TBB_W(name) name
+    #define __TBB_W(name) name
 #endif
 
 /** User controlled TBB features & modes **/
 
 #ifndef TBB_USE_DEBUG
-/*
+    /*
     There are four cases that are supported:
     1. "_DEBUG is undefined" means "no debug";
     2. "_DEBUG defined to something that is evaluated to 0" (including "garbage", as per [cpp.cond]) means "no debug";
     3. "_DEBUG defined to something that is evaluated to a non-zero value" means "debug";
     4. "_DEBUG defined to nothing (empty)" means "debug".
     */
-#ifdef _DEBUG
-// Check if _DEBUG is empty.
-#define __TBB_IS__DEBUG_EMPTY (__TBB_IS_MACRO_EMPTY(_DEBUG, IGNORED) == __TBB_MACRO_EMPTY)
-#if __TBB_IS__DEBUG_EMPTY
-#define TBB_USE_DEBUG 1
-#else
-#define TBB_USE_DEBUG _DEBUG
-#endif// __TBB_IS__DEBUG_EMPTY
-#else
-#define TBB_USE_DEBUG 0
-#endif// _DEBUG
-#endif// TBB_USE_DEBUG
+    #ifdef _DEBUG
+        // Check if _DEBUG is empty.
+        #define __TBB_IS__DEBUG_EMPTY (__TBB_IS_MACRO_EMPTY(_DEBUG,IGNORED)==__TBB_MACRO_EMPTY)
+        #if __TBB_IS__DEBUG_EMPTY
+            #define TBB_USE_DEBUG 1
+        #else
+            #define TBB_USE_DEBUG _DEBUG
+        #endif // __TBB_IS__DEBUG_EMPTY
+    #else
+        #define TBB_USE_DEBUG 0
+    #endif // _DEBUG
+#endif // TBB_USE_DEBUG
 
 #ifndef TBB_USE_ASSERT
-#define TBB_USE_ASSERT TBB_USE_DEBUG
-#endif// TBB_USE_ASSERT
+    #define TBB_USE_ASSERT TBB_USE_DEBUG
+#endif // TBB_USE_ASSERT
 
 #ifndef TBB_USE_PROFILING_TOOLS
 #if TBB_USE_DEBUG
-#define TBB_USE_PROFILING_TOOLS 2
-#else// TBB_USE_DEBUG
-#define TBB_USE_PROFILING_TOOLS 0
-#endif// TBB_USE_DEBUG
-#endif// TBB_USE_PROFILING_TOOLS
+    #define TBB_USE_PROFILING_TOOLS 2
+#else // TBB_USE_DEBUG
+    #define TBB_USE_PROFILING_TOOLS 0
+#endif // TBB_USE_DEBUG
+#endif // TBB_USE_PROFILING_TOOLS
 
 // Exceptions support cases
 #if !(__EXCEPTIONS || defined(_CPPUNWIND) || __SUNPRO_CC)
-#if TBB_USE_EXCEPTIONS
-#error Compilation settings do not support exception handling. Please do not set TBB_USE_EXCEPTIONS macro or set it to 0.
-#elif !defined(TBB_USE_EXCEPTIONS)
-#define TBB_USE_EXCEPTIONS 0
-#endif
+    #if TBB_USE_EXCEPTIONS
+        #error Compilation settings do not support exception handling. Please do not set TBB_USE_EXCEPTIONS macro or set it to 0.
+    #elif !defined(TBB_USE_EXCEPTIONS)
+        #define TBB_USE_EXCEPTIONS 0
+    #endif
 #elif !defined(TBB_USE_EXCEPTIONS)
-#define TBB_USE_EXCEPTIONS 1
+    #define TBB_USE_EXCEPTIONS 1
 #endif
 
 /** Preprocessor symbols to determine HW architecture **/
 
 #if _WIN32 || _WIN64
-#if defined(_M_X64) || defined(__x86_64__)// the latter for MinGW support
-#define __TBB_x86_64 1
-#elif defined(_M_IA64)
-#define __TBB_ipf 1
-#elif defined(_M_IX86) || defined(__i386__)// the latter for MinGW support
-#define __TBB_x86_32 1
-#else
-#define __TBB_generic_arch 1
-#endif
+    #if defined(_M_X64) || defined(__x86_64__)  // the latter for MinGW support
+        #define __TBB_x86_64 1
+    #elif defined(_M_IA64)
+        #define __TBB_ipf 1
+    #elif defined(_M_IX86) || defined(__i386__) // the latter for MinGW support
+        #define __TBB_x86_32 1
+    #else
+        #define __TBB_generic_arch 1
+    #endif
 #else /* Assume generic Unix */
-#if __x86_64__
-#define __TBB_x86_64 1
-#elif __ia64__
-#define __TBB_ipf 1
-#elif __i386__ || __i386// __i386 is for Sun OS
-#define __TBB_x86_32 1
-#else
-#define __TBB_generic_arch 1
-#endif
+    #if __x86_64__
+        #define __TBB_x86_64 1
+    #elif __ia64__
+        #define __TBB_ipf 1
+    #elif __i386__||__i386  // __i386 is for Sun OS
+        #define __TBB_x86_32 1
+    #else
+        #define __TBB_generic_arch 1
+    #endif
 #endif
 
 /** Windows API or POSIX API **/
 
 #if _WIN32 || _WIN64
-#define __TBB_USE_WINAPI 1
+    #define __TBB_USE_WINAPI 1
 #else
-#define __TBB_USE_POSIX 1
+    #define __TBB_USE_POSIX 1
 #endif
 
 /** Internal TBB features & modes **/
 
 /** __TBB_DYNAMIC_LOAD_ENABLED describes the system possibility to load shared libraries at run time **/
 #ifndef __TBB_DYNAMIC_LOAD_ENABLED
-#define __TBB_DYNAMIC_LOAD_ENABLED 1
+    #define __TBB_DYNAMIC_LOAD_ENABLED (!__EMSCRIPTEN__)
 #endif
 
 /** __TBB_WIN8UI_SUPPORT enables support of Windows* Store Apps and limit a possibility to load
     shared libraries at run time only from application container **/
 #if defined(WINAPI_FAMILY) && WINAPI_FAMILY == WINAPI_FAMILY_APP
-#define __TBB_WIN8UI_SUPPORT 1
+    #define __TBB_WIN8UI_SUPPORT 1
 #else
-#define __TBB_WIN8UI_SUPPORT 0
+    #define __TBB_WIN8UI_SUPPORT 0
 #endif
 
 /** __TBB_WEAK_SYMBOLS_PRESENT denotes that the system supports the weak symbol mechanism **/
 #ifndef __TBB_WEAK_SYMBOLS_PRESENT
-#define __TBB_WEAK_SYMBOLS_PRESENT                                                                           \
-    (!_WIN32 && !__APPLE__ && !__sun && (__TBB_GCC_VERSION >= 40000 || __INTEL_COMPILER))
+    #define __TBB_WEAK_SYMBOLS_PRESENT ( !__EMSCRIPTEN__ && !_WIN32 && !__APPLE__ && !__sun && (__TBB_GCC_VERSION >= 40000 || __INTEL_COMPILER ) )
 #endif
 
 /** Presence of compiler features **/
 
 #if __clang__ && !__INTEL_COMPILER
-#define __TBB_USE_OPTIONAL_RTTI __has_feature(cxx_rtti)
+    #define __TBB_USE_OPTIONAL_RTTI __has_feature(cxx_rtti)
 #elif defined(_CPPRTTI)
-#define __TBB_USE_OPTIONAL_RTTI 1
+    #define __TBB_USE_OPTIONAL_RTTI 1
 #else
-#define __TBB_USE_OPTIONAL_RTTI (__GXX_RTTI || __RTTI || __INTEL_RTTI__)
+    #define __TBB_USE_OPTIONAL_RTTI (__GXX_RTTI || __RTTI || __INTEL_RTTI__)
 #endif
 
 /** Address sanitizer detection **/
 #ifdef __SANITIZE_ADDRESS__
-#define __TBB_USE_ADDRESS_SANITIZER 1
+    #define __TBB_USE_ADDRESS_SANITIZER 1
 #elif defined(__has_feature)
 #if __has_feature(address_sanitizer)
-#define __TBB_USE_ADDRESS_SANITIZER 1
+    #define __TBB_USE_ADDRESS_SANITIZER 1
 #endif
 #endif
 
 /** Library features presence macros **/
 
-#define __TBB_CPP14_INTEGER_SEQUENCE_PRESENT (__TBB_LANG >= 201402L)
-#define __TBB_CPP17_INVOKE_RESULT_PRESENT (__TBB_LANG >= 201703L)
+#define __TBB_CPP14_INTEGER_SEQUENCE_PRESENT       (__TBB_LANG >= 201402L)
+#define __TBB_CPP17_INVOKE_PRESENT                 (__TBB_LANG >= 201703L)
 
 // TODO: Remove the condition(__INTEL_COMPILER > 2021) from the __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 // macro when this feature start working correctly on this compiler.
 #if __INTEL_COMPILER && (!_MSC_VER || __INTEL_CXX11_MOVE__)
-#define __TBB_CPP14_VARIABLE_TEMPLATES_PRESENT (__TBB_LANG >= 201402L)
-#define __TBB_CPP17_DEDUCTION_GUIDES_PRESENT (__INTEL_COMPILER > 2021 && __TBB_LANG >= 201703L)
-#define __TBB_CPP20_CONCEPTS_PRESENT 0// TODO: add a mechanism for future addition
+    #define __TBB_CPP14_VARIABLE_TEMPLATES_PRESENT (__TBB_LANG >= 201402L)
+    #define __TBB_CPP17_DEDUCTION_GUIDES_PRESENT   (__INTEL_COMPILER > 2021 && __TBB_LANG >= 201703L)
 #elif __clang__
-#define __TBB_CPP14_VARIABLE_TEMPLATES_PRESENT (__has_feature(cxx_variable_templates))
-#define __TBB_CPP20_CONCEPTS_PRESENT 0// TODO: add a mechanism for future addition
-#ifdef __cpp_deduction_guides
-#define __TBB_CPP17_DEDUCTION_GUIDES_PRESENT (__cpp_deduction_guides >= 201611L)
-#else
-#define __TBB_CPP17_DEDUCTION_GUIDES_PRESENT 0
-#endif
+    #define __TBB_CPP14_VARIABLE_TEMPLATES_PRESENT (__has_feature(cxx_variable_templates))
+    #ifdef __cpp_deduction_guides
+        #define __TBB_CPP17_DEDUCTION_GUIDES_PRESENT (__cpp_deduction_guides >= 201611L)
+    #else
+        #define __TBB_CPP17_DEDUCTION_GUIDES_PRESENT 0
+    #endif
 #elif __GNUC__
-#define __TBB_CPP14_VARIABLE_TEMPLATES_PRESENT (__TBB_LANG >= 201402L && __TBB_GCC_VERSION >= 50000)
-#define __TBB_CPP17_DEDUCTION_GUIDES_PRESENT (__cpp_deduction_guides >= 201606L)
-#define __TBB_CPP20_CONCEPTS_PRESENT (__TBB_LANG >= 201709L && __TBB_GCC_VERSION >= 100201)
+    #define __TBB_CPP14_VARIABLE_TEMPLATES_PRESENT (__TBB_LANG >= 201402L && __TBB_GCC_VERSION >= 50000)
+    #define __TBB_CPP17_DEDUCTION_GUIDES_PRESENT   (__cpp_deduction_guides >= 201606L)
 #elif _MSC_VER
-#define __TBB_CPP14_VARIABLE_TEMPLATES_PRESENT                                                               \
-    (_MSC_FULL_VER >= 190023918 && (!__INTEL_COMPILER || __INTEL_COMPILER >= 1700))
-#define __TBB_CPP17_DEDUCTION_GUIDES_PRESENT                                                                 \
-    (_MSC_VER >= 1914 && __TBB_LANG >= 201703L && (!__INTEL_COMPILER || __INTEL_COMPILER > 2021))
-#define __TBB_CPP20_CONCEPTS_PRESENT (_MSC_VER >= 1923 && __TBB_LANG >= 202002L)// TODO: INTEL_COMPILER?
+    #define __TBB_CPP14_VARIABLE_TEMPLATES_PRESENT (_MSC_FULL_VER >= 190023918 && (!__INTEL_COMPILER || __INTEL_COMPILER >= 1700))
+    #define __TBB_CPP17_DEDUCTION_GUIDES_PRESENT   (_MSC_VER >= 1914 && __TBB_LANG >= 201703L && (!__INTEL_COMPILER || __INTEL_COMPILER > 2021))
 #else
-#define __TBB_CPP14_VARIABLE_TEMPLATES_PRESENT (__TBB_LANG >= 201402L)
-#define __TBB_CPP17_DEDUCTION_GUIDES_PRESENT (__TBB_LANG >= 201703L)
-#define __TBB_CPP20_CONCEPTS_PRESENT (__TBB_LANG >= 202002L)
+    #define __TBB_CPP14_VARIABLE_TEMPLATES_PRESENT (__TBB_LANG >= 201402L)
+    #define __TBB_CPP17_DEDUCTION_GUIDES_PRESENT   (__TBB_LANG >= 201703L)
 #endif
 
 // GCC4.8 on RHEL7 does not support std::get_new_handler
-#define __TBB_CPP11_GET_NEW_HANDLER_PRESENT                                                                  \
-    (_MSC_VER >= 1900 || __TBB_GLIBCXX_VERSION >= 40900 && __GXX_EXPERIMENTAL_CXX0X__ || _LIBCPP_VERSION)
+#define __TBB_CPP11_GET_NEW_HANDLER_PRESENT             (_MSC_VER >= 1900 || __TBB_GLIBCXX_VERSION >= 40900 && __GXX_EXPERIMENTAL_CXX0X__ || _LIBCPP_VERSION)
 // GCC4.8 on RHEL7 does not support std::is_trivially_copyable
-#define __TBB_CPP11_TYPE_PROPERTIES_PRESENT                                                                  \
-    (_LIBCPP_VERSION || _MSC_VER >= 1700 || (__TBB_GLIBCXX_VERSION >= 50000 && __GXX_EXPERIMENTAL_CXX0X__))
-
-#define __TBB_CPP17_MEMORY_RESOURCE_PRESENT                                                                  \
-    (_MSC_VER >= 1913 && (__TBB_LANG > 201402L) || __TBB_GLIBCXX_VERSION >= 90000 && __TBB_LANG >= 201703L)
-#define __TBB_CPP17_HW_INTERFERENCE_SIZE_PRESENT (_MSC_VER >= 1911)
-#define __TBB_CPP17_LOGICAL_OPERATIONS_PRESENT (__TBB_LANG >= 201703L)
-#define __TBB_CPP17_ALLOCATOR_IS_ALWAYS_EQUAL_PRESENT (__TBB_LANG >= 201703L)
-#define __TBB_CPP17_IS_SWAPPABLE_PRESENT (__TBB_LANG >= 201703L)
+#define __TBB_CPP11_TYPE_PROPERTIES_PRESENT             (_LIBCPP_VERSION || _MSC_VER >= 1700 || (__TBB_GLIBCXX_VERSION >= 50000 && __GXX_EXPERIMENTAL_CXX0X__))
+
+#define __TBB_CPP17_MEMORY_RESOURCE_PRESENT             (_MSC_VER >= 1913 && (__TBB_LANG > 201402L) || \
+                                                        __TBB_GLIBCXX_VERSION >= 90000 && __TBB_LANG >= 201703L)
+#define __TBB_CPP17_HW_INTERFERENCE_SIZE_PRESENT        (_MSC_VER >= 1911)
+#define __TBB_CPP17_LOGICAL_OPERATIONS_PRESENT          (__TBB_LANG >= 201703L)
+#define __TBB_CPP17_ALLOCATOR_IS_ALWAYS_EQUAL_PRESENT   (__TBB_LANG >= 201703L)
+#define __TBB_CPP17_IS_SWAPPABLE_PRESENT                (__TBB_LANG >= 201703L)
+
+// TODO: fix concepts on Clang or define the broken versions
+#if !(__clang__) && defined(__cpp_concepts) && defined(__cpp_lib_concepts)
+    #define __TBB_CPP20_CONCEPTS_PRESENT ((__cpp_concepts >= 201907L) && (__cpp_lib_concepts >= 202002L))
+#else
+    #define __TBB_CPP20_CONCEPTS_PRESENT 0
+#endif
 
 #if defined(__cpp_impl_three_way_comparison) && defined(__cpp_lib_three_way_comparison)
-#define __TBB_CPP20_COMPARISONS_PRESENT                                                                      \
-    ((__cpp_impl_three_way_comparison >= 201907L) && (__cpp_lib_three_way_comparison >= 201907L))
+    #define __TBB_CPP20_COMPARISONS_PRESENT ((__cpp_impl_three_way_comparison >= 201907L) && (__cpp_lib_three_way_comparison >= 201907L))
 #else
-#define __TBB_CPP20_COMPARISONS_PRESENT __TBB_CPP20_PRESENT
+    #define __TBB_CPP20_COMPARISONS_PRESENT 0
 #endif
 
-#define __TBB_RESUMABLE_TASKS (!__TBB_WIN8UI_SUPPORT && !__ANDROID__ && !__QNXNTO__)
+#define __TBB_RESUMABLE_TASKS                           (!__TBB_WIN8UI_SUPPORT && !__ANDROID__ && !__QNXNTO__ && (!__linux__ || __GLIBC__))
 
 /* This macro marks incomplete code or comments describing ideas which are considered for the future.
  * See also for plain comment with TODO and FIXME marks for small improvement opportunities.
@@ -284,190 +286,179 @@
 /* Check which standard library we use. */
 /* __TBB_SYMBOL is defined only while processing exported symbols list where C++ is not allowed. */
 #if !defined(__TBB_SYMBOL) && !__TBB_CONFIG_PREPROC_ONLY
-#include <cstddef>
+    #include <cstddef>
 #endif
 
 /** Target OS is either iOS* or iOS* simulator **/
 #if __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__
-#define __TBB_IOS 1
+    #define __TBB_IOS 1
 #endif
 
 #if __APPLE__
-#if __INTEL_COMPILER && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ > 1099                                 \
-        && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 101000
-// ICC does not correctly set the macro if -mmacosx-min-version is not specified
-#define __TBB_MACOS_TARGET_VERSION (100000 + 10 * (__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ - 1000))
-#else
-#define __TBB_MACOS_TARGET_VERSION __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__
-#endif
+    #if __INTEL_COMPILER && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ > 1099 \
+                         && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 101000
+        // ICC does not correctly set the macro if -mmacosx-min-version is not specified
+        #define __TBB_MACOS_TARGET_VERSION  (100000 + 10*(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ - 1000))
+    #else
+        #define __TBB_MACOS_TARGET_VERSION  __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__
+    #endif
 #endif
 
 #if defined(__GNUC__) && !defined(__INTEL_COMPILER)
-#define __TBB_GCC_WARNING_IGNORED_ATTRIBUTES_PRESENT (__TBB_GCC_VERSION >= 60100)
+    #define __TBB_GCC_WARNING_IGNORED_ATTRIBUTES_PRESENT (__TBB_GCC_VERSION >= 60100)
 #endif
 
 #if __GNUC__ && !__INTEL_COMPILER && !__clang__
-#define __TBB_GCC_PARAMETER_PACK_IN_LAMBDAS_BROKEN (__TBB_GCC_VERSION <= 40805)
+    #define __TBB_GCC_PARAMETER_PACK_IN_LAMBDAS_BROKEN (__TBB_GCC_VERSION <= 40805)
 #endif
 
 #define __TBB_CPP17_FALLTHROUGH_PRESENT (__TBB_LANG >= 201703L)
-#define __TBB_CPP17_NODISCARD_PRESENT (__TBB_LANG >= 201703L)
-#define __TBB_FALLTHROUGH_PRESENT (__TBB_GCC_VERSION >= 70000 && !__INTEL_COMPILER)
+#define __TBB_CPP17_NODISCARD_PRESENT   (__TBB_LANG >= 201703L)
+#define __TBB_FALLTHROUGH_PRESENT       (__TBB_GCC_VERSION >= 70000 && !__INTEL_COMPILER)
 
 #if __TBB_CPP17_FALLTHROUGH_PRESENT
-#define __TBB_fallthrough [[fallthrough]]
+    #define __TBB_fallthrough [[fallthrough]]
 #elif __TBB_FALLTHROUGH_PRESENT
-#define __TBB_fallthrough __attribute__((fallthrough))
+    #define __TBB_fallthrough __attribute__ ((fallthrough))
 #else
-#define __TBB_fallthrough
+    #define __TBB_fallthrough
 #endif
 
 #if __TBB_CPP17_NODISCARD_PRESENT
-#define __TBB_nodiscard [[nodiscard]]
+    #define __TBB_nodiscard [[nodiscard]]
 #elif __clang__ || __GNUC__
-#define __TBB_nodiscard __attribute__((warn_unused_result))
+    #define __TBB_nodiscard __attribute__((warn_unused_result))
 #else
-#define __TBB_nodiscard
+    #define __TBB_nodiscard
 #endif
 
-#define __TBB_CPP17_UNCAUGHT_EXCEPTIONS_PRESENT                                                              \
-    (_MSC_VER >= 1900 || __GLIBCXX__ && __cpp_lib_uncaught_exceptions                                        \
-     || _LIBCPP_VERSION >= 3700 && (!__TBB_MACOS_TARGET_VERSION || __TBB_MACOS_TARGET_VERSION >= 101200))
+#define __TBB_CPP17_UNCAUGHT_EXCEPTIONS_PRESENT             (_MSC_VER >= 1900 || __GLIBCXX__ && __cpp_lib_uncaught_exceptions \
+                                                            || _LIBCPP_VERSION >= 3700 && (!__TBB_MACOS_TARGET_VERSION || __TBB_MACOS_TARGET_VERSION >= 101200))
 
-#define __TBB_TSX_INTRINSICS_PRESENT                                                                         \
-    (__RTM__ || __INTEL_COMPILER || (_MSC_VER >= 1700 && (__TBB_x86_64 || __TBB_x86_32)))
+#define __TBB_TSX_INTRINSICS_PRESENT (__RTM__ || __INTEL_COMPILER || (_MSC_VER>=1700 && (__TBB_x86_64 || __TBB_x86_32)))
 
-#define __TBB_WAITPKG_INTRINSICS_PRESENT                                                                     \
-    ((__INTEL_COMPILER >= 1900 || __TBB_GCC_VERSION >= 110000 || __TBB_CLANG_VERSION >= 120000)              \
-     && !__ANDROID__)
+#define __TBB_WAITPKG_INTRINSICS_PRESENT ((__INTEL_COMPILER >= 1900 || (__TBB_GCC_VERSION >= 110000 && __TBB_GNU_ASM_VERSION >= 2032) || __TBB_CLANG_VERSION >= 120000) \
+                                         && (_WIN32 || _WIN64 || __unix__ || __APPLE__) && (__TBB_x86_32 || __TBB_x86_64) && !__ANDROID__)
 
 /** Internal TBB features & modes **/
 
 /** __TBB_SOURCE_DIRECTLY_INCLUDED is a mode used in whitebox testing when
     it's necessary to test internal functions not exported from TBB DLLs
 **/
-#if (_WIN32 || _WIN64) && (__TBB_SOURCE_DIRECTLY_INCLUDED || TBB_USE_PREVIEW_BINARY)
-#define __TBB_NO_IMPLICIT_LINKAGE 1
-#define __TBBMALLOC_NO_IMPLICIT_LINKAGE 1
+#if (_WIN32||_WIN64) && (__TBB_SOURCE_DIRECTLY_INCLUDED || TBB_USE_PREVIEW_BINARY)
+    #define __TBB_NO_IMPLICIT_LINKAGE 1
+    #define __TBBMALLOC_NO_IMPLICIT_LINKAGE 1
 #endif
 
-#if (__TBB_BUILD || __TBBMALLOC_BUILD || __TBBMALLOCPROXY_BUILD || __TBBBIND_BUILD)                          \
-        && !defined(__TBB_NO_IMPLICIT_LINKAGE)
-#define __TBB_NO_IMPLICIT_LINKAGE 1
+#if (__TBB_BUILD || __TBBMALLOC_BUILD || __TBBMALLOCPROXY_BUILD || __TBBBIND_BUILD) && !defined(__TBB_NO_IMPLICIT_LINKAGE)
+    #define __TBB_NO_IMPLICIT_LINKAGE 1
 #endif
 
 #if _MSC_VER
-#if !__TBB_NO_IMPLICIT_LINKAGE
-#ifdef _DEBUG
-#pragma comment(lib, "tbb12_debug.lib")
-#else
-#pragma comment(lib, "tbb12.lib")
-#endif
-#endif
+    #if !__TBB_NO_IMPLICIT_LINKAGE
+        #ifdef _DEBUG
+            #pragma comment(lib, "tbb12_debug.lib")
+        #else
+            #pragma comment(lib, "tbb12.lib")
+        #endif
+    #endif
 #endif
 
 #ifndef __TBB_SCHEDULER_OBSERVER
-#define __TBB_SCHEDULER_OBSERVER 1
+    #define __TBB_SCHEDULER_OBSERVER 1
 #endif /* __TBB_SCHEDULER_OBSERVER */
 
 #ifndef __TBB_FP_CONTEXT
-#define __TBB_FP_CONTEXT 1
+    #define __TBB_FP_CONTEXT 1
 #endif /* __TBB_FP_CONTEXT */
 
-#define __TBB_RECYCLE_TO_ENQUEUE __TBB_BUILD// keep non-official
+#define __TBB_RECYCLE_TO_ENQUEUE __TBB_BUILD // keep non-official
 
 #ifndef __TBB_ARENA_OBSERVER
-#define __TBB_ARENA_OBSERVER __TBB_SCHEDULER_OBSERVER
+    #define __TBB_ARENA_OBSERVER __TBB_SCHEDULER_OBSERVER
 #endif /* __TBB_ARENA_OBSERVER */
 
 #ifndef __TBB_ARENA_BINDING
-#define __TBB_ARENA_BINDING 1
-#endif
-
-#if TBB_PREVIEW_WAITING_FOR_WORKERS || __TBB_BUILD
-#define __TBB_SUPPORTS_WORKERS_WAITING_IN_TERMINATE 1
+    #define __TBB_ARENA_BINDING 1
 #endif
 
-#if (TBB_PREVIEW_TASK_ARENA_CONSTRAINTS_EXTENSION || __TBB_BUILD) && __TBB_ARENA_BINDING
-#define __TBB_PREVIEW_TASK_ARENA_CONSTRAINTS_EXTENSION_PRESENT 1
-#endif
+// Thread pinning is not available on macOS*
+#define __TBB_CPUBIND_PRESENT (__TBB_ARENA_BINDING && !__APPLE__)
 
 #ifndef __TBB_ENQUEUE_ENFORCED_CONCURRENCY
-#define __TBB_ENQUEUE_ENFORCED_CONCURRENCY 1
+    #define __TBB_ENQUEUE_ENFORCED_CONCURRENCY 1
 #endif
 
-#if !defined(__TBB_SURVIVE_THREAD_SWITCH) && (_WIN32 || _WIN64 || __APPLE__ || (__unix__ && !__ANDROID__))
-#define __TBB_SURVIVE_THREAD_SWITCH 1
+#if !defined(__TBB_SURVIVE_THREAD_SWITCH) && \
+          (_WIN32 || _WIN64 || __APPLE__ || (defined(__unix__) && !__ANDROID__))
+    #define __TBB_SURVIVE_THREAD_SWITCH 1
 #endif /* __TBB_SURVIVE_THREAD_SWITCH */
 
 #ifndef TBB_PREVIEW_FLOW_GRAPH_FEATURES
-#define TBB_PREVIEW_FLOW_GRAPH_FEATURES __TBB_CPF_BUILD
+    #define TBB_PREVIEW_FLOW_GRAPH_FEATURES __TBB_CPF_BUILD
 #endif
 
 #ifndef __TBB_DEFAULT_PARTITIONER
-#define __TBB_DEFAULT_PARTITIONER tbb::auto_partitioner
+    #define __TBB_DEFAULT_PARTITIONER tbb::auto_partitioner
 #endif
 
 #ifndef __TBB_FLOW_TRACE_CODEPTR
-#define __TBB_FLOW_TRACE_CODEPTR __TBB_CPF_BUILD
+    #define __TBB_FLOW_TRACE_CODEPTR __TBB_CPF_BUILD
 #endif
 
 // Intel(R) C++ Compiler starts analyzing usages of the deprecated content at the template
 // instantiation site, which is too late for suppression of the corresponding messages for internal
 // stuff.
-#if !defined(__INTEL_COMPILER)                                                                               \
-        && (!defined(TBB_SUPPRESS_DEPRECATED_MESSAGES) || (TBB_SUPPRESS_DEPRECATED_MESSAGES == 0))
-#if (__TBB_LANG >= 201402L && (!defined(_MSC_VER) || _MSC_VER >= 1920))
-#define __TBB_DEPRECATED [[deprecated]]
-#define __TBB_DEPRECATED_MSG(msg) [[deprecated(msg)]]
-#elif _MSC_VER
-#define __TBB_DEPRECATED __declspec(deprecated)
-#define __TBB_DEPRECATED_MSG(msg) __declspec(deprecated(msg))
-#elif (__GNUC__ && __TBB_GCC_VERSION >= 40805) || __clang__
-#define __TBB_DEPRECATED __attribute__((deprecated))
-#define __TBB_DEPRECATED_MSG(msg) __attribute__((deprecated(msg)))
-#endif
-#endif// !defined(TBB_SUPPRESS_DEPRECATED_MESSAGES) || (TBB_SUPPRESS_DEPRECATED_MESSAGES == 0)
+#if !defined(__INTEL_COMPILER) && (!defined(TBB_SUPPRESS_DEPRECATED_MESSAGES) || (TBB_SUPPRESS_DEPRECATED_MESSAGES == 0))
+    #if (__TBB_LANG >= 201402L && (!defined(_MSC_VER) || _MSC_VER >= 1920))
+        #define __TBB_DEPRECATED [[deprecated]]
+        #define __TBB_DEPRECATED_MSG(msg) [[deprecated(msg)]]
+    #elif _MSC_VER
+        #define __TBB_DEPRECATED __declspec(deprecated)
+        #define __TBB_DEPRECATED_MSG(msg) __declspec(deprecated(msg))
+    #elif (__GNUC__ && __TBB_GCC_VERSION >= 40805) || __clang__
+        #define __TBB_DEPRECATED __attribute__((deprecated))
+        #define __TBB_DEPRECATED_MSG(msg) __attribute__((deprecated(msg)))
+    #endif
+#endif  // !defined(TBB_SUPPRESS_DEPRECATED_MESSAGES) || (TBB_SUPPRESS_DEPRECATED_MESSAGES == 0)
 
 #if !defined(__TBB_DEPRECATED)
-#define __TBB_DEPRECATED
-#define __TBB_DEPRECATED_MSG(msg)
+    #define __TBB_DEPRECATED
+    #define __TBB_DEPRECATED_MSG(msg)
 #elif !defined(__TBB_SUPPRESS_INTERNAL_DEPRECATED_MESSAGES)
-// Suppress deprecated messages from self
-#define __TBB_SUPPRESS_INTERNAL_DEPRECATED_MESSAGES 1
+    // Suppress deprecated messages from self
+    #define __TBB_SUPPRESS_INTERNAL_DEPRECATED_MESSAGES 1
 #endif
 
 #if defined(TBB_SUPPRESS_DEPRECATED_MESSAGES) && (TBB_SUPPRESS_DEPRECATED_MESSAGES == 0)
-#define __TBB_DEPRECATED_VERBOSE __TBB_DEPRECATED
-#define __TBB_DEPRECATED_VERBOSE_MSG(msg) __TBB_DEPRECATED_MSG(msg)
+    #define __TBB_DEPRECATED_VERBOSE __TBB_DEPRECATED
+    #define __TBB_DEPRECATED_VERBOSE_MSG(msg) __TBB_DEPRECATED_MSG(msg)
 #else
-#define __TBB_DEPRECATED_VERBOSE
-#define __TBB_DEPRECATED_VERBOSE_MSG(msg)
-#endif// (TBB_SUPPRESS_DEPRECATED_MESSAGES == 0)
+    #define __TBB_DEPRECATED_VERBOSE
+    #define __TBB_DEPRECATED_VERBOSE_MSG(msg)
+#endif // (TBB_SUPPRESS_DEPRECATED_MESSAGES == 0)
 
-#if (!defined(TBB_SUPPRESS_DEPRECATED_MESSAGES) || (TBB_SUPPRESS_DEPRECATED_MESSAGES == 0))                  \
-        && !(__TBB_LANG >= 201103L || _MSC_VER >= 1900)
-#pragma message(                                                                                             \
-        "TBB Warning: Support for C++98/03 is deprecated. Please use the compiler that supports C++11 features at least.")
+#if (!defined(TBB_SUPPRESS_DEPRECATED_MESSAGES) || (TBB_SUPPRESS_DEPRECATED_MESSAGES == 0)) && !(__TBB_LANG >= 201103L || _MSC_VER >= 1900)
+    #pragma message("TBB Warning: Support for C++98/03 is deprecated. Please use the compiler that supports C++11 features at least.")
 #endif
 
 #ifdef _VARIADIC_MAX
-#define __TBB_VARIADIC_MAX _VARIADIC_MAX
+    #define __TBB_VARIADIC_MAX _VARIADIC_MAX
 #else
-#if _MSC_VER == 1700
-#define __TBB_VARIADIC_MAX 5// VS11 setting, issue resolved in VS12
-#elif _MSC_VER == 1600
-#define __TBB_VARIADIC_MAX 10// VS10 setting
-#else
-#define __TBB_VARIADIC_MAX 15
-#endif
+    #if _MSC_VER == 1700
+        #define __TBB_VARIADIC_MAX 5 // VS11 setting, issue resolved in VS12
+    #elif _MSC_VER == 1600
+        #define __TBB_VARIADIC_MAX 10 // VS10 setting
+    #else
+        #define __TBB_VARIADIC_MAX 15
+    #endif
 #endif
 
 #if __SANITIZE_THREAD__
-#define __TBB_USE_THREAD_SANITIZER 1
+    #define __TBB_USE_THREAD_SANITIZER 1
 #elif defined(__has_feature)
 #if __has_feature(thread_sanitizer)
-#define __TBB_USE_THREAD_SANITIZER 1
+    #define __TBB_USE_THREAD_SANITIZER 1
 #endif
 #endif
 
@@ -488,10 +479,10 @@
 #endif
 
 #if __TBB_CPP20_CONCEPTS_PRESENT && __TBB_USE_CONSTRAINTS
-#define __TBB_requires(...) requires __VA_ARGS__
-#else// __TBB_CPP20_CONCEPTS_PRESENT
-#define __TBB_requires(...)
-#endif// __TBB_CPP20_CONCEPTS_PRESENT
+    #define __TBB_requires(...) requires __VA_ARGS__
+#else // __TBB_CPP20_CONCEPTS_PRESENT
+    #define __TBB_requires(...)
+#endif // __TBB_CPP20_CONCEPTS_PRESENT
 
 /** Macros of the form __TBB_XXX_BROKEN denote known issues that are caused by
     the bugs in compilers, standard or OS specific libraries. They should be
@@ -501,39 +492,40 @@
 
 // Some STL containers not support allocator traits in old GCC versions
 #if __GXX_EXPERIMENTAL_CXX0X__ && __TBB_GLIBCXX_VERSION <= 50301
-#define TBB_ALLOCATOR_TRAITS_BROKEN 1
+    #define TBB_ALLOCATOR_TRAITS_BROKEN 1
 #endif
 
 // GCC 4.8 C++ standard library implements std::this_thread::yield as no-op.
 #if __TBB_GLIBCXX_VERSION >= 40800 && __TBB_GLIBCXX_VERSION < 40900
-#define __TBB_GLIBCXX_THIS_THREAD_YIELD_BROKEN 1
+    #define __TBB_GLIBCXX_THIS_THREAD_YIELD_BROKEN 1
 #endif
 
 /** End of __TBB_XXX_BROKEN macro section **/
 
-#if defined(_MSC_VER) && _MSC_VER >= 1500 && !defined(__INTEL_COMPILER)
-// A macro to suppress erroneous or benign "unreachable code" MSVC warning (4702)
-#define __TBB_MSVC_UNREACHABLE_CODE_IGNORED 1
+#if defined(_MSC_VER) && _MSC_VER>=1500 && !defined(__INTEL_COMPILER)
+    // A macro to suppress erroneous or benign "unreachable code" MSVC warning (4702)
+    #define __TBB_MSVC_UNREACHABLE_CODE_IGNORED 1
 #endif
 
 // Many OS versions (Android 4.0.[0-3] for example) need workaround for dlopen to avoid non-recursive loader lock hang
 // Setting the workaround for all compile targets ($APP_PLATFORM) below Android 4.4 (android-19)
 #if __ANDROID__
-#include <android/api-level.h>
+    #include <android/api-level.h>
 #endif
 
 #define __TBB_PREVIEW_MESSAGE_BASED_KEY_MATCHING (TBB_PREVIEW_FLOW_GRAPH_FEATURES)
 
 #ifndef __TBB_PREVIEW_CRITICAL_TASKS
-#define __TBB_PREVIEW_CRITICAL_TASKS 1
+#define __TBB_PREVIEW_CRITICAL_TASKS            1
 #endif
 
 #ifndef __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-#define __TBB_PREVIEW_FLOW_GRAPH_NODE_SET (TBB_PREVIEW_FLOW_GRAPH_FEATURES)
+#define __TBB_PREVIEW_FLOW_GRAPH_NODE_SET       (TBB_PREVIEW_FLOW_GRAPH_FEATURES)
 #endif
 
-#if TBB_PREVIEW_MUTEXES || __TBB_BUILD
-#define __TBB_PREVIEW_MUTEXES 1
+#ifndef __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+#define __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT (TBB_PREVIEW_FLOW_GRAPH_FEATURES \
+                                                   || TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT)
 #endif
 
 #if TBB_PREVIEW_CONCURRENT_HASH_MAP_EXTENSIONS
@@ -544,8 +536,12 @@
 #define __TBB_PREVIEW_TASK_GROUP_EXTENSIONS 1
 #endif
 
-#if TBB_PREVIEW_COLLABORATIVE_CALL_ONCE || __TBB_BUILD
-#define __TBB_PREVIEW_COLLABORATIVE_CALL_ONCE 1
+#if TBB_PREVIEW_PARALLEL_PHASE || __TBB_BUILD
+#define __TBB_PREVIEW_PARALLEL_PHASE 1
+#endif
+
+#if TBB_PREVIEW_BLOCKED_ND_RANGE_DEDUCTION_GUIDES
+#define __TBB_PREVIEW_BLOCKED_ND_RANGE_DEDUCTION_GUIDES 1
 #endif
 
-#endif// __TBB_detail__config_H
+#endif // __TBB_detail__config_H
diff --git a/external/tbb/include/oneapi/tbb/detail/_containers_helpers.h b/external/tbb/include/oneapi/tbb/detail/_containers_helpers.h
index 328e26ea..4dca07fa 100644
--- a/external/tbb/include/oneapi/tbb/detail/_containers_helpers.h
+++ b/external/tbb/include/oneapi/tbb/detail/_containers_helpers.h
@@ -17,61 +17,51 @@
 #ifndef __TBB_detail__containers_helpers_H
 #define __TBB_detail__containers_helpers_H
 
-#include "_allocator_traits.h"
 #include "_template_helpers.h"
-#include <functional>
-#include <memory>
+#include "_allocator_traits.h"
 #include <type_traits>
+#include <memory>
+#include <functional>
 
 namespace tbb {
-    namespace detail {
-        inline namespace d0 {
-
-            template <typename Compare, typename = void>
-            struct comp_is_transparent : std::false_type {};
-
-            template <typename Compare>
-            struct comp_is_transparent<Compare, tbb::detail::void_t<typename Compare::is_transparent>>
-                : std::true_type {};
-
-            template <typename Key, typename Hasher, typename KeyEqual, typename = void>
-            struct has_transparent_key_equal : std::false_type {
-                using type = KeyEqual;
-            };
-
-            template <typename Key, typename Hasher, typename KeyEqual>
-            struct has_transparent_key_equal<Key, Hasher, KeyEqual,
-                                             tbb::detail::void_t<typename Hasher::transparent_key_equal>>
-                : std::true_type {
-                using type = typename Hasher::transparent_key_equal;
-                static_assert(comp_is_transparent<type>::value, "Hash::transparent_key_equal::is_transparent "
-                                                                "is not valid or does not denote a type.");
-                static_assert(
-                        (std::is_same<KeyEqual, std::equal_to<Key>>::value
-                         || std::is_same<typename Hasher::transparent_key_equal, KeyEqual>::value),
-                        "KeyEqual is a different type than equal_to<Key> or Hash::transparent_key_equal.");
-            };
-
-            struct is_iterator_impl {
-                template <typename T>
-                using iter_traits_category = typename std::iterator_traits<T>::iterator_category;
-
-                template <typename T>
-                using input_iter_category = typename std::enable_if<
-                        std::is_base_of<std::input_iterator_tag, iter_traits_category<T>>::value>::type;
-            };// struct is_iterator_impl
-
-            template <typename T>
-            using is_input_iterator = supports<T, is_iterator_impl::iter_traits_category,
-                                               is_iterator_impl::input_iter_category>;
+namespace detail {
+inline namespace d0 {
+
+template <typename Compare, typename = void>
+struct comp_is_transparent : std::false_type {};
+
+template <typename Compare>
+struct comp_is_transparent<Compare, tbb::detail::void_t<typename Compare::is_transparent>> : std::true_type {};
+
+template <typename Key, typename Hasher, typename KeyEqual, typename = void >
+struct has_transparent_key_equal : std::false_type { using type = KeyEqual; };
+
+template <typename Key, typename Hasher, typename KeyEqual>
+struct has_transparent_key_equal<Key, Hasher, KeyEqual, tbb::detail::void_t<typename Hasher::transparent_key_equal>> : std::true_type {
+    using type = typename Hasher::transparent_key_equal;
+    static_assert(comp_is_transparent<type>::value, "Hash::transparent_key_equal::is_transparent is not valid or does not denote a type.");
+    static_assert((std::is_same<KeyEqual, std::equal_to<Key>>::value ||
+        std::is_same<typename Hasher::transparent_key_equal, KeyEqual>::value), "KeyEqual is a different type than equal_to<Key> or Hash::transparent_key_equal.");
+ };
+
+struct is_iterator_impl {
+template <typename T>
+using iter_traits_category = typename std::iterator_traits<T>::iterator_category;
+
+template <typename T>
+using input_iter_category = typename std::enable_if<std::is_base_of<std::input_iterator_tag, iter_traits_category<T>>::value>::type;
+}; // struct is_iterator_impl
+
+template <typename T>
+using is_input_iterator = supports<T, is_iterator_impl::iter_traits_category, is_iterator_impl::input_iter_category>;
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
-            template <typename T>
-            inline constexpr bool is_input_iterator_v = is_input_iterator<T>::value;
+template <typename T>
+inline constexpr bool is_input_iterator_v = is_input_iterator<T>::value;
 #endif
 
-        }// namespace d0
-    }    // namespace detail
-}// namespace tbb
+} // inline namespace d0
+} // namespace detail
+} // namespace tbb
 
-#endif// __TBB_detail__containers_helpers_H
+#endif // __TBB_detail__containers_helpers_H
diff --git a/external/tbb/include/oneapi/tbb/detail/_exception.h b/external/tbb/include/oneapi/tbb/detail/_exception.h
index 178fd103..d1aa1fc6 100644
--- a/external/tbb/include/oneapi/tbb/detail/_exception.h
+++ b/external/tbb/include/oneapi/tbb/detail/_exception.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -19,77 +19,76 @@
 
 #include "_config.h"
 
-#include <exception>// std::exception
-#include <new>      // std::bad_alloc
-#if __TBB_SUPPORTS_WORKERS_WAITING_IN_TERMINATE
-#include <stdexcept>// std::runtime_error
-#endif
+#include <new>          // std::bad_alloc
+#include <exception>    // std::exception
+#include <stdexcept>    // std::runtime_error
 
 namespace tbb {
-    namespace detail {
-        inline namespace d0 {
-            enum class exception_id {
-                bad_alloc = 1,
-                bad_last_alloc,
-                user_abort,
-                nonpositive_step,
-                out_of_range,
-                reservation_length_error,
-                missing_wait,
-                invalid_load_factor,
-                invalid_key,
-                bad_tagged_msg_cast,
-                unsafe_wait,
-#if __TBB_PREVIEW_TASK_GROUP_EXTENSIONS
-                bad_task_handle,
-                bad_task_handle_wrong_task_group,
-#endif// __TBB_PREVIEW_TASK_GROUP_EXTENSIONS
-                last_entry
-            };
-        }// namespace d0
+namespace detail {
+inline namespace d0 {
+enum class exception_id {
+    bad_alloc = 1,
+    bad_last_alloc,
+    user_abort,
+    nonpositive_step,
+    out_of_range,
+    reservation_length_error,
+    missing_wait,
+    invalid_load_factor,
+    invalid_key,
+    bad_tagged_msg_cast,
+    unsafe_wait,
+    last_entry
+};
+} // namespace d0
 
 #if _MSC_VER
-#pragma warning(disable : 4275)
+    #pragma warning(disable: 4275)
 #endif
 
-        namespace r1 {
-            //! Exception for concurrent containers
-            class TBB_EXPORT bad_last_alloc : public std::bad_alloc {
-            public:
-                const char* __TBB_EXPORTED_METHOD what() const noexcept(true) override;
-            };
-
-            //! Exception for user-initiated abort
-            class TBB_EXPORT user_abort : public std::exception {
-            public:
-                const char* __TBB_EXPORTED_METHOD what() const noexcept(true) override;
-            };
-
-            //! Exception for missing wait on structured_task_group
-            class TBB_EXPORT missing_wait : public std::exception {
-            public:
-                const char* __TBB_EXPORTED_METHOD what() const noexcept(true) override;
-            };
-
-#if __TBB_SUPPORTS_WORKERS_WAITING_IN_TERMINATE
-            //! Exception for impossible finalization of task_sheduler_handle
-            class unsafe_wait : public std::runtime_error {
-            public:
-                unsafe_wait(const char* msg) : std::runtime_error(msg) {}
-            };
-#endif// __TBB_SUPPORTS_WORKERS_WAITING_IN_TERMINATE
-
-            //! Gathers all throw operators in one place.
-            /** Its purpose is to minimize code bloat that can be caused by throw operators
+namespace r1 {
+//! Exception for concurrent containers
+class TBB_EXPORT bad_last_alloc : public std::bad_alloc {
+public:
+    const char* __TBB_EXPORTED_METHOD what() const noexcept(true) override;
+};
+
+//! Exception for user-initiated abort
+class TBB_EXPORT user_abort : public std::exception {
+public:
+    const char* __TBB_EXPORTED_METHOD what() const noexcept(true) override;
+};
+
+//! Exception for missing wait on structured_task_group
+class TBB_EXPORT missing_wait : public std::exception {
+public:
+    const char* __TBB_EXPORTED_METHOD what() const noexcept(true) override;
+};
+
+//! Exception for impossible finalization of task_sheduler_handle
+#if __APPLE__
+    #pragma GCC visibility push(default)
+#endif
+class TBB_EXPORT unsafe_wait : public std::runtime_error {
+public:
+    unsafe_wait(const char* msg) : std::runtime_error(msg) {}
+};
+#if __APPLE__
+    #pragma GCC visibility pop
+#endif
+
+//! Gathers all throw operators in one place.
+/** Its purpose is to minimize code bloat that can be caused by throw operators
     scattered in multiple places, especially in templates. **/
-            TBB_EXPORT void __TBB_EXPORTED_FUNC throw_exception(exception_id);
-        }// namespace r1
+TBB_EXPORT void __TBB_EXPORTED_FUNC throw_exception ( exception_id );
+} // namespace r1
+
+inline namespace d0 {
+using r1::throw_exception;
+} // namespace d0
 
-        inline namespace d0 {
-            using r1::throw_exception;
-        }// namespace d0
+} // namespace detail
+} // namespace tbb
 
-    }// namespace detail
-}// namespace tbb
+#endif // __TBB__exception_H
 
-#endif// __TBB__exception_H
diff --git a/external/tbb/include/oneapi/tbb/detail/_export.h b/external/tbb/include/oneapi/tbb/detail/_export.h
index ddaa7f60..24b6c08e 100644
--- a/external/tbb/include/oneapi/tbb/detail/_export.h
+++ b/external/tbb/include/oneapi/tbb/detail/_export.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -18,29 +18,37 @@
 #define __TBB_detail__export_H
 
 #if defined(__MINGW32__)
-#define _EXPORT __declspec(dllexport)
-#elif defined(_WIN32) || defined(__unix__) || defined(__APPLE__)// Use .def files for these
-#define _EXPORT
+    #define __TBB_EXPORT __declspec(dllexport)
+#elif defined(_WIN32) // Use .def files for these
+    #define __TBB_EXPORT
+#elif defined(__unix__) || defined(__APPLE__) // Use .def files for these
+    #define __TBB_EXPORT __attribute__ ((visibility ("default")))
 #else
-#error "Unknown platform/compiler"
+    #error "Unknown platform/compiler"
 #endif
 
 #if __TBB_BUILD
-#define TBB_EXPORT _EXPORT
+    #define TBB_EXPORT __TBB_EXPORT
 #else
-#define TBB_EXPORT
+    #define TBB_EXPORT
 #endif
 
 #if __TBBMALLOC_BUILD
-#define TBBMALLOC_EXPORT _EXPORT
+    #define TBBMALLOC_EXPORT __TBB_EXPORT
 #else
-#define TBBMALLOC_EXPORT
+    #define TBBMALLOC_EXPORT
+#endif
+
+#if __TBBMALLOCPROXY_BUILD
+    #define TBBMALLOCPROXY_EXPORT __TBB_EXPORT
+#else
+    #define TBBMALLOCPROXY_EXPORT
 #endif
 
 #if __TBBBIND_BUILD
-#define TBBBIND_EXPORT _EXPORT
+    #define TBBBIND_EXPORT __TBB_EXPORT
 #else
-#define TBBBIND_EXPORT
+    #define TBBBIND_EXPORT
 #endif
 
 #endif
diff --git a/external/tbb/include/oneapi/tbb/detail/_flow_graph_body_impl.h b/external/tbb/include/oneapi/tbb/detail/_flow_graph_body_impl.h
index 55e38637..21da06ce 100644
--- a/external/tbb/include/oneapi/tbb/detail/_flow_graph_body_impl.h
+++ b/external/tbb/include/oneapi/tbb/detail/_flow_graph_body_impl.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -21,41 +21,41 @@
 #error Do not #include this internal file directly; use public TBB headers instead.
 #endif
 
-// included in namespace tbb::detail::d1 (in flow_graph.h)
+// included in namespace tbb::detail::d2 (in flow_graph.h)
 
 typedef std::uint64_t tag_value;
 
+
 // TODO revamp: find out if there is already helper for has_policy.
-template <typename... Policies>
-struct Policy {};
+template<typename ... Policies> struct Policy {};
 
-template <typename... Policies>
-struct has_policy;
+template<typename ... Policies> struct has_policy;
 
-template <typename ExpectedPolicy, typename FirstPolicy, typename... Policies>
-struct has_policy<ExpectedPolicy, FirstPolicy, Policies...>
-    : std::integral_constant<bool, has_policy<ExpectedPolicy, FirstPolicy>::value
-                                           || has_policy<ExpectedPolicy, Policies...>::value> {};
+template<typename ExpectedPolicy, typename FirstPolicy, typename ...Policies>
+struct has_policy<ExpectedPolicy, FirstPolicy, Policies...> :
+    std::integral_constant<bool, has_policy<ExpectedPolicy, FirstPolicy>::value ||
+                                 has_policy<ExpectedPolicy, Policies...>::value> {};
 
-template <typename ExpectedPolicy, typename SinglePolicy>
-struct has_policy<ExpectedPolicy, SinglePolicy>
-    : std::integral_constant<bool, std::is_same<ExpectedPolicy, SinglePolicy>::value> {};
+template<typename ExpectedPolicy, typename SinglePolicy>
+struct has_policy<ExpectedPolicy, SinglePolicy> :
+    std::integral_constant<bool, std::is_same<ExpectedPolicy, SinglePolicy>::value> {};
 
-template <typename ExpectedPolicy, typename... Policies>
-struct has_policy<ExpectedPolicy, Policy<Policies...>> : has_policy<ExpectedPolicy, Policies...> {};
+template<typename ExpectedPolicy, typename ...Policies>
+struct has_policy<ExpectedPolicy, Policy<Policies...> > : has_policy<ExpectedPolicy, Policies...> {};
 
 namespace graph_policy_namespace {
 
-    struct rejecting {};
-    struct reserving {};
-    struct queueing {};
-    struct lightweight {};
+    struct rejecting { };
+    struct reserving { };
+    struct queueing  { };
+    struct lightweight  { };
 
     // K == type of field used for key-matching.  Each tag-matching port will be provided
     // functor that, given an object accepted by the port, will return the
     /// field of type K being used for matching.
-    template <typename K, typename KHash = tbb_hash_compare<typename std::decay<K>::type>>
-    __TBB_requires(tbb::detail::hash_compare<KHash, K>) struct key_matching {
+    template<typename K, typename KHash=d1::tbb_hash_compare<typename std::decay<K>::type > >
+        __TBB_requires(tbb::detail::hash_compare<KHash, K>)
+    struct key_matching {
         typedef K key_type;
         typedef typename std::decay<K>::type base_key_type;
         typedef KHash hash_compare_type;
@@ -68,122 +68,127 @@ namespace graph_policy_namespace {
     typedef Policy<queueing, lightweight> queueing_lightweight;
     typedef Policy<rejecting, lightweight> rejecting_lightweight;
 
-}// namespace graph_policy_namespace
+} // namespace graph_policy_namespace
 
 // -------------- function_body containers ----------------------
 
 //! A functor that takes no input and generates a value of type Output
-template <typename Output>
+template< typename Output >
 class input_body : no_assign {
 public:
     virtual ~input_body() {}
-    virtual Output operator()(flow_control& fc) = 0;
+    virtual Output operator()(d1::flow_control& fc) = 0;
     virtual input_body* clone() = 0;
 };
 
 //! The leaf for input_body
-template <typename Output, typename Body>
+template< typename Output, typename Body>
 class input_body_leaf : public input_body<Output> {
 public:
-    input_body_leaf(const Body& _body) : body(_body) {}
-    Output operator()(flow_control& fc) override { return body(fc); }
-    input_body_leaf* clone() override { return new input_body_leaf<Output, Body>(body); }
+    input_body_leaf( const Body &_body ) : body(_body) { }
+    Output operator()(d1::flow_control& fc) override { return body(fc); }
+    input_body_leaf* clone() override {
+        return new input_body_leaf< Output, Body >(body);
+    }
     Body get_body() { return body; }
-
 private:
     Body body;
 };
 
 //! A functor that takes an Input and generates an Output
-template <typename Input, typename Output>
+template< typename Input, typename Output >
 class function_body : no_assign {
 public:
     virtual ~function_body() {}
-    virtual Output operator()(const Input& input) = 0;
+    virtual Output operator()(const Input &input) = 0;
     virtual function_body* clone() = 0;
 };
 
 //! the leaf for function_body
 template <typename Input, typename Output, typename B>
-class function_body_leaf : public function_body<Input, Output> {
+class function_body_leaf : public function_body< Input, Output > {
 public:
-    function_body_leaf(const B& _body) : body(_body) {}
-    Output operator()(const Input& i) override { return body(i); }
+    function_body_leaf( const B &_body ) : body(_body) { }
+    Output operator()(const Input &i) override { return tbb::detail::invoke(body,i); }
     B get_body() { return body; }
-    function_body_leaf* clone() override { return new function_body_leaf<Input, Output, B>(body); }
-
+    function_body_leaf* clone() override {
+        return new function_body_leaf< Input, Output, B >(body);
+    }
 private:
     B body;
 };
 
 //! the leaf for function_body specialized for Input and output of continue_msg
 template <typename B>
-class function_body_leaf<continue_msg, continue_msg, B> : public function_body<continue_msg, continue_msg> {
+class function_body_leaf< continue_msg, continue_msg, B> : public function_body< continue_msg, continue_msg > {
 public:
-    function_body_leaf(const B& _body) : body(_body) {}
-    continue_msg operator()(const continue_msg& i) override {
+    function_body_leaf( const B &_body ) : body(_body) { }
+    continue_msg operator()( const continue_msg &i ) override {
         body(i);
         return i;
     }
     B get_body() { return body; }
     function_body_leaf* clone() override {
-        return new function_body_leaf<continue_msg, continue_msg, B>(body);
+        return new function_body_leaf< continue_msg, continue_msg, B >(body);
     }
-
 private:
     B body;
 };
 
 //! the leaf for function_body specialized for Output of continue_msg
 template <typename Input, typename B>
-class function_body_leaf<Input, continue_msg, B> : public function_body<Input, continue_msg> {
+class function_body_leaf< Input, continue_msg, B> : public function_body< Input, continue_msg > {
 public:
-    function_body_leaf(const B& _body) : body(_body) {}
-    continue_msg operator()(const Input& i) override {
+    function_body_leaf( const B &_body ) : body(_body) { }
+    continue_msg operator()(const Input &i) override {
         body(i);
         return continue_msg();
     }
     B get_body() { return body; }
-    function_body_leaf* clone() override { return new function_body_leaf<Input, continue_msg, B>(body); }
-
+    function_body_leaf* clone() override {
+        return new function_body_leaf< Input, continue_msg, B >(body);
+    }
 private:
     B body;
 };
 
 //! the leaf for function_body specialized for Input of continue_msg
 template <typename Output, typename B>
-class function_body_leaf<continue_msg, Output, B> : public function_body<continue_msg, Output> {
+class function_body_leaf< continue_msg, Output, B > : public function_body< continue_msg, Output > {
 public:
-    function_body_leaf(const B& _body) : body(_body) {}
-    Output operator()(const continue_msg& i) override { return body(i); }
+    function_body_leaf( const B &_body ) : body(_body) { }
+    Output operator()(const continue_msg &i) override {
+        return body(i);
+    }
     B get_body() { return body; }
-    function_body_leaf* clone() override { return new function_body_leaf<continue_msg, Output, B>(body); }
-
+    function_body_leaf* clone() override {
+        return new function_body_leaf< continue_msg, Output, B >(body);
+    }
 private:
     B body;
 };
 
 //! function_body that takes an Input and a set of output ports
-template <typename Input, typename OutputSet>
+template<typename Input, typename OutputSet>
 class multifunction_body : no_assign {
 public:
-    virtual ~multifunction_body() {}
-    virtual void operator()(const Input& /* input*/, OutputSet& /*oset*/) = 0;
+    virtual ~multifunction_body () {}
+    virtual void operator()(const Input &/* input*/, OutputSet &/*oset*/) = 0;
     virtual multifunction_body* clone() = 0;
     virtual void* get_body_ptr() = 0;
 };
 
 //! leaf for multifunction.  OutputSet can be a std::tuple or a vector.
-template <typename Input, typename OutputSet, typename B>
+template<typename Input, typename OutputSet, typename B >
 class multifunction_body_leaf : public multifunction_body<Input, OutputSet> {
 public:
-    multifunction_body_leaf(const B& _body) : body(_body) {}
-    void operator()(const Input& input, OutputSet& oset) override {
-        body(input, oset);// body may explicitly put() to one or more of oset.
+    multifunction_body_leaf(const B &_body) : body(_body) { }
+    void operator()(const Input &input, OutputSet &oset) override {
+        tbb::detail::invoke(body, input, oset); // body may explicitly put() to one or more of oset.
     }
     void* get_body_ptr() override { return &body; }
     multifunction_body_leaf* clone() override {
-        return new multifunction_body_leaf<Input, OutputSet, B>(body);
+        return new multifunction_body_leaf<Input, OutputSet,B>(body);
     }
 
 private:
@@ -192,45 +197,45 @@ class multifunction_body_leaf : public multifunction_body<Input, OutputSet> {
 
 // ------ function bodies for hash_buffers and key-matching joins.
 
-template <typename Input, typename Output>
+template<typename Input, typename Output>
 class type_to_key_function_body : no_assign {
-public:
-    virtual ~type_to_key_function_body() {}
-    virtual Output operator()(const Input& input) = 0;// returns an Output
-    virtual type_to_key_function_body* clone() = 0;
+    public:
+        virtual ~type_to_key_function_body() {}
+        virtual Output operator()(const Input &input) = 0;  // returns an Output
+        virtual type_to_key_function_body* clone() = 0;
 };
 
 // specialization for ref output
-template <typename Input, typename Output>
-class type_to_key_function_body<Input, Output&> : no_assign {
-public:
-    virtual ~type_to_key_function_body() {}
-    virtual const Output& operator()(const Input& input) = 0;// returns a const Output&
-    virtual type_to_key_function_body* clone() = 0;
+template<typename Input, typename Output>
+class type_to_key_function_body<Input,Output&> : no_assign {
+    public:
+        virtual ~type_to_key_function_body() {}
+        virtual const Output & operator()(const Input &input) = 0;  // returns a const Output&
+        virtual type_to_key_function_body* clone() = 0;
 };
 
 template <typename Input, typename Output, typename B>
 class type_to_key_function_body_leaf : public type_to_key_function_body<Input, Output> {
 public:
-    type_to_key_function_body_leaf(const B& _body) : body(_body) {}
-    Output operator()(const Input& i) override { return body(i); }
+    type_to_key_function_body_leaf( const B &_body ) : body(_body) { }
+    Output operator()(const Input &i) override { return tbb::detail::invoke(body, i); }
     type_to_key_function_body_leaf* clone() override {
-        return new type_to_key_function_body_leaf<Input, Output, B>(body);
+        return new type_to_key_function_body_leaf< Input, Output, B>(body);
     }
-
 private:
     B body;
 };
 
 template <typename Input, typename Output, typename B>
-class type_to_key_function_body_leaf<Input, Output&, B> : public type_to_key_function_body<Input, Output&> {
+class type_to_key_function_body_leaf<Input,Output&,B> : public type_to_key_function_body< Input, Output&> {
 public:
-    type_to_key_function_body_leaf(const B& _body) : body(_body) {}
-    const Output& operator()(const Input& i) override { return body(i); }
+    type_to_key_function_body_leaf( const B &_body ) : body(_body) { }
+    const Output& operator()(const Input &i) override {
+        return tbb::detail::invoke(body, i);
+    }
     type_to_key_function_body_leaf* clone() override {
-        return new type_to_key_function_body_leaf<Input, Output&, B>(body);
+        return new type_to_key_function_body_leaf< Input, Output&, B>(body);
     }
-
 private:
     B body;
 };
@@ -240,89 +245,147 @@ class type_to_key_function_body_leaf<Input, Output&, B> : public type_to_key_fun
 // --------------------------- node task bodies ---------------------------------------
 
 //! A task that calls a node's forward_task function
-template <typename NodeType>
+template< typename NodeType >
 class forward_task_bypass : public graph_task {
-    NodeType& my_node;
-
+    NodeType &my_node;
 public:
-    forward_task_bypass(graph& g, small_object_allocator& allocator, NodeType& n,
-                        node_priority_t node_priority = no_priority)
-        : graph_task(g, allocator, node_priority), my_node(n) {}
+    forward_task_bypass( graph& g, d1::small_object_allocator& allocator, NodeType &n
+                         , node_priority_t node_priority = no_priority
+    ) : graph_task(g, allocator, node_priority),
+    my_node(n) {}
 
-    task* execute(execution_data& ed) override {
+    d1::task* execute(d1::execution_data& ed) override {
         graph_task* next_task = my_node.forward_task();
-        if (SUCCESSFULLY_ENQUEUED == next_task) next_task = nullptr;
+        if (SUCCESSFULLY_ENQUEUED == next_task)
+            next_task = nullptr;
         else if (next_task)
             next_task = prioritize_task(my_node.graph_reference(), *next_task);
-        finalize(ed);
+        finalize<forward_task_bypass>(ed);
         return next_task;
     }
+
+    d1::task* cancel(d1::execution_data& ed) override {
+        finalize<forward_task_bypass>(ed);
+        return nullptr;
+    }
 };
 
 //! A task that calls a node's apply_body_bypass function, passing in an input of type Input
-//  return the task* unless it is SUCCESSFULLY_ENQUEUED, in which case return NULL
-template <typename NodeType, typename Input>
-class apply_body_task_bypass : public graph_task {
-    NodeType& my_node;
+//  return the task* unless it is SUCCESSFULLY_ENQUEUED, in which case return nullptr
+template< typename NodeType, typename Input, typename BaseTaskType = graph_task>
+class apply_body_task_bypass
+    : public BaseTaskType
+{
+    NodeType &my_node;
     Input my_input;
 
+    using check_metainfo = std::is_same<BaseTaskType, graph_task>;
+    using without_metainfo = std::true_type;
+    using with_metainfo = std::false_type;
+
+    graph_task* call_apply_body_bypass_impl(without_metainfo) {
+        return my_node.apply_body_bypass(my_input
+                                         __TBB_FLOW_GRAPH_METAINFO_ARG(message_metainfo{}));
+    }
+
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+    graph_task* call_apply_body_bypass_impl(with_metainfo) {
+        return my_node.apply_body_bypass(my_input, message_metainfo{this->get_msg_wait_context_vertices()});
+    }
+#endif
+
+    graph_task* call_apply_body_bypass() {
+        return call_apply_body_bypass_impl(check_metainfo{});
+    }
+
 public:
-    apply_body_task_bypass(graph& g, small_object_allocator& allocator, NodeType& n, const Input& i,
-                           node_priority_t node_priority = no_priority)
-        : graph_task(g, allocator, node_priority), my_node(n), my_input(i) {}
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+    template <typename Metainfo>
+    apply_body_task_bypass( graph& g, d1::small_object_allocator& allocator, NodeType &n, const Input &i,
+                            node_priority_t node_priority, Metainfo&& metainfo )
+        : BaseTaskType(g, allocator, node_priority, std::forward<Metainfo>(metainfo).waiters())
+        , my_node(n), my_input(i) {}
+#endif
 
-    task* execute(execution_data& ed) override {
-        graph_task* next_task = my_node.apply_body_bypass(my_input);
-        if (SUCCESSFULLY_ENQUEUED == next_task) next_task = nullptr;
+    apply_body_task_bypass( graph& g, d1::small_object_allocator& allocator, NodeType& n, const Input& i,
+                            node_priority_t node_priority = no_priority )
+        : BaseTaskType(g, allocator, node_priority), my_node(n), my_input(i) {}
+
+    d1::task* execute(d1::execution_data& ed) override {
+        graph_task* next_task = call_apply_body_bypass();
+        if (SUCCESSFULLY_ENQUEUED == next_task)
+            next_task = nullptr;
         else if (next_task)
             next_task = prioritize_task(my_node.graph_reference(), *next_task);
-        finalize(ed);
+        BaseTaskType::template finalize<apply_body_task_bypass>(ed);
         return next_task;
     }
+
+    d1::task* cancel(d1::execution_data& ed) override {
+        BaseTaskType::template finalize<apply_body_task_bypass>(ed);
+        return nullptr;
+    }
 };
 
 //! A task that calls a node's apply_body_bypass function with no input
-template <typename NodeType>
+template< typename NodeType >
 class input_node_task_bypass : public graph_task {
-    NodeType& my_node;
-
+    NodeType &my_node;
 public:
-    input_node_task_bypass(graph& g, small_object_allocator& allocator, NodeType& n)
+    input_node_task_bypass( graph& g, d1::small_object_allocator& allocator, NodeType &n )
         : graph_task(g, allocator), my_node(n) {}
 
-    task* execute(execution_data& ed) override {
-        graph_task* next_task = my_node.apply_body_bypass();
-        if (SUCCESSFULLY_ENQUEUED == next_task) next_task = nullptr;
+    d1::task* execute(d1::execution_data& ed) override {
+        graph_task* next_task = my_node.apply_body_bypass( );
+        if (SUCCESSFULLY_ENQUEUED == next_task)
+            next_task = nullptr;
         else if (next_task)
             next_task = prioritize_task(my_node.graph_reference(), *next_task);
-        finalize(ed);
+        finalize<input_node_task_bypass>(ed);
         return next_task;
     }
+
+    d1::task* cancel(d1::execution_data& ed) override {
+        finalize<input_node_task_bypass>(ed);
+        return nullptr;
+    }
 };
 
 // ------------------------ end of node task bodies -----------------------------------
 
-template <typename T, typename DecrementType, typename DummyType = void>
+template<typename T, typename DecrementType, typename DummyType = void>
 class threshold_regulator;
 
-template <typename T, typename DecrementType>
+template<typename T, typename DecrementType>
 class threshold_regulator<T, DecrementType,
-                          typename std::enable_if<std::is_integral<DecrementType>::value>::type>
-    : public receiver<DecrementType>, no_copy {
+                  typename std::enable_if<std::is_integral<DecrementType>::value>::type>
+    : public receiver<DecrementType>, no_copy
+{
     T* my_node;
-
 protected:
-    graph_task* try_put_task(const DecrementType& value) override {
-        graph_task* result = my_node->decrement_counter(value);
-        if (!result) result = SUCCESSFULLY_ENQUEUED;
+
+    graph_task* try_put_task( const DecrementType& value ) override {
+        graph_task* result = my_node->decrement_counter( value );
+        if( !result )
+            result = SUCCESSFULLY_ENQUEUED;
         return result;
     }
 
-    graph& graph_reference() const override { return my_node->my_graph; }
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+    // Intentionally ignore the metainformation
+    // If there are more items associated with passed metainfo to be processed
+    // They should be stored in the buffer before the limiter_node
+    graph_task* try_put_task(const DecrementType& value, const message_metainfo&) override {
+        return try_put_task(value);
+    }
+#endif
+
+    graph& graph_reference() const override {
+        return my_node->my_graph;
+    }
 
-    template <typename U, typename V>
-    friend class limiter_node;
-    void reset_receiver(reset_flags) {}
+    template<typename U, typename V> friend class limiter_node;
+    void reset_receiver( reset_flags ) {}
 
 public:
     threshold_regulator(T* owner) : my_node(owner) {
@@ -330,23 +393,37 @@ class threshold_regulator<T, DecrementType,
     }
 };
 
-template <typename T>
+template<typename T>
 class threshold_regulator<T, continue_msg, void> : public continue_receiver, no_copy {
 
-    T* my_node;
+    T *my_node;
 
-    graph_task* execute() override { return my_node->decrement_counter(1); }
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+    // Intentionally ignore the metainformation
+    // If there are more items associated with passed metainfo to be processed
+    // They should be stored in the buffer before the limiter_node
+    graph_task* execute(const message_metainfo&) override {
+#else
+    graph_task* execute() override {
+#endif
+        return my_node->decrement_counter( 1 );
+    }
 
 protected:
-    graph& graph_reference() const override { return my_node->my_graph; }
+
+    graph& graph_reference() const override {
+        return my_node->my_graph;
+    }
 
 public:
+
     typedef continue_msg input_type;
     typedef continue_msg output_type;
     threshold_regulator(T* owner)
-        : continue_receiver(/*number_of_predecessors=*/0, no_priority), my_node(owner) {
+        : continue_receiver( /*number_of_predecessors=*/0, no_priority ), my_node(owner)
+    {
         // Do not work with the passed pointer here as it may not be fully initialized yet
     }
 };
 
-#endif// __TBB__flow_graph_body_impl_H
+#endif // __TBB__flow_graph_body_impl_H
diff --git a/external/tbb/include/oneapi/tbb/detail/_flow_graph_cache_impl.h b/external/tbb/include/oneapi/tbb/detail/_flow_graph_cache_impl.h
index 384038af..647f3dc1 100644
--- a/external/tbb/include/oneapi/tbb/detail/_flow_graph_cache_impl.h
+++ b/external/tbb/include/oneapi/tbb/detail/_flow_graph_cache_impl.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -21,103 +21,135 @@
 #error Do not #include this internal file directly; use public TBB headers instead.
 #endif
 
-// included in namespace tbb::detail::d1 (in flow_graph.h)
+// included in namespace tbb::detail::d2 (in flow_graph.h)
 
 //! A node_cache maintains a std::queue of elements of type T.  Each operation is protected by a lock.
-template <typename T, typename M = spin_mutex>
+template< typename T, typename M=spin_mutex >
 class node_cache {
-public:
+    public:
+
     typedef size_t size_type;
 
     bool empty() {
-        typename mutex_type::scoped_lock lock(my_mutex);
+        typename mutex_type::scoped_lock lock( my_mutex );
         return internal_empty();
     }
 
-    void add(T& n) {
-        typename mutex_type::scoped_lock lock(my_mutex);
+    void add( T &n ) {
+        typename mutex_type::scoped_lock lock( my_mutex );
         internal_push(n);
     }
 
-    void remove(T& n) {
-        typename mutex_type::scoped_lock lock(my_mutex);
-        for (size_t i = internal_size(); i != 0; --i) {
-            T& s = internal_pop();
-            if (&s == &n) break;// only remove one predecessor per request
+    void remove( T &n ) {
+        typename mutex_type::scoped_lock lock( my_mutex );
+        for ( size_t i = internal_size(); i != 0; --i ) {
+            T &s = internal_pop();
+            if ( &s == &n )
+                break;  // only remove one predecessor per request
             internal_push(s);
         }
     }
 
     void clear() {
-        while (!my_q.empty()) (void) my_q.pop();
+        while( !my_q.empty()) (void)my_q.pop();
     }
 
 protected:
+
     typedef M mutex_type;
     mutex_type my_mutex;
-    std::queue<T*> my_q;
+    std::queue< T * > my_q;
 
     // Assumes lock is held
-    inline bool internal_empty() { return my_q.empty(); }
+    inline bool internal_empty( )  {
+        return my_q.empty();
+    }
 
     // Assumes lock is held
-    inline size_type internal_size() { return my_q.size(); }
+    inline size_type internal_size( )  {
+        return my_q.size();
+    }
 
     // Assumes lock is held
-    inline void internal_push(T& n) { my_q.push(&n); }
+    inline void internal_push( T &n )  {
+        my_q.push(&n);
+    }
 
     // Assumes lock is held
-    inline T& internal_pop() {
-        T* v = my_q.front();
+    inline T &internal_pop() {
+        T *v = my_q.front();
         my_q.pop();
         return *v;
     }
+
 };
 
 //! A cache of predecessors that only supports try_get
-template <typename T, typename M = spin_mutex>
-class predecessor_cache : public node_cache<sender<T>, M> {
+template< typename T, typename M=spin_mutex >
+class predecessor_cache : public node_cache< sender<T>, M > {
 public:
     typedef M mutex_type;
     typedef T output_type;
     typedef sender<output_type> predecessor_type;
     typedef receiver<output_type> successor_type;
 
-    predecessor_cache(successor_type* owner) : my_owner(owner) {
-        __TBB_ASSERT(my_owner, "predecessor_cache should have an owner.");
+    predecessor_cache( successor_type* owner ) : my_owner( owner ) {
+        __TBB_ASSERT( my_owner, "predecessor_cache should have an owner." );
         // Do not work with the passed pointer here as it may not be fully initialized yet
     }
 
-    bool get_item(output_type& v) {
+private:
+    bool get_item_impl( output_type& v
+                        __TBB_FLOW_GRAPH_METAINFO_ARG(message_metainfo* metainfo_ptr = nullptr) )
+    {
 
-        bool msg = false;
+        bool successful_get = false;
 
         do {
-            predecessor_type* src;
+            predecessor_type *src;
             {
                 typename mutex_type::scoped_lock lock(this->my_mutex);
-                if (this->internal_empty()) { break; }
+                if ( this->internal_empty() ) {
+                    break;
+                }
                 src = &this->internal_pop();
             }
 
             // Try to get from this sender
-            msg = src->try_get(v);
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+            if (metainfo_ptr) {
+                successful_get = src->try_get( v, *metainfo_ptr );
+            } else
+#endif
+            {
+                successful_get = src->try_get( v );
+            }
 
-            if (msg == false) {
+            if (successful_get == false) {
                 // Relinquish ownership of the edge
                 register_successor(*src, *my_owner);
             } else {
                 // Retain ownership of the edge
                 this->add(*src);
             }
-        } while (msg == false);
-        return msg;
+        } while ( successful_get == false );
+        return successful_get;
+    }
+public:
+    bool get_item( output_type& v ) {
+        return get_item_impl(v);
+    }
+
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+    bool get_item( output_type& v, message_metainfo& metainfo ) {
+        return get_item_impl(v, &metainfo);
     }
+#endif
 
     // If we are removing arcs (rf_clear_edges), call clear() rather than reset().
     void reset() {
-        for (;;) {
-            predecessor_type* src;
+        for(;;) {
+            predecessor_type *src;
             {
                 if (this->internal_empty()) break;
                 src = &this->internal_pop();
@@ -131,48 +163,68 @@ class predecessor_cache : public node_cache<sender<T>, M> {
 };
 
 //! An cache of predecessors that supports requests and reservations
-template <typename T, typename M = spin_mutex>
-class reservable_predecessor_cache : public predecessor_cache<T, M> {
+template< typename T, typename M=spin_mutex >
+class reservable_predecessor_cache : public predecessor_cache< T, M > {
 public:
     typedef M mutex_type;
     typedef T output_type;
     typedef sender<T> predecessor_type;
     typedef receiver<T> successor_type;
 
-    reservable_predecessor_cache(successor_type* owner)
-        : predecessor_cache<T, M>(owner), reserved_src(nullptr) {
+    reservable_predecessor_cache( successor_type* owner )
+        : predecessor_cache<T,M>(owner), reserved_src(nullptr)
+    {
         // Do not work with the passed pointer here as it may not be fully initialized yet
     }
 
-    bool try_reserve(output_type& v) {
-        bool msg = false;
+private:
+    bool try_reserve_impl( output_type &v __TBB_FLOW_GRAPH_METAINFO_ARG(message_metainfo* metainfo) ) {
+        bool successful_reserve = false;
 
         do {
             predecessor_type* pred = nullptr;
             {
                 typename mutex_type::scoped_lock lock(this->my_mutex);
-                if (reserved_src.load(std::memory_order_relaxed) || this->internal_empty()) return false;
+                if ( reserved_src.load(std::memory_order_relaxed) || this->internal_empty() )
+                    return false;
 
                 pred = &this->internal_pop();
                 reserved_src.store(pred, std::memory_order_relaxed);
             }
 
             // Try to get from this sender
-            msg = pred->try_reserve(v);
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+            if (metainfo) {
+                successful_reserve = pred->try_reserve( v, *metainfo );
+            } else
+#endif
+            {
+                successful_reserve = pred->try_reserve( v );
+            }
 
-            if (msg == false) {
+            if (successful_reserve == false) {
                 typename mutex_type::scoped_lock lock(this->my_mutex);
                 // Relinquish ownership of the edge
-                register_successor(*pred, *this->my_owner);
+                register_successor( *pred, *this->my_owner );
                 reserved_src.store(nullptr, std::memory_order_relaxed);
             } else {
                 // Retain ownership of the edge
-                this->add(*pred);
+                this->add( *pred);
             }
-        } while (msg == false);
+        } while ( successful_reserve == false );
 
-        return msg;
+        return successful_reserve;
     }
+public:
+    bool try_reserve( output_type& v ) {
+        return try_reserve_impl(v __TBB_FLOW_GRAPH_METAINFO_ARG(nullptr));
+    }
+
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+    bool try_reserve( output_type& v, message_metainfo& metainfo ) {
+        return try_reserve_impl(v, &metainfo);
+    }
+#endif
 
     bool try_release() {
         reserved_src.load(std::memory_order_relaxed)->try_release();
@@ -200,10 +252,12 @@ class reservable_predecessor_cache : public predecessor_cache<T, M> {
     std::atomic<predecessor_type*> reserved_src;
 };
 
+
 //! An abstract cache of successors
-template <typename T, typename M = spin_rw_mutex>
+template<typename T, typename M=spin_rw_mutex >
 class successor_cache : no_copy {
 protected:
+
     typedef M mutex_type;
     mutex_type my_mutex;
 
@@ -211,29 +265,31 @@ class successor_cache : no_copy {
     typedef receiver<T>* pointer_type;
     typedef sender<T> owner_type;
     // TODO revamp: introduce heapified collection of successors for strict priorities
-    typedef std::list<pointer_type> successors_type;
+    typedef std::list< pointer_type > successors_type;
     successors_type my_successors;
 
     owner_type* my_owner;
 
 public:
-    successor_cache(owner_type* owner) : my_owner(owner) {
+    successor_cache( owner_type* owner ) : my_owner(owner) {
         // Do not work with the passed pointer here as it may not be fully initialized yet
     }
 
     virtual ~successor_cache() {}
 
-    void register_successor(successor_type& r) {
+    void register_successor( successor_type& r ) {
         typename mutex_type::scoped_lock l(my_mutex, true);
-        if (r.priority() != no_priority) my_successors.push_front(&r);
+        if( r.priority() != no_priority )
+            my_successors.push_front( &r );
         else
-            my_successors.push_back(&r);
+            my_successors.push_back( &r );
     }
 
-    void remove_successor(successor_type& r) {
+    void remove_successor( successor_type& r ) {
         typename mutex_type::scoped_lock l(my_mutex, true);
-        for (typename successors_type::iterator i = my_successors.begin(); i != my_successors.end(); ++i) {
-            if (*i == &r) {
+        for ( typename successors_type::iterator i = my_successors.begin();
+              i != my_successors.end(); ++i ) {
+            if ( *i == & r ) {
                 my_successors.erase(i);
                 break;
             }
@@ -245,48 +301,57 @@ class successor_cache : no_copy {
         return my_successors.empty();
     }
 
-    void clear() { my_successors.clear(); }
+    void clear() {
+        my_successors.clear();
+    }
 
-    virtual graph_task* try_put_task(const T& t) = 0;
-};// successor_cache<T>
+    virtual graph_task* try_put_task( const T& t ) = 0;
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+    virtual graph_task* try_put_task( const T& t, const message_metainfo& metainfo ) = 0;
+#endif
+};  // successor_cache<T>
 
 //! An abstract cache of successors, specialized to continue_msg
-template <typename M>
-class successor_cache<continue_msg, M> : no_copy {
+template<typename M>
+class successor_cache< continue_msg, M > : no_copy {
 protected:
+
     typedef M mutex_type;
     mutex_type my_mutex;
 
     typedef receiver<continue_msg> successor_type;
     typedef receiver<continue_msg>* pointer_type;
     typedef sender<continue_msg> owner_type;
-    typedef std::list<pointer_type> successors_type;
+    typedef std::list< pointer_type > successors_type;
     successors_type my_successors;
     owner_type* my_owner;
 
 public:
-    successor_cache(sender<continue_msg>* owner) : my_owner(owner) {
+    successor_cache( sender<continue_msg>* owner ) : my_owner(owner) {
         // Do not work with the passed pointer here as it may not be fully initialized yet
     }
 
     virtual ~successor_cache() {}
 
-    void register_successor(successor_type& r) {
+    void register_successor( successor_type& r ) {
         typename mutex_type::scoped_lock l(my_mutex, true);
-        if (r.priority() != no_priority) my_successors.push_front(&r);
+        if( r.priority() != no_priority )
+            my_successors.push_front( &r );
         else
-            my_successors.push_back(&r);
-        __TBB_ASSERT(my_owner, "Cache of successors must have an owner.");
-        if (r.is_continue_receiver()) { r.register_predecessor(*my_owner); }
+            my_successors.push_back( &r );
+        __TBB_ASSERT( my_owner, "Cache of successors must have an owner." );
+        if ( r.is_continue_receiver() ) {
+            r.register_predecessor( *my_owner );
+        }
     }
 
-    void remove_successor(successor_type& r) {
+    void remove_successor( successor_type& r ) {
         typename mutex_type::scoped_lock l(my_mutex, true);
-        for (successors_type::iterator i = my_successors.begin(); i != my_successors.end(); ++i) {
-            if (*i == &r) {
+        for ( successors_type::iterator i = my_successors.begin(); i != my_successors.end(); ++i ) {
+            if ( *i == &r ) {
                 __TBB_ASSERT(my_owner, "Cache of successors must have an owner.");
                 // TODO: check if we need to test for continue_receiver before removing from r.
-                r.remove_predecessor(*my_owner);
+                r.remove_predecessor( *my_owner );
                 my_successors.erase(i);
                 break;
             }
@@ -298,37 +363,37 @@ class successor_cache<continue_msg, M> : no_copy {
         return my_successors.empty();
     }
 
-    void clear() { my_successors.clear(); }
+    void clear() {
+        my_successors.clear();
+    }
 
-    virtual graph_task* try_put_task(const continue_msg& t) = 0;
-};// successor_cache< continue_msg >
+    virtual graph_task* try_put_task( const continue_msg& t ) = 0;
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+    virtual graph_task* try_put_task( const continue_msg& t, const message_metainfo& metainfo ) = 0;
+#endif
+};  // successor_cache< continue_msg >
 
 //! A cache of successors that are broadcast to
-template <typename T, typename M = spin_rw_mutex>
+template<typename T, typename M=spin_rw_mutex>
 class broadcast_cache : public successor_cache<T, M> {
     typedef successor_cache<T, M> base_type;
     typedef M mutex_type;
-    typedef typename successor_cache<T, M>::successors_type successors_type;
+    typedef typename successor_cache<T,M>::successors_type successors_type;
 
-public:
-    broadcast_cache(typename base_type::owner_type* owner) : base_type(owner) {
-        // Do not work with the passed pointer here as it may not be fully initialized yet
-    }
-
-    // as above, but call try_put_task instead, and return the last task we received (if any)
-    graph_task* try_put_task(const T& t) override {
-        graph_task* last_task = nullptr;
+    graph_task* try_put_task_impl( const T& t __TBB_FLOW_GRAPH_METAINFO_ARG(const message_metainfo& metainfo) ) {
+        graph_task * last_task = nullptr;
         typename mutex_type::scoped_lock l(this->my_mutex, /*write=*/true);
         typename successors_type::iterator i = this->my_successors.begin();
-        while (i != this->my_successors.end()) {
-            graph_task* new_task = (*i)->try_put_task(t);
+        while ( i != this->my_successors.end() ) {
+            graph_task *new_task = (*i)->try_put_task(t __TBB_FLOW_GRAPH_METAINFO_ARG(metainfo));
             // workaround for icc bug
             graph& graph_ref = (*i)->graph_reference();
-            last_task = combine_tasks(graph_ref, last_task, new_task);// enqueue if necessary
-            if (new_task) {
+            last_task = combine_tasks(graph_ref, last_task, new_task);  // enqueue if necessary
+            if(new_task) {
                 ++i;
-            } else {// failed
-                if ((*i)->register_predecessor(*this->my_owner)) {
+            }
+            else {  // failed
+                if ( (*i)->register_predecessor(*this->my_owner) ) {
                     i = this->my_successors.erase(i);
                 } else {
                     ++i;
@@ -337,20 +402,38 @@ class broadcast_cache : public successor_cache<T, M> {
         }
         return last_task;
     }
+public:
+
+    broadcast_cache( typename base_type::owner_type* owner ): base_type(owner) {
+        // Do not work with the passed pointer here as it may not be fully initialized yet
+    }
+
+    graph_task* try_put_task( const T &t ) override {
+        return try_put_task_impl(t __TBB_FLOW_GRAPH_METAINFO_ARG(message_metainfo{}));
+    }
+
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+    graph_task* try_put_task( const T &t, const message_metainfo& metainfo ) override {
+        return try_put_task_impl(t, metainfo);
+    }
+#endif
 
     // call try_put_task and return list of received tasks
-    bool gather_successful_try_puts(const T& t, graph_task_list& tasks) {
+    bool gather_successful_try_puts( const T &t, graph_task_list& tasks ) {
         bool is_at_least_one_put_successful = false;
         typename mutex_type::scoped_lock l(this->my_mutex, /*write=*/true);
         typename successors_type::iterator i = this->my_successors.begin();
-        while (i != this->my_successors.end()) {
-            graph_task* new_task = (*i)->try_put_task(t);
-            if (new_task) {
+        while ( i != this->my_successors.end() ) {
+            graph_task * new_task = (*i)->try_put_task(t);
+            if(new_task) {
                 ++i;
-                if (new_task != SUCCESSFULLY_ENQUEUED) { tasks.push_back(*new_task); }
+                if(new_task != SUCCESSFULLY_ENQUEUED) {
+                    tasks.push_back(*new_task);
+                }
                 is_at_least_one_put_successful = true;
-            } else {// failed
-                if ((*i)->register_predecessor(*this->my_owner)) {
+            }
+            else {  // failed
+                if ( (*i)->register_predecessor(*this->my_owner) ) {
                     i = this->my_successors.erase(i);
                 } else {
                     ++i;
@@ -362,15 +445,16 @@ class broadcast_cache : public successor_cache<T, M> {
 };
 
 //! A cache of successors that are put in a round-robin fashion
-template <typename T, typename M = spin_rw_mutex>
+template<typename T, typename M=spin_rw_mutex >
 class round_robin_cache : public successor_cache<T, M> {
     typedef successor_cache<T, M> base_type;
     typedef size_t size_type;
     typedef M mutex_type;
-    typedef typename successor_cache<T, M>::successors_type successors_type;
+    typedef typename successor_cache<T,M>::successors_type successors_type;
 
 public:
-    round_robin_cache(typename base_type::owner_type* owner) : base_type(owner) {
+
+    round_robin_cache( typename base_type::owner_type* owner ): base_type(owner) {
         // Do not work with the passed pointer here as it may not be fully initialized yet
     }
 
@@ -379,23 +463,39 @@ class round_robin_cache : public successor_cache<T, M> {
         return this->my_successors.size();
     }
 
-    graph_task* try_put_task(const T& t) override {
+private:
+
+    graph_task* try_put_task_impl( const T &t
+                                   __TBB_FLOW_GRAPH_METAINFO_ARG(const message_metainfo& metainfo) )
+    {
         typename mutex_type::scoped_lock l(this->my_mutex, /*write=*/true);
         typename successors_type::iterator i = this->my_successors.begin();
-        while (i != this->my_successors.end()) {
-            graph_task* new_task = (*i)->try_put_task(t);
-            if (new_task) {
+        while ( i != this->my_successors.end() ) {
+            graph_task* new_task = (*i)->try_put_task(t __TBB_FLOW_GRAPH_METAINFO_ARG(metainfo));
+            if ( new_task ) {
                 return new_task;
             } else {
-                if ((*i)->register_predecessor(*this->my_owner)) {
-                    i = this->my_successors.erase(i);
-                } else {
-                    ++i;
-                }
+               if ( (*i)->register_predecessor(*this->my_owner) ) {
+                   i = this->my_successors.erase(i);
+               }
+               else {
+                   ++i;
+               }
             }
         }
-        return NULL;
+        return nullptr;
+    }
+
+public:
+    graph_task* try_put_task(const T& t) override {
+        return try_put_task_impl(t __TBB_FLOW_GRAPH_METAINFO_ARG(message_metainfo{}));
+    }
+
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+    graph_task* try_put_task( const T& t, const message_metainfo& metainfo ) override {
+        return try_put_task_impl(t, metainfo);
     }
+#endif
 };
 
-#endif// __TBB__flow_graph_cache_impl_H
+#endif // __TBB__flow_graph_cache_impl_H
diff --git a/external/tbb/include/oneapi/tbb/detail/_flow_graph_impl.h b/external/tbb/include/oneapi/tbb/detail/_flow_graph_impl.h
index e576b5ff..a5408adf 100644
--- a/external/tbb/include/oneapi/tbb/detail/_flow_graph_impl.h
+++ b/external/tbb/include/oneapi/tbb/detail/_flow_graph_impl.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2025 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -18,454 +18,556 @@
 #define __TBB_flow_graph_impl_H
 
 // #include "../config.h"
-#include "../flow_graph_abstractions.h"
-#include "../task_arena.h"
-#include "../task_group.h"
 #include "_task.h"
+#include "../task_group.h"
+#include "../task_arena.h"
+#include "../flow_graph_abstractions.h"
 
 #include "../concurrent_priority_queue.h"
 
 #include <list>
 
 namespace tbb {
-    namespace detail {
-
-        namespace d1 {
-
-            class graph_task;
-            static graph_task* const SUCCESSFULLY_ENQUEUED = (graph_task*) -1;
-            typedef unsigned int node_priority_t;
-            static const node_priority_t no_priority = node_priority_t(0);
-
-            class graph;
-            class graph_node;
-
-            template <typename GraphContainerType, typename GraphNodeType>
-            class graph_iterator {
-                friend class graph;
-                friend class graph_node;
-
-            public:
-                typedef size_t size_type;
-                typedef GraphNodeType value_type;
-                typedef GraphNodeType* pointer;
-                typedef GraphNodeType& reference;
-                typedef const GraphNodeType& const_reference;
-                typedef std::forward_iterator_tag iterator_category;
-
-                //! Copy constructor
-                graph_iterator(const graph_iterator& other)
-                    : my_graph(other.my_graph), current_node(other.current_node) {}
-
-                //! Assignment
-                graph_iterator& operator=(const graph_iterator& other) {
-                    if (this != &other) {
-                        my_graph = other.my_graph;
-                        current_node = other.current_node;
-                    }
-                    return *this;
-                }
-
-                //! Dereference
-                reference operator*() const;
-
-                //! Dereference
-                pointer operator->() const;
-
-                //! Equality
-                bool operator==(const graph_iterator& other) const {
-                    return ((my_graph == other.my_graph) && (current_node == other.current_node));
-                }
+namespace detail {
+
+namespace d2 {
+
+class graph_task;
+static graph_task* const SUCCESSFULLY_ENQUEUED = (graph_task*)-1;
+typedef unsigned int node_priority_t;
+static const node_priority_t no_priority = node_priority_t(0);
+
+class graph;
+class graph_node;
+
+template <typename GraphContainerType, typename GraphNodeType>
+class graph_iterator {
+    friend class graph;
+    friend class graph_node;
+public:
+    typedef size_t size_type;
+    typedef GraphNodeType value_type;
+    typedef GraphNodeType* pointer;
+    typedef GraphNodeType& reference;
+    typedef const GraphNodeType& const_reference;
+    typedef std::forward_iterator_tag iterator_category;
+
+    //! Copy constructor
+    graph_iterator(const graph_iterator& other) :
+        my_graph(other.my_graph), current_node(other.current_node)
+    {}
+
+    //! Assignment
+    graph_iterator& operator=(const graph_iterator& other) {
+        if (this != &other) {
+            my_graph = other.my_graph;
+            current_node = other.current_node;
+        }
+        return *this;
+    }
+
+    //! Dereference
+    reference operator*() const;
+
+    //! Dereference
+    pointer operator->() const;
+
+    //! Equality
+    bool operator==(const graph_iterator& other) const {
+        return ((my_graph == other.my_graph) && (current_node == other.current_node));
+    }
 
 #if !__TBB_CPP20_COMPARISONS_PRESENT
-                //! Inequality
-                bool operator!=(const graph_iterator& other) const { return !(operator==(other)); }
+    //! Inequality
+    bool operator!=(const graph_iterator& other) const { return !(operator==(other)); }
 #endif
 
-                //! Pre-increment
-                graph_iterator& operator++() {
-                    internal_forward();
-                    return *this;
-                }
-
-                //! Post-increment
-                graph_iterator operator++(int) {
-                    graph_iterator result = *this;
-                    operator++();
-                    return result;
-                }
-
-            private:
-                // the graph over which we are iterating
-                GraphContainerType* my_graph;
-                // pointer into my_graph's my_nodes list
-                pointer current_node;
-
-                //! Private initializing constructor for begin() and end() iterators
-                graph_iterator(GraphContainerType* g, bool begin);
-                void internal_forward();
-            };// class graph_iterator
-
-            // flags to modify the behavior of the graph reset().  Can be combined.
-            enum reset_flags {
-                rf_reset_protocol = 0,
-                rf_reset_bodies
-                = 1 << 0,// delete the current node body, reset to a copy of the initial node body.
-                rf_clear_edges = 1 << 1// delete edges
-            };
-
-            void activate_graph(graph& g);
-            void deactivate_graph(graph& g);
-            bool is_graph_active(graph& g);
-            graph_task* prioritize_task(graph& g, graph_task& arena_task);
-            void spawn_in_graph_arena(graph& g, graph_task& arena_task);
-            void enqueue_in_graph_arena(graph& g, graph_task& arena_task);
-
-            class graph;
-
-            //! Base class for tasks generated by graph nodes.
-            class graph_task : public task {
-            public:
-                graph_task(graph& g, small_object_allocator& allocator,
-                           node_priority_t node_priority = no_priority)
-                    : my_graph(g), priority(node_priority), my_allocator(allocator) {}
-                graph& my_graph;// graph instance the task belongs to
-                // TODO revamp: rename to my_priority
-                node_priority_t priority;
-                void destruct_and_deallocate(const execution_data& ed);
-                task* cancel(execution_data& ed) override;
-
-            protected:
-                void finalize(const execution_data& ed);
-
-            private:
-                // To organize task_list
-                graph_task* my_next {nullptr};
-                small_object_allocator my_allocator;
-                // TODO revamp: elaborate internal interfaces to avoid friends declarations
-                friend class graph_task_list;
-                friend graph_task* prioritize_task(graph& g, graph_task& gt);
-            };
-
-            struct graph_task_comparator {
-                bool operator()(const graph_task* left, const graph_task* right) {
-                    return left->priority < right->priority;
-                }
-            };
-
-            typedef tbb::concurrent_priority_queue<graph_task*, graph_task_comparator>
-                    graph_task_priority_queue_t;
-
-            class priority_task_selector : public task {
-            public:
-                priority_task_selector(graph_task_priority_queue_t& priority_queue,
-                                       small_object_allocator& allocator)
-                    : my_priority_queue(priority_queue), my_allocator(allocator), my_task() {}
-                task* execute(execution_data& ed) override {
-                    next_task();
-                    __TBB_ASSERT(my_task, nullptr);
-                    task* t_next = my_task->execute(ed);
-                    my_allocator.delete_object(this, ed);
-                    return t_next;
-                }
-                task* cancel(execution_data& ed) override {
-                    if (!my_task) { next_task(); }
-                    __TBB_ASSERT(my_task, nullptr);
-                    task* t_next = my_task->cancel(ed);
-                    my_allocator.delete_object(this, ed);
-                    return t_next;
-                }
-
-            private:
-                void next_task() {
-                    // TODO revamp: hold functors in priority queue instead of real tasks
-                    bool result = my_priority_queue.try_pop(my_task);
-                    __TBB_ASSERT_EX(result, "Number of critical tasks for scheduler and tasks"
-                                            " in graph's priority queue mismatched");
-                    __TBB_ASSERT(my_task && my_task != SUCCESSFULLY_ENQUEUED,
-                                 "Incorrect task submitted to graph priority queue");
-                    __TBB_ASSERT(my_task->priority != no_priority,
-                                 "Tasks from graph's priority queue must have priority");
-                }
-
-                graph_task_priority_queue_t& my_priority_queue;
-                small_object_allocator my_allocator;
-                graph_task* my_task;
-            };
-
-            template <typename Receiver, typename Body>
-            class run_and_put_task;
-            template <typename Body>
-            class run_task;
-
-            //********************************************************************************
-            // graph tasks helpers
-            //********************************************************************************
-
-            //! The list of graph tasks
-            class graph_task_list : no_copy {
-            private:
-                graph_task* my_first;
-                graph_task** my_next_ptr;
-
-            public:
-                //! Construct empty list
-                graph_task_list() : my_first(nullptr), my_next_ptr(&my_first) {}
-
-                //! True if list is empty; false otherwise.
-                bool empty() const { return !my_first; }
-
-                //! Push task onto back of list.
-                void push_back(graph_task& task) {
-                    task.my_next = nullptr;
-                    *my_next_ptr = &task;
-                    my_next_ptr = &task.my_next;
-                }
-
-                //! Pop the front task from the list.
-                graph_task& pop_front() {
-                    __TBB_ASSERT(!empty(), "attempt to pop item from empty task_list");
-                    graph_task* result = my_first;
-                    my_first = result->my_next;
-                    if (!my_first) { my_next_ptr = &my_first; }
-                    return *result;
-                }
-            };
-
-            //! The graph class
-            /** This class serves as a handle to the graph */
-            class graph : no_copy, public graph_proxy {
-                friend class graph_node;
-
-                void prepare_task_arena(bool reinit = false) {
-                    if (reinit) {
-                        __TBB_ASSERT(my_task_arena, "task arena is NULL");
-                        my_task_arena->terminate();
-                        my_task_arena->initialize(task_arena::attach());
-                    } else {
-                        __TBB_ASSERT(my_task_arena == NULL, "task arena is not NULL");
-                        my_task_arena = new task_arena(task_arena::attach());
-                    }
-                    if (!my_task_arena->is_active())// failed to attach
-                        my_task_arena->initialize();// create a new, default-initialized arena
-                    __TBB_ASSERT(my_task_arena->is_active(), "task arena is not active");
-                }
-
-            public:
-                //! Constructs a graph with isolated task_group_context
-                graph();
-
-                //! Constructs a graph with use_this_context as context
-                explicit graph(task_group_context& use_this_context);
-
-                //! Destroys the graph.
-                /** Calls wait_for_all, then destroys the root task and context. */
-                ~graph();
-
-                //! Used to register that an external entity may still interact with the graph.
-                /** The graph will not return from wait_for_all until a matching number of release_wait calls is
-    made. */
-                void reserve_wait() override;
-
-                //! Deregisters an external entity that may have interacted with the graph.
-                /** The graph will not return from wait_for_all until all the number of reserve_wait calls
-    matches the number of release_wait calls. */
-                void release_wait() override;
-
-                //! Wait until graph is idle and the number of release_wait calls equals to the number of
-                //! reserve_wait calls.
-                /** The waiting thread will go off and steal work while it is blocked in the wait_for_all. */
-                void wait_for_all() {
-                    cancelled = false;
-                    caught_exception = false;
-                    try_call([this] {
-                        my_task_arena->execute([this] { wait(my_wait_context, *my_context); });
-                        cancelled = my_context->is_group_execution_cancelled();
-                    }).on_exception([this] {
-                        my_context->reset();
-                        caught_exception = true;
-                        cancelled = true;
-                    });
-                    // TODO: the "if" condition below is just a work-around to support the concurrent wait
-                    // mode. The cancellation and exception mechanisms are still broken in this mode.
-                    // Consider using task group not to re-implement the same functionality.
-                    if (!(my_context->traits() & task_group_context::concurrent_wait)) {
-                        my_context->reset();// consistent with behavior in catch()
-                    }
-                }
-
-                // TODO revamp: consider adding getter for task_group_context.
-
-                // ITERATORS
-                template <typename C, typename N>
-                friend class graph_iterator;
-
-                // Graph iterator typedefs
-                typedef graph_iterator<graph, graph_node> iterator;
-                typedef graph_iterator<const graph, const graph_node> const_iterator;
-
-                // Graph iterator constructors
-                //! start iterator
-                iterator begin();
-                //! end iterator
-                iterator end();
-                //! start const iterator
-                const_iterator begin() const;
-                //! end const iterator
-                const_iterator end() const;
-                //! start const iterator
-                const_iterator cbegin() const;
-                //! end const iterator
-                const_iterator cend() const;
-
-                // thread-unsafe state reset.
-                void reset(reset_flags f = rf_reset_protocol);
-
-                //! cancels execution of the associated task_group_context
-                void cancel();
-
-                //! return status of graph execution
-                bool is_cancelled() { return cancelled; }
-                bool exception_thrown() { return caught_exception; }
-
-            private:
-                wait_context my_wait_context;
-                task_group_context* my_context;
-                bool own_context;
-                bool cancelled;
-                bool caught_exception;
-                bool my_is_active;
-
-                graph_node *my_nodes, *my_nodes_last;
-
-                tbb::spin_mutex nodelist_mutex;
-                void register_node(graph_node* n);
-                void remove_node(graph_node* n);
-
-                task_arena* my_task_arena;
-
-                graph_task_priority_queue_t my_priority_queue;
-
-                friend void activate_graph(graph& g);
-                friend void deactivate_graph(graph& g);
-                friend bool is_graph_active(graph& g);
-                friend graph_task* prioritize_task(graph& g, graph_task& arena_task);
-                friend void spawn_in_graph_arena(graph& g, graph_task& arena_task);
-                friend void enqueue_in_graph_arena(graph& g, graph_task& arena_task);
-
-                friend class task_arena_base;
-
-            };// class graph
-
-            inline void graph_task::destruct_and_deallocate(const execution_data& ed) {
-                auto allocator = my_allocator;
-                // TODO: investigate if direct call of derived destructor gives any benefits.
-                this->~graph_task();
-                allocator.deallocate(this, ed);
+    //! Pre-increment
+    graph_iterator& operator++() {
+        internal_forward();
+        return *this;
+    }
+
+    //! Post-increment
+    graph_iterator operator++(int) {
+        graph_iterator result = *this;
+        operator++();
+        return result;
+    }
+
+private:
+    // the graph over which we are iterating
+    GraphContainerType *my_graph;
+    // pointer into my_graph's my_nodes list
+    pointer current_node;
+
+    //! Private initializing constructor for begin() and end() iterators
+    graph_iterator(GraphContainerType *g, bool begin);
+    void internal_forward();
+};  // class graph_iterator
+
+// flags to modify the behavior of the graph reset().  Can be combined.
+enum reset_flags {
+    rf_reset_protocol = 0,
+    rf_reset_bodies = 1 << 0,  // delete the current node body, reset to a copy of the initial node body.
+    rf_clear_edges = 1 << 1   // delete edges
+};
+
+void activate_graph(graph& g);
+void deactivate_graph(graph& g);
+bool is_graph_active(graph& g);
+graph_task* prioritize_task(graph& g, graph_task& arena_task);
+void spawn_in_graph_arena(graph& g, graph_task& arena_task);
+void enqueue_in_graph_arena(graph &g, graph_task& arena_task);
+
+class graph;
+
+//! Base class for tasks generated by graph nodes.
+class graph_task : public d1::task {
+public:
+    graph_task(graph& g, d1::small_object_allocator& allocator,
+               node_priority_t node_priority = no_priority);
+
+    graph& my_graph; // graph instance the task belongs to
+    // TODO revamp: rename to my_priority
+    node_priority_t priority;
+    template <typename DerivedType>
+    void destruct_and_deallocate(const d1::execution_data& ed);
+protected:
+    template <typename DerivedType>
+    void finalize(const d1::execution_data& ed);
+private:
+    // To organize task_list
+    graph_task* my_next{ nullptr };
+    d1::small_object_allocator my_allocator;
+    d1::wait_tree_vertex_interface* my_reference_vertex;
+    // TODO revamp: elaborate internal interfaces to avoid friends declarations
+    friend class graph_task_list;
+    friend graph_task* prioritize_task(graph& g, graph_task& gt);
+};
+
+inline bool is_this_thread_in_graph_arena(graph& g);
+
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+class trackable_messages_graph_task : public graph_task {
+public:
+    trackable_messages_graph_task(graph& g, d1::small_object_allocator& allocator,
+                                  node_priority_t node_priority,
+                                  const std::forward_list<d1::wait_context_vertex*>& msg_waiters)
+        : graph_task(g, allocator, node_priority)
+        , my_msg_wait_context_vertices(msg_waiters)
+    {
+        auto last_iterator = my_msg_reference_vertices.cbefore_begin();
+
+        for (auto& msg_waiter : my_msg_wait_context_vertices) {
+            // If the task is created by the thread outside the graph arena, the lifetime of the thread reference vertex
+            // may be shorter that the lifetime of the task, so thread reference vertex approach cannot be used
+            // and the task should be associated with the msg wait context itself
+            d1::wait_tree_vertex_interface* ref_vertex = is_this_thread_in_graph_arena(g) ?
+                                                         r1::get_thread_reference_vertex(msg_waiter) :
+                                                         msg_waiter;
+            last_iterator = my_msg_reference_vertices.emplace_after(last_iterator,
+                                                                    ref_vertex);
+            ref_vertex->reserve(1);
+        }
+    }
+
+    trackable_messages_graph_task(graph& g, d1::small_object_allocator& allocator,
+                                  node_priority_t node_priority,
+                                  std::forward_list<d1::wait_context_vertex*>&& msg_waiters)
+        : graph_task(g, allocator, node_priority)
+        , my_msg_wait_context_vertices(std::move(msg_waiters))
+    {
+    }
+
+    const std::forward_list<d1::wait_context_vertex*> get_msg_wait_context_vertices() const {
+        return my_msg_wait_context_vertices;
+    }
+
+protected:
+    template <typename DerivedType>
+    void finalize(const d1::execution_data& ed) {
+        auto wait_context_vertices = std::move(my_msg_wait_context_vertices);
+        auto msg_reference_vertices = std::move(my_msg_reference_vertices);
+        graph_task::finalize<DerivedType>(ed);
+
+        // If there is no thread reference vertices associated with the task
+        // then this task was created by transferring the ownership from other metainfo
+        // instance (e.g. while taking from the buffer)
+        if (msg_reference_vertices.empty()) {
+            for (auto& msg_waiter : wait_context_vertices) {
+                msg_waiter->release(1);
             }
-
-            inline void graph_task::finalize(const execution_data& ed) {
-                graph& g = my_graph;
-                destruct_and_deallocate(ed);
-                g.release_wait();
+        } else {
+            for (auto& msg_waiter : msg_reference_vertices) {
+                msg_waiter->release(1);
             }
+        }
+    }
+private:
+    // Each task that holds information about single message wait_contexts should hold two lists
+    // The first one is wait_contexts associated with the message itself. They are needed
+    // to be able to broadcast the list of wait_contexts to the node successors while executing the task.
+    // The second list is a list of reference vertices for each wait_context_vertex in the first list
+    // to support the distributed reference counting schema
+    std::forward_list<d1::wait_context_vertex*> my_msg_wait_context_vertices;
+    std::forward_list<d1::wait_tree_vertex_interface*> my_msg_reference_vertices;
+}; // class trackable_messages_graph_task
+#endif // __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+
+struct graph_task_comparator {
+    bool operator()(const graph_task* left, const graph_task* right) {
+        return left->priority < right->priority;
+    }
+};
+
+typedef tbb::concurrent_priority_queue<graph_task*, graph_task_comparator> graph_task_priority_queue_t;
+
+class priority_task_selector : public d1::task {
+public:
+    priority_task_selector(graph_task_priority_queue_t& priority_queue, d1::small_object_allocator& allocator)
+        : my_priority_queue(priority_queue), my_allocator(allocator), my_task() {}
+    task* execute(d1::execution_data& ed) override {
+        next_task();
+        __TBB_ASSERT(my_task, nullptr);
+        task* t_next = my_task->execute(ed);
+        my_allocator.delete_object(this, ed);
+        return t_next;
+    }
+    task* cancel(d1::execution_data& ed) override {
+        if (!my_task) {
+            next_task();
+        }
+        __TBB_ASSERT(my_task, nullptr);
+        task* t_next = my_task->cancel(ed);
+        my_allocator.delete_object(this, ed);
+        return t_next;
+    }
+private:
+    void next_task() {
+        // TODO revamp: hold functors in priority queue instead of real tasks
+        bool result = my_priority_queue.try_pop(my_task);
+        __TBB_ASSERT_EX(result, "Number of critical tasks for scheduler and tasks"
+            " in graph's priority queue mismatched");
+        __TBB_ASSERT(my_task && my_task != SUCCESSFULLY_ENQUEUED,
+            "Incorrect task submitted to graph priority queue");
+        __TBB_ASSERT(my_task->priority != no_priority,
+            "Tasks from graph's priority queue must have priority");
+    }
+
+    graph_task_priority_queue_t& my_priority_queue;
+    d1::small_object_allocator my_allocator;
+    graph_task* my_task;
+};
+
+template <typename Receiver, typename Body> class run_and_put_task;
+template <typename Body> class run_task;
+
+//********************************************************************************
+// graph tasks helpers
+//********************************************************************************
+
+//! The list of graph tasks
+class graph_task_list : no_copy {
+private:
+    graph_task* my_first;
+    graph_task** my_next_ptr;
+public:
+    //! Construct empty list
+    graph_task_list() : my_first(nullptr), my_next_ptr(&my_first) {}
+
+    //! True if list is empty; false otherwise.
+    bool empty() const { return !my_first; }
+
+    //! Push task onto back of list.
+    void push_back(graph_task& task) {
+        task.my_next = nullptr;
+        *my_next_ptr = &task;
+        my_next_ptr = &task.my_next;
+    }
+
+    //! Pop the front task from the list.
+    graph_task& pop_front() {
+        __TBB_ASSERT(!empty(), "attempt to pop item from empty task_list");
+        graph_task* result = my_first;
+        my_first = result->my_next;
+        if (!my_first) {
+            my_next_ptr = &my_first;
+        }
+        return *result;
+    }
+};
+
+//! The graph class
+/** This class serves as a handle to the graph */
+class graph : no_copy, public graph_proxy {
+    friend class graph_node;
+
+    void prepare_task_arena(bool reinit = false) {
+        if (reinit) {
+            __TBB_ASSERT(my_task_arena, "task arena is nullptr");
+            my_task_arena->terminate();
+            my_task_arena->initialize(task_arena::attach());
+        }
+        else {
+            __TBB_ASSERT(my_task_arena == nullptr, "task arena is not nullptr");
+            my_task_arena = new task_arena(task_arena::attach());
+        }
+        if (!my_task_arena->is_active()) // failed to attach
+            my_task_arena->initialize(); // create a new, default-initialized arena
+        __TBB_ASSERT(my_task_arena->is_active(), "task arena is not active");
+    }
+
+public:
+    //! Constructs a graph with isolated task_group_context
+    graph();
+
+    //! Constructs a graph with use_this_context as context
+    explicit graph(task_group_context& use_this_context);
+
+    //! Destroys the graph.
+    /** Calls wait_for_all, then destroys the root task and context. */
+    ~graph();
+
+    //! Used to register that an external entity may still interact with the graph.
+    /** The graph will not return from wait_for_all until a matching number of release_wait calls is
+    made. */
+    void reserve_wait() override;
 
-            inline task* graph_task::cancel(execution_data& ed) {
-                finalize(ed);
-                return nullptr;
-            }
+    //! Deregisters an external entity that may have interacted with the graph.
+    /** The graph will not return from wait_for_all until all the number of reserve_wait calls
+    matches the number of release_wait calls. */
+    void release_wait() override;
+
+    //! Wait until graph is idle and the number of release_wait calls equals to the number of
+    //! reserve_wait calls.
+    /** The waiting thread will go off and steal work while it is blocked in the wait_for_all. */
+    void wait_for_all() {
+        cancelled = false;
+        caught_exception = false;
+        try_call([this] {
+            my_task_arena->execute([this] {
+                d1::wait(my_wait_context_vertex.get_context(), *my_context);
+            });
+            cancelled = my_context->is_group_execution_cancelled();
+        }).on_exception([this] {
+            my_context->reset();
+            caught_exception = true;
+            cancelled = true;
+        });
+        // TODO: the "if" condition below is just a work-around to support the concurrent wait
+        // mode. The cancellation and exception mechanisms are still broken in this mode.
+        // Consider using task group not to re-implement the same functionality.
+        if (!(my_context->traits() & task_group_context::concurrent_wait)) {
+            my_context->reset();  // consistent with behavior in catch()
+        }
+    }
+
+    // TODO revamp: consider adding getter for task_group_context.
+
+    // ITERATORS
+    template<typename C, typename N>
+    friend class graph_iterator;
+
+    // Graph iterator typedefs
+    typedef graph_iterator<graph, graph_node> iterator;
+    typedef graph_iterator<const graph, const graph_node> const_iterator;
+
+    // Graph iterator constructors
+    //! start iterator
+    iterator begin();
+    //! end iterator
+    iterator end();
+    //! start const iterator
+    const_iterator begin() const;
+    //! end const iterator
+    const_iterator end() const;
+    //! start const iterator
+    const_iterator cbegin() const;
+    //! end const iterator
+    const_iterator cend() const;
+
+    // thread-unsafe state reset.
+    void reset(reset_flags f = rf_reset_protocol);
+
+    //! cancels execution of the associated task_group_context
+    void cancel();
+
+    //! return status of graph execution
+    bool is_cancelled() { return cancelled; }
+    bool exception_thrown() { return caught_exception; }
+
+private:
+    d1::wait_context_vertex my_wait_context_vertex;
+    task_group_context *my_context;
+    bool own_context;
+    bool cancelled;
+    bool caught_exception;
+    bool my_is_active;
+
+    graph_node *my_nodes, *my_nodes_last;
+
+    tbb::spin_mutex nodelist_mutex;
+    void register_node(graph_node *n);
+    void remove_node(graph_node *n);
+
+    task_arena* my_task_arena;
+
+    graph_task_priority_queue_t my_priority_queue;
+
+    d1::wait_context_vertex& get_wait_context_vertex() { return my_wait_context_vertex; }
+
+    friend void activate_graph(graph& g);
+    friend void deactivate_graph(graph& g);
+    friend bool is_graph_active(graph& g);
+    friend bool is_this_thread_in_graph_arena(graph& g);
+    friend graph_task* prioritize_task(graph& g, graph_task& arena_task);
+    friend void spawn_in_graph_arena(graph& g, graph_task& arena_task);
+    friend void enqueue_in_graph_arena(graph &g, graph_task& arena_task);
+
+    friend class d1::task_arena_base;
+    friend class graph_task;
+
+    template <typename T>
+    friend class receiver;
+};  // class graph
+
+template<typename DerivedType>
+inline void graph_task::destruct_and_deallocate(const d1::execution_data& ed) {
+    auto allocator = my_allocator;
+    // TODO: investigate if direct call of derived destructor gives any benefits.
+    this->~graph_task();
+    allocator.deallocate(static_cast<DerivedType*>(this), ed);
+}
+
+template<typename DerivedType>
+inline void graph_task::finalize(const d1::execution_data& ed) {
+    d1::wait_tree_vertex_interface* reference_vertex = my_reference_vertex;
+    destruct_and_deallocate<DerivedType>(ed);
+    reference_vertex->release();
+}
+
+inline graph_task::graph_task(graph& g, d1::small_object_allocator& allocator,
+                              node_priority_t node_priority)
+    : my_graph(g)
+    , priority(node_priority)
+    , my_allocator(allocator)
+{
+    // If the task is created by the thread outside the graph arena, the lifetime of the thread reference vertex
+    // may be shorter that the lifetime of the task, so thread reference vertex approach cannot be used
+    // and the task should be associated with the graph wait context itself
+    // TODO: consider how reference counting can be improved for such a use case. Most common example is the async_node
+    d1::wait_context_vertex* graph_wait_context_vertex = &my_graph.get_wait_context_vertex();
+    my_reference_vertex = is_this_thread_in_graph_arena(g) ? r1::get_thread_reference_vertex(graph_wait_context_vertex)
+                                                           : graph_wait_context_vertex;
+    __TBB_ASSERT(my_reference_vertex, nullptr);
+    my_reference_vertex->reserve();
+}
+
+//********************************************************************************
+// end of graph tasks helpers
+//********************************************************************************
 
-            //********************************************************************************
-            // end of graph tasks helpers
-            //********************************************************************************
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-            class get_graph_helper;
+class get_graph_helper;
 #endif
 
-            //! The base of all graph nodes.
-            class graph_node : no_copy {
-                friend class graph;
-                template <typename C, typename N>
-                friend class graph_iterator;
+//! The base of all graph nodes.
+class graph_node : no_copy {
+    friend class graph;
+    template<typename C, typename N>
+    friend class graph_iterator;
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-                friend class get_graph_helper;
+    friend class get_graph_helper;
 #endif
 
-            protected:
-                graph& my_graph;
-                graph& graph_reference() const {
-                    // TODO revamp: propagate graph_reference() method to all the reference places.
-                    return my_graph;
-                }
-                graph_node* next = nullptr;
-                graph_node* prev = nullptr;
-
-            public:
-                explicit graph_node(graph& g);
-
-                virtual ~graph_node();
-
-            protected:
-                // performs the reset on an individual node.
-                virtual void reset_node(reset_flags f = rf_reset_protocol) = 0;
-            };// class graph_node
-
-            inline void activate_graph(graph& g) { g.my_is_active = true; }
-
-            inline void deactivate_graph(graph& g) { g.my_is_active = false; }
-
-            inline bool is_graph_active(graph& g) { return g.my_is_active; }
-
-            inline graph_task* prioritize_task(graph& g, graph_task& gt) {
-                if (no_priority == gt.priority) return &gt;
-
-                //! Non-preemptive priority pattern. The original task is submitted as a work item to the
-                //! priority queue, and a new critical task is created to take and execute a work item with
-                //! the highest known priority. The reference counting responsibility is transferred (via
-                //! allocate_continuation) to the new task.
-                task* critical_task = gt.my_allocator.new_object<priority_task_selector>(g.my_priority_queue,
-                                                                                         gt.my_allocator);
-                __TBB_ASSERT(critical_task, "bad_alloc?");
-                g.my_priority_queue.push(&gt);
-                using tbb::detail::d1::submit;
-                submit(*critical_task, *g.my_task_arena, *g.my_context, /*as_critical=*/true);
-                return nullptr;
-            }
-
-            //! Spawns a task inside graph arena
-            inline void spawn_in_graph_arena(graph& g, graph_task& arena_task) {
-                if (is_graph_active(g)) {
-                    task* gt = prioritize_task(g, arena_task);
-                    if (!gt) return;
-
-                    __TBB_ASSERT(g.my_task_arena && g.my_task_arena->is_active(), NULL);
-                    submit(*gt, *g.my_task_arena, *g.my_context
+protected:
+    graph& my_graph;
+    graph& graph_reference() const {
+        // TODO revamp: propagate graph_reference() method to all the reference places.
+        return my_graph;
+    }
+    graph_node* next = nullptr;
+    graph_node* prev = nullptr;
+public:
+    explicit graph_node(graph& g);
+
+    virtual ~graph_node();
+
+protected:
+    // performs the reset on an individual node.
+    virtual void reset_node(reset_flags f = rf_reset_protocol) = 0;
+};  // class graph_node
+
+inline void activate_graph(graph& g) {
+    g.my_is_active = true;
+}
+
+inline void deactivate_graph(graph& g) {
+    g.my_is_active = false;
+}
+
+inline bool is_graph_active(graph& g) {
+    return g.my_is_active;
+}
+
+inline bool is_this_thread_in_graph_arena(graph& g) {
+    __TBB_ASSERT(g.my_task_arena && g.my_task_arena->is_active(), nullptr);
+    return r1::execution_slot(*g.my_task_arena) != d1::slot_id(-1);
+}
+
+inline graph_task* prioritize_task(graph& g, graph_task& gt) {
+    if( no_priority == gt.priority )
+        return &gt;
+
+    //! Non-preemptive priority pattern. The original task is submitted as a work item to the
+    //! priority queue, and a new critical task is created to take and execute a work item with
+    //! the highest known priority. The reference counting responsibility is transferred to
+    //! the new task.
+    // A newly created small_object_allocator should be used to allocate the priority_task_selector
+    // instead of the allocator, associated with gt since gt can be allocated by another thread
+    d1::small_object_allocator allocator;
+    d1::task* critical_task = allocator.new_object<priority_task_selector>(g.my_priority_queue, allocator);
+    __TBB_ASSERT( critical_task, "bad_alloc?" );
+    g.my_priority_queue.push(&gt);
+    using tbb::detail::d1::submit;
+    submit( *critical_task, *g.my_task_arena, *g.my_context, /*as_critical=*/true );
+    return nullptr;
+}
+
+//! Spawns a task inside graph arena
+inline void spawn_in_graph_arena(graph& g, graph_task& arena_task) {
+    if (is_graph_active(g)) {
+        d1::task* gt = prioritize_task(g, arena_task);
+        if( !gt )
+            return;
+
+        __TBB_ASSERT(g.my_task_arena && g.my_task_arena->is_active(), nullptr);
+        submit( *gt, *g.my_task_arena, *g.my_context
 #if __TBB_PREVIEW_CRITICAL_TASKS
-                           ,
-                           /*as_critical=*/false
+                , /*as_critical=*/false
 #endif
-                    );
-                }
-            }
+        );
+    }
+}
 
-            // TODO revamp: unify *_in_graph_arena functions
+// TODO revamp: unify *_in_graph_arena functions
 
-            //! Enqueues a task inside graph arena
-            inline void enqueue_in_graph_arena(graph& g, graph_task& arena_task) {
-                if (is_graph_active(g)) {
-                    __TBB_ASSERT(g.my_task_arena && g.my_task_arena->is_active(),
-                                 "Is graph's arena initialized and active?");
+//! Enqueues a task inside graph arena
+inline void enqueue_in_graph_arena(graph &g, graph_task& arena_task) {
+    if (is_graph_active(g)) {
+        __TBB_ASSERT( g.my_task_arena && g.my_task_arena->is_active(), "Is graph's arena initialized and active?" );
 
-                    // TODO revamp: decide on the approach that does not postpone critical task
-                    if (task* gt = prioritize_task(g, arena_task))
-                        submit(*gt, *g.my_task_arena, *g.my_context, /*as_critical=*/false);
-                }
-            }
+        // TODO revamp: decide on the approach that does not postpone critical task
+        if( d1::task* gt = prioritize_task(g, arena_task) )
+            submit( *gt, *g.my_task_arena, *g.my_context, /*as_critical=*/false);
+    }
+}
 
-        }// namespace d1
-    }    // namespace detail
-}// namespace tbb
+} // namespace d2
+} // namespace detail
+} // namespace tbb
 
-#endif// __TBB_flow_graph_impl_H
+#endif // __TBB_flow_graph_impl_H
diff --git a/external/tbb/include/oneapi/tbb/detail/_flow_graph_indexer_impl.h b/external/tbb/include/oneapi/tbb/detail/_flow_graph_indexer_impl.h
index 5081c27a..a7433100 100644
--- a/external/tbb/include/oneapi/tbb/detail/_flow_graph_indexer_impl.h
+++ b/external/tbb/include/oneapi/tbb/detail/_flow_graph_indexer_impl.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -21,327 +21,350 @@
 #error Do not #include this internal file directly; use public TBB headers instead.
 #endif
 
-// included in namespace tbb::detail::d1
+// included in namespace tbb::detail::d2
 
 #include "_flow_graph_types_impl.h"
 
-// Output of the indexer_node is a tbb::flow::tagged_msg, and will be of
-// the form  tagged_msg<tag, result>
-// where the value of tag will indicate which result was put to the
-// successor.
-
-template <typename IndexerNodeBaseType, typename T, size_t K>
-graph_task *do_try_put(const T &v, void *p) {
-    typename IndexerNodeBaseType::output_type o(K, v);
-    return reinterpret_cast<IndexerNodeBaseType *>(p)->try_put_task(&o);
-}
-
-template <typename TupleTypes, int N>
-struct indexer_helper {
-    template <typename IndexerNodeBaseType, typename PortTuple>
-    static inline void set_indexer_node_pointer(PortTuple &my_input, IndexerNodeBaseType *p, graph &g) {
-        typedef typename std::tuple_element<N - 1, TupleTypes>::type T;
-        graph_task *(*indexer_node_put_task)(const T &, void *) = do_try_put<IndexerNodeBaseType, T, N - 1>;
-        std::get<N - 1>(my_input).set_up(p, indexer_node_put_task, g);
-        indexer_helper<TupleTypes, N - 1>::template set_indexer_node_pointer<IndexerNodeBaseType, PortTuple>(
-                my_input, p, g);
-    }
-};
-
-template <typename TupleTypes>
-struct indexer_helper<TupleTypes, 1> {
-    template <typename IndexerNodeBaseType, typename PortTuple>
-    static inline void set_indexer_node_pointer(PortTuple &my_input, IndexerNodeBaseType *p, graph &g) {
-        typedef typename std::tuple_element<0, TupleTypes>::type T;
-        graph_task *(*indexer_node_put_task)(const T &, void *) = do_try_put<IndexerNodeBaseType, T, 0>;
-        std::get<0>(my_input).set_up(p, indexer_node_put_task, g);
-    }
-};
-
-template <typename T>
-class indexer_input_port : public receiver<T> {
-private:
-    void *my_indexer_ptr;
-    typedef graph_task *(*forward_function_ptr)(T const &, void *);
-    forward_function_ptr my_try_put_task;
-    graph *my_graph;
-
-public:
-    void set_up(void *p, forward_function_ptr f, graph &g) {
-        my_indexer_ptr = p;
-        my_try_put_task = f;
-        my_graph = &g;
+    // Output of the indexer_node is a tbb::flow::tagged_msg, and will be of
+    // the form  tagged_msg<tag, result>
+    // where the value of tag will indicate which result was put to the
+    // successor.
+
+    template<typename IndexerNodeBaseType, typename T, size_t K>
+    graph_task* do_try_put(const T &v, void *p __TBB_FLOW_GRAPH_METAINFO_ARG(const message_metainfo& metainfo)) {
+        typename IndexerNodeBaseType::output_type o(K, v);
+        return reinterpret_cast<IndexerNodeBaseType *>(p)->try_put_task(&o __TBB_FLOW_GRAPH_METAINFO_ARG(metainfo));
     }
 
-protected:
-    template <typename R, typename B>
-    friend class run_and_put_task;
-    template <typename X, typename Y>
-    friend class broadcast_cache;
-    template <typename X, typename Y>
-    friend class round_robin_cache;
-    graph_task *try_put_task(const T &v) override { return my_try_put_task(v, my_indexer_ptr); }
-
-    graph &graph_reference() const override { return *my_graph; }
-};
-
-template <typename InputTuple, typename OutputType, typename StructTypes>
-class indexer_node_FE {
-public:
-    static const int N = std::tuple_size<InputTuple>::value;
-    typedef OutputType output_type;
-    typedef InputTuple input_type;
-
-    // Some versions of Intel(R) C++ Compiler fail to generate an implicit constructor for the class which has std::tuple as a member.
-    indexer_node_FE() : my_inputs() {}
-
-    input_type &input_ports() { return my_inputs; }
-
-protected:
-    input_type my_inputs;
-};
-
-//! indexer_node_base
-template <typename InputTuple, typename OutputType, typename StructTypes>
-class indexer_node_base : public graph_node,
-                          public indexer_node_FE<InputTuple, OutputType, StructTypes>,
-                          public sender<OutputType> {
-protected:
-    using graph_node::my_graph;
-
-public:
-    static const size_t N = std::tuple_size<InputTuple>::value;
-    typedef OutputType output_type;
-    typedef StructTypes tuple_types;
-    typedef typename sender<output_type>::successor_type successor_type;
-    typedef indexer_node_FE<InputTuple, output_type, StructTypes> input_ports_type;
-
-private:
-    // ----------- Aggregator ------------
-    enum op_type { reg_succ, rem_succ, try__put_task };
-    typedef indexer_node_base<InputTuple, output_type, StructTypes> class_type;
-
-    class indexer_node_base_operation : public aggregated_operation<indexer_node_base_operation> {
+    template<typename TupleTypes,int N>
+    struct indexer_helper {
+        template<typename IndexerNodeBaseType, typename PortTuple>
+        static inline void set_indexer_node_pointer(PortTuple &my_input, IndexerNodeBaseType *p, graph& g) {
+            typedef typename std::tuple_element<N-1, TupleTypes>::type T;
+            auto indexer_node_put_task = do_try_put<IndexerNodeBaseType, T, N-1>;
+            std::get<N-1>(my_input).set_up(p, indexer_node_put_task, g);
+            indexer_helper<TupleTypes,N-1>::template set_indexer_node_pointer<IndexerNodeBaseType,PortTuple>(my_input, p, g);
+        }
+    };
+
+    template<typename TupleTypes>
+    struct indexer_helper<TupleTypes,1> {
+        template<typename IndexerNodeBaseType, typename PortTuple>
+        static inline void set_indexer_node_pointer(PortTuple &my_input, IndexerNodeBaseType *p, graph& g) {
+            typedef typename std::tuple_element<0, TupleTypes>::type T;
+            auto indexer_node_put_task = do_try_put<IndexerNodeBaseType, T, 0>;
+            std::get<0>(my_input).set_up(p, indexer_node_put_task, g);
+        }
+    };
+
+    template<typename T>
+    class indexer_input_port : public receiver<T> {
+    private:
+        void* my_indexer_ptr;
+        typedef graph_task* (* forward_function_ptr)(T const &, void*
+                                                     __TBB_FLOW_GRAPH_METAINFO_ARG(const message_metainfo&));
+        forward_function_ptr my_try_put_task;
+        graph* my_graph;
     public:
-        char type;
-        union {
-            output_type const *my_arg;
-            successor_type *my_succ;
-            graph_task *bypass_t;
-        };
-        indexer_node_base_operation(const output_type *e, op_type t) : type(char(t)), my_arg(e) {}
-        indexer_node_base_operation(const successor_type &s, op_type t)
-            : type(char(t)), my_succ(const_cast<successor_type *>(&s)) {}
+        void set_up(void* p, forward_function_ptr f, graph& g) {
+            my_indexer_ptr = p;
+            my_try_put_task = f;
+            my_graph = &g;
+        }
+
+    protected:
+        template< typename R, typename B > friend class run_and_put_task;
+        template<typename X, typename Y> friend class broadcast_cache;
+        template<typename X, typename Y> friend class round_robin_cache;
+        graph_task* try_put_task(const T &v) override {
+            return my_try_put_task(v, my_indexer_ptr __TBB_FLOW_GRAPH_METAINFO_ARG(message_metainfo{}));
+        }
+
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+        graph_task* try_put_task(const T& v, const message_metainfo& metainfo) override {
+            return my_try_put_task(v, my_indexer_ptr, metainfo);
+        }
+#endif
+
+        graph& graph_reference() const override {
+            return *my_graph;
+        }
+    };
+
+    template<typename InputTuple, typename OutputType, typename StructTypes>
+    class indexer_node_FE {
+    public:
+        static const int N = std::tuple_size<InputTuple>::value;
+        typedef OutputType output_type;
+        typedef InputTuple input_type;
+
+        // Some versions of Intel(R) C++ Compiler fail to generate an implicit constructor for the class which has std::tuple as a member.
+        indexer_node_FE() : my_inputs() {}
+
+        input_type &input_ports() { return my_inputs; }
+    protected:
+        input_type my_inputs;
     };
 
-    typedef aggregating_functor<class_type, indexer_node_base_operation> handler_type;
-    friend class aggregating_functor<class_type, indexer_node_base_operation>;
-    aggregator<handler_type, indexer_node_base_operation> my_aggregator;
+    //! indexer_node_base
+    template<typename InputTuple, typename OutputType, typename StructTypes>
+    class indexer_node_base : public graph_node, public indexer_node_FE<InputTuple, OutputType,StructTypes>,
+                           public sender<OutputType> {
+    protected:
+       using graph_node::my_graph;
+    public:
+        static const size_t N = std::tuple_size<InputTuple>::value;
+        typedef OutputType output_type;
+        typedef StructTypes tuple_types;
+        typedef typename sender<output_type>::successor_type successor_type;
+        typedef indexer_node_FE<InputTuple, output_type,StructTypes> input_ports_type;
+
+    private:
+        // ----------- Aggregator ------------
+        enum op_type { reg_succ, rem_succ, try__put_task
+        };
+        typedef indexer_node_base<InputTuple,output_type,StructTypes> class_type;
+
+        class indexer_node_base_operation : public d1::aggregated_operation<indexer_node_base_operation> {
+        public:
+            char type;
+            union {
+                output_type const *my_arg;
+                successor_type *my_succ;
+                graph_task* bypass_t;
+            };
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+            message_metainfo const* metainfo;
+#endif
+            indexer_node_base_operation(const output_type* e, op_type t) :
+                type(char(t)), my_arg(e) __TBB_FLOW_GRAPH_METAINFO_ARG(metainfo(nullptr))
+            {}
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+            indexer_node_base_operation(const output_type* e, op_type t, const message_metainfo& info)
+                : type(char(t)), my_arg(e), metainfo(&info) {}
+#endif
+            indexer_node_base_operation(const successor_type &s, op_type t) : type(char(t)),
+                my_succ(const_cast<successor_type *>(&s)) {}
+        };
+
+        typedef d1::aggregating_functor<class_type, indexer_node_base_operation> handler_type;
+        friend class d1::aggregating_functor<class_type, indexer_node_base_operation>;
+        d1::aggregator<handler_type, indexer_node_base_operation> my_aggregator;
 
-    void handle_operations(indexer_node_base_operation *op_list) {
-        indexer_node_base_operation *current;
-        while (op_list) {
-            current = op_list;
-            op_list = op_list->next;
-            switch (current->type) {
+        void handle_operations(indexer_node_base_operation* op_list) {
+            indexer_node_base_operation *current;
+            while(op_list) {
+                current = op_list;
+                op_list = op_list->next;
+                switch(current->type) {
 
                 case reg_succ:
                     my_successors.register_successor(*(current->my_succ));
-                    current->status.store(SUCCEEDED, std::memory_order_release);
+                    current->status.store( SUCCEEDED, std::memory_order_release);
                     break;
 
                 case rem_succ:
                     my_successors.remove_successor(*(current->my_succ));
-                    current->status.store(SUCCEEDED, std::memory_order_release);
+                    current->status.store( SUCCEEDED, std::memory_order_release);
                     break;
                 case try__put_task: {
-                    current->bypass_t = my_successors.try_put_task(*(current->my_arg));
-                    current->status.store(
-                            SUCCEEDED,
-                            std::memory_order_release);// return of try_put_task actual return value
-                } break;
+                        current->bypass_t = my_successors.try_put_task(*(current->my_arg)
+                                                                       __TBB_FLOW_GRAPH_METAINFO_ARG(*(current->metainfo)));
+                        current->status.store( SUCCEEDED, std::memory_order_release);  // return of try_put_task actual return value
+                    }
+                    break;
+                }
             }
         }
-    }
-    // ---------- end aggregator -----------
-public:
-    indexer_node_base(graph &g) : graph_node(g), input_ports_type(), my_successors(this) {
-        indexer_helper<StructTypes, N>::set_indexer_node_pointer(this->my_inputs, this, g);
-        my_aggregator.initialize_handler(handler_type(this));
-    }
+        // ---------- end aggregator -----------
+    public:
+        indexer_node_base(graph& g) : graph_node(g), input_ports_type(), my_successors(this) {
+            indexer_helper<StructTypes,N>::set_indexer_node_pointer(this->my_inputs, this, g);
+            my_aggregator.initialize_handler(handler_type(this));
+        }
 
-    indexer_node_base(const indexer_node_base &other)
-        : graph_node(other.my_graph), input_ports_type(), sender<output_type>(), my_successors(this) {
-        indexer_helper<StructTypes, N>::set_indexer_node_pointer(this->my_inputs, this, other.my_graph);
-        my_aggregator.initialize_handler(handler_type(this));
-    }
+        indexer_node_base(const indexer_node_base& other)
+            : graph_node(other.my_graph), input_ports_type(), sender<output_type>(), my_successors(this)
+        {
+            indexer_helper<StructTypes,N>::set_indexer_node_pointer(this->my_inputs, this, other.my_graph);
+            my_aggregator.initialize_handler(handler_type(this));
+        }
 
-    bool register_successor(successor_type &r) override {
-        indexer_node_base_operation op_data(r, reg_succ);
-        my_aggregator.execute(&op_data);
-        return op_data.status == SUCCEEDED;
-    }
+        bool register_successor(successor_type &r) override {
+            indexer_node_base_operation op_data(r, reg_succ);
+            my_aggregator.execute(&op_data);
+            return op_data.status == SUCCEEDED;
+        }
 
-    bool remove_successor(successor_type &r) override {
-        indexer_node_base_operation op_data(r, rem_succ);
-        my_aggregator.execute(&op_data);
-        return op_data.status == SUCCEEDED;
-    }
+        bool remove_successor( successor_type &r) override {
+            indexer_node_base_operation op_data(r, rem_succ);
+            my_aggregator.execute(&op_data);
+            return op_data.status == SUCCEEDED;
+        }
 
-    graph_task *try_put_task(output_type const *v) {// not a virtual method in this class
-        indexer_node_base_operation op_data(v, try__put_task);
-        my_aggregator.execute(&op_data);
-        return op_data.bypass_t;
-    }
+        // not a virtual method in this class
+        graph_task* try_put_task(output_type const *v
+                                 __TBB_FLOW_GRAPH_METAINFO_ARG(const message_metainfo& metainfo))
+        {
+            indexer_node_base_operation op_data(v, try__put_task __TBB_FLOW_GRAPH_METAINFO_ARG(metainfo));
+            my_aggregator.execute(&op_data);
+            return op_data.bypass_t;
+        }
 
-protected:
-    void reset_node(reset_flags f) override {
-        if (f & rf_clear_edges) { my_successors.clear(); }
-    }
+    protected:
+        void reset_node(reset_flags f) override {
+            if(f & rf_clear_edges) {
+                my_successors.clear();
+            }
+        }
+
+    private:
+        broadcast_cache<output_type, null_rw_mutex> my_successors;
+    };  //indexer_node_base
+
+
+    template<int N, typename InputTuple> struct input_types;
+
+    template<typename InputTuple>
+    struct input_types<1, InputTuple> {
+        typedef typename std::tuple_element<0, InputTuple>::type first_type;
+        typedef tagged_msg<size_t, first_type > type;
+    };
+
+    template<typename InputTuple>
+    struct input_types<2, InputTuple> {
+        typedef typename std::tuple_element<0, InputTuple>::type first_type;
+        typedef typename std::tuple_element<1, InputTuple>::type second_type;
+        typedef tagged_msg<size_t, first_type, second_type> type;
+    };
+
+    template<typename InputTuple>
+    struct input_types<3, InputTuple> {
+        typedef typename std::tuple_element<0, InputTuple>::type first_type;
+        typedef typename std::tuple_element<1, InputTuple>::type second_type;
+        typedef typename std::tuple_element<2, InputTuple>::type third_type;
+        typedef tagged_msg<size_t, first_type, second_type, third_type> type;
+    };
+
+    template<typename InputTuple>
+    struct input_types<4, InputTuple> {
+        typedef typename std::tuple_element<0, InputTuple>::type first_type;
+        typedef typename std::tuple_element<1, InputTuple>::type second_type;
+        typedef typename std::tuple_element<2, InputTuple>::type third_type;
+        typedef typename std::tuple_element<3, InputTuple>::type fourth_type;
+        typedef tagged_msg<size_t, first_type, second_type, third_type,
+                                                      fourth_type> type;
+    };
+
+    template<typename InputTuple>
+    struct input_types<5, InputTuple> {
+        typedef typename std::tuple_element<0, InputTuple>::type first_type;
+        typedef typename std::tuple_element<1, InputTuple>::type second_type;
+        typedef typename std::tuple_element<2, InputTuple>::type third_type;
+        typedef typename std::tuple_element<3, InputTuple>::type fourth_type;
+        typedef typename std::tuple_element<4, InputTuple>::type fifth_type;
+        typedef tagged_msg<size_t, first_type, second_type, third_type,
+                                                      fourth_type, fifth_type> type;
+    };
+
+    template<typename InputTuple>
+    struct input_types<6, InputTuple> {
+        typedef typename std::tuple_element<0, InputTuple>::type first_type;
+        typedef typename std::tuple_element<1, InputTuple>::type second_type;
+        typedef typename std::tuple_element<2, InputTuple>::type third_type;
+        typedef typename std::tuple_element<3, InputTuple>::type fourth_type;
+        typedef typename std::tuple_element<4, InputTuple>::type fifth_type;
+        typedef typename std::tuple_element<5, InputTuple>::type sixth_type;
+        typedef tagged_msg<size_t, first_type, second_type, third_type,
+                                                      fourth_type, fifth_type, sixth_type> type;
+    };
+
+    template<typename InputTuple>
+    struct input_types<7, InputTuple> {
+        typedef typename std::tuple_element<0, InputTuple>::type first_type;
+        typedef typename std::tuple_element<1, InputTuple>::type second_type;
+        typedef typename std::tuple_element<2, InputTuple>::type third_type;
+        typedef typename std::tuple_element<3, InputTuple>::type fourth_type;
+        typedef typename std::tuple_element<4, InputTuple>::type fifth_type;
+        typedef typename std::tuple_element<5, InputTuple>::type sixth_type;
+        typedef typename std::tuple_element<6, InputTuple>::type seventh_type;
+        typedef tagged_msg<size_t, first_type, second_type, third_type,
+                                                      fourth_type, fifth_type, sixth_type,
+                                                      seventh_type> type;
+    };
+
+
+    template<typename InputTuple>
+    struct input_types<8, InputTuple> {
+        typedef typename std::tuple_element<0, InputTuple>::type first_type;
+        typedef typename std::tuple_element<1, InputTuple>::type second_type;
+        typedef typename std::tuple_element<2, InputTuple>::type third_type;
+        typedef typename std::tuple_element<3, InputTuple>::type fourth_type;
+        typedef typename std::tuple_element<4, InputTuple>::type fifth_type;
+        typedef typename std::tuple_element<5, InputTuple>::type sixth_type;
+        typedef typename std::tuple_element<6, InputTuple>::type seventh_type;
+        typedef typename std::tuple_element<7, InputTuple>::type eighth_type;
+        typedef tagged_msg<size_t, first_type, second_type, third_type,
+                                                      fourth_type, fifth_type, sixth_type,
+                                                      seventh_type, eighth_type> type;
+    };
+
+
+    template<typename InputTuple>
+    struct input_types<9, InputTuple> {
+        typedef typename std::tuple_element<0, InputTuple>::type first_type;
+        typedef typename std::tuple_element<1, InputTuple>::type second_type;
+        typedef typename std::tuple_element<2, InputTuple>::type third_type;
+        typedef typename std::tuple_element<3, InputTuple>::type fourth_type;
+        typedef typename std::tuple_element<4, InputTuple>::type fifth_type;
+        typedef typename std::tuple_element<5, InputTuple>::type sixth_type;
+        typedef typename std::tuple_element<6, InputTuple>::type seventh_type;
+        typedef typename std::tuple_element<7, InputTuple>::type eighth_type;
+        typedef typename std::tuple_element<8, InputTuple>::type nineth_type;
+        typedef tagged_msg<size_t, first_type, second_type, third_type,
+                                                      fourth_type, fifth_type, sixth_type,
+                                                      seventh_type, eighth_type, nineth_type> type;
+    };
+
+    template<typename InputTuple>
+    struct input_types<10, InputTuple> {
+        typedef typename std::tuple_element<0, InputTuple>::type first_type;
+        typedef typename std::tuple_element<1, InputTuple>::type second_type;
+        typedef typename std::tuple_element<2, InputTuple>::type third_type;
+        typedef typename std::tuple_element<3, InputTuple>::type fourth_type;
+        typedef typename std::tuple_element<4, InputTuple>::type fifth_type;
+        typedef typename std::tuple_element<5, InputTuple>::type sixth_type;
+        typedef typename std::tuple_element<6, InputTuple>::type seventh_type;
+        typedef typename std::tuple_element<7, InputTuple>::type eighth_type;
+        typedef typename std::tuple_element<8, InputTuple>::type nineth_type;
+        typedef typename std::tuple_element<9, InputTuple>::type tenth_type;
+        typedef tagged_msg<size_t, first_type, second_type, third_type,
+                                                      fourth_type, fifth_type, sixth_type,
+                                                      seventh_type, eighth_type, nineth_type,
+                                                      tenth_type> type;
+    };
+
+    // type generators
+    template<typename OutputTuple>
+    struct indexer_types : public input_types<std::tuple_size<OutputTuple>::value, OutputTuple> {
+        static const int N = std::tuple_size<OutputTuple>::value;
+        typedef typename input_types<N, OutputTuple>::type output_type;
+        typedef typename wrap_tuple_elements<N,indexer_input_port,OutputTuple>::type input_ports_type;
+        typedef indexer_node_FE<input_ports_type,output_type,OutputTuple> indexer_FE_type;
+        typedef indexer_node_base<input_ports_type, output_type, OutputTuple> indexer_base_type;
+    };
+
+    template<class OutputTuple>
+    class unfolded_indexer_node : public indexer_types<OutputTuple>::indexer_base_type {
+    public:
+        typedef typename indexer_types<OutputTuple>::input_ports_type input_ports_type;
+        typedef OutputTuple tuple_types;
+        typedef typename indexer_types<OutputTuple>::output_type output_type;
+    private:
+        typedef typename indexer_types<OutputTuple>::indexer_base_type base_type;
+    public:
+        unfolded_indexer_node(graph& g) : base_type(g) {}
+        unfolded_indexer_node(const unfolded_indexer_node &other) : base_type(other) {}
+    };
 
-private:
-    broadcast_cache<output_type, null_rw_mutex> my_successors;
-};//indexer_node_base
-
-template <int N, typename InputTuple>
-struct input_types;
-
-template <typename InputTuple>
-struct input_types<1, InputTuple> {
-    typedef typename std::tuple_element<0, InputTuple>::type first_type;
-    typedef tagged_msg<size_t, first_type> type;
-};
-
-template <typename InputTuple>
-struct input_types<2, InputTuple> {
-    typedef typename std::tuple_element<0, InputTuple>::type first_type;
-    typedef typename std::tuple_element<1, InputTuple>::type second_type;
-    typedef tagged_msg<size_t, first_type, second_type> type;
-};
-
-template <typename InputTuple>
-struct input_types<3, InputTuple> {
-    typedef typename std::tuple_element<0, InputTuple>::type first_type;
-    typedef typename std::tuple_element<1, InputTuple>::type second_type;
-    typedef typename std::tuple_element<2, InputTuple>::type third_type;
-    typedef tagged_msg<size_t, first_type, second_type, third_type> type;
-};
-
-template <typename InputTuple>
-struct input_types<4, InputTuple> {
-    typedef typename std::tuple_element<0, InputTuple>::type first_type;
-    typedef typename std::tuple_element<1, InputTuple>::type second_type;
-    typedef typename std::tuple_element<2, InputTuple>::type third_type;
-    typedef typename std::tuple_element<3, InputTuple>::type fourth_type;
-    typedef tagged_msg<size_t, first_type, second_type, third_type, fourth_type> type;
-};
-
-template <typename InputTuple>
-struct input_types<5, InputTuple> {
-    typedef typename std::tuple_element<0, InputTuple>::type first_type;
-    typedef typename std::tuple_element<1, InputTuple>::type second_type;
-    typedef typename std::tuple_element<2, InputTuple>::type third_type;
-    typedef typename std::tuple_element<3, InputTuple>::type fourth_type;
-    typedef typename std::tuple_element<4, InputTuple>::type fifth_type;
-    typedef tagged_msg<size_t, first_type, second_type, third_type, fourth_type, fifth_type> type;
-};
-
-template <typename InputTuple>
-struct input_types<6, InputTuple> {
-    typedef typename std::tuple_element<0, InputTuple>::type first_type;
-    typedef typename std::tuple_element<1, InputTuple>::type second_type;
-    typedef typename std::tuple_element<2, InputTuple>::type third_type;
-    typedef typename std::tuple_element<3, InputTuple>::type fourth_type;
-    typedef typename std::tuple_element<4, InputTuple>::type fifth_type;
-    typedef typename std::tuple_element<5, InputTuple>::type sixth_type;
-    typedef tagged_msg<size_t, first_type, second_type, third_type, fourth_type, fifth_type, sixth_type> type;
-};
-
-template <typename InputTuple>
-struct input_types<7, InputTuple> {
-    typedef typename std::tuple_element<0, InputTuple>::type first_type;
-    typedef typename std::tuple_element<1, InputTuple>::type second_type;
-    typedef typename std::tuple_element<2, InputTuple>::type third_type;
-    typedef typename std::tuple_element<3, InputTuple>::type fourth_type;
-    typedef typename std::tuple_element<4, InputTuple>::type fifth_type;
-    typedef typename std::tuple_element<5, InputTuple>::type sixth_type;
-    typedef typename std::tuple_element<6, InputTuple>::type seventh_type;
-    typedef tagged_msg<size_t, first_type, second_type, third_type, fourth_type, fifth_type, sixth_type,
-                       seventh_type>
-            type;
-};
-
-template <typename InputTuple>
-struct input_types<8, InputTuple> {
-    typedef typename std::tuple_element<0, InputTuple>::type first_type;
-    typedef typename std::tuple_element<1, InputTuple>::type second_type;
-    typedef typename std::tuple_element<2, InputTuple>::type third_type;
-    typedef typename std::tuple_element<3, InputTuple>::type fourth_type;
-    typedef typename std::tuple_element<4, InputTuple>::type fifth_type;
-    typedef typename std::tuple_element<5, InputTuple>::type sixth_type;
-    typedef typename std::tuple_element<6, InputTuple>::type seventh_type;
-    typedef typename std::tuple_element<7, InputTuple>::type eighth_type;
-    typedef tagged_msg<size_t, first_type, second_type, third_type, fourth_type, fifth_type, sixth_type,
-                       seventh_type, eighth_type>
-            type;
-};
-
-template <typename InputTuple>
-struct input_types<9, InputTuple> {
-    typedef typename std::tuple_element<0, InputTuple>::type first_type;
-    typedef typename std::tuple_element<1, InputTuple>::type second_type;
-    typedef typename std::tuple_element<2, InputTuple>::type third_type;
-    typedef typename std::tuple_element<3, InputTuple>::type fourth_type;
-    typedef typename std::tuple_element<4, InputTuple>::type fifth_type;
-    typedef typename std::tuple_element<5, InputTuple>::type sixth_type;
-    typedef typename std::tuple_element<6, InputTuple>::type seventh_type;
-    typedef typename std::tuple_element<7, InputTuple>::type eighth_type;
-    typedef typename std::tuple_element<8, InputTuple>::type nineth_type;
-    typedef tagged_msg<size_t, first_type, second_type, third_type, fourth_type, fifth_type, sixth_type,
-                       seventh_type, eighth_type, nineth_type>
-            type;
-};
-
-template <typename InputTuple>
-struct input_types<10, InputTuple> {
-    typedef typename std::tuple_element<0, InputTuple>::type first_type;
-    typedef typename std::tuple_element<1, InputTuple>::type second_type;
-    typedef typename std::tuple_element<2, InputTuple>::type third_type;
-    typedef typename std::tuple_element<3, InputTuple>::type fourth_type;
-    typedef typename std::tuple_element<4, InputTuple>::type fifth_type;
-    typedef typename std::tuple_element<5, InputTuple>::type sixth_type;
-    typedef typename std::tuple_element<6, InputTuple>::type seventh_type;
-    typedef typename std::tuple_element<7, InputTuple>::type eighth_type;
-    typedef typename std::tuple_element<8, InputTuple>::type nineth_type;
-    typedef typename std::tuple_element<9, InputTuple>::type tenth_type;
-    typedef tagged_msg<size_t, first_type, second_type, third_type, fourth_type, fifth_type, sixth_type,
-                       seventh_type, eighth_type, nineth_type, tenth_type>
-            type;
-};
-
-// type generators
-template <typename OutputTuple>
-struct indexer_types : public input_types<std::tuple_size<OutputTuple>::value, OutputTuple> {
-    static const int N = std::tuple_size<OutputTuple>::value;
-    typedef typename input_types<N, OutputTuple>::type output_type;
-    typedef typename wrap_tuple_elements<N, indexer_input_port, OutputTuple>::type input_ports_type;
-    typedef indexer_node_FE<input_ports_type, output_type, OutputTuple> indexer_FE_type;
-    typedef indexer_node_base<input_ports_type, output_type, OutputTuple> indexer_base_type;
-};
-
-template <class OutputTuple>
-class unfolded_indexer_node : public indexer_types<OutputTuple>::indexer_base_type {
-public:
-    typedef typename indexer_types<OutputTuple>::input_ports_type input_ports_type;
-    typedef OutputTuple tuple_types;
-    typedef typename indexer_types<OutputTuple>::output_type output_type;
-
-private:
-    typedef typename indexer_types<OutputTuple>::indexer_base_type base_type;
-
-public:
-    unfolded_indexer_node(graph &g) : base_type(g) {}
-    unfolded_indexer_node(const unfolded_indexer_node &other) : base_type(other) {}
-};
-
-#endif /* __TBB__flow_graph_indexer_impl_H */
+#endif  /* __TBB__flow_graph_indexer_impl_H */
diff --git a/external/tbb/include/oneapi/tbb/detail/_flow_graph_item_buffer_impl.h b/external/tbb/include/oneapi/tbb/detail/_flow_graph_item_buffer_impl.h
index 208caf78..cf7c54b8 100644
--- a/external/tbb/include/oneapi/tbb/detail/_flow_graph_item_buffer_impl.h
+++ b/external/tbb/include/oneapi/tbb/detail/_flow_graph_item_buffer_impl.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -31,15 +31,20 @@
 // a read-only reference to the item in the buffer.  set_my_item may be called
 // with either an empty or occupied slot.
 
-template <typename T, typename A = cache_aligned_allocator<T>>
+template <typename T, typename A=cache_aligned_allocator<T> >
 class item_buffer {
 public:
     typedef T item_type;
-    enum buffer_item_state { no_item = 0, has_item = 1, reserved_item = 2 };
-
+    enum buffer_item_state { no_item=0, has_item=1, reserved_item=2 };
 protected:
+    struct aligned_space_item {
+        item_type item;
+        buffer_item_state state;
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+        message_metainfo metainfo;
+#endif
+    };
     typedef size_t size_type;
-    typedef std::pair<item_type, buffer_item_state> aligned_space_item;
     typedef aligned_space<aligned_space_item> buffer_item_type;
     typedef typename allocator_traits<A>::template rebind_alloc<buffer_item_type> allocator_type;
     buffer_item_type *my_array;
@@ -50,53 +55,89 @@ class item_buffer {
 
     bool buffer_empty() const { return my_head == my_tail; }
 
-    aligned_space_item &item(size_type i) {
-        __TBB_ASSERT(!(size_type(&(my_array[i & (my_array_size - 1)].begin()->second))
-                       % alignment_of<buffer_item_state>::value),
-                     NULL);
-        __TBB_ASSERT(!(size_type(&(my_array[i & (my_array_size - 1)].begin()->first))
-                       % alignment_of<item_type>::value),
-                     NULL);
-        return *my_array[i & (my_array_size - 1)].begin();
+    aligned_space_item &element(size_type i) {
+        __TBB_ASSERT(!(size_type(&(my_array[i&(my_array_size-1)].begin()->state))%alignment_of<buffer_item_state>::value), nullptr);
+        __TBB_ASSERT(!(size_type(&(my_array[i&(my_array_size-1)].begin()->item))%alignment_of<item_type>::value), nullptr);
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+        __TBB_ASSERT(!(size_type(&(my_array[i&(my_array_size-1)].begin()->metainfo))%alignment_of<message_metainfo>::value), nullptr);
+#endif
+        return *my_array[i & (my_array_size - 1) ].begin();
     }
 
-    const aligned_space_item &item(size_type i) const {
-        __TBB_ASSERT(!(size_type(&(my_array[i & (my_array_size - 1)].begin()->second))
-                       % alignment_of<buffer_item_state>::value),
-                     NULL);
-        __TBB_ASSERT(!(size_type(&(my_array[i & (my_array_size - 1)].begin()->first))
-                       % alignment_of<item_type>::value),
-                     NULL);
-        return *my_array[i & (my_array_size - 1)].begin();
+    const aligned_space_item &element(size_type i) const {
+        __TBB_ASSERT(!(size_type(&(my_array[i&(my_array_size-1)].begin()->state))%alignment_of<buffer_item_state>::value), nullptr);
+        __TBB_ASSERT(!(size_type(&(my_array[i&(my_array_size-1)].begin()->item))%alignment_of<item_type>::value), nullptr);
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+        __TBB_ASSERT(!(size_type(&(my_array[i&(my_array_size-1)].begin()->metainfo))%alignment_of<message_metainfo>::value), nullptr);
+#endif
+        return *my_array[i & (my_array_size-1)].begin();
     }
 
-    bool my_item_valid(size_type i) const {
-        return (i < my_tail) && (i >= my_head) && (item(i).second != no_item);
-    }
+    bool my_item_valid(size_type i) const { return (i < my_tail) && (i >= my_head) && (element(i).state != no_item); }
 #if TBB_USE_ASSERT
-    bool my_item_reserved(size_type i) const { return item(i).second == reserved_item; }
+    bool my_item_reserved(size_type i) const { return element(i).state == reserved_item; }
 #endif
 
     // object management in buffer
     const item_type &get_my_item(size_t i) const {
+        __TBB_ASSERT(my_item_valid(i),"attempt to get invalid item");
+        return element(i).item;
+    }
+
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+    message_metainfo& get_my_metainfo(size_t i) {
         __TBB_ASSERT(my_item_valid(i), "attempt to get invalid item");
-        item_type *itm = const_cast<item_type *>(reinterpret_cast<const item_type *>(&item(i).first));
-        return *itm;
+        return element(i).metainfo;
     }
+#endif
 
     // may be called with an empty slot or a slot that has already been constructed into.
-    void set_my_item(size_t i, const item_type &o) {
-        if (item(i).second != no_item) { destroy_item(i); }
-        new (&(item(i).first)) item_type(o);
-        item(i).second = has_item;
+    void set_my_item(size_t i, const item_type &o
+                     __TBB_FLOW_GRAPH_METAINFO_ARG(const message_metainfo& metainfo))
+    {
+        if(element(i).state != no_item) {
+            destroy_item(i);
+        }
+        new(&(element(i).item)) item_type(o);
+        element(i).state = has_item;
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+        new(&element(i).metainfo) message_metainfo(metainfo);
+
+        for (auto& waiter : metainfo.waiters()) {
+            waiter->reserve(1);
+        }
+#endif
     }
 
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+    void set_my_item(size_t i, const item_type& o, message_metainfo&& metainfo) {
+        if(element(i).state != no_item) {
+            destroy_item(i);
+        }
+
+        new(&(element(i).item)) item_type(o);
+        new(&element(i).metainfo) message_metainfo(std::move(metainfo));
+        // Skipping the reservation on metainfo.waiters since the ownership
+        // is moving from metainfo to the cache
+        element(i).state = has_item;
+    }
+#endif
+
     // destructively-fetch an object from the buffer
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+    void fetch_item(size_t i, item_type& o, message_metainfo& metainfo) {
+        __TBB_ASSERT(my_item_valid(i), "Trying to fetch an empty slot");
+        o = get_my_item(i);  // could have std::move assign semantics
+        metainfo = std::move(get_my_metainfo(i));
+        destroy_item(i);
+    }
+#else
     void fetch_item(size_t i, item_type &o) {
         __TBB_ASSERT(my_item_valid(i), "Trying to fetch an empty slot");
-        o = get_my_item(i);// could have std::move assign semantics
+        o = get_my_item(i);  // could have std::move assign semantics
         destroy_item(i);
     }
+#endif
 
     // move an existing item from one slot to another.  The moved-to slot must be unoccupied,
     // the moved-from slot must exist and not be reserved.  The after, from will be empty,
@@ -104,63 +145,103 @@ class item_buffer {
     void move_item(size_t to, size_t from) {
         __TBB_ASSERT(!my_item_valid(to), "Trying to move to a non-empty slot");
         __TBB_ASSERT(my_item_valid(from), "Trying to move from an empty slot");
-        set_my_item(to, get_my_item(from));// could have std::move semantics
+        // could have std::move semantics
+        set_my_item(to, get_my_item(from) __TBB_FLOW_GRAPH_METAINFO_ARG(get_my_metainfo(from)));
         destroy_item(from);
     }
 
     // put an item in an empty slot.  Return true if successful, else false
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+    template <typename Metainfo>
+    bool place_item(size_t here, const item_type &me, Metainfo&& metainfo) {
+#if !TBB_DEPRECATED_SEQUENCER_DUPLICATES
+        if(my_item_valid(here)) return false;
+#endif
+        set_my_item(here, me, std::forward<Metainfo>(metainfo));
+        return true;
+    }
+#else
     bool place_item(size_t here, const item_type &me) {
 #if !TBB_DEPRECATED_SEQUENCER_DUPLICATES
-        if (my_item_valid(here)) return false;
+        if(my_item_valid(here)) return false;
 #endif
         set_my_item(here, me);
         return true;
     }
+#endif
 
     // could be implemented with std::move semantics
     void swap_items(size_t i, size_t j) {
         __TBB_ASSERT(my_item_valid(i) && my_item_valid(j), "attempt to swap invalid item(s)");
         item_type temp = get_my_item(i);
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+        message_metainfo temp_metainfo = get_my_metainfo(i);
+        set_my_item(i, get_my_item(j), get_my_metainfo(j));
+        set_my_item(j, temp, temp_metainfo);
+#else
         set_my_item(i, get_my_item(j));
         set_my_item(j, temp);
+#endif
     }
 
     void destroy_item(size_type i) {
         __TBB_ASSERT(my_item_valid(i), "destruction of invalid item");
-        item(i).first.~item_type();
-        item(i).second = no_item;
+
+        auto& e = element(i);
+        e.item.~item_type();
+        e.state = no_item;
+
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+        for (auto& msg_waiter : e.metainfo.waiters()) {
+            msg_waiter->release(1);
+        }
+
+        e.metainfo.~message_metainfo();
+#endif
     }
 
     // returns the front element
-    const item_type &front() const {
+    const item_type& front() const
+    {
         __TBB_ASSERT(my_item_valid(my_head), "attempt to fetch head non-item");
         return get_my_item(my_head);
     }
 
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+    const message_metainfo& front_metainfo() const
+    {
+        __TBB_ASSERT(my_item_valid(my_head), "attempt to fetch head non-item");
+        return element(my_head).metainfo;
+    }
+#endif
+
     // returns  the back element
-    const item_type &back() const {
+    const item_type& back() const
+    {
         __TBB_ASSERT(my_item_valid(my_tail - 1), "attempt to fetch head non-item");
         return get_my_item(my_tail - 1);
     }
 
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+    const message_metainfo& back_metainfo() const {
+        __TBB_ASSERT(my_item_valid(my_tail - 1), "attempt to fetch head non-item");
+        return element(my_tail - 1).metainfo;
+    }
+#endif
+
     // following methods are for reservation of the front of a buffer.
     void reserve_item(size_type i) {
         __TBB_ASSERT(my_item_valid(i) && !my_item_reserved(i), "item cannot be reserved");
-        item(i).second = reserved_item;
+        element(i).state = reserved_item;
     }
+
     void release_item(size_type i) {
         __TBB_ASSERT(my_item_reserved(i), "item is not reserved");
-        item(i).second = has_item;
+        element(i).state = has_item;
     }
 
-    void destroy_front() {
-        destroy_item(my_head);
-        ++my_head;
-    }
-    void destroy_back() {
-        destroy_item(my_tail - 1);
-        --my_tail;
-    }
+    void destroy_front() { destroy_item(my_head); ++my_head; }
+    void destroy_back() { destroy_item(my_tail-1); --my_tail; }
 
     // we have to be able to test against a new tail value without changing my_tail
     // grow_array doesn't work if we change my_tail when the old array is too small
@@ -171,84 +252,127 @@ class item_buffer {
     bool buffer_full() { return size() >= capacity(); }
 
     //! Grows the internal array.
-    void grow_my_array(size_t minimum_size) {
+    void grow_my_array( size_t minimum_size ) {
         // test that we haven't made the structure inconsistent.
         __TBB_ASSERT(capacity() >= my_tail - my_head, "total items exceed capacity");
-        size_type new_size = my_array_size ? 2 * my_array_size : initial_buffer_size;
-        while (new_size < minimum_size) new_size *= 2;
+        size_type new_size = my_array_size ? 2*my_array_size : initial_buffer_size;
+        while( new_size<minimum_size )
+            new_size*=2;
 
-        buffer_item_type *new_array = allocator_type().allocate(new_size);
+        buffer_item_type* new_array = allocator_type().allocate(new_size);
 
         // initialize validity to "no"
-        for (size_type i = 0; i < new_size; ++i) { new_array[i].begin()->second = no_item; }
+        for( size_type i=0; i<new_size; ++i ) { new_array[i].begin()->state = no_item; }
 
-        for (size_type i = my_head; i < my_tail; ++i) {
-            if (my_item_valid(i)) {// sequencer_node may have empty slots
+        for( size_type i=my_head; i<my_tail; ++i) {
+            if(my_item_valid(i)) {  // sequencer_node may have empty slots
                 // placement-new copy-construct; could be std::move
-                char *new_space = (char *) &(new_array[i & (new_size - 1)].begin()->first);
-                (void) new (new_space) item_type(get_my_item(i));
-                new_array[i & (new_size - 1)].begin()->second = item(i).second;
+                char *new_space = (char *)&(new_array[i&(new_size-1)].begin()->item);
+                (void)new(new_space) item_type(get_my_item(i));
+                new_array[i&(new_size-1)].begin()->state = element(i).state;
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+                char* meta_space = (char *)&(new_array[i&(new_size-1)].begin()->metainfo);
+                ::new(meta_space) message_metainfo(std::move(element(i).metainfo));
+#endif
             }
         }
 
-        clean_up_buffer(/*reset_pointers*/ false);
+        clean_up_buffer(/*reset_pointers*/false);
 
         my_array = new_array;
         my_array_size = new_size;
     }
 
-    bool push_back(item_type &v) {
-        if (buffer_full()) { grow_my_array(size() + 1); }
-        set_my_item(my_tail, v);
+    bool push_back(item_type& v
+                   __TBB_FLOW_GRAPH_METAINFO_ARG(const message_metainfo& metainfo))
+    {
+        if (buffer_full()) {
+            grow_my_array(size() + 1);
+        }
+        set_my_item(my_tail, v __TBB_FLOW_GRAPH_METAINFO_ARG(metainfo));
         ++my_tail;
         return true;
     }
 
-    bool pop_back(item_type &v) {
-        if (!my_item_valid(my_tail - 1)) { return false; }
-        v = this->back();
+    bool pop_back(item_type& v
+                  __TBB_FLOW_GRAPH_METAINFO_ARG(message_metainfo& metainfo))
+    {
+        if (!my_item_valid(my_tail - 1)) {
+            return false;
+        }
+        auto& e = element(my_tail - 1);
+        v = e.item;
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+        metainfo = std::move(e.metainfo);
+#endif
+
         destroy_back();
         return true;
     }
 
-    bool pop_front(item_type &v) {
-        if (!my_item_valid(my_head)) { return false; }
-        v = this->front();
+    bool pop_front(item_type& v
+                   __TBB_FLOW_GRAPH_METAINFO_ARG(message_metainfo& metainfo))
+    {
+        if (!my_item_valid(my_head)) {
+            return false;
+        }
+        auto& e = element(my_head);
+        v = e.item;
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+        metainfo = std::move(e.metainfo);
+#endif
+
         destroy_front();
         return true;
     }
 
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+    bool pop_back(item_type& v) {
+        message_metainfo metainfo;
+        return pop_back(v, metainfo);
+    }
+
+    bool pop_front(item_type& v) {
+        message_metainfo metainfo;
+        return pop_front(v, metainfo);
+    }
+#endif
+
     // This is used both for reset and for grow_my_array.  In the case of grow_my_array
     // we want to retain the values of the head and tail.
     void clean_up_buffer(bool reset_pointers) {
         if (my_array) {
-            for (size_type i = my_head; i < my_tail; ++i) {
-                if (my_item_valid(i)) destroy_item(i);
+            for( size_type i=my_head; i<my_tail; ++i ) {
+                if(my_item_valid(i))
+                    destroy_item(i);
             }
-            allocator_type().deallocate(my_array, my_array_size);
+            allocator_type().deallocate(my_array,my_array_size);
+        }
+        my_array = nullptr;
+        if(reset_pointers) {
+            my_head = my_tail = my_array_size = 0;
         }
-        my_array = NULL;
-        if (reset_pointers) { my_head = my_tail = my_array_size = 0; }
     }
 
 public:
     //! Constructor
-    item_buffer() : my_array(NULL), my_array_size(0), my_head(0), my_tail(0) {
+    item_buffer( ) : my_array(nullptr), my_array_size(0),
+                     my_head(0), my_tail(0) {
         grow_my_array(initial_buffer_size);
     }
 
-    ~item_buffer() { clean_up_buffer(/*reset_pointers*/ true); }
-
-    void reset() {
-        clean_up_buffer(/*reset_pointers*/ true);
-        grow_my_array(initial_buffer_size);
+    ~item_buffer() {
+        clean_up_buffer(/*reset_pointers*/true);
     }
+
+    void reset() { clean_up_buffer(/*reset_pointers*/true); grow_my_array(initial_buffer_size); }
+
 };
 
 //! item_buffer with reservable front-end.  NOTE: if reserving, do not
 //* complete operation with pop_front(); use consume_front().
 //* No synchronization built-in.
-template <typename T, typename A = cache_aligned_allocator<T>>
+template<typename T, typename A=cache_aligned_allocator<T> >
 class reservable_item_buffer : public item_buffer<T, A> {
 protected:
     using item_buffer<T, A>::my_item_valid;
@@ -256,20 +380,29 @@ class reservable_item_buffer : public item_buffer<T, A> {
 
 public:
     reservable_item_buffer() : item_buffer<T, A>(), my_reserved(false) {}
-    void reset() {
-        my_reserved = false;
-        item_buffer<T, A>::reset();
-    }
-
+    void reset() {my_reserved = false; item_buffer<T,A>::reset(); }
 protected:
+
     bool reserve_front(T &v) {
+        if(my_reserved || !my_item_valid(this->my_head)) return false;
+        my_reserved = true;
+        // reserving the head
+        v = this->front();
+        this->reserve_item(this->my_head);
+        return true;
+    }
+
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+    bool reserve_front(T& v, message_metainfo& metainfo) {
         if (my_reserved || !my_item_valid(this->my_head)) return false;
         my_reserved = true;
         // reserving the head
         v = this->front();
+        metainfo = this->front_metainfo();
         this->reserve_item(this->my_head);
         return true;
     }
+#endif
 
     void consume_front() {
         __TBB_ASSERT(my_reserved, "Attempt to consume a non-reserved item");
@@ -286,4 +419,4 @@ class reservable_item_buffer : public item_buffer<T, A> {
     bool my_reserved;
 };
 
-#endif// __TBB__flow_graph_item_buffer_impl_H
+#endif // __TBB__flow_graph_item_buffer_impl_H
diff --git a/external/tbb/include/oneapi/tbb/detail/_flow_graph_join_impl.h b/external/tbb/include/oneapi/tbb/detail/_flow_graph_join_impl.h
index 7cce5c4f..8bca9a2c 100644
--- a/external/tbb/include/oneapi/tbb/detail/_flow_graph_join_impl.h
+++ b/external/tbb/include/oneapi/tbb/detail/_flow_graph_join_impl.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -21,1691 +21,1950 @@
 #error Do not #include this internal file directly; use public TBB headers instead.
 #endif
 
-// included into namespace tbb::detail::d1
-
-struct forwarding_base : no_assign {
-    forwarding_base(graph &g) : graph_ref(g) {}
-    virtual ~forwarding_base() {}
-    graph &graph_ref;
-};
-
-struct queueing_forwarding_base : forwarding_base {
-    using forwarding_base::forwarding_base;
-    // decrement_port_count may create a forwarding task.  If we cannot handle the task
-    // ourselves, ask decrement_port_count to deal with it.
-    virtual graph_task *decrement_port_count(bool handle_task) = 0;
-};
-
-struct reserving_forwarding_base : forwarding_base {
-    using forwarding_base::forwarding_base;
-    // decrement_port_count may create a forwarding task.  If we cannot handle the task
-    // ourselves, ask decrement_port_count to deal with it.
-    virtual graph_task *decrement_port_count() = 0;
-    virtual void increment_port_count() = 0;
-};
-
-// specialization that lets us keep a copy of the current_key for building results.
-// KeyType can be a reference type.
-template <typename KeyType>
-struct matching_forwarding_base : public forwarding_base {
-    typedef typename std::decay<KeyType>::type current_key_type;
-    matching_forwarding_base(graph &g) : forwarding_base(g) {}
-    virtual graph_task *increment_key_count(current_key_type const & /*t*/) = 0;
-    current_key_type current_key;// so ports can refer to FE's desired items
-};
-
-template <int N>
-struct join_helper {
-
-    template <typename TupleType, typename PortType>
-    static inline void set_join_node_pointer(TupleType &my_input, PortType *port) {
-        std::get<N - 1>(my_input).set_join_node_pointer(port);
-        join_helper<N - 1>::set_join_node_pointer(my_input, port);
-    }
-    template <typename TupleType>
-    static inline void consume_reservations(TupleType &my_input) {
-        std::get<N - 1>(my_input).consume();
-        join_helper<N - 1>::consume_reservations(my_input);
-    }
+// included into namespace tbb::detail::d2
 
-    template <typename TupleType>
-    static inline void release_my_reservation(TupleType &my_input) {
-        std::get<N - 1>(my_input).release();
-    }
+    struct forwarding_base : no_assign {
+        forwarding_base(graph &g) : graph_ref(g) {}
+        virtual ~forwarding_base() {}
+        graph& graph_ref;
+    };
 
-    template <typename TupleType>
-    static inline void release_reservations(TupleType &my_input) {
-        join_helper<N - 1>::release_reservations(my_input);
-        release_my_reservation(my_input);
-    }
+    struct queueing_forwarding_base : forwarding_base {
+        using forwarding_base::forwarding_base;
+        // decrement_port_count may create a forwarding task.  If we cannot handle the task
+        // ourselves, ask decrement_port_count to deal with it.
+        virtual graph_task* decrement_port_count(bool handle_task) = 0;
+    };
 
-    template <typename InputTuple, typename OutputTuple>
-    static inline bool reserve(InputTuple &my_input, OutputTuple &out) {
-        if (!std::get<N - 1>(my_input).reserve(std::get<N - 1>(out))) return false;
-        if (!join_helper<N - 1>::reserve(my_input, out)) {
+    struct reserving_forwarding_base : forwarding_base {
+        using forwarding_base::forwarding_base;
+        // decrement_port_count may create a forwarding task.  If we cannot handle the task
+        // ourselves, ask decrement_port_count to deal with it.
+        virtual graph_task* decrement_port_count() = 0;
+        virtual void increment_port_count() = 0;
+    };
+
+    // specialization that lets us keep a copy of the current_key for building results.
+    // KeyType can be a reference type.
+    template<typename KeyType>
+    struct matching_forwarding_base : public forwarding_base {
+        typedef typename std::decay<KeyType>::type current_key_type;
+        matching_forwarding_base(graph &g) : forwarding_base(g) { }
+        virtual graph_task* increment_key_count(current_key_type const & /*t*/) = 0;
+        current_key_type current_key; // so ports can refer to FE's desired items
+    };
+
+    template< int N >
+    struct join_helper {
+
+        template< typename TupleType, typename PortType >
+        static inline void set_join_node_pointer(TupleType &my_input, PortType *port) {
+            std::get<N-1>( my_input ).set_join_node_pointer(port);
+            join_helper<N-1>::set_join_node_pointer( my_input, port );
+        }
+        template< typename TupleType >
+        static inline void consume_reservations( TupleType &my_input ) {
+            std::get<N-1>( my_input ).consume();
+            join_helper<N-1>::consume_reservations( my_input );
+        }
+
+        template< typename TupleType >
+        static inline void release_my_reservation( TupleType &my_input ) {
+            std::get<N-1>( my_input ).release();
+        }
+
+        template <typename TupleType>
+        static inline void release_reservations( TupleType &my_input) {
+            join_helper<N-1>::release_reservations(my_input);
             release_my_reservation(my_input);
-            return false;
         }
-        return true;
-    }
 
-    template <typename InputTuple, typename OutputTuple>
-    static inline bool get_my_item(InputTuple &my_input, OutputTuple &out) {
-        bool res = std::get<N - 1>(my_input).get_item(std::get<N - 1>(out));// may fail
-        return join_helper<N - 1>::get_my_item(my_input, out)
-               && res;// do get on other inputs before returning
-    }
+        template< typename InputTuple, typename OutputTuple >
+        static inline bool reserve( InputTuple &my_input, OutputTuple &out) {
+            if ( !std::get<N-1>( my_input ).reserve( std::get<N-1>( out ) ) ) return false;
+            if ( !join_helper<N-1>::reserve( my_input, out ) ) {
+                release_my_reservation( my_input );
+                return false;
+            }
+            return true;
+        }
 
-    template <typename InputTuple, typename OutputTuple>
-    static inline bool get_items(InputTuple &my_input, OutputTuple &out) {
-        return get_my_item(my_input, out);
-    }
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+        template <typename InputTuple, typename OutputTuple>
+        static inline bool reserve(InputTuple& my_input, OutputTuple& out, message_metainfo& metainfo) {
+            message_metainfo element_metainfo;
+            if (!std::get<N - 1>(my_input).reserve(std::get<N - 1>(out), element_metainfo)) return false;
+            if (!join_helper<N - 1>::reserve(my_input, out, metainfo)) {
+                release_my_reservation(my_input);
+                return false;
+            }
+            metainfo.merge(element_metainfo);
+            return true;
 
-    template <typename InputTuple>
-    static inline void reset_my_port(InputTuple &my_input) {
-        join_helper<N - 1>::reset_my_port(my_input);
-        std::get<N - 1>(my_input).reset_port();
-    }
+        }
+#endif
 
-    template <typename InputTuple>
-    static inline void reset_ports(InputTuple &my_input) {
-        reset_my_port(my_input);
-    }
+        template<typename InputTuple, typename OutputTuple>
+        static inline bool get_my_item( InputTuple &my_input, OutputTuple &out) {
+            bool res = std::get<N-1>(my_input).get_item(std::get<N-1>(out) ); // may fail
+            return join_helper<N-1>::get_my_item(my_input, out) && res;       // do get on other inputs before returning
+        }
 
-    template <typename InputTuple, typename KeyFuncTuple>
-    static inline void set_key_functors(InputTuple &my_input, KeyFuncTuple &my_key_funcs) {
-        std::get<N - 1>(my_input).set_my_key_func(std::get<N - 1>(my_key_funcs));
-        std::get<N - 1>(my_key_funcs) = nullptr;
-        join_helper<N - 1>::set_key_functors(my_input, my_key_funcs);
-    }
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+        template <typename InputTuple, typename OutputTuple>
+        static inline bool get_my_item(InputTuple& my_input, OutputTuple& out, message_metainfo& metainfo) {
+            message_metainfo element_metainfo;
+            bool res = std::get<N-1>(my_input).get_item(std::get<N-1>(out), element_metainfo);
+            metainfo.merge(element_metainfo);
+            return join_helper<N-1>::get_my_item(my_input, out, metainfo) && res;
+        }
+#endif
 
-    template <typename KeyFuncTuple>
-    static inline void copy_key_functors(KeyFuncTuple &my_inputs, KeyFuncTuple &other_inputs) {
-        __TBB_ASSERT(std::get<N - 1>(other_inputs).get_my_key_func(),
-                     "key matching join node should not be instantiated without functors.");
-        std::get<N - 1>(my_inputs).set_my_key_func(std::get<N - 1>(other_inputs).get_my_key_func()->clone());
-        join_helper<N - 1>::copy_key_functors(my_inputs, other_inputs);
-    }
+        template<typename InputTuple, typename OutputTuple>
+        static inline bool get_items(InputTuple &my_input, OutputTuple &out) {
+            return get_my_item(my_input, out);
+        }
 
-    template <typename InputTuple>
-    static inline void reset_inputs(InputTuple &my_input, reset_flags f) {
-        join_helper<N - 1>::reset_inputs(my_input, f);
-        std::get<N - 1>(my_input).reset_receiver(f);
-    }
-};// join_helper<N>
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+        template <typename InputTuple, typename OutputTuple>
+        static inline bool get_items(InputTuple& my_input, OutputTuple& out, message_metainfo& metainfo) {
+            return get_my_item(my_input, out, metainfo);
+        }
+#endif
 
-template <>
-struct join_helper<1> {
+        template<typename InputTuple>
+        static inline void reset_my_port(InputTuple &my_input) {
+            join_helper<N-1>::reset_my_port(my_input);
+            std::get<N-1>(my_input).reset_port();
+        }
 
-    template <typename TupleType, typename PortType>
-    static inline void set_join_node_pointer(TupleType &my_input, PortType *port) {
-        std::get<0>(my_input).set_join_node_pointer(port);
-    }
+        template<typename InputTuple>
+        static inline void reset_ports(InputTuple& my_input) {
+            reset_my_port(my_input);
+        }
 
-    template <typename TupleType>
-    static inline void consume_reservations(TupleType &my_input) {
-        std::get<0>(my_input).consume();
-    }
+        template<typename InputTuple, typename KeyFuncTuple>
+        static inline void set_key_functors(InputTuple &my_input, KeyFuncTuple &my_key_funcs) {
+            std::get<N-1>(my_input).set_my_key_func(std::get<N-1>(my_key_funcs));
+            std::get<N-1>(my_key_funcs) = nullptr;
+            join_helper<N-1>::set_key_functors(my_input, my_key_funcs);
+        }
 
-    template <typename TupleType>
-    static inline void release_my_reservation(TupleType &my_input) {
-        std::get<0>(my_input).release();
-    }
+        template< typename KeyFuncTuple>
+        static inline void copy_key_functors(KeyFuncTuple &my_inputs, KeyFuncTuple &other_inputs) {
+            __TBB_ASSERT(
+                std::get<N-1>(other_inputs).get_my_key_func(),
+                "key matching join node should not be instantiated without functors."
+            );
+            std::get<N-1>(my_inputs).set_my_key_func(std::get<N-1>(other_inputs).get_my_key_func()->clone());
+            join_helper<N-1>::copy_key_functors(my_inputs, other_inputs);
+        }
 
-    template <typename TupleType>
-    static inline void release_reservations(TupleType &my_input) {
-        release_my_reservation(my_input);
-    }
+        template<typename InputTuple>
+        static inline void reset_inputs(InputTuple &my_input, reset_flags f) {
+            join_helper<N-1>::reset_inputs(my_input, f);
+            std::get<N-1>(my_input).reset_receiver(f);
+        }
+    };  // join_helper<N>
 
-    template <typename InputTuple, typename OutputTuple>
-    static inline bool reserve(InputTuple &my_input, OutputTuple &out) {
-        return std::get<0>(my_input).reserve(std::get<0>(out));
-    }
+    template< >
+    struct join_helper<1> {
 
-    template <typename InputTuple, typename OutputTuple>
-    static inline bool get_my_item(InputTuple &my_input, OutputTuple &out) {
-        return std::get<0>(my_input).get_item(std::get<0>(out));
-    }
+        template< typename TupleType, typename PortType >
+        static inline void set_join_node_pointer(TupleType &my_input, PortType *port) {
+            std::get<0>( my_input ).set_join_node_pointer(port);
+        }
 
-    template <typename InputTuple, typename OutputTuple>
-    static inline bool get_items(InputTuple &my_input, OutputTuple &out) {
-        return get_my_item(my_input, out);
-    }
+        template< typename TupleType >
+        static inline void consume_reservations( TupleType &my_input ) {
+            std::get<0>( my_input ).consume();
+        }
 
-    template <typename InputTuple>
-    static inline void reset_my_port(InputTuple &my_input) {
-        std::get<0>(my_input).reset_port();
-    }
+        template< typename TupleType >
+        static inline void release_my_reservation( TupleType &my_input ) {
+            std::get<0>( my_input ).release();
+        }
 
-    template <typename InputTuple>
-    static inline void reset_ports(InputTuple &my_input) {
-        reset_my_port(my_input);
-    }
+        template<typename TupleType>
+        static inline void release_reservations( TupleType &my_input) {
+            release_my_reservation(my_input);
+        }
 
-    template <typename InputTuple, typename KeyFuncTuple>
-    static inline void set_key_functors(InputTuple &my_input, KeyFuncTuple &my_key_funcs) {
-        std::get<0>(my_input).set_my_key_func(std::get<0>(my_key_funcs));
-        std::get<0>(my_key_funcs) = nullptr;
-    }
+        template< typename InputTuple, typename OutputTuple >
+        static inline bool reserve( InputTuple &my_input, OutputTuple &out) {
+            return std::get<0>( my_input ).reserve( std::get<0>( out ) );
+        }
 
-    template <typename KeyFuncTuple>
-    static inline void copy_key_functors(KeyFuncTuple &my_inputs, KeyFuncTuple &other_inputs) {
-        __TBB_ASSERT(std::get<0>(other_inputs).get_my_key_func(),
-                     "key matching join node should not be instantiated without functors.");
-        std::get<0>(my_inputs).set_my_key_func(std::get<0>(other_inputs).get_my_key_func()->clone());
-    }
-    template <typename InputTuple>
-    static inline void reset_inputs(InputTuple &my_input, reset_flags f) {
-        std::get<0>(my_input).reset_receiver(f);
-    }
-};// join_helper<1>
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+        template <typename InputTuple, typename OutputTuple>
+        static inline bool reserve(InputTuple& my_input, OutputTuple& out, message_metainfo& metainfo) {
+            message_metainfo element_metainfo;
+            bool result = std::get<0>(my_input).reserve(std::get<0>(out), element_metainfo);
+            metainfo.merge(element_metainfo);
+            return result;
+        }
+#endif
+
+        template<typename InputTuple, typename OutputTuple>
+        static inline bool get_my_item( InputTuple &my_input, OutputTuple &out) {
+            return std::get<0>(my_input).get_item(std::get<0>(out));
+        }
+
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+        template <typename InputTuple, typename OutputTuple>
+        static inline bool get_my_item(InputTuple& my_input, OutputTuple& out, message_metainfo& metainfo) {
+            message_metainfo element_metainfo;
+            bool res = std::get<0>(my_input).get_item(std::get<0>(out), element_metainfo);
+            metainfo.merge(element_metainfo);
+            return res;
+        }
+#endif
 
-//! The two-phase join port
-template <typename T>
-class reserving_port : public receiver<T> {
-public:
-    typedef T input_type;
-    typedef typename receiver<input_type>::predecessor_type predecessor_type;
+        template<typename InputTuple, typename OutputTuple>
+        static inline bool get_items(InputTuple &my_input, OutputTuple &out) {
+            return get_my_item(my_input, out);
+        }
 
-private:
-    // ----------- Aggregator ------------
-    enum op_type { reg_pred, rem_pred, res_item, rel_res, con_res };
-    typedef reserving_port<T> class_type;
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+        template <typename InputTuple, typename OutputTuple>
+        static inline bool get_items(InputTuple& my_input, OutputTuple& out, message_metainfo& metainfo) {
+            return get_my_item(my_input, out, metainfo);
+        }
+#endif
+
+        template<typename InputTuple>
+        static inline void reset_my_port(InputTuple &my_input) {
+            std::get<0>(my_input).reset_port();
+        }
+
+        template<typename InputTuple>
+        static inline void reset_ports(InputTuple& my_input) {
+            reset_my_port(my_input);
+        }
 
-    class reserving_port_operation : public aggregated_operation<reserving_port_operation> {
+        template<typename InputTuple, typename KeyFuncTuple>
+        static inline void set_key_functors(InputTuple &my_input, KeyFuncTuple &my_key_funcs) {
+            std::get<0>(my_input).set_my_key_func(std::get<0>(my_key_funcs));
+            std::get<0>(my_key_funcs) = nullptr;
+        }
+
+        template< typename KeyFuncTuple>
+        static inline void copy_key_functors(KeyFuncTuple &my_inputs, KeyFuncTuple &other_inputs) {
+            __TBB_ASSERT(
+                std::get<0>(other_inputs).get_my_key_func(),
+                "key matching join node should not be instantiated without functors."
+            );
+            std::get<0>(my_inputs).set_my_key_func(std::get<0>(other_inputs).get_my_key_func()->clone());
+        }
+        template<typename InputTuple>
+        static inline void reset_inputs(InputTuple &my_input, reset_flags f) {
+            std::get<0>(my_input).reset_receiver(f);
+        }
+    };  // join_helper<1>
+
+    //! The two-phase join port
+    template< typename T >
+    class reserving_port : public receiver<T> {
     public:
-        char type;
-        union {
-            T *my_arg;
-            predecessor_type *my_pred;
+        typedef T input_type;
+        typedef typename receiver<input_type>::predecessor_type predecessor_type;
+
+    private:
+        // ----------- Aggregator ------------
+        enum op_type { reg_pred, rem_pred, res_item, rel_res, con_res
+        };
+        typedef reserving_port<T> class_type;
+
+        class reserving_port_operation : public d1::aggregated_operation<reserving_port_operation> {
+        public:
+            char type;
+            union {
+                T *my_arg;
+                predecessor_type *my_pred;
+            };
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+            message_metainfo* metainfo;
+#endif
+            reserving_port_operation(const T& e, op_type t __TBB_FLOW_GRAPH_METAINFO_ARG(message_metainfo& info)) :
+                type(char(t)), my_arg(const_cast<T*>(&e))
+                __TBB_FLOW_GRAPH_METAINFO_ARG(metainfo(&info)) {}
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+            reserving_port_operation(const T& e, op_type t)
+                : type(char(t)), my_arg(const_cast<T*>(&e)), metainfo(nullptr) {}
+#endif
+            reserving_port_operation(const predecessor_type &s, op_type t) : type(char(t)),
+                my_pred(const_cast<predecessor_type *>(&s)) {}
+            reserving_port_operation(op_type t) : type(char(t)) {}
         };
-        reserving_port_operation(const T &e, op_type t) : type(char(t)), my_arg(const_cast<T *>(&e)) {}
-        reserving_port_operation(const predecessor_type &s, op_type t)
-            : type(char(t)), my_pred(const_cast<predecessor_type *>(&s)) {}
-        reserving_port_operation(op_type t) : type(char(t)) {}
-    };
 
-    typedef aggregating_functor<class_type, reserving_port_operation> handler_type;
-    friend class aggregating_functor<class_type, reserving_port_operation>;
-    aggregator<handler_type, reserving_port_operation> my_aggregator;
-
-    void handle_operations(reserving_port_operation *op_list) {
-        reserving_port_operation *current;
-        bool was_missing_predecessors = false;
-        while (op_list) {
-            current = op_list;
-            op_list = op_list->next;
-            switch (current->type) {
+        typedef d1::aggregating_functor<class_type, reserving_port_operation> handler_type;
+        friend class d1::aggregating_functor<class_type, reserving_port_operation>;
+        d1::aggregator<handler_type, reserving_port_operation> my_aggregator;
+
+        void handle_operations(reserving_port_operation* op_list) {
+            reserving_port_operation *current;
+            bool was_missing_predecessors = false;
+            while(op_list) {
+                current = op_list;
+                op_list = op_list->next;
+                switch(current->type) {
                 case reg_pred:
                     was_missing_predecessors = my_predecessors.empty();
                     my_predecessors.add(*(current->my_pred));
-                    if (was_missing_predecessors) {
-                        (void) my_join->decrement_port_count();// may try to forward
+                    if ( was_missing_predecessors ) {
+                        (void) my_join->decrement_port_count(); // may try to forward
                     }
-                    current->status.store(SUCCEEDED, std::memory_order_release);
+                    current->status.store( SUCCEEDED, std::memory_order_release);
                     break;
                 case rem_pred:
-                    if (!my_predecessors.empty()) {
+                    if ( !my_predecessors.empty() ) {
                         my_predecessors.remove(*(current->my_pred));
-                        if (my_predecessors.empty())// was the last predecessor
+                        if ( my_predecessors.empty() ) // was the last predecessor
                             my_join->increment_port_count();
                     }
                     // TODO: consider returning failure if there were no predecessors to remove
-                    current->status.store(SUCCEEDED, std::memory_order_release);
+                    current->status.store( SUCCEEDED, std::memory_order_release );
                     break;
                 case res_item:
-                    if (reserved) {
-                        current->status.store(FAILED, std::memory_order_release);
-                    } else if (my_predecessors.try_reserve(*(current->my_arg))) {
-                        reserved = true;
-                        current->status.store(SUCCEEDED, std::memory_order_release);
-                    } else {
-                        if (my_predecessors.empty()) { my_join->increment_port_count(); }
-                        current->status.store(FAILED, std::memory_order_release);
+                    if ( reserved ) {
+                        current->status.store( FAILED, std::memory_order_release);
+                    }
+                    else {
+                        bool reserve_result = false;
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+                        if (current->metainfo) {
+                            reserve_result = my_predecessors.try_reserve(*(current->my_arg),
+                                                                         *(current->metainfo));
+                        } else
+#endif
+                        {
+                            reserve_result = my_predecessors.try_reserve(*(current->my_arg));
+                        }
+                        if (reserve_result) {
+                            reserved = true;
+                            current->status.store( SUCCEEDED, std::memory_order_release);
+                        } else {
+                            if ( my_predecessors.empty() ) {
+                                my_join->increment_port_count();
+                            }
+                            current->status.store( FAILED, std::memory_order_release);
+                        }
                     }
                     break;
                 case rel_res:
                     reserved = false;
-                    my_predecessors.try_release();
-                    current->status.store(SUCCEEDED, std::memory_order_release);
+                    my_predecessors.try_release( );
+                    current->status.store( SUCCEEDED, std::memory_order_release);
                     break;
                 case con_res:
                     reserved = false;
-                    my_predecessors.try_consume();
-                    current->status.store(SUCCEEDED, std::memory_order_release);
+                    my_predecessors.try_consume( );
+                    current->status.store( SUCCEEDED, std::memory_order_release);
                     break;
+                }
             }
         }
-    }
 
-protected:
-    template <typename R, typename B>
-    friend class run_and_put_task;
-    template <typename X, typename Y>
-    friend class broadcast_cache;
-    template <typename X, typename Y>
-    friend class round_robin_cache;
-    graph_task *try_put_task(const T &) override { return nullptr; }
-
-    graph &graph_reference() const override { return my_join->graph_ref; }
-
-public:
-    //! Constructor
-    reserving_port() : my_join(nullptr), my_predecessors(this), reserved(false) {
-        my_aggregator.initialize_handler(handler_type(this));
-    }
+    protected:
+        template< typename R, typename B > friend class run_and_put_task;
+        template<typename X, typename Y> friend class broadcast_cache;
+        template<typename X, typename Y> friend class round_robin_cache;
+        graph_task* try_put_task( const T & ) override {
+            return nullptr;
+        }
 
-    // copy constructor
-    reserving_port(const reserving_port & /* other */) = delete;
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+    graph_task* try_put_task(const T&, const message_metainfo&) override { return nullptr; }
+#endif
 
-    void set_join_node_pointer(reserving_forwarding_base *join) { my_join = join; }
+        graph& graph_reference() const override {
+            return my_join->graph_ref;
+        }
 
-    //! Add a predecessor
-    bool register_predecessor(predecessor_type &src) override {
-        reserving_port_operation op_data(src, reg_pred);
-        my_aggregator.execute(&op_data);
-        return op_data.status == SUCCEEDED;
-    }
+    public:
 
-    //! Remove a predecessor
-    bool remove_predecessor(predecessor_type &src) override {
-        reserving_port_operation op_data(src, rem_pred);
-        my_aggregator.execute(&op_data);
-        return op_data.status == SUCCEEDED;
-    }
+        //! Constructor
+        reserving_port() : my_join(nullptr), my_predecessors(this), reserved(false) {
+            my_aggregator.initialize_handler(handler_type(this));
+        }
 
-    //! Reserve an item from the port
-    bool reserve(T &v) {
-        reserving_port_operation op_data(v, res_item);
-        my_aggregator.execute(&op_data);
-        return op_data.status == SUCCEEDED;
-    }
+        // copy constructor
+        reserving_port(const reserving_port& /* other */) = delete;
 
-    //! Release the port
-    void release() {
-        reserving_port_operation op_data(rel_res);
-        my_aggregator.execute(&op_data);
-    }
+        void set_join_node_pointer(reserving_forwarding_base *join) {
+            my_join = join;
+        }
 
-    //! Complete use of the port
-    void consume() {
-        reserving_port_operation op_data(con_res);
-        my_aggregator.execute(&op_data);
-    }
+        //! Add a predecessor
+        bool register_predecessor( predecessor_type &src ) override {
+            reserving_port_operation op_data(src, reg_pred);
+            my_aggregator.execute(&op_data);
+            return op_data.status == SUCCEEDED;
+        }
+
+        //! Remove a predecessor
+        bool remove_predecessor( predecessor_type &src ) override {
+            reserving_port_operation op_data(src, rem_pred);
+            my_aggregator.execute(&op_data);
+            return op_data.status == SUCCEEDED;
+        }
 
-    void reset_receiver(reset_flags f) {
-        if (f & rf_clear_edges) my_predecessors.clear();
-        else
+        //! Reserve an item from the port
+        bool reserve( T &v ) {
+            reserving_port_operation op_data(v, res_item);
+            my_aggregator.execute(&op_data);
+            return op_data.status == SUCCEEDED;
+        }
+
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+        bool reserve( T& v, message_metainfo& metainfo ) {
+            reserving_port_operation op_data(v, res_item, metainfo);
+            my_aggregator.execute(&op_data);
+            return op_data.status == SUCCEEDED;
+        }
+#endif
+
+        //! Release the port
+        void release( ) {
+            reserving_port_operation op_data(rel_res);
+            my_aggregator.execute(&op_data);
+        }
+
+        //! Complete use of the port
+        void consume( ) {
+            reserving_port_operation op_data(con_res);
+            my_aggregator.execute(&op_data);
+        }
+
+        void reset_receiver( reset_flags f) {
+            if(f & rf_clear_edges) my_predecessors.clear();
+            else
             my_predecessors.reset();
-        reserved = false;
-        __TBB_ASSERT(!(f & rf_clear_edges) || my_predecessors.empty(), "port edges not removed");
-    }
+            reserved = false;
+            __TBB_ASSERT(!(f&rf_clear_edges) || my_predecessors.empty(), "port edges not removed");
+        }
 
-private:
+    private:
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-    friend class get_graph_helper;
+        friend class get_graph_helper;
 #endif
 
-    reserving_forwarding_base *my_join;
-    reservable_predecessor_cache<T, null_mutex> my_predecessors;
-    bool reserved;
-};// reserving_port
+        reserving_forwarding_base *my_join;
+        reservable_predecessor_cache< T, null_mutex > my_predecessors;
+        bool reserved;
+    };  // reserving_port
 
-//! queueing join_port
-template <typename T>
-class queueing_port : public receiver<T>, public item_buffer<T> {
-public:
-    typedef T input_type;
-    typedef typename receiver<input_type>::predecessor_type predecessor_type;
-    typedef queueing_port<T> class_type;
+    //! queueing join_port
+    template<typename T>
+    class queueing_port : public receiver<T>, public item_buffer<T> {
+    public:
+        typedef T input_type;
+        typedef typename receiver<input_type>::predecessor_type predecessor_type;
+        typedef queueing_port<T> class_type;
 
     // ----------- Aggregator ------------
-private:
-    enum op_type { get__item, res_port, try__put_task };
+    private:
+        enum op_type { get__item, res_port, try__put_task
+        };
 
-    class queueing_port_operation : public aggregated_operation<queueing_port_operation> {
-    public:
-        char type;
-        T my_val;
-        T *my_arg;
-        graph_task *bypass_t;
-        // constructor for value parameter
-        queueing_port_operation(const T &e, op_type t) : type(char(t)), my_val(e), bypass_t(nullptr) {}
-        // constructor for pointer parameter
-        queueing_port_operation(const T *p, op_type t)
-            : type(char(t)), my_arg(const_cast<T *>(p)), bypass_t(nullptr) {}
-        // constructor with no parameter
-        queueing_port_operation(op_type t) : type(char(t)), bypass_t(nullptr) {}
-    };
+        class queueing_port_operation : public d1::aggregated_operation<queueing_port_operation> {
+        public:
+            char type;
+            T my_val;
+            T* my_arg;
+            graph_task* bypass_t;
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+            message_metainfo* metainfo;
+#endif
+            // constructor for value parameter
+            queueing_port_operation(const T& e, op_type t __TBB_FLOW_GRAPH_METAINFO_ARG(const message_metainfo& info))
+                : type(char(t)), my_val(e), my_arg(nullptr)
+                , bypass_t(nullptr)
+                __TBB_FLOW_GRAPH_METAINFO_ARG(metainfo(const_cast<message_metainfo*>(&info)))
+            {}
+            // constructor for pointer parameter
+            queueing_port_operation(const T* p, op_type t __TBB_FLOW_GRAPH_METAINFO_ARG(message_metainfo& info)) :
+                type(char(t)), my_arg(const_cast<T*>(p))
+                , bypass_t(nullptr)
+                __TBB_FLOW_GRAPH_METAINFO_ARG(metainfo(&info))
+            {}
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+            queueing_port_operation(const T* p, op_type t)
+                : type(char(t)), my_arg(const_cast<T*>(p)), bypass_t(nullptr), metainfo(nullptr)
+            {}
+#endif
+            // constructor with no parameter
+            queueing_port_operation(op_type t) : type(char(t)), my_arg(nullptr)
+                , bypass_t(nullptr)
+                __TBB_FLOW_GRAPH_METAINFO_ARG(metainfo(nullptr))
+            {}
+        };
 
-    typedef aggregating_functor<class_type, queueing_port_operation> handler_type;
-    friend class aggregating_functor<class_type, queueing_port_operation>;
-    aggregator<handler_type, queueing_port_operation> my_aggregator;
-
-    void handle_operations(queueing_port_operation *op_list) {
-        queueing_port_operation *current;
-        bool was_empty;
-        while (op_list) {
-            current = op_list;
-            op_list = op_list->next;
-            switch (current->type) {
+        typedef d1::aggregating_functor<class_type, queueing_port_operation> handler_type;
+        friend class d1::aggregating_functor<class_type, queueing_port_operation>;
+        d1::aggregator<handler_type, queueing_port_operation> my_aggregator;
+
+        void handle_operations(queueing_port_operation* op_list) {
+            queueing_port_operation *current;
+            bool was_empty;
+            while(op_list) {
+                current = op_list;
+                op_list = op_list->next;
+                switch(current->type) {
                 case try__put_task: {
-                    graph_task *rtask = nullptr;
-                    was_empty = this->buffer_empty();
-                    this->push_back(current->my_val);
-                    if (was_empty) rtask = my_join->decrement_port_count(false);
-                    else
-                        rtask = SUCCESSFULLY_ENQUEUED;
-                    current->bypass_t = rtask;
-                    current->status.store(SUCCEEDED, std::memory_order_release);
-                } break;
+                        graph_task* rtask = nullptr;
+                        was_empty = this->buffer_empty();
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+                        __TBB_ASSERT(current->metainfo, nullptr);
+                        this->push_back(current->my_val, *(current->metainfo));
+#else
+                        this->push_back(current->my_val);
+#endif
+                        if (was_empty) rtask = my_join->decrement_port_count(false);
+                        else
+                            rtask = SUCCESSFULLY_ENQUEUED;
+                        current->bypass_t = rtask;
+                        current->status.store( SUCCEEDED, std::memory_order_release);
+                    }
+                    break;
                 case get__item:
-                    if (!this->buffer_empty()) {
+                    if(!this->buffer_empty()) {
+                        __TBB_ASSERT(current->my_arg, nullptr);
                         *(current->my_arg) = this->front();
-                        current->status.store(SUCCEEDED, std::memory_order_release);
-                    } else {
-                        current->status.store(FAILED, std::memory_order_release);
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+                        if (current->metainfo) {
+                            *(current->metainfo) = this->front_metainfo();
+                        }
+#endif
+                        current->status.store( SUCCEEDED, std::memory_order_release);
+                    }
+                    else {
+                        current->status.store( FAILED, std::memory_order_release);
                     }
                     break;
                 case res_port:
                     __TBB_ASSERT(this->my_item_valid(this->my_head), "No item to reset");
                     this->destroy_front();
-                    if (this->my_item_valid(this->my_head)) { (void) my_join->decrement_port_count(true); }
-                    current->status.store(SUCCEEDED, std::memory_order_release);
+                    if(this->my_item_valid(this->my_head)) {
+                        (void)my_join->decrement_port_count(true);
+                    }
+                    current->status.store( SUCCEEDED, std::memory_order_release);
                     break;
+                }
             }
         }
-    }
     // ------------ End Aggregator ---------------
 
-protected:
-    template <typename R, typename B>
-    friend class run_and_put_task;
-    template <typename X, typename Y>
-    friend class broadcast_cache;
-    template <typename X, typename Y>
-    friend class round_robin_cache;
-    graph_task *try_put_task(const T &v) override {
-        queueing_port_operation op_data(v, try__put_task);
-        my_aggregator.execute(&op_data);
-        __TBB_ASSERT(op_data.status == SUCCEEDED || !op_data.bypass_t, "inconsistent return from aggregator");
-        if (!op_data.bypass_t) return SUCCESSFULLY_ENQUEUED;
-        return op_data.bypass_t;
-    }
+    protected:
+        template< typename R, typename B > friend class run_and_put_task;
+        template<typename X, typename Y> friend class broadcast_cache;
+        template<typename X, typename Y> friend class round_robin_cache;
+
+    private:
+        graph_task* try_put_task_impl(const T& v __TBB_FLOW_GRAPH_METAINFO_ARG(const message_metainfo& metainfo)) {
+            queueing_port_operation op_data(v, try__put_task __TBB_FLOW_GRAPH_METAINFO_ARG(metainfo));
+            my_aggregator.execute(&op_data);
+            __TBB_ASSERT(op_data.status == SUCCEEDED || !op_data.bypass_t, "inconsistent return from aggregator");
+            if(!op_data.bypass_t) return SUCCESSFULLY_ENQUEUED;
+            return op_data.bypass_t;
+        }
 
-    graph &graph_reference() const override { return my_join->graph_ref; }
+    protected:
+        graph_task* try_put_task(const T &v) override {
+            return try_put_task_impl(v __TBB_FLOW_GRAPH_METAINFO_ARG(message_metainfo{}));
+        }
 
-public:
-    //! Constructor
-    queueing_port() : item_buffer<T>() {
-        my_join = nullptr;
-        my_aggregator.initialize_handler(handler_type(this));
-    }
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+        graph_task* try_put_task(const T& v, const message_metainfo& metainfo) override {
+            return try_put_task_impl(v, metainfo);
+        }
+#endif
 
-    //! copy constructor
-    queueing_port(const queueing_port & /* other */) = delete;
+        graph& graph_reference() const override {
+            return my_join->graph_ref;
+        }
 
-    //! record parent for tallying available items
-    void set_join_node_pointer(queueing_forwarding_base *join) { my_join = join; }
+    public:
 
-    bool get_item(T &v) {
-        queueing_port_operation op_data(&v, get__item);
-        my_aggregator.execute(&op_data);
-        return op_data.status == SUCCEEDED;
-    }
+        //! Constructor
+        queueing_port() : item_buffer<T>() {
+            my_join = nullptr;
+            my_aggregator.initialize_handler(handler_type(this));
+        }
 
-    // reset_port is called when item is accepted by successor, but
-    // is initiated by join_node.
-    void reset_port() {
-        queueing_port_operation op_data(res_port);
-        my_aggregator.execute(&op_data);
-        return;
-    }
+        //! copy constructor
+        queueing_port(const queueing_port& /* other */) = delete;
+
+        //! record parent for tallying available items
+        void set_join_node_pointer(queueing_forwarding_base *join) {
+            my_join = join;
+        }
 
-    void reset_receiver(reset_flags) { item_buffer<T>::reset(); }
+        bool get_item( T &v ) {
+            queueing_port_operation op_data(&v, get__item);
+            my_aggregator.execute(&op_data);
+            return op_data.status == SUCCEEDED;
+        }
 
-private:
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+        bool get_item( T& v, message_metainfo& metainfo ) {
+            queueing_port_operation op_data(&v, get__item, metainfo);
+            my_aggregator.execute(&op_data);
+            return op_data.status == SUCCEEDED;
+        }
+#endif
+
+        // reset_port is called when item is accepted by successor, but
+        // is initiated by join_node.
+        void reset_port() {
+            queueing_port_operation op_data(res_port);
+            my_aggregator.execute(&op_data);
+            return;
+        }
+
+        void reset_receiver(reset_flags) {
+            item_buffer<T>::reset();
+        }
+
+    private:
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-    friend class get_graph_helper;
+        friend class get_graph_helper;
 #endif
 
-    queueing_forwarding_base *my_join;
-};// queueing_port
+        queueing_forwarding_base *my_join;
+    };  // queueing_port
 
 #include "_flow_graph_tagged_buffer_impl.h"
 
-template <typename K>
-struct count_element {
-    K my_key;
-    size_t my_value;
-};
-
-// method to access the key in the counting table
-// the ref has already been removed from K
-template <typename K>
-struct key_to_count_functor {
-    typedef count_element<K> table_item_type;
-    const K &operator()(const table_item_type &v) { return v.my_key; }
-};
-
-// the ports can have only one template parameter.  We wrap the types needed in
-// a traits type
-template <class TraitsType>
-class key_matching_port : public receiver<typename TraitsType::T>,
-                          public hash_buffer<typename TraitsType::K, typename TraitsType::T,
-                                             typename TraitsType::TtoK, typename TraitsType::KHash> {
-public:
-    typedef TraitsType traits;
-    typedef key_matching_port<traits> class_type;
-    typedef typename TraitsType::T input_type;
-    typedef typename TraitsType::K key_type;
-    typedef typename std::decay<key_type>::type noref_key_type;
-    typedef typename receiver<input_type>::predecessor_type predecessor_type;
-    typedef typename TraitsType::TtoK type_to_key_func_type;
-    typedef typename TraitsType::KHash hash_compare_type;
-    typedef hash_buffer<key_type, input_type, type_to_key_func_type, hash_compare_type> buffer_type;
-
-private:
-    // ----------- Aggregator ------------
-private:
-    enum op_type { try__put, get__item, res_port };
+    template<typename K>
+    struct count_element {
+        K my_key;
+        size_t my_value;
+    };
 
-    class key_matching_port_operation : public aggregated_operation<key_matching_port_operation> {
-    public:
-        char type;
-        input_type my_val;
-        input_type *my_arg;
-        // constructor for value parameter
-        key_matching_port_operation(const input_type &e, op_type t) : type(char(t)), my_val(e) {}
-        // constructor for pointer parameter
-        key_matching_port_operation(const input_type *p, op_type t)
-            : type(char(t)), my_arg(const_cast<input_type *>(p)) {}
-        // constructor with no parameter
-        key_matching_port_operation(op_type t) : type(char(t)) {}
+    // method to access the key in the counting table
+    // the ref has already been removed from K
+    template< typename K >
+    struct key_to_count_functor {
+        typedef count_element<K> table_item_type;
+        const K& operator()(const table_item_type& v) { return v.my_key; }
+    };
+
+    template <typename K, typename T, typename TtoK, typename KHash>
+    struct key_matching_port_base {
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+        using type = metainfo_hash_buffer<K, T, TtoK, KHash>;
+#else
+        using type = hash_buffer<K, T, TtoK, KHash>;
+#endif
     };
 
-    typedef aggregating_functor<class_type, key_matching_port_operation> handler_type;
-    friend class aggregating_functor<class_type, key_matching_port_operation>;
-    aggregator<handler_type, key_matching_port_operation> my_aggregator;
+    // the ports can have only one template parameter.  We wrap the types needed in
+    // a traits type
+    template< class TraitsType >
+    class key_matching_port :
+        public receiver<typename TraitsType::T>,
+        public key_matching_port_base< typename TraitsType::K, typename TraitsType::T, typename TraitsType::TtoK,
+                                       typename TraitsType::KHash >::type
+    {
+    public:
+        typedef TraitsType traits;
+        typedef key_matching_port<traits> class_type;
+        typedef typename TraitsType::T input_type;
+        typedef typename TraitsType::K key_type;
+        typedef typename std::decay<key_type>::type noref_key_type;
+        typedef typename receiver<input_type>::predecessor_type predecessor_type;
+        typedef typename TraitsType::TtoK type_to_key_func_type;
+        typedef typename TraitsType::KHash hash_compare_type;
+        typedef typename key_matching_port_base<key_type, input_type, type_to_key_func_type, hash_compare_type>::type buffer_type;
+
+    private:
+// ----------- Aggregator ------------
+    private:
+        enum op_type { try__put, get__item, res_port
+        };
+
+        class key_matching_port_operation : public d1::aggregated_operation<key_matching_port_operation> {
+        public:
+            char type;
+            input_type my_val;
+            input_type *my_arg;
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+            message_metainfo* metainfo = nullptr;
+#endif
+            // constructor for value parameter
+            key_matching_port_operation(const input_type& e, op_type t
+                                        __TBB_FLOW_GRAPH_METAINFO_ARG(const message_metainfo& info))
+                : type(char(t)), my_val(e), my_arg(nullptr)
+                  __TBB_FLOW_GRAPH_METAINFO_ARG(metainfo(const_cast<message_metainfo*>(&info))) {}
+
+            // constructor for pointer parameter
+            key_matching_port_operation(const input_type* p, op_type t
+                                        __TBB_FLOW_GRAPH_METAINFO_ARG(message_metainfo& info))
+                : type(char(t)), my_arg(const_cast<input_type*>(p))
+                  __TBB_FLOW_GRAPH_METAINFO_ARG(metainfo(&info)) {}
+
+            // constructor with no parameter
+            key_matching_port_operation(op_type t) : type(char(t)), my_arg(nullptr) {}
+        };
+
+        typedef d1::aggregating_functor<class_type, key_matching_port_operation> handler_type;
+        friend class d1::aggregating_functor<class_type, key_matching_port_operation>;
+        d1::aggregator<handler_type, key_matching_port_operation> my_aggregator;
 
-    void handle_operations(key_matching_port_operation *op_list) {
-        key_matching_port_operation *current;
-        while (op_list) {
-            current = op_list;
-            op_list = op_list->next;
-            switch (current->type) {
+        void handle_operations(key_matching_port_operation* op_list) {
+            key_matching_port_operation *current;
+            while(op_list) {
+                current = op_list;
+                op_list = op_list->next;
+                switch(current->type) {
                 case try__put: {
-                    bool was_inserted = this->insert_with_key(current->my_val);
-                    // return failure if a duplicate insertion occurs
-                    current->status.store(was_inserted ? SUCCEEDED : FAILED, std::memory_order_release);
-                } break;
-                case get__item:
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+                        __TBB_ASSERT(current->metainfo, nullptr);
+                        bool was_inserted = this->insert_with_key(current->my_val, *(current->metainfo));
+#else
+                        bool was_inserted = this->insert_with_key(current->my_val);
+#endif
+                        // return failure if a duplicate insertion occurs
+                        current->status.store( was_inserted ? SUCCEEDED : FAILED, std::memory_order_release);
+                    }
+                    break;
+                case get__item: {
                     // use current_key from FE for item
-                    if (!this->find_with_key(my_join->current_key, *(current->my_arg))) {
+                    __TBB_ASSERT(current->my_arg, nullptr);
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+                    __TBB_ASSERT(current->metainfo, nullptr);
+                    bool find_result = this->find_with_key(my_join->current_key, *(current->my_arg),
+                                                           *(current->metainfo));
+#else
+                    bool find_result = this->find_with_key(my_join->current_key, *(current->my_arg));
+#endif
+#if TBB_USE_DEBUG
+                    if (!find_result) {
                         __TBB_ASSERT(false, "Failed to find item corresponding to current_key.");
                     }
-                    current->status.store(SUCCEEDED, std::memory_order_release);
+#else
+                    tbb::detail::suppress_unused_warning(find_result);
+#endif
+                    current->status.store( SUCCEEDED, std::memory_order_release);
+                    }
                     break;
                 case res_port:
                     // use current_key from FE for item
                     this->delete_with_key(my_join->current_key);
-                    current->status.store(SUCCEEDED, std::memory_order_release);
+                    current->status.store( SUCCEEDED, std::memory_order_release);
                     break;
+                }
             }
         }
-    }
-    // ------------ End Aggregator ---------------
-protected:
-    template <typename R, typename B>
-    friend class run_and_put_task;
-    template <typename X, typename Y>
-    friend class broadcast_cache;
-    template <typename X, typename Y>
-    friend class round_robin_cache;
-    graph_task *try_put_task(const input_type &v) override {
-        key_matching_port_operation op_data(v, try__put);
-        graph_task *rtask = nullptr;
-        my_aggregator.execute(&op_data);
-        if (op_data.status == SUCCEEDED) {
-            rtask = my_join->increment_key_count((*(this->get_key_func()))(v));// may spawn
-            // rtask has to reflect the return status of the try_put
-            if (!rtask) rtask = SUCCESSFULLY_ENQUEUED;
-        }
-        return rtask;
-    }
+// ------------ End Aggregator ---------------
+    protected:
+        template< typename R, typename B > friend class run_and_put_task;
+        template<typename X, typename Y> friend class broadcast_cache;
+        template<typename X, typename Y> friend class round_robin_cache;
+    private:
+        graph_task* try_put_task_impl(const input_type& v __TBB_FLOW_GRAPH_METAINFO_ARG(const message_metainfo& metainfo)) {
+            key_matching_port_operation op_data(v, try__put __TBB_FLOW_GRAPH_METAINFO_ARG(metainfo));
+            graph_task* rtask = nullptr;
+            my_aggregator.execute(&op_data);
+            if(op_data.status == SUCCEEDED) {
+                rtask = my_join->increment_key_count((*(this->get_key_func()))(v)); // may spawn
+                // rtask has to reflect the return status of the try_put
+                if(!rtask) rtask = SUCCESSFULLY_ENQUEUED;
+            }
+            return rtask;
+        }
+    protected:
+        graph_task* try_put_task(const input_type& v) override {
+            return try_put_task_impl(v __TBB_FLOW_GRAPH_METAINFO_ARG(message_metainfo{}));
+        }
+
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+        graph_task* try_put_task(const input_type& v, const message_metainfo& metainfo) override {
+            return try_put_task_impl(v, metainfo);
+        }
+#endif
 
-    graph &graph_reference() const override { return my_join->graph_ref; }
+        graph& graph_reference() const override {
+            return my_join->graph_ref;
+        }
 
-public:
-    key_matching_port() : receiver<input_type>(), buffer_type() {
-        my_join = nullptr;
-        my_aggregator.initialize_handler(handler_type(this));
-    }
+    public:
+
+        key_matching_port() : receiver<input_type>(), buffer_type() {
+            my_join = nullptr;
+            my_aggregator.initialize_handler(handler_type(this));
+        }
 
-    // copy constructor
-    key_matching_port(const key_matching_port & /*other*/) = delete;
+        // copy constructor
+        key_matching_port(const key_matching_port& /*other*/) = delete;
 #if __INTEL_COMPILER <= 2021
-    // Suppress superfluous diagnostic about virtual keyword absence in a destructor of an inherited
-    // class while the parent class has the virtual keyword for the destrocutor.
-    virtual
+        // Suppress superfluous diagnostic about virtual keyword absence in a destructor of an inherited
+        // class while the parent class has the virtual keyword for the destrocutor.
+        virtual
 #endif
-            ~key_matching_port() {
-    }
+        ~key_matching_port() { }
 
-    void set_join_node_pointer(forwarding_base *join) {
-        my_join = dynamic_cast<matching_forwarding_base<key_type> *>(join);
-    }
+        void set_join_node_pointer(forwarding_base *join) {
+            my_join = dynamic_cast<matching_forwarding_base<key_type>*>(join);
+        }
 
-    void set_my_key_func(type_to_key_func_type *f) { this->set_key_func(f); }
+        void set_my_key_func(type_to_key_func_type *f) { this->set_key_func(f); }
 
-    type_to_key_func_type *get_my_key_func() { return this->get_key_func(); }
+        type_to_key_func_type* get_my_key_func() { return this->get_key_func(); }
 
-    bool get_item(input_type &v) {
-        // aggregator uses current_key from FE for Key
-        key_matching_port_operation op_data(&v, get__item);
-        my_aggregator.execute(&op_data);
-        return op_data.status == SUCCEEDED;
-    }
+        bool get_item( input_type &v ) {
+            // aggregator uses current_key from FE for Key
+            key_matching_port_operation op_data(&v, get__item);
+            my_aggregator.execute(&op_data);
+            return op_data.status == SUCCEEDED;
+        }
 
-    // reset_port is called when item is accepted by successor, but
-    // is initiated by join_node.
-    void reset_port() {
-        key_matching_port_operation op_data(res_port);
-        my_aggregator.execute(&op_data);
-        return;
-    }
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+        bool get_item( input_type& v, message_metainfo& metainfo ) {
+            // aggregator uses current_key from FE for Key
+            key_matching_port_operation op_data(&v, get__item, metainfo);
+            my_aggregator.execute(&op_data);
+            return op_data.status == SUCCEEDED;
+        }
+#endif
 
-    void reset_receiver(reset_flags) { buffer_type::reset(); }
+        // reset_port is called when item is accepted by successor, but
+        // is initiated by join_node.
+        void reset_port() {
+            key_matching_port_operation op_data(res_port);
+            my_aggregator.execute(&op_data);
+            return;
+        }
 
-private:
-    // my_join forwarding base used to count number of inputs that
-    // received key.
-    matching_forwarding_base<key_type> *my_join;
-};// key_matching_port
+        void reset_receiver(reset_flags ) {
+            buffer_type::reset();
+        }
 
-using namespace graph_policy_namespace;
+    private:
+        // my_join forwarding base used to count number of inputs that
+        // received key.
+        matching_forwarding_base<key_type> *my_join;
+    };  // key_matching_port
 
-template <typename JP, typename InputTuple, typename OutputTuple>
-class join_node_base;
+    using namespace graph_policy_namespace;
 
-//! join_node_FE : implements input port policy
-template <typename JP, typename InputTuple, typename OutputTuple>
-class join_node_FE;
+    template<typename JP, typename InputTuple, typename OutputTuple>
+    class join_node_base;
 
-template <typename InputTuple, typename OutputTuple>
-class join_node_FE<reserving, InputTuple, OutputTuple> : public reserving_forwarding_base {
-public:
-    static const int N = std::tuple_size<OutputTuple>::value;
-    typedef OutputTuple output_type;
-    typedef InputTuple input_type;
-    typedef join_node_base<reserving, InputTuple, OutputTuple> base_node_type;// for forwarding
+    //! join_node_FE : implements input port policy
+    template<typename JP, typename InputTuple, typename OutputTuple>
+    class join_node_FE;
 
-    join_node_FE(graph &g) : reserving_forwarding_base(g), my_node(nullptr) {
-        ports_with_no_inputs = N;
-        join_helper<N>::set_join_node_pointer(my_inputs, this);
-    }
+    template<typename InputTuple, typename OutputTuple>
+    class join_node_FE<reserving, InputTuple, OutputTuple> : public reserving_forwarding_base {
+    private:
+        static const int N = std::tuple_size<OutputTuple>::value;
+        typedef OutputTuple output_type;
+        typedef InputTuple input_type;
+        typedef join_node_base<reserving, InputTuple, OutputTuple> base_node_type; // for forwarding
+    public:
+        join_node_FE(graph &g) : reserving_forwarding_base(g), my_node(nullptr) {
+            ports_with_no_inputs = N;
+            join_helper<N>::set_join_node_pointer(my_inputs, this);
+        }
 
-    join_node_FE(const join_node_FE &other)
-        : reserving_forwarding_base((other.reserving_forwarding_base::graph_ref)), my_node(nullptr) {
-        ports_with_no_inputs = N;
-        join_helper<N>::set_join_node_pointer(my_inputs, this);
-    }
+        join_node_FE(const join_node_FE& other) : reserving_forwarding_base((other.reserving_forwarding_base::graph_ref)), my_node(nullptr) {
+            ports_with_no_inputs = N;
+            join_helper<N>::set_join_node_pointer(my_inputs, this);
+        }
 
-    void set_my_node(base_node_type *new_my_node) { my_node = new_my_node; }
+        void set_my_node(base_node_type *new_my_node) { my_node = new_my_node; }
 
-    void increment_port_count() override { ++ports_with_no_inputs; }
+       void increment_port_count() override {
+            ++ports_with_no_inputs;
+        }
 
-    // if all input_ports have predecessors, spawn forward to try and consume tuples
-    graph_task *decrement_port_count() override {
-        if (ports_with_no_inputs.fetch_sub(1) == 1) {
-            if (is_graph_active(this->graph_ref)) {
-                small_object_allocator allocator {};
-                typedef forward_task_bypass<base_node_type> task_type;
-                graph_task *t = allocator.new_object<task_type>(graph_ref, allocator, *my_node);
-                graph_ref.reserve_wait();
-                spawn_in_graph_arena(this->graph_ref, *t);
+        // if all input_ports have predecessors, spawn forward to try and consume tuples
+        graph_task* decrement_port_count() override {
+            if(ports_with_no_inputs.fetch_sub(1) == 1) {
+                if(is_graph_active(this->graph_ref)) {
+                    d1::small_object_allocator allocator{};
+                    typedef forward_task_bypass<base_node_type> task_type;
+                    graph_task* t = allocator.new_object<task_type>(graph_ref, allocator, *my_node);
+                    spawn_in_graph_arena(this->graph_ref, *t);
+                }
             }
+            return nullptr;
         }
-        return nullptr;
-    }
 
-    input_type &input_ports() { return my_inputs; }
+        input_type &input_ports() { return my_inputs; }
 
-protected:
-    void reset(reset_flags f) {
-        // called outside of parallel contexts
-        ports_with_no_inputs = N;
-        join_helper<N>::reset_inputs(my_inputs, f);
-    }
+    protected:
 
-    // all methods on input ports should be called under mutual exclusion from join_node_base.
+        void reset(  reset_flags f) {
+            // called outside of parallel contexts
+            ports_with_no_inputs = N;
+            join_helper<N>::reset_inputs(my_inputs, f);
+        }
 
-    bool tuple_build_may_succeed() { return !ports_with_no_inputs; }
+        // all methods on input ports should be called under mutual exclusion from join_node_base.
 
-    bool try_to_make_tuple(output_type &out) {
-        if (ports_with_no_inputs) return false;
-        return join_helper<N>::reserve(my_inputs, out);
-    }
+        bool tuple_build_may_succeed() {
+            return !ports_with_no_inputs;
+        }
 
-    void tuple_accepted() { join_helper<N>::consume_reservations(my_inputs); }
-    void tuple_rejected() { join_helper<N>::release_reservations(my_inputs); }
-
-    input_type my_inputs;
-    base_node_type *my_node;
-    std::atomic<std::size_t> ports_with_no_inputs;
-};// join_node_FE<reserving, ... >
-
-template <typename InputTuple, typename OutputTuple>
-class join_node_FE<queueing, InputTuple, OutputTuple> : public queueing_forwarding_base {
-public:
-    static const int N = std::tuple_size<OutputTuple>::value;
-    typedef OutputTuple output_type;
-    typedef InputTuple input_type;
-    typedef join_node_base<queueing, InputTuple, OutputTuple> base_node_type;// for forwarding
-
-    join_node_FE(graph &g) : queueing_forwarding_base(g), my_node(nullptr) {
-        ports_with_no_items = N;
-        join_helper<N>::set_join_node_pointer(my_inputs, this);
-    }
+        bool try_to_make_tuple(output_type &out) {
+            if(ports_with_no_inputs) return false;
+            return join_helper<N>::reserve(my_inputs, out);
+        }
 
-    join_node_FE(const join_node_FE &other)
-        : queueing_forwarding_base((other.queueing_forwarding_base::graph_ref)), my_node(nullptr) {
-        ports_with_no_items = N;
-        join_helper<N>::set_join_node_pointer(my_inputs, this);
-    }
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+        bool try_to_make_tuple(output_type &out, message_metainfo& metainfo) {
+            if (ports_with_no_inputs) return false;
+            return join_helper<N>::reserve(my_inputs, out, metainfo);
+        }
+#endif
+
+        void tuple_accepted() {
+            join_helper<N>::consume_reservations(my_inputs);
+        }
+        void tuple_rejected() {
+            join_helper<N>::release_reservations(my_inputs);
+        }
+
+        input_type my_inputs;
+        base_node_type *my_node;
+        std::atomic<std::size_t> ports_with_no_inputs;
+    };  // join_node_FE<reserving, ... >
+
+    template<typename InputTuple, typename OutputTuple>
+    class join_node_FE<queueing, InputTuple, OutputTuple> : public queueing_forwarding_base {
+    public:
+        static const int N = std::tuple_size<OutputTuple>::value;
+        typedef OutputTuple output_type;
+        typedef InputTuple input_type;
+        typedef join_node_base<queueing, InputTuple, OutputTuple> base_node_type; // for forwarding
+
+        join_node_FE(graph &g) : queueing_forwarding_base(g), my_node(nullptr) {
+            ports_with_no_items = N;
+            join_helper<N>::set_join_node_pointer(my_inputs, this);
+        }
 
-    // needed for forwarding
-    void set_my_node(base_node_type *new_my_node) { my_node = new_my_node; }
-
-    void reset_port_count() { ports_with_no_items = N; }
-
-    // if all input_ports have items, spawn forward to try and consume tuples
-    graph_task *decrement_port_count(bool handle_task) override {
-        if (ports_with_no_items.fetch_sub(1) == 1) {
-            if (is_graph_active(this->graph_ref)) {
-                small_object_allocator allocator {};
-                typedef forward_task_bypass<base_node_type> task_type;
-                graph_task *t = allocator.new_object<task_type>(graph_ref, allocator, *my_node);
-                graph_ref.reserve_wait();
-                if (!handle_task) return t;
-                spawn_in_graph_arena(this->graph_ref, *t);
+        join_node_FE(const join_node_FE& other) : queueing_forwarding_base((other.queueing_forwarding_base::graph_ref)), my_node(nullptr) {
+            ports_with_no_items = N;
+            join_helper<N>::set_join_node_pointer(my_inputs, this);
+        }
+
+        // needed for forwarding
+        void set_my_node(base_node_type *new_my_node) { my_node = new_my_node; }
+
+        void reset_port_count() {
+            ports_with_no_items = N;
+        }
+
+        // if all input_ports have items, spawn forward to try and consume tuples
+        graph_task* decrement_port_count(bool handle_task) override
+        {
+            if(ports_with_no_items.fetch_sub(1) == 1) {
+                if(is_graph_active(this->graph_ref)) {
+                    d1::small_object_allocator allocator{};
+                    typedef forward_task_bypass<base_node_type> task_type;
+                    graph_task* t = allocator.new_object<task_type>(graph_ref, allocator, *my_node);
+                    if( !handle_task )
+                        return t;
+                    spawn_in_graph_arena(this->graph_ref, *t);
+                }
             }
+            return nullptr;
         }
-        return nullptr;
-    }
 
-    input_type &input_ports() { return my_inputs; }
+        input_type &input_ports() { return my_inputs; }
 
-protected:
-    void reset(reset_flags f) {
-        reset_port_count();
-        join_helper<N>::reset_inputs(my_inputs, f);
-    }
+    protected:
 
-    // all methods on input ports should be called under mutual exclusion from join_node_base.
+        void reset(  reset_flags f) {
+            reset_port_count();
+            join_helper<N>::reset_inputs(my_inputs, f );
+        }
 
-    bool tuple_build_may_succeed() { return !ports_with_no_items; }
+        // all methods on input ports should be called under mutual exclusion from join_node_base.
 
-    bool try_to_make_tuple(output_type &out) {
-        if (ports_with_no_items) return false;
-        return join_helper<N>::get_items(my_inputs, out);
-    }
+        bool tuple_build_may_succeed() {
+            return !ports_with_no_items;
+        }
 
-    void tuple_accepted() {
-        reset_port_count();
-        join_helper<N>::reset_ports(my_inputs);
-    }
-    void tuple_rejected() {
-        // nothing to do.
-    }
+        bool try_to_make_tuple(output_type &out) {
+            if(ports_with_no_items) return false;
+            return join_helper<N>::get_items(my_inputs, out);
+        }
 
-    input_type my_inputs;
-    base_node_type *my_node;
-    std::atomic<std::size_t> ports_with_no_items;
-};// join_node_FE<queueing, ...>
-
-// key_matching join front-end.
-template <typename InputTuple, typename OutputTuple, typename K, typename KHash>
-class join_node_FE<key_matching<K, KHash>, InputTuple, OutputTuple>
-    : public matching_forwarding_base<K>,
-      // buffer of key value counts
-      public hash_buffer<                    // typedefed below to key_to_count_buffer_type
-              typename std::decay<K>::type &,// force ref type on K
-              count_element<typename std::decay<K>::type>,
-              type_to_key_function_body<count_element<typename std::decay<K>::type>,
-                                        typename std::decay<K>::type &>,
-              KHash>,
-      // buffer of output items
-      public item_buffer<OutputTuple> {
-public:
-    static const int N = std::tuple_size<OutputTuple>::value;
-    typedef OutputTuple output_type;
-    typedef InputTuple input_type;
-    typedef K key_type;
-    typedef typename std::decay<key_type>::type unref_key_type;
-    typedef KHash key_hash_compare;
-    // must use K without ref.
-    typedef count_element<unref_key_type> count_element_type;
-    // method that lets us refer to the key of this type.
-    typedef key_to_count_functor<unref_key_type> key_to_count_func;
-    typedef type_to_key_function_body<count_element_type, unref_key_type &> TtoK_function_body_type;
-    typedef type_to_key_function_body_leaf<count_element_type, unref_key_type &, key_to_count_func>
-            TtoK_function_body_leaf_type;
-    // this is the type of the special table that keeps track of the number of discrete
-    // elements corresponding to each key that we've seen.
-    typedef hash_buffer<unref_key_type &, count_element_type, TtoK_function_body_type, key_hash_compare>
-            key_to_count_buffer_type;
-    typedef item_buffer<output_type> output_buffer_type;
-    typedef join_node_base<key_matching<key_type, key_hash_compare>, InputTuple, OutputTuple>
-            base_node_type;// for forwarding
-    typedef matching_forwarding_base<key_type> forwarding_base_type;
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+        bool try_to_make_tuple(output_type &out, message_metainfo& metainfo) {
+            if(ports_with_no_items) return false;
+            return join_helper<N>::get_items(my_inputs, out, metainfo);
+        }
+#endif
 
-    // ----------- Aggregator ------------
-    // the aggregator is only needed to serialize the access to the hash table.
-    // and the output_buffer_type base class
-private:
-    enum op_type { res_count, inc_count, may_succeed, try_make };
-    typedef join_node_FE<key_matching<key_type, key_hash_compare>, InputTuple, OutputTuple> class_type;
+        void tuple_accepted() {
+            reset_port_count();
+            join_helper<N>::reset_ports(my_inputs);
+        }
+        void tuple_rejected() {
+            // nothing to do.
+        }
 
-    class key_matching_FE_operation : public aggregated_operation<key_matching_FE_operation> {
+        input_type my_inputs;
+        base_node_type *my_node;
+        std::atomic<std::size_t> ports_with_no_items;
+    };  // join_node_FE<queueing, ...>
+
+    // key_matching join front-end.
+    template<typename InputTuple, typename OutputTuple, typename K, typename KHash>
+    class join_node_FE<key_matching<K,KHash>, InputTuple, OutputTuple> : public matching_forwarding_base<K>,
+             // buffer of key value counts
+              public hash_buffer<   // typedefed below to key_to_count_buffer_type
+                  typename std::decay<K>::type&,        // force ref type on K
+                  count_element<typename std::decay<K>::type>,
+                  type_to_key_function_body<
+                      count_element<typename std::decay<K>::type>,
+                      typename std::decay<K>::type& >,
+                  KHash >,
+             // buffer of output items
+             public item_buffer<OutputTuple> {
     public:
-        char type;
-        unref_key_type my_val;
-        output_type *my_output;
-        graph_task *bypass_t;
-        // constructor for value parameter
-        key_matching_FE_operation(const unref_key_type &e, op_type t)
-            : type(char(t)), my_val(e), my_output(nullptr), bypass_t(nullptr) {}
-        key_matching_FE_operation(output_type *p, op_type t)
-            : type(char(t)), my_output(p), bypass_t(nullptr) {}
-        // constructor with no parameter
-        key_matching_FE_operation(op_type t) : type(char(t)), my_output(nullptr), bypass_t(nullptr) {}
-    };
+        static const int N = std::tuple_size<OutputTuple>::value;
+        typedef OutputTuple output_type;
+        typedef InputTuple input_type;
+        typedef K key_type;
+        typedef typename std::decay<key_type>::type unref_key_type;
+        typedef KHash key_hash_compare;
+        // must use K without ref.
+        typedef count_element<unref_key_type> count_element_type;
+        // method that lets us refer to the key of this type.
+        typedef key_to_count_functor<unref_key_type> key_to_count_func;
+        typedef type_to_key_function_body< count_element_type, unref_key_type&> TtoK_function_body_type;
+        typedef type_to_key_function_body_leaf<count_element_type, unref_key_type&, key_to_count_func> TtoK_function_body_leaf_type;
+        // this is the type of the special table that keeps track of the number of discrete
+        // elements corresponding to each key that we've seen.
+        typedef hash_buffer< unref_key_type&, count_element_type, TtoK_function_body_type, key_hash_compare >
+                 key_to_count_buffer_type;
+        typedef item_buffer<output_type> output_buffer_type;
+        typedef join_node_base<key_matching<key_type,key_hash_compare>, InputTuple, OutputTuple> base_node_type; // for forwarding
+        typedef matching_forwarding_base<key_type> forwarding_base_type;
+
+// ----------- Aggregator ------------
+        // the aggregator is only needed to serialize the access to the hash table.
+        // and the output_buffer_type base class
+    private:
+        enum op_type { res_count, inc_count, may_succeed, try_make };
+        typedef join_node_FE<key_matching<key_type,key_hash_compare>, InputTuple, OutputTuple> class_type;
+
+        class key_matching_FE_operation : public d1::aggregated_operation<key_matching_FE_operation> {
+        public:
+            char type;
+            unref_key_type my_val;
+            output_type* my_output;
+            graph_task* bypass_t;
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+            message_metainfo* metainfo = nullptr;
+#endif
+            // constructor for value parameter
+            key_matching_FE_operation(const unref_key_type& e , op_type t) : type(char(t)), my_val(e),
+                 my_output(nullptr), bypass_t(nullptr) {}
+            key_matching_FE_operation(output_type *p, op_type t) : type(char(t)), my_output(p), bypass_t(nullptr) {}
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+            key_matching_FE_operation(output_type *p, op_type t, message_metainfo& info)
+                : type(char(t)), my_output(p), bypass_t(nullptr), metainfo(&info) {}
+#endif
+            // constructor with no parameter
+            key_matching_FE_operation(op_type t) : type(char(t)), my_output(nullptr), bypass_t(nullptr) {}
+        };
 
-    typedef aggregating_functor<class_type, key_matching_FE_operation> handler_type;
-    friend class aggregating_functor<class_type, key_matching_FE_operation>;
-    aggregator<handler_type, key_matching_FE_operation> my_aggregator;
-
-    // called from aggregator, so serialized
-    // returns a task pointer if the a task would have been enqueued but we asked that
-    // it be returned.  Otherwise returns nullptr.
-    graph_task *fill_output_buffer(unref_key_type &t) {
-        output_type l_out;
-        graph_task *rtask = nullptr;
-        bool do_fwd = this->buffer_empty() && is_graph_active(this->graph_ref);
-        this->current_key = t;
-        this->delete_with_key(this->current_key);         // remove the key
-        if (join_helper<N>::get_items(my_inputs, l_out)) {//  <== call back
-            this->push_back(l_out);
-            if (do_fwd) {// we enqueue if receiving an item from predecessor, not if successor asks for item
-                small_object_allocator allocator {};
-                typedef forward_task_bypass<base_node_type> task_type;
-                rtask = allocator.new_object<task_type>(this->graph_ref, allocator, *my_node);
-                this->graph_ref.reserve_wait();
-                do_fwd = false;
+        typedef d1::aggregating_functor<class_type, key_matching_FE_operation> handler_type;
+        friend class d1::aggregating_functor<class_type, key_matching_FE_operation>;
+        d1::aggregator<handler_type, key_matching_FE_operation> my_aggregator;
+
+        // called from aggregator, so serialized
+        // returns a task pointer if the a task would have been enqueued but we asked that
+        // it be returned.  Otherwise returns nullptr.
+        graph_task* fill_output_buffer(unref_key_type &t) {
+            output_type l_out;
+            graph_task* rtask = nullptr;
+            bool do_fwd = this->buffer_empty() && is_graph_active(this->graph_ref);
+            this->current_key = t;
+            this->delete_with_key(this->current_key);   // remove the key
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+            message_metainfo metainfo;
+#endif
+            if(join_helper<N>::get_items(my_inputs, l_out __TBB_FLOW_GRAPH_METAINFO_ARG(metainfo))) {  //  <== call back
+                this->push_back(l_out __TBB_FLOW_GRAPH_METAINFO_ARG(metainfo));
+                if(do_fwd) {  // we enqueue if receiving an item from predecessor, not if successor asks for item
+                    d1::small_object_allocator allocator{};
+                    typedef forward_task_bypass<base_node_type> task_type;
+                    rtask = allocator.new_object<task_type>(this->graph_ref, allocator, *my_node);
+                    do_fwd = false;
+                }
+                // retire the input values
+                join_helper<N>::reset_ports(my_inputs);  //  <== call back
+            }
+            else {
+                __TBB_ASSERT(false, "should have had something to push");
             }
-            // retire the input values
-            join_helper<N>::reset_ports(my_inputs);//  <== call back
-        } else {
-            __TBB_ASSERT(false, "should have had something to push");
+            return rtask;
         }
-        return rtask;
-    }
 
-    void handle_operations(key_matching_FE_operation *op_list) {
-        key_matching_FE_operation *current;
-        while (op_list) {
-            current = op_list;
-            op_list = op_list->next;
-            switch (current->type) {
-                case res_count:// called from BE
-                {
-                    this->destroy_front();
-                    current->status.store(SUCCEEDED, std::memory_order_release);
-                } break;
-                case inc_count: {// called from input ports
-                    count_element_type *p = 0;
-                    unref_key_type &t = current->my_val;
-                    if (!(this->find_ref_with_key(t, p))) {
-                        count_element_type ev;
-                        ev.my_key = t;
-                        ev.my_value = 0;
-                        this->insert_with_key(ev);
-                        bool found = this->find_ref_with_key(t, p);
-                        __TBB_ASSERT_EX(found, "should find key after inserting it");
+        void handle_operations(key_matching_FE_operation* op_list) {
+            key_matching_FE_operation *current;
+            while(op_list) {
+                current = op_list;
+                op_list = op_list->next;
+                switch(current->type) {
+                case res_count:  // called from BE
+                    {
+                        this->destroy_front();
+                        current->status.store( SUCCEEDED, std::memory_order_release);
                     }
-                    if (++(p->my_value) == size_t(N)) { current->bypass_t = fill_output_buffer(t); }
-                }
-                    current->status.store(SUCCEEDED, std::memory_order_release);
                     break;
-                case may_succeed:// called from BE
-                    current->status.store(this->buffer_empty() ? FAILED : SUCCEEDED,
-                                          std::memory_order_release);
+                case inc_count: {  // called from input ports
+                        count_element_type *p = nullptr;
+                        unref_key_type &t = current->my_val;
+                        if(!(this->find_ref_with_key(t,p))) {
+                            count_element_type ev;
+                            ev.my_key = t;
+                            ev.my_value = 0;
+                            this->insert_with_key(ev);
+                            bool found = this->find_ref_with_key(t, p);
+                            __TBB_ASSERT_EX(found, "should find key after inserting it");
+                        }
+                        if(++(p->my_value) == size_t(N)) {
+                            current->bypass_t = fill_output_buffer(t);
+                        }
+                    }
+                    current->status.store( SUCCEEDED, std::memory_order_release);
+                    break;
+                case may_succeed:  // called from BE
+                    current->status.store( this->buffer_empty() ? FAILED : SUCCEEDED, std::memory_order_release);
                     break;
-                case try_make:// called from BE
-                    if (this->buffer_empty()) {
-                        current->status.store(FAILED, std::memory_order_release);
-                    } else {
+                case try_make:  // called from BE
+                    if(this->buffer_empty()) {
+                        current->status.store( FAILED, std::memory_order_release);
+                    }
+                    else {
                         *(current->my_output) = this->front();
-                        current->status.store(SUCCEEDED, std::memory_order_release);
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+                        if (current->metainfo) {
+                            *(current->metainfo) = this->front_metainfo();
+                        }
+#endif
+                        current->status.store( SUCCEEDED, std::memory_order_release);
                     }
                     break;
+                }
             }
         }
-    }
-    // ------------ End Aggregator ---------------
+// ------------ End Aggregator ---------------
 
-public:
-    template <typename FunctionTuple>
-    join_node_FE(graph &g, FunctionTuple &TtoK_funcs) : forwarding_base_type(g), my_node(nullptr) {
-        join_helper<N>::set_join_node_pointer(my_inputs, this);
-        join_helper<N>::set_key_functors(my_inputs, TtoK_funcs);
-        my_aggregator.initialize_handler(handler_type(this));
-        TtoK_function_body_type *cfb = new TtoK_function_body_leaf_type(key_to_count_func());
-        this->set_key_func(cfb);
-    }
+    public:
+        template<typename FunctionTuple>
+        join_node_FE(graph &g, FunctionTuple &TtoK_funcs) : forwarding_base_type(g), my_node(nullptr) {
+            join_helper<N>::set_join_node_pointer(my_inputs, this);
+            join_helper<N>::set_key_functors(my_inputs, TtoK_funcs);
+            my_aggregator.initialize_handler(handler_type(this));
+                    TtoK_function_body_type *cfb = new TtoK_function_body_leaf_type(key_to_count_func());
+            this->set_key_func(cfb);
+        }
 
-    join_node_FE(const join_node_FE &other)
-        : forwarding_base_type((other.forwarding_base_type::graph_ref)), key_to_count_buffer_type(),
-          output_buffer_type() {
-        my_node = nullptr;
-        join_helper<N>::set_join_node_pointer(my_inputs, this);
-        join_helper<N>::copy_key_functors(my_inputs, const_cast<input_type &>(other.my_inputs));
-        my_aggregator.initialize_handler(handler_type(this));
-        TtoK_function_body_type *cfb = new TtoK_function_body_leaf_type(key_to_count_func());
-        this->set_key_func(cfb);
-    }
+        join_node_FE(const join_node_FE& other) : forwarding_base_type((other.forwarding_base_type::graph_ref)), key_to_count_buffer_type(),
+        output_buffer_type() {
+            my_node = nullptr;
+            join_helper<N>::set_join_node_pointer(my_inputs, this);
+            join_helper<N>::copy_key_functors(my_inputs, const_cast<input_type &>(other.my_inputs));
+            my_aggregator.initialize_handler(handler_type(this));
+            TtoK_function_body_type *cfb = new TtoK_function_body_leaf_type(key_to_count_func());
+            this->set_key_func(cfb);
+        }
 
-    // needed for forwarding
-    void set_my_node(base_node_type *new_my_node) { my_node = new_my_node; }
+        // needed for forwarding
+        void set_my_node(base_node_type *new_my_node) { my_node = new_my_node; }
 
-    void reset_port_count() {// called from BE
-        key_matching_FE_operation op_data(res_count);
-        my_aggregator.execute(&op_data);
-        return;
-    }
+        void reset_port_count() {  // called from BE
+            key_matching_FE_operation op_data(res_count);
+            my_aggregator.execute(&op_data);
+            return;
+        }
 
-    // if all input_ports have items, spawn forward to try and consume tuples
-    // return a task if we are asked and did create one.
-    graph_task *increment_key_count(unref_key_type const &t) override {// called from input_ports
-        key_matching_FE_operation op_data(t, inc_count);
-        my_aggregator.execute(&op_data);
-        return op_data.bypass_t;
-    }
+        // if all input_ports have items, spawn forward to try and consume tuples
+        // return a task if we are asked and did create one.
+        graph_task *increment_key_count(unref_key_type const & t) override {  // called from input_ports
+            key_matching_FE_operation op_data(t, inc_count);
+            my_aggregator.execute(&op_data);
+            return op_data.bypass_t;
+        }
 
-    input_type &input_ports() { return my_inputs; }
+        input_type &input_ports() { return my_inputs; }
 
-protected:
-    void reset(reset_flags f) {
-        // called outside of parallel contexts
-        join_helper<N>::reset_inputs(my_inputs, f);
+    protected:
 
-        key_to_count_buffer_type::reset();
-        output_buffer_type::reset();
-    }
+        void reset(  reset_flags f ) {
+            // called outside of parallel contexts
+            join_helper<N>::reset_inputs(my_inputs, f);
 
-    // all methods on input ports should be called under mutual exclusion from join_node_base.
+            key_to_count_buffer_type::reset();
+            output_buffer_type::reset();
+        }
 
-    bool tuple_build_may_succeed() {// called from back-end
-        key_matching_FE_operation op_data(may_succeed);
-        my_aggregator.execute(&op_data);
-        return op_data.status == SUCCEEDED;
-    }
+        // all methods on input ports should be called under mutual exclusion from join_node_base.
 
-    // cannot lock while calling back to input_ports.  current_key will only be set
-    // and reset under the aggregator, so it will remain consistent.
-    bool try_to_make_tuple(output_type &out) {
-        key_matching_FE_operation op_data(&out, try_make);
-        my_aggregator.execute(&op_data);
-        return op_data.status == SUCCEEDED;
-    }
+        bool tuple_build_may_succeed() {  // called from back-end
+            key_matching_FE_operation op_data(may_succeed);
+            my_aggregator.execute(&op_data);
+            return op_data.status == SUCCEEDED;
+        }
 
-    void tuple_accepted() {
-        reset_port_count();// reset current_key after ports reset.
-    }
+        // cannot lock while calling back to input_ports.  current_key will only be set
+        // and reset under the aggregator, so it will remain consistent.
+        bool try_to_make_tuple(output_type &out) {
+            key_matching_FE_operation op_data(&out,try_make);
+            my_aggregator.execute(&op_data);
+            return op_data.status == SUCCEEDED;
+        }
 
-    void tuple_rejected() {
-        // nothing to do.
-    }
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+        bool try_to_make_tuple(output_type &out, message_metainfo& metainfo) {
+            key_matching_FE_operation op_data(&out, try_make, metainfo);
+            my_aggregator.execute(&op_data);
+            return op_data.status == SUCCEEDED;
+        }
+#endif
 
-    input_type my_inputs;// input ports
-    base_node_type *my_node;
-};// join_node_FE<key_matching<K,KHash>, InputTuple, OutputTuple>
-
-//! join_node_base
-template <typename JP, typename InputTuple, typename OutputTuple>
-class join_node_base : public graph_node,
-                       public join_node_FE<JP, InputTuple, OutputTuple>,
-                       public sender<OutputTuple> {
-protected:
-    using graph_node::my_graph;
-
-public:
-    typedef OutputTuple output_type;
-
-    typedef typename sender<output_type>::successor_type successor_type;
-    typedef join_node_FE<JP, InputTuple, OutputTuple> input_ports_type;
-    using input_ports_type::try_to_make_tuple;
-    using input_ports_type::tuple_accepted;
-    using input_ports_type::tuple_build_may_succeed;
-    using input_ports_type::tuple_rejected;
-
-private:
-    // ----------- Aggregator ------------
-    enum op_type { reg_succ, rem_succ, try__get, do_fwrd, do_fwrd_bypass };
-    typedef join_node_base<JP, InputTuple, OutputTuple> class_type;
+        void tuple_accepted() {
+            reset_port_count();  // reset current_key after ports reset.
+        }
+
+        void tuple_rejected() {
+            // nothing to do.
+        }
+
+        input_type my_inputs;  // input ports
+        base_node_type *my_node;
+    }; // join_node_FE<key_matching<K,KHash>, InputTuple, OutputTuple>
 
-    class join_node_base_operation : public aggregated_operation<join_node_base_operation> {
+    //! join_node_base
+    template<typename JP, typename InputTuple, typename OutputTuple>
+    class join_node_base : public graph_node, public join_node_FE<JP, InputTuple, OutputTuple>,
+                           public sender<OutputTuple> {
+    protected:
+        using graph_node::my_graph;
     public:
-        char type;
-        union {
-            output_type *my_arg;
-            successor_type *my_succ;
+        typedef OutputTuple output_type;
+
+        typedef typename sender<output_type>::successor_type successor_type;
+        typedef join_node_FE<JP, InputTuple, OutputTuple> input_ports_type;
+        using input_ports_type::tuple_build_may_succeed;
+        using input_ports_type::try_to_make_tuple;
+        using input_ports_type::tuple_accepted;
+        using input_ports_type::tuple_rejected;
+
+    private:
+        // ----------- Aggregator ------------
+        enum op_type { reg_succ, rem_succ, try__get, do_fwrd, do_fwrd_bypass
+        };
+        typedef join_node_base<JP,InputTuple,OutputTuple> class_type;
+
+        class join_node_base_operation : public d1::aggregated_operation<join_node_base_operation> {
+        public:
+            char type;
+            union {
+                output_type *my_arg;
+                successor_type *my_succ;
+            };
+            graph_task* bypass_t;
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+            message_metainfo* metainfo;
+#endif
+            join_node_base_operation(const output_type& e, op_type t __TBB_FLOW_GRAPH_METAINFO_ARG(message_metainfo& info))
+                : type(char(t)), my_arg(const_cast<output_type*>(&e)), bypass_t(nullptr)
+                  __TBB_FLOW_GRAPH_METAINFO_ARG(metainfo(&info)) {}
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+            join_node_base_operation(const output_type& e, op_type t)
+                : type(char(t)), my_arg(const_cast<output_type*>(&e)), bypass_t(nullptr), metainfo(nullptr) {}
+#endif
+            join_node_base_operation(const successor_type &s, op_type t) : type(char(t)),
+                my_succ(const_cast<successor_type *>(&s)), bypass_t(nullptr) {}
+            join_node_base_operation(op_type t) : type(char(t)), bypass_t(nullptr) {}
         };
-        graph_task *bypass_t;
-        join_node_base_operation(const output_type &e, op_type t)
-            : type(char(t)), my_arg(const_cast<output_type *>(&e)), bypass_t(nullptr) {}
-        join_node_base_operation(const successor_type &s, op_type t)
-            : type(char(t)), my_succ(const_cast<successor_type *>(&s)), bypass_t(nullptr) {}
-        join_node_base_operation(op_type t) : type(char(t)), bypass_t(nullptr) {}
-    };
 
-    typedef aggregating_functor<class_type, join_node_base_operation> handler_type;
-    friend class aggregating_functor<class_type, join_node_base_operation>;
-    bool forwarder_busy;
-    aggregator<handler_type, join_node_base_operation> my_aggregator;
-
-    void handle_operations(join_node_base_operation *op_list) {
-        join_node_base_operation *current;
-        while (op_list) {
-            current = op_list;
-            op_list = op_list->next;
-            switch (current->type) {
+        typedef d1::aggregating_functor<class_type, join_node_base_operation> handler_type;
+        friend class d1::aggregating_functor<class_type, join_node_base_operation>;
+        bool forwarder_busy;
+        d1::aggregator<handler_type, join_node_base_operation> my_aggregator;
+
+        void handle_operations(join_node_base_operation* op_list) {
+            join_node_base_operation *current;
+            while(op_list) {
+                current = op_list;
+                op_list = op_list->next;
+                switch(current->type) {
                 case reg_succ: {
-                    my_successors.register_successor(*(current->my_succ));
-                    if (tuple_build_may_succeed() && !forwarder_busy && is_graph_active(my_graph)) {
-                        small_object_allocator allocator {};
-                        typedef forward_task_bypass<join_node_base<JP, InputTuple, OutputTuple>> task_type;
-                        graph_task *t = allocator.new_object<task_type>(my_graph, allocator, *this);
-                        my_graph.reserve_wait();
-                        spawn_in_graph_arena(my_graph, *t);
-                        forwarder_busy = true;
+                        my_successors.register_successor(*(current->my_succ));
+                        if(tuple_build_may_succeed() && !forwarder_busy && is_graph_active(my_graph)) {
+                            d1::small_object_allocator allocator{};
+                            typedef forward_task_bypass< join_node_base<JP, InputTuple, OutputTuple> > task_type;
+                            graph_task* t = allocator.new_object<task_type>(my_graph, allocator, *this);
+                            spawn_in_graph_arena(my_graph, *t);
+                            forwarder_busy = true;
+                        }
+                        current->status.store( SUCCEEDED, std::memory_order_release);
                     }
-                    current->status.store(SUCCEEDED, std::memory_order_release);
-                } break;
+                    break;
                 case rem_succ:
                     my_successors.remove_successor(*(current->my_succ));
-                    current->status.store(SUCCEEDED, std::memory_order_release);
+                    current->status.store( SUCCEEDED, std::memory_order_release);
                     break;
                 case try__get:
-                    if (tuple_build_may_succeed()) {
-                        if (try_to_make_tuple(*(current->my_arg))) {
-                            tuple_accepted();
-                            current->status.store(SUCCEEDED, std::memory_order_release);
+                    if(tuple_build_may_succeed()) {
+                        bool make_tuple_result = false;
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+                        if (current->metainfo) {
+                            make_tuple_result = try_to_make_tuple(*(current->my_arg), *(current->metainfo));
                         } else
-                            current->status.store(FAILED, std::memory_order_release);
-                    } else
-                        current->status.store(FAILED, std::memory_order_release);
+#endif
+                        {
+                            make_tuple_result = try_to_make_tuple(*(current->my_arg));
+                        }
+                        if(make_tuple_result) {
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+                            if (current->metainfo) {
+                                // Since elements would be removed from queues while calling to tuple_accepted
+                                // together with corresponding message_metainfo objects
+                                // we need to prolong the wait until the successor would create a task for removed elements
+                                for (auto waiter : current->metainfo->waiters()) {
+                                    waiter->reserve(1);
+                                }
+                            }
+#endif
+                            tuple_accepted();
+                            current->status.store( SUCCEEDED, std::memory_order_release);
+                        }
+                        else current->status.store( FAILED, std::memory_order_release);
+                    }
+                    else current->status.store( FAILED, std::memory_order_release);
                     break;
                 case do_fwrd_bypass: {
-                    bool build_succeeded;
-                    graph_task *last_task = nullptr;
-                    output_type out;
-                    // forwarding must be exclusive, because try_to_make_tuple and tuple_accepted
-                    // are separate locked methods in the FE.  We could conceivably fetch the front
-                    // of the FE queue, then be swapped out, have someone else consume the FE's
-                    // object, then come back, forward, and then try to remove it from the queue
-                    // again. Without reservation of the FE, the methods accessing it must be locked.
-                    // We could remember the keys of the objects we forwarded, and then remove
-                    // them from the input ports after forwarding is complete?
-                    if (tuple_build_may_succeed()) {// checks output queue of FE
-                        do {
-                            build_succeeded = try_to_make_tuple(out);// fetch front_end of queue
-                            if (build_succeeded) {
-                                graph_task *new_task = my_successors.try_put_task(out);
-                                last_task = combine_tasks(my_graph, last_task, new_task);
-                                if (new_task) {
-                                    tuple_accepted();
-                                } else {
-                                    tuple_rejected();
-                                    build_succeeded = false;
+                        bool build_succeeded;
+                        graph_task *last_task = nullptr;
+                        output_type out;
+                        // forwarding must be exclusive, because try_to_make_tuple and tuple_accepted
+                        // are separate locked methods in the FE.  We could conceivably fetch the front
+                        // of the FE queue, then be swapped out, have someone else consume the FE's
+                        // object, then come back, forward, and then try to remove it from the queue
+                        // again. Without reservation of the FE, the methods accessing it must be locked.
+                        // We could remember the keys of the objects we forwarded, and then remove
+                        // them from the input ports after forwarding is complete?
+                        if(tuple_build_may_succeed()) {  // checks output queue of FE
+                            do {
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+                                message_metainfo metainfo;
+#endif
+                                // fetch front_end of queue
+                                build_succeeded = try_to_make_tuple(out __TBB_FLOW_GRAPH_METAINFO_ARG(metainfo));
+                                if(build_succeeded) {
+                                    graph_task *new_task =
+                                        my_successors.try_put_task(out __TBB_FLOW_GRAPH_METAINFO_ARG(metainfo));
+                                    last_task = combine_tasks(my_graph, last_task, new_task);
+                                    if(new_task) {
+                                        tuple_accepted();
+                                    }
+                                    else {
+                                        tuple_rejected();
+                                        build_succeeded = false;
+                                    }
                                 }
-                            }
-                        } while (build_succeeded);
+                            } while(build_succeeded);
+                        }
+                        current->bypass_t = last_task;
+                        current->status.store( SUCCEEDED, std::memory_order_release);
+                        forwarder_busy = false;
                     }
-                    current->bypass_t = last_task;
-                    current->status.store(SUCCEEDED, std::memory_order_release);
-                    forwarder_busy = false;
-                } break;
+                    break;
+                }
             }
         }
-    }
-    // ---------- end aggregator -----------
-public:
-    join_node_base(graph &g)
-        : graph_node(g), input_ports_type(g), forwarder_busy(false), my_successors(this) {
-        input_ports_type::set_my_node(this);
-        my_aggregator.initialize_handler(handler_type(this));
-    }
+        // ---------- end aggregator -----------
+    public:
+        join_node_base(graph &g)
+            : graph_node(g), input_ports_type(g), forwarder_busy(false), my_successors(this)
+        {
+            input_ports_type::set_my_node(this);
+            my_aggregator.initialize_handler(handler_type(this));
+        }
 
-    join_node_base(const join_node_base &other)
-        : graph_node(other.graph_node::my_graph), input_ports_type(other), sender<OutputTuple>(),
-          forwarder_busy(false), my_successors(this) {
-        input_ports_type::set_my_node(this);
-        my_aggregator.initialize_handler(handler_type(this));
-    }
+        join_node_base(const join_node_base& other) :
+            graph_node(other.graph_node::my_graph), input_ports_type(other),
+            sender<OutputTuple>(), forwarder_busy(false), my_successors(this)
+        {
+            input_ports_type::set_my_node(this);
+            my_aggregator.initialize_handler(handler_type(this));
+        }
 
-    template <typename FunctionTuple>
-    join_node_base(graph &g, FunctionTuple f)
-        : graph_node(g), input_ports_type(g, f), forwarder_busy(false), my_successors(this) {
-        input_ports_type::set_my_node(this);
-        my_aggregator.initialize_handler(handler_type(this));
-    }
+        template<typename FunctionTuple>
+        join_node_base(graph &g, FunctionTuple f)
+            : graph_node(g), input_ports_type(g, f), forwarder_busy(false), my_successors(this)
+        {
+            input_ports_type::set_my_node(this);
+            my_aggregator.initialize_handler(handler_type(this));
+        }
 
-    bool register_successor(successor_type &r) override {
-        join_node_base_operation op_data(r, reg_succ);
-        my_aggregator.execute(&op_data);
-        return op_data.status == SUCCEEDED;
-    }
+        bool register_successor(successor_type &r) override {
+            join_node_base_operation op_data(r, reg_succ);
+            my_aggregator.execute(&op_data);
+            return op_data.status == SUCCEEDED;
+        }
 
-    bool remove_successor(successor_type &r) override {
-        join_node_base_operation op_data(r, rem_succ);
-        my_aggregator.execute(&op_data);
-        return op_data.status == SUCCEEDED;
-    }
+        bool remove_successor( successor_type &r) override {
+            join_node_base_operation op_data(r, rem_succ);
+            my_aggregator.execute(&op_data);
+            return op_data.status == SUCCEEDED;
+        }
 
-    bool try_get(output_type &v) override {
-        join_node_base_operation op_data(v, try__get);
-        my_aggregator.execute(&op_data);
-        return op_data.status == SUCCEEDED;
-    }
+        bool try_get( output_type &v) override {
+            join_node_base_operation op_data(v, try__get);
+            my_aggregator.execute(&op_data);
+            return op_data.status == SUCCEEDED;
+        }
 
-protected:
-    void reset_node(reset_flags f) override {
-        input_ports_type::reset(f);
-        if (f & rf_clear_edges) my_successors.clear();
-    }
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+        bool try_get( output_type &v, message_metainfo& metainfo) override {
+            join_node_base_operation op_data(v, try__get, metainfo);
+            my_aggregator.execute(&op_data);
+            return op_data.status == SUCCEEDED;
+        }
+#endif
 
-private:
-    broadcast_cache<output_type, null_rw_mutex> my_successors;
+    protected:
+        void reset_node(reset_flags f) override {
+            input_ports_type::reset(f);
+            if(f & rf_clear_edges) my_successors.clear();
+        }
 
-    friend class forward_task_bypass<join_node_base<JP, InputTuple, OutputTuple>>;
-    graph_task *forward_task() {
-        join_node_base_operation op_data(do_fwrd_bypass);
-        my_aggregator.execute(&op_data);
-        return op_data.bypass_t;
-    }
+    private:
+        broadcast_cache<output_type, null_rw_mutex> my_successors;
+
+        friend class forward_task_bypass< join_node_base<JP, InputTuple, OutputTuple> >;
+        graph_task *forward_task() {
+            join_node_base_operation op_data(do_fwrd_bypass);
+            my_aggregator.execute(&op_data);
+            return op_data.bypass_t;
+        }
+
+    };  // join_node_base
+
+    // join base class type generator
+    template<int N, template<class> class PT, typename OutputTuple, typename JP>
+    struct join_base {
+        typedef join_node_base<JP, typename wrap_tuple_elements<N,PT,OutputTuple>::type, OutputTuple> type;
+    };
+
+    template<int N, typename OutputTuple, typename K, typename KHash>
+    struct join_base<N, key_matching_port, OutputTuple, key_matching<K,KHash> > {
+        typedef key_matching<K, KHash> key_traits_type;
+        typedef K key_type;
+        typedef KHash key_hash_compare;
+        typedef join_node_base< key_traits_type,
+                // ports type
+                typename wrap_key_tuple_elements<N,key_matching_port,key_traits_type,OutputTuple>::type,
+                OutputTuple > type;
+    };
 
-};// join_node_base
-
-// join base class type generator
-template <int N, template <class> class PT, typename OutputTuple, typename JP>
-struct join_base {
-    typedef join_node_base<JP, typename wrap_tuple_elements<N, PT, OutputTuple>::type, OutputTuple> type;
-};
-
-template <int N, typename OutputTuple, typename K, typename KHash>
-struct join_base<N, key_matching_port, OutputTuple, key_matching<K, KHash>> {
-    typedef key_matching<K, KHash> key_traits_type;
-    typedef K key_type;
-    typedef KHash key_hash_compare;
-    typedef join_node_base<
-            key_traits_type,
-            // ports type
-            typename wrap_key_tuple_elements<N, key_matching_port, key_traits_type, OutputTuple>::type,
-            OutputTuple>
-            type;
-};
-
-//! unfolded_join_node : passes input_ports_type to join_node_base.  We build the input port type
-//  using tuple_element.  The class PT is the port type (reserving_port, queueing_port, key_matching_port)
-//  and should match the typename.
-
-template <int N, template <class> class PT, typename OutputTuple, typename JP>
-class unfolded_join_node : public join_base<N, PT, OutputTuple, JP>::type {
-public:
-    typedef typename wrap_tuple_elements<N, PT, OutputTuple>::type input_ports_type;
-    typedef OutputTuple output_type;
-
-private:
-    typedef join_node_base<JP, input_ports_type, output_type> base_type;
-
-public:
-    unfolded_join_node(graph &g) : base_type(g) {}
-    unfolded_join_node(const unfolded_join_node &other) : base_type(other) {}
-};
+    //! unfolded_join_node : passes input_ports_type to join_node_base.  We build the input port type
+    //  using tuple_element.  The class PT is the port type (reserving_port, queueing_port, key_matching_port)
+    //  and should match the typename.
+
+    template<int M, template<class> class PT, typename OutputTuple, typename JP>
+    class unfolded_join_node : public join_base<M,PT,OutputTuple,JP>::type {
+    public:
+        typedef typename wrap_tuple_elements<M, PT, OutputTuple>::type input_ports_type;
+        typedef OutputTuple output_type;
+    private:
+        typedef join_node_base<JP, input_ports_type, output_type > base_type;
+    public:
+        unfolded_join_node(graph &g) : base_type(g) {}
+        unfolded_join_node(const unfolded_join_node &other) : base_type(other) {}
+    };
 
 #if __TBB_PREVIEW_MESSAGE_BASED_KEY_MATCHING
-template <typename K, typename T>
-struct key_from_message_body {
-    K operator()(const T &t) const { return key_from_message<K>(t); }
-};
-// Adds const to reference type
-template <typename K, typename T>
-struct key_from_message_body<K &, T> {
-    const K &operator()(const T &t) const { return key_from_message<const K &>(t); }
-};
+    template <typename K, typename T>
+    struct key_from_message_body {
+        K operator()(const T& t) const {
+            return key_from_message<K>(t);
+        }
+    };
+    // Adds const to reference type
+    template <typename K, typename T>
+    struct key_from_message_body<K&,T> {
+        const K& operator()(const T& t) const {
+            return key_from_message<const K&>(t);
+        }
+    };
 #endif /* __TBB_PREVIEW_MESSAGE_BASED_KEY_MATCHING */
-// key_matching unfolded_join_node.  This must be a separate specialization because the constructors
-// differ.
-
-template <typename OutputTuple, typename K, typename KHash>
-class unfolded_join_node<2, key_matching_port, OutputTuple, key_matching<K, KHash>>
-    : public join_base<2, key_matching_port, OutputTuple, key_matching<K, KHash>>::type {
-    typedef typename std::tuple_element<0, OutputTuple>::type T0;
-    typedef typename std::tuple_element<1, OutputTuple>::type T1;
-
-public:
-    typedef typename wrap_key_tuple_elements<2, key_matching_port, key_matching<K, KHash>, OutputTuple>::type
-            input_ports_type;
-    typedef OutputTuple output_type;
-
-private:
-    typedef join_node_base<key_matching<K, KHash>, input_ports_type, output_type> base_type;
-    typedef type_to_key_function_body<T0, K> *f0_p;
-    typedef type_to_key_function_body<T1, K> *f1_p;
-    typedef std::tuple<f0_p, f1_p> func_initializer_type;
-
-public:
+    // key_matching unfolded_join_node.  This must be a separate specialization because the constructors
+    // differ.
+
+    template<typename OutputTuple, typename K, typename KHash>
+    class unfolded_join_node<2,key_matching_port,OutputTuple,key_matching<K,KHash> > : public
+            join_base<2,key_matching_port,OutputTuple,key_matching<K,KHash> >::type {
+        typedef typename std::tuple_element<0, OutputTuple>::type T0;
+        typedef typename std::tuple_element<1, OutputTuple>::type T1;
+    public:
+        typedef typename wrap_key_tuple_elements<2,key_matching_port,key_matching<K,KHash>,OutputTuple>::type input_ports_type;
+        typedef OutputTuple output_type;
+    private:
+        typedef join_node_base<key_matching<K,KHash>, input_ports_type, output_type > base_type;
+        typedef type_to_key_function_body<T0, K> *f0_p;
+        typedef type_to_key_function_body<T1, K> *f1_p;
+        typedef std::tuple< f0_p, f1_p > func_initializer_type;
+    public:
 #if __TBB_PREVIEW_MESSAGE_BASED_KEY_MATCHING
-    unfolded_join_node(graph &g)
-        : base_type(g, func_initializer_type(
-                               new type_to_key_function_body_leaf<T0, K, key_from_message_body<K, T0>>(
-                                       key_from_message_body<K, T0>()),
-                               new type_to_key_function_body_leaf<T1, K, key_from_message_body<K, T1>>(
-                                       key_from_message_body<K, T1>()))) {}
+        unfolded_join_node(graph &g) : base_type(g,
+                func_initializer_type(
+                    new type_to_key_function_body_leaf<T0, K, key_from_message_body<K,T0> >(key_from_message_body<K,T0>()),
+                    new type_to_key_function_body_leaf<T1, K, key_from_message_body<K,T1> >(key_from_message_body<K,T1>())
+                    ) ) {
+        }
 #endif /* __TBB_PREVIEW_MESSAGE_BASED_KEY_MATCHING */
-    template <typename Body0, typename Body1>
-    unfolded_join_node(graph &g, Body0 body0, Body1 body1)
-        : base_type(g, func_initializer_type(new type_to_key_function_body_leaf<T0, K, Body0>(body0),
-                                             new type_to_key_function_body_leaf<T1, K, Body1>(body1))) {
-        static_assert(std::tuple_size<OutputTuple>::value == 2, "wrong number of body initializers");
-    }
-    unfolded_join_node(const unfolded_join_node &other) : base_type(other) {}
-};
-
-template <typename OutputTuple, typename K, typename KHash>
-class unfolded_join_node<3, key_matching_port, OutputTuple, key_matching<K, KHash>>
-    : public join_base<3, key_matching_port, OutputTuple, key_matching<K, KHash>>::type {
-    typedef typename std::tuple_element<0, OutputTuple>::type T0;
-    typedef typename std::tuple_element<1, OutputTuple>::type T1;
-    typedef typename std::tuple_element<2, OutputTuple>::type T2;
-
-public:
-    typedef typename wrap_key_tuple_elements<3, key_matching_port, key_matching<K, KHash>, OutputTuple>::type
-            input_ports_type;
-    typedef OutputTuple output_type;
-
-private:
-    typedef join_node_base<key_matching<K, KHash>, input_ports_type, output_type> base_type;
-    typedef type_to_key_function_body<T0, K> *f0_p;
-    typedef type_to_key_function_body<T1, K> *f1_p;
-    typedef type_to_key_function_body<T2, K> *f2_p;
-    typedef std::tuple<f0_p, f1_p, f2_p> func_initializer_type;
-
-public:
+        template<typename Body0, typename Body1>
+        unfolded_join_node(graph &g, Body0 body0, Body1 body1) : base_type(g,
+                func_initializer_type(
+                    new type_to_key_function_body_leaf<T0, K, Body0>(body0),
+                    new type_to_key_function_body_leaf<T1, K, Body1>(body1)
+                    ) ) {
+            static_assert(std::tuple_size<OutputTuple>::value == 2, "wrong number of body initializers");
+        }
+        unfolded_join_node(const unfolded_join_node &other) : base_type(other) {}
+    };
+
+    template<typename OutputTuple, typename K, typename KHash>
+    class unfolded_join_node<3,key_matching_port,OutputTuple,key_matching<K,KHash> > : public
+            join_base<3,key_matching_port,OutputTuple,key_matching<K,KHash> >::type {
+        typedef typename std::tuple_element<0, OutputTuple>::type T0;
+        typedef typename std::tuple_element<1, OutputTuple>::type T1;
+        typedef typename std::tuple_element<2, OutputTuple>::type T2;
+    public:
+        typedef typename wrap_key_tuple_elements<3,key_matching_port,key_matching<K,KHash>,OutputTuple>::type input_ports_type;
+        typedef OutputTuple output_type;
+    private:
+        typedef join_node_base<key_matching<K,KHash>, input_ports_type, output_type > base_type;
+        typedef type_to_key_function_body<T0, K> *f0_p;
+        typedef type_to_key_function_body<T1, K> *f1_p;
+        typedef type_to_key_function_body<T2, K> *f2_p;
+        typedef std::tuple< f0_p, f1_p, f2_p > func_initializer_type;
+    public:
 #if __TBB_PREVIEW_MESSAGE_BASED_KEY_MATCHING
-    unfolded_join_node(graph &g)
-        : base_type(g, func_initializer_type(
-                               new type_to_key_function_body_leaf<T0, K, key_from_message_body<K, T0>>(
-                                       key_from_message_body<K, T0>()),
-                               new type_to_key_function_body_leaf<T1, K, key_from_message_body<K, T1>>(
-                                       key_from_message_body<K, T1>()),
-                               new type_to_key_function_body_leaf<T2, K, key_from_message_body<K, T2>>(
-                                       key_from_message_body<K, T2>()))) {}
+        unfolded_join_node(graph &g) : base_type(g,
+                func_initializer_type(
+                    new type_to_key_function_body_leaf<T0, K, key_from_message_body<K,T0> >(key_from_message_body<K,T0>()),
+                    new type_to_key_function_body_leaf<T1, K, key_from_message_body<K,T1> >(key_from_message_body<K,T1>()),
+                    new type_to_key_function_body_leaf<T2, K, key_from_message_body<K,T2> >(key_from_message_body<K,T2>())
+                    ) ) {
+        }
 #endif /* __TBB_PREVIEW_MESSAGE_BASED_KEY_MATCHING */
-    template <typename Body0, typename Body1, typename Body2>
-    unfolded_join_node(graph &g, Body0 body0, Body1 body1, Body2 body2)
-        : base_type(g, func_initializer_type(new type_to_key_function_body_leaf<T0, K, Body0>(body0),
-                                             new type_to_key_function_body_leaf<T1, K, Body1>(body1),
-                                             new type_to_key_function_body_leaf<T2, K, Body2>(body2))) {
-        static_assert(std::tuple_size<OutputTuple>::value == 3, "wrong number of body initializers");
-    }
-    unfolded_join_node(const unfolded_join_node &other) : base_type(other) {}
-};
-
-template <typename OutputTuple, typename K, typename KHash>
-class unfolded_join_node<4, key_matching_port, OutputTuple, key_matching<K, KHash>>
-    : public join_base<4, key_matching_port, OutputTuple, key_matching<K, KHash>>::type {
-    typedef typename std::tuple_element<0, OutputTuple>::type T0;
-    typedef typename std::tuple_element<1, OutputTuple>::type T1;
-    typedef typename std::tuple_element<2, OutputTuple>::type T2;
-    typedef typename std::tuple_element<3, OutputTuple>::type T3;
-
-public:
-    typedef typename wrap_key_tuple_elements<4, key_matching_port, key_matching<K, KHash>, OutputTuple>::type
-            input_ports_type;
-    typedef OutputTuple output_type;
-
-private:
-    typedef join_node_base<key_matching<K, KHash>, input_ports_type, output_type> base_type;
-    typedef type_to_key_function_body<T0, K> *f0_p;
-    typedef type_to_key_function_body<T1, K> *f1_p;
-    typedef type_to_key_function_body<T2, K> *f2_p;
-    typedef type_to_key_function_body<T3, K> *f3_p;
-    typedef std::tuple<f0_p, f1_p, f2_p, f3_p> func_initializer_type;
-
-public:
+        template<typename Body0, typename Body1, typename Body2>
+        unfolded_join_node(graph &g, Body0 body0, Body1 body1, Body2 body2) : base_type(g,
+                func_initializer_type(
+                    new type_to_key_function_body_leaf<T0, K, Body0>(body0),
+                    new type_to_key_function_body_leaf<T1, K, Body1>(body1),
+                    new type_to_key_function_body_leaf<T2, K, Body2>(body2)
+                    ) ) {
+            static_assert(std::tuple_size<OutputTuple>::value == 3, "wrong number of body initializers");
+        }
+        unfolded_join_node(const unfolded_join_node &other) : base_type(other) {}
+    };
+
+    template<typename OutputTuple, typename K, typename KHash>
+    class unfolded_join_node<4,key_matching_port,OutputTuple,key_matching<K,KHash> > : public
+            join_base<4,key_matching_port,OutputTuple,key_matching<K,KHash> >::type {
+        typedef typename std::tuple_element<0, OutputTuple>::type T0;
+        typedef typename std::tuple_element<1, OutputTuple>::type T1;
+        typedef typename std::tuple_element<2, OutputTuple>::type T2;
+        typedef typename std::tuple_element<3, OutputTuple>::type T3;
+    public:
+        typedef typename wrap_key_tuple_elements<4,key_matching_port,key_matching<K,KHash>,OutputTuple>::type input_ports_type;
+        typedef OutputTuple output_type;
+    private:
+        typedef join_node_base<key_matching<K,KHash>, input_ports_type, output_type > base_type;
+        typedef type_to_key_function_body<T0, K> *f0_p;
+        typedef type_to_key_function_body<T1, K> *f1_p;
+        typedef type_to_key_function_body<T2, K> *f2_p;
+        typedef type_to_key_function_body<T3, K> *f3_p;
+        typedef std::tuple< f0_p, f1_p, f2_p, f3_p > func_initializer_type;
+    public:
 #if __TBB_PREVIEW_MESSAGE_BASED_KEY_MATCHING
-    unfolded_join_node(graph &g)
-        : base_type(g, func_initializer_type(
-                               new type_to_key_function_body_leaf<T0, K, key_from_message_body<K, T0>>(
-                                       key_from_message_body<K, T0>()),
-                               new type_to_key_function_body_leaf<T1, K, key_from_message_body<K, T1>>(
-                                       key_from_message_body<K, T1>()),
-                               new type_to_key_function_body_leaf<T2, K, key_from_message_body<K, T2>>(
-                                       key_from_message_body<K, T2>()),
-                               new type_to_key_function_body_leaf<T3, K, key_from_message_body<K, T3>>(
-                                       key_from_message_body<K, T3>()))) {}
+        unfolded_join_node(graph &g) : base_type(g,
+                func_initializer_type(
+                    new type_to_key_function_body_leaf<T0, K, key_from_message_body<K,T0> >(key_from_message_body<K,T0>()),
+                    new type_to_key_function_body_leaf<T1, K, key_from_message_body<K,T1> >(key_from_message_body<K,T1>()),
+                    new type_to_key_function_body_leaf<T2, K, key_from_message_body<K,T2> >(key_from_message_body<K,T2>()),
+                    new type_to_key_function_body_leaf<T3, K, key_from_message_body<K,T3> >(key_from_message_body<K,T3>())
+                    ) ) {
+        }
 #endif /* __TBB_PREVIEW_MESSAGE_BASED_KEY_MATCHING */
-    template <typename Body0, typename Body1, typename Body2, typename Body3>
-    unfolded_join_node(graph &g, Body0 body0, Body1 body1, Body2 body2, Body3 body3)
-        : base_type(g, func_initializer_type(new type_to_key_function_body_leaf<T0, K, Body0>(body0),
-                                             new type_to_key_function_body_leaf<T1, K, Body1>(body1),
-                                             new type_to_key_function_body_leaf<T2, K, Body2>(body2),
-                                             new type_to_key_function_body_leaf<T3, K, Body3>(body3))) {
-        static_assert(std::tuple_size<OutputTuple>::value == 4, "wrong number of body initializers");
-    }
-    unfolded_join_node(const unfolded_join_node &other) : base_type(other) {}
-};
-
-template <typename OutputTuple, typename K, typename KHash>
-class unfolded_join_node<5, key_matching_port, OutputTuple, key_matching<K, KHash>>
-    : public join_base<5, key_matching_port, OutputTuple, key_matching<K, KHash>>::type {
-    typedef typename std::tuple_element<0, OutputTuple>::type T0;
-    typedef typename std::tuple_element<1, OutputTuple>::type T1;
-    typedef typename std::tuple_element<2, OutputTuple>::type T2;
-    typedef typename std::tuple_element<3, OutputTuple>::type T3;
-    typedef typename std::tuple_element<4, OutputTuple>::type T4;
-
-public:
-    typedef typename wrap_key_tuple_elements<5, key_matching_port, key_matching<K, KHash>, OutputTuple>::type
-            input_ports_type;
-    typedef OutputTuple output_type;
-
-private:
-    typedef join_node_base<key_matching<K, KHash>, input_ports_type, output_type> base_type;
-    typedef type_to_key_function_body<T0, K> *f0_p;
-    typedef type_to_key_function_body<T1, K> *f1_p;
-    typedef type_to_key_function_body<T2, K> *f2_p;
-    typedef type_to_key_function_body<T3, K> *f3_p;
-    typedef type_to_key_function_body<T4, K> *f4_p;
-    typedef std::tuple<f0_p, f1_p, f2_p, f3_p, f4_p> func_initializer_type;
-
-public:
+        template<typename Body0, typename Body1, typename Body2, typename Body3>
+        unfolded_join_node(graph &g, Body0 body0, Body1 body1, Body2 body2, Body3 body3) : base_type(g,
+                func_initializer_type(
+                    new type_to_key_function_body_leaf<T0, K, Body0>(body0),
+                    new type_to_key_function_body_leaf<T1, K, Body1>(body1),
+                    new type_to_key_function_body_leaf<T2, K, Body2>(body2),
+                    new type_to_key_function_body_leaf<T3, K, Body3>(body3)
+                    ) ) {
+            static_assert(std::tuple_size<OutputTuple>::value == 4, "wrong number of body initializers");
+        }
+        unfolded_join_node(const unfolded_join_node &other) : base_type(other) {}
+    };
+
+    template<typename OutputTuple, typename K, typename KHash>
+    class unfolded_join_node<5,key_matching_port,OutputTuple,key_matching<K,KHash> > : public
+            join_base<5,key_matching_port,OutputTuple,key_matching<K,KHash> >::type {
+        typedef typename std::tuple_element<0, OutputTuple>::type T0;
+        typedef typename std::tuple_element<1, OutputTuple>::type T1;
+        typedef typename std::tuple_element<2, OutputTuple>::type T2;
+        typedef typename std::tuple_element<3, OutputTuple>::type T3;
+        typedef typename std::tuple_element<4, OutputTuple>::type T4;
+    public:
+        typedef typename wrap_key_tuple_elements<5,key_matching_port,key_matching<K,KHash>,OutputTuple>::type input_ports_type;
+        typedef OutputTuple output_type;
+    private:
+        typedef join_node_base<key_matching<K,KHash> , input_ports_type, output_type > base_type;
+        typedef type_to_key_function_body<T0, K> *f0_p;
+        typedef type_to_key_function_body<T1, K> *f1_p;
+        typedef type_to_key_function_body<T2, K> *f2_p;
+        typedef type_to_key_function_body<T3, K> *f3_p;
+        typedef type_to_key_function_body<T4, K> *f4_p;
+        typedef std::tuple< f0_p, f1_p, f2_p, f3_p, f4_p > func_initializer_type;
+    public:
 #if __TBB_PREVIEW_MESSAGE_BASED_KEY_MATCHING
-    unfolded_join_node(graph &g)
-        : base_type(g, func_initializer_type(
-                               new type_to_key_function_body_leaf<T0, K, key_from_message_body<K, T0>>(
-                                       key_from_message_body<K, T0>()),
-                               new type_to_key_function_body_leaf<T1, K, key_from_message_body<K, T1>>(
-                                       key_from_message_body<K, T1>()),
-                               new type_to_key_function_body_leaf<T2, K, key_from_message_body<K, T2>>(
-                                       key_from_message_body<K, T2>()),
-                               new type_to_key_function_body_leaf<T3, K, key_from_message_body<K, T3>>(
-                                       key_from_message_body<K, T3>()),
-                               new type_to_key_function_body_leaf<T4, K, key_from_message_body<K, T4>>(
-                                       key_from_message_body<K, T4>()))) {}
+        unfolded_join_node(graph &g) : base_type(g,
+                func_initializer_type(
+                    new type_to_key_function_body_leaf<T0, K, key_from_message_body<K,T0> >(key_from_message_body<K,T0>()),
+                    new type_to_key_function_body_leaf<T1, K, key_from_message_body<K,T1> >(key_from_message_body<K,T1>()),
+                    new type_to_key_function_body_leaf<T2, K, key_from_message_body<K,T2> >(key_from_message_body<K,T2>()),
+                    new type_to_key_function_body_leaf<T3, K, key_from_message_body<K,T3> >(key_from_message_body<K,T3>()),
+                    new type_to_key_function_body_leaf<T4, K, key_from_message_body<K,T4> >(key_from_message_body<K,T4>())
+                    ) ) {
+        }
 #endif /* __TBB_PREVIEW_MESSAGE_BASED_KEY_MATCHING */
-    template <typename Body0, typename Body1, typename Body2, typename Body3, typename Body4>
-    unfolded_join_node(graph &g, Body0 body0, Body1 body1, Body2 body2, Body3 body3, Body4 body4)
-        : base_type(g, func_initializer_type(new type_to_key_function_body_leaf<T0, K, Body0>(body0),
-                                             new type_to_key_function_body_leaf<T1, K, Body1>(body1),
-                                             new type_to_key_function_body_leaf<T2, K, Body2>(body2),
-                                             new type_to_key_function_body_leaf<T3, K, Body3>(body3),
-                                             new type_to_key_function_body_leaf<T4, K, Body4>(body4))) {
-        static_assert(std::tuple_size<OutputTuple>::value == 5, "wrong number of body initializers");
-    }
-    unfolded_join_node(const unfolded_join_node &other) : base_type(other) {}
-};
+        template<typename Body0, typename Body1, typename Body2, typename Body3, typename Body4>
+        unfolded_join_node(graph &g, Body0 body0, Body1 body1, Body2 body2, Body3 body3, Body4 body4) : base_type(g,
+                func_initializer_type(
+                    new type_to_key_function_body_leaf<T0, K, Body0>(body0),
+                    new type_to_key_function_body_leaf<T1, K, Body1>(body1),
+                    new type_to_key_function_body_leaf<T2, K, Body2>(body2),
+                    new type_to_key_function_body_leaf<T3, K, Body3>(body3),
+                    new type_to_key_function_body_leaf<T4, K, Body4>(body4)
+                    ) ) {
+            static_assert(std::tuple_size<OutputTuple>::value == 5, "wrong number of body initializers");
+        }
+        unfolded_join_node(const unfolded_join_node &other) : base_type(other) {}
+    };
 
 #if __TBB_VARIADIC_MAX >= 6
-template <typename OutputTuple, typename K, typename KHash>
-class unfolded_join_node<6, key_matching_port, OutputTuple, key_matching<K, KHash>>
-    : public join_base<6, key_matching_port, OutputTuple, key_matching<K, KHash>>::type {
-    typedef typename std::tuple_element<0, OutputTuple>::type T0;
-    typedef typename std::tuple_element<1, OutputTuple>::type T1;
-    typedef typename std::tuple_element<2, OutputTuple>::type T2;
-    typedef typename std::tuple_element<3, OutputTuple>::type T3;
-    typedef typename std::tuple_element<4, OutputTuple>::type T4;
-    typedef typename std::tuple_element<5, OutputTuple>::type T5;
-
-public:
-    typedef typename wrap_key_tuple_elements<6, key_matching_port, key_matching<K, KHash>, OutputTuple>::type
-            input_ports_type;
-    typedef OutputTuple output_type;
-
-private:
-    typedef join_node_base<key_matching<K, KHash>, input_ports_type, output_type> base_type;
-    typedef type_to_key_function_body<T0, K> *f0_p;
-    typedef type_to_key_function_body<T1, K> *f1_p;
-    typedef type_to_key_function_body<T2, K> *f2_p;
-    typedef type_to_key_function_body<T3, K> *f3_p;
-    typedef type_to_key_function_body<T4, K> *f4_p;
-    typedef type_to_key_function_body<T5, K> *f5_p;
-    typedef std::tuple<f0_p, f1_p, f2_p, f3_p, f4_p, f5_p> func_initializer_type;
-
-public:
+    template<typename OutputTuple, typename K, typename KHash>
+    class unfolded_join_node<6,key_matching_port,OutputTuple,key_matching<K,KHash> > : public
+            join_base<6,key_matching_port,OutputTuple,key_matching<K,KHash> >::type {
+        typedef typename std::tuple_element<0, OutputTuple>::type T0;
+        typedef typename std::tuple_element<1, OutputTuple>::type T1;
+        typedef typename std::tuple_element<2, OutputTuple>::type T2;
+        typedef typename std::tuple_element<3, OutputTuple>::type T3;
+        typedef typename std::tuple_element<4, OutputTuple>::type T4;
+        typedef typename std::tuple_element<5, OutputTuple>::type T5;
+    public:
+        typedef typename wrap_key_tuple_elements<6,key_matching_port,key_matching<K,KHash>,OutputTuple>::type input_ports_type;
+        typedef OutputTuple output_type;
+    private:
+        typedef join_node_base<key_matching<K,KHash> , input_ports_type, output_type > base_type;
+        typedef type_to_key_function_body<T0, K> *f0_p;
+        typedef type_to_key_function_body<T1, K> *f1_p;
+        typedef type_to_key_function_body<T2, K> *f2_p;
+        typedef type_to_key_function_body<T3, K> *f3_p;
+        typedef type_to_key_function_body<T4, K> *f4_p;
+        typedef type_to_key_function_body<T5, K> *f5_p;
+        typedef std::tuple< f0_p, f1_p, f2_p, f3_p, f4_p, f5_p > func_initializer_type;
+    public:
 #if __TBB_PREVIEW_MESSAGE_BASED_KEY_MATCHING
-    unfolded_join_node(graph &g)
-        : base_type(g, func_initializer_type(
-                               new type_to_key_function_body_leaf<T0, K, key_from_message_body<K, T0>>(
-                                       key_from_message_body<K, T0>()),
-                               new type_to_key_function_body_leaf<T1, K, key_from_message_body<K, T1>>(
-                                       key_from_message_body<K, T1>()),
-                               new type_to_key_function_body_leaf<T2, K, key_from_message_body<K, T2>>(
-                                       key_from_message_body<K, T2>()),
-                               new type_to_key_function_body_leaf<T3, K, key_from_message_body<K, T3>>(
-                                       key_from_message_body<K, T3>()),
-                               new type_to_key_function_body_leaf<T4, K, key_from_message_body<K, T4>>(
-                                       key_from_message_body<K, T4>()),
-                               new type_to_key_function_body_leaf<T5, K, key_from_message_body<K, T5>>(
-                                       key_from_message_body<K, T5>()))) {}
+        unfolded_join_node(graph &g) : base_type(g,
+                func_initializer_type(
+                    new type_to_key_function_body_leaf<T0, K, key_from_message_body<K,T0> >(key_from_message_body<K,T0>()),
+                    new type_to_key_function_body_leaf<T1, K, key_from_message_body<K,T1> >(key_from_message_body<K,T1>()),
+                    new type_to_key_function_body_leaf<T2, K, key_from_message_body<K,T2> >(key_from_message_body<K,T2>()),
+                    new type_to_key_function_body_leaf<T3, K, key_from_message_body<K,T3> >(key_from_message_body<K,T3>()),
+                    new type_to_key_function_body_leaf<T4, K, key_from_message_body<K,T4> >(key_from_message_body<K,T4>()),
+                    new type_to_key_function_body_leaf<T5, K, key_from_message_body<K,T5> >(key_from_message_body<K,T5>())
+                    ) ) {
+        }
 #endif /* __TBB_PREVIEW_MESSAGE_BASED_KEY_MATCHING */
-    template <typename Body0, typename Body1, typename Body2, typename Body3, typename Body4, typename Body5>
-    unfolded_join_node(graph &g, Body0 body0, Body1 body1, Body2 body2, Body3 body3, Body4 body4, Body5 body5)
-        : base_type(g, func_initializer_type(new type_to_key_function_body_leaf<T0, K, Body0>(body0),
-                                             new type_to_key_function_body_leaf<T1, K, Body1>(body1),
-                                             new type_to_key_function_body_leaf<T2, K, Body2>(body2),
-                                             new type_to_key_function_body_leaf<T3, K, Body3>(body3),
-                                             new type_to_key_function_body_leaf<T4, K, Body4>(body4),
-                                             new type_to_key_function_body_leaf<T5, K, Body5>(body5))) {
-        static_assert(std::tuple_size<OutputTuple>::value == 6, "wrong number of body initializers");
-    }
-    unfolded_join_node(const unfolded_join_node &other) : base_type(other) {}
-};
+        template<typename Body0, typename Body1, typename Body2, typename Body3, typename Body4, typename Body5>
+        unfolded_join_node(graph &g, Body0 body0, Body1 body1, Body2 body2, Body3 body3, Body4 body4, Body5 body5)
+                : base_type(g, func_initializer_type(
+                    new type_to_key_function_body_leaf<T0, K, Body0>(body0),
+                    new type_to_key_function_body_leaf<T1, K, Body1>(body1),
+                    new type_to_key_function_body_leaf<T2, K, Body2>(body2),
+                    new type_to_key_function_body_leaf<T3, K, Body3>(body3),
+                    new type_to_key_function_body_leaf<T4, K, Body4>(body4),
+                    new type_to_key_function_body_leaf<T5, K, Body5>(body5)
+                    ) ) {
+            static_assert(std::tuple_size<OutputTuple>::value == 6, "wrong number of body initializers");
+        }
+        unfolded_join_node(const unfolded_join_node &other) : base_type(other) {}
+    };
 #endif
 
 #if __TBB_VARIADIC_MAX >= 7
-template <typename OutputTuple, typename K, typename KHash>
-class unfolded_join_node<7, key_matching_port, OutputTuple, key_matching<K, KHash>>
-    : public join_base<7, key_matching_port, OutputTuple, key_matching<K, KHash>>::type {
-    typedef typename std::tuple_element<0, OutputTuple>::type T0;
-    typedef typename std::tuple_element<1, OutputTuple>::type T1;
-    typedef typename std::tuple_element<2, OutputTuple>::type T2;
-    typedef typename std::tuple_element<3, OutputTuple>::type T3;
-    typedef typename std::tuple_element<4, OutputTuple>::type T4;
-    typedef typename std::tuple_element<5, OutputTuple>::type T5;
-    typedef typename std::tuple_element<6, OutputTuple>::type T6;
-
-public:
-    typedef typename wrap_key_tuple_elements<7, key_matching_port, key_matching<K, KHash>, OutputTuple>::type
-            input_ports_type;
-    typedef OutputTuple output_type;
-
-private:
-    typedef join_node_base<key_matching<K, KHash>, input_ports_type, output_type> base_type;
-    typedef type_to_key_function_body<T0, K> *f0_p;
-    typedef type_to_key_function_body<T1, K> *f1_p;
-    typedef type_to_key_function_body<T2, K> *f2_p;
-    typedef type_to_key_function_body<T3, K> *f3_p;
-    typedef type_to_key_function_body<T4, K> *f4_p;
-    typedef type_to_key_function_body<T5, K> *f5_p;
-    typedef type_to_key_function_body<T6, K> *f6_p;
-    typedef std::tuple<f0_p, f1_p, f2_p, f3_p, f4_p, f5_p, f6_p> func_initializer_type;
-
-public:
+    template<typename OutputTuple, typename K, typename KHash>
+    class unfolded_join_node<7,key_matching_port,OutputTuple,key_matching<K,KHash> > : public
+            join_base<7,key_matching_port,OutputTuple,key_matching<K,KHash> >::type {
+        typedef typename std::tuple_element<0, OutputTuple>::type T0;
+        typedef typename std::tuple_element<1, OutputTuple>::type T1;
+        typedef typename std::tuple_element<2, OutputTuple>::type T2;
+        typedef typename std::tuple_element<3, OutputTuple>::type T3;
+        typedef typename std::tuple_element<4, OutputTuple>::type T4;
+        typedef typename std::tuple_element<5, OutputTuple>::type T5;
+        typedef typename std::tuple_element<6, OutputTuple>::type T6;
+    public:
+        typedef typename wrap_key_tuple_elements<7,key_matching_port,key_matching<K,KHash>,OutputTuple>::type input_ports_type;
+        typedef OutputTuple output_type;
+    private:
+        typedef join_node_base<key_matching<K,KHash> , input_ports_type, output_type > base_type;
+        typedef type_to_key_function_body<T0, K> *f0_p;
+        typedef type_to_key_function_body<T1, K> *f1_p;
+        typedef type_to_key_function_body<T2, K> *f2_p;
+        typedef type_to_key_function_body<T3, K> *f3_p;
+        typedef type_to_key_function_body<T4, K> *f4_p;
+        typedef type_to_key_function_body<T5, K> *f5_p;
+        typedef type_to_key_function_body<T6, K> *f6_p;
+        typedef std::tuple< f0_p, f1_p, f2_p, f3_p, f4_p, f5_p, f6_p > func_initializer_type;
+    public:
 #if __TBB_PREVIEW_MESSAGE_BASED_KEY_MATCHING
-    unfolded_join_node(graph &g)
-        : base_type(g, func_initializer_type(
-                               new type_to_key_function_body_leaf<T0, K, key_from_message_body<K, T0>>(
-                                       key_from_message_body<K, T0>()),
-                               new type_to_key_function_body_leaf<T1, K, key_from_message_body<K, T1>>(
-                                       key_from_message_body<K, T1>()),
-                               new type_to_key_function_body_leaf<T2, K, key_from_message_body<K, T2>>(
-                                       key_from_message_body<K, T2>()),
-                               new type_to_key_function_body_leaf<T3, K, key_from_message_body<K, T3>>(
-                                       key_from_message_body<K, T3>()),
-                               new type_to_key_function_body_leaf<T4, K, key_from_message_body<K, T4>>(
-                                       key_from_message_body<K, T4>()),
-                               new type_to_key_function_body_leaf<T5, K, key_from_message_body<K, T5>>(
-                                       key_from_message_body<K, T5>()),
-                               new type_to_key_function_body_leaf<T6, K, key_from_message_body<K, T6>>(
-                                       key_from_message_body<K, T6>()))) {}
+        unfolded_join_node(graph &g) : base_type(g,
+                func_initializer_type(
+                    new type_to_key_function_body_leaf<T0, K, key_from_message_body<K,T0> >(key_from_message_body<K,T0>()),
+                    new type_to_key_function_body_leaf<T1, K, key_from_message_body<K,T1> >(key_from_message_body<K,T1>()),
+                    new type_to_key_function_body_leaf<T2, K, key_from_message_body<K,T2> >(key_from_message_body<K,T2>()),
+                    new type_to_key_function_body_leaf<T3, K, key_from_message_body<K,T3> >(key_from_message_body<K,T3>()),
+                    new type_to_key_function_body_leaf<T4, K, key_from_message_body<K,T4> >(key_from_message_body<K,T4>()),
+                    new type_to_key_function_body_leaf<T5, K, key_from_message_body<K,T5> >(key_from_message_body<K,T5>()),
+                    new type_to_key_function_body_leaf<T6, K, key_from_message_body<K,T6> >(key_from_message_body<K,T6>())
+                    ) ) {
+        }
 #endif /* __TBB_PREVIEW_MESSAGE_BASED_KEY_MATCHING */
-    template <typename Body0, typename Body1, typename Body2, typename Body3, typename Body4, typename Body5,
-              typename Body6>
-    unfolded_join_node(graph &g, Body0 body0, Body1 body1, Body2 body2, Body3 body3, Body4 body4, Body5 body5,
-                       Body6 body6)
-        : base_type(g, func_initializer_type(new type_to_key_function_body_leaf<T0, K, Body0>(body0),
-                                             new type_to_key_function_body_leaf<T1, K, Body1>(body1),
-                                             new type_to_key_function_body_leaf<T2, K, Body2>(body2),
-                                             new type_to_key_function_body_leaf<T3, K, Body3>(body3),
-                                             new type_to_key_function_body_leaf<T4, K, Body4>(body4),
-                                             new type_to_key_function_body_leaf<T5, K, Body5>(body5),
-                                             new type_to_key_function_body_leaf<T6, K, Body6>(body6))) {
-        static_assert(std::tuple_size<OutputTuple>::value == 7, "wrong number of body initializers");
-    }
-    unfolded_join_node(const unfolded_join_node &other) : base_type(other) {}
-};
+        template<typename Body0, typename Body1, typename Body2, typename Body3, typename Body4,
+                 typename Body5, typename Body6>
+        unfolded_join_node(graph &g, Body0 body0, Body1 body1, Body2 body2, Body3 body3, Body4 body4,
+                Body5 body5, Body6 body6) : base_type(g, func_initializer_type(
+                    new type_to_key_function_body_leaf<T0, K, Body0>(body0),
+                    new type_to_key_function_body_leaf<T1, K, Body1>(body1),
+                    new type_to_key_function_body_leaf<T2, K, Body2>(body2),
+                    new type_to_key_function_body_leaf<T3, K, Body3>(body3),
+                    new type_to_key_function_body_leaf<T4, K, Body4>(body4),
+                    new type_to_key_function_body_leaf<T5, K, Body5>(body5),
+                    new type_to_key_function_body_leaf<T6, K, Body6>(body6)
+                    ) ) {
+            static_assert(std::tuple_size<OutputTuple>::value == 7, "wrong number of body initializers");
+        }
+        unfolded_join_node(const unfolded_join_node &other) : base_type(other) {}
+    };
 #endif
 
 #if __TBB_VARIADIC_MAX >= 8
-template <typename OutputTuple, typename K, typename KHash>
-class unfolded_join_node<8, key_matching_port, OutputTuple, key_matching<K, KHash>>
-    : public join_base<8, key_matching_port, OutputTuple, key_matching<K, KHash>>::type {
-    typedef typename std::tuple_element<0, OutputTuple>::type T0;
-    typedef typename std::tuple_element<1, OutputTuple>::type T1;
-    typedef typename std::tuple_element<2, OutputTuple>::type T2;
-    typedef typename std::tuple_element<3, OutputTuple>::type T3;
-    typedef typename std::tuple_element<4, OutputTuple>::type T4;
-    typedef typename std::tuple_element<5, OutputTuple>::type T5;
-    typedef typename std::tuple_element<6, OutputTuple>::type T6;
-    typedef typename std::tuple_element<7, OutputTuple>::type T7;
-
-public:
-    typedef typename wrap_key_tuple_elements<8, key_matching_port, key_matching<K, KHash>, OutputTuple>::type
-            input_ports_type;
-    typedef OutputTuple output_type;
-
-private:
-    typedef join_node_base<key_matching<K, KHash>, input_ports_type, output_type> base_type;
-    typedef type_to_key_function_body<T0, K> *f0_p;
-    typedef type_to_key_function_body<T1, K> *f1_p;
-    typedef type_to_key_function_body<T2, K> *f2_p;
-    typedef type_to_key_function_body<T3, K> *f3_p;
-    typedef type_to_key_function_body<T4, K> *f4_p;
-    typedef type_to_key_function_body<T5, K> *f5_p;
-    typedef type_to_key_function_body<T6, K> *f6_p;
-    typedef type_to_key_function_body<T7, K> *f7_p;
-    typedef std::tuple<f0_p, f1_p, f2_p, f3_p, f4_p, f5_p, f6_p, f7_p> func_initializer_type;
-
-public:
+    template<typename OutputTuple, typename K, typename KHash>
+    class unfolded_join_node<8,key_matching_port,OutputTuple,key_matching<K,KHash> > : public
+            join_base<8,key_matching_port,OutputTuple,key_matching<K,KHash> >::type {
+        typedef typename std::tuple_element<0, OutputTuple>::type T0;
+        typedef typename std::tuple_element<1, OutputTuple>::type T1;
+        typedef typename std::tuple_element<2, OutputTuple>::type T2;
+        typedef typename std::tuple_element<3, OutputTuple>::type T3;
+        typedef typename std::tuple_element<4, OutputTuple>::type T4;
+        typedef typename std::tuple_element<5, OutputTuple>::type T5;
+        typedef typename std::tuple_element<6, OutputTuple>::type T6;
+        typedef typename std::tuple_element<7, OutputTuple>::type T7;
+    public:
+        typedef typename wrap_key_tuple_elements<8,key_matching_port,key_matching<K,KHash>,OutputTuple>::type input_ports_type;
+        typedef OutputTuple output_type;
+    private:
+        typedef join_node_base<key_matching<K,KHash> , input_ports_type, output_type > base_type;
+        typedef type_to_key_function_body<T0, K> *f0_p;
+        typedef type_to_key_function_body<T1, K> *f1_p;
+        typedef type_to_key_function_body<T2, K> *f2_p;
+        typedef type_to_key_function_body<T3, K> *f3_p;
+        typedef type_to_key_function_body<T4, K> *f4_p;
+        typedef type_to_key_function_body<T5, K> *f5_p;
+        typedef type_to_key_function_body<T6, K> *f6_p;
+        typedef type_to_key_function_body<T7, K> *f7_p;
+        typedef std::tuple< f0_p, f1_p, f2_p, f3_p, f4_p, f5_p, f6_p, f7_p > func_initializer_type;
+    public:
 #if __TBB_PREVIEW_MESSAGE_BASED_KEY_MATCHING
-    unfolded_join_node(graph &g)
-        : base_type(g, func_initializer_type(
-                               new type_to_key_function_body_leaf<T0, K, key_from_message_body<K, T0>>(
-                                       key_from_message_body<K, T0>()),
-                               new type_to_key_function_body_leaf<T1, K, key_from_message_body<K, T1>>(
-                                       key_from_message_body<K, T1>()),
-                               new type_to_key_function_body_leaf<T2, K, key_from_message_body<K, T2>>(
-                                       key_from_message_body<K, T2>()),
-                               new type_to_key_function_body_leaf<T3, K, key_from_message_body<K, T3>>(
-                                       key_from_message_body<K, T3>()),
-                               new type_to_key_function_body_leaf<T4, K, key_from_message_body<K, T4>>(
-                                       key_from_message_body<K, T4>()),
-                               new type_to_key_function_body_leaf<T5, K, key_from_message_body<K, T5>>(
-                                       key_from_message_body<K, T5>()),
-                               new type_to_key_function_body_leaf<T6, K, key_from_message_body<K, T6>>(
-                                       key_from_message_body<K, T6>()),
-                               new type_to_key_function_body_leaf<T7, K, key_from_message_body<K, T7>>(
-                                       key_from_message_body<K, T7>()))) {}
+        unfolded_join_node(graph &g) : base_type(g,
+                func_initializer_type(
+                    new type_to_key_function_body_leaf<T0, K, key_from_message_body<K,T0> >(key_from_message_body<K,T0>()),
+                    new type_to_key_function_body_leaf<T1, K, key_from_message_body<K,T1> >(key_from_message_body<K,T1>()),
+                    new type_to_key_function_body_leaf<T2, K, key_from_message_body<K,T2> >(key_from_message_body<K,T2>()),
+                    new type_to_key_function_body_leaf<T3, K, key_from_message_body<K,T3> >(key_from_message_body<K,T3>()),
+                    new type_to_key_function_body_leaf<T4, K, key_from_message_body<K,T4> >(key_from_message_body<K,T4>()),
+                    new type_to_key_function_body_leaf<T5, K, key_from_message_body<K,T5> >(key_from_message_body<K,T5>()),
+                    new type_to_key_function_body_leaf<T6, K, key_from_message_body<K,T6> >(key_from_message_body<K,T6>()),
+                    new type_to_key_function_body_leaf<T7, K, key_from_message_body<K,T7> >(key_from_message_body<K,T7>())
+                    ) ) {
+        }
 #endif /* __TBB_PREVIEW_MESSAGE_BASED_KEY_MATCHING */
-    template <typename Body0, typename Body1, typename Body2, typename Body3, typename Body4, typename Body5,
-              typename Body6, typename Body7>
-    unfolded_join_node(graph &g, Body0 body0, Body1 body1, Body2 body2, Body3 body3, Body4 body4, Body5 body5,
-                       Body6 body6, Body7 body7)
-        : base_type(g, func_initializer_type(new type_to_key_function_body_leaf<T0, K, Body0>(body0),
-                                             new type_to_key_function_body_leaf<T1, K, Body1>(body1),
-                                             new type_to_key_function_body_leaf<T2, K, Body2>(body2),
-                                             new type_to_key_function_body_leaf<T3, K, Body3>(body3),
-                                             new type_to_key_function_body_leaf<T4, K, Body4>(body4),
-                                             new type_to_key_function_body_leaf<T5, K, Body5>(body5),
-                                             new type_to_key_function_body_leaf<T6, K, Body6>(body6),
-                                             new type_to_key_function_body_leaf<T7, K, Body7>(body7))) {
-        static_assert(std::tuple_size<OutputTuple>::value == 8, "wrong number of body initializers");
-    }
-    unfolded_join_node(const unfolded_join_node &other) : base_type(other) {}
-};
+        template<typename Body0, typename Body1, typename Body2, typename Body3, typename Body4,
+                 typename Body5, typename Body6, typename Body7>
+        unfolded_join_node(graph &g, Body0 body0, Body1 body1, Body2 body2, Body3 body3, Body4 body4,
+                Body5 body5, Body6 body6, Body7 body7) : base_type(g, func_initializer_type(
+                    new type_to_key_function_body_leaf<T0, K, Body0>(body0),
+                    new type_to_key_function_body_leaf<T1, K, Body1>(body1),
+                    new type_to_key_function_body_leaf<T2, K, Body2>(body2),
+                    new type_to_key_function_body_leaf<T3, K, Body3>(body3),
+                    new type_to_key_function_body_leaf<T4, K, Body4>(body4),
+                    new type_to_key_function_body_leaf<T5, K, Body5>(body5),
+                    new type_to_key_function_body_leaf<T6, K, Body6>(body6),
+                    new type_to_key_function_body_leaf<T7, K, Body7>(body7)
+                    ) ) {
+            static_assert(std::tuple_size<OutputTuple>::value == 8, "wrong number of body initializers");
+        }
+        unfolded_join_node(const unfolded_join_node &other) : base_type(other) {}
+    };
 #endif
 
 #if __TBB_VARIADIC_MAX >= 9
-template <typename OutputTuple, typename K, typename KHash>
-class unfolded_join_node<9, key_matching_port, OutputTuple, key_matching<K, KHash>>
-    : public join_base<9, key_matching_port, OutputTuple, key_matching<K, KHash>>::type {
-    typedef typename std::tuple_element<0, OutputTuple>::type T0;
-    typedef typename std::tuple_element<1, OutputTuple>::type T1;
-    typedef typename std::tuple_element<2, OutputTuple>::type T2;
-    typedef typename std::tuple_element<3, OutputTuple>::type T3;
-    typedef typename std::tuple_element<4, OutputTuple>::type T4;
-    typedef typename std::tuple_element<5, OutputTuple>::type T5;
-    typedef typename std::tuple_element<6, OutputTuple>::type T6;
-    typedef typename std::tuple_element<7, OutputTuple>::type T7;
-    typedef typename std::tuple_element<8, OutputTuple>::type T8;
-
-public:
-    typedef typename wrap_key_tuple_elements<9, key_matching_port, key_matching<K, KHash>, OutputTuple>::type
-            input_ports_type;
-    typedef OutputTuple output_type;
-
-private:
-    typedef join_node_base<key_matching<K, KHash>, input_ports_type, output_type> base_type;
-    typedef type_to_key_function_body<T0, K> *f0_p;
-    typedef type_to_key_function_body<T1, K> *f1_p;
-    typedef type_to_key_function_body<T2, K> *f2_p;
-    typedef type_to_key_function_body<T3, K> *f3_p;
-    typedef type_to_key_function_body<T4, K> *f4_p;
-    typedef type_to_key_function_body<T5, K> *f5_p;
-    typedef type_to_key_function_body<T6, K> *f6_p;
-    typedef type_to_key_function_body<T7, K> *f7_p;
-    typedef type_to_key_function_body<T8, K> *f8_p;
-    typedef std::tuple<f0_p, f1_p, f2_p, f3_p, f4_p, f5_p, f6_p, f7_p, f8_p> func_initializer_type;
-
-public:
+    template<typename OutputTuple, typename K, typename KHash>
+    class unfolded_join_node<9,key_matching_port,OutputTuple,key_matching<K,KHash> > : public
+            join_base<9,key_matching_port,OutputTuple,key_matching<K,KHash> >::type {
+        typedef typename std::tuple_element<0, OutputTuple>::type T0;
+        typedef typename std::tuple_element<1, OutputTuple>::type T1;
+        typedef typename std::tuple_element<2, OutputTuple>::type T2;
+        typedef typename std::tuple_element<3, OutputTuple>::type T3;
+        typedef typename std::tuple_element<4, OutputTuple>::type T4;
+        typedef typename std::tuple_element<5, OutputTuple>::type T5;
+        typedef typename std::tuple_element<6, OutputTuple>::type T6;
+        typedef typename std::tuple_element<7, OutputTuple>::type T7;
+        typedef typename std::tuple_element<8, OutputTuple>::type T8;
+    public:
+        typedef typename wrap_key_tuple_elements<9,key_matching_port,key_matching<K,KHash>,OutputTuple>::type input_ports_type;
+        typedef OutputTuple output_type;
+    private:
+        typedef join_node_base<key_matching<K,KHash> , input_ports_type, output_type > base_type;
+        typedef type_to_key_function_body<T0, K> *f0_p;
+        typedef type_to_key_function_body<T1, K> *f1_p;
+        typedef type_to_key_function_body<T2, K> *f2_p;
+        typedef type_to_key_function_body<T3, K> *f3_p;
+        typedef type_to_key_function_body<T4, K> *f4_p;
+        typedef type_to_key_function_body<T5, K> *f5_p;
+        typedef type_to_key_function_body<T6, K> *f6_p;
+        typedef type_to_key_function_body<T7, K> *f7_p;
+        typedef type_to_key_function_body<T8, K> *f8_p;
+        typedef std::tuple< f0_p, f1_p, f2_p, f3_p, f4_p, f5_p, f6_p, f7_p, f8_p > func_initializer_type;
+    public:
 #if __TBB_PREVIEW_MESSAGE_BASED_KEY_MATCHING
-    unfolded_join_node(graph &g)
-        : base_type(g, func_initializer_type(
-                               new type_to_key_function_body_leaf<T0, K, key_from_message_body<K, T0>>(
-                                       key_from_message_body<K, T0>()),
-                               new type_to_key_function_body_leaf<T1, K, key_from_message_body<K, T1>>(
-                                       key_from_message_body<K, T1>()),
-                               new type_to_key_function_body_leaf<T2, K, key_from_message_body<K, T2>>(
-                                       key_from_message_body<K, T2>()),
-                               new type_to_key_function_body_leaf<T3, K, key_from_message_body<K, T3>>(
-                                       key_from_message_body<K, T3>()),
-                               new type_to_key_function_body_leaf<T4, K, key_from_message_body<K, T4>>(
-                                       key_from_message_body<K, T4>()),
-                               new type_to_key_function_body_leaf<T5, K, key_from_message_body<K, T5>>(
-                                       key_from_message_body<K, T5>()),
-                               new type_to_key_function_body_leaf<T6, K, key_from_message_body<K, T6>>(
-                                       key_from_message_body<K, T6>()),
-                               new type_to_key_function_body_leaf<T7, K, key_from_message_body<K, T7>>(
-                                       key_from_message_body<K, T7>()),
-                               new type_to_key_function_body_leaf<T8, K, key_from_message_body<K, T8>>(
-                                       key_from_message_body<K, T8>()))) {}
+        unfolded_join_node(graph &g) : base_type(g,
+                func_initializer_type(
+                    new type_to_key_function_body_leaf<T0, K, key_from_message_body<K,T0> >(key_from_message_body<K,T0>()),
+                    new type_to_key_function_body_leaf<T1, K, key_from_message_body<K,T1> >(key_from_message_body<K,T1>()),
+                    new type_to_key_function_body_leaf<T2, K, key_from_message_body<K,T2> >(key_from_message_body<K,T2>()),
+                    new type_to_key_function_body_leaf<T3, K, key_from_message_body<K,T3> >(key_from_message_body<K,T3>()),
+                    new type_to_key_function_body_leaf<T4, K, key_from_message_body<K,T4> >(key_from_message_body<K,T4>()),
+                    new type_to_key_function_body_leaf<T5, K, key_from_message_body<K,T5> >(key_from_message_body<K,T5>()),
+                    new type_to_key_function_body_leaf<T6, K, key_from_message_body<K,T6> >(key_from_message_body<K,T6>()),
+                    new type_to_key_function_body_leaf<T7, K, key_from_message_body<K,T7> >(key_from_message_body<K,T7>()),
+                    new type_to_key_function_body_leaf<T8, K, key_from_message_body<K,T8> >(key_from_message_body<K,T8>())
+                    ) ) {
+        }
 #endif /* __TBB_PREVIEW_MESSAGE_BASED_KEY_MATCHING */
-    template <typename Body0, typename Body1, typename Body2, typename Body3, typename Body4, typename Body5,
-              typename Body6, typename Body7, typename Body8>
-    unfolded_join_node(graph &g, Body0 body0, Body1 body1, Body2 body2, Body3 body3, Body4 body4, Body5 body5,
-                       Body6 body6, Body7 body7, Body8 body8)
-        : base_type(g, func_initializer_type(new type_to_key_function_body_leaf<T0, K, Body0>(body0),
-                                             new type_to_key_function_body_leaf<T1, K, Body1>(body1),
-                                             new type_to_key_function_body_leaf<T2, K, Body2>(body2),
-                                             new type_to_key_function_body_leaf<T3, K, Body3>(body3),
-                                             new type_to_key_function_body_leaf<T4, K, Body4>(body4),
-                                             new type_to_key_function_body_leaf<T5, K, Body5>(body5),
-                                             new type_to_key_function_body_leaf<T6, K, Body6>(body6),
-                                             new type_to_key_function_body_leaf<T7, K, Body7>(body7),
-                                             new type_to_key_function_body_leaf<T8, K, Body8>(body8))) {
-        static_assert(std::tuple_size<OutputTuple>::value == 9, "wrong number of body initializers");
-    }
-    unfolded_join_node(const unfolded_join_node &other) : base_type(other) {}
-};
+        template<typename Body0, typename Body1, typename Body2, typename Body3, typename Body4,
+                 typename Body5, typename Body6, typename Body7, typename Body8>
+        unfolded_join_node(graph &g, Body0 body0, Body1 body1, Body2 body2, Body3 body3, Body4 body4,
+                Body5 body5, Body6 body6, Body7 body7, Body8 body8) : base_type(g, func_initializer_type(
+                    new type_to_key_function_body_leaf<T0, K, Body0>(body0),
+                    new type_to_key_function_body_leaf<T1, K, Body1>(body1),
+                    new type_to_key_function_body_leaf<T2, K, Body2>(body2),
+                    new type_to_key_function_body_leaf<T3, K, Body3>(body3),
+                    new type_to_key_function_body_leaf<T4, K, Body4>(body4),
+                    new type_to_key_function_body_leaf<T5, K, Body5>(body5),
+                    new type_to_key_function_body_leaf<T6, K, Body6>(body6),
+                    new type_to_key_function_body_leaf<T7, K, Body7>(body7),
+                    new type_to_key_function_body_leaf<T8, K, Body8>(body8)
+                    ) ) {
+            static_assert(std::tuple_size<OutputTuple>::value == 9, "wrong number of body initializers");
+        }
+        unfolded_join_node(const unfolded_join_node &other) : base_type(other) {}
+    };
 #endif
 
 #if __TBB_VARIADIC_MAX >= 10
-template <typename OutputTuple, typename K, typename KHash>
-class unfolded_join_node<10, key_matching_port, OutputTuple, key_matching<K, KHash>>
-    : public join_base<10, key_matching_port, OutputTuple, key_matching<K, KHash>>::type {
-    typedef typename std::tuple_element<0, OutputTuple>::type T0;
-    typedef typename std::tuple_element<1, OutputTuple>::type T1;
-    typedef typename std::tuple_element<2, OutputTuple>::type T2;
-    typedef typename std::tuple_element<3, OutputTuple>::type T3;
-    typedef typename std::tuple_element<4, OutputTuple>::type T4;
-    typedef typename std::tuple_element<5, OutputTuple>::type T5;
-    typedef typename std::tuple_element<6, OutputTuple>::type T6;
-    typedef typename std::tuple_element<7, OutputTuple>::type T7;
-    typedef typename std::tuple_element<8, OutputTuple>::type T8;
-    typedef typename std::tuple_element<9, OutputTuple>::type T9;
-
-public:
-    typedef typename wrap_key_tuple_elements<10, key_matching_port, key_matching<K, KHash>, OutputTuple>::type
-            input_ports_type;
-    typedef OutputTuple output_type;
-
-private:
-    typedef join_node_base<key_matching<K, KHash>, input_ports_type, output_type> base_type;
-    typedef type_to_key_function_body<T0, K> *f0_p;
-    typedef type_to_key_function_body<T1, K> *f1_p;
-    typedef type_to_key_function_body<T2, K> *f2_p;
-    typedef type_to_key_function_body<T3, K> *f3_p;
-    typedef type_to_key_function_body<T4, K> *f4_p;
-    typedef type_to_key_function_body<T5, K> *f5_p;
-    typedef type_to_key_function_body<T6, K> *f6_p;
-    typedef type_to_key_function_body<T7, K> *f7_p;
-    typedef type_to_key_function_body<T8, K> *f8_p;
-    typedef type_to_key_function_body<T9, K> *f9_p;
-    typedef std::tuple<f0_p, f1_p, f2_p, f3_p, f4_p, f5_p, f6_p, f7_p, f8_p, f9_p> func_initializer_type;
-
-public:
+    template<typename OutputTuple, typename K, typename KHash>
+    class unfolded_join_node<10,key_matching_port,OutputTuple,key_matching<K,KHash> > : public
+            join_base<10,key_matching_port,OutputTuple,key_matching<K,KHash> >::type {
+        typedef typename std::tuple_element<0, OutputTuple>::type T0;
+        typedef typename std::tuple_element<1, OutputTuple>::type T1;
+        typedef typename std::tuple_element<2, OutputTuple>::type T2;
+        typedef typename std::tuple_element<3, OutputTuple>::type T3;
+        typedef typename std::tuple_element<4, OutputTuple>::type T4;
+        typedef typename std::tuple_element<5, OutputTuple>::type T5;
+        typedef typename std::tuple_element<6, OutputTuple>::type T6;
+        typedef typename std::tuple_element<7, OutputTuple>::type T7;
+        typedef typename std::tuple_element<8, OutputTuple>::type T8;
+        typedef typename std::tuple_element<9, OutputTuple>::type T9;
+    public:
+        typedef typename wrap_key_tuple_elements<10,key_matching_port,key_matching<K,KHash>,OutputTuple>::type input_ports_type;
+        typedef OutputTuple output_type;
+    private:
+        typedef join_node_base<key_matching<K,KHash> , input_ports_type, output_type > base_type;
+        typedef type_to_key_function_body<T0, K> *f0_p;
+        typedef type_to_key_function_body<T1, K> *f1_p;
+        typedef type_to_key_function_body<T2, K> *f2_p;
+        typedef type_to_key_function_body<T3, K> *f3_p;
+        typedef type_to_key_function_body<T4, K> *f4_p;
+        typedef type_to_key_function_body<T5, K> *f5_p;
+        typedef type_to_key_function_body<T6, K> *f6_p;
+        typedef type_to_key_function_body<T7, K> *f7_p;
+        typedef type_to_key_function_body<T8, K> *f8_p;
+        typedef type_to_key_function_body<T9, K> *f9_p;
+        typedef std::tuple< f0_p, f1_p, f2_p, f3_p, f4_p, f5_p, f6_p, f7_p, f8_p, f9_p > func_initializer_type;
+    public:
 #if __TBB_PREVIEW_MESSAGE_BASED_KEY_MATCHING
-    unfolded_join_node(graph &g)
-        : base_type(g, func_initializer_type(
-                               new type_to_key_function_body_leaf<T0, K, key_from_message_body<K, T0>>(
-                                       key_from_message_body<K, T0>()),
-                               new type_to_key_function_body_leaf<T1, K, key_from_message_body<K, T1>>(
-                                       key_from_message_body<K, T1>()),
-                               new type_to_key_function_body_leaf<T2, K, key_from_message_body<K, T2>>(
-                                       key_from_message_body<K, T2>()),
-                               new type_to_key_function_body_leaf<T3, K, key_from_message_body<K, T3>>(
-                                       key_from_message_body<K, T3>()),
-                               new type_to_key_function_body_leaf<T4, K, key_from_message_body<K, T4>>(
-                                       key_from_message_body<K, T4>()),
-                               new type_to_key_function_body_leaf<T5, K, key_from_message_body<K, T5>>(
-                                       key_from_message_body<K, T5>()),
-                               new type_to_key_function_body_leaf<T6, K, key_from_message_body<K, T6>>(
-                                       key_from_message_body<K, T6>()),
-                               new type_to_key_function_body_leaf<T7, K, key_from_message_body<K, T7>>(
-                                       key_from_message_body<K, T7>()),
-                               new type_to_key_function_body_leaf<T8, K, key_from_message_body<K, T8>>(
-                                       key_from_message_body<K, T8>()),
-                               new type_to_key_function_body_leaf<T9, K, key_from_message_body<K, T9>>(
-                                       key_from_message_body<K, T9>()))) {}
+        unfolded_join_node(graph &g) : base_type(g,
+                func_initializer_type(
+                    new type_to_key_function_body_leaf<T0, K, key_from_message_body<K,T0> >(key_from_message_body<K,T0>()),
+                    new type_to_key_function_body_leaf<T1, K, key_from_message_body<K,T1> >(key_from_message_body<K,T1>()),
+                    new type_to_key_function_body_leaf<T2, K, key_from_message_body<K,T2> >(key_from_message_body<K,T2>()),
+                    new type_to_key_function_body_leaf<T3, K, key_from_message_body<K,T3> >(key_from_message_body<K,T3>()),
+                    new type_to_key_function_body_leaf<T4, K, key_from_message_body<K,T4> >(key_from_message_body<K,T4>()),
+                    new type_to_key_function_body_leaf<T5, K, key_from_message_body<K,T5> >(key_from_message_body<K,T5>()),
+                    new type_to_key_function_body_leaf<T6, K, key_from_message_body<K,T6> >(key_from_message_body<K,T6>()),
+                    new type_to_key_function_body_leaf<T7, K, key_from_message_body<K,T7> >(key_from_message_body<K,T7>()),
+                    new type_to_key_function_body_leaf<T8, K, key_from_message_body<K,T8> >(key_from_message_body<K,T8>()),
+                    new type_to_key_function_body_leaf<T9, K, key_from_message_body<K,T9> >(key_from_message_body<K,T9>())
+                    ) ) {
+        }
 #endif /* __TBB_PREVIEW_MESSAGE_BASED_KEY_MATCHING */
-    template <typename Body0, typename Body1, typename Body2, typename Body3, typename Body4, typename Body5,
-              typename Body6, typename Body7, typename Body8, typename Body9>
-    unfolded_join_node(graph &g, Body0 body0, Body1 body1, Body2 body2, Body3 body3, Body4 body4, Body5 body5,
-                       Body6 body6, Body7 body7, Body8 body8, Body9 body9)
-        : base_type(g, func_initializer_type(new type_to_key_function_body_leaf<T0, K, Body0>(body0),
-                                             new type_to_key_function_body_leaf<T1, K, Body1>(body1),
-                                             new type_to_key_function_body_leaf<T2, K, Body2>(body2),
-                                             new type_to_key_function_body_leaf<T3, K, Body3>(body3),
-                                             new type_to_key_function_body_leaf<T4, K, Body4>(body4),
-                                             new type_to_key_function_body_leaf<T5, K, Body5>(body5),
-                                             new type_to_key_function_body_leaf<T6, K, Body6>(body6),
-                                             new type_to_key_function_body_leaf<T7, K, Body7>(body7),
-                                             new type_to_key_function_body_leaf<T8, K, Body8>(body8),
-                                             new type_to_key_function_body_leaf<T9, K, Body9>(body9))) {
-        static_assert(std::tuple_size<OutputTuple>::value == 10, "wrong number of body initializers");
-    }
-    unfolded_join_node(const unfolded_join_node &other) : base_type(other) {}
-};
+        template<typename Body0, typename Body1, typename Body2, typename Body3, typename Body4,
+            typename Body5, typename Body6, typename Body7, typename Body8, typename Body9>
+        unfolded_join_node(graph &g, Body0 body0, Body1 body1, Body2 body2, Body3 body3, Body4 body4,
+                Body5 body5, Body6 body6, Body7 body7, Body8 body8, Body9 body9) : base_type(g, func_initializer_type(
+                    new type_to_key_function_body_leaf<T0, K, Body0>(body0),
+                    new type_to_key_function_body_leaf<T1, K, Body1>(body1),
+                    new type_to_key_function_body_leaf<T2, K, Body2>(body2),
+                    new type_to_key_function_body_leaf<T3, K, Body3>(body3),
+                    new type_to_key_function_body_leaf<T4, K, Body4>(body4),
+                    new type_to_key_function_body_leaf<T5, K, Body5>(body5),
+                    new type_to_key_function_body_leaf<T6, K, Body6>(body6),
+                    new type_to_key_function_body_leaf<T7, K, Body7>(body7),
+                    new type_to_key_function_body_leaf<T8, K, Body8>(body8),
+                    new type_to_key_function_body_leaf<T9, K, Body9>(body9)
+                    ) ) {
+            static_assert(std::tuple_size<OutputTuple>::value == 10, "wrong number of body initializers");
+        }
+        unfolded_join_node(const unfolded_join_node &other) : base_type(other) {}
+    };
 #endif
 
-//! templated function to refer to input ports of the join node
-template <size_t N, typename JNT>
-typename std::tuple_element<N, typename JNT::input_ports_type>::type &input_port(JNT &jn) {
-    return std::get<N>(jn.input_ports());
-}
+    //! templated function to refer to input ports of the join node
+    template<size_t N, typename JNT>
+    typename std::tuple_element<N, typename JNT::input_ports_type>::type &input_port(JNT &jn) {
+        return std::get<N>(jn.input_ports());
+    }
 
-#endif// __TBB__flow_graph_join_impl_H
+#endif // __TBB__flow_graph_join_impl_H
diff --git a/external/tbb/include/oneapi/tbb/detail/_flow_graph_node_impl.h b/external/tbb/include/oneapi/tbb/detail/_flow_graph_node_impl.h
index 99d1517b..336cb069 100644
--- a/external/tbb/include/oneapi/tbb/detail/_flow_graph_node_impl.h
+++ b/external/tbb/include/oneapi/tbb/detail/_flow_graph_node_impl.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -23,61 +23,93 @@
 
 #include "_flow_graph_item_buffer_impl.h"
 
-template <typename T, typename A>
-class function_input_queue : public item_buffer<T, A> {
+template< typename T, typename A >
+class function_input_queue : public item_buffer<T,A> {
 public:
-    bool empty() const { return this->buffer_empty(); }
+    bool empty() const {
+        return this->buffer_empty();
+    }
+
+    const T& front() const {
+        return this->item_buffer<T, A>::front();
+    }
 
-    const T& front() const { return this->item_buffer<T, A>::front(); }
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+    const message_metainfo& front_metainfo() const {
+        return this->item_buffer<T,A>::front_metainfo();
+    }
+#endif
 
-    void pop() { this->destroy_front(); }
+    void pop() {
+        this->destroy_front();
+    }
 
-    bool push(T& t) { return this->push_back(t); }
+    bool push( T& t ) {
+        return this->push_back( t );
+    }
+
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+    bool push( T& t, const message_metainfo& metainfo ) {
+        return this->push_back(t, metainfo);
+    }
+#endif
 };
 
 //! Input and scheduling for a function node that takes a type Input as input
 //  The only up-ref is apply_body_impl, which should implement the function
 //  call and any handling of the result.
-template <typename Input, typename Policy, typename A, typename ImplType>
+template< typename Input, typename Policy, typename A, typename ImplType >
 class function_input_base : public receiver<Input>, no_assign {
-    enum op_type { reg_pred, rem_pred, try_fwd, tryput_bypass, app_body_bypass, occupy_concurrency };
+    enum op_type {reg_pred, rem_pred, try_fwd, tryput_bypass, app_body_bypass, occupy_concurrency
+    };
     typedef function_input_base<Input, Policy, A, ImplType> class_type;
 
 public:
+
     //! The input type of this receiver
     typedef Input input_type;
     typedef typename receiver<input_type>::predecessor_type predecessor_type;
-    typedef predecessor_cache<input_type, null_mutex> predecessor_cache_type;
+    typedef predecessor_cache<input_type, null_mutex > predecessor_cache_type;
     typedef function_input_queue<input_type, A> input_queue_type;
     typedef typename allocator_traits<A>::template rebind_alloc<input_queue_type> allocator_type;
     static_assert(!has_policy<queueing, Policy>::value || !has_policy<rejecting, Policy>::value, "");
 
     //! Constructor for function_input_base
-    function_input_base(graph& g, size_t max_concurrency, node_priority_t a_priority)
-        : my_graph_ref(g), my_max_concurrency(max_concurrency), my_concurrency(0), my_priority(a_priority),
-          my_queue(!has_policy<rejecting, Policy>::value ? new input_queue_type() : NULL),
-          my_predecessors(this), forwarder_busy(false) {
+    function_input_base( graph &g, size_t max_concurrency, node_priority_t a_priority, bool is_no_throw )
+        : my_graph_ref(g), my_max_concurrency(max_concurrency)
+        , my_concurrency(0), my_priority(a_priority), my_is_no_throw(is_no_throw)
+        , my_queue(!has_policy<rejecting, Policy>::value ? new input_queue_type() : nullptr)
+        , my_predecessors(this)
+        , forwarder_busy(false)
+    {
         my_aggregator.initialize_handler(handler_type(this));
     }
 
     //! Copy constructor
-    function_input_base(const function_input_base& src)
-        : function_input_base(src.my_graph_ref, src.my_max_concurrency, src.my_priority) {}
+    function_input_base( const function_input_base& src )
+        : function_input_base(src.my_graph_ref, src.my_max_concurrency, src.my_priority, src.my_is_no_throw) {}
 
     //! Destructor
     // The queue is allocated by the constructor for {multi}function_node.
     // TODO: pass the graph_buffer_policy to the base so it can allocate the queue instead.
     // This would be an interface-breaking change.
     virtual ~function_input_base() {
-        if (my_queue) delete my_queue;
+        delete my_queue;
+        my_queue = nullptr;
+    }
+
+    graph_task* try_put_task( const input_type& t) override {
+        return try_put_task_base(t __TBB_FLOW_GRAPH_METAINFO_ARG(message_metainfo{}));
     }
 
-    graph_task* try_put_task(const input_type& t) override {
-        return try_put_task_impl(t, has_policy<lightweight, Policy>());
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+    graph_task* try_put_task( const input_type& t, const message_metainfo& metainfo ) override {
+        return try_put_task_base(t, metainfo);
     }
+#endif // __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
 
     //! Adds src to the list of cached predecessors.
-    bool register_predecessor(predecessor_type& src) override {
+    bool register_predecessor( predecessor_type &src ) override {
         operation_type op_data(reg_pred);
         op_data.r = &src;
         my_aggregator.execute(&op_data);
@@ -85,7 +117,7 @@ class function_input_base : public receiver<Input>, no_assign {
     }
 
     //! Removes src from the list of cached predecessors.
-    bool remove_predecessor(predecessor_type& src) override {
+    bool remove_predecessor( predecessor_type &src ) override {
         operation_type op_data(rem_pred);
         op_data.r = &src;
         my_aggregator.execute(&op_data);
@@ -93,9 +125,12 @@ class function_input_base : public receiver<Input>, no_assign {
     }
 
 protected:
-    void reset_function_input_base(reset_flags f) {
+
+    void reset_function_input_base( reset_flags f) {
         my_concurrency = 0;
-        if (my_queue) { my_queue->reset(); }
+        if(my_queue) {
+            my_queue->reset();
+        }
         reset_receiver(f);
         forwarder_busy = false;
     }
@@ -104,187 +139,257 @@ class function_input_base : public receiver<Input>, no_assign {
     const size_t my_max_concurrency;
     size_t my_concurrency;
     node_priority_t my_priority;
-    input_queue_type* my_queue;
-    predecessor_cache<input_type, null_mutex> my_predecessors;
+    const bool my_is_no_throw;
+    input_queue_type *my_queue;
+    predecessor_cache<input_type, null_mutex > my_predecessors;
 
-    void reset_receiver(reset_flags f) {
-        if (f & rf_clear_edges) my_predecessors.clear();
+    void reset_receiver( reset_flags f) {
+        if( f & rf_clear_edges) my_predecessors.clear();
         else
             my_predecessors.reset();
         __TBB_ASSERT(!(f & rf_clear_edges) || my_predecessors.empty(), "function_input_base reset failed");
     }
 
-    graph& graph_reference() const override { return my_graph_ref; }
+    graph& graph_reference() const override {
+        return my_graph_ref;
+    }
 
     graph_task* try_get_postponed_task(const input_type& i) {
-        operation_type op_data(i, app_body_bypass);// tries to pop an item or get_item
+        operation_type op_data(i, app_body_bypass);  // tries to pop an item or get_item
         my_aggregator.execute(&op_data);
         return op_data.bypass_t;
     }
 
 private:
-    friend class apply_body_task_bypass<class_type, input_type>;
-    friend class forward_task_bypass<class_type>;
 
-    class operation_type : public aggregated_operation<operation_type> {
+    friend class apply_body_task_bypass< class_type, input_type >;
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+    friend class apply_body_task_bypass< class_type, input_type, trackable_messages_graph_task >;
+#endif
+    friend class forward_task_bypass< class_type >;
+
+    class operation_type : public d1::aggregated_operation< operation_type > {
     public:
         char type;
         union {
-            input_type* elem;
-            predecessor_type* r;
+            input_type *elem;
+            predecessor_type *r;
         };
         graph_task* bypass_t;
-        operation_type(const input_type& e, op_type t) : type(char(t)), elem(const_cast<input_type*>(&e)) {}
-        operation_type(op_type t) : type(char(t)), r(NULL) {}
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+        message_metainfo* metainfo;
+#endif
+        operation_type(const input_type& e, op_type t) :
+            type(char(t)), elem(const_cast<input_type*>(&e)), bypass_t(nullptr)
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+            , metainfo(nullptr)
+#endif
+        {}
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+        operation_type(const input_type& e, op_type t, const message_metainfo& info) :
+            type(char(t)), elem(const_cast<input_type*>(&e)), bypass_t(nullptr),
+            metainfo(const_cast<message_metainfo*>(&info)) {}
+#endif
+        operation_type(op_type t) : type(char(t)), r(nullptr), bypass_t(nullptr) {}
     };
 
     bool forwarder_busy;
-    typedef aggregating_functor<class_type, operation_type> handler_type;
-    friend class aggregating_functor<class_type, operation_type>;
-    aggregator<handler_type, operation_type> my_aggregator;
+    typedef d1::aggregating_functor<class_type, operation_type> handler_type;
+    friend class d1::aggregating_functor<class_type, operation_type>;
+    d1::aggregator< handler_type, operation_type > my_aggregator;
 
     graph_task* perform_queued_requests() {
-        graph_task* new_task = NULL;
-        if (my_queue) {
-            if (!my_queue->empty()) {
+        graph_task* new_task = nullptr;
+        if(my_queue) {
+            if(!my_queue->empty()) {
                 ++my_concurrency;
-                new_task = create_body_task(my_queue->front());
+                // TODO: consider removing metainfo from the queue using move semantics to avoid
+                // ref counter increase
+                new_task = create_body_task(my_queue->front()
+                                            __TBB_FLOW_GRAPH_METAINFO_ARG(my_queue->front_metainfo()));
 
                 my_queue->pop();
             }
-        } else {
+        }
+        else {
             input_type i;
-            if (my_predecessors.get_item(i)) {
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+            message_metainfo metainfo;
+#endif
+            if(my_predecessors.get_item(i __TBB_FLOW_GRAPH_METAINFO_ARG(metainfo))) {
                 ++my_concurrency;
-                new_task = create_body_task(i);
+                new_task = create_body_task(i __TBB_FLOW_GRAPH_METAINFO_ARG(std::move(metainfo)));
             }
         }
         return new_task;
     }
-    void handle_operations(operation_type* op_list) {
+    void handle_operations(operation_type *op_list) {
         operation_type* tmp;
         while (op_list) {
             tmp = op_list;
             op_list = op_list->next;
             switch (tmp->type) {
-                case reg_pred:
-                    my_predecessors.add(*(tmp->r));
-                    tmp->status.store(SUCCEEDED, std::memory_order_release);
-                    if (!forwarder_busy) {
-                        forwarder_busy = true;
-                        spawn_forward_task();
-                    }
-                    break;
-                case rem_pred:
-                    my_predecessors.remove(*(tmp->r));
-                    tmp->status.store(SUCCEEDED, std::memory_order_release);
-                    break;
-                case app_body_bypass: {
-                    tmp->bypass_t = NULL;
-                    __TBB_ASSERT(my_max_concurrency != 0, NULL);
-                    --my_concurrency;
-                    if (my_concurrency < my_max_concurrency) tmp->bypass_t = perform_queued_requests();
+            case reg_pred:
+                my_predecessors.add(*(tmp->r));
+                tmp->status.store(SUCCEEDED, std::memory_order_release);
+                if (!forwarder_busy) {
+                    forwarder_busy = true;
+                    spawn_forward_task();
+                }
+                break;
+            case rem_pred:
+                my_predecessors.remove(*(tmp->r));
+                tmp->status.store(SUCCEEDED, std::memory_order_release);
+                break;
+            case app_body_bypass: {
+                tmp->bypass_t = nullptr;
+                __TBB_ASSERT(my_max_concurrency != 0, nullptr);
+                --my_concurrency;
+                if(my_concurrency<my_max_concurrency)
+                    tmp->bypass_t = perform_queued_requests();
+                tmp->status.store(SUCCEEDED, std::memory_order_release);
+            }
+                break;
+            case tryput_bypass: internal_try_put_task(tmp);  break;
+            case try_fwd: internal_forward(tmp);  break;
+            case occupy_concurrency:
+                if (my_concurrency < my_max_concurrency) {
+                    ++my_concurrency;
                     tmp->status.store(SUCCEEDED, std::memory_order_release);
-                } break;
-                case tryput_bypass:
-                    internal_try_put_task(tmp);
-                    break;
-                case try_fwd:
-                    internal_forward(tmp);
-                    break;
-                case occupy_concurrency:
-                    if (my_concurrency < my_max_concurrency) {
-                        ++my_concurrency;
-                        tmp->status.store(SUCCEEDED, std::memory_order_release);
-                    } else {
-                        tmp->status.store(FAILED, std::memory_order_release);
-                    }
-                    break;
+                } else {
+                    tmp->status.store(FAILED, std::memory_order_release);
+                }
+                break;
             }
         }
     }
 
     //! Put to the node, but return the task instead of enqueueing it
-    void internal_try_put_task(operation_type* op) {
-        __TBB_ASSERT(my_max_concurrency != 0, NULL);
+    void internal_try_put_task(operation_type *op) {
+        __TBB_ASSERT(my_max_concurrency != 0, nullptr);
         if (my_concurrency < my_max_concurrency) {
             ++my_concurrency;
-            graph_task* new_task = create_body_task(*(op->elem));
+            graph_task* new_task = create_body_task(*(op->elem)
+                                                    __TBB_FLOW_GRAPH_METAINFO_ARG(*(op->metainfo)));
             op->bypass_t = new_task;
             op->status.store(SUCCEEDED, std::memory_order_release);
-        } else if (my_queue && my_queue->push(*(op->elem))) {
+        } else if ( my_queue && my_queue->push(*(op->elem)
+                    __TBB_FLOW_GRAPH_METAINFO_ARG(*(op->metainfo))) )
+        {
             op->bypass_t = SUCCESSFULLY_ENQUEUED;
             op->status.store(SUCCEEDED, std::memory_order_release);
         } else {
-            op->bypass_t = NULL;
+            op->bypass_t = nullptr;
             op->status.store(FAILED, std::memory_order_release);
         }
     }
 
     //! Creates tasks for postponed messages if available and if concurrency allows
-    void internal_forward(operation_type* op) {
-        op->bypass_t = NULL;
-        if (my_concurrency < my_max_concurrency) op->bypass_t = perform_queued_requests();
-        if (op->bypass_t) op->status.store(SUCCEEDED, std::memory_order_release);
+    void internal_forward(operation_type *op) {
+        op->bypass_t = nullptr;
+        if (my_concurrency < my_max_concurrency)
+            op->bypass_t = perform_queued_requests();
+        if(op->bypass_t)
+            op->status.store(SUCCEEDED, std::memory_order_release);
         else {
             forwarder_busy = false;
             op->status.store(FAILED, std::memory_order_release);
         }
     }
 
-    graph_task* internal_try_put_bypass(const input_type& t) {
-        operation_type op_data(t, tryput_bypass);
+    graph_task* internal_try_put_bypass( const input_type& t
+                                         __TBB_FLOW_GRAPH_METAINFO_ARG(const message_metainfo& metainfo))
+    {
+        operation_type op_data(t, tryput_bypass __TBB_FLOW_GRAPH_METAINFO_ARG(metainfo));
         my_aggregator.execute(&op_data);
-        if (op_data.status == SUCCEEDED) { return op_data.bypass_t; }
-        return NULL;
+        if( op_data.status == SUCCEEDED ) {
+            return op_data.bypass_t;
+        }
+        return nullptr;
     }
 
-    graph_task* try_put_task_impl(const input_type& t, /*lightweight=*/std::true_type) {
-        if (my_max_concurrency == 0) {
-            return apply_body_bypass(t);
+    graph_task* try_put_task_base(const input_type& t
+                                  __TBB_FLOW_GRAPH_METAINFO_ARG(const message_metainfo& metainfo))
+    {
+        if ( my_is_no_throw )
+            return try_put_task_impl(t, has_policy<lightweight, Policy>()
+                                     __TBB_FLOW_GRAPH_METAINFO_ARG(metainfo));
+        else
+            return try_put_task_impl(t, std::false_type()
+                                     __TBB_FLOW_GRAPH_METAINFO_ARG(metainfo));
+    }
+
+    graph_task* try_put_task_impl( const input_type& t, /*lightweight=*/std::true_type
+                                   __TBB_FLOW_GRAPH_METAINFO_ARG(const message_metainfo& metainfo))
+    {
+        if( my_max_concurrency == 0 ) {
+            return apply_body_bypass(t __TBB_FLOW_GRAPH_METAINFO_ARG(metainfo));
         } else {
             operation_type check_op(t, occupy_concurrency);
             my_aggregator.execute(&check_op);
-            if (check_op.status == SUCCEEDED) { return apply_body_bypass(t); }
-            return internal_try_put_bypass(t);
+            if( check_op.status == SUCCEEDED ) {
+                return apply_body_bypass(t __TBB_FLOW_GRAPH_METAINFO_ARG(metainfo));
+            }
+            return internal_try_put_bypass(t __TBB_FLOW_GRAPH_METAINFO_ARG(metainfo));
         }
     }
 
-    graph_task* try_put_task_impl(const input_type& t, /*lightweight=*/std::false_type) {
-        if (my_max_concurrency == 0) {
-            return create_body_task(t);
+    graph_task* try_put_task_impl( const input_type& t, /*lightweight=*/std::false_type
+                                   __TBB_FLOW_GRAPH_METAINFO_ARG(const message_metainfo& metainfo))
+    {
+        if( my_max_concurrency == 0 ) {
+            return create_body_task(t __TBB_FLOW_GRAPH_METAINFO_ARG(metainfo));
         } else {
-            return internal_try_put_bypass(t);
+            return internal_try_put_bypass(t __TBB_FLOW_GRAPH_METAINFO_ARG(metainfo));
         }
     }
 
     //! Applies the body to the provided input
     //  then decides if more work is available
-    graph_task* apply_body_bypass(const input_type& i) {
-        return static_cast<ImplType*>(this)->apply_body_impl_bypass(i);
+    graph_task* apply_body_bypass( const input_type &i
+                                   __TBB_FLOW_GRAPH_METAINFO_ARG(const message_metainfo& metainfo))
+
+    {
+        return static_cast<ImplType *>(this)->apply_body_impl_bypass(i __TBB_FLOW_GRAPH_METAINFO_ARG(metainfo));
     }
 
     //! allocates a task to apply a body
-    graph_task* create_body_task(const input_type& input) {
-        if (!is_graph_active(my_graph_ref)) { return nullptr; }
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+    template <typename Metainfo>
+    graph_task* create_body_task( const input_type &input, Metainfo&& metainfo )
+#else
+    graph_task* create_body_task( const input_type &input )
+#endif
+    {
+        if (!is_graph_active(my_graph_ref)) {
+            return nullptr;
+        }
         // TODO revamp: extract helper for common graph task allocation part
-        small_object_allocator allocator {};
-        typedef apply_body_task_bypass<class_type, input_type> task_type;
-        graph_task* t = allocator.new_object<task_type>(my_graph_ref, allocator, *this, input, my_priority);
-        graph_reference().reserve_wait();
+        d1::small_object_allocator allocator{};
+        graph_task* t = nullptr;
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+        if (!metainfo.empty()) {
+            using task_type = apply_body_task_bypass<class_type, input_type, trackable_messages_graph_task>;
+            t = allocator.new_object<task_type>(my_graph_ref, allocator, *this, input, my_priority, std::forward<Metainfo>(metainfo));
+        } else
+#endif
+        {
+            using task_type = apply_body_task_bypass<class_type, input_type>;
+            t = allocator.new_object<task_type>(my_graph_ref, allocator, *this, input, my_priority);
+        }
         return t;
     }
 
     //! This is executed by an enqueued task, the "forwarder"
     graph_task* forward_task() {
         operation_type op_data(try_fwd);
-        graph_task* rval = NULL;
+        graph_task* rval = nullptr;
         do {
             op_data.status = WAIT;
             my_aggregator.execute(&op_data);
-            if (op_data.status == SUCCEEDED) {
+            if(op_data.status == SUCCEEDED) {
                 graph_task* ttask = op_data.bypass_t;
-                __TBB_ASSERT(ttask && ttask != SUCCESSFULLY_ENQUEUED, NULL);
+                __TBB_ASSERT( ttask && ttask != SUCCESSFULLY_ENQUEUED, nullptr);
                 rval = combine_tasks(my_graph_ref, rval, ttask);
             }
         } while (op_data.status == SUCCEEDED);
@@ -292,94 +397,103 @@ class function_input_base : public receiver<Input>, no_assign {
     }
 
     inline graph_task* create_forward_task() {
-        if (!is_graph_active(my_graph_ref)) { return nullptr; }
-        small_object_allocator allocator {};
+        if (!is_graph_active(my_graph_ref)) {
+            return nullptr;
+        }
+        d1::small_object_allocator allocator{};
         typedef forward_task_bypass<class_type> task_type;
-        graph_task* t = allocator.new_object<task_type>(graph_reference(), allocator, *this, my_priority);
-        graph_reference().reserve_wait();
+        graph_task* t = allocator.new_object<task_type>( graph_reference(), allocator, *this, my_priority );
         return t;
     }
 
     //! Spawns a task that calls forward()
     inline void spawn_forward_task() {
         graph_task* tp = create_forward_task();
-        if (tp) { spawn_in_graph_arena(graph_reference(), *tp); }
+        if(tp) {
+            spawn_in_graph_arena(graph_reference(), *tp);
+        }
     }
 
     node_priority_t priority() const override { return my_priority; }
-};// function_input_base
+};  // function_input_base
 
 //! Implements methods for a function node that takes a type Input as input and sends
 //  a type Output to its successors.
-template <typename Input, typename Output, typename Policy, typename A>
-class function_input
-    : public function_input_base<Input, Policy, A, function_input<Input, Output, Policy, A>> {
+template< typename Input, typename Output, typename Policy, typename A>
+class function_input : public function_input_base<Input, Policy, A, function_input<Input,Output,Policy,A> > {
 public:
     typedef Input input_type;
     typedef Output output_type;
     typedef function_body<input_type, output_type> function_body_type;
-    typedef function_input<Input, Output, Policy, A> my_class;
+    typedef function_input<Input, Output, Policy,A> my_class;
     typedef function_input_base<Input, Policy, A, my_class> base_type;
     typedef function_input_queue<input_type, A> input_queue_type;
 
     // constructor
-    template <typename Body>
-    function_input(graph& g, size_t max_concurrency, Body& body, node_priority_t a_priority)
-        : base_type(g, max_concurrency, a_priority),
-          my_body(new function_body_leaf<input_type, output_type, Body>(body)),
-          my_init_body(new function_body_leaf<input_type, output_type, Body>(body)) {}
+    template<typename Body>
+    function_input(
+        graph &g, size_t max_concurrency, Body& body, node_priority_t a_priority )
+      : base_type(g, max_concurrency, a_priority, noexcept(tbb::detail::invoke(body, input_type())))
+      , my_body( new function_body_leaf< input_type, output_type, Body>(body) )
+      , my_init_body( new function_body_leaf< input_type, output_type, Body>(body) ) {
+    }
 
     //! Copy constructor
-    function_input(const function_input& src)
-        : base_type(src), my_body(src.my_init_body->clone()), my_init_body(src.my_init_body->clone()) {}
+    function_input( const function_input& src ) :
+        base_type(src),
+        my_body( src.my_init_body->clone() ),
+        my_init_body(src.my_init_body->clone() ) {
+    }
 #if __INTEL_COMPILER <= 2021
     // Suppress superfluous diagnostic about virtual keyword absence in a destructor of an inherited
     // class while the parent class has the virtual keyword for the destrocutor.
     virtual
 #endif
-            ~function_input() {
+    ~function_input() {
         delete my_body;
         delete my_init_body;
     }
 
-    template <typename Body>
+    template< typename Body >
     Body copy_function_object() {
-        function_body_type& body_ref = *this->my_body;
-        return dynamic_cast<function_body_leaf<input_type, output_type, Body>&>(body_ref).get_body();
+        function_body_type &body_ref = *this->my_body;
+        return dynamic_cast< function_body_leaf<input_type, output_type, Body> & >(body_ref).get_body();
     }
 
-    output_type apply_body_impl(const input_type& i) {
+    output_type apply_body_impl( const input_type& i) {
         // There is an extra copied needed to capture the
         // body execution without the try_put
-        fgt_begin_body(my_body);
-        output_type v = (*my_body)(i);
-        fgt_end_body(my_body);
+        fgt_begin_body( my_body );
+        output_type v = tbb::detail::invoke(*my_body, i);
+        fgt_end_body( my_body );
         return v;
     }
 
     //TODO: consider moving into the base class
-    graph_task* apply_body_impl_bypass(const input_type& i) {
+    graph_task* apply_body_impl_bypass( const input_type &i
+                                        __TBB_FLOW_GRAPH_METAINFO_ARG(const message_metainfo& metainfo))
+    {
         output_type v = apply_body_impl(i);
-        graph_task* postponed_task = NULL;
-        if (base_type::my_max_concurrency != 0) {
+        graph_task* postponed_task = nullptr;
+        if( base_type::my_max_concurrency != 0 ) {
             postponed_task = base_type::try_get_postponed_task(i);
-            __TBB_ASSERT(!postponed_task || postponed_task != SUCCESSFULLY_ENQUEUED, NULL);
+            __TBB_ASSERT( !postponed_task || postponed_task != SUCCESSFULLY_ENQUEUED, nullptr);
         }
-        if (postponed_task) {
+        if( postponed_task ) {
             // make the task available for other workers since we do not know successors'
             // execution policy
             spawn_in_graph_arena(base_type::graph_reference(), *postponed_task);
         }
-        graph_task* successor_task = successors().try_put_task(v);
+        graph_task* successor_task = successors().try_put_task(v __TBB_FLOW_GRAPH_METAINFO_ARG(metainfo));
 #if _MSC_VER && !__INTEL_COMPILER
-#pragma warning(push)
-#pragma warning(disable : 4127) /* suppress conditional expression is constant */
+#pragma warning (push)
+#pragma warning (disable: 4127)  /* suppress conditional expression is constant */
 #endif
-        if (has_policy<lightweight, Policy>::value) {
+        if(has_policy<lightweight, Policy>::value) {
 #if _MSC_VER && !__INTEL_COMPILER
-#pragma warning(pop)
+#pragma warning (pop)
 #endif
-            if (!successor_task) {
+            if(!successor_task) {
                 // Return confirmative status since current
                 // node's body has been executed anyway
                 successor_task = SUCCESSFULLY_ENQUEUED;
@@ -389,47 +503,44 @@ class function_input
     }
 
 protected:
+
     void reset_function_input(reset_flags f) {
         base_type::reset_function_input_base(f);
-        if (f & rf_reset_bodies) {
-            function_body_type* tmp = my_init_body->clone();
+        if(f & rf_reset_bodies) {
+            function_body_type *tmp = my_init_body->clone();
             delete my_body;
             my_body = tmp;
         }
     }
 
-    function_body_type* my_body;
-    function_body_type* my_init_body;
-    virtual broadcast_cache<output_type>& successors() = 0;
+    function_body_type *my_body;
+    function_body_type *my_init_body;
+    virtual broadcast_cache<output_type > &successors() = 0;
+
+};  // function_input
 
-};// function_input
 
 // helper templates to clear the successor edges of the output ports of an multifunction_node
-template <int N>
-struct clear_element {
-    template <typename P>
-    static void clear_this(P& p) {
-        (void) std::get<N - 1>(p).successors().clear();
-        clear_element<N - 1>::clear_this(p);
+template<int N> struct clear_element {
+    template<typename P> static void clear_this(P &p) {
+        (void)std::get<N-1>(p).successors().clear();
+        clear_element<N-1>::clear_this(p);
     }
 #if TBB_USE_ASSERT
-    template <typename P>
-    static bool this_empty(P& p) {
-        if (std::get<N - 1>(p).successors().empty()) return clear_element<N - 1>::this_empty(p);
+    template<typename P> static bool this_empty(P &p) {
+        if(std::get<N-1>(p).successors().empty())
+            return clear_element<N-1>::this_empty(p);
         return false;
     }
 #endif
 };
 
-template <>
-struct clear_element<1> {
-    template <typename P>
-    static void clear_this(P& p) {
-        (void) std::get<0>(p).successors().clear();
+template<> struct clear_element<1> {
+    template<typename P> static void clear_this(P &p) {
+        (void)std::get<0>(p).successors().clear();
     }
 #if TBB_USE_ASSERT
-    template <typename P>
-    static bool this_empty(P& p) {
+    template<typename P> static bool this_empty(P &p) {
         return std::get<0>(p).successors().empty();
     }
 #endif
@@ -441,13 +552,12 @@ struct init_output_ports {
     static OutputTuple call(graph& g, const std::tuple<Args...>&) {
         return OutputTuple(Args(g)...);
     }
-};// struct init_output_ports
+}; // struct init_output_ports
 
 //! Implements methods for a function node that takes a type Input as input
 //  and has a tuple of output ports specified.
-template <typename Input, typename OutputPortSet, typename Policy, typename A>
-class multifunction_input
-    : public function_input_base<Input, Policy, A, multifunction_input<Input, OutputPortSet, Policy, A>> {
+template< typename Input, typename OutputPortSet, typename Policy, typename A>
+class multifunction_input : public function_input_base<Input, Policy, A, multifunction_input<Input,OutputPortSet,Policy,A> > {
 public:
     static const int N = std::tuple_size<OutputPortSet>::value;
     typedef Input input_type;
@@ -458,100 +568,132 @@ class multifunction_input
     typedef function_input_queue<input_type, A> input_queue_type;
 
     // constructor
-    template <typename Body>
-    multifunction_input(graph& g, size_t max_concurrency, Body& body, node_priority_t a_priority)
-        : base_type(g, max_concurrency, a_priority),
-          my_body(new multifunction_body_leaf<input_type, output_ports_type, Body>(body)),
-          my_init_body(new multifunction_body_leaf<input_type, output_ports_type, Body>(body)),
-          my_output_ports(init_output_ports<output_ports_type>::call(g, my_output_ports)) {}
+    template<typename Body>
+    multifunction_input(graph &g, size_t max_concurrency,Body& body, node_priority_t a_priority )
+      : base_type(g, max_concurrency, a_priority, noexcept(tbb::detail::invoke(body, input_type(), my_output_ports)))
+      , my_body( new multifunction_body_leaf<input_type, output_ports_type, Body>(body) )
+      , my_init_body( new multifunction_body_leaf<input_type, output_ports_type, Body>(body) )
+      , my_output_ports(init_output_ports<output_ports_type>::call(g, my_output_ports)){
+    }
 
     //! Copy constructor
-    multifunction_input(const multifunction_input& src)
-        : base_type(src), my_body(src.my_init_body->clone()), my_init_body(src.my_init_body->clone()),
-          my_output_ports(init_output_ports<output_ports_type>::call(src.my_graph_ref, my_output_ports)) {}
+    multifunction_input( const multifunction_input& src ) :
+        base_type(src),
+        my_body( src.my_init_body->clone() ),
+        my_init_body(src.my_init_body->clone() ),
+        my_output_ports( init_output_ports<output_ports_type>::call(src.my_graph_ref, my_output_ports) ) {
+    }
 
     ~multifunction_input() {
         delete my_body;
         delete my_init_body;
     }
 
-    template <typename Body>
+    template< typename Body >
     Body copy_function_object() {
-        multifunction_body_type& body_ref = *this->my_body;
-        return *static_cast<Body*>(
-                dynamic_cast<multifunction_body_leaf<input_type, output_ports_type, Body>&>(body_ref)
-                        .get_body_ptr());
+        multifunction_body_type &body_ref = *this->my_body;
+        return *static_cast<Body*>(dynamic_cast< multifunction_body_leaf<input_type, output_ports_type, Body> & >(body_ref).get_body_ptr());
     }
 
     // for multifunction nodes we do not have a single successor as such.  So we just tell
     // the task we were successful.
     //TODO: consider moving common parts with implementation in function_input into separate function
-    graph_task* apply_body_impl_bypass(const input_type& i) {
-        fgt_begin_body(my_body);
+    graph_task* apply_body_impl_bypass( const input_type &i
+                                        __TBB_FLOW_GRAPH_METAINFO_ARG(const message_metainfo&) )
+    {
+        fgt_begin_body( my_body );
         (*my_body)(i, my_output_ports);
-        fgt_end_body(my_body);
-        graph_task* ttask = NULL;
-        if (base_type::my_max_concurrency != 0) { ttask = base_type::try_get_postponed_task(i); }
+        fgt_end_body( my_body );
+        graph_task* ttask = nullptr;
+        if(base_type::my_max_concurrency != 0) {
+            ttask = base_type::try_get_postponed_task(i);
+        }
         return ttask ? ttask : SUCCESSFULLY_ENQUEUED;
     }
 
-    output_ports_type& output_ports() { return my_output_ports; }
+    output_ports_type &output_ports(){ return my_output_ports; }
 
 protected:
+
     void reset(reset_flags f) {
         base_type::reset_function_input_base(f);
-        if (f & rf_clear_edges) clear_element<N>::clear_this(my_output_ports);
-        if (f & rf_reset_bodies) {
+        if(f & rf_clear_edges)clear_element<N>::clear_this(my_output_ports);
+        if(f & rf_reset_bodies) {
             multifunction_body_type* tmp = my_init_body->clone();
             delete my_body;
             my_body = tmp;
         }
-        __TBB_ASSERT(!(f & rf_clear_edges) || clear_element<N>::this_empty(my_output_ports),
-                     "multifunction_node reset failed");
+        __TBB_ASSERT(!(f & rf_clear_edges) || clear_element<N>::this_empty(my_output_ports), "multifunction_node reset failed");
     }
 
-    multifunction_body_type* my_body;
-    multifunction_body_type* my_init_body;
+    multifunction_body_type *my_body;
+    multifunction_body_type *my_init_body;
     output_ports_type my_output_ports;
 
-};// multifunction_input
+};  // multifunction_input
 
 // template to refer to an output port of a multifunction_node
-template <size_t N, typename MOP>
-typename std::tuple_element<N, typename MOP::output_ports_type>::type& output_port(MOP& op) {
+template<size_t N, typename MOP>
+typename std::tuple_element<N, typename MOP::output_ports_type>::type &output_port(MOP &op) {
     return std::get<N>(op.output_ports());
 }
 
 inline void check_task_and_spawn(graph& g, graph_task* t) {
-    if (t && t != SUCCESSFULLY_ENQUEUED) { spawn_in_graph_arena(g, *t); }
+    if (t && t != SUCCESSFULLY_ENQUEUED) {
+        spawn_in_graph_arena(g, *t);
+    }
 }
 
 // helper structs for split_node
-template <int N>
+template<int N>
 struct emit_element {
-    template <typename T, typename P>
-    static graph_task* emit_this(graph& g, const T& t, P& p) {
+    template<typename T, typename P>
+    static graph_task* emit_this(graph& g, const T &t, P &p) {
         // TODO: consider to collect all the tasks in task_list and spawn them all at once
-        graph_task* last_task = std::get<N - 1>(p).try_put_task(std::get<N - 1>(t));
+        graph_task* last_task = std::get<N-1>(p).try_put_task(std::get<N-1>(t));
         check_task_and_spawn(g, last_task);
-        return emit_element<N - 1>::emit_this(g, t, p);
+        return emit_element<N-1>::emit_this(g,t,p);
     }
+
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+    template <typename TupleType, typename PortsType>
+    static graph_task* emit_this(graph& g, const TupleType& t, PortsType& p,
+                                 const message_metainfo& metainfo)
+    {
+        // TODO: consider to collect all the tasks in task_list and spawn them all at once
+        graph_task* last_task = std::get<N-1>(p).try_put_task(std::get<N-1>(t), metainfo);
+        check_task_and_spawn(g, last_task);
+        return emit_element<N-1>::emit_this(g, t, p, metainfo);
+    }
+#endif
 };
 
-template <>
+template<>
 struct emit_element<1> {
-    template <typename T, typename P>
-    static graph_task* emit_this(graph& g, const T& t, P& p) {
+    template<typename T, typename P>
+    static graph_task* emit_this(graph& g, const T &t, P &p) {
         graph_task* last_task = std::get<0>(p).try_put_task(std::get<0>(t));
         check_task_and_spawn(g, last_task);
         return SUCCESSFULLY_ENQUEUED;
     }
+
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+    template <typename TupleType, typename PortsType>
+    static graph_task* emit_this(graph& g, const TupleType& t, PortsType& ports,
+                                 const message_metainfo& metainfo)
+    {
+        graph_task* last_task = std::get<0>(ports).try_put_task(std::get<0>(t), metainfo);
+        check_task_and_spawn(g, last_task);
+        return SUCCESSFULLY_ENQUEUED;
+    }
+#endif
 };
 
 //! Implements methods for an executable node that takes continue_msg as input
-template <typename Output, typename Policy>
+template< typename Output, typename Policy>
 class continue_input : public continue_receiver {
 public:
+
     //! The input type of this receiver
     typedef continue_msg input_type;
 
@@ -560,91 +702,117 @@ class continue_input : public continue_receiver {
     typedef function_body<input_type, output_type> function_body_type;
     typedef continue_input<output_type, Policy> class_type;
 
-    template <typename Body>
-    continue_input(graph& g, Body& body, node_priority_t a_priority)
-        : continue_receiver(/*number_of_predecessors=*/0, a_priority), my_graph_ref(g),
-          my_body(new function_body_leaf<input_type, output_type, Body>(body)),
-          my_init_body(new function_body_leaf<input_type, output_type, Body>(body)) {}
-
-    template <typename Body>
-    continue_input(graph& g, int number_of_predecessors, Body& body, node_priority_t a_priority)
-        : continue_receiver(number_of_predecessors, a_priority), my_graph_ref(g),
-          my_body(new function_body_leaf<input_type, output_type, Body>(body)),
-          my_init_body(new function_body_leaf<input_type, output_type, Body>(body)) {}
-
-    continue_input(const continue_input& src)
-        : continue_receiver(src), my_graph_ref(src.my_graph_ref), my_body(src.my_init_body->clone()),
-          my_init_body(src.my_init_body->clone()) {}
+    template< typename Body >
+    continue_input( graph &g, Body& body, node_priority_t a_priority )
+        : continue_receiver(/*number_of_predecessors=*/0, a_priority)
+        , my_graph_ref(g)
+        , my_body( new function_body_leaf< input_type, output_type, Body>(body) )
+        , my_init_body( new function_body_leaf< input_type, output_type, Body>(body) )
+    { }
+
+    template< typename Body >
+    continue_input( graph &g, int number_of_predecessors,
+                    Body& body, node_priority_t a_priority )
+      : continue_receiver( number_of_predecessors, a_priority )
+      , my_graph_ref(g)
+      , my_body( new function_body_leaf< input_type, output_type, Body>(body) )
+      , my_init_body( new function_body_leaf< input_type, output_type, Body>(body) )
+    { }
+
+    continue_input( const continue_input& src ) : continue_receiver(src),
+                                                  my_graph_ref(src.my_graph_ref),
+                                                  my_body( src.my_init_body->clone() ),
+                                                  my_init_body( src.my_init_body->clone() ) {}
 
     ~continue_input() {
         delete my_body;
         delete my_init_body;
     }
 
-    template <typename Body>
+    template< typename Body >
     Body copy_function_object() {
-        function_body_type& body_ref = *my_body;
-        return dynamic_cast<function_body_leaf<input_type, output_type, Body>&>(body_ref).get_body();
+        function_body_type &body_ref = *my_body;
+        return dynamic_cast< function_body_leaf<input_type, output_type, Body> & >(body_ref).get_body();
     }
 
-    void reset_receiver(reset_flags f) override {
+    void reset_receiver( reset_flags f) override {
         continue_receiver::reset_receiver(f);
-        if (f & rf_reset_bodies) {
-            function_body_type* tmp = my_init_body->clone();
+        if(f & rf_reset_bodies) {
+            function_body_type *tmp = my_init_body->clone();
             delete my_body;
             my_body = tmp;
         }
     }
 
 protected:
+
     graph& my_graph_ref;
-    function_body_type* my_body;
-    function_body_type* my_init_body;
+    function_body_type *my_body;
+    function_body_type *my_init_body;
 
-    virtual broadcast_cache<output_type>& successors() = 0;
+    virtual broadcast_cache<output_type > &successors() = 0;
 
-    friend class apply_body_task_bypass<class_type, continue_msg>;
+    friend class apply_body_task_bypass< class_type, continue_msg >;
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+    friend class apply_body_task_bypass< class_type, continue_msg, trackable_messages_graph_task >;
+#endif
 
     //! Applies the body to the provided input
-    graph_task* apply_body_bypass(input_type) {
+    graph_task* apply_body_bypass( input_type __TBB_FLOW_GRAPH_METAINFO_ARG(const message_metainfo& metainfo) ) {
         // There is an extra copied needed to capture the
         // body execution without the try_put
-        fgt_begin_body(my_body);
-        output_type v = (*my_body)(continue_msg());
-        fgt_end_body(my_body);
-        return successors().try_put_task(v);
+        fgt_begin_body( my_body );
+        output_type v = (*my_body)( continue_msg() );
+        fgt_end_body( my_body );
+        return successors().try_put_task( v __TBB_FLOW_GRAPH_METAINFO_ARG(metainfo) );
     }
 
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+    graph_task* execute(const message_metainfo& metainfo) override {
+#else
     graph_task* execute() override {
-        if (!is_graph_active(my_graph_ref)) { return NULL; }
+#endif
+        if(!is_graph_active(my_graph_ref)) {
+            return nullptr;
+        }
 #if _MSC_VER && !__INTEL_COMPILER
-#pragma warning(push)
-#pragma warning(disable : 4127) /* suppress conditional expression is constant */
+#pragma warning (push)
+#pragma warning (disable: 4127)  /* suppress conditional expression is constant */
 #endif
-        if (has_policy<lightweight, Policy>::value) {
+        if(has_policy<lightweight, Policy>::value) {
 #if _MSC_VER && !__INTEL_COMPILER
-#pragma warning(pop)
+#pragma warning (pop)
 #endif
-            return apply_body_bypass(continue_msg());
-        } else {
-            small_object_allocator allocator {};
-            typedef apply_body_task_bypass<class_type, continue_msg> task_type;
-            graph_task* t = allocator.new_object<task_type>(graph_reference(), allocator, *this,
-                                                            continue_msg(), my_priority);
-            graph_reference().reserve_wait();
+            return apply_body_bypass( continue_msg() __TBB_FLOW_GRAPH_METAINFO_ARG(metainfo) );
+        }
+        else {
+            d1::small_object_allocator allocator{};
+            graph_task* t = nullptr;
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+            if (!metainfo.empty()) {
+                using task_type = apply_body_task_bypass<class_type, continue_msg, trackable_messages_graph_task>;
+                t = allocator.new_object<task_type>( graph_reference(), allocator, *this, continue_msg(), my_priority, metainfo );
+            } else
+#endif
+            {
+                using task_type = apply_body_task_bypass<class_type, continue_msg>;
+                t = allocator.new_object<task_type>( graph_reference(), allocator, *this, continue_msg(), my_priority );
+            }
             return t;
         }
     }
 
-    graph& graph_reference() const override { return my_graph_ref; }
-};// continue_input
+    graph& graph_reference() const override {
+        return my_graph_ref;
+    }
+};  // continue_input
 
 //! Implements methods for both executable and function nodes that puts Output to its successors
-template <typename Output>
+template< typename Output >
 class function_output : public sender<Output> {
 public:
-    template <int N>
-    friend struct clear_element;
+
+    template<int N> friend struct clear_element;
     typedef Output output_type;
     typedef typename sender<output_type>::successor_type successor_type;
     typedef broadcast_cache<output_type> broadcast_cache_type;
@@ -653,27 +821,26 @@ class function_output : public sender<Output> {
     function_output(const function_output& other) = delete;
 
     //! Adds a new successor to this node
-    bool register_successor(successor_type& r) override {
-        successors().register_successor(r);
+    bool register_successor( successor_type &r ) override {
+        successors().register_successor( r );
         return true;
     }
 
     //! Removes a successor from this node
-    bool remove_successor(successor_type& r) override {
-        successors().remove_successor(r);
+    bool remove_successor( successor_type &r ) override {
+        successors().remove_successor( r );
         return true;
     }
 
-    broadcast_cache_type& successors() { return my_successors; }
+    broadcast_cache_type &successors() { return my_successors; }
 
     graph& graph_reference() const { return my_graph_ref; }
-
 protected:
     broadcast_cache_type my_successors;
     graph& my_graph_ref;
-};// function_output
+};  // function_output
 
-template <typename Output>
+template< typename Output >
 class multifunction_output : public function_output<Output> {
 public:
     typedef Output output_type;
@@ -683,10 +850,10 @@ class multifunction_output : public function_output<Output> {
     multifunction_output(graph& g) : base_type(g) {}
     multifunction_output(const multifunction_output& other) : base_type(other.my_graph_ref) {}
 
-    bool try_put(const output_type& i) {
-        graph_task* res = try_put_task(i);
-        if (!res) return false;
-        if (res != SUCCESSFULLY_ENQUEUED) {
+    bool try_put(const output_type &i) {
+        graph_task *res = try_put_task(i);
+        if( !res ) return false;
+        if( res != SUCCESSFULLY_ENQUEUED ) {
             // wrapping in task_arena::execute() is not needed since the method is called from
             // inside task::execute()
             spawn_in_graph_arena(graph_reference(), *res);
@@ -697,23 +864,31 @@ class multifunction_output : public function_output<Output> {
     using base_type::graph_reference;
 
 protected:
-    graph_task* try_put_task(const output_type& i) { return my_successors.try_put_task(i); }
 
-    template <int N>
-    friend struct emit_element;
+    graph_task* try_put_task(const output_type &i) {
+        return my_successors.try_put_task(i);
+    }
+
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+    graph_task* try_put_task(const output_type& i, const message_metainfo& metainfo) {
+        return my_successors.try_put_task(i, metainfo);
+    }
+#endif
+
+    template <int N> friend struct emit_element;
 
-};// multifunction_output
+};  // multifunction_output
 
 //composite_node
-template <typename CompositeType>
+template<typename CompositeType>
 void add_nodes_impl(CompositeType*, bool) {}
 
-template <typename CompositeType, typename NodeType1, typename... NodeTypes>
-void add_nodes_impl(CompositeType* c_node, bool visible, const NodeType1& n1, const NodeTypes&... n) {
-    void* addr = const_cast<NodeType1*>(&n1);
+template< typename CompositeType, typename NodeType1, typename... NodeTypes >
+void add_nodes_impl(CompositeType *c_node, bool visible, const NodeType1& n1, const NodeTypes&... n) {
+    void *addr = const_cast<NodeType1 *>(&n1);
 
     fgt_alias_port(c_node, addr, visible);
     add_nodes_impl(c_node, visible, n...);
 }
 
-#endif// __TBB__flow_graph_node_impl_H
+#endif // __TBB__flow_graph_node_impl_H
diff --git a/external/tbb/include/oneapi/tbb/detail/_flow_graph_node_set_impl.h b/external/tbb/include/oneapi/tbb/detail/_flow_graph_node_set_impl.h
index b6d685b5..8440bd70 100644
--- a/external/tbb/include/oneapi/tbb/detail/_flow_graph_node_set_impl.h
+++ b/external/tbb/include/oneapi/tbb/detail/_flow_graph_node_set_impl.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2020-2021 Intel Corporation
+    Copyright (c) 2020-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 #error Do not #include this internal file directly; use public TBB headers instead.
 #endif
 
-// Included in namespace tbb::detail::d1 (in flow_graph.h)
+// Included in namespace tbb::detail::d2 (in flow_graph.h)
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 // Visual Studio 2019 reports an error while calling predecessor_selector::get and successor_selector::get
@@ -30,10 +30,10 @@
 #define __TBB_MSVC_DISABLE_TRAILING_DECLTYPE (_MSC_VER >= 1900)
 
 namespace order {
-    struct undefined {};
-    struct following {};
-    struct preceding {};
-}// namespace order
+struct undefined {};
+struct following {};
+struct preceding {};
+}
 
 class get_graph_helper {
 public:
@@ -57,7 +57,7 @@ class get_graph_helper {
     }
 };
 
-template <typename Order, typename... Nodes>
+template<typename Order, typename... Nodes>
 struct node_set {
     typedef Order order_type;
 
@@ -67,19 +67,17 @@ struct node_set {
     template <typename... Nodes2>
     node_set(const node_set<order::undefined, Nodes2...>& set) : nodes(set.nodes) {}
 
-    graph& graph_reference() const { return get_graph_helper::get(std::get<0>(nodes)); }
+    graph& graph_reference() const {
+        return get_graph_helper::get(std::get<0>(nodes));
+    }
 };
 
 namespace alias_helpers {
-    template <typename T>
-    using output_type = typename T::output_type;
-    template <typename T>
-    using output_ports_type = typename T::output_ports_type;
-    template <typename T>
-    using input_type = typename T::input_type;
-    template <typename T>
-    using input_ports_type = typename T::input_ports_type;
-}// namespace alias_helpers
+template <typename T> using output_type = typename T::output_type;
+template <typename T> using output_ports_type = typename T::output_ports_type;
+template <typename T> using input_type = typename T::input_type;
+template <typename T> using input_ports_type = typename T::input_ports_type;
+} // namespace alias_helpers
 
 template <typename T>
 using has_output_type = supports<T, alias_helpers::output_type>;
@@ -93,10 +91,10 @@ using has_input_ports_type = supports<T, alias_helpers::input_ports_type>;
 template <typename T>
 using has_output_ports_type = supports<T, alias_helpers::output_ports_type>;
 
-template <typename T>
+template<typename T>
 struct is_sender : std::is_base_of<sender<typename T::output_type>, T> {};
 
-template <typename T>
+template<typename T>
 struct is_receiver : std::is_base_of<receiver<typename T::input_type>, T> {};
 
 template <typename Node>
@@ -105,50 +103,55 @@ struct is_async_node : std::false_type {};
 template <typename... Args>
 struct is_async_node<async_node<Args...>> : std::true_type {};
 
-template <typename FirstPredecessor, typename... Predecessors>
-node_set<order::following, FirstPredecessor, Predecessors...> follows(FirstPredecessor& first_predecessor,
-                                                                      Predecessors&... predecessors) {
-    static_assert((conjunction<has_output_type<FirstPredecessor>, has_output_type<Predecessors>...>::value),
-                  "Not all node's predecessors has output_type typedef");
+template<typename FirstPredecessor, typename... Predecessors>
+node_set<order::following, FirstPredecessor, Predecessors...>
+follows(FirstPredecessor& first_predecessor, Predecessors&... predecessors) {
+    static_assert((conjunction<has_output_type<FirstPredecessor>,
+                                                   has_output_type<Predecessors>...>::value),
+                        "Not all node's predecessors has output_type typedef");
     static_assert((conjunction<is_sender<FirstPredecessor>, is_sender<Predecessors>...>::value),
-                  "Not all node's predecessors are senders");
+                        "Not all node's predecessors are senders");
     return node_set<order::following, FirstPredecessor, Predecessors...>(first_predecessor, predecessors...);
 }
 
-template <typename... Predecessors>
+template<typename... Predecessors>
 node_set<order::following, Predecessors...>
 follows(node_set<order::undefined, Predecessors...>& predecessors_set) {
     static_assert((conjunction<has_output_type<Predecessors>...>::value),
-                  "Not all nodes in the set has output_type typedef");
-    static_assert((conjunction<is_sender<Predecessors>...>::value), "Not all nodes in the set are senders");
+                        "Not all nodes in the set has output_type typedef");
+    static_assert((conjunction<is_sender<Predecessors>...>::value),
+                        "Not all nodes in the set are senders");
     return node_set<order::following, Predecessors...>(predecessors_set);
 }
 
-template <typename FirstSuccessor, typename... Successors>
-node_set<order::preceding, FirstSuccessor, Successors...> precedes(FirstSuccessor& first_successor,
-                                                                   Successors&... successors) {
-    static_assert((conjunction<has_input_type<FirstSuccessor>, has_input_type<Successors>...>::value),
-                  "Not all node's successors has input_type typedef");
+template<typename FirstSuccessor, typename... Successors>
+node_set<order::preceding, FirstSuccessor, Successors...>
+precedes(FirstSuccessor& first_successor, Successors&... successors) {
+    static_assert((conjunction<has_input_type<FirstSuccessor>,
+                                                    has_input_type<Successors>...>::value),
+                        "Not all node's successors has input_type typedef");
     static_assert((conjunction<is_receiver<FirstSuccessor>, is_receiver<Successors>...>::value),
-                  "Not all node's successors are receivers");
+                        "Not all node's successors are receivers");
     return node_set<order::preceding, FirstSuccessor, Successors...>(first_successor, successors...);
 }
 
-template <typename... Successors>
+template<typename... Successors>
 node_set<order::preceding, Successors...>
 precedes(node_set<order::undefined, Successors...>& successors_set) {
     static_assert((conjunction<has_input_type<Successors>...>::value),
-                  "Not all nodes in the set has input_type typedef");
-    static_assert((conjunction<is_receiver<Successors>...>::value), "Not all nodes in the set are receivers");
+                        "Not all nodes in the set has input_type typedef");
+    static_assert((conjunction<is_receiver<Successors>...>::value),
+                        "Not all nodes in the set are receivers");
     return node_set<order::preceding, Successors...>(successors_set);
 }
 
 template <typename Node, typename... Nodes>
-node_set<order::undefined, Node, Nodes...> make_node_set(Node& first_node, Nodes&... nodes) {
+node_set<order::undefined, Node, Nodes...>
+make_node_set(Node& first_node, Nodes&... nodes) {
     return node_set<order::undefined, Node, Nodes...>(first_node, nodes...);
 }
 
-template <size_t I>
+template<size_t I>
 class successor_selector {
     template <typename NodeType>
     static auto get_impl(NodeType& node, std::true_type) -> decltype(input_port<I>(node)) {
@@ -156,9 +159,7 @@ class successor_selector {
     }
 
     template <typename NodeType>
-    static NodeType& get_impl(NodeType& node, std::false_type) {
-        return node;
-    }
+    static NodeType& get_impl(NodeType& node, std::false_type) { return node; }
 
 public:
     template <typename NodeType>
@@ -172,7 +173,7 @@ class successor_selector {
     }
 };
 
-template <size_t I>
+template<size_t I>
 class predecessor_selector {
     template <typename NodeType>
     static auto internal_get(NodeType& node, std::true_type) -> decltype(output_port<I>(node)) {
@@ -180,25 +181,20 @@ class predecessor_selector {
     }
 
     template <typename NodeType>
-    static NodeType& internal_get(NodeType& node, std::false_type) {
-        return node;
-    }
+    static NodeType& internal_get(NodeType& node, std::false_type) { return node;}
 
     template <typename NodeType>
 #if __TBB_MSVC_DISABLE_TRAILING_DECLTYPE
     static auto& get_impl(NodeType& node, std::false_type)
 #else
-    static auto get_impl(NodeType& node, std::false_type)
-            -> decltype(internal_get(node, has_output_ports_type<NodeType>()))
+    static auto get_impl(NodeType& node, std::false_type) -> decltype(internal_get(node, has_output_ports_type<NodeType>()))
 #endif
     {
         return internal_get(node, has_output_ports_type<NodeType>());
     }
 
     template <typename AsyncNode>
-    static AsyncNode& get_impl(AsyncNode& node, std::true_type) {
-        return node;
-    }
+    static AsyncNode& get_impl(AsyncNode& node, std::true_type) { return node; }
 
 public:
     template <typename NodeType>
@@ -212,37 +208,37 @@ class predecessor_selector {
     }
 };
 
-template <size_t I>
+template<size_t I>
 class make_edges_helper {
 public:
-    template <typename PredecessorsTuple, typename NodeType>
+    template<typename PredecessorsTuple, typename NodeType>
     static void connect_predecessors(PredecessorsTuple& predecessors, NodeType& node) {
         make_edge(std::get<I>(predecessors), successor_selector<I>::get(node));
         make_edges_helper<I - 1>::connect_predecessors(predecessors, node);
     }
 
-    template <typename SuccessorsTuple, typename NodeType>
+    template<typename SuccessorsTuple, typename NodeType>
     static void connect_successors(NodeType& node, SuccessorsTuple& successors) {
         make_edge(predecessor_selector<I>::get(node), std::get<I>(successors));
         make_edges_helper<I - 1>::connect_successors(node, successors);
     }
 };
 
-template <>
+template<>
 struct make_edges_helper<0> {
-    template <typename PredecessorsTuple, typename NodeType>
+    template<typename PredecessorsTuple, typename NodeType>
     static void connect_predecessors(PredecessorsTuple& predecessors, NodeType& node) {
         make_edge(std::get<0>(predecessors), successor_selector<0>::get(node));
     }
 
-    template <typename SuccessorsTuple, typename NodeType>
+    template<typename SuccessorsTuple, typename NodeType>
     static void connect_successors(NodeType& node, SuccessorsTuple& successors) {
         make_edge(predecessor_selector<0>::get(node), std::get<0>(successors));
     }
 };
 
 // TODO: consider adding an overload for making edges between node sets
-template <typename NodeType, typename OrderFlagType, typename... Args>
+template<typename NodeType, typename OrderFlagType, typename... Args>
 void make_edges(const node_set<OrderFlagType, Args...>& s, NodeType& node) {
     const std::size_t SetSize = std::tuple_size<decltype(s.nodes)>::value;
     make_edges_helper<SetSize - 1>::connect_predecessors(s.nodes, node);
@@ -264,6 +260,6 @@ void make_edges_in_order(const node_set<order::preceding, Nodes...>& ns, NodeTyp
     make_edges(node, ns);
 }
 
-#endif// __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+#endif  // __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 
-#endif// __TBB_flow_graph_node_set_impl_H
+#endif // __TBB_flow_graph_node_set_impl_H
diff --git a/external/tbb/include/oneapi/tbb/detail/_flow_graph_nodes_deduction.h b/external/tbb/include/oneapi/tbb/detail/_flow_graph_nodes_deduction.h
index f765871c..47ecfb2a 100644
--- a/external/tbb/include/oneapi/tbb/detail/_flow_graph_nodes_deduction.h
+++ b/external/tbb/include/oneapi/tbb/detail/_flow_graph_nodes_deduction.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -20,241 +20,258 @@
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 
 namespace tbb {
-    namespace detail {
-        namespace d1 {
+namespace detail {
+namespace d2 {
 
-            template <typename Input, typename Output>
-            struct declare_body_types {
-                using input_type = Input;
-                using output_type = Output;
-            };
+template <typename Input, typename Output>
+struct declare_body_types {
+    using input_type = Input;
+    using output_type = Output;
+};
 
-            struct NoInputBody {};
+struct NoInputBody {};
 
-            template <typename Output>
-            struct declare_body_types<NoInputBody, Output> {
-                using output_type = Output;
-            };
+template <typename Output>
+struct declare_body_types<NoInputBody, Output> {
+    using output_type = Output;
+};
 
-            template <typename T>
-            struct body_types;
+template <typename T> struct body_types;
 
-            template <typename T, typename Input, typename Output>
-            struct body_types<Output (T::*)(const Input&) const> : declare_body_types<Input, Output> {};
+template <typename T, typename Input, typename Output>
+struct body_types<Output (T::*)(const Input&) const> : declare_body_types<Input, Output> {};
 
-            template <typename T, typename Input, typename Output>
-            struct body_types<Output (T::*)(const Input&)> : declare_body_types<Input, Output> {};
+template <typename T, typename Input, typename Output>
+struct body_types<Output (T::*)(const Input&)> : declare_body_types<Input, Output> {};
 
-            template <typename T, typename Input, typename Output>
-            struct body_types<Output (T::*)(Input&) const> : declare_body_types<Input, Output> {};
+template <typename T, typename Input, typename Output>
+struct body_types<Output (T::*)(Input&) const> : declare_body_types<Input, Output> {};
 
-            template <typename T, typename Input, typename Output>
-            struct body_types<Output (T::*)(Input&)> : declare_body_types<Input, Output> {};
+template <typename T, typename Input, typename Output>
+struct body_types<Output (T::*)(Input&)> : declare_body_types<Input, Output> {};
 
-            template <typename T, typename Output>
-            struct body_types<Output (T::*)(flow_control&) const> : declare_body_types<NoInputBody, Output> {
-            };
+template <typename T, typename Output>
+struct body_types<Output (T::*)(d1::flow_control&) const> : declare_body_types<NoInputBody, Output> {};
 
-            template <typename T, typename Output>
-            struct body_types<Output (T::*)(flow_control&)> : declare_body_types<NoInputBody, Output> {};
+template <typename T, typename Output>
+struct body_types<Output (T::*)(d1::flow_control&)> : declare_body_types<NoInputBody, Output> {};
 
-            template <typename Input, typename Output>
-            struct body_types<Output (*)(Input&)> : declare_body_types<Input, Output> {};
+template <typename Input, typename Output>
+struct body_types<Output (*)(Input&)> : declare_body_types<Input, Output> {};
 
-            template <typename Input, typename Output>
-            struct body_types<Output (*)(const Input&)> : declare_body_types<Input, Output> {};
+template <typename Input, typename Output>
+struct body_types<Output (*)(const Input&)> : declare_body_types<Input, Output> {};
 
-            template <typename Output>
-            struct body_types<Output (*)(flow_control&)> : declare_body_types<NoInputBody, Output> {};
+template <typename Output>
+struct body_types<Output (*)(d1::flow_control&)> : declare_body_types<NoInputBody, Output> {};
 
-            template <typename Body>
-            using input_t = typename body_types<Body>::input_type;
+template <typename Body>
+using input_t = typename body_types<Body>::input_type;
 
-            template <typename Body>
-            using output_t = typename body_types<Body>::output_type;
+template <typename Body>
+using output_t = typename body_types<Body>::output_type;
 
-            template <typename T, typename Input, typename Output>
-            auto decide_on_operator_overload(Output (T::*name)(const Input&) const) -> decltype(name);
+template <typename T, typename Input, typename Output>
+auto decide_on_operator_overload(Output (T::*name)(const Input&) const)->decltype(name);
 
-            template <typename T, typename Input, typename Output>
-            auto decide_on_operator_overload(Output (T::*name)(const Input&)) -> decltype(name);
+template <typename T, typename Input, typename Output>
+auto decide_on_operator_overload(Output (T::*name)(const Input&))->decltype(name);
 
-            template <typename T, typename Input, typename Output>
-            auto decide_on_operator_overload(Output (T::*name)(Input&) const) -> decltype(name);
+template <typename T, typename Input, typename Output>
+auto decide_on_operator_overload(Output (T::*name)(Input&) const)->decltype(name);
 
-            template <typename T, typename Input, typename Output>
-            auto decide_on_operator_overload(Output (T::*name)(Input&)) -> decltype(name);
+template <typename T, typename Input, typename Output>
+auto decide_on_operator_overload(Output (T::*name)(Input&))->decltype(name);
 
-            template <typename Input, typename Output>
-            auto decide_on_operator_overload(Output (*name)(const Input&)) -> decltype(name);
+template <typename Input, typename Output>
+auto decide_on_operator_overload(Output (*name)(const Input&))->decltype(name);
 
-            template <typename Input, typename Output>
-            auto decide_on_operator_overload(Output (*name)(Input&)) -> decltype(name);
+template <typename Input, typename Output>
+auto decide_on_operator_overload(Output (*name)(Input&))->decltype(name);
 
-            template <typename Body>
-            decltype(decide_on_operator_overload(&Body::operator())) decide_on_callable_type(int);
+template <typename Body>
+decltype(decide_on_operator_overload(&Body::operator())) decide_on_callable_type(int);
 
-            template <typename Body>
-            decltype(decide_on_operator_overload(std::declval<Body>())) decide_on_callable_type(...);
+template <typename Body>
+decltype(decide_on_operator_overload(std::declval<Body>())) decide_on_callable_type(...);
 
-            // Deduction guides for Flow Graph nodes
+// Deduction guides for Flow Graph nodes
 
-            template <typename GraphOrSet, typename Body>
-            input_node(GraphOrSet&&, Body)
-                    -> input_node<output_t<decltype(decide_on_callable_type<Body>(0))>>;
+template <typename GraphOrSet, typename Body>
+input_node(GraphOrSet&&, Body)
+->input_node<output_t<decltype(decide_on_callable_type<Body>(0))>>;
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 
-            template <typename NodeSet>
-            struct decide_on_set;
+template <typename NodeSet>
+struct decide_on_set;
 
-            template <typename Node, typename... Nodes>
-            struct decide_on_set<node_set<order::following, Node, Nodes...>> {
-                using type = typename Node::output_type;
-            };
+template <typename Node, typename... Nodes>
+struct decide_on_set<node_set<order::following, Node, Nodes...>> {
+    using type = typename Node::output_type;
+};
 
-            template <typename Node, typename... Nodes>
-            struct decide_on_set<node_set<order::preceding, Node, Nodes...>> {
-                using type = typename Node::input_type;
-            };
+template <typename Node, typename... Nodes>
+struct decide_on_set<node_set<order::preceding, Node, Nodes...>> {
+    using type = typename Node::input_type;
+};
 
-            template <typename NodeSet>
-            using decide_on_set_t = typename decide_on_set<std::decay_t<NodeSet>>::type;
+template <typename NodeSet>
+using decide_on_set_t = typename decide_on_set<std::decay_t<NodeSet>>::type;
 
-            template <typename NodeSet>
-            broadcast_node(const NodeSet&) -> broadcast_node<decide_on_set_t<NodeSet>>;
+template <typename NodeSet>
+broadcast_node(const NodeSet&)
+->broadcast_node<decide_on_set_t<NodeSet>>;
 
-            template <typename NodeSet>
-            buffer_node(const NodeSet&) -> buffer_node<decide_on_set_t<NodeSet>>;
+template <typename NodeSet>
+buffer_node(const NodeSet&)
+->buffer_node<decide_on_set_t<NodeSet>>;
 
-            template <typename NodeSet>
-            queue_node(const NodeSet&) -> queue_node<decide_on_set_t<NodeSet>>;
-#endif// __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+template <typename NodeSet>
+queue_node(const NodeSet&)
+->queue_node<decide_on_set_t<NodeSet>>;
+#endif // __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 
-            template <typename GraphOrProxy, typename Sequencer>
-            sequencer_node(GraphOrProxy&&, Sequencer)
-                    -> sequencer_node<input_t<decltype(decide_on_callable_type<Sequencer>(0))>>;
+template <typename GraphOrProxy, typename Sequencer>
+sequencer_node(GraphOrProxy&&, Sequencer)
+->sequencer_node<input_t<decltype(decide_on_callable_type<Sequencer>(0))>>;
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-            template <typename NodeSet, typename Compare>
-            priority_queue_node(const NodeSet&, const Compare&)
-                    -> priority_queue_node<decide_on_set_t<NodeSet>, Compare>;
+template <typename NodeSet, typename Compare>
+priority_queue_node(const NodeSet&, const Compare&)
+->priority_queue_node<decide_on_set_t<NodeSet>, Compare>;
 
-            template <typename NodeSet>
-            priority_queue_node(const NodeSet&)
-                    -> priority_queue_node<decide_on_set_t<NodeSet>, std::less<decide_on_set_t<NodeSet>>>;
-#endif// __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+template <typename NodeSet>
+priority_queue_node(const NodeSet&)
+->priority_queue_node<decide_on_set_t<NodeSet>, std::less<decide_on_set_t<NodeSet>>>;
+#endif // __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 
-            template <typename Key>
-            struct join_key {
-                using type = Key;
-            };
+template <typename Key>
+struct join_key {
+    using type = Key;
+};
 
-            template <typename T>
-            struct join_key<const T&> {
-                using type = T&;
-            };
+template <typename T>
+struct join_key<const T&> {
+    using type = T&;
+};
 
-            template <typename Key>
-            using join_key_t = typename join_key<Key>::type;
+template <typename Key>
+using join_key_t = typename join_key<Key>::type;
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-            template <typename Policy, typename... Predecessors>
-            join_node(const node_set<order::following, Predecessors...>&, Policy)
-                    -> join_node<std::tuple<typename Predecessors::output_type...>, Policy>;
-
-            template <typename Policy, typename Successor, typename... Successors>
-            join_node(const node_set<order::preceding, Successor, Successors...>&, Policy)
-                    -> join_node<typename Successor::input_type, Policy>;
-
-            template <typename... Predecessors>
-            join_node(const node_set<order::following, Predecessors...>)
-                    -> join_node<std::tuple<typename Predecessors::output_type...>, queueing>;
-
-            template <typename Successor, typename... Successors>
-            join_node(const node_set<order::preceding, Successor, Successors...>)
-                    -> join_node<typename Successor::input_type, queueing>;
+template <typename Policy, typename... Predecessors>
+join_node(const node_set<order::following, Predecessors...>&, Policy)
+->join_node<std::tuple<typename Predecessors::output_type...>,
+            Policy>;
+
+template <typename Policy, typename Successor, typename... Successors>
+join_node(const node_set<order::preceding, Successor, Successors...>&, Policy)
+->join_node<typename Successor::input_type, Policy>;
+
+template <typename... Predecessors>
+join_node(const node_set<order::following, Predecessors...>)
+->join_node<std::tuple<typename Predecessors::output_type...>,
+            queueing>;
+
+template <typename Successor, typename... Successors>
+join_node(const node_set<order::preceding, Successor, Successors...>)
+->join_node<typename Successor::input_type, queueing>;
 #endif
 
-            template <typename GraphOrProxy, typename Body, typename... Bodies>
-            join_node(GraphOrProxy&&, Body, Bodies...) -> join_node<
-                    std::tuple<input_t<decltype(decide_on_callable_type<Body>(0))>,
-                               input_t<decltype(decide_on_callable_type<Bodies>(0))>...>,
-                    key_matching<join_key_t<output_t<decltype(decide_on_callable_type<Body>(0))>>>>;
+template <typename GraphOrProxy, typename Body, typename... Bodies>
+join_node(GraphOrProxy&&, Body, Bodies...)
+->join_node<std::tuple<input_t<decltype(decide_on_callable_type<Body>(0))>,
+                       input_t<decltype(decide_on_callable_type<Bodies>(0))>...>,
+            key_matching<join_key_t<output_t<decltype(decide_on_callable_type<Body>(0))>>>>;
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-            template <typename... Predecessors>
-            indexer_node(const node_set<order::following, Predecessors...>&)
-                    -> indexer_node<typename Predecessors::output_type...>;
+template <typename... Predecessors>
+indexer_node(const node_set<order::following, Predecessors...>&)
+->indexer_node<typename Predecessors::output_type...>;
 #endif
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-            template <typename NodeSet>
-            limiter_node(const NodeSet&, size_t) -> limiter_node<decide_on_set_t<NodeSet>>;
+template <typename NodeSet>
+limiter_node(const NodeSet&, size_t)
+->limiter_node<decide_on_set_t<NodeSet>>;
 
-            template <typename Predecessor, typename... Predecessors>
-            split_node(const node_set<order::following, Predecessor, Predecessors...>&)
-                    -> split_node<typename Predecessor::output_type>;
+template <typename Predecessor, typename... Predecessors>
+split_node(const node_set<order::following, Predecessor, Predecessors...>&)
+->split_node<typename Predecessor::output_type>;
 
-            template <typename... Successors>
-            split_node(const node_set<order::preceding, Successors...>&)
-                    -> split_node<std::tuple<typename Successors::input_type...>>;
+template <typename... Successors>
+split_node(const node_set<order::preceding, Successors...>&)
+->split_node<std::tuple<typename Successors::input_type...>>;
 
 #endif
 
-            template <typename GraphOrSet, typename Body, typename Policy>
-            function_node(GraphOrSet&&, size_t, Body, Policy, node_priority_t = no_priority)
-                    -> function_node<input_t<decltype(decide_on_callable_type<Body>(0))>,
-                                     output_t<decltype(decide_on_callable_type<Body>(0))>, Policy>;
-
-            template <typename GraphOrSet, typename Body>
-            function_node(GraphOrSet&&, size_t, Body, node_priority_t = no_priority)
-                    -> function_node<input_t<decltype(decide_on_callable_type<Body>(0))>,
-                                     output_t<decltype(decide_on_callable_type<Body>(0))>, queueing>;
-
-            template <typename Output>
-            struct continue_output {
-                using type = Output;
-            };
-
-            template <>
-            struct continue_output<void> {
-                using type = continue_msg;
-            };
-
-            template <typename T>
-            using continue_output_t = typename continue_output<T>::type;
-
-            template <typename GraphOrSet, typename Body, typename Policy>
-            continue_node(GraphOrSet&&, Body, Policy, node_priority_t = no_priority)
-                    -> continue_node<continue_output_t<std::invoke_result_t<Body, continue_msg>>, Policy>;
-
-            template <typename GraphOrSet, typename Body, typename Policy>
-            continue_node(GraphOrSet&&, int, Body, Policy, node_priority_t = no_priority)
-                    -> continue_node<continue_output_t<std::invoke_result_t<Body, continue_msg>>, Policy>;
-
-            template <typename GraphOrSet, typename Body>
-            continue_node(GraphOrSet&&, Body, node_priority_t = no_priority)
-                    -> continue_node<continue_output_t<std::invoke_result_t<Body, continue_msg>>,
-                                     Policy<void>>;
-
-            template <typename GraphOrSet, typename Body>
-            continue_node(GraphOrSet&&, int, Body, node_priority_t = no_priority)
-                    -> continue_node<continue_output_t<std::invoke_result_t<Body, continue_msg>>,
-                                     Policy<void>>;
+template <typename GraphOrSet, typename Body, typename Policy>
+function_node(GraphOrSet&&,
+              size_t, Body,
+              Policy, node_priority_t = no_priority)
+->function_node<input_t<decltype(decide_on_callable_type<Body>(0))>,
+                output_t<decltype(decide_on_callable_type<Body>(0))>,
+                Policy>;
+
+template <typename GraphOrSet, typename Body>
+function_node(GraphOrSet&&, size_t,
+              Body, node_priority_t = no_priority)
+->function_node<input_t<decltype(decide_on_callable_type<Body>(0))>,
+                output_t<decltype(decide_on_callable_type<Body>(0))>,
+                queueing>;
+
+template <typename Output>
+struct continue_output {
+    using type = Output;
+};
+
+template <>
+struct continue_output<void> {
+    using type = continue_msg;
+};
+
+template <typename T>
+using continue_output_t = typename continue_output<T>::type;
+
+template <typename GraphOrSet, typename Body, typename Policy>
+continue_node(GraphOrSet&&, Body,
+              Policy, node_priority_t = no_priority)
+->continue_node<continue_output_t<std::invoke_result_t<Body, continue_msg>>,
+                Policy>;
+
+template <typename GraphOrSet, typename Body, typename Policy>
+continue_node(GraphOrSet&&,
+              int, Body,
+              Policy, node_priority_t = no_priority)
+->continue_node<continue_output_t<std::invoke_result_t<Body, continue_msg>>,
+                Policy>;
+
+template <typename GraphOrSet, typename Body>
+continue_node(GraphOrSet&&,
+              Body, node_priority_t = no_priority)
+->continue_node<continue_output_t<std::invoke_result_t<Body, continue_msg>>, Policy<void>>;
+
+template <typename GraphOrSet, typename Body>
+continue_node(GraphOrSet&&, int,
+              Body, node_priority_t = no_priority)
+->continue_node<continue_output_t<std::invoke_result_t<Body, continue_msg>>,
+                Policy<void>>;
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 
-            template <typename NodeSet>
-            overwrite_node(const NodeSet&) -> overwrite_node<decide_on_set_t<NodeSet>>;
+template <typename NodeSet>
+overwrite_node(const NodeSet&)
+->overwrite_node<decide_on_set_t<NodeSet>>;
 
-            template <typename NodeSet>
-            write_once_node(const NodeSet&) -> write_once_node<decide_on_set_t<NodeSet>>;
-#endif   // __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-        }// namespace d1
-    }    // namespace detail
-}// namespace tbb
+template <typename NodeSet>
+write_once_node(const NodeSet&)
+->write_once_node<decide_on_set_t<NodeSet>>;
+#endif // __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+} // namespace d2
+} // namespace detail
+} // namespace tbb
 
-#endif// __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
+#endif // __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 
-#endif// __TBB_flow_graph_nodes_deduction_H
+#endif // __TBB_flow_graph_nodes_deduction_H
diff --git a/external/tbb/include/oneapi/tbb/detail/_flow_graph_tagged_buffer_impl.h b/external/tbb/include/oneapi/tbb/detail/_flow_graph_tagged_buffer_impl.h
index 90f69de5..0f7c0d17 100644
--- a/external/tbb/include/oneapi/tbb/detail/_flow_graph_tagged_buffer_impl.h
+++ b/external/tbb/include/oneapi/tbb/detail/_flow_graph_tagged_buffer_impl.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -30,48 +30,105 @@
 
 // elements in the table are a simple list; we need pointer to next element to
 // traverse the chain
-template <typename ValueType>
-struct buffer_element_type {
-    // the second parameter below is void * because we can't forward-declare the type
-    // itself, so we just reinterpret_cast below.
-    typedef typename aligned_pair<ValueType, void *>::type type;
+
+template <typename Key, typename ValueType>
+struct hash_buffer_element : public aligned_pair<ValueType, void*> {
+    using key_type = Key;
+    using value_type = ValueType;
+
+    value_type* get_value_ptr() { return reinterpret_cast<value_type*>(this->first); }
+    hash_buffer_element* get_next() { return reinterpret_cast<hash_buffer_element*>(this->second); }
+    void set_next(hash_buffer_element* new_next) { this->second = reinterpret_cast<void*>(new_next); }
+
+    void create_element(const value_type& v) {
+        ::new(this->first) value_type(v);
+    }
+
+    void create_element(hash_buffer_element&& other) {
+        ::new(this->first) value_type(std::move(*other.get_value_ptr()));
+    }
+
+    void destroy_element() {
+        get_value_ptr()->~value_type();
+    }
 };
 
-template <typename Key,// type of key within ValueType
-          typename ValueType,
-          typename ValueToKey, // abstract method that returns "const Key" or "const Key&" given ValueType
-          typename HashCompare,// has hash and equal
-          typename Allocator = tbb::cache_aligned_allocator<typename aligned_pair<ValueType, void *>::type>>
-class hash_buffer : public HashCompare {
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+template <typename Key, typename ValueType>
+struct metainfo_hash_buffer_element : public aligned_triple<ValueType, void*, message_metainfo> {
+    using key_type = Key;
+    using value_type = ValueType;
+
+    value_type* get_value_ptr() { return reinterpret_cast<value_type*>(this->first); }
+    metainfo_hash_buffer_element* get_next() {
+        return reinterpret_cast<metainfo_hash_buffer_element*>(this->second);
+    }
+    void set_next(metainfo_hash_buffer_element* new_next) { this->second = reinterpret_cast<void*>(new_next); }
+    message_metainfo& get_metainfo() { return this->third; }
+
+    void create_element(const value_type& v, const message_metainfo& metainfo) {
+        __TBB_ASSERT(this->third.empty(), nullptr);
+        ::new(this->first) value_type(v);
+        this->third = metainfo;
+
+        for (auto waiter : metainfo.waiters()) {
+            waiter->reserve(1);
+        }
+    }
+
+    void create_element(metainfo_hash_buffer_element&& other) {
+        __TBB_ASSERT(this->third.empty(), nullptr);
+        ::new(this->first) value_type(std::move(*other.get_value_ptr()));
+        this->third = std::move(other.get_metainfo());
+    }
+
+    void destroy_element() {
+        get_value_ptr()->~value_type();
+
+        for (auto waiter : get_metainfo().waiters()) {
+            waiter->release(1);
+        }
+        get_metainfo() = message_metainfo{};
+    }
+};
+#endif
+
+template
+    <
+     typename ElementType,
+     typename ValueToKey,  // abstract method that returns "const Key" or "const Key&" given ValueType
+     typename HashCompare, // has hash and equal
+     typename Allocator=tbb::cache_aligned_allocator<ElementType>
+    >
+class hash_buffer_impl : public HashCompare {
 public:
-    static const size_t INITIAL_SIZE = 8;// initial size of the hash pointer table
-    typedef ValueType value_type;
-    typedef typename buffer_element_type<value_type>::type element_type;
+    static const size_t INITIAL_SIZE = 8;  // initial size of the hash pointer table
+    typedef typename ElementType::key_type key_type;
+    typedef typename ElementType::value_type value_type;
+    typedef ElementType element_type;
     typedef value_type *pointer_type;
-    typedef element_type *list_array_type;// array we manage manually
+    typedef element_type *list_array_type;  // array we manage manually
     typedef list_array_type *pointer_array_type;
-    typedef typename std::allocator_traits<Allocator>::template rebind_alloc<list_array_type>
-            pointer_array_allocator_type;
-    typedef typename std::allocator_traits<Allocator>::template rebind_alloc<element_type>
-            elements_array_allocator;
-    typedef typename std::decay<Key>::type Knoref;
+    typedef typename std::allocator_traits<Allocator>::template rebind_alloc<list_array_type> pointer_array_allocator_type;
+    typedef typename std::allocator_traits<Allocator>::template rebind_alloc<element_type> elements_array_allocator;
+    typedef typename std::decay<key_type>::type Knoref;
 
 private:
     ValueToKey *my_key;
     size_t my_size;
     size_t nelements;
-    pointer_array_type pointer_array;// pointer_array[my_size]
-    list_array_type elements_array;  // elements_array[my_size / 2]
-    element_type *free_list;
+    pointer_array_type pointer_array;    // pointer_array[my_size]
+    list_array_type elements_array;      // elements_array[my_size / 2]
+    element_type* free_list;
 
     size_t mask() { return my_size - 1; }
 
-    void set_up_free_list(element_type **p_free_list, list_array_type la, size_t sz) {
-        for (size_t i = 0; i < sz - 1; ++i) {// construct free list
-            la[i].second = &(la[i + 1]);
+    void set_up_free_list( element_type **p_free_list, list_array_type la, size_t sz) {
+        for(size_t i=0; i < sz - 1; ++i ) {  // construct free list
+            la[i].set_next(&(la[i + 1]));
         }
-        la[sz - 1].second = NULL;
-        *p_free_list = (element_type *) &(la[0]);
+        la[sz - 1].set_next(nullptr);
+        *p_free_list = (element_type *)&(la[0]);
     }
 
     // cleanup for exceptions
@@ -80,10 +137,10 @@ class hash_buffer : public HashCompare {
         list_array_type *my_elements;
         size_t my_size;
 
-        DoCleanup(pointer_array_type &pa, list_array_type &my_els, size_t sz)
-            : my_pa(&pa), my_elements(&my_els), my_size(sz) {}
+        DoCleanup(pointer_array_type &pa, list_array_type &my_els, size_t sz) :
+            my_pa(&pa), my_elements(&my_els), my_size(sz) {  }
         ~DoCleanup() {
-            if (my_pa) {
+            if(my_pa) {
                 size_t dont_care = 0;
                 internal_free_buffer(*my_pa, *my_elements, my_size, dont_care);
             }
@@ -92,27 +149,30 @@ class hash_buffer : public HashCompare {
 
     // exception-safety requires we do all the potentially-throwing operations first
     void grow_array() {
-        size_t new_size = my_size * 2;
-        size_t new_nelements = nelements;// internal_free_buffer zeroes this
-        list_array_type new_elements_array = NULL;
-        pointer_array_type new_pointer_array = NULL;
-        list_array_type new_free_list = NULL;
+        size_t new_size = my_size*2;
+        size_t new_nelements = nelements;  // internal_free_buffer zeroes this
+        list_array_type new_elements_array = nullptr;
+        pointer_array_type new_pointer_array = nullptr;
+        list_array_type new_free_list = nullptr;
         {
             DoCleanup my_cleanup(new_pointer_array, new_elements_array, new_size);
             new_elements_array = elements_array_allocator().allocate(my_size);
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+            for (std::size_t i = 0; i < my_size; ++i) {
+                ::new(new_elements_array + i) element_type();
+            }
+#endif
             new_pointer_array = pointer_array_allocator_type().allocate(new_size);
-            for (size_t i = 0; i < new_size; ++i) new_pointer_array[i] = NULL;
-            set_up_free_list(&new_free_list, new_elements_array, my_size);
-
-            for (size_t i = 0; i < my_size; ++i) {
-                for (element_type *op = pointer_array[i]; op; op = (element_type *) (op->second)) {
-                    value_type *ov = reinterpret_cast<value_type *>(&(op->first));
-                    // could have std::move semantics
-                    internal_insert_with_key(new_pointer_array, new_size, new_free_list, *ov);
+            for(size_t i=0; i < new_size; ++i) new_pointer_array[i] = nullptr;
+            set_up_free_list(&new_free_list, new_elements_array, my_size );
+
+            for(size_t i=0; i < my_size; ++i) {
+                for( element_type* op = pointer_array[i]; op; op = (element_type *)(op->get_next())) {
+                    internal_insert_with_key(new_pointer_array, new_size, new_free_list, std::move(*op));
                 }
             }
-            my_cleanup.my_pa = NULL;
-            my_cleanup.my_elements = NULL;
+            my_cleanup.my_pa = nullptr;
+            my_cleanup.my_elements = nullptr;
         }
 
         internal_free_buffer(pointer_array, elements_array, my_size, nelements);
@@ -125,63 +185,81 @@ class hash_buffer : public HashCompare {
 
     // v should have perfect forwarding if std::move implemented.
     // we use this method to move elements in grow_array, so can't use class fields
-    void internal_insert_with_key(element_type **p_pointer_array, size_t p_sz, list_array_type &p_free_list,
-                                  const value_type &v) {
-        size_t l_mask = p_sz - 1;
+    template <typename Value, typename... Args>
+    const value_type& get_value_from_pack(const Value& value, const Args&...) {
+        return value;
+    }
+
+    template <typename Element>
+    const value_type& get_value_from_pack(Element&& element) {
+        return *(element.get_value_ptr());
+    }
+
+    template <typename... Args>
+    void internal_insert_with_key( element_type **p_pointer_array, size_t p_sz, list_array_type &p_free_list,
+                                   Args&&... args) {
+        size_t l_mask = p_sz-1;
         __TBB_ASSERT(my_key, "Error: value-to-key functor not provided");
-        size_t h = this->hash((*my_key)(v)) & l_mask;
+        size_t h = this->hash(tbb::detail::invoke(*my_key, get_value_from_pack(args...))) & l_mask;
         __TBB_ASSERT(p_free_list, "Error: free list not set up.");
-        element_type *my_elem = p_free_list;
-        p_free_list = (element_type *) (p_free_list->second);
-        (void) new (&(my_elem->first)) value_type(v);
-        my_elem->second = p_pointer_array[h];
+        element_type* my_elem = p_free_list; p_free_list = (element_type *)(p_free_list->get_next());
+        my_elem->create_element(std::forward<Args>(args)...);
+        my_elem->set_next(p_pointer_array[h]);
         p_pointer_array[h] = my_elem;
     }
 
     void internal_initialize_buffer() {
         pointer_array = pointer_array_allocator_type().allocate(my_size);
-        for (size_t i = 0; i < my_size; ++i) pointer_array[i] = NULL;
+        for(size_t i = 0; i < my_size; ++i) pointer_array[i] = nullptr;
         elements_array = elements_array_allocator().allocate(my_size / 2);
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+        for (std::size_t i = 0; i < my_size / 2; ++i) {
+            ::new(elements_array + i) element_type();
+        }
+#endif
         set_up_free_list(&free_list, elements_array, my_size / 2);
     }
 
     // made static so an enclosed class can use to properly dispose of the internals
-    static void internal_free_buffer(pointer_array_type &pa, list_array_type &el, size_t &sz, size_t &ne) {
-        if (pa) {
-            for (size_t i = 0; i < sz; ++i) {
+    static void internal_free_buffer( pointer_array_type &pa, list_array_type &el, size_t &sz, size_t &ne ) {
+        if(pa) {
+            for(size_t i = 0; i < sz; ++i ) {
                 element_type *p_next;
-                for (element_type *p = pa[i]; p; p = p_next) {
-                    p_next = (element_type *) p->second;
-                    // TODO revamp: make sure type casting is correct.
-                    void *ptr = (void *) (p->first);
-#if _MSC_VER && _MSC_VER <= 1900 && !__INTEL_COMPILER
-                    suppress_unused_warning(ptr);
-#endif
-                    ((value_type *) ptr)->~value_type();
+                for( element_type *p = pa[i]; p; p = p_next) {
+                    p_next = p->get_next();
+                    p->destroy_element();
                 }
             }
             pointer_array_allocator_type().deallocate(pa, sz);
-            pa = NULL;
+            pa = nullptr;
         }
         // Separate test (if allocation of pa throws, el may be allocated.
         // but no elements will be constructed.)
-        if (el) {
+        if(el) {
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+            for (std::size_t i = 0; i < sz / 2; ++i) {
+                (el + i)->~element_type();
+            }
+#endif
             elements_array_allocator().deallocate(el, sz / 2);
-            el = NULL;
+            el = nullptr;
         }
         sz = INITIAL_SIZE;
         ne = 0;
     }
 
 public:
-    hash_buffer() : my_key(NULL), my_size(INITIAL_SIZE), nelements(0) { internal_initialize_buffer(); }
+    hash_buffer_impl() : my_key(nullptr), my_size(INITIAL_SIZE), nelements(0) {
+        internal_initialize_buffer();
+    }
 
-    ~hash_buffer() {
+    ~hash_buffer_impl() {
         internal_free_buffer(pointer_array, elements_array, my_size, nelements);
-        if (my_key) delete my_key;
+        delete my_key;
+        my_key = nullptr;
     }
-    hash_buffer(const hash_buffer &) = delete;
-    hash_buffer &operator=(const hash_buffer &) = delete;
+    hash_buffer_impl(const hash_buffer_impl&) = delete;
+    hash_buffer_impl& operator=(const hash_buffer_impl&) = delete;
 
     void reset() {
         internal_free_buffer(pointer_array, elements_array, my_size, nelements);
@@ -192,57 +270,64 @@ class hash_buffer : public HashCompare {
     // This method is only used internally, so can't be misused by user.
     void set_key_func(ValueToKey *vtk) { my_key = vtk; }
     // pointer is used to clone()
-    ValueToKey *get_key_func() { return my_key; }
+    ValueToKey* get_key_func() { return my_key; }
 
-    bool insert_with_key(const value_type &v) {
-        pointer_type p = NULL;
+    template <typename... Args>
+    bool insert_with_key(const value_type &v, Args&&... args) {
+        element_type* p = nullptr;
         __TBB_ASSERT(my_key, "Error: value-to-key functor not provided");
-        if (find_ref_with_key((*my_key)(v), p)) {
-            p->~value_type();
-            (void) new (p) value_type(v);// copy-construct into the space
+        if(find_element_ref_with_key(tbb::detail::invoke(*my_key, v), p)) {
+            p->destroy_element();
+            p->create_element(v, std::forward<Args>(args)...);
             return false;
         }
         ++nelements;
-        if (nelements * 2 > my_size) grow_array();
-        internal_insert_with_key(pointer_array, my_size, free_list, v);
+        if(nelements*2 > my_size) grow_array();
+        internal_insert_with_key(pointer_array, my_size, free_list, v, std::forward<Args>(args)...);
         return true;
     }
 
-    // returns true and sets v to array element if found, else returns false.
-    bool find_ref_with_key(const Knoref &k, pointer_type &v) {
+    bool find_element_ref_with_key(const Knoref& k, element_type*& v) {
         size_t i = this->hash(k) & mask();
-        for (element_type *p = pointer_array[i]; p; p = (element_type *) (p->second)) {
-            pointer_type pv = reinterpret_cast<pointer_type>(&(p->first));
+        for(element_type* p = pointer_array[i]; p; p = (element_type *)(p->get_next())) {
             __TBB_ASSERT(my_key, "Error: value-to-key functor not provided");
-            if (this->equal((*my_key)(*pv), k)) {
-                v = pv;
+            if(this->equal(tbb::detail::invoke(*my_key, *p->get_value_ptr()), k)) {
+                v = p;
                 return true;
             }
         }
         return false;
     }
 
-    bool find_with_key(const Knoref &k, value_type &v) {
+    // returns true and sets v to array element if found, else returns false.
+    bool find_ref_with_key(const Knoref& k, pointer_type &v) {
+        element_type* element_ptr = nullptr;
+        bool res = find_element_ref_with_key(k, element_ptr);
+        v = element_ptr->get_value_ptr();
+        return res;
+    }
+
+    bool find_with_key( const Knoref& k, value_type &v) {
         value_type *p;
-        if (find_ref_with_key(k, p)) {
+        if(find_ref_with_key(k, p)) {
             v = *p;
             return true;
-        } else
+        }
+        else
             return false;
     }
 
-    void delete_with_key(const Knoref &k) {
+    void delete_with_key(const Knoref& k) {
         size_t h = this->hash(k) & mask();
-        element_type *prev = NULL;
-        for (element_type *p = pointer_array[h]; p; prev = p, p = (element_type *) (p->second)) {
-            value_type *vp = reinterpret_cast<value_type *>(&(p->first));
+        element_type* prev = nullptr;
+        for(element_type* p = pointer_array[h]; p; prev = p, p = (element_type *)(p->get_next())) {
+            value_type *vp = p->get_value_ptr();
             __TBB_ASSERT(my_key, "Error: value-to-key functor not provided");
-            if (this->equal((*my_key)(*vp), k)) {
-                vp->~value_type();
-                if (prev) prev->second = p->second;
-                else
-                    pointer_array[h] = (element_type *) (p->second);
-                p->second = free_list;
+            if(this->equal(tbb::detail::invoke(*my_key, *vp), k)) {
+                p->destroy_element();
+                if(prev) prev->set_next(p->get_next());
+                else pointer_array[h] = (element_type *)(p->get_next());
+                p->set_next(free_list);
                 free_list = p;
                 --nelements;
                 return;
@@ -251,4 +336,45 @@ class hash_buffer : public HashCompare {
         __TBB_ASSERT(false, "key not found for delete");
     }
 };
-#endif// __TBB__flow_graph_hash_buffer_impl_H
+
+template
+    <
+     typename Key,         // type of key within ValueType
+     typename ValueType,
+     typename ValueToKey,  // abstract method that returns "const Key" or "const Key&" given ValueType
+     typename HashCompare, // has hash and equal
+     typename Allocator=tbb::cache_aligned_allocator<hash_buffer_element<Key, ValueType>>
+    >
+using hash_buffer = hash_buffer_impl<hash_buffer_element<Key, ValueType>,
+                                     ValueToKey, HashCompare, Allocator>;
+
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+template
+    <
+     typename Key,         // type of key within ValueType
+     typename ValueType,
+     typename ValueToKey,  // abstract method that returns "const Key" or "const Key&" given ValueType
+     typename HashCompare, // has hash and equal
+     typename Allocator=tbb::cache_aligned_allocator<metainfo_hash_buffer_element<Key, ValueType>>
+    >
+struct metainfo_hash_buffer : public hash_buffer_impl<metainfo_hash_buffer_element<Key, ValueType>,
+                                               ValueToKey, HashCompare, Allocator>
+{
+private:
+    using base_type = hash_buffer_impl<metainfo_hash_buffer_element<Key, ValueType>,
+                                       ValueToKey, HashCompare, Allocator>;
+public:
+    bool find_with_key(const typename base_type::Knoref& k,
+                       typename base_type::value_type& v, message_metainfo& metainfo)
+    {
+        typename base_type::element_type* p = nullptr;
+        bool result = this->find_element_ref_with_key(k, p);
+        if (result) {
+            v = *(p->get_value_ptr());
+            metainfo = p->get_metainfo();
+        }
+        return result;
+    }
+};
+#endif // __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+#endif // __TBB__flow_graph_hash_buffer_impl_H
diff --git a/external/tbb/include/oneapi/tbb/detail/_flow_graph_trace_impl.h b/external/tbb/include/oneapi/tbb/detail/_flow_graph_trace_impl.h
index 82664a2c..74ebf084 100644
--- a/external/tbb/include/oneapi/tbb/detail/_flow_graph_trace_impl.h
+++ b/external/tbb/include/oneapi/tbb/detail/_flow_graph_trace_impl.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -19,383 +19,346 @@
 
 #include "../profiling.h"
 #if (_MSC_VER >= 1900)
-#include <intrin.h>
+    #include <intrin.h>
 #endif
 
 namespace tbb {
-    namespace detail {
-        namespace d1 {
+namespace detail {
+namespace d2 {
 
-            template <typename T>
-            class sender;
-            template <typename T>
-            class receiver;
+template< typename T > class sender;
+template< typename T > class receiver;
 
 #if TBB_USE_PROFILING_TOOLS
+    #if __TBB_FLOW_TRACE_CODEPTR
+        #if (_MSC_VER >= 1900)
+            #define CODEPTR() (_ReturnAddress())
+        #elif __TBB_GCC_VERSION >= 40800
+            #define CODEPTR() ( __builtin_return_address(0))
+        #else
+            #define CODEPTR() nullptr
+        #endif
+    #else
+        #define CODEPTR() nullptr
+    #endif /* __TBB_FLOW_TRACE_CODEPTR */
+
+static inline void fgt_alias_port(void *node, void *p, bool visible) {
+    if(visible)
+        itt_relation_add( d1::ITT_DOMAIN_FLOW, node, FLOW_NODE, __itt_relation_is_parent_of, p, FLOW_NODE );
+    else
+        itt_relation_add( d1::ITT_DOMAIN_FLOW, p, FLOW_NODE, __itt_relation_is_child_of, node, FLOW_NODE );
+}
+
+static inline void fgt_composite ( void* codeptr, void *node, void *graph ) {
+    itt_make_task_group( d1::ITT_DOMAIN_FLOW, node, FLOW_NODE, graph, FLOW_GRAPH, FLOW_COMPOSITE_NODE );
+    suppress_unused_warning( codeptr );
 #if __TBB_FLOW_TRACE_CODEPTR
-#if (_MSC_VER >= 1900)
-#define CODEPTR() (_ReturnAddress())
-#elif __TBB_GCC_VERSION >= 40800
-#define CODEPTR() (__builtin_return_address(0))
-#else
-#define CODEPTR() NULL
-#endif
-#else
-#define CODEPTR() NULL
-#endif /* __TBB_FLOW_TRACE_CODEPTR */
-
-            static inline void fgt_alias_port(void *node, void *p, bool visible) {
-                if (visible)
-                    itt_relation_add(ITT_DOMAIN_FLOW, node, FLOW_NODE, __itt_relation_is_parent_of, p,
-                                     FLOW_NODE);
-                else
-                    itt_relation_add(ITT_DOMAIN_FLOW, p, FLOW_NODE, __itt_relation_is_child_of, node,
-                                     FLOW_NODE);
-            }
-
-            static inline void fgt_composite(void *codeptr, void *node, void *graph) {
-                itt_make_task_group(ITT_DOMAIN_FLOW, node, FLOW_NODE, graph, FLOW_GRAPH, FLOW_COMPOSITE_NODE);
-                suppress_unused_warning(codeptr);
-#if __TBB_FLOW_TRACE_CODEPTR
-                if (codeptr != NULL) {
-                    register_node_addr(ITT_DOMAIN_FLOW, node, FLOW_NODE, CODE_ADDRESS, &codeptr);
-                }
+    if (codeptr != nullptr) {
+        register_node_addr(d1::ITT_DOMAIN_FLOW, node, FLOW_NODE, CODE_ADDRESS, &codeptr);
+    }
 #endif
-            }
-
-            static inline void fgt_internal_alias_input_port(void *node, void *p,
-                                                             string_resource_index name_index) {
-                itt_make_task_group(ITT_DOMAIN_FLOW, p, FLOW_INPUT_PORT, node, FLOW_NODE, name_index);
-                itt_relation_add(ITT_DOMAIN_FLOW, node, FLOW_NODE, __itt_relation_is_parent_of, p,
-                                 FLOW_INPUT_PORT);
-            }
-
-            static inline void fgt_internal_alias_output_port(void *node, void *p,
-                                                              string_resource_index name_index) {
-                itt_make_task_group(ITT_DOMAIN_FLOW, p, FLOW_OUTPUT_PORT, node, FLOW_NODE, name_index);
-                itt_relation_add(ITT_DOMAIN_FLOW, node, FLOW_NODE, __itt_relation_is_parent_of, p,
-                                 FLOW_OUTPUT_PORT);
-            }
-
-            template <typename InputType>
-            void alias_input_port(void *node, receiver<InputType> *port, string_resource_index name_index) {
-                // TODO: Make fgt_internal_alias_input_port a function template?
-                fgt_internal_alias_input_port(node, port, name_index);
-            }
-
-            template <typename PortsTuple, int N>
-            struct fgt_internal_input_alias_helper {
-                static void alias_port(void *node, PortsTuple &ports) {
-                    alias_input_port(node, &(std::get<N - 1>(ports)),
-                                     static_cast<string_resource_index>(FLOW_INPUT_PORT_0 + N - 1));
-                    fgt_internal_input_alias_helper<PortsTuple, N - 1>::alias_port(node, ports);
-                }
-            };
-
-            template <typename PortsTuple>
-            struct fgt_internal_input_alias_helper<PortsTuple, 0> {
-                static void alias_port(void * /* node */, PortsTuple & /* ports */) {}
-            };
-
-            template <typename OutputType>
-            void alias_output_port(void *node, sender<OutputType> *port, string_resource_index name_index) {
-                // TODO: Make fgt_internal_alias_output_port a function template?
-                fgt_internal_alias_output_port(node, static_cast<void *>(port), name_index);
-            }
-
-            template <typename PortsTuple, int N>
-            struct fgt_internal_output_alias_helper {
-                static void alias_port(void *node, PortsTuple &ports) {
-                    alias_output_port(node, &(std::get<N - 1>(ports)),
-                                      static_cast<string_resource_index>(FLOW_OUTPUT_PORT_0 + N - 1));
-                    fgt_internal_output_alias_helper<PortsTuple, N - 1>::alias_port(node, ports);
-                }
-            };
-
-            template <typename PortsTuple>
-            struct fgt_internal_output_alias_helper<PortsTuple, 0> {
-                static void alias_port(void * /*node*/, PortsTuple & /*ports*/) {}
-            };
-
-            static inline void fgt_internal_create_input_port(void *node, void *p,
-                                                              string_resource_index name_index) {
-                itt_make_task_group(ITT_DOMAIN_FLOW, p, FLOW_INPUT_PORT, node, FLOW_NODE, name_index);
-            }
-
-            static inline void fgt_internal_create_output_port(void *codeptr, void *node, void *p,
-                                                               string_resource_index name_index) {
-                itt_make_task_group(ITT_DOMAIN_FLOW, p, FLOW_OUTPUT_PORT, node, FLOW_NODE, name_index);
-                suppress_unused_warning(codeptr);
+}
+
+static inline void fgt_internal_alias_input_port( void *node, void *p, string_resource_index name_index ) {
+    itt_make_task_group( d1::ITT_DOMAIN_FLOW, p, FLOW_INPUT_PORT, node, FLOW_NODE, name_index );
+    itt_relation_add( d1::ITT_DOMAIN_FLOW, node, FLOW_NODE, __itt_relation_is_parent_of, p, FLOW_INPUT_PORT );
+}
+
+static inline void fgt_internal_alias_output_port( void *node, void *p, string_resource_index name_index ) {
+    itt_make_task_group( d1::ITT_DOMAIN_FLOW, p, FLOW_OUTPUT_PORT, node, FLOW_NODE, name_index );
+    itt_relation_add( d1::ITT_DOMAIN_FLOW, node, FLOW_NODE, __itt_relation_is_parent_of, p, FLOW_OUTPUT_PORT );
+}
+
+template<typename InputType>
+void alias_input_port(void *node, receiver<InputType>* port, string_resource_index name_index) {
+    // TODO: Make fgt_internal_alias_input_port a function template?
+    fgt_internal_alias_input_port( node, port, name_index);
+}
+
+template < typename PortsTuple, int N >
+struct fgt_internal_input_alias_helper {
+    static void alias_port( void *node, PortsTuple &ports ) {
+        alias_input_port( node, &(std::get<N-1>(ports)), static_cast<string_resource_index>(FLOW_INPUT_PORT_0 + N - 1) );
+        fgt_internal_input_alias_helper<PortsTuple, N-1>::alias_port( node, ports );
+    }
+};
+
+template < typename PortsTuple >
+struct fgt_internal_input_alias_helper<PortsTuple, 0> {
+    static void alias_port( void * /* node */, PortsTuple & /* ports */ ) { }
+};
+
+template<typename OutputType>
+void alias_output_port(void *node, sender<OutputType>* port, string_resource_index name_index) {
+    // TODO: Make fgt_internal_alias_output_port a function template?
+    fgt_internal_alias_output_port( node, static_cast<void *>(port), name_index);
+}
+
+template < typename PortsTuple, int N >
+struct fgt_internal_output_alias_helper {
+    static void alias_port( void *node, PortsTuple &ports ) {
+        alias_output_port( node, &(std::get<N-1>(ports)), static_cast<string_resource_index>(FLOW_OUTPUT_PORT_0 + N - 1) );
+        fgt_internal_output_alias_helper<PortsTuple, N-1>::alias_port( node, ports );
+    }
+};
+
+template < typename PortsTuple >
+struct fgt_internal_output_alias_helper<PortsTuple, 0> {
+    static void alias_port( void * /*node*/, PortsTuple &/*ports*/ ) {
+    }
+};
+
+static inline void fgt_internal_create_input_port( void *node, void *p, string_resource_index name_index ) {
+    itt_make_task_group( d1::ITT_DOMAIN_FLOW, p, FLOW_INPUT_PORT, node, FLOW_NODE, name_index );
+}
+
+static inline void fgt_internal_create_output_port( void* codeptr, void *node, void *p, string_resource_index name_index ) {
+    itt_make_task_group(d1::ITT_DOMAIN_FLOW, p, FLOW_OUTPUT_PORT, node, FLOW_NODE, name_index);
+    suppress_unused_warning( codeptr );
 #if __TBB_FLOW_TRACE_CODEPTR
-                if (codeptr != NULL) {
-                    register_node_addr(ITT_DOMAIN_FLOW, node, FLOW_NODE, CODE_ADDRESS, &codeptr);
-                }
+    if (codeptr != nullptr) {
+        register_node_addr(d1::ITT_DOMAIN_FLOW, node, FLOW_NODE, CODE_ADDRESS, &codeptr);
+    }
 #endif
-            }
-
-            template <typename InputType>
-            void register_input_port(void *node, receiver<InputType> *port,
-                                     string_resource_index name_index) {
-                // TODO: Make fgt_internal_create_input_port a function template?
-                fgt_internal_create_input_port(node, static_cast<void *>(port), name_index);
-            }
-
-            template <typename PortsTuple, int N>
-            struct fgt_internal_input_helper {
-                static void register_port(void *node, PortsTuple &ports) {
-                    register_input_port(node, &(std::get<N - 1>(ports)),
-                                        static_cast<string_resource_index>(FLOW_INPUT_PORT_0 + N - 1));
-                    fgt_internal_input_helper<PortsTuple, N - 1>::register_port(node, ports);
-                }
-            };
-
-            template <typename PortsTuple>
-            struct fgt_internal_input_helper<PortsTuple, 1> {
-                static void register_port(void *node, PortsTuple &ports) {
-                    register_input_port(node, &(std::get<0>(ports)), FLOW_INPUT_PORT_0);
-                }
-            };
-
-            template <typename OutputType>
-            void register_output_port(void *codeptr, void *node, sender<OutputType> *port,
-                                      string_resource_index name_index) {
-                // TODO: Make fgt_internal_create_output_port a function template?
-                fgt_internal_create_output_port(codeptr, node, static_cast<void *>(port), name_index);
-            }
-
-            template <typename PortsTuple, int N>
-            struct fgt_internal_output_helper {
-                static void register_port(void *codeptr, void *node, PortsTuple &ports) {
-                    register_output_port(codeptr, node, &(std::get<N - 1>(ports)),
-                                         static_cast<string_resource_index>(FLOW_OUTPUT_PORT_0 + N - 1));
-                    fgt_internal_output_helper<PortsTuple, N - 1>::register_port(codeptr, node, ports);
-                }
-            };
-
-            template <typename PortsTuple>
-            struct fgt_internal_output_helper<PortsTuple, 1> {
-                static void register_port(void *codeptr, void *node, PortsTuple &ports) {
-                    register_output_port(codeptr, node, &(std::get<0>(ports)), FLOW_OUTPUT_PORT_0);
-                }
-            };
-
-            template <typename NodeType>
-            void fgt_multioutput_node_desc(const NodeType *node, const char *desc) {
-                void *addr = (void *) (static_cast<receiver<typename NodeType::input_type> *>(
-                        const_cast<NodeType *>(node)));
-                itt_metadata_str_add(ITT_DOMAIN_FLOW, addr, FLOW_NODE, FLOW_OBJECT_NAME, desc);
-            }
-
-            template <typename NodeType>
-            void fgt_multiinput_multioutput_node_desc(const NodeType *node, const char *desc) {
-                void *addr = const_cast<NodeType *>(node);
-                itt_metadata_str_add(ITT_DOMAIN_FLOW, addr, FLOW_NODE, FLOW_OBJECT_NAME, desc);
-            }
-
-            template <typename NodeType>
-            static inline void fgt_node_desc(const NodeType *node, const char *desc) {
-                void *addr = (void *) (static_cast<sender<typename NodeType::output_type> *>(
-                        const_cast<NodeType *>(node)));
-                itt_metadata_str_add(ITT_DOMAIN_FLOW, addr, FLOW_NODE, FLOW_OBJECT_NAME, desc);
-            }
-
-            static inline void fgt_graph_desc(const void *g, const char *desc) {
-                void *addr = const_cast<void *>(g);
-                itt_metadata_str_add(ITT_DOMAIN_FLOW, addr, FLOW_GRAPH, FLOW_OBJECT_NAME, desc);
-            }
-
-            static inline void fgt_body(void *node, void *body) {
-                itt_relation_add(ITT_DOMAIN_FLOW, body, FLOW_BODY, __itt_relation_is_child_of, node,
-                                 FLOW_NODE);
-            }
-
-            template <int N, typename PortsTuple>
-            static inline void fgt_multioutput_node(void *codeptr, string_resource_index t, void *g,
-                                                    void *input_port, PortsTuple &ports) {
-                itt_make_task_group(ITT_DOMAIN_FLOW, input_port, FLOW_NODE, g, FLOW_GRAPH, t);
-                fgt_internal_create_input_port(input_port, input_port, FLOW_INPUT_PORT_0);
-                fgt_internal_output_helper<PortsTuple, N>::register_port(codeptr, input_port, ports);
-            }
-
-            template <int N, typename PortsTuple>
-            static inline void fgt_multioutput_node_with_body(void *codeptr, string_resource_index t, void *g,
-                                                              void *input_port, PortsTuple &ports,
-                                                              void *body) {
-                itt_make_task_group(ITT_DOMAIN_FLOW, input_port, FLOW_NODE, g, FLOW_GRAPH, t);
-                fgt_internal_create_input_port(input_port, input_port, FLOW_INPUT_PORT_0);
-                fgt_internal_output_helper<PortsTuple, N>::register_port(codeptr, input_port, ports);
-                fgt_body(input_port, body);
-            }
-
-            template <int N, typename PortsTuple>
-            static inline void fgt_multiinput_node(void *codeptr, string_resource_index t, void *g,
-                                                   PortsTuple &ports, void *output_port) {
-                itt_make_task_group(ITT_DOMAIN_FLOW, output_port, FLOW_NODE, g, FLOW_GRAPH, t);
-                fgt_internal_create_output_port(codeptr, output_port, output_port, FLOW_OUTPUT_PORT_0);
-                fgt_internal_input_helper<PortsTuple, N>::register_port(output_port, ports);
-            }
-
-            static inline void fgt_multiinput_multioutput_node(void *codeptr, string_resource_index t,
-                                                               void *n, void *g) {
-                itt_make_task_group(ITT_DOMAIN_FLOW, n, FLOW_NODE, g, FLOW_GRAPH, t);
-                suppress_unused_warning(codeptr);
+}
+
+template<typename InputType>
+void register_input_port(void *node, receiver<InputType>* port, string_resource_index name_index) {
+    // TODO: Make fgt_internal_create_input_port a function template?
+    fgt_internal_create_input_port(node, static_cast<void*>(port), name_index);
+}
+
+template < typename PortsTuple, int N >
+struct fgt_internal_input_helper {
+    static void register_port( void *node, PortsTuple &ports ) {
+        register_input_port( node, &(std::get<N-1>(ports)), static_cast<string_resource_index>(FLOW_INPUT_PORT_0 + N - 1) );
+        fgt_internal_input_helper<PortsTuple, N-1>::register_port( node, ports );
+    }
+};
+
+template < typename PortsTuple >
+struct fgt_internal_input_helper<PortsTuple, 1> {
+    static void register_port( void *node, PortsTuple &ports ) {
+        register_input_port( node, &(std::get<0>(ports)), FLOW_INPUT_PORT_0 );
+    }
+};
+
+template<typename OutputType>
+void register_output_port(void* codeptr, void *node, sender<OutputType>* port, string_resource_index name_index) {
+    // TODO: Make fgt_internal_create_output_port a function template?
+    fgt_internal_create_output_port( codeptr, node, static_cast<void *>(port), name_index);
+}
+
+template < typename PortsTuple, int N >
+struct fgt_internal_output_helper {
+    static void register_port( void* codeptr, void *node, PortsTuple &ports ) {
+        register_output_port( codeptr, node, &(std::get<N-1>(ports)), static_cast<string_resource_index>(FLOW_OUTPUT_PORT_0 + N - 1) );
+        fgt_internal_output_helper<PortsTuple, N-1>::register_port( codeptr, node, ports );
+    }
+};
+
+template < typename PortsTuple >
+struct fgt_internal_output_helper<PortsTuple,1> {
+    static void register_port( void* codeptr, void *node, PortsTuple &ports ) {
+        register_output_port( codeptr, node, &(std::get<0>(ports)), FLOW_OUTPUT_PORT_0 );
+    }
+};
+
+template< typename NodeType >
+void fgt_multioutput_node_desc( const NodeType *node, const char *desc ) {
+    void *addr =  (void *)( static_cast< receiver< typename NodeType::input_type > * >(const_cast< NodeType *>(node)) );
+    itt_metadata_str_add( d1::ITT_DOMAIN_FLOW, addr, FLOW_NODE, FLOW_OBJECT_NAME, desc );
+}
+
+template< typename NodeType >
+void fgt_multiinput_multioutput_node_desc( const NodeType *node, const char *desc ) {
+    void *addr =  const_cast<NodeType *>(node);
+    itt_metadata_str_add( d1::ITT_DOMAIN_FLOW, addr, FLOW_NODE, FLOW_OBJECT_NAME, desc );
+}
+
+template< typename NodeType >
+static inline void fgt_node_desc( const NodeType *node, const char *desc ) {
+    void *addr =  (void *)( static_cast< sender< typename NodeType::output_type > * >(const_cast< NodeType *>(node)) );
+    itt_metadata_str_add( d1::ITT_DOMAIN_FLOW, addr, FLOW_NODE, FLOW_OBJECT_NAME, desc );
+}
+
+static inline void fgt_graph_desc( const void *g, const char *desc ) {
+    void *addr = const_cast< void *>(g);
+    itt_metadata_str_add( d1::ITT_DOMAIN_FLOW, addr, FLOW_GRAPH, FLOW_OBJECT_NAME, desc );
+}
+
+static inline void fgt_body( void *node, void *body ) {
+    itt_relation_add( d1::ITT_DOMAIN_FLOW, body, FLOW_BODY, __itt_relation_is_child_of, node, FLOW_NODE );
+}
+
+template< int N, typename PortsTuple >
+static inline void fgt_multioutput_node(void* codeptr, string_resource_index t, void *g, void *input_port, PortsTuple &ports ) {
+    itt_make_task_group( d1::ITT_DOMAIN_FLOW, input_port, FLOW_NODE, g, FLOW_GRAPH, t );
+    fgt_internal_create_input_port( input_port, input_port, FLOW_INPUT_PORT_0 );
+    fgt_internal_output_helper<PortsTuple, N>::register_port(codeptr, input_port, ports );
+}
+
+template< int N, typename PortsTuple >
+static inline void fgt_multioutput_node_with_body( void* codeptr, string_resource_index t, void *g, void *input_port, PortsTuple &ports, void *body ) {
+    itt_make_task_group( d1::ITT_DOMAIN_FLOW, input_port, FLOW_NODE, g, FLOW_GRAPH, t );
+    fgt_internal_create_input_port( input_port, input_port, FLOW_INPUT_PORT_0 );
+    fgt_internal_output_helper<PortsTuple, N>::register_port( codeptr, input_port, ports );
+    fgt_body( input_port, body );
+}
+
+template< int N, typename PortsTuple >
+static inline void fgt_multiinput_node( void* codeptr, string_resource_index t, void *g, PortsTuple &ports, void *output_port) {
+    itt_make_task_group( d1::ITT_DOMAIN_FLOW, output_port, FLOW_NODE, g, FLOW_GRAPH, t );
+    fgt_internal_create_output_port( codeptr, output_port, output_port, FLOW_OUTPUT_PORT_0 );
+    fgt_internal_input_helper<PortsTuple, N>::register_port( output_port, ports );
+}
+
+static inline void fgt_multiinput_multioutput_node( void* codeptr, string_resource_index t, void *n, void *g ) {
+    itt_make_task_group( d1::ITT_DOMAIN_FLOW, n, FLOW_NODE, g, FLOW_GRAPH, t );
+    suppress_unused_warning( codeptr );
 #if __TBB_FLOW_TRACE_CODEPTR
-                if (codeptr != NULL) {
-                    register_node_addr(ITT_DOMAIN_FLOW, n, FLOW_NODE, CODE_ADDRESS, &codeptr);
-                }
+    if (codeptr != nullptr) {
+        register_node_addr(d1::ITT_DOMAIN_FLOW, n, FLOW_NODE, CODE_ADDRESS, &codeptr);
+    }
 #endif
-            }
+}
+
+static inline void fgt_node( void* codeptr, string_resource_index t, void *g, void *output_port ) {
+    itt_make_task_group( d1::ITT_DOMAIN_FLOW, output_port, FLOW_NODE, g, FLOW_GRAPH, t );
+    fgt_internal_create_output_port( codeptr, output_port, output_port, FLOW_OUTPUT_PORT_0 );
+}
 
-            static inline void fgt_node(void *codeptr, string_resource_index t, void *g, void *output_port) {
-                itt_make_task_group(ITT_DOMAIN_FLOW, output_port, FLOW_NODE, g, FLOW_GRAPH, t);
-                fgt_internal_create_output_port(codeptr, output_port, output_port, FLOW_OUTPUT_PORT_0);
-            }
+static void fgt_node_with_body( void* codeptr, string_resource_index t, void *g, void *output_port, void *body ) {
+    itt_make_task_group( d1::ITT_DOMAIN_FLOW, output_port, FLOW_NODE, g, FLOW_GRAPH, t );
+    fgt_internal_create_output_port(codeptr, output_port, output_port, FLOW_OUTPUT_PORT_0 );
+    fgt_body( output_port, body );
+}
 
-            static void fgt_node_with_body(void *codeptr, string_resource_index t, void *g, void *output_port,
-                                           void *body) {
-                itt_make_task_group(ITT_DOMAIN_FLOW, output_port, FLOW_NODE, g, FLOW_GRAPH, t);
-                fgt_internal_create_output_port(codeptr, output_port, output_port, FLOW_OUTPUT_PORT_0);
-                fgt_body(output_port, body);
-            }
+static inline void fgt_node( void* codeptr, string_resource_index t, void *g, void *input_port, void *output_port ) {
+    fgt_node( codeptr, t, g, output_port );
+    fgt_internal_create_input_port( output_port, input_port, FLOW_INPUT_PORT_0 );
+}
 
-            static inline void fgt_node(void *codeptr, string_resource_index t, void *g, void *input_port,
-                                        void *output_port) {
-                fgt_node(codeptr, t, g, output_port);
-                fgt_internal_create_input_port(output_port, input_port, FLOW_INPUT_PORT_0);
-            }
+static inline void  fgt_node_with_body( void* codeptr, string_resource_index t, void *g, void *input_port, void *output_port, void *body ) {
+    fgt_node_with_body( codeptr, t, g, output_port, body );
+    fgt_internal_create_input_port( output_port, input_port, FLOW_INPUT_PORT_0 );
+}
 
-            static inline void fgt_node_with_body(void *codeptr, string_resource_index t, void *g,
-                                                  void *input_port, void *output_port, void *body) {
-                fgt_node_with_body(codeptr, t, g, output_port, body);
-                fgt_internal_create_input_port(output_port, input_port, FLOW_INPUT_PORT_0);
-            }
 
-            static inline void fgt_node(void *codeptr, string_resource_index t, void *g, void *input_port,
-                                        void *decrement_port, void *output_port) {
-                fgt_node(codeptr, t, g, input_port, output_port);
-                fgt_internal_create_input_port(output_port, decrement_port, FLOW_INPUT_PORT_1);
-            }
+static inline void  fgt_node( void* codeptr, string_resource_index t, void *g, void *input_port, void *decrement_port, void *output_port ) {
+    fgt_node( codeptr, t, g, input_port, output_port );
+    fgt_internal_create_input_port( output_port, decrement_port, FLOW_INPUT_PORT_1 );
+}
 
-            static inline void fgt_make_edge(void *output_port, void *input_port) {
-                itt_relation_add(ITT_DOMAIN_FLOW, output_port, FLOW_OUTPUT_PORT,
-                                 __itt_relation_is_predecessor_to, input_port, FLOW_INPUT_PORT);
-            }
+static inline void fgt_make_edge( void *output_port, void *input_port ) {
+    itt_relation_add( d1::ITT_DOMAIN_FLOW, output_port, FLOW_OUTPUT_PORT, __itt_relation_is_predecessor_to, input_port, FLOW_INPUT_PORT);
+}
 
-            static inline void fgt_remove_edge(void *output_port, void *input_port) {
-                itt_relation_add(ITT_DOMAIN_FLOW, output_port, FLOW_OUTPUT_PORT, __itt_relation_is_sibling_of,
-                                 input_port, FLOW_INPUT_PORT);
-            }
+static inline void fgt_remove_edge( void *output_port, void *input_port ) {
+    itt_relation_add( d1::ITT_DOMAIN_FLOW, output_port, FLOW_OUTPUT_PORT, __itt_relation_is_sibling_of, input_port, FLOW_INPUT_PORT);
+}
 
-            static inline void fgt_graph(void *g) {
-                itt_make_task_group(ITT_DOMAIN_FLOW, g, FLOW_GRAPH, NULL, FLOW_NULL, FLOW_GRAPH);
-            }
+static inline void fgt_graph( void *g ) {
+    itt_make_task_group( d1::ITT_DOMAIN_FLOW, g, FLOW_GRAPH, nullptr, FLOW_NULL, FLOW_GRAPH );
+}
 
-            static inline void fgt_begin_body(void *body) {
-                itt_task_begin(ITT_DOMAIN_FLOW, body, FLOW_BODY, NULL, FLOW_NULL, FLOW_BODY);
-            }
+static inline void fgt_begin_body( void *body ) {
+    itt_task_begin( d1::ITT_DOMAIN_FLOW, body, FLOW_BODY, nullptr, FLOW_NULL, FLOW_BODY );
+}
 
-            static inline void fgt_end_body(void *) { itt_task_end(ITT_DOMAIN_FLOW); }
+static inline void fgt_end_body( void * ) {
+    itt_task_end( d1::ITT_DOMAIN_FLOW );
+}
 
-            static inline void fgt_async_try_put_begin(void *node, void *port) {
-                itt_task_begin(ITT_DOMAIN_FLOW, port, FLOW_OUTPUT_PORT, node, FLOW_NODE, FLOW_OUTPUT_PORT);
-            }
+static inline void fgt_async_try_put_begin( void *node, void *port ) {
+    itt_task_begin( d1::ITT_DOMAIN_FLOW, port, FLOW_OUTPUT_PORT, node, FLOW_NODE, FLOW_OUTPUT_PORT );
+}
 
-            static inline void fgt_async_try_put_end(void *, void *) { itt_task_end(ITT_DOMAIN_FLOW); }
+static inline void fgt_async_try_put_end( void *, void * ) {
+    itt_task_end( d1::ITT_DOMAIN_FLOW );
+}
 
-            static inline void fgt_async_reserve(void *node, void *graph) {
-                itt_region_begin(ITT_DOMAIN_FLOW, node, FLOW_NODE, graph, FLOW_GRAPH, FLOW_NULL);
-            }
+static inline void fgt_async_reserve( void *node, void *graph ) {
+    itt_region_begin( d1::ITT_DOMAIN_FLOW, node, FLOW_NODE, graph, FLOW_GRAPH, FLOW_NULL );
+}
 
-            static inline void fgt_async_commit(void *node, void * /*graph*/) {
-                itt_region_end(ITT_DOMAIN_FLOW, node, FLOW_NODE);
-            }
+static inline void fgt_async_commit( void *node, void * /*graph*/) {
+    itt_region_end( d1::ITT_DOMAIN_FLOW, node, FLOW_NODE );
+}
 
-            static inline void fgt_reserve_wait(void *graph) {
-                itt_region_begin(ITT_DOMAIN_FLOW, graph, FLOW_GRAPH, NULL, FLOW_NULL, FLOW_NULL);
-            }
+static inline void fgt_reserve_wait( void *graph ) {
+    itt_region_begin( d1::ITT_DOMAIN_FLOW, graph, FLOW_GRAPH, nullptr, FLOW_NULL, FLOW_NULL );
+}
 
-            static inline void fgt_release_wait(void *graph) {
-                itt_region_end(ITT_DOMAIN_FLOW, graph, FLOW_GRAPH);
-            }
+static inline void fgt_release_wait( void *graph ) {
+    itt_region_end( d1::ITT_DOMAIN_FLOW, graph, FLOW_GRAPH );
+}
 
-#else// TBB_USE_PROFILING_TOOLS
+#else // TBB_USE_PROFILING_TOOLS
 
-#define CODEPTR() NULL
+#define CODEPTR() nullptr
 
-            static inline void fgt_alias_port(void* /*node*/, void* /*p*/, bool /*visible*/) {}
+static inline void fgt_alias_port(void * /*node*/, void * /*p*/, bool /*visible*/ ) { }
 
-            static inline void fgt_composite(void* /*codeptr*/, void* /*node*/, void* /*graph*/) {}
+static inline void fgt_composite ( void* /*codeptr*/, void * /*node*/, void * /*graph*/ ) { }
 
-            static inline void fgt_graph(void* /*g*/) {}
+static inline void fgt_graph( void * /*g*/ ) { }
 
-            template <typename NodeType>
-            static inline void fgt_multioutput_node_desc(const NodeType* /*node*/, const char* /*desc*/) {}
+template< typename NodeType >
+static inline void fgt_multioutput_node_desc( const NodeType * /*node*/, const char * /*desc*/ ) { }
 
-            template <typename NodeType>
-            static inline void fgt_node_desc(const NodeType* /*node*/, const char* /*desc*/) {}
+template< typename NodeType >
+static inline void fgt_node_desc( const NodeType * /*node*/, const char * /*desc*/ ) { }
 
-            static inline void fgt_graph_desc(const void* /*g*/, const char* /*desc*/) {}
+static inline void fgt_graph_desc( const void * /*g*/, const char * /*desc*/ ) { }
 
-            template <int N, typename PortsTuple>
-            static inline void fgt_multioutput_node(void* /*codeptr*/, string_resource_index /*t*/,
-                                                    void* /*g*/, void* /*input_port*/,
-                                                    PortsTuple& /*ports*/) {}
+template< int N, typename PortsTuple >
+static inline void fgt_multioutput_node( void* /*codeptr*/, string_resource_index /*t*/, void * /*g*/, void * /*input_port*/, PortsTuple & /*ports*/ ) { }
 
-            template <int N, typename PortsTuple>
-            static inline void fgt_multioutput_node_with_body(void* /*codeptr*/, string_resource_index /*t*/,
-                                                              void* /*g*/, void* /*input_port*/,
-                                                              PortsTuple& /*ports*/, void* /*body*/) {}
+template< int N, typename PortsTuple >
+static inline void fgt_multioutput_node_with_body( void* /*codeptr*/, string_resource_index /*t*/, void * /*g*/, void * /*input_port*/, PortsTuple & /*ports*/, void * /*body*/ ) { }
 
-            template <int N, typename PortsTuple>
-            static inline void fgt_multiinput_node(void* /*codeptr*/, string_resource_index /*t*/,
-                                                   void* /*g*/, PortsTuple& /*ports*/,
-                                                   void* /*output_port*/) {}
+template< int N, typename PortsTuple >
+static inline void fgt_multiinput_node( void* /*codeptr*/, string_resource_index /*t*/, void * /*g*/, PortsTuple & /*ports*/, void * /*output_port*/ ) { }
 
-            static inline void fgt_multiinput_multioutput_node(void* /*codeptr*/, string_resource_index /*t*/,
-                                                               void* /*node*/, void* /*graph*/) {}
+static inline void fgt_multiinput_multioutput_node( void* /*codeptr*/, string_resource_index /*t*/, void * /*node*/, void * /*graph*/ ) { }
 
-            static inline void fgt_node(void* /*codeptr*/, string_resource_index /*t*/, void* /*g*/,
-                                        void* /*input_port*/, void* /*output_port*/) {}
-            static inline void fgt_node(void* /*codeptr*/, string_resource_index /*t*/, void* /*g*/,
-                                        void* /*input_port*/, void* /*decrement_port*/,
-                                        void* /*output_port*/) {}
+static inline void fgt_node( void* /*codeptr*/, string_resource_index /*t*/, void * /*g*/, void * /*input_port*/, void * /*output_port*/ ) { }
+static inline void  fgt_node( void* /*codeptr*/, string_resource_index /*t*/, void * /*g*/, void * /*input_port*/, void * /*decrement_port*/, void * /*output_port*/ ) { }
 
-            static inline void fgt_node_with_body(void* /*codeptr*/, string_resource_index /*t*/, void* /*g*/,
-                                                  void* /*output_port*/, void* /*body*/) {}
-            static inline void fgt_node_with_body(void* /*codeptr*/, string_resource_index /*t*/, void* /*g*/,
-                                                  void* /*input_port*/, void* /*output_port*/,
-                                                  void* /*body*/) {}
+static inline void fgt_node_with_body( void* /*codeptr*/, string_resource_index /*t*/, void * /*g*/, void * /*output_port*/, void * /*body*/ ) { }
+static inline void fgt_node_with_body( void* /*codeptr*/, string_resource_index /*t*/, void * /*g*/, void * /*input_port*/, void * /*output_port*/, void * /*body*/ ) { }
 
-            static inline void fgt_make_edge(void* /*output_port*/, void* /*input_port*/) {}
-            static inline void fgt_remove_edge(void* /*output_port*/, void* /*input_port*/) {}
+static inline void fgt_make_edge( void * /*output_port*/, void * /*input_port*/ ) { }
+static inline void fgt_remove_edge( void * /*output_port*/, void * /*input_port*/ ) { }
 
-            static inline void fgt_begin_body(void* /*body*/) {}
-            static inline void fgt_end_body(void* /*body*/) {}
+static inline void fgt_begin_body( void * /*body*/ ) { }
+static inline void fgt_end_body( void *  /*body*/) { }
 
-            static inline void fgt_async_try_put_begin(void* /*node*/, void* /*port*/) {}
-            static inline void fgt_async_try_put_end(void* /*node*/, void* /*port*/) {}
-            static inline void fgt_async_reserve(void* /*node*/, void* /*graph*/) {}
-            static inline void fgt_async_commit(void* /*node*/, void* /*graph*/) {}
-            static inline void fgt_reserve_wait(void* /*graph*/) {}
-            static inline void fgt_release_wait(void* /*graph*/) {}
+static inline void fgt_async_try_put_begin( void * /*node*/, void * /*port*/ ) { }
+static inline void fgt_async_try_put_end( void * /*node*/ , void * /*port*/ ) { }
+static inline void fgt_async_reserve( void * /*node*/, void * /*graph*/ ) { }
+static inline void fgt_async_commit( void * /*node*/, void * /*graph*/ ) { }
+static inline void fgt_reserve_wait( void * /*graph*/ ) { }
+static inline void fgt_release_wait( void * /*graph*/ ) { }
 
-            template <typename NodeType>
-            void fgt_multiinput_multioutput_node_desc(const NodeType* /*node*/, const char* /*desc*/) {}
+template< typename NodeType >
+void fgt_multiinput_multioutput_node_desc( const NodeType * /*node*/, const char * /*desc*/ ) { }
 
-            template <typename PortsTuple, int N>
-            struct fgt_internal_input_alias_helper {
-                static void alias_port(void* /*node*/, PortsTuple& /*ports*/) {}
-            };
+template < typename PortsTuple, int N >
+struct fgt_internal_input_alias_helper {
+    static void alias_port( void * /*node*/, PortsTuple & /*ports*/ ) { }
+};
 
-            template <typename PortsTuple, int N>
-            struct fgt_internal_output_alias_helper {
-                static void alias_port(void* /*node*/, PortsTuple& /*ports*/) {}
-            };
+template < typename PortsTuple, int N >
+struct fgt_internal_output_alias_helper {
+    static void alias_port( void * /*node*/, PortsTuple & /*ports*/ ) { }
+};
 
-#endif// TBB_USE_PROFILING_TOOLS
+#endif // TBB_USE_PROFILING_TOOLS
 
-        }// namespace d1
-    }    // namespace detail
-}// namespace tbb
+} // d2
+} // namespace detail
+} // namespace tbb
 
-#endif// _FGT_GRAPH_TRACE_IMPL_H
+#endif // _FGT_GRAPH_TRACE_IMPL_H
diff --git a/external/tbb/include/oneapi/tbb/detail/_flow_graph_types_impl.h b/external/tbb/include/oneapi/tbb/detail/_flow_graph_types_impl.h
index fb389f6d..e361b23e 100644
--- a/external/tbb/include/oneapi/tbb/detail/_flow_graph_types_impl.h
+++ b/external/tbb/include/oneapi/tbb/detail/_flow_graph_types_impl.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 #error Do not #include this internal file directly; use public TBB headers instead.
 #endif
 
-// included in namespace tbb::detail::d1
+// included in namespace tbb::detail::d2
 
 // the change to key_matching (adding a K and KHash template parameter, making it a class)
 // means we have to pass this data to the key_matching_port.  All the ports have only one
@@ -34,89 +34,98 @@
 //
 // The port will have an additional parameter on node construction, which is a function_body
 // that accepts a const T& and returns a K which is the field in T which is its K.
-template <typename Kp, typename KHashp, typename Tp>
+template<typename Kp, typename KHashp, typename Tp>
 struct KeyTrait {
     typedef Kp K;
     typedef Tp T;
-    typedef type_to_key_function_body<T, K> TtoK;
+    typedef type_to_key_function_body<T,K> TtoK;
     typedef KHashp KHash;
 };
 
 // wrap each element of a tuple in a template, and make a tuple of the result.
-template <int N, template <class> class PT, typename TypeTuple>
+template<int N, template<class> class PT, typename TypeTuple>
 struct wrap_tuple_elements;
 
 // A wrapper that generates the traits needed for each port of a key-matching join,
 // and the type of the tuple of input ports.
-template <int N, template <class> class PT, typename KeyTraits, typename TypeTuple>
+template<int N, template<class> class PT, typename KeyTraits, typename TypeTuple>
 struct wrap_key_tuple_elements;
 
-template <int N, template <class> class PT, typename... Args>
-struct wrap_tuple_elements<N, PT, std::tuple<Args...>> {
-    typedef typename std::tuple<PT<Args>...> type;
+template<int N, template<class> class PT,  typename... Args>
+struct wrap_tuple_elements<N, PT, std::tuple<Args...> >{
+    typedef typename std::tuple<PT<Args>... > type;
 };
 
-template <int N, template <class> class PT, typename KeyTraits, typename... Args>
-struct wrap_key_tuple_elements<N, PT, KeyTraits, std::tuple<Args...>> {
+template<int N, template<class> class PT, typename KeyTraits, typename... Args>
+struct wrap_key_tuple_elements<N, PT, KeyTraits, std::tuple<Args...> > {
     typedef typename KeyTraits::key_type K;
     typedef typename KeyTraits::hash_compare_type KHash;
-    typedef typename std::tuple<PT<KeyTrait<K, KHash, Args>>...> type;
+    typedef typename std::tuple<PT<KeyTrait<K, KHash, Args> >... > type;
 };
 
-template <int... S>
-class sequence {};
+template< int... S > class sequence {};
 
-template <int N, int... S>
-struct make_sequence : make_sequence<N - 1, N - 1, S...> {};
+template< int N, int... S >
+struct make_sequence : make_sequence < N - 1, N - 1, S... > {};
 
-template <int... S>
-struct make_sequence<0, S...> {
+template< int... S >
+struct make_sequence < 0, S... > {
     typedef sequence<S...> type;
 };
 
-//! type mimicking std::pair but with trailing fill to ensure each element of an array
-//* will have the correct alignment
-template <typename T1, typename T2, size_t REM>
-struct type_plus_align {
-    char first[sizeof(T1)];
-    T2 second;
-    char fill1[REM];
+template<class U> struct alignment_of {
+    typedef struct { char t; U    padded; } test_alignment;
+    static const size_t value = sizeof(test_alignment) - sizeof(U);
 };
 
-template <typename T1, typename T2>
-struct type_plus_align<T1, T2, 0> {
-    char first[sizeof(T1)];
-    T2 second;
+template <typename... Types>
+struct max_alignment_helper;
+
+template <typename T1, typename... Types>
+struct max_alignment_helper<T1, Types...> {
+    using type = typename max_alignment_helper<T1, typename max_alignment_helper<Types...>::type>::type;
 };
 
-template <class U>
-struct alignment_of {
-    typedef struct {
-        char t;
-        U padded;
-    } test_alignment;
-    static const size_t value = sizeof(test_alignment) - sizeof(U);
+template <typename T1, typename T2>
+struct max_alignment_helper<T1, T2> {
+    using type = typename std::conditional<alignof(T1) < alignof(T2), T2, T1>::type;
 };
 
+template <typename... Types>
+using max_alignment_helper_t = typename max_alignment_helper<Types...>::type;
+
+#if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
+#pragma warning(push)
+#pragma warning(disable: 4324) // warning C4324: structure was padded due to alignment specifier
+#endif
+
 // T1, T2 are actual types stored.  The space defined for T1 in the type returned
 // is a char array of the correct size.  Type T2 should be trivially-constructible,
 // T1 must be explicitly managed.
+
 template <typename T1, typename T2>
-struct aligned_pair {
-    static const size_t t1_align = alignment_of<T1>::value;
-    static const size_t t2_align = alignment_of<T2>::value;
-    typedef type_plus_align<T1, T2, 0> just_pair;
-    static const size_t max_align = t1_align < t2_align ? t2_align : t1_align;
-    static const size_t extra_bytes = sizeof(just_pair) % max_align;
-    static const size_t remainder = extra_bytes ? max_align - extra_bytes : 0;
+struct alignas(alignof(max_alignment_helper_t<T1, T2>)) aligned_pair {
+    char first[sizeof(T1)];
+    T2 second;
+};
+
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+template <typename T1, typename T2, typename T3>
+struct alignas(alignof(max_alignment_helper_t<T1, T2, T3>)) aligned_triple {
+    char first[sizeof(T1)];
+    T2 second;
+    T3 third;
+};
+#endif
 
-public:
-    typedef type_plus_align<T1, T2, remainder> type;
-};// aligned_pair
+
+#if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
+#pragma warning(pop) // warning 4324 is back
+#endif
 
 // support for variant type
 // type we use when we're not storing a value
-struct default_constructed {};
+struct default_constructed { };
 
 // type which contains another type, tests for what type is contained, and references to it.
 // Wrapper<T>
@@ -125,20 +134,18 @@ struct default_constructed {};
 // struct to allow us to copy and test the type of objects
 struct WrapperBase {
     virtual ~WrapperBase() {}
-    virtual void CopyTo(void * /*newSpace*/) const = 0;
+    virtual void CopyTo(void* /*newSpace*/) const = 0;
 };
 
 // Wrapper<T> contains a T, with the ability to test what T is.  The Wrapper<T> can be
 // constructed from a T, can be copy-constructed from another Wrapper<T>, and can be
 // examined via value(), but not modified.
-template <typename T>
-struct Wrapper : public WrapperBase {
+template<typename T>
+struct Wrapper: public WrapperBase {
     typedef T value_type;
-    typedef T *pointer_type;
-
+    typedef T* pointer_type;
 private:
     T value_space;
-
 public:
     const value_type &value() const { return value_space; }
 
@@ -150,30 +157,28 @@ struct Wrapper : public WrapperBase {
         pointer_type space;
         _unwind_space(pointer_type p) : space(p) {}
         ~_unwind_space() {
-            if (space) (void) new (space) Wrapper<default_constructed>(default_constructed());
+            if(space) (void) new (space) Wrapper<default_constructed>(default_constructed());
         }
     };
-
 public:
-    explicit Wrapper(const T &other) : value_space(other) {}
-    explicit Wrapper(const Wrapper &other) = delete;
+    explicit Wrapper( const T& other ) : value_space(other) { }
+    explicit Wrapper(const Wrapper& other) = delete;
 
-    void CopyTo(void *newSpace) const override {
-        _unwind_space guard((pointer_type) newSpace);
-        (void) new (newSpace) Wrapper(value_space);
-        guard.space = NULL;
+    void CopyTo(void* newSpace) const override {
+        _unwind_space guard((pointer_type)newSpace);
+        (void) new(newSpace) Wrapper(value_space);
+        guard.space = nullptr;
     }
-    ~Wrapper() {}
+    ~Wrapper() { }
 };
 
 // specialization for array objects
-template <typename T, size_t N>
+template<typename T, size_t N>
 struct Wrapper<T[N]> : public WrapperBase {
     typedef T value_type;
-    typedef T *pointer_type;
+    typedef T* pointer_type;
     // space must be untyped.
     typedef T ArrayType[N];
-
 private:
     // The space is not of type T[N] because when copy-constructing, it would be
     // default-initialized and then copied to in some fashion, resulting in two
@@ -182,20 +187,20 @@ struct Wrapper<T[N]> : public WrapperBase {
     static const size_t space_size = sizeof(ArrayType);
     char value_space[space_size];
 
+
     // on exception will ensure the already-built objects will be destructed
     // (the value_space is a char array, so it is already trivially-destructible.)
     struct _unwind_class {
         pointer_type space;
-        int already_built;
+        int    already_built;
         _unwind_class(pointer_type p) : space(p), already_built(0) {}
         ~_unwind_class() {
-            if (space) {
-                for (size_t i = already_built; i > 0; --i) space[i - 1].~value_type();
-                (void) new (space) Wrapper<default_constructed>(default_constructed());
+            if(space) {
+                for(size_t i = already_built; i > 0 ; --i ) space[i-1].~value_type();
+                (void) new(space) Wrapper<default_constructed>(default_constructed());
             }
         }
     };
-
 public:
     const ArrayType &value() const {
         char *vp = const_cast<char *>(value_space);
@@ -204,38 +209,37 @@ struct Wrapper<T[N]> : public WrapperBase {
 
 private:
     Wrapper();
-
 public:
     // have to explicitly construct because other decays to a const value_type*
-    explicit Wrapper(const ArrayType &other) {
-        _unwind_class guard((pointer_type) value_space);
+    explicit Wrapper(const ArrayType& other) {
+        _unwind_class guard((pointer_type)value_space);
         pointer_type vp = reinterpret_cast<pointer_type>(&value_space);
-        for (size_t i = 0; i < N; ++i) {
-            (void) new (vp++) value_type(other[i]);
+        for(size_t i = 0; i < N; ++i ) {
+            (void) new(vp++) value_type(other[i]);
             ++(guard.already_built);
         }
-        guard.space = NULL;
+        guard.space = nullptr;
     }
-    explicit Wrapper(const Wrapper &other) : WrapperBase() {
+    explicit Wrapper(const Wrapper& other) : WrapperBase() {
         // we have to do the heavy lifting to copy contents
-        _unwind_class guard((pointer_type) value_space);
+        _unwind_class guard((pointer_type)value_space);
         pointer_type dp = reinterpret_cast<pointer_type>(value_space);
         pointer_type sp = reinterpret_cast<pointer_type>(const_cast<char *>(other.value_space));
-        for (size_t i = 0; i < N; ++i, ++dp, ++sp) {
-            (void) new (dp) value_type(*sp);
+        for(size_t i = 0; i < N; ++i, ++dp, ++sp) {
+            (void) new(dp) value_type(*sp);
             ++(guard.already_built);
         }
-        guard.space = NULL;
+        guard.space = nullptr;
     }
 
-    void CopyTo(void *newSpace) const override {
-        (void) new (newSpace) Wrapper(*this);// exceptions handled in copy constructor
+    void CopyTo(void* newSpace) const override {
+        (void) new(newSpace) Wrapper(*this);  // exceptions handled in copy constructor
     }
 
     ~Wrapper() {
         // have to destroy explicitly in reverse order
         pointer_type vp = reinterpret_cast<pointer_type>(&value_space);
-        for (size_t i = N; i > 0; --i) vp[i - 1].~value_type();
+        for(size_t i = N; i > 0 ; --i ) vp[i-1].~value_type();
     }
 };
 
@@ -243,67 +247,55 @@ struct Wrapper<T[N]> : public WrapperBase {
 // Given a tuple and that type, return the number of elements of the object with the max
 // alignment requirement that is at least as big as the largest object in the tuple.
 
-template <bool, class T1, class T2>
-struct pick_one;
-template <class T1, class T2>
-struct pick_one<true, T1, T2> {
-    typedef T1 type;
-};
-template <class T1, class T2>
-struct pick_one<false, T1, T2> {
-    typedef T2 type;
-};
+template<bool, class T1, class T2> struct pick_one;
+template<class T1, class T2> struct pick_one<true , T1, T2> { typedef T1 type; };
+template<class T1, class T2> struct pick_one<false, T1, T2> { typedef T2 type; };
 
-template <template <class> class Selector, typename T1, typename T2>
+template< template<class> class Selector, typename T1, typename T2 >
 struct pick_max {
-    typedef typename pick_one<(Selector<T1>::value > Selector<T2>::value), T1, T2>::type type;
+    typedef typename pick_one< (Selector<T1>::value > Selector<T2>::value), T1, T2 >::type type;
 };
 
-template <typename T>
-struct size_of {
-    static const int value = sizeof(T);
-};
+template<typename T> struct size_of { static const int value = sizeof(T); };
 
-template <size_t N, class Tuple, template <class> class Selector>
-struct pick_tuple_max {
-    typedef typename pick_tuple_max<N - 1, Tuple, Selector>::type LeftMaxType;
-    typedef typename std::tuple_element<N - 1, Tuple>::type ThisType;
+template< size_t N, class Tuple, template<class> class Selector > struct pick_tuple_max {
+    typedef typename pick_tuple_max<N-1, Tuple, Selector>::type LeftMaxType;
+    typedef typename std::tuple_element<N-1, Tuple>::type ThisType;
     typedef typename pick_max<Selector, LeftMaxType, ThisType>::type type;
 };
 
-template <class Tuple, template <class> class Selector>
-struct pick_tuple_max<0, Tuple, Selector> {
+template< class Tuple, template<class> class Selector > struct pick_tuple_max<0, Tuple, Selector> {
     typedef typename std::tuple_element<0, Tuple>::type type;
 };
 
 // is the specified type included in a tuple?
-template <class Q, size_t N, class Tuple>
+template<class Q, size_t N, class Tuple>
 struct is_element_of {
-    typedef typename std::tuple_element<N - 1, Tuple>::type T_i;
-    static const bool value = std::is_same<Q, T_i>::value || is_element_of<Q, N - 1, Tuple>::value;
+    typedef typename std::tuple_element<N-1, Tuple>::type T_i;
+    static const bool value = std::is_same<Q,T_i>::value || is_element_of<Q,N-1,Tuple>::value;
 };
 
-template <class Q, class Tuple>
-struct is_element_of<Q, 0, Tuple> {
+template<class Q, class Tuple>
+struct is_element_of<Q,0,Tuple> {
     typedef typename std::tuple_element<0, Tuple>::type T_i;
-    static const bool value = std::is_same<Q, T_i>::value;
+    static const bool value = std::is_same<Q,T_i>::value;
 };
 
 // allow the construction of types that are listed tuple.  If a disallowed type
 // construction is written, a method involving this type is created.  The
 // type has no definition, so a syntax error is generated.
-template <typename T>
-struct ERROR_Type_Not_allowed_In_Tagged_Msg_Not_Member_Of_Tuple;
+template<typename T> struct ERROR_Type_Not_allowed_In_Tagged_Msg_Not_Member_Of_Tuple;
 
-template <typename T, bool BUILD_IT>
-struct do_if;
-template <typename T>
+template<typename T, bool BUILD_IT> struct do_if;
+template<typename T>
 struct do_if<T, true> {
-    static void construct(void *mySpace, const T &x) { (void) new (mySpace) Wrapper<T>(x); }
+    static void construct(void *mySpace, const T& x) {
+        (void) new(mySpace) Wrapper<T>(x);
+    }
 };
-template <typename T>
+template<typename T>
 struct do_if<T, false> {
-    static void construct(void * /*mySpace*/, const T &x) {
+    static void construct(void * /*mySpace*/, const T& x) {
         // This method is instantiated when the type T does not match any of the
         // element types in the Tuple in variant<Tuple>.
         ERROR_Type_Not_allowed_In_Tagged_Msg_Not_Member_Of_Tuple<T>::bad_type(x);
@@ -317,64 +309,57 @@ struct do_if<T, false> {
 
 using tbb::detail::punned_cast;
 struct tagged_null_type {};
-template <typename TagType, typename T0, typename T1 = tagged_null_type, typename T2 = tagged_null_type,
-          typename T3 = tagged_null_type, typename T4 = tagged_null_type, typename T5 = tagged_null_type,
-          typename T6 = tagged_null_type, typename T7 = tagged_null_type, typename T8 = tagged_null_type,
-          typename T9 = tagged_null_type>
+template<typename TagType, typename T0, typename T1=tagged_null_type, typename T2=tagged_null_type, typename T3=tagged_null_type,
+                           typename T4=tagged_null_type, typename T5=tagged_null_type, typename T6=tagged_null_type,
+                           typename T7=tagged_null_type, typename T8=tagged_null_type, typename T9=tagged_null_type>
 class tagged_msg {
     typedef std::tuple<T0, T1, T2, T3, T4
-//TODO: Should we reject lists longer than a tuple can hold?
-#if __TBB_VARIADIC_MAX >= 6
-                       ,
-                       T5
-#endif
-#if __TBB_VARIADIC_MAX >= 7
-                       ,
-                       T6
-#endif
-#if __TBB_VARIADIC_MAX >= 8
-                       ,
-                       T7
-#endif
-#if __TBB_VARIADIC_MAX >= 9
-                       ,
-                       T8
-#endif
-#if __TBB_VARIADIC_MAX >= 10
-                       ,
-                       T9
-#endif
-                       >
-            Tuple;
+                  //TODO: Should we reject lists longer than a tuple can hold?
+                  #if __TBB_VARIADIC_MAX >= 6
+                  , T5
+                  #endif
+                  #if __TBB_VARIADIC_MAX >= 7
+                  , T6
+                  #endif
+                  #if __TBB_VARIADIC_MAX >= 8
+                  , T7
+                  #endif
+                  #if __TBB_VARIADIC_MAX >= 9
+                  , T8
+                  #endif
+                  #if __TBB_VARIADIC_MAX >= 10
+                  , T9
+                  #endif
+                  > Tuple;
 
 private:
     class variant {
         static const size_t N = std::tuple_size<Tuple>::value;
         typedef typename pick_tuple_max<N, Tuple, alignment_of>::type AlignType;
         typedef typename pick_tuple_max<N, Tuple, size_of>::type MaxSizeType;
-        static const size_t MaxNBytes = (sizeof(Wrapper<MaxSizeType>) + sizeof(AlignType) - 1);
-        static const size_t MaxNElements = MaxNBytes / sizeof(AlignType);
+        static const size_t MaxNBytes = (sizeof(Wrapper<MaxSizeType>)+sizeof(AlignType)-1);
+        static const size_t MaxNElements = MaxNBytes/sizeof(AlignType);
         typedef aligned_space<AlignType, MaxNElements> SpaceType;
         SpaceType my_space;
         static const size_t MaxSize = sizeof(SpaceType);
 
     public:
-        variant() { (void) new (&my_space) Wrapper<default_constructed>(default_constructed()); }
+        variant() { (void) new(&my_space) Wrapper<default_constructed>(default_constructed()); }
 
-        template <typename T>
-        variant(const T &x) {
-            do_if<T, is_element_of<T, N, Tuple>::value>::construct(&my_space, x);
+        template<typename T>
+        variant( const T& x ) {
+            do_if<T, is_element_of<T, N, Tuple>::value>::construct(&my_space,x);
         }
 
-        variant(const variant &other) {
-            const WrapperBase *h = punned_cast<const WrapperBase *>(&(other.my_space));
+        variant(const variant& other) {
+            const WrapperBase * h = punned_cast<const WrapperBase *>(&(other.my_space));
             h->CopyTo(&my_space);
         }
 
         // assignment must destroy and re-create the Wrapper type, as there is no way
         // to create a Wrapper-to-Wrapper assign even if we find they agree in type.
-        void operator=(const variant &rhs) {
-            if (&rhs != this) {
+        void operator=( const variant& rhs ) {
+            if(&rhs != this) {
                 WrapperBase *h = punned_cast<WrapperBase *>(&my_space);
                 h->~WrapperBase();
                 const WrapperBase *ch = punned_cast<const WrapperBase *>(&(rhs.my_space));
@@ -382,65 +367,56 @@ class tagged_msg {
             }
         }
 
-        template <typename U>
-        const U &variant_cast_to() const {
-            const Wrapper<U> *h
-                    = dynamic_cast<const Wrapper<U> *>(punned_cast<const WrapperBase *>(&my_space));
-            if (!h) { throw_exception(exception_id::bad_tagged_msg_cast); }
+        template<typename U>
+        const U& variant_cast_to() const {
+            const Wrapper<U> *h = dynamic_cast<const Wrapper<U>*>(punned_cast<const WrapperBase *>(&my_space));
+            if(!h) {
+                throw_exception(exception_id::bad_tagged_msg_cast);
+            }
             return h->value();
         }
-        template <typename U>
-        bool variant_is_a() const {
-            return dynamic_cast<const Wrapper<U> *>(punned_cast<const WrapperBase *>(&my_space)) != NULL;
-        }
+        template<typename U>
+        bool variant_is_a() const { return dynamic_cast<const Wrapper<U>*>(punned_cast<const WrapperBase *>(&my_space)) != nullptr; }
 
-        bool variant_is_default_constructed() const { return variant_is_a<default_constructed>(); }
+        bool variant_is_default_constructed() const {return variant_is_a<default_constructed>();}
 
         ~variant() {
             WrapperBase *h = punned_cast<WrapperBase *>(&my_space);
             h->~WrapperBase();
         }
-    };//class variant
+    }; //class variant
 
     TagType my_tag;
     variant my_msg;
 
 public:
-    tagged_msg() : my_tag(TagType(~0)), my_msg() {}
+    tagged_msg(): my_tag(TagType(~0)), my_msg(){}
 
-    template <typename T, typename R>
+    template<typename T, typename R>
     tagged_msg(T const &index, R const &value) : my_tag(index), my_msg(value) {}
 
-    template <typename T, typename R, size_t N>
-    tagged_msg(T const &index, R (&value)[N]) : my_tag(index), my_msg(value) {}
+    template<typename T, typename R, size_t N>
+    tagged_msg(T const &index,  R (&value)[N]) : my_tag(index), my_msg(value) {}
 
-    void set_tag(TagType const &index) { my_tag = index; }
-    TagType tag() const { return my_tag; }
+    void set_tag(TagType const &index) {my_tag = index;}
+    TagType tag() const {return my_tag;}
 
-    template <typename V>
-    const V &cast_to() const {
-        return my_msg.template variant_cast_to<V>();
-    }
+    template<typename V>
+    const V& cast_to() const {return my_msg.template variant_cast_to<V>();}
 
-    template <typename V>
-    bool is_a() const {
-        return my_msg.template variant_is_a<V>();
-    }
+    template<typename V>
+    bool is_a() const {return my_msg.template variant_is_a<V>();}
 
-    bool is_default_constructed() const { return my_msg.variant_is_default_constructed(); }
-};//class tagged_msg
+    bool is_default_constructed() const {return my_msg.variant_is_default_constructed();}
+}; //class tagged_msg
 
 // template to simplify cast and test for tagged_msg in template contexts
-template <typename V, typename T>
-const V &cast_to(T const &t) {
-    return t.template cast_to<V>();
-}
+template<typename V, typename T>
+const V& cast_to(T const &t) { return t.template cast_to<V>(); }
 
-template <typename V, typename T>
-bool is_a(T const &t) {
-    return t.template is_a<V>();
-}
+template<typename V, typename T>
+bool is_a(T const &t) { return t.template is_a<V>(); }
 
 enum op_stat { WAIT = 0, SUCCEEDED, FAILED };
 
-#endif /* __TBB__flow_graph_types_impl_H */
+#endif  /* __TBB__flow_graph_types_impl_H */
diff --git a/external/tbb/include/oneapi/tbb/detail/_hash_compare.h b/external/tbb/include/oneapi/tbb/detail/_hash_compare.h
index b0b3a98b..5439264f 100644
--- a/external/tbb/include/oneapi/tbb/detail/_hash_compare.h
+++ b/external/tbb/include/oneapi/tbb/detail/_hash_compare.h
@@ -22,118 +22,126 @@
 #include "_containers_helpers.h"
 
 namespace tbb {
-    namespace detail {
-        namespace d1 {
-
-            template <typename Key, typename Hash, typename KeyEqual>
-            class hash_compare {
-                using is_transparent_hash = has_transparent_key_equal<Key, Hash, KeyEqual>;
-
-            public:
-                using hasher = Hash;
-                using key_equal = typename is_transparent_hash::type;
-
-                hash_compare() = default;
-                hash_compare(hasher hash, key_equal equal) : my_hasher(hash), my_equal(equal) {}
-
-                std::size_t operator()(const Key& key) const { return std::size_t(my_hasher(key)); }
-
-                bool operator()(const Key& key1, const Key& key2) const { return my_equal(key1, key2); }
-
-                template <typename K, typename = typename std::enable_if<is_transparent_hash::value, K>::type>
-                std::size_t operator()(const K& key) const {
-                    return std::size_t(my_hasher(key));
-                }
-
-                template <typename K1, typename K2,
-                          typename = typename std::enable_if<is_transparent_hash::value, K1>::type>
-                bool operator()(const K1& key1, const K2& key2) const {
-                    return my_equal(key1, key2);
-                }
-
-                hasher hash_function() const { return my_hasher; }
-
-                key_equal key_eq() const { return my_equal; }
-
-            private:
-                hasher my_hasher;
-                key_equal my_equal;
-            };// class hash_compare
-
-            //! hash_compare that is default argument for concurrent_hash_map
-            template <typename Key>
-            class tbb_hash_compare {
-            public:
-                std::size_t hash(const Key& a) const { return my_hash_func(a); }
+namespace detail {
+namespace d1 {
+
+template <typename Key, typename Hash, typename KeyEqual>
+class hash_compare {
+    using is_transparent_hash = has_transparent_key_equal<Key, Hash, KeyEqual>;
+public:
+    using hasher = Hash;
+    using key_equal = typename is_transparent_hash::type;
+
+    hash_compare() = default;
+    hash_compare( hasher hash, key_equal equal ) : my_hasher(hash), my_equal(equal) {}
+
+    std::size_t operator()( const Key& key ) const {
+        return std::size_t(my_hasher(key));
+    }
+
+    bool operator()( const Key& key1, const Key& key2 ) const {
+        return my_equal(key1, key2);
+    }
+
+    template <typename K, typename = typename std::enable_if<is_transparent_hash::value, K>::type>
+    std::size_t operator()( const K& key ) const {
+        return std::size_t(my_hasher(key));
+    }
+
+    template <typename K1, typename K2, typename = typename std::enable_if<is_transparent_hash::value, K1>::type>
+    bool operator()( const K1& key1, const K2& key2 ) const {
+        return my_equal(key1, key2);
+    }
+
+    hasher hash_function() const {
+        return my_hasher;
+    }
+
+    key_equal key_eq() const {
+        return my_equal;
+    }
+
+
+private:
+    hasher my_hasher;
+    key_equal my_equal;
+}; // class hash_compare
+
+//! hash_compare that is default argument for concurrent_hash_map
+template <typename Key>
+class tbb_hash_compare {
+public:
+    std::size_t hash( const Key& a ) const { return my_hash_func(a); }
 #if defined(_MSC_VER) && _MSC_VER <= 1900
-#pragma warning(push)
+#pragma warning (push)
 // MSVC 2015 throws a strange warning: 'std::size_t': forcing value to bool 'true' or 'false'
-#pragma warning(disable : 4800)
+#pragma warning (disable: 4800)
 #endif
-                bool equal(const Key& a, const Key& b) const { return my_key_equal(a, b); }
+    bool equal( const Key& a, const Key& b ) const { return my_key_equal(a, b); }
 #if defined(_MSC_VER) && _MSC_VER <= 1900
-#pragma warning(pop)
+#pragma warning (pop)
 #endif
-            private:
-                std::hash<Key> my_hash_func;
-                std::equal_to<Key> my_key_equal;
-            };
+private:
+    std::hash<Key> my_hash_func;
+    std::equal_to<Key> my_key_equal;
+};
 
-        }// namespace d1
+} // namespace d1
 #if __TBB_CPP20_CONCEPTS_PRESENT
-        inline namespace d0 {
+inline namespace d0 {
 
-            template <typename HashCompare, typename Key>
-            concept hash_compare = std::copy_constructible<HashCompare> && requires(
-                    const std::remove_reference_t<HashCompare>& hc, const Key& key1, const Key& key2) {
-                { hc.hash(key1) } -> std::same_as<std::size_t>;
-                { hc.equal(key1, key2) } -> std::convertible_to<bool>;
-            };
+template <typename HashCompare, typename Key>
+concept hash_compare = std::copy_constructible<HashCompare> &&
+                       requires( const std::remove_reference_t<HashCompare>& hc, const Key& key1, const Key& key2 ) {
+                           { hc.hash(key1) } -> std::same_as<std::size_t>;
+                           { hc.equal(key1, key2) } -> std::convertible_to<bool>;
+                       };
 
-        }// namespace d0
-#endif   // __TBB_CPP20_CONCEPTS_PRESENT
-    }    // namespace detail
-}// namespace tbb
+} // namespace d0
+#endif // __TBB_CPP20_CONCEPTS_PRESENT
+} // namespace detail
+} // namespace tbb
 
 #if TBB_DEFINE_STD_HASH_SPECIALIZATIONS
 
 namespace std {
 
-    template <typename T, typename U>
-    struct hash<std::pair<T, U>> {
-    public:
-        std::size_t operator()(const std::pair<T, U>& p) const {
-            return first_hash(p.first) ^ second_hash(p.second);
-        }
+template <typename T, typename U>
+struct hash<std::pair<T, U>> {
+public:
+    std::size_t operator()( const std::pair<T, U>& p ) const {
+        return first_hash(p.first) ^ second_hash(p.second);
+    }
 
-    private:
-        std::hash<T> first_hash;
-        std::hash<U> second_hash;
-    };// struct hash<std::pair>
+private:
+    std::hash<T> first_hash;
+    std::hash<U> second_hash;
+}; // struct hash<std::pair>
 
 // Apple clang and MSVC defines their own specializations for std::hash<std::basic_string<T, Traits, Alloc>>
 #if !(_LIBCPP_VERSION) && !(_CPPLIB_VER)
 
-    template <typename CharT, typename Traits, typename Allocator>
-    struct hash<std::basic_string<CharT, Traits, Allocator>> {
-    public:
-        std::size_t operator()(const std::basic_string<CharT, Traits, Allocator>& s) const {
-            std::size_t h = 0;
-            for (const CharT* c = s.c_str(); *c; ++c) { h = h * hash_multiplier ^ char_hash(*c); }
-            return h;
+template <typename CharT, typename Traits, typename Allocator>
+struct hash<std::basic_string<CharT, Traits, Allocator>> {
+public:
+    std::size_t operator()( const std::basic_string<CharT, Traits, Allocator>& s ) const {
+        std::size_t h = 0;
+        for ( const CharT* c = s.c_str(); *c; ++c ) {
+            h = h * hash_multiplier ^ char_hash(*c);
         }
+        return h;
+    }
 
-    private:
-        static constexpr std::size_t hash_multiplier
-                = tbb::detail::select_size_t_constant<2654435769U, 11400714819323198485ULL>::value;
+private:
+    static constexpr std::size_t hash_multiplier = tbb::detail::select_size_t_constant<2654435769U, 11400714819323198485ULL>::value;
 
-        std::hash<CharT> char_hash;
-    };// struct hash<std::basic_string>
+    std::hash<CharT> char_hash;
+}; // struct hash<std::basic_string>
 
-#endif// !(_LIBCPP_VERSION || _CPPLIB_VER)
+#endif // !(_LIBCPP_VERSION || _CPPLIB_VER)
 
-}// namespace std
+} // namespace std
 
-#endif// TBB_DEFINE_STD_HASH_SPECIALIZATIONS
+#endif // TBB_DEFINE_STD_HASH_SPECIALIZATIONS
 
-#endif// __TBB_detail__hash_compare_H
+#endif // __TBB_detail__hash_compare_H
diff --git a/external/tbb/include/oneapi/tbb/detail/_intrusive_list_node.h b/external/tbb/include/oneapi/tbb/detail/_intrusive_list_node.h
index de177829..69286c8f 100644
--- a/external/tbb/include/oneapi/tbb/detail/_intrusive_list_node.h
+++ b/external/tbb/include/oneapi/tbb/detail/_intrusive_list_node.h
@@ -18,24 +18,24 @@
 #define _TBB_detail__intrusive_list_node_H
 
 namespace tbb {
-    namespace detail {
-        namespace d1 {
+namespace detail {
+namespace d1 {
 
-            //! Data structure to be inherited by the types that can form intrusive lists.
-            /** Intrusive list is formed by means of the member_intrusive_list<T> template class.
+//! Data structure to be inherited by the types that can form intrusive lists.
+/** Intrusive list is formed by means of the member_intrusive_list<T> template class.
     Note that type T must derive from intrusive_list_node either publicly or
     declare instantiation member_intrusive_list<T> as a friend.
     This class implements a limited subset of std::list interface. **/
-            struct intrusive_list_node {
-                intrusive_list_node* my_prev_node {};
-                intrusive_list_node* my_next_node {};
+struct intrusive_list_node {
+    intrusive_list_node* my_prev_node{};
+    intrusive_list_node* my_next_node{};
 #if TBB_USE_ASSERT
-                intrusive_list_node() { my_prev_node = my_next_node = this; }
+    intrusive_list_node() { my_prev_node = my_next_node = this; }
 #endif /* TBB_USE_ASSERT */
-            };
+};
 
-        }// namespace d1
-    }    // namespace detail
-}// namespace tbb
+} // namespace d1
+} // namespace detail
+} // namespace tbb
 
-#endif// _TBB_detail__intrusive_list_node_H
+#endif // _TBB_detail__intrusive_list_node_H
diff --git a/external/tbb/include/oneapi/tbb/detail/_machine.h b/external/tbb/include/oneapi/tbb/detail/_machine.h
index 5b870102..ca481380 100644
--- a/external/tbb/include/oneapi/tbb/detail/_machine.h
+++ b/external/tbb/include/oneapi/tbb/detail/_machine.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -17,20 +17,22 @@
 #ifndef __TBB_detail__machine_H
 #define __TBB_detail__machine_H
 
-#include "_assert.h"
 #include "_config.h"
+#include "_assert.h"
 
 #include <atomic>
 #include <climits>
-#include <cstddef>
 #include <cstdint>
+#include <cstddef>
 
 #ifdef _WIN32
 #include <intrin.h>
 #ifdef __TBBMALLOC_BUILD
 #define WIN32_LEAN_AND_MEAN
+#ifndef NOMINMAX
 #define NOMINMAX
-#include <windows.h>// SwitchToThread()
+#endif
+#include <windows.h> // SwitchToThread()
 #endif
 #ifdef _MSC_VER
 #if __TBB_x86_64 || __TBB_x86_32
@@ -39,291 +41,272 @@
 #endif
 #endif
 #if __TBB_x86_64 || __TBB_x86_32
-#include <immintrin.h>// _mm_pause
+#include <immintrin.h> // _mm_pause
 #endif
 #if (_WIN32)
-#include <float.h>// _control87
+#include <float.h> // _control87
 #endif
 
 #if __TBB_GLIBCXX_THIS_THREAD_YIELD_BROKEN
-#include <sched.h>// sched_yield
+#include <sched.h> // sched_yield
 #else
-#include <thread>// std::this_thread::yield()
+#include <thread> // std::this_thread::yield()
 #endif
 
 namespace tbb {
-    namespace detail {
-        inline namespace d0 {
+namespace detail {
+inline namespace d0 {
 
-            //--------------------------------------------------------------------------------------------------
-            // Yield implementation
-            //--------------------------------------------------------------------------------------------------
+//--------------------------------------------------------------------------------------------------
+// Yield implementation
+//--------------------------------------------------------------------------------------------------
 
 #if __TBB_GLIBCXX_THIS_THREAD_YIELD_BROKEN
-            static inline void yield() {
-                int err = sched_yield();
-                __TBB_ASSERT_EX(err == 0, "sched_yield has failed");
-            }
+static inline void yield() {
+    int err = sched_yield();
+    __TBB_ASSERT_EX(err == 0, "sched_yield has failed");
+}
 #elif __TBBMALLOC_BUILD && _WIN32
-            // Use Windows API for yield in tbbmalloc to avoid dependency on C++ runtime with some implementations.
-            static inline void yield() { SwitchToThread(); }
+// Use Windows API for yield in tbbmalloc to avoid dependency on C++ runtime with some implementations.
+static inline void yield() {
+    SwitchToThread();
+}
 #else
-            using std::this_thread::yield;
+using std::this_thread::yield;
 #endif
 
-            //--------------------------------------------------------------------------------------------------
-            // atomic_fence implementation
-            //--------------------------------------------------------------------------------------------------
+//--------------------------------------------------------------------------------------------------
+// atomic_fence_seq_cst implementation
+//--------------------------------------------------------------------------------------------------
 
-#if _MSC_VER && (__TBB_x86_64 || __TBB_x86_32)
-#pragma intrinsic(_mm_mfence)
+static inline void atomic_fence_seq_cst() {
+#if (__TBB_x86_64 || __TBB_x86_32) && defined(__GNUC__) && __GNUC__ < 11
+    unsigned char dummy = 0u;
+    __asm__ __volatile__ ("lock; notb %0" : "+m" (dummy) :: "memory");
+#else
+    std::atomic_thread_fence(std::memory_order_seq_cst);
 #endif
+}
 
-            static inline void atomic_fence(std::memory_order order) {
-#if _MSC_VER && (__TBB_x86_64 || __TBB_x86_32)
-                if (order == std::memory_order_seq_cst || order == std::memory_order_acq_rel
-                    || order == std::memory_order_acquire || order == std::memory_order_release) {
-                    _mm_mfence();
-                    return;
-                }
-#endif /*_MSC_VER && (__TBB_x86_64 || __TBB_x86_32)*/
-                std::atomic_thread_fence(order);
-            }
-
-            //--------------------------------------------------------------------------------------------------
-            // Pause implementation
-            //--------------------------------------------------------------------------------------------------
-
-            static inline void machine_pause(int32_t delay) {
+//--------------------------------------------------------------------------------------------------
+// Pause implementation
+//--------------------------------------------------------------------------------------------------
+
+static inline void machine_pause(int32_t delay) {
 #if __TBB_x86_64 || __TBB_x86_32
-                while (delay-- > 0) { _mm_pause(); }
+    while (delay-- > 0) { _mm_pause(); }
 #elif __ARM_ARCH_7A__ || __aarch64__
-                while (delay-- > 0) { __asm__ __volatile__("yield" ::: "memory"); }
+    while (delay-- > 0) { __asm__ __volatile__("isb sy" ::: "memory"); }
 #else /* Generic */
-                (void) delay;// suppress without including _template_helpers.h
-                yield();
+    (void)delay; // suppress without including _template_helpers.h
+    yield();
 #endif
-            }
+}
 
-            ////////////////////////////////////////////////////////////////////////////////////////////////////
-            // tbb::detail::log2() implementation
-            ////////////////////////////////////////////////////////////////////////////////////////////////////
-            // TODO: Use log2p1() function that will be available in C++20 standard
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// tbb::detail::log2() implementation
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// TODO: Use log2p1() function that will be available in C++20 standard
 
 #if defined(__GNUC__) || defined(__clang__)
-            namespace gnu_builtins {
-                inline uintptr_t clz(unsigned int x) { return __builtin_clz(x); }
-                inline uintptr_t clz(unsigned long int x) { return __builtin_clzl(x); }
-                inline uintptr_t clz(unsigned long long int x) { return __builtin_clzll(x); }
-            }// namespace gnu_builtins
+namespace gnu_builtins {
+    inline uintptr_t clz(unsigned int x) { return static_cast<uintptr_t>(__builtin_clz(x)); }
+    inline uintptr_t clz(unsigned long int x) { return static_cast<uintptr_t>(__builtin_clzl(x)); }
+    inline uintptr_t clz(unsigned long long int x) { return static_cast<uintptr_t>(__builtin_clzll(x)); }
+}
 #elif defined(_MSC_VER)
 #pragma intrinsic(__TBB_W(_BitScanReverse))
-            namespace msvc_intrinsics {
-                static inline uintptr_t bit_scan_reverse(uintptr_t i) {
-                    unsigned long j;
-                    __TBB_W(_BitScanReverse)(&j, i);
-                    return j;
-                }
-            }// namespace msvc_intrinsics
+namespace msvc_intrinsics {
+    static inline uintptr_t bit_scan_reverse(uintptr_t i) {
+        unsigned long j;
+        __TBB_W(_BitScanReverse)( &j, i );
+        return j;
+    }
+}
 #endif
 
-            template <typename T>
-            constexpr std::uintptr_t number_of_bits() {
-                return sizeof(T) * CHAR_BIT;
-            }
+template <typename T>
+constexpr std::uintptr_t number_of_bits() {
+    return sizeof(T) * CHAR_BIT;
+}
 
-            // logarithm is the index of the most significant non-zero bit
-            static inline uintptr_t machine_log2(uintptr_t x) {
+// logarithm is the index of the most significant non-zero bit
+static inline uintptr_t machine_log2(uintptr_t x) {
 #if defined(__GNUC__) || defined(__clang__)
-                // If P is a power of 2 and x<P, then (P-1)-x == (P-1) XOR x
-                return (number_of_bits<decltype(x)>() - 1) ^ gnu_builtins::clz(x);
+    // If P is a power of 2 and x<P, then (P-1)-x == (P-1) XOR x
+    return (number_of_bits<decltype(x)>() - 1) ^ gnu_builtins::clz(x);
 #elif defined(_MSC_VER)
-                return msvc_intrinsics::bit_scan_reverse(x);
+    return msvc_intrinsics::bit_scan_reverse(x);
 #elif __i386__ || __i386 /*for Sun OS*/ || __MINGW32__
-                uintptr_t j, i = x;
-                __asm__("bsr %1,%0" : "=r"(j) : "r"(i));
-                return j;
+    uintptr_t j, i = x;
+    __asm__("bsr %1,%0" : "=r"(j) : "r"(i));
+    return j;
 #elif __powerpc__ || __POWERPC__
-#if __TBB_WORDSIZE == 8
-                __asm__ __volatile__("cntlzd %0,%0" : "+r"(x));
-                return 63 - static_cast<intptr_t>(x);
-#else
-                __asm__ __volatile__("cntlzw %0,%0" : "+r"(x));
-                return 31 - static_cast<intptr_t>(x);
-#endif /*__TBB_WORDSIZE*/
+    #if __TBB_WORDSIZE==8
+    __asm__ __volatile__ ("cntlzd %0,%0" : "+r"(x));
+    return 63 - static_cast<intptr_t>(x);
+    #else
+    __asm__ __volatile__ ("cntlzw %0,%0" : "+r"(x));
+    return 31 - static_cast<intptr_t>(x);
+    #endif /*__TBB_WORDSIZE*/
 #elif __sparc
-                uint64_t count;
-                // one hot encode
-                x |= (x >> 1);
-                x |= (x >> 2);
-                x |= (x >> 4);
-                x |= (x >> 8);
-                x |= (x >> 16);
-                x |= (x >> 32);
-                // count 1's
-                __asm__("popc %1, %0" : "=r"(count) : "r"(x));
-                return count - 1;
+    uint64_t count;
+    // one hot encode
+    x |= (x >> 1);
+    x |= (x >> 2);
+    x |= (x >> 4);
+    x |= (x >> 8);
+    x |= (x >> 16);
+    x |= (x >> 32);
+    // count 1's
+    __asm__ ("popc %1, %0" : "=r"(count) : "r"(x) );
+    return count - 1;
 #else
-                intptr_t result = 0;
-
-                if (sizeof(x) > 4 && (uintptr_t tmp = x >> 32)) {
-                    x = tmp;
-                    result += 32;
-                }
-                if (uintptr_t tmp = x >> 16) {
-                    x = tmp;
-                    result += 16;
-                }
-                if (uintptr_t tmp = x >> 8) {
-                    x = tmp;
-                    result += 8;
-                }
-                if (uintptr_t tmp = x >> 4) {
-                    x = tmp;
-                    result += 4;
-                }
-                if (uintptr_t tmp = x >> 2) {
-                    x = tmp;
-                    result += 2;
-                }
-
-                return (x & 2) ? result + 1 : result;
+    intptr_t result = 0;
+
+    if( sizeof(x) > 4 && (uintptr_t tmp = x >> 32) ) { x = tmp; result += 32; }
+    if( uintptr_t tmp = x >> 16 ) { x = tmp; result += 16; }
+    if( uintptr_t tmp = x >> 8 )  { x = tmp; result += 8; }
+    if( uintptr_t tmp = x >> 4 )  { x = tmp; result += 4; }
+    if( uintptr_t tmp = x >> 2 )  { x = tmp; result += 2; }
+
+    return (x & 2) ? result + 1 : result;
 #endif
-            }
+}
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // tbb::detail::reverse_bits() implementation
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 #if TBB_USE_CLANG_BITREVERSE_BUILTINS
-            namespace llvm_builtins {
-                inline uint8_t builtin_bitreverse(uint8_t x) { return __builtin_bitreverse8(x); }
-                inline uint16_t builtin_bitreverse(uint16_t x) { return __builtin_bitreverse16(x); }
-                inline uint32_t builtin_bitreverse(uint32_t x) { return __builtin_bitreverse32(x); }
-                inline uint64_t builtin_bitreverse(uint64_t x) { return __builtin_bitreverse64(x); }
-            }// namespace llvm_builtins
-#else        // generic
-            template <typename T>
-            struct reverse {
-                static const T byte_table[256];
-            };
-
-            template <typename T>
-            const T reverse<T>::byte_table[256]
-                    = {0x00, 0x80, 0x40, 0xC0, 0x20, 0xA0, 0x60, 0xE0, 0x10, 0x90, 0x50, 0xD0, 0x30, 0xB0,
-                       0x70, 0xF0, 0x08, 0x88, 0x48, 0xC8, 0x28, 0xA8, 0x68, 0xE8, 0x18, 0x98, 0x58, 0xD8,
-                       0x38, 0xB8, 0x78, 0xF8, 0x04, 0x84, 0x44, 0xC4, 0x24, 0xA4, 0x64, 0xE4, 0x14, 0x94,
-                       0x54, 0xD4, 0x34, 0xB4, 0x74, 0xF4, 0x0C, 0x8C, 0x4C, 0xCC, 0x2C, 0xAC, 0x6C, 0xEC,
-                       0x1C, 0x9C, 0x5C, 0xDC, 0x3C, 0xBC, 0x7C, 0xFC, 0x02, 0x82, 0x42, 0xC2, 0x22, 0xA2,
-                       0x62, 0xE2, 0x12, 0x92, 0x52, 0xD2, 0x32, 0xB2, 0x72, 0xF2, 0x0A, 0x8A, 0x4A, 0xCA,
-                       0x2A, 0xAA, 0x6A, 0xEA, 0x1A, 0x9A, 0x5A, 0xDA, 0x3A, 0xBA, 0x7A, 0xFA, 0x06, 0x86,
-                       0x46, 0xC6, 0x26, 0xA6, 0x66, 0xE6, 0x16, 0x96, 0x56, 0xD6, 0x36, 0xB6, 0x76, 0xF6,
-                       0x0E, 0x8E, 0x4E, 0xCE, 0x2E, 0xAE, 0x6E, 0xEE, 0x1E, 0x9E, 0x5E, 0xDE, 0x3E, 0xBE,
-                       0x7E, 0xFE, 0x01, 0x81, 0x41, 0xC1, 0x21, 0xA1, 0x61, 0xE1, 0x11, 0x91, 0x51, 0xD1,
-                       0x31, 0xB1, 0x71, 0xF1, 0x09, 0x89, 0x49, 0xC9, 0x29, 0xA9, 0x69, 0xE9, 0x19, 0x99,
-                       0x59, 0xD9, 0x39, 0xB9, 0x79, 0xF9, 0x05, 0x85, 0x45, 0xC5, 0x25, 0xA5, 0x65, 0xE5,
-                       0x15, 0x95, 0x55, 0xD5, 0x35, 0xB5, 0x75, 0xF5, 0x0D, 0x8D, 0x4D, 0xCD, 0x2D, 0xAD,
-                       0x6D, 0xED, 0x1D, 0x9D, 0x5D, 0xDD, 0x3D, 0xBD, 0x7D, 0xFD, 0x03, 0x83, 0x43, 0xC3,
-                       0x23, 0xA3, 0x63, 0xE3, 0x13, 0x93, 0x53, 0xD3, 0x33, 0xB3, 0x73, 0xF3, 0x0B, 0x8B,
-                       0x4B, 0xCB, 0x2B, 0xAB, 0x6B, 0xEB, 0x1B, 0x9B, 0x5B, 0xDB, 0x3B, 0xBB, 0x7B, 0xFB,
-                       0x07, 0x87, 0x47, 0xC7, 0x27, 0xA7, 0x67, 0xE7, 0x17, 0x97, 0x57, 0xD7, 0x37, 0xB7,
-                       0x77, 0xF7, 0x0F, 0x8F, 0x4F, 0xCF, 0x2F, 0xAF, 0x6F, 0xEF, 0x1F, 0x9F, 0x5F, 0xDF,
-                       0x3F, 0xBF, 0x7F, 0xFF};
-
-            inline unsigned char reverse_byte(unsigned char src) {
-                return reverse<unsigned char>::byte_table[src];
-            }
-#endif       // TBB_USE_CLANG_BITREVERSE_BUILTINS
-
-            template <typename T>
-            T machine_reverse_bits(T src) {
+namespace  llvm_builtins {
+    inline uint8_t  builtin_bitreverse(uint8_t  x) { return __builtin_bitreverse8 (x); }
+    inline uint16_t builtin_bitreverse(uint16_t x) { return __builtin_bitreverse16(x); }
+    inline uint32_t builtin_bitreverse(uint32_t x) { return __builtin_bitreverse32(x); }
+    inline uint64_t builtin_bitreverse(uint64_t x) { return __builtin_bitreverse64(x); }
+}
+#else // generic
+template<typename T>
+struct reverse {
+    static const T byte_table[256];
+};
+
+template<typename T>
+const T reverse<T>::byte_table[256] = {
+    0x00, 0x80, 0x40, 0xC0, 0x20, 0xA0, 0x60, 0xE0, 0x10, 0x90, 0x50, 0xD0, 0x30, 0xB0, 0x70, 0xF0,
+    0x08, 0x88, 0x48, 0xC8, 0x28, 0xA8, 0x68, 0xE8, 0x18, 0x98, 0x58, 0xD8, 0x38, 0xB8, 0x78, 0xF8,
+    0x04, 0x84, 0x44, 0xC4, 0x24, 0xA4, 0x64, 0xE4, 0x14, 0x94, 0x54, 0xD4, 0x34, 0xB4, 0x74, 0xF4,
+    0x0C, 0x8C, 0x4C, 0xCC, 0x2C, 0xAC, 0x6C, 0xEC, 0x1C, 0x9C, 0x5C, 0xDC, 0x3C, 0xBC, 0x7C, 0xFC,
+    0x02, 0x82, 0x42, 0xC2, 0x22, 0xA2, 0x62, 0xE2, 0x12, 0x92, 0x52, 0xD2, 0x32, 0xB2, 0x72, 0xF2,
+    0x0A, 0x8A, 0x4A, 0xCA, 0x2A, 0xAA, 0x6A, 0xEA, 0x1A, 0x9A, 0x5A, 0xDA, 0x3A, 0xBA, 0x7A, 0xFA,
+    0x06, 0x86, 0x46, 0xC6, 0x26, 0xA6, 0x66, 0xE6, 0x16, 0x96, 0x56, 0xD6, 0x36, 0xB6, 0x76, 0xF6,
+    0x0E, 0x8E, 0x4E, 0xCE, 0x2E, 0xAE, 0x6E, 0xEE, 0x1E, 0x9E, 0x5E, 0xDE, 0x3E, 0xBE, 0x7E, 0xFE,
+    0x01, 0x81, 0x41, 0xC1, 0x21, 0xA1, 0x61, 0xE1, 0x11, 0x91, 0x51, 0xD1, 0x31, 0xB1, 0x71, 0xF1,
+    0x09, 0x89, 0x49, 0xC9, 0x29, 0xA9, 0x69, 0xE9, 0x19, 0x99, 0x59, 0xD9, 0x39, 0xB9, 0x79, 0xF9,
+    0x05, 0x85, 0x45, 0xC5, 0x25, 0xA5, 0x65, 0xE5, 0x15, 0x95, 0x55, 0xD5, 0x35, 0xB5, 0x75, 0xF5,
+    0x0D, 0x8D, 0x4D, 0xCD, 0x2D, 0xAD, 0x6D, 0xED, 0x1D, 0x9D, 0x5D, 0xDD, 0x3D, 0xBD, 0x7D, 0xFD,
+    0x03, 0x83, 0x43, 0xC3, 0x23, 0xA3, 0x63, 0xE3, 0x13, 0x93, 0x53, 0xD3, 0x33, 0xB3, 0x73, 0xF3,
+    0x0B, 0x8B, 0x4B, 0xCB, 0x2B, 0xAB, 0x6B, 0xEB, 0x1B, 0x9B, 0x5B, 0xDB, 0x3B, 0xBB, 0x7B, 0xFB,
+    0x07, 0x87, 0x47, 0xC7, 0x27, 0xA7, 0x67, 0xE7, 0x17, 0x97, 0x57, 0xD7, 0x37, 0xB7, 0x77, 0xF7,
+    0x0F, 0x8F, 0x4F, 0xCF, 0x2F, 0xAF, 0x6F, 0xEF, 0x1F, 0x9F, 0x5F, 0xDF, 0x3F, 0xBF, 0x7F, 0xFF
+};
+
+inline unsigned char reverse_byte(unsigned char src) {
+    return reverse<unsigned char>::byte_table[src];
+}
+#endif // TBB_USE_CLANG_BITREVERSE_BUILTINS
+
+template<typename T>
+T machine_reverse_bits(T src) {
 #if TBB_USE_CLANG_BITREVERSE_BUILTINS
-                return builtin_bitreverse(fixed_width_cast(src));
+    return builtin_bitreverse(fixed_width_cast(src));
 #else /* Generic */
-                T dst;
-                unsigned char *original = (unsigned char *) &src;
-                unsigned char *reversed = (unsigned char *) &dst;
+    T dst;
+    unsigned char *original = reinterpret_cast<unsigned char *>(&src);
+    unsigned char *reversed = reinterpret_cast<unsigned char *>(&dst);
 
-                for (int i = sizeof(T) - 1; i >= 0; i--) {
-                    reversed[i] = reverse_byte(original[sizeof(T) - i - 1]);
-                }
+    for ( int i = sizeof(T) - 1; i >= 0; i-- ) {
+        reversed[i] = reverse_byte( original[sizeof(T) - i - 1] );
+    }
 
-                return dst;
-#endif// TBB_USE_CLANG_BITREVERSE_BUILTINS
-            }
+    return dst;
+#endif // TBB_USE_CLANG_BITREVERSE_BUILTINS
+}
 
-        }// namespace d0
+} // inline namespace d0
 
-        namespace d1 {
+namespace d1 {
 
 #if (_WIN32)
 // API to retrieve/update FPU control setting
 #define __TBB_CPU_CTL_ENV_PRESENT 1
-            struct cpu_ctl_env {
-                unsigned int x87cw {};
+struct cpu_ctl_env {
+    unsigned int x87cw{};
 #if (__TBB_x86_64)
-                // Changing the infinity mode or the floating-point precision is not supported on x64.
-                // The attempt causes an assertion. See
-                // https://docs.microsoft.com/en-us/cpp/c-runtime-library/reference/control87-controlfp-control87-2
-                static constexpr unsigned int X87CW_CONTROL_MASK = _MCW_DN | _MCW_EM | _MCW_RC;
+    // Changing the infinity mode or the floating-point precision is not supported on x64.
+    // The attempt causes an assertion. See
+    // https://docs.microsoft.com/en-us/cpp/c-runtime-library/reference/control87-controlfp-control87-2
+    static constexpr unsigned int X87CW_CONTROL_MASK = _MCW_DN | _MCW_EM | _MCW_RC;
 #else
-                static constexpr unsigned int X87CW_CONTROL_MASK = ~0U;
+    static constexpr unsigned int X87CW_CONTROL_MASK = ~0U;
 #endif
 #if (__TBB_x86_32 || __TBB_x86_64)
-                unsigned int mxcsr {};
-                static constexpr unsigned int MXCSR_CONTROL_MASK
-                        = ~0x3fu; /* all except last six status bits */
+    unsigned int mxcsr{};
+    static constexpr unsigned int MXCSR_CONTROL_MASK = ~0x3fu; /* all except last six status bits */
 #endif
 
-                bool operator!=(const cpu_ctl_env& ctl) const {
-                    return
+    bool operator!=( const cpu_ctl_env& ctl ) const {
+        return
 #if (__TBB_x86_32 || __TBB_x86_64)
-                            mxcsr != ctl.mxcsr ||
+            mxcsr != ctl.mxcsr ||
 #endif
-                            x87cw != ctl.x87cw;
-                }
-                void get_env() {
-                    x87cw = _control87(0, 0);
+            x87cw != ctl.x87cw;
+    }
+    void get_env() {
+        x87cw = _control87(0, 0);
 #if (__TBB_x86_32 || __TBB_x86_64)
-                    mxcsr = _mm_getcsr();
+        mxcsr = _mm_getcsr();
 #endif
-                }
-                void set_env() const {
-                    _control87(x87cw, X87CW_CONTROL_MASK);
+    }
+    void set_env() const {
+        _control87(x87cw, X87CW_CONTROL_MASK);
 #if (__TBB_x86_32 || __TBB_x86_64)
-                    _mm_setcsr(mxcsr & MXCSR_CONTROL_MASK);
+        _mm_setcsr(mxcsr & MXCSR_CONTROL_MASK);
 #endif
-                }
-            };
+    }
+};
 #elif (__TBB_x86_32 || __TBB_x86_64)
 // API to retrieve/update FPU control setting
 #define __TBB_CPU_CTL_ENV_PRESENT 1
-            struct cpu_ctl_env {
-                int mxcsr {};
-                short x87cw {};
-                static const int MXCSR_CONTROL_MASK = ~0x3f; /* all except last six status bits */
-
-                bool operator!=(const cpu_ctl_env &ctl) const {
-                    return mxcsr != ctl.mxcsr || x87cw != ctl.x87cw;
-                }
-                void get_env() {
-                    __asm__ __volatile__("stmxcsr %0\n\t"
-                                         "fstcw %1"
-                                         : "=m"(mxcsr), "=m"(x87cw));
-                    mxcsr &= MXCSR_CONTROL_MASK;
-                }
-                void set_env() const {
-                    __asm__ __volatile__("ldmxcsr %0\n\t"
-                                         "fldcw %1"
-                                         :
-                                         : "m"(mxcsr), "m"(x87cw));
-                }
-            };
+struct cpu_ctl_env {
+    int     mxcsr{};
+    short   x87cw{};
+    static const int MXCSR_CONTROL_MASK = ~0x3f; /* all except last six status bits */
+
+    bool operator!=(const cpu_ctl_env& ctl) const {
+        return mxcsr != ctl.mxcsr || x87cw != ctl.x87cw;
+    }
+    void get_env() {
+        __asm__ __volatile__(
+            "stmxcsr %0\n\t"
+            "fstcw %1"
+            : "=m"(mxcsr), "=m"(x87cw)
+        );
+        mxcsr &= MXCSR_CONTROL_MASK;
+    }
+    void set_env() const {
+        __asm__ __volatile__(
+            "ldmxcsr %0\n\t"
+            "fldcw %1"
+            : : "m"(mxcsr), "m"(x87cw)
+        );
+    }
+};
 #endif
 
-        }// namespace d1
+} // namespace d1
 
-    }// namespace detail
-}// namespace tbb
+} // namespace detail
+} // namespace tbb
 
 #if !__TBB_CPU_CTL_ENV_PRESENT
 #include <fenv.h>
@@ -331,56 +314,60 @@ namespace tbb {
 #include <cstring>
 
 namespace tbb {
-    namespace detail {
-
-        namespace r1 {
-            void* __TBB_EXPORTED_FUNC cache_aligned_allocate(std::size_t size);
-            void __TBB_EXPORTED_FUNC cache_aligned_deallocate(void* p);
-        }// namespace r1
-
-        namespace d1 {
-
-            class cpu_ctl_env {
-                fenv_t* my_fenv_ptr;
-
-            public:
-                cpu_ctl_env() : my_fenv_ptr(NULL) {}
-                ~cpu_ctl_env() {
-                    if (my_fenv_ptr) r1::cache_aligned_deallocate((void*) my_fenv_ptr);
-                }
-                // It is possible not to copy memory but just to copy pointers but the following issues should be addressed:
-                //   1. The arena lifetime and the context lifetime are independent;
-                //   2. The user is allowed to recapture different FPU settings to context so 'current FPU settings' inside
-                //   dispatch loop may become invalid.
-                // But do we really want to improve the fenv implementation? It seems to be better to replace the fenv implementation
-                // with a platform specific implementation.
-                cpu_ctl_env(const cpu_ctl_env& src) : my_fenv_ptr(NULL) { *this = src; }
-                cpu_ctl_env& operator=(const cpu_ctl_env& src) {
-                    __TBB_ASSERT(src.my_fenv_ptr, NULL);
-                    if (!my_fenv_ptr) my_fenv_ptr = (fenv_t*) r1::cache_aligned_allocate(sizeof(fenv_t));
-                    *my_fenv_ptr = *src.my_fenv_ptr;
-                    return *this;
-                }
-                bool operator!=(const cpu_ctl_env& ctl) const {
-                    __TBB_ASSERT(my_fenv_ptr, "cpu_ctl_env is not initialized.");
-                    __TBB_ASSERT(ctl.my_fenv_ptr, "cpu_ctl_env is not initialized.");
-                    return std::memcmp((void*) my_fenv_ptr, (void*) ctl.my_fenv_ptr, sizeof(fenv_t));
-                }
-                void get_env() {
-                    if (!my_fenv_ptr) my_fenv_ptr = (fenv_t*) r1::cache_aligned_allocate(sizeof(fenv_t));
-                    fegetenv(my_fenv_ptr);
-                }
-                const cpu_ctl_env& set_env() const {
-                    __TBB_ASSERT(my_fenv_ptr, "cpu_ctl_env is not initialized.");
-                    fesetenv(my_fenv_ptr);
-                    return *this;
-                }
-            };
-
-        }// namespace d1
-    }    // namespace detail
-}// namespace tbb
+namespace detail {
+
+namespace r1 {
+void* __TBB_EXPORTED_FUNC cache_aligned_allocate(std::size_t size);
+void __TBB_EXPORTED_FUNC cache_aligned_deallocate(void* p);
+} // namespace r1
+
+namespace d1 {
+
+class cpu_ctl_env {
+    fenv_t *my_fenv_ptr;
+public:
+    cpu_ctl_env() : my_fenv_ptr(nullptr) {}
+    ~cpu_ctl_env() {
+        if ( my_fenv_ptr )
+            r1::cache_aligned_deallocate( (void*)my_fenv_ptr );
+    }
+    // It is possible not to copy memory but just to copy pointers but the following issues should be addressed:
+    //   1. The arena lifetime and the context lifetime are independent;
+    //   2. The user is allowed to recapture different FPU settings to context so 'current FPU settings' inside
+    //   dispatch loop may become invalid.
+    // But do we really want to improve the fenv implementation? It seems to be better to replace the fenv implementation
+    // with a platform specific implementation.
+    cpu_ctl_env( const cpu_ctl_env &src ) : my_fenv_ptr(nullptr) {
+        *this = src;
+    }
+    cpu_ctl_env& operator=( const cpu_ctl_env &src ) {
+        __TBB_ASSERT( src.my_fenv_ptr, nullptr);
+        if ( !my_fenv_ptr )
+            my_fenv_ptr = (fenv_t*)r1::cache_aligned_allocate(sizeof(fenv_t));
+        *my_fenv_ptr = *src.my_fenv_ptr;
+        return *this;
+    }
+    bool operator!=( const cpu_ctl_env &ctl ) const {
+        __TBB_ASSERT( my_fenv_ptr, "cpu_ctl_env is not initialized." );
+        __TBB_ASSERT( ctl.my_fenv_ptr, "cpu_ctl_env is not initialized." );
+        return std::memcmp( (void*)my_fenv_ptr, (void*)ctl.my_fenv_ptr, sizeof(fenv_t) );
+    }
+    void get_env () {
+        if ( !my_fenv_ptr )
+            my_fenv_ptr = (fenv_t*)r1::cache_aligned_allocate(sizeof(fenv_t));
+        fegetenv( my_fenv_ptr );
+    }
+    const cpu_ctl_env& set_env () const {
+        __TBB_ASSERT( my_fenv_ptr, "cpu_ctl_env is not initialized." );
+        fesetenv( my_fenv_ptr );
+        return *this;
+    }
+};
+
+} // namespace d1
+} // namespace detail
+} // namespace tbb
 
 #endif /* !__TBB_CPU_CTL_ENV_PRESENT */
 
-#endif// __TBB_detail__machine_H
+#endif // __TBB_detail__machine_H
diff --git a/external/tbb/include/oneapi/tbb/detail/_mutex_common.h b/external/tbb/include/oneapi/tbb/detail/_mutex_common.h
index 694ed156..4650c192 100644
--- a/external/tbb/include/oneapi/tbb/detail/_mutex_common.h
+++ b/external/tbb/include/oneapi/tbb/detail/_mutex_common.h
@@ -24,37 +24,38 @@
 #include <concepts>
 
 namespace tbb {
-    namespace detail {
-        inline namespace d0 {
-
-            template <typename Lock, typename Mutex>
-            concept mutex_scoped_lock
-                    = std::default_initializable<Lock> && std::constructible_from<Lock, Mutex&> && requires(
-                            Lock& lock, Mutex& mutex) {
-                lock.acquire(mutex);
-                { lock.try_acquire(mutex) } -> adaptive_same_as<bool>;
-                lock.release();
-            };
-
-            template <typename Lock, typename Mutex>
-            concept rw_mutex_scoped_lock = mutex_scoped_lock<Lock, Mutex> && std::constructible_from<
-                    Lock, Mutex&, bool> && requires(Lock& lock, Mutex& mutex) {
-                lock.acquire(mutex, false);
-                { lock.try_acquire(mutex, false) } -> adaptive_same_as<bool>;
-                { lock.upgrade_to_writer() } -> adaptive_same_as<bool>;
-                { lock.downgrade_to_reader() } -> adaptive_same_as<bool>;
-            };
-
-            template <typename Mutex>
-            concept scoped_lockable = mutex_scoped_lock<typename Mutex::scoped_lock, Mutex>;
-
-            template <typename Mutex>
-            concept rw_scoped_lockable
-                    = scoped_lockable<Mutex> && rw_mutex_scoped_lock<typename Mutex::scoped_lock, Mutex>;
-
-        }// namespace d0
-    }    // namespace detail
-}// namespace tbb
-
-#endif// __TBB_CPP20_CONCEPTS_PRESENT
-#endif// __TBB_detail__mutex_common_H
+namespace detail {
+inline namespace d0 {
+
+template <typename Lock, typename Mutex>
+concept mutex_scoped_lock = std::default_initializable<Lock> &&
+                            std::constructible_from<Lock, Mutex&> &&
+                            requires( Lock& lock, Mutex& mutex ) {
+                                lock.acquire(mutex);
+                                { lock.try_acquire(mutex) } -> adaptive_same_as<bool>;
+                                lock.release();
+                            };
+
+template <typename Lock, typename Mutex>
+concept rw_mutex_scoped_lock = mutex_scoped_lock<Lock, Mutex> &&
+                               std::constructible_from<Lock, Mutex&, bool> &&
+                               requires( Lock& lock, Mutex& mutex ) {
+                                   lock.acquire(mutex, false);
+                                   { lock.try_acquire(mutex, false) } -> adaptive_same_as<bool>;
+                                   { lock.upgrade_to_writer() } -> adaptive_same_as<bool>;
+                                   { lock.downgrade_to_reader() } -> adaptive_same_as<bool>;
+                               };
+
+template <typename Mutex>
+concept scoped_lockable = mutex_scoped_lock<typename Mutex::scoped_lock, Mutex>;
+
+template <typename Mutex>
+concept rw_scoped_lockable = scoped_lockable<Mutex> &&
+                             rw_mutex_scoped_lock<typename Mutex::scoped_lock, Mutex>;
+
+} // namespace d0
+} // namespace detail
+} // namespace tbb
+
+#endif // __TBB_CPP20_CONCEPTS_PRESENT
+#endif // __TBB_detail__mutex_common_H
diff --git a/external/tbb/include/oneapi/tbb/detail/_namespace_injection.h b/external/tbb/include/oneapi/tbb/detail/_namespace_injection.h
index 53b1ba72..2e1df309 100644
--- a/external/tbb/include/oneapi/tbb/detail/_namespace_injection.h
+++ b/external/tbb/include/oneapi/tbb/detail/_namespace_injection.h
@@ -20,5 +20,5 @@
 namespace tbb {}
 
 namespace oneapi {
-    namespace tbb = ::tbb;
+namespace tbb = ::tbb;
 }
diff --git a/external/tbb/include/oneapi/tbb/detail/_node_handle.h b/external/tbb/include/oneapi/tbb/detail/_node_handle.h
index 8d5cffd8..265be075 100644
--- a/external/tbb/include/oneapi/tbb/detail/_node_handle.h
+++ b/external/tbb/include/oneapi/tbb/detail/_node_handle.h
@@ -21,144 +21,142 @@
 #include "_assert.h"
 
 namespace tbb {
-    namespace detail {
-        namespace d1 {
-
-            // A structure to access private node handle methods in internal TBB classes
-            // Regular friend declaration is not convenient because classes which use node handle
-            // can be placed in the different versioning namespaces.
-            struct node_handle_accessor {
-                template <typename NodeHandleType>
-                static typename NodeHandleType::node* get_node_ptr(NodeHandleType& nh) {
-                    return nh.get_node_ptr();
-                }
-
-                template <typename NodeHandleType>
-                static NodeHandleType construct(typename NodeHandleType::node* node_ptr) {
-                    return NodeHandleType {node_ptr};
-                }
-
-                template <typename NodeHandleType>
-                static void deactivate(NodeHandleType& nh) {
-                    nh.deactivate();
-                }
-            };// struct node_handle_accessor
-
-            template <typename Value, typename Node, typename Allocator>
-            class node_handle_base {
-            public:
-                using allocator_type = Allocator;
-
-            protected:
-                using node = Node;
-                using allocator_traits_type = tbb::detail::allocator_traits<allocator_type>;
-
-            public:
-                node_handle_base() : my_node(nullptr), my_allocator() {}
-                node_handle_base(node_handle_base&& nh)
-                    : my_node(nh.my_node), my_allocator(std::move(nh.my_allocator)) {
-                    nh.my_node = nullptr;
-                }
-
-                __TBB_nodiscard bool empty() const { return my_node == nullptr; }
-                explicit operator bool() const { return my_node != nullptr; }
-
-                ~node_handle_base() { internal_destroy(); }
-
-                node_handle_base& operator=(node_handle_base&& nh) {
-                    internal_destroy();
-                    my_node = nh.my_node;
-                    move_assign_allocators(my_allocator, nh.my_allocator);
-                    nh.deactivate();
-                    return *this;
-                }
-
-                void swap(node_handle_base& nh) {
-                    using std::swap;
-                    swap(my_node, nh.my_node);
-                    swap_allocators(my_allocator, nh.my_allocator);
-                }
-
-                allocator_type get_allocator() const { return my_allocator; }
-
-            protected:
-                node_handle_base(node* n) : my_node(n) {}
-
-                void internal_destroy() {
-                    if (my_node != nullptr) {
-                        allocator_traits_type::destroy(my_allocator, my_node->storage());
-                        typename allocator_traits_type::template rebind_alloc<node> node_allocator(
-                                my_allocator);
-                        node_allocator.deallocate(my_node, 1);
-                    }
-                }
-
-                node* get_node_ptr() { return my_node; }
-
-                void deactivate() { my_node = nullptr; }
-
-                node* my_node;
-                allocator_type my_allocator;
-            };
-
-            // node handle for maps
-            template <typename Key, typename Value, typename Node, typename Allocator>
-            class node_handle : public node_handle_base<Value, Node, Allocator> {
-                using base_type = node_handle_base<Value, Node, Allocator>;
-
-            public:
-                using key_type = Key;
-                using mapped_type = typename Value::second_type;
-                using allocator_type = typename base_type::allocator_type;
-
-                node_handle() = default;
-
-                key_type& key() const {
-                    __TBB_ASSERT(!this->empty(), "Cannot get key from the empty node_type object");
-                    return *const_cast<key_type*>(&(this->my_node->value().first));
-                }
-
-                mapped_type& mapped() const {
-                    __TBB_ASSERT(!this->empty(), "Cannot get mapped value from the empty node_type object");
-                    return this->my_node->value().second;
-                }
-
-            private:
-                friend struct node_handle_accessor;
-
-                node_handle(typename base_type::node* n) : base_type(n) {}
-            };// class node_handle
-
-            // node handle for sets
-            template <typename Key, typename Node, typename Allocator>
-            class node_handle<Key, Key, Node, Allocator> : public node_handle_base<Key, Node, Allocator> {
-                using base_type = node_handle_base<Key, Node, Allocator>;
-
-            public:
-                using value_type = Key;
-                using allocator_type = typename base_type::allocator_type;
-
-                node_handle() = default;
-
-                value_type& value() const {
-                    __TBB_ASSERT(!this->empty(), "Cannot get value from the empty node_type object");
-                    return *const_cast<value_type*>(&(this->my_node->value()));
-                }
-
-            private:
-                friend struct node_handle_accessor;
-
-                node_handle(typename base_type::node* n) : base_type(n) {}
-            };// class node_handle
-
-            template <typename Key, typename Value, typename Node, typename Allocator>
-            void swap(node_handle<Key, Value, Node, Allocator>& lhs,
-                      node_handle<Key, Value, Node, Allocator>& rhs) {
-                return lhs.swap(rhs);
-            }
-
-        }// namespace d1
-    }    // namespace detail
-}// namespace tbb
-
-#endif// __TBB_detail__node_handle_H
+namespace detail {
+namespace d1 {
+
+// A structure to access private node handle methods in internal TBB classes
+// Regular friend declaration is not convenient because classes which use node handle
+// can be placed in the different versioning namespaces.
+struct node_handle_accessor {
+    template <typename NodeHandleType>
+    static typename NodeHandleType::node* get_node_ptr( NodeHandleType& nh ) {
+        return nh.get_node_ptr();
+    }
+
+    template <typename NodeHandleType>
+    static NodeHandleType construct( typename NodeHandleType::node* node_ptr ) {
+        return NodeHandleType{node_ptr};
+    }
+
+    template <typename NodeHandleType>
+    static void deactivate( NodeHandleType& nh ) {
+        nh.deactivate();
+    }
+}; // struct node_handle_accessor
+
+template<typename Value, typename Node, typename Allocator>
+class node_handle_base {
+public:
+    using allocator_type = Allocator;
+protected:
+    using node = Node;
+    using allocator_traits_type = tbb::detail::allocator_traits<allocator_type>;
+public:
+
+    node_handle_base() : my_node(nullptr), my_allocator() {}
+    node_handle_base(node_handle_base&& nh) : my_node(nh.my_node),
+                                              my_allocator(std::move(nh.my_allocator)) {
+        nh.my_node = nullptr;
+    }
+
+    __TBB_nodiscard bool empty() const { return my_node == nullptr; }
+    explicit operator bool() const { return my_node != nullptr; }
+
+    ~node_handle_base() { internal_destroy(); }
+
+    node_handle_base& operator=( node_handle_base&& nh ) {
+        internal_destroy();
+        my_node = nh.my_node;
+        move_assign_allocators(my_allocator, nh.my_allocator);
+        nh.deactivate();
+        return *this;
+    }
+
+    void swap( node_handle_base& nh ) {
+        using std::swap;
+        swap(my_node, nh.my_node);
+        swap_allocators(my_allocator, nh.my_allocator);
+    }
+
+    allocator_type get_allocator() const {
+        return my_allocator;
+    }
+
+protected:
+    node_handle_base( node* n ) : my_node(n) {}
+
+    void internal_destroy() {
+        if(my_node != nullptr) {
+            allocator_traits_type::destroy(my_allocator, my_node->storage());
+            typename allocator_traits_type::template rebind_alloc<node> node_allocator(my_allocator);
+            node_allocator.deallocate(my_node, 1);
+        }
+    }
+
+    node* get_node_ptr() { return my_node; }
+
+    void deactivate() { my_node = nullptr; }
+
+    node* my_node;
+    allocator_type my_allocator;
+};
+
+// node handle for maps
+template<typename Key, typename Value, typename Node, typename Allocator>
+class node_handle : public node_handle_base<Value, Node, Allocator> {
+    using base_type = node_handle_base<Value, Node, Allocator>;
+public:
+    using key_type = Key;
+    using mapped_type = typename Value::second_type;
+    using allocator_type = typename base_type::allocator_type;
+
+    node_handle() = default;
+
+    key_type& key() const {
+        __TBB_ASSERT(!this->empty(), "Cannot get key from the empty node_type object");
+        return *const_cast<key_type*>(&(this->my_node->value().first));
+    }
+
+    mapped_type& mapped() const {
+        __TBB_ASSERT(!this->empty(), "Cannot get mapped value from the empty node_type object");
+        return this->my_node->value().second;
+    }
+
+private:
+    friend struct node_handle_accessor;
+
+    node_handle( typename base_type::node* n ) : base_type(n) {}
+}; // class node_handle
+
+// node handle for sets
+template<typename Key, typename Node, typename Allocator>
+class node_handle<Key, Key, Node, Allocator> : public node_handle_base<Key, Node, Allocator> {
+    using base_type = node_handle_base<Key, Node, Allocator>;
+public:
+    using value_type = Key;
+    using allocator_type = typename base_type::allocator_type;
+
+    node_handle() = default;
+
+    value_type& value() const {
+        __TBB_ASSERT(!this->empty(), "Cannot get value from the empty node_type object");
+        return *const_cast<value_type*>(&(this->my_node->value()));
+    }
+
+private:
+    friend struct node_handle_accessor;
+
+    node_handle( typename base_type::node* n ) : base_type(n) {}
+}; // class node_handle
+
+template <typename Key, typename Value, typename Node, typename Allocator>
+void swap( node_handle<Key, Value, Node, Allocator>& lhs,
+           node_handle<Key, Value, Node, Allocator>& rhs ) {
+    return lhs.swap(rhs);
+}
+
+} // namespace d1
+} // namespace detail
+} // namespace tbb
+
+#endif // __TBB_detail__node_handle_H
diff --git a/external/tbb/include/oneapi/tbb/detail/_pipeline_filters.h b/external/tbb/include/oneapi/tbb/detail/_pipeline_filters.h
index 4548ff71..81219467 100644
--- a/external/tbb/include/oneapi/tbb/detail/_pipeline_filters.h
+++ b/external/tbb/include/oneapi/tbb/detail/_pipeline_filters.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -17,478 +17,445 @@
 #ifndef __TBB_parallel_filters_H
 #define __TBB_parallel_filters_H
 
-#include "../tbb_allocator.h"
 #include "_config.h"
-#include "_pipeline_filters_deduction.h"
 #include "_task.h"
+#include "_pipeline_filters_deduction.h"
+#include "../tbb_allocator.h"
 
 #include <cstddef>
 #include <cstdint>
 
 namespace tbb {
-    namespace detail {
-
-        namespace d1 {
-            class base_filter;
-        }
-
-        namespace r1 {
-            TBB_EXPORT void __TBB_EXPORTED_FUNC set_end_of_input(d1::base_filter&);
-            class pipeline;
-            class stage_task;
-            class input_buffer;
-        }// namespace r1
-
-        namespace d1 {
-            class filter_node;
-
-            //! A stage in a pipeline.
-            /** @ingroup algorithms */
-            class base_filter {
-            private:
-                //! Value used to mark "not in pipeline"
-                static base_filter* not_in_pipeline() {
-                    return reinterpret_cast<base_filter*>(std::intptr_t(-1));
-                }
-
-            public:
-                //! The lowest bit 0 is for parallel vs serial
-                static constexpr unsigned int filter_is_serial = 0x1;
-
-                //! 2nd bit distinguishes ordered vs unordered filters.
-                static constexpr unsigned int filter_is_out_of_order = 0x1 << 1;
-
-                //! 3rd bit marks input filters emitting small objects
-                static constexpr unsigned int filter_may_emit_null = 0x1 << 2;
-
-                base_filter(const base_filter&) = delete;
-                base_filter& operator=(const base_filter&) = delete;
-
-            protected:
-                explicit base_filter(unsigned int m)
-                    : next_filter_in_pipeline(not_in_pipeline()), my_input_buffer(nullptr), my_filter_mode(m),
-                      my_pipeline(nullptr) {}
-
-                // signal end-of-input for concrete_filters
-                void set_end_of_input() { r1::set_end_of_input(*this); }
-
-            public:
-                //! True if filter is serial.
-                bool is_serial() const { return bool(my_filter_mode & filter_is_serial); }
-
-                //! True if filter must receive stream in order.
-                bool is_ordered() const {
-                    return (my_filter_mode & filter_is_serial) && !(my_filter_mode & filter_is_out_of_order);
-                }
-
-                //! true if an input filter can emit null
-                bool object_may_be_null() {
-                    return (my_filter_mode & filter_may_emit_null) == filter_may_emit_null;
-                }
-
-                //! Operate on an item from the input stream, and return item for output stream.
-                /** Returns nullptr if filter is a sink. */
-                virtual void* operator()(void* item) = 0;
-
-                //! Destroy filter.
-                virtual ~base_filter() {};
-
-                //! Destroys item if pipeline was cancelled.
-                /** Required to prevent memory leaks.
+namespace detail {
+
+namespace d1 {
+class base_filter;
+}
+
+namespace d2 {
+template <typename Output>
+__TBB_requires(std::copyable<Output>)
+class input_node;
+}
+
+namespace r1 {
+TBB_EXPORT void __TBB_EXPORTED_FUNC set_end_of_input(d1::base_filter&);
+class pipeline;
+class stage_task;
+class input_buffer;
+}
+
+namespace d1 {
+class filter_node;
+
+//! A stage in a pipeline.
+/** @ingroup algorithms */
+class base_filter{
+private:
+    //! Value used to mark "not in pipeline"
+    static base_filter* not_in_pipeline() { return reinterpret_cast<base_filter*>(std::intptr_t(-1)); }
+public:
+    //! The lowest bit 0 is for parallel vs serial
+    static constexpr  unsigned int filter_is_serial = 0x1;
+
+    //! 2nd bit distinguishes ordered vs unordered filters.
+    static constexpr  unsigned int filter_is_out_of_order = 0x1<<1;
+
+    //! 3rd bit marks input filters emitting small objects
+    static constexpr  unsigned int filter_may_emit_null = 0x1<<2;
+
+    base_filter(const base_filter&) = delete;
+    base_filter& operator=(const base_filter&) = delete;
+
+protected:
+    explicit base_filter( unsigned int m ) :
+        next_filter_in_pipeline(not_in_pipeline()),
+        my_input_buffer(nullptr),
+        my_filter_mode(m),
+        my_pipeline(nullptr)
+    {}
+
+    // signal end-of-input for concrete_filters
+    void set_end_of_input() {
+        r1::set_end_of_input(*this);
+    }
+
+public:
+    //! True if filter is serial.
+    bool is_serial() const {
+        return bool( my_filter_mode & filter_is_serial );
+    }
+
+    //! True if filter must receive stream in order.
+    bool is_ordered() const {
+        return (my_filter_mode & filter_is_serial) && !(my_filter_mode & filter_is_out_of_order);
+    }
+
+    //! true if an input filter can emit null
+    bool object_may_be_null() {
+        return ( my_filter_mode & filter_may_emit_null ) == filter_may_emit_null;
+    }
+
+    //! Operate on an item from the input stream, and return item for output stream.
+    /** Returns nullptr if filter is a sink. */
+    virtual void* operator()( void* item ) = 0;
+
+    //! Destroy filter.
+    virtual ~base_filter() {};
+
+    //! Destroys item if pipeline was cancelled.
+    /** Required to prevent memory leaks.
         Note it can be called concurrently even for serial filters.*/
-                virtual void finalize(void* /*item*/) {}
-
-            private:
-                //! Pointer to next filter in the pipeline.
-                base_filter* next_filter_in_pipeline;
-
-                //! Buffer for incoming tokens, or nullptr if not required.
-                /** The buffer is required if the filter is serial. */
-                r1::input_buffer* my_input_buffer;
-
-                friend class r1::stage_task;
-                friend class r1::pipeline;
-                friend void r1::set_end_of_input(d1::base_filter&);
-
-                //! Storage for filter mode and dynamically checked implementation version.
-                const unsigned int my_filter_mode;
-
-                //! Pointer to the pipeline.
-                r1::pipeline* my_pipeline;
-            };
-
-            template <typename Body, typename InputType, typename OutputType>
-            class concrete_filter;
-
-            //! input_filter control to signal end-of-input for parallel_pipeline
-            class flow_control {
-                bool is_pipeline_stopped = false;
-                flow_control() = default;
-                template <typename Body, typename InputType, typename OutputType>
-                friend class concrete_filter;
-                template <typename Output>
-                __TBB_requires(std::copyable<Output>) friend class input_node;
-
-            public:
-                void stop() { is_pipeline_stopped = true; }
-            };
+    virtual void finalize( void* /*item*/ ) {}
+
+private:
+    //! Pointer to next filter in the pipeline.
+    base_filter* next_filter_in_pipeline;
+
+    //! Buffer for incoming tokens, or nullptr if not required.
+    /** The buffer is required if the filter is serial. */
+    r1::input_buffer* my_input_buffer;
+
+    friend class r1::stage_task;
+    friend class r1::pipeline;
+    friend void r1::set_end_of_input(d1::base_filter&);
+
+    //! Storage for filter mode and dynamically checked implementation version.
+    const unsigned int my_filter_mode;
+
+    //! Pointer to the pipeline.
+    r1::pipeline* my_pipeline;
+};
+
+template<typename Body, typename InputType, typename OutputType >
+class concrete_filter;
+
+//! input_filter control to signal end-of-input for parallel_pipeline
+class flow_control {
+    bool is_pipeline_stopped = false;
+    flow_control() = default;
+    template<typename Body, typename InputType, typename OutputType > friend class concrete_filter;
+    template<typename Output>
+    __TBB_requires(std::copyable<Output>)
+    friend class d2::input_node;
+public:
+    void stop() { is_pipeline_stopped = true; }
+};
 
 // Emulate std::is_trivially_copyable (false positives not allowed, false negatives suboptimal but safe).
 #if __TBB_CPP11_TYPE_PROPERTIES_PRESENT
-            template <typename T>
-            using tbb_trivially_copyable = std::is_trivially_copyable<T>;
+template<typename T> using tbb_trivially_copyable = std::is_trivially_copyable<T>;
 #else
-            template <typename T>
-            struct tbb_trivially_copyable {
-                enum { value = false };
-            };
-            template <typename T>
-            struct tbb_trivially_copyable<T*> {
-                enum { value = true };
-            };
-            template <>
-            struct tbb_trivially_copyable<bool> {
-                enum { value = true };
-            };
-            template <>
-            struct tbb_trivially_copyable<char> {
-                enum { value = true };
-            };
-            template <>
-            struct tbb_trivially_copyable<signed char> {
-                enum { value = true };
-            };
-            template <>
-            struct tbb_trivially_copyable<unsigned char> {
-                enum { value = true };
-            };
-            template <>
-            struct tbb_trivially_copyable<short> {
-                enum { value = true };
-            };
-            template <>
-            struct tbb_trivially_copyable<unsigned short> {
-                enum { value = true };
-            };
-            template <>
-            struct tbb_trivially_copyable<int> {
-                enum { value = true };
-            };
-            template <>
-            struct tbb_trivially_copyable<unsigned int> {
-                enum { value = true };
-            };
-            template <>
-            struct tbb_trivially_copyable<long> {
-                enum { value = true };
-            };
-            template <>
-            struct tbb_trivially_copyable<unsigned long> {
-                enum { value = true };
-            };
-            template <>
-            struct tbb_trivially_copyable<long long> {
-                enum { value = true };
-            };
-            template <>
-            struct tbb_trivially_copyable<unsigned long long> {
-                enum { value = true };
-            };
-            template <>
-            struct tbb_trivially_copyable<float> {
-                enum { value = true };
-            };
-            template <>
-            struct tbb_trivially_copyable<double> {
-                enum { value = true };
-            };
-            template <>
-            struct tbb_trivially_copyable<long double> {
-                enum { value = true };
-            };
-#endif// __TBB_CPP11_TYPE_PROPERTIES_PRESENT
-
-            template <typename T>
-            struct use_allocator {
-                static constexpr bool value = sizeof(T) > sizeof(void*) || !tbb_trivially_copyable<T>::value;
-            };
-
-            // A helper class to customize how a type is passed between filters.
-            // Usage: token_helper<T, use_allocator<T>::value>
-            template <typename T, bool Allocate>
-            struct token_helper;
-
-            // using tbb_allocator
-            template <typename T>
-            struct token_helper<T, true> {
-                using pointer = T*;
-                using value_type = T;
-                static pointer create_token(value_type&& source) {
-                    return new (r1::allocate_memory(sizeof(T))) T(std::move(source));
-                }
-                static value_type& token(pointer& t) { return *t; }
-                static void* cast_to_void_ptr(pointer ref) { return reinterpret_cast<void*>(ref); }
-                static pointer cast_from_void_ptr(void* ref) { return reinterpret_cast<pointer>(ref); }
-                static void destroy_token(pointer token) {
-                    token->~value_type();
-                    r1::deallocate_memory(token);
-                }
-            };
-
-            // pointer specialization
-            template <typename T>
-            struct token_helper<T*, false> {
-                using pointer = T*;
-                using value_type = T*;
-                static pointer create_token(const value_type& source) { return source; }
-                static value_type& token(pointer& t) { return t; }
-                static void* cast_to_void_ptr(pointer ref) { return reinterpret_cast<void*>(ref); }
-                static pointer cast_from_void_ptr(void* ref) { return reinterpret_cast<pointer>(ref); }
-                static void destroy_token(pointer /*token*/) {}
-            };
-
-            // converting type to and from void*, passing objects directly
-            template <typename T>
-            struct token_helper<T, false> {
-                typedef union {
-                    T actual_value;
-                    void* void_overlay;
-                } type_to_void_ptr_map;
-                using pointer = T;// not really a pointer in this case.
-                using value_type = T;
-                static pointer create_token(const value_type& source) { return source; }
-                static value_type& token(pointer& t) { return t; }
-                static void* cast_to_void_ptr(pointer ref) {
-                    type_to_void_ptr_map mymap;
-                    mymap.void_overlay = nullptr;
-                    mymap.actual_value = ref;
-                    return mymap.void_overlay;
-                }
-                static pointer cast_from_void_ptr(void* ref) {
-                    type_to_void_ptr_map mymap;
-                    mymap.void_overlay = ref;
-                    return mymap.actual_value;
-                }
-                static void destroy_token(pointer /*token*/) {}
-            };
-
-            // intermediate
-            template <typename InputType, typename OutputType, typename Body>
-            class concrete_filter : public base_filter {
-                const Body& my_body;
-                using input_helper = token_helper<InputType, use_allocator<InputType>::value>;
-                using input_pointer = typename input_helper::pointer;
-                using output_helper = token_helper<OutputType, use_allocator<OutputType>::value>;
-                using output_pointer = typename output_helper::pointer;
-
-                void* operator()(void* input) override {
-                    input_pointer temp_input = input_helper::cast_from_void_ptr(input);
-                    output_pointer temp_output = output_helper::create_token(
-                            my_body(std::move(input_helper::token(temp_input))));
-                    input_helper::destroy_token(temp_input);
-                    return output_helper::cast_to_void_ptr(temp_output);
-                }
-
-                void finalize(void* input) override {
-                    input_pointer temp_input = input_helper::cast_from_void_ptr(input);
-                    input_helper::destroy_token(temp_input);
-                }
-
-            public:
-                concrete_filter(unsigned int m, const Body& body) : base_filter(m), my_body(body) {}
-            };
-
-            // input
-            template <typename OutputType, typename Body>
-            class concrete_filter<void, OutputType, Body> : public base_filter {
-                const Body& my_body;
-                using output_helper = token_helper<OutputType, use_allocator<OutputType>::value>;
-                using output_pointer = typename output_helper::pointer;
-
-                void* operator()(void*) override {
-                    flow_control control;
-                    output_pointer temp_output = output_helper::create_token(my_body(control));
-                    if (control.is_pipeline_stopped) {
-                        output_helper::destroy_token(temp_output);
-                        set_end_of_input();
-                        return nullptr;
-                    }
-                    return output_helper::cast_to_void_ptr(temp_output);
-                }
-
-            public:
-                concrete_filter(unsigned int m, const Body& body)
-                    : base_filter(m | filter_may_emit_null), my_body(body) {}
-            };
-
-            // output
-            template <typename InputType, typename Body>
-            class concrete_filter<InputType, void, Body> : public base_filter {
-                const Body& my_body;
-                using input_helper = token_helper<InputType, use_allocator<InputType>::value>;
-                using input_pointer = typename input_helper::pointer;
-
-                void* operator()(void* input) override {
-                    input_pointer temp_input = input_helper::cast_from_void_ptr(input);
-                    my_body(std::move(input_helper::token(temp_input)));
-                    input_helper::destroy_token(temp_input);
-                    return nullptr;
-                }
-                void finalize(void* input) override {
-                    input_pointer temp_input = input_helper::cast_from_void_ptr(input);
-                    input_helper::destroy_token(temp_input);
-                }
-
-            public:
-                concrete_filter(unsigned int m, const Body& body) : base_filter(m), my_body(body) {}
-            };
-
-            template <typename Body>
-            class concrete_filter<void, void, Body> : public base_filter {
-                const Body& my_body;
-
-                void* operator()(void*) override {
-                    flow_control control;
-                    my_body(control);
-                    void* output = control.is_pipeline_stopped ? nullptr : (void*) (std::intptr_t) -1;
-                    return output;
-                }
-
-            public:
-                concrete_filter(unsigned int m, const Body& body) : base_filter(m), my_body(body) {}
-            };
-
-            class filter_node_ptr {
-                filter_node* my_node;
-
-            public:
-                filter_node_ptr() : my_node(nullptr) {}
-                filter_node_ptr(filter_node*);
-                ~filter_node_ptr();
-                filter_node_ptr(const filter_node_ptr&);
-                filter_node_ptr(filter_node_ptr&&);
-                void operator=(filter_node*);
-                void operator=(const filter_node_ptr&);
-                void operator=(filter_node_ptr&&);
-                filter_node& operator*() const;
-                operator bool() const;
-            };
-
-            //! Abstract base class that represents a node in a parse tree underlying a filter class.
-            /** These nodes are always heap-allocated and can be shared by filter objects. */
-            class filter_node {
-                /** Count must be atomic because it is hidden state for user, but might be shared by threads. */
-                std::atomic<std::intptr_t> ref_count;
-
-            public:
-                filter_node_ptr left;
-                filter_node_ptr right;
-
-            protected:
-                filter_node() : ref_count(0), left(nullptr), right(nullptr) {
+template<typename T> struct tbb_trivially_copyable                      { enum { value = false }; };
+template<typename T> struct tbb_trivially_copyable <         T*       > { enum { value = true  }; };
+template<>           struct tbb_trivially_copyable <         bool     > { enum { value = true  }; };
+template<>           struct tbb_trivially_copyable <         char     > { enum { value = true  }; };
+template<>           struct tbb_trivially_copyable <  signed char     > { enum { value = true  }; };
+template<>           struct tbb_trivially_copyable <unsigned char     > { enum { value = true  }; };
+template<>           struct tbb_trivially_copyable <         short    > { enum { value = true  }; };
+template<>           struct tbb_trivially_copyable <unsigned short    > { enum { value = true  }; };
+template<>           struct tbb_trivially_copyable <         int      > { enum { value = true  }; };
+template<>           struct tbb_trivially_copyable <unsigned int      > { enum { value = true  }; };
+template<>           struct tbb_trivially_copyable <         long     > { enum { value = true  }; };
+template<>           struct tbb_trivially_copyable <unsigned long     > { enum { value = true  }; };
+template<>           struct tbb_trivially_copyable <         long long> { enum { value = true  }; };
+template<>           struct tbb_trivially_copyable <unsigned long long> { enum { value = true  }; };
+template<>           struct tbb_trivially_copyable <         float    > { enum { value = true  }; };
+template<>           struct tbb_trivially_copyable <         double   > { enum { value = true  }; };
+template<>           struct tbb_trivially_copyable <    long double   > { enum { value = true  }; };
+#endif // __TBB_CPP11_TYPE_PROPERTIES_PRESENT
+
+template<typename T>
+struct use_allocator {
+   static constexpr bool value = sizeof(T) > sizeof(void *) || !tbb_trivially_copyable<T>::value;
+};
+
+// A helper class to customize how a type is passed between filters.
+// Usage: token_helper<T, use_allocator<T>::value>
+template<typename T, bool Allocate> struct token_helper;
+
+// using tbb_allocator
+template<typename T>
+struct token_helper<T, true> {
+    using pointer = T*;
+    using value_type = T;
+    static pointer create_token(value_type && source) {
+        return new (r1::allocate_memory(sizeof(T))) T(std::move(source));
+    }
+    static value_type & token(pointer & t) { return *t; }
+    static void * cast_to_void_ptr(pointer ref) { return reinterpret_cast<void *>(ref); }
+    static pointer cast_from_void_ptr(void * ref) { return reinterpret_cast<pointer>(ref); }
+    static void destroy_token(pointer token) {
+        token->~value_type();
+        r1::deallocate_memory(token);
+    }
+};
+
+// pointer specialization
+template<typename T>
+struct token_helper<T*, false> {
+    using pointer = T*;
+    using value_type = T*;
+    static pointer create_token(const value_type & source) { return source; }
+    static value_type & token(pointer & t) { return t; }
+    static void * cast_to_void_ptr(pointer ref) { return reinterpret_cast<void *>(ref); }
+    static pointer cast_from_void_ptr(void * ref) { return reinterpret_cast<pointer>(ref); }
+    static void destroy_token( pointer /*token*/) {}
+};
+
+// converting type to and from void*, passing objects directly
+template<typename T>
+struct token_helper<T, false> {
+    typedef union {
+        T actual_value;
+        void * void_overlay;
+    } type_to_void_ptr_map;
+    using pointer = T;  // not really a pointer in this case.
+    using value_type = T;
+    static pointer create_token(const value_type & source) { return source; }
+    static value_type & token(pointer & t) { return t; }
+    static void * cast_to_void_ptr(pointer ref) {
+        type_to_void_ptr_map mymap;
+        mymap.void_overlay = nullptr;
+        mymap.actual_value = ref;
+        return mymap.void_overlay;
+    }
+    static pointer cast_from_void_ptr(void * ref) {
+        type_to_void_ptr_map mymap;
+        mymap.void_overlay = ref;
+        return mymap.actual_value;
+    }
+    static void destroy_token( pointer /*token*/) {}
+};
+
+// intermediate
+template<typename InputType,  typename OutputType, typename Body>
+class concrete_filter: public base_filter {
+    const Body& my_body;
+    using input_helper = token_helper<InputType, use_allocator<InputType >::value>;
+    using input_pointer = typename input_helper::pointer;
+    using output_helper = token_helper<OutputType, use_allocator<OutputType>::value>;
+    using output_pointer = typename output_helper::pointer;
+
+    void* operator()(void* input) override {
+        input_pointer temp_input = input_helper::cast_from_void_ptr(input);
+        output_pointer temp_output = output_helper::create_token(tbb::detail::invoke(my_body, std::move(input_helper::token(temp_input))));
+        input_helper::destroy_token(temp_input);
+        return output_helper::cast_to_void_ptr(temp_output);
+    }
+
+    void finalize(void * input) override {
+        input_pointer temp_input = input_helper::cast_from_void_ptr(input);
+        input_helper::destroy_token(temp_input);
+    }
+
+public:
+    concrete_filter(unsigned int m, const Body& body) : base_filter(m), my_body(body) {}
+};
+
+// input
+template<typename OutputType, typename Body>
+class concrete_filter<void, OutputType, Body>: public base_filter {
+    const Body& my_body;
+    using output_helper = token_helper<OutputType, use_allocator<OutputType>::value>;
+    using output_pointer = typename output_helper::pointer;
+
+    void* operator()(void*) override {
+        flow_control control;
+        output_pointer temp_output = output_helper::create_token(my_body(control));
+        if(control.is_pipeline_stopped) {
+            output_helper::destroy_token(temp_output);
+            set_end_of_input();
+            return nullptr;
+        }
+        return output_helper::cast_to_void_ptr(temp_output);
+    }
+
+public:
+    concrete_filter(unsigned int m, const Body& body) :
+        base_filter(m | filter_may_emit_null),
+        my_body(body)
+    {}
+};
+
+// output
+template<typename InputType, typename Body>
+class concrete_filter<InputType, void, Body>: public base_filter {
+    const Body& my_body;
+    using input_helper = token_helper<InputType, use_allocator<InputType >::value>;
+    using input_pointer = typename input_helper::pointer;
+
+    void* operator()(void* input) override {
+        input_pointer temp_input = input_helper::cast_from_void_ptr(input);
+        tbb::detail::invoke(my_body, std::move(input_helper::token(temp_input)));
+        input_helper::destroy_token(temp_input);
+        return nullptr;
+    }
+    void finalize(void* input) override {
+        input_pointer temp_input = input_helper::cast_from_void_ptr(input);
+        input_helper::destroy_token(temp_input);
+    }
+
+public:
+    concrete_filter(unsigned int m, const Body& body) : base_filter(m), my_body(body) {}
+};
+
+template<typename Body>
+class concrete_filter<void, void, Body>: public base_filter {
+    const Body& my_body;
+
+    void* operator()(void*) override {
+        flow_control control;
+        my_body(control);
+        void* output = control.is_pipeline_stopped ? nullptr : (void*)(std::intptr_t)-1;
+        return output;
+    }
+public:
+    concrete_filter(unsigned int m, const Body& body) : base_filter(m), my_body(body) {}
+};
+
+class filter_node_ptr {
+    filter_node * my_node;
+
+public:
+    filter_node_ptr() : my_node(nullptr) {}
+    filter_node_ptr(filter_node *);
+    ~filter_node_ptr();
+    filter_node_ptr(const filter_node_ptr &);
+    filter_node_ptr(filter_node_ptr &&);
+    void operator=(filter_node *);
+    void operator=(const filter_node_ptr &);
+    void operator=(filter_node_ptr &&);
+    filter_node& operator*() const;
+    operator bool() const;
+};
+
+//! Abstract base class that represents a node in a parse tree underlying a filter class.
+/** These nodes are always heap-allocated and can be shared by filter objects. */
+class filter_node {
+    /** Count must be atomic because it is hidden state for user, but might be shared by threads. */
+    std::atomic<std::intptr_t> ref_count;
+public:
+    filter_node_ptr left;
+    filter_node_ptr right;
+protected:
+    filter_node() : ref_count(0), left(nullptr), right(nullptr) {
 #ifdef __TBB_TEST_FILTER_NODE_COUNT
-                    ++(__TBB_TEST_FILTER_NODE_COUNT);
+        ++(__TBB_TEST_FILTER_NODE_COUNT);
 #endif
-                }
-
-            public:
-                filter_node(const filter_node_ptr& x, const filter_node_ptr& y) : filter_node() {
-                    left = x;
-                    right = y;
-                }
-                filter_node(const filter_node&) = delete;
-                filter_node& operator=(const filter_node&) = delete;
-
-                //! Add concrete_filter to pipeline
-                virtual base_filter* create_filter() const {
-                    __TBB_ASSERT(false, "method of non-leaf was called");
-                    return nullptr;
-                }
-
-                //! Increment reference count
-                void add_ref() { ref_count.fetch_add(1, std::memory_order_relaxed); }
-
-                //! Decrement reference count and delete if it becomes zero.
-                void remove_ref() {
-                    __TBB_ASSERT(ref_count > 0, "ref_count underflow");
-                    if (ref_count.fetch_sub(1, std::memory_order_relaxed) == 1) {
-                        this->~filter_node();
-                        r1::deallocate_memory(this);
-                    }
-                }
-
-                virtual ~filter_node() {
+    }
+public:
+    filter_node(const filter_node_ptr& x, const filter_node_ptr& y) : filter_node(){
+        left = x;
+        right = y;
+    }
+    filter_node(const filter_node&) = delete;
+    filter_node& operator=(const filter_node&) = delete;
+
+    //! Add concrete_filter to pipeline
+    virtual base_filter* create_filter() const {
+        __TBB_ASSERT(false, "method of non-leaf was called");
+        return nullptr;
+    }
+
+    //! Increment reference count
+    void add_ref() { ref_count.fetch_add(1, std::memory_order_relaxed); }
+
+    //! Decrement reference count and delete if it becomes zero.
+    void remove_ref() {
+        __TBB_ASSERT(ref_count>0,"ref_count underflow");
+        if( ref_count.fetch_sub(1, std::memory_order_relaxed) == 1 ) {
+            this->~filter_node();
+            r1::deallocate_memory(this);
+        }
+    }
+
+    virtual ~filter_node() {
 #ifdef __TBB_TEST_FILTER_NODE_COUNT
-                    --(__TBB_TEST_FILTER_NODE_COUNT);
+        --(__TBB_TEST_FILTER_NODE_COUNT);
 #endif
-                }
-            };
-
-            inline filter_node_ptr::filter_node_ptr(filter_node* nd) : my_node(nd) {
-                if (my_node) { my_node->add_ref(); }
-            }
-
-            inline filter_node_ptr::~filter_node_ptr() {
-                if (my_node) { my_node->remove_ref(); }
-            }
-
-            inline filter_node_ptr::filter_node_ptr(const filter_node_ptr& rhs) : my_node(rhs.my_node) {
-                if (my_node) { my_node->add_ref(); }
-            }
-
-            inline filter_node_ptr::filter_node_ptr(filter_node_ptr&& rhs) : my_node(rhs.my_node) {
-                rhs.my_node = nullptr;
-            }
-
-            inline void filter_node_ptr::operator=(filter_node* rhs) {
-                // Order of operations below carefully chosen so that reference counts remain correct
-                // in unlikely event that remove_ref throws exception.
-                filter_node* old = my_node;
-                my_node = rhs;
-                if (my_node) { my_node->add_ref(); }
-                if (old) { old->remove_ref(); }
-            }
-
-            inline void filter_node_ptr::operator=(const filter_node_ptr& rhs) { *this = rhs.my_node; }
-
-            inline void filter_node_ptr::operator=(filter_node_ptr&& rhs) {
-                filter_node* old = my_node;
-                my_node = rhs.my_node;
-                rhs.my_node = nullptr;
-                if (old) { old->remove_ref(); }
-            }
-
-            inline filter_node& filter_node_ptr::operator*() const {
-                __TBB_ASSERT(my_node, "NULL node is used");
-                return *my_node;
-            }
-
-            inline filter_node_ptr::operator bool() const { return my_node != nullptr; }
-
-            //! Node in parse tree representing result of make_filter.
-            template <typename InputType, typename OutputType, typename Body>
-            class filter_node_leaf : public filter_node {
-                const unsigned int my_mode;
-                const Body my_body;
-                base_filter* create_filter() const override {
-                    return new (r1::allocate_memory(sizeof(concrete_filter<InputType, OutputType, Body>)))
-                            concrete_filter<InputType, OutputType, Body>(my_mode, my_body);
-                }
-
-            public:
-                filter_node_leaf(unsigned int m, const Body& b) : my_mode(m), my_body(b) {}
-            };
-
-            template <typename Body,
-                      typename Input = typename body_types<decltype(&Body::operator())>::input_type>
-            using filter_input =
-                    typename std::conditional<std::is_same<Input, flow_control>::value, void, Input>::type;
-
-            template <typename Body>
-            using filter_output = typename body_types<decltype(&Body::operator())>::output_type;
-
-        }// namespace d1
-    }    // namespace detail
-}// namespace tbb
+    }
+};
+
+inline filter_node_ptr::filter_node_ptr(filter_node * nd) : my_node(nd) {
+    if (my_node) {
+        my_node->add_ref();
+    }
+}
+
+inline filter_node_ptr::~filter_node_ptr() {
+    if (my_node) {
+        my_node->remove_ref();
+    }
+}
+
+inline filter_node_ptr::filter_node_ptr(const filter_node_ptr & rhs) : my_node(rhs.my_node) {
+    if (my_node) {
+        my_node->add_ref();
+    }
+}
+
+inline filter_node_ptr::filter_node_ptr(filter_node_ptr && rhs) : my_node(rhs.my_node) {
+    rhs.my_node = nullptr;
+}
+
+inline void filter_node_ptr::operator=(filter_node * rhs) {
+    // Order of operations below carefully chosen so that reference counts remain correct
+    // in unlikely event that remove_ref throws exception.
+    filter_node* old = my_node;
+    my_node = rhs;
+    if (my_node) {
+        my_node->add_ref();
+    }
+    if (old) {
+        old->remove_ref();
+    }
+}
+
+inline void filter_node_ptr::operator=(const filter_node_ptr & rhs) {
+    *this = rhs.my_node;
+}
+
+inline void filter_node_ptr::operator=(filter_node_ptr && rhs) {
+    filter_node* old = my_node;
+    my_node = rhs.my_node;
+    rhs.my_node = nullptr;
+    if (old) {
+        old->remove_ref();
+    }
+}
+
+inline filter_node& filter_node_ptr::operator*() const{
+    __TBB_ASSERT(my_node,"nullptr node is used");
+    return *my_node;
+}
+
+inline filter_node_ptr::operator bool() const {
+    return my_node != nullptr;
+}
+
+//! Node in parse tree representing result of make_filter.
+template<typename InputType, typename OutputType, typename Body>
+class filter_node_leaf: public filter_node {
+    const unsigned int my_mode;
+    const Body my_body;
+    base_filter* create_filter() const override {
+        return new(r1::allocate_memory(sizeof(concrete_filter<InputType, OutputType, Body>))) concrete_filter<InputType, OutputType, Body>(my_mode,my_body);
+    }
+public:
+    filter_node_leaf( unsigned int m, const Body& b ) : my_mode(m), my_body(b) {}
+};
+
+
+template <typename Body, typename Input = typename filter_body_types<decltype(&Body::operator())>::input_type>
+using filter_input = typename std::conditional<std::is_same<Input, flow_control>::value, void, Input>::type;
+
+template <typename Body>
+using filter_output = typename filter_body_types<decltype(&Body::operator())>::output_type;
+
+} // namespace d1
+} // namespace detail
+} // namespace tbb
+
 
 #endif /* __TBB_parallel_filters_H */
diff --git a/external/tbb/include/oneapi/tbb/detail/_pipeline_filters_deduction.h b/external/tbb/include/oneapi/tbb/detail/_pipeline_filters_deduction.h
index e0acde90..c1a6e8ae 100644
--- a/external/tbb/include/oneapi/tbb/detail/_pipeline_filters_deduction.h
+++ b/external/tbb/include/oneapi/tbb/detail/_pipeline_filters_deduction.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2023 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -18,32 +18,29 @@
 #define __TBB__pipeline_filters_deduction_H
 
 #include "_config.h"
-#include <type_traits>
 #include <utility>
+#include <type_traits>
 
 namespace tbb {
-    namespace detail {
-        namespace d1 {
+namespace detail {
+namespace d1 {
 
-            template <typename Input, typename Output>
-            struct declare_fitler_types {
-                using input_type =
-                        typename std::remove_const<typename std::remove_reference<Input>::type>::type;
-                using output_type =
-                        typename std::remove_const<typename std::remove_reference<Output>::type>::type;
-            };
+template <typename Input, typename Output>
+struct declare_filter_types {
+    using input_type = typename std::remove_const<typename std::remove_reference<Input>::type>::type;
+    using output_type = typename std::remove_const<typename std::remove_reference<Output>::type>::type;
+};
 
-            template <typename T>
-            struct body_types;
+template <typename T> struct filter_body_types;
 
-            template <typename T, typename Input, typename Output>
-            struct body_types<Output (T::*)(Input) const> : declare_fitler_types<Input, Output> {};
+template <typename T, typename Input, typename Output>
+struct filter_body_types<Output(T::*)(Input) const> : declare_filter_types<Input, Output> {};
 
-            template <typename T, typename Input, typename Output>
-            struct body_types<Output (T::*)(Input)> : declare_fitler_types<Input, Output> {};
+template <typename T, typename Input, typename Output>
+struct filter_body_types<Output(T::*)(Input)> : declare_filter_types<Input, Output> {};
 
-        }// namespace d1
-    }    // namespace detail
-}// namespace tbb
+} // namespace d1
+} // namespace detail
+} // namespace tbb
 
-#endif// __TBB__pipeline_filters_deduction_H
+#endif // __TBB__pipeline_filters_deduction_H
diff --git a/external/tbb/include/oneapi/tbb/detail/_range_common.h b/external/tbb/include/oneapi/tbb/detail/_range_common.h
index b30dee12..ac219587 100644
--- a/external/tbb/include/oneapi/tbb/detail/_range_common.h
+++ b/external/tbb/include/oneapi/tbb/detail/_range_common.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2025 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -21,115 +21,113 @@
 #include "_utils.h"
 #if __TBB_CPP20_CONCEPTS_PRESENT
 #include <concepts>
-#include <iterator>
 #endif
+#include <iterator>
 
 namespace tbb {
-    namespace detail {
-        inline namespace d0 {
+namespace detail {
+inline namespace d0 {
 
-            //! Dummy type that distinguishes splitting constructor from copy constructor.
-            /**
+//! Dummy type that distinguishes splitting constructor from copy constructor.
+/**
  * See description of parallel_for and parallel_reduce for example usages.
  * @ingroup algorithms
  */
-            class split {};
+class split {};
 
-            //! Type enables transmission of splitting proportion from partitioners to range objects
-            /**
+//! Type enables transmission of splitting proportion from partitioners to range objects
+/**
  * In order to make use of such facility Range objects must implement
  * splitting constructor with this type passed.
  */
-            class proportional_split : no_assign {
-            public:
-                proportional_split(size_t _left = 1, size_t _right = 1) : my_left(_left), my_right(_right) {}
-
-                size_t left() const { return my_left; }
-                size_t right() const { return my_right; }
-
-                // used when range does not support proportional split
-                explicit operator split() const { return split(); }
-
-            private:
-                size_t my_left, my_right;
-            };
-
-            template <typename Range, typename = void>
-            struct range_split_object_provider {
-                template <typename PartitionerSplitType>
-                static split get(PartitionerSplitType&) {
-                    return split();
-                }
-            };
-
-            template <typename Range>
-            struct range_split_object_provider<
-                    Range, typename std::enable_if<
-                                   std::is_constructible<Range, Range&, proportional_split&>::value>::type> {
-                template <typename PartitionerSplitType>
-                static PartitionerSplitType& get(PartitionerSplitType& split_obj) {
-                    return split_obj;
-                }
-            };
-
-            template <typename Range, typename PartitionerSplitType>
-            auto get_range_split_object(PartitionerSplitType& split_obj)
-                    -> decltype(range_split_object_provider<Range>::get(split_obj)) {
-                return range_split_object_provider<Range>::get(split_obj);
-            }
+class proportional_split : no_assign {
+public:
+    proportional_split(size_t _left = 1, size_t _right = 1) : my_left(_left), my_right(_right) { }
+
+    size_t left() const { return my_left; }
+    size_t right() const { return my_right; }
+
+    // used when range does not support proportional split
+    explicit operator split() const { return split(); }
+
+private:
+    size_t my_left, my_right;
+};
+
+template <typename Range, typename = void>
+struct range_split_object_provider {
+    template <typename PartitionerSplitType>
+    static split get( PartitionerSplitType& ) { return split(); }
+};
+
+template <typename Range>
+struct range_split_object_provider<Range,
+                                   typename std::enable_if<std::is_constructible<Range, Range&, proportional_split&>::value>::type> {
+    template <typename PartitionerSplitType>
+    static PartitionerSplitType& get( PartitionerSplitType& split_obj ) { return split_obj; }
+};
+
+template <typename Range, typename PartitionerSplitType>
+auto get_range_split_object( PartitionerSplitType& split_obj )
+-> decltype(range_split_object_provider<Range>::get(split_obj)) {
+    return range_split_object_provider<Range>::get(split_obj);
+}
+
+template <typename Range>
+using range_iterator_type = decltype(std::begin(std::declval<Range&>()));
 
 #if __TBB_CPP20_CONCEPTS_PRESENT
-            template <typename Range>
-            using range_iterator_type = decltype(std::begin(std::declval<Range&>()));
-
-            template <typename Iterator>
-            using iterator_reference_type = typename std::iterator_traits<Iterator>::reference;
-
-            template <typename Range>
-            using range_reference_type = iterator_reference_type<range_iterator_type<Range>>;
-
-            template <typename Value>
-            concept blocked_range_value
-                    = std::copyable<Value> && requires(const std::remove_reference_t<Value>& lhs,
-                                                       const std::remove_reference_t<Value>& rhs) {
-                { lhs < rhs } -> relaxed_convertible_to<bool>;
-                { lhs - rhs } -> std::convertible_to<std::size_t>;
-                { lhs + (rhs - lhs) } -> std::convertible_to<Value>;
-            };
-
-            template <typename T>
-            concept splittable = std::constructible_from<T, T&, tbb::detail::split>;
-
-            template <typename Range>
-            concept tbb_range = std::copy_constructible<Range> && splittable<Range> && requires(
-                    const std::remove_reference_t<Range>& range) {
-                { range.empty() } -> relaxed_convertible_to<bool>;
-                { range.is_divisible() } -> relaxed_convertible_to<bool>;
-            };
-
-            template <typename Iterator>
-            constexpr bool iterator_concept_helper(std::input_iterator_tag) {
-                return std::input_iterator<Iterator>;
-            }
-
-            template <typename Iterator>
-            constexpr bool iterator_concept_helper(std::random_access_iterator_tag) {
-                return std::random_access_iterator<Iterator>;
-            }
-
-            template <typename Iterator, typename IteratorTag>
-            concept iterator_satisfies = requires(IteratorTag tag) {
-                requires iterator_concept_helper<Iterator>(tag);
-            };
-
-            template <typename Sequence, typename IteratorTag>
-            concept container_based_sequence = requires(Sequence& seq) {
-                { std::begin(seq) } -> iterator_satisfies<IteratorTag>;
-                { std::end(seq) } -> iterator_satisfies<IteratorTag>;
-            };
-#endif   // __TBB_CPP20_CONCEPTS_PRESENT
-        }// namespace d0
-    }    // namespace detail
-}// namespace tbb
-
-#endif// __TBB_detail__range_common_H
+template <typename Iterator>
+using iterator_reference_type = typename std::iterator_traits<Iterator>::reference;
+
+template <typename Range>
+using range_reference_type = iterator_reference_type<range_iterator_type<Range>>;
+
+template <typename Value>
+concept blocked_range_value = std::copyable<Value> &&
+                              requires( const std::remove_reference_t<Value>& lhs, const std::remove_reference_t<Value>& rhs ) {
+                                  { lhs < rhs } -> relaxed_convertible_to<bool>;
+                                  { lhs - rhs } -> std::convertible_to<std::size_t>;
+                                  { lhs + (rhs - lhs) } -> std::convertible_to<Value>;
+                              };
+
+template <typename T>
+concept splittable = std::constructible_from<T, T&, tbb::detail::split>;
+
+template <typename Range>
+concept tbb_range = std::copy_constructible<Range> &&
+                    splittable<Range> &&
+                    requires( const std::remove_reference_t<Range>& range ) {
+                        { range.empty() } -> relaxed_convertible_to<bool>;
+                        { range.is_divisible() } -> relaxed_convertible_to<bool>;
+                    };
+
+template <typename Iterator, typename IteratorTag>
+struct iterator_concept_helper;
+
+// New specializations should be added in case of using container_based_sequence with
+// the new iterator tag types
+template <typename Iterator>
+struct iterator_concept_helper<Iterator, std::input_iterator_tag> {
+    static constexpr bool value = std::input_iterator<Iterator>;
+};
+
+template <typename Iterator>
+struct iterator_concept_helper<Iterator, std::random_access_iterator_tag> {
+    static constexpr bool value = std::random_access_iterator<Iterator>;
+};
+
+template <typename Iterator, typename IteratorTag>
+concept iterator_satisfies = iterator_concept_helper<Iterator, IteratorTag>::value;
+
+template <typename Sequence, typename IteratorTag>
+concept container_based_sequence = requires( Sequence& seq ) {
+    { std::begin(seq) } -> iterator_satisfies<IteratorTag>;
+    { std::end(seq) } -> iterator_satisfies<IteratorTag>;
+};
+#endif // __TBB_CPP20_CONCEPTS_PRESENT
+} // namespace d0
+} // namespace detail
+} // namespace tbb
+
+#endif // __TBB_detail__range_common_H
diff --git a/external/tbb/include/oneapi/tbb/detail/_rtm_mutex.h b/external/tbb/include/oneapi/tbb/detail/_rtm_mutex.h
index 2252d62c..11583bad 100644
--- a/external/tbb/include/oneapi/tbb/detail/_rtm_mutex.h
+++ b/external/tbb/include/oneapi/tbb/detail/_rtm_mutex.h
@@ -17,137 +17,146 @@
 #ifndef __TBB__rtm_mutex_impl_H
 #define __TBB__rtm_mutex_impl_H
 
-#include "../spin_mutex.h"
 #include "_assert.h"
 #include "_utils.h"
+#include "../spin_mutex.h"
 
 #include "../profiling.h"
 
 namespace tbb {
-    namespace detail {
-        namespace r1 {
-            struct rtm_mutex_impl;
-        }
-        namespace d1 {
+namespace detail {
+namespace r1 {
+struct rtm_mutex_impl;
+}
+namespace d1 {
 
 #if _MSC_VER && !defined(__INTEL_COMPILER)
-// Suppress warning: structure was padded due to alignment specifier
-#pragma warning(push)
-#pragma warning(disable : 4324)
+    // Suppress warning: structure was padded due to alignment specifier
+    #pragma warning (push)
+    #pragma warning (disable: 4324)
 #endif
 
-            /** A rtm_mutex is an speculation-enabled spin mutex.
+/** A rtm_mutex is an speculation-enabled spin mutex.
     It should be used for locking short critical sections where the lock is
     contended but the data it protects are not.  If zero-initialized, the
     mutex is considered unheld.
     @ingroup synchronization */
-            class alignas(max_nfs_size) rtm_mutex : private spin_mutex {
-            private:
-                enum class rtm_state { rtm_none, rtm_transacting, rtm_real };
-
-            public:
-                //! Constructors
-                rtm_mutex() noexcept { create_itt_sync(this, "tbb::speculative_spin_mutex", ""); }
-
-                //! Destructor
-                ~rtm_mutex() = default;
-
-                //! Represents acquisition of a mutex.
-                class scoped_lock {
-                public:
-                    friend class rtm_mutex;
-                    //! Construct lock that has not acquired a mutex.
-                    /** Equivalent to zero-initialization of *this. */
-                    constexpr scoped_lock() : m_mutex(nullptr), m_transaction_state(rtm_state::rtm_none) {}
-
-                    //! Acquire lock on given mutex.
-                    scoped_lock(rtm_mutex& m) : m_mutex(nullptr), m_transaction_state(rtm_state::rtm_none) {
-                        acquire(m);
-                    }
-
-                    //! Release lock (if lock is held).
-                    ~scoped_lock() {
-                        if (m_transaction_state != rtm_state::rtm_none) { release(); }
-                    }
-
-                    //! No Copy
-                    scoped_lock(const scoped_lock&) = delete;
-                    scoped_lock& operator=(const scoped_lock&) = delete;
-
-                    //! Acquire lock on given mutex.
-                    void acquire(rtm_mutex& m);
-
-                    //! Try acquire lock on given mutex.
-                    bool try_acquire(rtm_mutex& m);
-
-                    //! Release lock
-                    void release();
-
-                private:
-                    rtm_mutex* m_mutex;
-                    rtm_state m_transaction_state;
-                    friend r1::rtm_mutex_impl;
-                };
-
-                //! Mutex traits
-                static constexpr bool is_rw_mutex = false;
-                static constexpr bool is_recursive_mutex = false;
-                static constexpr bool is_fair_mutex = false;
-
-            private:
-                friend r1::rtm_mutex_impl;
-            };// end of rtm_mutex
-        }     // namespace d1
-
-        namespace r1 {
-            //! Internal acquire lock.
-            // only_speculate == true if we're doing a try_lock, else false.
-            TBB_EXPORT void __TBB_EXPORTED_FUNC acquire(d1::rtm_mutex&, d1::rtm_mutex::scoped_lock&,
-                                                        bool only_speculate = false);
-            //! Internal try_acquire lock.
-            TBB_EXPORT bool __TBB_EXPORTED_FUNC try_acquire(d1::rtm_mutex&, d1::rtm_mutex::scoped_lock&);
-            //! Internal release lock.
-            TBB_EXPORT void __TBB_EXPORTED_FUNC release(d1::rtm_mutex::scoped_lock&);
-        }// namespace r1
-
-        namespace d1 {
-            //! Acquire lock on given mutex.
-            inline void rtm_mutex::scoped_lock::acquire(rtm_mutex& m) {
-                __TBB_ASSERT(!m_mutex, "lock is already acquired");
-                r1::acquire(m, *this);
-            }
+class alignas(max_nfs_size) rtm_mutex : private spin_mutex {
+private:
+    enum class rtm_state {
+        rtm_none,
+        rtm_transacting,
+        rtm_real
+    };
+public:
+    //! Constructors
+    rtm_mutex() noexcept {
+        create_itt_sync(this, "tbb::speculative_spin_mutex", "");
+    }
+
+    //! Destructor
+    ~rtm_mutex() = default;
+
+    //! Represents acquisition of a mutex.
+    class scoped_lock {
+    public:
+        friend class rtm_mutex;
+        //! Construct lock that has not acquired a mutex.
+        /** Equivalent to zero-initialization of *this. */
+        constexpr scoped_lock() : m_mutex(nullptr), m_transaction_state(rtm_state::rtm_none) {}
+
+        //! Acquire lock on given mutex.
+        scoped_lock(rtm_mutex& m) : m_mutex(nullptr), m_transaction_state(rtm_state::rtm_none) {
+            acquire(m);
+        }
 
-            //! Try acquire lock on given mutex.
-            inline bool rtm_mutex::scoped_lock::try_acquire(rtm_mutex& m) {
-                __TBB_ASSERT(!m_mutex, "lock is already acquired");
-                return r1::try_acquire(m, *this);
+        //! Release lock (if lock is held).
+        ~scoped_lock() {
+            if(m_transaction_state != rtm_state::rtm_none) {
+                release();
             }
+        }
 
-            //! Release lock
-            inline void rtm_mutex::scoped_lock::release() {
-                __TBB_ASSERT(m_mutex, "lock is not acquired");
-                __TBB_ASSERT(m_transaction_state != rtm_state::rtm_none, "lock is not acquired");
-                return r1::release(*this);
-            }
+        //! No Copy
+        scoped_lock(const scoped_lock&) = delete;
+        scoped_lock& operator=(const scoped_lock&) = delete;
+
+        //! Acquire lock on given mutex.
+        void acquire(rtm_mutex& m);
+
+        //! Try acquire lock on given mutex.
+        bool try_acquire(rtm_mutex& m);
+
+        //! Release lock
+        void release();
+
+    private:
+        rtm_mutex* m_mutex;
+        rtm_state m_transaction_state;
+        friend r1::rtm_mutex_impl;
+    };
+
+    //! Mutex traits
+    static constexpr bool is_rw_mutex = false;
+    static constexpr bool is_recursive_mutex = false;
+    static constexpr bool is_fair_mutex = false;
+private:
+    friend r1::rtm_mutex_impl;
+}; // end of rtm_mutex
+} // namespace d1
+
+namespace r1 {
+    //! Internal acquire lock.
+    // only_speculate == true if we're doing a try_lock, else false.
+    TBB_EXPORT void __TBB_EXPORTED_FUNC acquire(d1::rtm_mutex&, d1::rtm_mutex::scoped_lock&, bool only_speculate = false);
+    //! Internal try_acquire lock.
+    TBB_EXPORT bool __TBB_EXPORTED_FUNC try_acquire(d1::rtm_mutex&, d1::rtm_mutex::scoped_lock&);
+    //! Internal release lock.
+    TBB_EXPORT void __TBB_EXPORTED_FUNC release(d1::rtm_mutex::scoped_lock&);
+} // namespace r1
+
+namespace d1 {
+//! Acquire lock on given mutex.
+inline void rtm_mutex::scoped_lock::acquire(rtm_mutex& m) {
+    __TBB_ASSERT(!m_mutex, "lock is already acquired");
+    r1::acquire(m, *this);
+}
+
+//! Try acquire lock on given mutex.
+inline bool rtm_mutex::scoped_lock::try_acquire(rtm_mutex& m) {
+    __TBB_ASSERT(!m_mutex, "lock is already acquired");
+    return r1::try_acquire(m, *this);
+}
+
+//! Release lock
+inline void rtm_mutex::scoped_lock::release() {
+    __TBB_ASSERT(m_mutex, "lock is not acquired");
+    __TBB_ASSERT(m_transaction_state != rtm_state::rtm_none, "lock is not acquired");
+    return r1::release(*this);
+}
 
 #if _MSC_VER && !defined(__INTEL_COMPILER)
-#pragma warning(pop)// 4324 warning
+    #pragma warning (pop) // 4324 warning
 #endif
 
 #if TBB_USE_PROFILING_TOOLS
-            inline void set_name(rtm_mutex& obj, const char* name) { itt_set_sync_name(&obj, name); }
-#if (_WIN32 || _WIN64)
-            inline void set_name(rtm_mutex& obj, const wchar_t* name) { itt_set_sync_name(&obj, name); }
-#endif// WIN
+inline void set_name(rtm_mutex& obj, const char* name) {
+    itt_set_sync_name(&obj, name);
+}
+#if (_WIN32||_WIN64)
+inline void set_name(rtm_mutex& obj, const wchar_t* name) {
+    itt_set_sync_name(&obj, name);
+}
+#endif // WIN
 #else
-            inline void set_name(rtm_mutex&, const char*) {}
-#if (_WIN32 || _WIN64)
-            inline void set_name(rtm_mutex&, const wchar_t*) {}
-#endif// WIN
+inline void set_name(rtm_mutex&, const char*) {}
+#if (_WIN32||_WIN64)
+inline void set_name(rtm_mutex&, const wchar_t*) {}
+#endif // WIN
 #endif
 
-        }// namespace d1
-    }    // namespace detail
-}// namespace tbb
+} // namespace d1
+} // namespace detail
+} // namespace tbb
 
 #endif /* __TBB__rtm_mutex_impl_H */
diff --git a/external/tbb/include/oneapi/tbb/detail/_rtm_rw_mutex.h b/external/tbb/include/oneapi/tbb/detail/_rtm_rw_mutex.h
index 08733dbd..25a8fc1e 100644
--- a/external/tbb/include/oneapi/tbb/detail/_rtm_rw_mutex.h
+++ b/external/tbb/include/oneapi/tbb/detail/_rtm_rw_mutex.h
@@ -17,208 +17,199 @@
 #ifndef __TBB_detail__rtm_rw_mutex_H
 #define __TBB_detail__rtm_rw_mutex_H
 
-#include "../spin_rw_mutex.h"
 #include "_assert.h"
 #include "_utils.h"
+#include "../spin_rw_mutex.h"
 
 #include <atomic>
 
 namespace tbb {
-    namespace detail {
+namespace detail {
 
-        namespace r1 {
-            struct rtm_rw_mutex_impl;
-        }
+namespace r1 {
+struct rtm_rw_mutex_impl;
+}
 
-        namespace d1 {
+namespace d1 {
 
-            constexpr std::size_t speculation_granularity = 64;
+constexpr std::size_t speculation_granularity = 64;
 #if _MSC_VER && !defined(__INTEL_COMPILER)
-// Suppress warning: structure was padded due to alignment specifier
-#pragma warning(push)
-#pragma warning(disable : 4324)
+    // Suppress warning: structure was padded due to alignment specifier
+    #pragma warning (push)
+    #pragma warning (disable: 4324)
 #endif
 
-            //! Fast, unfair, spinning speculation-enabled reader-writer lock with backoff and writer-preference
-            /** @ingroup synchronization */
-            class alignas(max_nfs_size) rtm_rw_mutex : private spin_rw_mutex {
-                friend struct r1::rtm_rw_mutex_impl;
-
-            private:
-                enum class rtm_type {
-                    rtm_not_in_mutex,
-                    rtm_transacting_reader,
-                    rtm_transacting_writer,
-                    rtm_real_reader,
-                    rtm_real_writer
-                };
-
-            public:
-                //! Constructors
-                rtm_rw_mutex() noexcept : write_flag(false) {
-                    create_itt_sync(this, "tbb::speculative_spin_rw_mutex", "");
-                }
-
-                //! Destructor
-                ~rtm_rw_mutex() = default;
-
-                //! Represents acquisition of a mutex.
-                class scoped_lock {
-                    friend struct r1::rtm_rw_mutex_impl;
-
-                public:
-                    //! Construct lock that has not acquired a mutex.
-                    /** Equivalent to zero-initialization of *this. */
-                    constexpr scoped_lock()
-                        : m_mutex(nullptr), m_transaction_state(rtm_type::rtm_not_in_mutex) {}
-
-                    //! Acquire lock on given mutex.
-                    scoped_lock(rtm_rw_mutex& m, bool write = true)
-                        : m_mutex(nullptr), m_transaction_state(rtm_type::rtm_not_in_mutex) {
-                        acquire(m, write);
-                    }
-
-                    //! Release lock (if lock is held).
-                    ~scoped_lock() {
-                        if (m_transaction_state != rtm_type::rtm_not_in_mutex) { release(); }
-                    }
-
-                    //! No Copy
-                    scoped_lock(const scoped_lock&) = delete;
-                    scoped_lock& operator=(const scoped_lock&) = delete;
-
-                    //! Acquire lock on given mutex.
-                    inline void acquire(rtm_rw_mutex& m, bool write = true);
-
-                    //! Try acquire lock on given mutex.
-                    inline bool try_acquire(rtm_rw_mutex& m, bool write = true);
-
-                    //! Release lock
-                    inline void release();
-
-                    //! Upgrade reader to become a writer.
-                    /** Returns whether the upgrade happened without releasing and re-acquiring the lock */
-                    inline bool upgrade_to_writer();
-
-                    //! Downgrade writer to become a reader.
-                    inline bool downgrade_to_reader();
-
-                    inline bool is_writer() const;
-
-                private:
-                    rtm_rw_mutex* m_mutex;
-                    rtm_type m_transaction_state;
-                };
-
-                //! Mutex traits
-                static constexpr bool is_rw_mutex = true;
-                static constexpr bool is_recursive_mutex = false;
-                static constexpr bool is_fair_mutex = false;
-
-            private:
-                alignas(speculation_granularity) std::atomic<bool> write_flag;
-            };
-
-#if _MSC_VER && !defined(__INTEL_COMPILER)
-#pragma warning(pop)// 4324 warning
-#endif
+//! Fast, unfair, spinning speculation-enabled reader-writer lock with backoff and writer-preference
+/** @ingroup synchronization */
+class alignas(max_nfs_size) rtm_rw_mutex : private spin_rw_mutex {
+    friend struct r1::rtm_rw_mutex_impl;
+private:
+    enum class rtm_type {
+        rtm_not_in_mutex,
+        rtm_transacting_reader,
+        rtm_transacting_writer,
+        rtm_real_reader,
+        rtm_real_writer
+    };
+public:
+    //! Constructors
+    rtm_rw_mutex() noexcept : write_flag(false) {
+        create_itt_sync(this, "tbb::speculative_spin_rw_mutex", "");
+    }
+
+    //! Destructor
+    ~rtm_rw_mutex() = default;
+
+    //! Represents acquisition of a mutex.
+    class scoped_lock {
+        friend struct r1::rtm_rw_mutex_impl;
+    public:
+        //! Construct lock that has not acquired a mutex.
+        /** Equivalent to zero-initialization of *this. */
+        constexpr scoped_lock() : m_mutex(nullptr), m_transaction_state(rtm_type::rtm_not_in_mutex) {}
+
+        //! Acquire lock on given mutex.
+        scoped_lock(rtm_rw_mutex& m, bool write = true) : m_mutex(nullptr), m_transaction_state(rtm_type::rtm_not_in_mutex) {
+            acquire(m, write);
+        }
 
-        }// namespace d1
-
-        namespace r1 {
-            //! Internal acquire write lock.
-            // only_speculate == true if we're doing a try_lock, else false.
-            TBB_EXPORT void __TBB_EXPORTED_FUNC acquire_writer(d1::rtm_rw_mutex&,
-                                                               d1::rtm_rw_mutex::scoped_lock&,
-                                                               bool only_speculate = false);
-            //! Internal acquire read lock.
-            // only_speculate == true if we're doing a try_lock, else false.
-            TBB_EXPORT void __TBB_EXPORTED_FUNC acquire_reader(d1::rtm_rw_mutex&,
-                                                               d1::rtm_rw_mutex::scoped_lock&,
-                                                               bool only_speculate = false);
-            //! Internal upgrade reader to become a writer.
-            TBB_EXPORT bool __TBB_EXPORTED_FUNC upgrade(d1::rtm_rw_mutex::scoped_lock&);
-            //! Internal downgrade writer to become a reader.
-            TBB_EXPORT bool __TBB_EXPORTED_FUNC downgrade(d1::rtm_rw_mutex::scoped_lock&);
-            //! Internal try_acquire write lock.
-            TBB_EXPORT bool __TBB_EXPORTED_FUNC try_acquire_writer(d1::rtm_rw_mutex&,
-                                                                   d1::rtm_rw_mutex::scoped_lock&);
-            //! Internal try_acquire read lock.
-            TBB_EXPORT bool __TBB_EXPORTED_FUNC try_acquire_reader(d1::rtm_rw_mutex&,
-                                                                   d1::rtm_rw_mutex::scoped_lock&);
-            //! Internal release lock.
-            TBB_EXPORT void __TBB_EXPORTED_FUNC release(d1::rtm_rw_mutex::scoped_lock&);
-        }// namespace r1
-
-        namespace d1 {
-            //! Acquire lock on given mutex.
-            void rtm_rw_mutex::scoped_lock::acquire(rtm_rw_mutex& m, bool write) {
-                __TBB_ASSERT(!m_mutex, "lock is already acquired");
-                if (write) {
-                    r1::acquire_writer(m, *this);
-                } else {
-                    r1::acquire_reader(m, *this);
-                }
+        //! Release lock (if lock is held).
+        ~scoped_lock() {
+            if(m_transaction_state != rtm_type::rtm_not_in_mutex) {
+                release();
             }
+        }
 
-            //! Try acquire lock on given mutex.
-            bool rtm_rw_mutex::scoped_lock::try_acquire(rtm_rw_mutex& m, bool write) {
-                __TBB_ASSERT(!m_mutex, "lock is already acquired");
-                if (write) {
-                    return r1::try_acquire_writer(m, *this);
-                } else {
-                    return r1::try_acquire_reader(m, *this);
-                }
-            }
+        //! No Copy
+        scoped_lock(const scoped_lock&) = delete;
+        scoped_lock& operator=(const scoped_lock&) = delete;
 
-            //! Release lock
-            void rtm_rw_mutex::scoped_lock::release() {
-                __TBB_ASSERT(m_mutex, "lock is not acquired");
-                __TBB_ASSERT(m_transaction_state != rtm_type::rtm_not_in_mutex, "lock is not acquired");
-                return r1::release(*this);
-            }
+        //! Acquire lock on given mutex.
+        inline void acquire(rtm_rw_mutex& m, bool write = true);
 
-            //! Upgrade reader to become a writer.
-            /** Returns whether the upgrade happened without releasing and re-acquiring the lock */
-            bool rtm_rw_mutex::scoped_lock::upgrade_to_writer() {
-                __TBB_ASSERT(m_mutex, "lock is not acquired");
-                if (m_transaction_state == rtm_type::rtm_transacting_writer
-                    || m_transaction_state == rtm_type::rtm_real_writer) {
-                    return true;// Already a writer
-                }
-                return r1::upgrade(*this);
-            }
+        //! Try acquire lock on given mutex.
+        inline bool try_acquire(rtm_rw_mutex& m, bool write = true);
 
-            //! Downgrade writer to become a reader.
-            bool rtm_rw_mutex::scoped_lock::downgrade_to_reader() {
-                __TBB_ASSERT(m_mutex, "lock is not acquired");
-                if (m_transaction_state == rtm_type::rtm_transacting_reader
-                    || m_transaction_state == rtm_type::rtm_real_reader) {
-                    return true;// Already a reader
-                }
-                return r1::downgrade(*this);
-            }
+        //! Release lock
+        inline void release();
 
-            bool rtm_rw_mutex::scoped_lock::is_writer() const {
-                __TBB_ASSERT(m_mutex, "lock is not acquired");
-                return m_transaction_state == rtm_type::rtm_transacting_writer
-                       || m_transaction_state == rtm_type::rtm_real_writer;
-            }
+        //! Upgrade reader to become a writer.
+        /** Returns whether the upgrade happened without releasing and re-acquiring the lock */
+        inline bool upgrade_to_writer();
+
+        //! Downgrade writer to become a reader.
+        inline bool downgrade_to_reader();
+
+        inline bool is_writer() const;
+    private:
+        rtm_rw_mutex* m_mutex;
+        rtm_type m_transaction_state;
+    };
+
+    //! Mutex traits
+    static constexpr bool is_rw_mutex = true;
+    static constexpr bool is_recursive_mutex = false;
+    static constexpr bool is_fair_mutex = false;
+
+private:
+    alignas(speculation_granularity) std::atomic<bool> write_flag;
+};
+
+#if _MSC_VER && !defined(__INTEL_COMPILER)
+    #pragma warning (pop) // 4324 warning
+#endif
+
+} // namespace d1
+
+namespace r1 {
+    //! Internal acquire write lock.
+    // only_speculate == true if we're doing a try_lock, else false.
+    TBB_EXPORT void __TBB_EXPORTED_FUNC acquire_writer(d1::rtm_rw_mutex&, d1::rtm_rw_mutex::scoped_lock&, bool only_speculate = false);
+    //! Internal acquire read lock.
+    // only_speculate == true if we're doing a try_lock, else false.
+    TBB_EXPORT void __TBB_EXPORTED_FUNC acquire_reader(d1::rtm_rw_mutex&, d1::rtm_rw_mutex::scoped_lock&, bool only_speculate = false);
+    //! Internal upgrade reader to become a writer.
+    TBB_EXPORT bool __TBB_EXPORTED_FUNC upgrade(d1::rtm_rw_mutex::scoped_lock&);
+    //! Internal downgrade writer to become a reader.
+    TBB_EXPORT bool __TBB_EXPORTED_FUNC downgrade(d1::rtm_rw_mutex::scoped_lock&);
+    //! Internal try_acquire write lock.
+    TBB_EXPORT bool __TBB_EXPORTED_FUNC try_acquire_writer(d1::rtm_rw_mutex&, d1::rtm_rw_mutex::scoped_lock&);
+    //! Internal try_acquire read lock.
+    TBB_EXPORT bool __TBB_EXPORTED_FUNC try_acquire_reader(d1::rtm_rw_mutex&, d1::rtm_rw_mutex::scoped_lock&);
+    //! Internal release lock.
+    TBB_EXPORT void __TBB_EXPORTED_FUNC release(d1::rtm_rw_mutex::scoped_lock&);
+}
+
+namespace d1 {
+//! Acquire lock on given mutex.
+void rtm_rw_mutex::scoped_lock::acquire(rtm_rw_mutex& m, bool write) {
+    __TBB_ASSERT(!m_mutex, "lock is already acquired");
+    if (write) {
+        r1::acquire_writer(m, *this);
+    } else {
+        r1::acquire_reader(m, *this);
+    }
+}
+
+//! Try acquire lock on given mutex.
+bool rtm_rw_mutex::scoped_lock::try_acquire(rtm_rw_mutex& m, bool write) {
+    __TBB_ASSERT(!m_mutex, "lock is already acquired");
+    if (write) {
+        return r1::try_acquire_writer(m, *this);
+    } else {
+        return r1::try_acquire_reader(m, *this);
+    }
+}
+
+//! Release lock
+void rtm_rw_mutex::scoped_lock::release() {
+    __TBB_ASSERT(m_mutex, "lock is not acquired");
+    __TBB_ASSERT(m_transaction_state != rtm_type::rtm_not_in_mutex, "lock is not acquired");
+    return r1::release(*this);
+}
+
+//! Upgrade reader to become a writer.
+/** Returns whether the upgrade happened without releasing and re-acquiring the lock */
+bool rtm_rw_mutex::scoped_lock::upgrade_to_writer() {
+    __TBB_ASSERT(m_mutex, "lock is not acquired");
+    if (m_transaction_state == rtm_type::rtm_transacting_writer || m_transaction_state == rtm_type::rtm_real_writer) {
+        return true; // Already a writer
+    }
+    return r1::upgrade(*this);
+}
+
+//! Downgrade writer to become a reader.
+bool rtm_rw_mutex::scoped_lock::downgrade_to_reader() {
+    __TBB_ASSERT(m_mutex, "lock is not acquired");
+    if (m_transaction_state == rtm_type::rtm_transacting_reader || m_transaction_state == rtm_type::rtm_real_reader) {
+        return true; // Already a reader
+    }
+    return r1::downgrade(*this);
+}
+
+bool rtm_rw_mutex::scoped_lock::is_writer() const {
+    __TBB_ASSERT(m_mutex, "lock is not acquired");
+    return m_transaction_state == rtm_type::rtm_transacting_writer || m_transaction_state == rtm_type::rtm_real_writer;
+}
 
 #if TBB_USE_PROFILING_TOOLS
-            inline void set_name(rtm_rw_mutex& obj, const char* name) { itt_set_sync_name(&obj, name); }
-#if (_WIN32 || _WIN64)
-            inline void set_name(rtm_rw_mutex& obj, const wchar_t* name) { itt_set_sync_name(&obj, name); }
-#endif// WIN
+inline void set_name(rtm_rw_mutex& obj, const char* name) {
+    itt_set_sync_name(&obj, name);
+}
+#if (_WIN32||_WIN64)
+inline void set_name(rtm_rw_mutex& obj, const wchar_t* name) {
+    itt_set_sync_name(&obj, name);
+}
+#endif // WIN
 #else
-            inline void set_name(rtm_rw_mutex&, const char*) {}
-#if (_WIN32 || _WIN64)
-            inline void set_name(rtm_rw_mutex&, const wchar_t*) {}
-#endif// WIN
+inline void set_name(rtm_rw_mutex&, const char*) {}
+#if (_WIN32||_WIN64)
+inline void set_name(rtm_rw_mutex&, const wchar_t*) {}
+#endif // WIN
 #endif
 
-        }// namespace d1
-    }    // namespace detail
-}// namespace tbb
+} // namespace d1
+} // namespace detail
+} // namespace tbb
 
-#endif// __TBB_detail__rtm_rw_mutex_H
+#endif // __TBB_detail__rtm_rw_mutex_H
diff --git a/external/tbb/include/oneapi/tbb/detail/_scoped_lock.h b/external/tbb/include/oneapi/tbb/detail/_scoped_lock.h
index 58fef663..a49dcdff 100644
--- a/external/tbb/include/oneapi/tbb/detail/_scoped_lock.h
+++ b/external/tbb/include/oneapi/tbb/detail/_scoped_lock.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -18,147 +18,157 @@
 #define __TBB_detail_scoped_lock_H
 
 namespace tbb {
-    namespace detail {
-        namespace d1 {
-
-            // unique_scoped_lock supposes that Mutex operations never throw
-            template <typename Mutex>
-            class unique_scoped_lock {
-                //! Points to currently held Mutex, or NULL if no lock is held.
-                Mutex* m_mutex {};
-
-            public:
-                //! Construct without acquiring a Mutex.
-                constexpr unique_scoped_lock() noexcept : m_mutex(nullptr) {}
-
-                //! Construct and acquire lock on a Mutex.
-                unique_scoped_lock(Mutex& m) { acquire(m); }
-
-                //! No Copy
-                unique_scoped_lock(const unique_scoped_lock&) = delete;
-                unique_scoped_lock& operator=(const unique_scoped_lock&) = delete;
-
-                //! Acquire lock.
-                void acquire(Mutex& m) {
-                    __TBB_ASSERT(m_mutex == nullptr, "The mutex is already acquired");
-                    m_mutex = &m;
-                    m.lock();
-                }
-
-                //! Try acquiring lock (non-blocking)
-                /** Return true if lock acquired; false otherwise. */
-                bool try_acquire(Mutex& m) {
-                    __TBB_ASSERT(m_mutex == nullptr, "The mutex is already acquired");
-                    bool succeed = m.try_lock();
-                    if (succeed) { m_mutex = &m; }
-                    return succeed;
-                }
-
-                //! Release lock
-                void release() {
-                    __TBB_ASSERT(m_mutex, "release on Mutex::unique_scoped_lock that is not holding a lock");
-                    m_mutex->unlock();
-                    m_mutex = nullptr;
-                }
-
-                //! Destroy lock. If holding a lock, releases the lock first.
-                ~unique_scoped_lock() {
-                    if (m_mutex) { release(); }
-                }
-            };
-
-            // rw_scoped_lock supposes that Mutex operations never throw
-            template <typename Mutex>
-            class rw_scoped_lock {
-            public:
-                //! Construct lock that has not acquired a mutex.
-                /** Equivalent to zero-initialization of *this. */
-                constexpr rw_scoped_lock() noexcept : m_mutex(nullptr), m_is_writer(false) {}
-
-                //! Acquire lock on given mutex.
-                rw_scoped_lock(Mutex& m, bool write = true) : m_mutex(nullptr) { acquire(m, write); }
-
-                //! Release lock (if lock is held).
-                ~rw_scoped_lock() {
-                    if (m_mutex) { release(); }
-                }
-
-                //! No Copy
-                rw_scoped_lock(const rw_scoped_lock&) = delete;
-                rw_scoped_lock& operator=(const rw_scoped_lock&) = delete;
-
-                //! Acquire lock on given mutex.
-                void acquire(Mutex& m, bool write = true) {
-                    __TBB_ASSERT(m_mutex == nullptr, "The mutex is already acquired");
-                    m_is_writer = write;
-                    m_mutex = &m;
-                    if (write) {
-                        m_mutex->lock();
-                    } else {
-                        m_mutex->lock_shared();
-                    }
-                }
-
-                //! Try acquire lock on given mutex.
-                bool try_acquire(Mutex& m, bool write = true) {
-                    bool succeed = write ? m.try_lock() : m.try_lock_shared();
-                    if (succeed) {
-                        m_mutex = &m;
-                        m_is_writer = write;
-                    }
-                    return succeed;
-                }
-
-                //! Release lock.
-                void release() {
-                    __TBB_ASSERT(m_mutex != nullptr, "The mutex is not acquired");
-                    Mutex* m = m_mutex;
-                    m_mutex = nullptr;
-
-                    if (m_is_writer) {
-                        m->unlock();
-                    } else {
-                        m->unlock_shared();
-                    }
-                }
-
-                //! Upgrade reader to become a writer.
-                /** Returns whether the upgrade happened without releasing and re-acquiring the lock */
-                bool upgrade_to_writer() {
-                    __TBB_ASSERT(m_mutex != nullptr, "The mutex is not acquired");
-                    if (m_is_writer) {
-                        return true;// Already a writer
-                    }
-                    m_is_writer = true;
-                    return m_mutex->upgrade();
-                }
-
-                //! Downgrade writer to become a reader.
-                bool downgrade_to_reader() {
-                    __TBB_ASSERT(m_mutex != nullptr, "The mutex is not acquired");
-                    if (m_is_writer) {
-                        m_mutex->downgrade();
-                        m_is_writer = false;
-                    }
-                    return true;
-                }
-
-                bool is_writer() const {
-                    __TBB_ASSERT(m_mutex != nullptr, "The mutex is not acquired");
-                    return m_is_writer;
-                }
-
-            protected:
-                //! The pointer to the current mutex that is held, or nullptr if no mutex is held.
-                Mutex* m_mutex {};
-
-                //! If mutex != nullptr, then is_writer is true if holding a writer lock, false if holding a reader lock.
-                /** Not defined if not holding a lock. */
-                bool m_is_writer {};
-            };
-
-        }// namespace d1
-    }    // namespace detail
-}// namespace tbb
-
-#endif// __TBB_detail_scoped_lock_H
+namespace detail {
+namespace d1 {
+
+// unique_scoped_lock supposes that Mutex operations never throw
+template <typename Mutex>
+class unique_scoped_lock {
+    //! Points to currently held Mutex, or nullptr if no lock is held.
+    Mutex* m_mutex{};
+
+public:
+    //! Construct without acquiring a Mutex.
+    constexpr unique_scoped_lock() noexcept : m_mutex(nullptr) {}
+
+    //! Construct and acquire lock on a Mutex.
+    unique_scoped_lock(Mutex& m) {
+        acquire(m);
+    }
+
+    //! No Copy
+    unique_scoped_lock(const unique_scoped_lock&) = delete;
+    unique_scoped_lock& operator=(const unique_scoped_lock&) = delete;
+
+    //! Acquire lock.
+    void acquire(Mutex& m) {
+        __TBB_ASSERT(m_mutex == nullptr, "The mutex is already acquired");
+        m_mutex = &m;
+        m.lock();
+    }
+
+    //! Try acquiring lock (non-blocking)
+    /** Return true if lock acquired; false otherwise. */
+    bool try_acquire(Mutex& m) {
+        __TBB_ASSERT(m_mutex == nullptr, "The mutex is already acquired");
+        bool succeed = m.try_lock();
+        if (succeed) {
+            m_mutex = &m;
+        }
+        return succeed;
+    }
+
+    //! Release lock
+    void release() {
+        __TBB_ASSERT(m_mutex, "release on Mutex::unique_scoped_lock that is not holding a lock");
+        m_mutex->unlock();
+        m_mutex = nullptr;
+    }
+
+    //! Destroy lock. If holding a lock, releases the lock first.
+    ~unique_scoped_lock() {
+        if (m_mutex) {
+            release();
+        }
+    }
+};
+
+// rw_scoped_lock supposes that Mutex operations never throw
+template <typename Mutex>
+class rw_scoped_lock {
+public:
+    //! Construct lock that has not acquired a mutex.
+    /** Equivalent to zero-initialization of *this. */
+    constexpr rw_scoped_lock() noexcept {}
+
+    //! Acquire lock on given mutex.
+    rw_scoped_lock(Mutex& m, bool write = true) {
+        acquire(m, write);
+    }
+
+    //! Release lock (if lock is held).
+    ~rw_scoped_lock() {
+        if (m_mutex) {
+            release();
+        }
+    }
+
+    //! No Copy
+    rw_scoped_lock(const rw_scoped_lock&) = delete;
+    rw_scoped_lock& operator=(const rw_scoped_lock&) = delete;
+
+    //! Acquire lock on given mutex.
+    void acquire(Mutex& m, bool write = true) {
+        __TBB_ASSERT(m_mutex == nullptr, "The mutex is already acquired");
+        m_is_writer = write;
+        m_mutex = &m;
+        if (write) {
+            m_mutex->lock();
+        } else {
+            m_mutex->lock_shared();
+        }
+    }
+
+    //! Try acquire lock on given mutex.
+    bool try_acquire(Mutex& m, bool write = true) {
+        bool succeed = write ? m.try_lock() : m.try_lock_shared();
+        if (succeed) {
+            m_mutex = &m;
+            m_is_writer = write;
+        }
+        return succeed;
+    }
+
+    //! Release lock.
+    void release() {
+        __TBB_ASSERT(m_mutex != nullptr, "The mutex is not acquired");
+        Mutex* m = m_mutex;
+        m_mutex = nullptr;
+
+        if (m_is_writer) {
+            m->unlock();
+        } else {
+            m->unlock_shared();
+        }
+    }
+
+    //! Upgrade reader to become a writer.
+    /** Returns whether the upgrade happened without releasing and re-acquiring the lock */
+    bool upgrade_to_writer() {
+        __TBB_ASSERT(m_mutex != nullptr, "The mutex is not acquired");
+        if (m_is_writer) {
+            return true; // Already a writer
+        }
+        m_is_writer = true;
+        return m_mutex->upgrade();
+    }
+
+    //! Downgrade writer to become a reader.
+    bool downgrade_to_reader() {
+        __TBB_ASSERT(m_mutex != nullptr, "The mutex is not acquired");
+        if (m_is_writer) {
+            m_mutex->downgrade();
+            m_is_writer = false;
+        }
+        return true;
+    }
+
+    bool is_writer() const {
+        __TBB_ASSERT(m_mutex != nullptr, "The mutex is not acquired");
+        return m_is_writer;
+    }
+
+protected:
+    //! The pointer to the current mutex that is held, or nullptr if no mutex is held.
+    Mutex* m_mutex {nullptr};
+
+    //! If mutex != nullptr, then is_writer is true if holding a writer lock, false if holding a reader lock.
+    /** Not defined if not holding a lock. */
+    bool m_is_writer {false};
+};
+
+} // namespace d1
+} // namespace detail
+} // namespace tbb
+
+#endif // __TBB_detail_scoped_lock_H
diff --git a/external/tbb/include/oneapi/tbb/detail/_segment_table.h b/external/tbb/include/oneapi/tbb/detail/_segment_table.h
index 19ec47b0..7fbf1cc0 100644
--- a/external/tbb/include/oneapi/tbb/detail/_segment_table.h
+++ b/external/tbb/include/oneapi/tbb/detail/_segment_table.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -17,548 +17,565 @@
 #ifndef __TBB_detail__segment_table_H
 #define __TBB_detail__segment_table_H
 
-#include "_allocator_traits.h"
-#include "_assert.h"
 #include "_config.h"
-#include "_exception.h"
+#include "_allocator_traits.h"
 #include "_template_helpers.h"
 #include "_utils.h"
+#include "_assert.h"
+#include "_exception.h"
 #include <atomic>
-#include <cstring>
-#include <memory>
 #include <type_traits>
+#include <memory>
+#include <cstring>
 
 #if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
 #pragma warning(push)
-#pragma warning(disable : 4127)// warning C4127: conditional expression is constant
+#pragma warning(disable: 4127) // warning C4127: conditional expression is constant
 #endif
 
 namespace tbb {
-    namespace detail {
-        namespace d1 {
-
-            template <typename T, typename Allocator, typename DerivedType,
-                      std::size_t PointersPerEmbeddedTable>
-            class segment_table {
-            public:
-                using value_type = T;
-                using segment_type = T*;
-                using atomic_segment = std::atomic<segment_type>;
-                using segment_table_type = atomic_segment*;
-
-                using size_type = std::size_t;
-                using segment_index_type = std::size_t;
-
-                using allocator_type = Allocator;
-
-                using allocator_traits_type = tbb::detail::allocator_traits<allocator_type>;
-                using segment_table_allocator_type =
-                        typename allocator_traits_type::template rebind_alloc<atomic_segment>;
-
-            protected:
-                using segment_table_allocator_traits
-                        = tbb::detail::allocator_traits<segment_table_allocator_type>;
-                using derived_type = DerivedType;
-
-                static constexpr size_type pointers_per_embedded_table = PointersPerEmbeddedTable;
-                static constexpr size_type pointers_per_long_table = sizeof(size_type) * 8;
-
-            public:
-                segment_table(const allocator_type& alloc = allocator_type())
-                    : my_segment_table_allocator(alloc), my_segment_table(my_embedded_table),
-                      my_first_block {}, my_size {}, my_segment_table_allocation_failed {} {
-                    zero_table(my_embedded_table, pointers_per_embedded_table);
-                }
-
-                segment_table(const segment_table& other)
-                    : my_segment_table_allocator(
-                            segment_table_allocator_traits::select_on_container_copy_construction(
-                                    other.my_segment_table_allocator)),
-                      my_segment_table(my_embedded_table), my_first_block {}, my_size {},
-                      my_segment_table_allocation_failed {} {
-                    zero_table(my_embedded_table, pointers_per_embedded_table);
-                    try_call([&] {
-                        internal_transfer(other, copy_segment_body_type {*this});
-                    }).on_exception([&] { clear(); });
-                }
-
-                segment_table(const segment_table& other, const allocator_type& alloc)
-                    : my_segment_table_allocator(alloc), my_segment_table(my_embedded_table),
-                      my_first_block {}, my_size {}, my_segment_table_allocation_failed {} {
-                    zero_table(my_embedded_table, pointers_per_embedded_table);
-                    try_call([&] {
-                        internal_transfer(other, copy_segment_body_type {*this});
-                    }).on_exception([&] { clear(); });
-                }
-
-                segment_table(segment_table&& other)
-                    : my_segment_table_allocator(std::move(other.my_segment_table_allocator)),
-                      my_segment_table(my_embedded_table), my_first_block {}, my_size {},
-                      my_segment_table_allocation_failed {} {
-                    zero_table(my_embedded_table, pointers_per_embedded_table);
-                    internal_move(std::move(other));
-                }
-
-                segment_table(segment_table&& other, const allocator_type& alloc)
-                    : my_segment_table_allocator(alloc), my_segment_table(my_embedded_table),
-                      my_first_block {}, my_size {}, my_segment_table_allocation_failed {} {
-                    zero_table(my_embedded_table, pointers_per_embedded_table);
-                    using is_equal_type = typename segment_table_allocator_traits::is_always_equal;
-                    internal_move_construct_with_allocator(std::move(other), alloc, is_equal_type());
-                }
-
-                ~segment_table() { clear(); }
-
-                segment_table& operator=(const segment_table& other) {
-                    if (this != &other) {
-                        copy_assign_allocators(my_segment_table_allocator, other.my_segment_table_allocator);
-                        internal_transfer(other, copy_segment_body_type {*this});
-                    }
-                    return *this;
-                }
-
-                segment_table&
-                operator=(segment_table&& other) noexcept(derived_type::is_noexcept_assignment) {
-                    using pocma_type =
-                            typename segment_table_allocator_traits::propagate_on_container_move_assignment;
-                    using is_equal_type = typename segment_table_allocator_traits::is_always_equal;
-
-                    if (this != &other) {
-                        move_assign_allocators(my_segment_table_allocator, other.my_segment_table_allocator);
-                        internal_move_assign(std::move(other),
-                                             tbb::detail::disjunction<is_equal_type, pocma_type>());
-                    }
-                    return *this;
-                }
-
-                void swap(segment_table& other) noexcept(derived_type::is_noexcept_swap) {
-                    using is_equal_type = typename segment_table_allocator_traits::is_always_equal;
-                    using pocs_type = typename segment_table_allocator_traits::propagate_on_container_swap;
-
-                    if (this != &other) {
-                        swap_allocators(my_segment_table_allocator, other.my_segment_table_allocator);
-                        internal_swap(other, tbb::detail::disjunction<is_equal_type, pocs_type>());
-                    }
-                }
-
-                segment_type get_segment(segment_index_type index) const {
-                    return get_table()[index] + segment_base(index);
-                }
-
-                value_type& operator[](size_type index) { return internal_subscript<true>(index); }
-
-                const value_type& operator[](size_type index) const {
-                    return const_cast<segment_table*>(this)->internal_subscript<true>(index);
-                }
-
-                const segment_table_allocator_type& get_allocator() const {
-                    return my_segment_table_allocator;
-                }
-
-                segment_table_allocator_type& get_allocator() { return my_segment_table_allocator; }
-
-                void enable_segment(segment_type& segment, segment_table_type table,
-                                    segment_index_type seg_index, size_type index) {
-                    // Allocate new segment
-                    segment_type new_segment = self()->create_segment(table, seg_index, index);
-                    if (new_segment != nullptr) {
-                        // Store (new_segment - segment_base) into the segment table to allow access to the table by index via
-                        // my_segment_table[segment_index_of(index)][index]
-                        segment_type disabled_segment = nullptr;
-                        if (!table[seg_index].compare_exchange_strong(
-                                    disabled_segment, new_segment - segment_base(seg_index))) {
-                            // compare_exchange failed => some other thread has already enabled this segment
-                            // Deallocate the memory
-                            self()->deallocate_segment(new_segment, seg_index);
-                        }
-                    }
-
-                    segment = table[seg_index].load(std::memory_order_acquire);
-                    __TBB_ASSERT(
-                            segment != nullptr,
-                            "If create_segment returned nullptr, the element should be stored in the table");
-                }
-
-                void delete_segment(segment_index_type seg_index) {
-                    segment_type disabled_segment = nullptr;
-                    // Set the pointer to the segment to NULL in the table
-                    segment_type segment_to_delete = get_table()[seg_index].exchange(disabled_segment);
-                    if (segment_to_delete == segment_allocation_failure_tag) { return; }
-
-                    segment_to_delete += segment_base(seg_index);
-
-                    // Deallocate the segment
-                    self()->destroy_segment(segment_to_delete, seg_index);
-                }
-
-                size_type number_of_segments(segment_table_type table) const {
-                    // Check for an active table, if it is embedded table - return the number of embedded segments
-                    // Otherwise - return the maximum number of segments
-                    return table == my_embedded_table ? pointers_per_embedded_table : pointers_per_long_table;
-                }
-
-                size_type capacity() const noexcept {
-                    segment_table_type table = get_table();
-                    size_type num_segments = number_of_segments(table);
-                    for (size_type seg_index = 0; seg_index < num_segments; ++seg_index) {
-                        // Check if the pointer is valid (allocated)
-                        if (table[seg_index].load(std::memory_order_relaxed)
-                            <= segment_allocation_failure_tag) {
-                            return segment_base(seg_index);
-                        }
-                    }
-                    return segment_base(num_segments);
-                }
-
-                size_type find_last_allocated_segment(segment_table_type table) const noexcept {
-                    size_type end = 0;
-                    size_type num_segments = number_of_segments(table);
-                    for (size_type seg_index = 0; seg_index < num_segments; ++seg_index) {
-                        // Check if the pointer is valid (allocated)
-                        if (table[seg_index].load(std::memory_order_relaxed)
-                            > segment_allocation_failure_tag) {
-                            end = seg_index + 1;
-                        }
-                    }
-                    return end;
-                }
-
-                void reserve(size_type n) {
-                    if (n > allocator_traits_type::max_size(my_segment_table_allocator)) {
-                        throw_exception(exception_id::reservation_length_error);
-                    }
-
-                    size_type size = my_size.load(std::memory_order_relaxed);
-                    segment_index_type start_seg_idx = size == 0 ? 0 : segment_index_of(size - 1) + 1;
-                    for (segment_index_type seg_idx = start_seg_idx; segment_base(seg_idx) < n; ++seg_idx) {
-                        size_type first_index = segment_base(seg_idx);
-                        internal_subscript<true>(first_index);
-                    }
-                }
-
-                void clear() {
-                    clear_segments();
-                    clear_table();
-                    my_size.store(0, std::memory_order_relaxed);
-                    my_first_block.store(0, std::memory_order_relaxed);
-                }
-
-                void clear_segments() {
-                    segment_table_type current_segment_table = get_table();
-                    for (size_type i = number_of_segments(current_segment_table); i != 0; --i) {
-                        if (current_segment_table[i - 1].load(std::memory_order_relaxed) != nullptr) {
-                            // If the segment was enabled - disable and deallocate it
-                            delete_segment(i - 1);
-                        }
-                    }
-                }
-
-                void clear_table() {
-                    segment_table_type current_segment_table = get_table();
-                    if (current_segment_table != my_embedded_table) {
-                        // If the active table is not the embedded one - deallocate the active table
-                        for (size_type i = 0; i != pointers_per_long_table; ++i) {
-                            segment_table_allocator_traits::destroy(my_segment_table_allocator,
-                                                                    &current_segment_table[i]);
-                        }
-
-                        segment_table_allocator_traits::deallocate(
-                                my_segment_table_allocator, current_segment_table, pointers_per_long_table);
-                        my_segment_table.store(my_embedded_table, std::memory_order_relaxed);
-                        zero_table(my_embedded_table, pointers_per_embedded_table);
+namespace detail {
+namespace d1 {
+
+template <typename T, typename Allocator, typename DerivedType, std::size_t PointersPerEmbeddedTable>
+class segment_table {
+public:
+    using value_type = T;
+    using segment_type = T*;
+    using atomic_segment = std::atomic<segment_type>;
+    using segment_table_type = atomic_segment*;
+
+    using size_type = std::size_t;
+    using segment_index_type = std::size_t;
+
+    using allocator_type = Allocator;
+
+    using allocator_traits_type = tbb::detail::allocator_traits<allocator_type>;
+    using segment_table_allocator_type = typename allocator_traits_type::template rebind_alloc<atomic_segment>;
+protected:
+    using segment_table_allocator_traits = tbb::detail::allocator_traits<segment_table_allocator_type>;
+    using derived_type = DerivedType;
+
+    static constexpr size_type pointers_per_embedded_table = PointersPerEmbeddedTable;
+    static constexpr size_type pointers_per_long_table = sizeof(size_type) * 8;
+public:
+    segment_table( const allocator_type& alloc = allocator_type() )
+        : my_segment_table_allocator(alloc), my_segment_table(nullptr)
+        , my_first_block{}, my_size{}, my_segment_table_allocation_failed{}
+    {
+        my_segment_table.store(my_embedded_table, std::memory_order_relaxed);
+        zero_table(my_embedded_table, pointers_per_embedded_table);
+    }
+
+    segment_table( const segment_table& other )
+        : my_segment_table_allocator(segment_table_allocator_traits::
+                                     select_on_container_copy_construction(other.my_segment_table_allocator))
+        , my_segment_table(nullptr), my_first_block{}, my_size{}, my_segment_table_allocation_failed{}
+    {
+        my_segment_table.store(my_embedded_table, std::memory_order_relaxed);
+        zero_table(my_embedded_table, pointers_per_embedded_table);
+        try_call( [&] {
+            internal_transfer(other, copy_segment_body_type{*this});
+        } ).on_exception( [&] {
+            clear();
+        });
+    }
+
+    segment_table( const segment_table& other, const allocator_type& alloc )
+        : my_segment_table_allocator(alloc), my_segment_table(nullptr)
+        , my_first_block{}, my_size{}, my_segment_table_allocation_failed{}
+    {
+        my_segment_table.store(my_embedded_table, std::memory_order_relaxed);
+        zero_table(my_embedded_table, pointers_per_embedded_table);
+        try_call( [&] {
+            internal_transfer(other, copy_segment_body_type{*this});
+        } ).on_exception( [&] {
+            clear();
+        });
+    }
+
+    segment_table( segment_table&& other )
+        : my_segment_table_allocator(std::move(other.my_segment_table_allocator)), my_segment_table(nullptr)
+        , my_first_block{}, my_size{}, my_segment_table_allocation_failed{}
+    {
+        my_segment_table.store(my_embedded_table, std::memory_order_relaxed);
+        zero_table(my_embedded_table, pointers_per_embedded_table);
+        internal_move(std::move(other));
+    }
+
+    segment_table( segment_table&& other, const allocator_type& alloc )
+        : my_segment_table_allocator(alloc), my_segment_table(nullptr), my_first_block{}
+        , my_size{}, my_segment_table_allocation_failed{}
+    {
+        my_segment_table.store(my_embedded_table, std::memory_order_relaxed);
+        zero_table(my_embedded_table, pointers_per_embedded_table);
+        using is_equal_type = typename segment_table_allocator_traits::is_always_equal;
+        internal_move_construct_with_allocator(std::move(other), alloc, is_equal_type());
+    }
+
+    ~segment_table() {
+        clear();
+    }
+
+    segment_table& operator=( const segment_table& other ) {
+        if (this != &other) {
+            copy_assign_allocators(my_segment_table_allocator, other.my_segment_table_allocator);
+            internal_transfer(other, copy_segment_body_type{*this});
+        }
+        return *this;
+    }
+
+    segment_table& operator=( segment_table&& other )
+        noexcept(derived_type::is_noexcept_assignment)
+    {
+        using pocma_type = typename segment_table_allocator_traits::propagate_on_container_move_assignment;
+        using is_equal_type = typename segment_table_allocator_traits::is_always_equal;
+
+        if (this != &other) {
+            move_assign_allocators(my_segment_table_allocator, other.my_segment_table_allocator);
+            internal_move_assign(std::move(other), tbb::detail::disjunction<is_equal_type, pocma_type>());
+        }
+        return *this;
+    }
+
+    void swap( segment_table& other )
+        noexcept(derived_type::is_noexcept_swap)
+    {
+        using is_equal_type = typename segment_table_allocator_traits::is_always_equal;
+        using pocs_type = typename segment_table_allocator_traits::propagate_on_container_swap;
+
+        if (this != &other) {
+            swap_allocators(my_segment_table_allocator, other.my_segment_table_allocator);
+            internal_swap(other, tbb::detail::disjunction<is_equal_type, pocs_type>());
+        }
+    }
+
+    segment_type get_segment( segment_index_type index ) const {
+        return get_table()[index] + segment_base(index);
+    }
+
+    value_type& operator[]( size_type index ) {
+        return internal_subscript<true>(index);
+    }
+
+    const value_type& operator[]( size_type index ) const {
+        return const_cast<segment_table*>(this)->internal_subscript<true>(index);
+    }
+
+    const segment_table_allocator_type& get_allocator() const {
+        return my_segment_table_allocator;
+    }
+
+    segment_table_allocator_type& get_allocator() {
+        return my_segment_table_allocator;
+    }
+
+    void enable_segment( segment_type& segment, segment_table_type table, segment_index_type seg_index, size_type index ) {
+        // Allocate new segment
+        segment_type new_segment = self()->create_segment(table, seg_index, index);
+        if (new_segment != nullptr) {
+            // Store (new_segment - segment_base) into the segment table to allow access to the table by index via
+            // my_segment_table[segment_index_of(index)][index]
+            segment_type disabled_segment = nullptr;
+            if (!table[seg_index].compare_exchange_strong(disabled_segment, new_segment - segment_base(seg_index))) {
+                // compare_exchange failed => some other thread has already enabled this segment
+                // Deallocate the memory
+                self()->deallocate_segment(new_segment, seg_index);
+            }
+        }
+
+        segment = table[seg_index].load(std::memory_order_acquire);
+        __TBB_ASSERT(segment != nullptr, "If create_segment returned nullptr, the element should be stored in the table");
+    }
+
+    void delete_segment( segment_index_type seg_index ) {
+        segment_type segment_to_delete = self()->nullify_segment(get_table(), seg_index);
+        if (segment_to_delete == segment_allocation_failure_tag) {
+            return;
+        }
+
+        segment_to_delete += segment_base(seg_index);
+
+        // Deallocate the segment
+        self()->destroy_segment(segment_to_delete, seg_index);
+    }
+
+    size_type number_of_segments( segment_table_type table ) const {
+        // Check for an active table, if it is embedded table - return the number of embedded segments
+        // Otherwise - return the maximum number of segments
+        return table == my_embedded_table ? pointers_per_embedded_table : pointers_per_long_table;
+    }
+
+    size_type capacity() const noexcept {
+        segment_table_type table = get_table();
+        size_type num_segments = number_of_segments(table);
+        for (size_type seg_index = 0; seg_index < num_segments; ++seg_index) {
+            // Check if the pointer is valid (allocated)
+            if (table[seg_index].load(std::memory_order_relaxed) <= segment_allocation_failure_tag) {
+                return segment_base(seg_index);
+            }
+        }
+        return segment_base(num_segments);
+    }
+
+    size_type find_last_allocated_segment( segment_table_type table ) const noexcept {
+        size_type end = 0;
+        size_type num_segments = number_of_segments(table);
+        for (size_type seg_index = 0; seg_index < num_segments; ++seg_index) {
+            // Check if the pointer is valid (allocated)
+            if (table[seg_index].load(std::memory_order_relaxed) > segment_allocation_failure_tag) {
+                end = seg_index + 1;
+            }
+        }
+        return end;
+    }
+
+    void reserve( size_type n ) {
+        if (n > allocator_traits_type::max_size(my_segment_table_allocator)) {
+            throw_exception(exception_id::reservation_length_error);
+        }
+
+        size_type size = my_size.load(std::memory_order_relaxed);
+        segment_index_type start_seg_idx = size == 0 ? 0 : segment_index_of(size - 1) + 1;
+        for (segment_index_type seg_idx = start_seg_idx; segment_base(seg_idx) < n; ++seg_idx) {
+                size_type first_index = segment_base(seg_idx);
+                internal_subscript<true>(first_index);
+        }
+    }
+
+    void clear() {
+        clear_segments();
+        clear_table();
+        my_size.store(0, std::memory_order_relaxed);
+        my_first_block.store(0, std::memory_order_relaxed);
+    }
+
+    void clear_segments() {
+        segment_table_type current_segment_table = get_table();
+        for (size_type i = number_of_segments(current_segment_table); i != 0; --i) {
+            if (current_segment_table[i - 1].load(std::memory_order_relaxed) != nullptr) {
+                // If the segment was enabled - disable and deallocate it
+                delete_segment(i - 1);
+            }
+        }
+    }
+
+    void destroy_and_deallocate_table(segment_table_type table, size_type num_segments) {
+        auto& alloc = get_allocator();
+        for (size_type seg_idx = 0; seg_idx < num_segments; ++seg_idx) {
+            segment_table_allocator_traits::destroy(alloc, &table[seg_idx]);
+        }
+        segment_table_allocator_traits::deallocate(alloc, table, num_segments);
+    }
+
+    void clear_table() {
+        segment_table_type current_segment_table = get_table();
+        if (current_segment_table != my_embedded_table) {
+            // If the active table is not the embedded one - deallocate the active table
+            destroy_and_deallocate_table(current_segment_table, pointers_per_long_table);
+            my_segment_table.store(my_embedded_table, std::memory_order_relaxed);
+            zero_table(my_embedded_table, pointers_per_embedded_table);
+        }
+    }
+
+    void extend_table_if_necessary(segment_table_type& table, size_type start_index, size_type end_index) {
+        // Extend segment table if an active table is an embedded one and the requested index is
+        // outside it
+        if (table == my_embedded_table && end_index > embedded_table_size) {
+            if (start_index <= embedded_table_size) {
+                // More than one thread can get here: the one that has assigned the first block and
+                // is in the process of allocating it now, and the one that saw the first block has
+                // been assigned already, but not yet allocated. This latter thread decides not to
+                // wait for the first one and extend the table itself.
+                try_call([&] {
+                    segment_table_type new_table =
+                        self()->allocate_long_table(my_embedded_table, start_index);
+                    // It is possible that the table was extended by the thread that allocated first
+                    // block. In this case, the below CAS fails and re-reads the new table pointer.
+                    if (my_segment_table.compare_exchange_strong(
+                            table, new_table,
+                            /*memory order in case of a success*/std::memory_order_release,
+                            /*memory order in case of a failure*/std::memory_order_acquire))
+                    {
+                        // CAS was successful, update the local table pointer with now actual
+                        table = new_table;
+                    } else if (new_table) {
+                        // Other thread was the first to replace the segment table. Current thread's
+                        // table is not needed anymore, so destroying it.
+                        destroy_and_deallocate_table(new_table, pointers_per_long_table);
                     }
-                }
-
-                void extend_table_if_necessary(segment_table_type& table, size_type start_index,
-                                               size_type end_index) {
-                    // extend_segment_table if an active table is an embedded table
-                    // and the requested index is not in the embedded table
-                    if (table == my_embedded_table && end_index > embedded_table_size) {
-                        if (start_index <= embedded_table_size) {
-                            try_call([&] {
-                                table = self()->allocate_long_table(my_embedded_table, start_index);
-                                // It is possible that the table was extended by the thread that allocated first_block.
-                                // In this case it is necessary to re-read the current table.
-
-                                if (table) {
-                                    my_segment_table.store(table, std::memory_order_release);
-                                } else {
-                                    table = my_segment_table.load(std::memory_order_acquire);
-                                }
-                            }).on_exception([&] {
-                                my_segment_table_allocation_failed.store(true, std::memory_order_relaxed);
-                            });
-                        } else {
-                            atomic_backoff backoff;
-                            do {
-                                if (my_segment_table_allocation_failed.load(std::memory_order_relaxed)) {
-                                    throw_exception(exception_id::bad_alloc);
-                                }
-                                backoff.pause();
-                                table = my_segment_table.load(std::memory_order_acquire);
-                            } while (table == my_embedded_table);
-                        }
-                    }
-                }
-
-                // Return the segment where index is stored
-                static constexpr segment_index_type segment_index_of(size_type index) {
-                    return size_type(tbb::detail::log2(uintptr_t(index | 1)));
-                }
-
-                // Needed to calculate the offset in segment
-                static constexpr size_type segment_base(size_type index) {
-                    return size_type(1) << index & ~size_type(1);
-                }
-
-                // Return size of the segment
-                static constexpr size_type segment_size(size_type index) {
-                    return index == 0 ? 2 : size_type(1) << index;
-                }
-
-            private:
-                derived_type* self() { return static_cast<derived_type*>(this); }
-
-                struct copy_segment_body_type {
-                    void operator()(segment_index_type index, segment_type from, segment_type to) const {
-                        my_instance.self()->copy_segment(index, from, to);
-                    }
-                    segment_table& my_instance;
-                };
-
-                struct move_segment_body_type {
-                    void operator()(segment_index_type index, segment_type from, segment_type to) const {
-                        my_instance.self()->move_segment(index, from, to);
-                    }
-                    segment_table& my_instance;
-                };
-
-                // Transgers all segments from the other table
-                template <typename TransferBody>
-                void internal_transfer(const segment_table& other, TransferBody transfer_segment) {
-                    static_cast<derived_type*>(this)->destroy_elements();
-
-                    assign_first_block_if_necessary(other.my_first_block.load(std::memory_order_relaxed));
-                    my_size.store(other.my_size.load(std::memory_order_relaxed), std::memory_order_relaxed);
-
-                    segment_table_type other_table = other.get_table();
-                    size_type end_segment_size = segment_size(other.find_last_allocated_segment(other_table));
-
-                    // If an exception occurred in other, then the size may be greater than the size of the end segment.
-                    size_type other_size = end_segment_size < other.my_size.load(std::memory_order_relaxed)
-                                                   ? other.my_size.load(std::memory_order_relaxed)
-                                                   : end_segment_size;
-                    other_size = my_segment_table_allocation_failed ? embedded_table_size : other_size;
-
-                    for (segment_index_type i = 0; segment_base(i) < other_size; ++i) {
-                        // If the segment in other table is enabled - transfer it
-                        if (other_table[i].load(std::memory_order_relaxed)
-                            == segment_allocation_failure_tag) {
-                            my_size = segment_base(i);
-                            break;
-                        } else if (other_table[i].load(std::memory_order_relaxed) != nullptr) {
-                            internal_subscript<true>(segment_base(i));
-                            transfer_segment(
-                                    i, other.get_table()[i].load(std::memory_order_relaxed) + segment_base(i),
-                                    get_table()[i].load(std::memory_order_relaxed) + segment_base(i));
-                        }
-                    }
-                }
-
-                // Moves the other segment table
-                // Only equal allocators are allowed
-                void internal_move(segment_table&& other) {
-                    // NOTE: allocators should be equal
-                    clear();
-                    my_first_block.store(other.my_first_block.load(std::memory_order_relaxed),
-                                         std::memory_order_relaxed);
-                    my_size.store(other.my_size.load(std::memory_order_relaxed), std::memory_order_relaxed);
-                    // If an active table in other is embedded - restore all of the embedded segments
-                    if (other.get_table() == other.my_embedded_table) {
-                        for (size_type i = 0; i != pointers_per_embedded_table; ++i) {
-                            segment_type other_segment
-                                    = other.my_embedded_table[i].load(std::memory_order_relaxed);
-                            my_embedded_table[i].store(other_segment, std::memory_order_relaxed);
-                            other.my_embedded_table[i].store(nullptr, std::memory_order_relaxed);
-                        }
-                        my_segment_table.store(my_embedded_table, std::memory_order_relaxed);
-                    } else {
-                        my_segment_table.store(other.my_segment_table, std::memory_order_relaxed);
-                        other.my_segment_table.store(other.my_embedded_table, std::memory_order_relaxed);
-                        zero_table(other.my_embedded_table, pointers_per_embedded_table);
-                    }
-                    other.my_size.store(0, std::memory_order_relaxed);
-                }
-
-                // Move construct the segment table with the allocator object
-                // if any instances of allocator_type are always equal
-                void internal_move_construct_with_allocator(segment_table&& other, const allocator_type&,
-                                                            /*is_always_equal = */ std::true_type) {
-                    internal_move(std::move(other));
-                }
-
-                // Move construct the segment table with the allocator object
-                // if any instances of allocator_type are always equal
-                void internal_move_construct_with_allocator(segment_table&& other,
-                                                            const allocator_type& alloc,
-                                                            /*is_always_equal = */ std::false_type) {
-                    if (other.my_segment_table_allocator == alloc) {
-                        // If allocators are equal - restore pointers
-                        internal_move(std::move(other));
-                    } else {
-                        // If allocators are not equal - perform per element move with reallocation
-                        try_call([&] {
-                            internal_transfer(other, move_segment_body_type {*this});
-                        }).on_exception([&] { clear(); });
-                    }
-                }
-
-                // Move assigns the segment table to other is any instances of allocator_type are always equal
-                // or propagate_on_container_move_assignment is true
-                void internal_move_assign(segment_table&& other,
-                                          /*is_always_equal || POCMA = */ std::true_type) {
-                    internal_move(std::move(other));
-                }
-
-                // Move assigns the segment table to other is any instances of allocator_type are not always equal
-                // and propagate_on_container_move_assignment is false
-                void internal_move_assign(segment_table&& other,
-                                          /*is_always_equal || POCMA = */ std::false_type) {
-                    if (my_segment_table_allocator == other.my_segment_table_allocator) {
-                        // If allocators are equal - restore pointers
-                        internal_move(std::move(other));
-                    } else {
-                        // If allocators are not equal - perform per element move with reallocation
-                        internal_transfer(other, move_segment_body_type {*this});
-                    }
-                }
-
-                // Swaps two segment tables if any instances of allocator_type are always equal
-                // or propagate_on_container_swap is true
-                void internal_swap(segment_table& other, /*is_always_equal || POCS = */ std::true_type) {
-                    internal_swap_fields(other);
-                }
-
-                // Swaps two segment tables if any instances of allocator_type are not always equal
-                // and propagate_on_container_swap is false
-                // According to the C++ standard, swapping of two containers with unequal allocators
-                // is an undefined behavior scenario
-                void internal_swap(segment_table& other, /*is_always_equal || POCS = */ std::false_type) {
-                    __TBB_ASSERT(my_segment_table_allocator == other.my_segment_table_allocator,
-                                 "Swapping with unequal allocators is not allowed");
-                    internal_swap_fields(other);
-                }
-
-                void internal_swap_fields(segment_table& other) {
-                    // If an active table in either *this segment table or other is an embedded one - swaps the embedded tables
-                    if (get_table() == my_embedded_table || other.get_table() == other.my_embedded_table) {
-
-                        for (size_type i = 0; i != pointers_per_embedded_table; ++i) {
-                            segment_type current_segment
-                                    = my_embedded_table[i].load(std::memory_order_relaxed);
-                            segment_type other_segment
-                                    = other.my_embedded_table[i].load(std::memory_order_relaxed);
-
-                            my_embedded_table[i].store(other_segment, std::memory_order_relaxed);
-                            other.my_embedded_table[i].store(current_segment, std::memory_order_relaxed);
-                        }
-                    }
-
-                    segment_table_type current_segment_table = get_table();
-                    segment_table_type other_segment_table = other.get_table();
-
-                    // If an active table is an embedded one -
-                    // store an active table in other to the embedded one from other
-                    if (current_segment_table == my_embedded_table) {
-                        other.my_segment_table.store(other.my_embedded_table, std::memory_order_relaxed);
-                    } else {
-                        // Otherwise - store it to the active segment table
-                        other.my_segment_table.store(current_segment_table, std::memory_order_relaxed);
-                    }
-
-                    // If an active table in other segment table is an embedded one -
-                    // store an active table in other to the embedded one from *this
-                    if (other_segment_table == other.my_embedded_table) {
-                        my_segment_table.store(my_embedded_table, std::memory_order_relaxed);
-                    } else {
-                        // Otherwise - store it to the active segment table in other
-                        my_segment_table.store(other_segment_table, std::memory_order_relaxed);
-                    }
-                    auto first_block = other.my_first_block.load(std::memory_order_relaxed);
-                    other.my_first_block.store(my_first_block.load(std::memory_order_relaxed),
-                                               std::memory_order_relaxed);
-                    my_first_block.store(first_block, std::memory_order_relaxed);
-
-                    auto size = other.my_size.load(std::memory_order_relaxed);
-                    other.my_size.store(my_size.load(std::memory_order_relaxed), std::memory_order_relaxed);
-                    my_size.store(size, std::memory_order_relaxed);
-                }
-
-            protected:
-                // A flag indicates that an exception was throws during segment allocations
-                const segment_type segment_allocation_failure_tag = reinterpret_cast<segment_type>(1);
-                static constexpr size_type embedded_table_size = segment_size(pointers_per_embedded_table);
-
-                template <bool allow_out_of_range_access>
-                value_type& internal_subscript(size_type index) {
-                    segment_index_type seg_index = segment_index_of(index);
-                    segment_table_type table = my_segment_table.load(std::memory_order_acquire);
-                    segment_type segment = nullptr;
-
-                    if (allow_out_of_range_access) {
-                        if (derived_type::allow_table_extending) {
-                            extend_table_if_necessary(table, index, index + 1);
-                        }
-
-                        segment = table[seg_index].load(std::memory_order_acquire);
-                        // If the required segment is disabled - enable it
-                        if (segment == nullptr) { enable_segment(segment, table, seg_index, index); }
-                        // Check if an exception was thrown during segment allocation
-                        if (segment == segment_allocation_failure_tag) {
-                            throw_exception(exception_id::bad_alloc);
-                        }
-                    } else {
-                        segment = table[seg_index].load(std::memory_order_acquire);
-                    }
-                    __TBB_ASSERT(segment != nullptr, nullptr);
-
-                    return segment[index];
-                }
-
-                void assign_first_block_if_necessary(segment_index_type index) {
-                    size_type zero = 0;
-                    if (this->my_first_block.load(std::memory_order_relaxed) == zero) {
-                        this->my_first_block.compare_exchange_strong(zero, index);
-                    }
-                }
-
-                void zero_table(segment_table_type table, size_type count) {
-                    for (size_type i = 0; i != count; ++i) {
-                        table[i].store(nullptr, std::memory_order_relaxed);
+                }).on_exception([&] {
+                    my_segment_table_allocation_failed.store(true, std::memory_order_relaxed);
+                });
+            } else {
+                atomic_backoff backoff;
+                do {
+                    if (my_segment_table_allocation_failed.load(std::memory_order_relaxed)) {
+                        throw_exception(exception_id::bad_alloc);
                     }
-                }
-
-                segment_table_type get_table() const {
-                    return my_segment_table.load(std::memory_order_acquire);
-                }
-
-                segment_table_allocator_type my_segment_table_allocator;
-                std::atomic<segment_table_type> my_segment_table;
-                atomic_segment my_embedded_table[pointers_per_embedded_table];
-                // Number of segments in first block
-                std::atomic<size_type> my_first_block;
-                // Number of elements in table
-                std::atomic<size_type> my_size;
-                // Flag to indicate failed extend table
-                std::atomic<bool> my_segment_table_allocation_failed;
-            };// class segment_table
-
-        }// namespace d1
-    }    // namespace detail
-}// namespace tbb
+                    backoff.pause();
+                    table = my_segment_table.load(std::memory_order_acquire);
+                } while (table == my_embedded_table);
+            }
+        }
+    }
+
+    // Return the segment where index is stored
+    static constexpr segment_index_type segment_index_of( size_type index ) {
+        return size_type(tbb::detail::log2(uintptr_t(index|1)));
+    }
+
+    // Needed to calculate the offset in segment
+    static constexpr size_type segment_base( size_type index ) {
+        return size_type(1) << index & ~size_type(1);
+    }
+
+    // Return size of the segment
+    static constexpr size_type segment_size( size_type index ) {
+        return index == 0 ? 2 : size_type(1) << index;
+    }
+
+private:
+
+    derived_type* self() {
+        return static_cast<derived_type*>(this);
+    }
+
+    struct copy_segment_body_type {
+        void operator()( segment_index_type index, segment_type from, segment_type to ) const {
+            my_instance.self()->copy_segment(index, from, to);
+        }
+        segment_table& my_instance;
+    };
+
+    struct move_segment_body_type {
+        void operator()( segment_index_type index, segment_type from, segment_type to ) const {
+            my_instance.self()->move_segment(index, from, to);
+        }
+        segment_table& my_instance;
+    };
+
+    // Transgers all segments from the other table
+    template <typename TransferBody>
+    void internal_transfer( const segment_table& other, TransferBody transfer_segment ) {
+        static_cast<derived_type*>(this)->destroy_elements();
+
+        assign_first_block_if_necessary(other.my_first_block.load(std::memory_order_relaxed));
+        my_size.store(other.my_size.load(std::memory_order_relaxed), std::memory_order_relaxed);
+
+        segment_table_type other_table = other.get_table();
+        size_type end_segment_size = segment_size(other.find_last_allocated_segment(other_table));
+
+        // If an exception occurred in other, then the size may be greater than the size of the end segment.
+        size_type other_size = end_segment_size < other.my_size.load(std::memory_order_relaxed) ?
+            other.my_size.load(std::memory_order_relaxed) : end_segment_size;
+        other_size = my_segment_table_allocation_failed ? embedded_table_size : other_size;
+
+        for (segment_index_type i = 0; segment_base(i) < other_size; ++i) {
+            // If the segment in other table is enabled - transfer it
+            if (other_table[i].load(std::memory_order_relaxed) == segment_allocation_failure_tag)
+            {
+                    my_size = segment_base(i);
+                    break;
+            } else if (other_table[i].load(std::memory_order_relaxed) != nullptr) {
+                internal_subscript<true>(segment_base(i));
+                transfer_segment(i, other.get_table()[i].load(std::memory_order_relaxed) + segment_base(i),
+                                get_table()[i].load(std::memory_order_relaxed) + segment_base(i));
+            }
+        }
+    }
+
+    // Moves the other segment table
+    // Only equal allocators are allowed
+    void internal_move( segment_table&& other ) {
+        // NOTE: allocators should be equal
+        clear();
+        my_first_block.store(other.my_first_block.load(std::memory_order_relaxed), std::memory_order_relaxed);
+        my_size.store(other.my_size.load(std::memory_order_relaxed), std::memory_order_relaxed);
+        // If an active table in other is embedded - restore all of the embedded segments
+        if (other.get_table() == other.my_embedded_table) {
+            for ( size_type i = 0; i != pointers_per_embedded_table; ++i ) {
+                segment_type other_segment = other.my_embedded_table[i].load(std::memory_order_relaxed);
+                my_embedded_table[i].store(other_segment, std::memory_order_relaxed);
+                other.my_embedded_table[i].store(nullptr, std::memory_order_relaxed);
+            }
+            my_segment_table.store(my_embedded_table, std::memory_order_relaxed);
+        } else {
+            my_segment_table.store(other.my_segment_table, std::memory_order_relaxed);
+            other.my_segment_table.store(other.my_embedded_table, std::memory_order_relaxed);
+            zero_table(other.my_embedded_table, pointers_per_embedded_table);
+        }
+        other.my_size.store(0, std::memory_order_relaxed);
+    }
+
+    // Move construct the segment table with the allocator object
+    // if any instances of allocator_type are always equal
+    void internal_move_construct_with_allocator( segment_table&& other, const allocator_type&,
+                                                 /*is_always_equal = */ std::true_type ) {
+        internal_move(std::move(other));
+    }
+
+    // Move construct the segment table with the allocator object
+    // if any instances of allocator_type are always equal
+    void internal_move_construct_with_allocator( segment_table&& other, const allocator_type& alloc,
+                                                 /*is_always_equal = */ std::false_type ) {
+        if (other.my_segment_table_allocator == alloc) {
+            // If allocators are equal - restore pointers
+            internal_move(std::move(other));
+        } else {
+            // If allocators are not equal - perform per element move with reallocation
+            try_call( [&] {
+                internal_transfer(other, move_segment_body_type{*this});
+            } ).on_exception( [&] {
+                clear();
+            });
+        }
+    }
+
+    // Move assigns the segment table to other is any instances of allocator_type are always equal
+    // or propagate_on_container_move_assignment is true
+    void internal_move_assign( segment_table&& other, /*is_always_equal || POCMA = */ std::true_type ) {
+        internal_move(std::move(other));
+    }
+
+    // Move assigns the segment table to other is any instances of allocator_type are not always equal
+    // and propagate_on_container_move_assignment is false
+    void internal_move_assign( segment_table&& other, /*is_always_equal || POCMA = */ std::false_type ) {
+        if (my_segment_table_allocator == other.my_segment_table_allocator) {
+            // If allocators are equal - restore pointers
+            internal_move(std::move(other));
+        } else {
+            // If allocators are not equal - perform per element move with reallocation
+            internal_transfer(other, move_segment_body_type{*this});
+        }
+    }
+
+    // Swaps two segment tables if any instances of allocator_type are always equal
+    // or propagate_on_container_swap is true
+    void internal_swap( segment_table& other, /*is_always_equal || POCS = */ std::true_type ) {
+        internal_swap_fields(other);
+    }
+
+    // Swaps two segment tables if any instances of allocator_type are not always equal
+    // and propagate_on_container_swap is false
+    // According to the C++ standard, swapping of two containers with unequal allocators
+    // is an undefined behavior scenario
+    void internal_swap( segment_table& other, /*is_always_equal || POCS = */ std::false_type ) {
+        __TBB_ASSERT(my_segment_table_allocator == other.my_segment_table_allocator,
+                     "Swapping with unequal allocators is not allowed");
+        internal_swap_fields(other);
+    }
+
+    void internal_swap_fields( segment_table& other ) {
+        // If an active table in either *this segment table or other is an embedded one - swaps the embedded tables
+        if (get_table() == my_embedded_table ||
+            other.get_table() == other.my_embedded_table) {
+
+            for (size_type i = 0; i != pointers_per_embedded_table; ++i) {
+                segment_type current_segment = my_embedded_table[i].load(std::memory_order_relaxed);
+                segment_type other_segment = other.my_embedded_table[i].load(std::memory_order_relaxed);
+
+                my_embedded_table[i].store(other_segment, std::memory_order_relaxed);
+                other.my_embedded_table[i].store(current_segment, std::memory_order_relaxed);
+            }
+        }
+
+        segment_table_type current_segment_table = get_table();
+        segment_table_type other_segment_table = other.get_table();
+
+        // If an active table is an embedded one -
+        // store an active table in other to the embedded one from other
+        if (current_segment_table == my_embedded_table) {
+            other.my_segment_table.store(other.my_embedded_table, std::memory_order_relaxed);
+        } else {
+            // Otherwise - store it to the active segment table
+            other.my_segment_table.store(current_segment_table, std::memory_order_relaxed);
+        }
+
+        // If an active table in other segment table is an embedded one -
+        // store an active table in other to the embedded one from *this
+        if (other_segment_table == other.my_embedded_table) {
+            my_segment_table.store(my_embedded_table, std::memory_order_relaxed);
+        } else {
+            // Otherwise - store it to the active segment table in other
+            my_segment_table.store(other_segment_table, std::memory_order_relaxed);
+        }
+        auto first_block = other.my_first_block.load(std::memory_order_relaxed);
+        other.my_first_block.store(my_first_block.load(std::memory_order_relaxed), std::memory_order_relaxed);
+        my_first_block.store(first_block, std::memory_order_relaxed);
+
+        auto size = other.my_size.load(std::memory_order_relaxed);
+        other.my_size.store(my_size.load(std::memory_order_relaxed), std::memory_order_relaxed);
+        my_size.store(size, std::memory_order_relaxed);
+    }
+
+protected:
+    // A flag indicates that an exception was throws during segment allocations
+    const segment_type segment_allocation_failure_tag = reinterpret_cast<segment_type>(1);
+    static constexpr size_type embedded_table_size = segment_size(pointers_per_embedded_table);
+
+    template <bool allow_out_of_range_access>
+    value_type& internal_subscript( size_type index ) {
+        segment_index_type seg_index = segment_index_of(index);
+        segment_table_type table = my_segment_table.load(std::memory_order_acquire);
+        segment_type segment = nullptr;
+
+        if (allow_out_of_range_access) {
+            if (derived_type::allow_table_extending) {
+                extend_table_if_necessary(table, index, index + 1);
+            }
+
+            segment = table[seg_index].load(std::memory_order_acquire);
+            // If the required segment is disabled - enable it
+            if (segment == nullptr) {
+                enable_segment(segment, table, seg_index, index);
+            }
+            // Check if an exception was thrown during segment allocation
+            if (segment == segment_allocation_failure_tag) {
+                throw_exception(exception_id::bad_alloc);
+            }
+        } else {
+            segment = table[seg_index].load(std::memory_order_acquire);
+        }
+        __TBB_ASSERT(segment != nullptr, nullptr);
+
+        return segment[index];
+    }
+
+    void assign_first_block_if_necessary(segment_index_type index) {
+        size_type zero = 0;
+        if (this->my_first_block.load(std::memory_order_relaxed) == zero) {
+            this->my_first_block.compare_exchange_strong(zero, index);
+        }
+    }
+
+    void zero_table( segment_table_type table, size_type count ) {
+        for (size_type i = 0; i != count; ++i) {
+            table[i].store(nullptr, std::memory_order_relaxed);
+        }
+    }
+
+    segment_table_type get_table() const {
+        return my_segment_table.load(std::memory_order_acquire);
+    }
+
+    segment_table_allocator_type my_segment_table_allocator;
+    std::atomic<segment_table_type> my_segment_table;
+    atomic_segment my_embedded_table[pointers_per_embedded_table];
+    // Number of segments in first block
+    std::atomic<size_type> my_first_block;
+    // Number of elements in table
+    std::atomic<size_type> my_size;
+    // Flag to indicate failed extend table
+    std::atomic<bool> my_segment_table_allocation_failed;
+}; // class segment_table
+
+} // namespace d1
+} // namespace detail
+} // namespace tbb
 
 #if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
-#pragma warning(pop)// warning 4127 is back
+#pragma warning(pop) // warning 4127 is back
 #endif
 
-#endif// __TBB_detail__segment_table_H
+#endif // __TBB_detail__segment_table_H
diff --git a/external/tbb/include/oneapi/tbb/detail/_small_object_pool.h b/external/tbb/include/oneapi/tbb/detail/_small_object_pool.h
index a380b680..7485b31c 100644
--- a/external/tbb/include/oneapi/tbb/detail/_small_object_pool.h
+++ b/external/tbb/include/oneapi/tbb/detail/_small_object_pool.h
@@ -17,97 +17,92 @@
 #ifndef __TBB__small_object_pool_H
 #define __TBB__small_object_pool_H
 
-#include "_assert.h"
 #include "_config.h"
+#include "_assert.h"
 
 #include "../profiling.h"
-#include <atomic>
 #include <cstddef>
 #include <cstdint>
+#include <atomic>
 
 namespace tbb {
-    namespace detail {
-
-        namespace d1 {
-            class small_object_pool {
-            protected:
-                small_object_pool() = default;
-            };
-            struct execution_data;
-        }// namespace d1
-
-        namespace r1 {
-            TBB_EXPORT void* __TBB_EXPORTED_FUNC allocate(d1::small_object_pool*& pool,
-                                                          std::size_t number_of_bytes,
-                                                          const d1::execution_data& ed);
-            TBB_EXPORT void* __TBB_EXPORTED_FUNC allocate(d1::small_object_pool*& pool,
-                                                          std::size_t number_of_bytes);
-            TBB_EXPORT void __TBB_EXPORTED_FUNC deallocate(d1::small_object_pool& pool, void* ptr,
-                                                           std::size_t number_of_bytes,
-                                                           const d1::execution_data& ed);
-            TBB_EXPORT void __TBB_EXPORTED_FUNC deallocate(d1::small_object_pool& pool, void* ptr,
-                                                           std::size_t number_of_bytes);
-        }// namespace r1
-
-        namespace d1 {
-            class small_object_allocator {
-            public:
-                template <typename Type, typename... Args>
-                Type* new_object(execution_data& ed, Args&&... args) {
-                    void* allocated_object = r1::allocate(m_pool, sizeof(Type), ed);
-
-                    auto constructed_object = new (allocated_object) Type(std::forward<Args>(args)...);
-                    return constructed_object;
-                }
-
-                template <typename Type, typename... Args>
-                Type* new_object(Args&&... args) {
-                    void* allocated_object = r1::allocate(m_pool, sizeof(Type));
-
-                    auto constructed_object = new (allocated_object) Type(std::forward<Args>(args)...);
-                    return constructed_object;
-                }
-
-                template <typename Type>
-                void delete_object(Type* object, const execution_data& ed) {
-                    // Copy this since it can be a member of the passed object and
-                    // unintentionally destroyed when Type destructor is called below
-                    small_object_allocator alloc = *this;
-                    object->~Type();
-                    alloc.deallocate(object, ed);
-                }
-
-                template <typename Type>
-                void delete_object(Type* object) {
-                    // Copy this since it can be a member of the passed object and
-                    // unintentionally destroyed when Type destructor is called below
-                    small_object_allocator alloc = *this;
-                    object->~Type();
-                    alloc.deallocate(object);
-                }
-
-                template <typename Type>
-                void deallocate(Type* ptr, const execution_data& ed) {
-                    call_itt_task_notify(destroy, ptr);
-
-                    __TBB_ASSERT(m_pool != nullptr, "Pool must be valid for deallocate call");
-                    r1::deallocate(*m_pool, ptr, sizeof(Type), ed);
-                }
-
-                template <typename Type>
-                void deallocate(Type* ptr) {
-                    call_itt_task_notify(destroy, ptr);
-
-                    __TBB_ASSERT(m_pool != nullptr, "Pool must be valid for deallocate call");
-                    r1::deallocate(*m_pool, ptr, sizeof(Type));
-                }
-
-            private:
-                small_object_pool* m_pool {};
-            };
-
-        }// namespace d1
-    }    // namespace detail
-}// namespace tbb
+namespace detail {
+
+namespace d1 {
+class small_object_pool {
+protected:
+    small_object_pool() = default;
+};
+struct execution_data;
+}
+
+namespace r1 {
+TBB_EXPORT void* __TBB_EXPORTED_FUNC allocate(d1::small_object_pool*& pool, std::size_t number_of_bytes,
+                                    const d1::execution_data& ed);
+TBB_EXPORT void* __TBB_EXPORTED_FUNC allocate(d1::small_object_pool*& pool, std::size_t number_of_bytes);
+TBB_EXPORT void  __TBB_EXPORTED_FUNC deallocate(d1::small_object_pool& pool, void* ptr, std::size_t number_of_bytes,
+                                        const d1::execution_data& ed);
+TBB_EXPORT void  __TBB_EXPORTED_FUNC deallocate(d1::small_object_pool& pool, void* ptr, std::size_t number_of_bytes);
+}
+
+namespace d1 {
+class small_object_allocator {
+public:
+    template <typename Type, typename... Args>
+    Type* new_object(execution_data& ed, Args&&... args) {
+        void* allocated_object = r1::allocate(m_pool, sizeof(Type), ed);
+
+        auto constructed_object = new(allocated_object) Type(std::forward<Args>(args)...);
+        return constructed_object;
+    }
+
+    template <typename Type, typename... Args>
+    Type* new_object(Args&&... args) {
+        void* allocated_object = r1::allocate(m_pool, sizeof(Type));
+
+        auto constructed_object = new(allocated_object) Type(std::forward<Args>(args)...);
+        return constructed_object;
+    }
+
+    template <typename Type>
+    void delete_object(Type* object, const execution_data& ed) {
+        // Copy this since it can be a member of the passed object and
+        // unintentionally destroyed when Type destructor is called below
+        small_object_allocator alloc = *this;
+        object->~Type();
+        alloc.deallocate(object, ed);
+    }
+
+    template <typename Type>
+    void delete_object(Type* object) {
+        // Copy this since it can be a member of the passed object and
+        // unintentionally destroyed when Type destructor is called below
+        small_object_allocator alloc = *this;
+        object->~Type();
+        alloc.deallocate(object);
+    }
+
+    template <typename Type>
+    void deallocate(Type* ptr, const execution_data& ed) {
+        call_itt_task_notify(destroy, ptr);
+
+        __TBB_ASSERT(m_pool != nullptr, "Pool must be valid for deallocate call");
+        r1::deallocate(*m_pool, ptr, sizeof(Type), ed);
+    }
+
+    template <typename Type>
+    void deallocate(Type* ptr) {
+        call_itt_task_notify(destroy, ptr);
+
+        __TBB_ASSERT(m_pool != nullptr, "Pool must be valid for deallocate call");
+        r1::deallocate(*m_pool, ptr, sizeof(Type));
+    }
+private:
+    small_object_pool* m_pool{};
+};
+
+} // namespace d1
+} // namespace detail
+} // namespace tbb
 
 #endif /* __TBB__small_object_pool_H */
diff --git a/external/tbb/include/oneapi/tbb/detail/_task.h b/external/tbb/include/oneapi/tbb/detail/_task.h
index b45facd6..400f9cd4 100644
--- a/external/tbb/include/oneapi/tbb/detail/_task.h
+++ b/external/tbb/include/oneapi/tbb/detail/_task.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2020-2021 Intel Corporation
+    Copyright (c) 2020-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -17,208 +17,286 @@
 #ifndef __TBB__task_H
 #define __TBB__task_H
 
-#include "_assert.h"
 #include "_config.h"
-#include "_small_object_pool.h"
+#include "_assert.h"
 #include "_template_helpers.h"
+#include "_small_object_pool.h"
 
 #include "../profiling.h"
 
-#include <atomic>
-#include <climits>
 #include <cstddef>
 #include <cstdint>
-#include <mutex>
+#include <climits>
 #include <utility>
+#include <atomic>
+#include <mutex>
 
 namespace tbb {
-    namespace detail {
-
-        namespace d1 {
-            using slot_id = unsigned short;
-            constexpr slot_id no_slot = slot_id(~0);
-            constexpr slot_id any_slot = slot_id(~1);
-
-            class task;
-            class wait_context;
-            class task_group_context;
-            struct execution_data;
-        }// namespace d1
-
-        namespace r1 {
-            //! Task spawn/wait entry points
-            TBB_EXPORT void __TBB_EXPORTED_FUNC spawn(d1::task& t, d1::task_group_context& ctx);
-            TBB_EXPORT void __TBB_EXPORTED_FUNC spawn(d1::task& t, d1::task_group_context& ctx,
-                                                      d1::slot_id id);
-            TBB_EXPORT void __TBB_EXPORTED_FUNC execute_and_wait(d1::task& t, d1::task_group_context& t_ctx,
-                                                                 d1::wait_context&,
-                                                                 d1::task_group_context& w_ctx);
-            TBB_EXPORT void __TBB_EXPORTED_FUNC wait(d1::wait_context&, d1::task_group_context& ctx);
-            TBB_EXPORT d1::slot_id __TBB_EXPORTED_FUNC execution_slot(const d1::execution_data*);
-            TBB_EXPORT d1::task_group_context* __TBB_EXPORTED_FUNC current_context();
-
-            // Do not place under __TBB_RESUMABLE_TASKS. It is a stub for unsupported platforms.
-            struct suspend_point_type;
-            using suspend_callback_type = void (*)(void*, suspend_point_type*);
-            //! The resumable tasks entry points
-            TBB_EXPORT void __TBB_EXPORTED_FUNC suspend(suspend_callback_type suspend_callback,
-                                                        void* user_callback);
-            TBB_EXPORT void __TBB_EXPORTED_FUNC resume(suspend_point_type* tag);
-            TBB_EXPORT suspend_point_type* __TBB_EXPORTED_FUNC current_suspend_point();
-            TBB_EXPORT void __TBB_EXPORTED_FUNC notify_waiters(std::uintptr_t wait_ctx_addr);
-
-            class thread_data;
-            class task_dispatcher;
-            class external_waiter;
-            struct task_accessor;
-            struct task_arena_impl;
-        }// namespace r1
-
-        namespace d1 {
-
-            class task_arena;
-            using suspend_point = r1::suspend_point_type*;
+namespace detail {
+
+namespace d1 {
+using slot_id = unsigned short;
+constexpr slot_id no_slot = slot_id(~0);
+constexpr slot_id any_slot = slot_id(~1);
+
+class task;
+class wait_context;
+class task_group_context;
+struct execution_data;
+class wait_tree_vertex_interface;
+class task_arena_base;
+}
+
+namespace d2 {
+class task_group;
+class task_group_base;
+}
+
+namespace r1 {
+//! Task spawn/wait entry points
+TBB_EXPORT void __TBB_EXPORTED_FUNC spawn(d1::task& t, d1::task_group_context& ctx);
+TBB_EXPORT void __TBB_EXPORTED_FUNC spawn(d1::task& t, d1::task_group_context& ctx, d1::slot_id id);
+TBB_EXPORT void __TBB_EXPORTED_FUNC execute_and_wait(d1::task& t, d1::task_group_context& t_ctx, d1::wait_context&, d1::task_group_context& w_ctx);
+TBB_EXPORT void __TBB_EXPORTED_FUNC wait(d1::wait_context&, d1::task_group_context& ctx);
+TBB_EXPORT d1::slot_id __TBB_EXPORTED_FUNC execution_slot(const d1::execution_data*);
+TBB_EXPORT d1::slot_id __TBB_EXPORTED_FUNC execution_slot(const d1::task_arena_base&);
+TBB_EXPORT d1::task_group_context* __TBB_EXPORTED_FUNC current_context();
+TBB_EXPORT d1::wait_tree_vertex_interface* get_thread_reference_vertex(d1::wait_tree_vertex_interface* wc);
+
+// Do not place under __TBB_RESUMABLE_TASKS. It is a stub for unsupported platforms.
+struct suspend_point_type;
+using suspend_callback_type = void(*)(void*, suspend_point_type*);
+//! The resumable tasks entry points
+TBB_EXPORT void __TBB_EXPORTED_FUNC suspend(suspend_callback_type suspend_callback, void* user_callback);
+TBB_EXPORT void __TBB_EXPORTED_FUNC resume(suspend_point_type* tag);
+TBB_EXPORT suspend_point_type* __TBB_EXPORTED_FUNC current_suspend_point();
+TBB_EXPORT void __TBB_EXPORTED_FUNC notify_waiters(std::uintptr_t wait_ctx_addr);
+
+class thread_data;
+class task_dispatcher;
+class external_waiter;
+struct task_accessor;
+struct task_arena_impl;
+} // namespace r1
+
+namespace d1 {
+
+class task_arena;
+using suspend_point = r1::suspend_point_type*;
 
 #if __TBB_RESUMABLE_TASKS
-            template <typename F>
-            static void suspend_callback(void* user_callback, suspend_point sp) {
-                // Copy user function to a new stack after the context switch to avoid a race when the previous
-                // suspend point is resumed while the user_callback is being called.
-                F user_callback_copy = *static_cast<F*>(user_callback);
-                user_callback_copy(sp);
-            }
-
-            template <typename F>
-            void suspend(F f) {
-                r1::suspend(&suspend_callback<F>, &f);
-            }
-
-            inline void resume(suspend_point tag) { r1::resume(tag); }
+template <typename F>
+static void suspend_callback(void* user_callback, suspend_point sp) {
+    // Copy user function to a new stack after the context switch to avoid a race when the previous
+    // suspend point is resumed while the user_callback is being called.
+    F user_callback_copy = *static_cast<F*>(user_callback);
+    user_callback_copy(sp);
+}
+
+template <typename F>
+void suspend(F f) {
+    r1::suspend(&suspend_callback<F>, &f);
+}
+
+inline void resume(suspend_point tag) {
+    r1::resume(tag);
+}
 #endif /* __TBB_RESUMABLE_TASKS */
 
-            // TODO align wait_context on cache lane
-            class wait_context {
-                static constexpr std::uint64_t overflow_mask = ~((1LLU << 32) - 1);
-
-                std::uint64_t m_version_and_traits {1};
-                std::atomic<std::uint64_t> m_ref_count {};
-
-                void add_reference(std::int64_t delta) {
-                    call_itt_task_notify(releasing, this);
-                    std::uint64_t r = m_ref_count.fetch_add(delta) + delta;
-
-                    __TBB_ASSERT_EX((r & overflow_mask) == 0, "Overflow is detected");
-
-                    if (!r) {
-                        // Some external waiters or coroutine waiters sleep in wait list
-                        // Should to notify them that work is done
-                        std::uintptr_t wait_ctx_addr = std::uintptr_t(this);
-                        r1::notify_waiters(wait_ctx_addr);
-                    }
-                }
-
-                bool continue_execution() const {
-                    std::uint64_t r = m_ref_count.load(std::memory_order_acquire);
-                    __TBB_ASSERT_EX((r & overflow_mask) == 0, "Overflow is detected");
-                    return r > 0;
-                }
-
-                friend class r1::thread_data;
-                friend class r1::task_dispatcher;
-                friend class r1::external_waiter;
-                friend class task_group;
-                friend class task_group_base;
-                friend struct r1::task_arena_impl;
-                friend struct r1::suspend_point_type;
-
-            public:
-                // Despite the internal reference count is uin64_t we limit the user interface with uint32_t
-                // to preserve a part of the internal reference count for special needs.
-                wait_context(std::uint32_t ref_count) : m_ref_count {ref_count} {
-                    suppress_unused_warning(m_version_and_traits);
-                }
-                wait_context(const wait_context&) = delete;
-
-                ~wait_context() { __TBB_ASSERT(!continue_execution(), NULL); }
-
-                void reserve(std::uint32_t delta = 1) { add_reference(delta); }
-
-                void release(std::uint32_t delta = 1) { add_reference(-std::int64_t(delta)); }
-            };
-
-            struct execution_data {
-                task_group_context* context {};
-                slot_id original_slot {};
-                slot_id affinity_slot {};
-            };
-
-            inline task_group_context* context(const execution_data& ed) { return ed.context; }
-
-            inline slot_id original_slot(const execution_data& ed) { return ed.original_slot; }
-
-            inline slot_id affinity_slot(const execution_data& ed) { return ed.affinity_slot; }
-
-            inline slot_id execution_slot(const execution_data& ed) { return r1::execution_slot(&ed); }
-
-            inline bool is_same_affinity(const execution_data& ed) {
-                return affinity_slot(ed) == no_slot || affinity_slot(ed) == execution_slot(ed);
-            }
-
-            inline bool is_stolen(const execution_data& ed) {
-                return original_slot(ed) != execution_slot(ed);
-            }
-
-            inline void spawn(task& t, task_group_context& ctx) {
-                call_itt_task_notify(releasing, &t);
-                r1::spawn(t, ctx);
-            }
-
-            inline void spawn(task& t, task_group_context& ctx, slot_id id) {
-                call_itt_task_notify(releasing, &t);
-                r1::spawn(t, ctx, id);
-            }
-
-            inline void execute_and_wait(task& t, task_group_context& t_ctx, wait_context& wait_ctx,
-                                         task_group_context& w_ctx) {
-                r1::execute_and_wait(t, t_ctx, wait_ctx, w_ctx);
-                call_itt_task_notify(acquired, &wait_ctx);
-                call_itt_task_notify(destroy, &wait_ctx);
-            }
-
-            inline void wait(wait_context& wait_ctx, task_group_context& ctx) {
-                r1::wait(wait_ctx, ctx);
-                call_itt_task_notify(acquired, &wait_ctx);
-                call_itt_task_notify(destroy, &wait_ctx);
-            }
-
-            using r1::current_context;
-
-            class task_traits {
-                std::uint64_t m_version_and_traits {};
-                friend struct r1::task_accessor;
-            };
-
-            //! Alignment for a task object
-            static constexpr std::size_t task_alignment = 64;
-
-            //! Base class for user-defined tasks.
-            /** @ingroup task_scheduling */
-            class alignas(task_alignment) task : public task_traits {
-            protected:
-                virtual ~task() = default;
-
-            public:
-                virtual task* execute(execution_data&) = 0;
-                virtual task* cancel(execution_data&) = 0;
-
-            private:
-                std::uint64_t m_reserved[6] {};
-                friend struct r1::task_accessor;
-            };
-            static_assert(sizeof(task) == task_alignment, "task size is broken");
-
-        }// namespace d1
-    }    // namespace detail
-}// namespace tbb
+// TODO align wait_context on cache lane
+class wait_context {
+    static constexpr std::uint64_t overflow_mask = ~((1LLU << 32) - 1);
+
+    std::uint64_t m_version_and_traits{1};
+    std::atomic<std::uint64_t> m_ref_count{};
+
+    void add_reference(std::int64_t delta) {
+        call_itt_task_notify(releasing, this);
+        std::uint64_t r = m_ref_count.fetch_add(static_cast<std::uint64_t>(delta)) + static_cast<std::uint64_t>(delta);
+
+        __TBB_ASSERT_EX((r & overflow_mask) == 0, "Overflow is detected");
+
+        if (!r) {
+            // Some external waiters or coroutine waiters sleep in wait list
+            // Should to notify them that work is done
+            std::uintptr_t wait_ctx_addr = std::uintptr_t(this);
+            r1::notify_waiters(wait_ctx_addr);
+        }
+    }
+
+    bool continue_execution() const {
+        std::uint64_t r = m_ref_count.load(std::memory_order_acquire);
+        __TBB_ASSERT_EX((r & overflow_mask) == 0, "Overflow is detected");
+        return r > 0;
+    }
+
+    friend class r1::thread_data;
+    friend class r1::task_dispatcher;
+    friend class r1::external_waiter;
+    friend class wait_context_vertex;
+    friend struct r1::task_arena_impl;
+    friend struct r1::suspend_point_type;
+public:
+    // Despite the internal reference count is uin64_t we limit the user interface with uint32_t
+    // to preserve a part of the internal reference count for special needs.
+    wait_context(std::uint32_t ref_count) : m_ref_count{ref_count} { suppress_unused_warning(m_version_and_traits); }
+    wait_context(const wait_context&) = delete;
+
+    ~wait_context() {
+        __TBB_ASSERT(!continue_execution(), nullptr);
+    }
+
+    void reserve(std::uint32_t delta = 1) {
+        add_reference(delta);
+    }
+
+    void release(std::uint32_t delta = 1) {
+        add_reference(-std::int64_t(delta));
+    }
+};
+
+class wait_tree_vertex_interface {
+public:
+    virtual void reserve(std::uint32_t delta = 1) = 0;
+    virtual void release(std::uint32_t delta = 1) = 0;
+
+protected:
+    virtual ~wait_tree_vertex_interface() = default;
+};
+
+class wait_context_vertex : public wait_tree_vertex_interface {
+public:
+    wait_context_vertex(std::uint32_t ref = 0) : m_wait(ref) {}
+
+    void reserve(std::uint32_t delta = 1) override {
+        m_wait.reserve(delta);
+    }
+
+    void release(std::uint32_t delta = 1) override {
+        m_wait.release(delta);
+    }
+
+    wait_context& get_context() {
+        return m_wait;
+    }
+private:
+    friend class d2::task_group;
+    friend class d2::task_group_base;
+
+    bool continue_execution() const {
+        return m_wait.continue_execution();
+    }
+
+    wait_context m_wait;
+};
+
+class reference_vertex : public wait_tree_vertex_interface {
+public:
+    reference_vertex(wait_tree_vertex_interface* parent, std::uint32_t ref_count) : my_parent{parent}, m_ref_count{ref_count}
+    {}
+
+    void reserve(std::uint32_t delta = 1) override {
+        if (m_ref_count.fetch_add(static_cast<std::uint64_t>(delta)) == 0) {
+            my_parent->reserve();
+        }
+    }
+
+    void release(std::uint32_t delta = 1) override {
+        auto parent = my_parent;
+        std::uint64_t ref = m_ref_count.fetch_sub(static_cast<std::uint64_t>(delta)) - static_cast<std::uint64_t>(delta);
+        if (ref == 0) {
+            parent->release();
+        }
+    }
+
+    std::uint32_t get_num_child() {
+        return static_cast<std::uint32_t>(m_ref_count.load(std::memory_order_acquire));
+    }
+private:
+    wait_tree_vertex_interface* my_parent;
+    std::atomic<std::uint64_t> m_ref_count;
+};
+
+struct execution_data {
+    task_group_context* context{};
+    slot_id original_slot{};
+    slot_id affinity_slot{};
+};
+
+inline task_group_context* context(const execution_data& ed) {
+    return ed.context;
+}
+
+inline slot_id original_slot(const execution_data& ed) {
+    return ed.original_slot;
+}
+
+inline slot_id affinity_slot(const execution_data& ed) {
+    return ed.affinity_slot;
+}
+
+inline slot_id execution_slot(const execution_data& ed) {
+    return r1::execution_slot(&ed);
+}
+
+inline bool is_same_affinity(const execution_data& ed) {
+    return affinity_slot(ed) == no_slot || affinity_slot(ed) == execution_slot(ed);
+}
+
+inline bool is_stolen(const execution_data& ed) {
+    return original_slot(ed) != execution_slot(ed);
+}
+
+inline void spawn(task& t, task_group_context& ctx) {
+    call_itt_task_notify(releasing, &t);
+    r1::spawn(t, ctx);
+}
+
+inline void spawn(task& t, task_group_context& ctx, slot_id id) {
+    call_itt_task_notify(releasing, &t);
+    r1::spawn(t, ctx, id);
+}
+
+inline void execute_and_wait(task& t, task_group_context& t_ctx, wait_context& wait_ctx, task_group_context& w_ctx) {
+    r1::execute_and_wait(t, t_ctx, wait_ctx, w_ctx);
+    call_itt_task_notify(acquired, &wait_ctx);
+    call_itt_task_notify(destroy, &wait_ctx);
+}
+
+inline void wait(wait_context& wait_ctx, task_group_context& ctx) {
+    r1::wait(wait_ctx, ctx);
+    call_itt_task_notify(acquired, &wait_ctx);
+    call_itt_task_notify(destroy, &wait_ctx);
+}
+
+using r1::current_context;
+
+class task_traits {
+    std::uint64_t m_version_and_traits{};
+    friend struct r1::task_accessor;
+};
+
+//! Alignment for a task object
+static constexpr std::size_t task_alignment = 64;
+
+//! Base class for user-defined tasks.
+/** @ingroup task_scheduling */
+class alignas(task_alignment) task : public task_traits {
+protected:
+    virtual ~task() = default;
+
+public:
+    virtual task* execute(execution_data&) = 0;
+    virtual task* cancel(execution_data&) = 0;
+
+private:
+    std::uint64_t m_reserved[6]{};
+    friend struct r1::task_accessor;
+};
+static_assert(sizeof(task) == task_alignment, "task size is broken");
+
+} // namespace d1
+} // namespace detail
+} // namespace tbb
 
 #endif /* __TBB__task_H */
diff --git a/external/tbb/include/oneapi/tbb/detail/_task_handle.h b/external/tbb/include/oneapi/tbb/detail/_task_handle.h
index b7fd2d42..26212b46 100644
--- a/external/tbb/include/oneapi/tbb/detail/_task_handle.h
+++ b/external/tbb/include/oneapi/tbb/detail/_task_handle.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2020-2021 Intel Corporation
+    Copyright (c) 2020-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -14,110 +14,110 @@
     limitations under the License.
 */
 
+
 #ifndef __TBB_task_handle_H
 #define __TBB_task_handle_H
 
 #include "_config.h"
-#include "_small_object_pool.h"
 #include "_task.h"
+#include "_small_object_pool.h"
 #include "_utils.h"
 #include <memory>
 
 namespace tbb {
-    namespace detail {
-
-        namespace d1 {
-            class task_group_context;
-            class wait_context;
-            struct execution_data;
-        }// namespace d1
-        namespace d2 {
-
-#if __TBB_PREVIEW_TASK_GROUP_EXTENSIONS
-            class task_handle;
-
-            class task_handle_task : public d1::task {
-                std::uint64_t m_version_and_traits {};
-                d1::wait_context& m_wait_ctx;
-                d1::task_group_context& m_ctx;
-                d1::small_object_allocator m_allocator;
-
-            public:
-                void finalize(const d1::execution_data* ed = nullptr) {
-                    if (ed) {
-                        m_allocator.delete_object(this, *ed);
-                    } else {
-                        m_allocator.delete_object(this);
-                    }
-                }
-
-                task_handle_task(d1::wait_context& wo, d1::task_group_context& ctx,
-                                 d1::small_object_allocator& alloc)
-                    : m_wait_ctx(wo), m_ctx(ctx), m_allocator(alloc) {
-                    suppress_unused_warning(m_version_and_traits);
-                }
-
-                ~task_handle_task() { m_wait_ctx.release(); }
-
-                d1::task_group_context& ctx() const { return m_ctx; }
-            };
-
-            class task_handle {
-                struct task_handle_task_finalizer_t {
-                    void operator()(task_handle_task* p) { p->finalize(); }
-                };
-                using handle_impl_t = std::unique_ptr<task_handle_task, task_handle_task_finalizer_t>;
-
-                handle_impl_t m_handle = {nullptr};
-
-            public:
-                task_handle() = default;
-                task_handle(task_handle&&) = default;
-                task_handle& operator=(task_handle&&) = default;
-
-                explicit operator bool() const noexcept { return static_cast<bool>(m_handle); }
-
-                friend bool operator==(task_handle const& th, std::nullptr_t) noexcept;
-                friend bool operator==(std::nullptr_t, task_handle const& th) noexcept;
-
-                friend bool operator!=(task_handle const& th, std::nullptr_t) noexcept;
-                friend bool operator!=(std::nullptr_t, task_handle const& th) noexcept;
-
-            private:
-                friend struct task_handle_accessor;
-
-                task_handle(task_handle_task* t) : m_handle {t} {};
-
-                d1::task* release() { return m_handle.release(); }
-            };
-
-            struct task_handle_accessor {
-                static task_handle construct(task_handle_task* t) { return {t}; }
-                static d1::task* release(task_handle& th) { return th.release(); }
-                static d1::task_group_context& ctx_of(task_handle& th) {
-                    __TBB_ASSERT(th.m_handle, "ctx_of does not expect empty task_handle.");
-                    return th.m_handle->ctx();
-                }
-            };
-
-            inline bool operator==(task_handle const& th, std::nullptr_t) noexcept {
-                return th.m_handle == nullptr;
-            }
-            inline bool operator==(std::nullptr_t, task_handle const& th) noexcept {
-                return th.m_handle == nullptr;
-            }
-
-            inline bool operator!=(task_handle const& th, std::nullptr_t) noexcept {
-                return th.m_handle != nullptr;
-            }
-
-            inline bool operator!=(std::nullptr_t, task_handle const& th) noexcept {
-                return th.m_handle != nullptr;
-            }
-#endif// __TBB_PREVIEW_TASK_GROUP_EXTENSIONS
-
-        }// namespace d2
-    }    // namespace detail
-}// namespace tbb
+namespace detail {
+
+namespace d1 { class task_group_context; class wait_context; struct execution_data; }
+namespace d2 {
+
+class task_handle;
+
+class task_handle_task : public d1::task {
+    std::uint64_t m_version_and_traits{};
+    d1::wait_tree_vertex_interface* m_wait_tree_vertex;
+    d1::task_group_context& m_ctx;
+    d1::small_object_allocator m_allocator;
+public:
+    void finalize(const d1::execution_data* ed = nullptr) {
+        if (ed) {
+            m_allocator.delete_object(this, *ed);
+        } else {
+            m_allocator.delete_object(this);
+        }
+    }
+
+    task_handle_task(d1::wait_tree_vertex_interface* vertex, d1::task_group_context& ctx, d1::small_object_allocator& alloc)
+        : m_wait_tree_vertex(vertex)
+        , m_ctx(ctx)
+        , m_allocator(alloc) {
+        suppress_unused_warning(m_version_and_traits);
+        m_wait_tree_vertex->reserve();
+    }
+
+    ~task_handle_task() override {
+        m_wait_tree_vertex->release();
+    }
+
+    d1::task_group_context& ctx() const { return m_ctx; }
+};
+
+
+class task_handle {
+    struct task_handle_task_finalizer_t{
+        void operator()(task_handle_task* p){ p->finalize(); }
+    };
+    using handle_impl_t = std::unique_ptr<task_handle_task, task_handle_task_finalizer_t>;
+
+    handle_impl_t m_handle = {nullptr};
+public:
+    task_handle() = default;
+    task_handle(task_handle&&) = default;
+    task_handle& operator=(task_handle&&) = default;
+
+    explicit operator bool() const noexcept { return static_cast<bool>(m_handle); }
+
+    friend bool operator==(task_handle const& th, std::nullptr_t) noexcept;
+    friend bool operator==(std::nullptr_t, task_handle const& th) noexcept;
+
+    friend bool operator!=(task_handle const& th, std::nullptr_t) noexcept;
+    friend bool operator!=(std::nullptr_t, task_handle const& th) noexcept;
+
+private:
+    friend struct task_handle_accessor;
+
+    task_handle(task_handle_task* t) : m_handle {t}{};
+
+    d1::task* release() {
+       return m_handle.release();
+    }
+};
+
+struct task_handle_accessor {
+static task_handle              construct(task_handle_task* t)  { return {t}; }
+static d1::task*                release(task_handle& th)        { return th.release(); }
+static d1::task_group_context&  ctx_of(task_handle& th)         {
+    __TBB_ASSERT(th.m_handle, "ctx_of does not expect empty task_handle.");
+    return th.m_handle->ctx();
+}
+};
+
+inline bool operator==(task_handle const& th, std::nullptr_t) noexcept {
+    return th.m_handle == nullptr;
+}
+inline bool operator==(std::nullptr_t, task_handle const& th) noexcept {
+    return th.m_handle == nullptr;
+}
+
+inline bool operator!=(task_handle const& th, std::nullptr_t) noexcept {
+    return th.m_handle != nullptr;
+}
+
+inline bool operator!=(std::nullptr_t, task_handle const& th) noexcept {
+    return th.m_handle != nullptr;
+}
+
+} // namespace d2
+} // namespace detail
+} // namespace tbb
 
 #endif /* __TBB_task_handle_H */
diff --git a/external/tbb/include/oneapi/tbb/detail/_template_helpers.h b/external/tbb/include/oneapi/tbb/detail/_template_helpers.h
index a05ca129..a20c5af5 100644
--- a/external/tbb/include/oneapi/tbb/detail/_template_helpers.h
+++ b/external/tbb/include/oneapi/tbb/detail/_template_helpers.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -17,392 +17,391 @@
 #ifndef __TBB_detail__template_helpers_H
 #define __TBB_detail__template_helpers_H
 
-#include "_config.h"
 #include "_utils.h"
+#include "_config.h"
 
 #include <cstddef>
 #include <cstdint>
-#include <iterator>
-#include <memory>
-#include <type_traits>
 #include <utility>
+#include <type_traits>
+#include <memory>
+#include <iterator>
 
 namespace tbb {
-    namespace detail {
-        inline namespace d0 {
-
-            // An internal implementation of void_t, which can be used in SFINAE contexts
-            template <typename...>
-            struct void_impl {
-                using type = void;
-            };// struct void_impl
-
-            template <typename... Args>
-            using void_t = typename void_impl<Args...>::type;
-
-            // Generic SFINAE helper for expression checks, based on the idea demonstrated in ISO C++ paper n4502
-            template <typename T, typename, template <typename> class... Checks>
-            struct supports_impl {
-                using type = std::false_type;
-            };
-
-            template <typename T, template <typename> class... Checks>
-            struct supports_impl<T, void_t<Checks<T>...>, Checks...> {
-                using type = std::true_type;
-            };
-
-            template <typename T, template <typename> class... Checks>
-            using supports = typename supports_impl<T, void, Checks...>::type;
-
-            //! A template to select either 32-bit or 64-bit constant as compile time, depending on machine word size.
-            template <unsigned u, unsigned long long ull>
-            struct select_size_t_constant {
-                // Explicit cast is needed to avoid compiler warnings about possible truncation.
-                // The value of the right size,   which is selected by ?:, is anyway not truncated or promoted.
-                static const std::size_t value = (std::size_t)((sizeof(std::size_t) == sizeof(u)) ? u : ull);
-            };
-
-            // TODO: do we really need it?
-            //! Cast between unrelated pointer types.
-            /** This method should be used sparingly as a last resort for dealing with
+namespace detail {
+inline namespace d0 {
+
+// An internal implementation of void_t, which can be used in SFINAE contexts
+template <typename...>
+struct void_impl {
+    using type = void;
+}; // struct void_impl
+
+template <typename... Args>
+using void_t = typename void_impl<Args...>::type;
+
+// Generic SFINAE helper for expression checks, based on the idea demonstrated in ISO C++ paper n4502
+template <typename T, typename, template <typename> class... Checks>
+struct supports_impl {
+    using type = std::false_type;
+};
+
+template <typename T, template <typename> class... Checks>
+struct supports_impl<T, void_t<Checks<T>...>, Checks...> {
+    using type = std::true_type;
+};
+
+template <typename T, template <typename> class... Checks>
+using supports = typename supports_impl<T, void, Checks...>::type;
+
+//! A template to select either 32-bit or 64-bit constant as compile time, depending on machine word size.
+template <unsigned u, unsigned long long ull >
+struct select_size_t_constant {
+    // Explicit cast is needed to avoid compiler warnings about possible truncation.
+    // The value of the right size,   which is selected by ?:, is anyway not truncated or promoted.
+    static const std::size_t value = static_cast<std::size_t>((sizeof(std::size_t)==sizeof(u)) ? u : ull);
+};
+
+// TODO: do we really need it?
+//! Cast between unrelated pointer types.
+/** This method should be used sparingly as a last resort for dealing with
   situations that inherently break strict ISO C++ aliasing rules. */
-            // T is a pointer type because it will be explicitly provided by the programmer as a template argument;
-            // U is a referent type to enable the compiler to check that "ptr" is a pointer, deducing U in the process.
-            template <typename T, typename U>
-            inline T punned_cast(U* ptr) {
-                std::uintptr_t x = reinterpret_cast<std::uintptr_t>(ptr);
-                return reinterpret_cast<T>(x);
-            }
-
-            template <class T, size_t S, size_t R>
-            struct padded_base : T {
-                char pad[S - R];
-            };
-            template <class T, size_t S>
-            struct padded_base<T, S, 0> : T {};
-
-            //! Pads type T to fill out to a multiple of cache line size.
-            template <class T, size_t S = max_nfs_size>
-            struct padded : padded_base<T, S, sizeof(T) % S> {};
+// T is a pointer type because it will be explicitly provided by the programmer as a template argument;
+// U is a referent type to enable the compiler to check that "ptr" is a pointer, deducing U in the process.
+template<typename T, typename U>
+inline T punned_cast( U* ptr ) {
+    std::uintptr_t x = reinterpret_cast<std::uintptr_t>(ptr);
+    return reinterpret_cast<T>(x);
+}
+
+template<class T, size_t S, size_t R>
+struct padded_base : T {
+    char pad[S - R];
+};
+template<class T, size_t S> struct padded_base<T, S, 0> : T {};
+
+//! Pads type T to fill out to a multiple of cache line size.
+template<class T, size_t S = max_nfs_size>
+struct padded : padded_base<T, S, sizeof(T) % S> {};
 
 #if __TBB_CPP14_INTEGER_SEQUENCE_PRESENT
 
-            using std::index_sequence;
-            using std::make_index_sequence;
+using std::index_sequence;
+using std::make_index_sequence;
 
 #else
 
-            template <std::size_t... S>
-            class index_sequence {};
+template<std::size_t... S> class index_sequence {};
 
-            template <std::size_t N, std::size_t... S>
-            struct make_index_sequence_impl : make_index_sequence_impl<N - 1, N - 1, S...> {};
+template<std::size_t N, std::size_t... S>
+struct make_index_sequence_impl : make_index_sequence_impl < N - 1, N - 1, S... > {};
 
-            template <std::size_t... S>
-            struct make_index_sequence_impl<0, S...> {
-                using type = index_sequence<S...>;
-            };
+template<std::size_t... S>
+struct make_index_sequence_impl <0, S...> {
+    using type = index_sequence<S...>;
+};
 
-            template <std::size_t N>
-            using make_index_sequence = typename make_index_sequence_impl<N>::type;
+template<std::size_t N>
+using make_index_sequence = typename make_index_sequence_impl<N>::type;
 
 #endif /* __TBB_CPP14_INTEGER_SEQUENCE_PRESENT */
 
+//! Attach an index to a type to use it with an index sequence
+template<typename T, std::size_t>
+using indexed_t = T;
+
 #if __TBB_CPP17_LOGICAL_OPERATIONS_PRESENT
-            using std::conjunction;
-            using std::disjunction;
-#else// __TBB_CPP17_LOGICAL_OPERATIONS_PRESENT
+using std::conjunction;
+using std::disjunction;
+#else // __TBB_CPP17_LOGICAL_OPERATIONS_PRESENT
 
-            template <typename...>
-            struct conjunction : std::true_type {};
+template <typename...>
+struct conjunction : std::true_type {};
 
-            template <typename First, typename... Args>
-            struct conjunction<First, Args...>
-                : std::conditional<bool(First::value), conjunction<Args...>, First>::type {};
+template <typename First, typename... Args>
+struct conjunction<First, Args...>
+    : std::conditional<bool(First::value), conjunction<Args...>, First>::type {};
 
-            template <typename T>
-            struct conjunction<T> : T {};
+template <typename T>
+struct conjunction<T> : T {};
 
-            template <typename...>
-            struct disjunction : std::false_type {};
+template <typename...>
+struct disjunction : std::false_type {};
 
-            template <typename First, typename... Args>
-            struct disjunction<First, Args...>
-                : std::conditional<bool(First::value), First, disjunction<Args...>>::type {};
+template <typename First, typename... Args>
+struct disjunction<First, Args...>
+    : std::conditional<bool(First::value), First, disjunction<Args...>>::type {};
 
-            template <typename T>
-            struct disjunction<T> : T {};
+template <typename T>
+struct disjunction<T> : T {};
 
-#endif// __TBB_CPP17_LOGICAL_OPERATIONS_PRESENT
+#endif // __TBB_CPP17_LOGICAL_OPERATIONS_PRESENT
 
-            template <typename Iterator>
-            using iterator_value_t = typename std::iterator_traits<Iterator>::value_type;
+template <typename Iterator>
+using iterator_value_t = typename std::iterator_traits<Iterator>::value_type;
 
-            template <typename Iterator>
-            using iterator_key_t =
-                    typename std::remove_const<typename iterator_value_t<Iterator>::first_type>::type;
+template <typename Iterator>
+using iterator_key_t = typename std::remove_const<typename iterator_value_t<Iterator>::first_type>::type;
 
-            template <typename Iterator>
-            using iterator_mapped_t = typename iterator_value_t<Iterator>::second_type;
+template <typename Iterator>
+using iterator_mapped_t = typename iterator_value_t<Iterator>::second_type;
 
-            template <typename Iterator>
-            using iterator_alloc_pair_t = std::pair<typename std::add_const<iterator_key_t<Iterator>>::type,
-                                                    iterator_mapped_t<Iterator>>;
+template <typename Iterator>
+using iterator_alloc_pair_t = std::pair<typename std::add_const<iterator_key_t<Iterator>>::type,
+                                        iterator_mapped_t<Iterator>>;
 
-            template <typename A>
-            using alloc_value_type = typename A::value_type;
-            template <typename A>
-            using alloc_ptr_t = typename std::allocator_traits<A>::pointer;
-            template <typename A>
-            using has_allocate = decltype(std::declval<alloc_ptr_t<A>&>() = std::declval<A>().allocate(0));
-            template <typename A>
-            using has_deallocate = decltype(std::declval<A>().deallocate(std::declval<alloc_ptr_t<A>>(), 0));
+template <typename A> using alloc_value_type = typename A::value_type;
+template <typename A> using alloc_ptr_t = typename std::allocator_traits<A>::pointer;
+template <typename A> using has_allocate = decltype(std::declval<alloc_ptr_t<A>&>() = std::declval<A>().allocate(0));
+template <typename A> using has_deallocate = decltype(std::declval<A>().deallocate(std::declval<alloc_ptr_t<A>>(), 0));
 
-            // alloc_value_type should be checked first, because it can be used in other checks
-            template <typename T>
-            using is_allocator = supports<T, alloc_value_type, has_allocate, has_deallocate>;
+// alloc_value_type should be checked first, because it can be used in other checks
+template <typename T>
+using is_allocator = supports<T, alloc_value_type, has_allocate, has_deallocate>;
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
-            template <typename T>
-            inline constexpr bool is_allocator_v = is_allocator<T>::value;
+template <typename T>
+inline constexpr bool is_allocator_v = is_allocator<T>::value;
 #endif
 
-            // Template class in which the "type" determines the type of the element number N in pack Args
-            template <std::size_t N, typename... Args>
-            struct pack_element {
-                using type = void;
-            };
-
-            template <std::size_t N, typename T, typename... Args>
-            struct pack_element<N, T, Args...> {
-                using type = typename pack_element<N - 1, Args...>::type;
-            };
-
-            template <typename T, typename... Args>
-            struct pack_element<0, T, Args...> {
-                using type = T;
-            };
-
-            template <std::size_t N, typename... Args>
-            using pack_element_t = typename pack_element<N, Args...>::type;
-
-            template <typename Func>
-            class raii_guard {
-            public:
-                static_assert(std::is_nothrow_copy_constructible<Func>::value
-                                      && std::is_nothrow_move_constructible<Func>::value,
-                              "Throwing an exception during the Func copy or move construction cause an "
-                              "unexpected behavior.");
-
-                raii_guard(Func f) noexcept : my_func(f), is_active(true) {}
-
-                raii_guard(raii_guard&& g) noexcept : my_func(std::move(g.my_func)), is_active(g.is_active) {
-                    g.is_active = false;
-                }
-
-                ~raii_guard() {
-                    if (is_active) { my_func(); }
-                }
-
-                void dismiss() { is_active = false; }
-
-            private:
-                Func my_func;
-                bool is_active;
-            };// class raii_guard
-
-            template <typename Func>
-            raii_guard<Func> make_raii_guard(Func f) {
-                return raii_guard<Func>(f);
-            }
-
-            template <typename Body>
-            struct try_call_proxy {
-                try_call_proxy(Body b) : body(b) {}
-
-                template <typename OnExceptionBody>
-                void on_exception(OnExceptionBody on_exception_body) {
-                    auto guard = make_raii_guard(on_exception_body);
-                    body();
-                    guard.dismiss();
-                }
-
-                template <typename OnCompletionBody>
-                void on_completion(OnCompletionBody on_completion_body) {
-                    auto guard = make_raii_guard(on_completion_body);
-                    body();
-                }
-
-                Body body;
-            };// struct try_call_proxy
-
-            // Template helper function for API
-            // try_call(lambda1).on_exception(lambda2)
-            // Executes lambda1 and if it throws an exception - executes lambda2
-            template <typename Body>
-            try_call_proxy<Body> try_call(Body b) {
-                return try_call_proxy<Body>(b);
-            }
+// Template class in which the "type" determines the type of the element number N in pack Args
+template <std::size_t N, typename... Args>
+struct pack_element {
+    using type = void;
+};
+
+template <std::size_t N, typename T, typename... Args>
+struct pack_element<N, T, Args...> {
+    using type = typename pack_element<N-1, Args...>::type;
+};
+
+template <typename T, typename... Args>
+struct pack_element<0, T, Args...> {
+    using type = T;
+};
+
+template <std::size_t N, typename... Args>
+using pack_element_t = typename pack_element<N, Args...>::type;
+
+template <typename Func>
+class raii_guard {
+public:
+    static_assert(
+        std::is_nothrow_copy_constructible<Func>::value &&
+        std::is_nothrow_move_constructible<Func>::value,
+        "Throwing an exception during the Func copy or move construction cause an unexpected behavior."
+    );
+
+    raii_guard( Func f ) noexcept : my_func(f), is_active(true) {}
+
+    raii_guard( raii_guard&& g ) noexcept : my_func(std::move(g.my_func)), is_active(g.is_active) {
+        g.is_active = false;
+    }
+
+    ~raii_guard() {
+        if (is_active) {
+            my_func();
+        }
+    }
+
+    void dismiss() {
+        is_active = false;
+    }
+private:
+    Func my_func;
+    bool is_active;
+}; // class raii_guard
+
+template <typename Func>
+raii_guard<Func> make_raii_guard( Func f ) {
+    return raii_guard<Func>(f);
+}
+
+template <typename Body>
+struct try_call_proxy {
+    try_call_proxy( Body b ) : body(b) {}
+
+    template <typename OnExceptionBody>
+    void on_exception( OnExceptionBody on_exception_body ) {
+        auto guard = make_raii_guard(on_exception_body);
+        body();
+        guard.dismiss();
+    }
+
+    template <typename OnCompletionBody>
+    void on_completion(OnCompletionBody on_completion_body) {
+        auto guard = make_raii_guard(on_completion_body);
+        body();
+    }
+
+    Body body;
+}; // struct try_call_proxy
+
+// Template helper function for API
+// try_call(lambda1).on_exception(lambda2)
+// Executes lambda1 and if it throws an exception - executes lambda2
+template <typename Body>
+try_call_proxy<Body> try_call( Body b ) {
+    return try_call_proxy<Body>(b);
+}
 
 #if __TBB_CPP17_IS_SWAPPABLE_PRESENT
-            using std::is_nothrow_swappable;
-            using std::is_swappable;
-#else// __TBB_CPP17_IS_SWAPPABLE_PRESENT
-            namespace is_swappable_detail {
-                using std::swap;
+using std::is_nothrow_swappable;
+using std::is_swappable;
+#else // __TBB_CPP17_IS_SWAPPABLE_PRESENT
+namespace is_swappable_detail {
+using std::swap;
 
-                template <typename T>
-                using has_swap = decltype(swap(std::declval<T&>(), std::declval<T&>()));
+template <typename T>
+using has_swap = decltype(swap(std::declval<T&>(), std::declval<T&>()));
 
 #if _MSC_VER && _MSC_VER <= 1900 && !__INTEL_COMPILER
-                // Workaround for VS2015: it fails to instantiate noexcept(...) inside std::integral_constant.
-                template <typename T>
-                struct noexcept_wrapper {
-                    static const bool value = noexcept(swap(std::declval<T&>(), std::declval<T&>()));
-                };
-                template <typename T>
-                struct is_nothrow_swappable_impl : std::integral_constant<bool, noexcept_wrapper<T>::value> {
-                };
+// Workaround for VS2015: it fails to instantiate noexcept(...) inside std::integral_constant.
+template <typename T>
+struct noexcept_wrapper {
+    static const bool value = noexcept(swap(std::declval<T&>(), std::declval<T&>()));
+};
+template <typename T>
+struct is_nothrow_swappable_impl : std::integral_constant<bool, noexcept_wrapper<T>::value> {};
 #else
-                template <typename T>
-                struct is_nothrow_swappable_impl
-                    : std::integral_constant<bool, noexcept(swap(std::declval<T&>(), std::declval<T&>()))> {};
+template <typename T>
+struct is_nothrow_swappable_impl : std::integral_constant<bool, noexcept(swap(std::declval<T&>(), std::declval<T&>()))> {};
 #endif
-            }// namespace is_swappable_detail
-
-            template <typename T>
-            struct is_swappable : supports<T, is_swappable_detail::has_swap> {};
-
-            template <typename T>
-            struct is_nothrow_swappable
-                : conjunction<is_swappable<T>, is_swappable_detail::is_nothrow_swappable_impl<T>> {};
-#endif// __TBB_CPP17_IS_SWAPPABLE_PRESENT
-
-            //! Allows to store a function parameter pack as a variable and later pass it to another function
-            template <typename... Types>
-            struct stored_pack;
-
-            template <>
-            struct stored_pack<> {
-                using pack_type = stored_pack<>;
-                stored_pack() {}
-
-                // Friend front-end functions
-                template <typename F, typename Pack>
-                friend void call(F&& f, Pack&& p);
-                template <typename Ret, typename F, typename Pack>
-                friend Ret call_and_return(F&& f, Pack&& p);
-
-            protected:
-                // Ideally, ref-qualified non-static methods would be used,
-                // but that would greatly reduce the set of compilers where it works.
-                template <typename Ret, typename F, typename... Preceding>
-                static Ret call(F&& f, const pack_type& /*pack*/, Preceding&&... params) {
-                    return std::forward<F>(f)(std::forward<Preceding>(params)...);
-                }
-                template <typename Ret, typename F, typename... Preceding>
-                static Ret call(F&& f, pack_type&& /*pack*/, Preceding&&... params) {
-                    return std::forward<F>(f)(std::forward<Preceding>(params)...);
-                }
-            };
-
-            template <typename T, typename... Types>
-            struct stored_pack<T, Types...> : stored_pack<Types...> {
-                using pack_type = stored_pack<T, Types...>;
-                using pack_remainder = stored_pack<Types...>;
-
-                // Since lifetime of original values is out of control, copies should be made.
-                // Thus references should be stripped away from the deduced type.
-                typename std::decay<T>::type leftmost_value;
-
-                // Here rvalue references act in the same way as forwarding references,
-                // as long as class template parameters were deduced via forwarding references.
-                stored_pack(T&& t, Types&&... types)
-                    : pack_remainder(std::forward<Types>(types)...), leftmost_value(std::forward<T>(t)) {}
-
-                // Friend front-end functions
-                template <typename F, typename Pack>
-                friend void call(F&& f, Pack&& p);
-                template <typename Ret, typename F, typename Pack>
-                friend Ret call_and_return(F&& f, Pack&& p);
-
-            protected:
-                template <typename Ret, typename F, typename... Preceding>
-                static Ret call(F&& f, pack_type& pack, Preceding&&... params) {
-                    return pack_remainder::template call<Ret>(
-                            std::forward<F>(f), static_cast<pack_remainder&>(pack),
-                            std::forward<Preceding>(params)..., pack.leftmost_value);
-                }
-
-                template <typename Ret, typename F, typename... Preceding>
-                static Ret call(F&& f, pack_type&& pack, Preceding&&... params) {
-                    return pack_remainder::template call<Ret>(
-                            std::forward<F>(f), static_cast<pack_remainder&&>(pack),
-                            std::forward<Preceding>(params)..., std::move(pack.leftmost_value));
-                }
-            };
-
-            //! Calls the given function with arguments taken from a stored_pack
-            template <typename F, typename Pack>
-            void call(F&& f, Pack&& p) {
-                std::decay<Pack>::type::template call<void>(std::forward<F>(f), std::forward<Pack>(p));
-            }
-
-            template <typename Ret, typename F, typename Pack>
-            Ret call_and_return(F&& f, Pack&& p) {
-                return std::decay<Pack>::type::template call<Ret>(std::forward<F>(f), std::forward<Pack>(p));
-            }
-
-            template <typename... Types>
-            stored_pack<Types...> save_pack(Types&&... types) {
-                return stored_pack<Types...>(std::forward<Types>(types)...);
-            }
-
-            // A structure with the value which is equal to Trait::value
-            // but can be used in the immediate context due to parameter T
-            template <typename Trait, typename T>
-            struct dependent_bool : std::integral_constant<bool, bool(Trait::value)> {};
-
-            template <typename Callable>
-            struct body_arg_detector;
-
-            template <typename Callable, typename ReturnType, typename Arg>
-            struct body_arg_detector<ReturnType (Callable::*)(Arg)> {
-                using arg_type = Arg;
-            };
-
-            template <typename Callable, typename ReturnType, typename Arg>
-            struct body_arg_detector<ReturnType (Callable::*)(Arg) const> {
-                using arg_type = Arg;
-            };
-
-            template <typename Callable>
-            struct argument_detector;
-
-            template <typename Callable>
-            struct argument_detector {
-                using type = typename body_arg_detector<decltype(&Callable::operator())>::arg_type;
-            };
-
-            template <typename ReturnType, typename Arg>
-            struct argument_detector<ReturnType (*)(Arg)> {
-                using type = Arg;
-            };
-
-            // Detects the argument type of callable, works for callable with one argument.
-            template <typename Callable>
-            using argument_type_of = typename argument_detector<typename std::decay<Callable>::type>::type;
-
-            template <typename T>
-            struct type_identity {
-                using type = T;
-            };
-
-            template <typename T>
-            using type_identity_t = typename type_identity<T>::type;
-
-        }// namespace d0
-    }    // namespace detail
-}// namespace tbb
-
-#endif// __TBB_detail__template_helpers_H
+}
+
+template <typename T>
+struct is_swappable : supports<T, is_swappable_detail::has_swap> {};
+
+template <typename T>
+struct is_nothrow_swappable
+    : conjunction<is_swappable<T>, is_swappable_detail::is_nothrow_swappable_impl<T>> {};
+#endif // __TBB_CPP17_IS_SWAPPABLE_PRESENT
+
+//! Allows to store a function parameter pack as a variable and later pass it to another function
+template< typename... Types >
+struct stored_pack;
+
+template<>
+struct stored_pack<>
+{
+    using pack_type = stored_pack<>;
+    stored_pack() {}
+
+    // Friend front-end functions
+    template< typename F, typename Pack > friend void call(F&& f, Pack&& p);
+    template< typename Ret, typename F, typename Pack > friend Ret call_and_return(F&& f, Pack&& p);
+
+protected:
+    // Ideally, ref-qualified non-static methods would be used,
+    // but that would greatly reduce the set of compilers where it works.
+    template< typename Ret, typename F, typename... Preceding >
+    static Ret call(F&& f, const pack_type& /*pack*/, Preceding&&... params) {
+        return std::forward<F>(f)(std::forward<Preceding>(params)...);
+    }
+    template< typename Ret, typename F, typename... Preceding >
+    static Ret call(F&& f, pack_type&& /*pack*/, Preceding&&... params) {
+        return std::forward<F>(f)(std::forward<Preceding>(params)...);
+    }
+};
+
+template< typename T, typename... Types >
+struct stored_pack<T, Types...> : stored_pack<Types...>
+{
+    using pack_type = stored_pack<T, Types...>;
+    using pack_remainder = stored_pack<Types...>;
+
+    // Since lifetime of original values is out of control, copies should be made.
+    // Thus references should be stripped away from the deduced type.
+    typename std::decay<T>::type leftmost_value;
+
+    // Here rvalue references act in the same way as forwarding references,
+    // as long as class template parameters were deduced via forwarding references.
+    stored_pack(T&& t, Types&&... types)
+    : pack_remainder(std::forward<Types>(types)...), leftmost_value(std::forward<T>(t)) {}
+
+    // Friend front-end functions
+    template< typename F, typename Pack > friend void call(F&& f, Pack&& p);
+    template< typename Ret, typename F, typename Pack > friend Ret call_and_return(F&& f, Pack&& p);
+
+protected:
+    template< typename Ret, typename F, typename... Preceding >
+    static Ret call(F&& f, pack_type& pack, Preceding&&... params) {
+        return pack_remainder::template call<Ret>(
+            std::forward<F>(f), static_cast<pack_remainder&>(pack),
+            std::forward<Preceding>(params)... , pack.leftmost_value
+        );
+    }
+
+    template< typename Ret, typename F, typename... Preceding >
+    static Ret call(F&& f, pack_type&& pack, Preceding&&... params) {
+        return pack_remainder::template call<Ret>(
+            std::forward<F>(f), static_cast<pack_remainder&&>(pack),
+            std::forward<Preceding>(params)... , std::move(pack.leftmost_value)
+        );
+    }
+};
+
+//! Calls the given function with arguments taken from a stored_pack
+template< typename F, typename Pack >
+void call(F&& f, Pack&& p) {
+    std::decay<Pack>::type::template call<void>(std::forward<F>(f), std::forward<Pack>(p));
+}
+
+template< typename Ret, typename F, typename Pack >
+Ret call_and_return(F&& f, Pack&& p) {
+    return std::decay<Pack>::type::template call<Ret>(std::forward<F>(f), std::forward<Pack>(p));
+}
+
+template< typename... Types >
+stored_pack<Types...> save_pack(Types&&... types) {
+    return stored_pack<Types...>(std::forward<Types>(types)...);
+}
+
+// A structure with the value which is equal to Trait::value
+// but can be used in the immediate context due to parameter T
+template <typename Trait, typename T>
+struct dependent_bool : std::integral_constant<bool, bool(Trait::value)> {};
+
+template <typename Callable>
+struct body_arg_detector;
+
+template <typename Callable, typename ReturnType, typename Arg>
+struct body_arg_detector<ReturnType(Callable::*)(Arg)> {
+    using arg_type = Arg;
+};
+
+template <typename Callable, typename ReturnType, typename Arg>
+struct body_arg_detector<ReturnType(Callable::*)(Arg) const> {
+    using arg_type = Arg;
+};
+
+template <typename Callable>
+struct argument_detector;
+
+template <typename Callable>
+struct argument_detector {
+    using type = typename body_arg_detector<decltype(&Callable::operator())>::arg_type;
+};
+
+template <typename ReturnType, typename Arg>
+struct argument_detector<ReturnType(*)(Arg)> {
+    using type = Arg;
+};
+
+// Detects the argument type of callable, works for callable with one argument.
+template <typename Callable>
+using argument_type_of = typename argument_detector<typename std::decay<Callable>::type>::type;
+
+template <typename T>
+struct type_identity {
+    using type = T;
+};
+
+template <typename T>
+using type_identity_t = typename type_identity<T>::type;
+
+} // inline namespace d0
+} // namespace detail
+} // namespace tbb
+
+#endif // __TBB_detail__template_helpers_H
diff --git a/external/tbb/include/oneapi/tbb/detail/_utils.h b/external/tbb/include/oneapi/tbb/detail/_utils.h
index 2784fff6..1f480702 100644
--- a/external/tbb/include/oneapi/tbb/detail/_utils.h
+++ b/external/tbb/include/oneapi/tbb/detail/_utils.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2023 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -17,358 +17,377 @@
 #ifndef __TBB_detail__utils_H
 #define __TBB_detail__utils_H
 
-#include <atomic>
-#include <cstdint>
 #include <type_traits>
+#include <cstdint>
+#include <atomic>
+#include <functional>
 
-#include "_assert.h"
 #include "_config.h"
+#include "_assert.h"
 #include "_machine.h"
 
 namespace tbb {
-    namespace detail {
-        inline namespace d0 {
+namespace detail {
+inline namespace d0 {
 
-            //! Utility template function to prevent "unused" warnings by various compilers.
-            template <typename... T>
-            void suppress_unused_warning(T&&...) {}
+//! Utility template function to prevent "unused" warnings by various compilers.
+template<typename... T> void suppress_unused_warning(T&&...) {}
 
-            //! Compile-time constant that is upper bound on cache line/sector size.
-            /** It should be used only in situations where having a compile-time upper
+//! Compile-time constant that is upper bound on cache line/sector size.
+/** It should be used only in situations where having a compile-time upper
   bound is more useful than a run-time exact answer.
   @ingroup memory_allocation */
-            constexpr size_t max_nfs_size = 128;
-            constexpr std::size_t max_nfs_size_exp = 7;
-            static_assert(1 << max_nfs_size_exp == max_nfs_size,
-                          "max_nfs_size_exp must be a log2(max_nfs_size)");
-
-            //! Class that implements exponential backoff.
-            class atomic_backoff {
-                //! Time delay, in units of "pause" instructions.
-                /** Should be equal to approximately the number of "pause" instructions
+constexpr size_t max_nfs_size = 128;
+constexpr std::size_t max_nfs_size_exp = 7;
+static_assert(1 << max_nfs_size_exp == max_nfs_size, "max_nfs_size_exp must be a log2(max_nfs_size)");
+
+//! Class that implements exponential backoff.
+class atomic_backoff {
+    //! Time delay, in units of "pause" instructions.
+    /** Should be equal to approximately the number of "pause" instructions
       that take the same time as an context switch. Must be a power of two.*/
-                static constexpr std::int32_t LOOPS_BEFORE_YIELD = 16;
-                std::int32_t count;
-
-            public:
-                // In many cases, an object of this type is initialized eagerly on hot path,
-                // as in for(atomic_backoff b; ; b.pause()) { /*loop body*/ }
-                // For this reason, the construction cost must be very small!
-                atomic_backoff() : count(1) {}
-                // This constructor pauses immediately; do not use on hot paths!
-                atomic_backoff(bool) : count(1) { pause(); }
-
-                //! No Copy
-                atomic_backoff(const atomic_backoff&) = delete;
-                atomic_backoff& operator=(const atomic_backoff&) = delete;
-
-                //! Pause for a while.
-                void pause() {
-                    if (count <= LOOPS_BEFORE_YIELD) {
-                        machine_pause(count);
-                        // Pause twice as long the next time.
-                        count *= 2;
-                    } else {
-                        // Pause is so long that we might as well yield CPU to scheduler.
-                        yield();
-                    }
-                }
-
-                //! Pause for a few times and return false if saturated.
-                bool bounded_pause() {
-                    machine_pause(count);
-                    if (count < LOOPS_BEFORE_YIELD) {
-                        // Pause twice as long the next time.
-                        count *= 2;
-                        return true;
-                    } else {
-                        return false;
-                    }
-                }
-
-                void reset() { count = 1; }
-            };
-
-            //! Spin WHILE the condition is true.
-            /** T and U should be comparable types. */
-            template <typename T, typename C>
-            T spin_wait_while(const std::atomic<T>& location, C comp, std::memory_order order) {
-                atomic_backoff backoff;
-                T snapshot = location.load(order);
-                while (comp(snapshot)) {
-                    backoff.pause();
-                    snapshot = location.load(order);
-                }
-                return snapshot;
-            }
-
-            //! Spin WHILE the value of the variable is equal to a given value
-            /** T and U should be comparable types. */
-            template <typename T, typename U>
-            T spin_wait_while_eq(const std::atomic<T>& location, const U value,
-                                 std::memory_order order = std::memory_order_acquire) {
-                return spin_wait_while(
-                        location, [&value](T t) { return t == value; }, order);
-            }
-
-            //! Spin UNTIL the value of the variable is equal to a given value
-            /** T and U should be comparable types. */
-            template <typename T, typename U>
-            T spin_wait_until_eq(const std::atomic<T>& location, const U value,
-                                 std::memory_order order = std::memory_order_acquire) {
-                return spin_wait_while(
-                        location, [&value](T t) { return t != value; }, order);
-            }
-
-            //! Spin UNTIL the condition returns true or spinning time is up.
-            /** Returns what the passed functor returned last time it was invoked. */
-            template <typename Condition>
-            bool timed_spin_wait_until(Condition condition) {
-                // 32 pauses + 32 yields are meausered as balanced spin time before sleep.
-                bool finish = condition();
-                for (int i = 1; !finish && i < 32; finish = condition(), i *= 2) { machine_pause(i); }
-                for (int i = 32; !finish && i < 64; finish = condition(), ++i) { yield(); }
-                return finish;
-            }
-
-            template <typename T>
-            std::uintptr_t log2(T in) {
-                __TBB_ASSERT(in > 0, "The logarithm of a non-positive value is undefined.");
-                return machine_log2(in);
-            }
-
-            template <typename T>
-            T reverse_bits(T src) {
-                return machine_reverse_bits(src);
-            }
-
-            template <typename T>
-            T reverse_n_bits(T src, std::size_t n) {
-                __TBB_ASSERT(n != 0, "Reverse for 0 bits is undefined behavior.");
-                return reverse_bits(src) >> (number_of_bits<T>() - n);
-            }
-
-            // A function to check if passed integer is a power of two
-            template <typename IntegerType>
-            constexpr bool is_power_of_two(IntegerType arg) {
-                static_assert(std::is_integral<IntegerType>::value,
-                              "An argument for is_power_of_two should be integral type");
-                return arg && (0 == (arg & (arg - 1)));
-            }
-
-            // A function to determine if passed integer is a power of two
-            // at least as big as another power of two, i.e. for strictly positive i and j,
-            // with j being a power of two, determines whether i==j<<k for some nonnegative k
-            template <typename ArgIntegerType, typename DivisorIntegerType>
-            constexpr bool is_power_of_two_at_least(ArgIntegerType arg, DivisorIntegerType divisor) {
-                // Divisor should be a power of two
-                static_assert(std::is_integral<ArgIntegerType>::value,
-                              "An argument for is_power_of_two_at_least should be integral type");
-                return 0 == (arg & (arg - divisor));
-            }
-
-            // A function to compute arg modulo divisor where divisor is a power of 2.
-            template <typename ArgIntegerType, typename DivisorIntegerType>
-            inline ArgIntegerType modulo_power_of_two(ArgIntegerType arg, DivisorIntegerType divisor) {
-                __TBB_ASSERT(is_power_of_two(divisor), "Divisor should be a power of two");
-                return arg & (divisor - 1);
-            }
-
-            //! A function to check if passed in pointer is aligned on a specific border
-            template <typename T>
-            constexpr bool is_aligned(T* pointer, std::uintptr_t alignment) {
-                return 0 == ((std::uintptr_t) pointer & (alignment - 1));
-            }
+    static constexpr std::int32_t LOOPS_BEFORE_YIELD = 16;
+    std::int32_t count;
+
+public:
+    // In many cases, an object of this type is initialized eagerly on hot path,
+    // as in for(atomic_backoff b; ; b.pause()) { /*loop body*/ }
+    // For this reason, the construction cost must be very small!
+    atomic_backoff() : count(1) {}
+    // This constructor pauses immediately; do not use on hot paths!
+    atomic_backoff(bool) : count(1) { pause(); }
+
+    //! No Copy
+    atomic_backoff(const atomic_backoff&) = delete;
+    atomic_backoff& operator=(const atomic_backoff&) = delete;
+
+    //! Pause for a while.
+    void pause() {
+        if (count <= LOOPS_BEFORE_YIELD) {
+            machine_pause(count);
+            // Pause twice as long the next time.
+            count *= 2;
+        } else {
+            // Pause is so long that we might as well yield CPU to scheduler.
+            yield();
+        }
+    }
+
+    //! Pause for a few times and return false if saturated.
+    bool bounded_pause() {
+        machine_pause(count);
+        if (count < LOOPS_BEFORE_YIELD) {
+            // Pause twice as long the next time.
+            count *= 2;
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    void reset() {
+        count = 1;
+    }
+};
+
+//! Spin WHILE the condition is true.
+/** T and U should be comparable types. */
+template <typename T, typename C>
+T spin_wait_while(const std::atomic<T>& location, C comp, std::memory_order order) {
+    atomic_backoff backoff;
+    T snapshot = location.load(order);
+    while (comp(snapshot)) {
+        backoff.pause();
+        snapshot = location.load(order);
+    }
+    return snapshot;
+}
+
+//! Spin WHILE the value of the variable is equal to a given value
+/** T and U should be comparable types. */
+template <typename T, typename U>
+T spin_wait_while_eq(const std::atomic<T>& location, const U value, std::memory_order order = std::memory_order_acquire) {
+    return spin_wait_while(location, [&value](T t) { return t == value; }, order);
+}
+
+//! Spin UNTIL the value of the variable is equal to a given value
+/** T and U should be comparable types. */
+template<typename T, typename U>
+T spin_wait_until_eq(const std::atomic<T>& location, const U value, std::memory_order order = std::memory_order_acquire) {
+    return spin_wait_while(location, [&value](T t) { return t != value; }, order);
+}
+
+//! Spin UNTIL the condition returns true or spinning time is up.
+/** Returns what the passed functor returned last time it was invoked. */
+template <typename Condition>
+bool timed_spin_wait_until(Condition condition) {
+    // 32 pauses + 32 yields are meausered as balanced spin time before sleep.
+    bool finish = condition();
+    for (int i = 1; !finish && i < 32; finish = condition(), i *= 2) {
+        machine_pause(i);
+    }
+    for (int i = 32; !finish && i < 64; finish = condition(), ++i) {
+        yield();
+    }
+    return finish;
+}
+
+template <typename T>
+T clamp(T value, T lower_bound, T upper_bound) {
+    __TBB_ASSERT(lower_bound <= upper_bound, "Incorrect bounds");
+    return value > lower_bound ? (value > upper_bound ? upper_bound : value) : lower_bound;
+}
+
+template <typename T>
+std::uintptr_t log2(T in) {
+    __TBB_ASSERT(in > 0, "The logarithm of a non-positive value is undefined.");
+    return machine_log2(in);
+}
+
+template<typename T>
+T reverse_bits(T src) {
+    return machine_reverse_bits(src);
+}
+
+template<typename T>
+T reverse_n_bits(T src, std::size_t n) {
+    __TBB_ASSERT(n != 0, "Reverse for 0 bits is undefined behavior.");
+    return reverse_bits(src) >> (number_of_bits<T>() - n);
+}
+
+// A function to check if passed integer is a power of two
+template <typename IntegerType>
+constexpr bool is_power_of_two( IntegerType arg ) {
+    static_assert(std::is_integral<IntegerType>::value,
+                  "An argument for is_power_of_two should be integral type");
+    return arg && (0 == (arg & (arg - 1)));
+}
+
+// A function to determine if passed integer is a power of two
+// at least as big as another power of two, i.e. for strictly positive i and j,
+// with j being a power of two, determines whether i==j<<k for some nonnegative k
+template <typename ArgIntegerType, typename DivisorIntegerType>
+constexpr bool is_power_of_two_at_least(ArgIntegerType arg, DivisorIntegerType divisor) {
+    // Divisor should be a power of two
+    static_assert(std::is_integral<ArgIntegerType>::value,
+                  "An argument for is_power_of_two_at_least should be integral type");
+    return 0 == (arg & (arg - divisor));
+}
+
+// A function to compute arg modulo divisor where divisor is a power of 2.
+template<typename ArgIntegerType, typename DivisorIntegerType>
+inline ArgIntegerType modulo_power_of_two(ArgIntegerType arg, DivisorIntegerType divisor) {
+    __TBB_ASSERT( is_power_of_two(divisor), "Divisor should be a power of two" );
+    return arg & (divisor - 1);
+}
+
+//! A function to check if passed in pointer is aligned on a specific border
+template<typename T>
+constexpr bool is_aligned(T* pointer, std::uintptr_t alignment) {
+    return 0 == (reinterpret_cast<std::uintptr_t>(pointer) & (alignment - 1));
+}
 
 #if TBB_USE_ASSERT
-            static void* const poisoned_ptr = reinterpret_cast<void*>(-1);
+static void* const poisoned_ptr = reinterpret_cast<void*>(-1);
 
-            //! Set p to invalid pointer value.
-            template <typename T>
-            inline void poison_pointer(T*& p) {
-                p = reinterpret_cast<T*>(poisoned_ptr);
-            }
+//! Set p to invalid pointer value.
+template<typename T>
+inline void poison_pointer( T* &p ) { p = reinterpret_cast<T*>(poisoned_ptr); }
 
-            template <typename T>
-            inline void poison_pointer(std::atomic<T*>& p) {
-                p.store(reinterpret_cast<T*>(poisoned_ptr), std::memory_order_relaxed);
-            }
+template<typename T>
+inline void poison_pointer(std::atomic<T*>& p) { p.store(reinterpret_cast<T*>(poisoned_ptr), std::memory_order_relaxed); }
 
-            /** Expected to be used in assertions only, thus no empty form is defined. **/
-            template <typename T>
-            inline bool is_poisoned(T* p) {
-                return p == reinterpret_cast<T*>(poisoned_ptr);
-            }
+/** Expected to be used in assertions only, thus no empty form is defined. **/
+template<typename T>
+inline bool is_poisoned( T* p ) { return p == reinterpret_cast<T*>(poisoned_ptr); }
 
-            template <typename T>
-            inline bool is_poisoned(const std::atomic<T*>& p) {
-                return is_poisoned(p.load(std::memory_order_relaxed));
-            }
+template<typename T>
+inline bool is_poisoned(const std::atomic<T*>& p) { return is_poisoned(p.load(std::memory_order_relaxed)); }
 #else
-            template <typename T>
-            inline void poison_pointer(T&) { /*do nothing*/
-            }
+template<typename T>
+inline void poison_pointer(T&) {/*do nothing*/}
 #endif /* !TBB_USE_ASSERT */
 
-            template <std::size_t alignment = 0, typename T>
-            bool assert_pointer_valid(T* p, const char* comment = nullptr) {
-                suppress_unused_warning(p, comment);
-                __TBB_ASSERT(p != nullptr, comment);
-                __TBB_ASSERT(!is_poisoned(p), comment);
+template <std::size_t alignment = 0, typename T>
+bool assert_pointer_valid(T* p, const char* comment = nullptr) {
+    suppress_unused_warning(p, comment);
+    __TBB_ASSERT(p != nullptr, comment);
+    __TBB_ASSERT(!is_poisoned(p), comment);
 #if !(_MSC_VER && _MSC_VER <= 1900 && !__INTEL_COMPILER)
-                __TBB_ASSERT(is_aligned(p, alignment == 0 ? alignof(T) : alignment), comment);
+    __TBB_ASSERT(is_aligned(p, alignment == 0 ? alignof(T) : alignment), comment);
 #endif
-                // Returns something to simplify assert_pointers_valid implementation.
-                return true;
-            }
-
-            template <typename... Args>
-            void assert_pointers_valid(Args*... p) {
-                // suppress_unused_warning is used as an evaluation context for the variadic pack.
-                suppress_unused_warning(assert_pointer_valid(p)...);
-            }
-
-            //! Base class for types that should not be assigned.
-            class no_assign {
-            public:
-                void operator=(const no_assign&) = delete;
-                no_assign(const no_assign&) = default;
-                no_assign() = default;
-            };
-
-            //! Base class for types that should not be copied or assigned.
-            class no_copy : no_assign {
-            public:
-                no_copy(const no_copy&) = delete;
-                no_copy() = default;
-            };
-
-            template <typename T>
-            void swap_atomics_relaxed(std::atomic<T>& lhs, std::atomic<T>& rhs) {
-                T tmp = lhs.load(std::memory_order_relaxed);
-                lhs.store(rhs.load(std::memory_order_relaxed), std::memory_order_relaxed);
-                rhs.store(tmp, std::memory_order_relaxed);
-            }
-
-            //! One-time initialization states
-            enum class do_once_state {
-                uninitialized = 0,    ///< No execution attempts have been undertaken yet
-                pending,              ///< A thread is executing associated do-once routine
-                executed,             ///< Do-once routine has been executed
-                initialized = executed///< Convenience alias
-            };
-
-            //! One-time initialization function
-            /** /param initializer Pointer to function without arguments
+    // Returns something to simplify assert_pointers_valid implementation.
+    return true;
+}
+
+template <typename... Args>
+void assert_pointers_valid(Args*... p) {
+    // suppress_unused_warning is used as an evaluation context for the variadic pack.
+    suppress_unused_warning(assert_pointer_valid(p)...);
+}
+
+//! Base class for types that should not be assigned.
+class no_assign {
+public:
+    void operator=(const no_assign&) = delete;
+    no_assign(const no_assign&) = default;
+    no_assign() = default;
+};
+
+//! Base class for types that should not be copied or assigned.
+class no_copy: no_assign {
+public:
+    no_copy(const no_copy&) = delete;
+    no_copy() = default;
+};
+
+template <typename T>
+void swap_atomics_relaxed(std::atomic<T>& lhs, std::atomic<T>& rhs){
+    T tmp = lhs.load(std::memory_order_relaxed);
+    lhs.store(rhs.load(std::memory_order_relaxed), std::memory_order_relaxed);
+    rhs.store(tmp, std::memory_order_relaxed);
+}
+
+//! One-time initialization states
+enum class do_once_state {
+    uninitialized = 0,      ///< No execution attempts have been undertaken yet
+    pending,                ///< A thread is executing associated do-once routine
+    executed,               ///< Do-once routine has been executed
+    initialized = executed  ///< Convenience alias
+};
+
+//! One-time initialization function
+/** /param initializer Pointer to function without arguments
            The variant that returns bool is used for cases when initialization can fail
            and it is OK to continue execution, but the state should be reset so that
            the initialization attempt was repeated the next time.
     /param state Shared state associated with initializer that specifies its
             initialization state. Must be initially set to #uninitialized value
             (e.g. by means of default static zero initialization). **/
-            template <typename F>
-            void atomic_do_once(const F& initializer, std::atomic<do_once_state>& state) {
-                // The loop in the implementation is necessary to avoid race when thread T2
-                // that arrived in the middle of initialization attempt by another thread T1
-                // has just made initialization possible.
-                // In such a case T2 has to rely on T1 to initialize, but T1 may already be past
-                // the point where it can recognize the changed conditions.
-                do_once_state expected_state;
-                while (state.load(std::memory_order_acquire) != do_once_state::executed) {
-                    if (state.load(std::memory_order_relaxed) == do_once_state::uninitialized) {
-                        expected_state = do_once_state::uninitialized;
+template <typename F>
+void atomic_do_once( const F& initializer, std::atomic<do_once_state>& state ) {
+    // The loop in the implementation is necessary to avoid race when thread T2
+    // that arrived in the middle of initialization attempt by another thread T1
+    // has just made initialization possible.
+    // In such a case T2 has to rely on T1 to initialize, but T1 may already be past
+    // the point where it can recognize the changed conditions.
+    do_once_state expected_state;
+    while ( state.load( std::memory_order_acquire ) != do_once_state::executed ) {
+        if( state.load( std::memory_order_relaxed ) == do_once_state::uninitialized ) {
+            expected_state = do_once_state::uninitialized;
 #if defined(__INTEL_COMPILER) && __INTEL_COMPILER <= 1910
-                        using enum_type = typename std::underlying_type<do_once_state>::type;
-                        if (((std::atomic<enum_type>&) state)
-                                    .compare_exchange_strong((enum_type&) expected_state,
-                                                             (enum_type) do_once_state::pending)) {
+            using enum_type = typename std::underlying_type<do_once_state>::type;
+            if( ((std::atomic<enum_type>&)state).compare_exchange_strong( (enum_type&)expected_state, (enum_type)do_once_state::pending ) ) {
 #else
-                        if (state.compare_exchange_strong(expected_state, do_once_state::pending)) {
+            if( state.compare_exchange_strong( expected_state, do_once_state::pending ) ) {
 #endif
-                            run_initializer(initializer, state);
-                            break;
-                        }
-                    }
-                    spin_wait_while_eq(state, do_once_state::pending);
-                }
-            }
-
-            // Run the initializer which can not fail
-            template <typename Functor>
-            void run_initializer(const Functor& f, std::atomic<do_once_state>& state) {
-                f();
-                state.store(do_once_state::executed, std::memory_order_release);
+                run_initializer( initializer, state );
+                break;
             }
+        }
+        spin_wait_while_eq( state, do_once_state::pending );
+    }
+}
+
+// Run the initializer which can not fail
+template<typename Functor>
+void run_initializer(const Functor& f, std::atomic<do_once_state>& state ) {
+    f();
+    state.store(do_once_state::executed, std::memory_order_release);
+}
 
 #if __TBB_CPP20_CONCEPTS_PRESENT
-            template <typename T>
-            concept boolean_testable_impl = std::convertible_to<T, bool>;
+template <typename T>
+concept boolean_testable_impl = std::convertible_to<T, bool>;
 
-            template <typename T>
-            concept boolean_testable = boolean_testable_impl<T> && requires(T&& t) {
-                { !std::forward<T>(t) } -> boolean_testable_impl;
-            };
+template <typename T>
+concept boolean_testable = boolean_testable_impl<T> && requires( T&& t ) {
+                               { !std::forward<T>(t) } -> boolean_testable_impl;
+                           };
 
 #if __TBB_CPP20_COMPARISONS_PRESENT
-            struct synthesized_three_way_comparator {
-                template <typename T1, typename T2>
-                auto operator()(const T1& lhs, const T2& rhs) const requires requires {
-                    { lhs < rhs } -> boolean_testable;
-                    { rhs < lhs } -> boolean_testable;
-                }
-                {
-                    if constexpr (std::three_way_comparable_with<T1, T2>) {
-                        return lhs <=> rhs;
-                    } else {
-                        if (lhs < rhs) { return std::weak_ordering::less; }
-                        if (rhs < lhs) { return std::weak_ordering::greater; }
-                        return std::weak_ordering::equivalent;
-                    }
-                }
-            };// struct synthesized_three_way_comparator
-
-            template <typename T1, typename T2 = T1>
-            using synthesized_three_way_result
-                    = decltype(synthesized_three_way_comparator {}(std::declval<T1&>(), std::declval<T2&>()));
-
-#endif// __TBB_CPP20_COMPARISONS_PRESENT
-
-            // Check if the type T is implicitly OR explicitly convertible to U
-            template <typename T, typename U>
-            concept relaxed_convertible_to = std::constructible_from<U, T>;
-
-            template <typename T, typename U>
-            concept adaptive_same_as =
-#if __TBB_STRICT_CONSTRAINTS
-                    std::same_as<T, U>;
-#else
-                    std::convertible_to<T, U>;
-#endif
-#endif// __TBB_CPP20_CONCEPTS_PRESENT
-
-        }// namespace d0
-
-        namespace d1 {
-
-            class delegate_base {
-            public:
-                virtual bool operator()() const = 0;
-                virtual ~delegate_base() {}
-            };
-
-            template <typename FuncType>
-            class delegated_function : public delegate_base {
-            public:
-                delegated_function(FuncType& f) : my_func(f) {}
+struct synthesized_three_way_comparator {
+    template <typename T1, typename T2>
+    auto operator()( const T1& lhs, const T2& rhs ) const
+        requires requires {
+            { lhs < rhs } -> boolean_testable;
+            { rhs < lhs } -> boolean_testable;
+        }
+    {
+        if constexpr (std::three_way_comparable_with<T1, T2>) {
+            return lhs <=> rhs;
+        } else {
+            if (lhs < rhs) {
+                return std::weak_ordering::less;
+            }
+            if (rhs < lhs) {
+                return std::weak_ordering::greater;
+            }
+            return std::weak_ordering::equivalent;
+        }
+    }
+}; // struct synthesized_three_way_comparator
 
-                bool operator()() const override { return my_func(); }
+template <typename T1, typename T2 = T1>
+using synthesized_three_way_result = decltype(synthesized_three_way_comparator{}(std::declval<T1&>(),
+                                                                                 std::declval<T2&>()));
 
-            private:
-                FuncType& my_func;
-            };
-        }// namespace d1
+#endif // __TBB_CPP20_COMPARISONS_PRESENT
 
-    }// namespace detail
-}// namespace tbb
+// Check if the type T is implicitly OR explicitly convertible to U
+template <typename T, typename U>
+concept relaxed_convertible_to = std::constructible_from<U, T>;
 
-#endif// __TBB_detail__utils_H
+template <typename T, typename U>
+concept adaptive_same_as =
+#if __TBB_STRICT_CONSTRAINTS
+    std::same_as<T, U>;
+#else
+    std::convertible_to<T, U>;
+#endif
+#endif // __TBB_CPP20_CONCEPTS_PRESENT
+
+template <typename F, typename... Args>
+auto invoke(F&& f, Args&&... args)
+#if __TBB_CPP17_INVOKE_PRESENT
+    noexcept(std::is_nothrow_invocable_v<F, Args...>)
+    -> std::invoke_result_t<F, Args...>
+{
+    return std::invoke(std::forward<F>(f), std::forward<Args>(args)...);
+}
+#else // __TBB_CPP17_INVOKE_PRESENT
+    noexcept(noexcept(std::forward<F>(f)(std::forward<Args>(args)...)))
+    -> decltype(std::forward<F>(f)(std::forward<Args>(args)...))
+{
+    return std::forward<F>(f)(std::forward<Args>(args)...);
+}
+#endif // __TBB_CPP17_INVOKE_PRESENT
+
+} // namespace d0
+
+namespace d1 {
+
+class delegate_base {
+public:
+    virtual bool operator()() const = 0;
+    virtual ~delegate_base() {}
+};
+
+template <typename FuncType>
+class delegated_function : public delegate_base {
+public:
+    delegated_function(FuncType& f) : my_func(f) {}
+
+    bool operator()() const override {
+        return my_func();
+    }
+
+private:
+    FuncType &my_func;
+};
+} // namespace d1
+
+} // namespace detail
+} // namespace tbb
+
+#endif // __TBB_detail__utils_H
diff --git a/external/tbb/include/oneapi/tbb/detail/_waitable_atomic.h b/external/tbb/include/oneapi/tbb/detail/_waitable_atomic.h
index c008e947..1b18d11e 100644
--- a/external/tbb/include/oneapi/tbb/detail/_waitable_atomic.h
+++ b/external/tbb/include/oneapi/tbb/detail/_waitable_atomic.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2021 Intel Corporation
+    Copyright (c) 2021-2023 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -20,75 +20,71 @@
 #include "_utils.h"
 
 namespace tbb {
-    namespace detail {
-
-        namespace r1 {
-            TBB_EXPORT void __TBB_EXPORTED_FUNC wait_on_address(void* address,
-                                                                d1::delegate_base& wakeup_condition,
-                                                                std::uintptr_t context);
-            TBB_EXPORT void __TBB_EXPORTED_FUNC notify_by_address(void* address, std::uintptr_t context);
-            TBB_EXPORT void __TBB_EXPORTED_FUNC notify_by_address_one(void* address);
-            TBB_EXPORT void __TBB_EXPORTED_FUNC notify_by_address_all(void* address);
-        }// namespace r1
-
-        namespace d1 {
-
-            template <typename Predicate>
-            void adaptive_wait_on_address(void* address, Predicate wakeup_condition, std::uintptr_t context) {
-                if (!timed_spin_wait_until(wakeup_condition)) {
-                    d1::delegated_function<Predicate> pred(wakeup_condition);
-                    r1::wait_on_address(address, pred, context);
-                }
-            }
-
-            template <typename T>
-            class waitable_atomic {
-            public:
-                waitable_atomic() = default;
-
-                explicit waitable_atomic(T value) : my_atomic(value) {}
-
-                waitable_atomic(const waitable_atomic&) = delete;
-                waitable_atomic& operator=(const waitable_atomic&) = delete;
-
-                T load(std::memory_order order) const noexcept { return my_atomic.load(order); }
-
-                T exchange(T desired) noexcept { return my_atomic.exchange(desired); }
-
-                void wait(T old, std::uintptr_t context, std::memory_order order) {
-                    auto wakeup_condition = [&] { return my_atomic.load(order) != old; };
-                    if (!timed_spin_wait_until(wakeup_condition)) {
-                        // We need to use while here, because notify_all() will wake up all threads
-                        // But predicate for them might be false
-                        d1::delegated_function<decltype(wakeup_condition)> pred(wakeup_condition);
-                        do { r1::wait_on_address(this, pred, context); } while (!wakeup_condition());
-                    }
-                }
-
-                void wait_until(T expected, std::uintptr_t context, std::memory_order order) {
-                    auto wakeup_condition = [&] { return my_atomic.load(order) == expected; };
-                    if (!timed_spin_wait_until(wakeup_condition)) {
-                        // We need to use while here, because notify_all() will wake up all threads
-                        // But predicate for them might be false
-                        d1::delegated_function<decltype(wakeup_condition)> pred(wakeup_condition);
-                        do { r1::wait_on_address(this, pred, context); } while (!wakeup_condition());
-                    }
-                }
-
-                void notify_relaxed(std::uintptr_t context) { r1::notify_by_address(this, context); }
-
-                void notify_one_relaxed() { r1::notify_by_address_one(this); }
-
-                // TODO: consider adding following interfaces:
-                // store(desired, memory_order)
-                // notify_all_relaxed()
-
-            private:
-                std::atomic<T> my_atomic {};
-            };
-
-        }// namespace d1
-    }    // namespace detail
-}// namespace tbb
-
-#endif// __TBB_detail__address_waiters_H
+namespace detail {
+
+namespace r1 {
+TBB_EXPORT void __TBB_EXPORTED_FUNC wait_on_address(void* address, d1::delegate_base& wakeup_condition, std::uintptr_t context);
+TBB_EXPORT void __TBB_EXPORTED_FUNC notify_by_address(void* address, std::uintptr_t context);
+TBB_EXPORT void __TBB_EXPORTED_FUNC notify_by_address_one(void* address);
+TBB_EXPORT void __TBB_EXPORTED_FUNC notify_by_address_all(void* address);
+} // namespace r1
+
+namespace d1 {
+
+template <typename Predicate>
+void adaptive_wait_on_address(void* address, Predicate wakeup_condition, std::uintptr_t context) {
+    if (!timed_spin_wait_until(wakeup_condition)) {
+        d1::delegated_function<Predicate> pred(wakeup_condition);
+        r1::wait_on_address(address, pred, context);
+    }
+}
+
+template <typename T>
+class waitable_atomic {
+public:
+    waitable_atomic() = default;
+
+    explicit waitable_atomic(T value) : my_atomic(value) {}
+
+    waitable_atomic(const waitable_atomic&) = delete;
+    waitable_atomic& operator=(const waitable_atomic&) = delete;
+
+    T load(std::memory_order order) const noexcept {
+        return my_atomic.load(order);
+    }
+
+    T exchange(T desired) noexcept {
+        return my_atomic.exchange(desired);
+    }
+
+    void wait(T old, std::uintptr_t context, std::memory_order order) {
+        auto wakeup_condition = [&] { return my_atomic.load(order) != old; };
+        if (!timed_spin_wait_until(wakeup_condition)) {
+            // We need to use while here, because notify_all() will wake up all threads
+            // But predicate for them might be false
+            d1::delegated_function<decltype(wakeup_condition)> pred(wakeup_condition);
+            do {
+                r1::wait_on_address(this, pred, context);
+            } while (!wakeup_condition());
+        }
+    }
+
+    void notify_one_relaxed() {
+        r1::notify_by_address_one(this);
+    }
+
+    // TODO: consider adding following interfaces:
+    // store(desired, memory_order)
+    // notify_all_relaxed()
+    // wait_until(T, std::uintptr_t, std::memory_order)
+    // notify_relaxed(std::uintptr_t context)
+
+private:
+    std::atomic<T> my_atomic{};
+};
+
+} // namespace d1
+} // namespace detail
+} // namespace tbb
+
+#endif // __TBB_detail__address_waiters_H
diff --git a/external/tbb/include/oneapi/tbb/enumerable_thread_specific.h b/external/tbb/include/oneapi/tbb/enumerable_thread_specific.h
index 3d5d9522..caa53fa0 100644
--- a/external/tbb/include/oneapi/tbb/enumerable_thread_specific.h
+++ b/external/tbb/include/oneapi/tbb/enumerable_thread_specific.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -17,678 +17,692 @@
 #ifndef __TBB_enumerable_thread_specific_H
 #define __TBB_enumerable_thread_specific_H
 
-#include "detail/_aligned_space.h"
-#include "detail/_assert.h"
 #include "detail/_config.h"
 #include "detail/_namespace_injection.h"
+#include "detail/_assert.h"
 #include "detail/_template_helpers.h"
+#include "detail/_aligned_space.h"
 
-#include "cache_aligned_allocator.h"
 #include "concurrent_vector.h"
-#include "profiling.h"
 #include "tbb_allocator.h"
+#include "cache_aligned_allocator.h"
+#include "profiling.h"
 
 #include <atomic>
-#include <cstddef>// std::ptrdiff_t
-#include <cstring>// memcpy
 #include <thread>
+#include <cstring> // memcpy
+#include <cstddef> // std::ptrdiff_t
 
-#include "task.h"// for task::suspend_point
+#include "task.h" // for task::suspend_point
 
 #if _WIN32 || _WIN64
+#ifndef NOMINMAX
+#define NOMINMAX
+#define __TBB_DEFINED_NOMINMAX 1
+#endif
 #include <windows.h>
+#if __TBB_DEFINED_NOMINMAX
+#undef NOMINMAX
+#undef __TBB_DEFINED_NOMINMAX
+#endif
 #else
 #include <pthread.h>
 #endif
 
 namespace tbb {
-    namespace detail {
-        namespace d1 {
+namespace detail {
+namespace d1 {
 
-            //! enum for selecting between single key and key-per-instance versions
-            enum ets_key_usage_type {
-                ets_key_per_instance,
-                ets_no_key
+//! enum for selecting between single key and key-per-instance versions
+enum ets_key_usage_type {
+    ets_key_per_instance
+    , ets_no_key
 #if __TBB_RESUMABLE_TASKS
-                ,
-                ets_suspend_aware
+    , ets_suspend_aware
 #endif
-            };
+};
 
-            // Forward declaration to use in internal classes
-            template <typename T, typename Allocator, ets_key_usage_type ETS_key_type>
-            class enumerable_thread_specific;
+// Forward declaration to use in internal classes
+template <typename T, typename Allocator, ets_key_usage_type ETS_key_type>
+class enumerable_thread_specific;
 
-            template <std::size_t ThreadIDSize>
-            struct internal_ets_key_selector {
-                using key_type = std::thread::id;
-                static key_type current_key() { return std::this_thread::get_id(); }
-            };
+template <std::size_t ThreadIDSize>
+struct internal_ets_key_selector {
+    using key_type = std::thread::id;
+    static key_type current_key() {
+        return std::this_thread::get_id();
+    }
+};
 
 // Intel Compiler on OSX cannot create atomics objects that instantiated from non-fundamental types
 #if __INTEL_COMPILER && __APPLE__
-            template <>
-            struct internal_ets_key_selector<sizeof(std::size_t)> {
-                using key_type = std::size_t;
-                static key_type current_key() {
-                    auto id = std::this_thread::get_id();
-                    return reinterpret_cast<key_type&>(id);
-                }
-            };
+template<>
+struct internal_ets_key_selector<sizeof(std::size_t)> {
+    using key_type = std::size_t;
+    static key_type current_key() {
+        auto id = std::this_thread::get_id();
+        return reinterpret_cast<key_type&>(id);
+    }
+};
 #endif
 
-            template <ets_key_usage_type ETS_key_type>
-            struct ets_key_selector : internal_ets_key_selector<sizeof(std::thread::id)> {};
+template <ets_key_usage_type ETS_key_type>
+struct ets_key_selector : internal_ets_key_selector<sizeof(std::thread::id)> {};
 
 #if __TBB_RESUMABLE_TASKS
-            template <>
-            struct ets_key_selector<ets_suspend_aware> {
-                using key_type = suspend_point;
-                static key_type current_key() { return r1::current_suspend_point(); }
-            };
+template <>
+struct ets_key_selector<ets_suspend_aware> {
+    using key_type = suspend_point;
+    static key_type current_key() {
+        return r1::current_suspend_point();
+    }
+};
 #endif
 
-            template <ets_key_usage_type ETS_key_type>
-            class ets_base : detail::no_copy {
-            protected:
-                using key_type = typename ets_key_selector<ETS_key_type>::key_type;
-
-            public:
-                struct slot;
-                struct array {
-                    array* next;
-                    std::size_t lg_size;
-                    slot& at(std::size_t k) {
-                        return (reinterpret_cast<slot*>(reinterpret_cast<void*>(this + 1)))[k];
-                    }
-                    std::size_t size() const { return std::size_t(1) << lg_size; }
-                    std::size_t mask() const { return size() - 1; }
-                    std::size_t start(std::size_t h) const {
-                        return h >> (8 * sizeof(std::size_t) - lg_size);
-                    }
-                };
-                struct slot {
-                    std::atomic<key_type> key;
-                    void* ptr;
-                    bool empty() const { return key.load(std::memory_order_relaxed) == key_type(); }
-                    bool match(key_type k) const { return key.load(std::memory_order_relaxed) == k; }
-                    bool claim(key_type k) {
-                        // TODO: maybe claim ptr, because key_type is not guaranteed to fit into word size
-                        key_type expected = key_type();
-                        return key.compare_exchange_strong(expected, k);
-                    }
-                };
-
-            protected:
-                //! Root of linked list of arrays of decreasing size.
-                /** nullptr if and only if my_count==0.
+template<ets_key_usage_type ETS_key_type>
+class ets_base : detail::no_copy {
+protected:
+    using key_type = typename ets_key_selector<ETS_key_type>::key_type;
+
+public:
+    struct slot;
+    struct array {
+        array* next;
+        std::size_t lg_size;
+        slot& at( std::size_t k ) {
+            return (reinterpret_cast<slot*>(reinterpret_cast<void*>(this+1)))[k];
+        }
+        std::size_t size() const { return std::size_t(1) << lg_size; }
+        std::size_t mask() const { return size() - 1; }
+        std::size_t start( std::size_t h ) const {
+            return h >> (8 * sizeof(std::size_t) - lg_size);
+        }
+    };
+    struct slot {
+        std::atomic<key_type> key;
+        void* ptr;
+        bool empty() const { return key.load(std::memory_order_relaxed) == key_type(); }
+        bool match( key_type k ) const { return key.load(std::memory_order_relaxed) == k; }
+        bool claim( key_type k ) {
+            // TODO: maybe claim ptr, because key_type is not guaranteed to fit into word size
+            key_type expected = key_type();
+            return key.compare_exchange_strong(expected, k);
+        }
+    };
+
+protected:
+    //! Root of linked list of arrays of decreasing size.
+    /** nullptr if and only if my_count==0.
         Each array in the list is half the size of its predecessor. */
-                std::atomic<array*> my_root;
-                std::atomic<std::size_t> my_count;
-
-                virtual void* create_local() = 0;
-                virtual void* create_array(std::size_t _size) = 0;        // _size in bytes
-                virtual void free_array(void* ptr, std::size_t _size) = 0;// _size in bytes
-
-                array* allocate(std::size_t lg_size) {
-                    std::size_t n = std::size_t(1) << lg_size;
-                    array* a = static_cast<array*>(create_array(sizeof(array) + n * sizeof(slot)));
-                    a->lg_size = lg_size;
-                    std::memset(a + 1, 0, n * sizeof(slot));
-                    return a;
-                }
-                void free(array* a) {
-                    std::size_t n = std::size_t(1) << (a->lg_size);
-                    free_array(static_cast<void*>(a), std::size_t(sizeof(array) + n * sizeof(slot)));
-                }
-
-                ets_base() : my_root {nullptr}, my_count {0} {}
-                virtual ~ets_base();// g++ complains if this is not virtual
-
-                void* table_lookup(bool& exists);
-                void table_clear();
-                // The following functions are not used in concurrent context,
-                // so we don't need synchronization and ITT annotations there.
-                template <ets_key_usage_type E2>
-                void table_elementwise_copy(const ets_base& other,
-                                            void* (*add_element)(ets_base<E2>&, void*) ) {
-                    __TBB_ASSERT(!my_root.load(std::memory_order_relaxed), NULL);
-                    __TBB_ASSERT(!my_count.load(std::memory_order_relaxed), NULL);
-                    if (!other.my_root.load(std::memory_order_relaxed)) return;
-                    array* root = allocate(other.my_root.load(std::memory_order_relaxed)->lg_size);
-                    my_root.store(root, std::memory_order_relaxed);
-                    root->next = nullptr;
-                    my_count.store(other.my_count.load(std::memory_order_relaxed), std::memory_order_relaxed);
-                    std::size_t mask = root->mask();
-                    for (array* r = other.my_root.load(std::memory_order_relaxed); r; r = r->next) {
-                        for (std::size_t i = 0; i < r->size(); ++i) {
-                            slot& s1 = r->at(i);
-                            if (!s1.empty()) {
-                                for (std::size_t j = root->start(
-                                             std::hash<key_type> {}(s1.key.load(std::memory_order_relaxed)));
-                                     ; j = (j + 1) & mask) {
-                                    slot& s2 = root->at(j);
-                                    if (s2.empty()) {
-                                        s2.ptr = add_element(static_cast<ets_base<E2>&>(*this), s1.ptr);
-                                        s2.key.store(s1.key.load(std::memory_order_relaxed),
-                                                     std::memory_order_relaxed);
-                                        break;
-                                    } else if (s2.match(s1.key.load(std::memory_order_relaxed)))
-                                        break;
-                                }
-                            }
+    std::atomic<array*> my_root;
+    std::atomic<std::size_t> my_count;
+
+    virtual void* create_local() = 0;
+    virtual void* create_array(std::size_t _size) = 0;  // _size in bytes
+    virtual void free_array(void* ptr, std::size_t _size) = 0; // _size in bytes
+
+    array* allocate( std::size_t lg_size ) {
+        std::size_t n = std::size_t(1) << lg_size;
+        array* a = static_cast<array*>(create_array(sizeof(array) + n * sizeof(slot)));
+        a->lg_size = lg_size;
+        std::memset( a + 1, 0, n * sizeof(slot) );
+        return a;
+    }
+    void deallocate(array* a) {
+        std::size_t n = std::size_t(1) << (a->lg_size);
+        free_array( static_cast<void*>(a), std::size_t(sizeof(array) + n * sizeof(slot)) );
+    }
+
+    ets_base() : my_root{nullptr}, my_count{0} {}
+    virtual ~ets_base();  // g++ complains if this is not virtual
+
+    void* table_lookup( bool& exists );
+    void  table_clear();
+    // The following functions are not used in concurrent context,
+    // so we don't need synchronization and ITT annotations there.
+    template <ets_key_usage_type E2>
+    void table_elementwise_copy( const ets_base& other,
+                                 void*(*add_element)(ets_base<E2>&, void*) ) {
+        __TBB_ASSERT(!my_root.load(std::memory_order_relaxed), nullptr);
+        __TBB_ASSERT(!my_count.load(std::memory_order_relaxed), nullptr);
+        if( !other.my_root.load(std::memory_order_relaxed) ) return;
+        array* root = allocate(other.my_root.load(std::memory_order_relaxed)->lg_size);
+        my_root.store(root, std::memory_order_relaxed);
+        root->next = nullptr;
+        my_count.store(other.my_count.load(std::memory_order_relaxed), std::memory_order_relaxed);
+        std::size_t mask = root->mask();
+        for( array* r = other.my_root.load(std::memory_order_relaxed); r; r = r->next ) {
+            for( std::size_t i = 0; i < r->size(); ++i ) {
+                slot& s1 = r->at(i);
+                if( !s1.empty() ) {
+                    for( std::size_t j = root->start(std::hash<key_type>{}(s1.key.load(std::memory_order_relaxed))); ; j = (j+1)&mask ) {
+                        slot& s2 = root->at(j);
+                        if( s2.empty() ) {
+                            s2.ptr = add_element(static_cast<ets_base<E2>&>(*this), s1.ptr);
+                            s2.key.store(s1.key.load(std::memory_order_relaxed), std::memory_order_relaxed);
+                            break;
                         }
+                        else if( s2.match(s1.key.load(std::memory_order_relaxed)) )
+                            break;
                     }
                 }
-                void table_swap(ets_base& other) {
-                    __TBB_ASSERT(this != &other, "Don't swap an instance with itself");
-                    swap_atomics_relaxed(my_root, other.my_root);
-                    swap_atomics_relaxed(my_count, other.my_count);
-                }
-            };
-
-            template <ets_key_usage_type ETS_key_type>
-            ets_base<ETS_key_type>::~ets_base() {
-                __TBB_ASSERT(!my_root.load(std::memory_order_relaxed), nullptr);
             }
-
-            template <ets_key_usage_type ETS_key_type>
-            void ets_base<ETS_key_type>::table_clear() {
-                while (array* r = my_root.load(std::memory_order_relaxed)) {
-                    my_root.store(r->next, std::memory_order_relaxed);
-                    free(r);
+        }
+    }
+    void table_swap( ets_base& other ) {
+       __TBB_ASSERT(this!=&other, "Don't swap an instance with itself");
+       swap_atomics_relaxed(my_root, other.my_root);
+       swap_atomics_relaxed(my_count, other.my_count);
+    }
+};
+
+template<ets_key_usage_type ETS_key_type>
+ets_base<ETS_key_type>::~ets_base() {
+    __TBB_ASSERT(!my_root.load(std::memory_order_relaxed), nullptr);
+}
+
+template<ets_key_usage_type ETS_key_type>
+void ets_base<ETS_key_type>::table_clear() {
+    while ( array* r = my_root.load(std::memory_order_relaxed) ) {
+        my_root.store(r->next, std::memory_order_relaxed);
+        deallocate(r);
+    }
+    my_count.store(0, std::memory_order_relaxed);
+}
+
+template<ets_key_usage_type ETS_key_type>
+void* ets_base<ETS_key_type>::table_lookup( bool& exists ) {
+    const key_type k = ets_key_selector<ETS_key_type>::current_key();
+
+    __TBB_ASSERT(k != key_type(), nullptr);
+    void* found;
+    std::size_t h = std::hash<key_type>{}(k);
+    for( array* r = my_root.load(std::memory_order_acquire); r; r = r->next ) {
+        call_itt_notify(acquired,r);
+        std::size_t mask=r->mask();
+        for(std::size_t i = r->start(h); ;i=(i+1)&mask) {
+            slot& s = r->at(i);
+            if( s.empty() ) break;
+            if( s.match(k) ) {
+                if( r == my_root.load(std::memory_order_acquire) ) {
+                    // Success at top level
+                    exists = true;
+                    return s.ptr;
+                } else {
+                    // Success at some other level.  Need to insert at top level.
+                    exists = true;
+                    found = s.ptr;
+                    goto insert;
                 }
-                my_count.store(0, std::memory_order_relaxed);
             }
-
-            template <ets_key_usage_type ETS_key_type>
-            void* ets_base<ETS_key_type>::table_lookup(bool& exists) {
-                const key_type k = ets_key_selector<ETS_key_type>::current_key();
-
-                __TBB_ASSERT(k != key_type(), NULL);
-                void* found;
-                std::size_t h = std::hash<key_type> {}(k);
-                for (array* r = my_root.load(std::memory_order_acquire); r; r = r->next) {
-                    call_itt_notify(acquired, r);
-                    std::size_t mask = r->mask();
-                    for (std::size_t i = r->start(h);; i = (i + 1) & mask) {
-                        slot& s = r->at(i);
-                        if (s.empty()) break;
-                        if (s.match(k)) {
-                            if (r == my_root.load(std::memory_order_acquire)) {
-                                // Success at top level
-                                exists = true;
-                                return s.ptr;
-                            } else {
-                                // Success at some other level.  Need to insert at top level.
-                                exists = true;
-                                found = s.ptr;
-                                goto insert;
-                            }
-                        }
-                    }
-                }
-                // Key does not yet exist.  The density of slots in the table does not exceed 0.5,
-                // for if this will occur a new table is allocated with double the current table
-                // size, which is swapped in as the new root table.  So an empty slot is guaranteed.
-                exists = false;
-                found = create_local();
-                {
-                    std::size_t c = ++my_count;
-                    array* r = my_root.load(std::memory_order_acquire);
-                    call_itt_notify(acquired, r);
-                    if (!r || c > r->size() / 2) {
-                        std::size_t s = r ? r->lg_size : 2;
-                        while (c > std::size_t(1) << (s - 1)) ++s;
-                        array* a = allocate(s);
-                        for (;;) {
-                            a->next = r;
-                            call_itt_notify(releasing, a);
-                            array* new_r = r;
-                            if (my_root.compare_exchange_strong(new_r, a)) break;
-                            call_itt_notify(acquired, new_r);
-                            __TBB_ASSERT(new_r != nullptr, nullptr);
-                            if (new_r->lg_size >= s) {
-                                // Another thread inserted an equal or  bigger array, so our array is superfluous.
-                                free(a);
-                                break;
-                            }
-                            r = new_r;
-                        }
-                    }
-                }
-            insert:
-                // Whether a slot has been found in an older table, or if it has been inserted at this level,
-                // it has already been accounted for in the total.  Guaranteed to be room for it, and it is
-                // not present, so search for empty slot and use it.
-                array* ir = my_root.load(std::memory_order_acquire);
-                call_itt_notify(acquired, ir);
-                std::size_t mask = ir->mask();
-                for (std::size_t i = ir->start(h);; i = (i + 1) & mask) {
-                    slot& s = ir->at(i);
-                    if (s.empty()) {
-                        if (s.claim(k)) {
-                            s.ptr = found;
-                            return found;
-                        }
-                    }
+        }
+    }
+    // Key does not yet exist.  The density of slots in the table does not exceed 0.5,
+    // for if this will occur a new table is allocated with double the current table
+    // size, which is swapped in as the new root table.  So an empty slot is guaranteed.
+    exists = false;
+    found = create_local();
+    {
+        std::size_t c = ++my_count;
+        array* r = my_root.load(std::memory_order_acquire);
+        call_itt_notify(acquired,r);
+        if( !r || c > r->size()/2 ) {
+            std::size_t s = r ? r->lg_size : 2;
+            while( c > std::size_t(1)<<(s-1) ) ++s;
+            array* a = allocate(s);
+            for(;;) {
+                a->next = r;
+                call_itt_notify(releasing,a);
+                array* new_r = r;
+                if( my_root.compare_exchange_strong(new_r, a) ) break;
+                call_itt_notify(acquired, new_r);
+                __TBB_ASSERT(new_r != nullptr, nullptr);
+                if( new_r->lg_size >= s ) {
+                    // Another thread inserted an equal or  bigger array, so our array is superfluous.
+                    deallocate(a);
+                    break;
                 }
+                r = new_r;
             }
-
-            //! Specialization that exploits native TLS
-            template <>
-            class ets_base<ets_key_per_instance> : public ets_base<ets_no_key> {
-                using super = ets_base<ets_no_key>;
-#if _WIN32 || _WIN64
+        }
+    }
+    insert:
+    // Whether a slot has been found in an older table, or if it has been inserted at this level,
+    // it has already been accounted for in the total.  Guaranteed to be room for it, and it is
+    // not present, so search for empty slot and use it.
+    array* ir = my_root.load(std::memory_order_acquire);
+    call_itt_notify(acquired, ir);
+    std::size_t mask = ir->mask();
+    for(std::size_t i = ir->start(h);; i = (i+1)&mask) {
+        slot& s = ir->at(i);
+        if( s.empty() ) {
+            if( s.claim(k) ) {
+                s.ptr = found;
+                return found;
+            }
+        }
+    }
+}
+
+//! Specialization that exploits native TLS
+template <>
+class ets_base<ets_key_per_instance>: public ets_base<ets_no_key> {
+    using super = ets_base<ets_no_key>;
+#if _WIN32||_WIN64
 #if __TBB_WIN8UI_SUPPORT
-                using tls_key_t = DWORD;
-                void create_key() { my_key = FlsAlloc(NULL); }
-                void destroy_key() { FlsFree(my_key); }
-                void set_tls(void* value) { FlsSetValue(my_key, (LPVOID) value); }
-                void* get_tls() { return (void*) FlsGetValue(my_key); }
+    using tls_key_t = DWORD;
+    void create_key() { my_key = FlsAlloc(nullptr); }
+    void destroy_key() { FlsFree(my_key); }
+    void set_tls(void * value) { FlsSetValue(my_key, (LPVOID)value); }
+    void* get_tls() { return (void *)FlsGetValue(my_key); }
 #else
-                using tls_key_t = DWORD;
-                void create_key() { my_key = TlsAlloc(); }
-                void destroy_key() { TlsFree(my_key); }
-                void set_tls(void* value) { TlsSetValue(my_key, (LPVOID) value); }
-                void* get_tls() { return (void*) TlsGetValue(my_key); }
+    using tls_key_t = DWORD;
+    void create_key() { my_key = TlsAlloc(); }
+    void destroy_key() { TlsFree(my_key); }
+    void set_tls(void * value) { TlsSetValue(my_key, (LPVOID)value); }
+    void* get_tls() { return (void *)TlsGetValue(my_key); }
 #endif
 #else
-                using tls_key_t = pthread_key_t;
-                void create_key() { pthread_key_create(&my_key, NULL); }
-                void destroy_key() { pthread_key_delete(my_key); }
-                void set_tls(void* value) const { pthread_setspecific(my_key, value); }
-                void* get_tls() const { return pthread_getspecific(my_key); }
+    using tls_key_t = pthread_key_t;
+    void create_key() { pthread_key_create(&my_key, nullptr); }
+    void destroy_key() { pthread_key_delete(my_key); }
+    void set_tls( void * value ) const { pthread_setspecific(my_key, value); }
+    void* get_tls() const { return pthread_getspecific(my_key); }
 #endif
-                tls_key_t my_key;
-                virtual void* create_local() override = 0;
-                virtual void* create_array(std::size_t _size) override = 0;        // _size in bytes
-                virtual void free_array(void* ptr, std::size_t _size) override = 0;// size in bytes
-            protected:
-                ets_base() { create_key(); }
-                ~ets_base() { destroy_key(); }
-                void* table_lookup(bool& exists) {
-                    void* found = get_tls();
-                    if (found) {
-                        exists = true;
-                    } else {
-                        found = super::table_lookup(exists);
-                        set_tls(found);
-                    }
-                    return found;
-                }
-                void table_clear() {
-                    destroy_key();
-                    create_key();
-                    super::table_clear();
-                }
-                void table_swap(ets_base& other) {
-                    using std::swap;
-                    __TBB_ASSERT(this != &other, "Don't swap an instance with itself");
-                    swap(my_key, other.my_key);
-                    super::table_swap(other);
-                }
-            };
-
-            //! Random access iterator for traversing the thread local copies.
-            template <typename Container, typename Value>
-            class enumerable_thread_specific_iterator {
-                //! current position in the concurrent_vector
-
-                Container* my_container;
-                typename Container::size_type my_index;
-                mutable Value* my_value;
-
-                template <typename C, typename T, typename U>
-                friend bool operator==(const enumerable_thread_specific_iterator<C, T>& i,
-                                       const enumerable_thread_specific_iterator<C, U>& j);
-
-                template <typename C, typename T, typename U>
-                friend bool operator<(const enumerable_thread_specific_iterator<C, T>& i,
-                                      const enumerable_thread_specific_iterator<C, U>& j);
-
-                template <typename C, typename T, typename U>
-                friend std::ptrdiff_t operator-(const enumerable_thread_specific_iterator<C, T>& i,
-                                                const enumerable_thread_specific_iterator<C, U>& j);
-
-                template <typename C, typename U>
-                friend class enumerable_thread_specific_iterator;
-
-            public:
-                //! STL support
-                using difference_type = std::ptrdiff_t;
-                using value_type = Value;
-                using pointer = Value*;
-                using reference = Value&;
-                using iterator_category = std::random_access_iterator_tag;
-
-                enumerable_thread_specific_iterator(const Container& container,
-                                                    typename Container::size_type index)
-                    : my_container(&const_cast<Container&>(container)), my_index(index), my_value(nullptr) {}
-
-                //! Default constructor
-                enumerable_thread_specific_iterator()
-                    : my_container(nullptr), my_index(0), my_value(nullptr) {}
-
-                template <typename U>
-                enumerable_thread_specific_iterator(
-                        const enumerable_thread_specific_iterator<Container, U>& other)
-                    : my_container(other.my_container), my_index(other.my_index),
-                      my_value(const_cast<Value*>(other.my_value)) {}
-
-                enumerable_thread_specific_iterator operator+(std::ptrdiff_t offset) const {
-                    return enumerable_thread_specific_iterator(*my_container, my_index + offset);
-                }
-
-                friend enumerable_thread_specific_iterator operator+(std::ptrdiff_t offset,
-                                                                     enumerable_thread_specific_iterator v) {
-                    return enumerable_thread_specific_iterator(*v.my_container, v.my_index + offset);
-                }
-
-                enumerable_thread_specific_iterator& operator+=(std::ptrdiff_t offset) {
-                    my_index += offset;
-                    my_value = nullptr;
-                    return *this;
-                }
-
-                enumerable_thread_specific_iterator operator-(std::ptrdiff_t offset) const {
-                    return enumerable_thread_specific_iterator(*my_container, my_index - offset);
-                }
-
-                enumerable_thread_specific_iterator& operator-=(std::ptrdiff_t offset) {
-                    my_index -= offset;
-                    my_value = nullptr;
-                    return *this;
-                }
-
-                Value& operator*() const {
-                    Value* value = my_value;
-                    if (!value) { value = my_value = (*my_container)[my_index].value(); }
-                    __TBB_ASSERT(value == (*my_container)[my_index].value(), "corrupt cache");
-                    return *value;
-                }
-
-                Value& operator[](std::ptrdiff_t k) const { return *(*my_container)[my_index + k].value(); }
-
-                Value* operator->() const { return &operator*(); }
-
-                enumerable_thread_specific_iterator& operator++() {
-                    ++my_index;
-                    my_value = nullptr;
-                    return *this;
-                }
-
-                enumerable_thread_specific_iterator& operator--() {
-                    --my_index;
-                    my_value = nullptr;
-                    return *this;
-                }
-
-                //! Post increment
-                enumerable_thread_specific_iterator operator++(int) {
-                    enumerable_thread_specific_iterator result = *this;
-                    ++my_index;
-                    my_value = nullptr;
-                    return result;
-                }
-
-                //! Post decrement
-                enumerable_thread_specific_iterator operator--(int) {
-                    enumerable_thread_specific_iterator result = *this;
-                    --my_index;
-                    my_value = nullptr;
-                    return result;
-                }
-            };
-
-            template <typename Container, typename T, typename U>
-            bool operator==(const enumerable_thread_specific_iterator<Container, T>& i,
-                            const enumerable_thread_specific_iterator<Container, U>& j) {
-                return i.my_index == j.my_index && i.my_container == j.my_container;
-            }
-
-            template <typename Container, typename T, typename U>
-            bool operator!=(const enumerable_thread_specific_iterator<Container, T>& i,
-                            const enumerable_thread_specific_iterator<Container, U>& j) {
-                return !(i == j);
-            }
-
-            template <typename Container, typename T, typename U>
-            bool operator<(const enumerable_thread_specific_iterator<Container, T>& i,
-                           const enumerable_thread_specific_iterator<Container, U>& j) {
-                return i.my_index < j.my_index;
-            }
-
-            template <typename Container, typename T, typename U>
-            bool operator>(const enumerable_thread_specific_iterator<Container, T>& i,
-                           const enumerable_thread_specific_iterator<Container, U>& j) {
-                return j < i;
-            }
-
-            template <typename Container, typename T, typename U>
-            bool operator>=(const enumerable_thread_specific_iterator<Container, T>& i,
-                            const enumerable_thread_specific_iterator<Container, U>& j) {
-                return !(i < j);
-            }
-
-            template <typename Container, typename T, typename U>
-            bool operator<=(const enumerable_thread_specific_iterator<Container, T>& i,
-                            const enumerable_thread_specific_iterator<Container, U>& j) {
-                return !(j < i);
-            }
-
-            template <typename Container, typename T, typename U>
-            std::ptrdiff_t operator-(const enumerable_thread_specific_iterator<Container, T>& i,
-                                     const enumerable_thread_specific_iterator<Container, U>& j) {
-                return i.my_index - j.my_index;
-            }
-
-            template <typename SegmentedContainer, typename Value>
-            class segmented_iterator {
-                template <typename C, typename T, typename U>
-                friend bool operator==(const segmented_iterator<C, T>& i, const segmented_iterator<C, U>& j);
-
-                template <typename C, typename T, typename U>
-                friend bool operator!=(const segmented_iterator<C, T>& i, const segmented_iterator<C, U>& j);
-
-                template <typename C, typename U>
-                friend class segmented_iterator;
-
-            public:
-                segmented_iterator() { my_segcont = nullptr; }
-
-                segmented_iterator(const SegmentedContainer& _segmented_container)
-                    : my_segcont(const_cast<SegmentedContainer*>(&_segmented_container)),
-                      outer_iter(my_segcont->end()) {}
-
-                ~segmented_iterator() {}
-
-                using InnerContainer = typename SegmentedContainer::value_type;
-                using inner_iterator = typename InnerContainer::iterator;
-                using outer_iterator = typename SegmentedContainer::iterator;
-
-                // STL support
-                // TODO: inherit all types from segmented container?
-                using difference_type = std::ptrdiff_t;
-                using value_type = Value;
-                using size_type = typename SegmentedContainer::size_type;
-                using pointer = Value*;
-                using reference = Value&;
-                using iterator_category = std::input_iterator_tag;
-
-                // Copy Constructor
-                template <typename U>
-                segmented_iterator(const segmented_iterator<SegmentedContainer, U>& other)
-                    : my_segcont(other.my_segcont), outer_iter(other.outer_iter),
-                      // can we assign a default-constructed iterator to inner if we're at the end?
-                      inner_iter(other.inner_iter) {}
-
-                // assignment
-                template <typename U>
-                segmented_iterator& operator=(const segmented_iterator<SegmentedContainer, U>& other) {
-                    my_segcont = other.my_segcont;
-                    outer_iter = other.outer_iter;
-                    if (outer_iter != my_segcont->end()) inner_iter = other.inner_iter;
-                    return *this;
-                }
-
-                // allow assignment of outer iterator to segmented iterator.  Once it is
-                // assigned, move forward until a non-empty inner container is found or
-                // the end of the outer container is reached.
-                segmented_iterator& operator=(const outer_iterator& new_outer_iter) {
-                    __TBB_ASSERT(my_segcont != nullptr, NULL);
-                    // check that this iterator points to something inside the segmented container
-                    for (outer_iter = new_outer_iter; outer_iter != my_segcont->end(); ++outer_iter) {
-                        if (!outer_iter->empty()) {
-                            inner_iter = outer_iter->begin();
-                            break;
-                        }
-                    }
-                    return *this;
-                }
-
-                // pre-increment
-                segmented_iterator& operator++() {
-                    advance_me();
-                    return *this;
-                }
-
-                // post-increment
-                segmented_iterator operator++(int) {
-                    segmented_iterator tmp = *this;
-                    operator++();
-                    return tmp;
-                }
-
-                bool operator==(const outer_iterator& other_outer) const {
-                    __TBB_ASSERT(my_segcont != nullptr, NULL);
-                    return (outer_iter == other_outer
-                            && (outer_iter == my_segcont->end() || inner_iter == outer_iter->begin()));
-                }
-
-                bool operator!=(const outer_iterator& other_outer) const { return !operator==(other_outer); }
-
-                // (i)* RHS
-                reference operator*() const {
-                    __TBB_ASSERT(my_segcont != nullptr, NULL);
-                    __TBB_ASSERT(outer_iter != my_segcont->end(),
-                                 "Dereferencing a pointer at end of container");
-                    __TBB_ASSERT(inner_iter != outer_iter->end(), NULL);// should never happen
-                    return *inner_iter;
-                }
-
-                // i->
-                pointer operator->() const { return &operator*(); }
-
-            private:
-                SegmentedContainer* my_segcont;
-                outer_iterator outer_iter;
-                inner_iterator inner_iter;
-
-                void advance_me() {
-                    __TBB_ASSERT(my_segcont != nullptr, NULL);
-                    __TBB_ASSERT(outer_iter != my_segcont->end(),
-                                 NULL);// not true if there are no inner containers
-                    __TBB_ASSERT(inner_iter != outer_iter->end(),
-                                 NULL);// not true if the inner containers are all empty.
-                    ++inner_iter;
-                    while (inner_iter == outer_iter->end() && ++outer_iter != my_segcont->end()) {
-                        inner_iter = outer_iter->begin();
-                    }
-                }
-            };// segmented_iterator
-
-            template <typename SegmentedContainer, typename T, typename U>
-            bool operator==(const segmented_iterator<SegmentedContainer, T>& i,
-                            const segmented_iterator<SegmentedContainer, U>& j) {
-                if (i.my_segcont != j.my_segcont) return false;
-                if (i.my_segcont == nullptr) return true;
-                if (i.outer_iter != j.outer_iter) return false;
-                if (i.outer_iter == i.my_segcont->end()) return true;
-                return i.inner_iter == j.inner_iter;
+    tls_key_t my_key;
+    virtual void* create_local() override = 0;
+    virtual void* create_array(std::size_t _size) override = 0;  // _size in bytes
+    virtual void free_array(void* ptr, std::size_t _size) override = 0; // size in bytes
+protected:
+    ets_base() {create_key();}
+    ~ets_base() {destroy_key();}
+    void* table_lookup( bool& exists ) {
+        void* found = get_tls();
+        if( found ) {
+            exists=true;
+        } else {
+            found = super::table_lookup(exists);
+            set_tls(found);
+        }
+        return found;
+    }
+    void table_clear() {
+        destroy_key();
+        create_key();
+        super::table_clear();
+    }
+    void table_swap( ets_base& other ) {
+       using std::swap;
+       __TBB_ASSERT(this!=&other, "Don't swap an instance with itself");
+       swap(my_key, other.my_key);
+       super::table_swap(other);
+    }
+};
+
+//! Random access iterator for traversing the thread local copies.
+template< typename Container, typename Value >
+class enumerable_thread_specific_iterator
+{
+    //! current position in the concurrent_vector
+
+    Container *my_container;
+    typename Container::size_type my_index;
+    mutable Value *my_value;
+
+    template<typename C, typename T, typename U>
+    friend bool operator==( const enumerable_thread_specific_iterator<C, T>& i,
+                     const enumerable_thread_specific_iterator<C, U>& j );
+
+    template<typename C, typename T, typename U>
+    friend bool operator<( const enumerable_thread_specific_iterator<C,T>& i,
+                           const enumerable_thread_specific_iterator<C,U>& j );
+
+    template<typename C, typename T, typename U>
+    friend std::ptrdiff_t operator-( const enumerable_thread_specific_iterator<C,T>& i,
+                                const enumerable_thread_specific_iterator<C,U>& j );
+
+    template<typename C, typename U>
+    friend class enumerable_thread_specific_iterator;
+
+public:
+    //! STL support
+    using difference_type = std::ptrdiff_t;
+    using value_type = Value;
+    using pointer = Value*;
+    using reference = Value&;
+    using iterator_category = std::random_access_iterator_tag;
+
+    enumerable_thread_specific_iterator( const Container &container, typename Container::size_type index ) :
+        my_container(&const_cast<Container &>(container)), my_index(index), my_value(nullptr) {}
+
+    //! Default constructor
+    enumerable_thread_specific_iterator() : my_container(nullptr), my_index(0), my_value(nullptr) {}
+
+    template<typename U>
+    enumerable_thread_specific_iterator( const enumerable_thread_specific_iterator<Container, U>& other ) :
+            my_container( other.my_container ), my_index( other.my_index), my_value( const_cast<Value *>(other.my_value) ) {}
+
+    enumerable_thread_specific_iterator operator+( std::ptrdiff_t offset ) const {
+        return enumerable_thread_specific_iterator(*my_container, my_index + offset);
+    }
+
+    friend enumerable_thread_specific_iterator operator+( std::ptrdiff_t offset, enumerable_thread_specific_iterator v ) {
+        return enumerable_thread_specific_iterator(*v.my_container, v.my_index + offset);
+    }
+
+    enumerable_thread_specific_iterator &operator+=( std::ptrdiff_t offset ) {
+        my_index += offset;
+        my_value = nullptr;
+        return *this;
+    }
+
+    enumerable_thread_specific_iterator operator-( std::ptrdiff_t offset ) const {
+        return enumerable_thread_specific_iterator( *my_container, my_index-offset );
+    }
+
+    enumerable_thread_specific_iterator &operator-=( std::ptrdiff_t offset ) {
+        my_index -= offset;
+        my_value = nullptr;
+        return *this;
+    }
+
+    Value& operator*() const {
+        Value* value = my_value;
+        if( !value ) {
+            value = my_value = (*my_container)[my_index].value();
+        }
+        __TBB_ASSERT( value==(*my_container)[my_index].value(), "corrupt cache" );
+        return *value;
+    }
+
+    Value& operator[]( std::ptrdiff_t k ) const {
+       return *(*my_container)[my_index + k].value();
+    }
+
+    Value* operator->() const {return &operator*();}
+
+    enumerable_thread_specific_iterator& operator++() {
+        ++my_index;
+        my_value = nullptr;
+        return *this;
+    }
+
+    enumerable_thread_specific_iterator& operator--() {
+        --my_index;
+        my_value = nullptr;
+        return *this;
+    }
+
+    //! Post increment
+    enumerable_thread_specific_iterator operator++(int) {
+        enumerable_thread_specific_iterator result = *this;
+        ++my_index;
+        my_value = nullptr;
+        return result;
+    }
+
+    //! Post decrement
+    enumerable_thread_specific_iterator operator--(int) {
+        enumerable_thread_specific_iterator result = *this;
+        --my_index;
+        my_value = nullptr;
+        return result;
+    }
+};
+
+template<typename Container, typename T, typename U>
+bool operator==( const enumerable_thread_specific_iterator<Container, T>& i,
+                 const enumerable_thread_specific_iterator<Container, U>& j ) {
+    return i.my_index == j.my_index && i.my_container == j.my_container;
+}
+
+template<typename Container, typename T, typename U>
+bool operator!=( const enumerable_thread_specific_iterator<Container,T>& i,
+                 const enumerable_thread_specific_iterator<Container,U>& j ) {
+    return !(i==j);
+}
+
+template<typename Container, typename T, typename U>
+bool operator<( const enumerable_thread_specific_iterator<Container,T>& i,
+                const enumerable_thread_specific_iterator<Container,U>& j ) {
+    return i.my_index<j.my_index;
+}
+
+template<typename Container, typename T, typename U>
+bool operator>( const enumerable_thread_specific_iterator<Container,T>& i,
+                const enumerable_thread_specific_iterator<Container,U>& j ) {
+    return j<i;
+}
+
+template<typename Container, typename T, typename U>
+bool operator>=( const enumerable_thread_specific_iterator<Container,T>& i,
+                 const enumerable_thread_specific_iterator<Container,U>& j ) {
+    return !(i<j);
+}
+
+template<typename Container, typename T, typename U>
+bool operator<=( const enumerable_thread_specific_iterator<Container,T>& i,
+                 const enumerable_thread_specific_iterator<Container,U>& j ) {
+    return !(j<i);
+}
+
+template<typename Container, typename T, typename U>
+std::ptrdiff_t operator-( const enumerable_thread_specific_iterator<Container,T>& i,
+                     const enumerable_thread_specific_iterator<Container,U>& j ) {
+    return i.my_index-j.my_index;
+}
+
+template<typename SegmentedContainer, typename Value >
+class segmented_iterator
+{
+    template<typename C, typename T, typename U>
+    friend bool operator==(const segmented_iterator<C,T>& i, const segmented_iterator<C,U>& j);
+
+    template<typename C, typename T, typename U>
+    friend bool operator!=(const segmented_iterator<C,T>& i, const segmented_iterator<C,U>& j);
+
+    template<typename C, typename U>
+    friend class segmented_iterator;
+
+public:
+    segmented_iterator() {my_segcont = nullptr;}
+
+    segmented_iterator( const SegmentedContainer& _segmented_container ) :
+        my_segcont(const_cast<SegmentedContainer*>(&_segmented_container)),
+        outer_iter(my_segcont->end()) { }
+
+    ~segmented_iterator() {}
+
+    using InnerContainer = typename SegmentedContainer::value_type;
+    using inner_iterator = typename InnerContainer::iterator;
+    using outer_iterator = typename SegmentedContainer::iterator;
+
+    // STL support
+    // TODO: inherit all types from segmented container?
+    using difference_type = std::ptrdiff_t;
+    using value_type = Value;
+    using size_type = typename SegmentedContainer::size_type;
+    using pointer = Value*;
+    using reference = Value&;
+    using iterator_category = std::input_iterator_tag;
+
+    // Copy Constructor
+    template<typename U>
+    segmented_iterator(const segmented_iterator<SegmentedContainer, U>& other) :
+        my_segcont(other.my_segcont),
+        outer_iter(other.outer_iter),
+        // can we assign a default-constructed iterator to inner if we're at the end?
+        inner_iter(other.inner_iter)
+    {}
+
+    // assignment
+    template<typename U>
+    segmented_iterator& operator=( const segmented_iterator<SegmentedContainer, U>& other) {
+        my_segcont = other.my_segcont;
+        outer_iter = other.outer_iter;
+        if(outer_iter != my_segcont->end()) inner_iter = other.inner_iter;
+        return *this;
+    }
+
+    // allow assignment of outer iterator to segmented iterator.  Once it is
+    // assigned, move forward until a non-empty inner container is found or
+    // the end of the outer container is reached.
+    segmented_iterator& operator=(const outer_iterator& new_outer_iter) {
+        __TBB_ASSERT(my_segcont != nullptr, nullptr);
+        // check that this iterator points to something inside the segmented container
+        for(outer_iter = new_outer_iter ;outer_iter!=my_segcont->end(); ++outer_iter) {
+            if( !outer_iter->empty() ) {
+                inner_iter = outer_iter->begin();
+                break;
             }
-
-            // !=
-            template <typename SegmentedContainer, typename T, typename U>
-            bool operator!=(const segmented_iterator<SegmentedContainer, T>& i,
-                            const segmented_iterator<SegmentedContainer, U>& j) {
-                return !(i == j);
-            }
-
-            template <typename T>
-            struct construct_by_default : no_assign {
-                void construct(void* where) {
-                    new (where) T();
-                }// C++ note: the () in T() ensure zero initialization.
-                construct_by_default(int) {}
-            };
-
-            template <typename T>
-            struct construct_by_exemplar : no_assign {
-                const T exemplar;
-                void construct(void* where) { new (where) T(exemplar); }
-                construct_by_exemplar(const T& t) : exemplar(t) {}
-                construct_by_exemplar(T&& t) : exemplar(std::move(t)) {}
-            };
-
-            template <typename T, typename Finit>
-            struct construct_by_finit : no_assign {
-                Finit f;
-                void construct(void* where) { new (where) T(f()); }
-                construct_by_finit(Finit&& f_) : f(std::move(f_)) {}
-            };
-
-            template <typename T, typename... P>
-            struct construct_by_args : no_assign {
-                stored_pack<P...> pack;
-                void construct(void* where) {
-                    call([where](const typename std::decay<P>::type&... args) { new (where) T(args...); },
-                         pack);
-                }
-                construct_by_args(P&&... args) : pack(std::forward<P>(args)...) {}
-            };
-
-            // storage for initialization function pointer
-            // TODO: consider removing the template parameter T here and in callback_leaf
-            class callback_base {
-            public:
-                // Clone *this
-                virtual callback_base* clone() const = 0;
-                // Destruct and free *this
-                virtual void destroy() = 0;
-                // Need virtual destructor to satisfy GCC compiler warning
-                virtual ~callback_base() {}
-                // Construct T at where
-                virtual void construct(void* where) = 0;
-            };
-
-            template <typename Constructor>
-            class callback_leaf : public callback_base, Constructor {
-                template <typename... P>
-                callback_leaf(P&&... params) : Constructor(std::forward<P>(params)...) {}
-                // TODO: make the construction/destruction consistent (use allocator.construct/destroy)
-                using my_allocator_type = typename tbb::tbb_allocator<callback_leaf>;
-
-                callback_base* clone() const override { return make(*this); }
-
-                void destroy() override {
-                    my_allocator_type alloc;
-                    tbb::detail::allocator_traits<my_allocator_type>::destroy(alloc, this);
-                    tbb::detail::allocator_traits<my_allocator_type>::deallocate(alloc, this, 1);
-                }
-
-                void construct(void* where) override { Constructor::construct(where); }
-
-            public:
-                template <typename... P>
-                static callback_base* make(P&&... params) {
-                    void* where = my_allocator_type().allocate(1);
-                    return new (where) callback_leaf(std::forward<P>(params)...);
-                }
-            };
-
-            //! Template for recording construction of objects in table
-            /** All maintenance of the space will be done explicitly on push_back,
+        }
+        return *this;
+    }
+
+    // pre-increment
+    segmented_iterator& operator++() {
+        advance_me();
+        return *this;
+    }
+
+    // post-increment
+    segmented_iterator operator++(int) {
+        segmented_iterator tmp = *this;
+        operator++();
+        return tmp;
+    }
+
+    bool operator==(const outer_iterator& other_outer) const {
+        __TBB_ASSERT(my_segcont != nullptr, nullptr);
+        return (outer_iter == other_outer &&
+                (outer_iter == my_segcont->end() || inner_iter == outer_iter->begin()));
+    }
+
+    bool operator!=(const outer_iterator& other_outer) const {
+        return !operator==(other_outer);
+
+    }
+
+    // (i)* RHS
+    reference operator*() const {
+        __TBB_ASSERT(my_segcont != nullptr, nullptr);
+        __TBB_ASSERT(outer_iter != my_segcont->end(), "Dereferencing a pointer at end of container");
+        __TBB_ASSERT(inner_iter != outer_iter->end(), nullptr); // should never happen
+        return *inner_iter;
+    }
+
+    // i->
+    pointer operator->() const { return &operator*();}
+
+private:
+    SegmentedContainer* my_segcont;
+    outer_iterator outer_iter;
+    inner_iterator inner_iter;
+
+    void advance_me() {
+        __TBB_ASSERT(my_segcont != nullptr, nullptr);
+        __TBB_ASSERT(outer_iter != my_segcont->end(), nullptr); // not true if there are no inner containers
+        __TBB_ASSERT(inner_iter != outer_iter->end(), nullptr); // not true if the inner containers are all empty.
+        ++inner_iter;
+        while(inner_iter == outer_iter->end() && ++outer_iter != my_segcont->end()) {
+            inner_iter = outer_iter->begin();
+        }
+    }
+};    // segmented_iterator
+
+template<typename SegmentedContainer, typename T, typename U>
+bool operator==( const segmented_iterator<SegmentedContainer,T>& i,
+                 const segmented_iterator<SegmentedContainer,U>& j ) {
+    if(i.my_segcont != j.my_segcont) return false;
+    if(i.my_segcont == nullptr) return true;
+    if(i.outer_iter != j.outer_iter) return false;
+    if(i.outer_iter == i.my_segcont->end()) return true;
+    return i.inner_iter == j.inner_iter;
+}
+
+// !=
+template<typename SegmentedContainer, typename T, typename U>
+bool operator!=( const segmented_iterator<SegmentedContainer,T>& i,
+                 const segmented_iterator<SegmentedContainer,U>& j ) {
+    return !(i==j);
+}
+
+template<typename T>
+struct construct_by_default: no_assign {
+    void construct(void*where) {new(where) T();} // C++ note: the () in T() ensure zero initialization.
+    construct_by_default( int ) {}
+};
+
+template<typename T>
+struct construct_by_exemplar: no_assign {
+    const T exemplar;
+    void construct(void*where) {new(where) T(exemplar);}
+    construct_by_exemplar( const T& t ) : exemplar(t) {}
+    construct_by_exemplar( T&& t ) : exemplar(std::move(t)) {}
+};
+
+template<typename T, typename Finit>
+struct construct_by_finit: no_assign {
+    Finit f;
+    void construct(void* where) {new(where) T(f());}
+    construct_by_finit( Finit&& f_ ) : f(std::move(f_)) {}
+};
+
+template<typename T, typename... P>
+struct construct_by_args: no_assign {
+    stored_pack<P...> pack;
+    void construct(void* where) {
+        call( [where](const typename std::decay<P>::type&... args ){
+           new(where) T(args...);
+        }, pack );
+    }
+    construct_by_args( P&& ... args ) : pack(std::forward<P>(args)...) {}
+};
+
+// storage for initialization function pointer
+// TODO: consider removing the template parameter T here and in callback_leaf
+class callback_base {
+public:
+    // Clone *this
+    virtual callback_base* clone() const = 0;
+    // Destruct and free *this
+    virtual void destroy() = 0;
+    // Need virtual destructor to satisfy GCC compiler warning
+    virtual ~callback_base() { }
+    // Construct T at where
+    virtual void construct(void* where) = 0;
+};
+
+template <typename Constructor>
+class callback_leaf: public callback_base, Constructor {
+    template<typename... P> callback_leaf( P&& ... params ) : Constructor(std::forward<P>(params)...) {}
+    // TODO: make the construction/destruction consistent (use allocator.construct/destroy)
+    using my_allocator_type = typename tbb::tbb_allocator<callback_leaf>;
+
+    callback_base* clone() const override {
+        return make(*this);
+    }
+
+    void destroy() override {
+        my_allocator_type alloc;
+        tbb::detail::allocator_traits<my_allocator_type>::destroy(alloc, this);
+        tbb::detail::allocator_traits<my_allocator_type>::deallocate(alloc, this, 1);
+    }
+
+    void construct(void* where) override {
+        Constructor::construct(where);
+    }
+
+public:
+    template<typename... P>
+    static callback_base* make( P&& ... params ) {
+        void* where = my_allocator_type().allocate(1);
+        return new(where) callback_leaf( std::forward<P>(params)... );
+    }
+};
+
+//! Template for recording construction of objects in table
+/** All maintenance of the space will be done explicitly on push_back,
     and all thread local copies must be destroyed before the concurrent
     vector is deleted.
 
@@ -696,40 +710,34 @@ namespace tbb {
     successfully-constructed, set the flag to true or call value_committed().
     If the constructor throws, the flag will be false.
 */
-            template <typename U>
-            struct ets_element {
-                detail::aligned_space<U> my_space;
-                bool is_built;
-                ets_element() { is_built = false; }// not currently-built
-                U* value() { return my_space.begin(); }
-                U* value_committed() {
-                    is_built = true;
-                    return my_space.begin();
-                }
-                ~ets_element() {
-                    if (is_built) {
-                        my_space.begin()->~U();
-                        is_built = false;
-                    }
-                }
-            };
-
-            // A predicate that can be used for a compile-time compatibility check of ETS instances
-            // Ideally, it should have been declared inside the ETS class, but unfortunately
-            // in that case VS2013 does not enable the variadic constructor.
-            template <typename T, typename ETS>
-            struct is_compatible_ets : std::false_type {};
-            template <typename T, typename U, typename A, ets_key_usage_type C>
-            struct is_compatible_ets<T, enumerable_thread_specific<U, A, C>> : std::is_same<T, U> {};
-
-            // A predicate that checks whether, for a variable 'foo' of type T, foo() is a valid expression
-            template <typename T>
-            using has_empty_braces_operator = decltype(std::declval<T>()());
-            template <typename T>
-            using is_callable_no_args = supports<T, has_empty_braces_operator>;
-
-            //! The enumerable_thread_specific container
-            /** enumerable_thread_specific has the following properties:
+template<typename U>
+struct ets_element {
+    detail::aligned_space<U> my_space;
+    bool is_built;
+    ets_element() { is_built = false; }  // not currently-built
+    U* value() { return my_space.begin(); }
+    U* value_committed() { is_built = true; return my_space.begin(); }
+    ~ets_element() {
+        if(is_built) {
+            my_space.begin()->~U();
+            is_built = false;
+        }
+    }
+};
+
+// A predicate that can be used for a compile-time compatibility check of ETS instances
+// Ideally, it should have been declared inside the ETS class, but unfortunately
+// in that case VS2013 does not enable the variadic constructor.
+template<typename T, typename ETS> struct is_compatible_ets : std::false_type {};
+template<typename T, typename U, typename A, ets_key_usage_type C>
+struct is_compatible_ets< T, enumerable_thread_specific<U,A,C> > : std::is_same<T, U> {};
+
+// A predicate that checks whether, for a variable 'foo' of type T, foo() is a valid expression
+template <typename T> using has_empty_braces_operator = decltype(std::declval<T>()());
+template <typename T> using is_callable_no_args = supports<T, has_empty_braces_operator>;
+
+//! The enumerable_thread_specific container
+/** enumerable_thread_specific has the following properties:
     - thread-local copies are lazily created, with default, exemplar or function initialization.
     - thread-local copies do not move (during lifetime, and excepting clear()) so the address of a copy is invariant.
     - the contained objects need not have operator=() defined if combine is not used.
@@ -748,371 +756,366 @@ namespace tbb {
     - Both are evaluated in serial context (the methods are assumed to be non-benign.)
 
 @ingroup containers */
-            template <typename T, typename Allocator = cache_aligned_allocator<T>,
-                      ets_key_usage_type ETS_key_type = ets_no_key>
-            class enumerable_thread_specific : ets_base<ETS_key_type> {
-
-                template <typename U, typename A, ets_key_usage_type C>
-                friend class enumerable_thread_specific;
-
-                using padded_element = padded<ets_element<T>>;
-
-                //! A generic range, used to create range objects from the iterators
-                template <typename I>
-                class generic_range_type : public blocked_range<I> {
-                public:
-                    using value_type = T;
-                    using reference = T&;
-                    using const_reference = const T&;
-                    using iterator = I;
-                    using difference_type = std::ptrdiff_t;
-
-                    generic_range_type(I begin_, I end_, std::size_t grainsize_ = 1)
-                        : blocked_range<I>(begin_, end_, grainsize_) {}
-                    template <typename U>
-                    generic_range_type(const generic_range_type<U>& r)
-                        : blocked_range<I>(r.begin(), r.end(), r.grainsize()) {}
-                    generic_range_type(generic_range_type& r, split) : blocked_range<I>(r, split()) {}
-                };
-
-                using allocator_traits_type = tbb::detail::allocator_traits<Allocator>;
-
-                using padded_allocator_type =
-                        typename allocator_traits_type::template rebind_alloc<padded_element>;
-                using internal_collection_type
-                        = tbb::concurrent_vector<padded_element, padded_allocator_type>;
-
-                callback_base* my_construct_callback;
-
-                internal_collection_type my_locals;
-
-                // TODO: consider unifying the callback mechanism for all create_local* methods below
-                //   (likely non-compatible and requires interface version increase)
-                void* create_local() override {
-                    padded_element& lref = *my_locals.grow_by(1);
-                    my_construct_callback->construct(lref.value());
-                    return lref.value_committed();
-                }
-
-                static void* create_local_by_copy(ets_base<ETS_key_type>& base, void* p) {
-                    enumerable_thread_specific& ets = static_cast<enumerable_thread_specific&>(base);
-                    padded_element& lref = *ets.my_locals.grow_by(1);
-                    new (lref.value()) T(*static_cast<T*>(p));
-                    return lref.value_committed();
-                }
-
-                static void* create_local_by_move(ets_base<ETS_key_type>& base, void* p) {
-                    enumerable_thread_specific& ets = static_cast<enumerable_thread_specific&>(base);
-                    padded_element& lref = *ets.my_locals.grow_by(1);
-                    new (lref.value()) T(std::move(*static_cast<T*>(p)));
-                    return lref.value_committed();
-                }
-
-                using array_allocator_type = typename allocator_traits_type::template rebind_alloc<uintptr_t>;
-
-                // _size is in bytes
-                void* create_array(std::size_t _size) override {
-                    std::size_t nelements = (_size + sizeof(uintptr_t) - 1) / sizeof(uintptr_t);
-                    return array_allocator_type().allocate(nelements);
-                }
-
-                void free_array(void* _ptr, std::size_t _size) override {
-                    std::size_t nelements = (_size + sizeof(uintptr_t) - 1) / sizeof(uintptr_t);
-                    array_allocator_type().deallocate(reinterpret_cast<uintptr_t*>(_ptr), nelements);
-                }
-
-            public:
-                //! Basic types
-                using value_type = T;
-                using allocator_type = Allocator;
-                using size_type = typename internal_collection_type::size_type;
-                using difference_type = typename internal_collection_type::difference_type;
-                using reference = value_type&;
-                using const_reference = const value_type&;
-
-                using pointer = typename allocator_traits_type::pointer;
-                using const_pointer = typename allocator_traits_type::const_pointer;
-
-                // Iterator types
-                using iterator = enumerable_thread_specific_iterator<internal_collection_type, value_type>;
-                using const_iterator
-                        = enumerable_thread_specific_iterator<internal_collection_type, const value_type>;
-
-                // Parallel range types
-                using range_type = generic_range_type<iterator>;
-                using const_range_type = generic_range_type<const_iterator>;
-
-                //! Default constructor.  Each local instance of T is default constructed.
-                enumerable_thread_specific()
-                    : my_construct_callback(
-                            callback_leaf<construct_by_default<T>>::make(/*dummy argument*/ 0)) {}
-
-                //! Constructor with initializer functor. Each local instance of T is constructed by T(finit()).
-                template <typename Finit, typename = typename std::enable_if<is_callable_no_args<
-                                                  typename std::decay<Finit>::type>::value>::type>
-                explicit enumerable_thread_specific(Finit finit)
-                    : my_construct_callback(
-                            callback_leaf<construct_by_finit<T, Finit>>::make(std::move(finit))) {}
-
-                //! Constructor with exemplar. Each local instance of T is copy-constructed from the exemplar.
-                explicit enumerable_thread_specific(const T& exemplar)
-                    : my_construct_callback(callback_leaf<construct_by_exemplar<T>>::make(exemplar)) {}
-
-                explicit enumerable_thread_specific(T&& exemplar)
-                    : my_construct_callback(
-                            callback_leaf<construct_by_exemplar<T>>::make(std::move(exemplar))) {}
-
-                //! Variadic constructor with initializer arguments.  Each local instance of T is constructed by T(args...)
-                template <typename P1, typename... P,
-                          typename = typename std::enable_if<
-                                  !is_callable_no_args<typename std::decay<P1>::type>::value
-                                  && !is_compatible_ets<T, typename std::decay<P1>::type>::value
-                                  && !std::is_same<T, typename std::decay<P1>::type>::value>::type>
-                enumerable_thread_specific(P1&& arg1, P&&... args)
-                    : my_construct_callback(callback_leaf<construct_by_args<T, P1, P...>>::make(
-                            std::forward<P1>(arg1), std::forward<P>(args)...)) {}
-
-                //! Destructor
-                ~enumerable_thread_specific() {
-                    if (my_construct_callback) my_construct_callback->destroy();
-                    // Deallocate the hash table before overridden free_array() becomes inaccessible
-                    this->ets_base<ETS_key_type>::table_clear();
-                }
-
-                //! returns reference to local, discarding exists
-                reference local() {
-                    bool exists;
-                    return local(exists);
-                }
-
-                //! Returns reference to calling thread's local copy, creating one if necessary
-                reference local(bool& exists) {
-                    void* ptr = this->table_lookup(exists);
-                    return *(T*) ptr;
-                }
-
-                //! Get the number of local copies
-                size_type size() const { return my_locals.size(); }
-
-                //! true if there have been no local copies created
-                bool empty() const { return my_locals.empty(); }
-
-                //! begin iterator
-                iterator begin() { return iterator(my_locals, 0); }
-                //! end iterator
-                iterator end() { return iterator(my_locals, my_locals.size()); }
-
-                //! begin const iterator
-                const_iterator begin() const { return const_iterator(my_locals, 0); }
-
-                //! end const iterator
-                const_iterator end() const { return const_iterator(my_locals, my_locals.size()); }
-
-                //! Get range for parallel algorithms
-                range_type range(std::size_t grainsize = 1) { return range_type(begin(), end(), grainsize); }
-
-                //! Get const range for parallel algorithms
-                const_range_type range(std::size_t grainsize = 1) const {
-                    return const_range_type(begin(), end(), grainsize);
-                }
-
-                //! Destroys local copies
-                void clear() {
-                    my_locals.clear();
-                    this->table_clear();
-                    // callback is not destroyed
-                }
-
-            private:
-                template <typename A2, ets_key_usage_type C2>
-                void internal_copy(const enumerable_thread_specific<T, A2, C2>& other) {
-                    // this tests is_compatible_ets
-                    static_assert((is_compatible_ets<T, typename std::decay<decltype(other)>::type>::value),
-                                  "is_compatible_ets fails");
-                    // Initialize my_construct_callback first, so that it is valid even if rest of this routine throws an exception.
-                    my_construct_callback = other.my_construct_callback->clone();
-                    __TBB_ASSERT(my_locals.size() == 0, NULL);
-                    my_locals.reserve(other.size());
-                    this->table_elementwise_copy(other, create_local_by_copy);
-                }
-
-                void internal_swap(enumerable_thread_specific& other) {
-                    using std::swap;
-                    __TBB_ASSERT(this != &other, NULL);
-                    swap(my_construct_callback, other.my_construct_callback);
-                    // concurrent_vector::swap() preserves storage space,
-                    // so addresses to the vector kept in ETS hash table remain valid.
-                    swap(my_locals, other.my_locals);
-                    this->ets_base<ETS_key_type>::table_swap(other);
-                }
-
-                template <typename A2, ets_key_usage_type C2>
-                void internal_move(enumerable_thread_specific<T, A2, C2>&& other) {
-                    static_assert((is_compatible_ets<T, typename std::decay<decltype(other)>::type>::value),
-                                  "is_compatible_ets fails");
-                    my_construct_callback = other.my_construct_callback;
-                    other.my_construct_callback = nullptr;
-                    __TBB_ASSERT(my_locals.size() == 0, NULL);
-                    my_locals.reserve(other.size());
-                    this->table_elementwise_copy(other, create_local_by_move);
-                }
-
-            public:
-                enumerable_thread_specific(const enumerable_thread_specific& other)
-                    : ets_base<ETS_key_type>() /* prevents GCC warnings with -Wextra */
-                {
-                    internal_copy(other);
-                }
-
-                template <typename Alloc, ets_key_usage_type Cachetype>
-                enumerable_thread_specific(const enumerable_thread_specific<T, Alloc, Cachetype>& other) {
-                    internal_copy(other);
-                }
-
-                enumerable_thread_specific(enumerable_thread_specific&& other) : my_construct_callback() {
-                    // TODO: use internal_move correctly here
-                    internal_swap(other);
-                }
-
-                template <typename Alloc, ets_key_usage_type Cachetype>
-                enumerable_thread_specific(enumerable_thread_specific<T, Alloc, Cachetype>&& other)
-                    : my_construct_callback() {
-                    internal_move(std::move(other));
-                }
-
-                enumerable_thread_specific& operator=(const enumerable_thread_specific& other) {
-                    if (this != &other) {
-                        this->clear();
-                        my_construct_callback->destroy();
-                        internal_copy(other);
-                    }
-                    return *this;
-                }
-
-                template <typename Alloc, ets_key_usage_type Cachetype>
-                enumerable_thread_specific&
-                operator=(const enumerable_thread_specific<T, Alloc, Cachetype>& other) {
-                    __TBB_ASSERT(static_cast<void*>(this) != static_cast<const void*>(&other),
-                                 NULL);// Objects of different types
-                    this->clear();
-                    my_construct_callback->destroy();
-                    internal_copy(other);
-                    return *this;
-                }
-
-                enumerable_thread_specific& operator=(enumerable_thread_specific&& other) {
-                    if (this != &other) {
-                        // TODO: use internal_move correctly here
-                        internal_swap(other);
-                    }
-                    return *this;
-                }
-
-                template <typename Alloc, ets_key_usage_type Cachetype>
-                enumerable_thread_specific&
-                operator=(enumerable_thread_specific<T, Alloc, Cachetype>&& other) {
-                    __TBB_ASSERT(static_cast<void*>(this) != static_cast<const void*>(&other),
-                                 NULL);// Objects of different types
-                    this->clear();
-                    my_construct_callback->destroy();
-                    internal_move(std::move(other));
-                    return *this;
-                }
-
-                // CombineFunc has signature T(T,T) or T(const T&, const T&)
-                template <typename CombineFunc>
-                T combine(CombineFunc f_combine) {
-                    if (begin() == end()) {
-                        ets_element<T> location;
-                        my_construct_callback->construct(location.value());
-                        return *location.value_committed();
-                    }
-                    const_iterator ci = begin();
-                    T my_result = *ci;
-                    while (++ci != end()) my_result = f_combine(my_result, *ci);
-                    return my_result;
-                }
-
-                // combine_func_t takes T by value or by [const] reference, and returns nothing
-                template <typename CombineFunc>
-                void combine_each(CombineFunc f_combine) {
-                    for (iterator ci = begin(); ci != end(); ++ci) { f_combine(*ci); }
-                }
-
-            };// enumerable_thread_specific
-
-            template <typename Container>
-            class flattened2d {
-                // This intermediate typedef is to address issues with VC7.1 compilers
-                using conval_type = typename Container::value_type;
-
-            public:
-                //! Basic types
-                using size_type = typename conval_type::size_type;
-                using difference_type = typename conval_type::difference_type;
-                using allocator_type = typename conval_type::allocator_type;
-                using value_type = typename conval_type::value_type;
-                using reference = typename conval_type::reference;
-                using const_reference = typename conval_type::const_reference;
-                using pointer = typename conval_type::pointer;
-                using const_pointer = typename conval_type::const_pointer;
-
-                using iterator = segmented_iterator<Container, value_type>;
-                using const_iterator = segmented_iterator<Container, const value_type>;
-
-                flattened2d(const Container& c, typename Container::const_iterator b,
-                            typename Container::const_iterator e)
-                    : my_container(const_cast<Container*>(&c)), my_begin(b), my_end(e) {}
-
-                explicit flattened2d(const Container& c)
-                    : my_container(const_cast<Container*>(&c)), my_begin(c.begin()), my_end(c.end()) {}
-
-                iterator begin() { return iterator(*my_container) = my_begin; }
-                iterator end() { return iterator(*my_container) = my_end; }
-                const_iterator begin() const { return const_iterator(*my_container) = my_begin; }
-                const_iterator end() const { return const_iterator(*my_container) = my_end; }
-
-                size_type size() const {
-                    size_type tot_size = 0;
-                    for (typename Container::const_iterator i = my_begin; i != my_end; ++i) {
-                        tot_size += i->size();
-                    }
-                    return tot_size;
-                }
-
-            private:
-                Container* my_container;
-                typename Container::const_iterator my_begin;
-                typename Container::const_iterator my_end;
-            };
-
-            template <typename Container>
-            flattened2d<Container> flatten2d(const Container& c, const typename Container::const_iterator b,
-                                             const typename Container::const_iterator e) {
-                return flattened2d<Container>(c, b, e);
-            }
-
-            template <typename Container>
-            flattened2d<Container> flatten2d(const Container& c) {
-                return flattened2d<Container>(c);
-            }
-
-        }// namespace d1
-    }    // namespace detail
-
-    inline namespace v1 {
-        using detail::d1::enumerable_thread_specific;
-        using detail::d1::flatten2d;
-        using detail::d1::flattened2d;
-        // ets enum keys
-        using detail::d1::ets_key_per_instance;
-        using detail::d1::ets_key_usage_type;
-        using detail::d1::ets_no_key;
+template <typename T, typename Allocator=cache_aligned_allocator<T>,
+          ets_key_usage_type ETS_key_type=ets_no_key >
+class enumerable_thread_specific: ets_base<ETS_key_type> {
+
+    template<typename U, typename A, ets_key_usage_type C> friend class enumerable_thread_specific;
+
+    using padded_element = padded<ets_element<T>>;
+
+    //! A generic range, used to create range objects from the iterators
+    template<typename I>
+    class generic_range_type: public blocked_range<I> {
+    public:
+        using value_type = T;
+        using reference = T&;
+        using const_reference = const T&;
+        using iterator = I;
+        using difference_type = std::ptrdiff_t;
+
+        generic_range_type( I begin_, I end_, std::size_t grainsize_ = 1) : blocked_range<I>(begin_,end_,grainsize_) {}
+        template<typename U>
+        generic_range_type( const generic_range_type<U>& r) : blocked_range<I>(r.begin(),r.end(),r.grainsize()) {}
+        generic_range_type( generic_range_type& r, split ) : blocked_range<I>(r,split()) {}
+    };
+
+    using allocator_traits_type = tbb::detail::allocator_traits<Allocator>;
+
+    using padded_allocator_type = typename allocator_traits_type::template rebind_alloc<padded_element>;
+    using internal_collection_type = tbb::concurrent_vector< padded_element, padded_allocator_type >;
+
+    callback_base *my_construct_callback;
+
+    internal_collection_type my_locals;
+
+    // TODO: consider unifying the callback mechanism for all create_local* methods below
+    //   (likely non-compatible and requires interface version increase)
+    void* create_local() override {
+        padded_element& lref = *my_locals.grow_by(1);
+        my_construct_callback->construct(lref.value());
+        return lref.value_committed();
+    }
+
+    static void* create_local_by_copy( ets_base<ETS_key_type>& base, void* p ) {
+        enumerable_thread_specific& ets = static_cast<enumerable_thread_specific&>(base);
+        padded_element& lref = *ets.my_locals.grow_by(1);
+        new(lref.value()) T(*static_cast<T*>(p));
+        return lref.value_committed();
+    }
+
+    static void* create_local_by_move( ets_base<ETS_key_type>& base, void* p ) {
+        enumerable_thread_specific& ets = static_cast<enumerable_thread_specific&>(base);
+        padded_element& lref = *ets.my_locals.grow_by(1);
+        new(lref.value()) T(std::move(*static_cast<T*>(p)));
+        return lref.value_committed();
+    }
+
+    using array_allocator_type = typename allocator_traits_type::template rebind_alloc<uintptr_t>;
+
+    // _size is in bytes
+    void* create_array(std::size_t _size) override {
+        std::size_t nelements = (_size + sizeof(uintptr_t) -1) / sizeof(uintptr_t);
+        return array_allocator_type().allocate(nelements);
+    }
+
+    void free_array( void* _ptr, std::size_t _size) override {
+        std::size_t nelements = (_size + sizeof(uintptr_t) -1) / sizeof(uintptr_t);
+        array_allocator_type().deallocate( reinterpret_cast<uintptr_t *>(_ptr),nelements);
+    }
+
+public:
+
+    //! Basic types
+    using value_type = T;
+    using allocator_type = Allocator;
+    using size_type = typename internal_collection_type::size_type;
+    using difference_type = typename internal_collection_type::difference_type;
+    using reference = value_type&;
+    using const_reference = const value_type&;
+
+    using pointer = typename allocator_traits_type::pointer;
+    using const_pointer = typename allocator_traits_type::const_pointer;
+
+    // Iterator types
+    using iterator = enumerable_thread_specific_iterator<internal_collection_type, value_type>;
+    using const_iterator = enumerable_thread_specific_iterator<internal_collection_type, const value_type>;
+
+    // Parallel range types
+    using range_type = generic_range_type<iterator>;
+    using const_range_type = generic_range_type<const_iterator>;
+
+    //! Default constructor.  Each local instance of T is default constructed.
+    enumerable_thread_specific() : my_construct_callback(
+        callback_leaf<construct_by_default<T> >::make(/*dummy argument*/0)
+    ){}
+
+    //! Constructor with initializer functor. Each local instance of T is constructed by T(finit()).
+    template <typename Finit , typename = typename std::enable_if<is_callable_no_args<typename std::decay<Finit>::type>::value>::type>
+    explicit enumerable_thread_specific( Finit finit ) : my_construct_callback(
+        callback_leaf<construct_by_finit<T,Finit> >::make( std::move(finit) )
+    ){}
+
+    //! Constructor with exemplar. Each local instance of T is copy-constructed from the exemplar.
+    explicit enumerable_thread_specific( const T& exemplar ) : my_construct_callback(
+        callback_leaf<construct_by_exemplar<T> >::make( exemplar )
+    ){}
+
+    explicit enumerable_thread_specific( T&& exemplar ) : my_construct_callback(
+        callback_leaf<construct_by_exemplar<T> >::make( std::move(exemplar) )
+    ){}
+
+    //! Variadic constructor with initializer arguments.  Each local instance of T is constructed by T(args...)
+    template <typename P1, typename... P,
+              typename = typename std::enable_if<!is_callable_no_args<typename std::decay<P1>::type>::value
+                                                      && !is_compatible_ets<T, typename std::decay<P1>::type>::value
+                                                      && !std::is_same<T, typename std::decay<P1>::type>::value
+                                                     >::type>
+    enumerable_thread_specific( P1&& arg1, P&& ... args ) : my_construct_callback(
+        callback_leaf<construct_by_args<T,P1,P...> >::make( std::forward<P1>(arg1), std::forward<P>(args)... )
+    ){}
+
+    //! Destructor
+    ~enumerable_thread_specific() {
+        if(my_construct_callback) my_construct_callback->destroy();
+        // Deallocate the hash table before overridden free_array() becomes inaccessible
+        this->ets_base<ETS_key_type>::table_clear();
+    }
+
+    //! returns reference to local, discarding exists
+    reference local() {
+        bool exists;
+        return local(exists);
+    }
+
+    //! Returns reference to calling thread's local copy, creating one if necessary
+    reference local(bool& exists)  {
+        void* ptr = this->table_lookup(exists);
+        return *(T*)ptr;
+    }
+
+    //! Get the number of local copies
+    size_type size() const { return my_locals.size(); }
+
+    //! true if there have been no local copies created
+    bool empty() const { return my_locals.empty(); }
+
+    //! begin iterator
+    iterator begin() { return iterator( my_locals, 0 ); }
+    //! end iterator
+    iterator end() { return iterator(my_locals, my_locals.size() ); }
+
+    //! begin const iterator
+    const_iterator begin() const { return const_iterator(my_locals, 0); }
+
+    //! end const iterator
+    const_iterator end() const { return const_iterator(my_locals, my_locals.size()); }
+
+    //! Get range for parallel algorithms
+    range_type range( std::size_t grainsize=1 ) { return range_type( begin(), end(), grainsize ); }
+
+    //! Get const range for parallel algorithms
+    const_range_type range( std::size_t grainsize=1 ) const { return const_range_type( begin(), end(), grainsize ); }
+
+    //! Destroys local copies
+    void clear() {
+        my_locals.clear();
+        this->table_clear();
+        // callback is not destroyed
+    }
+
+private:
+    template<typename A2, ets_key_usage_type C2>
+    void internal_copy(const enumerable_thread_specific<T, A2, C2>& other) {
+        // this tests is_compatible_ets
+        static_assert( (is_compatible_ets<T, typename std::decay<decltype(other)>::type>::value), "is_compatible_ets fails" );
+        // Initialize my_construct_callback first, so that it is valid even if rest of this routine throws an exception.
+        my_construct_callback = other.my_construct_callback->clone();
+        __TBB_ASSERT(my_locals.size()==0, nullptr);
+        my_locals.reserve(other.size());
+        this->table_elementwise_copy( other, create_local_by_copy );
+    }
+
+    void internal_swap(enumerable_thread_specific& other) {
+        using std::swap;
+        __TBB_ASSERT( this!=&other, nullptr);
+        swap(my_construct_callback, other.my_construct_callback);
+        // concurrent_vector::swap() preserves storage space,
+        // so addresses to the vector kept in ETS hash table remain valid.
+        swap(my_locals, other.my_locals);
+        this->ets_base<ETS_key_type>::table_swap(other);
+    }
+
+    template<typename A2, ets_key_usage_type C2>
+    void internal_move(enumerable_thread_specific<T, A2, C2>&& other) {
+        static_assert( (is_compatible_ets<T, typename std::decay<decltype(other)>::type>::value), "is_compatible_ets fails" );
+        my_construct_callback = other.my_construct_callback;
+        other.my_construct_callback = nullptr;
+        __TBB_ASSERT(my_locals.size()==0, nullptr);
+        my_locals.reserve(other.size());
+        this->table_elementwise_copy( other, create_local_by_move );
+    }
+
+public:
+    enumerable_thread_specific( const enumerable_thread_specific& other )
+    : ets_base<ETS_key_type>() /* prevents GCC warnings with -Wextra */
+    {
+        internal_copy(other);
+    }
+
+    template<typename Alloc, ets_key_usage_type Cachetype>
+    enumerable_thread_specific( const enumerable_thread_specific<T, Alloc, Cachetype>& other )
+    {
+        internal_copy(other);
+    }
+
+    enumerable_thread_specific( enumerable_thread_specific&& other ) : my_construct_callback()
+    {
+        // TODO: use internal_move correctly here
+        internal_swap(other);
+    }
+
+    template<typename Alloc, ets_key_usage_type Cachetype>
+    enumerable_thread_specific( enumerable_thread_specific<T, Alloc, Cachetype>&& other ) : my_construct_callback()
+    {
+        internal_move(std::move(other));
+    }
+
+    enumerable_thread_specific& operator=( const enumerable_thread_specific& other )
+    {
+        if( this != &other ) {
+            this->clear();
+            my_construct_callback->destroy();
+            internal_copy( other );
+        }
+        return *this;
+    }
+
+    template<typename Alloc, ets_key_usage_type Cachetype>
+    enumerable_thread_specific& operator=( const enumerable_thread_specific<T, Alloc, Cachetype>& other )
+    {
+        __TBB_ASSERT( static_cast<void*>(this)!=static_cast<const void*>(&other), nullptr); // Objects of different types
+        this->clear();
+        my_construct_callback->destroy();
+        internal_copy(other);
+        return *this;
+    }
+
+    enumerable_thread_specific& operator=( enumerable_thread_specific&& other )
+    {
+        if( this != &other ) {
+            // TODO: use internal_move correctly here
+            internal_swap(other);
+        }
+        return *this;
+    }
+
+    template<typename Alloc, ets_key_usage_type Cachetype>
+    enumerable_thread_specific& operator=( enumerable_thread_specific<T, Alloc, Cachetype>&& other )
+    {
+        __TBB_ASSERT( static_cast<void*>(this)!=static_cast<const void*>(&other), nullptr); // Objects of different types
+        this->clear();
+        my_construct_callback->destroy();
+        internal_move(std::move(other));
+        return *this;
+    }
+
+    // CombineFunc has signature T(T,T) or T(const T&, const T&)
+    template <typename CombineFunc>
+    T combine(CombineFunc f_combine) {
+        if(begin() == end()) {
+            ets_element<T> location;
+            my_construct_callback->construct(location.value());
+            return *location.value_committed();
+        }
+        const_iterator ci = begin();
+        T my_result = *ci;
+        while(++ci != end())
+            my_result = f_combine( my_result, *ci );
+        return my_result;
+    }
+
+    // combine_func_t takes T by value or by [const] reference, and returns nothing
+    template <typename CombineFunc>
+    void combine_each(CombineFunc f_combine) {
+        for(iterator ci = begin(); ci != end(); ++ci) {
+            f_combine( *ci );
+        }
+    }
+
+}; // enumerable_thread_specific
+
+template< typename Container >
+class flattened2d {
+    // This intermediate typedef is to address issues with VC7.1 compilers
+    using conval_type = typename Container::value_type;
+
+public:
+    //! Basic types
+    using size_type = typename conval_type::size_type;
+    using difference_type = typename conval_type::difference_type;
+    using allocator_type = typename conval_type::allocator_type;
+    using value_type = typename conval_type::value_type;
+    using reference = typename conval_type::reference;
+    using const_reference = typename conval_type::const_reference;
+    using pointer = typename conval_type::pointer;
+    using const_pointer = typename conval_type::const_pointer;
+
+    using iterator = segmented_iterator<Container, value_type>;
+    using const_iterator = segmented_iterator<Container, const value_type>;
+
+    flattened2d( const Container &c, typename Container::const_iterator b, typename Container::const_iterator e ) :
+        my_container(const_cast<Container*>(&c)), my_begin(b), my_end(e) { }
+
+    explicit flattened2d( const Container &c ) :
+        my_container(const_cast<Container*>(&c)), my_begin(c.begin()), my_end(c.end()) { }
+
+    iterator begin() { return iterator(*my_container) = my_begin; }
+    iterator end() { return iterator(*my_container) = my_end; }
+    const_iterator begin() const { return const_iterator(*my_container) = my_begin; }
+    const_iterator end() const { return const_iterator(*my_container) = my_end; }
+
+    size_type size() const {
+        size_type tot_size = 0;
+        for(typename Container::const_iterator i = my_begin; i != my_end; ++i) {
+            tot_size += i->size();
+        }
+        return tot_size;
+    }
+
+private:
+    Container *my_container;
+    typename Container::const_iterator my_begin;
+    typename Container::const_iterator my_end;
+};
+
+template <typename Container>
+flattened2d<Container> flatten2d(const Container &c, const typename Container::const_iterator b, const typename Container::const_iterator e) {
+    return flattened2d<Container>(c, b, e);
+}
+
+template <typename Container>
+flattened2d<Container> flatten2d(const Container &c) {
+    return flattened2d<Container>(c);
+}
+
+} // namespace d1
+} // namespace detail
+
+inline namespace v1 {
+using detail::d1::enumerable_thread_specific;
+using detail::d1::flattened2d;
+using detail::d1::flatten2d;
+// ets enum keys
+using detail::d1::ets_key_usage_type;
+using detail::d1::ets_key_per_instance;
+using detail::d1::ets_no_key;
 #if __TBB_RESUMABLE_TASKS
-        using detail::d1::ets_suspend_aware;
+using detail::d1::ets_suspend_aware;
 #endif
-    }// namespace v1
+} // inline namespace v1
+
+} // namespace tbb
 
-}// namespace tbb
+#endif // __TBB_enumerable_thread_specific_H
 
-#endif// __TBB_enumerable_thread_specific_H
diff --git a/external/tbb/include/oneapi/tbb/flow_graph.h b/external/tbb/include/oneapi/tbb/flow_graph.h
index 52d189bf..3ace331c 100644
--- a/external/tbb/include/oneapi/tbb/flow_graph.h
+++ b/external/tbb/include/oneapi/tbb/flow_graph.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2025 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -21,38 +21,39 @@
 #include <memory>
 #include <type_traits>
 
-#include "cache_aligned_allocator.h"
-#include "detail/_aggregator.h"
-#include "detail/_allocator_traits.h"
 #include "detail/_config.h"
-#include "detail/_exception.h"
 #include "detail/_namespace_injection.h"
+#include "spin_mutex.h"
+#include "null_mutex.h"
+#include "spin_rw_mutex.h"
+#include "null_rw_mutex.h"
 #include "detail/_pipeline_filters.h"
-#include "detail/_small_object_pool.h"
 #include "detail/_task.h"
+#include "detail/_small_object_pool.h"
+#include "cache_aligned_allocator.h"
+#include "detail/_exception.h"
 #include "detail/_template_helpers.h"
+#include "detail/_aggregator.h"
+#include "detail/_allocator_traits.h"
 #include "detail/_utils.h"
-#include "null_mutex.h"
-#include "null_rw_mutex.h"
 #include "profiling.h"
-#include "spin_mutex.h"
-#include "spin_rw_mutex.h"
 #include "task_arena.h"
 
-#if TBB_USE_PROFILING_TOOLS && (__unix__ || __APPLE__)
-#if __INTEL_COMPILER
-// Disabled warning "routine is both inline and noinline"
-#pragma warning(push)
-#pragma warning(disable : 2196)
-#endif
-#define __TBB_NOINLINE_SYM __attribute__((noinline))
+#if TBB_USE_PROFILING_TOOLS && ( __unix__ || __APPLE__ )
+   #if __INTEL_COMPILER
+       // Disabled warning "routine is both inline and noinline"
+       #pragma warning (push)
+       #pragma warning( disable: 2196 )
+   #endif
+   #define __TBB_NOINLINE_SYM __attribute__((noinline))
 #else
-#define __TBB_NOINLINE_SYM
+   #define __TBB_NOINLINE_SYM
 #endif
 
+#include <tuple>
 #include <list>
+#include <forward_list>
 #include <queue>
-#include <tuple>
 #if __TBB_CPP20_CONCEPTS_PRESENT
 #include <concepts>
 #endif
@@ -68,3311 +69,3650 @@
 */
 
 namespace tbb {
-    namespace detail {
+namespace detail {
 
-        namespace d1 {
+namespace d2 {
 
-            //! An enumeration the provides the two most common concurrency levels: unlimited and serial
-            enum concurrency { unlimited = 0, serial = 1 };
+//! An enumeration the provides the two most common concurrency levels: unlimited and serial
+enum concurrency { unlimited = 0, serial = 1 };
 
-            //! A generic null type
-            struct null_type {};
+//! A generic null type
+struct null_type {};
 
-            //! An empty class used for messages that mean "I'm done"
-            class continue_msg {};
+//! An empty class used for messages that mean "I'm done"
+class continue_msg {};
 
-        }// namespace d1
+} // namespace d2
 
 #if __TBB_CPP20_CONCEPTS_PRESENT
-        namespace d0 {
-
-            template <typename ReturnType, typename OutputType>
-            concept node_body_return_type
-                    = std::same_as<OutputType, tbb::detail::d1::continue_msg> || std::same_as<OutputType,
-                                                                                              ReturnType>;
-
-            template <typename Body, typename Output>
-            concept continue_node_body
-                    = std::copy_constructible<Body> && requires(Body &body,
-                                                                const tbb::detail::d1::continue_msg &v) {
-                { body(v) } -> node_body_return_type<Output>;
-            };
-
-            template <typename Body, typename Input, typename Output>
-            concept function_node_body
-                    = std::copy_constructible<Body> && requires(Body &body, const Input &v) {
-                { body(v) } -> node_body_return_type<Output>;
-            };
-
-            template <typename FunctionObject, typename Input, typename Key>
-            concept join_node_function_object
-                    = std::copy_constructible<FunctionObject> && requires(FunctionObject &func,
-                                                                          const Input &v) {
-                { func(v) } -> adaptive_same_as<Key>;
-            };
-
-            template <typename Body, typename Output>
-            concept input_node_body
-                    = std::copy_constructible<Body> && requires(Body &body,
-                                                                tbb::detail::d1::flow_control &fc) {
-                { body(fc) } -> adaptive_same_as<Output>;
-            };
-
-            template <typename Body, typename Input, typename OutputPortsType>
-            concept multifunction_node_body
-                    = std::copy_constructible<Body> && requires(Body &body, const Input &v,
-                                                                OutputPortsType &p) {
-                body(v, p);
-            };
-
-            template <typename Sequencer, typename Value>
-            concept sequencer
-                    = std::copy_constructible<Sequencer> && requires(Sequencer &seq, const Value &value) {
-                { seq(value) } -> adaptive_same_as<std::size_t>;
-            };
-
-            template <typename Body, typename Input, typename GatewayType>
-            concept async_node_body = std::copy_constructible<Body> && requires(Body &body, const Input &v,
-                                                                                GatewayType &gateway) {
-                body(v, gateway);
-            };
-
-        }// namespace d0
-#endif   // __TBB_CPP20_CONCEPTS_PRESENT
-
-        namespace d1 {
-
-            //! Forward declaration section
-            template <typename T>
-            class sender;
-            template <typename T>
-            class receiver;
-            class continue_receiver;
-
-            template <typename T, typename U>
-            class limiter_node;// needed for resetting decrementer
-
-            template <typename T, typename M>
-            class successor_cache;
-            template <typename T, typename M>
-            class broadcast_cache;
-            template <typename T, typename M>
-            class round_robin_cache;
-            template <typename T, typename M>
-            class predecessor_cache;
-            template <typename T, typename M>
-            class reservable_predecessor_cache;
+inline namespace d0 {
+
+template <typename ReturnType, typename OutputType>
+concept node_body_return_type = std::same_as<OutputType, tbb::detail::d2::continue_msg> ||
+                                std::convertible_to<OutputType, ReturnType>;
+
+// TODO: consider using std::invocable here
+template <typename Body, typename Output>
+concept continue_node_body = std::copy_constructible<Body> &&
+                             requires( Body& body, const tbb::detail::d2::continue_msg& v ) {
+                                 { body(v) } -> node_body_return_type<Output>;
+                             };
+
+template <typename Body, typename Input, typename Output>
+concept function_node_body = std::copy_constructible<Body> &&
+                             std::invocable<Body&, const Input&> &&
+                             node_body_return_type<std::invoke_result_t<Body&, const Input&>, Output>;
+
+template <typename FunctionObject, typename Input, typename Key>
+concept join_node_function_object = std::copy_constructible<FunctionObject> &&
+                                    std::invocable<FunctionObject&, const Input&> &&
+                                    std::convertible_to<std::invoke_result_t<FunctionObject&, const Input&>, Key>;
+
+template <typename Body, typename Output>
+concept input_node_body = std::copy_constructible<Body> &&
+                          requires( Body& body, tbb::detail::d1::flow_control& fc ) {
+                              { body(fc) } -> adaptive_same_as<Output>;
+                          };
+
+template <typename Body, typename Input, typename OutputPortsType>
+concept multifunction_node_body = std::copy_constructible<Body> &&
+                                  std::invocable<Body&, const Input&, OutputPortsType&>;
+
+template <typename Sequencer, typename Value>
+concept sequencer = std::copy_constructible<Sequencer> &&
+                    std::invocable<Sequencer&, const Value&> &&
+                    std::convertible_to<std::invoke_result_t<Sequencer&, const Value&>, std::size_t>;
+
+template <typename Body, typename Input, typename GatewayType>
+concept async_node_body = std::copy_constructible<Body> &&
+                          std::invocable<Body&, const Input&, GatewayType&>;
+
+} // inline namespace d0
+#endif // __TBB_CPP20_CONCEPTS_PRESENT
+
+namespace d2 {
+
+//! Forward declaration section
+template< typename T > class sender;
+template< typename T > class receiver;
+class continue_receiver;
+
+template< typename T, typename U > class limiter_node;  // needed for resetting decrementer
+
+template<typename T, typename M> class successor_cache;
+template<typename T, typename M> class broadcast_cache;
+template<typename T, typename M> class round_robin_cache;
+template<typename T, typename M> class predecessor_cache;
+template<typename T, typename M> class reservable_predecessor_cache;
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-            namespace order {
-                struct following;
-                struct preceding;
-            }// namespace order
-            template <typename Order, typename... Args>
-            struct node_set;
+namespace order {
+struct following;
+struct preceding;
+}
+template<typename Order, typename... Args> struct node_set;
 #endif
 
-        }// namespace d1
-    }    // namespace detail
-}// namespace tbb
+
+} // namespace d2
+} // namespace detail
+} // namespace tbb
 
 //! The graph class
 #include "detail/_flow_graph_impl.h"
 
 namespace tbb {
-    namespace detail {
-        namespace d1 {
-
-            static inline std::pair<graph_task *, graph_task *> order_tasks(graph_task *first,
-                                                                            graph_task *second) {
-                if (second->priority > first->priority) return std::make_pair(second, first);
-                return std::make_pair(first, second);
-            }
-
-            // submit task if necessary. Returns the non-enqueued task if there is one.
-            static inline graph_task *combine_tasks(graph &g, graph_task *left, graph_task *right) {
-                // if no RHS task, don't change left.
-                if (right == NULL) return left;
-                // right != NULL
-                if (left == NULL) return right;
-                if (left == SUCCESSFULLY_ENQUEUED) return right;
-                // left contains a task
-                if (right != SUCCESSFULLY_ENQUEUED) {
-                    // both are valid tasks
-                    auto tasks_pair = order_tasks(left, right);
-                    spawn_in_graph_arena(g, *tasks_pair.first);
-                    return tasks_pair.second;
-                }
-                return left;
-            }
-
-            //! Pure virtual template class that defines a sender of messages of type T
-            template <typename T>
-            class sender {
-            public:
-                virtual ~sender() {}
-
-                //! Request an item from the sender
-                virtual bool try_get(T &) { return false; }
-
-                //! Reserves an item in the sender
-                virtual bool try_reserve(T &) { return false; }
-
-                //! Releases the reserved item
-                virtual bool try_release() { return false; }
-
-                //! Consumes the reserved item
-                virtual bool try_consume() { return false; }
+namespace detail {
+namespace d2 {
+
+static inline std::pair<graph_task*, graph_task*> order_tasks(graph_task* first, graph_task* second) {
+    if (second->priority > first->priority)
+        return std::make_pair(second, first);
+    return std::make_pair(first, second);
+}
+
+// submit task if necessary. Returns the non-enqueued task if there is one.
+static inline graph_task* combine_tasks(graph& g, graph_task* left, graph_task* right) {
+    // if no RHS task, don't change left.
+    if (right == nullptr) return left;
+    // right != nullptr
+    if (left == nullptr) return right;
+    if (left == SUCCESSFULLY_ENQUEUED) return right;
+    // left contains a task
+    if (right != SUCCESSFULLY_ENQUEUED) {
+        // both are valid tasks
+        auto tasks_pair = order_tasks(left, right);
+        spawn_in_graph_arena(g, *tasks_pair.first);
+        return tasks_pair.second;
+    }
+    return left;
+}
+
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+class message_metainfo {
+public:
+    using waiters_type = std::forward_list<d1::wait_context_vertex*>;
+
+    message_metainfo() = default;
+
+    message_metainfo(const waiters_type& waiters) : my_waiters(waiters) {}
+    message_metainfo(waiters_type&& waiters) : my_waiters(std::move(waiters)) {}
+
+    const waiters_type& waiters() const & { return my_waiters; }
+    waiters_type&& waiters() && { return std::move(my_waiters); }
+
+    bool empty() const { return my_waiters.empty(); }
+
+    void merge(const message_metainfo& other) {
+        // TODO: should we avoid duplications on merging
+        my_waiters.insert_after(my_waiters.before_begin(),
+                                other.waiters().begin(),
+                                other.waiters().end());
+    }
+private:
+    waiters_type my_waiters;
+}; // class message_metainfo
+
+#define __TBB_FLOW_GRAPH_METAINFO_ARG(metainfo) , metainfo
 
-            protected:
-                //! The output type of this sender
-                typedef T output_type;
-
-                //! The successor type for this node
-                typedef receiver<T> successor_type;
-
-                //! Add a new successor to this node
-                virtual bool register_successor(successor_type &r) = 0;
-
-                //! Removes a successor from this node
-                virtual bool remove_successor(successor_type &r) = 0;
-
-                template <typename C>
-                friend bool register_successor(sender<C> &s, receiver<C> &r);
-
-                template <typename C>
-                friend bool remove_successor(sender<C> &s, receiver<C> &r);
-            };// class sender<T>
+#else
+#define __TBB_FLOW_GRAPH_METAINFO_ARG(metainfo)
+#endif // __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
 
-            template <typename C>
-            bool register_successor(sender<C> &s, receiver<C> &r) {
-                return s.register_successor(r);
-            }
+//! Pure virtual template class that defines a sender of messages of type T
+template< typename T >
+class sender {
+public:
+    virtual ~sender() {}
 
-            template <typename C>
-            bool remove_successor(sender<C> &s, receiver<C> &r) {
-                return s.remove_successor(r);
-            }
+    //! Request an item from the sender
+    virtual bool try_get( T & ) { return false; }
 
-            //! Pure virtual template class that defines a receiver of messages of type T
-            template <typename T>
-            class receiver {
-            public:
-                //! Destructor
-                virtual ~receiver() {}
-
-                //! Put an item to the receiver
-                bool try_put(const T &t) {
-                    graph_task *res = try_put_task(t);
-                    if (!res) return false;
-                    if (res != SUCCESSFULLY_ENQUEUED) spawn_in_graph_arena(graph_reference(), *res);
-                    return true;
-                }
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+    virtual bool try_get( T &, message_metainfo& ) { return false; }
+#endif
 
-                //! put item to successor; return task to run the successor if possible.
-            protected:
-                //! The input type of this receiver
-                typedef T input_type;
-
-                //! The predecessor type for this node
-                typedef sender<T> predecessor_type;
-
-                template <typename R, typename B>
-                friend class run_and_put_task;
-                template <typename X, typename Y>
-                friend class broadcast_cache;
-                template <typename X, typename Y>
-                friend class round_robin_cache;
-                virtual graph_task *try_put_task(const T &t) = 0;
-                virtual graph &graph_reference() const = 0;
-
-                template <typename TT, typename M>
-                friend class successor_cache;
-                virtual bool is_continue_receiver() { return false; }
-
-                // TODO revamp: reconsider the inheritance and move node priority out of receiver
-                virtual node_priority_t priority() const { return no_priority; }
-
-                //! Add a predecessor to the node
-                virtual bool register_predecessor(predecessor_type &) { return false; }
-
-                //! Remove a predecessor from the node
-                virtual bool remove_predecessor(predecessor_type &) { return false; }
-
-                template <typename C>
-                friend bool register_predecessor(receiver<C> &r, sender<C> &s);
-                template <typename C>
-                friend bool remove_predecessor(receiver<C> &r, sender<C> &s);
-            };// class receiver<T>
-
-            template <typename C>
-            bool register_predecessor(receiver<C> &r, sender<C> &s) {
-                return r.register_predecessor(s);
-            }
+    //! Reserves an item in the sender
+    virtual bool try_reserve( T & ) { return false; }
 
-            template <typename C>
-            bool remove_predecessor(receiver<C> &r, sender<C> &s) {
-                return r.remove_predecessor(s);
-            }
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+    virtual bool try_reserve( T &, message_metainfo& ) { return false; }
+#endif
 
-            //! Base class for receivers of completion messages
-            /** These receivers automatically reset, but cannot be explicitly waited on */
-            class continue_receiver : public receiver<continue_msg> {
-            protected:
-                //! Constructor
-                explicit continue_receiver(int number_of_predecessors, node_priority_t a_priority) {
-                    my_predecessor_count = my_initial_predecessor_count = number_of_predecessors;
-                    my_current_count = 0;
-                    my_priority = a_priority;
-                }
+    //! Releases the reserved item
+    virtual bool try_release( ) { return false; }
+
+    //! Consumes the reserved item
+    virtual bool try_consume( ) { return false; }
+
+protected:
+    //! The output type of this sender
+    typedef T output_type;
+
+    //! The successor type for this node
+    typedef receiver<T> successor_type;
+
+    //! Add a new successor to this node
+    virtual bool register_successor( successor_type &r ) = 0;
+
+    //! Removes a successor from this node
+    virtual bool remove_successor( successor_type &r ) = 0;
+
+    template<typename C>
+    friend bool register_successor(sender<C>& s, receiver<C>& r);
+
+    template<typename C>
+    friend bool remove_successor  (sender<C>& s, receiver<C>& r);
+};  // class sender<T>
+
+template<typename C>
+bool register_successor(sender<C>& s, receiver<C>& r) {
+    return s.register_successor(r);
+}
+
+template<typename C>
+bool remove_successor(sender<C>& s, receiver<C>& r) {
+    return s.remove_successor(r);
+}
+
+//! Pure virtual template class that defines a receiver of messages of type T
+template< typename T >
+class receiver {
+private:
+    template <typename... TryPutTaskArgs>
+    bool internal_try_put(const T& t, TryPutTaskArgs&&... args) {
+        graph_task* res = try_put_task(t, std::forward<TryPutTaskArgs>(args)...);
+        if (!res) return false;
+        if (res != SUCCESSFULLY_ENQUEUED) spawn_in_graph_arena(graph_reference(), *res);
+        return true;
+    }
+
+public:
+    //! Destructor
+    virtual ~receiver() {}
+
+    //! Put an item to the receiver
+    bool try_put( const T& t ) {
+        return internal_try_put(t);
+    }
+
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+    //! Put an item to the receiver and wait for completion
+    bool try_put_and_wait( const T& t ) {
+        // Since try_put_and_wait is a blocking call, it is safe to create wait_context on stack
+        d1::wait_context_vertex msg_wait_vertex{};
+
+        bool res = internal_try_put(t, message_metainfo{message_metainfo::waiters_type{&msg_wait_vertex}});
+        if (res) {
+            __TBB_ASSERT(graph_reference().my_context != nullptr, "No wait_context associated with the Flow Graph");
+            d1::wait(msg_wait_vertex.get_context(), *graph_reference().my_context);
+        }
+        return res;
+    }
+#endif
 
-                //! Copy constructor
-                continue_receiver(const continue_receiver &src) : receiver<continue_msg>() {
-                    my_predecessor_count = my_initial_predecessor_count = src.my_initial_predecessor_count;
-                    my_current_count = 0;
-                    my_priority = src.my_priority;
-                }
+    //! put item to successor; return task to run the successor if possible.
+protected:
+    //! The input type of this receiver
+    typedef T input_type;
 
-                //! Increments the trigger threshold
-                bool register_predecessor(predecessor_type &) override {
-                    spin_mutex::scoped_lock l(my_mutex);
-                    ++my_predecessor_count;
-                    return true;
-                }
+    //! The predecessor type for this node
+    typedef sender<T> predecessor_type;
 
-                //! Decrements the trigger threshold
-                /** Does not check to see if the removal of the predecessor now makes the current count
+    template< typename R, typename B > friend class run_and_put_task;
+    template< typename X, typename Y > friend class broadcast_cache;
+    template< typename X, typename Y > friend class round_robin_cache;
+    virtual graph_task *try_put_task(const T& t) = 0;
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+    virtual graph_task *try_put_task(const T& t, const message_metainfo&) = 0;
+#endif
+    virtual graph& graph_reference() const = 0;
+
+    template<typename TT, typename M> friend class successor_cache;
+    virtual bool is_continue_receiver() { return false; }
+
+    // TODO revamp: reconsider the inheritance and move node priority out of receiver
+    virtual node_priority_t priority() const { return no_priority; }
+
+    //! Add a predecessor to the node
+    virtual bool register_predecessor( predecessor_type & ) { return false; }
+
+    //! Remove a predecessor from the node
+    virtual bool remove_predecessor( predecessor_type & ) { return false; }
+
+    template <typename C>
+    friend bool register_predecessor(receiver<C>& r, sender<C>& s);
+    template <typename C>
+    friend bool remove_predecessor  (receiver<C>& r, sender<C>& s);
+}; // class receiver<T>
+
+template <typename C>
+bool register_predecessor(receiver<C>& r, sender<C>& s) {
+    return r.register_predecessor(s);
+}
+
+template <typename C>
+bool remove_predecessor(receiver<C>& r, sender<C>& s) {
+    return r.remove_predecessor(s);
+}
+
+//! Base class for receivers of completion messages
+/** These receivers automatically reset, but cannot be explicitly waited on */
+class continue_receiver : public receiver< continue_msg > {
+protected:
+
+    //! Constructor
+    explicit continue_receiver( int number_of_predecessors, node_priority_t a_priority ) {
+        my_predecessor_count = my_initial_predecessor_count = number_of_predecessors;
+        my_current_count = 0;
+        my_priority = a_priority;
+    }
+
+    //! Copy constructor
+    continue_receiver( const continue_receiver& src ) : receiver<continue_msg>() {
+        my_predecessor_count = my_initial_predecessor_count = src.my_initial_predecessor_count;
+        my_current_count = 0;
+        my_priority = src.my_priority;
+    }
+
+    //! Increments the trigger threshold
+    bool register_predecessor( predecessor_type & ) override {
+        spin_mutex::scoped_lock l(my_mutex);
+        ++my_predecessor_count;
+        return true;
+    }
+
+    //! Decrements the trigger threshold
+    /** Does not check to see if the removal of the predecessor now makes the current count
         exceed the new threshold.  So removing a predecessor while the graph is active can cause
         unexpected results. */
-                bool remove_predecessor(predecessor_type &) override {
-                    spin_mutex::scoped_lock l(my_mutex);
-                    --my_predecessor_count;
-                    return true;
-                }
-
-                //! The input type
-                typedef continue_msg input_type;
-
-                //! The predecessor type for this node
-                typedef receiver<input_type>::predecessor_type predecessor_type;
-
-                template <typename R, typename B>
-                friend class run_and_put_task;
-                template <typename X, typename Y>
-                friend class broadcast_cache;
-                template <typename X, typename Y>
-                friend class round_robin_cache;
-                // execute body is supposed to be too small to create a task for.
-                graph_task *try_put_task(const input_type &) override {
-                    {
-                        spin_mutex::scoped_lock l(my_mutex);
-                        if (++my_current_count < my_predecessor_count) return SUCCESSFULLY_ENQUEUED;
-                        else
-                            my_current_count = 0;
-                    }
-                    graph_task *res = execute();
-                    return res ? res : SUCCESSFULLY_ENQUEUED;
-                }
-
-                spin_mutex my_mutex;
-                int my_predecessor_count;
-                int my_current_count;
-                int my_initial_predecessor_count;
-                node_priority_t my_priority;
-                // the friend declaration in the base class did not eliminate the "protected class"
-                // error in gcc 4.1.2
-                template <typename U, typename V>
-                friend class limiter_node;
-
-                virtual void reset_receiver(reset_flags f) {
-                    my_current_count = 0;
-                    if (f & rf_clear_edges) { my_predecessor_count = my_initial_predecessor_count; }
-                }
+    bool remove_predecessor( predecessor_type & ) override {
+        spin_mutex::scoped_lock l(my_mutex);
+        --my_predecessor_count;
+        return true;
+    }
+
+    //! The input type
+    typedef continue_msg input_type;
+
+    //! The predecessor type for this node
+    typedef receiver<input_type>::predecessor_type predecessor_type;
+
+    template< typename R, typename B > friend class run_and_put_task;
+    template<typename X, typename Y> friend class broadcast_cache;
+    template<typename X, typename Y> friend class round_robin_cache;
+
+private:
+    // execute body is supposed to be too small to create a task for.
+    graph_task* try_put_task_impl( const input_type& __TBB_FLOW_GRAPH_METAINFO_ARG(const message_metainfo& metainfo) ) {
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+        message_metainfo predecessor_metainfo;
+#endif
+        {
+            spin_mutex::scoped_lock l(my_mutex);
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+            // Prolong the wait and store the metainfo until receiving signals from all the predecessors
+            for (auto waiter : metainfo.waiters()) {
+                waiter->reserve(1);
+            }
+            my_current_metainfo.merge(metainfo);
+#endif
+            if ( ++my_current_count < my_predecessor_count )
+                return SUCCESSFULLY_ENQUEUED;
+            else {
+                my_current_count = 0;
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+                predecessor_metainfo = my_current_metainfo;
+                my_current_metainfo = message_metainfo{};
+#endif
+            }
+        }
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+        graph_task* res = execute(predecessor_metainfo);
+        for (auto waiter : predecessor_metainfo.waiters()) {
+            waiter->release(1);
+        }
+#else
+        graph_task* res = execute();
+#endif
+        return res? res : SUCCESSFULLY_ENQUEUED;
+    }
+
+protected:
+    graph_task* try_put_task( const input_type& input ) override {
+        return try_put_task_impl(input __TBB_FLOW_GRAPH_METAINFO_ARG(message_metainfo{}));
+    }
+
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+    graph_task* try_put_task( const input_type& input, const message_metainfo& metainfo ) override {
+        return try_put_task_impl(input, metainfo);
+    }
+#endif
 
-                //! Does whatever should happen when the threshold is reached
-                /** This should be very fast or else spawn a task.  This is
+    spin_mutex my_mutex;
+    int my_predecessor_count;
+    int my_current_count;
+    int my_initial_predecessor_count;
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+    message_metainfo my_current_metainfo;
+#endif
+    node_priority_t my_priority;
+    // the friend declaration in the base class did not eliminate the "protected class"
+    // error in gcc 4.1.2
+    template<typename U, typename V> friend class limiter_node;
+
+    virtual void reset_receiver( reset_flags f ) {
+        my_current_count = 0;
+        if (f & rf_clear_edges) {
+            my_predecessor_count = my_initial_predecessor_count;
+        }
+    }
+
+    //! Does whatever should happen when the threshold is reached
+    /** This should be very fast or else spawn a task.  This is
         called while the sender is blocked in the try_put(). */
-                virtual graph_task *execute() = 0;
-                template <typename TT, typename M>
-                friend class successor_cache;
-                bool is_continue_receiver() override { return true; }
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+    virtual graph_task* execute(const message_metainfo& metainfo) = 0;
+#else
+    virtual graph_task* execute() = 0;
+#endif
+    template<typename TT, typename M> friend class successor_cache;
+    bool is_continue_receiver() override { return true; }
 
-                node_priority_t priority() const override { return my_priority; }
-            };// class continue_receiver
+    node_priority_t priority() const override { return my_priority; }
+}; // class continue_receiver
 
 #if __TBB_PREVIEW_MESSAGE_BASED_KEY_MATCHING
-            template <typename K, typename T>
-            K key_from_message(const T &t) {
-                return t.key();
-            }
+    template <typename K, typename T>
+    K key_from_message( const T &t ) {
+        return t.key();
+    }
 #endif /* __TBB_PREVIEW_MESSAGE_BASED_KEY_MATCHING */
 
-        }// namespace d1
-    }    // namespace detail
-}// namespace tbb
+} // d1
+} // detail
+} // tbb
 
 #include "detail/_flow_graph_trace_impl.h"
 #include "detail/_hash_compare.h"
 
 namespace tbb {
-    namespace detail {
-        namespace d1 {
+namespace detail {
+namespace d2 {
 
 #include "detail/_flow_graph_body_impl.h"
 #include "detail/_flow_graph_cache_impl.h"
 #include "detail/_flow_graph_types_impl.h"
 
-            using namespace graph_policy_namespace;
+using namespace graph_policy_namespace;
+
+template <typename C, typename N>
+graph_iterator<C,N>::graph_iterator(C *g, bool begin) : my_graph(g), current_node(nullptr)
+{
+    if (begin) current_node = my_graph->my_nodes;
+    //else it is an end iterator by default
+}
+
+template <typename C, typename N>
+typename graph_iterator<C,N>::reference graph_iterator<C,N>::operator*() const {
+    __TBB_ASSERT(current_node, "graph_iterator at end");
+    return *operator->();
+}
+
+template <typename C, typename N>
+typename graph_iterator<C,N>::pointer graph_iterator<C,N>::operator->() const {
+    return current_node;
+}
+
+template <typename C, typename N>
+void graph_iterator<C,N>::internal_forward() {
+    if (current_node) current_node = current_node->next;
+}
+
+//! Constructs a graph with isolated task_group_context
+inline graph::graph() : my_wait_context_vertex(0), my_nodes(nullptr), my_nodes_last(nullptr), my_task_arena(nullptr) {
+    prepare_task_arena();
+    own_context = true;
+    cancelled = false;
+    caught_exception = false;
+    my_context = new (r1::cache_aligned_allocate(sizeof(task_group_context))) task_group_context(FLOW_TASKS);
+    fgt_graph(this);
+    my_is_active = true;
+}
+
+inline graph::graph(task_group_context& use_this_context) :
+    my_wait_context_vertex(0), my_context(&use_this_context), my_nodes(nullptr), my_nodes_last(nullptr), my_task_arena(nullptr) {
+    prepare_task_arena();
+    own_context = false;
+    cancelled = false;
+    caught_exception = false;
+    fgt_graph(this);
+    my_is_active = true;
+}
+
+inline graph::~graph() {
+    wait_for_all();
+    if (own_context) {
+        my_context->~task_group_context();
+        r1::cache_aligned_deallocate(my_context);
+    }
+    delete my_task_arena;
+}
+
+inline void graph::reserve_wait() {
+    my_wait_context_vertex.reserve();
+    fgt_reserve_wait(this);
+}
+
+inline void graph::release_wait() {
+    fgt_release_wait(this);
+    my_wait_context_vertex.release();
+}
+
+inline void graph::register_node(graph_node *n) {
+    n->next = nullptr;
+    {
+        spin_mutex::scoped_lock lock(nodelist_mutex);
+        n->prev = my_nodes_last;
+        if (my_nodes_last) my_nodes_last->next = n;
+        my_nodes_last = n;
+        if (!my_nodes) my_nodes = n;
+    }
+}
+
+inline void graph::remove_node(graph_node *n) {
+    {
+        spin_mutex::scoped_lock lock(nodelist_mutex);
+        __TBB_ASSERT(my_nodes && my_nodes_last, "graph::remove_node: Error: no registered nodes");
+        if (n->prev) n->prev->next = n->next;
+        if (n->next) n->next->prev = n->prev;
+        if (my_nodes_last == n) my_nodes_last = n->prev;
+        if (my_nodes == n) my_nodes = n->next;
+    }
+    n->prev = n->next = nullptr;
+}
+
+inline void graph::reset( reset_flags f ) {
+    // reset context
+    deactivate_graph(*this);
+
+    my_context->reset();
+    cancelled = false;
+    caught_exception = false;
+    // reset all the nodes comprising the graph
+    for(iterator ii = begin(); ii != end(); ++ii) {
+        graph_node *my_p = &(*ii);
+        my_p->reset_node(f);
+    }
+    // Reattach the arena. Might be useful to run the graph in a particular task_arena
+    // while not limiting graph lifetime to a single task_arena::execute() call.
+    prepare_task_arena( /*reinit=*/true );
+    activate_graph(*this);
+}
+
+inline void graph::cancel() {
+    my_context->cancel_group_execution();
+}
+
+inline graph::iterator graph::begin() { return iterator(this, true); }
+
+inline graph::iterator graph::end() { return iterator(this, false); }
+
+inline graph::const_iterator graph::begin() const { return const_iterator(this, true); }
+
+inline graph::const_iterator graph::end() const { return const_iterator(this, false); }
+
+inline graph::const_iterator graph::cbegin() const { return const_iterator(this, true); }
+
+inline graph::const_iterator graph::cend() const { return const_iterator(this, false); }
+
+inline graph_node::graph_node(graph& g) : my_graph(g) {
+    my_graph.register_node(this);
+}
+
+inline graph_node::~graph_node() {
+    my_graph.remove_node(this);
+}
 
-            template <typename C, typename N>
-            graph_iterator<C, N>::graph_iterator(C *g, bool begin) : my_graph(g), current_node(NULL) {
-                if (begin) current_node = my_graph->my_nodes;
-                //else it is an end iterator by default
-            }
+#include "detail/_flow_graph_node_impl.h"
 
-            template <typename C, typename N>
-            typename graph_iterator<C, N>::reference graph_iterator<C, N>::operator*() const {
-                __TBB_ASSERT(current_node, "graph_iterator at end");
-                return *operator->();
-            }
 
-            template <typename C, typename N>
-            typename graph_iterator<C, N>::pointer graph_iterator<C, N>::operator->() const {
-                return current_node;
-            }
+//! An executable node that acts as a source, i.e. it has no predecessors
 
-            template <typename C, typename N>
-            void graph_iterator<C, N>::internal_forward() {
-                if (current_node) current_node = current_node->next;
-            }
+template < typename Output >
+    __TBB_requires(std::copyable<Output>)
+class input_node : public graph_node, public sender< Output > {
+public:
+    //! The type of the output message, which is complete
+    typedef Output output_type;
 
-            //! Constructs a graph with isolated task_group_context
-            inline graph::graph()
-                : my_wait_context(0), my_nodes(NULL), my_nodes_last(NULL), my_task_arena(NULL) {
-                prepare_task_arena();
-                own_context = true;
-                cancelled = false;
-                caught_exception = false;
-                my_context = new (r1::cache_aligned_allocate(sizeof(task_group_context)))
-                        task_group_context(FLOW_TASKS);
-                fgt_graph(this);
-                my_is_active = true;
-            }
+    //! The type of successors of this node
+    typedef typename sender<output_type>::successor_type successor_type;
 
-            inline graph::graph(task_group_context &use_this_context)
-                : my_wait_context(0), my_context(&use_this_context), my_nodes(NULL), my_nodes_last(NULL),
-                  my_task_arena(NULL) {
-                prepare_task_arena();
-                own_context = false;
-                cancelled = false;
-                caught_exception = false;
-                fgt_graph(this);
-                my_is_active = true;
-            }
+    // Input node has no input type
+    typedef null_type input_type;
 
-            inline graph::~graph() {
-                wait_for_all();
-                if (own_context) {
-                    my_context->~task_group_context();
-                    r1::cache_aligned_deallocate(my_context);
-                }
-                delete my_task_arena;
-            }
+    //! Constructor for a node with a successor
+    template< typename Body >
+        __TBB_requires(input_node_body<Body, Output>)
+     __TBB_NOINLINE_SYM input_node( graph &g, Body body )
+         : graph_node(g), my_active(false)
+         , my_body( new input_body_leaf< output_type, Body>(body) )
+         , my_init_body( new input_body_leaf< output_type, Body>(body) )
+         , my_successors(this), my_reserved(false), my_has_cached_item(false)
+    {
+        fgt_node_with_body(CODEPTR(), FLOW_INPUT_NODE, &this->my_graph,
+                           static_cast<sender<output_type> *>(this), this->my_body);
+    }
 
-            inline void graph::reserve_wait() {
-                my_wait_context.reserve();
-                fgt_reserve_wait(this);
-            }
+#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+    template <typename Body, typename... Successors>
+        __TBB_requires(input_node_body<Body, Output>)
+    input_node( const node_set<order::preceding, Successors...>& successors, Body body )
+        : input_node(successors.graph_reference(), body)
+    {
+        make_edges(*this, successors);
+    }
+#endif
 
-            inline void graph::release_wait() {
-                fgt_release_wait(this);
-                my_wait_context.release();
-            }
+    //! Copy constructor
+    __TBB_NOINLINE_SYM input_node( const input_node& src )
+        : graph_node(src.my_graph), sender<Output>()
+        , my_active(false)
+        , my_body(src.my_init_body->clone()), my_init_body(src.my_init_body->clone())
+        , my_successors(this), my_reserved(false), my_has_cached_item(false)
+    {
+        fgt_node_with_body(CODEPTR(), FLOW_INPUT_NODE, &this->my_graph,
+                           static_cast<sender<output_type> *>(this), this->my_body);
+    }
+
+    //! The destructor
+    ~input_node() { delete my_body; delete my_init_body; }
+
+    //! Add a new successor to this node
+    bool register_successor( successor_type &r ) override {
+        spin_mutex::scoped_lock lock(my_mutex);
+        my_successors.register_successor(r);
+        if ( my_active )
+            spawn_put();
+        return true;
+    }
+
+    //! Removes a successor from this node
+    bool remove_successor( successor_type &r ) override {
+        spin_mutex::scoped_lock lock(my_mutex);
+        my_successors.remove_successor(r);
+        return true;
+    }
+
+    //! Request an item from the node
+    bool try_get( output_type &v ) override {
+        spin_mutex::scoped_lock lock(my_mutex);
+        if ( my_reserved )
+            return false;
+
+        if ( my_has_cached_item ) {
+            v = my_cached_item;
+            my_has_cached_item = false;
+            return true;
+        }
+        // we've been asked to provide an item, but we have none.  enqueue a task to
+        // provide one.
+        if ( my_active )
+            spawn_put();
+        return false;
+    }
+
+    //! Reserves an item.
+    bool try_reserve( output_type &v ) override {
+        spin_mutex::scoped_lock lock(my_mutex);
+        if ( my_reserved ) {
+            return false;
+        }
+
+        if ( my_has_cached_item ) {
+            v = my_cached_item;
+            my_reserved = true;
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+private:
+    bool try_reserve( output_type& v, message_metainfo& ) override {
+        return try_reserve(v);
+    }
+
+    bool try_get( output_type& v, message_metainfo& ) override {
+        return try_get(v);
+    }
+public:
+#endif
 
-            inline void graph::register_node(graph_node *n) {
-                n->next = NULL;
-                {
-                    spin_mutex::scoped_lock lock(nodelist_mutex);
-                    n->prev = my_nodes_last;
-                    if (my_nodes_last) my_nodes_last->next = n;
-                    my_nodes_last = n;
-                    if (!my_nodes) my_nodes = n;
-                }
-            }
+    //! Release a reserved item.
+    /** true = item has been released and so remains in sender, dest must request or reserve future items */
+    bool try_release( ) override {
+        spin_mutex::scoped_lock lock(my_mutex);
+        __TBB_ASSERT( my_reserved && my_has_cached_item, "releasing non-existent reservation" );
+        my_reserved = false;
+        if(!my_successors.empty())
+            spawn_put();
+        return true;
+    }
+
+    //! Consumes a reserved item
+    bool try_consume( ) override {
+        spin_mutex::scoped_lock lock(my_mutex);
+        __TBB_ASSERT( my_reserved && my_has_cached_item, "consuming non-existent reservation" );
+        my_reserved = false;
+        my_has_cached_item = false;
+        if ( !my_successors.empty() ) {
+            spawn_put();
+        }
+        return true;
+    }
+
+    //! Activates a node that was created in the inactive state
+    void activate() {
+        spin_mutex::scoped_lock lock(my_mutex);
+        my_active = true;
+        if (!my_successors.empty())
+            spawn_put();
+    }
+
+    template<typename Body>
+    Body copy_function_object() {
+        input_body<output_type> &body_ref = *this->my_body;
+        return dynamic_cast< input_body_leaf<output_type, Body> & >(body_ref).get_body();
+    }
+
+protected:
+
+    //! resets the input_node to its initial state
+    void reset_node( reset_flags f) override {
+        my_active = false;
+        my_reserved = false;
+        my_has_cached_item = false;
+
+        if(f & rf_clear_edges) my_successors.clear();
+        if(f & rf_reset_bodies) {
+            input_body<output_type> *tmp = my_init_body->clone();
+            delete my_body;
+            my_body = tmp;
+        }
+    }
+
+private:
+    spin_mutex my_mutex;
+    bool my_active;
+    input_body<output_type> *my_body;
+    input_body<output_type> *my_init_body;
+    broadcast_cache< output_type > my_successors;
+    bool my_reserved;
+    bool my_has_cached_item;
+    output_type my_cached_item;
+
+    // used by apply_body_bypass, can invoke body of node.
+    bool try_reserve_apply_body(output_type &v) {
+        spin_mutex::scoped_lock lock(my_mutex);
+        if ( my_reserved ) {
+            return false;
+        }
+        if ( !my_has_cached_item ) {
+            d1::flow_control control;
+
+            fgt_begin_body( my_body );
+
+            my_cached_item = (*my_body)(control);
+            my_has_cached_item = !control.is_pipeline_stopped;
+
+            fgt_end_body( my_body );
+        }
+        if ( my_has_cached_item ) {
+            v = my_cached_item;
+            my_reserved = true;
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    graph_task* create_put_task() {
+        d1::small_object_allocator allocator{};
+        typedef input_node_task_bypass< input_node<output_type> > task_type;
+        graph_task* t = allocator.new_object<task_type>(my_graph, allocator, *this);
+        return t;
+    }
+
+    //! Spawns a task that applies the body
+    void spawn_put( ) {
+        if(is_graph_active(this->my_graph)) {
+            spawn_in_graph_arena(this->my_graph, *create_put_task());
+        }
+    }
+
+    friend class input_node_task_bypass< input_node<output_type> >;
+    //! Applies the body.  Returning SUCCESSFULLY_ENQUEUED okay; forward_task_bypass will handle it.
+    graph_task* apply_body_bypass( ) {
+        output_type v;
+        if ( !try_reserve_apply_body(v) )
+            return nullptr;
+
+        graph_task *last_task = my_successors.try_put_task(v);
+        if ( last_task )
+            try_consume();
+        else
+            try_release();
+        return last_task;
+    }
+};  // class input_node
+
+//! Implements a function node that supports Input -> Output
+template<typename Input, typename Output = continue_msg, typename Policy = queueing>
+    __TBB_requires(std::default_initializable<Input> &&
+                   std::copy_constructible<Input> &&
+                   std::copy_constructible<Output>)
+class function_node
+    : public graph_node
+    , public function_input< Input, Output, Policy, cache_aligned_allocator<Input> >
+    , public function_output<Output>
+{
+    typedef cache_aligned_allocator<Input> internals_allocator;
+
+public:
+    typedef Input input_type;
+    typedef Output output_type;
+    typedef function_input<input_type,output_type,Policy,internals_allocator> input_impl_type;
+    typedef function_input_queue<input_type, internals_allocator> input_queue_type;
+    typedef function_output<output_type> fOutput_type;
+    typedef typename input_impl_type::predecessor_type predecessor_type;
+    typedef typename fOutput_type::successor_type successor_type;
+
+    using input_impl_type::my_predecessors;
+
+    //! Constructor
+    // input_queue_type is allocated here, but destroyed in the function_input_base.
+    // TODO: pass the graph_buffer_policy to the function_input_base so it can all
+    // be done in one place.  This would be an interface-breaking change.
+    template< typename Body >
+        __TBB_requires(function_node_body<Body, Input, Output>)
+     __TBB_NOINLINE_SYM function_node( graph &g, size_t concurrency,
+                   Body body, Policy = Policy(), node_priority_t a_priority = no_priority )
+        : graph_node(g), input_impl_type(g, concurrency, body, a_priority),
+          fOutput_type(g) {
+        fgt_node_with_body( CODEPTR(), FLOW_FUNCTION_NODE, &this->my_graph,
+                static_cast<receiver<input_type> *>(this), static_cast<sender<output_type> *>(this), this->my_body );
+    }
+
+    template <typename Body>
+        __TBB_requires(function_node_body<Body, Input, Output>)
+    function_node( graph& g, size_t concurrency, Body body, node_priority_t a_priority )
+        : function_node(g, concurrency, body, Policy(), a_priority) {}
 
-            inline void graph::remove_node(graph_node *n) {
-                {
-                    spin_mutex::scoped_lock lock(nodelist_mutex);
-                    __TBB_ASSERT(my_nodes && my_nodes_last, "graph::remove_node: Error: no registered nodes");
-                    if (n->prev) n->prev->next = n->next;
-                    if (n->next) n->next->prev = n->prev;
-                    if (my_nodes_last == n) my_nodes_last = n->prev;
-                    if (my_nodes == n) my_nodes = n->next;
-                }
-                n->prev = n->next = NULL;
-            }
+#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+    template <typename Body, typename... Args>
+        __TBB_requires(function_node_body<Body, Input, Output>)
+    function_node( const node_set<Args...>& nodes, size_t concurrency, Body body,
+                   Policy p = Policy(), node_priority_t a_priority = no_priority )
+        : function_node(nodes.graph_reference(), concurrency, body, p, a_priority) {
+        make_edges_in_order(nodes, *this);
+    }
+
+    template <typename Body, typename... Args>
+        __TBB_requires(function_node_body<Body, Input, Output>)
+    function_node( const node_set<Args...>& nodes, size_t concurrency, Body body, node_priority_t a_priority )
+        : function_node(nodes, concurrency, body, Policy(), a_priority) {}
+#endif // __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+
+    //! Copy constructor
+    __TBB_NOINLINE_SYM function_node( const function_node& src ) :
+        graph_node(src.my_graph),
+        input_impl_type(src),
+        fOutput_type(src.my_graph) {
+        fgt_node_with_body( CODEPTR(), FLOW_FUNCTION_NODE, &this->my_graph,
+                static_cast<receiver<input_type> *>(this), static_cast<sender<output_type> *>(this), this->my_body );
+    }
+
+protected:
+    template< typename R, typename B > friend class run_and_put_task;
+    template<typename X, typename Y> friend class broadcast_cache;
+    template<typename X, typename Y> friend class round_robin_cache;
+    using input_impl_type::try_put_task;
+
+    broadcast_cache<output_type> &successors () override { return fOutput_type::my_successors; }
+
+    void reset_node(reset_flags f) override {
+        input_impl_type::reset_function_input(f);
+        // TODO: use clear() instead.
+        if(f & rf_clear_edges) {
+            successors().clear();
+            my_predecessors.clear();
+        }
+        __TBB_ASSERT(!(f & rf_clear_edges) || successors().empty(), "function_node successors not empty");
+        __TBB_ASSERT(this->my_predecessors.empty(), "function_node predecessors not empty");
+    }
+
+};  // class function_node
+
+//! implements a function node that supports Input -> (set of outputs)
+// Output is a tuple of output types.
+template<typename Input, typename Output, typename Policy = queueing>
+    __TBB_requires(std::default_initializable<Input> &&
+                   std::copy_constructible<Input>)
+class multifunction_node :
+    public graph_node,
+    public multifunction_input
+    <
+        Input,
+        typename wrap_tuple_elements<
+            std::tuple_size<Output>::value,  // #elements in tuple
+            multifunction_output,  // wrap this around each element
+            Output // the tuple providing the types
+        >::type,
+        Policy,
+        cache_aligned_allocator<Input>
+    >
+{
+    typedef cache_aligned_allocator<Input> internals_allocator;
+
+protected:
+    static const int N = std::tuple_size<Output>::value;
+public:
+    typedef Input input_type;
+    typedef null_type output_type;
+    typedef typename wrap_tuple_elements<N,multifunction_output, Output>::type output_ports_type;
+    typedef multifunction_input<
+        input_type, output_ports_type, Policy, internals_allocator> input_impl_type;
+    typedef function_input_queue<input_type, internals_allocator> input_queue_type;
+private:
+    using input_impl_type::my_predecessors;
+public:
+    template<typename Body>
+        __TBB_requires(multifunction_node_body<Body, Input, output_ports_type>)
+    __TBB_NOINLINE_SYM multifunction_node(
+        graph &g, size_t concurrency,
+        Body body, Policy = Policy(), node_priority_t a_priority = no_priority
+    ) : graph_node(g), input_impl_type(g, concurrency, body, a_priority) {
+        fgt_multioutput_node_with_body<N>(
+            CODEPTR(), FLOW_MULTIFUNCTION_NODE,
+            &this->my_graph, static_cast<receiver<input_type> *>(this),
+            this->output_ports(), this->my_body
+        );
+    }
+
+    template <typename Body>
+        __TBB_requires(multifunction_node_body<Body, Input, output_ports_type>)
+    __TBB_NOINLINE_SYM multifunction_node(graph& g, size_t concurrency, Body body, node_priority_t a_priority)
+        : multifunction_node(g, concurrency, body, Policy(), a_priority) {}
 
-            inline void graph::reset(reset_flags f) {
-                // reset context
-                deactivate_graph(*this);
-
-                my_context->reset();
-                cancelled = false;
-                caught_exception = false;
-                // reset all the nodes comprising the graph
-                for (iterator ii = begin(); ii != end(); ++ii) {
-                    graph_node *my_p = &(*ii);
-                    my_p->reset_node(f);
-                }
-                // Reattach the arena. Might be useful to run the graph in a particular task_arena
-                // while not limiting graph lifetime to a single task_arena::execute() call.
-                prepare_task_arena(/*reinit=*/true);
-                activate_graph(*this);
-            }
+#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+    template <typename Body, typename... Args>
+        __TBB_requires(multifunction_node_body<Body, Input, output_ports_type>)
+    __TBB_NOINLINE_SYM multifunction_node(const node_set<Args...>& nodes, size_t concurrency, Body body,
+                       Policy p = Policy(), node_priority_t a_priority = no_priority)
+        : multifunction_node(nodes.graph_reference(), concurrency, body, p, a_priority) {
+        make_edges_in_order(nodes, *this);
+    }
+
+    template <typename Body, typename... Args>
+        __TBB_requires(multifunction_node_body<Body, Input, output_ports_type>)
+    __TBB_NOINLINE_SYM multifunction_node(const node_set<Args...>& nodes, size_t concurrency, Body body, node_priority_t a_priority)
+        : multifunction_node(nodes, concurrency, body, Policy(), a_priority) {}
+#endif // __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+
+    __TBB_NOINLINE_SYM multifunction_node( const multifunction_node &other) :
+        graph_node(other.my_graph), input_impl_type(other) {
+        fgt_multioutput_node_with_body<N>( CODEPTR(), FLOW_MULTIFUNCTION_NODE,
+                &this->my_graph, static_cast<receiver<input_type> *>(this),
+                this->output_ports(), this->my_body );
+    }
+
+    // all the guts are in multifunction_input...
+protected:
+    void reset_node(reset_flags f) override { input_impl_type::reset(f); }
+};  // multifunction_node
+
+//! split_node: accepts a tuple as input, forwards each element of the tuple to its
+//  successors.  The node has unlimited concurrency, so it does not reject inputs.
+template<typename TupleType>
+class split_node : public graph_node, public receiver<TupleType> {
+    static const int N = std::tuple_size<TupleType>::value;
+    typedef receiver<TupleType> base_type;
+public:
+    typedef TupleType input_type;
+    typedef typename wrap_tuple_elements<
+            N,  // #elements in tuple
+            multifunction_output,  // wrap this around each element
+            TupleType // the tuple providing the types
+        >::type  output_ports_type;
+
+    __TBB_NOINLINE_SYM explicit split_node(graph &g)
+        : graph_node(g),
+          my_output_ports(init_output_ports<output_ports_type>::call(g, my_output_ports))
+    {
+        fgt_multioutput_node<N>(CODEPTR(), FLOW_SPLIT_NODE, &this->my_graph,
+            static_cast<receiver<input_type> *>(this), this->output_ports());
+    }
 
-            inline void graph::cancel() { my_context->cancel_group_execution(); }
+#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+    template <typename... Args>
+    __TBB_NOINLINE_SYM split_node(const node_set<Args...>& nodes) : split_node(nodes.graph_reference()) {
+        make_edges_in_order(nodes, *this);
+    }
+#endif
+
+    __TBB_NOINLINE_SYM split_node(const split_node& other)
+        : graph_node(other.my_graph), base_type(other),
+          my_output_ports(init_output_ports<output_ports_type>::call(other.my_graph, my_output_ports))
+    {
+        fgt_multioutput_node<N>(CODEPTR(), FLOW_SPLIT_NODE, &this->my_graph,
+            static_cast<receiver<input_type> *>(this), this->output_ports());
+    }
+
+    output_ports_type &output_ports() { return my_output_ports; }
+
+protected:
+    graph_task *try_put_task(const TupleType& t) override {
+        // Sending split messages in parallel is not justified, as overheads would prevail.
+        // Also, we do not have successors here. So we just tell the task returned here is successful.
+        return emit_element<N>::emit_this(this->my_graph, t, output_ports());
+    }
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+    graph_task* try_put_task(const TupleType& t, const message_metainfo& metainfo) override {
+        // Sending split messages in parallel is not justified, as overheads would prevail.
+        // Also, we do not have successors here. So we just tell the task returned here is successful.
+        return emit_element<N>::emit_this(this->my_graph, t, output_ports(), metainfo);
+    }
+#endif
 
-            inline graph::iterator graph::begin() { return iterator(this, true); }
+    void reset_node(reset_flags f) override {
+        if (f & rf_clear_edges)
+            clear_element<N>::clear_this(my_output_ports);
+
+        __TBB_ASSERT(!(f & rf_clear_edges) || clear_element<N>::this_empty(my_output_ports), "split_node reset failed");
+    }
+    graph& graph_reference() const override {
+        return my_graph;
+    }
+
+private:
+    output_ports_type my_output_ports;
+};
+
+//! Implements an executable node that supports continue_msg -> Output
+template <typename Output, typename Policy = Policy<void> >
+    __TBB_requires(std::copy_constructible<Output>)
+class continue_node : public graph_node, public continue_input<Output, Policy>,
+                      public function_output<Output> {
+public:
+    typedef continue_msg input_type;
+    typedef Output output_type;
+    typedef continue_input<Output, Policy> input_impl_type;
+    typedef function_output<output_type> fOutput_type;
+    typedef typename input_impl_type::predecessor_type predecessor_type;
+    typedef typename fOutput_type::successor_type successor_type;
+
+    //! Constructor for executable node with continue_msg -> Output
+    template <typename Body >
+        __TBB_requires(continue_node_body<Body, Output>)
+    __TBB_NOINLINE_SYM continue_node(
+        graph &g,
+        Body body, Policy = Policy(), node_priority_t a_priority = no_priority
+    ) : graph_node(g), input_impl_type( g, body, a_priority ),
+        fOutput_type(g) {
+        fgt_node_with_body( CODEPTR(), FLOW_CONTINUE_NODE, &this->my_graph,
+
+                                           static_cast<receiver<input_type> *>(this),
+                                           static_cast<sender<output_type> *>(this), this->my_body );
+    }
+
+    template <typename Body>
+        __TBB_requires(continue_node_body<Body, Output>)
+    continue_node( graph& g, Body body, node_priority_t a_priority )
+        : continue_node(g, body, Policy(), a_priority) {}
 
-            inline graph::iterator graph::end() { return iterator(this, false); }
+#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+    template <typename Body, typename... Args>
+        __TBB_requires(continue_node_body<Body, Output>)
+    continue_node( const node_set<Args...>& nodes, Body body,
+                   Policy p = Policy(), node_priority_t a_priority = no_priority )
+        : continue_node(nodes.graph_reference(), body, p, a_priority ) {
+        make_edges_in_order(nodes, *this);
+    }
+    template <typename Body, typename... Args>
+        __TBB_requires(continue_node_body<Body, Output>)
+    continue_node( const node_set<Args...>& nodes, Body body, node_priority_t a_priority)
+        : continue_node(nodes, body, Policy(), a_priority) {}
+#endif // __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+
+    //! Constructor for executable node with continue_msg -> Output
+    template <typename Body >
+        __TBB_requires(continue_node_body<Body, Output>)
+    __TBB_NOINLINE_SYM continue_node(
+        graph &g, int number_of_predecessors,
+        Body body, Policy = Policy(), node_priority_t a_priority = no_priority
+    ) : graph_node(g)
+      , input_impl_type(g, number_of_predecessors, body, a_priority),
+        fOutput_type(g) {
+        fgt_node_with_body( CODEPTR(), FLOW_CONTINUE_NODE, &this->my_graph,
+                                           static_cast<receiver<input_type> *>(this),
+                                           static_cast<sender<output_type> *>(this), this->my_body );
+    }
+
+    template <typename Body>
+        __TBB_requires(continue_node_body<Body, Output>)
+    continue_node( graph& g, int number_of_predecessors, Body body, node_priority_t a_priority)
+        : continue_node(g, number_of_predecessors, body, Policy(), a_priority) {}
 
-            inline graph::const_iterator graph::begin() const { return const_iterator(this, true); }
+#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+    template <typename Body, typename... Args>
+        __TBB_requires(continue_node_body<Body, Output>)
+    continue_node( const node_set<Args...>& nodes, int number_of_predecessors,
+                   Body body, Policy p = Policy(), node_priority_t a_priority = no_priority )
+        : continue_node(nodes.graph_reference(), number_of_predecessors, body, p, a_priority) {
+        make_edges_in_order(nodes, *this);
+    }
+
+    template <typename Body, typename... Args>
+        __TBB_requires(continue_node_body<Body, Output>)
+    continue_node( const node_set<Args...>& nodes, int number_of_predecessors,
+                   Body body, node_priority_t a_priority )
+        : continue_node(nodes, number_of_predecessors, body, Policy(), a_priority) {}
+#endif
 
-            inline graph::const_iterator graph::end() const { return const_iterator(this, false); }
+    //! Copy constructor
+    __TBB_NOINLINE_SYM continue_node( const continue_node& src ) :
+        graph_node(src.my_graph), input_impl_type(src),
+        function_output<Output>(src.my_graph) {
+        fgt_node_with_body( CODEPTR(), FLOW_CONTINUE_NODE, &this->my_graph,
+                                           static_cast<receiver<input_type> *>(this),
+                                           static_cast<sender<output_type> *>(this), this->my_body );
+    }
+
+protected:
+    template< typename R, typename B > friend class run_and_put_task;
+    template<typename X, typename Y> friend class broadcast_cache;
+    template<typename X, typename Y> friend class round_robin_cache;
+    using input_impl_type::try_put_task;
+    broadcast_cache<output_type> &successors () override { return fOutput_type::my_successors; }
+
+    void reset_node(reset_flags f) override {
+        input_impl_type::reset_receiver(f);
+        if(f & rf_clear_edges)successors().clear();
+        __TBB_ASSERT(!(f & rf_clear_edges) || successors().empty(), "continue_node not reset");
+    }
+};  // continue_node
+
+//! Forwards messages of type T to all successors
+template <typename T>
+class broadcast_node : public graph_node, public receiver<T>, public sender<T> {
+public:
+    typedef T input_type;
+    typedef T output_type;
+    typedef typename receiver<input_type>::predecessor_type predecessor_type;
+    typedef typename sender<output_type>::successor_type successor_type;
+private:
+    broadcast_cache<input_type> my_successors;
+public:
+
+    __TBB_NOINLINE_SYM explicit broadcast_node(graph& g) : graph_node(g), my_successors(this) {
+        fgt_node( CODEPTR(), FLOW_BROADCAST_NODE, &this->my_graph,
+                  static_cast<receiver<input_type> *>(this), static_cast<sender<output_type> *>(this) );
+    }
 
-            inline graph::const_iterator graph::cbegin() const { return const_iterator(this, true); }
+#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+    template <typename... Args>
+    broadcast_node(const node_set<Args...>& nodes) : broadcast_node(nodes.graph_reference()) {
+        make_edges_in_order(nodes, *this);
+    }
+#endif
 
-            inline graph::const_iterator graph::cend() const { return const_iterator(this, false); }
+    // Copy constructor
+    __TBB_NOINLINE_SYM broadcast_node( const broadcast_node& src ) : broadcast_node(src.my_graph) {}
+
+    //! Adds a successor
+    bool register_successor( successor_type &r ) override {
+        my_successors.register_successor( r );
+        return true;
+    }
+
+    //! Removes s as a successor
+    bool remove_successor( successor_type &r ) override {
+        my_successors.remove_successor( r );
+        return true;
+    }
+
+private:
+    graph_task* try_put_task_impl(const T& t __TBB_FLOW_GRAPH_METAINFO_ARG(const message_metainfo& metainfo)) {
+        graph_task* new_task = my_successors.try_put_task(t __TBB_FLOW_GRAPH_METAINFO_ARG(metainfo));
+        if (!new_task) new_task = SUCCESSFULLY_ENQUEUED;
+        return new_task;
+    }
+
+protected:
+    template< typename R, typename B > friend class run_and_put_task;
+    template<typename X, typename Y> friend class broadcast_cache;
+    template<typename X, typename Y> friend class round_robin_cache;
+    //! build a task to run the successor if possible.  Default is old behavior.
+    graph_task* try_put_task(const T& t) override {
+        return try_put_task_impl(t __TBB_FLOW_GRAPH_METAINFO_ARG(message_metainfo{}));
+    }
+
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+    graph_task* try_put_task(const T& t, const message_metainfo& metainfo) override {
+        return try_put_task_impl(t, metainfo);
+    }
+#endif
 
-            inline graph_node::graph_node(graph &g) : my_graph(g) { my_graph.register_node(this); }
+    graph& graph_reference() const override {
+        return my_graph;
+    }
+
+    void reset_node(reset_flags f) override {
+        if (f&rf_clear_edges) {
+           my_successors.clear();
+        }
+        __TBB_ASSERT(!(f & rf_clear_edges) || my_successors.empty(), "Error resetting broadcast_node");
+    }
+};  // broadcast_node
+
+//! Forwards messages in arbitrary order
+template <typename T>
+class buffer_node
+    : public graph_node
+    , public reservable_item_buffer< T, cache_aligned_allocator<T> >
+    , public receiver<T>, public sender<T>
+{
+    typedef cache_aligned_allocator<T> internals_allocator;
+
+public:
+    typedef T input_type;
+    typedef T output_type;
+    typedef typename receiver<input_type>::predecessor_type predecessor_type;
+    typedef typename sender<output_type>::successor_type successor_type;
+    typedef buffer_node<T> class_type;
+
+protected:
+    typedef size_t size_type;
+    round_robin_cache< T, null_rw_mutex > my_successors;
+
+    friend class forward_task_bypass< class_type >;
+
+    enum op_type {reg_succ, rem_succ, req_item, res_item, rel_res, con_res, put_item, try_fwd_task
+    };
+
+    // implements the aggregator_operation concept
+    class buffer_operation : public d1::aggregated_operation< buffer_operation > {
+    public:
+        char type;
+        T* elem;
+        graph_task* ltask;
+        successor_type *r;
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+        message_metainfo* metainfo{ nullptr };
+#endif
 
-            inline graph_node::~graph_node() { my_graph.remove_node(this); }
+        buffer_operation(const T& e, op_type t) : type(char(t))
+                                                  , elem(const_cast<T*>(&e)) , ltask(nullptr)
+                                                  , r(nullptr)
+        {}
 
-#include "detail/_flow_graph_node_impl.h"
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+        buffer_operation(const T& e, op_type t, const message_metainfo& info)
+            : type(char(t)), elem(const_cast<T*>(&e)), ltask(nullptr), r(nullptr)
+            , metainfo(const_cast<message_metainfo*>(&info))
+        {}
 
-            //! An executable node that acts as a source, i.e. it has no predecessors
-
-            template <typename Output>
-            __TBB_requires(std::copyable<Output>) class input_node : public graph_node,
-                                                                     public sender<Output> {
-            public:
-                //! The type of the output message, which is complete
-                typedef Output output_type;
-
-                //! The type of successors of this node
-                typedef typename sender<output_type>::successor_type successor_type;
-
-                // Input node has no input type
-                typedef null_type input_type;
-
-                //! Constructor for a node with a successor
-                template <typename Body>
-                __TBB_requires(input_node_body<Body, Output>) __TBB_NOINLINE_SYM
-                        input_node(graph &g, Body body)
-                    : graph_node(g), my_active(false), my_body(new input_body_leaf<output_type, Body>(body)),
-                      my_init_body(new input_body_leaf<output_type, Body>(body)), my_successors(this),
-                      my_reserved(false), my_has_cached_item(false) {
-                    fgt_node_with_body(CODEPTR(), FLOW_INPUT_NODE, &this->my_graph,
-                                       static_cast<sender<output_type> *>(this), this->my_body);
-                }
+        buffer_operation(op_type t, message_metainfo& info)
+            : type(char(t)), elem(nullptr), ltask(nullptr), r(nullptr), metainfo(&info) {}
+#endif
+        buffer_operation(op_type t) : type(char(t)), elem(nullptr), ltask(nullptr), r(nullptr) {}
+    };
+
+    bool forwarder_busy;
+    typedef d1::aggregating_functor<class_type, buffer_operation> handler_type;
+    friend class d1::aggregating_functor<class_type, buffer_operation>;
+    d1::aggregator< handler_type, buffer_operation> my_aggregator;
+
+    virtual void handle_operations(buffer_operation *op_list) {
+        handle_operations_impl(op_list, this);
+    }
+
+    template<typename derived_type>
+    void handle_operations_impl(buffer_operation *op_list, derived_type* derived) {
+        __TBB_ASSERT(static_cast<class_type*>(derived) == this, "'this' is not a base class for derived");
+
+        buffer_operation *tmp = nullptr;
+        bool try_forwarding = false;
+        while (op_list) {
+            tmp = op_list;
+            op_list = op_list->next;
+            switch (tmp->type) {
+            case reg_succ: internal_reg_succ(tmp); try_forwarding = true; break;
+            case rem_succ: internal_rem_succ(tmp); break;
+            case req_item: internal_pop(tmp); break;
+            case res_item: internal_reserve(tmp); break;
+            case rel_res:  internal_release(tmp); try_forwarding = true; break;
+            case con_res:  internal_consume(tmp); try_forwarding = true; break;
+            case put_item: try_forwarding = internal_push(tmp); break;
+            case try_fwd_task: internal_forward_task(tmp); break;
+            }
+        }
+
+        derived->order();
+
+        if (try_forwarding && !forwarder_busy) {
+            if(is_graph_active(this->my_graph)) {
+                forwarder_busy = true;
+                typedef forward_task_bypass<class_type> task_type;
+                d1::small_object_allocator allocator{};
+                graph_task* new_task = allocator.new_object<task_type>(graph_reference(), allocator, *this);
+                // tmp should point to the last item handled by the aggregator.  This is the operation
+                // the handling thread enqueued.  So modifying that record will be okay.
+                // TODO revamp: check that the issue is still present
+                // workaround for icc bug  (at least 12.0 and 13.0)
+                // error: function "tbb::flow::interfaceX::combine_tasks" cannot be called with the given argument list
+                //        argument types are: (graph, graph_task *, graph_task *)
+                graph_task *z = tmp->ltask;
+                graph &g = this->my_graph;
+                tmp->ltask = combine_tasks(g, z, new_task);  // in case the op generated a task
+            }
+        }
+    }  // handle_operations
+
+    inline graph_task *grab_forwarding_task( buffer_operation &op_data) {
+        return op_data.ltask;
+    }
+
+    inline bool enqueue_forwarding_task(buffer_operation &op_data) {
+        graph_task *ft = grab_forwarding_task(op_data);
+        if(ft) {
+            spawn_in_graph_arena(graph_reference(), *ft);
+            return true;
+        }
+        return false;
+    }
+
+    //! This is executed by an enqueued task, the "forwarder"
+    virtual graph_task *forward_task() {
+        buffer_operation op_data(try_fwd_task);
+        graph_task *last_task = nullptr;
+        do {
+            op_data.status = WAIT;
+            op_data.ltask = nullptr;
+            my_aggregator.execute(&op_data);
+
+            // workaround for icc bug
+            graph_task *xtask = op_data.ltask;
+            graph& g = this->my_graph;
+            last_task = combine_tasks(g, last_task, xtask);
+        } while (op_data.status ==SUCCEEDED);
+        return last_task;
+    }
+
+    //! Register successor
+    virtual void internal_reg_succ(buffer_operation *op) {
+        __TBB_ASSERT(op->r, nullptr);
+        my_successors.register_successor(*(op->r));
+        op->status.store(SUCCEEDED, std::memory_order_release);
+    }
+
+    //! Remove successor
+    virtual void internal_rem_succ(buffer_operation *op) {
+        __TBB_ASSERT(op->r, nullptr);
+        my_successors.remove_successor(*(op->r));
+        op->status.store(SUCCEEDED, std::memory_order_release);
+    }
+
+private:
+    void order() {}
+
+    bool is_item_valid() {
+        return this->my_item_valid(this->my_tail - 1);
+    }
+
+    void try_put_and_add_task(graph_task*& last_task) {
+        graph_task* new_task = my_successors.try_put_task(this->back()
+                                                          __TBB_FLOW_GRAPH_METAINFO_ARG(this->back_metainfo()));
+        if (new_task) {
+            // workaround for icc bug
+            graph& g = this->my_graph;
+            last_task = combine_tasks(g, last_task, new_task);
+            this->destroy_back();
+        }
+    }
+
+protected:
+    //! Tries to forward valid items to successors
+    virtual void internal_forward_task(buffer_operation *op) {
+        internal_forward_task_impl(op, this);
+    }
+
+    template<typename derived_type>
+    void internal_forward_task_impl(buffer_operation *op, derived_type* derived) {
+        __TBB_ASSERT(static_cast<class_type*>(derived) == this, "'this' is not a base class for derived");
+
+        if (this->my_reserved || !derived->is_item_valid()) {
+            op->status.store(FAILED, std::memory_order_release);
+            this->forwarder_busy = false;
+            return;
+        }
+        // Try forwarding, giving each successor a chance
+        graph_task* last_task = nullptr;
+        size_type counter = my_successors.size();
+        for (; counter > 0 && derived->is_item_valid(); --counter)
+            derived->try_put_and_add_task(last_task);
+
+        op->ltask = last_task;  // return task
+        if (last_task && !counter) {
+            op->status.store(SUCCEEDED, std::memory_order_release);
+        }
+        else {
+            op->status.store(FAILED, std::memory_order_release);
+            forwarder_busy = false;
+        }
+    }
+
+    virtual bool internal_push(buffer_operation *op) {
+        __TBB_ASSERT(op->elem, nullptr);
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+        __TBB_ASSERT(op->metainfo, nullptr);
+        this->push_back(*(op->elem), (*op->metainfo));
+#else
+        this->push_back(*(op->elem));
+#endif
+        op->status.store(SUCCEEDED, std::memory_order_release);
+        return true;
+    }
+
+    virtual void internal_pop(buffer_operation *op) {
+        __TBB_ASSERT(op->elem, nullptr);
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+        bool pop_result = op->metainfo ? this->pop_back(*(op->elem), *(op->metainfo))
+                                       : this->pop_back(*(op->elem));
+#else
+        bool pop_result = this->pop_back(*(op->elem));
+#endif
+        if (pop_result) {
+            op->status.store(SUCCEEDED, std::memory_order_release);
+        }
+        else {
+            op->status.store(FAILED, std::memory_order_release);
+        }
+    }
+
+    virtual void internal_reserve(buffer_operation *op) {
+        __TBB_ASSERT(op->elem, nullptr);
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+        bool reserve_result = op->metainfo ? this->reserve_front(*(op->elem), *(op->metainfo))
+                                           : this->reserve_front(*(op->elem));
+#else
+        bool reserve_result = this->reserve_front(*(op->elem));
+#endif
+        if (reserve_result) {
+            op->status.store(SUCCEEDED, std::memory_order_release);
+        }
+        else {
+            op->status.store(FAILED, std::memory_order_release);
+        }
+    }
+
+    virtual void internal_consume(buffer_operation *op) {
+        this->consume_front();
+        op->status.store(SUCCEEDED, std::memory_order_release);
+    }
+
+    virtual void internal_release(buffer_operation *op) {
+        this->release_front();
+        op->status.store(SUCCEEDED, std::memory_order_release);
+    }
+
+public:
+    //! Constructor
+    __TBB_NOINLINE_SYM explicit buffer_node( graph &g )
+        : graph_node(g), reservable_item_buffer<T, internals_allocator>(), receiver<T>(),
+          sender<T>(), my_successors(this), forwarder_busy(false)
+    {
+        my_aggregator.initialize_handler(handler_type(this));
+        fgt_node( CODEPTR(), FLOW_BUFFER_NODE, &this->my_graph,
+                                 static_cast<receiver<input_type> *>(this), static_cast<sender<output_type> *>(this) );
+    }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-                template <typename Body, typename... Successors>
-                __TBB_requires(input_node_body<Body, Output>)
-                        input_node(const node_set<order::preceding, Successors...> &successors, Body body)
-                    : input_node(successors.graph_reference(), body) {
-                    make_edges(*this, successors);
-                }
+    template <typename... Args>
+    buffer_node(const node_set<Args...>& nodes) : buffer_node(nodes.graph_reference()) {
+        make_edges_in_order(nodes, *this);
+    }
 #endif
 
-                //! Copy constructor
-                __TBB_NOINLINE_SYM input_node(const input_node &src)
-                    : graph_node(src.my_graph), sender<Output>(), my_active(false),
-                      my_body(src.my_init_body->clone()), my_init_body(src.my_init_body->clone()),
-                      my_successors(this), my_reserved(false), my_has_cached_item(false) {
-                    fgt_node_with_body(CODEPTR(), FLOW_INPUT_NODE, &this->my_graph,
-                                       static_cast<sender<output_type> *>(this), this->my_body);
-                }
-
-                //! The destructor
-                ~input_node() {
-                    delete my_body;
-                    delete my_init_body;
-                }
+    //! Copy constructor
+    __TBB_NOINLINE_SYM buffer_node( const buffer_node& src ) : buffer_node(src.my_graph) {}
+
+    //
+    // message sender implementation
+    //
+
+    //! Adds a new successor.
+    /** Adds successor r to the list of successors; may forward tasks.  */
+    bool register_successor( successor_type &r ) override {
+        buffer_operation op_data(reg_succ);
+        op_data.r = &r;
+        my_aggregator.execute(&op_data);
+        (void)enqueue_forwarding_task(op_data);
+        return true;
+    }
+
+    //! Removes a successor.
+    /** Removes successor r from the list of successors.
+        It also calls r.remove_predecessor(*this) to remove this node as a predecessor. */
+    bool remove_successor( successor_type &r ) override {
+        // TODO revamp: investigate why full qualification is necessary here
+        tbb::detail::d2::remove_predecessor(r, *this);
+        buffer_operation op_data(rem_succ);
+        op_data.r = &r;
+        my_aggregator.execute(&op_data);
+        // even though this operation does not cause a forward, if we are the handler, and
+        // a forward is scheduled, we may be the first to reach this point after the aggregator,
+        // and so should check for the task.
+        (void)enqueue_forwarding_task(op_data);
+        return true;
+    }
+
+    //! Request an item from the buffer_node
+    /**  true = v contains the returned item<BR>
+         false = no item has been returned */
+    bool try_get( T &v ) override {
+        buffer_operation op_data(req_item);
+        op_data.elem = &v;
+        my_aggregator.execute(&op_data);
+        (void)enqueue_forwarding_task(op_data);
+        return (op_data.status==SUCCEEDED);
+    }
+
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+    bool try_get( T &v, message_metainfo& metainfo ) override {
+        buffer_operation op_data(req_item, metainfo);
+        op_data.elem = &v;
+        my_aggregator.execute(&op_data);
+        (void)enqueue_forwarding_task(op_data);
+        return (op_data.status==SUCCEEDED);
+    }
+#endif
 
-                //! Add a new successor to this node
-                bool register_successor(successor_type &r) override {
-                    spin_mutex::scoped_lock lock(my_mutex);
-                    my_successors.register_successor(r);
-                    if (my_active) spawn_put();
-                    return true;
-                }
+    //! Reserves an item.
+    /**  false = no item can be reserved<BR>
+         true = an item is reserved */
+    bool try_reserve( T &v ) override {
+        buffer_operation op_data(res_item);
+        op_data.elem = &v;
+        my_aggregator.execute(&op_data);
+        (void)enqueue_forwarding_task(op_data);
+        return (op_data.status==SUCCEEDED);
+    }
+
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+    bool try_reserve( output_type& v, message_metainfo& metainfo ) override {
+        buffer_operation op_data(res_item, metainfo);
+        op_data.elem = &v;
+        my_aggregator.execute(&op_data);
+        (void)enqueue_forwarding_task(op_data);
+        return op_data.status==SUCCEEDED;
+    }
+#endif
 
-                //! Removes a successor from this node
-                bool remove_successor(successor_type &r) override {
-                    spin_mutex::scoped_lock lock(my_mutex);
-                    my_successors.remove_successor(r);
-                    return true;
-                }
+    //! Release a reserved item.
+    /**  true = item has been released and so remains in sender */
+    bool try_release() override {
+        buffer_operation op_data(rel_res);
+        my_aggregator.execute(&op_data);
+        (void)enqueue_forwarding_task(op_data);
+        return true;
+    }
+
+    //! Consumes a reserved item.
+    /** true = item is removed from sender and reservation removed */
+    bool try_consume() override {
+        buffer_operation op_data(con_res);
+        my_aggregator.execute(&op_data);
+        (void)enqueue_forwarding_task(op_data);
+        return true;
+    }
+
+private:
+    graph_task* try_put_task_impl(const T& t __TBB_FLOW_GRAPH_METAINFO_ARG(const message_metainfo& metainfo)) {
+        buffer_operation op_data(t, put_item __TBB_FLOW_GRAPH_METAINFO_ARG(metainfo));
+        my_aggregator.execute(&op_data);
+        graph_task *ft = grab_forwarding_task(op_data);
+        // sequencer_nodes can return failure (if an item has been previously inserted)
+        // We have to spawn the returned task if our own operation fails.
+
+        if(ft && op_data.status ==FAILED) {
+            // we haven't succeeded queueing the item, but for some reason the
+            // call returned a task (if another request resulted in a successful
+            // forward this could happen.)  Queue the task and reset the pointer.
+            spawn_in_graph_arena(graph_reference(), *ft); ft = nullptr;
+        }
+        else if(!ft && op_data.status ==SUCCEEDED) {
+            ft = SUCCESSFULLY_ENQUEUED;
+        }
+        return ft;
+    }
+
+protected:
+
+    template< typename R, typename B > friend class run_and_put_task;
+    template<typename X, typename Y> friend class broadcast_cache;
+    template<typename X, typename Y> friend class round_robin_cache;
+    //! receive an item, return a task *if possible
+    graph_task *try_put_task(const T &t) override {
+        return try_put_task_impl(t __TBB_FLOW_GRAPH_METAINFO_ARG(message_metainfo{}));
+    }
+
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+    graph_task* try_put_task(const T& t, const message_metainfo& metainfo) override {
+        return try_put_task_impl(t, metainfo);
+    }
+#endif
 
-                //! Request an item from the node
-                bool try_get(output_type &v) override {
-                    spin_mutex::scoped_lock lock(my_mutex);
-                    if (my_reserved) return false;
+    graph& graph_reference() const override {
+        return my_graph;
+    }
+
+protected:
+    void reset_node( reset_flags f) override {
+        reservable_item_buffer<T, internals_allocator>::reset();
+        // TODO: just clear structures
+        if (f&rf_clear_edges) {
+            my_successors.clear();
+        }
+        forwarder_busy = false;
+    }
+};  // buffer_node
+
+//! Forwards messages in FIFO order
+template <typename T>
+class queue_node : public buffer_node<T> {
+protected:
+    typedef buffer_node<T> base_type;
+    typedef typename base_type::size_type size_type;
+    typedef typename base_type::buffer_operation queue_operation;
+    typedef queue_node class_type;
+
+private:
+    template<typename> friend class buffer_node;
+
+    bool is_item_valid() {
+        return this->my_item_valid(this->my_head);
+    }
+
+    void try_put_and_add_task(graph_task*& last_task) {
+        graph_task* new_task = this->my_successors.try_put_task(this->front()
+                                                                __TBB_FLOW_GRAPH_METAINFO_ARG(this->front_metainfo()));
+
+        if (new_task) {
+            // workaround for icc bug
+            graph& graph_ref = this->graph_reference();
+            last_task = combine_tasks(graph_ref, last_task, new_task);
+            this->destroy_front();
+        }
+    }
+
+protected:
+    void internal_forward_task(queue_operation *op) override {
+        this->internal_forward_task_impl(op, this);
+    }
+
+    void internal_pop(queue_operation *op) override {
+        if ( this->my_reserved || !this->my_item_valid(this->my_head)){
+            op->status.store(FAILED, std::memory_order_release);
+        }
+        else {
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+            if (op->metainfo) {
+                this->pop_front(*(op->elem), *(op->metainfo));
+            } else
+#endif
+            {
+                this->pop_front(*(op->elem));
+            }
+            op->status.store(SUCCEEDED, std::memory_order_release);
+        }
+    }
+    void internal_reserve(queue_operation *op) override {
+        if (this->my_reserved || !this->my_item_valid(this->my_head)) {
+            op->status.store(FAILED, std::memory_order_release);
+        }
+        else {
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+            if (op->metainfo) {
+                this->reserve_front(*(op->elem), *(op->metainfo));
+            }
+            else
+#endif
+            {
+                this->reserve_front(*(op->elem));
+            }
+            op->status.store(SUCCEEDED, std::memory_order_release);
+        }
+    }
+    void internal_consume(queue_operation *op) override {
+        this->consume_front();
+        op->status.store(SUCCEEDED, std::memory_order_release);
+    }
+
+public:
+    typedef T input_type;
+    typedef T output_type;
+    typedef typename receiver<input_type>::predecessor_type predecessor_type;
+    typedef typename sender<output_type>::successor_type successor_type;
+
+    //! Constructor
+    __TBB_NOINLINE_SYM explicit queue_node( graph &g ) : base_type(g) {
+        fgt_node( CODEPTR(), FLOW_QUEUE_NODE, &(this->my_graph),
+                                 static_cast<receiver<input_type> *>(this),
+                                 static_cast<sender<output_type> *>(this) );
+    }
 
-                    if (my_has_cached_item) {
-                        v = my_cached_item;
-                        my_has_cached_item = false;
-                        return true;
-                    }
-                    // we've been asked to provide an item, but we have none.  enqueue a task to
-                    // provide one.
-                    if (my_active) spawn_put();
-                    return false;
-                }
+#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+    template <typename... Args>
+    queue_node( const node_set<Args...>& nodes) : queue_node(nodes.graph_reference()) {
+        make_edges_in_order(nodes, *this);
+    }
+#endif
 
-                //! Reserves an item.
-                bool try_reserve(output_type &v) override {
-                    spin_mutex::scoped_lock lock(my_mutex);
-                    if (my_reserved) { return false; }
-
-                    if (my_has_cached_item) {
-                        v = my_cached_item;
-                        my_reserved = true;
-                        return true;
-                    } else {
-                        return false;
-                    }
-                }
+    //! Copy constructor
+    __TBB_NOINLINE_SYM queue_node( const queue_node& src) : base_type(src) {
+        fgt_node( CODEPTR(), FLOW_QUEUE_NODE, &(this->my_graph),
+                                 static_cast<receiver<input_type> *>(this),
+                                 static_cast<sender<output_type> *>(this) );
+    }
+
+
+protected:
+    void reset_node( reset_flags f) override {
+        base_type::reset_node(f);
+    }
+};  // queue_node
+
+//! Forwards messages in sequence order
+template <typename T>
+    __TBB_requires(std::copyable<T>)
+class sequencer_node : public queue_node<T> {
+    function_body< T, size_t > *my_sequencer;
+    // my_sequencer should be a benign function and must be callable
+    // from a parallel context.  Does this mean it needn't be reset?
+public:
+    typedef T input_type;
+    typedef T output_type;
+    typedef typename receiver<input_type>::predecessor_type predecessor_type;
+    typedef typename sender<output_type>::successor_type successor_type;
+
+    //! Constructor
+    template< typename Sequencer >
+        __TBB_requires(sequencer<Sequencer, T>)
+    __TBB_NOINLINE_SYM sequencer_node( graph &g, const Sequencer& s ) : queue_node<T>(g),
+        my_sequencer(new function_body_leaf< T, size_t, Sequencer>(s) ) {
+        fgt_node( CODEPTR(), FLOW_SEQUENCER_NODE, &(this->my_graph),
+                                 static_cast<receiver<input_type> *>(this),
+                                 static_cast<sender<output_type> *>(this) );
+    }
 
-                //! Release a reserved item.
-                /** true = item has been released and so remains in sender, dest must request or reserve future items */
-                bool try_release() override {
-                    spin_mutex::scoped_lock lock(my_mutex);
-                    __TBB_ASSERT(my_reserved && my_has_cached_item, "releasing non-existent reservation");
-                    my_reserved = false;
-                    if (!my_successors.empty()) spawn_put();
-                    return true;
-                }
+#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+    template <typename Sequencer, typename... Args>
+        __TBB_requires(sequencer<Sequencer, T>)
+    sequencer_node( const node_set<Args...>& nodes, const Sequencer& s)
+        : sequencer_node(nodes.graph_reference(), s) {
+        make_edges_in_order(nodes, *this);
+    }
+#endif
 
-                //! Consumes a reserved item
-                bool try_consume() override {
-                    spin_mutex::scoped_lock lock(my_mutex);
-                    __TBB_ASSERT(my_reserved && my_has_cached_item, "consuming non-existent reservation");
-                    my_reserved = false;
-                    my_has_cached_item = false;
-                    if (!my_successors.empty()) { spawn_put(); }
-                    return true;
-                }
+    //! Copy constructor
+    __TBB_NOINLINE_SYM sequencer_node( const sequencer_node& src ) : queue_node<T>(src),
+        my_sequencer( src.my_sequencer->clone() ) {
+        fgt_node( CODEPTR(), FLOW_SEQUENCER_NODE, &(this->my_graph),
+                                 static_cast<receiver<input_type> *>(this),
+                                 static_cast<sender<output_type> *>(this) );
+    }
 
-                //! Activates a node that was created in the inactive state
-                void activate() {
-                    spin_mutex::scoped_lock lock(my_mutex);
-                    my_active = true;
-                    if (!my_successors.empty()) spawn_put();
-                }
+    //! Destructor
+    ~sequencer_node() { delete my_sequencer; }
 
-                template <typename Body>
-                Body copy_function_object() {
-                    input_body<output_type> &body_ref = *this->my_body;
-                    return dynamic_cast<input_body_leaf<output_type, Body> &>(body_ref).get_body();
-                }
+protected:
+    typedef typename buffer_node<T>::size_type size_type;
+    typedef typename buffer_node<T>::buffer_operation sequencer_operation;
 
-            protected:
-                //! resets the input_node to its initial state
-                void reset_node(reset_flags f) override {
-                    my_active = false;
-                    my_reserved = false;
-                    my_has_cached_item = false;
-
-                    if (f & rf_clear_edges) my_successors.clear();
-                    if (f & rf_reset_bodies) {
-                        input_body<output_type> *tmp = my_init_body->clone();
-                        delete my_body;
-                        my_body = tmp;
-                    }
-                }
+private:
+    bool internal_push(sequencer_operation *op) override {
+        size_type tag = (*my_sequencer)(*(op->elem));
+#if !TBB_DEPRECATED_SEQUENCER_DUPLICATES
+        if (tag < this->my_head) {
+            // have already emitted a message with this tag
+            op->status.store(FAILED, std::memory_order_release);
+            return false;
+        }
+#endif
+        // cannot modify this->my_tail now; the buffer would be inconsistent.
+        size_t new_tail = (tag+1 > this->my_tail) ? tag+1 : this->my_tail;
+
+        if (this->size(new_tail) > this->capacity()) {
+            this->grow_my_array(this->size(new_tail));
+        }
+        this->my_tail = new_tail;
+
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+        __TBB_ASSERT(op->metainfo, nullptr);
+        bool place_item_result = this->place_item(tag, *(op->elem), *(op->metainfo));
+        const op_stat res = place_item_result ? SUCCEEDED : FAILED;
+#else
+        const op_stat res = this->place_item(tag, *(op->elem)) ? SUCCEEDED : FAILED;
+#endif
+        op->status.store(res, std::memory_order_release);
+        return res ==SUCCEEDED;
+    }
+};  // sequencer_node
+
+//! Forwards messages in priority order
+template<typename T, typename Compare = std::less<T>>
+class priority_queue_node : public buffer_node<T> {
+public:
+    typedef T input_type;
+    typedef T output_type;
+    typedef buffer_node<T> base_type;
+    typedef priority_queue_node class_type;
+    typedef typename receiver<input_type>::predecessor_type predecessor_type;
+    typedef typename sender<output_type>::successor_type successor_type;
+
+    //! Constructor
+    __TBB_NOINLINE_SYM explicit priority_queue_node( graph &g, const Compare& comp = Compare() )
+        : buffer_node<T>(g), compare(comp), mark(0) {
+        fgt_node( CODEPTR(), FLOW_PRIORITY_QUEUE_NODE, &(this->my_graph),
+                                 static_cast<receiver<input_type> *>(this),
+                                 static_cast<sender<output_type> *>(this) );
+    }
 
-            private:
-                spin_mutex my_mutex;
-                bool my_active;
-                input_body<output_type> *my_body;
-                input_body<output_type> *my_init_body;
-                broadcast_cache<output_type> my_successors;
-                bool my_reserved;
-                bool my_has_cached_item;
-                output_type my_cached_item;
-
-                // used by apply_body_bypass, can invoke body of node.
-                bool try_reserve_apply_body(output_type &v) {
-                    spin_mutex::scoped_lock lock(my_mutex);
-                    if (my_reserved) { return false; }
-                    if (!my_has_cached_item) {
-                        flow_control control;
+#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+    template <typename... Args>
+    priority_queue_node(const node_set<Args...>& nodes, const Compare& comp = Compare())
+        : priority_queue_node(nodes.graph_reference(), comp) {
+        make_edges_in_order(nodes, *this);
+    }
+#endif
 
-                        fgt_begin_body(my_body);
+    //! Copy constructor
+    __TBB_NOINLINE_SYM priority_queue_node( const priority_queue_node &src )
+        : buffer_node<T>(src), mark(0)
+    {
+        fgt_node( CODEPTR(), FLOW_PRIORITY_QUEUE_NODE, &(this->my_graph),
+                                 static_cast<receiver<input_type> *>(this),
+                                 static_cast<sender<output_type> *>(this) );
+    }
+
+protected:
+
+    void reset_node( reset_flags f) override {
+        mark = 0;
+        base_type::reset_node(f);
+    }
+
+    typedef typename buffer_node<T>::size_type size_type;
+    typedef typename buffer_node<T>::item_type item_type;
+    typedef typename buffer_node<T>::buffer_operation prio_operation;
+
+    //! Tries to forward valid items to successors
+    void internal_forward_task(prio_operation *op) override {
+        this->internal_forward_task_impl(op, this);
+    }
+
+    void handle_operations(prio_operation *op_list) override {
+        this->handle_operations_impl(op_list, this);
+    }
+
+    bool internal_push(prio_operation *op) override {
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+        __TBB_ASSERT(op->metainfo, nullptr);
+        prio_push(*(op->elem), *(op->metainfo));
+#else
+        prio_push(*(op->elem));
+#endif
+        op->status.store(SUCCEEDED, std::memory_order_release);
+        return true;
+    }
+
+    void internal_pop(prio_operation *op) override {
+        // if empty or already reserved, don't pop
+        if ( this->my_reserved == true || this->my_tail == 0 ) {
+            op->status.store(FAILED, std::memory_order_release);
+            return;
+        }
+
+        *(op->elem) = prio();
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+        if (op->metainfo) {
+            *(op->metainfo) = std::move(prio_metainfo());
+        }
+#endif
+        op->status.store(SUCCEEDED, std::memory_order_release);
+        prio_pop();
+
+    }
+
+    // pops the highest-priority item, saves copy
+    void internal_reserve(prio_operation *op) override {
+        if (this->my_reserved == true || this->my_tail == 0) {
+            op->status.store(FAILED, std::memory_order_release);
+            return;
+        }
+        this->my_reserved = true;
+        *(op->elem) = prio();
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+        if (op->metainfo) {
+            *(op->metainfo) = std::move(prio_metainfo());
+            reserved_metainfo = *(op->metainfo);
+        }
+#endif
+        reserved_item = *(op->elem);
+        op->status.store(SUCCEEDED, std::memory_order_release);
+        prio_pop();
+    }
+
+    void internal_consume(prio_operation *op) override {
+        op->status.store(SUCCEEDED, std::memory_order_release);
+        this->my_reserved = false;
+        reserved_item = input_type();
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+        for (auto waiter : reserved_metainfo.waiters()) {
+            waiter->release(1);
+        }
+
+        reserved_metainfo = message_metainfo{};
+#endif
+    }
+
+    void internal_release(prio_operation *op) override {
+        op->status.store(SUCCEEDED, std::memory_order_release);
+        prio_push(reserved_item __TBB_FLOW_GRAPH_METAINFO_ARG(reserved_metainfo));
+        this->my_reserved = false;
+        reserved_item = input_type();
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+        for (auto waiter : reserved_metainfo.waiters()) {
+            waiter->release(1);
+        }
+
+        reserved_metainfo = message_metainfo{};
+#endif
+    }
+
+private:
+    template<typename> friend class buffer_node;
+
+    void order() {
+        if (mark < this->my_tail) heapify();
+        __TBB_ASSERT(mark == this->my_tail, "mark unequal after heapify");
+    }
+
+    bool is_item_valid() {
+        return this->my_tail > 0;
+    }
+
+    void try_put_and_add_task(graph_task*& last_task) {
+        graph_task* new_task = this->my_successors.try_put_task(this->prio()
+                                                                __TBB_FLOW_GRAPH_METAINFO_ARG(this->prio_metainfo()));
+        if (new_task) {
+            // workaround for icc bug
+            graph& graph_ref = this->graph_reference();
+            last_task = combine_tasks(graph_ref, last_task, new_task);
+            prio_pop();
+        }
+    }
+
+private:
+    Compare compare;
+    size_type mark;
+
+    input_type reserved_item;
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+    message_metainfo reserved_metainfo;
+#endif
 
-                        my_cached_item = (*my_body)(control);
-                        my_has_cached_item = !control.is_pipeline_stopped;
+    // in case a reheap has not been done after a push, check if the mark item is higher than the 0'th item
+    bool prio_use_tail() {
+        __TBB_ASSERT(mark <= this->my_tail, "mark outside bounds before test");
+        return mark < this->my_tail && compare(this->get_my_item(0), this->get_my_item(this->my_tail - 1));
+    }
+
+    // prio_push: checks that the item will fit, expand array if necessary, put at end
+    void prio_push(const T &src __TBB_FLOW_GRAPH_METAINFO_ARG(const message_metainfo& metainfo)) {
+        if ( this->my_tail >= this->my_array_size )
+            this->grow_my_array( this->my_tail + 1 );
+        (void) this->place_item(this->my_tail, src __TBB_FLOW_GRAPH_METAINFO_ARG(metainfo));
+        ++(this->my_tail);
+        __TBB_ASSERT(mark < this->my_tail, "mark outside bounds after push");
+    }
+
+    // prio_pop: deletes highest priority item from the array, and if it is item
+    // 0, move last item to 0 and reheap.  If end of array, just destroy and decrement tail
+    // and mark.  Assumes the array has already been tested for emptiness; no failure.
+    void prio_pop()  {
+        if (prio_use_tail()) {
+            // there are newly pushed elements; last one higher than top
+            // copy the data
+            this->destroy_item(this->my_tail-1);
+            --(this->my_tail);
+            __TBB_ASSERT(mark <= this->my_tail, "mark outside bounds after pop");
+            return;
+        }
+        this->destroy_item(0);
+        if(this->my_tail > 1) {
+            // push the last element down heap
+            __TBB_ASSERT(this->my_item_valid(this->my_tail - 1), nullptr);
+            this->move_item(0,this->my_tail - 1);
+        }
+        --(this->my_tail);
+        if(mark > this->my_tail) --mark;
+        if (this->my_tail > 1) // don't reheap for heap of size 1
+            reheap();
+        __TBB_ASSERT(mark <= this->my_tail, "mark outside bounds after pop");
+    }
+
+    const T& prio() {
+        return this->get_my_item(prio_use_tail() ? this->my_tail-1 : 0);
+    }
+
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+    message_metainfo& prio_metainfo() {
+        return this->get_my_metainfo(prio_use_tail() ? this->my_tail-1 : 0);
+    }
+#endif
 
-                        fgt_end_body(my_body);
+    // turn array into heap
+    void heapify() {
+        if(this->my_tail == 0) {
+            mark = 0;
+            return;
+        }
+        if (!mark) mark = 1;
+        for (; mark<this->my_tail; ++mark) { // for each unheaped element
+            size_type cur_pos = mark;
+            input_type to_place;
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+            message_metainfo metainfo;
+#endif
+            this->fetch_item(mark, to_place __TBB_FLOW_GRAPH_METAINFO_ARG(metainfo));
+            do { // push to_place up the heap
+                size_type parent = (cur_pos-1)>>1;
+                if (!compare(this->get_my_item(parent), to_place))
+                    break;
+                this->move_item(cur_pos, parent);
+                cur_pos = parent;
+            } while( cur_pos );
+            this->place_item(cur_pos, to_place __TBB_FLOW_GRAPH_METAINFO_ARG(std::move(metainfo)));
+        }
+    }
+
+    // otherwise heapified array with new root element; rearrange to heap
+    void reheap() {
+        size_type cur_pos=0, child=1;
+        while (child < mark) {
+            size_type target = child;
+            if (child+1<mark &&
+                compare(this->get_my_item(child),
+                        this->get_my_item(child+1)))
+                ++target;
+            // target now has the higher priority child
+            if (compare(this->get_my_item(target),
+                        this->get_my_item(cur_pos)))
+                break;
+            // swap
+            this->swap_items(cur_pos, target);
+            cur_pos = target;
+            child = (cur_pos<<1)+1;
+        }
+    }
+};  // priority_queue_node
+
+//! Forwards messages only if the threshold has not been reached
+/** This node forwards items until its threshold is reached.
+    It contains no buffering.  If the downstream node rejects, the
+    message is dropped. */
+template< typename T, typename DecrementType=continue_msg >
+class limiter_node : public graph_node, public receiver< T >, public sender< T > {
+public:
+    typedef T input_type;
+    typedef T output_type;
+    typedef typename receiver<input_type>::predecessor_type predecessor_type;
+    typedef typename sender<output_type>::successor_type successor_type;
+    //TODO: There is a lack of predefined types for its controlling "decrementer" port. It should be fixed later.
+
+private:
+    size_t my_threshold;
+    size_t my_count; // number of successful puts
+    size_t my_tries; // number of active put attempts
+    size_t my_future_decrement; // number of active decrement
+    reservable_predecessor_cache< T, spin_mutex > my_predecessors;
+    spin_mutex my_mutex;
+    broadcast_cache< T > my_successors;
+
+    //! The internal receiver< DecrementType > that adjusts the count
+    threshold_regulator< limiter_node<T, DecrementType>, DecrementType > decrement;
+
+    graph_task* decrement_counter( long long delta ) {
+        if ( delta > 0 && size_t(delta) > my_threshold ) {
+            delta = my_threshold;
+        }
+
+        {
+            spin_mutex::scoped_lock lock(my_mutex);
+            if ( delta > 0 && size_t(delta) > my_count ) {
+                if( my_tries > 0 ) {
+                    my_future_decrement += (size_t(delta) - my_count);
+                }
+                my_count = 0;
+            }
+            else if ( delta < 0 && size_t(-delta) > my_threshold - my_count ) {
+                my_count = my_threshold;
+            }
+            else {
+                my_count -= size_t(delta); // absolute value of delta is sufficiently small
+            }
+            __TBB_ASSERT(my_count <= my_threshold, "counter values are truncated to be inside the [0, threshold] interval");
+        }
+        return forward_task();
+    }
+
+    // Let threshold_regulator call decrement_counter()
+    friend class threshold_regulator< limiter_node<T, DecrementType>, DecrementType >;
+
+    friend class forward_task_bypass< limiter_node<T,DecrementType> >;
+
+    bool check_conditions() {  // always called under lock
+        return ( my_count + my_tries < my_threshold && !my_predecessors.empty() && !my_successors.empty() );
+    }
+
+    // only returns a valid task pointer or nullptr, never SUCCESSFULLY_ENQUEUED
+    graph_task* forward_task() {
+        input_type v;
+        graph_task* rval = nullptr;
+        bool reserved = false;
+
+        {
+            spin_mutex::scoped_lock lock(my_mutex);
+            if ( check_conditions() )
+                ++my_tries;
+            else
+                return nullptr;
+        }
+
+        //SUCCESS
+        // if we can reserve and can put, we consume the reservation
+        // we increment the count and decrement the tries
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+        message_metainfo metainfo;
+#endif
+        if ( (my_predecessors.try_reserve(v __TBB_FLOW_GRAPH_METAINFO_ARG(metainfo))) == true ) {
+            reserved = true;
+            if ( (rval = my_successors.try_put_task(v __TBB_FLOW_GRAPH_METAINFO_ARG(metainfo))) != nullptr ) {
+                {
+                    spin_mutex::scoped_lock lock(my_mutex);
+                    ++my_count;
+                    if ( my_future_decrement ) {
+                        if ( my_count > my_future_decrement ) {
+                            my_count -= my_future_decrement;
+                            my_future_decrement = 0;
+                        }
+                        else {
+                            my_future_decrement -= my_count;
+                            my_count = 0;
+                        }
                     }
-                    if (my_has_cached_item) {
-                        v = my_cached_item;
-                        my_reserved = true;
-                        return true;
-                    } else {
-                        return false;
+                    --my_tries;
+                    my_predecessors.try_consume();
+                    if ( check_conditions() ) {
+                        if ( is_graph_active(this->my_graph) ) {
+                            typedef forward_task_bypass<limiter_node<T, DecrementType>> task_type;
+                            d1::small_object_allocator allocator{};
+                            graph_task* rtask = allocator.new_object<task_type>( my_graph, allocator, *this );
+                            spawn_in_graph_arena(graph_reference(), *rtask);
+                        }
                     }
                 }
-
-                graph_task *create_put_task() {
-                    small_object_allocator allocator {};
-                    typedef input_node_task_bypass<input_node<output_type>> task_type;
-                    graph_task *t = allocator.new_object<task_type>(my_graph, allocator, *this);
-                    my_graph.reserve_wait();
+                return rval;
+            }
+        }
+        //FAILURE
+        //if we can't reserve, we decrement the tries
+        //if we can reserve but can't put, we decrement the tries and release the reservation
+        {
+            spin_mutex::scoped_lock lock(my_mutex);
+            --my_tries;
+            if (reserved) my_predecessors.try_release();
+            if ( check_conditions() ) {
+                if ( is_graph_active(this->my_graph) ) {
+                    d1::small_object_allocator allocator{};
+                    typedef forward_task_bypass<limiter_node<T, DecrementType>> task_type;
+                    graph_task* t = allocator.new_object<task_type>(my_graph, allocator, *this);
+                    __TBB_ASSERT(!rval, "Have two tasks to handle");
                     return t;
                 }
+            }
+            return rval;
+        }
+    }
+
+    void initialize() {
+        fgt_node(
+            CODEPTR(), FLOW_LIMITER_NODE, &this->my_graph,
+            static_cast<receiver<input_type> *>(this), static_cast<receiver<DecrementType> *>(&decrement),
+            static_cast<sender<output_type> *>(this)
+        );
+    }
+
+public:
+    //! Constructor
+    limiter_node(graph &g, size_t threshold)
+        : graph_node(g), my_threshold(threshold), my_count(0), my_tries(0), my_future_decrement(0),
+        my_predecessors(this), my_successors(this), decrement(this)
+    {
+        initialize();
+    }
 
-                //! Spawns a task that applies the body
-                void spawn_put() {
-                    if (is_graph_active(this->my_graph)) {
-                        spawn_in_graph_arena(this->my_graph, *create_put_task());
-                    }
-                }
+#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+    template <typename... Args>
+    limiter_node(const node_set<Args...>& nodes, size_t threshold)
+        : limiter_node(nodes.graph_reference(), threshold) {
+        make_edges_in_order(nodes, *this);
+    }
+#endif
 
-                friend class input_node_task_bypass<input_node<output_type>>;
-                //! Applies the body.  Returning SUCCESSFULLY_ENQUEUED okay; forward_task_bypass will handle it.
-                graph_task *apply_body_bypass() {
-                    output_type v;
-                    if (!try_reserve_apply_body(v)) return NULL;
-
-                    graph_task *last_task = my_successors.try_put_task(v);
-                    if (last_task) try_consume();
-                    else
-                        try_release();
-                    return last_task;
-                }
-            };// class input_node
-
-            //! Implements a function node that supports Input -> Output
-            template <typename Input, typename Output = continue_msg, typename Policy = queueing>
-            __TBB_requires(std::default_initializable<Input> &&std::copy_constructible<Input>
-                                   &&std::copy_constructible<Output>) class function_node
-                : public graph_node,
-                  public function_input<Input, Output, Policy, cache_aligned_allocator<Input>>,
-                  public function_output<Output> {
-                typedef cache_aligned_allocator<Input> internals_allocator;
-
-            public:
-                typedef Input input_type;
-                typedef Output output_type;
-                typedef function_input<input_type, output_type, Policy, internals_allocator> input_impl_type;
-                typedef function_input_queue<input_type, internals_allocator> input_queue_type;
-                typedef function_output<output_type> fOutput_type;
-                typedef typename input_impl_type::predecessor_type predecessor_type;
-                typedef typename fOutput_type::successor_type successor_type;
-
-                using input_impl_type::my_predecessors;
-
-                //! Constructor
-                // input_queue_type is allocated here, but destroyed in the function_input_base.
-                // TODO: pass the graph_buffer_policy to the function_input_base so it can all
-                // be done in one place.  This would be an interface-breaking change.
-                template <typename Body>
-                __TBB_requires(function_node_body<Body, Input, Output>) __TBB_NOINLINE_SYM
-                        function_node(graph &g, size_t concurrency, Body body, Policy = Policy(),
-                                      node_priority_t a_priority = no_priority)
-                    : graph_node(g), input_impl_type(g, concurrency, body, a_priority), fOutput_type(g) {
-                    fgt_node_with_body(CODEPTR(), FLOW_FUNCTION_NODE, &this->my_graph,
-                                       static_cast<receiver<input_type> *>(this),
-                                       static_cast<sender<output_type> *>(this), this->my_body);
+    //! Copy constructor
+    limiter_node( const limiter_node& src ) : limiter_node(src.my_graph, src.my_threshold) {}
+
+    //! The interface for accessing internal receiver< DecrementType > that adjusts the count
+    receiver<DecrementType>& decrementer() { return decrement; }
+
+    //! Replace the current successor with this new successor
+    bool register_successor( successor_type &r ) override {
+        spin_mutex::scoped_lock lock(my_mutex);
+        bool was_empty = my_successors.empty();
+        my_successors.register_successor(r);
+        //spawn a forward task if this is the only successor
+        if ( was_empty && !my_predecessors.empty() && my_count + my_tries < my_threshold ) {
+            if ( is_graph_active(this->my_graph) ) {
+                d1::small_object_allocator allocator{};
+                typedef forward_task_bypass<limiter_node<T, DecrementType>> task_type;
+                graph_task* t = allocator.new_object<task_type>(my_graph, allocator, *this);
+                spawn_in_graph_arena(graph_reference(), *t);
+            }
+        }
+        return true;
+    }
+
+    //! Removes a successor from this node
+    /** r.remove_predecessor(*this) is also called. */
+    bool remove_successor( successor_type &r ) override {
+        // TODO revamp: investigate why qualification is needed for remove_predecessor() call
+        tbb::detail::d2::remove_predecessor(r, *this);
+        my_successors.remove_successor(r);
+        return true;
+    }
+
+    //! Adds src to the list of cached predecessors.
+    bool register_predecessor( predecessor_type &src ) override {
+        spin_mutex::scoped_lock lock(my_mutex);
+        my_predecessors.add( src );
+        if ( my_count + my_tries < my_threshold && !my_successors.empty() && is_graph_active(this->my_graph) ) {
+            d1::small_object_allocator allocator{};
+            typedef forward_task_bypass<limiter_node<T, DecrementType>> task_type;
+            graph_task* t = allocator.new_object<task_type>(my_graph, allocator, *this);
+            spawn_in_graph_arena(graph_reference(), *t);
+        }
+        return true;
+    }
+
+    //! Removes src from the list of cached predecessors.
+    bool remove_predecessor( predecessor_type &src ) override {
+        my_predecessors.remove( src );
+        return true;
+    }
+
+protected:
+
+    template< typename R, typename B > friend class run_and_put_task;
+    template<typename X, typename Y> friend class broadcast_cache;
+    template<typename X, typename Y> friend class round_robin_cache;
+
+private:
+    //! Puts an item to this receiver
+    graph_task* try_put_task_impl( const T &t __TBB_FLOW_GRAPH_METAINFO_ARG(const message_metainfo& metainfo) ) {
+        {
+            spin_mutex::scoped_lock lock(my_mutex);
+            if ( my_count + my_tries >= my_threshold )
+                return nullptr;
+            else
+                ++my_tries;
+        }
+
+        graph_task* rtask = my_successors.try_put_task(t __TBB_FLOW_GRAPH_METAINFO_ARG(metainfo));
+        if ( !rtask ) {  // try_put_task failed.
+            spin_mutex::scoped_lock lock(my_mutex);
+            --my_tries;
+            if (check_conditions() && is_graph_active(this->my_graph)) {
+                d1::small_object_allocator allocator{};
+                typedef forward_task_bypass<limiter_node<T, DecrementType>> task_type;
+                rtask = allocator.new_object<task_type>(my_graph, allocator, *this);
+            }
+        }
+        else {
+            spin_mutex::scoped_lock lock(my_mutex);
+            ++my_count;
+            if ( my_future_decrement ) {
+                if ( my_count > my_future_decrement ) {
+                    my_count -= my_future_decrement;
+                    my_future_decrement = 0;
+                }
+                else {
+                    my_future_decrement -= my_count;
+                    my_count = 0;
                 }
+            }
+            --my_tries;
+        }
+        return rtask;
+    }
+
+protected:
+    graph_task* try_put_task(const T& t) override {
+        return try_put_task_impl(t __TBB_FLOW_GRAPH_METAINFO_ARG(message_metainfo{}));
+    }
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+    graph_task* try_put_task(const T& t, const message_metainfo& metainfo) override {
+        return try_put_task_impl(t, metainfo);
+    }
+#endif
+
+    graph& graph_reference() const override { return my_graph; }
+
+    void reset_node( reset_flags f ) override {
+        my_count = 0;
+        if ( f & rf_clear_edges ) {
+            my_predecessors.clear();
+            my_successors.clear();
+        }
+        else {
+            my_predecessors.reset();
+        }
+        decrement.reset_receiver(f);
+    }
+};  // limiter_node
+
+#include "detail/_flow_graph_join_impl.h"
 
-                template <typename Body>
-                __TBB_requires(function_node_body<Body, Input, Output>)
-                        function_node(graph &g, size_t concurrency, Body body, node_priority_t a_priority)
-                    : function_node(g, concurrency, body, Policy(), a_priority) {}
+template<typename OutputTuple, typename JP=queueing> class join_node;
+
+template<typename OutputTuple>
+class join_node<OutputTuple,reserving>: public unfolded_join_node<std::tuple_size<OutputTuple>::value, reserving_port, OutputTuple, reserving> {
+private:
+    static const int N = std::tuple_size<OutputTuple>::value;
+    typedef unfolded_join_node<N, reserving_port, OutputTuple, reserving> unfolded_type;
+public:
+    typedef OutputTuple output_type;
+    typedef typename unfolded_type::input_ports_type input_ports_type;
+     __TBB_NOINLINE_SYM explicit join_node(graph &g) : unfolded_type(g) {
+        fgt_multiinput_node<N>( CODEPTR(), FLOW_JOIN_NODE_RESERVING, &this->my_graph,
+                                            this->input_ports(), static_cast< sender< output_type > *>(this) );
+    }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-                template <typename Body, typename... Args>
-                __TBB_requires(function_node_body<Body, Input, Output>)
-                        function_node(const node_set<Args...> &nodes, size_t concurrency, Body body,
-                                      Policy p = Policy(), node_priority_t a_priority = no_priority)
-                    : function_node(nodes.graph_reference(), concurrency, body, p, a_priority) {
-                    make_edges_in_order(nodes, *this);
-                }
+    template <typename... Args>
+    __TBB_NOINLINE_SYM join_node(const node_set<Args...>& nodes, reserving = reserving()) : join_node(nodes.graph_reference()) {
+        make_edges_in_order(nodes, *this);
+    }
+#endif
 
-                template <typename Body, typename... Args>
-                __TBB_requires(function_node_body<Body, Input, Output>)
-                        function_node(const node_set<Args...> &nodes, size_t concurrency, Body body,
-                                      node_priority_t a_priority)
-                    : function_node(nodes, concurrency, body, Policy(), a_priority) {}
-#endif// __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-
-                //! Copy constructor
-                __TBB_NOINLINE_SYM function_node(const function_node &src)
-                    : graph_node(src.my_graph), input_impl_type(src), fOutput_type(src.my_graph) {
-                    fgt_node_with_body(CODEPTR(), FLOW_FUNCTION_NODE, &this->my_graph,
-                                       static_cast<receiver<input_type> *>(this),
-                                       static_cast<sender<output_type> *>(this), this->my_body);
-                }
+    __TBB_NOINLINE_SYM join_node(const join_node &other) : unfolded_type(other) {
+        fgt_multiinput_node<N>( CODEPTR(), FLOW_JOIN_NODE_RESERVING, &this->my_graph,
+                                            this->input_ports(), static_cast< sender< output_type > *>(this) );
+    }
+
+};
+
+template<typename OutputTuple>
+class join_node<OutputTuple,queueing>: public unfolded_join_node<std::tuple_size<OutputTuple>::value, queueing_port, OutputTuple, queueing> {
+private:
+    static const int N = std::tuple_size<OutputTuple>::value;
+    typedef unfolded_join_node<N, queueing_port, OutputTuple, queueing> unfolded_type;
+public:
+    typedef OutputTuple output_type;
+    typedef typename unfolded_type::input_ports_type input_ports_type;
+     __TBB_NOINLINE_SYM explicit join_node(graph &g) : unfolded_type(g) {
+        fgt_multiinput_node<N>( CODEPTR(), FLOW_JOIN_NODE_QUEUEING, &this->my_graph,
+                                            this->input_ports(), static_cast< sender< output_type > *>(this) );
+    }
 
-            protected:
-                template <typename R, typename B>
-                friend class run_and_put_task;
-                template <typename X, typename Y>
-                friend class broadcast_cache;
-                template <typename X, typename Y>
-                friend class round_robin_cache;
-                using input_impl_type::try_put_task;
-
-                broadcast_cache<output_type> &successors() override { return fOutput_type::my_successors; }
-
-                void reset_node(reset_flags f) override {
-                    input_impl_type::reset_function_input(f);
-                    // TODO: use clear() instead.
-                    if (f & rf_clear_edges) {
-                        successors().clear();
-                        my_predecessors.clear();
-                    }
-                    __TBB_ASSERT(!(f & rf_clear_edges) || successors().empty(),
-                                 "function_node successors not empty");
-                    __TBB_ASSERT(this->my_predecessors.empty(), "function_node predecessors not empty");
-                }
+#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+    template <typename... Args>
+    __TBB_NOINLINE_SYM join_node(const node_set<Args...>& nodes, queueing = queueing()) : join_node(nodes.graph_reference()) {
+        make_edges_in_order(nodes, *this);
+    }
+#endif
 
-            };// class function_node
-
-            //! implements a function node that supports Input -> (set of outputs)
-            // Output is a tuple of output types.
-            template <typename Input, typename Output, typename Policy = queueing>
-            __TBB_requires(std::default_initializable<Input>
-                                   &&std::copy_constructible<Input>) class multifunction_node
-                : public graph_node,
-                  public multifunction_input<
-                          Input,
-                          typename wrap_tuple_elements<std::tuple_size<Output>::value,// #elements in tuple
-                                                       multifunction_output,// wrap this around each element
-                                                       Output               // the tuple providing the types
-                                                       >::type,
-                          Policy, cache_aligned_allocator<Input>> {
-                typedef cache_aligned_allocator<Input> internals_allocator;
-
-            protected:
-                static const int N = std::tuple_size<Output>::value;
-
-            public:
-                typedef Input input_type;
-                typedef null_type output_type;
-                typedef typename wrap_tuple_elements<N, multifunction_output, Output>::type output_ports_type;
-                typedef multifunction_input<input_type, output_ports_type, Policy, internals_allocator>
-                        input_impl_type;
-                typedef function_input_queue<input_type, internals_allocator> input_queue_type;
-
-            private:
-                using input_impl_type::my_predecessors;
-
-            public:
-                template <typename Body>
-                __TBB_requires(multifunction_node_body<Body, Input, output_ports_type>) __TBB_NOINLINE_SYM
-                        multifunction_node(graph &g, size_t concurrency, Body body, Policy = Policy(),
-                                           node_priority_t a_priority = no_priority)
-                    : graph_node(g), input_impl_type(g, concurrency, body, a_priority) {
-                    fgt_multioutput_node_with_body<N>(CODEPTR(), FLOW_MULTIFUNCTION_NODE, &this->my_graph,
-                                                      static_cast<receiver<input_type> *>(this),
-                                                      this->output_ports(), this->my_body);
-                }
+    __TBB_NOINLINE_SYM join_node(const join_node &other) : unfolded_type(other) {
+        fgt_multiinput_node<N>( CODEPTR(), FLOW_JOIN_NODE_QUEUEING, &this->my_graph,
+                                            this->input_ports(), static_cast< sender< output_type > *>(this) );
+    }
 
-                template <typename Body>
-                __TBB_requires(multifunction_node_body<Body, Input, output_ports_type>) __TBB_NOINLINE_SYM
-                        multifunction_node(graph &g, size_t concurrency, Body body,
-                                           node_priority_t a_priority)
-                    : multifunction_node(g, concurrency, body, Policy(), a_priority) {}
+};
 
-#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-                template <typename Body, typename... Args>
-                __TBB_requires(multifunction_node_body<Body, Input, output_ports_type>) __TBB_NOINLINE_SYM
-                        multifunction_node(const node_set<Args...> &nodes, size_t concurrency, Body body,
-                                           Policy p = Policy(), node_priority_t a_priority = no_priority)
-                    : multifunction_node(nodes.graph_reference(), concurrency, body, p, a_priority) {
-                    make_edges_in_order(nodes, *this);
-                }
+#if __TBB_CPP20_CONCEPTS_PRESENT
+// Helper function which is well-formed only if all of the elements in OutputTuple
+// satisfies join_node_function_object<body[i], tuple[i], K>
+template <typename OutputTuple, typename K,
+          typename... Functions, std::size_t... Idx>
+void join_node_function_objects_helper( std::index_sequence<Idx...> )
+    requires (std::tuple_size_v<OutputTuple> == sizeof...(Functions)) &&
+             (... && join_node_function_object<Functions, std::tuple_element_t<Idx, OutputTuple>, K>);
+
+template <typename OutputTuple, typename K, typename... Functions>
+concept join_node_functions = requires {
+    join_node_function_objects_helper<OutputTuple, K, Functions...>(std::make_index_sequence<sizeof...(Functions)>{});
+};
 
-                template <typename Body, typename... Args>
-                __TBB_requires(multifunction_node_body<Body, Input, output_ports_type>) __TBB_NOINLINE_SYM
-                        multifunction_node(const node_set<Args...> &nodes, size_t concurrency, Body body,
-                                           node_priority_t a_priority)
-                    : multifunction_node(nodes, concurrency, body, Policy(), a_priority) {}
-#endif// __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-
-                __TBB_NOINLINE_SYM multifunction_node(const multifunction_node &other)
-                    : graph_node(other.my_graph), input_impl_type(other) {
-                    fgt_multioutput_node_with_body<N>(CODEPTR(), FLOW_MULTIFUNCTION_NODE, &this->my_graph,
-                                                      static_cast<receiver<input_type> *>(this),
-                                                      this->output_ports(), this->my_body);
-                }
+#endif
 
-                // all the guts are in multifunction_input...
-            protected:
-                void reset_node(reset_flags f) override { input_impl_type::reset(f); }
-            };// multifunction_node
-
-            //! split_node: accepts a tuple as input, forwards each element of the tuple to its
-            //  successors.  The node has unlimited concurrency, so it does not reject inputs.
-            template <typename TupleType>
-            class split_node : public graph_node, public receiver<TupleType> {
-                static const int N = std::tuple_size<TupleType>::value;
-                typedef receiver<TupleType> base_type;
-
-            public:
-                typedef TupleType input_type;
-                typedef typename wrap_tuple_elements<N,                   // #elements in tuple
-                                                     multifunction_output,// wrap this around each element
-                                                     TupleType            // the tuple providing the types
-                                                     >::type output_ports_type;
-
-                __TBB_NOINLINE_SYM explicit split_node(graph &g)
-                    : graph_node(g),
-                      my_output_ports(init_output_ports<output_ports_type>::call(g, my_output_ports)) {
-                    fgt_multioutput_node<N>(CODEPTR(), FLOW_SPLIT_NODE, &this->my_graph,
-                                            static_cast<receiver<input_type> *>(this), this->output_ports());
-                }
+// template for key_matching join_node
+// tag_matching join_node is a specialization of key_matching, and is source-compatible.
+template<typename OutputTuple, typename K, typename KHash>
+class join_node<OutputTuple, key_matching<K, KHash> > : public unfolded_join_node<std::tuple_size<OutputTuple>::value,
+      key_matching_port, OutputTuple, key_matching<K,KHash> > {
+private:
+    static const int N = std::tuple_size<OutputTuple>::value;
+    typedef unfolded_join_node<N, key_matching_port, OutputTuple, key_matching<K,KHash> > unfolded_type;
+public:
+    typedef OutputTuple output_type;
+    typedef typename unfolded_type::input_ports_type input_ports_type;
+
+#if __TBB_PREVIEW_MESSAGE_BASED_KEY_MATCHING
+    join_node(graph &g) : unfolded_type(g) {}
+#endif  /* __TBB_PREVIEW_MESSAGE_BASED_KEY_MATCHING */
+
+    template<typename __TBB_B0, typename __TBB_B1>
+        __TBB_requires(join_node_functions<OutputTuple, K, __TBB_B0, __TBB_B1>)
+     __TBB_NOINLINE_SYM join_node(graph &g, __TBB_B0 b0, __TBB_B1 b1) : unfolded_type(g, b0, b1) {
+        fgt_multiinput_node<N>( CODEPTR(), FLOW_JOIN_NODE_TAG_MATCHING, &this->my_graph,
+                                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
+    }
+    template<typename __TBB_B0, typename __TBB_B1, typename __TBB_B2>
+        __TBB_requires(join_node_functions<OutputTuple, K, __TBB_B0, __TBB_B1, __TBB_B2>)
+     __TBB_NOINLINE_SYM join_node(graph &g, __TBB_B0 b0, __TBB_B1 b1, __TBB_B2 b2) : unfolded_type(g, b0, b1, b2) {
+        fgt_multiinput_node<N>( CODEPTR(), FLOW_JOIN_NODE_TAG_MATCHING, &this->my_graph,
+                                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
+    }
+    template<typename __TBB_B0, typename __TBB_B1, typename __TBB_B2, typename __TBB_B3>
+        __TBB_requires(join_node_functions<OutputTuple, K, __TBB_B0, __TBB_B1, __TBB_B2, __TBB_B3>)
+     __TBB_NOINLINE_SYM join_node(graph &g, __TBB_B0 b0, __TBB_B1 b1, __TBB_B2 b2, __TBB_B3 b3) : unfolded_type(g, b0, b1, b2, b3) {
+        fgt_multiinput_node<N>( CODEPTR(), FLOW_JOIN_NODE_TAG_MATCHING, &this->my_graph,
+                                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
+    }
+    template<typename __TBB_B0, typename __TBB_B1, typename __TBB_B2, typename __TBB_B3, typename __TBB_B4>
+        __TBB_requires(join_node_functions<OutputTuple, K, __TBB_B0, __TBB_B1, __TBB_B2, __TBB_B3, __TBB_B4>)
+     __TBB_NOINLINE_SYM join_node(graph &g, __TBB_B0 b0, __TBB_B1 b1, __TBB_B2 b2, __TBB_B3 b3, __TBB_B4 b4) :
+            unfolded_type(g, b0, b1, b2, b3, b4) {
+        fgt_multiinput_node<N>( CODEPTR(), FLOW_JOIN_NODE_TAG_MATCHING, &this->my_graph,
+                                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
+    }
+#if __TBB_VARIADIC_MAX >= 6
+    template<typename __TBB_B0, typename __TBB_B1, typename __TBB_B2, typename __TBB_B3, typename __TBB_B4,
+        typename __TBB_B5>
+        __TBB_requires(join_node_functions<OutputTuple, K, __TBB_B0, __TBB_B1, __TBB_B2, __TBB_B3, __TBB_B4, __TBB_B5>)
+     __TBB_NOINLINE_SYM join_node(graph &g, __TBB_B0 b0, __TBB_B1 b1, __TBB_B2 b2, __TBB_B3 b3, __TBB_B4 b4, __TBB_B5 b5) :
+            unfolded_type(g, b0, b1, b2, b3, b4, b5) {
+        fgt_multiinput_node<N>( CODEPTR(), FLOW_JOIN_NODE_TAG_MATCHING, &this->my_graph,
+                                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
+    }
+#endif
+#if __TBB_VARIADIC_MAX >= 7
+    template<typename __TBB_B0, typename __TBB_B1, typename __TBB_B2, typename __TBB_B3, typename __TBB_B4,
+        typename __TBB_B5, typename __TBB_B6>
+        __TBB_requires(join_node_functions<OutputTuple, K, __TBB_B0, __TBB_B1, __TBB_B2, __TBB_B3, __TBB_B4, __TBB_B5, __TBB_B6>)
+     __TBB_NOINLINE_SYM join_node(graph &g, __TBB_B0 b0, __TBB_B1 b1, __TBB_B2 b2, __TBB_B3 b3, __TBB_B4 b4, __TBB_B5 b5, __TBB_B6 b6) :
+            unfolded_type(g, b0, b1, b2, b3, b4, b5, b6) {
+        fgt_multiinput_node<N>( CODEPTR(), FLOW_JOIN_NODE_TAG_MATCHING, &this->my_graph,
+                                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
+    }
+#endif
+#if __TBB_VARIADIC_MAX >= 8
+    template<typename __TBB_B0, typename __TBB_B1, typename __TBB_B2, typename __TBB_B3, typename __TBB_B4,
+        typename __TBB_B5, typename __TBB_B6, typename __TBB_B7>
+        __TBB_requires(join_node_functions<OutputTuple, K, __TBB_B0, __TBB_B1, __TBB_B2, __TBB_B3, __TBB_B4, __TBB_B5, __TBB_B6, __TBB_B7>)
+     __TBB_NOINLINE_SYM join_node(graph &g, __TBB_B0 b0, __TBB_B1 b1, __TBB_B2 b2, __TBB_B3 b3, __TBB_B4 b4, __TBB_B5 b5, __TBB_B6 b6,
+            __TBB_B7 b7) : unfolded_type(g, b0, b1, b2, b3, b4, b5, b6, b7) {
+        fgt_multiinput_node<N>( CODEPTR(), FLOW_JOIN_NODE_TAG_MATCHING, &this->my_graph,
+                                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
+    }
+#endif
+#if __TBB_VARIADIC_MAX >= 9
+    template<typename __TBB_B0, typename __TBB_B1, typename __TBB_B2, typename __TBB_B3, typename __TBB_B4,
+        typename __TBB_B5, typename __TBB_B6, typename __TBB_B7, typename __TBB_B8>
+        __TBB_requires(join_node_functions<OutputTuple, K, __TBB_B0, __TBB_B1, __TBB_B2, __TBB_B3, __TBB_B4, __TBB_B5, __TBB_B6, __TBB_B7, __TBB_B8>)
+     __TBB_NOINLINE_SYM join_node(graph &g, __TBB_B0 b0, __TBB_B1 b1, __TBB_B2 b2, __TBB_B3 b3, __TBB_B4 b4, __TBB_B5 b5, __TBB_B6 b6,
+            __TBB_B7 b7, __TBB_B8 b8) : unfolded_type(g, b0, b1, b2, b3, b4, b5, b6, b7, b8) {
+        fgt_multiinput_node<N>( CODEPTR(), FLOW_JOIN_NODE_TAG_MATCHING, &this->my_graph,
+                                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
+    }
+#endif
+#if __TBB_VARIADIC_MAX >= 10
+    template<typename __TBB_B0, typename __TBB_B1, typename __TBB_B2, typename __TBB_B3, typename __TBB_B4,
+        typename __TBB_B5, typename __TBB_B6, typename __TBB_B7, typename __TBB_B8, typename __TBB_B9>
+        __TBB_requires(join_node_functions<OutputTuple, K, __TBB_B0, __TBB_B1, __TBB_B2, __TBB_B3, __TBB_B4, __TBB_B5, __TBB_B6, __TBB_B7, __TBB_B8, __TBB_B9>)
+     __TBB_NOINLINE_SYM join_node(graph &g, __TBB_B0 b0, __TBB_B1 b1, __TBB_B2 b2, __TBB_B3 b3, __TBB_B4 b4, __TBB_B5 b5, __TBB_B6 b6,
+            __TBB_B7 b7, __TBB_B8 b8, __TBB_B9 b9) : unfolded_type(g, b0, b1, b2, b3, b4, b5, b6, b7, b8, b9) {
+        fgt_multiinput_node<N>( CODEPTR(), FLOW_JOIN_NODE_TAG_MATCHING, &this->my_graph,
+                                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
+    }
+#endif
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-                template <typename... Args>
-                __TBB_NOINLINE_SYM split_node(const node_set<Args...> &nodes)
-                    : split_node(nodes.graph_reference()) {
-                    make_edges_in_order(nodes, *this);
-                }
+    template <
+#if (__clang_major__ == 3 && __clang_minor__ == 4)
+        // clang 3.4 misdeduces 'Args...' for 'node_set' while it can cope with template template parameter.
+        template<typename...> class node_set,
 #endif
+        typename... Args, typename... Bodies
+    >
+    __TBB_requires((sizeof...(Bodies) == 0) || join_node_functions<OutputTuple, K, Bodies...>)
+    __TBB_NOINLINE_SYM join_node(const node_set<Args...>& nodes, Bodies... bodies)
+        : join_node(nodes.graph_reference(), bodies...) {
+        make_edges_in_order(nodes, *this);
+    }
+#endif // __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+
+    __TBB_NOINLINE_SYM join_node(const join_node &other) : unfolded_type(other) {
+        fgt_multiinput_node<N>( CODEPTR(), FLOW_JOIN_NODE_TAG_MATCHING, &this->my_graph,
+                                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
+    }
+
+};
 
-                __TBB_NOINLINE_SYM split_node(const split_node &other)
-                    : graph_node(other.my_graph), base_type(other),
-                      my_output_ports(
-                              init_output_ports<output_ports_type>::call(other.my_graph, my_output_ports)) {
-                    fgt_multioutput_node<N>(CODEPTR(), FLOW_SPLIT_NODE, &this->my_graph,
-                                            static_cast<receiver<input_type> *>(this), this->output_ports());
-                }
+// indexer node
+#include "detail/_flow_graph_indexer_impl.h"
 
-                output_ports_type &output_ports() { return my_output_ports; }
+// TODO: Implement interface with variadic template or tuple
+template<typename T0, typename T1=null_type, typename T2=null_type, typename T3=null_type,
+                      typename T4=null_type, typename T5=null_type, typename T6=null_type,
+                      typename T7=null_type, typename T8=null_type, typename T9=null_type> class indexer_node;
+
+//indexer node specializations
+template<typename T0>
+class indexer_node<T0> : public unfolded_indexer_node<std::tuple<T0> > {
+private:
+    static const int N = 1;
+public:
+    typedef std::tuple<T0> InputTuple;
+    typedef tagged_msg<size_t, T0> output_type;
+    typedef unfolded_indexer_node<InputTuple> unfolded_type;
+    __TBB_NOINLINE_SYM indexer_node(graph& g) : unfolded_type(g) {
+        fgt_multiinput_node<N>( CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph,
+                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
+    }
 
-            protected:
-                graph_task *try_put_task(const TupleType &t) override {
-                    // Sending split messages in parallel is not justified, as overheads would prevail.
-                    // Also, we do not have successors here. So we just tell the task returned here is successful.
-                    return emit_element<N>::emit_this(this->my_graph, t, output_ports());
-                }
-                void reset_node(reset_flags f) override {
-                    if (f & rf_clear_edges) clear_element<N>::clear_this(my_output_ports);
+#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+    template <typename... Args>
+    indexer_node(const node_set<Args...>& nodes) : indexer_node(nodes.graph_reference()) {
+        make_edges_in_order(nodes, *this);
+    }
+#endif
 
-                    __TBB_ASSERT(!(f & rf_clear_edges) || clear_element<N>::this_empty(my_output_ports),
-                                 "split_node reset failed");
-                }
-                graph &graph_reference() const override { return my_graph; }
-
-            private:
-                output_ports_type my_output_ports;
-            };
-
-            //! Implements an executable node that supports continue_msg -> Output
-            template <typename Output, typename Policy = Policy<void>>
-            __TBB_requires(std::copy_constructible<Output>) class continue_node
-                : public graph_node,
-                  public continue_input<Output, Policy>,
-                  public function_output<Output> {
-            public:
-                typedef continue_msg input_type;
-                typedef Output output_type;
-                typedef continue_input<Output, Policy> input_impl_type;
-                typedef function_output<output_type> fOutput_type;
-                typedef typename input_impl_type::predecessor_type predecessor_type;
-                typedef typename fOutput_type::successor_type successor_type;
-
-                //! Constructor for executable node with continue_msg -> Output
-                template <typename Body>
-                __TBB_requires(continue_node_body<Body, Output>) __TBB_NOINLINE_SYM
-                        continue_node(graph &g, Body body, Policy = Policy(),
-                                      node_priority_t a_priority = no_priority)
-                    : graph_node(g), input_impl_type(g, body, a_priority), fOutput_type(g) {
-                    fgt_node_with_body(CODEPTR(), FLOW_CONTINUE_NODE, &this->my_graph,
-
-                                       static_cast<receiver<input_type> *>(this),
-                                       static_cast<sender<output_type> *>(this), this->my_body);
-                }
+    // Copy constructor
+    __TBB_NOINLINE_SYM indexer_node( const indexer_node& other ) : unfolded_type(other) {
+        fgt_multiinput_node<N>( CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph,
+                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
+    }
+};
+
+template<typename T0, typename T1>
+class indexer_node<T0, T1> : public unfolded_indexer_node<std::tuple<T0, T1> > {
+private:
+    static const int N = 2;
+public:
+    typedef std::tuple<T0, T1> InputTuple;
+    typedef tagged_msg<size_t, T0, T1> output_type;
+    typedef unfolded_indexer_node<InputTuple> unfolded_type;
+    __TBB_NOINLINE_SYM indexer_node(graph& g) : unfolded_type(g) {
+        fgt_multiinput_node<N>( CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph,
+                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
+    }
+
+#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+    template <typename... Args>
+    indexer_node(const node_set<Args...>& nodes) : indexer_node(nodes.graph_reference()) {
+        make_edges_in_order(nodes, *this);
+    }
+#endif
 
-                template <typename Body>
-                __TBB_requires(continue_node_body<Body, Output>)
-                        continue_node(graph &g, Body body, node_priority_t a_priority)
-                    : continue_node(g, body, Policy(), a_priority) {}
+    // Copy constructor
+    __TBB_NOINLINE_SYM indexer_node( const indexer_node& other ) : unfolded_type(other) {
+        fgt_multiinput_node<N>( CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph,
+                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
+    }
+
+};
+
+template<typename T0, typename T1, typename T2>
+class indexer_node<T0, T1, T2> : public unfolded_indexer_node<std::tuple<T0, T1, T2> > {
+private:
+    static const int N = 3;
+public:
+    typedef std::tuple<T0, T1, T2> InputTuple;
+    typedef tagged_msg<size_t, T0, T1, T2> output_type;
+    typedef unfolded_indexer_node<InputTuple> unfolded_type;
+    __TBB_NOINLINE_SYM indexer_node(graph& g) : unfolded_type(g) {
+        fgt_multiinput_node<N>( CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph,
+                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
+    }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-                template <typename Body, typename... Args>
-                __TBB_requires(continue_node_body<Body, Output>)
-                        continue_node(const node_set<Args...> &nodes, Body body, Policy p = Policy(),
-                                      node_priority_t a_priority = no_priority)
-                    : continue_node(nodes.graph_reference(), body, p, a_priority) {
-                    make_edges_in_order(nodes, *this);
-                }
-                template <typename Body, typename... Args>
-                __TBB_requires(continue_node_body<Body, Output>)
-                        continue_node(const node_set<Args...> &nodes, Body body, node_priority_t a_priority)
-                    : continue_node(nodes, body, Policy(), a_priority) {}
-#endif// __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-
-                //! Constructor for executable node with continue_msg -> Output
-                template <typename Body>
-                __TBB_requires(continue_node_body<Body, Output>) __TBB_NOINLINE_SYM
-                        continue_node(graph &g, int number_of_predecessors, Body body, Policy = Policy(),
-                                      node_priority_t a_priority = no_priority)
-                    : graph_node(g), input_impl_type(g, number_of_predecessors, body, a_priority),
-                      fOutput_type(g) {
-                    fgt_node_with_body(CODEPTR(), FLOW_CONTINUE_NODE, &this->my_graph,
-                                       static_cast<receiver<input_type> *>(this),
-                                       static_cast<sender<output_type> *>(this), this->my_body);
-                }
+    template <typename... Args>
+    indexer_node(const node_set<Args...>& nodes) : indexer_node(nodes.graph_reference()) {
+        make_edges_in_order(nodes, *this);
+    }
+#endif
 
-                template <typename Body>
-                __TBB_requires(continue_node_body<Body, Output>)
-                        continue_node(graph &g, int number_of_predecessors, Body body,
-                                      node_priority_t a_priority)
-                    : continue_node(g, number_of_predecessors, body, Policy(), a_priority) {}
+    // Copy constructor
+    __TBB_NOINLINE_SYM indexer_node( const indexer_node& other ) : unfolded_type(other) {
+        fgt_multiinput_node<N>( CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph,
+                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
+    }
+
+};
+
+template<typename T0, typename T1, typename T2, typename T3>
+class indexer_node<T0, T1, T2, T3> : public unfolded_indexer_node<std::tuple<T0, T1, T2, T3> > {
+private:
+    static const int N = 4;
+public:
+    typedef std::tuple<T0, T1, T2, T3> InputTuple;
+    typedef tagged_msg<size_t, T0, T1, T2, T3> output_type;
+    typedef unfolded_indexer_node<InputTuple> unfolded_type;
+    __TBB_NOINLINE_SYM indexer_node(graph& g) : unfolded_type(g) {
+        fgt_multiinput_node<N>( CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph,
+                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
+    }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-                template <typename Body, typename... Args>
-                __TBB_requires(continue_node_body<Body, Output>)
-                        continue_node(const node_set<Args...> &nodes, int number_of_predecessors, Body body,
-                                      Policy p = Policy(), node_priority_t a_priority = no_priority)
-                    : continue_node(nodes.graph_reference(), number_of_predecessors, body, p, a_priority) {
-                    make_edges_in_order(nodes, *this);
-                }
+    template <typename... Args>
+    indexer_node(const node_set<Args...>& nodes) : indexer_node(nodes.graph_reference()) {
+        make_edges_in_order(nodes, *this);
+    }
+#endif
+
+    // Copy constructor
+    __TBB_NOINLINE_SYM indexer_node( const indexer_node& other ) : unfolded_type(other) {
+        fgt_multiinput_node<N>( CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph,
+                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
+    }
+
+};
+
+template<typename T0, typename T1, typename T2, typename T3, typename T4>
+class indexer_node<T0, T1, T2, T3, T4> : public unfolded_indexer_node<std::tuple<T0, T1, T2, T3, T4> > {
+private:
+    static const int N = 5;
+public:
+    typedef std::tuple<T0, T1, T2, T3, T4> InputTuple;
+    typedef tagged_msg<size_t, T0, T1, T2, T3, T4> output_type;
+    typedef unfolded_indexer_node<InputTuple> unfolded_type;
+    __TBB_NOINLINE_SYM indexer_node(graph& g) : unfolded_type(g) {
+        fgt_multiinput_node<N>( CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph,
+                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
+    }
 
-                template <typename Body, typename... Args>
-                __TBB_requires(continue_node_body<Body, Output>)
-                        continue_node(const node_set<Args...> &nodes, int number_of_predecessors, Body body,
-                                      node_priority_t a_priority)
-                    : continue_node(nodes, number_of_predecessors, body, Policy(), a_priority) {}
+#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+    template <typename... Args>
+    indexer_node(const node_set<Args...>& nodes) : indexer_node(nodes.graph_reference()) {
+        make_edges_in_order(nodes, *this);
+    }
 #endif
 
-                //! Copy constructor
-                __TBB_NOINLINE_SYM continue_node(const continue_node &src)
-                    : graph_node(src.my_graph), input_impl_type(src), function_output<Output>(src.my_graph) {
-                    fgt_node_with_body(CODEPTR(), FLOW_CONTINUE_NODE, &this->my_graph,
-                                       static_cast<receiver<input_type> *>(this),
-                                       static_cast<sender<output_type> *>(this), this->my_body);
-                }
+    // Copy constructor
+    __TBB_NOINLINE_SYM indexer_node( const indexer_node& other ) : unfolded_type(other) {
+        fgt_multiinput_node<N>( CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph,
+                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
+    }
 
-            protected:
-                template <typename R, typename B>
-                friend class run_and_put_task;
-                template <typename X, typename Y>
-                friend class broadcast_cache;
-                template <typename X, typename Y>
-                friend class round_robin_cache;
-                using input_impl_type::try_put_task;
-                broadcast_cache<output_type> &successors() override { return fOutput_type::my_successors; }
-
-                void reset_node(reset_flags f) override {
-                    input_impl_type::reset_receiver(f);
-                    if (f & rf_clear_edges) successors().clear();
-                    __TBB_ASSERT(!(f & rf_clear_edges) || successors().empty(), "continue_node not reset");
-                }
-            };// continue_node
-
-            //! Forwards messages of type T to all successors
-            template <typename T>
-            class broadcast_node : public graph_node, public receiver<T>, public sender<T> {
-            public:
-                typedef T input_type;
-                typedef T output_type;
-                typedef typename receiver<input_type>::predecessor_type predecessor_type;
-                typedef typename sender<output_type>::successor_type successor_type;
-
-            private:
-                broadcast_cache<input_type> my_successors;
-
-            public:
-                __TBB_NOINLINE_SYM explicit broadcast_node(graph &g) : graph_node(g), my_successors(this) {
-                    fgt_node(CODEPTR(), FLOW_BROADCAST_NODE, &this->my_graph,
-                             static_cast<receiver<input_type> *>(this),
-                             static_cast<sender<output_type> *>(this));
-                }
+};
+
+#if __TBB_VARIADIC_MAX >= 6
+template<typename T0, typename T1, typename T2, typename T3, typename T4, typename T5>
+class indexer_node<T0, T1, T2, T3, T4, T5> : public unfolded_indexer_node<std::tuple<T0, T1, T2, T3, T4, T5> > {
+private:
+    static const int N = 6;
+public:
+    typedef std::tuple<T0, T1, T2, T3, T4, T5> InputTuple;
+    typedef tagged_msg<size_t, T0, T1, T2, T3, T4, T5> output_type;
+    typedef unfolded_indexer_node<InputTuple> unfolded_type;
+    __TBB_NOINLINE_SYM indexer_node(graph& g) : unfolded_type(g) {
+        fgt_multiinput_node<N>( CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph,
+                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
+    }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-                template <typename... Args>
-                broadcast_node(const node_set<Args...> &nodes) : broadcast_node(nodes.graph_reference()) {
-                    make_edges_in_order(nodes, *this);
-                }
+    template <typename... Args>
+    indexer_node(const node_set<Args...>& nodes) : indexer_node(nodes.graph_reference()) {
+        make_edges_in_order(nodes, *this);
+    }
 #endif
 
-                // Copy constructor
-                __TBB_NOINLINE_SYM broadcast_node(const broadcast_node &src) : broadcast_node(src.my_graph) {}
+    // Copy constructor
+    __TBB_NOINLINE_SYM indexer_node( const indexer_node& other ) : unfolded_type(other) {
+        fgt_multiinput_node<N>( CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph,
+                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
+    }
 
-                //! Adds a successor
-                bool register_successor(successor_type &r) override {
-                    my_successors.register_successor(r);
-                    return true;
-                }
+};
+#endif //variadic max 6
 
-                //! Removes s as a successor
-                bool remove_successor(successor_type &r) override {
-                    my_successors.remove_successor(r);
-                    return true;
-                }
+#if __TBB_VARIADIC_MAX >= 7
+template<typename T0, typename T1, typename T2, typename T3, typename T4, typename T5,
+         typename T6>
+class indexer_node<T0, T1, T2, T3, T4, T5, T6> : public unfolded_indexer_node<std::tuple<T0, T1, T2, T3, T4, T5, T6> > {
+private:
+    static const int N = 7;
+public:
+    typedef std::tuple<T0, T1, T2, T3, T4, T5, T6> InputTuple;
+    typedef tagged_msg<size_t, T0, T1, T2, T3, T4, T5, T6> output_type;
+    typedef unfolded_indexer_node<InputTuple> unfolded_type;
+    __TBB_NOINLINE_SYM indexer_node(graph& g) : unfolded_type(g) {
+        fgt_multiinput_node<N>( CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph,
+                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
+    }
 
-            protected:
-                template <typename R, typename B>
-                friend class run_and_put_task;
-                template <typename X, typename Y>
-                friend class broadcast_cache;
-                template <typename X, typename Y>
-                friend class round_robin_cache;
-                //! build a task to run the successor if possible.  Default is old behavior.
-                graph_task *try_put_task(const T &t) override {
-                    graph_task *new_task = my_successors.try_put_task(t);
-                    if (!new_task) new_task = SUCCESSFULLY_ENQUEUED;
-                    return new_task;
-                }
+#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+    template <typename... Args>
+    indexer_node(const node_set<Args...>& nodes) : indexer_node(nodes.graph_reference()) {
+        make_edges_in_order(nodes, *this);
+    }
+#endif
 
-                graph &graph_reference() const override { return my_graph; }
+    // Copy constructor
+    __TBB_NOINLINE_SYM indexer_node( const indexer_node& other ) : unfolded_type(other) {
+        fgt_multiinput_node<N>( CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph,
+                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
+    }
 
-                void reset_node(reset_flags f) override {
-                    if (f & rf_clear_edges) { my_successors.clear(); }
-                    __TBB_ASSERT(!(f & rf_clear_edges) || my_successors.empty(),
-                                 "Error resetting broadcast_node");
-                }
-            };// broadcast_node
-
-            //! Forwards messages in arbitrary order
-            template <typename T>
-            class buffer_node : public graph_node,
-                                public reservable_item_buffer<T, cache_aligned_allocator<T>>,
-                                public receiver<T>,
-                                public sender<T> {
-                typedef cache_aligned_allocator<T> internals_allocator;
-
-            public:
-                typedef T input_type;
-                typedef T output_type;
-                typedef typename receiver<input_type>::predecessor_type predecessor_type;
-                typedef typename sender<output_type>::successor_type successor_type;
-                typedef buffer_node<T> class_type;
-
-            protected:
-                typedef size_t size_type;
-                round_robin_cache<T, null_rw_mutex> my_successors;
-
-                friend class forward_task_bypass<class_type>;
-
-                enum op_type {
-                    reg_succ,
-                    rem_succ,
-                    req_item,
-                    res_item,
-                    rel_res,
-                    con_res,
-                    put_item,
-                    try_fwd_task
-                };
-
-                // implements the aggregator_operation concept
-                class buffer_operation : public aggregated_operation<buffer_operation> {
-                public:
-                    char type;
-                    T *elem;
-                    graph_task *ltask;
-                    successor_type *r;
-
-                    buffer_operation(const T &e, op_type t)
-                        : type(char(t)), elem(const_cast<T *>(&e)), ltask(NULL) {}
-                    buffer_operation(op_type t) : type(char(t)), ltask(NULL) {}
-                };
-
-                bool forwarder_busy;
-                typedef aggregating_functor<class_type, buffer_operation> handler_type;
-                friend class aggregating_functor<class_type, buffer_operation>;
-                aggregator<handler_type, buffer_operation> my_aggregator;
-
-                virtual void handle_operations(buffer_operation *op_list) {
-                    handle_operations_impl(op_list, this);
-                }
-
-                template <typename derived_type>
-                void handle_operations_impl(buffer_operation *op_list, derived_type *derived) {
-                    __TBB_ASSERT(static_cast<class_type *>(derived) == this,
-                                 "'this' is not a base class for derived");
-
-                    buffer_operation *tmp = NULL;
-                    bool try_forwarding = false;
-                    while (op_list) {
-                        tmp = op_list;
-                        op_list = op_list->next;
-                        switch (tmp->type) {
-                            case reg_succ:
-                                internal_reg_succ(tmp);
-                                try_forwarding = true;
-                                break;
-                            case rem_succ:
-                                internal_rem_succ(tmp);
-                                break;
-                            case req_item:
-                                internal_pop(tmp);
-                                break;
-                            case res_item:
-                                internal_reserve(tmp);
-                                break;
-                            case rel_res:
-                                internal_release(tmp);
-                                try_forwarding = true;
-                                break;
-                            case con_res:
-                                internal_consume(tmp);
-                                try_forwarding = true;
-                                break;
-                            case put_item:
-                                try_forwarding = internal_push(tmp);
-                                break;
-                            case try_fwd_task:
-                                internal_forward_task(tmp);
-                                break;
-                        }
-                    }
-
-                    derived->order();
-
-                    if (try_forwarding && !forwarder_busy) {
-                        if (is_graph_active(this->my_graph)) {
-                            forwarder_busy = true;
-                            typedef forward_task_bypass<class_type> task_type;
-                            small_object_allocator allocator {};
-                            graph_task *new_task
-                                    = allocator.new_object<task_type>(graph_reference(), allocator, *this);
-                            my_graph.reserve_wait();
-                            // tmp should point to the last item handled by the aggregator.  This is the operation
-                            // the handling thread enqueued.  So modifying that record will be okay.
-                            // TODO revamp: check that the issue is still present
-                            // workaround for icc bug  (at least 12.0 and 13.0)
-                            // error: function "tbb::flow::interfaceX::combine_tasks" cannot be called with the given argument list
-                            //        argument types are: (graph, graph_task *, graph_task *)
-                            graph_task *z = tmp->ltask;
-                            graph &g = this->my_graph;
-                            tmp->ltask = combine_tasks(g, z, new_task);// in case the op generated a task
-                        }
-                    }
-                }// handle_operations
-
-                inline graph_task *grab_forwarding_task(buffer_operation &op_data) { return op_data.ltask; }
-
-                inline bool enqueue_forwarding_task(buffer_operation &op_data) {
-                    graph_task *ft = grab_forwarding_task(op_data);
-                    if (ft) {
-                        spawn_in_graph_arena(graph_reference(), *ft);
-                        return true;
-                    }
-                    return false;
-                }
-
-                //! This is executed by an enqueued task, the "forwarder"
-                virtual graph_task *forward_task() {
-                    buffer_operation op_data(try_fwd_task);
-                    graph_task *last_task = NULL;
-                    do {
-                        op_data.status = WAIT;
-                        op_data.ltask = NULL;
-                        my_aggregator.execute(&op_data);
-
-                        // workaround for icc bug
-                        graph_task *xtask = op_data.ltask;
-                        graph &g = this->my_graph;
-                        last_task = combine_tasks(g, last_task, xtask);
-                    } while (op_data.status == SUCCEEDED);
-                    return last_task;
-                }
-
-                //! Register successor
-                virtual void internal_reg_succ(buffer_operation *op) {
-                    my_successors.register_successor(*(op->r));
-                    op->status.store(SUCCEEDED, std::memory_order_release);
-                }
-
-                //! Remove successor
-                virtual void internal_rem_succ(buffer_operation *op) {
-                    my_successors.remove_successor(*(op->r));
-                    op->status.store(SUCCEEDED, std::memory_order_release);
-                }
-
-            private:
-                void order() {}
-
-                bool is_item_valid() { return this->my_item_valid(this->my_tail - 1); }
-
-                void try_put_and_add_task(graph_task *&last_task) {
-                    graph_task *new_task = my_successors.try_put_task(this->back());
-                    if (new_task) {
-                        // workaround for icc bug
-                        graph &g = this->my_graph;
-                        last_task = combine_tasks(g, last_task, new_task);
-                        this->destroy_back();
-                    }
-                }
-
-            protected:
-                //! Tries to forward valid items to successors
-                virtual void internal_forward_task(buffer_operation *op) {
-                    internal_forward_task_impl(op, this);
-                }
-
-                template <typename derived_type>
-                void internal_forward_task_impl(buffer_operation *op, derived_type *derived) {
-                    __TBB_ASSERT(static_cast<class_type *>(derived) == this,
-                                 "'this' is not a base class for derived");
-
-                    if (this->my_reserved || !derived->is_item_valid()) {
-                        op->status.store(FAILED, std::memory_order_release);
-                        this->forwarder_busy = false;
-                        return;
-                    }
-                    // Try forwarding, giving each successor a chance
-                    graph_task *last_task = NULL;
-                    size_type counter = my_successors.size();
-                    for (; counter > 0 && derived->is_item_valid(); --counter)
-                        derived->try_put_and_add_task(last_task);
-
-                    op->ltask = last_task;// return task
-                    if (last_task && !counter) {
-                        op->status.store(SUCCEEDED, std::memory_order_release);
-                    } else {
-                        op->status.store(FAILED, std::memory_order_release);
-                        forwarder_busy = false;
-                    }
-                }
-
-                virtual bool internal_push(buffer_operation *op) {
-                    this->push_back(*(op->elem));
-                    op->status.store(SUCCEEDED, std::memory_order_release);
-                    return true;
-                }
-
-                virtual void internal_pop(buffer_operation *op) {
-                    if (this->pop_back(*(op->elem))) {
-                        op->status.store(SUCCEEDED, std::memory_order_release);
-                    } else {
-                        op->status.store(FAILED, std::memory_order_release);
-                    }
-                }
-
-                virtual void internal_reserve(buffer_operation *op) {
-                    if (this->reserve_front(*(op->elem))) {
-                        op->status.store(SUCCEEDED, std::memory_order_release);
-                    } else {
-                        op->status.store(FAILED, std::memory_order_release);
-                    }
-                }
-
-                virtual void internal_consume(buffer_operation *op) {
-                    this->consume_front();
-                    op->status.store(SUCCEEDED, std::memory_order_release);
-                }
-
-                virtual void internal_release(buffer_operation *op) {
-                    this->release_front();
-                    op->status.store(SUCCEEDED, std::memory_order_release);
-                }
-
-            public:
-                //! Constructor
-                __TBB_NOINLINE_SYM explicit buffer_node(graph &g)
-                    : graph_node(g),
-                      reservable_item_buffer<T, internals_allocator>(), receiver<T>(), sender<T>(),
-                      my_successors(this), forwarder_busy(false) {
-                    my_aggregator.initialize_handler(handler_type(this));
-                    fgt_node(CODEPTR(), FLOW_BUFFER_NODE, &this->my_graph,
-                             static_cast<receiver<input_type> *>(this),
-                             static_cast<sender<output_type> *>(this));
-                }
-
-#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-                template <typename... Args>
-                buffer_node(const node_set<Args...> &nodes) : buffer_node(nodes.graph_reference()) {
-                    make_edges_in_order(nodes, *this);
-                }
-#endif
-
-                //! Copy constructor
-                __TBB_NOINLINE_SYM buffer_node(const buffer_node &src) : buffer_node(src.my_graph) {}
-
-                //
-                // message sender implementation
-                //
-
-                //! Adds a new successor.
-                /** Adds successor r to the list of successors; may forward tasks.  */
-                bool register_successor(successor_type &r) override {
-                    buffer_operation op_data(reg_succ);
-                    op_data.r = &r;
-                    my_aggregator.execute(&op_data);
-                    (void) enqueue_forwarding_task(op_data);
-                    return true;
-                }
-
-                //! Removes a successor.
-                /** Removes successor r from the list of successors.
-        It also calls r.remove_predecessor(*this) to remove this node as a predecessor. */
-                bool remove_successor(successor_type &r) override {
-                    // TODO revamp: investigate why full qualification is necessary here
-                    tbb::detail::d1::remove_predecessor(r, *this);
-                    buffer_operation op_data(rem_succ);
-                    op_data.r = &r;
-                    my_aggregator.execute(&op_data);
-                    // even though this operation does not cause a forward, if we are the handler, and
-                    // a forward is scheduled, we may be the first to reach this point after the aggregator,
-                    // and so should check for the task.
-                    (void) enqueue_forwarding_task(op_data);
-                    return true;
-                }
-
-                //! Request an item from the buffer_node
-                /**  true = v contains the returned item<BR>
-         false = no item has been returned */
-                bool try_get(T &v) override {
-                    buffer_operation op_data(req_item);
-                    op_data.elem = &v;
-                    my_aggregator.execute(&op_data);
-                    (void) enqueue_forwarding_task(op_data);
-                    return (op_data.status == SUCCEEDED);
-                }
-
-                //! Reserves an item.
-                /**  false = no item can be reserved<BR>
-         true = an item is reserved */
-                bool try_reserve(T &v) override {
-                    buffer_operation op_data(res_item);
-                    op_data.elem = &v;
-                    my_aggregator.execute(&op_data);
-                    (void) enqueue_forwarding_task(op_data);
-                    return (op_data.status == SUCCEEDED);
-                }
+};
+#endif //variadic max 7
 
-                //! Release a reserved item.
-                /**  true = item has been released and so remains in sender */
-                bool try_release() override {
-                    buffer_operation op_data(rel_res);
-                    my_aggregator.execute(&op_data);
-                    (void) enqueue_forwarding_task(op_data);
-                    return true;
-                }
-
-                //! Consumes a reserved item.
-                /** true = item is removed from sender and reservation removed */
-                bool try_consume() override {
-                    buffer_operation op_data(con_res);
-                    my_aggregator.execute(&op_data);
-                    (void) enqueue_forwarding_task(op_data);
-                    return true;
-                }
-
-            protected:
-                template <typename R, typename B>
-                friend class run_and_put_task;
-                template <typename X, typename Y>
-                friend class broadcast_cache;
-                template <typename X, typename Y>
-                friend class round_robin_cache;
-                //! receive an item, return a task *if possible
-                graph_task *try_put_task(const T &t) override {
-                    buffer_operation op_data(t, put_item);
-                    my_aggregator.execute(&op_data);
-                    graph_task *ft = grab_forwarding_task(op_data);
-                    // sequencer_nodes can return failure (if an item has been previously inserted)
-                    // We have to spawn the returned task if our own operation fails.
-
-                    if (ft && op_data.status == FAILED) {
-                        // we haven't succeeded queueing the item, but for some reason the
-                        // call returned a task (if another request resulted in a successful
-                        // forward this could happen.)  Queue the task and reset the pointer.
-                        spawn_in_graph_arena(graph_reference(), *ft);
-                        ft = NULL;
-                    } else if (!ft && op_data.status == SUCCEEDED) {
-                        ft = SUCCESSFULLY_ENQUEUED;
-                    }
-                    return ft;
-                }
-
-                graph &graph_reference() const override { return my_graph; }
-
-            protected:
-                void reset_node(reset_flags f) override {
-                    reservable_item_buffer<T, internals_allocator>::reset();
-                    // TODO: just clear structures
-                    if (f & rf_clear_edges) { my_successors.clear(); }
-                    forwarder_busy = false;
-                }
-            };// buffer_node
-
-            //! Forwards messages in FIFO order
-            template <typename T>
-            class queue_node : public buffer_node<T> {
-            protected:
-                typedef buffer_node<T> base_type;
-                typedef typename base_type::size_type size_type;
-                typedef typename base_type::buffer_operation queue_operation;
-                typedef queue_node class_type;
-
-            private:
-                template <typename>
-                friend class buffer_node;
-
-                bool is_item_valid() { return this->my_item_valid(this->my_head); }
-
-                void try_put_and_add_task(graph_task *&last_task) {
-                    graph_task *new_task = this->my_successors.try_put_task(this->front());
-                    if (new_task) {
-                        // workaround for icc bug
-                        graph &graph_ref = this->graph_reference();
-                        last_task = combine_tasks(graph_ref, last_task, new_task);
-                        this->destroy_front();
-                    }
-                }
-
-            protected:
-                void internal_forward_task(queue_operation *op) override {
-                    this->internal_forward_task_impl(op, this);
-                }
-
-                void internal_pop(queue_operation *op) override {
-                    if (this->my_reserved || !this->my_item_valid(this->my_head)) {
-                        op->status.store(FAILED, std::memory_order_release);
-                    } else {
-                        this->pop_front(*(op->elem));
-                        op->status.store(SUCCEEDED, std::memory_order_release);
-                    }
-                }
-                void internal_reserve(queue_operation *op) override {
-                    if (this->my_reserved || !this->my_item_valid(this->my_head)) {
-                        op->status.store(FAILED, std::memory_order_release);
-                    } else {
-                        this->reserve_front(*(op->elem));
-                        op->status.store(SUCCEEDED, std::memory_order_release);
-                    }
-                }
-                void internal_consume(queue_operation *op) override {
-                    this->consume_front();
-                    op->status.store(SUCCEEDED, std::memory_order_release);
-                }
-
-            public:
-                typedef T input_type;
-                typedef T output_type;
-                typedef typename receiver<input_type>::predecessor_type predecessor_type;
-                typedef typename sender<output_type>::successor_type successor_type;
-
-                //! Constructor
-                __TBB_NOINLINE_SYM explicit queue_node(graph &g) : base_type(g) {
-                    fgt_node(CODEPTR(), FLOW_QUEUE_NODE, &(this->my_graph),
-                             static_cast<receiver<input_type> *>(this),
-                             static_cast<sender<output_type> *>(this));
-                }
+#if __TBB_VARIADIC_MAX >= 8
+template<typename T0, typename T1, typename T2, typename T3, typename T4, typename T5,
+         typename T6, typename T7>
+class indexer_node<T0, T1, T2, T3, T4, T5, T6, T7> : public unfolded_indexer_node<std::tuple<T0, T1, T2, T3, T4, T5, T6, T7> > {
+private:
+    static const int N = 8;
+public:
+    typedef std::tuple<T0, T1, T2, T3, T4, T5, T6, T7> InputTuple;
+    typedef tagged_msg<size_t, T0, T1, T2, T3, T4, T5, T6, T7> output_type;
+    typedef unfolded_indexer_node<InputTuple> unfolded_type;
+    indexer_node(graph& g) : unfolded_type(g) {
+        fgt_multiinput_node<N>( CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph,
+                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
+    }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-                template <typename... Args>
-                queue_node(const node_set<Args...> &nodes) : queue_node(nodes.graph_reference()) {
-                    make_edges_in_order(nodes, *this);
-                }
+    template <typename... Args>
+    indexer_node(const node_set<Args...>& nodes) : indexer_node(nodes.graph_reference()) {
+        make_edges_in_order(nodes, *this);
+    }
 #endif
 
-                //! Copy constructor
-                __TBB_NOINLINE_SYM queue_node(const queue_node &src) : base_type(src) {
-                    fgt_node(CODEPTR(), FLOW_QUEUE_NODE, &(this->my_graph),
-                             static_cast<receiver<input_type> *>(this),
-                             static_cast<sender<output_type> *>(this));
-                }
+    // Copy constructor
+    indexer_node( const indexer_node& other ) : unfolded_type(other) {
+        fgt_multiinput_node<N>( CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph,
+                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
+    }
 
-            protected:
-                void reset_node(reset_flags f) override { base_type::reset_node(f); }
-            };// queue_node
-
-            //! Forwards messages in sequence order
-            template <typename T>
-            __TBB_requires(std::copyable<T>) class sequencer_node : public queue_node<T> {
-                function_body<T, size_t> *my_sequencer;
-                // my_sequencer should be a benign function and must be callable
-                // from a parallel context.  Does this mean it needn't be reset?
-            public:
-                typedef T input_type;
-                typedef T output_type;
-                typedef typename receiver<input_type>::predecessor_type predecessor_type;
-                typedef typename sender<output_type>::successor_type successor_type;
-
-                //! Constructor
-                template <typename Sequencer>
-                __TBB_requires(sequencer<Sequencer, T>) __TBB_NOINLINE_SYM
-                        sequencer_node(graph &g, const Sequencer &s)
-                    : queue_node<T>(g), my_sequencer(new function_body_leaf<T, size_t, Sequencer>(s)) {
-                    fgt_node(CODEPTR(), FLOW_SEQUENCER_NODE, &(this->my_graph),
-                             static_cast<receiver<input_type> *>(this),
-                             static_cast<sender<output_type> *>(this));
-                }
+};
+#endif //variadic max 8
 
-#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-                template <typename Sequencer, typename... Args>
-                __TBB_requires(sequencer<Sequencer, T>)
-                        sequencer_node(const node_set<Args...> &nodes, const Sequencer &s)
-                    : sequencer_node(nodes.graph_reference(), s) {
-                    make_edges_in_order(nodes, *this);
-                }
-#endif
-
-                //! Copy constructor
-                __TBB_NOINLINE_SYM sequencer_node(const sequencer_node &src)
-                    : queue_node<T>(src), my_sequencer(src.my_sequencer->clone()) {
-                    fgt_node(CODEPTR(), FLOW_SEQUENCER_NODE, &(this->my_graph),
-                             static_cast<receiver<input_type> *>(this),
-                             static_cast<sender<output_type> *>(this));
-                }
-
-                //! Destructor
-                ~sequencer_node() { delete my_sequencer; }
-
-            protected:
-                typedef typename buffer_node<T>::size_type size_type;
-                typedef typename buffer_node<T>::buffer_operation sequencer_operation;
-
-            private:
-                bool internal_push(sequencer_operation *op) override {
-                    size_type tag = (*my_sequencer)(*(op->elem));
-#if !TBB_DEPRECATED_SEQUENCER_DUPLICATES
-                    if (tag < this->my_head) {
-                        // have already emitted a message with this tag
-                        op->status.store(FAILED, std::memory_order_release);
-                        return false;
-                    }
-#endif
-                    // cannot modify this->my_tail now; the buffer would be inconsistent.
-                    size_t new_tail = (tag + 1 > this->my_tail) ? tag + 1 : this->my_tail;
-
-                    if (this->size(new_tail) > this->capacity()) {
-                        this->grow_my_array(this->size(new_tail));
-                    }
-                    this->my_tail = new_tail;
-
-                    const op_stat res = this->place_item(tag, *(op->elem)) ? SUCCEEDED : FAILED;
-                    op->status.store(res, std::memory_order_release);
-                    return res == SUCCEEDED;
-                }
-            };// sequencer_node
-
-            //! Forwards messages in priority order
-            template <typename T, typename Compare = std::less<T>>
-            class priority_queue_node : public buffer_node<T> {
-            public:
-                typedef T input_type;
-                typedef T output_type;
-                typedef buffer_node<T> base_type;
-                typedef priority_queue_node class_type;
-                typedef typename receiver<input_type>::predecessor_type predecessor_type;
-                typedef typename sender<output_type>::successor_type successor_type;
-
-                //! Constructor
-                __TBB_NOINLINE_SYM explicit priority_queue_node(graph &g, const Compare &comp = Compare())
-                    : buffer_node<T>(g), compare(comp), mark(0) {
-                    fgt_node(CODEPTR(), FLOW_PRIORITY_QUEUE_NODE, &(this->my_graph),
-                             static_cast<receiver<input_type> *>(this),
-                             static_cast<sender<output_type> *>(this));
-                }
+#if __TBB_VARIADIC_MAX >= 9
+template<typename T0, typename T1, typename T2, typename T3, typename T4, typename T5,
+         typename T6, typename T7, typename T8>
+class indexer_node<T0, T1, T2, T3, T4, T5, T6, T7, T8> : public unfolded_indexer_node<std::tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8> > {
+private:
+    static const int N = 9;
+public:
+    typedef std::tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8> InputTuple;
+    typedef tagged_msg<size_t, T0, T1, T2, T3, T4, T5, T6, T7, T8> output_type;
+    typedef unfolded_indexer_node<InputTuple> unfolded_type;
+    __TBB_NOINLINE_SYM indexer_node(graph& g) : unfolded_type(g) {
+        fgt_multiinput_node<N>( CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph,
+                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
+    }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-                template <typename... Args>
-                priority_queue_node(const node_set<Args...> &nodes, const Compare &comp = Compare())
-                    : priority_queue_node(nodes.graph_reference(), comp) {
-                    make_edges_in_order(nodes, *this);
-                }
+    template <typename... Args>
+    indexer_node(const node_set<Args...>& nodes) : indexer_node(nodes.graph_reference()) {
+        make_edges_in_order(nodes, *this);
+    }
 #endif
 
-                //! Copy constructor
-                __TBB_NOINLINE_SYM priority_queue_node(const priority_queue_node &src)
-                    : buffer_node<T>(src), mark(0) {
-                    fgt_node(CODEPTR(), FLOW_PRIORITY_QUEUE_NODE, &(this->my_graph),
-                             static_cast<receiver<input_type> *>(this),
-                             static_cast<sender<output_type> *>(this));
-                }
+    // Copy constructor
+    __TBB_NOINLINE_SYM indexer_node( const indexer_node& other ) : unfolded_type(other) {
+        fgt_multiinput_node<N>( CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph,
+                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
+    }
 
-            protected:
-                void reset_node(reset_flags f) override {
-                    mark = 0;
-                    base_type::reset_node(f);
-                }
-
-                typedef typename buffer_node<T>::size_type size_type;
-                typedef typename buffer_node<T>::item_type item_type;
-                typedef typename buffer_node<T>::buffer_operation prio_operation;
-
-                //! Tries to forward valid items to successors
-                void internal_forward_task(prio_operation *op) override {
-                    this->internal_forward_task_impl(op, this);
-                }
-
-                void handle_operations(prio_operation *op_list) override {
-                    this->handle_operations_impl(op_list, this);
-                }
-
-                bool internal_push(prio_operation *op) override {
-                    prio_push(*(op->elem));
-                    op->status.store(SUCCEEDED, std::memory_order_release);
-                    return true;
-                }
-
-                void internal_pop(prio_operation *op) override {
-                    // if empty or already reserved, don't pop
-                    if (this->my_reserved == true || this->my_tail == 0) {
-                        op->status.store(FAILED, std::memory_order_release);
-                        return;
-                    }
-
-                    *(op->elem) = prio();
-                    op->status.store(SUCCEEDED, std::memory_order_release);
-                    prio_pop();
-                }
-
-                // pops the highest-priority item, saves copy
-                void internal_reserve(prio_operation *op) override {
-                    if (this->my_reserved == true || this->my_tail == 0) {
-                        op->status.store(FAILED, std::memory_order_release);
-                        return;
-                    }
-                    this->my_reserved = true;
-                    *(op->elem) = prio();
-                    reserved_item = *(op->elem);
-                    op->status.store(SUCCEEDED, std::memory_order_release);
-                    prio_pop();
-                }
+};
+#endif //variadic max 9
 
-                void internal_consume(prio_operation *op) override {
-                    op->status.store(SUCCEEDED, std::memory_order_release);
-                    this->my_reserved = false;
-                    reserved_item = input_type();
-                }
-
-                void internal_release(prio_operation *op) override {
-                    op->status.store(SUCCEEDED, std::memory_order_release);
-                    prio_push(reserved_item);
-                    this->my_reserved = false;
-                    reserved_item = input_type();
-                }
-
-            private:
-                template <typename>
-                friend class buffer_node;
-
-                void order() {
-                    if (mark < this->my_tail) heapify();
-                    __TBB_ASSERT(mark == this->my_tail, "mark unequal after heapify");
-                }
-
-                bool is_item_valid() { return this->my_tail > 0; }
-
-                void try_put_and_add_task(graph_task *&last_task) {
-                    graph_task *new_task = this->my_successors.try_put_task(this->prio());
-                    if (new_task) {
-                        // workaround for icc bug
-                        graph &graph_ref = this->graph_reference();
-                        last_task = combine_tasks(graph_ref, last_task, new_task);
-                        prio_pop();
-                    }
-                }
-
-            private:
-                Compare compare;
-                size_type mark;
-
-                input_type reserved_item;
-
-                // in case a reheap has not been done after a push, check if the mark item is higher than the 0'th item
-                bool prio_use_tail() {
-                    __TBB_ASSERT(mark <= this->my_tail, "mark outside bounds before test");
-                    return mark < this->my_tail
-                           && compare(this->get_my_item(0), this->get_my_item(this->my_tail - 1));
-                }
-
-                // prio_push: checks that the item will fit, expand array if necessary, put at end
-                void prio_push(const T &src) {
-                    if (this->my_tail >= this->my_array_size) this->grow_my_array(this->my_tail + 1);
-                    (void) this->place_item(this->my_tail, src);
-                    ++(this->my_tail);
-                    __TBB_ASSERT(mark < this->my_tail, "mark outside bounds after push");
-                }
-
-                // prio_pop: deletes highest priority item from the array, and if it is item
-                // 0, move last item to 0 and reheap.  If end of array, just destroy and decrement tail
-                // and mark.  Assumes the array has already been tested for emptiness; no failure.
-                void prio_pop() {
-                    if (prio_use_tail()) {
-                        // there are newly pushed elements; last one higher than top
-                        // copy the data
-                        this->destroy_item(this->my_tail - 1);
-                        --(this->my_tail);
-                        __TBB_ASSERT(mark <= this->my_tail, "mark outside bounds after pop");
-                        return;
-                    }
-                    this->destroy_item(0);
-                    if (this->my_tail > 1) {
-                        // push the last element down heap
-                        __TBB_ASSERT(this->my_item_valid(this->my_tail - 1), NULL);
-                        this->move_item(0, this->my_tail - 1);
-                    }
-                    --(this->my_tail);
-                    if (mark > this->my_tail) --mark;
-                    if (this->my_tail > 1)// don't reheap for heap of size 1
-                        reheap();
-                    __TBB_ASSERT(mark <= this->my_tail, "mark outside bounds after pop");
-                }
-
-                const T &prio() { return this->get_my_item(prio_use_tail() ? this->my_tail - 1 : 0); }
-
-                // turn array into heap
-                void heapify() {
-                    if (this->my_tail == 0) {
-                        mark = 0;
-                        return;
-                    }
-                    if (!mark) mark = 1;
-                    for (; mark < this->my_tail; ++mark) {// for each unheaped element
-                        size_type cur_pos = mark;
-                        input_type to_place;
-                        this->fetch_item(mark, to_place);
-                        do {// push to_place up the heap
-                            size_type parent = (cur_pos - 1) >> 1;
-                            if (!compare(this->get_my_item(parent), to_place)) break;
-                            this->move_item(cur_pos, parent);
-                            cur_pos = parent;
-                        } while (cur_pos);
-                        (void) this->place_item(cur_pos, to_place);
-                    }
-                }
-
-                // otherwise heapified array with new root element; rearrange to heap
-                void reheap() {
-                    size_type cur_pos = 0, child = 1;
-                    while (child < mark) {
-                        size_type target = child;
-                        if (child + 1 < mark
-                            && compare(this->get_my_item(child), this->get_my_item(child + 1)))
-                            ++target;
-                        // target now has the higher priority child
-                        if (compare(this->get_my_item(target), this->get_my_item(cur_pos))) break;
-                        // swap
-                        this->swap_items(cur_pos, target);
-                        cur_pos = target;
-                        child = (cur_pos << 1) + 1;
-                    }
-                }
-            };// priority_queue_node
-
-            //! Forwards messages only if the threshold has not been reached
-            /** This node forwards items until its threshold is reached.
-    It contains no buffering.  If the downstream node rejects, the
-    message is dropped. */
-            template <typename T, typename DecrementType = continue_msg>
-            class limiter_node : public graph_node, public receiver<T>, public sender<T> {
-            public:
-                typedef T input_type;
-                typedef T output_type;
-                typedef typename receiver<input_type>::predecessor_type predecessor_type;
-                typedef typename sender<output_type>::successor_type successor_type;
-                //TODO: There is a lack of predefined types for its controlling "decrementer" port. It should be fixed later.
-
-            private:
-                size_t my_threshold;
-                size_t my_count;// number of successful puts
-                size_t my_tries;// number of active put attempts
-                reservable_predecessor_cache<T, spin_mutex> my_predecessors;
-                spin_mutex my_mutex;
-                broadcast_cache<T> my_successors;
-
-                //! The internal receiver< DecrementType > that adjusts the count
-                threshold_regulator<limiter_node<T, DecrementType>, DecrementType> decrement;
-
-                graph_task *decrement_counter(long long delta) {
-                    {
-                        spin_mutex::scoped_lock lock(my_mutex);
-                        if (delta > 0 && size_t(delta) > my_count) {
-                            my_count = 0;
-                        } else if (delta < 0 && size_t(-delta) > my_threshold - my_count) {
-                            my_count = my_threshold;
-                        } else {
-                            my_count -= size_t(delta);// absolute value of delta is sufficiently small
-                        }
-                        __TBB_ASSERT(my_count <= my_threshold,
-                                     "counter values are truncated to be inside the [0, threshold] interval");
-                    }
-                    return forward_task();
-                }
-
-                // Let threshold_regulator call decrement_counter()
-                friend class threshold_regulator<limiter_node<T, DecrementType>, DecrementType>;
-
-                friend class forward_task_bypass<limiter_node<T, DecrementType>>;
-
-                bool check_conditions() {// always called under lock
-                    return (my_count + my_tries < my_threshold && !my_predecessors.empty()
-                            && !my_successors.empty());
-                }
-
-                // only returns a valid task pointer or NULL, never SUCCESSFULLY_ENQUEUED
-                graph_task *forward_task() {
-                    input_type v;
-                    graph_task *rval = NULL;
-                    bool reserved = false;
-                    {
-                        spin_mutex::scoped_lock lock(my_mutex);
-                        if (check_conditions()) ++my_tries;
-                        else
-                            return NULL;
-                    }
-
-                    //SUCCESS
-                    // if we can reserve and can put, we consume the reservation
-                    // we increment the count and decrement the tries
-                    if ((my_predecessors.try_reserve(v)) == true) {
-                        reserved = true;
-                        if ((rval = my_successors.try_put_task(v)) != NULL) {
-                            {
-                                spin_mutex::scoped_lock lock(my_mutex);
-                                ++my_count;
-                                --my_tries;
-                                my_predecessors.try_consume();
-                                if (check_conditions()) {
-                                    if (is_graph_active(this->my_graph)) {
-                                        typedef forward_task_bypass<limiter_node<T, DecrementType>> task_type;
-                                        small_object_allocator allocator {};
-                                        graph_task *rtask
-                                                = allocator.new_object<task_type>(my_graph, allocator, *this);
-                                        my_graph.reserve_wait();
-                                        spawn_in_graph_arena(graph_reference(), *rtask);
-                                    }
-                                }
-                            }
-                            return rval;
-                        }
-                    }
-                    //FAILURE
-                    //if we can't reserve, we decrement the tries
-                    //if we can reserve but can't put, we decrement the tries and release the reservation
-                    {
-                        spin_mutex::scoped_lock lock(my_mutex);
-                        --my_tries;
-                        if (reserved) my_predecessors.try_release();
-                        if (check_conditions()) {
-                            if (is_graph_active(this->my_graph)) {
-                                small_object_allocator allocator {};
-                                typedef forward_task_bypass<limiter_node<T, DecrementType>> task_type;
-                                graph_task *t = allocator.new_object<task_type>(my_graph, allocator, *this);
-                                my_graph.reserve_wait();
-                                __TBB_ASSERT(!rval, "Have two tasks to handle");
-                                return t;
-                            }
-                        }
-                        return rval;
-                    }
-                }
-
-                void initialize() {
-                    fgt_node(CODEPTR(), FLOW_LIMITER_NODE, &this->my_graph,
-                             static_cast<receiver<input_type> *>(this),
-                             static_cast<receiver<DecrementType> *>(&decrement),
-                             static_cast<sender<output_type> *>(this));
-                }
-
-            public:
-                //! Constructor
-                limiter_node(graph &g, size_t threshold)
-                    : graph_node(g), my_threshold(threshold), my_count(0), my_tries(0), my_predecessors(this),
-                      my_successors(this), decrement(this) {
-                    initialize();
-                }
+#if __TBB_VARIADIC_MAX >= 10
+template<typename T0, typename T1, typename T2, typename T3, typename T4, typename T5,
+         typename T6, typename T7, typename T8, typename T9>
+class indexer_node/*default*/ : public unfolded_indexer_node<std::tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> > {
+private:
+    static const int N = 10;
+public:
+    typedef std::tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> InputTuple;
+    typedef tagged_msg<size_t, T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> output_type;
+    typedef unfolded_indexer_node<InputTuple> unfolded_type;
+    __TBB_NOINLINE_SYM indexer_node(graph& g) : unfolded_type(g) {
+        fgt_multiinput_node<N>( CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph,
+                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
+    }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-                template <typename... Args>
-                limiter_node(const node_set<Args...> &nodes, size_t threshold)
-                    : limiter_node(nodes.graph_reference(), threshold) {
-                    make_edges_in_order(nodes, *this);
-                }
+    template <typename... Args>
+    indexer_node(const node_set<Args...>& nodes) : indexer_node(nodes.graph_reference()) {
+        make_edges_in_order(nodes, *this);
+    }
 #endif
 
-                //! Copy constructor
-                limiter_node(const limiter_node &src) : limiter_node(src.my_graph, src.my_threshold) {}
-
-                //! The interface for accessing internal receiver< DecrementType > that adjusts the count
-                receiver<DecrementType> &decrementer() { return decrement; }
-
-                //! Replace the current successor with this new successor
-                bool register_successor(successor_type &r) override {
-                    spin_mutex::scoped_lock lock(my_mutex);
-                    bool was_empty = my_successors.empty();
-                    my_successors.register_successor(r);
-                    //spawn a forward task if this is the only successor
-                    if (was_empty && !my_predecessors.empty() && my_count + my_tries < my_threshold) {
-                        if (is_graph_active(this->my_graph)) {
-                            small_object_allocator allocator {};
-                            typedef forward_task_bypass<limiter_node<T, DecrementType>> task_type;
-                            graph_task *t = allocator.new_object<task_type>(my_graph, allocator, *this);
-                            my_graph.reserve_wait();
-                            spawn_in_graph_arena(graph_reference(), *t);
-                        }
-                    }
-                    return true;
-                }
-
-                //! Removes a successor from this node
-                /** r.remove_predecessor(*this) is also called. */
-                bool remove_successor(successor_type &r) override {
-                    // TODO revamp: investigate why qualification is needed for remove_predecessor() call
-                    tbb::detail::d1::remove_predecessor(r, *this);
-                    my_successors.remove_successor(r);
-                    return true;
-                }
+    // Copy constructor
+    __TBB_NOINLINE_SYM indexer_node( const indexer_node& other ) : unfolded_type(other) {
+        fgt_multiinput_node<N>( CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph,
+                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
+    }
+
+};
+#endif //variadic max 10
+
+template< typename T >
+inline void internal_make_edge( sender<T> &p, receiver<T> &s ) {
+    register_successor(p, s);
+    fgt_make_edge( &p, &s );
+}
+
+//! Makes an edge between a single predecessor and a single successor
+template< typename T >
+inline void make_edge( sender<T> &p, receiver<T> &s ) {
+    internal_make_edge( p, s );
+}
+
+//Makes an edge from port 0 of a multi-output predecessor to port 0 of a multi-input successor.
+template< typename T, typename V,
+          typename = typename T::output_ports_type, typename = typename V::input_ports_type >
+inline void make_edge( T& output, V& input) {
+    make_edge(std::get<0>(output.output_ports()), std::get<0>(input.input_ports()));
+}
+
+//Makes an edge from port 0 of a multi-output predecessor to a receiver.
+template< typename T, typename R,
+          typename = typename T::output_ports_type >
+inline void make_edge( T& output, receiver<R>& input) {
+     make_edge(std::get<0>(output.output_ports()), input);
+}
+
+//Makes an edge from a sender to port 0 of a multi-input successor.
+template< typename S,  typename V,
+          typename = typename V::input_ports_type >
+inline void make_edge( sender<S>& output, V& input) {
+     make_edge(output, std::get<0>(input.input_ports()));
+}
+
+template< typename T >
+inline void internal_remove_edge( sender<T> &p, receiver<T> &s ) {
+    remove_successor( p, s );
+    fgt_remove_edge( &p, &s );
+}
+
+//! Removes an edge between a single predecessor and a single successor
+template< typename T >
+inline void remove_edge( sender<T> &p, receiver<T> &s ) {
+    internal_remove_edge( p, s );
+}
+
+//Removes an edge between port 0 of a multi-output predecessor and port 0 of a multi-input successor.
+template< typename T, typename V,
+          typename = typename T::output_ports_type, typename = typename V::input_ports_type >
+inline void remove_edge( T& output, V& input) {
+    remove_edge(std::get<0>(output.output_ports()), std::get<0>(input.input_ports()));
+}
+
+//Removes an edge between port 0 of a multi-output predecessor and a receiver.
+template< typename T, typename R,
+          typename = typename T::output_ports_type >
+inline void remove_edge( T& output, receiver<R>& input) {
+     remove_edge(std::get<0>(output.output_ports()), input);
+}
+//Removes an edge between a sender and port 0 of a multi-input successor.
+template< typename S,  typename V,
+          typename = typename V::input_ports_type >
+inline void remove_edge( sender<S>& output, V& input) {
+     remove_edge(output, std::get<0>(input.input_ports()));
+}
+
+//! Returns a copy of the body from a function or continue node
+template< typename Body, typename Node >
+Body copy_body( Node &n ) {
+    return n.template copy_function_object<Body>();
+}
+
+//composite_node
+template< typename InputTuple, typename OutputTuple > class composite_node;
+
+template< typename... InputTypes, typename... OutputTypes>
+class composite_node <std::tuple<InputTypes...>, std::tuple<OutputTypes...> > : public graph_node {
+
+public:
+    typedef std::tuple< receiver<InputTypes>&... > input_ports_type;
+    typedef std::tuple< sender<OutputTypes>&... > output_ports_type;
+
+private:
+    std::unique_ptr<input_ports_type> my_input_ports;
+    std::unique_ptr<output_ports_type> my_output_ports;
+
+    static const size_t NUM_INPUTS = sizeof...(InputTypes);
+    static const size_t NUM_OUTPUTS = sizeof...(OutputTypes);
+
+protected:
+    void reset_node(reset_flags) override {}
+
+public:
+    composite_node( graph &g ) : graph_node(g) {
+        fgt_multiinput_multioutput_node( CODEPTR(), FLOW_COMPOSITE_NODE, this, &this->my_graph );
+    }
+
+    template<typename T1, typename T2>
+    void set_external_ports(T1&& input_ports_tuple, T2&& output_ports_tuple) {
+        static_assert(NUM_INPUTS == std::tuple_size<input_ports_type>::value, "number of arguments does not match number of input ports");
+        static_assert(NUM_OUTPUTS == std::tuple_size<output_ports_type>::value, "number of arguments does not match number of output ports");
+
+        fgt_internal_input_alias_helper<T1, NUM_INPUTS>::alias_port( this, input_ports_tuple);
+        fgt_internal_output_alias_helper<T2, NUM_OUTPUTS>::alias_port( this, output_ports_tuple);
+
+        my_input_ports.reset( new input_ports_type(std::forward<T1>(input_ports_tuple)) );
+        my_output_ports.reset( new output_ports_type(std::forward<T2>(output_ports_tuple)) );
+    }
+
+    template< typename... NodeTypes >
+    void add_visible_nodes(const NodeTypes&... n) { add_nodes_impl(this, true, n...); }
+
+    template< typename... NodeTypes >
+    void add_nodes(const NodeTypes&... n) { add_nodes_impl(this, false, n...); }
+
+
+    input_ports_type& input_ports() {
+         __TBB_ASSERT(my_input_ports, "input ports not set, call set_external_ports to set input ports");
+         return *my_input_ports;
+    }
+
+    output_ports_type& output_ports() {
+         __TBB_ASSERT(my_output_ports, "output ports not set, call set_external_ports to set output ports");
+         return *my_output_ports;
+    }
+};  // class composite_node
+
+//composite_node with only input ports
+template< typename... InputTypes>
+class composite_node <std::tuple<InputTypes...>, std::tuple<> > : public graph_node {
+public:
+    typedef std::tuple< receiver<InputTypes>&... > input_ports_type;
 
-                //! Adds src to the list of cached predecessors.
-                bool register_predecessor(predecessor_type &src) override {
-                    spin_mutex::scoped_lock lock(my_mutex);
-                    my_predecessors.add(src);
-                    if (my_count + my_tries < my_threshold && !my_successors.empty()
-                        && is_graph_active(this->my_graph)) {
-                        small_object_allocator allocator {};
-                        typedef forward_task_bypass<limiter_node<T, DecrementType>> task_type;
-                        graph_task *t = allocator.new_object<task_type>(my_graph, allocator, *this);
-                        my_graph.reserve_wait();
-                        spawn_in_graph_arena(graph_reference(), *t);
-                    }
-                    return true;
-                }
+private:
+    std::unique_ptr<input_ports_type> my_input_ports;
+    static const size_t NUM_INPUTS = sizeof...(InputTypes);
 
-                //! Removes src from the list of cached predecessors.
-                bool remove_predecessor(predecessor_type &src) override {
-                    my_predecessors.remove(src);
-                    return true;
-                }
+protected:
+    void reset_node(reset_flags) override {}
 
-            protected:
-                template <typename R, typename B>
-                friend class run_and_put_task;
-                template <typename X, typename Y>
-                friend class broadcast_cache;
-                template <typename X, typename Y>
-                friend class round_robin_cache;
-                //! Puts an item to this receiver
-                graph_task *try_put_task(const T &t) override {
-                    {
-                        spin_mutex::scoped_lock lock(my_mutex);
-                        if (my_count + my_tries >= my_threshold) return NULL;
-                        else
-                            ++my_tries;
-                    }
+public:
+    composite_node( graph &g ) : graph_node(g) {
+        fgt_composite( CODEPTR(), this, &g );
+    }
 
-                    graph_task *rtask = my_successors.try_put_task(t);
+   template<typename T>
+   void set_external_ports(T&& input_ports_tuple) {
+       static_assert(NUM_INPUTS == std::tuple_size<input_ports_type>::value, "number of arguments does not match number of input ports");
 
-                    if (!rtask) {// try_put_task failed.
-                        spin_mutex::scoped_lock lock(my_mutex);
-                        --my_tries;
-                        if (check_conditions() && is_graph_active(this->my_graph)) {
-                            small_object_allocator allocator {};
-                            typedef forward_task_bypass<limiter_node<T, DecrementType>> task_type;
-                            rtask = allocator.new_object<task_type>(my_graph, allocator, *this);
-                            my_graph.reserve_wait();
-                        }
-                    } else {
-                        spin_mutex::scoped_lock lock(my_mutex);
-                        ++my_count;
-                        --my_tries;
-                    }
-                    return rtask;
-                }
+       fgt_internal_input_alias_helper<T, NUM_INPUTS>::alias_port( this, input_ports_tuple);
 
-                graph &graph_reference() const override { return my_graph; }
-
-                void reset_node(reset_flags f) override {
-                    my_count = 0;
-                    if (f & rf_clear_edges) {
-                        my_predecessors.clear();
-                        my_successors.clear();
-                    } else {
-                        my_predecessors.reset();
-                    }
-                    decrement.reset_receiver(f);
-                }
-            };// limiter_node
+       my_input_ports.reset( new input_ports_type(std::forward<T>(input_ports_tuple)) );
+   }
 
-#include "detail/_flow_graph_join_impl.h"
+    template< typename... NodeTypes >
+    void add_visible_nodes(const NodeTypes&... n) { add_nodes_impl(this, true, n...); }
 
-            template <typename OutputTuple, typename JP = queueing>
-            class join_node;
-
-            template <typename OutputTuple>
-            class join_node<OutputTuple, reserving>
-                : public unfolded_join_node<std::tuple_size<OutputTuple>::value, reserving_port, OutputTuple,
-                                            reserving> {
-            private:
-                static const int N = std::tuple_size<OutputTuple>::value;
-                typedef unfolded_join_node<N, reserving_port, OutputTuple, reserving> unfolded_type;
-
-            public:
-                typedef OutputTuple output_type;
-                typedef typename unfolded_type::input_ports_type input_ports_type;
-                __TBB_NOINLINE_SYM explicit join_node(graph &g) : unfolded_type(g) {
-                    fgt_multiinput_node<N>(CODEPTR(), FLOW_JOIN_NODE_RESERVING, &this->my_graph,
-                                           this->input_ports(), static_cast<sender<output_type> *>(this));
-                }
+    template< typename... NodeTypes >
+    void add_nodes( const NodeTypes&... n) { add_nodes_impl(this, false, n...); }
 
-#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-                template <typename... Args>
-                __TBB_NOINLINE_SYM join_node(const node_set<Args...> &nodes, reserving = reserving())
-                    : join_node(nodes.graph_reference()) {
-                    make_edges_in_order(nodes, *this);
-                }
-#endif
 
-                __TBB_NOINLINE_SYM join_node(const join_node &other) : unfolded_type(other) {
-                    fgt_multiinput_node<N>(CODEPTR(), FLOW_JOIN_NODE_RESERVING, &this->my_graph,
-                                           this->input_ports(), static_cast<sender<output_type> *>(this));
-                }
-            };
-
-            template <typename OutputTuple>
-            class join_node<OutputTuple, queueing>
-                : public unfolded_join_node<std::tuple_size<OutputTuple>::value, queueing_port, OutputTuple,
-                                            queueing> {
-            private:
-                static const int N = std::tuple_size<OutputTuple>::value;
-                typedef unfolded_join_node<N, queueing_port, OutputTuple, queueing> unfolded_type;
-
-            public:
-                typedef OutputTuple output_type;
-                typedef typename unfolded_type::input_ports_type input_ports_type;
-                __TBB_NOINLINE_SYM explicit join_node(graph &g) : unfolded_type(g) {
-                    fgt_multiinput_node<N>(CODEPTR(), FLOW_JOIN_NODE_QUEUEING, &this->my_graph,
-                                           this->input_ports(), static_cast<sender<output_type> *>(this));
-                }
+    input_ports_type& input_ports() {
+         __TBB_ASSERT(my_input_ports, "input ports not set, call set_external_ports to set input ports");
+         return *my_input_ports;
+    }
 
-#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-                template <typename... Args>
-                __TBB_NOINLINE_SYM join_node(const node_set<Args...> &nodes, queueing = queueing())
-                    : join_node(nodes.graph_reference()) {
-                    make_edges_in_order(nodes, *this);
-                }
-#endif
+};  // class composite_node
 
-                __TBB_NOINLINE_SYM join_node(const join_node &other) : unfolded_type(other) {
-                    fgt_multiinput_node<N>(CODEPTR(), FLOW_JOIN_NODE_QUEUEING, &this->my_graph,
-                                           this->input_ports(), static_cast<sender<output_type> *>(this));
-                }
-            };
+//composite_nodes with only output_ports
+template<typename... OutputTypes>
+class composite_node <std::tuple<>, std::tuple<OutputTypes...> > : public graph_node {
+public:
+    typedef std::tuple< sender<OutputTypes>&... > output_ports_type;
 
-#if __TBB_CPP20_CONCEPTS_PRESENT
-            // Helper function which is well-formed only if all of the elements in OutputTuple
-            // satisfies join_node_function_object<body[i], tuple[i], K>
-            template <typename OutputTuple, typename K, typename... Functions, std::size_t... Idx>
-                    void join_node_function_objects_helper(std::index_sequence<Idx...>) requires(
-                            std::tuple_size_v<OutputTuple> == sizeof...(Functions))
-                    && (...
-                        && join_node_function_object<Functions, std::tuple_element_t<Idx, OutputTuple>, K>);
-
-            template <typename OutputTuple, typename K, typename... Functions>
-            concept join_node_functions = requires {
-                join_node_function_objects_helper<OutputTuple, K, Functions...>(
-                        std::make_index_sequence<sizeof...(Functions)> {});
-            };
-
-#endif
-
-            // template for key_matching join_node
-            // tag_matching join_node is a specialization of key_matching, and is source-compatible.
-            template <typename OutputTuple, typename K, typename KHash>
-            class join_node<OutputTuple, key_matching<K, KHash>>
-                : public unfolded_join_node<std::tuple_size<OutputTuple>::value, key_matching_port,
-                                            OutputTuple, key_matching<K, KHash>> {
-            private:
-                static const int N = std::tuple_size<OutputTuple>::value;
-                typedef unfolded_join_node<N, key_matching_port, OutputTuple, key_matching<K, KHash>>
-                        unfolded_type;
-
-            public:
-                typedef OutputTuple output_type;
-                typedef typename unfolded_type::input_ports_type input_ports_type;
-
-#if __TBB_PREVIEW_MESSAGE_BASED_KEY_MATCHING
-                join_node(graph &g) : unfolded_type(g) {}
-#endif /* __TBB_PREVIEW_MESSAGE_BASED_KEY_MATCHING */
-
-                template <typename __TBB_B0, typename __TBB_B1>
-                __TBB_requires(join_node_functions<OutputTuple, K, __TBB_B0, __TBB_B1>) __TBB_NOINLINE_SYM
-                        join_node(graph &g, __TBB_B0 b0, __TBB_B1 b1)
-                    : unfolded_type(g, b0, b1) {
-                    fgt_multiinput_node<N>(CODEPTR(), FLOW_JOIN_NODE_TAG_MATCHING, &this->my_graph,
-                                           this->input_ports(), static_cast<sender<output_type> *>(this));
-                }
-                template <typename __TBB_B0, typename __TBB_B1, typename __TBB_B2>
-                __TBB_requires(join_node_functions<OutputTuple, K, __TBB_B0, __TBB_B1, __TBB_B2>)
-                        __TBB_NOINLINE_SYM join_node(graph &g, __TBB_B0 b0, __TBB_B1 b1, __TBB_B2 b2)
-                    : unfolded_type(g, b0, b1, b2) {
-                    fgt_multiinput_node<N>(CODEPTR(), FLOW_JOIN_NODE_TAG_MATCHING, &this->my_graph,
-                                           this->input_ports(), static_cast<sender<output_type> *>(this));
-                }
-                template <typename __TBB_B0, typename __TBB_B1, typename __TBB_B2, typename __TBB_B3>
-                __TBB_requires(join_node_functions<OutputTuple, K, __TBB_B0, __TBB_B1, __TBB_B2, __TBB_B3>)
-                        __TBB_NOINLINE_SYM
-                        join_node(graph &g, __TBB_B0 b0, __TBB_B1 b1, __TBB_B2 b2, __TBB_B3 b3)
-                    : unfolded_type(g, b0, b1, b2, b3) {
-                    fgt_multiinput_node<N>(CODEPTR(), FLOW_JOIN_NODE_TAG_MATCHING, &this->my_graph,
-                                           this->input_ports(), static_cast<sender<output_type> *>(this));
-                }
-                template <typename __TBB_B0, typename __TBB_B1, typename __TBB_B2, typename __TBB_B3,
-                          typename __TBB_B4>
-                __TBB_requires(
-                        join_node_functions<OutputTuple, K, __TBB_B0, __TBB_B1, __TBB_B2, __TBB_B3, __TBB_B4>)
-                        __TBB_NOINLINE_SYM
-                        join_node(graph &g, __TBB_B0 b0, __TBB_B1 b1, __TBB_B2 b2, __TBB_B3 b3, __TBB_B4 b4)
-                    : unfolded_type(g, b0, b1, b2, b3, b4) {
-                    fgt_multiinput_node<N>(CODEPTR(), FLOW_JOIN_NODE_TAG_MATCHING, &this->my_graph,
-                                           this->input_ports(), static_cast<sender<output_type> *>(this));
-                }
-#if __TBB_VARIADIC_MAX >= 6
-                template <typename __TBB_B0, typename __TBB_B1, typename __TBB_B2, typename __TBB_B3,
-                          typename __TBB_B4, typename __TBB_B5>
-                __TBB_requires(join_node_functions<OutputTuple, K, __TBB_B0, __TBB_B1, __TBB_B2, __TBB_B3,
-                                                   __TBB_B4, __TBB_B5>) __TBB_NOINLINE_SYM
-                        join_node(graph &g, __TBB_B0 b0, __TBB_B1 b1, __TBB_B2 b2, __TBB_B3 b3, __TBB_B4 b4,
-                                  __TBB_B5 b5)
-                    : unfolded_type(g, b0, b1, b2, b3, b4, b5) {
-                    fgt_multiinput_node<N>(CODEPTR(), FLOW_JOIN_NODE_TAG_MATCHING, &this->my_graph,
-                                           this->input_ports(), static_cast<sender<output_type> *>(this));
-                }
-#endif
-#if __TBB_VARIADIC_MAX >= 7
-                template <typename __TBB_B0, typename __TBB_B1, typename __TBB_B2, typename __TBB_B3,
-                          typename __TBB_B4, typename __TBB_B5, typename __TBB_B6>
-                __TBB_requires(join_node_functions<OutputTuple, K, __TBB_B0, __TBB_B1, __TBB_B2, __TBB_B3,
-                                                   __TBB_B4, __TBB_B5, __TBB_B6>) __TBB_NOINLINE_SYM
-                        join_node(graph &g, __TBB_B0 b0, __TBB_B1 b1, __TBB_B2 b2, __TBB_B3 b3, __TBB_B4 b4,
-                                  __TBB_B5 b5, __TBB_B6 b6)
-                    : unfolded_type(g, b0, b1, b2, b3, b4, b5, b6) {
-                    fgt_multiinput_node<N>(CODEPTR(), FLOW_JOIN_NODE_TAG_MATCHING, &this->my_graph,
-                                           this->input_ports(), static_cast<sender<output_type> *>(this));
-                }
-#endif
-#if __TBB_VARIADIC_MAX >= 8
-                template <typename __TBB_B0, typename __TBB_B1, typename __TBB_B2, typename __TBB_B3,
-                          typename __TBB_B4, typename __TBB_B5, typename __TBB_B6, typename __TBB_B7>
-                __TBB_requires(join_node_functions<OutputTuple, K, __TBB_B0, __TBB_B1, __TBB_B2, __TBB_B3,
-                                                   __TBB_B4, __TBB_B5, __TBB_B6, __TBB_B7>) __TBB_NOINLINE_SYM
-                        join_node(graph &g, __TBB_B0 b0, __TBB_B1 b1, __TBB_B2 b2, __TBB_B3 b3, __TBB_B4 b4,
-                                  __TBB_B5 b5, __TBB_B6 b6, __TBB_B7 b7)
-                    : unfolded_type(g, b0, b1, b2, b3, b4, b5, b6, b7) {
-                    fgt_multiinput_node<N>(CODEPTR(), FLOW_JOIN_NODE_TAG_MATCHING, &this->my_graph,
-                                           this->input_ports(), static_cast<sender<output_type> *>(this));
-                }
-#endif
-#if __TBB_VARIADIC_MAX >= 9
-                template <typename __TBB_B0, typename __TBB_B1, typename __TBB_B2, typename __TBB_B3,
-                          typename __TBB_B4, typename __TBB_B5, typename __TBB_B6, typename __TBB_B7,
-                          typename __TBB_B8>
-                __TBB_requires(join_node_functions<OutputTuple, K, __TBB_B0, __TBB_B1, __TBB_B2, __TBB_B3,
-                                                   __TBB_B4, __TBB_B5, __TBB_B6, __TBB_B7, __TBB_B8>)
-                        __TBB_NOINLINE_SYM
-                        join_node(graph &g, __TBB_B0 b0, __TBB_B1 b1, __TBB_B2 b2, __TBB_B3 b3, __TBB_B4 b4,
-                                  __TBB_B5 b5, __TBB_B6 b6, __TBB_B7 b7, __TBB_B8 b8)
-                    : unfolded_type(g, b0, b1, b2, b3, b4, b5, b6, b7, b8) {
-                    fgt_multiinput_node<N>(CODEPTR(), FLOW_JOIN_NODE_TAG_MATCHING, &this->my_graph,
-                                           this->input_ports(), static_cast<sender<output_type> *>(this));
-                }
-#endif
-#if __TBB_VARIADIC_MAX >= 10
-                template <typename __TBB_B0, typename __TBB_B1, typename __TBB_B2, typename __TBB_B3,
-                          typename __TBB_B4, typename __TBB_B5, typename __TBB_B6, typename __TBB_B7,
-                          typename __TBB_B8, typename __TBB_B9>
-                __TBB_requires(
-                        join_node_functions<OutputTuple, K, __TBB_B0, __TBB_B1, __TBB_B2, __TBB_B3, __TBB_B4,
-                                            __TBB_B5, __TBB_B6, __TBB_B7, __TBB_B8, __TBB_B9>)
-                        __TBB_NOINLINE_SYM
-                        join_node(graph &g, __TBB_B0 b0, __TBB_B1 b1, __TBB_B2 b2, __TBB_B3 b3, __TBB_B4 b4,
-                                  __TBB_B5 b5, __TBB_B6 b6, __TBB_B7 b7, __TBB_B8 b8, __TBB_B9 b9)
-                    : unfolded_type(g, b0, b1, b2, b3, b4, b5, b6, b7, b8, b9) {
-                    fgt_multiinput_node<N>(CODEPTR(), FLOW_JOIN_NODE_TAG_MATCHING, &this->my_graph,
-                                           this->input_ports(), static_cast<sender<output_type> *>(this));
-                }
-#endif
+private:
+    std::unique_ptr<output_ports_type> my_output_ports;
+    static const size_t NUM_OUTPUTS = sizeof...(OutputTypes);
+
+protected:
+    void reset_node(reset_flags) override {}
+
+public:
+    __TBB_NOINLINE_SYM composite_node( graph &g ) : graph_node(g) {
+        fgt_composite( CODEPTR(), this, &g );
+    }
+
+   template<typename T>
+   void set_external_ports(T&& output_ports_tuple) {
+       static_assert(NUM_OUTPUTS == std::tuple_size<output_ports_type>::value, "number of arguments does not match number of output ports");
+
+       fgt_internal_output_alias_helper<T, NUM_OUTPUTS>::alias_port( this, output_ports_tuple);
+
+       my_output_ports.reset( new output_ports_type(std::forward<T>(output_ports_tuple)) );
+   }
+
+    template<typename... NodeTypes >
+    void add_visible_nodes(const NodeTypes&... n) { add_nodes_impl(this, true, n...); }
+
+    template<typename... NodeTypes >
+    void add_nodes(const NodeTypes&... n) { add_nodes_impl(this, false, n...); }
+
+
+    output_ports_type& output_ports() {
+         __TBB_ASSERT(my_output_ports, "output ports not set, call set_external_ports to set output ports");
+         return *my_output_ports;
+    }
+
+};  // class composite_node
+
+template<typename Gateway>
+class async_body_base: no_assign {
+public:
+    typedef Gateway gateway_type;
+
+    async_body_base(gateway_type *gateway): my_gateway(gateway) { }
+    void set_gateway(gateway_type *gateway) {
+        my_gateway = gateway;
+    }
+
+protected:
+    gateway_type *my_gateway;
+};
+
+template<typename Input, typename Ports, typename Gateway, typename Body>
+class async_body: public async_body_base<Gateway> {
+private:
+    Body my_body;
+
+public:
+    typedef async_body_base<Gateway> base_type;
+    typedef Gateway gateway_type;
+
+    async_body(const Body &body, gateway_type *gateway)
+        : base_type(gateway), my_body(body) { }
+
+    void operator()( const Input &v, Ports & ) noexcept(noexcept(tbb::detail::invoke(my_body, v, std::declval<gateway_type&>()))) {
+        tbb::detail::invoke(my_body, v, *this->my_gateway);
+    }
+
+    Body get_body() { return my_body; }
+};
+
+//! Implements async node
+template < typename Input, typename Output,
+           typename Policy = queueing_lightweight >
+    __TBB_requires(std::default_initializable<Input> && std::copy_constructible<Input>)
+class async_node
+    : public multifunction_node< Input, std::tuple< Output >, Policy >, public sender< Output >
+{
+    typedef multifunction_node< Input, std::tuple< Output >, Policy > base_type;
+    typedef multifunction_input<
+        Input, typename base_type::output_ports_type, Policy, cache_aligned_allocator<Input>> mfn_input_type;
+
+public:
+    typedef Input input_type;
+    typedef Output output_type;
+    typedef receiver<input_type> receiver_type;
+    typedef receiver<output_type> successor_type;
+    typedef sender<input_type> predecessor_type;
+    typedef receiver_gateway<output_type> gateway_type;
+    typedef async_body_base<gateway_type> async_body_base_type;
+    typedef typename base_type::output_ports_type output_ports_type;
+
+private:
+    class receiver_gateway_impl: public receiver_gateway<Output> {
+    public:
+        receiver_gateway_impl(async_node* node): my_node(node) {}
+        void reserve_wait() override {
+            fgt_async_reserve(static_cast<typename async_node::receiver_type *>(my_node), &my_node->my_graph);
+            my_node->my_graph.reserve_wait();
+        }
+
+        void release_wait() override {
+            async_node* n = my_node;
+            graph* g = &n->my_graph;
+            g->release_wait();
+            fgt_async_commit(static_cast<typename async_node::receiver_type *>(n), g);
+        }
+
+        //! Implements gateway_type::try_put for an external activity to submit a message to FG
+        bool try_put(const Output &i) override {
+            return my_node->try_put_impl(i);
+        }
+
+    private:
+        async_node* my_node;
+    } my_gateway;
+
+    //The substitute of 'this' for member construction, to prevent compiler warnings
+    async_node* self() { return this; }
+
+    //! Implements gateway_type::try_put for an external activity to submit a message to FG
+    bool try_put_impl(const Output &i) {
+        multifunction_output<Output> &port_0 = output_port<0>(*this);
+        broadcast_cache<output_type>& port_successors = port_0.successors();
+        fgt_async_try_put_begin(this, &port_0);
+        // TODO revamp: change to std::list<graph_task*>
+        graph_task_list tasks;
+        bool is_at_least_one_put_successful = port_successors.gather_successful_try_puts(i, tasks);
+        __TBB_ASSERT( is_at_least_one_put_successful || tasks.empty(),
+                      "Return status is inconsistent with the method operation." );
+
+        while( !tasks.empty() ) {
+            enqueue_in_graph_arena(this->my_graph, tasks.pop_front());
+        }
+        fgt_async_try_put_end(this, &port_0);
+        return is_at_least_one_put_successful;
+    }
+
+public:
+    template<typename Body>
+        __TBB_requires(async_node_body<Body, input_type, gateway_type>)
+    __TBB_NOINLINE_SYM async_node(
+        graph &g, size_t concurrency,
+        Body body, Policy = Policy(), node_priority_t a_priority = no_priority
+    ) : base_type(
+        g, concurrency,
+        async_body<Input, typename base_type::output_ports_type, gateway_type, Body>
+        (body, &my_gateway), a_priority ), my_gateway(self()) {
+        fgt_multioutput_node_with_body<1>(
+            CODEPTR(), FLOW_ASYNC_NODE,
+            &this->my_graph, static_cast<receiver<input_type> *>(this),
+            this->output_ports(), this->my_body
+        );
+    }
+
+    template <typename Body>
+        __TBB_requires(async_node_body<Body, input_type, gateway_type>)
+    __TBB_NOINLINE_SYM async_node(graph& g, size_t concurrency, Body body, node_priority_t a_priority)
+        : async_node(g, concurrency, body, Policy(), a_priority) {}
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-                template <
-#if (__clang_major__ == 3 && __clang_minor__ == 4)
-                        // clang 3.4 misdeduces 'Args...' for 'node_set' while it can cope with template template parameter.
-                        template <typename...> class node_set,
-#endif
-                        typename... Args, typename... Bodies>
-                __TBB_requires((sizeof...(Bodies) == 0)
-                               || join_node_functions<OutputTuple, K, Bodies...>) __TBB_NOINLINE_SYM
-                        join_node(const node_set<Args...> &nodes, Bodies... bodies)
-                    : join_node(nodes.graph_reference(), bodies...) {
-                    make_edges_in_order(nodes, *this);
-                }
-#endif// __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-
-                __TBB_NOINLINE_SYM join_node(const join_node &other) : unfolded_type(other) {
-                    fgt_multiinput_node<N>(CODEPTR(), FLOW_JOIN_NODE_TAG_MATCHING, &this->my_graph,
-                                           this->input_ports(), static_cast<sender<output_type> *>(this));
-                }
-            };
+    template <typename Body, typename... Args>
+        __TBB_requires(async_node_body<Body, input_type, gateway_type>)
+    __TBB_NOINLINE_SYM async_node(
+        const node_set<Args...>& nodes, size_t concurrency, Body body,
+        Policy = Policy(), node_priority_t a_priority = no_priority )
+        : async_node(nodes.graph_reference(), concurrency, body, a_priority) {
+        make_edges_in_order(nodes, *this);
+    }
+
+    template <typename Body, typename... Args>
+        __TBB_requires(async_node_body<Body, input_type, gateway_type>)
+    __TBB_NOINLINE_SYM async_node(const node_set<Args...>& nodes, size_t concurrency, Body body, node_priority_t a_priority)
+        : async_node(nodes, concurrency, body, Policy(), a_priority) {}
+#endif // __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+
+    __TBB_NOINLINE_SYM async_node( const async_node &other ) : base_type(other), sender<Output>(), my_gateway(self()) {
+        static_cast<async_body_base_type*>(this->my_body->get_body_ptr())->set_gateway(&my_gateway);
+        static_cast<async_body_base_type*>(this->my_init_body->get_body_ptr())->set_gateway(&my_gateway);
+
+        fgt_multioutput_node_with_body<1>( CODEPTR(), FLOW_ASYNC_NODE,
+                &this->my_graph, static_cast<receiver<input_type> *>(this),
+                this->output_ports(), this->my_body );
+    }
+
+    gateway_type& gateway() {
+        return my_gateway;
+    }
+
+    // Define sender< Output >
+
+    //! Add a new successor to this node
+    bool register_successor(successor_type&) override {
+        __TBB_ASSERT(false, "Successors must be registered only via ports");
+        return false;
+    }
+
+    //! Removes a successor from this node
+    bool remove_successor(successor_type&) override {
+        __TBB_ASSERT(false, "Successors must be removed only via ports");
+        return false;
+    }
+
+    template<typename Body>
+    Body copy_function_object() {
+        typedef multifunction_body<input_type, typename base_type::output_ports_type> mfn_body_type;
+        typedef async_body<Input, typename base_type::output_ports_type, gateway_type, Body> async_body_type;
+        mfn_body_type &body_ref = *this->my_body;
+        async_body_type ab = *static_cast<async_body_type*>(dynamic_cast< multifunction_body_leaf<input_type, typename base_type::output_ports_type, async_body_type> & >(body_ref).get_body_ptr());
+        return ab.get_body();
+    }
+
+protected:
+
+    void reset_node( reset_flags f) override {
+       base_type::reset_node(f);
+    }
+};
 
-// indexer node
-#include "detail/_flow_graph_indexer_impl.h"
-
-            // TODO: Implement interface with variadic template or tuple
-            template <typename T0, typename T1 = null_type, typename T2 = null_type, typename T3 = null_type,
-                      typename T4 = null_type, typename T5 = null_type, typename T6 = null_type,
-                      typename T7 = null_type, typename T8 = null_type, typename T9 = null_type>
-            class indexer_node;
-
-            //indexer node specializations
-            template <typename T0>
-            class indexer_node<T0> : public unfolded_indexer_node<std::tuple<T0>> {
-            private:
-                static const int N = 1;
-
-            public:
-                typedef std::tuple<T0> InputTuple;
-                typedef tagged_msg<size_t, T0> output_type;
-                typedef unfolded_indexer_node<InputTuple> unfolded_type;
-                __TBB_NOINLINE_SYM indexer_node(graph &g) : unfolded_type(g) {
-                    fgt_multiinput_node<N>(CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph, this->input_ports(),
-                                           static_cast<sender<output_type> *>(this));
-                }
-
-#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-                template <typename... Args>
-                indexer_node(const node_set<Args...> &nodes) : indexer_node(nodes.graph_reference()) {
-                    make_edges_in_order(nodes, *this);
-                }
-#endif
-
-                // Copy constructor
-                __TBB_NOINLINE_SYM indexer_node(const indexer_node &other) : unfolded_type(other) {
-                    fgt_multiinput_node<N>(CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph, this->input_ports(),
-                                           static_cast<sender<output_type> *>(this));
-                }
-            };
-
-            template <typename T0, typename T1>
-            class indexer_node<T0, T1> : public unfolded_indexer_node<std::tuple<T0, T1>> {
-            private:
-                static const int N = 2;
-
-            public:
-                typedef std::tuple<T0, T1> InputTuple;
-                typedef tagged_msg<size_t, T0, T1> output_type;
-                typedef unfolded_indexer_node<InputTuple> unfolded_type;
-                __TBB_NOINLINE_SYM indexer_node(graph &g) : unfolded_type(g) {
-                    fgt_multiinput_node<N>(CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph, this->input_ports(),
-                                           static_cast<sender<output_type> *>(this));
-                }
-
-#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-                template <typename... Args>
-                indexer_node(const node_set<Args...> &nodes) : indexer_node(nodes.graph_reference()) {
-                    make_edges_in_order(nodes, *this);
-                }
-#endif
-
-                // Copy constructor
-                __TBB_NOINLINE_SYM indexer_node(const indexer_node &other) : unfolded_type(other) {
-                    fgt_multiinput_node<N>(CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph, this->input_ports(),
-                                           static_cast<sender<output_type> *>(this));
-                }
-            };
-
-            template <typename T0, typename T1, typename T2>
-            class indexer_node<T0, T1, T2> : public unfolded_indexer_node<std::tuple<T0, T1, T2>> {
-            private:
-                static const int N = 3;
-
-            public:
-                typedef std::tuple<T0, T1, T2> InputTuple;
-                typedef tagged_msg<size_t, T0, T1, T2> output_type;
-                typedef unfolded_indexer_node<InputTuple> unfolded_type;
-                __TBB_NOINLINE_SYM indexer_node(graph &g) : unfolded_type(g) {
-                    fgt_multiinput_node<N>(CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph, this->input_ports(),
-                                           static_cast<sender<output_type> *>(this));
-                }
-
-#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-                template <typename... Args>
-                indexer_node(const node_set<Args...> &nodes) : indexer_node(nodes.graph_reference()) {
-                    make_edges_in_order(nodes, *this);
-                }
-#endif
-
-                // Copy constructor
-                __TBB_NOINLINE_SYM indexer_node(const indexer_node &other) : unfolded_type(other) {
-                    fgt_multiinput_node<N>(CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph, this->input_ports(),
-                                           static_cast<sender<output_type> *>(this));
-                }
-            };
-
-            template <typename T0, typename T1, typename T2, typename T3>
-            class indexer_node<T0, T1, T2, T3> : public unfolded_indexer_node<std::tuple<T0, T1, T2, T3>> {
-            private:
-                static const int N = 4;
-
-            public:
-                typedef std::tuple<T0, T1, T2, T3> InputTuple;
-                typedef tagged_msg<size_t, T0, T1, T2, T3> output_type;
-                typedef unfolded_indexer_node<InputTuple> unfolded_type;
-                __TBB_NOINLINE_SYM indexer_node(graph &g) : unfolded_type(g) {
-                    fgt_multiinput_node<N>(CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph, this->input_ports(),
-                                           static_cast<sender<output_type> *>(this));
-                }
-
-#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-                template <typename... Args>
-                indexer_node(const node_set<Args...> &nodes) : indexer_node(nodes.graph_reference()) {
-                    make_edges_in_order(nodes, *this);
-                }
-#endif
+#include "detail/_flow_graph_node_set_impl.h"
 
-                // Copy constructor
-                __TBB_NOINLINE_SYM indexer_node(const indexer_node &other) : unfolded_type(other) {
-                    fgt_multiinput_node<N>(CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph, this->input_ports(),
-                                           static_cast<sender<output_type> *>(this));
-                }
-            };
-
-            template <typename T0, typename T1, typename T2, typename T3, typename T4>
-            class indexer_node<T0, T1, T2, T3, T4>
-                : public unfolded_indexer_node<std::tuple<T0, T1, T2, T3, T4>> {
-            private:
-                static const int N = 5;
-
-            public:
-                typedef std::tuple<T0, T1, T2, T3, T4> InputTuple;
-                typedef tagged_msg<size_t, T0, T1, T2, T3, T4> output_type;
-                typedef unfolded_indexer_node<InputTuple> unfolded_type;
-                __TBB_NOINLINE_SYM indexer_node(graph &g) : unfolded_type(g) {
-                    fgt_multiinput_node<N>(CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph, this->input_ports(),
-                                           static_cast<sender<output_type> *>(this));
-                }
+template< typename T >
+class overwrite_node : public graph_node, public receiver<T>, public sender<T> {
+public:
+    typedef T input_type;
+    typedef T output_type;
+    typedef typename receiver<input_type>::predecessor_type predecessor_type;
+    typedef typename sender<output_type>::successor_type successor_type;
+
+    __TBB_NOINLINE_SYM explicit overwrite_node(graph &g)
+        : graph_node(g), my_successors(this), my_buffer_is_valid(false)
+    {
+        fgt_node( CODEPTR(), FLOW_OVERWRITE_NODE, &this->my_graph,
+                  static_cast<receiver<input_type> *>(this), static_cast<sender<output_type> *>(this) );
+    }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-                template <typename... Args>
-                indexer_node(const node_set<Args...> &nodes) : indexer_node(nodes.graph_reference()) {
-                    make_edges_in_order(nodes, *this);
-                }
+    template <typename... Args>
+    overwrite_node(const node_set<Args...>& nodes) : overwrite_node(nodes.graph_reference()) {
+        make_edges_in_order(nodes, *this);
+    }
 #endif
 
-                // Copy constructor
-                __TBB_NOINLINE_SYM indexer_node(const indexer_node &other) : unfolded_type(other) {
-                    fgt_multiinput_node<N>(CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph, this->input_ports(),
-                                           static_cast<sender<output_type> *>(this));
-                }
-            };
-
-#if __TBB_VARIADIC_MAX >= 6
-            template <typename T0, typename T1, typename T2, typename T3, typename T4, typename T5>
-            class indexer_node<T0, T1, T2, T3, T4, T5>
-                : public unfolded_indexer_node<std::tuple<T0, T1, T2, T3, T4, T5>> {
-            private:
-                static const int N = 6;
-
-            public:
-                typedef std::tuple<T0, T1, T2, T3, T4, T5> InputTuple;
-                typedef tagged_msg<size_t, T0, T1, T2, T3, T4, T5> output_type;
-                typedef unfolded_indexer_node<InputTuple> unfolded_type;
-                __TBB_NOINLINE_SYM indexer_node(graph &g) : unfolded_type(g) {
-                    fgt_multiinput_node<N>(CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph, this->input_ports(),
-                                           static_cast<sender<output_type> *>(this));
-                }
-
-#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-                template <typename... Args>
-                indexer_node(const node_set<Args...> &nodes) : indexer_node(nodes.graph_reference()) {
-                    make_edges_in_order(nodes, *this);
-                }
+    //! Copy constructor; doesn't take anything from src; default won't work
+    __TBB_NOINLINE_SYM overwrite_node( const overwrite_node& src ) : overwrite_node(src.my_graph) {}
+
+    ~overwrite_node() {}
+
+    bool register_successor( successor_type &s ) override {
+        spin_mutex::scoped_lock l( my_mutex );
+        if (my_buffer_is_valid && is_graph_active( my_graph )) {
+            // We have a valid value that must be forwarded immediately.
+            bool ret = s.try_put( my_buffer );
+            if ( ret ) {
+                // We add the successor that accepted our put
+                my_successors.register_successor( s );
+            } else {
+                // In case of reservation a race between the moment of reservation and register_successor can appear,
+                // because failed reserve does not mean that register_successor is not ready to put a message immediately.
+                // We have some sort of infinite loop: reserving node tries to set pull state for the edge,
+                // but overwrite_node tries to return push state back. That is why we have to break this loop with task creation.
+                d1::small_object_allocator allocator{};
+                typedef register_predecessor_task task_type;
+                graph_task* t = allocator.new_object<task_type>(graph_reference(), allocator, *this, s);
+                spawn_in_graph_arena( my_graph, *t );
+            }
+        } else {
+            // No valid value yet, just add as successor
+            my_successors.register_successor( s );
+        }
+        return true;
+    }
+
+    bool remove_successor( successor_type &s ) override {
+        spin_mutex::scoped_lock l( my_mutex );
+        my_successors.remove_successor(s);
+        return true;
+    }
+
+    bool try_get( input_type &v ) override {
+        spin_mutex::scoped_lock l( my_mutex );
+        if ( my_buffer_is_valid ) {
+            v = my_buffer;
+            return true;
+        }
+        return false;
+    }
+
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+    bool try_get( input_type &v, message_metainfo& metainfo ) override {
+        spin_mutex::scoped_lock l( my_mutex );
+        if (my_buffer_is_valid) {
+            v = my_buffer;
+            metainfo = my_buffered_metainfo;
+
+            // Since the successor of the node will use move semantics while wrapping the metainfo
+            // that is designed to transfer the ownership of the value from single-push buffer to the task
+            // It is required to reserve one more reference here because the value keeps in the buffer
+            // and the ownership is not transferred
+            for (auto msg_waiter : metainfo.waiters()) {
+                msg_waiter->reserve(1);
+            }
+            return true;
+        }
+        return false;
+    }
 #endif
 
-                // Copy constructor
-                __TBB_NOINLINE_SYM indexer_node(const indexer_node &other) : unfolded_type(other) {
-                    fgt_multiinput_node<N>(CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph, this->input_ports(),
-                                           static_cast<sender<output_type> *>(this));
-                }
-            };
-#endif//variadic max 6
-
-#if __TBB_VARIADIC_MAX >= 7
-            template <typename T0, typename T1, typename T2, typename T3, typename T4, typename T5,
-                      typename T6>
-            class indexer_node<T0, T1, T2, T3, T4, T5, T6>
-                : public unfolded_indexer_node<std::tuple<T0, T1, T2, T3, T4, T5, T6>> {
-            private:
-                static const int N = 7;
-
-            public:
-                typedef std::tuple<T0, T1, T2, T3, T4, T5, T6> InputTuple;
-                typedef tagged_msg<size_t, T0, T1, T2, T3, T4, T5, T6> output_type;
-                typedef unfolded_indexer_node<InputTuple> unfolded_type;
-                __TBB_NOINLINE_SYM indexer_node(graph &g) : unfolded_type(g) {
-                    fgt_multiinput_node<N>(CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph, this->input_ports(),
-                                           static_cast<sender<output_type> *>(this));
-                }
-
-#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-                template <typename... Args>
-                indexer_node(const node_set<Args...> &nodes) : indexer_node(nodes.graph_reference()) {
-                    make_edges_in_order(nodes, *this);
-                }
+    //! Reserves an item
+    bool try_reserve( T &v ) override {
+        return try_get(v);
+    }
+
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+private:
+    bool try_reserve(T& v, message_metainfo& metainfo) override {
+        spin_mutex::scoped_lock l( my_mutex );
+        if (my_buffer_is_valid) {
+            v = my_buffer;
+            metainfo = my_buffered_metainfo;
+            return true;
+        }
+        return false;
+    }
+public:
 #endif
 
-                // Copy constructor
-                __TBB_NOINLINE_SYM indexer_node(const indexer_node &other) : unfolded_type(other) {
-                    fgt_multiinput_node<N>(CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph, this->input_ports(),
-                                           static_cast<sender<output_type> *>(this));
-                }
-            };
-#endif//variadic max 7
-
-#if __TBB_VARIADIC_MAX >= 8
-            template <typename T0, typename T1, typename T2, typename T3, typename T4, typename T5,
-                      typename T6, typename T7>
-            class indexer_node<T0, T1, T2, T3, T4, T5, T6, T7>
-                : public unfolded_indexer_node<std::tuple<T0, T1, T2, T3, T4, T5, T6, T7>> {
-            private:
-                static const int N = 8;
-
-            public:
-                typedef std::tuple<T0, T1, T2, T3, T4, T5, T6, T7> InputTuple;
-                typedef tagged_msg<size_t, T0, T1, T2, T3, T4, T5, T6, T7> output_type;
-                typedef unfolded_indexer_node<InputTuple> unfolded_type;
-                indexer_node(graph &g) : unfolded_type(g) {
-                    fgt_multiinput_node<N>(CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph, this->input_ports(),
-                                           static_cast<sender<output_type> *>(this));
-                }
-
-#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-                template <typename... Args>
-                indexer_node(const node_set<Args...> &nodes) : indexer_node(nodes.graph_reference()) {
-                    make_edges_in_order(nodes, *this);
-                }
+    //! Releases the reserved item
+    bool try_release() override { return true; }
+
+    //! Consumes the reserved item
+    bool try_consume() override { return true; }
+
+    bool is_valid() {
+       spin_mutex::scoped_lock l( my_mutex );
+       return my_buffer_is_valid;
+    }
+
+    void clear() {
+       spin_mutex::scoped_lock l( my_mutex );
+       my_buffer_is_valid = false;
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+       for (auto msg_waiter : my_buffered_metainfo.waiters()) {
+           msg_waiter->release(1);
+       }
+       my_buffered_metainfo = message_metainfo{};
 #endif
-
-                // Copy constructor
-                indexer_node(const indexer_node &other) : unfolded_type(other) {
-                    fgt_multiinput_node<N>(CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph, this->input_ports(),
-                                           static_cast<sender<output_type> *>(this));
-                }
-            };
-#endif//variadic max 8
-
-#if __TBB_VARIADIC_MAX >= 9
-            template <typename T0, typename T1, typename T2, typename T3, typename T4, typename T5,
-                      typename T6, typename T7, typename T8>
-            class indexer_node<T0, T1, T2, T3, T4, T5, T6, T7, T8>
-                : public unfolded_indexer_node<std::tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8>> {
-            private:
-                static const int N = 9;
-
-            public:
-                typedef std::tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8> InputTuple;
-                typedef tagged_msg<size_t, T0, T1, T2, T3, T4, T5, T6, T7, T8> output_type;
-                typedef unfolded_indexer_node<InputTuple> unfolded_type;
-                __TBB_NOINLINE_SYM indexer_node(graph &g) : unfolded_type(g) {
-                    fgt_multiinput_node<N>(CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph, this->input_ports(),
-                                           static_cast<sender<output_type> *>(this));
-                }
-
-#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-                template <typename... Args>
-                indexer_node(const node_set<Args...> &nodes) : indexer_node(nodes.graph_reference()) {
-                    make_edges_in_order(nodes, *this);
-                }
+    }
+
+protected:
+
+    template< typename R, typename B > friend class run_and_put_task;
+    template<typename X, typename Y> friend class broadcast_cache;
+    template<typename X, typename Y> friend class round_robin_cache;
+    graph_task* try_put_task( const input_type &v ) override {
+        spin_mutex::scoped_lock l( my_mutex );
+        return try_put_task_impl(v __TBB_FLOW_GRAPH_METAINFO_ARG(message_metainfo{}));
+    }
+
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+    graph_task* try_put_task(const input_type& v, const message_metainfo& metainfo) override {
+        spin_mutex::scoped_lock l( my_mutex );
+        return try_put_task_impl(v, metainfo);
+    }
 #endif
 
-                // Copy constructor
-                __TBB_NOINLINE_SYM indexer_node(const indexer_node &other) : unfolded_type(other) {
-                    fgt_multiinput_node<N>(CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph, this->input_ports(),
-                                           static_cast<sender<output_type> *>(this));
-                }
-            };
-#endif//variadic max 9
-
-#if __TBB_VARIADIC_MAX >= 10
-            template <typename T0, typename T1, typename T2, typename T3, typename T4, typename T5,
-                      typename T6, typename T7, typename T8, typename T9>
-            class indexer_node /*default*/ : public unfolded_indexer_node<
-                                                     std::tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>> {
-            private:
-                static const int N = 10;
-
-            public:
-                typedef std::tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> InputTuple;
-                typedef tagged_msg<size_t, T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> output_type;
-                typedef unfolded_indexer_node<InputTuple> unfolded_type;
-                __TBB_NOINLINE_SYM indexer_node(graph &g) : unfolded_type(g) {
-                    fgt_multiinput_node<N>(CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph, this->input_ports(),
-                                           static_cast<sender<output_type> *>(this));
-                }
-
-#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-                template <typename... Args>
-                indexer_node(const node_set<Args...> &nodes) : indexer_node(nodes.graph_reference()) {
-                    make_edges_in_order(nodes, *this);
-                }
+    graph_task * try_put_task_impl(const input_type &v __TBB_FLOW_GRAPH_METAINFO_ARG(const message_metainfo& metainfo)) {
+        my_buffer = v;
+        my_buffer_is_valid = true;
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+        // Since the new item is pushed to the buffer - reserving the waiters
+        for (auto msg_waiter : metainfo.waiters()) {
+            msg_waiter->reserve(1);
+        }
+
+        // Since the item is taken out from the buffer - releasing the stored waiters
+        for (auto msg_waiter : my_buffered_metainfo.waiters()) {
+            msg_waiter->release(1);
+        }
+
+        my_buffered_metainfo = metainfo;
 #endif
-
-                // Copy constructor
-                __TBB_NOINLINE_SYM indexer_node(const indexer_node &other) : unfolded_type(other) {
-                    fgt_multiinput_node<N>(CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph, this->input_ports(),
-                                           static_cast<sender<output_type> *>(this));
-                }
-            };
-#endif//variadic max 10
-
-            template <typename T>
-            inline void internal_make_edge(sender<T> &p, receiver<T> &s) {
-                register_successor(p, s);
-                fgt_make_edge(&p, &s);
-            }
-
-            //! Makes an edge between a single predecessor and a single successor
-            template <typename T>
-            inline void make_edge(sender<T> &p, receiver<T> &s) {
-                internal_make_edge(p, s);
-            }
-
-            //Makes an edge from port 0 of a multi-output predecessor to port 0 of a multi-input successor.
-            template <typename T, typename V, typename = typename T::output_ports_type,
-                      typename = typename V::input_ports_type>
-            inline void make_edge(T &output, V &input) {
-                make_edge(std::get<0>(output.output_ports()), std::get<0>(input.input_ports()));
-            }
-
-            //Makes an edge from port 0 of a multi-output predecessor to a receiver.
-            template <typename T, typename R, typename = typename T::output_ports_type>
-            inline void make_edge(T &output, receiver<R> &input) {
-                make_edge(std::get<0>(output.output_ports()), input);
-            }
-
-            //Makes an edge from a sender to port 0 of a multi-input successor.
-            template <typename S, typename V, typename = typename V::input_ports_type>
-            inline void make_edge(sender<S> &output, V &input) {
-                make_edge(output, std::get<0>(input.input_ports()));
-            }
-
-            template <typename T>
-            inline void internal_remove_edge(sender<T> &p, receiver<T> &s) {
-                remove_successor(p, s);
-                fgt_remove_edge(&p, &s);
-            }
-
-            //! Removes an edge between a single predecessor and a single successor
-            template <typename T>
-            inline void remove_edge(sender<T> &p, receiver<T> &s) {
-                internal_remove_edge(p, s);
-            }
-
-            //Removes an edge between port 0 of a multi-output predecessor and port 0 of a multi-input successor.
-            template <typename T, typename V, typename = typename T::output_ports_type,
-                      typename = typename V::input_ports_type>
-            inline void remove_edge(T &output, V &input) {
-                remove_edge(std::get<0>(output.output_ports()), std::get<0>(input.input_ports()));
-            }
-
-            //Removes an edge between port 0 of a multi-output predecessor and a receiver.
-            template <typename T, typename R, typename = typename T::output_ports_type>
-            inline void remove_edge(T &output, receiver<R> &input) {
-                remove_edge(std::get<0>(output.output_ports()), input);
-            }
-            //Removes an edge between a sender and port 0 of a multi-input successor.
-            template <typename S, typename V, typename = typename V::input_ports_type>
-            inline void remove_edge(sender<S> &output, V &input) {
-                remove_edge(output, std::get<0>(input.input_ports()));
-            }
-
-            //! Returns a copy of the body from a function or continue node
-            template <typename Body, typename Node>
-            Body copy_body(Node &n) {
-                return n.template copy_function_object<Body>();
+        graph_task* rtask = my_successors.try_put_task(v __TBB_FLOW_GRAPH_METAINFO_ARG(my_buffered_metainfo) );
+        if (!rtask) rtask = SUCCESSFULLY_ENQUEUED;
+        return rtask;
+    }
+
+    graph& graph_reference() const override {
+        return my_graph;
+    }
+
+    //! Breaks an infinite loop between the node reservation and register_successor call
+    struct register_predecessor_task : public graph_task {
+        register_predecessor_task(
+            graph& g, d1::small_object_allocator& allocator, predecessor_type& owner, successor_type& succ)
+            : graph_task(g, allocator), o(owner), s(succ) {};
+
+        d1::task* execute(d1::execution_data& ed) override {
+            // TODO revamp: investigate why qualification is needed for register_successor() call
+            using tbb::detail::d2::register_predecessor;
+            using tbb::detail::d2::register_successor;
+            if ( !register_predecessor(s, o) ) {
+                register_successor(o, s);
             }
-
-            //composite_node
-            template <typename InputTuple, typename OutputTuple>
-            class composite_node;
-
-            template <typename... InputTypes, typename... OutputTypes>
-            class composite_node<std::tuple<InputTypes...>, std::tuple<OutputTypes...>> : public graph_node {
-
-            public:
-                typedef std::tuple<receiver<InputTypes> &...> input_ports_type;
-                typedef std::tuple<sender<OutputTypes> &...> output_ports_type;
-
-            private:
-                std::unique_ptr<input_ports_type> my_input_ports;
-                std::unique_ptr<output_ports_type> my_output_ports;
-
-                static const size_t NUM_INPUTS = sizeof...(InputTypes);
-                static const size_t NUM_OUTPUTS = sizeof...(OutputTypes);
-
-            protected:
-                void reset_node(reset_flags) override {}
-
-            public:
-                composite_node(graph &g) : graph_node(g) {
-                    fgt_multiinput_multioutput_node(CODEPTR(), FLOW_COMPOSITE_NODE, this, &this->my_graph);
-                }
-
-                template <typename T1, typename T2>
-                void set_external_ports(T1 &&input_ports_tuple, T2 &&output_ports_tuple) {
-                    static_assert(NUM_INPUTS == std::tuple_size<input_ports_type>::value,
-                                  "number of arguments does not match number of input ports");
-                    static_assert(NUM_OUTPUTS == std::tuple_size<output_ports_type>::value,
-                                  "number of arguments does not match number of output ports");
-
-                    fgt_internal_input_alias_helper<T1, NUM_INPUTS>::alias_port(this, input_ports_tuple);
-                    fgt_internal_output_alias_helper<T2, NUM_OUTPUTS>::alias_port(this, output_ports_tuple);
-
-                    my_input_ports.reset(new input_ports_type(std::forward<T1>(input_ports_tuple)));
-                    my_output_ports.reset(new output_ports_type(std::forward<T2>(output_ports_tuple)));
-                }
-
-                template <typename... NodeTypes>
-                void add_visible_nodes(const NodeTypes &...n) {
-                    add_nodes_impl(this, true, n...);
-                }
-
-                template <typename... NodeTypes>
-                void add_nodes(const NodeTypes &...n) {
-                    add_nodes_impl(this, false, n...);
-                }
-
-                input_ports_type &input_ports() {
-                    __TBB_ASSERT(my_input_ports,
-                                 "input ports not set, call set_external_ports to set input ports");
-                    return *my_input_ports;
-                }
-
-                output_ports_type &output_ports() {
-                    __TBB_ASSERT(my_output_ports,
-                                 "output ports not set, call set_external_ports to set output ports");
-                    return *my_output_ports;
-                }
-            };// class composite_node
-
-            //composite_node with only input ports
-            template <typename... InputTypes>
-            class composite_node<std::tuple<InputTypes...>, std::tuple<>> : public graph_node {
-            public:
-                typedef std::tuple<receiver<InputTypes> &...> input_ports_type;
-
-            private:
-                std::unique_ptr<input_ports_type> my_input_ports;
-                static const size_t NUM_INPUTS = sizeof...(InputTypes);
-
-            protected:
-                void reset_node(reset_flags) override {}
-
-            public:
-                composite_node(graph &g) : graph_node(g) { fgt_composite(CODEPTR(), this, &g); }
-
-                template <typename T>
-                void set_external_ports(T &&input_ports_tuple) {
-                    static_assert(NUM_INPUTS == std::tuple_size<input_ports_type>::value,
-                                  "number of arguments does not match number of input ports");
-
-                    fgt_internal_input_alias_helper<T, NUM_INPUTS>::alias_port(this, input_ports_tuple);
-
-                    my_input_ports.reset(new input_ports_type(std::forward<T>(input_ports_tuple)));
-                }
-
-                template <typename... NodeTypes>
-                void add_visible_nodes(const NodeTypes &...n) {
-                    add_nodes_impl(this, true, n...);
-                }
-
-                template <typename... NodeTypes>
-                void add_nodes(const NodeTypes &...n) {
-                    add_nodes_impl(this, false, n...);
-                }
-
-                input_ports_type &input_ports() {
-                    __TBB_ASSERT(my_input_ports,
-                                 "input ports not set, call set_external_ports to set input ports");
-                    return *my_input_ports;
-                }
-
-            };// class composite_node
-
-            //composite_nodes with only output_ports
-            template <typename... OutputTypes>
-            class composite_node<std::tuple<>, std::tuple<OutputTypes...>> : public graph_node {
-            public:
-                typedef std::tuple<sender<OutputTypes> &...> output_ports_type;
-
-            private:
-                std::unique_ptr<output_ports_type> my_output_ports;
-                static const size_t NUM_OUTPUTS = sizeof...(OutputTypes);
-
-            protected:
-                void reset_node(reset_flags) override {}
-
-            public:
-                __TBB_NOINLINE_SYM composite_node(graph &g) : graph_node(g) {
-                    fgt_composite(CODEPTR(), this, &g);
-                }
-
-                template <typename T>
-                void set_external_ports(T &&output_ports_tuple) {
-                    static_assert(NUM_OUTPUTS == std::tuple_size<output_ports_type>::value,
-                                  "number of arguments does not match number of output ports");
-
-                    fgt_internal_output_alias_helper<T, NUM_OUTPUTS>::alias_port(this, output_ports_tuple);
-
-                    my_output_ports.reset(new output_ports_type(std::forward<T>(output_ports_tuple)));
-                }
-
-                template <typename... NodeTypes>
-                void add_visible_nodes(const NodeTypes &...n) {
-                    add_nodes_impl(this, true, n...);
-                }
-
-                template <typename... NodeTypes>
-                void add_nodes(const NodeTypes &...n) {
-                    add_nodes_impl(this, false, n...);
-                }
-
-                output_ports_type &output_ports() {
-                    __TBB_ASSERT(my_output_ports,
-                                 "output ports not set, call set_external_ports to set output ports");
-                    return *my_output_ports;
-                }
-
-            };// class composite_node
-
-            template <typename Gateway>
-            class async_body_base : no_assign {
-            public:
-                typedef Gateway gateway_type;
-
-                async_body_base(gateway_type *gateway) : my_gateway(gateway) {}
-                void set_gateway(gateway_type *gateway) { my_gateway = gateway; }
-
-            protected:
-                gateway_type *my_gateway;
-            };
-
-            template <typename Input, typename Ports, typename Gateway, typename Body>
-            class async_body : public async_body_base<Gateway> {
-            public:
-                typedef async_body_base<Gateway> base_type;
-                typedef Gateway gateway_type;
-
-                async_body(const Body &body, gateway_type *gateway) : base_type(gateway), my_body(body) {}
-
-                void operator()(const Input &v, Ports &) { my_body(v, *this->my_gateway); }
-
-                Body get_body() { return my_body; }
-
-            private:
-                Body my_body;
-            };
-
-            //! Implements async node
-            template <typename Input, typename Output, typename Policy = queueing_lightweight>
-            __TBB_requires(
-                    std::default_initializable<Input> &&std::copy_constructible<Input>) class async_node
-                : public multifunction_node<Input, std::tuple<Output>, Policy>,
-                  public sender<Output> {
-                typedef multifunction_node<Input, std::tuple<Output>, Policy> base_type;
-                typedef multifunction_input<Input, typename base_type::output_ports_type, Policy,
-                                            cache_aligned_allocator<Input>>
-                        mfn_input_type;
-
-            public:
-                typedef Input input_type;
-                typedef Output output_type;
-                typedef receiver<input_type> receiver_type;
-                typedef receiver<output_type> successor_type;
-                typedef sender<input_type> predecessor_type;
-                typedef receiver_gateway<output_type> gateway_type;
-                typedef async_body_base<gateway_type> async_body_base_type;
-                typedef typename base_type::output_ports_type output_ports_type;
-
-            private:
-                class receiver_gateway_impl : public receiver_gateway<Output> {
-                public:
-                    receiver_gateway_impl(async_node *node) : my_node(node) {}
-                    void reserve_wait() override {
-                        fgt_async_reserve(static_cast<typename async_node::receiver_type *>(my_node),
-                                          &my_node->my_graph);
-                        my_node->my_graph.reserve_wait();
-                    }
-
-                    void release_wait() override {
-                        async_node *n = my_node;
-                        graph *g = &n->my_graph;
-                        g->release_wait();
-                        fgt_async_commit(static_cast<typename async_node::receiver_type *>(n), g);
-                    }
-
-                    //! Implements gateway_type::try_put for an external activity to submit a message to FG
-                    bool try_put(const Output &i) override { return my_node->try_put_impl(i); }
-
-                private:
-                    async_node *my_node;
-                } my_gateway;
-
-                //The substitute of 'this' for member construction, to prevent compiler warnings
-                async_node *self() { return this; }
-
-                //! Implements gateway_type::try_put for an external activity to submit a message to FG
-                bool try_put_impl(const Output &i) {
-                    multifunction_output<Output> &port_0 = output_port<0>(*this);
-                    broadcast_cache<output_type> &port_successors = port_0.successors();
-                    fgt_async_try_put_begin(this, &port_0);
-                    // TODO revamp: change to std::list<graph_task*>
-                    graph_task_list tasks;
-                    bool is_at_least_one_put_successful
-                            = port_successors.gather_successful_try_puts(i, tasks);
-                    __TBB_ASSERT(is_at_least_one_put_successful || tasks.empty(),
-                                 "Return status is inconsistent with the method operation.");
-
-                    while (!tasks.empty()) { enqueue_in_graph_arena(this->my_graph, tasks.pop_front()); }
-                    fgt_async_try_put_end(this, &port_0);
-                    return is_at_least_one_put_successful;
-                }
-
-            public:
-                template <typename Body>
-                __TBB_requires(async_node_body<Body, input_type, gateway_type>) __TBB_NOINLINE_SYM
-                        async_node(graph &g, size_t concurrency, Body body, Policy = Policy(),
-                                   node_priority_t a_priority = no_priority)
-                    : base_type(g, concurrency,
-                                async_body<Input, typename base_type::output_ports_type, gateway_type, Body>(
-                                        body, &my_gateway),
-                                a_priority),
-                      my_gateway(self()) {
-                    fgt_multioutput_node_with_body<1>(CODEPTR(), FLOW_ASYNC_NODE, &this->my_graph,
-                                                      static_cast<receiver<input_type> *>(this),
-                                                      this->output_ports(), this->my_body);
-                }
-
-                template <typename Body>
-                __TBB_requires(async_node_body<Body, input_type, gateway_type>) __TBB_NOINLINE_SYM
-                        async_node(graph &g, size_t concurrency, Body body, node_priority_t a_priority)
-                    : async_node(g, concurrency, body, Policy(), a_priority) {}
-
-#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-                template <typename Body, typename... Args>
-                __TBB_requires(async_node_body<Body, input_type, gateway_type>) __TBB_NOINLINE_SYM
-                        async_node(const node_set<Args...> &nodes, size_t concurrency, Body body,
-                                   Policy = Policy(), node_priority_t a_priority = no_priority)
-                    : async_node(nodes.graph_reference(), concurrency, body, a_priority) {
-                    make_edges_in_order(nodes, *this);
-                }
-
-                template <typename Body, typename... Args>
-                __TBB_requires(async_node_body<Body, input_type, gateway_type>) __TBB_NOINLINE_SYM
-                        async_node(const node_set<Args...> &nodes, size_t concurrency, Body body,
-                                   node_priority_t a_priority)
-                    : async_node(nodes, concurrency, body, Policy(), a_priority) {}
-#endif// __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-
-                __TBB_NOINLINE_SYM async_node(const async_node &other)
-                    : base_type(other), sender<Output>(), my_gateway(self()) {
-                    static_cast<async_body_base_type *>(this->my_body->get_body_ptr())
-                            ->set_gateway(&my_gateway);
-                    static_cast<async_body_base_type *>(this->my_init_body->get_body_ptr())
-                            ->set_gateway(&my_gateway);
-
-                    fgt_multioutput_node_with_body<1>(CODEPTR(), FLOW_ASYNC_NODE, &this->my_graph,
-                                                      static_cast<receiver<input_type> *>(this),
-                                                      this->output_ports(), this->my_body);
-                }
-
-                gateway_type &gateway() { return my_gateway; }
-
-                // Define sender< Output >
-
-                //! Add a new successor to this node
-                bool register_successor(successor_type &) override {
-                    __TBB_ASSERT(false, "Successors must be registered only via ports");
-                    return false;
-                }
-
-                //! Removes a successor from this node
-                bool remove_successor(successor_type &) override {
-                    __TBB_ASSERT(false, "Successors must be removed only via ports");
-                    return false;
-                }
-
-                template <typename Body>
-                Body copy_function_object() {
-                    typedef multifunction_body<input_type, typename base_type::output_ports_type>
-                            mfn_body_type;
-                    typedef async_body<Input, typename base_type::output_ports_type, gateway_type, Body>
-                            async_body_type;
-                    mfn_body_type &body_ref = *this->my_body;
-                    async_body_type ab = *static_cast<async_body_type *>(
-                            dynamic_cast<multifunction_body_leaf<
-                                    input_type, typename base_type::output_ports_type, async_body_type> &>(
-                                    body_ref)
-                                    .get_body_ptr());
-                    return ab.get_body();
-                }
-
-            protected:
-                void reset_node(reset_flags f) override { base_type::reset_node(f); }
-            };
-
-#include "detail/_flow_graph_node_set_impl.h"
-
-            template <typename T>
-            class overwrite_node : public graph_node, public receiver<T>, public sender<T> {
-            public:
-                typedef T input_type;
-                typedef T output_type;
-                typedef typename receiver<input_type>::predecessor_type predecessor_type;
-                typedef typename sender<output_type>::successor_type successor_type;
-
-                __TBB_NOINLINE_SYM explicit overwrite_node(graph &g)
-                    : graph_node(g), my_successors(this), my_buffer_is_valid(false) {
-                    fgt_node(CODEPTR(), FLOW_OVERWRITE_NODE, &this->my_graph,
-                             static_cast<receiver<input_type> *>(this),
-                             static_cast<sender<output_type> *>(this));
-                }
-
-#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-                template <typename... Args>
-                overwrite_node(const node_set<Args...> &nodes) : overwrite_node(nodes.graph_reference()) {
-                    make_edges_in_order(nodes, *this);
-                }
+            finalize<register_predecessor_task>(ed);
+            return nullptr;
+        }
+
+        d1::task* cancel(d1::execution_data& ed) override {
+            finalize<register_predecessor_task>(ed);
+            return nullptr;
+        }
+
+        predecessor_type& o;
+        successor_type& s;
+    };
+
+    spin_mutex my_mutex;
+    broadcast_cache< input_type, null_rw_mutex > my_successors;
+    input_type my_buffer;
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+    message_metainfo my_buffered_metainfo;
 #endif
-
-                //! Copy constructor; doesn't take anything from src; default won't work
-                __TBB_NOINLINE_SYM overwrite_node(const overwrite_node &src) : overwrite_node(src.my_graph) {}
-
-                ~overwrite_node() {}
-
-                bool register_successor(successor_type &s) override {
-                    spin_mutex::scoped_lock l(my_mutex);
-                    if (my_buffer_is_valid && is_graph_active(my_graph)) {
-                        // We have a valid value that must be forwarded immediately.
-                        bool ret = s.try_put(my_buffer);
-                        if (ret) {
-                            // We add the successor that accepted our put
-                            my_successors.register_successor(s);
-                        } else {
-                            // In case of reservation a race between the moment of reservation and register_successor can appear,
-                            // because failed reserve does not mean that register_successor is not ready to put a message immediately.
-                            // We have some sort of infinite loop: reserving node tries to set pull state for the edge,
-                            // but overwrite_node tries to return push state back. That is why we have to break this loop with task creation.
-                            small_object_allocator allocator {};
-                            typedef register_predecessor_task task_type;
-                            graph_task *t
-                                    = allocator.new_object<task_type>(graph_reference(), allocator, *this, s);
-                            graph_reference().reserve_wait();
-                            spawn_in_graph_arena(my_graph, *t);
-                        }
-                    } else {
-                        // No valid value yet, just add as successor
-                        my_successors.register_successor(s);
-                    }
-                    return true;
-                }
-
-                bool remove_successor(successor_type &s) override {
-                    spin_mutex::scoped_lock l(my_mutex);
-                    my_successors.remove_successor(s);
-                    return true;
-                }
-
-                bool try_get(input_type &v) override {
-                    spin_mutex::scoped_lock l(my_mutex);
-                    if (my_buffer_is_valid) {
-                        v = my_buffer;
-                        return true;
-                    }
-                    return false;
-                }
-
-                //! Reserves an item
-                bool try_reserve(T &v) override { return try_get(v); }
-
-                //! Releases the reserved item
-                bool try_release() override { return true; }
-
-                //! Consumes the reserved item
-                bool try_consume() override { return true; }
-
-                bool is_valid() {
-                    spin_mutex::scoped_lock l(my_mutex);
-                    return my_buffer_is_valid;
-                }
-
-                void clear() {
-                    spin_mutex::scoped_lock l(my_mutex);
-                    my_buffer_is_valid = false;
-                }
-
-            protected:
-                template <typename R, typename B>
-                friend class run_and_put_task;
-                template <typename X, typename Y>
-                friend class broadcast_cache;
-                template <typename X, typename Y>
-                friend class round_robin_cache;
-                graph_task *try_put_task(const input_type &v) override {
-                    spin_mutex::scoped_lock l(my_mutex);
-                    return try_put_task_impl(v);
-                }
-
-                graph_task *try_put_task_impl(const input_type &v) {
-                    my_buffer = v;
-                    my_buffer_is_valid = true;
-                    graph_task *rtask = my_successors.try_put_task(v);
-                    if (!rtask) rtask = SUCCESSFULLY_ENQUEUED;
-                    return rtask;
-                }
-
-                graph &graph_reference() const override { return my_graph; }
-
-                //! Breaks an infinite loop between the node reservation and register_successor call
-                struct register_predecessor_task : public graph_task {
-                    register_predecessor_task(graph &g, small_object_allocator &allocator,
-                                              predecessor_type &owner, successor_type &succ)
-                        : graph_task(g, allocator), o(owner), s(succ) {};
-
-                    task *execute(execution_data &ed) override {
-                        // TODO revamp: investigate why qualification is needed for register_successor() call
-                        using tbb::detail::d1::register_predecessor;
-                        using tbb::detail::d1::register_successor;
-                        if (!register_predecessor(s, o)) { register_successor(o, s); }
-                        finalize(ed);
-                        return nullptr;
-                    }
-
-                    predecessor_type &o;
-                    successor_type &s;
-                };
-
-                spin_mutex my_mutex;
-                broadcast_cache<input_type, null_rw_mutex> my_successors;
-                input_type my_buffer;
-                bool my_buffer_is_valid;
-
-                void reset_node(reset_flags f) override {
-                    my_buffer_is_valid = false;
-                    if (f & rf_clear_edges) { my_successors.clear(); }
-                }
-            };// overwrite_node
-
-            template <typename T>
-            class write_once_node : public overwrite_node<T> {
-            public:
-                typedef T input_type;
-                typedef T output_type;
-                typedef overwrite_node<T> base_type;
-                typedef typename receiver<input_type>::predecessor_type predecessor_type;
-                typedef typename sender<output_type>::successor_type successor_type;
-
-                //! Constructor
-                __TBB_NOINLINE_SYM explicit write_once_node(graph &g) : base_type(g) {
-                    fgt_node(CODEPTR(), FLOW_WRITE_ONCE_NODE, &(this->my_graph),
-                             static_cast<receiver<input_type> *>(this),
-                             static_cast<sender<output_type> *>(this));
-                }
+    bool my_buffer_is_valid;
+
+    void reset_node( reset_flags f) override {
+        my_buffer_is_valid = false;
+       if (f&rf_clear_edges) {
+           my_successors.clear();
+       }
+    }
+};  // overwrite_node
+
+template< typename T >
+class write_once_node : public overwrite_node<T> {
+public:
+    typedef T input_type;
+    typedef T output_type;
+    typedef overwrite_node<T> base_type;
+    typedef typename receiver<input_type>::predecessor_type predecessor_type;
+    typedef typename sender<output_type>::successor_type successor_type;
+
+    //! Constructor
+    __TBB_NOINLINE_SYM explicit write_once_node(graph& g) : base_type(g) {
+        fgt_node( CODEPTR(), FLOW_WRITE_ONCE_NODE, &(this->my_graph),
+                                 static_cast<receiver<input_type> *>(this),
+                                 static_cast<sender<output_type> *>(this) );
+    }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-                template <typename... Args>
-                write_once_node(const node_set<Args...> &nodes) : write_once_node(nodes.graph_reference()) {
-                    make_edges_in_order(nodes, *this);
-                }
+    template <typename... Args>
+    write_once_node(const node_set<Args...>& nodes) : write_once_node(nodes.graph_reference()) {
+        make_edges_in_order(nodes, *this);
+    }
 #endif
 
-                //! Copy constructor: call base class copy constructor
-                __TBB_NOINLINE_SYM write_once_node(const write_once_node &src) : base_type(src) {
-                    fgt_node(CODEPTR(), FLOW_WRITE_ONCE_NODE, &(this->my_graph),
-                             static_cast<receiver<input_type> *>(this),
-                             static_cast<sender<output_type> *>(this));
-                }
-
-            protected:
-                template <typename R, typename B>
-                friend class run_and_put_task;
-                template <typename X, typename Y>
-                friend class broadcast_cache;
-                template <typename X, typename Y>
-                friend class round_robin_cache;
-                graph_task *try_put_task(const T &v) override {
-                    spin_mutex::scoped_lock l(this->my_mutex);
-                    return this->my_buffer_is_valid ? NULL : this->try_put_task_impl(v);
-                }
-            };// write_once_node
-
-            inline void set_name(const graph &g, const char *name) { fgt_graph_desc(&g, name); }
-
-            template <typename Output>
-            inline void set_name(const input_node<Output> &node, const char *name) {
-                fgt_node_desc(&node, name);
-            }
-
-            template <typename Input, typename Output, typename Policy>
-            inline void set_name(const function_node<Input, Output, Policy> &node, const char *name) {
-                fgt_node_desc(&node, name);
-            }
-
-            template <typename Output, typename Policy>
-            inline void set_name(const continue_node<Output, Policy> &node, const char *name) {
-                fgt_node_desc(&node, name);
-            }
-
-            template <typename T>
-            inline void set_name(const broadcast_node<T> &node, const char *name) {
-                fgt_node_desc(&node, name);
-            }
-
-            template <typename T>
-            inline void set_name(const buffer_node<T> &node, const char *name) {
-                fgt_node_desc(&node, name);
-            }
-
-            template <typename T>
-            inline void set_name(const queue_node<T> &node, const char *name) {
-                fgt_node_desc(&node, name);
-            }
-
-            template <typename T>
-            inline void set_name(const sequencer_node<T> &node, const char *name) {
-                fgt_node_desc(&node, name);
-            }
-
-            template <typename T, typename Compare>
-            inline void set_name(const priority_queue_node<T, Compare> &node, const char *name) {
-                fgt_node_desc(&node, name);
-            }
-
-            template <typename T, typename DecrementType>
-            inline void set_name(const limiter_node<T, DecrementType> &node, const char *name) {
-                fgt_node_desc(&node, name);
-            }
-
-            template <typename OutputTuple, typename JP>
-            inline void set_name(const join_node<OutputTuple, JP> &node, const char *name) {
-                fgt_node_desc(&node, name);
-            }
-
-            template <typename... Types>
-            inline void set_name(const indexer_node<Types...> &node, const char *name) {
-                fgt_node_desc(&node, name);
-            }
-
-            template <typename T>
-            inline void set_name(const overwrite_node<T> &node, const char *name) {
-                fgt_node_desc(&node, name);
-            }
-
-            template <typename T>
-            inline void set_name(const write_once_node<T> &node, const char *name) {
-                fgt_node_desc(&node, name);
-            }
-
-            template <typename Input, typename Output, typename Policy>
-            inline void set_name(const multifunction_node<Input, Output, Policy> &node, const char *name) {
-                fgt_multioutput_node_desc(&node, name);
-            }
-
-            template <typename TupleType>
-            inline void set_name(const split_node<TupleType> &node, const char *name) {
-                fgt_multioutput_node_desc(&node, name);
-            }
-
-            template <typename InputTuple, typename OutputTuple>
-            inline void set_name(const composite_node<InputTuple, OutputTuple> &node, const char *name) {
-                fgt_multiinput_multioutput_node_desc(&node, name);
-            }
+    //! Copy constructor: call base class copy constructor
+    __TBB_NOINLINE_SYM write_once_node( const write_once_node& src ) : base_type(src) {
+        fgt_node( CODEPTR(), FLOW_WRITE_ONCE_NODE, &(this->my_graph),
+                                 static_cast<receiver<input_type> *>(this),
+                                 static_cast<sender<output_type> *>(this) );
+    }
+
+protected:
+    template< typename R, typename B > friend class run_and_put_task;
+    template<typename X, typename Y> friend class broadcast_cache;
+    template<typename X, typename Y> friend class round_robin_cache;
+    graph_task *try_put_task( const T &v ) override {
+        spin_mutex::scoped_lock l( this->my_mutex );
+        return this->my_buffer_is_valid ? nullptr : this->try_put_task_impl(v __TBB_FLOW_GRAPH_METAINFO_ARG(message_metainfo{}));
+    }
+
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+    graph_task* try_put_task(const T& v, const message_metainfo& metainfo) override {
+        spin_mutex::scoped_lock l( this->my_mutex );
+        return this->my_buffer_is_valid ? nullptr : this->try_put_task_impl(v, metainfo);
+    }
+#endif
+}; // write_once_node
+
+inline void set_name(const graph& g, const char *name) {
+    fgt_graph_desc(&g, name);
+}
+
+template <typename Output>
+inline void set_name(const input_node<Output>& node, const char *name) {
+    fgt_node_desc(&node, name);
+}
+
+template <typename Input, typename Output, typename Policy>
+inline void set_name(const function_node<Input, Output, Policy>& node, const char *name) {
+    fgt_node_desc(&node, name);
+}
+
+template <typename Output, typename Policy>
+inline void set_name(const continue_node<Output,Policy>& node, const char *name) {
+    fgt_node_desc(&node, name);
+}
+
+template <typename T>
+inline void set_name(const broadcast_node<T>& node, const char *name) {
+    fgt_node_desc(&node, name);
+}
+
+template <typename T>
+inline void set_name(const buffer_node<T>& node, const char *name) {
+    fgt_node_desc(&node, name);
+}
+
+template <typename T>
+inline void set_name(const queue_node<T>& node, const char *name) {
+    fgt_node_desc(&node, name);
+}
+
+template <typename T>
+inline void set_name(const sequencer_node<T>& node, const char *name) {
+    fgt_node_desc(&node, name);
+}
+
+template <typename T, typename Compare>
+inline void set_name(const priority_queue_node<T, Compare>& node, const char *name) {
+    fgt_node_desc(&node, name);
+}
+
+template <typename T, typename DecrementType>
+inline void set_name(const limiter_node<T, DecrementType>& node, const char *name) {
+    fgt_node_desc(&node, name);
+}
+
+template <typename OutputTuple, typename JP>
+inline void set_name(const join_node<OutputTuple, JP>& node, const char *name) {
+    fgt_node_desc(&node, name);
+}
+
+template <typename... Types>
+inline void set_name(const indexer_node<Types...>& node, const char *name) {
+    fgt_node_desc(&node, name);
+}
+
+template <typename T>
+inline void set_name(const overwrite_node<T>& node, const char *name) {
+    fgt_node_desc(&node, name);
+}
+
+template <typename T>
+inline void set_name(const write_once_node<T>& node, const char *name) {
+    fgt_node_desc(&node, name);
+}
+
+template<typename Input, typename Output, typename Policy>
+inline void set_name(const multifunction_node<Input, Output, Policy>& node, const char *name) {
+    fgt_multioutput_node_desc(&node, name);
+}
+
+template<typename TupleType>
+inline void set_name(const split_node<TupleType>& node, const char *name) {
+    fgt_multioutput_node_desc(&node, name);
+}
+
+template< typename InputTuple, typename OutputTuple >
+inline void set_name(const composite_node<InputTuple, OutputTuple>& node, const char *name) {
+    fgt_multiinput_multioutput_node_desc(&node, name);
+}
+
+template<typename Input, typename Output, typename Policy>
+inline void set_name(const async_node<Input, Output, Policy>& node, const char *name)
+{
+    fgt_multioutput_node_desc(&node, name);
+}
+} // d2
+} // detail
+} // tbb
 
-            template <typename Input, typename Output, typename Policy>
-            inline void set_name(const async_node<Input, Output, Policy> &node, const char *name) {
-                fgt_multioutput_node_desc(&node, name);
-            }
-        }// namespace d1
-    }    // namespace detail
-}// namespace tbb
 
 // Include deduction guides for node classes
 #include "detail/_flow_graph_nodes_deduction.h"
 
 namespace tbb {
-    namespace flow {
-        inline namespace v1 {
-            using detail::d1::receiver;
-            using detail::d1::sender;
-
-            using detail::d1::serial;
-            using detail::d1::unlimited;
-
-            using detail::d1::reset_flags;
-            using detail::d1::rf_clear_edges;
-            using detail::d1::rf_reset_bodies;
-            using detail::d1::rf_reset_protocol;
-
-            using detail::d1::continue_msg;
-            using detail::d1::graph;
-            using detail::d1::graph_node;
-
-            using detail::d1::broadcast_node;
-            using detail::d1::buffer_node;
-            using detail::d1::cast_to;
-            using detail::d1::continue_node;
-            using detail::d1::function_node;
-            using detail::d1::indexer_node;
-            using detail::d1::input_node;
-            using detail::d1::is_a;
-            using detail::d1::limiter_node;
-            using detail::d1::multifunction_node;
-            using detail::d1::output_port;
-            using detail::d1::overwrite_node;
-            using detail::d1::priority_queue_node;
-            using detail::d1::queue_node;
-            using detail::d1::sequencer_node;
-            using detail::d1::split_node;
-            using detail::d1::tagged_msg;
-            using detail::d1::write_once_node;
-            using namespace detail::d1::graph_policy_namespace;
-            using detail::d1::async_node;
-            using detail::d1::composite_node;
-            using detail::d1::copy_body;
-            using detail::d1::input_port;
-            using detail::d1::join_node;
-            using detail::d1::make_edge;
-            using detail::d1::no_priority;
-            using detail::d1::node_priority_t;
-            using detail::d1::remove_edge;
-            using detail::d1::tag_value;
+namespace flow {
+inline namespace v1 {
+    using detail::d2::receiver;
+    using detail::d2::sender;
+
+    using detail::d2::serial;
+    using detail::d2::unlimited;
+
+    using detail::d2::reset_flags;
+    using detail::d2::rf_reset_protocol;
+    using detail::d2::rf_reset_bodies;
+    using detail::d2::rf_clear_edges;
+
+    using detail::d2::graph;
+    using detail::d2::graph_node;
+    using detail::d2::continue_msg;
+
+    using detail::d2::input_node;
+    using detail::d2::function_node;
+    using detail::d2::multifunction_node;
+    using detail::d2::split_node;
+    using detail::d2::output_port;
+    using detail::d2::indexer_node;
+    using detail::d2::tagged_msg;
+    using detail::d2::cast_to;
+    using detail::d2::is_a;
+    using detail::d2::continue_node;
+    using detail::d2::overwrite_node;
+    using detail::d2::write_once_node;
+    using detail::d2::broadcast_node;
+    using detail::d2::buffer_node;
+    using detail::d2::queue_node;
+    using detail::d2::sequencer_node;
+    using detail::d2::priority_queue_node;
+    using detail::d2::limiter_node;
+    using namespace detail::d2::graph_policy_namespace;
+    using detail::d2::join_node;
+    using detail::d2::input_port;
+    using detail::d2::copy_body;
+    using detail::d2::make_edge;
+    using detail::d2::remove_edge;
+    using detail::d2::tag_value;
+    using detail::d2::composite_node;
+    using detail::d2::async_node;
+    using detail::d2::node_priority_t;
+    using detail::d2::no_priority;
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-            using detail::d1::follows;
-            using detail::d1::make_edges;
-            using detail::d1::make_node_set;
-            using detail::d1::precedes;
+    using detail::d2::follows;
+    using detail::d2::precedes;
+    using detail::d2::make_node_set;
+    using detail::d2::make_edges;
 #endif
 
-        }// namespace v1
-    }    // namespace flow
+} // v1
+} // flow
 
     using detail::d1::flow_control;
 
-    namespace profiling {
-        using detail::d1::set_name;
-    }// namespace profiling
+namespace profiling {
+    using detail::d2::set_name;
+} // profiling
+
+} // tbb
 
-}// namespace tbb
 
-#if TBB_USE_PROFILING_TOOLS && (__unix__ || __APPLE__)
-// We don't do pragma pop here, since it still gives warning on the USER side
-#undef __TBB_NOINLINE_SYM
+#if TBB_USE_PROFILING_TOOLS  && ( __unix__ || __APPLE__ )
+   // We don't do pragma pop here, since it still gives warning on the USER side
+   #undef __TBB_NOINLINE_SYM
 #endif
 
-#endif// __TBB_flow_graph_H
+#endif // __TBB_flow_graph_H
diff --git a/external/tbb/include/oneapi/tbb/flow_graph_abstractions.h b/external/tbb/include/oneapi/tbb/flow_graph_abstractions.h
index 27389cbf..329e75c4 100644
--- a/external/tbb/include/oneapi/tbb/flow_graph_abstractions.h
+++ b/external/tbb/include/oneapi/tbb/flow_graph_abstractions.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -18,33 +18,34 @@
 #define __TBB_flow_graph_abstractions_H
 
 namespace tbb {
-    namespace detail {
-        namespace d1 {
+namespace detail {
+namespace d2 {
 
-            //! Pure virtual template classes that define interfaces for async communication
-            class graph_proxy {
-            public:
-                //! Inform a graph that messages may come from outside, to prevent premature graph completion
-                virtual void reserve_wait() = 0;
+//! Pure virtual template classes that define interfaces for async communication
+class graph_proxy {
+public:
+    //! Inform a graph that messages may come from outside, to prevent premature graph completion
+    virtual void reserve_wait() = 0;
 
-                //! Inform a graph that a previous call to reserve_wait is no longer in effect
-                virtual void release_wait() = 0;
+    //! Inform a graph that a previous call to reserve_wait is no longer in effect
+    virtual void release_wait() = 0;
 
-                virtual ~graph_proxy() {}
-            };
+    virtual ~graph_proxy() {}
+};
 
-            template <typename Input>
-            class receiver_gateway : public graph_proxy {
-            public:
-                //! Type of inputing data into FG.
-                typedef Input input_type;
+template <typename Input>
+class receiver_gateway : public graph_proxy {
+public:
+    //! Type of inputing data into FG.
+    typedef Input input_type;
 
-                //! Submit signal from an asynchronous activity to FG.
-                virtual bool try_put(const input_type&) = 0;
-            };
+    //! Submit signal from an asynchronous activity to FG.
+    virtual bool try_put(const input_type&) = 0;
+};
 
-        }// namespace d1
+} // d2
 
-    }// namespace detail
-}// namespace tbb
+
+} // detail
+} // tbb
 #endif
diff --git a/external/tbb/include/oneapi/tbb/global_control.h b/external/tbb/include/oneapi/tbb/global_control.h
index c3ac49e7..57f3b9db 100644
--- a/external/tbb/include/oneapi/tbb/global_control.h
+++ b/external/tbb/include/oneapi/tbb/global_control.h
@@ -17,167 +17,184 @@
 #ifndef __TBB_global_control_H
 #define __TBB_global_control_H
 
-#include "detail/_assert.h"
 #include "detail/_config.h"
+
+#include "detail/_assert.h"
+#include "detail/_attach.h"
 #include "detail/_exception.h"
 #include "detail/_namespace_injection.h"
 #include "detail/_template_helpers.h"
 
-#if __TBB_SUPPORTS_WORKERS_WAITING_IN_TERMINATE
-#include <new>// std::nothrow_t
-#endif
 #include <cstddef>
+#include <new> // std::nothrow_t
 
 namespace tbb {
-    namespace detail {
-
-        namespace d1 {
-            class global_control;
-#if __TBB_SUPPORTS_WORKERS_WAITING_IN_TERMINATE
-            class task_scheduler_handle;
-#endif
-        }// namespace d1
-
-        namespace r1 {
-            TBB_EXPORT void __TBB_EXPORTED_FUNC create(d1::global_control&);
-            TBB_EXPORT void __TBB_EXPORTED_FUNC destroy(d1::global_control&);
-            TBB_EXPORT std::size_t __TBB_EXPORTED_FUNC global_control_active_value(int);
-            struct global_control_impl;
-            struct control_storage_comparator;
-#if __TBB_SUPPORTS_WORKERS_WAITING_IN_TERMINATE
-            void release_impl(d1::task_scheduler_handle& handle);
-            bool finalize_impl(d1::task_scheduler_handle& handle);
-            TBB_EXPORT void __TBB_EXPORTED_FUNC get(d1::task_scheduler_handle&);
-            TBB_EXPORT bool __TBB_EXPORTED_FUNC finalize(d1::task_scheduler_handle&, std::intptr_t mode);
-#endif
-        }// namespace r1
-
-        namespace d1 {
-
-            class global_control {
-            public:
-                enum parameter {
-                    max_allowed_parallelism,
-                    thread_stack_size,
-                    terminate_on_exception,
-#if __TBB_SUPPORTS_WORKERS_WAITING_IN_TERMINATE
-                    scheduler_handle,// not a public parameter
-#else
-                    reserved1,// not a public parameter
-#endif
-                    parameter_max// insert new parameters above this point
-                };
-
-                global_control(parameter p, std::size_t value) : my_value(value), my_reserved(), my_param(p) {
-                    suppress_unused_warning(my_reserved);
-                    __TBB_ASSERT(my_param < parameter_max, "Invalid parameter");
+namespace detail {
+
+namespace d1 {
+class global_control;
+class task_scheduler_handle;
+}
+
+namespace r1 {
+TBB_EXPORT void __TBB_EXPORTED_FUNC create(d1::global_control&);
+TBB_EXPORT void __TBB_EXPORTED_FUNC destroy(d1::global_control&);
+TBB_EXPORT std::size_t __TBB_EXPORTED_FUNC global_control_active_value(int);
+struct global_control_impl;
+struct control_storage_comparator;
+void release_impl(d1::task_scheduler_handle& handle);
+bool finalize_impl(d1::task_scheduler_handle& handle);
+TBB_EXPORT void __TBB_EXPORTED_FUNC get(d1::task_scheduler_handle&);
+TBB_EXPORT bool __TBB_EXPORTED_FUNC finalize(d1::task_scheduler_handle&, std::intptr_t mode);
+}
+
+namespace d1 {
+
+class global_control {
+public:
+    enum parameter {
+        max_allowed_parallelism,
+        thread_stack_size,
+        terminate_on_exception,
+        scheduler_handle, // not a public parameter
+        parameter_max // insert new parameters above this point
+    };
+
+    global_control(parameter p, std::size_t value) :
+        my_value(value), my_reserved(), my_param(p) {
+        suppress_unused_warning(my_reserved);
+        __TBB_ASSERT(my_param < parameter_max, "Invalid parameter");
 #if __TBB_WIN8UI_SUPPORT && (_WIN32_WINNT < 0x0A00)
-                    // For Windows 8 Store* apps it's impossible to set stack size
-                    if (p == thread_stack_size) return;
+        // For Windows 8 Store* apps it's impossible to set stack size
+        if (p==thread_stack_size)
+            return;
 #elif __TBB_x86_64 && (_WIN32 || _WIN64)
-                    if (p == thread_stack_size)
-                        __TBB_ASSERT_RELEASE((unsigned) value == value,
-                                             "Stack size is limited to unsigned int range");
+        if (p==thread_stack_size)
+            __TBB_ASSERT_RELEASE((unsigned)value == value, "Stack size is limited to unsigned int range");
 #endif
-                    if (my_param == max_allowed_parallelism)
-                        __TBB_ASSERT_RELEASE(my_value > 0, "max_allowed_parallelism cannot be 0.");
-                    r1::create(*this);
-                }
+        if (my_param==max_allowed_parallelism)
+            __TBB_ASSERT_RELEASE(my_value>0, "max_allowed_parallelism cannot be 0.");
+        r1::create(*this);
+    }
 
-                ~global_control() {
-                    __TBB_ASSERT(my_param < parameter_max, "Invalid parameter");
+    ~global_control() {
+        __TBB_ASSERT(my_param < parameter_max, "Invalid parameter");
 #if __TBB_WIN8UI_SUPPORT && (_WIN32_WINNT < 0x0A00)
-                    // For Windows 8 Store* apps it's impossible to set stack size
-                    if (my_param == thread_stack_size) return;
+        // For Windows 8 Store* apps it's impossible to set stack size
+        if (my_param==thread_stack_size)
+            return;
 #endif
-                    r1::destroy(*this);
-                }
-
-                static std::size_t active_value(parameter p) {
-                    __TBB_ASSERT(p < parameter_max, "Invalid parameter");
-                    return r1::global_control_active_value((int) p);
-                }
-
-            private:
-                std::size_t my_value;
-                std::intptr_t
-                        my_reserved;// TODO: substitution of global_control* not to break backward compatibility
-                parameter my_param;
-
-                friend struct r1::global_control_impl;
-                friend struct r1::control_storage_comparator;
-            };
-
-#if __TBB_SUPPORTS_WORKERS_WAITING_IN_TERMINATE
-            //! Finalization options.
-            //! Outside of the class to avoid extensive friendship.
-            static constexpr std::intptr_t release_nothrowing = 0;
-            static constexpr std::intptr_t finalize_nothrowing = 1;
-            static constexpr std::intptr_t finalize_throwing = 2;
-
-            //! User side wrapper for a task scheduler lifetime control object
-            class task_scheduler_handle {
-            public:
-                task_scheduler_handle() = default;
-                ~task_scheduler_handle() { release(*this); }
-
-                //! No copy
-                task_scheduler_handle(const task_scheduler_handle& other) = delete;
-                task_scheduler_handle& operator=(const task_scheduler_handle& other) = delete;
-
-                //! Move only
-                task_scheduler_handle(task_scheduler_handle&& other) noexcept : m_ctl {nullptr} {
-                    std::swap(m_ctl, other.m_ctl);
-                }
-                task_scheduler_handle& operator=(task_scheduler_handle&& other) noexcept {
-                    std::swap(m_ctl, other.m_ctl);
-                    return *this;
-                };
-
-                explicit operator bool() const noexcept { return m_ctl != nullptr; }
-
-                //! Get and active instance of task_scheduler_handle
-                static task_scheduler_handle get() {
-                    task_scheduler_handle handle;
-                    r1::get(handle);
-                    return handle;
-                }
-
-                //! Release the reference and deactivate handle
-                static void release(task_scheduler_handle& handle) {
-                    if (handle.m_ctl != nullptr) { r1::finalize(handle, release_nothrowing); }
-                }
-
-            private:
-                friend void r1::release_impl(task_scheduler_handle& handle);
-                friend bool r1::finalize_impl(task_scheduler_handle& handle);
-                friend void __TBB_EXPORTED_FUNC r1::get(task_scheduler_handle&);
-
-                global_control* m_ctl {nullptr};
-            };
+        r1::destroy(*this);
+    }
+
+    static std::size_t active_value(parameter p) {
+        __TBB_ASSERT(p < parameter_max, "Invalid parameter");
+        return r1::global_control_active_value((int)p);
+    }
+
+private:
+    std::size_t my_value;
+    std::intptr_t my_reserved; // TODO: substitution of global_control* not to break backward compatibility
+    parameter my_param;
+
+    friend struct r1::global_control_impl;
+    friend struct r1::control_storage_comparator;
+};
+
+//! Finalization options.
+//! Outside of the class to avoid extensive friendship.
+static constexpr std::intptr_t release_nothrowing = 0;
+static constexpr std::intptr_t finalize_nothrowing = 1;
+static constexpr std::intptr_t finalize_throwing = 2;
+
+//! User side wrapper for a task scheduler lifetime control object
+class task_scheduler_handle {
+public:
+    //! Creates an empty task_scheduler_handle
+    task_scheduler_handle() = default;
+
+    //! Creates an attached instance of task_scheduler_handle
+    task_scheduler_handle(attach) {
+        r1::get(*this);
+    }
+
+    //! Release a reference if any
+    ~task_scheduler_handle() {
+        release();
+    }
+
+    //! No copy
+    task_scheduler_handle(const task_scheduler_handle& other) = delete;
+    task_scheduler_handle& operator=(const task_scheduler_handle& other) = delete;
+
+    //! Move only
+    task_scheduler_handle(task_scheduler_handle&& other) noexcept {
+        std::swap(m_ctl, other.m_ctl);
+    }
+    task_scheduler_handle& operator=(task_scheduler_handle&& other) noexcept {
+        std::swap(m_ctl, other.m_ctl);
+        return *this;
+    };
+
+    //! Checks if the task_scheduler_handle is empty
+    explicit operator bool() const noexcept {
+        return m_ctl != nullptr;
+    }
+
+    //! Release the reference and deactivate handle
+    void release() {
+        if (m_ctl != nullptr) {
+            r1::finalize(*this, release_nothrowing);
+            m_ctl = nullptr;
+        }
+    }
+
+private:
+    friend void r1::release_impl(task_scheduler_handle& handle);
+    friend bool r1::finalize_impl(task_scheduler_handle& handle);
+    friend void __TBB_EXPORTED_FUNC r1::get(task_scheduler_handle&);
+
+    friend void finalize(task_scheduler_handle&);
+    friend bool finalize(task_scheduler_handle&, const std::nothrow_t&) noexcept;
+
+    global_control* m_ctl{nullptr};
+};
 
 #if TBB_USE_EXCEPTIONS
-            //! Waits for worker threads termination. Throws exception on error.
-            inline void finalize(task_scheduler_handle& handle) { r1::finalize(handle, finalize_throwing); }
+//! Waits for worker threads termination. Throws exception on error.
+inline void finalize(task_scheduler_handle& handle) {
+    try_call([&] {
+        if (handle.m_ctl != nullptr) {
+            bool finalized = r1::finalize(handle, finalize_throwing);
+            __TBB_ASSERT_EX(finalized, "r1::finalize did not respect finalize_throwing ?");
+            
+        }
+    }).on_completion([&] {
+        __TBB_ASSERT(!handle, "The handle should be empty after finalize");
+    });
+}
 #endif
-            //! Waits for worker threads termination. Returns false on error.
-            inline bool finalize(task_scheduler_handle& handle, const std::nothrow_t&) noexcept {
-                return r1::finalize(handle, finalize_nothrowing);
-            }
-#endif// __TBB_SUPPORTS_WORKERS_WAITING_IN_TERMINATE
-
-        }// namespace d1
-    }    // namespace detail
-
-    inline namespace v1 {
-        using detail::d1::global_control;
-#if __TBB_SUPPORTS_WORKERS_WAITING_IN_TERMINATE
-        using detail::d1::finalize;
-        using detail::d1::task_scheduler_handle;
-        using detail::r1::unsafe_wait;
-#endif
-    }// namespace v1
-
-}// namespace tbb
-
-#endif// __TBB_global_control_H
+//! Waits for worker threads termination. Returns false on error.
+inline bool finalize(task_scheduler_handle& handle, const std::nothrow_t&) noexcept {
+    bool finalized = true;
+    if (handle.m_ctl != nullptr) {
+        finalized = r1::finalize(handle, finalize_nothrowing);
+    }
+    __TBB_ASSERT(!handle, "The handle should be empty after finalize");
+    return finalized;
+}
+
+} // namespace d1
+} // namespace detail
+
+inline namespace v1 {
+using detail::d1::global_control;
+using detail::d1::attach;
+using detail::d1::finalize;
+using detail::d1::task_scheduler_handle;
+using detail::r1::unsafe_wait;
+} // namespace v1
+
+} // namespace tbb
+
+#endif // __TBB_global_control_H
diff --git a/external/tbb/include/oneapi/tbb/info.h b/external/tbb/include/oneapi/tbb/info.h
index 740c7fca..dfcfcc03 100644
--- a/external/tbb/include/oneapi/tbb/info.h
+++ b/external/tbb/include/oneapi/tbb/info.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2019-2021 Intel Corporation
+    Copyright (c) 2019-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -21,119 +21,104 @@
 #include "detail/_namespace_injection.h"
 
 #if __TBB_ARENA_BINDING
-#include <cstdint>
 #include <vector>
+#include <cstdint>
 
 namespace tbb {
-    namespace detail {
+namespace detail {
 
-        namespace d1 {
+namespace d1{
 
-            using numa_node_id = int;
-            using core_type_id = int;
+using numa_node_id = int;
+using core_type_id = int;
 
-            // TODO: consider version approach to resolve backward compatibility potential issues.
-            struct constraints {
+// TODO: consider version approach to resolve backward compatibility potential issues.
+struct constraints {
 #if !__TBB_CPP20_PRESENT
-                constraints(numa_node_id id = -1, int maximal_concurrency = -1)
-                    : numa_id(id), max_concurrency(maximal_concurrency)
-#if __TBB_PREVIEW_TASK_ARENA_CONSTRAINTS_EXTENSION_PRESENT
-                      ,
-                      core_type(-1), max_threads_per_core(-1)
-#endif
-                {
-                }
+    constraints(numa_node_id id = -1, int maximal_concurrency = -1)
+        : numa_id(id)
+        , max_concurrency(maximal_concurrency)
+    {}
 #endif /*!__TBB_CPP20_PRESENT*/
 
-                constraints& set_numa_id(numa_node_id id) {
-                    numa_id = id;
-                    return *this;
-                }
-                constraints& set_max_concurrency(int maximal_concurrency) {
-                    max_concurrency = maximal_concurrency;
-                    return *this;
-                }
-#if __TBB_PREVIEW_TASK_ARENA_CONSTRAINTS_EXTENSION_PRESENT
-                constraints& set_core_type(core_type_id id) {
-                    core_type = id;
-                    return *this;
-                }
-                constraints& set_max_threads_per_core(int threads_number) {
-                    max_threads_per_core = threads_number;
-                    return *this;
-                }
-#endif
-
-                numa_node_id numa_id = -1;
-                int max_concurrency = -1;
-#if __TBB_PREVIEW_TASK_ARENA_CONSTRAINTS_EXTENSION_PRESENT
-                core_type_id core_type = -1;
-                int max_threads_per_core = -1;
-#endif
-            };
-
-        }// namespace d1
-
-        namespace r1 {
-            TBB_EXPORT unsigned __TBB_EXPORTED_FUNC numa_node_count();
-            TBB_EXPORT void __TBB_EXPORTED_FUNC fill_numa_indices(int* index_array);
-            TBB_EXPORT int __TBB_EXPORTED_FUNC numa_default_concurrency(int numa_id);
-
-            // Reserved fields are required to save binary backward compatibility in case of future changes.
-            // They must be defined to 0 at this moment.
-            TBB_EXPORT unsigned __TBB_EXPORTED_FUNC core_type_count(intptr_t reserved = 0);
-            TBB_EXPORT void __TBB_EXPORTED_FUNC fill_core_type_indices(int* index_array,
-                                                                       intptr_t reserved = 0);
-
-            TBB_EXPORT int __TBB_EXPORTED_FUNC constraints_default_concurrency(const d1::constraints& c,
-                                                                               intptr_t reserved = 0);
-            TBB_EXPORT int __TBB_EXPORTED_FUNC constraints_threads_per_core(const d1::constraints& c,
-                                                                            intptr_t reserved = 0);
-        }// namespace r1
-
-        namespace d1 {
-
-            inline std::vector<numa_node_id> numa_nodes() {
-                std::vector<numa_node_id> node_indices(r1::numa_node_count());
-                r1::fill_numa_indices(node_indices.data());
-                return node_indices;
-            }
-
-            inline int default_concurrency(numa_node_id id = -1) { return r1::numa_default_concurrency(id); }
-
-#if __TBB_PREVIEW_TASK_ARENA_CONSTRAINTS_EXTENSION_PRESENT
-            inline std::vector<core_type_id> core_types() {
-                std::vector<int> core_type_indexes(r1::core_type_count());
-                r1::fill_core_type_indices(core_type_indexes.data());
-                return core_type_indexes;
-            }
-
-            inline int default_concurrency(constraints c) {
-                if (c.max_concurrency > 0) { return c.max_concurrency; }
-                return r1::constraints_default_concurrency(c);
-            }
-#endif /*__TBB_PREVIEW_TASK_ARENA_CONSTRAINTS_EXTENSION_PRESENT*/
-
-        }// namespace d1
-    }    // namespace detail
-
-    inline namespace v1 {
-        using detail::d1::numa_node_id;
-#if __TBB_PREVIEW_TASK_ARENA_CONSTRAINTS_EXTENSION_PRESENT
-        using detail::d1::core_type_id;
-#endif
-
-        namespace info {
-            using detail::d1::numa_nodes;
-#if __TBB_PREVIEW_TASK_ARENA_CONSTRAINTS_EXTENSION_PRESENT
-            using detail::d1::core_types;
-#endif
-
-            using detail::d1::default_concurrency;
-        }// namespace info
-    }    // namespace v1
-
-}// namespace tbb
+    constraints& set_numa_id(numa_node_id id) {
+        numa_id = id;
+        return *this;
+    }
+    constraints& set_max_concurrency(int maximal_concurrency) {
+        max_concurrency = maximal_concurrency;
+        return *this;
+    }
+    constraints& set_core_type(core_type_id id) {
+        core_type = id;
+        return *this;
+    }
+    constraints& set_max_threads_per_core(int threads_number) {
+        max_threads_per_core = threads_number;
+        return *this;
+    }
+
+    numa_node_id numa_id = -1;
+    int max_concurrency = -1;
+    core_type_id core_type = -1;
+    int max_threads_per_core = -1;
+};
+
+} // namespace d1
+
+namespace r1 {
+TBB_EXPORT unsigned __TBB_EXPORTED_FUNC numa_node_count();
+TBB_EXPORT void __TBB_EXPORTED_FUNC fill_numa_indices(int* index_array);
+TBB_EXPORT int __TBB_EXPORTED_FUNC numa_default_concurrency(int numa_id);
+
+// Reserved fields are required to save binary backward compatibility in case of future changes.
+// They must be defined to 0 at this moment.
+TBB_EXPORT unsigned __TBB_EXPORTED_FUNC core_type_count(intptr_t reserved = 0);
+TBB_EXPORT void __TBB_EXPORTED_FUNC fill_core_type_indices(int* index_array, intptr_t reserved = 0);
+
+TBB_EXPORT int __TBB_EXPORTED_FUNC constraints_default_concurrency(const d1::constraints& c, intptr_t reserved = 0);
+TBB_EXPORT int __TBB_EXPORTED_FUNC constraints_threads_per_core(const d1::constraints& c, intptr_t reserved = 0);
+} // namespace r1
+
+namespace d1 {
+
+inline std::vector<numa_node_id> numa_nodes() {
+    std::vector<numa_node_id> node_indices(r1::numa_node_count());
+    r1::fill_numa_indices(node_indices.data());
+    return node_indices;
+}
+
+inline int default_concurrency(numa_node_id id = -1) {
+    return r1::numa_default_concurrency(id);
+}
+
+inline std::vector<core_type_id> core_types() {
+    std::vector<int> core_type_indexes(r1::core_type_count());
+    r1::fill_core_type_indices(core_type_indexes.data());
+    return core_type_indexes;
+}
+
+inline int default_concurrency(constraints c) {
+    if (c.max_concurrency > 0) { return c.max_concurrency; }
+    return r1::constraints_default_concurrency(c);
+}
+
+} // namespace d1
+} // namespace detail
+
+inline namespace v1 {
+using detail::d1::numa_node_id;
+using detail::d1::core_type_id;
+
+namespace info {
+using detail::d1::numa_nodes;
+using detail::d1::core_types;
+
+using detail::d1::default_concurrency;
+} // namespace info
+} // namespace v1
+
+} // namespace tbb
 
 #endif /*__TBB_ARENA_BINDING*/
 
diff --git a/external/tbb/include/oneapi/tbb/memory_pool.h b/external/tbb/include/oneapi/tbb/memory_pool.h
index 01aa582b..5ece8790 100644
--- a/external/tbb/include/oneapi/tbb/memory_pool.h
+++ b/external/tbb/include/oneapi/tbb/memory_pool.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -24,255 +24,249 @@
 
 #include "scalable_allocator.h"
 
-#include <new>      // std::bad_alloc
-#include <stdexcept>// std::runtime_error, std::invalid_argument
-#include <utility>  // std::forward
+#include <new> // std::bad_alloc
+#include <stdexcept> // std::runtime_error, std::invalid_argument
+#include <utility> // std::forward
+
 
 #if __TBB_EXTRA_DEBUG
 #define __TBBMALLOC_ASSERT ASSERT
 #else
-#define __TBBMALLOC_ASSERT(a, b) ((void) 0)
+#define __TBBMALLOC_ASSERT(a,b) ((void)0)
 #endif
 
 namespace tbb {
-    namespace detail {
-        namespace d1 {
+namespace detail {
+namespace d1 {
 
-            //! Base of thread-safe pool allocator for variable-size requests
-            class pool_base : no_copy {
-                // Pool interface is separate from standard allocator classes because it has
-                // to maintain internal state, no copy or assignment. Move and swap are possible.
-            public:
-                //! Reset pool to reuse its memory (free all objects at once)
-                void recycle() { rml::pool_reset(my_pool); }
+//! Base of thread-safe pool allocator for variable-size requests
+class pool_base : no_copy {
+    // Pool interface is separate from standard allocator classes because it has
+    // to maintain internal state, no copy or assignment. Move and swap are possible.
+public:
+    //! Reset pool to reuse its memory (free all objects at once)
+    void recycle() { rml::pool_reset(my_pool); }
 
-                //! The "malloc" analogue to allocate block of memory of size bytes
-                void* malloc(size_t size) { return rml::pool_malloc(my_pool, size); }
+    //! The "malloc" analogue to allocate block of memory of size bytes
+    void *malloc(size_t size) { return rml::pool_malloc(my_pool, size); }
 
-                //! The "free" analogue to discard a previously allocated piece of memory.
-                void free(void* ptr) { rml::pool_free(my_pool, ptr); }
+    //! The "free" analogue to discard a previously allocated piece of memory.
+    void free(void* ptr) { rml::pool_free(my_pool, ptr); }
 
-                //! The "realloc" analogue complementing pool_malloc.
-                // Enables some low-level optimization possibilities
-                void* realloc(void* ptr, size_t size) { return rml::pool_realloc(my_pool, ptr, size); }
+    //! The "realloc" analogue complementing pool_malloc.
+    // Enables some low-level optimization possibilities
+    void *realloc(void* ptr, size_t size) {
+        return rml::pool_realloc(my_pool, ptr, size);
+    }
 
-            protected:
-                //! destroy pool - must be called in a child class
-                void destroy() { rml::pool_destroy(my_pool); }
+protected:
+    //! destroy pool - must be called in a child class
+    void destroy() { rml::pool_destroy(my_pool); }
 
-                rml::MemoryPool* my_pool;
-            };
+    rml::MemoryPool *my_pool;
+};
 
 #if _MSC_VER && !defined(__INTEL_COMPILER)
-// Workaround for erroneous "unreferenced parameter" warning in method destroy.
-#pragma warning(push)
-#pragma warning(disable : 4100)
+    // Workaround for erroneous "unreferenced parameter" warning in method destroy.
+    #pragma warning (push)
+    #pragma warning (disable: 4100)
 #endif
 
-            //! Meets "allocator" requirements of ISO C++ Standard, Section 20.1.5
-            /** @ingroup memory_allocation */
-            template <typename T, typename P = pool_base>
-            class memory_pool_allocator {
-            protected:
-                typedef P pool_type;
-                pool_type* my_pool;
-                template <typename U, typename R>
-                friend class memory_pool_allocator;
-                template <typename V, typename U, typename R>
-                friend bool operator==(const memory_pool_allocator<V, R>& a,
-                                       const memory_pool_allocator<U, R>& b);
-                template <typename V, typename U, typename R>
-                friend bool operator!=(const memory_pool_allocator<V, R>& a,
-                                       const memory_pool_allocator<U, R>& b);
-
-            public:
-                typedef T value_type;
-                typedef value_type* pointer;
-                typedef const value_type* const_pointer;
-                typedef value_type& reference;
-                typedef const value_type& const_reference;
-                typedef size_t size_type;
-                typedef ptrdiff_t difference_type;
-                template <typename U>
-                struct rebind {
-                    typedef memory_pool_allocator<U, P> other;
-                };
-
-                explicit memory_pool_allocator(pool_type& pool) throw() : my_pool(&pool) {}
-                memory_pool_allocator(const memory_pool_allocator& src) throw() : my_pool(src.my_pool) {}
-                template <typename U>
-                memory_pool_allocator(const memory_pool_allocator<U, P>& src) throw()
-                    : my_pool(src.my_pool) {}
-
-                pointer address(reference x) const { return &x; }
-                const_pointer address(const_reference x) const { return &x; }
-
-                //! Allocate space for n objects.
-                pointer allocate(size_type n, const void* /*hint*/ = 0) {
-                    pointer p = static_cast<pointer>(my_pool->malloc(n * sizeof(value_type)));
-                    if (!p) throw_exception(std::bad_alloc());
-                    return p;
-                }
-                //! Free previously allocated block of memory.
-                void deallocate(pointer p, size_type) { my_pool->free(p); }
-                //! Largest value for which method allocate might succeed.
-                size_type max_size() const throw() {
-                    size_type max = static_cast<size_type>(-1) / sizeof(value_type);
-                    return (max > 0 ? max : 1);
-                }
-                //! Copy-construct value at location pointed to by p.
-
-                template <typename U, typename... Args>
-                void construct(U* p, Args&&... args) {
-                    ::new ((void*) p) U(std::forward<Args>(args)...);
-                }
-
-                //! Destroy value at location pointed to by p.
-                void destroy(pointer p) { p->~value_type(); }
-            };
+//! Meets "allocator" requirements of ISO C++ Standard, Section 20.1.5
+/** @ingroup memory_allocation */
+template<typename T, typename P = pool_base>
+class memory_pool_allocator {
+protected:
+    typedef P pool_type;
+    pool_type *my_pool;
+    template<typename U, typename R>
+    friend class memory_pool_allocator;
+    template<typename V, typename U, typename R>
+    friend bool operator==( const memory_pool_allocator<V,R>& a, const memory_pool_allocator<U,R>& b);
+    template<typename V, typename U, typename R>
+    friend bool operator!=( const memory_pool_allocator<V,R>& a, const memory_pool_allocator<U,R>& b);
+public:
+    typedef T value_type;
+    typedef value_type* pointer;
+    typedef const value_type* const_pointer;
+    typedef value_type& reference;
+    typedef const value_type& const_reference;
+    typedef size_t size_type;
+    typedef ptrdiff_t difference_type;
+    template<typename U> struct rebind {
+        typedef memory_pool_allocator<U, P> other;
+    };
+
+    explicit memory_pool_allocator(pool_type &pool) noexcept : my_pool(&pool) {}
+    memory_pool_allocator(const memory_pool_allocator& src) noexcept : my_pool(src.my_pool) {}
+    template<typename U>
+    memory_pool_allocator(const memory_pool_allocator<U,P>& src) noexcept : my_pool(src.my_pool) {}
+
+    pointer address(reference x) const { return &x; }
+    const_pointer address(const_reference x) const { return &x; }
+
+    //! Allocate space for n objects.
+    pointer allocate( size_type n, const void* /*hint*/ = nullptr) {
+        pointer p = static_cast<pointer>( my_pool->malloc( n*sizeof(value_type) ) );
+        if (!p)
+            throw_exception(std::bad_alloc());
+        return p;
+    }
+    //! Free previously allocated block of memory.
+    void deallocate( pointer p, size_type ) {
+        my_pool->free(p);
+    }
+    //! Largest value for which method allocate might succeed.
+    size_type max_size() const noexcept {
+        size_type max = static_cast<size_type>(-1) / sizeof (value_type);
+        return (max > 0 ? max : 1);
+    }
+    //! Copy-construct value at location pointed to by p.
+
+    template<typename U, typename... Args>
+    void construct(U *p, Args&&... args)
+        { ::new((void *)p) U(std::forward<Args>(args)...); }
+
+    //! Destroy value at location pointed to by p.
+    void destroy( pointer p ) { p->~value_type(); }
+
+};
 
 #if _MSC_VER && !defined(__INTEL_COMPILER)
-#pragma warning(pop)
-#endif// warning 4100 is back
-
-            //! Analogous to std::allocator<void>, as defined in ISO C++ Standard, Section 20.4.1
-            /** @ingroup memory_allocation */
-            template <typename P>
-            class memory_pool_allocator<void, P> {
-            public:
-                typedef P pool_type;
-                typedef void* pointer;
-                typedef const void* const_pointer;
-                typedef void value_type;
-                template <typename U>
-                struct rebind {
-                    typedef memory_pool_allocator<U, P> other;
-                };
-
-                explicit memory_pool_allocator(pool_type& pool) throw() : my_pool(&pool) {}
-                memory_pool_allocator(const memory_pool_allocator& src) throw() : my_pool(src.my_pool) {}
-                template <typename U>
-                memory_pool_allocator(const memory_pool_allocator<U, P>& src) throw()
-                    : my_pool(src.my_pool) {}
-
-            protected:
-                pool_type* my_pool;
-                template <typename U, typename R>
-                friend class memory_pool_allocator;
-                template <typename V, typename U, typename R>
-                friend bool operator==(const memory_pool_allocator<V, R>& a,
-                                       const memory_pool_allocator<U, R>& b);
-                template <typename V, typename U, typename R>
-                friend bool operator!=(const memory_pool_allocator<V, R>& a,
-                                       const memory_pool_allocator<U, R>& b);
-            };
-
-            template <typename T, typename U, typename P>
-            inline bool operator==(const memory_pool_allocator<T, P>& a,
-                                   const memory_pool_allocator<U, P>& b) {
-                return a.my_pool == b.my_pool;
-            }
-
-            template <typename T, typename U, typename P>
-            inline bool operator!=(const memory_pool_allocator<T, P>& a,
-                                   const memory_pool_allocator<U, P>& b) {
-                return a.my_pool != b.my_pool;
-            }
-
-            //! Thread-safe growable pool allocator for variable-size requests
-            template <typename Alloc>
-            class memory_pool : public pool_base {
-                Alloc my_alloc;// TODO: base-class optimization
-                static void* allocate_request(intptr_t pool_id, size_t& bytes);
-                static int deallocate_request(intptr_t pool_id, void*, size_t raw_bytes);
-
-            public:
-                //! construct pool with underlying allocator
-                explicit memory_pool(const Alloc& src = Alloc());
-
-                //! destroy pool
-                ~memory_pool() { destroy(); }// call the callbacks first and destroy my_alloc latter
-            };
-
-            class fixed_pool : public pool_base {
-                void* my_buffer;
-                size_t my_size;
-                inline static void* allocate_request(intptr_t pool_id, size_t& bytes);
-
-            public:
-                //! construct pool with underlying allocator
-                inline fixed_pool(void* buf, size_t size);
-                //! destroy pool
-                ~fixed_pool() { destroy(); }
-            };
-
-            //////////////// Implementation ///////////////
-
-            template <typename Alloc>
-            memory_pool<Alloc>::memory_pool(const Alloc& src) : my_alloc(src) {
-                rml::MemPoolPolicy args(allocate_request, deallocate_request,
-                                        sizeof(typename Alloc::value_type));
-                rml::MemPoolError res = rml::pool_create_v1(intptr_t(this), &args, &my_pool);
-                if (res != rml::POOL_OK) throw_exception(std::runtime_error("Can't create pool"));
-            }
-            template <typename Alloc>
-            void* memory_pool<Alloc>::allocate_request(intptr_t pool_id, size_t& bytes) {
-                memory_pool<Alloc>& self = *reinterpret_cast<memory_pool<Alloc>*>(pool_id);
-                const size_t unit_size = sizeof(typename Alloc::value_type);
-                __TBBMALLOC_ASSERT(0 == bytes % unit_size, NULL);
-                void* ptr;
+    #pragma warning (pop)
+#endif // warning 4100 is back
+
+//! Analogous to std::allocator<void>, as defined in ISO C++ Standard, Section 20.4.1
+/** @ingroup memory_allocation */
+template<typename P>
+class memory_pool_allocator<void, P> {
+public:
+    typedef P pool_type;
+    typedef void* pointer;
+    typedef const void* const_pointer;
+    typedef void value_type;
+    template<typename U> struct rebind {
+        typedef memory_pool_allocator<U, P> other;
+    };
+
+    explicit memory_pool_allocator( pool_type &pool) noexcept : my_pool(&pool) {}
+    memory_pool_allocator( const memory_pool_allocator& src) noexcept : my_pool(src.my_pool) {}
+    template<typename U>
+    memory_pool_allocator(const memory_pool_allocator<U,P>& src) noexcept : my_pool(src.my_pool) {}
+
+protected:
+    pool_type *my_pool;
+    template<typename U, typename R>
+    friend class memory_pool_allocator;
+    template<typename V, typename U, typename R>
+    friend bool operator==( const memory_pool_allocator<V,R>& a, const memory_pool_allocator<U,R>& b);
+    template<typename V, typename U, typename R>
+    friend bool operator!=( const memory_pool_allocator<V,R>& a, const memory_pool_allocator<U,R>& b);
+};
+
+template<typename T, typename U, typename P>
+inline bool operator==( const memory_pool_allocator<T,P>& a, const memory_pool_allocator<U,P>& b) {return a.my_pool==b.my_pool;}
+
+template<typename T, typename U, typename P>
+inline bool operator!=( const memory_pool_allocator<T,P>& a, const memory_pool_allocator<U,P>& b) {return a.my_pool!=b.my_pool;}
+
+//! Thread-safe growable pool allocator for variable-size requests
+template <typename Alloc>
+class memory_pool : public pool_base {
+    Alloc my_alloc; // TODO: base-class optimization
+    static void *allocate_request(intptr_t pool_id, size_t & bytes);
+    static int deallocate_request(intptr_t pool_id, void*, size_t raw_bytes);
+
+public:
+    //! construct pool with underlying allocator
+    explicit memory_pool(const Alloc &src = Alloc());
+
+    //! destroy pool
+    ~memory_pool() { destroy(); } // call the callbacks first and destroy my_alloc latter
+};
+
+class fixed_pool : public pool_base {
+    void *my_buffer;
+    size_t my_size;
+    inline static void *allocate_request(intptr_t pool_id, size_t & bytes);
+
+public:
+    //! construct pool with underlying allocator
+    inline fixed_pool(void *buf, size_t size);
+    //! destroy pool
+    ~fixed_pool() { destroy(); }
+};
+
+//////////////// Implementation ///////////////
+
+template <typename Alloc>
+memory_pool<Alloc>::memory_pool(const Alloc &src) : my_alloc(src) {
+    rml::MemPoolPolicy args(allocate_request, deallocate_request,
+                            sizeof(typename Alloc::value_type));
+    rml::MemPoolError res = rml::pool_create_v1(intptr_t(this), &args, &my_pool);
+    if (res!=rml::POOL_OK)
+        throw_exception(std::runtime_error("Can't create pool"));
+}
+template <typename Alloc>
+void *memory_pool<Alloc>::allocate_request(intptr_t pool_id, size_t & bytes) {
+    memory_pool<Alloc> &self = *reinterpret_cast<memory_pool<Alloc>*>(pool_id);
+    const size_t unit_size = sizeof(typename Alloc::value_type);
+    __TBBMALLOC_ASSERT( 0 == bytes%unit_size, nullptr);
+    void *ptr;
 #if TBB_USE_EXCEPTIONS
-                try {
+    try {
 #endif
-                    ptr = self.my_alloc.allocate(bytes / unit_size);
+        ptr = self.my_alloc.allocate( bytes/unit_size );
 #if TBB_USE_EXCEPTIONS
-                } catch (...) { return 0; }
+    } catch(...) {
+        return nullptr;
+    }
 #endif
-                return ptr;
-            }
+    return ptr;
+}
 #if __TBB_MSVC_UNREACHABLE_CODE_IGNORED
-// Workaround for erroneous "unreachable code" warning in the template below.
-// Specific for VC++ 17-18 compiler
-#pragma warning(push)
-#pragma warning(disable : 4702)
+    // Workaround for erroneous "unreachable code" warning in the template below.
+    // Specific for VC++ 17-18 compiler
+    #pragma warning (push)
+    #pragma warning (disable: 4702)
 #endif
-            template <typename Alloc>
-            int memory_pool<Alloc>::deallocate_request(intptr_t pool_id, void* raw_ptr, size_t raw_bytes) {
-                memory_pool<Alloc>& self = *reinterpret_cast<memory_pool<Alloc>*>(pool_id);
-                const size_t unit_size = sizeof(typename Alloc::value_type);
-                __TBBMALLOC_ASSERT(0 == raw_bytes % unit_size, NULL);
-                self.my_alloc.deallocate(static_cast<typename Alloc::value_type*>(raw_ptr),
-                                         raw_bytes / unit_size);
-                return 0;
-            }
+template <typename Alloc>
+int memory_pool<Alloc>::deallocate_request(intptr_t pool_id, void* raw_ptr, size_t raw_bytes) {
+    memory_pool<Alloc> &self = *reinterpret_cast<memory_pool<Alloc>*>(pool_id);
+    const size_t unit_size = sizeof(typename Alloc::value_type);
+    __TBBMALLOC_ASSERT( 0 == raw_bytes%unit_size, nullptr);
+    self.my_alloc.deallocate( static_cast<typename Alloc::value_type*>(raw_ptr), raw_bytes/unit_size );
+    return 0;
+}
 #if __TBB_MSVC_UNREACHABLE_CODE_IGNORED
-#pragma warning(pop)
+    #pragma warning (pop)
 #endif
-            inline fixed_pool::fixed_pool(void* buf, size_t size) : my_buffer(buf), my_size(size) {
-                if (!buf || !size)
-                    // TODO: improve support for mode with exceptions disabled
-                    throw_exception(std::invalid_argument("Zero in parameter is invalid"));
-                rml::MemPoolPolicy args(allocate_request, 0, size, /*fixedPool=*/true);
-                rml::MemPoolError res = rml::pool_create_v1(intptr_t(this), &args, &my_pool);
-                if (res != rml::POOL_OK) throw_exception(std::runtime_error("Can't create pool"));
-            }
-            inline void* fixed_pool::allocate_request(intptr_t pool_id, size_t& bytes) {
-                fixed_pool& self = *reinterpret_cast<fixed_pool*>(pool_id);
-                __TBBMALLOC_ASSERT(0 != self.my_size, "The buffer must not be used twice.");
-                bytes = self.my_size;
-                self.my_size = 0;// remember that buffer has been used
-                return self.my_buffer;
-            }
-
-        }// namespace d1
-    }    // namespace detail
-
-    inline namespace v1 {
-        using detail::d1::fixed_pool;
-        using detail::d1::memory_pool;
-        using detail::d1::memory_pool_allocator;
-    }// namespace v1
-}// namespace tbb
+inline fixed_pool::fixed_pool(void *buf, size_t size) : my_buffer(buf), my_size(size) {
+    if (!buf || !size)
+        // TODO: improve support for mode with exceptions disabled
+        throw_exception(std::invalid_argument("Zero in parameter is invalid"));
+    rml::MemPoolPolicy args(allocate_request, nullptr, size, /*fixedPool=*/true);
+    rml::MemPoolError res = rml::pool_create_v1(intptr_t(this), &args, &my_pool);
+    if (res!=rml::POOL_OK)
+        throw_exception(std::runtime_error("Can't create pool"));
+}
+inline void *fixed_pool::allocate_request(intptr_t pool_id, size_t & bytes) {
+    fixed_pool &self = *reinterpret_cast<fixed_pool*>(pool_id);
+    __TBBMALLOC_ASSERT(0 != self.my_size, "The buffer must not be used twice.");
+    bytes = self.my_size;
+    self.my_size = 0; // remember that buffer has been used
+    return self.my_buffer;
+}
+
+} // namespace d1
+} // namespace detail
+
+inline namespace v1 {
+using detail::d1::memory_pool_allocator;
+using detail::d1::memory_pool;
+using detail::d1::fixed_pool;
+} // inline namepspace v1
+} // namespace tbb
 
 #undef __TBBMALLOC_ASSERT
 #endif// __TBB_memory_pool_H
diff --git a/external/tbb/include/oneapi/tbb/mutex.h b/external/tbb/include/oneapi/tbb/mutex.h
index 458c44d2..169b7a3c 100644
--- a/external/tbb/include/oneapi/tbb/mutex.h
+++ b/external/tbb/include/oneapi/tbb/mutex.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2021 Intel Corporation
+    Copyright (c) 2021-2023 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -17,78 +17,77 @@
 #ifndef __TBB_mutex_H
 #define __TBB_mutex_H
 
-#if __TBB_PREVIEW_MUTEXES
-
-#include "detail/_mutex_common.h"
 #include "detail/_namespace_injection.h"
-#include "detail/_scoped_lock.h"
 #include "detail/_utils.h"
+#include "detail/_scoped_lock.h"
 #include "detail/_waitable_atomic.h"
+#include "detail/_mutex_common.h"
 #include "profiling.h"
 
 namespace tbb {
-    namespace detail {
-        namespace d1 {
-
-            class mutex {
-            public:
-                //! Constructors
-                mutex() { create_itt_sync(this, "tbb::mutex", ""); };
-
-                //! Destructor
-                ~mutex() {
-                    __TBB_ASSERT(!my_flag.load(std::memory_order_relaxed),
-                                 "destruction of an acquired mutex");
-                }
-
-                //! No Copy
-                mutex(const mutex&) = delete;
-                mutex& operator=(const mutex&) = delete;
-
-                using scoped_lock = unique_scoped_lock<mutex>;
-
-                //! Mutex traits
-                static constexpr bool is_rw_mutex = false;
-                static constexpr bool is_recursive_mutex = false;
-                static constexpr bool is_fair_mutex = false;
-
-                //! Acquire lock
-                /** Spin if the lock is taken */
-                void lock() {
-                    call_itt_notify(prepare, this);
-                    while (!try_lock()) { my_flag.wait(true, /* context = */ 0, std::memory_order_relaxed); }
-                }
-
-                //! Try acquiring lock (non-blocking)
-                /** Return true if lock acquired; false otherwise. */
-                bool try_lock() {
-                    bool result = !my_flag.load(std::memory_order_relaxed) && !my_flag.exchange(true);
-                    if (result) { call_itt_notify(acquired, this); }
-                    return result;
-                }
-
-                //! Release lock
-                void unlock() {
-                    call_itt_notify(releasing, this);
-                    // We need Write Read memory barrier before notify that reads the waiter list.
-                    // In C++ only full fence covers this type of barrier.
-                    my_flag.exchange(false);
-                    my_flag.notify_one_relaxed();
-                }
-
-            private:
-                waitable_atomic<bool> my_flag {0};
-            };// class mutex
-
-        }// namespace d1
-    }    // namespace detail
-
-    inline namespace v1 {
-        using detail::d1::mutex;
-    }// namespace v1
-
-}// namespace tbb
-
-#endif /* __TBB_PREVIEW_MUTEXES */
-
-#endif// __TBB_mutex_H
+namespace detail {
+namespace d1 {
+
+class mutex {
+public:
+    //! Constructors
+    mutex() {
+        create_itt_sync(this, "tbb::mutex", "");
+    };
+
+    //! Destructor
+    ~mutex() = default;
+
+    //! No Copy
+    mutex(const mutex&) = delete;
+    mutex& operator=(const mutex&) = delete;
+
+    using scoped_lock = unique_scoped_lock<mutex>;
+
+    //! Mutex traits
+    static constexpr bool is_rw_mutex = false;
+    static constexpr bool is_recursive_mutex = false;
+    static constexpr bool is_fair_mutex = false;
+
+    //! Acquire lock
+    /** Spin if the lock is taken */
+    void lock() {
+        call_itt_notify(prepare, this);
+        while (!try_lock()) {
+            my_flag.wait(true, /* context = */ 0, std::memory_order_relaxed);
+        }
+    }
+
+    //! Try acquiring lock (non-blocking)
+    /** Return true if lock acquired; false otherwise. */
+    bool try_lock() {
+        bool result = !my_flag.load(std::memory_order_relaxed) && !my_flag.exchange(true);
+        if (result) {
+            call_itt_notify(acquired, this);
+        }
+        return result;
+    }
+
+    //! Release lock
+    void unlock() {
+        call_itt_notify(releasing, this);
+        // We need Write Read memory barrier before notify that reads the waiter list.
+        // In C++ only full fence covers this type of barrier.
+        my_flag.exchange(false);
+        my_flag.notify_one_relaxed();
+    }
+
+private:
+    waitable_atomic<bool> my_flag{0};
+}; // class mutex
+
+} // namespace d1
+} // namespace detail
+
+inline namespace v1 {
+using detail::d1::mutex;
+} // namespace v1
+
+} // namespace tbb
+
+#endif // __TBB_mutex_H
diff --git a/external/tbb/include/oneapi/tbb/null_mutex.h b/external/tbb/include/oneapi/tbb/null_mutex.h
index 9687c069..1797e35b 100644
--- a/external/tbb/include/oneapi/tbb/null_mutex.h
+++ b/external/tbb/include/oneapi/tbb/null_mutex.h
@@ -18,63 +18,63 @@
 #define __TBB_null_mutex_H
 
 #include "detail/_config.h"
-#include "detail/_mutex_common.h"
 #include "detail/_namespace_injection.h"
+#include "detail/_mutex_common.h"
 
 namespace tbb {
-    namespace detail {
-        namespace d1 {
+namespace detail {
+namespace d1 {
 
-            //! A mutex which does nothing
-            /** A null_mutex does no operation and simulates success.
+//! A mutex which does nothing
+/** A null_mutex does no operation and simulates success.
     @ingroup synchronization */
-            class null_mutex {
-            public:
-                //! Constructors
-                constexpr null_mutex() noexcept = default;
-
-                //! Destructor
-                ~null_mutex() = default;
-
-                //! No Copy
-                null_mutex(const null_mutex&) = delete;
-                null_mutex& operator=(const null_mutex&) = delete;
-
-                //! Represents acquisition of a mutex.
-                class scoped_lock {
-                public:
-                    //! Constructors
-                    constexpr scoped_lock() noexcept = default;
-                    scoped_lock(null_mutex&) {}
-
-                    //! Destructor
-                    ~scoped_lock() = default;
-
-                    //! No Copy
-                    scoped_lock(const scoped_lock&) = delete;
-                    scoped_lock& operator=(const scoped_lock&) = delete;
-
-                    void acquire(null_mutex&) {}
-                    bool try_acquire(null_mutex&) { return true; }
-                    void release() {}
-                };
-
-                //! Mutex traits
-                static constexpr bool is_rw_mutex = false;
-                static constexpr bool is_recursive_mutex = true;
-                static constexpr bool is_fair_mutex = true;
-
-                void lock() {}
-                bool try_lock() { return true; }
-                void unlock() {}
-            };// class null_mutex
-
-        }// namespace d1
-    }    // namespace detail
-
-    inline namespace v1 {
-        using detail::d1::null_mutex;
-    }// namespace v1
-}// namespace tbb
+class null_mutex {
+public:
+    //! Constructors
+    constexpr null_mutex() noexcept = default;
+
+    //! Destructor
+    ~null_mutex() = default;
+
+    //! No Copy
+    null_mutex(const null_mutex&) = delete;
+    null_mutex& operator=(const null_mutex&) = delete;
+
+    //! Represents acquisition of a mutex.
+    class scoped_lock {
+    public:
+        //! Constructors
+        constexpr scoped_lock() noexcept = default;
+        scoped_lock(null_mutex&) {}
+
+        //! Destructor
+        ~scoped_lock() = default;
+
+        //! No Copy
+        scoped_lock(const scoped_lock&) = delete;
+        scoped_lock& operator=(const scoped_lock&) = delete;
+
+        void acquire(null_mutex&) {}
+        bool try_acquire(null_mutex&) { return true; }
+        void release() {}
+    };
+
+    //! Mutex traits
+    static constexpr bool is_rw_mutex = false;
+    static constexpr bool is_recursive_mutex = true;
+    static constexpr bool is_fair_mutex = true;
+
+    void lock() {}
+    bool try_lock() { return true; }
+    void unlock() {}
+}; // class null_mutex
+
+} // namespace d1
+} // namespace detail
+
+inline namespace v1 {
+using detail::d1::null_mutex;
+} // namespace v1
+} // namespace tbb
 
 #endif /* __TBB_null_mutex_H */
diff --git a/external/tbb/include/oneapi/tbb/null_rw_mutex.h b/external/tbb/include/oneapi/tbb/null_rw_mutex.h
index f920cbf9..43983a00 100644
--- a/external/tbb/include/oneapi/tbb/null_rw_mutex.h
+++ b/external/tbb/include/oneapi/tbb/null_rw_mutex.h
@@ -18,70 +18,70 @@
 #define __TBB_null_rw_mutex_H
 
 #include "detail/_config.h"
-#include "detail/_mutex_common.h"
 #include "detail/_namespace_injection.h"
+#include "detail/_mutex_common.h"
 
 namespace tbb {
-    namespace detail {
-        namespace d1 {
+namespace detail {
+namespace d1 {
 
-            //! A rw mutex which does nothing
-            /** A null_rw_mutex is a rw mutex that does nothing and simulates successful operation.
+//! A rw mutex which does nothing
+/** A null_rw_mutex is a rw mutex that does nothing and simulates successful operation.
     @ingroup synchronization */
-            class null_rw_mutex {
-            public:
-                //! Constructors
-                constexpr null_rw_mutex() noexcept = default;
-
-                //! Destructor
-                ~null_rw_mutex() = default;
-
-                //! No Copy
-                null_rw_mutex(const null_rw_mutex&) = delete;
-                null_rw_mutex& operator=(const null_rw_mutex&) = delete;
-
-                //! Represents acquisition of a mutex.
-                class scoped_lock {
-                public:
-                    //! Constructors
-                    constexpr scoped_lock() noexcept = default;
-                    scoped_lock(null_rw_mutex&, bool = true) {}
-
-                    //! Destructor
-                    ~scoped_lock() = default;
-
-                    //! No Copy
-                    scoped_lock(const scoped_lock&) = delete;
-                    scoped_lock& operator=(const scoped_lock&) = delete;
-
-                    void acquire(null_rw_mutex&, bool = true) {}
-                    bool try_acquire(null_rw_mutex&, bool = true) { return true; }
-                    void release() {}
-                    bool upgrade_to_writer() { return true; }
-                    bool downgrade_to_reader() { return true; }
-
-                    bool is_writer() const { return true; }
-                };
-
-                //! Mutex traits
-                static constexpr bool is_rw_mutex = true;
-                static constexpr bool is_recursive_mutex = true;
-                static constexpr bool is_fair_mutex = true;
-
-                void lock() {}
-                bool try_lock() { return true; }
-                void unlock() {}
-                void lock_shared() {}
-                bool try_lock_shared() { return true; }
-                void unlock_shared() {}
-            };// class null_rw_mutex
-
-        }// namespace d1
-    }    // namespace detail
-
-    inline namespace v1 {
-        using detail::d1::null_rw_mutex;
-    }// namespace v1
-}// namespace tbb
+class null_rw_mutex {
+public:
+    //! Constructors
+    constexpr null_rw_mutex() noexcept = default;
+
+    //! Destructor
+    ~null_rw_mutex() = default;
+
+    //! No Copy
+    null_rw_mutex(const null_rw_mutex&) = delete;
+    null_rw_mutex& operator=(const null_rw_mutex&) = delete;
+
+    //! Represents acquisition of a mutex.
+    class scoped_lock {
+    public:
+        //! Constructors
+        constexpr scoped_lock() noexcept = default;
+        scoped_lock(null_rw_mutex&, bool = true) {}
+
+        //! Destructor
+        ~scoped_lock() = default;
+
+        //! No Copy
+        scoped_lock(const scoped_lock&) = delete;
+        scoped_lock& operator=(const scoped_lock&) = delete;
+
+        void acquire(null_rw_mutex&, bool = true) {}
+        bool try_acquire(null_rw_mutex&, bool = true) { return true; }
+        void release() {}
+        bool upgrade_to_writer() { return true; }
+        bool downgrade_to_reader() { return true; }
+
+        bool is_writer() const { return true; }
+    };
+
+    //! Mutex traits
+    static constexpr bool is_rw_mutex = true;
+    static constexpr bool is_recursive_mutex = true;
+    static constexpr bool is_fair_mutex = true;
+
+    void lock() {}
+    bool try_lock() { return true; }
+    void unlock() {}
+    void lock_shared() {}
+    bool try_lock_shared() { return true; }
+    void unlock_shared() {}
+}; // class null_rw_mutex
+
+} // namespace d1
+} // namespace detail
+
+inline namespace v1 {
+using detail::d1::null_rw_mutex;
+} // namespace v1
+} // namespace tbb
 
 #endif /* __TBB_null_rw_mutex_H */
diff --git a/external/tbb/include/oneapi/tbb/parallel_for.h b/external/tbb/include/oneapi/tbb/parallel_for.h
index ff45db65..37a26135 100644
--- a/external/tbb/include/oneapi/tbb/parallel_for.h
+++ b/external/tbb/include/oneapi/tbb/parallel_for.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -18,179 +18,183 @@
 #define __TBB_parallel_for_H
 
 #include "detail/_config.h"
-#include "detail/_exception.h"
 #include "detail/_namespace_injection.h"
-#include "detail/_small_object_pool.h"
+#include "detail/_exception.h"
 #include "detail/_task.h"
+#include "detail/_small_object_pool.h"
 #include "profiling.h"
 
-#include "blocked_range.h"
 #include "partitioner.h"
+#include "blocked_range.h"
 #include "task_group.h"
 
 #include <cstddef>
 #include <new>
 
 namespace tbb {
-    namespace detail {
+namespace detail {
 #if __TBB_CPP20_CONCEPTS_PRESENT
-        inline namespace d0 {
-
-            template <typename Body, typename Range>
-            concept parallel_for_body
-                    = std::copy_constructible<Body> && requires(const std::remove_reference_t<Body>& body,
-                                                                Range& range) {
-                body(range);
-            };
-
-            template <typename Index>
-            concept parallel_for_index
-                    = std::constructible_from<Index, int> && std::copyable<Index> && requires(
-                            const std::remove_reference_t<Index>& lhs,
-                            const std::remove_reference_t<Index>& rhs) {
-                { lhs < rhs } -> adaptive_same_as<bool>;
-                { lhs - rhs } -> std::convertible_to<std::size_t>;
-                { lhs + (rhs - lhs) } -> std::convertible_to<Index>;
-            };
-
-            template <typename Function, typename Index>
-            concept parallel_for_function
-                    = requires(const std::remove_reference_t<Function>& func, Index index) {
-                func(index);
-            };
-
-        }// namespace d0
-#endif   // __TBB_CPP20_CONCEPTS_PRESENT
-        namespace d1 {
-
-            //! Task type used in parallel_for
-            /** @ingroup algorithms */
-            template <typename Range, typename Body, typename Partitioner>
-            struct start_for : public task {
-                Range my_range;
-                const Body my_body;
-                node* my_parent;
-
-                typename Partitioner::task_partition_type my_partition;
-                small_object_allocator my_allocator;
-
-                task* execute(execution_data&) override;
-                task* cancel(execution_data&) override;
-                void finalize(const execution_data&);
-
-                //! Constructor for root task.
-                start_for(const Range& range, const Body& body, Partitioner& partitioner,
-                          small_object_allocator& alloc)
-                    : my_range(range), my_body(body), my_partition(partitioner), my_allocator(alloc) {}
-                //! Splitting constructor used to generate children.
-                /** parent_ becomes left child.  Newly constructed object is right child. */
-                start_for(start_for& parent_, typename Partitioner::split_type& split_obj,
-                          small_object_allocator& alloc)
-                    : my_range(parent_.my_range, get_range_split_object<Range>(split_obj)),
-                      my_body(parent_.my_body), my_partition(parent_.my_partition, split_obj),
-                      my_allocator(alloc) {}
-                //! Construct right child from the given range as response to the demand.
-                /** parent_ remains left child.  Newly constructed object is right child. */
-                start_for(start_for& parent_, const Range& r, depth_t d, small_object_allocator& alloc)
-                    : my_range(r), my_body(parent_.my_body), my_partition(parent_.my_partition, split()),
-                      my_allocator(alloc) {
-                    my_partition.align_depth(d);
-                }
-                static void run(const Range& range, const Body& body, Partitioner& partitioner) {
-                    task_group_context context(PARALLEL_FOR);
-                    run(range, body, partitioner, context);
-                }
-
-                static void run(const Range& range, const Body& body, Partitioner& partitioner,
-                                task_group_context& context) {
-                    if (!range.empty()) {
-                        small_object_allocator alloc {};
-                        start_for& for_task = *alloc.new_object<start_for>(range, body, partitioner, alloc);
-
-                        // defer creation of the wait node until task allocation succeeds
-                        wait_node wn;
-                        for_task.my_parent = &wn;
-                        execute_and_wait(for_task, context, wn.m_wait, context);
-                    }
-                }
-                //! Run body for range, serves as callback for partitioner
-                void run_body(Range& r) { my_body(r); }
-
-                //! spawn right task, serves as callback for partitioner
-                void offer_work(typename Partitioner::split_type& split_obj, execution_data& ed) {
-                    offer_work_impl(ed, *this, split_obj);
-                }
-
-                //! spawn right task, serves as callback for partitioner
-                void offer_work(const Range& r, depth_t d, execution_data& ed) {
-                    offer_work_impl(ed, *this, r, d);
-                }
-
-            private:
-                template <typename... Args>
-                void offer_work_impl(execution_data& ed, Args&&... constructor_args) {
-                    // New right child
-                    small_object_allocator alloc {};
-                    start_for& right_child = *alloc.new_object<start_for>(
-                            ed, std::forward<Args>(constructor_args)..., alloc);
-
-                    // New root node as a continuation and ref count. Left and right child attach to the new parent.
-                    right_child.my_parent = my_parent = alloc.new_object<tree_node>(ed, my_parent, 2, alloc);
-                    // Spawn the right sibling
-                    right_child.spawn_self(ed);
-                }
-
-                void spawn_self(execution_data& ed) { my_partition.spawn_task(*this, *context(ed)); }
-            };
-
-            //! fold the tree and deallocate the task
-            template <typename Range, typename Body, typename Partitioner>
-            void start_for<Range, Body, Partitioner>::finalize(const execution_data& ed) {
-                // Get the current parent and allocator an object destruction
-                node* parent = my_parent;
-                auto allocator = my_allocator;
-                // Task execution finished - destroy it
-                this->~start_for();
-                // Unwind the tree decrementing the parent`s reference count
-
-                fold_tree<tree_node>(parent, ed);
-                allocator.deallocate(this, ed);
-            }
-
-            //! execute task for parallel_for
-            template <typename Range, typename Body, typename Partitioner>
-            task* start_for<Range, Body, Partitioner>::execute(execution_data& ed) {
-                if (!is_same_affinity(ed)) { my_partition.note_affinity(execution_slot(ed)); }
-                my_partition.check_being_stolen(*this, ed);
-                my_partition.execute(*this, my_range, ed);
-                finalize(ed);
-                return nullptr;
-            }
-
-            //! cancel task for parallel_for
-            template <typename Range, typename Body, typename Partitioner>
-            task* start_for<Range, Body, Partitioner>::cancel(execution_data& ed) {
-                finalize(ed);
-                return nullptr;
-            }
-
-            //! Calls the function with values from range [begin, end) with a step provided
-            template <typename Function, typename Index>
-            class parallel_for_body_wrapper : detail::no_assign {
-                const Function& my_func;
-                const Index my_begin;
-                const Index my_step;
-
-            public:
-                parallel_for_body_wrapper(const Function& _func, Index& _begin, Index& _step)
-                    : my_func(_func), my_begin(_begin), my_step(_step) {}
-
-                void operator()(const blocked_range<Index>& r) const {
-                    // A set of local variables to help the compiler with vectorization of the following loop.
-                    Index b = r.begin();
-                    Index e = r.end();
-                    Index ms = my_step;
-                    Index k = my_begin + b * ms;
+inline namespace d0 {
+
+template <typename Body, typename Range>
+concept parallel_for_body = std::copy_constructible<Body> && std::invocable<const std::remove_reference_t<Body>&, Range&>;
+
+template <typename Index>
+concept parallel_for_index = std::constructible_from<Index, int> &&
+                             std::copyable<Index> &&
+                             requires( const std::remove_reference_t<Index>& lhs, const std::remove_reference_t<Index>& rhs ) {
+                                 { lhs < rhs } -> adaptive_same_as<bool>;
+                                 { lhs - rhs } -> std::convertible_to<std::size_t>;
+                                 { lhs + (rhs - lhs) } -> std::convertible_to<Index>;
+                             };
+
+template <typename Function, typename Index>
+concept parallel_for_function = std::invocable<const std::remove_reference_t<Function>&, Index>;
+
+} // namespace d0
+#endif // __TBB_CPP20_CONCEPTS_PRESENT
+namespace d1 {
+
+//! Task type used in parallel_for
+/** @ingroup algorithms */
+template<typename Range, typename Body, typename Partitioner>
+struct start_for : public task {
+    Range my_range;
+    const Body my_body;
+    node* my_parent;
+
+    typename Partitioner::task_partition_type my_partition;
+    small_object_allocator my_allocator;
+
+    task* execute(execution_data&) override;
+    task* cancel(execution_data&) override;
+    void finalize(const execution_data&);
+
+    //! Constructor for root task.
+    start_for( const Range& range, const Body& body, Partitioner& partitioner, small_object_allocator& alloc ) :
+        my_range(range),
+        my_body(body),
+        my_parent(nullptr),
+        my_partition(partitioner),
+        my_allocator(alloc) {}
+    //! Splitting constructor used to generate children.
+    /** parent_ becomes left child.  Newly constructed object is right child. */
+    start_for( start_for& parent_, typename Partitioner::split_type& split_obj, small_object_allocator& alloc ) :
+        my_range(parent_.my_range, get_range_split_object<Range>(split_obj)),
+        my_body(parent_.my_body),
+        my_parent(nullptr),
+        my_partition(parent_.my_partition, split_obj),
+        my_allocator(alloc) {}
+    //! Construct right child from the given range as response to the demand.
+    /** parent_ remains left child.  Newly constructed object is right child. */
+    start_for( start_for& parent_, const Range& r, depth_t d, small_object_allocator& alloc ) :
+        my_range(r),
+        my_body(parent_.my_body),
+        my_parent(nullptr),
+        my_partition(parent_.my_partition, split()),
+        my_allocator(alloc)
+    {
+        my_partition.align_depth( d );
+    }
+    static void run(const Range& range, const Body& body, Partitioner& partitioner) {
+        task_group_context context(PARALLEL_FOR);
+        run(range, body, partitioner, context);
+    }
+
+    static void run(const Range& range, const Body& body, Partitioner& partitioner, task_group_context& context) {
+        if ( !range.empty() ) {
+            small_object_allocator alloc{};
+            start_for& for_task = *alloc.new_object<start_for>(range, body, partitioner, alloc);
+
+            // defer creation of the wait node until task allocation succeeds
+            wait_node wn;
+            for_task.my_parent = &wn;
+            execute_and_wait(for_task, context, wn.m_wait, context);
+        }
+    }
+    //! Run body for range, serves as callback for partitioner
+    void run_body( Range &r ) {
+        tbb::detail::invoke(my_body, r);
+    }
+
+    //! spawn right task, serves as callback for partitioner
+    void offer_work(typename Partitioner::split_type& split_obj, execution_data& ed) {
+       offer_work_impl(ed, *this, split_obj);
+    }
+
+    //! spawn right task, serves as callback for partitioner
+    void offer_work(const Range& r, depth_t d, execution_data& ed) {
+        offer_work_impl(ed, *this, r, d);
+    }
+
+private:
+    template <typename... Args>
+    void offer_work_impl(execution_data& ed, Args&&... constructor_args) {
+        // New right child
+        small_object_allocator alloc{};
+        start_for& right_child = *alloc.new_object<start_for>(ed, std::forward<Args>(constructor_args)..., alloc);
+
+        // New root node as a continuation and ref count. Left and right child attach to the new parent.
+        right_child.my_parent = my_parent = alloc.new_object<tree_node>(ed, my_parent, 2, alloc);
+        // Spawn the right sibling
+        right_child.spawn_self(ed);
+    }
+
+    void spawn_self(execution_data& ed) {
+        my_partition.spawn_task(*this, *context(ed));
+    }
+};
+
+//! fold the tree and deallocate the task
+template<typename Range, typename Body, typename Partitioner>
+void start_for<Range, Body, Partitioner>::finalize(const execution_data& ed) {
+    // Get the current parent and allocator an object destruction
+    node* parent = my_parent;
+    auto allocator = my_allocator;
+    // Task execution finished - destroy it
+    this->~start_for();
+    // Unwind the tree decrementing the parent`s reference count
+
+    fold_tree<tree_node>(parent, ed);
+    allocator.deallocate(this, ed);
+
+}
+
+//! execute task for parallel_for
+template<typename Range, typename Body, typename Partitioner>
+task* start_for<Range, Body, Partitioner>::execute(execution_data& ed) {
+    if (!is_same_affinity(ed)) {
+        my_partition.note_affinity(execution_slot(ed));
+    }
+    my_partition.check_being_stolen(*this, ed);
+    my_partition.execute(*this, my_range, ed);
+    finalize(ed);
+    return nullptr;
+}
+
+//! cancel task for parallel_for
+template<typename Range, typename Body, typename Partitioner>
+task* start_for<Range, Body, Partitioner>::cancel(execution_data& ed) {
+    finalize(ed);
+    return nullptr;
+}
+
+//! Calls the function with values from range [begin, end) with a step provided
+template<typename Function, typename Index>
+class parallel_for_body_wrapper : detail::no_assign {
+    const Function &my_func;
+    const Index my_begin;
+    const Index my_step;
+public:
+    parallel_for_body_wrapper( const Function& _func, Index& _begin, Index& _step )
+        : my_func(_func), my_begin(_begin), my_step(_step) {}
+
+    void operator()( const blocked_range<Index>& r ) const {
+        // A set of local variables to help the compiler with vectorization of the following loop.
+        Index b = r.begin();
+        Index e = r.end();
+        Index ms = my_step;
+        Index k = my_begin + b*ms;
 
 #if __INTEL_COMPILER
 #pragma ivdep
@@ -198,323 +202,268 @@ namespace tbb {
 #pragma vector always assert
 #endif
 #endif
-                    for (Index i = b; i < e; ++i, k += ms) { my_func(k); }
-                }
-            };
+        for ( Index i = b; i < e; ++i, k += ms ) {
+            tbb::detail::invoke(my_func, k);
+        }
+    }
+};
 
-            // Requirements on Range concept are documented in blocked_range.h
+// Requirements on Range concept are documented in blocked_range.h
 
-            /** \page parallel_for_body_req Requirements on parallel_for body
+/** \page parallel_for_body_req Requirements on parallel_for body
     Class \c Body implementing the concept of parallel_for body must define:
     - \code Body::Body( const Body& ); \endcode                 Copy constructor
     - \code Body::~Body(); \endcode                             Destructor
     - \code void Body::operator()( Range& r ) const; \endcode   Function call operator applying the body to range \c r.
 **/
 
-            /** \name parallel_for
+/** \name parallel_for
     See also requirements on \ref range_req "Range" and \ref parallel_for_body_req "parallel_for Body". **/
-            //@{
-
-            //! Parallel iteration over range with default partitioner.
-            /** @ingroup algorithms **/
-            template <typename Range, typename Body>
-            __TBB_requires(tbb_range<Range>&& parallel_for_body<Body, Range>) void parallel_for(
-                    const Range& range, const Body& body) {
-                start_for<Range, Body, const __TBB_DEFAULT_PARTITIONER>::run(range, body,
-                                                                             __TBB_DEFAULT_PARTITIONER());
-            }
-
-            //! Parallel iteration over range with simple partitioner.
-            /** @ingroup algorithms **/
-            template <typename Range, typename Body>
-            __TBB_requires(tbb_range<Range>&& parallel_for_body<Body, Range>) void parallel_for(
-                    const Range& range, const Body& body, const simple_partitioner& partitioner) {
-                start_for<Range, Body, const simple_partitioner>::run(range, body, partitioner);
-            }
-
-            //! Parallel iteration over range with auto_partitioner.
-            /** @ingroup algorithms **/
-            template <typename Range, typename Body>
-            __TBB_requires(tbb_range<Range>&& parallel_for_body<Body, Range>) void parallel_for(
-                    const Range& range, const Body& body, const auto_partitioner& partitioner) {
-                start_for<Range, Body, const auto_partitioner>::run(range, body, partitioner);
-            }
-
-            //! Parallel iteration over range with static_partitioner.
-            /** @ingroup algorithms **/
-            template <typename Range, typename Body>
-            __TBB_requires(tbb_range<Range>&& parallel_for_body<Body, Range>) void parallel_for(
-                    const Range& range, const Body& body, const static_partitioner& partitioner) {
-                start_for<Range, Body, const static_partitioner>::run(range, body, partitioner);
-            }
-
-            //! Parallel iteration over range with affinity_partitioner.
-            /** @ingroup algorithms **/
-            template <typename Range, typename Body>
-            __TBB_requires(tbb_range<Range>&& parallel_for_body<Body, Range>) void parallel_for(
-                    const Range& range, const Body& body, affinity_partitioner& partitioner) {
-                start_for<Range, Body, affinity_partitioner>::run(range, body, partitioner);
-            }
-
-            //! Parallel iteration over range with default partitioner and user-supplied context.
-            /** @ingroup algorithms **/
-            template <typename Range, typename Body>
-            __TBB_requires(tbb_range<Range>&& parallel_for_body<Body, Range>) void parallel_for(
-                    const Range& range, const Body& body, task_group_context& context) {
-                start_for<Range, Body, const __TBB_DEFAULT_PARTITIONER>::run(
-                        range, body, __TBB_DEFAULT_PARTITIONER(), context);
-            }
-
-            //! Parallel iteration over range with simple partitioner and user-supplied context.
-            /** @ingroup algorithms **/
-            template <typename Range, typename Body>
-            __TBB_requires(tbb_range<Range>&& parallel_for_body<Body, Range>) void parallel_for(
-                    const Range& range, const Body& body, const simple_partitioner& partitioner,
-                    task_group_context& context) {
-                start_for<Range, Body, const simple_partitioner>::run(range, body, partitioner, context);
-            }
-
-            //! Parallel iteration over range with auto_partitioner and user-supplied context.
-            /** @ingroup algorithms **/
-            template <typename Range, typename Body>
-            __TBB_requires(tbb_range<Range>&& parallel_for_body<Body, Range>) void parallel_for(
-                    const Range& range, const Body& body, const auto_partitioner& partitioner,
-                    task_group_context& context) {
-                start_for<Range, Body, const auto_partitioner>::run(range, body, partitioner, context);
-            }
-
-            //! Parallel iteration over range with static_partitioner and user-supplied context.
-            /** @ingroup algorithms **/
-            template <typename Range, typename Body>
-            __TBB_requires(tbb_range<Range>&& parallel_for_body<Body, Range>) void parallel_for(
-                    const Range& range, const Body& body, const static_partitioner& partitioner,
-                    task_group_context& context) {
-                start_for<Range, Body, const static_partitioner>::run(range, body, partitioner, context);
-            }
-
-            //! Parallel iteration over range with affinity_partitioner and user-supplied context.
-            /** @ingroup algorithms **/
-            template <typename Range, typename Body>
-            __TBB_requires(tbb_range<Range>&& parallel_for_body<Body, Range>) void parallel_for(
-                    const Range& range, const Body& body, affinity_partitioner& partitioner,
-                    task_group_context& context) {
-                start_for<Range, Body, affinity_partitioner>::run(range, body, partitioner, context);
-            }
-
-            //! Implementation of parallel iteration over stepped range of integers with explicit step and partitioner
-            template <typename Index, typename Function, typename Partitioner>
-            void parallel_for_impl(Index first, Index last, Index step, const Function& f,
-                                   Partitioner& partitioner) {
-                if (step <= 0) throw_exception(exception_id::nonpositive_step);// throws std::invalid_argument
-                else if (first < last) {
-                    // Above "else" avoids "potential divide by zero" warning on some platforms
-                    Index end = (last - first - Index(1)) / step + Index(1);
-                    blocked_range<Index> range(static_cast<Index>(0), end);
-                    parallel_for_body_wrapper<Function, Index> body(f, first, step);
-                    parallel_for(range, body, partitioner);
-                }
-            }
-
-            //! Parallel iteration over a range of integers with a step provided and default partitioner
-            template <typename Index, typename Function>
-            __TBB_requires(parallel_for_index<Index>&& parallel_for_function<
-                           Function, Index>) void parallel_for(Index first, Index last, Index step,
-                                                               const Function& f) {
-                parallel_for_impl<Index, Function, const auto_partitioner>(first, last, step, f,
-                                                                           auto_partitioner());
-            }
-            //! Parallel iteration over a range of integers with a step provided and simple partitioner
-            template <typename Index, typename Function>
-            __TBB_requires(parallel_for_index<Index>&& parallel_for_function<
-                           Function, Index>) void parallel_for(Index first, Index last, Index step,
-                                                               const Function& f,
-                                                               const simple_partitioner& partitioner) {
-                parallel_for_impl<Index, Function, const simple_partitioner>(first, last, step, f,
-                                                                             partitioner);
-            }
-            //! Parallel iteration over a range of integers with a step provided and auto partitioner
-            template <typename Index, typename Function>
-            __TBB_requires(parallel_for_index<Index>&& parallel_for_function<
-                           Function, Index>) void parallel_for(Index first, Index last, Index step,
-                                                               const Function& f,
-                                                               const auto_partitioner& partitioner) {
-                parallel_for_impl<Index, Function, const auto_partitioner>(first, last, step, f, partitioner);
-            }
-            //! Parallel iteration over a range of integers with a step provided and static partitioner
-            template <typename Index, typename Function>
-            __TBB_requires(parallel_for_index<Index>&& parallel_for_function<
-                           Function, Index>) void parallel_for(Index first, Index last, Index step,
-                                                               const Function& f,
-                                                               const static_partitioner& partitioner) {
-                parallel_for_impl<Index, Function, const static_partitioner>(first, last, step, f,
-                                                                             partitioner);
-            }
-            //! Parallel iteration over a range of integers with a step provided and affinity partitioner
-            template <typename Index, typename Function>
-            __TBB_requires(parallel_for_index<Index>&& parallel_for_function<
-                           Function, Index>) void parallel_for(Index first, Index last, Index step,
-                                                               const Function& f,
-                                                               affinity_partitioner& partitioner) {
-                parallel_for_impl(first, last, step, f, partitioner);
-            }
-
-            //! Parallel iteration over a range of integers with a default step value and default partitioner
-            template <typename Index, typename Function>
-            __TBB_requires(parallel_for_index<Index>&& parallel_for_function<
-                           Function, Index>) void parallel_for(Index first, Index last, const Function& f) {
-                parallel_for_impl<Index, Function, const auto_partitioner>(first, last, static_cast<Index>(1),
-                                                                           f, auto_partitioner());
-            }
-            //! Parallel iteration over a range of integers with a default step value and simple partitioner
-            template <typename Index, typename Function>
-            __TBB_requires(parallel_for_index<Index>&& parallel_for_function<
-                           Function, Index>) void parallel_for(Index first, Index last, const Function& f,
-                                                               const simple_partitioner& partitioner) {
-                parallel_for_impl<Index, Function, const simple_partitioner>(
-                        first, last, static_cast<Index>(1), f, partitioner);
-            }
-            //! Parallel iteration over a range of integers with a default step value and auto partitioner
-            template <typename Index, typename Function>
-            __TBB_requires(parallel_for_index<Index>&& parallel_for_function<
-                           Function, Index>) void parallel_for(Index first, Index last, const Function& f,
-                                                               const auto_partitioner& partitioner) {
-                parallel_for_impl<Index, Function, const auto_partitioner>(first, last, static_cast<Index>(1),
-                                                                           f, partitioner);
-            }
-            //! Parallel iteration over a range of integers with a default step value and static partitioner
-            template <typename Index, typename Function>
-            __TBB_requires(parallel_for_index<Index>&& parallel_for_function<
-                           Function, Index>) void parallel_for(Index first, Index last, const Function& f,
-                                                               const static_partitioner& partitioner) {
-                parallel_for_impl<Index, Function, const static_partitioner>(
-                        first, last, static_cast<Index>(1), f, partitioner);
-            }
-            //! Parallel iteration over a range of integers with a default step value and affinity partitioner
-            template <typename Index, typename Function>
-            __TBB_requires(parallel_for_index<Index>&& parallel_for_function<
-                           Function, Index>) void parallel_for(Index first, Index last, const Function& f,
-                                                               affinity_partitioner& partitioner) {
-                parallel_for_impl(first, last, static_cast<Index>(1), f, partitioner);
-            }
-
-            //! Implementation of parallel iteration over stepped range of integers with explicit step, task group context, and partitioner
-            template <typename Index, typename Function, typename Partitioner>
-            void parallel_for_impl(Index first, Index last, Index step, const Function& f,
-                                   Partitioner& partitioner, task_group_context& context) {
-                if (step <= 0) throw_exception(exception_id::nonpositive_step);// throws std::invalid_argument
-                else if (first < last) {
-                    // Above "else" avoids "potential divide by zero" warning on some platforms
-                    Index end = (last - first - Index(1)) / step + Index(1);
-                    blocked_range<Index> range(static_cast<Index>(0), end);
-                    parallel_for_body_wrapper<Function, Index> body(f, first, step);
-                    parallel_for(range, body, partitioner, context);
-                }
-            }
-
-            //! Parallel iteration over a range of integers with explicit step, task group context, and default partitioner
-            template <typename Index, typename Function>
-            __TBB_requires(parallel_for_index<Index>&& parallel_for_function<
-                           Function, Index>) void parallel_for(Index first, Index last, Index step,
-                                                               const Function& f,
-                                                               task_group_context& context) {
-                parallel_for_impl<Index, Function, const auto_partitioner>(first, last, step, f,
-                                                                           auto_partitioner(), context);
-            }
-            //! Parallel iteration over a range of integers with explicit step, task group context, and simple partitioner
-            template <typename Index, typename Function>
-            __TBB_requires(parallel_for_index<Index>&& parallel_for_function<
-                           Function, Index>) void parallel_for(Index first, Index last, Index step,
-                                                               const Function& f,
-                                                               const simple_partitioner& partitioner,
-                                                               task_group_context& context) {
-                parallel_for_impl<Index, Function, const simple_partitioner>(first, last, step, f,
-                                                                             partitioner, context);
-            }
-            //! Parallel iteration over a range of integers with explicit step, task group context, and auto partitioner
-            template <typename Index, typename Function>
-            __TBB_requires(parallel_for_index<Index>&& parallel_for_function<
-                           Function, Index>) void parallel_for(Index first, Index last, Index step,
-                                                               const Function& f,
-                                                               const auto_partitioner& partitioner,
-                                                               task_group_context& context) {
-                parallel_for_impl<Index, Function, const auto_partitioner>(first, last, step, f, partitioner,
-                                                                           context);
-            }
-            //! Parallel iteration over a range of integers with explicit step, task group context, and static partitioner
-            template <typename Index, typename Function>
-            __TBB_requires(parallel_for_index<Index>&& parallel_for_function<
-                           Function, Index>) void parallel_for(Index first, Index last, Index step,
-                                                               const Function& f,
-                                                               const static_partitioner& partitioner,
-                                                               task_group_context& context) {
-                parallel_for_impl<Index, Function, const static_partitioner>(first, last, step, f,
-                                                                             partitioner, context);
-            }
-            //! Parallel iteration over a range of integers with explicit step, task group context, and affinity partitioner
-            template <typename Index, typename Function>
-            __TBB_requires(parallel_for_index<Index>&& parallel_for_function<
-                           Function, Index>) void parallel_for(Index first, Index last, Index step,
-                                                               const Function& f,
-                                                               affinity_partitioner& partitioner,
-                                                               task_group_context& context) {
-                parallel_for_impl(first, last, step, f, partitioner, context);
-            }
-
-            //! Parallel iteration over a range of integers with a default step value, explicit task group context, and default partitioner
-            template <typename Index, typename Function>
-            __TBB_requires(parallel_for_index<Index>&& parallel_for_function<
-                           Function, Index>) void parallel_for(Index first, Index last, const Function& f,
-                                                               task_group_context& context) {
-                parallel_for_impl<Index, Function, const auto_partitioner>(first, last, static_cast<Index>(1),
-                                                                           f, auto_partitioner(), context);
-            }
-            //! Parallel iteration over a range of integers with a default step value, explicit task group context, and simple partitioner
-            template <typename Index, typename Function>
-            __TBB_requires(parallel_for_index<Index>&& parallel_for_function<
-                           Function, Index>) void parallel_for(Index first, Index last, const Function& f,
-                                                               const simple_partitioner& partitioner,
-                                                               task_group_context& context) {
-                parallel_for_impl<Index, Function, const simple_partitioner>(
-                        first, last, static_cast<Index>(1), f, partitioner, context);
-            }
-            //! Parallel iteration over a range of integers with a default step value, explicit task group context, and auto partitioner
-            template <typename Index, typename Function>
-            __TBB_requires(parallel_for_index<Index>&& parallel_for_function<
-                           Function, Index>) void parallel_for(Index first, Index last, const Function& f,
-                                                               const auto_partitioner& partitioner,
-                                                               task_group_context& context) {
-                parallel_for_impl<Index, Function, const auto_partitioner>(first, last, static_cast<Index>(1),
-                                                                           f, partitioner, context);
-            }
-            //! Parallel iteration over a range of integers with a default step value, explicit task group context, and static partitioner
-            template <typename Index, typename Function>
-            __TBB_requires(parallel_for_index<Index>&& parallel_for_function<
-                           Function, Index>) void parallel_for(Index first, Index last, const Function& f,
-                                                               const static_partitioner& partitioner,
-                                                               task_group_context& context) {
-                parallel_for_impl<Index, Function, const static_partitioner>(
-                        first, last, static_cast<Index>(1), f, partitioner, context);
-            }
-            //! Parallel iteration over a range of integers with a default step value, explicit task group context, and affinity_partitioner
-            template <typename Index, typename Function>
-            __TBB_requires(parallel_for_index<Index>&& parallel_for_function<
-                           Function, Index>) void parallel_for(Index first, Index last, const Function& f,
-                                                               affinity_partitioner& partitioner,
-                                                               task_group_context& context) {
-                parallel_for_impl(first, last, static_cast<Index>(1), f, partitioner, context);
-            }
-            // @}
-
-        }// namespace d1
-    }    // namespace detail
-
-    inline namespace v1 {
-        using detail::d1::parallel_for;
-        // Split types
-        using detail::proportional_split;
-        using detail::split;
-    }// namespace v1
-
-}// namespace tbb
+//@{
+
+//! Parallel iteration over range with default partitioner.
+/** @ingroup algorithms **/
+template<typename Range, typename Body>
+    __TBB_requires(tbb_range<Range> && parallel_for_body<Body, Range>)
+void parallel_for( const Range& range, const Body& body ) {
+    start_for<Range,Body,const __TBB_DEFAULT_PARTITIONER>::run(range,body,__TBB_DEFAULT_PARTITIONER());
+}
+
+//! Parallel iteration over range with simple partitioner.
+/** @ingroup algorithms **/
+template<typename Range, typename Body>
+    __TBB_requires(tbb_range<Range> && parallel_for_body<Body, Range>)
+void parallel_for( const Range& range, const Body& body, const simple_partitioner& partitioner ) {
+    start_for<Range,Body,const simple_partitioner>::run(range,body,partitioner);
+}
+
+//! Parallel iteration over range with auto_partitioner.
+/** @ingroup algorithms **/
+template<typename Range, typename Body>
+    __TBB_requires(tbb_range<Range> && parallel_for_body<Body, Range>)
+void parallel_for( const Range& range, const Body& body, const auto_partitioner& partitioner ) {
+    start_for<Range,Body,const auto_partitioner>::run(range,body,partitioner);
+}
+
+//! Parallel iteration over range with static_partitioner.
+/** @ingroup algorithms **/
+template<typename Range, typename Body>
+    __TBB_requires(tbb_range<Range> && parallel_for_body<Body, Range>)
+void parallel_for( const Range& range, const Body& body, const static_partitioner& partitioner ) {
+    start_for<Range,Body,const static_partitioner>::run(range,body,partitioner);
+}
+
+//! Parallel iteration over range with affinity_partitioner.
+/** @ingroup algorithms **/
+template<typename Range, typename Body>
+    __TBB_requires(tbb_range<Range> && parallel_for_body<Body, Range>)
+void parallel_for( const Range& range, const Body& body, affinity_partitioner& partitioner ) {
+    start_for<Range,Body,affinity_partitioner>::run(range,body,partitioner);
+}
+
+//! Parallel iteration over range with default partitioner and user-supplied context.
+/** @ingroup algorithms **/
+template<typename Range, typename Body>
+    __TBB_requires(tbb_range<Range> && parallel_for_body<Body, Range>)
+void parallel_for( const Range& range, const Body& body, task_group_context& context ) {
+    start_for<Range,Body,const __TBB_DEFAULT_PARTITIONER>::run(range, body, __TBB_DEFAULT_PARTITIONER(), context);
+}
+
+//! Parallel iteration over range with simple partitioner and user-supplied context.
+/** @ingroup algorithms **/
+template<typename Range, typename Body>
+    __TBB_requires(tbb_range<Range> && parallel_for_body<Body, Range>)
+void parallel_for( const Range& range, const Body& body, const simple_partitioner& partitioner, task_group_context& context ) {
+    start_for<Range,Body,const simple_partitioner>::run(range, body, partitioner, context);
+}
+
+//! Parallel iteration over range with auto_partitioner and user-supplied context.
+/** @ingroup algorithms **/
+template<typename Range, typename Body>
+    __TBB_requires(tbb_range<Range> && parallel_for_body<Body, Range>)
+void parallel_for( const Range& range, const Body& body, const auto_partitioner& partitioner, task_group_context& context ) {
+    start_for<Range,Body,const auto_partitioner>::run(range, body, partitioner, context);
+}
+
+//! Parallel iteration over range with static_partitioner and user-supplied context.
+/** @ingroup algorithms **/
+template<typename Range, typename Body>
+    __TBB_requires(tbb_range<Range> && parallel_for_body<Body, Range>)
+void parallel_for( const Range& range, const Body& body, const static_partitioner& partitioner, task_group_context& context ) {
+    start_for<Range,Body,const static_partitioner>::run(range, body, partitioner, context);
+}
+
+//! Parallel iteration over range with affinity_partitioner and user-supplied context.
+/** @ingroup algorithms **/
+template<typename Range, typename Body>
+    __TBB_requires(tbb_range<Range> && parallel_for_body<Body, Range>)
+void parallel_for( const Range& range, const Body& body, affinity_partitioner& partitioner, task_group_context& context ) {
+    start_for<Range,Body,affinity_partitioner>::run(range,body,partitioner, context);
+}
+
+//! Implementation of parallel iteration over stepped range of integers with explicit step and partitioner
+template <typename Index, typename Function, typename Partitioner>
+void parallel_for_impl(Index first, Index last, Index step, const Function& f, Partitioner& partitioner) {
+    if (step <= 0 )
+        throw_exception(exception_id::nonpositive_step); // throws std::invalid_argument
+    else if (first < last) {
+        // Above "else" avoids "potential divide by zero" warning on some platforms
+        Index end = Index(last - first - 1ul) / step + Index(1);
+        blocked_range<Index> range(static_cast<Index>(0), end);
+        parallel_for_body_wrapper<Function, Index> body(f, first, step);
+        parallel_for(range, body, partitioner);
+    }
+}
+
+//! Parallel iteration over a range of integers with a step provided and default partitioner
+template <typename Index, typename Function>
+    __TBB_requires(parallel_for_index<Index> && parallel_for_function<Function, Index>)
+void parallel_for(Index first, Index last, Index step, const Function& f) {
+    parallel_for_impl<Index,Function,const __TBB_DEFAULT_PARTITIONER>(first, last, step, f, __TBB_DEFAULT_PARTITIONER());
+}
+//! Parallel iteration over a range of integers with a step provided and simple partitioner
+template <typename Index, typename Function>
+    __TBB_requires(parallel_for_index<Index> && parallel_for_function<Function, Index>)
+void parallel_for(Index first, Index last, Index step, const Function& f, const simple_partitioner& partitioner) {
+    parallel_for_impl<Index,Function,const simple_partitioner>(first, last, step, f, partitioner);
+}
+//! Parallel iteration over a range of integers with a step provided and auto partitioner
+template <typename Index, typename Function>
+    __TBB_requires(parallel_for_index<Index> && parallel_for_function<Function, Index>)
+void parallel_for(Index first, Index last, Index step, const Function& f, const auto_partitioner& partitioner) {
+    parallel_for_impl<Index,Function,const auto_partitioner>(first, last, step, f, partitioner);
+}
+//! Parallel iteration over a range of integers with a step provided and static partitioner
+template <typename Index, typename Function>
+    __TBB_requires(parallel_for_index<Index> && parallel_for_function<Function, Index>)
+void parallel_for(Index first, Index last, Index step, const Function& f, const static_partitioner& partitioner) {
+    parallel_for_impl<Index,Function,const static_partitioner>(first, last, step, f, partitioner);
+}
+//! Parallel iteration over a range of integers with a step provided and affinity partitioner
+template <typename Index, typename Function>
+    __TBB_requires(parallel_for_index<Index> && parallel_for_function<Function, Index>)
+void parallel_for(Index first, Index last, Index step, const Function& f, affinity_partitioner& partitioner) {
+    parallel_for_impl(first, last, step, f, partitioner);
+}
+
+//! Parallel iteration over a range of integers with a default step value and default partitioner
+template <typename Index, typename Function>
+    __TBB_requires(parallel_for_index<Index> && parallel_for_function<Function, Index>)
+void parallel_for(Index first, Index last, const Function& f) {
+    parallel_for_impl<Index,Function,const __TBB_DEFAULT_PARTITIONER>(first, last, static_cast<Index>(1), f, __TBB_DEFAULT_PARTITIONER());
+}
+//! Parallel iteration over a range of integers with a default step value and simple partitioner
+template <typename Index, typename Function>
+    __TBB_requires(parallel_for_index<Index> && parallel_for_function<Function, Index>)
+void parallel_for(Index first, Index last, const Function& f, const simple_partitioner& partitioner) {
+    parallel_for_impl<Index,Function,const simple_partitioner>(first, last, static_cast<Index>(1), f, partitioner);
+}
+//! Parallel iteration over a range of integers with a default step value and auto partitioner
+template <typename Index, typename Function>
+    __TBB_requires(parallel_for_index<Index> && parallel_for_function<Function, Index>)
+void parallel_for(Index first, Index last, const Function& f, const auto_partitioner& partitioner) {
+    parallel_for_impl<Index,Function,const auto_partitioner>(first, last, static_cast<Index>(1), f, partitioner);
+}
+//! Parallel iteration over a range of integers with a default step value and static partitioner
+template <typename Index, typename Function>
+    __TBB_requires(parallel_for_index<Index> && parallel_for_function<Function, Index>)
+void parallel_for(Index first, Index last, const Function& f, const static_partitioner& partitioner) {
+    parallel_for_impl<Index,Function,const static_partitioner>(first, last, static_cast<Index>(1), f, partitioner);
+}
+//! Parallel iteration over a range of integers with a default step value and affinity partitioner
+template <typename Index, typename Function>
+    __TBB_requires(parallel_for_index<Index> && parallel_for_function<Function, Index>)
+void parallel_for(Index first, Index last, const Function& f, affinity_partitioner& partitioner) {
+    parallel_for_impl(first, last, static_cast<Index>(1), f, partitioner);
+}
+
+//! Implementation of parallel iteration over stepped range of integers with explicit step, task group context, and partitioner
+template <typename Index, typename Function, typename Partitioner>
+void parallel_for_impl(Index first, Index last, Index step, const Function& f, Partitioner& partitioner, task_group_context &context) {
+    if (step <= 0 )
+        throw_exception(exception_id::nonpositive_step); // throws std::invalid_argument
+    else if (first < last) {
+        // Above "else" avoids "potential divide by zero" warning on some platforms
+        Index end = (last - first - Index(1)) / step + Index(1);
+        blocked_range<Index> range(static_cast<Index>(0), end);
+        parallel_for_body_wrapper<Function, Index> body(f, first, step);
+        parallel_for(range, body, partitioner, context);
+    }
+}
+
+//! Parallel iteration over a range of integers with explicit step, task group context, and default partitioner
+template <typename Index, typename Function>
+    __TBB_requires(parallel_for_index<Index> && parallel_for_function<Function, Index>)
+void parallel_for(Index first, Index last, Index step, const Function& f, task_group_context &context) {
+    parallel_for_impl<Index,Function,const __TBB_DEFAULT_PARTITIONER>(first, last, step, f, __TBB_DEFAULT_PARTITIONER(), context);
+}
+//! Parallel iteration over a range of integers with explicit step, task group context, and simple partitioner
+template <typename Index, typename Function>
+    __TBB_requires(parallel_for_index<Index> && parallel_for_function<Function, Index>)
+void parallel_for(Index first, Index last, Index step, const Function& f, const simple_partitioner& partitioner, task_group_context &context) {
+    parallel_for_impl<Index,Function,const simple_partitioner>(first, last, step, f, partitioner, context);
+}
+//! Parallel iteration over a range of integers with explicit step, task group context, and auto partitioner
+template <typename Index, typename Function>
+    __TBB_requires(parallel_for_index<Index> && parallel_for_function<Function, Index>)
+void parallel_for(Index first, Index last, Index step, const Function& f, const auto_partitioner& partitioner, task_group_context &context) {
+    parallel_for_impl<Index,Function,const auto_partitioner>(first, last, step, f, partitioner, context);
+}
+//! Parallel iteration over a range of integers with explicit step, task group context, and static partitioner
+template <typename Index, typename Function>
+    __TBB_requires(parallel_for_index<Index> && parallel_for_function<Function, Index>)
+void parallel_for(Index first, Index last, Index step, const Function& f, const static_partitioner& partitioner, task_group_context &context) {
+    parallel_for_impl<Index,Function,const static_partitioner>(first, last, step, f, partitioner, context);
+}
+//! Parallel iteration over a range of integers with explicit step, task group context, and affinity partitioner
+template <typename Index, typename Function>
+    __TBB_requires(parallel_for_index<Index> && parallel_for_function<Function, Index>)
+void parallel_for(Index first, Index last, Index step, const Function& f, affinity_partitioner& partitioner, task_group_context &context) {
+    parallel_for_impl(first, last, step, f, partitioner, context);
+}
+
+//! Parallel iteration over a range of integers with a default step value, explicit task group context, and default partitioner
+template <typename Index, typename Function>
+    __TBB_requires(parallel_for_index<Index> && parallel_for_function<Function, Index>)
+void parallel_for(Index first, Index last, const Function& f, task_group_context &context) {
+    parallel_for_impl<Index,Function,const __TBB_DEFAULT_PARTITIONER>(first, last, static_cast<Index>(1), f, __TBB_DEFAULT_PARTITIONER(), context);
+}
+//! Parallel iteration over a range of integers with a default step value, explicit task group context, and simple partitioner
+template <typename Index, typename Function>
+    __TBB_requires(parallel_for_index<Index> && parallel_for_function<Function, Index>)
+void parallel_for(Index first, Index last, const Function& f, const simple_partitioner& partitioner, task_group_context &context) {
+    parallel_for_impl<Index,Function,const simple_partitioner>(first, last, static_cast<Index>(1), f, partitioner, context);
+}
+//! Parallel iteration over a range of integers with a default step value, explicit task group context, and auto partitioner
+template <typename Index, typename Function>
+    __TBB_requires(parallel_for_index<Index> && parallel_for_function<Function, Index>)
+void parallel_for(Index first, Index last, const Function& f, const auto_partitioner& partitioner, task_group_context &context) {
+    parallel_for_impl<Index,Function,const auto_partitioner>(first, last, static_cast<Index>(1), f, partitioner, context);
+}
+//! Parallel iteration over a range of integers with a default step value, explicit task group context, and static partitioner
+template <typename Index, typename Function>
+    __TBB_requires(parallel_for_index<Index> && parallel_for_function<Function, Index>)
+void parallel_for(Index first, Index last, const Function& f, const static_partitioner& partitioner, task_group_context &context) {
+    parallel_for_impl<Index,Function,const static_partitioner>(first, last, static_cast<Index>(1), f, partitioner, context);
+}
+//! Parallel iteration over a range of integers with a default step value, explicit task group context, and affinity_partitioner
+template <typename Index, typename Function>
+    __TBB_requires(parallel_for_index<Index> && parallel_for_function<Function, Index>)
+void parallel_for(Index first, Index last, const Function& f, affinity_partitioner& partitioner, task_group_context &context) {
+    parallel_for_impl(first, last, static_cast<Index>(1), f, partitioner, context);
+}
+// @}
+
+} // namespace d1
+} // namespace detail
+
+inline namespace v1 {
+using detail::d1::parallel_for;
+// Split types
+using detail::split;
+using detail::proportional_split;
+} // namespace v1
+
+} // namespace tbb
 
 #endif /* __TBB_parallel_for_H */
diff --git a/external/tbb/include/oneapi/tbb/parallel_for_each.h b/external/tbb/include/oneapi/tbb/parallel_for_each.h
index 2f2ad229..b64eb233 100644
--- a/external/tbb/include/oneapi/tbb/parallel_for_each.h
+++ b/external/tbb/include/oneapi/tbb/parallel_for_each.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2025 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -17,615 +17,624 @@
 #ifndef __TBB_parallel_for_each_H
 #define __TBB_parallel_for_each_H
 
-#include "detail/_aligned_space.h"
 #include "detail/_config.h"
-#include "detail/_exception.h"
 #include "detail/_namespace_injection.h"
-#include "detail/_small_object_pool.h"
+#include "detail/_exception.h"
 #include "detail/_task.h"
+#include "detail/_aligned_space.h"
+#include "detail/_small_object_pool.h"
+#include "detail/_utils.h"
 
 #include "parallel_for.h"
-#include "task_group.h"// task_group_context
+#include "task_group.h" // task_group_context
 
 #include <iterator>
 #include <type_traits>
 
 namespace tbb {
-    namespace detail {
+namespace detail {
 #if __TBB_CPP20_CONCEPTS_PRESENT
-        namespace d1 {
-            template <typename Item>
-            class feeder;
-
-        }// namespace d1
-        inline namespace d0 {
-
-            template <typename Body, typename ItemType, typename FeederItemType>
-            concept parallel_for_each_body
-                    = requires(const std::remove_reference_t<Body>& body, ItemType&& item) {
-                body(std::forward<ItemType>(item));
-            }
-            || requires(const std::remove_reference_t<Body>& body, ItemType&& item,
-                        tbb::detail::d1::feeder<FeederItemType>& feeder) {
-                body(std::forward<ItemType>(item), feeder);
-            };
-
-        }// namespace d0
-#endif   // __TBB_CPP20_CONCEPTS_PRESENT
-        namespace d2 {
-            template <typename Body, typename Item>
-            class feeder_impl;
-        }// namespace d2
-
-        namespace d1 {
-            //! Class the user supplied algorithm body uses to add new tasks
-            template <typename Item>
-            class feeder {
-                feeder() {}
-                feeder(const feeder&) = delete;
-                void operator=(const feeder&) = delete;
-
-                virtual ~feeder() {}
-                virtual void internal_add_copy(const Item& item) = 0;
-                virtual void internal_add_move(Item&& item) = 0;
-
-                template <typename Body_, typename Item_>
-                friend class d2::feeder_impl;
-
-            public:
-                //! Add a work item to a running parallel_for_each.
-                void add(const Item& item) { internal_add_copy(item); }
-                void add(Item&& item) { internal_add_move(std::move(item)); }
-            };
-
-        }// namespace d1
-
-        namespace d2 {
-            using namespace tbb::detail::d1;
-            /** Selects one of the two possible forms of function call member operator.
+namespace d1 {
+template <typename Item>
+class feeder;
+
+} // namespace d1
+inline namespace d0 {
+
+template <typename Body, typename ItemType, typename FeederItemType>
+concept parallel_for_each_body = std::invocable<const std::remove_reference_t<Body>&, ItemType&&> ||
+                                 std::invocable<const std::remove_reference_t<Body>&, ItemType&&, tbb::detail::d1::feeder<FeederItemType>&>;
+
+} // namespace d0
+#endif // __TBB_CPP20_CONCEPTS_PRESENT
+namespace d2 {
+template<typename Body, typename Item> class feeder_impl;
+} // namespace d2
+
+namespace d1 {
+//! Class the user supplied algorithm body uses to add new tasks
+template<typename Item>
+class feeder {
+    feeder() {}
+    feeder(const feeder&) = delete;
+    void operator=( const feeder&) = delete;
+
+    virtual ~feeder () {}
+    virtual void internal_add_copy(const Item& item) = 0;
+    virtual void internal_add_move(Item&& item) = 0;
+
+    template<typename Body_, typename Item_> friend class d2::feeder_impl;
+public:
+    //! Add a work item to a running parallel_for_each.
+    void add(const Item& item) {internal_add_copy(item);}
+    void add(Item&& item) {internal_add_move(std::move(item));}
+};
+
+} // namespace d1
+
+namespace d2 {
+using namespace tbb::detail::d1;
+/** Selects one of the two possible forms of function call member operator.
     @ingroup algorithms **/
-            template <class Body>
-            struct parallel_for_each_operator_selector {
-            public:
-                template <typename ItemArg, typename FeederArg>
-                static auto call(const Body& body, ItemArg&& item, FeederArg*)
-                        -> decltype(body(std::forward<ItemArg>(item)), void()) {
-#if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
-// Suppression of Microsoft non-standard extension warnings
-#pragma warning(push)
-#pragma warning(disable : 4239)
-#endif
-
-                    body(std::forward<ItemArg>(item));
-
-#if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
-#pragma warning(push)
-#endif
-                }
-
-                template <typename ItemArg, typename FeederArg>
-                static auto call(const Body& body, ItemArg&& item, FeederArg* feeder)
-                        -> decltype(body(std::forward<ItemArg>(item), *feeder), void()) {
-#if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
-// Suppression of Microsoft non-standard extension warnings
-#pragma warning(push)
-#pragma warning(disable : 4239)
-#endif
-                    __TBB_ASSERT(feeder, "Feeder was not created but should be");
-
-                    body(std::forward<ItemArg>(item), *feeder);
-
-#if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
-#pragma warning(push)
-#endif
-                }
-            };
-
-            template <typename Body, typename Item>
-            struct feeder_item_task : public task {
-                using feeder_type = feeder_impl<Body, Item>;
-
-                template <typename ItemType>
-                feeder_item_task(ItemType&& input_item, feeder_type& feeder, small_object_allocator& alloc)
-                    : item(std::forward<ItemType>(input_item)), my_feeder(feeder), my_allocator(alloc) {}
-
-                void finalize(const execution_data& ed) {
-                    my_feeder.my_wait_context.release();
-                    my_allocator.delete_object(this, ed);
-                }
-
-                //! Hack for resolve ambiguity between calls to the body with and without moving the stored copy
-                //! Executing body with moving the copy should have higher priority
-                using first_priority = int;
-                using second_priority = double;
-
-                template <typename BodyType, typename ItemType, typename FeederType>
-                static auto call(const BodyType& call_body, ItemType& call_item, FeederType& call_feeder,
-                                 first_priority)
-                        -> decltype(parallel_for_each_operator_selector<Body>::call(call_body,
-                                                                                    std::move(call_item),
-                                                                                    &call_feeder),
-                                    void()) {
-                    parallel_for_each_operator_selector<Body>::call(call_body, std::move(call_item),
-                                                                    &call_feeder);
-                }
-
-                template <typename BodyType, typename ItemType, typename FeederType>
-                static void call(const BodyType& call_body, ItemType& call_item, FeederType& call_feeder,
-                                 second_priority) {
-                    parallel_for_each_operator_selector<Body>::call(call_body, call_item, &call_feeder);
-                }
-
-                task* execute(execution_data& ed) override {
-                    call(my_feeder.my_body, item, my_feeder, first_priority {});
-                    finalize(ed);
-                    return nullptr;
-                }
-
-                task* cancel(execution_data& ed) override {
-                    finalize(ed);
-                    return nullptr;
-                }
-
-                Item item;
-                feeder_type& my_feeder;
-                small_object_allocator my_allocator;
-            };// class feeder_item_task
-
-            /** Implements new task adding procedure.
+template<class Body>
+struct parallel_for_each_operator_selector {
+public:
+    template<typename ItemArg, typename FeederArg>
+    static auto call(const Body& body, ItemArg&& item, FeederArg*)
+    -> decltype(tbb::detail::invoke(body, std::forward<ItemArg>(item)), void()) {
+        #if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
+        // Suppression of Microsoft non-standard extension warnings
+        #pragma warning (push)
+        #pragma warning (disable: 4239)
+        #endif
+
+        tbb::detail::invoke(body, std::forward<ItemArg>(item));
+
+        #if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
+        #pragma warning (pop)
+        #endif
+    }
+
+    template<typename ItemArg, typename FeederArg>
+    static auto call(const Body& body, ItemArg&& item, FeederArg* feeder)
+    -> decltype(tbb::detail::invoke(body, std::forward<ItemArg>(item), *feeder), void()) {
+        #if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
+        // Suppression of Microsoft non-standard extension warnings
+        #pragma warning (push)
+        #pragma warning (disable: 4239)
+        #endif
+        __TBB_ASSERT(feeder, "Feeder was not created but should be");
+
+        tbb::detail::invoke(body, std::forward<ItemArg>(item), *feeder);
+
+        #if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
+        #pragma warning (pop)
+        #endif
+    }
+};
+
+template<typename Body, typename Item>
+struct feeder_item_task: public task {
+    using feeder_type = feeder_impl<Body, Item>;
+
+    template <typename ItemType>
+    feeder_item_task(ItemType&& input_item, feeder_type& feeder, small_object_allocator& alloc, wait_tree_vertex_interface& wait_vertex) :
+        item(std::forward<ItemType>(input_item)),
+        my_feeder(feeder),
+        my_allocator(alloc),
+        m_wait_tree_vertex(r1::get_thread_reference_vertex(&wait_vertex))
+    {
+        m_wait_tree_vertex->reserve();
+    }
+
+    void finalize(const execution_data& ed) {
+        m_wait_tree_vertex->release();
+        my_allocator.delete_object(this, ed);
+    }
+
+    //! Hack for resolve ambiguity between calls to the body with and without moving the stored copy
+    //! Executing body with moving the copy should have higher priority
+    using first_priority = int;
+    using second_priority = double;
+
+    template <typename BodyType, typename ItemType, typename FeederType>
+    static auto call(const BodyType& call_body, ItemType& call_item, FeederType& call_feeder, first_priority)
+    -> decltype(parallel_for_each_operator_selector<Body>::call(call_body, std::move(call_item), &call_feeder), void())
+    {
+        parallel_for_each_operator_selector<Body>::call(call_body, std::move(call_item), &call_feeder);
+    }
+
+    template <typename BodyType, typename ItemType, typename FeederType>
+    static void call(const BodyType& call_body, ItemType& call_item, FeederType& call_feeder, second_priority) {
+        parallel_for_each_operator_selector<Body>::call(call_body, call_item, &call_feeder);
+    }
+
+    task* execute(execution_data& ed) override {
+        call(my_feeder.my_body, item, my_feeder, first_priority{});
+        finalize(ed);
+        return nullptr;
+    }
+
+    task* cancel(execution_data& ed) override {
+        finalize(ed);
+        return nullptr;
+    }
+
+    Item item;
+    feeder_type& my_feeder;
+    small_object_allocator my_allocator;
+    wait_tree_vertex_interface* m_wait_tree_vertex;
+}; // class feeder_item_task
+
+/** Implements new task adding procedure.
     @ingroup algorithms **/
-            template <typename Body, typename Item>
-            class feeder_impl : public feeder<Item> {
-                // Avoiding use of copy constructor in a virtual method if the type does not support it
-                void internal_add_copy_impl(std::true_type, const Item& item) {
-                    using feeder_task = feeder_item_task<Body, Item>;
-                    small_object_allocator alloc;
-                    auto task = alloc.new_object<feeder_task>(item, *this, alloc);
-
-                    my_wait_context.reserve();
-                    spawn(*task, my_execution_context);
-                }
-
-                void internal_add_copy_impl(std::false_type, const Item&) {
-                    __TBB_ASSERT(false, "Overloading for r-value reference doesn't work or it's not movable "
-                                        "and not copyable object");
-                }
-
-                void internal_add_copy(const Item& item) override {
-                    internal_add_copy_impl(typename std::is_copy_constructible<Item>::type(), item);
-                }
-
-                void internal_add_move(Item&& item) override {
-                    using feeder_task = feeder_item_task<Body, Item>;
-                    small_object_allocator alloc {};
-                    auto task = alloc.new_object<feeder_task>(std::move(item), *this, alloc);
-
-                    my_wait_context.reserve();
-                    spawn(*task, my_execution_context);
-                }
-
-            public:
-                feeder_impl(const Body& body, wait_context& w_context, task_group_context& context)
-                    : my_body(body), my_wait_context(w_context), my_execution_context(context) {}
-
-                const Body& my_body;
-                wait_context& my_wait_context;
-                task_group_context& my_execution_context;
-            };// class feeder_impl
-
-            /** Execute computation under one element of the range
+template<typename Body, typename Item>
+class feeder_impl : public feeder<Item> {
+    // Avoiding use of copy constructor in a virtual method if the type does not support it
+    void internal_add_copy_impl(std::true_type, const Item& item) {
+        using feeder_task = feeder_item_task<Body, Item>;
+        small_object_allocator alloc;
+        auto task = alloc.new_object<feeder_task>(item, *this, alloc, my_wait_context);
+
+        spawn(*task, my_execution_context);
+    }
+
+    void internal_add_copy_impl(std::false_type, const Item&) {
+        __TBB_ASSERT(false, "Overloading for r-value reference doesn't work or it's not movable and not copyable object");
+    }
+
+    void internal_add_copy(const Item& item) override {
+        internal_add_copy_impl(typename std::is_copy_constructible<Item>::type(), item);
+    }
+
+    void internal_add_move(Item&& item) override {
+        using feeder_task = feeder_item_task<Body, Item>;
+        small_object_allocator alloc{};
+        auto task = alloc.new_object<feeder_task>(std::move(item), *this, alloc, my_wait_context);
+
+        spawn(*task, my_execution_context);
+    }
+public:
+    feeder_impl(const Body& body, wait_context_vertex& w_context, task_group_context &context)
+      : my_body(body),
+        my_wait_context(w_context)
+      , my_execution_context(context)
+    {}
+
+    const Body& my_body;
+    wait_context_vertex& my_wait_context;
+    task_group_context& my_execution_context;
+}; // class feeder_impl
+
+/** Execute computation under one element of the range
     @ingroup algorithms **/
-            template <typename Iterator, typename Body, typename Item>
-            struct for_each_iteration_task : public task {
-                using feeder_type = feeder_impl<Body, Item>;
-
-                for_each_iteration_task(Iterator input_item_ptr, const Body& body,
-                                        feeder_impl<Body, Item>* feeder_ptr, wait_context& wait_context)
-                    : item_ptr(input_item_ptr), my_body(body), my_feeder_ptr(feeder_ptr),
-                      parent_wait_context(wait_context) {}
-
-                void finalize() { parent_wait_context.release(); }
-
-                task* execute(execution_data&) override {
-                    parallel_for_each_operator_selector<Body>::call(my_body, *item_ptr, my_feeder_ptr);
-                    finalize();
-                    return nullptr;
-                }
-
-                task* cancel(execution_data&) override {
-                    finalize();
-                    return nullptr;
-                }
-
-                Iterator item_ptr;
-                const Body& my_body;
-                feeder_impl<Body, Item>* my_feeder_ptr;
-                wait_context& parent_wait_context;
-            };// class for_each_iteration_task
-
-            // Helper to get the type of the iterator to the internal sequence of copies
-            // If the element can be passed to the body as an rvalue - this iterator should be move_iterator
-            template <typename Body, typename Item, typename = void>
-            struct input_iteration_task_iterator_helper {
-                // For input iterators we pass const lvalue reference to the body
-                // It is prohibited to take non-constant lvalue references for input iterators
-                using type = const Item*;
-            };
-
-            template <typename Body, typename Item>
-            struct input_iteration_task_iterator_helper<
-                    Body, Item,
-                    tbb::detail::void_t<decltype(parallel_for_each_operator_selector<Body>::call(
-                            std::declval<const Body&>(), std::declval<Item&&>(),
-                            std::declval<feeder_impl<Body, Item>*>()))>> {
-                using type = std::move_iterator<Item*>;
-            };
-
-            /** Split one block task to several(max_block_size) iteration tasks for input iterators
+template<typename Iterator, typename Body, typename Item>
+struct for_each_iteration_task: public task {
+    using feeder_type = feeder_impl<Body, Item>;
+
+    for_each_iteration_task(Iterator input_item_ptr, const Body& body, feeder_impl<Body, Item>* feeder_ptr, wait_context& wait_context) :
+        item_ptr(input_item_ptr), my_body(body), my_feeder_ptr(feeder_ptr), parent_wait_context(wait_context)
+    {}
+
+    void finalize() {
+        parent_wait_context.release();
+    }
+
+    task* execute(execution_data&) override {
+        parallel_for_each_operator_selector<Body>::call(my_body, *item_ptr, my_feeder_ptr);
+        finalize();
+        return nullptr;
+    }
+
+    task* cancel(execution_data&) override {
+        finalize();
+        return nullptr;
+    }
+
+    Iterator item_ptr;
+    const Body& my_body;
+    feeder_impl<Body, Item>* my_feeder_ptr;
+    wait_context& parent_wait_context;
+}; // class for_each_iteration_task
+
+// Helper to get the type of the iterator to the internal sequence of copies
+// If the element can be passed to the body as an rvalue - this iterator should be move_iterator
+template <typename Body, typename Item, typename = void>
+struct input_iteration_task_iterator_helper {
+    // For input iterators we pass const lvalue reference to the body
+    // It is prohibited to take non-constant lvalue references for input iterators
+    using type = const Item*;
+};
+
+template <typename Body, typename Item>
+struct input_iteration_task_iterator_helper<Body, Item,
+    tbb::detail::void_t<decltype(parallel_for_each_operator_selector<Body>::call(std::declval<const Body&>(),
+                                                                                 std::declval<Item&&>(),
+                                                                                 std::declval<feeder_impl<Body, Item>*>()))>>
+{
+    using type = std::move_iterator<Item*>;
+};
+
+/** Split one block task to several(max_block_size) iteration tasks for input iterators
     @ingroup algorithms **/
-            template <typename Body, typename Item>
-            struct input_block_handling_task : public task {
-                static constexpr size_t max_block_size = 4;
-
-                using feeder_type = feeder_impl<Body, Item>;
-                using iteration_task_iterator_type =
-                        typename input_iteration_task_iterator_helper<Body, Item>::type;
-                using iteration_task = for_each_iteration_task<iteration_task_iterator_type, Body, Item>;
-
-                input_block_handling_task(wait_context& root_wait_context, task_group_context& e_context,
-                                          const Body& body, feeder_impl<Body, Item>* feeder_ptr,
-                                          small_object_allocator& alloc)
-                    : my_size(0), my_wait_context(0), my_root_wait_context(root_wait_context),
-                      my_execution_context(e_context), my_allocator(alloc) {
-                    auto item_it = block_iteration_space.begin();
-                    for (auto* it = task_pool.begin(); it != task_pool.end(); ++it) {
-                        new (it) iteration_task(iteration_task_iterator_type(item_it++), body, feeder_ptr,
-                                                my_wait_context);
-                    }
-                }
-
-                void finalize(const execution_data& ed) {
-                    my_root_wait_context.release();
-                    my_allocator.delete_object(this, ed);
-                }
-
-                task* execute(execution_data& ed) override {
-                    __TBB_ASSERT(my_size > 0, "Negative size was passed to task");
-                    for (std::size_t counter = 1; counter < my_size; ++counter) {
-                        my_wait_context.reserve();
-                        spawn(*(task_pool.begin() + counter), my_execution_context);
-                    }
-                    my_wait_context.reserve();
-                    execute_and_wait(*task_pool.begin(), my_execution_context, my_wait_context,
-                                     my_execution_context);
-
-                    // deallocate current task after children execution
-                    finalize(ed);
-                    return nullptr;
-                }
-
-                task* cancel(execution_data& ed) override {
-                    finalize(ed);
-                    return nullptr;
-                }
-
-                ~input_block_handling_task() {
-                    for (std::size_t counter = 0; counter < max_block_size; ++counter) {
-                        (task_pool.begin() + counter)->~iteration_task();
-                        (block_iteration_space.begin() + counter)->~Item();
-                    }
-                }
-
-                aligned_space<Item, max_block_size> block_iteration_space;
-                aligned_space<iteration_task, max_block_size> task_pool;
-                std::size_t my_size;
-                wait_context my_wait_context;
-                wait_context& my_root_wait_context;
-                task_group_context& my_execution_context;
-                small_object_allocator my_allocator;
-            };// class input_block_handling_task
-
-            /** Split one block task to several(max_block_size) iteration tasks for forward iterators
+template <typename Body, typename Item>
+struct input_block_handling_task : public task {
+    static constexpr size_t max_block_size = 4;
+
+    using feeder_type = feeder_impl<Body, Item>;
+    using iteration_task_iterator_type = typename input_iteration_task_iterator_helper<Body, Item>::type;
+    using iteration_task = for_each_iteration_task<iteration_task_iterator_type, Body, Item>;
+
+    input_block_handling_task(wait_context_vertex& root_wait_context, task_group_context& e_context,
+                              const Body& body, feeder_impl<Body, Item>* feeder_ptr, small_object_allocator& alloc)
+        :my_size(0), my_wait_context(0), my_root_wait_context(root_wait_context),
+         my_execution_context(e_context), my_allocator(alloc)
+    {
+        auto item_it = block_iteration_space.begin();
+        for (auto* it = task_pool.begin(); it != task_pool.end(); ++it) {
+            new (it) iteration_task(iteration_task_iterator_type(item_it++), body, feeder_ptr, my_wait_context);
+        }
+    }
+
+    void finalize(const execution_data& ed) {
+        my_root_wait_context.release();
+        my_allocator.delete_object(this, ed);
+    }
+
+    task* execute(execution_data& ed) override {
+        __TBB_ASSERT( my_size > 0, "Negative size was passed to task");
+        for (std::size_t counter = 1; counter < my_size; ++counter) {
+            my_wait_context.reserve();
+            spawn(*(task_pool.begin() + counter), my_execution_context);
+        }
+        my_wait_context.reserve();
+        execute_and_wait(*task_pool.begin(), my_execution_context,
+                         my_wait_context,    my_execution_context);
+
+        // deallocate current task after children execution
+        finalize(ed);
+        return nullptr;
+    }
+
+    task* cancel(execution_data& ed) override {
+        finalize(ed);
+        return nullptr;
+    }
+
+    ~input_block_handling_task() {
+        for(std::size_t counter = 0; counter < max_block_size; ++counter) {
+            (task_pool.begin() + counter)->~iteration_task();
+            if (counter < my_size) {
+                (block_iteration_space.begin() + counter)->~Item();
+            }
+        }
+    }
+
+    aligned_space<Item, max_block_size> block_iteration_space;
+    aligned_space<iteration_task, max_block_size> task_pool;
+    std::size_t my_size;
+    wait_context my_wait_context;
+    wait_context_vertex& my_root_wait_context;
+    task_group_context& my_execution_context;
+    small_object_allocator my_allocator;
+}; // class input_block_handling_task
+
+/** Split one block task to several(max_block_size) iteration tasks for forward iterators
     @ingroup algorithms **/
-            template <typename Iterator, typename Body, typename Item>
-            struct forward_block_handling_task : public task {
-                static constexpr size_t max_block_size = 4;
-
-                using iteration_task = for_each_iteration_task<Iterator, Body, Item>;
-
-                forward_block_handling_task(Iterator first, std::size_t size, wait_context& w_context,
-                                            task_group_context& e_context, const Body& body,
-                                            feeder_impl<Body, Item>* feeder_ptr,
-                                            small_object_allocator& alloc)
-                    : my_size(size), my_wait_context(0), my_root_wait_context(w_context),
-                      my_execution_context(e_context), my_allocator(alloc) {
-                    auto* task_it = task_pool.begin();
-                    for (std::size_t i = 0; i < size; i++) {
-                        new (task_it++) iteration_task(first, body, feeder_ptr, my_wait_context);
-                        ++first;
-                    }
-                }
-
-                void finalize(const execution_data& ed) {
-                    my_root_wait_context.release();
-                    my_allocator.delete_object(this, ed);
-                }
-
-                task* execute(execution_data& ed) override {
-                    __TBB_ASSERT(my_size > 0, "Negative size was passed to task");
-                    for (std::size_t counter = 1; counter < my_size; ++counter) {
-                        my_wait_context.reserve();
-                        spawn(*(task_pool.begin() + counter), my_execution_context);
-                    }
-                    my_wait_context.reserve();
-                    execute_and_wait(*task_pool.begin(), my_execution_context, my_wait_context,
-                                     my_execution_context);
-
-                    // deallocate current task after children execution
-                    finalize(ed);
-                    return nullptr;
-                }
-
-                task* cancel(execution_data& ed) override {
-                    finalize(ed);
-                    return nullptr;
-                }
-
-                ~forward_block_handling_task() {
-                    for (std::size_t counter = 0; counter < my_size; ++counter) {
-                        (task_pool.begin() + counter)->~iteration_task();
-                    }
-                }
-
-                aligned_space<iteration_task, max_block_size> task_pool;
-                std::size_t my_size;
-                wait_context my_wait_context;
-                wait_context& my_root_wait_context;
-                task_group_context& my_execution_context;
-                small_object_allocator my_allocator;
-            };// class forward_block_handling_task
-
-            /** Body for parallel_for algorithm.
+template <typename Iterator, typename Body, typename Item>
+struct forward_block_handling_task : public task {
+    static constexpr size_t max_block_size = 4;
+
+    using iteration_task = for_each_iteration_task<Iterator, Body, Item>;
+
+    forward_block_handling_task(Iterator first, std::size_t size,
+                                wait_context_vertex& w_context, task_group_context& e_context,
+                                const Body& body, feeder_impl<Body, Item>* feeder_ptr,
+                                small_object_allocator& alloc)
+        : my_size(size), my_wait_context(0), my_root_wait_context(w_context),
+          my_execution_context(e_context), my_allocator(alloc)
+    {
+        auto* task_it = task_pool.begin();
+        for (std::size_t i = 0; i < size; i++) {
+            new (task_it++) iteration_task(first, body, feeder_ptr, my_wait_context);
+            ++first;
+        }
+    }
+
+    void finalize(const execution_data& ed) {
+        my_root_wait_context.release();
+        my_allocator.delete_object(this, ed);
+    }
+
+    task* execute(execution_data& ed) override {
+        __TBB_ASSERT( my_size > 0, "Negative size was passed to task");
+        for(std::size_t counter = 1; counter < my_size; ++counter) {
+            my_wait_context.reserve();
+            spawn(*(task_pool.begin() + counter), my_execution_context);
+        }
+        my_wait_context.reserve();
+        execute_and_wait(*task_pool.begin(), my_execution_context,
+                         my_wait_context,    my_execution_context);
+
+        // deallocate current task after children execution
+        finalize(ed);
+        return nullptr;
+    }
+
+    task* cancel(execution_data& ed) override {
+        finalize(ed);
+        return nullptr;
+    }
+
+    ~forward_block_handling_task() {
+        for(std::size_t counter = 0; counter < my_size; ++counter) {
+            (task_pool.begin() + counter)->~iteration_task();
+        }
+    }
+
+    aligned_space<iteration_task, max_block_size> task_pool;
+    std::size_t my_size;
+    wait_context my_wait_context;
+    wait_context_vertex& my_root_wait_context;
+    task_group_context& my_execution_context;
+    small_object_allocator my_allocator;
+}; // class forward_block_handling_task
+
+/** Body for parallel_for algorithm.
   * Allows to redirect operations under random access iterators range to the parallel_for algorithm.
     @ingroup algorithms **/
-            template <typename Iterator, typename Body, typename Item>
-            class parallel_for_body_wrapper {
-                Iterator my_first;
-                const Body& my_body;
-                feeder_impl<Body, Item>* my_feeder_ptr;
-
-            public:
-                parallel_for_body_wrapper(Iterator first, const Body& body,
-                                          feeder_impl<Body, Item>* feeder_ptr)
-                    : my_first(first), my_body(body), my_feeder_ptr(feeder_ptr) {}
-
-                void operator()(tbb::blocked_range<std::size_t> range) const {
+template <typename Iterator, typename Body, typename Item>
+class parallel_for_body_wrapper {
+    Iterator my_first;
+    const Body& my_body;
+    feeder_impl<Body, Item>* my_feeder_ptr;
+public:
+    parallel_for_body_wrapper(Iterator first, const Body& body, feeder_impl<Body, Item>* feeder_ptr)
+        : my_first(first), my_body(body), my_feeder_ptr(feeder_ptr) {}
+
+    void operator()(tbb::blocked_range<std::size_t> range) const {
 #if __INTEL_COMPILER
 #pragma ivdep
 #endif
-                    for (std::size_t count = range.begin(); count != range.end(); count++) {
-                        parallel_for_each_operator_selector<Body>::call(my_body, *(my_first + count),
-                                                                        my_feeder_ptr);
-                    }
-                }
-            };// class parallel_for_body_wrapper
-
-            /** Helper for getting iterators tag including inherited custom tags
+        for (std::size_t count = range.begin(); count != range.end(); count++) {
+            parallel_for_each_operator_selector<Body>::call(my_body, *(my_first + count),
+                                                            my_feeder_ptr);
+        }
+    }
+}; // class parallel_for_body_wrapper
+
+
+/** Helper for getting iterators tag including inherited custom tags
     @ingroup algorithms */
-            template <typename It>
-            using tag = typename std::iterator_traits<It>::iterator_category;
-
-            template <typename It>
-            using iterator_tag_dispatch = typename std::conditional<
-                    std::is_base_of<std::random_access_iterator_tag, tag<It>>::value,
-                    std::random_access_iterator_tag,
-                    typename std::conditional<std::is_base_of<std::forward_iterator_tag, tag<It>>::value,
-                                              std::forward_iterator_tag,
-                                              std::input_iterator_tag>::type>::type;
-
-            template <typename Body, typename Iterator, typename Item>
-            using feeder_is_required = tbb::detail::void_t<decltype(std::declval<const Body>()(
-                    std::declval<typename std::iterator_traits<Iterator>::reference>(),
-                    std::declval<feeder<Item>&>()))>;
-
-            // Creates feeder object only if the body can accept it
-            template <typename Iterator, typename Body, typename Item, typename = void>
-            struct feeder_holder {
-                feeder_holder(wait_context&, task_group_context&, const Body&) {}
-
-                feeder_impl<Body, Item>* feeder_ptr() { return nullptr; }
-            };// class feeder_holder
-
-            template <typename Iterator, typename Body, typename Item>
-            class feeder_holder<Iterator, Body, Item, feeder_is_required<Body, Iterator, Item>> {
-            public:
-                feeder_holder(wait_context& w_context, task_group_context& context, const Body& body)
-                    : my_feeder(body, w_context, context) {}
-
-                feeder_impl<Body, Item>* feeder_ptr() { return &my_feeder; }
-
-            private:
-                feeder_impl<Body, Item> my_feeder;
-            };// class feeder_holder
-
-            template <typename Iterator, typename Body, typename Item>
-            class for_each_root_task_base : public task {
-            public:
-                for_each_root_task_base(Iterator first, Iterator last, const Body& body,
-                                        wait_context& w_context, task_group_context& e_context)
-                    : my_first(first), my_last(last), my_wait_context(w_context),
-                      my_execution_context(e_context), my_body(body),
-                      my_feeder_holder(my_wait_context, my_execution_context, my_body) {
-                    my_wait_context.reserve();
-                }
-
-            private:
-                task* cancel(execution_data&) override {
-                    this->my_wait_context.release();
-                    return nullptr;
-                }
-
-            protected:
-                Iterator my_first;
-                Iterator my_last;
-                wait_context& my_wait_context;
-                task_group_context& my_execution_context;
-                const Body& my_body;
-                feeder_holder<Iterator, Body, Item> my_feeder_holder;
-            };// class for_each_root_task_base
-
-            /** parallel_for_each algorithm root task - most generic version
+template<typename It>
+using tag = typename std::iterator_traits<It>::iterator_category;
+
+#if __TBB_CPP20_CONCEPTS_PRESENT
+template <typename It>
+struct move_iterator_dispatch_helper {
+    using type = It;
+};
+
+// Until C++23, std::move_iterator::iterator_concept always defines
+// to std::input_iterator_tag and hence std::forward_iterator concept
+// always evaluates to false, so std::move_iterator dispatch should be
+// made according to the base iterator type.
+template <typename It>
+struct move_iterator_dispatch_helper<std::move_iterator<It>> {
+    using type = It;
+};
+
+template <typename It>
+using iterator_tag_dispatch_impl =
+    std::conditional_t<std::random_access_iterator<It>,
+                       std::random_access_iterator_tag,
+                       std::conditional_t<std::forward_iterator<It>,
+                                          std::forward_iterator_tag,
+                                          std::input_iterator_tag>>;
+
+template <typename It>
+using iterator_tag_dispatch =
+    iterator_tag_dispatch_impl<typename move_iterator_dispatch_helper<It>::type>;
+
+#else
+template<typename It>
+using iterator_tag_dispatch = typename
+    std::conditional<
+        std::is_base_of<std::random_access_iterator_tag, tag<It>>::value,
+        std::random_access_iterator_tag,
+        typename std::conditional<
+            std::is_base_of<std::forward_iterator_tag, tag<It>>::value,
+            std::forward_iterator_tag,
+            std::input_iterator_tag
+        >::type
+    >::type;
+#endif // __TBB_CPP20_CONCEPTS_PRESENT
+
+template <typename Body, typename Iterator, typename Item>
+using feeder_is_required = tbb::detail::void_t<decltype(tbb::detail::invoke(std::declval<const Body>(),
+                                                                            std::declval<typename std::iterator_traits<Iterator>::reference>(),
+                                                                            std::declval<feeder<Item>&>()))>;
+
+// Creates feeder object only if the body can accept it
+template <typename Iterator, typename Body, typename Item, typename = void>
+struct feeder_holder {
+    feeder_holder( wait_context_vertex&, task_group_context&, const Body& ) {}
+
+    feeder_impl<Body, Item>* feeder_ptr() { return nullptr; }
+}; // class feeder_holder
+
+template <typename Iterator, typename Body, typename Item>
+class feeder_holder<Iterator, Body, Item, feeder_is_required<Body, Iterator, Item>> {
+public:
+    feeder_holder( wait_context_vertex& w_context, task_group_context& context, const Body& body )
+        : my_feeder(body, w_context, context) {}
+
+    feeder_impl<Body, Item>* feeder_ptr() { return &my_feeder; }
+private:
+    feeder_impl<Body, Item> my_feeder;
+}; // class feeder_holder
+
+template <typename Iterator, typename Body, typename Item>
+class for_each_root_task_base : public task {
+public:
+    for_each_root_task_base(Iterator first, Iterator last, const Body& body, wait_context_vertex& w_context, task_group_context& e_context)
+        : my_first(first), my_last(last), my_wait_context(w_context), my_execution_context(e_context),
+          my_body(body), my_feeder_holder(my_wait_context, my_execution_context, my_body)
+    {
+        my_wait_context.reserve();
+    }
+private:
+    task* cancel(execution_data&) override {
+        this->my_wait_context.release();
+        return nullptr;
+    }
+protected:
+    Iterator my_first;
+    Iterator my_last;
+    wait_context_vertex& my_wait_context;
+    task_group_context& my_execution_context;
+    const Body& my_body;
+    feeder_holder<Iterator, Body, Item> my_feeder_holder;
+}; // class for_each_root_task_base
+
+/** parallel_for_each algorithm root task - most generic version
   * Splits input range to blocks
     @ingroup algorithms **/
-            template <typename Iterator, typename Body, typename Item,
-                      typename IteratorTag = iterator_tag_dispatch<Iterator>>
-            class for_each_root_task : public for_each_root_task_base<Iterator, Body, Item> {
-                using base_type = for_each_root_task_base<Iterator, Body, Item>;
-
-            public:
-                using base_type::base_type;
-
-            private:
-                task* execute(execution_data& ed) override {
-                    using block_handling_type = input_block_handling_task<Body, Item>;
-
-                    if (this->my_first == this->my_last) {
-                        this->my_wait_context.release();
-                        return nullptr;
-                    }
-
-                    this->my_wait_context.reserve();
-                    small_object_allocator alloc {};
-                    auto block_handling_task = alloc.new_object<block_handling_type>(
-                            ed, this->my_wait_context, this->my_execution_context, this->my_body,
-                            this->my_feeder_holder.feeder_ptr(), alloc);
-
-                    auto* block_iterator = block_handling_task->block_iteration_space.begin();
-                    for (; !(this->my_first == this->my_last)
-                           && block_handling_task->my_size < block_handling_type::max_block_size;
-                         ++this->my_first) {
-                        // Move semantics are automatically used when supported by the iterator
-                        new (block_iterator++) Item(*this->my_first);
-                        ++block_handling_task->my_size;
-                    }
-
-                    // Do not access this after spawn to avoid races
-                    spawn(*this, this->my_execution_context);
-                    return block_handling_task;
-                }
-            };// class for_each_root_task - most generic implementation
-
-            /** parallel_for_each algorithm root task - forward iterator based specialization
+template <typename Iterator, typename Body, typename Item, typename IteratorTag = iterator_tag_dispatch<Iterator>>
+class for_each_root_task : public for_each_root_task_base<Iterator, Body, Item>
+{
+    using base_type = for_each_root_task_base<Iterator, Body, Item>;
+public:
+    using base_type::base_type;
+private:
+    task* execute(execution_data& ed) override {
+        using block_handling_type = input_block_handling_task<Body, Item>;
+
+        if (this->my_first == this->my_last) {
+            this->my_wait_context.release();
+            return nullptr;
+        }
+
+        this->my_wait_context.reserve();
+        small_object_allocator alloc{};
+        auto block_handling_task = alloc.new_object<block_handling_type>(ed, this->my_wait_context, this->my_execution_context,
+                                                                         this->my_body, this->my_feeder_holder.feeder_ptr(),
+                                                                         alloc);
+
+        auto* block_iterator = block_handling_task->block_iteration_space.begin();
+        for (; !(this->my_first == this->my_last) && block_handling_task->my_size < block_handling_type::max_block_size; ++this->my_first) {
+            // Move semantics are automatically used when supported by the iterator
+            new (block_iterator++) Item(*this->my_first);
+            ++block_handling_task->my_size;
+        }
+
+        // Do not access this after spawn to avoid races
+        spawn(*this, this->my_execution_context);
+        return block_handling_task;
+    }
+}; // class for_each_root_task - most generic implementation
+
+/** parallel_for_each algorithm root task - forward iterator based specialization
   * Splits input range to blocks
     @ingroup algorithms **/
-            template <typename Iterator, typename Body, typename Item>
-            class for_each_root_task<Iterator, Body, Item, std::forward_iterator_tag>
-                : public for_each_root_task_base<Iterator, Body, Item> {
-                using base_type = for_each_root_task_base<Iterator, Body, Item>;
-
-            public:
-                using base_type::base_type;
-
-            private:
-                task* execute(execution_data& ed) override {
-                    using block_handling_type = forward_block_handling_task<Iterator, Body, Item>;
-                    if (this->my_first == this->my_last) {
-                        this->my_wait_context.release();
-                        return nullptr;
-                    }
-
-                    std::size_t block_size {0};
-                    Iterator first_block_element = this->my_first;
-                    for (; !(this->my_first == this->my_last)
-                           && block_size < block_handling_type::max_block_size;
-                         ++this->my_first) {
-                        ++block_size;
-                    }
-
-                    this->my_wait_context.reserve();
-                    small_object_allocator alloc {};
-                    auto block_handling_task = alloc.new_object<block_handling_type>(
-                            ed, first_block_element, block_size, this->my_wait_context,
-                            this->my_execution_context, this->my_body, this->my_feeder_holder.feeder_ptr(),
-                            alloc);
-
-                    // Do not access this after spawn to avoid races
-                    spawn(*this, this->my_execution_context);
-                    return block_handling_task;
-                }
-            };// class for_each_root_task - forward iterator based specialization
-
-            /** parallel_for_each algorithm root task - random access iterator based specialization
+template <typename Iterator, typename Body, typename Item>
+class for_each_root_task<Iterator, Body, Item, std::forward_iterator_tag>
+    : public for_each_root_task_base<Iterator, Body, Item>
+{
+    using base_type = for_each_root_task_base<Iterator, Body, Item>;
+public:
+    using base_type::base_type;
+private:
+    task* execute(execution_data& ed) override {
+        using block_handling_type = forward_block_handling_task<Iterator, Body, Item>;
+        if (this->my_first == this->my_last) {
+            this->my_wait_context.release();
+            return nullptr;
+        }
+
+        std::size_t block_size{0};
+        Iterator first_block_element = this->my_first;
+        for (; !(this->my_first == this->my_last) && block_size < block_handling_type::max_block_size; ++this->my_first) {
+            ++block_size;
+        }
+
+        this->my_wait_context.reserve();
+        small_object_allocator alloc{};
+        auto block_handling_task = alloc.new_object<block_handling_type>(ed, first_block_element, block_size,
+                                                                         this->my_wait_context, this->my_execution_context,
+                                                                         this->my_body, this->my_feeder_holder.feeder_ptr(), alloc);
+
+        // Do not access this after spawn to avoid races
+        spawn(*this, this->my_execution_context);
+        return block_handling_task;
+    }
+}; // class for_each_root_task - forward iterator based specialization
+
+/** parallel_for_each algorithm root task - random access iterator based specialization
   * Splits input range to blocks
     @ingroup algorithms **/
-            template <typename Iterator, typename Body, typename Item>
-            class for_each_root_task<Iterator, Body, Item, std::random_access_iterator_tag>
-                : public for_each_root_task_base<Iterator, Body, Item> {
-                using base_type = for_each_root_task_base<Iterator, Body, Item>;
-
-            public:
-                using base_type::base_type;
-
-            private:
-                task* execute(execution_data&) override {
-                    tbb::parallel_for(
-                            tbb::blocked_range<std::size_t>(0, std::distance(this->my_first, this->my_last)),
-                            parallel_for_body_wrapper<Iterator, Body, Item>(
-                                    this->my_first, this->my_body, this->my_feeder_holder.feeder_ptr()),
-                            this->my_execution_context);
-
-                    this->my_wait_context.release();
-                    return nullptr;
-                }
-            };// class for_each_root_task - random access iterator based specialization
-
-            /** Helper for getting item type. If item type can be deduced from feeder - got it from feeder,
+template <typename Iterator, typename Body, typename Item>
+class for_each_root_task<Iterator, Body, Item, std::random_access_iterator_tag>
+    : public for_each_root_task_base<Iterator, Body, Item>
+{
+    using base_type = for_each_root_task_base<Iterator, Body, Item>;
+public:
+    using base_type::base_type;
+private:
+    task* execute(execution_data&) override {
+        tbb::parallel_for(
+            tbb::blocked_range<std::size_t>(0, std::distance(this->my_first, this->my_last)),
+            parallel_for_body_wrapper<Iterator, Body, Item>(this->my_first, this->my_body, this->my_feeder_holder.feeder_ptr())
+            , this->my_execution_context
+        );
+
+        this->my_wait_context.release();
+        return nullptr;
+    }
+}; // class for_each_root_task - random access iterator based specialization
+
+/** Helper for getting item type. If item type can be deduced from feeder - got it from feeder,
     if feeder is generic - got item type from range.
     @ingroup algorithms */
-            template <typename Body, typename Item, typename FeederArg>
-            auto feeder_argument_parser(void (Body::*)(Item, feeder<FeederArg>&) const) -> FeederArg;
+template<typename Body, typename Item, typename FeederArg>
+auto feeder_argument_parser(void (Body::*)(Item, feeder<FeederArg>&) const) -> FeederArg;
 
-            template <typename Body, typename>
-            decltype(feeder_argument_parser<Body>(&Body::operator()))
-            get_item_type_impl(int);// for (T, feeder<T>)
-            template <typename Body, typename Item>
-            Item get_item_type_impl(...);// stub
+template<typename Body, typename>
+decltype(feeder_argument_parser<Body>(&Body::operator())) get_item_type_impl(int); // for (T, feeder<T>)
+template<typename Body, typename Item> Item get_item_type_impl(...); // stub
 
-            template <typename Body, typename Item>
-            using get_item_type = decltype(get_item_type_impl<Body, Item>(0));
+template <typename Body, typename Item>
+using get_item_type = decltype(get_item_type_impl<Body, Item>(0));
 
 #if __TBB_CPP20_CONCEPTS_PRESENT
-            template <typename Body, typename ItemType>
-            using feeder_item_type = std::remove_cvref_t<get_item_type<Body, ItemType>>;
-
-            template <typename Body, typename Iterator>
-            concept parallel_for_each_iterator_body
-                    = parallel_for_each_body<Body, iterator_reference_type<Iterator>,
-                                             feeder_item_type<Body, iterator_reference_type<Iterator>>>;
-
-            template <typename Body, typename Range>
-            concept parallel_for_each_range_body
-                    = parallel_for_each_body<Body, range_reference_type<Range>,
-                                             feeder_item_type<Body, range_reference_type<Range>>>;
+template <typename Body, typename ItemType>
+using feeder_item_type = std::remove_cvref_t<get_item_type<Body, ItemType>>;
+
+template <typename Body, typename Iterator>
+concept parallel_for_each_iterator_body =
+    parallel_for_each_body<Body, iterator_reference_type<Iterator>, feeder_item_type<Body, iterator_reference_type<Iterator>>>;
+
+template <typename Body, typename Range>
+concept parallel_for_each_range_body =
+    parallel_for_each_body<Body, range_reference_type<Range>, feeder_item_type<Body, range_reference_type<Range>>>;
 #endif
 
-            /** Implements parallel iteration over a range.
+/** Implements parallel iteration over a range.
     @ingroup algorithms */
-            template <typename Iterator, typename Body>
-            void run_parallel_for_each(Iterator first, Iterator last, const Body& body,
-                                       task_group_context& context) {
-                if (!(first == last)) {
-                    using ItemType = get_item_type<Body, typename std::iterator_traits<Iterator>::value_type>;
-                    wait_context w_context(0);
-
-                    for_each_root_task<Iterator, Body, ItemType> root_task(first, last, body, w_context,
-                                                                           context);
-
-                    execute_and_wait(root_task, context, w_context, context);
-                }
-            }
+template<typename Iterator, typename Body>
+void run_parallel_for_each( Iterator first, Iterator last, const Body& body, task_group_context& context)
+{
+    if (!(first == last)) {
+        using ItemType = get_item_type<Body, typename std::iterator_traits<Iterator>::value_type>;
+        wait_context_vertex w_context(0);
+
+        for_each_root_task<Iterator, Body, ItemType> root_task(first, last, body, w_context, context);
 
-            /** \page parallel_for_each_body_req Requirements on parallel_for_each body
+        execute_and_wait(root_task, context, w_context.get_context(), context);
+    }
+}
+
+/** \page parallel_for_each_body_req Requirements on parallel_for_each body
     Class \c Body implementing the concept of parallel_for_each body must define:
     - \code
         B::operator()(
@@ -644,69 +653,60 @@ namespace tbb {
     - \code ~item_type() \endcode                            Destroy a work item
 **/
 
-            /** \name parallel_for_each
+/** \name parallel_for_each
     See also requirements on \ref parallel_for_each_body_req "parallel_for_each Body". **/
-            //@{
-            //! Parallel iteration over a range, with optional addition of more work.
-            /** @ingroup algorithms */
-            template <typename Iterator, typename Body>
-            __TBB_requires(std::input_iterator<Iterator>&& parallel_for_each_iterator_body<
-                           Body, Iterator>) void parallel_for_each(Iterator first, Iterator last,
-                                                                   const Body& body) {
-                task_group_context context(PARALLEL_FOR_EACH);
-                run_parallel_for_each<Iterator, Body>(first, last, body, context);
-            }
-
-            template <typename Range, typename Body>
-            __TBB_requires(
-                    container_based_sequence<Range, std::input_iterator_tag>&& parallel_for_each_range_body<
-                            Body, Range>) void parallel_for_each(Range& rng, const Body& body) {
-                parallel_for_each(std::begin(rng), std::end(rng), body);
-            }
-
-            template <typename Range, typename Body>
-            __TBB_requires(
-                    container_based_sequence<Range, std::input_iterator_tag>&& parallel_for_each_range_body<
-                            Body, Range>) void parallel_for_each(const Range& rng, const Body& body) {
-                parallel_for_each(std::begin(rng), std::end(rng), body);
-            }
-
-            //! Parallel iteration over a range, with optional addition of more work and user-supplied context
-            /** @ingroup algorithms */
-            template <typename Iterator, typename Body>
-            __TBB_requires(std::input_iterator<Iterator>&& parallel_for_each_iterator_body<
-                           Body, Iterator>) void parallel_for_each(Iterator first, Iterator last,
-                                                                   const Body& body,
-                                                                   task_group_context& context) {
-                run_parallel_for_each<Iterator, Body>(first, last, body, context);
-            }
-
-            template <typename Range, typename Body>
-            __TBB_requires(
-                    container_based_sequence<Range, std::input_iterator_tag>&& parallel_for_each_range_body<
-                            Body, Range>) void parallel_for_each(Range& rng, const Body& body,
-                                                                 task_group_context& context) {
-                parallel_for_each(std::begin(rng), std::end(rng), body, context);
-            }
-
-            template <typename Range, typename Body>
-            __TBB_requires(
-                    container_based_sequence<Range, std::input_iterator_tag>&& parallel_for_each_range_body<
-                            Body, Range>) void parallel_for_each(const Range& rng, const Body& body,
-                                                                 task_group_context& context) {
-                parallel_for_each(std::begin(rng), std::end(rng), body, context);
-            }
-
-        }// namespace d2
-    }    // namespace detail
-    //! @endcond
-    //@}
-
-    inline namespace v1 {
-        using detail::d1::feeder;
-        using detail::d2::parallel_for_each;
-    }// namespace v1
-
-}// namespace tbb
+//@{
+//! Parallel iteration over a range, with optional addition of more work.
+/** @ingroup algorithms */
+template<typename Iterator, typename Body>
+    __TBB_requires(std::input_iterator<Iterator> && parallel_for_each_iterator_body<Body, Iterator>)
+void parallel_for_each(Iterator first, Iterator last, const Body& body) {
+    task_group_context context(PARALLEL_FOR_EACH);
+    run_parallel_for_each<Iterator, Body>(first, last, body, context);
+}
+
+template<typename Range, typename Body>
+    __TBB_requires(container_based_sequence<Range, std::input_iterator_tag> && parallel_for_each_range_body<Body, Range>)
+void parallel_for_each(Range& rng, const Body& body) {
+    parallel_for_each(std::begin(rng), std::end(rng), body);
+}
+
+template<typename Range, typename Body>
+    __TBB_requires(container_based_sequence<Range, std::input_iterator_tag> && parallel_for_each_range_body<Body, Range>)
+void parallel_for_each(const Range& rng, const Body& body) {
+    parallel_for_each(std::begin(rng), std::end(rng), body);
+}
+
+//! Parallel iteration over a range, with optional addition of more work and user-supplied context
+/** @ingroup algorithms */
+template<typename Iterator, typename Body>
+    __TBB_requires(std::input_iterator<Iterator> && parallel_for_each_iterator_body<Body, Iterator>)
+void parallel_for_each(Iterator first, Iterator last, const Body& body, task_group_context& context) {
+    run_parallel_for_each<Iterator, Body>(first, last, body, context);
+}
+
+template<typename Range, typename Body>
+    __TBB_requires(container_based_sequence<Range, std::input_iterator_tag> && parallel_for_each_range_body<Body, Range>)
+void parallel_for_each(Range& rng, const Body& body, task_group_context& context) {
+    parallel_for_each(std::begin(rng), std::end(rng), body, context);
+}
+
+template<typename Range, typename Body>
+    __TBB_requires(container_based_sequence<Range, std::input_iterator_tag> && parallel_for_each_range_body<Body, Range>)
+void parallel_for_each(const Range& rng, const Body& body, task_group_context& context) {
+    parallel_for_each(std::begin(rng), std::end(rng), body, context);
+}
+
+} // namespace d2
+} // namespace detail
+//! @endcond
+//@}
+
+inline namespace v1 {
+using detail::d2::parallel_for_each;
+using detail::d1::feeder;
+} // namespace v1
+
+} // namespace tbb
 
 #endif /* __TBB_parallel_for_each_H */
diff --git a/external/tbb/include/oneapi/tbb/parallel_invoke.h b/external/tbb/include/oneapi/tbb/parallel_invoke.h
index 2873e2d9..4bc5d853 100644
--- a/external/tbb/include/oneapi/tbb/parallel_invoke.h
+++ b/external/tbb/include/oneapi/tbb/parallel_invoke.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2023 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -18,207 +18,210 @@
 #define __TBB_parallel_invoke_H
 
 #include "detail/_config.h"
-#include "detail/_exception.h"
 #include "detail/_namespace_injection.h"
-#include "detail/_small_object_pool.h"
+#include "detail/_exception.h"
 #include "detail/_task.h"
 #include "detail/_template_helpers.h"
+#include "detail/_small_object_pool.h"
 
 #include "task_group.h"
 
-#include <atomic>
 #include <tuple>
+#include <atomic>
 #include <utility>
 
 namespace tbb {
-    namespace detail {
-        namespace d1 {
-
-            //! Simple task object, executing user method
-            template <typename Function, typename WaitObject>
-            struct function_invoker : public task {
-                function_invoker(const Function& function, WaitObject& wait_ctx)
-                    : my_function(function), parent_wait_ctx(wait_ctx) {}
-
-                task* execute(execution_data& ed) override {
-                    my_function();
-                    parent_wait_ctx.release(ed);
-                    call_itt_task_notify(destroy, this);
-                    return nullptr;
-                }
-
-                task* cancel(execution_data& ed) override {
-                    parent_wait_ctx.release(ed);
-                    return nullptr;
-                }
-
-                const Function& my_function;
-                WaitObject& parent_wait_ctx;
-            };// struct function_invoker
-
-            //! Task object for managing subroots in trinary task trees.
-            // Endowed with additional synchronization logic (compatible with wait object intefaces) to support
-            // continuation passing execution. This task spawns 2 function_invoker tasks with first and second functors
-            // and then executes first functor by itself. But only the last executed functor must destruct and deallocate
-            // the subroot task.
-            template <typename F1, typename F2, typename F3>
-            struct invoke_subroot_task : public task {
-                wait_context& root_wait_ctx;
-                std::atomic<unsigned> ref_count {0};
-                bool child_spawned = false;
-
-                const F1& self_invoked_functor;
-                function_invoker<F2, invoke_subroot_task<F1, F2, F3>> f2_invoker;
-                function_invoker<F3, invoke_subroot_task<F1, F2, F3>> f3_invoker;
-
-                task_group_context& my_execution_context;
-                small_object_allocator my_allocator;
-
-                invoke_subroot_task(const F1& f1, const F2& f2, const F3& f3, wait_context& wait_ctx,
-                                    task_group_context& context, small_object_allocator& alloc)
-                    : root_wait_ctx(wait_ctx), self_invoked_functor(f1), f2_invoker(f2, *this),
-                      f3_invoker(f3, *this), my_execution_context(context), my_allocator(alloc) {
-                    root_wait_ctx.reserve();
-                }
-
-                void finalize(const execution_data& ed) {
-                    root_wait_ctx.release();
-
-                    my_allocator.delete_object(this, ed);
-                }
-
-                void release(const execution_data& ed) {
-                    __TBB_ASSERT(ref_count > 0, nullptr);
-                    call_itt_task_notify(releasing, this);
-                    if (--ref_count == 0) {
-                        call_itt_task_notify(acquired, this);
-                        finalize(ed);
-                    }
-                }
-
-                task* execute(execution_data& ed) override {
-                    ref_count.fetch_add(3, std::memory_order_relaxed);
-                    spawn(f3_invoker, my_execution_context);
-                    spawn(f2_invoker, my_execution_context);
-                    self_invoked_functor();
-
-                    release(ed);
-                    return nullptr;
-                }
-
-                task* cancel(execution_data& ed) override {
-                    if (ref_count > 0) {// detect children spawn
-                        release(ed);
-                    } else {
-                        finalize(ed);
-                    }
-                    return nullptr;
-                }
-            };// struct subroot_task
-
-            class invoke_root_task {
-            public:
-                invoke_root_task(wait_context& wc) : my_wait_context(wc) {}
-                void release(const execution_data&) { my_wait_context.release(); }
-
-            private:
-                wait_context& my_wait_context;
-            };
-
-            template <typename F1>
-            void invoke_recursive_separation(wait_context& root_wait_ctx, task_group_context& context,
-                                             const F1& f1) {
-                root_wait_ctx.reserve(1);
-                invoke_root_task root(root_wait_ctx);
-                function_invoker<F1, invoke_root_task> invoker1(f1, root);
-
-                execute_and_wait(invoker1, context, root_wait_ctx, context);
-            }
-
-            template <typename F1, typename F2>
-            void invoke_recursive_separation(wait_context& root_wait_ctx, task_group_context& context,
-                                             const F1& f1, const F2& f2) {
-                root_wait_ctx.reserve(2);
-                invoke_root_task root(root_wait_ctx);
-                function_invoker<F1, invoke_root_task> invoker1(f1, root);
-                function_invoker<F2, invoke_root_task> invoker2(f2, root);
-
-                spawn(invoker1, context);
-                execute_and_wait(invoker2, context, root_wait_ctx, context);
-            }
-
-            template <typename F1, typename F2, typename F3>
-            void invoke_recursive_separation(wait_context& root_wait_ctx, task_group_context& context,
-                                             const F1& f1, const F2& f2, const F3& f3) {
-                root_wait_ctx.reserve(3);
-                invoke_root_task root(root_wait_ctx);
-                function_invoker<F1, invoke_root_task> invoker1(f1, root);
-                function_invoker<F2, invoke_root_task> invoker2(f2, root);
-                function_invoker<F3, invoke_root_task> invoker3(f3, root);
-
-                //TODO: implement sub root for two tasks (measure performance)
-                spawn(invoker1, context);
-                spawn(invoker2, context);
-                execute_and_wait(invoker3, context, root_wait_ctx, context);
-            }
-
-            template <typename F1, typename F2, typename F3, typename... Fs>
-            void invoke_recursive_separation(wait_context& root_wait_ctx, task_group_context& context,
-                                             const F1& f1, const F2& f2, const F3& f3, const Fs&... fs) {
-                small_object_allocator alloc {};
-                auto sub_root = alloc.new_object<invoke_subroot_task<F1, F2, F3>>(f1, f2, f3, root_wait_ctx,
-                                                                                  context, alloc);
-                spawn(*sub_root, context);
-
-                invoke_recursive_separation(root_wait_ctx, context, fs...);
-            }
-
-            template <typename... Fs>
-            void parallel_invoke_impl(task_group_context& context, const Fs&... fs) {
-                static_assert(sizeof...(Fs) >= 2, "Parallel invoke may be called with at least two callable");
-                wait_context root_wait_ctx {0};
-
-                invoke_recursive_separation(root_wait_ctx, context, fs...);
-            }
-
-            template <typename F1, typename... Fs>
-            void parallel_invoke_impl(const F1& f1, const Fs&... fs) {
-                static_assert(sizeof...(Fs) >= 1, "Parallel invoke may be called with at least two callable");
-                task_group_context context(PARALLEL_INVOKE);
-                wait_context root_wait_ctx {0};
-
-                invoke_recursive_separation(root_wait_ctx, context, fs..., f1);
-            }
-
-            //! Passes last argument of variadic pack as first for handling user provided task_group_context
-            template <typename Tuple, typename... Fs>
-            struct invoke_helper;
-
-            template <typename... Args, typename T, typename... Fs>
-            struct invoke_helper<std::tuple<Args...>, T, Fs...>
-                : invoke_helper<std::tuple<Args..., T>, Fs...> {};
-
-            template <typename... Fs, typename T /*task_group_context or callable*/>
-            struct invoke_helper<std::tuple<Fs...>, T> {
-                void operator()(Fs&&... args, T&& t) {
-                    parallel_invoke_impl(std::forward<T>(t), std::forward<Fs>(args)...);
-                }
-            };
-
-            //! Parallel execution of several function objects
-            // We need to pass parameter pack through forwarding reference,
-            // since this pack may contain task_group_context that must be passed via lvalue non-const reference
-            template <typename... Fs>
-            void parallel_invoke(Fs&&... fs) {
-                invoke_helper<std::tuple<>, Fs...>()(std::forward<Fs>(fs)...);
-            }
-
-        }// namespace d1
-    }    // namespace detail
-
-    inline namespace v1 {
-        using detail::d1::parallel_invoke;
-    }// namespace v1
-
-}// namespace tbb
+namespace detail {
+namespace d1 {
+
+//! Simple task object, executing user method
+template<typename Function, typename WaitObject>
+struct function_invoker : public task {
+    function_invoker(const Function& function, WaitObject& wait_ctx) :
+        my_function(function),
+        parent_wait_ctx(wait_ctx)
+    {}
+
+    task* execute(execution_data& ed) override {
+        my_function();
+        parent_wait_ctx.release(ed);
+        call_itt_task_notify(destroy, this);
+        return nullptr;
+    }
+
+    task* cancel(execution_data& ed) override {
+        parent_wait_ctx.release(ed);
+        return nullptr;
+    }
+
+    const Function& my_function;
+    WaitObject& parent_wait_ctx;
+}; // struct function_invoker
+
+//! Task object for managing subroots in trinary task trees.
+// Endowed with additional synchronization logic (compatible with wait object interfaces) to support
+// continuation passing execution. This task spawns 2 function_invoker tasks with first and second functors
+// and then executes first functor by itself. But only the last executed functor must destruct and deallocate
+// the subroot task.
+template<typename F1, typename F2, typename F3>
+struct invoke_subroot_task : public task {
+    wait_context& root_wait_ctx;
+    std::atomic<unsigned> ref_count{0};
+    bool child_spawned = false;
+
+    const F1& self_invoked_functor;
+    function_invoker<F2, invoke_subroot_task<F1, F2, F3>> f2_invoker;
+    function_invoker<F3, invoke_subroot_task<F1, F2, F3>> f3_invoker;
+
+    task_group_context& my_execution_context;
+    small_object_allocator my_allocator;
+
+    invoke_subroot_task(const F1& f1, const F2& f2, const F3& f3, wait_context& wait_ctx, task_group_context& context,
+                 small_object_allocator& alloc) :
+        root_wait_ctx(wait_ctx),
+        self_invoked_functor(f1),
+        f2_invoker(f2, *this),
+        f3_invoker(f3, *this),
+        my_execution_context(context),
+        my_allocator(alloc)
+    {
+        root_wait_ctx.reserve();
+    }
+
+    void finalize(const execution_data& ed) {
+        root_wait_ctx.release();
+
+        my_allocator.delete_object(this, ed);
+    }
+
+    void release(const execution_data& ed) {
+        __TBB_ASSERT(ref_count > 0, nullptr);
+        call_itt_task_notify(releasing, this);
+        if( --ref_count == 0 ) {
+            call_itt_task_notify(acquired, this);
+            finalize(ed);
+        }
+    }
+
+    task* execute(execution_data& ed) override {
+        ref_count.fetch_add(3, std::memory_order_relaxed);
+        spawn(f3_invoker, my_execution_context);
+        spawn(f2_invoker, my_execution_context);
+        self_invoked_functor();
+
+        release(ed);
+        return nullptr;
+    }
+
+    task* cancel(execution_data& ed) override {
+        if( ref_count > 0 ) { // detect children spawn
+            release(ed);
+        } else {
+            finalize(ed);
+        }
+        return nullptr;
+    }
+}; // struct subroot_task
+
+class invoke_root_task {
+public:
+    invoke_root_task(wait_context& wc) : my_wait_context(wc) {}
+    void release(const execution_data&) {
+        my_wait_context.release();
+    }
+private:
+    wait_context& my_wait_context;
+};
+
+template<typename F1>
+void invoke_recursive_separation(wait_context& root_wait_ctx, task_group_context& context, const F1& f1) {
+    root_wait_ctx.reserve(1);
+    invoke_root_task root(root_wait_ctx);
+    function_invoker<F1, invoke_root_task> invoker1(f1, root);
+
+    execute_and_wait(invoker1, context, root_wait_ctx, context);
+}
+
+template<typename F1, typename F2>
+void invoke_recursive_separation(wait_context& root_wait_ctx, task_group_context& context, const F1& f1, const F2& f2) {
+    root_wait_ctx.reserve(2);
+    invoke_root_task root(root_wait_ctx);
+    function_invoker<F1, invoke_root_task> invoker1(f1, root);
+    function_invoker<F2, invoke_root_task> invoker2(f2, root);
+
+    spawn(invoker1, context);
+    execute_and_wait(invoker2, context, root_wait_ctx, context);
+}
+
+template<typename F1, typename F2, typename F3>
+void invoke_recursive_separation(wait_context& root_wait_ctx, task_group_context& context, const F1& f1, const F2& f2, const F3& f3) {
+    root_wait_ctx.reserve(3);
+    invoke_root_task root(root_wait_ctx);
+    function_invoker<F1, invoke_root_task> invoker1(f1, root);
+    function_invoker<F2, invoke_root_task> invoker2(f2, root);
+    function_invoker<F3, invoke_root_task> invoker3(f3, root);
+
+    //TODO: implement sub root for two tasks (measure performance)
+    spawn(invoker1, context);
+    spawn(invoker2, context);
+    execute_and_wait(invoker3, context, root_wait_ctx, context);
+}
+
+template<typename F1, typename F2, typename F3, typename... Fs>
+void invoke_recursive_separation(wait_context& root_wait_ctx, task_group_context& context,
+                                 const F1& f1, const F2& f2, const F3& f3, const Fs&... fs) {
+    small_object_allocator alloc{};
+    auto sub_root = alloc.new_object<invoke_subroot_task<F1, F2, F3>>(f1, f2, f3, root_wait_ctx, context, alloc);
+    spawn(*sub_root, context);
+
+    invoke_recursive_separation(root_wait_ctx, context, fs...);
+}
+
+template<typename... Fs>
+void parallel_invoke_impl(task_group_context& context, const Fs&... fs) {
+    static_assert(sizeof...(Fs) >= 2, "Parallel invoke may be called with at least two callable");
+    wait_context root_wait_ctx{0};
+
+    invoke_recursive_separation(root_wait_ctx, context, fs...);
+}
+
+template<typename F1, typename... Fs>
+void parallel_invoke_impl(const F1& f1, const Fs&... fs) {
+    static_assert(sizeof...(Fs) >= 1, "Parallel invoke may be called with at least two callable");
+    task_group_context context(PARALLEL_INVOKE);
+    wait_context root_wait_ctx{0};
+
+    invoke_recursive_separation(root_wait_ctx, context, fs..., f1);
+}
+
+//! Passes last argument of variadic pack as first for handling user provided task_group_context
+template <typename Tuple, typename... Fs>
+struct invoke_helper;
+
+template <typename... Args, typename T, typename... Fs>
+struct invoke_helper<std::tuple<Args...>, T, Fs...> : invoke_helper<std::tuple<Args..., T>, Fs...> {};
+
+template <typename... Fs, typename T/*task_group_context or callable*/>
+struct invoke_helper<std::tuple<Fs...>, T> {
+    void operator()(Fs&&... args, T&& t) {
+        parallel_invoke_impl(std::forward<T>(t), std::forward<Fs>(args)...);
+    }
+};
+
+//! Parallel execution of several function objects
+// We need to pass parameter pack through forwarding reference,
+// since this pack may contain task_group_context that must be passed via lvalue non-const reference
+template<typename... Fs>
+void parallel_invoke(Fs&&... fs) {
+    invoke_helper<std::tuple<>, Fs...>()(std::forward<Fs>(fs)...);
+}
+
+} // namespace d1
+} // namespace detail
+
+inline namespace v1 {
+using detail::d1::parallel_invoke;
+} // namespace v1
+
+} // namespace tbb
 #endif /* __TBB_parallel_invoke_H */
diff --git a/external/tbb/include/oneapi/tbb/parallel_pipeline.h b/external/tbb/include/oneapi/tbb/parallel_pipeline.h
index 0496e043..a204b9c4 100644
--- a/external/tbb/include/oneapi/tbb/parallel_pipeline.h
+++ b/external/tbb/include/oneapi/tbb/parallel_pipeline.h
@@ -17,137 +17,137 @@
 #ifndef __TBB_parallel_pipeline_H
 #define __TBB_parallel_pipeline_H
 
+#include "detail/_pipeline_filters.h"
 #include "detail/_config.h"
 #include "detail/_namespace_injection.h"
-#include "detail/_pipeline_filters.h"
 #include "task_group.h"
 
-#include <atomic>
 #include <cstddef>
+#include <atomic>
 #include <type_traits>
 
 namespace tbb {
-    namespace detail {
-
-        namespace r1 {
-            TBB_EXPORT void __TBB_EXPORTED_FUNC parallel_pipeline(task_group_context&, std::size_t,
-                                                                  const d1::filter_node&);
-        }
-
-        namespace d1 {
-
-            enum class filter_mode : unsigned int {
-                //! processes multiple items in parallel and in no particular order
-                parallel = base_filter::filter_is_out_of_order,
-                //! processes items one at a time; all such filters process items in the same order
-                serial_in_order = base_filter::filter_is_serial,
-                //! processes items one at a time and in no particular order
-                serial_out_of_order = base_filter::filter_is_serial | base_filter::filter_is_out_of_order
-            };
-            //! Class representing a chain of type-safe pipeline filters
-            /** @ingroup algorithms */
-            template <typename InputType, typename OutputType>
-            class filter {
-                filter_node_ptr my_root;
-                filter(filter_node_ptr root) : my_root(root) {}
-                friend void parallel_pipeline(size_t, const filter<void, void>&, task_group_context&);
-                template <typename T_, typename U_, typename Body>
-                friend filter<T_, U_> make_filter(filter_mode, const Body&);
-                template <typename T_, typename V_, typename U_>
-                friend filter<T_, U_> operator&(const filter<T_, V_>&, const filter<V_, U_>&);
-
-            public:
-                filter() = default;
-                filter(const filter& rhs) : my_root(rhs.my_root) {}
-                filter(filter&& rhs) : my_root(std::move(rhs.my_root)) {}
-
-                void operator=(const filter& rhs) { my_root = rhs.my_root; }
-                void operator=(filter&& rhs) { my_root = std::move(rhs.my_root); }
-
-                template <typename Body>
-                filter(filter_mode mode, const Body& body)
-                    : my_root(new (r1::allocate_memory(sizeof(filter_node_leaf<InputType, OutputType, Body>)))
-                                      filter_node_leaf<InputType, OutputType, Body>(
-                                              static_cast<unsigned int>(mode), body)) {}
-
-                filter& operator&=(const filter<OutputType, OutputType>& right) {
-                    *this = *this & right;
-                    return *this;
-                }
-
-                void clear() {
-                    // Like operator= with filter() on right side.
-                    my_root = nullptr;
-                }
-            };
-
-            //! Create a filter to participate in parallel_pipeline
-            /** @ingroup algorithms */
-            template <typename InputType, typename OutputType, typename Body>
-            filter<InputType, OutputType> make_filter(filter_mode mode, const Body& body) {
-                return filter_node_ptr(
-                        new (r1::allocate_memory(sizeof(filter_node_leaf<InputType, OutputType, Body>)))
-                                filter_node_leaf<InputType, OutputType, Body>(static_cast<unsigned int>(mode),
-                                                                              body));
-            }
-
-            //! Create a filter to participate in parallel_pipeline
-            /** @ingroup algorithms */
-            template <typename Body>
-            filter<filter_input<Body>, filter_output<Body>> make_filter(filter_mode mode, const Body& body) {
-                return make_filter<filter_input<Body>, filter_output<Body>>(mode, body);
-            }
-
-            //! Composition of filters left and right.
-            /** @ingroup algorithms */
-            template <typename T, typename V, typename U>
-            filter<T, U> operator&(const filter<T, V>& left, const filter<V, U>& right) {
-                __TBB_ASSERT(left.my_root, "cannot use default-constructed filter as left argument of '&'");
-                __TBB_ASSERT(right.my_root, "cannot use default-constructed filter as right argument of '&'");
-                return filter_node_ptr(new (r1::allocate_memory(sizeof(filter_node)))
-                                               filter_node(left.my_root, right.my_root));
-            }
+namespace detail {
+
+namespace r1 {
+TBB_EXPORT void __TBB_EXPORTED_FUNC parallel_pipeline(task_group_context&, std::size_t, const d1::filter_node&);
+}
+
+namespace d1 {
+
+enum class filter_mode : unsigned int
+{
+    //! processes multiple items in parallel and in no particular order
+    parallel = base_filter::filter_is_out_of_order,
+    //! processes items one at a time; all such filters process items in the same order
+    serial_in_order =  base_filter::filter_is_serial,
+    //! processes items one at a time and in no particular order
+    serial_out_of_order = base_filter::filter_is_serial | base_filter::filter_is_out_of_order
+};
+//! Class representing a chain of type-safe pipeline filters
+/** @ingroup algorithms */
+template<typename InputType, typename OutputType>
+class filter {
+    filter_node_ptr my_root;
+    filter( filter_node_ptr root ) : my_root(root) {}
+    friend void parallel_pipeline( size_t, const filter<void,void>&, task_group_context& );
+    template<typename T_, typename U_, typename Body>
+    friend filter<T_,U_> make_filter( filter_mode, const Body& );
+    template<typename T_, typename V_, typename U_>
+    friend filter<T_,U_> operator&( const filter<T_,V_>&, const filter<V_,U_>& );
+public:
+    filter() = default;
+    filter( const filter& rhs ) : my_root(rhs.my_root) {}
+    filter( filter&& rhs ) : my_root(std::move(rhs.my_root)) {}
+
+    void operator=(const filter& rhs) {
+        my_root = rhs.my_root;
+    }
+    void operator=( filter&& rhs ) {
+        my_root = std::move(rhs.my_root);
+    }
+
+    template<typename Body>
+    filter( filter_mode mode, const Body& body ) :
+        my_root( new(r1::allocate_memory(sizeof(filter_node_leaf<InputType, OutputType, Body>)))
+                    filter_node_leaf<InputType, OutputType, Body>(static_cast<unsigned int>(mode), body) ) {
+    }
+
+    filter& operator&=( const filter<OutputType,OutputType>& right ) {
+        *this = *this & right;
+        return *this;
+    }
+
+    void clear() {
+        // Like operator= with filter() on right side.
+        my_root = nullptr;
+    }
+};
+
+//! Create a filter to participate in parallel_pipeline
+/** @ingroup algorithms */
+template<typename InputType, typename OutputType, typename Body>
+filter<InputType, OutputType> make_filter( filter_mode mode, const Body& body ) {
+    return filter_node_ptr( new(r1::allocate_memory(sizeof(filter_node_leaf<InputType, OutputType, Body>)))
+                                filter_node_leaf<InputType, OutputType, Body>(static_cast<unsigned int>(mode), body) );
+}
+
+//! Create a filter to participate in parallel_pipeline
+/** @ingroup algorithms */
+template<typename Body>
+filter<filter_input<Body>, filter_output<Body>> make_filter( filter_mode mode, const Body& body ) {
+    return make_filter<filter_input<Body>, filter_output<Body>>(mode, body);
+}
+
+//! Composition of filters left and right.
+/** @ingroup algorithms */
+template<typename T, typename V, typename U>
+filter<T,U> operator&( const filter<T,V>& left, const filter<V,U>& right ) {
+    __TBB_ASSERT(left.my_root,"cannot use default-constructed filter as left argument of '&'");
+    __TBB_ASSERT(right.my_root,"cannot use default-constructed filter as right argument of '&'");
+    return filter_node_ptr( new (r1::allocate_memory(sizeof(filter_node))) filter_node(left.my_root,right.my_root) );
+}
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
-            template <typename Body>
-            filter(filter_mode, Body) -> filter<filter_input<Body>, filter_output<Body>>;
-#endif// __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
-
-            //! Parallel pipeline over chain of filters with user-supplied context.
-            /** @ingroup algorithms **/
-            inline void parallel_pipeline(size_t max_number_of_live_tokens,
-                                          const filter<void, void>& filter_chain,
-                                          task_group_context& context) {
-                r1::parallel_pipeline(context, max_number_of_live_tokens, *filter_chain.my_root);
-            }
-
-            //! Parallel pipeline over chain of filters.
-            /** @ingroup algorithms **/
-            inline void parallel_pipeline(size_t max_number_of_live_tokens,
-                                          const filter<void, void>& filter_chain) {
-                task_group_context context;
-                parallel_pipeline(max_number_of_live_tokens, filter_chain, context);
-            }
-
-            //! Parallel pipeline over sequence of filters.
-            /** @ingroup algorithms **/
-            template <typename F1, typename F2, typename... FiltersContext>
-            void parallel_pipeline(size_t max_number_of_live_tokens, const F1& filter1, const F2& filter2,
-                                   FiltersContext&&... filters) {
-                parallel_pipeline(max_number_of_live_tokens, filter1 & filter2,
-                                  std::forward<FiltersContext>(filters)...);
-            }
-
-        }// namespace d1
-    }    // namespace detail
-
-    inline namespace v1 {
-        using detail::d1::filter;
-        using detail::d1::filter_mode;
-        using detail::d1::flow_control;
-        using detail::d1::make_filter;
-        using detail::d1::parallel_pipeline;
-    }// namespace v1
-}// namespace tbb
+template<typename Body>
+filter(filter_mode, Body)
+->filter<filter_input<Body>, filter_output<Body>>;
+#endif // __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
+
+//! Parallel pipeline over chain of filters with user-supplied context.
+/** @ingroup algorithms **/
+inline void parallel_pipeline(size_t max_number_of_live_tokens, const filter<void,void>& filter_chain, task_group_context& context) {
+    r1::parallel_pipeline(context, max_number_of_live_tokens, *filter_chain.my_root);
+}
+
+//! Parallel pipeline over chain of filters.
+/** @ingroup algorithms **/
+inline void parallel_pipeline(size_t max_number_of_live_tokens, const filter<void,void>& filter_chain) {
+    task_group_context context;
+    parallel_pipeline(max_number_of_live_tokens, filter_chain, context);
+}
+
+//! Parallel pipeline over sequence of filters.
+/** @ingroup algorithms **/
+template<typename F1, typename F2, typename... FiltersContext>
+void parallel_pipeline(size_t max_number_of_live_tokens,
+                              const F1& filter1,
+                              const F2& filter2,
+                              FiltersContext&&... filters) {
+    parallel_pipeline(max_number_of_live_tokens, filter1 & filter2, std::forward<FiltersContext>(filters)...);
+}
+
+} // namespace d1
+} // namespace detail
+
+inline namespace v1
+{
+using detail::d1::parallel_pipeline;
+using detail::d1::filter;
+using detail::d1::make_filter;
+using detail::d1::filter_mode;
+using detail::d1::flow_control;
+}
+} // tbb
 
 #endif /* __TBB_parallel_pipeline_H */
diff --git a/external/tbb/include/oneapi/tbb/parallel_reduce.h b/external/tbb/include/oneapi/tbb/parallel_reduce.h
index 51d46c83..205c97ef 100644
--- a/external/tbb/include/oneapi/tbb/parallel_reduce.h
+++ b/external/tbb/include/oneapi/tbb/parallel_reduce.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -17,359 +17,395 @@
 #ifndef __TBB_parallel_reduce_H
 #define __TBB_parallel_reduce_H
 
-#include "detail/_aligned_space.h"
+#include <new>
 #include "detail/_namespace_injection.h"
-#include "detail/_range_common.h"
-#include "detail/_small_object_pool.h"
 #include "detail/_task.h"
-#include <new>
+#include "detail/_aligned_space.h"
+#include "detail/_small_object_pool.h"
+#include "detail/_range_common.h"
 
+#include "task_group.h" // task_group_context
 #include "partitioner.h"
 #include "profiling.h"
-#include "task_group.h"// task_group_context
 
 namespace tbb {
-    namespace detail {
+namespace detail {
 #if __TBB_CPP20_CONCEPTS_PRESENT
-        inline namespace d0 {
-
-            template <typename Body, typename Range>
-            concept parallel_reduce_body
-                    = splittable<Body> && requires(Body& body, const Range& range, Body& rhs) {
-                body(range);
-                body.join(rhs);
-            };
-
-            template <typename Function, typename Range, typename Value>
-            concept parallel_reduce_function = requires(const std::remove_reference_t<Function>& func,
-                                                        const Range& range, const Value& value) {
-                { func(range, value) } -> std::convertible_to<Value>;
-            };
-
-            template <typename Combine, typename Value>
-            concept parallel_reduce_combine = requires(const std::remove_reference_t<Combine>& combine,
-                                                       const Value& lhs, const Value& rhs) {
-                { combine(lhs, rhs) } -> std::convertible_to<Value>;
-            };
-
-        }// namespace d0
-#endif   // __TBB_CPP20_CONCEPTS_PRESENT
-        namespace d1 {
-
-            //! Tree node type for parallel_reduce.
-            /** @ingroup algorithms */
-            //TODO: consider folding tree via bypass execution(instead of manual folding)
-            // for better cancellation and critical tasks handling (performance measurements required).
-            template <typename Body>
-            struct reduction_tree_node : public tree_node {
-                tbb::detail::aligned_space<Body> zombie_space;
-                Body& left_body;
-                bool has_right_zombie {false};
-
-                reduction_tree_node(node* parent, int ref_count, Body& input_left_body,
-                                    small_object_allocator& alloc)
-                    : tree_node {parent, ref_count, alloc},
-                      left_body(
-                              input_left_body) /* gcc4.8 bug - braced-initialization doesn't work for class members of reference type */
-                {}
-
-                void join(task_group_context* context) {
-                    if (has_right_zombie && !context->is_group_execution_cancelled())
-                        left_body.join(*zombie_space.begin());
-                }
-
-                ~reduction_tree_node() {
-                    if (has_right_zombie) zombie_space.begin()->~Body();
-                }
-            };
-
-            //! Task type used to split the work of parallel_reduce.
-            /** @ingroup algorithms */
-            template <typename Range, typename Body, typename Partitioner>
-            struct start_reduce : public task {
-                Range my_range;
-                Body* my_body;
-                node* my_parent;
-
-                typename Partitioner::task_partition_type my_partition;
-                small_object_allocator my_allocator;
-                bool is_right_child;
-
-                task* execute(execution_data&) override;
-                task* cancel(execution_data&) override;
-                void finalize(const execution_data&);
-
-                using tree_node_type = reduction_tree_node<Body>;
-
-                //! Constructor reduce root task.
-                start_reduce(const Range& range, Body& body, Partitioner& partitioner,
-                             small_object_allocator& alloc)
-                    : my_range(range), my_body(&body), my_partition(partitioner), my_allocator(alloc),
-                      is_right_child(false) {}
-                //! Splitting constructor used to generate children.
-                /** parent_ becomes left child. Newly constructed object is right child. */
-                start_reduce(start_reduce& parent_, typename Partitioner::split_type& split_obj,
-                             small_object_allocator& alloc)
-                    : my_range(parent_.my_range, get_range_split_object<Range>(split_obj)),
-                      my_body(parent_.my_body), my_partition(parent_.my_partition, split_obj),
-                      my_allocator(alloc), is_right_child(true) {
-                    parent_.is_right_child = false;
-                }
-                //! Construct right child from the given range as response to the demand.
-                /** parent_ remains left child. Newly constructed object is right child. */
-                start_reduce(start_reduce& parent_, const Range& r, depth_t d, small_object_allocator& alloc)
-                    : my_range(r), my_body(parent_.my_body), my_partition(parent_.my_partition, split()),
-                      my_allocator(alloc), is_right_child(true) {
-                    my_partition.align_depth(d);
-                    parent_.is_right_child = false;
-                }
-                static void run(const Range& range, Body& body, Partitioner& partitioner,
-                                task_group_context& context) {
-                    if (!range.empty()) {
-                        wait_node wn;
-                        small_object_allocator alloc {};
-                        auto reduce_task = alloc.new_object<start_reduce>(range, body, partitioner, alloc);
-                        reduce_task->my_parent = &wn;
-                        execute_and_wait(*reduce_task, context, wn.m_wait, context);
-                    }
-                }
-                static void run(const Range& range, Body& body, Partitioner& partitioner) {
-                    // Bound context prevents exceptions from body to affect nesting or sibling algorithms,
-                    // and allows users to handle exceptions safely by wrapping parallel_reduce in the try-block.
-                    task_group_context context(PARALLEL_REDUCE);
-                    run(range, body, partitioner, context);
-                }
-                //! Run body for range, serves as callback for partitioner
-                void run_body(Range& r) { (*my_body)(r); }
-
-                //! spawn right task, serves as callback for partitioner
-                void offer_work(typename Partitioner::split_type& split_obj, execution_data& ed) {
-                    offer_work_impl(ed, *this, split_obj);
-                }
-                //! spawn right task, serves as callback for partitioner
-                void offer_work(const Range& r, depth_t d, execution_data& ed) {
-                    offer_work_impl(ed, *this, r, d);
-                }
-
-            private:
-                template <typename... Args>
-                void offer_work_impl(execution_data& ed, Args&&... args) {
-                    small_object_allocator alloc {};
-                    // New right child
-                    auto right_child = alloc.new_object<start_reduce>(ed, std::forward<Args>(args)..., alloc);
-
-                    // New root node as a continuation and ref count. Left and right child attach to the new parent.
-                    right_child->my_parent = my_parent
-                            = alloc.new_object<tree_node_type>(ed, my_parent, 2, *my_body, alloc);
-
-                    // Spawn the right sibling
-                    right_child->spawn_self(ed);
-                }
-
-                void spawn_self(execution_data& ed) { my_partition.spawn_task(*this, *context(ed)); }
-            };
-
-            //! fold the tree and deallocate the task
-            template <typename Range, typename Body, typename Partitioner>
-            void start_reduce<Range, Body, Partitioner>::finalize(const execution_data& ed) {
-                // Get the current parent and wait object before an object destruction
-                node* parent = my_parent;
-                auto allocator = my_allocator;
-                // Task execution finished - destroy it
-                this->~start_reduce();
-                // Unwind the tree decrementing the parent`s reference count
-                fold_tree<tree_node_type>(parent, ed);
-                allocator.deallocate(this, ed);
-            }
-
-            //! Execute parallel_reduce task
-            template <typename Range, typename Body, typename Partitioner>
-            task* start_reduce<Range, Body, Partitioner>::execute(execution_data& ed) {
-                if (!is_same_affinity(ed)) { my_partition.note_affinity(execution_slot(ed)); }
-                my_partition.check_being_stolen(*this, ed);
-
-                // The acquire barrier synchronizes the data pointed with my_body if the left
-                // task has already finished.
-                if (is_right_child && my_parent->m_ref_count.load(std::memory_order_acquire) == 2) {
-                    tree_node_type* parent_ptr = static_cast<tree_node_type*>(my_parent);
-                    my_body = (Body*) new (parent_ptr->zombie_space.begin()) Body(*my_body, split());
-                    parent_ptr->has_right_zombie = true;
-                }
-                __TBB_ASSERT(my_body != nullptr, "Incorrect body value");
-
-                my_partition.execute(*this, my_range, ed);
-
-                finalize(ed);
-                return nullptr;
-            }
-
-            //! Cancel parallel_reduce task
-            template <typename Range, typename Body, typename Partitioner>
-            task* start_reduce<Range, Body, Partitioner>::cancel(execution_data& ed) {
-                finalize(ed);
-                return nullptr;
-            }
-
-            //! Tree node type for parallel_deterministic_reduce.
-            /** @ingroup algorithms */
-            template <typename Body>
-            struct deterministic_reduction_tree_node : public tree_node {
-                Body right_body;
-                Body& left_body;
-
-                deterministic_reduction_tree_node(node* parent, int ref_count, Body& input_left_body,
-                                                  small_object_allocator& alloc)
-                    : tree_node {parent, ref_count, alloc}, right_body {input_left_body, detail::split()},
-                      left_body(input_left_body) {}
-
-                void join(task_group_context* context) {
-                    if (!context->is_group_execution_cancelled()) left_body.join(right_body);
-                }
-            };
-
-            //! Task type used to split the work of parallel_deterministic_reduce.
-            /** @ingroup algorithms */
-            template <typename Range, typename Body, typename Partitioner>
-            struct start_deterministic_reduce : public task {
-                Range my_range;
-                Body& my_body;
-                node* my_parent;
-
-                typename Partitioner::task_partition_type my_partition;
-                small_object_allocator my_allocator;
-
-                task* execute(execution_data&) override;
-                task* cancel(execution_data&) override;
-                void finalize(const execution_data&);
-
-                using tree_node_type = deterministic_reduction_tree_node<Body>;
-
-                //! Constructor deterministic_reduce root task.
-                start_deterministic_reduce(const Range& range, Partitioner& partitioner, Body& body,
-                                           small_object_allocator& alloc)
-                    : my_range(range), my_body(body), my_partition(partitioner), my_allocator(alloc) {}
-                //! Splitting constructor used to generate children.
-                /** parent_ becomes left child.  Newly constructed object is right child. */
-                start_deterministic_reduce(start_deterministic_reduce& parent_,
-                                           typename Partitioner::split_type& split_obj, Body& body,
-                                           small_object_allocator& alloc)
-                    : my_range(parent_.my_range, get_range_split_object<Range>(split_obj)), my_body(body),
-                      my_partition(parent_.my_partition, split_obj), my_allocator(alloc) {}
-                static void run(const Range& range, Body& body, Partitioner& partitioner,
-                                task_group_context& context) {
-                    if (!range.empty()) {
-                        wait_node wn;
-                        small_object_allocator alloc {};
-                        auto deterministic_reduce_task = alloc.new_object<start_deterministic_reduce>(
-                                range, partitioner, body, alloc);
-                        deterministic_reduce_task->my_parent = &wn;
-                        execute_and_wait(*deterministic_reduce_task, context, wn.m_wait, context);
-                    }
-                }
-                static void run(const Range& range, Body& body, Partitioner& partitioner) {
-                    // Bound context prevents exceptions from body to affect nesting or sibling algorithms,
-                    // and allows users to handle exceptions safely by wrapping parallel_deterministic_reduce
-                    // in the try-block.
-                    task_group_context context(PARALLEL_REDUCE);
-                    run(range, body, partitioner, context);
-                }
-                //! Run body for range, serves as callback for partitioner
-                void run_body(Range& r) { my_body(r); }
-                //! Spawn right task, serves as callback for partitioner
-                void offer_work(typename Partitioner::split_type& split_obj, execution_data& ed) {
-                    offer_work_impl(ed, *this, split_obj);
-                }
-
-            private:
-                template <typename... Args>
-                void offer_work_impl(execution_data& ed, Args&&... args) {
-                    small_object_allocator alloc {};
-                    // New root node as a continuation and ref count. Left and right child attach to the new parent. Split the body.
-                    auto new_tree_node = alloc.new_object<tree_node_type>(ed, my_parent, 2, my_body, alloc);
-
-                    // New right child
-                    auto right_child = alloc.new_object<start_deterministic_reduce>(
-                            ed, std::forward<Args>(args)..., new_tree_node->right_body, alloc);
-
-                    right_child->my_parent = my_parent = new_tree_node;
-
-                    // Spawn the right sibling
-                    right_child->spawn_self(ed);
-                }
-
-                void spawn_self(execution_data& ed) { my_partition.spawn_task(*this, *context(ed)); }
-            };
-
-            //! Fold the tree and deallocate the task
-            template <typename Range, typename Body, typename Partitioner>
-            void start_deterministic_reduce<Range, Body, Partitioner>::finalize(const execution_data& ed) {
-                // Get the current parent and wait object before an object destruction
-                node* parent = my_parent;
-
-                auto allocator = my_allocator;
-                // Task execution finished - destroy it
-                this->~start_deterministic_reduce();
-                // Unwind the tree decrementing the parent`s reference count
-                fold_tree<tree_node_type>(parent, ed);
-                allocator.deallocate(this, ed);
-            }
-
-            //! Execute parallel_deterministic_reduce task
-            template <typename Range, typename Body, typename Partitioner>
-            task* start_deterministic_reduce<Range, Body, Partitioner>::execute(execution_data& ed) {
-                if (!is_same_affinity(ed)) { my_partition.note_affinity(execution_slot(ed)); }
-                my_partition.check_being_stolen(*this, ed);
-
-                my_partition.execute(*this, my_range, ed);
-
-                finalize(ed);
-                return NULL;
-            }
-
-            //! Cancel parallel_deterministic_reduce task
-            template <typename Range, typename Body, typename Partitioner>
-            task* start_deterministic_reduce<Range, Body, Partitioner>::cancel(execution_data& ed) {
-                finalize(ed);
-                return NULL;
-            }
-
-            //! Auxiliary class for parallel_reduce; for internal use only.
-            /** The adaptor class that implements \ref parallel_reduce_body_req "parallel_reduce Body"
+inline namespace d0 {
+
+template <typename Body, typename Range>
+concept parallel_reduce_body = splittable<Body> &&
+                               requires( Body& body, const Range& range, Body& rhs ) {
+                                   body(range);
+                                   body.join(rhs);
+                               };
+
+template <typename Function, typename Range, typename Value>
+concept parallel_reduce_function = std::invocable<const std::remove_reference_t<Function>&,
+                                                  const Range&, Value&&> &&
+                                   std::convertible_to<std::invoke_result_t<const std::remove_reference_t<Function>&,
+                                                                            const Range&, Value&&>,
+                                                        Value>;
+
+template <typename Combine, typename Value>
+concept parallel_reduce_combine = std::invocable<const std::remove_reference_t<Combine>&,
+                                                 Value&&, Value&&> &&
+                                  std::convertible_to<std::invoke_result_t<const std::remove_reference_t<Combine>&,
+                                                                           Value&&, Value&&>,
+                                                      Value>;
+
+} // namespace d0
+#endif // __TBB_CPP20_CONCEPTS_PRESENT
+namespace d1 {
+
+//! Tree node type for parallel_reduce.
+/** @ingroup algorithms */
+//TODO: consider folding tree via bypass execution(instead of manual folding)
+// for better cancellation and critical tasks handling (performance measurements required).
+template<typename Body>
+struct reduction_tree_node : public tree_node {
+    tbb::detail::aligned_space<Body> zombie_space;
+    Body& left_body;
+    bool has_right_zombie{false};
+
+    reduction_tree_node(node* parent, int ref_count, Body& input_left_body, small_object_allocator& alloc) :
+        tree_node{parent, ref_count, alloc},
+        left_body(input_left_body) /* gcc4.8 bug - braced-initialization doesn't work for class members of reference type */
+    {}
+
+    void join(task_group_context* context) {
+        if (has_right_zombie && !context->is_group_execution_cancelled())
+            left_body.join(*zombie_space.begin());
+    }
+
+    ~reduction_tree_node() {
+        if( has_right_zombie ) zombie_space.begin()->~Body();
+    }
+};
+
+//! Task type used to split the work of parallel_reduce.
+/** @ingroup algorithms */
+template<typename Range, typename Body, typename Partitioner>
+struct start_reduce : public task {
+    Range my_range;
+    Body* my_body;
+    node* my_parent;
+
+    typename Partitioner::task_partition_type my_partition;
+    small_object_allocator my_allocator;
+    bool is_right_child;
+
+    task* execute(execution_data&) override;
+    task* cancel(execution_data&) override;
+    void finalize(const execution_data&);
+
+    using tree_node_type = reduction_tree_node<Body>;
+
+    //! Constructor reduce root task.
+    start_reduce( const Range& range, Body& body, Partitioner& partitioner, small_object_allocator& alloc ) :
+        my_range(range),
+        my_body(&body),
+        my_parent(nullptr),
+        my_partition(partitioner),
+        my_allocator(alloc),
+        is_right_child(false) {}
+    //! Splitting constructor used to generate children.
+    /** parent_ becomes left child. Newly constructed object is right child. */
+    start_reduce( start_reduce& parent_, typename Partitioner::split_type& split_obj, small_object_allocator& alloc ) :
+        my_range(parent_.my_range, get_range_split_object<Range>(split_obj)),
+        my_body(parent_.my_body),
+        my_parent(nullptr),
+        my_partition(parent_.my_partition, split_obj),
+        my_allocator(alloc),
+        is_right_child(true)
+    {
+        parent_.is_right_child = false;
+    }
+    //! Construct right child from the given range as response to the demand.
+    /** parent_ remains left child. Newly constructed object is right child. */
+    start_reduce( start_reduce& parent_, const Range& r, depth_t d, small_object_allocator& alloc ) :
+        my_range(r),
+        my_body(parent_.my_body),
+        my_parent(nullptr),
+        my_partition(parent_.my_partition, split()),
+        my_allocator(alloc),
+        is_right_child(true)
+    {
+        my_partition.align_depth( d );
+        parent_.is_right_child = false;
+    }
+    static void run(const Range& range, Body& body, Partitioner& partitioner, task_group_context& context) {
+        if ( !range.empty() ) {
+            wait_node wn;
+            small_object_allocator alloc{};
+            auto reduce_task = alloc.new_object<start_reduce>(range, body, partitioner, alloc);
+            reduce_task->my_parent = &wn;
+            execute_and_wait(*reduce_task, context, wn.m_wait, context);
+        }
+    }
+    static void run(const Range& range, Body& body, Partitioner& partitioner) {
+        // Bound context prevents exceptions from body to affect nesting or sibling algorithms,
+        // and allows users to handle exceptions safely by wrapping parallel_reduce in the try-block.
+        task_group_context context(PARALLEL_REDUCE);
+        run(range, body, partitioner, context);
+    }
+    //! Run body for range, serves as callback for partitioner
+    void run_body( Range &r ) {
+        tbb::detail::invoke(*my_body, r);
+    }
+
+    //! spawn right task, serves as callback for partitioner
+    void offer_work(typename Partitioner::split_type& split_obj, execution_data& ed) {
+        offer_work_impl(ed, *this, split_obj);
+    }
+    //! spawn right task, serves as callback for partitioner
+    void offer_work(const Range& r, depth_t d, execution_data& ed) {
+        offer_work_impl(ed, *this, r, d);
+    }
+
+private:
+    template <typename... Args>
+    void offer_work_impl(execution_data& ed, Args&&... args) {
+        small_object_allocator alloc{};
+        // New right child
+        auto right_child = alloc.new_object<start_reduce>(ed, std::forward<Args>(args)..., alloc);
+
+        // New root node as a continuation and ref count. Left and right child attach to the new parent.
+        right_child->my_parent = my_parent = alloc.new_object<tree_node_type>(ed, my_parent, 2, *my_body, alloc);
+
+        // Spawn the right sibling
+        right_child->spawn_self(ed);
+    }
+
+    void spawn_self(execution_data& ed) {
+        my_partition.spawn_task(*this, *context(ed));
+    }
+};
+
+//! fold the tree and deallocate the task
+template<typename Range, typename Body, typename Partitioner>
+void start_reduce<Range, Body, Partitioner>::finalize(const execution_data& ed) {
+    // Get the current parent and wait object before an object destruction
+    node* parent = my_parent;
+    auto allocator = my_allocator;
+    // Task execution finished - destroy it
+    this->~start_reduce();
+    // Unwind the tree decrementing the parent`s reference count
+    fold_tree<tree_node_type>(parent, ed);
+    allocator.deallocate(this, ed);
+}
+
+//! Execute parallel_reduce task
+template<typename Range, typename Body, typename Partitioner>
+task* start_reduce<Range,Body,Partitioner>::execute(execution_data& ed) {
+    if (!is_same_affinity(ed)) {
+        my_partition.note_affinity(execution_slot(ed));
+    }
+    my_partition.check_being_stolen(*this, ed);
+
+    // The acquire barrier synchronizes the data pointed with my_body if the left
+    // task has already finished.
+    __TBB_ASSERT(my_parent, nullptr);
+    if( is_right_child && my_parent->m_ref_count.load(std::memory_order_acquire) == 2 ) {
+        tree_node_type* parent_ptr = static_cast<tree_node_type*>(my_parent);
+        my_body = static_cast<Body*>(new( parent_ptr->zombie_space.begin() ) Body(*my_body, split()));
+        parent_ptr->has_right_zombie = true;
+    }
+    __TBB_ASSERT(my_body != nullptr, "Incorrect body value");
+
+    my_partition.execute(*this, my_range, ed);
+
+    finalize(ed);
+    return nullptr;
+}
+
+//! Cancel parallel_reduce task
+template<typename Range, typename Body, typename Partitioner>
+task* start_reduce<Range, Body, Partitioner>::cancel(execution_data& ed) {
+    finalize(ed);
+    return nullptr;
+}
+
+//! Tree node type for parallel_deterministic_reduce.
+/** @ingroup algorithms */
+template<typename Body>
+struct deterministic_reduction_tree_node : public tree_node {
+    Body right_body;
+    Body& left_body;
+
+    deterministic_reduction_tree_node(node* parent, int ref_count, Body& input_left_body, small_object_allocator& alloc) :
+        tree_node{parent, ref_count, alloc},
+        right_body{input_left_body, detail::split()},
+        left_body(input_left_body)
+    {}
+
+    void join(task_group_context* context) {
+        if (!context->is_group_execution_cancelled())
+            left_body.join(right_body);
+    }
+};
+
+//! Task type used to split the work of parallel_deterministic_reduce.
+/** @ingroup algorithms */
+template<typename Range, typename Body, typename Partitioner>
+struct start_deterministic_reduce : public task {
+    Range my_range;
+    Body& my_body;
+    node* my_parent;
+
+    typename Partitioner::task_partition_type my_partition;
+    small_object_allocator my_allocator;
+
+    task* execute(execution_data&) override;
+    task* cancel(execution_data&) override;
+    void finalize(const execution_data&);
+
+    using tree_node_type = deterministic_reduction_tree_node<Body>;
+
+    //! Constructor deterministic_reduce root task.
+    start_deterministic_reduce( const Range& range, Partitioner& partitioner, Body& body, small_object_allocator& alloc ) :
+        my_range(range),
+        my_body(body),
+        my_parent(nullptr),
+        my_partition(partitioner),
+        my_allocator(alloc) {}
+    //! Splitting constructor used to generate children.
+    /** parent_ becomes left child.  Newly constructed object is right child. */
+    start_deterministic_reduce( start_deterministic_reduce& parent_, typename Partitioner::split_type& split_obj, Body& body,
+                                small_object_allocator& alloc ) :
+        my_range(parent_.my_range, get_range_split_object<Range>(split_obj)),
+        my_body(body),
+        my_parent(nullptr),
+        my_partition(parent_.my_partition, split_obj),
+        my_allocator(alloc) {}
+    static void run(const Range& range, Body& body, Partitioner& partitioner, task_group_context& context) {
+        if ( !range.empty() ) {
+            wait_node wn;
+            small_object_allocator alloc{};
+            auto deterministic_reduce_task =
+                alloc.new_object<start_deterministic_reduce>(range, partitioner, body, alloc);
+            deterministic_reduce_task->my_parent = &wn;
+            execute_and_wait(*deterministic_reduce_task, context, wn.m_wait, context);
+        }
+    }
+    static void run(const Range& range, Body& body, Partitioner& partitioner) {
+        // Bound context prevents exceptions from body to affect nesting or sibling algorithms,
+        // and allows users to handle exceptions safely by wrapping parallel_deterministic_reduce
+        // in the try-block.
+        task_group_context context(PARALLEL_REDUCE);
+        run(range, body, partitioner, context);
+    }
+    //! Run body for range, serves as callback for partitioner
+    void run_body( Range &r ) {
+        tbb::detail::invoke(my_body, r);
+    }
+    //! Spawn right task, serves as callback for partitioner
+    void offer_work(typename Partitioner::split_type& split_obj, execution_data& ed) {
+        offer_work_impl(ed, *this, split_obj);
+    }
+private:
+    template <typename... Args>
+    void offer_work_impl(execution_data& ed, Args&&... args) {
+        small_object_allocator alloc{};
+        // New root node as a continuation and ref count. Left and right child attach to the new parent. Split the body.
+        auto new_tree_node = alloc.new_object<tree_node_type>(ed, my_parent, 2, my_body, alloc);
+
+        // New right child
+        auto right_child = alloc.new_object<start_deterministic_reduce>(ed, std::forward<Args>(args)..., new_tree_node->right_body, alloc);
+
+        right_child->my_parent = my_parent = new_tree_node;
+
+        // Spawn the right sibling
+        right_child->spawn_self(ed);
+    }
+
+    void spawn_self(execution_data& ed) {
+        my_partition.spawn_task(*this, *context(ed));
+    }
+};
+
+//! Fold the tree and deallocate the task
+template<typename Range, typename Body, typename Partitioner>
+void start_deterministic_reduce<Range, Body, Partitioner>::finalize(const execution_data& ed) {
+    // Get the current parent and wait object before an object destruction
+    node* parent = my_parent;
+
+    auto allocator = my_allocator;
+    // Task execution finished - destroy it
+    this->~start_deterministic_reduce();
+    // Unwind the tree decrementing the parent`s reference count
+    fold_tree<tree_node_type>(parent, ed);
+    allocator.deallocate(this, ed);
+}
+
+//! Execute parallel_deterministic_reduce task
+template<typename Range, typename Body, typename Partitioner>
+task* start_deterministic_reduce<Range,Body,Partitioner>::execute(execution_data& ed) {
+    if (!is_same_affinity(ed)) {
+        my_partition.note_affinity(execution_slot(ed));
+    }
+    my_partition.check_being_stolen(*this, ed);
+
+    my_partition.execute(*this, my_range, ed);
+
+    finalize(ed);
+    return nullptr;
+}
+
+//! Cancel parallel_deterministic_reduce task
+template<typename Range, typename Body, typename Partitioner>
+task* start_deterministic_reduce<Range, Body, Partitioner>::cancel(execution_data& ed) {
+    finalize(ed);
+    return nullptr;
+}
+
+
+//! Auxiliary class for parallel_reduce; for internal use only.
+/** The adaptor class that implements \ref parallel_reduce_body_req "parallel_reduce Body"
     using given \ref parallel_reduce_lambda_req "anonymous function objects".
  **/
-            /** @ingroup algorithms */
-            template <typename Range, typename Value, typename RealBody, typename Reduction>
-            class lambda_reduce_body {
-                //TODO: decide if my_real_body, my_reduction, and my_identity_element should be copied or referenced
-                //       (might require some performance measurements)
-
-                const Value& my_identity_element;
-                const RealBody& my_real_body;
-                const Reduction& my_reduction;
-                Value my_value;
-                lambda_reduce_body& operator=(const lambda_reduce_body& other);
-
-            public:
-                lambda_reduce_body(const Value& identity, const RealBody& body, const Reduction& reduction)
-                    : my_identity_element(identity), my_real_body(body), my_reduction(reduction),
-                      my_value(identity) {}
-                lambda_reduce_body(const lambda_reduce_body& other) = default;
-                lambda_reduce_body(lambda_reduce_body& other, tbb::split)
-                    : my_identity_element(other.my_identity_element), my_real_body(other.my_real_body),
-                      my_reduction(other.my_reduction), my_value(other.my_identity_element) {}
-                void operator()(Range& range) {
-                    my_value = my_real_body(range, const_cast<const Value&>(my_value));
-                }
-                void join(lambda_reduce_body& rhs) {
-                    my_value = my_reduction(const_cast<const Value&>(my_value),
-                                            const_cast<const Value&>(rhs.my_value));
-                }
-                Value result() const { return my_value; }
-            };
-
-            // Requirements on Range concept are documented in blocked_range.h
-
-            /** \page parallel_reduce_body_req Requirements on parallel_reduce body
+/** @ingroup algorithms */
+template<typename Range, typename Value, typename RealBody, typename Reduction>
+class lambda_reduce_body {
+//TODO: decide if my_real_body, my_reduction, and my_identity_element should be copied or referenced
+//       (might require some performance measurements)
+
+    const Value&     my_identity_element;
+    const RealBody&  my_real_body;
+    const Reduction& my_reduction;
+    Value            my_value;
+    lambda_reduce_body& operator= ( const lambda_reduce_body& other );
+public:
+    lambda_reduce_body( const Value& identity, const RealBody& body, const Reduction& reduction )
+        : my_identity_element(identity)
+        , my_real_body(body)
+        , my_reduction(reduction)
+        , my_value(identity)
+    { }
+    lambda_reduce_body( const lambda_reduce_body& other ) = default;
+    lambda_reduce_body( lambda_reduce_body& other, tbb::split )
+        : my_identity_element(other.my_identity_element)
+        , my_real_body(other.my_real_body)
+        , my_reduction(other.my_reduction)
+        , my_value(other.my_identity_element)
+    { }
+    void operator()(Range& range) {
+        my_value = tbb::detail::invoke(my_real_body, range, std::move(my_value));
+    }
+
+    void join( lambda_reduce_body& rhs ) {
+        my_value = tbb::detail::invoke(my_reduction, std::move(my_value), std::move(rhs.my_value));
+    }
+
+    __TBB_nodiscard Value&& result() && noexcept {
+        return std::move(my_value);
+    }
+};
+
+
+// Requirements on Range concept are documented in blocked_range.h
+
+/** \page parallel_reduce_body_req Requirements on parallel_reduce body
     Class \c Body implementing the concept of parallel_reduce body must define:
     - \code Body::Body( Body&, split ); \endcode        Splitting constructor.
                                                         Must be able to run concurrently with operator() and method \c join
@@ -380,398 +416,357 @@ namespace tbb {
                                                         The result in \c b should be merged into the result of \c this
 **/
 
-            /** \page parallel_reduce_lambda_req Requirements on parallel_reduce anonymous function objects (lambda functions)
+/** \page parallel_reduce_lambda_req Requirements on parallel_reduce anonymous function objects (lambda functions)
     TO BE DOCUMENTED
 **/
 
-            /** \name parallel_reduce
+/** \name parallel_reduce
     See also requirements on \ref range_req "Range" and \ref parallel_reduce_body_req "parallel_reduce Body". **/
-            //@{
-
-            //! Parallel iteration with reduction and default partitioner.
-            /** @ingroup algorithms **/
-            template <typename Range, typename Body>
-            __TBB_requires(tbb_range<Range>&& parallel_reduce_body<Body, Range>) void parallel_reduce(
-                    const Range& range, Body& body) {
-                start_reduce<Range, Body, const __TBB_DEFAULT_PARTITIONER>::run(range, body,
-                                                                                __TBB_DEFAULT_PARTITIONER());
-            }
-
-            //! Parallel iteration with reduction and simple_partitioner
-            /** @ingroup algorithms **/
-            template <typename Range, typename Body>
-            __TBB_requires(tbb_range<Range>&& parallel_reduce_body<Body, Range>) void parallel_reduce(
-                    const Range& range, Body& body, const simple_partitioner& partitioner) {
-                start_reduce<Range, Body, const simple_partitioner>::run(range, body, partitioner);
-            }
-
-            //! Parallel iteration with reduction and auto_partitioner
-            /** @ingroup algorithms **/
-            template <typename Range, typename Body>
-            __TBB_requires(tbb_range<Range>&& parallel_reduce_body<Body, Range>) void parallel_reduce(
-                    const Range& range, Body& body, const auto_partitioner& partitioner) {
-                start_reduce<Range, Body, const auto_partitioner>::run(range, body, partitioner);
-            }
-
-            //! Parallel iteration with reduction and static_partitioner
-            /** @ingroup algorithms **/
-            template <typename Range, typename Body>
-            __TBB_requires(tbb_range<Range>&& parallel_reduce_body<Body, Range>) void parallel_reduce(
-                    const Range& range, Body& body, const static_partitioner& partitioner) {
-                start_reduce<Range, Body, const static_partitioner>::run(range, body, partitioner);
-            }
-
-            //! Parallel iteration with reduction and affinity_partitioner
-            /** @ingroup algorithms **/
-            template <typename Range, typename Body>
-            __TBB_requires(tbb_range<Range>&& parallel_reduce_body<Body, Range>) void parallel_reduce(
-                    const Range& range, Body& body, affinity_partitioner& partitioner) {
-                start_reduce<Range, Body, affinity_partitioner>::run(range, body, partitioner);
-            }
-
-            //! Parallel iteration with reduction, default partitioner and user-supplied context.
-            /** @ingroup algorithms **/
-            template <typename Range, typename Body>
-            __TBB_requires(tbb_range<Range>&& parallel_reduce_body<Body, Range>) void parallel_reduce(
-                    const Range& range, Body& body, task_group_context& context) {
-                start_reduce<Range, Body, const __TBB_DEFAULT_PARTITIONER>::run(
-                        range, body, __TBB_DEFAULT_PARTITIONER(), context);
-            }
-
-            //! Parallel iteration with reduction, simple partitioner and user-supplied context.
-            /** @ingroup algorithms **/
-            template <typename Range, typename Body>
-            __TBB_requires(tbb_range<Range>&& parallel_reduce_body<Body, Range>) void parallel_reduce(
-                    const Range& range, Body& body, const simple_partitioner& partitioner,
-                    task_group_context& context) {
-                start_reduce<Range, Body, const simple_partitioner>::run(range, body, partitioner, context);
-            }
-
-            //! Parallel iteration with reduction, auto_partitioner and user-supplied context
-            /** @ingroup algorithms **/
-            template <typename Range, typename Body>
-            __TBB_requires(tbb_range<Range>&& parallel_reduce_body<Body, Range>) void parallel_reduce(
-                    const Range& range, Body& body, const auto_partitioner& partitioner,
-                    task_group_context& context) {
-                start_reduce<Range, Body, const auto_partitioner>::run(range, body, partitioner, context);
-            }
-
-            //! Parallel iteration with reduction, static_partitioner and user-supplied context
-            /** @ingroup algorithms **/
-            template <typename Range, typename Body>
-            __TBB_requires(tbb_range<Range>&& parallel_reduce_body<Body, Range>) void parallel_reduce(
-                    const Range& range, Body& body, const static_partitioner& partitioner,
-                    task_group_context& context) {
-                start_reduce<Range, Body, const static_partitioner>::run(range, body, partitioner, context);
-            }
-
-            //! Parallel iteration with reduction, affinity_partitioner and user-supplied context
-            /** @ingroup algorithms **/
-            template <typename Range, typename Body>
-            __TBB_requires(tbb_range<Range>&& parallel_reduce_body<Body, Range>) void parallel_reduce(
-                    const Range& range, Body& body, affinity_partitioner& partitioner,
-                    task_group_context& context) {
-                start_reduce<Range, Body, affinity_partitioner>::run(range, body, partitioner, context);
-            }
-            /** parallel_reduce overloads that work with anonymous function objects
+//@{
+
+//! Parallel iteration with reduction and default partitioner.
+/** @ingroup algorithms **/
+template<typename Range, typename Body>
+    __TBB_requires(tbb_range<Range> && parallel_reduce_body<Body, Range>)
+void parallel_reduce( const Range& range, Body& body ) {
+    start_reduce<Range,Body, const __TBB_DEFAULT_PARTITIONER>::run( range, body, __TBB_DEFAULT_PARTITIONER() );
+}
+
+//! Parallel iteration with reduction and simple_partitioner
+/** @ingroup algorithms **/
+template<typename Range, typename Body>
+    __TBB_requires(tbb_range<Range> && parallel_reduce_body<Body, Range>)
+void parallel_reduce( const Range& range, Body& body, const simple_partitioner& partitioner ) {
+    start_reduce<Range,Body,const simple_partitioner>::run( range, body, partitioner );
+}
+
+//! Parallel iteration with reduction and auto_partitioner
+/** @ingroup algorithms **/
+template<typename Range, typename Body>
+    __TBB_requires(tbb_range<Range> && parallel_reduce_body<Body, Range>)
+void parallel_reduce( const Range& range, Body& body, const auto_partitioner& partitioner ) {
+    start_reduce<Range,Body,const auto_partitioner>::run( range, body, partitioner );
+}
+
+//! Parallel iteration with reduction and static_partitioner
+/** @ingroup algorithms **/
+template<typename Range, typename Body>
+    __TBB_requires(tbb_range<Range> && parallel_reduce_body<Body, Range>)
+void parallel_reduce( const Range& range, Body& body, const static_partitioner& partitioner ) {
+    start_reduce<Range,Body,const static_partitioner>::run( range, body, partitioner );
+}
+
+//! Parallel iteration with reduction and affinity_partitioner
+/** @ingroup algorithms **/
+template<typename Range, typename Body>
+    __TBB_requires(tbb_range<Range> && parallel_reduce_body<Body, Range>)
+void parallel_reduce( const Range& range, Body& body, affinity_partitioner& partitioner ) {
+    start_reduce<Range,Body,affinity_partitioner>::run( range, body, partitioner );
+}
+
+//! Parallel iteration with reduction, default partitioner and user-supplied context.
+/** @ingroup algorithms **/
+template<typename Range, typename Body>
+    __TBB_requires(tbb_range<Range> && parallel_reduce_body<Body, Range>)
+void parallel_reduce( const Range& range, Body& body, task_group_context& context ) {
+    start_reduce<Range,Body,const __TBB_DEFAULT_PARTITIONER>::run( range, body, __TBB_DEFAULT_PARTITIONER(), context );
+}
+
+//! Parallel iteration with reduction, simple partitioner and user-supplied context.
+/** @ingroup algorithms **/
+template<typename Range, typename Body>
+    __TBB_requires(tbb_range<Range> && parallel_reduce_body<Body, Range>)
+void parallel_reduce( const Range& range, Body& body, const simple_partitioner& partitioner, task_group_context& context ) {
+    start_reduce<Range,Body,const simple_partitioner>::run( range, body, partitioner, context );
+}
+
+//! Parallel iteration with reduction, auto_partitioner and user-supplied context
+/** @ingroup algorithms **/
+template<typename Range, typename Body>
+    __TBB_requires(tbb_range<Range> && parallel_reduce_body<Body, Range>)
+void parallel_reduce( const Range& range, Body& body, const auto_partitioner& partitioner, task_group_context& context ) {
+    start_reduce<Range,Body,const auto_partitioner>::run( range, body, partitioner, context );
+}
+
+//! Parallel iteration with reduction, static_partitioner and user-supplied context
+/** @ingroup algorithms **/
+template<typename Range, typename Body>
+    __TBB_requires(tbb_range<Range> && parallel_reduce_body<Body, Range>)
+void parallel_reduce( const Range& range, Body& body, const static_partitioner& partitioner, task_group_context& context ) {
+    start_reduce<Range,Body,const static_partitioner>::run( range, body, partitioner, context );
+}
+
+//! Parallel iteration with reduction, affinity_partitioner and user-supplied context
+/** @ingroup algorithms **/
+template<typename Range, typename Body>
+    __TBB_requires(tbb_range<Range> && parallel_reduce_body<Body, Range>)
+void parallel_reduce( const Range& range, Body& body, affinity_partitioner& partitioner, task_group_context& context ) {
+    start_reduce<Range,Body,affinity_partitioner>::run( range, body, partitioner, context );
+}
+/** parallel_reduce overloads that work with anonymous function objects
     (see also \ref parallel_reduce_lambda_req "requirements on parallel_reduce anonymous function objects"). **/
 
-            //! Parallel iteration with reduction and default partitioner.
-            /** @ingroup algorithms **/
-            template <typename Range, typename Value, typename RealBody, typename Reduction>
-            __TBB_requires(tbb_range<Range>&& parallel_reduce_function<RealBody, Range, Value>&&
-                                   parallel_reduce_combine<Reduction, Value>) Value
-                    parallel_reduce(const Range& range, const Value& identity, const RealBody& real_body,
-                                    const Reduction& reduction) {
-                lambda_reduce_body<Range, Value, RealBody, Reduction> body(identity, real_body, reduction);
-                start_reduce<Range, lambda_reduce_body<Range, Value, RealBody, Reduction>,
-                             const __TBB_DEFAULT_PARTITIONER>::run(range, body, __TBB_DEFAULT_PARTITIONER());
-                return body.result();
-            }
-
-            //! Parallel iteration with reduction and simple_partitioner.
-            /** @ingroup algorithms **/
-            template <typename Range, typename Value, typename RealBody, typename Reduction>
-            __TBB_requires(tbb_range<Range>&& parallel_reduce_function<RealBody, Range, Value>&&
-                                   parallel_reduce_combine<Reduction, Value>) Value
-                    parallel_reduce(const Range& range, const Value& identity, const RealBody& real_body,
-                                    const Reduction& reduction, const simple_partitioner& partitioner) {
-                lambda_reduce_body<Range, Value, RealBody, Reduction> body(identity, real_body, reduction);
-                start_reduce<Range, lambda_reduce_body<Range, Value, RealBody, Reduction>,
-                             const simple_partitioner>::run(range, body, partitioner);
-                return body.result();
-            }
-
-            //! Parallel iteration with reduction and auto_partitioner
-            /** @ingroup algorithms **/
-            template <typename Range, typename Value, typename RealBody, typename Reduction>
-            __TBB_requires(tbb_range<Range>&& parallel_reduce_function<RealBody, Range, Value>&&
-                                   parallel_reduce_combine<Reduction, Value>) Value
-                    parallel_reduce(const Range& range, const Value& identity, const RealBody& real_body,
-                                    const Reduction& reduction, const auto_partitioner& partitioner) {
-                lambda_reduce_body<Range, Value, RealBody, Reduction> body(identity, real_body, reduction);
-                start_reduce<Range, lambda_reduce_body<Range, Value, RealBody, Reduction>,
-                             const auto_partitioner>::run(range, body, partitioner);
-                return body.result();
-            }
-
-            //! Parallel iteration with reduction and static_partitioner
-            /** @ingroup algorithms **/
-            template <typename Range, typename Value, typename RealBody, typename Reduction>
-            __TBB_requires(tbb_range<Range>&& parallel_reduce_function<RealBody, Range, Value>&&
-                                   parallel_reduce_combine<Reduction, Value>) Value
-                    parallel_reduce(const Range& range, const Value& identity, const RealBody& real_body,
-                                    const Reduction& reduction, const static_partitioner& partitioner) {
-                lambda_reduce_body<Range, Value, RealBody, Reduction> body(identity, real_body, reduction);
-                start_reduce<Range, lambda_reduce_body<Range, Value, RealBody, Reduction>,
-                             const static_partitioner>::run(range, body, partitioner);
-                return body.result();
-            }
-
-            //! Parallel iteration with reduction and affinity_partitioner
-            /** @ingroup algorithms **/
-            template <typename Range, typename Value, typename RealBody, typename Reduction>
-            __TBB_requires(tbb_range<Range>&& parallel_reduce_function<RealBody, Range, Value>&&
-                                   parallel_reduce_combine<Reduction, Value>) Value
-                    parallel_reduce(const Range& range, const Value& identity, const RealBody& real_body,
-                                    const Reduction& reduction, affinity_partitioner& partitioner) {
-                lambda_reduce_body<Range, Value, RealBody, Reduction> body(identity, real_body, reduction);
-                start_reduce<Range, lambda_reduce_body<Range, Value, RealBody, Reduction>,
-                             affinity_partitioner>::run(range, body, partitioner);
-                return body.result();
-            }
-
-            //! Parallel iteration with reduction, default partitioner and user-supplied context.
-            /** @ingroup algorithms **/
-            template <typename Range, typename Value, typename RealBody, typename Reduction>
-            __TBB_requires(tbb_range<Range>&& parallel_reduce_function<RealBody, Range, Value>&&
-                                   parallel_reduce_combine<Reduction, Value>) Value
-                    parallel_reduce(const Range& range, const Value& identity, const RealBody& real_body,
-                                    const Reduction& reduction, task_group_context& context) {
-                lambda_reduce_body<Range, Value, RealBody, Reduction> body(identity, real_body, reduction);
-                start_reduce<Range, lambda_reduce_body<Range, Value, RealBody, Reduction>,
-                             const __TBB_DEFAULT_PARTITIONER>::run(range, body, __TBB_DEFAULT_PARTITIONER(),
-                                                                   context);
-                return body.result();
-            }
-
-            //! Parallel iteration with reduction, simple partitioner and user-supplied context.
-            /** @ingroup algorithms **/
-            template <typename Range, typename Value, typename RealBody, typename Reduction>
-            __TBB_requires(tbb_range<Range>&& parallel_reduce_function<RealBody, Range, Value>&&
-                                   parallel_reduce_combine<Reduction, Value>) Value
-                    parallel_reduce(const Range& range, const Value& identity, const RealBody& real_body,
-                                    const Reduction& reduction, const simple_partitioner& partitioner,
-                                    task_group_context& context) {
-                lambda_reduce_body<Range, Value, RealBody, Reduction> body(identity, real_body, reduction);
-                start_reduce<Range, lambda_reduce_body<Range, Value, RealBody, Reduction>,
-                             const simple_partitioner>::run(range, body, partitioner, context);
-                return body.result();
-            }
-
-            //! Parallel iteration with reduction, auto_partitioner and user-supplied context
-            /** @ingroup algorithms **/
-            template <typename Range, typename Value, typename RealBody, typename Reduction>
-            __TBB_requires(tbb_range<Range>&& parallel_reduce_function<RealBody, Range, Value>&&
-                                   parallel_reduce_combine<Reduction, Value>) Value
-                    parallel_reduce(const Range& range, const Value& identity, const RealBody& real_body,
-                                    const Reduction& reduction, const auto_partitioner& partitioner,
-                                    task_group_context& context) {
-                lambda_reduce_body<Range, Value, RealBody, Reduction> body(identity, real_body, reduction);
-                start_reduce<Range, lambda_reduce_body<Range, Value, RealBody, Reduction>,
-                             const auto_partitioner>::run(range, body, partitioner, context);
-                return body.result();
-            }
-
-            //! Parallel iteration with reduction, static_partitioner and user-supplied context
-            /** @ingroup algorithms **/
-            template <typename Range, typename Value, typename RealBody, typename Reduction>
-            __TBB_requires(tbb_range<Range>&& parallel_reduce_function<RealBody, Range, Value>&&
-                                   parallel_reduce_combine<Reduction, Value>) Value
-                    parallel_reduce(const Range& range, const Value& identity, const RealBody& real_body,
-                                    const Reduction& reduction, const static_partitioner& partitioner,
-                                    task_group_context& context) {
-                lambda_reduce_body<Range, Value, RealBody, Reduction> body(identity, real_body, reduction);
-                start_reduce<Range, lambda_reduce_body<Range, Value, RealBody, Reduction>,
-                             const static_partitioner>::run(range, body, partitioner, context);
-                return body.result();
-            }
-
-            //! Parallel iteration with reduction, affinity_partitioner and user-supplied context
-            /** @ingroup algorithms **/
-            template <typename Range, typename Value, typename RealBody, typename Reduction>
-            __TBB_requires(tbb_range<Range>&& parallel_reduce_function<RealBody, Range, Value>&&
-                                   parallel_reduce_combine<Reduction, Value>) Value
-                    parallel_reduce(const Range& range, const Value& identity, const RealBody& real_body,
-                                    const Reduction& reduction, affinity_partitioner& partitioner,
-                                    task_group_context& context) {
-                lambda_reduce_body<Range, Value, RealBody, Reduction> body(identity, real_body, reduction);
-                start_reduce<Range, lambda_reduce_body<Range, Value, RealBody, Reduction>,
-                             affinity_partitioner>::run(range, body, partitioner, context);
-                return body.result();
-            }
-
-            //! Parallel iteration with deterministic reduction and default simple partitioner.
-            /** @ingroup algorithms **/
-            template <typename Range, typename Body>
-            __TBB_requires(tbb_range<Range>&& parallel_reduce_body<
-                           Body, Range>) void parallel_deterministic_reduce(const Range& range, Body& body) {
-                start_deterministic_reduce<Range, Body, const simple_partitioner>::run(range, body,
-                                                                                       simple_partitioner());
-            }
-
-            //! Parallel iteration with deterministic reduction and simple partitioner.
-            /** @ingroup algorithms **/
-            template <typename Range, typename Body>
-            __TBB_requires(tbb_range<Range>&& parallel_reduce_body<
-                           Body, Range>) void parallel_deterministic_reduce(const Range& range, Body& body,
-                                                                            const simple_partitioner&
-                                                                                    partitioner) {
-                start_deterministic_reduce<Range, Body, const simple_partitioner>::run(range, body,
-                                                                                       partitioner);
-            }
-
-            //! Parallel iteration with deterministic reduction and static partitioner.
-            /** @ingroup algorithms **/
-            template <typename Range, typename Body>
-            __TBB_requires(tbb_range<Range>&& parallel_reduce_body<
-                           Body, Range>) void parallel_deterministic_reduce(const Range& range, Body& body,
-                                                                            const static_partitioner&
-                                                                                    partitioner) {
-                start_deterministic_reduce<Range, Body, const static_partitioner>::run(range, body,
-                                                                                       partitioner);
-            }
-
-            //! Parallel iteration with deterministic reduction, default simple partitioner and user-supplied context.
-            /** @ingroup algorithms **/
-            template <typename Range, typename Body>
-            __TBB_requires(tbb_range<Range>&& parallel_reduce_body<
-                           Body, Range>) void parallel_deterministic_reduce(const Range& range, Body& body,
-                                                                            task_group_context& context) {
-                start_deterministic_reduce<Range, Body, const simple_partitioner>::run(
-                        range, body, simple_partitioner(), context);
-            }
-
-            //! Parallel iteration with deterministic reduction, simple partitioner and user-supplied context.
-            /** @ingroup algorithms **/
-            template <typename Range, typename Body>
-            __TBB_requires(tbb_range<Range>&& parallel_reduce_body<
-                           Body, Range>) void parallel_deterministic_reduce(const Range& range, Body& body,
-                                                                            const simple_partitioner&
-                                                                                    partitioner,
-                                                                            task_group_context& context) {
-                start_deterministic_reduce<Range, Body, const simple_partitioner>::run(range, body,
-                                                                                       partitioner, context);
-            }
-
-            //! Parallel iteration with deterministic reduction, static partitioner and user-supplied context.
-            /** @ingroup algorithms **/
-            template <typename Range, typename Body>
-            __TBB_requires(tbb_range<Range>&& parallel_reduce_body<
-                           Body, Range>) void parallel_deterministic_reduce(const Range& range, Body& body,
-                                                                            const static_partitioner&
-                                                                                    partitioner,
-                                                                            task_group_context& context) {
-                start_deterministic_reduce<Range, Body, const static_partitioner>::run(range, body,
-                                                                                       partitioner, context);
-            }
-
-            /** parallel_reduce overloads that work with anonymous function objects
+//! Parallel iteration with reduction and default partitioner.
+/** @ingroup algorithms **/
+template<typename Range, typename Value, typename RealBody, typename Reduction>
+    __TBB_requires(tbb_range<Range> && parallel_reduce_function<RealBody, Range, Value> &&
+                   parallel_reduce_combine<Reduction, Value>)
+Value parallel_reduce( const Range& range, const Value& identity, const RealBody& real_body, const Reduction& reduction ) {
+    lambda_reduce_body<Range,Value,RealBody,Reduction> body(identity, real_body, reduction);
+    start_reduce<Range,lambda_reduce_body<Range,Value,RealBody,Reduction>,const __TBB_DEFAULT_PARTITIONER>
+                          ::run(range, body, __TBB_DEFAULT_PARTITIONER() );
+    return std::move(body).result();
+}
+
+//! Parallel iteration with reduction and simple_partitioner.
+/** @ingroup algorithms **/
+template<typename Range, typename Value, typename RealBody, typename Reduction>
+    __TBB_requires(tbb_range<Range> && parallel_reduce_function<RealBody, Range, Value> &&
+                   parallel_reduce_combine<Reduction, Value>)
+Value parallel_reduce( const Range& range, const Value& identity, const RealBody& real_body, const Reduction& reduction,
+                       const simple_partitioner& partitioner ) {
+    lambda_reduce_body<Range,Value,RealBody,Reduction> body(identity, real_body, reduction);
+    start_reduce<Range,lambda_reduce_body<Range,Value,RealBody,Reduction>,const simple_partitioner>
+                          ::run(range, body, partitioner );
+    return std::move(body).result();
+}
+
+//! Parallel iteration with reduction and auto_partitioner
+/** @ingroup algorithms **/
+template<typename Range, typename Value, typename RealBody, typename Reduction>
+    __TBB_requires(tbb_range<Range> && parallel_reduce_function<RealBody, Range, Value> &&
+                   parallel_reduce_combine<Reduction, Value>)
+Value parallel_reduce( const Range& range, const Value& identity, const RealBody& real_body, const Reduction& reduction,
+                       const auto_partitioner& partitioner ) {
+    lambda_reduce_body<Range,Value,RealBody,Reduction> body(identity, real_body, reduction);
+    start_reduce<Range,lambda_reduce_body<Range,Value,RealBody,Reduction>,const auto_partitioner>
+                          ::run( range, body, partitioner );
+    return std::move(body).result();
+}
+
+//! Parallel iteration with reduction and static_partitioner
+/** @ingroup algorithms **/
+template<typename Range, typename Value, typename RealBody, typename Reduction>
+    __TBB_requires(tbb_range<Range> && parallel_reduce_function<RealBody, Range, Value> &&
+                   parallel_reduce_combine<Reduction, Value>)
+Value parallel_reduce( const Range& range, const Value& identity, const RealBody& real_body, const Reduction& reduction,
+                       const static_partitioner& partitioner ) {
+    lambda_reduce_body<Range,Value,RealBody,Reduction> body(identity, real_body, reduction);
+    start_reduce<Range,lambda_reduce_body<Range,Value,RealBody,Reduction>,const static_partitioner>
+                                        ::run( range, body, partitioner );
+    return std::move(body).result();
+}
+
+//! Parallel iteration with reduction and affinity_partitioner
+/** @ingroup algorithms **/
+template<typename Range, typename Value, typename RealBody, typename Reduction>
+    __TBB_requires(tbb_range<Range> && parallel_reduce_function<RealBody, Range, Value> &&
+                   parallel_reduce_combine<Reduction, Value>)
+Value parallel_reduce( const Range& range, const Value& identity, const RealBody& real_body, const Reduction& reduction,
+                       affinity_partitioner& partitioner ) {
+    lambda_reduce_body<Range,Value,RealBody,Reduction> body(identity, real_body, reduction);
+    start_reduce<Range,lambda_reduce_body<Range,Value,RealBody,Reduction>,affinity_partitioner>
+                                        ::run( range, body, partitioner );
+    return std::move(body).result();
+}
+
+//! Parallel iteration with reduction, default partitioner and user-supplied context.
+/** @ingroup algorithms **/
+template<typename Range, typename Value, typename RealBody, typename Reduction>
+    __TBB_requires(tbb_range<Range> && parallel_reduce_function<RealBody, Range, Value> &&
+                   parallel_reduce_combine<Reduction, Value>)
+Value parallel_reduce( const Range& range, const Value& identity, const RealBody& real_body, const Reduction& reduction,
+                       task_group_context& context ) {
+    lambda_reduce_body<Range,Value,RealBody,Reduction> body(identity, real_body, reduction);
+    start_reduce<Range,lambda_reduce_body<Range,Value,RealBody,Reduction>,const __TBB_DEFAULT_PARTITIONER>
+                          ::run( range, body, __TBB_DEFAULT_PARTITIONER(), context );
+    return std::move(body).result();
+}
+
+//! Parallel iteration with reduction, simple partitioner and user-supplied context.
+/** @ingroup algorithms **/
+template<typename Range, typename Value, typename RealBody, typename Reduction>
+    __TBB_requires(tbb_range<Range> && parallel_reduce_function<RealBody, Range, Value> &&
+                   parallel_reduce_combine<Reduction, Value>)
+Value parallel_reduce( const Range& range, const Value& identity, const RealBody& real_body, const Reduction& reduction,
+                       const simple_partitioner& partitioner, task_group_context& context ) {
+    lambda_reduce_body<Range,Value,RealBody,Reduction> body(identity, real_body, reduction);
+    start_reduce<Range,lambda_reduce_body<Range,Value,RealBody,Reduction>,const simple_partitioner>
+                          ::run( range, body, partitioner, context );
+    return std::move(body).result();
+}
+
+//! Parallel iteration with reduction, auto_partitioner and user-supplied context
+/** @ingroup algorithms **/
+template<typename Range, typename Value, typename RealBody, typename Reduction>
+    __TBB_requires(tbb_range<Range> && parallel_reduce_function<RealBody, Range, Value> &&
+                   parallel_reduce_combine<Reduction, Value>)
+Value parallel_reduce( const Range& range, const Value& identity, const RealBody& real_body, const Reduction& reduction,
+                       const auto_partitioner& partitioner, task_group_context& context ) {
+    lambda_reduce_body<Range,Value,RealBody,Reduction> body(identity, real_body, reduction);
+    start_reduce<Range,lambda_reduce_body<Range,Value,RealBody,Reduction>,const auto_partitioner>
+                          ::run( range, body, partitioner, context );
+    return std::move(body).result();
+}
+
+//! Parallel iteration with reduction, static_partitioner and user-supplied context
+/** @ingroup algorithms **/
+template<typename Range, typename Value, typename RealBody, typename Reduction>
+    __TBB_requires(tbb_range<Range> && parallel_reduce_function<RealBody, Range, Value> &&
+                   parallel_reduce_combine<Reduction, Value>)
+Value parallel_reduce( const Range& range, const Value& identity, const RealBody& real_body, const Reduction& reduction,
+                       const static_partitioner& partitioner, task_group_context& context ) {
+    lambda_reduce_body<Range,Value,RealBody,Reduction> body(identity, real_body, reduction);
+    start_reduce<Range,lambda_reduce_body<Range,Value,RealBody,Reduction>,const static_partitioner>
+                                        ::run( range, body, partitioner, context );
+    return std::move(body).result();
+}
+
+//! Parallel iteration with reduction, affinity_partitioner and user-supplied context
+/** @ingroup algorithms **/
+template<typename Range, typename Value, typename RealBody, typename Reduction>
+    __TBB_requires(tbb_range<Range> && parallel_reduce_function<RealBody, Range, Value> &&
+                   parallel_reduce_combine<Reduction, Value>)
+Value parallel_reduce( const Range& range, const Value& identity, const RealBody& real_body, const Reduction& reduction,
+                       affinity_partitioner& partitioner, task_group_context& context ) {
+    lambda_reduce_body<Range,Value,RealBody,Reduction> body(identity, real_body, reduction);
+    start_reduce<Range,lambda_reduce_body<Range,Value,RealBody,Reduction>,affinity_partitioner>
+                                        ::run( range, body, partitioner, context );
+    return std::move(body).result();
+}
+
+//! Parallel iteration with deterministic reduction and default simple partitioner.
+/** @ingroup algorithms **/
+template<typename Range, typename Body>
+    __TBB_requires(tbb_range<Range> && parallel_reduce_body<Body, Range>)
+void parallel_deterministic_reduce( const Range& range, Body& body ) {
+    start_deterministic_reduce<Range, Body, const simple_partitioner>::run(range, body, simple_partitioner());
+}
+
+//! Parallel iteration with deterministic reduction and simple partitioner.
+/** @ingroup algorithms **/
+template<typename Range, typename Body>
+    __TBB_requires(tbb_range<Range> && parallel_reduce_body<Body, Range>)
+void parallel_deterministic_reduce( const Range& range, Body& body, const simple_partitioner& partitioner ) {
+    start_deterministic_reduce<Range, Body, const simple_partitioner>::run(range, body, partitioner);
+}
+
+//! Parallel iteration with deterministic reduction and static partitioner.
+/** @ingroup algorithms **/
+template<typename Range, typename Body>
+    __TBB_requires(tbb_range<Range> && parallel_reduce_body<Body, Range>)
+void parallel_deterministic_reduce( const Range& range, Body& body, const static_partitioner& partitioner ) {
+    start_deterministic_reduce<Range, Body, const static_partitioner>::run(range, body, partitioner);
+}
+
+//! Parallel iteration with deterministic reduction, default simple partitioner and user-supplied context.
+/** @ingroup algorithms **/
+template<typename Range, typename Body>
+    __TBB_requires(tbb_range<Range> && parallel_reduce_body<Body, Range>)
+void parallel_deterministic_reduce( const Range& range, Body& body, task_group_context& context ) {
+    start_deterministic_reduce<Range,Body, const simple_partitioner>::run( range, body, simple_partitioner(), context );
+}
+
+//! Parallel iteration with deterministic reduction, simple partitioner and user-supplied context.
+/** @ingroup algorithms **/
+template<typename Range, typename Body>
+    __TBB_requires(tbb_range<Range> && parallel_reduce_body<Body, Range>)
+void parallel_deterministic_reduce( const Range& range, Body& body, const simple_partitioner& partitioner, task_group_context& context ) {
+    start_deterministic_reduce<Range, Body, const simple_partitioner>::run(range, body, partitioner, context);
+}
+
+//! Parallel iteration with deterministic reduction, static partitioner and user-supplied context.
+/** @ingroup algorithms **/
+template<typename Range, typename Body>
+    __TBB_requires(tbb_range<Range> && parallel_reduce_body<Body, Range>)
+void parallel_deterministic_reduce( const Range& range, Body& body, const static_partitioner& partitioner, task_group_context& context ) {
+    start_deterministic_reduce<Range, Body, const static_partitioner>::run(range, body, partitioner, context);
+}
+
+/** parallel_reduce overloads that work with anonymous function objects
     (see also \ref parallel_reduce_lambda_req "requirements on parallel_reduce anonymous function objects"). **/
 
-            //! Parallel iteration with deterministic reduction and default simple partitioner.
-            // TODO: consider making static_partitioner the default
-            /** @ingroup algorithms **/
-            template <typename Range, typename Value, typename RealBody, typename Reduction>
-            __TBB_requires(tbb_range<Range>&& parallel_reduce_function<RealBody, Range, Value>&&
-                                   parallel_reduce_combine<Reduction, Value>) Value
-                    parallel_deterministic_reduce(const Range& range, const Value& identity,
-                                                  const RealBody& real_body, const Reduction& reduction) {
-                return parallel_deterministic_reduce(range, identity, real_body, reduction,
-                                                     simple_partitioner());
-            }
-
-            //! Parallel iteration with deterministic reduction and simple partitioner.
-            /** @ingroup algorithms **/
-            template <typename Range, typename Value, typename RealBody, typename Reduction>
-            __TBB_requires(tbb_range<Range>&& parallel_reduce_function<RealBody, Range, Value>&&
-                                   parallel_reduce_combine<Reduction, Value>) Value
-                    parallel_deterministic_reduce(const Range& range, const Value& identity,
-                                                  const RealBody& real_body, const Reduction& reduction,
-                                                  const simple_partitioner& partitioner) {
-                lambda_reduce_body<Range, Value, RealBody, Reduction> body(identity, real_body, reduction);
-                start_deterministic_reduce<Range, lambda_reduce_body<Range, Value, RealBody, Reduction>,
-                                           const simple_partitioner>::run(range, body, partitioner);
-                return body.result();
-            }
-
-            //! Parallel iteration with deterministic reduction and static partitioner.
-            /** @ingroup algorithms **/
-            template <typename Range, typename Value, typename RealBody, typename Reduction>
-            __TBB_requires(tbb_range<Range>&& parallel_reduce_function<RealBody, Range, Value>&&
-                                   parallel_reduce_combine<Reduction, Value>) Value
-                    parallel_deterministic_reduce(const Range& range, const Value& identity,
-                                                  const RealBody& real_body, const Reduction& reduction,
-                                                  const static_partitioner& partitioner) {
-                lambda_reduce_body<Range, Value, RealBody, Reduction> body(identity, real_body, reduction);
-                start_deterministic_reduce<Range, lambda_reduce_body<Range, Value, RealBody, Reduction>,
-                                           const static_partitioner>::run(range, body, partitioner);
-                return body.result();
-            }
-
-            //! Parallel iteration with deterministic reduction, default simple partitioner and user-supplied context.
-            /** @ingroup algorithms **/
-            template <typename Range, typename Value, typename RealBody, typename Reduction>
-            __TBB_requires(tbb_range<Range>&& parallel_reduce_function<RealBody, Range, Value>&&
-                                   parallel_reduce_combine<Reduction, Value>) Value
-                    parallel_deterministic_reduce(const Range& range, const Value& identity,
-                                                  const RealBody& real_body, const Reduction& reduction,
-                                                  task_group_context& context) {
-                return parallel_deterministic_reduce(range, identity, real_body, reduction,
-                                                     simple_partitioner(), context);
-            }
-
-            //! Parallel iteration with deterministic reduction, simple partitioner and user-supplied context.
-            /** @ingroup algorithms **/
-            template <typename Range, typename Value, typename RealBody, typename Reduction>
-            __TBB_requires(tbb_range<Range>&& parallel_reduce_function<RealBody, Range, Value>&&
-                                   parallel_reduce_combine<Reduction, Value>) Value
-                    parallel_deterministic_reduce(const Range& range, const Value& identity,
-                                                  const RealBody& real_body, const Reduction& reduction,
-                                                  const simple_partitioner& partitioner,
-                                                  task_group_context& context) {
-                lambda_reduce_body<Range, Value, RealBody, Reduction> body(identity, real_body, reduction);
-                start_deterministic_reduce<Range, lambda_reduce_body<Range, Value, RealBody, Reduction>,
-                                           const simple_partitioner>::run(range, body, partitioner, context);
-                return body.result();
-            }
-
-            //! Parallel iteration with deterministic reduction, static partitioner and user-supplied context.
-            /** @ingroup algorithms **/
-            template <typename Range, typename Value, typename RealBody, typename Reduction>
-            __TBB_requires(tbb_range<Range>&& parallel_reduce_function<RealBody, Range, Value>&&
-                                   parallel_reduce_combine<Reduction, Value>) Value
-                    parallel_deterministic_reduce(const Range& range, const Value& identity,
-                                                  const RealBody& real_body, const Reduction& reduction,
-                                                  const static_partitioner& partitioner,
-                                                  task_group_context& context) {
-                lambda_reduce_body<Range, Value, RealBody, Reduction> body(identity, real_body, reduction);
-                start_deterministic_reduce<Range, lambda_reduce_body<Range, Value, RealBody, Reduction>,
-                                           const static_partitioner>::run(range, body, partitioner, context);
-                return body.result();
-            }
-            //@}
-
-        }// namespace d1
-    }    // namespace detail
-
-    inline namespace v1 {
-        using detail::d1::parallel_deterministic_reduce;
-        using detail::d1::parallel_reduce;
-        // Split types
-        using detail::proportional_split;
-        using detail::split;
-    }// namespace v1
-
-}// namespace tbb
+//! Parallel iteration with deterministic reduction and default simple partitioner.
+// TODO: consider making static_partitioner the default
+/** @ingroup algorithms **/
+template<typename Range, typename Value, typename RealBody, typename Reduction>
+    __TBB_requires(tbb_range<Range> && parallel_reduce_function<RealBody, Range, Value> &&
+                   parallel_reduce_combine<Reduction, Value>)
+Value parallel_deterministic_reduce( const Range& range, const Value& identity, const RealBody& real_body, const Reduction& reduction ) {
+    return parallel_deterministic_reduce(range, identity, real_body, reduction, simple_partitioner());
+}
+
+//! Parallel iteration with deterministic reduction and simple partitioner.
+/** @ingroup algorithms **/
+template<typename Range, typename Value, typename RealBody, typename Reduction>
+    __TBB_requires(tbb_range<Range> && parallel_reduce_function<RealBody, Range, Value> &&
+                   parallel_reduce_combine<Reduction, Value>)
+Value parallel_deterministic_reduce( const Range& range, const Value& identity, const RealBody& real_body, const Reduction& reduction, const simple_partitioner& partitioner ) {
+    lambda_reduce_body<Range,Value,RealBody,Reduction> body(identity, real_body, reduction);
+    start_deterministic_reduce<Range,lambda_reduce_body<Range,Value,RealBody,Reduction>, const simple_partitioner>
+                          ::run(range, body, partitioner);
+    return std::move(body).result();
+}
+
+//! Parallel iteration with deterministic reduction and static partitioner.
+/** @ingroup algorithms **/
+template<typename Range, typename Value, typename RealBody, typename Reduction>
+    __TBB_requires(tbb_range<Range> && parallel_reduce_function<RealBody, Range, Value> &&
+                   parallel_reduce_combine<Reduction, Value>)
+Value parallel_deterministic_reduce( const Range& range, const Value& identity, const RealBody& real_body, const Reduction& reduction, const static_partitioner& partitioner ) {
+    lambda_reduce_body<Range, Value, RealBody, Reduction> body(identity, real_body, reduction);
+    start_deterministic_reduce<Range, lambda_reduce_body<Range, Value, RealBody, Reduction>, const static_partitioner>
+        ::run(range, body, partitioner);
+    return std::move(body).result();
+}
+
+//! Parallel iteration with deterministic reduction, default simple partitioner and user-supplied context.
+/** @ingroup algorithms **/
+template<typename Range, typename Value, typename RealBody, typename Reduction>
+    __TBB_requires(tbb_range<Range> && parallel_reduce_function<RealBody, Range, Value> &&
+                   parallel_reduce_combine<Reduction, Value>)
+Value parallel_deterministic_reduce( const Range& range, const Value& identity, const RealBody& real_body, const Reduction& reduction,
+    task_group_context& context ) {
+    return parallel_deterministic_reduce(range, identity, real_body, reduction, simple_partitioner(), context);
+}
+
+//! Parallel iteration with deterministic reduction, simple partitioner and user-supplied context.
+/** @ingroup algorithms **/
+template<typename Range, typename Value, typename RealBody, typename Reduction>
+    __TBB_requires(tbb_range<Range> && parallel_reduce_function<RealBody, Range, Value> &&
+                   parallel_reduce_combine<Reduction, Value>)
+Value parallel_deterministic_reduce( const Range& range, const Value& identity, const RealBody& real_body, const Reduction& reduction,
+    const simple_partitioner& partitioner, task_group_context& context ) {
+    lambda_reduce_body<Range, Value, RealBody, Reduction> body(identity, real_body, reduction);
+    start_deterministic_reduce<Range, lambda_reduce_body<Range, Value, RealBody, Reduction>, const simple_partitioner>
+        ::run(range, body, partitioner, context);
+    return std::move(body).result();
+}
+
+//! Parallel iteration with deterministic reduction, static partitioner and user-supplied context.
+/** @ingroup algorithms **/
+template<typename Range, typename Value, typename RealBody, typename Reduction>
+    __TBB_requires(tbb_range<Range> && parallel_reduce_function<RealBody, Range, Value> &&
+                   parallel_reduce_combine<Reduction, Value>)
+Value parallel_deterministic_reduce( const Range& range, const Value& identity, const RealBody& real_body, const Reduction& reduction,
+    const static_partitioner& partitioner, task_group_context& context ) {
+    lambda_reduce_body<Range, Value, RealBody, Reduction> body(identity, real_body, reduction);
+    start_deterministic_reduce<Range, lambda_reduce_body<Range, Value, RealBody, Reduction>, const static_partitioner>
+        ::run(range, body, partitioner, context);
+    return std::move(body).result();
+}
+//@}
+
+} // namespace d1
+} // namespace detail
+
+inline namespace v1 {
+using detail::d1::parallel_reduce;
+using detail::d1::parallel_deterministic_reduce;
+// Split types
+using detail::split;
+using detail::proportional_split;
+} // namespace v1
+
+} // namespace tbb
 #endif /* __TBB_parallel_reduce_H */
diff --git a/external/tbb/include/oneapi/tbb/parallel_scan.h b/external/tbb/include/oneapi/tbb/parallel_scan.h
index 747dbd78..8ef0777b 100644
--- a/external/tbb/include/oneapi/tbb/parallel_scan.h
+++ b/external/tbb/include/oneapi/tbb/parallel_scan.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2025 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -20,476 +20,526 @@
 #include <functional>
 
 #include "detail/_config.h"
-#include "detail/_exception.h"
 #include "detail/_namespace_injection.h"
+#include "detail/_exception.h"
 #include "detail/_task.h"
 
-#include "blocked_range.h"
-#include "partitioner.h"
 #include "profiling.h"
+#include "partitioner.h"
+#include "blocked_range.h"
 #include "task_group.h"
 
 namespace tbb {
-    namespace detail {
-        namespace d1 {
-
-            //! Used to indicate that the initial scan is being performed.
-            /** @ingroup algorithms */
-            struct pre_scan_tag {
-                static bool is_final_scan() { return false; }
-                operator bool() { return is_final_scan(); }
-            };
-
-            //! Used to indicate that the final scan is being performed.
-            /** @ingroup algorithms */
-            struct final_scan_tag {
-                static bool is_final_scan() { return true; }
-                operator bool() { return is_final_scan(); }
-            };
-
-            template <typename Range, typename Body>
-            struct sum_node;
+namespace detail {
+namespace d1 {
+
+//! Used to indicate that the initial scan is being performed.
+/** @ingroup algorithms */
+struct pre_scan_tag {
+    static bool is_final_scan() {return false;}
+    operator bool() {return is_final_scan();}
+};
+
+//! Used to indicate that the final scan is being performed.
+/** @ingroup algorithms */
+struct final_scan_tag {
+    static bool is_final_scan() {return true;}
+    operator bool() {return is_final_scan();}
+};
+
+template<typename Range, typename Body>
+struct sum_node;
 
 #if __TBB_CPP20_CONCEPTS_PRESENT
-        }// namespace d1
-        namespace d0 {
-
-            template <typename Body, typename Range>
-            concept parallel_scan_body
-                    = splittable<Body> && requires(Body& body, const Range& range, Body& other) {
-                body(range, tbb::detail::d1::pre_scan_tag {});
-                body(range, tbb::detail::d1::final_scan_tag {});
-                body.reverse_join(other);
-                body.assign(other);
-            };
-
-            template <typename Function, typename Range, typename Value>
-            concept parallel_scan_function = requires(const std::remove_reference_t<Function>& func,
-                                                      const Range& range, const Value& value) {
-                { func(range, value, true) } -> std::convertible_to<Value>;
-            };
-
-            template <typename Combine, typename Value>
-            concept parallel_scan_combine = requires(const std::remove_reference_t<Combine>& combine,
-                                                     const Value& lhs, const Value& rhs) {
-                { combine(lhs, rhs) } -> std::convertible_to<Value>;
-            };
-
-        }// namespace d0
-        namespace d1 {
-#endif// __TBB_CPP20_CONCEPTS_PRESENT
-
-            //! Performs final scan for a leaf
-            /** @ingroup algorithms */
-            template <typename Range, typename Body>
-            struct final_sum : public task {
-            private:
-                using sum_node_type = sum_node<Range, Body>;
-                Body m_body;
-                aligned_space<Range> m_range;
-                //! Where to put result of last subrange, or nullptr if not last subrange.
-                Body* m_stuff_last;
-
-                wait_context& m_wait_context;
-                sum_node_type* m_parent = nullptr;
-
-            public:
-                small_object_allocator m_allocator;
-                final_sum(Body& body, wait_context& w_o, small_object_allocator& alloc)
-                    : m_body(body, split()), m_wait_context(w_o), m_allocator(alloc) {
-                    poison_pointer(m_stuff_last);
-                }
-
-                final_sum(final_sum& sum, small_object_allocator& alloc)
-                    : m_body(sum.m_body, split()), m_wait_context(sum.m_wait_context), m_allocator(alloc) {
-                    poison_pointer(m_stuff_last);
-                }
-
-                ~final_sum() { m_range.begin()->~Range(); }
-                void finish_construction(sum_node_type* parent, const Range& range, Body* stuff_last) {
-                    __TBB_ASSERT(m_parent == nullptr, nullptr);
-                    m_parent = parent;
-                    new (m_range.begin()) Range(range);
-                    m_stuff_last = stuff_last;
-                }
-
-            private:
-                sum_node_type* release_parent() {
-                    call_itt_task_notify(releasing, m_parent);
-                    if (m_parent) {
-                        auto parent = m_parent;
-                        m_parent = nullptr;
-                        if (parent->ref_count.fetch_sub(1) == 1) { return parent; }
-                    } else
-                        m_wait_context.release();
-                    return nullptr;
-                }
-                sum_node_type* finalize(const execution_data& ed) {
-                    sum_node_type* next_task = release_parent();
-                    m_allocator.delete_object<final_sum>(this, ed);
-                    return next_task;
-                }
-
-            public:
-                task* execute(execution_data& ed) override {
-                    m_body(*m_range.begin(), final_scan_tag());
-                    if (m_stuff_last) m_stuff_last->assign(m_body);
-
-                    return finalize(ed);
-                }
-                task* cancel(execution_data& ed) override { return finalize(ed); }
-                template <typename Tag>
-                void operator()(const Range& r, Tag tag) {
-                    m_body(r, tag);
-                }
-                void reverse_join(final_sum& a) { m_body.reverse_join(a.m_body); }
-                void reverse_join(Body& body) { m_body.reverse_join(body); }
-                void assign_to(Body& body) { body.assign(m_body); }
-                void self_destroy(const execution_data& ed) {
-                    m_allocator.delete_object<final_sum>(this, ed);
-                }
-            };
-
-            //! Split work to be done in the scan.
-            /** @ingroup algorithms */
-            template <typename Range, typename Body>
-            struct sum_node : public task {
-            private:
-                using final_sum_type = final_sum<Range, Body>;
-
-            public:
-                final_sum_type* m_incoming;
-                final_sum_type* m_body;
-                Body* m_stuff_last;
-
-            private:
-                final_sum_type* m_left_sum;
-                sum_node* m_left;
-                sum_node* m_right;
-                bool m_left_is_final;
-                Range m_range;
-                wait_context& m_wait_context;
-                sum_node* m_parent;
-                small_object_allocator m_allocator;
-
-            public:
-                std::atomic<unsigned int> ref_count {0};
-                sum_node(const Range range, bool left_is_final_, sum_node* parent, wait_context& w_o,
-                         small_object_allocator& alloc)
-                    : m_stuff_last(nullptr), m_left_sum(nullptr), m_left(nullptr), m_right(nullptr),
-                      m_left_is_final(left_is_final_), m_range(range), m_wait_context(w_o), m_parent(parent),
-                      m_allocator(alloc) {
-                    if (m_parent) m_parent->ref_count.fetch_add(1);
-                    // Poison fields that will be set by second pass.
-                    poison_pointer(m_body);
-                    poison_pointer(m_incoming);
-                }
-
-                ~sum_node() {
-                    if (m_parent) m_parent->ref_count.fetch_sub(1);
-                }
-
-            private:
-                sum_node* release_parent() {
-                    call_itt_task_notify(releasing, m_parent);
-                    if (m_parent) {
-                        auto parent = m_parent;
-                        m_parent = nullptr;
-                        if (parent->ref_count.fetch_sub(1) == 1) { return parent; }
-                    } else
-                        m_wait_context.release();
-                    return nullptr;
-                }
-                task* create_child(const Range& range, final_sum_type& body, sum_node* child,
-                                   final_sum_type* incoming, Body* stuff_last) {
-                    if (child) {
-                        __TBB_ASSERT(is_poisoned(child->m_body) && is_poisoned(child->m_incoming), nullptr);
-                        child->prepare_for_execution(body, incoming, stuff_last);
-                        return child;
-                    } else {
-                        body.finish_construction(this, range, stuff_last);
-                        return &body;
-                    }
-                }
-
-                sum_node* finalize(const execution_data& ed) {
-                    sum_node* next_task = release_parent();
-                    m_allocator.delete_object<sum_node>(this, ed);
-                    return next_task;
-                }
-
-            public:
-                void prepare_for_execution(final_sum_type& body, final_sum_type* incoming, Body* stuff_last) {
-                    this->m_body = &body;
-                    this->m_incoming = incoming;
-                    this->m_stuff_last = stuff_last;
-                }
-                task* execute(execution_data& ed) override {
-                    if (m_body) {
-                        if (m_incoming) m_left_sum->reverse_join(*m_incoming);
-                        task* right_child = this->create_child(Range(m_range, split()), *m_left_sum, m_right,
-                                                               m_left_sum, m_stuff_last);
-                        task* left_child = m_left_is_final ? nullptr
-                                                           : this->create_child(m_range, *m_body, m_left,
-                                                                                m_incoming, nullptr);
-                        ref_count = (left_child != nullptr) + (right_child != nullptr);
-                        m_body = nullptr;
-                        if (left_child) {
-                            spawn(*right_child, *ed.context);
-                            return left_child;
-                        } else {
-                            return right_child;
-                        }
-                    } else {
-                        return finalize(ed);
-                    }
-                }
-                task* cancel(execution_data& ed) override { return finalize(ed); }
-                void self_destroy(const execution_data& ed) { m_allocator.delete_object<sum_node>(this, ed); }
-                template <typename range, typename body, typename partitioner>
-                friend struct start_scan;
-
-                template <typename range, typename body>
-                friend struct finish_scan;
-            };
-
-            //! Combine partial results
-            /** @ingroup algorithms */
-            template <typename Range, typename Body>
-            struct finish_scan : public task {
-            private:
-                using sum_node_type = sum_node<Range, Body>;
-                using final_sum_type = final_sum<Range, Body>;
-                final_sum_type** const m_sum_slot;
-                sum_node_type*& m_return_slot;
-                small_object_allocator m_allocator;
-
-            public:
-                std::atomic<final_sum_type*> m_right_zombie;
-                sum_node_type& m_result;
-                std::atomic<unsigned int> ref_count {2};
-                finish_scan* m_parent;
-                wait_context& m_wait_context;
-                task* execute(execution_data& ed) override {
-                    __TBB_ASSERT(m_result.ref_count.load()
-                                         == static_cast<unsigned int>((m_result.m_left != nullptr)
-                                                                      + (m_result.m_right != nullptr)),
-                                 nullptr);
-                    if (m_result.m_left) m_result.m_left_is_final = false;
-                    final_sum_type* right_zombie = m_right_zombie.load(std::memory_order_acquire);
-                    if (right_zombie && m_sum_slot) (*m_sum_slot)->reverse_join(*m_result.m_left_sum);
-                    __TBB_ASSERT(!m_return_slot, nullptr);
-                    if (right_zombie || m_result.m_right) {
-                        m_return_slot = &m_result;
-                    } else {
-                        m_result.self_destroy(ed);
-                    }
-                    if (right_zombie && !m_sum_slot && !m_result.m_right) {
-                        right_zombie->self_destroy(ed);
-                        m_right_zombie.store(nullptr, std::memory_order_relaxed);
-                    }
-                    return finalize(ed);
-                }
-                task* cancel(execution_data& ed) override { return finalize(ed); }
-                finish_scan(sum_node_type*& return_slot, final_sum_type** sum, sum_node_type& result_,
-                            finish_scan* parent, wait_context& w_o, small_object_allocator& alloc)
-                    : m_sum_slot(sum), m_return_slot(return_slot), m_allocator(alloc),
-                      m_right_zombie(nullptr), m_result(result_), m_parent(parent), m_wait_context(w_o) {
-                    __TBB_ASSERT(!m_return_slot, nullptr);
-                }
-
-            private:
-                finish_scan* release_parent() {
-                    call_itt_task_notify(releasing, m_parent);
-                    if (m_parent) {
-                        auto parent = m_parent;
-                        m_parent = nullptr;
-                        if (parent->ref_count.fetch_sub(1) == 1) { return parent; }
-                    } else
-                        m_wait_context.release();
-                    return nullptr;
-                }
-                finish_scan* finalize(const execution_data& ed) {
-                    finish_scan* next_task = release_parent();
-                    m_allocator.delete_object<finish_scan>(this, ed);
-                    return next_task;
-                }
-            };
-
-            //! Initial task to split the work
-            /** @ingroup algorithms */
-            template <typename Range, typename Body, typename Partitioner>
-            struct start_scan : public task {
-            private:
-                using sum_node_type = sum_node<Range, Body>;
-                using final_sum_type = final_sum<Range, Body>;
-                using finish_pass1_type = finish_scan<Range, Body>;
-                std::reference_wrapper<sum_node_type*> m_return_slot;
-                Range m_range;
-                std::reference_wrapper<final_sum_type> m_body;
-                typename Partitioner::partition_type m_partition;
-                /** Non-null if caller is requesting total. */
-                final_sum_type** m_sum_slot;
-                bool m_is_final;
-                bool m_is_right_child;
-
-                finish_pass1_type* m_parent;
-                small_object_allocator m_allocator;
-                wait_context& m_wait_context;
-
-                finish_pass1_type* release_parent() {
-                    call_itt_task_notify(releasing, m_parent);
-                    if (m_parent) {
-                        auto parent = m_parent;
-                        m_parent = nullptr;
-                        if (parent->ref_count.fetch_sub(1) == 1) { return parent; }
-                    } else
-                        m_wait_context.release();
-                    return nullptr;
-                }
-
-                finish_pass1_type* finalize(const execution_data& ed) {
-                    finish_pass1_type* next_task = release_parent();
-                    m_allocator.delete_object<start_scan>(this, ed);
-                    return next_task;
-                }
-
-            public:
-                task* execute(execution_data&) override;
-                task* cancel(execution_data& ed) override { return finalize(ed); }
-                start_scan(sum_node_type*& return_slot, start_scan& parent, small_object_allocator& alloc)
-                    : m_return_slot(return_slot), m_range(parent.m_range, split()), m_body(parent.m_body),
-                      m_partition(parent.m_partition, split()), m_sum_slot(parent.m_sum_slot),
-                      m_is_final(parent.m_is_final), m_is_right_child(true), m_parent(parent.m_parent),
-                      m_allocator(alloc), m_wait_context(parent.m_wait_context) {
-                    __TBB_ASSERT(!m_return_slot, nullptr);
-                    parent.m_is_right_child = false;
-                }
-
-                start_scan(sum_node_type*& return_slot, const Range& range, final_sum_type& body,
-                           const Partitioner& partitioner, wait_context& w_o, small_object_allocator& alloc)
-                    : m_return_slot(return_slot), m_range(range), m_body(body), m_partition(partitioner),
-                      m_sum_slot(nullptr), m_is_final(true), m_is_right_child(false), m_parent(nullptr),
-                      m_allocator(alloc), m_wait_context(w_o) {
-                    __TBB_ASSERT(!m_return_slot, nullptr);
-                }
-
-                static void run(const Range& range, Body& body, const Partitioner& partitioner) {
-                    if (!range.empty()) {
-                        task_group_context context(PARALLEL_SCAN);
-
-                        using start_pass1_type = start_scan<Range, Body, Partitioner>;
-                        sum_node_type* root = nullptr;
-                        wait_context w_ctx {1};
-                        small_object_allocator alloc {};
-
-                        auto& temp_body = *alloc.new_object<final_sum_type>(body, w_ctx, alloc);
-                        temp_body.reverse_join(body);
-
-                        auto& pass1 = *alloc.new_object<start_pass1_type>(
-                                /*m_return_slot=*/root, range, temp_body, partitioner, w_ctx, alloc);
-
-                        execute_and_wait(pass1, context, w_ctx, context);
-                        if (root) {
-                            root->prepare_for_execution(temp_body, nullptr, &body);
-                            w_ctx.reserve();
-                            execute_and_wait(*root, context, w_ctx, context);
-                        } else {
-                            temp_body.assign_to(body);
-                            temp_body.finish_construction(nullptr, range, nullptr);
-                            alloc.delete_object<final_sum_type>(&temp_body);
-                        }
-                    }
-                }
-            };
-
-            template <typename Range, typename Body, typename Partitioner>
-            task* start_scan<Range, Body, Partitioner>::execute(execution_data& ed) {
-                // Inspecting m_parent->result.left_sum would ordinarily be a race condition.
-                // But we inspect it only if we are not a stolen task, in which case we
-                // know that task assigning to m_parent->result.left_sum has completed.
-                __TBB_ASSERT(!m_is_right_child || m_parent, "right child is never an orphan");
-                bool treat_as_stolen = m_is_right_child
-                                       && (is_stolen(ed) || &m_body.get() != m_parent->m_result.m_left_sum);
-                if (treat_as_stolen) {
-                    // Invocation is for right child that has been really stolen or needs to be virtually stolen
-                    small_object_allocator alloc {};
-                    final_sum_type* right_zombie = alloc.new_object<final_sum_type>(m_body, alloc);
-                    m_parent->m_right_zombie.store(right_zombie, std::memory_order_release);
-                    m_body = *right_zombie;
-                    m_is_final = false;
-                }
-                task* next_task = nullptr;
-                if ((m_is_right_child && !treat_as_stolen) || !m_range.is_divisible()
-                    || m_partition.should_execute_range(ed)) {
-                    if (m_is_final) m_body(m_range, final_scan_tag());
-                    else if (m_sum_slot)
-                        m_body(m_range, pre_scan_tag());
-                    if (m_sum_slot) *m_sum_slot = &m_body.get();
-                    __TBB_ASSERT(!m_return_slot, nullptr);
-
-                    next_task = finalize(ed);
-                } else {
-                    small_object_allocator alloc {};
-                    auto result = alloc.new_object<sum_node_type>(m_range, /*m_left_is_final=*/m_is_final,
-                                                                  m_parent ? &m_parent->m_result : nullptr,
-                                                                  m_wait_context, alloc);
-
-                    auto new_parent = alloc.new_object<finish_pass1_type>(m_return_slot, m_sum_slot, *result,
-                                                                          m_parent, m_wait_context, alloc);
-                    m_parent = new_parent;
-
-                    // Split off right child
-                    auto& right_child
-                            = *alloc.new_object<start_scan>(/*m_return_slot=*/result->m_right, *this, alloc);
-
-                    spawn(right_child, *ed.context);
-
-                    m_sum_slot = &result->m_left_sum;
-                    m_return_slot = result->m_left;
-
-                    __TBB_ASSERT(!m_return_slot, nullptr);
-                    next_task = this;
-                }
-                return next_task;
+} // namespace d1
+inline namespace d0 {
+
+template <typename Body, typename Range>
+concept parallel_scan_body = splittable<Body> &&
+                             requires( Body& body, const Range& range, Body& other ) {
+                                 body(range, tbb::detail::d1::pre_scan_tag{});
+                                 body(range, tbb::detail::d1::final_scan_tag{});
+                                 body.reverse_join(other);
+                                 body.assign(other);
+                             };
+
+template <typename Function, typename Range, typename Value>
+concept parallel_scan_function = std::invocable<const std::remove_reference_t<Function>&,
+                                                const Range&, const Value&, bool> &&
+                                 std::convertible_to<std::invoke_result_t<const std::remove_reference_t<Function>&,
+                                                                          const Range&, const Value&, bool>,
+                                                     Value>;
+
+template <typename Combine, typename Value>
+concept parallel_scan_combine = std::invocable<const std::remove_reference_t<Combine>&,
+                                               const Value&, const Value&> &&
+                                std::convertible_to<std::invoke_result_t<const std::remove_reference_t<Combine>&,
+                                                                         const Value&, const Value&>,
+                                                    Value>;
+
+} // namespace d0
+namespace d1 {
+#endif // __TBB_CPP20_CONCEPTS_PRESENT
+
+//! Performs final scan for a leaf
+/** @ingroup algorithms */
+template<typename Range, typename Body>
+struct final_sum : public task {
+private:
+    using sum_node_type = sum_node<Range, Body>;
+    Body m_body;
+    aligned_space<Range> m_range;
+    //! Where to put result of last subrange, or nullptr if not last subrange.
+    Body* m_stuff_last;
+
+    wait_context& m_wait_context;
+    sum_node_type* m_parent = nullptr;
+public:
+    small_object_allocator m_allocator;
+    final_sum( Body& body, wait_context& w_o, small_object_allocator& alloc ) :
+        m_body(body, split()), m_wait_context(w_o), m_allocator(alloc) {
+        poison_pointer(m_stuff_last);
+    }
+
+    final_sum( final_sum& sum, small_object_allocator& alloc ) :
+        m_body(sum.m_body, split()), m_wait_context(sum.m_wait_context), m_allocator(alloc) {
+        poison_pointer(m_stuff_last);
+    }
+
+    ~final_sum() {
+        m_range.begin()->~Range();
+    }
+    void finish_construction( sum_node_type* parent, const Range& range, Body* stuff_last ) {
+        __TBB_ASSERT( m_parent == nullptr, nullptr );
+        m_parent = parent;
+        new( m_range.begin() ) Range(range);
+        m_stuff_last = stuff_last;
+    }
+private:
+    sum_node_type* release_parent() {
+        call_itt_task_notify(releasing, m_parent);
+        if (m_parent) {
+            auto parent = m_parent;
+            m_parent = nullptr;
+            if (parent->ref_count.fetch_sub(1) == 1) {
+                return parent;
             }
-
-            template <typename Range, typename Value, typename Scan, typename ReverseJoin>
-            class lambda_scan_body {
-                Value m_sum_slot;
-                const Value& identity_element;
-                const Scan& m_scan;
-                const ReverseJoin& m_reverse_join;
-
-            public:
-                void operator=(const lambda_scan_body&) = delete;
-                lambda_scan_body(const lambda_scan_body&) = default;
-
-                lambda_scan_body(const Value& identity, const Scan& scan, const ReverseJoin& rev_join)
-                    : m_sum_slot(identity), identity_element(identity), m_scan(scan),
-                      m_reverse_join(rev_join) {}
-
-                lambda_scan_body(lambda_scan_body& b, split)
-                    : m_sum_slot(b.identity_element), identity_element(b.identity_element), m_scan(b.m_scan),
-                      m_reverse_join(b.m_reverse_join) {}
-
-                template <typename Tag>
-                void operator()(const Range& r, Tag tag) {
-                    m_sum_slot = m_scan(r, m_sum_slot, tag);
-                }
-
-                void reverse_join(lambda_scan_body& a) {
-                    m_sum_slot = m_reverse_join(a.m_sum_slot, m_sum_slot);
-                }
-
-                void assign(lambda_scan_body& b) { m_sum_slot = b.m_sum_slot; }
-
-                Value result() const { return m_sum_slot; }
-            };
-
-            // Requirements on Range concept are documented in blocked_range.h
-
-            /** \page parallel_scan_body_req Requirements on parallel_scan body
+        }
+        else
+            m_wait_context.release();
+        return nullptr;
+    }
+    sum_node_type* finalize(const execution_data& ed){
+        sum_node_type* next_task = release_parent();
+        m_allocator.delete_object<final_sum>(this, ed);
+        return next_task;
+    }
+
+public:
+    task* execute(execution_data& ed) override {
+        m_body( *m_range.begin(), final_scan_tag() );
+        if( m_stuff_last )
+            m_stuff_last->assign(m_body);
+
+        return finalize(ed);
+    }
+    task* cancel(execution_data& ed) override {
+        return finalize(ed);
+    }
+    template<typename Tag>
+    void operator()( const Range& r, Tag tag ) {
+        m_body( r, tag );
+    }
+    void reverse_join( final_sum& a ) {
+        m_body.reverse_join(a.m_body);
+    }
+    void reverse_join( Body& body ) {
+        m_body.reverse_join(body);
+    }
+    void assign_to( Body& body ) {
+        body.assign(m_body);
+    }
+    void self_destroy(const execution_data& ed) {
+        m_allocator.delete_object<final_sum>(this, ed);
+    }
+};
+
+//! Split work to be done in the scan.
+/** @ingroup algorithms */
+template<typename Range, typename Body>
+struct sum_node : public task {
+private:
+    using final_sum_type = final_sum<Range,Body>;
+public:
+    final_sum_type *m_incoming;
+    final_sum_type *m_body;
+    Body *m_stuff_last;
+private:
+    final_sum_type *m_left_sum;
+    sum_node *m_left;
+    sum_node *m_right;
+    bool m_left_is_final;
+    Range m_range;
+    wait_context& m_wait_context;
+    sum_node* m_parent;
+    small_object_allocator m_allocator;
+public:
+    std::atomic<unsigned int> ref_count{0};
+    sum_node( const Range range, bool left_is_final_, sum_node* parent, wait_context& w_o, small_object_allocator& alloc ) :
+        m_stuff_last(nullptr),
+        m_left_sum(nullptr),
+        m_left(nullptr),
+        m_right(nullptr),
+        m_left_is_final(left_is_final_),
+        m_range(range),
+        m_wait_context(w_o),
+        m_parent(parent),
+        m_allocator(alloc)
+    {
+        if( m_parent )
+            m_parent->ref_count.fetch_add(1);
+        // Poison fields that will be set by second pass.
+        poison_pointer(m_body);
+        poison_pointer(m_incoming);
+    }
+
+    ~sum_node() {
+        if (m_parent)
+            m_parent->ref_count.fetch_sub(1);
+    }
+private:
+    sum_node* release_parent() {
+        call_itt_task_notify(releasing, m_parent);
+        if (m_parent) {
+            auto parent = m_parent;
+            m_parent = nullptr;
+            if (parent->ref_count.fetch_sub(1) == 1) {
+                return parent;
+            }
+        }
+        else
+            m_wait_context.release();
+        return nullptr;
+    }
+    task* create_child( const Range& range, final_sum_type& body, sum_node* child, final_sum_type* incoming, Body* stuff_last ) {
+        if( child ) {
+            __TBB_ASSERT( is_poisoned(child->m_body) && is_poisoned(child->m_incoming), nullptr );
+            child->prepare_for_execution(body, incoming, stuff_last);
+            return child;
+        } else {
+            body.finish_construction(this, range, stuff_last);
+            return &body;
+        }
+    }
+
+    sum_node* finalize(const execution_data& ed) {
+        sum_node* next_task = release_parent();
+        m_allocator.delete_object<sum_node>(this, ed);
+        return next_task;
+    }
+
+public:
+    void prepare_for_execution(final_sum_type& body, final_sum_type* incoming, Body *stuff_last) {
+        this->m_body = &body;
+        this->m_incoming = incoming;
+        this->m_stuff_last = stuff_last;
+    }
+    task* execute(execution_data& ed) override {
+        if( m_body ) {
+            if( m_incoming )
+                m_left_sum->reverse_join( *m_incoming );
+            task* right_child = this->create_child(Range(m_range,split()), *m_left_sum, m_right, m_left_sum, m_stuff_last);
+            task* left_child = m_left_is_final ? nullptr : this->create_child(m_range, *m_body, m_left, m_incoming, nullptr);
+            ref_count = (left_child != nullptr) + (right_child != nullptr);
+            m_body = nullptr;
+            if( left_child ) {
+                spawn(*right_child, *ed.context);
+                return left_child;
+            } else {
+                return right_child;
+            }
+        } else {
+            return finalize(ed);
+        }
+    }
+    task* cancel(execution_data& ed) override {
+        return finalize(ed);
+    }
+    void self_destroy(const execution_data& ed) {
+        m_allocator.delete_object<sum_node>(this, ed);
+    }
+    template<typename range,typename body,typename partitioner>
+    friend struct start_scan;
+
+    template<typename range,typename body>
+    friend struct finish_scan;
+};
+
+//! Combine partial results
+/** @ingroup algorithms */
+template<typename Range, typename Body>
+struct finish_scan : public task {
+private:
+    using sum_node_type = sum_node<Range,Body>;
+    using final_sum_type = final_sum<Range,Body>;
+    final_sum_type** const m_sum_slot;
+    sum_node_type*& m_return_slot;
+    small_object_allocator m_allocator;
+public:
+    std::atomic<final_sum_type*> m_right_zombie;
+    sum_node_type& m_result;
+    std::atomic<unsigned int> ref_count{2};
+    finish_scan*  m_parent;
+    wait_context& m_wait_context;
+    task* execute(execution_data& ed) override {
+        __TBB_ASSERT( m_result.ref_count.load() == static_cast<unsigned int>((m_result.m_left!=nullptr)+(m_result.m_right!=nullptr)), nullptr );
+        if( m_result.m_left )
+            m_result.m_left_is_final = false;
+        final_sum_type* right_zombie = m_right_zombie.load(std::memory_order_acquire);
+        if( right_zombie && m_sum_slot )
+            (*m_sum_slot)->reverse_join(*m_result.m_left_sum);
+        __TBB_ASSERT( !m_return_slot, nullptr );
+        if( right_zombie || m_result.m_right ) {
+            m_return_slot = &m_result;
+        } else {
+            m_result.self_destroy(ed);
+        }
+        if( right_zombie && !m_sum_slot && !m_result.m_right ) {
+            right_zombie->self_destroy(ed);
+            m_right_zombie.store(nullptr, std::memory_order_relaxed);
+        }
+        return finalize(ed);
+    }
+    task* cancel(execution_data& ed) override {
+        return finalize(ed);
+    }
+    finish_scan(sum_node_type*& return_slot, final_sum_type** sum, sum_node_type& result_, finish_scan* parent, wait_context& w_o, small_object_allocator& alloc) :
+        m_sum_slot(sum),
+        m_return_slot(return_slot),
+        m_allocator(alloc),
+        m_right_zombie(nullptr),
+        m_result(result_),
+        m_parent(parent),
+        m_wait_context(w_o)
+    {
+        __TBB_ASSERT( !m_return_slot, nullptr );
+    }
+private:
+    finish_scan* release_parent() {
+        call_itt_task_notify(releasing, m_parent);
+        if (m_parent) {
+            auto parent = m_parent;
+            m_parent = nullptr;
+            if (parent->ref_count.fetch_sub(1) == 1) {
+                return parent;
+            }
+        }
+        else
+            m_wait_context.release();
+        return nullptr;
+    }
+    finish_scan* finalize(const execution_data& ed) {
+        finish_scan* next_task = release_parent();
+        m_allocator.delete_object<finish_scan>(this, ed);
+        return next_task;
+    }
+};
+
+//! Initial task to split the work
+/** @ingroup algorithms */
+template<typename Range, typename Body, typename Partitioner>
+struct start_scan : public task {
+private:
+    using sum_node_type = sum_node<Range,Body>;
+    using final_sum_type = final_sum<Range,Body>;
+    using finish_pass1_type = finish_scan<Range,Body>;
+    std::reference_wrapper<sum_node_type*> m_return_slot;
+    Range m_range;
+    std::reference_wrapper<final_sum_type> m_body;
+    typename Partitioner::partition_type m_partition;
+    /** Non-null if caller is requesting total. */
+    final_sum_type** m_sum_slot;
+    bool m_is_final;
+    bool m_is_right_child;
+
+    finish_pass1_type*  m_parent;
+    small_object_allocator m_allocator;
+    wait_context& m_wait_context;
+
+    finish_pass1_type* release_parent() {
+        call_itt_task_notify(releasing, m_parent);
+        if (m_parent) {
+            auto parent = m_parent;
+            m_parent = nullptr;
+            if (parent->ref_count.fetch_sub(1) == 1) {
+                return parent;
+            }
+        }
+        else
+            m_wait_context.release();
+        return nullptr;
+    }
+
+    finish_pass1_type* finalize( const execution_data& ed ) {
+        finish_pass1_type* next_task = release_parent();
+        m_allocator.delete_object<start_scan>(this, ed);
+        return next_task;
+    }
+
+public:
+    task* execute( execution_data& ) override;
+    task* cancel( execution_data& ed ) override {
+        return finalize(ed);
+    }
+    start_scan( sum_node_type*& return_slot, start_scan& parent, small_object_allocator& alloc ) :
+        m_return_slot(return_slot),
+        m_range(parent.m_range,split()),
+        m_body(parent.m_body),
+        m_partition(parent.m_partition,split()),
+        m_sum_slot(parent.m_sum_slot),
+        m_is_final(parent.m_is_final),
+        m_is_right_child(true),
+        m_parent(parent.m_parent),
+        m_allocator(alloc),
+        m_wait_context(parent.m_wait_context)
+    {
+        __TBB_ASSERT( !m_return_slot, nullptr );
+        parent.m_is_right_child = false;
+    }
+
+    start_scan( sum_node_type*& return_slot, const Range& range, final_sum_type& body, const Partitioner& partitioner, wait_context& w_o, small_object_allocator& alloc ) :
+        m_return_slot(return_slot),
+        m_range(range),
+        m_body(body),
+        m_partition(partitioner),
+        m_sum_slot(nullptr),
+        m_is_final(true),
+        m_is_right_child(false),
+        m_parent(nullptr),
+        m_allocator(alloc),
+        m_wait_context(w_o)
+    {
+        __TBB_ASSERT( !m_return_slot, nullptr );
+    }
+
+    static void run( const Range& range, Body& body, const Partitioner& partitioner ) {
+        if( !range.empty() ) {
+            task_group_context context(PARALLEL_SCAN);
+
+            using start_pass1_type = start_scan<Range,Body,Partitioner>;
+            sum_node_type* root = nullptr;
+            wait_context w_ctx{1};
+            small_object_allocator alloc{};
+
+            auto& temp_body = *alloc.new_object<final_sum_type>(body, w_ctx, alloc);
+            temp_body.reverse_join(body);
+
+            auto& pass1 = *alloc.new_object<start_pass1_type>(/*m_return_slot=*/root, range, temp_body, partitioner, w_ctx, alloc);
+
+            execute_and_wait(pass1, context, w_ctx, context);
+            if( root ) {
+                root->prepare_for_execution(temp_body, nullptr, &body);
+                w_ctx.reserve();
+                execute_and_wait(*root, context, w_ctx, context);
+            } else {
+                temp_body.assign_to(body);
+                temp_body.finish_construction(nullptr, range, nullptr);
+                alloc.delete_object<final_sum_type>(&temp_body);
+            }
+        }
+    }
+};
+
+template<typename Range, typename Body, typename Partitioner>
+task* start_scan<Range,Body,Partitioner>::execute( execution_data& ed ) {
+    // Inspecting m_parent->result.left_sum would ordinarily be a race condition.
+    // But we inspect it only if we are not a stolen task, in which case we
+    // know that task assigning to m_parent->result.left_sum has completed.
+    __TBB_ASSERT(!m_is_right_child || m_parent, "right child is never an orphan");
+    bool treat_as_stolen = m_is_right_child && (is_stolen(ed) || &m_body.get()!=m_parent->m_result.m_left_sum);
+    if( treat_as_stolen ) {
+        // Invocation is for right child that has been really stolen or needs to be virtually stolen
+        small_object_allocator alloc{};
+        final_sum_type* right_zombie = alloc.new_object<final_sum_type>(m_body, alloc);
+        m_parent->m_right_zombie.store(right_zombie, std::memory_order_release);
+        m_body = *right_zombie;
+        m_is_final = false;
+    }
+    task* next_task = nullptr;
+    if( (m_is_right_child && !treat_as_stolen) || !m_range.is_divisible() || m_partition.should_execute_range(ed) ) {
+        if( m_is_final )
+            m_body(m_range, final_scan_tag());
+        else if( m_sum_slot )
+            m_body(m_range, pre_scan_tag());
+        if( m_sum_slot )
+            *m_sum_slot = &m_body.get();
+        __TBB_ASSERT( !m_return_slot, nullptr );
+
+        next_task = finalize(ed);
+    } else {
+        small_object_allocator alloc{};
+        auto result = alloc.new_object<sum_node_type>(m_range,/*m_left_is_final=*/m_is_final, m_parent? &m_parent->m_result: nullptr, m_wait_context, alloc);
+
+        auto new_parent = alloc.new_object<finish_pass1_type>(m_return_slot, m_sum_slot, *result, m_parent, m_wait_context, alloc);
+        m_parent = new_parent;
+
+        // Split off right child
+        auto& right_child = *alloc.new_object<start_scan>(/*m_return_slot=*/result->m_right, *this, alloc);
+
+        spawn(right_child, *ed.context);
+
+        m_sum_slot = &result->m_left_sum;
+        m_return_slot = result->m_left;
+
+        __TBB_ASSERT( !m_return_slot, nullptr );
+        next_task = this;
+    }
+    return next_task;
+}
+
+template<typename Range, typename Value, typename Scan, typename ReverseJoin>
+class lambda_scan_body {
+    Value               m_sum_slot;
+    const Value&        identity_element;
+    const Scan&         m_scan;
+    const ReverseJoin&  m_reverse_join;
+public:
+    void operator=(const lambda_scan_body&) = delete;
+    lambda_scan_body(const lambda_scan_body&) = default;
+
+    lambda_scan_body( const Value& identity, const Scan& scan, const ReverseJoin& rev_join )
+        : m_sum_slot(identity)
+        , identity_element(identity)
+        , m_scan(scan)
+        , m_reverse_join(rev_join) {}
+
+    lambda_scan_body( lambda_scan_body& b, split )
+        : m_sum_slot(b.identity_element)
+        , identity_element(b.identity_element)
+        , m_scan(b.m_scan)
+        , m_reverse_join(b.m_reverse_join) {}
+
+    template<typename Tag>
+    void operator()( const Range& r, Tag tag ) {
+        m_sum_slot = tbb::detail::invoke(m_scan, r, m_sum_slot, tag);
+    }
+
+    void reverse_join( lambda_scan_body& a ) {
+        m_sum_slot = tbb::detail::invoke(m_reverse_join, a.m_sum_slot, m_sum_slot);
+    }
+
+    void assign( lambda_scan_body& b ) {
+        m_sum_slot = b.m_sum_slot;
+    }
+
+    Value result() const {
+        return m_sum_slot;
+    }
+};
+
+// Requirements on Range concept are documented in blocked_range.h
+
+/** \page parallel_scan_body_req Requirements on parallel_scan body
     Class \c Body implementing the concept of parallel_scan body must define:
     - \code Body::Body( Body&, split ); \endcode    Splitting constructor.
                                                     Split \c b so that \c this and \c b can accumulate separately
@@ -503,79 +553,78 @@ namespace tbb {
                                                     created earlier from \c b by b's splitting constructor
 **/
 
-            /** \name parallel_scan
+/** \name parallel_scan
     See also requirements on \ref range_req "Range" and \ref parallel_scan_body_req "parallel_scan Body". **/
-            //@{
-
-            //! Parallel prefix with default partitioner
-            /** @ingroup algorithms **/
-            template <typename Range, typename Body>
-            __TBB_requires(tbb_range<Range>&& parallel_scan_body<Body, Range>) void parallel_scan(
-                    const Range& range, Body& body) {
-                start_scan<Range, Body, auto_partitioner>::run(range, body, __TBB_DEFAULT_PARTITIONER());
-            }
-
-            //! Parallel prefix with simple_partitioner
-            /** @ingroup algorithms **/
-            template <typename Range, typename Body>
-            __TBB_requires(tbb_range<Range>&& parallel_scan_body<Body, Range>) void parallel_scan(
-                    const Range& range, Body& body, const simple_partitioner& partitioner) {
-                start_scan<Range, Body, simple_partitioner>::run(range, body, partitioner);
-            }
-
-            //! Parallel prefix with auto_partitioner
-            /** @ingroup algorithms **/
-            template <typename Range, typename Body>
-            __TBB_requires(tbb_range<Range>&& parallel_scan_body<Body, Range>) void parallel_scan(
-                    const Range& range, Body& body, const auto_partitioner& partitioner) {
-                start_scan<Range, Body, auto_partitioner>::run(range, body, partitioner);
-            }
-
-            //! Parallel prefix with default partitioner
-            /** @ingroup algorithms **/
-            template <typename Range, typename Value, typename Scan, typename ReverseJoin>
-            __TBB_requires(tbb_range<Range>&& parallel_scan_function<Scan, Range, Value>&&
-                                   parallel_scan_combine<ReverseJoin, Value>) Value
-                    parallel_scan(const Range& range, const Value& identity, const Scan& scan,
-                                  const ReverseJoin& reverse_join) {
-                lambda_scan_body<Range, Value, Scan, ReverseJoin> body(identity, scan, reverse_join);
-                parallel_scan(range, body, __TBB_DEFAULT_PARTITIONER());
-                return body.result();
-            }
-
-            //! Parallel prefix with simple_partitioner
-            /** @ingroup algorithms **/
-            template <typename Range, typename Value, typename Scan, typename ReverseJoin>
-            __TBB_requires(tbb_range<Range>&& parallel_scan_function<Scan, Range, Value>&&
-                                   parallel_scan_combine<ReverseJoin, Value>) Value
-                    parallel_scan(const Range& range, const Value& identity, const Scan& scan,
-                                  const ReverseJoin& reverse_join, const simple_partitioner& partitioner) {
-                lambda_scan_body<Range, Value, Scan, ReverseJoin> body(identity, scan, reverse_join);
-                parallel_scan(range, body, partitioner);
-                return body.result();
-            }
-
-            //! Parallel prefix with auto_partitioner
-            /** @ingroup algorithms **/
-            template <typename Range, typename Value, typename Scan, typename ReverseJoin>
-            __TBB_requires(tbb_range<Range>&& parallel_scan_function<Scan, Range, Value>&&
-                                   parallel_scan_combine<ReverseJoin, Value>) Value
-                    parallel_scan(const Range& range, const Value& identity, const Scan& scan,
-                                  const ReverseJoin& reverse_join, const auto_partitioner& partitioner) {
-                lambda_scan_body<Range, Value, Scan, ReverseJoin> body(identity, scan, reverse_join);
-                parallel_scan(range, body, partitioner);
-                return body.result();
-            }
-
-        }// namespace d1
-    }    // namespace detail
-
-    inline namespace v1 {
-        using detail::d1::final_scan_tag;
-        using detail::d1::parallel_scan;
-        using detail::d1::pre_scan_tag;
-    }// namespace v1
-
-}// namespace tbb
+//@{
+
+//! Parallel prefix with default partitioner
+/** @ingroup algorithms **/
+template<typename Range, typename Body>
+    __TBB_requires(tbb_range<Range> && parallel_scan_body<Body, Range>)
+void parallel_scan( const Range& range, Body& body ) {
+    start_scan<Range, Body, __TBB_DEFAULT_PARTITIONER>::run(range,body,__TBB_DEFAULT_PARTITIONER());
+}
+
+//! Parallel prefix with simple_partitioner
+/** @ingroup algorithms **/
+template<typename Range, typename Body>
+    __TBB_requires(tbb_range<Range> && parallel_scan_body<Body, Range>)
+void parallel_scan( const Range& range, Body& body, const simple_partitioner& partitioner ) {
+    start_scan<Range, Body, simple_partitioner>::run(range, body, partitioner);
+}
+
+//! Parallel prefix with auto_partitioner
+/** @ingroup algorithms **/
+template<typename Range, typename Body>
+    __TBB_requires(tbb_range<Range> && parallel_scan_body<Body, Range>)
+void parallel_scan( const Range& range, Body& body, const auto_partitioner& partitioner ) {
+    start_scan<Range,Body,auto_partitioner>::run(range, body, partitioner);
+}
+
+//! Parallel prefix with default partitioner
+/** @ingroup algorithms **/
+template<typename Range, typename Value, typename Scan, typename ReverseJoin>
+    __TBB_requires(tbb_range<Range> && parallel_scan_function<Scan, Range, Value> &&
+                   parallel_scan_combine<ReverseJoin, Value>)
+Value parallel_scan( const Range& range, const Value& identity, const Scan& scan, const ReverseJoin& reverse_join ) {
+    lambda_scan_body<Range, Value, Scan, ReverseJoin> body(identity, scan, reverse_join);
+    parallel_scan(range, body, __TBB_DEFAULT_PARTITIONER());
+    return body.result();
+}
+
+//! Parallel prefix with simple_partitioner
+/** @ingroup algorithms **/
+template<typename Range, typename Value, typename Scan, typename ReverseJoin>
+    __TBB_requires(tbb_range<Range> && parallel_scan_function<Scan, Range, Value> &&
+                   parallel_scan_combine<ReverseJoin, Value>)
+Value parallel_scan( const Range& range, const Value& identity, const Scan& scan, const ReverseJoin& reverse_join,
+                     const simple_partitioner& partitioner ) {
+    lambda_scan_body<Range, Value, Scan, ReverseJoin> body(identity, scan, reverse_join);
+    parallel_scan(range, body, partitioner);
+    return body.result();
+}
+
+//! Parallel prefix with auto_partitioner
+/** @ingroup algorithms **/
+template<typename Range, typename Value, typename Scan, typename ReverseJoin>
+    __TBB_requires(tbb_range<Range> && parallel_scan_function<Scan, Range, Value> &&
+                   parallel_scan_combine<ReverseJoin, Value>)
+Value parallel_scan( const Range& range, const Value& identity, const Scan& scan, const ReverseJoin& reverse_join,
+                     const auto_partitioner& partitioner ) {
+    lambda_scan_body<Range, Value, Scan, ReverseJoin> body(identity, scan, reverse_join);
+    parallel_scan(range, body, partitioner);
+    return body.result();
+}
+
+} // namespace d1
+} // namespace detail
+
+inline namespace v1 {
+    using detail::d1::parallel_scan;
+    using detail::d1::pre_scan_tag;
+    using detail::d1::final_scan_tag;
+} // namespace v1
+
+} // namespace tbb
 
 #endif /* __TBB_parallel_scan_H */
diff --git a/external/tbb/include/oneapi/tbb/parallel_sort.h b/external/tbb/include/oneapi/tbb/parallel_sort.h
index 5949103d..4c0578eb 100644
--- a/external/tbb/include/oneapi/tbb/parallel_sort.h
+++ b/external/tbb/include/oneapi/tbb/parallel_sort.h
@@ -17,197 +17,196 @@
 #ifndef __TBB_parallel_sort_H
 #define __TBB_parallel_sort_H
 
-#include "blocked_range.h"
 #include "detail/_namespace_injection.h"
 #include "parallel_for.h"
+#include "blocked_range.h"
 #include "profiling.h"
 
 #include <algorithm>
-#include <cstddef>
-#include <functional>
 #include <iterator>
+#include <functional>
+#include <cstddef>
 
 namespace tbb {
-    namespace detail {
+namespace detail {
 #if __TBB_CPP20_CONCEPTS_PRESENT
-        inline namespace d0 {
-
-            // TODO: consider using std::strict_weak_order concept
-            template <typename Compare, typename Iterator>
-            concept compare = requires(const std::remove_reference_t<Compare>& comp,
-                                       typename std::iterator_traits<Iterator>::reference value) {
-                // Forward via iterator_traits::reference
-                {
-                    comp(typename std::iterator_traits<Iterator>::reference(value),
-                         typename std::iterator_traits<Iterator>::reference(value))
-                    } -> std::convertible_to<bool>;
-            };
-
-            // Inspired by std::__PartiallyOrderedWith exposition only concept
-            template <typename T>
-            concept less_than_comparable
-                    = requires(const std::remove_reference_t<T>& lhs, const std::remove_reference_t<T>& rhs) {
-                { lhs < rhs } -> boolean_testable;
-            };
-
-        }// namespace d0
-#endif   // __TBB_CPP20_CONCEPTS_PRESENT
-        namespace d1 {
-
-            //! Range used in quicksort to split elements into subranges based on a value.
-            /** The split operation selects a splitter and places all elements less than or equal
+inline namespace d0 {
+
+// TODO: consider using std::strict_weak_order concept
+template <typename Compare, typename Iterator>
+concept compare = requires( const std::remove_reference_t<Compare>& comp, typename std::iterator_traits<Iterator>::reference value ) {
+    // Forward via iterator_traits::reference
+    { comp(typename std::iterator_traits<Iterator>::reference(value),
+           typename std::iterator_traits<Iterator>::reference(value)) } -> std::convertible_to<bool>;
+};
+
+// Inspired by std::__PartiallyOrderedWith exposition only concept
+template <typename T>
+concept less_than_comparable = requires( const std::remove_reference_t<T>& lhs,
+                                         const std::remove_reference_t<T>& rhs ) {
+    { lhs < rhs } -> boolean_testable;
+};
+
+} // namespace d0
+#endif // __TBB_CPP20_CONCEPTS_PRESENT
+namespace d1 {
+
+//! Range used in quicksort to split elements into subranges based on a value.
+/** The split operation selects a splitter and places all elements less than or equal
     to the value in the first range and the remaining elements in the second range.
     @ingroup algorithms */
-            template <typename RandomAccessIterator, typename Compare>
-            class quick_sort_range {
-                std::size_t median_of_three(const RandomAccessIterator& array, std::size_t l, std::size_t m,
-                                            std::size_t r) const {
-                    return comp(array[l], array[m])
-                                   ? (comp(array[m], array[r]) ? m : (comp(array[l], array[r]) ? r : l))
-                                   : (comp(array[r], array[m]) ? m : (comp(array[r], array[l]) ? r : l));
-                }
-
-                std::size_t pseudo_median_of_nine(const RandomAccessIterator& array,
-                                                  const quick_sort_range& range) const {
-                    std::size_t offset = range.size / 8u;
-                    return median_of_three(array, median_of_three(array, 0, offset, offset * 2),
-                                           median_of_three(array, offset * 3, offset * 4, offset * 5),
-                                           median_of_three(array, offset * 6, offset * 7, range.size - 1));
-                }
-
-                std::size_t split_range(quick_sort_range& range) {
-                    RandomAccessIterator array = range.begin;
-                    RandomAccessIterator first_element = range.begin;
-                    std::size_t m = pseudo_median_of_nine(array, range);
-                    if (m != 0) std::iter_swap(array, array + m);
-
-                    std::size_t i = 0;
-                    std::size_t j = range.size;
-                    // Partition interval [i + 1,j - 1] with key *first_element.
-                    for (;;) {
-                        __TBB_ASSERT(i < j, nullptr);
-                        // Loop must terminate since array[l] == *first_element.
-                        do {
-                            --j;
-                            __TBB_ASSERT(i <= j, "bad ordering relation?");
-                        } while (comp(*first_element, array[j]));
-                        do {
-                            __TBB_ASSERT(i <= j, nullptr);
-                            if (i == j) goto partition;
-                            ++i;
-                        } while (comp(array[i], *first_element));
-                        if (i == j) goto partition;
-                        std::iter_swap(array + i, array + j);
-                    }
-                partition:
-                    // Put the partition key were it belongs
-                    std::iter_swap(array + j, first_element);
-                    // array[l..j) is less or equal to key.
-                    // array(j..r) is greater or equal to key.
-                    // array[j] is equal to key
-                    i = j + 1;
-                    std::size_t new_range_size = range.size - i;
-                    range.size = j;
-                    return new_range_size;
-                }
-
-            public:
-                quick_sort_range() = default;
-                quick_sort_range(const quick_sort_range&) = default;
-                void operator=(const quick_sort_range&) = delete;
-
-                static constexpr std::size_t grainsize = 500;
-                const Compare& comp;
-                std::size_t size;
-                RandomAccessIterator begin;
-
-                quick_sort_range(RandomAccessIterator begin_, std::size_t size_, const Compare& comp_)
-                    : comp(comp_), size(size_), begin(begin_) {}
-
-                bool empty() const { return size == 0; }
-                bool is_divisible() const { return size >= grainsize; }
-
-                quick_sort_range(quick_sort_range& range, split)
-                    : comp(range.comp), size(split_range(range))
-                      // +1 accounts for the pivot element, which is at its correct place
-                      // already and, therefore, is not included into subranges.
-                      ,
-                      begin(range.begin + range.size + 1) {}
-            };
-
-            //! Body class used to test if elements in a range are presorted
-            /** @ingroup algorithms */
-            template <typename RandomAccessIterator, typename Compare>
-            class quick_sort_pretest_body {
-                const Compare& comp;
-                task_group_context& context;
-
-            public:
-                quick_sort_pretest_body() = default;
-                quick_sort_pretest_body(const quick_sort_pretest_body&) = default;
-                void operator=(const quick_sort_pretest_body&) = delete;
-
-                quick_sort_pretest_body(const Compare& _comp, task_group_context& _context)
-                    : comp(_comp), context(_context) {}
-
-                void operator()(const blocked_range<RandomAccessIterator>& range) const {
-                    RandomAccessIterator my_end = range.end();
-
-                    int i = 0;
-                    //TODO: consider using std::is_sorted() for each 64 iterations (requires performance measurements)
-                    for (RandomAccessIterator k = range.begin(); k != my_end; ++k, ++i) {
-                        if (i % 64 == 0 && context.is_group_execution_cancelled()) break;
-
-                        // The k - 1 is never out-of-range because the first chunk starts at begin+serial_cutoff+1
-                        if (comp(*(k), *(k - 1))) {
-                            context.cancel_group_execution();
-                            break;
-                        }
-                    }
-                }
-            };
-
-            //! Body class used to sort elements in a range that is smaller than the grainsize.
-            /** @ingroup algorithms */
-            template <typename RandomAccessIterator, typename Compare>
-            struct quick_sort_body {
-                void operator()(const quick_sort_range<RandomAccessIterator, Compare>& range) const {
-                    std::sort(range.begin, range.begin + range.size, range.comp);
-                }
-            };
-
-            //! Method to perform parallel_for based quick sort.
-            /** @ingroup algorithms */
-            template <typename RandomAccessIterator, typename Compare>
-            void do_parallel_quick_sort(RandomAccessIterator begin, RandomAccessIterator end,
-                                        const Compare& comp) {
-                parallel_for(quick_sort_range<RandomAccessIterator, Compare>(begin, end - begin, comp),
-                             quick_sort_body<RandomAccessIterator, Compare>(), auto_partitioner());
+template<typename RandomAccessIterator, typename Compare>
+class quick_sort_range {
+    std::size_t median_of_three( const RandomAccessIterator& array, std::size_t l, std::size_t m, std::size_t r ) const {
+        return comp(array[l], array[m]) ? ( comp(array[m], array[r]) ? m : ( comp(array[l], array[r]) ? r : l ) )
+                                        : ( comp(array[r], array[m]) ? m : ( comp(array[r], array[l]) ? r : l ) );
+    }
+
+    std::size_t pseudo_median_of_nine( const RandomAccessIterator& array, const quick_sort_range& range ) const {
+        std::size_t offset = range.size / 8u;
+        return median_of_three(array,
+                               median_of_three(array, 0 , offset, offset * 2),
+                               median_of_three(array, offset * 3, offset * 4, offset * 5),
+                               median_of_three(array, offset * 6, offset * 7, range.size - 1));
+
+    }
+
+    std::size_t split_range( quick_sort_range& range ) {
+        RandomAccessIterator array = range.begin;
+        RandomAccessIterator first_element = range.begin;
+        std::size_t m = pseudo_median_of_nine(array, range);
+        if( m != 0 ) std::iter_swap(array, array + m);
+
+        std::size_t i = 0;
+        std::size_t j = range.size;
+        // Partition interval [i + 1,j - 1] with key *first_element.
+        for(;;) {
+            __TBB_ASSERT( i < j, nullptr );
+            // Loop must terminate since array[l] == *first_element.
+            do {
+                --j;
+                __TBB_ASSERT( i <= j, "bad ordering relation?" );
+            } while( comp(*first_element, array[j]) );
+            do {
+                __TBB_ASSERT( i <= j, nullptr );
+                if( i == j ) goto partition;
+                ++i;
+            } while( comp(array[i], *first_element) );
+            if( i == j ) goto partition;
+            std::iter_swap(array + i, array + j);
+        }
+partition:
+        // Put the partition key were it belongs
+        std::iter_swap(array + j, first_element);
+        // array[l..j) is less or equal to key.
+        // array(j..r) is greater or equal to key.
+        // array[j] is equal to key
+        i = j + 1;
+        std::size_t new_range_size = range.size - i;
+        range.size = j;
+        return new_range_size;
+    }
+
+public:
+    quick_sort_range() = default;
+    quick_sort_range( const quick_sort_range& ) = default;
+    void operator=( const quick_sort_range& ) = delete;
+
+    static constexpr std::size_t grainsize = 500;
+    const Compare& comp;
+    std::size_t size;
+    RandomAccessIterator begin;
+
+    quick_sort_range( RandomAccessIterator begin_, std::size_t size_, const Compare& comp_ ) :
+        comp(comp_), size(size_), begin(begin_) {}
+
+    bool empty() const { return size == 0; }
+    bool is_divisible() const { return size >= grainsize; }
+
+    quick_sort_range( quick_sort_range& range, split )
+        : comp(range.comp)
+        , size(split_range(range))
+          // +1 accounts for the pivot element, which is at its correct place
+          // already and, therefore, is not included into subranges.
+        , begin(range.begin + range.size + 1) {}
+};
+
+//! Body class used to test if elements in a range are presorted
+/** @ingroup algorithms */
+template<typename RandomAccessIterator, typename Compare>
+class quick_sort_pretest_body {
+    const Compare& comp;
+    task_group_context& context;
+
+public:
+    quick_sort_pretest_body() = default;
+    quick_sort_pretest_body( const quick_sort_pretest_body& ) = default;
+    void operator=( const quick_sort_pretest_body& ) = delete;
+
+    quick_sort_pretest_body( const Compare& _comp, task_group_context& _context ) : comp(_comp), context(_context) {}
+
+    void operator()( const blocked_range<RandomAccessIterator>& range ) const {
+        RandomAccessIterator my_end = range.end();
+
+        int i = 0;
+        //TODO: consider using std::is_sorted() for each 64 iterations (requires performance measurements)
+        for( RandomAccessIterator k = range.begin(); k != my_end; ++k, ++i ) {
+            if( i % 64 == 0 && context.is_group_execution_cancelled() ) break;
+
+            // The k - 1 is never out-of-range because the first chunk starts at begin+serial_cutoff+1
+            if( comp(*(k), *(k - 1)) ) {
+                context.cancel_group_execution();
+                break;
             }
-
-            //! Wrapper method to initiate the sort by calling parallel_for.
-            /** @ingroup algorithms */
-            template <typename RandomAccessIterator, typename Compare>
-            void parallel_quick_sort(RandomAccessIterator begin, RandomAccessIterator end,
-                                     const Compare& comp) {
-                task_group_context my_context(PARALLEL_SORT);
-                constexpr int serial_cutoff = 9;
-
-                __TBB_ASSERT(begin + serial_cutoff < end, "min_parallel_size is smaller than serial cutoff?");
-                RandomAccessIterator k = begin;
-                for (; k != begin + serial_cutoff; ++k) {
-                    if (comp(*(k + 1), *k)) { do_parallel_quick_sort(begin, end, comp); }
-                }
-
-                // Check is input range already sorted
-                parallel_for(blocked_range<RandomAccessIterator>(k + 1, end),
-                             quick_sort_pretest_body<RandomAccessIterator, Compare>(comp, my_context),
-                             auto_partitioner(), my_context);
-
-                if (my_context.is_group_execution_cancelled()) do_parallel_quick_sort(begin, end, comp);
-            }
-
-            /** \page parallel_sort_iter_req Requirements on iterators for parallel_sort
+        }
+    }
+};
+
+//! Body class used to sort elements in a range that is smaller than the grainsize.
+/** @ingroup algorithms */
+template<typename RandomAccessIterator, typename Compare>
+struct quick_sort_body {
+    void operator()( const quick_sort_range<RandomAccessIterator,Compare>& range ) const {
+        std::sort(range.begin, range.begin + range.size, range.comp);
+    }
+};
+
+//! Method to perform parallel_for based quick sort.
+/** @ingroup algorithms */
+template<typename RandomAccessIterator, typename Compare>
+void do_parallel_quick_sort( RandomAccessIterator begin, RandomAccessIterator end, const Compare& comp ) {
+    parallel_for(quick_sort_range<RandomAccessIterator,Compare>(begin, end - begin, comp),
+                 quick_sort_body<RandomAccessIterator,Compare>(),
+                 auto_partitioner());
+}
+
+//! Wrapper method to initiate the sort by calling parallel_for.
+/** @ingroup algorithms */
+template<typename RandomAccessIterator, typename Compare>
+void parallel_quick_sort( RandomAccessIterator begin, RandomAccessIterator end, const Compare& comp ) {
+    task_group_context my_context(PARALLEL_SORT);
+    constexpr int serial_cutoff = 9;
+
+    __TBB_ASSERT( begin + serial_cutoff < end, "min_parallel_size is smaller than serial cutoff?" );
+    RandomAccessIterator k = begin;
+    for( ; k != begin + serial_cutoff; ++k ) {
+        if( comp(*(k + 1), *k) ) {
+            do_parallel_quick_sort(begin, end, comp);
+            return;
+        }
+    }
+
+    // Check is input range already sorted
+    parallel_for(blocked_range<RandomAccessIterator>(k + 1, end),
+                 quick_sort_pretest_body<RandomAccessIterator, Compare>(comp, my_context),
+                 auto_partitioner(),
+                 my_context);
+
+    if( my_context.is_group_execution_cancelled() )
+        do_parallel_quick_sort(begin, end, comp);
+}
+
+/** \page parallel_sort_iter_req Requirements on iterators for parallel_sort
     Requirements on the iterator type \c It and its value type \c T for \c parallel_sort:
 
     - \code void iter_swap( It a, It b ) \endcode Swaps the values of the elements the given
@@ -216,66 +215,74 @@ namespace tbb {
     - \code bool Compare::operator()( const T& x, const T& y ) \endcode True if x comes before y;
 **/
 
-            /** \name parallel_sort
+/** \name parallel_sort
     See also requirements on \ref parallel_sort_iter_req "iterators for parallel_sort". **/
-            //@{
+//@{
 
-            //! Sorts the data in [begin,end) using the given comparator
-            /** The compare function object is used for all comparisons between elements during sorting.
-    The compare object must define a bool operator() function.
-    @ingroup algorithms **/
-            template <typename RandomAccessIterator, typename Compare>
-            __TBB_requires(std::random_access_iterator<RandomAccessIterator>&& compare<
-                           Compare, RandomAccessIterator>) void parallel_sort(RandomAccessIterator begin,
-                                                                              RandomAccessIterator end,
-                                                                              const Compare& comp) {
-                constexpr int min_parallel_size = 500;
-                if (end > begin) {
-                    if (end - begin < min_parallel_size) {
-                        std::sort(begin, end, comp);
-                    } else {
-                        parallel_quick_sort(begin, end, comp);
-                    }
-                }
-            }
-
-            //! Sorts the data in [begin,end) with a default comparator \c std::less<RandomAccessIterator>
-            /** @ingroup algorithms **/
-            template <typename RandomAccessIterator>
-            __TBB_requires(std::random_access_iterator<RandomAccessIterator>&& less_than_comparable<
-                           typename std::iterator_traits<RandomAccessIterator>::
-                                   value_type>) void parallel_sort(RandomAccessIterator begin,
-                                                                   RandomAccessIterator end) {
-                parallel_sort(begin, end,
-                              std::less<typename std::iterator_traits<RandomAccessIterator>::value_type>());
-            }
-
-            //! Sorts the data in rng using the given comparator
-            /** @ingroup algorithms **/
-            template <typename Range, typename Compare>
-            __TBB_requires(container_based_sequence<Range, std::random_access_iterator_tag>&& compare<
-                           Compare, range_iterator_type<Range>>) void parallel_sort(Range& rng,
-                                                                                    const Compare& comp) {
-                parallel_sort(std::begin(rng), std::end(rng), comp);
-            }
-
-            //! Sorts the data in rng with a default comparator \c std::less<RandomAccessIterator>
-            /** @ingroup algorithms **/
-            template <typename Range>
-            __TBB_requires(
-                    container_based_sequence<Range, std::random_access_iterator_tag>&&
-                            less_than_comparable<typename std::iterator_traits<
-                                    range_iterator_type<Range>>::value_type>) void parallel_sort(Range& rng) {
-                parallel_sort(std::begin(rng), std::end(rng));
-            }
-            //@}
+#if __TBB_CPP20_CONCEPTS_PRESENT
+template<typename It>
+using iter_value_type = typename std::iterator_traits<It>::value_type;
 
-        }// namespace d1
-    }    // namespace detail
+template<typename Range>
+using range_value_type = typename std::iterator_traits<range_iterator_type<Range>>::value_type;
+#endif
 
-    inline namespace v1 {
-        using detail::d1::parallel_sort;
-    }// namespace v1
-}// namespace tbb
+//! Sorts the data in [begin,end) using the given comparator
+/** The compare function object is used for all comparisons between elements during sorting.
+    The compare object must define a bool operator() function.
+    @ingroup algorithms **/
+template<typename RandomAccessIterator, typename Compare>
+    __TBB_requires(std::random_access_iterator<RandomAccessIterator> &&
+                   compare<Compare, RandomAccessIterator> &&
+                   std::movable<iter_value_type<RandomAccessIterator>>)
+void parallel_sort( RandomAccessIterator begin, RandomAccessIterator end, const Compare& comp ) {
+    constexpr int min_parallel_size = 500;
+    if( end > begin ) {
+        if( end - begin < min_parallel_size ) {
+            std::sort(begin, end, comp);
+        } else {
+            parallel_quick_sort(begin, end, comp);
+        }
+    }
+}
+
+//! Sorts the data in [begin,end) with a default comparator \c std::less
+/** @ingroup algorithms **/
+template<typename RandomAccessIterator>
+    __TBB_requires(std::random_access_iterator<RandomAccessIterator> &&
+                   less_than_comparable<iter_value_type<RandomAccessIterator>> &&
+                   std::movable<iter_value_type<RandomAccessIterator>>)
+void parallel_sort( RandomAccessIterator begin, RandomAccessIterator end ) {
+    parallel_sort(begin, end, std::less<typename std::iterator_traits<RandomAccessIterator>::value_type>());
+}
+
+//! Sorts the data in rng using the given comparator
+/** @ingroup algorithms **/
+template<typename Range, typename Compare>
+    __TBB_requires(container_based_sequence<Range, std::random_access_iterator_tag> &&
+                   compare<Compare, range_iterator_type<Range>> &&
+                   std::movable<range_value_type<Range>>)
+void parallel_sort( Range&& rng, const Compare& comp ) {
+    parallel_sort(std::begin(rng), std::end(rng), comp);
+}
+
+//! Sorts the data in rng with a default comparator \c std::less
+/** @ingroup algorithms **/
+template<typename Range>
+    __TBB_requires(container_based_sequence<Range, std::random_access_iterator_tag> &&
+                   less_than_comparable<range_value_type<Range>> &&
+                   std::movable<range_value_type<Range>>)
+void parallel_sort( Range&& rng ) {
+    parallel_sort(std::begin(rng), std::end(rng));
+}
+//@}
+
+} // namespace d1
+} // namespace detail
+
+inline namespace v1 {
+    using detail::d1::parallel_sort;
+} // namespace v1
+} // namespace tbb
 
 #endif /*__TBB_parallel_sort_H*/
diff --git a/external/tbb/include/oneapi/tbb/partitioner.h b/external/tbb/include/oneapi/tbb/partitioner.h
index 38bb8c66..f09786c0 100644
--- a/external/tbb/include/oneapi/tbb/partitioner.h
+++ b/external/tbb/include/oneapi/tbb/partitioner.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2023 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -34,681 +34,645 @@
 #define __TBB_DEMAND_DEPTH_ADD 1
 #endif
 
-#include "detail/_aligned_space.h"
 #include "detail/_config.h"
 #include "detail/_namespace_injection.h"
+#include "detail/_aligned_space.h"
+#include "detail/_utils.h"
+#include "detail/_template_helpers.h"
 #include "detail/_range_common.h"
-#include "detail/_small_object_pool.h"
 #include "detail/_task.h"
-#include "detail/_template_helpers.h"
-#include "detail/_utils.h"
+#include "detail/_small_object_pool.h"
 
 #include "cache_aligned_allocator.h"
+#include "task_group.h" // task_group_context
 #include "task_arena.h"
-#include "task_group.h"// task_group_context
 
 #include <algorithm>
 #include <atomic>
 #include <type_traits>
 
 #if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
-// Workaround for overzealous compiler warnings
-#pragma warning(push)
-#pragma warning(disable : 4244)
+    // Workaround for overzealous compiler warnings
+    #pragma warning (push)
+    #pragma warning (disable: 4244)
 #endif
 
 namespace tbb {
-    namespace detail {
-
-        namespace d1 {
-            class auto_partitioner;
-            class simple_partitioner;
-            class static_partitioner;
-            class affinity_partitioner;
-            class affinity_partition_type;
-            class affinity_partitioner_base;
-
-            inline std::size_t get_initial_auto_partitioner_divisor() {
-                const std::size_t factor = 4;
-                return factor * max_concurrency();
+namespace detail {
+
+namespace d1 {
+class auto_partitioner;
+class simple_partitioner;
+class static_partitioner;
+class affinity_partitioner;
+class affinity_partition_type;
+class affinity_partitioner_base;
+
+inline std::size_t get_initial_auto_partitioner_divisor() {
+    const std::size_t factor = 4;
+    return factor * static_cast<std::size_t>(max_concurrency());
+}
+
+//! Defines entry point for affinity partitioner into oneTBB run-time library.
+class affinity_partitioner_base: no_copy {
+    friend class affinity_partitioner;
+    friend class affinity_partition_type;
+    //! Array that remembers affinities of tree positions to affinity_id.
+    /** nullptr if my_size==0. */
+    slot_id* my_array;
+    //! Number of elements in my_array.
+    std::size_t my_size;
+    //! Zeros the fields.
+    affinity_partitioner_base() : my_array(nullptr), my_size(0) {}
+    //! Deallocates my_array.
+    ~affinity_partitioner_base() { resize(0); }
+    //! Resize my_array.
+    /** Retains values if resulting size is the same. */
+    void resize(unsigned factor) {
+        // Check factor to avoid asking for number of workers while there might be no arena.
+        unsigned max_threads_in_arena = static_cast<unsigned>(max_concurrency());
+        std::size_t new_size = factor ? factor * max_threads_in_arena : 0;
+        if (new_size != my_size) {
+            if (my_array) {
+                r1::cache_aligned_deallocate(my_array);
+                // Following two assignments must be done here for sake of exception safety.
+                my_array = nullptr;
+                my_size = 0;
             }
-
-            //! Defines entry point for affinity partitioner into oneTBB run-time library.
-            class affinity_partitioner_base : no_copy {
-                friend class affinity_partitioner;
-                friend class affinity_partition_type;
-                //! Array that remembers affinities of tree positions to affinity_id.
-                /** NULL if my_size==0. */
-                slot_id* my_array;
-                //! Number of elements in my_array.
-                std::size_t my_size;
-                //! Zeros the fields.
-                affinity_partitioner_base() : my_array(nullptr), my_size(0) {}
-                //! Deallocates my_array.
-                ~affinity_partitioner_base() { resize(0); }
-                //! Resize my_array.
-                /** Retains values if resulting size is the same. */
-                void resize(unsigned factor) {
-                    // Check factor to avoid asking for number of workers while there might be no arena.
-                    unsigned max_threads_in_arena = max_concurrency();
-                    std::size_t new_size = factor ? factor * max_threads_in_arena : 0;
-                    if (new_size != my_size) {
-                        if (my_array) {
-                            r1::cache_aligned_deallocate(my_array);
-                            // Following two assignments must be done here for sake of exception safety.
-                            my_array = nullptr;
-                            my_size = 0;
-                        }
-                        if (new_size) {
-                            my_array = static_cast<slot_id*>(
-                                    r1::cache_aligned_allocate(new_size * sizeof(slot_id)));
-                            std::fill_n(my_array, new_size, no_slot);
-                            my_size = new_size;
-                        }
-                    }
-                }
-            };
-
-            template <typename Range, typename Body, typename Partitioner>
-            struct start_for;
-            template <typename Range, typename Body, typename Partitioner>
-            struct start_scan;
-            template <typename Range, typename Body, typename Partitioner>
-            struct start_reduce;
-            template <typename Range, typename Body, typename Partitioner>
-            struct start_deterministic_reduce;
-
-            struct node {
-                node* my_parent {};
-                std::atomic<int> m_ref_count {};
-
-                node() = default;
-                node(node* parent, int ref_count) : my_parent {parent}, m_ref_count {ref_count} {
-                    __TBB_ASSERT(ref_count > 0, "The ref count must be positive");
-                }
-            };
-
-            struct wait_node : node {
-                wait_node() : node {nullptr, 1} {}
-                wait_context m_wait {1};
-            };
-
-            //! Join task node that contains shared flag for stealing feedback
-            struct tree_node : public node {
-                small_object_allocator m_allocator;
-                std::atomic<bool> m_child_stolen {false};
-
-                tree_node(node* parent, int ref_count, small_object_allocator& alloc)
-                    : node {parent, ref_count}, m_allocator {alloc} {}
-
-                void join(task_group_context*) {/*dummy, required only for reduction algorithms*/};
-
-                template <typename Task>
-                static void mark_task_stolen(Task& t) {
-                    std::atomic<bool>& flag = static_cast<tree_node*>(t.my_parent)->m_child_stolen;
+            if (new_size) {
+                my_array = static_cast<slot_id*>(r1::cache_aligned_allocate(new_size * sizeof(slot_id)));
+                std::fill_n(my_array, new_size, no_slot);
+                my_size = new_size;
+            }
+        }
+    }
+};
+
+template<typename Range, typename Body, typename Partitioner> struct start_for;
+template<typename Range, typename Body, typename Partitioner> struct start_scan;
+template<typename Range, typename Body, typename Partitioner> struct start_reduce;
+template<typename Range, typename Body, typename Partitioner> struct start_deterministic_reduce;
+
+struct node {
+    node* my_parent{};
+    std::atomic<int> m_ref_count{};
+
+    node() = default;
+    node(node* parent, int ref_count) :
+        my_parent{parent}, m_ref_count{ref_count} {
+        __TBB_ASSERT(ref_count > 0, "The ref count must be positive");
+    }
+};
+
+struct wait_node : node {
+    wait_node() : node{ nullptr, 1 } {}
+    wait_context m_wait{1};
+};
+
+//! Join task node that contains shared flag for stealing feedback
+struct tree_node : public node {
+    small_object_allocator m_allocator;
+    std::atomic<bool> m_child_stolen{false};
+
+    tree_node(node* parent, int ref_count, small_object_allocator& alloc)
+        : node{parent, ref_count}
+        , m_allocator{alloc} {}
+
+    void join(task_group_context*) {/*dummy, required only for reduction algorithms*/};
+
+    template <typename Task>
+    static void mark_task_stolen(Task &t) {
+        std::atomic<bool> &flag = static_cast<tree_node*>(t.my_parent)->m_child_stolen;
 #if TBB_USE_PROFILING_TOOLS
-                    // Threading tools respect lock prefix but report false-positive data-race via plain store
-                    flag.exchange(true);
+        // Threading tools respect lock prefix but report false-positive data-race via plain store
+        flag.exchange(true);
 #else
-                    flag.store(true, std::memory_order_relaxed);
-#endif// TBB_USE_PROFILING_TOOLS
-                }
-                template <typename Task>
-                static bool is_peer_stolen(Task& t) {
-                    return static_cast<tree_node*>(t.my_parent)
-                            ->m_child_stolen.load(std::memory_order_relaxed);
-                }
-            };
-
-            // Context used to check cancellation state during reduction join process
-            template <typename TreeNodeType>
-            void fold_tree(node* n, const execution_data& ed) {
-                for (;;) {
-                    __TBB_ASSERT(n->m_ref_count.load(std::memory_order_relaxed) > 0,
-                                 "The refcount must be positive.");
-                    call_itt_task_notify(releasing, n);
-                    if (--n->m_ref_count > 0) { return; }
-                    node* parent = n->my_parent;
-                    if (!parent) { break; };
-
-                    call_itt_task_notify(acquired, n);
-                    TreeNodeType* self = static_cast<TreeNodeType*>(n);
-                    self->join(ed.context);
-                    self->m_allocator.delete_object(self, ed);
-                    n = parent;
-                }
-                // Finish parallel for execution when the root (last node) is reached
-                static_cast<wait_node*>(n)->m_wait.release();
+        flag.store(true, std::memory_order_relaxed);
+#endif // TBB_USE_PROFILING_TOOLS
+    }
+    template <typename Task>
+    static bool is_peer_stolen(Task &t) {
+        return static_cast<tree_node*>(t.my_parent)->m_child_stolen.load(std::memory_order_relaxed);
+    }
+};
+
+// Context used to check cancellation state during reduction join process
+template<typename TreeNodeType>
+void fold_tree(node* n, const execution_data& ed) {
+    for (;;) {
+        __TBB_ASSERT(n, nullptr);
+        __TBB_ASSERT(n->m_ref_count.load(std::memory_order_relaxed) > 0, "The refcount must be positive.");
+        call_itt_task_notify(releasing, n);
+        if (--n->m_ref_count > 0) {
+            return;
+        }
+        node* parent = n->my_parent;
+        if (!parent) {
+            break;
+        };
+
+        call_itt_task_notify(acquired, n);
+        TreeNodeType* self = static_cast<TreeNodeType*>(n);
+        self->join(ed.context);
+        self->m_allocator.delete_object(self, ed);
+        n = parent;
+    }
+    // Finish parallel for execution when the root (last node) is reached
+    static_cast<wait_node*>(n)->m_wait.release();
+}
+
+//! Depth is a relative depth of recursive division inside a range pool. Relative depth allows
+//! infinite absolute depth of the recursion for heavily unbalanced workloads with range represented
+//! by a number that cannot fit into machine word.
+typedef unsigned char depth_t;
+
+//! Range pool stores ranges of type T in a circular buffer with MaxCapacity
+template <typename T, depth_t MaxCapacity>
+class range_vector {
+    depth_t my_head;
+    depth_t my_tail;
+    depth_t my_size;
+    depth_t my_depth[MaxCapacity]; // relative depths of stored ranges
+    tbb::detail::aligned_space<T, MaxCapacity> my_pool;
+
+public:
+    //! initialize via first range in pool
+    range_vector(const T& elem) : my_head(0), my_tail(0), my_size(1) {
+        my_depth[0] = 0;
+        new( static_cast<void *>(my_pool.begin()) ) T(elem);//TODO: std::move?
+    }
+    ~range_vector() {
+        while( !empty() ) pop_back();
+    }
+    bool empty() const { return my_size == 0; }
+    depth_t size() const { return my_size; }
+    //! Populates range pool via ranges up to max depth or while divisible
+    //! max_depth starts from 0, e.g. value 2 makes 3 ranges in the pool up to two 1/4 pieces
+    void split_to_fill(depth_t max_depth) {
+        while( my_size < MaxCapacity && is_divisible(max_depth) ) {
+            depth_t prev = my_head;
+            my_head = (my_head + 1) % MaxCapacity;
+            new(my_pool.begin()+my_head) T(my_pool.begin()[prev]); // copy TODO: std::move?
+            my_pool.begin()[prev].~T(); // instead of assignment
+            new(my_pool.begin()+prev) T(my_pool.begin()[my_head], detail::split()); // do 'inverse' split
+            my_depth[my_head] = ++my_depth[prev];
+            my_size++;
+        }
+    }
+    void pop_back() {
+        __TBB_ASSERT(my_size > 0, "range_vector::pop_back() with empty size");
+        my_pool.begin()[my_head].~T();
+        my_size--;
+        my_head = (my_head + MaxCapacity - 1) % MaxCapacity;
+    }
+    void pop_front() {
+        __TBB_ASSERT(my_size > 0, "range_vector::pop_front() with empty size");
+        my_pool.begin()[my_tail].~T();
+        my_size--;
+        my_tail = (my_tail + 1) % MaxCapacity;
+    }
+    T& back() {
+        __TBB_ASSERT(my_size > 0, "range_vector::back() with empty size");
+        return my_pool.begin()[my_head];
+    }
+    T& front() {
+        __TBB_ASSERT(my_size > 0, "range_vector::front() with empty size");
+        return my_pool.begin()[my_tail];
+    }
+    //! similarly to front(), returns depth of the first range in the pool
+    depth_t front_depth() {
+        __TBB_ASSERT(my_size > 0, "range_vector::front_depth() with empty size");
+        return my_depth[my_tail];
+    }
+    depth_t back_depth() {
+        __TBB_ASSERT(my_size > 0, "range_vector::back_depth() with empty size");
+        return my_depth[my_head];
+    }
+    bool is_divisible(depth_t max_depth) {
+        return back_depth() < max_depth && back().is_divisible();
+    }
+};
+
+//! Provides default methods for partition objects and common algorithm blocks.
+template <typename Partition>
+struct partition_type_base {
+    typedef detail::split split_type;
+    // decision makers
+    void note_affinity( slot_id ) {}
+    template <typename Task>
+    bool check_being_stolen(Task&, const execution_data&) { return false; } // part of old should_execute_range()
+    template <typename Range> split_type get_split() { return split(); }
+    Partition& self() { return *static_cast<Partition*>(this); } // CRTP helper
+
+    template<typename StartType, typename Range>
+    void work_balance(StartType &start, Range &range, const execution_data&) {
+        start.run_body( range ); // static partitioner goes here
+    }
+
+    template<typename StartType, typename Range>
+    void execute(StartType &start, Range &range, execution_data& ed) {
+        // The algorithm in a few words ([]-denotes calls to decision methods of partitioner):
+        // [If this task is stolen, adjust depth and divisions if necessary, set flag].
+        // If range is divisible {
+        //    Spread the work while [initial divisions left];
+        //    Create trap task [if necessary];
+        // }
+        // If not divisible or [max depth is reached], execute, else do the range pool part
+        if ( range.is_divisible() ) {
+            if ( self().is_divisible() ) {
+                do { // split until is divisible
+                    typename Partition::split_type split_obj = self().template get_split<Range>();
+                    start.offer_work( split_obj, ed );
+                } while ( range.is_divisible() && self().is_divisible() );
             }
-
-            //! Depth is a relative depth of recursive division inside a range pool. Relative depth allows
-            //! infinite absolute depth of the recursion for heavily unbalanced workloads with range represented
-            //! by a number that cannot fit into machine word.
-            typedef unsigned char depth_t;
-
-            //! Range pool stores ranges of type T in a circular buffer with MaxCapacity
-            template <typename T, depth_t MaxCapacity>
-            class range_vector {
-                depth_t my_head;
-                depth_t my_tail;
-                depth_t my_size;
-                depth_t my_depth[MaxCapacity];// relative depths of stored ranges
-                tbb::detail::aligned_space<T, MaxCapacity> my_pool;
-
-            public:
-                //! initialize via first range in pool
-                range_vector(const T& elem) : my_head(0), my_tail(0), my_size(1) {
-                    my_depth[0] = 0;
-                    new (static_cast<void*>(my_pool.begin())) T(elem);//TODO: std::move?
-                }
-                ~range_vector() {
-                    while (!empty()) pop_back();
-                }
-                bool empty() const { return my_size == 0; }
-                depth_t size() const { return my_size; }
-                //! Populates range pool via ranges up to max depth or while divisible
-                //! max_depth starts from 0, e.g. value 2 makes 3 ranges in the pool up to two 1/4 pieces
-                void split_to_fill(depth_t max_depth) {
-                    while (my_size < MaxCapacity && is_divisible(max_depth)) {
-                        depth_t prev = my_head;
-                        my_head = (my_head + 1) % MaxCapacity;
-                        new (my_pool.begin() + my_head) T(my_pool.begin()[prev]);// copy TODO: std::move?
-                        my_pool.begin()[prev].~T();                              // instead of assignment
-                        new (my_pool.begin() + prev)
-                                T(my_pool.begin()[my_head], detail::split());// do 'inverse' split
-                        my_depth[my_head] = ++my_depth[prev];
-                        my_size++;
-                    }
-                }
-                void pop_back() {
-                    __TBB_ASSERT(my_size > 0, "range_vector::pop_back() with empty size");
-                    my_pool.begin()[my_head].~T();
-                    my_size--;
-                    my_head = (my_head + MaxCapacity - 1) % MaxCapacity;
-                }
-                void pop_front() {
-                    __TBB_ASSERT(my_size > 0, "range_vector::pop_front() with empty size");
-                    my_pool.begin()[my_tail].~T();
-                    my_size--;
-                    my_tail = (my_tail + 1) % MaxCapacity;
-                }
-                T& back() {
-                    __TBB_ASSERT(my_size > 0, "range_vector::back() with empty size");
-                    return my_pool.begin()[my_head];
-                }
-                T& front() {
-                    __TBB_ASSERT(my_size > 0, "range_vector::front() with empty size");
-                    return my_pool.begin()[my_tail];
-                }
-                //! similarly to front(), returns depth of the first range in the pool
-                depth_t front_depth() {
-                    __TBB_ASSERT(my_size > 0, "range_vector::front_depth() with empty size");
-                    return my_depth[my_tail];
-                }
-                depth_t back_depth() {
-                    __TBB_ASSERT(my_size > 0, "range_vector::back_depth() with empty size");
-                    return my_depth[my_head];
-                }
-                bool is_divisible(depth_t max_depth) {
-                    return back_depth() < max_depth && back().is_divisible();
-                }
-            };
-
-            //! Provides default methods for partition objects and common algorithm blocks.
-            template <typename Partition>
-            struct partition_type_base {
-                typedef detail::split split_type;
-                // decision makers
-                void note_affinity(slot_id) {}
-                template <typename Task>
-                bool check_being_stolen(Task&, const execution_data&) {
-                    return false;
-                }// part of old should_execute_range()
-                template <typename Range>
-                split_type get_split() {
-                    return split();
-                }
-                Partition& self() { return *static_cast<Partition*>(this); }// CRTP helper
-
-                template <typename StartType, typename Range>
-                void work_balance(StartType& start, Range& range, const execution_data&) {
-                    start.run_body(range);// static partitioner goes here
-                }
-
-                template <typename StartType, typename Range>
-                void execute(StartType& start, Range& range, execution_data& ed) {
-                    // The algorithm in a few words ([]-denotes calls to decision methods of partitioner):
-                    // [If this task is stolen, adjust depth and divisions if necessary, set flag].
-                    // If range is divisible {
-                    //    Spread the work while [initial divisions left];
-                    //    Create trap task [if necessary];
-                    // }
-                    // If not divisible or [max depth is reached], execute, else do the range pool part
-                    if (range.is_divisible()) {
-                        if (self().is_divisible()) {
-                            do {// split until is divisible
-                                typename Partition::split_type split_obj = self().template get_split<Range>();
-                                start.offer_work(split_obj, ed);
-                            } while (range.is_divisible() && self().is_divisible());
-                        }
-                    }
-                    self().work_balance(start, range, ed);
-                }
-            };
-
-            //! Provides default splitting strategy for partition objects.
-            template <typename Partition>
-            struct adaptive_mode : partition_type_base<Partition> {
-                typedef Partition my_partition;
-                std::size_t my_divisor;
-                // For affinity_partitioner, my_divisor indicates the number of affinity array indices the task reserves.
-                // A task which has only one index must produce the right split without reserved index in order to avoid
-                // it to be overwritten in note_affinity() of the created (right) task.
-                // I.e. a task created deeper than the affinity array can remember must not save its affinity (LIFO order)
-                static const unsigned factor = 1;
-                adaptive_mode()
-                    : my_divisor(get_initial_auto_partitioner_divisor() / 4 * my_partition::factor) {}
-                adaptive_mode(adaptive_mode& src, split) : my_divisor(do_split(src, split())) {}
-                adaptive_mode(adaptive_mode&, const proportional_split&) : my_divisor(0) {
-                    // left blank as my_divisor gets overridden in the successors' constructors
-                }
-                /*! Override do_split methods in order to specify splitting strategy */
-                std::size_t do_split(adaptive_mode& src, split) { return src.my_divisor /= 2u; }
-            };
-
-            //! Helper type for checking availability of proportional_split constructor
-            template <typename T>
-            using supports_proportional_splitting =
-                    typename std::is_constructible<T, T&, proportional_split&>;
-
-            //! A helper class to create a proportional_split object for a given type of Range.
-            /** If the Range has proportional_split constructor,
-    then created object splits a provided value in an implemenation-defined proportion;
-    otherwise it represents equal-size split. */
-            // TODO: check if this helper can be a nested class of proportional_mode.
-            template <typename Range, typename = void>
-            struct proportion_helper {
-                static proportional_split get_split(std::size_t) { return proportional_split(1, 1); }
-            };
-
-            template <typename Range>
-            struct proportion_helper<
-                    Range, typename std::enable_if<supports_proportional_splitting<Range>::value>::type> {
-                static proportional_split get_split(std::size_t n) {
-                    std::size_t right = n / 2;
-                    std::size_t left = n - right;
-                    return proportional_split(left, right);
-                }
-            };
-
-            //! Provides proportional splitting strategy for partition objects
-            template <typename Partition>
-            struct proportional_mode : adaptive_mode<Partition> {
-                typedef Partition my_partition;
-                using partition_type_base<Partition>::self;// CRTP helper to get access to derived classes
-
-                proportional_mode() : adaptive_mode<Partition>() {}
-                proportional_mode(proportional_mode& src, split) : adaptive_mode<Partition>(src, split()) {}
-                proportional_mode(proportional_mode& src, const proportional_split& split_obj)
-                    : adaptive_mode<Partition>(src, split_obj) {
-                    self().my_divisor = do_split(src, split_obj);
-                }
-                std::size_t do_split(proportional_mode& src, const proportional_split& split_obj) {
-                    std::size_t portion = split_obj.right() * my_partition::factor;
-                    portion = (portion + my_partition::factor / 2) & (0ul - my_partition::factor);
-                    src.my_divisor -= portion;
-                    return portion;
-                }
-                bool is_divisible() {// part of old should_execute_range()
-                    return self().my_divisor > my_partition::factor;
-                }
-                template <typename Range>
-                proportional_split get_split() {
-                    // Create a proportion for the number of threads expected to handle "this" subrange
-                    return proportion_helper<Range>::get_split(self().my_divisor / my_partition::factor);
-                }
-            };
-
-            static std::size_t get_initial_partition_head() {
-                int current_index = tbb::this_task_arena::current_thread_index();
-                if (current_index == tbb::task_arena::not_initialized) current_index = 0;
-                return size_t(current_index);
-            }
-
-            //! Provides default linear indexing of partitioner's sequence
-            template <typename Partition>
-            struct linear_affinity_mode : proportional_mode<Partition> {
-                std::size_t my_head;
-                std::size_t my_max_affinity;
-                using proportional_mode<Partition>::self;
-                linear_affinity_mode()
-                    : proportional_mode<Partition>(), my_head(get_initial_partition_head()),
-                      my_max_affinity(self().my_divisor) {}
-                linear_affinity_mode(linear_affinity_mode& src, split)
-                    : proportional_mode<Partition>(src, split()),
-                      my_head((src.my_head + src.my_divisor) % src.my_max_affinity),
-                      my_max_affinity(src.my_max_affinity) {}
-                linear_affinity_mode(linear_affinity_mode& src, const proportional_split& split_obj)
-                    : proportional_mode<Partition>(src, split_obj),
-                      my_head((src.my_head + src.my_divisor) % src.my_max_affinity),
-                      my_max_affinity(src.my_max_affinity) {}
-                void spawn_task(task& t, task_group_context& ctx) {
-                    if (self().my_divisor) {
-                        spawn(t, ctx, slot_id(my_head));
-                    } else {
-                        spawn(t, ctx);
-                    }
-                }
-            };
-
-            static bool is_stolen_task(const execution_data& ed) {
-                return execution_slot(ed) != original_slot(ed);
-            }
-
-            /*! Determine work-balance phase implementing splitting & stealing actions */
-            template <class Mode>
-            struct dynamic_grainsize_mode : Mode {
-                using Mode::self;
-                enum { begin = 0, run, pass } my_delay;
-                depth_t my_max_depth;
-                static const unsigned range_pool_size = __TBB_RANGE_POOL_CAPACITY;
-                dynamic_grainsize_mode() : Mode(), my_delay(begin), my_max_depth(__TBB_INIT_DEPTH) {}
-                dynamic_grainsize_mode(dynamic_grainsize_mode& p, split)
-                    : Mode(p, split()), my_delay(pass), my_max_depth(p.my_max_depth) {}
-                dynamic_grainsize_mode(dynamic_grainsize_mode& p, const proportional_split& split_obj)
-                    : Mode(p, split_obj), my_delay(begin), my_max_depth(p.my_max_depth) {}
-                template <typename Task>
-                bool check_being_stolen(Task& t,
-                                        const execution_data& ed) {// part of old should_execute_range()
-                    if (!(self().my_divisor
-                          / Mode::my_partition::factor)) {// if not from the top P tasks of binary tree
-                        self().my_divisor = 1;// TODO: replace by on-stack flag (partition_state's member)?
-                        if (is_stolen_task(ed)
-                            && t.my_parent->m_ref_count >= 2) {// runs concurrently with the left task
+        }
+        self().work_balance(start, range, ed);
+    }
+};
+
+//! Provides default splitting strategy for partition objects.
+template <typename Partition>
+struct adaptive_mode : partition_type_base<Partition> {
+    typedef Partition my_partition;
+    std::size_t my_divisor;
+    // For affinity_partitioner, my_divisor indicates the number of affinity array indices the task reserves.
+    // A task which has only one index must produce the right split without reserved index in order to avoid
+    // it to be overwritten in note_affinity() of the created (right) task.
+    // I.e. a task created deeper than the affinity array can remember must not save its affinity (LIFO order)
+    static const unsigned factor = 1;
+    adaptive_mode() : my_divisor(get_initial_auto_partitioner_divisor() / 4 * my_partition::factor) {}
+    adaptive_mode(adaptive_mode &src, split) : my_divisor(do_split(src, split())) {}
+    adaptive_mode(adaptive_mode&, const proportional_split&) : my_divisor(0)
+    {
+        // left blank as my_divisor gets overridden in the successors' constructors
+    }
+    /*! Override do_split methods in order to specify splitting strategy */
+    std::size_t do_split(adaptive_mode &src, split) {
+        return src.my_divisor /= 2u;
+    }
+};
+
+
+//! Provides proportional splitting strategy for partition objects
+template <typename Partition>
+struct proportional_mode : adaptive_mode<Partition> {
+    typedef Partition my_partition;
+    using partition_type_base<Partition>::self; // CRTP helper to get access to derived classes
+
+    proportional_mode() : adaptive_mode<Partition>() {}
+    proportional_mode(proportional_mode &src, split) : adaptive_mode<Partition>(src, split()) {}
+    proportional_mode(proportional_mode &src, const proportional_split& split_obj)
+        : adaptive_mode<Partition>(src, split_obj)
+    {
+        self().my_divisor = do_split(src, split_obj);
+    }
+    std::size_t do_split(proportional_mode &src, const proportional_split& split_obj) {
+        std::size_t portion = split_obj.right() * my_partition::factor;
+        portion = (portion + my_partition::factor/2) & (0ul - my_partition::factor);
+        src.my_divisor -= portion;
+        return portion;
+    }
+    bool is_divisible() { // part of old should_execute_range()
+        return self().my_divisor > my_partition::factor;
+    }
+    template <typename Range>
+    proportional_split get_split() {
+        // Create the proportion from partitioner internal resources (threads) that would be used:
+        // - into proportional_mode constructor to split the partitioner
+        // - if Range supports the proportional_split constructor it would use proposed proportion,
+        //   otherwise, the tbb::proportional_split object will be implicitly (for Range implementer)
+        //   casted to tbb::split
+
+        std::size_t n = self().my_divisor / my_partition::factor;
+        std::size_t right = n / 2;
+        std::size_t left  = n - right;
+        return proportional_split(left, right);
+    }
+};
+
+static std::size_t get_initial_partition_head() {
+    int current_index = tbb::this_task_arena::current_thread_index();
+    if (current_index == tbb::task_arena::not_initialized)
+        current_index = 0;
+    return size_t(current_index);
+}
+
+//! Provides default linear indexing of partitioner's sequence
+template <typename Partition>
+struct linear_affinity_mode : proportional_mode<Partition> {
+    std::size_t my_head;
+    std::size_t my_max_affinity;
+    using proportional_mode<Partition>::self;
+    linear_affinity_mode() : proportional_mode<Partition>(), my_head(get_initial_partition_head()),
+                             my_max_affinity(self().my_divisor) {}
+    linear_affinity_mode(linear_affinity_mode &src, split) : proportional_mode<Partition>(src, split())
+        , my_head((src.my_head + src.my_divisor) % src.my_max_affinity), my_max_affinity(src.my_max_affinity) {}
+    linear_affinity_mode(linear_affinity_mode &src, const proportional_split& split_obj) : proportional_mode<Partition>(src, split_obj)
+        , my_head((src.my_head + src.my_divisor) % src.my_max_affinity), my_max_affinity(src.my_max_affinity) {}
+    void spawn_task(task& t, task_group_context& ctx) {
+        if (self().my_divisor) {
+            spawn(t, ctx, slot_id(my_head));
+        } else {
+            spawn(t, ctx);
+        }
+    }
+};
+
+static bool is_stolen_task(const execution_data& ed) {
+    return execution_slot(ed) != original_slot(ed);
+}
+
+/*! Determine work-balance phase implementing splitting & stealing actions */
+template<class Mode>
+struct dynamic_grainsize_mode : Mode {
+    using Mode::self;
+    enum {
+        begin = 0,
+        run,
+        pass
+    } my_delay;
+    depth_t my_max_depth;
+    static const unsigned range_pool_size = __TBB_RANGE_POOL_CAPACITY;
+    dynamic_grainsize_mode(): Mode()
+        , my_delay(begin)
+        , my_max_depth(__TBB_INIT_DEPTH) {}
+    dynamic_grainsize_mode(dynamic_grainsize_mode& p, split)
+        : Mode(p, split())
+        , my_delay(pass)
+        , my_max_depth(p.my_max_depth) {}
+    dynamic_grainsize_mode(dynamic_grainsize_mode& p, const proportional_split& split_obj)
+        : Mode(p, split_obj)
+        , my_delay(begin)
+        , my_max_depth(p.my_max_depth) {}
+    template <typename Task>
+    bool check_being_stolen(Task &t, const execution_data& ed) { // part of old should_execute_range()
+        if( !(self().my_divisor / Mode::my_partition::factor) ) { // if not from the top P tasks of binary tree
+            self().my_divisor = 1; // TODO: replace by on-stack flag (partition_state's member)?
+            if( is_stolen_task(ed) && t.my_parent->m_ref_count >= 2 ) { // runs concurrently with the left task
 #if __TBB_USE_OPTIONAL_RTTI
-                            // RTTI is available, check whether the cast is valid
-                            // TODO: TBB_REVAMP_TODO __TBB_ASSERT(dynamic_cast<tree_node*>(t.m_parent), 0);
-                            // correctness of the cast relies on avoiding the root task for which:
-                            // - initial value of my_divisor != 0 (protected by separate assertion)
-                            // - is_stolen_task() always returns false for the root task.
+                // RTTI is available, check whether the cast is valid
+                // TODO: TBB_REVAMP_TODO __TBB_ASSERT(dynamic_cast<tree_node*>(t.m_parent), 0);
+                // correctness of the cast relies on avoiding the root task for which:
+                // - initial value of my_divisor != 0 (protected by separate assertion)
+                // - is_stolen_task() always returns false for the root task.
 #endif
-                            tree_node::mark_task_stolen(t);
-                            if (!my_max_depth) my_max_depth++;
-                            my_max_depth += __TBB_DEMAND_DEPTH_ADD;
-                            return true;
-                        }
-                    }
-                    return false;
-                }
-                depth_t max_depth() { return my_max_depth; }
-                void align_depth(depth_t base) {
-                    __TBB_ASSERT(base <= my_max_depth, 0);
-                    my_max_depth -= base;
-                }
-                template <typename StartType, typename Range>
-                void work_balance(StartType& start, Range& range, execution_data& ed) {
-                    if (!range.is_divisible() || !self().max_depth()) {
-                        start.run_body(range);
-                    } else {// do range pool
-                        range_vector<Range, range_pool_size> range_pool(range);
-                        do {
-                            range_pool.split_to_fill(self().max_depth());// fill range pool
-                            if (self().check_for_demand(start)) {
-                                if (range_pool.size() > 1) {
-                                    start.offer_work(range_pool.front(), range_pool.front_depth(), ed);
-                                    range_pool.pop_front();
-                                    continue;
-                                }
-                                if (range_pool.is_divisible(
-                                            self().max_depth()))// was not enough depth to fork a task
-                                    continue;// note: next split_to_fill() should split range at least once
-                            }
-                            start.run_body(range_pool.back());
-                            range_pool.pop_back();
-                        } while (!range_pool.empty() && !ed.context->is_group_execution_cancelled());
-                    }
-                }
-                template <typename Task>
-                bool check_for_demand(Task& t) {
-                    if (pass == my_delay) {
-                        if (self().my_divisor > 1)// produce affinitized tasks while they have slot in array
-                            return true;// do not do my_max_depth++ here, but be sure range_pool is splittable once more
-                        else if (self().my_divisor && my_max_depth) {// make balancing task
-                            self().my_divisor
-                                    = 0;// once for each task; depth will be decreased in align_depth()
-                            return true;
-                        } else if (tree_node::is_peer_stolen(t)) {
-                            my_max_depth += __TBB_DEMAND_DEPTH_ADD;
-                            return true;
-                        }
-                    } else if (begin == my_delay) {
-                        my_delay = pass;
-                    }
-                    return false;
-                }
-            };
-
-            class auto_partition_type : public dynamic_grainsize_mode<adaptive_mode<auto_partition_type>> {
-            public:
-                auto_partition_type(const auto_partitioner&)
-                    : dynamic_grainsize_mode<adaptive_mode<auto_partition_type>>() {
-                    my_divisor *= __TBB_INITIAL_CHUNKS;
-                }
-                auto_partition_type(auto_partition_type& src, split)
-                    : dynamic_grainsize_mode<adaptive_mode<auto_partition_type>>(src, split()) {}
-                bool is_divisible() {// part of old should_execute_range()
-                    if (my_divisor > 1) return true;
-                    if (my_divisor && my_max_depth) {// can split the task. TODO: on-stack flag instead
-                        // keep same fragmentation while splitting for the local task pool
-                        my_max_depth--;
-                        my_divisor = 0;// decrease max_depth once per task
-                        return true;
-                    } else
-                        return false;
-                }
-                template <typename Task>
-                bool check_for_demand(Task& t) {
-                    if (tree_node::is_peer_stolen(t)) {
-                        my_max_depth += __TBB_DEMAND_DEPTH_ADD;
-                        return true;
-                    } else
-                        return false;
-                }
-                void spawn_task(task& t, task_group_context& ctx) { spawn(t, ctx); }
-            };
-
-            class simple_partition_type : public partition_type_base<simple_partition_type> {
-            public:
-                simple_partition_type(const simple_partitioner&) {}
-                simple_partition_type(const simple_partition_type&, split) {}
-                //! simplified algorithm
-                template <typename StartType, typename Range>
-                void execute(StartType& start, Range& range, execution_data& ed) {
-                    split_type split_obj = split();// start.offer_work accepts split_type as reference
-                    while (range.is_divisible()) start.offer_work(split_obj, ed);
-                    start.run_body(range);
-                }
-                void spawn_task(task& t, task_group_context& ctx) { spawn(t, ctx); }
-            };
-
-            class static_partition_type : public linear_affinity_mode<static_partition_type> {
-            public:
-                typedef detail::proportional_split split_type;
-                static_partition_type(const static_partitioner&)
-                    : linear_affinity_mode<static_partition_type>() {}
-                static_partition_type(static_partition_type& p, const proportional_split& split_obj)
-                    : linear_affinity_mode<static_partition_type>(p, split_obj) {}
-            };
-
-            class affinity_partition_type
-                : public dynamic_grainsize_mode<linear_affinity_mode<affinity_partition_type>> {
-                static const unsigned factor_power
-                        = 4;// TODO: get a unified formula based on number of computing units
-                slot_id* my_array;
-
-            public:
-                static const unsigned factor = 1 << factor_power;// number of slots in affinity array per task
-                typedef detail::proportional_split split_type;
-                affinity_partition_type(affinity_partitioner_base& ap)
-                    : dynamic_grainsize_mode<linear_affinity_mode<affinity_partition_type>>() {
-                    __TBB_ASSERT((factor & (factor - 1)) == 0, "factor must be power of two");
-                    ap.resize(factor);
-                    my_array = ap.my_array;
-                    my_max_depth = factor_power + 1;
-                    __TBB_ASSERT(my_max_depth < __TBB_RANGE_POOL_CAPACITY, 0);
-                }
-                affinity_partition_type(affinity_partition_type& p, split)
-                    : dynamic_grainsize_mode<linear_affinity_mode<affinity_partition_type>>(p, split()),
-                      my_array(p.my_array) {}
-                affinity_partition_type(affinity_partition_type& p, const proportional_split& split_obj)
-                    : dynamic_grainsize_mode<linear_affinity_mode<affinity_partition_type>>(p, split_obj),
-                      my_array(p.my_array) {}
-                void note_affinity(slot_id id) {
-                    if (my_divisor) my_array[my_head] = id;
-                }
-                void spawn_task(task& t, task_group_context& ctx) {
-                    if (my_divisor) {
-                        if (!my_array[my_head]) {
-                            // TODO: consider new ideas with my_array for both affinity and static partitioner's, then code reuse
-                            spawn(t, ctx, slot_id(my_head / factor));
-                        } else {
-                            spawn(t, ctx, my_array[my_head]);
-                        }
-                    } else {
-                        spawn(t, ctx);
+                tree_node::mark_task_stolen(t);
+                if( !my_max_depth ) my_max_depth++;
+                my_max_depth += __TBB_DEMAND_DEPTH_ADD;
+                return true;
+            }
+        }
+        return false;
+    }
+    depth_t max_depth() { return my_max_depth; }
+    void align_depth(depth_t base) {
+        __TBB_ASSERT(base <= my_max_depth, nullptr);
+        my_max_depth -= base;
+    }
+    template<typename StartType, typename Range>
+    void work_balance(StartType &start, Range &range, execution_data& ed) {
+        if( !range.is_divisible() || !self().max_depth() ) {
+            start.run_body( range );
+        }
+        else { // do range pool
+            range_vector<Range, range_pool_size> range_pool(range);
+            do {
+                range_pool.split_to_fill(self().max_depth()); // fill range pool
+                if( self().check_for_demand( start ) ) {
+                    if( range_pool.size() > 1 ) {
+                        start.offer_work( range_pool.front(), range_pool.front_depth(), ed );
+                        range_pool.pop_front();
+                        continue;
                     }
-                }
-            };
-
-            //! A simple partitioner
-            /** Divides the range until the range is not divisible.
+                    if( range_pool.is_divisible(self().max_depth()) ) // was not enough depth to fork a task
+                        continue; // note: next split_to_fill() should split range at least once
+                }
+                start.run_body( range_pool.back() );
+                range_pool.pop_back();
+            } while( !range_pool.empty() && !ed.context->is_group_execution_cancelled() );
+        }
+    }
+    template <typename Task>
+    bool check_for_demand(Task& t) {
+        if ( pass == my_delay ) {
+            if ( self().my_divisor > 1 ) // produce affinitized tasks while they have slot in array
+                return true; // do not do my_max_depth++ here, but be sure range_pool is splittable once more
+            else if ( self().my_divisor && my_max_depth ) { // make balancing task
+                self().my_divisor = 0; // once for each task; depth will be decreased in align_depth()
+                return true;
+            }
+            else if ( tree_node::is_peer_stolen(t) ) {
+                my_max_depth += __TBB_DEMAND_DEPTH_ADD;
+                return true;
+            }
+        } else if( begin == my_delay ) {
+            my_delay = pass;
+        }
+        return false;
+    }
+};
+
+class auto_partition_type: public dynamic_grainsize_mode<adaptive_mode<auto_partition_type> > {
+public:
+    auto_partition_type( const auto_partitioner& ) {
+        my_divisor *= __TBB_INITIAL_CHUNKS;
+    }
+    auto_partition_type( auto_partition_type& src, split)
+        : dynamic_grainsize_mode<adaptive_mode<auto_partition_type> >(src, split()) {}
+    bool is_divisible() { // part of old should_execute_range()
+        if( my_divisor > 1 ) return true;
+        if( my_divisor && my_max_depth ) { // can split the task. TODO: on-stack flag instead
+            // keep same fragmentation while splitting for the local task pool
+            my_max_depth--;
+            my_divisor = 0; // decrease max_depth once per task
+            return true;
+        } else return false;
+    }
+    template <typename Task>
+    bool check_for_demand(Task& t) {
+        if (tree_node::is_peer_stolen(t)) {
+            my_max_depth += __TBB_DEMAND_DEPTH_ADD;
+            return true;
+        } else return false;
+    }
+    void spawn_task(task& t, task_group_context& ctx) {
+        spawn(t, ctx);
+    }
+};
+
+class simple_partition_type: public partition_type_base<simple_partition_type> {
+public:
+    simple_partition_type( const simple_partitioner& ) {}
+    simple_partition_type( const simple_partition_type&, split ) {}
+    //! simplified algorithm
+    template<typename StartType, typename Range>
+    void execute(StartType &start, Range &range, execution_data& ed) {
+        split_type split_obj = split(); // start.offer_work accepts split_type as reference
+        while( range.is_divisible() )
+            start.offer_work( split_obj, ed );
+        start.run_body( range );
+    }
+    void spawn_task(task& t, task_group_context& ctx) {
+        spawn(t, ctx);
+    }
+};
+
+class static_partition_type : public linear_affinity_mode<static_partition_type> {
+public:
+    typedef detail::proportional_split split_type;
+    static_partition_type( const static_partitioner& ) {}
+    static_partition_type( static_partition_type& p, const proportional_split& split_obj )
+        : linear_affinity_mode<static_partition_type>(p, split_obj) {}
+};
+
+class affinity_partition_type : public dynamic_grainsize_mode<linear_affinity_mode<affinity_partition_type> > {
+    static const unsigned factor_power = 4; // TODO: get a unified formula based on number of computing units
+    slot_id* my_array;
+public:
+    static const unsigned factor = 1 << factor_power; // number of slots in affinity array per task
+    typedef detail::proportional_split split_type;
+    affinity_partition_type( affinity_partitioner_base& ap ) {
+        __TBB_ASSERT( (factor&(factor-1))==0, "factor must be power of two" );
+        ap.resize(factor);
+        my_array = ap.my_array;
+        my_max_depth = factor_power + 1;
+        __TBB_ASSERT( my_max_depth < __TBB_RANGE_POOL_CAPACITY, nullptr );
+    }
+    affinity_partition_type(affinity_partition_type& p, split)
+        : dynamic_grainsize_mode<linear_affinity_mode<affinity_partition_type> >(p, split())
+        , my_array(p.my_array) {}
+    affinity_partition_type(affinity_partition_type& p, const proportional_split& split_obj)
+        : dynamic_grainsize_mode<linear_affinity_mode<affinity_partition_type> >(p, split_obj)
+        , my_array(p.my_array) {}
+    void note_affinity(slot_id id) {
+        if( my_divisor )
+            my_array[my_head] = id;
+    }
+    void spawn_task(task& t, task_group_context& ctx) {
+        if (my_divisor) {
+            if (!my_array[my_head]) {
+                // TODO: consider new ideas with my_array for both affinity and static partitioner's, then code reuse
+                spawn(t, ctx, slot_id(my_head / factor));
+            } else {
+                spawn(t, ctx, my_array[my_head]);
+            }
+        } else {
+            spawn(t, ctx);
+        }
+    }
+};
+
+//! A simple partitioner
+/** Divides the range until the range is not divisible.
     @ingroup algorithms */
-            class simple_partitioner {
-            public:
-                simple_partitioner() {}
-
-            private:
-                template <typename Range, typename Body, typename Partitioner>
-                friend struct start_for;
-                template <typename Range, typename Body, typename Partitioner>
-                friend struct start_reduce;
-                template <typename Range, typename Body, typename Partitioner>
-                friend struct start_deterministic_reduce;
-                template <typename Range, typename Body, typename Partitioner>
-                friend struct start_scan;
-                // new implementation just extends existing interface
-                typedef simple_partition_type task_partition_type;
-                // TODO: consider to make split_type public
-                typedef simple_partition_type::split_type split_type;
-
-                // for parallel_scan only
-                class partition_type {
-                public:
-                    bool should_execute_range(const execution_data&) { return false; }
-                    partition_type(const simple_partitioner&) {}
-                    partition_type(const partition_type&, split) {}
-                };
-            };
-
-            //! An auto partitioner
-            /** The range is initial divided into several large chunks.
+class simple_partitioner {
+public:
+    simple_partitioner() {}
+private:
+    template<typename Range, typename Body, typename Partitioner> friend struct start_for;
+    template<typename Range, typename Body, typename Partitioner> friend struct start_reduce;
+    template<typename Range, typename Body, typename Partitioner> friend struct start_deterministic_reduce;
+    template<typename Range, typename Body, typename Partitioner> friend struct start_scan;
+    // new implementation just extends existing interface
+    typedef simple_partition_type task_partition_type;
+    // TODO: consider to make split_type public
+    typedef simple_partition_type::split_type split_type;
+
+    // for parallel_scan only
+    class partition_type {
+    public:
+        bool should_execute_range(const execution_data& ) {return false;}
+        partition_type( const simple_partitioner& ) {}
+        partition_type( const partition_type&, split ) {}
+    };
+};
+
+//! An auto partitioner
+/** The range is initial divided into several large chunks.
     Chunks are further subdivided into smaller pieces if demand detected and they are divisible.
     @ingroup algorithms */
-            class auto_partitioner {
-            public:
-                auto_partitioner() {}
-
-            private:
-                template <typename Range, typename Body, typename Partitioner>
-                friend struct start_for;
-                template <typename Range, typename Body, typename Partitioner>
-                friend struct start_reduce;
-                template <typename Range, typename Body, typename Partitioner>
-                friend struct start_deterministic_reduce;
-                template <typename Range, typename Body, typename Partitioner>
-                friend struct start_scan;
-                // new implementation just extends existing interface
-                typedef auto_partition_type task_partition_type;
-                // TODO: consider to make split_type public
-                typedef auto_partition_type::split_type split_type;
-
-                //! Backward-compatible partition for auto and affinity partition objects.
-                class partition_type {
-                    size_t num_chunks;
-                    static const size_t VICTIM_CHUNKS = 4;
-
-                public:
-                    bool should_execute_range(const execution_data& ed) {
-                        if (num_chunks < VICTIM_CHUNKS && is_stolen_task(ed)) num_chunks = VICTIM_CHUNKS;
-                        return num_chunks == 1;
-                    }
-                    partition_type(const auto_partitioner&)
-                        : num_chunks(get_initial_auto_partitioner_divisor() * __TBB_INITIAL_CHUNKS / 4) {}
-                    partition_type(partition_type& pt, split) {
-                        num_chunks = pt.num_chunks = (pt.num_chunks + 1u) / 2u;
-                    }
-                };
-            };
-
-            //! A static partitioner
-            class static_partitioner {
-            public:
-                static_partitioner() {}
-
-            private:
-                template <typename Range, typename Body, typename Partitioner>
-                friend struct start_for;
-                template <typename Range, typename Body, typename Partitioner>
-                friend struct start_reduce;
-                template <typename Range, typename Body, typename Partitioner>
-                friend struct start_deterministic_reduce;
-                template <typename Range, typename Body, typename Partitioner>
-                friend struct start_scan;
-                // new implementation just extends existing interface
-                typedef static_partition_type task_partition_type;
-                // TODO: consider to make split_type public
-                typedef static_partition_type::split_type split_type;
-            };
-
-            //! An affinity partitioner
-            class affinity_partitioner : affinity_partitioner_base {
-            public:
-                affinity_partitioner() {}
-
-            private:
-                template <typename Range, typename Body, typename Partitioner>
-                friend struct start_for;
-                template <typename Range, typename Body, typename Partitioner>
-                friend struct start_reduce;
-                template <typename Range, typename Body, typename Partitioner>
-                friend struct start_deterministic_reduce;
-                template <typename Range, typename Body, typename Partitioner>
-                friend struct start_scan;
-                // new implementation just extends existing interface
-                typedef affinity_partition_type task_partition_type;
-                // TODO: consider to make split_type public
-                typedef affinity_partition_type::split_type split_type;
-            };
-
-        }// namespace d1
-    }    // namespace detail
-
-    inline namespace v1 {
-        // Partitioners
-        using detail::d1::affinity_partitioner;
-        using detail::d1::auto_partitioner;
-        using detail::d1::simple_partitioner;
-        using detail::d1::static_partitioner;
-        // Split types
-        using detail::proportional_split;
-        using detail::split;
-    }// namespace v1
-
-}// namespace tbb
+class auto_partitioner {
+public:
+    auto_partitioner() {}
+
+private:
+    template<typename Range, typename Body, typename Partitioner> friend struct start_for;
+    template<typename Range, typename Body, typename Partitioner> friend struct start_reduce;
+    template<typename Range, typename Body, typename Partitioner> friend struct start_deterministic_reduce;
+    template<typename Range, typename Body, typename Partitioner> friend struct start_scan;
+    // new implementation just extends existing interface
+    typedef auto_partition_type task_partition_type;
+    // TODO: consider to make split_type public
+    typedef auto_partition_type::split_type split_type;
+
+    //! Backward-compatible partition for auto and affinity partition objects.
+    class partition_type {
+        size_t num_chunks;
+        static const size_t VICTIM_CHUNKS = 4;
+        public:
+        bool should_execute_range(const execution_data& ed) {
+            if( num_chunks<VICTIM_CHUNKS && is_stolen_task(ed) )
+                num_chunks = VICTIM_CHUNKS;
+            return num_chunks==1;
+        }
+        partition_type( const auto_partitioner& )
+            : num_chunks(get_initial_auto_partitioner_divisor()*__TBB_INITIAL_CHUNKS/4) {}
+        partition_type( partition_type& pt, split ) {
+            num_chunks = pt.num_chunks = (pt.num_chunks+1u) / 2u;
+        }
+    };
+};
+
+//! A static partitioner
+class static_partitioner {
+public:
+    static_partitioner() {}
+private:
+    template<typename Range, typename Body, typename Partitioner> friend struct start_for;
+    template<typename Range, typename Body, typename Partitioner> friend struct start_reduce;
+    template<typename Range, typename Body, typename Partitioner> friend struct start_deterministic_reduce;
+    template<typename Range, typename Body, typename Partitioner> friend struct start_scan;
+    // new implementation just extends existing interface
+    typedef static_partition_type task_partition_type;
+    // TODO: consider to make split_type public
+    typedef static_partition_type::split_type split_type;
+};
+
+//! An affinity partitioner
+class affinity_partitioner : affinity_partitioner_base {
+public:
+    affinity_partitioner() {}
+
+private:
+    template<typename Range, typename Body, typename Partitioner> friend struct start_for;
+    template<typename Range, typename Body, typename Partitioner> friend struct start_reduce;
+    template<typename Range, typename Body, typename Partitioner> friend struct start_deterministic_reduce;
+    template<typename Range, typename Body, typename Partitioner> friend struct start_scan;
+    // new implementation just extends existing interface
+    typedef affinity_partition_type task_partition_type;
+    // TODO: consider to make split_type public
+    typedef affinity_partition_type::split_type split_type;
+};
+
+} // namespace d1
+} // namespace detail
+
+inline namespace v1 {
+// Partitioners
+using detail::d1::auto_partitioner;
+using detail::d1::simple_partitioner;
+using detail::d1::static_partitioner;
+using detail::d1::affinity_partitioner;
+// Split types
+using detail::split;
+using detail::proportional_split;
+} // namespace v1
+
+} // namespace tbb
 
 #if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
-#pragma warning(pop)
-#endif// warning 4244 is back
+    #pragma warning (pop)
+#endif // warning 4244 is back
 
 #undef __TBB_INITIAL_CHUNKS
 #undef __TBB_RANGE_POOL_CAPACITY
diff --git a/external/tbb/include/oneapi/tbb/profiling.h b/external/tbb/include/oneapi/tbb/profiling.h
index 8f3fa87f..412b5a35 100644
--- a/external/tbb/include/oneapi/tbb/profiling.h
+++ b/external/tbb/include/oneapi/tbb/profiling.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2023 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -23,233 +23,221 @@
 #include <string>
 
 namespace tbb {
-    namespace detail {
-        inline namespace d0 {
-// include list of index names
-#define TBB_STRING_RESOURCE(index_name, str) index_name,
-            enum string_resource_index : std::uintptr_t {
-#include "detail/_string_resource.h"
-                NUM_STRINGS
-            };
-#undef TBB_STRING_RESOURCE
-
-            enum itt_relation {
-                __itt_relation_is_unknown = 0,
-                __itt_relation_is_dependent_on, /**< "A is dependent on B" means that A cannot start until B completes */
-                __itt_relation_is_sibling_of, /**< "A is sibling of B" means that A and B were created as a group */
-                __itt_relation_is_parent_of, /**< "A is parent of B" means that A created B */
-                __itt_relation_is_continuation_of, /**< "A is continuation of B" means that A assumes the dependencies of B */
-                __itt_relation_is_child_of, /**< "A is child of B" means that A was created by B (inverse of is_parent_of) */
-                __itt_relation_is_continued_by, /**< "A is continued by B" means that B assumes the dependencies of A (inverse of is_continuation_of) */
-                __itt_relation_is_predecessor_to /**< "A is predecessor to B" means that B cannot start until A completes (inverse of is_dependent_on) */
-            };
+namespace detail {
+inline namespace d0 {
+    // include list of index names
+    #define TBB_STRING_RESOURCE(index_name,str) index_name,
+    enum string_resource_index : std::uintptr_t {
+        #include "detail/_string_resource.h"
+        NUM_STRINGS
+    };
+    #undef TBB_STRING_RESOURCE
+
+    enum itt_relation
+    {
+    __itt_relation_is_unknown = 0,
+    __itt_relation_is_dependent_on,         /**< "A is dependent on B" means that A cannot start until B completes */
+    __itt_relation_is_sibling_of,           /**< "A is sibling of B" means that A and B were created as a group */
+    __itt_relation_is_parent_of,            /**< "A is parent of B" means that A created B */
+    __itt_relation_is_continuation_of,      /**< "A is continuation of B" means that A assumes the dependencies of B */
+    __itt_relation_is_child_of,             /**< "A is child of B" means that A was created by B (inverse of is_parent_of) */
+    __itt_relation_is_continued_by,         /**< "A is continued by B" means that B assumes the dependencies of A (inverse of is_continuation_of) */
+    __itt_relation_is_predecessor_to        /**< "A is predecessor to B" means that B cannot start until A completes (inverse of is_dependent_on) */
+    };
 
 //! Unicode support
-#if (_WIN32 || _WIN64)
-            //! Unicode character type. Always wchar_t on Windows.
-            using tchar = wchar_t;
-#else  /* !WIN */
-            using tchar = char;
+#if (_WIN32||_WIN64)
+    //! Unicode character type. Always wchar_t on Windows.
+    using tchar = wchar_t;
+#else /* !WIN */
+    using tchar = char;
 #endif /* !WIN */
 
-        }// namespace d0
-    }    // namespace detail
-}// namespace tbb
+} // namespace d0
+} // namespace detail
+} // namespace tbb
 
 #include <atomic>
-#if _WIN32 || _WIN64
-#include <stdlib.h> /* mbstowcs_s */
+#if _WIN32||_WIN64
+#include <stdlib.h>  /* mbstowcs_s */
 #endif
 // Need these to work regardless of tools support
 namespace tbb {
-    namespace detail {
-        namespace d1 {
-            enum notify_type { prepare = 0, cancel, acquired, releasing, destroy };
-            enum itt_domain_enum {
-                ITT_DOMAIN_FLOW = 0,
-                ITT_DOMAIN_MAIN = 1,
-                ITT_DOMAIN_ALGO = 2,
-                ITT_NUM_DOMAINS
-            };
-        }// namespace d1
-
-        namespace r1 {
-            TBB_EXPORT void __TBB_EXPORTED_FUNC call_itt_notify(int t, void* ptr);
-            TBB_EXPORT void __TBB_EXPORTED_FUNC create_itt_sync(void* ptr, const tchar* objtype,
-                                                                const tchar* objname);
-            TBB_EXPORT void __TBB_EXPORTED_FUNC itt_make_task_group(d1::itt_domain_enum domain, void* group,
-                                                                    unsigned long long group_extra,
-                                                                    void* parent,
-                                                                    unsigned long long parent_extra,
-                                                                    string_resource_index name_index);
-            TBB_EXPORT void __TBB_EXPORTED_FUNC itt_task_begin(d1::itt_domain_enum domain, void* task,
-                                                               unsigned long long task_extra, void* parent,
-                                                               unsigned long long parent_extra,
-                                                               string_resource_index name_index);
-            TBB_EXPORT void __TBB_EXPORTED_FUNC itt_task_end(d1::itt_domain_enum domain);
-            TBB_EXPORT void __TBB_EXPORTED_FUNC itt_set_sync_name(void* obj, const tchar* name);
-            TBB_EXPORT void __TBB_EXPORTED_FUNC itt_metadata_str_add(d1::itt_domain_enum domain, void* addr,
-                                                                     unsigned long long addr_extra,
-                                                                     string_resource_index key,
-                                                                     const char* value);
-            TBB_EXPORT void __TBB_EXPORTED_FUNC itt_metadata_ptr_add(d1::itt_domain_enum domain, void* addr,
-                                                                     unsigned long long addr_extra,
-                                                                     string_resource_index key, void* value);
-            TBB_EXPORT void __TBB_EXPORTED_FUNC itt_relation_add(d1::itt_domain_enum domain, void* addr0,
-                                                                 unsigned long long addr0_extra,
-                                                                 itt_relation relation, void* addr1,
-                                                                 unsigned long long addr1_extra);
-            TBB_EXPORT void __TBB_EXPORTED_FUNC itt_region_begin(d1::itt_domain_enum domain, void* region,
-                                                                 unsigned long long region_extra,
-                                                                 void* parent,
-                                                                 unsigned long long parent_extra,
-                                                                 string_resource_index /* name_index */);
-            TBB_EXPORT void __TBB_EXPORTED_FUNC itt_region_end(d1::itt_domain_enum domain, void* region,
-                                                               unsigned long long region_extra);
-        }// namespace r1
-
-        namespace d1 {
-#if TBB_USE_PROFILING_TOOLS && (_WIN32 || _WIN64)
-            inline std::size_t multibyte_to_widechar(wchar_t* wcs, const char* mbs, std::size_t bufsize) {
-                std::size_t len;
-                mbstowcs_s(&len, wcs, bufsize, mbs, _TRUNCATE);
-                return len;// mbstowcs_s counts null terminator
-            }
+namespace detail {
+namespace d1 {
+    enum notify_type {prepare=0, cancel, acquired, releasing, destroy};
+    enum itt_domain_enum { ITT_DOMAIN_FLOW=0, ITT_DOMAIN_MAIN=1, ITT_DOMAIN_ALGO=2, ITT_NUM_DOMAINS };
+} // namespace d1
+
+namespace r1 {
+    TBB_EXPORT void __TBB_EXPORTED_FUNC call_itt_notify(int t, void* ptr);
+    TBB_EXPORT void __TBB_EXPORTED_FUNC create_itt_sync(void* ptr, const tchar* objtype, const tchar* objname);
+    TBB_EXPORT void __TBB_EXPORTED_FUNC itt_make_task_group(d1::itt_domain_enum domain, void* group, unsigned long long group_extra,
+        void* parent, unsigned long long parent_extra, string_resource_index name_index);
+    TBB_EXPORT void __TBB_EXPORTED_FUNC itt_task_begin(d1::itt_domain_enum domain, void* task, unsigned long long task_extra,
+        void* parent, unsigned long long parent_extra, string_resource_index name_index);
+    TBB_EXPORT void __TBB_EXPORTED_FUNC itt_task_end(d1::itt_domain_enum domain);
+    TBB_EXPORT void __TBB_EXPORTED_FUNC itt_set_sync_name(void* obj, const tchar* name);
+    TBB_EXPORT void __TBB_EXPORTED_FUNC itt_metadata_str_add(d1::itt_domain_enum domain, void* addr, unsigned long long addr_extra,
+        string_resource_index key, const char* value);
+    TBB_EXPORT void __TBB_EXPORTED_FUNC itt_metadata_ptr_add(d1::itt_domain_enum domain, void* addr, unsigned long long addr_extra,
+        string_resource_index key, void* value);
+    TBB_EXPORT void __TBB_EXPORTED_FUNC itt_relation_add(d1::itt_domain_enum domain, void* addr0, unsigned long long addr0_extra,
+        itt_relation relation, void* addr1, unsigned long long addr1_extra);
+    TBB_EXPORT void __TBB_EXPORTED_FUNC itt_region_begin(d1::itt_domain_enum domain, void* region, unsigned long long region_extra,
+        void* parent, unsigned long long parent_extra, string_resource_index /* name_index */);
+    TBB_EXPORT void __TBB_EXPORTED_FUNC itt_region_end(d1::itt_domain_enum domain, void* region, unsigned long long region_extra);
+} // namespace r1
+
+namespace d1 {
+#if TBB_USE_PROFILING_TOOLS && (_WIN32||_WIN64)
+    inline std::size_t multibyte_to_widechar(wchar_t* wcs, const char* mbs, std::size_t bufsize) {
+        std::size_t len;
+        mbstowcs_s(&len, wcs, bufsize, mbs, _TRUNCATE);
+        return len;   // mbstowcs_s counts null terminator
+    }
 #endif
 
 #if TBB_USE_PROFILING_TOOLS
-            inline void create_itt_sync(void* ptr, const char* objtype, const char* objname) {
-#if (_WIN32 || _WIN64)
-                std::size_t len_type = multibyte_to_widechar(nullptr, objtype, 0);
-                wchar_t* type = new wchar_t[len_type];
-                multibyte_to_widechar(type, objtype, len_type);
-                std::size_t len_name = multibyte_to_widechar(nullptr, objname, 0);
-                wchar_t* name = new wchar_t[len_name];
-                multibyte_to_widechar(name, objname, len_name);
-#else// WIN
-                const char* type = objtype;
-                const char* name = objname;
+    inline void create_itt_sync(void *ptr, const char *objtype, const char *objname) {
+#if (_WIN32||_WIN64)
+        std::size_t len_type = multibyte_to_widechar(nullptr, objtype, 0);
+        wchar_t *type = new wchar_t[len_type];
+        multibyte_to_widechar(type, objtype, len_type);
+        std::size_t len_name = multibyte_to_widechar(nullptr, objname, 0);
+        wchar_t *name = new wchar_t[len_name];
+        multibyte_to_widechar(name, objname, len_name);
+#else // WIN
+        const char *type = objtype;
+        const char *name = objname;
 #endif
-                r1::create_itt_sync(ptr, type, name);
+        r1::create_itt_sync(ptr, type, name);
 
-#if (_WIN32 || _WIN64)
-                delete[] type;
-                delete[] name;
-#endif// WIN
-            }
+#if (_WIN32||_WIN64)
+        delete[] type;
+        delete[] name;
+#endif // WIN
+    }
 
 // Distinguish notifications on task for reducing overheads
 #if TBB_USE_PROFILING_TOOLS == 2
-            inline void call_itt_task_notify(d1::notify_type t, void* ptr) {
-                r1::call_itt_notify((int) t, ptr);
-            }
+    inline void call_itt_task_notify(d1::notify_type t, void *ptr) {
+        r1::call_itt_notify(static_cast<int>(t), ptr);
+    }
 #else
-            inline void call_itt_task_notify(d1::notify_type, void*) {}
-#endif// TBB_USE_PROFILING_TOOLS
-
-            inline void call_itt_notify(d1::notify_type t, void* ptr) { r1::call_itt_notify((int) t, ptr); }
-
-#if (_WIN32 || _WIN64) && !__MINGW32__
-            inline void itt_set_sync_name(void* obj, const wchar_t* name) {
-                r1::itt_set_sync_name(obj, name);
-            }
-            inline void itt_set_sync_name(void* obj, const char* name) {
-                std::size_t len_name = multibyte_to_widechar(nullptr, name, 0);
-                wchar_t* obj_name = new wchar_t[len_name];
-                multibyte_to_widechar(obj_name, name, len_name);
-                r1::itt_set_sync_name(obj, obj_name);
-                delete[] obj_name;
-            }
+    inline void call_itt_task_notify(d1::notify_type, void *) {}
+#endif // TBB_USE_PROFILING_TOOLS
+
+    inline void call_itt_notify(d1::notify_type t, void *ptr) {
+        r1::call_itt_notify(static_cast<int>(t), ptr);
+    }
+
+#if (_WIN32||_WIN64) && !__MINGW32__
+    inline void itt_set_sync_name(void* obj, const wchar_t* name) {
+        r1::itt_set_sync_name(obj, name);
+    }
+    inline void itt_set_sync_name(void* obj, const char* name) {
+        std::size_t len_name = multibyte_to_widechar(nullptr, name, 0);
+        wchar_t *obj_name = new wchar_t[len_name];
+        multibyte_to_widechar(obj_name, name, len_name);
+        r1::itt_set_sync_name(obj, obj_name);
+        delete[] obj_name;
+    }
 #else
-            inline void itt_set_sync_name(void* obj, const char* name) { r1::itt_set_sync_name(obj, name); }
-#endif//WIN
-
-            inline void itt_make_task_group(itt_domain_enum domain, void* group,
-                                            unsigned long long group_extra, void* parent,
-                                            unsigned long long parent_extra,
-                                            string_resource_index name_index) {
-                r1::itt_make_task_group(domain, group, group_extra, parent, parent_extra, name_index);
-            }
-
-            inline void itt_metadata_str_add(itt_domain_enum domain, void* addr,
-                                             unsigned long long addr_extra, string_resource_index key,
-                                             const char* value) {
-                r1::itt_metadata_str_add(domain, addr, addr_extra, key, value);
-            }
-
-            inline void register_node_addr(itt_domain_enum domain, void* addr, unsigned long long addr_extra,
-                                           string_resource_index key, void* value) {
-                r1::itt_metadata_ptr_add(domain, addr, addr_extra, key, value);
-            }
-
-            inline void itt_relation_add(itt_domain_enum domain, void* addr0, unsigned long long addr0_extra,
-                                         itt_relation relation, void* addr1, unsigned long long addr1_extra) {
-                r1::itt_relation_add(domain, addr0, addr0_extra, relation, addr1, addr1_extra);
-            }
-
-            inline void itt_task_begin(itt_domain_enum domain, void* task, unsigned long long task_extra,
-                                       void* parent, unsigned long long parent_extra,
-                                       string_resource_index name_index) {
-                r1::itt_task_begin(domain, task, task_extra, parent, parent_extra, name_index);
-            }
-
-            inline void itt_task_end(itt_domain_enum domain) { r1::itt_task_end(domain); }
-
-            inline void itt_region_begin(itt_domain_enum domain, void* region,
-                                         unsigned long long region_extra, void* parent,
-                                         unsigned long long parent_extra, string_resource_index name_index) {
-                r1::itt_region_begin(domain, region, region_extra, parent, parent_extra, name_index);
-            }
-
-            inline void itt_region_end(itt_domain_enum domain, void* region,
-                                       unsigned long long region_extra) {
-                r1::itt_region_end(domain, region, region_extra);
-            }
+    inline void itt_set_sync_name( void* obj, const char* name) {
+        r1::itt_set_sync_name(obj, name);
+    }
+#endif //WIN
+
+    inline void itt_make_task_group(itt_domain_enum domain, void* group, unsigned long long group_extra,
+        void* parent, unsigned long long parent_extra, string_resource_index name_index) {
+        r1::itt_make_task_group(domain, group, group_extra, parent, parent_extra, name_index);
+    }
+
+    inline void itt_metadata_str_add( itt_domain_enum domain, void *addr, unsigned long long addr_extra,
+                                        string_resource_index key, const char *value ) {
+        r1::itt_metadata_str_add( domain, addr, addr_extra, key, value );
+    }
+
+    inline void register_node_addr(itt_domain_enum domain, void *addr, unsigned long long addr_extra,
+        string_resource_index key, void *value) {
+        r1::itt_metadata_ptr_add(domain, addr, addr_extra, key, value);
+    }
+
+    inline void itt_relation_add( itt_domain_enum domain, void *addr0, unsigned long long addr0_extra,
+                                    itt_relation relation, void *addr1, unsigned long long addr1_extra ) {
+        r1::itt_relation_add( domain, addr0, addr0_extra, relation, addr1, addr1_extra );
+    }
+
+    inline void itt_task_begin( itt_domain_enum domain, void *task, unsigned long long task_extra,
+                                                    void *parent, unsigned long long parent_extra, string_resource_index name_index ) {
+        r1::itt_task_begin( domain, task, task_extra, parent, parent_extra, name_index );
+    }
+
+    inline void itt_task_end( itt_domain_enum domain ) {
+        r1::itt_task_end( domain );
+    }
+
+    inline void itt_region_begin( itt_domain_enum domain, void *region, unsigned long long region_extra,
+                                    void *parent, unsigned long long parent_extra, string_resource_index name_index ) {
+        r1::itt_region_begin( domain, region, region_extra, parent, parent_extra, name_index );
+    }
+
+    inline void itt_region_end( itt_domain_enum domain, void *region, unsigned long long region_extra  ) {
+        r1::itt_region_end( domain, region, region_extra );
+    }
 #else
-            inline void create_itt_sync(void* /*ptr*/, const char* /*objtype*/, const char* /*objname*/) {}
+    inline void create_itt_sync(void* /*ptr*/, const char* /*objtype*/, const char* /*objname*/) {}
 
-            inline void call_itt_notify(notify_type /*t*/, void* /*ptr*/) {}
+    inline void call_itt_notify(notify_type /*t*/, void* /*ptr*/) {}
 
-            inline void call_itt_task_notify(notify_type /*t*/, void* /*ptr*/) {}
-#endif// TBB_USE_PROFILING_TOOLS
+    inline void call_itt_task_notify(notify_type /*t*/, void* /*ptr*/) {}
+#endif // TBB_USE_PROFILING_TOOLS
 
 #if TBB_USE_PROFILING_TOOLS && !(TBB_USE_PROFILING_TOOLS == 2)
-            class event {
-                /** This class supports user event traces through itt.
+class event {
+/** This class supports user event traces through itt.
     Common use-case is tagging data flow graph tasks (data-id)
     and visualization by Intel Advisor Flow Graph Analyzer (FGA)  **/
-                //  TODO: Replace implementation by itt user event api.
+//  TODO: Replace implementation by itt user event api.
 
-                const std::string my_name;
+    const std::string my_name;
 
-                static void emit_trace(const std::string& input) {
-                    itt_metadata_str_add(ITT_DOMAIN_FLOW, NULL, FLOW_NULL, USER_EVENT,
-                                         ("FGA::DATAID::" + input).c_str());
-                }
+    static void emit_trace(const std::string &input) {
+        itt_metadata_str_add( ITT_DOMAIN_FLOW, nullptr, FLOW_NULL, USER_EVENT, ( "FGA::DATAID::" + input ).c_str() );
+    }
 
-            public:
-                event(const std::string& input) : my_name(input) {}
+public:
+    event(const std::string &input)
+              : my_name( input )
+    { }
 
-                void emit() { emit_trace(my_name); }
+    void emit() {
+        emit_trace(my_name);
+    }
 
-                static void emit(const std::string& description) { emit_trace(description); }
-            };
-#else    // TBB_USE_PROFILING_TOOLS && !(TBB_USE_PROFILING_TOOLS == 2)
-            // Using empty struct if user event tracing is disabled:
-            struct event {
-                event(const std::string&) {}
+    static void emit(const std::string &description) {
+        emit_trace(description);
+    }
 
-                void emit() {}
+};
+#else // TBB_USE_PROFILING_TOOLS && !(TBB_USE_PROFILING_TOOLS == 2)
+// Using empty struct if user event tracing is disabled:
+struct event {
+    event(const std::string &) { }
 
-                static void emit(const std::string&) {}
-            };
-#endif   // TBB_USE_PROFILING_TOOLS && !(TBB_USE_PROFILING_TOOLS == 2)
-        }// namespace d1
-    }    // namespace detail
+    void emit() { }
+
+    static void emit(const std::string &) { }
+};
+#endif // TBB_USE_PROFILING_TOOLS && !(TBB_USE_PROFILING_TOOLS == 2)
+} // namespace d1
+} // namespace detail
+
+namespace profiling {
+    using detail::d1::event;
+}
+} // namespace tbb
 
-    namespace profiling {
-        using detail::d1::event;
-    }
-}// namespace tbb
 
 #endif /* __TBB_profiling_H */
diff --git a/external/tbb/include/oneapi/tbb/queuing_mutex.h b/external/tbb/include/oneapi/tbb/queuing_mutex.h
index 7e73a193..f7ee5a94 100644
--- a/external/tbb/include/oneapi/tbb/queuing_mutex.h
+++ b/external/tbb/include/oneapi/tbb/queuing_mutex.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -17,164 +17,176 @@
 #ifndef __TBB_queuing_mutex_H
 #define __TBB_queuing_mutex_H
 
-#include "detail/_assert.h"
-#include "detail/_mutex_common.h"
 #include "detail/_namespace_injection.h"
+#include "detail/_assert.h"
 #include "detail/_utils.h"
+#include "detail/_mutex_common.h"
 
 #include "profiling.h"
 
 #include <atomic>
 
 namespace tbb {
-    namespace detail {
-        namespace d1 {
-
-            //! Queuing mutex with local-only spinning.
-            /** @ingroup synchronization */
-            class queuing_mutex {
-            public:
-                //! Construct unacquired mutex.
-                queuing_mutex() noexcept { create_itt_sync(this, "tbb::queuing_mutex", ""); };
-
-                queuing_mutex(const queuing_mutex&) = delete;
-                queuing_mutex& operator=(const queuing_mutex&) = delete;
-
-                //! The scoped locking pattern
-                /** It helps to avoid the common problem of forgetting to release lock.
+namespace detail {
+namespace d1 {
+
+//! Queuing mutex with local-only spinning.
+/** @ingroup synchronization */
+class queuing_mutex {
+public:
+    //! Construct unacquired mutex.
+    queuing_mutex() noexcept  {
+        create_itt_sync(this, "tbb::queuing_mutex", "");
+    };
+
+    queuing_mutex(const queuing_mutex&) = delete;
+    queuing_mutex& operator=(const queuing_mutex&) = delete;
+
+    //! The scoped locking pattern
+    /** It helps to avoid the common problem of forgetting to release lock.
         It also nicely provides the "node" for queuing locks. */
-                class scoped_lock {
-                    //! Reset fields to mean "no lock held".
-                    void reset() { m_mutex = nullptr; }
-
-                public:
-                    //! Construct lock that has not acquired a mutex.
-                    /** Equivalent to zero-initialization of *this. */
-                    scoped_lock() = default;
-
-                    //! Acquire lock on given mutex.
-                    scoped_lock(queuing_mutex& m) { acquire(m); }
-
-                    //! Release lock (if lock is held).
-                    ~scoped_lock() {
-                        if (m_mutex) release();
-                    }
-
-                    //! No Copy
-                    scoped_lock(const scoped_lock&) = delete;
-                    scoped_lock& operator=(const scoped_lock&) = delete;
-
-                    //! Acquire lock on given mutex.
-                    void acquire(queuing_mutex& m) {
-                        __TBB_ASSERT(!m_mutex, "scoped_lock is already holding a mutex");
-
-                        // Must set all fields before the exchange, because once the
-                        // exchange executes, *this becomes accessible to other threads.
-                        m_mutex = &m;
-                        m_next.store(nullptr, std::memory_order_relaxed);
-                        m_going.store(0U, std::memory_order_relaxed);
-
-                        // x86 compare exchange operation always has a strong fence
-                        // "sending" the fields initialized above to other processors.
-                        scoped_lock* pred = m.q_tail.exchange(this);
-                        if (pred) {
-                            call_itt_notify(prepare, &m);
-                            __TBB_ASSERT(pred->m_next.load(std::memory_order_relaxed) == nullptr,
-                                         "the predecessor has another successor!");
-
-                            pred->m_next.store(this, std::memory_order_release);
-                            spin_wait_while_eq(m_going, 0U);
-                        }
-                        call_itt_notify(acquired, &m);
-                    }
-
-                    //! Acquire lock on given mutex if free (i.e. non-blocking)
-                    bool try_acquire(queuing_mutex& m) {
-                        __TBB_ASSERT(!m_mutex, "scoped_lock is already holding a mutex");
-
-                        // Must set all fields before the compare_exchange_strong, because once the
-                        // compare_exchange_strong executes, *this becomes accessible to other threads.
-                        m_next.store(nullptr, std::memory_order_relaxed);
-                        m_going.store(0U, std::memory_order_relaxed);
-
-                        scoped_lock* expected = nullptr;
-                        // The compare_exchange_strong must have release semantics, because we are
-                        // "sending" the fields initialized above to other processors.
-                        // x86 compare exchange operation always has a strong fence
-                        if (!m.q_tail.compare_exchange_strong(expected, this, std::memory_order_acq_rel))
-                            return false;
-
-                        m_mutex = &m;
-
-                        call_itt_notify(acquired, &m);
-                        return true;
-                    }
-
-                    //! Release lock.
-                    void release() {
-                        __TBB_ASSERT(this->m_mutex, "no lock acquired");
-
-                        call_itt_notify(releasing, this->m_mutex);
-
-                        if (m_next.load(std::memory_order_relaxed) == nullptr) {
-                            scoped_lock* expected = this;
-                            if (m_mutex->q_tail.compare_exchange_strong(expected, nullptr)) {
-                                // this was the only item in the queue, and the queue is now empty.
-                                reset();
-                                return;
-                            }
-                            // Someone in the queue
-                            spin_wait_while_eq(m_next, nullptr);
-                        }
-                        m_next.load(std::memory_order_acquire)->m_going.store(1U, std::memory_order_release);
-
-                        reset();
-                    }
-
-                private:
-                    //! The pointer to the mutex owned, or NULL if not holding a mutex.
-                    queuing_mutex* m_mutex {nullptr};
-
-                    //! The pointer to the next competitor for a mutex
-                    std::atomic<scoped_lock*> m_next {nullptr};
-
-                    //! The local spin-wait variable
-                    /** Inverted (0 - blocked, 1 - acquired the mutex) for the sake of
+    class scoped_lock {
+        //! Reset fields to mean "no lock held".
+        void reset() {
+            m_mutex = nullptr;
+        }
+
+    public:
+        //! Construct lock that has not acquired a mutex.
+        /** Equivalent to zero-initialization of *this. */
+        scoped_lock() = default;
+
+        //! Acquire lock on given mutex.
+        scoped_lock(queuing_mutex& m) {
+            acquire(m);
+        }
+
+        //! Release lock (if lock is held).
+        ~scoped_lock() {
+            if (m_mutex) release();
+        }
+
+        //! No Copy
+        scoped_lock( const scoped_lock& ) = delete;
+        scoped_lock& operator=( const scoped_lock& ) = delete;
+
+        //! Acquire lock on given mutex.
+        void acquire( queuing_mutex& m ) {
+            __TBB_ASSERT(!m_mutex, "scoped_lock is already holding a mutex");
+
+            // Must set all fields before the exchange, because once the
+            // exchange executes, *this becomes accessible to other threads.
+            m_mutex = &m;
+            m_next.store(nullptr, std::memory_order_relaxed);
+            m_going.store(0U, std::memory_order_relaxed);
+
+            // x86 compare exchange operation always has a strong fence
+            // "sending" the fields initialized above to other processors.
+            scoped_lock* pred = m.q_tail.exchange(this);
+            if (pred) {
+                call_itt_notify(prepare, &m);
+                __TBB_ASSERT(pred->m_next.load(std::memory_order_relaxed) == nullptr, "the predecessor has another successor!");
+
+                pred->m_next.store(this, std::memory_order_release);
+                spin_wait_while_eq(m_going, 0U);
+            }
+            call_itt_notify(acquired, &m);
+
+        }
+
+        //! Acquire lock on given mutex if free (i.e. non-blocking)
+        bool try_acquire( queuing_mutex& m ) {
+            __TBB_ASSERT(!m_mutex, "scoped_lock is already holding a mutex");
+
+            // Must set all fields before the compare_exchange_strong, because once the
+            // compare_exchange_strong executes, *this becomes accessible to other threads.
+            m_next.store(nullptr, std::memory_order_relaxed);
+            m_going.store(0U, std::memory_order_relaxed);
+
+            scoped_lock* expected = nullptr;
+            // The compare_exchange_strong must have release semantics, because we are
+            // "sending" the fields initialized above to other processors.
+            // x86 compare exchange operation always has a strong fence
+            if (!m.q_tail.compare_exchange_strong(expected, this, std::memory_order_acq_rel))
+                return false;
+
+            m_mutex = &m;
+
+            call_itt_notify(acquired, &m);
+            return true;
+        }
+
+        //! Release lock.
+        void release()
+        {
+            __TBB_ASSERT(this->m_mutex, "no lock acquired");
+
+            call_itt_notify(releasing, this->m_mutex);
+
+            if (m_next.load(std::memory_order_relaxed) == nullptr) {
+                scoped_lock* expected = this;
+                if (m_mutex->q_tail.compare_exchange_strong(expected, nullptr)) {
+                    // this was the only item in the queue, and the queue is now empty.
+                    reset();
+                    return;
+                }
+                // Someone in the queue
+                spin_wait_while_eq(m_next, nullptr);
+            }
+            m_next.load(std::memory_order_acquire)->m_going.store(1U, std::memory_order_release);
+
+            reset();
+        }
+
+    private:
+        //! The pointer to the mutex owned, or nullptr if not holding a mutex.
+        queuing_mutex* m_mutex{nullptr};
+
+        //! The pointer to the next competitor for a mutex
+        std::atomic<scoped_lock*> m_next{nullptr};
+
+        //! The local spin-wait variable
+        /** Inverted (0 - blocked, 1 - acquired the mutex) for the sake of
             zero-initialization.  Defining it as an entire word instead of
             a byte seems to help performance slightly. */
-                    std::atomic<uintptr_t> m_going {0U};
-                };
+        std::atomic<uintptr_t> m_going{0U};
+    };
+
+    // Mutex traits
+    static constexpr bool is_rw_mutex = false;
+    static constexpr bool is_recursive_mutex = false;
+    static constexpr bool is_fair_mutex = true;
 
-                // Mutex traits
-                static constexpr bool is_rw_mutex = false;
-                static constexpr bool is_recursive_mutex = false;
-                static constexpr bool is_fair_mutex = true;
+private:
+    //! The last competitor requesting the lock
+    std::atomic<scoped_lock*> q_tail{nullptr};
 
-            private:
-                //! The last competitor requesting the lock
-                std::atomic<scoped_lock*> q_tail {nullptr};
-            };
+};
 
 #if TBB_USE_PROFILING_TOOLS
-            inline void set_name(queuing_mutex& obj, const char* name) { itt_set_sync_name(&obj, name); }
-#if (_WIN32 || _WIN64)
-            inline void set_name(queuing_mutex& obj, const wchar_t* name) { itt_set_sync_name(&obj, name); }
-#endif//WIN
+inline void set_name(queuing_mutex& obj, const char* name) {
+    itt_set_sync_name(&obj, name);
+}
+#if (_WIN32||_WIN64)
+inline void set_name(queuing_mutex& obj, const wchar_t* name) {
+    itt_set_sync_name(&obj, name);
+}
+#endif //WIN
 #else
-            inline void set_name(queuing_mutex&, const char*) {}
-#if (_WIN32 || _WIN64)
-            inline void set_name(queuing_mutex&, const wchar_t*) {}
-#endif//WIN
+inline void set_name(queuing_mutex&, const char*) {}
+#if (_WIN32||_WIN64)
+inline void set_name(queuing_mutex&, const wchar_t*) {}
+#endif //WIN
 #endif
-        }// namespace d1
-    }    // namespace detail
-
-    inline namespace v1 {
-        using detail::d1::queuing_mutex;
-    }// namespace v1
-    namespace profiling {
-        using detail::d1::set_name;
-    }
-}// namespace tbb
+} // namespace d1
+} // namespace detail
+
+inline namespace v1 {
+using detail::d1::queuing_mutex;
+} // namespace v1
+namespace profiling {
+    using detail::d1::set_name;
+}
+} // namespace tbb
 
 #endif /* __TBB_queuing_mutex_H */
diff --git a/external/tbb/include/oneapi/tbb/queuing_rw_mutex.h b/external/tbb/include/oneapi/tbb/queuing_rw_mutex.h
index ef55c042..f8325dfd 100644
--- a/external/tbb/include/oneapi/tbb/queuing_rw_mutex.h
+++ b/external/tbb/include/oneapi/tbb/queuing_rw_mutex.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -17,186 +17,191 @@
 #ifndef __TBB_queuing_rw_mutex_H
 #define __TBB_queuing_rw_mutex_H
 
-#include "detail/_assert.h"
 #include "detail/_config.h"
-#include "detail/_mutex_common.h"
 #include "detail/_namespace_injection.h"
+#include "detail/_assert.h"
+#include "detail/_mutex_common.h"
 
 #include "profiling.h"
 
-#include <atomic>
 #include <cstring>
+#include <atomic>
 
 namespace tbb {
-    namespace detail {
-        namespace r1 {
-            struct queuing_rw_mutex_impl;
-        }
-        namespace d1 {
-
-            //! Queuing reader-writer mutex with local-only spinning.
-            /** Adapted from Krieger, Stumm, et al. pseudocode at
+namespace detail {
+namespace r1 {
+struct queuing_rw_mutex_impl;
+}
+namespace d1 {
+
+//! Queuing reader-writer mutex with local-only spinning.
+/** Adapted from Krieger, Stumm, et al. pseudocode at
     https://www.researchgate.net/publication/221083709_A_Fair_Fast_Scalable_Reader-Writer_Lock
     @ingroup synchronization */
-            class queuing_rw_mutex {
-                friend r1::queuing_rw_mutex_impl;
-
-            public:
-                //! Construct unacquired mutex.
-                queuing_rw_mutex() noexcept { create_itt_sync(this, "tbb::queuing_rw_mutex", ""); }
+class queuing_rw_mutex {
+    friend r1::queuing_rw_mutex_impl;
+public:
+    //! Construct unacquired mutex.
+    queuing_rw_mutex() noexcept  {
+        create_itt_sync(this, "tbb::queuing_rw_mutex", "");
+    }
 
-                //! Destructor asserts if the mutex is acquired, i.e. q_tail is non-NULL
-                ~queuing_rw_mutex() {
-                    __TBB_ASSERT(q_tail.load(std::memory_order_relaxed) == nullptr,
-                                 "destruction of an acquired mutex");
-                }
+    //! Destructor asserts if the mutex is acquired, i.e. q_tail is non-null
+    ~queuing_rw_mutex() {
+        __TBB_ASSERT(q_tail.load(std::memory_order_relaxed) == nullptr, "destruction of an acquired mutex");
+    }
 
-                //! No Copy
-                queuing_rw_mutex(const queuing_rw_mutex&) = delete;
-                queuing_rw_mutex& operator=(const queuing_rw_mutex&) = delete;
+    //! No Copy
+    queuing_rw_mutex(const queuing_rw_mutex&) = delete;
+    queuing_rw_mutex& operator=(const queuing_rw_mutex&) = delete;
 
-                //! The scoped locking pattern
-                /** It helps to avoid the common problem of forgetting to release lock.
+    //! The scoped locking pattern
+    /** It helps to avoid the common problem of forgetting to release lock.
         It also nicely provides the "node" for queuing locks. */
-                class scoped_lock {
-                    friend r1::queuing_rw_mutex_impl;
-                    //! Initialize fields to mean "no lock held".
-                    void initialize() {
-                        my_mutex = nullptr;
-                        my_internal_lock.store(0, std::memory_order_relaxed);
-                        my_going.store(0, std::memory_order_relaxed);
+    class scoped_lock {
+        friend r1::queuing_rw_mutex_impl;
+        //! Initialize fields to mean "no lock held".
+        void initialize() {
+            my_mutex = nullptr;
+            my_internal_lock.store(0, std::memory_order_relaxed);
+            my_going.store(0, std::memory_order_relaxed);
 #if TBB_USE_ASSERT
-                        my_state = 0xFF;// Set to invalid state
-                        my_next.store(reinterpret_cast<uintptr_t>(reinterpret_cast<void*>(-1)),
-                                      std::memory_order_relaxed);
-                        my_prev.store(reinterpret_cast<uintptr_t>(reinterpret_cast<void*>(-1)),
-                                      std::memory_order_relaxed);
+            my_state = 0xFF; // Set to invalid state
+            my_next.store(reinterpret_cast<uintptr_t>(reinterpret_cast<void*>(-1)), std::memory_order_relaxed);
+            my_prev.store(reinterpret_cast<uintptr_t>(reinterpret_cast<void*>(-1)), std::memory_order_relaxed);
 #endif /* TBB_USE_ASSERT */
-                    }
+        }
 
-                public:
-                    //! Construct lock that has not acquired a mutex.
-                    /** Equivalent to zero-initialization of *this. */
-                    scoped_lock() { initialize(); }
+    public:
+        //! Construct lock that has not acquired a mutex.
+        /** Equivalent to zero-initialization of *this. */
+        scoped_lock() {initialize();}
 
-                    //! Acquire lock on given mutex.
-                    scoped_lock(queuing_rw_mutex& m, bool write = true) {
-                        initialize();
-                        acquire(m, write);
-                    }
+        //! Acquire lock on given mutex.
+        scoped_lock( queuing_rw_mutex& m, bool write=true ) {
+            initialize();
+            acquire(m,write);
+        }
 
-                    //! Release lock (if lock is held).
-                    ~scoped_lock() {
-                        if (my_mutex) release();
-                    }
+        //! Release lock (if lock is held).
+        ~scoped_lock() {
+            if( my_mutex ) release();
+        }
 
-                    //! No Copy
-                    scoped_lock(const scoped_lock&) = delete;
-                    scoped_lock& operator=(const scoped_lock&) = delete;
+        //! No Copy
+        scoped_lock(const scoped_lock&) = delete;
+        scoped_lock& operator=(const scoped_lock&) = delete;
 
-                    //! Acquire lock on given mutex.
-                    void acquire(queuing_rw_mutex& m, bool write = true);
+        //! Acquire lock on given mutex.
+        void acquire( queuing_rw_mutex& m, bool write=true );
 
-                    //! Acquire lock on given mutex if free (i.e. non-blocking)
-                    bool try_acquire(queuing_rw_mutex& m, bool write = true);
+        //! Acquire lock on given mutex if free (i.e. non-blocking)
+        bool try_acquire( queuing_rw_mutex& m, bool write=true );
 
-                    //! Release lock.
-                    void release();
+        //! Release lock.
+        void release();
 
-                    //! Upgrade reader to become a writer.
-                    /** Returns whether the upgrade happened without releasing and re-acquiring the lock */
-                    bool upgrade_to_writer();
+        //! Upgrade reader to become a writer.
+        /** Returns whether the upgrade happened without releasing and re-acquiring the lock */
+        bool upgrade_to_writer();
 
-                    //! Downgrade writer to become a reader.
-                    bool downgrade_to_reader();
+        //! Downgrade writer to become a reader.
+        bool downgrade_to_reader();
 
-                    bool is_writer() const;
+        bool is_writer() const;
 
-                private:
-                    //! The pointer to the mutex owned, or NULL if not holding a mutex.
-                    queuing_rw_mutex* my_mutex;
+    private:
+        //! The pointer to the mutex owned, or nullptr if not holding a mutex.
+        queuing_rw_mutex* my_mutex;
 
-                    //! The 'pointer' to the previous and next competitors for a mutex
-                    std::atomic<uintptr_t> my_prev;
-                    std::atomic<uintptr_t> my_next;
+        //! The 'pointer' to the previous and next competitors for a mutex
+        std::atomic<uintptr_t> my_prev;
+        std::atomic<uintptr_t> my_next;
 
-                    using state_t = unsigned char;
+        using state_t = unsigned char ;
 
-                    //! State of the request: reader, writer, active reader, other service states
-                    std::atomic<state_t> my_state;
+        //! State of the request: reader, writer, active reader, other service states
+        std::atomic<state_t> my_state;
 
-                    //! The local spin-wait variable
-                    /** Corresponds to "spin" in the pseudocode but inverted for the sake of zero-initialization */
-                    std::atomic<unsigned char> my_going;
+        //! The local spin-wait variable
+        /** Corresponds to "spin" in the pseudocode but inverted for the sake of zero-initialization */
+        std::atomic<unsigned char> my_going;
 
-                    //! A tiny internal lock
-                    std::atomic<unsigned char> my_internal_lock;
-                };
+        //! A tiny internal lock
+        std::atomic<unsigned char> my_internal_lock;
+    };
 
-                // Mutex traits
-                static constexpr bool is_rw_mutex = true;
-                static constexpr bool is_recursive_mutex = false;
-                static constexpr bool is_fair_mutex = true;
+    // Mutex traits
+    static constexpr bool is_rw_mutex = true;
+    static constexpr bool is_recursive_mutex = false;
+    static constexpr bool is_fair_mutex = true;
 
-            private:
-                //! The last competitor requesting the lock
-                std::atomic<scoped_lock*> q_tail {nullptr};
-            };
+private:
+    //! The last competitor requesting the lock
+    std::atomic<scoped_lock*> q_tail{nullptr};
+};
 #if TBB_USE_PROFILING_TOOLS
-            inline void set_name(queuing_rw_mutex& obj, const char* name) { itt_set_sync_name(&obj, name); }
-#if (_WIN32 || _WIN64)
-            inline void set_name(queuing_rw_mutex& obj, const wchar_t* name) {
-                itt_set_sync_name(&obj, name);
-            }
-#endif//WIN
+inline void set_name(queuing_rw_mutex& obj, const char* name) {
+    itt_set_sync_name(&obj, name);
+}
+#if (_WIN32||_WIN64)
+inline void set_name(queuing_rw_mutex& obj, const wchar_t* name) {
+    itt_set_sync_name(&obj, name);
+}
+#endif //WIN
 #else
-            inline void set_name(queuing_rw_mutex&, const char*) {}
-#if (_WIN32 || _WIN64)
-            inline void set_name(queuing_rw_mutex&, const wchar_t*) {}
-#endif//WIN
+inline void set_name(queuing_rw_mutex&, const char*) {}
+#if (_WIN32||_WIN64)
+inline void set_name(queuing_rw_mutex&, const wchar_t*) {}
+#endif //WIN
 #endif
-        }// namespace d1
-
-        namespace r1 {
-            TBB_EXPORT void acquire(d1::queuing_rw_mutex&, d1::queuing_rw_mutex::scoped_lock&, bool);
-            TBB_EXPORT bool try_acquire(d1::queuing_rw_mutex&, d1::queuing_rw_mutex::scoped_lock&, bool);
-            TBB_EXPORT void release(d1::queuing_rw_mutex::scoped_lock&);
-            TBB_EXPORT bool upgrade_to_writer(d1::queuing_rw_mutex::scoped_lock&);
-            TBB_EXPORT bool downgrade_to_reader(d1::queuing_rw_mutex::scoped_lock&);
-            TBB_EXPORT bool is_writer(const d1::queuing_rw_mutex::scoped_lock&);
-        }// namespace r1
-
-        namespace d1 {
-
-            inline void queuing_rw_mutex::scoped_lock::acquire(queuing_rw_mutex& m, bool write) {
-                r1::acquire(m, *this, write);
-            }
-
-            inline bool queuing_rw_mutex::scoped_lock::try_acquire(queuing_rw_mutex& m, bool write) {
-                return r1::try_acquire(m, *this, write);
-            }
-
-            inline void queuing_rw_mutex::scoped_lock::release() { r1::release(*this); }
-
-            inline bool queuing_rw_mutex::scoped_lock::upgrade_to_writer() {
-                return r1::upgrade_to_writer(*this);
-            }
-
-            inline bool queuing_rw_mutex::scoped_lock::downgrade_to_reader() {
-                return r1::downgrade_to_reader(*this);
-            }
-
-            inline bool queuing_rw_mutex::scoped_lock::is_writer() const { return r1::is_writer(*this); }
-        }// namespace d1
-
-    }// namespace detail
-
-    inline namespace v1 {
-        using detail::d1::queuing_rw_mutex;
-    }// namespace v1
-    namespace profiling {
-        using detail::d1::set_name;
-    }
-}// namespace tbb
+} // namespace d1
+
+namespace r1 {
+TBB_EXPORT void acquire(d1::queuing_rw_mutex&, d1::queuing_rw_mutex::scoped_lock&, bool);
+TBB_EXPORT bool try_acquire(d1::queuing_rw_mutex&, d1::queuing_rw_mutex::scoped_lock&, bool);
+TBB_EXPORT void release(d1::queuing_rw_mutex::scoped_lock&);
+TBB_EXPORT bool upgrade_to_writer(d1::queuing_rw_mutex::scoped_lock&);
+TBB_EXPORT bool downgrade_to_reader(d1::queuing_rw_mutex::scoped_lock&);
+TBB_EXPORT bool is_writer(const d1::queuing_rw_mutex::scoped_lock&);
+} // namespace r1
+
+namespace d1 {
+
+
+inline void queuing_rw_mutex::scoped_lock::acquire(queuing_rw_mutex& m,bool write) {
+    r1::acquire(m, *this, write);
+}
+
+inline bool queuing_rw_mutex::scoped_lock::try_acquire(queuing_rw_mutex& m, bool write) {
+    return r1::try_acquire(m, *this, write);
+}
+
+inline void queuing_rw_mutex::scoped_lock::release() {
+    r1::release(*this);
+}
+
+inline bool queuing_rw_mutex::scoped_lock::upgrade_to_writer() {
+    return r1::upgrade_to_writer(*this);
+}
+
+inline bool queuing_rw_mutex::scoped_lock::downgrade_to_reader() {
+    return r1::downgrade_to_reader(*this);
+}
+
+inline bool queuing_rw_mutex::scoped_lock::is_writer() const {
+    return r1::is_writer(*this);
+}
+} // namespace d1
+
+} // namespace detail
+
+inline namespace v1 {
+using detail::d1::queuing_rw_mutex;
+} // namespace v1
+namespace profiling {
+    using detail::d1::set_name;
+}
+} // namespace tbb
 
 #endif /* __TBB_queuing_rw_mutex_H */
diff --git a/external/tbb/include/oneapi/tbb/rw_mutex.h b/external/tbb/include/oneapi/tbb/rw_mutex.h
index 4b826904..c3fbaf65 100644
--- a/external/tbb/include/oneapi/tbb/rw_mutex.h
+++ b/external/tbb/include/oneapi/tbb/rw_mutex.h
@@ -17,210 +17,200 @@
 #ifndef __TBB_rw_mutex_H
 #define __TBB_rw_mutex_H
 
-#if __TBB_PREVIEW_MUTEXES
-
-#include "detail/_mutex_common.h"
 #include "detail/_namespace_injection.h"
-#include "detail/_scoped_lock.h"
 #include "detail/_utils.h"
 #include "detail/_waitable_atomic.h"
+#include "detail/_scoped_lock.h"
+#include "detail/_mutex_common.h"
 #include "profiling.h"
 
 namespace tbb {
-    namespace detail {
-        namespace d1 {
-
-            class rw_mutex {
-            public:
-                //! Constructors
-                rw_mutex() noexcept : m_state(0) { create_itt_sync(this, "tbb::rw_mutex", ""); }
-
-                //! Destructor
-                ~rw_mutex() {
-                    __TBB_ASSERT(!m_state.load(std::memory_order_relaxed),
-                                 "destruction of an acquired mutex");
+namespace detail {
+namespace d1 {
+
+class rw_mutex {
+public:
+    //! Constructors
+    rw_mutex() noexcept : m_state(0) {
+       create_itt_sync(this, "tbb::rw_mutex", "");
+    }
+
+    //! Destructor
+    ~rw_mutex() {
+        __TBB_ASSERT(!m_state.load(std::memory_order_relaxed), "destruction of an acquired mutex");
+    }
+
+    //! No Copy
+    rw_mutex(const rw_mutex&) = delete;
+    rw_mutex& operator=(const rw_mutex&) = delete;
+
+    using scoped_lock = rw_scoped_lock<rw_mutex>;
+
+    //! Mutex traits
+    static constexpr bool is_rw_mutex = true;
+    static constexpr bool is_recursive_mutex = false;
+    static constexpr bool is_fair_mutex = false;
+
+    //! Acquire lock
+    void lock() {
+        call_itt_notify(prepare, this);
+        while (!try_lock()) {
+            if (!(m_state.load(std::memory_order_relaxed) & WRITER_PENDING)) { // no pending writers
+                m_state |= WRITER_PENDING;
+            }
+
+            auto wakeup_condition = [&] { return !(m_state.load(std::memory_order_relaxed) & BUSY); };
+            adaptive_wait_on_address(this, wakeup_condition, WRITER_CONTEXT);
+        }
+
+        call_itt_notify(acquired, this);
+    }
+
+    //! Try acquiring lock (non-blocking)
+    /** Return true if lock acquired; false otherwise. */
+    bool try_lock() {
+        // for a writer: only possible to acquire if no active readers or writers
+        // Use relaxed memory fence is OK here because
+        // Acquire memory fence guaranteed by compare_exchange_strong()
+        state_type s = m_state.load(std::memory_order_relaxed);
+        if (!(s & BUSY)) { // no readers, no writers; mask is 1..1101
+            if (m_state.compare_exchange_strong(s, WRITER)) {
+                call_itt_notify(acquired, this);
+                return true; // successfully stored writer flag
+            }
+        }
+        return false;
+    }
+
+    //! Release lock
+    void unlock() {
+        call_itt_notify(releasing, this);
+        state_type curr_state = (m_state &= READERS | WRITER_PENDING); // Returns current state
+
+        if (curr_state & WRITER_PENDING) {
+            r1::notify_by_address(this, WRITER_CONTEXT);
+        } else {
+            // It's possible that WRITER sleeps without WRITER_PENDING,
+            // because other thread might clear this bit at upgrade()
+            r1::notify_by_address_all(this);
+        }
+    }
+
+    //! Lock shared ownership mutex
+    void lock_shared() {
+        call_itt_notify(prepare, this);
+        while (!try_lock_shared()) {
+            state_type has_writer = WRITER | WRITER_PENDING;
+            auto wakeup_condition = [&] { return !(m_state.load(std::memory_order_relaxed) & has_writer); };
+            adaptive_wait_on_address(this, wakeup_condition, READER_CONTEXT);
+        }
+        __TBB_ASSERT(m_state.load(std::memory_order_relaxed) & READERS, "invalid state of a read lock: no readers");
+    }
+
+    //! Try lock shared ownership mutex
+    bool try_lock_shared() {
+        // for a reader: acquire if no active or waiting writers
+        // Use relaxed memory fence is OK here because
+        // Acquire memory fence guaranteed by fetch_add()
+        state_type has_writer = WRITER | WRITER_PENDING;
+        if (!(m_state.load(std::memory_order_relaxed) & has_writer)) {
+            if (m_state.fetch_add(ONE_READER) & has_writer) {
+                m_state -= ONE_READER;
+                r1::notify_by_address(this, WRITER_CONTEXT);
+            } else {
+                call_itt_notify(acquired, this);
+                return true; // successfully stored increased number of readers
+            }
+        }
+        return false;
+    }
+
+    //! Unlock shared ownership mutex
+    void unlock_shared() {
+        __TBB_ASSERT(m_state.load(std::memory_order_relaxed) & READERS, "invalid state of a read lock: no readers");
+        call_itt_notify(releasing, this);
+
+        state_type curr_state = (m_state -= ONE_READER); // Returns current state
+
+        if (curr_state & (WRITER_PENDING)) {
+            r1::notify_by_address(this, WRITER_CONTEXT);
+        } else {
+            // It's possible that WRITER sleeps without WRITER_PENDING,
+            // because other thread might clear this bit at upgrade()
+            r1::notify_by_address_all(this);
+        }
+    }
+
+private:
+    /** Internal non ISO C++ standard API **/
+    //! This API is used through the scoped_lock class
+
+    //! Upgrade reader to become a writer.
+    /** Returns whether the upgrade happened without releasing and re-acquiring the lock */
+    bool upgrade() {
+        state_type s = m_state.load(std::memory_order_relaxed);
+        __TBB_ASSERT(s & READERS, "invalid state before upgrade: no readers ");
+        // Check and set writer-pending flag.
+        // Required conditions: either no pending writers, or we are the only reader
+        // (with multiple readers and pending writer, another upgrade could have been requested)
+        while ((s & READERS) == ONE_READER || !(s & WRITER_PENDING)) {
+            if (m_state.compare_exchange_strong(s, s | WRITER | WRITER_PENDING)) {
+                auto wakeup_condition = [&] { return (m_state.load(std::memory_order_relaxed) & READERS) == ONE_READER; };
+                while ((m_state.load(std::memory_order_relaxed) & READERS) != ONE_READER) {
+                    adaptive_wait_on_address(this, wakeup_condition, WRITER_CONTEXT);
                 }
 
-                //! No Copy
-                rw_mutex(const rw_mutex&) = delete;
-                rw_mutex& operator=(const rw_mutex&) = delete;
-
-                using scoped_lock = rw_scoped_lock<rw_mutex>;
-
-                //! Mutex traits
-                static constexpr bool is_rw_mutex = true;
-                static constexpr bool is_recursive_mutex = false;
-                static constexpr bool is_fair_mutex = false;
-
-                //! Acquire lock
-                void lock() {
-                    call_itt_notify(prepare, this);
-                    while (!try_lock()) {
-                        if (!(m_state.load(std::memory_order_relaxed)
-                              & WRITER_PENDING)) {// no pending writers
-                            m_state |= WRITER_PENDING;
-                        }
-
-                        auto wakeup_condition
-                                = [&] { return !(m_state.load(std::memory_order_relaxed) & BUSY); };
-                        adaptive_wait_on_address(this, wakeup_condition, WRITER_CONTEXT);
-                    }
-
-                    call_itt_notify(acquired, this);
-                }
-
-                //! Try acquiring lock (non-blocking)
-                /** Return true if lock acquired; false otherwise. */
-                bool try_lock() {
-                    // for a writer: only possible to acquire if no active readers or writers
-                    // Use relaxed memory fence is OK here because
-                    // Acquire memory fence guaranteed by compare_exchange_strong()
-                    state_type s = m_state.load(std::memory_order_relaxed);
-                    if (!(s & BUSY)) {// no readers, no writers; mask is 1..1101
-                        if (m_state.compare_exchange_strong(s, WRITER)) {
-                            call_itt_notify(acquired, this);
-                            return true;// successfully stored writer flag
-                        }
-                    }
-                    return false;
-                }
-
-                //! Release lock
-                void unlock() {
-                    call_itt_notify(releasing, this);
-                    state_type curr_state = (m_state &= READERS | WRITER_PENDING);// Returns current state
-
-                    if (curr_state & WRITER_PENDING) {
-                        r1::notify_by_address(this, WRITER_CONTEXT);
-                    } else {
-                        // It's possible that WRITER sleeps without WRITER_PENDING,
-                        // because other thread might clear this bit at upgrade()
-                        r1::notify_by_address_all(this);
-                    }
-                }
-
-                //! Lock shared ownership mutex
-                void lock_shared() {
-                    call_itt_notify(prepare, this);
-                    while (!try_lock_shared()) {
-                        state_type has_writer = WRITER | WRITER_PENDING;
-                        auto wakeup_condition
-                                = [&] { return !(m_state.load(std::memory_order_relaxed) & has_writer); };
-                        adaptive_wait_on_address(this, wakeup_condition, READER_CONTEXT);
-                    }
-                    __TBB_ASSERT(m_state.load(std::memory_order_relaxed) & READERS,
-                                 "invalid state of a read lock: no readers");
-                }
-
-                //! Try lock shared ownership mutex
-                bool try_lock_shared() {
-                    // for a reader: acquire if no active or waiting writers
-                    // Use relaxed memory fence is OK here because
-                    // Acquire memory fence guaranteed by fetch_add()
-                    state_type has_writer = WRITER | WRITER_PENDING;
-                    if (!(m_state.load(std::memory_order_relaxed) & has_writer)) {
-                        if (m_state.fetch_add(ONE_READER) & has_writer) {
-                            m_state -= ONE_READER;
-                            r1::notify_by_address(this, WRITER_CONTEXT);
-                        } else {
-                            call_itt_notify(acquired, this);
-                            return true;// successfully stored increased number of readers
-                        }
-                    }
-                    return false;
-                }
-
-                //! Unlock shared ownership mutex
-                void unlock_shared() {
-                    __TBB_ASSERT(m_state.load(std::memory_order_relaxed) & READERS,
-                                 "invalid state of a read lock: no readers");
-                    call_itt_notify(releasing, this);
-
-                    state_type curr_state = (m_state -= ONE_READER);// Returns current state
-
-                    if (curr_state & (WRITER_PENDING)) {
-                        r1::notify_by_address(this, WRITER_CONTEXT);
-                    } else {
-                        // It's possible that WRITER sleeps without WRITER_PENDING,
-                        // because other thread might clear this bit at upgrade()
-                        r1::notify_by_address_all(this);
-                    }
-                }
-
-            private:
-                /** Internal non ISO C++ standard API **/
-                //! This API is used through the scoped_lock class
-
-                //! Upgrade reader to become a writer.
-                /** Returns whether the upgrade happened without releasing and re-acquiring the lock */
-                bool upgrade() {
-                    state_type s = m_state.load(std::memory_order_relaxed);
-                    __TBB_ASSERT(s & READERS, "invalid state before upgrade: no readers ");
-                    // Check and set writer-pending flag.
-                    // Required conditions: either no pending writers, or we are the only reader
-                    // (with multiple readers and pending writer, another upgrade could have been requested)
-                    while ((s & READERS) == ONE_READER || !(s & WRITER_PENDING)) {
-                        if (m_state.compare_exchange_strong(s, s | WRITER | WRITER_PENDING)) {
-                            auto wakeup_condition = [&] {
-                                return (m_state.load(std::memory_order_relaxed) & READERS) == ONE_READER;
-                            };
-                            while ((m_state.load(std::memory_order_relaxed) & READERS) != ONE_READER) {
-                                adaptive_wait_on_address(this, wakeup_condition, WRITER_CONTEXT);
-                            }
-
-                            __TBB_ASSERT((m_state.load(std::memory_order_relaxed) & (WRITER_PENDING | WRITER))
-                                                 == (WRITER_PENDING | WRITER),
-                                         "invalid state when upgrading to writer");
-                            // Both new readers and writers are blocked at this time
-                            m_state -= (ONE_READER + WRITER_PENDING);
-                            return true;// successfully upgraded
-                        }
-                    }
-                    // Slow reacquire
-                    unlock_shared();
-                    lock();
-                    return false;
-                }
-
-                //! Downgrade writer to a reader
-                void downgrade() {
-                    __TBB_ASSERT(m_state.load(std::memory_order_relaxed) & WRITER, nullptr),
-                            call_itt_notify(releasing, this);
-                    m_state += (ONE_READER - WRITER);
-
-                    if (!(m_state & WRITER_PENDING)) { r1::notify_by_address(this, READER_CONTEXT); }
-
-                    __TBB_ASSERT(m_state.load(std::memory_order_relaxed) & READERS,
-                                 "invalid state after downgrade: no readers");
-                }
-
-                using state_type = std::intptr_t;
-                static constexpr state_type WRITER = 1;
-                static constexpr state_type WRITER_PENDING = 2;
-                static constexpr state_type READERS = ~(WRITER | WRITER_PENDING);
-                static constexpr state_type ONE_READER = 4;
-                static constexpr state_type BUSY = WRITER | READERS;
-
-                using context_type = std::uintptr_t;
-                static constexpr context_type WRITER_CONTEXT = 0;
-                static constexpr context_type READER_CONTEXT = 1;
-                friend scoped_lock;
-                //! State of lock
-                /** Bit 0 = writer is holding lock
+                __TBB_ASSERT((m_state.load(std::memory_order_relaxed) & (WRITER_PENDING|WRITER)) == (WRITER_PENDING | WRITER),
+                             "invalid state when upgrading to writer");
+                // Both new readers and writers are blocked at this time
+                m_state -= (ONE_READER + WRITER_PENDING);
+                return true; // successfully upgraded
+            }
+        }
+        // Slow reacquire
+        unlock_shared();
+        lock();
+        return false;
+    }
+
+    //! Downgrade writer to a reader
+    void downgrade() {
+        __TBB_ASSERT(m_state.load(std::memory_order_relaxed) & WRITER, nullptr),
+        call_itt_notify(releasing, this);
+        m_state += (ONE_READER - WRITER);
+
+        if (!(m_state & WRITER_PENDING)) {
+            r1::notify_by_address(this, READER_CONTEXT);
+        }
+
+        __TBB_ASSERT(m_state.load(std::memory_order_relaxed) & READERS, "invalid state after downgrade: no readers");
+    }
+
+    using state_type = std::intptr_t;
+    static constexpr state_type WRITER = 1;
+    static constexpr state_type WRITER_PENDING = 2;
+    static constexpr state_type READERS = ~(WRITER | WRITER_PENDING);
+    static constexpr state_type ONE_READER = 4;
+    static constexpr state_type BUSY = WRITER | READERS;
+
+    using context_type = std::uintptr_t;
+    static constexpr context_type WRITER_CONTEXT = 0;
+    static constexpr context_type READER_CONTEXT = 1;
+    friend scoped_lock;
+    //! State of lock
+    /** Bit 0 = writer is holding lock
         Bit 1 = request by a writer to acquire lock (hint to readers to wait)
         Bit 2..N = number of readers holding lock */
-                std::atomic<state_type> m_state;
-            };// class rw_mutex
-
-        }// namespace d1
-    }    // namespace detail
+    std::atomic<state_type> m_state;
+}; // class rw_mutex
 
-    inline namespace v1 {
-        using detail::d1::rw_mutex;
-    }// namespace v1
+} // namespace d1
+} // namespace detail
 
-}// namespace tbb
+inline namespace v1 {
+using detail::d1::rw_mutex;
+} // namespace v1
 
-#endif /* __TBB_PREVIEW_MUTEXES */
+} // namespace tbb
 
-#endif// __TBB_rw_mutex_H
+#endif // __TBB_rw_mutex_H
diff --git a/external/tbb/include/oneapi/tbb/scalable_allocator.h b/external/tbb/include/oneapi/tbb/scalable_allocator.h
index 68f8234b..31650a0a 100644
--- a/external/tbb/include/oneapi/tbb/scalable_allocator.h
+++ b/external/tbb/include/oneapi/tbb/scalable_allocator.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2023 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -20,9 +20,10 @@
 #ifdef __cplusplus
 #include "oneapi/tbb/detail/_config.h"
 #include "oneapi/tbb/detail/_utils.h"
+#include "oneapi/tbb/detail/_namespace_injection.h"
 #include <cstdlib>
-#include <new> /* std::bad_alloc() */
 #include <utility>
+#include <new> /* std::bad_alloc() */
 #else
 #include "oneapi/tbb/detail/_export.h"
 #include <stddef.h> /* Need ptrdiff_t and size_t from here. */
@@ -40,9 +41,9 @@ extern "C" {
 #endif /* __cplusplus */
 
 #if _MSC_VER
-#define __TBB_EXPORTED_FUNC __cdecl
+    #define __TBB_EXPORTED_FUNC __cdecl
 #else
-#define __TBB_EXPORTED_FUNC
+    #define __TBB_EXPORTED_FUNC
 #endif
 
 /** The "malloc" analogue to allocate block of memory of size bytes.
@@ -51,7 +52,7 @@ TBBMALLOC_EXPORT void* __TBB_EXPORTED_FUNC scalable_malloc(size_t size);
 
 /** The "free" analogue to discard a previously allocated piece of memory.
     @ingroup memory_allocation */
-TBBMALLOC_EXPORT void __TBB_EXPORTED_FUNC scalable_free(void* ptr);
+TBBMALLOC_EXPORT void   __TBB_EXPORTED_FUNC scalable_free(void* ptr);
 
 /** The "realloc" analogue complementing scalable_malloc.
     @ingroup memory_allocation */
@@ -63,8 +64,7 @@ TBBMALLOC_EXPORT void* __TBB_EXPORTED_FUNC scalable_calloc(size_t nobj, size_t s
 
 /** The "posix_memalign" analogue.
     @ingroup memory_allocation */
-TBBMALLOC_EXPORT int __TBB_EXPORTED_FUNC scalable_posix_memalign(void** memptr, size_t alignment,
-                                                                 size_t size);
+TBBMALLOC_EXPORT int __TBB_EXPORTED_FUNC scalable_posix_memalign(void** memptr, size_t alignment, size_t size);
 
 /** The "_aligned_malloc" analogue.
     @ingroup memory_allocation */
@@ -96,7 +96,7 @@ typedef enum {
 /* Setting TBB_MALLOC_USE_HUGE_PAGES environment variable to 1 enables huge pages.
    scalable_allocation_mode call has priority over environment variable. */
 typedef enum {
-    TBBMALLOC_USE_HUGE_PAGES, /* value turns using huge pages on and off */
+    TBBMALLOC_USE_HUGE_PAGES,  /* value turns using huge pages on and off */
     /* deprecated, kept for backward compatibility only */
     USE_HUGE_PAGES = TBBMALLOC_USE_HUGE_PAGES,
     /* try to limit memory consumption value (Bytes), clean internal buffers
@@ -123,7 +123,7 @@ typedef enum {
 
 /** Call TBB allocator-specific commands.
     @ingroup memory_allocation */
-TBBMALLOC_EXPORT int __TBB_EXPORTED_FUNC scalable_allocation_command(int cmd, void* param);
+TBBMALLOC_EXPORT int __TBB_EXPORTED_FUNC scalable_allocation_command(int cmd, void *param);
 
 #ifdef __cplusplus
 } /* extern "C" */
@@ -133,199 +133,202 @@ TBBMALLOC_EXPORT int __TBB_EXPORTED_FUNC scalable_allocation_command(int cmd, vo
 
 //! The namespace rml contains components of low-level memory pool interface.
 namespace rml {
-    class MemoryPool;
-
-    typedef void* (*rawAllocType)(std::intptr_t pool_id, std::size_t& bytes);
-    // returns non-zero in case of error
-    typedef int (*rawFreeType)(std::intptr_t pool_id, void* raw_ptr, std::size_t raw_bytes);
-
-    struct MemPoolPolicy {
-        enum { TBBMALLOC_POOL_VERSION = 1 };
-
-        rawAllocType pAlloc;
-        rawFreeType pFree;
-        // granularity of pAlloc allocations. 0 means default used.
-        std::size_t granularity;
-        int version;
-        // all memory consumed at 1st pAlloc call and never returned,
-        // no more pAlloc calls after 1st
-        unsigned fixedPool : 1,
-                // memory consumed but returned only at pool termination
-                keepAllMemory : 1, reserved : 30;
-
-        MemPoolPolicy(rawAllocType pAlloc_, rawFreeType pFree_, std::size_t granularity_ = 0,
-                      bool fixedPool_ = false, bool keepAllMemory_ = false)
-            : pAlloc(pAlloc_), pFree(pFree_), granularity(granularity_), version(TBBMALLOC_POOL_VERSION),
-              fixedPool(fixedPool_), keepAllMemory(keepAllMemory_), reserved(0) {}
-    };
+class MemoryPool;
 
-    // enums have same values as appropriate enums from ScalableAllocationResult
-    // TODO: use ScalableAllocationResult in pool_create directly
-    enum MemPoolError {
-        // pool created successfully
-        POOL_OK = TBBMALLOC_OK,
-        // invalid policy parameters found
-        INVALID_POLICY = TBBMALLOC_INVALID_PARAM,
-        // requested pool policy is not supported by allocator library
-        UNSUPPORTED_POLICY = TBBMALLOC_UNSUPPORTED,
-        // lack of memory during pool creation
-        NO_MEMORY = TBBMALLOC_NO_MEMORY,
-        // action takes no effect
-        NO_EFFECT = TBBMALLOC_NO_EFFECT
-    };
+typedef void *(*rawAllocType)(std::intptr_t pool_id, std::size_t &bytes);
+// returns non-zero in case of error
+typedef int   (*rawFreeType)(std::intptr_t pool_id, void* raw_ptr, std::size_t raw_bytes);
 
-    TBBMALLOC_EXPORT MemPoolError pool_create_v1(std::intptr_t pool_id, const MemPoolPolicy* policy,
-                                                 rml::MemoryPool** pool);
-
-    TBBMALLOC_EXPORT bool pool_destroy(MemoryPool* memPool);
-    TBBMALLOC_EXPORT void* pool_malloc(MemoryPool* memPool, std::size_t size);
-    TBBMALLOC_EXPORT void* pool_realloc(MemoryPool* memPool, void* object, std::size_t size);
-    TBBMALLOC_EXPORT void* pool_aligned_malloc(MemoryPool* mPool, std::size_t size, std::size_t alignment);
-    TBBMALLOC_EXPORT void* pool_aligned_realloc(MemoryPool* mPool, void* ptr, std::size_t size,
-                                                std::size_t alignment);
-    TBBMALLOC_EXPORT bool pool_reset(MemoryPool* memPool);
-    TBBMALLOC_EXPORT bool pool_free(MemoryPool* memPool, void* object);
-    TBBMALLOC_EXPORT MemoryPool* pool_identify(void* object);
-    TBBMALLOC_EXPORT std::size_t pool_msize(MemoryPool* memPool, void* object);
+struct MemPoolPolicy {
+    enum {
+        TBBMALLOC_POOL_VERSION = 1
+    };
 
-}// namespace rml
+    rawAllocType pAlloc;
+    rawFreeType  pFree;
+                 // granularity of pAlloc allocations. 0 means default used.
+    std::size_t  granularity;
+    int          version;
+                 // all memory consumed at 1st pAlloc call and never returned,
+                 // no more pAlloc calls after 1st
+    unsigned     fixedPool : 1,
+                 // memory consumed but returned only at pool termination
+                 keepAllMemory : 1,
+                 reserved : 30;
+
+    MemPoolPolicy(rawAllocType pAlloc_, rawFreeType pFree_,
+                  std::size_t granularity_ = 0, bool fixedPool_ = false,
+                  bool keepAllMemory_ = false) :
+        pAlloc(pAlloc_), pFree(pFree_), granularity(granularity_), version(TBBMALLOC_POOL_VERSION),
+        fixedPool(fixedPool_), keepAllMemory(keepAllMemory_),
+        reserved(0) {}
+};
+
+// enums have same values as appropriate enums from ScalableAllocationResult
+// TODO: use ScalableAllocationResult in pool_create directly
+enum MemPoolError {
+    // pool created successfully
+    POOL_OK = TBBMALLOC_OK,
+    // invalid policy parameters found
+    INVALID_POLICY = TBBMALLOC_INVALID_PARAM,
+     // requested pool policy is not supported by allocator library
+    UNSUPPORTED_POLICY = TBBMALLOC_UNSUPPORTED,
+    // lack of memory during pool creation
+    NO_MEMORY = TBBMALLOC_NO_MEMORY,
+    // action takes no effect
+    NO_EFFECT = TBBMALLOC_NO_EFFECT
+};
+
+TBBMALLOC_EXPORT MemPoolError pool_create_v1(std::intptr_t pool_id, const MemPoolPolicy *policy,
+                            rml::MemoryPool **pool);
+
+TBBMALLOC_EXPORT bool  pool_destroy(MemoryPool* memPool);
+TBBMALLOC_EXPORT void *pool_malloc(MemoryPool* memPool, std::size_t size);
+TBBMALLOC_EXPORT void *pool_realloc(MemoryPool* memPool, void *object, std::size_t size);
+TBBMALLOC_EXPORT void *pool_aligned_malloc(MemoryPool* mPool, std::size_t size, std::size_t alignment);
+TBBMALLOC_EXPORT void *pool_aligned_realloc(MemoryPool* mPool, void *ptr, std::size_t size, std::size_t alignment);
+TBBMALLOC_EXPORT bool  pool_reset(MemoryPool* memPool);
+TBBMALLOC_EXPORT bool  pool_free(MemoryPool *memPool, void *object);
+TBBMALLOC_EXPORT MemoryPool *pool_identify(void *object);
+TBBMALLOC_EXPORT std::size_t pool_msize(MemoryPool *memPool, void *object);
+
+} // namespace rml
 
 namespace tbb {
-    namespace detail {
-        namespace d1 {
+namespace detail {
+namespace d1 {
 
-            // keep throw in a separate function to prevent code bloat
-            template <typename E>
-            void throw_exception(const E& e) {
+// keep throw in a separate function to prevent code bloat
+template<typename E>
+void throw_exception(const E &e) {
 #if TBB_USE_EXCEPTIONS
-                throw e;
+    throw e;
 #else
-                suppress_unused_warning(e);
+    suppress_unused_warning(e);
 #endif
-            }
-
-            template <typename T>
-            class scalable_allocator {
-            public:
-                using value_type = T;
-                using propagate_on_container_move_assignment = std::true_type;
-
-                //! Always defined for TBB containers
-                using is_always_equal = std::true_type;
-
-                scalable_allocator() = default;
-                template <typename U>
-                scalable_allocator(const scalable_allocator<U>&) noexcept {}
-
-                //! Allocate space for n objects.
-                __TBB_nodiscard T* allocate(std::size_t n) {
-                    T* p = static_cast<T*>(scalable_malloc(n * sizeof(value_type)));
-                    if (!p) { throw_exception(std::bad_alloc()); }
-                    return p;
-                }
-
-                //! Free previously allocated block of memory
-                void deallocate(T* p, std::size_t) { scalable_free(p); }
+}
+
+template<typename T>
+class scalable_allocator {
+public:
+    using value_type = T;
+    using propagate_on_container_move_assignment = std::true_type;
+
+    //! Always defined for TBB containers
+    using is_always_equal = std::true_type;
+
+    scalable_allocator() = default;
+    template<typename U> scalable_allocator(const scalable_allocator<U>&) noexcept {}
+
+    //! Allocate space for n objects.
+    __TBB_nodiscard T* allocate(std::size_t n) {
+        T* p = static_cast<T*>(scalable_malloc(n * sizeof(value_type)));
+        if (!p) {
+            throw_exception(std::bad_alloc());
+        }
+        return p;
+    }
+
+    //! Free previously allocated block of memory
+    void deallocate(T* p, std::size_t) {
+        scalable_free(p);
+    }
 
 #if TBB_ALLOCATOR_TRAITS_BROKEN
-                using pointer = value_type*;
-                using const_pointer = const value_type*;
-                using reference = value_type&;
-                using const_reference = const value_type&;
-                using difference_type = std::ptrdiff_t;
-                using size_type = std::size_t;
-                template <typename U>
-                struct rebind {
-                    using other = scalable_allocator<U>;
-                };
-                //! Largest value for which method allocate might succeed.
-                size_type max_size() const noexcept {
-                    size_type absolutemax = static_cast<size_type>(-1) / sizeof(value_type);
-                    return (absolutemax > 0 ? absolutemax : 1);
-                }
-                template <typename U, typename... Args>
-                void construct(U* p, Args&&... args) {
-                    ::new ((void*) p) U(std::forward<Args>(args)...);
-                }
-                void destroy(pointer p) { p->~value_type(); }
-                pointer address(reference x) const { return &x; }
-                const_pointer address(const_reference x) const { return &x; }
-#endif// TBB_ALLOCATOR_TRAITS_BROKEN
-            };
+    using pointer = value_type*;
+    using const_pointer = const value_type*;
+    using reference = value_type&;
+    using const_reference = const value_type&;
+    using difference_type = std::ptrdiff_t;
+    using size_type = std::size_t;
+    template<typename U> struct rebind {
+        using other = scalable_allocator<U>;
+    };
+    //! Largest value for which method allocate might succeed.
+    size_type max_size() const noexcept {
+        size_type absolutemax = static_cast<size_type>(-1) / sizeof (value_type);
+        return (absolutemax > 0 ? absolutemax : 1);
+    }
+    template<typename U, typename... Args>
+    void construct(U *p, Args&&... args)
+        { ::new((void *)p) U(std::forward<Args>(args)...); }
+    void destroy(pointer p) { p->~value_type(); }
+    pointer address(reference x) const { return &x; }
+    const_pointer address(const_reference x) const { return &x; }
+#endif // TBB_ALLOCATOR_TRAITS_BROKEN
+
+};
 
 #if TBB_ALLOCATOR_TRAITS_BROKEN
-            template <>
-            class scalable_allocator<void> {
-            public:
-                using pointer = void*;
-                using const_pointer = const void*;
-                using value_type = void;
-                template <typename U>
-                struct rebind {
-                    using other = scalable_allocator<U>;
-                };
-            };
+    template<>
+    class scalable_allocator<void> {
+    public:
+        using pointer = void*;
+        using const_pointer = const void*;
+        using value_type = void;
+        template<typename U> struct rebind {
+            using other = scalable_allocator<U>;
+        };
+    };
 #endif
 
-            template <typename T, typename U>
-            inline bool operator==(const scalable_allocator<T>&, const scalable_allocator<U>&) noexcept {
-                return true;
-            }
+template<typename T, typename U>
+inline bool operator==(const scalable_allocator<T>&, const scalable_allocator<U>&) noexcept { return true; }
 
 #if !__TBB_CPP20_COMPARISONS_PRESENT
-            template <typename T, typename U>
-            inline bool operator!=(const scalable_allocator<T>&, const scalable_allocator<U>&) noexcept {
-                return false;
-            }
+template<typename T, typename U>
+inline bool operator!=(const scalable_allocator<T>&, const scalable_allocator<U>&) noexcept { return false; }
 #endif
 
 #if __TBB_CPP17_MEMORY_RESOURCE_PRESENT
 
-            //! C++17 memory resource implementation for scalable allocator
-            //! ISO C++ Section 23.12.2
-            class scalable_resource_impl : public std::pmr::memory_resource {
-            private:
-                void* do_allocate(std::size_t bytes, std::size_t alignment) override {
-                    void* p = scalable_aligned_malloc(bytes, alignment);
-                    if (!p) { throw_exception(std::bad_alloc()); }
-                    return p;
-                }
-
-                void do_deallocate(void* ptr, std::size_t /*bytes*/, std::size_t /*alignment*/) override {
-                    scalable_free(ptr);
-                }
-
-                //! Memory allocated by one instance of scalable_resource_impl could be deallocated by any
-                //! other instance of this class
-                bool do_is_equal(const std::pmr::memory_resource& other) const noexcept override {
-                    return this == &other ||
+//! C++17 memory resource implementation for scalable allocator
+//! ISO C++ Section 23.12.2
+class scalable_resource_impl : public std::pmr::memory_resource {
+private:
+    void* do_allocate(std::size_t bytes, std::size_t alignment) override {
+        void* p = scalable_aligned_malloc(bytes, alignment);
+        if (!p) {
+            throw_exception(std::bad_alloc());
+        }
+        return p;
+    }
+
+    void do_deallocate(void* ptr, std::size_t /*bytes*/, std::size_t /*alignment*/) override {
+        scalable_free(ptr);
+    }
+
+    //! Memory allocated by one instance of scalable_resource_impl could be deallocated by any
+    //! other instance of this class
+    bool do_is_equal(const std::pmr::memory_resource& other) const noexcept override {
+        return this == &other ||
 #if __TBB_USE_OPTIONAL_RTTI
-                           dynamic_cast<const scalable_resource_impl*>(&other) != nullptr;
+            dynamic_cast<const scalable_resource_impl*>(&other) != nullptr;
 #else
-                           false;
+            false;
 #endif
-                }
-            };
+    }
+};
 
-            //! Global scalable allocator memory resource provider
-            inline std::pmr::memory_resource* scalable_memory_resource() noexcept {
-                static tbb::detail::d1::scalable_resource_impl scalable_res;
-                return &scalable_res;
-            }
+//! Global scalable allocator memory resource provider
+inline std::pmr::memory_resource* scalable_memory_resource() noexcept {
+    static tbb::detail::d1::scalable_resource_impl scalable_res;
+    return &scalable_res;
+}
 
-#endif// __TBB_CPP17_MEMORY_RESOURCE_PRESENT
+#endif // __TBB_CPP17_MEMORY_RESOURCE_PRESENT
 
-        }// namespace d1
-    }    // namespace detail
+} // namespace d1
+} // namespace detail
 
-    inline namespace v1 {
-        using detail::d1::scalable_allocator;
+inline namespace v1 {
+using detail::d1::scalable_allocator;
 #if __TBB_CPP17_MEMORY_RESOURCE_PRESENT
-        using detail::d1::scalable_memory_resource;
+using detail::d1::scalable_memory_resource;
 #endif
-    }// namespace v1
+} // namespace v1
 
-}// namespace tbb
+} // namespace tbb
 
 #endif /* __cplusplus */
 
diff --git a/external/tbb/include/oneapi/tbb/spin_mutex.h b/external/tbb/include/oneapi/tbb/spin_mutex.h
index c661d5bd..e38c47c9 100644
--- a/external/tbb/include/oneapi/tbb/spin_mutex.h
+++ b/external/tbb/include/oneapi/tbb/spin_mutex.h
@@ -17,109 +17,118 @@
 #ifndef __TBB_spin_mutex_H
 #define __TBB_spin_mutex_H
 
-#include "detail/_mutex_common.h"
 #include "detail/_namespace_injection.h"
+#include "detail/_mutex_common.h"
 
 #include "profiling.h"
 
 #include "detail/_assert.h"
-#include "detail/_scoped_lock.h"
 #include "detail/_utils.h"
+#include "detail/_scoped_lock.h"
 
 #include <atomic>
 
 namespace tbb {
-    namespace detail {
-        namespace d1 {
+namespace detail {
+namespace d1 {
 
 #if __TBB_TSX_INTRINSICS_PRESENT
-            class rtm_mutex;
+class rtm_mutex;
 #endif
 
-            /** A spin_mutex is a low-level synchronization primitive.
+/** A spin_mutex is a low-level synchronization primitive.
     While locked, it causes the waiting threads to spin in a loop until the lock is released.
     It should be used only for locking short critical sections
     (typically less than 20 instructions) when fairness is not an issue.
     If zero-initialized, the mutex is considered unheld.
     @ingroup synchronization */
-            class spin_mutex {
-            public:
-                //! Constructors
-                spin_mutex() noexcept : m_flag(false) { create_itt_sync(this, "tbb::spin_mutex", ""); };
-
-                //! Destructor
-                ~spin_mutex() = default;
-
-                //! No Copy
-                spin_mutex(const spin_mutex&) = delete;
-                spin_mutex& operator=(const spin_mutex&) = delete;
-
-                using scoped_lock = unique_scoped_lock<spin_mutex>;
-
-                //! Mutex traits
-                static constexpr bool is_rw_mutex = false;
-                static constexpr bool is_recursive_mutex = false;
-                static constexpr bool is_fair_mutex = false;
-
-                //! Acquire lock
-                /** Spin if the lock is taken */
-                void lock() {
-                    atomic_backoff backoff;
-                    call_itt_notify(prepare, this);
-                    while (m_flag.exchange(true)) backoff.pause();
-                    call_itt_notify(acquired, this);
-                }
-
-                //! Try acquiring lock (non-blocking)
-                /** Return true if lock acquired; false otherwise. */
-                bool try_lock() {
-                    bool result = !m_flag.exchange(true);
-                    if (result) { call_itt_notify(acquired, this); }
-                    return result;
-                }
-
-                //! Release lock
-                void unlock() {
-                    call_itt_notify(releasing, this);
-                    m_flag.store(false, std::memory_order_release);
-                }
-
-            protected:
-                std::atomic<bool> m_flag;
-            };// class spin_mutex
+class spin_mutex {
+public:
+    //! Constructors
+    spin_mutex() noexcept : m_flag(false) {
+        create_itt_sync(this, "tbb::spin_mutex", "");
+    };
+
+    //! Destructor
+    ~spin_mutex() = default;
+
+    //! No Copy
+    spin_mutex(const spin_mutex&) = delete;
+    spin_mutex& operator=(const spin_mutex&) = delete;
+
+    using scoped_lock = unique_scoped_lock<spin_mutex>;
+
+    //! Mutex traits
+    static constexpr bool is_rw_mutex = false;
+    static constexpr bool is_recursive_mutex = false;
+    static constexpr bool is_fair_mutex = false;
+
+    //! Acquire lock
+    /** Spin if the lock is taken */
+    void lock() {
+        atomic_backoff backoff;
+        call_itt_notify(prepare, this);
+        while (m_flag.exchange(true)) backoff.pause();
+        call_itt_notify(acquired, this);
+    }
+
+    //! Try acquiring lock (non-blocking)
+    /** Return true if lock acquired; false otherwise. */
+    bool try_lock() {
+        bool result = !m_flag.exchange(true);
+        if (result) {
+            call_itt_notify(acquired, this);
+        }
+        return result;
+    }
+
+    //! Release lock
+    void unlock() {
+        call_itt_notify(releasing, this);
+        m_flag.store(false, std::memory_order_release);
+    }
+
+protected:
+    std::atomic<bool> m_flag;
+}; // class spin_mutex
 
 #if TBB_USE_PROFILING_TOOLS
-            inline void set_name(spin_mutex& obj, const char* name) { itt_set_sync_name(&obj, name); }
-#if (_WIN32 || _WIN64)
-            inline void set_name(spin_mutex& obj, const wchar_t* name) { itt_set_sync_name(&obj, name); }
-#endif//WIN
+inline void set_name(spin_mutex& obj, const char* name) {
+    itt_set_sync_name(&obj, name);
+}
+#if (_WIN32||_WIN64)
+inline void set_name(spin_mutex& obj, const wchar_t* name) {
+    itt_set_sync_name(&obj, name);
+}
+#endif //WIN
 #else
-            inline void set_name(spin_mutex&, const char*) {}
-#if (_WIN32 || _WIN64)
-            inline void set_name(spin_mutex&, const wchar_t*) {}
-#endif// WIN
+inline void set_name(spin_mutex&, const char*) {}
+#if (_WIN32||_WIN64)
+inline void set_name(spin_mutex&, const wchar_t*) {}
+#endif // WIN
 #endif
-        }// namespace d1
-    }    // namespace detail
-
-    inline namespace v1 {
-        using detail::d1::spin_mutex;
-    }// namespace v1
-    namespace profiling {
-        using detail::d1::set_name;
-    }
-}// namespace tbb
+} // namespace d1
+} // namespace detail
+
+inline namespace v1 {
+using detail::d1::spin_mutex;
+} // namespace v1
+namespace profiling {
+    using detail::d1::set_name;
+}
+} // namespace tbb
 
 #include "detail/_rtm_mutex.h"
 
 namespace tbb {
-    inline namespace v1 {
+inline namespace v1 {
 #if __TBB_TSX_INTRINSICS_PRESENT
-        using speculative_spin_mutex = detail::d1::rtm_mutex;
+    using speculative_spin_mutex = detail::d1::rtm_mutex;
 #else
-        using speculative_spin_mutex = detail::d1::spin_mutex;
+    using speculative_spin_mutex = detail::d1::spin_mutex;
 #endif
-    }// namespace v1
-}// namespace tbb
+}
+}
 
 #endif /* __TBB_spin_mutex_H */
+
diff --git a/external/tbb/include/oneapi/tbb/task_arena.h b/external/tbb/include/oneapi/tbb/task_arena.h
index 84ce8e4a..e594b571 100644
--- a/external/tbb/include/oneapi/tbb/task_arena.h
+++ b/external/tbb/include/oneapi/tbb/task_arena.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2025 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -17,15 +17,16 @@
 #ifndef __TBB_task_arena_H
 #define __TBB_task_arena_H
 
-#include "detail/_namespace_injection.h"
-#include "detail/_task.h"
-#include "detail/_exception.h"
+#include "detail/_config.h"
+
 #include "detail/_aligned_space.h"
+#include "detail/_attach.h"
+#include "detail/_exception.h"
+#include "detail/_namespace_injection.h"
 #include "detail/_small_object_pool.h"
+#include "detail/_task.h"
 
-#if __TBB_PREVIEW_TASK_GROUP_EXTENSIONS
 #include "detail/_task_handle.h"
-#endif
 
 #if __TBB_ARENA_BINDING
 #include "info.h"
@@ -94,26 +95,28 @@ TBB_EXPORT void __TBB_EXPORTED_FUNC isolate_within_arena(d1::delegate_base& d, s
 TBB_EXPORT void __TBB_EXPORTED_FUNC enqueue(d1::task&, d1::task_arena_base*);
 TBB_EXPORT void __TBB_EXPORTED_FUNC enqueue(d1::task&, d1::task_group_context&, d1::task_arena_base*);
 TBB_EXPORT void __TBB_EXPORTED_FUNC submit(d1::task&, d1::task_group_context&, arena*, std::uintptr_t);
+
+#if __TBB_PREVIEW_PARALLEL_PHASE
+TBB_EXPORT void __TBB_EXPORTED_FUNC enter_parallel_phase(d1::task_arena_base*, std::uintptr_t);
+TBB_EXPORT void __TBB_EXPORTED_FUNC exit_parallel_phase(d1::task_arena_base*, std::uintptr_t);
+#endif
 } // namespace r1
 
 namespace d2 {
-#if __TBB_PREVIEW_TASK_GROUP_EXTENSIONS
 inline void enqueue_impl(task_handle&& th, d1::task_arena_base* ta) {
-    if (th == nullptr) {
-        throw_exception(exception_id::bad_task_handle);
-    }
+    __TBB_ASSERT(th != nullptr, "Attempt to schedule empty task_handle");
 
     auto& ctx = task_handle_accessor::ctx_of(th);
 
     // Do not access th after release
     r1::enqueue(*task_handle_accessor::release(th), ctx, ta);
 }
-#endif// __TBB_PREVIEW_TASK_GROUP_EXTENSIONS
+} //namespace d2
 
-}
 namespace d1 {
 
-static constexpr int priority_stride = INT_MAX / 4;
+static constexpr unsigned num_priority_levels = 3;
+static constexpr int priority_stride = INT_MAX / (num_priority_levels + 1);
 
 class task_arena_base {
     friend struct r1::task_arena_impl;
@@ -124,6 +127,14 @@ class task_arena_base {
         normal = 2 * priority_stride,
         high   = 3 * priority_stride
     };
+
+#if __TBB_PREVIEW_PARALLEL_PHASE
+    enum class leave_policy : int {
+        automatic = 0,
+        fast      = 1
+    };
+#endif
+
 #if __TBB_ARENA_BINDING
     using constraints = tbb::detail::d1::constraints;
 #endif /*__TBB_ARENA_BINDING*/
@@ -133,9 +144,9 @@ class task_arena_base {
 
     std::atomic<do_once_state> my_initialization_state;
 
-    //! NULL if not currently initialized.
+    //! nullptr if not currently initialized.
     std::atomic<r1::arena*> my_arena;
-    static_assert(sizeof(std::atomic<r1::arena*>) == sizeof(r1::arena*), 
+    static_assert(sizeof(std::atomic<r1::arena*>) == sizeof(r1::arena*),
         "To preserve backward compatibility we need the equal size of an atomic pointer and a pointer");
 
     //! Concurrency level for deferred initialization
@@ -164,13 +175,36 @@ class task_arena_base {
         return (my_version_and_traits & core_type_support_flag) == core_type_support_flag ? my_max_threads_per_core : automatic;
     }
 
+#if __TBB_PREVIEW_PARALLEL_PHASE
+    leave_policy get_leave_policy() const {
+        return (my_version_and_traits & fast_leave_policy_flag) ? leave_policy::fast : leave_policy::automatic;
+    }
+
+    int leave_policy_trait(leave_policy lp) const {
+        return lp == leave_policy::fast ? fast_leave_policy_flag : 0;
+    }
+
+    void set_leave_policy(leave_policy lp) {
+        my_version_and_traits |= leave_policy_trait(lp);
+    }
+#endif
+
     enum {
-        default_flags = 0
-        , core_type_support_flag = 1
+        default_flags               = 0,
+        core_type_support_flag      = 1,
+        fast_leave_policy_flag      = 1 << 1
     };
 
-    task_arena_base(int max_concurrency, unsigned reserved_for_masters, priority a_priority)
-        : my_version_and_traits(default_flags | core_type_support_flag)
+    task_arena_base(int max_concurrency, unsigned reserved_for_masters, priority a_priority
+#if __TBB_PREVIEW_PARALLEL_PHASE
+                    , leave_policy lp
+#endif
+    )
+        : my_version_and_traits(default_flags | core_type_support_flag
+#if __TBB_PREVIEW_PARALLEL_PHASE
+                | leave_policy_trait(lp)
+#endif
+        )
         , my_initialization_state(do_once_state::uninitialized)
         , my_arena(nullptr)
         , my_max_concurrency(max_concurrency)
@@ -182,21 +216,24 @@ class task_arena_base {
         {}
 
 #if __TBB_ARENA_BINDING
-    task_arena_base(const constraints& constraints_, unsigned reserved_for_masters, priority a_priority)
-        : my_version_and_traits(default_flags | core_type_support_flag)
+    task_arena_base(const constraints& constraints_, unsigned reserved_for_masters, priority a_priority
+#if __TBB_PREVIEW_PARALLEL_PHASE
+                    , leave_policy lp
+#endif
+    )
+        : my_version_and_traits(default_flags | core_type_support_flag 
+#if __TBB_PREVIEW_PARALLEL_PHASE
+                | leave_policy_trait(lp)
+#endif
+                )
         , my_initialization_state(do_once_state::uninitialized)
         , my_arena(nullptr)
         , my_max_concurrency(constraints_.max_concurrency)
         , my_num_reserved_slots(reserved_for_masters)
         , my_priority(a_priority)
         , my_numa_id(constraints_.numa_id)
-#if __TBB_PREVIEW_TASK_ARENA_CONSTRAINTS_EXTENSION_PRESENT
         , my_core_type(constraints_.core_type)
         , my_max_threads_per_core(constraints_.max_threads_per_core)
-#else
-        , my_core_type(automatic)
-        , my_max_threads_per_core(automatic)
-#endif
         {}
 #endif /*__TBB_ARENA_BINDING*/
 public:
@@ -266,33 +303,58 @@ class task_arena : public task_arena_base {
      *       Value of 1 is default and reflects behavior of implicit arenas.
      **/
     task_arena(int max_concurrency_ = automatic, unsigned reserved_for_masters = 1,
-               priority a_priority = priority::normal)
-        : task_arena_base(max_concurrency_, reserved_for_masters, a_priority)
+               priority a_priority = priority::normal
+#if __TBB_PREVIEW_PARALLEL_PHASE
+               , leave_policy lp = leave_policy::automatic
+#endif
+    )
+        : task_arena_base(max_concurrency_, reserved_for_masters, a_priority
+#if __TBB_PREVIEW_PARALLEL_PHASE
+                         , lp
+#endif
+          )
     {}
 
 #if __TBB_ARENA_BINDING
     //! Creates task arena pinned to certain NUMA node
     task_arena(const constraints& constraints_, unsigned reserved_for_masters = 1,
-               priority a_priority = priority::normal)
-        : task_arena_base(constraints_, reserved_for_masters, a_priority)
+               priority a_priority = priority::normal
+#if __TBB_PREVIEW_PARALLEL_PHASE
+               , leave_policy lp = leave_policy::automatic
+#endif
+    )
+        : task_arena_base(constraints_, reserved_for_masters, a_priority
+#if __TBB_PREVIEW_PARALLEL_PHASE
+                         , lp
+#endif
+          )
     {}
 
     //! Copies settings from another task_arena
-    task_arena(const task_arena &s) // copy settings but not the reference or instance
+    task_arena(const task_arena &a) // copy settings but not the reference or instance
         : task_arena_base(
             constraints{}
-                .set_numa_id(s.my_numa_id)
-                .set_max_concurrency(s.my_max_concurrency)
-#if __TBB_PREVIEW_TASK_ARENA_CONSTRAINTS_EXTENSION_PRESENT
-                .set_core_type(s.my_core_type)
-                .set_max_threads_per_core(s.my_max_threads_per_core)
+                .set_numa_id(a.my_numa_id)
+                .set_max_concurrency(a.my_max_concurrency)
+                .set_core_type(a.my_core_type)
+                .set_max_threads_per_core(a.my_max_threads_per_core)
+            , a.my_num_reserved_slots, a.my_priority
+#if __TBB_PREVIEW_PARALLEL_PHASE
+            , a.get_leave_policy()
 #endif
-            , s.my_num_reserved_slots, s.my_priority)
+        )
+    
     {}
 #else
     //! Copies settings from another task_arena
     task_arena(const task_arena& a) // copy settings but not the reference or instance
-        : task_arena_base(a.my_max_concurrency, a.my_num_reserved_slots, a.my_priority)
+        : task_arena_base(a.my_max_concurrency,
+                          a.my_num_reserved_slots,
+                          a.my_priority,
+#if __TBB_PREVIEW_PARALLEL_PHASE
+                          a.get_leave_policy()
+#endif
+          )
     {}
 #endif /*__TBB_ARENA_BINDING*/
 
@@ -301,13 +363,22 @@ class task_arena : public task_arena_base {
 
     //! Creates an instance of task_arena attached to the current arena of the thread
     explicit task_arena( attach )
-        : task_arena_base(automatic, 1, priority::normal) // use default settings if attach fails
+        : task_arena_base(automatic, 1, priority::normal
+#if __TBB_PREVIEW_PARALLEL_PHASE
+        , leave_policy::automatic
+#endif
+        ) // use default settings if attach fails
     {
         if (r1::attach(*this)) {
             mark_initialized();
         }
     }
 
+    //! Creates an instance of task_arena attached to the current arena of the thread
+    explicit task_arena(d1::attach)
+        : task_arena(attach{})
+    {}
+
     //! Forces allocation of the resources for the task_arena as specified in constructor arguments
     void initialize() {
         atomic_do_once([this]{ r1::initialize(*this); }, my_initialization_state);
@@ -315,13 +386,20 @@ class task_arena : public task_arena_base {
 
     //! Overrides concurrency level and forces initialization of internal representation
     void initialize(int max_concurrency_, unsigned reserved_for_masters = 1,
-                    priority a_priority = priority::normal)
+                    priority a_priority = priority::normal
+#if __TBB_PREVIEW_PARALLEL_PHASE
+                    , leave_policy lp = leave_policy::automatic
+#endif
+    )
     {
         __TBB_ASSERT(!my_arena.load(std::memory_order_relaxed), "Impossible to modify settings of an already initialized task_arena");
         if( !is_active() ) {
             my_max_concurrency = max_concurrency_;
             my_num_reserved_slots = reserved_for_masters;
             my_priority = a_priority;
+#if __TBB_PREVIEW_PARALLEL_PHASE
+            set_leave_policy(lp);
+#endif
             r1::initialize(*this);
             mark_initialized();
         }
@@ -329,18 +407,23 @@ class task_arena : public task_arena_base {
 
 #if __TBB_ARENA_BINDING
     void initialize(constraints constraints_, unsigned reserved_for_masters = 1,
-                    priority a_priority = priority::normal)
+                    priority a_priority = priority::normal
+#if __TBB_PREVIEW_PARALLEL_PHASE
+                    , leave_policy lp = leave_policy::automatic
+#endif
+    )
     {
         __TBB_ASSERT(!my_arena.load(std::memory_order_relaxed), "Impossible to modify settings of an already initialized task_arena");
         if( !is_active() ) {
             my_numa_id = constraints_.numa_id;
             my_max_concurrency = constraints_.max_concurrency;
-#if __TBB_PREVIEW_TASK_ARENA_CONSTRAINTS_EXTENSION_PRESENT
             my_core_type = constraints_.core_type;
             my_max_threads_per_core = constraints_.max_threads_per_core;
-#endif
             my_num_reserved_slots = reserved_for_masters;
             my_priority = a_priority;
+#if __TBB_PREVIEW_PARALLEL_PHASE
+            set_leave_policy(lp);
+#endif
             r1::initialize(*this);
             mark_initialized();
         }
@@ -359,6 +442,11 @@ class task_arena : public task_arena_base {
         }
     }
 
+    //! Attaches this instance to the current arena of the thread
+    void initialize(d1::attach) {
+        initialize(attach{});
+    }
+
     //! Removes the reference to the internal arena representation.
     //! Not thread safe wrt concurrent invocations of other methods.
     void terminate() {
@@ -391,12 +479,10 @@ class task_arena : public task_arena_base {
 
     //! Enqueues a task into the arena to process a functor wrapped in task_handle, and immediately returns.
     //! Does not require the calling thread to join the arena
-#if __TBB_PREVIEW_TASK_GROUP_EXTENSIONS
     void enqueue(d2::task_handle&& th) {
         initialize();
         d2::enqueue_impl(std::move(th), this);
     }
-#endif //__TBB_PREVIEW_TASK_GROUP_EXTENSIONS
 
     //! Joins the arena and executes a mutable functor, then returns
     //! If not possible to join, wraps the functor into a task, enqueues it and waits for task completion
@@ -407,6 +493,32 @@ class task_arena : public task_arena_base {
         return execute_impl<decltype(f())>(f);
     }
 
+#if __TBB_PREVIEW_PARALLEL_PHASE
+    void start_parallel_phase() {
+        initialize();
+        r1::enter_parallel_phase(this, /*reserved*/0);
+    }
+    void end_parallel_phase(bool with_fast_leave = false) {
+        __TBB_ASSERT(my_initialization_state.load(std::memory_order_relaxed) == do_once_state::initialized, nullptr);
+        // It is guaranteed by the standard that conversion of boolean to integral type will result in either 0 or 1
+        r1::exit_parallel_phase(this, static_cast<std::uintptr_t>(with_fast_leave));
+    }
+
+    class scoped_parallel_phase {
+        task_arena& arena;
+        bool one_time_fast_leave;
+    public:
+        scoped_parallel_phase(task_arena& ta, bool with_fast_leave = false)
+            : arena(ta), one_time_fast_leave(with_fast_leave)
+        {
+            arena.start_parallel_phase();
+        }
+        ~scoped_parallel_phase() {
+            arena.end_parallel_phase(one_time_fast_leave);
+        }
+    };
+#endif
+
 #if __TBB_EXTRA_DEBUG
     //! Returns my_num_reserved_slots
     int debug_reserved_slots() const {
@@ -466,7 +578,6 @@ inline int max_concurrency() {
     return r1::max_concurrency(nullptr);
 }
 
-#if __TBB_PREVIEW_TASK_GROUP_EXTENSIONS
 inline void enqueue(d2::task_handle&& th) {
     d2::enqueue_impl(std::move(th), nullptr);
 }
@@ -475,7 +586,17 @@ template<typename F>
 inline void enqueue(F&& f) {
     enqueue_impl(std::forward<F>(f), nullptr);
 }
-#endif //__TBB_PREVIEW_TASK_GROUP_EXTENSIONS
+
+#if __TBB_PREVIEW_PARALLEL_PHASE
+inline void start_parallel_phase() {
+    r1::enter_parallel_phase(nullptr, /*reserved*/0);
+}
+
+inline void end_parallel_phase(bool with_fast_leave) {
+    // It is guaranteed by the standard that conversion of boolean to integral type will result in either 0 or 1
+    r1::exit_parallel_phase(nullptr, static_cast<std::uintptr_t>(with_fast_leave));
+}
+#endif
 
 using r1::submit;
 
@@ -484,6 +605,7 @@ using r1::submit;
 
 inline namespace v1 {
 using detail::d1::task_arena;
+using detail::d1::attach;
 
 #if __TBB_PREVIEW_TASK_GROUP_EXTENSIONS
 using detail::d1::is_inside_task;
@@ -494,8 +616,11 @@ using detail::d1::current_thread_index;
 using detail::d1::max_concurrency;
 using detail::d1::isolate;
 
-#if __TBB_PREVIEW_TASK_GROUP_EXTENSIONS
 using detail::d1::enqueue;
+
+#if __TBB_PREVIEW_PARALLEL_PHASE
+using detail::d1::start_parallel_phase;
+using detail::d1::end_parallel_phase;
 #endif
 } // namespace this_task_arena
 
diff --git a/external/tbb/include/oneapi/tbb/task_group.h b/external/tbb/include/oneapi/tbb/task_group.h
index 442ced16..c0811c85 100644
--- a/external/tbb/include/oneapi/tbb/task_group.h
+++ b/external/tbb/include/oneapi/tbb/task_group.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -26,10 +26,7 @@
 #include "detail/_task.h"
 #include "detail/_small_object_pool.h"
 #include "detail/_intrusive_list_node.h"
-
-#if __TBB_PREVIEW_TASK_GROUP_EXTENSIONS
 #include "detail/_task_handle.h"
-#endif
 
 #include "profiling.h"
 
@@ -48,13 +45,12 @@ namespace d1 {
 class delegate_base;
 class task_arena_base;
 class task_group_context;
-class task_group_base;
 }
 
 namespace r1 {
 // Forward declarations
 class tbb_exception_ptr;
-class market;
+class cancellation_disseminator;
 class thread_data;
 class task_dispatcher;
 template <bool>
@@ -77,7 +73,6 @@ struct task_group_context_impl;
 
 namespace d2 {
 
-#if __TBB_PREVIEW_TASK_GROUP_EXTENSIONS
 namespace {
 template<typename F>
 d1::task* task_ptr_or_nullptr(F&& f);
@@ -101,11 +96,12 @@ class function_task : public task_handle_task  {
     }
 public:
     template<typename FF>
-    function_task(FF&& f, d1::wait_context& wo, d1::task_group_context& ctx, d1::small_object_allocator& alloc)
-        : task_handle_task{wo, ctx, alloc},
+    function_task(FF&& f, d1::wait_tree_vertex_interface* vertex, d1::task_group_context& ctx, d1::small_object_allocator& alloc)
+        : task_handle_task{vertex, ctx, alloc},
           m_func(std::forward<FF>(f)) {}
 };
 
+#if __TBB_PREVIEW_TASK_GROUP_EXTENSIONS
 namespace {
     template<typename F>
     d1::task* task_ptr_or_nullptr_impl(std::false_type, F&& f){
@@ -186,8 +182,7 @@ class task_group_context : no_copy {
 
     //! Versioning for run-time checks and behavioral traits of the context.
     enum class task_group_context_version : std::uint8_t {
-        gold_2021U1   = 0,      // version of task_group_context released in oneTBB 2021.1 GOLD
-        proxy_support = 1       // backward compatible support for 'this' context to act as a proxy
+        unused = 1       // ensure that new versions, if any, will not clash with previously used ones
     };
     task_group_context_version my_version;
 
@@ -196,32 +191,33 @@ class task_group_context : no_copy {
         bool fp_settings        : 1;
         bool concurrent_wait    : 1;
         bool bound              : 1;
-        bool proxy              : 1; // true if 'this' acts as a proxy for user-specified context
         bool reserved1          : 1;
         bool reserved2          : 1;
         bool reserved3          : 1;
         bool reserved4          : 1;
+        bool reserved5          : 1;
     } my_traits;
 
     static_assert(sizeof(context_traits) == 1, "Traits shall fit into one byte.");
 
     static constexpr std::uint8_t may_have_children = 1;
     //! The context internal state (currently only may_have_children).
-    std::atomic<std::uint8_t> my_state;
+    std::atomic<std::uint8_t> my_may_have_children;
 
-    enum class lifetime_state : std::uint8_t {
+    enum class state : std::uint8_t {
         created,
         locked,
         isolated,
         bound,
-        dead
+        dead,
+        proxy = std::uint8_t(-1) //the context is not the real one, but proxy to other one
     };
 
     //! The synchronization machine state to manage lifetime.
-    std::atomic<lifetime_state> my_lifetime_state;
+    std::atomic<state> my_state;
 
     union {
-        //! Pointer to the context of the parent cancellation group. NULL for isolated contexts.
+        //! Pointer to the context of the parent cancellation group. nullptr for isolated contexts.
         task_group_context* my_parent;
 
         //! Pointer to the actual context 'this' context represents a proxy of.
@@ -255,7 +251,7 @@ class task_group_context : no_copy {
         - sizeof(std::uint8_t)                           // my_version
         - sizeof(context_traits)                         // my_traits
         - sizeof(std::atomic<std::uint8_t>)              // my_state
-        - sizeof(std::atomic<lifetime_state>)            // my_lifetime_state
+        - sizeof(std::atomic<state>)                     // my_state
         - sizeof(task_group_context*)                    // my_parent
         - sizeof(r1::context_list*)                      // my_context_list
         - sizeof(intrusive_list_node)                    // my_node
@@ -265,59 +261,50 @@ class task_group_context : no_copy {
     ];
 
     task_group_context(context_traits t, string_resource_index name)
-        : my_version{task_group_context_version::proxy_support}, my_name{name}
+        : my_version{task_group_context_version::unused}, my_name{name}
     {
         my_traits = t; // GCC4.8 issues warning list initialization for bitset (missing-field-initializers)
         r1::initialize(*this);
     }
 
-#if __TBB_PREVIEW_TASK_GROUP_EXTENSIONS
     task_group_context(task_group_context* actual_context)
-        : my_version{task_group_context_version::proxy_support}
+        : my_version{task_group_context_version::unused}
+        , my_state{state::proxy}
         , my_actual_context{actual_context}
     {
         __TBB_ASSERT(my_actual_context, "Passed pointer value points to nothing.");
-        my_traits.proxy = true;
         my_name = actual_context->my_name;
 
         // no need to initialize 'this' context as it acts as a proxy for my_actual_context, which
         // initialization is a user-side responsibility.
     }
-#endif
 
     static context_traits make_traits(kind_type relation_with_parent, std::uintptr_t user_traits) {
         context_traits ct;
         ct.fp_settings = (user_traits & fp_settings) == fp_settings;
         ct.concurrent_wait = (user_traits & concurrent_wait) == concurrent_wait;
         ct.bound = relation_with_parent == bound;
-        ct.proxy = false;
-        ct.reserved1 = ct.reserved2 = ct.reserved3 = ct.reserved4 = false;
+        ct.reserved1 = ct.reserved2 = ct.reserved3 = ct.reserved4 = ct.reserved5 = false;
         return ct;
     }
 
-#if __TBB_PREVIEW_TASK_GROUP_EXTENSIONS
     bool is_proxy() const {
-        return my_version >= task_group_context_version::proxy_support && my_traits.proxy;
+        return my_state.load(std::memory_order_relaxed) == state::proxy;
     }
-#endif
 
     task_group_context& actual_context() noexcept {
-#if __TBB_PREVIEW_TASK_GROUP_EXTENSIONS
         if (is_proxy()) {
             __TBB_ASSERT(my_actual_context, "Actual task_group_context is not set.");
             return *my_actual_context;
         }
-#endif
         return *this;
     }
 
     const task_group_context& actual_context() const noexcept {
-#if __TBB_PREVIEW_TASK_GROUP_EXTENSIONS
         if (is_proxy()) {
             __TBB_ASSERT(my_actual_context, "Actual task_group_context is not set.");
             return *my_actual_context;
         }
-#endif
         return *this;
     }
 
@@ -358,11 +345,9 @@ class task_group_context : no_copy {
 
     // Do not introduce any logic on user side since it might break state propagation assumptions
     ~task_group_context() {
-#if __TBB_PREVIEW_TASK_GROUP_EXTENSIONS
         // When 'this' serves as a proxy, the initialization does not happen - nor should the
         // destruction.
         if (!is_proxy())
-#endif
         {
             r1::destroy(*this);
         }
@@ -421,18 +406,27 @@ class task_group_context : no_copy {
     }
 private:
     //// TODO: cleanup friends
-    friend class r1::market;
+    friend class r1::cancellation_disseminator;
     friend class r1::thread_data;
     friend class r1::task_dispatcher;
     template <bool>
     friend class r1::context_guard_helper;
     friend struct r1::task_arena_impl;
     friend struct r1::task_group_context_impl;
-    friend class task_group_base;
+    friend class d2::task_group_base;
 }; // class task_group_context
 
 static_assert(sizeof(task_group_context) == 128, "Wrong size of task_group_context");
 
+inline bool is_current_task_group_canceling() {
+    task_group_context* ctx = current_context();
+    return ctx ? ctx->is_group_execution_cancelled() : false;
+}
+
+} // namespace d1
+
+namespace d2 {
+
 enum task_group_status {
     not_complete,
     complete,
@@ -445,77 +439,41 @@ class structured_task_group;
 class isolated_task_group;
 #endif
 
-template<typename F>
-class function_task : public task {
-    const F m_func;
-    wait_context& m_wait_ctx;
-    small_object_allocator m_allocator;
-
-    void finalize(const execution_data& ed) {
-        // Make a local reference not to access this after destruction.
-        wait_context& wo = m_wait_ctx;
-        // Copy allocator to the stack
-        auto allocator = m_allocator;
-        // Destroy user functor before release wait.
-        this->~function_task();
-        wo.release();
-
-        allocator.deallocate(this, ed);
-    }
-    task* execute(execution_data& ed) override {
-        task* res = d2::task_ptr_or_nullptr(m_func);
-        finalize(ed);
-        return res;
-    }
-    task* cancel(execution_data& ed) override {
-        finalize(ed);
-        return nullptr;
-    }
-public:
-    function_task(const F& f, wait_context& wo, small_object_allocator& alloc)
-        : m_func(f)
-        , m_wait_ctx(wo)
-        , m_allocator(alloc) {}
-
-    function_task(F&& f, wait_context& wo, small_object_allocator& alloc)
-        : m_func(std::move(f))
-        , m_wait_ctx(wo)
-        , m_allocator(alloc) {}
-};
-
 template <typename F>
-class function_stack_task : public task {
+class function_stack_task : public d1::task {
     const F& m_func;
-    wait_context& m_wait_ctx;
+    d1::wait_tree_vertex_interface* m_wait_tree_vertex;
 
     void finalize() {
-        m_wait_ctx.release();
+        m_wait_tree_vertex->release();
     }
-    task* execute(execution_data&) override {
+    task* execute(d1::execution_data&) override {
         task* res = d2::task_ptr_or_nullptr(m_func);
         finalize();
         return res;
     }
-    task* cancel(execution_data&) override {
+    task* cancel(d1::execution_data&) override {
         finalize();
         return nullptr;
     }
 public:
-    function_stack_task(const F& f, wait_context& wo) : m_func(f), m_wait_ctx(wo) {}
+    function_stack_task(const F& f, d1::wait_tree_vertex_interface* vertex) : m_func(f), m_wait_tree_vertex(vertex) {
+        m_wait_tree_vertex->reserve();
+    }
 };
 
 class task_group_base : no_copy {
 protected:
-    wait_context m_wait_ctx;
-    task_group_context m_context;
+    d1::wait_context_vertex m_wait_vertex;
+    d1::task_group_context m_context;
 
     template<typename F>
     task_group_status internal_run_and_wait(const F& f) {
-        function_stack_task<F> t{ f, m_wait_ctx };
-        m_wait_ctx.reserve();
+        function_stack_task<F> t{ f, r1::get_thread_reference_vertex(&m_wait_vertex) };
+
         bool cancellation_status = false;
         try_call([&] {
-            execute_and_wait(t, context(), m_wait_ctx, context());
+            execute_and_wait(t, context(), m_wait_vertex.get_context(), context());
         }).on_completion([&] {
             // TODO: the reset method is not thread-safe. Ensure the correct behavior.
             cancellation_status = context().is_group_execution_cancelled();
@@ -524,20 +482,15 @@ class task_group_base : no_copy {
         return cancellation_status ? canceled : complete;
     }
 
-#if __TBB_PREVIEW_TASK_GROUP_EXTENSIONS
     task_group_status internal_run_and_wait(d2::task_handle&& h) {
-        if (h == nullptr) {
-            throw_exception(exception_id::bad_task_handle);
-        }
+        __TBB_ASSERT(h != nullptr, "Attempt to schedule empty task_handle");
 
         using acs = d2::task_handle_accessor;
-        if (&acs::ctx_of(h) != &context()) {
-            throw_exception(exception_id::bad_task_handle_wrong_task_group);
-        }
+        __TBB_ASSERT(&acs::ctx_of(h) == &context(), "Attempt to schedule task_handle into different task_group");
 
         bool cancellation_status = false;
         try_call([&] {
-            execute_and_wait(*acs::release(h), context(), m_wait_ctx, context());
+            execute_and_wait(*acs::release(h), context(), m_wait_vertex.get_context(), context());
         }).on_completion([&] {
             // TODO: the reset method is not thread-safe. Ensure the correct behavior.
             cancellation_status = context().is_group_execution_cancelled();
@@ -545,45 +498,41 @@ class task_group_base : no_copy {
         });
         return cancellation_status ? canceled : complete;
     }
-#endif
+
     template<typename F>
-    task* prepare_task(F&& f) {
-        m_wait_ctx.reserve();
-        small_object_allocator alloc{};
-        return alloc.new_object<function_task<typename std::decay<F>::type>>(std::forward<F>(f), m_wait_ctx, alloc);
+    d1::task* prepare_task(F&& f) {
+        d1::small_object_allocator alloc{};
+        return alloc.new_object<function_task<typename std::decay<F>::type>>(std::forward<F>(f),
+            r1::get_thread_reference_vertex(&m_wait_vertex), context(), alloc);
     }
 
-    task_group_context& context() noexcept {
+    d1::task_group_context& context() noexcept {
         return m_context.actual_context();
     }
 
-#if __TBB_PREVIEW_TASK_GROUP_EXTENSIONS
     template<typename F>
     d2::task_handle prepare_task_handle(F&& f) {
-        m_wait_ctx.reserve();
-        small_object_allocator alloc{};
+        d1::small_object_allocator alloc{};
         using function_task_t =  d2::function_task<typename std::decay<F>::type>;
-        d2::task_handle_task* function_task_p =  alloc.new_object<function_task_t>(std::forward<F>(f), m_wait_ctx, context(), alloc);
+        d2::task_handle_task* function_task_p =  alloc.new_object<function_task_t>(std::forward<F>(f),
+            r1::get_thread_reference_vertex(&m_wait_vertex), context(), alloc);
 
         return d2::task_handle_accessor::construct(function_task_p);
     }
-#endif
 
 public:
     task_group_base(uintptr_t traits = 0)
-        : m_wait_ctx(0)
-        , m_context(task_group_context::bound, task_group_context::default_traits | traits)
+        : m_wait_vertex(0)
+        , m_context(d1::task_group_context::bound, d1::task_group_context::default_traits | traits)
     {}
 
-#if __TBB_PREVIEW_TASK_GROUP_EXTENSIONS
-    task_group_base(task_group_context& ctx)
-        : m_wait_ctx(0)
+    task_group_base(d1::task_group_context& ctx)
+        : m_wait_vertex(0)
         , m_context(&ctx)
     {}
-#endif
 
     ~task_group_base() noexcept(false) {
-        if (m_wait_ctx.continue_execution()) {
+        if (m_wait_vertex.continue_execution()) {
 #if __TBB_CPP17_UNCAUGHT_EXCEPTIONS_PRESENT
             bool stack_unwinding_in_progress = std::uncaught_exceptions() > 0;
 #else
@@ -593,7 +542,7 @@ class task_group_base : no_copy {
             // in case of missing wait (for the sake of better testability & debuggability)
             if (!context().is_group_execution_cancelled())
                 cancel();
-            d1::wait(m_wait_ctx, context());
+            d1::wait(m_wait_vertex.get_context(), context());
             if (!stack_unwinding_in_progress)
                 throw_exception(exception_id::missing_wait);
         }
@@ -602,7 +551,7 @@ class task_group_base : no_copy {
     task_group_status wait() {
         bool cancellation_status = false;
         try_call([&] {
-            d1::wait(m_wait_ctx, context());
+            d1::wait(m_wait_vertex.get_context(), context());
         }).on_completion([&] {
             // TODO: the reset method is not thread-safe. Ensure the correct behavior.
             cancellation_status = m_context.is_group_execution_cancelled();
@@ -618,29 +567,21 @@ class task_group_base : no_copy {
 
 class task_group : public task_group_base {
 public:
-    task_group() : task_group_base(task_group_context::concurrent_wait) {}
-
-#if __TBB_PREVIEW_TASK_GROUP_EXTENSIONS
-    task_group(task_group_context& ctx) : task_group_base(ctx) {}
-#endif
+    task_group() : task_group_base(d1::task_group_context::concurrent_wait) {}
+    task_group(d1::task_group_context& ctx) : task_group_base(ctx) {}
 
     template<typename F>
     void run(F&& f) {
-        spawn(*prepare_task(std::forward<F>(f)), context());
+        d1::spawn(*prepare_task(std::forward<F>(f)), context());
     }
 
-#if __TBB_PREVIEW_TASK_GROUP_EXTENSIONS    
     void run(d2::task_handle&& h) {
-        if (h == nullptr) {
-            throw_exception(exception_id::bad_task_handle);
-        }
+        __TBB_ASSERT(h != nullptr, "Attempt to schedule empty task_handle");
 
         using acs = d2::task_handle_accessor;
-        if (&acs::ctx_of(h) != &context()) {
-            throw_exception(exception_id::bad_task_handle_wrong_task_group);
-        }
+        __TBB_ASSERT(&acs::ctx_of(h) == &context(), "Attempt to schedule task_handle into different task_group");
 
-        spawn(*acs::release(h), context());
+        d1::spawn(*acs::release(h), context());
     }
 
     template<typename F>
@@ -648,35 +589,32 @@ class task_group : public task_group_base {
         return prepare_task_handle(std::forward<F>(f));
 
     }
-#endif //__TBB_PREVIEW_TASK_GROUP_EXTENSIONS
-    
+
     template<typename F>
     task_group_status run_and_wait(const F& f) {
         return internal_run_and_wait(f);
     }
 
-#if __TBB_PREVIEW_TASK_GROUP_EXTENSIONS
     task_group_status run_and_wait(d2::task_handle&& h) {
         return internal_run_and_wait(std::move(h));
     }
-#endif
 }; // class task_group
 
 #if TBB_PREVIEW_ISOLATED_TASK_GROUP
-class spawn_delegate : public delegate_base {
-    task* task_to_spawn;
-    task_group_context& context;
+class spawn_delegate : public d1::delegate_base {
+    d1::task* task_to_spawn;
+    d1::task_group_context& context;
     bool operator()() const override {
         spawn(*task_to_spawn, context);
         return true;
     }
 public:
-    spawn_delegate(task* a_task, task_group_context& ctx)
+    spawn_delegate(d1::task* a_task, d1::task_group_context& ctx)
         : task_to_spawn(a_task), context(ctx)
     {}
 };
 
-class wait_delegate : public delegate_base {
+class wait_delegate : public d1::delegate_base {
     bool operator()() const override {
         status = tg.wait();
         return true;
@@ -708,9 +646,7 @@ class isolated_task_group : public task_group {
 public:
     isolated_task_group() : task_group() {}
 
-#if __TBB_PREVIEW_TASK_GROUP_EXTENSIONS
-    isolated_task_group(task_group_context& ctx) : task_group(ctx) {}
-#endif
+    isolated_task_group(d1::task_group_context& ctx) : task_group(ctx) {}
 
     template<typename F>
     void run(F&& f) {
@@ -718,21 +654,15 @@ class isolated_task_group : public task_group {
         r1::isolate_within_arena(sd, this_isolation());
     }
 
-#if __TBB_PREVIEW_TASK_GROUP_EXTENSIONS
     void run(d2::task_handle&& h) {
-        if (h == nullptr) {
-            throw_exception(exception_id::bad_task_handle);
-        }
+        __TBB_ASSERT(h != nullptr, "Attempt to schedule empty task_handle");
 
         using acs = d2::task_handle_accessor;
-        if (&acs::ctx_of(h) != &context()) {
-            throw_exception(exception_id::bad_task_handle_wrong_task_group);
-        }
+        __TBB_ASSERT(&acs::ctx_of(h) == &context(), "Attempt to schedule task_handle into different task_group");
 
         spawn_delegate sd(acs::release(h), context());
         r1::isolate_within_arena(sd, this_isolation());
     }
-#endif //__TBB_PREVIEW_TASK_GROUP_EXTENSIONS
 
     template<typename F>
     task_group_status run_and_wait( const F& f ) {
@@ -752,33 +682,25 @@ class isolated_task_group : public task_group {
     }
 }; // class isolated_task_group
 #endif // TBB_PREVIEW_ISOLATED_TASK_GROUP
-
-inline bool is_current_task_group_canceling() {
-    task_group_context* ctx = current_context();
-    return ctx ? ctx->is_group_execution_cancelled() : false;
-}
-
-} // namespace d1
+} // namespace d2
 } // namespace detail
 
 inline namespace v1 {
 using detail::d1::task_group_context;
-using detail::d1::task_group;
+using detail::d2::task_group;
 #if TBB_PREVIEW_ISOLATED_TASK_GROUP
-using detail::d1::isolated_task_group;
+using detail::d2::isolated_task_group;
 #endif
 
-using detail::d1::task_group_status;
-using detail::d1::not_complete;
-using detail::d1::complete;
-using detail::d1::canceled;
+using detail::d2::task_group_status;
+using detail::d2::not_complete;
+using detail::d2::complete;
+using detail::d2::canceled;
 
 using detail::d1::is_current_task_group_canceling;
 using detail::r1::missing_wait;
 
-#if __TBB_PREVIEW_TASK_GROUP_EXTENSIONS
 using detail::d2::task_handle;
-#endif
 }
 
 } // namespace tbb
diff --git a/external/tbb/include/oneapi/tbb/version.h b/external/tbb/include/oneapi/tbb/version.h
index 794c160e..507fad2a 100644
--- a/external/tbb/include/oneapi/tbb/version.h
+++ b/external/tbb/include/oneapi/tbb/version.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2025 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -17,24 +17,34 @@
 #ifndef __TBB_version_H
 #define __TBB_version_H
 
-#include "detail/_config.h"
-#include "detail/_namespace_injection.h"
+// Exclude all includes during .rc files compilation
+#ifndef RC_INVOKED
+    #include "detail/_config.h"
+    #include "detail/_namespace_injection.h"
+#else
+    #define __TBB_STRING_AUX(x) #x
+    #define __TBB_STRING(x) __TBB_STRING_AUX(x)
+#endif
 
 // Product version
-#define TBB_VERSION_MAJOR 2021
+#define TBB_VERSION_MAJOR 2022
 // Update version
-#define TBB_VERSION_MINOR 5
+#define TBB_VERSION_MINOR 1
 // "Patch" version for custom releases
 #define TBB_VERSION_PATCH 0
 // Suffix string
 #define __TBB_VERSION_SUFFIX ""
 // Full official version string
-#define TBB_VERSION_STRING __TBB_STRING(TBB_VERSION_MAJOR) "." __TBB_STRING(TBB_VERSION_MINOR) __TBB_VERSION_SUFFIX
+#define TBB_VERSION_STRING              \
+    __TBB_STRING(TBB_VERSION_MAJOR) "." \
+    __TBB_STRING(TBB_VERSION_MINOR) "." \
+    __TBB_STRING(TBB_VERSION_PATCH)     \
+    __TBB_VERSION_SUFFIX
 
 // OneAPI oneTBB specification version
-#define ONETBB_SPEC_VERSION "1.0"
+#define ONETBB_SPEC_VERSION 104
 // Full interface version
-#define TBB_INTERFACE_VERSION 12050
+#define TBB_INTERFACE_VERSION 12150
 // Major interface version
 #define TBB_INTERFACE_VERSION_MAJOR (TBB_INTERFACE_VERSION/1000)
 // Minor interface version
@@ -45,37 +55,37 @@
 #define __TBB_BINARY_VERSION 12
 
 //! TBB_VERSION support
-#ifndef ENDL
-#define ENDL "\n"
+#ifndef TBB_ENDL
+#define TBB_ENDL "\n"
 #endif
 
 //TBB_REVAMP_TODO: consider enabling version_string.ver generation
 //TBB_REVAMP_TODO: #include "version_string.ver"
 
-#define __TBB_ONETBB_SPEC_VERSION(N) #N ": SPECIFICATION VERSION\t" ONETBB_SPEC_VERSION ENDL
-#define __TBB_VERSION_NUMBER(N) #N ": VERSION\t\t" TBB_VERSION_STRING ENDL
-#define __TBB_INTERFACE_VERSION_NUMBER(N) #N ": INTERFACE VERSION\t" __TBB_STRING(TBB_INTERFACE_VERSION) ENDL
+#define __TBB_ONETBB_SPEC_VERSION(N) #N ": SPECIFICATION VERSION\t" __TBB_STRING(ONETBB_SPEC_VERSION) TBB_ENDL
+#define __TBB_VERSION_NUMBER(N) #N ": VERSION\t\t" TBB_VERSION_STRING TBB_ENDL
+#define __TBB_INTERFACE_VERSION_NUMBER(N) #N ": INTERFACE VERSION\t" __TBB_STRING(TBB_INTERFACE_VERSION) TBB_ENDL
 
 #ifndef TBB_USE_DEBUG
-    #define __TBB_VERSION_USE_DEBUG(N) #N ": TBB_USE_DEBUG\tundefined" ENDL
+    #define __TBB_VERSION_USE_DEBUG(N) #N ": TBB_USE_DEBUG\tundefined" TBB_ENDL
 #elif TBB_USE_DEBUG==0
-    #define __TBB_VERSION_USE_DEBUG(N) #N ": TBB_USE_DEBUG\t0" ENDL
+    #define __TBB_VERSION_USE_DEBUG(N) #N ": TBB_USE_DEBUG\t0" TBB_ENDL
 #elif TBB_USE_DEBUG==1
-    #define __TBB_VERSION_USE_DEBUG(N) #N ": TBB_USE_DEBUG\t1" ENDL
+    #define __TBB_VERSION_USE_DEBUG(N) #N ": TBB_USE_DEBUG\t1" TBB_ENDL
 #elif TBB_USE_DEBUG==2
-    #define __TBB_VERSION_USE_DEBUG(N) #N ": TBB_USE_DEBUG\t2" ENDL
+    #define __TBB_VERSION_USE_DEBUG(N) #N ": TBB_USE_DEBUG\t2" TBB_ENDL
 #else
     #error Unexpected value for TBB_USE_DEBUG
 #endif
 
 #ifndef TBB_USE_ASSERT
-    #define __TBB_VERSION_USE_ASSERT(N) #N ": TBB_USE_ASSERT\tundefined" ENDL
+    #define __TBB_VERSION_USE_ASSERT(N) #N ": TBB_USE_ASSERT\tundefined" TBB_ENDL
 #elif TBB_USE_ASSERT==0
-    #define __TBB_VERSION_USE_ASSERT(N) #N ": TBB_USE_ASSERT\t0" ENDL
+    #define __TBB_VERSION_USE_ASSERT(N) #N ": TBB_USE_ASSERT\t0" TBB_ENDL
 #elif TBB_USE_ASSERT==1
-    #define __TBB_VERSION_USE_ASSERT(N) #N ": TBB_USE_ASSERT\t1" ENDL
+    #define __TBB_VERSION_USE_ASSERT(N) #N ": TBB_USE_ASSERT\t1" TBB_ENDL
 #elif TBB_USE_ASSERT==2
-    #define __TBB_VERSION_USE_ASSERT(N) #N ": TBB_USE_ASSERT\t2" ENDL
+    #define __TBB_VERSION_USE_ASSERT(N) #N ": TBB_USE_ASSERT\t2" TBB_ENDL
 #else
     #error Unexpected value for TBB_USE_ASSERT
 #endif
diff --git a/external/tbb/include/tbb/blocked_nd_range.h b/external/tbb/include/tbb/blocked_nd_range.h
new file mode 100644
index 00000000..70ca73af
--- /dev/null
+++ b/external/tbb/include/tbb/blocked_nd_range.h
@@ -0,0 +1,17 @@
+/*
+    Copyright (c) 2017-2024 Intel Corporation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#include "../oneapi/tbb/blocked_nd_range.h"
diff --git a/external/tbb/include/tbb/mutex.h b/external/tbb/include/tbb/mutex.h
new file mode 100644
index 00000000..91dbee0f
--- /dev/null
+++ b/external/tbb/include/tbb/mutex.h
@@ -0,0 +1,17 @@
+/*
+    Copyright (c) 2023 Intel Corporation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#include "../oneapi/tbb/mutex.h"
diff --git a/external/tbb/include/tbb/rw_mutex.h b/external/tbb/include/tbb/rw_mutex.h
new file mode 100644
index 00000000..f2499eba
--- /dev/null
+++ b/external/tbb/include/tbb/rw_mutex.h
@@ -0,0 +1,17 @@
+/*
+    Copyright (c) 2023 Intel Corporation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#include "../oneapi/tbb/rw_mutex.h"
diff --git a/external/tbb/integration/linux/env/vars.sh b/external/tbb/integration/linux/env/vars.sh
index 151b298d..5d913bb6 100644
--- a/external/tbb/integration/linux/env/vars.sh
+++ b/external/tbb/integration/linux/env/vars.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # shellcheck shell=sh
 #
-# Copyright (c) 2005-2021 Intel Corporation
+# Copyright (c) 2005-2023 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# The script is setting up environment for TBB.
+# The script is setting up environment for oneTBB.
 # Supported arguments:
 #   intel64|ia32 - architecture, intel64 is default.
 
@@ -139,6 +139,7 @@ fi
 TBBROOT=$(get_script_path "${vars_script_name:-}")/..
 
 TBB_TARGET_ARCH="intel64"
+TBB_ARCH_SUFFIX=""
 
 if [ -n "${SETVARS_ARGS:-}" ]; then
   tbb_arg_ia32="$(expr "${SETVARS_ARGS:-}" : '^.*\(ia32\)')" || true
@@ -157,17 +158,26 @@ else
 fi
 
 TBB_LIB_NAME="libtbb.so.12"
-TBB_LIB_DIR="$TBB_TARGET_ARCH/gcc4.8"
 
-if [ -e "$TBBROOT/lib/$TBB_LIB_DIR/$TBB_LIB_NAME" ]; then
+# Parse layout
+if [ -e "$TBBROOT/lib/$TBB_TARGET_ARCH" ]; then
+  TBB_LIB_DIR="$TBB_TARGET_ARCH/gcc4.8"
+else
+  if [ "$TBB_TARGET_ARCH" = "ia32" ] ; then
+    TBB_ARCH_SUFFIX="32"
+  fi
+  TBB_LIB_DIR=""
+fi
+
+if [ -e "$TBBROOT/lib$TBB_ARCH_SUFFIX/$TBB_LIB_DIR/$TBB_LIB_NAME" ]; then
   export TBBROOT
 
-  LIBRARY_PATH=$(prepend_path "${TBBROOT}/lib/$TBB_LIB_DIR" "${LIBRARY_PATH:-}") ; export LIBRARY_PATH
-  LD_LIBRARY_PATH=$(prepend_path "${TBBROOT}/lib/$TBB_LIB_DIR" "${LD_LIBRARY_PATH:-}") ; export LD_LIBRARY_PATH
+  LIBRARY_PATH=$(prepend_path "${TBBROOT}/lib$TBB_ARCH_SUFFIX/$TBB_LIB_DIR" "${LIBRARY_PATH:-}") ; export LIBRARY_PATH
+  LD_LIBRARY_PATH=$(prepend_path "${TBBROOT}/lib$TBB_ARCH_SUFFIX/$TBB_LIB_DIR" "${LD_LIBRARY_PATH:-}") ; export LD_LIBRARY_PATH
   CPATH=$(prepend_path "${TBBROOT}/include" "${CPATH:-}") ; export CPATH
   CMAKE_PREFIX_PATH=$(prepend_path "${TBBROOT}" "${CMAKE_PREFIX_PATH:-}") ; export CMAKE_PREFIX_PATH
-  PKG_CONFIG_PATH=$(prepend_path "${TBBROOT}/lib/pkgconfig" "${PKG_CONFIG_PATH:-}") ; export PKG_CONFIG_PATH
+  PKG_CONFIG_PATH=$(prepend_path "${TBBROOT}/lib$TBB_ARCH_SUFFIX/pkgconfig" "${PKG_CONFIG_PATH:-}") ; export PKG_CONFIG_PATH
 else
-  >&2 echo "ERROR: $TBB_LIB_NAME library does not exist in $TBBROOT/lib/$TBB_LIB_DIR."
+  >&2 echo "ERROR: $TBB_LIB_NAME library does not exist in $TBBROOT/lib$TBB_ARCH_SUFFIX/$TBB_LIB_DIR."
   return 255 2>/dev/null || exit 255
 fi
diff --git a/external/tbb/integration/linux/modulefiles/tbb b/external/tbb/integration/linux/modulefiles/tbb
index b5eeb320..58113ee6 100644
--- a/external/tbb/integration/linux/modulefiles/tbb
+++ b/external/tbb/integration/linux/modulefiles/tbb
@@ -1,6 +1,6 @@
 #%Module1.0###################################################################
 #
-# Copyright (c) 2020-2021 Intel Corporation
+# Copyright (c) 2020-2024 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,17 +14,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Why all the directory and filename boilerplate code? It is needed in order
-# to properly remove symbolic links used in assembly of the modulefiles
-# folder as well as those found within the oneAPI installation folders.
-# Without it many modulefiles will fail to work as expected.
-
-# IMPORTANT: quotes around "$variables" and "[expressions]" are there
-# to insure that paths/filenames which include spaces are handled properly.
-
 # This modulefile requires Environment Modules 4.1 or later.
 # Type `module --version` to determine the current installed version.
 
+##############################################################################
+
 set min_tcl_ver 8.4
 if { $tcl_version < $min_tcl_ver } {
     puts stderr " "
@@ -33,72 +27,43 @@ if { $tcl_version < $min_tcl_ver } {
     exit 1
 }
 
-# get full pathname for this script file
+# if modulefile script name is a symlink, resolve it to get the fully
+# qualified pathname that points to the actual modulefile script
+# see: https://wiki.tcl-lang.org/page/file+normalize
 set scriptpath "${ModulesCurrentModulefile}"
-
-# if modulefile script name is a symlink, resolve it
-if { "[file type "$scriptpath"]" eq "link" } {
-    set scriptpath "[file readlink "$scriptpath"]"
+set scriptpath "[file dirname [file normalize "$scriptpath/___"]]"
+
+# define componentroot, modulefilepath, modulefilename and modulefilever
+set modulefilename "[file tail [file dirname "${scriptpath}"]]"
+set modulefilever "[file tail "${scriptpath}"]"
+set modulefilepath "${scriptpath}"
+set componentroot "[file dirname [file dirname [file dirname [file dirname "${scriptpath}"]]]]"
+
+##############################################################################
+
+module-whatis "Name: Intel(R) oneAPI Threading Building Blocks"
+module-whatis "Version: $modulefilename/$modulefilever"
+module-whatis "Description: Flexible threading library for adding parallelism to complex applications across accelerated architectures."
+module-whatis "URL: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onetbb.html"
+module-whatis "Dependencies: none"
+
+proc ModulesHelp { } {
+    global modulefilename
+    global modulefilever
+    puts "module whatis ${modulefilename}/${modulefilever}"
 }
 
-# if fullpath contains links, resolve them
-set scriptpath "[file normalize "$scriptpath"]"
-
-# get directory holding this modulefile script and others
-set modulefileroot "[file dirname "$scriptpath"]"
+##############################################################################
 
-# get name of modulefile script we are loading
-set modulefilename "[file tail "$scriptpath"]"
+# Define environment variables needed for an isolated component install.
 
-# determine modulefile script version
-set modulefilever "[file dirname "$modulefileroot"]"
-set modulefilever "[file tail "$modulefilever"]"
-
-# point to component top-level root folder
-set componentroot "[file dirname "$modulefileroot"]"
-set componentroot "[file dirname "$componentroot"]"
-
-# get component folder name
-set componentname "[file tail "$componentroot"]"
-
-# get oneAPI top-level root folder
-set oneapiroot "[file dirname "$componentroot"]"
-
-# disallow loading multiple versions of this modulefile
-# disallow loading multiple architectures of this modulefile
-# if only 64-bit architecture exists the test still works
-set mname32 $modulefilename
-set mname64 [string trimright $mname32 "32"]
-if { [string equal "$mname32" "$mname64"] } {
-    append mname32 "32"
-}
-conflict $mname32
-conflict $mname64
-
-
-# On load print component name and version being loaded
-if { [ module-info mode load ] } {
-    puts stderr "Loading $modulefilename version $modulefilever"
-}
-
-# On `module unload` print component module name and version being removed
-# Include `module list` message only if this modulefile loads dependent modules
-if { [ module-info mode ] == "unload" || [ module-info mode ] == "remove" } {
-    puts stderr "Removing $modulefilename version $modulefilever"
-    puts stderr "Use `module list` to view any remaining dependent modules."
-}
-
-
-# ###### Component Specific env vars setup ###################################
-
-set tbbroot "$componentroot/$modulefilever"
+set tbbroot "$componentroot"
 set tbb_target_arch "intel64"
 
-module-whatis "Intel(R) oneAPI Threading Building Blocks for $tbb_target_arch."
-
 setenv TBBROOT "$tbbroot"
 
 prepend-path CPATH "$tbbroot/include"
-prepend-path LIBRARY_PATH "$tbbroot/lib/$tbb_target_arch/gcc4.8"
-prepend-path LD_LIBRARY_PATH "$tbbroot/lib/$tbb_target_arch/gcc4.8"
+prepend-path LIBRARY_PATH "$tbbroot/lib"
+prepend-path LD_LIBRARY_PATH "$tbbroot/lib"
 prepend-path CMAKE_PREFIX_PATH "$tbbroot"
+prepend-path PKG_CONFIG_PATH "$tbbroot/lib/pkgconfig"
diff --git a/external/tbb/integration/linux/modulefiles/tbb32 b/external/tbb/integration/linux/modulefiles/tbb32
index ec8ff874..89d6bc60 100644
--- a/external/tbb/integration/linux/modulefiles/tbb32
+++ b/external/tbb/integration/linux/modulefiles/tbb32
@@ -1,6 +1,6 @@
 #%Module1.0###################################################################
 #
-# Copyright (c) 2020-2021 Intel Corporation
+# Copyright (c) 2020-2024 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,17 +14,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Why all the directory and filename boilerplate code? It is needed in order
-# to properly remove symbolic links used in assembly of the modulefiles
-# folder as well as those found within the oneAPI installation folders.
-# Without it many modulefiles will fail to work as expected.
-
-# IMPORTANT: quotes around "$variables" and "[expressions]" are there
-# to insure that paths/filenames which include spaces are handled properly.
-
 # This modulefile requires Environment Modules 4.1 or later.
 # Type `module --version` to determine the current installed version.
 
+##############################################################################
+
 set min_tcl_ver 8.4
 if { $tcl_version < $min_tcl_ver } {
     puts stderr " "
@@ -33,72 +27,43 @@ if { $tcl_version < $min_tcl_ver } {
     exit 1
 }
 
-# get full pathname for this script file
+# if modulefile script name is a symlink, resolve it to get the fully
+# qualified pathname that points to the actual modulefile script
+# see: https://wiki.tcl-lang.org/page/file+normalize
 set scriptpath "${ModulesCurrentModulefile}"
-
-# if modulefile script name is a symlink, resolve it
-if { "[file type "$scriptpath"]" eq "link" } {
-    set scriptpath "[file readlink "$scriptpath"]"
+set scriptpath "[file dirname [file normalize "$scriptpath/___"]]"
+
+# define componentroot, modulefilepath, modulefilename and modulefilever
+set modulefilename "[file tail [file dirname "${scriptpath}"]]"
+set modulefilever "[file tail "${scriptpath}"]"
+set modulefilepath "${scriptpath}"
+set componentroot "[file dirname [file dirname [file dirname [file dirname "${scriptpath}"]]]]"
+
+##############################################################################
+
+module-whatis "Name: Intel(R) oneAPI Threading Building Blocks"
+module-whatis "Version: $modulefilename/$modulefilever"
+module-whatis "Description: Flexible threading library for adding parallelism to complex applications across accelerated architectures."
+module-whatis "URL: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onetbb.html"
+module-whatis "Dependencies: none"
+
+proc ModulesHelp { } {
+    global modulefilename
+    global modulefilever
+    puts "module whatis ${modulefilename}/${modulefilever}"
 }
 
-# if fullpath contains links, resolve them
-set scriptpath "[file normalize "$scriptpath"]"
-
-# get directory holding this modulefile script and others
-set modulefileroot "[file dirname "$scriptpath"]"
+##############################################################################
 
-# get name of modulefile script we are loading
-set modulefilename "[file tail "$scriptpath"]"
+# Define environment variables needed for an isolated component install.
 
-# determine modulefile script version
-set modulefilever "[file dirname "$modulefileroot"]"
-set modulefilever "[file tail "$modulefilever"]"
-
-# point to component top-level root folder
-set componentroot "[file dirname "$modulefileroot"]"
-set componentroot "[file dirname "$componentroot"]"
-
-# get component folder name
-set componentname "[file tail "$componentroot"]"
-
-# get oneAPI top-level root folder
-set oneapiroot "[file dirname "$componentroot"]"
-
-# disallow loading multiple versions of this modulefile
-# disallow loading multiple architectures of this modulefile
-# if only 64-bit architecture exists the test still works
-set mname32 $modulefilename
-set mname64 [string trimright $mname32 "32"]
-if { [string equal "$mname32" "$mname64"] } {
-    append mname32 "32"
-}
-conflict $mname32
-conflict $mname64
-
-
-# On load print component name and version being loaded
-if { [ module-info mode load ] } {
-    puts stderr "Loading $modulefilename version $modulefilever"
-}
-
-# On `module unload` print component module name and version being removed
-# Include `module list` message only if this modulefile loads dependent modules
-if { [ module-info mode ] == "unload" || [ module-info mode ] == "remove" } {
-    puts stderr "Removing $modulefilename version $modulefilever"
-    puts stderr "Use `module list` to view any remaining dependent modules."
-}
-
-
-# ###### Component Specific env vars setup ###################################
-
-set tbbroot "$componentroot/$modulefilever"
+set tbbroot "$componentroot"
 set tbb_target_arch "ia32"
 
-module-whatis "Intel(R) oneAPI Threading Building Blocks for $tbb_target_arch."
-
 setenv TBBROOT "$tbbroot"
 
-prepend-path CPATH "$tbbroot/include"
-prepend-path LIBRARY_PATH "$tbbroot/lib/$tbb_target_arch/gcc4.8"
-prepend-path LD_LIBRARY_PATH "$tbbroot/lib/$tbb_target_arch/gcc4.8"
+prepend-path CPATH "$tbbroot/include32:$tbbroot/include"
+prepend-path LIBRARY_PATH "$tbbroot/lib32"
+prepend-path LD_LIBRARY_PATH "$tbbroot/lib32"
 prepend-path CMAKE_PREFIX_PATH "$tbbroot"
+prepend-path PKG_CONFIG_PATH "$tbbroot/lib32/pkgconfig"
diff --git a/external/tbb/integration/linux/oneapi/vars.sh b/external/tbb/integration/linux/oneapi/vars.sh
new file mode 100644
index 00000000..ffcf56a5
--- /dev/null
+++ b/external/tbb/integration/linux/oneapi/vars.sh
@@ -0,0 +1,34 @@
+#!/bin/sh
+# shellcheck shell=sh
+#
+# Copyright (c) 2023 Intel Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+if [ -z "${SETVARS_CALL:-}" ] ; then
+  >&2 echo " "
+  >&2 echo ":: ERROR: This script must be sourced by setvars.sh."
+  >&2 echo "   Try 'source <install-dir>/setvars.sh --help' for help."
+  >&2 echo " "
+  return 255
+fi
+
+if [ -z "${ONEAPI_ROOT:-}" ] ; then
+  >&2 echo " "
+  >&2 echo ":: ERROR: This script requires that the ONEAPI_ROOT env variable is set."
+  >&2 echo "   Try 'source <install-dir>\setvars.sh --help' for help."
+  >&2 echo " "
+  return 254
+fi
+
+TBBROOT="${ONEAPI_ROOT}"; export TBBROOT
diff --git a/external/tbb/integration/pkg-config/tbb.pc.in b/external/tbb/integration/pkg-config/tbb.pc.in
index d87fcf56..2fe03c72 100644
--- a/external/tbb/integration/pkg-config/tbb.pc.in
+++ b/external/tbb/integration/pkg-config/tbb.pc.in
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Intel Corporation
+# Copyright (c) 2021-2024 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@ includedir=@_includedir_for_pc_file@
 
 Name: oneAPI Threading Building Blocks (oneTBB)
 Description: C++ library for parallel programming on multi-core processors.
-URL: https://github.com/oneapi-src/oneTBB
+URL: https://github.com/uxlfoundation/oneTBB
 Version: @TBB_VERSION@
-Libs: -L${libdir} -l@_tbb_pc_lib_name@
+Libs: -L${libdir} @_tbb_pc_extra_libdir@ -l@_tbb_pc_lib_name@
 Cflags: -I${includedir}
diff --git a/external/tbb/integration/windows/env/vars.bat b/external/tbb/integration/windows/env/vars.bat
index 3618ac4e..c5ec0ddc 100644
--- a/external/tbb/integration/windows/env/vars.bat
+++ b/external/tbb/integration/windows/env/vars.bat
@@ -1,6 +1,6 @@
 @echo off
 REM
-REM Copyright (c) 2005-2021 Intel Corporation
+REM Copyright (c) 2005-2023 Intel Corporation
 REM
 REM Licensed under the Apache License, Version 2.0 (the "License");
 REM you may not use this file except in compliance with the License.
@@ -22,45 +22,72 @@ REM        ia32         : Set up for IA-32  architecture
 REM        intel64      : Set up for Intel(R) 64  architecture
 REM    if ^<arch^> is not set Intel(R) 64 architecture will be used
 REM    ^<vs^> should be one of the following
-REM        vs2015      : Set to use with Microsoft Visual Studio 2015 runtime DLLs
-REM        vs2017      : Set to use with Microsoft Visual Studio 2017 runtime DLLs
 REM        vs2019      : Set to use with Microsoft Visual Studio 2019 runtime DLLs
-REM        all         : Set to use TBB statically linked with Microsoft Visual C++ runtime
-REM    if ^<vs^> is not set TBB statically linked with Microsoft Visual C++ runtime will be used.
+REM        vs2022      : Set to use with Microsoft Visual Studio 2022 runtime DLLs
+REM        all         : Set to use oneTBB statically linked with Microsoft Visual C++ runtime
+REM    if ^<vs^> is not set oneTBB dynamically linked with Microsoft Visual C++ runtime will be used.
 
 set "SCRIPT_NAME=%~nx0"
-set "TBB_BIN_DIR=%~d0%~p0"
-set "TBBROOT=%TBB_BIN_DIR%.."
+set "TBB_SCRIPT_DIR=%~d0%~p0"
+set "TBBROOT=%TBB_SCRIPT_DIR%.."
 
 :: Set the default arguments
 set TBB_TARGET_ARCH=intel64
-set TBB_TARGET_VS=vc_mt
+set TBB_ARCH_SUFFIX=
+set TBB_TARGET_VS=vc14
 
 :ParseArgs
 :: Parse the incoming arguments
-if /i "%1"==""        goto SetEnv
+if /i "%1"==""             goto ParseLayout
 if /i "%1"=="ia32"         (set TBB_TARGET_ARCH=ia32)     & shift & goto ParseArgs
 if /i "%1"=="intel64"      (set TBB_TARGET_ARCH=intel64)  & shift & goto ParseArgs
-if /i "%1"=="vs2015"       (set TBB_TARGET_VS=vc14)       & shift & goto ParseArgs
-if /i "%1"=="vs2017"       (set TBB_TARGET_VS=vc14)       & shift & goto ParseArgs
 if /i "%1"=="vs2019"       (set TBB_TARGET_VS=vc14)       & shift & goto ParseArgs
+if /i "%1"=="vs2022"       (set TBB_TARGET_VS=vc14)       & shift & goto ParseArgs
 if /i "%1"=="all"          (set TBB_TARGET_VS=vc_mt)      & shift & goto ParseArgs
 
-:SetEnv
-if exist "%TBBROOT%\redist\%TBB_TARGET_ARCH%\%TBB_TARGET_VS%\tbb12.dll" (
-    set "TBB_DLL_PATH=%TBBROOT%\redist\%TBB_TARGET_ARCH%\%TBB_TARGET_VS%"
+:ParseLayout
+if exist "%TBBROOT%\redist\" (
+    set "TBB_BIN_DIR=%TBBROOT%\redist"
+    set "TBB_SUBDIR=%TBB_TARGET_ARCH%"
+    goto SetEnv
+)
+
+if "%TBB_TARGET_ARCH%" == "ia32" (
+    set TBB_ARCH_SUFFIX=32
+)
+if exist "%TBBROOT%\bin%TBB_ARCH_SUFFIX%" (
+    set "TBB_BIN_DIR=%TBBROOT%\bin%TBB_ARCH_SUFFIX%"
+    if "%TBB_TARGET_VS%" == "vc14" (
+        set TBB_TARGET_VS=
+    )
+    goto SetEnv
 )
-if exist "%TBBROOT%\..\redist\%TBB_TARGET_ARCH%\tbb\%TBB_TARGET_VS%\tbb12.dll" (
-    set "TBB_DLL_PATH=%TBBROOT%\..\redist\%TBB_TARGET_ARCH%\tbb\%TBB_TARGET_VS%"
+:: Couldn't parse TBBROOT/bin, unset variable
+set TBB_ARCH_SUFFIX=
+
+if exist "%TBBROOT%\..\redist\" (
+    set "TBB_BIN_DIR=%TBBROOT%\..\redist"
+    set "TBB_SUBDIR=%TBB_TARGET_ARCH%\tbb"
+    goto SetEnv
+)
+
+:SetEnv
+if exist "%TBB_BIN_DIR%\%TBB_SUBDIR%\%TBB_TARGET_VS%\tbb12.dll" (
+    set "TBB_DLL_PATH=%TBB_BIN_DIR%\%TBB_SUBDIR%\%TBB_TARGET_VS%"
+) else (
+    echo:
+    echo :: ERROR: tbb12.dll library does not exist in "%TBB_BIN_DIR%\%TBB_SUBDIR%\%TBB_TARGET_VS%\"
+    echo:
+    exit /b 255
 )
 
 set "PATH=%TBB_DLL_PATH%;%PATH%"
 
-set "LIB=%TBBROOT%\lib\%TBB_TARGET_ARCH%\%TBB_TARGET_VS%;%LIB%"
+set "LIB=%TBBROOT%\lib%TBB_ARCH_SUFFIX%\%TBB_SUBDIR%\%TBB_TARGET_VS%;%LIB%"
 set "INCLUDE=%TBBROOT%\include;%INCLUDE%"
 set "CPATH=%TBBROOT%\include;%CPATH%"
 set "CMAKE_PREFIX_PATH=%TBBROOT%;%CMAKE_PREFIX_PATH%"
-set "PKG_CONFIG_PATH=%TBBROOT%\lib\pkgconfig;%PKG_CONFIG_PATH%"
+set "PKG_CONFIG_PATH=%TBBROOT%\lib%TBB_ARCH_SUFFIX%\pkgconfig;%PKG_CONFIG_PATH%"
 
 :End
 exit /B 0
diff --git a/external/tbb/integration/windows/nuget/inteltbb.devel.win.targets b/external/tbb/integration/windows/nuget/inteltbb.devel.win.targets
index 274e2d38..1c94a12c 100644
--- a/external/tbb/integration/windows/nuget/inteltbb.devel.win.targets
+++ b/external/tbb/integration/windows/nuget/inteltbb.devel.win.targets
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright (c) 2019-2021 Intel Corporation
+    Copyright (c) 2019-2023 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
   <!-- include files -->
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)..\..\lib\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)..\..\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)' == 'Debug'">TBB_USE_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
@@ -27,26 +27,26 @@
   <!-- .lib files -->
   <ItemDefinitionGroup Condition="$(Configuration.ToLower().Contains('release')) AND '$(Platform)' == 'Win32'">
     <Link>
-      <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)..\..\lib\native\win-x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>tbb12.lib;tbbmalloc.lib;tbbmalloc_proxy.lib;tbbproxy.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)..\..\build\native\win-x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>tbb12.lib;tbbmalloc.lib;tbbmalloc_proxy.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="$(Configuration.ToLower().Contains('release')) AND '$(Platform)' == 'x64'">
     <Link>
-      <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)..\..\lib\native\win-x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>tbb12.lib;tbbmalloc.lib;tbbmalloc_proxy.lib;tbbproxy.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)..\..\build\native\win-x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>tbb12.lib;tbbmalloc.lib;tbbmalloc_proxy.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="$(Configuration.ToLower().Contains('debug')) AND '$(Platform)' == 'Win32'">
     <Link>
-      <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)..\..\lib\native\win-x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>tbb12_debug.lib;tbbmalloc_debug.lib;tbbmalloc_proxy_debug.lib;tbbproxy_debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)..\..\build\native\win-x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>tbb12_debug.lib;tbbmalloc_debug.lib;tbbmalloc_proxy_debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="$(Configuration.ToLower().Contains('debug')) AND '$(Platform)' == 'x64'">
     <Link>
-      <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)..\..\lib\native\win-x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>tbb12_debug.lib;tbbmalloc_debug.lib;tbbmalloc_proxy_debug.lib;tbbproxy_debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)..\..\build\native\win-x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>tbb12_debug.lib;tbbmalloc_debug.lib;tbbmalloc_proxy_debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
 
diff --git a/external/tbb/integration/windows/oneapi/vars.bat b/external/tbb/integration/windows/oneapi/vars.bat
new file mode 100644
index 00000000..9c53c710
--- /dev/null
+++ b/external/tbb/integration/windows/oneapi/vars.bat
@@ -0,0 +1,56 @@
+@echo off
+REM
+REM Copyright (c) 2023 Intel Corporation
+REM
+REM Licensed under the Apache License, Version 2.0 (the "License");
+REM you may not use this file except in compliance with the License.
+REM You may obtain a copy of the License at
+REM
+REM     http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing, software
+REM distributed under the License is distributed on an "AS IS" BASIS,
+REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM See the License for the specific language governing permissions and
+REM limitations under the License.
+REM
+
+if not defined SETVARS_CALL (
+    echo:
+    echo :: ERROR: This script must be executed by setvars.bat.
+    echo:   Try '[install-dir]\setvars.bat --help' for help.
+    echo:
+    exit /b 255
+)
+
+if not defined ONEAPI_ROOT (
+    echo:
+    echo :: ERROR: This script requires that the ONEAPI_ROOT env variable is set."
+    echo:   Try '[install-dir]\setvars.bat --help' for help.
+    echo:
+    exit /b 254
+)
+
+set "TBBROOT=%ONEAPI_ROOT%"
+
+:: Set the default arguments
+set "TBB_TARGET_ARCH=%INTEL_TARGET_ARCH%"
+set TBB_TARGET_VS=
+set ARCH_SUFFIX=
+
+:ParseArgs
+:: Parse the incoming arguments
+if /i "%1"==""        goto SetEnv
+if /i "%1"=="vs2019"       (set TBB_TARGET_VS= )       & shift & goto ParseArgs
+if /i "%1"=="vs2022"       (set TBB_TARGET_VS= )       & shift & goto ParseArgs
+if /i "%1"=="all"          (set TBB_TARGET_VS=vc_mt)   & shift & goto ParseArgs
+
+if "%TBB_TARGET_ARCH%"=="ia32" set ARCH_SUFFIX=32  
+
+:SetEnv
+if exist "%TBBROOT%\bin%ARCH_SUFFIX%\%TBB_TARGET_VS%\tbb12.dll" (
+    set "TBB_DLL_PATH=%TBBROOT%\bin%ARCH_SUFFIX%\%TBB_TARGET_VS%"
+)
+
+:End
+exit /B 0
diff --git a/external/tbb/python/CMakeLists.txt b/external/tbb/python/CMakeLists.txt
index 1d2b05fe..748921a5 100644
--- a/external/tbb/python/CMakeLists.txt
+++ b/external/tbb/python/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Intel Corporation
+# Copyright (c) 2020-2023 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 
 find_package(PythonInterp 3.5 REQUIRED)
 
-set(PYTHON_BUILD_WORK_DIR .)
+set(PYTHON_BUILD_WORK_DIR python_build)
 
 add_custom_target(
     python_copy
@@ -34,12 +34,13 @@ string(STRIP "${TBB4PY_INCLUDE_STRING}" TBB4PY_INCLUDE_STRING)
 
 add_custom_target(
     python_build
+    ALL
     DEPENDS tbb python_copy
     COMMAND
     ${PYTHON_EXECUTABLE} ${PYTHON_BUILD_WORK_DIR}/setup.py
         build -b${PYTHON_BUILD_WORK_DIR}
         build_ext ${TBB4PY_INCLUDE_STRING} -L$<TARGET_FILE_DIR:TBB::tbb>
-        install --prefix ${PYTHON_BUILD_WORK_DIR}/build -f
+        install --prefix build -f
     COMMENT "Build and install to work directory the oneTBB Python module"
 )
 
diff --git a/external/tbb/python/README.md b/external/tbb/python/README.md
index 59ec6a10..e7e3318d 100644
--- a/external/tbb/python/README.md
+++ b/external/tbb/python/README.md
@@ -13,7 +13,7 @@ parallelized using Intel&reg; oneAPI Math Kernel Library or/and oneTBB.
 The module implements Pool class with the standard interface using oneTBB which can be used to replace Python's ThreadPool.
 Thanks to the monkey-patching technique implemented in class Monkey, no source code change is needed in order to enable threading composability in Python programs.
 
-For more information and examples, please refer to [online blog](http://software.intel.com/en-us/blogs/2016/04/04unleash-parallel-performance-of-python-programs).
+For more information and examples, please refer to [forum discussion](https://community.intel.com/t5/Intel-Distribution-for-Python/TBB-module-Unleash-parallel-performance-of-Python-programs/m-p/1074459).
 
 ## Directories
  - **rml** - The folder contains sources for building the plugin with cross-process dynamic thread scheduler implementation.
diff --git a/external/tbb/python/TBB.py b/external/tbb/python/TBB.py
index fbee4c24..3144560e 100644
--- a/external/tbb/python/TBB.py
+++ b/external/tbb/python/TBB.py
@@ -1,6 +1,4 @@
-#!/usr/bin/env python3
-#
-# Copyright (c) 2016-2021 Intel Corporation
+# Copyright (c) 2016-2023 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/external/tbb/python/rml/ipc_server.cpp b/external/tbb/python/rml/ipc_server.cpp
index 216008f8..fff5e9ed 100644
--- a/external/tbb/python/rml/ipc_server.cpp
+++ b/external/tbb/python/rml/ipc_server.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2017-2021 Intel Corporation
+    Copyright (c) 2017-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -15,14 +15,14 @@
 */
 
 #include <atomic>
-#include <cstdlib>
 #include <cstring>
+#include <cstdlib>
 
-#include "../../src/tbb/governor.h"
-#include "../../src/tbb/misc.h"
 #include "../../src/tbb/rml_tbb.h"
 #include "../../src/tbb/rml_thread_monitor.h"
 #include "../../src/tbb/scheduler_common.h"
+#include "../../src/tbb/governor.h"
+#include "../../src/tbb/misc.h"
 #include "tbb/cache_aligned_allocator.h"
 
 #include "ipc_utils.h"
@@ -31,208 +31,214 @@
 #include <stdlib.h>
 
 namespace rml {
-    namespace internal {
+namespace internal {
 
-        static const char* IPC_ENABLE_VAR_NAME = "IPC_ENABLE";
+static const char* IPC_ENABLE_VAR_NAME = "IPC_ENABLE";
 
-        typedef versioned_object::version_type version_type;
+typedef versioned_object::version_type version_type;
 
-        extern "C" factory::status_type __RML_open_factory(factory& f, version_type& /*server_version*/,
-                                                           version_type /*client_version*/) {
-            if (!tbb::internal::rml::get_enable_flag(IPC_ENABLE_VAR_NAME)) {
-                return factory::st_incompatible;
-            }
+extern "C" factory::status_type __RML_open_factory(factory& f, version_type& /*server_version*/, version_type /*client_version*/) {
+    if( !tbb::internal::rml::get_enable_flag( IPC_ENABLE_VAR_NAME ) ) {
+        return factory::st_incompatible;
+    }
 
-            // Hack to keep this library from being closed
-            static std::atomic<bool> one_time_flag {false};
-            bool expected = false;
+    // Hack to keep this library from being closed
+    static std::atomic<bool> one_time_flag{false};
+    bool expected = false;
 
-            if (one_time_flag.compare_exchange_strong(expected, true)) {
-                __TBB_ASSERT((size_t) f.library_handle != factory::c_dont_unload, nullptr);
-#if _WIN32 || _WIN64
-                f.library_handle = reinterpret_cast<HMODULE>(factory::c_dont_unload);
+    if( one_time_flag.compare_exchange_strong(expected, true) ) {
+        __TBB_ASSERT( (size_t)f.library_handle!=factory::c_dont_unload, nullptr );
+#if _WIN32||_WIN64
+        f.library_handle = reinterpret_cast<HMODULE>(factory::c_dont_unload);
 #else
-                f.library_handle = reinterpret_cast<void*>(factory::c_dont_unload);
+        f.library_handle = reinterpret_cast<void*>(factory::c_dont_unload);
 #endif
-            }
-            // End of hack
+    }
+    // End of hack
 
-            return factory::st_success;
-        }
+    return factory::st_success;
+}
 
-        extern "C" void __RML_close_factory(factory& /*f*/) {}
+extern "C" void __RML_close_factory(factory& /*f*/) {
+}
 
-        class ipc_thread_monitor : public tbb::detail::r1::rml::internal::thread_monitor {
-        public:
-            ipc_thread_monitor() : thread_monitor() {}
+class ipc_thread_monitor : public tbb::detail::r1::rml::internal::thread_monitor {
+public:
+    ipc_thread_monitor() : thread_monitor() {}
 
 #if USE_WINTHREAD
 #elif USE_PTHREAD
-            static handle_type launch(thread_routine_type thread_routine, void* arg, size_t stack_size);
+    static handle_type launch(thread_routine_type thread_routine, void* arg, size_t stack_size);
 #endif
-        };
+};
 
 #if USE_WINTHREAD
 #elif USE_PTHREAD
-        inline ipc_thread_monitor::handle_type ipc_thread_monitor::launch(void* (*thread_routine)(void*),
-                                                                          void* arg, size_t stack_size) {
-            pthread_attr_t s;
-            if (pthread_attr_init(&s)) return 0;
-            if (stack_size > 0) {
-                if (pthread_attr_setstacksize(&s, stack_size)) return 0;
-            }
-            pthread_t handle;
-            if (pthread_create(&handle, &s, thread_routine, arg)) return 0;
-            if (pthread_attr_destroy(&s)) return 0;
-            return handle;
-        }
+inline ipc_thread_monitor::handle_type ipc_thread_monitor::launch(void* (*thread_routine)(void*), void* arg, size_t stack_size) {
+    pthread_attr_t s;
+    if( pthread_attr_init( &s ) ) return 0;
+    if( stack_size>0 ) {
+        if( pthread_attr_setstacksize( &s, stack_size ) ) return 0;
+    }
+    pthread_t handle;
+    if( pthread_create( &handle, &s, thread_routine, arg ) ) return 0;
+    if( pthread_attr_destroy( &s ) ) return 0;
+    return handle;
+}
 #endif
 
-    }// namespace internal
-}// namespace rml
+}} // rml::internal
 
 using rml::internal::ipc_thread_monitor;
 using tbb::internal::rml::get_shared_name;
 
 namespace tbb {
-    namespace detail {
-
-        namespace r1 {
-            bool terminate_on_exception() { return false; }
-        }// namespace r1
-
-        namespace rml {
-
-            typedef ipc_thread_monitor::handle_type thread_handle;
-
-            class ipc_server;
-
-            static const char* IPC_MAX_THREADS_VAR_NAME = "MAX_THREADS";
-            static const char* IPC_ACTIVE_SEM_PREFIX = "/__IPC_active";
-            static const char* IPC_STOP_SEM_PREFIX = "/__IPC_stop";
-            static const char* IPC_ACTIVE_SEM_VAR_NAME = "IPC_ACTIVE_SEMAPHORE";
-            static const char* IPC_STOP_SEM_VAR_NAME = "IPC_STOP_SEMAPHORE";
-            static const mode_t IPC_SEM_MODE = 0660;
-
-            static std::atomic<int> my_global_thread_count;
-            using tbb_client = tbb::detail::r1::rml::tbb_client;
-            using tbb_server = tbb::detail::r1::rml::tbb_server;
-            using tbb_factory = tbb::detail::r1::rml::tbb_factory;
-
-            using tbb::detail::r1::runtime_warning;
-
-            char* get_sem_name(const char* name, const char* prefix) {
-                __TBB_ASSERT(name != nullptr, nullptr);
-                __TBB_ASSERT(prefix != nullptr, nullptr);
-                char* value = std::getenv(name);
-                std::size_t len = value == nullptr ? 0 : std::strlen(value);
-                if (len > 0) {
-                    // TODO: consider returning the original string instead of the copied string.
-                    char* sem_name = new char[len + 1];
-                    __TBB_ASSERT(sem_name != nullptr, nullptr);
-                    std::strncpy(sem_name, value, len + 1);
-                    __TBB_ASSERT(sem_name[len] == 0, nullptr);
-                    return sem_name;
-                } else {
-                    return get_shared_name(prefix);
-                }
-            }
-
-            char* get_active_sem_name() {
-                return get_sem_name(IPC_ACTIVE_SEM_VAR_NAME, IPC_ACTIVE_SEM_PREFIX);
-            }
-
-            char* get_stop_sem_name() { return get_sem_name(IPC_STOP_SEM_VAR_NAME, IPC_STOP_SEM_PREFIX); }
-
-            static void release_thread_sem(sem_t* my_sem) {
-                int old = my_global_thread_count.load(std::memory_order_relaxed);
-                do {
-                    if (old <= 0) return;
-                } while (!my_global_thread_count.compare_exchange_strong(old, old - 1));
-                if (old > 0) { sem_post(my_sem); }
-            }
+namespace detail {
 
-            void set_sem_name(const char* name, const char* prefix) {
-                __TBB_ASSERT(name != nullptr, nullptr);
-                __TBB_ASSERT(prefix != nullptr, nullptr);
-                const char* postfix = "_XXXXXX";
-                std::size_t plen = std::strlen(prefix);
-                std::size_t xlen = std::strlen(postfix);
-                char* templ = new char[plen + xlen + 1];
-                __TBB_ASSERT(templ != nullptr, nullptr);
-                strncpy(templ, prefix, plen + 1);
-                __TBB_ASSERT(templ[plen] == 0, nullptr);
-                strncat(templ, postfix, xlen + 1);
-                __TBB_ASSERT(std::strlen(templ) == plen + xlen + 1, nullptr);
-                // TODO: consider using mkstemp instead of mktemp.
-                char* sem_name = mktemp(templ);
-                if (sem_name != nullptr) {
-                    int status = setenv(name, sem_name, /*overwrite*/ 1);
-                    __TBB_ASSERT_EX(status == 0, nullptr);
-                }
-                delete[] templ;
-            }
-
-            extern "C" void set_active_sem_name() {
-                set_sem_name(IPC_ACTIVE_SEM_VAR_NAME, IPC_ACTIVE_SEM_PREFIX);
-            }
-
-            extern "C" void set_stop_sem_name() { set_sem_name(IPC_STOP_SEM_VAR_NAME, IPC_STOP_SEM_PREFIX); }
-
-            extern "C" void release_resources() {
-                if (my_global_thread_count.load(std::memory_order_acquire) != 0) {
-                    char* active_sem_name = get_active_sem_name();
-                    sem_t* my_active_sem = sem_open(active_sem_name, O_CREAT);
-                    __TBB_ASSERT(my_active_sem, "Unable to open active threads semaphore");
-                    delete[] active_sem_name;
-
-                    do {
-                        release_thread_sem(my_active_sem);
-                    } while (my_global_thread_count.load(std::memory_order_acquire) != 0);
-                }
-            }
-
-            extern "C" void release_semaphores() {
-                int status = 0;
-                char* sem_name = nullptr;
+namespace r1 {
+bool terminate_on_exception() {
+    return false;
+}
+}
 
-                sem_name = get_active_sem_name();
-                if (sem_name == nullptr) {
-                    runtime_warning("Can not get RML semaphore name");
-                    return;
-                }
-                status = sem_unlink(sem_name);
-                if (status != 0) {
-                    if (errno == ENOENT) {
-                        /* There is no semaphore with the given name, nothing to do */
-                    } else {
-                        runtime_warning("Can not release RML semaphore");
-                        return;
-                    }
-                }
-                delete[] sem_name;
-
-                sem_name = get_stop_sem_name();
-                if (sem_name == nullptr) {
-                    runtime_warning("Can not get RML semaphore name");
-                    return;
-                }
-                status = sem_unlink(sem_name);
-                if (status != 0) {
-                    if (errno == ENOENT) {
-                        /* There is no semaphore with the given name, nothing to do */
-                    } else {
-                        runtime_warning("Can not release RML semaphore");
-                        return;
-                    }
-                }
-                delete[] sem_name;
-            }
+namespace rml {
 
-            class ipc_worker : no_copy {
-            protected:
-                //! State in finite-state machine that controls the worker.
-                /** State diagram:
+typedef ipc_thread_monitor::handle_type thread_handle;
+
+class ipc_server;
+
+static const char* IPC_MAX_THREADS_VAR_NAME = "MAX_THREADS";
+static const char* IPC_ACTIVE_SEM_PREFIX = "/__IPC_active";
+static const char* IPC_STOP_SEM_PREFIX = "/__IPC_stop";
+static const char* IPC_ACTIVE_SEM_VAR_NAME = "IPC_ACTIVE_SEMAPHORE";
+static const char* IPC_STOP_SEM_VAR_NAME = "IPC_STOP_SEMAPHORE";
+static const mode_t IPC_SEM_MODE = 0660;
+
+static std::atomic<int> my_global_thread_count;
+using tbb_client = tbb::detail::r1::rml::tbb_client;
+using tbb_server = tbb::detail::r1::rml::tbb_server;
+using tbb_factory = tbb::detail::r1::rml::tbb_factory;
+
+using tbb::detail::r1::runtime_warning;
+
+char* get_sem_name(const char* name, const char* prefix) {
+    __TBB_ASSERT(name != nullptr, nullptr);
+    __TBB_ASSERT(prefix != nullptr, nullptr);
+    char* value = std::getenv(name);
+    std::size_t len = value == nullptr ? 0 : std::strlen(value);
+    if (len > 0) {
+        // TODO: consider returning the original string instead of the copied string.
+        char* sem_name = new char[len + 1];
+        __TBB_ASSERT(sem_name != nullptr, nullptr);
+        std::strncpy(sem_name, value, len+1);
+        __TBB_ASSERT(sem_name[len] == 0, nullptr);
+        return sem_name;
+    } else {
+        return get_shared_name(prefix);
+    }
+}
+
+char* get_active_sem_name() {
+    return get_sem_name(IPC_ACTIVE_SEM_VAR_NAME, IPC_ACTIVE_SEM_PREFIX);
+}
+
+char* get_stop_sem_name() {
+    return get_sem_name(IPC_STOP_SEM_VAR_NAME, IPC_STOP_SEM_PREFIX);
+}
+
+static void release_thread_sem(sem_t* my_sem) {
+    int old = my_global_thread_count.load(std::memory_order_relaxed);
+    do {
+        if( old<=0 ) return;
+    } while( !my_global_thread_count.compare_exchange_strong(old, old-1) );
+    if( old>0 ) {
+        sem_post( my_sem );
+    }
+}
+
+void set_sem_name(const char* name, const char* prefix) {
+    __TBB_ASSERT(name != nullptr, nullptr);
+    __TBB_ASSERT(prefix != nullptr, nullptr);
+    const char* postfix = "_XXXXXX";
+    std::size_t plen = std::strlen(prefix);
+    std::size_t xlen = std::strlen(postfix);
+    char* templ = new char[plen + xlen + 1];
+    __TBB_ASSERT(templ != nullptr, nullptr);
+    strncpy(templ, prefix, plen+1);
+    __TBB_ASSERT(templ[plen] == 0, nullptr);
+    strncat(templ, postfix, xlen + 1);
+    __TBB_ASSERT(std::strlen(templ) == plen + xlen + 1, nullptr);
+    // TODO: consider using mkstemp instead of mktemp.
+    char* sem_name = mktemp(templ);
+    if (sem_name != nullptr) {
+        int status = setenv(name, sem_name,  /*overwrite*/ 1);
+        __TBB_ASSERT_EX(status == 0, nullptr);
+    }
+    delete[] templ;
+}
+
+extern "C" void set_active_sem_name() {
+    set_sem_name(IPC_ACTIVE_SEM_VAR_NAME, IPC_ACTIVE_SEM_PREFIX);
+}
+
+extern "C" void set_stop_sem_name() {
+    set_sem_name(IPC_STOP_SEM_VAR_NAME, IPC_STOP_SEM_PREFIX);
+}
+
+extern "C" void release_resources() {
+    if( my_global_thread_count.load(std::memory_order_acquire)!=0 ) {
+        char* active_sem_name = get_active_sem_name();
+        sem_t* my_active_sem = sem_open( active_sem_name, O_CREAT );
+        __TBB_ASSERT( my_active_sem, "Unable to open active threads semaphore" );
+        delete[] active_sem_name;
+
+        do {
+            release_thread_sem( my_active_sem );
+        } while( my_global_thread_count.load(std::memory_order_acquire)!=0 );
+    }
+}
+
+extern "C" void release_semaphores() {
+    int status = 0;
+    char* sem_name = nullptr;
+
+    sem_name = get_active_sem_name();
+    if( sem_name==nullptr ) {
+        runtime_warning("Can not get RML semaphore name");
+        return;
+    }
+    status = sem_unlink( sem_name );
+    if( status!=0 ) {
+        if( errno==ENOENT ) {
+            /* There is no semaphore with the given name, nothing to do */
+        } else {
+            runtime_warning("Can not release RML semaphore");
+            return;
+        }
+    }
+    delete[] sem_name;
+
+    sem_name = get_stop_sem_name();
+    if( sem_name==nullptr ) {
+        runtime_warning( "Can not get RML semaphore name" );
+        return;
+    }
+    status = sem_unlink( sem_name );
+    if( status!=0 ) {
+        if( errno==ENOENT ) {
+            /* There is no semaphore with the given name, nothing to do */
+        } else {
+            runtime_warning("Can not release RML semaphore");
+            return;
+        }
+    }
+    delete[] sem_name;
+}
+
+class ipc_worker: no_copy {
+protected:
+    //! State in finite-state machine that controls the worker.
+    /** State diagram:
                     /----------stop---\
                     |           ^     |
                     V           |     |
@@ -241,884 +247,890 @@ namespace tbb {
           |         V           |     |
           \------> quit <-------/<----/
       */
-                enum state_t {
-                    //! *this is initialized
-                    st_init,
-                    //! *this has associated thread that is starting up.
-                    st_starting,
-                    //! Associated thread is doing normal life sequence.
-                    st_normal,
-                    //! Associated thread is stopped but can be started again.
-                    st_stop,
-                    //! Associated thread has ended normal life sequence and promises to never touch *this again.
-                    st_quit
-                };
-                std::atomic<state_t> my_state;
-
-                //! Associated server
-                ipc_server& my_server;
-
-                //! Associated client
-                tbb_client& my_client;
-
-                //! index used for avoiding the 64K aliasing problem
-                const size_t my_index;
-
-                //! Monitor for sleeping when there is no work to do.
-                /** The invariant that holds for sleeping workers is:
+    enum state_t {
+        //! *this is initialized
+        st_init,
+        //! *this has associated thread that is starting up.
+        st_starting,
+        //! Associated thread is doing normal life sequence.
+        st_normal,
+        //! Associated thread is stopped but can be started again.
+        st_stop,
+        //! Associated thread has ended normal life sequence and promises to never touch *this again.
+        st_quit
+    };
+    std::atomic<state_t> my_state;
+
+    //! Associated server
+    ipc_server& my_server;
+
+    //! Associated client
+    tbb_client& my_client;
+
+    //! index used for avoiding the 64K aliasing problem
+    const size_t my_index;
+
+    //! Monitor for sleeping when there is no work to do.
+    /** The invariant that holds for sleeping workers is:
         "my_slack<=0 && my_state==st_normal && I am on server's list of asleep threads" */
-                ipc_thread_monitor my_thread_monitor;
+    ipc_thread_monitor my_thread_monitor;
 
-                //! Handle of the OS thread associated with this worker
-                thread_handle my_handle;
+    //! Handle of the OS thread associated with this worker
+    thread_handle my_handle;
 
-                //! Link for list of workers that are sleeping or have no associated thread.
-                ipc_worker* my_next;
+    //! Link for list of workers that are sleeping or have no associated thread.
+    ipc_worker* my_next;
 
-                friend class ipc_server;
+    friend class ipc_server;
 
-                //! Actions executed by the associated thread
-                void run();
+    //! Actions executed by the associated thread
+    void run();
 
-                //! Wake up associated thread (or launch a thread if there is none)
-                bool wake_or_launch();
+    //! Wake up associated thread (or launch a thread if there is none)
+    bool wake_or_launch();
 
-                //! Called by a thread (usually not the associated thread) to commence termination.
-                void start_shutdown(bool join);
+    //! Called by a thread (usually not the associated thread) to commence termination.
+    void start_shutdown(bool join);
 
-                //! Called by a thread (usually not the associated thread) to commence stopping.
-                void start_stopping(bool join);
+    //! Called by a thread (usually not the associated thread) to commence stopping.
+    void start_stopping(bool join);
 
-                static __RML_DECL_THREAD_ROUTINE thread_routine(void* arg);
+    static __RML_DECL_THREAD_ROUTINE thread_routine(void* arg);
 
-                static void release_handle(thread_handle my_handle, bool join);
+    static void release_handle(thread_handle my_handle, bool join);
 
-            protected:
-                ipc_worker(ipc_server& server, tbb_client& client, const size_t i)
-                    : my_server(server), my_client(client), my_index(i) {
-                    my_state = st_init;
-                }
-            };
+protected:
+    ipc_worker(ipc_server& server, tbb_client& client, const size_t i) :
+        my_server(server),
+        my_client(client),
+        my_index(i)
+    {
+        my_state = st_init;
+    }
+};
 
-            //TODO: cannot bind to nfs_size from allocator.cpp since nfs_size is constexpr defined in another translation unit
-            constexpr static size_t cache_line_sz = 128;
+//TODO: cannot bind to nfs_size from allocator.cpp since nfs_size is constexpr defined in another translation unit
+constexpr static size_t cache_line_sz = 128;
 
 #if _MSC_VER && !defined(__INTEL_COMPILER)
-// Suppress overzealous compiler warnings about uninstantiable class
-#pragma warning(push)
-#pragma warning(disable : 4510 4610)
+    // Suppress overzealous compiler warnings about uninstantiable class
+    #pragma warning(push)
+    #pragma warning(disable:4510 4610)
 #endif
-            class padded_ipc_worker : public ipc_worker {
-                char pad[cache_line_sz - sizeof(ipc_worker) % cache_line_sz];
-
-            public:
-                padded_ipc_worker(ipc_server& server, tbb_client& client, const size_t i)
-                    : ipc_worker(server, client, i) {
-                    suppress_unused_warning(pad);
-                }
-            };
+class padded_ipc_worker: public ipc_worker {
+    char pad[cache_line_sz - sizeof(ipc_worker)%cache_line_sz];
+public:
+    padded_ipc_worker(ipc_server& server, tbb_client& client, const size_t i)
+    : ipc_worker( server,client,i ) { suppress_unused_warning(pad); }
+};
 #if _MSC_VER && !defined(__INTEL_COMPILER)
-#pragma warning(pop)
+    #pragma warning(pop)
 #endif
 
-            class ipc_waker : public padded_ipc_worker {
-            private:
-                static __RML_DECL_THREAD_ROUTINE thread_routine(void* arg);
-                void run();
-                bool wake_or_launch();
+class ipc_waker : public padded_ipc_worker {
+private:
+    static __RML_DECL_THREAD_ROUTINE thread_routine(void* arg);
+    void run();
+    bool wake_or_launch();
 
-                friend class ipc_server;
+    friend class ipc_server;
 
-            public:
-                ipc_waker(ipc_server& server, tbb_client& client, const size_t i)
-                    : padded_ipc_worker(server, client, i) {}
-            };
+public:
+    ipc_waker(ipc_server& server, tbb_client& client, const size_t i)
+    : padded_ipc_worker( server, client, i ) {}
+};
 
-            class ipc_stopper : public padded_ipc_worker {
-            private:
-                static __RML_DECL_THREAD_ROUTINE thread_routine(void* arg);
-                void run();
-                bool wake_or_launch();
+class ipc_stopper : public padded_ipc_worker {
+private:
+    static __RML_DECL_THREAD_ROUTINE thread_routine(void* arg);
+    void run();
+    bool wake_or_launch();
 
-                friend class ipc_server;
+    friend class ipc_server;
 
-            public:
-                ipc_stopper(ipc_server& server, tbb_client& client, const size_t i)
-                    : padded_ipc_worker(server, client, i) {}
-            };
+public:
+    ipc_stopper(ipc_server& server, tbb_client& client, const size_t i)
+    : padded_ipc_worker( server, client, i ) {}
+};
 
-            class ipc_server : public tbb_server, no_copy {
-            private:
-                tbb_client& my_client;
-                //! Maximum number of threads to be created.
-                /** Threads are created lazily, so maximum might not actually be reached. */
-                tbb_client::size_type my_n_thread;
+class ipc_server: public tbb_server, no_copy {
+private:
+    tbb_client& my_client;
+    //! Maximum number of threads to be created.
+    /** Threads are created lazily, so maximum might not actually be reached. */
+    tbb_client::size_type my_n_thread;
 
-                //! Stack size for each thread. */
-                const size_t my_stack_size;
+    //! Stack size for each thread. */
+    const size_t my_stack_size;
 
-                //! Number of jobs that could use their associated thread minus number of active threads.
-                /** If negative, indicates oversubscription.
+    //! Number of jobs that could use their associated thread minus number of active threads.
+    /** If negative, indicates oversubscription.
         If positive, indicates that more threads should run.
         Can be lowered asynchronously, but must be raised only while holding my_asleep_list_mutex,
         because raising it impacts the invariant for sleeping threads. */
-                std::atomic<int> my_slack;
+    std::atomic<int> my_slack;
 
-                //! Counter used to determine when to delete this.
-                std::atomic<int> my_ref_count;
+    //! Counter used to determine when to delete this.
+    std::atomic<int> my_ref_count;
 
-                padded_ipc_worker* my_thread_array;
+    padded_ipc_worker* my_thread_array;
 
-                //! List of workers that are asleep or committed to sleeping until notified by another thread.
-                std::atomic<ipc_worker*> my_asleep_list_root;
+    //! List of workers that are asleep or committed to sleeping until notified by another thread.
+    std::atomic<ipc_worker*> my_asleep_list_root;
 
-                //! Protects my_asleep_list_root
-                typedef scheduler_mutex_type asleep_list_mutex_type;
-                asleep_list_mutex_type my_asleep_list_mutex;
+    //! Protects my_asleep_list_root
+    typedef scheduler_mutex_type asleep_list_mutex_type;
+    asleep_list_mutex_type my_asleep_list_mutex;
 
-                //! Should server wait workers while terminate
-                const bool my_join_workers;
+    //! Should server wait workers while terminate
+    const bool my_join_workers;
 
-                //! Service thread for waking of workers
-                ipc_waker* my_waker;
+    //! Service thread for waking of workers
+    ipc_waker* my_waker;
 
-                //! Service thread to stop threads
-                ipc_stopper* my_stopper;
+    //! Service thread to stop threads
+    ipc_stopper* my_stopper;
 
-                //! Semaphore to account active threads
-                sem_t* my_active_sem;
+    //! Semaphore to account active threads
+    sem_t* my_active_sem;
 
-                //! Semaphore to account stop threads
-                sem_t* my_stop_sem;
+    //! Semaphore to account stop threads
+    sem_t* my_stop_sem;
 
 #if TBB_USE_ASSERT
-                std::atomic<int> my_net_slack_requests;
+    std::atomic<int> my_net_slack_requests;
 #endif /* TBB_USE_ASSERT */
 
-                //! Wake up to two sleeping workers, if there are any sleeping.
-                /** The call is used to propagate a chain reaction where each thread wakes up two threads,
+    //! Wake up to two sleeping workers, if there are any sleeping.
+    /** The call is used to propagate a chain reaction where each thread wakes up two threads,
         which in turn each wake up two threads, etc. */
-                void propagate_chain_reaction() {
-                    // First test of a double-check idiom.  Second test is inside wake_some(0).
-                    if (my_slack.load(std::memory_order_acquire) > 0) {
-                        int active_threads = 0;
-                        if (try_get_active_thread()) {
-                            ++active_threads;
-                            if (try_get_active_thread()) { ++active_threads; }
-                            wake_some(0, active_threads);
-                        }
-                    }
+    void propagate_chain_reaction() {
+        // First test of a double-check idiom.  Second test is inside wake_some(0).
+        if( my_slack.load(std::memory_order_acquire)>0 ) {
+            int active_threads = 0;
+            if( try_get_active_thread() ) {
+                ++active_threads;
+                if( try_get_active_thread() ) {
+                    ++active_threads;
                 }
+                wake_some( 0, active_threads );
+            }
+        }
+    }
 
-                //! Try to add t to list of sleeping workers
-                bool try_insert_in_asleep_list(ipc_worker& t);
-
-                //! Try to add t to list of sleeping workers even if there is some work to do
-                bool try_insert_in_asleep_list_forced(ipc_worker& t);
+    //! Try to add t to list of sleeping workers
+    bool try_insert_in_asleep_list(ipc_worker& t);
 
-                //! Equivalent of adding additional_slack to my_slack and waking up to 2 threads if my_slack permits.
-                void wake_some(int additional_slack, int active_threads);
+    //! Try to add t to list of sleeping workers even if there is some work to do
+    bool try_insert_in_asleep_list_forced(ipc_worker& t);
 
-                //! Equivalent of adding additional_slack to my_slack and waking up to 1 thread if my_slack permits.
-                void wake_one_forced(int additional_slack);
+    //! Equivalent of adding additional_slack to my_slack and waking up to 2 threads if my_slack permits.
+    void wake_some(int additional_slack, int active_threads);
 
-                //! Stop one thread from asleep list
-                bool stop_one();
+    //! Equivalent of adding additional_slack to my_slack and waking up to 1 thread if my_slack permits.
+    void wake_one_forced(int additional_slack);
 
-                //! Wait for active thread
-                bool wait_active_thread();
+    //! Stop one thread from asleep list
+    bool stop_one();
 
-                //! Try to get active thread
-                bool try_get_active_thread();
+    //! Wait for active thread
+    bool wait_active_thread();
 
-                //! Release active thread
-                void release_active_thread();
+    //! Try to get active thread
+    bool try_get_active_thread();
 
-                //! Wait for thread to stop
-                bool wait_stop_thread();
+    //! Release active thread
+    void release_active_thread();
 
-                //! Add thread to stop list
-                void add_stop_thread();
+    //! Wait for thread to stop
+    bool wait_stop_thread();
 
-                void remove_server_ref() {
-                    if (--my_ref_count == 0) {
-                        my_client.acknowledge_close_connection();
-                        this->~ipc_server();
-                        tbb::cache_aligned_allocator<ipc_server>().deallocate(this, 1);
-                    }
-                }
+    //! Add thread to stop list
+    void add_stop_thread();
 
-                friend class ipc_worker;
-                friend class ipc_waker;
-                friend class ipc_stopper;
+    void remove_server_ref() {
+        if( --my_ref_count==0 ) {
+            my_client.acknowledge_close_connection();
+            this->~ipc_server();
+            tbb::cache_aligned_allocator<ipc_server>().deallocate( this, 1 );
+        }
+    }
 
-            public:
-                ipc_server(tbb_client& client);
-                virtual ~ipc_server();
+    friend class ipc_worker;
+    friend class ipc_waker;
+    friend class ipc_stopper;
+public:
+    ipc_server(tbb_client& client);
+    virtual ~ipc_server();
 
-                version_type version() const override { return 0; }
+    version_type version() const override {
+        return 0;
+    }
 
-                void request_close_connection(bool /*exiting*/) override {
-                    my_waker->start_shutdown(false);
-                    my_stopper->start_shutdown(false);
-                    for (size_t i = 0; i < my_n_thread; ++i)
-                        my_thread_array[i].start_shutdown(my_join_workers);
-                    remove_server_ref();
-                }
+    void request_close_connection(bool /*exiting*/) override {
+        my_waker->start_shutdown(false);
+        my_stopper->start_shutdown(false);
+        for( size_t i=0; i<my_n_thread; ++i )
+            my_thread_array[i].start_shutdown( my_join_workers );
+        remove_server_ref();
+    }
 
-                void yield() override { d0::yield(); }
+    void yield() override {d0::yield();}
 
-                void independent_thread_number_changed(int) override { __TBB_ASSERT(false, nullptr); }
+    void independent_thread_number_changed(int) override { __TBB_ASSERT( false, nullptr ); }
 
-                unsigned default_concurrency() const override { return my_n_thread - 1; }
+    unsigned default_concurrency() const override { return my_n_thread - 1; }
 
-                void adjust_job_count_estimate(int delta) override;
+    void adjust_job_count_estimate(int delta) override;
 
-#if _WIN32 || _WIN64
-                void register_external_thread(::rml::server::execution_resource_t&) override {}
-                void unregister_external_thread(::rml::server::execution_resource_t) override {}
+#if _WIN32||_WIN64
+    void register_external_thread(::rml::server::execution_resource_t&) override {}
+    void unregister_external_thread(::rml::server::execution_resource_t) override {}
 #endif /* _WIN32||_WIN64 */
-            };
+};
 
 //------------------------------------------------------------------------
 // Methods of ipc_worker
 //------------------------------------------------------------------------
 #if _MSC_VER && !defined(__INTEL_COMPILER)
-// Suppress overzealous compiler warnings about an initialized variable 'sink_for_alloca' not referenced
-#pragma warning(push)
-#pragma warning(disable : 4189)
+    // Suppress overzealous compiler warnings about an initialized variable 'sink_for_alloca' not referenced
+    #pragma warning(push)
+    #pragma warning(disable:4189)
 #endif
-#if __MINGW32__ && __GNUC__ == 4 && __GNUC_MINOR__ >= 2 && !__MINGW64__
-            // ensure that stack is properly aligned
-            __attribute__((force_align_arg_pointer))
+#if __MINGW32__ && __GNUC__==4 &&__GNUC_MINOR__>=2 && !__MINGW64__
+// ensure that stack is properly aligned
+__attribute__((force_align_arg_pointer))
 #endif
-            __RML_DECL_THREAD_ROUTINE
-            ipc_worker::thread_routine(void* arg) {
-                ipc_worker* self = static_cast<ipc_worker*>(arg);
-                AVOID_64K_ALIASING(self->my_index);
-                self->run();
-                return 0;
-            }
+__RML_DECL_THREAD_ROUTINE ipc_worker::thread_routine(void* arg) {
+    ipc_worker* self = static_cast<ipc_worker*>(arg);
+    AVOID_64K_ALIASING( self->my_index );
+    self->run();
+    return 0;
+}
 #if _MSC_VER && !defined(__INTEL_COMPILER)
-#pragma warning(pop)
+    #pragma warning(pop)
 #endif
 
-            void ipc_worker::release_handle(thread_handle handle, bool join) {
-                if (join) ipc_thread_monitor::join(handle);
-                else
-                    ipc_thread_monitor::detach_thread(handle);
-            }
-
-            void ipc_worker::start_shutdown(bool join) {
-                state_t s = my_state.load(std::memory_order_relaxed);
-                ;
-
-                do {
-                    __TBB_ASSERT(s != st_quit, nullptr);
-                } while (!my_state.compare_exchange_strong(s, st_quit));
-                if (s == st_normal || s == st_starting) {
-                    // May have invalidated invariant for sleeping, so wake up the thread.
-                    // Note that the notify() here occurs without maintaining invariants for my_slack.
-                    // It does not matter, because my_state==st_quit overrides checking of my_slack.
-                    my_thread_monitor.notify();
-                    // Do not need release handle in st_init state,
-                    // because in this case the thread wasn't started yet.
-                    // For st_starting release is done at launch site.
-                    if (s == st_normal) release_handle(my_handle, join);
-                }
-            }
-
-            void ipc_worker::start_stopping(bool join) {
-                state_t s = my_state.load(std::memory_order_relaxed);
-                ;
-
-                while (!my_state.compare_exchange_strong(s, st_quit)) {};
-                if (s == st_normal || s == st_starting) {
-                    // May have invalidated invariant for sleeping, so wake up the thread.
-                    // Note that the notify() here occurs without maintaining invariants for my_slack.
-                    // It does not matter, because my_state==st_quit overrides checking of my_slack.
-                    my_thread_monitor.notify();
-                    // Do not need release handle in st_init state,
-                    // because in this case the thread wasn't started yet.
-                    // For st_starting release is done at launch site.
-                    if (s == st_normal) release_handle(my_handle, join);
-                }
-            }
-
-            void ipc_worker::run() {
+void ipc_worker::release_handle(thread_handle handle, bool join) {
+    if( join )
+        ipc_thread_monitor::join( handle );
+    else
+        ipc_thread_monitor::detach_thread( handle );
+}
+
+void ipc_worker::start_shutdown(bool join) {
+    state_t s = my_state.load(std::memory_order_relaxed);
+
+    do {
+        __TBB_ASSERT( s!=st_quit, nullptr );
+    } while( !my_state.compare_exchange_strong( s, st_quit ) );
+    if( s==st_normal || s==st_starting ) {
+        // May have invalidated invariant for sleeping, so wake up the thread.
+        // Note that the notify() here occurs without maintaining invariants for my_slack.
+        // It does not matter, because my_state==st_quit overrides checking of my_slack.
+        my_thread_monitor.notify();
+        // Do not need release handle in st_init state,
+        // because in this case the thread wasn't started yet.
+        // For st_starting release is done at launch site.
+        if( s==st_normal )
+            release_handle( my_handle, join );
+    }
+}
+
+void ipc_worker::start_stopping(bool join) {
+    state_t s = my_state.load(std::memory_order_relaxed);
+
+    while( !my_state.compare_exchange_strong( s, st_quit ) ) {};
+    if( s==st_normal || s==st_starting ) {
+        // May have invalidated invariant for sleeping, so wake up the thread.
+        // Note that the notify() here occurs without maintaining invariants for my_slack.
+        // It does not matter, because my_state==st_quit overrides checking of my_slack.
+        my_thread_monitor.notify();
+        // Do not need release handle in st_init state,
+        // because in this case the thread wasn't started yet.
+        // For st_starting release is done at launch site.
+        if( s==st_normal )
+            release_handle( my_handle, join );
+    }
+}
+
+void ipc_worker::run() {
+    my_server.propagate_chain_reaction();
+
+    // Transiting to st_normal here would require setting my_handle,
+    // which would create race with the launching thread and
+    // complications in handle management on Windows.
+
+    ::rml::job& j = *my_client.create_one_job();
+    state_t state = my_state.load(std::memory_order_acquire);
+    while( state!=st_quit && state!=st_stop ) {
+        if( my_server.my_slack>=0 ) {
+            my_client.process(j);
+        } else {
+            // Check/set the invariant for sleeping
+            state = my_state.load(std::memory_order_seq_cst);
+            if( state!=st_quit && state!=st_stop && my_server.try_insert_in_asleep_list(*this) ) {
+                if( my_server.my_n_thread > 1 ) my_server.release_active_thread();
+                my_thread_monitor.wait();
                 my_server.propagate_chain_reaction();
-
-                // Transiting to st_normal here would require setting my_handle,
-                // which would create race with the launching thread and
-                // complications in handle management on Windows.
-
-                ::rml::job& j = *my_client.create_one_job();
-                state_t state = my_state.load(std::memory_order_acquire);
-                while (state != st_quit && state != st_stop) {
-                    if (my_server.my_slack >= 0) {
-                        my_client.process(j);
-                    } else {
-                        ipc_thread_monitor::cookie c;
-                        // Prepare to wait
-                        my_thread_monitor.prepare_wait(c);
-                        // Check/set the invariant for sleeping
-                        state = my_state.load(std::memory_order_acquire);
-                        if (state != st_quit && state != st_stop
-                            && my_server.try_insert_in_asleep_list(*this)) {
-                            if (my_server.my_n_thread > 1) my_server.release_active_thread();
-                            my_thread_monitor.commit_wait(c);
-                            my_server.propagate_chain_reaction();
-                        } else {
-                            // Invariant broken
-                            my_thread_monitor.cancel_wait();
-                        }
-                    }
-                    state = my_state.load(std::memory_order_acquire);
-                }
-                my_client.cleanup(j);
-
-                my_server.remove_server_ref();
             }
-
-            inline bool ipc_worker::wake_or_launch() {
-                state_t excepted_stop = st_stop, expected_init = st_init;
-                if ((my_state.load(std::memory_order_acquire) == st_init
-                     && my_state.compare_exchange_strong(expected_init, st_starting))
-                    || (my_state.load(std::memory_order_acquire) == st_stop
-                        && my_state.compare_exchange_strong(excepted_stop, st_starting))) {
-                    // after this point, remove_server_ref() must be done by created thread
+        }
+        // memory_order_seq_cst to be strictly ordered after thread_monitor::wait
+        state = my_state.load(std::memory_order_seq_cst);
+    }
+    my_client.cleanup(j);
+
+    my_server.remove_server_ref();
+}
+
+inline bool ipc_worker::wake_or_launch() {
+    state_t excepted_stop = st_stop, expected_init = st_init;
+    if( ( my_state.load(std::memory_order_acquire)==st_init && my_state.compare_exchange_strong( expected_init, st_starting ) ) ||
+        ( my_state.load(std::memory_order_acquire)==st_stop && my_state.compare_exchange_strong( excepted_stop, st_starting ) ) ) {
+        // after this point, remove_server_ref() must be done by created thread
 #if USE_WINTHREAD
-                    my_handle = ipc_thread_monitor::launch(thread_routine, this, my_server.my_stack_size,
-                                                           &this->my_index);
+        my_handle = ipc_thread_monitor::launch( thread_routine, this, my_server.my_stack_size, &this->my_index );
 #elif USE_PTHREAD
-                    {
-                        affinity_helper fpa;
-                        fpa.protect_affinity_mask(/*restore_process_mask=*/true);
-                        my_handle = ipc_thread_monitor::launch(thread_routine, this, my_server.my_stack_size);
-                        if (my_handle == 0) {
-                            // Unable to create new thread for process
-                            // However, this is expected situation for the use cases of this coordination server
-                            state_t s = st_starting;
-                            my_state.compare_exchange_strong(s, st_init);
-                            if (st_starting != s) {
-                                // Do shutdown during startup. my_handle can't be released
-                                // by start_shutdown, because my_handle value might be not set yet
-                                // at time of transition from st_starting to st_quit.
-                                __TBB_ASSERT(s == st_quit, nullptr);
-                                release_handle(my_handle, my_server.my_join_workers);
-                            }
-                            return false;
-                        } else {
-                            my_server.my_ref_count++;
-                        }
-                        // Implicit destruction of fpa resets original affinity mask.
-                    }
+        {
+        affinity_helper fpa;
+        fpa.protect_affinity_mask( /*restore_process_mask=*/true );
+        my_handle = ipc_thread_monitor::launch( thread_routine, this, my_server.my_stack_size );
+        if( my_handle == 0 ) {
+            // Unable to create new thread for process
+            // However, this is expected situation for the use cases of this coordination server
+            state_t s = st_starting;
+            my_state.compare_exchange_strong( s, st_init );
+            if (st_starting != s) {
+                // Do shutdown during startup. my_handle can't be released
+                // by start_shutdown, because my_handle value might be not set yet
+                // at time of transition from st_starting to st_quit.
+                __TBB_ASSERT( s==st_quit, nullptr );
+                release_handle( my_handle, my_server.my_join_workers );
+            }
+            return false;
+        } else {
+            my_server.my_ref_count++;
+        }
+        // Implicit destruction of fpa resets original affinity mask.
+        }
 #endif /* USE_PTHREAD */
-                    state_t s = st_starting;
-                    my_state.compare_exchange_strong(s, st_normal);
-                    if (st_starting != s) {
-                        // Do shutdown during startup. my_handle can't be released
-                        // by start_shutdown, because my_handle value might be not set yet
-                        // at time of transition from st_starting to st_quit.
-                        __TBB_ASSERT(s == st_quit, nullptr);
-                        release_handle(my_handle, my_server.my_join_workers);
-                    }
-                } else {
-                    my_thread_monitor.notify();
-                }
+        state_t s = st_starting;
+        my_state.compare_exchange_strong( s, st_normal );
+        if( st_starting!=s ) {
+            // Do shutdown during startup. my_handle can't be released
+            // by start_shutdown, because my_handle value might be not set yet
+            // at time of transition from st_starting to st_quit.
+            __TBB_ASSERT( s==st_quit, nullptr );
+            release_handle( my_handle, my_server.my_join_workers );
+        }
+    }
+    else {
+        my_thread_monitor.notify();
+    }
 
-                return true;
-            }
+    return true;
+}
 
 //------------------------------------------------------------------------
 // Methods of ipc_waker
 //------------------------------------------------------------------------
 #if _MSC_VER && !defined(__INTEL_COMPILER)
-// Suppress overzealous compiler warnings about an initialized variable 'sink_for_alloca' not referenced
-#pragma warning(push)
-#pragma warning(disable : 4189)
+    // Suppress overzealous compiler warnings about an initialized variable 'sink_for_alloca' not referenced
+    #pragma warning(push)
+    #pragma warning(disable:4189)
 #endif
-#if __MINGW32__ && __GNUC__ == 4 && __GNUC_MINOR__ >= 2 && !__MINGW64__
-            // ensure that stack is properly aligned
-            __attribute__((force_align_arg_pointer))
+#if __MINGW32__ && __GNUC__==4 &&__GNUC_MINOR__>=2 && !__MINGW64__
+// ensure that stack is properly aligned
+__attribute__((force_align_arg_pointer))
 #endif
-            __RML_DECL_THREAD_ROUTINE
-            ipc_waker::thread_routine(void* arg) {
-                ipc_waker* self = static_cast<ipc_waker*>(arg);
-                AVOID_64K_ALIASING(self->my_index);
-                self->run();
-                return 0;
-            }
+__RML_DECL_THREAD_ROUTINE ipc_waker::thread_routine(void* arg) {
+    ipc_waker* self = static_cast<ipc_waker*>(arg);
+    AVOID_64K_ALIASING( self->my_index );
+    self->run();
+    return 0;
+}
 #if _MSC_VER && !defined(__INTEL_COMPILER)
-#pragma warning(pop)
+    #pragma warning(pop)
 #endif
 
-            void ipc_waker::run() {
-                // Transiting to st_normal here would require setting my_handle,
-                // which would create race with the launching thread and
-                // complications in handle management on Windows.
-
-                while (my_state.load(std::memory_order_acquire) != st_quit) {
-                    bool have_to_sleep = false;
-                    if (my_server.my_slack.load(std::memory_order_acquire) > 0) {
-                        if (my_server.wait_active_thread()) {
-                            if (my_server.my_slack.load(std::memory_order_acquire) > 0) {
-                                my_server.wake_some(0, 1);
-                            } else {
-                                my_server.release_active_thread();
-                                have_to_sleep = true;
-                            }
-                        }
-                    } else {
-                        have_to_sleep = true;
-                    }
-                    if (have_to_sleep) {
-                        ipc_thread_monitor::cookie c;
-                        // Prepare to wait
-                        my_thread_monitor.prepare_wait(c);
-                        // Check/set the invariant for sleeping
-                        if (my_state.load(std::memory_order_acquire) != st_quit
-                            && my_server.my_slack.load(std::memory_order_acquire) < 0) {
-                            my_thread_monitor.commit_wait(c);
-                        } else {
-                            // Invariant broken
-                            my_thread_monitor.cancel_wait();
-                        }
-                    }
+void ipc_waker::run() {
+    // Transiting to st_normal here would require setting my_handle,
+    // which would create race with the launching thread and
+    // complications in handle management on Windows.
+
+    // memory_order_seq_cst to be strictly ordered after thread_monitor::wait on the next iteration
+    while( my_state.load(std::memory_order_seq_cst)!=st_quit ) {
+        bool have_to_sleep = false;
+        if( my_server.my_slack.load(std::memory_order_acquire)>0 ) {
+            if( my_server.wait_active_thread() ) {
+                if( my_server.my_slack.load(std::memory_order_acquire)>0 ) {
+                    my_server.wake_some( 0, 1 );
+                } else {
+                    my_server.release_active_thread();
+                    have_to_sleep = true;
                 }
-
-                my_server.remove_server_ref();
             }
+        } else {
+            have_to_sleep = true;
+        }
+        if( have_to_sleep ) {
+            // Check/set the invariant for sleeping
+            if( my_server.my_slack.load(std::memory_order_acquire)<0 ) {
+                my_thread_monitor.wait();
+            }
+        }
+    }
+
+    my_server.remove_server_ref();
+}
 
-            inline bool ipc_waker::wake_or_launch() {
-                state_t excepted = st_init;
-                if ((my_state.load(std::memory_order_acquire) == st_init
-                     && my_state.compare_exchange_strong(excepted, st_starting))) {
-                    // after this point, remove_server_ref() must be done by created thread
+inline bool ipc_waker::wake_or_launch() {
+    state_t excepted = st_init;
+    if( ( my_state.load(std::memory_order_acquire)==st_init && my_state.compare_exchange_strong( excepted, st_starting ) ) ) {
+        // after this point, remove_server_ref() must be done by created thread
 #if USE_WINTHREAD
-                    my_handle = ipc_thread_monitor::launch(thread_routine, this, my_server.my_stack_size,
-                                                           &this->my_index);
+        my_handle = ipc_thread_monitor::launch( thread_routine, this, my_server.my_stack_size, &this->my_index );
 #elif USE_PTHREAD
-                    {
-                        affinity_helper fpa;
-                        fpa.protect_affinity_mask(/*restore_process_mask=*/true);
-                        my_handle = ipc_thread_monitor::launch(thread_routine, this, my_server.my_stack_size);
-                        if (my_handle == 0) {
-                            runtime_warning("Unable to create new thread for process %d", getpid());
-                            state_t s = st_starting;
-                            my_state.compare_exchange_strong(s, st_init);
-                            if (st_starting != s) {
-                                // Do shutdown during startup. my_handle can't be released
-                                // by start_shutdown, because my_handle value might be not set yet
-                                // at time of transition from st_starting to st_quit.
-                                __TBB_ASSERT(s == st_quit, nullptr);
-                                release_handle(my_handle, my_server.my_join_workers);
-                            }
-                            return false;
-                        } else {
-                            my_server.my_ref_count++;
-                        }
-                        // Implicit destruction of fpa resets original affinity mask.
-                    }
+        {
+        affinity_helper fpa;
+        fpa.protect_affinity_mask( /*restore_process_mask=*/true );
+        my_handle = ipc_thread_monitor::launch( thread_routine, this, my_server.my_stack_size );
+        if( my_handle == 0 ) {
+            runtime_warning( "Unable to create new thread for process %d", getpid() );
+            state_t s = st_starting;
+            my_state.compare_exchange_strong(s, st_init);
+            if (st_starting != s) {
+                // Do shutdown during startup. my_handle can't be released
+                // by start_shutdown, because my_handle value might be not set yet
+                // at time of transition from st_starting to st_quit.
+                __TBB_ASSERT( s==st_quit, nullptr );
+                release_handle( my_handle, my_server.my_join_workers );
+            }
+            return false;
+        } else {
+            my_server.my_ref_count++;
+        }
+        // Implicit destruction of fpa resets original affinity mask.
+        }
 #endif /* USE_PTHREAD */
-                    state_t s = st_starting;
-                    my_state.compare_exchange_strong(s, st_normal);
-                    if (st_starting != s) {
-                        // Do shutdown during startup. my_handle can't be released
-                        // by start_shutdown, because my_handle value might be not set yet
-                        // at time of transition from st_starting to st_quit.
-                        __TBB_ASSERT(s == st_quit, nullptr);
-                        release_handle(my_handle, my_server.my_join_workers);
-                    }
-                } else {
-                    my_thread_monitor.notify();
-                }
+        state_t s = st_starting;
+        my_state.compare_exchange_strong(s, st_normal);
+        if( st_starting!=s ) {
+            // Do shutdown during startup. my_handle can't be released
+            // by start_shutdown, because my_handle value might be not set yet
+            // at time of transition from st_starting to st_quit.
+            __TBB_ASSERT( s==st_quit, nullptr );
+            release_handle( my_handle, my_server.my_join_workers );
+        }
+    }
+    else {
+        my_thread_monitor.notify();
+    }
 
-                return true;
-            }
+    return true;
+}
 
 //------------------------------------------------------------------------
 // Methods of ipc_stopper
 //------------------------------------------------------------------------
 #if _MSC_VER && !defined(__INTEL_COMPILER)
-// Suppress overzealous compiler warnings about an initialized variable 'sink_for_alloca' not referenced
-#pragma warning(push)
-#pragma warning(disable : 4189)
+    // Suppress overzealous compiler warnings about an initialized variable 'sink_for_alloca' not referenced
+    #pragma warning(push)
+    #pragma warning(disable:4189)
 #endif
-#if __MINGW32__ && __GNUC__ == 4 && __GNUC_MINOR__ >= 2 && !__MINGW64__
-            // ensure that stack is properly aligned
-            __attribute__((force_align_arg_pointer))
+#if __MINGW32__ && __GNUC__==4 &&__GNUC_MINOR__>=2 && !__MINGW64__
+// ensure that stack is properly aligned
+__attribute__((force_align_arg_pointer))
 #endif
-            __RML_DECL_THREAD_ROUTINE
-            ipc_stopper::thread_routine(void* arg) {
-                ipc_stopper* self = static_cast<ipc_stopper*>(arg);
-                AVOID_64K_ALIASING(self->my_index);
-                self->run();
-                return 0;
-            }
+__RML_DECL_THREAD_ROUTINE ipc_stopper::thread_routine(void* arg) {
+    ipc_stopper* self = static_cast<ipc_stopper*>(arg);
+    AVOID_64K_ALIASING( self->my_index );
+    self->run();
+    return 0;
+}
 #if _MSC_VER && !defined(__INTEL_COMPILER)
-#pragma warning(pop)
+    #pragma warning(pop)
 #endif
 
-            void ipc_stopper::run() {
-                // Transiting to st_normal here would require setting my_handle,
-                // which would create race with the launching thread and
-                // complications in handle management on Windows.
-
-                while (my_state.load(std::memory_order_acquire) != st_quit) {
-                    if (my_server.wait_stop_thread()) {
-                        if (my_state.load(std::memory_order_acquire) != st_quit) {
-                            if (!my_server.stop_one()) {
-                                my_server.add_stop_thread();
-                                tbb::detail::r1::prolonged_pause();
-                            }
-                        }
-                    }
+void ipc_stopper::run() {
+    // Transiting to st_normal here would require setting my_handle,
+    // which would create race with the launching thread and
+    // complications in handle management on Windows.
+
+    while( my_state.load(std::memory_order_acquire)!=st_quit ) {
+        if( my_server.wait_stop_thread() ) {
+            if( my_state.load(std::memory_order_acquire)!=st_quit ) {
+                if( !my_server.stop_one() ) {
+                    my_server.add_stop_thread();
+                    tbb::detail::r1::prolonged_pause();
                 }
-
-                my_server.remove_server_ref();
             }
+        }
+    }
+
+    my_server.remove_server_ref();
+}
 
-            inline bool ipc_stopper::wake_or_launch() {
-                state_t excepted = st_init;
-                if ((my_state.load(std::memory_order_acquire) == st_init
-                     && my_state.compare_exchange_strong(excepted, st_starting))) {
-                    // after this point, remove_server_ref() must be done by created thread
+inline bool ipc_stopper::wake_or_launch() {
+    state_t excepted = st_init;
+    if( ( my_state.load(std::memory_order_acquire)==st_init && my_state.compare_exchange_strong( excepted, st_starting ) ) ) {
+        // after this point, remove_server_ref() must be done by created thread
 #if USE_WINTHREAD
-                    my_handle = ipc_thread_monitor::launch(thread_routine, this, my_server.my_stack_size,
-                                                           &this->my_index);
+        my_handle = ipc_thread_monitor::launch( thread_routine, this, my_server.my_stack_size, &this->my_index );
 #elif USE_PTHREAD
-                    {
-                        affinity_helper fpa;
-                        fpa.protect_affinity_mask(/*restore_process_mask=*/true);
-                        my_handle = ipc_thread_monitor::launch(thread_routine, this, my_server.my_stack_size);
-                        if (my_handle == 0) {
-                            runtime_warning("Unable to create new thread for process %d", getpid());
-                            state_t s = st_starting;
-                            my_state.compare_exchange_strong(s, st_init);
-                            if (st_starting != s) {
-                                // Do shutdown during startup. my_handle can't be released
-                                // by start_shutdown, because my_handle value might be not set yet
-                                // at time of transition from st_starting to st_quit.
-                                __TBB_ASSERT(s == st_quit, nullptr);
-                                release_handle(my_handle, my_server.my_join_workers);
-                            }
-                            return false;
-                        } else {
-                            my_server.my_ref_count++;
-                        }
-                        // Implicit destruction of fpa resets original affinity mask.
-                    }
+        {
+        affinity_helper fpa;
+        fpa.protect_affinity_mask( /*restore_process_mask=*/true );
+        my_handle = ipc_thread_monitor::launch( thread_routine, this, my_server.my_stack_size );
+        if( my_handle == 0 ) {
+            runtime_warning( "Unable to create new thread for process %d", getpid() );
+            state_t s = st_starting;
+            my_state.compare_exchange_strong(s, st_init);
+            if (st_starting != s) {
+                // Do shutdown during startup. my_handle can't be released
+                // by start_shutdown, because my_handle value might be not set yet
+                // at time of transition from st_starting to st_quit.
+                __TBB_ASSERT( s==st_quit, nullptr );
+                release_handle( my_handle, my_server.my_join_workers );
+            }
+            return false;
+        } else {
+            my_server.my_ref_count++;
+        }
+        // Implicit destruction of fpa resets original affinity mask.
+        }
 #endif /* USE_PTHREAD */
-                    state_t s = st_starting;
-                    my_state.compare_exchange_strong(s, st_normal);
-                    if (st_starting != s) {
-                        // Do shutdown during startup. my_handle can't be released
-                        // by start_shutdown, because my_handle value might be not set yet
-                        // at time of transition from st_starting to st_quit.
-                        __TBB_ASSERT(s == st_quit, nullptr);
-                        release_handle(my_handle, my_server.my_join_workers);
-                    }
-                } else {
-                    my_thread_monitor.notify();
-                }
+        state_t s = st_starting;
+        my_state.compare_exchange_strong(s, st_normal);
+        if( st_starting!=s ) {
+            // Do shutdown during startup. my_handle can't be released
+            // by start_shutdown, because my_handle value might be not set yet
+            // at time of transition from st_starting to st_quit.
+            __TBB_ASSERT( s==st_quit, nullptr );
+            release_handle( my_handle, my_server.my_join_workers );
+        }
+    }
+    else {
+        my_thread_monitor.notify();
+    }
 
-                return true;
-            }
+    return true;
+}
 
-            //------------------------------------------------------------------------
-            // Methods of ipc_server
-            //------------------------------------------------------------------------
-            ipc_server::ipc_server(tbb_client& client)
-                : my_client(client), my_stack_size(client.min_stack_size()), my_thread_array(nullptr),
-                  my_join_workers(false), my_waker(nullptr), my_stopper(nullptr) {
-                my_ref_count = 1;
-                my_slack = 0;
+//------------------------------------------------------------------------
+// Methods of ipc_server
+//------------------------------------------------------------------------
+ipc_server::ipc_server(tbb_client& client) :
+    my_client( client ),
+    my_stack_size( client.min_stack_size() ),
+    my_thread_array(nullptr),
+    my_join_workers(false),
+    my_waker(nullptr),
+    my_stopper(nullptr)
+{
+    my_ref_count = 1;
+    my_slack = 0;
 #if TBB_USE_ASSERT
-                my_net_slack_requests = 0;
+    my_net_slack_requests = 0;
 #endif /* TBB_USE_ASSERT */
-                my_n_thread = tbb::internal::rml::get_num_threads(IPC_MAX_THREADS_VAR_NAME);
-                if (my_n_thread == 0) {
-                    my_n_thread = tbb::detail::r1::AvailableHwConcurrency();
-                    __TBB_ASSERT(my_n_thread > 0, nullptr);
-                }
-
-                my_asleep_list_root = nullptr;
-                my_thread_array = tbb::cache_aligned_allocator<padded_ipc_worker>().allocate(my_n_thread);
-                for (size_t i = 0; i < my_n_thread; ++i) {
-                    ipc_worker* t = new (&my_thread_array[i]) padded_ipc_worker(*this, client, i);
-                    t->my_next = my_asleep_list_root;
-                    my_asleep_list_root = t;
-                }
-
-                my_waker = tbb::cache_aligned_allocator<ipc_waker>().allocate(1);
-                new (my_waker) ipc_waker(*this, client, my_n_thread);
-
-                my_stopper = tbb::cache_aligned_allocator<ipc_stopper>().allocate(1);
-                new (my_stopper) ipc_stopper(*this, client, my_n_thread + 1);
-
-                char* active_sem_name = get_active_sem_name();
-                my_active_sem = sem_open(active_sem_name, O_CREAT, IPC_SEM_MODE, my_n_thread - 1);
-                __TBB_ASSERT(my_active_sem, "Unable to open active threads semaphore");
-                delete[] active_sem_name;
-
-                char* stop_sem_name = get_stop_sem_name();
-                my_stop_sem = sem_open(stop_sem_name, O_CREAT, IPC_SEM_MODE, 0);
-                __TBB_ASSERT(my_stop_sem, "Unable to open stop threads semaphore");
-                delete[] stop_sem_name;
+    my_n_thread = tbb::internal::rml::get_num_threads(IPC_MAX_THREADS_VAR_NAME);
+    if( my_n_thread==0 ) {
+        my_n_thread = tbb::detail::r1::AvailableHwConcurrency();
+        __TBB_ASSERT( my_n_thread>0, nullptr );
+    }
+
+    my_asleep_list_root = nullptr;
+    my_thread_array = tbb::cache_aligned_allocator<padded_ipc_worker>().allocate( my_n_thread );
+    for( size_t i=0; i<my_n_thread; ++i ) {
+        ipc_worker* t = new( &my_thread_array[i] ) padded_ipc_worker( *this, client, i );
+        t->my_next = my_asleep_list_root;
+        my_asleep_list_root = t;
+    }
+
+    my_waker = tbb::cache_aligned_allocator<ipc_waker>().allocate(1);
+    new( my_waker ) ipc_waker( *this, client, my_n_thread );
+
+    my_stopper = tbb::cache_aligned_allocator<ipc_stopper>().allocate(1);
+    new( my_stopper ) ipc_stopper( *this, client, my_n_thread + 1 );
+
+    char* active_sem_name = get_active_sem_name();
+    my_active_sem = sem_open( active_sem_name, O_CREAT, IPC_SEM_MODE, my_n_thread - 1 );
+    __TBB_ASSERT( my_active_sem, "Unable to open active threads semaphore" );
+    delete[] active_sem_name;
+
+    char* stop_sem_name = get_stop_sem_name();
+    my_stop_sem = sem_open( stop_sem_name, O_CREAT, IPC_SEM_MODE, 0 );
+    __TBB_ASSERT( my_stop_sem, "Unable to open stop threads semaphore" );
+    delete[] stop_sem_name;
+}
+
+ipc_server::~ipc_server() {
+    __TBB_ASSERT( my_net_slack_requests.load(std::memory_order_relaxed)==0, nullptr );
+
+    for( size_t i=my_n_thread; i--; )
+        my_thread_array[i].~padded_ipc_worker();
+    tbb::cache_aligned_allocator<padded_ipc_worker>().deallocate( my_thread_array, my_n_thread );
+    tbb::detail::d0::poison_pointer( my_thread_array );
+
+    my_waker->~ipc_waker();
+    tbb::cache_aligned_allocator<ipc_waker>().deallocate( my_waker, 1 );
+    tbb::detail::d0::poison_pointer( my_waker );
+
+    my_stopper->~ipc_stopper();
+    tbb::cache_aligned_allocator<ipc_stopper>().deallocate( my_stopper, 1 );
+    tbb::detail::d0::poison_pointer( my_stopper );
+
+    sem_close( my_active_sem );
+    sem_close( my_stop_sem );
+}
+
+inline bool ipc_server::try_insert_in_asleep_list(ipc_worker& t) {
+    asleep_list_mutex_type::scoped_lock lock;
+    if( !lock.try_acquire( my_asleep_list_mutex ) )
+        return false;
+    // Contribute to slack under lock so that if another takes that unit of slack,
+    // it sees us sleeping on the list and wakes us up.
+    int k = ++my_slack;
+    if( k<=0 ) {
+        t.my_next = my_asleep_list_root.load(std::memory_order_relaxed);
+        my_asleep_list_root.store(&t, std::memory_order_relaxed);
+        return true;
+    } else {
+        --my_slack;
+        return false;
+    }
+}
+
+inline bool ipc_server::try_insert_in_asleep_list_forced(ipc_worker& t) {
+    asleep_list_mutex_type::scoped_lock lock;
+    if( !lock.try_acquire( my_asleep_list_mutex ) )
+        return false;
+    // Contribute to slack under lock so that if another takes that unit of slack,
+    // it sees us sleeping on the list and wakes us up.
+    ++my_slack;
+    t.my_next = my_asleep_list_root.load(std::memory_order_relaxed);
+    my_asleep_list_root.store(&t, std::memory_order_relaxed);
+    return true;
+}
+
+inline bool ipc_server::wait_active_thread() {
+    if( sem_wait( my_active_sem ) == 0 ) {
+        ++my_global_thread_count;
+        return true;
+    }
+    return false;
+}
+
+inline bool ipc_server::try_get_active_thread() {
+    if( sem_trywait( my_active_sem ) == 0 ) {
+        ++my_global_thread_count;
+        return true;
+    }
+    return false;
+}
+
+inline void ipc_server::release_active_thread() {
+    release_thread_sem( my_active_sem );
+}
+
+inline bool ipc_server::wait_stop_thread() {
+    struct timespec ts;
+    if( clock_gettime( CLOCK_REALTIME, &ts )==0 ) {
+        ts.tv_sec++;
+        if( sem_timedwait( my_stop_sem, &ts )==0 ) {
+            return true;
+        }
+    }
+    return false;
+}
+
+inline void ipc_server::add_stop_thread() {
+    sem_post( my_stop_sem );
+}
+
+void ipc_server::wake_some( int additional_slack, int active_threads ) {
+    __TBB_ASSERT( additional_slack>=0, nullptr );
+    ipc_worker* wakee[2];
+    ipc_worker **w = wakee;
+    {
+        asleep_list_mutex_type::scoped_lock lock(my_asleep_list_mutex);
+        while( active_threads>0 && my_asleep_list_root.load(std::memory_order_relaxed) && w<wakee+2 ) {
+            if( additional_slack>0 ) {
+                if( additional_slack+my_slack.load(std::memory_order_acquire)<=0 ) // additional demand does not exceed surplus supply
+                    break;
+                --additional_slack;
+            } else {
+                // Chain reaction; Try to claim unit of slack
+                int old;
+                do {
+                    old = my_slack.load(std::memory_order_relaxed);
+                    if( old<=0 ) goto done;
+                } while( !my_slack.compare_exchange_strong( old, old-1 ) );
             }
-
-            ipc_server::~ipc_server() {
-                __TBB_ASSERT(my_net_slack_requests.load(std::memory_order_relaxed) == 0, nullptr);
-
-                for (size_t i = my_n_thread; i--;) my_thread_array[i].~padded_ipc_worker();
-                tbb::cache_aligned_allocator<padded_ipc_worker>().deallocate(my_thread_array, my_n_thread);
-                tbb::detail::d0::poison_pointer(my_thread_array);
-
-                my_waker->~ipc_waker();
-                tbb::cache_aligned_allocator<ipc_waker>().deallocate(my_waker, 1);
-                tbb::detail::d0::poison_pointer(my_waker);
-
-                my_stopper->~ipc_stopper();
-                tbb::cache_aligned_allocator<ipc_stopper>().deallocate(my_stopper, 1);
-                tbb::detail::d0::poison_pointer(my_stopper);
-
-                sem_close(my_active_sem);
-                sem_close(my_stop_sem);
+            // Pop sleeping worker to combine with claimed unit of slack
+            my_asleep_list_root.store(
+                (*w++ = my_asleep_list_root.load(std::memory_order_relaxed))->my_next,
+                std::memory_order_relaxed
+            );
+            --active_threads;
+        }
+        if( additional_slack ) {
+            // Contribute our unused slack to my_slack.
+            my_slack += additional_slack;
+        }
+    }
+done:
+    while( w>wakee ) {
+        if( !(*--w)->wake_or_launch() ) {
+            add_stop_thread();
+            do {
+            } while( !try_insert_in_asleep_list_forced(**w) );
+            release_active_thread();
+        }
+    }
+    while( active_threads ) {
+        release_active_thread();
+        --active_threads;
+    }
+}
+
+void ipc_server::wake_one_forced( int additional_slack ) {
+    __TBB_ASSERT( additional_slack>=0, nullptr );
+    ipc_worker* wakee[1];
+    ipc_worker **w = wakee;
+    {
+        asleep_list_mutex_type::scoped_lock lock(my_asleep_list_mutex);
+        while( my_asleep_list_root.load(std::memory_order_relaxed) && w<wakee+1 ) {
+            if( additional_slack>0 ) {
+                if( additional_slack+my_slack.load(std::memory_order_acquire)<=0 ) // additional demand does not exceed surplus supply
+                    break;
+                --additional_slack;
+            } else {
+                // Chain reaction; Try to claim unit of slack
+                int old;
+                do {
+                    old = my_slack.load(std::memory_order_relaxed);
+                    if( old<=0 ) goto done;
+                } while( !my_slack.compare_exchange_strong( old, old-1 ) );
             }
-
-            inline bool ipc_server::try_insert_in_asleep_list(ipc_worker& t) {
-                asleep_list_mutex_type::scoped_lock lock;
-                if (!lock.try_acquire(my_asleep_list_mutex)) return false;
-                // Contribute to slack under lock so that if another takes that unit of slack,
-                // it sees us sleeping on the list and wakes us up.
-                int k = ++my_slack;
-                if (k <= 0) {
-                    t.my_next = my_asleep_list_root.load(std::memory_order_relaxed);
-                    my_asleep_list_root.store(&t, std::memory_order_relaxed);
-                    return true;
-                } else {
-                    --my_slack;
-                    return false;
+            // Pop sleeping worker to combine with claimed unit of slack
+            my_asleep_list_root.store(
+                (*w++ = my_asleep_list_root.load(std::memory_order_relaxed))->my_next,
+                std::memory_order_relaxed);
+        }
+        if( additional_slack ) {
+            // Contribute our unused slack to my_slack.
+            my_slack += additional_slack;
+        }
+    }
+done:
+    while( w>wakee ) {
+        if( !(*--w)->wake_or_launch() ) {
+            add_stop_thread();
+            do {
+            } while( !try_insert_in_asleep_list_forced(**w) );
+        }
+    }
+}
+
+bool ipc_server::stop_one() {
+    ipc_worker* current = nullptr;
+    ipc_worker* next = nullptr;
+    {
+        asleep_list_mutex_type::scoped_lock lock(my_asleep_list_mutex);
+        if( my_asleep_list_root.load(std::memory_order_relaxed) ) {
+            current = my_asleep_list_root.load(std::memory_order_relaxed);
+            if( current->my_state.load(std::memory_order_relaxed)==ipc_worker::st_normal ) {
+                next = current->my_next;
+                while( next!= nullptr && next->my_state.load(std::memory_order_relaxed)==ipc_worker::st_normal ) {
+                    current = next;
+                    next = current->my_next;
                 }
-            }
-
-            inline bool ipc_server::try_insert_in_asleep_list_forced(ipc_worker& t) {
-                asleep_list_mutex_type::scoped_lock lock;
-                if (!lock.try_acquire(my_asleep_list_mutex)) return false;
-                // Contribute to slack under lock so that if another takes that unit of slack,
-                // it sees us sleeping on the list and wakes us up.
-                ++my_slack;
-                t.my_next = my_asleep_list_root.load(std::memory_order_relaxed);
-                my_asleep_list_root.store(&t, std::memory_order_relaxed);
+                current->start_stopping( my_join_workers );
                 return true;
             }
+        }
+    }
+    return false;
+}
 
-            inline bool ipc_server::wait_active_thread() {
-                if (sem_wait(my_active_sem) == 0) {
-                    ++my_global_thread_count;
-                    return true;
-                }
-                return false;
-            }
-
-            inline bool ipc_server::try_get_active_thread() {
-                if (sem_trywait(my_active_sem) == 0) {
-                    ++my_global_thread_count;
-                    return true;
-                }
-                return false;
-            }
-
-            inline void ipc_server::release_active_thread() { release_thread_sem(my_active_sem); }
-
-            inline bool ipc_server::wait_stop_thread() {
-                struct timespec ts;
-                if (clock_gettime(CLOCK_REALTIME, &ts) == 0) {
-                    ts.tv_sec++;
-                    if (sem_timedwait(my_stop_sem, &ts) == 0) { return true; }
-                }
-                return false;
-            }
-
-            inline void ipc_server::add_stop_thread() { sem_post(my_stop_sem); }
-
-            void ipc_server::wake_some(int additional_slack, int active_threads) {
-                __TBB_ASSERT(additional_slack >= 0, nullptr);
-                ipc_worker* wakee[2];
-                ipc_worker** w = wakee;
-                {
-                    asleep_list_mutex_type::scoped_lock lock(my_asleep_list_mutex);
-                    while (active_threads > 0 && my_asleep_list_root.load(std::memory_order_relaxed)
-                           && w < wakee + 2) {
-                        if (additional_slack > 0) {
-                            if (additional_slack + my_slack.load(std::memory_order_acquire)
-                                <= 0)// additional demand does not exceed surplus supply
-                                break;
-                            --additional_slack;
-                        } else {
-                            // Chain reaction; Try to claim unit of slack
-                            int old;
-                            do {
-                                old = my_slack.load(std::memory_order_relaxed);
-                                if (old <= 0) goto done;
-                            } while (!my_slack.compare_exchange_strong(old, old - 1));
-                        }
-                        // Pop sleeping worker to combine with claimed unit of slack
-                        my_asleep_list_root.store(
-                                (*w++ = my_asleep_list_root.load(std::memory_order_relaxed))->my_next,
-                                std::memory_order_relaxed);
-                        --active_threads;
-                    }
-                    if (additional_slack) {
-                        // Contribute our unused slack to my_slack.
-                        my_slack += additional_slack;
-                    }
-                }
-            done:
-                while (w > wakee) {
-                    if (!(*--w)->wake_or_launch()) {
-                        add_stop_thread();
-                        do {
-                        } while (!try_insert_in_asleep_list_forced(**w));
-                        release_active_thread();
-                    }
-                }
-                while (active_threads) {
-                    release_active_thread();
-                    --active_threads;
-                }
-            }
-
-            void ipc_server::wake_one_forced(int additional_slack) {
-                __TBB_ASSERT(additional_slack >= 0, nullptr);
-                ipc_worker* wakee[1];
-                ipc_worker** w = wakee;
-                {
-                    asleep_list_mutex_type::scoped_lock lock(my_asleep_list_mutex);
-                    while (my_asleep_list_root.load(std::memory_order_relaxed) && w < wakee + 1) {
-                        if (additional_slack > 0) {
-                            if (additional_slack + my_slack.load(std::memory_order_acquire)
-                                <= 0)// additional demand does not exceed surplus supply
-                                break;
-                            --additional_slack;
-                        } else {
-                            // Chain reaction; Try to claim unit of slack
-                            int old;
-                            do {
-                                old = my_slack.load(std::memory_order_relaxed);
-                                if (old <= 0) goto done;
-                            } while (!my_slack.compare_exchange_strong(old, old - 1));
-                        }
-                        // Pop sleeping worker to combine with claimed unit of slack
-                        my_asleep_list_root.store(
-                                (*w++ = my_asleep_list_root.load(std::memory_order_relaxed))->my_next,
-                                std::memory_order_relaxed);
-                    }
-                    if (additional_slack) {
-                        // Contribute our unused slack to my_slack.
-                        my_slack += additional_slack;
-                    }
-                }
-            done:
-                while (w > wakee) {
-                    if (!(*--w)->wake_or_launch()) {
-                        add_stop_thread();
-                        do { } while (!try_insert_in_asleep_list_forced(**w)); }
+void ipc_server::adjust_job_count_estimate( int delta ) {
+#if TBB_USE_ASSERT
+    my_net_slack_requests+=delta;
+#endif /* TBB_USE_ASSERT */
+    if( my_n_thread > 1 ) {
+        if( delta<0 ) {
+            my_slack+=delta;
+        } else if( delta>0 ) {
+            int active_threads = 0;
+            if( try_get_active_thread() ) {
+                ++active_threads;
+                if( try_get_active_thread() ) {
+                    ++active_threads;
                 }
             }
+            wake_some( delta, active_threads );
 
-            bool ipc_server::stop_one() {
-                ipc_worker* current = nullptr;
-                ipc_worker* next = nullptr;
-                {
-                    asleep_list_mutex_type::scoped_lock lock(my_asleep_list_mutex);
-                    if (my_asleep_list_root.load(std::memory_order_relaxed)) {
-                        current = my_asleep_list_root.load(std::memory_order_relaxed);
-                        if (current->my_state.load(std::memory_order_relaxed) == ipc_worker::st_normal) {
-                            next = current->my_next;
-                            while (next != nullptr
-                                   && next->my_state.load(std::memory_order_relaxed)
-                                              == ipc_worker::st_normal) {
-                                current = next;
-                                next = current->my_next;
-                            }
-                            current->start_stopping(my_join_workers);
-                            return true;
-                        }
-                    }
-                }
-                return false;
+            if( !my_waker->wake_or_launch() ) {
+                add_stop_thread();
             }
-
-            void ipc_server::adjust_job_count_estimate(int delta) {
-#if TBB_USE_ASSERT
-                my_net_slack_requests += delta;
-#endif /* TBB_USE_ASSERT */
-                if (my_n_thread > 1) {
-                    if (delta < 0) {
-                        my_slack += delta;
-                    } else if (delta > 0) {
-                        int active_threads = 0;
-                        if (try_get_active_thread()) {
-                            ++active_threads;
-                            if (try_get_active_thread()) { ++active_threads; }
-                        }
-                        wake_some(delta, active_threads);
-
-                        if (!my_waker->wake_or_launch()) { add_stop_thread(); }
-                        if (!my_stopper->wake_or_launch()) { add_stop_thread(); }
-                    }
-                } else {// Corner case when RML shouldn't provide any worker thread but client has to have at least one
-                    if (delta < 0) {
-                        my_slack += delta;
-                    } else {
-                        wake_one_forced(delta);
-                    }
-                }
+            if( !my_stopper->wake_or_launch() ) {
+                add_stop_thread();
             }
+        }
+    } else { // Corner case when RML shouldn't provide any worker thread but client has to have at least one
+        if( delta<0 ) {
+            my_slack += delta;
+        } else {
+            wake_one_forced( delta );
+        }
+    }
+}
 
-            //------------------------------------------------------------------------
-            // RML factory methods
-            //------------------------------------------------------------------------
+//------------------------------------------------------------------------
+// RML factory methods
+//------------------------------------------------------------------------
 
 #if USE_PTHREAD
 
-            static tbb_client* my_global_client = nullptr;
-            static tbb_server* my_global_server = nullptr;
+static tbb_client* my_global_client = nullptr;
+static tbb_server* my_global_server = nullptr;
 
-            void rml_atexit() { release_resources(); }
+void rml_atexit() {
+    release_resources();
+}
 
-            void rml_atfork_child() {
-                if (my_global_server != nullptr && my_global_client != nullptr) {
-                    ipc_server* server = static_cast<ipc_server*>(my_global_server);
-                    server->~ipc_server();
-                    // memset( server, 0, sizeof(ipc_server) );
-                    new (server) ipc_server(*my_global_client);
-                    pthread_atfork(nullptr, nullptr, rml_atfork_child);
-                    atexit(rml_atexit);
-                }
-            }
+void rml_atfork_child() {
+    if( my_global_server!=nullptr && my_global_client!=nullptr ) {
+        ipc_server* server = static_cast<ipc_server*>( my_global_server );
+        server->~ipc_server();
+        // memset( server, 0, sizeof(ipc_server) );
+        new( server ) ipc_server( *my_global_client );
+        pthread_atfork( nullptr, nullptr, rml_atfork_child );
+        atexit( rml_atexit );
+    }
+}
 
 #endif /* USE_PTHREAD */
 
-            extern "C" tbb_factory::status_type __TBB_make_rml_server(tbb_factory& /*f*/, tbb_server*& server,
-                                                                      tbb_client& client) {
-                server = new (tbb::cache_aligned_allocator<ipc_server>().allocate(1)) ipc_server(client);
+extern "C" tbb_factory::status_type __TBB_make_rml_server(tbb_factory& /*f*/, tbb_server*& server, tbb_client& client) {
+    server = new( tbb::cache_aligned_allocator<ipc_server>().allocate(1) ) ipc_server(client);
 #if USE_PTHREAD
-                my_global_client = &client;
-                my_global_server = server;
-                pthread_atfork(nullptr, nullptr, rml_atfork_child);
-                atexit(rml_atexit);
+    my_global_client = &client;
+    my_global_server = server;
+    pthread_atfork( nullptr, nullptr, rml_atfork_child );
+    atexit( rml_atexit );
 #endif /* USE_PTHREAD */
-                if (getenv("RML_DEBUG")) { runtime_warning("IPC server is started"); }
-                return tbb_factory::st_success;
-            }
+    if( getenv( "RML_DEBUG" ) ) {
+        runtime_warning("IPC server is started");
+    }
+    return tbb_factory::st_success;
+}
 
-            extern "C" void __TBB_call_with_my_server_info(::rml::server_info_callback_t /*cb*/,
-                                                           void* /*arg*/) {}
+extern "C" void __TBB_call_with_my_server_info(::rml::server_info_callback_t /*cb*/, void* /*arg*/) {
+}
 
-        }// namespace rml
-    }    // namespace detail
+} // namespace rml
+} // namespace detail
 
-}// namespace tbb
+} // namespace tbb
diff --git a/external/tbb/python/rml/ipc_utils.cpp b/external/tbb/python/rml/ipc_utils.cpp
index 80f2754f..259d692e 100644
--- a/external/tbb/python/rml/ipc_utils.cpp
+++ b/external/tbb/python/rml/ipc_utils.cpp
@@ -16,105 +16,125 @@
 
 #include "ipc_utils.h"
 
-#include <limits.h>
-#include <stdio.h>
 #include <stdlib.h>
+#include <stdio.h>
+#include <limits.h>
 #include <string.h>
 #include <unistd.h>
 
 namespace tbb {
-    namespace internal {
-        namespace rml {
+namespace internal {
+namespace rml {
 
 #define MAX_STR_LEN 255
 #define STARTTIME_ITEM_ID 21
 
-            static char* get_stat_item(char* line, int item_id) {
-                int id = 0, i = 0;
-
-                while (id != item_id) {
-                    while (line[i] != '(' && line[i] != ' ' && line[i] != '\0') { ++i; }
-                    if (line[i] == ' ') {
-                        ++id;
-                        ++i;
-                    } else if (line[i] == '(') {
-                        while (line[i] != ')' && line[i] != '\0') { ++i; }
-                        if (line[i] == ')') {
-                            ++i;
-                        } else {
-                            return nullptr;
-                        }
-                    } else {
-                        return nullptr;
-                    }
-                }
-
-                return line + i;
-            }
-
-            unsigned long long get_start_time(int pid) {
-                const char* stat_file_path_template = "/proc/%d/stat";
-                char stat_file_path[MAX_STR_LEN + 1];
-                sprintf(stat_file_path, stat_file_path_template, pid);
-
-                FILE* stat_file = fopen(stat_file_path, "rt");
-                if (stat_file == nullptr) { return 0; }
-
-                char stat_line[MAX_STR_LEN + 1];
-                char* line = fgets(stat_line, MAX_STR_LEN, stat_file);
-                if (line == nullptr) { return 0; }
-
-                char* starttime_str = get_stat_item(stat_line, STARTTIME_ITEM_ID);
-                if (starttime_str == nullptr) { return 0; }
-
-                unsigned long long starttime = strtoull(starttime_str, nullptr, 10);
-                if (starttime == ULLONG_MAX) { return 0; }
-
-                return starttime;
-            }
-
-            char* get_shared_name(const char* prefix, int pid, unsigned long long time) {
-                const char* name_template = "%s_%d_%llu";
-                const int digits_in_int = 10;
-                const int digits_in_long = 20;
-
-                int len = strlen(name_template) + strlen(prefix) + digits_in_int + digits_in_long + 1;
-                char* name = new char[len];
-                sprintf(name, name_template, prefix, pid, time);
-
-                return name;
-            }
-
-            char* get_shared_name(const char* prefix) {
-                int pid = getpgrp();
-                unsigned long long time = get_start_time(pid);
-                return get_shared_name(prefix, pid, time);
+static char* get_stat_item(char* line, int item_id) {
+    int id = 0, i = 0;
+
+    while( id!=item_id ) {
+        while( line[i]!='(' && line[i]!=' ' && line[i]!='\0' ) {
+            ++i;
+        }
+        if( line[i]==' ' ) {
+            ++id;
+            ++i;
+        } else if( line[i]=='(' ) {
+            while( line[i]!=')' && line[i]!='\0' ) {
+               ++i;
             }
-
-            int get_num_threads(const char* env_var) {
-                if (env_var == nullptr) { return 0; }
-
-                char* value = getenv(env_var);
-                if (value == nullptr) { return 0; }
-
-                int num_threads = (int) strtol(value, nullptr, 10);
-                return num_threads;
+            if( line[i]==')' ) {
+                ++i;
+            } else {
+                return nullptr;
             }
-
-            bool get_enable_flag(const char* env_var) {
-                if (env_var == nullptr) { return false; }
-
-                char* value = getenv(env_var);
-                if (value == nullptr) { return false; }
-
-                if (strcmp(value, "0") == 0 || strcmp(value, "false") == 0 || strcmp(value, "False") == 0
-                    || strcmp(value, "FALSE") == 0) {
-                    return false;
-                }
-
-                return true;
-            }
-
-        }// namespace rml
-    }    // namespace internal
-}// namespace tbb
+        } else {
+            return nullptr;
+        }
+    }
+
+    return line + i;
+}
+
+unsigned long long get_start_time(int pid) {
+    const char* stat_file_path_template = "/proc/%d/stat";
+    char stat_file_path[MAX_STR_LEN + 1];
+    sprintf( stat_file_path, stat_file_path_template, pid );
+
+    FILE* stat_file = fopen( stat_file_path, "rt" );
+    if( stat_file==nullptr ) {
+        return 0;
+    }
+
+    char stat_line[MAX_STR_LEN + 1];
+    char* line = fgets( stat_line, MAX_STR_LEN, stat_file );
+    if( line==nullptr ) {
+        return 0;
+    }
+
+    char* starttime_str = get_stat_item( stat_line, STARTTIME_ITEM_ID );
+    if( starttime_str==nullptr ) {
+        return 0;
+    }
+
+    unsigned long long starttime = strtoull( starttime_str, nullptr, 10 );
+    if( starttime==ULLONG_MAX ) {
+        return 0;
+    }
+
+    return starttime;
+}
+
+char* get_shared_name(const char* prefix, int pid, unsigned long long time) {
+    const char* name_template = "%s_%d_%llu";
+    const int digits_in_int = 10;
+    const int digits_in_long = 20;
+
+    int len = strlen( name_template ) + strlen( prefix ) + digits_in_int + digits_in_long + 1;
+    char* name = new char[len];
+    sprintf( name, name_template, prefix, pid, time );
+
+    return name;
+}
+
+char* get_shared_name(const char* prefix) {
+    int pid = getpgrp();
+    unsigned long long time = get_start_time( pid );
+    return get_shared_name( prefix, pid, time );
+}
+
+int get_num_threads(const char* env_var) {
+    if( env_var==nullptr ) {
+        return 0;
+    }
+
+    char* value = getenv( env_var );
+    if( value==nullptr ) {
+        return 0;
+    }
+
+    int num_threads = (int)strtol( value, nullptr, 10 );
+    return num_threads;
+}
+
+bool get_enable_flag(const char* env_var) {
+    if( env_var==nullptr ) {
+        return false;
+    }
+
+    char* value = getenv( env_var );
+    if( value==nullptr ) {
+        return false;
+    }
+
+    if( strcmp( value, "0" ) == 0 ||
+        strcmp( value, "false" ) == 0 ||
+        strcmp( value, "False" ) == 0 ||
+        strcmp( value, "FALSE" ) == 0 ) {
+        return false;
+    }
+
+    return true;
+}
+
+}}} // namespace tbb::internal::rml
diff --git a/external/tbb/python/setup.py b/external/tbb/python/setup.py
index f084e705..edf8580f 100644
--- a/external/tbb/python/setup.py
+++ b/external/tbb/python/setup.py
@@ -1,6 +1,4 @@
-#!/usr/bin/env python3
-#
-# Copyright (c) 2016-2021 Intel Corporation
+# Copyright (c) 2016-2023 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -87,7 +85,7 @@ class TBBBuild(build):
         description ="Python API for oneTBB",
         long_description="Python API to Intel(R) oneAPI Threading Building Blocks library (oneTBB) "
                          "extended with standard Pool implementation and monkey-patching",
-        url         ="https://software.intel.com/en-us/intel-tbb",
+        url         ="https://www.intel.com/content/www/us/en/developer/tools/oneapi/onetbb.html",
         author      ="Intel Corporation",
         author_email="inteltbbdevelopers@intel.com",
         license     ="Dual license: Apache or Proprietary",
diff --git a/external/tbb/python/tbb/__init__.py b/external/tbb/python/tbb/__init__.py
index 875667c3..f09c93aa 100644
--- a/external/tbb/python/tbb/__init__.py
+++ b/external/tbb/python/tbb/__init__.py
@@ -1,6 +1,4 @@
-#!/usr/bin/env python3
-#
-# Copyright (c) 2016-2021 Intel Corporation
+# Copyright (c) 2016-2023 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,6 +18,17 @@
 import sys
 import os
 
+import platform
+
+if "Windows" in platform.system():
+    import site
+    path_to_env = site.getsitepackages()[0]
+    path_to_libs = os.path.join(path_to_env, "Library", "bin")
+    if sys.version_info.minor >= 8:
+        os.add_dll_directory(path_to_libs)
+    os.environ['PATH'] += os.pathsep + path_to_libs
+
+
 from .api import  *
 from .api import __all__ as api__all
 from .pool import *
diff --git a/external/tbb/python/tbb/__main__.py b/external/tbb/python/tbb/__main__.py
index 2c071017..03c2efce 100644
--- a/external/tbb/python/tbb/__main__.py
+++ b/external/tbb/python/tbb/__main__.py
@@ -1,6 +1,4 @@
-#!/usr/bin/env python3
-#
-# Copyright (c) 2016-2021 Intel Corporation
+# Copyright (c) 2016-2023 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/external/tbb/python/tbb/pool.py b/external/tbb/python/tbb/pool.py
index 75c9016c..dd5c8190 100644
--- a/external/tbb/python/tbb/pool.py
+++ b/external/tbb/python/tbb/pool.py
@@ -1,6 +1,4 @@
-#!/usr/bin/env python3
-#
-# Copyright (c) 2016-2021 Intel Corporation
+# Copyright (c) 2016-2024 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -91,8 +89,8 @@ class Pool(object):
 
     def __init__(self, nworkers=0, name="Pool"):
         """
-        \param nworkers (integer) number of worker threads to start
-        \param name (string) prefix for the worker threads' name
+        :param nworkers (integer) number of worker threads to start
+        :param name (string) prefix for the worker threads' name
         """
         self._closed = False
         self._tasks = task_group()
@@ -270,8 +268,8 @@ class Job:
 
     def __init__(self, func, args, kwds, apply_result):
         """
-        \param func/args/kwds used to call the function
-        \param apply_result ApplyResult object that holds the result
+        :param func/args/kwds used to call the function
+        :param apply_result ApplyResult object that holds the result
         of the function call
         """
         self._func = func
@@ -319,10 +317,10 @@ class ApplyResult(object):
 
     def __init__(self, collector=None, callback=None):
         """
-        \param collector when not None, the notify_ready() method of
+        :param collector when not None, the notify_ready() method of
         the collector will be called when the result from the Job is
         ready
-        \param callback when not None, function to call when the
+        :param callback when not None, function to call when the
         result becomes available (this is the parameter passed to the
         Pool::*_async() methods.
         """
@@ -406,7 +404,7 @@ class AbstractResultCollector(object):
 
     def __init__(self, to_notify):
         """
-        \param to_notify ApplyResult object to notify when all the
+        :param to_notify ApplyResult object to notify when all the
         results we're waiting for become available. Can be None.
         """
         self._to_notify = to_notify
@@ -416,7 +414,7 @@ def register_result(self, apply_result):
         always be called BEFORE the Jobs get submitted to the work
         queue, and BEFORE the __iter__ and _get_result() methods can
         be called
-        \param apply_result ApplyResult object to add in our collection
+        :param apply_result ApplyResult object to add in our collection
         """
         raise NotImplementedError("Children classes must implement it")
 
@@ -424,7 +422,7 @@ def notify_ready(self, apply_result):
         """Called by the ApplyResult object (already registered via
         register_result()) that it is now ready (ie. the Job's result
         is available or an exception has been raised).
-        \param apply_result ApplyResult object telling us that the job
+        :param apply_result ApplyResult object telling us that the job
         has been processed
         """
         raise NotImplementedError("Children classes must implement it")
@@ -433,8 +431,8 @@ def _get_result(self, idx, timeout=None):
         """Called by the CollectorIterator object to retrieve the
         result's values one after another (order defined by the
         implementation)
-        \param idx The index of the result we want, wrt collector's order
-        \param timeout integer telling how long to wait (in seconds)
+        :param idx The index of the result we want, wrt collector's order
+        :param timeout integer telling how long to wait (in seconds)
         for the result at index idx to be available, or None (wait
         forever)
         """
@@ -452,7 +450,7 @@ class CollectorIterator(object):
     AbstractResultCollector::__iter__() method"""
 
     def __init__(self, collector):
-        """\param AbstractResultCollector instance"""
+        """:param AbstractResultCollector instance"""
         self._collector = collector
         self._idx = 0
 
@@ -488,7 +486,7 @@ class UnorderedResultCollector(AbstractResultCollector):
 
     def __init__(self, to_notify=None):
         """
-        \param to_notify ApplyResult object to notify when all the
+        :param to_notify ApplyResult object to notify when all the
         results we're waiting for become available. Can be None.
         """
         AbstractResultCollector.__init__(self, to_notify)
@@ -501,7 +499,7 @@ def register_result(self, apply_result):
         always be called BEFORE the Jobs get submitted to the work
         queue, and BEFORE the __iter__ and _get_result() methods can
         be called
-        \param apply_result ApplyResult object to add in our collection
+        :param apply_result ApplyResult object to add in our collection
         """
         self._expected += 1
 
@@ -509,8 +507,8 @@ def _get_result(self, idx, timeout=None):
         """Called by the CollectorIterator object to retrieve the
         result's values one after another, in the order the results have
         become available.
-        \param idx The index of the result we want, wrt collector's order
-        \param timeout integer telling how long to wait (in seconds)
+        :param idx The index of the result we want, wrt collector's order
+        :param timeout integer telling how long to wait (in seconds)
         for the result at index idx to be available, or None (wait
         forever)
         """
@@ -537,7 +535,7 @@ def notify_ready(self, apply_result=None):
         """Called by the ApplyResult object (already registered via
         register_result()) that it is now ready (ie. the Job's result
         is available or an exception has been raised).
-        \param apply_result ApplyResult object telling us that the job
+        :param apply_result ApplyResult object telling us that the job
         has been processed
         """
         first_item = False
@@ -562,9 +560,9 @@ class OrderedResultCollector(AbstractResultCollector):
 
     def __init__(self, to_notify=None, as_iterator=True):
         """
-        \param to_notify ApplyResult object to notify when all the
+        :param to_notify ApplyResult object to notify when all the
         results we're waiting for become available. Can be None.
-        \param as_iterator boolean telling whether the result value
+        :param as_iterator boolean telling whether the result value
         set on to_notify should be an iterator (available as soon as 1
         result arrived) or a list (available only after the last
         result arrived)
@@ -580,7 +578,7 @@ def register_result(self, apply_result):
         always be called BEFORE the Jobs get submitted to the work
         queue, and BEFORE the __iter__ and _get_result() methods can
         be called
-        \param apply_result ApplyResult object to add in our collection
+        :param apply_result ApplyResult object to add in our collection
         """
         self._results.append(apply_result)
         self._remaining += 1
@@ -589,8 +587,8 @@ def _get_result(self, idx, timeout=None):
         """Called by the CollectorIterator object to retrieve the
         result's values one after another (order defined by the
         implementation)
-        \param idx The index of the result we want, wrt collector's order
-        \param timeout integer telling how long to wait (in seconds)
+        :param idx The index of the result we want, wrt collector's order
+        :param timeout integer telling how long to wait (in seconds)
         for the result at index idx to be available, or None (wait
         forever)
         """
@@ -602,7 +600,7 @@ def notify_ready(self, apply_result):
         """Called by the ApplyResult object (already registered via
         register_result()) that it is now ready (ie. the Job's result
         is available or an exception has been raised).
-        \param apply_result ApplyResult object telling us that the job
+        :param apply_result ApplyResult object telling us that the job
         has been processed
         """
         got_first = False
diff --git a/external/tbb/python/tbb/test.py b/external/tbb/python/tbb/test.py
index 7e02d788..690bfd4c 100644
--- a/external/tbb/python/tbb/test.py
+++ b/external/tbb/python/tbb/test.py
@@ -1,6 +1,4 @@
-#!/usr/bin/env python3
-#
-# Copyright (c) 2016-2021 Intel Corporation
+# Copyright (c) 2016-2023 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -82,6 +80,29 @@ def work(mseconds):
         say("[%d] Work done (%fms)." % (get_tid(), mseconds*10))
         return res
 
+    # special flag to to be set by thread calling async work
+    spin_flag = None
+    def timeout_work(param):
+        say("[%d] Spin wait work start..." % get_tid())
+        while spin_flag:
+            time.sleep(0.0001) # yield equivalent
+        say("[%d] Work done." % get_tid())
+        return str(param) if param != None else None
+
+    def prepare_timeout_exception():
+        nonlocal spin_flag
+        spin_flag = True # lock threads in timeout_work
+
+    def check_timeout_exception(pool_object, func):
+        nonlocal spin_flag
+        try:
+            func(pool_object)
+        except TimeoutError:
+            say("Good. Got expected timeout exception.")
+        else:
+            assert False, "Expected exception !"
+        spin_flag = False # unlock threads in timeout_work
+
     ### Test copy/pasted from multiprocessing
     pool = Pool(4)  # start worker threads
 
@@ -105,13 +126,9 @@ def work(mseconds):
     assert next(it) == 4
 
     # Test apply_sync exceptions
-    result = pool.apply_async(time.sleep, (3,))
-    try:
-        say(result.get(timeout=1))  # raises `TimeoutError`
-    except TimeoutError:
-        say("Good. Got expected timeout exception.")
-    else:
-        assert False, "Expected exception !"
+    prepare_timeout_exception()
+    result = pool.apply_async(timeout_work, (None,))
+    check_timeout_exception(result, lambda result : say(result.get(timeout=1)))
     assert result.get() is None  # sleep() returns None
 
     def cb(s):
@@ -126,23 +143,15 @@ def cb(s):
         str, range(10, 3, -1)))
 
     # Test map_async()
-    result = pool.map_async(work, range(10), callback=cb)
-    try:
-        result.get(timeout=0.01)  # raises `TimeoutError`
-    except TimeoutError:
-        say("Good. Got expected timeout exception.")
-    else:
-        assert False, "Expected exception !"
+    prepare_timeout_exception()
+    result = pool.map_async(timeout_work, range(10), callback=cb)
+    check_timeout_exception(result, lambda result : result.get(timeout=0.01))
     say(result.get())
 
     # Test imap_async()
-    result = pool.imap_async(work, range(3, 10), callback=cb)
-    try:
-        result.get(timeout=0.01)  # raises `TimeoutError`
-    except TimeoutError:
-        say("Good. Got expected timeout exception.")
-    else:
-        assert False, "Expected exception !"
+    prepare_timeout_exception()
+    result = pool.imap_async(timeout_work, range(3, 10), callback=cb)
+    check_timeout_exception(result, lambda result : result.get(timeout=0.01))
     for i in result.get():
         say("Item:", i)
     say("### Loop again:")
@@ -150,13 +159,9 @@ def cb(s):
         say("Item2:", i)
 
     # Test imap_unordered_async()
-    result = pool.imap_unordered_async(work, range(10, 3, -1), callback=cb)
-    try:
-        say(result.get(timeout=0.01))  # raises `TimeoutError`
-    except TimeoutError:
-        say("Good. Got expected timeout exception.")
-    else:
-        assert False, "Expected exception !"
+    prepare_timeout_exception()
+    result = pool.imap_unordered_async(timeout_work, range(10, 3, -1), callback=cb)
+    check_timeout_exception(result, lambda result : result.get(timeout=0.01))
     for i in result.get():
         say("Item1:", i)
     for i in result.get():
diff --git a/external/tbb/rfcs/README.md b/external/tbb/rfcs/README.md
new file mode 100644
index 00000000..15995290
--- /dev/null
+++ b/external/tbb/rfcs/README.md
@@ -0,0 +1,77 @@
+# oneTBB Design Documents/RFCs
+
+The RFC process intends to:
+
+- Communicate library-wide changes
+- Collect feedback before implementation
+- Increase transparency in decision-making 
+- Align different teams involved in oneTBB development
+
+This directory contains design documents (RFCs) approved 
+or rejected for implementation in oneTBB.
+
+The possible RFC states are:
+
+1. Initial 
+2. Proposed
+3. Experimental
+4. Supported
+5. Archived
+
+Most modifications or new features will naturally start as a part of a 
+GitHub issue or discussion. Small changes do not require a formal RFC. 
+However, if the issue or discussion results in an idea for a significant 
+change or new feature that affects the library's public API or architecture, 
+we recommend opening a PR to add a new RFC to the `rfcs/proposed` directory. 
+The RFC should provide a detailed description and design of the proposed feature.
+or new feature that significantly impacts the library's public API or 
+architecture, it will be suggested that a PR be opened to add a new rfc 
+to the `rfcs/proposed` directory. The RFC contains a more detailed description
+and design for the feature.
+
+## General Process
+
+A template for RFCs is available as [template.md](template.md). Place the modified
+template in the subdirectory of the `rfcs/proposed` with a name
+of the form `<feature>_<extension_description>`. For example,
+a proposal for a new ``my_op`` flow graph node should be put into the
+`rfcs/proposed/flow_graph_my_op_node` directory. Use [template.md](template.md) 
+to create the `README.md` file in that directory. The folder can 
+contain other files referenced by the `README.md` file, such as figures.
+
+Once two maintainers approve the PR, it is merged into the `rfcs/proposed`
+directory. Update the RFC document with additional information as the RFC moves 
+to different states. 
+
+A proposal that is subsequently implemented and released in oneTBB 
+as a preview feature is moved into the `rfcs/experimental` folder. The
+RFC for a preview feature in `rfcs/experimental` should include a description
+of what is required to move from experimental to fully supported -- for 
+example, feedback from users, demonstrated performance improvements, etc.
+
+A proposal that is implemented, added to the oneTBB specification, and 
+supported as a full feature appears in the `rfcs/supported` directory. An RFC 
+for a fully supported feature in the `rfcs/supported` directory should 
+have a link to the section in the oneTBB specification with its 
+formal wording.
+
+A feature that is removed or a proposal that is abandoned or rejected will 
+be moved to the `rfcs/archived` folder.
+
+## Document Style
+
+The design documents are stored in the `rfcs` directory, and each RFC is placed 
+in its subdirectory under `rfcs/proposed/<feature>_<extension_description>`. 
+
+- There must be a `README.md` file that contains the main RFC itself (or 
+links to a file that contains it in the same directory).
+  - The RFC should follow the [template.md](template.md) structure. 
+  - The directory can contain other supporting files, such as images, tex 
+  formulas, and sub-proposals / sub-RFCs.
+  - We highly recommend using a text-based file format like markdown for easy 
+  collaboration on GitHub, but other formats like PDFs may also be acceptable.
+- For the markdown-written RFC, keep the text width within
+  100 characters, unless there is a reason to violate this rule, e.g., 
+  long links or wide tables.
+- It is also recommended to read through existing RFCs to better understand the 
+general writing style and required elements.
diff --git a/external/tbb/rfcs/archived/README.md b/external/tbb/rfcs/archived/README.md
new file mode 100644
index 00000000..7c23aa3e
--- /dev/null
+++ b/external/tbb/rfcs/archived/README.md
@@ -0,0 +1,14 @@
+# Archived Design Documents
+
+Documents may appear in the `rfcs/archived` directory for one of 
+two reasons:
+
+1. The document describes a feature or extension that has been deprecated and 
+then removed.
+2. The document describes a proposed feature or extension that have
+not (ultimately) become a fully supported feature. 
+
+Design documents that appear in the `rfcs/archived` folder should describe a 
+reason for archiving.  Documents may 
+remain in this folder indefinitely to serve as a source of information about
+previous proposals and features.
diff --git a/external/tbb/rfcs/experimental/README.md b/external/tbb/rfcs/experimental/README.md
new file mode 100644
index 00000000..612e69f0
--- /dev/null
+++ b/external/tbb/rfcs/experimental/README.md
@@ -0,0 +1,28 @@
+# Design Documents for Experimental Features
+
+Experimental proposals describe extensions that are implemented and
+released as preview features in the oneTBB library. A preview
+feature is expected to have an implementation that is of comparable quality
+to a fully supported feature. Sufficient tests are required.
+
+An experimental feature does not yet appear as part of the oneTBB 
+specification. Therefore, the interface and design can change.
+There is no commitment to backward compatibility for a preview
+feature.
+
+The documents in this directory 
+should include a list of the exit conditions that need to be met to move from
+preview to fully supported. These conditions might include demonstrated
+performance improvements, demonstrated interest from the community,
+acceptance of the required oneTBB specification changes, etc. 
+
+For features that require oneTBB specification changes, the document might
+include wording for those changes or a link to any PRs that opened
+against the specification.
+
+Proposals should not remain in the experimental directory forever.
+It should move either to the
+supported folder when they become fully supported or the archived 
+folder if they are not fully accepted. It should be highly unusual for 
+a proposal to stay in the experimental folder for longer than a year or 
+two.
diff --git a/external/tbb/rfcs/experimental/blocked_nd_range_ctad/README.md b/external/tbb/rfcs/experimental/blocked_nd_range_ctad/README.md
new file mode 100644
index 00000000..35610e2f
--- /dev/null
+++ b/external/tbb/rfcs/experimental/blocked_nd_range_ctad/README.md
@@ -0,0 +1,227 @@
+# Enabling CTAD for blocked_nd_range
+
+## Introduction
+
+`oneapi::tbb::blocked_nd_range` class was introduced as a representation for recursively divisible N-dimensional range for oneTBB parallel algorithms.
+This document proposes extending its API with the deduction guides since C++17 to allow dropping the explicit template arguments specification while
+creating the object if they can be determined using the arguments provided:
+
+```cpp
+oneapi::tbb::blocked_range<int> range1(0, 100);
+oneapi::tbb::blocked_range<int> range2(0, 200);
+oneapi::tbb::blocked_range<int> range3(0, 300);
+
+// Since 3 ranges of type int are provided, the type of nd_range
+// can be deduced as oneapi::tbb::blocked_nd_range<int, 3>
+oneapi::tbb::blocked_nd_range nd_range(range1, range2, range3);
+```
+
+## Proposal
+
+### Supported constructors
+
+The `oneapi::tbb::blocked_nd_range` supports the following set of constructors:
+
+```cpp
+template <typename T, unsigned int N>\
+class blocked_nd_range {
+public:
+    using value_type;
+    using dim_range_type = blocked_range<value_type>;
+    using size_type = typename dim_range_type::size_type;
+
+    blocked_nd_range(const dim_range_type& dim0, /*exactly N arguments of type const dim_range_type&*/); // [1]
+    blocked_nd_range(const value_type (&dim_size)[N], size_type grainsize = 1);                          // [2]
+    blocked_nd_range(blocked_nd_range& r, split);                                                        // [3]
+    blocked_nd_range(blocked_nd_range& r, proportional_split proportion);                                // [4]
+};
+```
+
+The constructor `[1]` is intended to create an n-dimensional interval by providing N one-dimensional ranges. Each element represents the
+dimension of the N-dimensional interval being constructed.
+It also allows to construct these one-dimensional intervals in-place from braced-inclosed initializer lists:
+
+```cpp
+// Passing blocked_range objects itself
+tbb::blocked_range<int> dim_range(0, 100);
+
+tbb::blocked_nd_range<int, 2> nd_range_1(dim_range, tbb::blocked_range<int>(0, 200));
+
+// Constructing in-place from braced-init-lists
+tbb::blocked_nd_range<int, 2> nd_range_2({0, 100}, {0, 200, 5});
+
+// Combined approach
+tbb::blocked_nd_range<int, 2> nd_range_3(dim_range, {0, 200, 5});
+```
+
+The constructor `[2]` is intended to create an interval by providing a C-array each element of which represents a size of the corresponding
+dimension of the interval being created. This constructor also allows to pass braced-init-list instead of the array from stack:
+
+```cpp
+// Passing array object itself
+int sizes[3] = {100, 200, 300};
+
+// Constructing the 3-dim range [0, 100), [0, 200), [0, 300)
+tbb::blocked_nd_range<int, 3> nd_range_1(sizes);
+
+// Using the grainsize - each dim range will have grainsize 5
+tbb::blocked_nd_range<int, 3> nd_range_2(sizes, 5);
+
+// Passing the braced-init-list
+tbb::blocked_nd_range<int, 3> nd_range_3({100, 200, 300});
+```
+
+In case of passing the template arguments explicitly, using a braced-init-list in both constructors `[1]` and `[2]` does not introduce any 
+ambiguity since if the number of braced-init lists provided is always equal to the number of dimensions of the range for constructor `[1]` and
+the number of elements in the braced-init list equal to the number of dimensions for constructor `[2]`. 
+
+Constructors `[3]` and `[4]` are intended to split the range into two parts. They are part of _Range_ Named Requirements and used internally in the
+implementation of oneTBB parallel algorithms.
+
+### Proposed deduction guides
+
+This paper proposes to add explicit deduction guides for `blocked_nd_range` class:
+
+```cpp
+// [g1]
+template <typename Value, typename... Values>
+blocked_nd_range(blocked_range<Value>, blocked_range<Values>...)
+-> blocked_nd_range<Value, 1 + sizeof...(Values)>;
+```
+
+This deduction guide corresponds to the constructor `[1]` for the case of passing _N_ `blocked_range` objects itself.
+It only participates in overload resolution if all of the types in `Values` are same as `Value`.
+
+To cover the case while blocked_ranges are passed as braced-init-lists, it is proposed to add a deduction guide taking 
+a set of C-array objects.
+
+There are currently two options how to define the deduction guide (or a function) taking the braced-init-list
+of any type- C-array and `std::initializer_list`. The issue with `std::initializer_list` is that it does not allow
+tracking the size in compile-time. 
+
+```cpp
+// [g2]
+template <typename Value, unsigned int... Ns>
+blocked_nd_range(const Value (&...)[Ns])
+-> blocked_nd_range<Value, sizeof...(Ns)>;
+```
+
+This deduction guide only participates in overload resolution if
+1. the number of C-arrays provided is more than 1 (`sizeof...(Ns) > 1`),
+2. Each C-array has the size 2 or 3.
+
+The first constraint is intended to disambiguate between `[1]` and `[2]`.
+See [separate section](#ambiguity-while-passing-the-single-braced-init-list-of-size-2-or-3) for more details.
+
+The second constraint is intended to accept only the braced-init-lists that can be used to initialize the `blocked_range` object.
+Currently it supports the constructor with 2 parameters, taking _begin_ and _end_ of the interval, and the constructor with 3 parameters, taking
+additional _grainsize_ parameter.
+
+The important limitation of the deduction guide `[g2]` is that all of the elements in the braced-init-list should be of the same type. 
+It would be impossible to use this constructor for initializing the `blocked_range` objects of types that are not convertible to `size_type`
+together with the grainsize:
+
+```cpp
+std::vector<int> vector;
+
+// OK, deduced as blocked_nd_range<iterator, 1>
+blocked_nd_range range1({vector.begin(), vector.end()});
+
+// FAIL, all items in braced-init-lists should be objects of the same type
+// It is impossible to provide grainsize as iterator since iterator is not convertible to size_type
+blocked_nd_range range({vector.begin(), vector.end(), /*grainsize = */5});
+```
+
+For the constructor `[2]`, the following deduction guide is proposed:
+
+```cpp
+// [g3]
+template <typename Value, unsigned int N>
+blocked_nd_range(const Value (&)[N])
+```
+
+For service constructors `[3]` and `[4]`, the following guides are proposed:
+
+```cpp
+// [g4]
+template <typename Value, unsigned int N>
+blocked_nd_range(blocked_nd_range<Value, N>, split)
+-> blocked_nd_range<Value, N>;
+
+// [g5]
+template <typename Value, unsigned int N>
+blocked_nd_range(blocked_nd_range<Value, N>, proportional_split)
+-> blocked_nd_range<Value, N>;
+```
+
+From the specification perspective, such a deduction guides can be generated as implicit deduction guides, in the same manner as copy and move constructors.
+But the current oneTBB implementation, these deduction guides are not generated implicitly, so the explicit guides are required.
+Guides `[g4]` and `[g5]` are not proposed to be a part of the spec, only a part of oneTBB implementation.
+
+## Open Questions
+
+### Ambiguity while passing the single braced-init-list of size 2 or 3
+
+While using the CTAD with `blocked_nd_range`, there is an ambiguity between two approaches while using a single braced-init-list of size 2 or 3:
+
+```cpp
+blocked_nd_range range1({10, 20});
+blocked_nd_range range2({10, 20, 5});
+```
+
+Since the template arguments for `blocked_nd_range` are not specified, there can be two possible resolutions:
+1. Be interpreted as one-dimensional range _[10, 20)_ (with grainsize 1 or 5). In this case it should be deduced as `blocked_nd_range<int, 1>` and 
+   constructed using the constructor `[1]`.
+2. Be interpreted as two (or three) dimensional range _[0, 10)_, _[0, 20)_ (and _[0, 5)_). In this case it should be deduced as `blocked_nd_range<int, 3>` 
+   and constructed using the constructor `[2]`. 
+
+Since it is unclear which resolution should be chosen, current proposal is not to support such use-case in CTAD and require the user to either explicitly
+specialize the template arguments, or to use array or `blocked_range` type itself to initialize the object.
+
+### Passing single C-array object of size 2 or 3
+
+Another interesting issue that should be resolved, is passing the single C-array object of size 2 or 3 to the constructor:
+
+```cpp
+int array[2] = {100, 200};
+tbb::blocked_nd_range range(array);
+```
+
+Since the `blocked_range` is not constructible from C-array and the braced-init-list is not used, the user expects the range to be deduced as
+`blocked_nd_range<int, 2>` and the constructor `[2]` to be used.
+
+If we add one more explicit deduction guide to support the code above, the single braced-init-list of size 2 or 3 would also match on this guide.
+
+There are the following options how this issue can be resolved:
+* Add a new deduction guide to support the code above. The downside of this approach is that it makes the ambiguity, discussed in the
+  [previous section](#ambiguity-while-passing-the-single-braced-init-list-of-size-2-or-3) to be resolved also and always result in 2 or 3-dimensional
+  range. If the user provided the single braced-init-list to have one-dimensional range, he would face the unexpected behavior without any diagnostics.
+* Document the code above as limitation and do not support it. The downside is  that the code above is considered valid, but    
+  cannot be supported because of the implementation of CTAD and current set of constructors.
+* Support the use-case above but do not support CTAD for braced-init-lists at all. The major downside is that the user would 
+  need to always specify the exact type `tbb::blocked_range` while using the braced-init-list construction.
+
+### Using the constructor `[1]` with "mixed" arguments
+
+There is a limitation of the deduction guides proposed if the constructor `[1]` is used with both arguments of exact `tbb::blocked_range` type
+and the braced-init-lists:
+
+```cpp
+tbb::blocked_range<int> dim_range(0, 100);
+tbb::blocked_nd_range nd_range(dim_range, {0, 200}, {0, 300}, dim_range);
+```
+
+These arguments would not match nether on the `[g1]` not `[g2]` and it is unclear how to define the deduction guide that covers this case.
+Current proposal is to keep this scenario a limitation for using the CTAD and always require using the consistent set of parameters - or 
+the set of braced-init-lists or the set of `tbb::blocked_range` objects.
+
+## Exit criteria
+
+The following conditions need to be met to move the feature from experimental to fully supported:
+* Collecting feedback on user experience confirming the choices made on the open questions and limitations:
+  * Preference of multi-dimensional range while deducing from the C-array or braced-init-list of size 2 or 3.
+    See [separate section](#passing-single-c-array-object-of-size-2-or-3) for more details.
+  * Limitation for the deduction from the braced-init-list to accept only the lists of items of the same type.
+  * Limitation for the deduction guide `1` in case of mixing `blocked_range` objects and braced-init-lists.
+    See [separate section](#using-the-constructor-1-with-mixed-arguments) for more details.
+* The corresponding oneTBB specification update should be done backed by the user feedback provided.
diff --git a/external/tbb/rfcs/experimental/parallel_phase_for_task_arena/README.md b/external/tbb/rfcs/experimental/parallel_phase_for_task_arena/README.md
new file mode 100644
index 00000000..34f3cf87
--- /dev/null
+++ b/external/tbb/rfcs/experimental/parallel_phase_for_task_arena/README.md
@@ -0,0 +1,306 @@
+# Adding API for parallel phase to task_arena to warm-up/retain/release worker threads
+
+## Introduction
+
+In oneTBB, there has never been an API that allows users to block worker threads within the arena.
+This design choice was made to preserve the composability of the application.
+Before PR#1352, workers moved to the thread pool to sleep once there were no arenas with active
+demand. However, PR#1352 introduced a delayed leave behavior to the library that
+results in blocking threads for an _implementation-defined_ duration inside an arena
+if there is no active demand arcoss all arenas. This change significantly
+improved performance for various applications on high thread count systems.
+The main idea is that usually, after one parallel computation ends,
+another will start after some time. The delayed leave behavior is a heuristic to utilize this,
+covering most cases within _implementation-defined_ duration.
+
+However, the new behavior is not the perfect match for all the scenarios:
+* The heuristic of delayed leave is unsuitable for the tasks that are submitted
+  in an unpredictable pattern and/or durations.
+* If oneTBB is used in composable scenarios it is not behaving as
+  a good citizen consuming CPU resources.
+  * For example, if an application runs a series of stages where oneTBB is used for one stage
+    and OpenMP is used for a subsequent stage, there is a chance that oneTBB workers will
+    interfere with OpenMP threads. This interference might result in slight oversubscription,
+    which in turn might lead to underperformance.
+
+So there are two related problems but with different resolutions:
+* Completely disable new behavior for scenarios where the heuristic of delayed leave is unsuitable.
+* Optimize library behavior so customers can benefit from the heuristic of delayed leave but
+  make it possible to indicate that "it is the time for the TBB arena to release threads".
+
+## Proposal
+
+Let's tackle these problems one by one.
+
+### Completely disable new behavior
+
+Let’s consider both “Delayed leave” and “Fast leave” as 2 different states in state machine.<br>
+* The "Delayed leave" heuristic benefits most of the workloads. Therefore, this is the 
+  default behavior for arena. 
+* Workloads that has rather negative performance impact from the heuristic of delayed leave
+  can create an arena in “Fast leave” state.
+
+<img src="completely_disable_new_behavior.png" width=800>
+
+There will be a question that we need to answer:
+* Do we see any value if arena potentially can transition from one to another state?
+
+To answer this question, the following scenarios should be considered:
+* What if different types of workloads are mixed in one application?
+* Different types of arenas can be used for different types of workloads.
+
+### When threads should leave?
+
+oneTBB itself can only guess when the ideal time to release threads from the arena is.
+Therefore, it does its best effort to preserve and enhance performance without completely
+messing up composability guarantees (that is how delayed leave is implemented).
+
+As we already discussed, there are cases where it does not work perfectly,
+therefore customers that want to further optimize this
+aspect of oneTBB behavior should be able to do it.
+
+This problem can be considered from another angle. Essentially, if the user can indicate
+where parallel computation ends, they can also indicate where it starts.
+
+<img src="parallel_phase_introduction.png" width=800>
+
+With this approach, the user not only releases threads when necessary but also specifies a
+programmable block where worker threads should expect new work coming regularly
+to the executing arena.
+
+Let’s add a new state to the existing state machine. To represent "Parallel Phase" state.
+
+> **_NOTE:_** The "Fast leave" state is colored Grey just for simplicity of the chart.
+              Let's assume that arena was created with the "Delayed leave". 
+              The logic demonstrated below is applicable to the "Fast leave" as well.
+
+<img src="parallel_phase_state_initial.png" width=800>
+
+This state diagram leads to several questions:
+* What if there are multiple Parallel Phases?
+* If “End of Parallel Phase” leads back to “Delayed leave” how soon will threads
+  be released from arena?
+  * What if we indicated that threads should leave arena after the "Parallel Phase"?
+  * What if we just indicated the end of the "Parallel Phase"?
+
+The extended state machine aims to answer these questions.
+* The first call to the “Start of Phase” will transition into the “Parallel Phase” state.
+* The last call to the “End of Phase” will transition back to the “Delayed leave” state
+  or into the "One-time Fast leave" if it is indicated that threads should leave sooner.
+* Concurrent or nested calls to the “Start of Phase” or the “End of Phase”
+  increment/decrement a reference counter.
+
+<img src="parallel_phase_state_final.png" width=800>
+
+Let's consider the semantics that an API for explicit parallel phases can provide:
+* Start of a parallel phase:
+  * Indicates the point from which the scheduler can use a hint and keep threads in the arena
+    for longer.
+  * Serves as a warm-up hint to the scheduler:
+    * Allows reducing delays of computation start by initiating the wake-up of worker threads
+      in advance.
+* "Parallel phase" itself:
+  * Scheduler can implement different policies to retain threads in the arena.
+    * For instance, more aggressive policy might be implemented for _parallel phase_.
+      It can be beneficial in cases when the default arena leave policy is not sufficient enough.
+  * The semantics for retaining threads is a hint to the scheduler;
+    thus, no real guarantee is provided. The scheduler can ignore the hint and
+    move threads to another arena or to sleep if conditions are met.
+* End of a parallel phase:
+  * Indicates the point from which the scheduler may drop the hint and
+    no longer retain threads in the arena.
+  * Indicates that worker threads should avoid busy-waiting once there is no more work in the arena.
+    * Temporarily overrides the default arena leave policy, which will be restored when
+      new work is submitted.
+
+
+### Proposed API
+
+Summary of API changes:
+
+* Add enumeration class for the arena leave policy.
+* Add the policy as the last parameter to the arena constructor and initializer
+defaulted to "automatic".
+* Add functions to start and end the parallel phase to the `task_arena` class
+and the `this_task_arena` namespace.
+* Add RAII class to map a parallel phase to a code scope.
+
+```cpp
+class task_arena {
+    enum class leave_policy : /* unspecified type */ {
+        automatic = /* unspecifed */,
+        fast = /* unspecifed */,
+    };
+
+    task_arena(int max_concurrency = automatic, unsigned reserved_for_masters = 1,
+               priority a_priority = priority::normal,
+               leave_policy a_leave_policy = leave_policy::automatic);
+
+    task_arena(const constraints& constraints_, unsigned reserved_for_masters = 1,
+               priority a_priority = priority::normal,
+               leave_policy a_leave_policy = leave_policy::automatic);
+
+    void initialize(int max_concurrency, unsigned reserved_for_masters = 1,
+                    priority a_priority = priority::normal,
+                    leave_policy a_leave_policy = leave_policy::automatic);
+
+    void initialize(constraints a_constraints, unsigned reserved_for_masters = 1,
+                    priority a_priority = priority::normal,
+                    leave_policy a_leave_policy = leave_policy::automatic);
+
+    void start_parallel_phase();
+    void end_parallel_phase(bool with_fast_leave = false);
+
+    class scoped_parallel_phase {
+        scoped_parallel_phase(task_arena& ta, bool with_fast_leave = false);
+    };
+};
+
+namespace this_task_arena {
+    void start_parallel_phase();
+    void end_parallel_phase(bool with_fast_leave = false);
+}
+```
+The _parallel phase_ continues until each previous `start_parallel_phase` call
+to the same arena has a matching `end_parallel_phase` call.<br>
+Let's introduce RAII scoped object that will help to manage the contract.
+
+If the end of the parallel phase is not indicated by the user, it will be done automatically when
+the last public reference is removed from the arena (i.e., task_arena has been destroyed or,
+for an implicitly created arena, the thread that owns it has completed).
+This ensures correctness is preserved (threads will not be retained forever).
+
+### Examples
+
+Following code snippets show how the new API can be used.
+
+```cpp
+void task_arena_leave_policy_example() {
+    tbb::task_arena ta{tbb::task_arena::automatic, 1, priority::normal, leave_policy::fast};
+    ta.execute([]() {
+        // Parallel computation
+    });
+    // Different parallel runtime is used
+    // so it is preferred that worker threads won't be retained
+    // in the arena at this point.
+    #pragma omp parallel for
+    for (int i = 0; i < work_size; ++i) {
+        // Computation
+    }
+}
+
+void parallel_phase_example() {
+    tbb::this_task_arena::start_parallel_phase();
+    tbb::parallel_for(0, work_size, [] (int idx) {
+        // User defined body
+    });
+
+    // Some serial computation
+
+    tbb::parallel_for(0, work_size, [] (int idx) {
+        // User defined body
+    });
+    tbb::this_task_arena::end_parallel_phase(/*with_fast_leave=*/true);
+
+    // Different parallel runtime (for example, OpenMP) is used
+    // so it is preferred that worker threads won't be retained
+    // in the arena at this point.
+    #pragma omp parallel for
+    for (int i = 0; i < work_size; ++i) {
+        // Computation
+    }
+}
+
+void scoped_parallel_phase_example() {
+    tbb::task_arena ta{/*arena constraints*/};
+    {
+        // Start of the parallel phase
+        tbb::task_arena::scoped_parallel_phase phase{ta, /*with_fast_leave=*/true};
+        ta.execute([]() {
+            // Parallel computation
+        });
+
+        // Serial computation
+
+        ta.execute([]() {
+            // Parallel computation
+        });
+    } // End of the parallel phase
+
+    // Different parallel runtime (for example, OpenMP) is used
+    // so it is preferred that worker threads won't be retained
+    // in the arena at this point.
+    #pragma omp parallel for
+    for (int i = 0; i < work_size; ++i) {
+        // Computation
+    }
+}
+```
+
+## Considerations
+
+The alternative approaches were also considered.<br>
+We can express this state machine as complete graph and provide low-level interface that
+will give control over state transition.
+
+<img src="alternative_proposal.png" width=600>
+
+We considered this approach too low-level. Plus, it leaves a question: "How to manage concurrent changes of the state?".
+
+The retaining of worker threads should be implemented with care because
+it might introduce performance problems if:
+* Threads cannot migrate to another arena because they are
+  retained in the current arena.
+* Compute resources are not homogeneous, e.g., the CPU is hybrid.
+  Heavier involvement of less performant core types might result in artificial work
+  imbalance in the arena.
+
+## Technical Details
+
+To implement the proposed feature, the following changes were made:
+* Added a new entity `thread_leave_manager` to the `r1::arena` which is responsible for
+  for managing the state of workers' arena leaving behaviour.
+* Introduced two new entry points to the library.
+  * `r1::enter_parallel_phase(d1::task_arena_base*, std::uintptr_t)` - used to communicate
+    the start of parallel phase with the library.
+  * `r1::exit_parallel_phase(d1::task_arena_base*, std::uintptr_t)` - used to communicate
+    the end of parallel phase with the library.
+
+### Thread Leave Manager
+
+`thread_leave_manager` class implements the state machine described in proposal.
+Specifically, it controls when worker threads are allowed to be retained in the arena.
+`thread_leave_manager` is initialized with a state that determines the default
+behavior for workers leaving the arena.
+
+To support `start/end_parallel_phase` API, it provides functionality to override the default
+state with a "Parallel Phase" state. It also keeps track of the number of active parallel phases.
+
+The following sequence diagram illustrates the interaction between the user and
+the `thread_leave_manager` during the execution of parallel phases. It shows how the
+`thread_leave_manager` manages the state transitions when using `start/end_parallel_phase`.
+
+<img src="parallel_phase_sequence_diagram.png" width=1000>
+
+## Open Questions in Design
+
+Some open questions that remain:
+* Are the suggested APIs sufficient?
+  * In the current version of proposed API, the `scoped_parallel_phase` object can be created
+    only for already existing `task_arena`. Should it be possible for `this_task_arena` as well?
+  * What should be expected from "Parallel Phase" API for `this_task_arena` when a calling thread
+    doesn't yet have any associated arena?
+  * Should parallel phase API be limited only to RAII-only style?
+    * Are there any scenarios where inconvenience of handling `scoped_parallel_phase` object is
+      not acceptable?
+* Are there additional use cases that should be considered that we missed in our analysis?
+* Do we see any value if arena potentially can transition from one to another state?
+  * What if different types of workloads are mixed in one application?
+  * What if there concurrent calls to this API?
+
+## Conditions to become fully supported
+
+Following conditions need to be met for the feature to move from experimental to fully supported:
+* Open questions regarding API should be resolved.
+* The feature should demonstrate performance improvements in scenarios mentioned.
+* oneTBB specification needs to be updated to reflect the new feature.
diff --git a/external/tbb/rfcs/experimental/parallel_phase_for_task_arena/alternative_proposal.png b/external/tbb/rfcs/experimental/parallel_phase_for_task_arena/alternative_proposal.png
new file mode 100644
index 0000000000000000000000000000000000000000..654fa39fbfae2bec1ecd3c7cbe9938754e614461
GIT binary patch
literal 111506
zcmeEucUaTs_jW8*TgB13K$g}bE~c_)YZVn44n#!u2HB9X0$9I-B1;euWLQBF8IdJI
z7%qqb0ogM|340_m1B4{+c|zNt{r=v6-}kS2UA>CPhi9B~?)yIDliLP*+M71)-hjbi
zHl058+j$IT{V5D)UGaD8;5+zBXHwvQYrM{D|BA_P6dr@Wd~5%U?k^ZjLG;EI%eC<L
z@7+%sdtop?dZYi=^xKK~Vldptr+@q9qOaK`<@-QW9DaoD(e;h#cOS1~QooTjebTzu
z#ZslI_<}&fi`MfGkF>_OSSBUJbnR_CqwwRY?|v?zeOs9HZOYnTFI|%;5Yg$6_cb4U
z_n_iE>yXLJlZJ%g=%^US1ZOc*%D$!X6ei0LZ${8K9%y5H2hT7X3FaP$J)u9_|8sr&
z>Q@K&`3|mrWgxH)4v79dl;O`@{YuMH;M5x4mmzOtV!m1Z=1t2z=xp$3!&@zMH}GeB
z=)b=ZuHpaV9iH!-Yvqb4YH&tke?A@SdBs^<hf&R06Y>+XQ>IMJ8Tj^6BiN_L3e0uN
za!)+`*i0&zDZB>08}ml%(COHphg8A*+wZ`4_uRaG5gw_-ffpRu3E$P)z?Th=++%<<
z7#xA`hHPJV9v(SJ6+E@(;br6^2l+GMk@HnYW4_TUK%R15;FS33*vvrtJ!?a(WdGgB
zzc=!)kNg`o|KiBM$oenW{QqI!`Nu@(s;!zyc+0lD3h6XsAMWV@hsF~gq|9mt$0vBY
zaDu;`o-X@{$*yLeU`)&n;pQr;+m|cnUK{TV2%^UAqzL%rm~je(G#SZhTsBcZsC<wh
zc7`H9R5bl*a-&s;7d5z>l{7c_W`am<YPz>l(*BWhA&yY6(QHBa(zCGPtHQXmjh&tM
zGp{#%Ek5R2VrAX0u&0`z=Sg8pawDxNT=U>!oM=R?>77S*-MIBW_nrDmloS}*(%l0-
znvv%;+4Zs2^vB{EUt;ICJ<78VW(0U!X-8q-m5X>;*9|mht+1Tr!lg_#WjDW2@ZmNt
za|(J3+<ZP5PrrTXwyaEHy#2)QMjp}5j=peyCg3#dGG+N)mQ`Ks18e72FOSK~MvMSY
zPcln+wya>fQi7{bcHVrF*(A`<mdBbfJG)Z4k^&>=r<t7dQ>kJ88dT>*Jb}rUy?^G=
zKP1%H!s*~$`qE{}9gO>8soFgO)v7j!1-BZxrS8zoWp}=G4AD**bV+@m@MK8Vf5kk0
z#fKEI(w$>Pql>de^RNtau`QjZDo?5AZfRdSrzgk7YOc#^H*XWnWqy9&ye+sYuj^{S
zn`px(7IFOgs0y~2SuJHQ_o*q6!}6$qr++U{$QaAYtez6|?3@pbEScwQE{qTCCv>Z*
z*6OlKe-U~qzA5!<`Ih}MGIgdqjX1U(5atjp>ELUlrJc>$oJk(NL|wdC9oC$fOk5`6
zt4vB_MYD;=7K*P4#6;5)o{ad@vBFPZ=V|hdz3h=D(G%t=Vp-Svse|~6sqE^2?q2ev
z!7l0)>yqt4z*Np!XR%0=^u-6U)e@&`K78#3;k`GCq;BQs@2jM4TGv^{XEKnMozCFk
zZ8R%VukF$8r;kpH;kyZfic|G`a&nsoPbCXWKj1Gn72H%V5xe52XDVl>)gK+VDU*D+
zMw)$DT$_gV7NxVL3*-7^16UWx&i+-4Oe06K2T6hzD13^w+4Z(qTcF1)MpweIV{%`q
z)W-wZL+e|9tN(1uCl{M`E#^%Bu#R?V&obi#>260q_oo1|Y`$^y9kP;27jAz?UWMW;
zlV-!`=xIMP9c}1|V-%*zzT|3;KRInyU)1Jnb~?**kM1Oc6Q~$_=FESs^9<IJyWGG0
zPC|#nSvFDT8%v3&t@HNQ`MEls_+-V4*;{Xysj`DM>QOHwf#WWvuE<}l&z9zMl#9xz
zaIV>Di=}^P6EC$<`6hk*`mwtanN<8tt9Wp5Y<S$)Vtz-d=lYgG-=2nm@qlFN7X!7T
zaZZ}Tl-bT+X8t78B5_`}7%y_FUPK!=Y0^Gh#T>!2yFCixx7-<u${>>_yW2IxQSc(<
zXkxAm%B#h3S-01A*3>n$@}e)8q6pv+(@hnT5IPlS?H1?ZJ>QXp7uAlFb+1nwQWwh_
zeyduiAy-y8Yw^U|sthjc2z|Jp%3TQ!Gyfw0qL?|GAG~k6LVk;#$~B$c{$D2%=RH)r
zwfvvDn5$Kn?N7Vvi&vAG&7n{aFJqassW^^8nwh7UumhzPA72%DL6i7)rifCl@j&$m
zOD;z5itq9C+RsCgaRXr`+$%G;T3GfGx8!^6n103n4_VcWiFDd+|DX%H>HYnGycqU<
zZohS^xA%b(x2Fr|?wr1^#^$#QdnX0bi!|`R+QvaI8JBl@{hfm)r`?hkZzq~+3SN%8
z>p77&gy$&f=2S}-z2<-)%&<7!on56gZFO^NJd35YwEID!jW;vBiB8X%V>?f>^n)AE
z5zk-$Ix%`Yu+Vb-nBbNPq4e>x-sdfQrOR4n%e)F`r%V{_`mVpc-Io-3-jQ#t^^TjK
zh<03OhFY`Ca!W$45H(Bn++n;}+z+!3Vkaqs4n4hT%f#4DC1dja`+*;pXR0c`%>QzD
z47Qa#NK5I%2i9+s7CUKvWu{7!P9r&zs@m1L`0R;$y*le#Z07RZQnqhtD$5+G4vx#n
zPB)#`@`ezqTqa9iWjX8@J9_%~(XUg&L#|}4a{FNGrgLdbT}^u}x|9yR@EYT7$ZSjJ
zy1YyXMF|%5M>3alQ8OxLs{Z-?K3U({Mb0KSvgr--%LFXRVkc=wlW}utMwmonb^bv0
z@nzMR{lPogW&3cA;bIG8jh`Vx55^I~Z1zwng&I4(gCi-L?7qU_YWx^S@NGsO&4R&L
zc^9i$B)d(+Y-V@tO#0Vu@Az<H!WrLxbbcd+iyz`U-}9aSPvqu;=r+?H0^<%@Bn&So
zQ?I<RaC3ghfzrbt9cub~_;Xvdv1g*o;|y%@x)!iB%PZ{K`56x<<>DgNAqlRM?iFuq
zyWoTy&67JcCtE2snz>8CQQh$ylK;7|&dF>^b;26InRAEyM9Aj^1NFz7w37Q?FTaZT
zydzQ@FZg@9ncR~}rmP>nW1p!+aC)K2%z`hObfj!nc1r%V*nJPP6Sxxzsxg=3qD0+>
zX9}`$ccm_~93pmejl_fT@(F<z3JkLZl}Anf9Qxk*pwo3yUt6ZdVs5d>=yB9}W8p0i
zF4DD<BQlKpDpm3q>OG2cikQzH&yV<=YNZdK?WYDj36h;v<%=Uaw)UsDo7fv3`;c%n
zW<PGUUt^4+W0sW?OABv}%4`^*cfF<;*b~mO`_fB?U(=cOT8DPX{&P`pT*I#Oq!%NK
zoi?60Kr_dg@`uJEQxEPbROI!_mgZhRRCe@>L2rM*xoJ;RzOsyUe}00GMCG005g$Wh
zaP;FK7xVE6v{^FgV9pOpQ?B)cQxvt&*5bh~C0HCYUB4%NB)p;Ixa(s4J>9Qs5t*;Y
z-C0%r47JDN$Eg;;S<X?H{B!9#y;W}Qr=x%D$64qY^BKCZndcc5c#GOw;ZbGk#&|!L
z=F>4QB?m8fDlU4Y$&4sZtR`G?OHCqPKQ?C3n?|RyZ)<Xay^We5N;;0(eO<WNo!ep-
z=B?8@b2f@QIia=OT4rR+QI}EnRB-VXQm<n08TQP_-o@=%Pe>OL3Y^hwI(^4=lIcuZ
zu-(J%o<FSVzjU)fU-^ZStlf8;Gaulj)yGD3X0DX1JD+|3YxIj<mow-il4H9kb*ZoG
zgLY}=a&4BJ$SM7y>GIR$`w0qGQpSpZP;s1vsZ(8bni6I`ABL<iFd{_4`Nl$1H*U&|
zJ@a3?erCHzmtOZ_-~jc!t#Zu5kdMj4r6{48KbSYCoHUjuV)kd41Z(#cU-zabuU|iC
zJ>T|*k;&=aeM)@j;6H6`D9Jb0*RCo0{G4prQJ+@&;{rc@Jo%DKQuhdRI{T(#X8+LQ
zDN5(M6_zh8|Ad4H1v_ctvL`PV%0hbg{t+zC553V!w$<r~j4tjZuh8St4=p(t9dUtu
zhEFlz)*BS~vNN~YetrAnI<zNv<^57GrN%E&b~WXeYwpa$t0_zwUz(93Z)@-Hd&pGP
zcU;%9D^YlDio#iq^Ek&9n}wTvS3JW;$)Qt&O|0RdsN3sWg59o8RoA>*qL^DB1|q`7
z67TA?cNA2!a6vP)m`$1IWxqyg@%Tf6zwJ^`+ufUdDaBj3KKA-t&0|WLu`Yk+kRrrZ
z!NbpY>4buj^;5KKd*Z_%e0|C>-%^d~Y+vkrbjH%h1v+E%jicdJG4KoIMf&>K=LA-w
zj|U5!Vs+%{2g;=Z@J^~0Pu&Z=23zp>#}>rZD+h-!a0avC(GuaFZZ=UqW*FQ9C`Q=T
zjb1gA&APw))Z>AFn7zhz@?H~XQhtAq#jT?;RWFN~8OZ{t^!rTV+`Y`a-NhNt^lKrU
z6~8typu18z<5LHn@ol?D;v=-4kMJa0#7L9RaV*xOcuZ?vIR1Z~b4L;67#|rP-qh=o
z$RoN-d_+epe?_)Xyl8gAoBP?6ElQbDi|JRN-&jzZF7_6`9x{X>Y1ZyDIiTd31dZw5
zqcLY{{*fVscS9<`3LG5y;|2a4Rq3E;z(Tmd(E@J9IqSOKW9UTJy_uZ(X?M!w>A3D)
zX)U7n{miPlQsh~!a?6o7^d@G0e@<#2ko;v3@e6>B*x*Qf#o+w%`5t)wzgO$bys7wG
zXF*0Kb*)}5XqL9TMN2#DN7suhcH<;f#=6?QMur#vP{$7W?3t>c-v(L0BiEtIq{?V0
zf=bl=L)03|Mg9EtO0tbGz|NPKW7E|K{8BkKdn5_P*N>G=xIc|H^%Dm4IbHvU2*pTg
zNu-CYw4AYlUL_fS{bI}Qf5=6vd5EV+ITNQCxR7lD?h9)vRIx%K?Ktp0Ls016sWy{m
z`mTPKeV$dWwmB2A9DXV;c=P@sxsgX7xSJJX&ZwOG8Z<BFjw|Y^jD^Hru5eum;lH)6
zWhNQiX#76=Rm2ZTTe@!;i>`06jnqHc^FxPDhyMFPFZN@>Q{t%y{^2E;$OUPRv8tce
zS$Q9gN$7+WAS=rE_z+(C930F<b@QCr=Xav`;ledbtWK>%W50ckZs$GDgx)Pacfh0f
zLa@<Hr%^K8aBQ@Z3F&n|)yI+iN#1`&TZgm!he1DZv2{n%jD|S<{@fN|^99ZSSnP@S
ze)Nw7MhPV_ZRZ?t^~-CNmyeRQt^}DZw588A9g)2k-QCcu<!{97yxhYo4&W}Y5jqIy
z_)jF-k+t65G-f$DA*Zx4{2Z-FYzrfQ>DNik3L;BV;8eY1W1UAf!M@Cu)VDWamm}<H
zy?x|a_KHc7&q7FG1wC!~rUQ}*k|~qUA0V3K|8Y-xv?t;ON57ft-lQtSB<e58{6%?F
z4V7-6-|=TkGaywIa!HlYv{OWxbl9M2rXMKj&PZL>3d&rE_u0yQ5OwP9#m~o4UH*5_
zWmO3m^!EG7v=V!f9v&BoAqk$+N$hJ6D73z?EvzS*mX>XP>%qEDK9cJTe-cGM`_#Ns
z<J^UW2tB-c)c=k*L-Wvk+T&7ri>~h=Tf2C~SaYvWSHNBr`O(_u8m?qYb*cJ1PMmNq
zZwQcjT&<@g;O4e~xup6-92T=fLPPLQXCz~G%buV4{|mt$Tb1Cc<4Osh{39sG>yY3)
z86+@twvCtzt-r$bHXj>w8+pv1DdEbhGK5roIemolmN@Xbd)GxZ_br#er%I<xla>p5
zaPB&ROtOCb$~@lj&5GMXU~WBkHyq@|KY^qD_fYL+ZzFp=E%T-AfW#Ry+Hc|nk8%%Y
zti~q4#|Q)|^5&z;$tBXUOie#AM#@Swr5bAy3aJ8rbbwRU<>|Xsu;>WE@1;J@N6Ibb
z>cW<vB68TJ4t*t0b5)DX-~TV%ycFGrmn<)jnhRR5R5qyB5;k(xvxWFWT!wdCry!+c
zE)a5Q8l2E=*vp!ziN$N`$uD{N26^c+NnZvKsuBE_KIPt(b!?72S2|wRRUF{xExOeG
zRN04oKb$K(s}#eTJT(ZBEt=SOIyq1`ZIUrCcz`nKbFx%Hy^~=%r^J_ivF{&|;X6Nc
zpR%h5X=nn=5v70W%)TcF3;dc23r{u!w$dzm`{~@AIf87=6C*O^2HE*u)f{cHWtCRV
zI@kqy+@-DlKdo!o)|qIHHFscgHmMUNmfu9z%mC%-qFjgT%Y-@u)LYCYmj5r7FjB_d
zwX-FcPpez^^xrTk=W_Wo*^*_}xcao^!rId7R(sSvhWbt<$BR!$V1wC##}<UUyx)k0
zK)dR{$>76C6*a5#^oL)k3K{H`fXM5`GqKm5=R1tqRdL4-uWN}@^jb2dxLLagZMB5D
zk|y^u^q%7X3Cz9Wx+Q!ng(6PQQDGBOQyh(12Eo#4PecA%XHn7OyTt8$j{Z$<$tn-U
zG6tO|AESSZzj){$A&qSvcdHM4<;YMI@G{~aa79UBWhGQPQf(?^V-k8%IV9PoNS{o}
zT-Q<+-}g)Ed}<~t8F8+;`VF|5EiAm4GWB@VwEn;CbsCCIKTKdh)DQYdP6$cVq{eXz
zSmoTH&e4s|eI<+kaU*H<aMyVq&|UY%M|Bt*+@HdFM7+Ve@WZ;6Oysvdy(4xr)5iTu
z%Jk$JeM+Y!+rHXz<X4bUiT{vMD*Z1V&7+2dB(!INeyAeL3JLqIjc5Gt>r1U*A-bCG
zRnRw@eEf3iT2IjtD8B_8-|6HWi~B4mXsKh$^}Vn&x^aqGg#bd0Gig}x{Bv_xcb~!Z
zXlh_!+-Lvk^7Pt>AzUrKwJF<oJKi#qxHEo5K!h<?qqyb$efBBJ;{uP)*jTq&U&ZLA
zpi^f<CkMm6OWxw5`8l;sI=)XbIWST@gWgnCtH&A93~o4H;K*!=WwZ|X(5&YcqZ3wq
z{;Oq~ebG8AP+`Ahg)Edd&2h}?r`=7|ZCe`34g|@u-kc@L*_zAU*HD`HJuSMuRflwM
z#dp81slT(@F_yhpYbM0{cE!j19?x=#{#CWEx5~E#MVj`p<cArKr{n*pXZht_&cBV%
ze_O%-Hpl-R7x;I8;_H<B-;t94C$lY^Dy6v1_5-0mav4Kdc1Ez_4A(UF9^q?scY3!<
zD!z#uX<qGpZDr<G812E9;M~FB3wpuo%PmT?Z&(A|NVZkqmoD>rD{eoZKCbz-h>3kx
zeV56xUZKZR?^xPv3UWW!>(9?MKah@OsC94|pA)&Gtscu|(cBe(#?tcrmn*M9a=VG2
zKK{?)pl79^K#TH4w`EmY2&nfvhiQr?vKOHhVQQ{2k^I0MOBqa#-%N<j9IyW?J;qqP
z@AiAB-pD4;PS<(uuXK17=s2QL{F6$w=mgskujsLq?>ny?r(<?>Oue%)%6L;i#>C~N
zP8hHI)CPGm1|wrrTr6^XqnOE#>c#eh;$iiP*yS(e=B~EgLzDMiQcb5D>$6DDi*(Fq
zZ{io$>sZfLy(rAzg2BAX1`!04Y~$h?LyGBFgsMF)b@^3UgSg15VrfcsMK19aA*E|8
zVdV^!T07Actm2wlB^%{!d>W?RLcf8_!(a@jh(~wRjHFXLvQ$;{+bU{@HAKQps^_(u
zJ{gbic4Rk~PFOAU;G-z8&QniFx-pn%E%@0NwM0V7xn>#viowhMjTxquMj8b+5qQJ8
ziR35qkJl%V=r=?>J{Z8<oIyNT7=yVOf4d%6!^$VzX{}Q`Q+kn6hQ*%Er3z}-D{-)w
zj$c^mbZd;V6wmMM6eezjrz%&Ux@mKN<^BC7k1OkN5mmIpF%N2mr0u2*X&+kK{Irhw
z6xD-B(uty^Qb{yC97;f#w?n<`K_5*`EbGzP(B{&s7lo*)1+r1X4R$eoU?$E2U3@y6
za1pCGQMM)T7G-^}2yex;ycJV^6k@)p)#N^}8km+nsNAyfAg-hK^+HCaQBy}-e83?M
ztfHVBsj)ky+ZVQ}#pO*73S1<cCXH|gmwbo7%$siyd4u^pK3nHlHT@B_rdqWqujp`w
zH7?y_QVNWA&;}XJ!T{O)@c!J}=4x(d$e*A0#acU;9xJV}U__8p31ZdO=W1|OW?x3@
zei6jN(R@*b8iU~*UrbG0wKH*s=FM&D5^sJ!@$uo74C#1bBFn@)y_>BO&%rM|9_*s9
zhFu~vOizN*LSCc!IE=-sK-@{|mGQ@|hj#xE%`E8MRr^L)($MFaiyS9tHoIg8bq9-c
zZuU`7eGrKbj>*63BuN3j(+j@L_@i=yC*!7{+qI`X9e!}6NDa%>>b={agFJXE@Aho$
z24+mBt0pD}iut2j@J%H}w7cS}p>5MeWER&sQJ1jTMG4#Kg5%u-293^P3<@9~X#1>(
z?dATq@Nw*(vr&{vPpjiKBs!;Ca@KmOgOBHe@9#q?5)%@XL-pUIaTM!Oqg}sW9H-ZR
zxkw{waIlfwuDW@l!qrJUSRrdmy6`TI7j*?hxHUmum>Iknlvk|w=FWgybf$B?uWDH8
z3SZOg378K&Z5BPRiFdgI>*+nEj&+&BBK$ntjuxe^?+Ktg1P&?3Z^<ArqWZj^?u!~)
z5$H~MvCpICKl0Phy!I!q6pcEQ3y98G(G5qzOj=wh4q-5-;`sxqDa9`aI@{Iy6X}F#
z$p)8m#fhC~Ya2AHeSS%~^qP`MejeDp*v>oLs07c%5^WvbI~4Uy#r`rg@#LRoHuxOc
zoLD!|MZsOwP~U&V3tgjD8Sm!r9m6&bFShF(7MhMq?2|9Eu=euaffvMIAI$H&BWf-}
z$o=ATHO?BRIOQz4GRlv^d^F;PirLR)#A%9A<9izcJojnYxgsb1m*nYp<E5gbOJ2|B
zx+rdHB?_Bgh)q=<f_s$UdC@~s>tQU37t3-=XP5}nv=b)XSDXdu>D46z*0|t_iKD!r
zg854X0q(OxCIkOt;%Rny!@BaIGf@-~&d1puVnh~l#3z-!OE`e$HZcYU<mUWzL86k`
zxz7TLa|w5xXtl}n9`Ao3B;BWW2?zVP7VQurvX*DlqukWmx29?n{R!}x*6MmPD25a1
z=4oV^<Ougf{mZlx>GkiKBiEw1zUOrLb3W1gAvy*ZZE*A8fh!TnrylOXiaJE|Fxb8S
zUhMHJ%BdQGp8UZMCnlBKejugLR2~+pV42(q(*d4$xT5O|NzqyN!c7m5_x@{{<T<YB
zWl@vlUVfJwN0hP5=&ISXCkQ(x(2rw~Wwl&Oe6Tfn2ydlwCvSDo@RJKSA$nsh=eDz4
znWW+tYaG>UYVv;jbH$W$fS2ue(a!dS(I1q`2hF!Q%1%zU@EI#t2DkNHeqNwlek8+i
zpR$y4SzIYRsmXe4Ti};YyuJprI+cnUeE*;2)M@%*dmFh34gmQhyLQpH4m$uZ@lA>&
z7Xv5hn=W*cekhHDOIXVrcYc3;@MRm*)O^?5GyE1q3%y27;b7TY8S9Gn(w-!5nii9O
z=EHM3F<xwhK3|HIoW3hNd$|0@7hlH9YyN@Nu0@vKx4^XQzL(3sCvKAHL1Wj43Ro7}
z!d@dX7);Cs-o5R0m~Xr>om6m##siA_6D1zj4a-VxLB-5*e%qqm$ph-0mx3ngd98{n
z*j*URdvSDuueKI?xH$)oafWtK#qZyXut<zH-xkm(d0z)&uX+xsQ*!}76<x)Su*ShH
z^zi_Oe+_v$8<5~o(C3P}b%e~;F#V{{0Q~A<{26|Uf&D8}6rDq&ZB0w$S)K!W^2WUl
zYLZP<X+rvWk&335FL=H@R2t0rT-eppw-cLhl~nGj4@j|JTQ)kis2d^7s~AYEfgyhd
zw)U8as9kI)=-#mutY{o1xta?!xu|Y^k~eThBg-|VTmzzTL{ULIF<t}+3)Ovrg@>#B
zOn`+O?08XFV38qvC%CjATV5lG^b-$>Z}OP_>5tpSakUJ*HFp2o(SZC^5&4`2fs@LA
zfHzZ@mp=$x8ko%@h?D63syH2C<?&gFa{(3J3Rzvbp_K@k5AA*y#r)f_W)iU)rvPfP
zE#-@k2^yv|v)Kgpn66hw&_vJ;HNf?sd4|@zYiqJV(ysjw-P)Kx`Ls22P_K&7>7o$P
zB5f=}40xS!*qZqo%iE|Ss#;=X-Yd{uBAX&ig|lqk@43oFAcWpr0x+U7M}0R$9O#sK
zVAd?##JlllXxIp25i_awQPjLV*slgRCY~zm>2y`rQumn1xO=H+5;#<)=Rope&FqtV
zD}58r!Pxqhr&L}fK3wK)aouGvXZx#*UC$P8Zdjl7x0L~LEpb+R^1A(=0x-ojb;4Eg
zxzOD~d_4=}EgSOl+fl`|D?)DN&z}tXUUcQIKpbJ2mTwQ-7{4ptdlVx1kDA`flYq4b
zJ9u{~s1tRd(&wag1)CR=b<wT5^nn1^-ZgIzWS!ONz55b~t71HbEUu}|y5c!WPc{vE
zlO>12xF6!Nf}A(CA`gY-MekC|bibyP>j&e~CTFGd^0C%9?n=U1K*WH*I6+U4haBtn
zw=p9A49s7LupK^LykI_Hc=!%rhR4!e8bOG6{Wo~mZ*U!vYH<JJwUmU{=gLuJsukL3
zcij=#0BcD52gdUPWG@NX>f@IB7n9M|RW6p`R3=i-BEhm)36bOH*&Te-oCi>qlf1`S
zp`#e1`Z~D?JE*n<7y|ZPw?;01;B9SX9*X3{yKh9{YTswC1~R=wKyaC!UiuF@;8)@u
zMhp!7!-&RQV8y`Uc&co2pCoQ+QNG#xX$EsVW(zE{Pt@!OAgqZ&>r&|mT~^PV`Y!-c
ze6P`N-G6MzOZE6n%Nf|!_~5+f`-53F0zf0-T~>>GM}`#@NGxq-gcwitctG=Gj|$Ph
zHi;L+6$g1ie3{64Zh7z5B~D7i^za>L>&t5i?GHdZ&DE*%+)<8qF5lZG_Qz^_rBg38
zKlQ4JrWPF7>FV@->*f>j?FB?&rk@q2oac{&8)?<>oT3tebU(g5Lg3Qtf`=eVccm7&
zntL02J=6vl5W};Ql=6NTQ}bmn=`;JfDSmC8JK*Yr(Iy{$;aL|?lnRX(u&JBMofv+%
ztsW<M^7FS<ieA<$q&rTaJ8^a46yE-pc?`L|0|oS5lVKxo?cV8rkM22N8*<e1POWm#
zD>U=qxvPLsK?`B^R;^|{&luvN;mx9J^_<0t-ko+Jw}u`iFVZ6-={7fl00h)0dXy0v
zr)G7Y7-@z!BiwmP3W|{f5s?8Vv?9&RJF{%R?9Q-{NZH*9q!-o`y<jFXN_gPZVFYA?
z@aU+}LirsbP(D1k@^l-y9`*85f#G!chUnR|D)`00msW3*9aP$y1AO*u1WTt28KuMj
zh?}wRWJi$Vl(0Zf<(X4fa#Sk)`F_A`$cOHE3Ly*k^x64dUvn&As^7Os(H<=+*}9vj
zGw$&uwPzOSY}fnc8vWjuy5#B1KF$&xe=7g2<*u8r<G{i?=6RE0LY&@tA6e%q4Z;rq
zj}^Dj0pG{}ZER;jQ3efnB>bk3$(!PDvQC2Ws6oLVH6-icY0h$2J6;kO%m?p0Ay1Ck
zxJ9yOC!@;qB)=+gPV2lLLrh-L=@R|6l=X&-H?t|`(Tt_xl<;UurE}x3(ts=2`hXgG
zP$pCNDOHeBS%obA+p5L)-NF5b{p~Y-Pwxd?d7**Crr`3yPB(Lu-E?+MP6)$`NNCCs
z!+*MH_d;zL=>uUjs*qNRk|OR(-nwl9-zX@Q)Jo7VUz{!=j;z?6U=$E5cY%YhzQ4qO
z5JkCu^eQ6LA<l1u-AL!^5AZ941*+NeNjoU&9Hg}Jl_4BJeyrsMLg;^x@$WFD35)p!
znMY6RMLJ95MIN8h4j^piKLL-DJ7=WvK4-{;`KknA;)9hhH#<evfd=8dN@eKsrwb(U
zXYeGsk9p3Rfi|Q4y4w5kF3R2LTyG>Owuc}yJUs)kJsp|VQ7fHd)SYTc`qS(?Nk_zD
zO!U=Cb4KKEh8enlivz2?EHmNlQW*vW0L;&L+6*H(^FS*1pt9M$UND+tE(PBuVrj6I
z%#6uNb9f5Lhi0W?K7zhIStw|=+67eYz5WNr*|R1iBuI!XdqS+P6wMk0t}NUHnfXAt
z9{)Nc$0~SYHQDjw`KVsm_w%YWkj_s>FMpsRP4?8Zgk);26`c#}hx}*?1#3tO?-sH?
zv>sk~7eFA~u@ql-+f#L-TzPslR>ZOzWA^Ov)Tyh=9=bpnb#y&$k;$+sf-lckJX@Fh
z2_@6sS`U*P1%)3!=o7@^D8oulf@{zJ42e-q-o{ls@wCS}UC)vBERs|sDEaym@*Wo&
z{NElhc%i-1E!v!QWyYWMxVn1ou{rVDl?d|}t;{_j4Sq+L@G7MDWvP6XFLy>s@<ykC
zy7gci3er_Ah8Y6?t6a>=0UE^3Hy-DmY41DU-tMQaR~h)7bg4!<Me*_Aa|1ncLBg)T
z%)920QMFHSpha6BxIeo`--vgr(C>I*Q#RbuxLA9^`6#5594cSEwX>Iruvgel87*K8
z`JgH1R$f%E<=wMfE2KlEjSdk!3|Bi)im<qYt|5#)XCYHu>|+PMU{0-iKH}g(1ts=S
z1(9sX**=g!e_1y4W+voYK}Y(!etfa^)5Xgl*=z~mO@iOEy_<{uDs8~?6nH@V6UeI?
zA|d%)bHP0li$V3<&x__#(=~>l=;e|?7fy$lISVMu_L`*MMRgDGJw4PP$9$AVamlJO
zO(e_s13?coi>tn=Us%(=AFl4*@xud#BWI<S*f|8e-Q<r5k+tG^zG0hG`iHWHnqAP}
zRNZG<svLFY<n=>|5KetVL08slZl776&8n5xSNM(e0}k~1t85<PE!!X&JyviBZj$PG
zPPgwOQdt2m8Ws*q{U2(5XKUich^n?VuA0Jttyw&*Q_4nmL-9PCpH2HyXGL0W7id8V
zP%z#C8kuV_7PojQv$*)%(Y4We;pR$EqmWprADjCeXT5m*@FQLfuL-R}zTVh2&-064
zczZI-1njPwZtL-Fy(urA{z1C5DKaNIuffIRgXDQFy~t-20{|$f|LA?V+&YMoBY|&u
zm#=MNZ`7xfA=@7`RxFV4dLkldCF*7Yw$oBu`<t6F0N>KIaaz22_9SaWlWj2u+HtB9
zpd&^d-Tqc)BPF(5W|?!&%ldQePJKGxO+*w*z-b;=)>8F(4#kH`c9^vae*_t=B)Wab
zAHDpZCQf*3M0C>kF0<YKaHNZ3&KYkNuQp#O;bQToAFg%rvbWW$!v=>-Z~J{2^F9D&
z0GGxnf<w=RBm#A^iNr*dPwiru_j^fF?Eqke(3uXz*qSg&JggoitztC<u)FoPSLF6w
zr#jH0vaP!_W}mv1gSbRvX_)P=kevE&iz3~OaRezNr;5eVL-9dM;C6>lc!UV|`aR4T
zaj0!Ysd&WQ3$*a>o&U7X0VB_gbZTGO0W&{6Tg~S)@$1uhm6tg*QjPI^ia6Hynqh_O
zyTMrf+{D(gw-Tf;VVB-@48KqsPVx;o+m_q2t=eloH=I5hTwhb-F*2#kGqfBEu|3+c
zmUDk4NHgR)PgdVcK%7^Y(|{PRGv$jzvqef+@MIMn;Mp<{Gn8Z0$U*gUo2D0ZvTC05
zo7v9+)kchzinx34d$p&lxKxre+*ku5M0KV)zF^`Z52_>4ZbM%NjJV#Wz67eR|KxL$
z3aa@?Pul?5C*;DX+mKJBCgOrMrKj0tDE*0=-~{|J>tMt%1SCjAj{It?JQ%%#xm*sl
zpQ8NKZ6!Giza`pk|8(z+-nTEE29gm<wLTcGZE0ZP&DUc>enikH^X|jd*6qQbw4xmp
zOYaIQXF1o`o4i^7A>YL$dDSg7K(?z6j6ud0_$k4KA|_VpVhNG#%u`n{iLPGWes6>y
zKC|_iq~F+BO8S91w+8c&mw7zv`yW#`2`J0EJ~I{zQ>{=Cd1cVt(jjQ1-n^BdVed(1
zOyQ^Ym41kR{J<n-H;~q6bo&p_Od%1yGPuM;ZQamjR7!kuT%^)yy~R^70h>xS-AY(I
z!wt3=MnOBc?{LQB`BUgh9{Qrg8Q7u>7vcBB$&1)5gYz@LE#3+<s^wWfYH!HZQ)a5m
zBC9n!5|KbdksAIU1(4w*&{@0)r>(u9qmg9l3NlV?0xPzectDE-%w#sx+CDw*byyRN
zYmee_#zO<%l51U4n+4pey|3_$s2N0h;~Rw1CapDXZWJ-D^V}+1EXpG{TYW*>eFH@m
z=e$xIf7I&oI>J#D;2Exzs^@pU+1|uATY3qij$o=F8C33_g}miG4-HbjK|l_CTW=$P
zWbO3ejA@kiw+CJxiKb9KdUtK<1Kcp-8SS^DoyTf;5xO~@CXU;nUTza+xjkf;@$&+4
z4Vh;%KodcQdlyPkQW3I(H1w-ImtO$2&Aqq@Wod%!GDxO@fTIeb+qSMzN+M1ukW8fV
z^G1t*hm8CP!uc3g-a=YXl&S&XGKMTma9>ufuKWbeUE7G!zUI>)BxOwjz9*0d;D|0y
z^zJ%oeIbW;oV5rP_(T4pT1UZ(S_jV$pLcBQ_^tJisQw&2EkBesRtu$(0ZkV61sQ<z
z{=rKE1)W@{BI+e_Z+AxCzdA!6@;sAvOLY269q8ztq>9D^7{Qk=9kozsO<h@`D|xn2
zbzvnmjEs4&1yCF~GUhY=WTW#Ljijqz85m>STUM>knbK}DgsabDT$x0U5&ARQ=f%;4
zF`<E}M7=*tAB@WacN9tlPOcGfHwOF$3PZ)5kkz!4J@@g^)U*(<^vHfS>UWOl6isx;
z2zY0JEPWvTEPJ$z!d-6YmbGr^SLzvZlLL{5hT<`G$NmiE@U&AJ{l=Y*w<Qu8;Zmg$
z-?(pp;O9^SCTNBu7Z-N-aOZB=Hg|!!SHRudkq3U%{?pvimf~q!rAl#E71TxVSGUV-
z&@xP_#Ja6;fVhh{1bue^(*9n3!kwrLo-6W1#h#kNJQl6hdKXWPvHrIEcWa*7WjHIo
zgAPmiAk`Kx3536#ydT-#zz41B{tdD{kOLGX{ZWcMm09BP@-5{UhJO<X=-}X{Sl=O|
zL#%)=8=38-D7MSzkKe*+Z=%zhS&=vk0!yQH;ZeKP`VmBf?cepkO@%-Y`Qx$OP#P+g
zmtl{43s2wp6*4w|WWmw)z8=9&weGD1A=$FQIO34Pz~}ga66G@MTFIjreitZH$v%4m
z&do*1kaYtuMRY%dkmW$d;AtvDtx~Gr_jOyW{%``4(x-EK@m+99bcpVtnZ_DH5n?YL
z8D5W<2;IbXPBtJ=j}M%A(FaAVH<ydEYvL*~gJz)47+2Mc9(9fdAqpYo@+idOBX6n9
z@8^jFiuox&yglS=#q<>uP?vTxn);r20COTX<<*xw@`N1Np?ebx>D*TjQS=!cxR6E_
z;iXQgrpu>$JXKJ90~I$9C7i=-xYpYLV)23MF65luTQtN}w<sZ(yN)FC!>z;e3W$x7
z@na;B@g-M{kCFcJ4jLEGW;2?@xxkjUq*H!O)n<#ps;|(hG0ycb=+XL=lBbV4PpS5!
z?CD&I(3|f=Fb1f?)0ysY%beq63*OfRBof;o$!T1RvCu-5srQc~19}I*u+ZR0LsczB
zKT~1)=r}OCyBstOK0w^giW&2I4svLldyKG?Zqaw6^CKW|&(GZM@Z=@Vi_`4|Om}<0
zix5w>r9QfE=Z>T3TC@y#8{CM>A`NkyrfWAoNeJ{T>Eq06H`M@`14dxj?JXThu{t-V
zUY%j|RV_f>fCN;BRMBevg5QzsoJx_alr6HHbE~fYxnoL0n3OWK9)n76?0SY&gi%^6
z7b<A2B7ip!Qt3cMyp9>aF(|Ly2-C?D2K7_YRm43zU7V(O+hb&2iJBIw_xml)A#$C5
z<I?QcHgSUwW1xYs;&|hKmQ7Lk-?Fr4ayQ?j;VtGWAcK;ae1wtlg*Bv?#>Rbp*5cy!
zLr_a~_wkB-b*KSh@&11I$L)W+K+8W}K*=`2O?9i7u)4I_bbKAe##~m;U(EMu5QXE#
zO25d4>CdvWNHu$O7XwQdS#HNXdmp{?S`H+M<`W!M&h%r|fm^-MDLsWM;}4zkU?^2X
z9qVyIKS7l70m?=fr`BnIS)&!N0%hved!0e~FVU0qizfeC%&YH_hd)(OT_`0%<ct1Y
zIWf|^cI&MOWDe^w&$@qy`g!%qCSFmUuNKHvtNm1H^WU~7Hv(u2h)jP8?+SQX#2m-G
zGVp9VYBKOa$LX+&6}PlXqaIbCD^Ld`<U&3Ox_m!Rmx}4%lVkN=6MCyT4u0319U0(i
zG8f?%gXZt<m>%B%));l!Xm$L8^L=za<fKZrAT9?I#v-R*=r{qT8@oaS(h`DRDax-w
z7V0D5q+E};MW{YBFVTTwir3P}s;%@YwNr@T)Zli#djy&DuC*b7M0`iB(rm0F(s5%;
zyrR_s8D#StPAi3})5OjX&qi-I(AZ2jO{BwsA0BF9>2A@|+{H5FDs!efR>xZ{5q@ru
zK_~k~w&;(8oW)Rk=sz}<WA)Ttc-wm$!(-12m9WhD5&g)V^lP^k_VLoOhu<L^^FRGl
zc{f2iOtNhqNV9(d3x%W$nG*N*dwS#{b{$18fnoTpXn+}WT{W_~@8V*Hu){Savd^%`
zh3QH?0X~?JV93H)ORNM^P9wZxlX;r!+tlK4%?X)Is}b4weOnZJYWgN?oK{?PIN*1=
zF{HxlZaZ5sJ|lw0q;#c}1kkqR=S*;Lr^bR!=1^;PA}bfQ@3f+Lzu`BiT}K3Z+kzCo
z7pt$3z?0%2#{R^4%qS5a8C;)thOL@GV53&~nDavI-3+?KTFiSPbch|NLz|t`t_rzT
zJbW@3cV}p!%%k24(rSPU%(4W4s2JUNH$esDWU$v<35`Ve-{cK?24$chrBTzOey-NH
zSG*P2{<3TOORsaQwx9U{^WLDLPCW@_qVeN^_#uJl8G{!f$6-#x%70bK$vByT9RCq}
z4rB4~XU(qo8p!ZimrT!^^D?}Uy=cNnD?QTu#Zk@|6ECaFYjGCBj9llD-=?0ahr&Z2
z5wDEr*G$(DE-oB5ORpwqyeKVR!tsN0N2SC)?H@v)EYd*b*a)zv2u<On1Ui3{#5b6%
zGXTHARsMF+Om!3hGA(WD5fDL~E#Qg#Amt<CY(iD(o;b@n2wNKX!EcEsl9-S~D5V63
z8JHi@G@YSJA=+jp&9ep^5`$^rKsykRn%N=WXfwTIb@{f$ntDmWliKb1(Qidi@e5<1
z4kN<EkvN>xGeC_Zu|N#~Zj@oY+KN)MPb0As^HnpSW_O4v;wn(#?65@s?aDA!fAnl+
zTA-^@#l+0m4t7Wv$Q?8ru=?B{q{|DZod<mOJ-HWHNJ!BW(@;LCR`Jt|lHz$Y5sZZc
z>ewukLxK2BE3)CLL6W19U;_(sTu7%{nL@wsFS=w2X5Ew*EurQ`!UFO_eqG?22>t%D
zm(T~PUIs)dsBYjrieSgUp!BR;M5(D<-e8>H(86uiT{YoT>uLAxxsYL!p-?BLMqFJ8
z<#7fw2=l9hY9dzibc?nMUpsse@h9lHIXO;55Hy>&W^Ex%KK_m~qU(i7#y}hyW36mZ
zcjMw)xAqzsX3=ys(z7>Jm3Wc|?V)cls1a(g($3sz=RQfVbI=HUM}|6b7K;BpBX$a)
z(OuKh$ui4P^-pT7b#S3svzU-a{@2E$d^?AZf@IU9p*+0#cf>N)&p?<U<*cPA*;`&c
zA{BNdwE3uXeq=ye_m8G@Z_r0z>z3&pn*4~K)RJ3P)dH}A6?vG=a~vD6d`ODpHK)kn
z3VUPz!_z-sEkkvZh-Z|oVX9G3^TveGcqCKqXI3$j!lCLeCwocMEJY(+w2(m|?fIu{
zdlnuQplT);VFo3>N%cOcd&Aa#R+d5?+u*6fvFR>QE`G&1OxQC2cG&W(t(_p<5+lvG
zfpmL380W$pCXpTZyrUrRaUM_rX6^)x*W`Bv$)Fywj61s6;}=&2`#i9}(;1DjOCZ=w
zk907UCmj?qAsdeLwf!h2Y`RoHOjN7tK}P38W|a9B5q>|GTpX+aG`?4Yes%jD#nS(b
z^kXoEvp4KtyfYzkD;1#U%w0DDWk3ii^x;_{dj};pmevr=Witl1ISegaKQ}v&G~WPG
z9I_@>m>9s>clfXdmYGp1IjKCBQLhQ9mK>r`fp4DVc8LTp=9P!jwUl_eJu9u(MF9Tg
zXC#6HX+^xToK-cIa0$WxMV?#N{NK#q3ilY<Ywr?qR609vl!~qPYd_0-1f{43Hxpdc
zx2BgndqA?4w5zk$<*1@c>?X{^4U;M#f3W8+F2O(+I+2ngx<129Xth?kQ)i%odiuGi
zDwIG442c?>al)wXf@!z<Tw51S!Lyex1Vm9>CcG8Fvy^!cTC9rmXG&9(9L-;_6{xxV
zRg`O$l>7CdIK_{bnR;Z_Q(!SXx(ub8D9Do~I%_9Ro;|o^V^kLD>w5yYdIBwY{1*VV
z5k_9LQMw7Vm($C=3J_f_qnfb$hM!3f@grk@ncC2m>*<DXinAoC39f@lvIb+KB4Df!
zV(Pqu&S1eY+nsP%JcGZdr<5FAHMj#Z_+_5KO(DcIL2)$+EP2Cl#LzCzgrYsExSgle
z51_7_%&FQ=Mg+k9NwUQAx+%Vl;hN(10R9XNMj1^VMQdILZpkX_e98?ANT>~c!ZTh4
zs_9#V=o&*i;%V_2I_7Vq+k(*#-0CsZonGJBfPhac6x}ADjhVGq;OOuYnsd;<7~iTY
zoi3_*<+(gaLQG9-(BS2W{JfPe3iLro5EG#hjF1S)UKj=P=^TK<4hr#JJ6G?Yp-iF<
zgyKIr;M)!pS)ASi0-jT~+*MUg$^IFmWr-qGt_9}n%wM|sp#Z<g3viI;F2Zzoet29O
zq#O&BN_gv`#p@NozRe|(%|V&GIITezeEJbsUv{S1aJuJnJp1S1mN81_%f)F!(CE<J
zScCaA1UE`ZFKk5N#zuTFngwO=m&><9ec!&%7Eix+sPu;|gj+6>E=UT7ct2Qpu~1QQ
z{4wl%iPS_|V7nj(-GHv&;K_@|e1W4b$5)k|RD3U$Qh5x*yAQ$10cu>+R5&sYZ=lGn
z>gj&h^b!auj20aov`&WJEeX2rNqpe1*?k%wq(_%4%EY6VWbqK0K!O1can1o|O;vzM
z6CG1`cnPm33cQc&X%o1GmEVH0C1U<Iy0G~=Xc;(k`5b^b2H=spw9Z~8;}T|%8#18;
zPpKjIV}Hw;ZY;-QL92yH+=uGec4L?nXgc~JgZ31hc~yGclOYr+Yk1GD2w<^e65(}Y
zsfqdwzw>0N4VYIJ5DXDW*R_TjVHL;H`xdVq>FGjQz@A-bDe33_BTZ5J>a7ISX9s#v
zyq5RL!E*<Z<&3B%0x<SyE0KX9`8^-vg3`g$Y0`bAY9IvuRA>Y4q-Mm8T0W=DX7)ly
zK<s|Cq)HTeL?9W~(E0<)-%HWC5uKNO2QQ!Zyw+V4O$h&!!7=SfRyor;y}2yteg$_f
zlx&Gk61$^_Dn$bR=<&VsrP$hb{bTQhPU=Z6+31(Cd!y6u{AKa+(!k#9iys?i55Zg!
z5Yaf44XB?Rm4^FFq5O_i)=kLTc33}gxm9X*)nw-TG*1?hAssm%u$c)Igb7U(lkVEd
zC=V=0_xXnRfUGM$VO7Tcaltj%W8!x(b&Wom4_cMnph;I-Y4y8sJ1Z}4d~P$vJWK}n
z2<a0tuRa>YOzsv>e|4~w%bBvb>KRuDA&=P;z0>s?Dk}|^EFluVco?oR#^k6_@<6nk
zuR^Gy`^B!mZEOiT{ny3UkeuWtwqdy@<#W~1tQIKEsf(Ic>{E$e);@+YFh#dQKY}6_
zj2@o$LAf8rI8&{tTLuK;XHbD@-1p(W4Q26SL?R4cjLt+mL9G)~l#o6U-I0)iE3FDS
z$iJ2yrY2DujoE$y@G`w`?pnp8HxP9GkM<^S5kt7*UWZP&*9}m5@eRHn@;xZDmW<qf
z@TY>q{7k<O4CqfT4(CwV4~!ZjND0XLN+qz-S268<$-+w|a%QTJ3inmVA{o{=QPt7^
z78O}R8#;Afk6Ns|(S$nD=6JVXa(lhHAnINnMEDSzVk1!bKfw;82drtYzbITQ848gu
zQ{MhS;4gVgHS;X(_NS#2JX!BV?pU$Y-ttzelehD?PVqbKQbVF^EcNA&s`a$P2u8?t
zB#lG=<Kb2MjwqFGHuHVFC+pQyzXD$`9bvB&NYO5$Ikb&TNg$F7JR)(1Le3O~ki{o-
zG0zmLg6vmb`*>M(b+a|gCw#f=ULRSP`Lr*A(Eha{K%Eu!J60#{vT6<WbJ3;BJVaJB
zOzwWJ$RXi)iaa&P9*HtYurL-|Ba%7<+$wF*EM*5Y5VXrz_K9NNrvVu}Jyicf^j7r>
z{rB*+v#X}p^u^u**TJka1`}$s-5o2I`ygp&BOX~+M+jJm4*Bd?>kH0-kRU+s#op|y
zP)3%^t&T>RQGix_)~}F6OovgQ0X4Yk8t-!9;J09G5Z|SoN7;9`W{?yw=E)N~<lj|w
zG_F2%g>~23W43tHbm(1uqq!e<S2H8K&k@UcxQRwOUL9-(A!aUAt-`Z^>8kw$d>^Cj
zKD!LtwXc=BZIs%|y?g8+gf1jokWPniP`lyAA?2MD;}W|EHtjkKfv;W0u7A1Q)zQ*{
z@cLm7q~e@JXS*859VtJ-T!QK|yBjEkgHR#ohTR9~k943c{Pj7=#H`Qdb_G3T)<L7z
z0OS>G>fi)z)4r@r-jj4Rf!Sk-?x+rR>eux_OMJjIQD1uLKPSuZAj)|-FEab>cc3kO
zfM05%TzeIoZ(L@7dg>9{ImrEX0f$<=iXc!0gWV}9vHBMGdZD5k<(R|#56A+{48l0*
zaYwWsdih|kVORS*P*NvZKOm(gfr?dfiba-gf$nn^;Zb!e{ZQ#UEDGIa2xg2j<jp`W
zn>=dYXMrHZHI`SRt?D6tW@9&&z@AQo4#nF>DfVwClvDjYTvk4HOM;5T9Jn898aB{s
z4ebLaHE1pcT@8HL0u-utKe$2@qnjmn%c%JGggQ*Q9|2{vz57BFBZ~UcDir<T2jtg5
zy#>|kjltfwf0o(}w+UGRvhwVHqO%26M#~h;R0GeDNk8DH^j!lL0O(dLz2)fnLWJ9$
zwS=h7C{#HQ;}zhP7*IjQ2L~W>$C#nO%0MIovWK*XBo+X+f7pd~nU01$OViDExxKV-
zB1;I>O_|rWlR}?#@Rm>Mqv_z@xm`5|F^+>dD~PA<Xr_5IPPSF?or!d|<kGjt%kTqH
zCki~_<?+Md-*c(xV5l}561Pl#<T9OKpOqN+>mPj@GES~)#6Ogyz{KA|g*$2Fg~+Wf
zR5fX{rTD*c5<id_m0>FCdTT<yLGC3Ea!i8rsa#n+{kH?9R7O?foV;$DJIo-;F==ai
z2RaE)A&gifZjrqESpA??X}Ld*46{vf8%Y5pL#?!FTh+Hf(-{6tAc%VCJ%RL<TI$Lq
z;75o33LGu~o37b2f-WTbG0YB1Fs^Lp+4`4%*xJHC5}NX2q8H#gc4=0rEQn|fY!}A7
z=Y2%SRTT3e+mNz@?76vB;Wy_n>ueZ3yD$>g<a)c*R3+~bNtrw5+&XZ#rZ<Cji=>E&
zQ3Q`Z@Kl7=OIy)4f+?r{q|2uA1$!4n=#z*mUS)$~RV`%6>hA<FEu9KM`_zVg8pxmu
z>O53Xdwz&lKOJ*Vt=YZ*?P2QxomG=RLnq>O6SaOR1{2?hRtGP<L#q2Ywpa1j9GrOB
zf|d`_YvBp1V>RU1)n@2m5ut>l$+zuVGrzs!nHW>Os>2FxgBkJQPN7kz(33w5^=g80
zY2h{>&iD)Hd;|S?LaM=k8cy`SU>c@Pc)=Y~^_S(lJ)lJKDh3s(G~JSg2x?h{Kz}JO
z_rqc5l)lG=3c#v^AMfo57}%2k;KIx=fo1F<rq6!$>R!Ge7%axsp6&hU)e{8=<9*a^
z%swy0W2E)kO%p-xRBrn38a#H^G<zwD6u4Fz;8xId)euT8$f~<Y<?3Nb792-9-_rs`
zG?}>5aPC4ANfi{?OMJ)vw+Fy25BN+hz?&bz`=K7o;l3K1XiDFWnwz{-dI#p|NjRRs
z8x-5Ke;3IEooC8Xd;<g-Tm|9Cg7Q2h_WEhxXvqV>zS>%B9UPFt9j)`7x>Xkya)wtS
zcd|M@soK|#FgC;r5?1!)mc*Kz!|<8{gJJgL1Qv~;JVV{&&={T)Cxa444a`NU(pgb6
z!CsRdRMo+}+Nf(n+0I~JG6e=RgOs2ci`rJac1&mpPl@A?+r1sFj>w7L6mVtrncKx;
z$~&!}$kz%H#iBQ<61m667<eyiTdq@hV}@DBx2r=U7t4UF=PEe5+3UMdm1Sp5Yy&HR
z0CQ+s=IC<mCanNjwKjv^d3YugKpE7XKY4u{%Cfzzm&czd4X;sxA3g!OMKD9C2qoGu
zm#v<)b`9o669B8Bo!#61#TygD_X4+?x>i&1siZ_YKlD>DT3C3dTHV&P!g8<`F?zpS
z!|i0l0MtUbfd<PAt&jy@KNvBb`?T!Ks0j35@%^lTEcgo3Q$dh~*DX%Ng`oBtn%D9D
zZawA(8kNrKdM2`-7Kf9pgI+6A;-<vc2>)enp-s*{OM>}}=n393XxudGJ*t*2vBs^t
zx*v-PC$^$qXz6~!osP|0G9eW7ZUUa5mk#<rvKMn(U{*S}cNb`g!NaTd5&lA0hT9yE
zqEzJdJ>Hu(WLl2(U-<5RNPbdfdwP{KjO@`lt9l!FC*(S$U?IP>0Hqsgc5mfj^ZM!`
z?AH<gbiclO>EV9-P((On?6W82rz?|$kcSJx2iLs9=!m|LN~+r1?|<5byuM;+0Y^38
zEwoUK%0ZYAr}mZ})M4SJ^Naat3PH+Yl~Y2_f;lZPkq?OCMV52YuBl==3JgXi^fNKX
zPk@Xtr@oLe^U>on_UrDR{<r}-z&gMq84Tpy;oQK6+}JG+^(g1Aoom<in7kkM3O(74
zcm!U;G6p`U5_-2!X`?G<gIEgTZ@ApLol6U~KcjI=vXolws>i%Bl8O{P<~?sXEly|z
zdGs<F>>+r$+%`Dy%dnrgSaCuxFXQ&L<4LkTq_ke_9t}A=Gu|+>n9xEAnC8iiRCW-5
zQeXS>C+O&O_!Tp`YcVt6ds=(NwLkT%xg4+AXM=!yCjW$N?(ej_Q8-jkFMlyZ-G=t9
zEvLtUW<CtGGGXSu9^R)~VsPu_ivmQWQBA8{ZO__=d*Jxn8<C$tIm=%ZBT65o>c8LL
zxwwL#N40@1diA^_`?K4dntMLaTf^@SM-AJ;@0|xq-X2!PGLI`Z-GK?tWl-ijwso$+
ztax>Gfa9c_Y746xqg4f5dLU&>6o;AN4t;l9W85_boTkIyZgu^CyOn{>9fhgr=!hiq
z<^m!?8Ryw#O(}+U*uEgD|LLhaL0_0z_1Kdm=Wutwi9tiX8-}2J9MF8D+9tCPbRVla
z?J|_;uCi^8SA70GTa#N7Kj)_DF9k(zUM`2>P(ZxVpmm-z+6JF8NeSEK5*@V-fL#%0
zQH@e(2dwcZmJ0I9C_2@cm;khdH9d6Lcj`+bcRQU-{|QDwKtjx|T%6JgHVs~WC$iD{
zZQ82n&~gM-yK64R;v&#&eW|D~oPj)%#+flnms+Am`#PKuzJ_a)!Ysik<-@J9f6U?t
zNv1QeskiArLFrnjVj_G@JXp7kU6VI!4MoyQBbX`;sX}GpJEA5#0=D>^gsFEriBvRD
zTx1@|9Noz69dk||I3;FI0<irFNa*GlUc`Sdx*`rz*jBUpj&~qCfANM}!@(tLd@q-o
zYHtPbMt2Ud_#Uu|OHmH6u9#}sRc+@`#?FFwDKv?;L6926MdvZ5g3eYjpb=`ajyI1H
z6F~l?ocoTiDiO>2pgXPU>ic4ld&#vrn3CcfIHrdH43pID^Kf6I-<PGdxR^8QI~xjx
z(#*v2Qndr9a+pE*T=<ZyNHOxt=IaCan*WS~`tQwKfq*cFP>m}K;_q;^=RjQSp{aR*
ztZ<R_8TEWuF`l4jwes<xfMd7J71E)_VC_8x+H`arUk}g9Ja<j%7jPqbUrE=~9oG+D
zs$ARL;-AUPTcZ^Ou<$<5O|vrpQK#LQ4w|Yq(!C}FwQ!948PpGf_gtov?{)5&a-$8q
zMlS3Vo&6?88Vv90$TK{qYQN5mzx0TDg&Yz$_&czi`*>SkuMl^tx9QzsIS4VN*gJ-?
z(&Btt`DnRRps&UG!*=%qEfP;~<?>ONg;^yJPd*jp^O&Sp_Yse5E>?Eh#jDT6sG>$p
zXlm+|{)hdbNpBWd>N_(`0Hs65@4=lk(GqO^C+V3ZIPH;h+Ed@eY(cvllDPB2o>QJ7
zCLphv03V;q0+9|)i<edd$sf#uhM85$#F1m-=*QQiAJ2f=Yrl-A6M4NSdkmMKwxiWZ
z(MNM}b`)N44f#X7?9N;#A?5DaIU>BrC4w|V6;zDN0U-u!L8%;G!sJ&&_K>$81Pw@~
zw_;a*$g=llj!wt!3)to2bUVW|C`N!c5u+uA!f#l6Vt-^l<<sIG`1#O#<vszlh}j}l
z%dwm6=}k?wRWMlL2FhtaIPLNNzD*5Dl~3w)ymmp04Ric7>u&zyr-s>qc=M!-Gajxx
zQT-gfU_ku|!><m92`wI6)6Gl8*O*)a)%n^K3RM{X?{SU&0@c3oT3NJP(KxaRG*>d}
zZ`fi&(MM1n?-^m_L|fYbANJleuE`|&7uRJMc2|(ywIN7Z8=?XtO**ctfC#9pqO^#J
zh?E#Qge0=8pi%`DsZnX7LX;LDBvBEN8YvPfAxeM%A&G%N2x)f$y5;`v=l);*UtC}E
zFgedWXU?2C<$KO34m&mN+<_UWkOum-ff!ha4Fb89;vrW@{g9oxz>CmL76sZw1F4nQ
zmcH&Odhej+F2$wvF5s8qK&)@oqsx+|7a^SN5V?sRmyXU$bu_H+1n%?n3Y&}jm!psB
z_Z5C;Z3PFy{lV(0@Me&p^lr{B&M(iaG9rk7Kjfs2L!2P_XNWP~bE7UgPj7hbP!rr8
zLM;te0rb#>+|AX?*)@4P^%<nK%k;~$r$qob6Rl=Ic&2V%*%W69zB<?klquh%m_4?v
zx&)7*m7<d$17~`tc;@bRR;Xjb>2<?drlSuwz@Aa0)6+g>n09w*&1q14pWap`x?V7%
zv1T~|LcRx{Y`^1Nt+#yHLz{=}$v5%KmpGi<cuHlt>3ZR?kH)ot<x3g1`<(bX@GE<O
z$b1!wuUp}(rueEKrC0TQJr%wlnqN(Y|ECS4ZV725??t-@nI}fQe_U2}%D-%cC1B#K
zFY`_ZGJ4$HnAO!H?0k4N{K@s3e_q#kGx}%1&6_vhOn-Aa?XY#Y?KeMsYpd~X#ZMY4
z-`d)K|7+|jv3M>kB)&t~1?|epqOx=O+9WcK6Ei$yWMbkwk^8YD3eASL-38IcRgd!O
zlx>|LRlk~y*Uz_RI3avzQQO{0lc}qY|FxXnT6NjCMy^Nc2ul3nNxE-?=+)SZ5SN`!
zO17tZfupm^`sXi%K>uo7LU$L@N8?l;2uiJ5b$Hiu8N>bXn`*X|@!e}>N~c#!c7Gd?
zCZbkVJNH?eQuYmc{f{5at}Tp{FHn^|`Of6OGwF*Bz2{ZcX#Lo9xvuc$@tWm1Fy+nC
zQuZf>gGoul`v02LLAf6D#!CsYe}qY4eyi3$2mtYwRaXbI{4})B1E>ec?m2&^!Bw$U
z0H~2w`*>fzh--aWI^-%x>+^@0%J|6_Sn+;ccHEPkKYvDLaBs@krrhPBC%=62=(kfA
zZs9v6(amM85k%U<4l9r@S=EvJnWrTJLtF1%BCM{;QQ#S!bN}*6R%}(q1F2)*T=03O
zt;)7$o0kU#-O*m=hFPydVct#Uql)GcKC`c#saY{kPU4pc5eT!nIW<5`$!EEitglN$
z#;>H|Q0f2p_{|qJm<H3wFaHm|AK7ecreJnk`9EyDdX#@>+k_^@BD}j-+#=8=2}4#H
zxaG%I_1^zNJ8AlzjrL3wYvCz=7C&LkoqJqR&fvSl7d$ulitD!Gr`MID=JF~f&~N_m
zkTUJKmP`42b3P>bhM3QFOZUAXG+C8hb{&vB_BYAP?J1Ou)a~m;Zv{G?!jLp_ae{h|
zaBt4!j*w4@eY_&E1F=D2U!|0vKW11C80+Z1Z^<Y(1(LV#`c}CfM^XIAWr4eG%BK{-
zoeWZ@eHH6>^UJYj3MT7hv_e3o`f&v*r`AtAzJqUkR~zlY_`$zlU}FJ-5lXKE<O}n9
zK2PRoUI1ml?EQxBL2X>R|LH(GN4MHv`3cT<cUp;K_oTC<;R{5nf$YhNo3ZQfD@&Jh
zS5oZlIuO-8_fw@wTKKelksO-XX8m~ZqDGP9MQ@GH>Hg%Qi~?P^3}K%fCV+e9vWAZ|
z2J%=cp0Tf#Y_rw?7g|<tlT2yfU-E^0t?ppO)rLfW1iv!mZMQ<4(@!}0pHJ9nk(M7!
zS?VDBX9ar3RgHj6AP?>r+>jA_+tg06P%b9KXI2i~U^y2x9xApdSG)4^@mM3(^-c_J
zLXe)*A84PSJ8|@zyaxudw|xyR?J`W;?*d4?lWs3-uO1mc^RpdGA%8d}rNboQ!Z%`?
zpqXm@;|mZAJ*l_Zwlsrly@ayD9f+D3W7yH>M@2eLV%Atu>!wXl?bSx+e@{2eEU!n|
z%rey7K5_lekn;d@09gJ}{PN;?Ym{Nwh4~ao$3d5i;<^>KNn7+wKRjS<A?5sD(R(br
zLkR7z@xWyeMLp?bXW{Qq+y6UD`NDZ13imI6nG?`!X2{t%m+ijP7)XVnwUlnBDC(ac
zgYyUn=GgD9{qJ+o1$*n1H|QweYJD`XW8QiY_UXGl86LP2am17=1g9OfV8$>@SGLXC
zBYX1dW$8A*zfZPjNh-~TUuIh?+w*A?q_)&TDcq_$I)LXKvSir-DscZLY|YlL5U{q7
zrJdlVtFxJItt|eKLDoz)Ul<!BTApawIR!-u2gh*!2mZg_CfD<60W)%UCZ-``J3frI
zFc!tG+dfBf$@;&3+ifom1x*i}PL!~9MB*r-wA!cpGEZU1+y3wTtdK9HR`Qx!+Z@c&
zOX~A|o3wh=N7xmv7FfOiNXxWo8e!r6VP|32E%HV2K;2K&P+z>$Syas~2XG7oF*eQU
zk7zDnS|icTe3P>m&tl&xrtrlw6Cg6M8$`CkPTq|*xZrV_cNLs6)VZz!v%^b5o_n@%
zq<c+C3`*F6zeqQ_ml$hcSxoI*yoa268&w_SK{j8aoc1|TC!CXm<O#)k@DZ#_O+MAq
z|2nC?Ua^qmPl>=-UY<tqX3oYm+_Q7vXwE>~#Nc5T<#z#WAdGT*=(3SI`@z%Yy?e|<
zwnr&D1vgqgmLgEg653WIYLX#t4SM{N-k{bPv%|~!5E3Xdv+uVu=j-xxS#h-#8v6pi
zY)Xhxgy@gwRHuL~VGMCi=hN#u`_CB<$@mS2CsYMB=J?j)X{~SRn6o)TK0PRRo;sT{
zH2c1vKE{-Zam*iBa_7^*ANnKtqMD1dy>gx=<H+33R9%a66RNt9pLx{p$^=kKquq3G
zP051D7!xKz5W*zMk#4KUFMgKY+kP6!&V_qUme{&bhy|a>TSakBp6D&8aY`9hbcsQo
zmZ%2jp0il0Fl>b)goCf*n+B9@Y2kuI67_cO0hC7t>p@;G@|Zt%=BT6VGfRE}4XSiG
zfU(e?&}r`((veT!Q)$vbh$Oa0%g%V&yxNPg3OX^{x`!2nK7*_fWN5#u=og_n#v^tR
zDfJTisQ=dH!Ns~)erw2@L*bU)yt*N<i-$-<VCDRa@f5~^G(ve8Rh3-N9)+E+7qDvJ
zSk0Ci7H+F0q<Ee8h?`}Evp`(y+s=i+8ES)fa$}fFW65Yw^V#ngd-}<)yi015xd73A
zo9GuY<C^827M3kTHw5D;g7EE5$KVo+9`WX}Czdb|E#%qN7u}?X&$ZGe>!lVn!K?X1
z6(j;WGN9I0F~WLu{*jsQRB<cHYjNX9wIM$z<L(6lb1$dUUjiM7*A2=TP|CmPuaT^&
z55arUY_SJpMjAN!#_KJ&i%&2@W*7R6+Y9={xk(&d8q-nJlHKDJiVT(P*)Iw3BvPWk
zA&a0*>pD)LzE|N<T}H(!AJ--c*beBk0lThcgXm$?1#mF58KlKObuPplIPW>@0VPQ+
zMa?Z6x4Ts3n>p~}_(+f1nb-x5J3P^@XblktGkkX#7f80H&OwkZ6AP>KW<(-!2+LND
zS)bY;IB=)o6TUL!aCU)?N5;$`o-W8-yf&k*1luQ>Pt~#2!O>n`;AJ#Y&upSBSi_a_
z%YI!9EYWsg#hhDuY54@IgV&7;8&24~?QEWG4@5F497`Xf5mdzRfy7L!v<Bg)Q8o@`
z<vox@OnZx2+}y=h$6uM`EFh@076SyvjaF>>_9yD^Z#7&X4%9(-OM`*T2ZY|U#v?hx
z57!}d;=(OHQ}B`VbADnBoFCVUsS*>`)%KlTS)6HWWlc@YF+96qqk725tr?)NYZ2$G
z9-SB7pd#Csu=R#f8VDX4>J)C7FOi#~>rf14jk_s>=!~+|%IgB!+cj?Jj6)-e#$`iB
ze5|JOc%b~KJ;#JRe-Js_hD&EFf22n7&SEuFH^L;83azM*aNTyH@zv?SSHUQ)S*xBa
zxXs&-gT0!qbfIPlh;gY*<ZctL+mj)ZQ>8fX;CjO}@k`B3JFtN<7Ybp;xW#+o=|p2q
zlG^C))49{fP+L$IV?#>64?|UISkqB!m58q`W*)7F(ifkwSespKw1S>A>biSOqGXVx
zSN9Ccyxmn0SQ1GT)7smMV?6u4G?E26j)G#8-}(2WMoVuFN9-gaBE;a?a~%&NVsPEl
zxb>+vDEMsp1GS-1!>nE`2a+E-_tgEa(ORWYR1zxs)#wAKv}VBu%_9+Gc!?|aosBM`
z^3#(atk2#CHstYpyVn+S{-QnTTi4?Vvm4^Yh!z%n^hPTR@`&psAwo7y<<V2ih|a-V
za=6IAcE(Zz#kt&#D#rF^mM7~mwb3|ObNe?a;SiWt)<kQdvs@2SJz|(BI5r}oI1xq{
zQrma8T+f^5jm}Nj@YF>&PUI>hCcDMx41ti>M{2D-78v8WAQ--3|3N+k(!lI<OJ~uo
zIE97Rspr`n(F_XlhHBIJ;|lRiC?S+t-$B)Ytmi=(HNZlvnG!doIzM3wFeJa;BBlTe
zS~YwVBE2O^dYEbrSu5+*hB=e8NbT&%D`Q@?CV@wO2Qj4mw%#_`45&8FiqF&4^@kj(
znA2;~SckEz<7KsH0F$oOJW!dGNkF}Bi3RQVMWng{_PNlHfr{HDoI5_Pj8vRuRJTCK
z--<rf&^6(;sXV*kFHT>oR#1Z1k-NPc11C)sHcEoJX@|{iqQ;(EXucm!$2N**1C#1p
ze1}tEk`{pwT{g6vCFz<}=Ajzm$IRS#C?Wpo$JsuHQBus!YPVcly#HK*bADWtAiOJG
zFv#<EU%PZz5Kc)g<1wj(82?}x1A#IR%igb}A{vfhM-d-erZporX%c#Q2LWQ|A&*F?
ze;Nj#sr%M{I0AE7M1ms%qk_lVw4H;{lU3JL(&=pdB}As>%K?wvv?QJut5Q9P;>(%)
z^G180PJm?ZK2Nn>{(mGp&yfb;pIR~&i>6u6QKOmJbCQ$M*hPL@T&lSxU-y{%Z20?(
z$1s&+x$jwc^-;d<@M#WA!s;elSkyPuoN_OvW;}rree;Yg3g&B_U+aE2G_WFaj};2_
zcKK|`e9q4*=lGfGJ-dk4xzHecp&yO5>u>Fj%xhQQJgUN6oG7Q>crQb!d&s``zKX1o
z+&!1OBd0himlL&xxWnYlP}0!MLm$OsQ7U?CQ)eCExqo#iGe^S?qbBaZwA2)M+{Gfy
z6b_^}2Ud=ETR8pnkf`)A7~gwClTHE4ONs6=?)YAXO&ciF?3o&3O#jLzuF0fWjR(FK
z@eZ*=($_!k`XWj+>!sNKkSf+{4cS{tuJNJ~fu>dD;b2BQ(^>ZAV$%x=1-M*k>}v0s
zT0druR^t)(U@SaI`H%cq1KA4wa_Rw}#T!HPH}?I<hL6aY6K~K}Iml4d?;NAi{deOm
zC6OYaJ`^Jq4s&=YzZXNH$MwDmPxTh$BU-A6A96RA=+ib`?&Wz1V`xSC4M<;`2G6Nc
zc(hZ`VZFEGn+Hdk&HksuQJ0$om56Ty-s-jI?+Z9|MS`gb`>ulpTCqfD_!IZI$9Sv(
z3zyUHh-Y^-a7JQv!?uuOF+@1yHq5-a&da8z)`7N(+gp-GgEI<raZeCvh1og@)OW8v
ziz<#}i$<bV8XLM`!T`Uy6bq}I>qK?kHC)PfNM_Rw0ShuB{`B3G_~-@!r(YD&Xfaeg
zya0hxP_R1ML9xm@b^0ruTK4|5mK%)4qS&WInNz2hor%W=Y0XpBIc`pB^@;1^3X-DF
zLiglHO5UWEd{0|{iH-fuF8ET4{X(<x844{hR|nCBlSTdcPTN95!L+|K{-JD7E!S>o
zLA<ylVy*es@F7X=2IruH+F{l{=pM_|AXnr0kl?iTZ6yv3Wh3ol&GfN-n%jo3PUM#L
z>ZDznM5d-lENY@dm8X&BJLkoRVUpxo%Vtq#v`(+Mvu`Wv!|DzTa8JZB*^|?SNiu%9
z;WL&dN(utgLRj|R=3A`T9kP#zW>KxZnq9IRpnLr92|v{BDRJ))-5CW;#&{zOVI(P}
z=78T~h@6KZmp28wF(P;VQC5su_n&51dBY{jaCG^?1@gMITH#E{kI^wnsnvqrzrm>0
z35`isIXhUDjDB;2aj~Su`R-bTNl&C3?7Wc((RYwuraVQI(-W6PJ>!i{)+dDTAnLzj
zyo|@@ht9p8G~(Bc%+HTA*WEa!YD-(lC)V@&pu-Wchmr3w*hn``U-=y1e(vUre|0P(
za^FU^F7+dBi=$rXss+!#g~0WOgNB#RkcMuO-gzA%a>t>Hev0>+Vwg>>q{Z*1x&)ih
zyg2c1cGoeOCoX}G`IE{<v_K(a3M(IW(&+V&>C|9YYZnEtIbkI%d)KO%^l8oR<ENMX
z>f+0qwzM2F&XxN8Va^b&Q5b&FwV@0+fXzFg37ca^vHNj}RPL6rEzIlCM^;Nrvmqz7
zBbx_J>xo&(K)Dgh<}Yj$>ET8G?ZK3hv)laKN5k&jGO$eTH$T8JiJE=|?Bwfl;n%Tu
z2!91OG}G_1orI?^E@4TD_1u7^z?OCGUikq|?%&k%5OAAel!@%{(_37;1YuK-{UIsy
zi?`7nYv70s8X7Q5Bk(JYcapY@R%?2{ogq|t%kL$kxUXWJ{CsZoI#EipMgs{Soym$}
z@NxX>Al@@Rp%SVdy>EJ>rd@=2zd*Q4_Vq!C?<b0{HajZtWtdy|hVW8SqpmAO|K{t~
zHZR%x2kZt!2&Z8e&dF_2mRK77XG*3h3CnN(6|&Ay7Pn|(!=s-_Dj+W1;@4Rkdxs{{
z(>SMTqMPlq5s<BhkK3%X)eLAfejKe_eW}_PhbWqlOcTc}W{~!(O^1aHHBQvr@CuPY
zNAzZWY7XUYcd%*}wNJ$<zL+8smts{9LB7GFQD(IMe$=Lg24<yeD!ehb)<H2FG^wVI
zJtN-hVR8?vL|bXPLg$=pA|3wN^<>#Ocdm{#c)i1jb`p11g7s2`H+f{J^MB_kbnYv$
z?WMWK9Lk=jAJJ<wo~HD$-R{Ws)RNR4k_Q^|7iKgO-xyfRc`lB8)Jgb-O~nDL>~MqC
zl=FR#SYAKa^ZDq@d}@W|hv5yCvq*)I;D}K%L-g{<i4qH_JFbjQOCD-33V#5w6e|&i
z{c8&!2)O6CyhFLdBsu^vrVf=@goyW9c#^90e+zSsA=NzagjZe%2S#SZ4YE?FzEYU`
z22FfDa!>F*@-NBc>j8>KGEl}#jEo?)%b{(*Y#W`0t55O2d+XKQxj0T`macmvmxtZY
zo9bVTG!CG=o8vUk6?rum$hfg>c#pOm@@NRU_%kGgGnd{)?wl4x9II>a+W_viGY^}(
z{qY%Mu=1)Ph<SHJpriBAY^KOnvINQ%b#WFmT4Q@NN7OK+I=aP8dkNvni<UU`AcQ%k
z#Js?GlYx?FFkF5Sp06*j|GT(R%f7@s9JTo8yKNpR4Q{!Y@r;)vsm93uKl*mb(@uYm
z#Z0+xa@txkf~ot3DsOc=`W2pZmBw&VkMtoKTXA0Fk7<(Ysn|ztGJZ>8HZ;4=)U{D2
zW5}J3M;r+sTjMPbyB03y9wXkJ+{Y%l5o-(Sv>Tc`q7vRLYIk!5+)6o*JAB{DLP$jD
zsCduB1;!p%9%LyDlDqZV^!_hiifP&izKHirA$xH!P)3wy*<8ILC!8BYvXpdbw<^l(
zop+=Y3Bg0RIrD}s^2q(wAgpH#UE(UVE|i0X7&V~XC&3(Zi8XXVqL*wxQY@S^o^K#b
z{b{Ct)N|j5A{0$b)HW=46pGFV(Itzs6<V376!JRNG5?(-*aO;wqM2zAUu{y@j|a3p
zOXhF&m40yaQ3q<TZpVD~OLBSCqi2{~z&ANd0$|Yu^xlb03P(6CE!2JEoDbO4Ey8MB
zD|n|xYgc*8LocW3i~Q<-GSa=g&N)U~!SuK0OT&bjaB>{f-Sj~7@KY<Rr>NwNvQmy=
zP@}n~^Mk!B;elQdcZr3TPey(7QzlFGLW6$VS{-ojsNp#=pAPK^^P^O8r`|;N7<8%c
zE!GvOfHB;VJ^2km!!`c1P)BYtX>V5;+`(NfVm7%tJ2J5MW&Zl6t67AqAVIbL8lkJn
z#H^t+i|FNv`EHlum&53(%v8@j{*ax!mrvTSQ$)g`*}0&hYO^T*$3{GI>R7pFb&>D4
zwO0mYWYB55ffd|SVw+Ic!FrPF`aWb-*YS68&rcYadpq(K!_emvPXxbR2Zs%OV8!lZ
zNg6US4!DQ&LY!dXrv1d)*}*anEEFB!Q3Dga(3DMpMKz#2G}oEkL1>70{mfpAbC$#P
zY$VNl&5wAt4t^W0@8ZGCYidn9N}UTE-7oU)peON3!7*s74*zQxZ=flmR!C&6Xs|fW
zqQ=2JJAy=W8_v{Q+{mY9K(Q<gt0f+)i@GxD{NnhL<ujw%I@)U%IOh+1HSjcojjS?s
z)Y#k^M>=EkrfNSP3Xa(fj0ZJDvL3KGh@*gvew|3I&<_4fwOPH|QWGcFx|q9V!tVFz
zPkBlPm692ao=j$-V(w;?PJ1R$Fi6Oc^;JRGS_xneE!~q=FS**i*|zBX{<M>tr#9Ov
z9*7vX-Zr3`Gs^ui2DyCdbx~OF=r1{x5*_dLNtx-J#{@K>hip8eT}TW;69ch!Zp|%D
zNGj{)r%!8KQe#Yp&<8%;%pcn2SSgy6lf?x#2J#k=BkN&6A|iE$L}BZI=}*<ir|Mk~
zCqkiSVSc}6UUo<%A9g@_*Z>*sEwM?gtqO8=kFOQX?I9SaK)Te)x-`_xP{e|JFh6lk
z|5}5Zh(fvkL-9%my`v$p&N#Rut0i!qON}zO#tyBfJ=#<62jcW6X00!;7uP8&h%J9R
zD@__4zsI#!mV`8{opQec<w}*udQ569-L3G3tY~6<BoI$^SO3(xp=h&DJpl@Jc^7No
zsb7rq(j}Qa;`-l``pwM?4goQa#d1SlN17Jvr^SLsLW&=jEBM7}S3(q|r{t_;oa^R0
z9_~Qg=r@cytoZ!JjP$;{<*)`&7@5(5?FV(93o05X9P0j>*psqrfqN-Z4A;q<HH8Cr
zHCe{vab=Rs6plz}p!dDs5D}m@y}u52ImCus+F6@4^QdHYttrZfB$zGT!&ZxYDjM$>
zp$QPAsGuodO#vo}NHsX&zA>_%?3v8dwh)RJR~1Y@n!t>lEG26orXI{iJ03bhoadZ(
zN{y#ivv6F&q6G1A;x|uR$a=Q<Tupw<(<i3`f-H8*Be%{{yUz57{Aq?fsNo4UWRSYH
zds<ZqeyJ(Z9ZYLD_X0!9REu_~&<ev5X4gqy&Z%9Gks0=A(3uGkK3v^Vw33iev-Pe5
zA@i_}C8Q&&>zryYGRLUzdsVDL4o#r*{KJ%ND|Ik}SG=ySal4)poy@1G1Fa#``%|B;
zD{E|+@C6%LWMTEp1e}iB6f&lU#^0`SQ4oe#=wQq`GD^J)bt`dIVUi7^3mfhsKF6Nz
zHp}%yYQN(8cjA}rm|U-`!;+jm>3JTSzd|Xs7CeU6LI$CObu06!U4A96BUQm?i>>!C
z!}4cbB(vs$<MXC-wJ?A7eGyrcV$M8wZwHGvUP@LJRsSm6CF-gxpc{DRzV8rZCyBt@
z;eAE^#j3%*7!T7)pD3HKGmI#orRv~z^E4KGfoXwtl1EgAP4#ho!c+Y$G<By9Zzjz9
zqH)iC`-pzb##Ti|4y=VXL{VhTM3svt)@@8RSai%iLYZ6S$2%#Am-5-7W~Rj<DA0$#
zQ*+vgEQ&X#*8eo|?m3-hUs6eC>MyR{TM1&)Fbk!l?MP<EH1HDYV6JQ$m7veh(nF^>
zFi+muVoRIdLs4%DNC6EIn0K|X0|%Tmik&>gJrCygOWdtEzZb*Z3GlhD2Uht?mwVYQ
z`!rAV@*qifE5mXe8yqjQRWE5=`zJ1RAWb|bhnY0lut6m5UgIki&k5a(<{K79>E(64
z{RB^|kardq5)ZsEMNUrnY#SKfY_o|wJOTo#%F$<p+*1*nxcZ>fHBk7uN!XHuRL5P|
zybu@@GKH{cv~%CRSa-;Mccc=mqFPY#TJK(S`?o%#flt*<Dj6-fAhcp0_VQ_oTY6X)
zWxryfG^asghKvfUD;L@oT0FW1ra7Fs+XIo>?+?D#T@{KxlG00V9C2c{bHnpKSTdU7
z3F4*Xb@yS9>zw6tbw{9|cr=DFWoRyPvFSTTu_*ct?Or=;nt%BEVjW{&!T#GPmV<G6
zX^yq5^0Ex<i{Bd?jHYees53?3)g_6Vn_)T4jGsE@$NysNODl$;Lhtn^Hn!D2Wj@L*
z(tcI#uQttppMY@ad<qMBkJZzwU`6Tf^lT6Pq<*9b3^rmDApsQB6!}-tbHyaKSmwx=
zyvuEvhKN$IX(4xKB9fE##8>Fk#bw+j@c+tk%1hau9}*@>L%z&&lT{7{{B72tAZ`ZU
zjy2HvbqFzS?3p>2=}P)FJ_;E!_)x)O+kjR6{$c;n<|!PDz8A_Lc920|Rp}pcbQ=tr
zUKlh}&t5RXaq<H#*h9xM$2#{o&W9^{p2(8xQDL$02=VBevLWBQIyp<JB|1$0wX2H*
zF9JMn`0eBjR#P&IRedy)+t)=<$s7?<7<2g^TH!V6UA=mU)fLvw2c8L$AG6CWG#^W*
zUk~7Bm{hFVrh0WuxjzL};CWi9?cs8g?+=7VGIcS!ogNfGq;lN+IGjSO;uFdjL2?Fy
zMb1LI+;jg-;&E>GQ~589UA7ZL#;UWR`WRFB!cE%n`@Y-FLxQj5YflXYyl)?jU(8MN
z(i`#Q(JxFpC{mu$F503$n9nsQ>x<tOyDfo(bE#wW!AJs^nu@YQ<ZRNaPTgt6d+?EM
zb*|xG7B<JcToCFhA0Fran_jtlpGez3cYXU3q2_x?eYgh+<pS~v-uHRWCu0qoJAoVQ
z7c9+?kvtJjg6)h>hFbpYQbwaeo3-+2)L9-8zIg4491^sD@(!6cG)=$<_FGjwp^H<U
z^Aj!(M;t!j_p&~p)Lknnfum?fOe7VU6ir0J#lb;sGq|`D$T;k9F^gyDxSceCAS3<^
z4Py{ge9k4p=AeYC?fkd=br5)FHDMvh6<bE1#Wxy(_wLk5#nGwBEpHFXbt&zK5}~A`
zG8#-9d0M~YMKoO|bwL;~re8MXUBe<C$Qu;3YeiT-^Zr26|Lp6mbNZ=1QF6~$R9A81
z=iMV@ZpQdS<!}uJ3A=DdE4~z3Bd48T``WKJQUx}v%U~)#St~OY<{#~}&=m%9Al)zG
z&c!%3YYd2T{yZ$54fU@GNqlrnzC!eFBT<A+-S5z)^)v3qZGp1?_CC2iL+Udipwnio
zkDxR$T)O&0t{uF&Iv~yd=tje|=6%tx-r+O(+K*4j^`K0dcgJp(+asFa>rWQhQ^Wda
z^Siz8!3<xEB<ILQN9py8X9Rh_CGoTo+4_#dUH$C^p?e+kT(ue2%2=l*cBc=Fst{r_
zpmZdaILp$)a9n>cSX+n^HRZt7B%_Aza;gZ)%wH;SwM<6<2#I?66GWo-Ea*MxG*wo&
z7pXUDvtXQdGVrr&FEbUOSda$*1Ba4wIE8x<ts`DHp$(F{d8662X5f4yo7aZSLX%2d
z5a%a)@s$=y;mTn%X7JYH{9D0j2?24RT6GL<X#q~SLlCuy&bU-ZF_Xicc5?UCxOVg3
zvG}5cz3g5{zEbAVJTamzn$lAjP!57E{e<Yo<}pq=d2nw%;EhuKsL4^@T&^@CVx5`J
zB$x*YW*ZXLMnsJ$mGxkm?nV@AW%kfSU!+-whVkRa@`W&gd75$>y#gRaYHtT7B~UaI
z5`+3;4UV*#)jP%>fiCvV>stoJa~TQ1?KhSW^P5%&(Jfw}3iU;xM$y_8SKy9pPox4V
zhYZqy`3oD>Z5r6W>eQ)V_$EoU?luvCyOhyZU-~R@6LrB_fY>sj@@~<L6h)pav6Jde
zr?mWN%2ElNUbn9|gS9{(tDhmYK5^qk(9^ZIAsk1B1STfa)}|cOhZ)eqQ|4Nm$8N;%
z7@2EBW~<zmzMU#v(;g;SJ^r`u4AejfT%h*h;dvc5pYJ_#H;dpxGCdeQwj<&qQr%2t
zbkh#GI@c5Vv0O#Vx<?k<i}G*QBzAM3t#QFpGp&Su^I4?Wr5nAz6if+tt8z;1rLc++
zUcP|+s(+4^<(V@-UzYj=KCCvzF7(OMu$b-vUP{TpFFX`cVss%-Lv&5i!-A{(W-X&X
z8INgoD_U1*12KYUwm8C}3_{LSa23WZ=mf(==<SSLyFM?BhHw2?MiNB2p+bcUSrBhg
zp%XI2G%bFShlALJre)l>qAr=wAQk$CScnUg981QxQ_nL=Oc77!kfo>f=b*9@6YSVX
zuw!9~n!yo)`O(??JX_{mQtqMo5%IT>4_#kd4?4x{<s@IsHAo&Z^USD%P~GeO#x!>T
z5$(ksG@Yd8tbtiw%u7r9`IC!Px+EmHy#ViYe9m3RNQCU-)`%xT-IDnU3+#N<fwu8G
zJ(z<_x+PRohEqlC<-ZMF5YjwealSVtA7U*$%`j;Xk&DsBbN$l@qt^$BNmI{`sM<mh
zeXq1=lhV{Drc#-BCYw%6!cr`bPi(fO{l(}nr%U2;Wi4Rh!F=|K(ahrsCNKMMAr+Q$
zZ)Z_?q=QX?gCas_lYd&cBILwbxt=uePwLX*4An9&`kiLEy-^TT)kYm)Ed={<K(jvy
zMlkUe^EJ2xkvX_xcP0r_inf?+^Ftl^33Cc)zMs_(M0_IaFz*5~F38cr=a9#$j|*4M
zC2+K9o|+n2oKo2@nRzx^=o@`3w=>qDU9$Aau=NM>Q-|=2x%*VZ)<12uR>q9?ioCW&
ze|+2{AHY#bm>ODiK-WD;TWu`$#oBg}tm`Evd!k3kN-&~-_7G=g2XB6uRUjUM+!SCK
z3U{W&GHtD20`9%m*_IZ{Qrk*S?daWdwuK&VVqMU&e3KVDcG7!x0q9jrB5QCkq^|G4
ztuuYAgdn}%6EeG(1X4bpV(Z!08SoMEl&6z{r{;4DO9%15DIQyiPh}B~LAiHHO+{HY
z#LIu&3OeS&T9|Lq&VGlfgjj}pR+!A!ot}v0#^c~nG;#5jLu)0~M4D-{>2kvt(G73W
z{4tMWac|ZYek3|)w&yKe2w`|9%6ykMWO0PLSl7SH%K1#~MSoHt*F|$=7%4c5+Ia8r
z3Lilh4|;|dqoRL8xbbX1TD3_XwG^)fMU~6-q(nl(Ek^{69~T{(P7qcfON}_S1&Cu@
z)Wm3Vk<$Coko^|tQf8I&M8|SJ<i<2+i~}hVA*vX1Ca~7wO$1}Xyl)R`A!W60YmQHw
zD1z4f8`AolzQ1Fd06}r&#hudL0!W<~?KlKVr&g5u-h;D^gLEm1Q#PAzHDx<S+Sf{^
zet@-A+!IVavS&|6)nzxxOrcTY;(TX6y`_d{q!vCJa<+f&xoYT0+n5PFbwNqcS;X6c
z!+GX}5i0?212-^p!Gbmf%_MZW89tF{^HX(o!NqkCmkre6dPF_Ji6Y5~xIId&);qV5
zdp!uBDxq!)+C2js_XdXgK==Gytn{VTQv1j|$dz|xwo%|C3D~M5*AUf`-}?mO{!Az8
zrDcJ~V<VAiF=sC4gyX~CoL4;B-SUN!`FB1RG8cuiXMZl?nvRZLtcNKSKCpOS-2A*&
zXw#3*b5sTSg7q+7%g<I@_=GK(cGugH>BAyq6aB)iM(PhPn7m*K;BDi8z0rJ(Y7_MG
zMTPpQ-eQq>Si`foUQ(YhRx2_8VRiA}D%M9sG&`@7LGhqnOu9;peDki?Giyhn1O$WX
zF2CKENzdC;AYTX}az^q$vP0%rb_C*!mIvcJ%bvN0t!!&$Z{DmRnmXa;RBsX$-t5-}
z!u?$C4>h$U6zl$zBS>Tw)g*$O<RDGT&kBE*LqBXfgDdd=KA*{B-oC~tiJ`ho#D-EU
zp=^_;EhTAlF>5!D?<s33VhwR#f9JmjPaXADr9d>J<a$b+u7%?}jbo;lIv~Xdyu0J`
zAxZZZLkdLZyO5iAINlFmT9}n{OAQ=o+`I48O5XjI_0qd06-_Gc#%M6^EGlR{$26T|
zx^Jr4BrP7NHiN*w!=l0l-qOyHc{$9-!1@;TBC_?Oy$@zS@1#934w%`jVih&+aV<|R
zIW>w_<B<W4aso5qo*97lc_7&ftyX%l9<B|Kc)kt2`Hz^r6sL*;W5h+yd$!g6e~eK1
zLOIB@3cB3<33FZ51um7XR{f0L=Pn;4@s_mP&x<%f5Ab$eDnK3Z@tb&m;3k)mdIY@X
z%Im{VGV*XdbC<eLHFD{6d`ZNarQ}qdNt3*YwlGEpodD-@rrz0jkmvYYc#>50D~GjM
z5|`=`EX%&MnbFeKFW8u=?MPJf|6>9KKj@VL|7|QB+VoS~b7};qvVesa3EQWzRp<m?
z(SR55VGP>L(&A-KV)iI&9_lS%DYD^bNu=pwGe6Voi)Yj(m(Gluw2+XOxRCIx#ZvU>
z{e7pDYyqkvRT49(odviH?)hXo6SPvBEz%sLn4SHi{WHcRQy+OQR{O2yNS)V!O_L_Z
zNzn}p(DRr}cqa<aNkG$@L`3t>mXTVMoZ1>>{3g|`3L?|VBBS1I)30~H;MC@4<!3nO
zNP%H2?Hu=un<l>`#y9h<m#`4m{o|QNx<uN`v4jPD=p>s&8yiKG(fue?b=0TfJFUFC
zllyUvYYX+l!xa5bnDh2d!^M?B4On^)=ETo3Q%+m19Ihx5^c3RIN2TbU=n*yz(}43;
zN=2_5;}0hatSsc!)@ROWzw{1ofa)Q`h)~#Qn32xvnD^J76vsFm_ED3@X?^Fq@`vaj
z=3F*JpNu}ksm5x}bA$^m811oYn?t$TPAI77Yinf)oWeWQ@1I!g6ywNqEsDFI@x)&(
zri$*Xtxh->Rt|~0y7O<ovM(dn4N~@`ZV?Apo*h;Bn6MKaP=ZpaUAE6_fMIz<8f2DY
z3&B-rqDm6wfX_Z*wO$JTSHg1^>(n;)Z%piC9D|}lN3qJiAWb1(IK`RoyT*XazSV7_
zdypmg>nMFs??QNJGLpG%O)$~pe*PD?3AVOSeR1NZ7Bv$ig*dL0<BIp8l+^1Y!z!LI
zh!H#}YHw7lKzC0kuLW?{ivMy?G(_fk7<?XXLGr>+^%_?>Wj77YAdj2?AKm3TY(`K+
zew;2*xAOjJ=vf%)Tx|et;Wu$-qqC+98zg0Cz14TMXpJ`NPOIwBymh7tGmHE<&<v>@
zPu%{tv_r=40Qc1?3vlm)K*v(j5=L!$TU$E6*sVoK72gsi)+tC97gYvRzvCF;&|RDK
z(&979K{U0F!(CPXsl3byGHB{=t=jY})pZ~wYwW-Y*VjYWcCJ7jrQ++4@b2?)4>Dqq
z6d1WhIfGDL9m8w_xCQM7h3j*U2PE2C&};z?<k8^WlqS)9?w^oE?so$BK|-gP_kess
zOvQQRD5I(3>VA>)3*&cr<R6$Zj^R|);iNm9F^u2`sPGy68auD{m_v+^BEcdvKd3f2
zFly#w_PSs#YaXJmsIVn2LGRy+%h)hPz6}3M?3Sivi<aasj#TgrZ3=2<CfgO!nGC_$
zCU!(r#ni_ZIKj$tHr?<Vx(`0!HJ48EsH_pCZ*DYqX*Ekb0vzkGI;ZDNQ?*45EEY8|
z3k+hQN3<?$B(JU!+;&Z}$~*W8?T9P#JvJbCI)2T)-oUb)YaIzfU_V;jSZps7NTe7c
z;i8<Z`qc^@gi7XCooPg3cht)~#T`!O^LY!k_r!+>D}X~Qcun`@!4X`ahz-aeIYkLw
z_Ld-K)as;mWxOiYa4ObdN#wn80twQ>bMf$+YPq&l&lvh`%&o1g5-U@2{Dly*w*zlS
zC<H$9FyCHq(c{mE^{{~v?v5L&cwxC#W`7r>D8Vyh3+f%E6(odCd09Ef!uEVoK4yn5
zmTdKmGqCJ(Bu2j$YGra%LxF`d9M6xB{>cjQ;f}N8v6SGb;Z&rcD<3-S{YjY&Z5~&(
zrAGIpYhhb8-OzG}5$1a3VMpFCuI^x@xEU}75nW?x1EnD8W-<2XDJN7C?A89DN*1c%
zdaOaA(~a<E3U{h!QK9Q$5EYArwcgew!g9v(G0>LRB4fQ*%_5h+!0-Ofw_gBukrlsV
zbZnxZcQ>!sK5w*;&Q`mFT3plO9!|b3nGlJjNYxG8`aHdqa`>h5-`4`j>%tkMNyX^|
zRog?|n1jlP2BWY6mlgY9=Z*72pd-(H_km?pXlEk|>2+=3)U6W{T1elYf0KA#Nq6=(
zT~o)SHzZmodZ^TXD06k^(p=+Bfq>PyE^}S7^L+rr8+n1oqHDL0U@g2ub4QZNn%blO
zthu><OT<<I$qLnb+g?8tp`oBIS;*GPluOBs-8~&<<-G+z_tFMrJMDsp@Iyl`q-+*p
z&yt}nE##AmF_nyraiuH`CPJ>he?LF#a9E-6<3yOErc*e6j+1Uh8fHAyDzT@2DrKyJ
z2PD0WXz|ALsKk7jzZdcTFSN<Fe&)thEo`-#n=}D4F>_OHU(Sjn3R01aot@=u-XQg@
z*fs_FrXCVufGjY|A4}Sw)@<CvF-3F!!awTG;v~-;Zdbb(qq|c%?0t;ea1h1V{fSpX
z>%%d?!|2;dqrVtO*)%ATM^)xntdWM0L6F3P4uSX*wWDjPGHy~$lV;}~b8L#t+IyKR
zU~a=O`Kztzg_q=$^6H)LZX5?Dz5_pI@3hz+eLPvf7EqaTjmHmv0Z0QJJIA#kV%V4y
z#|%wm58M?FCyW{#U!ba<&OMIzX?#8P#!>H;2n_(M0&j+zjad_Kl%)DeKszDZgP}%3
zD{zdH)oWP8`)5m^D%s$uBM=nq{IeO$6Q{?lmjL{6a&v=D12cB)6uP$Dw;_>!DQ*NA
zcU?fVSR0o72_}(rbM(F)$4PK4-Hy}%iiD){>08eRsBsw+K|Q}d5i+PYpD8nHDS9Qe
zpj{G5Q1|Egw~(R^U}^#cu_Y(+Eka-pvR@<IES2EYNDA#zNl0c;_CkngPbv8ad{F11
zGR#1CetXM-LD2$0!0%v6JlrqWJKvI-@{}UTBkB3QrLdFSO=}7Dq8P#)e+W@g^*yJy
zY7*#P$?T!^nipuqJ)|!FnjfXK7Z0Z%R6F!w=I<3&vNpwR7}WAi{a|uPeA+!JbvaU~
zeJp8L-h(g@2Ngw(BHG}7Bek#n>y2v&-C)7=Z=@Q_4zorR))csx8)E>rZPENpMm_gR
z=w*hb>U=OxFSHn1u-LFT5LezIoKxixLOu6XIS)&y#$$qRaqf(1_hw1B@1?x5ScA~i
z2PcGg{dgJAxc(U%y+A$<!R+59E<1s`E~s&aPVoc#FO7<EyXQzU<Gx>j^!)(NSs)hQ
zE@G;;wJ3^kM0FPHFMpPw1$CF$f4AdCi)VP=NgN2>L!5|Vh3b7R--k(~ie;&m-E%9p
z%3;A;v2qEptM%44`Ckj?)kX2-5q|x(RdmBASaS={+@9!i^5&hs0Gx}e6nLiyG-StF
zY&%c>jq{FcBLo2NdMPz*N+6*U8v+V53SkoUP;uKrOOMD1bID?p`hsB)4PlRFC1Gxn
zw^Ux5#NcZY-eZi0e*fH~Gr7%Wqt?nG%`{h%o1G$HSrID$jq5Nf;#0$h)(M+vHUMt4
zrLw5?WyMiJBT;2<S&r_{!YA!}nnj^e3@XF@w2*sEWsvldCNXjYE-aejeaT#{c}E^L
zEV)>kLBD1tZY~{OJW!9ip+Oj-a^4LcSrTgzJV7q<u)xp(N4+R)m~T;3V*Nt@0;~B^
z#_zf_dP;`?1RaHloFFI4gYb58t4A5M!L+Hgj^+Fam>R@jpyZvDOq-4`7;9>`3gIFl
zu^&yWo3|_i_(vleNpZI&iv@jaN`X<gwLT~lm^#v%eL&ue{>ERQ>gWlqpkIS{-20oG
zjNhTed=)ul4(EBZ9fj+l|K`BpEyDIdE)yVdG%#Mu;=RD#m!$$Fp=p&T5rCSFvut<-
zN2T|$$c^IJT`w^T8k!q>>^#gu0R;P1r!AvBW=w(Zyq=QHgQYKq6v$9w6qGS`n@JuC
zVFRj)HE5X@U6xPYdZvz!g9=d3@P|-S*kwbDONaF?6M|omIZ3c_UBVUT37^;mRhvfO
z7)-kVg2g#`!Xg+^ybhUzG4h;T$w&e(X(Ok-k%D0!01I#+useQ?V@ZvB?SFA2XDQ+A
zD18<4gwHH>dVRsf6S;<`fy3dPsA$??DNnMCcFCpzO2JqRO!Zw;+3Dm=5)wo$nVHos
z)m@1CnGq(F&dnn+9<MF@SO#f`YV-fWhEthJHH-deovH$(;>SabcNh=%!XN70#LjKg
zPbyHQ*78TR&_pz0w<l`h=4N(@5^p4GV)lZlKhMc(XTCHhwx*sy0624nsrISxO%N5%
zFMm|(?GvA3h!fG;MH2m=B#6jPJ(#3ZX#XQ@sEHI-E`{^85F*W*PfV`_a9*RTaEY49
zz=azg%*@A^@p>xrEEfQ}D$XT_*2kaY<OFeui4wP@SW44Xeq09e2eRJuj&K3q>4dxG
zM2@}jd{P>RH~Patp@fD~$3`TXo<$&MXNgm&h%-~L;QCQSRx<R%O=a6d!z4=M`3R1<
zg}Fd4gPt_QM%fIH!0g81&Q8}&o2>czGARWQLQKZE>mE+hGKUAmTiTX#lgROS3tGtR
zwNlMRP#o1P$VXCcJLcK5E{gD5Uk9d#r5jwPqUM&UD9zWROuaN4dp9-~w*E2cbDRj2
zGgVTA@7&U@#9W2S;LX&%s86ko3^`}b7SkqMIM>HNT^h`ECRmLKI>uW!lcASV&zwaW
zJ029jC1kD@Z8;BuypChVx++^JL=oo#8ag~8J^<ko+Vhcw%_vJp8Ff%9(K@INZ_e7~
zS)eaEV3Z>>#jvV-MDKHrkSJkFOkdsTI*1q79?m-CwjQG%Ev<Ec9uUWC@lZ*wAWi%h
zNvsqHxt}(6{B9y@?SR@9=aO7A4><i$D_jhZ5>&jUu*vAWE8YSVN-+~pa~2-^P-6Ms
zEc{fIh5`musxWT_&IX2U0+a(71VKTPAP9qT7>=0g9myMg9oPVg8;P)jz1WZ?6BWZ`
zMs%q%1(OLp{LB=c&!N+*@6t9YjhaOA$euBTrtwr9RSfnc%oHc^$Kei8tlWsXKaCP5
z)jr`8$%+=No47%V_PuBc<!)}x6@=jJ@BP$d$VPtmfgOQcijJ(DJf~!Pek$m4+2n-(
zmbnj6HqWcn=`?Gz9{kx!x!$Q{LYv^FyR^SnG7t@)YG3br>KZ_dy}vh~U0AT*>dKAw
z2T8Lqtd%D8{XK^0fWD=sKKOAC*oYsetFx#bM4EpY34d06#F9mPO5UzoR4cK3UoW{y
z*uHO{+TT`#eBl!o^;Qf_TtB9O&c=CFxith$CYO>8w^T2l8U20gktW0jm@i5BbM-p6
z%mO&3x$2-ca>D1RZwS~)WJ=QcbC(rWH=_u)ocaf_AIlyIB)U!wb<a-lPT6>5K7D^%
zG}sWgvBa^`Goxl2Xjig=NA1LeTUK;jV!L9CKPx5p#<-FN?e&$V?X>$%x~?&k!c$q8
zYUy{>MvqU7-ALk@m2a8vIBWh=eKhP4?RI28(JBCBm$vayAWA7VInhu2?$io`3jkol
zU;CWvW%G_T*>xSL%bH*K4HQ#ui|=8u22J@J<8=uqsB{KaQ8f5C?&gWhAh>jix=|EF
z1UU;;&Jcj@r7?AoZ-2o+lrzg(qlX%=lUgIK;`w(?k$bo<Ry`nu4eE6lqiwBPlbuN+
ze3^HVuk>e_{iO(rwmUWC?D_kDt6Wefsr2Fei$wY%%`Ql$5ZKq6x`(nvP*QbdekggO
zR>&SRGyh#LiHYjExp3o&IZ0&}%mLO)1`)0OpB`=G*}GpWL0m2;A@qi1{2GvBDJ{{M
zia9AnV=3&9xyT_u`wTO=T4Bg(aOl2`Ca7cWyW@h~e>8I38q`(0g&Uezw>YxUj^(P<
zP47z!7t%`YGu|mC8EtRbr%Y7(^a_;sNC9<xWz9M{)gf;si|Go(UeA;W@O@G!qn2hZ
z#%=DnpwAy*$Q3xzeS6$^jk}12KQ&GQ#OyK8^_mN!Q6obs?s%0pXDJ)D)xduyQL~#v
zOtpXPXq?m)AL-FoyJb>~Tn1H45#5A#&=5(fABhBI-3d0f<H!bVR1#5Np%2D?znB|I
zD}nA3+Ie5s+y-kiVUfAmcNBC+uR?)CA3@UPM?v}5I12tU(<xBNJdULKy7JJPYRBzY
zB=~qB%w({(BOuAMS3zfvJ)FJ;#+e=)_rNgDY}9+)^g$&vr@@a>qop}>eyri*ySrne
zGWu%W0jMyuAgR3@sBw5*AH<ZKeHH=C(a{Q=jc2g0U~D2Z&LKBO@TMtZp`n}}5Dm~Y
z4&n)W`*eM1gYg`^MyZ|_vft6WrL~~~;n;Ppb|xrE1T1e6B7&KnFsMshXQi@hsV_R$
zI{D>7j=d`c?vHgaIi<YKSNQOa9HDM2zgy&s%<I{C1M(_0bNXiH;cV6)SLACsbR@H2
z&Bgh!$18X^jYGl-NR0kE%^j6uHf>{xJWZ6Sw~HZhd~S;6xhsxQ+QgvDk4OoVbT;2p
zxSg>AyzR43N+!a&uNHVMoO;12RRiS54^J|v;>Bw3x+IRqdG2JA>!y(f>j@vPmR~`n
zPTde#@52e@yWf3M%KVVb+vADtnX4(?$-><jx|GYKkg$XW<dgYo-V9!NUcB#oK#KEQ
zm_!uA5bt4lZ|bO#qH<QPy4<pSh^#+%Knh4?wkL;2Gwh62GFII$0x^4OUHD4o@jE5Q
zhAl_w>DjO!dLk{}JhhTr<?y9UTxl6E_Km!bPHcT3Fz5^9^0E7)x<=G&R%=MnDWGuP
zY-QP3#hEQz8?Eev(%Riw`vgzt0dmxLS08>U<o+^_Ki)X8!%dxH!Jo|9PTyOn%a7%`
zr}KSR-@hSM!JtfEbp;4`^<^kpEm;hLIO)Euaqg~Fq5r({U7f>_y8VKg?_p^LUuy(F
z!Vq(dfb8qTImpZ%Dp<?Ap=#-wfy4R24{+U1Vdbi~e@K(Lt5)@;fD&<5ey3RmeMZDw
zu8@tQpKbRI1BJlfbj(~&JgsRKVP(R9leHauY=!7R-aMFE=|5AO23cEX41qKOYRbR6
z=PBS$)>xF-s7pT@)Fy0=I?{~(?&?lyC<1i#3YRZ@95NMK<!uBiw6$JvM<~(56wV^x
zWQjZ0GKz)MZI#aL!oTKLPPHC9F(xHG$%eb8V%yp9?NN^zFBhs?bdKipQxf+}%vTvK
z7m$Ir0^XpmJ;zUjx$C@i{#+hNW89sI3?NN)H~C|C=)R}-bXcuf<=`UK3#+V|(xw5j
zs<vjc@<pJsS1g{Ya!ZfXJ(Cr)==Nj~DVe<1s?Q6KUcaj1->mimNt_eX`Twg=LJMe1
zU_5O-sMjH#Dd_w7r8~hEX$A#H{rF47zPy9~<3~Tn<pfD5`mcrw@`d{vo<8XNPsaki
zv{wN6-$SnwOU|M|lf%Eu{8M7r&n7-FV4y%#x_wXo7W5za4Z`bDtz>AuE<Zm)8Qi9I
zRrvRcX(biwCt33QUMHqSD@YgR`@gxpK0ZV3h}rUP*!s^GD;*<xRW0Amy6a2#hPn6a
zoE$9M)27K5IiL`1z>Ipuq<7z-v~lM@eHQf69(REZi=68JB>AomIQ3o$-Hyvr@y`VQ
z2n)Iw8`}53zfQWUDi<_5&62`F5$AuH^*97{L^!Nakhi>`Um8+?Ei>)jZ|%zcKg}r&
zSdoVRCrWy0;)Pq}oe<*G$XS*DIcaHC`oH>1eBPG-Vc>EZ^MAxbTAT(p@!y<VNhkf6
zO;W7nzh&mLn)%OnN}=#z8UM8`U#Ih>-^Pj?`IS2>8chmm{_h_7Dm!1a@z<U8Z}t3D
z?|eDWzG~%vT0VWYlfRx>E5@<3G0Fe`C;F2=q%9NUs>0~3RtdUoBtiGgoh|$0*vG_Y
zK_5Z8cg$;SoWWee1BwwlGG^B4iDRI@g$=L4G5rs4Wl(zI(Q1F5b1MdU0a;NwFL^9P
z@XU1DgfDHen&{a-TmgZ{(Xu@kH@Yw*DX_$JIM(8BOpCLb-N|d9@+*D!J55Z(o~Y&_
z-D4?up^g(_ciM8J+sjA5Zx*ic{Q<;6Fx2{SQ<<Y0LfG0WDcf#04nlTzkB`BkrKpdG
zqSs5P21)RLemSwB#0C;QY1kTp7d;#Uwfc7h-cPSD-ChdrwBBKNr!*wGYHn;$t7jIZ
z6F}e8>|3!_QDKg$;VeiA_&>N<643vhQetD4yHy)>HV0fN-Mra0=M-<MyGz875&~C~
z07APE(N&FFJ;DEwIa}nE8h+p~`2A7vyOUGxrWS)A*Zb80OdsGx=Ns$6+zRlbe~n;7
zEYp|;ZB{-{#bn-0`Xlg`AEj?83aaldP<6a@*Lb<JWnYqfVdo|3BiPMQ(IK30YvuOR
zzLkN+D+BfaHBkB}!K1cKcfWo5(LBK0KL%w@mgi*h_ncfME04e%XO;;CzFi@t`!}I^
z=*pv`>20}EB5m<2MEKH0T>dau_R1qbq+^*#!21;<d;TF3wDJfL$(9nSKe9rk?jIu5
zl}CWc(`6$5eJeyX{~;2%@(2*QCnfTDHdl>#<z|(+bbNZ@#S0o`zEPi9yxUv42&HZC
zm1Vl{H;ePfEk3gt_~(GdT8^pWH=qSs%zneYCARIi0O9R+QW;!2^?Is11tk3IoPnsH
z^Z^v^6hB-hZz=}TzuoSn{{FOn%*vzPcDtRWZ`9g7%e|D~Tu75jYWjA=Z8CoN&yUgz
z_b(H9_;6WJOhHSnFGQZKJOV^Oe8;ZmeNOW7x2OEG?(=>|U%u?~kg}B_|5_-&nlD2R
zNvWL4>HHr<E*X6m(%qkjFjt2Bi^-R2J`YijSf(NnHiWhQy6I_lzlO~8OS-Rwk^<lk
z{nn=77Q-*|FL1^TrEOU%dzVFeVn#q+T^&ZPWWN#ORMGh8Kmhr5&X7FbZWn@<uG*4p
zT@}f>pLFtHVvh&CfA+JfK|E*##6G=kSy(|#@m=TNObn3<%CuBN{PFc4D{}RfC0~W%
z>;CZjx(&W=gRk4*>o)jm8ho{uWWH{LuiN13Hu$;?zB-CueP<AQ`RW_|KjIsV2Y?O$
z7E#RSiN*6tt64aJyWTg)4i^$L?$)BD!9l$RUddj&d{I}TJ`t_kqpNPDJ5V!sqZM_^
zM|xg7mWIPlPU)xJtqg$<7`#Pfko7V#cEflO;p$nemv%z`U+leSSd&ZFHjJXObt~w$
zARxtpSV06tN&+@O5s)q*pdy`sNGAkTR8*>>pg@QU(u?#?L=dD#YG_HM1`<MmkOUHv
zyc73*KlgS&_i=pR`|tg+^Xod2D^u3YtXZ>Wt@B)EcZ8f*F6<SB=}Co+XaDbiR@k#=
z9(J(Pj_@WpiE^>fd7(r6e^(|`Ow$cxE%+|BY~i0iM~t>L-if^nq|@>pXlhCS?S*+K
z;BEf%g{q`{({yympb9AE$S<Y*{Uz`M-{<<DYPip#mq^Q5z`bnN_4Cn%{);1Rs&Izi
zIKCryD(~l`1>d3gp8}$vtN*)z`Jaz2Dtzbhe>`znS^rZ&!OuqvrC$m_E~Osu3+6jj
zb991?UZ_K?ar~<Tb-qXTHB`{muMPgZZ`PRaXcwP?fVy1#eyxCng{o`Oph?gE6h@gi
zeb;QeFp9YB^7z*m-TF+^TkO0O|9tN;cn`?0AE2-PXLKzJZ}FSJ_sp7?{Cu?L{L&h_
zIOE?^SCRPn*#Gm&;osB4qU7BF6j1Z?(K_~*0#qcH|6M>?^4Uwlm#3L*T#8h_E`NSW
z@@0Po^`Nx6)A!$<mf|#K>u3J#IO3O~>4#<fTe5VQpN|8-P9X{l`ESWuat!&BE&Qb^
zW#oW=S7Jxk;7hjd*9sI6|NcGo<Ij;n|MGvjKI-4)JJ0f)GVtrvh*i(jLrU?lE=aaS
zey8ajf0gw>TGvsNOkMus3&yJPtB3r1yxOb=R389F5)fGs#`M6et(y9~&VwJ-+JkQj
z{rsM#6z7%#a`93eA)ojxCjtT-F+G(o5R%bVEHw!DO#p`qaKei_Z!$URY$Y<s{{j@Y
z$s`)gzE>rALjFI$d8Z|q-Td}}8K_WD<L5Wufe(5Dv~%hN`2k=u2A>&>c8)jjMc+%H
ze+GQm;Ir&3(|`7#=KPe!KhpVU?)<Z|{?R)>mBIg)R=!!l0f@8l7v!(M2BEGyL+3A8
z%3=cH3{>Y!CN<Ftsa1YJGYq94AKqoNx=bm-0Lq2bD(t1VVSqFF`R%_d-TPJktxG~L
zGwW%{R;o$-<hB+<TnKhVNV;l?%Q?;VCpoaw#1S5sR<cFx-p-A3CMWab4>3K4-fB8i
zy_~sLAk5_XUlsk$U2s&{+U(97msW_qo|o+c<~~f8#i!B=B9(Zyqz3I_!VQshs-{oS
zJ-ue^WES9%8o(}j!|M~!RNJpHiTrrd=7zuS6Q`b=GqsZD-rjY}+?_0S+0eEUx|-PQ
zbu{G8EdV{i>7;81w;(iL7KC|PSP!wRp|G(hpv3%ECR&4lEe5fh_q|X3b&HF-Ex)N}
zzI=WZxi6?SX|e@+_tH{S6f?q2F^*x`@}RT^mR~r<r`}jwSqGkW*xB@hsMybE_x^QP
z)KSC&ey+V&c-+a4Wnzs<Afv_}2Z*Z_UvVe0D-IDjF=Nm({J4{en|~Gd-b;Y~qe98E
zQ)Rq%d|{P>Jstw+EGq0<762^%p$Y<1k1#gfv`T*IEUcDyO=?pQ7eGvKTPzc%Si`}q
zW3-pp()t8|9oFQYY*#tQon*kJT@hE~dD=M&<@E`uI_!@^H4hMqdUM||J9Zji9ib47
zjIO7Qu4*$}`vVOw9CTF?(_`ndw1+Xtfc?oTC=7hBv<IdK4EF||pRv(@Yx-A^|2y`R
z&_f(Xi)oSLl|j@lTN{8j0@k1>E7qYzz{VgX6%^8@0NEP+k{<y5zl4@3=-Of=8R!Ut
z+-*&tye6y-KAaTu!f-V}YC$PlT_jyn@gBY|i1?~E9i;Y`DTU_!xB1`=vK#Gkec1(&
z2|eG=oX*w~Mo!DwfnA^}NvGnT1m^dE3{=I{LPKRQkdFa(uIwxLZ`0rgNMzy@>BJlP
z@yM5#iW`X<m#p{m3ppM4<e);GQqXuSzHrK(^KEUQC7DAE|8Iq)2+r!`!-9$tmeke~
zfEbPpslXn{-zw-DW+1L-Urd;4y%0N}x|S%%`t~(96SBkezl_daKqDnz$7x7sZ=dbi
zCQ{Sk`FO7$+r0-M0ZUU)N|Xa!mjGV-oH&Rd-YfK1GwbsaFg@lG(@UxCbDp>=jUa|y
zFWP_q)GZlGp{wAm2D)4m5JhDk=Ftxg4X~_3yJ}b>ssB}?BI&$9QqSbGK5`tC4R~X6
zPQ@{>r4N>=Mpj9h+$O+_z=HCpv#i4})A?(qP!B=N$rw;{%`;^#|I7mcgm6RWzB)qe
zdxL9!rnZ8JhAYsud<cH!t;9=|+DzLGFZ7Yc(B>8%Ke&J2=~XU=Hd_(3CZ30^NThqC
zvuWOF2%8#{b4+ly3086{h<sT;*fY7Z&OTuD!{lRXUFibmS;jU1$pB3d*W)oG3TN4B
zAa<XnB~q2aq4Sw^W~!v^>CfDW%SFe1p@rN$x=H{@Oh$!<eL;mdc`pH|Z1WZD=+#h~
z!|yM#QZ+{aBw-yDBOS8DnzW34qeZMRemXMCjPXQp5Z;$Dlx2l{Hie#Fh?Wi}IDQPg
zx=A4EZz{@LB%M#(0tBedszu0yB#2%<a)=Qg;QUQ~abz;1OgPp>vo9vU=?|2KokGzW
zPZl2{<SAkY@ih8KrlcB=(_V3yTrp3o!fDu+xalwD?Uz^FCmnDjBXBU5eQ9IJ=z9PV
z5_Ot)x2<QAk44}kMhvwLW0p^TrdgDGB_9AZ>)X=3xO3x21!sRJ1h`J4wl!`|Uv!SG
z_BB}g<^bo0Sa@3z3JJbm{Fz?nNzV4l{7qqqx-^N*FRb#y1@p8~md8~oE@-M&Ep@8o
z^!jGvs-3+}Y97MH8N(qIRz`Pu)lnC(^G2B+_-8o4c*CcO3#+K-_QWn);qGF}C*KWB
z%tSiR`mYz5`J2ie1#N$fOB|GBsOV`-OvZ>ki4XmX7EK$>$~<!+N)?y5C;Gh{`E-Ng
zrozy7esH6b-CNb;_AGi!_pvHz!Y+;g%Hr-CeJ5(9cXWXBe4Q&l=mjyN3<KJ90DF%Q
z9}&jan;AErz~kyGZ`v-^GPm;D_i!}PbQRIq-6H`I#Z`r^mZMVA>S6uY&;p9_du6cY
zo)yMWOd3D)26}Ii^hLLoN6RLUpkfb>!YCuIJRgh7K6Qap?!W5Ny#S79Hg|qj?eT88
zeL|Akxd1Jm33)c;ik;7V$!A#r=wR^TlepQ)Glwt;rb}k_CNVwq*)W`TW+!;!xqXh+
zzz?Lw8fm?2Zs7>38NPT8lZoDO+;F>LfK7{lj{(`|c6(Y)X5BWgp@q9k@%e23zOgK@
zoHGjmUeC81V2=y!!gI6|oyGMgOsbEcp@&{Yj>B58^k!JBfrc<2`wTIzL|tJf%HcI9
zwyVuxNBN1gh}3Bb&k5SnwBJZD6y5W+wZAgj6U}_#%Db`4ey4Xf)tT~|N|UYU)|ao~
zU4<ws72}~pwG)f3Xs#!&5^*B&$R+{OFDJND&%v|@$(`LaDysZ$qjp-?4$=IseGPz0
z<NDI$Ao5E~#CUawbY4sA7e3JF^iyyANoK6__73GZr|7hu4sFwu0FdKwgrQxMYR9s8
zdIV;{8_mihTQdoLXzXfbiD8Oi$Y^+UkE^4&o<m9%cRoMALUpzIaOAnehWne{PdU|5
z5~ZPN&T8p?2j3X>(v)t8v}?NSuy!yT5xcy`c0MtDigNVx>?S_k-b2Q0b60X?VPYVh
zm+2>+frgHU#$wk+V-Izz<HQmTLmS|_(uYLq?wSLjiaQ>efxK~dcEE_ekEs`tpOj3o
z7YMq8?JKPM-Lnpj*gU*U5NqOTPLd`II!%pqTkcCRS7Q-Bo_Aodd(9_ad9hzsAU1Wh
zdxo7_ofXuD=Z{xP7ueFSE!`nWMi!#u_vE<~q^x3L3K|}E_W;CFyq{R&Z!xj6SZMW4
z3$&-e{b|Ktjg}O!g8XN(8SM6*UP%l>tnvQP&nW1Q-HA~Mg6jO<6_cvPVWi@wbV67C
zh1%#C(C6i|;&Nx$(QkU6#j?q&j$xyXwU|Y3`y{$I3bNKB*#@vhT3-7NFZ5dCkhLy^
z20K&bO{sg|^-dUX)#SsYU5M2Idzi!86*PCo1|3K%MVWFo^#Fk@46$ZX-z#nE+M6x3
zn)J*xQy;4}T8)$AE#1+zFL%n)4~SSv(x5eGXTF%Ajd7d{_pT%!9p6CynvZ$BJo2pl
zn=m_a^CA>iTF#twiE5#8SxfIjs}45zD0J8)&vgaDzW+o^eS3lXK`$h#eMHV&j_~cy
zqP|#o>W}C`^orw)WuoyYUI8+f^j=zNodD}^q5>QH+B+UV;h}F;UkvBIwNpC9#c!+_
zB`9rgn*Gez;cvr2)fdaVjOy|OrS1Gz?#gXqZ%c=xs@7(UPRiG<(u86|tG?wiRiN{t
z(QDpbNlV_b_e_ext{$T4&CbwDMMJ$=4+>BK$ZYmi{L@7S+BvB=&I;HK%@p)P!P%-2
zIGgu_Pkl<01R?`CBf-H}qp&-W^Sj&<0>g@*bXrOUQLa^l)grz8>lBPr9_^c=tB-iO
zU#5;cA8{G%eE~-RS|Y)5KBV6ZDCWY}kBf@_Qkmm-+*y7%o&S&?*?s(s(dr;~I$ic4
zg3G6Y4BoWl!X=$-Wg5|f%LN1)|E7O|NCsr@2|?Dez^(&}&0Vbiz{gI1(ehxsoQSkx
z^eshAVOlsR?}73YJi~oYIhUwe=rw#2I!~q!Sr4|<!H9ja@In2piMM1pO&{HZ4H3;}
zcP8HGqy_CuJYZmNL4O))DdJaL05+dn6#ei1oW}g|M^jfT%mIW*n!mF^%IqJ2$jLNP
z1X5kY@mEKNkvSJ)N4;|tn+cVNm^Du{Kfc{V?M;xZqnd6lXsk7w1*w_#pWJ5Ri>&zD
z3<Y~aa!N%@E3_5aI$>*ne38y%P3)Np4q+uKdAg#J^L&hih<cuYK=I$q^q2?A?)z-3
z$Hv|_NAMxxCM#lV{U>+6#q|`D#kAh=S_KRCt-QKEpbel_-G{wsFQ-JN#m#%h3D09|
zp0*ogD9A}j2h?(I8MZ{j0c^B#0D)l~61olk?E48z=aefjG}NIP)!FliUk$*(VKB14
z<Y^I3LgJbM#2RzKffBnPuak=1wvEr|g(2#UhH3fySP;C)cAuYUL_#TY0RI|N+rn0!
zIU?o&W2rm>A=QBj5Ox^U4^gZ{5AM3O?QJ5ch_foPEiBtz;J)&&2H^BP8BXucJ#rPW
zQM}Ul#l;PD(eb4cu`p-(rZ**w_s@D$kx$g#zXjlJe&;44Ru_5AvL{;T-kpb_^Lu@2
zwC3wD;`4V%z>K>T(DKn%j(0CNu&#|riTAor4g?2|%#>oz_toP<Qj%m%KFLmGyp8Hr
zL_TIEM0}ZU-7DxCfL5BEx?9pjWZEX%#Cq9MC&IeM$i+_2n691Sb=2N>h0?5KX`Am#
zI?bEu-uC|f4M`Ef(3Xiiyx*NGOPAi+`486K@gX%)fR%Xf`7VKPoxh&_ssO#^a{p9-
z=2^$9&zd1I{&N8gNl50=iQ>xe)bm$G(vib*Vl8Kzx85d1#lqk0ESvzy`04ug!?fK8
zYhy^h!Zn|muPA_iSYqXlgCww4!A3CIGXmEtFl>xUdr#0#A_Cq8eo{7OGd6H!LTV7t
zj2?kYDRfnaeqzo}MPS_RNfo_7K)ewai(JneCsVNzAqM?FQ%r;Hd{hj@&@O~A`v5V4
zcgepVgaIg+9Y)bkYrd={W*QLh6(QP)ljH$8%YsqODL;Xl$lfq5-uuPav@vir8&yhg
zk_{6=z|f(Bv%Gz`PlzWzi-lv@cy49H-Z%i{n8BMj&d1;m$mfroly?_zGzth8MoviS
z#nyWm{K*eY_T3%^%zWs|!`H2?Sa2Y;^e`;fWCdazE(Lhs3wYzL3}~|L;U4waSV{t*
z6KFGtJp>5jYBS{>uFr8(p0{rfBM4k@PSGK}s7|4rRVadw6|>>;58wbKV>cAqf+aBe
z+%NK4o%bYiMU4dR-}}XN9CZK^*L6uzcwZpC?Y;bz`iPzP%3A9CQ{u}J94o<DmE7_}
z81cI|B{Nqld#P-hLg^vJ0-$aHS`b56u8}(ue#O3-`7}}p9^DJf3LoQ;lP!)Bx<N=>
z-UHv;pHIw_r$w~Dn#d*7;3Hi)!RQwyM-hK02hZ0C!BO*9ZBv;51pnAvDdiLxp$6UH
zu+=F*(W!YncJ}xAkSyn?CrK)X>+VmV{&iQC2LRHVvwU8KP{zA^DdH3c(2vN|yP#p8
zvBe$Yda-EI{FRh@KpC+ANa%hi9k3Uxo#YpUJEwrq$W!RBA5r=~T0A!PU{ew}yn1K%
zo-G=Iu7i$mZq9qK+-pgIEVNS2tzj+{yajODY(EW$8>5TYsqEzoY+*(<5>-1spBg{k
z%_Zi&q1iWotFE2*uw^j-!qV*O)N316PwBvGn*_f7;;z~I6(EAx1k8KJUW~A-%s~v{
zy=}MLy9S^NJ(eISm+$(MPTSJM{KgGR)Sv7=+FUUIq{@s0sEq;GW2SRy)Xtg`znAmU
zhE~H$%{t*XGRh1AQCe;7oz-v(_6~yMjTK$;z5~t?8uWxOVMQ_st6?w}w;Bg*A+a@R
z-x(D_L}%R{bbEZKMuuJa+Cv+v5kBP0T*{A*d!ti|ee<hHZz_V@^N<~!n)t-4tC~T0
zxDzpPzrcN`U-zRAGgz5zS}XVl!wa3|Kh?5|7}Z{jEKQO;31BJ|v_iPw<j70UnM9SA
zJ7G~)10SLD0LY7Y64ys#GBnsRRvJYTOh?u$7{E@e1=c^Hs%m$llm-lFvvQ^15~`z%
zd23nIw`C+5?(_4V8u0mC02TfTi}g%iS{-zq%8+d3o97^B<Jf9EM&1*R8(K-xAOb#Z
zx$4k!`wffs1T9sJv<oMzPBrC&WB)h6TK}J$i&M`5L9mzesCw?fE{~_!ZcYAzQ`0{q
zYneZqGFn3^N{w~x1KsfMIZnpxaV`JZcFV%y9vXAJxWcl+GrUsL=>ikIn^P!)36TIB
z3n#Yl#BsV~YRRS^X&mqQ7oi~l?-9uP9@yDmk~o?OZ2sE8N|@#TO#cXgcne2+vtPBO
z%s$uu(R>usyQjd2p-wBG{20;MPOl35`n(e&SLucOR7Y2N%PBK`G_QDuHI+iu68P@%
z*IS$W#%4h>8~|D<n@Cu^`I0phbc>(t9TeSW%;75j9^XDJ&72GQ0k9)2J(6m$BOQRn
z%pN2oNF=(Rye-42OA|euILg(=9Jzi6AXbg3YL&m^M6OS(H}W1{2G)Qa`tE{xKBj#x
zEDhx-A^o<j1$U00*BbQe25tNm=m36he<w@(3_vc=ECUql(YJi%p`L=XAjgHKFOt6K
zXIjpGi%i82`)GCP05~y8#aF3-?)V-c28dC%Zl;8GI0ndKMw}Pg2Y{R8{;^**(+4-f
zS&0}lH0X{c^~Vkv@RY260jU;*P}j>#)efSvd|%TA5#i%hs^lAh_e~utRtoZO0M_2<
z2s>m{F=maDm;mK?i@?QCK+ag)lCiDkj-@iy>;e`6w~MSacVIMd+D-`_yQydPBY<zI
z7Mm=yjZgs|i3n76J)KT(nj{SOmJeV@MQ!YT!UFD*-RCR2u%mY?XnY>CszNYVaN|Ar
z#mHUWVn0?iqjxe?E9xyai3NHMeM0=u-$w|<l&4m#PLbv8n93Z#(>6}DM^J%lzg)tB
z;dGVZWD6EvEvJ$sPw>xRY!&)aswNv>r(h_hZ+p1n1i*RWM3`PM2pOe%AVvwi`Ef1&
zvYJI#057C0!M0fOyS92AK!9GXhb+&`x1trhGbpjLRCV{DrP1~E)Bb=f54u|=&QMMY
z1K6ZLO!ivh<26^lO}s6%3;`^Xn}Sc&@!4+@83;_6f>CN&V)q{cS(|>fSOA7jYFIl5
z5^kE3y7oA{P->>B_bMO^aevu@IziM9=AKN>0H?lsF93g6^IULtHgbTuRaw`z+UcDs
z(x>&$1`=)*XA^114WqeK5mBYv&Di<0Y^E!4?0PEpaHpQBRv5)*D!i@%0Ol{9F{k`f
zLvSp>nGENSD<%@A%;W^FiT!OU0B~qZto;a0aP^4%1GTxSJ8VEUOGwguVZEj8R2<iW
zJYgtO;k9DseZeMVbatd{i{R`zV&PmBx(iL`is>S&oMe!80Nb5!UktGO*(yvv5!R=j
zZM@;&C<C6!7vS}l)EcT58NY|di6Gno+RatDUOrG9rseKAGTH0QyoSL2p}%>H0eaIx
zd25`{2Xd{=yuxzRO_r~l*^>v$3sJFbtBs+f#E*uVI$(uP`0c6jqS*p$U%LgoK7f9&
z+^d&qIRNaBcK-mZf^5@@l$?ACckW0}rfC|$+1@Wj?5XG`#{wKsnKihs!kpSh3HvaG
zVP-KOUE|uB|0SHdWrk4vyulc7Htq5MK$fMVHG|I5hck@DHudOxQYD9kkF8AL6M|vA
zSpeZ~tA&j;KxO1D`=}<6e6V21iiOkpGzyseK?|$7Ti}S!#5n-(>ZnU~Pu2kzTO&*Y
zZuEkSwM;Z%NA6vuixxTz<LpDmGEBni*9rLkO=Y}(uspC$gc+sf1-<2ci%JxWJhQyj
z3JJyuUksM1sOtJuJgc%-Zs-G;++%sk^OPW7yZ>8T!P(_Dz-LwKX@lV~5-^18g9@@K
z#dkTc^n-MPA*BUKlT-C!()Sv2#H1VRs{<V{E#s$a1hj#G|8gO&WBmGo?-WNP7?0um
zug`CK{0w^rxmQ&ctT+tX_zCzi1K)id&=ow5tpVg|@l+qyL_wQ2>&ZkRwF;M3sTCP)
zI}ENadXJNVqoOW$c{HX_bE*3Ld<DS+T|V2yE_Q{J-3!QsBO^Z{_?^}q!}*S>cx3hn
zqaRf%zdHX1mnrza%uRF1IqN3&D*u3oSlgLql9Ew-@9T8xx!fo@J-&N!8rr!>I>0%w
zlU11uJlvN8ykG#96+KEy7$CONm`539diJ3!YYYk<5IHgH#lQ@Dy)&I>^_jA=Hh{h1
z90-|UJu9r5@5MOQG|dxIO7Faj4dR>gp1C%v9!7R6_4-P@xvZZSeGs`EK9MP!$fAh}
zWC{OG0i2HGG7XsYH5o3T)b64;E(LC@dxllv7#4%<*hx8&%F|UIOJVc;iB2wA@;2HU
z04S%}_$o<tb61&8^-C;z^8Cp;lN!aCawB#be!c)_BnwCRjeM>^Kky9(zCuiG5woWg
zRmGaWVUJl<!3Np(f=it$z@m_Iw9rR=Mw?Zb-$JzfdbD#r6&sjBu8$t4tr4NV{n}Kc
zfulWMqaj|mm<~~C5*3tS7MTj+)zz9Mc5f2MY5mm<0H|Jkw|OeICQ>>9J-4uW5Lx|v
z=PO*=k9tC78suzx#Fx|H72vW>)wc)EzNLd(Se2O6l}d%T`>tw$&TK<f`gXp;`bEVT
zX)UCN9PIQ$gq*v_n>;%_3l5@(0mSK}oIkt7tEa0luVb-3A)OqO?w%-L!q?XBdBtT8
zF;6eG411~dQUy*6m?dB_hp-sx)5SHLxSA<l`iz=dgn9|P-FXoE2L}-E9*#A#%c$*5
zEF{F${-|5Uqbs9=o%d08p_@#WH=7H*3;NaBnFY9TGCvJKOG}6dTfYBV2(L6MGG-4<
z`#VEVC`KZe6$8KC+`+2=+<KJQ8aks#n)zu$FJ#nvwS7Le#^;Y*0LeD0gUtiRkN=02
zy<vbdJs#W;AZMGh{8ldIW=0i&V_3tV8e(y^bh=?+;x-m0mUx}pz!X;Ps9ReIYJEu;
z(c-9Wk5yPK2S}WA+Ty7A+5JjVqI~E2i?AIs`0282{mJINYwpsLo?C$v?RlSUc-mg2
zFxKY*Ea85vEMRX&06?H%9n!b6TLgA}{a>TFAMsrIdC>xo{l!439;4;=<8`ZZL3JiE
zV#T}d6I}b)#7|Pjw3SNUy*SXzdW8DK#C+73_k6s$SS3zyzVVHo<##lT!wSH;q$K=t
z@eBj%6I2}PPR%ZJ8T3~Emo`o}dZDBEl1qQ4iU|xFS*eTxR6ePNLxH$%>TK}Uz5X)M
zEgxjbjHrCvSJ`)3z$HDID1uV`PP9xBhb+C+`15v+xT=Np*I()=XnAsubBF9u?+T;3
zSLiI#!4*gDOHnF(HOfA0@eF>oY-%TZ`^(^#s5AlX7k?X8aJR&FlTYj2<=>wHPV_6>
zRREoYm8>}u1Z%f}1~}aN21-jFfF&;pGV`!YCjbwTVG7!_ZFBw+LqjS5G14T;$O|#r
zvTemXb5oo;xRNtWbwnPb_;PR~!xiQ!hVWkJJ#xHNz`(vgpBJ`<Q7vylwrag0Mdpu$
zzA^>r>a(u_W+Dnz;oqik=OWF*%N2EMo}0uj0d`V@Xx`O5&QXu73U8^m$@)*EPruK{
z^e<0&)I@qKN*x!5LH2N4okf|oUW-B8d~gZ@mI)kw(fi&q+8U*RL!VX5TVb`UUml(X
zUO-u0KpPpTHI9hHU;<N~^Mbs|ya6f|;o86&O(bs=m~r~$PU}+trk;iOG)pILTv#06
zj4H;yt#C|Tf1IW*F5I^2jV{5o*d_v;#HYRhMqH;JSzY7U*hs-5_R%?jbFFX=Tr2Vc
zW*N3dSGk>I&*PEan@97yy<Y*GK)Ylb*p52)dFdXt^I5KdhQjuvlKI=+Wpxs40GBUO
zAqOZR$D-u?*9kmv{IyxT0dwg~rhRHkA5q!WLUDUNRU+UJu;I89dP71z+oc0iK2QRN
zkJ*Ndvbz?%u>eEs>Bv#Tp6JuBnveGF?WV;<0+E~FlG)~cd03$X12sr8-<rlo*4-X9
zZ2{DrF_niX;D$jX=+uNsRk+#YsiZv>Rw<ux_3kT$=(F!@fQ1O*h_?bvqhD-m<?iFc
zC_r&P*^13KD!5UlHnh6ZbWO}CxX_b>@lKkh*xM$A5aQDGh9Deo`w><p@JUEfLPl+@
zrI|UM6ztv*Ha5XPBkIh#6c;w%k%g*br7|eK)bf_#=Jd0&;wU-5qws2tELL$?OZl_=
z>z=FNbO=z&SgD0o&lbHf*wG{gcGO3=a-WagV*OV#F?3>@JscZuBSn!km{=;eEaNhP
zmNj6%EJrVPZ}eG;JO#XmVOlkn9QALOd4Z>fz`+XhR66tGL^*KGhp|EEKqP}s7ZT`z
z{&nBthh_W|()Lfl-#_7y|9^u;Z>zho1O!U_FJC-o_D|sGKVh~1j|3fm<`M94?M}~K
zj1jrrDc{{?4)HLX>zI4i@89lrDlTrj%n$AJisjxF-b_DgCG#E*uE1n5@NjA!)5(71
zY<DIK-;dBODXDp>V@<&`gSvtYztHQgU6qqwPiMY8=W$})QM1kKj^39mcp|yuKOYHw
z?Jef#wYU6umU~P0;{SY_n*WG9|9X4e`oM9w!T-Fyqo`;@`Zd`N=>n;h;{N~h_Qi|;
z6c2>-k8r?@_<v#MjPekj#^Dc@Qg4)E4pLFXwS5-U9b;9BnEnTHB0ix75|Bz>$7B(*
zn72>j!0p%El>xDaS)=9h!Z0{#;fIK@ci5gC?1TuslH6HbB`>(ewJ}_4?h|8dDnjHp
zE_Zyf!RQP8Yj0Hf)%w}W{SDG*xrZZLDGGT6C`Fc`XpfkD_v4Z7G_^)JCite^-Opo!
zNYtf^P3iwxISfzBF@n|&_5CY_BQM7y*ZOfKX}rS(M6(`|z}(0~$46}BF~iEPY%kVa
zQ_MX0PRSN<yQR^;5)AHw#!FV;)W2!g_(QtUfks(4f3Yd^;W^rwjXd|Y@4Vir_=j4W
zldeSP9YtPh&bawch%6Q1{r2d4_ZD=~1@(wPn)ii=WS#u2XQ-k3y~A8+TqWJ<Exx^;
zJVED}4|PpYqCN7g@*rz2vMg8THw)N^MD6^Wb6uDN2X33JH_7^Ay@`O)jcssM7ScU)
zLq&{@WQRSv#{bUjwNrtVZ?7A|MwKC3ENn;c(y}rXsm*#jb|~g<NPjx`&G2_Ul_Xla
zuIL606dM7HO^R2M>1P;itw0}~Vr<qcQn;f1{OKF}zf@6?rA@1Sp#PArfhv@Y))Jid
zc&?KOsN}<5-Y<n8k^vIU`y=ka?SmR8W%}E56zcEbcbt)P*ADLdwtI}ht6*UB_se{(
zKeF!Vf!m>*_1<6kO>dp1x5^yuT?Piny+Pd;(ye*g;ljdLiLM439v1g!p-mswzR2!;
zNJy?5-(L}J-@C)~`0b*f)zCJjTbIzPMD21o<{|-xH+DvU_eDUXho?&h&M@m&(B0x~
z_SGIAm{ikT3QrLo_Vfkl_nT(SjkEHDrR2xf`rVBj(*gP_<Kg{XIgjq|`n=P!5#Q?8
zH?!h6;tsdREIhXPP^J@G8)m2c$8xV|l)+lvc_U6uMqi!t(s085Txf}wVV%DAFofS4
z<3HjUl0dpeFOYx4k*FDYqc2=?_jnHO44F((d|YbT&9LnA;-wMylpvZom)DzIyn1k5
zw#{FJo0;?O9*cx5gBX2~QKCM@6xymCO&Y%JwX^10U?n>G@V`c{=*VV0cFdmxxLHrj
z8~>)d8%d}Ob-R_OUdDk8FnAw7Qx47>@!KT6Sr7M@O+&*N5{LnFqa0gzWUu)kk(Hds
z{knMJp-oGE0Zi@LmtK1uWMnk}cVwL_QxA;&rOVpG0bp1?3M4x?LtdNIwJNlRkFJ}I
z^?dsx@SNX5ZD+%}jj0jRxYLlpuHjI7b<ALu=TQ7sQM<5?n?xdb_2_|&qM7?<u;^#Q
z2e3qS+rM;Ij<iL-eai_IYv0c)24!BCmqv8=oaJSV9Qt#T{!ceMWo7au1NF?;WhYz;
z8e`V2o9;hou|YxO1TQ$Fe3(m{X6P1tt1EnZi9cI$$NnbMZ2EcFuws&_NdMt2JM3#v
zdAe8r9IpenEx=$U>uXzUEX0+rbM3}Mf?(qxkq4#UNUXKK|GM!_fYFu;p2<CSnDr0F
z4jRAo!GmD4*7|d&Wf=Ob6;sOUDCg2H+oFy)Qg3L;4su5$UkL3{e(fcv_g`wsS>KcC
z<h9lAw14_Hy6(q1#DMfy!x#5=?I_X(OE~Obivc-VgV}2}(rfqJ+DAE`1vRK4v%EmR
z{v490R<d9`<kz`UK3`CmmEkm-f1QtTXKzR!+zbZ%07DO$4I+P<6m{{MOWdF`2<4o6
zcr`R)=wE{UbM^lz)!)_~y$uHiUYrBX_$>V|MIsl3|11msHx_UqQBCXr=8xHQ9fMHz
zxAjEgspJjmI3TVA2b^Bt-&It#A-zmcWIt$nA(**O!Gc-8a^X)4hkA%|e>qA{^#86V
zSEC|0X0ogcLlFsOJuGU#7NqQY{JDtdH`4J#S{}K*mL2t?3*G9Dzi-BV&*|2)^N}v2
z7GNqGK}?#=a3-(PwYp@^&d1D8#Q&JHWzZ~PnQ$Y_L0_9xNctwKUK;bJnZ24@<1EK0
zYD*M_n!6_&2E0lh4)+%tHWsrzy?>>v%=8cTA#`Ye`j5{G)ucyp9NV(;rAHC)LJsQ5
z6yxnDP4;m6kwrCjXdnm4y=Y_=!mK`Oyt;28c^zmLDYHvj0!A$zW=x5Arb+<~(Jg6;
zcXKuqM%TJC>Z{qkBhET77HYSda0X?Io?oa|SnEpDs!A-SOxKc7U(Hyw|DwL~^;6fb
z-OmwAYl>y+m3QsMn*0_-j^~84W7s-?JPFqwuJNHRggARJ&3$4ef+)vWED?=4snSOs
zxWCLpDxWx3IFYy1qXt=cwV-<H65^nYAK=aK<8U}%Az0Lq{MsDDYK$}AbYwgE5g{}2
zF?+S@u2xtmF%N-$Kir}P>7WK2#m}Q7TEa*ZNcbA{EbQW-q2X^a2p4WW!HF_KuvIST
zt1d=wOovRJg`S<mSFuCAxZpazAyGbgZ|%~z2ekt3t3^I77cn7nkO6jz4Ehgz?ri;7
ztOzU&9)%;fe_^mdi+>lccDi!6*gR8s3+gQ)ba){qRPE_6vvra~bAt~zvXB@JEo^>H
zynWi83N0-ARL@ofqtQ9m-}88+)p`?zg*$p4u^8r#@=tTPcAt~_u<=GB$@iKb?OW8g
zGB2+#p!Cz?mdaqiec_I;?C%z2l=f@56Yy_V$pO0WTi1;(R+h_x9Y@{EKg)c%F<X7D
z)6mkk&`MpSZL6NSuJF8;QsCLVgVO=Zx6fbKH8hhv`c6s9z3Rv*tBQ%$;nYK7MR)Z_
zbP))RkjiSuInvGK?#n$<+zCq|Y4hz<gBCkTN$TVEK@Ghns<OlRIwyWB%%!2M{_x}0
zlqX(7>X$f}5{tW6pK8_6hwfx1Mh~~aGxN6LN4(5rC3UoBwGMWlS?fI7XiC*hSX%jR
zl@>0PnQ!#SSKcXaNNkNvH&w#Y0+7(tm98B*2_uB<c-7G}p#}?yXi1VSUOluV&9a4%
zr(}=PTEka0BvIhW<ri3pI<L0sANB?9cEZsolw{1=tO*<E4I&0!h|sT1QzPN=QnuIi
zgcfoePeZ<*71Di7d}o}A5o%Ol(Y`L!dB5pv$0y-Xg}iX9aIyXdiAME7H@3H=S%lFL
zHYCK;mr^#Ypy<6C^JB7Q&nB;H*T)9!_N4jj^gQnEDek+}jKbBjA7@~jV?Nc@hLNg&
z2s%e^A$xKBtylAN<>ZD>^orVF38kqCCY;rB&T(MHZ&5EGgp9_`Xd2j6rA?_++-*$#
zAsWynZ0CJ(;xkrGhSPmgiLudjNiuVrSFk5^Z>k0@NyWBwai}SDRL$Gq?zAZ#Re~_R
zF6E6d$DJZ0XFo*4^C*P|XwE*m0T$Ip<Ytq}q{PU}$Nev&j|QPJ%l*2-TMR==D;(Cc
zgr+YcrwcGw9+QH(J}NuYM7_3=F-l!%_l)!1()iPmYA5@U>{Xw%H~S=cAF@J4z1OCH
z&sGmb#yX+Q(dSFrU0d*?Y30iYiBYY)N5dv^E^i}qeFlCP7ZtW9t)*ng%-(Nohrc-J
zuAPHHY25X0zZU|nZ3#MCYrn#c?oAqKEhWJ_eez|>yQ{i#Nl#aMV%qRTS#ev5V7yJS
z70ixYe$J1Yy-=kaMoUUVwJx*s7WzGY4@F>7dh7&(d%eSVP8}lLoqN|q^}A~CH>uR%
zEh5Vtdp(A(f+l}uKE}8@LE^W_L}oQcJRvsC9S?N49%D7~Syf8o?26-x4e#6Xwv+7H
zrf~!K!}cfgB88}1k2OWsYyu(4lo2*7+C%(HDE;{}zcJWc3^CMxq+P0yIm1es?H*IH
zY6_D7s{t#Q9oM4s{sXxLm#%Z;SZRCveYNBdFSZoGG8GL#-$!p7c&8+gbqYMhS*uyy
z9_{z=AxGX^BU)IgQsf?~c8{1m!5t3%G$)Fmsq%~hD>X-YTFv77^vLSXT=m<~$!sad
zsxkTFGMpUJQ*%$(XC%GAMvAG0Yx|{h>4;F+uvna1>CE8A5tEH=@|(JFeLlj!=Qu-d
zjee*$hPrlFnH`xh4dp3lCZbh?Md&{qwAQjs4;!2!jkAn%A8L8^JhOcgPV_P?-DY3!
zahv3mv2;oUVJ_u=ePMbcB7KWIY}YHd^mDn}FTOWR`q8h06mo{t4Z8cjjNxre>$Pm*
zWkw9}2C}#I&B9{0UvB(%$tIkMQfp(Y9|H|;+r2aVs{{%(arige_!j6{0(D=C@`*q$
zvsrDBb;H*AbsMj_J3m}sV&g}iZx!h#jbkclCh*daofGaH;rA);#s1-djpu{9q95w{
zonl3u`d+1|G3)C&XXwuH+K9-1Xe_FpN%~Et0^3H`&A(bYRzLHmZR?R6QnVknH+$!a
zN{QGfwiqGe*6VZoHqY#ggTkWQ)`BCAQCqh5`r@5H*mle))8;)z%W{FCwY|K-YNTBu
z0!yf+AH&Yk4Q@SEA4jO;d93vJ4PAA0$d2O`^L};;gsm9MTu#T%I1&@?X;!!-iMBHd
zsUj}sN=9}slA%3oQRj1%8?qv8S_)#md^v$RYAJ00Vx?~BQj6Ji-d0yZljuElL324b
zTFyANmj9R_M$@ZBzR%z(&7p3|g-0uInC-FoLdf3x`m01tC-Wti>6NtSv1w4jwjyur
z?+qKn6E=B4Zn@;Z8<|WA^8nuJGuqPQwR}y+`=Ew-B76j?M)seQmy;%X>6JrxyUKOz
z6_hxh--@f9zkeNrB%Hs6CHCf2e>`(U$4_5Dum(ytp;YVCdTk+JN<H?Gu(@vgw1hlf
z%hC43wre+s=TzrjHncy4sG(+U^Mu<Cu#d<!IWPZm=5QT8_rdc>@#sb0m!!Sb{*!IP
zFO;3YS-@EL_Hkv_cRD2BV|SbzsY7Rfx(-CxzEalPfp{KubZNh#NR^0@7xcE7V+Ivw
z?thF>k#g;Zq)AYhO+`&Py*W!>^>~G@vqx6)y_ffu>%1jh8F_IZV<zin4Nc`q*Y#-E
zdSmXJQF?$yT{?;qJ31n3U@&ciRhGpKgQz!ukG?VW+uaF2szj3lzJm?JZ-J;rNb%ea
zxIQ3i?r9}+$}i3RV78IvCN1B)vire4NGGH%<S_^i<31nBIaZKfB6pS4%2uz3sT}i*
z@4n^u;lBA4&TX<pXGulEs=q^dUG^8H=;v;}DO<FAqq+v39zk{GeGoM1_j~-XQ+=fm
zI-^;k4n^jop^60G!Tj|moPg+eB>|>>`i_M|l1WpJtQ4K!l#d;czJjZ4m$W!~(>ys}
zc>1vYj#20>gZEx_?#j~$Q>@B1kKOxbR_F(GOAyIbPL^g*f`%6?)@3tjMGMfDGSu&?
zb1|f@Vad+$NaM%~M${Rl`ii%>eQ`OOnS~|@SUoR3f%??xy~}cu+!w-;XzkM#1^_nt
z#JX&qBpf(2^zKO8B48e{+ge!zSu!xcg=<lwK3U1_*^pk1h3~(V^;%Y@f03YaxrGo|
zV->@rWX8AzihS?**?<R|4#MfTTfcqcbbE+&CPgahm+Pbz_N1aXiZYyeKU4U_x5LgJ
zyDU6Cy;C3CU2oUODFR1En8R8R%pfd$SLJL)(0sM+$*^2sNy$*cs2Td4Q5XJI7TI#E
zy<MA&28a6wEhMLT8vSyX<Rw+1zNnEV>VdG+?nivIEBEhrFp#CtP7k38XHR;g^2F}+
z*kOaKg3krU0-kCkSd3jDesz?ZY!|WRY`=5@^DXjzsoh@=aGBYDg0NjZyX)kghe-Pk
z4r;-Cl`^wk{Zbgo43l$-8M^(7HQ#sbWDrV=t+aEx^QVvKQBWBSzv%1zin9dznSxxO
z^AB$BaPOFfXXFoCjkqb0qRfBH4Xb9)KE+5@Hi=!Ec|+*MpoM2OZuF)d`>oDnrr0G~
z2}{W4x+Uq?eT97xIOneS6?IU?Ad~d1&s@XJhIGkqvfB7~8tuohznSi)M}AG-!hV`b
zoBFxQ7Ujo8EzjnVuM+j>Ln+XVITbx~PwTYyGOeUd7Va}u1-J6UG7!Bk>&Qk2yF%Q&
zGpcXq>`*8WzGZ8wo@kxeWq#Pc?zYL@&Zn;%N@6}QcLQeF#|EA2O<v<(z1Cp7Mz&qO
zl{YX@%rruozjZY*!9E?_++INxrW9LSXuCzEvAo0^B<dDDVY=>5+#q@-Yq!l}P&I)!
zaL}qR#*dNKJ}ullo$Wcb{bF;Zi`SelrglYx38HS$fiPpIAv~1*3f9LFMpaecl=xfP
zs{LkAl~}Pe<J)~RdcgQ|iXS^`qUP3e&hR$^3r0?HZAy24eruz_7Kz@0y6dm4((aq_
zI=AZ53Ch;pDs{yJTl*vTLQE4FAy6H^Ys4PtVIY@JrpPje^Mra}|HAGrLnDK8v*L&p
z^T#o6T62Zhu6>^ybs08ACiknW4iIuip}V+erqxuB)$E1I)fZB5m{f&cqM5&2*c_+V
z*_@kH?uEs(7$&{z(bHMJl65%oIMUh-z5%K#zB_noVam9wDzq0L#Cqz|Rx@-f`L-Qz
zOFaRh<F#-REUVIW+2>UsD>0~154U!vzca=aoVhWAMf9}6=)~*$-(-BdO5<bzO#s@Q
zZM6GIPX3JZRY;2eHWNwSjI0f^C5-l_zdQJO!48^wD1y+o5L~QaL<vaU@dS(&C3F37
zpqAh07C%3NOYG@h=Q9619haj`pZpb)_FO;stw*zP&TC!v@Ew|z1<`6M>vM~_eQDi=
z`P7|tGh@}FH6epbH}+eoZb<jif<5v{FE96*sq^_j(8sD2Q2Up$)kZM0fG3YJ80wZ0
zmJ{rePJU8vg4?c~awJo2<Rj})2dh{qPo!EnaxJDbN0^kV?DTomz#ucibE={c*|XrN
zWs9|PE;&`#C;pa27+W<|q9w6L{Ka4)QK=fN*j^fO1JN%Fx*tItfZT#R***~@dUkPM
z0$)JgU)-36eY;PP4(o|{FE$#<<sy9ZFJ}uV>VMCjb+k359W!gar!;&-#{Bvn|I;%y
zJq1T|CO$Pny}6%d?Nr;uPtGODn~ymRt6VbYZn;9yRqEfb6xEUAd6v@cKAe&9tnKvI
z1qG^M!MSYOj@Y}hGO&Eox1LVSKzUEQW8)X~mrD=Sat;c9QNL~e2hu3Ndxn*)bLP0H
z#=d?Q5@r0u8I~qVdXsiPr(8kNI##8f^@eowo<V1B%<KvJImy{1^?pC$n9!S{Bv>|d
zYteb_7mgA|(O}SWAHH7E=v(B~EA_q}s`*lWdP`F<*H>CpvqahQX>$MR^(K$cIi1b9
zcFG_#vCVkhOWcEWA5Z^D7qbj8P5Hr38Y`oh=nYxz;RSE^MLT_3MQJ!q<%ocS^C{Kr
zRlE?-dD>GLpKuFj>NkJ!mN|v$(C3YmJ9P4xOn;T_%$suav>m0MAIV-G{R1wgPbJM}
zHIIL9T^i{-A`{K%{Y@9H<C>8hZn-sAq^G~TfO?wz?o0NHX-+ulqLFEawNS6hrJR9h
z%T?2U9paa7q9iuDSSKGdz?tq18ZaHJD$+5ZUD=)G2vIG#Zx*Ba#du?i^j4~BZ`2=f
z=j-!Hb)V-!GTlPYC(7k8)KpKX)yL<?3i9TK<yy&e8~RtjTSvQ+eDemTlmyQ{HWnJt
zkt<h{fo0fzKV3oJ77MHLg=tas<;uldHJxDyfqV3CyR)%<W_vT8tu%f!UP#X#C@CER
zt3qR+dDfK1mMi3pF6;QM<6l+AfcbTTvgj@e)zHQ+l4T#{wNSU{spQY=9o%RBd9~<O
zZ?xO7q07h1u^gz2q!xkkC3SrnQt6qp3DY)ueb4bHCyi1v-_t5CPQ^3!xlYcG8_>yK
z#|DEOn`curAbff+iTU^-OxiV&u0j+Nx|5|kEcDnLQ+HkZm@CYLQ(nzAbd#QgtJV#Y
zl%mV>6K<a-H*HI^4Bi+4&B<F{Zxc0q9wkQfluFh-v$KCAF06_xA5F4X8relJQ>lsZ
zjm_m0*>C7kOx=SQO_!t;vcE)pA$qWx(@}DJoKsC~own&EXP;K-UiC#3^vcRSKDJ+G
z<3dyar+^RD4c*_=Ma9k2cf=rT&&+;$Y~uzWiIjS3i-LXhe1h`d&<vdRFKIM+iH+&g
z{v}TeOxTQtD3<G8t$STAM50YLCE6xw>m$Ds7LL4xB!@Q&32J=rdlhA+F5qA;M=_2#
z)>8W*S8BY|xLB~!=RN0u46K0kRI)2OW=;RPZn3An)M%I!?zfAtZ4)Nk%;a@PRTb8l
zsbRfmN;VZ<(ztUD@$^l=WM)^m`yrBQVQNY>-c^F(Teii@KERh@co17|rtqOmQWE8L
z2WWgGZBcDN{ezW;Z&?_G?4pxA*wTWLG+ps?v(eFZOVCaIVLbLuGWF>F$adh!#Ulok
z0}H=x|3i<$oKtBvPRbFn$_#?-iaVyML?A)u@M=}+t8|TbUDtiIzVb%Zj?);=f73HJ
z>M!z06@NW~#{H1mG14YYP*3x`_%0)%{q)OXW3cC!drPu{VwPAH5*e~x`PaVhjg=2}
z^7IOFL)pK+x4|Kg0e1?NcE_IM*iEkH_f(1Pn2!jGDTCPR2a)h$Pl(N1Eg!`w={sAd
z-CzE4PM@*yleMlg`I{AN0)Lcl`kQ-mye9or`A$KTjqdH`hcag@)N%w>Fka#77rfic
zDY<gtUw}v!cEnX{p)C4a_m4sHs$l&bX}o5g=f&INVS(+-)!kRbhu%8++5(9kTp7QA
zX(Yr8J&jy+HCy=r->f0PGWJ~?()ecX**%jnT>eNW!|ClGrJ!e4m&g5Q6N-isZ+tJp
zD|#E?sEwlXVpMa>nxiuPCoHESF*;b1_+41q+bvBI5zM;`PHIMUXK|gOh#q|@9@0bA
z`l6odWLB<EiB$Vw#!+#NVRmHhkqsp(FO_EP_$Gd-?pSSehf;PT{CV&?+1Q<la^Wqt
z<hUGMUkQ9oL(^}n>qwvSh(O&+g7cp3NPV9w+5DklHv>~#1WwHxHqO1Gu#S{^+}#FW
zlCSa%mTl+S9G^#?*cmtQm#bx}89lD|$RU;PZ5`An@{#LJA76xe#qNI3_<Gputaxt3
zZyJaCch$P;o~&NqLwz!}n-{;Hs43}hG6jo>i|rVU%XJ|3e46W!@WOStmLka|uKg|s
zw82a0g^)WCJII|kE05BOx`U8)t^`GC`sdo}vYVUr;@#Tz($1ReemJTsi89E=x0R*h
z(y~AIB%pF{^eu`PW@j6xg;{*=>xJ5#zT=AXdne?IGF0lf*Lc;Zo?-<~1YPcCx%ihH
zI>hG-$2&|u+AXqU2jYPHn^~ZsOqB5jI#;GCGLa0-mPn~~wcU63L<;NeCN=Xij2{Lu
zc@K`9n#Yyvi01g1k<T>~wcRaA+gz}OilyV0SFg_1e5*zSH7t45J1d((gsU|+UbocC
zp*SI9%Aej}{?MRLUVk5>n|2t7GD`cR&(?Iw!ImQ33hpn*6QglVFROA#_ri(nF8_R7
z;CGdHCNdyjDd&Z0P^g2M5ap;mMr!-KSB$Wx()K-oJn|DW8@^?nvR!-Z{IIZ&rFKqs
z@I-f9z}4&VHR0DA-b>0rq`3G=N>n^@Z=756z7pY_ttBy&W&K{XgS~KUXulcN+NXO(
ze0@(;s_Na#<JJ~+ydKA$wG57P1tw48s6SUp-$Y0kv@N=28(#JK)ifP@c!x|Odt%V1
z(Z9hXVs{M5?n|bJN`4l?z|AST)YQ6WeUDL!)|tV|66d;(n#KuC&Efa!qv+Pe3g_M(
zMvpP>P<M5IeQnnJ5?y+p_dc!{(z$NtRfS|?L7dqL=jzH_0)sWXeBaEyKdB{v(W`%2
zh$gQBo1ZJIF-1?la}8CMXpw=wxVP+k9QcsuF2d6iUn4R~Pkx~Z$s3gJPuyyiKo*bA
zAghoPGs-#q%U9ydHzSQiEnHy@xBe~9r)BOFl5|p);*exq!RmOouxfxo$vtAnSDcIw
zj<NR4FU<L@;vQ(IZLRR1po+Tq{tF*GO*$lAl^)UVb2+y$VapK}TiDQ8c70>Wn?G2g
zSm%<Q;!l~S=0lZGcXy%m;P{iF$p-sNsnzdwN3|5ZM@eU&W=0vfoB3OeO>I7HTdnia
zX$U>D5{2j`5G7^Zb7?t#k`t6GJJ<Kvp~VMwOspy$(2pCsip}aPCEuuQyM(;Kl8fHT
znEfn&-r$-0JnFk|)1|pYQXvG9H}Jlr81@>avuU@t6or1(PfCT7O)inQU6(ze)PH#Q
zz-oa+4qdLZYs7_jCG^M%bs6)ZtSFT)U70>+BjviHz&Eqz0=q>iY}1j{fYQewWVdej
zzpzr1=(>EnGS*)^M|gB)-?XHaYi@SUhit{Pe8$3HNAz3#Bjz?e`1+|yYOK+UOU{dD
zP9ym~xpz+*u)!8jzulm3EIFD&j^<v6jm%a4(E?G{3U<A~&gJy6s-WwNbRN9H){<@x
z3mmc_izhkC6mNLj=^K5;JUL~$+Gk^WPKCN%{)6mKL-YVw$XsgGGqMrE??)@dw7D8e
zXam>HBK?b2??;^Fv+N0HVsji!(}LH+y8Sz8hkn!RWlt@zO2{$mO;Mkq{tIg?<Lsnn
zWdq58jp?Eyc6-WpTl;^`ynr(!i;pOv95>%f&fd}Ge|Ml{-~*eM0hX<TaaQM>-T1@|
zTh-DR=xTSv@mhC6Y3)@!xkLikdNyjVUt<tT0&7i5`=a}+K4FP{k%U4+HKhx3Lg`!X
zt3IA`T3UQ~zE#uhia9OdQc20m26mBkFSgbqEN2$}yNh7Rn)OPE`+z;9omf?%Y^_w^
z(!=YIv?D3?LBei0`oSh=bxSknIrwd}7cTW*h6wHU-Zo5rOFG-1`1)h&AHOQzO@0?X
zL>T)#e_nf}wh~+=&vbtJAZQB5bsq^iu`q3%b_ecd06+gjStQI~+imH^!r||9Rja;j
z#Sl)OX9_Sz($#Qz-@n}?{5W&Q+Pz<VD#!0a?<*vEP`Rg<_<qDfWR#&?sJJ1$?$}wy
z?%}tW{O;z&3`*XVgNhHl*yZSw7-={2y)lmKH5^xVmExycR&Qf0>AW<8y?WVq!F89b
zxujsVU0Fd|>wBi#9k*&uk)TQZfsDpz1}6AOU$yro->0g@-|j1CWbO>84A98R4(_aW
zsNd>nSe1+wL8?@H@=6{RfOh-ebKyPzO~gT@+UXvy-YxykFoM2KPsRMLmC-V~w{|L3
z2N{91*dEm8@Vn`2lw@4<%#EyrIA&6*u2W7Uglj+jswSvk?<SlF>?~{AphrS!hVyXD
zl!Y5kOXCofzPK=&e%4b%Mr9ExY?)J6nu+3kwJq_n4?ymUBMp`&R0nyqXw|-p`>tU@
z=D3NQif%}sm8`pCb31uUoL!iQ;#h}J*S_5zc%-IoaJH&JW{G5+n<QohU*epv$0RtK
zH#`kmv+gx*Fy4VVrylxPzs?5RUKE)|Zlnj9{;O8E99xKUGCDWOP|Hi^`?hu2t$t}1
zdsunzK0cUZ-&c5oDR3>o7z*oY?SV?Xp?D;`$aGu*AsSC$+FokM2YZWFZxl*v1o(d7
zx+Pb0pU?f?nl^9TS$_`a{t?k|{EYZXPmc>qPwMK=oF3R}_?3U>zRFUy-}=2=nf-=}
zaF;40^jcD`mQIm~-|j{KZEHVMCjVrh{VH%-iYrUzmCv#YP7IHIJaQnUv_A<IyaE9i
z!`V_Yj%oM%oZW0~;K8FOMq=8!RvaKd(3u21qBAXc{<G{ePH*SkBmoBd7VZ@DB!%Fp
zlB8bFkUYF09TKXMcd!|PFw+G$P_JkuL687#OcrJ@lB_J5<zLmbOQpJB_i-Yle)d-V
zOoVlQVfO6ySa7tv?)24O+Del<w))JW9=1m6lXL_JF;uo6tP^0Nz8LYh($NlHJ;hrv
zaod&>nEvot0rkTdH9x21maw^Sno_?Ie2dBZ?xst%FTC6%Qmk}dur{RopUqw3-3;WJ
z++ly5jqY^UKX|nFQ3yDP9QdNY`hUoK&!{H5evR`%MHEy-K?Dq-s1!j|2uMP+P!s{_
z(p99FC=hxRMMNNArGrQ>Nu-1xkRm8mN)iYqB1%aJJ%kpR&2#3Q_j%u$GoNSH<by8O
zO1aCv_x_jb`t5a{R+8?s3&#8F#YFAsVMbZT{Vx<OnC-&$`MrlV(uL3(?lzG^J}Md1
zK@iic8qvr$_lq5+f+|LDf%4w#M23aEO{;f=;EZG3q1_R*<*>$dz#9aUrazytb%C*>
zG?2(lf*`W*h_>A;!BI)%R$xqTmY_y~vs<*XW1dRMrCyZVp}3u{w#p;-|Ic4YrX_K@
z!{_gu8Rd=dwyC`k5LGwr$gV5tG3GiQ!H{Pfrk#qf-{~}f@Wo3Fk`A~mhb%P6llvzW
z*Gn@yj`u%x&EB|xlGql$8po|?nNX#*L86sK_^8dPi7k5O5+9@T)+_SH2r;7OxjDhM
z4F(2@r?Qghg>`e>ct^co5m(vMu^o?<_hmEwAq=TCSNTioWM4Ut;DbUTZah7SgB?Tu
zKnv`<D!t|L)(N85HWftJt3!ky6=cuOsQ!Wo);9`F9(D3|Z9k$M7~Hem>}BpfRM0tl
zMf<oaxqtZtl#WGr7rF9EvN^}y;CIv8Lc_vdsj3oqme*R;wmlwp1iSIZZ-a(qS_UHT
zhOtL0#yMc%41D$Ba=DJZbDR_5<xn{!8{EVm&_({d;h<ku#8asXsX|MOi89hQ6ikge
zYGCtxg8U}ueeYPktx_#>t2I!!7#OIj;7|&`jSijJC`Rk6Z^SSv`43xI_@x<d-secO
zt^UMNRp8VP&a00#fp|v*S!B%UE9cHb@$OC37AV#|FHO+zrxk7Fkd4K(#Eo_8!pNZO
zX&0AO`KeYDpPir83WWtKU2{!`XF$+M&ki&0IW*}{;IdHd*HAQct*+60eJnnA`TOI*
zNtLHI4$@LVF$CVU)o(SS^)-wTMG&D%)#cOXqs)blwPEe;`Y=4nrjQ1K>n{-z%qM8g
z67Y@&&uR)eKX+BW)}ljk9`B*Zo~@yac6E(AWAYPYf8IjH5$UO3*ic4d0Ro1#f1e%K
zF<FKDjB~Vrw<TCktiG=8=rAYmaO+w?=d<NwMr{t(kt<Q;@{#NGg7le*DWQnaju;%A
zzB6_^kY#{BG*N3D9S7=~4?jVY%RGF&xo0<ub@ucH{6m|ySyc1Xz$v?O^4Eg=VZrr8
z#<*EVXgBq&)RmwW6Z;1%%{Ond<xZ6O<48vd!+y>lqKuEu`k^Tbyq$$Av52D2W#X5L
zf~z!%IFqtzL7>qgdkN2?y5t+}h3U>g{V{uR9UA#tMInC1wU1OqxsX@h8F-{+YnmlN
zvd?sRzwYCUKLNQf<#&mx?{44wG}5`3Z6^G1E!U{683&dabipM+9i8R;p;FV{p@16%
zJ-t~P?2Z?q0pHHLpG;8%J!=>Jl8yH<{mZ$8^j5_#!8{NtATJ^EVmjzOL{g*txVuFb
zPqHRt0Os!u%iyyjZ+<vm)tU7HdWoi=4Ald{*q+Wad(Q^4OxVwG{63@r2eo|vQ9F9H
zO}^Adx(pHe>Rnhl4ufNdek%R8`E;;X=S}}$t^hlgQ(H@R%;FwL9V)cB`}a!aP7vdr
zAu2Q*8jB@vc<{B<>@j3d)X-JC*x)_%{N~yxXV9?J1zIha6{j&fw;WByi$itdPec}2
zDY>{UmD%56#$+)C?8%C{KAsP-54xsKMf^g`<+$C>|C6|@_vdo^s9M5mf#X#zxcBxD
z!}o6;<f3{H7}VNW%Xw=2V!z_`-1!2Xp~YCzOzH_l2iZ2fj+)>LxYo!pPx$w#U^Cgm
z^)9VeKIM~{(U(UvKTGmRu}#<7rV7EWpvwF_!!)2dktwfp%i5rL4*{dWcFQIq6EA)f
zj%0dPE)vQ_6Q+V$g?v}I_82l(YV472)CaAqQ)pB#U%ZWioB5jWTu-G=V1PAFN5ki)
zPa$W}Y`mO%Wab4?85h{lpl^hG4hsS%#uL`UtGrb;_0h>TX4_lc=21(+)lNFpB_H<e
zWT}cy+B9g$zlFF<l3-mz@xs4P;w&C<l+A!D(K%S7BW7r*)NTL_9dL-nD(sl{kNGpm
zKReHnKMv(<UL+?M8hwZ2=Ull)Wcz7a*gIC@a->-of00>EZS1K`FQXBa5xBmHIdjj$
zG0KkKL2aZ>m#2|Azlv0k@#!*^>xsK}d<NNnCpe|8NUK<TizxBf-#$9*E9i^KHRRX)
zPPVCxaW?y7GQOBXuR}Eug2OI|;(Z2QUB|kj|F~eLBz`dtmXT#Zp#SG$nfrjW@MJa7
zA`d;+3yNd-g`}KDFXDVhL7Z&itfHn1%&9CDDVyZzd_d(!BJ-tMoqs^#Cja}XgWNrF
z8zVsj0h3*G%yQWP=Zp0_gv+#Q<t{H2kyl~(u5K_wBxU14rz^8pK**52h1?xv*RWFB
zW&3XJO|T##7c-iE=={#=z>2IR&%cMK9a7Q+<Eo40-32s+m6V&j!58uj+YC47JzoNG
z8zrx3MSA|nZ97SG;{;^(t8mb8=bcTbxaqn(nVz>c&j)H2pZARqlP?w%1BGCSrGS{z
z??#s6d04wfQ8(O7eM6R{D}%#iFTOdgbNo+kfnbMJrJh$AfrsIv@)u0ik;bVV>fI63
z)a(KGp3MzgQOjDA@CfDT(V4UDIned1VrO0F{8>~Zc(w=cPIhodQs9aP945lfxnrF|
z@it0s8fWg_^)qWV&RA-z?9MOJcfNkL?1tvn8Zjy2g;dYI{z0j#uHl&pLt1KbTfBlO
zLE_z`s*Jh$rL_!Dj->?@bz6gDe7m4n{>@7)nsfJo$BPQ~4h7m^1xxDQ%}Cp2@e~o=
zj_u1v<GsHvwQz9?rmat%BP0Q#2Obkr5nup@!S?jzOav>$=8B*Br%|dvnngF4pxOcE
zu&~Lf)bq#e*&v%OZo-}md_`rch!S)P?7QDAcGNm>)W)t#biE|(7KwhfP#2c*GWy*5
zJwv=fib2BCG~e2!<nBRfIdnvUU1y(K4phEt<{3X?<apg>`=pha**iqE@+tqFx(^M6
zRqZa32)c9f6_SccP+ZPZFPG@5V>v{IaEu~Ws2jwb5wje#4Lz?MQZ`$Pv9<W%MLMSi
z51ni(DF_uis7?DvQPi$SLeuN%>Pb9qa-$CI5vD7jgQa<yfN~4P3rM3KgUcJlbj7#&
z%ih}i8vBV^nN}66D|e`>DhJ>A^<XNmvPW8F&1P3AtpPGptZq~Toci=L>K*Uhd{kna
zgavY}dQTto1^0VQPlXYZH@P-PZ^+}YHlK0u>EemPDQ7D?{At?pzr&#jTPEnqhWsr4
ztjt-rJsW0>sOBGfVB@X6QTRsFtX1lcoR$y<s38iEQ0mxbCgc>)ZqE&JOz~T6=Ze5w
zz0W*8>c7WOH_Q4Fq<nARC$0QRkc=2M9tuPSI)zB~Ti!-XIz*=V@9E>tkb@P2S!xOy
z%B4M@RCf_HO}~iJ%PIZ@3%f~uAvR}Mk>m>1C+R@w7~U5?%l(`wP@AFuV)wK9H(llU
zjncXASZA!!l^1&>a@bX1A)EJ>_GM>qW(-Fc>z88Lvz>|i7?(NWvCFw1vrUqG0@S5K
zpG?iRcz2%XJTaeIbw2s&Z%fjhBV+tTW@$)=E)@RMACYCBXOliISbzU#U(5WYbDZpL
z)*Eg3-o6aVWq3&i{ji;Bg_{~s$Gw!`jji@vd-WoVNWePQf5{AaX}b9c8=E|dSjrFB
zWb()Ps&dt)3XO3kHUKqr$UlO>5-oNyAFVh|xf)ehxW~{c*>+_CNFd>AX74d!<uR3m
zv-8^hPnA5JOK0VC3fl3~?njjE6TKRKe`f#QQz<5jYj_*BQsAV*vpnC95i^CNi2J?h
zX2lmo>CaJdmrbi#8|g|Bq^M6O3r{wVM~6o`y1nfF3Ufujt6STbZ4T4!BX_aQ2*t_x
zypn*6$^>u@pV@1O9yOZOmR-m6Yn`t*VxDt`i7o-n_hwh|l3<BTWt4_X<@<S9@Xh{>
zX-@6v^vT{M+F3XQxTq+EC!~8sHr9=Rs4cRJ{-LTkubRcEE}2iEcm^$|(KanX3D=?X
zNW0IzZ2g{+>w0_oJ{(DEI9CGdAh0uAtjE@H4JS(AbWVhWd({O|0@QpUc<kds<<Ll8
zUmT@|wDw~N9Y;B$&8=L$h6~y>R4@E8jZ})0MJHDbN*n2pj<^^<1Z~2lh0V$Hnr#)=
z+c0+3!A;2vh^gnKt?BE}`t3xLGX_N%m$T_Ry#Xa$igQE0q4~iCt~bsZo5KR}<Ofr!
z$XW}cB>c<3?4{WB!>R#u(=ExE=4MYfBun)YRN%bJkBA;b8j)LN{55+cYutyB@rkEn
za^A@1fHv#wznU6$*Z}z8qzr0C!7agD4Ygy?w1QIw1>H{~qW0<Y_Z(sq-4sC&D3DSg
zLO44$^~%`wMdDX&^+E$&4{`gGAQ-qBK5KuF-*X>Tvlb==a;%sdYY{r<pEJY+-tk50
zt6OOL4RrzabU&8NHuF7BMtWsK@`@+{re&|ICRB99Bk-Ml(r(BWc)ND4FJ4@<t5h>c
z5D0$Xweg=I-%3&xO>3wpd%YDGl@aqEq3kh?{duW}=8H)&+)!yoPne2_3?I<8EK>hb
zU+F3io?jWl_=cOXBL=g&w!AOf{&`@qq^NcI6Tkor)4Y~#l8bOFsX$bMD{nW2in6)*
zc|NWGQ*Z8+TG`p;nT|^Lfq@2x#}cYQGY@K(+q(Ttw4%!3YTu=rK4PBib@Vwz1q+?q
znD)7txh%D8O4CWn;1|5NsCBpky9sBU{@RtdXSj}L=2|$`=HQWE%YBh^kD=N>V&%ai
z*l2ngEO2EqnO2tTqrUM~r$54i4w6Gcritd=hiY1R>nKnVAkno^HabG48-w53W@?)w
zp=D*y!^*Ybq6CJ?qexpDaD8+dbVOosI_z0SW_0a==qulZ;;B|2E|=z6?lpX`)$3|B
z1j2`-9etSc-C9fsW%7NPd;uiB@W=;9JcyTuA}Yp%L9DtH`WKtC4pQGPodoOz1uKF3
zL0C4GGUU!yfN40hH^u{4K$_4okFm1s*_^^1M;c+k0`kq&s{uS_C7idh0@Y^(Bb+O4
zIU5AmgYNfZk^TN%?H?;bu}^j~?WJvo?n{{)>0b62i>3}`&TiU@gepEV|E0JMs?ctJ
z*nFPM$&HUwNAC4`2LCxOVjZ8j-};%9psu1DRxQBpm1L+p?r_(chZn02_W%1#ba_VQ
zEs1!$DAH96;~moNJ+?85(`SB!3R`6q-G+;reEy${3Ba-TB(=KNY7^fz+{=b;MB))@
zRsJ=k8@C1F{;#ajY|g3^xC^3bwH{`4*??)a`YvR)hSCPASf)eC)%RTcCOA^5KQ%ox
zGi)O7?2|hhIk+f{5bjFNm@yVAV?bot)XfaFluRAgX8bhztz9|@7AF&7jd@p)n9)yO
z1KC9pEweMsdy<+KwL~&Tu+lv%BkTvM8>L|G`kq{QBlmThV7#8K3BB4GnKsB)(5>4$
zjspX|&-sGyS?Vx|j6N*E?b>;3=Xw;qmR`}Lmc6H1aE(d&GCnpJz!zDR?(KVT$yBhq
zAscrb&13GX>oUJ6^4M>g)_+7Bxut>n7;C@Jxx|OcTbpsX!7gPHQqNXUpvfIF2P{#y
z;$&V@SLMc8<njgPXu2u+>+FKSJz45xaEOswxWAR4!G_s5u75U3+lZKK)b6tHkw8Z*
z@64_q$UrL@eWTFpzG|q8yi?JpeV`zv;DWD0apmd?UaiJnGdEC7WfL>B9rSBkKOaA@
z7NYCjvyii3t~c&Lv{!4D9ZmP^J}1g}`!A6j>K3y9(Wfs145j`DTyHZ?lMV9d<!|>I
z!jCHdo*T-EjCV#qJZz|oceoA`+~L%<+8c8RY1#)Fidb+3$wowB)|V}mq~iM|2ns`4
z4=UHAX0TeZ&#bvKCz~@wMbW_q2iTmq!;Bx;54pyJXn=CkZ2H|K9Oyu)`EomRpEoCY
z1@Enq6ZZB!C5AW$mz6#%mp&FhS@sI5ooA6L4VLwcLzVVp+^0aVs&9Bl8azm<mtAlC
zT8j&LY%}hTjoX*K4dyr$UUpKozFhM`-jgxjcjX)19^9av{8N{Cph2iqIpD~Z<eA_*
z2Zs?EGg;#3!Pidwp#i{>@JAP8kAI14Tf-}lzg~aOvdJ}Z&uEv;9fD=|o6V0f1Fw3_
zR18e53%F8$>qGCEtt^@gF;(ExWBO(9bAspkpaqUHWx^80s-Sdc09o)ynQh`70<R>V
z{f|ow-ROU`)+E#2lSIza3sv+^TJ|y-0+Y<B=}?;5<6CX}vRAz;S?O-7zXr^Z(qxDq
zsFn&pq14p`44^<ng-!|0!<o0|H~7;B!d5W1T#rrBN*{E<9ya`bJKmgCji5@e55GI@
zaDjqs)!t)xV^80&J%)?96BbyVxva5p{keJK<4{Xq_1_@2lIoqkTI=+q55+aU;i4We
zyhix$CFkc{;I09TH_HX)mpUl|y7Oj}-@Mb_%GAC+%?<7VLZDWv_k=C%k+~!Tj<x5=
zR*YyvY;VsDRS@#KeQpDH1|<Gf1LGt*v31@?5o&<o+r|mv$f&Rt{_**Gr3jbWJ%;@W
z5%lPG$5pa*l+T^ijkQlB4d%O9!sSl}vSEr+Ui9W-D8Aoyeq{5ZHyU}Haz~CMq6hAf
z!aCjd?QY=4Ffafm)L3!X`s#g}qgHOdCl1uPJnK4_T)OY`5^5oRqz>E11fC0TT5H7;
z(DG?N{}vuLp#Lvj9Q-^XdCz%^+D3+wQQ*J~a23F*nx${|_VqWH0_M?c0U_A=tx~4$
z1OKE=hse}32(X4~J94xFpND?v8D;KPk=;7I+H5@R3>+$|A|tK1ydH3U@FL$3Pm&q_
ziL2V0YvIRF7_{vO6z=!ECjNl7t1a(!bt-@S_V8gN9eh1scoHd+7=7D_1C0GV<@!qo
zQz9wVB@@@H>ILJ|w+5STjuP^p>j^e$sweB~mN`{i$U1?Lf%<K3Mz?YF;1iX7_Vf{5
zx|Eh{2rv5zsWBa3E>q!7AyuMwdg7*wC&Wb={UFErO%%x4?oMT_{JI&KeGY2V`^jdA
z&ABJP|6zyz<^v*AYER$2w1k2ppY!A^bp4`&mqG=SAq*zok}F(a{=jJY`3j{st1o&l
zaJiec8_SlalpU{b>H*!rQAL<3eX~|yBxxhv=8x0<m}o_M)OOcaCkd1I&Pnc~K&dox
zJ$NOxxADB4pzR_;@i+Hr_s~-|!;{r~|FMh|5Klps5I>JiP2I_QT)66=DKxtmHZ3y&
zmSFmQSt)prq(XEb4pHA9s$hgTL$*&;5XIeq8F*`T|E+2oxdED@=>@@oJEc>~-g@G?
zdHb`a6y+q0tC82Ih)R1;h_};#4v>>Biqp#D+|x(qk2o5?0pk0;9d&wEB`OBO&U=UI
zfW#HPe3GCiZ&6vmx#_9yvXj=`<r+6v?3ES#>NL<U?$Ie5S=mWYLg&C@={_-_x?myq
zBh|rh>igUwY#+GzkOrksdafF~Rz27x`~5wJp`b1m-gG5{uUz`Ie@5`*9RZn8Zd`_C
z@$$#e3#AwJN^&#NS47_@2arz9NYp<eWREa^28@G6TP-ti$P7m2!XI)U^POfEb_R}}
zVa-NN93u?{8xhZG3KpezQ9cJ!Sm`!Z-8GYQdyU?n&YbJ-lw5*3J*?#E3;DAYRnRjO
z6(_A7vqHGSr7<Qnm}SJyR*>;e1)3q`g1z#{qbFk<zXjtPY62^ky>iL(Q^i6k`B2hD
zxRPjW`&`7Mp<tDuza9ryjJi<L-TUijYKekIr7a*8n5QfDtq&>h+PcP9U4<~cAp4k7
zJ_}c1#1BfQ$%ECPaAX##ifeTgAcdTWy!UkUR@_DD;<^EUN7cmEqw&OgiRWPhvZAA(
zm)HBoaznlDh5D+JhLz5YrFz~5xnTi03PSV^p(RT~dS866KNU|MaSK%N_oxr1zq`)t
z(%RD(R2Vbcy*+Pb*6mO5o%y3s77Ioe+GNPRTyuG=gJA?eFAY)@f^o_QUaqK{>5*tb
zW!*k;P@9DWJ<w$Y%U$VOmCdDlwJPR$@^r_dKts^rhu(;Gfvft=CDyz~ns8)$mhzE>
zpX`i`^jlp}mZz0=FWW|t;{DT2x+f2`mgrRaql3vFNZTC8g*B$$)Q`GI(~MW<aUnjN
zot;c+i~Y^T7t9XZzIO8MLf$5*HvD<M(&0HcUbNr2>iVp*%gW+X*LR%mf8G}ZMTuR<
z?g>4!pFcP5427)C_9Dfu*`_Q#pp6R%xr7p)p|Xnqno{#fPM<mb87$4~3oDO?kbUyC
z6CXUVbQA7?;m<L_@L$`%H_|Ty0e&@O=yx;I7n@>u4>F)s>Wc-#GU(ezNLr*`l0&5t
z`23F*MpOV)%q`*7Y>Ye$xK)hsQE*2(rlopolJJ(RHg_&H(aIP4BCLE><1~19*$S?%
zHm>JbX|1l*98W;#;}sqN1K${6`Tjz{os&nw&AJ^Mc8PXVT(@l4ooxoF)Ft-=@l|5`
zoS6Kp_F^yn=To?tQus=`QdAB94fSL_^i#xkh&MO|u$U}$M={zclKrzjmg+7I`3o~#
z(Ohdwpi~=?>nm%AHxCRLm8ZqEy1<Oew)$d}bzOHBU8&^ndIz*+g=&-yY#i0_Ewl|G
zyr1hY0Z`iLI%MPVZoGuMOD9IKawkx6?Poc%k*l?OYhc}uY3)dgu`0nT6MU%aDzxQ1
z@?g!;)wT4aK#6M=>aFgFNIG|4IJ1|a8Mv8I*)1_!|C7pdfjXCS(}Zm%6^W;fa58+6
z?Os}7RQ-=lI_*<a@5xa=iDDpJyMt@Z{tlvKnA%idx`Ua-H}7C#+YTqfl%X=*9C=-L
z;`QW%&;1|>^?k5I*XnlOS@$jI6<n={_}wmHtM87Zv6(zNs7*g=L=)$Gk`8R{-xhLf
z>Yt(0*k;U{VGou2HG)=BFL(D;41>wC;qficWb4J|6i40=mI%<O8Si&V03vCFg_`pa
zVF0tub0MY-YwTMOIDmp{c0nKR1OC+L>mU;a$;yphNH3;0%bW;j90dK1uPvWr-n6ZM
zUkH$zP(57~tRl+F>kua*M+(uj=lsuWWJDniZh^m)L-U$?t3cKKcTK^ZJWcC0DYZKe
z!r68dG*~*u8IGie9=@xdU2PzNw-6aie}BWs!>4`G*GL_9#*NvvsS|s1^X)rX_4lB~
zX`C6SS<m+bAxslgNj~?x{KlOKv_@U=0;*qgfSxej61FnX#_ta)n{)4!w2F-A`QxCj
z;-!ml`Xl&&d|23LKJ{kpN$icn0Ehi4m641Yg3@qwN*hLRD<t&7mI|pOW_2S=ONprN
zo;zpINx`Pi__Kx&pxp&~UVL_Daz)MOONpBJxvBa(1rJ=A6Y2QyuZVc;pwx7kfmUs}
z9BHa!;oIgEp}v}9bnVe$=REY7`6f-+`w&OEl~rP{s6)!)rTpM6?N`CGKw_h3`Cb|x
z`$Z-|#xSkNJ|&}r7j`?4;=R|>czwp<l5kGpT`gqm*^YYQC$^qIeas*pGOCqdDi})n
z#GwWEc5zgf%EOQiHamokwO;vMRWO0{T8^2oqQL`Spjh7JX@*}LHj0F+rD%bL2boCD
zamdV5314xnyl~VjQ~^!pHCia7j{!G`Jglwm#D9k$BJr<=Td|Vm9)np|9gByO0#@=@
z4r=FU79~$zqwExhlg_YqZHXE}%$u3E<X{?&tswPix=@xmr^Ab>+-c-PH9unh{qYwn
zjb>K{Qb1lhkJFskp4_gE!ZnlWRrbTj7#_ctAQ7?TKK~!{A5p%|nDjuMEKZ(yhsP^#
z+@svPIp-gM#(v4Qk=@3Ar+Fp3f4f3V^gRe}(C}?VVa2K+KX10F1=8n!rogt}ksejD
zXIJXqdwX)or}M_L6!$(*QlxdZI$Fp^@k8->11fLV;aB0sTIR&iE&H`vw-*ffYW+#P
z@vp#!{D}d7gRn;cQg;+&CbQIY{u!Gh5d$#Hn9Tl0@otghxJD}CQXUHLw@~_%Pm7n5
z{*Df;aIda^N%Vsl;uk!GDNK)VB6CB-eK>T*RNv{2W6TQ{=@K3DDJtReu3xBz4F`{Z
zaF0uO=X*>|`cZeJh*KMJs!WP!o0hX}=KXDUpZPyZJig%p>X)?QTk|J0#+`?_kJgNr
z_cCi#hdZ6lJ_2fH-e1{ixs^#Zi-wMox5&Y>FTw_(uZ+26H0XKZ*fj@J1~tCcF)yUb
zmp;6{H-WblQ5j>6$98Z1oSZQTbA1Df2piEpTEFa@Klsz9fQzbreh_MpwT>%QPTbg^
zjWNh(zCdQ@zm_i)Ta^E50I3!)7L%+P1q}l;?A_{fTzW?I6D8ZP$>#!fd*w1LMpo8D
zQa_}wGM657;M;W?xEEFPkFU8mKrAZtfk#}H^R#G}NIZ2-B(3@Zg^{gDh@KwVSx+lF
z#?X6o_-gQ8Ly|<_W*+9kY|w>Mqg6#y=Y(+B$k7DM>;di3EN!I6t7I3m@%-!Z@58#g
z#+hBZggK<8dO+jHb5RxQS@t$w-blz77}jC^Ao4c<6C11$&eK+_DE$d9kbNCua}Kc1
z(uT&`8OTmcp0X+nMy$Z|H$Lhu$|FC5rOlOh=EivNNCv;(R#62bX4X*Mcjei#Auew8
zM0~o+{U^Ty%+%K=C!!B0m$?8<QO`<{5Qzy2eYV;uA&&?5CmB_~nzt%qxb-6}$HxR+
zv!@t9(;Oj1j`Tb16YBsa+4TT!1VYVsvFiGK+-@oNei_fo4EYD{S74}H+->~BwIzuI
z4fZ3{``9NLnVaEf=D!ZlY#pv;j`q(eyFd(e`GqN38at*bClupcGCJpf)S#))42}xy
zY)`{i5SRwUZ(TdH$f;cBDT$ja{sMZN0$A5V3Ma!WpRO=34u+V1=)(sO<(Eg0wONjs
zPa7=qxqnLO>Y#N>UYW05lQ}yWiuK#8ui0^k8I1>MAp9H%rz+H+F4&XkPxB>J5SzCa
zLPg@2GIN0N%75mEJ(A69=d)h6O1CEUu<Ej|TBcX3{qw>x&T=N2@;2I2ZIJqOdG3}g
z)7_}8V9A2Y6Ms7}*;*y0f$=<ui*g}82%~_*z=q{<pNFDG=E96Mry5~AthPvGi&yz#
z9%wRQ$6=R>#hhVZU@D^Tfk`oS`V=2H9MrJz;Tlo51PgTBas4)-EZ9c<LZ(^|?h!}1
zmf9sXsX!pwJE$FfSbK-s^5EJ)lI5l%g#l#l@77zZehfS@r==m(rRdPR5o0l-Utfnn
z#*;C=6LY^0?d$0rO?C0+1kwiJ(6!+IL>pN{Ev)}uw_A<Ky8Nuk^-9<DIGDf)6^UY1
zEsNYT5;&IoANHQJH!Ppbg`G>%j7urpLhAF9_|P5bn%v$f2L>4Qx#{%T8ZS}{E=luC
z^;V0&T{tv(|Ik&%jV`_8O`wGJe(D7?-a+VmxoQ!Sw0v+)Rakh3O2_xxaE><M#|MeS
z^a>z?lbS6FpL{D~eeZTklIgCj6v^?Tp=U8TYCa&_!sFYa>n$4N^XBPcqabF;%+x$I
zS?xF=H~k___GUvcs|_8cndNbL&-Ze+8An;cN^IQts|Oufy?<0m&y7#+ijHquu6nQC
zDSRD|>2X{HCDtPqCy^Fnj!;?;b-`}}VI&fT7&gtBw8;8pi%29M$B>RJygA)bH=j1!
z`-!SA@5mOd^}c4i;&rmm@GREQn#8h8PrA5b`H}z41nm!y=WB_DGd$D$51RnDW3Wjr
zVh(U2_+c)1$UoW?a9xsj?d4{Ek0|1XH_O_TFIlpxyjM4KzWJ3(pV4&fN*bm|(I|_*
z%NZE~%T|5+z!J383r8kq9CW?)R=!Mbq&QGpS4N)d9D{_OalI;qL#!It{sPjPD{42L
zboH07B2|Aug?49}fXskK_2KVJUvevhCmtJzVhaL-pM5#A$1p7tMCgPxqlhH`+~X+f
zx3JHsdqQ`FQ0*QEwEx7je;2(iadtPYx{|>WdmFdc9;XxPYd~|KIptFR{8sXP!s-pj
zIK6%4z`sK#^#V!61vcjrkkN4krUdL&qjl`BIkMZ7vYyUaknTyop|LNUocB7q@_aaN
z<|QLYf%))39F{YXZU=tx_MSdrq(}LSwCarO4<>Ch5?Sa#G#>f4w}kwud^~>^jEYSM
z><y`l!gb}PdP?-SDg;cGOUu$v-8Kiyy$fl1aWARbBL($Wltlur=?#kl3WO>erhlU;
z@SfN3^#)sx^iyNDkMP^5Q@kqk$@Fk-aGE~*vt_yBY&RV$|J0B+QjA_iHbCbZT(eO-
zE8-{4k-1+hoO%x?#lk~$q;`bn%KH8;e~=lG`B|H#GCgy(iv2pJ29|Hem1%x)RiPf%
z63W2AJ2G{P7J(Ul9h9lXM!811^WB@0{lheCyBxy8HyMo1+k?Vu99`5X)E6jQKGi=}
zo-!Uj<)Vu#6kVIYC}=yl{1RgiY+F5qNiNadCiytioNjz=!Y9k7$Gq~wlRAUxY4Z;m
z2Q$*Tc<NoEyC{npqpEVttoU{-R)j;aMV+($0MWjB6*S$ZO2&~VNT(SYt;lL4U^yNA
zvQYgsy?PP^=mDBU$1UB0+yAQe1d105nFZo+9A{O6Vs&SoW<hw&E=5Nm=GB=dg94#Y
zGi|95MQ`(R5ln*|Ate{X8W?uA?L2wRS4Uk6hg~L~)9T=aFn2R*=rOb5AIYV(Q%DK@
ztAfK$6l0N4!Lb9Cf-{8$rh1{C1`juQ)9hk9W7H;uz!WLdml&ci<KnN!`&rf6(#tr1
z1XtCtor0p&tz*xKz9)0*etmeH@LH=G_U6oIq5|qJ<e*5od+GD6zDg@{4ml?i6>n^%
z>Sn&6sHx(Xtr@CkjgxyK9MNvm|2YRgNjJ#8etM?CN)h)*VIV4#L!vD177dl0Rt#jN
z$Kp?bCAt9;GCy+Ddg$o(5hscz4pP&$c56pK#dT7!O@=oWe|aj|42)dEOj0p)9O^+&
z!7LgHTP8{!AS#4-QAY0La$}2G!FN79HU`|J!qOi)GON`F+K<~OxSlCKpUO3X=eg(4
zX=Z5@(;pqw%BdjevK4sinn{<>i#1hTds-h}G?>-2`TWYTV}WO?@HU3r5G6RY8C~m8
znR?x@pTp%{g1`soji0_5mmk_b)=;Nz2b}<_T;v~A&2l#GDBmhxQkfeaVu_2rF`pzv
zP~6<;IQI9rHl#RWqa?hyYD|r}`yo52)2c({JGqaIT`YkprCruq;q;U4hvoAd)<4{2
zqgJP$`bVI3W_P_VJGuPAX2e|86P(A8bMk*2%e=Dh8|$=AD|KNmaBA(q+~)hnp4F6-
z&cxo5lQLl|$~_g^tWL0I6y(R=HGc%^rH3&#H6=F?nM*Z4fdnM7*>PIlJzg``MQ{=c
zr-i133Tz+YT^}wCJY}ZB8?89^Jy?V+NwuOf`y=+y%Z<b<uW-uI-<nLQIR3U2Aqi_p
z@xE~poHAwIfz5F>!yN11eZ1R0%Rloj%-H2ebhV9J%$z<@C<%6r+^>k#iljfti@o%Z
zw!d#-z_;GGOqNeUER4S5@NNJQ3%Lsh;)=FYR7nR|in_7m<hVMjrs-z?0o~U^I}5HG
z_t`5qc5v8$$KIKtq{9ic&E$f=+Ui34eS(Db1f3~jldL0Yfh6s|lPWPSQ)Z|At$a!i
z)?_e3)qR0AHuMzNv(BAaatb#$GdHq@)L6DGM4FipD+Myi#}nV~s##o2OFY5p#lVxr
zBNoVQRa>*psYvS<Fu{Q{qAJH6roE({j3Bc0@_vJ1u$IV27G<z2QpI8ddsjR_8bZ#g
zJ&!J^HMQe4Oy9YqU%O(RWi5Cjz1D$lm@esw5Uy>n7NKUFChqiq4k?_tjx=`9wz>EN
z=eQH)df4diIHBX9_8%}U>D67k=-uN<d51KB5Tju(&H90#^60(1(>_xHopy4HFSxhY
z;n$-%!B3J5P_MHugEB@OQIL2!7;rrdrqVF_ta(rqm3OoCIEj~9_6F9?ThOI`=o@(l
zklk!vSB<#QTU|hCkVHKepKM(ic|`Z4wgT~&>uZG@ZN?7jJVnb?!BN5Gmg3l6XkK8u
zEX(7e{D#$(aRbulK&Gpi?C+!o|9#nWJ&sVp(LX0|3CaQ8J1|u<m|aEU91T^j#Cn?k
z4!V~zs_cWD9C9K<;%`HCey&@lK8?Q{CKwsCV+G${V<P%qjWO2UJPyXG(InbE4r%A$
zPdLkY-!Z3YoJe8MUJO+vneYmBt$_kh?|jT2t5G8=`{A?+j$+1PU3rb->tE`6f^#{a
zc1jxC@!l?E!5zQ6`PtAMcne=u03Fj0eE2{=(f(AV0Lmo=G<6Hq@5#o|OG5JQl*<sF
z;KnJO^Fj<frQYH8imy~<Tl1!xb;l|pvy|B3ps};xIU_4U-i2c4NuG%2w6v|djm-Gt
zk~bjim{yYiIzTco0at;!dw_QQ%5XokHO8_=h6<0NRiwv312zC_=BAv%VAf^aiy7DA
zgfW<;==)WR?5?|ylYNKsOaGZu)dYMaIrWzMJ!*Z?8J+KF0LkuZ8Y*}CZ8wIzQ!69-
zp8BXiIeXHnqi#A=TQLkX|2<3ii#09B;hNEMO?cHOa8i+B`-9zO3?S<-c~I?ooZ9xr
zT1}BJ{iN=T7;C8t5nn5B_Up1a7i$Wnq@D5aEw8}BVLLZI!ep$tpE}<i+@S?dKDW1S
zu>P;X$EE$JR!>AgntV@9P+q1+?e5ekg!bJ>>QaPy7hS`^fI8*Qdu4KKpn|W2C71%c
zL6KJ$^p<s&Q|YJIFESeZf-p6GXtsg@auMf-5c`|UpxKafy-#`^9bKeZ{1~<8{O+<J
zS2#h<9$UAn(HnK>w5Ywnsk8L%8XsGMah2!Xm#>Yeg|%hUfUx&gz=>~Os2Zr~dy7Dm
zEJ-2uuFIgHX_#3R&a-SI!Nqxo@6d@}j}&3%!d7nPBRTI>+t0b?K&96T^!0FYwEM}U
zjv7ywrY;I5xU#;>yLcC|h6~kK_d5Qu?8o&RFU;12vKEH2xZw41>2R{r9z)mEjf$^Y
zYFDw2g43sBi&tmX7B(KUH>RD4zm1Q<CNV8=!0YhWt^Z~Te!6}j*1_=OjL_9WJ8SMr
zaxSg*l_|GdjX_5Zh3aQ`wb)tTdRW(0aks&ZMF>>F7{e9k1ttBp?>WBmvn1qrltN1{
z%E0!sXK^SL_-gFWHl&R?3~5;lMUEW*kTfxZv``lmBD^js@?y^sGu9G3g|Mi-Ec)Ih
zVZ|Yo_|cegPs|<Xpl>jR?R7HbFU;CaHP*_`iv=Il2Bb9^MKE+Ok;<!kldHZP4fDq4
zZ*@=rE4JUhm(6)LrI}`g$ecQOn{S_R!2BufUqBU5lH6yA{5CbRR*nGjr`8Y}^?PqL
ztS0gY{tc0+AUh6Xu@VtwS7T%Gu8&v&7>7mK3M3C|!}T_7faNcOWX%Y;lg4IA8M)lb
zTlGqf83E;cP1v(bk`33AUtdTSqgY%H_)c_sl&TLO1UimcMZi(hjl%@qmw8&^uYcv}
z%=0jLQ=>UmdH3MlkL96jTVrLK?n<PO*T0K9x*wWf?4!TcOmqppYnC#%dxzn>ULBR9
zN7W)RlJJwUyZUpa+{Y2PzqNcsDQ$Ul5;Sp)ed$!i`foHdO)(R+W6k{N-8+x-4e~9r
zuF|7hI5qWygA5h|bWO&7+I&2|w{H+@bNTYsnG*J1xyW>D#kmmGCkQ=t&iMbvHKL`~
z45ss)-T0p0Vn43Hd5%F@QHq@$pj20oE;3k)<qgRWq?`S&060P6+n=!b5dgyab^F~4
z<*wUjb8sJz{cE7%f;wrSgf0zde`L{Ph-gTflE(yAzTkeDe1a}>4rT0-Lrq(~w&}E=
zF{xVEy{>o7DyLA4a)kB`DoK5ri|B%%2@G8^dceBs`{hkAaxiG1f5k$oa@mz`Xr2ZY
zfdzWYQ_YbE6n>7efVI2v=z>rNt1H}~<&3USd~(RSpf4oBYU<10@;?q7Nif5?!}A&;
ze#?ijuSq8PtBjAX=jY)HXo_3KalvySBU7slHYGu96~W{EalUZ8wfeFiN;9hPFyYu=
z$;rC3Zyy-HPM*lyGu=FwCWPd5VQp4r-OY?AzuD!CiL2CH@*9r2fwx(@u7+ee!-g(2
z)AUc1KoK3f4|>~BheH|WbwhqM4~A#vE$8s$Q0iPfAAkMK*W2OjS~0KteDV8421GcN
zhPz$j6}*#_)#T%Nt=s|k0e{I>Y9Rlf%;kl*+j2(e@0Ra4Z}SCFzaEo&M4UFk$2{JA
z4(;VSh*hdt-zd=7+z!e5l;km&Qgd;`-Bi@M;&Ae+O+yzLID#@<%LU7AAB1C)sg+-Y
zp5B$c`(eH5{N!>lOLM=ta;fMpy(~YLFw0)3#kmO0Dc3BfMpQZ_dy<J2xBnfP+>#B}
zm0cEci{9$@p_J9w`m{0+GYn7J%V6_=1@G`P;03sv8oO^~-3kPP5p(kuSjo%H+JE)4
z{zfX_*~LGC7w{X#SVCseXz^;V`RLx{`aAfzMBV@G8#Mw~rhz1RKNhwmuuFd}`QN@Z
znw4(BJL^B5Lr!x)8ni3j5ZT%I8yNe)e&iVf=JEKm3vKM@jtdiKm*Bx=<J&2^`zwI8
z_-{Dq|2g(&juu&3|0PF=d}14&2&j|)4Uhe|E8)Sk2T)xH^eErf{0<{VWVDJF@e`{j
zD7f`>qU`0M#sB)TDL`EFp|gVND1`$c-<0<I%F}aIE&3(;ACaXPxa7Oo+TEKo>p<_#
z`t=O3-L@Cv^U^Z3T8RHh^mh^0mv<4O;N??BsrGUC%&O*h^)0)0>3(<aPn;IFXUGYj
z{#*Zf=XU{<FJBIJ9Z7Fc@>|Rq>&*g^pn!$a=Bf;h6~MXtZ_+Dj_ieX!dAI-*ZOJ0P
ze;ZEkSw#t3*FDi+cwxr@2S+~hpGUsCr?KeTE{`^}s=Q6#_L9Qdvl}CTCA@n&XLqZ1
zKbI3?D890rV<B1LYTHm?-Prh#!MXch@cMrPmHEGp<nMp~e~b$+K?E$g%RT#>O}$rN
zcyj9$7;?GG1g*oIdj3J<^%P>(Tn7KvA~wS(<U|SQu950-&66D_s{aK?sNc)YvX>fb
zR51>Aan+iSmDWM`Z5EcA_wNq;mxD9^9MB~Qm|Noqi;f@7zyo!CfdkcZ8axcJ9m=id
zaJ=j`f}Q|9VCoip5$vYBk8Mz?8}u;NC_6<aKjN{rN=j>D*Mp>c8&sX0K2KCrNG?`K
zi$`h{{TK#+KV$!wpZa^ox(D+0-D7xIyF1JM%^m*NBfqNq_u!8PfL1sl^SS}u<ja>;
zYX5woTIvgciz-4#{49)gb7!&Wnc5&X@iSGa;&<cB;Jpkkp4#s{wpUdB#&gC#>g__e
z7Q`cuJ%0zDTA!L=B~jMM*NJB;vUSGrCE>Z$Dut^*7oK+a*j?U5)&AN(`>*mcgl98%
zUpC0pc%JNHp8>bH1fV$pVdnq#m?Zy({N5Z9IV+0R++#TFeNg+L_OQ(ERI$rF{ud;_
z1OYTdAHvGvTX++;ox~p;MjK7@Z!^a;geyW{n1P-?^w}MQoAI~QU!`4S170<`O0~_0
z=tlv5^xkKw869W-AHMOd=-0Yq@t)`waB*$lg#jB-(%%yg0PFq_QAF$^Wk6h1qZrJX
zovyavoN(Z7@Y6fkBr8B05X?INHdW82fUi>2QGexsPW0<Na9YveZ@Is35x^AxYe#^V
z`rXT0wl6!;Y>#0Kc<(MyTLCET{y+DHE%iTLQG&c%%{j-zLD39;6{t90?;?DsDTQ-Y
zTPy5#&wy&xnG*8V<!?T((Q{CQ2`Mzy%oF-^Jfi^=cly>9M?X@>_?zt3;!<+OyMu$=
zu!m`A+I+jQJ$hc16*b0sZF`8;7TF^_dKsAweERxnwnYi3(mvcKM`YCw#xjOF1txRb
zF=!wK$L#;?u|0k|#2$iRZa%;(cIXXnf1(DnrImCQ102wkP*vqQz<JKWbO(WKzVT_^
zA=(B^jDp<wmTwK;9%si-t*$0DI$k^_M1(LY#`fau+4w&S6ax=Jq?roCH)w$i$AQ}@
zVr|;>+?N@fV<J+8QynTe#w!RP>gT2#-FHT#m@~uUxB&8TE++l$R;$U|XAMgBe)gn7
zY67`uLijfE_<IwwLUw1^%JHe#sJYX6!OG?yfN}nC;kB2h?@en=lW)4}r@1;7fcG{!
z%AO)U8TST9u?y#2sr7fe=dl?4vYieJrc<M<zZv!qHW#Xa=xZlrqWq=`DTFmKe||sW
z>Up=an%|Ymun*Bq6?4gwjgmy@W)CnVY_ATCLk!e#8KL}hQ$6#kIIQmWJlw&5$DwT)
z*OOC$R-hej^J%RP3iO7=aHIS`GhsheLoU`G+0O3jQB$#3xOi2fSWaB+L$Mr%bB9ic
z7&;#PXFnV@C?oY-es3w*9)MKde<wrj%vNVjS`P{Hmm>9Bo$nI)XDvz3*-|_;{Aq3T
z{K&Rd>G7to8;^H3<18UTtoB<Ga~TNr-I@G2w+1!QEBGRonpk&EdCpz3U3*2O0Y(k-
za=%c-!IYgJT)Bj$s{xP7Lg@FHp6}1?ho1p`@?8t3Y?jh4gcq;?v2RZjhO`_#Ucw%6
zujy7dzJa-Qx{j@cqJf&L;42VV7IrPrQ&~)*W>?=n^8FOT)9EucKFt9I3q|cmPT(RO
z#6ycb*MKEG96HS0kD)37kfK%En?lE3%buUp#zu|T)WfDFIuPkzjA`N_ty=g4Y6$K6
zx50$s$E@PKenOfuL=~YLqP>u^Ik{iIYb=pk#qTx<v0CWt`^jkg4fhxZyd5!vBh=YD
zmi#7&&LhnZ_D4f~I@0-Fw0>#Q+km2reO?XFA}~=1YZWD)x+Jo!MQYloi>LTL+$eJu
z)d5UZ8+kwH&ztKBE*U;$V$zkMv&yCV_(Nzl9;R&OpygLI0dQH4>_rt3^ru-HD64X)
zpE-*Ekg;%K3h*A=`l{3<Rt0Gd@CdPUqv(9&DRDx_PWjA_{QPb%WJK?8Ivg0z#UXQe
zEdPji+v+Rh&D@EMI!~<*pPQSEXt*N>_UglrUY0<=ZalU0BXDxxh30_tPf^j-rHKau
zJ3WxHa5Lc{Kaq|VtxAcQdHjCfrW`z2?p{A@qU4SxsO@g#(Cn(7L0}C7IH{sc3MA0>
zkZ@wf#kI#mdw(Nrpw$;!P&nIDN;^sC!0l4Fz>x%c*^WIzRcAMX%A|5U120Ke#-+;T
zuBdBf{@_NW3y<(uG|Se#lNRBBYc_j8FA(IR{NpO>;``ikcZ2Q6-$uQ{+nNH`<=aY~
zCenX`&Q^G3`lW##rg+_Xy-NU%h*$cl7(4v*86t&8dT6V-Y*eW1k>x`2sUA&OLcnFl
z*n-V(e_DhRzfqHq8PfovRG&DZXdB+QxMTioB2KN=Cvuais7Y#U9>+7<dW4L~I(vbk
zu*TJAVLIk;LA%?Ndyc!UgoO&qk;B9COa-3WfAI9-4=dMp(v+na!#*q5Nj_1@pMGGR
zd7FH{YgZ547`X9X@r(h2pl^vQTXi3j^xO&B+m|^`N$GLbh*c*XXnmqnsYvH_ZvC>0
z+~rl>yyD&HKpQ-N!qd$b?`ini+p9jsnVm~3lDkjCr(7bR@XXhS_pkKzfloh?=OQW<
zW6j@Bw=gugulU2c<(F=xoppwVSxejt%D8^It)gRfC&GOyT9z?a)!xWxtsdKNTRJn8
zOR`B1TLI)9m+Dc?{4rYWdU0BYq9!u0sy*w<X8(<Tj%!cuSLJCe5Dq{p_wZ2kD2|iv
zx8F6JUCek_v)5)kZHOoLW6#`QW>-IbMw<W*?~C4|aI^B$qSX&p+Kr!@S$z6ZcI#;T
zd2r7?4#lbUgv`tbh3AyBVZ!Z^F^aV@z}m9oz20*FK{Q?A`gpSDPd+8PuswFxuC=R^
zwWc`z8e)gwS1-_P3fHa8=otx-dIzeQ52p^Sf7$~!-o7GMsOFzSP7k&^RtGj5ac8*)
zd9Jp$bntL;^>1S&>xOZP0xS5XZ;yWD(Ij^%!ILFLIvE<*Y*Zd<jJk2EmJ9ME?;aWk
zI4n&5vh&ip=YfSg+?8ZZ>m=yrTgweysA(z!bJDb%-LN~ap6V5~!HTJ`R!lqC34F|;
z#1EZ`-916-Y^Q@&Ngaw{Z}1eB5}sE%kdDc1cnxx2m7;Eo{-D~}AB(igCgz&r{2bo4
zZ_)K#;kp2O71$_*FQ%r-eJlBAY#Sf5ue+!T<~7p1{7j~HnUIwBAZg}nnS<=Cs1MjD
z<bP7h7LQ#D^NeW%^x#L{ONA5FeAGdSrPG$&t%67*b^IZ~)%HHYeWDme*F7uM<I*<K
zB*oktT6%ET{@vuM?b+3&>W+M{6~u!m&2A`M0n-2Sb4Uf}s^jxEY-N=-<*li;ju(mU
zVj;p`Oo3R-E;sKC|9W?G6I1Z@)ggqv_`dAI1hB(Lzo(i*@l3UkB^?7xAVaU8RRAbf
zBO;m$4ra4}oiF8+Vwzb2A|7RgmsaoRhxJY+Z@`LyAIaFgNGRq@tbsc8it?PJt<xA!
z5GYF6Ky>T@(7hq9$2%^DpnVVLNb`~B_Tl}EUmWyoehp3n`W~aXUR~(;!Lvh1D(9d!
zmb;@<*qU|*{F<m?R%A*V7Z4;(62UhHYylJTD^xR6aVk*p4wtEitMCHDs>rh073Uuo
zpyh|I2Y@0zWDsC>xDBCnElRTT>gCr4kC!Rz$11_9ZR^=)Y$G=n+)b8yiwh@QhNp54
zeDEHFz7MR;eYHzpKft)VR?7^WP*gmB@vUiN+w@n<XARQ#%WdR#H(QagVSk9J`NR)h
z2`osGNrviVCAh_E7W0{Sz;-X&u=l&1>vCz>uD~XRqVM%HgJVe#vORl4m^B5x(Joz>
zuT#wxdiGU;^E$f2l)&>?dQt#!Q3ZYHc)ZPJH~(LXg*>2YlGZWYq)=nNCY;u>u*P@4
z0+v8UeDk_!2|Bwyf#S7V6)wiPA<^EUL$k^#>l&G$ZXw}0TNcxC5l+&JwQ+DUar71*
zIImD7Cy3shoao4KXDdnjXRu!T6%bD~9h1{$seTQ}5vmhj(F<NePR~7*S{dR?mwl58
z91N$qhXi}6g3!W9HC_7Vvy@y8j(cfu7b&czxuHg&5_1iGeY1aV<IWQ@0C>R28Oiv9
zx$#010cX4dnpAM)D!>1;-@sQ083w#qDoU5J3~;eRC?D33p{!?K9MVxRRd-`1WmuNt
z)Z!b#&2T-HrHRvxNJS_;c)2|9jnCg(HZ<@BH13y<Aasj>1Lts!W~?T|^Y%Si#1UG~
zgkTJ2^mFmRt#PRf_;J>hdr(S^i8_^23mHTGW&)v`rEuQKwSH#IurcZ!YQqMEvhq!O
zp?|1#>p&ZqWuR}s;Ymk4ET_!tD}8kWJD%jyknHM0KB^*+N}{_bglUFJJc+zltC^~*
z;AJ=W^J6hsI(GrEo84Gybdwc&$R1&vK{()szC}&GZQ7rALO^=R$54Ia`*PbpA!s2W
zGbg`K*`tBR=Si+wWeJ&hbnS`Ktl-qP9?w_BqK0VnRnb3!*{~D3Deks!Ia}r5+-uv>
zLItchE(DOK-%dyDrSZBnFyKj*$L}#Y9BNNy8HAF>(e%k0Q~5osh2s}ek>-Fo0WqK%
zwn6ZZ?dV{4&i3(+XR<|gr~Y7&7oneqk0kR-G;AJ<kW<N6KB&!r=qRdLRw9xgn$h|d
zIP-Z6U1}Wg^8FG)BFYFaZ>&KJ-dC=JQ=892Li**fkhLP`;J_StnB=$vc6{p9E&=r#
z4_VDdrVvU7an>0Gy2*mxjMcFX%#S~qTMw$Oc|N2thWQgxh-V3M8P;#TDF!VEV8K1#
zzFN{k;Jlxl-(gp~7`4SS69mn|;L>3@WLdmNgr*{Q)0A*tdCITRZUV#q$!<MTrxmXC
zXJ^9xcz8$T#W-r7b+>-k5N}<(pi){Z7_=8o(GQMSXwploQ#Hv@ZREvBnGr+M+_Y6;
z#!uJrYVT3XjFpRvHSX(b^*~7IM$;_qrvjHYlkQ0Oz14=kWRc}ePx@=c91STFFjatS
z`s$fi%lXj|%MC%f&Mnr=tU@`dGJq4Jg#MC{Q|aHnSS*JzXy4o9*y0m|(sE1qw@JDL
zu$CE@GUPOW9XcQ~BFL_C5qCcS!pj<u-?y<SL3)|%%_8E$w^B?_t^+b6ELl$hp$+!w
zaXuwVcA|Gl_a7{Zu>zdfpWg$HfF>s2y8^M^N#Fo7R6AQ3#QTn%_L?)fJpCgLAy|NV
zuH^bwOpCy?2wGK-q{Ij`po%RV7T=W#zZ<KTq@z%0@~qx*@>%ycxv&UM5Un;!)fScS
zEw$ZB;*N)zHd$H}*K80`nSp<tN>UoANr_e@CXDhmC*;{!8Zm4dUydpj1ni*t`w|*-
zYK;b=?DnQeca=-Hkn-YH#SY#^samkb7Rh~T@Kpby4nTp0&|3cB$Md&$%3bYTR(=;l
z;WRSX$W}&XOHeOslqV&(4EH{E&o}OLD2(T*#Lt0-9GS|bBFG;FKj+DXI`dshvmoD)
zgv6a9Voz#AeMrmfd$A9BHVsB>MX*-7I`}WVL7M&^Ws+r14Uc<l$ywC*ArGZPufjv{
z2jZC#`wJG@j&znI@>J_3`Ul!MxjT{97&{_<w|fLz{DBa9)YuhbOvn+N%b?9lBeI(e
zM^mczP&399I*PXX?rEwQmI}B(&*HqQ<~f&WOhR3E#K+iIZYCTtub3yh<qe|+Ag>NU
z0e?s2s+TcuO$(s=E!#b)&MAl!L>Bf8lRgqv-6}Bl7jR?0Ith#{b1VdRCaB_$;&l_Y
z55(%=xv!7DW#64^?u~~0AwDT6uwd*#1@~kH{}7z#IF*ixF&2)CWY)`Ch&k)~OS2Rn
zf-bMm)xyW0#b0*Vnv#9-*={5r7LjG&-rEXG;7nrPJ6+bkm^Fp!_C^pT04lf73wa7v
zsPf~DoHIG6GLqD|mNQIEkM{0y*WVevO>aYk4n!atmQ~=1tlv@ogUs;^eFT!AnmnZc
z@Orq!!=!&-3N*pwSADtp|7h<$qnhfvz3<D4f?@*^lp@$bic%#M5owBm^b!IJ(h?9A
zLJ8FZC><4$E(8Ju5^Csy3sF#dO(2wj^n?IP2Z3kB`#k6MI`{edzGJ*&-1)#5?h&*1
zURhatt~vkn_wTwrpOB)E;})^pd+3egpka3KUWK!145x^ciE+K1<K;k~qY%#Ft?7>q
zw-nN^d)hY<-ZaG@4Y$rX@d`M(D6Q|dAPwDklSpiY?DZa_aC3-xWQD60EF=nYaA_{8
zS7xJkE@BI>9TZ{?Vf6*i*}lr2E64M4GT5gTQ!FT{i1!!`jxux&81}kK*ZEpqp@`FM
zCx6KrG(k{Li|33M>O8l5E$!Ao;e)0Dcfu;Av6mEscIqng2oJB@%_{x91hLqMlxuCJ
z;UM&}w{&$6H}43FTmbYE8lEL0|3}J6@jQEn{Lb1+<@hfednRn9Wakv@aYBg~@4ux4
zBSI;9>XUIh=cFlhprlh>u+I{$&Pkcrc6r_Bq4{dCm|l!YZ|_;%p2kVNNYVHzs3A6z
zI9oGYg1XZtsu^)3z%Vj56*k!Y!*3$lz5WAEm23xni<UzAkDMBro|5NcjcXDcEGzi6
z@-t{}1n7*h!W3uw_x7fkYwCXyx#IU|GuW?gI+6VbV)Sj3<lgS3gW?0GvOKZzD>sZl
z4ZfQ_Vs|Iwhf8%qsEdQjrph|>IDbj%(_;KWj><H9lXQi3#Rcn1C!da2<TvIwrQa^x
zbWMnH;{9pXCT&wd&FPBv*08oWZpxq@DRGwGl;~J)!@J~KD!YwU+?yP_BCtJ~QnEHo
zpWT5<z&1!ej1sF4vIWA7rTQ^HyVRJS-KRav58j=a3M(3`wXakL-;hIa2l0ngs+Ccz
z#ZC8oR$0cXd5P4cO3faR(hJd*yo?SIGK(&4Cm^6AyB#n^<u%uXHkbd*cFvs!GG7h7
z#&irMtJWvQ2Qpk*rE1_J*P_*ErqJ5!@w-Rfp=5^j&eAJ9(0<bxUQ5ZW)D`2tZ;wJU
zm&gn4y|V^tDyTO|XUJ~XSH&iW9;_3TasSq_J|}()Moc*BWzB09)iIn#GtI@B93ask
zxzE4{Zk<x?YL#+RD-s!$>3y3l3fMpqY6eZ=JA|*o0TO&Q(q7+gXv7Xri?5!I*#r`&
zz7$s-yQK1^d@!eIYq!zC%b(gGuC@Q54fSXlC>%04lRz-coe5k9ra2?!);tMs<#I?r
z5>h5r)1Qz!J5Bra-ih9V3c>bF)D2%lS`!T`CubewMdW<k(=o_4gAmwOwv5QQFbqwQ
zW~0^AJ?MP<*&=+?>HwFrODe{RQ1DQvB_&H-<i<JBr%`&a(2C>7#`gW3+}Zs)92HYe
zro9QS!8qkH$9!6;>Q}Go%ZfDu7Cl|g20aHeSFdR5+%#9)+CW3?_p`~)9p1sne(GCE
z5EO$5^u5;9aTA_TtdL!sQSZBW;Mye$xfER%S_}i|8Q0WW2@b>Pw`(^Dd`p`t-;hZw
z=N3bSipy=`+O4bl&)dPKaE5cnQTVt|RX0dEw4FORt&iqkc^g{0`yph?d%MxeXq3YE
z_RM57F)JB-$(R=mZ>RCy41Khd!)eD!bG^0TNY!bBp1#eR2c95<bdp@xd5_&`AsxI|
zbxMZttZx(TjcJdE-2CC^7w&J^jql;v!WOpAa9fixnDw>XY|3RAeM)&YL1^K+pvT*P
zJdy$Wh!(+EPxEc)GSdlz>y_u7*lP}PVfLF<jY=$hHHp`Q?)k_!Rf69(L#kkfpW<4D
z5>aKZ+pi=4YK4{OmG$xI`nunuxojQGRBDP-yg?n6Bgu%!=v>QPY~=HPj|?5rEzS>I
z1_a04tJ${~QVh*rZ%pKmoG4eFUU0b_cUBbiF|wu3avxZ49nuLRe#6OBh8~gB(UjN7
zqD8DKy1>nW$YVXzsVlUC#6*#{@;r^5`~c9oGIuQplZx!K*Q(M%3vIc$VvpyPd^Tu`
zOMHJK8ooVHvE*-W_PCb!rIL`+yGhIzx)j+CC`ct%)2c#8!pv?P!g0Dj(%K|}l9&cA
zQq*0g#R=yz3wNCTIln<IA0<PE9;t8vq<$_@F1d_LajomPp36h=>P6%+5~r;*4{LFX
z45Bxvo>O0+><*<ZJOWp=^7cjhZa$&9hI~|MVqU)9t#PBP5;g6#gRU&;2QAEq>v^zV
zr~8${T0fk&0+8h7s%vw@*$#PWAW5nUThH>jm^O>DWogIp$7198L#xW2r>ukQ3RVij
zD)dN3B_8s1<<^_yfYF08HyP}8v(v9nNWDY&{QQl5-IeclD!4j$*_y~coM|HFh~=Ky
zQxAPIsm%jpZh0M5=|6$tly2`sMiQo|-J+v34J)NyQ;J!+*G6S$ydw=f)*RLp1<$Mh
zuD{rnJF;Zjvvk<qj_0K0(wGl^KoNI<QPB5G4(8*GURRS?pOyrN0ddW074QgJ5M6eG
zr`(pxOQ`erq=j6k1{yWl?+{6bVzho`_thD-=~tZ%4tcr)L9+J!8C*v~58<(3TDbpg
zo~XQvqC9|A=anzuT!<kpAz~6MmH<WoiRksG?P5=5=9C$tFSmKPG4qjECG!)=t$^eS
z=_kmUFX;I@Kg2(~DkUIh5X95P^MbI=VXlce%^jWS2(hG6rFqjn$uF(@17EnZGHs9h
zMgT6}ed=rFt~id;<W=er4pHxkOCknXP$eH9E8dU8^&ZkGnRjaI%YfANRl=h(`*>2+
zUln-w%A1$T%gfBW&g<QjG!7^*Khs*b25adxF}&nT(5PwzlYwb<`I#6(!90d(<G%*>
zs?k?A%dD|%Y;u>#bA7#y-kK@XMZAE*IW4i8reW6O-A;{8hFD0H+j)=O77}aQdW3VO
zogHcvQ5h_hl2^(j89#1%->r^)mI^(~;C7q4y=1uSK>=8eAH8gQHhG&*mX;ZG<V?xn
zyB1vK>m>lpud-LF!dskR@1J<0lSyXHT9l`(nQKgIN}T&Jt%*=GHSZ|ZlOkVOn|-DE
zO9Lb5@#3HB0Dwet<U3(uWa_#j%WJ3Gx(b%YP2<pp5J|FwpL>AbW{jip!AuV?VP#bN
z8NgQZb=(Yo0A26&>)p2`*>@rhFv^d&g{Y*&udSY){N-%b!CiRa>HNxR|Gdb%2SBc-
zji4Dt8zSOfIlVmg%&+6kWP~7LU-yR$4bNuaevo|QGUO8OyzxZXd0L=ki;mDz>1q<a
zq-`!P(1>rX^OssB97PgE62t!m1$9$0)SoEp$w9&2mc1)a_%BW;`b3&ZW!A6<diyHe
zJ^L4_@7*b+CUtGhO~WUo0h4Go;!KvEL)AtLTrOx*ym7NgISnJCd$!$oA=v57&+Z~%
zT>Cw0@|Q#0D?5{b`JVlmtRSg!mL;>Rx9UL9@o63=8nZg(p{fGtT&%X}<@mI^T+vlZ
z6sFI};S)K)2Yc>HH|t28KJA_6O9N8jX{$M6u<Sf4y|5FX0=M|7qyhct^t5Lr478%(
zlddZHi2CT{-d2Ti+ZfnuWp%BO4Q0<gV@Xr4?W+U;%FTNKt%!FJ2_5pVl35BGcs!zD
z2a_&|p_jZK2DQKc_U0~vf;XR*A>eUW1Ml_RdB74yj<7U$)H<FQY3aj}3#se&H;vts
zyIszj*75<PgI@Wm7`OpY3shP%ho3Wk_8F9c#`ABvez1|7jouiml#=xU8~?0VU#mP!
zU9}?x`=lS+`No5D)Q*>qCEz#g*;C_z9O;HSe-w?#t#U|bJYi*%h6yyPFY%t2Cb+~!
z<H7@%m%4b~&ewgz0wN_7iJ0_VCc@*snY{|FdKCjOmH1{cMy(tLRLS&*q*M1zU!tdw
zE{UW3%yl;49hgPJ)yuJ@$g*zsAQ_uWE)Qg#$KuqyQxqQD5f(Z~Xw15rtaU0Hj&k+k
zRmb!*CR^fluH?@T^vsD56<#K{sCa{b4@+GvwWBh7b#R0v*)u5TsbIAv)IjHCP)N7M
zv0lC}IIbxy&qgZQ^%Y}Icbw+~(ZiGm=>~yae<hl&+Mh3>R{4kEYkMbe^?C`n8A}TN
zKmbTci48J9@V|F6gZ3QU+4n_=S3}Xulr)!k>uMW=!Zt_Ksr(-IiN5($8Nf>PkL)CP
z$^v*I_n7URN!~k^ht4G`w|Li09=~&fkK}_+>l(F$9K~)A6VO_MJw=}H{RR3nSlQsA
z*IZRV%QiohH0#}ioy}<V>pk0mYv1NUz{zYGi)GaidmHfBLC(*)`2QNZo<)#A?V}#a
z=k(?5yW>a)lt)pDLH}Cr+#LJ3gf$;&>tu5~08MsW>3<AxpM*kQR)@pK!T;y{%xP|A
zU1?+UeO<b3WakW^TK=NYeXv99i-)u{#VHp3JHi#x3aVdB3$&~kiXHXFp%Yj7^Wm?u
z<RSMmxld&Ml++Y_lTVMg?~)0X)=?3OcfPB;&-YujoeR+_tQh1~_e=pOtoYx*e%hTn
z^{^Ck-evkwA%G>aUh^Xt%WfN(J)Wx6ugn_o41&?~g$-L+#Q}-Zd~I3Myj({HD{Rk@
z-H8xx5I0qUfL@Fl<?fY@d>}4AptfX*IV`>euE(cql!QoTlB4#uf?UM-)W!g}6$?tf
zab>_`qt+iyi-e-HVQK1fe|9Xt9?k&xueFH`gO`MmY*#JCN9u?a+1b)fz+O7Fl_NuJ
z_N}(Ev+-aLCG)1tpU=Yv_NH2uXNO~FJDnemfJQ~)V{^k!AXPTbz_*zZOYB&tfmK;A
z>^4wU*7ZUx;?!9(LGf}~?LjWe{BusPhDfQjX8W5`-h1Yt;Y1zpgNn9A4Hs)v58bdg
z{?21qm`pfTlC;+V$wN7B7Z>?6V;^uUk&sxf@*>X)(QDDKqa|@b8e4Fr1^2bxBQ|N9
z*GcoL>`0wW^DwxS6MMp1e*5Do@el^uH*IM=U7MR6Jrg@_W>!-huQgKR&V0CHS^jbe
zco=E)4b)u(vG2$Ci|O~k1OOzZj80VciVb7oiipZxTM&^U8lGL1Jm=fwBt)wfYBTBs
zOv#qS&DG|yt0x(N*I%|YbUI!2tC&fDtUbyc0QU;c5{nB@q=L7tq}U~E4{Ig~5giH!
z`-*D;Lyz7tF7Y#UgE5AD5D;Q-^vtgeRx6S(WpTPe&F_p|GS_F1f7|Gcymj|0y8;uE
z23viQs!upX>c&H9<4p8LEiS|aZE2gwswKf&EUJ&$H|<QT2owj^RYH5+j}W2LkA=m4
zDFMUwswXwZEZKa~4B?-j(Nc2zt?S?hvq*v#^Nx9H1@%)!-ev6ltRX(K?wpaj4SYzo
zD^G*CX^r)lc=cRHSMJ527EljG&ks2qy#cH<VlARN)l#ON3i`k|!*ml_q<><kuQmlP
zUoLMKtr?n&ZUJ7NYiF}L%K~W9vISj&n%R^c2Qz*Ky|TH>4B>e}Q=C{%{TfHc+CRHC
zIGv{<DnZZ*)yTJ4+vBva+c9)x_}i1)iq{dgi#P=4y)2t**J;4Z0>$zm;)CM|7QZc9
zl})N=t4Ixg(6AqKSPSgFM1Mf#?7xvljV}@>R$eA$vs43l!Ag@m)d;OE%ebSs;43}J
zQ3<RTMi*=GIn>u|Y37ORF6XKrL7gOKX0jaJun)W7nHXT>I0-9Zt6MO44T@pvrKOxc
zlrN+y2HYE4Q-95P|A#KEpXs=<&)?AM^4nh_KzdW_=Itfan_oho9Y}(w&8349%iUus
z^Qon>UFSVPXkg&y0H^_m54jTp;_ZfeJpfhB4-Se^RNj=ImJ>ffvl$+0DBbpQ>I7&4
zU^B5j4Js_l{N)g)+@cHGzo2aU2m|TT1>ad(GH0rS?K=l$LPhBlh1K>q008v;1B*;z
z`TBx8GxLNndWbYk8K0W%eELiOj$O8}1H*O}w3zMb;}TCezFnL7G*$*?8M|kerNJY6
zMiwWrKNDUMCSESM4{#L?hjwPaTw5xiT@N|^e)ZEU41o}p1?XjTLX{2O?F}_XdJhx)
zb<w}0*WAj)`%Ald{9KOi+303#s#G=}_PWcc1T<`)(%IMry$qU7)~gGSeBh#Q`j7N~
ziYfu8N~?L`JhtZ!C@by=(?4y6jzIjn(QMjVyxq&CiRqt#{KMdYXF$LYFNf->XJd^@
zZ+zI&0+&m;BCh814M_p}Z@z{1O{Zg5yTjYFU{ofwk*$R|6R%AHP3AbMr3Qz4CGE$f
zZOZ>t<IJ6A1RBZhs(ap`hzLm58S*}D(||=ltB9-L`20~@t=;=B`Sijm_sg(>?sMHP
zgu0orXdnA{f4-7LIf1^Sgn(=(*AR&zgTyJ%H+4$L3b#7vr~t29-_H{`v1>d>edrZ^
z_2)f1*hkR1)=eIR0DzoJQjrW(6FS>G-%rrA5_vBsWCp$)b=_$NW=cw$fy=8sorR>K
zomPr_o0yLPH)g|yv~l(7pw+mj1c)&0@@?%{EWupIwtveQ1c2l2@^jWh9IqO<Ty%Qn
zb-44W$F?Bicem8j*Ji$?hOcq3S^!n{!$r{TQD68Z34z3&eo_Q}9W1Q_?{5VEW+)DP
zSZ@c8h`lY=5voA;?h3l@k3K$I2f494B45ANe$LqGi3LD)k}tDg{iR$6zN=m8w=V^R
zq{{++_9Ihjejf<3&LyWS2a^O#7n+oxwa=8nj<K%jqTFvS{#{y#V@n$+Ia8Bny+58%
z-ZML>rxT#p)12L~+AC_U^U!jtvXuOKcip?~_Duk9)g5j)?aRvn>|D1ysmee#96;Ng
z83;h$LIwwN{Ew13*ny!=70s})LdiLO_IqZ#+rFL6D(xBG^a6;=lUq3_0-c((m`|mX
z>mhP_62$Og@U0P|aKo8LwI;L0&p^3m>~EoUI2-xBny*c-wv^2Ty8pmz&OUB=Y|W9H
zkaDCv!rJhz!*hT)eg^qlon%zc!1MsBInd0VkqmG<&#NVlJ)&i8rTSrrYj1bynBD2H
zBU)jWOV4&TCwjvemq4AdOXB5}3!cq9Oi)J!;yFC8=IwX6##OYs$4o*Yp)TDVU{>BN
zHSQNW?a~JG;Bi5<2Yz|DrBpNPhvWupo4q*~1m|~NK+KlbqqrwGPEVM=206+&q_sPr
z@uN#rZk6~zA24@Z74a2ZtC;*DeG8w|V8uPNN!n+I&DB&k2iTg_r9StswW{Az2^|I^
zxj%y9(uTXlN^_6E7{Cn7+4ruPtQ9-V7mYc}4>}wVY1wkVACdGx7Phjk^<+eP;L=I+
zNNOn9!E2O$ix+3>@czco1|_a`?mbQt>R^^?TrL>WN8K<o28CS1MvJ!|X63*;d~^5M
zm9Y<@tXe*+1+Kr}h3~gQU3m*?=YB6M&stYMGnh?j1dWD(R_J<$C}{?i1%--;v#o(N
z>cyAwu_q;EnF5n7>qb=UmXFG&ui0Z@U+|tgTI5XM5#d!Ow=TdcGd>oY+?6>9N(cem
zQf^>4ST!`oM=UHp@ZJ8mo6fh{pR4o*Pl|9l9j(h$Q+(s2T>mm(xi9X*>W`|JtA?@Q
zu4X|GJv^Z6wvoogw5EJOnq}D1Z`L{}b$HAwu--n_X<gy2%29>z!3xoCNVa60NYt%J
zp<m(Tjn=3)ae-#=8qTF|1Flx~&<fflw%hyxn57@L-tEnPl1#8S%{Xe%IoN?svP&ei
zHXr(pRCz!idGz4oa#H#dHs+`Gkpi5a^+y72XwWfJ!y;i43Wjur^RN~a!4fS}E*Y7d
z6IeR4oy0f7lF+uqd+O8bsPGyA8jPcq1yuRkz}7E#ydu*g(545Npugp3&<;W(&LzPi
z;-Jo{XkE4dpH{^3=#CVdbyPdaGjv!3i?)^sb*!>UVT;Hl`#nuuyi+ISs+3-lo0??)
zNTuo-kf_J*&lDqo5(tz#-77WF{ZldH4Sfu>{G%@(n=8u_Z9&y9@=GKgcOF_%9aj1U
z5PKRD8awMG?yjXahfihVbfx9qScOw|abU&dp%>^qjqHYad@K9x@1)aR^2x`=v@(7y
zjlb)cCD^@3?jAjG@N*F;xNNUh#=Y$4CUFzZmfkI{3FD>AtxJ<D6uGTV{cmeHZ-*TV
zV)x1HtIwX|$6Q|}`epM%_?Rp}1)t?;gz{JSO&+kLQ@1nv>D>wkvFT2=wdd$2*4vNF
zErh1uLX12vfppmPe(S}D3<C>W<U}HQ^ZKz?3BdFQZ3}8mPpe4+AkWFGC}HklVT+$D
zUMd1%`|}=MMDv%U3TaWz>BbJ`S2-;QdWJxQ?d3gAKeptaJT7kEo~o_PV)1wCD;lh`
z238gP=lJHwud-H{r1_oq)`cLCcITR0ff}h$?h!yY+#}T|lZBl1nBkT5h!3SUnoxVR
zfPl+mYc?&wfII&*${h$=?k4EgreJFrAGIF>8}1_F)Qm$-s*d&PGUTc>vm~!9>F4Jq
z?h`<b^zrgfm%6Y{`3B5#U62(wJyPUX(>L_bjzS&g`~(HQJdXco*n+7RvqfF%S)fWQ
z{Yb%KRtOEvz!Utcl0eDJ_S+oI^2!d(xhPk1%1%1}mt->-#@~>^6=p_YKf?-|$BPwO
z-;&ey)D`x1=Mb&h#WN#GpHIz{MpbeCvYKU<wR&)~CWU4mDyXK<GH=>fLAIAMqZ<X{
z#U_Wx_s-Q>jl98Zi;Y5lNA#=lfu%P9<AGWS*fhHP{XvsSqIc#Ub7hF_Z5ygIe0kV`
z!wpBPD($$F7-%G=^P$cmk#j;%TT~*2&SVlADC{*bWHbQ6*J;uI!plFZuj+bv-O6o}
zIINX4NZ#9h7W5`Ad9DI@z+kPjTGxo29c=N%2@ZJgOh^Ye?5nm{Rb7#_G-$eA-t4;i
zlGs?;ORQOFkx*w2Xlh5Bk8%W$i;Ue93o0L&rDtqa|82Da4|Xc?ap+Qsy7z3fUBccD
zP(6(A*VNIoP-}t;fwDuCS?BT%U>HI{VBo!=iC4DeY&4~5b*A+wucxy*7GXe-OmKXU
zRN(Uh11ZxydvScisd-dVQ)!k$$bPi_><&E@fG*(>bt!i*=c&d>?(0)vy<9e&j?xJ?
zIiC2bB!|8O+B&d#^!=G%?x<M&+DTy&1bvp)^CPl)lk%}rBxR~Per@BXXDb!~?cSex
zS*c9m#G`PF8X3j-$=G<3HG!^M4f?q1*y-QFvUuwJY;&P<9IxZ?XxVZA!v^leH=pV#
z%J>)xPnW`&d+e?-i%Zm6kGl`o{Fqwc2Wv~;HV1&@TO)k_dTLl&YDq4Rezv^Wa9?*+
z(6nny>Z8C739_D;bHq;Ca+*FFbK>8A-LO4Q9A*$@==;^g4Aw_UepDa_hLuMZTz&dJ
zPw7A*-|L>*6-zKNWyIUsuOZDmC`lCWech?H^lfe4qy>(o6g*}`rs4VzPY@}tRJ{kA
zPJY$`m`{?OyTxZX_SVvtJEQjJ*Jrf5AnW8V+PG@Gpit>n1RgsG=)l;M7&}CiE&#}V
zF>mx-TLA~}C$4BvjaQxdofMaH)w2$kN8Qtl)a7&n(P`Y&M(3{eqX!T2R?^#4OpG|A
z?-Cq*QuRo7!+LR*H$jSzf!H%kg-I)4*V$PblUa{D75v_x9~#HxJbJYsI-HhRBJ5@S
z9JxI5?ORuF2FN!n1$<aBoi?Bj2v0M|>>VF0+A&0C#V4k2&{O9gI4{toGyYM0RR`b@
zmO!up(RIM`T}t&i?=6*fX>JIP6n$UGo~s1IVWPALpIU(di!}4;MM#T1Y2JPu0#;n!
zq~Wf$h`dVx(co=PL2CtgY~^=%IDn9K$eF0**ZOi2cN>*0BZedWEs}@+2!Kl~BXieI
zGbvw%b3<tb6cCAmn*QbXabZA`o>Q!q|8<n&gnY{eIHRKD)mtbPtjj=;1bo?`k2ihQ
zA}w2~HmA^Iv90Oo;WG33aFDUW*0lbu;yYdStXZ2%c(hc4T<Zq$?z2_O#FcKKFt6^U
zUV-lIo?0aU){_v0j@%iH==lWcucc-P_LY3}?(ifThBY`$+F1SV)ARJ@OTyqgyNeJY
z8?Ee>ZQI@g5_2xulig(9qguZa@UFh?ffs{_qj?ZCeHbtGzYU~FWK~`AU)`xzp1+D2
zxsWVIUC(>8-Tnipes2=%6KKQ}8Jvhf>@gi`^g2{W-O}WE7D3WFsmN9suxI!aYnAo&
z*4CUnCfjUHFGg-;YI4Q-w|aco*pbroF5ky>%slbXyX8^CMx&xC4^L<heTTWjcDnos
zz@dE~P*7JF8ADDUa`SgR&iRezcUA5KwNH;rw4HLi{x!?ir&Q(h+!=tVb~+n!qU|I}
z>t_w}d|3hD<c$c^Pd<Ef`Cf^FOJAhgp|zB~x1m0~T_1p5`?<0w+TS65f}#bIwAS>s
z*4(pSgs@<<&s!<^<80O>Yx5E5Lt06Bvh}}anM52ST@(1L{aghbNwi?Kcj7S6nO>w&
z1L~eyJfv@qTtj7*9Az>IR{85L6-A{;w><`oO*EIQPU#ya#N%Pz06Ef9-?L8ekXF&)
zpPdyRVIU!WAX+_25E;Rzb5^<PMN8U<a*sky5z+qhUCpmEJNYdlptza{OAjf^Xqf>4
z3wohzISVw}z26k`0^7bkQ{B7n?x9hsQkX?s`USw;o?(&x*}XlGkzD*t^ZPl!CEB-<
zdJPUs3!%W>tw{5r16D;$=3<VJ6zP5Sh?BzJ?gGo}x#9xrpS>RvB`WzQo_2>8&Y!8K
zoq~%GRa`E@=_SjRMcbN$xDT0E*R%dOq!q?2u)LvWyu_z`_amN)R_4S3^>{`AAYBHP
zXPGl)Zr?4$-~p`!9l1Hy0^@Oo?t_^;PhG89oOWe#77K2S$W49446uQqD%X50RB5`n
z$H|Srj^{4)TL{h_Sv!)#7wtb=d>AS9(0A<Z4;c5TqxYF5PwSQ<j;B!@*KsZuXF+ot
z89?b~nC3<3Ri6CKa$PT{0<bRJY4N;(-;l7DEsCDr5Ab#T1u%#Ib<n#4hG?n^Z}~jJ
zpR^YHG1K3*BR#H}zyz$<9qD2Ih+9b{?}*kU(~mu1;3c2^?$rCS_Kqq26+3zf@mM;9
zg;fNWMgT0ptjM-sTig$~g;6QS5$+aM8w0IdCc&#5)jUVdCst;D);oQRsp8=_RJ+2o
zKOzd-xWnfFf#Ht3>T5~OC?>kUo1KsI*J&c27ShhcE6Pq!g1G*S8vxK!G>pmbo!8~@
z*+08GbiJjzL6djv=^|D?6Q0+$4cf5Vw=kD9A$<PUJ5|TERVZlt;cN7fR+;J-<a01*
zfuHpy8V5jq`i)hmBXVT!L}pzLqRca7Bd-A=!)~>Z1Ix4bYd-lb5?UsvZ$&HA_0fgq
zF6HTCDRMy-RaD8)jB!l=cD+uI_E9PDWAFh$?>9cdX#Ql-bm0ly9yCSo9&9Kf&9jcU
z{~A?YC_>(pzv|4kVxY#o_OP4p7OJ1<_A=flwa%1Z{tBxVVHgN9j|R6=&yiwAs4;*f
zkd><6hVb?95)ZR7HJLWp-d9zix239C9xkBteW!Ay?q&fiy>()-QU$3|ayO^_L(e*B
zB>MNHg^(tHLQ(o^9h`0k*%8mHtMT#p?(>-|K(2mcK!bKmjXv<9)w-@a8tH4qzFMX!
zI`mdP8VeC%a66fAjq{*7eTTbtj)l^+fakrCR!>}vs|t-r9kuYD5EO0_!>T#HXv#ZW
zSL>h)d>%s<9l&1Mk)^)6{Y=8l>#m(&ldd6<o6yX7vs)O|89`D@7oi%pH9|4*F*|Nm
z?RulJ&PpVwv|I@^O>|S?uBN{~8bCLKK)JC?hY)$OujIDd!6dGuR*5+!%D3jXP5Mz^
z7ALKm@&tse$VTUbHT(wX$smrN4tg1PiI%_Dm8$ClSV@5IwvbkZFU&RMjBGT#K=)#@
zXfWhdCB}lWP@GSMfl<O2dgA<{f<Dj($af?;$#Pm6?7@E)7X*c|NL<aV!SnVhs4mq#
zPU02?l@MpHj9u;+;35;w3RG;C=_wR=M=N2__@L`eq}P-W1pvln*M^>log(93e3Ijv
z=Hl?U&Ab(?os^Y+r$snxuSqZi=l?eC7=7dVvG%K34B$kTsCFC)^V;4T;zz(bQjt2l
za{WbXUq+S2{OU+;3&07g0|+U)H9xs+U|-OZ+b4^~l<4wwOD1o@h+g9XSlcZiXJmzL
zcNCd4^)5wVrG8Xl6dE8)&llG$CiPT8x8D8F!U@ggzLe-PENXdl(4G{8-cGfAk4Q@F
z{yGx3_wRjr+*7}Nd2afy&O8{HnrQpbJcfHHU!hEG#qKlk20*iR$)AVs80$^p2aN|U
zjxkj*(l2@d=OEsZqX_A2kv-R;nEi66_kiswA=@B`9h8^K%oWxc4W_fDntvzq8vwt`
z8GT$OC6Z+XK&^eKKRz$tW6*bp_01EAP3Kv=c1%*rB0IA6$5NY{hp>G4Bc$MKl|YzL
zV>X6HT7fK6qe9INfUcfOx%)k#GU=u1#35N=GMir|um%iZrm^KWYmpi@P})#OH6|DG
zciT1Tk?dP0UqLjRjAff5oCmP2TGOvUNKQZSGH!oed9$gIm><L{3u1zvbw&(wRCy#G
z5Z~pt%Cn!&Zys%!4rec50VWE$F=+cUs9z0i8L~3$_iT%G-{n#5tCeZW!miPIOK^M?
zYWlNGmsYVn{jHEJD0PCw<N9bN7mAiV?;3iDXT*0XdeL93Qo<sDkP}l9aRHct#~tu4
z^T68zwMV+?7WL?!Tt$b!zgJN+t1sgsRBLM10)CE9M;tbJtc_<t9_^f77#)~A_BfSq
z&cC)ipL5g?G97l5M;;!Wo~>ARtx9?PZ)uQhGVmt#gwbe48g-j-l^7l?D>hBr<$L)K
z876~F$orO@j<zMxDx|Ru{!(01<&obkJQ19_x}GuG(coaz_6uY{{(Zh+$G@=)0w}Ji
zmrG;hexzW^;@1~dDhRL0m;?+k&MkPHL|G`Xmie}^VGlR@UPhrvTt~g$Z4I&oc7IGQ
ze>b~Okg5T%DT$FAUIuB_65=c7O$t!KLS#H<%c^Y8-f%EnB%LY_v7w!FJJ9U(Nq-y1
z`v}Xovza<jNnYraWgu0INefq>Kq&TDU&aC#mtu*u;h7Pw2#w;~21<t}&FSFrevh?m
z?oP0eNL~kwgQOj`dJ)Gs0=&F5B-rUhq)qB!dhVyueB|wwxw&jEa!OduSWYkSF5JTw
zajBJO0uI&Bc5pdsQy)B>pwP<s5kVn(rMdh5kQWpX)ANfbvgcM@$!GJXbM0{|px`k$
zY5K?eA9B08%m;5C_?<r&S99i!yvxv5{C?T~p%>0RWz|&3RL1s}@4ZdX+UUE_z@;e_
zZt7S{Pl{}lRm!9sc5A*LVcA0rDFf*=<I2HXn6hl@w;J>UL1$Pfp$Q8b%hGcOWO?qW
zP%I;Mipl3W>)6r?+=&yFO>|JeZ`!%%r86j@FWlPubt)fexM$o+Pc$D<(88*j6?w}r
zAc;)Mi12w)_w~k?e2qK0tO5MvsB6+g)9cB|+bY;+_miA=t!6e>QnDkyBE|K*eIFJ!
zvBG+S(O}D95F0yxs|`|eBVWpuZB0%)#T!sP>emZlQ3d=fGM~u;dxYm*|FMApLdM)3
zD2Ezp2R2hb$|NPTA97u1Fg{?V?xHo~<sU!ch&+A$BL1our-htx4@c!rqY+voEtQxn
zeyF?m7OTaQvZd!;6|6455A=HcQD_|eGXpqfXduS>bHablnVtYFun2ojN&(YU1nci~
zR&z+M;IV~W%%yX&i3d%$#zbskR}=ls5EB@A4W&nj<=24K1Z>~YV$ZGfUuahE)0=s&
z-lI#eX!j~63pIEMYKMINajZkn{q$!?wF#ds0{aV2l#)Ecc6g;=Debaj8v^JNau<3~
zdiZhWjiR7jjn{~?G+%2#2!#<NKIwOy$Ys`cVc7|<>Fo)TRXsUEO}`0T{t_0@GH>~-
z`Bm`sP&Fk|6*|B<nSXEhGh^5_1%{1#P2yhY^JH@_X+!mrYeB%lrMBSm{d~WNM|HG)
zfV=@c+X5wIQ5whA+9M$E7#<gOZt#Fuh?Dis?sl+~m;#(|%=8E}=FEw_uEHsqF+hd$
z>sVg&Z`@&Yy*6)4?!+>Ba_$jI6e5o6(d%lrjvUyll=cna)7!d~;^=Glw~%1_Qoq%~
z6N`1}+HuOv$7q+Aul5Yu$8HXCfT)N9aA(*1UGDjvLyz-TIwF?88)U$IKW;#>08#NS
zBaiz?qa(_^O@t%pp%@<Fa=XQPChN#nl`wEvCTPa624&u4-6i&w4zvCc=LTgoh4h$s
zd!>b7AX?mNl+eb16LA+`8Qh5*4=GcOr!;~h$Kg0<{LOgtPx=G7dvZ&Ee?(Q23o`2C
zc$H&k@#ohtfaK;G=eaEKW&2O&hD~|Ds6Z?LM1;D%%HpFfFXGuBN61F-PqnRRyDX2!
zdp=6h4l3**M$f$uV``_K?EHPPOL_Lp&NybaYqvm-0ISD!76nWsceO9vMPvhL9Y_;>
z64~e<2!m+=e!a)??lEY^MG-cxP0t`R`~t#GAL!+><Cw@Y&^n4{=i==k7bKT1^k+gY
zoZU_#aWqRB7}(|O-ph*;c;0+(Fk(%e9M-(GOxaOXa(Gw5M~7?;FiIpn_j9E)v0BRl
z?~qkFAbAmE#^0ufc*i7^5r54imB{#Jktz?l%bJ{xj{MT9m=wD{z(2)~RBOC#bnLY{
zr%F>lhTA?zF3HWKX?iwV-h>;UN3=1~fc819i8^lH;~$LMU2=uYn{tKO2yrX52-@Mb
zr&T0CdK0r|zDw=7&AVs!D+xk@Oc4;g^ds|@K2IvVD1kq30g9V*xOf~wZ5JwaKzg(K
ztY$&8B5Yx0%r%*AiTIqnT3=&Q$7_|xvpq=(aXf06$HxKCt+C{a#gUI)PZ2y8$oXAB
ziPewJa!NNgxjp5IM})Xrda(GX3VRr9x)*#$B?xGs?;>@VpS`u(E7@{?E1N6WvMw7N
zRkh}%c|+u|R*zGGIwjoXxdU+9F+d+!`KgYk27SBgp|;kGCGVait$=U=VXc%_VdK+K
zSB)HkFU+EPP<CE7#~=Z=an50wlcdB?@S7R*<wW7GnXhlghzZ06lz5?a>kPPEnkD-O
z=*_p%8jP(<f<vn-OiDfxbyGRM%GAYOd@IWORLzfm=Ubl4{VPcD(dWfprP>;6*r&*Y
zCT0}3gYP=j4vY@K!x;=w|3HTcd4%Ei8f?r<X^?PT2|<pJs6uRay`O9|yV=3+ms~4+
z6R3x{aYWi?q$p_4;mM16i;sC@-X&dDuyke{%7l6q<><#psQwgnyr4@GeyIa+Ww(3e
zq>p?o&XCc(iE95~fKMoe`!x%*Cc(FQUxT_%FW{q1K<!!Ae%>pXLok_LL~>&0D$jlI
zPM$)$dw25P6wD1}%5Ri|OUvzg67gx-#JPXN_sI;=Eja~LPZ;_s$V61-E$bQOL%^J6
zq2fvB$?2TZe6So&OK_)Ei4S58J;@`<WEy_@Wy3;J(wRwKkaHH{d<#EH)=1fO0!UHT
zX^V8=f!7bVy_YIno2!D;Z<%ncVtIGa$<vZiz&yE+lEA8ILA+NA>N*BJks?|{eDme5
zF64Y3rZ^MtbDv-4RC8J3y`OWtjWCJ*0QuFivDFE{kG++>Y}ZhYqTelddL~b~4Qn!Y
zQBi)5R)uz+I}oOFFGXVUWc2r)OaG`(f%dh#N?)BmV@THDR5=vwy#l}HY220J;ieo3
z@~=f}=qLbg7j1v{*O>fUxe(u#xDre#(nT%|<oAkDDn#!&n&qur%(mi0>Ojx|wW?G+
zUy-Dz!0_Sv9Nb7C`O0T#BQ8>d%hgBR+Zm(_%_5GQG54@32NPK<hry=<^@J_hv~49d
z<~MV`2hGzL6EWhh$KR5G7VjKEVT%@tgaKJ&RwRK*3S-rX@_ypqqYr>Tj1{P<9=om~
z?9d>5TNe&PEIFTy-pmy?k*T`S(XyZCXfD^`&_mp%{N#|W7}*)aYuK2?HWEfmQXrx)
zG25a+-X$r+Ew2l=@S4=`=Gt=^9OfyGKL+JPu4WIGTzGoT!eem$ZJ>0uh!AnV`%=Gg
zmr^mwST5}w5L!sD>NFi?Ux+u|ui&;n3;c+V`n&B8-3=g@?xM_X3T&lw*@7$qNvd!b
zRRR#NjaX6qxmv;g9p_ayc~FuW{mL?Rkmb<_VpAD_Kj%KH5_G1*(05=t?a4p;Kh2;J
zMj)y1G~iELsD3fbQ7xT1kIBqYO3YRCirO^vc`ncgE$ob9W@FtI9bNQwqA>02vw836
z4)6<zng9#!6#}PcxKWmd0{kw2Y>eNIv<$9U%Wwe>FB2q%xx~}1bd|c1duf<$fjs?;
zO;4SDxY?a%<+5WzNPV;?e`@XdO)CX6=@tt^UE!RC%m<~zaF?!AeC!3o2f&&;AU;d!
zs|xBOoK00oi)r0T!mcI0)vm8;)}_-Dd5r*vi|nH_kZh0Z)-^_|8J4O)M|kCTkgP)Q
zpUK)xmsw{&Jc!G{uxZT6_VHZ_C-Kyv#^5;0KJ=~5EBeGUnUP*P^tDY6MC_FQp3E0%
zH;zYHPs|Wa;x!~LZ{U6A@?J2Q@U9~OUi5+MK(bO$7Qs>`))TN-(D%n(E|*yu7C0IQ
zTL_u(j#gO@ZaPa!_kDFHFcO<B){gVv^t^Ym{z^s^PtbZ>-X-;VVAD(DnVn+O;xW&W
zy)AKk=X?7=eNrTXXyT;so8TpDbBp5{V%KxQPq<2#vwL>(l$gRtuI|JG=&dkFJhkGP
z!IO<n(zJnLEj=hv7ZT6-30Pd}ew?Up`jeUQw_71@KSu4kw6zOdPKFE47yL5{RQwma
ziOFvg{2yXHfMH@{mwvzUqW@7uVzOcW>t)0Fj}KJ;7d7fPttemhA4+Pif8n{9M5our
zT7SS&m~yoLd!iFXtbe#^{FZqB-!loCod3ttap5-;?Dv^Ii~MtO{}*2B_nFLs{;`q%
z|L~@){nrCW`NdNTI{<=;v?2fdN|}E?3;vlU{qNfow6Xp3)_-69??3$jH1pqz^#AAW
zg0g@3RQv{I{nvkq_|L}+{%3HQli@!z2mD<A^Rr@3h5sxHU@H7)#r%I^QTXeR*T)VO
z71lrg{nuZ9z|Hm_2WF&>NALafh)UY?K#o5T{Iz)mz=HpLbvg(L9QgA<pz^*w!hat4
zYndCsh5tPApGyIw@t;xo>#zUc&y`mK>$`jCwm#g((i>9DDSk&?R}HWF;Kly|+9<3E

literal 0
HcmV?d00001

diff --git a/external/tbb/rfcs/experimental/parallel_phase_for_task_arena/completely_disable_new_behavior.png b/external/tbb/rfcs/experimental/parallel_phase_for_task_arena/completely_disable_new_behavior.png
new file mode 100644
index 0000000000000000000000000000000000000000..a0b6fc2bdae0c773531a818a8e0484cc60d114ee
GIT binary patch
literal 171804
zcmeFacU+U#`#x@K)wYUQaj>IBL`6VE_J}PCDgsqRloch)kR>w^LPE8o2qXdm%2W{$
z5fIrc(FzGe_MTCKYzPS>fvn$oF!bH`=Vjmj{{Hwjua_?&;FI&5bKlo>-Pe82W7uzI
z#v(sT{<v=4I+4?-PMlx2PE>B)y6+;s-w57`+V{2u{Pm5`dE;N#<u*xAfN#EY`o;8@
zb?fp8o4HpvfbV~}dFryyx^>%qp+DaYIl=<gtrMi5KJm+i0Q>1d)C1~bFr9<kQtacT
zy!1ie-&?`Y3`4MJGEGVfa!^pyEN)KLzM`xA2!HTfss8O(w#B(<RNW6bVXSfT`?IRz
zKm2f7@u_9ri=6K!tDY3U$SG{|ucFf{_&@CqE;(gA!Qx?Aj9NW~Fm@+z=R|5ZmTv(@
z^!L~EBSz4T{OxsKLT>%vz6D=qMMQn`U+;umAlLra8|#iALSFmtclN}p9{ulk9@L9V
z{P#Pju19S7?{}Ub{dYKPGxGo1?9_%B4{<MYIdcN})6x5~p3DrC<a6_IU#24jqq-Uy
zAzO|Z#qB#CeLs0EydGG63C0KCkZYs&oj#whwiZH6VZa@ID}EXL<dFYb)E>A06641=
zip!aRpVTz1MP{wympHCnhr9+2qUWz<2o%Pu#FdD{;3qqE*8+Y|-k0>)vpymU4E(u+
z(^^oE2vgu%i0T_K<O|blc@$FlCCvZ5nSWR2-!S_(XZ}UAf1!Czbp6XSUx@u*()?G>
z{Hx9W-w>KI?uH7svMT1hb9(Ch=zyEm6It;G9p3M^`-u=~perlxWj%>&_I|&AQITYi
zFyqlry3Ez)k;5%=@p~<)%2j5|!JY;-{0M!0qWLF;+G&dBSG9TiBKuJREj^2e>}zvM
zbDVk6^IOG{B^eBStIQ2WT#&C@L+*7()5^<7%-Lqz?iif7D3KA{!O@b{*PDz8aH&^k
z)E9n}B{OkzC3a%{aIy%^0qJfk?KWV6=HIPvW@`FRU+(1lNNQwxI&Ms>+lCsN?CwXD
zB>PD{oB7Rkxs{)r5x3GdRaD4(lXsS+ys?VW+0m~nE1%aHo?Lm6K+w*#xlJFb(jhwD
zeAREDDVaEB(mXlWeIVb58hWYF!?$vINuM!3K0+tf<Lmn2$n-I|U!59>A2D-j8)s{W
z|CCy>AB(xf`utGdyol7L!1RlG*!<Os<Ke?Ca@0pYL5DA?{d|L!J9D!VeQZhQRb+`(
zRUh^cogq85|NV#Cra=uXOzAaW&fE*n413n?=&0$QWtOq~;7VKb)2XZDp8fewew7;Y
z8TTU$V^ZmrouvC!i~Z&5&ZaRDF;<?*y;w>56Pn)7=Jwg^BP*b5o%5vHp|=R)(1Xvr
z9S6h}hZ1)w<(PhU^`-t!u2S_`o}Zy}#MIB2&AL`k_dD<>Kc%zk5}aLK55g0W@!V%2
zBSknYbEkqYSLGo5t99Ap5ccBYOhESNr%NSB`@&-Nc+yUM-W^wC@`E;>|5$Z@+QcPF
zEp6A<`zxW>_9SA<Jy1CTo;UQgmnz%bWd%=Nk9sGQ90QJ(Xgs7>Ilb!DQ4BTZzVniL
zfKoTgwO<I(JI0*4Yo{U+u8@cHX~>6DuRTnPNFa32p-**gP$iB&y;KoAdoD7AVANQy
zNpqqp9||Uy<Gw9@KK#|1up=muJKLO=_4&$j|Htan8=rW7Ao5C+WHE)vk!vj#Zu8Hb
zU8c(3jc2fSmk`bo#`Xku^rKD={ywsA1Sw^X+ApC4XO2o_v2cg|)QwV@P0h5Y=SaFn
zSg(3f8n1lOIGE{^Fmh~sWK63x#^Mp7_%vNlBC?Uw!15j5mzuvccI?eqYRq$t<Jaod
zj-c!gaqZT&KIycv!G7B9ku(W8($V1KoKx8fn{r`V_P0mg$&n;YG)?ucX3p%-+y}qx
zhn*k>%?3(OhzI`Km_~8$Nvwq7)aMoSvA=q!lWW7e+I%E+1^l+4&#qYn)ARJd?4Z9F
z-C3-Qb*kRO0b8OgB;`~FFYt7!LC8@Ny;)@I(l-l<cT>rj!sPM2%uOKMWXwr^E_z3v
zIc==7i;Qwo!hM2=(tIvfVg{($x-9p5sRUA~FHT>xG<QT?`|5+k6Su#b4rtF<SviHR
z$7Ul_BP(7k1fV@W_VtPf)&yA$w=!8nFG}e5L&c8lFg5B{F_+pVif1#g5?H5n6ZSGw
zcs366O(<kjy_Lf#bGHK{G(Z2T|JCVS>UQ_L)(!EKDM}S_H8f<?>0mcwYb)f)vTJBO
zAFm@fnu}FRu#v3Cp)tWXQ(Xuw=a&oO+EEyCpYe!3MyKRC<}YXL?<PV=(A15HfsXSq
z`i%AV&E5F>lP3u^+3k6RF@?qOO;mP0eW0o3hj>bZ1@1!mhcwlo8k77Itc|oz$3<dn
zu9B@T6K?iazpEU?h&$Ody`eK!P>8I1z?!klBeOT$?oSmwc)9tEfK&dc*w^_LRTXaC
zpU@CLJ+LA(Kb+s{lx{F8H<2u238LZ>u@f(!H+ZY9d2#u)m9Ne%>|~CC>h-$zndX9u
zyxu(X!+fL38JW|A5^@T(3G(O)Gu79vv8z|LXhF|D(aTT|K((F~@3y!;i`a$?&JR95
z*w=NQcx^2DlLu36BFhT{W-B9ZeLAJ&*p2Aso?!~DvyEnMfV_>Rt1Y=Lt7$ytO7sVR
zmuL0NaWE0Uq8e^YLw+&$9~RgJBveG%HJS~BoYe2oB84!mvbTa@9bmo1Ovz5K@ovq5
zu#u6ESH*DKL?g8H7nktQXCtB@l$?gMu@izRcD_6znEYm}TzU}ySo5__reX=4aypnW
zp<SFhGEkU@374^940QxJ{(0Tl7f~115JTl%o(QBL9Q<`G?=sWY{xP2xFc*o`ohZvz
zWfI$5J38wc6NeDehS@4~W*OdweWgQl`jB1P6pO~bBN~g9MVM42%PF}>BvqEgc_eL<
zGoimvt4h6A37<$#jZJBvZBv_E(JqR!FW9{w(JPm#dV2Z8*KDjT*3vuive_%{hpjcs
zgRiV`6yC_10J_obau2Go$!u$~<zw`YO-^N%`0N8XVrI6^!^7nO4<RF}6%&(i_d+lr
z;MS^kFT`VwC&60%oh^QS(N6dk?fviuJB|kVsbMme!d1_UCw4cVs*0R_nDn+HNHD5Q
zcN!y#Fsggz&wHj-fa}hlJ$lc~YzpgqjfG1AR36?}HC3*6PD?@yZZMkE(XZ8JATFms
zC)7-lt5q@)xDGi%VKl2IA*Z0+?^o8Vohq{JL5AmvUp4n8tMuU$_XGU@MA6>;MDhRA
z-AO)esC>Qd8LCDy!KP%|dKb_Uii;Zf=egwC<kK5-#cs%IzihujQIg&f*|_-G=1d8)
zc`{A5OnLB<9U5Z_-ax%F91%UUvCeN(alA+VeD}1K8qWJHZ81$oPT~C!ps$-3SjkBb
z20AC&OqCWH1#KLSnH6K}qaoPh6=uNeO~!l@6(o}bi?5V!l|A3>IyL*5qPHjhA@!>v
z>RTzLhPx7PIC$-Q?uS3<zMNyjc%42~@1w_q{m3H5`jRqw%<Oz*bAp-qplJ#%#&Y*_
zdr|>bzi-fj80%Z-LL@|L>n^SsTO7^xa2`Ss7k#HtAK)1ry##QL6a1PHnCxPRL11z*
z-M;hlL@g-^JLn~|jpYl#-3CqVj)eu6ceQcoWnu6G!DKV@Dv^KkL=~PD^*b87+L$aS
zDh$?YqpF{15);t8S^s0m5v0t|xE4qUjCO@Gb25UiuY}0Swh;@S9<sKUYACr`x;`=p
z+2bYtIJe&*uc3STl9{nVn<_JZYZTm>+;%m+n|pluVtXWl-EuDZfnD82_s90=s)UB-
zJ%fop^n?0&IFl;kKiI3!#aau~n~f|Q-Z3@J%U^B~m7V{Md5Ti2uYSTza&gJ7wFP8o
z!vtAL-1kH?gQ4m~;fE%FcFnXY^}jGt!Hwvcf|=wsma1;m@aGpKksR6QsH~`nsF?1F
zA_+~I#ku8@pc`CyJN{W5uaddQqCG^VPBOn^GB(5Tca5<6i!1+R;h3F}bEHa&0M@1I
zP3%{a-7YFab15`FYUJVKJ{#5k2<|-oM+5CRErpqr85Hzck+G__;5m;QQs}<b$$EFM
z#;h!{vuaP@HpZ$K(=W^1-C7h&pSfw{uM|$9B*mb4xs$Wv+JX4GmY^0XeV=EZ%*x5F
z(+8;Na#R-~+}JqvF`D;E1Jk8sM-)WAW4=!#MxlfMd36z@e!8$9nr(P1KZ*FY>qM(E
z|2Rn?e?&^d1^#uleu8(bhLV(Ao;I<UH`dcB9>BvdGkV4g&gb=uHI9?TS0+kU9x4a*
zUG1KEIg5{qu_y{cALn2P%K=gRwk*4~#G#>(w&J5NtFQa1BAta8Q!r2gDpYonMeI=g
zYHqiM-M|@+8P<tu8`+ooUz_02BLG;$fvISp2w<Ng*BZW5zPA!;_t`Zgv5b3%hHjgA
z6v#Sh*iK|trE@wzq(TuIjpj8?Hi-xJW`t2b|1n(DKV}4lu>IEfh)Tjz_1KwW*4tvH
z+9{`q!;3>-Pta%e_2Pj%d?00}qaU#P$^NHZOnn&-pb{$db7eq?*=_wjreO=3mYvm2
z4+}M&+`VYGCDf@%^cjKcH`OG*oSxNPeOr#0gytb#>c~F;61_l-fA2n6q?aNd<T2@2
zkfi$NIsUKy*Wa5LZDEHLkt0!_)WCs_mHOI7DP_~k&Ns9#5l25+TPM=87{O=a^=DpB
zEnTRa_+VG%G2guf{?Z~t5&UMwN|E#Ih?8r?;VkE`YUYU(ol@l5y3>E=o#mX%`X)=?
zCOEK!QZ(iNA-uRaj+tgKz~N|Aiy`s!D@&iwIaL#H)8px?gSu1M_!}RA8kv`nGnqW_
z)q+dL1uEf^MLcvTuUOatz_9y?T&v$pyj}F!I7wOJo78*sxm;PweWf~=W~X%fl7fgR
zU1f<P5@ttgKD44v51Pa;PgZ?(*jZ_zW~F-j52N?(%9W9jy0IH9sLygDjeW$3Zwhjy
zs6i~Oz+p8y9~D@n8aqkI3GxDp7bJq9>Y#KqvgbAOm%>7gSlBzp)qh;|g?{<<Bif4g
z_+*X-Sn*<}W=+`D2ySBN1-q8d2TLyJU+;bsfcc=E)tpv<o)XuV*wbv!cc>(JA}7?k
ztcet{_y2eU2Pd*hR;nj+3h<l>O0p^#HAIR4A?pcR{Si?W-4-;JuvnW67^|J2i~PqC
zqEVuxK%=t=onr|)5{@Yc$hD-2ZbLid$j<=1SPLEU%_opP!OLBWlz$w_;!yNnW@z7?
zR{s}8+{oW9gG(GVM~<l5I8l&k&1ZsTlUE~z6F9gO*b1q%&-F)*;?SO7?WR=~yb_5L
z6JBDcO$IrQTzfaRXs`F5|NQw)T^@;I?#4%=^;$|b<J?nrSj2Jl?329=E04M#4}zF&
z)dC3SVmVU&ah^)as!UHb(3|I|ud})L+TGDOuMd}(&wQ}u|9VmiWTI-oNcVZL<U4~S
zD$xxQ&hD<tREKV$BAKj=>JEAH8duVyL=afE^yZ$4EEa<^qyIVw<2n%$l|GdCwYK7U
zy6XonCoR8>$W>}7i!2Iv80kkX)CP2mmvKb0%AYi-GFKJQd!T@@vWJ-BfeV$KGxYc6
z%p5<Db`D*7@d<~eW)#<P?(1`w4Uk->f<@YW_l%(Zaa`9ZC}E?-^_bN2o@35Ojb^c;
z1Rc30*fe)+5%?3fxVyXkB9bs<|E?T@;oZLalDOQW1&Qp{0(Di#9s9?eOdsm3K1n!f
z(eOJ{^LY8SdwS@hDt&_<bt8i}zyVN#5Bq|uT#|q{P+KeyeDMM~@`F0zgyB4&sg!OK
zT8kW`QspxD3V>T5t@HKr4OQgdp9IzHxb@F%DzR=86`y*H-nmG~!7c+xnOZ371FnG{
zr1+*rpFYD!S$RJGDaXALC@xl0s2An>DGz{DX<vn4v^hL`#b4Taz=FSknjWL6DBJN1
z-{<09K^OPANZj72B=XrfdA4_wUb9{f%`ejVX{T3&-t);@J*YVzGsk!O@ekCnP5Adt
zAH*-8H~uQDET-5e23j0DHlv7JX|E!A8tQ3`P6Kh^O0G5T0+rw-b5XM7%5Pg_my0^4
zoT`4tM<J5Ekny(#$sm?ukj>^*{Cvm%aR<mzDhyJb=D6~7scaMKW~b-&f=g;(`XM-*
ztPr149=wp;@8$9nr50#2E3}|9)>D4)jj0$7D!^8M_aDP3vyRT!12Ax9e};0Pj;!SJ
zA|z{|*qM~_kEP3ly!qr#Ezp7dE;#djQK1Iq_32>R?>}W`+QS>5xtd5;NXrkzEnjRi
zMd&O%qK>)9mt00&F<!QB10hxQRbMTA$O2UNhA)XS^cmaLx|bCV=x)wYIfw{EUh<-4
z8CO};$cz-3<^pVz{49U3!lI&w&~V;#1bvnBC-qHj7cLzul0E=dLCGFoyinERV_0|X
zW_bzLRa(dQ1x8c`%vojT&}94Pu(mL-%^PbzMuB=M^3}y^pjZ-&pFIs%W$H?iYtqu1
z&sOnU7sBh{5rZ5}6#CZErvH)W6OAQwJXEe`!UyB*8dj@bd%>wyan51^TyBSoJP1+X
zE51rOjf}nsDU;?Y#jKL3n)_Ntvf5)!ZJfMZjN(M`teFR=5-flVWT1TJ@idUvvRMD%
zwMbg?s<e7~mVeVcSM>4Sm&{Mo70FuhKTOq2Z}?`0u4ZKBSv_r2p|0hABa5IqKdYP3
zJ$nMW+X69V0#8J@p`<Mz$kF?E@t^ih?X}!p-DWD5mR^*P2_O6)>|qr&RT68kd>6~x
z(DFMVAIP*iyqZ?j%aG#SPvXokO`-f?E`XbJbu;B~S3dQf`@DB1stT)64#Gdif2Q9S
z%|h`cf>v@&Xur#0A~(hwAY+Ckwl9iQR8$g<k!#P>8^2nZqKdp57Ca)YWAaCUz@O-H
zW<kQ-MqRXqvuc{!Ebqc6sd`i7;j}N6=AhJ*{dv@+ohmgkmQ?&EqlFI#0(+igRj;<n
z<%8lr-&HWmt{KV3yBx6XQ1$jc6ky_Nu^gupS7`(+q=<KeT6?tvc@!0C=_0?WGpYGq
zOeJaUe_oXewEL(jR5)-&T8cVtoX9pn?OSCctX7DpLjTOHd7svFFFs=dS`31vjiW!O
zdI&hYW|TruV`^fSa?-~xT48q$mH>_LsDK$Oey*G!Zjm=JSEis~qW~vaWr*DSAzU_6
zq9KKlp7;{kKO39gU7C(@B{A9_BBg!=7|)%AqRZ8MIj+3ev48r}Z}X=n)ck|NA0v)S
zUESEnnzm+53B^2&CmKkZIF-RN$TDfZL?LYh8!P@nIV}=3rZ3$*o0%;e2{GBi07pmW
zS1CEv;D_tY#uf^4ePVUuWwb62oUY&7U_E!VAbAO~t)+Kc-~YH`=tZ0gaMDQ&A}x%A
zHTo_S<jEy5#9h<!XYEg4t9r9u+AlaC)98**HT^6uhZ=xF7I?*HQeTVBOV|{<oY&J>
zdDZ6h3Nh{3bD7`%{(oRiudABp<if+@l%v2eX0*J>E1`}(c<G7KF#r|=_PrBTk|Vl5
ztzAsb-xL`!5SZ6gn%{15KdAoIPSOFM9e=915vt0m@A{ZHZ6LV+34p319|hZVXzoL{
zq`(S2dW#O*Ki1eIi=inByl_Cn+Iass3#8k#qMS1B2eZS-kz6T*skkMJS_0*VIvbP<
z0bxd(MGZCl51wRo*aSP!IN{H7a?-guH{F(|soRmGgRtAi{Qj$~>k$~tnG_#+qdIc!
z;8YePzIsJw^O-zz(O~jqiBadRO|+*`2;FHS*mC6e@N1GKIvUt)7Ow`Emd=S-+gK+e
z2baoJp8{2pbo2pt4|0TN<Gp>6+t&QrpWf%J+hL6@)=$eyHz=OAmIPFK9-TLEX{CY|
z(H5NI--FbOMmLBr-?mrc4RpCB+pSa{i>0S?tW8q$7j;LC{TkEKn`<@Cd&2Afkyj^5
zOg6qx8yk`e?;_wuiqyScdwD`Y&W&WaLZz%JT?L<>xW5|0fu$pU!uE~}tT7`tX%FY)
zy>^Sd{y|w;KO;_9l}m}>7a$51fGBh`?0dz6x;l~CB_#xN%?@QZTvhR`b%Krt73ho!
z5~&^gcqiR7vRBdm{^JJ3y*m2VFks&NR-QwfpFd-t-83Y6T3;1yrWlx4rMKAE!8wb@
zo+pVfkgd+=1-+8L{YjHbRJhSq)ywaLgvUxmQ7j@7(O(`ExU6<@kROQgU3knmu8G}x
zyAO`E$~4G)o=IV8E7Lqq_cnhG^Zwma_U{I{f444vwF>%oALhTCO8?y<`|sZ6FZ;d!
z-V^?pH2)>d|9?rdhCYM{mdDO5TxX>JUP3WdNtR%V!j+nE({~wyL7b~CyE=9Tr!lwK
zem+m}bUi2$zC`hV9W*$vDmBMlW-Pwzu5rSyoJbn*yui(bMYzyk8Rtd@*>lcdW^;e{
zs^2Lmpfw8!u88}%(%|1PX}-zXq4v@&-sD0@f9$@`DqpqQv&4A|>7F%Z1bZ1lvy5o9
z0K1sYcuGtYAf37Wy!K>)EUI#)h@JLLGb-Tm^B7KK1f2Bg@lyLkP~X$Z$>~$i2lMtF
z<b2f=JH0&JWF=5imSEmy<LFho28(ICho2KYGw}CuBm!c-VVrX|b?KdVACCSCE<K0g
z5_ARnO&GRuE3RjQ7j??aJnp&Pwg0=xWZm1J9u@hc1~kx?m{0F|8BvPljIE&+?dC?g
z_skb?ii;$f)0s;!SSEbMf55=eFT%!JN~AI8voUlMYxPB0JGJpd%%pfWTp`2bp6Axb
zFc=+fV9=o%yaV%`*Fb8%Pq4onyF$em;Yx$h3&DY>w<ONnzoG{2vF_g*n<}z)F=+|m
zyoONESC9_cr<BMO1;Z7L-SEddV6&)&Oc<(5Ay)>bu&8fP!sGDjBE@JCdp8dg8LkfX
zFYQ`;+Ad;?*DlrqT!q!IpIDiMmRXv((pG*_94<ha6JiMMY%SMd?8gtKST-{NY-;Ht
z=Bf5=)z)7-8WjSn-!JE{s+w*^`l-G^+a>YG2iW7WmRZQbp)SObo^}&1W4~-dsln(g
zs+g&n`Pu=lC)L7|<3MGn?j)`EaU!kKX%`u0ZzZF!m@_az5nu$b*mY8hwAQ*Q8eTP<
zHf8>SV9pEp^(4%~8k%f`q@IF@c>d2X<2uMgx0OE4tsUwL8KSIRJE=T0PCVb)#+EnP
z#?J1~sIIfR;4z+<q{Y1*A6Kn7UqVh<FC&WX?vQncoyF02)2pe2+Dc|+KL;sj2pVTB
zXl-M=DJ_>19cq?VoLvgc)<%CoXKm89?av#KC?S>|GQbHwXr<qx(ag6#+BT+dCuW%8
z9<it^YBY6jtAETdi_drJ(o$Zkd-cir(9*0NJ(H63x>evBnjTVBhsa7fk)fkq%(P9y
zRe5qi=qiWUTEFo_=&AY{Vti`3>>kTlsmc9vpHxIr#8`M6F`q7a*k~6GWj*(&sozZV
z^6=B}VYL#ouo#Y|hwtFIRG6093aR)NZ{N5`1s)r*7D2}~#D(it_S%K@F2H3rZd}dH
zi@R(ZGyHz1^e~^MuhzGz#M0zOT7G&C_j~ioKAx#+@q&0REdOWX+{fv&DJfh9O|uBK
z(8KpQ<h-!nsihMZ8*uh(K?PY=t6%SliH`E@Y(t2;!-H50_fx(F|Lm+A>=(FZkdIro
zYecbOul|gt1b6F8``u%DMNfv)W(uR<Ex@U8#atNi=b=l5`o;8yrDn0Ui78n#VUHr;
zWt5kq1`^oAPqZ0PKc+B)ZU`8RMupwghGN|mru$-RTLLwII-zg<jKUcN6aWKnAMfOq
z`FDV@EDN62zt%^-R9L2*V3VA(cCzomP9Yi|uX#0e4%XZ>AU&pUA(mR|kHNg~T)DJ(
z;$c!(&{Se}pZPA2CI-7yu`aB=plcQ%M9GQt)YB#{_~5di!C8gTs_giU&0$hTukO8+
zFKTUZOIrJg-wp~t;_VL>AbCT(-NIp&h5HPArXI3ylJc{V9b&E2AyuUnV&y)g4mU#8
zCY#~kyjT=F>vDG-=Kz<ZLX^Vcx)-!Q-=9uS;fkWnJ#kejiB;Mc-SP-=#rE7=Yv&)6
zj<0=^mwMpm+|o~xv5d0c)o2eD4`~|kM?!w^8fsTpg=T>?f2B~e!2d<=Q~8&1UB#(8
zf}toyT1A@h9$$PjvdA5c`3pT}6b#mmT(-=wMX7AjwJD;wo>wr2R=2!UCLg;{|5A(B
zS~i31OfdB`YtuK{Yyy7|p`J;KjWmuCQ@2yUvpmfJe)Hl2&i!)bQJkw=&-I&Ig{#~m
zwsv9U8yA#e<uR1Wg2a*;w{=mB_M8|il?4K{y`S<T=HhHb#zlqCvgU~<d7QZfcQ4+(
zos2u1oJt6!cKet!OYxfKVe_e3VR!fE611mS0p@=N=muece!SPAURd2DU*xrzZ9=2d
z6J!;v=KdHkryiA84#s*_>Uo;DQM<+6?<W0WbGo2=ChV8aso_M!UDW`o>{_p)t?RC=
zq|#G&c8el@vP@^qK}e+Z*95Jl!4s3s8l5%nX;ww4Asi5^A#1T(nCe@Bu?a3Lw2pS{
zg+evcQQ`e!vq;kAR+gDD4?s}=rWpuHP9{!0>kV4tlaHvi1ipK@D$O7zsaUls7=0Bp
z+*dMe7~Fn0N#U8w)`WJ0Kg`Sq)ps<Oj9i#Gt>{nIw{#s|FdidQIE1|MAjKRAst{N=
z4^EKBKwF=)vxg!aEu5i{p*kUm-jm@-A_E$W+5B)iIhA_spxMih#}_>5k9Gwk?6=F^
zD3-dl^sPzB48h6C18?wt7sbgVdAkBjDshGQ;+o(lYhj5s;!~hWSxMfMR@8VvR`>zq
z`ocASvipXci!1!;62v<`>z&940Y<M|$pr8ME#1=s4N9n8XiAmc3_nA>;<<)Lu#aWZ
zQtbc$L(43B;+Z9dbk?*4Sdm~_clATdiaz*Xt9){8XJS=#bPmVix5e_M-^YyeUJble
zE2Fo=f^|2>%Qie~^lNp%oZY?4<7N0evF@5Oa}_su8Rxx(p8oRudZ(Jj_g2+X;l-4t
z;K)}0T8^Y}{0BA)Bj~^j(+a6!h`=E970t`W$E;lRc)Lsh6gqWRg;1x6GK#UdrfrmH
zLZA7h-rr}w#OLzVXmUHHyHOAprSq!kP=JC=X&t!n7f_7E2))uBC+rMOILGJjl5Dr9
zmie7IX-?oRC|L|c+|)2%T%EGM@zaA#_)KzK@v2JE^)OvcLl`yF4}!$>cRs_RKPf)D
zaoT-azh~HI4If5s2|r+@=Yx91aF?c44awk0_Os0QSns!gXd!EF1$a+}UdpdBu<n0#
zIO~;q(ITU5K#6fXekhVeaz!V3pDZTVoyPfaI@)M9+nXDQ2KZ$zjIy=sAFUNekoUDk
z{7QhsWav^m!o14S7J|}R#)*ZRUkYfDCTUvH2RDA=bg{g`U32Svwb?9du}rv*roj*n
za}o}Bkx%3QH&Yh>hbdo33zwnxHHg!Ga};k#Whe|zayg%L;T>ZHLektoKbOjU=b&T9
zO5$L9N4g=Zr12pjf@U*mKqV+s0f+tgYFyCwCg3{1tLOF96AOy)E<(iCl-tqg`RPhz
z<*dl5P!$4n|0gL?I5e$VOYk@$z+-8&=VJFZ_q!2$4i*EloJl1~4PE*P5pdHV1F*28
z*+`xf(>BHgGR)!T;>wamU1HLiHMo;@5(4#aS0R|VE!I`zLii9#usv7CU}W(qlz3R8
zl&GmKEL@}eWVqO+y^eYPGPhp}Lp7QEUP4!2TjH!>o>wru@=3AJT!~7|YgJjh{5tfS
z>z;Ha8`VKkQ`0CSNWm9rKX{#|)<;SS7_$>zfYVmBVF%ELe;hZ~pnKelA9D}OM%YQF
zN@=MXM89i~5sczpye8(uk+p@9Go(vTdME0H$?#THcr-tR_6m^5Dyi|kT`;3v2Y2dU
zUTiNp8%9)72}3CN><SVs{$u@xPd&$q3u|5#RnUgKT!*F1n+WE%x{ws+&0A$fTQrlj
zoc#xmIGl_KMj1=H-B9`uF69a(=UcBME;UW1*E?P=#aNh^J@Zz`#7<H=z4&VCjDm?o
zhxfU+TOBc5D1&V|oK<<bMx1S^<DaqL{9+uul<Tq@%VUn7_|N@I#^EY|$*=Xo1!-9y
z=Qao<nD@3|k4|QFUzokt0VMiPNP5mnk@iEHwlT;3v+?&A&UovfnVWxv)SOw+H4n`6
z%X;3eTlf_~volmg9f~p%tDE-pZ!?y+b|2?@3M=;7V}eX<nFGV@0x5->(>o<$3cMK^
zi!_02g9C)jZmI^MdY4MGlv5s+KjrC;e9?H<=?fzx*I2Ihc9MA?sFF5QlFw!yw8sb|
z_lc%(e^!XcDI+2>zJu%skc>)IuX^_W9lXlR!FGi^EUqzD1yp_O@ohg|nV$_6w=Ymy
z(|Ai3P3;DP*l88dl<i~sRYxEZ4+3u{9wuD$<0@B$g_6u8l9%UzMNvkuctHKmSSeU)
z9}bhGdhHiIJr~1QJ@&91cQU0#YTs?@7xo;be9`%hT@!VHKLN^uvBgt*<aHgIe;=Kz
z_(}K)PXg9B!VN+YNAjo^YvK+g3ufidW~m4abfM|a$Q_a~HG^$9)78;MG4Uy>?#xq;
z1Pm$x%lfEtdi({67<^+vqWC~cQu*E+8lB7hZ@*kU<Xd6PKI!hu&r`L}>)l1gF$URr
zKtGGJvIkz%*TPnFmph?6^kQcCw|0Q4!U3Qcr+&n)r1{WjAUW@@WZ)<lUIH#{;r9S?
zx_&_^EAlo}{fP>1W8{tyXsha>Dj-f1$bduW`kj_pv@)@C-c06lb4PV^hG&FG#a5$4
zhAN0UkHOtQd=BtUc12s<H_!d3a(Vnk^N_kecCM|0(N?LHj~#pGytv_e;U_#6_Uey6
zRq8E=Z?wz{&x32j4bay=lPPt<xaIsZ)wvw?d}klKLUHOh3djFWrTp<q_H7v6gol55
z4d+d(W;;&ku7IrUGe>*;T@mcrEL@BO4<W*<DYF@l9@`~c$((_#CxQUhLg|v#mx#Tg
zp1c0dQ^$E?fb;Om>Z*b2R2tUQ16Ewclg)km*lTd^v+6U)AW#PQqV<F~a^Zn+s>+I4
zS9~HapO>;Cl^^5J=1zEdZ!q>tC0;*cyY#0nqn?|SkHlFN%DhR*ejX{MNp4FwLDogf
zliD*(6Q30o6=4pp#xsC@Te!nXj8{t%&<nk~`pYD)uXhs5*K|v+{qD`0Gm#m)NFUc2
z%WQ{`OuU`=<SH-o&II<Kw+p@qW`iODdzBLd+E!LMQD*S+Idye)#&kh5+0x2xr&DUM
zKW55?I{CUmg`_7NG@buQ6=`%#T|L(Gsnb5W@!!{PA}f^)cvn}={kfS@ub5XDua{aC
z#3Jua^EZ19k$07c`GBT}J4D_L<8Jd;;|J$mlKTWXOP>}N|4NUzHm7v%cf#okkrgVO
z<D)sbIRr>x`=r>5uh|Mo{y(p@ebn~iJhD`E;-xry_#Jgh@9gZX0V9;&jlg&%1&%(>
zdQZze6IvIu-*htnoVTB!pRI4}$t;%NF?oV#?SsAfm}RE3i_1ak=A=umXQ=O0n)@Y#
z5!Tzm(2Y*wemY^yTLg77N2N;2(8(R(=wz_5Q2rhl{qh)$b$fjLr(GkuU5jg22#hA5
zn{nFf{00gI7ewh8XVphT&cX}Vn@q=x(poq73<c04m!8hH;ve8hQl6En#U6v`4+=kt
z%IF+xf(y9dj9b@iDGlFK8R%13BysutWj~QdRj9l{4fL^@Y4gKk-9*b)#Ez&gg-vJg
zwZoF7pz3^o&VYnSqk*Py-fkWf#`23&XyQv9oS-P-wu7kjCe<gGE<@^bb4pGa#0`-Z
zq97~1Mqk-gXl&dfzRfAw@8aYY)}`{%1XqW}$<EfkK5Jr$9BM2XMecP<O-6I{Tkq_)
z7q`eXiyR#tW$OQ`ak#%29(uN4JUFyU4CmM1aUUCx>KHqNqu9<*zFD$J>89(6=MYEM
zklRE^KNqSiY?f-CO!}?5269#x)A3}p6ELMg7NiK)Q}V)~vY_UOQv3e1kG93zqg@Ee
zp-C4>Sl+YZ;-wd6r#xI-T;Ms{GyXwue44ZsGR{7BcyKnObJp|z%k(0z{_##m`Y%4i
zNGr?P3St_c9XiPdm0q8~AOVCTM};Dst##OVVOA<sXAFukrav@#F?_;lkk%DVkNDH<
zf`FGI;r0IBPSxw3xy~Ny22J508#Gqe%ge*M?jS{zit!onZcv)B3tsFTG{|Q&C@{jx
z$_i5-h48*He?8tV4xOlPmue8~FhAO8tey~h=5c|C`IeMY<))yF{rq7C;7mX=XL-X;
z;A$x5N)h#->e$^c(yUfU+fTZM-oVGwo}ky-<ilB!FuwQcRS_bS6uc65(5rVooEE!m
zgQO6zU2?n}r}_S_D8UoQ>CZ|Vpw12j(Ia~coKOJ{bH(oc4n420dcE5K&MpW_va_<n
zy1KfU>J^#g<vPmc<Ig(!rF8w>j%k36EXx%ab8RI|;tsoz_#m$aW<D)6<M{JwlBR|i
z-G&CY<$dUv?5-?63>idAsyF*s0rH%w{!F9PtKqb|EU7d{3%g@~S!yBn<S(K*L{`mb
zW){esdUp3FCkj*(VYq<!C?&vh+1su`uAf<KoxIdwE2Vzpf^ER3J6Xs9QOP4$j&q)r
zRM0+^`HYcK#Q9{c`44Iqo+<|=H0b>$d6>vq2_0YOyP29Qwxvg`t*z_hr>&XdxP>&B
zpU#=t?mWcwP*nv+q?Yt|I4W4s=NorhfdfSCq$$PDEFSefC@#fHD$5Q*-rGAz+M4rr
zU$}QFB(1o-*g!V*jRBEgU8x0-ll|L<O~_Tp4pw#Oi);$LdNL}>3{xi`|9q<#d>mxV
zz1y2a<MLXAr8GU<;J>q96*Qfx8ieAuE5~NHyZayxJ{UNboJIRIQtUrFaG7|4C9j~3
z@awcp#%IK<Ah6X6T81gBsn*md4G(ZRjaizVU_@;JW>s%RMhToa;-yTzNT=@=#`TXi
z!nyY7hXeqIQ^g*FYTQAs{AZb#{1V;FlY;KJn%a~7{pM}Y112XYpWy_28T_4?A<TTE
zv$OL71g+Ne(UHAhBEk&KTkNg~=G0|T;t|-u$(el$n)Kd+OiZ0z3^;w$yC<mr;lb8{
z0bAm+9SA!^pR@L5Y96pE9W$J-2lt&N?Yto6#kExFBYTOAkz0_n)rK70De{+Px`!gf
ztnuHDGG*px@ueQs_t_P?nKgA*5vDSB$@lmR<S?&yK>rR*H|7T;kkW_XM)#+F-z0m_
zr&(XqFC@_y927cnbPvCkfbID7aT%{W>kK=IqVyHH(%v*EgCkrN7*20;YN{b#@93tj
z(&INrl8$+g)H=Jl9Y#o^GZPy97$b!utxi3|t7hs!t7|}k0;#pLyR!T+u%Xq9yVQ*m
zNo&vBs{KJor&tOXY}b1?>Bk_+Vs#C?fh@6wk(P4U^++Gu)37NdW3=4arKoSxv|J}&
zOX3i0rj*4Jff?u#c{84wL*_@n9jXdKEk`G3=jP7NsS+gBCm(HmuQ}*zkrcetn^oc-
zvE^=%r#Uj>QlXMZ01~46X^8Hn6a?|9X88G(+^~0@Q^=)qeY0gDSnL5C_*dZ;T?VO{
z#}bLOq|9C9%v=c4wq*PtNYgNwEsAcxpI5cix7A#6wms9_t@n-mR+-7itXhB-I(n^I
zE;aXet}=lyC3LHd<X9>WJL!Jdw)8bGP$q{nTaowP;#tfme+vtX<>=$aqp$kKZY$)5
z&!=1#7mO`-f=X<G6n>}^m=pI^wj_u_b`m7nQ`Re`)61B*g`*DnQK;$1uP@2E;k$Qx
zgu{qHA58%};60C=fq!OpB9$0;2I?Jfz4={jw4>$2-TTc`1}3s<EiEnevD<HYf9u^B
zEZ>-*u9%RR2u@7)B%_8NqtOiQu_Q5F)a+rz<oFixBTwFYEe(|UR4lSXs6|V>^$cdE
zl2@av32mO$>;_w($+NSp<F71bLBRlQ0`jHe9D~0(sc*xCr-)lNpS2~bdB_$W<xda+
zy8_-%UGeh6xYpic_b!;`U+sS9tY)ykMg}zyr32QVH57yt@Oht2mXeytM2n2G6W-H_
zN$7#rC)#B*`aw$%RRTx0N^7-za#t`M8@V=?q9ZSfE`Z?bjknbRWPL2R1~S52fi6Gl
zk7nZdt$#p9Bvju*28gut<VuIXF#okK3VC+J!faeHgWVy*SX3CLWbqU=GtQVj=BC~r
ztA1P3Med(sod{o4wR-_*z(l!hpI<=Gr#rjJp(0XXL)@78MpL7vy4RXBSmQ{^ogyM4
zpG`7sD*WAT{d=!xb>p}UN*a+!1R$X4Gy0*FJsfV~$qAM6xCf+PoXQUih1dI+pcVsd
z6Od3qRG~5ZZUaAJDR%;#C*5bCP@>)i#DP){KNosHA9y_h$3s>X){eLMU{l8MfRY!Z
zrH0|8X?h<RPqPa&f&W+`<YkDLIR|kL#@yVeqq}o?4PI4x3!>l60T_)(lfZ#jD=RC?
z$=!AxpBAO0q(ItxqlN;V?ix-2`Yz^;T>Du4VvxE6Y6=y%0?+#Z|918pO*1}C>Lo4F
zT-h1^DUewY&Z|w+9lnfh9X|4lQaHX<UXH3t?;;a`14gQFMPo`4pcaArlG5orD2JXe
z2&F}cO6%+eC&s3_a&(n5e^!7}XSeOmUnY6}P7&M=3-g-gvD8#F@6Kj$XvWobIojB9
zcA!j#e>VDeZ||Sy87q(14O$eGDFX*|Zxhb(D!0abzvTjbq!83TmKb2_lzOo5i=Qjd
zFYbhp>6K7nX?-hPd2Ll3(r&=6Xg`1PT`%Zo#_EPKXx+q}h(I?FP`n1e8t~d<t&}jn
zmo?yHepg|gg2Mh)BCShdy<IO_T{f1Ih^7`eHr|JXo_zZt;Ds!L{&GRGE-FsN?;5~{
zT~>B}mXOZAJLqxVJ7J#B<21x?d^237AF1llS`1wIoeanbLqdMzT5$pzKFAKYm*Jo|
z=@8Cr2wu4C*E(LxEHV}%Oud>cHq&C@DcfLYB*c<m@IUh}1Et@o>i0#1WsJ!HIZfmY
z(lhWLF)y>T)3UO%FcT^N(W%tBu*T$Mw}D<H3<!tmRjQf=M<=@NP<D3-6U+t`f{d<z
z^;1Iw!UMlZC3n@J!P!zz&~X`k02L^!ia<cjxsbVpQzU9Ro7uuKCnEw;#?#s@=U1=?
z;ljyYht~hX10fMT`FRJiMK@hB^coaRP=4JTQ%ddWc-Im(-mYnm$L1Z5j0#7c82sh-
zK0N8#T+pgE@Z>B^h=GcZ0@98asp+r9waa%nnTZ^URkR|f$J-~M2S*l$AuTCi;WYZ;
zu~+Z)c)x(3y}kRG5P<3BNYv&Q(P680maDyuBxFgmYh$5WFwZl!kM9``S<G*8IB8{_
ze;Ha;!pGqq-(YH+|9|0&@ki;$-UN1UVPw7+%CJxZ=5vcTyqk1yz8Mbp!*D><7Nr_s
z^yC#pG6zxMq$&wPyih*UF&eI1eqgaY%_#CdnM`KN>&8bs0A~hLiwTkK9#glC@Y20A
z{ogU4=04Sinu<_=4}tad0H!{J@iYSTdQzc+MmA6va=<wx#8wRy*W@oddY5pH#l{Df
zIKvRv7AcHcF6^i##LaSWTT{f=Q?13qsoCMXGG)$R)f~8KnB>=WIg8dm(lOFxw%_1l
zUCVL>mFF=Ti~wpf-?cjz#Irnd0w3CuN8+OoTNfUPJAB#u5>(Z6+XpGlR?atRfvm8|
z6L2JcHl*jf_4CD#x*GzkMT<XKd=MlPm}2ea>xZBU9ufy#GkV*Uu!%o>3FzZ{h4CzH
zoanDvtulmFQO0_BaVJ2t8uWN{d2A9@O+Po-{c;52qLir;nR3n8n>hzn3OYnnvmb_t
z!9ieGE_b7cqE&8$LGa4+A)L1Zb9S(zA^t3CzEKkun83*I%0rMI!ExAQnws(So#XC9
zd26MQr59x2i00N0X)O~xABltR<B^T#wlJuhXCxRBX5E4BgwrZp2>B6MlreX%Go68>
zYAYEG<ayI**SMJ8&Ed58&BbJVaO9^~zrMKv#UP_*cP9SkCQvN~v1XMJOtv^E7dSuE
zy0CB!N+l=k?Ch4K?@mo$_?&Ve(AFHz^W`*u4A}bScT7To2kJ}J^99U+xVtb*m2n9M
zE;7`>1n3k`0iCY=Y+~7h-9_x2aG)chUx4?mY62-=c{bNtOtA8C8Z-&(lh3mmuGIUU
zJhxx;jsiPw;2f~yx(r6%w>&kZap#-OWoQPBYO!+&1cEriV6bTf$|^kw>X5ntb63DP
zP0TEb3vDJAc|nKe<)*LgtHKGea@U^p5B0Z;%k6Rx=jSO!HdEmR!CR7+JVVbcb(fe&
znuIFdSIBgaxRbbK6!VuSc~rR3_~Z9EedmC$I=IaVUbM$-2HFKt;+?sT-vBJ^rPl1>
znZ=-IHS9-8<;$aqG~lq9$$Y+OX?YTfL@q~DD4kXa8K;y$$4OrEnvBu2U2`tF^%G>V
z>`#}f(0+yBR4DzMkK^jVYo7M2Kz?KwF&g*I(+IhFph=S<NPKo4@>ke@KI!$Ee-W$d
zUx(Lf8Q}<hyFIQ#iCF#`iLl___|zpV4^~@XY&HpO703;^?h;{JslTLN7`oo#;4M0q
zRgv|6;JLg>oOJiq*`{P&nl5$OY%(|%)G_(NoFy~!{n*K@OdY+>W#=<yC+uHe0Vg{P
zAJV^h;-mzb1gn+H#2|Zmu$?9cQ37a5?xL#jDyDibC-%WSeX?<DOMW3*xa4#fH|-sr
z4OGGuXg3SIs1aIa5ZR`#KtT04L0kj$+WQ8#xpz@^d;n+!i?{Q?Jb8rm=Vp}%y9)nU
zl|als1sDRur~!{>`71gnqAikRTA6f&=5oPEag3^88$eT<6=}t?5@?ti1yz*qcHi^f
zgMgVO_pMg|J*w4$W>%(TKatr}$);kplozS{VyB_xq6T<lfj_LXKUQ|?onxkg&>>0!
zN21rQn-dhEU@dloES^AAD?eGw#lJ1Wk)Saj&vR{iPI6qNe$bG8>_1$6y8fuRl&IU>
zTQPID+ag0!qLq=`zOCNA=a28c|L*&3-*4OV&9A=(G5IzxqsdK0k?t+LGkUUPdd(AF
zcYH-UVu>sw5jfWYT`y<+ycS=XGSW_O$V%B3&{2Tka5R-88EOp<*K3I5<Hrm#aEeMw
zkyQRtNm$yzyW5+LO-)Ukjb$ap6wD%01>CVP1a7h;tF@z}V?GL(ouALxVD2}o^NC%P
ztFNM>!sn0#x_JGio@#{PE}Xmf<x6m)<bq>};q~R>V6S#AlRaanNQ0?7lFE~b4g^x~
zGqX~h|J&)aihUBgHxh%Jh34MP?}Y$)H$B%P)U%;~m%>o~&qINuuf&fW2pn&d3TCuz
z@M=O%ISj2#I!}#Hm;I`x=Nsvb7{4|Qf^AG5M4EcJ0V`bO7ATHoWn@$^D~{a{Rz_mX
z&A3H&a$}*Pp(%v3#Wy-%?v{2yEdo7LIW8{wq+~kRGg9H=MRG48FC16lf4b7+(kNh`
zPpV~%0-NyR1h5_ET<?&xKU(<A<hQ>dzw`m5cil+r8=kPV^qMr3XE5f+$UgxoyY(_U
zjS!hEMIvQt$=Vjn`FECt`f#<9K97!)!xT~;X_2d@-!wb}8hK1kl$ey1w42*U;xFc<
zm6w-~$;E&|WoiSC7h`T9p`@gw4_p58&6_v&b3VSwTdGj>p%lV*wTG7zU5Cqi6KP{5
zyJ~`(Qe@U!V36_8@sbHUsg-E2q~-CxfYDz1H!O|fJMTw@s>EKniRuZ}x-?&hY*1uC
z^y+*TV0xcM(@fS-!=inzo=qXicUh?$8E49G;a=``E^%ci9wR3ob7?b4QRd!=kkVAf
z!};v$yg~Ipa<j9imTRv8f7gTyw7@Cu;>nXIRnRY)sYN9vC;}ca?mNoma=~fSsb%Mo
z50=Fhsu{bc@BJhiTMZ{5I`lW1tq>11@)@_v7>N}ZtDgscKKCZgpic+0wqxq%o-b$=
zf<*>f8lFwElBH13i{nt%{#(Q!4y{|Z=~fO4Pw8z5zHz03p<4N5x0D<e%b98I>FJq|
z+SDDVWHXE+aqNb>XC{x6tC8f0FflW&Po7x!Zg_uzlX<goRiQ30RyP<of}%_N`E9ol
z!}RnjwK%tzVTx}WhB=zMs%?y#FiSxNBlN_!$r-1SY7!z9hD<#aIgy?HEPpYbdP3M)
z`FK;fgKpunrC*L0wQYuRHz=IOO9SQ94p9HeYQn*R$o(m{mv`pOB<ov!U-=N6LlZS%
zU*R(2NoTp`yX}0>O#{CQEWe*!_rc7hX!caI7A*o4U=z!=@fWSFB^6RJ-os-n?_vCH
zz|hu*{m@d9(|Z|)QqH|6AbMJ2_|bQ~u5AR)Pg(dFB}+7}nzx}J*`8wLc}R#obBDh$
z`;%s87b?X1VQMg&-KkXpzeuZURWTUwBsE>EALo9lE2FrlyhK}vCH3;HBEtbWlAT*V
z`5@`X0lyoJRQ^Jy)>02rj5Pb~By>C~XDltIswX61xH?RQQ*Im~&bZZG;6KwBua_?I
zM5WJ;DyeqHpK_<!?Vh0Y=^lIBWJEQ+qHVg$sTrR-P<U85Ie+iy!`ZM54S~LJuh~}k
zmr~`pk>Y{8$ZT(o8kE8a#r5uU6nf~KAvnR~X)7rPT<YQb<>NQc$V%_f*49?hGBOxT
z^08<BF>EzlK9w7u%A0lyLln5~!0gGCggDbok5OIS+^YT>IK*H|*Q>d-J!daB<5Jkm
zvH>4|cfN6Ba`{vU-@T@|yfly>r?osg%$^G@V<haLV)ldQ893Hh<<*9tYwsebHK2g<
zX(Xx$VQWPw_V=W@WqI81XBO8mN_LQSjXqb0{8DH5U}!u%UiqGntj+HEE-PajW2few
z-)^$7x3^F7Z95$%2f;0@<p}%pxXvQ`4iW6Jp^XFQHHCn^`k&O2hEj{OkCy8-zuB(4
zCm$(VcR=ci%8M5+c#72pvNj=}OtP!kXRmp9-prgo_h^9Kn{!gt%Oh}ydroB6R+`YR
ze1a49C(c{;ckCkUn7MZq#0iBwN`|5oCZ(&n5&l|7_RxR?C!r51z#4AX>bRI^FGB*R
zl$dd;LekA&FIZWzFeBOB>f<un-q)m2172YW`f>A<vqv32Jer*f;*X85I0Y?DPb|M!
zU*b2_#U2C#K{J)!oa!^yl*~{3u0;;#V`>{^w@cvXbG4H5s@Lm8D8O3sPrZ!1?!$OB
zn4MJftC#nyBHf$$nw4Y2LhxGIBMjbdrGZjSvfgD$1QBz!((x3U7KOsshanYq*NiON
zI0RcFeSNLNj(fVgxkXr*Y0G>4(Qnxu_HL8+dB*Pn`Rx%EIxQAai0K3<yR0w?^W&{)
zG@t;@xs_mmk;TQu0AD}m#m?M_$l9PgTzI#;dbhHjxbfDyGu$DSMgtUs%Wmgo4=<gx
zK{ht6IQy(|Ld#v@2Bo_L5Z}@UnC#Z)w`OC8H*PuO6oTn!nPALJF=_XwBl8O@HToh6
zd*vW2PX%r5<?im@Y)tenD=YJAJFOs(jm#zEWu$<*(}(ef&zP9dRtZc`Z2#GNs|<z-
zg!)0drA^F}v{Zq48Dy|MWVc0ko2(D0P(Q2H{|CA_%_DTt_Ak&yeE^HU=6+8*J?L3h
zPQlouaAJ=VzG$kOEtZ`{<f`SJUc)kq!?32uV(Tp=VW`CkuX*Iid)MK*Sj*NvkCAU4
zI|EObF`p{X12fwRFu=Yu>#ZG$UlUpjg$WWgGg^BCuLvT?b#j)g#mvugZ9#`J9JmE3
z1WX{4$+Vx-5zO6%p8)sQZ2aw<cTSGmJ>A__)%00qJg)qTeWm{?G&Pm@8=_24B@|w`
ze^#YOHgV}#AWiy<@ZW<JPIR8N35OqmwzP~u``Td~2e?`eH_<daPRq%kJ3AZe#frZF
z;-%{kVq0r54e=@jDtA;9q+2c!3Q0Wx|EH+}ra%R~vM|AzLI`vi^Zc@SU4P=|I2-%9
z?`Y4SJsSrvfW4VhRK`OKv(wy4yBxcUrJXpBbt$f>VAl@^dS!MS6zt{GLT?4|vedSd
zO3oIrQuKArO4ASIJ}x@A%l&28f0W-rVd~jO-D38Y2CRg#$(G^6>Id-zs&C&1_Pgp^
zkB$WS?6B%Mc~@-YiMbAEx_|~&*+lx2zdDp!F~5uYK7e8rGSp~)h?$+@VsNu5K>#{4
zGExwJSITqcC+7Wm1@-myR>u<f1+8hu6wq@LXr@+VZvqf^9ig~xlQNWitZCLmQmK0&
zW_)1a0*PWe`QqtiMyDdvp`);fG0v>-v7oL@3z{d&!2g8-y+RCy`<k@&Ol3<Bcirh9
zX50KolSy-|0SG4-HZ(qErF?&Lsy%F8^MWzp;)Tr+BnRGNzyxecZBr9|roY74$%#4f
z;QICJs@LluYE3+k8SX(6Ou2fvSzyWs^wNfaL$F(~Dxmt_Pv<Nw+UKM4J{XGX?;x#o
z=52=y0OTR5#9+XBZ=YT~*Dg)Sdl3;ucol||B^|)a#sN_&plz5R)<oq*oSv^wbDknP
zyP(!m^X8mTSB61qE$W%fDmf#OW2>-dhrrFP&!#>7Qzkzzi)Wdv^W(K#6P2n3dGn)u
zA3IpL-~Bnz#NJM$5D1Xn5xPZ!c`Nfra6<g(iP`gi@p96UtG^yQc5DGNqF4a>$LtwT
zTq1k9f}dPrhFPK>5ApRC362*k3zCO&1S(Zs7hn6jJ%+0Fvo2A0FPv;(DcNoX9%dM~
zl#(qpzXLuC6%Yy9<`xm?9SkmgCu^(XkoF-3Y+yh0(VHtK5b2n`*VQ@<I$64ao#9m@
zVdT7w++XO0F73|%sElP3^&rDe%v?{E;X_Jj<~Z3Ys0coZ;!bh7c8$rpntgqJXamWR
zLJ0LLc3D+F;aE||R4#u(J-!BndbfnA*Y5zK-qc)``j^<4V}8lTw^v^U1liffTI_-+
z6dtzM-3J5(MAjvFHrr`VaW!qs1ZVoO2O;k*yX)SAu9v~S+atMA^f%WVo>lQ;Q@8i}
zZJ$@cGQz8y5f?7(kdcuAx)<!!(wyC3elJDK%b}yYn}yl8?r}zLy8dX~#lK)~$~-xW
z&GSsCVomolViMzO($zG`Np1SA9bLUXi(kgLuI|e;emv6VS3g&^+)u04y;u$8j>5*R
zXFNl==?%Nc6Cju#yZRg3-2LXeIa0A(?{>(wqTzLwy&iD9rzDq#eA`V26;$ZBScM#d
zgxY?u0|SfAhZGeNi(_;q2<4hQ9B+!WENSN_0-VQe2$P9d{t^?p!|cq>qv<RAkE?XV
zr}Bm{Y(rNE>((Y<56bIQYHt%xrq!2$K7nPsdxU3N&D_5#nu~9au-Rt3#mtjE$8Yr+
zX0diq22F}<a#y;Jc&@WQ3k(81KAXnq2i4oo)M)P5PfWaw?z4jVPSV6L-RjBS^#{Wc
zuK&p@v+jwORVmp$abu>hXw&EK9M`qwb9(7_oE}c&Tg@K=B~bt=2}K5H>=>s7NT33n
zc#1l344;{*w@xnzwS*RUunQzCkHal~vzOX!PTfW=y>YH`e+`3?XqG5JF;l)jHRgt2
zw2b_8Q~hIXPl+djb^0BR9Qj3>(FRDl{~vqr9Tio!v=1}aJHwqZjS(b>ii(PWfJg=%
z1x67N5s|DSAQBoR$7XZ{$tFOFN|Y=)2bCNpHaT=lhDKsT)4*5zbmPqX{^ng@`0rcm
z?R(d(yXJOt&e^+m)l*MBRmZf*r9p&H{^-Z81y!G!Nijs(Nr{zZZ{F0W=>}EnO2E5K
zuRAecbar;ufs&_}etZ%Xc@Zhzq_E`+*H>Js*Q627Tfa9)O2&p9cB3>vWx|g;gQTCP
zx!YK#fIosi6=1}4zYaq)w1b<DE5B5wq&;}bK5F4lirZVsu2BE<hsQ1K{4Q&?a#qd4
z>~~EZ&9m%Z^Dr^%6B0fqX{7lN*9BK`2T1J(r<VS3xR#9X5Ydr&O)_Bmy)LfLPcZwo
zbJ)_ikmb=?M=Kiyzynz7eFl27g)DUQM6TGiDTK~!(1Y#U0eUgZT_!FuRpcOl?=E~^
zu9%F(aZxbDgUk!^ktO%tw!JBkK#78F!?e6R6O-kCva;+eUnq%K$t_hbulxNt8}wY*
z;Jmji^U=j6;fF+L!e~`zd`FdVQexD**yzo;?q0%BaSG``l&sdwl$4h)I9FoR^$A5u
z9<EaB8_KkaCD1Q?48p*^U%(GchxVEBPLdksU<l`05@|m8^i#mS{o^%}oT9QGN_<|c
zTkS4&kt^@dEX*@<iUm3Pnm+r(JC{(QE^avc+3UyI?!)7L0Re0hAl{l1@r}$E^yZz2
z`i!E9&~;r!=X#w&Nq!fni?pikilo;=U0wsE_%7$hkbSZdkPy^#|GKqqN#0u9xT&3S
zl{bvhnL=ej6LERALpjTf)4W8^=!bX9-hTC@I7g?p2CLxjDb;K1Pk)6ReeCm1vmO@F
zrh(l&1KC0{LPi!vMwU)En^$eBpEHQO!J`!i0LN!Vg{K$ibg>_zZ_fFj7@M=V?Obk!
zT7|mc)W;Xg3v%<Mr+XECK;YO7-&E`H-qLs~5%+Vz`WB}18#frC$oil@%Z6RU3x~cB
z$>ou|TBa_J4p(~Fr#|(vu8X!*G|$SC+-xCgVF=fX?|t-`V4eR;T@L1DiFG>C_1{m;
zpdb^Im<u0Ynjf<ANM$T$@V1Lyxq?}FsD^+)%0^mY-wWO~u%BQ&g#cX=;(qZSB+b2I
zxl;b2*E`pk*4!_QOSf$R1U2Yg*xq;X@s3FYCZ@q3fhJ>B+nQ5lvNIUc@+O~X;crmj
z_7CO47va=<gK{wgPTHh12cI$4=y41fFu7siV0^C{$A)EN80%}|^0F{#r0Q8h5(#0&
zjyo>U08%7m%Qr2UYonqgV_-nLefL6<;XS);zb_v++R*PNuk12IrR9m4UaZ&4<zds7
zbV_At<;7ST9(&&dNL9s6?W*1@Kwn-Z-&5|N;zecLHpawflX`-|5uUm`*&jF7i*tvI
zaj-GW7ju$40%0t`H}yCD1};~i$w!UrwAX5oML<TMUvvMs@lm?Vb%<qL$?yauo4gRI
z?0HW65n{w-WFCwykkx8ZBQwRld6(oonJ0f>a({)WqA8I=(x-R=B%-IE8hAAQP7^=g
zAY-Fv5oW2VsuP}ha;|nsUM=+dnw_UR$}*qM>wO%#{Jr}@pD9;l(1uv8m5)pPV~W9i
zzRf^At*|div~Oi%s=m+5J3*xOHq83;coRR54#!cAlrM9NoaQZg=%^PaXl@S7S(o(t
zCAIzZhd9dE^U~`*y(q2oeW#{TRaM#O_s8QF=i4QdlaUW`R#G?exF<p+?{2sSRKmG(
zZC&aPa=2?~=<61Bw#2PHO3dljO=8mplO->pu`d7JcI}sRr0EypV2ocBo8s%d#%U0t
z!=+y$CE)-2Y*s2t!oZ(ay!uhw;B#uF<uaJ>7yaxkTlw{o5Y|ZD{j%XYtTW=yc8Rh9
z#}-k#7yh$i#F}IJ*$7SbeT#h4(i#jF+LMKz>g|xM=$RyXz%oQ%t|M;$Y+UZXS4DPx
z$yV_$t=>=dL+m+;WN=#UpF6<|TTzJKthBO;<xjC&N$=miv3Hs?u4)L7?aw`BQ8($d
zC&A-B#hQ^pc>X}Y0JS)=pd(Kd?;Pe(RqHU&m1%GrxUeSQP-tt+I395-)jP+(F@hJ;
z{K1t8t!@Kg9rKP9o_4b|xKOmX@J8^^&}i~m=O)ceV%5u_iesAWcR_E_+}Yi{2|T{w
z>EP(gOjg!R0E*|raVdVA@!W-m;yJ-S`DtOWnUC%wU;4m1O<3o&&RXw+*G0D#A&Vg{
ze|<7ftlkE+I9SP)+nz)dImzg#IB|(EMhn+@F1qgEeCY?sD^tTX_d^`E!V+UTttXan
z2-)yW^R)Rd;!I3shqDSxL^23d{??Hv{BVdhK%7iud&|`0(MB&){N9Ro@zA?NmBr0%
zBb&jV%BZzbV_Isdd4?Z5#4N7dDO&RlLni!grvLq9TM|%lzivH8_OpY)$mD*5uTN*s
zo)I&D{r(au85cde2fh{9#;$PBzVvy=dlOSq0x=O%4Yu&rwbS$x+4&K=dwHw!9`KLn
zR{QdkfOZtBzE+lj_qw{Co^EYW-PS&9+1&Wv)FNQ*AR7SX>RUag+F(czjeTA2DY;D7
z%FPy__1eQy@3&{>)~?*sy=+Oj1UXaZ?*ZjJm44`}Zz0#>sPf7#Qp)9$H;-m9Jt_|O
z?R<jk>-k!K3Z6tJIW|RjPLxm{C@fl`!oyP8(^T#C!_Tr?<GOm3BM%IOKiimUDxV~d
z6BFO##>es*{X}D~^vHP6mk4ygMe@k<Q28T_Y=zmF0W(*t17?Lq<v#{>BmNzjud${M
z^>gLAKD>8PHnKIC-(_j^69f~M)+xo{;ffCl$E<McOPzU1g57`Z{R~~ueMm$*F_aW>
zY~So;k4E`wV?_AG<r|R)L}isxP}Irf1-b#k!wyq$#?LeDRCE^VJuoQY0l`;RF%E)n
z#6H=Oywm&<C5QK$^|C9OS27wMIN0cqu@Ewn)98?xcgjOqmlK029It5SZE*|h&6y+$
zCE3?`j`yyHtKw9yEIiDhTypYzpPH>XSXQs1Cnn%u54lbNhlF&Ai>6-KdUdx$jHU67
zwzCSJqCIpHb?^}VVFsURY3Z?(z?wE54o8XI{kBlf9OoR3C~ALjA);S{s;G$`V_9g?
z2Gu+DdUmTMC;KAcnwzS-J5APBp4b#^vh>k<v^>p1|Db3iUx1<ZgXsK}@7QRtjP8*w
zuLa)hsM?+%O3FL=WY%M7T;}PTfCitxRjX+EBR}Wp;?K*hU;r1B-WHuZUO!HKlXs%u
zdTHv$z$@MaQU7XxoKCS=<LjJrfYuHGT9ejb^q&aO;flLP>_dG;DV;oS<^1?fls9u>
z5|sun#-;kldnZMe#Bwi5uA!^!HHS#NlfP#dj7!|3UkXr~UW9mKHBZ_}N%hvA&#9c?
z1O;S65hHRPG{B&^UQU=uVWEmDwZ(9&n)L9vu5qKc{y_Q>3(Y){9J0B$GCGe;Lbps;
z*Kd8egY%8l+%Fq;>sOp4H&46h;*|;W_$J>O<>~;R2u&b`r@cHn{5KQOK})*Wx=is@
zzaEQ*o%9LmghP5SA<~cC(d;8w8Y*ihJ1vDsm?P^NBOwDu5g8e9D@%h9x2Msu^{Zh<
z`b9Q(wmE+|itqxvy{J6mKpD`^QjD?bI7nmtwfCD%%h)a>rX7fdo!k_8{Svb~l#})1
zruGVjix5$m)_Nm6a$c`YHI<Q|eSqug>8GOGBA+kMKMZmG*4rz#9u$>#%2@3*aD;4|
zO|D-UjVHfmH<-`1B_^^;*xI@{_0llNLK+2RK<4xJ^s%cXdvtW-@Bk#r?xaF8+xx6g
z+|9OXZn^q(ufz1SdI{;3>UXWAI)IPWKnuR)<t=1x4|jV@Pu9mo={{wL+SYS7kx!{C
z)yY2L&nhK7dxzLRrWD`ci^Ajf{NeOF8quDCuwsM9%+gG}czk$Cy*!Gf9s-}2fe@gt
zfJj+U<sxf21m1$o6a3)dZEnchG&+kUcJ<ZG4*SR`n_fOJ+*e%J*Bk$&v5LB0+-sKL
z=TF~p2NA6vN)_bYc@K>=IV5Ax^gB0#?K+%J$PJefMwCONbH>>SJ$006YzE)+adap#
z7JrJ8T`sM73WHMMQ8>5kKKO5Pij1&@+cwt^M^SL32Ki&bk!eR@gL4QG2oyn^iHT(*
z1mLkd5P%;Npp2CVC=w~UG(;|Gdy1Y0-~pfNOLV8Qb_q~E_$Ntpib`x8^%8jw72_AC
zmKTA7jG%dU-fZPKcnr?DyG?s`Ruye~yPyojU$OMJt1-ks9t%w_d<7mQX|<cbvHMqK
zBWsxide`x$ho^ps9nKbXGtzV!Euh_~s#4fl=gp;j>M5^v?cMgJ0=gG*_tnr*Wl`I2
z<~1;&#t~UysmCFHG_$fs*EW1YYHmnm)^f-nZe=g09=s(Mea39*_wQOAG%<q0;c`3V
zBb#PBv4ojz*y<&d)17&Q$7S$~FFU79?)w12P?a~%PAuFrM|!Phe6-~FGb1i3QBi>C
ztQx~+-m#&k;HSQGvtl>sCM9&s+*+GbBa56yfPW1_b&~JK=$3o(zgjNST7L##w$)l#
z1BQ<kD!*2mdfq!$V)5)Ij^jD!#zVk)YtKbyzt$#pLTM&kFAF^nBpN`cfkiS2)x#oN
z_3w$DUF2n{*!8%TovU=RUel`gYgC@$P)Fyr_OT17=lxI);cOMRoMd5DscxEXk<1nq
zmG$KnYZAf!bihe)`#^y=w~!g|!Cm7sCObZ4hyWeJwU8uQ)qk_$8eBtmOR4ub(RrPn
zGrY12{&bm-srdkxA_QD@@laxC&6C;wOyhX!$b-wp(+gqCjej1qBJY_bCJ<{o3BCQB
zP>bU~m^XCSyP2PMjI4Qm7b?E?+b>PAKKu5}47Z5fs4v1CkeXPa%!G;K-?8f35lPHC
z2e6TDwVGaOiZNX*5yh$R)D$rb{D9(Z5kEadefy1Z#?u+WP&qQ^oQ!KTjaBSKaqA!b
zvQBn1>e9Zxo!w-M`+jQ?nMlC6BfTJK>2>Kl3CL_&W%JSx^#kKKYwL5?nF7esbI(>l
zvr6f=N&WZDroW>H#&!N+STC(E(1-Z+BV^TxEG9FX;Hvoo;NT8@L%#jc9-xg8@Fr61
zS?o(4dsHt9!_naOR1Of(%{im&?4SfuNI0h*qOH9x{Rr+*qnj}E1rx)IS2aI~AR9z6
z0m>C_&$30SbB0^NEnO*8nH~RtLM;>3oim$n_J)-@#guIzpI^5Bj1($1(RV%hDf>fF
zg$s`6--Z2RSLxWd=wHa~S~mN$3W3|TF|*jl@v48kic1!+haAblliddv`3^opD@FB$
zKuz+1%1Qfl9f?c6$se*k3RUqs!*q$5>6X{hH+~p?0iQJ=tbS4UL#<|E;i^r9fNsf|
zpW+<mW(ym`_Eo8z^w!>Q;b$(=Ff@ghYS8k7qly8nMy4~ZN912_h_~05yqu|`e^ypG
z-(H<Ec`hl3prH5{R$S1fFO<M-&`RXV*jv*quU|m$nrDVX8Zt8Qqp9^LCuMfMk8Y(w
zAZL1;?TSb7Cp9epq}y2&O$;WBoyb&HaqAfupIu|$dKWTq1jE{LZ59}r)%gK>XW<tE
zMO*9M;+P|-5bFS1dSH6ux$vmCVbI;}P>^?u4&|73{B8p2edayqZQ)uiYt&lRi<!Ii
zoiAq!=oEZdrIKp~4r(u*lXH$|WTEc$blQO<C!|M$R6|U}c4H!HB_Seg9znQQP_FI=
zkK6Z!ZFL%jb0)oP>Fp_fJiGO!Tn%WJ#Ej*_U0q&j4KZEJjp2K$luk~_3^{&;EMbsw
z$`5^}Z@6b57%d{wh^Q(+&(~W`gh>i7e}QCft`km_L<)8Vr;5bsMXS0`DNu5%BSjlL
zBxPT0arQfrK)2i=mUwBXncvbpP&nCBWCv*&d}8Q>t;Yygc-imPK1#8gdi6=nXxX=%
zS;{#Hr;{yKsWkBGR#7rU!JW_0slE4zVYXqEdnPCfI9#kvJA7;ratV?~uE30&K_R%^
zsDuWF67u{EJ;YK2YYT#a?NOkuM-UMNKxh1=xs2O-FRMg$%<7#EkNrEJqAM)?m@>T@
z4Hz-Cv1>0Zj5j4*Skj+0Of#OR6nQL2Sc!0wfE5W$Ps=afWaxItU>@sjQ)s@CeVB~7
zxyx+E6G6*sb6Y}+o00J%nxMD9($uV{hoccYf@55@Nuk7{Pn=ejP^k&5n<v`FWBeS1
zEDHNVUv|t9dZ5*aM{C98{+RA~$E<JOobmy^50QD#*6Y%NBLLrK`+i=r8qOqSJaE>v
zAyeFW;QM7mZ&UN7_nW;ZyXlUhoED`z-{UMVN_>4oOWv(E&<axN6LAIu>G(}ZZzUoQ
zsu8A$Q=H8aes~wN+ZA}C2i@I>ew2{FauB9vF64H#`#Z#jVO@b<BSQ7bD@`D_3n~u3
zq8&e|mBWpIt6drn*&!1Xa~T#ss>QM!rf2V2sUwC|#<rPuLnY90W2~!h=Q9}q*-K}$
zJU(M~CHAXs+Ogr}K2D644t>UjW0m2aU5r1wT9$8(A__tgNahij^Bw9g>to0Ky!<Ul
zK1QXXyj=QFm9C4xh&d&GUv}#{gNsmJ*5X1g)biP0iv&OLdR1vNw+?b~zC_}t{>j^y
zi|;ttQ6{aqx%Bp+DwVEniXQd@CML|OyW70Fd9HjBl8(-kPpq!i#(#1lC06wDwC#OG
zxD;>9iynFGnB)U(6ye0?o3m#jCAqR@n-L>(&dwstg;I-(KB!LkHz(z}m2OKKH#)Kr
z1jkUDa}%JppN`4)cCx!J5r0H<CUPKbS`tpFSizyCy}P7zb^AQSZhev6>Iom^ofS#V
za+<7u0|o1#^06vHh3^Yp)xToxc|1KU;Mm<@9xiCzKo)cD?p`JuZZ#NuJMOhpU`c+4
z4fGa826DZj`n&dtG^7uVqrlFzuxrv@1cA!CW01rTBlG<%g!*apGY)x3eJEIM_zwYa
z;wIbpR-b+ncZ3A)v&AsnY5~2*ON#b1tOz*14-kT3x)azheM`O|k6Qi-8gCNAlx9gl
z8qLVx<0+93GMbSwy-6Fae3a)RuUS8EjdObn=O*H1FxX|hH%sDA#+~kDD=h$aZW^eK
zXT<R;lz)U#E}2jszh=M_CJvdKGw%aXI)=yz<I08rAjyxFcm&;4*b#mZ<vP9&_m!lw
z%oNP}diGB1eZ~T=yA1s(irq#=d~Jvx4)0yH*!H`_hYz__6h?Pa_9IMXpmNbv3=1Vp
z(1kW>h~yCS5vTo7k|t_2I9`Ks(YC8|d2Wp(w+ix)hjdFgGnmtA80ZZvUFH)4fTPhB
zF?+*N;JH>leq`hz!0)7N&8@7|^}FMYVP)o2sFvn|RwT?})O)!sA0#h_TVXu3Vv^{#
zCbHZ1xv8p-ikG}eQ8@|4qqW$HbkCwE&`s$XQT(Y*eH^l{Z~a<@^03>taqYGb>M9_E
z1{~UK;!3}S5_kuPnES?1sfT9YiHd~M{jb~N`NOynN<)hdz%XiaRKT-eFk=?0SEn0u
z0oR1{_eh8g89WLyWQ_fTcuUC2nVE4@D>F4R_vTX3+CRe@xMvHqA#~c~IK_ogc|LFK
z&2~X(E_`qLou3)JhEYxKpRW?e53B6gs2B$>J)S=#a$?I9E-`y$pai}1L`#pHdJtkz
zx`r}OrhC4N;JJW=VO_d?849sQ!1mXJrXK1fzK7Km3kEFHiwaJ57uOs{-)7>l!M4JZ
zwR%8j4=RD?rqu;t;ZO#cR@(jR7kXc7A4JSlJeJuqEgWd~GZ!@Ni^w}_YCyZ+lHmYh
zbB{hVs0soi_5gj_x#l!hwAijX(6R}8%XsNWaqZeBiVJ6;xEKfOtOkD*v|F9<d%{lf
zxOf@e(_1_mo@3F_!&aJaD(7N0)hqV!{!QZKpC-0nL7;*Mg%hf(R|U=ZCKlYpy`Wdl
z1n6^F7PkDKraP93nXW<S<72bGH#gqD4-5Pox)K1b=$vCHyEKT<;sTP43qV}>vc%mG
zSHOU@xusz%R|`i}!>hcRW`M!#G9T=`yURQn3F!ljA3IwCh1s&bDl%?__nKC;S5Z*<
z=|Buv*h%aMwCt#qY^#Q3B`X@A-0V&e+nIXAP@IgeqkS*2oqoZ(cF9C4JwxaLTaQyJ
zo%|iUizzo<%YkFX&>Ykxkel~h1Q|iQYg7$#DQ1f1He^vmWC48FS&69pZo7-#XxEd=
z2}fF|Ua~a$4D{)8*q`p+4>7H|yMMFd4CFVO6zaZB9efH|50Vk&Q=mdEc>CJiMXTaw
zV}S^+XrO}QeUhT0TM^3yDVW2AcDDiWu2$-eamzJIby$IG@GasUW}3qG4V0!If~uM8
zy|gaQ)sUXe6Hk@JPD}N#;EYjl#7IyC>}1R+e*g!@1>}bFJnvm_DpU4U%#gqM07|ea
zm05{jy$MAXaA3kyjC4V#;Eadtt=))+0!lHek6j#F=`SkSfj{q!cu+ae@}=qLpTJOd
zsB)b@m(r=HC^#-cLXB~mkVpP*YoJ}P1$91@^n~2{vKC_0Vj6C;gedR$ms?5QnxO^y
ztLA^DJY(?s25>HKSpp$Ef|84f!ejln1716m7jGg;TSv<EBEr=iotO_=5Rub1B~|t|
zV0tA;hW&tULT8@!Ij4T%Lse9gbug1NywRTR#D~>M+-2wko_4%L$j-8BX?ab$Vs>bL
zq}=^a<`$=<RL@xt>07%|{lsHG&qK5)Olx(Gu6(ogiMm!D2Bsuba|5SX)cR6Z!p?%W
zL=F^m{1|jgQ<Vi4e>0%Gsl(99jtrFTqv**Zpv}64SxLoZFj>?IEV+;85rTC<epb2h
zSYVg&eBQCNrkZD{uOsPf%^@3m0#Zq3lw_oJ9bfEdH3n)^d-teR34g{FyNZ&LO@)Yi
zJw0nkyG|J2hg=MjMuJpe=0XmNkVrPUY0mTr$s|<;6;y|}w-vU97D%9KQqg+b0k5>&
zxUP--dl$C3-L~xo5P2nuEh_sn0}#j1pGPll4r;F;4aK+)b41ZWHHPeT%K}tGf~M1C
z29FJbb8#?a?ldzTs)e~dY|U_(uYTi|RuR`V5Gl^PK0jh;C1<Bu-*atkO2mFM0b1CB
znX$vq$j3m6hvg@8pBx3xfS>?n9H>%GZb*9yNy#RjU}9FU@u%kT;Y?|>CF--#(E!8~
zU`aw;`}2#LMBvbUhjylTF$YgS<#PsO4pqmDnISVj|A^Kgg1MROSw{?a>lZg8b4DeQ
z@_g;Pq}0l9Vi?RlKa*%-=9BzFS8yp|akhAJo`eC5h)^RgPACgIuFkzaV{A>C?D0!s
zG%pVh(mjB2N{=QN0i*_z%6j{;2zf>Wx9FF&ziKl?j(<gYDU-Wzrb|!BYoPp;3#{c_
zXteyk_<cOZ{h>F%8}wpl0jk$cnVU`K)2-8C1v@ihr%|MQT$fWdGjq}(Nzi^m?jJds
z&j(L?At&>$!ek$2X|4@m0IzRm2{*bxD4w6F0NxuF%TTqHXP{W<xIpJ_-kfQlzeq=S
z7OcQjcIVyXyTqv%x>i)kJ)S7Cl$Tv--NRKm;ny$n;3gI>`Ec4`)Sh$@&O{ByY&!N_
zYIyd^_4&9@4x{f;nK<<B@kI)7)EjwsOmvp(sjpQtcpro^%30@yFf*X0{0;Km;F^<Q
zL`)rNQ?+EEqQg5dK*{78zP*r*SVEh&nt%X=5~9WU#@}6(#4*VdtIb9tvh`OQqVmr1
zgiOqDVEM{hu9ImN-au4U3gEO4VzdXWm=)piJtQ32Z_&#h(T>>)6#l@LQT;juXhbQ<
z=2x=7mPO;cRu!7OHVPayk(3p5mkPSp&J0r9QViSsw@r!W76G2W*q0A7->g7P99F(W
zKreuj;;rCqCl5Yy(<d_tsC~EPe)ZV^pryGHad$i%U}b}Mn%;93?t`bi6oO}bYhC&J
zpJC%62hZF_(d>Mr5N<6(jN;X@+`U``OI%Zhli-u|kG#Hj&!~l$Um@G)B`n0aKQ<pN
z334z3$)xK8R~OuGZnVCqQ{{x@*5t{C-|$vFb9oj^aVNS91b`)A1Q_@APspFS`{q~}
zyXr&&C4MFyWZVx5c+R`n|K_IiB3lrV)XGRs0H5n0TmVhlb;OAc1w}caI(^8;@nS3E
z>o{p?p7rVOV^&MxNN4v2rst-oFyQ1^5@yELCjxEx5FxkR*T+jj0`VUnzu+>O@RM<#
zrHL)R6PdNKQn#^Tqi0jk9CL1nR)B`XY9xBoGXnq(u@6~m1tp*gEU_dD&c`+o0`riF
zJ-Rpd5^Myk`wfv?+sc<9@R$Q8G{I-2%KcBzS58SgeIxep^yLd7FEgDD<5lTTL=B+^
zEmijbp#$mth9kH$x*fCQk1wVgr;W>6++qXaqKwh2DevyMP1k&A4;C@MOhUx0+}FiU
zf^LP&i$A>I%v{<t&s9uJ+cGftd3@F#jf=g(rPAxG;K}lRSRgz{EEG6uaf+YimBH6M
z5?lQE;<eTXZXf`nid&PG(DN|8p>NGai@rwcYbm@U&1NpcVRBs9pbRBq?2GdH`7T)c
zg5stGCmoEJ-FaW|j&J1E&8k>Ub`p>1zDnqFxay)L-LO6sCO)e#%2EkpuL@8cHGgT@
zEM+gi`;p*+I|{l-mQd(~QhOrE<E`mwKJk&`Y!zS$NM5Ah(|H<!+YOB#n2>(Fao;RR
z3M!soM0~xdZ?!)XZOTh!9Y3gBA`E2)kI(c0UQV7ElgBJ)SCh)Rwp@Tp`FC%7gI3A3
zEg8&d*lO}qifT^bNe(wGt6&lsfZ#0Xx|qtk+D2W@H4QF@;xbPOf27fd&Br37;3w}|
z^ftGJLblRn?C|fP55d%Xj@-)~fLZH)iloK(IA@7Zj9{snXRFUhCz;AF5W4#h$Z1n5
zY+;&XlZEa<lo?=BBIS@aShcBx%8_f}mEl0Ooy(>$xV$uaV<K}5WCLWaB0eP4bO4nA
z5-TygIz>0>Ny*A9X@ktYd*5bK$@I)4#W~dA!AF1A^)DgI6Z;$i`=I0^6C^cAju{Sx
zVO_(Epat6$V=!Y(nENG!`%u7KsSZJ6fxG8FZILQ&XO?gBdP&wfKpD{}kAS+?%mUq-
ztHnTSk^UZnv#_ZejnMF9HdWZTqHOO#@7V<V@Hcy8BX0Z}+;qYxe=;eW++~VE;K2&a
zmcOw;*AXUsAykf5VBWuF+^^q8%Z|1jXJ}<$;rMFm{mxeUb;d$Frji4CSj>H7`*Keq
z0jWbDaIG`jW3bqaawa6mVFp3Yv`9nqcqL{wW!4yn$Whrbog7dzpIffNBjA%8AtU@#
zjM(}0+TpDv;yC+}wB+Lw;TVSx0PVW%Mbr9|eS0t|_8K*|4|grZX5dhRjL>mWH#bvN
z9hkd&n!ksAJKtu?Z|Q)geqz3eEO}gK2Q_NF16(o!qKNvgjuWMp|2Tga5*k5s$5>AX
z?4S*v$+-*B`D~h$n>C?!xg30W_2Kbi#|PI@bjDh)kR6z<G`_dE&xp?MpC2Q8J}(=r
zo53qDtH-9FXLDiO)!DBkd%uu<JiQrG7SQ1a^vI^8IaJe8tOWY&a13jLijf0SCQR83
zm&*lZbLc3}Ygn5irxq%zhxl?PDmHH1-Ob2QPFLr7v0w?_fPMw!WhkloY#L47d!N8B
z7#Swhw_mby?B$y~y1~znpdOJ~a;8zN)6S#V-fs*nDv}<>6BIfobX8l&=)CUR4J=}g
zkr4HmTCs1ot|zEUTP5<qmg`b$%b6@q0noC+g6703_t3X~@Yk-qLP4^AfwYJ0jotdi
zM+E#20RPr67vgHy`)GLv9EIyjkHLIICDy}-=_TAtu*o!U0}>!+LMvVcikW~(xS;H4
zF`goG#z~o$K6yAKwkNtEosV8JhXwfkf-A@gbxV2pL(>H@s96V4lX9+Q3aSTQ8%2(q
z6p@i2vX|@k3g@#fEY?unX${#{L#>k}Q_?)$$&6=BAtxhfMGiXA)3-N=jxf&0X=P^0
zSm<YotlJDgKXS!92}mn&WT~xT8#BvA<ks-`ebc_-t6EX5#Vlx34sF3s%e}X@l9L9X
zfQV{^5*Af0b2rzu@stwB#TO{O{~FkSX>(J)D5#T7QA-(-2BI=(F&kJro_v`i-!cW#
zugWGIueYf&&ifPJ>fib{TCfJhXFr^p)FOT~lqA~Qr}<LCM0k-2GsR*iOl<S)C>Kt$
zlQT$S)<HMM<i2hShH^DT;~=K~|5nuN&@edeMNw&);Nv!~+$c1%3R~>#b}*~>yBYV>
zFZBozVKsjjCnitGgM$9=4tX)TD4(%v3Fjr{6s3Te^4O+p=14^hZq>~jb^-W}fow&h
zA2(w9@I|*RXtVw5R#j2v={XsPwYrP*PorD2q`&@l;l;k5r3yy41m?NLSz`^0m^iKd
z8cnBsUT`ilA|}(b<dRtF{kTLgSR6pt{Jy2KrZ=Is<g)X4O26$$^7016<x$ye8KdC8
z@4uxb-NPIiZdVe7KCk6rb6#RfeA87Iv6x&c@-X!Zgvu#f=cv|Zx&?q93&^tB^T;({
zyX-R5^5bm59q?pLbWgUS1LURjtrpktP|8_3ZBKf^#a#oF-wqy1FnQp!Y0sWbp?kJm
zchR6Bq=EF6SGDyJ=aW9b#9-5(b@p`b2iHr=IKWPl#qnQVQ+n{yX+S))Fl~AQGG-Mg
zvcxR*-9fslu;>?PD#Nl&LZyKBACKdBWO|#~i@)14_~dDeUl<3|eIXfoZICJlN7mZ4
z;Q%r60kA*P5m^#YL0K*(vDikEX}>r7cR~$SqE8<~z<Tb;i<Q-VNX?KrUf;EMpw!9)
zOB#3L7H$p{x|sk1Jp4;8*=G|0y8Ei<r-@|Toblco(f{i}fyHH7pGlV&1>cfvdUma+
z@MfhFIQBX7znQc9=Wy&IKJSxFy$bi^Fj{3s9QKp-70pr}x6p;PGzQYm*;D~K=#bGc
zeF5svzH$x*9e;v?_dLkdnVTB?2s>($p|3*dp%JarG^pHBB^9M^s;zAd)~sv@n>aR@
zb~e{m-mZqc89A?Wa^Y_;goy!QK^>f6&f=Tq`~`2GV&PpCq+vG@Pc79r?QNhO{@h{b
z$p)l{ppBOxgZ91!jzX)Op*r#0f&kOthv3rubE(z*J~-V_E{p{D5G9IbGbm&(CTE=J
zQsrW}8Ya&)(B9lCN;nP~len8i{+adldQC`xMO&06Tu1Ba{gR=o`>n4~%1aoXMd$HY
z=P8FBxaYfbw3NP`=AcasD`)0$N=nlyIa4W>FEdyB;4f<~dYUcCPV|@SA(qbQb8d_h
zkvVI6QQo#pR6`q3zHyo<u=7?MEz_zXZVtEj0|BS=kysA6;4GqKK0BDfDY*PcJ1{2?
zp*lIkx`EIg*9@<}NgXeEXOSiLLtC)z`S#1SxtULIi?o%aou<o%N9^oKYsQ`#)z~gi
zkn}ZK@FB<MFK6f+T~a|O8@>>*)46sXZOfX237obkAhUeu**~ER-9|s>?yWF)?1?h7
zH|RV_zlP<Bl-?Wx3*^&^O$}+JAFYx4)7EKD5cHy=sd^m7(mDJHXhL~tNk<&r*Ruo^
z0^Hs1ROGk<2pqwba8!_E$aH?ucAcTdT3zn&IMG`mV1`wbAj+r>L)P@rP(2KS{4yT8
z6ieArV8#<^SnqNr^e(46DZotgO>p+?XY3L(2^pZ0*3#KkT4XL)G@1<j-xpA`u>c0t
z%{T-ZxUN)Y;weTo6l5{Cp*c7m<xg(Pjx<`wFj78Lm0hTzd~BHrkA6rTNYiJdw;$VA
z^jGFER6#9R61ea)9SA0ZId>x<2z#^hlFNTH=<j>;#WQf)!k77%oT{e~CN>~QGwS*E
zc|Xn~UJ%-3pnDiXv?aZbY5|jg9x@olrTT4+?Eh7ty_CTKDm40X4cz#3&uEZBjlTq@
zHiK2BW@E-|g7a<S_t_|d%o%E-<*WBimP)LRs#GG1a}+bNP94>ruXLnAm%F(8rXx?&
zG{A-g!#JgtKRoDmtjXqRD6&~m0Ew2xbR#v-pg9Ksg+>Lc9j37d1v*6Xr69CX;v}aR
zM!kI*sqgICaxTU9xS*}KyoT9VLPD~sAEJd2eY=VLEZ;)dT$zWkdF5{RTsY`>yR4s}
zAA$M5fSg+}`ksc)w*~5Q0DBOYG8OF%HsX@NDbuDpqEP*0uX!Jf-}k~&5eK6G&!^Qw
z%#7v|@PoqqnV*hI{rW|_*z|@nl8PgBeGcJVm0LWcK3JA?9dt;jZ2@dq&IO7?&<kl4
z9?>iEdYxdpzv@jusvjZ%`W90dTEik%%*#B}N;lU>L<Hi9f7%fe;m}%&c^OP!?{rgh
zuSLps1~6w5%gUKH$J&Ow0#f|YxC4v?aCS6V8i!mslB~TiSD<^psa?n4WDs~vKEQDU
zqNWvr=#529Y2ya}A5QLgCTm~wh-@!{hb+iOVg(}_fCp%Y)Coj9l_+&ef9XT)Gj4$R
z^kQZ)wp~(T7&_@o&!Uz$q}no9V^Ak$Lm1cSp#C7Fo9Gp&j=7ndt)o@$d%5;6mjRhj
zwdzeOiQT8#*V+AjbK*|*pdJRha+95DUIKar^d@uXKTu6084%mnyVW2_T#x;)_Dolq
z4;pG`BpgT0C@$u-DAs3|7fW)TfUcY+h5mAv*gHq|+`AbAm|T0{%)KrwkwE@@qagoG
zza6!{-1!Nz=#g?OwO>e#K@oq+fX5;+KM<Tn51t%g(yytK&+)*!AtzJK+rz#|Wifr3
zNl8MTun_$QGGTVyBS)*YFUjT3UM99cgQNaTVjHs}s{W@JmSoeZlec&boUh9p>Y7UB
znJFN}I7&4!0zkCgIa(!5RzTVH{n0qSfdhUi{i^gL2-6OG7*l{5^fD-c=?0C21YBH_
zqKJRI8j^eLm)y1j0@7ulkHj_~Y4z>}Px(WEh;Gc=u9V#AXGhjdQCfkv_sXU2k?(mX
zNPtmn_BLN7QpH0_EV+CEJHvxfjU34$R<fp+N7{WrVAN588kY**rO;&&hvpG@F1wRB
zX++!CWr(R|5Cy=6q&D`hZaUIQr=g|l$uw5TfJrJ3%zJwFqB?sk$YwXB+*FJ1fEZ*o
zkZ#OeGrE{DACsJj&Sxk*?j1*G1{9PUqNrn>6r7v#G&dsRr9)=n-vMA@bSsr%%VOnh
zT9S8b;zCf?Bxd&zwXJI+#(1qh%LyuzBqWspG6juWRPEV>8PE99b;jcVZp-wLDcT~7
z@|oEZ;_Dn2;~SzmOFD-!Kf`q1>D;u5H<D6sHeeAVL(qcRRWB@0<*f*Qg}7@u)Yz%l
z%E1}lKZT&6dp{PN*Q%j3C`g?}9H1P;Oe0&|;>dGh(x2Mi$dDnWVckKmXhC(R?{AjO
zrF{Bnu5Z{I2idb&7Yn7hGs(L42#(bM-jp%%#4`fHvxPg8r%*=IfHIndQbmernjQyg
zDgTs`y@|@17MMXlRnY(luLe>Q)X&W!a+Y`2%|we+SW0qzII#lCw;_mtwrkH`pa*0Q
zDdZ}@ctSp22?BUXW>~7A9Sp<^N-9M|z3i^!7e8VHR_YTIF_GMF^wn}-Pl7Ha#Ji#L
zI5xNifN%L~g2~b>sC!~0H7d*VhgEgbfzIr0LK*X5JECUYw{`S(9Oyb$Xz-QWlmunG
z03aH1$0?v&2t*9v5wf<{t{&4+n1C?KaLr7fxgAT5x4_NzKGUYBPh*fi(N)1HG&}DJ
zs(j6(NP44Q_?I;gmZ5NS-a`|7%y$r|Cbfd()5yaRCo~OV=n4NO&|uQ*j+6F70L!Wy
zTJB9jKLt8-RBo~zqOs1Mzl<2dT02lsd$NB*Yfy9s+1T%zj<#wrx<v$G#(u!PM8CoQ
zi6o7$6)0j9WfTwH6sE6OSrXw(_bxO%1{4x~lqUnwgGF5HK8xz>m=zyu6|JN}iTS(Q
z1H%@@sc{J@tGXYU`$|utUJiieE}6OXa2Y_^SCus^3BWIV^cRd|gTwU-DoDiCWBd9j
zex;V<pRo4$nen)G!Oxi_)P4uu46|P{IMa*cj!8%q$D&^1vLTGma{35(5t%VLwAuuE
z<E0)NZN^G?@Jcs|H{%-DHCo#aLiB*qBFO<W10ZOZb~PeO51d^c1d-35Ft!K$PP8R7
zf}2fG(VH@;lGw@r_sttqKG0J)QF57vps(ly=cF0kNNhR+m~tf}?PGF9DppkB112$W
zwmCf?^)>c8ySd?H%#Bd#L~x=xThM%^u~U7Z+ZvN2E{Gyaw)}O|l96w*hoaX{+aM+j
z=ZI1v8WB-~iJabd|MFHJ4e~$(h{ixBrVTo9(eR*fhbFNGq;gs&xh4^Fip*6rGG#(~
z=yj4WT*$D>c)!?wUVu1>S<9v!XD!Kdu}bqGH{P3@bp%5gTfj=t$K5S0#Q=|bGmvn}
zO3j-n4KzDaSypykE++YgE%yTj6lHv_9A&_;>2$9=rijAWAQNBL4dB^|50{*CQ{DD^
zo>#XvC-`MI7qtsl!?X{All?@mGr)!TVPr!kBG;-FI?4&DI(vc3`tHaeB%>Yyq&Lh<
zdgputy`}5C5mKJJv!FcF0^aZTmo2x@Z5d7%Dk|n}hYmUPDf{ES$%6n#_Cy0(eFoWi
z0AwF89aJP5`eFKrnBA2-s8)2k_ZFw^Ciinb4h2j1gOJ1Y&HTDnSm;B#2pv!8?EkqW
zA1Q_h#0W#Fv`d7sRzyr91=rCFZ%OpXGp)%H8}1LB1vFC8{MqPef39+pfroJw44Ps^
zMK)CDftKtD-lnU%Jd*Y{PTE%R+qZc1P=g<WbTcFy9nEx6K9c}eEpmznO^E;kkj=1=
z-Jo>!6?!80EIfjiv}(OfUjC4h!zFl93!?M)%$UY^p(!n1&@1LOUu)161g|ct2@_o`
zITe4p(b2`6Qq2xOep`x&&A|^DQFk#kxMB6Vg;ngn6H%$Ye**Ohw`bNyS(>KIGJ+@5
z0fR;V0t8)=9%B}byFwPOkEdHWsI6G%@0myyC!Sh53&VHjzCdf|>mgyHBv`1Np@{Nj
zOcs0$9jYB~Qio=UN+Jn6%<GauQ42AVC6_+{vwcL}Zrc4qd*NSp?=BMsooq<p8O^27
zGLYwFRb+L^j_5jjcC`)KZjl@cWqVnPFcoUYn(K=0VhU1@<MTaG3(ZazvM;Jq2B38t
z<3biHcGM`je;+F6p|sa&UI|}lF(zFSCG-<GE`+Ec{~G9bpQ7`L5P$PZZ#&-*jid0_
zqdx*4%QGTbISSCRh=y@sg?Q_ZWayX%6i!3Q7!sYK$}POdB^o;(J0rlq&Nh+eBj#-f
ztmKtZcyMOlxlTao>F<~}nYj-IHCVU;T!wA<PrYtW3Dt_{2<1Pjqy*qgjtI0v$2{av
zk-bHyk3+MPh~%W2^sdb*mrkuC(n?l1H#t<BcNu!|Bi_;Ckebu<v+-Gwv=^q$0Q*;<
z;!Ji3Y!XJLd!$b-PZJ@&djZ|1Fs%(elxrvo-^}g6t8I+*`P;YWF3@m0{cQsmt@@^v
zpyDIoL)c#D)JT|^USAA3hLGv4tc2s=qtYPWCj62V&eay{9V*WMuv$JCvr0xiR@S6t
zZEpxB8MpGRa8sraX7Z_9tUC-Qi4F0FJZ|Jv#L1$l2_5@zBXlh_$63_K@W<l_$xGyk
z=TYI!E2sQ_?gz>#ZogT;%NeZ$ToU%m&?C%N+|JV&$r3MfV|PI6d*4dvOG3Sv*hjAx
zif0&qhiZjtETCagbK5dEN*QT2suWGt;xN9d-MW^1QN3?#>57wf)jDJ>bsHnwdm;yd
z`L$VLBo)>Vn1=q|m@~2+hjyfl2GI#%r#LMQ1Op@_cDnfXF0LS>Lc&y3heHjI^GM+s
z*y_55@+1r=B(bW~=?EsK4O0!64Ff$bXhzXM3Fzb@gb|BZ&#rcM=35cNdGF3W;zMi!
zMR>dJm58;-jp>jIuhNl~;?b!tt5Kr&{rj_Vqi|d22N1IZIbmzte*FTMA)g%{02}SH
zO3PUt<v@z=Qdx<Rd&%JYe9;Lf!Z04c#FiSNzF)3q={r1TTJTS8_3(ji;!4P6)I4QT
zE4*E`Poz|D59aR4f6~yHA_r(i*du#9fe<OdjRe$?9Y}BFpp|yTigIbU9Br*J@jmN9
zi|G2fsRu5N37>RJmqr}5v4fr)Lu;(mFP0K$bTZS0Zf?o%#&gIT30=6KNMcijKoaf`
zkVd(PGN2&=L>uJ#C8GnVZ|*G)dFR1>;}SK?)6oxi<HC;Fsw-<s6}T90E5NJMTA$48
zEgT)bs7tuqfG<iDLt}y3{rasK7@djg?a{G>#Jhy1lK~*%u#LPCwqSPtI3@h&mFKxu
zI2#+MI@G?yxQ=0Hx|0Tnu!}r#d*;=t2B5zYxfJ859c4zbR=JPWz2Mu_92j7MHHo0!
zVrUXsEf?O7^p`LsYZnszY+%wNO!MO&JPh>_t8$>!MQeo;@Wn=#btDW7PIuqfv&rx=
zSuR7+@`0B}mO~#93Dnp`^LXQt@fxIAL^2T=dqq#}pS{5x+HDB8GB6yX<U){LWTC@_
zZFmQztNO*fAw{NV;P%kxn+7CARao~2=utt!$O27HS6tTL<~oCy5F`%0I5E)LW*v*Z
z`v$!y)O|~ft*`|M%fxqK!ZMHo8upgl*PiMmv{(nCuc42CxwE;VRDOmKrXqFidjTq*
zsq)c1PDw~(2@;XXd<poPdp#1=mH9ldn8dpAe)w7RlT&7@{n7QBhB{(MS16hn(^*<N
z`Y#4<W73Pw@n2H~q5}w{s#$;_sM62<6NMa_gC7UIxIsheee;>AeCWM}zmD){+15l@
zGy%PwGf>_r`PuIM>cp@k6v-x!q?x6C4`yGI&dr$kqBsn*T>OwgZJnHT5$`ky&8?hB
zqlbxp(Oo>ll=r&>HAJg0S;mE83V$hz|FrRS_1Q7++RmP~4(ns^P3$v1>7+(M69HkI
z-%%Ng<p(F|8X*Emx}>ga+N6O@<#+6LA$S8gmkvD##Jxm|b{OFfiVM5hP0qbO3olgc
zZr!`eiCPPpI4WUS$vf9)nlFyRo3rWvU2MRnLX=rcL9D`xWub(}ssyH$7s-CAS?2n5
zvXchYKJ5F{^N)A0zrlXna+u#7K~5T$%0B(rx~J4i`n7qI33<gE-8}7$U<UR@Pfgv=
zMkFKb_clzie2an)TX5d=>)YgIBQeH4VNh)v`kqGLxh~tZd<(n1;!kjI*uQ&m)DXR2
z)1C1b*G`iR=zs3nl~C;8=}CxI!e89s__uG-AMwg5xJ&q-PKF0gD84w#*@ldp@ig>%
zcy*)O_xUmG@5O9G<EGBY2hsl@?4Oro8(7hbjeosoc=<)lC~}Rg-0-KcU%)?OV(7OS
z(?6NUT#a3<3CaEb`Om=bYTf_8-oyX?cyrPJA8y+JF4+Gr*#GUx{$C^cUnBWnBl#ZB
zj$YmjdH+8>7|s3ZrK5$J8?()V`H)hP;K^*p5I?aQ=CMb;e%(YE3-ky;T>t5R3hUQB
zMBz;w)qH&~olp_INM<nr`!g+Qy8b_f_?T^J)*IFeQ6}PdKL|d=HzM$Ga_xVL__g1B
zpSQCgKzJfH5_09+n}7#1$QN{YbD)2|s=6+B8WpsQ`^zp=R<FU!t^s*0Adcssp6cXh
z=XF*XQ$51&we(oVfgC2bk+5j>v2~*rYOXO7%jeLOUqSsFWf-`DoyPuqED+R|mtP1;
z8GK#uD%C4KDj~5!Y07a?QR5KoMBf~@MCy`%e(omLd??ldV2c?=b%B2ZN!LA$eS2lG
zb#IyfpKo4Ro*ap-$@mH?%3zr4MNIGmm<D?!>7K^dAo4gFHT8}`|0Wl2aR{0W)2gvC
zGmuR>&Qdw)(eOL1^Kttib3utwyMD>YtlEw>!YlNM32CqXdO$irjriNLJ0)1a7;?nH
zxxMgRZUy#pF`mtIV$i;Cs-gMITq&L)FLh&g)i&8IJORyFo!FQ#jX>QVpAWBxU<<ey
zh=IZX;W-y8koLWPIq9X7{$*4JfRYC6%A~;pv>YM%D+r-3yV%tCiq$5R0*KUvSEGP+
z!e4%)j)7EUF01ecWB4~tZr`zPOi3qVtH#qR)0wqlN?xAxWjWMRhjnq^_NH_QA2ztR
z2rpp5Zqe{2X80#R|KloC?|M4<(g<3TOI2vvbg54M*avCBuKyRe0=C+-1S1<Wil1v2
zjJj(>VvL%GWIiiSvK^D{5V=w^@s0f$J9kp95FKcr%w(9k9-fUG4O6{~MpQNyY~;Vm
zb5w!%6RVd)F|S~wYZwM>!lXFKuN(eonnq+_hEyZo$+cJiL-DHVj5#%OwhGB|b4NW!
z5jBs>GDybbsAu9yVqMwOw7wGH`e03eoffJkSy+0rA+vPGnlR&)++J9KJF*68zSH!~
zGM)IzJ8ndQ>A}Vu9P2d6^r)!OnR_q;5$apaYcuEdlO`z-rqp8bE5%o+^Xx0%FxA7(
z)dAkiFZ4|QzAdm8gvNd}rf#Y{K>8V~khnmmiS70BRK~5G*d=jNPbpfII~I;E-_B4S
zYyWAfsZ`dL2AJc5gbQ(f8<J8ozv^Bb9_TBcdmF%3C|~`VOJ@(vqH-!}`6INz%-Lny
za7XNnu2!>juZtTvj@7!cY(*%dQr-%W8*CJynSooFIcd#v?>M+4E$ik$3PcIR4+OV}
zG_J!uksURqri6hS#f)=k=3=m`67)(g@6&CC+6j6sQ7KK_u8+g5;V@eyesQkob@mdz
zv?JUnr#Laq_7k66y3=YV-c5icngl9jH`k}@w4;|Nn*KV+)Vs{izF}>v5o<2o2l>5_
zOnyZJM_V)2#ev@7_Ce^=aHoK=PNXnATWvDqOu>xlYW%^qlI{y~1h1MI@yWs77?)V?
zucN4v4hqzdKWvW`B|n&2QD?5w^~vRYvFFv!3f6qny@i&f{$P>2t|iBy{sc48rA|aI
zq?W#nm$|junN7=CW|g<q_U;_anpw+m!^?<TT*#81p}<VR9SuK!qI}hm8ZBiXl~JX7
zuQ%GPt?)Sn;@wujm|VvXt*t<85&J84O!zETvaU4QhKIO7Z-BvM|42mIQfYxlEgDS=
z???z-HeH1mj{d`=u~b!aN!cq?F6RlvnASV5`1&Eou+gFfFP-;iVg1EE`~?kaxO+-F
z{;-1<_HtE2!l;{zoT1M0ln9NomPC{Vq2egmY?!UHp3PIoQKGqk_$wKms%nf++}-b2
zph$R4nVTA2U(uIzRs(U~6{&>0xCFiu>%L6<jDE%2#Vt+i;W~>);#ckbA|mlhFC*3@
z^FfL>8&aTrd3~%inBtt3RkS3okB73y<8|XM+lhJ95tjB%mdB!WBTQUiwJBq=DQ!(|
zodz{W=f;`#4cdyx@%44PwG~(U-%8Y89J?&>x8&C~y`O`7BOg`gck=bDgsEBtLk$A)
zrK^i#gnv8--K;BU$ZESE-g$1SJA6@a><@LMBtEuYAWM09xlZpJfouL3T!gN4(iBeq
zg)aA35ZcgQY$2ptjp9I*4wB^J!D~xB0z$8(7e9(L9WY<dm)vje+$dt}8Ub_Uo-L>2
z`|y2PQ_sSLoX=EMgXU>1v@};Yx-<2MNkzZhLS<5Tj>~9fX~`(d(inA7Hq7C6ysB&|
zzS!yVl(N`%M_of#;L8^?31=teHgxe)35RCS4yWpGRPJJ4x1WQOrL6H=-TbuSF8#>x
z<@B_yJ8Fs%^CD1**q3%-4!xXZ(5j7@S{13tPkUK+EQa#uLa**GCNUJf%m4cKzlMJM
zeQ0;tYrSo(=s#w@g0J_hnHv~{SXC8Q2i@z+FszZ|&(QgLO7sBB^4cip^ey4&fm9<S
z<80o^Rhg#Ipa1A;pQ@jlBG(tq`)K^DWNBr1+WV{4`YDyt(#N~rWv|N%v{6krmh~m;
zp8p2CeZH#v@jrk4?LUTC4Nq59u(mo%^#!w%ZV$P0V#0j2Uf`$TP(rx9jsLT&2M&Zk
z5rW^qCpNb89mN0hUXxc0zmjkv?c~(Yr@HhO&B7f&|JbZDS3Ej*awN7OWxBRh;@$q-
z`sLOOTf6x#`rQwU*_#k$V|dZ}cFDPEC-G*l{rm2%JyG$?(tf%tAo@y@ugl77Eo-r?
zqWH8<Bboj4D>oi&XL+iAf31GIuz_^btZ3seVKLXUl$M<A9Ft$B&)DVE)MPiFJK$ns
zG*<6XJvqH7T^Y*f{3se9DU>DD{>Z{%VYp+L*K}*Q&Qez9`fqYy4>VGJ3Z?I_nRm6i
zt+_U8ay>cGx`oLy>#gtA{~Z4F*IMAan3xKp?gl;|em!6LhPSdUq%wR}7+)+BI2qDF
zun0GBy{e(`k8AOOn|namwePvm*Qmw9dWEz%M&bP4o+D?oc=2xIBVFlw8+!voT$=>n
z87cPj4DoZR*?%qX7no;Fq1@-?PD<wF&*&GiRU#4=6DEyc2Wl_<SUX@Fx>PPxbJn4|
zn|mf&&aZHeZE@ve*Y@fDmpr{hvzNPa|5$%Hxux!YRHk$#XTBKwKKGr}j%axcf9rUh
z9}{Q)j-QmY4c4W{sf89En$2I6We3zAMD&Nv-Twk)q0$NNJ-@+2W1H%p`u?@yJ=Mc2
zK|d$e=X}}zvPz)uu8ckD>ZCz|P;K?t=~uw2!RG{D#SUaGS9COZx$9chL+gco&V}ac
zN_9~OqFeq`)AL(2sqz5l3LlHo0}X%I)nh9SFBRmvCiQMTcev3Lo#N}#+pgB*cQ2V}
zUy?Rnet6%=wO@W5Ro$wcTjN3~mH&N5z%skB%{{-iDS>Ugkz>-*fs}<U@1hoBqfNP+
zf;;pb+D5!Yv>PVpPG3nH<Zvrq*&7D6x$ggF$LV#|a~(cBZxrg-wj9%q9aR$<>GbhW
zWk0SaFK>)Y7e41rPTHLS?0Jp&$?)r)`Hs-Zs?@Qw5_gP4({%I(xT*J(Img8xYTiCD
zCA)m(>u(9#%Zt)CqbK%few(z<3Vg00(7TuQ2YchX3-f>Qwu<K`A4x9_NH!nbBB-Jh
zpRc5MCgb=A@>$uLA{%d8t<ajfN71$eVitz|lX_`5!urKG#%AI1J9R}w<|H`O6AXLL
zscGS@4o23gy&JU~P0^5O+Rjwg>>(rsHu)R6ODH9IUwP+yI<ml`z%juh)Um=|#=d_d
zeB@6z>*Q8@^;gfEHR<1Dx~ApLiR}1Qp5=l3%=u>1IL*<d%=h=Y@~rVj7FyOVu7M*1
z>n4%?Gs$;+w$#mZRfO&dxEGcao#30??DjdDWn*?ot}!D=g)3OTx<9jY`qIl6_iVmq
z-48YEOdnX*pFMezmm8-YFZ1EdhoW;cPF+RhB3f+=9$zH!EsUG@ocux8Jlm`h4WR(D
zhBq56R7K;J2WQ81`OM`^o-~6MeTe?AXYKk)?mB(0q;ref6vL4i5rv+y>VJG1vYvd9
zWLz7w{EKN(EA^PDNfl<k|D2YUmv7{c6nf}z<LmQ%?AP&p!O-U+$~GIyf4aXW4jqqZ
zi-B_qGIOSlx%Fn5x6Q3@bJCVmSDx1m4yiuxJ2LM$o?2QLk-Gg=Z1%c;+{-nX0|b8V
zzpQ(LFAZ4}OJb;mxy{!!iKe8CuhOlA5SHMxZ%pcP^KJUoN1r#b<y3PJOdlkUe%Y!i
z@7Cu?swd#W4fr|KN&8hJ^@~=jP2t^$9d8bDo7T^YHau){?TLt%6dwxevbbRXA#=S-
zq9;5zEF!V@zJ-0qMpwXTJN%^m(&8ap{{0s#?b5>|wZ;?mq<Qv+SKTROm+hgs{R^C>
zEn!P#zZsXry)lr;v!XWZ$gdL{GV6bA%#m{F*0PTrN-0!rENB%ujCZt2U+K(ll`!uc
zFOHwSJRf8DZ7OQedFG?|cCz2T5}SFmd5?pyGG%9`9y|HodO(iY->Wjt2J5F$C>pnX
zX{J#dj}FZjO@?iW)m96HL~sZH81(ti5WeT$q58$P%5TdOi`HJ$beKr?G+&qR_&NET
z0sgF|Tg>w$k{Ed+A$-n0s-=c&gBm(!_R>n8T5Qr=TSki1?tSGDGuZLmuO}kOVm_jp
zo6mHOQ*1BCK5^ye;-|uOa2xjfzp9r(0q_2$18*Q&9j5yt8@bpU^83MBPW`x1I^TM-
zDY4w~vk!0mL<-*@E!L^8Qo2mmDf&M3J^T^(TpPuHQI%isn4a$)?JJrbuFtd!i)FV9
z#mnTk70tIS6YjXoGztluk*VB2e!`1yBtObD?{;yGqSy%Ep9tZ`o3>=6j7YAHYR3B!
zKNrV^^b4F8P0E=vwO6{5^D52!oUv>{-XI~_Wo4v`>;!YKXPw&4E%Xu_M&cij81u1m
znHzrHDLzS_7@eq}iz|Lk&>b$&9l<rq9ILTA_{8GAB_%66&T4eMUVlm~J9O#w*6`uE
zh`RV&k;1{aei=fqY|>Em>QHmWB6(3g$7FtSNs;G`jDg0#`<-Rkv&tmQ_fmCKKkB8)
zPEeDyO6zE!yA(<$Gg|WWFh@71K6MRPgtz5S>Z)Z~&&bX_%~tRk*p~30)1GpZ_Hz7W
ziyr4g^Y1&P3LUI3?>!U{B$UzNw_!VFCjOfGzTlwW@u{X`(WX8*{3;yR53-KitCILB
z{Mk7s<~LGh9P(1alAb@3b!cz9G-Gc6%4neIe*UGtpkBg|Hbo0x6=U-+8MD5nptAd4
zf-7IEKxo}sTa6G0-3h<tJ(Vq#A+Hc|D^o;RG$r3OapYv_fDW$c_9N{F+WSsPRMjL0
z_Vlq|DwPSC&oBvkF6;XF>iqAT(ax!2CPr!9cS_pv7RmFaTy}07&;+leARVb?)NeC%
zX>wuZ+8w8coS=GrL5suJqwBik8ssMRW7~#9DMk?|-A3AG&d8QJUzmu#QaV!`e05+p
zslIY#%<v&TuFb+)F>%P&A?wxi#r5TRZl8t>C1;@~Hd(_Y`w;z|CsoXE5H||kJPt@C
zeKZ>gr4@_f8<g$wyGM&DhmB>I>!TXp7~gLgHh8dAh`Qi)@zhnr&#7=1M%1}!vYk=r
zx!?`UpnQvw5BENk>xC<t9%V~5%#f3QH{a`s4%msHyPhZ@AM+QQ^C9=))(jQHk9s>D
zTJt}-cw8!P;e+F3Lk~YcnNtAmllO;p^BaaUzZLtdZWR^B^UiyQjqNDDtgxq1!{O}R
zlu|LndnT^Z=1o?MFhWB>GW;zR3+;qdV@K?D+146!b3MK5$^U8i@zhIM^#d-&RBfwZ
zP<<*${-0a4Ev%sOY%WJ_{d2+jn=@zi$AeuKRQx=o>@KSf#<i}$KPqa~bu)KC%1kd>
z+oA6Z?ctzHa&U2Dh6KL+y7iP?jd!letLL_<OOKw57)>wbyhxP|sY>+FB~N~N|4HR^
z=WSSZ5$&aa<Nh-vN3a?*8cCBBaH_dE++|*JBrXWo9nGC|UMl0R!ENdH4l6-EM89h(
z&CjZCnAaApo1P<E1-JLLcH~7%O-72eq?oUn_UTGJc%vPXyOxqy;?|=hY`$VQInZLe
zz5ATVsp)42OdCEo7MV!4SC<u(lyRAF#k1v{xOPs4t+twNyJk<>AEzgkqo*FYZjb2C
zak0synN5<tjVI>VhID3%tq-Q1;|;gH?XzA<tn8rlOE*eMYjup3P|g`1$ad-T-)~L5
zs6O(Vbw;|FnO3pL5^N@@UvkXtLMgZXRXua99XTm=aBf3#^>^dC#xuXBulS9W9bTm-
z^%N0wZ+4e(g|*&3-eG2i3&QE*8;f-2X>*SPu3@8ppWI-aVpVy!X6c{z%KXleowWi^
zB8#0<vsu^G_7ORnuy^!dP0_KwQu%hKZ>Myto4sw1w3XJMWwUzcoypmJ?f^_F87=q!
zQ$fRm?`)Oxj`061$X0RBvl;Bmvi+@cqvO=q`xVmiZCUI}5@ew*;BOWFo4>s!e^XrL
zn25kB!um-6FY_V)9=%xFjq`t#{m|2~0{^hx>q<nhuii)yr+HIS%aHxdYh#FKtS97o
zPkHH4KK(LJu8STp>wbwlpgCH|d{xtc^SLd&LDE9?Tn|+(pTcARf3f$TQB9`p+OT68
z6~}@K3`I~;K@gBG-LZg(fb<TEbO;?H1c;7>kt&@~6$GROArPblY)A)bi4a0WAprsj
z5+Q_=yjNgm_B%d%X7>8ldcR+rKPIl^&UIhqEXR4A$K9>`CDnU(*S)-7fpfnM)Z9d$
zc~o1;)W>~!_B5q92ZeoJ$wSGIhrdqe=}~9-ehQ;h4`=yyddb&#+cZ$jP0yPbn>0^C
z=w*xSau&TSX;N_H2phLz!M}>J01uFi5C{qGTR|tdV!FzSH$&sfWJTJ(YMOp+pe?7|
zy-<&xHtWSAptd8{*x4Cpr`S8?l;dwG20JE7bBg6f8iK8{L5#hwtERhy8=MIQ)ylC(
zcE|GSIl`Uu6oUDTj13AE1gm$+SgZ_<XWuxF2r2XkxWN<`D7VXJX@}FM-v1==0@laU
z#pOO@j;(@>rh7R<3ekMy+S@o@S7FKW0T+6RtDu>YY9p)Kr<qhYNjii<RWw%+R9laf
z9S`eH$L69d9pT!XIQ+cv?_v08pQ$!$raYjFK|LeSv3^LAhU2Lp{3b1TzJjZ|{nC(h
zV|;2mjuWJ7_7GQElk~b6+04Pa(-)*DV5c<tcWQotPlSl3)^{3ER3L0}S=zkZ!0zq%
zu*(HW??b6MqF;QH#*>cdM%Abee}<<z>^-eq!7K{5&O}H;w|9IZQnhevHZiRfrx$D*
zg^DMN+;Ctq`*+WuXNJO}RY+l+NObwT@cc9|<gmBb<clJ7T;i+)h6idYb@GQ)CYhci
zT&SqH$&xEVMOR9UXR^%HwviELQ6@JPsJq&k$q8ncux*%ePjOzQSve4YerTM2<3`U5
zSfsXf;C~gB^!#=s<p3mp_dtLf{%iaPeEr-r27Vc<yXf6M-1(TF(iM4YZONQF1Y7bc
z_!+qYgddj9gFd55xN8pFLKsVmR=d)4B~L=o-d3VWMciUmy{6MtS&&YTkz14L6*vlI
z7d#1UZkqu2h)9a}s=lSO=HXlHXP()GgFkjoS!-i*?1Vk<J7IbiSNvaIu_e63OKlYq
z^sDy9_*BQ4l`+UIC-oC_l(7MBhoS7}E%%Db6<Zgt(lF4m`GUK74N(Mk`1((jY9)!|
zrB|rE$o0r;?Dj=j;@g0(<$~8>dlDCWG_$x9IqM&I`Oh>=T9hJPa;rpXXGfy@NpC-k
zN#fq_Rr&Zh;p}f2*HJAPIt9)^B#cyPS$DKGFm@Uy2D$|PD&x)11c?@+Z;x_~WNlHx
z31_El%WpnAH^TSfWfNTYSymrHvEO%evQjdTG1n7=C9?B5IsX=CCr;AHi6}rg$dls8
z&*UV^l|%Xn6^~eN)pcZNURtk0$?S50%~sLl6=UdLsk!(3k3Q1dDTSGSdYN0vA%ak#
zfCap78D+=95q@S?Yg+nB`RZt^$GfSq-8yc(wZ1<~oN!RB$4Y773-_-AAH21oqd*Xv
zNgGq?RfX6}oH6*8!XFg3GO?N;-?-K!=^)oD<-wIT;DExkWHBowp!ePIxBUCWk-gF*
zUi+4@>>pj%+2Cmyq9dWKqTZisk5b~bFS2q_vx&B_JkPz-;q}-uVqd6T?A7k(`l8XF
zGSFzf)C3}|MbE`_vhY>C4Y{lVC1REJ{9_q+vW}VePh}0U-K*W;Iq1rXj9gaDRNHTJ
zq5Fw)H_h_6QzvEOrM)e#VD%4<1?yHb#zcf|r<y=q^b8v7<(;V{%~KKC4N<RJGh=Cx
zzs|IE&S+R%lLb!jfF*oy54!kZ@SxzS<?wGA?j&6@bDxlh4Lma#<HcI`HOpgc@RJXl
zR9@r<T&sgPp3XKR2Gtc~Q+4v}XO9tG|Fa-TecvF~r=--J6_UDKjIVCZ`uZWyGQW33
zND8d+S#cM8zRE3SljRMsR(L~ZbU9%<fv}3_dM(jRk?u80#ZZ@Kh!3Ut?F3<h3%PEm
zwK-Ykf$sxvOYKy#PUY=U%>ug>W}Y`l$P?8r=BJ~xdxvC4lOoNvH4P#8+=+Z;kRJ70
zo;ej`UYf95)qVF*66LCF>7)K8b;#j0W<txOj&R`=OOYHwA%bOopZ1ZbW|yxKj*jK#
z7)o_|=BUGAWg}%H{nqv7f!(jjt36c)f}}VhidU<^qoL@It|Bed6x<4KSNk}3gV}Yq
z<2&X-pFmHxoCWAYsO_yW5Q#*etay$*&H^!HgDt-mg}S7>NEL6h|JLie*CuPKeqX%y
zm7GdP7>VCT-fx&U;6k$-zFsHaAWd!cPC%qgthzu|tUdXO`|G|~S5B}wH+#!#AQJPX
zzn!|5zFrr04U$(CobLVN6R}s{p-E$5sTel|UAxLyClw5bh_Kebo+PEKBW3%*2)D99
z+D4+(c2^o~Jc^{C<i8*^r<Cwq<VbSBiHWKqHNqi7Mvo<VEa+T`?;{1`XR7;tQ$(g%
znVd;>h_0MJ%07~s<qo5Yi;I#)2nD8M$Gqs1eM%}N_Yxj=VynHARBw9Xm#V&2Xq}wa
zEyXfDVMy@;M-1}e5h)!mHsC)Z^}Y~`>(iYl0C%pFe2E*xd!paPdqZ*y+fagA3kc(r
zf?Y+(Oz&)^*@}26rBb<qYcdvEwWCt=!-er*Kt8%v*$5ZH(AsO`WiRq|&0PTOFi(qd
z<y^;da@xJl?z}~aXxYr7+ji@099mxlOBq&WtTm@q>Scfo__7RnWNJ~v7_E6-+oD*}
zqn&B^mKQPk)W~(U@ueKLZDiP1E)-$aj0)QBc)3&Wa_93-3Y^dv#BdUZbfs$Sbc|ij
zicZDHelgD|?+K8|P-fR~+dYj5d;iwVWw;PMnLoAigmFS>9Zv&6Cv{h+eRY_E>at+y
zJ4wCfV)DDjsJ<K#q9PGPYKbNlMast;k;!k0vLLeZ0_cU$iBbtZCmwgk_P|;kPEqB9
zAB4c(ac3IBZah`Hiqcvas|eO<0C&`?m22yPUDo!;Ef}k)w_jlZo4DornLlmwX;I3v
z->An0v+!88w@aBXI~o~L6FV2R!WIXETY9Ub8#3UrQ)_sbWLMBFi<i(V=D#Rf7+LLn
zt`!Way08Fp=%w7`>v@_;dAIDQ>x2jeCrDDQL76hG;d8+|dT16(f9BbJEnUOI?l$u>
z@N9+I=T6}>+xB!HBkqAY+2=DE+wr}s4o|I^PPFNhb?_gyJZbn2=QNfQ^$gUnFfCTE
zy^Uga?L88Iego<t^C=@N!pKgFSG}5cSoPXuk>TD(CZ96yp34_4GSW6k>hX!x(Gfm-
zaz%X5q0Tw@M)i&C0WEj8h{+Ke!ODfV%v}&sQ*twnY4DEwmg2(v^A7#Hi}LQn=Jd%-
zx{P~N4!bz&6TKl{lsNizsi4(E!G?Vcrj=`;J4QDk*X3Bgcr7%~Q-?_o<!643K2=Yr
zI%vuaLF6486tnw$7T4l?_iMrv`w|B781}aVo#sUH_95pVG@-gCM#>R7=(wZhea(;o
zZGfb@q*v;VXsh9_;KlY8zc3ICo_%nLVAQ<c30;YrBiWpeS&{My&SBpq(>vH}F>#!P
z`AO*?z+nAVekSQ_=?D)LY{@r`<G-%aCW;e%Z>t2l_%Vv^@xI)dZ?msjtFOv!9eGL2
zIu2xHRP7n~MEsAcc(T^qKrlM<eYry9MSLvv)9U-f25%njd3RM4T3+rQn3_+UZX&?F
zdnT8EH3(Z3_I)FTIwZxId2e^OxwL`QRCoysp07^e{;RhQN|9Sg9)Wl>dz8u@Zksw0
zo~^n<WzJUUe$8T4(29L~55fAnUl=|*R}U!$2zLB_3q*Z4M09s;oVQT9ZTW@Civa?^
zI=esxud)Q0^?c^(g#-wN1*{@z-9j6G>TUjUpO1CmVWwjXrWMo6Ou}Sg)lCbMOf?cN
z^)`;B4KTKanr;%FTMz5!2CJ~dnUj``L8L5ok^Q_)Fq5GZ;c$5|seyNU6xABafkfPJ
zYgy{m{b!cu^h~qZ9`6=v#$ZtWy{U+uhBlsYl$13LwCBr^_YcF--lk6kzu*h^s?ELr
z^t>%I!$HYaeemn*@i>uvSw1A}PMstch+U)5EY1l#iu^rEMoNOLl0lpg+m}_ZT4Q{x
zH=#4iT6<|~ABsBF``SvDFTNyp-I|jrQy<Sb2*bn6Myz;Sw9doVVo@WQQ`zTrJ^39t
zNG&TF1gaX^+jC`bS6a*S<!ZC<+YP=feVdSs>eCfxcP`sJD$@e!h2(#lN=VYowpP2y
zG@rA%^~f*AS=#1{xk*EHr2UgdJ*YnY>Q-}QXVwKz<fC(MARzFC%eggKO-bUA!`RPb
zU873n-TYvctQ{T&PQNFRV9-;N!zF=b31t|!XOquGQBfU9tVJ!S_o`$@Xmx^1e*cO9
z#@7Ta3F#r9MF!MPsYMk-1|@;J+|ji3#*wh2j_s;(w`4M$w3B!0+%Uh2i3zKqkIl>E
zu4YdzR(cLNK*8f*cfq|8*L}tULa0F&;sQHHwW^luk4TY}8QR1##d0>L6dp$(TU?D7
zKGby)h1V7ygU-KTcHZiX9vQ(2pBqH86s|6aiGqj7eo&tYS?^n&3b#1Smfwg?^2C1!
z)$1?ttEfvXe4E4@ODT+Sy=sx5HZ`>_2h&Yz-3@1%Dj*tN7sKsD8>P5KGgZ|A77J=V
zsWqdS@AeD{AkNVz5ECZa=6&G|4puHlJ(5cdDqg>ovN{q5Ut8nWJ0wHLXD{;AYzO^a
zT=C!GwKXwouVx>fcW1mFrgZC6wA)=XoemsXfFN|LNwjzizGt(g{mub;_>j-sJc8YD
zJFT~><qn*rga}OqW~=-_@z(hY>gieo&-?&VZ)C^tf5A$1Sv&&6w@oLt>C=L$_Q-{C
zdz0>W862adO`b3luGP<tw>eeDmBn{mg(<J>B%*JfKeVEU9r;mVrUEjekhR|Ch<Z~i
zlwu6R_J=>zr@qaN*3prXYkm58Iha@v3+{8FGc#3%gD?j)VPCGv`&r?YO2a!ugv+W7
zJOPk$2%l0~(?$Fs%JMgP6f!o0Hi}ey^%{3PuD`4|rl|DS9qW?0#d_8Ir+)KZdjavm
zw@r_DHwAWjQ8u2%aoyvO$^i1ZHgfo-nmn{z1-g8Y?sGaes_c*fEL@Dg@i1z>B;m<h
zD10b82r}Rj0B|t4{Ilcps-R*wyasz?6gp7-%n$nHY{b}a1;soQHqmeAK=B4t4iAm9
z7^?s(#6u2Ayj7lclN~dakZM+mKO`fz@AUq%RZhgg2m;LeiSH^;rk!p1k{b>Or8q;{
zS<$iHK$&=&Qs{CEzY9}ZI~SlMT%(^^AuQ_ARX+z(W~Z*iy$#*9D<H<BSVTEH*~xQD
ze|<02VXst(RiKXMhE&VmN>gZ&zTHG^^doT~?z+IqPvaKd4kG2jy)_`G7!a?F7Q`d(
zT74<Y&E0oZ>8h6wYrL#>2$UdLiGH;WB0se?m9MW+cNF^D;dh}YJu|y&SH%Q1RHI~w
z>i90pN)0;B+N8tTDTOE*F1j{@;VC*G(n=IARg$c&E?0}4Sx5b{r)+?C1XhvWk9@b9
zro(4b)UAyhEL)t5&ar764y*K8^ADl{6AXdjdx94E8{PouTo>#9wmMwKav&?@ne1M*
zrOc$P^-2IlXDfPDS~b;`yH&thL3hy`a+_Cd{>%b8+QzHq`Br-jAi}UXTdX&~c#Cj2
z4jy@JGICq?;=%ko>q9nVAs%NZo`ARU>)5#f6Ulrr9_c-BCa-JeHTN9ppRERvF~|v<
z&l;@vR@6t=WugV3bz)c72VPFzBodq8<`?Zn`8lZkVCX??XYDE<eEo+lAME}!t&dmn
z$>J9jI9Y=W=<HUL&i2Y43n1)~yf#2ZQ+~*CXjCD))i9T*pX?~~2)79_hBL&txnc_}
zwXt<`vQIBKjmj<TuI*9^n7NlPSsL>**_unE)r+{Rdk<DA(`RhV?=?PPNIuBLgx-nJ
z5u|@kJVk%7y`W1xA`ll=dwtfqGiMtKcTu8jAWEBQN0ao_vc|e;2H90}=O%qnS~P8W
z-{s(`e>yEe=7^oA(sF7qs9aE&Ze%Js5Jj%@{`|x3QWVwT^mRY9XedoXu0mE`to)IU
zHdfR7SDMRK0Xycm$h>&u8G#`ClP)r#ScNzg;MIFmLkF9_s5XMlRV!J5^l6*LQPiMa
z^70mFo;kB8nxZ5Mr#JkL;~yafFvx2h&@QvJ+CY7(ZXJqQEc)m?ak|E4n<(wQlqjW!
zsaJ4Sv!Flhq?Bmq)Pu~eosKI}kjvpx)@YV-#X_OF_WmVUEq%0p)nk6xCh7feZ&bNw
z98y(fNkpW!O6LeWVh@{fLVMc#QxiFBysX)GH)!_@-1nW|YLQ!T^-1R!M@wkrmdLi+
zC$Elv-Ed?cidEzW=}gCLB?pnZ&<uoitrR^iW_WtdE_R<sCbr@OC}gNL>zjRA|MJ#s
zqa?N1Blp`It-R`kwJ~QHz21UDmi$xRdVO$7Mku<+Yh=j$R8z>B1VdmezFJ8+&W8Wz
z;YHH!($NH0$N-7*5|~c_6v)AgYr@v?t5s>r6(JFI?jwYy5m36OXhuRts@<5YJH^ET
z@}fOy_7vYamqh7aMV{%3n7Y{G50CJ}ckeSD)0n&a0PFr``7x>-{smp<&AlAu>QPRU
z&y*nk_TlQNT-B&*rRIy#ovouyJz=*KtkA^}k@@-2MN$%`$fl^Kt|NrD;<H`WcSeAI
zcWZdu6kQjm8ZunNe#|7orK$`zTw6imA1Pau^F*yf;;O+LBMpV3*HSLh*3G4MOw^#Z
zHmkq;tIoY8k#`oFy!l(Q(7-GbG5KY7l`FuWkrYqIBUe|1zYx?eLQR`$QWA*6uL<S(
zp}xWQ8Ze%NpFg<df`~IqtYllK|5O(`A>Qo1rtizSXQhydi4#p<%9`gF`gO-~Yw`p}
zI+keoW4GaY2&jH%T>mSJ19&ns5`dJI<#o#Q_p#kLFlhv%*JIb=a5c5&P9yEbXP`it
zPd}Hk3t$<6Iw=}Ls*GI2L}2J)J`ak$N3%nIyp`%b3Tc9p)hX3CX^mc0{0+~_kCtQ-
z*=H`);b~NN&+f6~NcMn8m!>Mk&g5Rp4W6PsX2}dtl9ceJ<|TKwLGKIWhM9EHuUxM}
zdvjJ^U65}Ky9YB_Qy{{0JKCCmZajL{nDOSJUBVI~&(ors_RaoY$FQqLl{mJ>uJ)Rx
zb8vH5TX>kPe;i7rrh7yDE;-|msBf^d?V#q-2vEoliN}rvOjL<h*j*;h6MqYRWxeAH
zzPYy*6j(i!wP;tazd~B#gv6~lCG8NI+Gh)=MfK|JqiLrDi^gB}CPZVu>>1Lh5?`*=
zO&;O3-oJ9Sq2u)F<b0W*tpc1do|iuR-c^p3tFkAjYCxcJSP+C{@eeUa$Z0##4b2+n
z+18cN*CW|?7i)*D;2g5T&|*=;R*FV=EQ%EsE)RgZtH9`f2ba|Wu-T>5CwcI64Ze$S
z1%Mh9<r4p-kduKL=Uod?9c}izt;j2H$+&^5iE;}z(iu)U_AgKSdau1HN<}C;_hgb6
zR(JAd6g2fABD+0f6y-|Q&CyQ@i$}8&w$4rjbpm`FT~8Y)T$l6YIx+&;gNb;h2W*~5
z7N+SrMcRXZSn`<XL@;~hnmkws0Yw%!S>ubtL+d4<slKmOY-%>WYt{@R+GmI)cr*o5
zgaE?+6QT+EoC1O@jwM6p{c#GooSlvwW%N$IDlVl<M6g`0v?LsIE$>xC5`G|yJ8Q>2
zE>$CNa^AJp9n&d^v~*)ySz1@jImC6;NuxUdZ*TPPZk-x|NbS&aPttF4o~T&L9H8z)
zIeP{d%3Vb_|2BJB^hdHa31zN=f94ZPICd^~>+GY89r2Btw7NH95BkML^#DA2ca9)=
zq{3|kHW7|SP2MOG<Edc<(|np){XZLxI9yuFQ~Mk$s<~~;9i`-i-JGI60L}n>Zei*H
zydk7jijauN#Jb(Lu)BC8bF4xQ909090ixN(wdY`!cMs;JUo8S1X5(ZNHtBOxm)}Yn
zR*%JC-$rYzvDWmD@U;gCTPv@bE3n}!I7fPYI{B+!U5t=)l(F`{87}7uhkeq@@)q8`
zRu{17QtsCfTBVngVr{u7=Sn>xc_V{9gtQReFZQ@+KL~matk?kpmD);UnrDs!b<FaW
z5(JEy1NI*MbK`?_r{ZT5KJf?%T{0@@(gc?LVXEF9p&0f`<!a@(M>}G5NTuEbIoObn
zfWXntY@C3-nAm=OrGwwB-tyMMkWb}tEls!l1Qvj60R_tL@edTM!Izz&j4>gG&<a}r
zi9s!96%Dn&bs(7J1Rxsd2S;2Y6wVH>FyenJOY*Y+rS>|9@0B%~W4n-NJTH@tqd4f?
zE1a}IqWg9eK;2+v;PO^oh6*65JOnkN)&xd%-Xeo?Y_d3Z2DDoC0jkkocol#R^!YIt
z%IPA0S6$TA9HXdWiRzW;rh2PI4(|*A3E0zP+~W`X0P^1(_OfFTGL{+QWRt2qr-)Op
z9Sv(>H-0>MA%w%UNH5VxxO(dM%Pjzy(0@;+eISaO^w6B7t|J@~!<8ZSEfbQhl-2+c
zcUX95a9d1}_uWA>l55;9%~__)(`J++IXwp0IX%+@zW8UMsM5*nB$?D;erDW<FVtMZ
zCwm)5o1O<B`nvahi+B#~BccIaHd56)I{*19ouJkMC<eMqV<tv~+-D#d{qps5B3e+z
zEifeZvsWgT{<^eKmA2lE(D~VwUDX=Wd*+2fW~bC4a|A)A7UIdyXc$`?8BW8e1|4gp
zMSYGVZQz4OJYX;WutnStKw4!9hRO=HgcNh5gyraPSDhT(eg};qb-Nnom1$G4q_y~X
z8*MaCc*?XS8sYGh{egz$k|c<PU1V;+rIv?{S5rXAY+L?SNeP48K!*a@S9jNPib6-5
zoRY$?m3fd~9?YG~clOLQe)<u9T>p{rC0>oDo2{%@Rb~mxoyux>(|62sJyxvx&eGbR
z8vO`nD!P@gB<4&~8f5R`+h$x#GPpxw^n}9sUGJk(@u#U^`LaEkrK4Up@WWvIZE@c%
z`F~Mqw&n}=+F%B<KKR51t(;AfS#R}Njj=PDf8%Pa+u7#emwGq#fz}?uV8jOSzJ0pL
zQ}YzgyIbAUGch$`GH3d=@%(vcW(O;i+5f?<BTbF1rCV&hg9yTDEV~=bF2mkPfa37L
zEaf5w;Q3e~T<MEe?rLFcxqN-e0$XkB`kSa%Q=_$pNM%~*7ZTHb#gS+QNQ)4Jif3$8
zJKJ}xVQlZ$q?O0?rrW_rHvE>l*4n9*tjQ_(em6MluFxudK-ktT)yqxNYJc|74b9MQ
z1xj@tD6I;gQ)Cb~f<Ee>7%woD%<jig!Ss@;6PCzB@~uRLPGD7gs)gLtLMmNs^cuDe
z_;t3a7JvJY^)R@_QbuBJ=KK<H4jpysLFE3XFBVqO#{mC8n7>Y?c*9WEOm>LUu|=B4
zk<ZMu&3Bvau*du3b~TgtIe2LL>n|nNP_LIC8p2C;s(Ek^=aW^Ptk4%-m0sp6x@PW-
zy;gR}gOyb4nGKO^yvAjvjm>t3(2;H`Gd*Z@>!cpV$JE*82fT>S`ZNX+zMj%RYnWRd
zF*p$N^fyodYW*&GOYUgn;3^zjhB$O<pHRfmx1Wt}#bMm?z_RjuU3>6yr)!0>h~D)w
z$!DB0(=8URagiEgBO|bv2`avZlLGfE!0{wuX>IBOp1?tSDts<kY>?}9>gtbe=w?u}
zT(iw_kyENWXd`><0`hRqnP^c94HH)-#pYSf_&jb`tzlSw&`3{kOS(0xPub^fr*Z~+
zTK=snM8Gt0Z<;MI$zjt|)~MGOSKyAUAL&FKpEvVT0V79y)LZ4_Qig)Sf)B0q$|R<U
zk^?Gv(LKQ2z}0=5U>eDMgcqN5dYV!CrMTeUm>SZnr`YwY0iDMJu%giiF~}T1<ytuc
zq4->C(WWB=U95{X*S+iy7byYw7e`{x$>%?va_X&~#CN?)GtUI5`Y0URyr<RtQtC@*
zr(Qr~b5r&RI5*bFoPK7Wn)aCl7<r-ut8-BU!p~=Xg*hnbF#Xf)kDgD5qP6vMs5WCq
zczjL`ddcQC-E^4^Ss8e7*{X9);%86c9}VmvIf3Z*;vTJvV3yr&4;yYPu)f|$hU?ZF
z#X&ix{?mi8ovM~_0V%8e7#%zKAy0I@*ds343?Sm9bLhJyAq9loeOcF0if1Jj0-}{$
zC91Po*Hel?U`cno<$@gbZVKZd3oVJyV%Ey>WCYVQLq7hj_xQ^G{pNM#LdZaC5U6ZY
z>w@55RZDNIRae|7vt1sPqZjVMr*&{*O|_0PzHA!nV@*5PL^G6R)#54>Fau4mAo4;?
z=Psy)xH;e0KC%HhuFvh5QwSr+g}8XTotOjY37gu)g=(|7ffN7qz*f`9{qe8B{JD}k
zUgq1d7yCQ_n{E1x4o|#=Ld_hC1MZEasn5<1U>IYs-&SPo(Z*VmE%M6^7h{*p`uduK
zJ*ybe-VqLUNQg+yjX4AQy&s&h?i}CyL{0J!K+BllstM+bK-e_PyC&dLv!!<G=ki&k
z*V?PMuQURam6zlyah2ko?MIdr;yFtQdhB0pEY`mg=YT+MDG3CV8ODf{GpR(XP^Jcr
z^7<D<MC_9-nC5g@*ihU@`cudP2hppw^AcIFf9&j32ddM-cnoQ}J2k2F!Tb@|x)gF9
z%hXy^zISowmh;dH-%&HJYe#(9aj5G>NbKE2r1oVjvx5zd_!dwnAx&AU0#qD&@$5>*
z)~q5!2@rfdFknB=moZgF^b*p?p65$!S=F&K=fuXnMINJ>w_zaKZx3S?TFn&-o^`Gn
z#;_l&#bR;A`_Ehpvuk00LrjmgjYj9ts&^)7Ib_5^?Hjy#sh9ERn>x>>%`4?6`}14n
zA2qZ^D*{&8B)ypp@D-m7*4K%Hs1arB)pyP|qY3XI1E*v^6%5@qN=pH&b5Q!6=Y$^w
zK0YlCQ$1(RQ0$d~R=~Lo`C35z>E?UY)sr%-S-5YwR^GICunh-!Rrh!J0}AkkuEksU
zu!#($-!Gqi9-4w;@|=$5zM}ktRYg!YmBv#y`7K)pj}71u&Vr105~uh|?t9V4ON%l%
zrHY<Vr^>n>M#dzRVSd<2IJEhN`aHCX$2aL*-!N|ua>U7c-*!WFmuU3v6r^E&#qqD9
z=)N%E{43rrjv4J94w$3Ac1~T|{TS+?SwINwvwNx5@UgU^*JGV&=t90qS@8_SI-EQS
z7}Jh<f2F-TrX_IDk~-%%5-3RT-7cYOZL*YBAFO^+cKG?=8Yn?=cx2sQEPyAIZBY%E
zJ#kuee?~p&%1sNSaT8Hpd||9!OGn)zWQVs5lh;{`;97_PQeKy=vZFQK-JCy-hTYEK
zGqa@Pn-us{u<Y~_z)SPgXK!Hr!K^F9o7SxWbaN(^D6XHv@;Twvk+{KN+O`6ayIE@j
z8|orFlyUd6KmoyUHQvP)zvxek2_lK&P6*bi&F<+zYZjo(pHM+TcVTBmhDXj<%zlLo
zy8He!KV72>yEX{cynw(4pA)o>R3AO7FU0P<^=m`#5;<quli>N>3o!0M3=ZAoC2rX<
z$>UjZyRZi%NS<HV>s`D+hRXQTEN!}sa)<%U!vQ1P%yhV#RX<gzjg|<Nv)SuEI8z&;
z+CS7aTtD_v@}rhI6vN*f*qJaHzH-kjyQ(oh0IeJQDZC{e3t7;0&7A$Rww}A+{zlUi
zNaA94N>n>*QMsp?C0rs0&|b+MU}X}&BP2V5{P~i(RiD<c$h?3)T^$x?X1M;9TP_EQ
z>~+Q$N<BQ`JOQZX-LKz5ln>BktKI`1$|C?j)Q9_HY!2@ei#3AzWF8KqV*TCmKIHkS
zc7bBW>9(>Qy==1E=&;i9`HVR!4l~rIXwHi--rfbfN-7V7pqRnz5Ue}>rXY{iX#jUr
zd+&$PF+EmL4kbYq;#%kW-a6nFV{Cvm`BA;rC>}ZVv8i?)CIf2fQzMTdO=N5Y$o;kv
ze!kJSVuxURbbSJ|eXxP8@>vzSY>aZT!LM3TjNz?HQegJC1X^rXDLJp7Z2t~HsO)H?
z)q7Rd!Oicvd%FvMwJ5g5d2M8axAK+;g9f_0QXu(r5)TA8M1MoM3N3i!VzYD7vl#Wf
zuzZ!Zj#3cp2DDE(7au+z^wxvN(d_53YKk+8eZyv2E>><qW@lQagu}SsX2k=Y>Z2I-
z)r2QAu2Gr|?~K$Q$gyo03OA4em$zz}#xZ_tVrfOpDF86scPvz^d9)D};IY$5%RNWv
zU86&4^1Z^>iqjIbNM}R{ri9!Jv2kGlDDM^w4ODj+(P0u{m|TaOfQrGQVK`)3f}uOR
zh+*IP8tt5_&2L33P-)`sC07hjHxU<!_Rz6&^1d9#uL<23`{MFlqt2w|DaC;<RP?W+
zNqioG6Uq+fD&MZ3;!Im|-X<Wyd3}BBcVW@b&J(?3X9uoXqZQANROA`Oz-3>K0;c@!
z9mE$u$dvC(&dLlHIm;n2tu?2&jN3+>ebQx$#80M1Yx(PcBi;kaIpd*l{+l9r^1umA
z5aA#!QA1MJ`_jQ~yG}T~EC>jdZy(&61gJn=zG`H2M{SYi&rLy&nBi$Pm*y5LwyS2N
zxVhg;Q6lD6&S?;6tDgf<6+gbP5?Gv)SIql+)fkyXf<*$9+jI=tqDPu8>838&qut}J
z>TlK#QzU;(3+1=+7OL&{Vo2qd!}g_vI9#asoX`-!-Q`ghb7$X@%Ar2?H!|M`tUmih
zse?WoqxIoxyIZqb<J-%`=Jsowd2_ABf=oj~Xf=9p=l*67z_{~E`vSsRuER@aTeJZ6
z9ZP;h0dPtt1h(HPXZU5lyv}fI%hy;uDFg88GsSql&awww9|mnGmWiAF!;W<YXZEv+
zk*Vn2hw?s)26T*C=YsU{Xs(AQ9<`v7ee&Z;!1ksQReBpwJ?Jm8xU?kq)Fqm^rjIHc
zczE)(r~@FSpoVL^OodpZvGU~u+E0y&MG&~Do=C1z0exs&%%`vdBkfc`3Q_b#*Er=2
zfwFSOsB;iV7NM71F0)|^A399A>hk&$%wBv;djd$QN?QC1S}D!rJPDX<_UNH76-UH?
zlIlVX51uZt*LEyq+KK*Z_Q%?=vc=of`I9=V<}^@~!A`aHN_k7ogccLPBk31%7EH0(
zoUsCWV~;buQl1^F#&9iE>Z!*&HucMd_*vxNpkNA}pWzni4SX+Y52``mOXN<zdYX@n
zz|D1e<*vZmdjOoaAK<y=ksYMaw<6@{9yrmL@>=i!NTxj_GL6T_B#*=TU}SucYK{IT
z%=vsHdgW~DEy-K{8WPULaB$-+cWQdoi1h_?(+tx`-Af;zMQA*GBXx8&f9u!yAA1aK
zZ)4r^0l~%zB<kIO{-bT`rN9mfujW=wN=|6j0^7XIvqwEo5gf~L-s_M7^1@AWZK<{+
z0Y1+Itu{@$O!Nn`VJQiV3<WMUA5XlDFsAETF+P>4{9Ya9hH8lYD4d(D{n7s82lJmT
zc*}{CsakX^HXHy1XYen@=rQH|7~dqDg=&rW+AWlMG{W%Mu)`(uhpPDWF~e=y41Z4J
z5{S9a?!o?83kvQ8(mR+$muyIxT1r6a#m;prSA1uX=v|-1Tu&EfN9Wb%M~ftlG{Z`R
z+|Ed3#?09ECzGFUGB8D%KQ+!J>h6#fg@0hedQAb-sZ<u!t%GxIM7dyn!OtflurTA1
z)}B%yNs6SzWlrv`a%z0)n>BnyjHzQ{5qRsNOo2klhI(q?!@svA;&T86l*yThJ6M`H
z_l2(fGCyiXM|?@A)eIJ6JEQr2$(A{@{)TIyTFvr~JqD7i=HtgEiB)8J=lI(9Qr9Ep
zdIvMkU3LOYFLQ1h%WCi4*5bicvJNkF*|HhnJl-8RB@zCb!1-@Aq?cVj!xvH#TC}*T
zs+<`=pm2;@7VCCRNO=63&bxgLGYC~wrOHbd&dW!Z9B=6{7NOg?$bK|70HRJxH}b<u
zyv?Ph=f4SzDVe3R<}f^!sV)0=rXt({EU_)p!7uls=&$es2hZZVQjoy+_tm)E^SR{c
zoQ<M>6Zo7uuQ;-B4<&dlK+l&@yq(zh8!43bz#%DztnMlpMX!$t!-av9M#B`XBemzT
za7j~st5A*7x!Ln1gyPk&Ij>-E2s^)BW#2aMO?cgxmhvN+?XdDq4(b$)zg1;a$+CB4
zSIY+q#~t4UG5=wYbEPGi9nG|9ehbt(rQ}k?8I3|`Rwko5{5Y(iJvkLB(5#@Qe&4Q;
zFV}J_=k~N;9nQ!mi5N=D((2Ew?keK+E~t4t*On*L7nOe?pY-Oo0>Jv@o^aPXXKlDb
z{R|)_bNYW2D!QwL%nH{yP7I(|I#Gk6wjiDOQ5!1d#BX)EtK&mkkG;ZHs<Kb6XSi+C
zw~>kn?~sNIRe8;&7p7qqZB48idxZ|l+W?$R?bBzMo%#ZZ^Ny<!6N<~VAs0IR^(3jA
z&!Ae<yn<p=+bjR}0)CPneQ$CEX{(L(Y;?R<4wJv<TP<bxsWFw|fLJfwZQZ2x^L0|{
zV~A*#&gtVY1&>;IpwDH>w7cti?gyXX9>$omcc$k<HCi9(8oxt)L%4DHjWN*ZWG)+C
zf{I69E|`%QE~(O#b_kv0Q=@3wUNKjwuS7@NDr1&8JOU0q`J!vNykG`iE7Imt6XN%U
zDEfP20~TTrf68N@oEH)m328|$Z#c!Om6S*cJcZu8hzcny>l^*tl^JyxP&{W-%OE?P
zE{g^(g(7<z@fM_533rgJaZHWnRg6H8CEGqf%U&zEg<GH<I)_db&99U|AFn!G6;tN;
zd43`GE_42%v<vSWz~=fK_ZuV{+uV^LuvqWlvaV%P({9H`Z>`Fk49`Y|1@Iv9Klo2C
zdad?lV%(fQg_J_mce*I23uXl=-RKaYgN`4n=U43uOL=dqmHUxJl4%JVn<Pd@2k3}B
zpE6a>Q2OHy?`%sS?;tE;01@OWc~ny369;>og-~tQ$r)BpGk*{dZF;b`VU$tB2HU-a
zqz2?cA+!f)L_Gx?JZA(3{9nv5F>W?1pS%0GhIQS)EpeJ!SdM2`vqDP7Uf`uX8z?@X
zCFDcLwV~_7Ty0U>r)cDBxZ&Jm9FzX|_XZQr>;DK^K;Frt;R-T)?=Zgt=J*{Z>Ejtu
zOz=Y=My{*9ZPm%^FZC05>(#!@&jywCuh`~+1Ww&Q!2pzz)a5$-vbr2l16ls;3-nW+
zq2gd0gXAi~s_*cblitJOuh#s1>w;FQ-Lo}nU$zrY(c34SZMr!<0&%)8S&)bb##To7
zLFu1$+DAZioY+@GBBXLR#Xkgj^Bh)%6Q0~9>n9cm;k)){tzYjCVzdCh7wCtJkMS20
zOWE7d1@dVp06Q5skU1xaHUH@XDiHM8plUCR@-;uzxmmjtG~20=ilfj8!$~gh0sTu1
zDs{FsD|c)&qg352sB<P}i}(+JEf)lWzGQh2F{lYR8v~AXy{L`Hr4KoVL+QYRQh7g&
z*}hw-?3N|R$~VJrJVm_pDjlZ#e{;0`(z8yTD%EO$-K}X8jO4oWCA@PLcd?_JawwTn
z9Ye;_&h8XFY-x5ubN#6VomY>$KVba1fP92IKCIZ+GgG=4lv)vDDxHMfn*oB|Vi)t7
zyouV6G^U%bGJ-tr4?XYO)gs!V3;_J=_-br--P^PbPD7W($<q5_bM(&co&GTgV65K?
zT(W$!bL6V4K24fn9s&k-+*&u0nA<}f1W!fB@VIydC8-Jc4SIQv`Ea@q4FZK>vzMpK
z)OZ{hNAk+VQXVU+&f}%qSz`lxcdvC`n+(JU>SD-Ir%8o=lJV-z>elEnsStdj%=U6E
z3|v6~rJWit5bImsmk1{}`Vjs7mYjESrqu58M#9c{`Q7wxsgDChrs1rm^C@-V{T}oS
zK{njiO*1fHuLpp}rEbQ~<Vm~p(#gv9XJ3ak(ar<_;t5s!Wv|Rwm=kNK3Z2aW1ai<O
zQR_r%rY)Pf;K#7HraAE@YsHP@ygtYHuk`4NWfF<aA4Zib$E2=2#IZrgP(6jMvyBW5
zEoOBp_bR2u*^}b#%;i>a4m4oV1n6bcd`ZNmkJR%O>!AIFgx$SJ8ooS-BYc`Jrx+BB
zS97)96zE<HQ0|dq-}Zl`CQz*`va-rJ2Y1-<#b;C#r+UyI%2?7ng&>aE++0zi&=4g{
z6rZ*j>|#--*7fro{=9GXCNE%PQcm9azp?TyH;NLBL^1|$EQxp>(GOlKIg+g^C%N&#
z^Oc*$0nVE{2hacCK+u*Kt6%Nt`jhpfE*ZC5$Ov@Lkz+%f2_LAx{H@p9a)$t_|J^;Q
z*e_EczI{3Agy-m)f<K+ozl%(^Y?;gEwBEQ5#dTG<-g?*#Q2-@Sg6c+g34Ux7{NA|8
zU&F{P=V2_Pg#E%1Lu=!&ACPLuaj4A#JD3iM4X|zFOW#e$foI&09ZEnHIO)~(3>XeR
zpBzZ`hCnLlQ!=03>_-4!y!w|0g)K*?s){`I!8t@Y^t@kZbDC*`tT(QIC*SICH{=~9
z&{4Q`o6#uH-2J9|=@(Nm&l65Ek{L@GB0q`$*JwAP!T)Zw9|}RwdEreRJ(2}VcAJCs
zEzR3J&Dk74am#teW+&Ii*S;I=lcC@1z3oB~lV%KMdQa*-5@+viOwtDK1t#eqes-oz
zhZn)450h_BkNpG0+XONJdGX#qETzt6^PVG3gN<K*-Hn~z80SBJUM7RHsY?W*t`Sm#
zCPObeK`{<c1vc(!3*qli`W?RR$ZTROu`wLU9Lsh_8Zr>CpKoX`Y<YtJ`}^9w?v~8I
zzk$t9y!iX$^uL$*Q%T_WsrY|1odua1q80LySSeXj%0&d+B>m5$x$(P7|Cz*JRmMxR
z6Wvu;vt4kHn-5nf1Fexi#t8oXczB}}%K4u^tleqCZD%LLr&rrI3*^6l_>TU69O%dW
z`Y&T_pBu|<DxCcO!5b$3VK1HqCY8s`>X!abeml@qduhVvYT>4i#P8Si+N4%;-ksmQ
z$+A!O&Pz?u(AE2&j1o|k#Jo=<eivBTyykzin~m#18FJ})a+oh9D6+t5Q?BIq5xm;u
zCvCh-zO$H5J!`|F-NSALk8?h!sz3|~?)jH#045^d>z^(P&;S4&YK{N<bz~}%*Ahxk
z*))s&J~+-lcc|rmjrPGqQwp22Z^o^+nqX;M|JNs<tbXSR02LmG*3)!dGI)s#Tkhv8
zBZ9m7^Y1+4I|l&nM5N;WS_eym8iI<q)figQ*tBVzUkUX2>m~%v@vFPi9%KG-rvm+f
zskHL@vww)-Y+mXwYjmTv=^jGVh11`Dy2h(vO%LnuXL=;%UoOm1;JK;{3P=*iXqmTj
zLl!472-l7c36DST@Gon-3CdiVKIP4?;=Ox#&%f{OLp3p3)&Ds3&Dg`Ze)@S#me2p_
zn&7--ng5SIc}QBc$nL_@CiUizTl$+*J#pcGHeG5y%%ETN+U$SVJo){q|LY+BnBFb_
zkF5KqTF@WA@|WHJ*YNd!SLFXEfBU~H@;#98|9y8FuX&ABw+{{urWfd?Wz^TJ1}x8y
zcfpU{f84YCpRKH_j7_b#VgR{Ealgj5$8}SA(Oon+8y3*7E9M+Tts`gL-L^A>&mpW&
zK~WK5;SjD!zjpsXqW3?WFXLsm>MwZjhVHE35qE6ApXvI_qP(-SGwIVWW3~4m2XeZA
z|LgC2i~9JD^H7NyDZ>*fTa*)8Qe&HCN*luv5)vIkCR4f`j^BU0_Rl8y@f)YvkCmh{
zRF9lkZdg^#^{fh1uO_}LSBog58YoWZ+kNar$UomfqPOY3rd4V~w+L%~r{|+{`T~A+
zWo0oJ<c^)7{iC-%b%HP&Le3^t4;Y|QBi~9l%mQ_uk7wn>mVM<N-|fP!Gl)Jb-=@FB
zg@tvTF0vFMGg`G+eP`?&(>d3!_?K&A)K{kRN#6zxYf~R;Xuy^fzPyi>UtOA$uV`BF
zASEo7S=V%o`gclEceSC(3sWjk+E{kT;bZsT?f>Up(BEF|J}_z&1#!OF2NzTeE>rRS
zbe_cBhw>f25Wt*F1N><g14~W?>(SA;wg9>q4qUj>_%DNHgUN2Qy*>VbG?8S8=6%qs
z!LT*4uyEZcqL~$PX-z>{nY<?Gnj4NDt_yH=@wl+-5#Qg(g`C)7B3C!*l=BfDD|W<W
zM+zy$!oK}lwtA^~xg2~IPpsli?Ck8MOQ;{ZQ1A0EtLva3vA`tf`WUE89`^j@WnSL#
zp<m}G+LHj)Ajf^(=Iz71@={V#h|^%Bg#O#5W@cu(a#`QRJXMw-3VNRfPugm~hA>cq
zj5x8@$XYgRd$4&;*s%MLsoei^duiiuBQpmKwFuVxkmcq2L8eYJ8lm4_#Jw9uxf-Hi
z3~HC@{R0Oz{yBGOmq~Mo2*EneBkdaGObRkz-`klvV4zk`AgZs<qPlys)#OdMFI@Td
zFN+tlG>0ei-g#SagI~!jeYhD8cj*X}zwv5|C%;wj?8gK|)PW0m8;U=F9_0UUs_iKE
zfm3v{7JJy5D@V~YRps`Jv$Tq6>H4;;u!Z(H7O9S$WAmafefKdP=)cUedQeah$q>F`
z(qQ~z5R1)t8@b=L@S4oty?Z&wyo%L5hJj^*1L0J7;{M~Q-<9%yAK6BRWA`x^=pa}{
zl>=IIW{~O=OZ#rGO#AwQ%cd0%?bmdW<6A+2<<7Yc;jO!GE1a72`Q>l51k>3)B0d1F
ziQ@&hs&39O$~9BISAD?xCvPt=g^I@hCCu^in4e|eWcj`4$2N!1FpP}U)YPuz|9+k7
z_T<OJ80+xYNo}m*XE4quYJgsI1=o%(x9J9l3>vV|E@so&CWHBwsB-%;L*dwoi0`MS
z2%nNr5mwkEH5a^t1JN!j-WC_lA2ibT-iWC0fOp%b;y_uyU(tW+!?A$HA&brPd)&V_
zN28lcXplEK^xqs`gIY;ZwkLI^%RzemxtAAguW(13cu;Zze#6=x?r4z7b!>v^AOHXY
z`9}D{k>YDAee&lmw0(MguiL#S+ePa5p8Vs7E-Y+%p2M9S9kaOcbLv~R{PrmbK+P2z
z(5%Jgjl717Q%13U^E4&~87Jp&!@1Kt7mVB)pT<9>#dCU)*<&q+Yew2XemDYpww_hz
zb0^S%S<bpVVUG!wmH5+Qo|om&aS=5h4Iyp@_n2*p17!nX^>6nGRu0CLdv9v4JZ;@h
zQQ+)}JKuQJ2*{YQN%<gecjdii6sWWPWgD-7lZ&VZK1+vtU|U~3;yi)gI3f=?cONGV
zmj5)Ny1F`@f^6u?3Y{s&9<0g==us(r`t)_9facjtyN=0jdZp~?bb2d-u5(6lubQ<S
z@k;FU`kFr-;J7wLJAtH3-z%mI&_ARy9+FZol0ZjM*G^<;`zHE$)UJiI2u0H{XzJ#W
zcmM-8S+%1LvazMPPIk*J_yHL=&s+y@Aei$esL!M`%G?8F^qc$0-G$>h6ZNEJi?aNq
zYVMzrIPO_*Veh`m0?iz{zmIS7BDg{%841<9#8Pj5*&a4iKaFkWq`7mP<=Iw*l$F}K
z-?d4l+Qom)oIb}2==N+_)*s-k*popHgiAlq&)*jN=Yr{?V%D<NNT66c!lmF@TbqvK
zE8YUIkn>O=zwx-glVezO*=w#Fdt0x~pA%NBtb|6j-G6NQ`<TYR;0)wBo$`_PyK@{~
zx~`}K`uVZ}$gQhZ<M*6OFU_^_=4gX3f9%WPFd_f}#651jQIoTrhpz$nL}h<+!rf7E
z(b|nPS3J3wa8B}UM&;U#S7G!FxUu$+caR)a%7UcSR9<<v4@Uz=+>5OCwB>N@Mq%M8
z&R7OF$MPWfLbHm?>kJoq6z$E!xz&9cbe+LXwj_A2)}0rJB2Cjll}nCz%6i~Me#_d|
zaS5(=&N!|g1=;z8I@mS-`7xus9Ap1P5}c1MEtfgdaOL8~dv)LX^}0_NWjRV6?JO?J
z@yNOTc{d8qW_9K7I(8y^W51n0wjTIlE6Q!1dY(IEGBup!+S6R5uzkyx&np**RxYE7
zQlxoF2vG_>r{dNl2$0WW@+HbG&hKw&|If8Sg5+k)VLs5z6P4>eP>A5fK^)`D*}X7o
zU13Q{hmdC2IlB0TUAi)M>*rQDL|@R<M+h+Y2PBg&&)y@h*}UgfR{-5SDV)|ILr}-B
z!FD&&I1;P$QdmcKO79>7sF3a?8EN_hD*2b|BOKCCNOjrQwooCAZ$49;a`5CtJzr|(
zqfWHYuy&ALuPoWmb~yj|0!N>YsBQyZ?f)@3<(=!!J4nhKBSn|Be)Kwx!-wQhsMwhK
z;tyYFv5ebWS{4CUIRmI!il5jZ;)!v3w#j$p<Q@zDaa!$u0D+FUGzb<BE5~cDJXcx&
zHc-C9sW(=6%nj`|>}VfSFbCs0cK;ay86gy2Psh)F7)NiLAO=OavQ|S5+uXU3QSDW#
zG6f^91FcO`(B&{9=%)4OAjLupcK5xbrOj(KgbVbY8JyZBHcwU%bo}RH5`rG}%T_t&
z55r%~F-8F2^jTM`A7>kJ7;Ps91ftru^vi)}cogkCK6aJGoH$5-zvq-CXy9{Qu?BR7
zWsYjgBDg~aXu8N~<@4HQ>+|Ho0ua+wYW2+#kzIr4@{>e*$Zd<aEYfcV;6&=ajss?M
zW<w!TmLqI}nQl>&$@U5dHuiU%{cop5X4{WHoh`}^&ZxOF`-f{Mao;~+%)vVkSQIBG
z5aE-D>C0>H&p$e0AubBlPfjqJ5f{aWKgXHM7kGPq(&h#o63-rijpeteoqq4Z1kgb0
zYQHGi?aA!9E2IgSpmnzg<v1c)pXetn&@_!H-eg1gizr79g`qwLVB!A4z|sQ^=S_$8
zfd~BZozEOU=qCqa<be15u9kb+7C3?NwM?aMA@w#`@&V)JKgO49`QjL5$J;$vYGAMP
zYWPHkJC^*5`|q9=10;RhV?g8C3tKcz&CQ^$IWbS^&LH^ir@q)CKt6A8%(Ou{z4fMV
zG&<+QVDtxvx=-e()!_;!l7Nm)H_)T_lyMLYHE_>Ao#!6IfB+P8mB{us&}2@OU7i>j
zu?|@FtycRAd}|Xh*GG}Y;-ZvuJ%x5MuB0c5(Le^uVbso`Z%!PfKLx<u!Jr0KN6wJ~
zKYb`Ajf$mZ0QCd6Y~d}5z+}9lfdXG9sM5QP^_7Q2_$4v(=&(0R8udjLW2&v{4g@Fr
zCA)mb&J2i@OUS_3KAmf0pyzX1E2KsR$%mWS3INI}4z$>_&DrUw@*nP_ek-s^*KL6-
zn_lb6(ZFYgkPz783miivAt`wp_-s{05SY9(o0VGtJ<zkf@$2OGIabxfpwTL=Y#`rr
zbB<M}Kq**1o2F4Zdd|BbgyC#bHn8oyG5F^FY#<X*dw%9}vkgqEd9yKmx(~DFIKNdM
zuK(f%^7-|(*}QI&1tYm3|5T(%(U&6*)5@)*O2uOvEoG)><9mrWSPi`~!SS4qggD-f
z6$q@6TYyRDIwC>PGpcqgTdf=l^;oZ9HM7=zXyq?7(ehK<KLDu#Ib6Km&G$h6*+Y5G
zk8H@qjV@waFD*LYdVO;(Doh%a4ApG*)w3PoG!FT2U|85;*NV+b=9v04)y}>IOY>(F
zIPFaw;kuRO3;pOhh}c-@d}<2zLF#0rsO^E2VE*Ce*q>yGpL*g+dSB7E`rtUv7aBUQ
z(=l@Xr+siH^7Ld#11pppO)<`Q4$4Nc8l8t6t>AnroeRxse(NU-aQ!9}401ixA=!$y
zUOncMd5hJ(u-x-xy%ne>)pds1lH}jRGWP+E+(uGvyG++gGInxLPkmQo1iL<qTHXmn
zacAZ8-745Xrdp0K#+KB?R>&>Q4tj>G2rnXi)pX5eH>^r@HLnk_maE+ni-9C^L6;nz
zq+>OhKJ0P|DM$REG@wgQ9&E^_S&-F@AojNX6FrRgq_p_P)G9?a0$jO^IjcV1)X|7W
zDO7v!R3wo;1i!GtzvgmPORqzU(-9E<dfGA9Chc>%%y4_#n>`Ugpf}z?b9{}XSp(t{
zs#mEEA%t%51V%4pFk13Gx&iOrY60(IYKMs_+w+{$iO6Zp3{oS`c#(U4tO<cqf{{t)
zoL(G`2yb?iA<HRsu6TGj=i5lNhMinJHf-e~qG$C3OXxw~<PxK`wEN=>mhn{j_>e!H
z1i94mW57jH_;Rj>8YBF9$ZDp%kBktac3r2*Q^pcM%TfzZ1)A#pYpZoFgx(11djv_q
z^@vvGlfJHE;>~@{3nf<M#>ncQXc_hIZ9yL+^AgSd5snras;_9FWkL2Pj>MtoG(J&f
zFwL@VBLejN1`>3|e|aKkAe(9JeF}#LBD4-YUij7h83;+6+Bv;!$f`UQZTB%`0NRuk
zDXoBUaI@RLf*h9?bNxk8W%Y;dc+yuuKp?19@xd}Hp8}&tb_Hk!b*dFDxA6Gb#jd9C
zrD&^N$DUo^upxkL4+jj}b;!(RQGw~7O-{2&GX`-g@J5xVL?K32F<D=OF0vzKGh$V$
z*LDMPtt1{|%bt8bZ@G=Sw#Jr;dvbDj&aO*iIQ{G^Trwao9i_QeOfnp6T_lg!3aNVu
zXAB&mSnH;w1RY5(Pri1H1JCH7HY|1E8)+eY;DduTF=hSFqY7Aur0en=6Fcss$x&Z`
zhL10~T^_VUV5cutv`FgU6RTs&K9@8P3Z0bboAyJKJJYV7m-v+#9cq*}T@&Ngi{Q<^
zV^XPz3*DsyRqQoefv6P>Wjy0Eav!VKe~(a>k&xoc|1hVPOFq>tSB36%-i@XVWViC<
z1?JCLw<x8Ie7;0~c0n&O#6P;CX+3($?}5Z!_tmdg3-i{EG~pD5^5)pxSmMP8R&d=q
zN_Zn`toD>GEd*JSyU+T7rOdYM-gK|YRMbPM;Ap*J&QSdWy5AG#mV)Z?aPapRqm4t>
z?GaKq3NF-`-*vTV8$zY+$egQL*_lg5SLppfA<d-1@dk-@x!u|oQGCvFYQfkRD1;~j
zQn6cYb1zT!4I_U2lUMKo?-!GPp?4==``Ss^SBOOCyy&a4_`%q@Ox#Gt>OtFu+_k<P
zk22uw%V&>VrWdL$d77qNpdNz5*%v@dsjos>TwXsFv0p}FL>C1#<Kw*cEP$whWUC#Y
zT)sanHIx@goGeS~iuTVV9*|IZShR<-IJ+<?b2ipQTN8;h4Pci&6g}A{9#Z0;Z}XE>
zV1g~)B<KtEmH(XhNDe2z-P5EI4yxXaU!7B2^0iy2nOW=1ok;(&$Q`!9^#her`H{C8
zxy^Ef)x%>$aLy*i!#dADssTY4nBJ-{Ug>$_{BKdQr0ee{mzUSH>BW>nwOq(+a=UhK
zg`oDb%$Z&uyDcoh<>hUhf7)N+t$xT=tI2ycf>Aq1>Ct0sy}s_E&S)>7!o+%-Y(hfE
z3$edmOIRY_+;B=9gn|?!-}53h0f)4s%vv~7EkR)1yW#nPHa>@vrr}L~V3eTub`_cK
znCks8+e)&W3ADq@2HyX&=~gq<iprGK!do)}h38?=9?7}@?=5lrfOq;B#?dCMYsr+S
z&0?oUN53jhvhmyPlFEN8^E@4d(eM9(t0|Ns1ocgv58D5hq?lpoFDeWUg3tp_i8N#i
zq++r6vlJx0YV)rvWs1{_oPRDjBUBqxw(zNO=(R|hUw$iGv*4bvJpv0)t3A=zR#gux
zpYxf>&zHNc(^nN*;oS5l&Er(vZxZgiRfM|pxfamPM!Uu-rUT-lo((yfZ-Un!G)+Tr
z5<6&DZZ<^Fc)p@NG0Jc4;@PJ^WY6Z<zBu+m%JWjgi55ZV`VhI6)nRPAvCaPvRqq|o
z_Ws6y_q4}pOULQyP!y-tR!eb;3b9(Ps4A*fjnH8eJJg7r4jo2Rt=g@qQL9#LX{k+Y
zL6E8uL<B)3k>vMwzQ6l^-1pz-ar!_$pLeeJb-k|VGrN3>aYa9`dc9Hhy?s>n^HThF
zRzIp)nt-Q<w%)od)CTArdvajv%L_q%y3}>Bi7PFChuaav<?YK8r777y7*sYfXrCTZ
z%k0^O#meZ)Ba~`|90!8dvW~@R-`gwv6$KW+s;;LROWq*wAGpNfxsGOCUqieq7k{as
zIHYVNmH4h1Y}e&h<}HRaD!WuXiuM-Gt#^uq?J=xV-AV}a>n=1`f1Cho?$?hy?&&i{
z7Lc!g74D^xo%N(RC=aaVmC#hvz+Q@}f-nrMQA%PTBhwU%w5>g5sKURRws*HIoeB?O
zpvNE#qH-O{aa{PdYrIqXhGFeQecpC~Nq`4h>hj5K^F0LTDYH9`p?Bd^q*;)vJMq*j
z|BSfSZ(m|}xFpv!TV_+lk)%vdr#Z<Y4Wo++q@^7r1K__NZ!@%M)GR?}n-t;0s1s&_
zO#a;mI!AIRl5@#Zmi_s{%OtR7lFd*GT6gf9Pj<%1p34L`e<$#WCg+2LngQ;O*KJ$m
zrO3*jjvtptymU}*5Qkg7Kn4IvGoG7Zk9;L)4_aQdvb%osmp+K8{A~{&M+d+07e$a4
z%q((A?Zu75^=)<O#v2))t!4sUi!$djl`9nKj8;*Bpk3gA->4{p1p-0GlYlj1&%gI~
zH;@Q7!Saat&%=6yE*mxp@w;n@oZguv&kpM?GpmcPXREL*)2qt1DeZ}>j<c)eO})>0
z@a`fat^ZArX#T*d2A-`HANENnu(+wR^V4+Dz@?J0k+<{LGT%S_fKXoplAcFw=Cn%~
z{?BoXCgSt9hBr&oR~R{tAM3uj+ku_9_fjNZTo6OAglLgwWV5Za9op6ItVTlOBB^m6
zM6%>Nen7grKiPw{*?NYAoNzQ7`?LP<2fFVnBJD*DhtOrWIECj0tWP@ofj@fUW)dRX
zwFob%N>!lU*FRxRmti_Z3gV`Tzlxdj%T##aw+e0%2ILn;+Q0LVNwPkG9E7LF2#$;&
z;g*o$Nmj6!k=mW<Z>+aC5(fM?ez8l6mI5wp|8{ygxt@@W_c6dZz_nAf;b!r@oF!G~
z)czJDD;2aUu64{wr|T{$O5Uza7keJ9@%g>~U!X8buYCIX*UDjq;zRYP`fqG_kfLB^
zC_M?`Iiwlv2tQDFaN;LoKU0nLT?j#XhLEom&$cQYelrlVMIxtKzXGhoqgS*i|J1=U
zSJWT!33-tbQ~r;j(ud7LdsLS4I#;KI203+MR4pnG-bHH*l)K$<J;h)<1PR)p?#d1c
z_-6XmlTWWb$DvVgVM@JQVMDrgUX3n~f6^&4cY8t-_b&bd@qe8DciN(nbBJ|iOQUA~
zgM!{l<vXeC)R4|}ibj0U*26?~dh=?%<|pQ(^r_cd%$2;(==st3#B>-C1$6li>K4~l
zk7;|Y`w!<7O8w>Du;gT<uML69NKuu#@Z`SQ;D-S(I6)x*R<hEg3JQdup<W0=EzME(
zJauo!DnmA9KZ0EAy}I%G%Y<WAs)Nf$2+2M#K<hP`9*Q=kmNTMW7fi(Aa0_0OT51&t
zV=IJ(GOfIkH_zSQ1NNvW$R`KkX$~PJuD{Py3R1yJ3fLwgu=BjVG(HBUEMF<H#XfLP
z<+l$HrlG32UZ((}QwOTOJ3~VAnP|`f^{QWkfwp)X!~}GFE5McNzgLhN7|*YM7IqZR
zYTCe*|1AOxFvXXo@GhWYN)s`yyzD*Uq0@6}ca?g6ernI(yRRXZoLgo51yX14sjgSV
zK#Gnwt7u}3#*g@WPN3!exdiU~vfinxy345hq7QG8618hpXy9`8Uo&q{?U(;*q&uKE
zI(}Kkjg7tkP*1=j0fYE#m2fvMsx`GB%0u>CL4BUki%Q!#375W^=6-TNmA-Io!Ru90
zYF3-HxQS(nu4BA+MVfgQ%_YOEtY>RG)cC^~?zk>mp|jpKWMF-(M32h=*Bhv!;r9B9
zs<27^&*PYg$nj#2K~DblFN<dD6}lyBoS?*R^}iZNv@#XT1Yb-$<~tS*IP0~zA&5`P
zJc!zoX`yvE_}?Y8`_jjuDY;}-@TRu$+XVWnsC++OB3jMeK4A;Kti1Ot-%EpfrK>tz
zL;RMI*U=Rqy(q*VfxR60P4T1%g31>ru&LcTIWQ4iv<J1AIZX(r|E%0`x~)6XCT-<a
z)7cIJ>JbAnf8@U@Vd}njByz%m%1PN;xC%<WFT6P_G1FgbX4Q$4+uafxC7Bm1`flU%
zujda0786738RFk8L`OI>i!MJzZ#-zp^HyFeGddGc(QV|9OZJH2_hzJ{2TU9lY>ox>
z4PBc@v%9-%j%?OspYsDrNm^p5`Y(og$DPOEr<msF_&(CZ!X?o&SIV>d$ByVI)r^fD
z(E`GUdZrq1zKmP*YQdTyYvZuE!p($skFI+H!+~}w<lC}D)n4%oNP~9e#1y@Lzi&f8
zw6(h1^hGLfnn(zkunKqJYNEkwlBu25%Ef%5`-L6tJ%~{(^!;44M>HqP-rCX1xEO4p
zi%-?p72PT!mK^`Ea#+Z>ekIUerDen0j+3ZKi%fMr`ToDfh`ssh=s2nknXWc(Ttdz7
z{5ctXQqzw7X&v6WTkTj+m_4%)j-HpXm!Q@k-5ejGdr!Uo6rTIMFcG1}d8<VT@b6P>
z`U<o6Os`rlfit!s&XVPxdYpbAbDl-1GSRp9qNT`~{fQCIEI;GHW1do5&#|(E$dg>&
zy8ZcLS7hl&G=2lraZFUYyEu2DnB_E6yv6CTB82Apd?x^`e5GupJ1ft7=aU_QatjkQ
z7%d0ZqAD68MiSP^d1=0kmkG3ay$cR<y%<=U)>f1L3VXQ2nMA3xi4SPRe%9QJKJi~=
zr>v~}L7UI&rFFL7e0At57+H4R)je=FeRtybOC~@hD2u}+g=H@4JdTiR0h+4Gla8~(
zJsmfNQ%)Kp=!5%S+abL&M*FWS?P=c+I(#*upXgVZRRzM_SC0O(E4pnmyBG$K--<}z
zPCi+>kDoFn^9#gY;KTPD+N5r?A)t!;c;dhA=)Et1efL{^UcE@}XhBvRSlmt4t7@@7
zkC7qm<Zmo%v#_ylgQpiQrFO!xcoAkzWqp&t!yY=irQX0}8z~cP*W;WP2bU3`B41*K
z#t?&gj<V;dYL$mab9!N2mRR?Ye)lb4gR&nG-#jM+4)U1cfcM!GA9Vt&;|qN!#U97o
z#T`ic8<0Rsym3jZWqn(JGFcVy*9vaLS~gv4t%{o1w-7&GT;e;=IDECrJ^HIK0Yy+b
zU3n>s*}v82K5!|Ml{mN4gjHx0kA1MeyNUGtPPq>;Goo;s_+>M9Z#DufDm1+AYFG(I
zk66*KP8nF!L0cVBWk`nj!I#VIaEfJjDtX7vL^rpwK@*3*`PG!mH|yR!`LFqUrD10D
zh-3A`0_5VUt8#<RAShLM4#%Wli&zEAJYp=(&s=<j(X^J))1kRbW^R)VUk)ONSl;zS
z{MLvHwqK%|j{T%0c3(kregN%@s@p7CzdsR+t&EaPo9tVusVIIQ?^>R)%Ms<pMuu%p
zkRxiuHRe6{e-AnoQ+p<<GjqDE1g68Y;Mb@{A|H)2-Q&BweePZu&c?3WvHcNsL4yob
zR$%>l)}0PRU`h+7a=B{G_!E?%_XFhhT&$w63c2Qq-N(Y(fRM-_RIL2HP74@s2&uGJ
zisN>EwpWdlu3BQ*GN#w{yv1EtDu3SZ#>g)7F+uJcIWww8tI5$_m%7bBIkyD&Zl^=)
zFMicH8U3>G@%6OcM-4}>H3e@YzvQKEWNA%~O6`OSrERj!DX5dX1?LD;5WRN8isI2m
zH~0tY4gSLN|E}Hn$_`{3o<MSWOBudQ=Iy7G?8uEO)vjh6OSTsqA&!(RM5x<3Sopsv
z4qdra6#Jo>Ba)DIE#*!cGW)*o6Th#0#T4$k+}cRxid_R_1AbG==YpD5QGYVhPnpmA
z*b&5Upssi1^Kfq>z*r+a6O1(&N%)=5aFL+d_E;xAkNf|rP2*!9fiK8O^FReD5=>VD
ztQmqf$Kq}wx;u!R%_8URM!kXMqoG$syoU31w<X$_Ox;U)g1j;V*x!{#nK6)!4?m~c
zr})X)&yE_Q^APVY?7mb5yV+;TrxPFq*c~iwVRp;Ndfoi;wX|yNK4)2}kd}K1?<)>9
z#~A2@4|*$?6(hzkRh+5Z+38<M_c6ZDO2XO&YJGN3@M$)=(WipY^S7+=HhWxUD3*Zc
zRTP@t-Gtk(TwKyMGfhXdNG7DuoPZ<D_A;l$w2f5<kY}cU*}ex&0_rN`kUx%^E&Rj1
z&aR=78z5fwLDPX<D@C;+A+@kt?i($u0qZS|{orkCnn&;a?rfufzrL*hyAk^J%`O?E
z8#-9wSJ1zmewsORFQjP~;e)%_2Aq|D$0o3w89|!XbRUE2u%kV$E>#G0DSi0?DFCPF
z+fwTknA+#uee{oRW5<xbJi_$jc{rgqs$6p$)oGPffcssKIN*Z!in=;p0$!uG67pE^
zr+UFW@#yENJwILDNexryu@FwC9+rPGU9$A#Q~a6o18GBm6Gl2&3rs2<?*8*Y?uD@Y
zcgU}`;UA&}Y$Px3u&Broi$8v3LZ@i1RJ?{{g`N)DsVu+p-h(N#xH3hyIAdO62&_;O
z*e8_7VjT}!hN~I5n_}|UkEGx(uHF71(;@FQE;ibh@1Nf4QYU^e>Gzls#r0A`*-$ub
zO6$hlbZ8>I&x$&ZFi6sbC%K4iSC*F?iWvxIZd{xH@KTp$3?-RP&i~xXUSGA5$MA#A
zJ*R3EwzY=de6L-+Ie=me_YMolD_d-^&IFF-r-@C4A%9)%pl;Y|1Y6Y|`?#3~U2{p*
z60;Gp!Y?jWt@shUo&zW|BI!q6a$G2A%smrwi&syhSIP)cf5GYaMK6F#>AXdn85DXE
z?x0C*D>1~`-?M^*K1m62Dl`l|mfOiPfUF!0#Zk}A2mYwO+9pH@A@kY(rA?%CWUPP4
zDX!57=T>iUCpRHIc)C$?cL)|Ip&9(a)JW|Dz>X|_PU`;tqF(yo*>uU>uc54{Lt?x2
zVr>Y}y!iUtj!B+Ws2x<?bMFjzN&Ig?#6}K3Z&(Ptf|Uw93b4O{G;IeS{p|$-u{Sy|
z0$-Ng088wstY_!IYw_>>-Bk&~O#n1(IOcY3;J#LiB|N_PT#~k^J`v#2a4g21<`jIk
z?)X0qgw=XCwb7htsiNoQiK#!teN?+~M(?9Ah0h(gAM-;a+a=Ivt-55=E`cVQS|wb*
zKc#BEW?4hVZ>e(L?^&=JZ{W>eRbLBe(9mPGIBIBQpp_8eYG&YFb7}y0B$7ccZZ1(G
zEVPfuyky@DN^syd>AFV$A&hLS;Nj>(n6QE@|AE*;ny$iWGr_fPadlJV#HQe*3Ypbd
zDH6c!iP-RsGOzk{^^Cc|U+F1k00tiY#U~ln*O3{4hVbJ-BBKC@e6bk1&SqTZxp6%X
zH_ST=dl_w{AajujB`^GW{EM0u4cbA1sdE%2G_9Oh^^#Ydh}6<`=v6Z|tCGF$_Jgci
z(g7atfRBhL<>lh%<<520r8`PU%rR?P3`-Rr4>1Z4B=`Z&L2~DBJnyqsC2B^OHvxWg
zGFE}RixvoqX2IVLT6-S}Bl-#v1RD1!?{HUKK+EIz*gz8w)-n2RWMf!Nw-DxCp`%FP
zEjxtqbiXI^thbg_{~b{Q=jeEwy30FS9x8Mn9;z`jVOpmQ=7%vQ4EvI*-O&$g@>f%h
zkBu>iZC^-obwFnjac#X4ywJVwh@{#Dl@6D#jNeR0Dr^Gi)&B2;%0ioCQKYdLGwH^s
zJLQmW4~Xwq&%P6Zv-G2z!5s}_Z_%9OWe*a|ZjXbk>e1v<l>x&%OoR9RhyMP$r2C@e
zx7T#;Dmd54&$lFls_C*32#P&1(%c-nE&{@5-DjXDCdeRn<qVRO|5jg;Y6b)C+5%t~
z9O<bKWMdS1>?&U{Fa2u-`e4`fHq@_aK+8P8hKAlD9>e+rPVa!+-y!{*dTfMis*0SY
zwvDhV{R@?d)Qm#x?iKwH9#8o+)Y;BEF2nZ1wf%S`rU^0nuBL&mEl8H{v*fKlOxV1t
zpEo-jBUmRRH<lAEyE9?k>XWJ7bKGVcnZ<f*<GV!$1FjekuxPhXNjR*D*EW&Q8sK!=
z!}{7wTu%t9r}7`8E_jMqIohKu;CN;PIJZ~*+|?sE6Rw^_&2-v0zFt||r?c3U`aH0d
z%J>ygA9)}c#fv+iBAsC9F*vS4yYhs8@#Cg2Wv%9Arus_#oYe59mao;v2SvnVxnD))
zrIJ`$PY6$4Oxy$zC%<w@xg&F&lDp191$kmqTUf2Y>ZrnF-kVQ#=L$k2>B3QkS6|;$
zFN=}Bq?%jPQ_VObBXo+5Nx-HdXUPP!0Pauoj!5T6M_<B1N8H&z%}u4W(cmATeY{XE
zzSA>#WWDa^*S0q)0pW|rTNx76O|n*v*4L>G3Exbq&&-9LO7(qoEa~E~p2Up}P}sAF
z>ruBIRk|vCG|g*DCu@<BzKO1bzi9jF&qO;qH0*Eq{KW)y?M@lZ$H&$Fq&(H_$DFF}
zF6et7DY(2`bFs=)loY&OQ(3I-TUl<5*`BB}vOZb;w-sZ{o|wzjN~;Ujdl*934noeB
zZGhe2@2P^zVPmYRGu%q#Er|LWK0vN6rsXNmTf~Y%p*aJphek>2<Gk~YNaL^mUxX0#
z2s<f$t9Xan@>>D1y%*jg2^^MoNNWgrL2WOom-phW-h(4T+Et0j_}({wG2pzl9Whe7
zhixdFQ?7kU;J?T9kE0SEyw%s*zjwCFS{DBok5ao1iu{xRzthzZoUWthT3dRM2?Fzv
znLU3BfP&s6O&Q?!t?{x9BS;QtjQ9b*BDF#lx?>Cm->eqH<ZDwYz{UD#$`;rcfP&}Q
zWt+hOx$--!V4vT5^_jx%p-Z^;zphw9Y=fDa_6WdueLk*eSK1W`Gp{ssk3;ZYC3$@{
z%6tjaJuKamRUXmCJ8phwSH|$34((ret2^;&^D&*7V>Yps=RXbqC}|WQnO8BnO)&{y
z)j1U?*kbQw@+&@ea`Qy+&f?L}b?~Y)2a2)hfmcG8R4H$^swXu8gVS@>=t2DTfspg$
zy;FS6((}M9n#Q#lnj3^#`*{nvaX(jzyK}?!VyWG`7KqKM(Ryu$;D2t@SbM$dsAb1p
z^dS+i7dW+%gpXH_Bv>a+9}~i2FlXeYLi&H>C?832<GP%<g*K89MR89&S2tFF&hU>=
zGG?7BDOUp&>}NvT@sfwrGM5zl+^zd76jp0;kNIPZo4rNGy0Ti~`L-T;ESoCqg@4d^
zynUC(xSzY(Ec{cf?2Lw%V3Bl5b#9j1(DD5%GdfZ^U$#?5^!GPxt>&eNONguOq;I-h
z0Y8NMuokq32}-x8CnifKMS)oqgl)<v*NI`!O4?%CWm@N36Fohg=2pf2Q#mSLSw#9|
zgSF!%@Q0oQ(uTGm*4U)b{d5Se%?&8<8kHP)|HgeEB*NrVUU#+I4O|j50A>sYb}E3x
z!KN~OaQ(5@*1d+97zw%pR|XxV%yQ{@G_F;(to1Hve&iNV_8y|tRq{EjqZbVIh6VKh
zdlGlkmu_xu-2<NuVn*@yQq5KTM#BSV!*><HJ|?hNhaDaKEhhnAZ@n+vN!OIb@#8cC
ztkJG~M`#a-5*+$FBF0XsN25wr^<C#~!UfV&|4Fg-2>j?WA5-gO6R9@G1Kj4pY-)gn
ztb6y)@Q6#_fyw#_6;1FU_9g5telfsJb5?b32w3a>z?lB%Q9;WrjpZ1h(?GkPO4o#r
zPRAJ8o@6*Aj6Boc#RjJnE@p0u=slHaxK;D!j==AH$BaoIhuPKkmhs|2`8{^i9z>qi
zPykm__=HzoqhIIJx1EjDYMFKS5suHzydlxtZV%J3zJUF(x&8Y(&uQB~o&BY%JD*p4
zdZtjDEa?hI!|CU{#jWX$#7~<NmAgx0g^>>j#+_g4=^B+UEblsjej;7qJm+2v(Ge85
zDdE$r?L9Jga;^R}$l}kkzpdAT^5*;eW#C5ei%dNiQ!S=feXkJl_tHZ9SZ8}~_Ji%i
zF%rwC+@$1RujaMO=<A8gUBiH;{-nv;OjNN%7+kbNl_sRDfU3n!)*8B>w-*Cn4|;wg
zEKg_kD?bD(fu7N$3V!DJbmeP3c?`Q+byww7oo7kqAd>twQgneeB>EEk4OtQ3dms>1
z`pxJElAC_28Zu>qjo}|40HaRIsa(#&VA8;^Mt|iR%5w<e0ZmxW{eZ+*eTEmzW}~ft
zKNw?M$hyN(&xJXyDeU7i>g0PHw23`8b}qQX{$o+M_a_2{_9lvlel4d+)WT0_)VY)c
zn0OC>YV<Tb>INNQf4$@VhaI8N`92ZHSxI&B!4kj=*Z8O4`z|gg-8d*T3|r$0WJ(wB
zvU}pUe8%$p_ho}f0dbcg2&Ammz}S@dt!#&eI=K=p7$<>uMe)?;Bd%7?17iyirWN(l
zxzT|0_W`V!_PaWo^~7|RSW5>Q``LLJl6KyBz6vHBH|TCFPPceB<8HzwZYoWPJ>K%2
z_q#isBSqT2={J(v)i#u@FsZ1%NoI%#y=F9Wc9G|z6ci;hH^dp|DT_aCyW%NZLIYGQ
zg5#_)9MYTy3C#!KzB>R-pYsiuI}-=Z$r8&t`K#K&7HY@5>C8taGp2@1PZU9Vob4&7
zLT&-=D(li`#WK&QU?87Zoq6@YrFL<y`${m=cE>UuWqq|5k1h+O*7je8_rz6s`b+Ro
zmh}#(yJqY&Lp2{cPQ^;cLpg2I!XDn4{FtNWj#|f;V~kU`{K$Uui;9%WBVZmMWg{9&
zUVw%1Lw)mEUe1|gV{|c80Dp>gh`wo?9`xlgHt2G>aXoqq%GBhg0vQpfBs9Od_q|Sh
zEZ}bWGk{8Q;_*Z@p+4{WjJ+qjaF9}>l^GdCu%H5yHBRia+wV|XhzF1z04j{qt`KnS
zsDfYb)umU@d5$^sE7lpA0b57Yxhz?zaITnw8)~Vp1Y!@ZLQ{X3d%j(Ny|1g=M)0X!
zu9S>B3Vl5pTwSAsyaPZ5c$?o*Fv)icxoZ}@V=w7vhi9N>L@4TSm~36j-pZK1M%Ll<
zYEAcy#vqOcvvrLvkxhpI_h8K@0A^4f?7qgg`q?zDS3FYR-2+v4kxs8q5vB<XYAWb2
zg#09WrOrs8CASAszB!j1O0OgUXz9$<Hl(MQ477-abGckrH~}j0^9p`diytPZ4H6+>
zs3?!G#!#;fHw2hNs3XwLFk!dM0+ZW_n72z^1g0iphHWciGl}DmsP&PghwI49%?!Eu
zO({uVJAN-+KCsF!;c)H{E(|>wSUA;N@(+;l;y+U6xfMNWKX)>Q0)K<^=lQnBXw8)x
zo0`xf2D&D+ofXAtMfmmDr}wJC^*+(fd8~fseK`oK^-PFK8zoif2KhxGeqt+qZZSM{
z0`(qY?T<pW79R@L8{V`G)*j6<Bn|hD2oM^K0=7<)e>&}+tEz(kJ69vX9QJ@)s!G0h
zzS;is9)n|}^9n^KsdFF`)2ZQZQ(@#WIDb=$`^xkU{&<4C-J0J1<A}j<*C3XHj-~%!
z{VIq?|E3`os4w_>_rDI&$n=sMcvcd+9eibX?REF-z3>QcET`u+j!M{8H`(;Zx$}4K
zdgG|7!V!zlW%)D6hmgf^ry?ma=ZyBZf@>xUf`e>E(uern^R|LF&QE9M^V4;xyAF0M
z>hEqtjtCIxy(aS&+@QJ|YyZ4J6FOZfAGae8F2dyB2I@bQ@Z%q@0j(24S3!z88_h?$
zr(XUc5M|8|mpD0wJsv-u^+En!WLY5s{N6{><^^=7b=D3!tH1F*i?y>HT=|*Dbd8Bf
ziy!fN`ujxYMCIR`L4yZ>f*(D@`_tO)MF{CewtB;yDWP9JTE8`)_(DA6&yj=Us|$_V
z;$|Ocmsc(|1xtE*Oi7O7vo&RW?^}EFgzm&w=;>~`s1=UaDy+gyAOS(}m#EK0SLz8t
z#`Ra5qHktx1Lof|A-{T1w<%WkR*e+|{Ju2<tpS(pg(nJWCsZ#N0&GgqQf8gx(&qay
zake_%cPg@mhml_xovFKiqdz43Pfqyb|Lq&UBgjh?ROHR%Pm|B!7Sw;e@Dtr74Ru@p
zBM)dv6eTn3F&yP#-4oK7Vtzn@O%{Q<*N2OM`_tgn1?Z8WcdP#FV$_z@Fwm!I(lC?Z
zSVuJ=M4&)cD%$a9Z8FiN`D4{>!7pmPl_i~__#z?XZ}>2&s4L{t)mHcP05d&Too(2t
zD_3+pp{E|H*l8tAuN$yCy>kbzwt}wW@&t2zC}CAm4;CUv(5fH18%Cj>8jFy)&RCgP
zCv|zE2!Pig;w0;SKZkK{oBGKq3t&hn`OO6YcY&n-gX~~(g6Txo2be{~y4^hsuSrUx
zfcd4nGutmP4VqW+YwhkLmEKqmX-K8WF1J&yNA5eh%+Ac)B)Ms8^pboK=$z=}gQQab
z%C<qv_<X=%_$0(Vo%PLpOsLufG~I+VRI{6sW73~J@f<7b56ZCXl@ByvPg5dpw*1nY
zFVbEQ_V>FsdFZ=J5k?7gfmEnoJ_%m$Pw<qF)}Ae~GyP#W)a|XMjl7$8@3Tt!%u^s=
z8xxtSZf<(z#5|4o#C!{d<uFZg%s1N5iyIECKdR1upfNN-G-pdhW*sr<_cy~s+_|pY
z_>6f?M`&9RoE5hJ?M)J9tAUs2vM~~=&a{rCgV3@>M){NnNeq>|c%~%cdw7PWCIA)H
zUd^WkpR(~kQqntma)oy;bA~sbG(inb+T1df0l_4A{-q)@MXw|2&Wx;H)TB%E)~M|i
zYRrL|b7fd8ph_K`AV&>c4m7~Xz;n2hO;|@PvA}QA1k1(!@uaU&u19Q7-ph&J<fQ1U
z6kUAo2De}o@{SKg>fNBTIl*W#!HOj<Ts%>$mOxXRSy%#70SFyw*L;z}P<I1`sR|_;
zfWi_e(T*FM_sQb*sF#g_?qME-OM$(cgfQ0z2C3x~Dz~pP5Z5-J71S5~!~#k#RcC8b
zKR<?-+dS=Ia#DG?JA^4JG2{-U;;Uf+`MHd(-WXw%RiqPyqd#X27>fD(?d4*kMBy)T
z+_e#HC)Pjz<qO0*)f6TcM#i_wjr|Jqic$2|vEFE~%;eiGrIFu3TOX#Lf~OW&RRgt+
zlVKH%{%F#nT?I9+{4u)NikbDqv9=@jfA@LWU8KZ+omuFp12`<v8a3w`-9`PsNs|0Q
z18Oim8jx&1#ZB>mFWn_w{_ymRDd;7K)MBNV_JKpst7tyqSLBzP-gsx(-KuQ1O5!b?
z*RhnfdZq9Rh{{HS*R?@&^^^P;;z4h;zhc>gF01`PJ0&(G=QQ<yUw73&zo%^&&8=MO
zX$<m7GWZeHPhFLaBeG@97O!ZC`lqq3oWzS{%?;ze`F~VfS}#k8MXoCsskgnR7*fmb
z%@wWcXGQ7_2UMT&0Pj|US`Ur3>lQ&{Pjt3JfBS{6zAHt`(JaHf<P&y14C>$Iq4^a1
z5mC*Hoz&fbYd=$&I0#I*M|Ps~02s=eD}257!s5A;*3Cx11pfijfXAL-yzhIf#TOlD
zDGU#mL?(fGT|>nEbA~#?ufi2HhC0}`9E+15xWcqsm;aHj47T}tFN8ISRAZj3ebbAF
zFEo87oN4)6IKhz1$e|U!6JA_Ue~zvjX|XmL0hM(q<E42%tyg);q}r?iafuwMvLlf}
z`g4?`3r^#gcz)KW-643YkTQF9J*VLrg7d|B37V!C$X^PHf>~T{J#aAm|H5(7&0!-g
z)uQ^UcSHsfrRTl=k*r?-9Dvsx1QxE4JWTomGh_fzH6674n!A7CJCM&x`M(}>%Q5<#
zT$5vuzk>q<Qcb-ibHRPK2Gi)32`JcBqNOj-U|=X#3Dqe(VENvhUGz(_${&v-VPA)X
z;<DQ+t{ttliWe@5TNRiWJ!lnPah_By|0f?zW%4DDn~gb*PHYmqzB|zCj?Ibn_z-Zy
zcAn`bfdANR6QHM%sQY#*35QSUNewnq7LKu=KZVuF-G9!RI<;@bZ{bxq4u5Po$txLQ
zff!2)8X3{?+`iaHuXZR4QG%a5?zbyhg;9hg?c1eg67uf4b8P+s70nZ;;EZa{E#0<*
z6~>0a-4={o=2zkLqlblgQ!9mH>86W$4@E%+3t@)+)_Qp;94qF!@WH{l?K*xm5EoLc
zX?r*3I11w;o~s#L9-$|baY6G`R@Qr1*r8raQODWy7aVMyipHmTTpe*s#-KA6KjgO?
z$Cf5gZlq9-`1Nx<9OhcTU3%>UT<j_oO%2)2ppi>GK=;yq#d9KIp)Nj)X4aDI0m)cs
zr+B70&X>3nG*Stv;@)^^@DW&9x53n9DqG~F@N3WC0)?A-9jA4bwVBsXC59=H`+srY
z$G=0E)Yw9PcI0+vWWV$<08qY_nj%8u!G9Y~HSeFI<s2DPbRQ02!j1yn@G`hk0z&*?
zL#rGxy3`(wni|wk%GBz$1AL(%l_xmWOzm2y@7mFgc(;mqb`gSn1F<WDV%6X^YDXJB
z-5cnJH#BRO#BZF*Z`5-q&+BI5@pUDN|3q6pz<^Uei;StoTq`Oo3UmKrTca7nP#d@3
zad~JZLp+lAG8EqZSDD<d*T7H0{_zyjDwuM)yg$r6v?sCKUS);;$0W$MAhdYRV;8ll
zJ92Oe{K~kUZ~A^B2i66SZbBCG;U~hdJAZ5ES59||XEf%;$tBVBe^59>WaE?I{+`o(
z&`bXh`SWjaHrNVF+t2+|s7(d_X|%IZMsYmH@DA3L1z^CDNT?WTXOZPGc=4D-rImEQ
z$KdB1y)@&qd<#8gw*qYwqW;sMMLsFVpbKOsI(I(fZZ*7-(I|;HvNIp@=(@9DX7gKX
zSmR(2jrY1%cRAj8IT%E)s;Hr`;{?m6%8wC5A7dBl=62E~n0~i}X+n=RpzKNdj_G+}
zq?Z1pWv?Q;t#e#6KQJ}KgB!wkY{IkR26)Fatm!64D?rB_+^sUkRYG5@%XrVfP1mS<
z&;^-1PR;-qQGqHkiWjm1oN2SbG@Qeh7-`So;Xmnko`s#o%mAr1@{WEr-=T<)!(;pR
z4yYcC2avf-LblljDC2k`Q}Dl;-j_gaOTU=kFMoPaF-CE{>`p(AMgeVd0V_-WmwF-c
zv-Pgo=lQrHc9o#t{R_4qG_1SYYuEJ7l4C@DCh-J$(`iT>xehV#<r{~|TFQBzt}13y
zdi5(UV57?OsgLeYu1$MTqybi#MWL0lq6N|+C(F6m`bF;gmVr7C@kmxGb7hC1&tUu$
zdbSFtpwDn9@q93^a6m%~eKR}qhMDyiUC3-pZb*M&cZ0>_s7XW%#Q4Ej@%HLVh6cT%
z9wm}f00Pgz!u^hLNs7OeAvpMT(r$i`Ss1jbKB4%gv96$xaevYx(5!lO?Nao`tjIL3
z<BT%+9ZvfK<T4GjFL)OS%oQj0CL42|20~XR0^8ZOX6)gXe*LhJ-FVm=t!bgGN{@|6
z3vv;%&;-QQr{ZNZ^1FgH^4i)(%jL|RhN#KZLh0yJMUUH+%u^?QKl1A;wNoVF|EBi(
zNXgZO5vUy&zN_;cHqt4%0NPiU_-r!Bw+pdG$;X1h?w0xV!dI_n?k}goaz-`wFSlgZ
zRFh|+=!L3qVa;4jTsCszc3TOx>JP8NSzWq1qBod43AP)+&VWmfDybaP^)iN^fBvIM
z(+*=8gi2+G-1&cLS<E_qA0L^^%^H<*r1m&CC+7{NAlRU!Rwe0|%{UL3h_FyVwH@bP
zB@kxg+|>`JB{dP=$8_dyMMo9)UqdcGz)zchYsaDQJ$pd8^nSTqT}BE|w1R*z;9LKj
z;i^D%s&q28DKo)NCVlRUSnO72{Wyv%v;D>8NvbUs1hu}b%RF3k3a(AoGfiX`@m@_q
zQgYSPf(A-G5<ZsEX0H8J1Dm)@tsXtPp8y$-W=Hkz{ARz=2w1Vqiej<8wJUN82_;SR
z#RQuzD2FKUtjq^!kt7d&@H$mg)tjmnGOx;s+3!@M1W_ZEZK>6MhtYBxXc#Fr7Fmok
z`b4-E;c5GetWf07W4#P3FB;6z*Cm6`3=t^huP{DRp(Q=yfh6X77Jj08jA5P?`Hqz1
zVk&Tz09@Z9o)0D6Zf9#{{mN)G4I)_=r`}#rf)FT4AP=w(_EncX>v%JxV}IpF6{0>6
zbgLZ3$V;d^=6Hh=G5Iw`xtctah?s~&1{WD51g}pfUh}PP<cu~_s5w$>Bi1`5ZB$!{
zzt^FUsY1i5j0EaMC2SfoXvdHc*!6*gAxL%?1<tpu=P>7WA>1e>1?&0RKXTqt%5RaG
z!CK~VmH*~FE`ik$Rg~Jt>|O1ZTgF<={VR2e?s<DsH*B2%&DWikuKhTlQ;X=YclldD
z4i7XxKFnj*VPjf0L{;hyf${TQCE%fh6^Hc&881hBn_|I7c`|f!s$(nNigUXmESkpw
zF1QuL{Ef!1C~|)-F}fx$ehqy3?pl>G8@;)_j4+0#qE`clH?*^O@$WIgreK0!#)J2k
zXRSz4ccR!)l`W~#4W|&jF^Sh|Nq2Fn@`a@SUv~B)bL>cu4blU2FV1LVtPoWcCb@V~
zzc$B^m?$^)mBb1qG|DwpJ4CYB2tUEvqo(=~h|}AH&dYb0IX7^Nacr<1G06?MiY4Z|
zLp&JLZ1GRzmn~5^b8)@W9{WcBP@T+jyA4eP;?7u(-0$M}L0+?Dx;8y3RbY3;H2nXa
zoes*ozp{Ta^sC@RFwg(`M5YeLqL8vBz2x#E{G;P(45Iey>iV6!YKa`yA<6lO;A6vJ
zNoc^+-$6I<Q+;4-ZGhB~_^eg6I8Xz^Kg{&%5^$Dz{ShJ1URtJMV8!w|cy$TwLTJ|I
zm4k(=3!O#b^G|zy63fZ!+OJ`k-jv_<_x;9~5mdAG>5V0@8Qjv5{%oNTMOlP3eR|(7
zlcP@Huy>V+A369Nf3ON;;gP9g59Ub+>rYKq)??=$f=@SIfK;KM|2LH{_8AbeRgO1)
zEc>&CU?m&)`w0I6R$Zb9Dp`8~ChX3}3JI!@qroJVUh5x$9M5i?@z~FEl-Law+VN=Y
z`_3Y#*e^rOjwcCp<%FkI0iEbx;fL<Zbe-rwC&3{S9PQOm{Z%@=7=U&krlJcAuTr4p
ziAko7qeMU6YRb3u2NTum6kY$?yaBu<@ph-H{hPG-6|H4^&!m{k%k{2m2-5K#)Y^;R
z#L0*W3s`_&Soz)5q4$SHqt7vBjj}MdXA(U703*L};3Z#aSDh$`<FhGo2K$8fS$K`o
zFy|doN3bTJ&0npd?PNv2vp$VcCs7YAIiAb^_psMVisi5U_{;sfj<9nE%X{TlT$s`;
z121UK8dz4s>}cs1MD5HxV@%HcIZY3(eYe#MeCkzj#SV6zB{>(3G7jg|N!cn7^0hhr
zEu~%+aRoqCc8*%N0rAXC-Q4crq?1q7zJs@ndh^&1kacsC^5+WPe7?T`R@l-uH#4UT
z^=!s$+up^UlGtQUoQwS2jwS9uoTtd~b2>)wpZQ`72{tgyNNJz(1_pgd$`V*c{z@pV
zCzj|WhXu~o_L;@>=LJu*1{q=C0Ah@5pzU|KYi{nYHw19nTz8WZM`^O}JgqUA+AVK?
z;~pud6FEg!7msB0hMWc0m6Gl5EW;I6>sN7t$`X0X?88V84k*)5=O1@4UfRr8w+%P7
z{Xlxm{_5|Vpg~Dqp<JzHZj)~y{1y2)GL@N9LRNwFYsr8RpT#W;5laC`^qzdN^n4de
zw9e;qUTIklqZf=7lx7lDDs38NT3_ik7lDA_^kUPB-xfo%T87h}1j3LqPZ#(h{a&Hz
z`}(!icQho5_Mrk^GRI_$LkC%2J~5N?GE$_7c54U}pDXrT-kvkIkn(fldi~Dncf>y#
z4$1vZ^|PcjA}AmH3+JSPJ)HA=wRT_&`+UsiuM@#jD_7`X|JOz@Z#W>&H))HCYXd`s
zx1KE5`A%`#$XnO~5tm74l_>$rtz6jRL>kO%c!wk*&Auz4iZuLqJC}Ze*ZT?Jcz36I
zbzZA_R2|4@pR;Z;rN8kug>Lq;>}1?#&1b~ju2GPTU4)78=CYm;d8y}5G?CJ1ehY<v
zxW9#yTl_J%93PUNRG#t2o^Iebkrm9s46v*0s}w&NDRkR51tYtpS}52shG}tYED7?g
zsVic~ILeOW-E5+i(BMymJGVZy?{)VfO8Exna=|2BknO?TG91rsxT=$Eg!YRl4{auU
zxuqlOnL@H@z3m{wqLBBaFm|dEe-s~vk{k{@x9H<RbLL{7%8GW_K>qE!^r@z?fXY~m
zdVQ*f6kT+v@ck^X_^PzoouHw%Zc^y3=kKA9sCF6XYREA#l+QAhdKdBuq}{IpO7p)-
zBM;Cd*Z3!JKu%}a;?*`-N(9#3L%nsL^I56p(rSU@37ze=E7u_h4w5(Y`$KF=XdKxn
zMH(SF?$n$~t_^za`TkfSYfeV0;LT27+UB!!Wr^kUrkQU=4K1XmLpX1Gndv9<9hi<3
z^}!Pqb@y#`oab$CprLZse#plZabIoq*Y<mChrZf^jN@Cybv40D!EuZJNbSju_y(3N
zlNsYTG+_|@0b$S0dbY&-?41H;nP3A>5sxvo1;Fg+GS860tqV|v{NMDO7}?|#_y&cs
zp6W`8jk+$$qJ2fg<FDf>SL~=EYnPb{{$agdrKjRH#jS}~=Gk_M3J6&qy+AbYBGE7w
z?82Ur0|05NW-dLzZbRJ;;$CiOb70(gk<pTQ1CVejJBa_JEdN1z)s8~{Jr2GWbPgt=
zW=@1-1@W!mxpM8b-~N4AJHys@_M7$i#sn{W&DvjBN3$vd=m;#%Opj)0dmvqcbQ^>o
zYc+-c0{Lp!6Eu&&+|4YZoBkh-x_;R3)7NUV4%qkoSs7Iy?C!0(__H2ub2lzA8Ld?b
zm%c2=nkxq$b*uMrk$@5|f50?M>*<Zcvi39N^zC@BiBn!718*T{o?5*h(Y{nr7&`VP
z=>GRfoTuNx5@z21(Pl9G=bhhADPOa{mA!C_$h=AYTaHgDG~m1U>n4gfBzlX~{HZ&w
zlNgI1S19j^io*B2G=6n5E2=)r)&6JeUTslTZ94afo<GHh&zZKo*{L3C3?`}8daepF
zK<k&Dw}qETe<wGhC39EUXq!UYi6wAC{^fGPh)6{3>kh6e+gfph3MQlQJkz{6iki{}
z1j$^rMVm_5ZC6RdZS&(gaI~}bwI7t~J$>Pa^5cSeL4!=HvbHSalgU14$dvzDE}vl`
zeARyg0)7|xKd0x;m8dp3I-uGN7|+*s&4O2!?d@v4^|4K(xSr5-#x3MeojN3msaJas
zmf4FF3g0mqyCJ=LZE2u}5a<VA*g{h3+)KT_z6U&$T?r}Ror4s;<+WvByiH3DD@xuo
z!>n$zJ<yO#k4Yo*pz^W6hoTE+r8jDST80x;$sK5<aSeym!ROp$d_e=o5}0U~!PMPH
z``Pqs=-M&Ip)5w`Yq<a+!Ra8=%inB-MW_4h9}d6CqT_w<WRp2E?-m{h@aebbfG_q5
zdB`OE8dvLxu$6y*IY#Q%B#5IUq+|<z77HySVmdB@HokE0ms>e=U*__k-xwkm{FN$r
zVtRcF!0}hY$8l}99)S&jzl+FCK7x6oi^k!{=z(ACGUa~``_jPLu)OG5+DH1+2*G2n
zC-wZFHB=cj<lXxCmwEAX_fbw7lK|8L<C6y-HWQL2%lsy0{sObsTGzah*FdLJ?@qSK
zJ9l4RMppqDM&>YDQc17_Ml#^%;V95GlI`%Yhh_(fTW22CULH$VD7vbC6aUuyOuNNW
z`|i)o*_+U{F=gU^$OaO4TQN8@Q;V|Gb+dm>P~6}xV<MO=e^^|4z;~#H<1=L}69qUS
zi|y2nEXL9}{g#^i`SB|ICn8o>5HAh+82T=g{thAcP*K#T2!ByasXMO|_dYf;;m$Mm
z86(gw-1_nt4lV97>sXXp{rQ3%6(~~n&);-35JzL!@Uz8W26$knAta|nNwVAL$+OV>
zH-*PubJ3<&UvtLf`gA8fCu0-ZhH&b=+Q7uidP;vvM{76Gkt<|$lqvP+Z<O-C3DJi(
zwHgVm?t^H^u#X<i%Oj?AH&ezqs^BGi&RzRUtS(XsMq=FByg>1D+mb=_B1-Jr#LYc1
zetsz+mOnP3l|SWikS3&}&bNo`iQu4S-~`5E&Yxf^=ROimnaSYym)b>F(-iPuZWsFb
zncU&02&3e;^={cU6jh!$9cbrociXXJwSM81YK<q*g+#PB&#T~M|0;M;gt8mL=WpgR
ztl2%YF^&9-BEQua!~;*$2(!sM_5s9e;8LZDUf0mNy4R2U<xv0hcd(3TXmE`*_=p(6
z{6gHZ*vjG!R+`saBV7k>D<ijN?xPK^2Wgt}wS){M-Yp_YRKL23Hz)>rRcgq+-RJz)
z$l)6sJHd9S5#33Z&7hFva_!Bq@{oS|18(bA&5L5FB;uBcJZ(wzXnHUB0PIQKY6SXC
z6n<3?vK_%lKF3Zk?k8}&?4;zVqVMy_Obu&^CuwubXq5F-t;t#`LB%EHuIPqMPy(Hc
z6?>D7nv`~&b-C;y!m_25_n~)SbEwHfKU5H(7V6T_|Gs%dfa=$69|48EKkk1E#r+<t
zxJALwbxE<!($}C$qMwK=#sEBb;-s_CF%ns*EBADoS@j-qrk5LsbQ+p}{KB}3|K6MX
zTLh6Gv!!^E=i>7mXA}3eOcu{fby$-&PdnEgX_zp3pIwo&Z=C0-ofUd>_FN+FBwxQ|
zB=!|;(CN6=*kCe9K&1Qm#MVs}2$oM_?N&_}6wCO<W$EHYT^K<{IB44LM3;9Dny02A
z6NAc5n7#pfDbFj8dnUtI71zQ2yuTWmy9^{0p5x*>JG@RgKf%UB*s{q_`0^}f;DpfW
zEI~9xOSG%K*AmiFtE%-D2oj@rObZvX{<Re@Ui>A;_q3GuGMLNRGrc!o-r~|mz3a=r
z`IHp--&YoN@*l^?Ui)I5lDP<As<>lyP+8H*?Ve)_6MY9B)jp8h;S^x&mkTXXTXw+q
z!+gG|lQca8CTF)PyYQhX5vA5$0+m~5{N?#?&wkO4A3Qs$6b=n2(J4Y#+|d<w2>VJj
zcpIj@RP`R_zA686WNj$MPQ9n$D+Fu`Wi&UKq|wzgJaHS9r1|rr4Q6eM?kWOaI8(f%
zePRDo5ZFhS<~4dzpToEr7@O9<!yL2QTNHc7NL`Dq9J!_-@Qm6Pwm*Ibb32>zG&JmM
z_D2>{?|C#!`~l?Pkk4V=5=*JO(p*$_e@s)Gv+|N>+LMdm2#ZneGA;o~hBo5+?wJ;B
zq8i@jMJ69Ak(#XmE^|rh%6q@SL=4!CVj3t~>`ao(HS`jDai!f-4;(rIzt%yr4o@+c
zu$Y$aaB<4IAB9%-(?vInS*d>kT{44Ay8wrZ3X*gY23}!ox+_=;X53kW;_@CFz2A$I
z$X)-cEtAl4+1F84%3k@){O#mb!sY(RfttMdx`#!c|5CJy#Jp~GsB)BhojpH1nrCfs
zBQPC608`)p#=L$F=NBznm}T|;SmI}5Ig*AszW7R1e`-e5)$X%6un3e1+UUb<MoJ%}
za-MQL5>hG)n*_#oZ=g0m$=WU<CN~rb(Na6g=<%?IUfG0>U-8#xQkG;(FU$OphSN=4
zH$3U;?{U`>TxO;=eqh^P33WhUrDnJ1?@c2(a$+K1>Gfd@uo|z05aYb8sjug4L|FWc
zJgxhElF;(Al-rpmuGw?KX>>6j{STR=nOi?~7_VMt_Bw0W&SAEfVy1e144w!>Nl|Du
zH-47b>Up_E$(c}cKNFLX9Ar98ojKN}I}UM+_fSYl(uS5OWd^BHV|Dcs<09bUSD>!^
zUkML4Q<uku6P?B1)=N>;Gx5{(LQ#<ix(`SjWB#9GV=J{+8@m?0wtT|q_0rRa-)ume
z!)L1<C%_mdU3L?;OjP-NtOpSjGlQ~hoL!OHM|`eIwI@oPXK^=tC?OSs%RENGcqTQ}
za>!2sJSA+2tX?NtFWay%kTSWoZ5u`pJ^J7;wozz#IUmD;-y>cMqUw-pGG@334W`jZ
z9NznE4U@43o@HSQqy~*Ibj(3qCAzfNEHJT+N^+ha;&NeNn|8%H2{B%grkXurrc!}Y
zk$+G=$SraPbG0NbFK*kAf7~^3*-}HBOVf&F5j%X^av)+509F3yflxd88GNrydLRbp
zq<R#6#~GH(qw^iGu6r$`I;~rQ&7qX*ll74B<AvhMwHi;GWIJ@tpf$OXwoQR4(Z|!h
zM<!(vz4n);Bd4*6u`_nJG6S+Q7KQ_gUfc}7`(7vF$SIDo=fW)pr}$04DwA-zU|*NL
zw9Aa$p;`RLqSKfC-%{$V=?1tH*)Nwb08vb!Q79s!gpB_6`Sjw#<8Po&^oVA#P38Nu
z!9>Py;a9Cr<26AO*p|I&?gC-W2WDmb3$%5gA=pcl#K3AJP^=;LyV^T^09X57PriUe
z#ENR_?A|V&1HCrR(u?5+;)|dvOm{F2{^V*F%;h0|ptx!y$@~z#tM6%9r+fUKPWhk1
zn}O?QYM9H9Vx3+Re!lqVveLEZ_w`7oASfGY5NG!$9)QdXO^OC~?iyRerp$kcK`!~o
zKN#66CguyN$AwY)1jL}POcqdg|63HB_<y)G^VxAmWlO^aNn_=?MeVyO(pV7dF@Gg%
zPduYK!qC}t3d~j_ZTL(;OL@1i0uxtARmAmO7PV)MR0KOrXz82>d{1g`sd4nnGg@sQ
z$p=LB!JPC1IOnI{jNDIc^x{M3Z+C@>ULHl?$j+dHrTA1}1VK6cUJGR7x*5cOxTg*Y
z3%$x;O?x=$e*Q*+k+L9M3nDaFmSQS-h14RB8nu9FQPwW#jhIfDRB)BiqWXQ>Xc<nc
z$l1FUg!xx?xtN5D4G$+v=-UZ;ozno_5J>#5a~s?zu*xIPu};Nm;&j#<2%IZM&)O_t
z7WsBm9ma&8gJG7UX9~0&G%T0qyAR8R%&v`Bdbv(!jN_c6t0gNRTm+a9I^EtyhDh@z
zMt7R~blw<qvCI78A=YEoe|USNCaJeHT~eJh>OBqgzOP0Fbkmu(6=6wr@K$m0UgHu|
z>?TV)wNhcwP}2hpynLexa$pTbch(mBLl>D)a;p$|e>#-1Mpw^@kKKft?`25lQdwp@
z=Q5%Noj^NOX2EdiTJ6^<S)M;Ay3N{)I-^=sdK>La9>tfFnVFe=c~znUBo&mrXa^A;
zB}YD2rUy~lq;obQ{)}gr$fh8~g0c&iaw#|;M|Ww@np1UX9skBO;1-2Ov`g5WwQ|hJ
z3%BV>g+*;<9v$|X%oYgHrWyFd`zah4C(YF7f#Y3%UON<$x}jc`Ij>7)L>{ADklYRG
zu|nMgVi1&a6g32^)y3r)P5!)&rHtqF=Ex?*>XI_Gl*|rALq*G?6EnkPSxK2&9kr}@
zMDXr93gpI9fLP+xSE=Fa7~+SmluOu{pJcs-z!pH^=%j+nF;t_Ab$BiYCPX~!?lJfp
zoK28uo5f`*o20i}RQ-tdEMg&|i=S>t<#GaB6&jX8vSF>nJPIq6NYq$-^@JBRu+FjI
zyGW@}*F+~t=qSB5r}w9pxV!RgKXB~^j6FsnU(=A>;FrN6kqjp1HRqF<@iw`-#Lr^9
z1x?!L)8Nmhuq7!xWVpJSI`y9zrO*6-aVR%O2l0PP4U=NPpak4?uVN*0aY5^Y2a7N;
z9g7<_U2{_+)QNpFCgD#woJWleCr{`T2Zv~jpT>=7)9}aX-RnnGTB8#Ko$Eah+W$@l
zS?%#+b(v=_bt^8nCbCJ$?Mmr}>MI&(lRGWJaGtsx^&yWWk3nbUe{ggt!UOACWvKEO
zM6qSAqPHkj(^Vv>mQghr%54GGCwQxzl(BtjQ8xHDo%}yNC~nF7RftRGJoZ$YMh=4X
zB;Xxbtb(b^*Y>I?jpnf<{=Yg@5cl=<U`K?*E=yIxgl}DFP_2>T9iI?%oOSRoEk=u3
zO;nR6bH{QLfb10c%(+<TU>)!q3tNFk6o_|s*MWThlpq{75-#Ezmb(a|VhEDH!j4*y
z%jb}15%Nx(CG@<0-Sf5IO7D>iu>TcNyI8<%Q1Cq&B?2kXKY!8K=^UGw!0c5`Tf84~
zxsS6_NYCUw2?NXlKm-cRez>Sh?qXav3G#nb&#!tjZz@%ztCn*LOyrxq#hV9xzT7wn
zyRv0EeS>m;*E%#~*rQO#FAk$N{=lzk)~*J}&?~9u`l_+tB1Se#g^ljaamp}sw%+&<
zd)q1MSn6&&;9}8n?vXw^K2%R*c#Y_7wW+tS>#=x9-FmWhIm(N)Rft#^gk&=~mej{D
z8PJAEVl%xC`zb1v^<n&*Kv!@yyC;dNYIp`xUtKmyFEORtpAJGlk(Dye8(Ug&zvdPy
zid~s6DDP~qv)7uHcs<bToi5xSI7=LqEL1#9B5l=lzP*`6-uMo_=~TXK7G>QNh5Y_b
z2qh&KV&W>3sTijx#YZp^nNT}UWS#I2sAQIJ(foxKLnnlpBD|pzky*g%kJkEi24qBi
z^T&R2t_)Kqzyc{XG-ot7=4J_U0q|)cdi^`Bqe8lurO-R$i=J0IA~R-Q6T-BkS=2-0
zl!ZS|^T3TGa!@PL75m)Pnl!G@H2-5uVgHc^HzS{|9_u#TB0~9n4#f9!64f4T1tc^X
zKAp`FagXtEkMPV}w<iYLwpJ#@nrjS|_O(&mmC4)W9uI<#p0y_@bU+aRX#BSfvtpx(
zuVHU29w~M*(0~l%^r}R;BxrD9rbYD>C$=Crd9e${@ZC0dCi%=?2&YvmEpjsMw7aG$
z5X0b<AN316UyC`B|A(w^k7qjm|LulS=t87WDfesT9-<IJZn@vd{Ss!vtU@ZcNaQ;A
zyUA_C*ow+6_siUu+|5kbhS_#LzQ4;kkH_(shs$T5_x5?+p0DTY`P!MSto)ojVjGER
zLd{6{c<>oN8``E)UB;5rVE_+Vvpy1qr;fS%fANIa+A345QA(jzrYmN{O;_4u3e%Xh
z)v$L4Pg9K14gg|vU|3DGI%q3gx>!2lyECG3cIGNOHR#`}TdmFoG9u$%zXf9v&h&bK
zNwQ`qhvu2OM9Qx$X;A=g6?9gZ!N_tCW5{ePs60lH#&i<;>_mwccFcXF=NsGkqeYf5
zT~F9$^P~&<v$S$<Hi=>v2;yi@_$zq9e|qgbUCmr!^mbv&-#NCXkHIoS^1O9Y1;!cj
zuuFqsIr9@GXT8sGnJE{hqGTHqhv`|?{ZrZ?9e1u#z~};y^|nLuGgoS6p+m7pI#HMY
z(jP%=-3PbF%bMmrP~)p?`|*fsg7OU4<FH}f>1gOa{!LV(At#LNX#PjGV;OD~tnm>u
zShX6R>DvN-grDV`l;6p0ZNfte0BM`1`jYYRCQEBEH&@2b7`>FZ9oF*HUcjULdWIBW
z0~%SIzj#3nfmsXLzQ5G#5>4LSsWS}RV|>_rV6&Ps1MF%$+4}_SLG;LyTDlWx`keEe
zv_rF-;rDbWGcoJ|)*sEioAzN7XwdL^E!YO9Mr+G&F${8!^?~vi)_tibh<0|tW@6Ky
z(CK?fke#bTd|a4MuxuN&d2MqcCKvfaKkEd{yX9CxA>_GiPZz9NL(7udpnFSF&^!7p
zL-}AM;jaF3>iY$T5>6jI2F=~?`^XATeJ6bRUJEyTQB1668jVvuV_${U2P8uKfw2V5
z$D%@n1uQR@RWUn*qJkVu|4S547;JFu*!=cSSsLK{Wg2nm92)&we8aYhK^h38=az<;
zZtefiga}4|p-EHv^Vj+aj!~wc`}VK=uku;pk_#_WSv8<4_m#JSYD-J1CmI;FFtZ=)
z8m{Tvp|&m?DO{T)QdNs_7REZ5;gDinIGsS?;7yi^ac<Lz>FIg<JZNGYjR#nAk{DoB
z8%r82QL<FlI$sCBxBoNiBqpO&3U_%wA_y2@;c9Ob7>WE&{?b2g<>o3qP3D)uwW?x_
zUu$(TawTx*MeeShAeZ6QZMDfC%6qfOB_Ts7Kh6BCyHpP8c&nyKN#tZnlKy}?Qf=>0
zS6jz0Zd@0b2T3@%0?P3)TRiHX*$*5I))0-oXu&isgo~OnFsEo>PUVy4U8C$}v8q>i
zS_fY`Hmf)V8xg2j-vXucPOo<Hnk%o9<ic9DJIO>qr^GK1a~7D!`0Ijw5`^gp9a5TF
z@LvzbT?B}z?<$G?%Fp1=XoBnu&rz^l=_11rUO<mEol<z8_K#LS-dt!9K17%4S$(7Y
zs|u2pezb}ekK`&nT{IA-gdS2P*$7pW2F=${E}_ATfEbmmK&#k6GY$Ss+wfDG1Mo9I
zwKE~&6M*Ylt*n3y^)U;PA(Rt%m%qavjF$XlhV5kPl<#tMs<z0O|Ls|x9>yUsPQ#v_
z+*X!a<?XU9$?&4h+;=kn^IY26;b$xR;~h?ZKC3A8h+FNT=Zqx@=>#df77hZ<9S#}J
zK>vwgY}ZhH!`WL-jvcuKVDs<6H*kIDvO>whtOP4CnFSE5dH-8DRtc#&0At)LD0tau
zU~x|DT5MsR53g`|iXRxz7+f*RPfxe^-ZOJ>Pkp7T%yU)k>1MGPO={=u30UY^2kM1J
zvsNFM02H16YIqXv&yT5?RVFO>U_B-DeUs+h(guDq<novH64(u$f!?wHpGHWnf8D2E
zxvNp!pu=xg&=`J$#=#j9zqJCyK6sqUv|mFZD&tinUONMtq@dS{(EdopfJoiXT>8M=
z&dA<p!g!^2#^b`);+L!rkN;!!kyM8_o2TqnQ8-j_&2OA(q}(IuUCK6K_jOVm+tLs1
zj#-J_M*Qrj9AmVu!8?lY`0uX*ioJ;+zI!$W2m1oO(<g<pD|=ZjB7GQ};haW&w{X^^
zs$ycNC-m8^#sIsZKlOi+6m!mqxin=Q2Mw<$=n7!osGuv&5!F(mzFD;n>{3Q<!JkYD
zh+tr6Xb|xi!G_7NB8T{f*y<B#jP5lBWTb)~0(<XFKIl>v!+?<%yVd>8`+gD`2|clN
z<0oy8Bn4x2wBWcp>BgZfRb_uJeou352zXZkpf!eLzTOX1l1ukj>FpvPDyRSZUO7C;
z|2*~sMl5;FIe5AuM@!JycP9am^P4;9D!lw$To4~ho|ZCP0eN28$H2T7JIWMR&Lw@g
zU+kB){~-RRjv4g8f_fqQGu&RAJ?TRg^x2R&!DUxDwlD}sf5gY91ej>x&o9b5X{m_s
z5ulJO`-$C^rdQ03j&wME{w3tX?>LPX_yab-1Qe7jaw%;Nz=`-2)W1&(4c{*bnmTFz
znqb=LgPDceS3m_5j~J){#~EE85|VrF{7w9@fy%E>tmP_rwH3ZXt8{i(1XhPzWA+o<
zCo<HaBURttW$Rf;2*&yS_=_XMLe!vzbBh{<q6a!!<13*z`i<=VM#K*FNrMWL%Zd+<
zrrRVht?#t#Bad#PEi#AuF_nb>Rl1aaLAx;iXnIaTiMlUvc`fYA(FEkSpu0`2!E_Fw
z-dyo5{4opzi+hTo1h3qw^T1RF1=%;io=y(S`&t5ra~m85HVnUuSx#JS_0I7(TV(5B
zY0*Aqv~xH!z$_`lg{DRIH?L>DO{8lB=xe`cF)2p_%d?N^Sf@U&_16pl#?Ln!MeT*8
zrvK8%8x8Q>K&D7ZL9+nd2RB%Y-`ntxtJ0~-Nrqq}n=Gr2>i-CRA1f+63d^xY#e)sO
zlskc;r)+7e)4@3g!eQ-KwuZg%4Z6TMQQhx)#7}v<FN{~ECaX(JY5I4ez4`#&rP}i4
z7xY+vuU3Cxg8}R^^xs2(@s`W0+!R4BjMFdpT|rPj%w$%c23d1Q?go$R?CtL;iH--k
zZtVvq1kWgo1x^2G`6j;hJ|gGZ7Umq7#<f=P>YhhitbXyy(vqgR9MYmRPQ=(Kn6oAR
zezClw9>IaXTB;mm1+Wtr{Ikd45)s%@x$?egCPD8LJ4KuY@l_}|l@Tvxq8Gk@u;zRo
zI&U%rpbNf1#lTYEZcRqG8PkBKREJ{l#Q}AHK$@q;by-qiHa~u5Ch+SYg;ZnNAqIMw
zuRMt0E;M=ySqd;%Ozy-O<UHCT-j#;7z)hte^=pB(Dbg!*(p4f|^qE51MsE7Fl%p~F
z#q<n2M&;;ZHKbFqL%^O~>p_s&lTLfZ?)VTjDh&qiF&~hS?s@#;NTp^5ka>$vbsknr
zgfHaKagx06zn<p~p4OIs1`LL9%b)VMF1q8KDJb-T_2PU=3Yr4m<(mX@WXgt-j>sLI
z{0n{-)DMF8!(uAEz}Wd~=Wkm~S53s(go;ljVIEiRSQ_il8h~=iFj)4bHKw;i%fVMg
zAi=UV3-jFF@yB04Fx~(XemOyp7hPL0Jl5NF$qT`pc&1oYtPZ9<xSOP1a<<U?FYx>T
zx*EjD{g3;@ef4_Fwwl1_4Z1JeN7&qDseIBwM$q6rAXtK8MJ<qif(nNeMwFNDG>3Tq
zY0C2J${c@8&t+^V4N08l;vTq)zPEjP+jFGv6m7cI?`y@08s90Igb%Cg{lQ~*LFHT>
zw0kG&{XEvx$4edovV4oPcieG=0nZEk7Gi3Vgoco5eG7ok%>141ZSzbCh7rR|m9ULa
zaxUZk+0H&LGSjX^eom(FE4oIiDYn&p^&2NLp6G|0xnh96ZIi;w-EBY#*e_#PzFJ2i
z=S;dJ<6!mgXi~FI{>vfs3=E@cZ<qQ~^!Cv*`T&=cc7l5yuZPYq%mNa!nkY<JO;A<K
z`&!_3f$F_?n}b903E@6M`ve)<iS}P^>B9II42M5fkoX78<bs1A-UI$>#V6QLtVgL@
zq(SQP-uS?;W!ka=<(XwEL4r5W74F|a1F2a5et%(E7n887@(TuNZ-CJ1A=QvCe&_Ou
z?}2q)0y)f2tS;>l9{p!`&10Sa)|?L#-#sk<gHK|wnl8cn0J0Dxk+Td~8}-<yidL#x
zWbu79Pa$oW4>fCj!hO4Q3!m<bmZ%Dqv~_3kpOt^Q!Djr3^U)9c+Pu^69up<n>c2|3
zot5BAo6`!ytbju}!Ur<KpZ8}dnTAlP82G^Fvb*)}hFN#rH*qv<`g}k$KX(Zr2wsa#
zuT%+EYVRr#m~4OTN;_@$`=fv8ADvN|ZN9lkUv)W~cZk$>yW~a(;bz;yhdJ-fV-8nK
z&bQD6V>NFH+yCW1b$;_Oynm#3JJKKgWETM=S+6fX6^%07zF@DQ%Mz(0Ih`3&^@w((
zc*1FMT6nzl+_OQ%lWo#j^Kz%f01H=1i<JEPedud*?jJ71v&QD?NX%M~2IS-ZO|m{H
zKl?QGoB!?DWdE$EFa*2!?Ne9m<=G6&Q{BWLxt|uS98D<rGOPYvp(rG3>{Y$b3U+P*
zZ<2_!%}Lc?d*(m6u|Q!WUb9YgEbe`2ge}?t#&@`b9J5<~O+<a=^ntoW3oNPx@mS$j
zHheirF9~DNFe)zStm(;aUNf7-<LKyQ(TWBwo{WMry{cQpLg>bUr)U&`ljj{T`FCu)
zWq6g;?+OtoS2j(bsSI9n0<Uu-K4x7~6x+pWBGS4T=JSn9o4>^)sDQ5oM7tuzw4Tx;
zT<#qaK3&$E_r?O=nf3u)S&c-XT9ibeEQR@e5s$xLi<smHLGi;ln4~wBM%2!`?T;2$
zd}nPVk`htQ%=vK0jmD_@3f0(TBa~mJl?xL;s8#HNO%=|X{s%(AHK8Pf;ksOEfxerB
zC04;C%a)(5!ufv7x*~2oFMBHZmZL5t;Y82`2y@lsI9Wmd<@Bnl>NbZUer|;2BI~pV
z<EzR<Ip?V4F9@=8+2`>YH&w;@?pD-kyYa$7cc;D*1gT<^Xsk?u>}8gVen&uJleF2>
zmLKwYH)1BZZpTYRar@{sbC<oi^7*1`pB8K_<clszm}oo0AN4u23OnZ>5(;~9FxyVD
z%!2m@GsdN6aW$#of8jE9Z@}x9H^L%pl{?L?aw3zi(U3|(e+~<1=;~uIh~Z$7WD6ol
zb(}o-n<ToRcu%8A=rLFoF~Rx!iB;O?zGT!yh*=opZWZk@#)=X8En>yRPC1-sKiJ<P
zx21(}zlg*wx3SJDh;K|`?JY+IhR)2y42(ZIsFr}|x{Mb^s1N-(-wa={by{S?hfo)u
z*(D9c!Y{~;ONu}khf9#NIZ2XS5atPDIFgb>+h8dKDQ>Ew)!c4A=R+CycYI!~MD}e9
zr<~D)-B#zboO`910`7?OHW88;l0&{(g?C;)>*RXWy?nGJ)!xN)JwDs6Hl4Uak??>l
zrA@W2eBF6be3|}Y$H7Q4NKHzB)$(nWkQmmbqaCk5UH8RlCP4VPd2@T$UohF%E-`P8
z%jx+}L`+AZaYxsbAvvhg!9w#3D2DVfrH5lfnLj-#?N7i#q}?iq3&(&htgcU*zwV~5
z-Foaw0&3b%er-=|QOAn*(J@xHfhH#Ujn|^DWb`}d%H{K;>?0vKf%T_l6{#}Y1I%7F
zh&D9BZP*E?Y39ZAa`IQ3Xy@$9sB~e3UBkeJYASkwQ!su59LgROm4qn^RS&k`X|HH)
zANYJto4)pKUvywZIU-0iCxVsBULMp`p88!RW>vz;l~4L7PrQ`>zy7-+j^-qIuaH~Y
zveM4xzG&10azoWt_I2M@o#-p-_|4#J-LcGk(H-BLnHk)FdsZx#xgs}z1C}OJ$HL}`
zlhWp{(JNrrXFW4f9ONl0{2<^){1fA1$@VTzEpzAFF9m1=N#<G0G+!(??_#FwEBPnK
zAJ6L4i|dtH&SnypMu}&Cvf7Y%Ez<9t4m9k5XCHrN!PC65svOjQyBm^p1r=e_L%Gb>
zZg5ADo+O;MA5|Tdi4KcZlKcM0Pfaa=l$tsS7xP-}<<cHs%oG-CGH8eh5%z^3Kh#Cc
zC-$%+vaNq?{h=K6>z>^~uE=aVu$Y%-1H*K)Zga4JPWdc^XXu?*054Bvg%)DLvyb@4
z_8#0R`AD>*3u)x>xM8|Q`Q<w0ZC-HXC=R45|C>u2?c(g>d`V^%-3s|#y-kJ{wMRQy
zBw4xv0`n?hX<Otpv4<GuQ!DzTVUYD*#c0ADU|?^)k(<pZ*bkFu2v;G`i%;D$2c8&4
zXu;Gpq8uhkxc#xpaBBWKJo2j1wso=D9D(3{_u+Rh2)vo!o4V9?mUiYg(1mdWJp%0P
z8ekdWrIkT1?qI_)+vFfBO?vigY1xgdcEZi=xMsLIeKF@DL089YiS-sff*;NNl&9e?
zOA4t?<l1Q(j>oC5pI=+;rwz0)t(Z9ydP&w2utjf8LXlb&=ay|Nnh<1*VbHhW9(Gv^
z!z<;q$r>W1xqkuh3XubP+nMurv%>p!Gf~5#$7$@VVLs&^Gk?GS^zAJg4z&Tyq`w84
z4~84Hjr;q*Ui6=pRdG8J4e-b_1aN$i6Q>$D4h&rw<ns3y3Z8hS76tHFb=oxxJv^cb
zr<iQsjJG}3-ZjY;zR#)0Y9Z@BlpuEPl<syMUTXmE0T~+&RF!{%@8w<Cv`D#odg}0j
zFCO=`GTX`Z497a%FnJEMcvYK>G+k}}yd`L*D3QI$A;TR;1?{O;va-pnPt-^8wbb&n
zUlh6T!yts0)`*MvR1(}-EX^GVIn>xaJvYW+;epS9$4S+KrmYMv(P`l_y)%N|HdFIY
zKQo(i23?F*6qAd;#(ow`U%v95X`*BHLzI{{j}^iy>aMvRtkNJ@;H<~7cxL1TapUma
zjZHmvK|D_#%U}h4t1G3Ts-vmFCq%}G)TdTIq9!<%Rn*?)upuYtMl-YKv5I<W)KsMS
zx@(68TXZga>|36#2FT)-RgR6AlLNMHGD^+t;4uEqq=u-^1Vm(M20Z!ov(^=n>YXa)
z+{tv0OoD0;ZvD5@BGUGr+U>l26N|5Unc2lW!Tt4=&#;-cyv5FQPOcxsd?jrVzjrq#
zM{L6hjfNcew_Yg)TnBxW&@wiw74N35w%|N*3wYUzek%NFtM2o;h#|$1!ED~Y?=NbP
z|41QI(siC!EBK3><Pnh^l7?qOL|wDRPyJ;DCO_yg$!`pd*)r?DUuziu9@mQyQqHe9
zp&arp$Zr8&2g06PRRJpw@_@d!iN{xkm*_^ioAL-=lTWzALx+ocn+hqnxcNYgh5roy
zFb>&!JeJ$hMR{W5PUiQsfu1a_mh;CnG#z(fdxa#bI_&xw^am9Km-*&W{KQ1K_?#eP
zq1)}fp>xTOgQ9J|Upc(<E#RNmU*(MM=i`dBq1%0Vxw)7jj`bFPn=*$P)b-oH3llNA
z^k>|iFXog~W?m}j@$4_xf<!MR?!sEfIlP<svrfeXc4&;3Il1OklJ>8ng{!3om63Sl
ziU=ktwRiF9yK3sz=j9^SjO;s!3;hB)m%HLFYHuo)NV)yx0{yKjy51}f^d(1nX?S<+
z!a~c7(acnwJS-bI6rreD%Fw)D?`YcN|4t#n{!`H3Sfu@(IjH>}Sb6qRTTMl`IyT+w
zgp*|NpZ!g@W}MAsJO7aA?)Zg4(n5fERr$^MYdPb%`m+j+QV@Nvi`wWJl_YO<kg6Jd
zv%`yqf0uV}^4H46CaK^df87K0mDK(|bqd_mHi@mN9pEktD`jME%AT`pXeN!>=q*Uv
z0+Ez(mo;aaOAgT35N}zzM9;CF{Y=Vay=^fJzQk>C6Z5s4Q2!zqiHkt`*SRQxBzIA<
zm$UE=ws!I@B~TmeZ=7die2c|Wm|ywf-?<nq6h~>TJz2FeFgm&BYP0eZ*xyc=W|1NE
z@~Gqfe@*<e^M1R6M%+Jzzk>;+fZK9BS~Yx|BIi@_|D@(g#R58ZN#dh7z2&t~J$%}^
z8w7z6b7vl__IiFVjG@@?bPhuJJZ0zY*_7!T!qvHu+ZX<x85pEZK7D76pNjOJXXGa3
z=VN`&bhilDbT|06e_t<(TpjYB<|`)v(X{TIU8|BCPFnkqg2QJXK&Pw`b*3_9U8o9+
za4&DDv~*fjyR>dfuDyMg%;|Q_A^m&#4R0pNLiVYOMVY$$sDPj;Wr<%8a+2&7`kpw{
zk1%BKufM$B>NE0;ShlM1$oLizgpyk3v0;!mQI!h;G0EoX?9~SMua$X+K(Ms~)O2>c
zD{I7a_FqMp6vydiq9@JTdrLI3b=lK6B7RKcO2UXXQU3}f`Dc~kQcH&gZsNa^{_+mG
zaR`~j;>x17l!5Gc_hD6ALPaZu@$2j-oc3o|S5jK)z_X)RYs{(jxiF<Q3GS^N?pVQm
z3|-!Z4L<O5#0h@5sLfyJ5!BO2fe9GNn|X~~cSqs#HLo_ez+2k8T0)Gr(GbP>2yE)F
zM<*ZsWEb>q^QuE)LZ>&^xt}SqAX_H#Z<yb3S{(7u%mq}^6ygt8H%0^6gp{6$d8EE)
z-kiqarjGJ<8v?16`XDo)k2FzqAIMcVRA$HuHUG%-wsr_RCs%`Qi+<cryWSOTx)(9y
z{oKG~<@iIATKz>EG>bdj2+*~)$DaBEq-c5?n&GM<qm_^W(uCq}ivy*95*p_7zS--C
z-pc;u?HM^mJ)UL^<z>m!Cr?>VaH67`-XxMiTB9;`t2=JrTV_Qm_>E!rf!{4TCAcDH
zM$5X+$z|##Q*P>gfuBKhq*PVijagIdXUN}V4*R=5iSi7nfE}=oM(qIoJa)_6xV;N(
zXgG`Y%Nl$-`X}5L2z{ECx->MT^T*rN_ZPzwDk-Q}E&N%jHizBJQ}Cq&L$7<K+7m0m
zxp3?HyGvkY)Hw0}qETcX-pN4X;1jBC;kOFz7FSOLWZdR5tz<{<Z4}zqYWy<9Duqn1
zEZJLG!>PAU*zzyznR45pl)ZU?@i0R&7DsHLztwSo_G)77W1^GgE?+N~y$<vMg_cm*
zYP!<R=DZq%PYv<bh(?lhW3)>UK?k@|w2hDwa|uw`Q9_9}*i)>ZLj>&cGwQY*iDMOj
zKihXrT3i0<Hf<7l7NNiJZ~5NF_QPIo4y$>EjloE}jqcon;b;xAlDj5>{Nw6{HHD4j
zF<+{S(t7RWB*6arfsz-fy$7oDDAzwu9=SO~?9x#Lhz%y6E;sSpNX*M@7tYBKg@IKs
z1IF$l-D4M>eD(p45-Lyvrf2ukE=e*vGW!6AT2^9Y890>(+$Jp)DjzRvSI9SmccP-P
z>5<X;bwTy3+EyhM4gFm(-MzNyc1+d}APB3(z-p|v0eAH%o2J})znR(TQE?)7m?t(e
z=Ld&BBf`t7rw*r5UA<E~mrgsGUKtdqhF<c;Y(eH6!ltFy5?iJs)wd81waTQo*rfFz
z`YFvfXoJ6npeTud<1anTwdk_>oIvf%V^ORTuFD~`jdX+h+x!ZhC12Dw^m@=8bvN^n
zP%Y!_fs_D(_3PgOr7Qe}*jp{RB!$e7k`U&xKR?Q#g~J_PypNpJEyg5&QR6f_liFW@
z_Zn2&-V_&FxvvnpL!R`!VG$$pNiE4^AB}_h{jI@YWIw-hRXfd&Wh(NWan7@E-ds0L
zd0tY!r?ZAZrKS`JH1pSEWqe;6)nnZI)v2$w-ow%x)jbEzv$3i`mhRabGCAm~a^AbS
zq-yxZL>>L!0~5QSfxa-Xt@032%o*F~vVJj#=K=KLN$kcz;$|evvIn%VJ~mlSWQ>2W
zaCl>07dq}CpxiNy3}Q0VyD@Xc>TahnL}En~sIWyo6qErawzp#&1fz`&`nefjsF6#S
z^GKBmRQzVUe(*H$_&c~v;Bd}zyVIh#4qUGx4wT~L$^_^9HFzw@4)d0X<uU=D+E4t7
zS^hjPHGPA6RGDXcrJgmZ<-M095NilZ@%ItW!+U6X>gx7(yYFi`bL&p}P@XuX*PqP-
z!e`h8DEPMykc1zA;hoFkYchc;Immna;Jrv2QM`Ct5X&pyb<V>9;q?9EEC%14aIs<y
z1<}c|5;NI#=$8ARP&=Xd{H#pB7NV22sBv%uTS`g&XEpa&>AAlwqg-O*q*G<{{Y~qs
zhyN~yM2w)x+{Ena#2+?f4+niecOaTSd$*iNvYPPq@YQ0{wsTq(agi$+4!s$E@g@l9
zQ~G0FJ_U}wGZ)3C8}&`|C`}XwktQ;IYX?egDEzY060=?{YRGn*(veFUJkMUcf;@k_
zTkX#3V5B{%X+bI0c3|3k^6fb#@TbWpe84Y9XSJ~_?Og{~58#IzZw%-Z^ewCd;B9eg
zO%waTmXoX*53&s`p;#)$(5{yYh$$qMT72!k-W?!lgImx~FYzQ$9tXnSU(&wJlromA
zGIK-8LNpt`^R=CP;AfgB)zd<BGV;nFs4F@NyhVlPvK?LXgU#p_PfY==OWYFq44Y`D
zCqvY`ubk_iCmUe9ACm&Pofc1=*Y1aN_6pCRFZ2uX-a-K{Imlt^lIFkTV58t@n^YSk
z{yt#$Ke@TwLTqfuQkbF8JpAW@tbDm2IPx8W1R`c2;3P()`KX53i^y~FdU(kQe9aei
zwHT;P+$HTat^7pvRLuffTi&{}FuidDYY|EX!3Ur1q08HcV%|DR?~?J3s^x+&_WW;M
zm>H(dyvQT`DrR0d6%~08pVO8z>ML08NNg_|6}Z?)Q~Owm(!LhvP}oW+{b}*7$ntpY
z7F&?|JAA0^HEy-~zY_?$&%hN=^+!5v;i)&{B{FF<_L{!>eSZmIK57k;4pnpO#5fBz
zjM#Q~*$<hz=%`Z39Ix4=1igA!=H7q%S?)#A{^mbf1@)U$>ek~UgD$Bo3sp_z2J(Lx
z;j$7_jh6_*ZtA^EQsxk!_-r<4m=m%Al7T-DUxa8z`E}qO)OT++LO>CiufcH`4m(w6
z^C1;)p)1<C3)NStPpJ!n-Tn9Z%mHWW%Xv;{I4`G&xw;$`qWFrhQ9KaX+c0i5t!MgW
zzXAVg7MAN!_fuT}DDc-UJHtXJ8)_n`?0m7^KBgd}T9#|xUtgtRNfTcKz^-E)#LV;w
zx_sFFc<Ml%qFr(^VEe@te(qDshfSFHZXZE{`1(}ApZ7wD56X_>>uQ%fh5fVr$kz4F
zm7}ygOYBs}dF>Lw5r~L&1I3?uErz4v6z3;QTAiwrg~msO##bOv%4Ly@BXp!eKiLE;
zv-DCZ;kU18KYMknTPjXBIyvfm;KQBQsWh?f9)<WS@BN~afA`-eH~Kjs#s`vEek*ix
zDP?c3R*^)%Cy=jclZo9nD6A2Slt@^U&T%y=YT`Qaen`*KzxJ+h4gnH+#0ad0u+;++
ztZ+u~fNRu*E^w^~)=VH@=Liq{9cVTx6L?;8{2OD7D5h%;;3i)(eMO-RFo(2kjnN+6
z+EPDu2H~RY$79t%m%3_=PfF?rlO+A7T<HHEfrd`zzgB;_GRN%yGRk@(rw~0TKKcHH
z?VIy~jbOCsIQsJK_$na1!C#8GzHqqw%m)Z|bU_^&?wVavUu>lMR~$pVb%9}^mHYeQ
z_izw9yIybJgJOKGlz;0t6e6PJSJhl5qp_Hb+F_BFZt5+C+eq=)E<n+4>nYilqZceL
zNww03{|0A)h62T-tMI~9Yl-glE+^MEgl5-)D#{WsjgzSxcgY69;#yu!VMwVhf8QpP
z=mUvOn+1A6Q4sxcOjdQX=(e%=(eZ4dWA3$JS~f6a)$9gq_ObLWVyEa1DRtP}gSOPl
zz3c3<&IsyMIs=!;v4@#ztmS4Z!%+M-=Q2H>5C^0ZaJmNyP{0r5js9;8H;GBcMBsln
zY{f9o2oEJ&s_QXnEaq|60f<N*#@7O;%huniRV)*<MSp{3wb)adY#L90o))Ak&mIE-
zBj{z^r?NYc$bxePChmO(;p|y9zs7GXe>-INpPeiwWSVV_-afR^ow;6%82K)^Mg?6w
z?p2Mw{_a}ptn7r_Gst@6?0^j{=3EaW1L?p*ln$-l;&`IVbZzs?#K$_-H-oh;i%gBZ
z)8J37-9-fOw^~}tsz^0~`&4pN3pk8SNUzBtshH9YG2Kjll-FkyX?sOjlR=>f!PepS
zE?y6w+#4Z@NXbu4$Kk$Lj{aw0I?Z@ar}%9$mt`F;i8+F^&bCFAuZr=fu|2=hnLTez
zewag^9B#s6lE12%)XZXyQk^b_e|&MmgK#6h>UI9SV|t6BSAa)8ev4>iRvK(D+<d6Y
znxMpwFK`>-;0y8my4pR<DsU?gB7FKL3kYg%YRvNbZ4Ht2jG%gbfa&@_qHn!3xH8~O
zZ1UKU{%l7S#6+E!Ys&7g<Q$k8V+x&~CNT_WG~h=7LUB~0-pRPp4CJ7<A;C!FyiyrU
zD@}C$!E;F)MW1Tl%tw|7{!tZu7sOX9G$M(ZFug_WSh&q-gUXVn@q{_nBqkD$KM<L*
zBE*9Gl1R;ucwVNe4<eODzlY6D%`P*7VP;$OLV^JBwwSDB+V++%c#+0w%OON%buX43
z5kG#Ekei)B)vW#Q@o*^sp9j3f2Ou!D-sIfA9lrr@a&o0HZVCVV9Kf?bQ<}o|k&{=O
z-g&9_FnoQUY8A2;W=%09g*%#sSZaLs=dqf;)vbH$Ht?tm9sg=^$!Rfk7ZnZRD7xn4
z3i{bQc3bqC_FNM+pomtO`X4u7p(BrV+4=0s^YRliLN}z^kHg7z*1`@g8ZKi-+2v#n
z$jQ2U2FHj8!ui)8`*<LmV;AwD_EIlr#<uNjR8&)USozoPS}gc|pjqV+@^K9tCM&bf
zhmpK{eNk~VDt?mE2&G=CMUl&&v{O2_&j>O=PyealJ1?*cR)#mgKONbAi}Ms_<+C6l
zJuH&BHAI^5;nW*nX^YeuImP-yg|qT<*vef3F~<Jx>cP_Q*E@X>Cdpp@ox)RTx4G?b
z_`?**N0kugwYQ<2uvsU&F#r?fjVqPC-#iZMubc;^_Kmms;+oBloF-qeZ4-Z168W<B
zGwhs0D76U)$71(@L2J}XRz(Y+RSi?a!0N$tqra;&)W~A#k~aIQ!fzr4=FJ@1nL?gz
znoTj!w4Aq~NPi&NIIGP;e!AZEc`;2MY#E_E#<~olAw5*MqL-D|^~2%(MlDA6xm6-w
zSym+B!Y~gD*5!y=MlPDs;%Pn>om?+&&SN!Nt7v;r>+t;<cA;?4$6?;Fmbn1WjKKdp
zj;-@h1*)UC*$Y+*us5$jP3;4{T70GLauMBWt<dNZ<ufg#<>)~C69z8U-$nb%Bhu($
zLUoeg89Au%0LXnr{)}|5^rr4+Nwt3HeM2?7gt7hWtus?Kq?4`qf5sjdc9ytC2S&gH
zGHuEsZLmF})IW0i*XFw_n(}GOSQgpaq>i#T+hkP`A2tj_hKb*E#ScR)50pp9BY!x6
zn>~$y(dvMDV0+F;ww(m0Y|WyBb`Ai!BUfL_C27wyJ8z*|WeqZQw#(JATl8{)aXFqo
z(w>Ogy05<ahHqOHqB!!~yE^G-UOZNJi>K_=&GthsB2;dA!-kR`9#F^}YZcBMdFGv?
zZLucMBI8x_sJ?Ag|E4!x773PI;a3r{GIhaMY(L4L*TQd|MgIQn&9@%51b|>8{Q|7Q
zop!OaZ^ug{r&HL%4+SvWsx@A)4D@sN9`~d~;$0vzuICBR*ie9<@cwGO*9nes0O0<H
zlVDrG%tT1P-yps=M1F}3%GFq-*efYXzN@-k#hkiQzqyeY{FL`zIpz})vG)$Cz6P0I
zIp^zbuyN5Hs!m+XY!K*_yDp6ztV!%p5tb{7fsFay_Tvudd(6jgTjDkX{t%IL#p3+_
zRC1*Y40Bo#*%aFKp&=+<*)T#zd+Yv_X~=fZa%xaB{VlWn5^Kf%d-ZD*N_tT+sG?)!
z_t_QF>@?l5@_^P6r>`8U{@{O#3m~&sb8@&^i8rlfNlkR9m0VJB1A_MGVBk9cCn4Vv
zfAQjv-Z`m&WwE>KzHJ1~42Jl{OkT(=dR$B#UAf;l!@<0A_np~5?a73S#Piy@Pp7j3
zp${l^akDRUPI?oFk^fU-sKx^&#-WTAPM1{*5hFp&K=%`Kfp*|4nZOk`LA(Np8fyB5
z#zI?BQg`@p!vY(@gxMIV%1iT~S-~yr_f*$!E2{zP=(r!C{<p#ym1~%|<gk8sjJ*Ru
z;n+u_%N$5^$Vgao;19jK9-G>Cefts{-Wzok4>&U6Qmomz4L+zAN`bDfDbPQC7|pP9
za!3$hO+S&%`X!>8A`x^L^AAaSv65tXX0aT24Y`-)5U3G`aZ7e6+~fnF_Op{GRDw%<
z9X8-I2fia{bcENOHU?FQuYFM_UMgfiNcy_zufFVS199jA;ezpVf^<sGtr}E&Z@~li
zQMdh$4j>&f=)HtaeC9cP$~WDAHzNnz{0y6PkX>IX_%<1eCkT@pHJ@glB295W%kmGy
z6Ql3<3s^%ldA`8`44jfR^X1MN4B*oyII)e|vWqPU_^wP{d-H*vgzbS^KonTAZ0Ds~
zpJ>BCv<l+#(fc9SxasZzBdWEI!_J3pi^VLP3iF*#AIBtOoDIGHRjWKNwMBYt*WaSN
zG-J0*DpP5&18`na=hG&B*u4a+k-gTuUDX}ox%~l><xw7@Dhj@!E%nMTExMP~<a{GO
zTWsdLCD&ouLRf^*!SToQV_S~iv>^EPy48I$8~8Kb>h)vng5AA$KhfVSza`QR111L&
zdK%H3sb<%|lR~*;3dgD^rP%(m(@}CIb2YY6Wx$=o3Ww2`+-74v_iZ&6OIQ3Q^a4gM
z_k3C6(oPFtarsOxZF2G=q#t}2z5mS~C{vDJ>!5Z{O0v^E?ALTntmIsvPq+sL0duI5
zsS{asOecd-YF8H^KQ3%KR&673z&JV~icY?|?2CDdbo0eHGbL+5!3&$C$In{R2gvdA
ze;zi>#(JTU@YB9vRdvhdfG=M!c640?{(HD(@H$%Y#<gnGn5+&y^#;j8=Hz0Nj;=5$
z{$Z4DL+-sj;q~zF8stEkzVlWo?N1Hq&?Gil>!f-6YjfZFxrKEXwrHwJO$MDqY#ySk
zFt>BYxG`O(uBpAlI`+lG30x}#fqSj8YeG*7-bYi84y)`412NhySGWiaUdMXrQ3E?-
z{e*_=5U#fJqfFgz&zaANTnoQR_sFH{bdFH0Tuf_-Sq1>QKW`1}rMq;dr0JhL`L}8T
zqiXD%8N#op#NWs+7x49?FBfnclW+T2APP0scth98wt%qrY3pB28jG*Q?^j__%Q0iM
zi2`iSL&s2CFA6mx_xl|q(vXque9R3#5TVhPYmS~Hd1h><SpB1fm;GdFdR-;~e>8L~
zVaq+AOu(t}NPn$_*qn3#$0)CPsOp@#=`CZmr>tkb<a?Fx>I?O=bAdyl(3kDFPrH$E
zV=r!S|2JxS`-=9s>Sb!!(@z*K)Wb}nsD_&ELI6z&?e%mBXYBv`8>_IederZnn&D}|
zl@hhr$<#37!5k^O?B1XI*PPc+I~_eTdS_00Zr3T|e0TDRYh*A2C~6`@pPTAE)uc=Z
zOLrZCqN_9mYVMptA$IW`@q+edtJC6tA)ljH?tOXMIuo2^Mlm1^uhea>Eni}7gzQa~
zdtz#|&j^ZdG+<fR?G*wWm6}1@lg>kmXQ}AG6sJX>d&X#b8XYa3-TF(#U8KwQH;#4m
z%n*Ir#T&u3G*jd&pr*Ydw@D_>a`DPzPraKjIS!O<l6<w(b5sBzV)e5B*x($S9G+0A
zpK-qg+Z0B$&1C$TGM>4E=)XtwKieSs*m}cpXj(ew4_F);GXH!9GWvG;B)v$xrhh>p
zwaGfo?e)v&^Cj`U1?<JTjJGwotd7oiElJ+3=K05iA)OhPS;~l#!kA=`>V@1U4VXU^
z(%SN;`|8{ZfuT&CG8c7PylQW|!15%jWlUYitY4`vrK77Ql08Yu6zgO#XuB%c7Y_g8
zqb&iDxUYB11j<_ru)2C>$B1XoH0<Q<kDWYwNj;XSh0QMc4*S2D_3F8nM77Io1byN^
zk|;%3M;f<`!@f|J_hf9V#og-{6-me#hp7F32@QzHO8t6_yT>^_1!vOFJJWy8$E3;G
zlxZ5x4`2VH=w#WJR=Jshkiv8DvtGl?lJl-s?`#Fe_R{^0Jt55}y2YwHarc`P7m@<k
z`ztnk$ltgmgZAE9u0JKsM3wD6tVU>*40Cj{a<8z4c=O?7Ik1RP^w#*r!|T`BGncLc
zV;N6hVa>y&TV6VJMe^N#cWv+weT!-`izn1i`k8o#uj#Oazrv95Tgsx(dG>w$p}_73
zJ-lr9w^+%ENVqzm55}i6W_-V6jy#>=MCG~*T;NVLGC?njrOp@3w!xz~Hof`mmGw03
zq(v$F>9esh1#?|ez>%i|SO50)(>xLpOCxiL-+|c-pFE_bd)V~wzlTK#x9sb60NcQ7
z*S=%g9E95y3ermxXfq-jFEPG(Fdmd+_Vc|<iZ)i3P7C%@r~~?EGb$S5*CV!Sua>AF
z^T~X)r)5%!aF=pM>aSL$T{x>?ocPBoYt%xXx`^ot3s!lQ^m-2e287D#{4@44_%p)u
zs^{PvZ>opmCctcPx0T-qm<x3B?2GF(9c4aT@#&j!^fbGex5=0ZZ*6PEdp3=y+CQoC
z-v!_>+`ZH0`KIBhH66Veox27X^E71EN85ZB<{BWnIiYe}rGvi3wC>FrpLAy493sJp
z_gaqUboLsA|Gr{jx4^eckxae|5m8;oEv{P?FFcJ3zblzFjzn~}HUjtd;rR#Y-NVA;
zZYcI5j^UBI*?Z3u_J1Ud<V@?}ZSe+xE+Wz3B(Qc)_mZ|>A?a|jHNg|sAqMDsH?H1Q
z8Idi@Yp0nT(2r$qNfm*v-F_#*%HfUJ5WLcF6uI&yxsrBVYclaO(m{EMVOaS96#8;G
zoVYUDE6f$lE_n***&gArDdzw}&{s%}Rup4<ZHx0WyfB!}-va1lZDvjO0s}5BAI^m6
zx&w&}Dz&9^f&v?5vwGcd3!Xl(svzvvR-vrPvrn%8iBc{Qzf3q9u3NYM$w@QC#cX&D
z0A-bLeN^xPd)e0{e66nW^`GeU!ZTVyIZ>wt!E-W!7~KR>42qmHVR_-T4oHf>(Z{=|
zw#=^!wli*Xk&?+7%nnWlimT1L`8SsAV<R2RN{s<vG|xAGKoJELXo&Kty3OJks0FW#
zo3AkrqbxABQUZ{a4q!-Kx^{m5&&;h~X!TORE?uVTF=H$2)etQp*|=t!ez9Ss(R>)o
z93v9Kv!BWRZ2uC0xtL~z^?`Q^X<=d}C~;hVzsWWM!@&}sn#r^ITbM}k(@DA_@{)0M
zINv*q^0S^P)O<LRKc{W(T3w<#=;63*$`8xqb}j=IMyjzPMF5rpBVVC{1?+SfTkx0f
ztJLi(&8l_Tlr4b167}m;>Yvg`tSX_Ur#Yk=XeyDf(E2@$<ckL;HK8?ZWiQ^g&6*dp
z3Qh+Ts-NHM8!x&nX3#+TclA?SKevHx0Ztrn;Fh;%Sv2eVAzm+gRIl09AJXT4_IC>D
zV&3Bqrs-&C5(V<e;Ert)3y|GRefnRtb<}C`0YauyFG{jO;<&}*5h<n+E;NW%?bA-g
zNmc96d}q6i)9q<c8Y*B7*Ua1yEq;hA98U6U9#4-nYrtA4t`-a{A0{Geq8-%lm8fiA
z7h}RGSgEHriCM-XwtRlin{>4dW*ii<a(E0V#9te9tlBzg5Qou}VHy{p+hlJY`i~k#
zYNIzKI!aQPE>Zzeotak<0Zod8<Y94<R`QNB1chhQ#J9sVnZb*PzO;pWRzx`F^z<yL
z&_S_^i}V&!-qCfOi9N_yUsC_8q@6|}>fT+rfHUZ@+DA+&UgBU#sMR-W81KPH%9=q8
z+zVw$9eP-tx9Z^npzD&c{YhHCwHimG<QqcGckW3tcg)4Jlm62-JXV~i*udir;;rm<
z`JH*e1_c4GCY@-_zznj@=g9N5>5>+fKDK=!JMZ~7KZeOh*9@_;3HH`(I*bmhHj(7&
z&4Ifr7@%}6SAqQ$*q${Ebh5^|hY7F>dI{~{QrFqcLQCP%a7?+2e9w0I?#WhW@!PTi
zTdk$uCga{soWI9g*wZAZU*yvaVcq+|VDNq_`1fk&jgfo-djwY&=VD)L1h<-v>EO#`
znLuUr)7fqe&q?GoB3Ynnpf1R$Y}QY0#FQG+N+{a&Ax(3*LI@xg_F{>+vWJflkb|FY
zHndHapY+I&Z2ynFXHKBegWxzYr>soz>-G6WWguo}&ODE8%oeOfUIr;GtXBc;R54c$
zODy%-gB#_<R|-kx`e%KDqXFy$QQz_Ol7&3CTqt=boV$od9|8y!&@FV_G<6p6X}_s)
zJR-wt-0VT(A5-xBB2J6_SGDQWm&Qb4XAXSE{I38^$dt{`A|EfO&VhTIuV;iK09^bI
z;jS7$l#ou6Hc)cF)2(HbxcD$+dbyYmkJVi8yy8yR#;D<xHTTbr6X3tM7e<sLLj=%u
zfBazb31^3*VH#@(nmJrt@4x_6!SA7W4$K?gIkg+EIZH<D)Sc*4wgBKqcA)XhILwWq
z6H_!Kk0?!cj9nBa(H#}sD*Teh8v|G1bZk7?jR*7J!L4PfMV3!ANMwGQM5D)6eo_u@
zBPAR#z6f<CkEhDgFj^isQGa!B#2-7~U94=vvtQZfzHe~y%@iP_PGe6Ub&t+0x@Wm^
z!@M{ez*Z`&gD6!8Imv3B`bUYia?(1uBoBa5U$(a7;U;~cd}hAm(dam!7?n7nnO+K?
zc<pLu^h=555$QjrOpOnj-e0q6L?`A2uBuE;WFlN_$6R)KcgAlTei2a~Ft8sB@f-W$
zu52N!iawG~5sCd@lLt!op}-Z^l4UWPN5SSdI5tVI*9q4ZZ_WC*Oy9KR3a))A?8&wD
zTyGA|_ol3O-FbsA@&Dy>KmXZ}>?I%;tWwcH^t5TB8`eg%{N(1<zT6h8b!G#LA(8Q#
z%vf)w_WFEnQ36&0=&Y3VkN!L-7{@FhgN#cPU3;J_gc~M%>p4<Y%_hjb>1htrszJdW
zcJvT|C11)ph4URwAN4o{<1|~&W`%UxbBB1^&^PmMzhq$&2f7_$=*S0MmoEl>CSL*Z
zs{OkNM#crcP1b_-9kE)rA9~I3)&^IqNBQJy43T-XFUPdVc}F6SIl+g0@CV;-uH_Md
z2~yu>_tkIL8ab`UU(K5^UKz*B)RhUsBTx5St}+J@wQH+DdC>dl_)8z;w9qJ3U5$I8
z-kdrz(}-f7!g6gKE(q#h!ofHXAR+mvsGw2azp4&V4?fWk$JD@uV8U0*Q~HV(6So@3
z^zfB8kCQ91hLS;m4oJE(hS1gD*J832c5{sDpAUFS_*j{l&mqQ&EOleVST+71e8S!t
zN5$r$iXJw|gScy1k}8jC^Kalnu8rZq+z`keocE_etB$VqRTP#rr0lFs3ZGZyx(Q0E
z5{S80xQxsY1dvELjZ!`*(M`uoe1y%z0pRfAG_Q9XUZwg(!%t;_vdRphg|m9cQ$(iY
z{)0w9$HO5iTS&^*(0Jn4&Cc`>k#Y6HnmnzJE(I`ips|=KuVI&Z{*&6nbbl`!hxJkF
z(oN=DHk$X!^Vb4nlC^R&I~KHduR6#=VdE<lDLg$TvQmGWr_Jj}PbzyWYY61lclOo;
zTIXg<6+j6Yf1!qB_2gGN@K?{aufQb*iH7i4%{$uJFcnjv%is33!Wo&zzHd5KAKO9_
zA8*or<l{{ZfUdieku*j4RDde_OM^s6o=Ne0uSASUhFkMuGZ(#uy@w%r>-&PrjGX0I
zGT^nUdg<)4UX#yu)^fY;1k0$<P@1_Ok5wPL(D)Ilb%e-o4KPhx_1FZx1^hhxP|E^H
z=d69rnnj_ORfTfdVtif2k&P%1uY9!wFtjB`2tF(V4d-hXyS-b5e`4o?;*U$zpa}c%
zS-`fh$cF7B3Jiw@?OF#M69mubVb5lM0SL}VAVS-Jfe4YU#*U-QVYamq2PGA$7`yna
z3-grFp?dLb;QT+gmkK^sx6HrwC%cI;<#EEtc5G|XrQ32VO+A`+DUI+uF&|Ho!?>`(
zbRS2+6xz5QV+{kiYUw*HzqbOH!yGb14l6M3jDTy!Jr^|DZMnmU87G?d2kG~!PLRFX
z20bSDeKGx)f!`?H0p;9Q{rX6q{1zD}bWH^G)dKH3@mF%$F`hsvL((GWRco^OrcTr%
z!qd(NUT>W(WFH^o=phG@u9&WWf3JRZqD3<4$3$9voA1jSq~uxK@hvL$54?z_r4_5v
ziPw4c$A9(iO_)FxNic)iZRx{lPnzr58!Ygb`Mw!Nw(1`}Y3IJwjgN+RK1|*FG>3Dk
zSNK9C=VVQwE1uT0C0LWAT(Pm<>W{s0y!V0Py#q1|nh1|*Q~%m9(MdI8>8G3=F@Cu6
zojmq!E|ATqSvlCJwc308_%wh!PQpAMT+)mlz+ra#eY;tnSDGa5tE=ZKrB-@R0tCms
zD49SvDAyY^;SHl(GNKPS-RD$s=l+pPY0p^VeTp|RtYGg~I<*5Yc#8tDi;eU=f=Gs^
zWY&opffmGGXFeH8|8&(x?cq(SEM_9?#mdZ&@vQMAh);R_!{MlAxi7!ea_1t~emqLD
zV|#<dMUg9QH9nS&-X>(kWSO*}Tq|c|?e7@<p8Yf6m%AG_N*$#az$IP?9V;t3ANWe<
z&Jl&m80ahFB8Hk8a6-GY6+Fjz*!U4FzgPf5ebv%A@W%t}r{3RJr6ug23McmSYL9<=
zs&X#)-$$<ZOrrfq8Fvoz*oAgLu5TWm4TU-bLOd79?o43(!_LH`IRUrlwEk4x(t93O
zCl>%lOsbG~{mEldt;A~9e=Yppg7GsiJGwd@6s2x&m9+qUyCGEA()Mm^f+%&nQM$@-
zqiO#+Y_cD>27nV>%;#cXpwy5BB6$2m>=U`O*y1FRh&zuJz;+Z}0z+v1ftnX6+@R>j
zlYc6J&5b#hGNudc8(;qz6ykrYNcBSI;{STLxfh?ZjRIVO+UDU9y)h2r|J3D4Fl>^v
zXCe;xg58YgMlul&=AXcQ*4h08TIs!mOQ)GgK-(hn%P?ueB-BwGU^0dQ=|NAnS&?_F
z?Jo6Gn*_jx{yee2C*|KZ{b_JUt@e9%=0c{Ln4JSE^I~w3OdxL1RiE_@S~x!_8g5!K
zUKCPdapVyw$KFajVf*W~{h^2q(=_+u*-rylnX~<kNf`C~optx{XT?4{c|BLOFGDDG
zP|C>OIlC+r&=MI4C92%_jQVwQQKf{F5UXaifxmB8A1r{V^Z2wIafG0BwhBp!Q7H0&
z7q~8ZMEhU8$NA$Nvm>4*MYb2oM|EeqsDHtF><=d`r#H6d9z<B~3xMYAGSJNG;;n=*
zLnRL-lHiv#gWmE7$hO>`eV3dQ#lR5D^cqW%Xk}&+tv;>B_V{9;BgPNMxxwbI&V(co
zEY2KvO?O0rIefu=GSvk8@?JX$Rv{KA$`-;*ArNYlc75wvH>a0*tncg-cJh_#LIHM<
zS@)@b2m7m_k;CuWQ*#FzUfVs-NBje$7z5j5b9Yr}<N>YkuHk&^u}GWFv3*9>F{JYC
z)XMtkH{BXfx8^hOwC@t@Qx(u>$O9q}?~8v|C8a&BQ-<cyzBxlts&f8?Q2X&ySEiox
zUbpBc6gvi<-=a`T-KJpUdyJ|pU2;!1<lL;)nEa*ryaZyWX#&}#0UVzDTI`Y)BFR=^
zEVw?+*O?F!w6gfi1=ctP|H<wrsKWFqs{15==Hw!Adc6V;rO!UpKZKynUgM5PNZBAp
zflKGqw{rX;WVvK~$r#ISmt}5pY*PFG2HAqmC*)UtYzI%oWSoOQTF-zIFpd%7{jIXa
zaGA9?O%Et+2ON+pw+9QuF`YTE-^7Opv$}l#9Y;nMXi;YK@5kpptt+d<^$%5EM4<gA
z+@R9B&VWUlZhz{5V5xB4+^_T4IZ8Jc+}*Zu)Sg|CyMKmcw3+L$^<rkSqbm@<caTaX
zRw6cyBKUq3FAQ$V*Mwt@$x9;q89BUaY+}HZ>BnE`_tO{eeUQngrDShwmu$WSkh}Ra
zAclB3_?*DbpD-U2&bMaV>v<^~iHC>7lA=`W{FR6-xXs-o2ERZF&I`HeYlBrbB+V2N
zy~X#c*ehFb0-%C4lW0In*|m|<JWif0qSVM<)x|(*&(7zj=J)>Lg}%9gUC`H<ccEG%
zaf{kSYvg^6-Cmf(8kBshSohv1)>f}!PHLw9r(GdAtEaFtZ1lz6`Sr(6i?Qz2Mpn>F
zAJK9e0^8J*3g6W@GO*o9!kHiAVYt#=K7dzgQaLKK{ms+6?*h=eYHC8-X8%?z#KFOq
zSRIYeD)Ci*n^OvJhKZA`AfTDYK?`wr;Fj{5y0jm}PsrNTQj-O{;M4remDo^+FHXZd
zx%DVq!BT8q36vZ{x~$p=U}~@QEC5RXIp90s%M4)l|A(M@8)#=>GXhww*+igrn)xO}
z_{r}asDii2a#phkgMoDYC~VxI0eR8ylCy!wD3D!^T_y91$88wF_hDx?6nM?xZbQd{
zXf=Eu>%gcNlY7Sv3#JPxtjs+FL_0_MO+(e^Z;qY=rvJm(o5w@lz2W06PboqRQMO7E
z3MKp2N+nyi?8&~bW6W5llC(%EvTup3BiY9?p+fd`tb;HUgTWXRV`hG5v^;%YzvugX
zef{C7r?+v=dEe(g_qp%uy6zpX^L0lVTpnFh2FOPICF=5vD~Se5%{o?n{A&ZuLa}~!
z!@|oP$<f(40^H5;L6l~^?uf$Zsj+BO(C696pqrQ_>{1eSL>bb@VVkVemMW+%a%4SY
zE2(X^fJ%EG(LU&ZL=^a_N%<REfTq+TS`&PxZv0KX;RIN1=K4hz_=jJZmk@;y_kqN(
z)9`oS5#(ExaCj9bL*^doNf4T0fzBXBZZDuF$U0x^ebLQQm~zJ<T&e0{hVqBiu_M`;
z9`uBfV;I?+VgS3%;#}_*NL5kvw0(2*?2aOC-qNaLdDKcZ9?R!a++ok5<}GipiH(Ig
z!<2+wZ+cX{nq|-EKkm;?YQ3+GvnSXgn!y3}kFad~caU(SNrRk7RbrqftFXjBj)m&U
z&tHB2l51-^R%k&ed|BTlv|KCoEbrR<RrCCXrXi`xAW9BMf~Ymj2Wz}qPKo<S#$u?g
zXN@4rG~Y0gMNz(1+0c|QH_X9CN$!msQ2RFfBnU9BstKdZNrn1w$3V<<i(HmfhRfNA
zx1zIM$LFMsJ>6++r!%h&K-4?Q0l+%aRK-DoXXmD+Y!Tn``y$LC+|p!kZm>;&wbS{C
z&wfh{?k$$Z<hw$L4K)wY7#YTkr(JkWt+KHR-KR|^raHz{gpIuvcpw)BKTzIRI!xs@
zZKo)^0(Qm3{N4;DXYRxN21oSL<>sYWbz9A=l&3xYKoV__d9~t+M|x=5-L*o#tP?&X
zHH=xYEQcO7glapfEVDnSMsPR~fX_#xjKFnJsc1K=B&0f|7unQpRo_H0DbSjU%=H)w
z^KTT582RQ+tafKXu0VVHB(8fY<O*@d5s8j9jTroh2P<YEH62s?eu#6lLXa=!;-}e=
z+&%53!X}A1dC<3@vk|aJ`L8tNBPJKx3s+K{t&%?~>I-N(_7j(54Mxc>@<d%l#%q~~
z{Kdk04S(8FS0;{qcgPpV{R@%#9Z!!(?g(3(BL{+P;QbB>B}8su@x_u^FV*z2LH-iD
zMpESCiG?Q3NcwP+dI0QB@+k=2#7X94*prUMNSeiHxYj;U<bv86Q6?k~u))Q8v3ub(
zALx~S+3<@4{>h}3<;(RHZ)a1D(^{4XA&0bGmUlon%hdxtbdOwJk8*vtj`3l&z@91U
zidd<AHHgR%4vS)WV1*ugTVG`?F{eH>j59+(bv(`qzxL2xtIh-Iw-J>x$!YmrG=X5r
z6KjfV+QbpLypVT{K_ST52jC_kaokz=<eT6PnhE!6jlq~X6Shf|NsyjY^o*ZF>$gjP
z02(u%^~gMp@7QZ+UuA!XzeF}ACn9;cyvo%j&eb(%UUEH9^}4erDcnIWGsrXkL++ru
ze5D{Ku&@#nW(4rl)XoF`-wkHSXLzQ*3Axa8coFV%Z?s;gCg|lDyUv6yyPzR7H6C)B
z!Ecx({Q)H`;b$-FOWNKpQ~~!nwzVAqlzI(FavHO7{lHPpZnNini||`rzpvEleE$22
ztnx;u+ajgm9zK#w!ylsApGGo3@f;lJ_7U5gO)kSIFZ4ds7tmJ*kYY<Y(R?SJnR=8r
z#)d%?G`T%sU|E~!pOta|6sskT<B&CgPZ1PifBicO#@L4#WZQjrzlKNpLKCar$t`@n
z^<YnTd^o<Xj0yj-!LChiH*r+!$SIzXB&5`j@8Dxw&+nGgJE9%>gGY9Lb*vEe7{HFf
zh>QdBIwK2a-(-!)))%p2>C3e{u<D-8fLzmAet+*Ze+Oj({ffi0QUS8*hCLBg5Byjq
zN|?fH84%tN09<SMmuXycH{$^6<)q(2A0(%~aY)l|4`)Kv86tDFbV+KW^9vu%tH~k#
zG`2PZ+n(W>QtsEqg%H`wE73X_kU|B0l)MWFh4Y7X5QI4v9_}FboKDCO1!MfQ!mzc#
zQ}SRmLFpXF4!KxQH)Wzk1kxU&+Ml(M$~ss>eKLh4bW{i4%PCV*b1|(=z1^u}X<Dkz
zl1VB-siOq>!jSVquE`d*mE|L>E@J$H09ym_r75&zr``_*xE?Ij9%Gx)Ntp?EEW1&b
z{`h{c%{o#H8<;%~GH53Z%Jr&-iL9Q3hyYCWWs$9H_nR(g=ew_>s{kPn9GpHFyzyHg
z6Z`Y3x}jX>ddM$AEGVDQ$5`s8x?{<jY9K#%Fbi3K%^!`y7cA8MlR2M8IEk^H>{iQa
zZkl@|;e&r0=%yq;kl9g&=FF92z(Q;=E+~<n%K|9PL(z1!h>qAwDHC^d-QYitQErfm
z0!hbL{ssD1j|_4g%j^AYD1hdA*(x7#>Tm$xf^qKoX3fIH*Ts_-B8R=Qz4U+3D5>4N
zVk+IhQV(yqt80=GHPc_;C1&i5&8xz7nb7B121De$?x8J}d;q#<w^X${&;F}rp-s6G
zsn+&76#>=iUT9FpyCRSl>pqfr_QJh>d<W6=1(YIZvKQ8!iyLV43*0S?phhZ&n0Qnz
z<eA}Fv@M@Mzc1~R2x?;k#6?%k+`1*59_5*aS0IiA0DhE#8q|=p-R&zJOYge7CYEjz
z(|*CTJ%ca*;%Oyy*Rywpv5M5^*h=e0zoUS<&@!oI&^{`@<0Xmx!_Wo07?i5`z&beJ
zia^57bI0(_duNj+Sm&+sJ8~C8@;yF>`A<Y-#0v3)mNA19mTY1pS+rJw;|b|Rq@W|`
zP*as=q<*b$Q0-nv%J=Ev4cZNX2nPMrSqA(AC~<#3?2rjbxjCbxC$LJI*UKY0YrR`6
z<2(^e7tbcbgKp)3;B%Jy6>Xt=^}{SJFVDNylEwUfQx26h_wY3-8St3UflfuHrKR>&
zPSm9N<V$SxRvV_oBu^H+;qx}^3z;N}xu@y<;LD6Wgk+Fu?#+vF;*c(><M~2a*G$hX
zg;`>z26tPJDU*Zs@LHCdRx5L?4AckV@F)oXaAW#)o2DQU3wSD2QfOoymO;j}DRZWb
zC$lgUbF3dFEn=05?us1lynJ#^XFY=`s1*6y^SY`o^Q60ZyB6d(t%)+j#1YR}k?AJK
zZ!akUc!%Tz=S&~0#^+TNeNaMCy1b?sv8Rb<Wj4vsg2IlDi&Z=XlAD|Mu$<lue|m=$
zAhjvv3<oe$!UgVQ@Q7YQpq~l=<fzOCMvM3=BfPY&Fwt*_D+zY39LET^dSGicS5O#M
z;Buo4DxXT9{pox4w(b%(V1|T705Fm58$WtNJ2S2DqMi3e19V_Ok&p-5HV)nPQ70V_
zfi2cfz$7id3VuSG6~R)OT=aphmm%3nD5cV>TydAZrhqhKYBSNCceA1XFc;Fp#QQ!H
z0r$%hqVHLjj^(s=#&#c$Bzy-)tme!j-J;YXe9f&xoHWGSn5=YI{3FSS@PuCl(NlEZ
zS(6=PJmn`Yd}Tt8l_fM(A6`j*9T=ITMQzXYXtA!acbFS@0(RcgL+a_E&E8?0AS!%y
zR0oihT;f}eV#4j&kWAas69Wf{3O_)VaKj^PVm?L!l>K5|K5SP$mA^MvO?lF9tAUqE
zUG))(H<Kc}KwP5n8ss$E7DC;(ZjHJBU~EoC*?7xW&WZf7NnM|Gcu4a>Qo5^|+9d$_
z<=$ctOYnMTTHB_ciaT(f?lD%0U7lAh6EtF7%$4w|eU&#g`AO?bVv+1{WPxZ5z48UA
z58#ScJ0w<>jGNW~{4WBMoaOq;o{u6>m14+Ch+a5Ng{9lr&8&{F68TdP&zex&AT3XO
zVobL7AykT5&pi<F*Ngk13BaL2$>v|BKLmXq#vFWbF^~G3pWJTBUbJm#wj}>raDTYS
z^1uhmqp=+dv-n5IrTTkneV>NraiY+U4vAeG?8NHy^D7el^a4^WQot&C+Sjt>>}b_N
zHq2!r$`Icg6bn$k>mN>jO1@k^c(<RjT_)is@^l|JL-+aTMCq%9pt_;a#{2g|^ztC+
z?*JEFpkAX+1qrT=!q8k>nt%XRDJ7Krj#6;VZ)I%g60hmG_&8+LT(>M`M@R1`j`F<W
z548=%-NCh*?8meKuD7(~yIBVZ8$n5f>X1aJCXOj~sI%;(wuWN8`7O#n0W7-~8ucbz
ztB@f<Ob|`g`%r7`N*lJZ86~Y{LN`RcIeMl7R`E>^o?|_wJ}>c_B~nUds69HI#|gDx
zGK%Ftp^W=nY2UCroH446_nS^6?b-!w{$wUd`ZJ{mz*ia|S8PJ-bK^h}_9EZhu1v98
z=e&l@NITTya2!!5oBVJecZ9r4x@5ffnx*F4`P=&e#IHcpA(KVHXwtPj(OSLYB;j^o
zO^5X;x~clTpVm;I(dXUAw7_-w>3wd(r3-@dQfA@rEY!NHXZb0l5_WE%IQ{YlqCc-n
zhtPLV_Mrtp2}U<$lm|CZi~GZsdR-V_d(&?c^aZ|ZoF0DtK}zDm9jF%pEVX{N6F~fm
z3A{97&CB(D*?%P~Sf4tBPBFtlZ<Tdui-$d^?G7}a^NlWf2ksRT%1L~ZVNqH6E^0U{
zPqd0`%i29@A8`RRVAOFQ&s&NA(Wn`_o-AV7!5xO>l7stCWJOC_UAVIQ7z>wQ-;{v=
z41d1w!}h4ccCV!Gswa<U_+Iluc9A3xe>j#YV+t0b#@f>N!S?3$z}bV@yQR(s)14I|
zAqKIvHT@{~orQ<d9n%1FY<XZMvDeA}mcWDg+}vSj6h{F$^iJiro>{pZ-#b5&3OmLx
zqEI~Fl(C9_YhQY47w;Jcw}X57XC8RlV#Bz9PH_=(Os6Wu<;%y?`>kUHWen9~7=CI`
zHXb5W+nr<=HuiFtFu_yIjfdlSo?jA3HFa}NJD3?m25X(JJ{z0v;qcA#i|nF4BCYAq
z0yNl*e2;nma66*{C<kUrdUk)@5-l*bfOV$LWgy09B#%q42PV;enMEl!+kjG5qiJS+
zqLfR#|EyR=907vHcp`;98B~lQ3$U(vR3D@s^7S<C41_*unYnxa8_B0g{gvc~(o={4
z1<Hr1Ng36=)>b_h2TK+;kndUR)s7d9?=DSmFJgVP6R)SLd!X70!6}G|YG_(^_M~aE
zg>{t*_D<g-$PKUeKr`?MJ=9iV1^Cf(@V27e_uqoBlN^E!2(dRiVk(Om_2`+7KkWO2
zTw7n_Nw^i%RHZX`C%9vexXxZvK#f0zYERZn96EDr*a{<zQfn*g2<oFE(|4=*ms^R>
z!oW4?UC_=(kmkQ51u-fk>JMb@HU??@p&)FPNJwz(T;p@(wBIP#DQi75hWB<%{6=S$
zTmn9L?7bF#JV@zfhHclGZ>(UwEs?f2C^3G|JIFzn4A*TtM#osK^S<8_egsktcO#Ji
zq<rY-Cd&p`<xN1kxC8JAY4ol=7p!CIA+ucl&^w`(HoYz~x4)Vp^cG*&g!kOvgQ<Qm
z?yd*++0@5^$yoz%$#UNE0~7^u>4yl~&%0b(=MNBQItbS8%56>J?B9)Ju@&ie+xayP
zvTrL-<%`~VQesznT`%jIf6l$I9#xnh{mgy&b^Bh8g91=aL)pwdXUnzH1tD6-ygH4^
zJKJ0k{cujDqb!*WkMQl88R1dWC4{W_Fl~2%?{nSs%wRLiA=&qq)b#s1NtlK905v_l
z^bXwFusC05T@VQ|lWdF0t~4OJl?lXUaJEs>9}?9LkQFDz!+LQrYPK4p&$*)G0i5*h
zLjm3KwZz^0ZrDn7T}#{U^hwoNA@(@W{s--r;x#GT{GkD<#8pM=V;CQ8!EY5g!Fo&!
z>@xlATP;yDf{(WCp2e!(o;CB$fVLaR+lQGzkeuNcsW+Ui?!I?zMB3-P&7pb51lk6Z
z;7)DhC2r)q^X4~9XqEjK?&iK~5(AJ(74T2u3^U1-JMMM_yHpA}`KYQr5n4&bLjyTt
zQO8{oCRfL>7{S!4y0M3=<hS6Y1iYc`j_MUnsh#yk>r_^E=MO0$+ZnH1(_sS<#jL6F
zy8vmI%G8=lasO}v;F(WvH_=@x6q_SFNL!(Ei(^U?kyWM1TnUMj?&uqM5dmQ(5Wy`L
zEPmTVT<<DXxiEveiaEHtcKzOQ0mnA#D1I>eg55A>z3mK0Xxv2F)c19cd^p9r$kKAw
zu1f@A>UVlB_s-6!?Fn{AMz-F}lx$w7C?R&XNX(wi@y!bsNOMnPIIu)*zQSQ>>r$aW
zLni6RMNitO>S+kg`AyhE+zOe8<CqqR8Cd9RQ)d}*zA<If`-%KZZ=nU9Ey|j+fvFe2
z3^6RX+Qo?Q0jo@~O<u@glFfr^I@}zg(3-I;SZFj5tk4>C6kJ|C6#V)DCEjbVDToHP
zEAc!xFKXj&_TexuC#4C!?YFyA_hCk*(EU5>o4l8Mj!BHG*9{?ayIRVx)FL$--%$@D
zmLnS$A6%d4hCFW99D?#)!cTh5Y`k?HgFaLn1KZ|qWY&LeAb(!PMSNo}t&Ti#*E_oV
zNFAdF5mnrx11O*RJkdJ{t8XFao|(^bt=8qqKxbRB0Ml$5kmP7D;GNS7I@;Opt5uIG
zQ4Igr(mvzQpP!P=E1%b8<JHU=I!$dI<V1y@PCgoO3e-K?iQ})uHV$N#5!JszmG^|7
znso8Bu~W<;{L|yRa#%e&p<tIVUbhhoF4r;-c{BRoe>UG3|K=*=H`Fqn2ndxH+Af-8
zkU5KDjYp}4zGM|<37NOla#D6=V>pN>YcZAsN?}hk2!6F-+;|+Qip;YZ7Ka7CiB>|1
z-N=!4s;z5#o2~U8<u*KO&V5*oKo8py_O_HW`%-~`ASlVdomJ`}!=mhXP5n6Z@bg}p
z3ksQw@3&QXBU9a`S%q8pq<HZxEr)Ad89`c<Q+<O9=J<{55*1cKu@#H&Yd2dmn_uaW
zkVmbP8x;+xV?s3q4~T=#9n*yrRC^N6l5?u~ly`7*l^_T7$#b)H$uy#GqcTd{{~@@K
zpf0BJ#NVe3UbnO&4}P2NAH>!-EyrMsHy+E*O}D=jfsawSR@4@%f22yp2x=VEzPvOw
zvZ1DR5RTzSBLW_iP)t_M_o|7)YFkr^&2r^Ju@;fQEEz0J#G_OjmjFwd+88Hr*m5TL
zUEe>auT`rl9UQf-a=mU_hmI28KoTTY&j9oA+xcI~6XtEmr+jw^PZv2|5)yy?=#<6L
zhLBf>TR{XEQodjRM@Hv`yR+id!gsINELXq%6FOTiAWbnUAT@ki+w+LS>Gn!7o4Hcj
zV>+T+z!=G2w0z6aag7Mfhr%Rh)_POjWJ*e(#_UNd>jyNsUdadg*~KN>;`9MP=tUn*
za+q2Xd?$1)N9-1oVzJMifsyO_h#QAps&@Cep50)We(o0SaV1|QjUBOuJhkzomw;7p
zc_x$<x&ONHt~Fw4Zn90(T_wLEg1${_(4~mA&Mj~%k)g|gU76pKE7?37o!cI&?>ovq
z%o!($g_|^~jCnN4?Z9(u?7|kKj@QcHqh)Y$U8gS>6mO(87zrD%T@VSgzEANfgkoC{
z${FaHrq_-yb-;+0Hd=tKlxZL2<j_-uKFTC6@?}j2x~;B9Piw(H+;=;-bicnq#Ou)k
zR@332PGWU-9SPa2w(PyS{i!zji<6CY*o%(Vy?fZR6H}BH!Ja!He^BtEdJ!SO_w!;*
z2!7~fOU~Y95b*w>J|d8(P*Hg|U(2N4jxNhU-N>``$ck)?7ngl77ee#tEPblvGkoA_
z_S01;wO#Co%w#MDD0^Tu2OqK?b$!XDEj<B0UAep#6OyJj@NnJ2S5;DSo(&c9=)m!w
zshy+Y1*d)t=~5e1v1F6QlwQjc!viP&DcLhSl}pm@-Tjy;en9M4AJI}WEPSy+Atn)Y
zzrM<u^v+_v*hKd^;nn6l0?VLvR;i7B(}CZd-Rl!~k;ZD^NLb{LzSx8g_9~Lud#EDd
z>a#<|)$>274iTLjSJLrxx7*doMIKc?I9>HKQM}N%MhUB7ieNn|p$EVC`kMR7A$v4S
zvaRKFwjRjaTD~1X4biT6&4pMmLVI-Sz#-ZOc85bWMX^Zqi=xlu!X-M4%w%IFvVAWr
zq!bdl>Zl0jHS3vLb1kDhpanXa-PcHexRHj~XqK!+;8oN&_@=QBE;gYgd&!Z6(#sSj
z4XH7>TRa_)gta%?XUxB|CEq)w?cn>6xymzpKU5bC2cR!isqTLATI-d1g^1Yp%hVzf
zR9B_6L8HIP%uwK`?$h++%3(T6%&d2b=znc1Kz^5FuQh3Mis0UOQG0;z1_tlaRt|78
zRwi3RHFQCea*dj1AF{WL<M8A9>Y6WoYsm)c(3Xh%+nSng2z=~SC48_c4Z#;4ImMOF
zP*+3sa$=;L6v~O@WLqYD!hW%m86~4&jib<oxL3DM775?%wA}iVpn+TsJ+P|8#hz<&
zcg{dH%UA8ZX?8=gh<AnUoeXHwyAX$&kwM3cp+YFbf$Uq2C?x<^cpZ;>c~oMfqy4tx
z3dNH`r>6?#t%jz=cp>$9f(xGWy!N<eYQkD<p;Xe3Hg1+XbLos&nr~D&2Q$BU!cGL_
zM8<U&mczq&5@pugWJT?Euf+_9BjfKl<PXO0zpO3(B0pH0+6{E#;*@KGwd))UQoUt|
zwE^uESNPn7O1)ErO8Sy+--mDPlgeM-?zy^ZxP@j+gyRZBtEcCuPZPrgh`zUu-nO*;
zo&c+mHPt>paa-FseRr^hW%tu7maA1N29vr82j~`<v!iE0eM)P?_d?n3-7nLc54H<c
zj}UtkolSd3O<UePcCaYazpjK->+yYvZbe1zY0sEFm*>kEOTC5j?C?pxBmwk!-qjGL
zW<QN!%n_`mI|#bTN{opDv{YbfA5y1DAWG!4GNCpsME=LVbl<oAk43h1Dqf@_j&7Y=
zy&>?pZ^`Py9qoa=L9d-?->a8^zCnB;R!+io5gm69)`PCL@1&5U`f~8^-{EF_k=Tvt
zrOc4`W|%xArYTn9QP6m1EbTGJ2kpz-23AHdZ>4Ibm`_wob{^MJ)hJvN{nVw{LOu-a
z?Y!oHmF8k3nAN(wk-A%lVb7`zwlybG_*bjAd8)RHZQ1g@0?=Y&t?1=5vSn&ZoigB4
zw)pw~huLy%-f_7Mvd%Ai3R=uT1N~G1%Js-AsDG-{LUOHSf$%a}3MuD_j&3hye#ncG
z|F{-E*~}6>nFqjzGp~&05;F=*cD&?1g8H@=gPZbr@DNPl9ALlpR9Cp=Df+C$^h>bX
zCQxeZQ0xV=q7VUM5EEs$B~AMOIKJrmKxC5JL#e?#95uZM1#ha#IflX*eFjM#AmzF%
zi8g+$7~seIB_6$Y8G?0g%s+MkB(2HKf8DZ$>%T4;o2AaXHx-v&E;)RRE_J57{nGCy
zBUELRKvD!l@ufZ|X(YN@0hzc3)o%E7=gp@Ht8u9u7Pljn5fLO9bG&!$qN{cZZ)g5-
z%NFk6aFhp8U`To{AfNTvc_1W>{G>MyyjB}5yg2~RBxceV7xx=f!BP>Ui`^{@IcCmG
z&3n>s^WU~?Y5uRu+U74w<EInWogGG=%x8hr6=^}DLS)C5E%7@>qhgU`wvv3tt^i2$
z4}NlUG|dwKQK0+zF&3Nf&mmt;Wd<LZ!~AKU=Q5&@<e&3GZ_egP#(xBre`>><zrcb?
zH3zc+Uw2u5kpxfvuG4J(?~j>(e+VcZ2qmcY^5?^cHmKjD`Vp5l>o}P|&2RGuz_)Rx
zsvIzC=9l4Jz;ofgi1qF>Y3oN<H_QdDYLJMr9Hn%gO`N@W=AX6Sd_MMXyX2CHa0`D?
zPG7SV`dOXKZT<7Xn@|7G_+R+(4su@<`B__v`7^Q22k&bAodX3Ssw049{Y-@#+8_L#
zAliKNe@B0@p-KN@)7GDLbffq`*WArVEB>~eBV*D&Nq_K6Mh<^UtDBEX{=F$4@oBV+
zKH&dV28%KM{SN+PsGvsA+19N7|MoBdBfi>obo-XOUny9G+HAG)<_G@zmTdC(5}XZ-
z+6|uUtlay%0=)T{&ELb^75?)X#s8hkuV>QitT6TwYyASgt>qG*^4h(nM8QYsaR4mm
zUXX20=KG&j-D~{QCa&XxO|<2t7}T)>ldaQ*m?Y()$|Ue}=M~*NUCt>Z*F=tjY@L$g
z{}|zs{GUb`4bo@e*&{L#jgU%M=%D=fo5k}&jK)JcK<P{X*vRG_et!G&3m<NJwHJUX
zcVXZ4om<jK|7$|^Kexd7=AR33wz%Q<b4P#M@a6~pdCrbiSRL*6v~uEeA8vhrAX)K2
zlyWFI=s#6&Twf2N2;rZ3s|f<%V*wN+({`NzYYh9(HBPew?_l$8)Tg+B-x9Vttf8lF
z;HM(PUNWq1orH}Q%O@bve%WNB&5TNJG@N1dDjBo;uW6?F{_+tgF7Y0kKF`d;l<??-
zxpE)A{(CF@w|$*FRNr)xg}KgYHID#uU3^UM?EiI_F_%a~adR&7SJc2Tzdd}pd$XEg
zXm1?IF3cbXvjOhBrrFpP^Wen<vG&I8@5T)6B?Zh}A4*~GIP}k-W3h&3LJF@H^dJ*w
zgVg?=hM(L|yGyg%C7i*}^ayuX-@K6a(bK=w{4<@Ddlu9%lu+f6#M|)ah4NLLg6^YQ
zAO56vnIGk(|I5U{8~=Kb`PQAJK+2FMMk4ygPw10)G5C04<%}_Yrt5}%_I|Eluuns$
z{Rj7Oo0gQOHRXb(?420JiI+?5n1B9^PEYCoKe%In6sH$|@qY#<4!N8%`o4u9GV-p)
z7>F=|7xL#boW}k&vp;JH%HJ2l{&#}8pu!tJ%JRHy;ZRQL9g-TLG;{QL-rP)_`O==c
zbKUW;5&S0nmt~fC{vMr@IqzBqMptI6);6-zW6H(1qXeSHo<^OpB(=tRCYvq>(g7b8
z2UK^ZF|fk5#e6buW{t0ny&!a@w!3N(qx+SBia0Zd3XWXsvDKp43zP-46hXY#fa;>H
z{0*5x9~CJvrl&d|sNV`^f8ivIv1s+{?QCPdoi{z6xo2IW{BENXLoOZZ88{FL<G{h>
ztH#;<_on-I$V~mZ?Km!R4ke#|tb*IWmo$n8RK0gDZ<ft>C8acg=(ZHc&U2abbBfne
zfbV>hkwfFXmAd4KZo-&iWnEHt@JmwZH>DcQ703}Hxr}m2Cb3l_(p?Z4lSql*te{pO
zXXuFXs2IE|b9=K`Ed10B9$_^ZR6Wl_k-Qp+K!@DcAA<jwzw}fF8GbQ(*>mfbyUP+x
zt!t(d*H`47hf(VOv~#49H`)$gb8%enC~+QEz8*G|!@Goq6V+8wy_E=yvvy%H(v^Rr
zw5H2;lO2GDTZ!-a+r~6W-^I*W^Ku>Yzn!P}rJp|dWISN0_TN=B$zCn(Kd-&xHIN5)
zIcDc+AinE_BU@Z<l~?axp9+qel_!-Di{QGg{jCBI4XovLb}3qz@!-{JR0{1aYslx@
zw*-v9-Bur#)K##mhGRnemzH*OCiTjhK;yh<6B8$xZ|i&7?}}fm^m436va{TR+Q@qB
z&}?FPhg>21=-6ZM>ONG4Ot}<G_!U&y(F93YiD5_4#mHHPg<5ky7KMhem2&^(Thq?|
zJofIsoN2O|0%=9ZRUsYX;eGD}6Kk-C&KjL0f1dqu6z?@dW}ERj006wm&Nk{KOICyI
zJMUPSIVQmJr53k_F?6;jyt|wX3nj7XJH8<YpDU>?pHoZ<_zrfBA;&M^+CB{p&2s^D
zB49C1%qUM@!~Is_q*blSQN|_j|5;e`-wPWF(81?*Os>kOqI`X9ucyi89P!bkXnTHD
zevu>*k#zaUFcPRt#u-SZMwju&M~g?C;%vVPa;RG%>D!_1lO}Eyx(4BCxiO%!?%44a
zSi8OO&xiuVIDVH&{R`KtV*N>=p@;D{BzM^6+46Ij>ka<i;(ni`mlGxVU1!S#oM`XL
z4x1OZZLFq$79(mA8IEB0L2tN8vqZl2-&RBzdDmxCKCQ^aM(;UBAR~C-wC7gpZ6FlB
z!ysF>9FE=@jw`M$4vRtnI4K@sUI|OB^zL;bCD;1iq~iihC3i|nbGBJ{`rGXu&39Mh
zReWLb6})E95>L}whvAw!cSbcT*pz_JjP0RBaat?)RexOq*ssnrzbauM<X3tVW8S?T
zX`+JeuActp-QJj?@^?rUQ}FBTy`i~B*!t{Sx#=-atna{v)5nb@B7P+?w{`hhVDg0N
zjsWhveYW*mt!wDdiS4v?))ohNaLvPuy-2+MD>2X+_=;`Yx@EW-BPVmyu9w%0#4J-}
z6eqrIM(&5U_X42OlCoY^3f~pnUNSF!G9#hfA8Mvo&6xUfS&7FQh-;VF3z`(GcD1*F
zGi&*;862x`n&1Ang?@<H4C#S|KC+ntXvxSOA$*CPUk=~S*}DMJW9{vY)>ZDWD+6bh
zh@NG1w!+>Mw+e+yWjx9-CXbY^>kYgX>&>gnT18`gLN>n46e<6pr!iED8H+6ig+NFy
z^(ngg-kq>0aDRQZiZWm2Uu_sfHa4bTKunxaYccOwLxT9bQ|<q0fX!SQAt5sdeH)(U
zwUJLO_p9vGv1b(~Dh=%C1=74h+bWO?jk$GfatWcDR?f6{uRXqa-*4JlL)UL4NSUHV
z{mUnAq+@|W^RuZC80Z4RKX_6`6W7)Lbyf0{Ywh@{o1o5Lj}7D$a1Smm6F+xuqhJ^x
zmm&2|(o?G`zAheIC;fiaYmP-kL_U)Cp>D<yzYeZ!x8H{gh*h*K*Y@0R<<j7oZEt3W
zvFLfG-by8x8m;-A<xnYiDlS%D4!`p-Q6>x?dh_;rZwm<^k3h!bYo*#k(ukAQ0h#ls
zKZ9&7C^C1yhJ5NSC<?{OVO&>vYeWhu;Nm#+TNZ%1<uCJA1|RwBkTWd%c`eX8D*!}u
zku`_2r{Pvypdrwk;y`ab*0tK1`l5EcMpTY6Q)oQVBy}<*QVS`)e29iiF!>x%bAuVG
z#-lx;W_Ojw7McJf3z36qEs^|^3$;F@=+EQY6*xBey=)^z#Tua1N~C@*$t(!Q7%GT}
zHIQa(W%4f?axmzMp^Zi48cw3dah-C_qC+f(feJ}LdxS6+_p3+b*i+YP*jl0M?MuWy
z!|qSsskJ#@H>MWKAU`s;#uRaEkJ+oyPa7^Am1{|wnRkul^fcAQb6R--ZORlh(rWAk
zgIf4`nV$D94iKl@!F7-zRk(qxyMp`i^hq&x2%PZlqap#r9<SH%uUfPzHWD-%{eZj<
zr9%Q3Amr=xfi{zxU|g!MqztI6echORY>%Tt+hvF-x0|MsjLB*W8K@$)#bb-GHIUTK
zN=g-0aYh)UO=eUPV1I&@?+SlB830`!wT#*h8RjUdHG^|^b1S|NMy%iNY;-7mF6$(2
z&Z{_v{2agGH@?mBE{fp0gt>C2q3NurJKW1``^vJZkQpGzNS5?4V=?t#=TOXL-Zk5T
zqeGr!XGA|&>YkQwiwwNXqh?@Ri}CarnsiT{R}^;rD5b-@*2eRU6nkZBpWA^k=lZgJ
zTIF%6*y1$13;JPjPXQB87rA*EDMgXAV%N{O;4D0F$<2a2Z3r%2+`%0Z=%GO4ArykP
zV}U}~@=TVxRW3^KaS^B;FK9@G5f<4GS&52W7?7{t=q@4Y5%!n%(ToVKKpqdOhBa>T
zL5$Ceg)9bOhb(bTT_$FX4^?GE<vS^s70nxC;jwX(Qa2>$5}m6Y;MSl{-3YXu2l*A2
zeF!fz`xif(w~CFDQh8+(!EG#5&pSY%rt8dwcY=Y_BnjGlOu^wYA?a9-JXz0Ym7qh5
zebylrM8+U=poSi5hO#L{^Ru23J#)cP1pL!OX#P163-*Y<-xDj6*tvuS1tw2(oe0@|
z&T*0Vq*fE+%d{`!tFOm@|MTY3ikWmPklZ}cv#+5k%>N3<jr`G+gHA@=L)?nv(8C_V
zZE0CZ51r$nZ^0>@+X4gU;+$)2U%c6w_JtjHP&r~`IzFKUV?7)sU3ek;fbm-*i{ohd
z`*CR{@cxAUdVe`EzP7s94=gj^`jZ}7;-VK0BqMYIPmlYeF|;cynMFotJvQeH#)A@y
zY&_woE_%cAMQU8tQQIx&%mviepTGi)UkL@Bo)V0#|7^bc7K)@dl^XO2#!5Vx%iWDt
zGK?L)1JN~#wJ{l}=~S9W^-_ew7BE<o()KykB;}7Yx$E;R8`L_aw3`LG0(!4lxDwP-
zy;(zCZq{2gdVpg};uJc>WW8ow7pp)Uu;q&EQ_H#?nAFqw#WI|RY_7c6tbeI#qWgGS
ztcpqEk9GZV$~B@ztyD+wt;TP6b6ja8O|@4JAq%)e4l%aYdNt$o@74<%$tr(Vnd{e0
z`eghKn<=Zw*;XjO%p6Y(fdoWjft2jx{b!H=xk5}q^#{`Wc}iz%X9)XYH2gt#9lp09
z1Tr~hGu7zed9_5sC#~bbdI_YKFs@Z}sTS~XQ$dtlOwn6UdoQz)#Fr=Wg$X8<dsK3w
z*CJ`_o4*dd+zfz9s!p1(`O+1))vT&_ni2~FTF_1$R6^D%Nvx+&k1+z>oUzG4zF|?^
zIAevS+k*FI(n=zRj6Z*OF$3}+S`YIV8_?d{^5R`QCM8La`Q9aBxV#W@fUzJ@ma!0;
zd?q6Q$a3fBMB248qyl`b+ZkeQeGRr9<`PdDcxph=v3A75OmV(;h6$&}`@JELgXIm6
zpqVMH$ha1be{Vi%XMZ2X;H0CsO!gIBOq_lJ;sHX%`sMn1Or*th5DkRtF--&tf3e6s
zncMGKkG+CHHU)r;4w!y<znQF4qGR!%Df?UzOs=G0Tvv2i2zPg6afs*P8WDFz+0H`V
z3!WhN5dX_W`+)HaEuI=H!N7<T9yx4FfbQsKHI}&;S;~OXc}a_{WEkX9yP;Wa%fr6)
zIvdPbs|et`x2#_zA7qf(PS<=P3R%5`Iw`&K36Cm`JU3xmJNiPV@1bRQD`3zH1m6F2
z9;iNx*co0`ae<Uce<&je7xyR9&L|(OnoW<_cD^@p96(n`6)U?y<!obnGpi-1X@%kv
zsXQ0nU_}b0laA?L{_B|ica50gif^iw2f(3!a0Cq^Zr|Qd_(ER478a%M*TzK>Z=7Vy
zyk|3^Qzu^VN?`&Ih%D${R|hjkA;_#krTI#oqqZ{VVJi2^1~}F#PZEG6w4unaNE!ly
z(hBb3)~Hy6OC_wI#4Yl!EdY;;gf(U!Xmj*Lo<)QN<;<wowx1fSkh0~m4?D<x^OT*B
zN?2I9<X5aSBnXg@u;bG>G%?8)h;k>{qBsj>WoG>y*mpvOYR~!~Q3Qum<YRUR&y()~
z^X&sXZ!NK$qhnXUO~-3UKwdcq0I(9O%d>8NTwM_~daNUT3joUd$&WJ4ThmVsU$%_o
z=3;~}U}D20DeQW;Z*f?6IdHk{)q%CJ(X}O_r~{j@D`N;(<6qY8qifn16d`gh$h>@a
zJK8Aw`kqa-tb_git9s{6Uzv)Z3(PGav7S+FVOBm=lmdhMC3|QhV$vfY=qpv992(D*
z1IRaNF<*pa;90qWLBE+MSM4ZFoeoTlY?Qa;MV#H%<y}inQ;tL05^8fH^uYd*KtN5w
zo%0l0*GL@<(e&4TUFm_pfDc|wiwtONlv;S!e<=CiyTEz-U-{onH>_S87}8Z=p9>EC
zyf**`JU|{&sk(o8;;?ki1$fLsjn^<&XyT$s1S<dVKZgWwE8m&vzcmc9_a%s5VF=I~
z-6$fwTT8Z>|CpIXjaEJdpOBFaIij!;FzguEzNj3HqNjkg6ob%g?`(s1&V$D3lEF>&
z)pTt*y&u$OzVeC(d351y@6`uoUvkM>%&8v%DRQ&^=>r9mGp_z`cN7@0vZhWKyvnw`
zdcuHr&2c+VT&Xfg8Qnljo6<k=&NKHboOqS6n7dCx#>$ohX!#dtxgF)Q>#Mneq4$)?
zs5-$BeM+Rst)%4V<<qm{`INOEN$iKp-<5Sa!X2zl-rV&>H?tqA;*$7CJ493n&~DuV
z%>w%FZ;|7LN<tEy>-X~BMQ>nlXM%f9Cjx0&c>)3xT!|c|SSTtIRDF}J&)vK4dNFh!
ztGL*MrKj2Y0zPL6^~>qeXT_=JYKWE_GVjii2nZZ5cYw0eS6We|NLDZrJ3j){0DM7A
zq#b=tzhkAHr+5~+*1?7W0`>GyZ;<$~zb=s3H+~1YN_Uv_A|2hgzV2X%D5VNPA(Nu|
zCU0wDNfXDt?6qHId3%j>rF~)@UApO!Kp{o*!TZ&;O1|#04&9yYx+Tg$%Q-vf-#3@k
z3@+U>d#;EZnt!+R1zAXN#gwNOyl`SPKf`@Oc3paACbwgSzr3wAwuW*5FQ}h3+{xWe
zkPOr7vpHw-qc1D6dbV?xwO+h>J%@KR94PPf)eUkqVP!MBh)-tW?6IB!g!duTt#~EF
zfC{dA7_T%#$Y+v7o4I6rVQ9W~;j0;?^>rSTMvktKBFqhRUI{_1?0y@u_868n1dcDN
z<GFYT0u~Plee^Sjr>*W3F<YZpMuax+;aX&XAhUI8pK_!SVnV@pYz5*h@Y#qd0_f<;
zQ$t6mJfW=Xwhw<-S@q-_yR8#BShHTF$ak|nMtsMU4j3FZCrR*OauD8RsWysGdtGTx
zA60xUJ}qGX%6E(Z0w<r0kL1+|=?Uv%5p|ekWfOwW#C+Ph{UGQD27&nMvz$T>!aqL1
zzyXX@7og&Oy@q)_;-er8e^t-v*TMDz0RZdyHS`yiSm1O-{$6)4U2%`Sie7axvJT;s
zO4p9wh7?0oMGw?qo>lc+dd_+*gwYPeRj4fR<j4>KO^p@^n}FM`t~aHB0?WdkNLg!n
z_k`~<hac?AC^uE#bB%RITEGZcg5yf!WO!{uCK<8-nvHzSCcr9_K$57~uR#!BGY9f_
zjYH4DTZ+vebLFV*-LDqx)($5{{!?X$&jZ4@TJm$M2Um^Wt(1SUcvub!HV5VBud#i5
z4#35yT!w<@DsEbWW-D{Fr3{R=Y#u+g3?+<^(|}GHpmfgx+2>NVssebV=>aOgV-FoM
z_}+{$GU9mgQogNa%UjSxmS)35z$0{r|1(+vD~x>m-b)T#!wN^L3jz7b#L<pD<Y~{D
z3PT$^Z_v_9J@brfz`BsGabiaLG-2Js-6}a4<mRcrsiTnxH8`%{8>$en-_A;H2a0t5
z2+a$4P7Bq~Ye_c%C+y|^^Luis?_*#PA@-p01hJ5lXM(7D2m;tpPyL882E2+V3mPa^
z@niIKh(cb7<B%%&J14AV0j~4%3Fs47`>96tRlq#xc(E{&HB1pWllrJa8+atsmI91m
zZNO8Z4L{ZLUh&fr{Jn2u+F(S`*&~l!Zd#U5lB-D6L7T}V(->nrjS}Ur>}f!d%S^L8
zsQ3CE%Z!qAz6?4su7894iQ)7@esB0)!jAn`4NaizDjD$JMNX<FskWV=l#RO6(8SDz
zDjqg-U_Yixf72>Z@~&_&{%p3sr5{tt6`aPP5O}`v&)NWy-JdM=rXa-eSO#U_reoTo
zIkZ)dvCn&uQ8i{!+`L2wlIJei`12-12sp8;G(uGqbA{Ch$10pk?e!sLv5~C9QRvFH
zqGz?kP@O4AT;ZJuQ8JJ#Km;mJae8^<KG6o;7Qxzhql7_xkhe0FS_OLu(~byC{%i;u
z2^KF{gR0C4bYNvXN_dzoK_pv`oj}`a6{4G#*2|xHJ{sYsy#vl2XyKHp6=z2B2Y*fq
zF^C~8{aKgq)xYn4K!`rS=3$i4;Qg{N1(2m_mtF=0ULg>J+4Gv_%Fk)@1^M@b#&BC_
zL0gv7^Qvl~!OopwfxoZMAey;|I>yoqQ{eA6u$0S}^U<6<$|g^J^>Hv$n(z*8_&MQ+
zWa2)p9%b?@4J~@n1OqPIn?G>{Riqd!V5Jt63G=;Y`M_69gBe$A<8C_zx{M;`%S<0*
z%?&C{>-4I)jzta${E9trZy(+3y9t!!H!rQBIFEBIk<}yXPjZZ|noQkAnTJ28He(63
zj9e$nMo>diqu$%N)cx<&<NlsHkPQG@Ugal;bp?(_g7`BWnY=&G)eDFkS*GM%qXtg8
zlqq7!KvVFo>MCe1X0*Xv!zX`S(3uDeClkB14pO5+0~}EJHD>klKKj&5uFYDl_y2S0
zHA<?)7O^gyj2gqSsyMO<^9*sDmT*{J=&8!e2gUT$9!KP6q?d<L+S0CNnVua?ox`^+
zrSkyB2l3#6XsfAR+^YrxF23MuTdBHnzjSf%3&A9rDB4zJ=mOC!%<l@vN;1G>3#kmP
zKRKNlOa~qXqNX<YN;NCdD3TmPT!G+{M}fBe&-yPIeP`|OSRF7cOo435n1YM;ol#q+
z2xL{PB5r&DC|r(t4_*d$6!^Pm%+$&0%cDRLuqf88`JpP-=LA|3><ExS`k6on-a-dZ
zu5QoH3gEuC<WK?x<4dueStvnIQfO^p&lr_+y+fw)M8Na!S~U(zmtw%la>_AI0eFeW
z$fkSE5{YeE>5w1a=g7GE*s?<DWvK;ACppE{={tTejUENgJggB3a{W=HNT5;gBJl$t
zLxq=Hxb9XZk_r5*8BwTO#0)y&=C@H9iKwB6BOf2+ZO3(|OSF~+=it@dNzX^6+tvbN
zcb5+LL~8eazGTeRdx8ItF$nxB7&EJ6@ui@F9ZofzZK3sBcZp2!mLaBa2j-K7XeJ=b
zGSB}0@}2X8Ep!^4)V;IQKNu;uN(CuE0hV8!S|u}Hm>s$Q>b<s;DREVG{6S)nZ58QH
z<uqBlR}Y&wuJT`>w=hG`pZ{i~x5FgXb13$pMX=o}+}9_v(=SVU8MO9FfS%|TATKHM
zwcZm>hg1akej9zz@DjWsl`P4E1M^m%)Q}%T^`V)P&tbz-)mT7Wl_8>)pn7s(F<s&+
zqk+rZ00I&?L(h1Nj>ne@i6~4yM)%H#2cQYgC%0Xv850?W%%E{0sJbPlqwwtTrF*zE
zCX~XFBgxt;{NLPA3F2?R2_&w>!<=3L{(a9qwpRVdv2{Y)>;M9f;XLJ2YmD5Q7WSim
z-naYy7qc;c%%s=twN9<VfEGj3?R$ZpIPd$##sCC2VsdSJQm<_MUR%(DgXtnDR&y?<
zWm81XnUsz?uW^idyG30OGhV5lj_9T-K8Xaqm1^yt3ays7GMR<Z|J=`$WV*&ZPv{tO
zrSg~qXmuGfn<$l=A6X7!Y(WKg_hXh-;9MpyMHU?2Hi3$*@xa&ho4Ducju}n|RX=UN
z!iJeYbI1ct?HdUC*qS|TvwkC6-ZI71g9$gofh3u1W3qMiHTgf=MbGqae^CQu;{_BS
zOL8xxByC$aAXPm|O+N(Uq@Ik?CcuTqx$br!-ZNgmmxhElU`r@oUy^-kXjuK{Nt(xL
z{~Utv&0&D!DAE0$d2|8|UI1(bo8&ltF8_t}a<q|ht5ziSQf4j)?|)p-#eCQS3?5<)
z1f)G~Y3>%*&3D%sPT8J?)IL=runHLSJxXJ_wF9nMFzv|42f(}`=rwlk{+TkcH%tN%
zl!DzGqc=dSwbYjZwBrEP3NEELY<<@Wm&JC(^v$g0;!W15nF~c#^k4jNurY?pe<xwV
zndA!S{(ZfDZI4e8fe%!`Kx#*0xi=u}a;gAkg(Xy`zIq@T>e}6JvR8rL_^Qu&Gy$zQ
z<#q0_*mxF95h&DHj05W5a)LXHS*m_YLQjPR{&EP2l9}pX*tkxmxsx_iLv2(u>&ya=
z)PWbbcow9?lri&HIUlEVc}A{1=Wo;jI|Sr;aX}tAMrOQg9nS-)^sq1@mH8oLD~9&&
z>X4g2%E+|<3;$?Gc)_1}P9GN|Yz!avyQ5FMw~3Tt?)tQnzu%_tgD4}`;o7Xb_QsTO
zF953d1irN_cqY^))@{IG@%*qG_NO159dExRRdYvYL9WZNU@*R0*0klOb0{Y;@0q{M
z8y)k}m4(@3N*OxEQLWJjm>^-*R+3<d`Y65w8ttdSr3*-5Crq|WR5y5n2{A@wrJ^vp
zXCqD#t6ZMI9O^`h)&25u2167kGA>E)t?i$IZ^<<JQ}_090P@?LS{QXhLED?*G+OxR
z_WW}Sg)f5bKxH!8eh<jqKid)Z&iBwc=%pbz5d?hhsxIemsab+!;C$onCPct<)5m2E
zlAd>Hf@6Sy?G+m>W(fgSr0z3sh@T{Nfe8TZI~mb~V$z9X5gShfc@i+msj96B;4d>N
zM%++cW|xQ5YHt*2$=jY)7?G=awlLL?S20a*`B_GPTqfUYg0QBwb8z3rEVyCgEEU@?
z{PDfnLBD+rFma%fOHvLBs`~V8&+4&=BrrW@TNsFp6)1(REsc_d3vAi_dvD*wtQ(Pe
zYqG{azTf$vQb{teH(ujj07mVHHAYv$NpHN|Bh@ytc8*?kA;)|<QR<BhKwbU9-+(4m
zZb0Z<*R-^unhT{VQ|n(<Y44U?N&nn;1qxumt%;JY*bA}JK7I#W6MM?=AVt_VjGD&s
zEHBlB__o3|<H&o6WB6H*B(aEmY9z8T7Bo@VU}Beg>~=biqB|{S1mvOGrmkO3jX4;@
z8jX@(_;j3sTv68eGh@BOf6chX$a@<SY%$O?YJ8#cN@8+yI50Zf_F#DB+Kud<#u?Sz
z4TzH8(m~(FtGKNOKyvs*8OK?OX1np4Kdj8ib0CpS%r)>iQzgTMQT&cbzz0ekk5EB6
zBq}cZ%&MLoeWh6By0q;zD5FMt`~XLT*U1NK19Rl4)v%yVB;H_=`<s8B>=wpr@K#C-
z)p+EtS)nVlFaz+O&Y+JlPU}+2qCRP~wsQN*pJ`-U{GJ9gsKz!liCU;&fh#?vJeOGT
za@V$DuDk7hnF<!yPF;$vlRd<8H>cJMAZJlhV4#uzJJ5~J)~uDiNXiJ*!fa%(2R~?`
zWWX~8bWF=?Z)&*@Ku&hifb?XXQZe=R?AUPN_w2PMNM$*@&D6*)VNrYqsqqKVWVj2W
zwZ3UxqZ0UPrt0VB*WG}>cRKLf<S}bd9#TJfPHREVXB5Od`lubCK6In__UJ-W`V4T7
z#0s}JgMlX@FC6uJ4@0{i1Go|YrJqp_fXl@*dqR%KA1<~<%$D|-1#7la3ng^|WQD+>
zsoD>9K93Phl8}YKdO$#PjUyaJIDI|)m9&os0Etlgh8^M)0LpfuPhL()TBs@=bW!*{
z(k+*NvCywSl=g8DI10o=$A&7DgS||m6HutZpatAFC@a&wX2B5aTL!&O^d-Yy2zBdN
zLlJz2?pDD%XNP(J$|Hg8V+uIkHBd-9I|gJp?^uo5=aUpOHFy=3!W;;oS{<BOhC;g}
zD=OC0_cl5MED8H?55u^3S~Mbw&t~e|4`x0<q_LJVjg@K3dm6+5(f+Tm&%ePpxCc)g
z69Jl84uigR=-Y$yy6Bv*m2=m2Tth>sNhKKc_d#xM^143I29<1P-RSpJzulc0WfpD)
z{|q{GW~_m>yI;@lx<2}n!325F=hfZ6=C-|nk&(V2R>e_k2PE&%TVsK@wmtS+L!zN6
zb-{Fc&lHf~_iaNY$$wc($_A~WHd67=m#Q8-#6L;wdEdf$8<k?<@*rx`8zO<NB|cjF
z@vLWm^7lp11ELMvplQyyXdax=F?aQV>VA#(XVO02L4Z<Er>%L>rWV$43dE%E@J(>*
z=4{1(fep4C1Kq#M#2)cI2nJ2J+V_ASQ6tj1C+4WbEIf(w7M)8hYBay`Am4K(3+uYh
zH{KFJ8SJ~lUvP}(Q4x@5>)!6m%)P=Ic7#EIjtOXjA$uoNUD2WfR8Mo$^zvJnRZNhU
z^i1Bb5sBA*E(uxi1qZ#XCutRe@%^Sm%bLk5Ql!PjS9};uf?p}wtGu}jcp5?Vzy(Bt
zu9gX9f5C4$Lw-j2TaLU8YG~rMe|T!h&1!ckmf5B7vA;72Z{~lYE#Evjr16?Na^a&1
z`u*4HwKw(k6-+IsMaNgd(g8odOW@4QJ9Op*O$v)34gl^$|4@VfdM%2`*sBq#If``b
zoxhQ|MGwOCpoA)}gYVU`$|53#H;A?Q>z`|YGR3iniksdA7A?fl4^wDvmOxNC_ZMTA
zYSANsSuj~j=ATe&=r@b^@<m=n^>>u)>wF~&5J)lXGy$aB9{i^Df)0#PedcXZ0Juyq
zeVsd4E#(u7xxu6+@6-XEZH07#+514fDr9dDIZ5F@z=b@;5YGsqZBQ_>VkL1q@PtwZ
z&?)vRj(E?5d!<b}*8sbqJ@|x<i5<8QfeoOK0}aY$TI3dFEq6-k<{MC%MZ?+#cf7C>
zi7re(9*=AsjzoJUt=$1QD?m)UmVrkj*^*=a%;RhNFEniwxLxa}?j}1E<~cc~9-rIA
z4Jz@!Tlt6s0cPwBp_Q)3Yh>gEodPX%j0ZlzCk08@D^yENm`r2}jG*o!YCFudAWa}V
z#kQUck3>G@nmQiApL($YNqPHK{zcO1N7cb&`$&MX)aq*MS9l^K$=s1sSYo8=s~J&-
z;GaMwCz^w!k>D$lgr5T4d3we6iCFy@X_LA6x)}-B1LTevB>vCf(<*-Y%`JO(+f4oV
z9shj1!Y&T7BSir1x8*L_IzQF?n4+>^KPKNZ=_~0|ZUveZP5{^ZY2Z~hvkAhF^s$-+
z$a{cqBlX-P*@kUl0FGWU$jMJO$x~b2Q7>&KXWKiN*WY43|M-kZ>T3XDki|qq2);EE
z9RT`oJ*e<JjzGo&xM`d%B<?5H3Id}Cjat`$>yKlWtHQ0WkKr{=jebilo}BZYbqWH>
zGW^;tD*5@&RuUtNP$~Bp#55-7-}e$(*fO3_0_g|Biy*PG08sd8q~C%yMGZ|abCi9`
z5`ard>Q?o=U8))uHT{JL6UW5t)n13!+^Xr@fasM{QbZL)2U%aP9ya&vcT*m(w$4h>
zs~WAAXi;Jlj!04udt~CNI=<&Y9`mLa8;Bq_U{QOZvc{rQLSw39D!78gns6E7fi+2~
zU(?E`@+if&NkXnKfc75N*c%tVy+Y|o$L=wmNPe~Is3K|!niNnfoQ9+RqY82UIB<OW
zECTGu*$RsQ2<Y=q5YTUNu$W^J`FG!6EQ!CLhy+2o-Ha@<eNHi2G3ao#pbQWQ8ao5U
z+{=jSPek27GiIA{M)(Rw8Jo>i{qM9V$tRNiEl1-}YN@JxAVK--q?F)?df+cMUdMn#
zE*VHr!|BV~fie#t&EJGh!k(R`7UnNUo;DFBdX1WtO7>6f`j3S0mSf<!>j0n&dCf}%
zSBti?k_8FieSaabuYf_HV)oF82mJc#6`zH@iMgPu%Jh9lm)1yHvt_7Q#Srrax(e25
z*EfY3#2H^$jJ0YPn2or}G$cfT-DBWyZIcmFto2QmkX7jq)x=yeT>Os2JJ5pXH)-$k
zWr>eq5eNPSNB^!6Y<cuR+DD}aGk1d!?F;f>ZFwCw!C;Tb|Ejaa07MzH$mrWuEE@tH
zuow+d26|bweuNt`>Hbwh$0gq$EF80~g*5U5MwV?7LKNU$nma>A0m-}A29thk6x|>j
zKo?<FWO-DIj%>Q}@-EkB)<vrG7O}drAV_djf8SJn=DD=$zmTW9Uk!g=0`6YjC9DaB
zKhG`UICc02eB;U*R3D6v369>x+h0Ef+HqB{O#_zzq`IfVIfUZ6>_AUN52kp4!+1$4
z?yX1sCG>2GO3)H68s8)qtLvktCImEKok2Q43r6G9ENISSD{Ao+GIPs9V)sczSK~YN
zW$Y$INK`;1lDE7y5S$8X5?*n(0x9q-K7_@u_#TW6r>8*5Kxx1Q1N~h?^u%Rl&*Yk-
zkC4}G!__okx9}d2MS>~b5jRbKk!oHt7z8qW;MA?~s`0R3>ZTyt7O4ngObidMSBdYO
ze6V?r@=BuQ4K)S9AMjLDoGDR(l`%@OPHwf^Ih4{Nc@;t96#20}>%t#G<K&h;)L>GB
z>8-qV)E%R`=4Mo5Q#d16(qElNy-b?*9VtwGDsq8$O2LCk@V}D!@mD|t{^Rj8n%#Wk
zeuqma*PUM2GCAq4taEQc1gHc&$fmj;kWG#-6on?<4xxQK=G&0n=g_*`JB|d|w{eC%
zg#YxpyAj<#m`4J@!#aR0ro*?dy=gV5YAopX0dRCdq=za>P1`=Nb`i1?(CoQ#<&k+Z
z8L^()gNW@kQTYUQbz^t6|Bt=*jB09K|3$4JD8gDGVxcH5P*FsBZz`ztE?q==Cj_Jf
zlp+=c6$`ycuaORc1OXKgNN6EIfT)xJ0U{*?5<>2qwb$Bv{m<R!jQjPDaU2dmNSK-P
zozGjI=lPY$j@r-B|2S!@{^Q<c|8+c_pB<?Kj@YPs)uC^vS=GqD=gL3&T;PBIW+JfS
zSe7LmU7rP(NlynoD*&H=31D=8#>qb+fP41*&C0mWsuT3)zs2{xvFN*SXsqz0Y)DM%
zX&YV8<3xc?bOmezdk*|{!udaNCH@D?=I;UjpB#<<dlA;S{NFM8Qylmo`@{cl#w2Gt
zwCBq-IQk|)cNJLgvO9daDX-59b830VPc!^4J`C#z|CZ_ed!o+YQ6F<ggaTaX`ck{W
z+>lyXMiT27_OhIXhS9O~lRK`_+<rQ0K#}PDaI^TYvkUmZzr{EHKJWKm-RTU?>k}5T
z_6Be{FXXzjKCADnW);X}<-_L-F`F4qfROjoF@~(MRvqfS$p#sx3}qx898doz6YD=%
zR`6S_jv%#ig}2X#_avyM>)McMwZk)S`&gJrrEFGVD#stL7E-I^_baf5+CMN-_UoO^
zXf1w+44T2L=Z_HTclalD>VI7h#ucFIkzu<!keOL48}e2yOYbi&X;M>xB_^CRy1Tw}
zbq;hwu6ork`yo&Im3*CxDFo83>oiH{Ow9iAnE&IQQ&=d$Vi$aG4}7PY;+u38a7pBF
zFYJ7#LdUKXA*{#a>$DnYROs#5lfCEGbuIHSj4UX!)H$R!46~AZfU)}RrcU!;RX5h>
z|6ecAJsUOUR-fA9se79zbP^pi$5gM5&0&p<v6yg+>$9fT((co+re$RqizZRON&!fK
z=}gSti`M_-X#IN$RGN&k*XTQ9-Po;fja>>Kp)<)j$vhWtf&_v^IB=%V6MeIs9Ku)J
ziOwn~xrVC<bfVvaDj8`Sv4JRY?VsT4tZ#!nmrtdxT1TJV+Tt4O1*c${_eU$_xG|p6
z)0W;U^@MJ5-;9+Az+BRF%M}T<m_(1Ls9r7*Vev`56IJ{Y)|HA?S!D&FR1~(POr>&P
zk@stSC=#l^OK{dR8=1`(vTsKK){ILYeGd4_iM~uY`ggVip8Fq>nX#hRfR;TKEa+)}
z?Q1!8ml+Pfua+CAU+g1)#X80c=y`X7pv@G0sp9)3n2c;4q@iDI?`A@fRI~`))O1e-
zP)4e-{gm>enL9m+m-9w6_zhfdDZwQX(4xyw!T3wWbue3$V~jRad;tj24=L?=A-ZeX
z3>4j5$+>wIwgV{uapsZO>YlM))wS~YIBsiib`Hq4$6HdNfL!%$9th#~g0gl>%oXHB
zSlr<6H&GrznW3=bVg_3DzX~1y<GufJ4D^1@dV1Z<)^GknTGKZe(aMZ{WwLNclvhVm
z9Pq5(g+Kuj7jEMgEbM)l`@Y1Vw5yshE9$Me?$A?aVt!|yOhf`I(oxot&iJX_qZtG6
zbd{J2Dfsfa*5w?=e`A6I8Y5N6DqGsW`gIv|Mh9{aw~D5o`S<r00T)3QaAW-ofc!R)
zQy>Y54rJwF`n7PVqlMX5uctQ*nuo-WZyz}GV2`GFt{2RnIEqsPYHNjn0o6<J!h;%y
z)ClMgTYL-O(Fe+HbI&<`dyM>ID;{EG@3krDdsy0C`u%#AgYQ(3Q)DK#c2@%{+Oq5R
zAgXM7$@y)9RAAs55cQJCMLCXkesc56a+(@{gsuTIxMeB?dmrM6MU0fadFSb^?!LSF
zS(-Tg=)a0Cf>F^GIPo@7O4?~AuoRe8vSQuR*TeQG_Au6#p=Dp$nODuAJ-SioL~k3p
zJZ9RXuq?w2CupyKJ-l`p3)-3{84(KyWCokjRb^l489RmqC3I(lE)&X-C5NLoM?!F>
z;MgPu@M1&TTj-^=A9b#PdsN}oy+z=H3pb6E>*vBE_=-YFQN3$E74T70pjp!g#CQYM
zg#fK7BLh@Xgi*nzC+Z*Qk!ox_4Lc+uI;~Bte0a~yHQwDLj<3V|uHu{Lwz8Y&l!Up>
zU;mfo>0*i08c_Fg)wzOC8>y2L2JRo}9lH4T$E9Bk!h46YE1jKKfXywBQRWcM8~ja2
zEWyq&_SGv{10Lx--=ffh<yu#rP#hoUfkq&=s_Ax3V2qK0zKOSUI@k;>)X*(JUKib|
z3!G$IKzTHtl_M4h5y%?2ULWt~LJiut);<=3kqOy8$9fI_n-DjA-TsNQVT{s;cT2~;
zJMVq#->(I52l8Px7;iwUb0k^HvOv=;FttKwfcJjQ_<Yic5v5of@Y2v%<AQ>gj~o(h
z&K??T=~FQTviSoo-hJPteZR=F;xr>E2{;vm{xuW2FkTozAN8QVH*dT)sP-14_r>>2
z1hp`r{iZcgKRh`HzbSZiG9LGCDa2Sr_^%T&n3$S>E6jq@KA<=JXCB@h2Rq@tkrl;J
z#Ic2ENA?I#0*k$u{9!u;I=`~;bN<*@lb8i>Nnr;sd9p{dRW+-6f{*7<$7R@Vg=n>R
z&E61D0({TCA{wBwjh?t#l}kA?YO2uEIKF*nPh7Ya^=TmiFwpZV3S1xH2!!eJ{m1^I
zuCkVkf3ATboG%JG-3OO62WZ?RI~A;|x?2p8%-v2&?;J@DagZO_eqdf%mgVTdqOJpV
zQXm1Z1G!DTh3?$9XI!JbYc-R_iCa%Wydh=jy22H*7p!L^BEs{@6QEsR)S_$88?p1)
z1Kk-S&zXhs9mR%yt{uMYOyX_cgkg>)_f<@rQma^CgX~2U8fga&s2{B9njN-%4l-RV
zccJssClAujt&hMi>tP~bR2qj75YF|fh%jB!Z*ILny3_{<=)5ConwS5VaDE0nncBOG
z!Ps+%zBdDIKLY_1R@gVcqZ%W&ZvVMX{q+!<s<cW4meduCESDtUTspEO<=Fh9@{8a>
zr<s|VQ#x!9(O{^I!&v7D7UuzE_de70{Bq0k8m%FZ)>k!~{;FoO2KXQB{UJajDFDnZ
zfu;<=)$_ny9``;f?4weN5w>%l3cUIV5aWtLj<Xs8P++bO(<>u+U$zJbG2vlNp|JO$
zn3cx>CBM^PnSLqU-lZ8D0r;$Q0NPujD>(Ve<S(Wd>ns0Bn+MDNKj$X+<v;1wAArKX
z(7!ZmPk;-<z?$)&3m2=bH5pwoYU0mVk-lj0-*<lyC+1){V_)?=m6CqV0#_@8qJd@*
zVL_#{m-S}zYt4Z)Zi<3EK!7BIv@Q@lnPw#TXLda`OQsia5^R!G5u$m4|DVPR#CHw^
zke{!IZ2x)-mcn|v=;8Fut-V0Hci`_mstahj=S0{|z5-QVSprD`xBVdJe~|J2BPQ^_
z8<hb{zszCzI-x%<LwiQU*3ms;%EC#Tz>w!ZcTcGU&5@^dc-tg(XZdAyZ^^LWxb-T{
zrvH9+{9j)AzaL|rp+Zar+8VY=zdHjoj3+BgCj#^BzZV(SqqIz6VILM0N~$RHUM2Ca
z@~OPdi6QDje_BR?9hvnf=Wq2$5Zs6e(A;D(dq~~0bHJgwcYfBEl@g=kUCR~TbJ=^S
zhp!)j*qzv)%-Urjpx56w+hLUkywDVQJsapOsT;Yu&w8Avdi}vxG53sUl}0a1>)kqb
z87=|1fOi4J&lw$g_Z86Kdazy!nZOv0M`dYz-D#jY)an1(O2mRAoBkkR25)zQNx=?J
zz2^|_>#@JZk0js5^1Yi|JZ_ol^jsmmTf+9;LY9XY!)Fzs0vM83a3yhiAW$-n7>5q^
zD$si6fuixWpF+6CyQyhX-*(LVbWA9{dZdaZcRLrr0xObOJG}2n<ktk7cL+(}bYnk+
zx|NqY);Y{Ni3Ffua?{eA9`;{{kdUDO4nH^$=VP%s`asF|d$wM-ZR41}r`ls-fc#;G
z&~_f!gULnYe~yN;rf(Gb)V<3?c~jCChW$qv&%tA4nGWPKfTxv4M4$P(5m_cTKIAkK
z2yK1~7{<|C=H~=;mC49Ty=@#JzQu*%OHi77O|;yK`K`0UeLI4rRyoyDbUnH7bjYsz
zx&gW71Ax-bfrhsSF{`<#QjQo#EJz|qU0#J4ou(ydK)&yTEPS+)0o68gqkEHjXaq=p
zX4lJlalYw3QxCK}lCX-kS*?-yOJvoR3gWF7b6*yRDdi-#Os2+<%<!J=)SbQLi8VpL
z?3S+P;0OLX$tUn(eNcKVThyt>EMBZt%lg6}*DO;WO@#~kEW5=V_m*x5qwfd{+usBD
z!E@`2r*ZmUHX_LkCg?Futr~k}r8Nxbdm>RnvTiX=ECoM$PrBr#zNRHbvhuGoq+8l^
zB($)t=gK96NjG4hhi*+Ag0_*qHDV52Jd?1aP7ePCNFOCpT$PwJ;jjg};F1P=Y-;Ii
z%&{*Y$f&5WT9-+XLR@f}oKI=#RcTl}P5F8l&qNG_GXO)J;jG(Psr+gIwwQw2jKfY5
zS0<_rUk1LQA_MR!(F)zCtF0Q5V=5X5A-oWh&RGFUoU|y_+FkgmrtwysfBTmLZpW4y
zP*F=~KTh9!30in`Gb&Sp_8>a|z~!zor!P04T`Gyh7^$`M8d5tkyATGXH?IaKj2C9>
zo4o5QWb4Kv&@saladk$(wUn9NBOXc)&59D%AzX-|mXoZI+>C|>{s$N!iWNdY<;|+Z
zzq`;FRqU)qjoaPXGG%eU@XN$$u%FLI>7u4oP}v)3xwh4c@E}enPg_uCQ-wSW5%O0P
zzU-tlsj)-n#kxKW>EnyA8i4%((*Ls&hIX`5jt#qCZ<72X>OQsRhR*;zT5qeX5GsFJ
z=##&naKGA~N#QNfIJ_N+87&O&pdA@T{szNvCSJ3DPx)1e*$})=O|i#Zz7Fo+i$0Hv
zsmJ+DH7$(w%aujG@2AQxmle<q=hlvrGxErMEPM;iXcbjt(Xa$zF?dn4FvlP@@r#pr
z!*nvqM<%l)n!4N4;7E$>YnqCz496AF4Ek>1ZX>crU?1qEBdHt}t%6*X$`a7`k<n;&
zdlcmmtft^G?gk`OOSj`g90rJ~uovQp-C?;W>ic^_xi;T-mi2+%)49==wPvrQ*(*Eu
z%^Lr!Y|L8V{*lER9tSkby)Rkdg-dn~;(rLFm29M)?6sN~xyhAQ%|1HM^a3u1Rh&;%
zrSiI$RCWSMrupyKB3nc|AT<Nh?k{&YL7v<SX@$1R`rqD9dv<J|w)${;_hBF7#8g??
zoczif`x#VjSIl`Jw3>JV@t{V@{~Wd2W6xSgO<FG?qkI#PGL!~__{)qb^?TeAXp8X`
zuq@8Uo9a!zYD#gMF_X-mXV2iPRioXm6>N5*@74HTsWkw<(588V>j~1u8|WPCD3Xg$
zrXyVd_f$Q?N4n<@Ai`>g{J5LPrr~zj`l6zrQFM-0i3#-<*SOjInFlK%J>Dkj<D8G_
zzy|Teywl?8EtCN46N?)s1U!fG51&+Y<F3V+>n5Upa+i83!5fo~b0H!JY?z$(;!2<F
zk}t=y(+<`ztKD0=W=OZfrU{}u$N4@7F)Hl%qy`?213Y=E=*adt+X{R@KXZZ(QgGfA
zZ-D47+c9?XjqFaEH&o5C^C8;-(gf+^L7HK+Z|Qo|Et5kwoq1{^(pHzPTRV5Qs|pUX
zpXc+$=3t#k-{`7+wadq9&5c#QF)A;IAEj$G1B^I8-6^^Emx)z(*H+lq0Z96KgBJE+
z$hU!Qqca_M)x4x?#P9)XmOrW-ricY2xn;7S?!;u-WBPP@ayaBi<b^lT90Tgpt_n+Q
z;$atpG=>O5Qh!hwq>P2IC2=H!47!r~kl1C=(raCS*phlFHgSXBY4p;xme%Ph{z{wr
z0Qfe@gP-jx{lR(3Ln`8<!~T=Tg6i3qsP80p8l^Jh4O=fTy%LjwuXTLF@o-|%wJSGN
zm?V`9v;<4#`yMW1+w_p5R_a~Y`A;Pu6G>G8nM=#u2!7jPKG>x9#>k8Mrzj0^Ijtn^
z^*kh|?z>tR6y$ldCj?<iCK9tnbH-p%REqk_r`PI`V}o5mLN$8C`>><OmAkd=Xo;mH
zg=XIqw%M!AQNQm}W~$%ZDnUp3ziQacv*$+XW^+w#qaBz8REJ>ob}?1ZoMevcYr0Kx
z#NQ^k*umevX|R(;GgVXPVYo!v<b#?9CMfXF$B%F_vMg>2SVuYTMckc~xWmNaUvnH_
zW4T!{PYCY30JPODg05ZC3sMj{O)D8bO8p^?ZF}z^@9bHhnms9_F-^O0E}{I^#U*ln
zTFRM4#@U0<DS{mix||iwLi96!Q7fPw*Gfn!+XxL!3YlE3IyFH!_IeGR>vo)d80d+f
z{P5q>4v>Jbo=l{h`KKjo5<OcCK0y3Ps`^q0yFvA%Aa4oI<-Mt_U?qYP2saBY0#o*B
zMm_YSP*z4m8`F0-%o`PyeUtacfv9Uvoq%HdX?s-4UUz;sj$!Acf^)881QG7Og=%zF
z#sSZrGh@HjcUpgB4n?<K9i*Q^5O^X1IAVs?c>8ww#O~ve%)r8FznL{ja!t+ikQce+
zViPiTA@b46G-)&#>1s}!7@2`?(lN3e7<y&ePxjeUNb<EN&-c_!E1c7~u08zi3$e%t
zVUe~18aZ^SACQOd{s57Kd?$81fKidZkk#8a<yHuDl(wpv1T$#`-kom;Kk+vD3#TGG
z*;XsUUZP0|aJ4w5LMms0p$uxI;AX`lS2$z+HK}RL{X`J5aQgBh%&9_RIVR5VUeVnu
zu_G#*yGTqAL9KRl`wonWz3$IqJ4@b}8w|BhzBV6OL#pE}AgJ^Ggi{h1im{+k)tU|D
zZGJjLA<nl{cHfE~yjs#dZ<loN-_3onmi{x<lLVZ~n8)w@#=RU86(4p>a=FrO`*FEq
z$PD-GrM=IAg7s##a9*43BIiqqe0~M6@MbJ7+IB(n*-E!+*2MWHc0lhaQWLvUdZIyg
zbc11KWY`j36MZ=eJ;fs-;`6>8J5Fuy0kmqRY@X^eu}bev_ES27`3}W^JCFp>2pXS&
zyY`32q>efmurblJtWpl~IB`tT<Ko>DV0|=in9<&EdkdhTrue=cAwQQPh0ykYsNq_&
zBI+Ilw!wGjizn|Kld5NLym;idqnHaHcK}E%R8ah6PT5}Ct&qzWMGWG5->0%oT8+`h
zYr2)`o(_V_@bm6oQLgSez?}2*@If8A-|K?CVU?|KpCW$D!?1oTFMp3rG~?Xwu34b&
zW*;SbkxRg#I?|6+Rv&APnt^4FC7CpC0EmJW^Rn$R;JzbOs_aWv$zZz0ArvFOhPQ49
zf3)~?hqv`W0p+);&B(i<G(=0K(PF*uFZKytuI6JMfLf4Rgv9J<t0xy#`pP^0LIY6-
zx63hN9vq%MS)!4O<B<vK8nRE6to+4%1-4%tPmlqsD!sC@M4{r0lER9qAM7e?YQ)kG
z!X+|9{CwP#j>&l02lkI<&!3s`UqFIt(~Q_B6A{PEvw3Wub_E|FwR?Wa(4YNkQf7ug
z@Y`@+B8BIY{9N*K-t2Qdxsi>bDqt&PuB19Rlb-WmO482e7*~ify;<6C9Jkr6p<ex&
zsekeQWN~wf*FJdTa6$j>N`AlD@X=mQ0k79-IehmR+sG0p@ymHAab1ox@p`<;?iyic
zPnESvE%_YC=s~K+!JX%!y`Gb!yr~yjgei<gdO`GzmIs5>;-(>X=+d9Rl*?m)dKDCM
z4VJVU*N|<FUB0>P@LN$37o)43Yxn-K%GTd*0BjiaY-USo6D4(u%0pH`8zIRzDm&-&
z2+#SXxJ$>H#dc#tR{YiEFHSx;J!INxscuo{T0~HijnL-<5S2syk(J6py0FT9>xfSN
zHz<Yq45xp8J#|;s>Dp_;!1d&F3lr%WB9!O0`ZQX}gSr*u;}*qi#?yN*QrwDHM4A4d
zRAmBOcBx08c8kjPRBpQ{(c_aEC+f<VC+?78)UD;1m0u31AhL-TDrX~eKBMTvL7W}N
zg58XM72&pCr29UlU<ztp|BX*)r0$uR?2+41qNmG;n(UJ+XLe3q?dXD&q(?M5@dU`v
zca_3*-rJG85_dsNb5+1cem`sZeLPa1=T749+DG4`gh@@}pBr&S%Oy__CtoxWD|p&v
z7bS54@p#B>wotY5M|9~}EpBJ!$Cps%*L;`$e7M#^b4umgrOtT-MPce{<@6cbFI=Ln
zXnI!Jv|h6EtS!ypHqKPJ5Jdd(xKz0dR>on>aq3d%fxqG^91WdvyPr#~*iY*na9jC0
zxlMR(*W{8-wMOOVPZm&Avc+Z&-{w6(e{zy?C+GBEXdJNGJmfUK`6TvF(V|3?*jGcd
z-~bH-XCja5Hp|{I*~<ofGo(*v<sU%42CX=10Edehs6Uzk4zFCk<)!%4-!1#h1KPVz
zPE;6rrYd7S?&3z%d?Gu!k<42X4fOrxcHB7H;P)zR?Xa*)Hfc9brvvzNcM5+zZ`gWN
ztiM;CtILE(oWNt0f_NzJtuY_L9KSLryR_DP$o)HN<UO0NCy#IAwRqQME8Q#Mju&JT
z%3aDZAH5eh%KX2n4cTtaf+`dRm)l-6wt0c;YZ&!d^6%V1@xZcfBxf7gblqP{RQB`f
z2{w(-0r@j^|6a~i*RU40xRP~)*CZ{tf{Vpm+v++J(pTk@v3xnNAyIaZ+R(IHSkIOt
zaEUvdr}GvlN5@FlX~e&`h;cHaY>ML`-arAw>l0Ghcf2hF8J|QWDsyp?u7<s6&49E-
zp@SR-yh=}5nm)SE#fg@EB6&xC`S7A_k;~97qAfgPtL1~%D^Aq-{;w)w0^1$H1T^ox
zk4(Ju>EnwBN}vj#Y`GUDWkETUywj}V9C9<W11l#-m_Ba>ZsOIkttW$-)dEg4(`aFz
zN&(cMH=2jvRMDE41%y=@3<G<33<hRZF&6xZ``Mh#Z?^!;Ji3c^q>c)?OxWkAfxFJW
z_>;Od!R7j{p)V+-@pi7Pfvnl0X7xx7+Z8-6Gk95La81273%hEZ{Kj3)ZPB>mF0_Yu
zZ-)Y;k9HD!#I|q}i#JosegdV2hsN<8`Z$4;`4v?7%U)-Q{Fc_WOj~<g9vw-6qRo2N
zltVxmNnF3`xjpj6>m_5VDavHXmqnUxHEY#oOS>sLR9E6)X0LFV<D4+j#}>-p%QwOK
z?iT45?qJ$OZTq*<P`u?$o0#$E*wu#L+q-C4`Ize!r>s1pFJv;wRCT;?#@I}@8H??*
zy80Z6c}@-`*4$&$mbs;zP)=@43h%Tie40GmZ9vk&Z7XNfNUnJezS61=lWfqVV6o%_
z+X9six}z6xtBA+8)lNyF!_ALJ0(L%zaOIE(QzI1yymqHK4&Hk%d~>%d#Cu$eUyzCz
zfvU-00PkMnNjb#y0mCYs#0(&Zze8ZuWNTa)67!1}k%g7<$(-l1hkaT!x~~_K_Q$am
zg%e(21t(k8H`L+sE*!P<GT&`O^;1ML0nL<rkJB9?rqwU^Xa%!HbR|#ZL0+!hnkU4y
zhAd2_Xu~(%q5x$T3OCG_*@S7^TP;B5Imk8?;IX<Jo;kM+NmW;&q%Gdd9;V7>x&@I3
zE!wI*ROV$g@n;(q_)s|O2A@`qsyGI+VZ!Nt+*sI)GRy<}LP+TfY(eN5S}n{kZ9~Lt
zq1i}1(~;$uM=~K4NmuALgE}tBZ+`c7e(P_dz*Djd@XuUZ*mFpCVSWPvMGp&5$>%i}
z7BeEcRD?E=R)it@D2a5i7=UMwTACdu3^DFPPmeTd^(eSd5)*jeF0YMbq8&~4cP|5g
zd-x$vP;h=xRy)NffMs0CbQUi5Tx%#>@oV<%nd;cR{(`f#dDlU{slCgu=|P4@x6YeY
z1+ca(J}xJ4*E%-dCdweAGJDv<h&J{~3pSsyO4dX_Mr1+aA~+rx{43rozM|Z6T8rrO
z2)BHK+eQPl@Abk|p@SJ5xNcd~6VNwO)d|rqgUUm7tzz{<>d6;0D+qg`_Likj?@+8u
z=>fpb#K!%7@V{JVS(z=XBk*L+`Ou$O0zn`RRn)_;GjjKg%AV>6K<^ALUc>zuTaEFW
z$mFl?Cv=JLq+L!};ymjmGCO(<&uG(Q0j?q%$aWfbXBSKP|7a}om8ra2p)GOJI|#@E
zpnnyx8M*(8S1yQUmsreZN*9ll&G{o8Bw4jMmNJsk{2`B$^=j8`jI5#=(;)^X`%<dK
zK=z@7;I+eCuXh<w7i&KuZVRT!Y0B8LNBeE0E^{wcv48S3UW2!|9A!g-&2{AA&ac%1
zpVf_)cZOHS9CY^|V#>Rx3UeNYtGs0kW84QIBE;FpO|OBl5m1GW+!9gUW0QGj_ySPZ
zlZm^a9yTe<QqS96J+3av=Z}5(>m1rToBGa#cmgNw`6~l$korELv}rERVt4zj>O0e(
z6msk#AUe?s>-1)()DY66znts}zV}(n4N!-@=ym$2{x!k|^GZZ;9HB&hM|rQBZtm)@
zCPO%#f_FX6*E<kCC_?*{6NID!Z<9^-Y1hNg<{|UDrD8Q52=<(|55dNWQQ*`TozoV7
zvR9~Zy#Sfy$sGLTk8}2+9f2?^q@bf&*pD(k##QaE;{^5jOuTg5{bTn=oHtGgs3(qi
z<H=F#Lhn13&f5aT*Xx#zmgFXu?*<UErbj7kUBcB}H=VS+(V5LQI!?c4OjFf}@_(Tr
zFha4j=e{tU(^l|9q;B6iM@nLHBTj9sy~}Z4uA`ZM40b7{v^8Mi<6CQS8x!i?gNyAr
z9?o+tP5RJ-h3mO(b)3H=*e1PfNog`ecc}{YQfQ6BAT^$&>=M`E&gv^+XnvjGgRhS5
zSlrQxS%doI8UAWhFY)33qh<3LIW5?dQR$4oa-ORfwKaA!>NPKpZv4bHN*5RXgR#*y
z5S3nr#GsO|yucw<ZGi;K0-zduIC!XW%-38K9IWAD8-eIN$Ts=W|Hi>8vvIvCctAbx
zVHGK|vOVxPx3!aD-$#AK)b68(C@%u{m1MTkY?HeWWqF|i*zHS-e(bWLdWz=ooPezW
zC(iv@k!BlSiJ%TTnXooh16wX0BqoSWZl_QQGCqf4t)@Jd*~fm6q@WdaEaUmJus+i3
z`#`V>2tZyj2Nt~^q`8N}%4@CSu6GnbZAs}iPWK12Cb(0p^^_foRCov208PKB7>o1{
zmAmy7NKPwls*T^k3^ZYm5=%D_Q4b#6a>!-|xC_E-q5}}}&t!hnQwPNFk=>0C4Xp=B
zj!rE?Q&)?5?6#o$!V;s8FOZmjFomuUd+q9PoXFeb{=oE{!RHU%9;hXl4pO~?@^&RE
z=tRo|H!(hGFD!&!MLi)%%@_x?D%w%_t?c#!jyni0`&X2fLdg4l?VD5+`)qgVN8b@8
zzXSI=4X)K)+mEgDkn393lTn<lhME|YkC!4U@^BV+YF~1|gW%eDqh!O;g74!j2(x1g
zh8*I;QM#}-tX>B3Ft()%Z8kfxk;*baISOI4MlOqMP4_xMQPbt!bwM02Azhvv8k!NU
zBqz~!lGb6lfKOZ}*{*dz?#!`6mfu%_MAv$&#zDefbs`d%j3{)B0VH6OUu;Yl?G$I$
zqO$moLan;d;yb#sV`q}sr$c_%CL4xljtf)Ke^f3PJ5S3@g+M2TIoPA15$79=yFa#L
zdVqw@_O+?dX%lkm!Jeim6<1mqPJ3(xI<G{_0QS$4jG7hu>l|Z1%Fa$>{xoW2r0(&%
zHpxtQJCN`9n&lnA+`x(0w?JppMh%nyC?-{)I-9b}4BHW%AJ*Ns=*cUySwvW3C(<wd
z&&5&VJQ9?bqO`9Wq!onwx1q|z2Tf2li|bZ|N9}F*4!(p=7LqJ*^#0unXr3487kSS(
zAt>TL{YYRpSb760jr~4m(9*|^G+<^H<D>%{8F+E|d>>(CrFzdg2Xk?va{VzXIkqgg
zN1YjwM-QkZE<!AbDRgbBkp-fmjKKN25hwh`Q3!6hjVdQxL%AE=J@h|)?%EZoe~RWV
zMu48JJxgt*j<d8_Hpf6_(5wFqNv>U1z$iwp-9CQ@{rSW`wN#*=l0D%QE&S$?_6N?H
z9m;CKD|T+T51-5))Q53h+U?}+xreN0oAKO}oT)GnwzKf*U=^Fm#V6%$uYO3CYYU7U
zeK>l1gb)O^w6v0~(8EDK_=B}Tap=1eS8SkK=MAmH(Ah)E&hGY%e%tu4sBNI%ls53t
zBm9)RNFrO!XD&yNyRFJcMtgEy%oR&tYE?Cz1CSD%Z0lVSpKyEkR?AO{w%=u!-t>sm
z?4y?+O_#oCK1$!;!^yFE-a7{nQKeTjesaG|l-`og@jbqH<aeRZ<?H2ab6@Pg0`?Nn
zga{bl)9Fe^mN?%Z{`8a&910#qp4=*}$_ZQEH5+jieBv{7eLv@1T&q`7`Ba*m_p9e@
zJsynFg2buC7JlLbGeyHQ(K-0MsT%aE^5bWMI%u6o+Tl5k?Ug6H7Q(#kXuU`3-HcE6
zht!1ZCL!!^{CM14m><7KPE#p6u@%flW#$pv3I6Mr->tPS!8V&5#67^~8Xg<-nX}~L
zhLGGw`Nv|m0#D%@z5Nc;N2kyrb0cl-H6foX*;BfYI;QO+A6Mvi((FAj$vWC{GKD1;
z5yU8#?EIlwD|UN(TkY`KY<3wi@V_)xKK%rw*2`t}wmjD@AAU%uD%2cA<r(u>=ZZE5
zMcAv|vna=n)MYEb#XoXg<_^F(v2HG;Oz(Acmu`!f&_N#cAcI<H*`t0=&A6B&yhxH_
z+-W;Z_jSD1naBPw?{q%azG~7OyBIcrwYDbQx?M$PAC}W=b8jBboS=+GEU1=o@Ga$h
z2dVzH;M&g!F^O~iL-f-}{d6-mYFE}X`NW06rV4eia93#Y<rCQIue&<(f;yIO9I|Bx
z?>6JB{U%;+n;=z<>fxrU+fpJalQ)R9#kfk^#89aG>F9wFBZH4W!VFDmEGMX+7cUix
z6q2fL0ciwlUR5sZ(cjyLX*f4?slCRMHq12lGpElF#Ih+fo3nW1#NKgkKFz81#)S2h
zkd;kZg%=<?kE;E})eI_m6y9L1fe)`p;I;L(QCu@(j-*o3M!=YlM{*t|tycpYCxSZ<
z^Xt1nKdK0rd7gCQymvvshG-u(R^TOXa9}#jkdKMO2XBTrS=2QUcDrq-6mdofF;jo(
z6j?p8b!U0yqi<k^4>@qqaha#IJpd7sL*_AQZCKbEVyHoj>hwsLJr&Fb>V1=dkvzV?
zif=*&>xNW+A0+9IG?WJ~2oZ_B>dNFg$SYTsMS^}9q<pG5tgsC~@kWd~$e2=uSCH9h
zy_{q{fR%R5kp0Gz3xVf)T|uH8tZ-i)lN1-8?CVr+9e$kXZ15zPoLot~9?<^fGPQQe
z^gE6+dT)plkLd7(jTK<*3?g_aQ^>?n5KBZ~pzcRtpa>dMp|aqLxKiN2q8i+KbMifu
zS=>*O7xYWQc;G|K5r&b#efSQ%!dV;c%$`<9SP;6MakLxUH_aF477@dwh1tW{>1e^r
zyy>$a!qb$+7pa`hvJ0=ouq-(m*rq$-5c^X~_?vnRUUZkO2=*1kRyL9b>!D=iGe9w<
zrnqF8OhUOzb^mVsHzNJd6YZf$zFeSFe7<y@AHZC|(HU5FE4%;7*=M%+nOE+mv)TLi
zzvM;%&+m7yLMounOX${e^)Dy^*CYR18=5X+C*Kr43Jw;Kp7%~M(zWP&-0Gc-cu|kc
zVf*PJbtl93GcL()nLEYGBc~Wq|CvK-+*c@B=;p|$iimx6oRr5Mf{TxLcFV+xSRd=2
zoJSsQIrk6ZYAa=nbz|<tJOd)Udx&?DCAH-9y(yS_zRTH&eFyeGl)GCo`ltykNt`?w
z#|9N(hSJ^vPz>Vaqi&1-xoxh&eU8l%mZM(^U4})9-neX_pA**Wp(y)LyR(;_6>sK!
z$H(7e+kcot)N2gzg7s9mJ-^qmv2{)!fBu`!$R}k%NZ4e=wW^bMP92@wA(ia3BNrtF
zj^1?_DMK_h31vSYNkW`D_`}s;C1?FMkO^!B{Ys4#CvG9j29;&;0I~RwB|UBr!rhJU
z4jUVY07~{wTTc?~D?!f1=c{DVm!Q=ei5AGc9%=XfU@Nk!u-j`kyi14YP-5J>Zv78_
z1Te&S@nJgg_k%{15Ig(Ez->~FXVl$N`$c78XmzS~(CX&8NKP)LocfaNR;>QK<I(-N
zLqAV<fKXvRsP++@R8R~1u99vBPw^H5#?;M1<^pnN$G>?89X-{cJ?V#cFyeKXKY7M8
zejcoGP@CaxQ!SQ8z$|xdu$o3XP@q3I3o$FGv<_&Xwr1G{d)vC3azGy@D(5Kc(;c_c
zEPmwXi$!-8fRp#ZC-IlY-vss*|N52P;`6G6_nu^H*j*DF_FK^V^i9ES_OsJKbFBRP
zV+3wY@YS)i5;OES^_i8kOEy0$B<vdyLfHma!8?R{nqJKm1sxTly;~>K+oISq_fYeO
zT6O=^6V)dDpDS5fNSqq8d7$3$-A0qdtmojGa?{+Qz+v9qw0f_-Z^h!D%T(!qzdYqO
z{mH|tPs=MXe*YEZQuh1xrguCB#rd!)$+)*a^*;@s0N+MB+Td`l;OVVM*}D!7$qyEq
z^HA}mliCHCE`oaPD6`V+78sR*5ehPK?<67APY7qqd1Ilu*?u=9PBl?{a{u6G%V2}@
zNg<^JCkn&s!m=eAYESQ1w(=Zo1AcbU-U;Q(-O(A_iw4DckSKMW|5{J@aoS#^X1*!4
zK6-C}nmS7iCu)g()dqE{xCSYPhp1^h12005-bUrF$UBFKTvXQWd<^5hn;gRBUqZFc
z&#53Ojm@KaCa2tVq)hT}XZsyjtx*m9s0Nmk&KGD~PXE$%pNVkDhwj<Z#c@<e@vw(=
z)DUIM?&5`nOBx8TtW?}+;L4DE|7T-m96~7lxtP^q_SY0^L88rB5S&NI;YDJ%O+5CQ
zOv3%uG>+OQZ)~F7f*;<YW>PX`v+2h;1tpe*^`#33sS_(xRliXb8bE{sSLiP8r=-U4
zu-(Etxy*-=^z@eMWg8v22W^F;$zuyCDHeo4hXL4E@j2fo5h&1BWY#mT6l;O{P;x?}
zP<H+mg7Q#8g$I49pW!uW<*&wnzV4p@uvqqofBFk!w^<l4D}n9Z6QsmAMLA=YY?12o
zEhUmt!JqsimN)P0cLWs&=%h80@{rJNtQDu-eCGK(ix{D$oNP9`3&yAAMt^)bG1Jj@
zj;l6NManqSp-f?k5_5L@vCIuJM2CTX^T@M<-!D<^qxGZL)>HL$j=EYi5p2!zV~-YC
zWkN!OVB=GeH`C33^&Nf3To~A)x}+l%y*}FfPL_KQTs>^KuOXMcLKv51pPcqT_?l&j
z6ns;wr&v;Qb5E6aOxIp35$pZkKM$M&#S|}*Otz-+{V^8G7{GZmC%62JbdU!v6FCv{
zOm_<!bNg|1?U69Y&4ALqgaCGf(&VZ{TT-p5G0#}xN}iV0sBI@M9q4~98av(h*$=B9
zeN_0@7sSNNNnt4uj)UT0a<Y4WKH6w;kNHx!VD*5=?iYj0f>wvOGmME2nULja^UlZn
zoGUw<8{50y1HT<TBt{!Mi-Gs5sOHa}`nepnxmI%R^==_)^_E$KMckO&f+p&W<^a84
z)1IzqDnd@aiWq4IiWs3S<H9`UFjL;P7E#RiGJ~E{FGZE5LVB{ssYa2_SU!1}RX?JZ
zv|V6(HiQlZ;-UJ75oheFKNnlBUFr-adjTx@1-x$Z=~>>!Mt~F96`^T_;rs)%8BR7h
znrc<dv9u+fY?aDR@ro2sP*SjeKhFD$@8tEPjr+Q<wRqK=Lf=Y)0x&dhPZ1+sGgoWo
zp~TB_<E+HXxamI&f5tzDEiUJ(AgK|paQDgWy_P_P?96S0@$X>~xf|4=sgGr9EI(%R
zE)!^H{!Vn)2g-n7pz}8xPRa3yFmAeL;6T78;|XhY?VZO3nNa%*udl^t@QFe?Bh+Uq
zNFVo*El|p)h5|F~t(Xul!5}y`te<EN5Q>!0e37EtRJJvav(FPBr6Z@i9io(p7xS0G
zBE%N&?+mvL8^Yrbyz)V0*-z0<l#sk8-OfV=tf?w#!SygB2@plb$30=Xhi-S4s%L+Q
zHNiUzG<6os?Vh_%JDNjo+77x_-vrJC5hKuq-N)@UX$OWW6N($nkHiK&H`Sw}2lI_+
zzV=;ed+d8gJL_)~PJIZ*g5jr3v19xerpht&2=K7fa;aj*ScPx5vXFfeh9z_K;g*<d
zIEk*~*P1ZSHFl%Z%ZhwblYZS8QN%-3c_NWep7;qSE>ELZM>oa=U*o?_YMR=<)aX_;
zNU0imgt*5#8&<x}u1*YjD~2#O##6SWz?98RB_%BruJQY#fiq|r2Epy+c$ig_CXWIa
zcKPu_WjE>?hPmyi;*~1vl!Mf#WteS^Q?|}|v|nrPXcn^_g4y7lADR9Wvi?x**ONc{
z6KG&YG86|?FrPg5)g=-6#B9I(utyK2rFeK-b3bI+RQEEMWRRMAFE}ygIC7~jY7`7)
zym6zpOL0YVIbQMn=<)jx3+VS+_S+XSa(#PD*wzm6jYjm`m_E#@!_N1uj(yWBboh%1
zdd==f1zd21HW)mxCqF{@Z2SW9;(fj&sFAg?+@I$`-{UB^GF!>UNzUKIt0D@_fzx?r
zQ*`3Tixuo#reXH)+uNV+<r+UCtiZYcWg#+hq5oK<)VcGQohNWzI{P`~q{b_2grDrv
zwqsw(2^dV;EcsWKVqzahvpxRfgw9B0?#sM)Ci@Mh59ry;ZplnQ*W9i)S8Aw-T>JJA
za<KnrtRjR1amGu~cN98Gz(sqKon|C4mo!EutqQ2c5Lm8L*+VwjvYrq2oW43-OJKgU
zAcHvelfN>rgJkHuROzxX5hBH#>AVbitbC%Z<Ib?N9B`9xs~CA-UxMDd9o)p>Zp}Ad
zrH5028_h$`q@TmBUs<t!aOp|jVAx2L+M-e?uwO{gP4+&o`qGcR^doTO^f{S^uhca^
zsp;r`NS{w^2=&{Wkv5>3d)h-Vwxf%73FoyikxyD`oWyhtpOKodp!iK8o`l<1+^yM6
zRm7>MW`t7rMMbCQY-|^;-_PZhzYZ)ys!?8J#M4MPkQ$Z}x69}aIR`y_B*fh6u1pCI
zQ`is0H9f{~>NW~CoB4<~=6ZMi(E_c7b!jw7{Dh9Brgmo)>Y72RkG$i>kJBFzd2uSq
zo`l=?&VH0KxcPwu(z(h@!PK>L9bKEW>}t<=CXB!eq6I_V=CK0b$N(`{f8=9O%15l2
zHfYnE3$?Qx7X*D;fgL?dB+vbww|jHe(7N1j+UkO@I)biTC#=VK?a9P1aqQ^<p+|C0
z-GCVi%Cwq&pE<}<0Ziow4DycR`5y7f7UyvkF6U`ut&d$&pKd>wb*AdE4>dR!zzrwN
zCr??d52!ZxA?#%H#b#w1J^PNbG*TKo!a>6+y4+%_Zuq(%%oB;oIvy{Pu*Bpd+ZB*c
zA&BHK2fN^+*&Mz%mo}yn&+~XWUh@#feST%4F4_Sq|4vZfequ$XgsevqDbxhEJ!0+Z
zZGfjF-Nu=T&ji4%o;ux!S&f8Ao{K%zf8Tg>wfO0YAV=xNx>%r}*@-90TE9Ybq+K7R
zv@~ugYk{u`%2<2=RZ~AY$vh;MXzU@lLD_siEm|Jq5B4DgPsb6;bFmtF9Cf^sc%y(`
zEBdZp|NC#lK<waNloiKj>baFXuWCs;O_!uMiOX}yo7HQ*FxD0T3ns}-fX3wTKO2)g
zLg$QtM;L>-xpHu+x*A2^wZNZz;gj}t{CawR->Fmdk=k1kB)Zt+>t@M?o{;hqOJ1|&
z;p-Alqn~u1`^oW}(Ual>JX$v%J>=0u7X=8U?C<FHKj|v)*hzrxfKtpuS0t&yO&)`!
zmZ!Q2k7OaUL)8f+n!|fVFEVm-+-s7A!a<lT8XvcKbf&PoK(%#eKtt<AKnI-T`p)FI
zN_eytdv@^jC*DK!j;_$`17`5n={9u!%R<}{FEI_r*5$UWPhMi03A`sS_0iov7;f+8
znd|!Y?1(Y2uVkts`U&R<#BqFhE2b>b<BIA@CRRnVv~nuYkute<Em-=dfD&)zx7%5%
zIk>N}Ey!g>APZ#3z~-7UWSCJyn|Udag<d&)cqLiC@^nx%y;bp7wBcKLpfI;e)X*KQ
z2F+lP6mN-XU7ns8ocpBf3HgMK?>b^W{O_$OpF*;VrydL<7TLcZF|R$Lv+{b6me@q1
z%2jpxtL|u*6h#YtHZ_8S9f2ynw^0v8jACr8S?+VUuX%8TDTj4A6aOlzc-KKsKBAeJ
zq4M)*UxlTg9}RW|t^w)4sK@}fi5epu*ca$4k95sV`{WY^ouOveIDIc&1wWJI_@lKP
zCH9qT&6O$LR(E929|@F<7;(qtR)cjlTA66kv$+~>p(RCX{43rWh67CI_T96GYh{tH
zcVwO_YSp#)z1L@BE}XfjNbYWlnu13#waP@nXPalnJj5)L@S9@SGj7C4J0bNhUa!Z7
z2!GiSY`sHm?OE&+ZoX?q$-7+twi#mTG;<)@$QFqdk9~JgXq<DX^K^sgBB9b-##F1h
zf^^>~5r}G4DTU4os&&rAy4dPgI*i;;G}w2^Wy||Z1(oZVw5LqM#2+{iAN~d~!Nd?j
zBE3M`qiGLzK(F3hW6ZR_Vq=V=HotLpi^p_1;P*D-pga(M4BTOE#nx4vW?n<1K+?1v
zIKhJpabP}uE^m><2Wv3z^UXW!jS~(h-cUQUHk(csR7|P868}o3u&d6rUPB4TwtV>L
zy{~c{H{UXHB!@UfL%Qk9j!AxO_9Ct!bEhM9VGeJcekSO$2}bPz8PK<@koU0{2owqh
zD`RuV|DzXrY^R>1m?8tbr?QT_mD@-9wpX@pcCSkKh4hVz{Fsw0^J{Kh-^umB561E9
zphI7|<&}tJAKahjAX5%r+?vep*5|qx@Dn4kw;(HTG0^vfKu5Qh(OSmGIR>{1oXTLY
zNSqJ`!DPJFO!D%dh<g~gTNLIMqV@RYrZVPqT0J4TMnK1RNL6JXo){6P7Tk5G(Ssfd
zrjC+upt{>$_zs%^xcWvoA!Ot+njYK@`AOJa`u24>UXIMfQIHi8Ohf3*-tijNM65-Y
z1gozQwASc5t53a3@#J)Rv(?uG58d>7!YS8m5J=e;4GS6y?G(9$6ON~wgI4VH9M3+V
zlJ(JB@hJj2Be!0k1AmqFbF#b}oo4JO?FF{?6TQ7Fep-mVed83Xe`n{%-WU`sV*Ql1
zX(N^{Wcag;?!eUIDc56@g`S@|^7PA0$$N_&2r^ZnDgHrG7Bh$a8pF?OCE{RCeUfh#
zJAn3F#xw@z7ycs#ISXd*ZfRGErt;Ip{*uI+CiuOnoVPFNWoM(xrU?4}p5ek~Z#~Q$
zXAvNtxp{S_m}R(?K=f1~wIlP}6(94wECA5r1@ta~>^QM+!IFnfj@We1q!ctzVzmry
z0_fNIc^+U1<x>Ui&Ud<;W(+N6?ycRs_=p^`bqs4}gG!7niNstgH<5OS&aj4WgS)U!
zs`DHpnHRS?5wn)geNt!~3_!7-Uqxg~fo4Z`)G}hR-Vc*0L$s$>Jla=YGe<JIGi3I5
zW5a7jpfNBgN}#DH_u7FpVomGCH6KD`J`GD#S6|WAC}@Qaf6F3C=PsHTWRqorkL#fC
zughOF{t~PGZBrgQC#Lo^RGs&n#Br1&WO)-^<vw0-Abw0|1^z68EXt7#_bym-T{uia
z8AsJsBTWQDGo%8+$evCol+h!7gwvVkR5(o{<fxfo=<i?_=X|aBK%hinoky$Fc4tq0
zg>T{SZ#J}k`=JfENVWHDVMabh_S=l<$`ap3=gJotsG|EQ65KH?NqxXWW*o(~mSvr>
z_`=az!5qtkDJ4ue9@|c<;I8H8xzs11aQJtM%(7G<fA`iHLIb~%=F|s?tD~%vUZe1E
zEUcu^hu$aC5v$Q`XVZYS-c#m*59pOk^_*wuOS3Mdgd5z2GS$yi7cT2kqK2t`cI?(I
z{{2_++J{9$ZsFD3`(f%J`0cA-n%ZU$fX`#FYpSJv5D_1ruTSlNpVKFJqcEfP0!pwS
z+03rH*mdH1E6nwVxbgTOPTMB!W%MusrQL7hVP(C<mhSDLTAx-{uv%-n_G_+3Y+Btw
zLzYxAzU$<B9`Dy8s`a$7@mUQ4Q-5CZx&I1I`xqr9+=f4SzItVoT^UoBUO#C&7kUrn
z{NBQLg{0~XUd-jFjm+Z~x(<j?qBy50q&@>kR<LHxt=BV0&a?b=Vqb;ST}a4yX}-&>
z7b|s*_KbdM?~5Y+cy!Ixz-dPRX4iqr`hCwO{E+aX(g_tq;g-PloH>U4Frj&d8!Vj^
z#$`*F6JM=_Ay6ZC>9>XK6|U*ebX~suRLBnUp%^hgOimv&GlAMW9-NZ`yW!inW&t(l
zc&mxwljTZ=U^>u*B^>a<7Bhp%K!{T)G{W~R^Qo0jMV5?aiUjXg56rvyVxWgu<U9IS
z!K|$c@zzj%K}_r`$ga5l>m0rA!54(e$d&ziHeP!8qoPD)aE96P5}_=~+J4gJfE2Gb
zJ!yYzOW=+rKkuz;V!HL#$C|tnt<cT8i(QA65+c5pPEozU^%tsOxvO^c81tLnoT5d_
z7<j}zYf|olwG_@Z6gj(_eM35}ez^e*(nF8v=P?fC_3h?tTP&|6-qf)n`OtfVajOW|
z8%8_|PVvXN?yOb;0mOc1qoDDu`u6rFb)hR4rCdIQi;c<qsFY&1*4KkMez^>!Z0~ad
z!`rzCgDnT(670J_lKh0~s%26Udi#D^f6Dj3BWK~lRV}=h^RGWX5Sv%<!51b2>s9Dj
zh1xL^zVew}*yy$bbpwKS2qE4)Hvc#POtO_Ym#&88(yoFMA-mnlGp&@v>awF%9x4eL
z@<a@(+IQ);k3FRCjZ?M{RZaPoly<w2%fX?KJYezOwf>b?F-;IYkIEB@KQ})P0#UdU
z)5HGk_LJiizbZzw@A@=?ZH&A1`&<@kn|MXIW%=aS1bg+UP(Scq`=kOZAE_F7k(6-H
zHAYT-=#eSEBtKB=<5Af*A*#2#)|+lq@oYj4<4cG#^n3eL3hZ7NRSAxlwo>BGZt6t2
z@*D?>`vaY=wt{bdIqPA3(%QSW6Jm_~$TCx~ue8O151HF|Y)H`8R|fdR#i2#gdF(4a
z)7&VOTPGO81F0Hz4RoJLT-2_p)y77}x<b6kMT#Vl%cJGHm8UjmbD3cq!Mj^ufw>We
z#|c0L^cy9Ul-FZT5fH^(Nv{{gCip?3B(}dj!xQae%fLrPAT+Yi<(KK?Fr5K*^v~#p
zBzd3ahF<N$B0ehhQt->j(4l&t)Zp25y}86XDQUNE4?r{gb1%Aue#qi=YYK!~rMGtx
z31H|-+rK!{XDrl?-C7HcVRHoko%!wCWs9}mb1T(hPF?3vw_+`2QtL9_&=&OMtuPtJ
zzXH|GZWWY2OL=OG5fm|gS8Cz%wpm{UeSNaf2QQTzN29NT8Q?5t_x?=Ikd>eCc@Y&o
zV0nk0*^=JLT9@SQ7qfV(V$u99_|ln{?RF`S*f&m%OU`1IhMvNX;Y)IAKK7fd1TLQ2
zsaFy*AQyQxdU7CJYiku1@#yiRAo|VIk9C-Nl&V^KP}x&?(s6I!UR-Y#w=R)Bto0^$
z;iGX!7qfnsQ8^`jyu4?7^>vbw<oEQ&`_{(!di<~lZF_icfG12<RV}$YS_}J;t4AWM
zP@5;r2%V<(g&z1w@WT>5*_$7ujH6aRN`!4*X-llXNMAA-Qg_ozm0Y-T<m6{}PEqk;
zoFzW_X&(d2>B#&dhaD2<iB|gg(>5&nx}$YuIK^z;&X)D+r%d-Yc+gGs=POjda=bli
z)8}tmD7`-TGn`<XEt6bqIYtJJh7)=PaQq*zDf0o(=0y*j)#;`W;$4}mnzRA~eEn=O
zxQsX&>AUiPINGw=h~-t0SBn1@tm53Gg(<7==<?uow4?4%s|Tl0;VT!kvrovlYCSLX
z>AZSatRTw#wdS<q^SUGV@J=%u-43+w&C2Js*0a#v3U*=PVw))$LU1H>@Y$4zo%Xrp
zM)ntrD4-BO5MpNz^O>#BgqJEif7Vb60BlyDl=WP@Em3`$gceuQ{>(4;{`^9#Z=UZs
zJdnGwaxd`jcH_f<UabF1;+`gMSs(mkYwv<qf&w6oa|`-MLN{Jd`QL3%PCjIl^i%tY
zC~<0RE)>tF<6se`Q@Snhqfw5Dq{m?i8=3p#9Y2=vmivrHo+dmPtiuX^(SGL<PArp}
z;?psF%d`?4a;U?prc06`RQ0v%MJL0C>ca!C#=fd~FtPfD{3_CjcE<p}2`+7@LiqaO
z_G&yg;-k#F%SwyYeOL`RzNv5-49)C2OvQSF3#!Tkh)-iw*{%7Ujn^Aers0h~#AYij
zjM9{$ZUQdclOWSW*XPIIi~=Xt`rZ#6p@{=7wv#Iffd<LR{^N&4lmE3<$>gy3>Z}9~
z2;;J&$L=t`+v3x=R-=&A*IA$ZwC}{2n<jvO;C5x&q@}Dqz5*wejAwAR#aQ|XjhKsH
zEPH=0XVv*~{4sVp-e2;tvIbL#7(~v;mWG(dZN%=AZ27T*j>UuN^{XJev07YKkc~^U
z2+=<I#qSiqjY#OQ)S7U1V|~#YwA9+@!$~vT0nQ#C&#f;>4pp7~ox+(P>)l>OAET%r
z9hXeFw^^l;K<|malCF?aT_hE_>w|qq4=XkK<4D*q4+X>fYjz-3^by`(PVp%mUS17o
zgU1-uoB+6)v}ucaiPT~BZaP#9?Y7UQ8=QaK&O8i!^rVcm9`IUgB^F1IslLM8cor(5
zDi`;vMx^r`S$Ie`*|O*MW2gRSAHe|RNh0fLtNa~DG%U%EC%W`!XD9s9>oZ+=f6a48
z?%?+Be+WKge*AP$RmQfyf2%iy_p^ZPOZ9SaJVtox4Orb)**P4)+(dH$?~S*QSawt{
z!TRO&hf~D%dnGLsmWQ0pnHH0CZ`x45RI<HVzj?JL9};DviI$WD{go9=YQ&G10ljqt
z!V!J>yIQn@JY`RT?S@2~F$m_?LCP)5S@dX?#+$TXKg`$_<$XYM7<ux(zCtlZee1&_
z>4qHA_hU0Sf9W5?N<ZXLk67u$Ce@A_`BX1Ut=*ESx4=X>hBH12mvmORxFAk5?LrLj
z?>4Q>(Q0RXbcX7O0v*9{nY=lWfv__pB#SrA-{3F1RX}^~0sKNhnn)YtFRO6{x|0$_
z?Vu($wvzeO$U90?wl++$<RwyJRKUHeY$uRZUb^%kV4xMjK<V0YeSJX!b1A!S6TKKG
z><bT!0He}5!&Ixy1RbX%-ykBnNR92m`}}G*HJa=`dk#%<W5QA3%?xq-)+k5uU+rFx
zl`OHOXURN<e?SPdcUd2hWAwe|&Zx-^_;V#ZJ`BUClEGBG1JSs0oaZ)nPJ=lPeSuFT
z^(5I%)x5OkKOfQYp8EgL_1<AkuFJcy%Y`MP;1UH91Q7@>r3p%r60x92Q)wbi1dIrw
zBorwjO9gC5l@bU+EFfKaPZUHtQ80uOh)4-Fp@je;$$7H(_q)D*&e`Wbu1l}v&GXJP
zbI(2Z%!H4eiAvBUAW(AEvga1JW<S-zh7{>YUc}Feg;5Poz<n2+)i^Q*KqCZ}*VSGy
zC5~#RJzmCDc{(6{^$?K>|IU-zC9eyXa_yF9J^;0&%2p>U12lgv|AG5mXUUX3D>mi}
zLtsBw_d8o#n)aP-zJ_rdQz<=rm`<@SK@P0KCs3=Rb#klo2=-Q=Vrygf_g3|(^<*2*
z=3`=%xP|}}AS9-s1rgIyQhLeu=~akkv#Sgm$*8#vi%a=r16_Wt5RQLth&^xU@{i9D
z2v-)j#=rayzUJ{<$QAtWPP01Ii?xs|+|M%GQ?5)po`f2La)yJFj808>vw;C8?ek{1
z-1m{F1ecK2d<)jh@@gF?yEUI8T_1Ya<~fL4{FzkBKK&WYeybZq+{Yt3v3?mV<v1aJ
z!itu~R(SWN4UPQ`Aav#ZV{JI6!+0@#P7Im>zP7xiu{_tw{NV(47h{9{0Ep(7AYQvf
zwv^9gZBC&=Pntvn;p#42=*0qIX@!9wvcEHfT83_P`7=a+zY;U{DL<++F~5)O)bjWQ
z<jjX5%f71d%`*8^JFl15A2emG?C=3dhPk=98B#LoYNj_TyJap*0Lac`GY)?6ONStq
zG7a6(mLKZOM)5y&`&q&)gPi$PXdBkw8N5uL2ZwdZqa8bZku>g1rf|DihtOG>Q?cfc
zRUi}E2#2Ad!@7Tvv?S8oAI|#Pv7`67XrDiZI;bh4W&#S+bUSaon5~2rAI9p_3=qAf
z`6c2ufd9{YFjRGhexvq{-Oz8XivZS@L?@IFIMq%M=M^wMM&vM1g5VP3Lvc|IPIsM<
zzwPXO;?c+Pl(njTy2Oks74xj(hMg99%mm1}vxwo8TD8<xq~O{FC7i#Xsy}{pH~4{`
zHT%I)cct$sG9Qk+3ogx<!74*}*I%!KyEFd`Vd&<SQiVmknYz`#zBIB*@oLJz@GNA@
ziY{l}6+glKdbv^V_l=X)0tkl>%SEV3g4x5wcNJvHhAajZNYdmhzt_!cDOfg}t$1sh
zvFGb9l9gN?fNfFmh_V*q<b?elUe(P+o~Izd;52<<3(=Wj<xfDduFq2C$xKLufvGUU
z&;S2*F*ca>g`2y4y+<Psf|P>4Dz~uU0%gE9*QsBZ%ov&0@#<pVv?W^QvIn$IewjjB
zjj`e^Zdo<byI7f!TTgD;Mv4G*My#2ynjJgdkonKg_kV^<Q2l~)w_Buw+i;q^M~k}Q
z$6{Z;Q=uRhmFiuSD`sI4mFWVz8<LxTC&P8iU;1neu045@`T9AFU)b`1ZZ1<FU`lf5
zvHR)2@lB{aX={dC{&<zmQh4ya15T2?J(m{D{CtM0yuhvQv>PFGvXZX7Ry#NU;t{F)
z1~3BL1E{5EX_4&Nn61j>;ruHyS$Yy0UmCh+x6C7^dPldd3gXONcgcx1g+6#AqRfb4
z=@f1nNRvmA>~2<i5Pn$+f<ex(J|8-Xn&YfS$U607cVpj}^>HiOH5B%LgUIK;9km)A
za30op31ZuHw?FTRnxj=C>e)E%vfMTB@BDtaT~!cH(_TA?RX>5($!qaBkY6*O6BZQF
z8+-m+I1vt>Js3vJ554yCWrf+fm@P3T;XO*$RA>I^MVzKKb?H}6<KP#;gZ6G3h<0bX
zWz|flJdea*L&en=?B0c$D(f!VX}Sqk!{S=Dm7O<Bl~*0rUy3?+^Hqssz)3dU2-rQi
z4x6F+>!J<~vFv+?b-6FgU};NT@Bdr_k*NH;<!~$JHAtb}O;#qgJUCE{7z(=0C;*1t
zW@G4L8Xxo>?(%MvP_DHa<CP<6Z20TvoI~SIW6;~PvMLqENXT+Q&Rt^KEtxA7%~{Ja
zH2^N-xzrcKzr3pWE6Lf<?J!7jbh)cq5+^~5Nw4#s(?pj1J&YB?3_q-*x{L4K3NQU-
zgwH+d*TH%<9E1RAsBiz&Y3D-MiI{P*p)KZ>lKj!NY6?5Xf6YCABL$2l?P)rN;C7!R
z-SSZx>eiRq$|I(C8LYU-1h`s8O|KH^1vw)JjeB&6-NZrjb1^vo`@E`@Qr;t$LEX&O
zeGN?92`re!PwGtZ!G#(6vr;$(v{B*l0ObDvMy!G7QF_={vGB3#sId=90}d@sF`_hf
zuSDbAlb&Z|!?7I)XJ`yncfCEp_SNQvcM=)vXUS~K6AdG0lZ9ne9)~r9jAeU!K^2u~
z8Z`k1wfir3AjlaObyX<y3SEDn>sJ8R6E;#EnqLm!Zsnh#eerBkUB~mTynu$>f9^t=
zshqUutfb<^bd%`3h#!hc9TD#M7czh>f!=JCqb$FFk__IW%PmZG4&q86z-xo7+Ut0F
z*t@$7IXGLjP2g&C3un<KW)`xn#+_%!5;P`~PhP>k2bnHKuwP}4U;!}1YSvauNM_YE
zAjqa89}+0P&4Y02%cihFpX(2YTqmUI6pX()ormuzM##`XWPqTx5qd8m5e7GvYf7uJ
zC2y^P9c$k%zCZ>BCcH!OBfcXV@+;i8&2R*N3uGGaRO>6@H&T1<9%Rvhn@#cM3`>Q6
zd$nPJ$Fxl}y#*^h#SB&dBtSkZ{PVp6;Xq)$o(s$OgT6_fD+G)#$VP}5$9ki&MoD9f
z4=oNv19sQ14s&)8{-xl<1ZJ#rtFP)`sOvk*w^-(c_?^w^4Ul{fP@_2@m@JrYG$LPF
z)-?s^e@Pur2grzCkan&Rd@aq6FCuz~-L@r?MA(Uppw^&$z9a#q;=ib8Zj0tCs+3aW
z;dXUZuvkgl@BUDbHAv(<$J48hw)|<?m`$(kABA$ubGWktPhJmj$w%P5m-|MyUd<Av
zOB+@i6iEtM_m_Mn#sPQ3_ZbR0h#Ij#F)SXF%{gR1Kk3uFqAR=Am)T@`mnqEOBe1Ji
zC6i7>;5Cy(<cT0HGZ^pMGH{Qlw@-}z*Sr7_qR`_a8tq|+hxf|E`9p>4pM2*2EZQ0R
z)Z@E4QaciN?Ij{Q=-N(*yc#Xsmo@Tx#U*0mmuuS%147A>l~1k{Y0ta!4!{21_wlLk
zh6+0fnr3lM!5-k(kjWx8JDddeAbG%V-V{Kr=ak8`xvvFPwxq%4NZMpIl~Nv;cU5-=
z-Sxhy>_Ts9if?8xavhBAwf4O_Srr8i<op=ju;#u0@D1Rf!aZD$EmpIeYUB5u@Ca;;
z0!Sz-LnDcu4){&H;n<GjH$A<>MpA-wL&#Mj%uZn8*4Ec9_vIjRU7JcV$lpT`MixZ(
zHu|-^i2*r(=>xqQgCfBX4DaqAlh`f!8jRH!HCVgEDo~Mm(pNHQSjrnZwpYs7;tu?~
zoAyTl2J7V}lB-84eX<Xdz?btnmWK<N;*=ZTAWwE~7@rkheeG7K9Q%5$(Q{Y}M56Gf
zWQVX=^OJ!Vn=)A^qacof?O<9-_<f#RA29Lp5Bw!<J8d7m{4mWJ+$`J!w%i{kGqV~f
zz*eAKqRSH)?4x?{Q1*py8g^=kL`*$Oaw@!Yi%nKv9+RL_`$(k28(Fe`5g-S~Zu8qP
z^Supzv6iL70I(qd6B(j^PX(u~qJNQF9i5!&5k3u?z_mUljSTd~S;T8_W5B_T0WubL
zJF6OS5T3&~7DVOgnl}?Fz@J@#=kiK_3VwbM8^iI`J_8<<gFIX-b-_YbzSZY|-~=yZ
z=P8U<ES$)pk?-9Jx)r@op3dVD%7+bLApH!!*aj~i8LgGDd<@_Nn?D<9K)*2b-9&Bb
zg2-$In8EgMWDP$rnAvwMrlA15E+GuPz)z<T0bo@LKc|J}561D)7C#(K8fG7S&>op)
z9arbh9r@E?XLvKPk;wLrkz1h1P>lVxmF{L|r{o+MrZiyCAw*D=V&pk5X8SUdueA#t
zgZfFOH<n;<cz$nKx=w}rI6%cZU`;`O2X8>{sjz(Rac`(3+j8-C?FM0XhwRopmZ;K0
zXHXcl@M!1joNpnxI$ljqU?;0DYZuoS<Q~m1KCEl>YJ)KY9$9(s62JRuauQXnze_9@
zJ^!3oVmlJ*GTs;vyas!61O!z#a*$ux5!VSjZa0}sc9??o6wD#gW9ba#;Z=2TNjTg%
z8?}w~JH#KyR4dex+p`dMzhtyyaG!j{zYJRK2HRVC=*k=d^Gv2xeR-jbq&P?nUk37P
z^tJlHG`igxyvzTCcRvG!+kK{~O=8q9nAIdo!en^?(?aPz8WnhU-{=IF#cV}#i+0Zr
zvy0+;u<o=vz&^(E6`Fnl+ZL1F{8DY9wO_BWT*lY}Q|Mj23%t*C)i~~55K%4Hh=c*3
zz{MzQ$q-;=&9gzut$6~p3I=zRFf<PX`Y5RIG-z=%z*kkmVsNCkm1yv%e>T_|RYb%L
z+w=*{_T{WUAM3@Wy6x5_a=+Ef_(;>|d(1Bbd<E|EWyWf<z$*%>Z){BK%!2JrS#S>U
z;#|Ob7(~URdM2drpVJPaf2$9bn8bm;8v8(uHm%llEqLI(mafTvM&C6{A+Vz6r6{Ou
zIn4uLb=N#T+Z39t5TA6uV|0;2hrIGw4##|lDlDe92Vny=uKlA4W+99uf+=;_Tc9z5
za+G*)l&M~vS7*CZy%hpB<eEI@93>Qnav@&%Y+NnjoM%hbgZ6K}BnOjY^f6OILSZF$
zAQKoHsgdDeAQwZ)`V{o*PV>imk9~C$Hp)|JLy(5E2r11FBDK}5Fe_l&*`&RiA%)<X
zxNZ7LiJ%bTSt4Lz1Gb-@WbcD;pbs_jzJC>PUPB!S1BxRw&GMZ364q3ky%ix0tm-^^
z!<mCYtg?^%jJ$H7gSi}a$|s|mrVd~ipZlRQv*RV#v3lXlECLgDk@dE@c-nde5xRg6
zpUoi6nEg_=?*i+i@|mSvu{X{8g7t454Ig@y$<)5~Ory1S@9!vkF#FQZMI!E?TpATj
z#+i75H~giLS+aeq@M(h8zS;(MP&;~l1YTIO#+fcl7^+(x?zyFDH>05pHr_WyPu?|v
z<mh`fCI8i@nlk>)$`(-og7nt-(|<YfuPqs2+X;|Ad7V$7QWs2ZT80S*!QKZFI|BPF
z5Wqp<YIFLOly$crn~N2_r~)aLr~!Lw_7Ss-g@OUu<?~&qp9c0fx4|$2y|ZtROT+H}
z|G~M;Mcn=*f9>y>2Dhd6%eq7KRO-+y>MN8M&<iLUf7vwa!y8U6E-oW3`h9JU{s*!&
z^TU8!fJ?!P>QQthWrF(hqukN&D~_kwGykf+p8leMW8MbK(z^B4YP_2b^w@V}R~uo0
zODg0NvRfsbIVL&B=(>>ZIc$0l?1z}EYQRj^@iIw85A>N(*P$mMs-K&4op3o9Zg1)G
z!4%I1S%X6Xe>rcGj1rL{h$f<-<StXFq;XIAOwydcN9sJ^!NRBdu7PfBAJ~lfZw3$d
zM<?t)Xj5-_uD)EXx(1@Pp8n=T-($;?Vj>ig2N$X*eZ^F1ewM5k@^;piG)%*uGHk;r
zKVvUg#^OG$apvLYJZ&@m&#6pDTkd_pk}9D_?=|_KjMIur@*Uvaq3iITXloG(`v8uV
ztqw4?{3Msu!W)ci&TQ?^vbUJR@O7o~;f(AHq|>zd5yM9nW+%KsZA|ky<ICN<yj{f7
zY|VC}=WsD#$LO-i5G5h1?EQV!RIVRgI`dM?A{qq3pB{~^OY(HYyim1(u;{b(WkQxz
z0o42}mD;QMSFM<F1|26uF^g<uCe+eTVPEUGeD)A;ZsVX=Ux1j6;v76+VQy3IPl}=w
z0BiZi>lOg_LUmRPHSR4_oP3H*b)Du${mj`Xn@P;t_qXdx*<oGR4(n1bLq~&6Y&uMK
zU4H7H0&bYpW=WQ#7=Ld4teaix*7IPOGSf-207m@!UHrCVMM<^J<G1U3svF~E)0Y`L
zuKUO+$kU_2rA9T5Y<#A!pBtNqgb02?<R8@%St0Yi!#j^K!5G<eTCsjf>d*1dRm?{p
z09xG0bRm|~hjc?t&_yDC3-ji115f}Xd1!Y>H351Q{v&!JkXB^+xZ;T+=LlK46Y0MP
z2&?qm>XDD0DdT^v4OG*VQ*O$10u))kZvAc9=|Jew3H#Aeq;F)x3T~Y`H)ZHn8kN9b
z?VJn6A5vP^Yv&Do+9NN@T;a|3;#V}@Z~8Onu(h5g@rw1aC#r?94el#F!6RP^BNJSL
zx6YD_E<0pi_Ke6k6gMBXXtoE{KdhDbPUXP>wtVJNUk!%RiF&EL+ghVtefd<Jvkl_J
z$<u1X0nE>&z_!M*{}#Jng5P(3;$q9!ZnFt#?dk8)d5#UMQ@-p-Ke6Rbe=qs1p@RW3
z?%Um<8mVGanvx!b*|7066ujA~k$jMCd${&Y62vMydvEbm>&y<J!5m7(7(o1yJ360#
zf`nO|qi%GAS|z~&SK<rS7mNNe9eJ-~zsJeH`E9#x45LqfSwqTdKKCZfp@Ur~7({rJ
z8#Fi7Jwu2yB%;6s{;(Q{bW-vgoGh#i?s3R=moCq;V@JtLfY)@9o^x%9x{>;zFiFHQ
z6TOgWz|J8WdNnu5b=m`1@Rs38@n+WIZ|>WW5OKI|F!^en=5hdcyS`F;y5TT@Xg&6;
zAM|Mg)zfUM2=Q(5IPMLKU#Wizz%XOwKLclAio1s^7S7;6<g=RNjX>;t7IfiAW~k=~
zJFFw)8w}pdaIDP(9|lsaJljAH8in3)^y2f-N&DnIn!*Ov%;VQul@9+S1MbkTJdnZ4
zq5z%smZ=31`}wd?M=OiqzH;8}f$M~`%M$hw%V3d^nPnZgJq41#)hu4jhk}rc?0Kj0
z414;k@NDUM0n-ago!{URRP{knM_h$3m8w381`3-R7QPnl;!?uNNYY;m5x)`5dkpfx
z%&Ns%6%@i`Gdv`vw*nz`57znFS>Qu0XSMG1ji5+vNZE%!gd`A$`(r$Mrvk7*qw%E@
zSy(v$wt}cZKMpC5F^%x`^D0pZPc?1s_wi3iSahvy;!+V?h!aNi<?y}b2aLf?EB2zQ
zL_d4YMD>DZVL8B+y5)RI@xsiNNlB)IWi25Y1vR4c!kF&?3%q|_jWl0G&0HIIkvTI+
z6pe4z`7b2x>|Ig$-2AJO6W4wP5cb4{HCw|}3o<9d;7EHY?hL5tV5e{HG!kG)Z47Iu
z=hB=i_QdKt7IPT<NS=U_mwu`a@L|`)v>8<O&-M%gYw^;lcmd>{m|3n-p@lQgkG;Cl
zJyE6cN$SAvuvwWk7CWv!r>?Q4%I+ser`-*UR&K5tJ9MR=qhpyCOb~q3#&X?m(Qx|n
zS&TF~khLm)sz_j)5)^g=tL1bLfjhq|<&4j8Gz336q+$=O-)yu?h^dMV$clFb_->ub
zb{-OYy>IYoZnsqtrXS?bJC(wziku{lkAv`T1%&|&^L7llGhvj2MvtubY!#7;=ap-E
zfjUXXZ<bZBT&N+i$_Q2F(Y)ey6f5xizwHuv@<t9aD0SX$D6Ogo%bknxmOLOVz!zEt
z-gYI8+($iJkPT>ctrzSiL{s%NA2oP#1i8&tnPthe{l{Yq+&75D6ZhsFqi;69$-WCL
zu}}7zO+%vfz0Q?LP|pekl?A1=`uyE@M{BrWEHZvnEL2DXPBQ;F{Ge;=YO*uhtiF|i
z3D*Wuyfq}mU$#Dnv8&PhF`2vEpiFYV7MU;?VPW8`_Gjr}HSC-#&kJr{e!eFPjm87t
z$nX5iE>K)`KJof&!EK+gZ>L>pNw!^;4#8yhlF&y%by~=Q8Ggs-Uj{kT=UC-hj0}4`
z81@dP_pzz1d1H(1G}_0mWhW?|TUdu}ybQuya*b&h)Ld<w+Bio?hl8A5*n`7_thn*Q
z=!6w^M%k-c;%Lcg!On#%-E@J%;C6&5Qx_yvNW3Xf(K5D3+|5iCSvREPe?rm!QCJCZ
zXk>Orz7h5rHvcZdT2`jjEc&DpU4}ScWf2dGcsCr&N~>p)hZTULq%Gz5Ll0TZgU>YN
zK`Wa=eGylHy3<g#uz-v`&WI@Yf6;aAOCFbJgk%M%UQDk<O!XA$rI3Lb4*~d0USr`u
z323v$;G3MZZPt?K>n0gb_2go65T?5z@~trLa-CDtQ-}he=U=c(B)N+&0GhcNf9J~8
zsjz}FlWT8y9HoPPo4-K@d-C^FL9$!TY^+f7OI{gQly$K+@VG#^(R6S!FvII4<tosX
zl#3fj_$vL<3U0(BSyi*On8DGzyK{dM{X>ePTfl01I>mQ>9+TQ<OS?hK8k*A#_h?x#
zpxjIYD~_579y>;#%7ne`bGiTScz{$7U|S9$I{n+RURBk%e`t}%Wf%0|AnVZ`&t6_P
z<c$!SkqJ;6BQ44m$xofkGt(@sd=R2FQw-R3wd0v?NjtVf1HCnZTx=bg_TF?NnG)7l
z#oYr+Hy30k8{KS1NE^wJsCGd*vNDVAJnrR$+}AK>ItLBf7xNn=F%^H#SiRn|HxTy%
zR7)0tUrR2f&F}jx0&ai#d!mD0@VsouR(;W~)24iOYX6$D*+C!!+KSGqdx#=wmN+s=
z`6YS4^3QTp>t8H}0(Yq^T$8-eB*tQ8RuvRQ3AdgdYZRMX3NjIY@Bn<n%5cQ*CWj!x
ziio(wVO=KXf`5!`(J+>(2cMMQZ!FUjbGhRhP4XRK9!RwZJT*J>I|b(HsTS+3!RATk
z9!2(;hb{QtUC{;JBu3L#g5+#B8tTHz$U^x3!0OW&d<Vd-v`M~89_Pp8K@GksJPrJB
z#o-ni<DN^M)(8F$>9Z?7`tZQ=`>wB38f^ie|E5$|HKCgtCVfXe;?<FB*|3-l$R|XU
zifK8FOEzsj1Bm$~o@REvDU@oFf07DZS6cj!;Fs;yvbxNvp2#&&@MlfffT~eZJ?<g7
ze^&QT>%%T(OL#n5e}2ncEaMmsQa@=J;knWOD8F#u5#!jB5>iyz5UMSZYWrQ_KU(8(
z7!)au+nd3_wq4j&OI)*S69GO-n&>~`WFWQ>2NpWBa1fjQ`av@YgX~O!8tF_{rTVf&
z>WHm@qfoD?F35q@MAM1gN4^R@?QH+*B<^;2BhA-m1~TZ8xDfX<Youb~Q_glL$*)X-
zn}ly|gw$InpfPCt<bXDUSe*%MB_Y*^fdwl_FaNC2^*G<q2?+Jp3J(w1lCT|BYw@tx
zEztsIAKOqPILk0>Br~%LkU&+yQA)?z*L?^Dv06!a_#E?s?z_!wl=j-H>#_s<uQxzJ
zcL)^bWB69)1cjH+w!Z&C*Y<(M3iw91Ns`)NuV&BY><dJZDnq>(uzy)0zcvhvi1GVx
zH+h;5i+XK()2IW(mPgLS;NG}z!W3((6~F(i;Og-1qcL5~p*Zzr5i3Y-cz^X8P`HiL
z1<DHwS<<VDx%FBXdI*^F?+T~Mb+zOs%~9W>2wx6qZtl}wX4EPjA96>J6e7s&obn&h
zWg60&+AIr(v2l2s)Eh368<I3j-&>%*>_=ESH5V$bse@px_1r4*9Cq#2{edA0qI$$o
z2Jwb0bDtg!y{opw-8C*}fn5b+dj!azL&Yhb$4?+$b>carrssqovNWFq52`5R5I1<O
zH>iT;9qZlspQ@nA_s6zv`=s+1I4NMIv01gsU!K;Qv{7hFcjj8}+_LkwNd8{i9+hXT
zdw<%`(2{tMqna!v2<~a^6?yAJiei6g{#6Bv<KFo%q;rlM8@}}=js^m4)Gpc(Z(>~s
zDCx*>M#O!e3l7jWe%CHl-^OJ>sFyFJo`7La7wCzVW>l#eO#6nN+KmQU)hx~(&LJFT
za@>w_z}u4b*=Wr_O&z)Q3e<ixUhe6V`{TFS9@*gS41%<=#iEYbSJMMk_ff9Tgd{dg
z@>GFxt^r`1B2s59$Nlj(&e4d=bL0dJ5U0*n8Pu#;1;v~2o@^NdZ`$MDjoi+cl_BO-
zUZV;sB&x|zo9^zFSNd!#LwD>$s5mcUS1%vg+zk#pmZ^(Ea|tN)mbEICx#;m~n1O(U
z818p<&^Q;tQ^NeP7{<LZg2uDU0bMgwox^uph6BxKP<_&OyTL0aw{&Q^3$wXug`5lA
zFAYL}LCO4ua~6j;0$W}B`k3vd8;ua_Se|7dKOd&U>FM*Gk1S2EV%i<99aKJmv|Osj
znb=$zwF7=&tPW|0bU~BMGJdR`jbBrtf931nV_kR41bqK#M5wN6NBI+3uNg^;HAN!4
z{SDZID3F^-hB=qB9`&r?fPt3gokRkyiYxx&+SA3}se4^R72Fe3ICH(_>!ocsQbEvn
zi(QF6em~R8lV9RQ3H6}rr}mU*#w7Qacn#&W<Lo9MY75`q7s|(zB5!x@cfREfz9fCz
zmTgGOYnApCORpLkR(%gNci2_kYla|?FH-S2{mi$3Ba`PdGWoG?;l5YGH|r@<IWYnx
z^wQ<$tu}C;VQ6$Unh-M!PylU<>=h<HZ1%9GXd6@ZCpxpJWu-+GC^^_baJv0?$hUzC
z6<zcH7XA+z8`f_QiYn(-h1Uo3p*BZ##a`^f9;*SGC7XoH#SxtHQw2;fFo{|Z=p(Vu
zUbk05bdu$=LERHlvG&x`C9vzxmmZ@923)L9L>_*D_b!fPUfAV6Zh|`{&@c8>M)EsW
zrayLSiJpBPV2H8+arme~(i_#fCB~zY9~l2%J2E>`fS(1@0EYscq*y=qw#($yOA5_k
z(S5+RxowFOcWV@T__m|-QQmCf()M=1_Uf+LU9r$h+Gg#LJrpTXpR@p`=ZQ9`0Fnnf
zqjc*w-WMA)aBoKy4(@WR-{H{4@}}mlqFb6?t`jT899z<3S$@4(xGbMds?6G9e&9_<
zuyP3nfB}o?di@><WUttnq0B*wvUB{}@z&f1{5_!kWP<$lf#+ZA`;ziwalgjZxnJ!;
zajR@Lb~fy?+geIeiEIISK7CG&V$-x=7cQgHgKY$BNArF<tjUUrOKIPaSNF@$O(t7f
zl@hui+?_$mMvUd)^V>SLX_V0VpA#UuOJ^k6js8G+Bl(DO4ewZUz+HlthQM#j=EK^5
z$57{mXCs<hSZQzF50Deslj_I|@wqH+P}0X(9FyvF{eGZ<$ivAWcA^#En`!|0JAK{I
zt#108uZ`M+Y^Q6mLSiENFf;~7kM;DuhAgfO;qy1*lt(_C^OkU((B%}!D}CK;RVwyW
zso>-!_1icQ8plICdgvOj^+BeM5+Qt4nwNy$II2sMvh8PA`YlxL(p%tb?yMn{AG^A-
z*Q5Pg*iISYg?2iHo3V_WOXMux6_)1@=&9uszS}jPp?QI4*0hkB!qPA7k#GIeqLBbU
zT{<5|xY$>fq(0WKM9`zS7=*T`%nqth)s`F7D5jgblKj^+{}e#thO}PJgp(Bo2XD9r
zJNmnp1k7F2Se1mumDj4BLFmPV^rLT%*mX53)6E7gz4T(J)`xT#?(w1rDh&R2lTQ(Q
zvTfVv-<N=rGb$l?oprX6{CGtd@}tt;ej*rFov(?N7t^N~D5RXHkGFhH{L`W~Vt$(?
zw7;0Rl5Mf5$xJ<Fv>^%d(s4oh4MDy?PU3SZsZ}?BXeIqwLR-57hlw5RQ22&~<pSc&
z_xjFr&8G~@-zL9#m;{2P8)&y#+!PxsFblcP<#BD^?F9PSO5!=>z>U9x8&(?UhL?Gl
z;}!SbKBOB9TqkyK)~pQo(S)`6(aIxz1R1c2C~z1bl&60WGN{jP9JdrglO*S|^hFQs
z)_do(()pYXe7Lk8IpJlP$JM|>tqb9&nJ#OGn%>wXj28l_(U-ElJ93Wn)+D?0&}h-d
z-&0|FW5b~RCtGa)-!Qk+Ku}eK^kQB0->cCcL~Vig+L;{cm8Oek)t92OlqE9KKByzj
zK71=H8g#C{I3rp$=(|p~bS8U-mH%pbgI))>0lv&_z8p_q6xMoWAh(eVF3jxXO?{IS
zEH@S>vyxGaCk;5bPOvl4R+bp0q@v;7F{^f0L?pfR3qG{Kd5bR_AHDsgoqxO)xa3lB
zD)-+tGSfR;wSBS*Cd8xjUPyyC<_nIn(m{5*0?5Q-XF(u~6*O$+Sjc`TYRS`po{Tfv
zUSG@DnMcs~0cG$mRhqh8vOaC$vlY0Wzr*pT-}@$TJ2XEcae8KlbqVDqb<1mYFzxA5
zENOK-)}^Wv<zmXgMa_2*K%Eok$pm64gu%;2r^ZRb?BtbLm%L4KYav4@;G+1sbEOP+
z(35u8MAwM{m!rC0Dl8pq@+vz>Gw<9J(o{#zFB~IX6-%*{Z8QbJreBAYy&SXU1g8!_
z{+zNmwm%vI&f9HN6JeSf8PO-|i7Ne?RnWQ=5`>%@`qIo0R*Bhq8aN!@IfA0x{I*04
zSpOy588gRoX)FfIp4_vuW5}Q!@iQhXwy-t3cFm%M##~_?F2Koanu4HmMX7McKK@MB
z3ZYI`$IS1cA<C@$zSU4p#SQb}RXqU4t&P+;K(?kzq6$8Rs%Pj-yNK*@ZwR0GkfFzB
zse+ob&E=^J$p1j&cQ&4i|9?=&#&zOo&bj4iJy}NH_w@K{whw&e?+oud9<1xRQ8oLN
zt^Su`61wC0OsiTwqR^yyW1s4<pCvrehhPW&={O+qPzDO_=TY6{)Nh&V1B0ZDpm{j-
z4}OPIaiJ<0jOqkfNDOb;K~HRSXs>AlL)a@cq7@hS1mF2i2fS0UYSo%C#%$?t10Nz=
zFLQkJr`%|6J8g5mW47vU8RDwVxa%oH4_VESYPjs2*3t(SQy)zA2!^f(c%A+O=6-xo
z-L(ePEl($n+>|RR?2x$m<=$&QGPqo^5H{TZNuq}~&4HU6%D;kb$Qn<2V_E%nylz;w
z5R~i`GdoUkZXVVh<C@)8k$7J7j`s=`tB>fKoA$_Zb}nKHqb8+ga!S-ejETbqqex#n
ztcpi%4cKZ|L>qI>XQcV9L`v;W4Ntu!szlh~jVE;PX~^&QS@93Pm=BBm7A0~Y&w8B#
zV`p5-S-d**#yusVqII1Jr<wLMcUuOVyirASa~u4(2oc)PsFS$B;C*L8(6%51Ur!!O
z)TDUJ7QBG3$&I~<jH8V3&R5dL>;g8Qf-)Qt<d2~Y-&!?AopV0wDu?#yjYt31^H_Q%
zbZTdwbBz+p+&v*a5fnn^tfAgR1Vk%fMP8>-Uc2QBHHkeu9PEmBZ0^+Ru9TC@Zg6du
zZ)&Tr&O5h!LwDEhLfe`Wp!SUHLYGUwq;h|alldF7m2SJjZzivRLi$>adD%Z--z0B*
z1FBmZKHhU<<XchfR>wQLz)cBBd1>1$P}^uk(e*@SjeUS?*K(uIej@2FZdv>~)2hnN
zdSXe;7Lz$(JlZH3m-1!6ulcB`ZHaCW>*~wq3Ht@9mmO5d7To`Z@@R#2b6ahH?1J!Z
zy6-R0_1Qe&*4Yq@UwG}-uYW~yl{0a>hg(Fg_Aij<SCa}q+Wtf*?jo#Qf|q7hAe@#P
zCEP%j#!r0t@3@tmx{{5}x~#r$P3a@Ykg1c^3T?!<{{L#ai@40q?BMxq?y$dp*O%)w
zh3QA!*yuX#_A~WW>75J3eD+WDG%naPtJk*;4dah^02(YWHvDT#V8#u74yl}4QHj_R
z5qv1wfl<=>Pr;FD6+!BT;cw;7e$$)k!CHUfcawTB2u6?WN4DHcEc6$SGmtSm&QoHA
z2#Vvvu&r*qq3!iU*z)=R;JH69i>hqfcE|rXC{s7Jp?G6UUO{<pLO0CW0npI6BZu23
zzFFT>QSys4!-q``2g$1Tyie0uJ)-f&|MfN4Am41LQ>fAmx>fYfHfYTYfVJ=yyOITn
zWR(B*c8~qK?#p)2Nd+@KZ*cL7>d5p1|8%}@^)J}Z2wpF9dR&BE&oKFIK3qKp07u&M
zc*va;BaX$bF#s2H7hprD!7#AgboNKey|vSaGDFvvvX7GGpXQZ04jsHic*q^O7<EfP
zYOFWZ71cjjX{;AY6jPR2d#C~gg5jX7zZMyHK^(T;r&c2M!2eMe%-d7xYj5VIOt;kd
zt37$v`$tj%a%VG+CWizQ{LL8#B?gT2go}3OMiZUd;q{yBi#vbZQ;ETSesE#8qOZZ^
zX3zU6km<Rf3<ioMr_7bPQY9X*y@S!z1`lS~L;gu|Uq(JwG#_TRXB7@J%KJwKYlDzD
zexZ-(fq*m?ph*ohlb203T-WVpNmB0q$xwlm^qkR?vg6L{*U+OM4*2zXT@$1>a}%>F
zjqHTrtkQ`01l#Q|Avf+NM6b&8@4_qBJ);s(Ff%Eq#ADr`7Ce(?F6JJ$9i&_x&_%Ou
zNKAtBq7#RG;?^bv=jqoxL-D3f4m3<o%thzl5u94jZ_N!pXroMOY75g!_UVKlf;<BJ
zkk=I%+0}Y*7v02*reQA30?ubhpZ?0{AKyyVwibKqnC0(&ho^pE8B8k5%5EJwtQ{kb
zQr4oLrC6FfWNqs|!L3z(_8JZyduiuW)M|gKpoD_Bk_vElDeRZ{H;6*2(L}uZ!=Xp)
z%u1ufAu>R#OU|V4Q?%bwNdELxGKr2IJWZo6Pn<UOV}Lfz`FVPV#qDZA&P8_MNFdra
zPFw6)RsNZFIi=$tui{rR!r%vFLc&~JVycmaA_mN<grUp|HyX9(9W8V@U+)}xj(2_u
zq?4@@M}sa~x*VI>AkWQt`TxA!zRZ5MH9F!psz~Z{)<5q82L=4{hd)hPbpI+laqrs$
zV2Frsd@j03Y?kx=6M8hwKccvN7jfkh{Rr3$NSe845F_1J-S#j?L0Gr3RE7;he2s9q
zuwg&FoVZC<X|FYCTZt2(n9^b%&-Gif{dLfUVt@^6k%RkAQ}vKN6L?OE2;n|pl2=dn
zQcgUf&z$o3@;qmu-TuF6mq3(s)-3&0s4TAWNOkPF>yr%Z*Hnm_$3yiliA%ANo_lZY
zB%8X0=s2lnA-e;gdLr9=+RCLCyNR!)jALCKgB&d1$U73o@D@8>xt{cIm`y7vU<Dgm
zql4+O5rHjLN(B@Vp#LFH@m5rDgwQb7OIatan<q9Vvqo<eRqpMC-eNO(o4vLt;mjT_
za8bnYoF}z;Cz9Gjn<JZU8l6gdzu9V=SA~1-Hg3)CyhP;DR5<H|a^G}z=-=Ij_wG9J
zw{P==i$zEW$%2T`N|z3IrB~1U3g1*&;YYZL>)nrVBEAG^C@pMiQ%U0B36tarA*%!1
zJnO^{Y&Q?f%vYNHx+%2#rlJNPzp&N<u21ADvNyQx($9;eVV$2B{?fJB*jL3?d696(
zdnn2EluGw)AYAD&>sM}W%G;i_N3)qa$LG*Xii;b$Uz7?)bABV)I>PcyogVBn{#Acz
zB)`poKXXx<uKYc5n+aP7GymA!(ze@vH@G+u0#|tSy-R`#p*cDS&$dhL=e{4-qXf0T
zF`Cc;=qI<ITkn?QGc)5bg$r>Si4ZM6M)D26=RrR=yK^$OW+J7>eR*rR0vwvn#rovU
zdWG=JcFH@|{e5SXo5Xf1x2Hkb^+LYs&VBCre=ALsX-b_NoUkh{1~*{=*2BByTURGF
z4F7J|jn9v3wr(Nm)?m;i)l-g7SM7N8)1c=gc->7trUBju+iW^iZ4-BBJX?|FTkB%V
zZfV&MP{;?5LZ@XvG*f@=g-Yhi$C<O{5quuqwxpOjR>0Zh%)tMpWtU0)3f?M&4pp#O
zD_Ef(lPflo2)+8rfc;ylnmG;g%^xPvia1YTtkl%lqsFndIh}NbobYRfkGfrGm1Hi8
z5J>de^dE_MslI$CXY)S)x4NA0LG(2B6`6!__oT}V@au5$_Gzl@KBQ3<ju@iVyTAc5
zC21F%YCY~t{(E0s>D6zC%u75qXqv+PPJ`7CjW%5|{>!Y3uq&O9Wg#z9DDWmYL=5gd
zu$mrGZb`&Y&yt5Sjh6NMI*z|GfAqTru&FajzVi-m?mHMn>rc#Q;H5S9J;+zVOf<a8
z47)9OSvB9mGQ@o@&J@YuRQDgb)>8|H7t>#dR3%3JK;r7&`z8i?rupB+H)fVj^(bA$
z!;2fsL%%#F3~p3Mfs>rM!cvQ_=00Ku;Njf$`e?n>6=^NXdH&(>@5hj!?uqQdR)mB^
zlNHAaLeZG}&rneM6~_1o3i@)s@so_z6ivWG4%9myR?k|(YxXlMiBA&W{bxz<)7C}d
zZQE{vHH6H3bz}+lPVjuM)1U2fk6sAfPluie>i*ho?WF70z2<bGE?ex9%%=laFL+D_
zi(=bS&$pmP{l|PRe%cU$oOOR2q+OFn@%W9@t!)IgJ?P%t<Cgs3Zo1-p0?ju#DX}~&
z?|i^oT|MZNy8@V3s}_#|@V^kU^{Z9*=aY&Xqa4r^ZgIAAV|yU>J5it^6FYISr`bB<
zNafqHH&us#RW&JEJM7HAxZN3YaVm|;z;$e_0h*11ow#k=27%P@nq2KFdhaR5<Jew9
zt&y;Z^@Xs3)+cK7);&%ROt%n1WCOe@{N0u_sA!Hewzoq>4EXV1wzt3hJ4Tv6Vd@o(
zZE#7vejaKH|M4`9Nx>9FTkj-&9b6t76vP2`?3M^R^+6yY4GKW&pN+B{9oa~^d<<D~
zmE5nfE_O3S)h5pv;vnz=Q`GsA_>>p*txo<9O7k19wY91xAOp|}?D?zg(NxOOfT4Yv
z*Uf_U1Ubk)Cz~uwMO|m?8v;mQM`Y>J<>mdO8}8TDN;==3tR)3kJDdOrI?HU6k+t_|
z@yFp(vwtxCGA9QN#z~~P@M^IV>g{TDJ)u?o-;QDZv8c+7bW&pLEGM)$Z=P)x)EC@o
zV2D7AXU*)S_R3!Ubdnw(Tn_}cn$fkN7!*dV*PNjl8!s-_)OB3XoJn@y-kw@a%+0;+
zc@;L*2p_fPx&+dKgI|_SY=tfO7wBb=lr8L$Y*l=w?{g>g)-Yf~DlSWq-TrZk>u%0O
zDU3fJk;$m*HhBj6NH^oUr^00NoY7sg330E~m$&ZehuEX%P0NniGRS~oAHNIq`Dn9`
z?_u%M2Z}8{D9UA(^<KxgU|b;3G7|=2DeZH5u3LY!DmV#zQp`oM#5pDO809Boh%u@u
z*D8UT@38n)6K2^~o~k^RLO+OzN?6hLE#W-lx}{UIkUWL0+WM0V8za3gT<WAl=mlgg
z12guiHljj(`4^8OpTfNPcY^|bBE5(W3z6-)m91~+)VubtWCOp?;uIj7)O9Hwa2v)(
z;_$>gtIMch5&_BM@+54v4cQ%YeL;JrE-})>eDQ2nlK+e>nOR?d+OIex1_N62nF%2x
zNsCTvV680$_a`QxDcxy%yPR-x<6I0YtS~J-zueOl76Oz`Qv^8MHSHME@tNy{{x02o
z!oA=tn@uA@a`=khYuN=+%=RtAybhN{c*#sXFIB#HXkn$_krEOSPj?t;*;=lPk?bVa
zD}x3Bf~EM}w5Y<<Raa!(P+yw%!bS0puI<;kFLy<`K5p{|dDfEB>|Eg%;z9&x6$?bh
z%LaJOTBY!O!YC-?UZEW?>AZ`cq(wphGLCRXTehuaCOVoT_(v1HhySx)@IPI|Q3)B`
z#abyTrK8bXe2AaI;wBHJWi4C3IMp+|gpL1s@Vp2XhkK3<+oPe4eee&LEO}v6P3~KB
z53yErEZ++{=keBCa;ht`iFXX?4cxNkppw{~j_0e2*ln-x1VD##I}qCk>EzZ^v;qf6
zttsIm-<=8oos*^{>`?3`?A=84CXIAE7@pg4fqfY7#Ao9pIvWpNiUsmkH)yvDpgWu%
zAC{w=K+`ZA`NMii%_wD!+J`{U6q<iK#r?S5<827rr#&3S-L<V~$A~a^nJv>$i|=eY
zhnCLS^dkaWa?96(Kepr7CYuCe?;E<1r&`1Tqooi$G^-aBX25uEz0ds985>a!hHtj2
zERi_?!2A-8!0xqpQ;1pmCmwZzatq3xbWWX{p4e>Ys;sOJ($8iJ30-N7y>~iBT8yDw
zP!?bkg_Vw@R@bqk(^|A|LI@7o+Glnoyc6j3g3s<ySjPEm0FFz{wR0TzB05i>g28c~
zwE1TPv2@O?jlE6DM0P9wqb->|Z6-si#G16(Q=#a@oNdUq)B5YHQtZR-K1d+VI!!S>
zxs#p5%n0KN3T;3oBcpKGdhKXBu#0p6H+DQh&Uf-g7*}<4$D4B4gPD>_isvb-JY8s>
zYMK^NFZwD`?Mor=MYoeJh1hI5M{^?>b|`pjg17d~oLGt}eHHJP6f`TSLsFb$yHjVi
zV6FFpF;-Wzlop0{T8$5fs9RzEfTkroamyLw<U)hI&_=*M0`NsW`z3F(dR29QuVU*N
z8@E17^JnyN37=VIMtnpsV{<G-W~o5l`A_gR#xcCFHkqeg#5SBM6xu1b$NKd%6=8w0
zDv#=y@i%rRtl$N&3@@edEcFgtY<P~~ys0pPHv6SCo~11GQ&yyVBYx?|1`j9`uwh0$
zOFn+ShkNPzoFTmemkp2!HZ|_ThoVVuHN#GUheGGZ@YAo7J0m$r=gFZSHpw^Di{L5u
zEuLqK*Pd7Xs{fIL4zO3cK6ojZSoZl6d$UXD7-@f}zqjP29<X6in*+u$RCcbUsmArw
zeIB>xf{bE9a@x+0Iw}c2vm^c@K3CyQeeN+-k}$A@753A<xgc2U14Cq&GYuJ*O5ess
z7sp3j`zF*%p_mZdD5QS3^wqg~8^lGc{kp2)uK%l7e5EV@IaPw<n>APBPQ`hhqa&@h
z>Ao+?B#!MZe`tpT^m<qM3@_sD)q4CIP=|-~go9=z@@(C!X&8L-Nn7cHI&vssYo}u8
z9LMb2H}m17@`?Y<%16wlw*!&yE+Fy+Wz<IORwCpf_VYOrB^4T=gc|Eh%5<_Iw0k#Q
zF^Aq7U5(ea(a6~T61;<Y0%)<xgp`Nv;WJ{*kYGS^K>^cuw^tm1OW5x?6JKlq<zR<Y
zw3)gk`J<5P@Ln3Dy$aaqqXD71Wwi06gQ!72_Mgi7lNRIY=<wDV?U*x0HKvapus`vT
zF7vF@9|bp@-~f$eJv9`&+EZDViwXlwWPQ$yQ0OW{RoNzy88jWD9n8?I&(KE?%`O-u
zajeMdhthzwa9B{#;J-Jd90+e{ta&P83YERrdl!@Ddkdt!(rnK3q0GxCj3Ethqi9@)
zIa^hr{R$X36ev}Nu71QeNcd!Rq0sz~MxddNouLcbg7U8z>(H<D*azFOR%9iMX8AzE
z>o)XE$m2ld;gnNzv^7ER*y#Z+aMoL2s_`_4isJc3C1aoxQI1$85-X~5`5MZ#w0pf9
zqep_z4uZzXoJNbZ@_Dg+rm@{XG5JC4{)5dJ*Mr6~T@@(Vt#8picjcT8>^7<K`o8Fw
z^im~8I?Im9{!7A_QCk(Q_=OtzrtFthAAIlK3~;S^R*zG-V<SdwTy;`Jol)z+y~DM0
zB|o__j^*#>-SE#FbA7~Cyo>ngsDvw;<3BCQ2tR&#2XuMlK=D>f9n1l*^g+-CN-FJo
z7(j*p)tvsxPF$+};X~`?;8it8e+O1M>ns`UK3LzXD{33K{~85*^p)?-p6M7@jcEw$
zYqk8v9Nm=B6|t{5J~oxRZ@nQeARD~9&21$HK7r$JuPTDdUaNA?!>=vXF{{dF(8JR7
zoT%I407B(tWe|*OY475rl8w=$+H-(nq1KJ?2X<u4MvN>j@S^KwibZr-(V<kr+zLSp
zhy|4dI%fR-0P*{s8+Fw@o=NQZe;Ttt|IQ!Vwuu{p8BskGFRbhkbA`V~S@2P!dx=d}
z2R&Eg0=wL5-vjFR8$@hC{GOP}VDI!xgYIi;9BT$GuA%`GrXe=U1B%ddkCI)RKHI<I
zPb*djHT`@Ny@Rfq9I7?Sx^DU5^GL!rW=X_y{)olv80^)=_^a%Jdx_?KLCtB9J|-;e
zV&Gi0tmKK;xcx|I&AjLDB|)D_c^1S*#354=^liR2J0YXxr}b(-l45rLBr)u9>9}pq
zOgd!siX+k#eth%I#*#TJ1bvmunc5tYYCSHtbn~>PT&WRzDWzVPfqMeG%^d$|<7iqg
znioC9-DlAlIy~?NR{>$_&E;4`EiyRY%wCN2g(-o}=kp^AVhpJ>ktq;Xp2kl!f^bDj
zF1;5n^Ux@;OS@WsL-I7@A!yi2R}XHA&J#*+&&e&Ud#9<Zp8VQbz@6Ojyij9aqSCmU
z6E<5FKsT{k0S>RWb*;=?kH}@Ai0H?D&9>dL->gk691>gfcRD4>B@Y`SN4v?E4fNl(
z#qX5cZs4ULsugITn7LCh3@i5J=|834N5*65sDibJ#f|hBmH}m5*idI6k{7w#(1k6F
z*S9TT4t&@?TEhcEj$o*6Fid`m2ZWQuQ#Fd#>TUiOyLHE&7_k1*kX)z!))B4Sc43J4
zPIY)|V(!452buw=vn<goy5xe`+B#I6EYv&0q&}~IbMA_=?8l<v%njZZ=UxuiirWB`
zV%?7wXPN_H^05aB`9OIPl;0<E(?myZ!c2?Sw_Ox8U87mAe&Yt2i$Tr2=Ctd`%}R*D
zgrf!QSJPWss`__Q_?^``82SbElrNZ8gx~Wf>^S>{&>=DDbmOxVy(S=bLmd;?B!w-b
zICF7!Ti}Z9tX6H2+sagl^Dv|$2(x0>j{wR!*+N)v9>bnSt1s!+$z50h6QAVZwABgt
zSLImH$M(KkXJz1nL#X(hwlq!3mem!<!Wq)6KTnr3x-k)KTCacq)?_O!#6NJlRw^qT
z5z99<G~D|AN0>${jPA+S{Cz4`+WW_=jqtIjsX^O~n<EofV&unvyB4@>Vd2~C_vUaK
zdquQV7#cAf3(JOHRXr;Ilq(&$5Hb0qn;R3ODAqsApaHQ<b(x>(V*-G;Ll$R08$HHC
z<dkX}bNwB*f1WJeY923<T))NG96I|aQHvy`Q9MJ?YQ6vcvg^*Xt#b>xBa7g-tnL#i
z331x?RK@I%R817q{KKgAaJZlmL;~Y&Pq)9`=VhuHbdpo8i;1|iUD#sZ-OUQY(5TcX
zHTI=%7+C{M-@wa*j2>yaqp$s<|9%bUHWu|~ZkPo(%)O9opw#17-?-UL5~(_TC8ATP
zwUff@|EJ{W&mMR<_nQ)IoH<KcUr2$uSwg9)QJ-!utTN;-6osr|$CuJKYv}ml)zK$u
z@U<CA3XQlhr#1dYsG&aVuVKf%a@i9xUr;@S1>X`TRZZ;#zGc!^TFtAr@l<!3)_A#5
z{u!mna3JrpBaJrGu9e*~k9f-9fr%vTqOt+5TrPd+7s&GlXHK0(=s{Mt^j>O30F)Yb
zl0>>9p4-*9AWD2_4n`Xo!&1v@Y-1OaXv7E-m?=;PTJ^fiKd(No%leBye`@YX^+=MW
z)l|9~r@dZ&Jd5g(g<53rwNiQa#FOS2eHj)<BC_r>#=+c}J1AbTI80LUn1x02{|V>s
zh&Q)6>f9^yfId@@9+W+9wtwpTidN9c9_aTz+ikTpv)}7cpvT4R$i}K-Miw=WLC-zs
zpTFIFcID~PhpdLO%}$~NP4kOh&h~*}kQ-Y`-oGtosZn~Wb#YqJA+#y;baJqU|Ei!*
zu5ne&&issmjxh9}jb+e|1Kpl1me4uw4+f9~<xj_+`+;#Rk5l8UzOYEn%|UlXj?Ir3
z;y5^jK%14>-mOUV8}PQC$$Vd{b>MB=*9FkuPq9`DrO(XiB^}Pvy0ia*i)K<fN)*%C
zP6=eNM%Jbp<_I?EttRu##Wu|5VsB})#>)|DIt~s&zd!B-JsTW{I_c<vTonf0<8R1D
z5_Pcf?>opqRudSwzLAkn91c;gn@W36TP-drVOsmhDE-qAZ|*WrH(c+w@Y8I47l!M7
z+F6-?^0WQ6`?&mcPMLkpM5?GuzkQoLd7~4hoD)h5BQ@lSiD!L?V1jwDPAKoS&eFWr
z9h2LgoWvs5J2wa1OOsl9q1|Qn`lslAlE-AV;~NIJyik2S$Mmrqr1Ui%6U!Qt@Scsl
z8?p4R^IY<Yj8V7#F3o7`Pu<6Fdt_;|V=Cl16mFaZnX+2Jl!RHumGsfK9?+W5tz@@h
zDqGB%njyU8AAnL#CTm_4hj|VK`KEih5;unoJ`!3zz9cQ{n|?n%o?*R%HyNig>}7*1
zx8%EwkVuVZU+M&~m5fNr(`g-)!7Kw6<>oKu^_kzj#S_~u_)O}?yW!&zcu|FT1B-3g
zg^c{4Bu+u+xtEvR{c9N)itM{)(>^%lbBUo&^x9A>#R>F}3W)uFCH7hpXY&-uEOzto
zq4V*-I68k!M0w*g;c^|Y^`^6#CpShSoMJ6E#Y1?@SulSaH^m8)0Z=!%plq+~<~xFF
z)A}!i;!F}9srQhm{MLZlnVzTTTsb)iFh(wbD&^{~s?WbT0@nit69b?_K$#_vTWffS
z?lZCIwZ3ldF|F#r466{^={1z1(2gDvN)VkDJ`TIV9wC;6JFo<@@bx1|+e|=I{vV_1
z1m7qS=;ar&4eQF`*KJ&!Lc&<StD;vEaeqf8)anIGT(xK!#;n;U_g`f=x%f}Kn9X-!
zj0_&JA$tfKD3_Ojk}Of7RxKmHmASR~s^0pNMc@>Mt4eaNUHpIiM0_O!B-hLcUpVPa
zzKG#M^z2iS{f=@b$drS|Q~0f=U?;~+z#7b!zO`g8y3vY6z*Mvz;@QS%1*I{UtUxQ)
z^$}ix$*<X3W+3sniK=QAV3ut#E8Qw&`8d*u7!$MleD>K(-#i|e75gB3pYEImIKY38
z4@2%eXuNaVHo-ZlI%786I`gHfVHM?e*KOhqmKtY)8_3_h;(IRFKMc&hJSuA7>lWy{
zq|a}r`xN5Qi&3wJk^Y<WPt@{boy$IiF6yBkJzZpZRoTHfUld=J$hB*6XD+Ii^xP^(
z!{@AQEW_E%f+v>srJDq8%satHvM;-AEqRbVv`5NUd}^N5%Y+x61BB~2a$<(_MOC5y
zTM`ByTOt=keC_;_B5J=?_ISZ5-xA&{!XGAyn)FiBYU?-&8()FmtN^~%QVSk$X_GV>
z>YRIW<|rEjr(?^WC`u8W7T7;d9dWssh**!~k#x!Rq?*z?dUh?*K<ODPF;2~kiU(HH
zt;|^8<x-O~6i$-YV@B!?Jft*}rHDubYnA(oR`cn<TMv!^Fb>&CRKKeH%BOcHmpfsN
z4V$g}E98@j3h;LL(EuY>FzDqBX&wC{z%2d_8oV{Qoh=xnilGnQw0VjTMzQ35?MyNz
zCc*>JE_Fe}PxKrzkJ=<?PW`Xd9GlM_H&I2rU;pou(5shb@8A14?#JH!>%q$orrW0_
z^1YMB9<z4$e@rdCdaYXi?oH_%2Z1|k*4F)r{l%){d2ZHv>wmMd{(fsOySH)mt8c&L
z{(VxOZl32|_V?uXxS-m~pKq^j^v+-X@9%HD>^p5Lw?BxwuUj$ge$o4LyRYzpmdR!9
zKOCB(4oq~ruTETluc-d(%I>_C|F)*Dz0;08wcFTzKJa<<;^}vy?*4xvY+cP{9Z~wa
z_UifC0?)6&G1dKjDxQAF<!fI5ys8O2A7<b0z5DN1USGEgbZ}1b{k&WAbpHOcx8Gj%
z>i<u-$NMKf+41l4_Br9QU$&cv00&IV7q0Ftw+-3*?8eo(4q=yHdrZ1Bz1Hn6`+xEL
z-3zLI{d;cq&w6J7)|k8V9h6pA^8u6ia;c(;sjoJ?-S<9Z|F4s)SJmsRaGLbQ=V$)^
zPnTYGpU!(7>GI^ByWD%0J$JTyPP%LqDt8}v#NSoZ?RVpCFPb0N^L*iP>;Kaf!Y*e6
zw`=b-z-nDg#J?|!)5G`w*_e9O+pg|uUhU!O*Fr&SQcI7`dVBTSZ@IgvO%>BqXTMtu
ztRTWUOeU&Wy3Q{JR%6`!vA1@%|G%|--KuZE)0?gWhkn+X-TnLFob@*u_t>)Rufo9X
zd>?B)Cdpi5>HcnAbN=z^>vHA3U(c<-A2AoSmVBAD{HlGQk9;q?H??Z#!#?)a_BM6B
z3c$l{pV+-X>RdthnEOn6a_G~StGCOoe^v*`{W&Lm6<BSp0%!jDj=&r|Z-4n0;9VlQ
z{BQPnzn|xQ{eJM@{q1_WHT;uQ+&}J3U-y3H0eh}~n}2tKYe=?->i>9PE^XfoEOoi>
zqqkQafO|Jjwt^15JzH)c^!IC|d8j?`e7jZ4_iX(67wEcsrNFJGz?>BZ>PCnODtc~v
z2UKe<|HJR=Pu1;V|IfEi3;F-T_qoYFdtkVK=fz%nOgr2%F@M+Rg|ChPOAcUX^H<jX
ze!bQ6K0beLwol!2(wup~Etz)?gI393ZQr+XW7R)kEd38S(XC?1*v_e(zxVsaSFeF9
z?DjkZt*x<rohxnv(x&p=7Ke5AwI`ll)d#kDfh9})&Te33>b?4X^=EUbcz0lla2Z@8
z9CDss_U<WYOSl-nqUSr)|6h0Ot@~!Zr?Td!{QdgMugv+D>pzwP11%;7YX*mu<v?;1
zmXjf&8)Cr~otY)(#xLlRcOdzbYFIr1l!2g|$RkPc^Z}IwDw&Nn%fsbUCL{09ZJo%-
z&;UDA8Ek$I^0F@I34G8K55V%iqn-zcB~qmgi<!}wM?VmCG}%M)tmkN+hXe%tIKt5a
z4;mn&r9C7dU<dj``$XU}b+oEOJ8KAf-ZVIHXkO3HUfB+89bf}z)Ic-U*npHEs3(gB
zT<8ED=8FY1xV7N0#Y72oQau*1KoE5D5;oAw0lE|d3&?N*oq~!5H~^O{V-W@ljd}%Z
lxQxaM)?gV<32ectfAz(G`!5HcezOqdSx;9#mvv4FO#sCtf%X6Z

literal 0
HcmV?d00001

diff --git a/external/tbb/rfcs/experimental/parallel_phase_for_task_arena/parallel_phase_introduction.png b/external/tbb/rfcs/experimental/parallel_phase_for_task_arena/parallel_phase_introduction.png
new file mode 100644
index 0000000000000000000000000000000000000000..30fb1cdfa3e0b7b4d0034e466babf360d19915a6
GIT binary patch
literal 99675
zcmeFZcTiJ}+ct<IpeSGgkrEIQY0{)8(gZ<z2Ppv*>Ai&B1O-K!(o5*Q3nX+RqM-EN
z0t7@_LI?sOLV#>|e(!$ov$Olh{<E_)?|hko%sI&%&fTy3y6?k#JsmYVT2@*L3JN;)
zXDS916j#_NC@w}^rY4`cT_zVue!Jjfp!S5Kc9?yOd~nG@Nn446;&bBFlNVIv<13!e
z%zVgS<vIVkpl)z~mx6*+qOPK36kxTzc%_4JDwFW1XD}l}=ArOdxury;DwXv0OWjm7
zjPJ%|?tU2PxWe}iDDY%~$xBn>p))%plW*_ar#mX~u@`T}#YWJ^UIfxQQ`lPe6u$4x
zT<IjC4GFom7K`9Ta3`rNPq(LHr)z4etWw8#CJ-$v1eX*g-_n1-lDbiIqznIjOhIv1
zC^G)v#}q10>Tmq}M8vbpQWyVy;`)_t)qfvT+~b<P{O=Qr_b;*iU;f6sH#Xe={sP6v
z>#mpned6xT|EV`Ywm|*bY}1|76rul9B@yOu?C=HnxdQT8lji=n>i+SB|4B}iuL_uY
z!Mp!ugkCH$e&<)}x#jZ>uE~b@<C^2bCbnS{{@acJ@qfPP+ep?~Z&&lUu>Ld(inpFh
zxXvNBD267(-p6OhYU{s2>Bx#f-xp!MnKaqBFbuA93vq%CAKIm{l5Vs<8qKEuwR`x+
zcCf2`XE_yh^jEVH^%oUvN3o^`ZCX9vu}xU==WTSz_Q;0%|4j?!@rwIvGhw>kD1s16
zKiRNYKZ4~UP4%=VUxbf$x6f5f3g<NTE_7{%f|%liA3rP02~(pUff@WfWWT2PI83g%
zNR~9)xt$`$MmkB|lJt6i)Uy!|8=;`+AA*BuW^a;3if~r6=cXuEVg?YRdKJ0#k7C0B
z+eU7G#2?pmp!sn67)H<h;cT9Cb|-o0Y@hrGjUGQ}92VG#3G2u+6F+mTn>bvSvv@$o
z`aa<XE#uZ%l+=2Co5`UWg`$`dS`6Hm_LiCBh17y?4s!={^9!(lbIBVx$lb$TCQt!%
zo_)!8@PvEzvZC?WTh~SYRE)C!(o7`Oe|9)6E5xCF{_*|C((rcKB4n-=O>oWhYnSe~
ziyaY^R7{sB>Gfo1Ym+~N%S!K7SJC)Bqg8zBW==XXwYuH5yxJ&2vPXSvH`+IuuJ*={
zP1h->o6Q+UysZ3Y+xDnrYj#hUh})*R!1QGHPsh|D$wu>^TcO~S2+E_#rxpqhPZp94
z+}E`x>nQ&=-|ECJH*&t>&5Xh<nl8CyrTV0AEIBP`MDFi6&H5Cb#WqOa?F@40?9no?
zZ2PB80qOs{cEoMq$wtk}QGaT58lA<uwNSuJ7o{TqRshq1wMVG^|N4XEM4C?x4Mb_+
zUUuZ^E3PHuEO*Eb2vh1AYGH{_>uUbV?%lJ$e)trJbhw#oO>8CPBme{`DfFCqwL?q9
zmY*S<b^;C=h7zp*O9XcE6^)p{Hhzs_Eez?=-Is$Ccb?ZV^*^fbc{>t-vaq92bd!CF
zlY*ygmIH!tRerP-5qpO*BP2A{5A?aa^MS|(^!ybY^G_Mbr^dEp=;5zAR;nkxuKwpE
z3W}uvTUBxTT=QC}Pt~dVLjHnlyHA7=PqhAk-;btdUiOI$s$YL*6dv)SS{DRy<Zv3q
zD$`3qG3ME1XTZtv9>+OMhh!OQkcxoYuT(jVH|V^`L4Y0dN8kyEsoz4r4?SBE)*Yql
zBuF*W$&c!kq`7m<jW#5b#=1%ub&$M5MUHa{#67nCeom?E_g9zVbDrA%SZU9mXxn)~
z|MyJc!BkB2slHSKJ}=zv!Q-QZz%cB_(*BDDe0p7ZpDaQ+tOZH0j_mDK2)C1xdPo>d
zCvDQ5n$nV!!Al)rfHWvI@9IYNl~WFPXge|IFq2JZX$0A|2-!QPu^95fh2-wb8`eUg
zvFI0;sL;VN;?86}I2^g%(bK#wc*Xn>5w?$5I;=SrHw0`5_WNN)_E&->oBZjBFY9X+
zNCVPlH9gCIo5IS^k(HrgSl)2431*MWHHj}>XTBF720vFuGMmiI*D`k;RkW@*dmtSe
z({Wy(M;GucmR;5iTeGex{mv7DnswF<hK^iFTIqRc%6jJkvH|V##66Go{pi){27+{E
z6-O{=JS3`baT#80r?Bz`{7GI7C4%&!CRwhKV_4Ef`DE3N-Obt)5$l7x41aNSmhiCm
z^WB!PRbaS4v60*RU=IAR_VD3Kx%Wk(-ZKcqjwC8in%zM{S150oPU2e;0=Jd3dmMc_
zMQSg>xoHF~GFh7L95TUA=27HKC$c_`>U6M2>=h6!1-25bD_$LEYdkKc!N_oK9hQ{$
z5kin<MhM#`w~+cRmpb{vvuLlx&pX~*;_gQqr)=w_#a=(q#F6#`U^HINCfy#Rf3liE
zVtbgr?@IA*K)yX>#+5)28dNv|_Y|#=09~gHr6n9l3<;ro;xSOu)d*H@U1^P;u?XGZ
z9CQ~#xcRx1_$*<!7tZ}Tg_VquoK?9Z<0oIpocw^RcPlEjJx96x`t*#s1Tq$WOwQ%u
z^WhFeEr~7RVKwZfAI*(g%)_`l^JDBC4w^)*AbojVJg6G8GZZOma8%bUFCOY{VPE!%
zsh!ec<*k~EdE)$S;?ki(F_v3LALLf}Z0hssbSq+{B6%0Z3QzXMNFagygf{vjor2Gy
zVM%bTXUV*EEDTHp*e-^T_R1&c0^!5iFyO}UJWZJ2yQ2+dL>@fs>mlLXN3L&c>8kZ*
zc#)3md)w#@-*>B4X1^zeC^ilor32k!6n2Apfqy9HkGBz;#i9E9&_BO=;{dSk)mntm
z){#rtBp2>bcmKRl+`|!%;Gx~80>h!)v(an&poZstk;}(Jgp-P-rs}X|9Y+0Ww;XJ8
z`&o=m_!LIv8py#|Q9seb>Oekt`d!a<qqYIex*Jl0)g+#-ZgAxO3Be~gkdpkYbs;Aj
zyb~y+Ut)64`;MM9i#(O<+L)JjYR`a7zxaq&>5EjqiW<11#eCb9u>`u;OyDbIzXh&1
zWTGg)k32m^WiFbBR*C&}Y)+%IJ4NkUE+(M<T+Ese$F-N9CvVa@+*K?Pjbo+w{fzm;
z)LeQ+lmT=2RK>^l!rlncTD9rds%whOZFy%iwI3<t3wJ?=MbxbC(e6Ka)aEP3M}rnT
zC%lHHi+~HhudPY#lNH7IS_C;S)@ORHceBh?pjDLoGmV_Vg70?F7XbHYSW~0695@(T
z4Go$SV6{_HuQZ9fEQ^PO&lSvZ^QD#XaE2-HB)tQ`cJhdP9eWVA9@;Ed;r<9x>5LpB
zP8Q@QT#TO#1VF4OiN2QoCAD~IbW&o`=|o7OJEwuLn{|Qb0^Np(kABqkLcUkTNiRa$
zI<vx20aT-OHE}vUGPTDs(03{0{rvSBBHu>U{7luKJKWzNmzrJ-ty?oah_mDc-rjsH
zoQ+~{KUr<=uxYRXF{us|<YTl7Ic{CZpAXqbkT#$wA#23kV;I`j2lXj_J$<BF+?FG7
z;#ynq+pUm^tEKpiqjh5XLkYQX*te5`Q^6saZig+$^TXH7qZRr3=Rx!5ZsU!JtQ!vY
z+~6Ef5HF<rE2p;-l#BJA26U~qh*wA(G?)(TU-<C7Ensi6KXEW;jZ^9j3e=(TpIc-D
z_G0;duGJndLw~d`W#X(i{V>Y-#@!m-p&k*E*p{$kXenB+N3#0#x2Df}s32BwsCA&M
zE#MG3GB|+q&}p+U!?BDRD*w3e&uZsm>a&n3XJQ308sBsLo4D^#qhn5ZVV3{v@3zdh
zOuMhp^qpAJuwOW;1zK+99u(weMbzS%hNW$^eqO{Hp+lcSy!W`;1My`ml&F&lW;43r
z8w5XWou*J7+N@`F^M-47WaiSNP(M+_*YgI=jk<FmcFa1uyg*m%!zTP-11)d;1Yk1F
zm?s9otb_9f$9^%!`f`r5**4SCHQ8Z^u+};GTas)ljNh01BL{Xkf?+!jT_-PAJ*6t!
zZTw<f;R;iY(S3n07B}LFg=q7>j6A$!wuH4%-|Jhsnwc!T0U>nmGso3^tO>X<lel^<
ztF3v3aFPk21OB4Q|77~)WKAFJxH+~QG=i7mv}9OIn=7B~i)<OrqgC&gqfPTVBE|(<
zZE?D^?JTwxxSN*%zE)g64`G=6$!grAWT8<1WHOH1EZ(QCQRoaiDk5Rs_Gz#GQQ&oz
zyEK!Ej4rQU#eJi~1rC(B-Os?P;nZPuG=vX)NO$3I?o@9rf2M{-&o!d#y!|5f*+IK9
zU}heE3aR_jSU^XNKwAC8>(*#zuKWOd%((~a4||Y7B(GB|r1}b*fC2G!B$VC>IljGH
z6aFld>NZ8}i$#227U>A#ww_HoQoxZ!*yg|0SfAF-?M+G3kw}TAOUJM?5@+LD9UUon
zjU<_Ub{v1?I54whYuK}YG>=%3h7Sw2HMzJYI68(WI?6E5hqag5a*&-h!jaq*>xu7m
z>Tzyg-!EacSAxd4@2a#7moLBd20zqEmsdzgsBHlbL@F6nB4wg0$M@(kZ85FC6;RI8
zvP>y%r>(!Xzv!#I+3`KJGpAp?f%SX%inXEW&aZ3zKm79ocS{%ysEduA!89==qxE9$
zN&1$*b~21kJNIISSTI^pKlhFL;;UJgciQD4-%41i1@An+UP8aRP<xes)+@saM7Hq@
z4A2;`aWBD*pRFPdOeBs5Tf6z?j2)I$^X!Q6FCG?1sr3k2iUw=<+M0N>X*9b>_L-Wp
zWAoCU?*E)D;IK?6?+#Sz#_Q>HtCq;z{suWS;-j_HgR3_KbfgDejov!ueI35FupD1M
zvl!ZQ8drZ*HqXqY<vkxa^CVHbdrb!>LjC_>*KRztg6<0SUdh#GJ~P=O+56ePD4yBF
z5|BNGqU;qHwnqGvG|5GNeouOzjIxLNEb!qyJ=FI)33Jv%ZMt2q0Vm%>P8CQFq<dK$
z#HK&drqejQ?cq?)d;0Sn(o=px(P|vhbV=l|07(4~_{R(tT^{g8A$5OBmT*fuv<=;%
zPxGwnwQAu9Ol1rofEE3F;(IWvt37NcEf%w2J3nVoXlM#u+1iBow}yK^GjvdgX*7>m
z;-Bw9SNa>0G)kr+?a-`4W`31?eJ)4qxN)w!P?CZ*F&V0%=l90781wFyU85&7V6+x)
zG&h;s1~{U%`C+tSE;4@>icT@jSCZTZMfN0!2kFf5SvnA0odqL(bEf}r_lsfBitDs?
zn*%16*t~>Bec%M1!%par6R{GGjaqg0=})@ppRfOUo)=2lZuW9IJooXXTr2;PIt8)|
z3q39KnX<Z-Ui=tw&0V?A<b{K+SmM^27SdMqt_~zQ0j=G~m3Js<w;y|N;wb(Rf9p71
zYw5$M!gk?Q5#|NgRD!W5fC)F8)RIT{4K=u=>46K5>W+eZ+Xu7Ip|SNUYl3)q%jf2!
z#iwc+!NW2?ESGlM5?(+LFC&C`HJ28DQ^|3H0yF2ZpGc23hApQ&Iq(&sOk`sy-XV7m
zch%aWBqrVlft!X^n9CP+3e1>phTQGeX(PjnQXwW3O?DQrc!B=&%dy>iI~&6mr|P}*
zuAMu6mjpdEyB($k3^$6=J&O)xy!F>fLvjitNgaI&)Dd~XWa}0B-7Px&F9Z85=lm71
z&`KIR<ohQ*_gZ`Lr>}*0_%c-I#J_R~V}oDdyf|sS`Ahf!-LyuYQR)qIXX97glR>z8
zsL<17{;P5GeA1%a#>Dg*f&%e_5D&XaI`Cb^xaWeK4(dBy?x>VxVS)CLX~BHiT`X^{
z2r2Ecmc}mL)oG5&F~uEp1*z(6Cf|49ExlI`w9t6h7RryQ#Jr)*c4t-RCBsW8mdwaV
zmM;_(K>N_XgR_<4_3B*6dTDaFqkSGEBXAX6G&F<Qaj@#DE^8&kMGek%q6d|9Ol0#e
zX5m8IJGXq0noGDunzT?G>vI-i`5u{S^UiNCT-7kf`7OT-R`ZuNOnQU7P?V7A%RE}O
z=maLzm%M4u)9nJuGSS(t09!R0*_`s;yJTc))MD&#(u;H=2-&hm>A|Zv9|(nr*n)2I
zAkBEZV|2`jKdm28YyW*9959o1)4*=5ikh`hoL2g86Fbl*)$D=B?T;gflisxJRDFx<
zkt`;Kmu#Nu#~rF~T-k~gdeq7BHbG23P3}%{pH~|Y@Y&zcCimi4p}RGZVeD}8gLlrD
z*WF>1Is@WF%|hc&*eeSU8665md(?3ZV!t6JVbjcENB;Eg{;{!I<_IrdGBIayE)G};
zopVV4tu@#0NDv{^NhstV#|9FM2BjI#0UGR_RQ%Cxjd1GEN~(i)AyWWc8V`!S#|RO>
z+XJjgHXnqhN^NM&CnMf11M8+i$*T(v0<E=@MxU}FPt9agc0zl!`vRdVQyE))Y<Xd0
zDRVpkX{3&&l4}X$_78eL-?E|vpXP~u5K_{vze-A<l08ycB-LCLq$$wPZY*q8EO6mm
z5s<xaY@A4go!BXPJD~2n)yMbHV)kpjrGu*FRy$od>I&6AsMo{mS}fy*95jUn%b$>G
z{F*ytcqfskvu%6ZD&S4}5go;KG6Y>5zJ@*t^_g*k4z^(uB}c3l7EfGyWJk$J<7*eU
zmlb3WT$iC>A2>)Bo}!Y4++ygxOa(sf;c`nh)TW6sdzXAsl<{4`hYb&1nFj}-9kTZ-
z`|9nk1)n@ldYhjWUB;JIA4C_Nq71HDHSTe2xu90)rwCOUiO23xaX49s%zP<2@ALv)
zeVH5gDvRz-i8qv8yFBL!S`ox&+$^&MLZ-y3ut8*u8|^+5l)?saCj~uI^Jwi!Gfm9J
z`ZwWf!(N~iw)Ka|4WU23O7Bl|$Gk#n9%IUctt%d9TURY&9|Yv^KaG~KBl<)gsVHre
znn=U;WSrmeg&Q#OV~~ns4rGsl4q~GiB*NQ{@&=hsfwK<rff!xuEJ4n?IM?4~u@%M6
znPWbSHksN4dMX>f>&na{5N7XLW&eY;<a1%K-$_FJBc>*}YM=1s%19sp-kr}q=Iv}T
z<5!18u<z)Y>O}#$5gph|KKKaw_2MZ1{pczFjUehmz4`>;t8*dShz#>@&V{^6b+3~0
z=#(uudp~h;z+$I<ZAuw10=u_OjFEFJ(!<D<n$l3!&w&4c_Lns|Ge){xIqsGnTK7rV
zjZS*$ytbo=*xsHTO<M}^z9%|EI6&*VUO6`&*>n*N#q>5{c2hMqA^zr-@Jcg&j5$Ds
z+~uuP0T%yka}HuS-!RM-Vy%^~&vR-#g?<u=!>mA5(=7BjlNhMB`JR`3y6DXq^7jDY
zhX*FzU`S{$=V70y8p$NoNVLaUIM#+c*O(nIm5wU<0X7()m#%V9+zkf0AD=a?xmf(u
z-;i1UySKflsrZXN0wcg}0bwgSlBM4_%bsxJLQYCT9Re>~^ztQ!Lp$e(FX+FWvQ1Hw
zorFauG_l7l>~_o%`=9btCN?RgINyn*V)oPQcg=6#faR#^nzNeM&Fg;5s|{|3mpGF1
zwqcA{E9`AaJz*FHE1C55Z(yr08lLO3CjGbuJ#*glt5K`qe`Z6bH+iWpJBC(8nPJst
zA7MaKvGq94wR3NJa;?woD%KE=`uxdLi-CEqWo3TFf=sbpX%-1WrD<$rp}O3H7WN9~
zR=zqIP;+dxY}jv{Yng)L2hBf0!bV!~RqI4@CF{t(B92|xtEKEBCBjn>H{>v`{7TTf
zZ2?yF%zK7M+XEi1SKgY`K(N#t6%!+FY_Fcr$hlSoq&)rZ=Fy}Db~oP^+SqqdXdby|
zUFSagQu7L+i@7u2ltRP1Pt0vhhaACa1~k$KbK%Su8kbn<!j~aFd(eT-7xV*DbiBB9
zM#tiW->1E#C5(*;QQu{DIy?BB5;S;%qRfKtTTZ<sHU(GxF6ik$IuU1MpGa<1PQ=cw
zBjJog4E`?USmqkk7-D#AK&=fBw3I{Q9RG{+J31e~Xl(BzBp@B-%BleItxaM4iW(ed
zSh7Fc|J(IS%rva2<OI;+Fwx<A0dcc|zJrV+;VGVriG)U;Z#B2k=FqUt2g08XuYho)
zjEedX%cw5qaJbFlT*S%?Mw_}8hc%k%249i6C|7>2mheed0Qcf@bUjx?3eO<jyuQ?D
zZ~8}j<dnZR>U2&j!;P|KcBGoUZN2R~WFq68KZkmcI7PiiRJ`h!FIVK0{_&Ynrj$2$
zV-+!L@G?WJrid@HkHuepO%-FRq_*Q{sjeLJ&%7yOPnGPWDYF>P`zSGv?F=ve>su=;
zF%KZ0(qe_J+I!@-zCyUh_rf_=gag0_DE>ahYtoqSxo)3uuSR-v)_ww}6fpY75%rdr
z8t<uK1NcjwD==D3iBGY=uf@8w)5ku#G^~I{Gzz6AYRuMJBS$B5E8`Q#bI}>1)h-kM
z`q8=095)4GEzSbNEi^KAe}mvD^L-Wwc*&%OWZVm2=A(~}#2<c+`5Fd-eUYww+3!KF
zpQ5#5ZILx4hg&nszz0;ee0O=ZMC%2?)B0225p>v${i9$Wj)^E1y#X)BHY$%WXU!`!
zYS*536ukhqxt}fu!;QMm$n_1w`j7YCwIGkt6yGnNo={t8==H?`c_JD0_P@4p#QTr8
zLDfqhg?jBZ<oWKpufNU%ye#wH2$P0XzL|>A%_ESr!qAa0*#8*=<l<V}3HksM!#^5i
z?)~$lQ+g*mRbzzZSX~rZ@N<nYUSD03%^TVk_i~%D=sM=K(0DepRW60bUg-<KDz;X<
z!2<6v76loV`3uZ1L9{%PU2i>j{Bx#Rr_v(@L!5cPUi6lyy~JF?Ms0-e*!{{qcs{)t
zNg1|A94U~m#jH{|lV&|8UiDBSwbUemYK|68iTL}IVV_>6GWAfs4=f$**tVV3t(ba?
z{@RH7?>xjtP_95~fEEKiVg|8F=yyjMdFE!rG%wgXE02$1+}kT7YP?6{%7XkGA+0Eu
z|EP-dA5~F-1}0ewbgm$5pE18XjbK&SRm72O4Bc6DfB6y%3CU^T;Z1nijBJ4pAH=BT
z0D90NJXwa}Gb5@`cwRyq>4&!T6qSoV3ny)TlV93c3o2_F3^^iaiu@y|qlH0Ua~g9$
zhzv&Da4boxJMJQS+n73{K0#it3|BH^?C=7|4<}Q_+Q;;0y|D(Wn6j}3XMk(VR?DY{
z{w32ecwVY0V5%kO1&iN7hgBY#2|CPtvkcGDu|(o;d4#xXUP1d#HXIS*>jgnm9eHd>
zIXC+lgUUBp^S;PFYu({|ud~m=fe?)F2ec)&9PTfDN87Akr^}}mTB)-G-x&9qPcXKY
zhm_KH5{yBqT7aIN!+fj>v7|lxFR?f4k6OAmyw>J{3e`tPi%}`AN*Zk!q=~1Id^cTc
zA!|arSG&z&R&jLzP;LA$AFhI0L|J`Ppf6vXkWZ?VuPg~=9cvUmXsKE=0c^Hlat(8(
z1tAX}Oue@l2?PD&;5265IcjgOu`jxrxK+t1?el4#+l|>ho9CE5Xjnm70FKGEbkV%x
ztbDRh=`Sl;v#}UqQZqtkmtT~{YT`@Q^r233Uk||ucVpbnADi=e$N40QT<pWlU0rMj
zK0ApW^IKeu_%;4^I;4SNv+!@&YPd()r>)4^@G-eXqNP4bmAP@MfQ83VwOdZkJy6VP
z2~D9f^}g|Z%$kzzyMMS9=?|Z~H9jPrjxXn0T(JAG{yYV{SC-u@yiEhDDs1x{W)+F3
znw(rIO{gw65c20DuvC0&8-|2;tj;OCk~`6|M8ev23iUQH{#|(gc!0&$Aq4WN)$A5+
ztJSah+N;{o4tEE8#>#zi7Z#w5v+G&pDB3Cd&bS~Sf?mc`x+5AFQM^==?=HqO-cJ%n
zs#FG+{R+2FIphzx_Q9Jy{$92ZmG$myhI9Kc;Y8hF2!tf_uCc4`Vr16kX*V~kpLC1I
zt4|e+AKF9veFy!Up_W#<&0x%F*Rq%nkr>A;ZU1;j;KwTZ!q}s=3XUC%2C=Qv5*bsW
z-(qsli0joiV&*Ca4Tjp2u*rOP`{+#KpCEsb=ZCt%IbO)5a{O()M*}!fp5%X@B1NNX
z!?ff#hlSu#@VN!N?lqD#@CC@1%}7XT(;*2z?O+%9`fn0jE<yMm=4&wfBuoBsEZ@E%
z?>pf2NaZ%W)#8deiGk4+K?u+h+y;HFPZe{>pDK>CaN-Erq68UtRTk8W>t}nO8oD&n
zOMGg9W4f9<8Cw&k=*ta{_8&%v2&QSw)lT&~Oyr_lk~H)6c?|X51I_T4sSO>oao!WZ
zngCx4=`E+gjI^^`1Wfu+cKGpEc|%tH5hfL6VnPv6-n89Z=JqR1GrLLQZxHv@s?x)s
z9?Fpy*ya<O<etjzINzz|>tjN2$e-RLtW*j7$*2uA+}QLwmFHuuae=x#b+UMhFSC78
zx~e5R1{^)UKl-2X{I~byW`plmn@tV90r;{BMZ7L^*Ho+LL2*ebc`&!#xTXeZrqKx)
z#w-~1x$Z`G3VUOIb##4LDtaM5KK3>o{KJ$c-h#8xX-Ew~2{Anp#)ALqm*3K2Mon=Q
z9#JcdSo_tm)x>Bu2}Ar(N4M&N1~{iHijK$jgTN?ToFH?maoO98;s;<uAp~MOv*9kI
zdC3$^-WvHajn~!e=?D=?5MI3<1kG%H=h8kMV$^rmh4o`S-q&-eS}*X+X9uN*rZ#|y
z*b21qKuYZ}#FB3Vm}oc)yz1UJzg{#QgC0gHMD{%lx6nftMgXWhQYcB5-6$!`WBPeD
zSe-NRC(pCb2F5*J((Y$sio~bSE$(##-;eJYdlQRSZR+X2)ltG|<`Wv`gnccqxTqOT
z`veIk1nth0k<7@9-i%bLbMOsPj@3ZXh#(WxWh-Z(j@cg^i-<3e*FQ}?&hUiv>^Xy7
z%zDtqM$J271u6Ld3<WE1k?9<=6Y_z&SDOFEU%1OgerGH<>{lc&<v0WW^WoIn!T%qY
zQU0Bm&g10#1#?A0DP1e}T229}CvxNy5i%eD_j1QSs`>w9LumY^1*Jv85DH5C_iD{y
zxFOA~!J3m;TLr=v2~8#b#}Z8U|9eF#fBeQj+eZ?8qR#)hz5n|CKWPQ!--7+W+vtjD
zXz*Usn5eT>*q?LAn{%K@>900x9Bkdlbt#MJ&v!fQ7p!YCBwtt2?*Q};^G}IR;`pbP
zEl@04>I}|y$PJ9X8qD|Zwvf3>5E%+yJrsE~5!|zWBg8Sg_I}$JdDmG{pAD%0I>58Z
zvp{UMm&Ioh((5{Flc%CoZ4T={S(iqL>B`}awBZHw?y#XH-wAEw8+>J}g%`^v!&<OE
zg_;*$qApN;mt37<v0pgxTAwayo_C<gZ;3=8+WfF+D8X)@O&9<TcM7viKi5FSfq>L3
z-`}1`wVWx19|$`guV2Q_J3%#h4Ly-M_;)_xvC8#PLQ_SbI*2>%_VZ0nOa4fwGU%r+
zwHSIp$A*iLU=&*AwQBg;eqQGm1T&o(&n6vYNAbNxk%@}+$SUk;Ek~pQ6;ve_N@Nvx
z`Xsj6$2NgbxS;m7!E@z_p|!P#Rro2y11fhgs{C||JyZ0>lhxJQ_ML{2wBGw}j%kqz
zj3Gu9z8s#L1u;Rd4bj_`MzmUvVg)PgeexzDEnmBCE{?V;vyr;ahJuI>^?>vAi&*n+
z={3id_NznXysDX2;z2w@bsW%AzrEa%2aeB(zuxt!WvFXD$P^oi`%`*D`1wZ3a#&ca
zdy&_uzYoHthMm{<F&@zfZ+`i1HN)z1UB_Om|C0ZtzFMHtlcQYHaHe?KpSCyaq4+6N
z@)FUxu^S3$*tT}AQ#~%{hJw5=Ox}ZqVv)_#8#z7+Gl84d-}d-_sE$<md^Xv9xtzqM
z%!+y02k@8pa9ik647>L`X*$Np!=76@GF%5^4R)Hu+QEaR`oPTsx7P7ZOKhC@aJ^wK
zd)VKV^{uizDG;usG4uf_nHL!e3xbIe79Du|lk(nHnAUwGrT&J^ST&Yhf>jKp2{jtR
zl#rEhv%JW40rJMmYt`<33K(w~a=aD{BDx+K_7&Gz$Ap#c??ACezHSyU7!QTM>uf{!
zL3lZ0i>PSrL)dE{`bGBvE2wP}-Y_2=wv*L*n0dfxBpQr&1*PUYQAu3j>#|HJJBnS+
z;GiK8Om_)nV-16Fk3p%~Y#tqBaU62<Iy~!UbS&cMCF-vGQ#vUFIO8HTc&jAc<Y2K?
zk*fsV<Odq|E=j1U53K6x%z<o;^Z2$3e!gYRTs}#CFH@KrouGt@Vvx`9$sYp`<cTSx
zc{2|Y@-ra><{nl~wZ-t%)}S%1{j<_UEJz=tn!vtA_27*hnZEu<g<~}q(!|>S{4a>t
zlr#^h&W3X3KpTqOR|Z}-*?ka7$vi$TeW>*zn=p{pDS|i|C$B%9;%DGSY)v)JD4&rV
zzT3vv!6l;&ZLd|2g+~-f9Y-hoBW%dD0%bw&?01p37VgG00`u%NTiF7>C|X>+-g{Ld
zs2&j*gq=9d4CrXylC#i&A7O^zm-3C;nz8PhZw=qs2GuU0tbq#SfuDlGnh5K?p;<Wy
z+6dQ{TsJOm{}1QHWwb5otO(PXa+0&_XCx*pRM-l*E}=a|9NMZLy0!||kd@Q!`??>p
zKO`NT$p?2sPX8Tk5>DHKndh(k_7xi~!^zovp#U*0cEAKXA__ljpgh8ehl1-pBA>)n
zg-D*z%%%e`pKk{P9r@f8L;SnCb5kLS3TG|kj260W<bI5Aq*6=dfJZ!^nwpw3NQS$)
zh;YYUOh^HYlr6V54g;(Bl>5IcDf_n^fP?s_OsKNpAz4C_u6Z@+N7S@Vn{0Nr`t>SC
z$JsCGI4O-Hk!efoc0zlwV?ROhwKx3sM?co=k$<C6Y=>h0yO!do#as5HucNj>6BB1u
zfvpmYZX^B2+SEq(0BnoZPck=UD!CXNSssWbyC!aZFWxUc+TY-%%0_wh0pKYhI`wU8
zF=KNI(0LRxo-dT>-S7SY7IzqyNVoJ>Z@eauHU0fjrwMi`lmPaSk<Hs-A6yF-9NjES
zTwI}Iv}?e7gySO<Qcf=`-de0+yLR${`^(Bsd-lZybJ!!*&yAGoS_ap7^Fq9Bzl`}I
z-5i1rx1G*&sP+siKyxu4Y&Vk4&OTA6C1l;TkQOKX&2jf}fkAnZ&va$!H40`z%WRqf
z8^W<8J-%dOQb!$HDTmHd<2wdaM6F-jdn9B@AY!%!72Vn$zRST=E>l->T6zeh!}J?h
z5*YbJPwH2eT=bo+0En3}LBUzYiDOR1mCb;1+f{P<lDPT<Yc?~Hmc@6udE+2=>3VE(
zy4J8jgmkK9!q)dvw)+c%iSFyaE%_r(&xp8YL+uOO=PHW0biVoaY(Xc4YRahpI^Wx3
z5M^lFRsD+oM%Z?ge}^JB)s3Ts#j2uKLf=Lf!cu-Bcrx$U2Pd1}!0GfulH&c!#KNh*
zvVSkrZux9_;C|d3d?;fmJHC}KDDMH8to^vs6O;XCwJ%$+w&m-=)<j>IL3R^ed(Wt|
z<0GopG?0JG)-W_Vic&!RG%Kia4f8GIJ#E090GnezWxA1H2y0Rdr1Dsa&Rwn2<7Y1q
z{L-W_mhCL;zJtF!@?eg)%l7p;4834%WnYZ9o$dpAP^^%9-QF}UN5$GEw<#(9%QFgo
z&KW)F@&P{uH@K0uK^5DbgeCZ^PYtkjWohfp4)S>FL9`*||I)-|i8oo8meqvDl6m~3
zp)L=k+{$mxPL^&)VujF{d@;V)PvPfd$h`4-laAV)L);dspplSc<r5$72M-LN=<}m3
z2lxLi1VKW*t}R|kiCTtlQ%@Dtr)YOeH%*Mj&FQ8<o_1el-T4__hpGUEFNS!S19G|(
zjO-wzo_hN_c^lf4FxQ{azw_Jct8FL*2EMKG2KC&f-;(*3?MLY?9SZvy?7o^7uddVr
zv`WB=O<$#tvu$Z42g20)uMZ+RtcBVe$*GSXi=3O5@#Z<o_|&o-dDWHw<CNpKcQ^b5
zfOL6>+ngrI3Ki8NOfW;E;m{ULxV^dA@IBX5DdO0gEP!_ZL1CPTyq(nt+rJX|?2Z;3
zazRZ{jaPKE)D+xd{k6aB@3T(Xr3l%TazPjJxykl{mQ^X3Ej~YtinF?N_T(X;g1pNm
zNcDS|RYH(|^Vx+~pm2XNPjbg<E!(T&yCpJ_k$bYGrdRD4AdRA!2k~1IWk~+>8!iV^
zU6pbkD}376r>`bymzks~(kXEex>ID02s>OHtC-j(V<`!6yPsQ*?m5r^>6+A9I-ye8
zAUclnS$PT`p$YOLdF|#+mS=m;OZ|UuFqaVU>8AKhH^3%{h%#nKx90Skf}O3WS-Ag6
z^C^S+Ip>u12kGE*hIX0HP?&<Fwx(^?-u_eeP=-#CY)A#6G9e1TJffSY@4}yE%sWx4
zy+564!8tGG{8^s%XAP!4RJAS@DbJmio;_`87VmpO#DY*~`AYN3YNEPjfc8eL6^Tqx
zAwoBpEGp@DfJSn}CcvdcYx8vTvK^vc@cJ;6%<q_jA*n)k9t$#VQJI{0{2{|VgY9He
z^YJxQG~N3x9q6ZxIszFhg&NZC5KsH^l@6b}j2G_`S`!Vv+nt_6zgrKqe*6tMT1&@T
z|5n8kzrMXX6vrYy`0f3z<n>S@wmEpjVQ(oI7kI&K2jzTJbU92n)E?fKqhIt1^qnK@
z?+c431q<!JtSlatlB>TJuM_+vpBrH~RhBTh#j7oneYc1VmojhPVoj)`V@NIfvF7oL
zjH5aSb#_q1#A$>pR<2Hqd37B`XQzVJ;sE-WJ4u&-$3rA_LrbGuKL{)mCPE_fiW+hU
z*2QVH2fP<?b^B@75R6C_30nH_ryQkC4g~ycCrFF%BaPTxdDVIrUeGoph3yhydt2>7
zXIl~|NX!Cxgr=>N_cw!x!+S+vZiEvL(~)(U<y}ktBM6|HK^t>qxgl6FFOOI>9MuLM
z2NQ5j2@M6f^|Q_{-HN|TYFCFXmjMi5;8HKktKT2U5RUGkeQwCzm$0a<+`6tjBYW!d
z@VGM<8z_A4hbabAc2eVsO@~-yFo2a+4OymxC4;O9_MpuISt{UWUoLQmNwnms1^WA#
zJ#?vyxRY%d5f6+AChRP>bYu|{!w!m`1H+k`BwT0fd)KBG7mlk#!aLA7yfU&bF$80d
zGo)!bQ&n;_*YTHOPQ~Y-%`m1IS<_07aPTl0k8JrI$Q>N1v3sfXLbm)Da18^(Rsb4|
zl0?nODCRh<)s-_<6=OjBD!Y-BETNL-h%AR4^WCR9YJmXYBb$;~@$N4LuHRrIEs=oE
z)>o3B98ezp&P}M{;0*4=g&CcaQm&~3D-<&CbnGE<82~bdp4i&%{w;x2Kq?_shu2^~
zJN3xeGR9QPgq!LX|Bq)El&Z3`E{^>A-W$h~900zc{v&>vo2jX-rQnIQgwgMG>o6y4
zbv?Gi4e_IHhOlLrc<qdJ_~LnMqVskF6O^aflVs196ZC^CCIAW7b>jlazAYLKZeAr+
z4?D~m_)WG}>HMCnav(2Or))V6iraQXWO-ld=aZnK=DVDaqYNec+6QR~3GWM)%yM;Y
zrqLhDB|OO6TBU~I_Blb7{YeME*7grGb9sV8rr~u*mlV|O<YtJd;B1R@`*(~&qW-dd
z3ZNz8S*1mK?o|t#Ovk0~<rs|=XQbYuOSTEr?$)yYk2Vuzu?>0fUlK^nv<o?YIHd45
zbL|N+<6^`K7P&D4>oS#s)F^T^*GAzBoaE|`&_4LH^2uJ8rGK36YM8xVUg&W~0t(|;
zb`!&wy%z8a&rKc`g%DTWD*iTY1JCGk#OuwF#dvAgo%)W8?UBEL<P0cnQ5t5t5nNOr
zR)ztVg~vbLC@;$kYcoB6W-3BM&$wH)zrKLeDU)xME1UBT+R-#7Ow{w<GX;94A4LQQ
zWfrQ1;b3cae=ueTcQ<r8lIrTV(IKN={ufG!p2N+OS|+0sLMvc7(@}0?T&&j4)WNV6
zQeh{HsXk!VKR9Z;em!-)0$Y?t>1xDlp1yNfO+iEVvnZzOHo8dfWLb^s=nV|;;=l^_
zan7%{w{@gtA=KeV5|^x<<oI=GR_Y<bYG^j_)5Jeudu94}P%vJ14u(v9Np3Wj;5XN1
z%OQpN7bnwf(muN$t{NB=vQpiWbp7STf7$8xGtlem$GcxBtxSqNx{k<uwVYIJ*v1ig
zKY<m01Q9Cq_G(w{>T}+wNozLSv!CH9Nh7VI<Js_zt>=Y<v~%{Hdr@(dUNt(e?A&)7
z*(w^Jn=wsxS4OZ>(Uu!_WJM)ReqJDTpQ%GTz4RU0futzFU)DmML>v2Ski(5nV?8AL
zW1?@96%&PiC7uN$>!V-YRx6Q>nBT_Y^wE|V1p9lF)wwX{uYu0lO*KaMs7&~ui{B}}
zS=^Rz^G(UI-l%4Mt)aeN(#4p<OH9sk0u*BC4)H70KU?O49%VNB<qGj6xb!fvxtGQE
zF+3WF*R1AE7r-49-Z{TY|G4zW0AKP&nCjd28y%TAvCjER9-o4Kz2|l1mwthmfM9u$
znEvw&q$fbGg!6DWi^jhF5d{xx?UtkUY-QAjd~O(U{^^vMZLfrVs=m3!kOkBsE9T4}
zC;w4=SccoXtR49Els=S7XD~;0BIJ0hY^lRK7z--~mEgNt8k9rMjyB+oh@ot0q`~3B
zLoKfv7<!M~Snt7^!r4ZZC(IdyA#o1Lr%vBvnU)%e7=ygETFubt={jAMn1=m>sn=cm
z$-44$&l!TstB=~9((rS%$K|TD2A-79j1ZL*FqfGi;%AOZ7dH|4shDYXNjqjen-~R^
zRN`fO-%-Eohw_Av0&HV}8_;ydlOi`QWLEoWg&Xb8hxt-o-CWnQM}m{`x2`Fk{L~G5
zsW}(8y864|3jJRz3k%w^?WgCB9l1;SQ+$^v5HrExTG3X1if>Nk!{Y10@PZakYBHqj
zD)v>553w$qt(h|V8xcdCuVoTD7JL#L#OB^p1LgD<-pM<JDmRM0hz#u>uXv^GGp*&x
zg1;Qcw;|*|OI%Q^Q002OmSQ;g_s?p!9KHNs8*-<`pTB_pJ?q|%?NH1kcZ^bD!$%u=
zI6Id4aMCHZ{Slj}jbh_|p;1r8Rv_swHv|G%LTyx9G`qu7b~lR>=WqTh9v(HT${MB;
z-tqb@WVcRp`LB{{;g`avB#)1>u+@sCrga6}LEw_8^VzN#nz3$OOH?6`v|n5eKwC}|
zX0H1nd!=&-b1~7AnV^7L7Nl*psYhnHaEyY~WByIW@Tw!{cR)F#>BpzTuKJ-4;#$bk
zI;p@5kI(!^gR(uhFExhz_V#GSBf64x2Yd#8Er@%s_keZA2)W*0Q+n;l;ArG&g{?Ig
zdLA(TGxSoUxl=f8a2`=F!upO-I;nFproC&g<O_3n_zb)t$g4SiSu{5Dq6%#*SkNLa
zZKi~RVQ8R+GhE>SS?*mB@l?886H?`;JWvfB3)>nGHgsbvlmgvpDL(yL!!Tq@)D-<9
zXsB0Ub=7`ntRu=TFU@)YTRUJx%^@S|1Z}yXvgO#>J|NbzYGWb50YEL><ql<-s)BDw
zA)Eg!H98E)b#hIfz}1P7(~0DDidyf2z~4byBB|VokH^z!m0$1gNG6rfEi}R)7?XcC
zH6r#*Bs1ermYE^ZRUtol(j}JUYDi@|(5%Ud%HgYajIm$yn$N=K8tj&KUxeMJryIz>
zOB-6N3uvEv<)V(am6@RrNC&?D`g<aClbYk3@k|f`*ae|EE!Qu~qFX6+I(_F)X?#C>
zTX$zy_xN#WTDvfw1&{y9JTVSY*=iTqeWLW@co<Ewk5Mw3K0%RvzBmEq+@YzC+SnTq
zA;WDqW#Us$xyo8tXZccyIj^a8C=B}K!92r4^-FR9+0IWdV0GP+;hI!{R%G5z&Ii_F
zW`g|cRr>5(+Y|}tM2lp~M~SXPWeew>LI?YdWc$;v4@shrqq3q6s#MR8C#32f#|lRe
z=jnbMf!O=5=a#b%q>D6{s3^ja2`Pfo*<&gE&dg-!%_{~rbr_VKkzkOC<uZFUq-Q~z
zw(yv%P$3rhh(kA8%-;Gw)Vu2@dgn3VRC{+p!c_*gyz2zou8)#E`kjn5a&K~L-@xo|
zj5L?*nQZDbwoKJkcx<N_JCp<ci^fHzcTkmvX0M+@{c+oN3O7g)yHrn*@l!y}lq#T;
zHgb21Sm|SiQkV^_J2vcn|GrQ604<cvmfPN)jnD<m93z)QBu4@r1~t)xrZN7L+sd>{
ze<%Ya7;2hb5?XsL>Iz8?^jVn)t@=?Ezls%aNsm5zeaC$IL!0$vOLZX`a@zA1yqtpY
zcoU9}yYW_?Ey&(#rN&Q(K2x@B6d6yZVC!4dtWJSUn~$*HoQ58C{w1y`wR616<7aUH
zl6NuEsM%Rs1z&V(fM3&KUMR^IPCqkoOSIt3syk$+y4?EO)*Qz?*#1RFvTWwWP5C5{
z1}QIuNJB2F8jPXvxKWf2Pa2oTdfpM{(+IN;Xj8&MAeYilHvhBy0r(WI&N#|X9#e_k
zNfK08;KAd5`;wcY^bb#7jr)y+;)6kXBbV(dm`@)};MvbBLir_Q$+#@e<)q4@?PE+G
z`T4zITzsyS832n;!Gq?&LGDlTO<jg_WZ@~9!0pB5tF6Cc1v_+3Ln>_N=uY%wKFSNC
zhQG;R%u&`5HoMG&(1kDWErGEo5EfO1%_2V)Cl3ATkMKn6lV8l_DqNCo)lh;K_4@U#
zH=la!m>y{wQYlR+jD2*^*wC-&NgKMd%9a1Kf{TKd=}g$@M?oYP>*~Bi$WFb?F?}ms
z&H4l@XrVFNK2!^zR8g)01QDM55Mrs+=i&~LfehqNSTjr|^#OvTd{b1KcD!Dle}8>|
zzcF97SN9>TY2+&weYko0aENdD2h6uZ=q|T3g*HpPj>73dQ(vYlzm2-tCre;j>&Aud
zm5Bt|^^E6f-KUn&<`mmq|6TecN_v?uX#zdJd9+y=rz$Xhv}y&_SHhBFKw3jty3?};
zx0(%&FHoXAYo$a&lTNa`>EeFGTohQi#*6Ma1l9JG*YY0doONR8Yi_+w19t;nAm8L-
z5FXyw6>BqPybBaR1)D6`mff5yVtjWa#$Xas@`p11<V$+Kjm^v_I!#x8GcL?Ayrfx@
z8vG+J*`e5S$$NbUBC6P5cI=I0u~YVrY7U_t_sTPUQ05B}nlD>8wPvaL8rjaMwN4Mc
zZMUR<WVRPFQmv_A)Y4VNc2W-SrjvhoJ2YIO3Yrk?F4v~?NnZM{X`eCSbnXWs!-}?h
z{{f*{$C4h%C!4f8B#mk+**<5@)e+r{j*J}z|4an?&89A~J>Bx1aoGXzh4mI{F*1Iv
zELvn{zx@?k{{BffGi%nfo}2uQ-{Pg09Ib!mrGfV+J5I0h9r3*atF728jS>1)+w!ki
z*K-Td13(Y_uT{^;h!}sv-kAtW^k$yc4L>#{FWOAkJLiY?aP|*|I+A?&HBHF{H6{{c
z*=9SuxGvJZ-OxlV&?R<cqmh6e;p8XV;;iN)=`JSRN4RTq?^1>wm$?znX)woE8(r(L
zkI92Oq}fS((?;Ldsy7D}qvvm2Yua3B{R`!7HHh=CROGfE`KuaO!Gh}~<Q|dB?6y&1
z4|l)U0}G(XbiHHOIdS{YGUM{Y%k+7rFIFPE)m!I-ah-1bD~aI`>#F@&?I!^VW_`;~
zCc_KLqh_%oUBwQ2fm)1cJvzT<4!`^>rz7Jnq~;C6as!B0$f7xfJ)qTjM$7md#ds}A
zy-krj?~#9tR5+AakDBvt^nb^;nN~+mCJJ#zyEk&eJ>S*Ut5tqUeyPsvcwaxgE(wXx
znbMX{b_y1TK-UB`l8ihv>TO1gT9kmaHf{Ap@^dSl%c7PHh_RCg8EPg9<o!7P4Zu^+
zP{9lVV=2KaaJndZ_E(zUHymIeG*E`G)my2Zzk6wkP(h`)PJWiHU?d-h=14cg+_E2s
z1k2A5nmYOgD&r>G?2BD^^lQt`d3MFt@+_Mo8qN^W@$Y|a)XY;>Uiy})GrE@r3j2>Z
z9!+g!drTLIW|gf2)MB1;VcL>>oApZbuUzp{;gYK{Z8j7|?}m5ZO<uk(;3zy>`=(?;
zheu{mJLUAV9x;wh)cD=u@R0p)1F528!*F+ZIWDh{eu-(IK$5Ar-OtsRJO)>&&6`|i
zhSU19fB8pcez=~v44r%HSQN^7TRSs3gtbk(TWV+5sT~W?mL<clZKJbD<xg&2eZK`?
z3)XdvA7Exif}0%2zMgEVDL6ka8yAz$;BQ)J?ZGlWA}Y6WrBucPdlw5lC5q?Cvz@p0
ztUsec50ik!MfQ%e4Yf|3v;(CdHA)q^D_o#w_$RdX((lD*%V!~ACsjWd7K`Y7vgI0F
zTZuUh-;M4~K~nBkB(y(3@iC>TYbXKbr>sj)k<9GTE?d3p6}(ZIZwiM&l{Tf-Hc456
zcZ`@!qf4G#t{Mno#E_>#z;N%nRK8`$bg<u_$Qj6R$$nkPC6DR34q4Lj^Hckc2Y1gC
zd1|?HWV|`dx$SaxLbUr2lSvAwFt}~j03!Gb%xo};FL!<9?#EKh%<jz}kZvl_O+QFL
zg`?7vG(4YYx<)<=qBaOo*|HJpmA~chX<h27dI~ZcemXAG<i0qc7BN@|N0m&M#tYr`
zBV$ll$(xo(v~S16N<C0regaDVeniH1zUYddJ<xA8ldp&S-&898TK0_Al|Opb`>=3L
zHIr*$cta*i@_ucceCp=*umjQ{GWtDQ0+!4|=5;dvpsx{K{T8@l=V1vPj`MKiJ+FIU
z)$67yHW#RrQUs90(L>s=@1u<p4L@Vr#+yz|G%fnA3(!HQ>%Xgc<j_I026pewXBH2&
z@&cvq>}C$_COBVRAb1=*CzBsMC?6QQKiTQ#ZxK5(LQl*T;%QNm6c+jrY&jwNa;;Pk
z`=lUo>uu>iFH~(Sq#sbI#X{C_s@sEOtzWsE=Xy2zRCz@zR=_!5OL%iqJ53Yp@+{qH
zqLgQG3lP$AV6ZQ-R8k81lbU7LWBgWVKSRuR8&s9o<?<ZxM$WQ(B_zp8$}IkVi-L*r
zg9<tG2MkfSd9ptW-buPd0TZrWu`MzXogmZZ<n<{4WKy4r$@La9<PCq1ewY6uGqP!I
z!j*q4lik0sINC%oohvWa?bn}MLrDogSp=q7>K>|bb8x;eCpEyfNP6Kum~jhi)p>U#
ztyRa;c~5Skp!j#EHg3+qPS9liF1jt?S2ad5uljSze3ILP0@tXzc~=ypB*y~bYqaZ!
z?5;dysX+O&xvEGqQ7xEpqk^3enH26iDeB_Ie<0R*M`Du1;*hffH9e1e3fi*u$auY6
ziQ?o)-T7t@k73yjcAp7tX~`wBRv6p4A2P)s)lw8e{pNpS7!91)=NcVignfj-%e%PS
zANDBrJ`)ul(6HHM4>@8`XU>{Kl;rX7_pvhF{TJ?NG`hp4$hoY2C-uhegsuX9r^}!6
zJw&*Ae^5irW$K}YzzF@EMwv}jYt%-x{dN82kB{`?0`23N10>wfWQZCP$H8`Q-tYbJ
z{|h%)12Z!~;(Zf5!aIa`-q=Zd$LJY;(YEY4HICF!D8<-+dC?OsX$4{@^U#6h7M4w1
z40G~NX}iuq7SFqF^%+1Tl`*7{JgiXT|59!lnI{1Dd@eZ|%_Qipd%Cn|f%;tX3hd{R
z_bB_L#~clgygMxFd8Pbml_@iCBjvI|jNWK89owg9Bf*q^+6fI!mK^G9ca|YxbS&d3
zZb}=Oz>SCg{pCdop-y<L$xw8;(&Lmdr>WMe!ANoDjE`W|XnW4Fpp2$hpQH!P#V+!N
zjjq$c-#jU*{Sebu8`eL$3NP579&Rjovn=`&#;9UJ*LQGLxaCXQ&DW}iWjd0bLHLG|
zZ@BZZ1Nq<IkinjuB(tm0kA$WW;82x*N}Gu)_oCNt+9e2M$SY8Y5m!#w@s|2rY|2Nc
z^}$U0#WqO6KsC-#aJ;77mjO)i#CMLKx5ZBLS7bq*CGfel+x#odInZ*jn;XAUx0-Ex
z-m6^F79D>h%aPTo;a+{{BAFCSi<pN6?%P{jjI~|)`j$UNA6#$qIuO?x5JOk_CZcUX
z1hJ5Ib17tB+d{zFUG?1=;5df5`>uR{tr!_O+n;9O$y@Cb5@YqPKM|h|w#;T4z3$|?
za<YD<8PlKnt_<D~c768Q*Cae=@iSz?R2xBR%GI#*?CU1axF&sL3PXNj$rMOITBM`k
zX+{@$odVaE<1tyT4`<{IJ?FwG?iP^!c)HHoL-UH)(&DePe4&_#41*5_GyV%+G34Z7
zQ#R@kSkq*_O(r#BIKx`Z;I5f0Kwn2~`wgd=TBuOL=mJ)g1!e#ljW+8D_$<V;{ke|=
zZWQ89%y1h`!8GaoRNmfR@>cT+#W@08J}g<=Y5pJ7y;oRMT^p{81<@#A0TD2uA_yp;
zbP}pakxppRReA|MR09GEDosD>NUs4YQbGq2rS}$kksf+4A+SgI*8i`yu6?lf!9LhK
z2V5Q`ac0gj$9&84-0vkhEHRnuObLtocUDUV_-gdGSuO?bc!P6(+PQiWE>}o3fwt2v
zAsEzV?Az>p2>Ni^u*vepGZeR9D$Y)SmZtiV{*KQ0O?PCA1~G2O=w;B_KM7HT*FV)!
zipGN6oM7u05QuOMeSH2Mt8-wc^SQe{Lj@vwbL?ObfN0?;yw@Z_sC=YVJh{9R_ccr;
z;$GS4=`Q;8@mB9?ENk9UHpj#_j8&-dNE=BQv*mcTG=UvPcrupS7N;+qrW^_mfy!}3
zo}payz4_9$u|r`wQ_(djn@zzRqWPcdK}Y}$0r4<Y;s0EB{9e1Z`n=EUX=W7TkL@zz
zG*m?XM5bs2hVl|kZ%C4Ah8}dz>=#P&Xg}X*K!+8c<9L}lN*?IN2zUK1bR?6DAK*Ih
zo2>F^=4iT>m>MQN9C<x_=Wh07jdsh=veQT1u9SvU<7$7O$o8&<4?lH&%Qu;2qB3(F
zs8d&b$o5zsGuHtil>ncr*+~7TfhQOlSWT9=CQroU8S2=wMvFbs3ndt{)<|r4fw}S=
z)o+8detjxOt8TShXFt7RK<LcRkwOVHn`5v;nDK#L&6{#il6znB=J;mRX?XSV3T;Wk
zwP$C<W7xf9!}rXVVomZk3U8N>kI*n(aW^&82vFowd=g;r&;pekclJ_WcLGM7=C{D{
z(1t6g*uU3iMeo6cLD90m84$OFphIi9BB9o<29P$od#;9Zmu%UsD?3~)biw2LMi5W;
zuw&rP+v>MCyqVuQs@>s^3W%wO5uC}<)a2I>_-$hcVs`C?Cg=Ljsg|VU8=r_VkhfKi
zzC18k@ciJds2V4jdk5!F+Rl?ce`2uJ#KRZ*FX7FZ4^PWv2XVrVDO{}ED<inbl<vY6
zQm;TR2quwNwW&Z*IPMVJGq6vH-2**}CA4-j`I6olkr<bSuDVD>FZCKI*bQSgyRgX3
zG51$3#Jue{?3OYkQENc4F?060@A(m0%987>1=4i6qr{DQiIZ}!hz2PNC}?mEomVD@
zR=RB(zH_Vj=k}Fba{=@7vAI5koOs^3G-lV5bW2iGobtpS=sIGVi3@VH*Y4}e!;BX9
zQx4UtZ#(|JcK){3Rb;1l$&C{6M?Zhg9P?|ONwxdK8J)XM+?yy(cc2zse@k~YoQvGL
z!be9(XTF5R36IJ2)D3-OU%eA4G^$tA$6bDAx{(<?Gw$l(KcnF8fy{!Vk=BZhhH+;T
zS+xZ3cCSA(NuW2${Ok5RL2eM?Sx0qDDlJ4>YlLB&WAy#bT;nEZIcl{({=?|X0r~gJ
zw%nP!@UzY90ooztEM(2dyEH!gQJt${z2*DGTKnFuVY-HPW{XTjZw;SEvnf2{qG?4I
zLB=)vBO`xCQsPrArcUzS3SsrCHN-nR!i2GLdx6O#je}hg_iMBKi{kw6*g$W^MCT5X
z@sK+eUnodh8>dV+A7i=Hr3#Jm7x8+Bx5>wVbI=iW^<jbRnVU7;sd5%OCK?j=`=ypD
z7Bk{rUxM_EJy|Wpn8+n+HNE_73o3Vc($ZFGOG(;4-+8-NO5I5BszBM090c-do~yY0
zM7OD=*f9s`-uDJblNKe(pXx{9zEUees;JzRhhyF#^{2~yGdzERlEE}nf#nu|iDmaa
z{g!c7x#Qo<$6?AVO`FuXn4pB1SDCSuvw!5i7BZuTs;fmZ6}MmU^cztW)h@iq*u`is
zy3ZmQ(c>QTLmc6iH&jKtBd<qt8(J%t<aE$;OfP1Je7xI{{@U`^2dL{{oeFD*iJzN&
zP$(S2zZte;=b*-h*L3W>w(S9w6@~E%x0jB7vLtp~tB+)1tou3e5-VxCHYLP_O&`X8
zri8tWnwi=k^>nmykM(svdoARNm#MM_Mb`O1_$J1GqFpKF=Z7V4pLn3Hc(5Av=8>l4
zvlrS7sD?eC0w0rs8$x8Pw4_U|i?izr!G>sV^>2BvD~7M6e%tqT$<wU248ilZL;{m%
z%nZ41dWwh5gyUXL5j+v8*sNlicr>!yGVy-m!+a?Q;@VP@hZ=P{(U!)Hf&M8x;<l#N
zig1Qps`HCIPsy6PrP2xSN-ov~hR){?;!QJ27dz>QR&3C6rfH^cwc2ZM_w4IY6^e-d
zYsqgTvd&0>XPMl>7&HC~=vs(3R{K}fi0_PjlG3XwNMh&8G;%)op5}!!P$P|CED_{6
zqK6BqB)yCJHMT^hd)Z3`hiZm7^<r@qu0GKO-y5q1&kk?5Yv_j2Jf7+()vRz+tuaCP
zK3f(1?zvuSjHIr6h0Ff3+dHWy8mkSpti5uf-m)6+(I0n=jXWn%n7;dmvPZ-4;n(0{
zky7Z6|FNHMFf}NMHwT7v&sWyJ;C#_&xNB=T0Y89`SHJe9Utgy*A0N)Be5u8RkZ3j_
z5HczS^u3qhbEFP<=BD#nwK84$mlv6JM5bA*pKs4RN4A_+?XwO2DMtL#ZRLQdahh#L
z)1%=E^dxxE*o>$a$mE&D#VUHdKm9!BeS*)ihw}t_PXIeI>^&NHsYm^17l=u0Gp~~h
zK<16C<c#IM1O_|h`Qn4(hpQeXks^6<RMtac4_AM%nsngbL~`{f_)@S@T*dSn>WUw!
zpvbc<J-fb1g$y~QxCSq+dA2XiQZ}cBzCq<x#_yyY*xb5Xty)iZz)R`tyz&D#4DulI
zC6EX0iL~7O+hc(*+KG*nS<7L|&b$ka>rf{Cyok2&(UZDgeNydalJsTVrz@{{2&R#o
z7nG@nf?lcUeltci*cuRDpw7=kzp)K#8;TElzT!U&@rg0?9H&hCdZ|%Gekfq!U~*66
zb3aMFxX0LSf${cIS&QLcBlQ*8m=eE1N9nFG^g8YNWcio`un_ZiX0aH(0RzgFJ{R#x
z>h!tG7qqnaLKnNw=ck7<L`(=?k1RLDiH$9#kk+1B$Eo~UCRybyDp;;v#rfBz2ho`*
zeUG<iY5m;92-`w6FOvdcbQz#Tj`f#1bM;k><#s6uF1K0^nd+8r;w{x*w%-lB{W|d@
zTmL+V|HnuHX2|%Z%dRmZ&gL^JkxvIu6&{%>cgRtugdXHCF1_M{bny7&M)ccoLaMsS
z&-ql=f=H>IHR|02>jJkkH!y5ORZt-)OdN!tCGKA8S9GZTaL*8(HY`!7K4Z?US#aEo
zo>!ugr@4X;y4T`uoP}nSuT!_Xqba^~x8=pmh3hhoD^H}W+T@4S<|}F?C?e`z*;Zk}
zdimu?A*%Hb?^pH~hl3C;^ObYI#EfX15?cb#-WYrIp*#=%=jMEzFmiQtPCDk}O^c1c
z&&n-SOE4duVBnLsgP+}NkHhZ8c{IwLfgiX&W$$W(%66h~hHf!o;)hM3eePTh@|`i!
zy;0}69h~uA!U(c->>pnIflETtope(1N!)}K879)a!9%=i1N0fiMG5ege%Hz~>W<$`
z=ny|fFa}v$gU||6;QTzkzC;!}p&qD=_^dFZjjT?(uddd0xxSw98adzoT5AAob3XnF
z&ot~(UZbroW8z_zoD^M<(BOqKsfxYG%jCD%2k*D6Tj~WCU1(Q0On_9$(~91GpS_ec
zDac1s)2+W<=ChuySSbhooS;j}NP`T|Ewe2l@D9+Rl}rV7aq}%)T=m;q#vHrnO2-YX
zSwOzo@UV7cgRvb;0I5x^)dTaIyYh81t6lo)&#V$@3T6fjVHzsYf63X)Cj{bFjOr8(
zS65$W#-`cC<tPh4d;M{Se~&}*81E97JYl6*F5hek2)Ive4vBOUJIO(D$qEsVhh68%
zPP;VL`rz@m*fC2I@tH|A|6%f4{^G=h@7rSLMr~S^B`C$OFg(4tOoc>o6SgQ_zi0Qp
z1}z(13WkpX{0Ix>E+9KLS1hk2X`C=0#UBa>tLJUz+Mvui$$;CK!U~;pZW|~xOM$UY
znp$iI-N^3pMKZp%f?d76*nY{YqW+Bx?d@2qMNEA6F)fNw(<=l0!20d0CziUSuDemS
zN9nj9-yV`va=6P6ed6sdu-VBx7F_~-zKjs3)g*3mGt{S^fYdi38pBM1aDH>Hp2yY-
ze!V|Z(J2?=J@FW$E;X2^p|7lZ(X80+pviMzX=@<_VD!!9ycENMjME8H7%TjwTmx3t
z&f>NDm=98wH4DBx^Gz*P^N7vovsc5>(o&r7({`@0cFFfiNdRS}Zhmc6Obq8oyyTgC
zG5Duax5~du{~NhL9C{8_8z({!mwOw<HS{pUtY-9xq;E`iNne28h7No~F%SFxL%eJD
zVNj1ahnl?9v&Fd_+>vDJ8+OI7XM_AMKwk_eHwJw)@#L>~)l%&!7&@T@(ig{ZT;pl<
z8UBgM_CEf5KXeGftNuXxae-W~r;(f1!z`9y32I_jFM($A>cB?cd|ugKNPeoJ?^Sg_
zUzg0%RTYnw5?qz!H7>>V#zdGrzkPL{ncBQ_Uq|E}G#xqBeq!?4$;?;PhJUU-osijC
z#{G!YO^jG7{1nOe-9#j+;wCwi-Cfa#@w<hx%~-a0aZM|$VgU1tY5RIR^!`WyRuRcq
z!N`$#n0Nm$VVLd+bZf4TY9AeTdukCEs}C{~@??f<iz%&rGz>FF-1-tCOakcl{(kcl
zIc+&RrA{WBv3OgNWPL6})o8@zm$Shnxg*`@;#K3!*kdSy`r$txhaVy9<-4%%LuOG!
z9Gdsy1GB2vIo_5HXzaP!S>Dsm<uz}iG0Rjqf2W*3cm9Er+JG>@l(u`rVCW;zhsMyj
z6py)%cnrOF@y6g%6DBOZ5J{i^6&d!qocmcv!3-W`F5+2JgDD7Y79r;-EDE{R6wj+t
zRzLN4RN+@u@4N?e0zc{oZ;JRM4P6d8p19}S{scE@kt(v1)LTWyiaO5b6a9YfMdzYG
zwLOs28qNC%LjM32!m8O1wYR?Fa;=PM^V{?gPPK;5?NLZ<z9t>{heu351_=pvVp-x^
zLfI2pQny}ZE&b)tG_)ZuRfCSoR`+p!=c6dF9xKz#dI~Yn9;XZE+%>7QS$qz(+=kSy
z4rDv)cp%jrjyab^YS9Ry3^I}CS(>Xx>)dfjq|TC3VvK##7oJ-$(q=<##%DuKJY7zu
zZmfAD4UT+K9qE}16sHleW>yMyYCuboY4dd+o8EpMV`R<#-^*J-&ln4ohl4t2?zq+6
zEu)#C7f|~V?pIIX*q5&}F5$F|Zg3K-etE0Jq3-Tk)EUFZW4%j}GCNLtQskmb(Hg6D
zva{mBv2fc^*cThKXnHb96oiT;<7EbWJweOg8lFLCeXC@0&1bAHeUeaCHt(Gh*V3{P
z@I&ukdyAy=hJ~Q@{ws^)?aXHfKF0tEby9`R6rhr0MOZA*8N2^EhsU?QI@w^JlVD_;
zI62;{w&F8anqC?|QQ~Xo@5N;Fp4U0Q_7}eNy`}7{(-t6-CaQ|e(&%R^>tp#TYws)u
z$UgNztiO*-R?wZ_Y!?iOZjZOQOgZk^8f}wba)Z*^5%$zIl~lo`+#v)RAEn$YWFRkk
z8u^u$InQ!AJY0{#`~sO8TF`drWdo2msjwC@7!DGj!nMY-H==7Cr)5DQwI$*qkgRU&
z3w21QPC9JDsQ>llNv4007+fGs2$>H)CjR1^YvT*)?z&teYKR#welpjmQT-EB%M9xi
zJ;di^^nbWEm)^*{m(gzIB~Y_U?BwrN;)}P|TX_zt_>ggz2Hhg;I2)k@(#W)+kk!wk
z6}N;f)mB`w_`eJL8_IMGv!vaZRr9);s$-yO706($y@g8(Qv|i@zCnsN0;_Xot%!5-
z(#W0JC}X?K>oI>g%?1bT#wv#Xc@ieN`GG4UFmS?sF!H*zVt>nHKC-uX{>@UB_Q?D=
zyKh~e?T4<&=r)7jdpzpgIfS^UVN<iMkE_0`P)j^nnK*7&`6I16V|YcK1UX7dvAk6>
zSbZ>uMM7b=BfCv3N;-w}i4$1lT6JmeQK^r{_!P35foZMOa!R=}-|K{Q6_qmMIwsfa
zsrQEIPo6l>DG?M7_P2Xgt7nIS+Wc$ePV<Ar;<YTX!__*J+aFq;L7mpGmEVOX-V~v+
z4l2S^?;1Ka%13kcOS!EWbq+{QjQo_D45cCLN|$sglCUnF(W~Y)R)Z#_t-Kg<O;>~C
zc`BJ^i>U{c^G3|`kT3EA8V4;JhAqyJWr<2N(f7D3^`-)C_in_n8nSVFaxEI9ha);p
zLZ<Tdf`7k#{c|v4JnvR_uv9A05+yR<+(5d$-oCqem^nqEd{lGT61`Gd3RV`n0wM4w
zjLyg--LcIXol3qsICU^^8C+N70|rfk3qys811Z)f*>_g>8bsHy0<3+&-?ZlA#?Ca+
z7Q@%BX6BW1w?(w%&4JTak0K9iE)P8@&Bnk`+3}pJq`;5W#IEMRoF`88t`%XU6l$jJ
z0c$VtoBjKq&d5@9wKWvJY6((BXwg;&e8fTx;aJ)pAr4KN{<sS_YuSou-MF9aHh~se
zw0pDSZ>?{$;(m@y5=ak*{ZN<Nf^{sS|1jPhvA7X~z8UtyfKN9hJH)#dC|=nHwrZU_
z#e_Ig9dFk{E!tzvR%=hZi(FUq><6u*c-!!$_iD>qbb`8-b$v?5=qJ=X!Re7?eP~c{
zEnBvr_eT%Rmdw~eKU5?A{IzgCN{`-3x3vbco2Wc)z2c_ZPEB{mT`*;J9O8x-zww$W
zC}ZE-tq14-1N$|$gXuV;g2DzdrWMh*Q6s%rlAC21V``_S&02D!;;Oh({VzR(BU#pq
zm-(~%lGMmut=XlchV^_tlq7=f<vjBlva5Av2h(jpB)zQZ40#;uxOt`5B2j#oJ{%5Q
zG<WU%E?r>wgVJaRPOj^RmFl%(a>2Li>~neLPMPCfqo;Iob`Ek^_A>c+Op4@ZU;*)*
zbxM-FW@xJUa~7mZ23t~55OI25(+{{WCqTlaV+x+kY+93=gC<J@xx0oji`B2Tx>($&
zDiM}w>#;*nzG?YmA1;PW9o9xid_%7`FxvC$7&yKM#4fMDrCdw6{L;>|WN!_2mbyAy
zEdkfd%+bf^57hF$95cF@i<ZqRKM%EV_{-33%uJlPt-)h*y|x6LZ!*n$z;HljR!=Rw
z$@eq7o?M8PtWUZ%H7K}*$u!MV4b48OFl68K9k5j2ram=zNdb`omZc#DD*jE5NqMO+
z5Lk~R;H=N&TNtYH6}HM3O}3Gnk1uZBg5^RMWN*duRPPSk{5Z1X=v%u(PP<rI9H8F2
zhF4FOy=Hn!4o`Uk@Ra}KC3!JGouvGaWdU~W|K;`nBXql&4aw6+T05xP+76OgOZ+mK
z<ci+L6lAR|YdZB*O?dj#B!83)4*ZO4_4890R<^Rp432U7MdPf#7qqPDZC(Yd4|ad^
zE}oa<#W^*A(X=$@D%uO2*3W_$_p3wA$LY6}40B)vrNxryu3wReCEzxxdVE9<C)X4&
zN!`M=3+0F#nURcP;&DkU)w8Agu_P<h1*XSc;+OAmLw-SpEs};dcW&BO^q1<#fW#xC
zQyg7ob$WDHYj36|7P6XP$3%Vto;TUsVQtr#5IcR(I4)LL_g@JAb<{tEL)3y?k~)1{
zm1!ZVVK`NzvsR=b`D%Ztn3TQ~!`QOpR5aioXX1)<I_+*+-VYLbB&eE?9)2`b@LT-c
zjI3`X1O|n<St7`s${)HgI<0;3Vmue}Y!(>*hE5F#r-zax+`>I**?||qnu0976Ptcy
zm30mEju7sVdfT%6DD*ihi&H=J#FE%LFup}(#;;Y&#YdOivmN9w^)I>29;7&UE&>Cb
zhrN5gHAaoqBiczEaSAWqUQ@eRKS#AyIKokoiwNj`B+FRn*ea`UUAVK9i+u+Ikk_wV
z?B;6ob`mZV<If87p>LiZ4frD|!kP1u#f-@bPOC~%5w%Q^8jj8G(vA_HADB_&IYrs6
zV}=ZHHh*X~ByWT7{el=y+$$HIe#o(<sTNiN8XZjhqI!epvIMQYMqf%$+6a>@Rv`BT
zt}EoY^epJmc}g2cj?_RjgQiEA?G=?zy=fo(8AZc6-wsl;EnzK$^gqc;&9w{)Sa#ew
zD}35qBpuox&dQf86Q4t+Uo*}rNr@I|w-;(O7>rK8*5{<8q)dHu*HrcS$}023*e!>&
zsco8{YIw3INjEtj_aJj<Ecw?!Lva69ef3Y}MCRX^WS$`%-(O{O(Kc;O+$`18DOsW$
z`yY+y)2FchG3<(FYd&i$X3M9H8`7!CGBvwlOLKc}xi2(x7;y}0?Ly|WY7}EX&ne=r
z<%N1tQcjy+>W<%PxnB5YX0zeZ-8!YakQ(ce>|A0HKC`3JBeQc0|7y!DuA1xu*`Lfd
z>%2?V4@~>ZsqPr{s(hP+(xKjH(r*kGlykJ24thj&=%Bs3bl4ynIJNQ?#A4zJhr<oh
zVUS))hzR9^ZmuBvAL-91l)lA0VdIIhRcyGj!e5*QovlmmqLEKaE)8eBAKl#CPQz={
z^=J*)af@B15&8;uY_7ev#*&r-gj&$kzSj#ZJCX=Zaf&87?XI(&sQ5jrECaJNJ=7}a
z|3I~a|544O<=&t?^f9TcsL}AP|KJg5wSy+pbEs%)MQ~yI-^=Fq2w4{1UGQGbL=Zv=
zFIK5a&9uCDF3U+eV$w@(@w6bs>I^IyeA9{0wFrUx?*k}4DxL%$3Q?Ww%a@k0x6DIy
zKW3<?923GezTg9w!<Ew;Vn?#~=~j9F&?Poo6KwA}Yi1h4J*4|(+7Y~<w`;#oofu%h
z!4bU#giszk%RZq4(_c_>p1vkA;w-{zntf7Hs@k;uCxz6JG5yT>b^`~vJQUm+Xyw~M
z=U;a`CSOm<@|EJpx4dR~oD_Cq6j4h9>7}t217g$tA<W-0SJEsh6Xvp0^IIxZ{^r?~
zs`wK~wR%Ixd=JO^py&0ymOiyWR+F4K)xpC&Ti{(%v+A`Y&Iim^TMdo&_bKTy-x;%)
zZtTH-=*|^qg-6sI2Cmi^cOd$MED2dQh8CX1D_^w6eyih#jVRjbXCjD5-L2}Wa>lmr
zT18bJ)(0ddZ`4LdCUGx;cF#TECaz|8(B`X=Tlq-oh}~i1dAHi_5xfSqsKD&eo7F<a
za6ysYiD$@@)DND)A5zhrvW(ZiS8Dzhj=BiH@F6mPIuBaCk_vXh<syt3tfS44PYBb&
zSJIz8iS>9j5>9|dB(ob%e%>wTc5~ZkIZSXn*<VdtqaO|BOh=Q*{crVpUvFz*`_@PP
zGaaK3Ti9fqCV6J!-`xxIwUL_tA7MVW*<aAu)Gk@ECoM~p6<!Bp&jHVK5%?~=;-m4J
z&hVQ>>5@N4`zO?Xbv{el0F~d_RT%!MCJuH%A7~fo7SazL;4qoBZfA%);5-Fd=Dyfp
zeYyq@15N$Xno*?GlEzLtZl^}+lOb-nwuETS*jrdxcVEvH`Bf})FSvL)LSZM@QxlzS
zGzL=}%C{*Y_q69)FRgdg7=AwhPJNePDvl@G%@-|L{j{%S!kj7&-Zo-<<bn5CksfZ4
zkt!NaAmVnQI~9KFDLuRgjpw;?RJSw@Exo1ZsY*Jv6JM9AMm+V^8P@p~dImI^40q5;
z`K8bc#$iv91t;`%u)Ps{R%1+=6*J;z7{MV*y)kNX$vf#wmYrXIC5?O5+ce;I+VdN0
zWle&d-X7r39b;B%L4;h?hzDv|Dsu>N99~zKNtM7(PYroKbjHA0yR#WH%?)i=jd#V9
zIeX|@hbJdZ`9#6`4<(}YDN<k={TxfK6@lG_mSRzUyxisS+c67h{MFoDmARcboENn6
z-24^WEAH|#sFb|}Uuq0ZQC`V1sf1h<x^xGLqZ2bkOVi@LIJ!9F4tL?(B%bNVnz&&;
zp<8#1-+y1qHMZY5`x1d{Wbk`_CLVJ363|=G=qn)W=O~Tzq3J3#@AO(GyPp1i(e-Vh
z<ZONl_R=s_5hVmcT-^V%$fr3`&&<f=q09M^m)Wd^;k3_A`r&F;3Z%T*;1Af<+kjlQ
z%BiOBRl3TPS`){XOB!u5V~Wf!N#7xM7MXrNbMe<E##UDg98+Gw?L=1_(q5ry_?>3g
z@{~M{Gp3UI?ykCO+ZbX@hBM)N#8=vydkoi`DBXMZ^d-!z<3F+O$EXK3IhJp!8Gh?J
zK5u_f#7FoR*AgkppJDy_)z6N<xC_)6W{ZtR+b+c5OQQXDFl!6;L5B$pSgT3jbJc~g
zue52?1J4CV<VR5}1DHAJZQgdqyiV>)UaepcPbEYqDx4@GY^t6dDAFe9AfW?Q5q9+x
z@yt(U+(YF`n}s;<X<TC5eSmjRR*!hieka$SoPpebzE7JxFj#YpeNsi*3VCepJUp!e
z{2(KFk@_QrK1a@bEGy2(4oFX;PUA@nV}r6(LQO%1>mHq(1YNrvA!tIIV*UYUczDwF
zdb)DQto?5>q0ethF|Ti5{?s4vdqZS(y+piS4mFMY*g;FPK1V$<-|LzKyEHxE>@d>1
z`#p(KVqI3M39{fcp|R{Nuu@5Smd7hNl)|~3Kf~Xp;8WUnkyV8}aVFl6Z(RSE<|66w
z`j!B=bV=p^n1l5iIf6;0nkwrfDY3600;A4eYw?9`8Q}Xg)xu%Nqmv&DvZgy$Xmm0Q
z16CYB00hc-`GjJo!sf|Ix9l7{x^Lw_m(=#)?EM@$Rw%v0?Xf<Lj;)?}fBD(??fCwW
zi#(Z@y8RoNP>oUz^^s6)vh~~=^Dq@i#+Lg-CX(}Dh^yaV2=uUQPj3C|{t~RC+mL{S
z+YoKj<LQ|hCB4q?UJa3)iMtwZ5_|AtEsE8eyb7K5PrItQjER0^wBOZ`G?NP#K3aNp
zx#>X9`|E284d3inNx#g`>0)T(QNm?YbL_O8wKPTK8J^#+s0jiEj+2jscuQmDreba)
zTBbE!k{KOZYi#X}yX_o8H#y}LD42Wm_T|`x(N;=+#F*uX*3W<R9}G7D-`#Jqo0gSY
zYU*sq*ay}*wC|=tUAbk)|Lc+~KpS8+Zy(m^af8Ia3nc!2gxC{dOPv35PJ_~dSn|*k
z>0UW~l_aIr$(BB<`4f2^idHX#K1*LdUjq~}URyjA_(7Ean`clb{Juulmw?J<0rtjf
zxbcKed@o=nmzs!<P?-~RVUV$o=TW@S^6-$1LCp#LqmaVmd@(_h%DSEqMI^@4N?&tb
z>IHE@#0>5vRycP}-#Tv)wZh|d3;ES<-kk$m{nT+paK%4{Hx<Jj{;_eV3E#K$<2r}?
zulBSIPY;)cRF091tWR1v$cuH<NKqV@KunLl!u0$Ff4S845xi#O3-a+YLeSaoo0Q&M
zLf}M|%^Rgmwz&{K;g=;;4yXay;nmC3mOkyuIzu}$PmZeXIz=o^Lcjc|*_Dw~yzc2~
zu$F4}3+ekJV!t8^H;W|~n30ZQ8V&7H^fY>{I4c!zhySciQJ^R#*K(_m6d6yd3&sS{
zB+YnRP=5W2(a_3&c(patmRubkP3%~5frbZqpQ!08I27FuPn~odDl<#v(t3bO%fOTE
za%{b;jL$n3_V|!(FsqMSgyo|d?ltSIju>gy5s!dsQ4W&ez$fwCp^S$-*>XRjK(3%(
zY+0;M?uW8|f~aN;@8Hb!@M%s>Lkf)d*qx+Fi}S{vG8r$g(~mk9kYtB+B^kqE<g4X6
zePDvZS4Q?+G>ZbjuL`&IX}j5vj74&)h70~D00yI|A|4GcfK0^Z3Ypqt>2LMl%IQ7(
zzC_w*I^Sh)^$TEA&vbvhAWyT;Hy86HV=UbDi(lwyviE)AJ{8V7m6|MQ8-wcujd_&F
z06g}5V9@hFP~MC_-3Py+PMq=B+~Hxw&c)UFRkimq+Y_Z61!~z=>?Iy+{N$=xVp@dQ
zd~kcgziUP-<y-I;wl>Mv-G{m%TWs$u3O@S5s(Aw$WVb%Mu@Y9A-sZO!QW!EyoX!X~
ziTFuWsY5><ZTotj;Xgm)t)6z_OBSI!mX?{xKTyM#!qC#M!V{sxPkY=33b-LK#Cj+^
zI7D^m9F0q#jck6gZlGU%)icU%ps6)jV-%EYwe9mH3}C|(;#Qtb(9W{p#pwp7^c0X-
zdlSV)D=+8LTI;K$oqXg+<)MRH7fGt7esle7TWh*8>_$@s3z9?PPxg`$(y9+D7!f&P
zZKb&Q<hCaA;)RQ5y)}Et2>@2c9wT$O(zTn<h`b_n%;m@J&bsD~4E+nd1Itfxh2wca
zH>eHWM^S~58u**@RGFzNc}`S<n^qzM+o67;H^H{Xm<{0h^7Lkh5`z-RpI;Q~o~tuW
z(}k4!d{Jwc4&-1tt-^rrtMt-SYJNI_7j-g*bVd&DMM{2B4{gMCO%x-zqC>bIS@Ic|
zsNo`R)BFP@{A@#4y6Hw`|1xM7ePho_<9P&6VEjC`IWoljKc~56%RKiBVbb0D03<>g
zADzo`fh8<J2bQy?i`5hf7n7EL#<4D6KT+0qNpQ2YxidXwGL4<O)FfBW>K2Sr4hQZR
z^PYd6oA2U>l2OSNo6?5o*ma6k9jv@AUWlnKo01_|-#cfqzSFG8HllN*PP-2Gp9@Q7
zEz|8E;#dFe5B=4&&{QsC`;C^CE89i&-g6NTzwlmEf;+|vRmCczGGULx3*ZM2V|aBe
zZ&hT`Cx3?H86?Y7&`&?}id^t-J93s+f9$%BawDjV?8E-u_`qq;W%n#lcZe>s4Onk_
z=9Wx2bXzc{t^Z}|E<l+x=ebG^s<PH24fd^z$(=bj8QA1v9=?G{G6ENykf!0F8}3}Y
zOtUvQ#}kaqwXYPrZI7*sfR-t1>6K!C`c-MEfv1KxmOrdz2;q8yOJcXO`bqlW|0aNv
zxg6F7UtrmzuR2c6b+h@$?T2YeA5M3i2%cyp`**(TVczS1ra+uNh)8iR_jag`aX)%y
zp9OnX`pQ{@!nv~|0UI7%!A<2Rp>rYBw(uJl;U$nBA0@Q|gJB{0Ic*(u6<A9eHmGV~
zKG#>s%6Q2Su6UjEd)wV8@}-+VNSdDLX2~c|XL|FEGWFgqVYl^B^L$cK>Gak2Ddhqq
za73vx%-K%*ZkP#pp8A3>epsmTvVd!$HQl7@uAJjDihre8^1RMs)q%amMP^cQm*(Zv
zg$>kbNh+5BkPtj5OO)8yy@3rMs&bnHW$qjUfs!u(0#a;f?G<8@)vTAZbg(oBlxC%3
zmEe4n?*4QK$YUnJ8Hwkl9L_YATSFBCEk)5Py?)E1vXJxhT8pEPRA0^O{=G0;a_ssq
z+4%H;v%~<ACze!Tq2~j@iopO8jmARwvzGPxfDr`hMTH{<kluCO(zpaJxgM6ILM-WT
z^>Kul{`>TkMbVonVo1{$_-3Bbi{}mcor(P#sbno!tR4*%IfgxiQzeF0U>%fV1o4Y}
zi@P9wv>#ze5thtQ!MD5*rlqy;n~pV2gtmD|KrVRw5opuDJCdnjDNVCKcVS+vdUsKN
zLT6{qj)e%@&Z$URZ8sL8^Z`QyD25QcZWC--|1FvH6{e6gV)$BD(mq}<zS>`JFKVm!
z@zM2J1~Awr6}CW1CrLGA%<sL+OOuGqMA!#3e&#kP4XGsRQu@(T_?^+`?(Zg{qNJQJ
z3|ZV6-t{|k@l||lzb4M^?R(hNG{oUUP-N#=XT*>66Mtgw>bzdqbRx2aJ2e<80bjOo
z&4w)y%3|dE%;!dq`xOkA2&XbL71lI{08P~2RThx9U(Tf#%RI!1hv&Rh`|MZkq`th1
z86CNL>B3J+A6xg~**=?d^Y<wbTKYfl{g2f|Mpmd%{4&)`XVgY<W8#`m=O-^)OcnfR
zKs(eNro1wPGSAk4-FiE#(U@SgCXgCMztwh&VEZfFTf-J3g1TA>T?M1zM5;6Cg?tPw
z=gx{{P7Q2Vh(A<t^;bxK`~Bs*6iECZptA4;YeUQU(dr{Rg6&F|C$KUrbYhG~k*d&z
zTG+9UE2l0PDDYT16gKF;lUBIPNUpKqbu(_jUw;DfsLwl35ExARYa@T?G6Iij+S?D-
zNo#ylgO^-6>+Da$t(wMe%Jk|54zp>=VKk);A5OCN7sPrRO*FRuO!ZW9d$S5uc7kgZ
zFUuRL+BG^4d_UO{&7@<}M{E1{x*R$84Y!B%8m;wzg}(Y@m&ln+Sq{{9;|@jQxpF=t
zW1ihkc#-NkDj6a0Ff`ZwmhB6F^fLRdG<s+mmtC(JmQ=8}@ZXJ5&F-}NL7qyL12XF$
z8VyPkR-U#)fqjchuIqWsMK!kYo_=+_IY&zXOtJscca>i*ed@QCZv|VgPL^}Pul5hk
znn%j-joW5zaZfxF!bGx`wZ&wG3b=f#4eg^R{9320a#9mtLiDs(sv-IVPpZv&b>d<v
ziK#@ZhGxDVDte8kipZNc^ac^HmQ?C|AT<{+pS_~-X@|Xhbspl~+!t`3ymSXSec8LI
zDaKD_wC$<7sa~KX4pq>8*`{`MMQj3R$RM6W$^|yT=Gnar=lEbc{IPdgQyALmb>g)q
zzmrU?0vjF)+(l4wZ49-=S#X4sOF3fiVg^h!O}v5yZiFRTX8vP!KtprWc8yORo3HC{
zK7;{merS3%z<faJ3_}YlocG3Tu^->yQp24qPc`=?Nq}~4i<uG{2HeI=U}<I{WtwgI
zksccJ>1XNw-kxh~k4{r5aH8aI351p0B-YA&@jFj*HKoIlsEqZiZ`XvO0P$56Vm5++
zlHw_G4LA*dk_t-95864L39^W9f?e|2>3RL$qOfgs9`@94W|fIcUL03hMkG@eNPTbj
zy6=um6xo=(5+4Ggg7HzBnRc}qC=r{9A=Z=6I`wRX>BkI*x)h81)8{y;x9wsO!&kZH
ztN7+vDQTla2TBKID!@0Dp4Qw-4{`vF>pwTxTR#%D?EpNTVVU5UD7nQ{)?J$weHUxs
zwOnFk5f2mVzZRFhr57KLU+?pZ3Nu(86H9C_aK?}JPdpNKmYTL8$E2!vE}>Ao4_P$D
z<A2R6#LwgRsV_g<s;$Lafj-4+=y3k^cSt(C+Q3!|J_+1Zt#zJ?>3Vp*R_rOrh+!qL
zZY{;i=j5A+Wd<6%e?%P3-+JlbpRrR_>m%3Brm;xVmc5p<2G!<CS?M+oEZwUe6OYql
z#g$-j1?WLzbL70<oUPy69U{%=RP=D}<r3y>op!#FX>Cr3FhV~Z|6;C`OHXJKUmd-o
zkzRaPkE&z?gU1=GpsCT!xk1)*7Z`U)4`Ag}kP^dg;^$Wb|2aKm*3at#)tv)HH007?
z-~FKW<qRZWP_-vkNBcnxOz6zJhf&GaWHga*TaAk3;(tH(nf~7-wVhV9s2k+<$mVE}
z95vpwEdE<h8{#X=yYN%$e_jF7XOgZ$7;MvCb?^tro+{=M$4uVSuk;nJ>^PG86*T`n
z9Pp2~PuVRCx><6Vf299@YyoV>KyD~xv2$CW*PP@p`0tfH{a!Wjz5Jm1T7*0jT-yM*
z=yK7<3kh@dbkzeUiEhw2`Cnd1q&NTXANTw}j^90nYyP*A^0uE;nKNzs&yY{Gk*5Fs
z8~;B%zc=aocZ2d%@7<f-A&XslvUFaXfk)1(<@3WFNxYVE)tfC3S4dalGn7d6x8n3f
zrIFf^Nw(}=S#E3Nb1@bPQ@@xXDKbGfzcBGst@{y!PAP`xnTInTe&jBoW)y521-^I>
zirZWUmThH@4F+!UPZ$LUAE;l=0g{^9gLeBi4OKC%ugEN{KC(z?%tb@%e9K~4)=!QS
zW;-vZR<6=PH!?}bb|9z+kF;;)sKs1xpzL{*Yx#MGm7eqHp`!prxq0JQX56X0;ZF4@
zN<qkRLGThq`oiC8xP4M|imTpyPczLZRzvLXXyV_i%P$povhJ_d5b|OKk+FMYuESQD
zX=~ld(iCe4daW%<F!iMF#FHZndru&YG@ot=F`}1r<WQ6Gm8}679Fh5;<<fC$rHPsb
zrC3wIk!aXnQ~jx){K%lJs}F~ZBVlp$EvUt|)zo2fY)a8x`(;acmCHrxPo6WzrYEtG
zGi!0iQ;;x2Mw8*NO3sM0H$W*|xba6A5PcNnKNE6U?P{pa_bD0|zZ@Qlm3FJtURM^;
z17%n~{73Z+T(Hse)*QJ^OnlXR(ItkS8sWbi*G>}$5>&_P-Q@ufj<Q7Kyb;UW+he0^
zdJh{fK~;%s-&b;P{T0rj`vu&Vf8+N^1~;S6YBlq<&U0;6RouxQ#(-;SbV`i>{C%NL
zwgUd_3^iVUKGcA$L>_5O*j;G{B%)~)(;?lDH;}^aExf^ZTA%|lZTj3$F$jbb?O+YG
z0p;jl<#X?oi0kies9Z!B+Ya^AJmjkuvSsqL)X(FG>A<Ih`M``^l6}VmkW1Qu3Bfk8
zxnrgo`!d%E*@oU5`p7$D@e1GnaKnd{Bq;+!D3JI<vsN%Cw+ow%9LP*6SGXdKNK#)H
zm0bBafhBoP#r2Q-o-8imk`ot65jU+NP*@@_NzyQ4Z6AZ)o&BMB7mgI^6uH;GCMbOE
zPyD`{kXUJ+hh`Har)@J58&P4k)H|b0_K7EI+NuVerN%lUk@l!MJt-Av7dlmD=SY3=
zRJky$#zzlr=>{dz4)Q@?-9IFpOU7;9$a68B7VXBZCXa#Tj)fK({1@D4SmAQXa8+UX
zH;$aM#8*Be$hX3zYj4t@dhWKR3vSb*?epRD3}Sw#zy$G6K|`bZp0Qb;5r1!0?V<@m
zrLW=(3+Sg@dKCud)}5Y0m!*OBnjBvCb^FPmzR!JqiYz)iM7rdE72ZM)y}oRgQB%Wl
zx%clJvCwP{hyjYz*^GUNC0zX%kU7IZ#(Ey=Mf*&Lqxd_}3f8oeh%@3RM_Ub8vxTmf
zCbpEx^FmEir>v$`Qa3k}?A^xM5T<4O1S3K*nvH1<>Dd|i5AxWvi0ce{#456K1TjVP
zH#*_r-d<Ekm`lQp5w2$~>J6W(YCNpJa&;zWJ2-}Pn$#}R!h;#qauFy!)fnDCH7suU
zXh>WsY_v6ImGiRxs>0H5+#hbkBqz|gX*Xi~gdD*Ni1X(LnR({kv=kOGyt2LMMSbh>
zPZb#<`xOXJ(!$?^y|{@Q;-`c4pqXIxRtW<OHZJt&?I%QDo`s8&&X6MwSAmJ?FbO-b
zqcH;_sW;KKt~)i5>y9?ywqX0xkR!vb7gOJ|m^E&3xUYUM>fmho?Bv+h1?5IZ87Y)#
z`DSn>nk!O{Smaa$`#xnjlpT6O^XOW{amI`KMzV-WQnyPt=uK|TSc{U#t53S(PUS;_
zHB);5=r*V*4uqE#^e&Tk2p!wSC)P&X%5Eb?h2CG!M94SF3gxJ=!9uMs{;>^s-gX~Q
z3ZE>BS{)x9Jg=KOHMq^HNMEm%Qi{0w^K@L>d(wapn&<1UaU?MgYm`CHBmYkss2@uC
zT9rUIgJV?b$b?fkAB;oz4;M|`+|S6w*b+yKtCLvFB+hm{bHiUack=h5Lm6Q;<87*T
zZm|0DvgGxzG{1qGY4nx@Nvjx>Am$ZI+CzIwWE&AemO4XQY!r>#4>d>-5!PwSCk&#h
zSv2^CZzb6r=YIYX;|AkB8h9Ai%uE*fOEeIf)?pQM*FJg6;gdxCtCTL|h{rGjL~UeM
z*D;KX)z24Cfr}$SI&8~W$RSrGY|HlaG-Gud*HGIn5W%kEV+u847!!Vww0*Uob@Ce6
z0SgxLYXzh(Lht^95TXb&smvN>;`w9o!X=@t)Ho3l9mvbtlVie)rpCYI&pW;(@ci}C
z8^%%s5xnOW?k;vnCayl!%-*!+0?ad>E}(v`G1<dgt`axO=Xjzzx0!&nchsvReOZpd
ziBj_QKEIn!Ust>%xhUtZ*|?|)7RhJ6Wp2X#X*~1eBaF1^{`!>p(f-EVr-ylu(TCeV
z^8473^{bDI8Df>B@@6}rb`{R^Gm~!>5VaZOwg<2$<|${HE-*!lx2V+@?XTfZUd3m7
ztND+7!Rr?~egrl{MM6L=b2I4J38HsDuDwX|$c4E@MA2J;F8z-VM#(agBbfCD!{>*9
z%c~6ewG$T4FbAd`8f~^5H0?$kaRR<UDOXIIZSFx=I~^>4m*d07sXo$Ob|?9dV91ch
zeTJtCz`t6k@ew}fywU{eP?V<nBT)5|#D?as-bTRFJAR~SUHgpqMo?9AhzoNDvxdEi
zhpeckh^-pErX3wjf+wD1E0vkpq%v#t;2cv;ohTtNBl#XlIcqTC6%EFsPW6WOH{pQW
z_DQSkQ4h(+N4S!02$;sU7-2&4hzduOnzUqOD#_G;`S-e3i{l-;ot=g&PO@L=;RDeh
zZ>*e0!~!@I7k$x)T_vm8_lG5u8>Qd&q>X`K{wawnXksxBlmYF<H{t?}pUX+tD7o@J
z$<lBJMN6ZXUwE^(ZKH0RrhTU}@eJn3nKDo#()6WLp(h5JOxk}>EBgGr1%iZ_;xrDg
z%m4+G33f`#wXE+p;^daJ`al@p_|<7h_Hyz~tQYyrc;Ws{J}*=+r4lGK@G%P7uLmgi
z9mW@Vs`UKOs0*NTt$iH1Y*NnD8<eYtb4HmoknDA4g4f5`cfeE2-S;>P$|Wmd2DXZU
z_#tYd@ukr<Fc0CayVjD({TQHrVs)$|ryE54eLeQ!8q2b#3xjw&=uGUUXo8L`u3~u{
zs5t{P<Bst@LmWwh9KAt|mT518^{((gMfG4sJ-0345lswfWcO(z&ptU)c~1Wy7-#qs
zGti-{qC%J<*8PL}lJQZrrfF2ObOE)JkIBiBvaN3Y1{q$=EK5|}U1*?tCr9g-(4dr;
z520@0eLq>u?r1pZ-u9I}00Xh!`+XXH)CPgYilZyyNfo!Z!&(I|S;oFFzA1B~4O$hv
zM8ZVLzO}{lD!DDVtqhkqibG*8>j4zH<xc5n9lJh}<O56Z<EkBzL(#Fte;#s0)mFup
z@_PT4Sws_Owb17J6o(zhZvFMMI5`7UZf$qGyj}<Jp<^5qfSkDBS+L%C-zPtCZmFlx
z=GMbK5)rY+b|8H`2SzpEFCl@J%}sxy9j_E8*sgD3hXx45KLCMPnpeL|U#)FN2(~n`
z)7xt0u6&ePd3MdXyeaZ}1M}Ci_1F&D>f@ov>)wQphgePMC@RZy*9v}-skWHAL}hF*
zdABVd4vNir6?jhIfh%(yzQ89DF2&CH3B7ruoj5g8aQDd=Mq~46=UCsq#9pBeU3=nC
z#L%4fd}_^^IsH@XVY|Kev>8py_WuhwP6bmVwf{Self{fjefO%EX6U`B+Ar_dxVHnE
z98bo5ijU1~);uW1G9NJyAuKjQ3A=ikcJ&m(S!n$%VwGSeUe~Fv+iA8%|31U4e02}!
z(VAbe6V-pBq7kX|W3A2T|3u-mk$>nm4#0>$#JQc__*pq$mgC(Oo>F66-BfwX<`V1$
zbL_xYd4~?71npg!nH1-;y|+4H1vQhNXeWB16A>H!rxkcOQ-w=a2wzhZUE`B#h6T4G
zyMH#v&~6%$f8H#dA`okFMPi+&!UjZkMVsv5mw_6zSH86Lv?ZYrg9aG<SYYJf&y=Jf
z4r(-3pUvQBF8ykdnA)kKFlKPpw(ra+NwqoKUnNkic00ZnqQ@X;`(k<%Z)b<ru8}a>
z**i>L!O7L2a`!Oj417}W@N;D*CcFT%H?l2qjdSM>Ff~M!h}Z6NT4(oO*E};Ys?y`q
zCmd_RT5?C-{!Y<dEH0hDM3^l^Yck|2u3Tn#`iB|Tl!;6oz^8tunVB9y4T`7YiaXDr
z3oN{b6Q72-ZqNPGFQ0&}<;dywhOfN}9dtH^N9dhU#aHhgjvp_FnUjD782k(~qkkh$
zu41l6u6~I{mh$TR&3bBys@H`K9MSSpvXF~<V|_I4H+clj+oFFjLFAv>xiDdp`u|YU
zRwO6it3BFO1U<^(t73`G)ZXjo^5Y$=j}Mp3`?IxNIlmd<2nGNzZ!l1YA<^Z5^tkV4
z&le40e3cvAyOZROGn0$2#6NQl48CRtV*q7Co}>%|KVFEk?-|J11yDiaDf$ZM|Eju^
zGOx9_>hKgWG_x%zFJ)A?7U_JL!*nh?xzXhpN$AAp9~*65@(ykB%-gHo+YRV`$ol`7
zz8P^XENp#l#UgTJv55a<(jxNmiV1{lv(!G(7<Xti)K_xWW3+;5AP^Kn=5jjw38@Ii
ze2+|P!jUV_evA})cX67sezCWr*<6H4mk1gyw<nI>^*P14DnorpGK&F0D<Wka{89eT
zyri<w#r|LIk(i18gK_rkiN%VJMPrk05j>#juSSq6gh|&mwF<uQ+AhfHu|Zs#<|vY3
z!~Mz3SH4~B36mz@Tp$jq$(||Q8mDVC#8nXB@`)uc>(0U>#K>vb*CnBSG0!kI<XVep
zI|_F;z0Pu%V4I=-p>QihYuygmL!t}~x`zAwvvdz@Le?A^WB<p2^h&XZKc%EM7pAh`
zAF|U(?5j(Oze390s@6f8V&iihSNXWzCV+NVUPU(qU_Sz+wutT%8KE;Sq?F)InLznC
zAUU|MxTX&lngx~SJ`)kNj%UvzD`AZ`dlW}33lGndt$Rip=dK5N${^CCa_1q*TpdLV
zus=0FI%nkSWC_bfVetz4V{6_Pic^01OTq)subGP60*-zz)){B+;Oz`9dsrlU(NpYD
z;L#lxltIo7-5AEBWm)_qZEbQ?0cVn|?^zPP5a6I6k&Lzo3wwjUp}dZhmlQPtS-mXL
z^wROfa?|bgTK{8lXs!;qWVkh2*095XCMWM<`&_=D7r`qWrt|Yt;f5&!&{&f~huM%1
zBjkOxAOlw}V9sOmQqR8vHvH}D-<LFLXwrTrvrE0#3xh}o!`47^j@J&Gpfr~oZ=v{c
zdYII!!2I3t4=zS7?PsF0R)(lk7>3N!+^RIu90iJJ939Ww&v_~33)aP@CAj~+q~D@E
zxaMN$)x2B5ONyAn73%y#NDTeu4PagX4K<);pX&m^<;=uTS9Mfd^pg->v+x1!E$#W3
zx#W|vO4S)Kk>SJWVqU02t+cW44H9fV(fbf1w1zYC;#yR(s^-aCzMANBT+a2!erpcQ
z5EK)-tTBqpt*8R&e--l2#D(py;sJj}==6}OkKT{h?@O1DEBY+T0e~}kXQ|gM_@9{P
zsHC+c;F1y?@Mq$*Ikt;6Lu38Kv%mP!jFMgN&&RufNAS4!_dvYfNRaAIG76zQL{2j}
zMXf$7?ne(ThQ6!rM5ndLx&YZdEBT2fV=s2j&c`~=kC1|0YzCtvFl~?$uxVZO+5DO~
zh;SX>7xu99J6D4ni2TLj)lEu2K`tfAA^&{*aQmEoHn+785y`6HMa(fKwnVBuoNKqi
zi+%x4hGB#qn@XR^%PqM(9V|S1qp7w^t|`7M)HFgVow^fUkCdWc8W*^54t0GKxM3hG
zc9x~ZqZJCkpz7J`7fJpYKJTM_^Dr>pVG!hl5Oz1X2zJB{&eLT9^4gF@XFz}P(hb<1
z@bLjNF#w{aYq^TO-@)2*T;f>X&@g^)uN*&+3pB&0?&x>I7(N#O-gou|7$IB5n1eHC
zy+40p2V}$(eN&Yc_iUlugHAX)K`1y@;!QB@Pmaiqw$AwzQ4X6xSkw+t;P)tYgK{3d
zn|v2FN0ngHuzPE%U!N_zbt;Tf6$0y;u&x1IS?UM@)mlD%&55Baz1YPZWh1h%6KL@`
z+iiH=Bj)l^eLG_Q+Dz}}Xrb_4@V5hpD2?sv%x{m=9d(Jb{m$z6L7fj3u7NI2%yr+j
zhZBE|&x_Mc(#f{Y`q=MH<>kNOSpPFIQG(0@?H3l|;MW;sU!L0GT5hJ!qBwp^Z#gYB
zPEZpCvkll^c2nXJW7%U}yg4ex#ueM+nqXvnJJkhlt6GO8>8<|b>sQuWXf(5MelcGB
zYcEGKXK_xIOS}=j6jVxj5A4X)VR~z;PFGfi2O~epH3|te$xle{WUrKy`U`u@Lr$vp
z7X@mOJvB)?sYxukIR=(YAo^9DZDI*4PXDDgS>;7}-&%0b7CBbYA4$50lB%?n%~>S&
zW#Xqejh&iVL)=uCPB0poY^dz)t*7+wQ`YBmYmEV=Md(d*;(O_OUiJ@96PGj^?F5JP
z5X4&@CFjP|RgxYbxUg0DQUGTAcz&q;n3RNdUzWLanWdh@-!VzrW;ViC_|aE!)l*8X
zEE>HDB(+fW!#qfpnp$*C5$xxY=hX;-6Sr}X2N;uFhBZXbUir~x>x$;<kuL9R24N&n
zZMIP2Kr_j6mihVP?m3~HXmA5XV+Gs@8Y5{d2ryW4HxoXea$)gLb?3fc{oHx@+tkD9
zftj~$EF;HVk+GEvG4yk3y0wp6C9ZTPWhD1yf2ln#rhKGV%wAmWdQPODs`1IY2b_(Y
zv#m&uYicW4mf4nebAGc=!!jm^+s~D7{q)Z50`2EQU(4Ur<?9=$-5Jn#<?Qxe7*(1V
zvD3Z_y-Xv|c;$ksoX-tWAxcISF5x%BRPg1ODgfC9k6=WOtR5U59c&>nRkRhokL-4A
z@QiS?e){Z=u`K?!5JD+lQ~Ra*{21J8NcFdmp)TvFik7;ZO^Lc(zTcfUhczU|EVb)+
z&T+WoYk;h(_H3OAn73P>ThnMPITjQ)Zg&Q%|9@ax{Zmi@!e>9XBQmCT>7^ACFl8WT
z;Uvc2oDFT)cjv7zN7rwV!Q2Um+(}ub6X4Ft`aWMsuaNZuW%zLvT?5)sIy|e`CpKN*
z(})H;(cEMiYN%WfFhoVqh`a)55cG<ac#geKJGmAu{*3FHZ}0Ty4pXWVEo(K=<vrwX
z99gaDwOS+71A%inM42;B?IxoK2&4uwm|q~^Gji2uybi0{nm_AW`bBfwjR@ZcgjKT-
z{~TBxSIlg^@1=sZM}C@rYe;4Jof@rEi@Z+m^2rG2cICoM3$@#GB3vZ?P3Yom%GH?S
zF=u1qc*i^+7(Omj+w3BC>QLmA(xObAqYzHRvsZ$s3V;O1y;3ukwdE>dW<(X&sD!wy
z3;nTt7NKA!0+pB0{?k(ntcHX!{)Ou~pT1XVoh_w&PdX|F_H@Q%b=lC&LJs$$Lhtz)
z26R&&W<k|s<-$>EE7Nqf`@mj9LZ;YaU`pSFe>};ODz2&DrA@@QS7)UJ%lC(mWqm$P
zP860qhpBt}OPF0|T3kOgl<m?d!XJg!Naw9|)A<kpzhc*}D2Gd+Tg@hLTx?*p`n43m
z^ATOg>w%Ky!km_}W+Q}O0ab?>dTzi|v!BA1e6viqXB1t2oxN)z<(Y&cA4J%R%h39A
zQxm16hHNVEyNj&=z9QrWBJzGzsM)HAq{Du(NvH^0<p0Iqd&R@qwr$@ML82x?M3;y}
zi5gwBh~9f|(aRthqKq1ZD2d*CmqC=#34-X|V3de3jNZ#A-#M=5y6@*(dDq^x_gu<v
z%uMDi$8qe(zHj?~vjSw5NcNS-fKjg0RRA_|WkDa8m%JvfG#J&G(V@=l5JdlXiCD9G
zHI5H9@pDT{`$vFqdfA{N{j+Op7i`A;oB(`*&T!$1%jgZR(v5p9asE4vQX6k`taM#u
zr}=Y`=R0XMcfL40k2Yfd@)slID0zF#jPvei4jF*(yO3ZM-(_NcJY8$qNouH|^Q*BH
zv<`}rq~KZpOUaT{mk!ti5PsP&X`S<snfWsJn>{PYeGZw>%VKQ&`IyD?T34p5@;3(#
zU>RH_o#LtGm-u?|)y5bJdHK#7u6QZPC79&1^y1>MebI8JVT{w4{9&SBlkX=X{`~u*
zg-LIAn|m*z50iq46^Ne!DM|qliw`EZKjzE@$Vi>nZnn*?I(+Ri>caC!sXllSS>Kr-
z;z;MCY)^2)LR>`bbJcc3LZ6RSzU_PYemP2DR(HS13jUhUSsYtI3;>j<*Xyetwp4xP
zu<fAO{1hS86WvRTy}>u6Nd8`=yJjJ8F63xD>uLhvEAf4!vR&K_<8h;(y*BC_BL^1L
zoZrGp+sSTqXP8~^mfzaA*iPZOM_5yT{(W?0=+wbV>ZIJ2h!p=*t5;N~zbaC#*r{e3
zD!f2{pH-v9`D<q;Um9nBz4Pizj>jErc41ErKcsv)*>VQ!$S?S-R&^8mZXn}iBX+*V
zD3Y+Y`^h!EH*qM9?`0|`z06BM@%%PHP-l^yUcH%%M)~oAkF%k|=`wvkTUkaZB{<At
zio5>)kts8Z!9ygAb3MhE?qP_qRxs^Y%4tSvtr=i&0*lXjvEbK{NIH>{6(003_BPIx
z01mcgEXT;Nq5<0SK~tpIrYCG}llBj8<4Tztc#DLQ-1iQWp5_nR=2zC;e7!LoD*1^O
zw!a>tHsJ9=%h^mtW1EHu(r4r}&tE=1WOn)zeLI<B(=R7Ofm4tW-s#NSc5n6TWDFqa
znedW*V6=!|sE{zI5CrPX#s<_SduRGvxnn0<W*X&z2JdOc6(y0%!v6bqr`|-W^vFRF
z2=Sa`F?0Axl)a)Vf|aqhoO0bjK7Qk-w@Hno^!fA}(BvKI&Mh|m^^sNm<9R#M5QJT3
z|NJWhKk)f#8kji}plbDungd1z9M9(2<5_Iq1ktL?scuYekwpq$m~#DkCioFQl>o+O
z&Qhm&kJ#;@mH*2Lv1ME(^4u1;YRZQA!Q!iltTaPaIivjfycLy&>q#a3{d&D{t)Re1
zKxkN9uwQsOZ?^jMC*ubjk0-OXS)tOJtIx7Roir<>M0{rfn3=T-5PpdywEg~KX*kDy
zrtlkMwsLuXbU+7mbaIKGkH%09m$*j)90zvKZ5NS{fvYc0cMI(EqThQm(-4*L0~M&8
z6q%|eVuF0)^<qkc=x+|QVI5U=`LQe`awvl$|CTR7Gs=Gm`B^=TbyESbM0etoVqh6~
zX}B#`<j9>M2c~6`D_t({6;KGViq-fMt$LJXcYTZ#wq(%w-3!%g_B^NfAeuFqh3#?v
zDn71uSAu!T{SFileV1?{MbJ>zoC6cS;H*`War19*hTHlD8-05knBRFwTu`TNrr{pO
zkW_-H6yTuhKvOw73iEQPtH}8ziWHMLU|RFQXbT|&i?XIgrWxa|<AfREFRUaeRAL`s
zU{p-`q%=Cu(->ki1Ig&sh4nsvAO1-@m&B5$eodU<_LY|y=<tOxF;o|Cd6v}LSrB}h
zpMn~KSe}$ezA<-?Tu0PZWGIYe%!}bX&G5G0cX{!i4V+!glf(K&P%wQ70P3f3f3|H<
zx4v6<AT(q~6wa2X$|T%$FasDUo96<$9?Q@nT6;{3o>&^K=cil`XdYfF43yxTE|>J+
zCpnXzgyj8#K3Fv%Xk!Q$o?O=21ndmh+a|{n_jQXKP1=Nn9OQ4B!1Qycz;&YIHkm}Y
zzSggr^JZ_KT&A@GaKL-`DA!l_z!+`op94S|Xsvk9Ni9mT{|_CUH&U;GMXO0|&B8lp
z{X!n8E}Z2W#;n;5Tw$xUaIv_0<jn$^kPkpjb0esj;|PSoaVr{dsxd3T7Es>P8;_o|
zW#V;|XUV#XZ-Moci?(_HYimH3G=wVJq0+%KC((5gq|Z-M)?vK29W(hw-aaO=w=-M1
z*ZMC$?z3AG(9aI1)5T;1H9&G7QDP}e3)YgxLHv}aHScqY-!VSv;s>4a8Y;Ly@0sT=
z$(ii4`c?EU4UqV~%C~S0RRDLh^^an#{Q#R9(7E`;;#}jQ4%!~r-JBAQ13FeY5>I9p
zFHFys)=Wf#(5FU@Ou-HB!50pWCH$6Y^2~_eW&8*M=_tIDmdYoHKZQF;SP4F>#&IbF
zQO+v9^;=fFK7Jr?!#7}Hgbz{T#3efN@20f*fYio>zyTd44Q7n-FNoIjf5!n<GHC$z
zt7i`IW{kpIm9Fi(iqaOXY(H!P8=`&TkoZ)u<IS0zej`N+!HcG@+}8oV0Dh~tU1rAm
z)$Dm)+pNaH4<?}44OnRTCZ{zv3Uf{u&#ssISlzk6G^97}%uBq>AlP_atubK0*Pqx|
zEd?86nZ{_9awy-DeaI&y16nzkap<Db#D`i*qpnOS&2wMx)3!pVZUBvp88?l8_snOa
z=AKNDxjcls_$OqK#jH0{x=dG^N5P2!|2GhTVLIzp8W6s|(O~`z22L-1TTmlRg9#^#
zc?5v-;B&Di{Vr0VpwS_!HSda;(`>7|nDPXu*h%w<q5<o_hR5xIAN+knquchQsL8J0
zO|1HfCuB7M-ZTHnB>q3!i7^e_qFdOwA2Lj(0M)hOh*#l|P=5vws@THR0Mevg{lxx0
ziIqF19qy+07jV_cnUSrb!vMR8s&yi<BIs+*0s-P90JF#`FU#UNst2t#*B&^sJQ0l4
zW5*fQ>Eyl)A^@a^Z?i`yN;H)#Oj<Ty?TKvHFW;z{u<TU_aj40w7}>K_4(!Pa$`eNA
zJZTz&JZW+0XNc*w?*a}j-Wsr{R+gzkZiV`FPR46I8|aA$_YIDDDT;vm#<0$NPBXFf
zW@~Io#8b*?{4*NIHzpPeYP+M;+b>d({@zl3jxw#f*YU3%P3uHYYMHV<Knu+?i2;A~
z>RrtH%(W<9>X|M0a4wh!vp&h*#`pykd<3Wh<B5GqX%BM!!>)29xjw~IIbhVg`hb3=
z?*}81GOwf4zVkON@2Mk4n$Q=Bu+Uve_X+Tx8oYskTH|HLB)yHN<NTra_>MTVNaG)^
z`)$7Y9OkSW$aQf6!z{pBtpG$HO&mySKKpp~F4?RbwVYgWgIV6u1{@HWrhC@ai`(`;
zVJMu)oj9WPoHGX|k7<@eW7)H@5F7!5@ue_&r$lx`>ri4^gSZ*5*;)r1MP^=4w1x~+
zi?+u65vK`Yh~=~SJ&c_^3n6Ar&ATED)!e@?(o{D$YP2X~&@-ERqC2C}@fGB6t0=K`
zm(Jl{YIn5Aa~rSEvDz=-0omGRI!v_Kn4Ca0W=deO0CF?b2Z+V1DU~k94^G}cZUH{F
zXM%sfNI9}Bby1ks6zpqVTenb5|7prcGQmE+bHR?m?9G85<)xhX3`W9R=Dl-E>vIyH
z-1!}&6NMsxIpEFYQQ)G;NFph}KRLUg4}dSWP${^};fa|=<L?h#)L>%S_!OS<hMq_m
zG}f7J9n&AHFnwMJg~cy)vr~gu8gI57q;uxutKTv$6uS>MMk=h2m+b`$o##`V2k#7*
z{n-UV0wCM~94Ub3E}-vddX2*xutIL`!D%^x4R;rf9N=Nas{qd;U{Q%kR2t*LInyX=
zOIu%!*Hrmlur`sCrzAde=RPKnxX?ut(GGRM`TOzxV&0|%a7R4bmlnFCX*Y=c)yo>e
zimeQS&L*z-u0N3gEge>H#|rX^wZ0;OhpQa3{KZ2?v_`)B@PUb2E@$WmJIi=%9{2!e
zcB?ZdX&kxsbUt-6lPc1AOZ3hSD~TgZ{`Oy^IZH_<6`2Unf}d~i&4|WGg6wCi3fP&x
z>Blu-b0-Bb)IMxO&+jw`Jk1K7m~1%1gcn)zG>mi0x~++vrcR3C7Ut|(ZCxujA=gtW
zX{gN|^#Il9eVGqdATy0X3vlyG+42+q5Ik%;eR%wmM!!bn6L_D#@kXJ<ZE%fEDGAPd
zz;drSLm}qoeu0~&dIjJwG2-n4OdvwuRF14jb5;yDui^cer?}Nj?fZ}>=w-$^-w`Z+
z1fwEX81X$yY3<s0RhNK~Ut3oUT^UI(N(H_ZBT6d-1JG}xdZD8qnxK;N_ewD`w+=W2
z^u#C{>2epx02es6Uq@yDxiS3q*Ng0DfK&2HMRB`KL2Ix{Mz+&&PS(ZW7qIxY@P{vE
zHQp??LO?83><Esg%|GCp;)7+39dO0p9ROHz1jKwhO*^d%Hsl7C08KScK8%>wk%jMa
z*QCh<n!!o}M3swC6oqp;3d3PRIyI29?dAg&jxS_#mByoLZ0ff~+(-N7=`olNgoYiB
z`-mjql%#xfD_<;1e?YSJwg;Fyeef%v!K@!F7AoiFx`q*j4)F4Y-Iyd3?~=387(cBC
zlCdHA%LzAkwEuxDjpPq?oYCV=O~5;~^ERQ<w(2W#E|ku<pc(u{|7(aL{>cw)k`K2e
zXEd@4(Vl>A!bIe0QKolk(#o$Bz&OOK6S|_f6-&+Kcd^%lAayMu)~^fp1bVzdB{287
zT9#dX4XcNwM5??%Hw@59EW7FTk-dOo^LHE2Ukfa{N49C{4NQ;kFKKXfv|X&4Hk&8q
zX5TRMpoH(7um+kv$ME3H*}K~-o`{k@Qb#ynq)ze`nqRa6Vh$J^d$96ti2$~jfEY)j
z5D*wx7NyopTHv3vSf)`CJ{xP@A<ilMU1T5x1McbeSJ~8{DtGpmS=0^gD&M@;>JBj~
zrun<M)Lxk7J6nTHwE8P`e6~o!=gE?SVfB$H)&2*%c;9b30P1{dQEzu0asDGI4ceOW
zG^a+E#B7Fn+GUP3VUI)o5JKGE!t(hgVcvL|Mq+y$rM0j+YF>4GOqf{k(LL~ODH15H
zdr=UV&JYRk8vmN)FC4gYho(yv5YxAwYQbk)$F>CQWr4d}1aTV4mh>p)4U*IZ>gZJk
zo5rqxRd3u8qF(~Gtqnl>$)mKv(8QOQ1+5M&vT1IOZ|RRUw!mEI&(T))S@sFhx*WBm
zK-nxa<4uFe-p_|17W4J70+?14D*Y=@rr&Jx<3C2Mp`n4(=3%s(T7O<Y|8N3ZtIv~Q
zyw=;n#k0y)AwQv!%<|mt1#-kczYmeT-e0HTb`+|5K<G$hP4M>kMw(d)C7#K~_K>HG
z9)?mRg%(i?zPLa7xLS6K7aXAAQqPzrd^$hy3_r3SC_K)T%)0&Y>+N}i^Y)`vfx3<F
zH6B{PTJ$}(ng#}!_yxR$3-sv8@tKP5;I+M-5$g-5mqRM>MNSoS<N<_Zpby66i#BU&
z-7&3a+dpCQ=EvjSw!!iX<I|`Qercs<MMfJ2J?tmWeDSj_Y}>V(y^`9K0Dg*BI1F5Y
z_m{fa4=_ap$oA!X>F#6l9zeHmJb}P+Z0JX9EM6Ax%F$n6drRg4FTX9EpY<8UtYwUE
zZn3Fj2LS;>^hlHV1ZD1!2PE1D4-A2zn#hA|e9a}*4OCiIaq(FyS25NsnxpynI$npP
zvLF^us@$haVkvL6;O0j;jXGgI{NSxCt`qDRbLQcPLa9YnbS!2a8O|l{JDI*c`M1O8
zKzc{No!e&Vf;!8!8Mlhsb3X7wg-84-2}4J{Cl5*mE<x;g_LhoUpQ-bU8g-si*19=~
zpztnnuqo+%ciUr0sPl$B!@g@(MmKHFG`4!~dp7%Y-G23ZiF%;9R@t+?^mV>pY{T)1
zvZn(K2+RgB)o_&+<bqEchXUhwppjm*Z#>`@cI<4t=_N`Rct~(bU^t31(cMw6x|M&G
z>_<`xUr~;?^_}Ms1Bnhpg%7|ekK-W_1=M1zfCj?Bv99*AUf^MVUO)~Yhn!JiqH!DG
z9*kDR=Xb?E;hRexvOBQTojb5+cQX>8ov6ZisVM$KFDMnoCQ%}0&?suE@;%K!;j4`v
z0@@*}>ZP|^kKv0)siXbWvGTNMC?iji4e0|o*BkGw&|CXfRJW0{78SJxcZdk4?Cf9c
zxW%*oEEt}!+2CXUyr8SBr79)NpOJPR_y7<a)Bx@YfH1yWg0bZ~+c>ToT=>SALNx~^
z{MbG3tP$O?3Wbc&o2a5sr|D9vMJVEC@oLGhc$yBIspVcgjL!H{MKpTQzEi|dmg5%2
zzYWwgG%k<R7hc&d0IfKqO0UI)MCv&o^A@gbU#ner6Uv^OZuEmRYri#6&6ceD{-9SF
zq#!IUwWb-*yJw<E%g5RVdiK(-sobX#E)DRVm|~z8zl;QJl$Wuw)UN&?sq_DlI{$Bx
zI-UGHy&GW-vs&Zaq95j&winkLAB?q?7rFIUn&mj!%I%vKnz6tS+6>_D+{bq~tzgA6
z+n#sS4CA55{9w<6KK%U#i2AwtQMLBk8AU1&^*sNnM8(DF27OB0juB8kXP}<+Ce}Y3
zkZE-D!e|)v)m#DCzE6I7nDEg>m|})6Rrw1|o2Jk&cblXPGy1Q5gK5i9HF_{d{V72H
z^dxFR|Dijex}MS4=BWRD+t5CD7@yc8zRY*SAR`4o;4b<~(qIvVg_&};UKJdSNRfCg
za^o96Q$tp9C}_RfLY!xAbD65+gcVA8+uPLmOV8s@X4)-=Q<>=z8a%4YxLo1%UkATL
zDo9G<(`mqRm3TJ|E=$CRg-7J#?efw^iWMdGGjeN|m`#`CVLeO4QTm^OK7`oc?wht*
z#gdp%hk`dg+C(>7eZtWzM)X)u<M)@@D2#IJj8$*A7TC(B2Yq|4qO=`P>~!!eQ)D3W
zHm5xx#hqYTtdQD226S6@tQOV2C_J%)yuAltjYd>~zN4uPPJ8P@g<N5^0J*|Owfiz0
z8((e$+uGadHCN+%b$Mdw!|%iKI;9@+`k`dZMPYy>Y(;lo8u*4S0{p9p#*EUd+!|GU
zGL8G{jb|u6@eyYFzOnotx!IC<i5_cv@BSpyML8wAI;Tf13ycH%qV$ua_n0t;xgZyh
zI$YQREDH-#n&`bxxH(#r2{)d^N8Mc>mJ&Za6vGkx2yWhJ!1#A>*y=L8jW=VMUxzkn
zn)qz-ajL!TC%xD!A|@R)tZ<;5IHRepW|CW!4#d8)Swo8h4sqWtKaO~+i=x5btfp*M
z8o%YP5N_xV6_iU$;^8lhE#hwIj~mpLl0bJ{dt;aIrcM!+hV)mkoGlGR=(bE>Q7c<`
zYtb=|f18%*ojUS1zZw&5e{bj3k|Kw%$DE+x*+s3S^<&yvo0Vkq?iRr!v!R<>_8jvE
z+nG<Mso&>Sc`&vgK>h<O4^Vrq;XH$);U$IsVH2GZmbv_j2rkkZc8tNd2Y!Ma@`*jC
zFFr&0(Zpp2b?PVWvd9!3>6sGJTXGzL!SKC@@q9yK`qJ*Nbv<$cdF*o>S^)d&VdC*5
z!xVK?j1-v7BxC+7j7cM~@Xcen0NXo6$(;-mdqG$+Ad4KFD*zcIUb_}WKHPQ@B&>_&
z0$d+Wdg_Ev=80Xc_SEpuxz}~SjNAtJj%RE!&JCOr@)>O?LXr)vDK~HB9Ya7(3_r_K
zmfZv74L<rW$;`5cNB42pg&?6p`0?D90LN&HZBqKy)6cRmk6VijNlH~Gqfi3&_hlac
zgNHS^_I7p=hx^uCZ@lWq;AA=MQfeIS!)nsovFIj)QNK+6CXM;YKHk`=Q<J5)^?46D
zXKDGXBVOP<D4CzAYVglnnG_zkS*5o9OMv^xu3<UVvtc=zZeCm0*h(>c1NMGypulaN
z<-GkSYd~JQ)>)jh|I(y+8q@yJ#CGwSvvqfjwCvy>);>8+kfLO!IySi?i(qqBPz>3H
zc3DTL-Anj5L8v+b1<g}6ijjox-*tkl)LZ5tYPW`kSL1yu)f-6iR*BQ{RQ?)JV&In<
zL7ksil3Dt8{U)<#qt`>IWY|y9rUGD=Q!$S1hOD*1D%WQ7Z&LvAEx^8;%YGg64?(U-
z11%!)&4H{d%NJA^`$@H;(DUNAD8kD>1Qqp*V(4UxEXdRa(*Gh1U~fhVfXZ87d*B1{
z>&_eSrMLI`*ju5uyBw|6L#2@-ECS9dtp{f}JM!5YE5-3$f><ZpXYns^OzSC2<G~z@
zjuxL%d{oY+47=yRNg1|kpT{3mQ3F{acDv$5jM*Of*GcAN@~ZT2r!LYKMfnqBH;~I}
z^M2e{H--~mC)YZ*DP~JhI#E4`QPcvn8oq$(c?y|r{$k^MTq>NfIJg%>pbS97v-!2u
z<a0~KSyixb@B3~C;{aHEVYn3=>weN{a8&Cx#3GbP@y=W%WggwkY^IKl9FzTcce17`
zpY{0jgRSZzo?$WcH#@#}AN9`w@8oehbfeILQeld9>iWd^xj2sT+wuDmVpi$(n7$t^
zudyx}PdPecLK@y;4-rG~d-sdeLV`nAK%RjhWeu+?s+Zzf08*WN;^_wZ>LUZty5~de
ze4EBnhFas}=YwBEXHh_%2(S_3`K;Yn2?cs-s+lb4y#78gWF;YK+XFBRp^2pl=GItP
zlXicdWmDNr1?B~Fo-9^TMpVUWFLPfuATz5A-WE>zuGf|ONX7f1uMusRX&Dhcm{Pvt
zJq+@*7~FS}6L$NfhI-+XYY0B;KJBFWi=7?oD8YgL{F<F|5niz?yX%a>No?U{)fdNm
zfG%lpJgbe)PlpkpwZrFRAG50#o&Yt2&*Ia?Qg{{<_Yh5W+&)_chMydK8sAj8^NzPP
zaiey{H@Oaa=tKu<iBzM;M_4^(`;Fe23Si^$-0(v)x8a<l<@qi^d5@pKC7I75F@u%9
zain+!H9yjdmQwBoq%L~ZQpzm%rKQLkq?TAdM2c{;!8d2B<El#2-*;1*jNtbDID%6j
zgo!^ssLrB%<!1fIw>q)NbEZp2$<4k3kDtc>0%m|X1ag@zu1srV1?z88X5p^0c*vW~
z(~YJBXwrO5^=5OuR#}S1;qi9^{9Gu^qA@hYqk<9m^d2m}3Fv0wT(5IVZ@UEh2>=Em
zp_+4{Zbpi5=|0e@5s>Q$siG9UtT1l*k=u5$<v+MV?|2mYdfZ~&C#@N2iKJ~^!6CWy
zmXmd+!upc+2=RyNhp=4A%Xr!z-Hq{t(j}kfN_*|)WaPO_8@PvfxXvWmI@L~OG<&va
zT&-spW1vp<^Pm|q75^p3?k8<Tj{v}0-MMYfuD)8b(w~$DBr90#AiZm&dHt<YZ9qdA
z&{PMQ9UAR^ZkYAE0Li9kXHIbySZ)7<7yW#j4^TN}q!N{~iTq0zmFK!!Wfc8Fy`*}e
zg?f=Bv9xxX2n*}|c%>b|6gw9t1N6vQ&oN8c@>u`%yZ3{Ze5L&7mpp*fQg8Sg@KBk{
zm&g|M6JdRf0=Vu1KnCR~6zTz#wc5zf2DMuaBAxoq4WTJ4fXq7^#vB*JbNnmBZ7LZ-
z(Xx}U96NY%$$y*?)5eRAx^B@W*06pmj`$K3PUm+PW8IyCm$u`#vD30nU|qrOe|k}|
zuu+cZ=kZA>50UB7mz*<h%2#cAHlo6(9-7~YGMHhpXxyG}+}k0m=dE5k==ccXwBpym
zijRRkDmK>kA=U>(+FDU&MHU6%X{^@YFq$HTdrz5d8mor~sq%*=flHSnMJ)6)je}f3
zu&an5P_s~}q!%_ql)0y^AzR-hHkq<0Nl7WS_Re(zq>9)Ed_e7sVjCp&6DCyF-kfp~
z5jecxqfTIWIZ~_<{DyqGM9H6{w)X12gZSmT>OHaBSPVh$4|-BCK*f?(GBaMF3Xg$2
zZoXpn+}^2pGk519A#cP+VXC211Jj{ro}W+jWA30u1FLADTVwLuSa6guyp|v2IVWbd
z`$ds5YDnCJvm$-_l~Mb!$l1_}iBLoc1)cfqR!vI=&sQ-L32^C@+pp6w0OHAjhrg-j
z@>N(<I*<YA6FTZ!kqCU+_^UXeAJ~UBtOj$C`|?=+x?jO~4RkkE{8DkAS1$cgQrQC(
z>Hrt#ai7lB9NFCt&w`QjiN+)F)@;J(MP{E_nOf*Ms}MRp^zme6JV)&dKSY(^r8oK|
z7S=EAHsZ_XNSQlS+K&K2>s+9WE3n~5XqZ=>pbWywIp+YsfK`ku8qf1RLjo){j`%Lw
zcE0yw9-uRj$jRxEV_P1D?cr}ldP_pySpSTcSpptXE1I!ghmZ**%*rI->orz@y_7Yh
z<y&h;Edm~DZQN^)F2EAw6M@qwW4*#st{Iw*To`-8v<h?QC;+{sK;w91e{mOR6b>(a
zau5S_4*<e_0p9}Q3E!^AxTL_B-5+qAs4g#BuXm7jLj@L*T59D4wY9l34(#>NJL8hj
z(HL4=`r$qKG$4ajnv&*KJo0DA@tOK7va@pZp5H3!R=DGdIuCh6RuagX5o=d_OXyiU
zu<HEJG5EmoPIjs`kUTk3h4R5KjzJ>i%JIW{z{?E8z;>XQ%l_ZD0)1bdWQ6&@I|b?S
zM_A%9vq?2EZ)}wRRUe=nJ7bu}6l(wHPy-6)@rENKrfp}Y0QciBP;mP9PZ;*(hXYm9
zX;Q3gvb+2@1*w1kcK_c0`e~RKpFa8D-wJ&6*`5EgSuk(-^znaxGw{OK|8uLai*L=5
z1JGg|=6o5<ehcgW|7jY`fK7}%TXGTsex1Z!{x>r>Et&ut@dmXB^d43M=v=iX9pCy6
z5f0R8@r~>h_+PVK7S2u;cdlU~PR@R!`FXn0@0LPjlj~m4jGqFxP}8Gb2A|cAJ4bqX
z89-P7auI>$NlN*H!nkr@yOtAxcb5V<&{1A*ei*-Qzp|om`Rk-uLf2w_Sha&&8az7+
z<SkMGz+Z^d4yN@HwfL=W2lxI9oTcNdlZA!%>OHav|9A~!ehHVg(9F&FtNt6yIEV=)
zj7EUmiEOfm2*~+(9vlY1rM1$k2>2TT!41q(sm!^KhXULNGzY0>{B8B4Jx>{G@`PzJ
z3t-Z*1s{RNO8%1;@2rg5_?^Rr1=*AsS}Qfq<0ybSi|HS)Q^jRpsGNS?a%@)(NO{nN
zU#M}CSl6@yL0g42)x(KxZ|a_$l-I)@&%8fp@R;aJ$^t(Ua|8gu&^qU|f*lY59(BK#
zq;@+BAYO&F<ME4OWj{(Vt{hFDbaU)YzH#t5(|p7TkX&ylBngR${X5B8VWnwI`A3|F
z0@nDWKK3j=l6sFAF&x*!ZyS{75>^`gbmD1=2pxt865K9BKSr<^v+rYY8{My8brU$2
z#hdef9u0Mz+rOS^dMH>@Dzdd4mhzs!T%9a$>{EoyErI(u?KpU3k)zKTe)I3#z1#kb
z^^MY>&|>a;x701375^TvCA&}RX({g_<#LPsR#Y}K5%-^N(m(tUO)?FU?pck-{m@#6
zGl+Orkfx&UywA4ABqZ}Z>j<Xpyg^|IA~^fw|48v|*5KS_ik9nmgZobl#y@^06p$;;
z%IH#;e=d-O9ZC!^&siVPwmu7mt}cU2XAN&<H}cK227?5I0l%I}LYwv70<SW${Pqly
zqy@?vhg5hnIByDPt2_5r(MDz?N8T-Y9Q{n{{qz={8L~=^5VFN@fz?Xao#zOL0!8dF
z6+Te4Ymwx_tyg%{4&9O4VzWwu;Gh<rd0wvVtTN&4$x)+)OV@E^wpja_7TH}4q_fb&
z4O(KSuKB2kRYCUyPzi)tij_Xoj&%EVq-sj9l(V{Qlwf-0p>#~Q-8Q^&kS{{=JkRV*
z+rPE69hv&}FqMSx1H+cv&7hAc>izY?u|Ih$PPGo&_oo6gL+qDnh)X4ESuy&jR!h?2
zt+3nXOYW|-6(Ss-KYr${lu9L|{iZlGb}nPF^;I%Tg*Rg%fBg9a6D+F0ps!2Wqv;38
z<R`Ku;nak>hCRiFt$+1!@Rw)f%K18*2uT(wq(MP4QEbM{a!Um!*Yj)|BXaJoTb`zE
zRV8bfzLlG!RI~SERL6LF#{8ZmqHlgvyLzMW_ZXJ(HF1={{qjH`Wuj%(dxg&5RYl$G
z)q3S8spq5@6LtCMaX@6P_T$Y_m*IUy?M*_+!F%WC2dV;iw*W*f1swxD+<}H%AV7w9
zC6c8box4CkDdSfnoEEp{mLygo%yF0yDRxkz5PO}XnuR=^8G=lW+lXry?Pn=!>Rf$T
zh}ptG0&k9hF-;!xyuHue2%T@PGGc5NbIqsL2!NST)E*_QR$emhi%)77L9Bi6p04XY
zTZj@pmuNkf1UI{W+fUfLVuL%`vCze;1sG{q)RdEfgJCz#!nq4V;oC`IOR&pVW~KZu
zU&Z>*km`_QO>pT9whhAYo%Of$2NaI~nWveVm>%$tX+3b88u$*6q@40f2Cb-!>z-<=
zN3QX7z#=$}TI9*2il?!G^&*9gV+<)860Q-#cWD;ucD-?ec=YdyNZ8p`LGTbxyl`<y
z3nhADIveWj=ivRtcl`wI2Oh^d0xb$8r<Q$J^07*#JpZNUGk9m*dJVA|lIt=aU!XaV
z3;rC$B1EGdjhblG<kB{tU}dscjpBYtp;`l1;yMb;<AOsKorun7TB2dgdwe~3?cd!i
z9{6orYCT{`DrH4oQ}8#N={OltQk-kxl)%_$Q#DD1CyhQFh6w4l+Vhl$gSu{8l^SW|
zU-%Jo!r2v_xZM^rsSl$Fkapthqp+}s^Pgp}w&Q$HY8Q)^mSqAvnv&*0nH7*$r&21Q
zb>&2{$vAbF?*iE`&EjYZs_-#s=o#?w$@GFOZ@kx(DMf{zpGQg!*{TV#mu8N8cY~y^
zr#Y>9&!ubpCu)kh=MnD1#m@Vq@L5wnXly-1f7oaFl|U*m6!3;iR+^g8E0SFzvOPP-
z{oDB4a52byFT87h=itQox_N!!;l=V;M%nPTi^mw!?ZPUF8Tr>;{Nd3Bz4XM%C*Sm}
zi1)<zPK<fZPG5dq6P2j(r8V><JSGV-ACo^3d*v|stzJykv)qaBN{Dk*Y^7p(m!tDQ
zIKlYT?VW|c)6GEn$xC_m5ky%H*<Xig>tBEYh=hcnHp=E#Y_Vg0c7U5Y^0OnGCzT#p
zlCjsOE8p={(~WHQQ;$qCho=X(Cr8UG4%=sq<?BMcpGqY8{LQ#E@gu;Ed750it8LM^
zKPOMTiP#k_MjP$SD!Vuh?_hsGk@#n89zLEg{E;>#jh#FBu3dy62u#Q4sa4r>0g*&#
zUKXH_>fIye;li!8*Y@<|RcLck_NL=rI!&Lq2FI=iS32UQ;*%AA^u=4}2FTl@Fsk~?
z%B_6ZJv4B=ZL>x%lLi`oE~FYfIiJmVHJk!gacQncPHYK>*2H{%Q$3qCe`z2)U%{oI
zW$^qYGusM$n2sV4UHq*dyai1tnno76=D2*0PI$X>EB8vx^r)duwURz`C*}>(?1XAb
z%oB+!-g$LaXd&0mef@_sZ^5+VqzT~HI(M8PbGypf9oejJ7KMLDMs^La_p}_g@zw9i
zhOjIL!v;+pJlVzM7>&K`FIu!e1l(2zzTs|bj2_sHs9>A5W-COol5L(Y7D?9nomdG3
z6bIT7^_>TAhuiAcWKajQa-0PpuCKkPx(_{+Tm`4Waj=^%ZH_AlUO&qd8(lWqeUkF-
zxHho`?tfy><w9F{d0zE`&AIdqG$}|Y<*<%=WcWm=DBgD7UF@I}tAW+hlua%hOR4Ho
zPm`Htq~yNb)3`^fRnWio0&rX;iW!o7-`*lriXi+XD6|Gj-W=hrGUAtP$1HbQbQ0rU
zk#j}2zx(A^|9@tafNpJ4b4DAr9!Y)GqlbmJ*p%g$Z52|x3oGLazrC-CoWX^}QeLg?
z*6)5Q{H-VKTcZDdFTzat;bp}}<NWBdwm#!Ss^+O5HF+g(S53LZli%6R7lYfui(pk_
z8$%+ybBar&)7%pCeff>o>oxM={*up$U{s1G^~XxG+|s|2s?aptfcYOy9UoBCM`7pE
zkiRG4bQHC>Bgv{NYTM5H%aI33#^Vd8<9lm+OFse(pI_%@9oStf9tvKM>1h_P3!Y%J
z3Re`9xH~pkX)bQ0qclxz8_O%-PKwSk(R`FYOx`Wvu0JU8zj}BS2!poGPYBFXfHN`c
z1jO>)*|x)C;jjRXW?s0T$?!_nN#ZwC4GPk+%h{fujMp6X9P1q(xy$|Hx*J||?<xJn
z)CGCtBIFwsJg#&Fr;^sVmlP)?-ir;XUTrigwhlir$a*XO&@aQ0`R5~ICI_!eu~D&d
z#KkbX@Qw_Ti+!mi4s5Q$0HFoh%rxEFwaJ|+i>TX?|7>h<r+>xNcM0vjm!ywYJiYS8
z51Y8j17aRW1?jxdC@q#Q`j?_j%QLV95hA^YTO34$M>`|++EFzA4EnqbP=#Amr~S`d
zzJ3Za^ur+}VjUK8Rtd&RD&O$%cQHadiNhy$+BJZbwfC~vC~>!tY|_pZW`~ud1D`_;
zEtJ0Iu4raCFz9di>euz75;beSNk!9<eyqHZe6uCeMR)j;-_zGtT#wgXeMEpGKTj;x
z?JB)K&~uBi1ZMvI+yGtQw&^YAKf@;>zV+=?!2p<}9Sm1gdrJJ%9jF_`c4NRtmxs5;
zgO|tYX*fNS^YzF!_kv|+>1(!8!7g{DA$bsWB+Go3QV!anzYLgVHxl!Fluv&9k8&5G
zYdPA)j^ORrHZ-oGEdtNyVeUN<iHc9iTcSlcj(p*n?x6e4duN(yI`|6&sP*ckH(Jr>
zGU)OkQ@<=*dN>I6@VZ3;4T>+hJ>U95SeH$&K+IzzQ<SUK*#_DtDwl8%T9MdqO!s&<
zpyfq(+psaQGo-!+p8US0o3CD+;<Ez<LTA9-htAsY-+2M6pg_G-21C7sPD_|hl-^PQ
zXYDUEMf<fMB;6+3Jbywz8jy~AMJBA#mF*}c<afjXt-vkP9KF2y@u3iV;9Q@G>^wNG
zwOZt7SP!sPEx;mVFQM&Y%!up8xaBg=l2W;X@z&y9$=s_^&{BjMNxAn3jEdF6w8={K
zEjnLZaN#l9B<B>#PaBLMQh;(hlCJk23}%aS?s3iE{b*VseYrpKJ1jOcEtgftl&$hN
zP1E9cAmr6plm}N(6UWFb4NdkgSdcgG#ZcgUb0um^qynzoSys#2r2(y;i1SVVR<!uB
zL1bZI6zhD$EQzOd$&|Jnr_+Z~*gNeg(!C_^(Y;i5S~tHoR6Tn__UnHyjD%iZNEB}|
zkIf*B4}05qddXO@xSF?g44Y#aukDC3_867iK8t&Pgd}8p>*1Xko)X^tfY`R7PGJ&7
zk>XM``A=6ZC<6+snz~tqPr_?LAi4_rxUEl;1;3*IoP7gS#$(68H-lA~*Z1(suhG@w
zf=qj+ueL&y$V4Q=z_SWEws?|@PmiPkw=!#d=%~1Oc2#2#>)80*xC47TobF*O83Kq`
z9NA>Z9jorGoZ?Ty%~7V}cgXyrb}wh-D4u@}q{W-niKK5V=1;gX`R#uk(dfVaVLy0G
zm_JubPBWy_9f@)RHO}aqg}bVJQka~n5<>oa=2*O;G6dA~2YsU8TLHfQK8T8uyucbG
zybJ<K?MJ+P;kaF$IgIMNHWPE|g}`$6^^NS6mN;pq{fm@c2GfaK*2+zBPP>g{XxgKW
z@vdjfs+8l?+An@)xw0nk4<e>@R_@Xxue3te4@K(5^q3QP6K2yVkCyIbsDk|lwZEUw
zX6dkgbw4S3)!e@;XC503-C(1Z{~-KA3wP_Y-|7BDuu3iTup=g_DrW9%>pa3@<%em}
zF833^m0n-mKwhG9(+uSux6+^giM`c;$jR|9UJ$M)ReGHywQ|ui2`N%o%}~z3hUhtP
z19zjvqoVSh0Sk}`H-q7N=jO1GBCl|&!xFm(i#xSxdD{H;-yH}L3WF6M9Y6H#!o3HW
zs9Zow?4BSy!xB6HgOfIe`(i`mI9I+sTb}8lF2^h1YEXhe2F0ZtCPGB$I7Ljt*M|z!
zhiiLz5e+Gzg2dtVY_-OYTRBQYI}l=&g(0_L+nl{&Z-Sdu=G&g3RZdjQ3J^NZ>Nt^^
zjUivl2KE}B%T)X$N5$Nuk;ha_j`_|m=-^Jq#>h(O+}ZfL?U%CnPMPRLP0bx<ci!uu
zvvw_}C41RY=JB0YKNf6Rv5>f2qizlw2mhyqu|>q=0Sn1q76U-6@$fi=!<N}zuU*!Z
z!sLT@wR=ZSf;N456?Femd3PdnO-h;l+J-A}h-JiqW{Xnc8o>_ZS*lKTd~s=hT(NK_
z{Vyk&;_6P6`78x`c#~ci#M)OA_MZnS3aZ{Ab2HxGX^#JOYlN<|p^9{=FyVay2@#iF
z1T#(y?`4!~uvsU4R2w@b=0{!x)+!X(t?|+tXZfI$!#}@BrDU^twn<?8h5DRIqU6uT
zovh<9mtUJ_v&gNM@A&CUXlE1O>K1`VF#N@=@VAnT+6@EG01uD<IY#s%==kwf-4cf-
zzTigBWk<1M8w26EWD`wE(2w|6g?F%3#f~!0E7eFLac$`(t|5gl!VMna&*W9yif0{C
zy{pO8<ML~O<cc|xwsmpQe}Z_CUb`y$YpKzHqK)|A+%U}MZsmY_?)*{Xcm<>_BKeUF
zwrZ-*;K_i`@U)IAqQ_|%r6G@PocdfgfsF=dM8=bzR!KX_b{;G#rCw?}3hz2O?}mfe
zQU|k~VbJ7lzIjkt71=x1U-oMbA@r=|$fCbIGuunqI(7W>jsz(Tw*NuVu}T8dH&yX|
zkq{<+hb1)4I1fY<NE?kV<0Dx8m+Ym&amU%9Pu0cdYBxC$5kwrrbb<(ANB)LOn>M#>
z-bnn%TwY-qs4K7HbEo(apIU}|LN#U+W5|tH^ZEy@&rq<k@g4A8eaf{*M~#CUj%<ao
z9k%INs1R{BOV{QBf1g%RS3DX?yoFuz#u~HYFJjverBD98a=-guptOSeMCB-E+l#Bm
z`y1XSbyZ3wTE8!eh`@O&yfZ#yQuZ3vROu2DXjh?B4MpYeridpODd^rY<tYjXq5rcn
z-IxcO1b*QQ-*oZgDGOM_0w#^arlVaRJM@+Iq;!$9wr$m-wAX%P!^?TN8k%fzA~FSw
zH8g6PhLLLi_^{dW{n%jn_XXL`&r8)BXmW$|FlG`#%bhm#Wtgt8j3Qs|NqMn**qIxS
z-sk<#olVFuHqT3=SadY(Cfw!~bRJK)Gn>hJYV~VW%CU^+<<0Ilx<Y6Hh6=&Eyl9oF
z!6&4OmubG)M-P1BV02__aNXK)2}x%j?;$r7%ocjT_Y+r>n#uKY9Nr`9q=z(zX;b2Q
z(AXMsW3~#gDqUp=tslwcL`L{RR_CpJcg-mxfA<elJ?es+3BB&7C1m>-TExivIExo9
z3vmvaku|L-e}DRQM5}XGNTYziy7=YN5|pG4`r+z(hP*914X;MB{P^jE|DMrGsjWF9
zk@Z<HulgGT_4(`bOBi|CQ}t5wJZ9`k^SYM}T`x<GEi1aFI7hLPa4&f!Hf_JS?S5<5
zZ?R^&t4nhi59W)?dk_=Fg>6k-Stn7m6M}s=95;!rq~bCl1b69x+~pSqdlnET{cc=@
zTx!rEXQM5$N-H?>B)17-T1QOE2o31lNW+Ix8Zxg-3o2^GuJ?MbE8*{Am8D9>_F}#Y
zIjlb0B$+R~f^)}1U6|#}D;&wt7g{Lf{d;)7Ltnpsw&L2D9a%AU`*TRXLflgJ*TVh0
z+YJ8<b=UXu6&}{;zvIFEos3P>hU%qrFmH!B`Qt}_<DzfDdxZJb&fQ<ugF^SUYbr<Q
z`?q1x3xCF|ax2dn9XpbMj8_{p<Ll8X?Pi6z1)aBE%3}L8wjpaWt$}6kcq&;Q@?u6u
zii+VFZ;qU7ox3)S@|CkvM;}h3a<EyWX$5&fqh!MfgNdN;$j-^-A6%{4*4an1&w*{}
z_=16G&HO`Ufda$?=T&RbtwYnSa|a)G6Q(0@{hMgqPo0<fuxRQKmYU42!mZyYbwMG*
zL*Sv^B+bhTD@PY%A&`a<LoTT;q&wsFkjdxwNO5hd{S)a?Fi2`E4wYxgno~jkL7pF4
z=mbAMCI2uHQ?ihSrZs9CZo*2uUdTaCfH;cRPE4O`>GxghL&Fw|IyQ3QQ~Xm6Ort(}
z--lIKT!_{AXq5#vY(*MZ4$;#6C5VgcNWvYSW=ZlQh2N?K$&P($FHrBHTdxnl=Dfcw
zLdDN!P1dP%UR?p%7)%${zSP66dah{_fd1I@9N}5H6*S5qpCq!OS*tmmo?3^JqB=an
z`v8wJ(5=E=r(!-TBeQxFTtIb4MPMZq7rzrbSbdO6kZm0+7q{u6kF<m??H<v>ioweB
znW~RTLbONU3sv4D<buBs6M1pihOGc*Uz2VW3RPDw8|-OfixXxjdRo=-q141Ge5ogB
zgVacecZMNbA|cmgt#V|ymGZe^d6quuY!|WXHKI!p2zolG&B{_a=V4ow8reF`ycI3%
zJEZ7-wSRJAv~yy2{w=WyMmSsH?Ay{V%<`58$gCY3yz>^{Ia+LadK4DzrtPxs=1lLS
zXuU(5;xyd-f%9%ZQs~)?N2I;`$*6Tl$-~Xs4+df(9UVxtyVjP&dBFOyfz(oKv}^0H
zRU7<v)9AMlBz=?mNx0HUizSbc)6KJc2DkkC5EzL{>fsk)M?!q+dEv_77M%}e0#2{O
zA|bOT*trBdWl>(6r~UiC_DKfx<C1Ve@y}1L+Ruu(v}V=@7>|i(lZK3}oD5H$Mr77C
zc29m!DF=I4_!F~)DqIrk$M?x-CQgx<u-1PWwi~*Lkf*xCHkqx?!CPFrd(9q6Mykf}
zHn{0LMJc2x4UnlaPyF^GD}@z^ZBG@ZwG?<W^JYtefyi@MxbP8?aXgRhvxG6Yu>Wh`
z(;S9)^*$cap;{BFZ$rGcT2AGn>$404slz9M3MdEK#cjQl&Nl|uM~00+ZUXhSBMkp<
z{-1@qu?!K7(PKj0Z+$Y{z$55NJnA|m<gYTP6<A{H<6xMNPnFPgWH^P;d6y;*Ousi5
ziD8k>Z!6f$MKG>Ewl-~3mD+9bGc~E$^O==Y*~KdHdqDQzk^D6f7!9kMs*4LI04I9L
z?j}y7-ltjI3w~irK{#bMqKW;z7q@~>uH=@gs0WbfZm&bWO7T#^ockHYK!p#Ki-;HH
zF<&8Rt^KjjO08bYZr2F=Iy}hM>2gxlZ73}cUUJzdnS1#LyRXq$o3>`h&P-^|xmQcU
z)L}-)sQGEJQr<FGGe_fg^e`UoYcpqdG0*fSF_JK9cjLOI<tBsDcgzE&N0Z(!P!ywA
zYp^BIrBij?bKM~b^pbCsdoxiV-H<30cfWE<HIRmO+|P9FBFAsi&HB7GA@a7YFa?tj
zryKGSC{63qWZ*!vAziA5M!4t2hG|{80SPn)Ce3uvDKqcTh|p=diQ#B_RD<lMZmyoh
z@dEm9bvC~A^Q0)lwn}l(fZ~pm%4xD?5+!Gwvwzk8speS87#^vnG!a}COCd~zBW0VE
znFJ?GW-x123HvKmB|b^Bl>@LASa<hPN*V@RQqA4@qF17%jh$V2v0kU4T<}lG9dMW|
z1LftmQhBEYC0B-xpKP}EIIVtTv_NO@uKM-BI5@X2gY70X`e9igRGGz<@^mQiO=i|s
zy95x4+?TT_{e~m9Gw6O)kPJ_DCl=yAi!oNf#Xa4n+gRDD<h+jgc0;^Tscx9v7@Oxw
zn_nBKtMI)38^Y@NKX#6ov&P_nfo9tTl35+c)aoI$I}Gj$WV)1q)V5hqAnZST1k8Ie
zgkSztF|)=QF%KUXFQ;E_$5R)20`|u9ZmO69207+U{~i)KyqJm!cCp!i)5G^Cu+_Y7
zrXNhzBUOUq=FJkssgb@Nu*ey)Gj~Mk%PZl;&tbA2+%|OIJx5yIS6ST<9iG7+IX4%n
zyPBAL>%`vPfN!3q9<*H=GZ16_jc~T$Pprw-02Eu~&X#PVzu8b~Gp{Z3-3T{2*{x~Y
zVYc=>bp}+VM-)8VdS0a8YW}(5V8-BJGgUPRfiDdaFB}eBt#tOCubH>d^(o_~cSiSp
zJ9A0%+B}M~?(W|~80L8ai{$FfeDVF{dZP{UNvKM>+6+Qd$B}Yq^8^Mikb@0>L;rO<
zxDd%ob)bjzFT~QT50PwNS{!wQR=<2##oKzLP?KeMxp<0L9Q=5;lYAm}Hn5N?vi14e
z&$g@{-seGEy;bDCa}O1>Ofo0x<gaErcRgnMO3XihKTVQ$`B>!0Ysb*^?rh03;bChx
z6S>uo$3DqRF91M5Uar^&(B)J!&BO4iCzE1HgI<C&-u3X5hQrICwii}q@5H4@`EQqE
zn=@t$-~XSw@2{+f&pG&qp=Z3dbq=*@`iINg){Bphf)f$~D%F*$B%NAxcBD>tO%Z3N
zTkPEUAB=b`67>0wfBtTbse{-Z(^UUhNK5hId_9)#zv(B54t+88mhSWj{p6uKtN|Cv
zDOLitn{>DFQGAE0aPWBPEQYt4VF{s!U5yV9N>xC<@LnVgGB{UZsdAWqV&15-+<NZT
zMZcgVVwMS-w%sG|Npr%hA)KAH@#lhA{RQdzjI$IDZZ}ysS2Sfkgqoi04dZROlbIxo
z9j;|VfEjK8=cM^jO`Q6g&3R?s#uR6Yzwep9b$c4U71>DN>cwwye|~gS5S#dGuj_26
zRp#-<dCe`^%K;(d6M3JxtM$Q{!4aP%S$x_vB;~bl*_K;p^ub4h$kW_(iwlV0!|<WA
z-bC&`FC~QKT1$m2e#tX}U(b9p+!2P5Y*2bJ2_)rZ9w+L+#+zfeV3s8PZI97&^St67
z*vrMrNhM>gw4`C2v-m-@nh^6E?|+N>E2zyO^mHQkj^9PfI@dO(+e)YZy$+&cN2<9A
zvtryz<1Z2j<KWiD;@BWu6kjC^mF3hAC;oHr9NVcWcI#PrV=N2w#6dU9tX!xCGXJAt
z%5dop4zv5Hu*0q%uiiI_Pq#JCa;?-Px^{ey8hjwe?(^)yK`*J);KR1Ro8q4tB)Rz8
z8`BUKil60`dzq5d(KuC_^pC6*N>hdqBu+XJU%~xy@EO%@MU6(}qNgi>J-KK15){;b
zhy0s{`m|KLc%9#@KuuPon2vwb0Sp!l3p-~-d4H4^694-qhfCa+_wT|AOR&s#{p9d7
z5vR*brG!t3CNqp1mr6N>b`&(`MtX1i*QVzEGrIG|+>zWFhUD&Ukfk9+F8J3<vZ2fR
z`}au2mc)%PEp*^*4Sd4}F{PTwD=(e?V!xO-=-|YD|Epc@9Qc?+M4~ZruXuQ8ZSTCn
zvSKM(<T`o0%IXb*Y5x1xj+=0gZ43Cd<+;HxngjqN`9DYOWAwDW+vRfER;@QgWZUYT
z{*uVeAWT$waC=20TiPlw*=6Mck(T|42E3^4!f)*U7u+|-M+r)$Fu@s};s-cP(dBkd
z6_n$(#-AJU<qZ<?OwJufh!v+ysgfa1N+*pjpK!zdMXxjRV|0J4`N%@@I2^wYp1=5`
z+dPuJPf}E&WH8ET)GLiWijQ+nZrJgplKw=f(uubA`q{q1R^rEs6!{P;5IxQvqw9PF
zila+Vu<*nd+<*i}DK;dKXU4fE=E}pRr%|lWL*%T&3$3{$ohqXih=*h7t6t{WV4(&X
zJsfK|o(ioYsW*!*7S{s5RG*{+#g$OdnAG_fY}mX&90WfEw~hL7U5{C8B&zn94d45$
zsl(9sw|??`vDL!VC5IF0zqr^OU-eGq)EC`8#Tn$5>8CSk|9rqS?R^*RsB0G3a?^{p
z&c6XH_jd^{W;;T^WHljHv|-R~NuG0f?pI5L<4pELaT2~{|GJzt!|ymSX(8sdbcU(<
z%Xyx2B#yl2#m5u8I>+8<_^y}l?u72sko%X*9FxMIhG@5&H;(Q6#Z`}m-fsLU#ZxG?
zKpbg1SB&Y!AGm+lvbSRF_^*tH<#ofp)Ips1RTnVYx)w-xic?ot<DFqV^TgBhH1P5e
zyC&JQk1=<tyH3pmC>G|)2pMFFw2BRasi#4nlO1xwgVEw^zJGo)=@ZS0G~7x0iNpNN
zo<Umjk+$Ib;3jqSOG<xQo_k&Ow+@)cEv$GTs(R0J9{B$d@8dQ5Q{i8_D>VUvMu_M6
z(5ux!ayevqoG$a6(qf(;62DPFal(=6{vHTu5l(*wYR_+4H8701{mEWT6LVmu(GUr#
zRoiHz(&>UZ7#%s~vpZjrFPdfPHWvzSTkR9a+j@I(01e_u<=Cv|yiS1)S3Nj7#Xm?=
zN7oZz6%dewFH)=zrCl{h<<M;TsH5lJ-(m`{+L0HWj^kihP1FP=-;3u#Eqp@PzN7^^
zmp!t^c<&)l_!oDixqp+4=z{xpM&q)md|<UNMC=z{owF`g;f=5J&G?X$)Q&W1YAj0O
zYj)d(o>l5P)Fr1;eB;C3F|a;vv(FLwjS6WGSmBFlwW2dRZq+}7Lst(fuI%WeG++po
zYpRbryk@j~a=RlA^uYWkkO}?-Dkzdv7x)FewP6$_(=cWRBY0VSTXmw{4M&7*cLb}R
zP^eW|O_a&d$xNTD<`YoXAo^iLRmn<5<k2+p3HKro*O!;8ToSA<Cz~K#RS*b>yYqiU
z!(xJ-Hr$EI7kjo_`}<mpEc5+jyw;^Gy52Sm-kKHRH-(dL;>XDkF??D&{r4>qRrs-U
z-RoJESrc_jH@{E792IgrCzdzzIgwl8E>qgFPR#hSbVUg={M~N!*3*!?R4bohF&Ad%
zeRBQ92azKFOy2&gtD&@rmvLeg8Pvuja^}Uwm&FieboyHT<LefwU=JRM6NFoEA@5Gq
zTO_ULYi6wcWll=kCb(Z2WJIUUs*1DzQl(-kNT$TS-0s0eg@oqBvT}d!k<N!Ytst3%
z$Qxtwn;Rf;CzW4W)Bju3I+@!+K&Mhx=P~c~Sblg*-9i(+|0BXji>E)SUhS6aDiu*@
z@--Rn=iB+LWGPq3b0(Xgv^Y6=yDD>Wl?NWG!XQ@uq*2P)J6Vt;f65RZUT`$^w{7_Q
z|Bt)(3~OrZ+D1_X6hzocQ4|mhReA>@f(S_ONLP_gXaPYWgcb`*Q91~LASFRST4)jk
z3%v#i5UNNgfOHbdS#iI6Z};<_^L_7kuJh}xKVFe_tup7DV~%l;d)%XB@`!)`zEPP#
zchnsop5DN>Pnz3R6a|URX{s8?(~<dok7Mr*sY)<PN;%$Z&%YIxuAmd~!;o&D6CjB8
z=YUIRHjXN*)bqtc1)o<>CaE&ge^*Pby}@a^^#}a95zW~jNG@>1Q6*O(anCcD#X4CW
zdZwc2OPAcoN-#jib@@*9TJTG?SbSHNVT5{2IMd?A-tDNfZ`x<~<6;IsGr<Mi*`%fN
z1x`>V#h4_&@}$r3mYT7TL!dibJV`wMKxL_HH)ANI2w^&q$=}Z&!mU1qxL5)U)>Q}Q
zql;KVznnW_xAifVYt?*zN|%5JJw9hh)yL_tu<BGR>I@n<<bX3wETpuXpgwY&DEwwj
zE))zy%_SEnn8Y?j<OlbsF}MzUc5eIPMZ9uB)Y_KK!vVRosDn+&M!ywzI_jlsrzukd
ztIp@Xt>l+Fh2k5XA|RvlE)Tp8tQw%Lr}q#uvrbG0Uq{#HDpi<gx?y`mH>|4UPx1tR
z*lKTy@N0QXi<8W5G&8@h7V*K5uFyv8E_F+^MVN}Iu2hRi+S41jMtj3s-?&feo7eEB
z`XPcntV(-y<kzWb8ZwV!zz&XpFOq&{I<r--AE}Jn1Q$O{YSK&762x8BlZdUy_F}$M
ztGw_9iD6E!3>oY;W>o3jl=J&A_xvD@?#OK~9!@*@GiUDOqi^V}41uG2+~lGNuu!E=
zHxr7VWma&^S&4=IrDfxt<{}0tV3g2yHqz<*Q{uhiTz-2T#(Ct3rn@l=^m*|v(hBg1
zQE$}FPxr39L#*t6BnP35spzHRGjewK2QE4y*FJ)X%{u6Z8{>L^ilX_S_No2DEWE5;
zw@+wD@#GvI84Z}_Q5nc7s(R~a+c0}#gUq9mig^3jK<x5(NJ$>A%CUEHc89AVU1C0h
zCNU=S-p}kBr=Niv?KPh1hD_K8T^ZZxy&WrCF`JOmmP-=bE*sH8Y$<ukUDApN_hW{k
zo5AH1`bX|(u-gK-1yX*ecth~G@6pyn$o}rvyyloA{gmo2Zv!@B+9SWtzT-SX++3i6
ztarZjw@x}?n$%-ZrX@%jm$x`SJAzgh;-PC-8&ky5#h2XsDPj#FN)j_A8ntcGtsj3@
zH2@JB?inZ8YUZo1c#`&W9qOahry3RdMI1p7ZKRpuJg&w25VNV$M=X{;VLa?7wbXFo
zHB{*^_v*>ld52o8yb$AvgPDk-3h;wNV1haxbFwCREkR6lm!)y7v-`|>ekJt_3DpKE
zO%AD%P3zvHq=CGyXs>b0`k&kw)7r9OZm#XTrdNUkn;|cDr?P4a7s*QJ(8#$<coEF%
zkNCo}Y7JaQ_|fP6>6L+zq0+aEFeM|41_3siK6&9q6Bxh9Z|mVnzsrPU<0qnM!-nq0
z7pA(j0X*W-;c8Vr-4VrWoUMvbOzW*@5}T0sS-t-WJLB<!Zu`~Gb6Sizts`<b(Gds2
zO2EeUYb-XVKpky6RjB~yP(pirum6TE8TBNj`3Q(VzTB(}Y@Q+NcS<TA!bnB2ow!2K
znD^ebg0jc}dag%CMNNj9pG+S-HyWNRGd}Y{*uFSKZfBv$r#GbJo*b_!YbyUfTJ{;h
z?ZG5ofN3dgO#?15GwQn*%3$lP?0LJ6`%h`V=QAnQicC_VkZ_kKdX+g2Z?f){w1-A4
z)$7z!A!{uN^`1F%TAciiKN`?)xKmo6T5*G`e4D|TIXXL}!9Bn^l04J0jQ2^NJhG0l
zG98ADRBB<BGNieA&%hGj_=CFktJ`_sZ;ujEw`x?I_4+^PrX=C&yO;42PqwnHYasXT
zbw?~xdxS_A=(s4Ej0teU0(-eLKQ=rGc$BP(<3t9W{D)i1ayOn=H(XnaKs@?hWypWg
z{W{$J<`2_mO}2N;G#u75Y&48z7v{V8*bVlU3rF*2H*Q}?<xSna1I=Eb=G=-`l_Gd3
zb$*myxmG^eHywV=3GRl}GdI`K!1tSzhpV?32!c0s-QI--7@nU6g0@FD4=j0EELn)M
zt>O1Qj?S0^J$=6Cxhm{Ue!-dU;qL7{IB&OMbJU4>wKu<7I@g}WttY?KQV$j?1soV;
zXiEh{Oo8Go%a8&8jdVyTLuB=$=<u4Ie^o|bGp%i)Y`Lp)^pw6Q8=qSGT~<LChe8^c
zqwblvt6ew`Zmm14-=s_tT^R&EMCP`S*AnTL$(6$=2N9RLJwsUQ9+_O|Vv^2y@&#y%
z(>vCoaW0T<>D|t8n~KaC7OkRdk^eaJ>&{>8s?x}Iq{6)g?xTl#4F}gDYnA%xu!F{P
zjYs)o+sK;TFjmL!;gu?K4tr099dS;jC~b)?&!fI;1yL2A?KTmDS2=g~Y8T32+Bjn9
znC=c|@-)-P*rt2KGx=<&5Tr>Z=mc)%t*@pK<jvuPxBMQn;E5mcc8MCex$8Ls-$rkh
z+SO#2-np<ZOv@<7lu6REo?+NZrfp(X>kTb$lCC<l%zQeokYp%88ym$MxK<c<BVgky
zgqQ;_N|@2VI%|I3XJ4TIn-W%GcVh0iCVDx(K<h<eR4$SGdctd>iC?tJ!FQ7SlK<e3
zTopxjG!@&K=tn*(-U|V`6`V-hKALc~#)~vQlrZoEOl>b!$AJUWmK5^`4Zn@1VgEBr
zzIyg~<d$!?3B0f%#N_60BUiTh_2>|H^N^$t*}CePs$7M2PP380UkdqLKKs$7B+aff
zh|poN_dsl`V_ORT;_+b>OkBEd)iGwc0WM#Uvz={P0e9%@E4Jt;ki{TJaXB3b5yh?>
z2NtoDgnih>3B~g!<i)Ckj(pi2@rxneQ5MjHR>!ZEd}+zBz>gNecl<Z@W7?78W1ZzW
zb*WD3+)kMnaGf`yPh>ax3#L1aNw8*zsREDff!9p*>Nh5s8H}98q%5e^adR*7J`3b$
zsfoK>CR3o5?5n021F_HC?%SxSm~bGD&rPQ-JX_<Es7AetJ~YuxD{BWc=u%&p%`?!J
zsZZv<#Sx+!4IY3rJ~ukmFcVMeq&Zuesemw_R({#!Z7f*Jj6~1bC_oZj{0CHV0O~9t
zYM3YEcADN`Mcz?`S;6SJar;8dRYZ6&y*Y~XT97My?Y9N|C~F%4Io^Sar1KAEuWwXp
z&!$PP1Pt#7cco>aTP7Mbm03*zEF&$R$;IL6c7Zquv=n#$)><xNTZ~(O-X6QFYgfLK
zXWO{d4C@)tA;(_r5XEljLWTwCQXsV}ZhCu;Lbw|6%ln~$tB#6z)8<<)HQ$*$N0Lrq
ztWpH^3Xm^%am9(p%?<Ms_<i5CvC(t6d>Ceoa$DQSvdi|v>(sJyG(?oY*}4VW5Gp?u
zHCdX~$)At(j{pYh-69vfBGBG_QC!w0Eobr-EqMkt@IpvYAoRy^qbXFs32W;M%L{0h
zLd)wLt(cOIxS(WwQA5{Ucl1K0@ucR1vmmiI#5>LB>Gi|P)eaDy*L7H-PcKdIIxhuh
zeaOpOFfNeRO8hYPIO?$G3f`qXZN(bI`p|@)a|^o#zi$T)To}z_VnOzi!&FgIlQZ?~
zTrMTq2EUE0nix5;fo9<4i0z&eWbeIf$467{G#D?xMSt;tN8>I0z`;m*Dmy3G%o-BD
zw=4sHp(oCu!RfT3eB=djnAmQ-pCNdG*z3zjj_3EMH>zG_rniZ_eS$vr1#P%A(Ne(6
z)K%hwv)&i(VB4L$2U(sx&TISOLAH__<Gb!+Su5c(^bJyuyFVg|?0~3-EENlHi&BYL
zqc5!v>A{+}eCpkoRW2*q{ScdX(sv~oGl=2vQMpF5x_>acOYP5eh!1>+Ce5tc1%=dy
zaMZY0xNS)jBxa|soS<UOT9SX@Z6l@%jnkcM0WX<-geAZMoYHBn0YrR&jRq1_ekwl@
zN}I{A@)dB{l(wYqBRl|>)(wkb5;HtkG7zXSVAyI@v-{IH5uF~eMWvuv@d?Gniza7;
z#D3e(f5pm>AJN^Z$NWVY(ClzdQ{1TaIGIY)eyDf09<d|g=DEzOGv)m`^%=naU$s|Q
zA#^O)p1UnE@Nfl9g8ukcz9>}ryzoR$)J;P{U6#*JbxT8E(WaSRxN7BeX?z3|rAU)R
z+b{iLg?}D@Z@=*%$Mt*RAxoNV-Mz3J)XT*PHT1h5Zv(vCk9rR?oav>TnXcIM=M;el
z=$HqC&lkQ;=zw_QK~?D(VJqTJ6g--xR%lQhg>RMi`ax>ZReaWm3I5DR5VV#qj<9Op
zb|9Lk>h&&|vue-g`pW_ok~xd|?sp6_4oe!6X0)a;YK=msZ`7vNTK^_KUw%;<TO@Pf
z0Tb}ZG9W!3Z6EbJoNDZMDzP5M=`6!iE(|$v<B~jk&6OA**M8Dy;3U7;0HD_;v>wHW
zZ#>GKOdZ&2j24GJOiV7D(tlyPjMnA2=MNo!9Q)mrMeB<$F^`_NCX&7k)$*F(YjdzV
ze%*HL_Ja%T3EsHX1!?P)u8I7!hRm&7@eB?Nb2d~w!B|FIU~QCjV5d7?{}_Y64%X5N
zblpz;8vP~V`ZA3l3#fhNz8acbVkusB#O%9(%toWBu4MxXyKZh0adp}M@QF;an1cw=
zh>`*ogWFTC5?Ew6Ex^C6nQK{Ll}p?J4f+D^VHHdgv=kJFs$XD{oO@=|`GHG1&(Xi>
zj<fSm#q{u_gHNq4oDW&=v52e*P5yWZf}7(qfSte3SgwsmHjum4$*hqPE@N%*sC7g)
z+Ng4&yyRiT<U;krt7{WHmwx7dCr!1I31*J{h{A7~=S?)*6Sj+h@C3zBTClDwgY(VZ
zNM?G7qp59E@SvB5|ACC`w7z_|`T22~5Sp`~l-C{9qF-Zp;Bb$N{XEW2i@?qTR490l
z*I@7YzI9&Y<CH{VQyw?|@%p%iIcPr#Eb#HHa8`mQPfVD5&1LOkV}+zEoPc<%$w@JS
zpbvb=HZZo&dwHDB=;!Bz;mFa7@j!&YyM_^0DF4mh7R0HW)fLLjeSr0F92ko4&~<{A
z-^anSe0CdYOiO#H3K<-3{(u{<w=#*<EEFKuBQ9=;D#<u&<oaD4Q#3=VJ_r*!TyyN{
zdYUPet`czYs&KJ%CBENOY5br%B&t|drxe)YJyQoRE=9<t(mrL8GK9HWRijl>+nS|p
z7OGKEYEuQPmoB862`sXNg<M_$+*`3`?&_c(vq>JU^W99XE?W6Ig_^?Eo7J_DJ;eCF
z+)RZhd=R?7;TLulyu%-Mb*nVVs$$g*Dv|r4r4F=eDv|hFW+>|Bh)6C=cw2H1TS=9$
z{R+2F0{BioRF&t;Biz;64`%5}y`Y=|1ng&qCv9^dvI<mL#hbrT7nH%%T-EBVxKQd*
zpK~I;0z14+hn86Qh{0B~wxbyzP>Mu;9ib;OH)zKP$A{XN2@lzW7&Uc)&OCC4tS^5~
zC`viI#hLNEQ1vcBHIj6WpRnXLFI7EufzeUp!Vl9HjfiFsL9|PENw+|S_!iLDG#<3*
zx>CQU8Kf;ml5b{ey!QP#2eM6O__Sj_q%+5JfU!mB<T*bpXD=I-b6fc#Awa}S2$C?L
z|MXh0LEee8#^1)v>F^>q%~5{N4CL5FUHELCgJpfG^68{5raU~iHocA-<0Y3P(#~yr
z+#w3~biD4SvuvLGaSclk_K_aaBcIXv(&F_bhA3%_?BTXQknsZ22jD^<{^#>u<qEdQ
zOs6|!jH2v(z+Ip}4MMT4Gz&i{uhRYGVA^fD2(_?(_{{u>tzrve*e$S9S>aCFqW~_e
zcXeX%Bv;o)o$yGKJUmNnt_Oe$B4p?z{sDNX;+!Dn1J6WQ<j%_0TW0I*2sZI+W;ME-
zX7t`Ks=Ef6<rHn!-N*@>GKn=0Rd2k^E@AkbFZps}I4iw^3l(|aen*m9cb@a3Iy%f<
z7?CIKYnoGWI^-npA7iU@UQ#JVlkf?RVH5LpltgT}c?{+&5EI31KB<gBhe|=`dmBmZ
zUufJQ#hB^i8X+fDmeNJOoK0k?64<}YF>0Q5MUY*mPob{OM6{tweiuZ)wL#RcXRp}0
zL~&y`?aQF*2PMR;1MP~Bb9zD2^Z7<upI$SxyFghmnye-`A0e-qaIj@b)whfUpQC}p
zqULJlp3*GnI~JXk28@S|@0mUy*MkFl$$`DBOOf5>3r$iZNeZ!U6NAdxhZlTS*CXd>
z8_;i?{82HG`aJZtg|}Ju{9{jW{*6i{12of{8-bZ7WYh{SaIusme-Nwypo^MgPgItQ
zp(?8msCmDN8zlK&`3jR5qSnA8@)-<Jvix61;lGQX>}w2CZVf#A(U)2%!EsIZ8`uuc
zcjf}wx2NkFxGK|3c1?g!&-x7{^cp9lPMw$W6%>%yTIa6WO{rabUf>gj?sOj|-SMio
zDJ)6d4uT4M)JxsVh>g<aplaB*A})pV#b93MX%Mz&j%e{#vV^afMoDhovAD~aCJw`0
z*2uGllhf~8wSn|Q>IxsnC4Xb2JUz$$Oa$0(35n{nzNf{)yE}XvcDKf^5Fte++L|QY
zF(GPwpQp{&0kzwV<X;{j53(;;IyW_I))lfjUSihl?;cSvHqrx3ws4B2!2`NxxI6Nr
zS@GO69hhzQDRV!~K2Ez41Wd8oe)K2vc(?E93J}j$H}gm4t!bl``M>PRB(BvyyKeb3
z_(l#v9TmezV>?=!)*h7KRi0Md2U__&XOS^2#c3IU;M{m7Ys6JGb%=Xnn2n7+w6!}{
z2+@5x`NWUQfWMDu6#`PXXjlu<Mf$CE<3c9X7qsEG8vOfZzsI-<m*){S3h%S7D+$<*
z9-6uo{MOu+CDg7}Qzb%`E?O<@B4f3X=49TzD6Q;>tDeC!=L`Hmg<%gF`Q4Z;*=b&n
zW)%;*06BwonS#Q&Pnq^?CrVb)u;;Y7(wZwtD(%y>A1dF<-Yn(y>Cu$BH}POpvT?F%
zFx$XnCV$n_7F~G!3dfHf{8y$+^WK)lswWi6QuBl|DDfls>u9BO2Kde#TI2=hiA<vA
z*{yQYz*Z@V0GDAg>v>#Kv)*k{Zzet;&?i30e-p`kS7HQFH(J4eGRWoN+DF7fwO{iq
zl11~Ym@T6v>Y_S8RUqk5KI=_EH`4`jMa}A0#=G6+u60neSZ}g>ZD<xre-5_uF)-6j
z&yzdyoL?_w>51RC@uXNXq^e6`B-W@X!UOlXU*gWGJ0z21tr_`aZu6rv+=N<|b){1%
z!{NWnelH(8B5Ws;iZ-p$l9!cq!!|nRJyh!Y1%=hJqr^2ZE^H<f-pb?Ki2x2G1DPwY
zq+!xW9nn4><_kE$1ofNm?k*R?()>Y(8qAMdD;4xh3({Isl<8#dv75RZCB~fEm=G9V
z)0Xd5mITl}9Dv5<nc^~*i+Ja!@q?b7&S_OX3GN_BGts`p^G3RTo+Xf=u7y}9pm^eY
zH@IMvD}H1Zp6>K1{8>)OUa&CyYPZ}+zX<!fl-0Y#=%Mbo-vUyOEAEljH3DE0@VkXv
z2(buY99W7)|3g;@ZRuLzNY8TxGP^WK0JF;E_;0)UtxOc!urN=Nj(BPVPy2uK=ZwJz
z-IGT%7cps0_~5e@K&^$~v48e8s>`t=3j<x3Mr&PqLUt>e!jC8?(ERI!kbw2W#v_0p
z&}U7aw^F$XJfG2D8Fh-8S^ohf<@-&gEjPFG8;^khNR0g5=<`iC_!j^W_=7`B3TLC>
z(r>RGdXs|AY*3g>fW39fwApw;p;Kh}{QLTV(THdV7!MUyz|~FIetUh&{jc!+wxEFD
zm(Tv^3BOAJM9=_-RFc9uc0YJnD8H3u+*!$I<F?v52Go*z&ekh+OA&HY<?B8VI|4M$
zWu+R_n30=D@T_{d&$JdU@5x2U_Zwn3@~83b@zEOrPGL1c!()yINn3gLOEI&H=SpOx
zJKdJ+YqCqGd+|R3!v1i~PdP^p<gcIeOHbRp6@M{S44ie<l^<Arb4LW%f=$_AoWOv`
z*|Cx@l!-T~|IHbB7}&ol2JqUtY};+SU6eYJBX_nfJLXq%IwOtwhTMjGZ&~CkDx?bA
zxtCUb>EMuS-vqsHs87lOIKDCz1}6St+G^kE`|5x@UDSw8zndfl+nQ}@f;d;R&h1}6
zxu9bP@*aOyM@NPInlB$i6oTiaa&#JPMpJ|r@>sD|(&)ny2aUuNP1FuZyw&!hM3Ar|
zNj)SWOGjNvz710*`*`Xe0iBO0{rt#Ha2w7pxd^;&qP-o%uNwh31@6KO<t(wT`rDDB
z;?U^*tp2OWf}_ubx8~l~lpw*?nV46JN#xW$c>SD~4N|%O`Ac_(8>|P<NEyn~5;*aE
ztUWImlrt9V@f;gtUQGCdGV#BT=$!cnIn<V1_ksE=`grRKm+@~H4%bp`211)&*<6=j
z>h<9S;m*e{j#mE%&zG^Y;7-D<x|IyzvT$$>JLeLId_Ye56diLAFfTw+5xB&`iNexl
zT}5`W51VbjQSvV%<RE_=09#;mNwqwbG2kqTgWCM-nWyba2#uJRv+o}BrGo9il7%1(
zFm|^=G(4>4Xm8~x<@V0ae&s8Qr0x35ps`s$M?h*kys`eszyC<GYO79o&U2Q#njAK}
zR?ozgN4>Yk%}pEOlT#Nf13KD45Hud?x9^MU9)A6J&`NM@XSdR6u2)EFb<&YJU|RCz
zey#N9Grc9J5%2vPR>~a3{xhth56|!Hx&m=}t>hWZze=TLeo>qL8u?GI66>b`_Yol0
z0-W^SB}(hceRO|!+#Q7aKOP8h_N^yZeqW*dR-Vy{0tH;iKiRm)sNkyqBu6M0zx6xN
z8A?xK@0tXtSUjAd30+tD{Zs=?@e_c_2h^-LIyCK9Zktiv%KqJQP$d*mIBXQ|qt}zi
zoqYfO1S%@#Q@<HI%H3c8>k7aLcjJkQLo$><{W{+BUPS<iJVsx63?ulmA*SGT@}{ek
z2j>uvGpKBz8uBM#84)ww{FdNnhbtbycX%j%b-fV0Jpk%lXSC|b=pOuKi$~2)<6&fG
z$fI<}Up%bwhaI*0%CesO#8t<pegBRiM6jc$u+j_CPoNk-RhrwQ-3`RMn4|hp56k*+
zqVvmP(6ZyVP5GWn<uC>udO@!dyf@w*Pi*LJ*g(~6_f{<n!{-J~+j}3!+7OH2@=1Em
z4b3rlh07id4UWyVT>*OsSs6NI4*l!(m=HHxa$yevYaM&{hsM{Cr`P_OuO8+HR}&)s
zi<wqc&t{VVE;+XTQs31LAfpYBzZqJLCR~Bj`TPVxgH8&!sO|<VaKm15lR|_!OV4%#
zi0Q{5i~v6T!(j)u&24vx0Ej=S71^iZ&Xk>n!Y?BVzd&(68z%=2Hc}HA>Y2uH!QeSq
zWz{vzUmPj2!rsZFYDoSdkpg{!`4HsdBkR9;t!IJ&qM9F}5td0IX9ceoc)nY%<0qR*
z7;aBcm|Mj_nsl^`&uZLVU{~@m=vf*-w5q7OmIn<Q*;wlQwXs}Fb_eyAN<fEtPuU3#
z$n<rO$rRikfm*ch0^yFMNcEg_khbgB@ohu=?alpqPiUj<?OYV_t?T6cT~I=m6+_!<
zS4TPl>0BT#HT|&!I=FeB**xV|GO+v7MjRlI?JwMpJwr>}=oEh0q|llK5H98>n82)&
zVJ3I@FVN7kEP90iuIieC;Z2{P;(qNv%by*-kqORXeieRR<VV)67fs5oq@S(aevIJ)
zsXb-*abGQFjCb}^6X?6OXSRH%+@|qg%`X9+EFL#xtu`IxEyZjX&3*HY{aEsxt1wPG
z;Am^-SY;*Cd<ap9K}1O;z#6--+y8jyGiXF~)W^AgjD!}g=vYj5cb@3;J|80NzjuF$
zeS0u~B)?VKAewKf4wl{W<RyGDF94TNB@KcW#Zhy3@wdc4s_3w`f5<7Pb`zNj+#`*0
zwXSR6rK<3+7DkHihy{qyi{D)9vx|6q4~@RUVd7aH<UVqRG43evQ1LD|cQHK@zpQ+?
zmz7bdlXU06i#!=K3nXo6@T}wW<n&}Cv(=x4Q)(6-MTJXNaGE|-l3`pUT)5(9tKe5>
zCDUVHg<p=YeM!^Askzj%UiLmHS?i+^j;hC}@Vyd@HU3Zf(0cG<_k?b!ETK)^<6<tM
z3V;Yq#zG2|mDj&HMLZUqIxvTN0i>eqHZt%I3Vu73<N@n2cgR`8R!?@uc3hV<yMDUe
zrOu9AM9P|iih5{TDDi(p%s;W&5-n;LhS^?3`J{xa<3!}H^kLuQ_q`F+(_M_x=7;jm
ze8%s=CB%ZPq#R{Uv%5OoAOHneN)lSc!q-(D{@EC*uHT^^;<)CYoIF0}zAElGJt+Ep
zWka;Jz$f<NJ^bYw+BIV(Tb>g%W-Rxa8ONP0Q~6RULzSfxsHDeo&p`7sE8NN2@3n7x
z(d9^nrg^76fQzK#Gj#@jL2AshOaR5Q+p{6?{QIjF=q+Y7%{vd+igFm7_*sz3nk=r&
zI|}sE&qGAw(RzDHt58|vG+qOO=CN2`vKf#Ej3DyUR|qV>(F-_IdbEraNVX$C+dfwx
zlO%*lZ0biKq2?vo2bV2OMTG5>)7b_%arEaL%VM4D{Rs<p5euhSQ=-mF^=-J>`I5_G
z;3nj<q}~bM#W@{8RaPHD9V7~!QlqSi;i|PE!^x=yWHtl(-=I9IlT9+k5^=OsIcEGu
zDW8}wp%k=hvvd@OMP72{H@`f7av@xw!a(t;Ij1W;8_tYuK2yK5m6h>oaEvCNMb6+J
z&zP?p^23Ycw~;+xcUL(%D&kWE8~^Zoz^2=sfF`}tZ=`2;H`=;js)$x+NA$}KDLak-
zEUUjR4+fbwcmt`5(xNXcj;)SI154FjFIAO;q{dpu<1ey18h^OnhAn6=IGgNj_wncZ
z+u@HDC<)odz<hK{V$0?Ojb>9LEw+x08f>2oi|!q^t&hen;F4+W#8#G}s1dqD`RijF
z)VblmdCH-e-LKO3t6hlPaWNQU;(N!?_70+lzc<g9?$Fz>9TSxKh~*k3K0Y;KxpHbk
z@rE<m1of4MhgalYdWF`D=@Rl*Y{?6j6)%?aK2xVmZSS&W_7LgKpN9(o=86XZ@Wh^>
zQ3bH7;KPRP!9^rEt##Y*`Ii!}_^75EZ#oYPXD$FCZumhj(SMKm`lo5!^cXf^y|EN3
z%&AM4C#aWtBDzAfPVoK+U(VB6HR#qS?X42lUoRz^c3eDu+IEh`JW;oM;@-fwP@Uhm
zQ1n|tDuL0<4CDL!IblA{Onm$|<A|X(NnhbN$}HGmleXRQ1(vV%Rl)%ZGjqjfoVbgi
z5W9%M)@Arfqf>Nzo1>}gpU-^;8WzobVKUt{HJ8YC6-+Y{iucmEZWwS4M=XDj2|-sq
z!r8dMAmr8W{xS}JHw4~KZ%=)z2%H9mAKB0p@fYuYPRFoDH;9srPpQu!{E;WZ-Wd>-
z*+m=7kM;pftqOcB_vLR>VKAe2vl<)T6}jgI7J@*`LY%F>y;^`|fgO0c+a->oV*!|!
zLb0}Lbx9L|N2swzNHHd<UiDC@C>V&?_v#rn-D;0}amqGezWQ<Lq|s1gQ3Kn4N!%To
zFkVA`q4di-xdE<Q%^21(w<UYy&D`&+p8mp?PFAUPGu^}7&-Ti^m)J3^41Kvd2jVs}
zC1UK%Z4P!Jl`<F`mXud#PYCv7y5WjP&jr<v<;MK$sYg~>8A|v~;$7~2+8J892!P|C
zu|NF?Z5@C$KXuscV38++t`xQ(sf;SJQb2F!xRgBdU8P>kGr@r=xR!H15a^QPLb*BG
zB9Gs)^dBy9_#7oc53O#KFJ3<_vC~(#mG}rr0+QnN3aDK&lo$5`zTjl@HPgt;R~JIi
z^7x!b@-ku>Nw&Eo&3?Y^+s10JtJODOFun=%MhJN5WK2+8m7N0>6&!R|O~pj5<Qk3C
z@6p_?L<sdE0?Nujc+}2h{z&ouO1RXL?APP6!)rp@%NXMd9z&XRUXkaf@rJN!R8F2!
zgR;*&3W&?Yk66#P=DNla&Un=A?)N;idqSJqiiy%Q**i%OEh7p6>>SgjKB+Lk@oaUk
z+mfP4i3o@~alIb)wOtK)Yq8rokxb#J1Ct%XT(DPs<Y?8(8c28<Zj$!Y5PHxXIev<a
zZx{t?Zw~He-TeLQW^Qr#1e&Pj?2(wt3hvjIDTZzemj~a5!dZ2}n>iPRh?Vm!DOwde
zhN6b~h9q2isy-e3dyBsTKRbD~)QUMU6<~AUPrF65dlBv)z3_~06|r{jxsO0)R?Kmm
z?pG^pI-d)$kB@0(z4`s7p`0drGr;yZ?8bYN-ny?aqn=i+ilCSK$84{1z3cJ|zhg2q
z^Bw^YqvgH7pZznJ8++sE^6mw-90PNrZvKfd5ktR10wS>cG~kyt9d3yNt`zJ3X#<ge
zS>8+A(Io`4X{)lw#!V`FI--<<BV~J6dis5Uh?{i~D|#ea-2&ukJ14O^{Ey<CEy`-%
z^;Oz15L8j#xV4!p++n$ZoqAs!^*UTsfy<;(sI5O#*Iy5G-2&@8e3p2WY70~>^efx{
z)UBU<UP~<Az*A7I#NPdd>+!=IOC})IC%=dGCh~CmYk02+bb;KG^4=&$Vp>(XC~bvh
z-|j}Nb+FEuuf{omuZhdF<E~)sPk}9zswigs$|%Bk@^wjoFN1ODQ0{~<Rj@=gh?<;(
zHGr}YxG;(GG^0L@Hx3*Pnrr6_5|KLjC*12a9_)z1>_j%*Sko|-h0gC54ab^6+!Z+r
zWxCKi(pi^&pA7UUkP%dY(VX)+rTNx7zzqnTq8kpzFcRgnpJ6AC>Rb>}Q{xP=@6(lu
z`ko<|OhOFBZV%j5YhPb$5m8Z01boAxB!Qt#w~)ky99J#bte%am<((X#ZJ?%NBuV_U
zKClCIME|lqt0@OdLUuM1SIb>$Ssn{+iWfkK;SAa+w51H~V-yo!H`bt)|2>4!w9UZw
z_lY!J0aAFzg1|*W!44}wBJ2~D9svP{yO3naeT_s5dR^84EC5x8Z<F*vvcEQq_Q^WC
zQy%e>u|taB(0NKCE=hdOcMOkN_XNbj8jsLf3EBk$1DjqY{ezy*-1Be>MV~V<rZy}l
zkYi~foICV~-3gd>c^gQ{=^1nc%4ZmeW!NfmYQY9{02K#houb`STDq5*I@|E`HTX`B
zy&PW9>{jU?zsd6nMuLP5d5`^J`qSGOwWaLaoxqdusQ74`$B%jzeKNtNy0L~dRpqW7
zma$CDZaAnCo4Qv2IULo;!YuDUQn;OYzUXrb=%XP!*WOouZ0h<GQ`A>@JY|_Kt*O;I
zzyPQVFyRzB64*hV;5IOHF5b*N5C{?dmNHyuuEY5xilX9)SgR<uj~5uy`A@UuUNIX2
zHg!7C5~*RR;%MRKWY;P9kJa{H;Fg0(+fQ4x?`ig&lCa?4V_lPzu&5#+S#2>i9hUqM
zR5;nWuN})cVklrDS?mA)%A4b70kURiRt6(YuvB6yzgH=RzVw*a<d20h#EzELg}d2j
z*yGZw?}M2?oH9n}1%&{d+6hW<prV)>#MaCuw8I48Fi7Lv>+n!EJMWM6xjd!-SnF-o
z6Ql4oUB4uon7egX8fuDRO$ZsC`}FGbxtis=T%h7_kF`_+)ssss&Pv0q0^jdk%b=6p
zf#j|oK{Q@0CI&{lxboIOb0qm7G*i_p)d;bW(i<{%4+HoP7zcovi!|TrD=oCIJ`ZL5
zaqhSHIV-%HIZ9P3HS&_lSPNWRYPaavKL0TqnrIfZp_~d!$6c0@)-OQS2_9~Gc+g`u
z3#^ONBZfdeYNXpgW>j$(^v70o6C=_qUX`h}z|*AYE>MGE(Kge&Q617R^L!*0d8->B
zU!5cwmBgbZ`lQEwZBkEIvb1=WWFxo(SC_UkpK=8(lwd0D>#+mMeSyx<%JJbyzOpfY
zZQbfCN!uE5Eu$?2W{bj>TaF*uA&-)f^?X5xo6imN@8Gs^KaT(;auK7EjVieWpG49U
z`Vp44TdCV~F9RzocUUHX$Q@V+5m%pPR>Uq1nSz!sQ74@H4Q#wcle%L1+^|I@;wPF7
zc`Vrf?revmZA_uW`e@3E0C!2_Iv=dRvRENbRdMgUl=;1BI-L0+Tp9@2KpQ~f+~}!i
z#oNGFTtb$yndjK(h+;Gze=<qDe=W*<iQN_R#p4En(I%!QO$XJRZCpSzm!({y@6x9;
zemq$`J0kiQM%IM@7{9Vfu$83Qc$&sGkHP{xpY%R0o>EV?q-uta$vNN|4qWmZII^@m
z(2*glh>$%{z1zJqo74}AA120JtWtJe!Z@k>GaPpu@vK;NQe@25CwwB7FC2Fn38|FL
zFseGB*zIxSfJMq4BI@im(eIrV<%nvsuw>^nx3uk*(2xg|2AW?hnpxkIyukjZPq~<w
z5qtlFfx9jSXe#{|l0x<2KPupmWzLrgj7@xRTnTQMt&QOVyOaDMJ^)@^$G0N86L<np
z(B{&B$1kc1AwS&07DD)k)(MTA5m_&D8uuE4KXkg2C1k*_lN=h7>b@wcC&F2F@3IW_
zkOZW1LKDI-Ltz_6KeTi#x!`_k&_1B%=k9HuKu%qa+{v(WE6szQkHx{3E0*koXNwSm
z^}D#JT%=e``q|D?JFoM!Hj-~I9RT6@*~k}tKgsRA8={3{mnza%_B|UboK`|;L~3JU
z%FcC=e8DP!hr5uKp(jHwRyCo=wd6{gU$+s3XIq0FK@N@OG*!;u-BM772jtm$1y~>P
z<zS5qI*G;}Pb3!_#E9j^ZxZKgW{XMuyLPo0x6<i*p0@rUg~aAn6%7aRuvciFnX^Vl
zp_)9mV0ME(SPJphtrYsCfwTG5Q3`*F)hjT!vYGG4Zi~I_CktakrAR!;5w_)Det)mh
zgPx;?NQ_CgCjXI}3&<WC{gX+dDiEU&a=vAqebIdQnjm8^_mk;zm4KFm_u)6`L-~8M
zUtYYy&X_`>_^IR_Gn!Nn<D$824L{HL!_8G1W?|i<$&+$1^WM1|urlTzz((TX$NEgS
zPXWEmcfLQ(D#Dxa3tgzk9={S8Toz(NVB+O}WB{2#Tm@2IIE;YU3>vLj9lM|Pk_!*y
ztX_vpAh&uXTrSE5hU|<6a@ydxduwa63^6{#{@Q?)KaoyBz5m&W22>%$m;B;f@`<ID
z)v7w833owj()M*Cw}|ySs0yne%iG>NrnSDOQ6+xMQjUI?Gj3PB_ux?NU9W|965Cfs
zbDB|h+SgNZ!1=DOEBAVT79aXSi$eTW6gZbgMBilOhZ<@86Pbse*l(jVkx`X4o_Twf
zAjKdUCHGgYBv4Q}@~TOp#$X^0p!=Ur${})XnLZvZySYvJ_DWUZYf=F>h`flH9g98s
zBk~;bDa`2Zpa$T)+$=Z)<U<tY;TKJEopw)2t0#IrCJ30}RS%BVgVG@(9#RRq4h1GA
zGxMXx<Zr}?5m8&K2I-SUiD#=yDkln2K$#(5klO+FCS-wpM{(!T)!x!KCDY6^xqntY
z{<XlIp99fBR_U(sws;Yn0XF4duq?}4L1uaM%@b6)zo%=csIIHxrYIZkF9)yWN1hxt
z)o&&aXoB>dLZzbsbc`dEpl+9&O6%VkDo3gyNB!fiQ-2~jco?Zh-fg`vi}6426#auz
zz8bC_D@h^GuuClhjIbWsP$S&`GKYN?5S<N?EXa`uT#jwadZo0LM-(K|wy+8S3nc*)
z`6qCC%%E6sOY+)p^>08Ei#SZsvg;X-v5Lm8OdQaUMD2}yS&$5n^L_}d-^{E(Lf@$W
zKJS!FZ3~@l{PyZIOc{Q$2q<+e51f|S&?2%?%4nC1s08o+ceE53{U6~j{eMluuYXOX
z|22mHlcd$}t}k$n|DM(Q&lBEIBo@Gb-}c^bc_xa&+CcPgARXnb|9#%<KkxA05^Mjz
zJ%QhXVcg>Ww~mYU#V}H!ab51<I6c*^Ez9l0vPr1nYOE`ehyAbP>mcQGwK>Zo=%R=!
zs(0)FG-6ZRYi%4$W*kR^a2-7wPe<Io-QdLb`;O<A*FQD#X@6tYQBae!EDdlC2YNf?
zVKFEdTYFEJVBK%hrA0sfPW@50A-Zxl#xtGF+^rv&g;e*AbL1S<4~ukmeCYc8OIO$G
z*pHX0)quXDtQB_XthFar8zLDr=}yT~Hv0W~zBt%_eg;K91TT)&{xAb1e~>dm&es6Q
z5lD4u_Y_2qQM6s73=5_*%~wkCp-o-`6@hw77xrTV7t{6ped&*<OPX~#GfTa>Q~9z3
zP??dUsK!}^F7pSx?^ys8qo$9y<QDhL#R1Z!HtbSoEBQn+ol7X6-k--;L!SpZsX|VG
z3k8UmwP1YmQR-66D+TN70zE!8VRsn|(3UZE6}t{EC$~cyR@rZ=N2Cl~>8)@%q;eB5
zU`<wIPspd_Hz~4er$@<i^!?_>cUi=a(@(v%m^%S<z;+i(c9DANea51}p&mRyAbm9>
zsA6{!U(fbBN%}Wnf+P+%=FdvY<<D)xL<ZdcdMrTH><#@z)OsAKAYf%`Zp3UQ??%Q$
zE8di-!qWWR-pP8}!rIZ{T#x$_H?z=Q(S<C?X6v1PzwOMn{5InUzcdwGdN!S3h}_EU
zt!ZW=yI6ikIq69+sTWBC>P}1|uHAr!NeZc~KgKl6=xtyR3S(MgmF|Io2d_mawI2Tx
zlCnH>5Cf<VZOV6-lmTKDe;x+KS|aX0PA|&wQ`CjLoJdg%+iBv-{tcrTj%RsK4HKEs
z`PcmCs#f1KTyjxRqB+l@c$wDZD$UgcNMg7;qzhsH^peuGlO75pUr;Dfd9$#l>g{)K
zoq)P(#LgYVAV7~KT!!NrjO*2J5M;rL>*pwvSdSk!mxG1;%gsBB3)`}f)gE$kcwV-q
z-bv&5R&o~U*;T03(l@2OgpQ09g7XIt0J(AUxkUX4e?SJ~+~((5gvXiVr>Ua!69<B)
z1Ebpmyf|+i>d4z`tzipxG%8=)Ri-Z$>hO|AbGr*;7@!WS2)|UezY~TDb#G2xjJA^+
z$2?4wT(`I|{ipszgd(Fyf7tq(i8CNLyeRyCC^+1W;M%5$J^amzz4b)!#fR5<^6BM{
zF~E`q))OEXLE5g)oVd{I5D8|rs}778<S;Cy1IP$v8DrVlhjXtICBF+^`}=cFNdKj1
zqYeQio6<}5qZvoi-l*aterPvL>=dTcYEB5^`>mrL{;>dm3tlI|I9k%me4{KXJYHMu
zO=$(Wz4tN6AIu0xEh5bX0QI0(snr3<ddKhut4r`24;vr1p6(UD3eMOPdF7Kaxk1ru
z5WXCN86OlHc?f&(nZa@9TcUTisA-%l0a^5m*8pU!Qy?>iywhnzW;YD-+Dvmlt<J6a
zjFtUhliVTJs7zFQWp2lFfrC;C^*<_1E4TXFk)a&Q9xVJH0aC*(AfUFC$JbxB6wpvX
z$USBE8HTk^XxbjwuANH^>iAeSmx`Cga>+WpLwgjIbj$sCMVp92F3J}<jmm7s9vA_-
zqH1If-IpA=dflB@BwlVn!o=@W$1xQGu|077BBG{O#|~&IrYAfxGbYL;I4-XcvTFI*
z+^b=GVMz}wvJ!%5fRX2PcQPlrlUJ;ZE~}OO&t-*U$LY2)RlLb7P{%>Eg*P;F#d_@g
zKExIYZL@2hvU!^SwoN4X1{(P~T>Z_WQ@Q+~5-4yAMh2im+pYP(6r&Bsw2)=5!;g2}
z$q+3o8g;opKoflp!5R<npF0hmuX0^{09b^tqcxjd)mg9SYiaAG;&T57%EBt5ThBl}
z0)ekQj3;%MkjHvmOD8jE8Wm#G6a|ND53yN9)M4L2ptZu+6+j?o1XdaAGJGKRBFTpQ
zC>Eu3ML4L&2v*2FfLJtdVCsJiErNt`Suu`=3_Ug?L>^oj0abL*A8OB9KlIcsVuljC
zQs+7p_~dLyA&ZYWZx^q>_(xgzmg@hrvhZZ$|3Fzd?DBso3+E%_s&c#@$Q=A*zvwxX
z+~0+Xz&^~3eg;I<Mp5ArIi4M|+f_}bf2s<9WRh9{lsNK_iP;(Cs<YBR-e1LKSvHW%
zF5c?@R6*--pt7S@abu(_T7@-vUxnnmDaZKSjC6Se(3%Sm8#|OF<7v3w7$WAqMRwzK
z!~sRs@uh|!>GRcRa3Rp)_(WOL>_KgnLLCx;aej{c)>x~;Ljke(Ak><*tfVTWRQlwn
zYlPTU*umlD|JS<0M#Y=*{ia@h3WY|0)3t8NQ!I;Q!F1O9e9|dgXd+g6<(I^;3a_rk
zwDW~>M$$FO{oX0>sXuh}%Y1i@%D;bSZS>_O+2Q@_a+(Xv)On=>h<V5V(4~{0s5P=^
z13L*rF}XNsQGwv9iEEgjYhu@BjMulEyPL0zw$ihycn_#)ja-h*Wj4Le6zDo8MYT*j
zF1?Gw8o~<f`ZYp;5i%6|qzOo1kqiGzzIN;th%=Up`^@QThjmesJYu^+Ep|gRS{j}f
z0|8|rH=;<lnlV-~TlHNi<t=#L61}#`*k_w2l@ztuQ+6B?iU`si$dKEaKqBb=(zHcU
z^gA_plUA|YU{bKLm~`6w+?Ms>6VF!Cbw3`Su@Y$TXzO(N(i;(XJ_YPPq%yOaGkI$6
z9Q?K<DkY)t(HsnJ52c8gsxh+6P4E9`D6acKzJ%PmyD2$^Z+)ujK4nmrgkL>JoUZLW
z8bxk+^i$>MahTk1&nT?a9cW(J8#n{wO{+%-kTWZWa_@YwKK#m#)n|vLRyIVg>Nl5^
zEtqfrEsV&|7tJAKl*<D9(2uaaV$SiwhuWIs{NhBmcOi%T;jJ>~Tb7B(rPh+~PG0$g
zrfQ%5JcmgpWc)4dF%cU)@o=&lbDNj-(&%I*$t)t?xGUvhAoq}BwXO=2%?`D$W!1No
zD|g!SmGQUA2KUN5k_UwIoh_bGcH#$n5s@SQQA+a`?kl@JAs?LQky)PBni^24xqW$W
z>eUeqBk<>kTb0}1u;H!X!!ozfkP(ZYi50V0B|N4L5o3HLhnMkzPI50Tk{77+=$i9E
za<<E2cT4$)rs<+9K+a<WbW_YxfF>}q%eWSls=8B|WKJ&2#0zWeq^&d_A?@{c+-yRi
zizN|9fYCl3<f#Mn<cMJvPF58R<n*^*-20`_6);`+h3dpA&DQ3yHjf~n;sG^p6m8H4
z056%X7e}^P2QqCYVIC9bG714n6mCV=Zm#naRpn+gT<_W<2hH1OM1Y<PpT^HkPt1ut
zt5O~vck8IOo#q%tbOD>vJ^#!eryL#SpnrDJD0RmF+U=>KhJ|O<yf?n518J)eBAKS!
zj$Z1+(z9SSY9EeW<9SWih%&~R-GPV-EXP~DJ3D0R>C`h~OHR@T^GtfAt`%l(t|098
z6M`VuRu!#wj{DJ)UQ7x09r{Y59vRt0_kyHR1s4ies$NtfxE2gSiAhR-5aSOg1MHWB
z;NKAh-_wFDN$BnY_Nhf_reYl|XZ!1>b0LXrTkW?axU~X3qR{uCMW4bU%OTApX7zyR
z-$1>G+)WO+qB&nstm)b}kS)uHHtBs!*8tIiIoS4DxTG<s&|*1-&NbvFo<=K!_MLMD
zjk4xin)B3GPu(FznM!MYvHPah?542T-Izg3a5ItpThnR=)!U@b(ejq!o+M4UbeSwP
za`V?Cn^`fY98&Xn$6Oex$iHNlm3OvJg=?e+6KsxMhh<3XYSgNjj+I<a%5kMJq)Qo_
z^g|zO%fWglfWPjVp3yQ4uo?8U@U%+2OO0x!4dpb=T-(7VUYyP^XfrE@X1K16EcDmL
zgA)(2?54YN4Fwx_D1$J=_cMRs%_E%j!dWgaeTvHX&@UHR9DP4tm%rJ(0DH#xh{Th%
z<`%iytzIkk;`Fjy59Z;1&z(xt=Fah>a`XNJ?dEvygu&83a#hm=FXbtk`@7*fF>U$@
z5Y;Qcq-uwpO0?d~0PfbGhoBXpvAptRCbJgk+;V#F?QF+UQZ;R#52vrl2~&%n{%ag8
zOwVG}BJ^`+V<f<QmC-B;>-nVDYbJ`Vk#u{=Gh%Kd8NLzt+@aM1_Dm7p3$V77Z^a5c
zhY7~0UkpJ(ja|8&d_kT3iN>u)Rn)siqI}`f=W_~(#r?EGU=f0fOs*`f=sN`@PrYus
z#%YB&mwEHG@+FudQH_k`#@+<jqhO)>HT#_9tNtN%*zfn`*YE<tI?wH%ND#7KM}D^Y
zeJ=BWxjg(7l^5UQ(DN;S!FONfyEUCF!`-F#E;hg<1~enSeKXvmg2w>SR%+RzK|oq^
zfeIpx?dO4QoxG((4qF}OLs9>}E1#u#LQFxkHS!q#TfYxJ36q$%Eeks;JTWzW(`K^U
ze>9|d*sNo=8>kC=f_u^nlI604d<4(r-GgSVSaWPyr|Xnwqz{|94(rgt*Uz0f>EIKx
z3Nhd&L=BT>%m`W{b_gQJZKS=^2K!dC4}lE~7E(mtT9}6vDmVQ7VJ5s(KXp+z$iZ@S
z@&hPCt$2UISE|Ld?ZH)zb`;8=MIjB=xIal)`Clju8{Y{R-}si&SWe3aX!rIQ^nVDC
z#fp4f+jLxrye(9yZ0%q*BWxWlZ0Ia$KG1`oxkTT}GM68is?*CpuCXp%<S1ZhdY8}8
z?<Od2%sshd;v$q@j5L=-(N_J(y<c!k_|O|s$W>7^)GxL7*29eyMOsMQ_l!<vU{wD9
zUR_uK#0+xkeA^P{^VbI)`ps<fgJD2gc`$9blvl;fOJNnO#4wSYq^2yJ7!#HIZ5NEg
z7Y2ginXXrRW%t@s1<jo~6lmAzW3jXbXgLs%PU5A{Jd!&Xj99*%nOI!~xjtL%PH0ju
zewbiO2Ey}GBY)k9Dz_LQz^+L-rRq$*j={oLHr*yluH?acH(mcjW*CVtWchz1Gps9Y
zhLQtaPi}q8L|0i`x!`Ek@)hvhtBQ8JOaFO__XU7{tjQkk?H=`wnzVy&%hd*7Se1%D
z6s@xt%Op69)%OXWo%swj5GgAfnp|HFE2l7-PZ$sI)Q)s+QFkc01`e6sB-P68Pg|Rc
zNuYeTo1U_}3(bZm(G8hBVW2ZJ2QUz;8WaX=TlFLZ{ME$hd^Dgtz2*ehiAmn`?5-+G
z@i`jJhF&&pxe<&IISiTvdJh5H4kP?yrCpRVpFZ%(_WVuN<9E2jc(Kz~TG1n|{E&0q
zeBe(hz#GiHPY_+(mNVWFMp!^}*p>Ue(QXIg%$>yIlh{Xk#~46g@TGnl1T-Ltt-mV=
zTP|vL7pj*poEtKGkG8&^aaD1}w8735*4b<lKQM@=KsQ$6%`5)z!Plz*A_(|;-sG1d
zxIMA*TjQR<_zN-u(D(h-LSO;D^Lh=EsMyeEjO@1f{%qZHxvvT1<4@^q^0M3WuTjpr
z$s+CU`{xb`>=<+4G)cxAWaD?I<pZCCO`l$0N**%n_$4h~zm|oVz&|$&Q;Fz%E*sJt
zK#2Mk*j_g;hH@6iopT^nKV+bj0uY*^`>r`^0LVqEZf0D%*?|%K{3(VSEHwK@9=O;x
z8ddUnH9M_VvX=~z3r+B7tDTBH(@m12e^$RP-D$=1r%LQvC)1o#&1|dYQsLpw&TA}@
zY-U{$1eg&VHy5ShPt+VYVefR2%?Qx0SHjVdh^&qZ|LdKoatr=9%EQ;s2l!Nkyr8X?
zn$JJ>P$S}PgcD=eqO_1o_4iwHA7+fXqXXO{FNi@x>uHcs(Mz{9rK+v(LWy)Yq)sAA
zLT_W8_keGT)rvHR7oG7gCdzH2NQ)BaA@8YP_7S&4m8EI(E4}iP_zk<t&C0<!(BUrk
zwxv#)i{=2|p*SG&|2Fa<o6vux@U)Ee42{5YV)R1<LhIntl_{#xxM$DaS?i7AVUEFZ
zXh3>6S~wU>DGT^VKhhvAicMynPH+7ndbciV%)u&GiRy9Jdx#Fe-lvI3<w!U~_u&%b
z^1>m|lqby)qA_e`&%2fJ2;j1Z4sm;#8@y}o=W^`$D1J(aeO^WvpH1GfG(=xaV4x{$
znu?%+WU^U+Xeg#frUtT*0noa#iJ8u|0%Lh0KX;TEBM(Xab_BPdg1{uQ`bd4^TH&ko
z8|Bx@-nt<JrfX<mz0vPo40+n{b`d6Q9|37`iT{55kHlL`k}E&FfxZZeN2tEI2GOWu
zw~MX_6YlHArvL{?yUZokw{Ebx<Wo+F&eq}R>Ldv|PV-@Z=ZsRm2Snvg!;wUGo6%vn
ztJ0=2t1Wvy22<K4{9^ob6f{Ke8KlKwOoSmX9RM@Nd`Jh#nSO9>HzLXd*ku{fa;C>&
zmY*IOKUILs6(7Xe37CETd)Ha})rO4y743UU;B71E2sBmMFoSAFU=OKQYYmsQ9$&Vh
z&J6+B8_pk0B0h0k)44+pp9*U%aAbU&=u2ft9TVd4!X&mcl6KXn$S2<2qN)9D4C$V6
zel_@A<IvpGo9q>zeTI|XEY>hww}4e|CFvqOUBy~Z(=H<xI3v9a#x2;SUuen$vfdO3
zE_xPDb<X7#k$;$Lj=tfY;<HHj&KA+0;V|j7G+b}LP1W!n;pyJW(i+gxXs>-@0#ZMb
zzff+uG9uyJfc?2eyY!B^6;PNTa(l6G@Db>Q6V=bH(B;JR7EBr?G>^X-4${aYl#7ou
zG_5~5a~H#z!!ZV}NcCDg5hR?Mq@Vpk=e95!D+&GN8&s6-Wv3x;_h>^BJ}Ih!#BRin
z6_C|x?WJ|5%GFpK|E(fiIlVLZH^32PH0<2gM{3ljVPBW;Otllg8*x9EL#ho<Tgi6V
z0DrA|oIcXo%N!JsTJx2h(W8cQ+>BKn!1Ondjrf*VnJ~d=r3#9*112q+`;pl%jcB9a
z83C=1VxQ51SRy5~Eb^Lb2DKvwQfZ^xC{;EWBP}-elnw4ei>3*jOCk3(+uw(10}!#P
zlF_a~*jtlPvRN%eLvSQ>D#~=2e|8UL-Nj?sB|q2wBE43K73>LqX`+(jQx(!4NYHZM
zm`ev2dZlEZ`OAbPybOO9y-C~ydI-?vugk|FJyXe3&yBd>)vWwj3U5?k40OFLGdx*I
zD<D0IY8K(dO6_h3^WwT(fcKLGVr;(>*1RzFv0}1x%ljyUn$z^jf{dANlORLp&Y}jA
zOV<;~x<aL$yk>=+^DT?2LUhEo661|$WZ_h;1vg<r)JyXdi7vjEp5pJ|$A0d83Z+{v
z`Z^Z_!Ou;3MF3rC{DaN4O;5uuDzTQUY5+{bJtp(9Xac-F_@k``==#H}@N`VV4TP6)
zI(vMOBoLQlKeEb@0qQRa?9!R2dSf`LIfs0->aa431jnN%UOovCOolxFzu0^8a47%(
zkC%K<BqdU^v}Xwwl67oR_GM7kBC-v#Z!=R#h0tQ(_kGDWcA_NvG8hboWH%JXV9d;U
zkI!{}zwhsy>nwkrb6w{;{^@G2JI&npJ@@<de!ZU0=Ob2iarY^CHP&b~gD{B7e~K8(
z57hC+7S^nMGe%X<?LN5KYo_QRpzGE5Utb|XssEday#-1CBe9p(n03gXiHUFpFa_8-
z8pNQHF(S69r5I4P7-Wxs5&d5;!{MJH`UAASDq7O1?{M{>{5MKIX=M&<hR6TA=}tSC
zB_sVw7PG0MgL%1Q-(lK+_f$`e1la!37$yHz%+U^gp(5lk<^VFY?MY+!*7>@N{p03a
zwgA55-LEh^d<+;n{_`iqaNs{=k+gr_^*?+g{~L=5?VqX*{T~h;X&*4X{y&_DwB!GW
zM}_u++W(n}<^Rb8^bM^7@lxm-H|s5cY{i<>NyaXt^O68neawoXD|lzTsI<PziZ;Kx
zorMeDZ8+?UWUB*Tjs9&;$(50!xCA+0G31!4vZUkCm7#eWLL2fil|N}ori~kqo>xOY
zhAbv~_WbVr?0JG$^x@;4_**|LkWII$t9R5nzlU*&^axOQHMYK=)`QN=KuIM#<4Lad
z1(#lV1Xx4eH5b{bLAMbHex##xf~7P^9?kPc;|ok5p=;-&kc$8{xplEw8}U}_URuj`
z(1GRQEo>-){bI1o-5o?$5!#<?qE0H^y2n@5Xa7N{(d~M}?=8Qsw}0r&E3{+)(b=~r
zTFB^?H`X>v;n!#uoV3%5A2EqhhG(V^=A|KcERZC8P47NoHTcepUxxbklrJv=esR}+
z)LPA?jdq&i5A9@!p0V;D+p8Kg`TA#WJbY~5p9+f=x8`@L#8D~4d*^u1NxNE1&HJ{H
zQktrtYY#`-({M2cbwi6UvLa=LkLo&pDY6iXA9y+$*?)JZVvTIKle)yz&tpN{s>H>^
z+!%SHc2toqCcC+uqQFUb?(f)9Gz~E`KazvyOL>KrIL5a8kQY!0C7%CPlW<zkpONKY
zCHmX`v2KA92ZILc_g2kBH%<pYyjP3KC1*GPrdk~pZ#nSzQ@8Q@wC+(Al{y3^MaI*9
z3U_sT5@X@1^Ka$*T?ByMa3>6Alo^(TE^{kM4b^R=2cNi2`%uBHszi+&8W+z`mA1A!
zWk8rt@PG%rxDO8QTj@Tl;`#fd1{3C`%D{8K3CFyvjgrozJ&M8#3U>xQmonjXlS`Eo
zdy8pqW#>G5Zgs?8PYW8VavJHH{*;j9hGKJ`*R)-)>#!11E@d(5Pc5f*cNUd3JDJ~-
z&1?SC#=2wXJ<wbTA2o0&<z>)d;R%5-gK*M5QNU-eu8CD-)0Tx}iBdF6UfDeim^ERK
zoV<sRHA4fOf;No=17M_%XGX*-h{NW4vt2VgkBaQa%?*w6AA>k@P{x#s4E&S6Tj3As
zHCCKPZ?#g%A_t^c6%EL4EBjjY+QGphMEbHuWEIAy|Isln30iCF0xk@62&*~aa>VP9
zy$6qwa@>O1PlHD(Umu|)Zvusm)QnYEz1Q+5_qy)qC#{j`Loz4-Zg(ibZ3pT$nn@KW
zc*w5H77`9SYMujbVt1@b?K0kRrzxvWp1p0%Jq<~BCNwf9*aQ^ik6yb{|FnX-TppUL
z8V7FIQN==e!Cg!Xl3F{1dw)&>{H6z)!s_OzG4;>{g@$Gpbmp76imPr|6bxm&0lv~-
zN><Y0#vQ5DbIKb{EQ2wuqD2CdL-q2cwaSIhdWr>dHOKia_(#+@b^oZI00gSak~IQw
zio)pcUpdM%h3S{CTX+ztg(#k?8b$qrQEVz<^bR*@OMFS2(D%Rq)B&z#d+&bQ=YtmK
zWn!F#h!5_02VW~LCE24a{;<^_qK`u7)5i#prxUUtd|ta;k@vDdt-pkxXqf93bJc9!
z<NSAwK*Kh(Fs=+iC`#vO-@#*7#p+8TvCGX)>C3;tS<_gB?=R<Jod<g#Ro*ztX{or;
z(v#)Z<T6bS3~JBM*=T`X6Z8MhD^18#UOK9z%0elqPu%)>IVzrkU4Fo-TNl@inq8ir
zy7R$QN=gb0S9OwBijHP|{a83B!_v=o{!X!=QP+HM?)o1`%YedRlXJA$8w@`NNy22a
zu{f@rH?}o+cuAP7U7j07-_=T^cov?K>GgGVy_RyPlQy?^5onkrvIQncxyL31EI=hd
z`aJ39u-Cy#T~Iw@4KYuUJEtGHJ-uYgrKz!zm8f#-vm*z(b6cS)ep|+Iy3zmnlP#=U
z%M_|2Pbidp(x{GcjCPZy4*-p>(#O}-F~U~{_IQ!f+Dv6eE=!C+x0iKJAb5(sTK>%o
z_q>@zFd0~a2sA4k<;<xhboaj+_*f`FpP%Qp@+KI$cl7S0|1<bZzQ3n!bP8VY$){I$
zSBooGj%di?t3EFeX1!gWsCIU5npkQYX2%x>O!v;pkTr*ga<o9EwbA=Gkn7Q`Y+kz7
z2G;a5o9l5{6AxSNNVdXqFTlr~Om`wCzBzVJ`h)D_g%{~VZ8V?s27Mv+a1;OVti#UN
z@ddD|OU19>SAGdVxX0GRHTy@NmqjX@KVh)MQ0Z7SHr@uffd|<D)5}SIDFv6JRFztV
z+?}Jj`i=g7d(ScYeePUPXd2sQJl3+AWi2CP&hmwdL6YN|OavYu_5!~HrS*$Tf0_Ss
z6$-@(>9ah*9rxN6Rf`esA7(vo!mNBb<X!S-;)cUIWv6{X01|kiwnvfF(F#*Eh73hJ
z)7hZ&_Byh1*LzH7494SRJl~HuPsR5pMbzEckH2<1oBrcP)i?3wwjGHgWsO7I>r>ci
zqm(Lk5_-VN>2`>PRtjXwYq9U|><f?Efg>)J^WkI3p)B&-8y{rt@|Pb?&JmEA%EsJI
zf0zwZ+E=-;XY`xATx#d;i>(BGT!ufUOtWrVh=^I8f~uPVT7XsBc_o{}_SUs07fdH4
z-A;42d2gg7F8pa{6KBF(Jl#*7eh4nsGxKYuX3k>U^Q`bvA5I$^*+UrbJDSwyUb@h5
zP+qb}7|girdaB<gS0zFogzRX7mWl`rP`4Ox@T!sMJ-uiJ>%)7!YH9~vbUEglWkuXr
zo_)NpG^`5qVkIX`d_TAJb5w!cOT&}Xab$fy7OfG^WYA5>D?wxyim-?~)L$n)l+Ksk
z!27p)v$?-vHZ&elMl1IM%%VGAzJ0j!oT_hV;VXJU@zc5~C$)p`f>GB@y}-|@?Y-O?
z6kv07gt!wBGWDdT3%v1B%Y7g|x=b?88sR_53EP){B!=FiE$B)YX=-oDFfB2FHv+i5
zHz)X<%I@VYqf-Oia+=N*Ie4j-d9GEz@v@GCpQymt7!~Tk=k<1Y^i!bA_qeQijjg&n
zwjGs(2AbtPe%}uiHIWkJrBerwhA``o4r+0yP%){wUYn{KJW%i8JQ0Y+BaF|*EU?jw
zi+c$Lpvjmcb!cYoC{{k94@Ja#VBT)?r+M}5drreH4MD*;;<jeSN(O?<9{#{~Ww_v9
zbOf~QRY*i4sEKAg+Kv&7ul=Si4Q(BJam{ejgoZ|*awV;>^1@G4ulrBbxCsPp{jSDX
zRYrA1GF{)64^X7Z8Jn!ca883Bb@L;hMZYwf^Bc>|tq9L@;pyH!tA*kH1dZl>Gl&G@
zVE3^Mam+TVei3S3Q;;T+Kxrd4iUnAu#ae=N%CaoNz})Te*nr~wyOZqed)quCCN_`Y
zx9z&3A1CdRGvHY~q^u7I&AMJaOU;II_G<m}aZ;wnm&x?vMpVLt3TOod8m_UI6<CaK
z1){jNmR8~bbZ{4|PhN9?9Bn~5nmZ-!N2wALq?}`6?G|v*Ux=x@Wn0Cb+tQN?LteOK
zmp0kIB9%NbF-Fi$`ITlJ)iQsElz!!)qoMl+{f@5lukYV!)5MtW{W$@u!;gsbaXXts
zTH@nrKO_4#SkK(JiO$uLIDJj~UEn&_wL!F2A*I?G!}RhF^;z|S!E20BS;BH)-@8+P
zgKda7WD6`qf8ENb25dcQ;JC*hB#p$pelr>Kv1RK5CU)oR_n>L+nD`$1x4C{U(}#2X
z;5`UuP}U#sr26|h{_Q@~iZArKWuNMs`Tl-zC+HmAp-l?{trYUCjL?(!Vw}j^^0OEN
z^BTKNo{(I-I?D2D@VqIm-p+ef(((BY7v0u4CgitU2Q*H54^q_Z&VfI_5{O4r=58DO
zY#x;~32-&G-byns%UQGreM$J!Wdrx`c${mUrS;pq#jq|wa)JQB%QI5rr?tt&zCf0#
z?94PGQWq<D+Dw|dSgjb*9ui4I$@)RIm&te1E?&Mau(2GY)FMq9iCAx}L<nOnmNt^t
z-EQo|70~^4;G07?5HDO>@e%PrZYe$Z6+K&T7T!TWaPxQPLVi|cm+(@$^^T-_+1KdQ
z4uLC})g{6S#od|WBX@Y{)<=p=r#4sWS_ma>^LBqsGjcrpWb$172{6FDC~aw6StNv`
zR--IPW>ILmT7>#VNzpt=O87**4!Ia#gijVF)L>&J?0en?@|C=`qSnquYBh*XeI=&`
zuAkd}UMrx6A@I~&ug3LK3|y;3y>A3jNw}z_OIlTKP;(^bCly76^>tZ$ue8VncXz?l
zd$RUHvoEJz3VAw>HbzaQWV1(_7i!5TP?%5XXs3YUt<esol(@@7SefxP;`CVrbqF<l
zX9P8}cYLIis=9ZpgV*SeaRlcz!=LwGrpFNSUVY8H_v1YeSA+G-D^E4jE_0b#R%NL=
z`+EIG!LVxzw`AWg?RcHIJM&^je$Ko(sP0j@O-NI0{5obXDDjOX+I{7t2LHJ=Y-C@^
z@!y=0OdI5vxF;!Z$4%@dYm1bB1JdA_xeavL0WiOm({rIJ=R$HHzfhs0Y0;oQX3&PY
zE8LlgLHtUfaqT<J{u0FKu-A%nOF+ny3?b2SeU0Pz&NHq4qBP9bYikYI)F@CYB$&r$
zKL|S$-;!*b#&f>7Wq&je%K;1a+Ma9&T*YV?oIcJu%_Pl^<B#A|>($BZFJZamL!J#?
zw<E2z`UMcZh8ecn^cQN7a;0U}RtekHujCQdZ%L{^MUZM*R@9-9<Jp)hH(uADLToEL
zHwqMixpP*0`0BAcT~B5BE%wr3?f;6=g3NrHsD!lfme#rl*bN}1`^~w=(v1lW$oW%b
zw?bU8Xb~*Lp$WdaMCmhdb%l+_tygzww_$W}7?91iy+J(C(olY@jkq|h)WEd;tu^!}
z*(3i#6o1+=W6nR!8!16St7bUL3AA%>8U$z6oqU9mh2P<YY>FVfL_daqk^Mzp7CyQ6
zYi+D$u+B0nC)RH4%P>-HaCMcP-e6g#8VU9Ist(VDEpPO*+;!08w+tE?5D59z7R9o6
zMb`I9X2%L|!t#uhV$``b<l1o_Nx`B*^+XjNbh->qu@-SbCdT=U;^S!?56-RZK(unp
zr*5pmPU}mVn!nrd9fN$jk*gMVH$KnR-YU?KXj7B(`5Vot!lO88rL4Z*M4V0+9x}Ct
z+qrc{w5c=m`=vLX*;<59$59-txH4k7uI2~3C)-PdD6Y@l&z@x8v2!E`h6;;3HG}^Q
zc`xZ+qWsj@)qNxaa7hYTcpe+4t1Hv9g_(LR-Dl_~udi}Tk0puoxL{_GestDG!^<3{
z?=xB{F2Vt|-UI!4nfO9FHCtGJes@BI4Z*u^{9tck#xH7Uk)=4FM^83n&6&~L%XO&P
zFp{&_@Sy~+;V~m?jbl#=Ae;fmh~BqZ7=`X~UWMl4^XY7c7j>`me)?NP$d&-eT5MQT
z85@`vG?~bYJ<W!jZy+b$Or%-9a{^7+R#MKsR;w7}ugz1_Jp_fOq1P=}2w)u=H}T;h
zr<S%fJ>B;O?oH4Ty1~eL9)@dfYMmc{mR3#taR4+)n!9(Yo4-E~Qu1Y;hV$zSZwosY
zEsoA4q^g1kf#S!leh6eUy@9E1>P7Rb)9mtpUhFMpMZH=?5JpVrnuSU_=8I&%gPo&|
z`Cg6xmOZvB**ZiB2QO(pnA$*auZg${4BW$1^9Avo?a$r^u#@grcD`7{vUxYHrZ=dv
zEbsS*2@k+Ria7Y&vAVC!T}?PZB-k~fR0Lw~Uu1+RWm1gON*`5TyBq0kVC{^2J}fYC
zEe2|-)OtetUJUY>sn-DF!_srg)kjj90tYk9&u0bjwiB2Gvfg6upYnY8{sP#^VunP9
zZ=F7I0kJ5D1FpQr=35A-SKoG=Y|TRp0tSy!y{i*ye}Am~@TqZckO?rIWU2M=t6h8h
zm=;PkEW@lP!3g4a3BJEwUb3bgpWgq1O*|u6LwCJiYb1UxhHv|?Qr)ShzIwjAkmqx2
ze6fm}>vvP6PFks3sz`JJng)1xIpy{j57vEKoPR{}VP`zPpVAluX)iB5kRNRGQhZom
zDUwOVvcMDp%AdE&F&V1t3d4%RO=vwxQ!8j9q6?ONh?L7<lhoS(Y!zJA>XP`k`~g2v
zAM|*Rr!;3$D!(3%^|mdPzJ|P4Yt0Oyx@E`!5O=G$0yTMS;U9E<-LkEupjBtgV}$%h
z$8%#j$=YH9hSL+<vA#R`Ogz!>+343t_5gRM+>(>k%nR7-wF55^CjCW1D_#cX{mV?1
z_sA)ok}yE$<NU{OQr4j%Le4+=k!+CTm&twW)!z>OKg7G5FFg}GnCC1Z0v+{;Xpy<q
z)R~;96qW62NX}<)ovMfaMuRhPkG@5%%EGmY9NyC8kuwu6H(l+PZ+!s2EFWQ04-7Iy
zXXEg}&3ypc@Z2NMMXLHn3UjgC*v}9nl=Phk*tyV1tu+257u?B|%5SY#`M43tC4cY6
z*9=z6Dk1ga7Ihl^e2PTJz3NE{N;?-s|2)TjXFr*fiC-7*pv}jM{I)3zZ{Jt(ubATd
z0rB^oynTy3iP0#(&hv95BTOJ9vZ|yaWAW#XLQ^>}^58GZ_$*5w3CR#@)~jG-UgKJQ
z*fkY|aT$&O46&9xTe`z#YGFXcJCczde7@h=3Z4F_aD`;L_m`w0XG6GOEq}A%I-%2@
zelo-gGx*i@+KAaF^6g|iU87#GQt0p7@k`9?n<JQjMy6&0+y1G`>XPwo_b>!4fO`0-
zT?pAjLzW5KW)#%0b5ANCwWA8kU|?p-D9*`(mUX7<Aq3}_ELt}Ocu#&cyNb|yu)0;5
zM((i+$DfxKYr`4<`Q|<Hf<uypXRp)_&(PrW8B;DJYi9v;^TGyFR@$)zy7UuA-R`Z+
zzt|KcAff9wk^G0w9g3Xd5%?+J+$#+$%IIFum3XF04SBSW_{HLss9C~MhtGpQo^1;`
z){jAaFj|}q(w+_7EcaSA1mxF3^49%=&7yNUiP>A3x0(VwN-@J{J@M6S3>yA|XC6s;
zl_Ix#rNL6Rr<&HgEz?mZ3^LLg9lt&K0|k1q{@l=9BUZh%(JDtH&(TNE#z9(EGahM`
zChe9Ai$STdC(dIJfwOi}XA4`W@+EsCsFgfWlP~#OiYdV>*MF^>8XrUI8%qwDIZ6%`
zoqU}|7@4UUg~<DrQH<I{kLBqe-4{&(GS*vu2n`0z{`jA*6`93k$aUA7)(q1IMeIV2
zb4TO@PQYrM_3H18m1a@}&i+xFTvcbI|NZ&ZHN?Pu<>R8OU=UVhZbGX&Z^!7D@7MG0
zbsT`9crX~;MF4eI2jAjK2b4Zug;1S}X6JGA=kiMM_z}$%V>S8Q&u{e`UNonb{Xpns
zcJqk8>M%rBY{a@5Ix7}ZAGH4{CGdbUu(jf6p!AbH5+s(~UgQWYxj41B!}k2YZfeC(
z?-8W{<i2C(axN1}Ng(<hEQWZpLoleY#V-o%MXT&3MRL-iM^Z9L)seGGr9qzkzgw>7
zed-PjC=gV;3Zqt*A#i>3Qf*vc@3nkh-jJcK3i>C6op_|U-S6Mg_xZ*q4QA0(z8d05
z#V>u>y6TmE(p=AT^Nb|Qc;*5!4t*db=%T5WzunFJG!ZbwZWUlVyIk$Tr`_|++L;U}
zqOlKF=a{cooD=lG-abWE5%9jC*?-FJyd!nDT^#YGti5sfS2%#=Uek`(=XN>?+feHW
z%R+2X^E1Ql$3Um@Ka@7_J7L54`ejcT5vp1F_HL(S-m>m^Kc^R-<^6LfXqzYw0h$3H
zQFE+`f=;#1a7tEhO7}vCu>`FUMR8S1ZCk{s!Hd%kDj*LFWkWYWd$UFq%Fv>jh`bTU
zz!)JG9#JU?Qb650Ij~A*2s$0Eh(5WE#^?=+1jEM<j6Vehh;KodU+3w`EoXn;tT;|t
zUGdZsdeia^_W`o@<(o^9{A44Dn8;-ECM(YhLZw<m<PRL3OhDEGYGp6Dkmb0;*Sev`
z+KUulCdk>3tc=13EZ2D&eHbvI`DGo1Fe)6AW_F!Lw4seJbm!RA=*G<MNhMUw-HMD0
zowWW8#%3go^ZU=YKR_)x_ex!Cm*dO{AJI}v7xTX?<Cq$;x@s}6i!?Z@m%moR>Z-d^
zmjM!h;EYu_znMp>$WriyzoQGw?sY^X4~jC4Gu`9bo>GP#4N~QVO|SMRkbG7O+NvWF
zy9SF)kf4V*%#fxdx*LHA$o|C#9qhkX;3LSOYaVbtx8t+@I+P9BJ&)blzshaW(|+Gj
zw}~ViRdL<-CSydK^%AWY@WRmK7T^pAuh;ienZk-5Mn|fg>SUTo`BQb0qNKygV(s8`
zNk=QYivvR4>&Gk9p(|Ep2$Q8pG{wM2G1xWMud+(G&z0!j#$d2FP;Pth^{Z^}mZ9>&
z%Ud8Y7}vJnPd(5BzLt?Mn(4ORbnF(ay$<%EIU<8|2jOkrig4RL+#+%xot7(qf{$+t
zQQ(HGZ}4Jy-s9k;a2;Eyz8NPu@($XYPYrHy)vtE&TU1;anLXXBXk7+*W?BJNzI@E|
zf-2!Cv#6}E7-i-GD*CVP8A*?T-)^ySh2=hYv#nNUfidTD`Y1tgYYZ*g>x3`3U{Sp{
z9-d@918xs=mHVu_A?mR4a|=m!b~LU=OJ-5LdIH$R)TrEHOz+68iy{Hvk&&S)4284w
z%U+-_C-snKahYEzui>vOIm@<?m*uWvq5s$te)d8Nct;vBazRNgKM@lf+Iu5%-`VTu
z3-#gn+>b2QZT$kNzeEPFKKhgW&=82)S2npkT2kvODBVvd(#|*ZS8!du!j*dM25$f-
zBs+@^oiim?jWJ}^`{qquWo!9oYo?1CCUR}XQ{&Y1G>g&IBKxbep5I=aU~nngwJ>hT
zuS#XPW_NzLt0OSLc3|-u9N{4eZ_3T<UyQ>}RE4HBE5x;IIQknKL%9kF(wE64SGsU$
z+LI$43e_H4Y9_6RZ+GneQ8J5Ow%OMCEO?;2<<hK>HIGSmD>Z)0G3dEcw{`0=*m#Rw
zftw3jI;emveqRSWBEb1xmTZ0ZDMzXbBU?znNT{ak_0y>f*Sh{b%(wl)uFdr;Xwg(+
zvmkMBtrF?tDkHk1F#%7)pE|JagkFt;m|RM5AIJpb29)tcG>*+wOa<|}CBgEYXH}Nt
zAXKJva2Upd-9_i&!H!^|0Y@%vif#B4{nY$GW{;=U*woT)e+Pfw0<?x~n!(n31fDw-
z7*uQMP_UJU6?#f|3pEln=3#qJGMaVJtOkhe`wtzjoTgMM@qCCh%b4Fy+_x1pkcxOZ
z#2AsCdvArrDr7NrCGAO;4bi*q+_atFwD3P%g=NNe-H-*SXfAI-S=Q@pSyUu76Pl@M
z$g+HQrNyhG=5*>C=g$2%IoH3%yv|hgh0ba|n*ER{&Rf`J8j_=Oe>kpAa5OOB;?mY<
zY7GZt<j$mL|AofVevAEsnD9Sw-gn&k6nKkp<9i$@Y2QZ=DEK}u^sZ8mCWYm?{)7&{
z(2WzbbSbI;(s@>)6(6Y7xt99l;I^paq{N!uo~7^c#lbPC588fa3EC=G6jZJ%W*+}?
zW-h+dw^rOzDhq+{UX04#8_2xJiajzE9zbz*5jCG++H_qVEdiUSvM`m<C52qQG(|A3
zX&%Q5zVq4{|BFufZEnk)VtmY4`PUz>H&GCZ--K{xj(W_+gVx2MH&R!ux!_%chYpRi
zI;Tefpxd6tpaq7TwUUItd4f*ZO92B_I$OKMP$-vjkU`rK7G+73>J%V1Q|4eRTr?^t
z)lW)d>k?q|rTXwDSI?l4PwP@su%bpa{HiTc%hLZ2?{3f20F4yZgATX-pwF;&!QpvR
zjuk*YhRyfWQX$Q6A@YCZ+5N>~BqJUc2o3vZ3~Vfi<o4_B^XBv$Q8?`iYr#2AFv--r
zj_W_{XU}Kbw5c21W9xbvtUTp6zFnQ`m2lfmb5gqLTO7Bw%flZH<;zLC!o9`Ig&d+=
z`368=Dv~xTWgu{+ezy(1ccEIlkmtd!U-4^AL(-k_G$v6^sms=PKm0>CB4&;5P|vxE
z&Unl3RMsvx`}%a3u*+w0o})$~Sr#qc)-Fb|y5%Kfk3E{1uSr##6=?54T|fi(F_ZWE
zGW~*9KVumlFmOcwiWAia4kn4iiEI+h=;KQB051R1yL#1Gx}>^f)1<gddE5K%@5(Y$
z+G16xnj7=_Hk)<zWVNCczv2#u&Umbw8HAc#sQ<ChG{lib%DVQFp^$#{MdEb6<LG7%
zI7RL01(bdW^<c*Hke!?EUMS}BdMH~cg;P-mG_`t&EmXKCT1R>Wj+P4&+EIFVJ8{dB
zK1*R|?DAPoL&t@4682Xt7M%7O-jYxcqgg+M!<+d9?sQcp4vvaLDoft9UZqod4%+$d
ziAjlxi5Fa;%iAS^#{V49_M2`vlCll_%;;i|$1Qlf7go5Je%vGP%LtGQa+sVn_;a62
zP`#Ir>z^o^`Ew&w9a0u{(?G0F7iWTBTK$z#_OYvgIR(rvLkrLE8RZMPe=b|5bSc-h
z<gIqU0Aq38DclK-NM6TO_|AB}X3ze?Axiisdz-q0*Zz->OwnCJL7C|v+YDIF#%S&q
zOorqct9m~~-5?EZ^!iNqqJDXgFQ#XYyiex7Q;aH!cXvOQuP$PGCa;2F2K_?+Aq)na
zjCKm~0GnKp%wx!y2R3&KXAi)vwt3=};<FWrX9Y(0_}JF8wk#8+<1?A|GQxDh2;vE7
zG2#HZUH%E-6zpwi_;n_9G1q0K=StlSF03Ky*4*rH%ROj82jp$vBZ&@_O&j{1vC%se
z$23~J?l%W0$s^Wl=T4w2pXmi^QBpj*g#J~yjpVJgsfY01@3tFg<hZx&Y%Dn>9T_z1
z#up-<petZ}6b!MfEUGUVKMk09$=m~GU@7hi)rupRMo?Pbg90y3TIQmUxsG#?f-{VS
z8H$tcz$!|5_)w<j!D798ILoM{`r8gUsrQK>!_!b3W1u@InjQd~ZX8Fw`1SD1W91=7
z=wg4G+h}R;MwRmX$$ZjyKf>PpmRsZBH?SD7mP=|aJ7kVGk3T>POK$;SyFCz$JP6iE
zOk7HS^tZ+KDmp7yV@gs!!AdfOJu|B;{B3ieRi;q8;iI}+mBdk<Gz^uJhaY~(<iiUj
zD(Sfpu6bKG1@QYvI5S0w#BGdKpy+NxvV_g|qu4HirbBh<g<Nn-z+<hlBt8hy&`u3O
zaUQu9A*yMOLy+(&uB@-R87<z?BIGBnWo=%xSvj|rU+Zyx`C8$kttuFH6s7M#q2z>_
zbuu}eepKb~5!Sxeu+fY%4x;ScLJvf5OzQqMT3bWA_<E|AIWRc0;w+y4iD}JVE{uNU
z@`06>15d*SzxBMRrg4f3gR+Q8@w-6wF~_`=p2O$DxvddX>jVt}_^?%X)SqYQZztq>
zP?{Z}_33DS3w$FRVKKSDVteA1=%IQ?lrvaBp2v6dZlLq~+_#3_k!nX@w{PX;Z3Uk!
z7<P>`kqK)SOI0CwzipBQ#r{HnR!AiV7K!W^;+~yfw?a>W8!0C3u%sO_YL}uaWPzu#
zcoc5~t{fEDgzgel%*4LvDomvQaOYuj;E1*_O?EW@u?@r3I7QBB`sv~7r4VVykfmL3
z!60|cL_1G6#f6ntF%;^Jghbf)#6K~==9>7*!f^ms=CuVHMHo~j`bDHL`6<T*(1$Hp
z6kC8EM_7w|`23D~)|lDwao%u9Uf_9!0I!?md)2Z#W4n-}eF>+nU-9mF{tCT5Ve-CE
zQH@J+lt<z$CP#}K+a)i_<+Dj41gpBi4@^C&VcW*vr>Ck0<q5820RsXr-VBApWDage
z&2>cS-6iWu4Uxk4Rmp}Yj40`;RLUAMQrX*Sv^W9QUThYFpu3f%^r7!GlCqT+tn@KU
z$eS=8w9!OF)qJ16d_XL-5VfoyM%iqHj2!HVTL0Ul6^23s@10}}8Zscf7mVs2ritmG
zGMgn+(RYvg1?j*;v_!RT<ywf?Nr|om|HI>;hY?_T9szeMZi?lBTgr#5tfEAJwODK&
zs;TQh^&yCbDS*))iYrN7%joXDS1R$F^sLZN!-OU$6s+BgX3MbIZVb?QHdw#C*hLfQ
zNSN4D9x1P8T=<yfh_34O3L?Ess+3EHna4yCw;ed+iF;4>T$VO2?pp?QMGG<R1>U4x
zAWlPrZ|V_bwg9$Q`y+3gw^BC7OxD3}?Xmf-!w#53l}q4y-LsnmnXOT@!P)fZ2B2rS
z>!+(g1O+p1qe(^x$?Rpa7Z|0vnRhO8Z%8?hjydOK=p^mB&0RHI!D;q~sEACoBzJzk
zzQz3M$gwn2$q~)y$8RYP^8%n)_!|W)dd`d3odpHP0|()?-#&kFmy!=Wg3jLjcs?z~
z4u#lD0M6e8+?td5Aeh=o#Z&%*iC*a5Xic;6nTwq&L!_8#>tTVFxVcEV$gc+H1}SSx
z@&<VHk?kk}Jqf#;t0q<<MO>g}Z9v70fy(gwKd)}*q~}sSX$>}iwLV4CT6)*VEzmb)
zLYK^IE?$M)M649#O`NI7p?`#Y;R`~>U5e_xTr35GVxNw@RzshTNR;cc>TUtl^FEXz
zEBhbZZchZtIHkTOv}}^&gxW5r`Y!lj8aMHVoL~Xw1Vy285Bt}iM=7!vSxU1hS{qfE
zF0I|hQpYNeWnXtPUiJ)a4J*5vXS+x<Q9GAkK!dhJC1zzW<5mcQ#b1|=In-;71Xi&F
zsOSc)F;9ay6HLgsK^DCcC+@K<QJ$*WqJ;#_TlVIonc|zYtEyBd7+`l95}ocQ%<ZhN
zRhBgnkv0DlLs$Mvisj*5AfxG7iqj!qDxf#R=}1pS$LW7)=9?2wV)EHG3ppPAbO=N7
z;!D)LJVIA}<n(?!mR(2k%^6WM@Wn2?@NvJ+4cFW%a6))ILVA>X(UcS~eEQ_wE{O5t
zfxULnv!!Z!PcF%4Ld;}j7nqKpeOx9L>F(eJdPrbADH2JI9A8`|EPkZvMZ}Widaaxt
z4z}3ajUg)){mKg@%S^q%f-Udb{qX5-FGQh9K+EPbFF9D?;H#Btf!y4C2^SIj&QDiS
z#!XI*3Aa;&hT`RaTXen2ed#b!RnT;X#Cw{ugIa=XC|@R8ZM+R08cYuZnwv7;!v<41
zQI=cYWBc5#L64`GcwN{`S=AQSkz@q6u#|rM%eS5PX_5UK+-bRa%MgiZhn`Ai(-HO;
zntt_{H5d*Mb{veCX(1DVCHu+G?;iwa961$QIOK4%83!k?6sGRdM?VFHhtN}NQpS1w
z`OZ|+nub4G(d4Y?+6yV-<C12F_NjQ<ntrk9>Gq_o&%xZvVJLYc`a~FYYON4*opLEv
zE>CzZ8fLu;@1{P|$?+jpG~lau^^J4p6cl*iZwOTW56*y#fOQ4iNpi$uk3@eJhIYNv
zx49HtB!m2d9Eny<0gNxtA_tUVY-)mEIHXQ`0U6!(gPpfbs*+=+n7=K`3V}YGZX$0S
z_c%f_tCH*c*;#}hdeRy}&VyH2i{!TlR8cVsItCx_i^Zr7V?y^;;Xo&(y+1*1pJcp#
z;263s8=wmm!H?UJ(?5nv%nzimab4LYJ|P5Sk=2mbd6q?Lvbx`l{w~!6cdFgp<5~DZ
z?1<a`xYG%zr<#l0knFr>ldI=a77w=aS;-;6?}<~s)>(SzvoOTGa_GYj>mBW>0TBe>
zhQ%FRGJ+am-<P=W)>^1QQ)x}13Aj-g)RyZ)S1PU&<Kao1A|RvHU6S5J1xDx6YOM9-
z%~fma1ga48^(E>_!NedCJ?=8fjHKSt*+Bl-F8cBuOkZWYP&WMjU;@yk(yvG=2Fl66
zl|JkQ@<9A_cIMXsE%BzOW$npcLl4-d<2dhZ29pw9b<!L?Wy*HbimH3|_J@?E8l1;1
zffJn;NKmxDy>U|D!cclcVNk8IHzU*w4qWu!Bkq|e-mfmws&ehl?3Y1orKDg&<|0N?
zB_KJM-eXATrRP*9X58d`F5{|~M&67!RP=iuX4rXEQ8b+2^ue%Ru<R)Ej(6+PlFEkC
zlMl+M>&D!YLv!qIeAXor=l1LUSOC9#AR-k5=_5?aGEHp<$o|mq)w7<ei}ykd)U}CL
z>eY~xWzYF;)@CoBoZ`2FgcQ@XjlPrbthC5jTc@bn#r0ZK4T;&|-IW>LyOO!{>qHX5
zn=5j=1r>+X9jUN)cF)`IXK)pky3Siz_!K;MPE*WR-kqw$Uk(+nS=~sb;O-qNq@w?o
z{f96elf21aE!zv~82i*=OqVJr2-aI2AMC$7oBo!G8`P$e(G15~l&%!2Wu<{#f^9Hr
z^s>d23WF%iC@;7kJFyO*no@=19UggR{L#()(hZbjC;dO<e1NB{)O|L%ugoy6TWDDe
zAf%|6AnPvm3WSb&>v=MOz!F>bN6LD*Os`O4(_4DR@9#{GZ+pixo&AQsC@XtySbTQw
zQW%u{ac%df+DARlV<9BSh-_Zg1%tc8-1nmAn)N%h<J$}nCxzoECyj4x2CErZ_ztC~
z-!{A^S-T#&_{DIn|2yuD0ZA$;?YShIY37{b$X@2H`HIr<KR9s~f9-jdR<#xu8vqy|
z|7F3N*PA%vE-W$l>xLPpGjS=y)2TQ`^A6;4b#-~iDpl~d|9X(Y<LemZql~==j@v;k
zq^XS_W`Ur`U<K$80JV6k|3bpEp3V90VC>Fx;6`m&K&0Yz!E8`=-U$r91x7&*7Q4f7
zOMeqxVLw0gv^bV|)(E`o>Ug%MBD~`-e4a;sC$IDoP%=%<xK|H;^&NKn3^rrvMxB$I
z93ih#&wtvzl6f;Y(Bhip2MDk<JJvk#le4!Wjr~pw<g9-Pb=LbTmmT0zp#N3r$!9@y
zmg9L{ftw1h3S5o%&!m0;RpdjzG@8V28ToL5tGZ%}7}Oct&{@0hX;F{xyuFtIju=)n
z7@(=n?6<g+f|cH*&vv}TxhbYx{%>ami3|cxdZQ(VkQeXIUP7*v2xcayaX#E6iNyf7
zJj)SHO1*srPNZ>ozE2E<M?n`CG>sl?EYG$8zqzj${L~QHQZG&PbV$hU457|%F|Tr<
z5UO#*wacqW>V)E+7Y$%SS7<&ca(+3fduyRLyy(@Z2sm*{dfC%Kzuz*5=Qr9*VVMal
z6{42u=HTo;uHfeP*f{u%c;g?HAIg^pqt$tekI4}yJz*k&aTXq-uo1L#NZu`)`L?80
zoACli2{Im4!=!}V{U$JB&eOjER^P{bSpx#cz@!bL3BApSHPb^TmgTn@p)X3MJo5^=
zH^uC&h%P@Z_4wg&volnAQnxkb_SuJhu_~%8>;+~9vWY&hopDItU56`$RR&!Q!x75H
zDVfRN4C;U6yF_)Q@l^6S@<?&DE{_dP>xa;amJ5>6Ve6&?f=<<qZv_x{#qMTrsaJrQ
z3xBTBt&!1Dd#;Man->xKvW@+hJt>kBELKoYKpYap)xZxZJh^nQ3f%;=4ew9z8@y7_
zq~8ZoIK6(PdnG+k-C<^yciF3~AvY_=-~3y@aJdid=(XcDXh01&M~lurt-{;c>B(YX
zM$%o@9L^!h!N<yiyf>vcf;8yUV_^|ei(c{fPGjYnS20fHyuosQAme!+zxcIjbk-nu
z?tysU!klkzw|I;EVoMZF;I3pV3>43j4~yKMiagC!e&hZ{1IQzqjZ5@3F0IRKho|!A
zy->}3={w~!A7jeIfM-!rJI1h_G`;WB1q8}G|J<v(F>6hcRLWc&C7Us^DQfV!97ER&
z-kq^hU8U~MMJ?uBdOdoNyte<ayBO2u^XOi8g2Q8(q~<drCpf2v`rnWqVX9#x0u$3Y
zhF8BaI!`LD5#M5^tE`=H12rE#mNz^y3B%<xky->*KkMgYu%1!Sww|I2mJwb-jsnAf
zbDOoj*Or1z!no`YAbmnT{$T0_Fe?UrOCcF8l35KYj`eGv`WAog(`Nw<<k^2dO;ZN>
za;*W6BP=`1Gj`|6cL(c(Wj&-*SqAU2=es`c$RpoJtm<2~B8`Ad|A%&B_6oF|?vozI
zn^gO}kms3O@r3}0sdpy7LcsTsNFN~dPOtx<XuU$oPjjn+2nqg{n~yef5s`t@&%C=F
z2^cfm{`%<hdpU*bh<P#m>crwl1>@vDdEcJY$HdDl_8wzuma5%g|4<b6mT8O|n2HuA
zK9^S4sC$BxB_{f-Y!s)P@`H3=T+#4=Nf0L#+)CAE3Zq3O<lAJtcxk24eLfev&BMZ#
zZ}SsG3ZaP5GmL6y*ep4V^Kk4ddW495X{V!?PyM@KO;7?{cJE@gmUc1Dv6=(-y{v|A
zJC1wt4|%*{kY8aYd^AT8EU$64nLYm-Hp9z_Kva7t$w3OJnW<@<mxla}x)-SLV@<Kz
zWeLs$KaVkoS558(tQ&$hwinQURKwaSu1Qhip39ZnSIBLL;RSYuOX&QJgBxa5KW{wz
za$(nGm!_gmzfsPVMt8w<R;ZS9^F0sLMSFIc%&BO&3+S<lx#duZ)y)Vqn^~bF1ZFQ|
zm*UtjH-zJm$A$kC6O#?u&&TXbI#H@*c+^T`9qj=|Nk~2-zD?U8mss>q%ucFRzT<FP
z3w2e?k_ERIP94|V&Z#gwXnR;~%R^I$re_?O-kJCtp0bC<0Wkq$uY0Arlp?6XbDT`V
z1utA==6BFVtO#wrrS1vP)DtuHb?f!@q+TjT98=flU3$Hx`RRk=6s2ABpl@$tI;4f9
z-6E+ATfpOBi7nJMM-A(>Tqwv@S8+7lZ7b8yDfFx}Ij@?!mnMV@LdWCCeOBWcJY^dB
zu9858SX+QV{tdT|zGs}}Zv4}bW`OVx{$!|w?g4NqJ)qr}*eNLAF)J<{Je)5Gn_q3t
zE3<ByMgig|#wwhZXW4fuh$*5C-MQ*{LHQ7oFn@{qB+D)6TfApqD5I--#LznzZ)?os
z`!Y`BL-CdUckI#ED!actSt!U$z1{ovgjAUV*~?ww@rE?F#aHiA&y>~9vQ_GpZ4F7C
zjHUcv-)UX@vY2b+^1-xE8pz|kH`4={%?TZY<+iI-C2`2XEIW*KUTwtaK<J!X{c>($
znr=z9prmKFXnB8Z;*M)aU4CKNs&6ExS1E<oaw=;V4v*=sD(T=4EQX!inh9o~FmbG<
z5=bzSJJrx?Z3zateC=-ne6FY<18Vy*oxRvjX!LwB2M(R)zi<vjK{)lsATWfMlQ}pt
zl7z)gIPX30mBNgf95;%lJ;($_64gaFru}S5JF4tc&G4ZsrE!(d(x#f5EF17{lkUMQ
zC)_sb<~FBW4z%2-Kzvd#yGP2Z#bUt9sv|G3WVHJKu;llfp%2ts-la7`=O@6TH5W?&
z2BDg$d_^<jA5_C;mk7Qor_*}Wn!IAVGukGDuR^a_>ER8DJ6N|4{G3zE{z}n~m1KRl
z7`C~|yatcOA=6fcmV)2|%FONfj)|J?kiIO}ac`j<+b;_XiTH(jzV7O|+X3qifg*Ht
z^Unr?gIA`}Udy+t-!|pRLMH+Pc8T#HFKbK$R!BPxM8dz5v}5~mWWt`<!NL9%Pfm9b
z^>00`+4Ca)+WxZ+aml?r%`=6Ob5Ih&quN#>)x12@wa>F;FpDxdTerhXyNd(u-fFg_
zzG}YZ_otOPNe@CE22h<!N?q<L0v;>9i%SdZ@TavRXIg{t)hp>;Mp|)VQsT|KHj_J_
zz&lBlTd)0QC8DE~C|NFQ3;YV!j3YrT4@gm1U+AOx2RcS(zkt}WuAT@V2j{OBc%^iT
zOiI>79iV%P(s3lh$)>cWTB98KJm|DuCavQ7)f`b~tG_tv6xc!!TqTmQiG!NOBwAA?
z+=&}_ePiI@fd-W_ju4JOAkRrTL9HNE%b>sQ&$%MD{x-~QFQa>rWDF80aYz3_n~<PS
zOj<-X<xH2IZdWv~Z0vOIC26wLZjWantmiXqUNiG`!@e@Pw~;&)W3=9-M>}>UfnD1O
z<3q{X`u{TVoDUb!eZKwnE2wsj=j#U8`|r+!6h1dSwuKru+_Y7A9^{(F6tQZ90tC+G
zm|uGt#U8SHOYF0Y4rUL-A&4yAD=a)Q&VtZZT^+k6bls><`A!;jFYR>{9o@Ufz^ZKj
z>sRQGnJUX!9XaPjAcJ=cWYtWel1wi)|8x2T&-|*E6s=db8<>S4^2&M%wm8S!J<P^b
zQl;8Znd#CEgvK)5KQbBJQ~q!VHt`SMFg^Vp<!Aoad9Zzg5;C+x^qAOqIFJ8EZgyU`
zlUXWp`z(AnW~st^)r6G4y*;MZpP{wOj+<A(8evC)`9TDEpx%jAEQF5;Ev|UdCdj=p
zrdEz+?S~#CTBo+=2;B=80t_de@1Qo2-?-a?oR@RB0`&EnFs|HyGRkO1i#SbmB_ROc
zHqgHnimL{voG$t@c-JpJ%^uMxJ)$ji(5k~o=RLT&6!m_D|F$6{AHrE{NH{O-3>D+P
zEBswx?4`;e@HnB8gViICXt3N9_R1#S1K_s?;EL#>m8=J>3rS$je6mu-k}lr1v^4|@
zki<BgISV21gUY>qOEYx-GI0ecdrsb_)u8&L{}JYTfj-xO_LShstoUy(8u<H*`~R5&
z4_<ipKa*bnKYKuS=MJBXoZDf#H2BzuKT1+qS^+N%#)uj+Wwc@32R-P21kQsO{;yGB
z|1;;7?tjk;`~MF(JlX%Royp%*>9#w!*rV2LXo%%XDu2VcIjvrUem*_1aq2)f9mh8O
zZwiQ#okInj8QYh1h;svt%|WHF2^s+GcaFxBTR??uOgJwCDul+?x6edCv3f*ZUd&y5
z-M-MIr&w7-S9f?f-Cp=OFA!gOO}rYT-|3+MiIEGD?f^)(WWPWB_8^5k-bBY2MLfF&
zP#OI$W7~Cmepu6mFi4~0A?cDi<}d)cgh6i1xzo<m>bQV)XY|DL#TJ1pw3uPfpJRD=
zDZ2Jd@eA4wGe@_oQ>aq4rNlyz^DZr6g@DwapvxCCP^^g&MmA<8V`xu+pVx)Y)6;FP
zB$tvvPc>=ER|=qlfz;R1A|wyMi2*7DKPim`jI!4=M=sQ_w!q&#lG^!xp~wF_qW2fr
zuf3cMHkX!~I^p0LS?cKO#z@B*+?LKVDc=0cZwo+Bc1DLxm--9iQaqF_2ks9ySGWZR
z(){7zXZ}5KT&rb6zOG`m#;ppkx^VE*#Vs^Yl3>Q{#%b|@a+0q3`Uu_4g@nPWp1qEB
z?tiZOU_+xWC_#C?HZN@NJZC`V>k7D#FXa!NZq5&TTsjKh^lw|F_+jIAPUQ#<-d;Vz
ziKf95!21chwtvGSEbQ;2YJh%mDdJC~KP<`Vgc*?Y^mM;R0AvqVG!59{V<<Yh1pVsw
z0P<aqvGGbBftm=<Z-{}sXO2l9T=@AOk!tg`%La~;gb%q4tkwtxDj(_H8rk7T*X#bK
zCA=Q~vZhg{-6*5dT;S}K4scu^f<6BI!1{f(hwJ7F2>35$<t5K`12iLqkXi?uZ2-}`
zO7@a$Io5*?fEvH>^L!f2-3kui60I=q$t_w8O?vsV!UJpBfsKDMcOHF?V}kwrJENt+
znsV|Z<>tESM|W=HPk$6D4uW4t6~zL}Cb9Ebt5WS~9YDkeYaXL}vBrxj&4INaNe<pX
zv;#YL`Zl4N5HjO?gzTDrsLuzbHp3yBAzh7cvc3RzuJQ?bQ91qezyB53Fx>i2-UfK}
zU(lh?biVu@I%v37K(z#bUq3Eu&o$`w>Z-zj)~gXct=;VdFap6l$MD3PH1vf`EdirV
z!_U?@@}x)!P`+tfLd}V_+Q((>1w0L+P`P;ih9AZ~16zeoKV0R=MUIuE(w))W`D1~8
zPq{r8P6c9}J97deweulA5UVpx-C{-3t`f9#^~Qr~dx=?Ujjy=AX*7YqL!g_rv;Djf
z%auzPUcI{VPAOC4qD8D(%4Zv`KFz<i6^62*J}Ms?)$AT}@UJGTVOS)pOf<5OGn`Tu
zI}(=O{PU`kmC^;jd-Iu({iktj=cb?aH;DH)_e=-wP!OX5+?8&X&r<zUpS{_m61RHH
zHstp^rs8}h7~}*nE-4K={5RPmRs$X9TqS(=6W^~^Mp<91VxRiaG6U(-CafnS@+4h7
zjiyeP*cyFfUMPi>No`@IcKc&T6C1>|g}YU<8*;yNPl9w5KAE}f*taX?D?44H8%a3P
zsYFwS;@=gzi^FpeyY;4uBxy#|S}V74az;W8s?|U2TkVcs&ZkoAif-9BMWG%ss>S|0
z!((X-_&evTQciTB?s`o^#hiWDB-ne#AE!RtK@pQhMxx53N;i6ZO0-Eoy!qk3uQx3Q
z?|*a-)W$@;L&1NiN9K0tMJaA8B;oeHHX2e(>*hmc7v~C4cLN-rp^3w`pSqN*n%}^g
zJ)NSKUq`7bVlFMe?k9wx8f<p-5}*OtW8uGe^3IY!!w-UO%Ls~h8}pV&nyZP8edVX^
zOXY@hz2E0e4Rj<U&1`t?!>G0AoDETXf}{_B>Md7XQT?@6q<VLl*7G_Owm3`KkR3fA
zfln(I>6^Q_J%aAy5mMsFv>3cYymbAEBDTDI1GNvsQ!BmYwpOx+Ea&cj!IRi2XqU<A
zG6%9W9W>D<C912nSv_<MLA$BjzyDOH)6cMvT5(&L3TWoeFF(!erE1yAH`N2sb4t|l
zHO{j`Yy`*4q<F3Rw1Ks2HKRp~Yv)&DRItr9Ym8R@*%Lm4p29_L)?S6&yg$|G|6vT@
z(dDuKVL5trUe<UaV0~h1BB}mwaPRM;!2Po5IFx0FK?lS_S`AxFHh5HUVuXV)D?ysL
zwSz0|D8vej#5@wS<G@sy$mI7GuICnFRv^Q=KDxZW7@IehsnPiY6CGaUPnM&y{48fM
zEHM%LYw7s04xRbTMXzE@l5vwB!8py}gSB0W?5U$G8n-5F^|`C@vWOj`17w>l9(69d
z8t<S`C~zLRD{jSiG%k4QIXEUcIujX|WMe&dA4)cA(e3bC9j!A-V|UnVd3$}L(#rJw
z;11I^IqLn=eA7ba82mnO!SP=KB|KMSLZ{wl%W^MCjli3v1(YE<6vat5XR?zt;j~y^
zonl_YkB^VBBe7vIJ^wDBC#60`(51Ik!MwA%mxg<nTsU140xaFA1_3N%LN}vV7JPD8
zQBx<JxHMnNPW`N5;7nM8v)qW5dzV$A|L1ZLFF|DWdp<Ms!7~o%TaO33?<5$bz1~;w
z8O4NZ=}VQ`mB5b1soHS9`|g9~%!dAvj(ed<HhP7U;nnU}>rid|W#$kioW!lc?!HoK
zY+6~Z5fPn1ENHIps!^yPy$9?5UY5KJ(S&uqt4vva`y0(acWs3t6!}Wlw8xpZM52&V
zpcDSBx7c7YM;@~hU(lpT?rj#r7Aeks63oGi+Y4}*K5sIK2;=baB7f9MSZb=f!WjC=
z_!}82tf^vX*{_bno2C7`<otRAg8tK$W`!6w6L`Mzzk2j-iCMa~TAtLKV*jg{Z5m3q
zPiV*$tzfv%GF;84fJF``D`qLh!qFCJOKt1&siYObcn{^)6!BDeW?jDXX8z4R?YPYE
z>?G5=y<*iW9hN&2SpMkFIjx#&I%yem>2&3}g^!5DCj0MMA_u04l{I>H8IEdJ2j;3n
z+X9J-i}mz;pSo0VQ*)*My68C0EUPi_JNPH)<x3>wQ=*!QsEm})sD^<Ju~-{jN82(j
zqf;Tonh$qQgS*rw3ehW|Uw7a&x}S~8gR>rqf9XP~pV-e+$te^NUe(}+=}y=)etj$L
z>U;P3eCo5&1i5F$e+90-CiSRrPM|!v)>l1BE|0IIH6dcQCaW8Ih9Wku@%c7sz<ut<
zCzT+^yv+$>@^%wO5rmuZHk!ESi`?~B_=wDl%`ra0e2nehYt=|IVzIGYQ_EvBftYsV
z#Z;G4fw7APl*Pb<wvLQ=xWTQyWdnj<0_Rrp=@7xv=b7ti(8$(jul5Coy$vkcCuVK6
zP=45gQ<kq54f)=>PZ^)%EMh-ahRs=D*g99<t<2JNouk8f#4GHtf{y|Re(^G^bkcQe
z1WCW8@D3p*Tu-Y|U~@95q36Q`@x7=|;~l-Fffat=)>YAjf<`Itq^YRR84|a^J_Q>6
z{h3?T#Mi1HgmJt<75;j)VwYAd-m7gem)NvLHU()hW0+^pzezfQr;?KAd*IyW`f=im
z1;jhYS3<Eiv;@gKSu?;Y`wyr7kj{aZWc@4noJH%!sjntCJDWR8&M&jDG=V2GReR6z
z_t8MCcd!*bXG|#H>(h*{IJXV=o@z>dA}a3wWcBi@pYt!fu`Lq_7v_%9>$v6FxN+RU
zT%8@i1`#e1x*Q<I>QTho)_Nu8+u}8`%~#>{j76O3MJCE0bYS+o(et`6b>$SVUk^w3
z`^u8heaPseV$Rq$dP98h&OH*Rep9NCssPo%ep~N{h)4rM@N7ZzrN-WX;`DmUQIFLR
z=*D!rYL>{nm6@E+ak<5pg)3i7m(jUi3urk~FZ^sI*u81gcH}%^73I92@=M$<?}E=4
zeCw@|x{G&n_aohOv~+LqOiIDcan;0h-!=2dfKlwTk+<o*YTafneU46g^o&hKB`spc
zR8DCFi#fF^2;+lun$rV2KMP@jjmWF_nFjqYjOkwO{AcZHvRCGk>My}aOrgP`gN{$;
z$CWn|VO`&Wk3+Fgp#Dr1$@uD@r}bx!jo}Sos;ewr7V{;tC0AszOBs24TD=9L<Du$K
z+)lo;JA(WC)t)21eE$aSy|{Y;Fmi<TPyS?QPCBwLRV+FctzKX5%Iw2gb@Y{LjP6TD
zQrrZ~jU^`d?n00v=Z%5hpg8Y{q>l%z$p59iE02cyZTnPG6ea2jQ6XEAU9v=&Y-2F8
zo63@mA%<jYBvQ#pw#HzHu`i`&>?RUrm)+P4*|Usow&y$jp7Wgkd;fX=de3|PF=xJK
z?sMkc*L~lg>vLWA^}ViG8HguW-$;vX!wb_E3o8D&nAZ<dcR#EU3^a@}Y<+((F%3Fx
zKOi{Y!1Fqm@uTo1#ewR|DJgISX%=2E!!V+VY3e<Wh{t%~8XvEDavzB1_$L0~*pMo1
zYKCDMVOVSoYOqQ2tqvIOE0dI55nh(B>V0n<Xlgx2@L`XQOhgY%S>pP^%$)^QCU6g<
zS$F}zgquG90-k0`G52&46Y64rEP%!GnHrSA*18p$7I&`tS+{G8mrg$@5yZpyR4C62
zVTD4NR)a8tp;r0K>rmik)t?@yKFnekH2iGoQo81ysb(iCO@d{5*}@mD0kH>Yrs?C*
z!*K^+fp?m#b05Emk&p83mQ}aonfh^GuT6}G|6a8gfo51XMq(Ce_)RECIm&wSWkPw}
zg=2RoP@VzJs@br3AX8j@6lQ#Ku$+imD?3nN>UR7g(L0Znm^p9j*yqROFBP4#(EVOT
zkMr3xIs7^JBPE58A2RTcR>1J$8p#Weqvu6N`S~3_u&C1C8=mfOk$<TM`}*<Hac4*1
z<ZyWr2Ye*E`Sp4mhqaNRYpvOQiRGvlF)TP)z%?qDV8-eLSMF&rjdm!GNj1FBvyCeO
zQ(*Y^Bh_zk5AS-8I?@hqYSR}x<z~X)A^8{#_6kcR{Zm^Sa^?n5t%57NK-zJiuiO$F
z&imylKAN-yU1Nerxay!}ku?)+#?Hq9c5J(|jLwBYY>;Qch-Q@r39NcD!SGOdg2<9I
zTrp^U=4aUASXKe)M&1Bb5;%EhSL|1nHKMi7quZc*z5&doqu>@r&BiBfz}fh|_AS{%
z{OUNf8x|2`xn=Hqyk7-eu$SlcJS*w~x|zVMt6YE5*z{58{7sZ}jm=^LXsq=nsE?;n
z?392W0)kM;jLaL(-m{@V3)vtgOY^B@!nq)RU`Y?XV&Rti>f<;XzVVkK@yw(H0TD-n
z?mo@H(2Dkw9L6_NJQL3Bz=uM*VXbn){5Ihq1O<vZZV0z&XqsUb<ySuU_EyrS>;KGQ
zNbFaoZJpL`B^3TnL9^9JW2zvf6~S!C4ZnY3$|C=joisJC^4Wr59za`&`k8tsKtD#J
z&k9c6YxOf~cc^5XK}lyJirTZssxmnJvf|%(Eu2_v=2eaH7WG)Euf;MivSnJTENR_Z
zc~jp^)wwqLJp;Fu!rGavSy(T$cJrU{<r8T*tNF!L;a>35dA0P#u}v6qFiM&!V?=dv
z$Qf;hqMm?tI+;*C92!BBsC)*un^66TY(<z-?#j-5l=WS~?W?+QBkBa9FzX1{R4U|_
z72ibPVsMDq^_;@4J*%1$WiF{j%?|*Tl&-Kt5N|eRp<dWam->2Up<45JpBGg+6&Xql
z&bKuN<Oqx9NUN7fYaon?15%(La*KBWqB)x`bOAQjixOai9Co%P-|`MB@BBy|M;cib
z1^Ntrr~T%7%}R?1XZr>O9#eC$dsiiS6nYJ}6l^v%zSYc^S+HBut@${lED<h+q!ae;
z3=TEL7`PogI0H(4v%vdoKTxav)?Tecm)c;);JDD~^VVSlIITN3uiSI}mjtKOtK#tT
zPNh_h%l)c08_FrSH_gLqDxHhYV{(59Q(T?C`$w^-fAII-*)qrrp5sneV`IZ_ch*0d
z<t_74ns`VHK<-sm&A!E5Qcb{3c<?ZOxG>K&hpsK1=-BkxRLO%*#tE@-!tWe_sSxC5
z+x@Y=GJ<Q`427U|#!33i`{KZv%LrkJ3>VS7x)4+xF>kCK?7PV(e<joMHEtTsI84aB
zS!P|-FP|~tp@GJ@JT<rT&Im!;xZnmtUFFi{{m1ih_kH`p1TMCu$xk4ra@%<Dps5|i
z$D6jim^)av(Xm$1sR*M}WM@&cK8lNhD;pD-OxKBt(7FoDT1R~@*+_hc6<SpVh%K8y
z*&AJV`W;)fn0-_p+Gou=znZ`e<~wYL(XNe=a+H1{!haV_Ds6yqJ2nxDDT}*Ma^kW%
zsW!R>c-I<0<9k6rrvRYd7e^?D<+%V@rwp{5SXMOyB^03NG&;ci?y(y3_dcHIND@t>
zCZ7&vPA39RM1jDjd51y#4I6HHf(eU-l5WNtm-f065lLzJcyXLx$em%b``4TlQ*zIT
z-U}l0w5*LoKszj~;1+hyW>t|_K3~lxw@lSWr*<?gtV<Kw*P&!a5|zKKrn!~6ONqg@
z!yU%Ab$Wg_4S+D%gQ(_q@1?jTHqE!F5aypueAe7Ejm-dJ3Nt>$`TBd0S&|<&=l)Kw
z!B&{e=&Kb39k2g;cCSFTBZ(9`T(b)+u%z#u?s?{7=i}+2eF=n*fiqnP<F;C6iI?u$
zk|OYCLP$UC&rILKpHJhTXaIO^JY@0RNJ3K2acui%&d=j!Sma71$Ly@+c>cFYpjMi>
zMGSxe1ACGwEMxSrL{K0EsuW8@>ZbglgNBbTg{F}bA@{PuBhNu`mxiZxu$db-<fvS1
zgr85IFfaQokN6~ejUpJEBRooOQ|?N)XD4cNwqymnQnXex?%I!P_NE25Y|Kt`Ix8~Q
zhTyZH*fO2nb@D8wB!os#R?FOYKfc+5B#|e)NUMAs-70r6CdEia*1nx(LAwm)=I2N9
z*N(s2Z!|v|7F3Y~vrI8jKR%U)E}`QaJra+E7-Iokj5C;Y2k`xNtw884&!}Hb?~4O^
z`*Nk#Wt<#YaPHwLB#~SR`P3~k-|TE&Qcew!_?h#)D6BUmku57S-FTbuC~wE)u(?V`
z7jyz{ElkbJHwcKeg8$hQ4~(`?(C~f!og{?EU8Y4)6UAOdCUv&?!4HmaM){bb0R6dF
z#^4>{wO=pXpFa!JAg-mbWd?h^C|9|<m8wRp_qplysOzF56CDKD)Lpu)4;FNC0BeL)
zO$}j|cZRMq$CcHz7}Zr<JvMcbWNs93$e-E3JzKfT=nq{;zH65Ez6;CHvGb5ad0?t;
zFBl_RHv65Y*Ip)(&Bn+f?a`w2US@M&bp_n5RAbw9BSAh;4M_^AA7;kfcArA*uVW&e
zhg3Ewtb-PQK^!Q6CE&2Vof{s%&j|DATv29U$#w9CXj00)4_u`O_?3GT`MwZ;(0S?j
zP5#Yqpq*1&Rp5I-;bQw-z=4(j5~EdTQEGKN(O9_6zCkHOoQr;5iHGzw&V{KA?+2r#
zr!v}Vc1<u^K#+oz`1@1ZQHCWVH8jAy48|*UP7-?%?jPe1jYj(fMKbdhD@_-ZFR`ER
zoF36JkS>I$*)QN6sju$eu_5-XWiZ?)a+-=9i${_*EhFINHmX1bBeu24Zjp|UWN~Nd
z<Dm-ybqNb!VdFbBBxn`?ea>*tKo%mtT$6wEVFlyUxjPl(-feygV<IW9U_%eCI(>zr
zvXMS9i19TqQ`n{l)a~}u%w{W0h{0CRI~~ZkZu(5XAFMLJ!mJ(u4#sz(8L(9*eKN+W
z!>4|ne6bc0KD_bi@&`}at&OImVeQMfRWG@v;M#k>`c`k{0qwE{{?Tsl(bEp<nf#Df
z)A7gaYGIb-?AXNKL=FmzMP7$YW*#G7XUCdarAWO}2!W!M<_kp_N>v~B7Yk;IO?*l)
z+;}&L|Ky+LX2CO6a9PGz6yU5RhY{t4$E{myi(Lgf;g5jr3HX6Vg`$FV&z|M|bWp*3
zKuDyB1g>vgN??JrOmwILl^E1?p88N$SHUXWZrOjfgZ?_AZRYnl=Qs9OrqA^~v*9b%
z?-oGR=Ppcs0zkw(@u*fjuf?4drwb#4Q2MhB?i7R4MyrG9s*f?GL@Z#G3=LZDuRR@O
zWb2ErPyb>+-Nk8aShH2T#mH`|a$VX~VPv-kxUK#~>f+6)2icOQpP4^uG~v<SR%&_E
z)~V6ssFwL;x9oNv7KfskZbS>|z>_D|u57Gy>G%-G)S50<BEnN#l^NVlbvfDW>2XSz
z;?BQ61gKQ%Bnuy3M4gc2*SA&Jiny+;O&2;K?Z4qHVplm#tr*>e!>?AJ<r0><Ty$1X
z9a0c^K&$MQMRj=kK92{#?H{WrMW3<l35H$>_`!KfbEGMPB*E0PJA6X0?$h{#OYnSe
zL<LbIJ=%Hbr@Tb|#RW;nrDdf0<s3Fsh{(vPx-veRH;csSQZwnq3Z0<`i0#hj*J*c6
zWYKOVL~nDkY;2ivEo9e|+NgVFIXc583|c1((zAA?=G8E3J7LD%eclTxeduMs0T(SF
zb9ycVL>ek_7vl`@8UX9NWe1-WM|0GxT%z}RZ2hv)4Y!*S?B4cBUy$tsFH@4+aL(i@
zc?qfKO)J~hJi0iY)q#z=4G1CTKZ}+lxR-Zl>)g6$Sg(|&uFl)_Bl#CM9U&*T0`ABu
z?~9|`rT0dZSIpNCM5~?ORfrv%gZJkjK|Ktz#N_h^1+{0oBMjVf5Hx^Y>~)Ec>V!N=
z`3Uut0rj(=kwp}t9V$uOtv6RcB#b5Q*nI1)XTMgjQK2=0)vKBNR${u!Q&JZn{gkrv
zakrw2xbgaFpAEXMIHqUQo!1GO9M~DUAT*bHg*iM?>pM5uyvWF!{q!Uyc&^87Le!N(
zE2*E2N3FU&+Qcih2g+%8(BQZSvuQjCQ|!rT>I7@u&l*REjedp6rGEAfZiej(U&s<_
zj(Vw`nT1ms43!aOt}CLXH>h5vxSkHdL71kF`t~JxDUY&{zJ!2|T)S6}16Xi%0GYq<
zolkwuSExvp2#7<CxWt%*T(ebU*2JP396AkwF3Hy&K_g#@-W)QG?EE%Ke%_swhq>ex
zDe_Cef>=-RU$#CbXM<@KL({GL)(b=zOiFRpigOm%m*^dMrgV~N3xq6mNU}d)Gf^|w
zB^9haciPO{ZCe2|;sSLm%Jh{p(l>6}?Tg2$`<LEF#O>awSjq2V#Z#)118l3v(D!A&
zIYV@-ooeaP+{S>s?m<M<*15N?JQ5XE;$jB@a^@<^#Ef<-aXpi{*KS=M&;nSVLWWV|
z4SujP^0?#G9GC5Lr8Bd8m{8_wKC%&rILMep@U!WcbR${sz=gLqvcj`7{7v1l4>-<$
z?|~0{H>a4ahRlUDM4OUv+#Cu3ol9X#DRGp@r`Prsj}Ti>7u2};LU(P-#AAO!4xPb;
zWZ0!B3%-oGljNk}xYk|no_z)S7I2*wun|_fi9Qb(@+_ajnTc>Z<g#U$5#HP!>c!Q3
z5T%+Fy>D+AU0^~#l#jEX)YjCpzH%h}V-p#4N`q7|rfS=3dNUi~9(c$ST(}^YQP8ce
zudLC&jk8ZDyo|Bn5fgE`E#grA1(irrhq187pk<WcV@)5tlJ&aujAMSBcn@oru(369
z0Ms0^-#^>w@u9I##3$xl7p1=T1F<-PFePW*Q;6({POiep{T^IrrFSyvy&>K~Z#z*E
zgmVeb>-&yPtsg4^v1d$KC5PyK(#yNtJ$Dt2Nq9h}*mlXP<JkgK13PV9M$j3{9DD?N
zLB#c7Fg44ii0*Y|!H$`<ZuQ&sQy4dI66zuKiAw=OG!#gt7+wd68Rtw<xmEgiV$}ZP
zsjau$GS}?oe3x+%d-0`+qL)wV^|M9#TK%OoybB`sbc6EK^EDm!@9EOJ?|w!=;;eo8
z4EwvP(b{|}gzL*L5VfWCLnFA6ypfDf9|9i~?ZSj|eW`DbSKl`OvT|KN?0VrN{fX>#
ziz@;}!cdsC55;L@_Hu}hBE`<P9&n=3RcI@S9H#SdA#+As(lm|GAghE(K-*P18g$JQ
zCet#t%Wro6(?IMj<DdM7YtD^UXWh6n_lL)7A7Bd~Y4|6m7I543Pgd9;t+PJB06qKf
z1Mp=s@_&B-54AF$<ft4yw)yfu4nOcmp2IDq+IHBVoQ$LY`m3ih@LTu^mMig>sI#1(
zzvTZ1{G*KjSq}-HwY`7Jv#z-RE7$B<fz`j{(_!HB{Vi!M-~TW9KQiF40+Sakm2&%E
STYS%0vokUP>zC@?iugD06h1xx

literal 0
HcmV?d00001

diff --git a/external/tbb/rfcs/experimental/parallel_phase_for_task_arena/parallel_phase_sequence_diagram.png b/external/tbb/rfcs/experimental/parallel_phase_for_task_arena/parallel_phase_sequence_diagram.png
new file mode 100644
index 0000000000000000000000000000000000000000..24648722efc8b901befbcbaa1e0be26181b93b73
GIT binary patch
literal 124339
zcmdqJcT`hb`z{(Rpj)JDK$?J9Kn3a2LRE?if`IhiJ4g#PfTHxGB2B6w0@9@S078g#
z0@4zShF(IXg%Xn775BHlZ~xA{cbqeRW1K(ESz{<8St~1ZuKB*te9QAB=82a2#XmUy
z0D(XkA3jjg1%WOEf<QFy&rt*KxRzN|0)MD{bk*;HDuynv0WZ!tDnC{RfvS=&oLHX)
zUY~#Vz}N=_`qP*4k7~|=CjbN@7d})`ei~r0Nxb;w@)DGvB$?Ptx-kJ06SL=!78`=!
z-qg5$|DF}sueuHue^t$gjKXBy^A+_sJEWDaSAC3TNz=48(mlSmE%isGPTACL{f=*=
z)ygc7dUmc(Gxl=`rd-fFh3JkxbLy%YI92kjsTuLuR|BfHJGwjPIJBa7_wMk3jN_-4
z+@hA;z-9EX%<}C0KY@|{ecb*jKP~_F3*axymBowydHIC*-rRp)fmp8oA9d1upe4#~
zX_U05O_n&CXn>{2p9<e0{h%jZIqEZny_G-p@2R=?G4GJN`4!%zfbyWj@&{%Hr_wK*
zT|ci>1pGImK=cI3e!yMaUo)iwi7+0;BZ?VzsI7jyY<=FVMrIH9SXDe-t4`(&*IEni
zLhhA=K<ULHJ+{ogTs!sGKu;olXhbrOuAce-z3yD#X%U7Yt`56pwsT4?SzwUt3fmt_
z;4G;;8NxXbh$)67P_X=e?=t=GGpZ+uL8<vHL9<4YHdXe2FSgZ_m#tJF&~3NbW<Mc?
z)4==TvEqs9;&41;!|mHzFE9090CoI2AIPJ-`GCH;z@`4j&!(S|oIT^jL@sc3?!WH?
zTy!o_{8rnquNQg+DqG*mKYE)4-L&m(TFJ@$hi!%bWZZGk4LV*csu@kcAlxb<0DSqs
zj*e&NfjeMPbpiqzaL&Kq1%<l+9~lk&`HJ<ep+(@0V7p76pm1xW29MdFrhCJ`FN?HB
zByvR|ZcBO2WyxOvfkZ;?&1uSND-wMT#Nwnt9bbUi?f=4#8(I$LP>>14R@N4Lz|CD6
zvR+bD?FbAZQu|xxL&wPqbK_pYe>nNmq}Ni(eZV+hx9;=_I8XnVb8jf;#<Uf)QwA{q
zfeEF%z${8OfmyUk0pI=aL;uF&;K%K+7lf}@w(dMKk^C>`{Qh!Ih3yz^yTa>%TTLs~
zquq7Sets=`cYSwxP@@9)`b{13Y{>4Q^PzP2=BWRSm%53E`U#Qp{c|{UgK*&Ppj1un
z_1<^4^xm?IJA7;iAU64|I4G_q1Pt@%hV1+b=8+2!A@oiiYvwA*XWVr)7@lu1XeBQs
zDdq^>f9C@~4k7MOCa>g%Dctb~$N9G+zSIYTZ88`8jb?;+Q_FMv(>)91gYnl12RNRF
z1TDGk?k@L*ET5r=TGBsXZt}OWY~;3wc@dKoNr%3(nQdXh_`&?aOeub0*rCnNPQNe@
zZ0bsP^&%QGAU>=)@A@<W)pR<KEAhFy0KPL#$b7xMOrpwTw%KlDqTIQOmH4NX&9g1g
zYL@Ly5cb(z_%dIY!f5HX)IxxSo*R$#*r&(FC9<*eZ|G&gr$KEPaqa@OZ-mz|96O04
zJIDJQ$>uE(`{CM4REsh`%hy@WeRT{wQI0u*e1V5QqY!5uGh?o}w&L<t<EkC|T=B~J
z<C3d>P&%K?hHIzb+f-F-WgdL%{Pp86&R(c?lx6j+^IGVUFf*T+cFfHdG_L;Wi01z~
zn<TgMpkzPkIL5EiJ+tkPKt$9&7Tu840?N-g7mTRx4o>9AzG)@qLn~*Zcz+IQ2*po3
zj`;*);STmfco)MxM*poD<AWC!3@iJM#T)PRwANPT`4`geM^tnL<y$nkqf_y&ajdnF
zou)e${1b)vQ%Gg=6E+NSH%=sOBiZsJNB^_Vv#fi*?4O?`F=hDBD6L$+f2%-RS*<FJ
zIX@RN`jEd6ni8soVZ_b5?7S7jc$SK=YwVF>WFn5IP5}<H6z<8313s%6GQ>GDV>hKv
z&Aua)(-61PADW2#j;gX%KZg2ajT~AQYPV%u{Ba8FGr5%-GYb19+BY1tywvc?b8O4$
zdR6Uuo59Q*mB?<3<U5P<WnM^302FKYjCcK$rMr(&WSuabp2e`}9M{Io5X?wBV_2-s
ztyJH+=%_oUZYAQR=BZs^&=GM~WU^(-0n<iP1xx6ze)==GAVj8_$Xyl->>c0F1@ee7
z0*|oMs4Zx}k*fc-zmYdQ;+f8gMVpl?dmWF0H?k>)>9O>)A00YBQyDe_780cD{r+^>
zQ@&c?*>*4o-m)_+P1~0laJMkX3dgnX4i(7W<CQ(7SETj0zm5mugM4`Sl@&JP#s5JE
zT|BF{pDG->0+=k$<%|48yUw|GeL_5Tw@?_m_N&>Sb0-o1XaA^^;<s^E;i@~B#_t=#
za*>bu|41L;+ZFwyL(b!}Z#Rp6K7im3F7vP~$g$WPwjrXL@&vlCAWx2V5&P%g-}30v
zI=*2IVBMPcaz2iUbz0y3iT@M7DVI#i(#dMSkupyc?J|wpgnprxGAt>eW<O>rU=OLT
zfsLx7^?L5okozIBN;vT<(J_2TCUR7hpUKY53(n#mhC~Zq8T(vmL?9$|vn_V9q{rXL
z5e9Fo3wFU-Eob~zgP!bvTl~>VHJE@>&>f)m&7YonQY!ks+E#To9x0J&R-ixsVN==-
z%;fQkEv|L(twyr~J-yFB$!w_McT23aWfk<L&c#4_Z?oE)JT&f(tqS-tBSfR8{rG47
zsL5N$sq_kmRwi2p+kV$7tGt)`YR!7S;Ni+n5W%>8QjZi&=X1^mHck~eXFD%g<Ed_n
zl|&$M5R>n2oITrnne!(OvvL~c0rMKdZMCJiWa_55IusPAwgE;aCJi26=MA019$4uw
z|I67iG38^Yy^3Vdzn!?iiBKk<><(83>n2Plv7<3R%+O772X6en=9^ZLAx|3TSe|)#
z$Cl=~(3rS()s}w;>r8k=7$s(iJASI<GBjLLIQdD>Q)iaVwk#=JIw#f>ob5MZ>{q$9
zu1{QaL8~bo{#w%xYxdw;G(0l_vA85`F{4u?J+U%j>d7^EJ^{k${s}qmUPY^;9!Q9_
zw}6ENniOSkW;Ur|Zz#MQC+u7eCCBjRtWMV#-=;u9<^ZAt^?XCC_Sl>EnCf80M|)OD
zd5^}#JeqA~Ez_g<R`64;Hkf+F)Pb|Fm$}p3#&p-a3}c#Y?o5@)B$AU9wRu!Ry|bWt
zK^&it{dykqiqD>uDS!<d!PvUV31SxVLCt=NdlB5;sa77`cIY#*FTK8(O9ezykK{$E
zSuH<JY(#aZJC&XnLvfY5?wx%ms4mPW?7U}Os@YzeJbY$wq6i{b+en*G@0j6N<~Z{I
zwwVIa_dx(oBp@aJ*oU9hWxQR%Re5{e;d1>zpmfju%9gF>O`X6lZlBn=>GiYKrV0Bj
z?ZI?)#0DMOK>8pviAljdPJ&GZ@{Aii$mROID*stOLwxZ*Nms2FI~+#Zoi4cEbi7`w
zVNNSk2K9Q)!PURMq-(;Z!D(-muZ3$Tlf2yX2OKlBl5Ryf6{!vm(Qrz-J?L+;X>r~o
zWox0NSNDZn@JB7<Fx_C<EGGmaG>qQBPhmmS<z*{<h7&KYw4!<aS8w4glL>b7lGo_*
zx?%hKRMQfyV9Le9mneF{1X-Q^?>RSxn^*I@lwV1|xoCq=uy)_AUcX4I(jpYB?~NTu
z#9Hv0pe0f4&x$9#w(RnVk(?fElh&S&mO^wcDw)khJR0HWf?DhNKA{SBubpFMF4!xK
z&|((Jc)V<DmF1Wlv|h4_WQ2D{V3Z!o4?3JHo}`c6_1x1(H!)OYD>nrspnkZuYPUMJ
zQB|DC+k(H-y?@7^?kvGD_NaAo)_-2!L#9+Z030t{*6`SM<L)tWyN1my?!qG<1ed?r
z*zsqsD+!Y^_JpSqVZv;ugW(tG@3-X2n3QX`TDT1dv0CA6f+MZJFBFf3QB(HVIv0Wy
z?=gP@-?wPkbh5TW27WA-m<j1wUx!ked2W75?$!7#&8{JMUv9n<%O0tdq)A8FG>Wm;
zytGR7Y5n2Sk3`+{1wtpBLdxgZ9&d-pL<1J`0fzE%+B?0Y@Qp_Cuyb?zy3GD}Jx=_^
zSlh=<T0>n-?f|gF4A}&_@*ngOxa%@vbS?za+nPyypU{auaCbaaUyU;zNbp5{ij8Gu
z03N(J_>cl8rT&5f6Mo-uD+&iq1?y$gE4emWMUu5V=z_U0tAxo?sSCa>1jH4zbH(`4
zm5IBFj>I6cNc{fLIN@Y!vu&d;8xtx9APVt>+wJNv_9UHai_mW>e*{i)9~zb!A@R@e
z;$C)lwr<W(hW=Q!W2l8p7t}oAv(gRDk5AOg8o<0{CELJ|G=moG6BMv`*vQJ2Rqbbn
zmW<8Ls&<*=t*yy+xxb!WJG?5meEJNsB#r>V4>D|2xlLDhWfLInH_z{{i=R5EqGiga
zn1c*8clq28U49qgo;U@E3{prNNqt&D1)KL23{7H_79?pP#a51kPK%cBt>0@_W>e#u
zKz|Bs>k;c-Nz@`GxVq=cT7V}CH7zS3m!gaktBJ=!Ky+}19Xh&E*$!J0^R1EZ5?S~9
zF5?gK9TI()zZ%TiWyYA(c!-JH2rV%!m3ByvgBfIy%(0D-N<QHdqTHXv3Tw@tKRZ8}
zdNkdbm9$5!w@l}BeOBkAS-I%sA+~ufJHCBfk0869E53uHqq(c52j1dPE<cfD!<j?M
zJ{LnWQ0$6v?d92CjoG;5D4FG_p82)aOxddB0_kA4kOSgo&2ZvIT!QYmV55cn{kewe
zkD{t|VWxa`=HOBS^k8<<;8LDJ6*O&nu4{&srW|i{sm53FSI6l!S;Vjjwtqj7>PRv%
zcL}jvjlF}9Lp}8C3vIZ&3VH8Zd-48BnP$t{GBK)d?t^4EPuTpB<1fsS+z|MUdnNz`
zLC{Q#5PC_SLm+Jp)P@Y7*~Y{PI}}#YGuqS5)a56$^T$hvryUWbAF?RAy;~C*X9{D=
z?l!~ftJ|y4NRfoJl#tV#pSsK@M1bI!J81QT7gz5g>#giob$4QSRPySKBomKTocpzU
zZGN6pHiYgxHQ(#rq6L2JNEw09#>B)2{8;gNW8cVoAzxy`&W=?WEw}oxWOqYO&+&#T
z!WeoRR9oj#@0gB?fu7YK>MC}pUH1|a1{eRiG9zt>m|yCn{j5%|V=H!Q@VtEb0g^vn
zn0ZI}o!Ds^Y&2B?TkCDQ<L<O`*?VuOtw;Qfv}xa|w)MEGuELU^m#?N>qFK-P<nlAG
z551Q4=Z57bO)8dYGPbkjFrHz930*uO_8pxAhlL907psH9gYt!$E&C$b+T+O>Lq4|4
zJEC2fM*A~h**8fGYKo$%ACklU_jY4*)iFM*A=8(kpT+W%E`=q>EyXOYs|afB8Sh#>
z$gnSNknc}~8WeI<<#8SPM@3vNC`l2%A8%VPZlKRhrjj8m$PN{GS=<4KUfN(<aEIeQ
z6euz+c-hms4%|wuJmm5f3@cNg4mI3U%x{0&9(D${yN%KjAMir5?G80~#n&|?Bcj{y
z;1jOJjebrF0D@t=LQ!<Rd;cSB95$7v^}ZQ1s!!wqZXNr~`;2+l-AOaO^_IjFHio7I
zGnn=Y0v^Jd>MV}TaTUKK`azpL!lP)Pxxu>CVj7}{BQAi8#UktG-uT2meC=IDiw&g~
z4uvE_#@0f03vmfS+wyE8a`)z#G*3#4&1%A!^wp-5)o3S{F`msbBdlGeA7+2KD1@8i
zyG(^?Z8OtYcndI5{cMXu;4kLd?!?xUoqppISQJmFv_JwhI$9tN%!1}Swcd32O!t$I
z(WW%Q)ptxX|2}(m|HxL<=4uv8yH!jns6X^uB}@OCFl$DPAG+<zDG*=WD!~l8KfY#V
zKHd4jEUQ$wY4PnQa_XpEpS+;1c&uZ<u|f7lNhMN!4yDcS)<1+(6@+~GH0v(@fRbf!
z2QI#;Rj_53#nyxoH!O!AWm^J4gk_d_fm?3lO={N#@q1<3w6YCj{N=MbSlTIr58PBB
zj+iUHA<Aei5q?%^CdSBIlR-4TR|6woD#osH5;}v~Rcj&6p|I0KQ!8IK7(pn;c~L~5
z$B3<j>NZIf#ylSek)>nDnaVk)UR0Tg#eLZQVi~>NC>ANY%uLlON6WsWVAg^m+BRLY
z<M1;&5ej@q8*C;~?^XLo%li~kN+^+rwT5+HC3^y22-bI_-+o`7$k;W<8g;AQXS3Z)
z(3QWK6D{G*3GAPkS2b9zJT~{j!;Guz1)Gks%JpMGJML`#^II$5PzRnXUkj|u{JAmo
z*;x@j+oZq|@X-0~S&f#@J8e3v@B=GKMMK-_=wV5&3-|`BMS!)zx~6-Pl&p5SLtF(*
zm|_{z&=mj$VtJ3G*%9qan`+;+ed8DE9R}Zj;zFgvTc#xQ^^gw{#Wxi`HjK%XnMZn{
z9ixZrw_S#+V|l*XaLH!G6cyti&Bi=Cdj~|TvBxWmjp~+ZnIhjLm3|Gf5m7KKyZ|cD
z<|5y&fLI0O(@xM<)48gKiLKXVlH6!%SKO~1FU^{rObv!RM^nK<zSJi-Ct-~*FA9?!
z3k)KSlR%*IT7oJ>Cw^R2QTSkQOxv;0dnYtVis|W7XR*`}&3d-?F6!7R$88(b@5@IL
zL&}`kY$cjjBf1ZAvhm6`169%lzmTYzhs6@z={i!$7ihf)){yEvT&xVO+dZ6P-uyOA
zyRV(ctEt<byz)X$^&r(`^#|Cxn^mYkWb6(rDhi|!h(R{<pSk)yKiwu^zI3l7X(icv
z(cWBE+<~yTmnTE?2*#f%OVcoBQgzXm2P>iXl(qpuVD*t5qz!7bZHgrrgy6<{Wu#dV
zg;R<Phg|b*wFQsnIpL5P`!&^y3v6_}xbvR^M&{ar{SDT0ZN5k-sHo8to8}&WFRC6*
zhk$wDTDw<hg8&!gI>PLzAo5xH7Y@Cz$Rf%uHVE_NP{2c8`-(SOJVnd6O(?|nGjQ!%
z)DAQ7#G-Tvyk(7a*|At2!<{Ak)@)`9DBMCI$ETl8^OaTw3Kz914Bd{iyxg#f%w6-1
z?1(8IlO0gCtOi!c-SP_>Yk}tXIC#;%n(NPW<-L3`#DK$1u@)V42DF;CI?sZL0k4(%
ziU&SywcM8fote+dawP$Nmi=-<78w_GCLHqAI{wovPCgE@H6tUmX~yZ{X1K={+qv)I
zpzNXEVygvTT8A51mid=5;8gVMypUQdL>0o2Jo#i7z?O4{tmthfZMiooeE=ky8r)9v
zVM~Elan4@uk421{73G$=DC*U6o?xH0U~6-xBD1#&>Xfk%q3>9=mJRdP@Fp}4>RreB
zFipR1!M3uVM&$CnITkVK@m|^Yseugfn$am`Fo`QzkwsAuzaF9P8x+Ui0VUw=3nwr*
z*|w`ydJ%KW_NwVc0d=140kHX4_X3NeMm?mAV11HfE>u#0tK72x*^tbNU7>fZ@}3di
zqe4ZHqbKS#C_P?FcI{)Cgk<KUnrHW`JlR%OtfNlZFgWh7k2@>gRk8dy76z4iQ>PcT
z&rE|rvG~3AB#&T0!Npjn2J}!fanm5H5Z35HoNx!~j(d7lNwr~QQrS}rspK@~_SW(~
zJHfV1A4s)4_-@(3Su1Z2Jlo@VVLztT+tiA-=FJz2UtuI;w#Sv@$+hCk%)|<e|F2xq
zUQvy%|MGBdZi<>Z3qln<z6CS5teqHhgmOn<wXR6rCfG=!2A?sroW_1YpFa~PlV}Z1
zU0cke6lm-UhnO1{uCz-zIkv?y*+X{Qv~@N;u`mOcq@*?!cgM4Hf%L{+`1aKYwYtHo
z=DsA%d^IagU~mbW;GNLJHG}QzGg{wT4*es<R)O+`R|`BQWaQ_84O)8XonE!B=ez93
zg^jfE_B8|FQB+`?jrm@6!o-#jHWYaZ^iB_)KIz66uBR>UH*=+rk~P$J4kvI*@zKlu
z>i8+lh1u=iS?UjlbWW>`YH>|4?W0O;!tOepU5A5$Z{pR_M+3~wZ6NRU?<L00Uz*E-
zz##N<+m9Nq*~EDRcd^tF>`Edgm|j<E{~QQQd5}``xjpHQ+h)_H=MgT5pVXqHv7vN5
zuQFk=Q*Fm|vKB>>PO?aSFSA-bEX?st;x5T8ei)&Nwuk$Z;LuY2UyyfrxRxr>cMPU*
z*h%kDDB6~#^z3!>v{dtKq_xpJ=R0#8Dn=|g!^`#HMec2Go|YqSS~dk<9Pfr5Llxdq
zxx1J5D_0z=uvQnsb+Y2|M7e32+gz*6bd@clF<Bjq@r=X776r^&%*6i0V;<J0SifxT
z%A;U7|E98M8me9geQV3W3(8@BWW*V;<rh_*?QT+rb3)f)+r~_{Z+HFbw<L)HCF`y~
zPm9)xn}q=GuSs|w@kcO%&>faGUF)oeADHSG!Zyq+{JKC^Q<XxOTM~CLu61A|Ljs%y
z1nL@hSFAdezsJI7dn>ex79=6LDf-^y_)6XLVT%Ot1Z=2ZxIHW7^M@(^+ZLB6E->9S
zLOlQsj^+l8|K^0F*C(t&P5>sR?5T&rR&TTLrTybwbzw`-{1gAY-e2q$cyO~tPJ}HX
zC8P1KAsleqM6Ql!mv^^#jhkw<LoiInw;tvMZ#9)kc-;Zo00K99TLX8gk1GekP~5r3
z3d?qw?*qA0eO{w60xvP2zls^2SABg@(X!RYy{|1e$>l%uMqbwBW$`WpHgBWIi2>cp
z1;_rGO{Nqq?$F<JM>pbNgrMe7#%FWQey;eN?5tLO7roh0&IQC;-?h>6TvP0IK$Q}F
z`E-)OCe6X|Wme)#skwlH@-SAz&EQ&-9JZUy`xB-c_zMN|A^_0%e&IikVC<0IYFudM
zkh_J~*qOG7#mTS2eq7mWp>u6mGi*N|ubqjpF-?SpRZ?%-gnJC<$WIp>LosGv(0r`?
z;g1OCCcQc+)&V!G*}n1b6v!Z7o5woloY=eUm)DOa;9;e6pOc<m7LN~$3z_wsEL?(&
z;|DQyu}p7$ukmGkQ#7p=r$)sMU%|$=ONvDY*?Iq6j*i>aE&j^(*sE-Py|i-cu-%h+
z^2RYYl4dRCT=(+ImKKbRTS?c`+?g1xzRN_uCCB%+U%!fHR7<kp4<PO7-f0I)91A2)
zErD&Rqo6c-YL(E%dbCGB_l@3I76Fq`dIsX8eSa#Khpl~&Vri=|UatxY4{fsQe6guR
za7ikhO$4)UT=%UOrq9pDdviuY66q86eA-+OQZ8~zeq6H10P-CSeia}5CFYx>oLa)`
z177%PFDV`rN*}$pv3TELfQ^mj7e=`?rFCI){iP`yxt3;tZe`_qWwE{@>4^|&(BMD)
z2lnRJE$&6J+A%ePbAFVWZ+>|1faotLI8~xW)`IL>!ChU4KpPP}U{}r?#C&bW2pOQv
z?qDKRTJQPvY2EWl4<Kp*zOGK!t)KW5@}&a3e|~naj;2jGQEY{dQoYpG-up=@c2kG+
zYb_!*OBHl0dpy<svS4Ehn|T{=dOHJ8zt5y4JgDq3_$;C}R_Zm0Y2MSD4u$9SWW}N@
zGhc_u6G@>htf;kJeQPrb*8a=9$Bofd*}uZ%v70S$tp4)7Z%&B7U$vXBuIQs#X$sTk
zdG~|nOUsk1E2UN;sD5`gS)!(N@&4AnOyh(KSOFg#{4{$wApZS<-9fU+nP)x`Cx#s4
zU-abHDLuYo7re}z>wwax@1+IlTZowJU%S1+6HUEly}fQ&T>j?S_%qU1skSU2Nm_aD
zSQ4pqJz{3re#y{~PD62`#9ZGflEM9h1sDf+7o#x)<-KWqCU$HjDuRlmB30+(xS?NH
z>3e>-w<%bavz^5F1ks);H>vwvK+?bxx-~hgF7j1dkMp(x`BeDrIN^7;J*}%r2Upn!
zo&hOadPt<qvV`CI_cE0f)z_juGqz=|XpnQuknBcTnFQX_+a%!#A+~(guwzkl03xfI
z?AJyWG^jZj<u=nO%EdgOx+?v(nRux)@nrs#n$fj(o65=jYwSFsnETq>^9+$j!)m-6
zsM6^mFMC6NR1?SN+p@FE*qa_{7Htm3RUUBT)!<plSi^UBn_tw;V|P<cJ!IsbjJOc!
zYJ~XyH0+~F&anM~3=)k{+IwhFX(7M$q9Oej*n{Wjo4N_fwL9NJP<u~%CyXiQ;3DSg
zsM=}6ZFZ}pouxZzHFy^So3v0U<R(E@U!qL5Z1&Ua-h3<$y)g~#TVFbU32~GxLBXVN
z|J5meq~lfJ%0OJ1u5m1arpzBE%s(J#+t;Gi*T)+nSVGU@wQNncv2u%~u?BP$mw~*P
zjI^hcPqH=7+W1u87lhM2z{+AbyfHESe3ry@!?B$!7i|Yha&4hZ9{|VAtppqwKJYl&
zO?i)T0Rl7+Q@5o2Yj8pqt%uJz6TCG!jI>2<8KKj6T_@g|z;18Gb&d3UVJvXLaM|<a
z7M@1f+BCFCEg|FC$cFhz+Y}-wyOUCtfS~(}w}C>GEg$YaW>IHvF<IN8kc4XS_cY)D
z=ixQ7*cM(gk~#S3P{{3m`1zX-?Zrj-Gd#~(`qq3i8w#czsAWz=i-{d4J)E9)g>zF4
zo|XoW-mZ-mITmiapjV!srU3#4=CltfHs-av{vf55d~N;9Kaxlj0M3j~*V!`EWmAzt
zo_sPzDjL^1>BxRzf_5~*;Vz;btf!qs#novAmu#kOxlq|i@PsgRoX^pQ%BuC%5*sdv
zs~G;QdKF-gNXCUPaAC+b24?G6wuXdlG^A%KSe_bHLTM-pJmxMiN&<<zp<PgPdTKpT
zGHDAf$ZBBgX<S9sxgyR!xaP~gusvz+Z!T+KDXGNKoMA0Z8gs0W*7Gmt&k49HaKrgq
zUG`G{k*6e+wmxbt@1kwnHI<zHVXn6C&U_Ce&#j*21)kh#rEM!qIpm%O?W0TDDxx=K
z&WTPP0bQGtz2i$^+EG>FSdZQ6*h*G+=aJ{pHqVGaOJv|tn~qtU!|6S^`$+$O(xgjK
zgqd05svupn5XedlRc+t@Q~A9#t9n>z_H$x>JDJcv{D{aDVIUg7qWlt*=ULWupI-i*
z{B2>_x9A@M+#E@hF(X|ne*|gQ%DR1=vdoT;@GH<w0(CeAExu8&9-U$fdHF*2yxvRe
zgd~JxOn$F4d;iVv*Fc&Q;*LWDk8Eu&VU#&0en(7UWDEAX&~G9L)dj+#O`fd7Aa+@C
z(02?WG&I8LH{)bEP04s3z5ShL)k$tb-wf%OWYdj)nE;cz?&}Qvm=mbd!d~v;Cmg6L
z;m!v-+8DH%y#y1u5^v^=Tuo=>O;C>M9L5|=f<G{W<B@A_{;A46wKaqNve?=&Aag3p
z4V4wRsMd~B^R12LNe7zgdu6`0DErkEh~sW$d7Ls4Xl|zuxHy7V_b!mWI1cBOeGjY3
z5=EPBUmeyG2E~6t0HGyfkWS&vi#et`I#(9*?ttCpGR_nr15(qD7r(^s9ZhZ?ORz{(
ztS^=B?Y6scD@j-WRENsWPx>&REOHbTb{JJA!Pdp$b31XLg)AN{ym!1G>7EX_Aa0?c
za^^8l)$A{a@^e0yPG`f}TYN+vaviVOh_yk4jM(t72P>byYtc9xZEz9vw+Yo2p?FuR
zq`TAYQm2Bnzkz*#z&sv2g=l|@Gt85bedcwwkEN?U!W(Fs+7~X9QTc2NF<L7_+29)W
z+R{x)VF87k%#LFo_{uO8r5BuvZ4Xd&sZDT4*V`vG?@rk!*%wyPS=P`?!}09sT2@00
zJgA}Nj_XGLSl%Vj6D_O^8R(Sv0(B`LvIuOEJhP&ZmeO;q3m>MzM#FU5@(!B)HmcRf
zCI0YB2mg-iamOE-;5Wywfkc90dEc|O2v7^7Sco|m@oNwlG3_3)M?lEU^f1dOj`h7f
zP*gWAAp`LL^zufWm37fVeVtkrj~GxVvuPX1kp~O-ePU&5WD!@~N11w&ouzmr2B2@Y
zo|b3R^#NVi!_c-9*oRqKq#bGQ+$udUPSfm&-7tLls*@K${;^96;wSk%I`hp3$=<S>
zA6Km&;q#;8Igp+u2V7%ZyaQniW(iHgieymd-=B7$OT^HGud?l39bl?t+;0Uc-k)le
zdZJ=5;m1HM-cm8PI>ihQfkUfvP<Uh7X#d-I!pUtEWUoNz#Sk~Bc4AOaC`sYiNqvRn
zF>dh<4}?_?h4>|9oK5@9V~0|M@;+|;d6lv*Gi;h>^3jX-7&D4%Wy<=w0Hqn>9<CN^
zu~bo}Hf}1b{9BPr81M|{pfN(?n`jZL3TAOuK)s4bH^mF-QO)|sa}{nE1fRKA+h8-4
z--zq3hIk|I>El&p4PQZIX(KFfzuhWf31ai2-$ND8Z&Atx11#t9x0Wj;RTa@%4sv}_
zT4%I0Rk>w*=uA|!Kt*GIIsJ`oj<(e=EaV%=cy{q>U1%F!yLv}3khk`hH_W}S&>p`C
zlmhF30IuMxTon||@*ES8z~D#hqz@IjBjvqTm<Cj$=i7IO0ILHkm?321fn!pSgMG}t
zYvGhaK~D49M|f0uanaN#ct%tIs-O8wY0`|}r1|46JV@k^IiTxZCSl}Nk>~^2zN~Pw
zj`(9C5iBI&$M<5cVLp_gLpHa&dbSNLIv_g$UumitRsaV})XxTceXyu~<3UJfQe|0Z
z1VR!v&v-9{HC|t{XSD4$fK5zYBqE{aPdIt=G9T)?VRpRCc;dcl#}_n7caEO@Zh?r<
zdu`BUoPv#)DYGLw^kf@RGiqeik{ox5?-=&LKWJKu|E<;p7$zWKaeda^gC9R1kT5dX
z)D6H=!^>9J8DQ88bOV7R`RK&p%XaODaN$qnQT_&i{IWRXGd#$h!o*(%G$IO1ueb_o
zlo@W7)eQAL+E)#zGyHiFfIAm}h>@;WmHO~QnY~BSQ{C+56J~Tna&nOG%~;-z)n~OX
zxk%;D7mfW#C2h#DBVo01GjDHbRO|ZGVZ~uTR<AR2h1FPhMb?IF!&&_$1T-txuXaNQ
z(3*m2^hTig_cpmL0itI7vNH2(<ZD75wB@AW2jyDBIMq6F-1yMuYz&*k@n{<CsnqH$
zb|oW})0Yd60($%axv3JUsG7U)wua3-4)bQ?3j&G}1+McjsBwurvc0!`gbQL>ct{dW
z<XD)PjrPlYkX-dr2MFUnmq;71*Z66D+)fXT#aYGi)_L&H{IQ+wrs+LC<lh&;O#wqc
zH10P3er#u#jt)?E(;`H}&;N+Uw(9*ZRE!=@*T>1c!3cI?i~A@rII2bC&bGnD)VeGl
zjS!U^I(tN#O8mAOvcNh2px=u-Ljf9OBGeBohw%Bp$!M$Yx=9Q0mZh3Xk-#Zb_DjKq
zE1ZVNSqR#Ffdsvu^%B!Pns{>k690#D)pO6fE-q9Y3tXGvr8{h@uDPLp*apc|`PH;}
zzPOQV=Za^mf2&8zMIWH{ro0J{V+D*^_SSZ2)uz4btO^axNXq{H1VHIpYShxNO~~|w
zHTm-2lI5vmRq8&jW%B*(p34~Pv2uS92odOMS_^y(f^WDP>#){Y)~lG;jydGFselDS
zr{b{4t+TwKCw_nJpu9K;^>vrwIBmIY6@%OSJm+Fa>a>aVV^VPnYJ1KF<R|sQW&$K3
zo+<ja%jvGndle?nY}5Uw=&NYqp;jUI4c|=G$vZf0gOaUSwQ@>aqkA&INc;@x(YPO?
z76UUnao^iFAx?IM#=&&=GQ78CK94D>dClev8!Yu2Q9e=pX-o@z2iU$m$=G)L8yN5c
z=HN@VRwD}rw}Z2@9jHdSbpws@&s-ZDwe$L$Q9v!N$dQa~c@%k9$OJ9yA=P2*7FWmA
z<aax@gl#b?Ua1uzf<%iFJotjydjNm>Jf%frJ+;Aw3p-j$b4+@>m;UEbJwz;Q+uSPW
zLo8IvTL&Avlpa6NNk!ycG*|a6GpI0=5n^McK}&~Q`i<+ab++oCyCLg_L|WFnO*ewn
zqdS%#OU(i?4DK2bjyIM@FZ>{OoTh(g^2sRY+}x#zRwR`m=VHQ_Z<Ouak7L2^@&+px
zOpSlZ=+j{!7832w`7=3S_BQ7-;C&$?<rjn0i}>f-br1^cf)l(Gh3MuOycsP&+*O_b
z)>rL>dL20)!UODChAM7s=t#w+!ovN>Wu|3eZ9|XcSQX>uW5Q}!fYSI{7Rz|#T!B#j
zpo+N!P+qBKMr+j8nDL`egZN&ctbAx6NUS$}*E=Dwy%Z!gh(<F($E4@g+KaN|=nBYh
z4>I$~43%TWmB<Hs$u?K`aAXy7A>M`L0c<50$=H3Y@2_IZNS!DmGqD5n!yY!633VuD
zL0_?KV8C8GZqg^sNVov|YkcB48Wse^w)KnKykO7c-SZmx?PJ(<>&ow15JqC9PHwzC
z^9E!1dW>i`>WN8~E&Af8gnYKN=H>UU)#|pG;8n=I4@drpKqui^St<J9ff7iWa4Ihh
zEriC!E)AZZ+m@w-y!d3Kc)S-<o7G{E&VL^2U(y^i9}_fywyESd1p{2A>QST2KnhP$
z{UOI54&c)Oo76Z2<*9FkOP>-YDX=0i-!Qd(*zT&EVk+BB;@yGQVV)b`MG})boMZul
zbG5f~?qN57weDLvfN5gvETI}zEcwx#nP#s<ugD?ktsR*}TsT##>h%M*H>%OnEGw*a
zo3aUy+278&LU&pE*`bmpb3d2$0wnE*EY#~%#ld^g5tEYx<^+X3wUxSTdQq>pgO&mn
z-W<L(K2tzZ$jduvNKHY>@~K;C0?OIU`1qA@$cKd?r2^s&S$4QU@<v_4VfNvZ(Z?$i
zviG(t4LID%Y8yPbHUROxtk-Q?;*Q&Zjce4~c>C<Vx$RPYH{pc!tN5bB%2Px);Rwl$
zAudqe<<lE+o$uLJ1wUh@UIsx|R}0{IYE|=0(2QZ|mXF_XuBa1J=jO?YMQ}v|Ovz(y
zw9t=meLF|A%iP_PFI9&69uTk2ei3FOzDxJ|1cCOOjp%RM)}e(<W_ytQpZnmcUBz8y
zQs~+YqawDvQf!hMAvz3h?Ac}m4c#l?DeTunt0z2f4hqvNo!nrujD&|fR_L@#($;XR
zXa7aS>mA3t-isGSqz%DEn;D4jv%&s}8)<Nyipb65VeH<Ud+j}S3pJ|TY<;TpqCK-4
z<%ZGiffRyZsL?hKbrdqPvF}_&4<7it+|;k2i@VGjJ1-i^*5bBjejtKy@+NYa#^650
zb&fDB$a-lhtYrDD<N0llY~89Mni4&ICXZtcUx^k4*+R>Y&FlJsqB9Fxz1T+a<CubF
zn>)*~jF3r-`~ogNXQK`gPzi8Ez0JZJ(@ocwV4PG)6pm~=JyB+?_j!J{FAwOUt}RuS
zP3BUerqiOPwSu7vPAi8`Qi$T~BoYCqxIV-E-ah)Cd#KA*E}r{RXm@5xgPn0lh?g!0
z$(}@~-F7-m!0U_LMp;deET?BtKQqmVG&=+g;-s38?wrV3eD93^P?`~XF|xrGFrhM|
zp*yDam&cVo`DBID%)B3JD=Z>F-@51(LmG!ndK-pSS<SyE)89oZ$36+IIz6SinX4n^
z1sI%vHY5Opv$c#VCHBYCTOl(z4Zt}5zgU=VWfmhX1_hl(YL=}k<g4_tlPw_OA?y+B
zNfU&+<-NHPt4sS~$)s?seS8=zYt8xEQLK_CRx<HG2z>6lXV>ShP&yCQFbN^KvdN0L
z4Hi5WZP>syZrbh;)TV%?3!*Rm_uAk3%=+S-C|#Pii7xKKEGDh*!>od?BBE}=kN?<C
z5R12t(*GBK#tx;<k>JIA7wma4IG%6M$F0!Kr~>)XNz{P3-%wIY2UtF~jh2<1;PudX
z)6J;wrirM~2LJ~T*!`Q=b}!nR)glir!0|=|i+z-}@WE_Qa_7FRru-_@i!CTnaAV&w
z9CEN^T{mXo(KWKQ{oyvjvBp+U-pj2WAb%tslRWadc!C4XGNb<@SvK6#A_X68J*J=8
zmsL6Hl#<;o%JP2XjdCt3r0Ea6Eu`1R9%~zjxzw-2r!ty&P98z?K4AXDE;WwH$1N&g
zUVK=t28XtO9oaP4AFFk5!07Fyc2)UuKU=>)!1q45@q-D?S5Y5FKxsXwO-R;~y)~=O
zVg49ZjyVSUeH%9?z!Qq=4h&ea`c8n<3~dzpJY_+xOrcd?KAjoYd5jAq6P(GP=fZ7k
zI*X)Nq&Vy<SypD*0w@&=`~V}C4gx25pzF)A7kKW|uJ(ilurDeN0I|cE{UE%)_|Zr(
zo1b)aXZhj4uR+hy8jnnm>&Ly6t}Yt-)uK|HKVq&6#j5@<8f^(nt_%l}ro&|W)fS7P
znb%XrkCY|6Ki3o^$F9K-owELZEjePBT0&|X{|4h9@3mEW(F9mUeV}7EZ!1s*rBFj8
ziVcKc8feF#g@-A-IciE6rid0b{t#TR2S|20iXW#G?y(Sf+g5ikdYeh8I4p6_AF7q$
z*$DP!dNZv1-t!5Pgrngwg<uIji%PtF%UxhmNB*^_TKFaF+A)h<dRZBTr_SVf`=lAI
z8L2)7IJ98liB~Eq=2^(*l9&6{o!{i9iycbR{ve<LXGLC8-eybhrOCKQTa4(?Ji~tM
z=Vjb_0OUHkFi$MpkC$3|Cr*h_M_XV8#6;Tg{a8~k5%GyT?IQJ-td?}B;)w+j;8qkG
zk=o8f4U5pDB`+dAL^pP|RI~db8z0(Eu)rjVHVJqzjyxZ7Y}i5>Z1eTmeO$)rW6moC
zah2s3Qv;~umb7iL|231+qE)jwshh|<P?eQ3Mz0l@`HM<~?T;J!?`QZ_Lp>#Ek1OLj
zcs)VXUz<)-%%J2mik<(soK>9EY4>x6YD5O{1cdqtuvw?otwiF-by-kX<5@p!qCHyf
z1i!m3U{J;YtB@udstpEL2mhOh52A}9FK1?o*~f-Ui9B-vv@2J#z?7o)>(8jxK%brO
zdfN6$$2cI(cyvk7=(YT*_g??xp>JLjVe4@z`NN&Dr)B+f>07D!5b-<1@9zp2H+kEe
zd}`jaWWNjOglJz<gf24Fr$&VSDs!J2p##`cLkg!rng(9TuE>j=z=rM(OqSngWoVFF
zM<19grQ-abaVDcE!UH!{?JZz32%fN3V7$!#kRWw@JOHTl*C{cB_pcwFn;F-eFtGyF
ze|A`%52Oe={yLH;02)|MnQ4QNaa)idpkk=B8|Lf%`szZm&#=5y@EH-K|8mP}TSTHA
zAUWv$tY7*T=sw&qZSdfdits<v%6iA-o%|`bR@*uG>jG)`80`?CF4qg(Bn{9BiLTI5
znC@rt%z@oG+lTgS9v8q5%z~Z)rGLBnaW)1}87NRjH}FHAYOP(&W#Av$DNUCehrvex
zr#4Ft=-8Z^Q@R0Yfc_pn=-QGk55Z^*oh9S*HgI?OhDMsuV@Y?^yE3yTG2<^*%J@l8
zm;Yb#2~B5uieiYemJH#LzxZy<;SfrN7taU+@%;&yLP7>b?(+9>Tjkq-geIW8d%v|X
z|96~B3_N&UW`^PiG$mzcKv<ydw*r{P;*(89F!d>l42vQcpmK`(?W<HEtE<Q`dw^(v
zKdF`U=0f!-BmYTPec2i2H5IDl1d=#tb|j42DTyQn${sz4EcmVc(gCzzHv_aG^Qnr5
z5sKd)DQzVruW<XFPF%kHTTB+Qizj=9$Ub}+8ob->lWeJ}c!zKc5a&1{`G-9N6^UWw
zKJptPGw4TjBH)FIkbyeWno&mF99S6WuqIFElGbwh=8q>Ds?|YHEX=MSrBsI82tK34
zempNS_uQF0yvXBVnJLd9zF(euoo5>Ai9dJlc<xCqj715DCC*k}CllHh?$3(*lbm-1
z$b>NaB+zOq(AN2b*K?H-02Rvd*`c4_QsdGLIbsu;epI9Q&W&{930w#YS3d68aql&y
znIGa#I7$NxKlt=mUNZO$NaTN_JwvnxKQN$fe)eA`15y>nDyF*~{Vbg>5Y3faBlbEv
zXbl5gDp1?b#Pf#a20B=>JcrND-Yw(vfH>(Rz2H2gIE)0rI}NnY1S*TUuUAc91BHv;
zn;W@i8hU7AAZtV7SA3TOj5D7HcCx#;hxT_!>Iw1gAtXB*W+ne6xC%#J1HA0re$FQM
zs_vO)S76FY(7Mx8ogm47nRq<o4n@rQ`(O)CF4BJZ>9GuC23sD1vr{|^lE$R_)A#lP
zr$rd%XIm6AYL)@Ya{BN<R*st`!~hS-@qQnC!s7pMSkTkx*Z<HxDZToqH~%l4Jbf_n
z+#fK(u}`g1f9u0K7Ww`G8KD1`7E>fY6}pS)rAhVFP&h6^)6Y+kXJMN~lsPErp9f4|
zun|Y2J_|h6<2l(whyh^5$9InBfwc=b#7|HWy(m`}%L4ZE=1z+xcpZ3l@1%gWp)A^J
zN)W5jdN2jIl=lCDzqCpxj@c+qkdpjAVD|KvA0)@O^fQg_GuW2k14qiUzDGf#@aKfZ
z_yc~8VZv%7dXs5B4RDXY4nC>hCQH4Q%-^PH?9+=t%%<j$k$;UIxJ0Ds?=OunZlG(;
zPDxCcT$%zrA2^<-{5KYaavNAO<u?0mzpWA=HzaN)wfp^84F!Y3|C@LGUmh53M{S8Z
z*)h9;j+;mk4*!26vz5wtCgYd6f#;NID%Jg_I<T*P6`k}Le5BqQjBBMl0A{E^j<gsh
zOqL6lSQZyA;-`2Z;7_1D!#UYske!K6e_$&XbMFg2+XevP1Jc;!!SxNYhb7>ClNISH
zf=Be?00x0<U$%ZwuRr-!SLWM&q8)mZVw$R!q|CP7J4tQn@*FigU-jM!lSu=cz-9v+
z@!Y_Y<&^<@x>DNJ5%b@+@%scQ9P;;K0k46X-a-Jd2`XOskGu85jusXxa3>PM5)OlK
z9_`<2{nu?lAWaJZFaNp|<^N)af1%m$x5EGUhg1J|PFnr=ZTzw}sPDElf2*T4J^o?7
zfH3-hE>pecw9u14i6W}i)w_KFQC~j=??n16P+=lR0Jg4S3&NV^+XjtypW^i>BhTxj
zJl{(*2N4AxAW#JUc%zcPVa8jd+Ij4g9iYtYT^`J&2poYlBUz!rZ)0K+P+U9+V+Fhh
ziJ$0f7&AQsLwL~qOOvV(z=eFZ{edgRpQ&%%n`xK}a;*lk{=IDsJTCd{g-aiop7pRh
zUN^La`ia^1y<1E%w0H<muTx3?)^d*jp5?VGUs0uom0DeBMvO(34ZJbj-(zd0sTU}R
zjm^sh{IWWhdhsvGXv8*v=1I*|pzjpq)ik=mDx~R2nR<?l$%!Dj&H8pt8Phl*oTaO@
ze8=7@_k-&L_ME4BG}r;_aXpm699`^Y(q`Usa9Y1;qMhmOMu8y8{Cp?<L*Iw|=y6~0
zpcve=HWerlP+fz<&u{KeT53;JT3X8f$Oiv>$@CV8_Cjak=Y(5--NWmxwv%zw;%^IA
zpuRKisP6|30MdYhI^n?1@kD<Ac#+&5K?VbMe3_R5u1r(%2Q$gPm99tcT`O*}{2Brz
zygVBBe+G^awpwsQp{Iya<Yb;l6J|TxUJaCe;D5lU^gKzAne@%+8vZ-N0K-TIC^(II
zgRe4khjCsNgaPW#T3X74fP+G=JuNZ>tm#;|<xJ8GAQR&?&uvs?w|d$w>Q2#s$~Y`q
z0I8kHRyUx+d~00eP`DH@NRe>f`8znIP!d7$yFkERNY&oRbG8z8?9!~@6(`nFJXLM4
zK?#a$Lx8Tzr-Rw(*N1>Gc60|QA!N+~pBJfW^ZSJb9J#gx;c$a8Ad2|`-v1)TxYZwv
zN=Y47AZ#wiiw`~MpN*dGSQ*GjPF>jd-<*1r3YhWlgH4X&cj;C(mvA$bn!oOW5JfLk
z6BxDvo_~n@A1{O8=CbD~i9+`C7DI|=)(*cp?HmYDmU<}>`oC_wn&7OLL;)|#@Xmmq
zy`%uG<`qCy8}NHRmw9m(0<dLDXYy~~1V#8#;$Qo`3kb88y8>L>TW!15f9`1yRCDmQ
zvRa0SPPd1J;oaU2q>EmY+3sda1`5>W<;E7Cu%qS0SF9Ef$jgb~t#3K*mM<9&u;?_H
zfyeRQTJNo*thYeZQfAGqYPPsxF3lpy*&A?}k4rOv0lx(lUIKT7&6_3uT4NS>fMyrC
zlwvrFz4S>l<LyLOhGWk3xMrJvNnF0goiQNa7$Z=^cc9*HZ&FeBm(aJ$cJI^U%uzyh
zPT+FJA|S4PoOYLf9MX*K6WkEl%b&fA9?pllq3iEJlUkvB`9xK8AW%s_w0T6^D-id_
zGV9ybf}nDD`Yc--%kT5|x44XdrXYp$5sa|45yVsB2>7~lW>UvNUy48tMdqFEM8R*n
zPNL#B?t~0Q!u{UmVe;=lhOKr#tU>rl+j1U=#A+552Ohv6syO}wDiELKUjbv}2Q~|L
zzI#ErgqfA~$aA|-{EZnOxG|Fw85RnX6yCed!-&tW)aRUgqc-A)%vYTj-@p4uqMFhn
zkk|L<;27JPcG_>bKKY4LqdGn}t#;TrEeR%U)+FE1NPS1=WAH)9rNOx}?be>aBG=C?
zKp4=t1Y^VnBUM>bKBrl~YNbJLanvOlAc~7O0E(bo2H4*Nuj#sNktB~d>TizOPrzP2
zu;0T3pdPeBN+CSFI~qbwAHP?vQZTX$Gnj~&ZC*+>eG3S<Kl;@I4X;gOz=ruK$u+3>
zuYJn$XouGr*gWqfadAl!c5wa*yFwC7*3*hd$%+pnig{mz`YaDTjCjk~7teqJnA4=i
z6-9C&$L$b6b2w^ccQOm;4UmhC3yB(Jp%4OkUTY3et8ePKik`+fDiWpvty`5~7~U}~
zHS*Ma;7a!5;X;yj+R{NN?qGDp=G`?xw*I|1%af}|+eu+rC!3Cn8leaNVN$`b3gE-L
z(=H1*#ho`vA3MKSLb0xE!7tCLg&ubCXr&1_bU_K&272;i<0IDtQ&@Q%TEt;7!D_7v
z!JX+*gu%zUv(=ne=js_~2Znqw#{Mb{I~jV1h*tZo%L-rGM2NjQXA?C=!|}?)mTyar
zA!OP<t?*#5JBWCcOAa(KtkP^JqT91Wmc?@)4guwOUzxc5KPx#adD``6D%Wq-lo3Uu
zA%<v$Pg>bQhioa6`v4M*5l#-75rqLsJSRVBdMiomm3%zpL&R9Srvsq)?X@KDTk<G4
zz+K^PKaQ$|9cbvcQQP2o!rZ}IKzY}+R(-G&U{ZRBLT=ge#9%{!A3or=n42=F$}X5i
zND9{6Az_3`SKD#{M)?l7eHZN9G#R>+ocj?AP6eYvOYs1ZE8UeRuL~zfh5ph85{{zK
z!+C!4iYGaU60x(@@@x?TcP#zeQ{_2!dz0sKEnc4oJ+b2hvLf+7@drn=rPhGk^a7we
z>MhTxcCswho-uUH@q9c*!0;1qj~d6|F&Zcxr2$(d^_2yAn;wi>KXZFaDDk-K`ABIc
ztof%PtghyCJ0K8Pi?3#U7ti2O18DDHYG(wa3L$8<5y|@drPFy*z(zssy^C!DcD=}U
zQ+V_0q}VHq;YBVgT*w5bxX3|VS-owsk`?_^!}3^njJ>i{EZJWXW$sQm9P)=Ha~I^h
zn*p-XwcR?Kj4i<5_okRlu(|M{_#b`)dvnDeHi27!PSkh0zyo$XUg@AHW73{jgiQ5p
z+n?xa=R~(4H}~q$`P1GiRwn@IQlp>frXi|9K20z8IyDNq351P#J`U&3fWp_2+BBfP
zAZ-YJ#~DWJ4!PHCRP7GWyBRuL&q?>-ddhXKRB<w%#DiR4-nw=U<(7f*_iSGK)YZTJ
z?OM{ugL0K(=~H#01otxS(*26&b7jEvzh*Ixx?Q46v|6Qv5Z*5hD1!7_Gi{a)8;1Vx
z7Z_cD)=-rPW3)$oyGol1@zuE%g}ssc&P{#C<6E&59Rha&CSdI54=x+Dnux-wk)MF6
zYv4Fzl!9tM7~u_AOS`>r!1n#HUq^~@uCgc>F=o>NuD2}+_y5+QT4otd6i6-4u_W!J
z0d!zTBV1a#_2qx<Xp~>)piZ~402D>Q4^R9>dv|4Ab-N_CY4GyewUa492@~Jn8!E7O
zIB-<B+Y|6u=RDC<9Za(TNnngUrvK$5AK<qEdVXf)T|1e+S<CU+h?QvZ$pc>2ADAci
zqTYV;&V<0JpS<-N1y&v`do8m|HeeN}rUBY9B)3gHj-hhijR41`HWgoCeZHB#4ek~j
zAFEt&9(a*6+y@03o<-=Y6r*-vzf`!RUL4w=ddInmUD@sT@WW#qQSWSl3W6tBz~3=V
z#}k#+Z3@uz+rOw{Oc!M0$Ub+q@$$yp*0D;l#Jq#H{QlFR`3w4GagekUQ?UP*=Ee;(
z@7^10P~+W|;o(QNHO~#l^HAnz-U0E{R{+f5&-Rmm4p7;5&cJVAl-rpjnj7>f>Qhi4
zAarhuKO~;yKTr39zV4^(Vjw5(RPcw&ZaFXjiCvHYX^B9|<#)y^2V_D_1FaXxnm{ZD
zBxg~trS`rpyM}HQbMAF{A-K{~-Y)j?=MFq#8rxeN8zTUs3JM@?_A!QEW)aQw=64v*
z$(~dH)s#jxavRVV_kS;!d&jwPNnEMnTD>YaA4LfhWT_wF<j;7{(~<KMT9>;PmqH)<
zD}qA*4kI0v`Kl-;7BTJ(PhQI{Y~=z7dVmO~<uEVfG!32Ijr4R94%hllFnAHM;6W){
zP(r-b6d)>jtd*l+Kl3{}E>@r<!AH3#BRW#6QRzRWUldydF<URdV&dC$s}y$_`1YuL
zFiS>UAR!V6we1S=i`M8T!nLT9e~mbOO@_I_6TD-O^?T4XNsZi+osA?u1G=0Jg~!KU
za(67=jSLCSH5q*}E5&~wzHsHtx4*-wNR4ltR;Ns=?H&SA`&2xbQS;<vMKO1V^3y0v
zq8_5jn?QInnoF<y@*3smU}n7g@AT>$nx_bwHGWyUlPlj8pUxHV)K~lhM6|ZqA2$b(
z+JG@Brj>BQp@m~sfue^B@zBb6<=U1J9CROuVjfOZm}heD0;(&_oy3Ilz2g9mn(Qb!
zxw)9uik->Zw};+_{<0!F$O%z@Gkvx6*D!B-0>L)l*r&_jEo#sc;74RS&M=F&30cBI
z%$&r(hBH2iM^ljI|Do->qng^beo;~JC}M1Y2q-96sG^`$MF9(TMd>I_q=`T%p(!XL
zO+_gpMUkR3>7Af7kt#?HNu-ICfV2b>0&lLM_ndpb@6|Eh{^N{$JSKN%?^WjfwS~kx
z7N4a*J;tO^@;Fo_baTZzKioKu+LY+VTW%~dS`Ec#)49*51FvRC&`UH+HZsmxU&yZ$
zr{-PMN+1r<bJDBSmfPJcv(6)i8n9iEWFz`{@Siuv&URrhQQK}4CwI83m`^qsDv*++
z=&M;1CAI)n?(?<7YpaN|o(p-IG0RyEfYdQHsR^hAPugPsdIk9~+b-3azpYohE_FXg
z+Wu~x7l8}o8nDBpZXe&hvg^@X_G|5ml(oL?>TjBm2eZ6uHSw_*4e6W=c5G-s#WSe4
z&Oz5uT4*hbS5w#@ce=Xez+^<9vCB=u^l^cMk`0%*N>JklQ?@1HWhx7*fE&Dzo)-79
z3N`<&yZ2v9(_HZwbF{8J5L_L~iVD_suZmq~hND+6pK3CGWYiB%i)e}SJ|en)O_CG~
zEl-%qer?L368f%JF60vlD1E4;>*vpFPx4b{M%oi)jD3^hkY54SPqn-Wo^!Q^X7P7j
zT@(Y!sn&cH(oNpsBP{*hv(fGXnf){8*gK|}>9Yo`2M7OH7X)|r=<x;$+8&=6`D{Aw
zLq%LqcK3eWT&q*###IDKx1P1)$HNLZG=9ibo|A<Y68xyRg}K43=C3lNS{V`|s*J-R
z*~_~0jAaA0n4V51&gf=)Lu5_-0My7iTi%daZnkp@)h#H>heos-*8;25tMaUX!K_GH
zGt1UhMS`Rw*5&na6D-^8La)Lbj}k_{_n@Vi;mpijMrsP~G#7o$;j6qb+t(RK-F!T`
z^3L6)oBEnQR7|ZSsGJi9E|&g^HKe4Ge=qtV`*hXXmw0XG_#3V2mU;7x5@YpIk4Lf!
zIO=FNYCdua`DH?68}M*pbs6Hn?|`iY8eXYW{U6H>e6LTn*P5q;_OUHh+v09lsXI>V
z_IZI)7*TB(dusQ!Ri3aAWd2pBbrv>rJcU>!w?D8xNxuy`!4Sly;J)eB2PI|%%!v^y
zc{6a<3-fc@L!SfYN`C!}3r<)za|fPe;=fpub<yxXc0KjwpW^k`tuZ&U+3i_^HRCWW
z!de$9N}n0sQ37R%w#BT__H8@AVSxo1yQ38CL~<E&zX;pyo9y88p7a)27g5{#;)_3T
zBq6o&#!ro+k-XlO%T3Lzf@Zn__ab*)C{-HfKkuJqHQtqz9M@TF99bRERez#M(GY)*
zoTz1$H?Qi&F`c*ReWHS0cO*ykhTjjy=niz1BH<j9M9@lEucQm*hc#9xKp{O{`qb@V
z7l-s%M~1MtoIMKbp-l*+s`~9zwZaI!lCw3q3rafkMrtD(!>}d1ON{<<x_k@a@Tb=p
zRdL<mi`;XgZSY0Bc?JcrfVC1dB!+j9WGbvkn0&GQ!)8cz2qe=pAdVDqxvo$<&?#~r
zeR4<#0)2<}yNp}rh&s|SfTh%xd=jdoiPAYM(pTAD+b@qy4RdZ^Ev!e?(r9PZP1*5z
zcL9&tp6OCPyL-o#{b`V#)QnrzhcNnQXeHp*yL0cuAJq5BMpQ+NLGTU>RIw?d<Q`nt
zu}_hwr;<Za{f^`(uP}YAHZ_F)SY{j9bCGG$k)nNAF6NZ1fr_eMpobinr1}O~vqvRB
zR%OLZ8<qxSq}mh=gyt@fV%~*}sze%w&H9kN!~8sWlTO!Snys(+qIut>e0L&xPHjEr
zVDNxNcJWS+tuhiC#0t6^@rwJ8K9B4o4}bZZk=>sf>z9APoCfuiwrhYMM778#V`Z4~
z(Nzos`}#u`M?B<$6jCK#`o&Z$Z_K*u%h8&5src~DP^B*8#G6G`E7$KdkRktAr<JX7
z19~UcwPXHE7{bXl*#u|HRzHJiv4oEwVcXtKUZCc&61C=P&U-wYpA5rmdQh`s;`7Gc
z$8j}zr8B9Z3Kux#0XDL?_bND)qVIm$+qu704$M#e*F0ygwR|8$%Mn6atS8T(l|N(E
zeN%+k2;b0YD_WzWJo&UAwGu5}H;Nn4iZI`&vS2)EyGXSix?7Q{c7cLAk7v-g@8x6~
zfby#b6&Iyi^ZLc+6Nl_4XfEHS7bHl@o1_Ug#n;5hmgyy-5BE;Z_z}_<>FG}MU6e<K
zk9nJo-G#TiPS%Kusz5|e%lBLJVyfjX{8d;60UD$JkE;b0x1SDf8h~uMZmE17DB}kY
zJV?TCAS7HYllP2j+LxpVD~ChDo2ZI~Ewy}%HkHLG6;a#b33Yl_QgDap%?Qu=KEXs!
z?pmgX=d{Mz<CUhNIf8WJm}(+LxcxQ(Dq#Ko>bGv54I{gPoHFXb%X%hAiQ3U$IFfcI
zOt?Q?-?o4b%Qx+%thLT02u9=61qq@CqFtU7Iekj)>4q^9xP`8ac|@`ryelBj*ON8F
zj&xaNPn`=gzu4|M7v>pZLr(HmS?E(~@c0z#hOnCvX>RMC(FDMdCQE50l5?}wD$z`n
z?0GWTWv|P~cLivw0HVM3o0nM{1mVRj#%*00`^K!%Dywn~$!hnfz%!v@7Dtk;FS5TD
ze$KP(b1&`$+b;yR2=HT$5zj`-#^0!N70TzyDwoj7-h&f4WgZn6;lfv9CU#so<X3b2
z85T(^?j&?S1@k7r>z2T5y(6Q`RPBN+sVKiRLl5(-ZbjxyMXtZLdu@Y_K0JNsXCJKP
zPM}TX1?HY#klz{lI^a5KHd2dmt?rIHw34BJ^@nP=dGMSl8p(Bk-YJ_=2dm-WMTYIg
z6ytgK?!n1+n_NAnVszD{`h~pC-1QkH!gZvv4Ec&&KkYK(tv{WkIAX&}p6m#fG}{*J
zF0+8Ge|g9nuR`?iEb7Z|Il0}k^w$H)U2C_BeU9ek6ue$44$q4K&uj7SAgH;1PnbKv
z5WyZV^Py@q1~W$Z8=m5P5QXis=vyAl+<dGYBvT>~9@pDr>euOQoJ#;K%Dj2?>X8T5
z_7n50+`GYJKa1BZbYju$?@$)-oS$%bIG7ZsCuaYx7S>DoCf)*tL!Ys79Cmg48yW;|
z63>B)A#EfMS|T^y_EK!IL9vGzPL7~pfahtG*fbr4F94iV;V<77-BeXl!7bmo&D5<3
zW?f()U<e32OJ92DczyJ#XNR~wg(4PfxDZ(g2<`iglMe;7?~u8Gwu)3))YV=CYd)_h
z?%iQ~hpZ3cAz@gJ^b;rDVNs61Pom6AFt5q>NAbP*kcZ&CX+xjlc0@&e4NupX-mg6=
zXlC;JYf<0nU{O2P9t5cJy3;<{*V6PNR(S~*yA!PQS~=HOubXixV?c+){VUq*CUu76
zp&@vVtsj*CE|<Oh$~A#B{3kHz#ruMHJ;i3y1;zaVEi4LNsq=Ja==puk-GX?Fh3EO-
zoJFeanl+-Yo+z6+cSY3{wVjCSBxu6>Yx0~B++!)atJAICcK4LZ+-pR3NZqpK=TVUr
z2nbxkHWOY0{f_!cpIl@0aTtmsP$^LJzuVSz@Havnpd=@At#j}ynI$%)tYV^h!MkR)
zO}FeAmTs+(g-X#I07X1?m2vT$$1e`1us_*_q-iXO{`*Jo8psBFuC$gJPyE>5Vr4e&
z>fYAl7yPC=V2izD^tOYGfvefPF5VPDuvYYMYP8z7P~}J;vnFeQLk(~c0n#Dx%*!|;
z4$I)$PuX)F`Oa!-;4NNdq2N;YJr<^7M3E4^c}W~_fwLt+Ao4|!GYn;*!oG6=YR2=#
zlac3nX1#!7IH^4LmXp+6F)Zq5Y!IeOATMC=R&KfWHh3AESIrP&Q{#mb&br$!!TIk;
zSv=2C?w|s!rIvgz5jSWG5Ok7l<>M_Zl0zfPUy3HU&?6`U^XL}OXj;3usiHfOVCprm
z4xQhPs92zd7@1kmP$7@V-c^)%=IW5(g&``8A;jZ)&|e&3QN}E$D7>t0sc(ZH8K;4W
zMx*5$p)+A!USD@3@L%d4hZ6wfrX`NwS-AM#f5XMuMA&+Om0?}siYzj2pJx8j<5929
z-aF2MtiMP73$i}Cat-=AqAPl4LyuUXHv06@7cA=Q%A-4fss&cY?uBKafTv+yN6)ct
z@R3i^pE0b%S~!kxUS|8Rdx$;xTexAwuEeOcf96>*b-zE+Fv5No3oJU~M_^L!Q$X_9
z15FRaRouk)^GgGD@#Qr9Qa9Fg`1-ks)=&%o4p$Qnfd+GBfdmll0tYTT7uL#+=3o_z
zyw=>PN=p4r*)`eDRE-3lU%{3`3L*YsBG{VDrR|+4oNTe7EPaW{8X1>7vxGn7?fWt`
zb^dkzAFyYC{_g)1&&~Sq|K^iRIt3UAKK%BSwv-dXzjYU76;w1Mhw><zwJiyyawRG*
z^lv6G)*zAyt_#*?zZW{RAi))9@n2}ZkH3mx4E3ja8|QJjRf|Wn9+Jqaf70eaj)t}y
zdMZIxr~3@H!QDkz%4u0>*O|LcAueFLAXPU{M6UbJae5K@e_?A{gOF;t_U!z>rSdk%
zFS;cDfHoX}1J+mQJo-Q#ZcT3ah4smYz%OZu?@^J^4raQ|O-?(Z3B3>)iw37!BDqus
zjfpBEA}v9?QpU4%7qMw*k3}4$Y2$WrkI+Su)C=u4zuPE<wq5eeIs<`UK}}enJmCud
zEUer{72Pbev&d8Wm#fS{TYg1Xk+Q$%L+kHxb#z5Ke!(>pVASSi<K1ZK)$?S|^qEb2
zz^;v2bhwV%|K38I%Ko=Z9qXso|M_x$J~<mr;G051xh3?%U%|3(QNWM+D;Up-*=m?)
zqp!nS47|*iX!d<$h!#4252!RYCU-RfUPi(|_){Fv8WshcU{N{=pzVv$zC)0r9f2sl
zvi^hCUov2xv!n-qrVZPbZoq?IK3v|n)s&5H3us-<NAJ}wlks5&FG)_qs=b#JG*8uX
zsm$MT<zi0%r{?3T=x@QtN@;&untoC9BuZZeY?0TZfKQrl76f6<cZ(Mg+QS-}OQb9M
z+3*1;8`L+x!$I=v*PhN|{8ZHVTN>+;AT);cKQ@n&N)$?B0O*ik;gtUB&ZjjsKwP#=
zMl0c-p|L4`T!lr#{gWdcUV1)kJEmaE6<y6GpjnHV9Lwpo1pH5CNvcxj{NGA|%6_$u
zWF3fBp6}m~m7tz9hS+A15Qiy6zLm*|_Mi{d@S4ARs?-w23aJGlcnD%daS2nj4hUks
z3r2zXf%r3FBA^Af0ZQ~kn`c!3Zw=r_VWGaJpx5hb!+m+acgPjJ5&imaeD|81>u>6x
zhp1nKXFP-2Ni?b;kIyBl1f;(;2q74hD4A|faBNLB)ycne!&SwWRNN2hK+W15R%`}Q
z9vg%LEnE$?Nat>9PhGH1B&5}4u0Jl>rJrSdG&>l)kMZMA^MVbs@wXI^Jv6_alem5V
zaL&MnYG3F_q>q4+RG!3*bFtEeW-=23IkMfz?li{|uJ$Y_H?r$BzT*bIyy(no(nV^E
z$(YhoQP|gNJj0*5Q67^Fi{Uk84^9)XA}ZaqDcIP|@y_Qa5n};c-iFDC(MaeJ3$H}C
z#aGZBqfRV!XY@!}C}9qw;L_78-ywqYAP4WxPYPrC!tN3R)r`&MIXOb#XvmOo<IV@L
z4<u{O;x>#39;^Lb2)QMt%qlQ1*}ACuSP8pzTa_Rh*rev!?)dUo8PUiVQA^>yN8;d@
zMD=<?srpV5hovVtsSXb-4YxY|8-X|Ev9Z@3MMz$nIgs*%wxdfwj(V}1I&(tb5QMWe
z-39hp<~sf~*U^k>owl<nwpN4rl5wq>KYC|p3mV<iQZHcBgRRjTxNYnBpxp>q>Q4oS
zT-1Q5%g@mdNYG;gIf4H9W%h-n;IkL^B)TU%z8bo@&(RcOR>GuoO*M#lF)`hvam~kY
zvH$$SF3!+W@D^HhNZ$8A!sl(70lc<}=b~OVEYK127WHukHJu^B(2;fS|3;(OdMcn)
z=@xB!;O`m}(gp98wHx5XIrkYrjadU6URbF{v3ar6yvMwvndAb6yg)(xU#$V<Q4Dj`
z+}Hf6_<m9!xQb3vZxtU)^(<~g@L)qTpHT7a*I<u>OqaTE3`AiKO))PODen9iZ<jVT
z&LoY;(=teaUbx9e-eEs(OvFQOaboS9C7x<IM3&u1m}p!WZEW^3vubpXaxUq$tS(#x
zAozUVAiDqTbDqE1!!09<>9rhdJSmojXUM`QO571`*e+=%A|YX}61w-q289zHITwHC
z9yVr}hUtfr<Tj1W40<jMTIg3EsPy<1(dhQ$SLvmcFlV9}<MhP{Q;IJ@!(CJi!xAFo
z9F;s5=BJf|l#n>RrBAcC8sY4h81~lzfSPRgWVR2{eVkLnITclVC%WuXIR1m_;|^BY
zIc(nW>WHtQj3Mb(WJd8s7r+;I|2~Z@*YWlYiX@PI%?zl}X_Wk#keK;h*5r)tuT<R}
z+n*=c)fYy_+M!?(k~-i?^+gh;vJZ;W-kzrox>Oc!4lGXPd5Rx_?HfvTuZZH;=16pV
zv^Aop=#cyD*XOH)jkVf1p36plJiOcqAwl$_e-M9_yl&8>SDAEXnhxRgAXk?2cmnJp
zii!lgPVJj~^}V`PJK9w|V-(AH8@Vn~0={6f1232ZuNQYt=n3DlmJW5xwiJumq70?D
z=qYkwXB?k(+$<3=Si$v!2x{aszmk^P2k|e$QA9b_<P4?A*5mllz0<BDVCfvp+Nz;+
zC~{3<etHFV7W|dp9I8g%*Yy*F5!G6X7V~=xxA>5Iitd)$#VlyefP4W=aZulhxI({y
zg2e?!3;43<P^>Gn|JGbU>+4qO-3ByB82-`I*9vL?K8fS_AZrW{o{~#wzN<pGRM)%+
zrnk2P*x->1ZTjcu4{B3C2WM#*hep%Bn$+)3m88RJM7L~snfPpcj2HtN0ryVrKQhi;
zHA@0>ucuemEd!Ll_y&j6iEyd=Z!tRSFj9ecjCer^bKcbxh-$egwZkNp``$YZ6jTG5
z2a{$zf4=r@j&O%U<mtn6d@E&E?_Qn^&r-_V=V0UmZ{x^{+%*`T5}3Cwca<jOF(N_M
zn_qXE-D{mC0**cOE7utyq-KVe(06`<vYAlOFRLsXhxhdagGU!Ep$c*IKkAT$-8i#x
zhWibt248ZaM^4cj1W>&mIvjNHFK1sj&meadMQVrfkh?JEWU%b!T9TL^zt9u6`a|t+
z2a+N=#@jbl2ZK_nmhfJ@dPF@km>j5^W%?7wW*C0nRO@szZyRH`84rtE_+3AEJ>4QR
zpw1zs2g}^q^7aA_Qv)bvERNg{Ll}8&{U{l)!g)abXNGo?4EK#Mip~*@N!?uDI*UL+
z?IPsao^Qw3;ih%JY1Ez66S?xzf1ttqe$X%TxTf2W+5>jnjwoD@#3-(UJ7+oM^EMI=
ze2T|ZNhFhj2n%;S!u4FEDR;E6(p7DTVg+_D?(0XX|09}lie)z6H8-6If&M!Fj+R@y
z1iodQ-4N+#Gc+f7c444lZ8PCK{(xu+^Q(&}l5E2D9(om5lc_^^$8XR=dG&np_QgDU
z1;wO}gs_JSSExFN!t(d^Coae?h^Pjep6IxPBtJ*Y1}I^$9Qug&(Q4B?@oMhd0lA1*
z{h)@~7l>c`o0G&GtvAfmJb5J7yr`Cx_WwptCik6?<Q(o;6=wumz7|4FOXBuYR@J`A
z8<CD6V*HteYU1)uH<}c$ylgZf1TFdAS6<OQ0$#1mOGjLiWDKhe_@?QDHyYnR>U^&7
z)OTEXw!0QmAO1m3YPMt4DS6n?ce*Zn<l0h+{>yIa_ERirW5gl%tDJ9$l^JnS*4M4h
zlqi$jet8Slojx@QY2D`W!hnV41J!(9dCo*@xM4@I^@Jfha0dF4>#R}>&8W0onHEb4
zGx>%WYt*BmkkNj(ZB@xaB{>~9n151>K$V!px0yA(ig-a!jxrtAs+->an2^Ummr0d>
z+ieMiXp~L4#}f78Zm0Li$g=}-sxm=}lqMO?)1Q$V!+n(F33Mx(HlRGFHBmb3<k-BH
zn$NP6k9qBm3rLNgP+noPpcAMWabWimklR6KgH%L2K2rOG|LazmS7z~XY8M=le?mO3
z`<Wg>T|xR3Nt%pEsr_v3VtWk{jSAS&&!?kS*ZO~?^^RPvfx_Ttw)^uLWadDrWe7tk
zq$D^q5U<I+Y77|SsbI{``=kju*d1nrbnEJf=c1^L4y{+anE;7szoR`~HmP+3PUm4$
zZ$yHoNy%hM9w$a!UB+VJDz+!U4x#^~Q@2A;^40YpZTq@k@%0CMro0>-A*UU<F~br6
z@64lwJBxXoM112Utcu^PEmLh+5#4{qy^HeSC2t{UTJcZT5xZ!++pGa%&*$<txD{jB
zOZ&E33k}N+ANfSKd#%dLRLmVXM)zpwkHTY%ueC~SWHmFf+m?#y*tZ<9>U$2E%?92v
zV^>G(AXr}B4OxTvuyg;k!Im&Tzun78NWSTM@91G9nS!Q5z5ueuhI6Clw^C99I9$m9
zZ4ZfenP-=9xDU#>4GOvObMLFroR*H8{m?H{T|HTmJLIc)%ivYK02*9ukADxYt;asO
z_EcbPFq*HDL>TnEWbIfPuGohh??@gDN(~}8*ev&B%Eo-b{3Zj=lT<=gS3wliik-=U
zK^`mpYIX1)?(#C&NAjTgh<pYIZsfkYL1!(D`$U5@zA7WQPT<-bih7j#bvG8o#t4e|
zc`e<5=uk90)q(x8HxUl}=q#`|*BXxE_%O&YoG4-4;ctM0=M-@1C&!U2k91x(#D!U;
zJ;+Mb;a4gjLqWleaQE4@hO?@*Y*rHY-_NC#lxS6&zIS9X>APG&F_G2$bLblIS+`cB
z9=jHXrse(<c(D1Ue2dE8bK~Rvl@>qcKaqB-HgPFUU(k`*R*^wLvOmRIXXPRnNhJ^r
zYFmu{zA2;>gSokDK<1PB1u3($QC1>T^lEuH^5buMu>;^-S3yFqRk-}LvB-D5En)Ap
z#M&YLK0I{w7BRtxumgGE!1o0F=PT%YwBNllcu?#wG#Vv{A6{9o+Rn=Ve@Qlm__O*q
zsb@FMI^0CsdQ;woRGJtr!pR%vpfc#G1)(VameM-!=sC?#rq;y5L;Gi7484o?SZS7=
zAP7V!E6KAeh|iQISwyF%Xq3EIT`-dK;ut@HmGKx<7fxP_YW-~&xR5%+m5cRCW|oW$
z!tV}m8i9UP{^f)t9GWwfl6-ZNmAmvq-4R@;cW(JyAYeu!eYF~ayO}QC6BAfS8vPWQ
zqF*HIULT&3C-^>JbH<I{64P+{R3>D}Ks04G89QRnL;pHPPj$X`w6pI-${^?>>1_`u
zDNpmp-@ttd-HJ{(OdP+wKUddd=TUY#VNELwR*{<feN&duqX2%Z4<0X~_Kgw0Uu2M8
zH+KdtF?c;lr3nvQkrfq_b5VN{t9Dq1#U%38bwfI0PiHDfTxDz`2T}Ouv~sR-#4ntW
zyKvJH)D}Xs+Zatrg-M`vQFJ1Dr`c3ctc&(Vxvw5_Rvk|i(c8}goes9$7C*s<e+q0R
zwCeSz1Jx9Y08ekZyWRMu9|Z_dx$G@Zf^uIqS}C&_(6-nhYw1X*1!WclKn~0=+Zj`d
zK!zbD)&oDdq%sdk37?o@37Rk|MF1EzUoe%KnBrKhtV`W_KkVw0#yxyDs;&ngcwKW*
zXA!FprN)pu`%&Hc?ffeEk+h=byFLz*MWdP7di&G8J3=!8w>@}2wZp>anQ<-&PAWRU
zI5mFNE@GP>EntVkqgWTQ^Kk>56ItPQM}|e(B!?4*Wdvz)z|Vg>Wgv<1u#w&5vRx3#
z#F0#zr2#kAl%bJuw)CPrB34(2ocgK5PS2ms<(rdFGM{w_yt~KTq7|7MxX~+C?eGgL
zEPoJ|^j6#ESbZC8$UHal6t!$ZYimYp@sf8AJqBtoco!UTa|Wd~9$W{CGZtZpI4TkR
z{D5Q#YOjVU2xmrskqMAuHIl$09yD@>0K?rZu50Mlgd9?79YADaRt(dMYIQ`~*hauv
zY|~f(uXUg8%}xU->koe5k*WQWhls@U?KxUk+wp>rYc~;41lc*HuuS;)bynNw;gq8X
z@a`c<3wc(+?bpZhdvhH6NZ`rootz;KA6`6^n%AL@Qa1|u7f~np%ToQx)ZYxG5z3xG
z45U+jDW7%nEJM+4o9DH3iIE}T3*D%_9kPMT+bG!sD7dY5i?uT(r3_6j^oy#TS^y#D
z5f?bor8!2;9q7CHvxRjk3lqUDc>jTgI2C$a!t34xwOw3H8>iPT)Tfp?)^7~nNC2r7
zb@0(ELCZ;bKVx+<`|W~=HJt9)0Dw(<TAtp&nA+;-r11`c49+(V{?#$gOk4L6-5TLw
z#k;e!n|4lKK6hj{E<UajH#5?qH64kciyS(j5gCXj{k%@l{5E5_FkqNKkQ@FUyf_=2
zwR9NPQRDv(T9wrmjobUl1?t};+n-zQTJD8$)&t(XR{OSaIBz=N>k<S};BsGuV`R<h
zIYC!*dR*7<!!7nL!afncx9ySXu>l~z(XU_M=PocW*t*<|R4dEsbgh=JPAN4t&kJgD
z_@>Q%X2h@EKf;ye)U<z#o-+q!FiSq~eXT1!L-R(@rw2ps^VV^cmQ%Vx1A%zII}S3^
z<uicwUElXa*G!vnV*@3PK)q;2s5pQmx*Ghtk8kq#jrS>s;jvi*kF{%!sZ^~Qejzb~
zAG0AN)fuT;R*~T=70q@->=~PD=h`(l=WZrUbjbDDwx?*fP#MP)k)5Nz2v<!l0u@Ch
z$&>P!)ij;2MHBpJ4l-R;c)6t3$1J7-b--3G+E0A>gx0^|UJ=S4;~b$ttAN9b6(2UP
z3OJZA_hnh}MT14N*HdmKeac*_)pYeov#?nW?U{zHx1k>b-4u)YjYS5-UGhWPM;^d}
zwI3<x<;(5AoskGVGCTlY0sfx>-BH_2iuioO9SaXD;2t?DfR?-{E!de7zNLsd8)AzD
z^5X94=lThShSj;w%$wJXG@BF_et?*1Y|r-fB^!*}bg@W2n>F{6eENsy<Z<LC`r}|3
zUTMaD0_dELJIC9mdtT%J(15LGTNAfsE4c1f9R@pz#FlBBL8sTi{Go!}=q3(`KJ*=I
z2RH1bAf;_qkcKk@DN|Xn`1GUj*UDVZg3u@|M^wW0fz%bYg2*&vx+L6P0SP!}lQw4s
z1w>?J_Q|a4BKA)q2MuaG|HJkY{!!r*d1qHepd2Y2!Jb3LJlRJqqfeI>IeCKRiE3)T
zJ0{|Y5||y?*41X(E*vfxQBbKD2-LQps1AuA^gIav#RxHMaP1LSB}m87kewI;r5Jb0
z6e<FU6Wx$2+uVfrS^`?55J&}=m#jE|W(80vu`EHz34jF2;g5P%X3_50nQv!ItqXTn
zUWjW!r;;hb4#z}B8gyy?h56PA_H6WtASx=AS%w}^S(v~=S%aL?z#Zg5j;ON7_j{|K
zT}{?9ZCuWF)N^TnWMd2Yq{3`b*$t-flM?yg??2_jftBqaOxLg<Zz0rWQLJ?xc|}V5
zs+Fl3qlw0gU(HFyE*37xgTyJ<{iI<GZi%^cG-TPyaA{+8dZlGIiv*NbyJeo~11_>X
zqVxyS$7uj}hae~vijuR)JYk}u)Qd1yWOfdXGvv+kSnIlit%++1)(`N3?Mk8mg`ePf
zHdEG%$lkDJ6UpLN!0uu>i7wjo|A@3b=P5eo8$X(P?g}WZ6pB68X-uy~+i<AxcP4}#
z?nP}$bM=ha^$$BJ8dX;0`!HUnmx?CfzTO4i>|msN+nNL8_!6*Ub40(y4;)xFu2(n7
zQrHeC{)FFGvg`MQzw<e%aa4)ra!h*B7;Cvz->YV~8Mzepyb$lzTnSls!#JG>!H^Ou
zW>9=sT*L4#XxuG$b>=)Z=U${Z_^ds&>~{|ZZ*gUu0Cg3cQ5}oDnEMfF;Q}F_)+>wc
z5vPDegW1LCjRKEi0Y?-TvWQ9e*ahDYa#DLR9D2Z1xUMjgLQKC27-uY8;Ki_j^H7Bh
zKxtW?f?C5xdV34+r)6xhy1(fXwzC|#@}Goki<TaO)F?>KI-&7neGwdhFs=Nl6CDtz
zGj^qp%>!b<5(mP0=ON|(EG$w@oWFS|uZ<#?;K8j}qH<jjl^fpuMw0u+=!Pt3jgv*X
zu>PEd@e&+A0HtVTJs+D_8b3;2X4w%1l(IhkW*ep4X6PvabF-d{jmTE{MFBZ-kY*4m
z?laBb_pPYS+ilD52H|W!49ALhM99u`jAAbAMlV~@pZ39Qlldg%S^p;`kmd-LtSEAQ
zZ8JdeIhp3GlhGInTITK4di7fT&hhX{2B>xFqA3O$sS;q$Lb(|_4|V=021Wo3Sx5n!
z{DG%ttak>!JA3D?<8YqdTUyCR?j0xYD6&pD1j7AXL=B&71>!ibL`4+y$smHA=nRgA
zu=yUrg&Xp5G{&N{2Gwe1rJO1-^}aP7N4D3Cm9F!SC{8YyHu``Rw&0&p64!_f$|as*
zdbq2X|5pr75ILs7q27q5^aV#%QXpctn*46&D|~r<fH~Hir?Q0u%gw70a~%zkgWUzT
z<kIO0ZS$xXxpQW{v>50%9C8^<1}(AiEcEZ31yP7B@g?3|)rKPJ^%Kx|Zmb8Jlsggj
zlZ4>audxIlh*1@V5Yn4>p{EjIoqK0xS+dTVien7QTktWb(JBiC7+)Ugq97|T1(ce*
zL|@%erNcQEj&R0bM5#?i8m{xlq`W_)_^jO8%e31Ot1y#6*p0P3o-rdPgsX@8iOJaZ
zQJxKiF;ISM<{3){yUYZ|69rgo3LN>dy}I%ot#UpGXJ>^%Cz>OQ`<$7r=^lr0xlT6;
zBnW4-aDm;O)v+Gfj2??AvhpLr3XpPhG4mH-yn6L)f(@br7VqrT>ls3<)ilX|<`eM<
zbF6K;C|Pv*ts7`Q0W}p7Djb^&mE}RrYggu@bTHTed}og3HL9jNifUM4OIgJs+&|Z0
z92~gTzfB(M{}2d3?7hR5Ex5CdBh>@=5FT!$6wy!Kh-V;fFq3Z5)=K{6q>}5I-ld-Y
zO*i`bxQ3v6_7F8-$4}t#x^zl!aY1clQJ`c=&=U?+Ee`BbEuoLi9GH>m=VzdL?Aa;{
zK0jAKd2xHYGO6Pv0CQ%#G>WUyLW1mu?t169n}>>NH@B(n{>uHBc3VqsXDBnXR$~8_
zFA`ZPJ9Amwo~Z;Mb!;X>9O4~g7Tt8l2JI}NCm(VV3bkYrQ7pIJg{pM7xhE;>9D2TS
zEi#Z7^}_Bv#kScqcdFdxXoQ&89Bf{GeG25cb1V!ixQqMV*g$QV=;8o=KCIu#W6<fD
zCvAKIa=nD7i*#GY)1uKaFD1c7dh9EOD~dq9T)wP~BcN(sinN0Dd_%R0hr{fi1(8xL
zvMM%LV{ZFvTM2)60}3$lSOti)MBVEV>oP~8m4>}?o2;oxXLhB><H=vD0{KFa8_G9q
zufdc|%$(+3D0<@u!Vft?UcbeLL-)P#^kn=?i9sY8EdN+GTN3QnFKkiJmWO9jrgMz>
z5vya?C}0hT_tkhZ(-#lvhjmC`?g#8}D#mvA79cd1rGg<KQo|vk+nMZ4(NpBE?F!=1
zm2FO^ko|MNp2?}*bfaF^w&ak0S{MD1^{)jQUPYhGp;JW-q6jQ&fu%^oJxX1O9XDP=
z6Cg!rFomw@xlxRRm1LvN9v&{}__1won~Oo%*XUeZa&+kNlxtSCu9OdgwckdV!eQg0
z8N@h)-W<<ynunx5sms;x!X2^d@rAK*Gf#cP&Oc<#)A1HNX|->TR(Q|}20KZwaQZg0
zI3Kf^^=;vmB+UuWAUbpk-GSbPN$3lTpD<8aoNH`p56s<Ky9M83)#+cmt=DmwKPJw)
zicxh}1s3F*MY`eQ{yAti>ZfhD)fg6qK^<6MEUreZoSZ3NoE2OY)=#5>Hn7HXK6p_Y
zw>79^rX}xLbqr1zmhI7Cj~#Q1^LY74iU1qW*(C|iuDU%PFL_rkV^h~nlyQ-ZEGP=~
zaI&NmTQ9$gr^4YZ=Z_c9^{ti2j~%c|#)SLhYgR<nn{5c{bVkSBl`kvLzw@SbT{h-d
zgL!VCmtj_fj_@vCncgb*x;J#l5B*>+vxPfM_|pS9qQhmKG*N^79x5@dC_pt$A<il7
zt5~Dyv^~R#AnTf%uZVWLZPx=gm}Ygx3U|<(j&t#^zbu#Bcj1+^{PMRbZ>yZbJL5(p
zIwkhBbwo?++Q#K->sDiYf?_SQhd9b*U4xs_P4_7%U=?Is21mBMtY_z+x%4WkpjG)Q
zcBzZ#P)5rCexMa^7RJcpg1eY5AQU`Ht0@*ZUMdmjfp;$UcP$<(9BICrdcE;_TZe#Y
z(B7|H{_TOLLAmp2Wn<KQr8`>fPt#Q)G@}H_cF&?}M-gA-($uEbPsq4Pf-N60S^-lK
zaDhrhHm~~}4jMc5nMnm2T}<|p3%JjruO2S(={_dGW=n5inUTOJ|1uId21o~`AZqZJ
zzR#~-+g|2NzwZVDLH-+VWtH9j?EQSA2ng1bDB5ULl(_%lp~wdpkI$bIv-Bx4)_%FN
zxajLR#qgUA;b$J8J2IT1RrG^@eSCPmfg|b1F=B@qCdqnN?!|A~-9lbnRycJf&!IDh
z^2JJdR-Mn7ZwrtXn^Ug(0ms*KFH1CdDh|x3`shqGfiB&OrcT)v9n9R*wzq;@iG9c7
zX<&&w=pJmDR**1+JE8E1yyjy2gj2nq>rniV@^<bLeem0!rS)`F3v&qcc7*wsTT(!U
zpx?Hkwt4tX)b*Id4=XA;0X(jWR?<-cWPPd|G?6b~xJrhueCc<ThEFLq>ONb>$CmW3
zGHXY7y-5y0g9lT%mwh$s!M_Q|99nLVF)Lc2kDOuZ`>;)YH?EWIwtC1!>83;OKJz*&
zll^<0`fMj7>~K4|4n)JLnM3Zpm@ymk0z&IJC1&KU_4H--`@-xxh{$QW&3@*1w!ix8
z)(wtYxul!8{u>?F)51IRU%*+ZV$4XhWh9;7Zn3!s8>FY~J01NUAAh%7;<(-qI~CPd
zVgu-wTW>c&lHLcEipfKpYUjUubA=jEIqnZ08&F?1KcCOzc-_q9cy?oc{_D=W>xMhD
z9`r#mdGJpsaR;PlA^JYOLOZU>PH(+Yi7c@L9F9MZl^+mdd%0R+%IH=q$Ce+<;Hc(e
zsS;Za_7(mzxj`>IY!}~vdl9cz^oTdM_Tg!JOn$x6Tz?3NOwfS`THDqt<ZYxJSf0)N
zHg>>q1n|z2<HFBz$WA(tIeFCeo8=4hDFKrrR*3Q?%ee=l8E&Sk{giO<ak}Ech&1i7
zVU>&33eb`+;q_q8J=9}!xEK1{n$xLU%EKw_8|^WqwU`}g+?sXAJuuq>c{2!GK9+Hq
zP){qzQQ(l57bGrSe4b}2wySDKT?{&YiQ8Jp%$ZAC!6kk3@g$ZNC2-(lr^julh(e6a
zgTbtm)ynN-m28;0dRn?0KK(s#+qVQMR^`9#Vk}b#c-@TTgEr0d&um>b1<lCY0UOTA
z4%tWAV^CuA{VuV~-tOw=>{H{&h%&k%usx8?SX4$a#-aI?_B#)$iGeV~bL0LuTCq_e
zaEAxxVx*|*jj|oy89AuT;27LF1X;RxTR{u<>FN}|2U-d*e4T55CY;TS0~)6a#gn~|
z=lakHg;@z1q05G9-nX5g5&=U*So;}aX=68m=~5tlLqK4fIAF7GvO~+Ns6_V5;wh+l
zKK{wW5ZTgWlVl6lc7U7}`@8qCcYI#*R+x;FN}x<qT-P}?;@i6}k61XGS-alX%s98_
za8NhkmNl>dg@D>CzNad@275uK9Ev~IJ*P%Kaj?T3igY=gI}Y1%i>pDgvt1?xStjIR
zRr{h={a_Sm68GfBz`HrLKSwmZ<p$)_*CE1(wsMQ~Wh%mG`>vH>FBdDp@rIp-t=xoN
z9+D@LTp%CJf)KFwMsGe(-gPq41Tmuy(A}*fkJy_*=sR-i#gl5whrJ6s;3s}v3IKp5
zP`!hdeR6P;l>q?qyr0O><-u(CR6=1{<oiTAF?Go4+IfMdNaQgA$9}@Vfl2(x1J`ll
z(B0NAhUSo!+4sp)4f8V4=mz`NzUyC4vgacmJu3D=@xn1vSyzH~kauNf>^mVGOu++1
zl$F@VlL;!*@7KG=bJuRV*TTvNkh{I9l78!2oaxBhAb&uhOmo$4<#;+|S<QSSD4T}m
z2!ipi5Xhvwv+SvTv#l1h_|Cg(cjl2Nf@L0$h^q`Be|?C2*9kN2<How#1GidUN6K68
z{xpVh3tn7q*K$^l)#l^=1d0Jp@Kf4ePE(>JdduPE1WX%jLyTrNLm!$@wli|n;H5=W
zpJO`o!2Tg$F1Jae?#?S;>o}XZXyK0S%i7KII6hF%{N|ic>PPU|uM$5X{9)Cn5ikIz
zT77p#*&p6q%Hb(cLvx<fPzcn$$R6E?-*IAx65Yg`p1wNgaW(XqPKmUVtptTOxmPge
z5uokxi6sIJ@!?&mD-*W^I;7@to3r>LSNW*;T<$D_Y)IpMc@RyQuu4(NP^)I8X{F^n
zlf3A@%|xt$O1%A}=bYIDg+}G_b`Hi)-*mZI)w5c_d53s=+Zpyr76gDRQE`yJY!4)(
zAP7*iY$)MBq1Lc;dQFybK>+NK7y)AgDDpyI-13gV>Gw9qyhw{=0xN^BIm6~#^eVe<
zzqO*1#tve~J1H02U`%t_rh61C1AgNBrz7;rje;|XhL|9?YGxSJ9=9VFd*ID1tapVT
zG0P6@EHzdqxQPtddQ3$Qxl6+AzNRfVqBl?IlClyo3v{&-)!Vj=<ngZeK<i6@PPDc~
zessPvgB);rd!DRL?o)Z0z3K2+tMtJ(7sLcuktYN<sOlZQkRG+Zw<A>YxHBX`WL+9R
z5w28Gn4JYsOKj+GK_6RFE;`SdhWR$)tH{IMQxU#0S06-`^!(23)f5!vfnH>&A#9t|
zrD60EX0n*s>0mnLgn&-H_ggg=@Eir(YKWc3U$Kk0t)|<^I!NueJCF3R_e}_P`42m*
zq3R44*COflj=Nu=B11g)c-?J*$)nixin)E{A9F`w7RvwGQQ5Msf$<+=BH3faO&sO^
zT8YEk+1)_#)y%*u(tpMcWpZ8?&{`M8-WoYXqox-ok+ECAq!;0KJi~)^4B9uHVl%vi
zND@3Q`%h~`x0mjTYrog|e#jB<OGPpLS9T=<5S0px!DH$($up%^YToj>NM>IWd=x85
z7F98<oU=q6AMAkWu9PyrmkMqN+z?$nS1Thf<k=9rsO$137yvNT3h;~H_nH$+!mxJ(
z7zZMT<+uz@mtPLoS>f`}cO^!<-qyOEX7Dp38ur8Y{!$YtjYnyps3Doduu6?xt&+~-
z94}e2tYuuxTb5V#64cQdG}Fq<vnZp<1s&!riyiC!FX-F0jjE$&eOmRN$Af0tI5~#Y
zzBZa`xMS<GQ5#ZXbcfBHv?ABj6>LZ4Sm{fn9u$^h0i;fQiXcz0nZbcYP=EaKyO{e$
zaC%gW5fK*aEc0M2ENueo-`fC}eC3Yh@&r`Xol~5s=!bnBK#+4O?Fh?THQV*H@%HxG
zjjw0aAIo^Cur~A@^xM98CyunIOO`Zz#ZLYjfE~=^ihD($;;#afAyoPT@WptUgM%|o
ztRE;OrQ3at(0Ogr9g8d;l6QF?g5T`eqrUTxA~I^{HSTd_Ad%q7k*uqq6^6$^%D1;f
zNi{q0u-OB3ZXu{qun2deO(;jzH5+WMokiIJ10A*q$cJ2*e{HgCM>TF%wYudtE9$lH
zd&?_BRo^3ZKS?@^lBhiMZd7!J2(ArZZ!b(Y3nXaYQ+ob+U%{+4yQc8BSp*F-ENDXC
zcxxHJ>F)xsrG0Izi4SwqaUCl8!2(FB%c(TFCF9+(aCI|b-|{Rt(PF-rJF-pVn;LtJ
zanVDLREV9C6L0^rA~l1v&vu(%jK)tDGkF7$kLqwSFIAe}-bHP_b$KWCg_ewK^#Kjt
z0C!n9f1>Ed&%D1_{zJqo>q*kco}MicpW_;kF>sm|ryS`=_b>Ecy8+Q^0(m+QGK9bL
zFPq%pNW2vZk7nz*3apCR+a0fpu#-=|5}o`-kCn_cy6HMnMnK_CxBrIOg4~Zvy3!05
z@2>%AWYQnkL}5Ic_|n5^=ERPJCt@Yc8pcleFeaspA2sQ*&$8Ig2{<69*^4wrEaLM0
zF7(J9j4@&B9otGZgi+#&1aOBARoxt;K&|NyO#u~S&EppM9V=!iR?CmhM8ln!Pmy)z
zuN8d#4J0VLE+?Kl8-oMB>KV%3(QgbtB!`gEsDb<!90paIRdeLlFWw(!rY#w?H`dda
zD3d3WWOC0~WnB-xKJFGZ(yEpnh+trGxo3F~HoOM!R<EUc?4g*e3ZbGgsd9@&>V)^#
zHR^{mqdmkgr&EL9+^U{a!|V)|<FXxO)Ic`Ot5So~y4U&LGtc#xd|nC2=T%8wgOLv&
z02f`ToQm@1V9rW>a-JS2zy})I4}EIANS@d>C%Xov{~D^;a!*X<Z%Ayd`@xjY-J&L?
zq{^6}Wy~W%AFgWV)+T8__oOcq&xQ$;<?YW_(iV4sYIk9jYd11JAtnTr{=5h_eSfaw
z?IGk_`SS+8t>RJGa-$52{n0x-IZrv<)yqDF&>lm6NsVX=qnB|a$rhIAp_G(LBg0Ok
zTb&y$>r{&X5Dp#T>CHiMWfaKtIod+pK#nB5{HY7if%bi~oxv1xa_-mtGohlYm551h
znF(?P+nE2E#<#^-N>_F?ABz?9r@V{VIo=d(Iy|%R)W2yIh4x6;3M^RfQY}K6K00Hf
zze^H2|K$3NIsmxGd!!tcD*a7VCvy12uYIGTvwj+c$nQ&qPw<a_ZJ2l~Se>g=>2LLA
zRg=A4T~Nfx@lJPk@UOF7cnJC`Rt(}*QLE;c%8Gw>d)&0z^)VE51ln&o8*F>{g#7&u
z?{(%?Vp%Ry()XPz*_`EstY+f`nR_^IR=fU4I3E+eiX9|j-*P_@ORmII$d>i0gLAIj
z-mw?S86?wkqS}N!h_4-7V{EIPQ=RM28KiTAz@YxbtP>nxqd^hPsLP0X1*SSBf+)k{
z3B_iE(DUuJk?p6p3*L-qRGg|y8xdaKY4`N>#O$U?>y6cwSo4~O8PFE3vkc>Ot)`Q}
zpF1>}&9{CvywTWo@M>Avng8)><-D^Yd&vRY$+6s~<HJr|sK=g$S;BtII`M|bx;YV*
zyvmdy14!4M>akZ#Zo(?y*Uq>>D4z+)DM7!gEMxDQ335tgSlR`raxW2KY*Lq4ky%a(
z3gT>Wwy=rSfFZJFt@q7UbO@%6mwD8#1DjWmm(wdlb^xn?a?1eZiQH#i?`7hQEa|_X
z<~oBfI>fYDWr|EHC~9gF!rxkc32cf46Wl5=!TA}{=rbcNu}+U7h*SO#9uI~BzP$?x
zOLZP%0o7*P1O7SIX317|($C94;1j~@R~9eZ!zw7u2ZJ^^`ONz-a`wX3ep1j7l&#C*
z?@velsY#>`AT@nA3!w#pKBzR#fL-CaBkbjGcaA~EfoWra-=MMCH~`LOjZL;l0EQSp
zkhq8IEs=u&Y^=Efl!&7(W<duj=|Mbi0=xClINCW`8U$YLWnO+mh{O*;Zfx@?$IuUQ
zY*Isi$S<}{pY)xGS82JB{KU%ALj_4^(O`XKST`u0;FhI?kPDduY<VFNaj^7@rFObO
z{97_E5`{sG8WcKMY@00w*+a;tbBA{__N%KIkfqNktb2@I-Fjf(jd93_TylY-;4-Nn
zf1BJ!4HvhR;FiJ|%de$3esTWCy8#NM5J19b2vO*ai!1r#qBDUP-YK)GoXc>*<u089
zN8%VO|HH+{av3h&X1JHSshKUDS^np7p$B%RgO80z?GOJ0<${msC}2e!f73beNh1^V
zYvYdob_Kzo@ErL>Vk<j={hg-v?@6mhvn;#bo2O3WQIL4d7Apgtl>3rJ5#kDGkWsh*
zC@mB%XwtZ@`V50hM3C7+0q?8m`Iu+()BEj_LL2N;(SApfRcz_<x-FFjZ|W)Q_ZU5s
zf`N<h!dPASb~OIHZqO$d8H-;|AKz?|YFzdBs!7Urw)Y?Z3`+Q6pK*w2dGRpi(=wQ$
z@~lQk>Qwl}4~McsfWQ)Gf&0Knj-XDkbYUjlJXoH)XG~?jTtyQFTo*3}JDD^#KT=j;
zy8?vF66*tx@ad+WF*uav$Q(5fAEjqkxdoKtd~C7o|MmpI<M+=e82$@fdtMj+kq)VO
z9gKZtdwx^E=r@aO2N$2w^WV-S^e3Ah-hoHJ`>(;u#`Z!K{EC_)f4{z?rpQhh^7PNp
z1W^9S;sSXQhrX+sb<71a0SS+WTjrVV-sVChxgd5;J`QdDa%=&mVAz73Kd+t+u(W91
z_p3#&*tKJfj~9QBb#x!M!jLL9l$g%{yFf;N_-|RAKyZDQ9v47ni|xoZ=TPx)tX?7)
z7u(T17V5vs>nl3KDCM9T(9_y$9-faWIpmHt5^7#F0)FOr@Dhi$Dh<3VtC!yPkkg8?
zpUK>rU2u9ImE++E3WnXiZLY3vNPA6e0ZZHp1diF}649ci92azVY_ZG#9`*3A|6c;F
z7Zyi}oZ0%O?xG9)3Hwy%F0Y7)UE{6x=w37XvSk|gtD4^UU268fDJ=CZKxiu_BR|t*
z=e{%7v?A8*IsHb{?9x&BSm}2sZ+mSRsC;;h({#rw)1%KMHat?>_s%+MehQcAbQiLz
zXQJK5i3PMNZOe4#tCGgfMp7eb@RxJDoXWEQKR@cfdseS^?Qb~ZTE>#6vYsv*5q#ax
zUb*&HEc+9-0)OuC$4SWgJF%)&)&vP#XsM(g2P!ySCB2ET_BS6ChxG*VXsLBY%Z#Q+
zMn-CN6~qin6@i4lyl~rrfg%O+R>{L=vO0jXe4N2&_*wVh6m>6SK-?%Phdy3)Y&HLL
zednGBbIG?~D!SYyZF33yA^4%_GR(o>*Xhk4i|MA|sH&$eFIykDfRncCt#Ff+YI}#M
zdnxs#Jsr`H@55&FrMO6G%7%@Hd1bO8Q__9tjK$fRq<&)bX_8c?fb;izqbN(^p6!cb
zg~VraaZgYG-tgGiKIpTLp!Bqa57>+fS+9>MRr9Zx9*~9CITx9E>+2i0@t>R8hn+UX
zD*ioH19UL5VxL~5LKcJ4ySu{xA!GrCYK|yW9TCm&C-@aVwb)<w70GGsAC}P0+*JhL
zhRa2>XColM!IhJZ^7k?z^&{1wL_QT&DWl$k^G0p$?O~zb>*e=Yul`wul7Eyy4Ll^*
z4`kka1Nk{RQo?gJTlU{U(Pc@Fzdo)`gj&5Gj-uO*gC;A>Z<DB5^>%yB(j5BZeFNp%
zyIpqC-|7^)tRl@dI3<je#->a5onbF#C2_S~9W3I!@Q>u?0G+<-;PcB`w05?jb173n
zUDKGo>WkfMk8k2Q>3Yf|(DNA1yuTKI=)Vk-|LHVUZ$eQ};*bqBco!YGhxGrYd2Yxm
z;l7zkg#4;bRH}~i%g->8Ecv)=)bW9cM30wBuH#*!Jw>Hqp^J>q-kr6QCE?=~1Iolr
z{`8_P%xag-gV__WahZn7MMua*I6w1@7V}*szDC=Lg^!BWS6wA)XKmKg#!pEOj~l+i
z<*5(TQl1`2TOHe$Z%r7mhB2m|VK<oeMfYHq^~7i~*d4r$NyKOuSWG?K-Q8U*eK`uP
z0r>MgbU+!@c;>759WG$Os`^70%f2%m;J^8+_6Qiq)=5|Qr|bB8d<rX_j?cCcz3&IO
zT7!XGhTYM_4RerpJKF9kImmyk5dwltpyh7No91SgfXAn9y~_MAx7zh3L05gGKuF!`
zh^L6@WZ!D)X_eDdkd2h>i<(PrP%N1c%+&C3#!)5l9(&2nWY3rKN(!SLdFD7umThS~
zes+FEUg~E98M{kVYRiwr4ODtjX}eSa|9C_xbN(jrv`^7uPqc29=X|H}T<AjY)MfH~
z?x>gd`kK6K8k&!(`l}f0Drk#<LR!sQZLSt8jl?_&9Arsc$r-gMXVU%q3c=5Y6z9;s
zj=(X`#Kx8jieXWTA(b<2+eV$T+U_hyA8a1>Xus{4mhRe`oC)QQO_}GJVNPsauf1Ii
z70zWJMTB%|PENYVOmZihGSDd}_9*S?bG_Z_DfixLvcJZ~vj5Oa&$2PFoSZ)3RO9Vp
z8Ma06h`jAGC;>LfTAT-B-^(DvDbJk5$reW*+c+5%YsfyN%04BuhvzjOreLD=1CD)F
z<_cfWepYzDk__U_y==49p7Yh67d7}_1PZDsQ~b-mpNBBXsGiCW6|kj!vvDBVdCUx6
z_axcXA?;^9fO_P&mgwlX@RFHS+p`QIy&^DBIHVko!O!~Rf6_WXQh9HC14{;C8|*`s
z5eAy0MSp#(;*tI9YHsFS%);(e;d!_3&s8)j=T10|#wfWNQWesjO{ouus!h|~na`t^
zjV8r1zdaO8{6JMs?^IE6ZHqa$&b<9$v9PoI;;?Nz^_VYz!Ia*c$F%dF^R!O;$OYTn
zK@!8nc7$Qn(&SuBdy2EEH=qwpb&inkT&EU#CsGv}E(5pr0N?kD>^5n^zq*7E5>*-N
z9JWmcNsYlFubJp5EMVv68wPho6HsjD&|Jg;)6=f9eR@I;3>=<@>m-n<xgL!ZfG%C;
zk&8}*GH-PLTr1!E!AxpIK%<62kRV?C!7apj%q5dbBOmlEC|M+gJaL+c=JDl-5`>Vj
zp$<$T%kEWrvm2dn|08BNy<K|0Dq$Q-IIKrn1Wz2tgKFt*E7NN8qg`{zoIA%G*0{)Q
zgL>iAHf9e=@clB772XJ;*7ZQU^TNdm_k+kLMW;yY9M>^jIV{iVqA_a=GLUz~QyW0&
zecqbqfOvz#{Rfoy73v(*ZMwE+Usqv!YK1fjC*|C$9MR&t(t<n{O`Beu+xDI_DR*1&
z0XNUSwJyo_e1e6d3>8nj$jbc1DV%cCK?ml~63eU@#XHwpXsr*67nz2hA#D&a*iRaF
zmsyz&fh64u<VaiM?tRXSzkb-h^`Z$Dn`+4pBvl=2?d=x+sWj5qVC_1Vv+Y5#rQ_7P
z&5c)zp3v~~wfMKUiGk5iy9W0JZK__2DYcnSL8I$4qK^|^clEeR_`fGn-s{ll#O;3M
z5HlU(_=SL>3cpQRNX)?5m_uDSs1RmQos!?Cg?D_=dpI!qMP^!}0mbR~=OX(VV?Nq?
ztP`%^^3SGe!~+=MrgzIJ%T{l1I&gT~u{x9h#(xcCv-^`D<VtOk4fN8x5*PSa9_AdS
zmCPiP<Bg23thd?vmNP^0Q?RrMMm6<WQUm`-3dgBD@XwV8M@BFc-?d!+MbBWA#@O=j
z37S(#ce~o+<uqHKw_rCcbDtDgF%cIdCm<7N0rJRFw01FQo{aWU!LfovWF7H|l-6r`
zX<NuolREg3x6uSPJWcq#b9)i##r;mTfnnFHIElCzgVIRh3ETl5I})ZYXyn$`N9!|`
zsMSgVcO2u$Zw#u%l-q}F^)F(I7qs_Ixw5_dLwi99dm|eZB=L?{Bn8f;E{}a6S2_`B
zLA0EiNiyJTeJ;#)1g5&1r9B*=s5yd;j(5DOIPrPK-W~2uH#D$URx&;qLlD9%{?^<`
zzweIwzrvY)qHnQR*wVLDGv^-8bVlRGL+%eyw%_g7ZKiXpENbgqyJ)u<=`y10#NKHL
z2Wwt=UDTSjo$+S*-A9i<=e(!uQ74Jp-;qOXi0(Av-T;A*bJ%u1MxU~;hJeei)RCD3
zW<4lIc*Lxli{+dA@tD@OkKxL;?Vmqs^9u)IlWna&VUmW?wy6(62qcplr*l_Q0B5DK
za#+Zu^PJBP;c&j!HHbwgcXgq9p(;IcfVE-LzdOiWbX3@Wcz~;=Fp9%`v3ha(;pTOo
z)ORsIbQ%5|oJFhoRO~L1hSLv^c`E+;4%=44&>=$bmcePw`XiM*DYL_atHn^LuaiXi
z&VAdRF6$SDnD2Y9BX?kX<G=+ADluhp{8Z|j`!i^1ZKG_a{Y1j9k&m}#aMaMe;@wI(
z<QXV6jYZ#KK}@<ids2@}iu!l$QznI5WRPQ)KLiDkIrZIn_kFtPoU1@vH{k~d<6NyU
zJH&Li%LN(oxuxlU8P4Oly7gnrxzINoClCVIMp2yqRc<j~sO>@h<!-U}6M<4ZT|3w!
zui6~tIzwW-ojHSdlSm!evZZi!@?o1-x)>eXym<zGLB#zB*(2*vYWaSHnPCV0nKM2w
z{Y?)aTx%lNvgZ!rU5~TG>g2HTA19g74#HK6Alk*2<s8ys#Shao%1R>)s>GJhBLMV8
z;mH0{-z0h|7+kCX_u#~@J#MGOHnUVJEAcpuy)VwG&8^Iu+6q}9#p?E2bQ#nLUHd_#
zM4(2f9csNi?4vsbKy4<k2@CJrsBv-}LHAG{EJL=Av;my_#Vg7S;0}J?MmfPY0V~G2
z5h1DTmc12zti^gX)z;k-3V_~Xuq9M1>obsizrhoh+L6PfoulDVR9>3W@<eYt(7;kR
z_gfFJO7JMZFKrk%4~E6mlsH8#N&bGnZ8+9S*1AezDpg^hxyl{F<DlSc+Xur{UJ}wL
zoif~|hJ#x_6B0+m^0tlqDA*tEtxn4(jO)vh)6JOc2km)}jm(zjF!Z#^^*!^jAG9(B
ztW0Os8#N+~x6&+ti|$;lGW*eOWIbZTu_LK@vL&9T2Ios`@O;7+OPhWxxzAbPh7+V=
z>_+1s0uRo1{l~M~W3s!S7{MW-p7WjKmNIY{?;cw@H{wVkQLr1m(@$=>V7A=}oZRp3
zTNTqjl&`O4RaUm1YA3Tgr4=YyhZ_VJCj`v_?XJlSD*otGT;7eJ)zopinXgK+RWwt_
z&f3XLr4I0}-8l|JKw*tb*c>rM?h0NsHM@{(xA>-O){xn1IH0>Kaa4N$SPRPcc#q>&
zo{Hcn!x3g4)wV}VU`>9Ce$=VYd=J|M=C=J=k9m$^t^^pF_?%xvsn!Z`hG8=`Nrd2^
zW7(c?)Wk<Yn7v(W1Fr$BBE_wduw2NcE)K;k>`isL#wa#h%w8DCifk#|r0dDNq%%JC
za*c(4t`dzTnwqyTmEQca;VPwI`<L+_7nsrOv;y4qMu1_M6!*SN4F}P)c<SQ9_@Z*^
zai5gFEbyi1!EDTg`ghCU07p_Rhot)Mc8-ne@tq$Z|5bX?F8AULNe83V4JoY)@8x_2
zTyN>58{(DWc3?R<v1ROB@qDv?r=-V1)~J)g#22gHW4`^mwTEsrkF?MQJ*n4qS_<AP
zg_X|{#YSi*9}E`h{EgPu;jU6&1hNjFW6uSR9Lep>|KRRR;Gtgk|Ft`%MNwosIGsw_
zO4*lW>9nA-lwA&zGGsTlN|d!uX|tyy8bY#-tzyb9*%?^}gULD=!~gS)l+L}sd(Zvt
zzyG{m_uO;F%zU@!`8=QJ^La1#<YD$c56#5)2v6U;Qkui-qx*gLU@BSvn<;FqsO1I~
zIPkzi?$>jP8P1++4;*1U?bgZx9UBiDo00rPonrZ^8|J4>Y0n8>ttSsq2*Wh5Ny_|W
z3L`Ok-Jl?wsCHlYD#?DfkA%V^=8`aR+p_U}!75r=dO98=WplQZ7ZQfaFV3caoPlwA
zNWE(sL^v(MO&U9wSdd288+9|Gm4_YQ)!NCo?41=MlrOr#JZ4|Ynixj?f8iN(sImSs
zTW+Orryloij@eKxtcf|kUKX6bKpbStvNx8$YD8r1FKjHIpN$5OcbJXH@T13IJNZ@B
zCjR#cepphZ%j@-$YV#xc1+?6PvP|v6D-+vY%Y)bwyzDC4U$Y#=c=SaLlDO)v(2y8}
z)hY_Zv;8!2Jo@z1tkuT$`!kn%P?nM>y1dV#ua`67v5@?I3lB+u8a#r>RS1f>YVbZ_
zNB42?&_zLmHy6ryYw#)M?dflT6IUxE<hm^^8+asBuWX;aATK+w`n_c6R|B+%aOD70
zF@6mjVm66jQw#p(S3vV$^5YzHTt0|aR8hyb=~xQ>&LN=0QB;y3!+mUM1aisDrxVC`
zcScCrFEykAb=pq<Jc`6Jnu$l_J^h#uMR`s(^=}tw<)Gl!Tb9t`=9v@JdRlj%e)c=X
zy&-oruTH!tA=7f+dSHC;sfj`~ZaTd9xsdZE9SUPRNG-^aSjgb;D1#IGT?fC8Rl$4g
zL;TYimvOE`!|{@Hhw~+mk+yYE3Jjc8Cqosnd&9-1smInuxs0)BpA3sC+m|2ymX7@x
zxY6VDisu)cBgOz4EdANAOF^Z;gx1{fkxYeh?TSR}`_ow68w#EHPA|gds`nlKd{LB3
z$w6?ZELvX=jUKGN#@I;aUNn%CWo%b$B&?n)IzVH{-QrJMN@nQSE^aB~tBF8OdVuK{
zz3R&9b8#X{Lq(Ax2CtvF`A{M37N01Y?YCDDk4m-OarHW&6;0M|-&%=^1rN+aKA2cE
zA#gAqxM-IWWeh~GMzWp@{$eJ+6*lgjKG?HKcNEsy<8W6WpFAryBisMv&ZzKV5@QW$
z1NAk(HN)j|Jq@Bg2F^EMPN03n+EbG2T-BLrS6XzR_)NBFhDT#AiM;7Pd4&dRK{yX&
z5@R^J>I1B&Q6Ih@r9^pV&8fQ+h|e=Mn?x}g^&j?cqRI=INxC1*p%b0P=ojiRW(m<{
z%!Y(igUG|Xx^g+`EF{Wr`y+#}SwM13Lz|HGDbgx-GD69cvJGk8Rmvm8FHux{d=iaF
zp7=zb%oYFRSIwx1Of_S=d<cov*+rSC#i(zi=8XK0w>MZ>SCD6vSES8XYu!oDNkFId
zZIh7y?6cyOU2?6GsiXimr;hDm-!s4guIBHLznxWru!=f78-RdlHAyR&r}5~N3m+5Z
zr@Yy(Ntb9DEw61Vm?wuQkrYxM-Z~-IcZ)xT2zzOKbjxgaCDRNAKdRF-wPHj0hDI;r
zwgHK5d427UY?g&t_e77?GFh?V?FQKwT^AYzr?K@%QW{Qg8s+8Y$EXSNV|Lv{WnR=d
zi;{-US>8U1Z55u2NllTTGOSEwN!h1NjB7iy&h2m=v)e}KR>ajTSx|Nr0d0HrUKFG9
zw=p@NA8!vt=;ZcwLBJSTTy?Y_BP2uNXlI~kFLs%!zuJ7BD*&#?@(RyL+O{~marGUF
zn_s6fe;+F7+BfH0rv9|$nwXgA!SURK)RR#HStUqbTEO$E|N30wrq>J(YcH^$77mTP
zns$8%a0uajxp*$XgUbYL!!Pl?()NEUJ$_Z_L!bOlHhEe+_<!Ng?)uQWW8;Q1i${V|
zHPCUi{s<#S^Zan_|6)pb1{8aVS8rQY5~HMLU&`*AH<dW`y(S7r`Txnp@%yq5xAAXl
z`~S{*^*{O5#SYNlJ>-AFANxL_K02bH800wiS6TpKrU~)=3d}FwAP+;O9AM$e9%a=x
z6i|Dr;4$$?sHPlsWbZqdb5GdX38|AjzBNmHJADq_+|=){FdjRIbP${YykV83i)+sI
zpp#8B548Y#)LZ3kvREraSCA(Q_FZGbZ$)Q99Bw!)bJqMG6PO%#B(6|*l~sNMmZudV
zu-p$Kv;iUuMwS7`B>lHLzghrjQe)W{=4<N3&})<bo+&cPOhPHx0_3y2!``&OPP!cU
zFad*)14T*^H4ZpM=A?a~6*X99GI#kkG==~(Y25_r=&52#N8$jF&O6%7%%~pIODroi
z9LkMGKl?BQX3*?W3rFqlLg$ruq$qIljqgv>Q6(E7P!E1QCVC<)--JG(M>1H3l0+B~
z4T`d+ix0`C#*#iWVeJW!xp=4e#~)p^=^+QS88=&~5}7v%BY81rNM3rd{>I}4z)gvy
z6ZS>Ww;@e?$Dv~Bchbe#%ify*i_19BVMxLpZoPv;PW!Ax^GQ1MUZOxpTy@HSOiqv)
z*)$D8yZpUn`GeaSVUyNt3Agg$mUyhoSS_o-dLbVeqK{TTjN42HiJ5c+o#iRe9l<+2
zZraaDM`g<<<l=?t$IMQRG+D<--iriQ%=A4Yft6l>`RYy44+ls!7#qya)+w>}&edn;
zhY3we?t@5u5$H`TN=$!w=q<)5s-cOHAmg27TgA=0q<9*Ai(SXEl4vZ+PXTwP-?#jF
z{K!!37o;s+O-3LBGIJKM{X15kHOKq~x_J&Y2Xje2b6)8M;!=_zy#`Ksd4?wO{Jk>@
zoe@Z0jmPQJ$^HqufU!o{HM|BG@whweh_9`ELy-3b@h0chw{~hq$^ASo_u!U`_HaI6
z?N7@pa2@J}wt!e3qTQz>Cl;VAl0T9;2+T*-tFym=7petGs$h1stO;4D(K=@b4#=c*
zHvKfR7l{d32Puzx!)9Wb<#sd(Caw_bBuuF(<!vHuHkY^l_~c?r-ef6A;kVio4&V~J
zK_!HOuaxpXyg~Yx7QlPdl3gdwO<=#&f=s-`>=ZVaD{=&*(S>G<cBG<Vrqu@Mbf%Q&
zw(O@sr&IHNfY5#`Ov)W;8cBhgt!<rUbl`JQfaxfdR-IR$AgeM_LGaw<ZOrAJb$4^u
z&->|y1$ViMZ%7^frMs<cg1!0r19KK#RN?0v$>w;=%xMBj?9=u2m5TGTZ08Y{hbzh<
zDK#+W3*_Un?jicY2A+L6Ew@~_X<MSFRMx6WuGQMs=?Q9L=C1+q!?wI&{Nu4Pc{;mJ
zhOE4QC*7XMez;;LW&Pt!n*YjTm)P*cQPo1(s~yP1pw{Z8t4Ra}GR?-(vpgcbd_ihU
z%7skl$vhNSb$#^*(uvzL*Xg(jCbF71H(Bgf+OFd(7_;51;*5X_cgy1fKyo~#)(5UF
zW}OV)akVto)oAZXl&wn41leTX{en99d*&8PGqmSg1gD679s?8Zo{=}SoFX)9)FaH(
z6$U6qzJCbfxvvaLX~^1#uzm@tI<R&|tuL>pQI&nlm50B>HRN27!A&m#-?sCuoex;q
zDBV&O2v;JTWGuPvjDLcmH==*dfeBY=uK{)&|6rCT>jT?5@4-OwMweE5b^ZH2$PBED
z%iQk6j{C1zY)u?%RQu)5l?%9TWLc!SqIe^-^~xuK7%ukUxN~-US^I*IzC9V{Dz>cW
z@hJyizpg3PUvM}j?%3MKtx){m&fhb29LHRwrqg$3vISG{3I`XCQ+_qk`AA@DJAW@y
zrRYzu5kbVY-M`C$7KNjNy>Z1|d(TK$7<RQXSKr&?r3lJ3>b`Apq0E!@dz5GG+lFSp
z_$wYKs})VVZWVCliS3w44SeZ{4;e~ToC!#^{iP&^qlH<yA=H3-|FF%<CxA|GAD6<h
zQHKE7c%1C~cs|Q-U$N%}_7@@%?gP)QdFsZ?Hk)%(h48Rn8R~0>KsdYl-57VfTa3pK
z@qc*^5*AC0;bu>d6L9oZLEzy*;A@v7QS;xS>(w+(ijGe7blJQd`AVENl~8C9y1_#W
zxHYP!%PNw*JDCC+eZQA|wpke}c#%7nYUxLw=^O(CdDViS9rKt~2~Mh7S^1A#Jd&I8
z-B~L`sP!hA9wLbs3Hb?Y+b#~C!w!lHxl0a+mi$~IP=Y)7(pYr)N7iwXH>GVi##lgp
zk6ZhtmsGLC)-LwawR+I`ZL<#QYQ#l_>)TU0`6PXr8&>ozl1Jb{#@Mhj%Y(U88c>LS
z&4pQXI;@9zr}`J!NmaXp$`!00A)l#e;e5uPFL;KF5?ECZz~T1hR^<Fwf0$DQiOJ{_
z4mh1^%BpkQNS$!HoUf`xMa&kmzWv6xkuJoC^}#AnhnZI+T>^-}=LXN2>@?p-3p8(q
zFk)?V!+y`z?#Lj6m3dr|nzD!!yH*1OjaWcbmN^q?iHyd!kork>4_FPY+n%EUgp&kw
z?|P-|B}q!(Z@xBhrI)pD!1;pG!09R3dc?zB>#6Q@P{>0vQNhr+An>!jEGtWhx!SF)
zvvzpBlXcQ6Oj%p(6)Kd|bny9)w>!r94D-=z_@2^PU)uHpwC@BN5%Y02PO{F$S)cSq
zhn-vBK%rw)mvjyvx7O9rVfL*r!X!PvJcYboHrMrGvO4_ubGKd3n(HHtmWj4Exx_sk
z)N+!u;vaU2n|maz+B1VRTX9z|FTu8m{UVSc2P9y&NfDvFCLp+CZIr}}D{%*w1&^?3
z!R+Oka&(keA_l&mhjWj9%6O!6hW92pu+UEXiLK+{nSm8`8J&*=&+rt@s_Edm(o^5b
z2V)IWIC3fARIr|wY!VRAquQ9I6=cAAgrYKg?OM@|DkA{vJfCsZ-mtOQN$mlm*!T18
zR#BZv+vBNTJSx!0Lsx0c>C3G-rKn+XlUAQlV0p|w`bw<$!p^5C%RvvCp09<YA~OLc
z1x?5FkI_Hu!wM2S^!L2Epv4Xg{Q3!is->}VqaaPYZZFsetNZ8Ss#V(zZy_SJcgC@m
zmV!5A8rx&1<O7);R(_JzF;u5Zhk1J9DuokIv^&<G=x>%~jqOb+G!_ln0{^e!1w7bZ
z1D6}95^H;Ka$;V%Pn&+=09TdsY6r@I>KAt)$2<qg4$XKa2kl*<BuNRb%uRIzDWKdC
zQq=*va+-utyJ=V{(xI#Onk8vlm2;APf4BVg&OE-kFaD=h=h|*huUU$7U}6bO*ue8h
zCq5*`(szIE*_@x|os()~9OM0FW&|GOL0!j@$f_J7<{4*RvYBRZ^On8uT|TfwS=O~F
zEK~4S>p<({8Rs}J1L2D0HLS_JwkIp(l11-<m5&7?$~c3R;vmZw^(lN1sS84IBj=a7
z&TRz`W-jOj;|ED;33rXPHP$2^`d(G?F-wIs0bggb((v%f9ocIG90CF=BLluT2)=dl
zM8NIsUHdDg1a%(TvTq&kHbf$NuaLBBt;`DmOnAQ5IU<)VSs53eYV(96)3WM>puN}O
z-O7!3em!w?h|y!gvhvSt>f$UKb=C#Fwan5jW^>hp)2q|~wu)8&#*63X(HfKKQoT{V
zwmm}o`0NUoSsO`p-Vprg4ysqyMyrr`Ga0&cvbdI;1EnW#XW#C~$!BI!*Xac)W3R#X
zz%NcauMnZCiL<GaZLT38Nox#e0!MC(ZLTnGO%g|@?HhvXdG}r5A8BmeCbDZD%KP28
z$w{z;!PgnKW+wbh3`SaKm;+SsAe6>+P3J+~|5Pr_>b%v{S9+I5i1(<Jh652117JBd
zbX0QLX7OJ?hiZ0_Vb|7;$h=lB?gjbeUIT+bs?+5SZN9oTz(?JK6Vz_`P0?OKwWr_x
zu$$+EfKOW`Y6nBNoCKJKu@Kr;_B6rwy!-==^@#)Hh(B2$8Dccsbw!Om(YzIs!Fw~I
zr1;3JhGNBE`qT{dB&&X7B}M^WN57#37|*pbm9imiH#I;LsvRwl%i5#W0!W|Z73tPc
z#3CRz*9D|ZOP<OO9Lt8NxOyUD`OuQ^QGFZr<C~uRcITAc1j=>Zn%d?u`>0J&AjgjX
z+>a!&DNrCQN>#jCG!%kG7I{=e1AxMD0MjtSr`Na13?#&z`f}iE4)Qv#{n_SX=on&Y
zoSw>ln3j@qJ4@0&AGf^Beh?&ga(c4s5hw{2J&^>^b5DR~$2;v;Jujs^G^AX}`UQFN
zqD_{hM>|q^$toVJ9mqLnvhuE`?9eNZW2EGqfkd=s9yhNQx@*)*=IG)eTXt=#(qNqm
zHP6hM6L`tf(C~sXHOt5pYdk=w8!|lsZobZZr%`!%nAf!jisflYhI9DXe)}jG0du$X
zp82N^D|$HR;@6LVcF1Iz-8g8~-Zp1)9Ka8D)_+?~JlT_}>st~dRNmBLBWV@7wiqFP
zCLtA*StTEr2ud045ul)@SQZ88!5}g*N&^TH$r|W@*fb=y)r6q5@l-XR@zc>W+Rh*-
z)2mJv6=Ev@_+%A=OtFatn*;WfI-iE{NJF9KD(|J17uAGpB1g|pM^j!rGNc?xaXTU7
zj~Iy)NVv-qC1xMpc%2)~rgQaWL2<R#O%AHyO&h(Z-VOpK|I%w<Fvcqgx?-UXWQjx{
zmr=mP^%olQ4yqJh{;Ak)TPZ$&3K!gk+B(zsc;Gie9g|sC^MaSAkAo3V4=0mM=t7Y;
z+94sgY<+_S@3tNvKOJ;P`(?-%kDUcW#f>0=WiCq?Mj{0tN0fcjx@6{hF>}9Si}x7c
z_5@+hR?g$eI<mHiydz`jn~#dT&*<X!SU1h1T~r<_W)tbdE|NUamR`s@4e563+ZNC#
zFG5W2ciSCBa^<PIti2@^yJgw%M$f*(vQ@FS_3{REtjmpowmg{IPPcUjv9HumQF<PH
zFlq>aq;biD=@SEz$-)X;?XivC03ote=eAdoQN!DgN3eHthIXmWkH`mCz4N@`bTMgu
z16%u$)O}Pg@1J`ots)y0cAhYjPancqF>3DOonG`FlR1mB#NoHav)5|Q|BGAKgyU;<
z%+THsl!kJXp}(>!AZ`Y;pY=v?VkN}5E%vPtMxHqd+T%f~%nB*3WlA*kaSMLJ!w&Y-
zuy#Zh07STqtqcuT9u@4{P6=Gw3f@?U4uXEwEDt@*-gCsDWl%;JgoXf+?R2T?fHMAM
zo(wDnJUOnIDM));U;p8PV^$+Pkie=5Byj6g1_snusC<^biVrRkE*X50UfC?&iz|tL
z$oz)kGhIYw){@-ZF^T{_7sex3hMTuO{=*}}VQ8XZK2v<g7<i7grH$fh8J;4r1?Nex
zbJ!YS6F^d&OFbN0Coif{JLtA?WaB~LUDVb&h<*BNJ3Y)xxIO7=8STw>7gu89O6`(_
zYH%tyCV;uw<W|nys1YgSR81i3_?ifw$3r`3Tqc<UHijII>|L?>`OMgcC>w1b+ig#5
zcX+jTNi`TcoXCGFI}&uUHA~z(>?tt5acv=}F7U!=<*oMdXOdxa$5r@Fj^s_cMFA?O
zOv#CJAo`|pbgFS(JBaGX#h#lhIuC+HJI+pbS&h|;Kq*z6(P$X+Cr|pGK>n4BV40uJ
zp0t3p<zag5k&_>C?<BU1F*di8?;Dgt1*(k-7FR!}!C~Y%_DTWN^FMC)iCr`!K!2A2
zJ616M0bwy`#3+UO!28VQVxN|*M?QX_UV5h<iKW;u`GLddx1SYL(*9x$GDZhs8$Os2
z7g7q}<X-yCWyrR65Drj**ov5Crdi)X0ZdFQP>OB<gezx=%OnFP4v{4r7$&BF>@2d6
zk>CLy<mAQH?4;4H6^jj-&kw%B#!TQvY&L_8(QTbtlr&ArpZ-~NY-^zi^z<vxBqOCH
zR>7<~vSUI1i*Z>#YfqvAtZ9%|<P&*zP`LPhx1T@xE$m@>rd8zz^A<3pOG6S|Iv==%
zlz#mFcU%Yj;6jP~uhov1+_=A2A6=}2!LR;p@$~<rKmOmW1OLkpCH5DG`*Kp>s+%y7
zZ4oq1H`&|ye{ti)uNC&`_cMV=uw=Ay>|-59yh#uY^W59Moaxn~It2_>rTz<V+W@e2
zX%gzYJ=h<=xGUIBl4%?;pp2;p|L}<dW`vU4(%+T<QpB$4B|*n%%kXNS*rkUc08hiT
zZ)u`=4}O=0?{B(OfHwu3CqMYLyWO7zcYg2Zn7Zr$j)tHWV||75h-*aqM&U<IuU(yq
zNOnQ|YuBzIKR+Lz@fN(U$F>H^IZRHTtK{t%MtYY9spnMti-rM7*)1Fs0LWJp3zVTA
zbQ<_Hh_p=sqP?&j!Bj0_hBEDs7}u|5TB1oo&-5T9K8cBKVkJMhy?xIpfp7@UcI3#L
zZCTo6R@T*iD2>I6TbY0!AEOEna>&#5qY)rm;<hd!4Z-~?klMhk&cs5E7*PE|taEm4
zQ7?f_vZN8YC$T&tFRxjersbQ*=Q&=3U!}!6woxrke)PcNgJBw!0LJ7XNH~_EocQ9$
zC%;YWGMP#(3Fp;!U&2jST+&8p-aNV5r{l*bmG`G7b-)bl$7GhoeU?Y?Gj}zA7!%kZ
z$HcB+_{a~#=HpM;6@{PC{OJ{Ov->`O%#AJqb*e829{BG)GgfQ%E?!UJ23F94lUZ_Z
zK*Hf)avJ|^`B}mW`fvN@!jjkb7it=4l&)eD+lQLEnWogIe|%rFnUt<Cd1z1pXD~Y#
z?~Bs)pqAH0#MSO%!>u|1%3dUY0AJ(9_|iH#=w>ghg-mrZfBtodVi6AG-+Mj_;)gq=
zC*I#&0SLLpSKl|S1N6>6Ijw(q&i^xi{PSP~S}Y>iyfB;}{PVRhUh;q2Q2C!2p8xEa
zJI>ly*8F(@{3#Gao%fs0CF7?3<0SB(9r8cnzH42D$#fC;o6|{iV8#7tvK^T7)AwS<
z4e75on~QxUG3ClGiFr9&J1TUqKxq83WD)y&$-%#G{l8`3^17@=X=6!bt`KG@?JJo@
zFr_9UY;Gx#o+;=TSe$YmrlYfMLL!Jf&;)IQg7X+|2)eC@n@|P|R%n)pq=9OSmg+oC
zK-Jj~U_3*aN=9d}h<E2FJ{zcMShpP+%JxTKEhOMSq!DI6EItVp{Bpo0b$_^%4hk|-
zZGjqf(S)gyu5`f=smDp?j*s)Br5dv8f7<fvlZHr+n=~HE^Sp-0C>O}eYbo!5{hW?u
zZP9*Gz3K#A+HnT&)S|iPTAnw^r@lvIU@wwZNxE1g?bHnicW5o9fi%dIhLOEIP_Zxy
ztu>{rcRUR25i|sp>Zad1VS9liy+{vZQu_neMhibYnW~<(?@fGa@;1uNmzQ#V?0r>`
z70^W}`^mly%MeKLXts{GK&G4kuATYZAHcpR4XRO8SzUZ`CbW<T4ccewE0K!UO>j0!
zw~&%kDL_W<B;pZ68VzI&?-ljvl2|)A0B>r|c`#TUY4K>1YL3K__=l-z`%FyYNC$)0
zJPWDJ263)(dI(iT$^9iYC+L<-N>z)gGSQ;FU?vsg{30s~?ZROZFUypuCwp2`TelIU
zV8^DfaK~bHt5W>jTdPd;>=j(f3O|sn+Kq+_E`Y+8vBaNi+CH~`U)c1cI?!&h>~=4j
z#m-2_Q~6H!o9V3iA)osY<v@{^u2?1lj$Uk=f|dFMMe`q^g39xK!v@6Bdl#YKS{Yhx
z;wypF<_7@<SLroR^;W!|tw`_JjPFu;PeonZwPDbF$b0VDXy)G&-P!|HLCubGfIlcq
zxFF~PqfiBmTX`%&mU#O$pJVl*>0Fl^b_4Ts?ens$qy!7O%sv79Q!;O!>P4ZZ!DHAL
zdD@VI?)mI#x~kYXLKwJX##v+QJ6p|JkSmukPuG<-yzl3}Y@8PhKAXp!J(n^+QE-Yz
zr+9l$A|o!^7`QS!21$kL;XB#;ImCNGAQDq+KTv#t;P%cH{>M>I3~U~A1w=)3-eg8f
zg<_NO5Isu4(>+JeUU3e*#eOGcmpsTDc1kHjFpE!Bp<d&05_7@BZk*=z74#4ixqzNI
zf3FR-E3Xk4N|}CC86p;haGq7w<)Vha*UnCN^Wzt2IK7gw`ri~MO7p!l%=yeW6Koyj
zNA{MaK9WzjXuaQ=DLC^8h=P+Q^JMQ69b=uD=FkQ^QCHl>f&8h%=Qf1dV~}3TS0r2|
zUvkS*ur!m{A5atIO1wp-Q`@7j#zoJ3il4czA*jNArNtGq@+cG=r~NwK3p~k&>OEWX
z?7N)`w|OqV=bt9-onSSqV7{sLK=LY)RSmZ>3jp`bk%a6>_{Q!&?kithF?3pBX%!UN
zOBFz0(h7J7jstsCm?adpU8!cyg<2vi4RYy*&G~yz`M;XSk5wMyr#3r;ir=sasVc!D
z{{0j2=j;vM$U63Cmls`f7Y-*tcT~+cIvNC*92EyvG}{L;pCE8VK~MjAvmHI}hPjH8
zLW$U$+LKqZPc~-UZl=+@_~xZ(AfTAxP#$3ZPNs6gh~lp2?rn&9K~9kzm$8fur_rH%
zWd)>hYMSEIHO2P|;7<O`?s6P94_qC`UzD6_2(|Cq(QQ;eR&Vn@H;ASe<aq{cPMo1F
z^9-x&Ek6?aQ|H-0J4eG~sRddko;OXM<!V_sg|>$@)9qhOwcS`t6p!L3>ZQEEu4ro%
zG+EFZLg`AsfNM4)qP(=-k2>#(Azb{mY793oyHRM@oSta46!`2`f7a@$bGrF;gaB7C
zxGvU(7yQJztOJ!o!^O;$^WzH|d1+m<dN}<s1w9O?aqW)aiS4%(aOCk+ZOoYC0HL4v
zuWj2Norsdl?sxOeiekPjnUl<g!P{FMQK*c6*tm_qp%1!{7Sr{Ws;b@4vWx9`a6RE?
z-YZR6L?m0*o^ve4TsP?s&8U?im7+_PDFH>ctm766n7m!&IrdJhD=7Rvp;!vqYj$FJ
zhT%EBO4c#Nh*F<&#6iG+;<SH6PL(6iSZ8>>`J&k*T2&8UfN<!Rl*+8G<|F-SjauAt
zCtpWFDK|jpkPN~DwZ5RHnR0A}iq44cmG+kqN!c7j3LVn5toSF@uXk+HDdVzs3ED(r
zf4toV_xO*?+6Q=p&antSX%_m$<VIo%zmS;Ao{~X8<YLqt4CJ;kdj1V$i}DLjmkSQ>
zq(_3(yEUV2=5)5yi?}+eoVHD%wM{62FW`$)x|U-Kb%&Si8`A<soovaVC7f3#mWRw|
zUaxcWvkdb>EH<{6K{2*F&8n)C3sAonb08Bq9<M~+#0{~Tbr~m8x0-!QcxJd~c`0jk
z$kA4i%c;n87AX;9BQ<ISIkbjyP&?Bj1I7lsz5MTJDoEqvwvU@0;7ZqzY^7+hSDCg3
z?hAf5R)3_4ih-W6TT-?L&E{#H=kCf55KZczaofN+yRO%l?q^=%4MKG5W{Z~2CO4pG
zs~N{h@1Z|@3!2b-7KqnO9KRt9(tfMZfEFY-zjlQv2w%hV&81HW;PHS%(!QR1aQy7W
zP@$YLQdL#vhDzx5p8ArOAF4JpGxJdf#KBfRj?;HeA_wQkbvmXiT^<a5T9ctB<pkPf
z&!d?Ss`reY377<3?N*6hCP8L{n8_&jlf|;j(<6g)b`85|i`(j`<{8^-o-5xTX&{PX
zVKRHeX7*U~7hE?}S<3E<YLfLwS|zZnAIW#cmXmNgiWPS~=W}>yx?Q?`J^9E%4FP{n
zVPW^!1mxe$F`5H(BVNl9VyA?CG(hC}H<UE}Er_Y`$UXq%l=4$-ujK@@{My}yQ)}Q_
zHUyq=yC>Ris$J>X6m0_S{lvYk3Fqv6^}zfkJ^jt)SdO<veU7bxw6?+4aBFAHQjT=n
zYbD|utd*Cx3M5Oi!OtBSun}v2m_{*q$WPffeC!PD;S*(eNjlyyn6c`sh5-(bEu1%3
zdPrTJ19sY9DJy6zz7&wmB=`Zg&qDtA-1X51KVEt-do>y?S3UDB>@MuFBOJi@pTLxc
zK-<a#<K1R#!%b@_m~%?B<!)eKR&R%7^pV*5kQTROvNa&Ort2@WQ*(okR$Bz0m89k-
zj2o`(i7S|SiHT*V-{Tn->2h0#o3VZd!@YE^+kGdK0l<YjFp@bC^^%SRBf@szwGWW~
zI408HppH&FRXzV3^wy`8Q_;&qU!BQ8O0|G>Ux?UwQDo5N7{P3;&YXSrjI<**7>pgO
z)$C|cuBi}#M)<2dg>IP$bB-%xwkm}Om%qwb))C8{t|p*uyz-{tXRfg7@KravJp7f<
zRvDy}W_eq1meMv8Zc;S3#~_xJC1>|OLg>Kf%5#@8+wK+E_$Rh<l`J?fEhOhc<Qsw^
zN5~1UTCCrv1^qmX+zN6OzBJ(yl6m+Wn@gL6-(?gZm=t(Z&H6f6>B0~P8=Om1>{k9J
zK$+aEOVW#X@>Ft_BJ7>*Q&&7nPB_=LSH&<3`p09s*`@A8cbyXYo-(`k`!4t{9%~+R
ztt26;Un;{keBt;$r2$OVzH)+D9-wm73!&>X1vT>+8UMW^X`r6gx`U=P&-JpnfiI99
zj_T1>O|v5b#b{9*uUTahmgLNGANB=^Z_;3$kWYjTPzAoO8Cj;)t7g5fKN55{SD}kn
zJ;7s_as`UJLS1uV*1u4WC49^?ySSuU9P?4&cg{mquvENe(Ntp^1HtcOX1$;S*lVz6
z=khrFASqq$be*jI%8`Lvg-eqG&a;dXE@6G@HJr=6y4!%i7#-}7kJdOesMeXzH&gB3
zta~PeezFJ)(83kVQ;Ip%v@(pC4pi<WHvE>5Z(M`njtgt#W4~h_WQDMcZLvY(<Pu2d
zYiAgU614!V9O6<Q`*s_Tou%%WD<bISkA}TA*YU02DBXSQm56o^aVgi2Nz0lw4gclM
zy3<Fb-`rtsHiU@@%#5Pm1UdRmO%H)pnpIL=L4#n)Q%T(bAg{>#%J1wMyw%;@Jf7?V
zzT9RF$U&fg!XJ_#1Q300wChbggQ7tS{A~52YXaex-jpJpw`Ssz!O&{N<an5zHzy}>
zW;=g<BcHh=XmIpmouBi)m7+9na^e;Z;W8UV2G<~8Ql<g!z8)ACWN%;rdzj;d3(gfa
z>Oq%+?DO`Oyx<ynq4H9$<mbdfg6r0R)L?9DLxWzaL)~%CDg#b;;Ir-S%715tbSB3)
zs&rEM6;9Jy8;nomVfMo6Jxw%9yo}*6_=_;`g#?alS;-q)!pyGj>I!`4>3XB)p_Fa>
zLkYZ|MXR<+;8?h0!Q)f!nUA&L$)Xu(nO&HfW<Ej?*Pp0)&v5V%7Meb|xuYuKE>A=A
zk(D2jT!CM7=-MLIXCX@G#VymVsw$BaSb@2}a|7?=`6<KnF=qP+4sx^41suoQzJin0
z8DTRto{lCMM+fBEnIEb1F*YGA+9eO1916NTQu1d87+ZkM!Bg{w>;xk~t-BlTSx%^k
zn%0OKsV0xrTPtQjj@#zd@F>^-Mu~Eh_^%_OJGS?CKT=Nl3&FF^qLTMeB~qb4k|ORr
z%PJOkr0(+C0?b_OA?xn!)YR~F)=!nZT2?Hrt~3Erqfdrqdu#)cd|9MIVGEj-WM0gn
zF#29l_HasGh?(b+EUk9U2ph?|mt_$7-%TU+FWJL*fO_;x?J|089Gz*)Qb*r|MzxTS
zB20986b)diFUjWXNqJ_2j9Sj@NIF!(PKQQ3V8DmaHuKG|f8J*H4zlQ`-xAARL*1BY
z73#5meAn`}iGLum@?&M-_kUJ&W^Ct(W{Oi~_*HF9(9TY8fXzu0NO7g34O4sR@EbZ8
z4}zCRLg{yUkF$#qcqS~q<fp0L^HjD?a}^k`I~X&U&bdRNm$IO#qVe$uO_haBbMGKi
zZZuLDg6tM|lo%KET|xzZ^S`4Wb8Q?v+N@wbb8|-PBS00c&w^eTFkn_g;AZGWd@m!J
zjtBTq84(+{^o(i*a^123Q1Y}ald0X`z{r`@QeZY&0xbSS(J;D9$dxq9f;jh&x-b=f
zUQ$Uc{8<hXOlwbYHGFa)NCyEXA)gx6Q{r6m{7g3?eY1Lms<vU;wP;Mkxc7f9XufAi
zk;JU&sx%7AbYAQ%+-^8udDQ!FOBZn#m0kd4XGEwW1n!fCqRr`CBEw4v#yEo8e<Xjn
zv(pOIZ4R2f@g2{Jgi6&bFs^jdcS&sUBCl_ls81SlLBMiWb?%y16w86C=P$a(-7f`y
zGR8cB-ZP_-uR|)8(P$bVybK=;peVPd!#(LWkkOOnU91c}!%A{wG;FH+2qxcS@^J=1
zG{8883qu257Hm~Vaf8GECYpMoN}QQn(S(*roPLJTBAk6N)}OZ&oP+TDpKM30gk^{7
zT-y=uX?big0)00D7^qF`XTz1b2D>ZcjYa8xx3h>^?HJ$7f?E157&GW6H^E{@JZQ*6
zx(sG~zaz0kDB&=(AbU9*uF0W^W*JseHXx||8n|M+vwGF2xyIZ(OYA{x4$z&QQsVhv
zqg<=M8a3;-?mTm>b2}6x?jyue|8}yfmW=Y-;2CmH?xs%n$5m=wtn?_59&7^cdjvqg
z=4N0SOc~GhEAp#!Q3n#&9cVHjCWlWVYSjO2G0vHEiyBTGe|8aN+gHaxQY4K5ir<;I
zykWHma%(~$isw8Xty6}qzl3<QZVoQ|0$8au*ew38BqcSoSEZeQCZ#T6`Q?;_yU~L2
z#UNB~BuNYV!oW6rM+<mL$wVI$&6Bu<`Q>Vp{V?lr@TN%sf;#i=oWz|?{}o2P(OLx)
zP-2p$*6rzPZq5eKeQowTC&GbfWS%9(8kCPr4zpCIWRtrP;X|>`1WyI$1&u3{Qun1A
zED6>JoQpko?eES5iz2{yi5we3CORX5V*&OI@gwgJ;Gyx_@eLHL6IT=8kg?r!+XaH)
z)kbmN33^FhAgK#@DChNqb0=py6>z{dp5P<2+N9*A0a-Y=KYf2Qvs<XfKdE@M7#$|U
z-SM%?EiF*Zl6tjv<F+EAbC{38_477ib(AAUm>SH=^KtDU=bLU;z)B1*v|E`Me%-;Q
zsvksKt+(rjT<BozpxjLWT)JX;vqgKET0m8alVs9rW3DqHn_S}(>oN$|>?=*6m{&$!
zulim#>M5|SEuv?;cXAoGLmGH0L2-F21MA@wBV`<K-ul6njSAJ2isZ~JKMrb^A1WHH
zPchqj!+zT+uO~n<76UTVOM`&I^S(L;tD+A3o)?s87GmQTaNT~TE<uQ!zri@H4P8L4
zm!K)CE=pz~7WJ!S7tjWO>JSj)niO++Fz|~lUQ)=YfolNE$v>7wOu+LH&Tr)n8DbR)
z5p%~E7;CeI4%u(8kFe~N0+4wil|b@4JYKi=Gmk(5ABk6|#QeCsPLR6xUd#brd(AGs
zWxmX!nVaXonC@MJ=geCY-5PPKh0bVGl2iidc=l&;?siF9cKmP3`Gq8?=XTBTJSPWx
zX-fCpoz*c{wUbq@n-KVgyG2l<RV0S@v5>R2eR2x30ylLOcDuik1zr)4`UVPKoGTXf
z5^qmCW)EIDy-%EERlSi+Bsq4gd94UH4|Na1&ET*ngVb|LlJC;lVyVmz)Ga8MGTEye
zd6x8eUmAo%1S4KZX68{})uF-0->qf_YWb=Kf=+p?lS988H}JhmRxR#9ypX3(JGbl5
zcmr&bCJ^z38p5ZTZ;>$q+FmJq;ZhpDHM!Cncu^uBoj~$$MspM(n>(uvb_R^x`0Si+
z^@ND*p%GHoy6ruL(%YG)j!W`()6A{0jm`%V()(nE8v_e{GTR+#S~^@iz(x=GG@%hC
zCyiOJVXr}>6nN`ztk-HU6VSp#S@!9K>H0~jVw%CK@UoA;?HEsEYuG}Kt&zX*ijA66
zmq(Tm+mOq(q`OcOgtAy*gbkeUmtbqXnOcw86RDeFYn70Kd-3Jvrpw;Qc*r$$yD)3F
zf9laCO;qtNn3k2$4<y!|@<U%k7Rbbb3N4csw4`LZpRTu83j}o20lXyc-t-t4^ZKPi
zeSLA%`kcf7GVT}|K!qYW|FSdW%&^XgC@2@c;(ZaD|9Zs+sh@EuuE2jn>h{bjldzj;
z;*n283Lcq{lFq%vzp%fas=V|EDYp)9_>Bw~^mM|G(}w=~R75R|_3--0^K81j12$;E
zOCRYXSivRrXAQWntRx>MA$ZcSCmwyOv+wjAnUnIL^1$g8%+y)u!I{6Z?U|!dstoE*
z29beBln#OhyV}=&v&w)gDNK+==yfqqkT{cF+p1>j0#9o?sfdel^wTRdQ4|IybR`!0
zJu510q>_>1xiuY9r~SB=Y05mkz$$v`-Okl3^Pt9Xr#_N5-nAXE>T`5YHenGvt?hWk
zTkt^`)q5L%XP~1viwKZ#>$XY=7%Sg!rZ1UV99uL1V)|;XxgozElzaG_%0zPauCkE*
zNicJN{miAOQt=E~5b5H4DN2H|XXnkGfFkD{unGLxO}ir`u@+@V`5CE=e9K7i{JfMV
zhEM_O5@lR!B;VEBBbkV_THXweL@_H$I)FiOyg5reM-sBFg_2%zR*7o{S7=rVIi)}W
zZtvOrRVDZ4zcexE?Seb!y_;yEZbk(b1Ir4+DXTy|lbUVNJYP1QI-E{XkU(IxMUWMv
zGJ|mmPoGD-Z?hU8LrSbNZGny9;WV^Q+|4!%G?w3y&ui^uL;hrjHBXBm3m(>vi)HtO
zpAURNdY`XSZa>~W0;_pceZ^fy{LW;E!}Yrcmpq+}c)XTc<vlmX)}1UL&pbJYOj9QV
z^zZ_?u*pQtCV`<Ooyok5-9VK8tziyeq)%;ThA`gYLx4SNf~{=in=WLph!hPXmr+0~
z@IBNR(oiUWJ__16*?o@#M>RJ{xQ%u@=GlAB&sNPx3_;}wRjBSys@|Y8SdK7E2SLdA
z{A3%&OY#!Nkx$0c`EY9-yq$rchtj|LBsjM`OKk>L+$0#(?hS53Oo+jlYa2@2GY$`B
zmB^H!;(nVnFT$fvD$Wt+-y=PRc%>=Gbn?dX>j!$btL1W}Cw%b&Io;n;Z6Px)mn-uU
zz=V-N{K4VYj`@P$TiPxf;JfB|H!v}+E?ba7Tu9q<TOvGRH1B@TwTy_SuR%+o-3Ut5
z-V_9@JaB?)Z4*jzg@b|a{d58VET9!+OoIqM^tv5DD^Ch9C)wY0$U&CGwCy(?0`fsk
z?kqL!Au|s`W`01fc5iAY1Y&r*_JNDC$1w--kcyBk>^V>(XsWRn_?!nqzJ3kdgd5ck
z+H9B!59hJL5)NcfaEaoLrvR$|h}ooadeyruq`q%0xBaGlunnvnr&nvMi#pQiToqeI
z3?JmL8EN~TRQ_G0%)*F!QPCv0mrKV#u=>)<OK}$*b4~42O7shG@1#Lp`n2qdvTO43
z5SEyC5Jmt``~cH*G8QY=F~WTKzGs9`Ygy3^`(SJ)#0-zJ&jj<mTSj>!8FTY*fjNxB
zRYmZaQU$x^Wrl92EJ4~OfH?SKd<5*$+9hkk{~X8tuQJt_#G=2~o?dd9OVNftW-xrI
zJ;F>eQMbNhO5XnZrVUIz%TZ0G#{k5OmjG#4vYYLwXdHs#`LSu<AHR554e(ewOW>$V
z{Rqpow0HhrixG?dm-^}3VbryHg1pY};Jms^zA?|V=qi3yp=mM3aaNar89?rg7>gz9
zMt{FlJR^<O9-JG{D@eQ`S!k>D9t+uo-ydk}spW*=Sxfmz3%%SpY1*R$Hfd<P3Z(7I
z%)9CwtTA#FSAuLBQhf0)W(X<%qgFVscknRlq}O<jI*3$h*`O-Ld8ngo{3dB&`sx8F
zV?$3f(?ZY4Ne4lCJ@zn(v7x=)k7^Ea2!6$~lrNt1E67nFURqQ=v<0AFqf64Y>iq!p
z+O@QU^b`<SKEx#-(UO6WaL6s0Q+`2kB*&##Fn%O_9l3-SXxjM6FK?Mo$&%sB;f%0d
z+n0RkU!IMBX03lkFrCewYx+mpxl2ysUzk&XdHKIC^Kdk+Ga~Lgx(+FIBk<*Obq($x
z<T3t_-=II0o&bsu5Vk)d3m2~af8Db1KXF3;mD(`QSfr8U3_3TY6m)H-)J3J_Lfa%}
z7sBRC=v|KWizBXah#553K}q`2V#ImbvS}DK#!UBa`YLJ@GYX3j`qr_<Zzb#n^fA0j
z1Qw%`kUFebu-K;_|GJg&DP8!PZ@GYw65|t0&Wq`Q>AQtP7b<=2^nxOWDRg>^)k7)`
z;EYBYV6K|-uL6QBAwcga#>*~m1N`vBtu?s}NN(Lj(20=4tPh!+sWq{gA!~Z$`co9?
z8P5vl#v7W?kgFo{<h}Q-@wuS&f$M16WqSJ83TcdD7~`5^<ijA42hTl?_ikclQVL6e
z+VA2zLz%2K4ikoEGO8ctTbzIH+Y~*gUu)t$V{^ir-k)-SJ`rC~Ki<%8N0l^GptS`<
zNxUi_dlZn-a5Qv(K$Y|F;e(kt3;?X8i2_50HY{<d?yOYzd{^VQL#KEV5m4jQ9;{x*
zDM2QtPk-!R#?;K9V4z=RjZ0%>87zwi-i0?{VL^W}`u2!eVAX)vw}*HYS(d{?Ec^C}
zy$hdM@(?u}p-xxR{ZZPV1s1>y!G8hsy2plbrWc__gH$TUgk_QC6>8NpF*%zoR@`5<
zoNQu@kD71eqYb%Nz$@;X-hXbM0IXu@tt(5CsQ(ZG_A6@l<tU-57iXj)fB77Ot>2bJ
zDBeKJMf$Vdg2n|L*=Le*cS@K+fOjdU2>w(}Tp~aPpIp0mXVDq|jdT;|(hbVrJC@I0
z+MtUhoRk7>csJZGhDC*G`KCXKJTnE)XI{(Rw~(4Jj>Pzf(yApD`EOulmN+O<ipqi*
z^O)Y(&x+k*+)9>f0<Ap9UVY78zbf}}D1&Xo!t1Nry`PWWV)lA%!QO1gW=1f8PsQjl
zvRAF;3sWE7DTTyp$HUz2BDD64%^>pz#!KrUTI5P6st}RDr{>tgyoY~{UBIOpeT@td
zV-grqM`_JMfPrswi2MWC$AL$0)njN-b>$r~rG9#TIvwLpYne`(Jb1D379A8Lt>+T4
ze+mJQ7;!<TzY6w*-m>7SAiV`NeZr6fM$EE>5P*)ln{jQ`g-|2Ddx?mb_6A`dkO{@!
zt7i=4>V>RcLhSE={THs8!~KWzR#n{$)<{nf{8Yc9qXBqg5Jz6V8X$%$%$$cI2rttY
zx4+M6nV5wM4e!5I-2vig-ey0ckkH)*B*iJ?J=i4Fnu5FR>^Ygs1?;zIPwHKOvj5z@
z{wa#5AQ*~o;VS3$dTEAP49QH7nihar*Z#q2FQk>buDo1)?iP&j?6Vn|1L%M-?)NZ$
zkYo9qugYrkidgRzdv!cXKedu9&%ORR?8W0xzpS|TQ25D>u+P3bMTb>R^ZRKze8@^W
zA7N2r5vVS>A?FCM%R{ZLr|zD8w(GWzuE*{Rk?&6>39joZ#XY@si}lXAbMLM^+Ofeh
zbKl9GT{8K{_g!h)mrL!Sk|K^_F$KhyHtKlK*mD^tFRCL|dR~FlzEi$D(|fs?{=#EB
zw0LSvuNG>1IZ6=77%v~og%P%meIeMvn+Z##9bpux%&gY@U}MVSJU>l#b1JDTm>|2s
z)9*^bOe-0mEc;wPhi5!57{4P7UWDDfO{2CbjQQN`#Ou&T2ZAysE6Vnu!^I2|?|<D1
zKlqs_Jw1GbA@J14!#GdI3Bf;hEKGy1|EVS5c`d#hF-o?aX&=3Ue|)b9M@MInhij&K
zx4VEfoZPVcjH_{^eS@A=FFTVDn$d-4LHb%eb{kl&tVPdfmt=d>G9R^XhiClwu4UiG
z0{pkn=EaqF;g1ZDC&s`2hyUnz@a)v*b%IMs4CljcNxu3pESM7dZ6^h{N9P~jhrjg4
zE#)oLa;{XydFL$_Vok3~yNpUN96!e8htPQUM;^z`C4Y3RX<oHo4Hn_BuR~zw-p1}a
z&T9s=v9*xfm}F31;O|oaJ<WLCy`u3=S`gm&^F#bgC(rnyf9acyu_3lPcYbyPFVi*9
zJ~IKM(PyL~)8prq1PePGZ{x2qy>N>0bfu0lyGf#yuTaIFnCJ-ux+T1~haDYQ%b8Nv
zz&Hb@<C`cE9xm?~<9d9<KN=*r^NUW8f{?GzPcN3v2OpyD5Uqfc3%|<iBJU}eQkg|g
z+7Gvlv5b9w!Qb8Xpc+Ewmg{J+-VLV=GARjuJ3Qkg?lQ*l!ubGhbm@bEZ~WU&?O*=m
z;qbj4U#_z<0{Oz>P?Tu?oqD@L{TuNK;+)Vwx(|P8viSVeJA~~GW{h|rA|T@!hZ8G`
zke!ZLIDWM()D6@@^;7XZB2COQ!UN+|g(|S%?$84V@|)julOe+3FkkNCSC_<~n;$8j
zm7$oTzwOE}IKrB$yreaznxjC0dp;Q%M%`ZK;>!4?^YuoWd{s&Nhi3-LVX$l(^?Plt
z_dZuQD;HJ^ro!_-EesIGXO%edq9!Z4_A0jlhV#TRoDV#$#n%?#0|xE?w%WtnLO{He
zVqHuK;EkB=;1#!T=|={jWFzv!M>v&<)n?xk4fxWl$4js2;B@5tLnB(KF$dKYwl3|F
zDB+$@N<~H?xz0nS^A{q!^6q!lkz6S~t`pKkthBLb2-P@5uf53;-_d@S)B1-=Q1gMS
zdGDLHZ9Gknwnj2C{DsR|h)2mO^WGoRdQ02iKZ_hIgE|h=U3JIjB4ugLMM12`GDuF?
zud~T#AKbQs*)y45^1|)2^CG4B)cE!fh_#JSd(&|+V4pf+z2wfp=bK5e3ZO6oZ&LcW
z<aVT7+0Y0M*2sr#5Gs6SnL!n)=7dp*DeihG!pj`q3A?cKeC^rjXfc`n-RpUflc^;*
z^wu)c<b`wgc?QtW`^dm-@l_qfn2vpq=`^Yp!ay5?*bvm5LwIEG>A?`rosI8;^&;Ja
zw3^B1axS^Q3j%<VN#sNLqcTx!Sbsfs9hB3=Sn&>>Z4ggdKajd1Hi+q>=%r<wpT2@A
zm@y!_ksub>7v66Ja8MKU<VSJvu~gL<?9|uAkSPM9%ntsAgq?AIN^r~mKqaQdmsBod
z9)3$C;Oz(~C&zX#Y(y45RSDeoYQcbS=?A>KB^<?!#n;~n46i=CS!2SnummtZrj!If
zd%~H|&2u57EqoWZ#E%RX$iFm$8Q=8T+|PK5;(Z1RxAd%7Y=^2~q{Mu5OPcJd<HTSd
z-G|#*cqZ@1dr0g)&g7%!i1y4e<i)lBd^EG;Mica_-{S$}7+M1V=7LeJYO}2zU7q&9
z-#d*zC{>JKfCm=-zh*^Z5}FX^d!Mv_b><|AvDm;VMzk^ZQhhQguJ*kc(;X^H+D{}(
zh^C<P_esN=d<Ec|UUemP=l<2z`)MkG<`GzA+Jxft<#W+^<LgT;qr#CjxUR4Fg~=)<
zH%dVP=4QetN!O#sE4qGGE=Kj?`9utYSR=*BMM}{#&~8-RC$93I2JXL=&cm$_G175T
znshoH$OC1gxS<AISE1d=+pAZuTp2{IVzk%5tn#@@j@&}&t>YwVDC~sm@kt$6I#x{a
z)0G>TBp%-Z=*!A1!Pc{wn<O^=J`e|zZ^^LHo4WuvM3}XYH-GVr<Izk}@gMFZ8erUj
z)b&v&=XkW7+rE~3&)gWvSEdLXW9}h&09%eQpiKaLOi%F~vYGy#aaF<`t~P%hM@7;`
zplJD|K(LReE$<3(YxK~b<Sc>k{Z<<J-<BJnbjZ)f6RuyTH^8FNbN@G$L)uV8zi;Gx
zHWATdUVWd%F;qCWjR>El&nNFLf%_UE;mrFy7qXKL8+hd&pj{J^pGybaVYfke?VwGU
z8)(H>&6lPDRM!&8<IU;W2vH}li+b?$V6zY`n-&OuLW8(W;!$tShx>NWfQWN)B0CHT
zrx@n~{M)09vlu%>p;Q5=>mCMoX^I0`rB*!LzY_`K&*a|I4Lx0UzN*M>s9BSLa$96O
zNNhel@knAfGP9Hst<#qEM<_O@BtMGHUI)9qTZQ#MeHlAdaYo^AoV=xA<O44AY&HLl
ze3eMIMj}%=hy>7{L}`XTNZ*V6o)r*1zvllX3n>f)(aHd=k@LziXl;6pX^)a|PXR@$
zcK2o=pWH@Gwk9wd_EWweCg9@+nqZ$;hHP723v+RBaIBS8_i+ID!{KGsFE96$Qhk-W
z@<4KS=XKR2qzaV=nltq*`k8{=JY62p*H)AFOZCHdWyv}ZCNvqzCy${vv0qU`qo(0C
zeTv}Zmae32eZhA2H^w-}I)M6>Ad}okK&~&b4x6hyL9?W`l{2}{Z41pEnj7hd{WtVf
zNeL?Vj^K*}w~-9gF6{VOezx&?r`)I0L++tH`z0QkAC#rah)WI_Q9xKL*0wRX#!6(8
zm12#+w~TR?bI5ch?D{KQoS9;7o8*#FVp4>hb=Z86je5GM_jK8GeeY}yAN}N7BZLKR
z+Nn7G!Gqji-Gk&2>I<gB3mz`Nhiot=5j#zzqZ6sl@4hu{<vnTD1j<ZEL|4$ehf_3v
z>YTd<D_a}DUMFvddi)YD>tee$L+y-Aj*>TM7#$B)?;8hKu4876%)WDF-qWI|nP-v1
z9bpR0D592^q_($DN4Ec#!Z{4`roT~k8t*r>k2)upvHT<0A6GDxZ(pQ%^z7Mv+{lIn
zNw4~s7(aj5^=UIn_RV`xPSuxDoF6cuC&hLV=7@0ej<ZNsu89DxJVw8Ju9O-;Wo@8L
zG?-|Taz_nyhe^<~H(qP0p4ojtz?BPZ&_pee(HT%oPVJfw2i@4}{JCMuoCpobctHQ4
zwO7scE7IfpBW8>EW)I~|g8fv1<T>IydjuC5l=SM7OyqT$!cV^i6VF%4a<+qedQWjn
zPHrR3A{#MxqTLAZBl<;c-rUh<I=y|~vw7<=Io{YVsg&Z^XCB))_0TxUR_7%M7o9^~
z&e`I@?Vzb(YTLX(E@)b+8&b|4uj{pmh|ZFH=Ne!)18r~rlCe2zfg(eQDr%cie!*0+
zXm1KUZ>E^q`XSEgxY^u%nVk8x+>mB?F%ktxP8gZ>;0WK`pnMs{b4GGh-G&Q@9yzYw
z)ZF$HZMOtH^f}MWHC1`t^F+<^xh6%LRTDDl@tp1A<8zk_*|MyX*{8%l6!I7PnD<;&
zt$A2L;UEgopi?HZN(loj47OiGKcC+lMrehcYU{k2k2ei7e`&3~-fCq*CN7HbB<Gc?
zd7Ae;1*_bDJ=GU4sIq+-<t5O55LH2ku!(llZp37+$3$1Yy<+91q}^|l&58rq`#p4c
z6$hC2sY}hkuse2$!u)pQ#z%Vjq25%=oKcQn#^e?=@|g>(N&<hTpmB}N*`BvxEjXl&
zx5T!%R@vj`+u^AF+l!}fl1l9Ts=}Ei2;!l9icv;Rbvpg2N8gf8tbFLtCppRPu#f0%
zkJop2%)?Jf2;4Eb%{<UeKikul!~I2cY^kRtwp_Q@RhFbSD<+uJNAPAfox<+DN}TWV
zo()ZGpefG!&)-^3WR)nG8Az%nueEQj@|sNVmmy#SsX9a3QEphxxm@sv^v(Pg?LArW
zp2m$B67Y)BhFUV?3lJcZ?I4b=qa2v2k_Mn7mT&Qd*;p;JpV?K-6n~F7a%)>IIU8*2
z(m)$y|0-#ln<51rg;!Qsw`riFmAfeGm*lOtgx^V-2eGbBrsf;4$2LiM8HP$_X1p`6
z8Ig+OGNW_^P)8<Gyz_=>H|XzDJF`a~xrcB|{~-)2)bln^I#aVmQs1T87!e+<89C!S
zvJsXI4A1V~6D#pu9u1qvCXsuYqBexe_XrFzdwZmzvPvu0@to~Dr<oGTeDO}+Q)fU=
zrH#xJ9jAq<B;*VBnNSR!-|o0?c+UEJL#+pKl189R_{=tE;vQ0WM%a>p7qWnUz6gqd
z2i`VhD2InVcEGrTEaAtTN6eoOa#db*EN2eX0Lz$FYAu|7ZMiNO_l>MsxNTm-D(B_j
zxn1;UF4)TRgzI|8VNkIhvtN0B4?9HR)1ndvyOuY=g<c`M7EC0cklRYTsbyE5q(%_w
zJ>fV8E@dzAn+U>JKSFX}mU-`RuEOCVF=Ge8cV5aFWFD%&)-xZ4#Vnvu1$JmVSos^6
z*ESdkXmQ4VWX382sQJXIN92b{Z&1Auf3L5kRijwk1Xiq9w*FF*vCORpPpwQ1YzWqI
zEZu-S&OhdG)?LjhcGYjv9BDnrQdbTdh$-81ky>)%>vf`dv6Ksebcrp0Y$z6QVb7sF
zvxGCMex5yo{HIbbB)M$dmD~mhT&<ZHDr{T!9{84H#CV{l_hW<M%1BwV2<xCRtbsQ+
zRA;F4?aP^hRSq|Bxvx5Q_F;yq6-k#{!9xn=I(1#eqrKsn-l~hy0;XL29Tx~MUaOcY
zT%7=F*F5smCf97Q@CqQ+uj9-dHTQA8K7&{{dco{hs2b(LsTT-V2|T4@l8HBMhiW1f
z6|hJdb4GLnLPJJ|XKj2(U%YutKJ~CYUCCDTiCJH*?=paxn+gk+>Yhd}tINYuEs<`t
zGi)%eS~4*y?)WoAcQS64eP|mczF9m;cxbJwUSfSDR-!p0dPL$;A$BK8Evcky|EHj|
zir~I_FR-Vv1a{F;MeUm*UBx7^;T86ZH)zVf`QNgk^H3r_F2<^11T5OM`jt`gvIg0g
zE$Wg#r@k{E+QfrJQle}T#%aI*hW3StguoqFV<OX_$CF5Sk@@Phqlc}(^N^Js!^*_?
zKuTTmNaQ}==vd1zds~%i>_}(v;b__!g4<1Ok;Q$Zd&BEkXF{swn6zaub@`~YP_2Mz
z-;eoT(RpBsc5iu;%{IFY5!gE?(p!DYJKV2VBN2C57kIU(AZ>e#1~Q4|Nt4pBe%H#p
z$?l4knmbcPLb%SHFgjb6u(82b@ipN(EAQLn`ES{&(XHb-G_X<uPE5_++V&kuvGQ!|
zx?wPK8${fwWpm6GeDK`8w=(_SB)hYn2kp^@9EQ6c7PrT+Mf|C^uO`mg6ZX5$oaABI
z_r9kWw{2Nl-zTo3N<hAL8zcpiUhlbKU|kZ#Y0bm`aYT!|AZ%<J=**-#PF1OVbXo{A
zQ=7B5Q(uBBNAYs^5q&+Hz0#~}OjDt2YIN$rq*VfEo}A?4T9=i*Z;@*iShX&`CeR?6
zh~4P9D<u)eXM@(70p|xWw~TeRU1>)ej=XEJuTML&glH78Rto1RH*7I)dVR@YuAz~g
z5c+wNn1>z1WfXG&B2xYw3*wW4Bt-qVSEuwytLuq8+uAPvtMf=TZcgu#_#CsZ`U5Nx
ze|tW=QJ}T8&*NQokomzl{lff5&R%|x<Sm7_STp*ljFYQ=fJP7i+%(C+oIZ$4x@k86
zGc7$SC10j}pF7f-BlkTvOmc9zXaa-mASf%a`3?Ib-De!)><)hEc>6s08Allm`_pDk
zmh1#?pxzJgD)I)3t0hb$<AnT)Af#+ac+{jRw=;?>Wp_C97`P$y>I>Toqv8fzB}18>
zK<copii)hqP7XeoF6cDmma>a^&bLXWPkOL1RS=hCO|?pR2p4kEK`@yREJ<wq;#oY_
zIpeG8(YeKXq3FeA_u3%Wv;^wkF@K=Tsu_`d1Liy-!zE!nz96Isexhs|Mj03CwC;DO
z-Y^A@n8Rr;$v3rOMg3CFE0qwab`UwiA?aGhk6t7B;NA2`Nh*>VB<{KP@+9FkM;XB5
z?@dst@eQwz^^8yepntKeBv>$nucb3pi#%He+XQ5%ml)oriGOxcpq#I0=z&d52EHDD
z!-kcFtIxP0($7i^A?bvh*q`V!d?#(wyJjVbY#bqT=y`1IoJiGn_Q8C+(k?JOJ31y$
z)MK4Y=GN?S3LzCc*%IWxx^$Zgp!z2&C;n|MIq@~KyDjXFuJcKvy(3RJv%UhfNOyC{
z8gg5~F7vQi8FR3%th29{VE1;jK36Zn;xYfgmlp@kVb=FkI^955gW)vs3b)DZGqa!C
zdB?0yxdYoZ<tRu%3$2<x2E;u?8(&+0zTE0T`wKT4)EoLsP3@j`kP7Z)`GGT@N(EiT
zpDYzWF?o9B)uhO(jsORfp&S-H3itYG$qAymZyFN5_9LtV)GOz}YNO|u`6?=#IObh|
zxjzW=b^6}LcQ(x<oQa>x#ls`9ZBbkkCG18y(IBnrcuC;B(TP0`4@c}la{kE#tQjA-
z#~7&5=$v2YT;*!mn*M6R@?3>uym*_*aVKA#RmG#an#z3EDG#6|`Yo?Vqn;3G+upX7
zlGi7}EpUDYIFXNSzhp#qP9eXI1CAnU*jeV$xnh&q;s?}P;f$;GZ&L{I3KP%okvhLP
zh{I$ES>vBe=e(fW)T`!Ogb<cgk6xtX@i9X50)U=MzO#@%LFwv}z?0=T7oRmHP~{Xe
z_VE6?;q__$kF`)@E<HQ`@DC%fvRj-8a1(+w+CT4hTOU+3tmrKdrE*kOOks+N5XtWT
z<CTK*;2HfDj>j04LGz`>%%&62Wcs`pPBv)Ue{KzBF&H}5K&hDTTd8RolT?}E<qtco
zJz<`|`hU#5cU+TcyDf}}ny~;;5Rj(uT2Ta*UZu`h5Tz+y5$R0`y@^=pI*y7+6+x*H
z=@7s|QACOY5s)CDgdQ+JfKbkL2XOS=`+d*ZzweyAzx*-&CP2#b+~vC0TGv`@`|o*Z
z5gr;?A@~|`VAbh=qtF0(jQ7dOF*V*~U{G!*EG0J%F2C#xn}3OIL7Domfv^Ai4;`M5
zz2sWjTbAA%f%w*UIyFtvms)usc<{$Q&BS!<r(790-KhQBAN~hs$hK$pC7b^(KTtEj
zUt~@s{&Ky3!MFl*yvdcN03j6LX?P0&qB$Wh3$f2$vR<o`H+PSs#3~5Ku|cRz46XjH
z2U<Rq>1rz&D<WnRci!zD1+W*QUsk>ilQj&6#JxWw>YY&VHY2CLrAMRbzXT97NL#u`
zYXp2U)67wE_kDe!sVkbb`93m@4qHa(hnHU>?~WGfg-`#Fmjv*)JeY7rZH3B*UrPi>
z)9(GdfBF?|z;d1M{SXYm@9f#V!%6zxlFVo6mH#qYnhHn%9_|qp7!M_|*x~=p9S_dt
zc&2^{fVO`hvZ#qnkx(xDYyQWl3Wt}ozH{h?uFwk_DB0x}H!x`c$XkNu$<hNRdMa6O
z!;LXh?7a|H5-2;N!Uq)36$Ji(beGiz++EcV@`UAIe|qxG!}#4_JI`94P2F<dsncu~
z6Cw(hf7(1%?z<^=XEu1w+jo`wwIMedlquN-NIn3-YL|gv`x~`<eeT#2>1^KP{R^D=
z`kdAZ8x4P!XpFAo&riU0yh3CDft&Yd{sLaAo?;-2&4(D=PhkKs5YTYbhW0)uo`Gcs
z=)KpkBP}z1zGLR>LKZjB43J>}#4zB}gCBrf2-Lc%OdDIl0j1%}S^o^aD<kssz|SCl
z|Nb3L=DPb{|HOUffm~H=*U!I{==X0Y(SOSiA0t-jdVKTG%&4+VY@w~0Y25f!suyC)
z!dv8alip_>u8;H8Ld0ormLW;Kd^OY4$9K?8H~AN{5Z&&j$G_pw14Rv&3!XEKA+C^y
zR?8IuLEz=5Qwk)S{_^WcpWMAN2H}~1^Q!+1Ka4i7H_HF%=)m}hKxM|=p+x=@mC5+g
zzgfW>)qxE5g;R)j+JAaC{+V`aSs3|T!MU1A*=u?kFNb$90fMs|jx>yibIgzF2><_|
zkU`78_y5lyPHc+*lh}9%=?XaWmwBW;H~u%fgx<T-Hy%(({@<sPl6E7OM#Prqb9(|%
zSlX;D<u!B?V>N^8_XK#zzpv)Mxy%3cefq!rvRmqaZ2ONyI>GgO=ify7-&^9p+tW+>
zv!6sE70SNJ|MYJBbB)tp5l1h)0DBkP%EAeY_K;Acg73=vY5gLh|1S}X|IZXSfAcl}
z8>Vwf(BXaN7pc)V=U=oUV)~R=Pbqx8G>B>#%Vwdi7uO6c9OagZz0MzJ`z<R|6$u+w
zt`FSpe^X<XSdRqpz_uB9jKLmFJVrc=`hjKDO>I&;&9iHz+WB%M?*H&r|Lt4;U-=<u
zjFzz$KwEx%+g;HfTIF&`1_12-&mQpqZmm-0>YSVyhk>k|!r=4&`EHEWhj>s2!(DeL
z+<|HO;;bIM&~;INBM^1n|Klb1e|ai1{@~who<1O!_Lo8jm6xz99mLmr`g|lX4j+TR
z60YO=2Pi^atC(~@AgOg=w$F0SmFV|ls{R-5N0y10#lPORbm;;VAE@9NkJwa3t+4!m
z|8qN%GMhK#yX1n?lNF*c3uCti7<54U<BPU$Kj~4BNI6g-*MmYr)}DL&%b+vUcgSXO
z1iTva=0{5@^#Bgub%NUHi#>Ju41#nlOMmy=p`(D|a08v%4^Zh#M-d@Pml-Zj?*Zd%
z0W`Hi5;_Ti(O!BiUG#~Y7<;yj8z0Yt6T&-qmvZ~T=ClEd%3K+|-GryKTmP*@RB@q)
zaulqJ<|>AO)fhhNJy0f+ZRT=dXz%MuNB7J!TL=yvD65JY#~vNQ00!^e<x<0+mc3KJ
z43O0HH4I5RaFX9v)_A1$RDL_so}ZBt=y4v2(h;)6k4Nrb=}8+&<yNF6O(s+Q)}g66
zPju5Et{zqh1fR75XsY8kUd1KFKPH+9;iYR{zXm$@IRMD1+p0U@Ajk9LTnUstywx8l
zBMy1a=qLcYFwEOEt&wh&?>6v(;qK)R0Ne-vm348?L3HrglZH~4QU1#rKV;AWsS77@
z89g}c1S>>D)}i1T-4(@;HdsEuZmWVa#N5BUxT4zt*SxeRROF0;As`-aQS9hovS!q!
zb!-ABeqfy67&6tJdBAiMYM&#zx8;*D^tCe*hRUoO;(xIF2+;?<(8Wh#v?SFVXZ+eM
z?^|-2`MRXn*uwo%?IiSa!`RaL`;{5W)tywx-y-YXGXadnt3|+U`W4sreeY1$?how;
zljYKH>bQ-gFb_%ShSe=R?zScYY(3MXfD&q5y7wT!I{qK3<sN(Y>9Ou%fQsr&{U%$6
z!F$W51DRVPa<~+nIgl@Js)Gewd8doWmv;*JVfsMg&&L9H{$3DrXvI087`D_Y6zi2Y
zx~w1=9N$XmhOT1228n2}HC=C9pP-~PuduD9{^ZSh|3RGu+vCc4(Mm3v?7gPQ@h-!L
z7!BHzdz&`KmN!s77az{b;2D_|?XwR*oPGTK5ps50j=NE5U*}*;#>es=9MWSI#=C<g
zWf<&!RjI;x77HVtrBV^4mn$sFo@`8bcOKLy1F?0nGKbMU{GOF%NA#1d-b$9Mi<2uH
zwQ|UFAO0kM<P^xoKTd6zfh*LD|EFpM>70CLQZt3zrYpCcBJ6HFdotJp56<(~cT{3r
z5z5#CXd&NvH4Sqy=4|z6E=8ErrUCPl2W~tN4yN}fN3r7avvy7KAAM8nOz{jR*u_1R
zrn&e>3Mj-ZWbZ1OG=)sg191t`q<96NZKfTVj%t~kIE5A!g3E#+3{0#Ae(S`h5dodu
zs-zss>UFHmvAH`+_|dgKxh9}S1RMyx3>^F`=XWY5VE@Ehf=fUf7`}aQdm+>J8A4uL
z#@Z{%irKWDsxaz-Nr}U)?BuVoLf8$IH;vNmgF6sOqHAFK(LGcgHHD`|Hk`^OV_|tG
zb$4aLK>h4%wT@}qOn#{rQfvb)%`;pwlri}_tkDMPF%}SK+6K7FUFO?})6Yf8lx_Ec
zi|4oyE@t6&E^@nN@RsD&4)Wxyf^+8OH*WjSeoSCplWif0GTaKl<C1aEM-FRwBgoxl
z2;)&*0Ir1!{Jjt!`bKf=3fo1&#p#-lL%bpEJ%S6}f~;$H3p?|kuYq21g4JS^1Wi+E
z_Vl(zK#OCl1+TngztZf8dz$6$*rTAfT{0*|{2nG*Gf`3?YP1}jy95SjdC9w(vlAew
z>Z9TyfWgP7%s|fY2T`)J_@>s&yL48U(Owybjcb(OutgiZcvD_kj8(kXE(IxBHXx?W
zv@Fg68!%WWaDjCma-J@E%a;hS30m#0)@^f{L6V3eTf<_~c=^H?wuS8`4^fb?aG%~c
z+zj}Q+|IT+Of6{3DKIMR>l~Xo{n@OCuPQ%Y%8AriwzJ+Qw!_okm~v_KK+<%brkH}M
z8B2BrnEO1o<G|IuMkdMwMdQU$G%&&qQ0!90-L;4y)|Bs~@$@Q?V_mP0>bdau&c}O@
zyas$*KZej58C<OIQ-Fbxly^$TCY1KLQbF7CIE@b57E@VO#W`3|i&vCWc_C(J&q!kB
zKbQOYqzivNhqt@zMn53Sruk_c(i<|{Y}`GGUwUhzo{Uyug-l?+wnIcDCk0rHB-WDm
zZmAK^$Ux1U5jzxg$82$yXji_AIUNx*gLAyS6~Go8YkDge^k7^-2ws}kEjFQ_*(6w&
zH=_8tg&QPMu6D|@<Fx=*<;DlE{q-jg+>MK=7>{sz9Oz-3E41Bsh&xHg!nQ!pJ(pOD
z$*!S?dg<Y}OpJMzA_oW9b%2N2A4iarpzI^pAl**$8rjGk-<j_*FK26gjuWyCX*3n%
zhoA@Z>pv_=%xj&AB<s6RSAa+I2fnObqdV1W1~q7fpPbyV2eU28=!X5xe(tb;tMY%6
zlezC$I#Q4%$lP2i372hR*Wx8OwtZuOv2W-QO|j(-kW@E<ZZ!QN`N}6h=*A9}Y^?bv
z>~z=*x5K8eWOG~(ceXCuevwa(IRg86Bal3Q40#K^I2WvdJatNv#xTdK$9okjr<0Q>
zJmp+^DzzIWNj_!cT&vz;G;c^h!G6yAmY$J)Y)6x41z6N%`8f0zVQ;ayI12sM9v;2A
z>47J3>;s=$<uv-MquY}XeJKMmM$9UTc3p?3*^XBQ>f1{)Wo0P))YtV(-vCGJ!a;Yf
zC@L@Q20J;Mw9xCy_i|LaYy1J8>uD631iQT|br`&*P7K*jQMwXZ#Yx^T2ic?4wdMN!
zV()wNx5;@WMEIEP=`($zrU}R9rAIC7>E=NpT6yYU#F>Mz!S)&~`-GozKN5C7e7@Dw
zG<e$(Zt;Mc=b@6G>z_Qz<~2RKF-NasRueZ^>hB||hT9Q1iHWD5=6yhJm9L7s5zk_1
zu!SBrN}N=Ac2}t1h{fxnj1-mwSfFA&*O#p30r7lQw=<%BEg%T$Y6fiv4mS8y*`UHw
z4~iD<9PToS6YXUaGY(U^JW5P^{J)%bBW3UGJ5`r_sYZamN_B4g4i#bx(&^avfeEu@
zSywdgxWzTY21=`+K4t~q{4xwGaj}>3U~am1j5{0n-8{$E76Y?5gD0iUlACMJK{Dck
zfyMHcywG!SK?tw0Po)BTJ(Czx6a!O_b<MFFo!E!{$3ELXJyPi!mR&PGd#QAvR5C_a
z^NkF1`edc6hU=(NOD){GXoK<B!C;#4q=aXDPAHmp$2Z4tTwaMdMQB)n{J3ofOOFb~
zN&C-v8WtW8&It?jKCE=Y=Ds7z>b#KLzu=_<e@n$Y*YIf5S1rMQ-XBz`8Oeu6pK)8Q
z_=Ux5Lfd7Gg9Sjr6PlAJ#GInO-9x^r*rp%@mjZq{^7xq2weL&51Z{w711a_h=?+K8
z<$76>Hv2D_a=K>s@97E^!4nSQwbuE*OE;p9x+c(#O(mXSE)ZuwM^&K;qP6KfA*M%D
zaJ;;ovk|VWWXa%bwW%N2`>#U%RlB15L-|7Mi?d>&TriZ{Qq4CaKA5)Aw%~(9@du~H
zDJOEvG>=20yvm?Dce%bb?g-HNcMaZ$u)d9J9gMENkV#Gd?&~J>^s{JZjK|%iv2p#+
zxwd=j|CsZ<2&Om=1Gl=e==LtLT3DfF8j%T=h=IR7K1BGmXZq|ru+X6nmeDg(`|CTj
zPz`9PdE;}_poVhs?ON)m^qzK3@}qmNZ?GXNptndhdB8C5>F8xBgvfZ?{j!3Z{T@eT
zB~n2|LD;9#7?J(XbFiAg`)<x!!>xk^+6-{eE*XX*DpS^D-~C4!?gy}g2f_F}2CS`I
z+bPu%ytz>STY>=bcUs9Myq(l&?%l<ftL`{Kd@AO4)Rf=KY-^N(GIdKcbmAIIu(w%<
zFkQ?Q1*=nnZ3P(dkz3k!Lsqm}|6%55NQbk&s6ft5KIVnhlbU8xtZkMg<>9$nzEQ^;
z8r1B@x5{I%c;zyLvas&EPxLnx;7(Q`Rno%3LK2OeuHe?MEh#2;YXs`CPFl~6-_)l|
z+w3~i==R^(tQn)i7C(Jd<NSUl|D}&-?$#<AEsn&%s99FwAFrB0mUn8^CwBf&r;>rx
zVeoZ6alXay9T-V`pvonMTRftv(MB;Rk^J^rtnfyD*T?Oj(~J=zPDv^UFVK`R&${;z
zf12vp_WJdE^=UcguBO}m1mM0C-el~T137|ezJaAD;X5d6(Zj6<6!<dBA3*GAmT~cO
z+wITqehU@JenV^Z+pQJ*CL{M$u(6#N2sL%22HA<yvK$Rinj(>FyZ$>QKZ8qoC^GFH
zW=j9zP}Y7_Y0@Nfnjd<^ZH>zn4&)cgo6mCc6G5sjRBGpC#p~DbySgHsn=A<~`ap~#
zq)^(7YD|~*Px12)6hc)yXef(Ii10FWqmJsnDec!6s0o4Ifu#pxa$p}pQOPjXV9y{7
z9$*L)gpSB>gR@3m#`xiT)I}t*njHIL8GI=DopV2h;<Puo>usWSTea><aeSz&+-cke
z67KbAXX!^-=2oQod@YFKcogP~)fWhpHm&Q#1ayHIO_jfV-P*Mu#P{Kb6nXi_Ro%Fh
ze5ak$J9gHeYw}tIzvYv5%O8uW7FzernL`pUV72Tu$6Vw&dfAYiGozIwsdxNHySVOk
z{V?;(-A)jA2_GED;ZxuATxB_*iuOjQ?+tp_G+EpUorMFHgrV!8BRZVbD=Wb}#)^&*
zrunD%7TfLc??JB&`QUq@^lSB-LYfIv%eIAiIyGG(-fyanAlumn3P{Ey@H?Daqs>FJ
zGn-QKxvr9s^^|FxKU-EP&G`B)4>uvflbYkTje|=Ig$)uzXY5BZY*UE>*f*Ou6>X`N
zPPM&Y-?URUPfpBeS6sA5r&xQSms|U2aBbwoT~|V51l^v66y`{BIb}z55o!!rJ_Gs~
z%NDMj5s_@<1&dDGJgz2^->Zetf0=L9=kd)Zmqo5dWVxG=K)fOeN7Fg{_+(AMT+LqX
zwoFf?;L_oL`K~)@pq9x#m%KA5DW{<)w!ny|M)zc0hETLzj2Gtx$Nb9*HOEWICQ=-6
zInZ<8lIK{B>^0fe$cjhpTiwzUMD8qUK--#^L`knM72HXmL{4>k1kgM_#*A}Oz2p}Q
zxt1^19!MPv{B4&?3@Gc<B1Lnte0KV7OeB!^7WmPp>?x$OnbuKYLkF~p-ynWPlK*UH
zk&DH8D-u|9&D<M54E|)zdNWO$f)K^&4ma%am?eP*lkuBT!}RXOuL)oE?v;W1+)K|W
zwh-Lplv-T0&|FSWxolb`?^JO3a=1*NzFUMTl*;A#v9jWnl5UWfoER$F_1>2xypgx_
zX|E}<Uy~p7*~eGS>+6yh)31?AVS@BlN^Ek8ZE~~0b98@y6y_1!TO-_f3a3PGYj}=&
zlt5>;)OwG;=w|dK_XNdYSvO+)!vbx~zFd^wy5kMXhka({*23Q~X69zHFiWh6AM9_Y
zgMC`AW081J68392>w5@;eVbj>6AH4&Ehfpru{;)rU=iJ^>>`iMXErHVK@Wf`5r4*B
zq(Jjaktw@aJrOBsnJd8d?ie`_jU~f<WW73S^x+7V+;LBq(q7r?Le56|Xjo~x^+pbD
zCYQF(r(-^ADtp7hY?JDMxS%i}zbh4X0Q-INytG$B82+Q9hSWSGS{t~mIqrG0(5TAR
zqM)HLULrIncxAzH@l8-)<^1U%>?NkcoyZV2lqd*ab@TAU`M$c$E;KyzF=63|4<w!B
zf>nb=2k3UElorX0bqln`g|4<Ph$~60d6Y2(=`V4R);@oF3LM1tl!?B&x7gP;_b}#V
zwWkTzGlFdD)})^1*a|MMw_CB1nOx4{^Zs8}3;w>UnUM?|-LzM>dJ!eLS<PXM!)ZLL
zC}0GXN|f@6b>HUih>9bQOkaqaea<*8nR+c$(8?&5pgUh64x`T#OR``&7(k)<JM}B*
zZXrr!e?!);9HtSjoAFtn$-+_ce}Z)Opd1`#o^y)mZ(L&?=6YtRq>5Wu7g{99R%Q#|
z?^ClPaF<Wy;2HkhhK3IezzEP0j`2Ahc@aaLz4W1qg`wg56?2x`oc6njUNEhS4zt_R
z8?O}LU;gBF48L7zm8YBn<&`yA)7s6kr(_P4-1CiOg+3kQJBuKQKDCXCTGE;EF8Em#
z5lpfQE>N0&$;LWT+FpeGVckr6C0xoZ{I`<-@hY!MCS-mQUE`1P5#(TL4P&Y|tnpbK
z6qnhFfq`}F#(C)PD(2qZYY2d|{JQIrf|MaZPCV21-atX~HUe9FT-iI^DWo_E^%abH
zMtn!JTAsd7m-`USX$cka23E%NM(~fAzYsT%iM?>_xl?X;O`!7ZWVgGSc;4;NCcq%<
zi|yRqHn2ABC_K$YVqf(ZGq!bAlkJ6JtbG>W@r)Xq8;0adFzegEp6?uOo0{~Dof+Lw
z=gI_Tj09%0xQ0K5@y|ax@2USIYe?VCKayzw>Di91_E@cmy|RKebDQKmM&U$YSVj`B
z$DG>Q-ESzw#DA33@BMktt&ZWd9a%<H$NkjgHrFk*3{QFHwwB7tn|1`SV)K3Xz>mml
z@L3a5!27*#^vC!?lg1GOm%c5{uOLQR!%d70yBXCRXF9_nSc&jN&Z}@V<jBDij~WRm
z*Xt3QF;>G}mg+P!KvzjwZq;U7B`YbI{kdu^ipd}CEiqEET^i2zkPvG!<gQ?d{g64l
zmQSb|1des--CxEV_b>?(w^s`icc__5$W9>eX<N$-9;c;ITH(H@H+nF{MG+*KX&Kaq
zPUR1r6cqZ3B*ptKl^lqA;@D8C6(+b59Rb>+0_J*?>^9TVc@AH?2>Z`WbhhTOTwni~
z&v_TEYHy{13BQ6vnVt5HKCm~azMR#6-R*WN`Ig7|N7u@(A>=RjSCAc$R7jl+%+;`z
z>UK{X4wY*aC7(Fa$3Kz>&`46`*9eu4EcyH6E%t9p#ZJE>A#k$sT)8XSij<v}`nisY
z2DKxlERLnf3C^j_NrW?VWl(1(1=0YCT|?L%J&k8m6Z3@{^T4&&%LPXuDG5OJypYJ+
z@O9MD;XHt=0XY?T$AF!oGsp*8qP}ZB=NMD;p0Gw1TpSq6q+^5CRed=xHeyCx8IF^M
zDX{)~9OIni&FG73v_S6eC@!ASmIUEdWTR8`PKbZZ^Ml|5W|Gx!aZB)VBJJ}s9kVlz
zkn|p@vIxxel8e)Vi@l6Sj5G7ZfO%pYN{&p~Ci|AK`g#Vjt<-RLg^SL};^vWe#NOYn
zR8c2BVyl)xDriIn$q)0ugL=}>jb0&$&VIo%0X-b@bcDdHsH+nTL3yG4a1QLxYSGue
z_cV#OPR_gt1#Gtg!kCK|vC{7AydS!j=cKX|qfHSmVLxLhVsy)HE5o=hE>ITzQSxQX
z%h6xRHE*MQ%3?W%`4_%jneAio%JFg+BY`4N;2%F!JzMUh53J1gqop@6gyB1uxbBCl
z=S3T|;kRGxzIremSXT4QA6_0`h5?9nc#e7z;9GJZ_|YdU?ZYr-`0J)Kyf)*3I+K~S
znSY3yl#e1z-kk4;rwG$)#-D^IV>~yk_>3^!UEv&eMHf;YNc|HF_k!hD<?;U+McV%;
zf5Rp8MV9E|7u*v+H#UY>*mj-sI@r~{JaG4{{+}Qy|DQNkn16=+H(unQ{+wUV{i~5y
z*hq!}zJ6-7^P$tKnDKw&hTyK58}ozK+XyNuL`~R}>*LyxtF6+XmeA^OJV0q~>~$NQ
zA*or6J1myNxPc%fb9|&q17z+w_~;*C<aEHPnbBG)_#TlJR;WT$gi{_Wds0T1bVp*h
z8RR{@(g}0Fck8}~8m=vjXT7zGsWS&kX?u9Xw0NKv+>uTn5h?*}#9G%YgU}Y$1wO6c
zi+<^Z2K^npkTQ`^-ct-Igbg2MTOyiCCP(1l`^bC)IP^O7&x<P>ZgN0TLb#bo$F8PH
z<YO!A4S(5~+d48czN~C!d^Zyu@D=C+q&cRD(7?a>IWmxKQEyzDSG$&6vI0f-$gUmQ
zwlQ|(5q%1!6aWC6n*I6xTEYgTBfkd%=Ru4&gjVfrS-N7km%S<)CD`Q0l#$Li1x2nL
zSVP!=TqQ*zflgOY+IhR2=a_jqV?dfeS~4Zt^8h1)+71seZF!5%(?AiWmQ++Iq0>jY
zrUm$+wt?5{83=$2ki%gZ;6q@@k_mC*255qn$vbix{PFG0&9|eMfIa#_E4IFTFg*i^
zr>0eNF?QL1;M~>*45mFfv!of>vSQi9UkEpZqnfp;N=~KSLLy*c4&7U=Nubf(sEjFS
z{%Yw%G9~tgF3KKt8%G(*=^f{xUCYJ~+N=-+pT_vjK+|OlOl3_NYMxKS&=&Hs!~~Ve
z9DHmySotA&9X<MSNMXD|(D(dO2gJoTTE*f#kY5eHeTThT6yZc?V^{&r5R4JJ#8viN
zE_-YEy*sr?z9h0~sm+@^prt(byJ`7rS~+SPK^Y%D%>KxB7N!2!L+azqz3(tUj3mXJ
zXAh$;)jZK;Xf6>3Ce&=b9`vg{{Ljd$tk8Ky*s*OYTog8p5blX<#-lD<MX&D{+fhGA
zUUsU9g)H310*Iv3#TyqN!fnsK1cTDXK8NDno1SWtaP?A6yTeF~$E2c_%P2aFx(S5M
zG)2yEb!M7@+?Y1(0ql}Z1=cqbmy!Pd8#_Hz93=2o%?VW(y6%#_^Li0esk55`5_(JI
z5m%n?*Yg>*Hl~@v94LU=NcVMH-A@=iFnA6<?_h<t1chWYWvom@CF_*p%*FNWt(#v~
zViu55L)V#3lwZUgF+K;Wl_`N2g|V`z1IF8gg_{CFN7$rV@1)M!XEwPdoC}ezTW9I?
zTm+%Wk|;n2>3P(-EC7coHxYBGa;B}!$HN^Oh<uOZAdBR!BNC)1^&0LV8InueWgKYH
zvOM1%$>i<fR&T%pDZ72{riJ|2i`8vS$(kR#S}Lu4VOXE+<XsQ@;IW!?4+oX-d7wY+
z_WjjacUCp_PXA?o3rEReemXMy<gKTpI1Djd@-vTN3iKyw;l4>Y6r#TAM4xaw;E!kY
zrF~|kV0bM%>-djkgAoe%Rh*B;f|WUC)^@1#KByFQ(*3NymHFPFoJ6^wC?)Y9Yv@AO
zK8Q&*o2fN8vt1&{AGMC=A{I$O;QSjzOtq1f7H8&Kgw>_KQ2Z!912c<50rU7_4}Y@9
zcTL-{#BazYpCi>6GAr6^oEzk+C)Rsv)O0U3*nWJJ>%`)1ggx5m2#JBaKgg=YVr?Uy
zU1DiZwsVZ7U{XXOf+CLAO_n3+5DGET{-|G;p0-ov8N?jC_y2w;0eZuK=OsS7+yy5a
zt-)P$VP<ne*G?(@Ah)O)Y4Z50nb4Wb2yeLI3H=f2Cik_%_x71#V<Y^G(YZ_@o8+68
z+L>^*armrU5--(pdhVuQjndt%O074kTqdQx+~W`8p|57}1wU~X2(_gYbUN5!$C#QO
z7ayhg(@JgZU81HZo+!onK`de&YMD*(tI6?Spe8(-uQm>Isd62RD7&1wV@jvE;Q~Qi
zs<%iSiJ`3)A>{IwAAFG$__UNy9^#bVIgJ|=J;s%u0gx}AGQ&fbAH5$@uRfd`ecWXv
zy;HcOd!5qs(QQO}*WyCzXs1}y&v(`hoIb`k97nb9Zb~)WN(DHhY-DX643r~?IIwV1
zpuI`gU<?0k20K~fZvZVRgSJ8#0st4fnp|y${C^q^)EQ^2p7eY={M5Ha&miT6ZSbBU
z+|@|xJYXVh*V1^)$hDD8*zKqv%g#L_($#Zup2mhVigGN=S+u>LP;;SN&06Bsv;0Ub
z;I&$A-$$Fti9ZM=$nc5wqdx39ai!n8=BDd+IFxT%Q@|i=I&;E?xI<}YhGqbz<(?%F
zODUD~@SN(Io8m{HORiF3-xRM!WU((YCyol|I6n*`juf)wpqA2{aWk*xH=m)e#_ix3
z&^Reb@!9>?m4IAi972ubXR`k4H-n655}&9=<1rZ;MY7Dd^IzS`QFxV!wcRvcg1JoG
z%x@=rkw-}E>`*cG=Ki4I9E#z~#*m(PpV2>Fe!#f4`ruv4d%Zc1c4CS(5)1BOe5+@|
zb}~PmWKP6>E`ua8ou@}$r2s!tFPL^P`@AtNS_J#bk>k(^VvX)3Tz%f(OvspM);X18
z;R~Upc%N`+8;xZr%9<K9AWn_ro+(Orw{LqML)^9Blpww4rRryoQ0Hl91n6zEyP4Cx
z!SjZv5>_KhP-;K4pmxcg;lpD*HM!>?NL9bnOE9WRVsD?{TwvloPXh8t1C*6}17kxu
z!GX>;Ov()*&bX#5iC3TAU(XQ!vhB*dF$m~N#T~$IjYzccgfmL|T2bNVvn)bGIJJ0;
z5IY|^@qxC@4wVe-{!LBd#roC~l{0ozd>YyXnAg=sk8)jv5#5HjanBCcin7Tp8JFR9
zg6!XG(ort+gV$m<jK@CG@d?Mrb5j9*_%QKF7-PzE*KW;N81Rm-FIDqi@UM>I9gGkz
zaj2Q!9~l4~Q|qS3To(e=pDN0>X%fdYV%iQi3jEp%h;AZzxT``bOE}!K6Gu!bIj7Dp
z74&CB3Acf}l>iAVExSkaX%0qB%gv?y(Q3Ecqz@`AjvE>j>Gq}(omPs}2LxGucgKHZ
zpJ%a_OKTC2&?{72*PHf`ItnacZALYu!ZoDe!toE-y+lNzGcQjOF+v`ygd3>rko6bS
z4*v8It0cO||A_WnKhvHYpldt)ORe6h^GNk_lY-Q%ge>=K5y}^WFQ{T|Gj{?~9jqF>
zJuJ~9_(GUiFJjitY=3^=1ObjM1ZgRC%?V-6NQlbNji(}@32!SBlpEI!%*&&P30KEk
zBfPk%$#-2nAubHy!FgnmZ<?=(jgAz&t*c`UE2AJ3fGrk!JQGekhfQyqd)^e6T3_ao
z{7zwM46rPXfm2?<$9=b*c-cAd@yU}(bRch?R9n~mXlNWd?GTiU&Z@@)G@rRZb&wX{
zFLcC+=YpfUOPuXBea#HaxTHm%g_E9$#kMfV0M_c`K(&MI1J!nplbCX^pWBS340Z3h
zo!XYsqxqXlw$c1c<sz`~r>48~mt7t$FmfCIr9kW7yNo1*$AxKrDkeg5P}=A$OoK){
z<VO({jO}Bv;qH>$4vmt4h!5ceB8Q;aBhnt~iMBs?9)GSLwzb8?@VAJlT}9huWm0pv
zqZ(d%_E!@&B*zK957lZzTNxsm)2XSKy&w~UYM{qO{zp7lk0}T3ar8rkkuK(6IomTY
z00#htCp=Yr)*NE^o&Fnjp2j}BhLZX8?!`&F2;tjd<?tA)L1$dCtt(9_OSU}Tt<ZTY
zFSNa_ZZm(e(PV^^uP|N<wZoV;y#c`wv?^m#HEwxBQN7o>eKeAQ<W3oVIPVi9AKo_{
zJ!o@@#Hn#uDF%CV2;;8lOm9q5b)aKkK#+GXioZk|D6?{XeW*5&h_FP>z~C*Vz_H-S
zarq!>XB;%Pxs*m07M%IrH14+x9x6GM+WH>&nA-Y)V)p%A+$(QEk=q1WhsA|?ud1`^
zH+qGf`AkBEqf4M_<H*h~JOOqiWvPI^?(#m)LXd*Alb}xVgGiW#h@L@0n(?+Zsf+?&
z0E}Hw`}w(mfPk1MujLZBx+xgH8n&%V&F-V2E}U1E26SoFjHv%jaf|EqOZeM_BBNs^
z(MoT_?*%1CEC4r4d+ksJrXk=H^L?~EU!<kkqo*>2ux)Ss`Pg^tM_VvwH1GFxpKr01
zZ8=v8F!+;pf+Oz1&B6Djj-N_!b}?*NN9f*mD7a7+I*fQI!K|zn84i;-_rYkT&*mE&
zR!Cdm%D9j*e`h}h{1J4aJHPC*Y51j(9NojNeFKgcvEETRc^wFwG&nbf@(b~dIg{wI
zbjnk(1jNw`SK?~-M4fvaO%I$~PZ_{!A7r7tFB7rYbCoe;4Gm`6yLS+49ozC>CAFxH
zmFobE-CZ&-!+kI=2G}hn4$l>#+>y!ES5!)6O=^5hf#w>VGMSU!Icn9?HvsNbAH4UI
zOK)G;*bN+SL&nrz|C?JVDR-$$M-xk+%;CdL{MB!0^mO=h`(9dCK)_%o@5`6{mAn^B
zf`yWeD9F5JFa&ivCi^F-Tjxt#-3{G74Ab;u$vN?Ot-Za`*N3La<^(re63$Tk28voa
z^Fm(bQ`106Co*!Y-kiRsI83x7uK$_IO{%sV=RxMSk;@<jOL8@xTRLDddB-6rg{e^o
zJcnePQ}R2HzU)TQN#^_5NWx^R5jE>cRacHe&^2`0E5}{%fz#FZbg#QfEwx(ZJAxiu
zWAyHC3-c3@b=$L;QHIE)k{Q@QM&beB4^9!0%a*dBjdpsqn2MW)=5SbKxS=#>++5<$
zl3O0fVAL7b_~pjcK;e7JutvcP$y9zhW=+I4_>H>S@E?5%0KnrCPOPXr5OE6zxbaw_
zJOt;nt+CxO?qSc?<luRv*IFZAxz961%q5vB`59z#A7o$Mhk14!cOF1bue+9b!uMmQ
z5?ec4l7+{{>^`ts^64DtoaX!MD1%VCGH7d(Yu5%Y3ngT?eSa-L37(3}|KeqNe*~PC
z?v*~Np@zAdo?>}cb2-+whrmgDE2M^0LSPTJbkb~e720z)*amo^2P*#WL&b(cx|s{r
zP0L1Y&BP;9yl4i#2NJdAb=8#6EuIGaFtfte!&dcm8T);}9h++F%SoXEpX4AL&6Cv7
z!>74jvE(;{(2B4ZRxIBho^~^+0Ico%ff2oG@s<w*4M%z05SNL@nyjpal&jfIpL&QG
zxR-4OaH?@B$~)n>6<Lf`T8qi|zo}i<<w=4B+K&?py~cP*^SV}0Xy5jyQ`QJNIS)zK
zTbJY+go-Q9e7yr2w-J!T>HKnxZoC6NK2DEC%eo<9-tp60>7bj~@cpkk&^fl{nMLqg
zVeM_*br{=hkf;VcE@8+zWYI2iFX(>$MoPL7k0Jj-@pw#~Ml`aXxzzc^Hufq;vF4L%
zu)f`zZ(+)IgbL4-2gaw-;Z2tRpkdygxMVcSZ3j@{DJwyd9f5{>!4gpyv!}!m`E0a$
z#>EQ~bK{HrT}FD=VG6taeM+Q`l#tb4$T5H2k&Vl8-Apa)59Y54`Qn~A6yi80p3pN}
zIUPVR43G<WTp+ywlSzl4XuDr2GQ<amHKj~NF)Z`IUglrJSp$u{`I{US_#Kly)SM5g
z_+!O3Vlf9)GEnGc2SdxGn>k#|cjdDoznSnqwk369_Gg=v7NjxRhYQOJX^P3mSHLno
zcl$6BM^v948t>jmJ9iTMVI)u5V8^Qjh}t=xR4?s5ZYrGV1w>IQd2Xa@!GR$s1s?xR
zV^Q)J@8m>Z7e^K2*PbW8DfYH=67k>LIq@RZlEy6NVK1CA$Qe2op~@&&Nv8~4onl^&
z>GvJqt+*};#GxuueVu3fG!K(gzsu}UA&Zap#8i4(gxtD3r~MUqolvsA<65dYlg79`
z#!Y)oIf-&pr(^Fp1M-r$c)_%?7o>Amuj~8nl6O`{TNqcBpNf^f-FHTON?T^(lA4%;
z3VnQ*dl58S9hYk+qqj6gC^pY7wM!@;WVEO(n}K#d6xu%xb+qL=RzB|a3ay*ZS0O0-
zJ!A#maq_~~HhzJC!R9kuUo@_~)>kRL=IQU&4d+R0^ZvYT$N00l&v&pV^`H>a2>d<F
zHZzcjo=kWR<j7;Yv&V-I%1-KEw~^!d&Kk$9vs;Cf6qj&S<pKQLNzMMagTih>0t*^#
zZZKJSYz7)+)g5FFc$P>XuMs?@^t+8)nXnpv%~MH1yAW|0Ax}n&SzXG738dQc4R@6;
z+DHbP-lSh}%Vx{^tkZ4p`b(DzY}W3K3eD=b9TW(<@G%M&Nbngg=D6+;!A{hybCQ0u
z6CB&;z*Vft?f$v?r&|jSsQpd_S+Vaa_9OK!u~dEL@7F#xP#csITGgE;ra0+*?-$w;
zYi#w%m$gKOQnEwktvIPCMr};CdhS7k@1;7TFmv0u>a9;6mS0MxcVqjU@{hYGNfYnV
zBXer}L3tt5_a(scY-wAf2cZjcwybr#ouxZ;=?fIPC|bLgyjBBqgKv3Qs2rS#sg0}{
z+5EDxHoIu@RY7cAom_j`_lls#J$aqAuFKxN{kRp|)J8po`srsIKadU9TsMm}GB|cY
zfcYF$S5c-<2QGVeZi!<w=>WSy;QiRfuJPgYgK=}9^n^amgZ?))(c@<QD7KFk&Wmr5
z-Q6H4SuR0r%kL7}3Fr^C9e?$6UG7t?ZUb2JjK?U(Me|Js#`6ZiR4EmppV_qv^)c=W
zUpB*JXl&q#7ez?Cvfc%PETy|H8`?+JlMu#P2tUfJL7S}uz?}13!TYMFPy>Sxh&bS9
z%3w8zpjjp+t819CVW?}M!#6Out^4(j+{q!L6^viTXD$N`_>Ay5D0j;zXrMZZbpSUQ
z)Ro)0wAF+6ASak4C0N3l?k&tr6prG&HH@|Mp`=4CvdpwcLTtGn7z(jUF)53$v|)2h
zXXBUss}n%yv{Kln-5|CSeGrMN#jA(!?bS*BYLrN=lS}+4R40sH%{`P7(3C`nN)@?d
zK1ZHP2wYw0=Yd7#9RtgqUf?#VKphJGssGVL_hY9Q6H|1w&?l1v&HUZ*D5cT}V9@du
znjT}cyl5Nv^71Nj)MqR!s7U*L(is8rrYK|i>N|$bUTH>K&Qv-QX{}!UWKjxL%Qh!H
zsytpI%O~0L)hI{04UE!1cI6{K9^AaBO80xh+L)i(h~QqGJ89(vR<j3RwW}AE-+kup
zHp6fMF>#v!Fu-vctYwl`|HQki9F7i~4lu<kpqkYl4gzVsG|1vK9IaLWq}TrKpF7hc
zDd8YT`vZCg+`#z*T|*}2HRsVAd;^!dH^_HK7jKxKzS5t8>}&=>N`7&<hrulrIY<BP
z@Yz@zTz17hO!*6{F_@J-hCxy<2Q*+h9k4_cmFRs0RbVH9CT!_im@3q{;S7K<$FDvB
zjr8EM^F5zntT!GKfSAMhP0*aOCUDgA``g{%d((!ZebO~WWCPLamKIt6<&?stE@0}3
zTUIEhnC)=e8;yG8jDmAi-NqwtO`S#M1>zQU{Jy+c)d?$ae>CGpb6+k0CM+kq-0#T%
zlrOi}EKV#U-_S+^0$`CC3NduP$GxVd?Djl?Tet}~E`WFJiS=7?Q$$LBhVO?iTOn9p
z4x_$??v}sr`#xIWC~|YtL56F{CTgZNCnGikg`h)#Y^<&IHHPc*659d2&q4Jty}u!<
zB1x14xb?{)_YlGDYR>X}P)~xbV`AqoNLV}SKQ-U4IFZC=S+Pj3NRagonC=p&D?Aex
zAV;=O4LjI-bT{R@Gh2T)>;)HLZvKv|8;I^0X&#tAJpT3p6H^3oh@1Wn*%ocTc@Y_=
z)YiJ!OOshsAP;<Gk^b>MzUD!IoRdkgD8qA-frc{{?OhK+ATjHciO8oZhRm!&384(d
zCa1)+`)wCdwdepwM#p+*>#P(H_dPRmGe>PZAERX_%O8r*eGZ02T?uBpp(HE;_OLF`
zv{twCj15oB91OqY==K3EK`=)s3KY5Q8pwZpj`XDry<KbiCkjftoig&u>X0Fa+HD=W
zpheuEQ)qXh6XR7QA0l2ov>{o>!*Y{Xp&hBEbX{dJswY2s*^?FU?PYG6v`|}Dnac7D
zbuMOnBUU+|Jmf|lkonZ$SAN<M%4g_mS9Ea%0s5#es=JV8FFonp<y~NqjYy1gUx>Sc
zeJx^!l?@zsQ93QdGL+b_x50zUm*SXdP~oBJDKbH$S)uv`mmBk&mi~qX^`~R7r3wyi
zHay8fgbC5E+gQ}@b2G3#IZ83+mD}CHvIcGgLLZ!yXYLImF(b26)>@44*J9`ga;vv}
z00(AwXh+((Mp+JfA);{*ircApCJPCdO^~3iEfIXq%j99pp1IBtYFBn~lW0rz779J>
zNqoAGqA*4ls_=W&T-5V$`q<P!9+NRRp2hBzRjfVYUFdTnZlhNX`74reA8j}6DXElj
z=&M=P%kzD-nvj9R2Y?dgIRc6*GHkw?n%$(xyJUJ3cU68udF`nxZSTV+DrJh1-&6F%
zO+JNm(pGvYa4b5VZ|SXoWqerFsw_ewd`{Q;-k>oz*KPuC`eJK`ro!iLRF{^w&*I}@
zY_H(->zJZHfu{}S;=!_sGYbaL*NfEY!^q1of#K<~(4;i0IU{T}P3k<0_ow(TA?%h}
z!Nad0H}{T;d(-43N<J)~EPM3M7Hb>%%p~|@E8Z+2$PGJ6uQe$DQ>7Bws1EYUL2_dA
z-AS&BY4xesf(v5wPc@47{3enGPvY^G(>^!ZDZqkWXAZ=2N3dp!*L&92C@qZVm7O8%
zTIdP`-^^1Vy0Erkq6Jl-E@VQMC;o$?8FcatBb!Mb3lZeRL_f7SptLDs?-c6g5T}2D
zPM3I^0C`_fpy2e2bswa`niINPR`+_L?w0f$c72Ay5xi2D0>1AK_>*)z_CDsQ#x1!i
z{^Rzb@>i2x%mK~rhJkI>E*4$aYKPi0ix%?T2ImSb9P>VojdLX2;3kd@VaZ?MyEuDS
zVDrMM{A2~@R6%ev|LAWU!afX~=8bx**a{4%!6+RPh5zUb?v*vDFE+d$a8I@FNv)t=
zB|X&joP&V-g%cwSz8s+qf5g(j5|C14P~~~U?0(VxDrrS%CL!aqQEL^do}nkjH?_Bh
zW2A)0)w?k2QSq>P>lFz3nf*v9zF+;HQUxOme6EKhd3#9}AUk6Ns(@iaIuT<S>Q_jG
z(X+qrjBzQq*=}UQ{(G-C7;z@d*Hh-S$~j|%t(Y06y{PpB`U2f$*Gu-v$uqsElx)``
zP0D((k$pTYWWA(_Z{<w4tSa{IbV}|WLD8NZJ*6~~&yf3xEMK;S+2$u_ZWd01@0Zu6
z(ku;gQPV9oVJ|GoSYN%a*{XEQnj<nQ(4(nMlG%S!Hotl%+;uD1dU*p#nU|&G@=aRE
z*b|cU9+$*?GLWz6xAj2@$J!ST<d?`xCEp<jWV$AI?yGVA!7}&>2z@ean<*zru-@fQ
z7FPBK!;@C|1eZ9}3B%zSLFMW6wtEj5B+@~R*dq}#{O3Oz)?nhc>3s9=Xn9-eX_jQV
zyT3^EZs!ADzf=&U?RK*u>D5QA6Z93M_eoVeP<%2ODLzO2+;3`TT%%36Z`gn*bXDPu
zQG?u#FdC0V1huJ7VQ0BhmA^%u_<aiWdd}UxEsJx?@O6rdJ&ydON*1z6#G~~rKR5+w
z=vt5Mk4)5clZ<$AIyq1(?>Ngxp+p+8j=a==P|f^6{1&0HDFpqO@L)^A#Y}?N2%qTO
zQ_0)ASH%<i33Z|BNr`bqsZWclc#g+Nn<`*Gi@b8dGG}p}-K2i&P<$zHGsAZcOy3If
zl-54GR3>J7lU#XL_%pvn8rPUWm{!8#v8?(Ctx{0yoq2YIbgHaDHT*Dhy1KSh{W%s}
zyAW3n;{JP>#8x?UA%VwCq83AqI(K^(?MScQkE;ep@1BgrmWZdi-_*9lwnx&olFM4<
zLq^7BLTMa5I2Y5}Y#nO$na{bs+#}`0fDt>h;|bl<E=F^E(nwa)ioIACHWy0RxB(Rf
zFXvq6KAtQ%Qb`Z-`F*bFJn)z^t+!>poWg20fa_ar##C6&3+t5@Wk$Cu6jg~q&QiSx
zg50qs8C-56m99d=JfV%20EqMbalQ<5vvtFwUg#GumOi06cYx3&CrdD^w!W<Cmo&!T
zStzWSAIXcnWtMD?OYw9hr1pn*u&Uo0NBt6pQo^q~v%*XD;uIIJHPuCEh05^nXuPD7
zat)KE@$5(?;VGx#CYSdyWsWY2p<?#oBC@<v&tVUli1A)U>XubV%?ZtZSH-sD5!E%9
za)6}667`xPAFym0@G|IcE>o<Ydm|imL}3aO#C7zW;i|cwa&F?Y2jkbH6UKY5d-wLY
zmSt_E9e&!Ejj!iJ&QvQd?$YW-51-$B(V=Hx0$m7au^N%=riWj?!c?g%XSX#P4O0QU
zON-RD!XANUALTG}E9^#oQI%`zfzC)+&>4zZtM6_fXD#cuAd)XDC3~Px-7U~jQrGb2
z3kTE``aUCv4z<J`gD0=+BPt2uOb)yAWg)m0RuMzZJv7uvhszCB_BJLS@}Q3P5r)2&
zm2)z51%gWc@>!)x4{4H6cj_@tq>Q2(K5ob}6OkPq8$^q?<DU;RRO#vEj82wq85=DM
zHvhg~&GVpIV3DC%4rWH(`iSg>!hJzkuy5?|KS~}+m~Tr+ne-f*m=VmrTimn>@KT(q
z#KAr_H&3>vID*MO)u$j%ur+PbXR%_?GU{&Y50?C1W0l<^xLQrDaN3tMf&LsCK8C8x
z%Fn5r%Z_eo;UFGh?n8C<<XIe*)EXg5gM#$8A0PP-_{cF}^lggM2xd3>ZR^&TO&GDr
z)Ynw#eT+6}xf+5nJwt=*dPWi!)!~F~r9xr?NiPBWlHd#<eY`TM!f5jCUZ+_y?N->2
z{jMdPS>ZPO8QmG%`~u-vK43G?K>T=cb|l;^B**uZG;ikb4NIiKa{3q0?;<T0P49h-
zzI}Em44E_g6Vyg?KhB1n-Hx?@Ep(t74<Dlw9Lsx+$*vf6)b4wSYI_4Kj`MGtMwN8k
zi}*7bLgpj9o!5K)T|iJ|iCSe)Q}3&Yrndz~ap&ch$AiQE9RsygJv`MpwhO_ZLyRzH
z&|Ks0>#Ou8&+qrRe8S?iOaP<BCu?u^fajv;qj<-<(#8QFKet*EsMSjX^d3sxeTNRD
z73n3?yT=LaNqy)fR?MRm974aaf83u<P%$?CBly8}T&j<KU~tYIq4u^FLYbs2K_ezO
zR<0O?)USWlIT4EdF!ij$CAB?(h{wKsap}HR#zuOC9?L<-q7+Hmp^`Vg0NoR3id+!K
z0hCJYt2<c7VT~`PyySp9*W~bBr{ZG`@~iU07ER#zW3@iEpj4P*t@tiZK&P~F4lhaE
zc3_+*=1t54k84_;L&Dblv{a0vpsd?d2PI}?w(Ac2k0t0a{s^e~94`2(QX*pKXc!8+
z)t)Xr{iduj&8I_C@%wFp?3T*WU{IRGRYA37vV3X^%vA~Q3obo>!Pdjz3&tDu?zbT}
zn>h?S9jR5IUX;V${T3rdf=KDK*HUG|vV2@udW#BN;*e9~tCq=of85!XLUdE%sZnzZ
z2}G)~4`qA%sz3#ldsoCjKThiI@#Gh7=Ye)>69%<5Dwc;RlvC6r_l`kdj!M^fXND1U
zEOqarw4rrz$UTf|GRF>Mm&az)++rJD&{}42)_*QRJO7coy_n$BKho7VU;VKC^bY+X
z4P9HI-#4o8T0B0<nTB0G|K;r!)xDR;zWRR0rU{wLjK5|(!*OKSx{5y{=0Y}Sz5HDa
zyK`;I_K-EgX#xAJv))G$<qk_dEGv~O^&pc<X?^3;Rt<IaqxFO?%7Zw1-**D=C3-7M
zTj0?Npq2aVgpF8cw_RH;=d~Y6YdRFwmGd7S%YZ`sY`K0G#z%9q9pkI{NfL%`)Y+)e
z0`+_fEF0G-?jl6iO7n<C>y|+ut}Am-o%t>p_xe_QWwT{S9y)tB-zVo}){&BOS-)_N
z*M1d92K8~0y}J*{n<Gg6X0-U>=o6y0?v5z>AI49{_te|4)C!B4250oLIV;XKMWs$&
zT1zEKLN%Kg-ssa3u#p4JAG~Focn#kjNV`(Tt(=j~+0~2e|G}%|?`!D3<&|R!CdWN@
z@n!ml_7izB``R_8<@U92JvzxC8P27=6j(HEJ(*yqWF&YwE9+k8A7g&d;W}eD>78?O
za@UFITlkSIb9uu}tvIPqJ#1@`EWNeYOw@+V#<E_oQ#H8(kqrUtI&;_)!5O?JPgGr;
zMB3RUfq=v7S)t5%9>0N$NRMlxLejpiM<zV)TEdp3pKY>aa(%{eS9@LZdfPogE?6zT
z-**n1l)6vqDGRWkZgK};)W%PYdH$-xLKy-%2Ig4Ru!aYM9_Irogy59tCQb1#KZH4?
za}m9h3WCP151%D=nu}y7O();cV(xQs;tBU5!lu&s-OQFd)W;}X^|T%VbJ1X@zbU7M
z=^Qw@1g1l(g1S~fRrkCA10#9Sugx+gyD6FR+4vwi-DU>WKgV+Pd_F!THFL2TgV@2)
zy{DkV@wfx8mik%ojsJK`sx^-az=u&g(%Kts9d>qU`}ptDijBtK4fA7d72Gm$;o&wO
zDM#ZjK}%i!=n)A$GY{3I=^0%kmok0?B@xp(iN~AnJ#xsuK1f0*<-BlZ_q#QF{Y|SH
z@CaJLL0Z}m1FpZGW=Xd@UL&Gz7N$#BbAdElkt77S_pUD-UqJfmhS{*~=BL+4RMU{6
zYG~x<3)8$bOg!s-q<NY#yoWFvGrO$Q{W-VM-RC;rGcAgH)bHd=>xshHw!|lB3i=%}
z6QLnKG4968qE;9R?_-@`{bs{+rA@0m<Jxq+ySL&E)fQr>_8#Vzi1bTRTNc~Z=3=*H
zYR{rJk$VwAWL2C~7?ZnHjm<x*vx;tT?YIom<BiK(9FulW!@_XG_x$~(5a|9rzfVXF
z9eSae=!u@5PgBsE4Id5##R<;$Yj&`{RmY412Xg9V3B!Q5y$iTydQduQZ4fEqTJ;e+
zLLToM%C%~!FLd8Mivy@Fg~@DpXnJ+iJxrFAj?p-r^(pnl+D%i_v~(fQZCxqubUvaM
zw%nIkN@}6_R#Jt=+8k5nksNOQ`zo)eh6fAM9$@NP{SD-1vN^iipq2Ich|*<l)~ha^
zo38bk#ony_G%^>)jJ?3<6Q9|?!K<biG@$R=1)|uA8lQ7ja+TD$(|tO4tYUB9bBVp8
zYlG)>n42R5yxr>~2kG>Az@S}aD67$sJ9YvLT@dDB7^Uo#vAzHs8#Z<>_^l8@ew$iV
z%OgV@Y_`Y-8;vRwW{n2B#J-N!wcmJWN-OB4<=f3!Xe4Sp?Xh38!0uKHBf{2IA2AZ9
z;2b)W(HW*~l}Afh7)W>yYP!GH?i3z2m=GuQ@>70)cWF?B*t%BLh$nQMqAsqFjgC-6
zTCxKTnz3QPP8D6pWW`^u-D^{3inWdq4{tcK1+Uq!w2!|bPEHEO157yEUF8{77251w
zcb|unn)-^i_R8@_DolM!P3kfgLvv7WymAY@{vE>@_U@bBSQD2j&VhLsMWYZZ7g=<H
zsT-_IPSLWSi@CE9gp~z)jHP(*B$X6ajfW+4yJWZj_EKt#((cf)S?$H!;EA&?Ufd`C
z9v;>WvCs$^56YtbqhbZ(ELjh*K8T|&zAaCQ)HY&i3{`ewSq1R_gOjn+;tGocrvhT;
z(ebkT9VXty`Q@6ud;;gYF<I)34p7?<luZg9F$iV}+kUZBDAOIC<R(G)EVao`WBU=c
zM90K#YP<V&%zO2UP;rD$>X-p{_<<`ZZ2QzYFrX+<jhn2o-c`MjnOlF1)3t;D>T_2t
zzGWRgc^-Q#B6PUHtKRiPL65PfQnIaMG~j6ImyLG?-9P=dXxg|;pB(V4x+2sr`Pk%0
zh_+Su@$hpK!m}oeWf=-wE)M$vkAk6VydkN{Lxwp^U2nwt)ak6kY2)0S!M;-YvkvKl
z^wT2Qy**JvDtUz%C$6qLXvU7<tzDlwcnFUa;KVjo;fU`io9aI`m+w~Vmv1+Ty<_d<
z67aN4s@XsLbg2-Bz=-JVHl^Mk-x|eG@!vo+dy0NAJIqsIf&EG5^BMEb4%@1RG0aE}
zIeA_X5EI$#A_1bBZZcch<%)|J={FXge98+NlnA)4irG~t{t}9&Kz7N!NGPmaSXcTk
zV#3QKxH7xAFJ@jPY*NU1>r1?lXRDU;<!4s|k`!M^Yr7DjZSS#S{^q0x3^(i7vpML<
zDtEvxYD-c%v@1VJ&&+>W?p~7!%}lyU5uqcNej9V}0R0?ZGuy#QkFZeN{v4yawYGlI
zJUl>;sG+wlf453iA<5hBoxf&6gLH3rfyiFeEIA-A1%?5~%JPXi=MqaEQZ93cOX|(f
z@2Q+0Lu>fRfmapp)vRf-$RC)G&+BM?DaHZI+UKF<_aKaSFyk({-LCZKZ~1h`)@<o6
zgcr}Mraq_g?--QU*iF0hvZ$~nV_x{7`|AE{MOK>MW*bL6SZa^VI<2cnUdv?5sFnG)
z2cN8+StAR)$RUcTlwn^dRz*bR%{7c4zsF}6{%d}k&oS?S*!63J{IIEv(QTY~;hPG7
zb=N&TWW=&X*prL=XuXR+14pQg^xw)VH~fr)J@$}g?Xx(F>9)o6{Pl5M^Vy4|>J=TE
zJcyz5V0pCnK$uIoUzOsz=N0>4_c06^qadlCf7cyrSKm{SGJVmt<#(>y?7^2Nu_t|n
zk)hSI!0rHDcV?ZFGdGpp=WZVxncvM}v6)t-m2r`4EuEy#+v+IQ&p$uk{6z6?`$rpT
zK0{O^*D|#6zkWk2(tC3dLY+$&<vscWmglcVJR9>l12TYNYfmpK(?1v6O)g132K|zQ
z^mC`TwvT=-YupRUn#8)JGZ5E`9_DJGhCFWQZWOmQu*nH<<2K;tKMJl@Uo(qN8+z>c
zLU8dY5A>Mx#f||y{xofA1Ztmt7Q1gRP#*6HrLkU8dI+LKC2Hy<vQHQj5Ple1yKx<{
z^UCg^PN~n%s_VUPJRLTj%h4WbxCeSEMz+9^_D;y94Lr1xnam`7hGim@odjk=YY3~X
zJAh|8gIgltrp&H-LRIirJnCrVL?7hSa<2drlW;wxx#XhArz}C=v6pR7hQzh5N;Cm)
z^y525fw%i+G!;5>x{dyqj@H{kG2?7dxZ6Wp!OUT%z|}uIvKw_E=&ErHy8{pVlO^Kr
z5Xedb*6`CXN^Rggw<@sdo6;gxDL3q3xwKq&@D_-53tSz!O!<J!B^%iiMZtZzi1cLf
zU=^-g<^$T0HaIU}fi~p+<`4EY>mlB59p4V8r*C41Mn~X0iXMrs0PfpPM<Wi=9dU?j
z%DF_1qXE1WUF1kscPURkCbyB3$RED(6^ZG^m5X)pPreN)b5+Nd(h^uQ^U3Y!kal%r
zg@&vClojCUjFsU5^bIv;gI0o(1+kD>p~@=r4<oP<LoM^Z@80YH^zW~gh;8@~+%CFc
z%Byi0M#%ERymB*oM)>DvQ1h?GmY<$!MpnKWtABn5S><XxU)oAcxLrrveH{`Mi1oEZ
z7;w`PF}cr`T)``##FAt(+K*qL_`;%gy>-V8zCRC~d;SkZE0$YMBXHYN7p2QBJv0>V
z!u7tbw$th9&5CC%Oo_y_J!k9r1c0%7;Bj9Ey3Yc;CteIKIF)N0_BUW<Dm%LK@9)tp
z_w|<Q_k2@!oXn6Q6B8W*$T`tB4>W!9$XsUS!_*Vt8Fv)kf@mhH)oQNpQPfv~sNm;h
zKWo+UyO-+PRwYWI{PN{TxGZ)Qg<QA;hItXp^!sy;0qc~ta(0K`O1|za#U!@v$9RPi
z8;_oe`T3c9jNkd`uY@BRzw`4m=yja8uh5h5%HHU8oVTwWq0uwwb)2_v%O%^)$TnVU
z>GGF1>mW}U@WsQq<;55;x)l+Zri|r8%vLi6UJ<8=T9IHMDMfQ)*sH<E6b+5qpw7PG
zZ;UUxyy(pJl*F1D!)Q7{9lhKK8QL3nyG~v18)j<cWv#uxd?nC76HI>(1E~4IYv{*?
z0^mh;<=n*h3-4bePuYI@8h|V9SgBwczpL=8h53!2E*-on`~R0Wy&hUuJWBFsW4sUJ
zKmC8*lG436d9Q}Pq>E)dnW*#M^?`nj`2WtU@b{Z?GXqun9ufLV9bK@pg7X*hdD|G7
zB&#JNzV>zJTGV{><7!RlupE6SK!LGy#+(YLpn3sVgXcanDNFryv#o7`y+Lk#F^Xte
z<QO%DsF?LW2aO6&Kx=&o_>^#-!_|xYeZ9>eKUDPdE&yA>RJ5Qzw$z=BRGvl#E$>82
z_d{EUN%=b9xX?lOqnV3m1w$~5J`*42(IXnci^^z7dnn_2DSdSQ)Z)acwsgIW?;enG
z{?qhHJcOuY)HK^_03s6<=$EycY2+uf+r%@V!X3!y_X9w=&uCSkdqf*G&zB!Y_G$aN
zVmqotOq=USCR)DMRx|cNNHc#MTV^~G>o@cLTU&d+UGBNuOO{B+Qdr<b%r<FL=Q8<g
zgj6QSa4rE{X6|m^qd^+r3umO|PsGa?XEn5hS=5xnu5&w{v715L+H)Y#Q^;{oy9_dN
zo<5q_%kx8q=pg^2TAh<T|0;MG@Z~yCX#VB2*PtsBgwL01_*_qD(ycY;T^?mM5uuei
zg*?I?N#&=cDG)~rd?0+pX5)R(5ID6xnXcb7MN9eEn|G*@S_o!d$R6f1ev_W@hSdrO
zuUUUY9`K_^JF-(kw(NG7*IKP0rF|T=s(xYW<|2LzJ_&>Lo|lIV)e)BPJ2F1S`&3Cu
zpZ*tf?;X~3)~^3DikiWSiXc^BW>gfx21o=H1RM*3Qlv<cK|s1lkroS}Qgvp)N>M~G
z2$7CJLQ#kV(uL3?AVmm-nm|Ir?^$tXWM<yI-@VWI?Q^!*^<MMGO9|hy)_U&ezCRBc
z4KzdUO=>$84dklBai;>ys>}qlBJdwabEGw&^85hs!AS0Q=@_{LkIKz$+fyF@?AB%#
zIDQ#6XEgDV*<o^!V4}_LD}dTv&&BP#>t&D$zEJ(~Qkr*gD;eBV=AkETSD`^38SM>6
z`RfoDkh7%LBk-kF3909G*lz5|%WShy&mxKJYme!^r!1P5s!@!Bi;IZe%hyk4u;!bi
z1G59QalMlJpjZqzZrc@qFKdL<N_I?%Yngoba@cZt50l#iODQ~ANv(EHlJ6-F15({)
zF8$x~@vS*H(AEDQM(&E}!E$+VkcL8L0ya9S*-eMs(lIxY*>Ssg+tFYwVrM+(`-$IL
z_WczY|8c?1_l;N<N<_8sygXfn``Ktl9+8ntsL^P)3f>3kqsi%Rjk#YmezX}&{Z8_5
zlfy!G{LIS_$nLc@T`F+8VQwoE%`Q8wvRCu7!EGNP-?XJ!&fsa#QVP6y${E)XZux78
zKS8cts;nNR=06iXA~3m|T%soyAO!h{F@g9w>?RFP6YbTTHPsrg0m#Ff@aD)-0E|{v
z38$l^hC58)%8kmlPaxC5sI2D85_T88F=$vjAxQ$6b}#Bi*aT0B<@P~4)`Ovoo7SD%
zTCKg%*V@2<cDhnrnu?U0e@6$aUDTFQE=*Dcm51Eu(JLA;fdf|6Bf4FJT;<DOrX(no
z1y0F=auJ8o(eyg1j|jiT)i<M$2;k5FmIcuq21n%fgJa&7WS7v3HSzECGqP|S6;H8j
z9wd0vY)_o0MzS_g&ePJ`_M2B+**+%W@e+uc7jRR`xL?W#D~NrNAUfGxVJo%3A}l;4
z4(um5wx;06?DTo7fy$xT3a<k;8@`-Kc!z+VpK2{LhVS?UUzIK0+<Zk=(Ug$-_+Zfd
zEDbe-8PN64Qiu?fuELzxP2AJI{+ss;^K}c(t+6uCz;RQ%G2<Yx46>7=RON8{kFz7{
zw2$s9FBY7RQoI;gnv03osi0#Z1k-(G`;hqPEoMte37&z2d4WF?kU@fntl+du+KODO
zpLH%Cgpraz3P@AJxHy`v)bYb(XLYa_wNf)nT6G^+gXM19vWStT?U~V-lVlOZ_cRjA
z7<Fri!n`Ak==iG2DJlyTDV-Ku4@RMqI8Lu{$&gs~d8y2ZJW{{B+mG~UZe<p!<VnZw
zm2r>hvsxhvfuE1JLA!sFMu*{zr&V4zye2_%iA_?Tu@x`;_KJxYF-9WgF22rcH^T<(
z7;T9ASZf-H>y7@l*DT!q@^rE<QNQBKZEJ6fCc$;l{<@<hnS=tjw^A?O`iA;i5%IOF
zKd5fA`eUdvU+JCOrFOwGvey1Emg6TlvsYWSSvf~jl2pOw@6<Fnj2vp)A0LE;*ibG1
z0mc`F{nB-<a~~js9I#EjtJhtK8BKsgqkz4xL*WC=IdY~9&8#FEEJn#&IKkg;c$g=9
z1Sj*ZE7c0EI#x&3+nY`lZ<3~{bgx$KyyNC#Wq1U+9?YUlZwd5*M#I(FKkL^OWt#3?
z>*FDrbS}NtE5hoQzDEqcxVzAxd2YvB<~Zv1Q)_g3AHQX)c0#7q(KKzyO?fa`Bng$&
zc6&Y4v_*)PgvVk!zybPmvkdKo)$p{w%91xVns-Bd)#Ro_Q9jL1T25d0sPgq+BJm-V
zaQ$&)kKUH^0A8UyyN}9-&0Nhkb<La|NA{1IX@B3Jdhy`83K5;7xkg7x>x?3`46Vlu
zBigXt6H$3AETpY+ilGJ6m}RMKYn&E0CDDGM`}WrO`>|-Ip_y^=@Q6zy{vb{odY;!=
zPcT->E46+6Eql8Km$NvZV?5ss@mRWFK5^+C7{}{xwyCFjkM`Mo^`X~LOl^D>LFxF`
zKQv4Kvw^Ne3}L^C5gTg|Y>@QuQaWav?jfw4hk_O9Ahn$&@<u-=^F)Mau%~TjcwOF(
zc2gy8$Qiu@-^(Y7P9NGYmTflrnC>k^v3?vbx0*cDa<qBS4IsR8W}c&xgc#$&WQR9^
zC{rcHYoW`S@E2jq1rGWC8F4Y_R9kxA=iXjAl!Ph|vhStEW$T{xg?`!#)ltwdr_$qY
zmwpm5vA7#4rJ>HAC2PdHbvdE^Z!_CXmp?42{c><PZzoKD9v1@o-LsE&hOAvHV~v}+
zW*)Rum9Cw4#0lgi11sB?&<m`({1~Hj>b|11TG$NqU-n3#3`XC~1^NqNqheXbj@q*!
zU|0KzXRbTni4XH5!UJ-D|3!0U+m_$vGK2zeht=<HiF|uD6qU+$=>@J2&n>OE;_x9}
zj*xFmc6>fOMfu#CFPg8ZJZJ}SRD=^~^6MlZC4xk+dwY9>d7g*j*s^uJv(=h)K_2Jy
zS^)%tDxj~IK=so(nk`8BZBMnsC)53f%HHWUuaI4_{;bP|Ez)$o{Q}-PhuFxDO?K7I
z_FSJ}1;;7;&d${H9>FHi*zPj1d95GOb0`NprhT-aY2-!QffwiBtF9I$t7xm_o8Btu
zwhk`FHV>U$I#+8L$i=U^V&Y+04(F@W%@YnL9Fh!8LZ|@3bhMy_^M_&vm;a&7pd#WG
z?3+lNK~+bo`yP7*6T5f*=v;(Yh2=jZ6f-n5a^_=*K-ww$ji+fWf8OEUGQ988Ic>Jn
z4tHItDC}54kgd^B4k43{;I1zUJ*IaodC6;vL7~>@w~Zkd_)yu+l9X#^WPCm2;(OHt
zRPE$JnQc<!w6*L_VfAj!(sa3u{Q6;)n(2$*)A6;(i3K=VF68}@`iM=s#6bu*55z^`
zL>ctIzGk+fAL6pV|4V(3Aeov4g72L-mO|&$*-x$f*RETfV2t&eWPJMqvL=mgy-pF-
zblqgUCXTV2A@of<#uW{)-0mzjtd*g4AXHF=euUpy_K>;QI?4CDoxaoT*S@2&gk<n7
z(e#c=J5~f=*j;E;F_%_l9e=O&RDjR<gbBhr3vfdrbL*LqdE|x0Q7nm<Tt#3K%@Y~V
zjH3MCyFKtJ*Bk-KrwVzr%HwL}^k7Kz0r`=ozr?8y+_!DqBR85Smi1ERmbno-sn9#(
zjEmi<&QrGrvg;8M)$%;Sqv;Yi&aaYH#J0+OCua1dBNJFQIWN~@*7n~IL2f?zq%g1S
zbsjxDu^(^LJkydcS8HVy$|^4IS?zYTTI7b=pC2nN|6n)$cX9}b%Rgh9cbVtyGzTk<
zK#wKJ#3z@=!`NFtGt^W`clS0NjU4wSw&H>h$`*(>zo~wkiI5M-WIGpo?FF7AU5S5>
zmTU<)N6ckkY>w)I`eZ6Sy@K8T*+&+Q0-ell0m0>$SnYzm7WW9#w%vW=x~Tz*nl(n2
zZe94^c_T-ay5mF1u*@y0Ob?mJ<cK_>^7O77l5j%>e0BSWF37k;N9g^=og^?{n}^EU
zE|^$eu@i_^_OlA!DLb^e`HgwV*1l|ymns*;i^Pm_agbtYgXhNFSU2k9JTf6(Z;gCw
zPldL@uf}JiC`s3S9w)F$opy%`8p^Ls)bZ~P91R{G5h6zh=By{^R(ula1E|p_b0!{M
zw%u^7&nX78PGi>HUU39Lr=CuiD^ci5g})&gKeZk=?g5_vdr?M$W*Wn(NsU?cI|f4=
z2EUwE>qDwrrWdwaaC_2kOx@D}F@Ig;z)M=)A7aVZr6Mky3UcW7b@Kq%{)u-u>VlT_
zYAK!~>pP1g01Pli9bk9Bc`)ekJDn&E?ko)vpBbe~*FLkI2Zvg9{6vKPPd6pJ&-$q`
z5a#_t!rXiNMiTmQs;J%Kmu_5)-U<%}I&+3>OB&52JYC(8hm7!)b3W$;Rv`GJ|A;yD
zp=Fv7=Qc%FWd5lzaT~SWLTFTDDDei*ZEhqgx%a{e#&zN1E&k~6xFiwb$eL!kaHe^O
zUR7F(2FFpLK{qu=>CgfkgVkoRmf@s@$$KT81c`}uG(sLt65jqU5L#Dua8||rYPsV>
zw9WJgjys5BRZ3Tm!!xb-P4n64p!sGij?qOY?0H-RNu`$E%_Px4!>%U5jOgdPojweT
zG^wnexVdx&FOpq9HWxLrtrAkBQnjd0tOm94h*-&aXE(sh(9l`B(aVU&M9mBO3n7YD
zL>VyiD+8+4D||9c{qZc)uW+7{tFs!KE^2Y;#H%RmUXvLOM8FFu48u$2AZ}h0<$1e$
zg~wAO)RHF%&G_NYL+Sq&eeLUM*1J|R=5>;p=Yv%IL0}wjEI0_AqiiU_`UyEaAOtz=
zSV82GS9|163L6DKx?Or9__b_A`%%MJmOwgdswy{VP-bKTH6seY)~ACDCKx;AuFGfM
z)aizN#3WZ1=;%+Qcr@5WniU+(TA1s|(RI0^<knM<*=Lp3+lr9U5sj3rrrpukdi>t5
zlRa%{>bi};>@7+1eY9F9mwYJ(Mu`Itolc7sSaRUHDQi~FK(ehvdHGBj-NMwrkl5X>
zrk4)q&lGCzg+AlvE4PPdcK;x_#O+y}dI%ipVQYNCo47ZvT2ip<FIuSL<M(aVtC^40
zu0KOl91`r>;Ba_)reE(ypWvqeAYUU6(6d3odXW5&l^m-z8p-1bTI^~U|EAeC>cI0p
zMTcO^B)mr;HtOKyyC{Z`ErJ>_LoACV-mvbtKjEr0w4mcndVW&a?vW!oK26V021<9s
zc`#q%*9<cw>OJpOEputdj0V4#yNc}V>~qWs-JNk`PTT5MCjoZK5Q$t@EeD~leh<8*
zztq(SJiV76&%UE5dt+*a7CkWl_R&B79a_6c)A*-mv`8yfvg)v}%gqL4HlIk)zg`ir
zth5EJ)s2f1kgaP28fZBUJkM2<fT<7IAsaHKyk{pUwB`u99C26gtH8=<t<PcN7JLLS
z3$R>(%KozoPI20BGBgZHrH2S-;+{P|aPV(?zkTf*#Yw~|Kx(Veq~v0?_n&{q|4jwZ
z@TcYj1lsS~J6uPdd}RLwr<AD@N_D{b@H2v!&l~ZHh#;l@GeM>J>-H)_l=;Y;9D!th
zWZZy^^A0uSJ1SYqw_FFQBftM!ZjBP?0Dg(N-UZKm%_h+FVHJD-4(7NlU3AdqTRM)S
zO8uZa#KyWOKE(RC=7AP7zgd6TqUu59Y8=+*d4GXNU*mc{{Gtu)pVI2P`)a4EDX{a3
zR6vhF$tvl=AM(33v<y*WfcG*)#vWjYt`^Heo~@Z*^i;PaJe3)N`SHfu3n(<42OiMr
zfb!sPd6^%cj%0^&rm<iOI8p8G1%<d)Gu1DbjE+Ix?{|~;sd?|6alv2I=whVbZRdu<
z!*7rN-h^BNo@1CEv<mBJ5+L0B7-{U(MpFBP3SfG(A#L=`Q+Zu(;4LRd6kXVnWFEnW
zF}wFsI{-awq?o&a>HCjGr@Kn_R)CJlgIOzxK-h*-@!;C9=WSz0_X8`Vz)F9Aw-0Pi
z&ks4sBDhg498g2Q>5*yeI@S>H*CnpJN*AZa@sRyh>{?@c-zMZ%i}PwRP3{?Xs75X`
z7f@-aStXcN30DRlB->D3*)35HgRGemF^00{Zw-SwgGH9Kt(6n#b;+k~VBemI`?9F@
z9^9u&j?7`n2Dekt=$Wod)$%W*XJocXJn7LPj|>#8d#d5_UZ+oxtkxH?Hw&#G)JCho
z1tiIHSc>)ab4S1Xq^A0NgY#b=qLqKv>W21%g*TcpEl>+Quo~ow>E2*;&1oqK{5;jJ
z0DjJq?CG4f5d1ERBJ-W-wVsJSvi&`aOFx#lyNhS9Bd_t8H;a_p;^W_`D9%}(OO6~L
z4HMeIYS%9!AnGf^Pmc0Z2@D;X`w}kE?ry=a0FLyD#Chw4b}BSWVq*XaVC5{!G!t!V
z)lN9+<$lkS2vmoCrU}TIoLoYneB|-qk|Zf%OJ5uA3r>YU0ov9Z9isD&m_Hg#X>Ju7
zd{T9X=|wqr?;M1_90P&c>Nx-O+-_Gmr1+>>7C`oh9e0yO*NiZT&`Q^#hO|%I+TtAn
zI%i*J#msJacb_*GII)EX9YLD-JeyfJcyRDQ8@PNspHpfbWdGe|JgwC&xIXf#y=gyH
z#zNdI<Yu_Fo9Xu-jiuYoj3j&tSmxr&OL9CqeTXCHR!58VbYWKM))$$o<ma74T%o2{
zmkd{yAY@oQ+g6Hww&bdJ^B^4GvK#0ZnoFIQR>LM`m|N(rk$(LnYKc}eSL?jPW+cPA
z^Aiw+ag<j$M7Djx#kix~!(0pZJZ?0~1KVftn2PaJ9&u~9DZ(6jgJ`l!v^UqbRGxe1
zKYd`alyYn1wFXRDp1{GIm<An(9HVV2N5=OpNi#4~(ah+=vkKlcQ?vSXN*NM#UtO~j
z-s!SCJ-_>5`^Li)#)tcT<;#mEx>GNob9+^17yLe{#NY~+(XjKNc!#WoxXrXLj+nYl
zvLk7AX2ON@8WVov3f)o(Vgep7FMLB^cbMbgZ@4*n_h;kXk_MT@&Ax9BL~1O-2wJ*+
z&mI4GXpQe)zeTMq#i!b(-Vhg<%dV8M5EXi!<maBI?=D^bURrLSkF8=9)`An+7w_Hf
z2wxEP(K{GFqJ2~)PuHPfXQJd&Id4Oc3<5@d<KQJ&cpXiHTg-2}dj!{LOx}(DWX{;m
z*o#DvooB?|kSXp!>v`v@@&*r5ISA%WSz;Bwzn&`rIU7UNEj=jbuiT_3W&PbBzC>8I
zt&cnch!d&BLQpkIpnP<j=DW!9syLB|zBMK|Sz3qQ{XEPvN_bc`^ndk^R(tQmGt@)^
z(_pT8#&kDG?|CnkEO(R-%-F&Tpy;=ieVbXq?wg&MEA#I3Aon}f<a!cwlSHC1uF6F^
z!>EpNd<}(Xj`OGcwo$)PtS>KWf>|F4*LQw^jwE)5o|dq@nMbEuaF9o?ZuJLiad;lF
zP$dMoScfSQKQ2=^T76BF=4r|wwid*K9P!j^V=2D4G;2?z_7}mHF|fu+ipC}BME6?c
ztNM&Cue5n42)pxNTVIL!&X6lL2Tq20w6|8-s7ifQ$FU-#^y*dKRJ_32mC|%KUf{_f
zNtb`F=MZF1g-nV4VDkNAze~)w05TiW?y-J`J%_NaJ5cY4Qn<G@(0{ya#Z>N?VQxah
zc~E&)*PTowBZ21Bn`=PR{No2)HK2nUeY_gHiOK!?2hi_tc#h0;jtBH_bmhxNsmRDD
z00a#FKD24rrLebmTLqB1k>j4QpAud+iLVq|^Mz&f<!46t=}LGRnz_OsCV#W)ns=vh
zm{J$y-5lGZbZq*|#yX%Ym4$jHz-4kR8usO{9nl&@GGt}66ty9!H*kXMpcO!Bfwsuw
zSTq@++L&j#oQXPbfmjTvYeW^;w`emjO;v^_>PAH{cRHD0>%h=<fgXlaa$nKzVZOb6
zW7#Mio%_ung?lTQW<9ei3VrH^Cf!$mafuE98QQ@cV9U&veyHq|@8~);K?27Fs6|h+
zn21K6^}yi`NTXBsS}AeEJrxBgVCrak0h%UDdc<EX>bj|Hc?^9O$GI1$0`Ye4`!ur<
zuw9@kZ-dS*&qRs*n5U3}zkH@zslusYEY&iw@yD(G=FH7BlJ=d0cz50A&tQb;Hx~=1
z$bLKs4)&nt{8I<|f6XCwao)0fITNq_;Cy?$hv9oFIN=d2<4%q0p{FB^3cv``l=a}e
zg>7+Fr7Wue0arrBT;JuFUIUi>pZ9sGCcph4bl%ivKAdTT+{yzyma;t9RxM9kdjQj@
z)7+zD)1fEfKz2#aJ85F!p)CMoQ?}<-IQ4)R;~naCwK%QTrlPWM<56TqXT&p$w}wQ?
z?vp&fxz5(VSn|m*BzKc3!*Ku(e6e<PY!K1U3HvWW|K<5d|KNlqTyAr=?Astz3!-`P
z-Yur~{pL4y3^D`yt73p=cP_SlQ?yP@ixYXjT&`}B6InK%%owsQR;XON=7=rhpuE+J
zLdAhj?m}@zyc3h#1csXWm7+DKZ3+K4=qfi3&;(^71!@F8o<o`ETnqkFs5*3pw`nex
zqrF90GYy@R^7kphBb5_j?Sw5<8*`t@Z|c)Iq+Cu;ul&9}2MQ~WW>xOflO8Y6=ACYS
z?fio#Ils%>JTHjD+PIA%d~HPJ9?$IZFx<mAFCn#F4b+P~#)fYgFgiKUCc#!pa6Brk
zH$9_HFQZGOFD;`GKRr)ok3rA_S$^kYUw*bfZ{ha3KX#vF<l6!rD?RLJPEd2h%DA8f
zoosNCJf|NHU_v(Xj+@=H4X}2g9(?@>I*|P15B5o{X_MVq1S=b<-i6;K8f;LF)*kt5
za{BVtyZ8ayn6;#OsY{bJQ(p78%mp}o4w`2<0||4fK(ww%;V@^q{I&Qk5sHcr3hn2w
z3OKmtC(Z68NT~mt66xw)-FN<%7q=JSrYv3bN`OP+|1a0U-)jz-O#L@UH1Fl$8MOX*
zP5z%dD6HQhfZlrw-&Maw&H7ajFg^-!^k$c?P`~5$4d3wMJ$dNjn=X{wWkCC94{jM>
z>hCO4^kGU9frosxcF~vX9{{?sh{~e!L{1hU%3X`Q=T3k()|XiHCCg6~i1FbU{oF%j
zfG1mzLvC7oz{1DvYac&C3BFfx78Ub<6%ms{z~Qng?!TvfG(1)-?*bTyNgiZht8R3m
z(E}7dk<<cRGEsHx1=x1p<?m@kw*x&ZLtdb(|LH9HDwZW=>sE}N0-hw^duaq8Jdj`>
z`_CT8*E*gIfc5W1kgq&w3j*geSnwPCRH$;XG?qKtH)S7j85|6P=mPo0Sy|lMdlO6z
z=8L<^W;JaqWN92CJx~D*I~OH>Rrpg)O?&~H-T~Ay%{~RASlYlf2jt;W>qTNfqDy%<
z?;`&BO+)uz!PVnIuYZ5WmLmtoUv3End~J!Ui=G-o9c0p2eAoKnORPUGdap$G!EdTR
zu=rNT!Eegpp|ijIrmNCt#K0CNy66G1eg}vJK8F)u_XTjm{abI(->f3=E&sv?0?x!^
z|Ggjk`}KhT{BQ9o8U9r3#bo$@{a}Yu{`o$DrDf6S^?z12S@cQ%TW+lgo@-{P{Jtk;
zz==(J?QKi~ztI~)!{ZpvgEwDoWs0mCFuucsezm~~HsQJUkNOBI|Hr?7^Jwh3P}el+
zmAKNj_S_@FX!d{Ti7XvbhFvzmg#bOc0Vl<I5CtD(FFj<drB)~OA8u<&R!QU4;2NH^
zS1cxFac+Z)&QfFU6<B|C?tQ!AhfhvR_kNJ3-<bUVj}Hs~RXg-fOfGBqvB^L0VM<Bw
z_}61I+%>SAef>_L&wuqj{_nh{|1jYF#m<WUl&gAQ%u@g5+unihIdW!C+9!1YzP2nN
zy#zF=7t~h8>Azg^s|~5m0sYzveg@u%bXlj9@Z}CPImBb{e|3yr70^C}=X!vyJ3v^%
zw<<wr>Q}Ja9K^*~E|SiK!UXQmL@NV*Y%UER$&`kJ{h+pca^;AN^u~Bz<AVKZtHy&s
zU<=dy-{zGmS&$`mHI$(7Yq;f{iW#eZuPne}#d9p@)D_KESLAk8Q%5bW19ZNi40$(K
zCtYTzXtXhjJ43KXM{hI<h}LQwU8AS^`PsAx1edr`WxFlN%XIERk5hKp#c+1lP2iEx
zV7$y_2DrRF(M9gh2G9oSF!6xR;J_@&?<Ce<E&Brk1pD+iZcuhO&Sm%zcko8B@U+Yc
z)J<`b+WE%I!uoP6P^Sfaa0o!mLk96YHd=QJZUR^Kd!kbPA@6`)+?Z>vb<og=XNa*;
zD<v*U*oLm6&UfQ$sdm+11U}G-Z-#yMZIG@&voW{7oyD6F<*2H&p(6!d+vJulCHCx1
zm^*>blUP_^ibjmm;^+bPEUml9Q~R03WCLYo`<*UFZ90z$?b(A&73^?MC07`5E>TQC
z3ELy*7k#td8xN~X3jCqhzrH0&Ev=chXRa0+-C{ktDS52g9!yq_2Mpm?mkzBvOhbyM
z#>U&YZxby$nR+Tc!8u$cKgoCG!f`n#prfNZmPoTxI6e|mK!^`wecpaZ(uia<wOmAe
z(Z;7(j(FRSbHJI{CogsdS*l_UyoxpmO0FdYjyg4ES@IL3ReEpbSk9LT@HH=5hp!s!
z#JjGIMe-9Ev;WLJ!doHu3GpoQ;56?HkNf8d)Tru!Tf)8gT37PQcSYdoVyR29q1++G
zl(d^awQ48<58s#rE+uStM`6$L&l7G;>Laze>V!eUnmE*ZbRaWotm?RZ6LE8C&Azm|
zQa@3P>;tL0CA+wB^D(u}(YO?f*$~4o-ALQN-GDl9El6Xy#HpcMPROXxJa8+_#CsT<
zjt^8mO)D~`_T8UQnXcE$z6V!luH{;qRN9jQ1*0o2-cRu(PAW!$E^909ucFLlnBb(u
zhU#+H^%>H(vXtsM^+lDmD`uoMmu-+QGB@xKi*XOdp|*;<xSb)wK?*WqRH!Tow2e=7
zp=9)~Z#-L!<{ZlV-!MRL2KVJ_q_XiWZS$s19*@VP7iOa!+m0%eBe%37HXmnxkn`p@
zgJdS?Fhk1RT$!_ZzzlK*-47}%A@+T+eky^BGQf#9wK=&glQrRz+%T7F($X?JpRh2O
za4+<@d1Tw(__>!fZQT-?N2+~wQ}XQ2spL944Q|g;FhO}<Qo7RaG?iYX{fZ^FK&@#j
z_!jqb+-#l?l*zZ<nLZ?Le@>kacYJ)J?N^hMUD#f2-F|ab;hqT>Y9W?ALkM~R{z@aO
zl~!}}lN(hOGKiQ}DELtm1Sj)P^wu32zfg!{UTxrGoRW|9@+5Ae{?e;@d!)yT+i#WS
z246LYW%$fbknP>BRGTx3T%9Tcx3!;U1V(-A2OH7yd5Il4g+U`^LL6Od2X29hOK9()
z#ZMsn0TxD4WQXr6gcfRiZ+2w+CJwM=MzYWxZtT?iz1b8}-aNMPy?f`q<$f;S{t7RL
zS@`C$x?eAtaf&ZK8+Iz{*zGu2q*g!0fn=BJ%oK=DHQlq7$^#%<kUBwcXaf#dHhPWc
zS^}#wW<=7wgEB&l`!=y}bKhol`CFxy(4&ku{BYtOW%+Zi+3nquCrX%Wp(Al^mqp${
z8KePlz9Y|gwtuUn13TD@55CsZ;aAV3XV<Fk;EjvX5R<fGHQxJTmvpk6dKhp#mIGe4
zns{h3KUX|cyve2_^{AK)q1E^x(giHtbj7zGY0Y_XO<ei9ji3^{QkisD4Gfri(uMiN
zQI|HW`3kFNb*M{Qjc{--RFWFe2MufY%suZPyazY?M(R0VJBk#_gVQW`{}Q{K;+KwI
zJWlIFLs7lK!FU0hMeZybnw>?vB^z~gl+{)j6suXXHSTg_&}bz2uCC;RZmZ|;un9FA
zBY1kd=%_E;^T%j_K<@siDe3};${W}~<Fe^>AT%ZLf*zmLYbt5C9NmuD4BBf9uFXnV
zn4WN^MB%FA=lkojge4DrzwpVj&Ub)rkIlnvUG_YBzR6_J{1JPs5}R$sC7;T^7pJ%v
zJN@d-RJy-5-+VXL*#6Y~tS+?iE?s6cn$*10^R0f+)<7=V6;iY?=(7+v>IZvECXOBC
zJ+w0F9rxp0<c+HIBNbySNOLi?&2=nJ&ceM@I4$qa_h;BMGr~o<pHHd`_s^v;nB&Z`
z<DAId(Vmy-MCS8M9Q5uBskxg5zt8vuUaf^6DW{2Y85A@)`o$72i>(IN3NagX{kfA0
z3w!+89n^S+P)|Qk*0TbdU$rGP@|oxIbI~aHjkS>^;&_O{`}{G5>wX}so^)~jKz~|;
zX8gpX7}s11D}02BW>wP(B|&{f-t~u9Bwrmsh6~0SM&P!om-cEq*gSGhO5Q?40<y|P
zHlP-MXkX*8fCQ9&`w(4VFGQvHvNw~%$45qBTyjp}mQWVy!)R_>4e=FzB+YWP?$>Jv
z+rQl?j3?!#iTq+r9d)hq;V<n|7dbr4^JzQ^*9b%72(rN8J>zs-NP{BKkOHq+8nvK;
z6sDdI5Y*AFW6^d@lICcjPa-qv?v~0_vB-hfHvniNhmIhJ2pg2PFYZvo$@H{l_ryU>
z$BEf4deFV=Ck4C1>y0wiBqvDT6&{-W=?^!*^GHAr`o~ysePm_VsbfQO!zi-jBG<}W
zQ45CW%@BxaUh!7usIYW4<~tI2X}jq&ttR|ClTMEzoitBdBx4<0p<M{_fW_J|b?po#
zf&EHNa<jsRi`w}d4d1_9{am|9mL~k9a_AI)uO$q1V61$lB$j<M!B@_IfUbeX(xSO4
zVhcatvx^R(lV}=2lYJZWGFF?AS$!I;!veaL5@QAYW$MC=f_<Ip?18o&r-IB$UIbtH
zCEbF2(fE(#+Sw_N=EqDb=G;Q}-uSy}+;?kF*ZcQ=(m3hjOhLOD2}h@7X>rGwwM8^h
z<0K|}e{3tmy;6Q_+(Aj0AG*2Sf!jen7$ec0c-~iVGU}ssaA?x{QOJw2&N&H+M|ebA
z|MZyMJEJK?adK%@EGG(Hwa9U32$CK+%bk!~@DQ-l!R!OHe+0gJrb@Hh;B!9ah%njl
z!vN-IvPZA~`aps(#Vy!cc3w;<Lss9+zqr*tU{|GL)MjR-gNd`0L+YN&#35V`9XWFu
z@a`*(D$6-1c-9^Wv~79uW({^{+{kQ(c7m)5t6u?kz`tyzWxepPqm}y9dxb=$6_?)Y
zH_tR5^*FhDx*-Ek7{ymUYxXJXn35RDT)>=EE<Dv7HZcco={sD95p-aJD~E^G6;nwr
zaacEcTcbNwB7Yt8h6o+gP8K2i<YM}j3z=~EaIMq7S-kdZ9OuwlQRHRv<jhztc$v9<
zm#3>;x9(c5pWyYCf~%aqFSi#Qli0NYujJ3y-5c)lj=(M4-ds$m&PR7>Tf@rUzBzkP
z{E`FSPeSs_M^es9BSWU^v{|~u+U^7n(`{jgQB8($bFS=13G#!3qq)$q>dn1(LQQ>i
z5Now?iIm%kJ4o8g=H@H?R2MWR-Ifr?s{N3nbKbw08)2`$gWc2O_PlQYhHuI-9!f>V
zG7hG}{v|W%Zpn7(uyklz<d?uPxrzI5bjRCFI5w9}>9}0{K1#5xA7h`Vs@FhB9rFjn
zJu@)nVnwb9<)>-+B`q~?MRbPtF`CjbAv%vV1AIX1ji2s13+XJDIwkzh5ZFm4?Q66Z
z_iH9-U(IoF3a$*d_DmOHw)*6xoYM-llB=~5qFgA#7n4HI#84Rekv~q%xz_p^bQRIe
zZe8q=Ci&0cS+6&7qCIYTgzt83Nm&;dMK|iK+uZh53P~jA3U~@V9lnHyB{XIk3oeNq
zKT8PHcjRxBDOG~bRDhGGL67p0WQq=4-fw@2`mx$-tUD$)SH@T3$x!OmuBzxfmmlf=
z6V;3;oHX8->?Bwk)b_1^M|+h4q1F6AF3mSrvT(tCyNKjB6VQ3nEasNq6OU_I;Pi~b
z`G|k1)ePRGzfN?A=Ia{GdtH`<Tp5wJT5gzJo#3Uhw<w!BO}yo9*XGeXlX^?+X}fEB
zK@f^tGiJnWTF+Z86|@;fH4Pi3PdPMujpJqWtya^?Mz8j2K80Z-%qjaw?X&*8R5$X9
zH<9`z*Gsc7LCUB3^~3QU5Hn$)j-gz@;tSy-Hp4}X`Z0eHd!6DDS6TN!<mQE5(gykt
zhEeL|pjm{ugMDW?jHYM_h`hT<1k$-CGc6>fHKMJ*HvrB{qp6K!`hGyoYs_+RdNAY`
z94Wg~rCwdAY$!Fa>!{&i)Vdk8WaQK6nYuxD)Y&E6+3z`;EzuervstSR(I=|+Ow4H<
z3<yxQq~%L!Ymdpiw0!PRJw}GUn(Sx<&J<HDkq!?Wzifw^vB5c&>+j;WT_2w5d4C~n
z0?h(w%Buf7Bli4MLOj810KBJ1d&W{PNyg+RRe4Qo;F&sGlq#n|Lmv@7CQsU`T~KIQ
zynrbC0#3TQjJ0r@coF7J!^*875Aw`oeUu$bvUrL0ED55Y)y2VfXA>ie$zFK%``1o4
zM8SGcCi#nAOdNf7*W0=WU}6|FX9ye7AV8B~4^*1Z9VSnz5}e|q%xU%@n9uFik^3sT
ziAc+wK$S(P4H2rc=A+@`_Q6`R?|`fqv?uTfhA>;g6_N<;XQ_k>(U{kv#?3dJ$j&37
z3N!vWdpsr+p7%#fU9^x77+gzw6sw@hD#&>`Q@zk?E^$!vV`Nmv&;)fMH~;B`8*a+b
zEOvYOXN_5gvgjCrI{~5iWAx}PSN7hN3i2hj5U*JhLVyBTF=ysqB^Lot29`pwqP~ip
ziGC{J9jxdiM4@LVaA-Nsx`qeG4EZ$x!ZY|8#sXQD1m+0%Er8e1+)PP~f@WEL_DqTQ
zyC?u@>pu9u$oI)kanp_}^y6KYk4Evstcw@GJiPr^je1=y?9(g!Pl$dV2oT0OG``g2
z0-djE5->A*)n-Oqiyf8e>PNe)1a-yl5_X^duS*lnE0)T>%CXg*!k20F+>n~L7Qi9r
zDr(!zjy!+ldT}n^`>jX02DeY+x!nUj;PCmvG?pBROHM7Jm<s^ITk>Fr9d`ACp^O@5
zy6I8qy9}_APq%rqTaRW>2?jbVUp`AeNB1)+39E~XYJ1FF2qfi|_>-nz)5sbDTl_hj
zSDr~8HM5#eNp6$2B|}3?JC$|QT<qqO>f+&(o~$JU=`UHIZcgRa9?=-?n2)JbI2BVS
z7HKD&PBMX)zrv^Q*)Mv-KBpX$3)Dy0`WEJqEaLz-tPz!IOm;}7aSatT>kZQ9-|wxX
zrCD|#<u@yt?^j4soW)Y-YA;8e59mERQEVJchC4(r8F~tKa!$n{I^i8yrbnG0P__pg
z$Qag2ur=z=m6Xs)bbvB-VBR-6XZ7X<lo3_Cw>y~|4HnIIYxmE$^ZCyURzPE|Wja7;
zRO}W@-OG=FiF;gxAJ8Pag2`yEy>#Eh!8Jc1$JMYKb74?a52x*gYr}wVY&{SUoMDb5
zA|8N!sdQ-Tr*nbt*hm=3gFfX(Qb5;;<vj@qMxA^U6_+Dj?zmQMT3?_<4Jx7SKg~@g
zEEE$o-IHurX}>GNM0qE*-4C>5Z-4@8`}M{e&F*N|1wBT3hlw5TV1FwuW^0K&^`Tvd
zGER*>raboElKb$N?BAMLH(kQ-Fppd9m-TP^cJEYrb6B26--Eg;y+HcU0oA2OLX#Q2
zei9B21*W%N8`bY_Uw62dH`115XB}pHS@eXPQdCU<44OSgZSyAG5R8w)cQlmnY7#JE
zwC{U+F1WnI5!Z=*dd!!f*e4#MGH6#e<-KYk@I{rs<5px@C-fN3<euxlpTlxBxk7r>
z^-CE2tYJxX)$|O0{<U#SrH)zTDK%+2W0luCHh2UtZ(q_i^G9?3s_PN2E}3VWz9D1u
zl~%sc{`hJ`W&#G#1xbx`B+j7z+xCJvG?xTNsXqWBK+`0MDyC*@47b{DdNQ!bzyPW!
zweO6kGG_X2<|SYCO1kQEt1dW&J0<LRK%`e>fzz>2g-Vqv`8R39BQt28DW!b_J7V0y
zrL^dTg^%F2D0dI#un{JugzIIN*9YfrKT-?nsf-79G_u|?_*CCs!SOXnk1}i7(cY!U
z?t5H07da(9h?Q(ua9!GM^J?t)jVlT+$zP=i!$4Bs!w7FTs3J<dacE>zhuE@Wt=-;T
zT#J<zB-PFNv$EgnD1BWbhYZ#pe5HI=yjknfvJV0VA=&0zAG>Rs=_FoCJqd$N<Yn(u
zBK0bF;xFg-eSaqUl+AEzw}gziWVEmZCv3X-u1BBM<Jg&=ak)sf^KROWH%syl$lo+?
zrZ`#L99`}juJ5?@8~S*!FkS6b7uQD1gX6s(FMgCSdx$zvGa5IAN!Zk!r`1sFR}s|V
zat2&IHo{>Z;;W20?}f4~%~FS1qIyPF9a_78xB-FxpRWWrh0`thf9rerk`vUNHauvy
ztuh_Tf==wsKKlcU)TXPF!p*nMZ@)4P9#&mlu*NV(`kiKuTKOfxr{)l|CFSP&T4m#(
z+u1T&Wi{RfO~QCpDM@v8YGY^ckK||gE(0R=;N^vGu5Jwd!ub+~fZrOni<7+G+?zzk
zdes+IYI6k|$E&4WU#FzkX(xmyvaIowelAS2S(x1VFjjj@!MUvo0hi1w2RmNe5pzMK
zgeUFUN35RqPNUc-8UQobGSG{i9)GiTu&!O%YxqOXJeaZ{x1au@{j``OXAtbyp`4v^
zLb_}X&>Ntl4d-*DrL7}7?AxXFB948!nc0|SYwQ)cIt6yeC*r@z)iKdn3hq-spH^u7
zn}KC;ue{i8j`57A3nJ}ZfpcO0e%H)|rz~Yz-Z<AU()x5N&p(on1h2>=M@Nw@!ID`>
z={IK;O;+uA6pD4y_T4#;Dg?6@B%w4-qS0Q}c<osQ&C3l@S^8G|27Q6NBePpuTHNmN
zS5wcu66!4X<Pr~!d#*XKZ&_ZrK(|4he`m19_SLs^G1&4RjZRigqx+1S70bepx|BM9
zjFfC4z7U-v{^<Ir1y%*lb@TKt)_j*+XPd#D;tfXU2qBoGXkhxT)e__pgG>g9pr>s5
z_1^C8^%N{G1{KFFNH;7G$+yn4q<qp$`e#-opLg20TQQ<uUPyU-34TMM!2@i&_-JI_
zTjnzZ^QT!?0_aKdJ)q*8v}qDaxxhI%n$y&{XGurG{HLvFa3k6U*z%+aKiZD5Z|Q!N
zqSGa|7OLO&t?3VhH9Wh^-zJ7aamP=#ONQ-!!3wyUicz<#`t@>`u13B~M~iXtxExd`
zNH28klyP2w$iVZ@zHb?=r#i9bMw{(_nkC|VK^O#WdYgCK!xfO3p1YZ^#N8@@NM&Do
zogn$RoBU^zPc=7azE3J;%h@z$j%?J1?#bBvXLb*~qr{$6qDV>yaQ+w&@wCH@ufW|w
zS_*N~H@TQj6di1PX_}n{3(ia%s&F>)rMYMY@3ECa9G)0m9E{ZaX#wh^7$iBIAn0z{
zx#S6)OzfLHWHur%#<UqRRiF@T6*<wZ_B*9OpZIVO1;216PU*F}&OpKp@CFlj3YP<7
zwm+kY%E=(4H{8Qev=tRvk_u@E90B}46{4hBWLsqo^*1PNLuo||e!AY%-xBJgR2jjv
z9(vb34$GwEeUv)MtDgRGQ1a()_S+JThusTV8!lY9DVe7{)b_p%H(pGu7Z$&(#&Dz7
zN#Z`OXjAZB_^xA0W1)%p8WW*W$icQLQ_@e22#P28^=@z5i(6>>JmXzF{%*Tt2~P*A
zl?qT8T}ZqUq#%KP%guKw#QJ}XpJ_W>!t`(Zuo)N6A>79OY?)>hq4jv-e6hLXWy!Px
zORZ6#J_Pd2A_VmBXalqG>23S+D&{hXt~{m88zq8knXgI;bo%@pTk=z*Bq(OIK_rzG
z4g}FZXNK8^6bw8qF{qf`T<5F93Mz)7hbJMxKn&{hU(b$kw;vTba&~{^6OkKP>@%_x
z-9rm#6y!89D(v0vF#wt$vlX?SgjG*D(j~wi21CB5K~&{E%7BrAbPmlxfjt*QjT3o<
z`N%~8s=<%l{`49YeF{W@T6W||$H(C!)gnol$Dpcm?HE7bEB>j3J_?PA_l@i_D9Q1K
zN-N_!SEhZbSG<jE8)-%7X6AMsNyK)Gk>{HUK{3R+8n<0UtCpy9;#gMK=ek_Y-LSfx
z?>xVd%Y2I_87wQNGD*zju;Iwcl)LS0*R7!T3|y(}U}t+Iiq?3pX!>_{?9w3<sq*kJ
z0`j{gtd3p_BP_QU@aDL|>AwdL6TV*b`?m{{zXcV1;eM=LyP7M1{?m*0!O|nz^@@1<
zrsnXZJ+AzPqPfy?w{$}4F<JZ9Un8bEsG@@NxNYVF@*#vAk-aRYy16K8O0ZYNWAts-
z-67_WTjPGkiz+u>d>_y0)XK8u(jwd5{)T%PkL#bRK2z#f%U)1db4&JhqxH$#CnUJZ
z3n#Q?^&E#vlSYRPvhIgd{w}0sPt<W>ypd-<!*@p>`F=8WXZK5%Z$o}+Rj1y5+J(W)
zu#sGDks#ZG=;wu3JV%HdQOZazU{td<U2DXg5T<w$F~@X_x*be*2$n`%y_htTAGE4{
zPJQ17^6f27;#=`6g`ZYkHrx}H=#)f1YB(2}8Nt+EmqS|b5#hss1ypEyN}zC`psfTu
zlA*&MAxpP!INa=uGhE}w;Jn=bD>E5CmK@?8Wt#T;!NCXnLprI$D1ojy(LKvWM7Ft>
zOA`-VgEE@KI7fu$bow^o0t9VlW-asm=_`$DLj1ZQDKeRR&2e9y#0g%5Xa&aRmrLb8
z{0TtfiwGi$OiIedg%)Fl%3h`Niwdb~@n=?Pn!`?`Am_d5Nfqi)ZGWkBCvbJ%&=f2R
z1y<$@Xnd-FTeW3u{Jj@a*;{c7uSo7p_gm{`GUC>zgthe`5!RU|xFK8C^0J|yWk_o0
zIk6u!KCLC&-P9m1AaRD2oJ%>SzSC+%&xqob&Ki+kLWbT{>5Yk+BdxomjBfRb!<m><
zUT@c1#Bf_+xCPp-V>>Y0)#_LE2RbTd)aV)hzOj~x|AMdc5q#{*T)TN#+rMz`wehWW
z{)T&SNXMAM+&%>_W2x;ApSr%dN0x`Y`tdKBc^wUDdfCb=O+<n-P6h%8c(_hU28NSS
z)-!;u*D+KqiMZqAAFBE(P@lyAWkZIU<Lkb8#RBVk=iL$kzKA2*6%!D8_CB(rSghs@
z2`Z66LgVp8+KQ$iUm6Yp{_3oj@##E8Fa&up@4d|te<50PMiK_s%^Ugs_Vs0(&z|Uq
z|1G{tk=)H}Uf;>umsbIZ))WU#+CY;o1f!{2F@gdMbld`aDm`M~@BNF0gFcEp>eU|~
z`eY|e8F8EoGbxslx7oJ16MkqZxJYYJTQym(8?^|h(vgShPx}pD;x%M76}E6c%-}Lh
zG^k6oprb0cXRy%!EBoXRLrb%{B>ihdg=ZK0!t>;Pj{kSio3FT+{|`w!fBB_f9hA9q
z?dpGIxyPOM+1ud;#uwi)grlJ_%+OJG`J1}O#K#A)eEXC>Oj!Ut?2lXWU-0$)1&PZ0
zK2>C3KEM&W$^4tg=D+h}zkUL~|3OI6UoPFE4mFre7WovuxTpSZrTb!qlFRa|?)x3R
z%KOa!myCx0>+LD^cfm|<hkWR<3Rc}ro<CVhMZaPOhelSz!!_zZtH-zWtA~Q`khzju
z_hZeMbm-J)flpQrIpV3d(5`pvn4g<M^StfWs?S<;x3A$Bys+zf&5EaB=}sQOfsM8e
zk#C?QluSlSQ_0fAy^HSFuVKf!cxL8IpmwV-I}0|4PUbClpJ4Mh2yF!Tfu9ic+;2@%
z7ox-DM9|9-h#a*I)lhFUZ|P;&r+MTzV;p+|+NcPA#Pd?Q{c9XiM9_?oMN*c+v;gqB
zYQTj&9z~x5<3#qdm79J-mSZbNgu?sGLF0b}f~|mP+E(DvH)*m$*YM}4V^xCc(eCoi
zw_XJq+9?zz&;e5pmA1K=LXo=8qalC8{AedmpVWdcDK|gY-||{us9${A&&r11Es`Dh
zL_UXY8A9&)K#)Ez?kL5AIUYbJ?E7++EAC(>$hjVgP_YZT;%YtPe~INYTI^qZf#?|h
za7nQOF1kZLpgL=vt`OtX5&K%u^F4%iSPG=tudEG*fnb+;Ik7J<<<-;Lt^SJ0pwFWd
z0<brQ3<uarlTb1Q&a>d2&E#%v-{c~m%HmY`Igc0;BAX6rQ%%y%nvFGv$-C5*8_5|Y
z`8dn9aJN4O^$D{@Ur?6RQ@`#n|2kXuFAQeDywhDbgJxRA6l*XtqgNlZ8^h$I!QXX=
z^X%5PH3|!MZD$x!ITsr!Q|||m)c(4Me^R1MUt`+4Avo3sfirL^h(Ti~&${e-EZYK_
z8v;F>$WeR<m%<L|Pr{)I3NS|No|~g<V&8`sPe;?y$W~-R<vJ5)H`hD(r%FX*z9;*B
z2+xF(jh@+nm+CjqinXP<CZtIgxq?sOf-Y`(du)L^LMu5#7=mZ1P=TV6!6vPlE?(ll
zdgh=BvRD3-0wux;F8*u>K%|E?ZQ<??{O*VlN<-*HtIw8#jL1OU);Y+!{CKztlNAJ0
zB1Tre(MwQQD?$T+PmKz>6hcAQ<X5~^lQ7Zd`vH7Wzpz}Ke$X5hOzeUxPYKk6%bib4
zDkfy+C4ihhxPPTRCG=s^ImmAQNGH&(I=5CcgbFvO=xJkKW47pa*s4XD?r7f)&)j^Q
zWy4K}Gp6sbjMw11%Bcf>^6q7K!!sj;f)UYi84;!n4Dain=<Yq(5`C_?MQ)>-h%IHP
zJ)A>Uzu0W)?@{cO@%o1jNOkzR@n<6PgtGJT;yj0jr_-;^CeWCJVmj*}<QdpYCK`a;
zu9Q3x7Wj5Iu;Qbqml0R^SzaT;`>_KN@!YSDhmZX2_^2fjbWQJm_B|&h`)KRW5V3FA
zD6?9SKMvAJ)IBF2>`CsEqYA2`NykcvL-h0UU5>MJ?fOn>if#s`uXm1j92?C9mKk*)
zO|)+ufYML<*<t#g!CtcZ{xB7l5fbR6ojPB&gK)y8AET@6cPa)w8&ad4bsgVcA^RRF
zEi%;zBUJ{WNlCSzVdd)%#hqQpM!4nBKw6j+!IZkP!UM$$QKI5x$0f+9q^JuWW}0bR
z6JN$nkWf%*B;&4L?T%Lz{W{M@jYz(F{a^#xV$o{@sgf3kyP{q>2AlUykeEaTqU4hf
z7%zPw#K?U6lIMaO-8PX{XR29hKq$0nqSx~VFsofZuVm%nFNoW8uMPOP^u@`Bo5n6-
z_$m~*d&76>);c%-1TBNjg~kd|XOzz$e7NkfR)jx)RuTs}*;R#W<jCavQO`1WL~Up;
zH_uJR{0w=IIDqvym`{*}YL4&~o0f`+Y+iIkb2!fLF00}PW5eyjg%$K{K45xu#<5HC
z4FY{(dEb6k><Jy=u@`<qtNn3$be;0b;!V9Xyh+*Up4&Cc{3`j)Ck%@hUuzi%yXrCh
z#Gtfb9sSX6TOIDpOqo|5+blYr`aYx=7!RkNff1OkwoQAu_Y-Lr;$UxZJaD=)<E2Co
zRJkXr5o}oAsbXexe8A*yIs7^bi`G5W^)U5#SKT9J0^z*7Au9^DkrLT?arnR|Az1X?
z!Ut|1OvjGZPRu<aI4|*1uKJO(n_jhw9`<mjJ4Ahw`*~TSyO{m=9EFw;E<Wx(cw}2i
zn=Nqb=CCVFvcm=<-}+bAYNwU@63*F<%CW?a`bUH)P0&MSWtduDUSxJl+#`6_61e)v
zjrlCmhyMbspfM$drv$Buqj?>tOABZQ{4bLBOj*OmqiY5RPbK*d1O8aC5Ra7`w(7kH
zixA%9p`wlEMYn9-t(-BPt$l){!#eO=a{<YErz>EpW_5>P^o6GngAB!^NeFP=1~(CA
zPPN&6-U}Qo1x3|Ghj9JZsjtL^p1witpRBtO%*&g(h5x8!gSusAZjSqYh?K0U+<u*D
z;6iMZEq{|_l;m-7S|rSAXL&24z9NXL;T*{T+uKluHeZII5zz;hXp+^$gH|h=vL#B1
zqZ#P)8%iOV`zPMAG*JcRT(eB=KBZ1elzq^X6g(<<0&xZ?e!2=#O-CD!+X|PBU~F}p
zr$H+qwn563GCn)8ZNrm!-e3ZFvD@nqd{-S7s|T!NWaa=IyYO_V;G*8>)x#6eI)idg
z;d+K3cPwVzFjS_n`^n~yz#e;|8dAL}{nkUd9-=?`InvNM23oJ_7HD5bd_AO%;k<Aa
zUd<V;bub35Q9bEA8|KU>-~;HLulJ%f!IaN8vXKaY`4{tf=}{lxjig*1KGca@;5c4s
zwYdq6dLHYF5Uiha@=<IoTo^~}#sCmsQ~E*se-wM;38m8UyU)p);J9HoUIJ<M<eRRL
z-ooKZvF`EEoQOna#XTr<VeEEgQMz6y3n7$7D1<uHDdT~9TNp?5{ebD@2pzOjr>e~=
z@_bKWpA2Ij<~N1vrEL+G@kN`b;oKZ77r*5z36pPU9zeNrlxU}#5z9nV^eS={8>g#U
zo5MzuV;r>RpOiuDZ&Ln-(|7SED*B6_p89&YDp`nO{Ba8M&sl(*e3`z^i(glvaOf$@
zYau;Rbh)vuxgh=v7{*<8R`l?cgH|>Z(f;L=ATW4M1-OG*=vIt-r@eB^>DiDld*mV;
zrg*H_f5&`A#p@z;yBx0o`y{#l=$=knlQa=Bua*_t-mb_~Y;cfJ`LTJXy1f9}xj6@U
zgqQB4>IC=1zZ{PMQ1cV4Qni&)5|2<oJ>*0k2tCe-J&8bLiCD=@$&TJ!bcS74EXzkk
z0~k+n<N-3r!)wCfccVbGwU^7SgN!1u|MG@z*1^)xd>+;jxiO|di{Gx#vmxF$$Gi*6
z@PMg*DI}d%WtJ#M?rqR{++YGO=%Oe8N85nq=4dxT(RHJQC{L@$Oy5=B6(jgngK)t;
zA~d$#vL#C$|G<^je5vb>ZC^)y;Oizk(FSdUJsd$ziyIRU9B|UtsSPD6r$7Mo$sX~1
zmSCc??rUrS;&pp+|1(Re%wuC-VnB421{`$lJQ<j)I;H!TWTzh~K$AvlVLOg>a~wr{
zQiOGu+oimojfJPF1Ao6OHB#_&H2%|Q*ee=>3-Ly)LePJN1PFhJ*L9d%y7hTow!%VX
zJWkkWLY2qxk!f25c7PR>71foRp3bWO&G$&F3Tv~`M{~~ILpBBEUDsPCZmza-xivD3
zCSaEh`%T=0GxyFRu}9~NMLFV;P6t`*aYq}D2It$-zMR%xc1;P;_Cs9@{ZC#<jaaLY
zQT^9^#J5+Psv)nCi?xq-9|EZ)7TFi6SrlZ)gh1@7g7uez?VOkgAQ-%Hqf|sy)#xpK
zS3^@sChPi1_OuOI74^)NH9Ga}`+2&&wSsAn5G7^9v)z{`bul3YN>W!o-6g&9u}FY*
zS-hTf^^#_{q9zJ`{WIs6lyFCx`2K4(-uch$!`IR{@#gRMQZoq$Q~x00aY$j}lz!}A
zeV<~(xJpS?o7!$_gB6E5Ct9iwhKJuspv-@&yQ=ulg8vv~r;r9P<c0s`*T4R#Grv8u
zyijXd`&eR)GjbSq1O71W)9TfWz|C+9<6D$P`k$?1{~rDerJ|8OQ1E@K<4c4gz<-&H
z@^8!YRWDGfh;)&J)sa0aKa?I?6wLeY@Q}CU!$#%|iGel%X*Jm*?kbvARMJiY<B7d8
zHNcY^bUq=I{>0b_CwiOnmKzqRi$kM|N>o)soh(M8v8^0_5gu$BK6FwmFW|H9&*)9W
z7clG}j_+K^M+B@6O#n)4gQ|VBe-nycL$GwfoE4rpzUbYXoqu2-{{T)?^3=w&!SP`6
zc!Zd_)T}yGN7g{Qk2gBlE&(d>WLpG};xWT>Ut=V!(CGk{qHMIMQVUNRaU7pHQ?)ft
zL6{Z7?H+S2I}rihv9!4Dis(>*x99tH(vzr9DIw+atQ~4w26&6r9svM|5uy+vO%(`!
z5<e(_hBS+B`8#{#k5{1cn&@Oy>E+;9lm|Zv#f;j8_xBr^?QuTc50=yj4imxIF1kEP
zb~d19KjkNY7uTTmy1WD#h?_k6AeS)e6e!*A>jJ~K0P8BJ+0h5=Bz5jYH1tAuX!gJg
zKj!50B#gUnL*Q$Gku{NIt%IQGWdy31e*jgMM|xvz?i+_Z$TNi@iNm8ZJ0-}`Gp5;$
zl7Zg6xzbEmvey>!PH^_N`V>nhKpNLpR8qN;36bdc8vC>0@$=-V6srUPne=y?#Yu&|
z_6j~*LW`ZWs?+ffKvx9T>~;}OW^|x)i9qv{R)i(Y1}AC}bws+`6UqX6Bqn&nbXw+0
z6JetiF`{u=>#3Z6)(D|4f6T}T_i+35Izc~IqcYX*d|Pr<s8OX>10^eAgHeRjlP=rP
z^8qrKaR39|r{=o5#jbDnX-J29LO4rpG3w%*LD=hml<vaN_pdy1(^vj_F@R0v+Gb?<
z#ce*O4t4HSl;{Y*V{O=!;Zy$Y)@OD}l#ALzpB;1!Gcruz6WqRY`92g@W=b2b4T6bI
z&v17}oZR(~24zL2rPz%w;fVqK)bPx2QWphI_*OhieOrve)&o4UOYZ9?J*>Puc;|kO
zop~5?%_$Dtz>af>;{!-zOI_=NHtx!X0blB)?&;?N)s{xgl)Eafy!p$Qwq3?%#F+th
zQJ_Q@L!z}#z}cv&i3Ph<<N8E_MT(L59dv|?B}@7{o5kKfM29!#G+)82b4pmfyJ3gx
zcX&@S7oE0&n=G!ZF6NT4cFS6A+;hFShp{l-X!E$ps?aRx^zhIZn5cW(E6u-mOFZ^P
zdj;0T#{U2apM;jDsaztOy-p|_hX+8}Y>?*R7N$7Wn0$On-d`S&21ph2lb0O5g{KI9
zX9-h%m4Ig*Fv3NLcDZA^zJ+&HE;w9{jz}B_{a-Xs*#c&Syf9;;8RWcIyO3f%lhU1K
zSDgi?(&saXM}r`8h-hut?+<h0Tt>IDL;^=Y4IWYM6Kz+!Fp<4e?n=IF`-Z`1Z3o1D
zM6fj?XVk6k`H2TV2llMAdY8Y%CUx*Nf`T8QbfFC3a3BF9&@gjg?r(r!XjZuSJ%EL1
z>Hbe@>moH9GD|RQrIpeYC-3N;njadvS+5u%^_@v9G`L?d%*|OJQ;BQ?noTpD$X7mw
z`2Y{fW*dnqKpB*A(E_{riVvhsb(E#uM4pIpbgx<&!j^gb@6q_btQV9)B+*FR2bfMw
zI#4&`@XpFBRfL&U7ntu-&jy12W4G77_WdS#vtQl1#9mq=W};u+gS}f}QH$YxehUiL
zX_Z+tWLSDQbqxtXP5U+>oX;B%2W9tj{RQ6ZC!-SmB4(}ukLux$vE3nM@q?0!;=>=W
z?typ=%)h#%43Ai+@R2C}DX0({_uUeg?gOt6wtW-(r59M)o{f8e(I*wJ5f?_%d6YyI
zJXXSGjbtOfGC+aeyOwYm^XKBy{46?z`b3Q0$QG|rv{+P6t89_*e81b#RO<QI2jJx1
ziv{?So2ce41kIf@b3*8g!+pqP^Hw}Mb*$@z5$8qu@8tpW(CW&9JX<K-9NSJFl1McF
z%Zq^o(IsyMpCdBL7mtfToq=6ZOzH_DYzvn=_iT;#J>PC+NMC~r^=ecL$cw!w)X=g4
zdOAR6jiQ{kVFx~^B*e$UCg|ei+&il+B9$n&_?NtrsTY&(#Z1R8^SUQ*9^36xEuRmF
z8C0yAZMsI&k--E2a_ItZCRWa-m^9f}=M2ZAhC6}4B)@u(Nkf7$;^?1)2S2%I5KZCf
zN6g&VnXuhOJVx(bJUKVcHdLf9^}eLd98!?%tit;UXEV>AeKT457ZmR|JC+bp-$+15
zS6}&hU2aUgthI#AXJ+xBTHxUk6qmty5zq-7O{4RpBYws8l902}`qPMhi*mKZ{Bsrl
z8WXoqJu96+S9rQOMvm2VB7gx8(R<V}kHc~2URdR_qwaXp*f0b3I6d+X3mgoSCQRYL
za3$b??k8%<g^`n#?pw|j<axd?2f*xUHrn;hK@at_T0@lPG`3PHN~#-`5Z3C4jQ;DP
zFc}AvMJM<quUbi%%cy~11wg~%_mv$t7yFdHA0Al*_&TXoE$B`{n82$AmI2-{@3ajS
zvs0;|5@g3gNz-Cwh6iVcGH71y)sbK<GcGPvifVXRCHY_2Qelo>b^g9hF6PjU=9vf2
zubmluG3?<o_<zc~_OK?eGyVZSh&PN<6%YkM(K-}ZspwQp6-0EPn+oD3L=-Z#1H?;+
zR0-8l5QO5TL9Cz^a1}aJR4xWc5S<QGsEEP{5JV!B5Gc@q1j62Pk}vs`)ost7J#*dp
zC&~HF<vr)Tw{yOe-<y0hxcHUy$+PDWvC3#>b=5A*%O#*@a!~l#T7<-J|4GxhSKe0R
z@$skTPaHjPl=u1@tCbDCzl3dwR2H#HgkaSCxJ&fQCxu^t@a%^fwk|?Aa4p`@1wOlS
z<^9r2b)a6VZy?uuNU<D{89!?43{Bj-N!|e1%PPBa1TgpK&>NdOr*=n6j~DJdj!s@K
zK0_Lf8n=YhXaE$rn2#*_8y55b2MFVs{CwkJAiNbhL-`jqv(hym-CD0j5yd_kM{J<L
z^l{6oqXihPlP4SuP>p@#p%L4F-bc}Bttp|-#3pwgx&T+t1i&$<SQ?d%2pnS>MU~v}
z%%4se!k$UHDat^|7p>HzhcnRb_~q#KD<v`z{ADz0E!2&!z^@&m7RE1O{~jWOrS4_5
z>;+`k!4Z%%BaQbo*blQC;lK$+!I(c00T0dgGdTR6{m~!dWUxK`%Sa3Q_dzL`y(Zn6
zJb>9&4i`zUpg7|mn*~h-Ktl|T;glMocWCr$KPeB6EMd>1r3gv}TaG+$76|Su^U89S
zWTMInMdnnEH~PmrP840k;dTQ$rT`>MQ(rh#kDy#B;JTpeh=-INd91YlJ9E)7%u5K}
zaS4Y`Q_ntq<88pj=%uXbyg9N7#475V=8lOl5J@N-#EZL7rEp3mQ-_@)#2-^BYq|r1
zBXPf{tmy_bDAGzTauyYdqO{Abd=d?TjTDqx4z1Qe&J7AV{|qh$L39m=yi{?j_EZqY
zY0Xy;XFNK)EWFh`V}>24bu@EV&gny}b^T)>TExy6GdO2*g#W%*`d`@18CO;r9MJV-
zt=V5MJ$^qu@osrsQ`bu(ujy90yO=L-x9P1SZynHL;I2YgkKA9XWnw~f)fL>W@}8=5
zWGQ%-H5qM~$TZ5D3T9yBsyj0!2-GB5jv%aPNjmu;=vLMMj6x<Zz1x5GL-=LEFRWc>
z((_*Z;S})fmdoo~!~#7@SJ4sWA_ztjn(uOC;7n#m*QvL(<f;o_Ll99f?ygCJH~x#6
zoa;PW>HD{SbOKQM!(u^s0l;MP*UM!s;#xf`L;JUnX-dJZqsdE1Y6*frKgoI13q^bL
z1Kn)`?&etPl?DAtZ*Nl9*uOGOuMaNf-Rdy<gt$;Ja+<ma54^!sy0H^c@7Ne9cQHmX
z^Zc-bLk|0O)H63*gFf$gcJDtgAOG&ci{jXkk!c^ApX|jiH5iLXVYGj`QM}xx*$j=!
zI7%b1+-dFr_XM|kXPIcYxXV8Vg5iK58Ip2)+XN&CWb)S}X~*Zt(d<b~NjWgmG~!4$
zLW>4l2MM&wx%2F4AE*O6ZAnn)+P<!A>}+v!TwjjksX(Y?yrn^w5z9Fdyc{$Ee`cRN
zY<-`6UuAvUf!vvgCK?`dTJRErh6HU*JW?gw_MkXOu^_O~Njdd;NXn788FemfMVRUr
zqq(Mq8Vx0S6kdRdDdQj*8p)b)Krw#iK@c@(BG?5&Roj*9>OBFaO%6jjI~cdW3~cmQ
zcwP^2RA$!ZC2M*RG>j%_f8c3^u;$!Wi2Gb$AJB1VDWr8m90g^?ON67$wP|uI31fh&
zWNrkVc9hd8?^B*FmUU#TM)P4DrEO%oJwy<MiMJ!yCt@z(DnScl$c&vaMQ9=DnsLzS
z{#cPFoFmtce+O$o3mdXVQ!K8r*p^&6#`tfs0=-8zB8s!Yy+}T90eu-YVf&61=|Rt>
zLvBb54|fOJdp_8Bpgl;R;QpA;=G8qd5;S(QzVU8%@5kI^e*tVqx7e~ze-c4hPda~Q
zKVV(qk%IOHS}%${2DG;V!4eQ8W$<i-B_P=eJ$o0`19!$Pp|HaI<mv&mE+}2cB=Zf{
z@9XQ2XQ}guWOuwk+h$`fhD@X^;G;%=A8EYW%i@xp45sG~bth-Wf|W(4N!9X@k&=9+
z^=Z|OV$9rYOXVfZ&uxK8Vu3H`%OO4=2wf}g(tYK}zYRWJv%5B584If~aVTK()Urk|
zINgg-#Itu=9CS86Y00V;k*0VmHcTS(JGdn%^Kl&J9B(TvrFH57jnYyoI5o{C2!<=+
zYRPkQG`_X;!lQ;#xz9C5K-!8(uf{UCd9fg(N9s9{`zxxPXe2Q%r=mz8-rono#9%g3
zFw0BK7}{R_aIanQosB{k$lVb@ifW1X`})vSi0KGC^d+V;^*347IRb$oyFQo&sm%vH
zgH%&oXzK9+d>L&QqIi5~SsY`EtWW8iRee=<uv0yOxLmRn<C<^zl!s*k)trL4F`Euv
z8BU^HtiYHP)Pe<hxo&tZr_-=(LdJ%hs5gF8R{Lj8p5j8`8VD~X^V905_IBKLS#;^n
zffmlO5-ZSHI5~L2r9{rc<gcx1dJr@{rm%c7=QI1bA~(`!d9eSK3rGxiZ1tX-GP!)=
z-n_cn+FIX%DVhe#)TG7TAuD9B#iT8@!tx8Hn7(Q@yL6?7Tyg2o!xcd;qR22<xGXd1
zdH0|bvI3D5uMW?UNQM20gyZ)GYJP!Su94T{xtjSyAA0{YF2@>1e7aeUsQSlMDYn54
ze(5053VY1nZh5Jo5^$=qM80SNbF~%xgL1ZYXP6u=*y7|GikV6Ci!dU!J<j;qc%7sc
zhEcuYv1z8SgLlu#b9-u9=1)!^*xMu;N25BS9a_nM!(K6BluBjxcfU)gY>X^mqcN)Q
zJ$7P6xNe*her(~ad0OQR)bE?jS>^B?D^|R?+-BSEXe+IThrIYV4ZC#u==uv@tTujx
zgDGMx@6*l^LH?;<ZCekz3@2G4vg+F%uFs?SekebRHhRn*z+a>nL0B*LNE0Q*UzV@F
z{6llLdAM#{7~1dJz_+0gM0_!;J9>fIV^p`!KcQBku-~g19+LV+R;UK6O2M2YTCNE6
z@$qTfRxr`hWw*1lb6ef_vhySSFIlo;sQXb__G<+53NQIL=PTKMf)xoo?0Tp>+j16$
zqR1Ln0diBM>RhoNLAPl3xq9KQ+5-irg~nNRw|H1Fv9?jw&y!gSLv~ZG3$(Ju3kxG1
zlzfo?;AEz-v102t-is`ZtFE0l8*d1{5t$@3@F;V$y|V(?Y__kUUXeo@d?=BDCPr&m
zAOlUz3=`6@Kn5Rn%?el27(s?;Kh$AS>m2oZG2tV%8wk%KnVP`*Q%d0Vzo<15P~x7)
ziwPxaKM>a-64vR)^A)%o6#uMz61=je>RELSAk6}sO3hEY)!a6cS0IZEZarBLK40J1
d-M*hQthXr1pmp1~9jj3(4>vE@Kdoeb`Zs`%6Pf@3

literal 0
HcmV?d00001

diff --git a/external/tbb/rfcs/experimental/parallel_phase_for_task_arena/parallel_phase_state_final.png b/external/tbb/rfcs/experimental/parallel_phase_for_task_arena/parallel_phase_state_final.png
new file mode 100644
index 0000000000000000000000000000000000000000..7faadaf04e2d45a1642955fe81c36458bcc0087d
GIT binary patch
literal 219191
zcmeEu2U}BV)GdsPN)Zv2UKADSFjR#AHjs`K0cir#tI`P&q<2t3q>D&Lsz^_isv^Dj
z-b?5`$$d|p8D;Kw|G;-A&!b=-OwQTw-fOSD)(%0+iqd4nw8R7i1Y|Pz@2U_GoQ)(P
zAo4y%1fF@~S<nx@5ZbFq-zLawp`Qo;IBt4N;T8cwVFbyc!3ps1({}f@><I|YIY561
zM@*Pp2ncX#GIwvOx#%qolSis|C-UrH6;L1_{+b*TcA1)@ramxu%{H*gH%c~Jz}frZ
zw=T1)v~MEUdNrR47-_xw)9AbQ!)w>l-^dH_(<GXH9rCW=pF+0pOeC{T&9hkWzN?Wu
z)pz%7%DCX$VZ}~?T}{ytg64UNStaM>VRv!$jFv~JhR)fg>fVJ|MI7?rJvsSlaFs_M
zQ#}Qnq(`11Adpl%4etBs<LeE=b4Q;cAh^LQ`NzMWW1c;J|6flLOeGNf`)$1vD47ZW
z^>dN-e_Z+3Qv}Zxy^jCuImwp)F796;`7d(+|K!{XC}J5S0)pVpwxT_AP#mQ9oOxVs
zhW(Zj*@OR;^l#ySzWonx{zK}cDe+$$`L6*V&4~Y~%YUTrXh!_UtNxerDpn7d`?SXh
zl-~!uZdPLPS_xx<UG0jXr%F$F=9%qa+tku~M{e<TTMtrHeI5OA%`_m+fF=Ck@L;>t
ze+Cv`^IF&Ty{u#GpW{_au0JwWYrkz#7O%BWz+1&@M@oxk#pw7g3`O?Zj5<>61>Ie&
zvl-jhv9H@c8mV`CworP65n>isPAFwi{7N=SM`#>UCL%m1slmr-(6Jk<wJT}$)s~*0
z%Og#s@Bu=*X}@4?INAWyqfe?iiLEIgl}Vkf|Li+$D;{S83n9Z$DQcfJQN*fI-*|UP
zon%q0jY3E`pO~%`^JlK>L97}B{aRIX!r?qG=HrbNq>WDY_R8>U$AFe@p5jQqnd*3z
z62z86o)D886OXOtOB28PjdQK7x%_!Q@&=KC$@Umg)G15Pou#*aGE?CC_gH>s6JJT7
z$<X*LGhtoib84ZpOob`cCN9?dveR{5etlEOXPAjLaQ|w{OfbQ3HvL;tn(H;aow)@r
z^xO$ZX3>jjf#W1iqb>pmddIFN6)XLy;`?!PGW*?amI{95<dh8i3qB&A*ahd#CCvZ{
zbQ=G~blEk-zS~ud`nGQDmEs4T%GySf*i*k_*ZOTRHA>PPzyCSN@<(RScm&UZi5ZBc
zI#ELt-D_X{JpCbCg@ZJr`*rD94ikhRi9x1s-&fSLVWo~-oP46ogE!7A)&_@jY*{Kd
z)?DhDgQ%~!Gs&Kg4D4MLq#D&OY^9T!Y}KofAc@NSm{QT;bx84hFP*B#({D)%MMlA=
zpXmlu<xDwAg_{oydUPb(7No=FQjO{-&yK35)v&y~!EZ}y--5jzr#|wPf^58)YUDy*
z{Kn|PRk6!)AiY*IlJ`CDMab!QGwi$T)?2b7lVv?ec4??uF!4(+4+nzE8h#}a0m1i6
z(77<18WMcovPbcck*(AQ^rp8{P$}vwuPJ-i8V25V$H;~loaEbl%<RozafYFoT8-k)
zX`+ty=Vt;&YlrM@zBNQ&yu+ARzB?j7M@wWG_WO_?bq5;8CC}71Z1;_gFg+*m5S(4&
z@pYXY>B&bMtTfu3-g2Dm$aN2>Wig!lA{jhRrqP0AX(mz>6Gpht3m?EZjTY)ch^|B$
zF{{^t^859;-mr=izXIOuddK&zkj_&g?R7KjT1@lsTKA>{?V7wD1l7pFV`)v4<2@Jn
z>_UNYFI|7HxS8$gRNP#Yl}=~{h}~GgN!;qq=(Be&RTSGIw0F1Cjr&Egl_0`D8a&o)
znkou1mWSU-EEX8l)|UCp1cdkVsH8d6`%Bl^Z$Iip`9&{!p6fwktakVEQFKDcgQlfJ
zYa7q4wn7QJxnlV_`_G@VCQW=__k1wug~zL=iNTU{dRE;!RmV{}`(eDxU2>`=rf_oI
zc+nkXv~KEyDr7L<bkxQfT_%a9aJj3b-GW3@N=gS@ziwJm@Wy=YoepXOugkEHR-Uwk
ztZ{6VEhHqfo~+H`-2i(81aa(EBWo5tQB1Xz`|m*6zVRGL;5D70DtfB#z&LjbxB5e&
ze<#<sl1eO5sxc&ankfm%1{Ke0KM7j4d!?ShM?;vaiT0rKruAX}cn3|dX>ut~k_(n2
z#TA_{z|jn{nGT?aL!2WIV^eaqJ0iJN+r7DbcIf2^#?5O)qIIq3B8<!3L^ZUXs*@6P
zlImLbzuU$<nPu0LlMeYpoe>sKgDt(2%$1anbaC2xw^YJzkeSEFjBp#U{Vj2_zx`jQ
zTi~U|bfY7IDZUR;yhSxmWr@9XIBI*S+qb*IQ=7LV6wrg~i^kqVZ##bqV1RqljT{cQ
z7Vl*lnfe;k`kPL!)a5fBu1bPju*_0PN?IvGf)k$;*_`7NduQI5U9gmPP%}`POonS;
z)5~V$V2s%c2-ol!-nCmOqsbbm-o|_|_GqA9Z;KKAY6}2qmkHOZYoIjvNo`(Ntku@a
zlRd$qW0iMLqFJ`P#_;-`$v*S`LN*Ph<P4j;cOW2X4yU?9p*OH9QG=>pmvouMX~*l{
z(XAhV2jnd}YA2H;)I`&jX3f=>zah#zn*`N*sUsyk_V#{@i82|alSSR~I-XEwXn*h?
z^cZ2!osHGQMF~=#To2Bw63le&I8x{28K)=B3#h^Jo9<TMP2H^Rm@v{AzWTP0UYktM
zXUTjr(X@W^bbm-dRFCxPu7o~-1x*Jk`gV0O6Hxlwv{k%$*v$fqNt}G~L|1PZNiu3P
z|BiJtQ<|*7QzhJ94!Ln7N)vI4T4eq`uW^lQ)+5a-r??&Dg-4G{-^-fITAPL6BE@as
zs)ch$E8ab}yQ{G_TDQ>^(|R$#o;sYOR_goDd;49u^QxkLodoXmI@Bh88<P%Hdb&oc
zoK>?Q_Ed5$)^MP7<4lG_!nW7iM=ksTI<0Ll+mhjm*7J*$y$vx?vjC~zOdN9QY(|)b
zXmc<>dT6i+hh%Nd(>wn#??5Ilnj6`WLkB0P6+tX?n+p_7l<e1S=(Ekoc^KEe)N55$
zTX0=ixT^y+l3$N$(47bfl<N&UJ*}Rhn>S_bJIuzGF#uB5YxGUXaA|X(W9p3_s>L~?
zB?RSVQjsAFIDS^dO>iOTgRS%t6hgmx6&>OCdZ+ZgmVqj(-g(+adAZ`}6nCg6T!Rgm
z(gJ7ad*j{68%2zNXqiWmyJ{YJe-At|zYVTW$HWM8Dip7T(YHrR9pmtq=JXg})DpRM
zL&!!uR%)0|*zFnZ)^KA6*ZtI*i8Ty3p)@Vyx?UaZOsaWLwVa7gvJ?hw_f<M;oFd=@
z=<G`yTTkBl@O@Wbw)|bieVdP$Vb#iC_i&kaRlkxJOmF{eZaJFhCtYXf{j8oKc*OfO
zwsVfnyh~WH*0MG?LMPV5&)P;${l(6xdS|$L$}}dabujAmY{moJP5Si*HZFJ1x9+v*
z)!c5Na!ty<Rg%Z|E4l<;hWP%Q`HU~{ZRrdSz_Gai@5I4gOf*8hebsLyZnshRJe9m1
zwkxOht6q51cgK*<%ylT<v=<)g3v-9k2=X=WOOsB!tZR@z+!QNW9!!+FBQ5x^H^B?P
zU!Q~K^J>KV96Oi)IRW%=lu7iO9?zwdP^)_|Dj#d7M|<Jov19BQn($A?vvlC@I~$S{
zr7)ATD6EZ3sj+UHdc(-4q*hf#fZ=A0h4ztisy_$iN#wD_lRFvhW7;6<DF9CdauNV!
zn5)rLpSW+;-wpqK=f<N)@H1Be73qZe!`N+`2U~r&v^CyqO}iJ^I@6MIb$>k4mu2y%
z?<F4c{CK{N&TEryOTaA*rULy1IF^QAZ<%*V+$4AKeZ2!e^TLc?lq-xKT}>X>nOQV2
z5MXjd|CSuVhv021sL%8V)61R+%f6z;FdHWHr(8K)k@KsD#6+p#!H0E=(b?Aetp+55
zwNmeY<Cy?)r13APK0Zw*SM!nzIkG(YO&|6KYm8Q;li&}l*jZWGG8b@>>JC$4`R#xS
zuD8lCF}?(Mb$&j@c%$>wTX>jJy5CxA#*+xMCkh_WWz+4bPrfOx0X)Xssfw#|<m>H=
z-yL_nGdeR1q8F(GK!1H{(!ID5<H0X4VXYX)V2eH}TGOiUalLuJwQ9qrsRiK-g#nFY
zN|r00AnhrSb8JwDC{eVDAK7MWqu2+ivkV^TEPlXQ@cI)ZA8}Cg(rm(0<2M4HCL*BO
zWeuQ?->0`6A42<rrYcvw@Nl8^CFKpt%dM8AUzvWlG9>j#<yyh5MnMO{yOW?@liZBB
zJhU0h<WG{pLtW6|6z;s98Dw6kY;c4PZOY@>P;5)Gn`4<H7RSh)SjZbnp`(1k!oNG6
z;?8qH$Tj-=(I$$2&#S><OTr#A0ps8Moqb=h(5ggRD1-bD`^tZ`e9`#wjbax1q%W}}
zn)39=N41nV(DLuItbaesoWdb*#p^OO!B|>Fkge2PxFY1Bq<F^!#+7u9w>$&e%ZjNB
zpLTp0%<I~7kCg31;^z1zb5a7y7mSaDB*MHXzk$i(wCc5l7!#PK<tT#?vhq)O-L<Wj
zV+`{g_4CW{hF(29d3V5T&cxc~o=-K)S6Iy-R%5NOlrVpCP>|<eqt?vg$dX!o4r&47
zcjSurIOdroK2_gc@^enpGML7?(|-r2kUX-j{dai4Em-hz!j2ITw4E$;Me>9#L$elD
zkN8E#JrwqeSf$$ovw_0wsRpOuospBG9hn6nctw(4Up%8|8Tq2Ljudeko{qOkL%;?o
ztxWL>V60bp4vk%0YhS9R40Ms^D6nJ)9XTK6oA~qb5CB~e8jwIAK;#`tnT=GkHB*zq
zCHj)2{I;gW{#-p8zz%#p&ZXkS_EZ7VXb5wYK&8k})CBIlGZQM3G>Yz;qeqsAKQi$+
z*L_eMaJo_5SSiwU<njCR$pWllnHPJge?^5ravq-vo41-*2bS97XR2+}D15Tg9OXd6
zdST+H0Kwe@vZEKZjtAp8pZyn;9hvZExUiqcfp%x;m-DqOPK-C1U_pfEpzEUXX+C;g
z5kId>#I>tVU_lQM?~cr(hKQtd4Z`v={QKEid))#HBMHT}@+?I0M}x=sGk67nh0!|N
z$}`c9g$RN`j{7TlNC4U)cVT~FE1mVu?DKE|4y%20`x^7fRz-fISO2e9u>`LIAQB+%
ztWxz&&V++R-e-63WGjb$+8#Er-^dnN9GT_8n4peRD$^e=95Fl<*?$bM1>Ae#X^-!|
z8y&e0YmRvd9@5)y#qxz=(Ne=X`E*oZ#?ia<htH4yF$Nak+`}rU=sGL`MbTP=IC9x^
zFjK%rhF&6jR4V8R;)$i8uQ1r`{~#|mC5kwDCx0c=$DjQNpd>UTJ#_GaPrflXfH29D
z8z~G0MxA{ez%Mnxz4ux>4WV(=7xl2h1}**ibG`Ow@32oe)~p>p+rJa8xjCmJ(-ex%
zkN`Ts0NkZY8onkF@Y)O{lg++78kf}Zu?ltd5Kt<CMJ>{+Z}>MFR!ucv6yor4-ToVF
zLYZS`Yp7%ZvRc>gk@D;gAofa^+?8mZo%X5d|CJiUN6}y8LEW{@2ENXYTxTe~xI{-!
z9o!sLx#|muhCg4bB3E{7HHgvDK@YgcXd~-?hW>x!#%mtF&naC5&z-e<{H(baBW^_K
zhUI3FhZ!Ld)(Jv3CJ|pKB@kPc2B5>f*D@zs)Tx&YrOs=A^~_WJ%oa3J*&dmwN`6w$
zIUj%=ucbUF={k6T#PB25b&`p(kP!8zVH>JYh-}`T{SvO0a$W*HkL5h|?mVEH2W1<5
zTNEh9R!jHI^NhDz{}p$9O<lhYsL?&)vY5&K?vR>wVI~Fs?}fGqOU?BOeg80Yp8SRE
z7e_OJ7GD|n+yL?vcrFGDEHYUySJr~Y%cuwB3-wH20IlPuJi|<S!)2W6nNmlKf9+=*
z7=v=;HEPc+PQ3+*`Cu@;Uq8;2RL*7v;+l=sJEV=KXdR|(MO?LVcQ(#ewmy346F)D#
zJ%=vFFBv;w2{9Tqw$?=jB|nIrL-?JtAt{~B2<}9i_Q7fBM3bu>a9%_*bza`P)e}4E
z&POk6^xthm7v%N$WTymEy1a-4MCR1t7i*6j8XYz`BVu8Vu1YhBaBYYqfWfxPR8<pV
zvkxo$>`||z{61iYi}B~%-}dLTyR|7B&Le21jD(oP&S!NS{Z%_3mWHZ!m_%z{C)%nB
zh!_^Mbaw?&`N^4Z$`{wXu3Fs^$WBNp0vb#?{7Wa~hyMLg9)^MkO<2nJt!yF`R#<zP
zMyEW-B&GX$in!^Zxo=zEG59&a!j|t1lhR6%dQtpT!+MzukY6ryCo`n&4xc@HEA26&
zmk=`k{b1(#`-Oq|YW+WrK7aot{_9sZd<q<S?!U!}-wp~Nng8s#-z7wRNd9vl{+GHB
zzeC1PSom+v={J1EhvdJ7jo&R6d`SL3^ru;)Ueq=m6);E{@Z}?NDKzf}O9E^^o!5R7
zK~}4nEu;RkmVW+CO^c^ayzj$k#rfPn8W`-hrrMs`63hsos9mUKW8t~44=rr|{qRZw
zJOTXUPRCaRqnb_s#hOM%<ke7`rw_BSBkwDkikX8{5*<`%|NeRCt7NpuPyL>N;8}iZ
zDvQ-f)eWn`Ph9H6@nWve-iUj+#cd7SmVO|`ElwYFF1bL03FJ1((;}R*kGv2LzYO^~
zvaP>=FJLUt=OlT$#g0E2-9_%or6Of*?RfTT$kD@&$Hw2*K3Gwk9|3yZg&EJK*N}K{
z<i6kH@NAE{*HE)=&=$q;$!0jt@BVqCj`uPK4WTsVJ(bW<tv6C|rP)mw%v5jSEzJho
zU6v}pM}uHL08e<HarjHstp<jNhpVxT+@sPxPfJVNk&B-w5!m|P+q2InP`!|Jt(1H)
z+t2^|J#7XU%+r7;o*5l%FOR3i=n>Ni+i-G-UAC~XQA|y;?%$J=8K-Ff^x9Etx6VEX
zC$uy;8h0cr$~XRUX$d6N2TLq9`l?**&8)d3d{a_VE+shjXc-*tu4Q#p0;TB`qzykB
z8GXrKPY3+ZAF$aOUigAw){*7ZX?&0+y9bL+l`hg#BsZyRXvCb577!8wh9VRYXi#c%
zeaoUAENl+klHh)QGH6VOwt@e7ME%@HRnI9Y5v<zk(N0NAyQ(g$p{-5VBDV2^*SzDs
z8k-V0qSc|rkQ#9I^3feSA|AJ((F;Gp{_{fM8_A#SUfFSAaIknRaAsykjZIfUK|y3P
zl)q-`+pAjORH>9ai*w2)ZW?tLfMz-MU=48KKQMh<20hYwvKM}Tx$Af(h#*@^T3Q;4
zRo^FT?d&LS|9f?9fz*r?cdqQKg86%OA>DX9W|7KtQbhseVVU8!#vMT3kA}(v@9%ou
z>h15R8Sy+=E^u7zv0EMcqQ*5mJ{CAIFrY?54I~kYB<<?!0?V4w>}ll=4K;S(LKka+
z`gioTU_W#FZIA&4pTK3{ww(=nCMYE2U)*w&qpQ0+?fY0D;W@thmx*MfvLS~Ha$aYq
zlroNl-9ZUoojwzGc6Y(;Wk=c6_?{mB!QV<sMn;zP=PslhY6x+j&OdZA7vk=YQf(pE
zNWyjVdTvIk{bsrlcunH<n#YoY!omTiBW@fYOG`6k=NrNq;!jA|&03TIk!-xYI|Lf@
zvQ*+A<2Lz?t5GJ6UOfBnv9|NY*9TEuo^EB$OmqAlOH0e_s63FEB;jv(4Q^+vp+;@A
zX_DX`56pn*&R&lf97J&8tL-xOM@!A~=dEEZT9aT}c6Z&mHFR}#MHX|5ZyOmIWlzaL
zXV$b8QkxV1+8CVK@8<OH>HRtAXJ%sFfy^Wc?*jz`F6h%Ip@gRmGzRNa-?CoXa-nTc
zLz#p>vickvJv#1$Pt5LyGhzL|OHN*t@%X!A&#tb9ftNyhz`;wUr(Yup3mm7Y^(T|-
zPBFstT+oWV3xN@vp2u+6YJbEiL%L$s^&?;;Lh)0szI^lM&6>Z_h&?UDfFi($#W1i=
z`4gC(U5slxR@eQnf_PIiKdoO9t$Fi+QuTK@@}dmFU(olC{{C1$2$ApzIe$$d?mSd>
zc!Xs22iA<QsXlJ7z<72sOQkAqykz`kgdP)jY#}cl5ElP>ND8{nCOX%|30l_JA`S)%
z>}Ok+t~t>OS>4x%^^_vFKG?O~n0-$Z{cPB=H?5r_T<~+-Pxby~T|r>&7Ye?+?{vb#
z!p3upTZkPU9kZSpJ_4>ZG|{Gf@NmvPZwoCP1Os(9i<0NJ0?n*SPfss!-I!?`8cJx!
zVMcK<xcERQ4gYNgg=VIPH6qnD*SbIoEiw_lT-{0`PVG;eRoerWSskJ&L>S<^e{Q=5
z5dyDw)}X^2Fu5B}*p@d$FeL*36A*Y$45_7%$PVNUx#*5Mf}mE<!<D1W;jIIFd+D^2
z1jgaw`L+1b!)r^UC<%`=7b+dQTW?@+r)~HB`HT#9-t$~qMOQd=D+HSNZJ6(nfod;8
zMKIn^l?o$P%}`V*eh$DP^S$g+az?^4StnH$cKlWVfyYJ4no+mK4{akON$hEKqE1#K
z8$bAqO^GdmlqOcXZ(9qn{;y-91X~YaVI}gHp8i%dzk2(TW})Fdm$iB-)wCkR+Q+0X
zcMoSJ@?FpRzd_*+P_5pkvV4&#M3%jIWIMyo`f+4c)K~b78bVjwBRmD*E3J<i!1~Np
zbwgYgc7L(9#*d^k^x4n+)8OLb0=4z;B5jKoM8U6BLAD;y6~VRrCDdI!n#gZWL3VtN
zL&e9%sifhW<Ar%FFQ30cxJTu~GQrr9Sk^Mhg0)`De2}WL6<EeZ+NH<aM|e)R{%lZA
zUIn`-Q8YNX%qxWFx_>$^!*1y6ouaWo7<~J^?EJ#QLXrMTlG{R7)@?q>2nF7+SgwuR
zpX#z304i!O%#KnlEH?bsgy?fVeBgqPM{MuO8lqUpvL{!7cw88@r_hH&AmT2VVh{JU
z_{aMSjZ{y3eYLyOSUT*a{RPJCe|rd=&bT)T_x<QE8rFp80_tI_3px2`diCJe*--$6
zlx6<7l8x7Z3Bo%E255zBN9diF2LQT*w<I%7cq;Wqz+8n|$VxL?B^!u!HNnD&C|HaI
zuubsLpT>Xa{ZH9?83_ss`kiESdD|PWr0cmi-9Jjy@HwzkNus*(Z2;(X_`-ADTIe31
zj?rIHEda^SQZp;QQ*KvFCj6c_k}5(1>+<DnT$%F_=s^AZdDpsWnV<H7iYc1BxHAZy
zEW3=?-7UP<|CtE@x#<^*!BShL=#K8LF5hpjSWU+%yjj?79Xnr*`;|ll01aF<%>~kV
zpsf_hC;UY>>@LHXOL}W+$tCDPzN<`Yf=nmV&~r8JA<)y;PtHzrosQPPp1sztt$B|$
zt8Al16i%8&klmypJnS%}cdmE!-Mx_SBNF>}oXOgRN8Rl|?WjK@?Fx!$X=wpX+`qu2
zIc_t0rM@kU`ZC4N*fT)U*x6RL3dz&*kvr9Bh8@Jg>Bvk@yiVi`*w*UypltvsbU!@K
znHy@}l|L^5Rnyti`%0t{ftSwl$-kqA?CBq(JD-l0xkx*wK2q#(PFjNaU<a)f&0^T;
zZ1s-2)Vy32s(sB02lI$q=hk3D_N}mf-CYjzZ!fQ!JJeOVZa@tu?m=?`YN4yE>--Ax
zU`0UmvOiPZhH6*^NhI~x$9}tv6MBaeAv_m{LdZFGM2I5^h&p3Xhtr&rvu1x>VQ=Dk
z44SRtW4=P6YcS+yhn&G;&j;fG>AJDNChkg3`DAfjmpTGyLrsV8AZJ`jVhhtIV)7{a
zqAlnq<At-x^Lit8hq%Ch`r79<DzxXQuFG936}^vU4^V#6cQ<BR$s@$~&3eQ%p@V4*
z9zVA;0=IQp|F&*Z(WOqBH@DwcZg0BJ-rcg7qsVtEB~p&N{7TsMD?}o7c7ce)Mg%E7
z;Th2<C3bJQfMe|-B?!L?Ve8oO^FEgiAKxVn2aIHzNLv04FKFk1StBJSC0XAkV+F8F
zcAci4)R2~Wk^Mn1NT^y8OC}N}F<f-P2V>prf3BOitG+ETfXTD$u}dA9@KB^6zcbZ>
zvJ8t<=+_l7%vY9(C(q9fyB@AJ3M$@-2B;*L$^s~eC^P(<^4SR0Aq12A>X)Um3+vTr
z4;}$Q!895IdVCKWJ6`N@u+1rAIN1=EQe4chE=P&D<l26Z%1^7<#IK^FLe01UqMLZD
zLW`-KT|KxLY+mfn>br9t9`=rs0qt4!AJXWRvLG$7|G*3o@?sXljb}>EpV2&pPxpJY
zZONQRTum>sx2u!Jluf;q>mbdPg72&-q_WV`(RBtQgN1iOE}ioW*Coa5RiX|m1&(>K
z;K!{5W(Y7&NayOK#2p+Q-dmU}itkPFg2uDd-qseGt>&{|@pQbH3B_?Z4_pdhF1^gI
z*WRc!tubo#V5_Qls`aZTdApYSi&>#$ZVnF=eoY&?8kh<J2?(0L-Io(uWyh6=i7_A6
z=QEO%q|URfJRjX{5H7My%!`YQBVHMo^sIBN0#{?i$j40db2095U<huqC0jiQ>i)Ok
zaCr7>ldjAM{kZF!YY_;sPzF&U^(?7ZkgHQZ(P*%8qZC-QvLt(br6@s8#76rnSTi|2
z_^2oC7Z<!!ztJj@EY-Mgi(5vewU5Q!bhL1pO9?1K>4r{<qO15lPK?!2)C$|6Fxvv6
zJrngIg7J64F`W_^)iN~lAl!9nq*~PDf-IhJKMsU?L(M{WPO&u9t6rz)<#GQ=xWTXU
z?AuiXz<9G{8Fg+N8C<-=XTP2SzzkCAp+T$$8lXs`|E4$ukIkS?O3Ofjd&oPohI~|4
zxiX5tVTMPZGmYInyE8-mzEi!be+*2RAo=kJM|uO~+%3&w6NTNad_*GVb^$%edV~GV
z`F<XHCD>M%+ErW7hx{Pl3U9|j%$jRtA)U2$R05-4Z2Hf8uYUmjsR|&Zxl<jh#NIc7
zY;L2*a0M1G%FeA`eGn=)sOC=n^|mz2%gY9s{jGi;0%wpp*=bo>S*J~tTum<0^SQ21
z@mjsX?L58y2CPEbHC>Q6W8YeSwTm=gp?d<1i?m7Fn9}iN#9GPG>WdU^Zf-Vr$i3}c
zcJlG6F36P>BvQON9IOC+Zg(I65H+O(%}8ZWjkZHj%Y&sE7UqV^cS%FbmWrB+2!g1u
zd}*_v5A_>w&2zi#?$D6{C@vm!A@2NJl$rHM0F@ND`4HeHEupf4R4DZezxxgsjy>N-
zk0zTCB+TJMJEdl7Y6=Zx7wHTCnxi(OI}$+4*RreIobNm#oj?GERsy*hKVESI2MYyO
zzIw>cLW40L6MGI<Vt)-W%;Xi8Lg8fJ3Dhzo+^1N;Z4OsDgH>YIpO)hd%3l!1cmEwd
z<u&<JF*?s=-rTS^$^7s^L0$1Yw7X;zw^IwPI^1qv?Px(j^Xi5^Lilil2YE4W$42%S
ziO<$@zC~eeZEb#BvV=z1Mu(Qca<(PW{P<tvhGe+aC=yl$K|KUXKm<{j<9Ax>v-=y9
z9;8a8v9rFTrhf_rbcVw-;e>3Ig?3W~zLubX9-aHuQdi<4cb58JNvVZUFBF3MT`F|n
zTQ7L>?d8%M=sYGRWOPFB5wT2bu*Uc-1}tX)6PTFi^_9Q2_tv~p5|3pl-gPg#Mqn}*
zf;gu4b!E7+(`>9RnQE;<w2FtpgKGtFUQEuyt45e0V{0vXPan6X9|3P&dl8U4imuvF
z+}4X2!9`$6w|O%|Ux|xBE2#vTDwR&l#J1I24|m6W$idDim^q=!7{;!jg@*Ii4|?af
zJqv(tfFI65N9Kjf^A{DeI2SL1E}IM&5S@Uq6|^v=;uLhnVjjSKFmTxV*|*$aZ6<28
z%&)%axs{`D+zJvHtSRpA?=Qi?SSYFk@u#YRx@+SXI3D^6TJ|^$>Htzy8UW^rG%a-Y
z)}gwrnBp3(X0@ARa=u?fLjy>9Dqkhf^;bSl^q#9eOi#l0q(f!}lSVBr#P^~r(MSQ&
zcLRADE(~I;pO1k`h3yPca+goN1V(Yz;x)Yph$?&vKRCC2F2A-G-tic>?8dm$Mg3&0
zOI69Z@h0}iN(i8Gu*xq}jpEydORfbGa8h3p_a%LBrQ#<->K13fVYMVpdJ1)UY{ZZL
z@Z@G(ej&|B(~*p6(#NhpU0mH?%qJ(I;+E(Cj&HtTHST;{7@e?xPfw2;+c03$HCm>L
z7p}>_iDYl9hD_3Eu&@Lz4~EGJg1y?>=vjmyzEb`{o=l>`pp6jy!-=QP2T6QJQZB1s
zPIhvRP9!$RaD$yg46Bf9gGuYNdK6t4dS`Do8Lj%t+SxGG-m0!@CeBhN?U}5(ScG#^
zghHD~xhS@s@SLkCBKmx<@!^t^_}-K3sB3y88u}iNWne6;1!PsFM67ULSO|B<_c^KU
zS2?e{q%(np47wLK#6xr&*W5yT4RsoI5hk1W5IO-KF9KjCk<_0kN1gTWu(+MOb1$!A
zA)7PQfVtiX<+3(0>HQ@5!YHm;cvS3t?fK*P50eOjzSH8@C^Ikf@m{`mqEWhhoC1R6
znIEzJJW9UOZ5q&eOF}W~tPK)0E3jCtQsScRgk)rdugF1!7c6}=k>CDD{doJQA*F3f
zWp|@!Qlpdwk)oAVxWQ@Xp{LSL&bVi^iK%^KnBB<;(|jtlj)bP+#zytd2%YDCXYw|i
znD?kY37;K{Q15FxMhb>A@5+`x4Su(oO26q~T_L^{rK%{C`u(OmtYI-TYBg|fZjl!o
zI&bSbtU8&r_xTvPFGPec1FerEzv^YRi97mO;Ys?DTJ|l>#6d)_z8E%54`Fv1zjvp6
z50b(*zpCdvjK+klQ`7T#>~Grj8^`#mD!~NRQ$&oU6i9oU_t0RYA7hf4PZyJ24+qXV
z=Y2!KAb;sjpC2Dgu}Z{(wmh<f%os;_L8G*ms^g93{^209uWKzcYjDz!eNPx_S%}_g
zxn~B>atP@*eh!n>CwU6Pjh&SE+7eWfXd5qVtC(sOMyIhqy642I7gDVo0a_VZu}QOR
zaZ<e{=-(@gy)d?XxP^Oj<w`|PYrY2<p#wnq2`uWmqXTxlWc^efF6aw;`eXZQ4d1p5
zJCDLLQ|?Ey{;h2C-iMSCZQJS#pKM3L*qj5p-z!$77RINf(H%gFgd|BwvFk5WgJ2tC
zp41X<vcHie>WRb}qhiw(la4Ia41ZhqNjfciJH2|*w#I7{*o*NlOs-Qe1QsiiRj9r<
zFw>TVCG_o9NHPKB8MzKG>~{eZSikN-e0;p>mL?#mr%FdX;bn*GO{!@Qy}Hi2v<zz>
zY&|#<07RKzEZS+0dF$OrFkCW^*+|B@myLOo6g@3TM#%=>q9Yeum5fm6T`Q|=i*aG7
z+v@KgD6uS_SpeNUy^&~b*L89ryb*PN?a*_tNnf!T+r2fgptQDIZ|9Rov<}<6w$cwu
zmnx!CaiUxYko~x=Jf1}nf3m*_;KA2=Dt&tH>dg)-+j(|9pQrkd0L6*u9Zz%~(Ru-!
zH*+0QP2Gi|Fw3^4v!#(`Ba<W4J54TmBp4lW_aOv8)h*f~%26EPAWV7H+XHHB`Z^M8
z{0^l7^^^2F1un~Vt(}gzpkx>l=Q1>D?<^rPu?USw>c!VMF8RN#i;raF!pgH>W4>ZL
z(Hfbz$f5V@H}raZ*3rqygsouklQqdnaz^>?4pKTHPWd<iHb{O;0WzF=$~q9J&p}HZ
zV37?Fa}E9~AsrFxTf22X=!$<W<@uymrq5p&%EH#`AKtT}6Ew1)Xh{?WpO(3ujG2kI
z<?eesn%EaA3S<wEV^#%W&HaTBK1KF1)5ZH4*+1hWdk-OZkC<-enh>%P?YUEVHGqh|
zM|;v$Y^IRrlckZ_A+qr4ff3Vz=Jrs`<ChjNMD)dcAG8M=J}eZ`cnzJCkF3b#jp-}H
zL1+-x=T~RR>3=_Jy?pXu>BB9L{vzW>4|Jax^6?jMfyMaSWLV5qa>8@N)s2R9`S3@L
zYljWYUU{>&BUP^b1MD;IRl5@*{f?SuO2PRXZFk7k-^+-%!Yy=i_`YVf?MJ|kbq*kQ
zlD(-Q#>jWbl2@DL?LM*C!0Z349=(;ygvlH;1x-a_r@Ym;F_&jz@o*4@(RNxQ0Wgxd
zizE*qn@%JM8l_}@poKSuh;EUF_f<GrZU;_2O9TX~pXdJK!h*_){n7mo97W7QKUE%R
z1PR_ipJGZBVEx5(sLjYF4()p81{3@0Xz338I~Y*pi%p5U9Be|hBXD$e|L_D!tOUZd
zY}}tt)+R0@thSJ*q;0XWz-zaEf1pnLzEUHH5PM^*lY^?6l~-7=qLnzB{Fn!polB^y
z(FAjQVy^=D1tG+>bL>b@tEH7ZLUG0%?5Wnk=EK6QL$fv7GR*d1XYT&gCCPWnsjeT*
z+TXqNCUtux3^kvN`*xZ`AuE7Zzl`5HfGd69NE#T1N96C!BCxZ@==ilQqf=7Ox6VC<
zy*_|V+>BVPj->9R*eOtn@NjQ^ir_r2Ng46r>K|g+&;JTnZ3pDm92*<^;-h7D_t1C=
zh}cbMA|UPh_2CWs8ToMv(z4iB68K37d~hTU_wJg%(qVoKnjG4msu>}7djD$*I>sjS
zV!Ml;o{rAQ$kA#yB&>c|aG|5JZ<7|?Frsed9p*gAlhH2}j9bR+jOz0`Fbj=0m`q^L
z#YaWhoT}cNi7&p^hb4~qTIrHoVObU4xb)>D6XX>IBTVUQPY_otT5(5=^A+AoTA;e)
zNeoul?X|P6?e`U+9OgR&M2nKa4k*RePEyn?OfaeQwuBM~#nRb&Bl~8-USDY@4*?w@
z?qu!5*AhT*Aj;19Ha)To*Esg#SvUshWW`?L)OXv}hfot(n&js{9Rg}*ASJbWvk2J?
zQ3HrpDG^wUxx|FqZ7jZv#&cTIDzJcB1ASo1`wIS3gBSC`TGi^Vy*@EVFXoB^<8@n)
zf0&7KLf;d&R@lzwz!iGBk;&nCsCBHeBGy^^b&C<8$(kq>_^q5(G$^DI8lk`y^iAmp
z6?oMe)~*O6*TTHRD*2{TB<ils)rNHi<Y)Ai$r}{T?>#@sc%6FWY=pKIbAD7U+3FfP
zymEo9&U=BPRh1OYc137G<2#r)adryZ=M$83cOUV|Gp~^8!hnusu2xaClI153KjifL
zgYr8?1YAsf?M>a|Fp-Eaw9|obFz{lQy$R2(X{uY`BG7_*qJH5rhbYkrK@xhrT_Gs}
zIdYmM7V4TPPY*L&Tcz#}phNri7n_<!02+Qn-Cz~kNan0Mw5@?YWCUrL7EcZB>cGdl
zfR{>r{U2WP`SXpTO{REx62U#E3-MBu!>fRj;{?SHS8K;X-H|~}sBAtxzUXm~rgqU2
z8BL_St7fH>^%to<O06n7cdLSGAomte>Sgkk)32Er`_VQ*^TY7j4;`<$b@v0LCU#v7
zj|mTlI4?&yqtWbol+mQeMV9Q29Rev)WjfFWMt=tPb|07uWf=`6gWW&~tGO|o@XBO5
z=o0T!lsKpV8#Q*XOTk}GJVh<C=lRGk$+!-xP9ij}yUYXmR5A5?$Re(C6l1ds+=B~1
zA5kq47+yA5qu#nGr5@}8Yp~4Bp|-e?uREssch^_GwH9*|nkQVqxDVzDU?V{D1b)K*
zquX*6+rxQkqC0FlElLU4J;0)4FaV~)Z}dho5OItK?SumyI~{z=lBlOI>JSpa>8LDD
zG2G|de3#Rwqn(w$^u?)>!I{2yiY^{*^hT16m?6KfjKSybJ1nu}oFZeZzLgWm!^+O3
zz%s@OI9kq2E^DI14g?%?X=$>cj~+Ld8u4%m4iO@eYoW}+1}6(oS3RnK8xQ^yPjfi+
zk3}{j(mLKG>dWBsMy7nE%;HozZ52VY*j2};d($xikp4lZq2i9=aUUlET$s=9n!ote
zt+eef7aOD1j&{SjdP*g+7be{~m9Sh?UVLrEAc|;mKdAAoih(@G!(0)Yu*T#xU_8hc
zchtX)EZcb)&x6=&YV??)#unL)*9fHQ;9;LV7w>tQnVZW1@wcZ3?=3<DcGe$z?Lhx>
zvDq5+2ZFUqnhV64SxrW$A>-?pDa31MXg^xqDo&S#!0vfFqw;<Gc<JJcjgFbQtL^8l
zRnsgGo?Ba4;v=0hD|~PWR1Fy!144i`jl7Y4ZF*T}y^&uh_kab1^3a)lDrU0QM|StE
zEU8l<A-Qh-SVZ4Pozs6@`A*r}*^wrPJNu(UeTWr}!eKc>GtT?<G#jjyP;os{Q{la*
zUx&HAA}8G>XLnmI3noY;P;VERT5p1rW^}#MoUM@p<J99>tC&Y8kNf2%UuP_JIV6&G
zJ}@hZ6|{W#Nkff}@Epcg(+zy;;H^9)t2D<68gyr?0|6H3xxVwA8390rm3KK_-VH?8
z-A=HY?Y=$f><8Lm)}sVy!h(hd*4K!ukU#i~Vv_pyg}MSw-WL*2f2`z*Bd~|T!eyl;
zCB|Wyg%r@lW!R%kM`xK8+V^p^B<qGyMq}lu#`p2cFO4&;&q*V`rmn0!Vu~1+^p(E5
z7I*!;Sb<f4(d5cf>*wHGFbT}OQmu9AaF6XcMRm}DI|69DeAhE`cJ1F<^1GH~cO^Z#
zZf3BvGOUgwsvNAn$f?<e9;bM4DDLOkBDU3~YJU7KJ_o*cwYR^()XYMg24Gy5{mH-*
zTxVi|$^y*v;u}-L(9#56+1u{wP|eZ?bPQ`et?!51TF2nMyI=aPGB=>Mc8ecMO`NGC
zoP$xbN${GIUcLC?;R=<oAB9i1S9SX#3@-oz#pVUs3v_Oiqwk%zAXhDnokb`?-)%n4
zT*}#VyEqwmh=nx!{K<Rrab%&?nm|(JaRF08XXx{@5w2DZ`T){)XM|C)ese%3*W|g9
zSBwQ>Q(o2jcYy^aev=>fQ;nvLQTb3DtS(_mhXB2aQ_r{!*Ca)i&%|}$6sxG8l0gCi
znBv!`n>tSgD(<gF3P4$KDlsw9U}L7)0MOEL(CM=t#ZjN<13L<K4K${{kd5z`VhXgF
zf{A7(<JPonU<ixzZ8X@8e?0Na5cXO)8=o`^x@In+Q26AimM561wT!H@oYf`hb=v#-
z-mphI0;?2*Tf&elNAD!=;7~qx&!q03zu10H;Bn-+OQ)|L*Uh2(M!jscBoGIG-+5)_
zgN(wDN5VGN^rd-u;WUl8S=ArnC2ZbR_Dty|JQ%Dj(++dyEp52>UY6|2@u0K!kaxAN
z5M#q7mw3<|Ox`t)UK=s?V|#CI)Xr`QJ;UlCc&U01w!qRkFdJTlhLZA=AVi&(BE7x;
z;6IR3R1ClH#{^qttDO19s`m+!ADk{V<_Gh9ZwU#3Cz!q-hTUHhc%N2LG4KPK@|>4e
zc`WCHcBzx)TuXCv^i{dnZ?xvx34FS9G~&TGtx7wTm1BfT<)YzR?v)nZ?EED3l^#lW
z6xP?*e{g=>n@q@-VA*nSi?*43?8oO~1f00x76ZWF-e0(Wfs^5usxH*32oFkcYh)-U
z7Lj$X`ZJQ~N~n@OT9eif;<g!JlF)Z6c3CqlcUgNE>%o%HLOAY)cfJW$BmM6sh&s3I
zPy74d-?ad$br0^1XriJjArZ1;;g1_C$UAwZg7Lw#6D!m#5hh&Gd}}+g#QzWw=o@A=
z^9^@n<FpIcQbL@~%kK6P89INwv<Vf=*X#qIOOg|xpC2o-9u(p~@GreZxI)`1Y}NNz
zu!=}q#9G3c@I<_jHSt&EFddmo+uMNnd-v{r%ST`=7jt+{MXoZzaOQ#G{-V1fm6MvK
z5jGi;+9=QJZZ8Bs8FL%6x7}F2{lfQXjt|Kp!ku1cG2)n~igRI=MpMhBqp!zn1LC#D
z%=^6kZ5_zciF>e%w!qVTQB?FNI6vN6-u+{Q=blp;Ao10?FL{S0I5;?0|Isesd`wI{
z{r&wflaj>W*02bWsq>tf_bWU+JhUNK(C&74N@}CUR&3m!izr6A<*Y5Zev??|XA>#B
z^++d1;U5<SAEUFuA1~>~@0ZAE#*3Ah>(O0tG`6y?S`HGTvG6h0KgMduVSRrkd(mPR
zNnCF-tK3;~OLP9ye12;S_mewxMU_I^sfekmsjt9V$lZ7^Q418F+_4Ll1<#veYG?Hx
zBNA1Mi;8|^zVb{4o?@D|y~p(e(SUg*&5zYn(<@b3Fj4~K&-F8c&08KG)fea=sH<NE
zI(qs7L$%~O&`>l{OMyW_eBG<*sK|D^!0DzKZS$l!&g`u0N@w)SHXyM9z!L6~4eP=+
zjG}(D+Yu|&Z_T8z<?WMP^MJ(oho^{8R>TQ|sfJIadX%Q5$#E*@{D-ZxlX5a)oP*>r
zjz*3Rg?|*wpD{V(;J6G3op#O#%U2Fc908W9AMzgMljwfoFDxuH>H3yTcy8cp4&kM_
z{vb+L@M|y%Xt$T=)=W!lU<!ShJEea9Qet~kuX^_E>Vq%bA_-S^i>MsNdaWEfDkchA
zzP8@IEp4V^V33mK>)+9#!oSd^PblKl3ZL(|%KwKXe%*&)^KDAXEm>LF_wU}_*5QuH
za+9vTyi$o4=V04x5k(7huRhe$GS^M$7&}E4uzJPn7LS#=qz`r&So8;6SG!|ApY)K3
z3(bzGhVMKgq}tyXSi0@Qvzw;+_)5bt%LbFH!ZWnT2yygk!`3GgP(j1QFGWV}27YPn
z_%Mv$ri+Q;)G`!QT)eF7v?-3%t#pc|xqa{1vm%-lR;Qis+ooQ=MR06f94)_h$K!Y)
z$)1=>nXLj+|2MGmg0VKM8!ERyxcc=H7guxWSx#EUl!NCCFnz1xita~4576ckjtgoi
zp3qDZn3E&mUa=4C>Khy5AFv{}SO|`Nu}192(crgNNHHgT^bR+rAA5DqM|E|n4ThW_
zm*v6E@jMO=2~ntbZf|cdvg-dc`PDPQxs<nWKmRzC)1RD-kg(BxbMNuTGVZ1q5v6kd
zvnLhmMPr?tqs%EU%6=?{*YM!)^6$TxH@6%l#y}n)e)<y!$eDpu;>VOq6x~5nQ&ZZf
zPus8IT418Cswh?0Xh09R<dQ866s$n-O80gH0>QG|jtBjP@DH@qk*{7EnS6;!PPXN`
z?98v*kLXNSFqvVncIV;b6ezYeJL^Mq&6gcE^Dtk}+9dI|BVzp?f~gTxi11ywq2BMo
z2x~V|t7Qc%E<6t&JXlXeyEkT^bdx9<wEbk&e>qh;La2DGUECii#&P|^n|ioJQRg_V
z-L?}jN5UWR^T;lyTYr9eN8;{8b~x9HkR!c|w_*rBE5yaePXk}Eqp#15eZ*db{^7f4
zhKBF5NJ*t57)w;-w`yWg^Cxmazi+7^nB%G>xsJWKKvi(kyP`p9YKK)nx*=y)q29h!
zy8dg_X2#T)t{dt9um*e#PqD7VSpamm;CeJoo^np|ZFBR!9tQ`9wTA1C@E=#a<>-t{
z3_j&xJwKd0Ltn5$f{f(}TV*&EdCD3f@MWErEQZ69z<2&Po|u?C8b3$-@%=4I?AQwZ
zMT_mFej}-IAA%s;v&`fA6f+#q+mTvu$H<9eca7NC*w$`{UH<b=m4+}nRv;lVDvv|H
zP0xu5Pz@)qh~1vIuL6Vi@Hs8mc+==INA;V&EyEj!9DFN`S|XENv9Al;h`sTZz;-xC
z*1v}(dB}Ve516aw-l;ip#4|~F4pq$Z4$Z^+DxLGY?`MTAx*-gCX%jKl%);gSA(e1j
z=}>9|Da;*>C3Lo>Di2Y>b36KgjT??%yiXJv)Dp?a$?;!6&mD9>rY4(rnTa)h0t~>O
z*|9|oZhW1;G%M>{sMnXUpMB5gk)>shn!38og9k5KsYF>WU%qnVMn7>lwWw3BAk+0t
z?^bZXA3|iRgMx#LI%EY2*T1nQM*;m<YZ5@$&V0=~@fd$K7yB17JTB#xWofM+%(I;$
zqN2`k=x-%@UW}6u`5YJZ+Vq6XdsYSE3$40`>-?@eK2+1-s7r2N{ktlDejUGsmPz0@
z4Ucu~fRhT|y__%)3xw$FG>{-u3=n6_oR;Hg{9gC<Y4ZP3GbkyNVd3KIe}4|M1C~hy
z)khO<I({d9)utQ<n2G9^PT6sOGsG!^7lYVML4N3y!d|yhtE+W^*vATF{%4a7WU5<w
zDk?88(2m=Q$QwUymka<|9~TQFGjjo(10O=voy_YPHYbL_3gY{sq7Jns^WbcMMVH(9
zsmO<-9vIL43dIDGOJLCO%%`dla5r2YC^7Mu6dkpDG{P}_IZUG!umzil;1}jJBv&}<
zi#<q=+-;kL0Otg-)>l69MvqWt?hx%S1hFRZ{$g1h61rr1bZ&5d_g%Y1#_p6m0gplw
zTo=KJ(_=p(k3Mk6Z1pzhqL;*Ztetx58~5)ZtR!sbE}P56a0?bIR*>x%Nov0>tK4w{
z2A9bc!!W9H#lF0}yy(fdbNnPQw}=g3gE!}@USCl{E}$nHMh~P#l2zgFc8X%6qrb)S
zo94oY;FUNek5mMsbz(6LhAtBg@T1jl)x|)APmdE)3xTsbB|s)HPrLap<n_$-bS#bg
zJ$zsBx^=JivVg$tS{8x3H5y>PEaGOo0k{;6%My2+qoDJO&LW~uaK19%?EvZad<Bpc
zp<-k|=&^%O)D(=m)q0Q}`U2){_iSZyM4iD{$a@UyT=l0uHpejLBVyX)ww2)!>`%<d
zY;OLMkb1R!^2E4VUf7DC_tt27&Bf1;K2iDNri6sP6MDqjWO#aNN^_hV>+V?@Nq``_
zziH~@QFi>k8OttztC*2V;{HJiqllg4C+k5IlhM@~#*sV-HIA`KULI=AO6sr=^1q>j
zbnoBKhEdRRwgYxQ>vbB|0P^(e)p|9zjArb>=4iJh`OQ;Ae_R1{!xwSy4gUIg$IR{S
zg7Qj$!Fy&`19x{_zO}Tx-rU?IWME98nsFm`Z5umIW&$>BSYgBw%5Kk<5U!KqdPD5o
z+#oE#ujfl$5i9?kwuv$Ovs_PLDM*h~%1%MH=@nD!5ZfeW#+%^T1zL$0&Jr#U&O~En
zA)5M2IfMele7;}s!GeeXxYQlqCECQTq<XN;qD7Vp6o6GYrE~8!h2zOWR)gl|=6tDG
z184fe0@|AT$6^@^<#$ITMgsDix80a<z-#yb-v`PM3*f0mE6-bh{18B-io#X|-+X(u
z5mCwO0}?Nm!b=(Y)li_=2$gu+%<S%}t4BxY&XZJ+y^M}F)>RIINY-;1N|{mj4F&#1
zMV>Q@_30l!3aG9n=p`($xzuzL1T8FB@K;3pOS{n8wWpL`(e}*hka(9^xb7okITggl
zBR9lgB;ReH)_tOA`LjO0;U2}&vld|Q!bB>uW*G~!?&?<Gsq8qQEBWHu{_Y;3wsloX
z%9qf#<fYqJ_TdtrEV1EXVS+5o4o?+JGIp9lsSH-M>epTw;!4lFbk1p<4pvAK(|%8!
z(3cTE1rv~Jx*4Rue}5P12~W#)0D&Y6X=^)07GW1dAQt(tq(qCVYcoeQ=i!GUZr;7y
z5^@U8ju}-|L!oXN&#6{alwZAi)%?}oEhQ%-Bmk3mDAt!2`s4LpdH%PLp?>FX)EQ(a
zm5=mrq9pdRs}8<|JX>pOmH!u${$8`}*#aOg$DlL^tOlW80dg3p^*AazI+kKz6#yEI
z<NB0dzhnU%OTi-bhT?36NXE7zdaIW=%(&@wKX=323co|+$}BhGJxR06&|Vh7XRlN$
zK3O@r4<!7+7zg*1(a8oD8zPsMtb!sUgu9=k!Q`R>sG!MkbE2q5M@PqxAHt)U73bzm
zQ3drCOUXNqjwLjXvvOX(>sx4+0`MtPl}AaOZ`NL4xIX>?boM8+2R!%3rEN7+j{b^k
zuQoe~jxL<fjGjI=4YmUXQWXJ4*=PjpP*qc@QqAASb;4g(F0>My9v0qgSC^9Vry)!U
zv9}miNW7_@1YfzqU)jAj+1Q-v?1VW6Sizqx1SvmP#|e)4``<G&^96bI($~Ck-0r@G
zMYepB*o`I6FJn2tFzPS0O^$UGcH1<I6}C-^-BaYb(tkD1X>QSPjo-B8%>!pFab*Fe
z&FPtA{RJs3(;)M-$r<2_<mv}c4pL0hmNtC;#Z2auoOb;DJ2CJ9E2~~RG1C@$e&PhE
zrBLh-)&)^EXTIY8*wcC0;`!7H<FKUg*fHcp!om%*-mjpNiWM8f8TeC2`u&>b_L{f@
zi6n79k4Cc3zFbG;!GlXzuU_qFYkQnM5)>L5^>ng9>kEa9j7<8?GI|law~Yj66quIT
zR=?1}{2b=|){vRGxdN#xDk>^JzKS}1n`SUHGHO1Ra@qLFC+Jk<We~EL14QJz`ML6%
z)(>9gf3IY!x(;=$e*s6Ig8`@R<J_FOy1V?u9!@(V3*LJBrv#MZd?++4m>)Sfe2jIx
z>AqV)b0TJVV*ys`luvQ$YJzGtzsJ4<|H72au8*#l?@h;rC>p|37k)CtQ`%teQUT)^
z7;she^=-io1qMbI8Z|!pLb0zt>(h<J95iQE0)#5BUY!g{x=p=L%RJ8Qp~Z82|C~!o
ztG>3jrOEJ#i489_NVD%SCGA`1X#dJGa4ysL_nbflS^bjNAOt*%-9%Q_hfwX5d8uA+
z>mCuj`z}Z3)wS3cwo7r-nCiHFFz_{Js`6ee0HEsxM@&mngf7o2QL-w6gskSmUOZKy
z-*=)|Y_si-$#GxqmaLINlD^d`_pA`90WSJIAfrRb_jAPbD(D;;;RegO5AE(Mg<(9R
zqoSUikPf92R=mu@qTp!P5%Oq-`wucEah)Xhbs7GRe5gtvID4FqY$JK<grZl8^IalQ
zxVt<Le^o?3;7`WDrX=sG<;iOvc2~3-#p_=6=P2>Z%*^HFC|l^({&}pjR-<j8&J6R(
z(a8U_!bGa>L}Fx4i5%&jBmZ)W+04ugunX9*=sdX_dJ-(|G+T`kml6auG9iXSZ_a-j
zfa>8yz%Vj}<kP&Ny=3NO!U6;0aL9eBun~;b*!as)I0iyeslSd9eA;Lz672SaJfvk#
zvDY`-Pa~3kpPn9EJI>qv<wHiuBTz-8nwsAELHQLDW&ECpF8u2)ww@bw{0lZfj5qOB
z78ZXReCRTx7#sDP^~Iek(GhK(n6$AvqHhxWF9q~qw*NXqy^rOdfXI$=ufA6(1aBX8
z?Bp5E4P_N&<;Rr+2hOMiUH<jN;p!J)8RbtFTwB9o9=A@}W2xtBz&uzPY*joaOqBiD
zN&?YQ-}LO+vmd#y7!ghfZp=|JF@r*IOBY|1x0aVAC`pD&`_v2!;Ytf7h9ZyRyTPrb
zwj^ILbq=qeQX3^ABLCS4e8D>CO%9O>Xx14Su>olu67mWFW-PCPw+P@metM@?=4<Sk
zDgCsywE<36lDO+`oo7y=8mLy+)STPqZzs`z&lx~P7XIdSq4LZu@){dUu|l^!__Z4k
zoGv1nrN5WT9cZlV=>BuS&^M><<yWl-gO$}-tqicg{0%I%{>a6d^REJu3hroxN(2nM
z{2Ph7EV(GU7XfD&ETj_upt%UtIELn`ee6dX$G5}{+Z)1_%PF_G!TQA~B+*O81JrIk
z5A?tDMIq2ScAIWi4c*n#6Ze3%(%wvIQ)dlq)V|ST#T@$V*#;gSx@%Q9WYNRiy3}ek
zY;5wTrl*J3nI-=~{)JfgEzQgdz+yND2b`2<j-<NmMRfF4@PUHly1KeI>^H%uB1S_i
zI-}H-c+R-KW2qkkn=-jH<rxP7qTjxKGnt~nB-tYO(qkPnsJ<PXvw7Y|>D)-|YWTeg
zA^=wg`VX+i(mpKV8Z%8O`UD=+h49#;pyi81?Zu;>4!+R@i6K}xctZa8E1`FJ`Y5C}
zfAvUdM*e8>4mylUVgw{T%ol4V#Rzi)ap~B(80c@R`$G5FA2-ECtsTxx!QNuHs0Uj|
z1&-gN^RMg}3y~ClyjWf6)L1$~B^tRyNy>R_IwAYZ`7fkZuE1vk0?ngGaWq@QMiDTR
z1N143urIg8|Do(nz^UBcH(*WDpfpG*6j2Ceo_Ca~P{*7MC3EHsnME`zq7sozWzLX!
zh@?cOP-aPHTWmHP+xM(@t8+S?-~ao*_qxvMbh!3@-}SEbtmnD!`?(jR1;7!0EQP9s
z9$ty{_B<<dC;shQ1*j+y2KO_GfL$P`f;~UeQk_2<HHw(Ec7b-W?x27>>4b*StB9go
zUhWPJk%T%ZcD|6mzVJ6Z7zrp(#J+QP)T8!qGA}-GziH}Jl@p5S9sSm(^)F*i_P0zY
zZv1Wj#GZ_7YfCp6oh3^c)amQYbVG&Nu`sk+8NcCNw%MJQoQ`mjg3(bTmun9mN%!jB
zxw^Ba?DY|CA2FY;;mPpyF#2ws-*aSl2R|L!emgklU=^<AIQ}fIvE4SN`P%o(RUT~T
zHU~H*d)EVYP^0cc(%_-m*C1=RY11Yfd_mr(?BP4zJ!Pm0DGCp?A>@d~XGm1A+a@~6
zaro*}d_LLY&lNbHfP`cKhM=jl^HOrRgTxbnA^8A}+|J5smz)`QZ0`i0#PGUk6vp+8
zb8>PZhL)_u4PE1P&FE@2+CF?OAAshwecL7s@0UhH<})u`vS(><_W5qC6c61k_|+S#
z#2JPIS=p280G%>uFS8Q<TdshuHr2iRwr|+5A<>biBxnMv(2&6xpYDxeG}I*wr<rj&
z>E|pxw#JAQ)IX7It6fwq%jhb(>28;ho;b19oj=i_GFzl%WFvw6l&CRc?&{=^niy&=
zdSL->T3fQ!8Bn`d#JG{s)&;$#6L$~WXy!>inA!7`Shc$EB3qP(aKj0o*5My7GW7j9
zR?`<h#lPlzq_BMWUP#D!vuIc;Ay9uu>T!9=LbRXtcogKV?QS>*vyI^Oxn!5I0L4KT
zr__*1Q*zn^`qS)oNR$lNi*X1GYjLVa^Fmd2REuz2Ua~U+B-Q1W+uhs0yZdEu!Nz6w
zscY^>f89Ij5+&!6PlraYHlYG3A*C>`%y?*+!HmYp!S!}X@r#UiV?o*~IfAX4(s8f1
z0l;Zm9c!M3`@Peg#<bnOz_OV$WmV7Kk}~zkbGbLPBkO0Pi*OAKb2(SEndQf$<?*JM
z+b-dGmZB%LjoSkC4Z>>LJoFJ$Tsx%Q{y8J1a{*!Jts;f<&Lbm}(R^>{gRkZ;tv*i}
zYMcTQQN))tf_E#(Hs4*_#Bi!gvi)9q^#c|YgJE-G(@FlB!q3cfH!J3&lJ^~Hmvj)6
zZk-XInd#YcwvUI_vB62X&6rb~>_z*=ZRAA~2VjV`62tWlUaX+UpZQS6OjyjlJp5P3
z!lHBJ(9%*=wXZ(ye04?yCMa6_<ikK{ax(Ym*KfJjZKql!LqbB1x{T@ataJLDc|P%G
zX+xO3D?|0n*Y=p@`ItyO<FWSKleV4t=gsomVTqf*ySERPIpFhMiD_@&ym?pPG?>cq
zC6d)=u^;%NXlcjE-eXs$>qG~Zm&%sgOz5sPv27}G6WQ$@ar9ADPXsUVfRB1<VI$|V
zk;%0e?%&<@Z+SYBz2=wsblwfge%NWQd3%1xZ_A(NaG^z;5qZGq?45XedU{*@zyf}m
zY<Gy8JG6&9n>Y2vJVuW;7SQLfmnG_a`ov4@e#nyhWiLW8J%t{@ab`qonk%o#-nVS2
zqip<#p`6ihiJv=vY<F9`769vuJ<AI|X;p<Eqr}-`e8>ee;s%A6hdY8wAIdId%L@8b
zM)MgaEZej#(9dLl^4RCh{8{+x>~Z`JPmrvqwza(+CoC*N=U&Moh_kK<>$Hm%`z(6{
zT_V!qo_(RHYXo0-hvejtZhWZ>*VvXG^Q6maseNrmwStF7QKuKNtMx~_4k^0Zef03?
zdDlzBvuz6(oEuAV4a8<=qc-AW1enGu64w<`&yc&z*2I?GHSrl^?ekP?X-kqlIc{+;
zpu3;^qncHpnBn2US{5jS*rX{Ra{cm4T8FvOGV-W?_kB^q;1qn7`4gk@kAkdTgb-)j
zR${CdOLWuH@rBJ~;xf7C)u3yaIn7-fb@#=~w8D)tPit#W3HoQ)E;P5*Vtt@j6LWK0
ztj01@Qk)h(1eV@}1UNpPWAxe8K&5g)l595!m_@TETqZgh8*XtwzE|iu?+C$CCPT(Y
zUC6QpQtC2`!otM2BUL<`Ss2O|Poc6OAb=zE^(VGCD1Dr}5_<oE`QN>NXbJ#1)jR^w
zMq%2`?j1ISNXSxzTg|$Iznj>!w<PK(s7|(jOOaV3Xr%ZV;rD(T9KF#kKL-l64}h(!
z9>~mbKsrXV?~GnO?aw=yOUyMQXS>q)WTASp?&DuN*VUE%JSIt`#cGXX8$K>({w6(7
z>H>>hqL2BHuT^HVcS=jYr$@Ve-5@xUW7{Q>@*`Vzoyo$w(Dcj<o>^kf+2v0!GzMaW
zSVAG1dwF<vog(sgiOMWa%8xD-#Nl0mWN#(!I;fv#JHG4f(^c!-Wo@53=54)JK_0hT
z^4haty-YLcl*|%G63^FPo8?dD{WRDXlS|TysSYl6F=)^zvvMjeRd6K;zW?w+P_Sp%
z1&M0z5(%TDt!){Dndvd+>%GQFSE9rmDmIok;75bWlJfN?0g3@!(%yv=apZ3P^^%mG
zdu=#pF9@h%TPdYhd=6!ivYOiL!7~hbO`8neUw;WU6l%VR$8jG#cyF(y%cC!8LiCpr
zEN_Mnl3hH1m*Im~EW;+4G-pPyN>XQJ)o-mqoWZTptQT&!pBqAsvRl81zg;Wxd&N(q
z+MY8HbPVCMCzD0{xpvk~vcuBh?F}6o&B=S!nSvm9E!Ara&!55Pd)TxePvLnvTJq3f
zKJH6_{Bvrh=V-AseYdu$m>3;xvq|sJ_tzu2^V?)TPTzpwtphl@Yt!OdG5Yv8JV}pm
zqS|A4So*VGjzviAW8n|5tJNQCzu%zYrm91V7#{3=Xw!CVd12kAUAhaKDj5DI4ske3
z-2iIEo%Hm|s;YPD`?me~@#E-~sf(lgIbp0CZ#|h98f3PBLZG?hgi?v_H~b{clIi`#
z@X>WrB}0mCYmed|A3{mY*2Ir6jlHgnZ~EdiHi$AAuZ_=si($UF=7sMBmO=z(h<v0D
zm5Gtb5XoOJDJ6&Sy-jwOCduhitTcO7-;>Uj9OB_A8t6+`)?Fh?a9;1>aqTfS91AWp
zpPLtS7p6$gJ`GFH_=!y;KjQ1=p$(PB&225+DJ&+WS10i04-H>Q$s;y|Q>zVmY&`B3
z(A1VLTQp<tX5`~-?d!|cw~d6qAM7OM8@-ab^p1><ruANjO~KO6PE-s3rm9NW#pRXr
zs><QZkGVZ#EvqItxVR$E^b&R&H|qNySMS@=4b8!?ib0$>_3gg;*&B(tAYc(Wh~0w&
z7>n3HaYU>B$qPx&Wk>tcJsGtRXEV<Ji(QqwD`I7(ks^{adUL?b^5e_{nTH~;MyF?p
z73zEM%-R+I2%OQ1w3#W@^6A!ju38DWUuJ0;e~&9{pRL5<jPg6DcitXnP%5+=@=9&z
z7{6<xRu+>!k{+{OwQcwFilwOJWAu9m4@(;^&37`Lii_RClogBTZy=bvRWCG*f90V~
zY`_m&imem)+%=oDvNg_W$;<l#wC-4Ns>%bJ-IAaH4qoot>I-UR1!y3v9n&V=dW7Rl
zvidr_I6qxCrtSW6u&s>jd{;U7r@CNzD{Y8wrm<hds#%qkP2ZH}x1h?NJNj0U$!&U-
zkfTRCG=G~JYyiLIz6Y6hd``|MQgTX=hdeXMIV1%DBK`i?-aZyUhI-ER1+|*DGuymt
zSyyQGG0HM6^sb*O{zuEwv;6$eq~vO2yBt45;+-HC_v>D3{hNSg(ALq>-z4lJMJQb;
zZEB$Lf{CDDaa^6yIWSztcsbI-H(2I!B;k`fRXN3_k!n$mU(?F|xKlRqPRrg47cQh4
z(Y*o2apR&g|NiC4AX%a82{P(Wf68!<aJ2#W6?l5mrhTds<L`mPPXMl=*0yCPcXVA6
zK&r}mdJ#}El~v!efNDFpDbg?60?{58j{^9c?k58J(fCnU<CoeG4T$fgV_(HJJBIA0
z#I|(e(6F?h3VyUXQ9D10cw)r-MNEGk!KvBUmuyR|u-v%dEjbYhkW7i`D)BDaJzIk4
z-&V-1zRYxRP}6G(N`>sVG2SH0JORcfapn<O6G?JfLwmdX$*sQ8d7+`9sV_^tSF=;~
zP-cI*UHZ9#{pR)2B?A}Y^P<#}==U74`gBm^7~9Z^M+qk%K8An@InKu?X1jJn@%aFO
zV_(uh8OwF$$`vy+^-BJ+&@g~7FQS;)`h<KzC8j7zQ*UX3<mKD_N!WXTkc!U%*zjsK
zrCdEUZ-0xgyRU31ji3H)7GQswI8MRddxcfAczJm417Szn!xH-*$gdZn_wUQQ9j7DY
zlnCMW-xGS%2g$BktAS#BzU1R)Rtzk$LZ0zlr0xfY^;=CYj3J<eW=Ib)4$C2JXj!JQ
z(b%1{vwpxn&|!)YC(laDzk88>-OA9)j^UP;o2$jm%^jbguM6%jlq6BRc^M>A2M!%l
z-oJmYC)~J!ZoTXF?b~Y)3T)i8sf!wCQ7#X)WW*O}R{-$eebc?uP>4(nd3*i%dO~oG
zJJEP#4<Z%c7h5O3a7+I`l^5uSp1NMXh-S#-BWlGJuJ2P@TV%4U&_TI1>_TF4k>m}*
zH0jZ+IRdw`+A8=t%uSvLl;-Q38{6sWP0eQAH{KgM?D<R{lmd5`(*l*KqOZHWts%0^
zy;vOTGg7I@ECS$yJ~s#(4gg3`{SL@uw_twR4Bf&|_Ux=niltHH2sB_0z})|?UMvW6
zghy;Y6eb8EqmO--N44Ha6IR_;R~DZ|2SLXSSP}pk7+)`aEbf%Z=<NFS%?82MQulYe
z-mUfdCJY7LX&~AlOrqCPaku;46MPw)^PQMSzas<aK76Gq8#zJ6f4`7`oIkq|PR^gh
z6O=A?>lEXYl5PQfr4{fP@L|EJvdW;Xk!M`R#l^ig`r0$#jzG3^w}L-W?a9b&89&Ub
z2M=}$u8|TwbXa}YN4Jx(8iDcS^PZ1D&^>}xRnX4<JAIArq4Oq%dzDVk$awhd+5Q*F
z$)T;S+8Q$-C;KW7NJ{D-6%?#O+l5>UV3u|7${=2TgZc+*1ymBflLoed!M^d~<c&y6
zw>Pe((|dtQ@z<a-IxcBqIxEj}z^+|ZnZlBo#;}Hs2Sta=YK{y3o>gFjp+*7oGFt#y
z7XGNCsX4c2j{~@OsAy|Hm_dRVt$@|EGxl7kS8Yd_OvhvpkPWkksGcPzzP(+@EbCni
zct^m79ktJkrluSPS9=O_l4Vxt?$Z>6xvk@I!epH2x2~;*VZa3Zi_O69f-)KgfNBAv
zeFKP$_mpZ%K4?ogq|R4*{nop0=Ef~Mh;@p-94+m&3l9(17Puh^0HaV`G=OT252<dZ
zUzT-FN^0BWW&+d$LKPWf#Huu<lKQqW?RR)i(9wSWZ%0J<Zi;avFOVL8ojq$MeR*sX
zFdxIi!w@3aA%RJ}d0GhGxnNe3-&QiP9{V9^iDXX*%^f2~lpf^g7mb^M->iF%KYH{i
zhlE6Xt!+X^M@-C`r~i|#(l`1oQlrN&?^VDUGl6#n=lCFBxgQ$3-O|eHs1{yq&lX6g
za^<KL?l74q)0o0^%ww5AJDAzGA^<mP(CkPp0%$VgOg-?C@vmOB!Y%mip18{99tQyf
zG2*wWmQ@%d4o^E7-3KE2faCQ_O=+i+G(A)^bT9RuD3}{C{})Jv?uwcjTPME9l2^jl
z^XE#x!dGZi)TMQb90v|4A78tivP}&ULeGl;2%6i&`%Fj*?WDDZAL{CIXJbkmCTVCx
zGU1^vC`6AQ!aakn8E&b$_qwv>m8t#+Nx%#2S|GGb_V^szDC=IiF&usU@0b530|bMX
zvms<%OG^uobtpDLt%R*%=4D~DhUvUP%VMX{WqH~k6nwxvLnwvO2?$twWujoPHq{ko
zjoBvyb$o)T^g5*>r&j<OG1BdZ-4lU}ttOCvCyo@rLb;C?4CLmIe}~S{E$!ZnnSW7H
zZ=el+{^G^UtL#?4MX?B}D_JWTxK=<M$cm3Yd-kk0wP<O9coHbGh#3P7jr-8MUs^p$
z<JAor?9AMvffspx5N=FG<tF15wdDzj0dU)2zg`ery_)AY!p6<j+s47*K~IdQ*8lb9
zj#A#-Dm83$B73mWK@pB0A{l^aYW8oaVq-Vl=TtqKJ#qHz*^59LI0DY2G2G?1X8pzC
zri2pm6A<WNuQk;Ua9rSHzJ0q0@I6LjQI`5@b$|B6&gmR_j#$6#-O1LA$6ZR7ukJb2
z!v`z=U->B-y3NP)mWHj(&>0HGzArK|^5oc&;>=B5p878hjRTyVZ#4z(LD2tzQlPZ7
zI?XXe@v*oM?c=fE&&^$<Sr*&V4?4Ul@&f)OjN*&JJirj&*VPGUmo~N$3C-#qr5_vP
z6alKxudS85cI{f0^Qg99krt3tW1R)fwZ6R)8m_0dEIHf)tri4oSfimH`03DSp|0Q4
zNOZU5I0}s|KqV|Br2BeXU0rF0NQU1wraiH%w(tHtH9c(#l4-M6(TIo$n2je--g-e$
z^XEd4=-o>8Fqt+`3PV;01D<uEYNO!vM_8(+s1$DP0&*HdnS6V#mXo!RreU!!+pG1n
zzKKF7KQu@0xB=<y3v?5|UA}&76`p8c6`+DZ`5x?75>iuZK~I2$A$?Q;j0Pxf-VS*b
zOAz}|>33zffQgeJ*q!E<lGD=GetgEYzxu8yJN^I%hwfHawI>p$3b;u?3*G_md{mYw
ztjrhzVns=x;k#K&4cU(Io<-;Erll=te!B<smjF;Vz#qP=aFzSjVq^{{BqTTv)X;0p
z1XuRmBM>elWD+C}8db(GLBJa!=I|_H{vmZJDAKF?@7;|2$7G*ZAbPnHcCR7n!(N4$
z{SR9?(?TrFQ(w4GxS5vHb2ubUJo=A;uy^T*DK&eGZl>Zk1%R^zZi^m&LP0?VRD&Fx
zoGQoH>N)xAfwAA%=a=$Z_J|pCmofs(j|A<~)PjT-cs-aV**4c{Q0+!=u!ta@o`K;5
z%EeP9eWbVcZbkc6zGEIeb>FS9kS}PaXp8-s*3hU^cF^<BAxv6XS;eQPf7C2a!noO1
z`D)yHTC2|`9(nZ7d+&fI>IzV49HOFanx1j5cR?Rv&P;9!icd(%Q!5I3>7zbmPr*@J
zaE$TxQ1>kZ5{w_e^h3vy+{6l^xDfe0Q@veI-}swivarWTL-6ZjE5?psp$Z6@ot?Gw
zXGb_Ag<J)gf)V6gVta%(R+d0hr4p1Bo*;2Ti=M~$bucv;D;$x_%F4P3CWc2rZZyqB
zj;+@R`ot`+iE4vSpv2I0zDEq`LykIpJr4ZP$rIz}k&4aI!9WBsCrOh5kFC59VVM5K
zh@*R}ScPq}xZMqz*CF*+wy{a0-`|%4JzmQ2t`JkUifZ#t80`VwD!zI778#8n!PH8%
z@6K{p1_lfLnX}N<P(rX=RG@-|8(2=Iyl~@}kuii<#{~(4Fg>hYXOK;NJ3X8cpZ;Tq
z#*cH~=z_l8j^Prwyz-mNHf7`j_$c$4PRq!MAHeUgSjCFA+N<o)4~X5~E|f;Gv)Vn}
z)n=;kqZ8x+rV6cpp(XQYg30!2<uyDC45a1}dsa~JMYEV;#|{(lzpJVO$+)pVAt*em
zxn16~CeKFPbQQvVMWcu2{jYcV^FMxa%5?i71x)RwSsLMi1O;jsM1sI~U&o3fS@&kr
zNZPx7Tjp;e$z;*s??>ZcA4bPS88(uhlT$V*k+h+aO0~*kOOQNdFb9qtX@nR!l%7+F
z3l78I8?~uR{92GN`BrJ7r2b^hyGy^<m)Hj`Q7q%0#^j&l0~!<>;S#@=ynFW!X5Rk&
z`%#)l6q1sY=MXwo!2lwqcefWFVpPG;NBi|B&Ih<d_!~_Y<iO&t6H$nHyh#+|y#Q-B
z6v*>y;8NWC0&++6O22)57!z@G5OPbj3_>A^_>Vbvl_G9rQ-W^yGTPvLhyFm6EU<6i
zu_JAgCaCg!G8L5@9txFjFz5cp6r>*KYQBBbWBwm6RhKe)t4~$_rfUm@Z4sC$xCLLI
z-xa{a%FPF$Ry@$oX#F1_*Rb+&&)LPmPOt?g2v&a}f^;JlmEW1Rxf^@9m%`71S`y~l
z_?aW2_eIn>69#_oIG}#E7{?#64UOdH%^ND;>fPcFWT(t#s(k2hK(86wW9{Z9`?T!?
zyw_2&Jp$tNq{DzM<*85ZcFC)KN4f!eZIj<_bGMSnc%-QU`e*?GaA__3rs`EyTY()!
zNaf24o1zlHd_tlgJr*7NI5`#2>T_^#fPuhG=H~OA1g(z}1PP5FYTpe6P1^&mZ6Ci4
zOY<Ms=Czc_x!Zy=7Ssh`fXE{zS4OHCz6@FrM7zPKE&r*fJT$ES-v5Qu??q-G#hjCB
z4J{UK%Gp|gHpIO99^E7YssW(eNu)ytEr>hfj(xPoLJ^Qw<+P!4;sK+cY{;8@kAHpS
zN}2ZSBl{f-QhTqHNbVXx3@=`c2RkEefIv9*@2>z!JB<M_uZ}}^^}n6!Is(tFU2_TQ
zQXHyFe|zo#N@7j5S%~ud{wRb&=ZP9*lCU6|b~SF>6T1&&QUQ@8{3`KKI>keM5Bj)3
zMT_eJfy)0FLMpaJN~|${in&)&?e2vMpN7<Elqs(+&n_fY(Pxh)Ro{!H6z%y+^M!9^
z+%9@1b_YPB-;DSANP?gJx_l>BG%S9BSW#x|+mv}d7}WnElUj0eSCNPXP#qXV0Rc4K
z@#?mraFf8ep+1naZ&w#cbHDv9nfe*61sW)Kx)}$(n2_(Wr=@jgBzEtEz>VS$XP}ub
zRe5<LnC7YEy?fYJDu8V(XySxkX*=~>_`y9N0WXm593Rkn!8K&W5GivXihcn>56XzH
zQ3B`@V2&Ff29DC>L1@#tF}MMgn45Qv8|A7vn3nF0`C@aYBpjg!Xzp(=`W;84vm$M0
zd+GUcl^_aBzGUapzMOBY^AQnWHVsnUpqWOmb2kCvX9DN|Yiepdx7>wNIRq-z_cb;9
zrB+i33>}BWD$FDL!8*b2P_!+M6hQbwA~@aQ^#4weKU3bIe|I>K4#1b1D7Av5Q#eWD
zi5ilWTr@X7>FHSvXo7$kEwjX5(T}FG7LA*jZn(UCoIFTAovZ$e)m@w0YHQ>_-zOR%
z7$V9<-h7s6*BNbXPA>K6Fj#Apj1Br6P|?D{!GXY%(<oBkHJ=EBxJpqY!WRGF>JDa(
z<)M>JZZqin|8@Cp!A9M<0fY?yhfWRds<5f|I+UQM-V@fL2)mVbg|r5PjQ&%zg}#T<
zoVA&0MKV@ZRrMc|F@$d+LYgbFm{;~ujshh1FyQ^+^V;{0qZsr@#cgaK_kk8ZeT^aT
zhS0hR`TdF_e449U`P8YLtL!MA0hx;mW2qw`Q{s&R)tt%)LHc?W-Cp0I%^Lh%pMVzT
zA3341Jw*qz<^lBy3u7ewrDuyhw!KtINeNUjP%6KH1qow4*$Q#}=wXvsdX6JzZ<gSe
zVJTfS@7siu?;M{NtK@%;G|XT=%2?w7ID+&fIXT&LOYrsIbw_YN<n5rCc^^r-S?g_)
z0GN<!iy+e;2PB{#==BuWaIO7U2M&DCZYeAZm-`}(;W|Z4O-&{16g!@KTS2A<iQzYB
z#k~LM(Qfp#eo!$PAiRs^)Dsi#XlqoFvKaAr1TURq%7_-#`s1#tWw1R-fbDO92Q5u4
zyoK&@GqXf`7A)Mcxgo85r$@}g`MbrOHyntMk_VH^4u(9r#{cf6y7%F6qxoIje+)KG
zjFLQ@ABVCL!*HPgM72dyElH!Pxfx+;U;Fz}HA)ByI1koCEaU`FykE@Uq6J99g5~Sa
z`u(m;MbEJLA~x7;ywH!N3d{T(Ahu1PK3xPYirAje$B(%IQ+@zxERrA5tV10?*I>1;
z*BAsnc4_hKwK4Hor_orGKZj#KHXL-?XZ7_HpzjKrixNPStXZ;yk?{~zPf$*Rh!+-`
z?`bCla(6EjV<;;i&?|EUR2BoDxyl~=Nd&={`TF@`p*vt5KokHhB789;1DL4e$B*l-
z6tEKOsi<PrkvjhZG^?ea-e6~8|K{aQ1EhrEIsNAn_q(bl4j&zm1K2GjpCJHFyhuw6
z2MyjM*&k}Kt<vuafdN@rFcr$M_vs0Z_M~QXTNS$-&hA+#Se%_Zi>ie`X9pq?;j?L!
znRdpm+#VB0-z_L10TMoZSQYkeG#2*GFcv6W{{wLb?bmyx0R!bp0&H%7F2$Ao(f6JP
z<n~B!igo>!3Ol}~uyW7?bhCL_2yRN?^uJox0;v@dmLa*x=-xDK(w}&S?<55vkW+xo
zW+wx~$rC58)xX|`n68Vartd)^z;)zExA1+q^~oRq|KNJxNlJGf34ujXQdj;$lMm$g
znARL*VqswVibFs>1PEh+{{xAKBKpsgf{ui(bX=LGt?dKo3mkQzRPWI9hN^eyOhDB;
zEHwW!E1bv0vv1|FjUB@cgTw6du5x@7jrxywDYx=2B_4h_U}|a#^5gwr9tZawRJjl4
z4MJ5h*%7?&5ZGa|?BD8R@QYL%Y%OSuT_k@?Y5H3DFZC|`I@OB)o=ymD1t5opxB0gm
z8nSShEEF~+2@U`r;%jH*$!0x!=t?tL85(v?lB0PR7N1^{C8RFKTE+awpqw4bf*wFz
zd2U|bNoZMs22o6!-1wA+_Vy##AF&V)w^72l!zTvY3_j={gnB%2Bm#=1zvdd5v!<6A
zuzK^47{w-p<vzZ?jlI{Qi4khTSFf~DbxwXGiF#wMvO_|&As9a05Gi40qYE_Na;X6e
z{?BHqa8!E!@zGCxD8yS?GrG}(e0;A~a|kI_FaUN9VZ`0NP;5_k+U_lI=-)mV5wtm?
zyx~pPk++)CI<xb~zIYGm9ZKU9fB^Zgiv*@a@V_QgAl-#KPEJ;Va0P)C3gd^Ma(!Q0
zyECcT5^YgrAY%2Aezp1NE|qU|c)4WgK=}~cWb_`1%Kw{%c}=luUVQei_ERn>C1ATr
z4GM-$d-Vx_cBpyYLq3wT`ap34Lh@tJZ)f8EV?)PfQidVsZ)EJ$<47;-2YVzgKZixG
z0u20S$OF;7x0)YD0u<F>+&42zG{G>OHDK%5vX~p@<=yaG>WU2r%@!<J_tMke67wSE
zggtlw`-~2dcu+W_4Tg(Lab<&HoBK<_?88+?yZ6wy$ngti_x736!W!OC-3mL!zb-#Y
z!;}=D4)Lj}r%)^I%a@IsC7`E+1%m_>jKWr7DC;8dgHqVBzFGTT0JVx+3LqP(hY-!Y
z|6(@$F8{>Hd@;Q}WZaN=V->oRvWiL;iv)DU(U_tL8Y^oXg5etHas;&#Rdo--R<?q>
z^ztL7Wo`x};=Iu7nAqM0?XG-C6)!mV0ccw=6MbJ>`q~^NQ@~?nS@!S>I@--gtue#6
zmZedkMo~|=V74e^IH965^n#nPv%RREDuRKA<3y+U&wV7>6;K0?BS+4FPcP4wpi1<r
z<ct<{(x!~)i@t4*8P9&(t#Z3av6NV@eqbW_2v+q!O@Usa0_X}vf>~SU*MfqAbxIuU
z?3K5vHghuRW`cO^%JLGi=o&+Q_6k@GHx5w60Q_S%ODkiIy$)&y>?KnL?4Tqn2Q77v
zE7}9cj`;u_we1wU3Z({4*BUl6peW=aEjdDuhjj3MRL&Jg*q5+?;@<}7^8mQjKCG!x
z0Uk$CtNu2Nbo<8ecQrLx+QoNo-aP8F+L*0r`Yp(?;u8|8G)bI~VyQ{(02|iwW|Ab8
zC})DeH~FIB^R=h!Fw}c#?=(zaZ`H=@v`x@qIKk$<5}(jqt>}p;G(k0Ie3kPTO(}-)
z+u<mIBE%14!?T&C-C_}X6W%Z2%lNTCEX%~{00Z)Y{jSu0SjmvAtvPn=m>&Qwm9<hk
zYESzEi>FuOo*S`F9bohL_;}sHQczEv1TuPthJ!LnKUuSi4OoQOErb*=EtwQB-|p0>
z-s@mX(~NG9`T>fK=L+<p;EufMO8ELUj<|dr#bdM(%F7eZZ)>0PA`G3;*pT}C`N4TI
zv5X%~$@5z@Y1xWr4um0j=XUTtxyE^1LE-U;D5&;R?XMXRWl(L9bms$dD_Lsxv&pI}
z%apng);2<>f4#=upU^#kStXFX0+(j0B@27K#qYSPBnYQ5FbNPetXQCa094jHcnWr8
zVX<8bM74LCv(4){l~&Vez&e;(oUYeDCS+iVs{lUs;zVabV$-tRA>3Cprqm;#pyxSN
zX+!}vs3<PHR5V<a#J#*Jl2=%)V#4gCI`l)ro+TsGjg8d9o9&foEu+m31TMg?1721$
z_vR4xA_HV;Z-Zp5L=%Ago6@uiEpNZWmN%MG*_T;rWinTnb4Y)fn3kRn`+1XLnd^Gm
zyA7O9w4qdVhQTb-+!$%8<{sUUc@<`8q>2Si3)PJ+u!_TwD*Axt|Cn}B-@luQd(5W7
z`7Hp)fqft}9lZzJPy~_~PyUW!Lg+h*ph84CqfLrNz5R4*-!=xma{}S|mSS&^ybroC
z(pzfB4%5DuhK3+Wne>f1+S_YmJ~t179bt$OQ_`xn)!-Wqaj>>l!lpe(8MQC*Ue4ci
zui^AH)Fcz(18UOu?iTsMfnx*(e-ELd*AJ&NDAg9=I&5fPV2h$`wyP=!9HBME!0zj`
z0$??{+l?Vjg%lW7UR0l|_+{_QCzORELi$f!9hcuYdar$Qe8N3mWS1;Z2HI<~Wi6X8
zqm|N;mr>1j1My5q;+R2>ukXrrkmTax;$ZG<+}pt~G%Ny^IOc_Wo5960tHM|=q=@PU
zSQRKk>srLRU}_?~!<yIr>(er%^<G_ypik{T{I6y89=G-0)8?%($aEGqHsPQo19|S0
zxYRRtu?ryM21N9@8^j0SJAW25&19_<q!8N+1SY~|(6&yqwS8=yPfBhLh}*zzgkb@M
zawilOPZ}CV7yo$6tnE}F*?z9XaX{q|w42f|!x;x<V41z}KoRi0d5r*xS4I|10@Ovg
zM_}~!>2^bSw6$>gvHCpySC>Li<Du-ZEwD_8Nf3kt>gN?8ShxiLO`Qn^1DZpSPeI#O
zayOPwHH5cfq6_$ihV0rRvziLnG!dXz<z!^IAcx9@nFge<rrUygahX{{A|fn>1(OmI
zB2;=U#Hv6=j|4)t%t^vS$f*4<U0n-qD!CAr6c?nSp^<JBxPcnfUrRG(HHQZ}4Haa9
z{mei2_C5>{@m)0pWj@-35bQY8$?z)~tD;osRHU!aF7UpDcxAq^vMdY%ge^`jMq%%u
zVyvOmq`8mLe4=v~y4^R_7-!b1oN>fzO}4?bBO8E2y7fiIuUBgnga_)KdLq$MOBJxc
zh-w4vjSaK&9GwH-zn_hjAboL8*teaD{ExAtvBP4;W&yw?wC&%3%0Ho`qzlT!UuG<P
zYDvv#f9$1&g-&+^z{{6%2a01sf)B_Z>V`uLA>bME(KwS75U|#IU;)Cb#)eY(tPh3G
zqqde}ZEXpC+n44GsR$qWaB_Ez+|v7t%^6D1K#wOg6}EZ9N5DnHO1T+227W_;MF4S#
z&uz)0f8jjv0#zX(R5`%;w&*(oia&o)i8y@AY$<Z4MgQk}{Abzsboq&dvkH>_rQQ!z
z{4C6~ULV#(F3B5+?-}>jbOYw?8Jm0uq26PBt>L}}#e|41D`<;sYHc+$!|n$Am#;l`
z9t!S}^`%Q;pp}>hm2%a9V+5#~c)uc?A~lt_032DcnvLx8|57&c^vJzIAL}EA+8CXi
z6ijJtY3K_{WT0tL8fq*6j`PXR-V-YFzK97&{PoI3XNv`S8V&a~MwXT@qGY_z{sJG+
zz##D9>sM?M`aM{YDxt~5qglZWcnqLCW4xZnP%?q4;-@~CT0=rLMyBhw93U`ZD0`@-
zGPZvV?Wv4i$snq@{qw8g&pr&H^%aOazYR()Z6pbt1E^OCwrc2d)mzC*sb0_iQGEUs
z)+V5&0j7#?FED#ASqz4Sm8ft-h_QtuprEtlXIw&G%I1k>*mRt*%_DFKbUI*1_z1E#
zcJ>3p!Yvzvl}?>Pg)|i*379N|vD6^21p`;5U4h6&#TUdTQ52Kd#P|%0Efn%pl#~S6
zsc;98w}c!=VbgR$#=h_9>nN8m8AGFS*R6lW!BB+0&!`<g9sq#8K80r81HT=60DLwg
zmfu+;K&_L79x6UyIC!Cn4g`{e%xYL;E1fRr83p6?5hM&l8EXcP|7Mp{K0M@)#7Gp%
zx3Wbw90A&!?ipa|37~V@7!1Dd!diGsW6(ES_#TJd1m)vwny3XIK|Uzm`dR?KB?p$@
z)yG5sqNPLQ92!@0EYFuURB{@SO2PX>wi_!ChW_Zo+LV3ioWO_zv0n5@Ss+2If*lq}
z27qM&WkT?yuRR^4bzioog%w*aa{$f>GB>SHED!#v>MCCb2KT%|-m?wjIpGf<_Dq3O
z-w~hfhM);5EMf4XGj0+s?3(YSPD0ihg<3w*MPQgx*2TaN{gKIiec$_)SYy4_TIxkR
z4YQxXi8=b+{^V1C-z#;>PY(^8Y)VQ>wj4XE1*<%u$^<14?~x-|HtuWx508eWGKL+2
zU55p;y!Rt051xanm$ltq0^_&AdUZco>OF{{^}NNvKhf%my1_6d2RXK`7rMAZ0hbVm
zhS7|=T<DTRr1KRx@&TzPH05u3e*`C)a7bTtX$M_?YDZg(PIq~ezYUi@T{wocYtE25
zCNiCypP$e2Alib@6#$KJ>{DwkNTpw97?!lxN`Qb$4Rl-3K3U-LBzlZkx<|BqZW$cr
z-nR2QkMR}bh$WH4D)O%2LCvL0GhlRA%QzbKMPE!2UT1Cw$bqE;R(o}kB3LC|YTM1-
zL+{<293N!axPTQyn=eMr&Un+h{eP*20(^lf1`Xi$haXJ2yP0J?^I<L^otVHRB3V#<
zCg@xZBn!eAF;}5x?}RfjqUFrsG<_;hYc%(a3!EBewyPT?PXnMIf_?)qj~{PUO1)D*
zp*`<fZFJ`c>G4(;sUZ>LSbo9`ziuWQTU{O`h7+&qrO0#r(lQTA8EAJjd>`-b+{3ml
zxT8KM$Kf3FjE8mp#0~FVAhZiZ-DWrOmlsC88+Oog4Kba5S~ngol0$rDH?ILM8bb~_
z;JqO@ngend05OkbM_<{&78`Syr5d7BVv{S=#;4UTK5L5tNa8KQw#?GA=)4R=e?IqT
z)t!(Xru8f39m}NOx$_;ge;18gdnIHT5gEH&FK<TEaFYMG%$`mF&Ifax9n%8{ON1U@
z1)WpCcX9CXeMFnQz&$OWGyAWxmhAi6g5{r-;ba|T6(Faa5M5>Md)y~2e?lFmiFT!v
z0JQQ}-!9fTca9ef4o94?T~W8lo`!5=v0ZFTxxYX}W^}O36>kVSsk&9$`*M~Rm6>Op
zjV2TNN_c!k%13A0me_W?ZxWtNvWH%7TmVe4$9mv3-Vwd0n#p)7W0{m;xK8nM!m9l~
z)1p584)?B$Rt!YB3rd@h%scj!ddaL){M=~2jW%?{+tSp1T%dxV>@d#&)Z^-pCA^Oj
zD9I?|$=;t`r1$+;*tTK5ZEV+(@ES>RNCeB6N_HUW;BcK|S=ree?!u7lK8~=7#m+Va
z<=xoxRRB}UzLGnLWMnU_7vG?5fC?{-+S@OufS=Jx5Hv;XyO$&G0ot%Ehkk`J5eXif
zuPykr`fZom7gO=??@wNTt#(&jdRFL7c}(9n6=K@VXq*1l;PJ^;;knpKBw~B#L)eoA
ziDg-U;`88X1GakQK6ka2ad6`$f7)30!xfq-aJ15SL*h>%G-@uLtUpYeA99+T&Thjm
zK)Z`>%-y0TR=6+9MPvR`Kjur-oQZ%mis(liM3QQ14?yFBYPWLZmam0ipHZMpDbg<{
z)II>t=^Ny6SZOB}r<z<ZyIgD|XbBMkovYDW)6>T-E8AoBmNpQM4108@$5I~Onx^k@
zX{ar668e$egFHM<3y*rK)4Gie4Q-dMfQAM23RzupQOxVhGX0R+GVPTMrwrKA7N2~;
z8`9Z%PH=Sd-JxOOu2bLw&m{~d`*vkI&+VZ1yq*xQV>tZsNQsG2LodV96Zz`Wr{{N&
zB1XOA7s6!R+mi_Rp_ge3&}No9;!U^NfS87BGEre3D>|EJ`{d%qi;wh{_2Go6yzidU
zfpBu94Q!o9!=q;g#Q1o5!{B7BZ2d<tv!O>g9MT}hBNyHrUI_742aAKitkEAmGvX3M
zql-a4bL-1|()--hv`FHXlUKoAEJi)=4mtXa(KKYSb{jS~wsp6+lg39~h+YyyM1APN
zFuHr#>tpxF^Q6KV!DcVT`tya$L)ML63d221la*UNHa9d9ORQRw?R+SiT5;b0cPwbF
z--m%LTW#R9L@^Cl4XFGm(s)cpLPf`e`+9nK*ZfpFL*iF)l=5z%y^khEaV%|K`<R_#
zq_j?|?s+d-#dgh(j+%Kml?&f`DGIv%gh$->^Yho=CYj;8OImM^Oj!8OBA<ZKT*9@|
z^|bn8_PxI2BQx#sMbMy{A-_g~(CXH$;dUHyDEd=J!7kV?@~Ox68WasJ&oXCp342*r
z&OphZTAz_Y$nOTjgbsyEON+T1IwDQ<W%0-nGn)tvgsvSfq$no3uN%4^ytdl86$)(H
z;0CH2>4drF{>%(_$>8yi>V+8=LpUS(9fWg}P#LRv!yz7@sU<Av%E2Js{UqI0{)(BX
z<odXdPkir`WBOlKv)qRWtlwYS<a9HdS$HjUDCiB<yBQ68gDHZ0-k^Y2bW*f?a{VCl
z60d}eha^dFPOu!SDyV;k3ktf`D{Sy&5Sse_($V1p3kLy2!v!EI6(o>oP+g!6I{a&m
z=OLNw4kiy|Ul!qwcWTvvAC+sgPiD{#PFQHX6v<p@KgfKOl(oIA%%;0o4{!!65R2WT
zvT2&-;O#Y&7M`+ls|3=bu2xdo%g_ZJWzU>BYTe2U#!|sOOjUNRtT3vVJ<`q<G}-ts
z!8rhJgMqG+?Y?QMGcG+nMzoVIps`G&o{XF~S>6<HPje4WTaC2QC<*j)YdY1_>=0L-
z5iM^kf~=&>eOc<Gn+Cx#M78{*GIvz{3uqL~rFC!UH_W@i1sK4vbt~Hj*L}MSRlR8I
z8wbJQx?o&fq0)$uO`M%;WV;O(?>?_eUFhFUGoTUJyo-V-(QvJi#$7#-0%2wKQ*aIg
zoGz6)9@-YXw%l##y$%Y@53udfpa6@z3xcGJU`B!fU}YqjnmK3C&owo%o?iu|Fz>+s
z5CiW?3Xz{Y&JGww>gV?9R<62ysqNs+QcOngJfeHX3pQ~>Q3)P{J_F{*<BzRA)YQad
zK7;C!VRrDH^vgYN{j@25Vsw4m`qb{S+nmaijK0kJIm`5xI)va#Nkg9{=Z=2;7$U@&
zmo~hLLyes7MUynrt`_(FWQR&KO{%v*Gi~5*WE*LCP4S>KgJoP<bYx+ZQ)rjRlxBXk
zhH%aszzY1Ov{QBaG*Gu&>Y$PIR#)2Hjl_i4Y^4oLRbAqz>J3N*^V>_G4IW-%aaqWd
zNumz2C;ws%%W)Wf>C0+)I)GXM8UpoJZ3jkgQ^~fI{)p-LSzI?1otIav*`Z<hfc4Z_
zcGSc)(+P^W_p|c#D#%3<;YdSIM2Ob+&D8g8SCMyf&LzxG59;&OSjW8-DQi#LvV~|?
zAMJIrKV4+X>V7sg-<-c;ieau*xJ@Oo)N5gNlYL5$2B2YHciW3q?E^gAd51@q3@qb_
zPy&0}vf!WgRCoPItDcCoE44JE(Q@|$LyfvxTVcCysf^0Kg`_ULHy1*%vhBe8w6<Jl
z@A)k*8R*y+L3aGLQSlZSD5Ii4iTV4{LC{X_sn%*UI_e!am>EfYxTWy$;x^w{g2#|G
zp2;^B3P)2YJ<O=l^un$HN=CC7Us~D?1x9l6lsEzd4PnPNg{lPFud(uVvJ)Ucq>?v<
zriSBNe(;5*Rypha!6`Ik2XjuBigdc97N^t3Lp}45E80yCxwG439{2VxMU~~*^Lx97
zZ<5;|rSYU#$7PGqF5LH)wc*7>U80PwUUHmjF{uQ)jMLq>5(#q+xCiMu$`JLI=xG{a
zljt_sT*$M&sA$n(e-(Tk&elyC49`ZPB!2!oh-tAbdsIqs{#I!#oNfSSA+$$cO74=P
zhwQniY_J}8FP$*B0MhJKwj0RqYbKbynCGzs`smhIlUz$u1YzrYiaI0-nwP)k5iTFI
zFeq1q)1ZLN0)92;)vL$Ju9w53VQU*T%URJQP=T0s8*ooGkl%2CUjBu9`U*KhQ88O%
zL}htNu-4by`PRtqe;M2;X4jQt4r$9U;zv$76$iZMDp|n{67u0!<j!<P_smB6UT0Hh
zpVTH>MIFC9>-;W2#Te&<M50;6?8})(XQqmarK~r5wA+{3^~ea0#+NxYc<n!3*S{AI
z10}Xm(b00_EE>H|)W<QsHBt0GyO>)xBwl2~+K?H9_gP+O{TxGxx=3_iqBq{I2GzwC
zOV?V}$3pLKua=jMETukC5Vw#JEm+vJ^c_#0z}ME6NqjVNvE3qrk~GRyu?@rC4Vxk(
zfHF#rd}y#@-b&!qg$<Hf0)EvOcO8V}Qbz_%=U>MQBmJFL{ayeEQQ-(^GX^XZPGKSd
zaH5bAeeBYppjRT3!t($RnrUtDwpe%4;`tloF>kTvz-szk4Slc+3C5`vp7lWK;e2}B
zk8?dAdKT+?9&vXzPSO;;b+9SkLcs3<$H2pI7(*2JIQGO|4)A3YvUpwrzJ+PiiF;{J
zf<{z8u&1k7o$qYULAF88rD#A(k7lb43=BY9i@kW#$dR^imSsQhC9<*WmQk_g^;0vW
zWvZBEkA{Q8OZs<zk3#@uZ<D$V9QL8ZhjUp#GL=?1c3I+pv^1z0vJW799gRgfQ;gUN
zBwFE2xKei04*IfoMtx?RS2PMmexnGJ7>W?F8oAj6hO)16n@U9NNRc9n_^zV1jbXaQ
zZZGLMkFh^rwxGIhAfF-2{7RDP#$auPNs)xCM8PJjhD3Ltz*PjK?0&VO!yt3r)sylr
zLb~PvjM~a?02OSW3ENQVw(Cw_>%q;sCn-=Mz#kW_G2=utW0INVqzeF8#JZ0Zw+lGj
zMu`3AYyK(lYfwaun6^?fSEk~}xn-j5{}7;1(Mci8R1ouP-+S|D8!<9@@S_na4g+1V
zmJH8Lx{wW&_r|6?17it&z=GM}(8v&Eq6^1K9D;H>hg@rfV3}*mL&*yu?a28)dB>Ku
zD6t#4p@l44tU2QToiDzxQIS<RuD7ATfXDSt9}O?9+CfM>krfemgs`I(<XtwP#s)nQ
zU8Q~MOlsSPPDkRV+QeHX%#)&-5rW1mG!E^o9pa~YZWS4?_i3*0<_kD}ci-R7eC}5l
z@g-RCH3$HOC<z)_(8oZ77&6$nah>f0veS%>dp4W7)0+_ZtEJ;;KRMwj2(~avuDhAj
zf_8QZdPCB_HvzNsIhpv0ri<C;DETMVgpjUepTma5`TD0%JY~-Dw*kNrIZB!JG)&$F
z6gfh#=Zlx23bQ*(G0k4@u<fXyn3-)e&jU|}(fks<pSVIX81eFhSF}jB-Q1|h`kU0d
zQ!$jmva+zOUY1nEtM0!VIcbh}FqQZ6xK_WEsYZ<|y!NfBdd=hJm5`C889%e{z3XHJ
zi>o$9wx?F&FqG-N`&ddFe3L-6|LBXTkQ5wRbHZ$w8}ib<s$JNgV|m{uAH+QHX1f!;
zN`hYV#mIj?2!91*y<e)u=5?g0#L^39aHzov_>m~Vtmqf1AcyqK7_AT$1t%B4kLA?d
zn=YdkzAFOG!7tp@D!IHpJkyYv$+FlTTTE1Vi)J%`Zd=wyJ$z^`d~?(UW>l+5SD~}^
zbhgOj+1yoU{SVGgbXf~Ci-J)Vx0EpQ{u=p)uXkcwXS?>M$XJK)I8i5i4jCmWJQ1Q&
zVD4yCmKPBkE05W#4tuSVqCdT%*Nhevj)aTIDr_e@I19|n9`bvz-ebH(2Itp<H@ap!
zAu5kw*}rpWbOb26tGPXw8#1>@^A%1Bg`wnua?#LV=7T-uawEl*?JubA{|~VrRY3Gg
z^SvpVJwy3#&DFnjdA>fD`2m5OhqwoTR>_n*a5>k7HVhPg0?XmjHob-gj;8NKS^^6Z
z-UbhTkBZhrp`Jk8ZD6_M@>BU$osA}0JhV24po375kOclOfMlXBefnCHHUYdH^c2A(
z0|^ceRizAk;OFfH@E7u6i)wC&KfT%UrKBi;!xBS-0<=AIA6-kqyc8T)OcZ`TGZoGa
zlarP=AX!KQGasb|ELQZOwS7SMw~Ma*Oz^98$>30aSk`^+;Z(_bZ|=sA6RMlN5R1Sw
zJz%uu<3j{Gp~y(XYjEP+ngb}g<k8&E#Z|qi>>Ast$sD}M_%^n#xa68I4mI50mVk#7
zxVma=NF=+%cC8YDwTlJSp+GVspKhCViWc{d3k-Qbf>uB?KjBNC1;COV^mGb+?<1W?
zfRVmX<Tc}AY0(7an(6_e&)0g_@?4JRDQb8Id^#q@r99q>2;C^<AI-DcJ=#jaf9N2o
zD%6qsyzh1%<|F;J0AvpH<3Dndc5~o^wGqYz(z!8B6ai@U1=dnWOKt887l;66fu&4G
zE(9>HQ^?eb*{XxGz&JHh(G7AKxG%w!&0&5bq<Jjz+tSiIIK}`PF!fNZcn{vfX##sO
zQpUKM_{HcvXWv_+K~4A{<93Sm3=kb3Ao~NTY;5XTUz@qwBG5dpH_O9tb>gpgN0<K7
zD8{$}AdY)LJlCLp*k3jZd=@;SXbXI;iP{9nL#m@Gc~E|Em@i7bSN@Rw7Jh`w1S^F1
z$ha8l2Tj|Ax>gAALV`WK5a>E;egH`E@^R5ZWO`zH%(djSv>Eqn-X)2)M7;@wfRR2<
zOgGi5$Yzu2YC1AfAm?_qwx7Va6$17J$5go1jxmEcU;CaPe@>ql>Vli4rB#I!gVG|d
zMgP<fI3u{ira?h$6yKj;HhcH9R8lhFVJhIj5HWMgUq+~WKiEt&!6~u&PSUn(>L&KQ
zf@8eBH*9ONDFDbwaP-@_2pSRJ*A~sCdS>6cr^MIS0xC~MMQWQ5Y!3DLW^QI?S9^T{
zPR->p+hvF`G5(?5<q5C1fh`xvGXNFT71csc?+APrun*T}co#CY*RdoGloFzshLj>g
zay0=K!+uP+2hg@mo2D7_IEUwJ=`1uRU=k+4q&{mYvpc13fd_X1SbpTs@mSCPnuhNi
zigP<uN&6s$HQVLco|9fTD%u=KKsM<SuE;nTjA_=JEYm!6vRbb$$I;o?;7RMW8#<;v
z2PJ!cEO=YHZrLR4KGEcaIRZU({YTBYA8Yj6y%X4^H0B~gA9xe~Qs;4kz8ti93V%y1
zNq~!>8J(v1v)kN{2#1Ki2P6mVouSpMji)+@$>4++98@w@D_H*y$xrh0#SY&2NZ!fF
zXsKYIWS#9DM7F)$8aSPv^Ml2|9w#1L3FyOXQDkE)&AFiB!#A?v1+P9;AdHnf8Kf;x
z1uh%4K7G=zgPEr*=l^!L?z@h}rve9|DQJ|s7udNNyVWjOwqljmD~!A#P-LdQ3qkhZ
z=OmDy9mn*^h7tUr)2HyNVhA;WdThnz^`O*nuAR-8L4jjJu8KEw_s!p*>_1sKZ7h1>
z4UOOkD@k&vWM32SmgNn^emAgC<5G({h=^*g7|*|e8a~zHL1NswYgY|vW)wAJYUc;!
zRm_|3ggc^KbR*b2T7!9_1Iq>4Z3@eEIUybd7no3<()1h#Z=t;Rf3kY7H-@24Tx|ml
zb=&vu1^<2I7c96@wxy*d3+%*FUgmKzJq2ESew-b$#*LpQ2}e9;FHP@VQ)xi6%AFxO
zWguI1eT;qg_cg<C<_Z4$$0s})W#q!tv$-`)qt-LwffbiJ^BXtbpZs1N7h@pS+xct5
z^R@pa{aS;3u^_}M85lh2%y*~+S=q5|;J}QLh3Ni<(xI9R_AEB2k&y+re(0D#Vb)ou
zi3Id$md*75y^=;hV3$Y>0VrKq5I>we)~@T34d=G#-l_6?dgmh?B;wFfo`Sco2|Lt^
z1W=L5b~PV9m?E>NR!hhW%s#okCKtQ!u*yi{QkVJ>z=%Z#49J`uc1Wn!(diyz7X46P
z{}7H@j{G9J=v+&Ev#3A5Ebj~(f#}d*zr>E*x53Xg3_KaEJBIrKRBFZR%#@4{Hs}C5
zGzAWC%Fvqv{kJhha9N6ls$=Qxef$oKHRHNyRD5ymId%^i3-bP}qk|b-0FhEY;u^z)
zIw;TAs3>Ay-Oz)E{6b!DLn3b=<0?>2?#p7)Tlp{7i+^a4F~nlB3>~*}CMmtHz7KG1
zWmHFX3`qfng*KQLoHSryWx^6E_KT_1`-|uo7d$#XkKb~s28TN84sl_ixHc*^JiQC`
zr5>QJGh~97mD@FM1CWZ$3`*~<-W$uzw6RggWssj9rd3Je=__zwE7!`}W3#|;7tq&W
zxC=!|EoT?yNZ}Kyo{9n^_ij<q5cvTNAYgpv6zJ?wv5d-v@JY0q=Q`j3-rDEQ$QSpZ
z=Os8w<JEarICC-!dU~z3=5WtbQUuuv7@s(Dv2Bj!6cp)ZpOl#^{OrrcXS7M)z~XTu
zEF4Zd)kk2`tY8D(ZS;!udQh*)8Lrhgf8ICMihWFlq1W$6vlvKo{lg3c{kr=9!MR>D
z5=3l4#mW3@8%CXfK<W{p$7OT5HT>HeWt~XH<!tLxK4jTIMj{7=Cu4?ObXMSu%?A=r
z5u0`nu$@kHOo5Y3+;>u)XW(<fj!F4-i@lgi2lu&2EA^kpr3?a35r)u+Z9DqAxZk5+
zx26A|bS<=`P}bG=5Bz0dEZo=njocT+3O1_-jNY)nfGbX+gbzgQh*(+GM*^>JOU%I0
zClkzI!1E%)Im_b-?s;ESyDJQ<1M_|d(9H>s7(gD*=sbd_LnJumGG@bCA_AU3kB>MM
zjLw2u(DM1h-F&DaHZ&sQ5F8`x`%?@{HP`%TZs8(iNEDHGO;PzP(CnePK+l1?5E0W&
z)m`8@pT+2mWklCxY{X=|7xN>W-BB|$H0IZ?mXFbiVO`>f%<#5EZcdI8aynS211BMk
zmmWb4!>i?X3~JU}UJoD#=cYg+^5_hHY&8dA(HV2I`FY<UXF)6<?lUwBHz%o|1W5(B
zfL3Xi^ke0GS7E`?m1>@9ZBu-X6pzvc&#yb7y%$_g5ztzLS1;v0oIauI1D}X9`kZFZ
z0@^`^*!uJ{Mv+nDtJf{o*@k-)(AgBI;X7L`Xe+BoTrYCjk5gmnPRrOqV+z*Q({Lu=
z<1<*nbq0@&ErzsR2LI6=;^q2NS-bE3fTJ>q#nBdl^%$atKxi>Nu>UGAh|sB?mT6Lm
z$n)#u+(wb{Xec>M>XAe>VksM9z<J>t;Itvj^Rmn4N}{)|-QHj)GBg7`c}Yi}_z5(s
zMQPEcKgsg>3E0uIu1uQ&n+@@<7`zG5ggLs1tOinxDBKm)s)bozV9E<GK;Tu3?6CLK
zh03~|A4_*cyE7}8uYzJ%8J)prt2$S>*V%&v%opWwgdWsb08#$2-p~d@0cRM*-my{g
zk$WFsypHcUm*=GuU2I$ArMOJ{5~vcvHKgyas+P}V1qbOvZPBgTcP0KYsv;P2u{5rp
zu^i4ws|LD@ljM+?h=`IS>=O^cFZ7X~TdXyVWk4#l`dU}TKyM0=l}JJY$>7;T2M-;(
zF^Q7Ar!oKKiht?a=`qjcbwBya238@d3qVi)1ubnnI_aB-TPlI!wt(|=&U`ka?Sj*K
z%s#z<cKq9m@{uz|8x?eMZPep_2f@)d26Gh}iQl(nVRl?FyBBC6T;3$j%x9Ck5tv=R
zyP}Uv`!Ewt<BlSy0BY-isWJ*AGb^;`SsqqyvxyBwLAAUu37sesEp5F{an4;M5jA|F
zv+&Y@@Ck+IprT`<Sm7f-8lKY?`pB#iajx@A?{(5nL#9Nv_Mym~45PActGTg9cCe*e
z9o#AmNLZ`Nv;n3B@-%0_^(qV67+Fv`=`elWrUZ&HAwr=w6AR7Nm%u>ljI>RTr33Hp
zKU+9+WftFKXZD2PJUqHaZZDWP=Sx<<dHeS98N8#D(*d+rC1?Z7_oF+*F1FKHzOxTR
zbj*OvLyI~zqJDh5Z~=}#1IX3Niu*MZ#^7j>AQh1MS1hO}U#mXc%lq`Jy>r$-TL;!w
z@_YZ-^a4ERv(?}zy!+4vQ(a4nq1Hzm2iU1{Pa}v=u!k0O%eN(vi1YShWx6=A;@YNF
z)^4pW^Ujj4$morcR_gU<Z?Xu=_(tLvDp2~dB-22ik6HfW(v$6BfIEo%xtB_8bx49O
zd~_9iX~$nKFs8<8f?2C@c6sxlezDt+yjYf%=Yv}p!$9N!IE?QssQm1NtSGL0)z$hb
zXA@TJp3rZ{^8IeLLbRJlfe?&?FcJsI988RZLk3hGW@l{3pBe&j8Q;2@y~qHEx2Hcy
zzf;scIl>Rx2ec1r%=Gb3Xs6^^f1e4brW-O(qOC^<486iTJf#8u?K}uVqs09NmYE-r
zaW}63l!VC6qgDb;Pg>j!aALc`e{G4e?T43tALUpCK)xWCa{6BTa>+Fy@HA-YAo42K
z;~@ikDI?n@vTog4Xf|58*orZ^772N>g7)(7!_HodQg&1u9U6cGspv@m^w2-N!mTz?
zW+rlbF$HMYR-OaqmnrzdIQEvW(%8TUzxMWY5vQh&V_T3chz=qe)5vh7Y|CxWr26y3
zD-Rz$cpTzm5jTy9m37+=mTZxQ7iuka8d-i;0M%#Su{PsQ1Je{8jr%DeW;<YpjOrq}
z->O)<r%@WBcHNhjid$le{1WjLZ?<6!bS!PI?|YFHeKcEt*kj{GUv)*dH+9E!P~rBE
z_nnW)feE)jQiBY(Z{FO98EiiRvH-esDSZ!c9KedL{ug(wJrX-i1Z+?Kf|eL06Tq=q
zTz@0GSShOnTAvr4Dmuq|fPI96(ic14elc!nxDGua?IJO74#?X0_XhI8<4hsI)h)Ju
zO6l=|j2|*zc&xubDqvRHXx0wGh@Pp(47|F%F3ekZ!UXqwO8XgXYO=k?nWlR2bQ_ku
z-A}nD)GtFOOFOr;cFhMc9UM9GLe^;J$}8J0E9r;iG1|3WTWDPxaJM6eue_UZ8oLFk
z=t($x5t7|OM~2k{JYBmC0CTmy52uhuGX9(fRCM0h0zZ}@$~|l)?H*_9lx>$nwH20O
zVTholWJlpX6obmk??VfZx0F*7>S;hK_?c5sOQL2hY-0trv>=l9%^|_&rS_cn8_nz$
z{r3np9Aj3;BxK~Iwr7$|7UR*1MkqaB)ATL<&N~d%*B`cSQfxERva5{}Z@z6i18135
z3?}vkkH@!7Nq+nOy#};D=p2I9*-Zh!3+1KESziy3H7p`~Ey<9U#-xayPSVk9d{5JV
z1Q;cF$o-U6FJcl*0i$t*>_G$0nBu4P&svCPx_+MFLbDD^IYIFXl+57Xr7MO2<Z_ob
z`Y;U5W=e96lx-sPtdFYxdvrbqF7{)Vyllooyr8eCC_Gk!DM>+udYe_&uypzfUUwh1
z`BT5Tetn;#PQ`KMlTn<ihn-t1nRS+ZXs4=2mK;k;PHgXQD%lbbpX}?=?)F0U<udp?
z9tJlNXqf@S!*8<7)3WGzlQ7gx#UUml(z^J9m~(!%2Yzp$PP8YiUM73%)=d}Pjt3!W
zIq1WYHC|$qvMhtaOfhr>S&>S{Uv+$gNAF^BQOyx;mTkkg2(!s&yk-D`)h9ipaz{Hy
z33%BcFPQ<zBNDlf0ylnT_KSJlSfp7u7*Iv(!8tS#S0$HZ44B=V=}F{E-LzmuzLPfO
zG}>|6B8RQphzZq^qA?kzb~ayIi8hLn)m_)@=2Uvr+lcWoFQe_`!Y9^~BAgR43INl=
z4deSivn~XYiJ<H0$~M0{USA9~+Nc}IgckatekdmEr9exkLaeNjoj3npLN=Lox!>ne
zge$?doJm3J+__5&3l|MQF?nN0tIOo~-A%-&`*tpm`YiE}P7mFjygvELWts7B<j?EJ
z-R$bf#@@>V?F@f;Pe?;o5wCmL#bB>bwG|(J9^*Inq`T7zq+w;Lm*PZe@BGZjFpCDD
z_C@|j$J3V#0R$8ESU#!*c!cEXr5oAKrTUn|wafV-_?+qGLiwL}Z0p`TFHth?365Q@
z`FVp))H*hfTj8y(x7pLyQdg2d`?{p@`$dBjU0n;U0;{~r_QtNBu*gmq`Hs#Q(BCl!
z98aO}k<n=&96r}d%nS&-CiEnMEw9$lg5+*CFx9{3?y=PFnMO;73>g1X@2vl8=)k@-
z&OR}ljXGqC$`&L?7uKl&rwbzej@nX88t)OrO)I2}+IFzwx`jjb9!lRbme@fH;a+Q9
zF5fmds#3|osTO6iH=|@ch~)GNHk*ynjl^#sk@#*rZE&?uL%n>ZRbk+j&Qp1><+n;-
zEO{9H@qD4`T~=8>INc!HS;h&nKUDu!uvdJxxwQ;URx20IXmNO^>}cHU;s4d|<?9Qr
z47u9(Qb0+IX?)I#ZW@)xR-!$4(cR>6{qUp46P$kxJG}_x7^R<mB;@$IB-q+>4W4xG
zXb&TyLkg|9o!dTl?6BF~@?G0Th&B-&0zz9t5_e0^xKl~GlB$=T*j9fc^1=*&ZRAKT
z?4YL66l(i?53gIh4u^tD1j<6Mbdb))LISl~S^k`eZRh8twhX`Rq8URO9r1ZyDwex%
zi5L)DPve1Jl<UB4xObW)gXB2pH!$sqtM)b;ewnh5Ofn>#ft+b6T1P&DB$xNn*4n4p
zN6_N>aU-K3Y7>-p>D70{@^o>+`Lq}RAIjc59_sb|AJ=lq`;;OT$x@_+A{p72tfA6E
zN`vB5mJnm#hEleeQd0IMON1mewyA8D>}$3OF?QJ*X6AR@Q=QKH^L~H6pU3a@$LW+Y
z^P2m0-`DcIp4am_{XUsp<_E-w7VYbf)qB=C`;_0uuP}#CF1`SYe__sXyD;i>wK%j{
za&U08)+nJFOh`CAcM$zjJQBUh@(V=$_dHqNVuo2>&_XInT{sm(Q=V=KIl5z;d=Ir0
zUim$4x7ytcCySwS_gZz=EHy{EW)ZkPFL`b#vL)10Rx(Ib(Tl)>frO=1|29be8=#?|
zvUqy&$^xEI@O=Jc+qRMJhP#Hw+Vsy)B^8zYk8W>kYrAxEoLXOZPJsHwIr(Hc$U&!1
zJ3Go->_2Yk<y9k{yMe1=f%DIdx9h>pH^zZld^J*<{{*_P?%0o}!$*hO_fg$nST^NN
z?4uS%tBkhW*`@e$C9q@qLcJ$IuMN5<OlNAY@U1xpb1Law%AnXk;wYDCZldf$Q_L)l
z?HTfDW}M<$SO0Py-@<@r>g2E;W8Us6R6bJrOnI!PfQMEMqvXUue|CJ1yvZ=zgyy_+
zsLWR0F`1G@Vl0yi=pl)9{{O|Qkp873@M4zUJB^!!WaUaj(jMGc5}?XM?;*zbPLS>$
z3W0uOjn=l(u18G|q38di^!4GIr(G{m4D~h!gpw`{m!f{-hT7Wjy^2mCweU|h4&aG8
z<Z;Zyy*=J0dj3KP#rH;hYszWkVdFSE7}-cGOn;L#Q3`__M<u{!i=Hkc&*nByPLBRL
zLUoywDupf`M1elX*Tvkh3v7ymz)z$UT=VXhhFP6veC8eMn>J#4fx%7AfpGFXz!~2b
z?r&2Zq|`)RFWKi6tJ286pSCjVnZ&UD&P9{HMekH0WykiTA_DXB@g2-p_NuuD|4@7u
z8g=eyBC18u0yGg^1>o?A<Irg)d(x*Ak?JeLi!u+hnj%#o1$Tzti<`)Du5E?U3*W$)
zOar1}BpT<T8+9Tt2fwm7b<B9K$FNX`3i|*=pLguo0V7_FKbF3Hd3qD1YhI;Z2{o??
zit|tM<h)HIlbwWJi^d0P0OD(My6Wbo*vo!`Jz$*6g6b9rj7zzR^o)#?c`hA)(SV)P
zW_7D=ob!frTpnHQz$1c_;&y9jrF?M?bj9=%)+VHp2>mJ(0=>?s@{;28+}xH5Hph6V
zl5dx8S6n~jF(S^#xV9fS1Eub&1=>}klLQ?1>dC*eTC^_l;`CXn=~M7HziX+>fld#K
zZmRph#`qrDgLMQ~g96Mx#S-5Ww|@zS!S7BY?Iu}$swgvERp62>-@Um<QHw4}J75i*
zW}mP1gY^K=SifkCmyg6|8y8)ZG9z$Hymxo3x32DJ=NI$kc$X5Fd{o$F?H`VqT<bMO
zjddrZZml<xl&5MgY*rj}WYq6n3hloEY@yb;eW2<`@a1-8aW#hkdhUA0I$P8dOJ0X>
zZfUtVsfSO|)YLSR@=~Vu%qp;3$*nfB_1=8FHabUX8HlsiS;shF=0huK8*2#nA~Rw{
zU!Ucz<l5uRZn~SnFt6qxT4qAfn|viF3{@_CzN4U7c6!SBZ!x&5l{DR}2%7o1zu0yD
z{Vg|+{Z!G3H!K`E@uPF5gYumfl+B>>85R?Bl39rM@%aGq#;DhxiJ5?sD<?^@^gL=0
z`_JJ}a3}2U%#SGn#UdE1BZ{=gJYllu9$<o?c_&ED6>U@&Uwdc?`Y);)sKPt;&=iI)
zW&U^}dhxF-;Wnyke0>aZgOF07%mNY&XheZ#5YYPsxvF2f1}v<bnDxJZYs&gxBu0KN
zOg9`h9l(*0c0S~5&)xS43aWxu0?5e2R0wP6-e+N<35#CMKNvY@*J^0@OB^5c1%KV%
zuRq!U9Qq17lMGpI#4o9VRwnGv!wq0I&n^xq_|V}MsE&r@XM{%gO(*%|5B%0!LA`_K
zaVtjuISmJXY3N5g7!d^3w*7cRnEZ8*M+#&Y9nfHzA7UMlKv@7Ei0#3L-`!3x%p#!M
z>1SQ!*X^P|edx?K=i68)Qv66&p))*XBnDI{evHX<L;`EfCzmh|<A9l>5l9n?3H&ij
zxdl~i|5a&O<vZHFAO-eA)8_nn9i$fMejU`%(9G}Sz}+Y>cP+3INB8l+^)0Pbzguzu
zgWf@!9%tmCSN`*Q%ZZ%&;SbOxtMfy<_?NUzIg$Xmc=4hGl+BpMEEd0P=pg(HXa#82
zql3pImsM{6*#`E{H;2kQLPWXu{Da(&S{^_d__rt&78}h3Y2Ut;_%|JD(Bg?utnwE7
zW8cx^zY2r@d~=n{%*A0zW%iFbOn=k<Ejp~L`w-Zzx~QsxAcePYxBj1)_CMd6h0c_B
zSo7$=oR)h#rE7mTi?ML?g5cghH248A_+Ur=5Y+eqK-+`aW!}I)-`t1s<G!0ZIz&JU
z81Xsg=H_6-1O%``BS1cAH-++9*C5+-`Q?w%!}s)}%|NIKy7#9ED<=?p^1n*aeCIQc
zhZKPw_TLXM42nRX0NnW;=eqB}fsY^}#uE79!*ON>)92lx|5Z?fDPsAzZ~b-eWOUmq
zPksn>h={!UA=L37EvGDBufZHRq>+U>*?{sn!H5Ap4J4@dp?1OaKI&LTq>O*NikTge
zS6=)lnH2HhkYXDX8R`N75|CZ_rMmoo%Zt=8@0r``$2>RCut!>jC1@ZqU@2iBc!tKg
zB4hyYcBBG|W@Hk8)eDMbP*L2E#@@r2R%XrP-|p9oxj(Kv127s@Q$Y9vsRy9p^FN0M
zGjI266iBDNx?Fkbh%oKI-(4$@QQtP2b&CexFhBdBZ#~3^h>?E2(7Vp$1Io?cfztWE
zIQJe02@o`dK?J?}t-${dd;Rm>ScaHtf_^Wd`ibT+JbLu#IFcTA|2<ChBC0Dh9|$`u
zfTNE<gzSdm4+XNuk=0+Ezh-A<|Jz%_U+S4meAZ(>rEEae?6;K7@5!D_lgD}&*5Ee*
z*#1fS^?$0XFlQnB&#m_LJhDmbsu-qhOHfb{A{j&fFbBtO^QzFiTSBuLwanjn2RgMs
ziL)>MPZe&Ts0Qsn0SdPG;aZ?u{4rpv$P+AaPNEd~9S6Y34}TpHu%{3ffB1jXyZ>!r
zkoS%^Ws=4%Zu+e|4&#`_VR8Sh84}1y!bqYHb&Nv^2z<ala4Mbu9CrscfH?@w#~XCx
zek(v_g1G<&1oAJiH3EJ}K*1(XD^wKGOu2gS^{qXX_uh~}90p2Yzd4luDQo@qGBXl9
z)>>b`3yIU6In#@~S&mfvMMZT{PWAhMyg_VSP|?)5ru_Qs|0Pj(xSe_O?*Bv21_JwQ
z&_Mq(0FE6qxM40{?;%CY!v7Gb3&YO}|IO9|7t2ugV654D)r}I^Q=l0TRP|NatepF}
zAkP({6I-Qr|LYCsNA)c03fT=GpY-3Iy7z#sf5#TiN=YpH#@tP%du!dFXmmS$d^5G@
zuwA*^`XlegbS96R?YXA1{+{oillmKvvGEyhT$PkfN}bFv47M7YNFT`>p?emOj4Ur;
zjOSL01QIg5$;_$=i%$Y__RU{(#Y-MR>T*`W#B-{m__bZA;(WU!sI;eS5PP#L#(m_u
z+X47`x8Fti$J|$vp%a=~BIv1(l^-WR>UvBLQ}}fmb0kLGaDoj(s${xojhp49;?fD-
zsekOJNEEQ`p8=(gRG?h#HS{XLGw82@?m7$gy_Ed?eE3w*(2DJWDaNV6;-xY%-qhhA
zpW2XCP%KJo@Mp+*%`PZKX!3fTHR<pm+%OHN&#W;_<*V}+7au0F#<qVKciBqtT3#4T
z{{6u!LY!ddV_+!nE=B0F7zV&vC%cqtWzr$fSBLueNUTX|l@e9F4=eBOIJZ^{`bwWN
zKUVFXp9}UeeQ|-I>rO7ZJ}6wm)w>zb_z*T*GfC5+wlLh~#1&up$1Y}9)Kv;0lGo2m
zrJwnU3RC5r!%$B=pt{R@J~wV4S&>tD;bGj$GuBX0pms6okOlz<N4e1#xj|n8Snme_
z1JEadQd4&7coV(FX_%n2(l&hWA^Bm%yveAzz{!Ohiwpl)->V+pw5Hh$qlMVy*K?H3
z&r;*?3eXa?22nrVnDHdK8%Hf^5thI76zB9o%(U7-r%q}42FD)zJ!k<sh`8$<yi-6x
z+Ug`#E7N~ZP^J&?oa=IfPt2#!!Y|)_#YzZZ4<yGerfQ_Ao2uU|7wR-jW~{tz(TG=f
zIl59E<L`IE^Lq8T*2Y*CmNb8_<@scwC#3GQeRC{etqR)<Eb+)8<HFa~%ZWc%W+R%}
z{nbglbkU4sb;HHA$JEo*UHX<exH;Z&Oy$BLRUP^%ay0BVjhp4r$<qkub_U(a{--j|
znuX3(@^;f@D>A)gIEuU++&48Efqxp2-$|WW-`G^A_&6iXl$M>^R0i6FuoASSygaFH
z*ZvSoXyVbhuZ~d=P;fnr=kn<RlI}U9B4?Y9VmBPMi=t%6RB?xoxqK6fG;i;79b-ob
z(NtbnZk<vTXqC@y$^as<n9}7r^!WM~Jo<rmc8Uvo^H}8JE2?rJdBeQRv@!JXNXk=s
zO#)tv*-bn4k@ks?m$aHHMV_ZGFeJSuwHSxc=@>3pZ>qCdamsYYW%FEFT$VO^me^G+
z&4w5msG)#inGVyxN16`L{`RL&&wkR~{Jgwv?-Uk#JhE^8tgQGPLv~KBXMVi13AhW<
z8Cin*eb<$jFJ_%}2Q0KHiJ)Y(_7sdMQWhVN0&bkd$!Hmgl7*7Vll!7?s+u5IrpVdL
z!67IyZfb1kr!%XuR?BnpWA?UVTdeUnaUBJCJ9=$GUmbnn5JNAEg=NGX`e8NHW<YF9
z^eBeFBPBv$847{HYYHPHAn~9JNZ!bnc7(pbr82Vxt>boIc38GrgR4`t>v3L3X*0?U
zTt}gkwfk^##Iy@_?|Z?$C!XB*o?P%258;(PA`aXjpHeqCYAMQe8Y66PasR90XA9o6
zY4LM#0BQ^tVreae#>cIB#MLZmnNVJT1{(gU&>Tw<76v-<@eSJ#9*1(=M_stH1Lsnn
zLA8r$#;&(^0-Cf!ETIhQhH5M5s?kA<*9yZG8i8y7G@~qd^U0FMzF^`=6i}d##&}E+
zhi`2VI}QzeR?M|(*=awfJ)A^ZAkJzD&_^*NhbBMij`k<mh&GkdJaB)ooZiXT%Mm_t
zALj23B@VlREDU^@mxS|JyW?nP!TI9YiOvFXuVGzNov5QWpLBoR28)FzoCoe#Fo!R2
z7G}AAOZWa|0l5Uq<$xytV_%g>p7Pc!q&6}hF-<SB!4a*kcAHBd(U;8&D1WlVyL0f^
zm$6B2-MwX?FLcS2J{=Lv{x6nvVBrP4zWnYM25OSU&%S+qciZyItE=ch{9Xz)>qM>b
zoE{9Y>*#PW5UAqCo#2tYcA^m0qv`4O*r%aN9Smm(Plg1zLZV`r_E2u&^K&<Cn{n59
zkBT)c@kX$=x*!}NHsNV178ymUi;DxXj>i!!r$vD)dkU!XFI+>6OFi9;@~jMCGchlV
zy>b^<aXTP?^BQF6u`MQRHPkPwuhmlb@%xH62kYJknCt0CiWN)L(7!VF#jKD@6vZ=R
z81(k>;cznFhixn>lNzq&5v8-qwq-(z#2r4=rx?q#MlUZPt6&do$uQjT;MYf~${DTV
zJ_`)?mRTT*ZZ#e4g$@MqTS81<V;(BIm$~<RXXek5qnKZi`gKwHlpVjbs)<nv_>+{!
zc%mfOl#*PCJ72@(1jp}R-xWUt*&h{#?Ad^FpfAE6U|uSc5GcI8{|b!ZYjAMbmRfK)
zM&MRpPgz2q%XBT6(BR4%F%WH3>ZiGB&*i_)I$1{_(Sm(F^b|bdYscZn*LLL6;%CpE
zz88Y>N9%af*~9BplH{-f<;E`E;ZTo{7XA6<c)HJImxvKoT|V8JdtJ}HFL0lO!A>Eq
z&=Zs13q?);+Sfd>2`%|)yPfob(Al!M7at9rG)o4Ie>j*Y(*M$5%MyC<);3!ZA8PLC
zh>UoIfri@`3^wVm`x$CAPbK%&JdqGGWU1MGOAs0)oR71fTC3aTIa6Z^B4uv>QZbjc
znkbk?4-B?QVB2}mgM_;&$Qxz456uwM$Hr4*;;!itg$-*4hE}$*tjmMSSL%3Y0VUlX
zRO~z>W$ewS*!f|9sYreStJ6W9nf#XS&h&0&ajkprt!Cj~Nt7U-buE8%;9TTh1wm-z
zkRym#TUve;;_iUOIX~6V+WMHWHUtez&|o=5WPNl28nQXsH#6^vMa3N4@!R{~!Dgoz
znz#uYwggk;z&A6WSWSPzKDsq^{9OdB+GgdYyjkQ_L|J@3ozFBf=;|&7w6(txszeSg
zi-}Vujn0nScke()c-ux}uzBf=GL5`uUr)p-DKb|{*nYfd;PIuP!@n#IPXt6g>q>xx
z+`1yBxqcJxapZ#01BsVapsn;<j@Ai$Fc>dJUZIn*G5}tHS7h}z=s|gy5eB$+G7NTn
z21M)u;Sllsq<w77(B1Gs$Y*f+qn`H>prq|K6t+J^nk-#*__hCpknN41?+X@B0rMqd
zn76HNc_bry5Se_QOMVJBTvtM|Ej{2c&qn}I9KWQ|{vNfA@op((Pv9_Je9zVR;epUh
zSS45I=>yzI^50GWm1R>(;uoIyFOJwap>L^Jzo9qzKa(7c802>wjW{O0!^vts^sN`h
zVmWO{g%9&F@_6B7+%Yp6H<+%(@7_mBL6I4JqH$Md>Dk;VsAGt(6UV%QYJ4i3mVxwc
zpi?yg0|nP&0CETXt1uCuG4>3&`~&IFicar>w?r2YiX+!$!VXG>okU4j5>yeq1)vN|
z`~!_NH9z_0OZbvaEcFV4GJ+H5O~q8XvWllaVWkKVX%3wEcs0WKv1TamQve{NBOa-L
zRfk#dSuBy&ASuuUqpfiUTiWJX*E6$Sc*iM7fi9o!fOFLW5nI*>rNz+nkm`>QvssLg
zZxkhs#<7%VD&u$M(We{W;i(zBxI8Bmb!^^w^q^tQ6;Q>hSl%2{!AF&k%m8@zqUZR*
zd@o4Lh^sA>42_)(IKs|}z4sM7{__)kDjk}wv#ZTnxVHjxD30H2wt?vwgh4;0L5mp{
zgI11$I4r(T<#gw5@nl639r=7Jv1)pMvgw%Dk&<aEk8_mR{J8D-d?PzqdZuOVBqPG{
zbJWVE9Vn#3UdX?3F-u4AW^adec8$RdG}GB5ubkC^b}%~ch6lQDma+L`^tJlu_*}Xg
z9DR4N@CmX~@;hy-4L$;!s_E7r8yx;Pd^0q1Ig`nLXJK*g%iAVUos=*<OcBt_;HP?K
ziFhnqQc}O1v;Am*Lt#~XF7%xMfb%$`L%!FKvk^ty8P2J3-tH(%@OjtQCeAogvPcyg
z>ttliW-#U)CFtE5>zi^t;tp0O;J7ueBlm+GAROF{8r^peba^k2Tb2iKxM|}8#skI=
z6qr>6VXT_duukN^6!G*G%+*hiu&Xd}tZRcV$2%1CxLfncJHy#q_d`k_%oSi0tM~Az
zGItvQj@?i#nPE-4yV-p8>5mufmNa<gQw)Qrw5#ZHHeVFQU}f9bHCcvkq>*+gKGAq+
zkJ%X!C3*c+q=dO<R-~4ns=AE&_3(*eJU9o(Zl^ZBEslIOEe(IM)xRj*(D>Z((Apup
zo?NttS$ujpc1gThvnRCn$M~^$5j`5!W;m6^W30gMHLuXi!E)Fy6B#-k<VjObMm^3L
z<ha64P?$cRr6cmkmGYw|-b({Sk-*APWJ~{yUs7j3<)`r|_-*`~%AZHGp8N0m=4r`p
zDNa4GQX$+Df`&Ebz|tFrXn<(N719i2i0TXsBTU>aIrf|pi(Mc86n-j7C`{kV^D~cl
z`xYg?%uA(4|4*F&l{=ssFqrNJDFLt|a0b&42%dWgo1`4ReGpVn#ICi5W|skUPp-AF
zUC^N_fN<>_6F`A4@4H9k*M5%-Sl7pN2B@t}<E3iuMUppdcf#iGKhzytjo+##-(>T-
z1~LUN6h_j|wr~1z6D%}6pI<4CRD<!Fsr5?VeHE<4KpfIde@ib1#5dIjSM4L{AQm!^
z{ulg}`DNkA*?a9&ba#XmG)6}VT|;;X!G2t6fdVUE*SqN-fjxu)IbbjvC!>xgLy(Kj
z3;r4aVYY&yzsr}a5nxB4oxPFi_3NWW?yMf~$jfm3`7VcF{$BMw6r}$6dO*i_YsT`s
ze)UxlL17AytixYfo9rM^+&0-rvh6NZusX$YD+l^ErTL-d^fTF#AA~LKUf|u1v#O~@
z7sS-{hiYM~Mh?{yYqP)H!=)9Cy8qm_=z|ZR4s{=Qa_g!u{s_ga=J!8#a^)EuDO?MF
z?6uGlL>S<>{SGkjhzaPJ$A&XqICwXr)ux88UJyKfOaIn-$?hZ|QZ+3PGL4Ilf)vCN
zLt%)j_pjc|W9+8^M56;XUtS3-PJa;cw{awxD|jw`@3UUnly%m%QYF9%*yy+%zNrA4
z^gXQ$&mNxA0ifL^QpwAma9h=apJP)FKxwnL1y<tC+D|@_vOXWF=;54|UH~DL*@Wk$
z2U*_i0+O=~x*xegy!ho}$50lDPBmMW3%0qCW2TYCLM1F5WG-^N%U$Yq=U8w0)a#Li
zI!gMhf;eaINX3E2SShC7_1pWvIkPJBmskZ(h#d~v!AtosEb1p;T#O2g5I2p5UfcT_
z&K$hZvt7c``$roVSF=0e52)=Q2e#5jgZ{v`cR-+3*`~WtN_@D)!iTgnUA_JVhtm7i
zg7x2yzvBwu2-f}N(<8~OoB_DSn}RX}(1%@ZPy|x5%EoR3;lvRlL~)LtHU+Tz=qpRK
z?G_xq`{Z3FJ{uG*#*DnSY;tIkmmqvno|L%u`3VO60(S1ySX{eajIn*iHh;xB!GmVd
zuTkOVwI}b-`vKpdfbZHyxnc@Kp%U9EIZ6_?>d*%yGH*?MGbmu$!_pl2_rk0_zHx#j
zFlh#YRpvF6tK%{&pzQ6*FGa98MSf#%o~4ucpr}AFApUH>*IG%abPcB4k9FjUqD<XY
zpOc>>@uG4pg*uw8yysq0tl&XGp3Z)!ewq2B3WDWz<#Kf~@&&A%2R0uZ8iU#Nhvp3^
zS_emif%CyTjhzY@pb5Vh`eaJV-p#t(JAY;A(;5+Xp)ARPy0-4Az<%!Cg3>*%=7je`
zR=Z91)t0dKrClRw44v>hT`tSLTi8pMFq&CZA8HlKtpC9Mw;&*ed8rsAo+&)bx$s27
zd^*hy2KLeKUmJfQq~+Xs&}$E{Dh}S-^9kD7#0WfUm}0GdkIbFpLXQMhxdl%MM)r*!
zP?a^?c|P03IQQ-{Ygho~#n$_({XzXCh~x!56O_w|C7>15r$E4!p6_!LTHB9{TgDpr
zZk;;}`J2KBl05tcsk~MBZ3+zvi~3g}Je*FGRc~5avsvMOMi>~0Vl!5CJx4AjwB3Ue
zcG3>z%SQG<yLeOtuN8PJOE7enFb#M(CCXL@IVEbPbm^IUz(%}(ttK)YO#S&A)-Hli
z`tI(uO}oUo0ugS|I(nHR9#dRZSm|EXKi_GmM_w6}CZ_?LAOZz43`cFulsGi+gGTEC
z@q`CX(58#oC|o-USn5^+M3I0!aZ#|*9w5U~qq|88a#W0Y<vr=adXP+QR9xtqsU%9n
zE-W(<7kboJxzp~T>RBEQET`z5<CsRdpQd`F#&1KZ<KhxcNEyC1{q^={{w*WyCmWIb
z$fE95-SA1{;W9FeQilb(cSklBS-&O>erF8`&|I+2F3D$o4-I#oISTW-_k?a<0sgJV
z;(G`&&UlVz{fm^;P}=%#2glg=WO1+O?XeCyu{jKgY$pU41zV+B<@xz2*R}X|bMtjV
zcd{&dlF*~CH;?VySX_2TOI@W5fVPW%GLC-!<wBtgVZypWTG4AtINoitKjp#|$vz`w
zBFfLPr9r~qEL8obMir5(cME7U;p}5IFX#$O*!AVP^W19?5HapAup`GJi;1p{Ynh@B
z=zsN-&z9Z9Y}dN&D7ggvy$`j7Irtl7kH?D(-b`qWp$dRqPwe&Dr7lT@yy<k#lwxS7
zfuXU%S~2xCo_ZP=)G%MOFXSY$nx#3e2&oJ5tXRW2>01&Ruez|nnio(X(8F7HVX{5c
zf=YPnTMI2p2h<af8T?5Iz#VzNL-5J&)jWO0q3r%fex2n+-c<*u^01#5qHGJFKUrVm
zmMNnr^g?*hB-vWi?^%~~r_DA~+^%S^`7huLN89(0BA}Oc^_zWJW3zo~@zfjF8<XB~
z7sl(PU%e}~$#a+(-skv5%lwqA7#?03|3m8(edW{P6Fg~A+G{!V|2((&K}#u2s|7Ry
z&+~_?2b3YN-$E+1Ruz!4(r+j>;g7Dr#L@Heua9AUOP@5p9zUeYZAL?;HY02B^V4&f
zNkdM01IM$Ro4xPB@|3le&gTUs9N72*Vt<!^5uO~ms>88s3q>_=_u&D-7iK_g*0`Wb
z48<X~iktRi#hhfUInXNHw6(PY%2n>vL1-XT3B2V9^rQ}BPIxW{T9&N@_qck}BDI&~
z70><pcCWs^a&i8m6<7G}^9mnC9;HkcHu`odHBPo~?AD=lDk;pOC(D4n@|pHS5zrz;
zR)ksyKvxrxdLVY`bf2k_Hr(hn6dbyDQKyb;_ePHR2E%Tt?^SNnD9VJBRQ$}{e$2LT
zI7RTZV7ax{O${N;_a?E>3J_0r2oLHPpd8D*EhJYyMb5J}gwWen_?E6*ZMaoAPTf^I
z8b2WTcF$nF%BU@aA3$mXx;war?0%oOPqB&~(`nzpr+!MRY=a~n2t|*W#zujV&h>5`
z7{Jd4+Qsug&&L_yb7H`y))=6E)8Lo>M$%ncuIkB@kh=`lS3?<~9+GRehLNgF8)nAG
zEwy05g2snfH3Qp1o#G`NH|;@BITGSpi7fvo%Ah;(`A5(X`#C(LV~AD#`PTPaMmgFD
zzRkv`HKlqF!_BU_I`ZaRqqV5g`G_hzTZTo)VMgNYob}!m<v4m)U!D*3a0D3g-+|G3
zgfj6<l|Fv_SV1K4?zjbOb~5YHA=X_(W4`P8KO|9u>hJ0#tmiv9(k*q{P;~z4TKPx8
zdsj;RuB$h#Kt$|duw~f=a9m<~Nsf7y^Ow*I{t!701o^&lnd|}GL#mkqh=pN5P{Rzn
znd2V&m2CrkU5jJam7_8`g4}k@<c0x0L}_?ykrKZP1*DE+FOz~bX9%V@H4B%5a6#*4
zO%E=&X{@0R?<<vM9EfjtS`Aw!_qXkj8~>8K4`O7;suj(xY`uInlo(?O$ldhi5%dCF
z(K>^VV9FZ-%XKhN&WXt>835~UfO*??&d(l7?qY_*(0r-RKZi|DS&|`VmCScwTlCiI
zJ8pVDG_jJ(C|_dl-Ou4S{j|<=uXrXw%DQ!HcFV=8(er=$KM#K*AHLd#I@-|?Gm-zL
z7?xk=mBmrQy4lv`rl3Jwye#u(5e@)9g6r-5Ik3~`Z?I->ojtt)+VE<UvY3HrI-$MN
z!dsjRI<!sPu4av7;NF(O?C8dm(%p};3P;k5pIuLsP>dX`*7#Zl>|qB3(>VHUYVcup
z9<{2K7+Ksk<J;DS8=?ZOHA>c8P+eQ1e|FNk>cJCeSA2Up|F7=QbOEyK?3d<Ov^&l7
zQCTGX$W64&gERi5?{v)IqyFi$@sCAnYI>ADUj@ta^lws9eBGxqu1M_{%g}fQPnxZ_
zyZa)^sKEl%R=#1w)y=68eLEO<OszDqm}V8F%(@5I5ZXW!@0ii6zqEP4!O&0D8OWJ5
zyfw*wOVH`-3V6AiN4KQTS7zZ;wu}A5TpRDmL`M#wDhfQ@Ai7^C1Y6)8CD__UpSD=u
zeW~$vC%^VSuX*|5G$L6?a&qxX$I^SdY0*bm1?RtDXZJZ$1MO;ceT<&NxV>exvwf~H
zn;g($`zVcySs)O^t@#b`ST9KE_r9tYt4^XmIcj4Bw$t2Qap${BMn=<V&x-EOx}zA_
zAe#vI3Y>#}1GwJ_^$W-R*4K0QMW-)Jxqf?~1qVMdSWE{H?hghuudizaz+kb)TH4su
z7%&jz#~(hs;0fuF#oh(w`RdtNVTNQ4qevh*pX|sc!i)Q4KP<qQeUF)zVPxIXye<Y9
zeaH!)U+I&VbEEdYfis5Tw|4N<z;aKg?cr$vF_V}KYCv1S_qz^|dVNgl2r@tO{M|~B
zXx4|MLH3Z5@W__b6HmjmX#04+iI>baVkPQD?!0O~8|?x*ou3RoqU<9Le<Bj|+)Snn
zN)$6`5{?TDgiv*iD=%76N7r9!YA0D}lY8c|CLOkYPxqx%NcO~tLIXBBXGwo=U6nW|
zm((SM+7Wn~AQBR}D}r_Ya@9@WG@PeSXb9me#Pk?c0ytyXaIfct$aoZBM$L-fljNbT
z@w3pn4raip)aQOithNXOvVnAb`I2|7EahAJUns0=CW-t}=yyR6ZY}i1xb*s_eG@%l
z`3f^;CXEw?n@f`{l-5VyCPGSu;rSg4T>bXp0f1s)Y80$aAX}Rh23BbPQrdffkVGd6
zkZn0L4#A}`LC5S;ROZK`vz!b-m}b%#8m=lXt3+nwWC&UzJmDGCw5=vc)=*)@H2nRM
zd=z`oMj<hGYYqpLi^V54xN=4ozwDaT!6!d9G>bPjBEM9R&u5;O2fxpY2-?L-VF*P#
z)BgpWOvT;rpa(E`hNkiTEx@J@28}=sP_TM_7Pq9bPJFfnbTMYqo}HES!UvkWqSXlU
z-Exe7?)-3<eE&Vk=`_57d$(_457eE|-gs{h%QMvT_`1mnmzAb-L@Sqy@`CL(6qOm~
z=GW{s-3>25mws|%H$zkkD;)%4<huwuiM?(R?h;1?P>8O|`iTi?SS9_s4Jg3CIcOxd
z#hsELf308^KdW`&Sh8%hz`JeXK!rX^&?(&DkXC@|#e_oUrl|MG@Lmj7u#%pBbHx&T
zj>8|A4LE48u~@5BGGC}*Yk@ET*xdClG&e47?$5s<s-Yq#GHu}ujfu=hX7CZ>-iM&l
z{2-%}J*2hG*u_}R_4{R$Mq3an9$q7`sFFq1^Sk&+8n2aBjzZMjy<?~W>2p#Tf@Fb>
zMM;;{?+68wZ3+`+V03#-mJCC<3W*>b=VT^sNr4deA!r3eWrP9Ic=poiO6VbF#uY8L
zfbm+wkBK8Opj5)QB>?S%*APMdoeM%HIh>x6^~u0XUv7b?Mg?mpYP{T!4Z&@XS9Ys|
z8rU6+?>*pXv3a9)r0cwBg9Kk?6j~ged<n*Pwjxj7K|@GX8Sh;BJqqL8dl$=hF;AKN
zf$Gs2X)l%y(sIM+BBGy);sk*5C(*2&J2N{&NHy5(rDPahLVG>aG<KliTRM?9hV(N7
zP>F*U93?_wN2!+wzf>p?vG}*}b2yK87+?w)7LpVoL8NA0%-w6)@_cqBq2ZQd=(D16
zZY57weztr4q4Ht`?)^-+-=gJqStF^Vz|NF^E)J0K!80GxDTNY(Pft7kdrM+YX>I|p
zAsIijI`4<Q`Z0e6Z7_r3tSd6AJ9xAY-QF>hSri}KBL}^r{7z0CmZ<}0a6?(L-th(f
zC{Pkw_X*+HX-ZZSo7ZQcN~MVG@>uQ+^JA<$h@+%qTKv)n3F$6i%}<@HikYr72SYSC
ziFsT*$~}tBy!K_nmwh>Lrc~DX$$X;Ga|%|>&^vVVYt1O!z-ZHc3UO&Yi%QAT&b{cq
z;4*;0K>8JXC-~%@znw8}2QY+Lb2ks3!;-wcvaGVdME3c!WvuKT_3a6Tw)R1eHCItV
zNME2k#v>%9XE~t@!aR|6Ma-QKZ^(VT;l5`l$xDyg(6>1m?O&SN7t*PngQl~U<};=z
z4m?&~xwDXpLaazXDL<T^a)R!;*(c{htI5yD`njUdywDqMw5*^ynp6=&C%tYCso1zk
z2Hc%%m*!iRo7bRt%|vx78!5D67fKzw{cCy7E~h+I=dR$o9&H?57G67bVLOFUV;GGq
zUozYfa+IRv^zo^&Nr9(VA1`4*B9z8GN*4I647}A&W&vua(f@!^e}hk40%7Lg5$udA
z?^zuhY31E6<d_U!7eJl#i_N{0f;7i2*_B8cdU3AWAi!9x!WlR;os>?7K{u52DUBp5
z!0s^_VX$m)#H8VOy@*!Qkn3XXdWx}gSj;y7C8Q07MbE$3uWCdsn`<+TgIyV(;S3#b
zI#7YEHJAjQ4iRL0498K;`SHPvVHrJvG|uJcx$SK^b)(5evRkt|O{<dkQ9bx?w7=Ya
z$h1_!P#Bus^q|RJ9k3^VfLMHt0`~S<^o_qDF=9E`TDb^^?!2bAP~%c|PBQGX+z0E#
z_@cI-z+cafA}k1aN_9`w*ENOZDQnx1hCMD*K4p+EVQ#uycx9_a?dwoeyC%dd$kUbd
zyiguD;ilj<*L&T;$#qRh_W-4?mdpELr5M!TgfiwSoA=c|@1&2r8P{gU26*L;`NnOh
zT)DTL9@}|dTe5Z__H&d>K|e2P;`Ze6s!gLyC4Q5Osi{GfPFkPcOjrl^kgVZE&<r_p
zd!5Yk%eF@o<+3{{?pV8Y**4J~L$HN!%BayK<@J;qu10h96r91APCa?$npg+jtVrED
zMhkOm!+*Ndnv1&ty$2`!IKwv&Tuo3fN5firjh#2{tw6&wQ?b?pg-1yR2(H#L9`7!a
zCPb>aunhw+^dZT&;l}dRalwPWS%pz*_NOYHvd{3-#zAG*mOmVHvy2eETxDBjv;&qu
zZ+ReCkx`<x_Q;CGlz)(X*TO*UT*G~SwqAR~mFc;(WY?HCWpw4*qL+FhJp++fi`KvY
z(0>=i$t9=mAHE$M<dwTPoqG=Uy~h4EiiS1VtUZID2&Ib&ec17nuIg_l)UI!%s2m!+
zWbs;-t8-i3wzlw6Tk{uHL3$^SlP=6>H^u4U4NZ*rW;R1suvg_5Oq~vBpD={`&3`Gd
zquQL7FogMI&Lzv8$m1VPSN{GM0zMZYkAC{;hG)`V^KqO#az7U8z6w^}9Q+dPt0k<G
z8;J$b4Wq#0-bc*=R1X{Oi2^zZKv~>HdG1w5<;1NF=(;(&Hhkdo-AIY`Ry8^6z%VDB
zknUmhW5)BfdR#x#sI9YYoAXm1kBjp<Twk_$7J6+=r_LbLBEV#3cp+J|7H@3=su+5d
zstGQ96zSZ>+#3rj0pnl3e+h1^5|<GYKM*)h@M>@)m-lnJ*lC-3Ej~rz`Kly)lS=Qb
zSuAgQBoV8<_Go#|J(XLV?7gd|g8H4CyX=ztvlz}2p}5jUi7^?0bhZb~B|K+Y)Yma(
zIEtrMx|b^jRXrnhU1**vIaF8t1YoJL{-|u3R93IFYbD53@cfvBiS|_b_A46!as6QM
zQHY=rrnP1tPYE1pNNRzJ_S(#%OeKKk(xAZw04k^?JqId}q1QRfodq|(glW|zH9C)V
z5hV#!Q<syoUQ$4Efa(D0y;3Ytw*=L1sTs%}y?sF8SwWw>(J=NYin}2bs=t&g?s|zo
zFBpz6Mk(6DIkae^s(VE~I4*|aqO61Beak^U<%5yQ{X{u_6z5bdBv~$nT`G-;?dr}W
zmh{&yaV(w|1)fL4M)Gc++N1~WWAE8Ca4v3Ya|Hzk^a2-2n+28qks}mS&*SI3#wNkC
z&~n7(CZk+E`x~w|MSJk;*<Jds9OTtT>{XuE9*fd5cDQDu>OwsdQ6%Zqb)cd+5GPq4
z9njB7apBDlrG%Jo>zA>$-$<URz{`D;k{>)-g`3k9swJ|X-@mza=t7)KozUk*b459I
z3w2m>)`tPgTnTIgf@}YpVJIf+Eq_`8ZpNA4QR3bn27Q5YMjJ|=P&dDnwXX6<!2h0A
z3=nRt)Lqf6H-dyhDih!GlC*4mrXaFo$h?sY>Xp?=VZL3VMkHsKRa?YKD-QfEZ78k}
za6r|gq_AtzYIz{d5vC<9p^O4sL{4xQ;z`I}{wnX#BF0luJ=tzL(a%+S$k?8K2?zi3
zu!^psYv0DONKp#2NQ<2nILhCs&R0_xEUqkX*mB8j&Vvl>Gn?SSaSIv3TsI_OK?8~{
zCpx>yeOPLha>?Nk*?~93&q|)tH$P^?x04mWwAuG)-1fq(OnOfhxLFo$i+ge!({}En
zDaApUFJTp5@1Gp`TdHzap6GAE@4fYBpN#W%N=1;e-0T8Yt1$p)TOn|AXv=r@W!DZv
z{sXP4smt<%YJNx6U#huXu6ecIyCZ3Q<TF~(e}vt8#R`WKfdIucWOJl9x^#qm8f+Pr
zbNI{LtK9)==iAh_@OyrLCm4{FEh0sl1QJjlLfld0*nYSDvF}SLiYlbX=<MD?%kzTH
z`42*$oLnXlxL~NJg$;&o^T>=aD2E(Iu+UH@tKojq8pf+R<?5sfjWsS9U4IKXI;5;Y
zduMu%Dpu8LayluPUdKBRw<qo{G-}vIpW0BnzjBJF;RIjJH?Nk1or>&&H{)jtwaTc%
z1qz<Wah`hR5+ZhHgqhckOFBiRwF5eW`U(9P&dcd}^kug)W<!XLy9fJ-sd4u+VlBaB
zu3{VT-7Yz~awRTXR6?(>u$iNtqmFYqtAKgD14&XpE#_%Xjt_?+pv8vk@ANqx!Xy$p
z7-H=;_@y4B+Tj`P7x=NV()8vPevn-O1l_TK57hW-ljxijoK)2_Ksfe*Vr7)p94Dn+
zWvuGjnFH;@r~pN{8wy~^w=;(4Qciqi+D)NIUu8M^YpBr;j>H~St%KZmTS#}4?Xowu
zGO2Db*((>K;ly`EYM28I(}>WI2INDr_RdpMt&)+o)(JcEi%4Emb2J4wfJ7_1);PDS
z%}o!BOh4(mi}QRnH+9+GyGGj7{#4e`>2d7D7~ehtLq8EenK}~nyJW>1alyBVGfR9*
zw08xRGj&pp(W2zK9K!OJ#?xZ4{fee5se-$bJmdHRQK*>o59|@k#EQ1m40lWMwOvYX
z3%T|^$GlV7r_%!PeC%5LM}X8DSM0hM8*uuTPG_g_8_gshh%Tr0yTGtO${9xBOgjH^
z)>)tOIy`+wAw5ou-|errswR=gK7Z7qnB?AhsV`dl;EnC0;L-ERG|2c>7R31FkJvoH
zpP@Dj1C@0=@rq1jhKCRjO@6|Og@rMzt$qv`hh!rfX|(^;f{Q})+yeUm%#UCUt`ww*
zn&8zr=Ry`3GUAybnmrSAXB0AT5c4nu(g2Y%rF4huQSeKj>A@8Qpf$|u*-#w(U9;Lr
z_O|Ec?X29qr9VXn`-IdQ<&*AfwOB9Lyfg7vdIG9I7(u-GPb4D#TH=E@MK5pBZBLUS
zN~~y$27HNMDn)0MtCQm--Al@8q!}O*7C)VuuX9^F?V+na71VL&5BMaURnZ0w_^BcB
zZmEX0_sl%|FVK;3(^n<~RzDpu;pj3^;dCu+NKED`IB%35zI|{H%*X4&!i8i6Mv1v(
zY;L&8@3KG`9Pxd1gH~7A<)+M&WFE6@1u4OHQ;N6OrR>Qea-3C3H_hhVtc$bde!^ac
zg+g{X(Uk1|flh?z>qAR@vj9#Oid#@mSedwi5O?Om@jX)$9XvNVMiC#YOY*%!U&T@%
z@EZy}7akdyG%OQISZ)H9fSI(v09*jmt4*{z0b5+V?5-1y{l*&xeR(ErAw@6F<c0^a
zT?>HCj|Q}E0Q)VWvSc~%DSWtaG;7r9zPihDN@Gq|1cG_>dbt$O98eKd{c~hT>6TU7
zQ1xe9H~7O2pE!>-&x^i3nozwBX2rtJA+&P(O)ecp{+Or&v6#nMGK|b6y+`GIlS#b_
zJay~OVu~ZkQjESFz>3J_GkG`gyA4C0^LKWeiby@Iqv5TWi(+NO8Ps=KtFjmqVGVAW
zMYeLREj;PSJM864#{Adpr`px<hFx*#PjRFbQ{#exvi?(W+OMP4Nc+cXbW3fuYk!%L
z74khsqsdF*Q%$sNt{JDRP++`2tLJ{M&RoEGAw#|~gP1%S2=YiKEk%(&8hD|+z!(fW
zHsJIFs7HPi)@to81&z0J_TDX*)|!-CJEhGL^<h0;AcWsa^w!}CSTk&kx5v7N02(>U
zi}!a;h)=l#8FAc!f8PH|M)<9BB7dxd*kR-L?99ar280sRrQ-<Nemy<1kWvv5XPomz
zVFe`s+KemxKK@#c?Mv^g-I^!5nzX*1A+L;=6-}q*w73^7S8G+pJr3nNZ^afglU6K2
z+TN-><;kBH<vJJ$qzB0~jIzfJcK~sv#XnAad2?xG#z=T}6UyY0e4E;24NDI}eyVVp
zlE}0pztOQ811pixm$yLtWH7xH>YFiI!VSF2i1s3t&%}QWIWE^5HmsN&*tJWQ4;XEL
zIJHCeUSSRzj>U-*B<aEptI%k+CdfPiQO#j9UG8Xe2yaA8EDbK>M;RRfUL30q4j>;E
zRI}Vdg-Ip;(znj<JsJ53V54ZW6IUU51!A%tB2#CL><euHfFpRu6KJLe#+%*E(e9*C
z=ZGT1Vh2&?9lHcJIYrlY$)s?KF3|S+OtH~G&6i0TVxi^?1hkMiXUsV-L~M@pa^TO)
zXruQ`&nBFlYIvjPH8@RHKHo{kDG`^G6|5Ep&DWL2yvW8)bauv8CpmLGdpTH09^LY-
z-jwNynD80wZ59?QF`nRkkn?4P0btQu(ohIZK7H2eKJNh?z_qj|9+02ELIj@2oa~<6
z`7{`X<Cs+#bkkpltuOB->@~#2R9nq1_*qDGgS%*cKQO@m%F^juvLg;W7EF8AnrKg&
zIjSD;c4cWs^zOg(N10%6m`tiQU+EUyGhA8~Dw}9IrWWDEQEkr7&%Rj=>M@iV`Px7_
z>i{(UyH&6})H!wxZq+dx5Xj(43fPp$p8T))XL?;F!d|4jL-+#wl@&wdsKN}(PodYS
z?p+}yek)=(4IyCDY2A#jsSJhmOc{JNVW7Mq?unL~F8=d?j_<0L{mLXg<*6Ds%uT8s
z#hJ9&=?KXLun?ZCw^pK+I!?9IX*AOR*i^=zgOYL2+b@%iB^@%6dPCogUW}X+A+ijJ
z3)5*COd{Q61y1w6rZA{+7&1w{Rzj)=fQT#32i4$^Ma053m;^pqlG$5L%ooJJ_S*C%
zZO^UkeX{a)YM5HB4_b=qX`0EDP_K&_-@{#FAq*;!&@;ogT6?UEny4+2Q5O7~aK0)n
zmu=@!UO<@us5`STY836#SzrgH6{z+ON5jEfS0X&>tWSG_BKRg-k3A*VKPo3bR9cRi
zU0;pAKY<eAbwiqYGj}?qB9)h_Bc{`)S{&dwqLfi0l{W%dAU95n4<xL!qmg;=0(W$9
zxdjAzbT!9TcHdREjiqq5bh6@^wat$64O6L1SJ5|hJtFkbdp@(!=3umNLh>VdZ3Fgd
zOg<`X@KWpiy{jzrwQ6YRQPwfr4MnlXS{tu5c=EnmJ0Mv8mC3prS65q+0^Z5-Bqxj~
z8vbQi(+~Cj{i+;t!KXtR^JMy^ikqR3?!#oZ#GsSCyH)oJcI}RA%E)mT`1BgU4XhJP
z#VEF2bHrUF)P5{Z=L+g~)|sKy>7ig<mpX_@`7ldiV$1PgxS|>FmHiD}<cl{9Z<tCU
z-YjpDgZ*da<u7&THy$2(et`@=V<yBVsNZvWynri#pX2OHc+_TY{;btc5L3r}-)e0$
zhEuB>W3Cm%(KpNX<jF+1kKUx11T1kL<7@$)Aw&C6gUAf~E;Hp;$?}BE%tJs{b~3JI
z90tb0?0`6)Sl718$7m)N`0^VXEQ+ttHHcPi_waQA>&5`R>Yb|!Fk1<IND$?Tu8MY8
z*&R}=*aF3)MElZx=S^rmv(I&*%;_QNgz0GORIzheTH*|uGUsxp#WeKJ&QZ)ejUpa<
zi*HF-!<c#(1C_zx%6kVRXXQNsS!smitIptR%S2R<RVA@YU}i8_vi1}+*HDyq_Lr>3
ziIoGHrfE{QYLom*Nw|<j-*To$a5iD=hG=P}H9CWgz*5V*@WlTgcu6qA>@OdOI4`fa
z><L6&hgk1(%ZW%O`~Qs+9~FGL>lTnCT-BvcF04r|8h@UDOp%8iA!clZNi&3iaEhnI
z<};y^%DVpogn$J#a~!-|Rte^@_wv|#hp)fu7%<29womz@pU|u(W=yN!dx;)+jVA8d
zyFo)mBhAo9J#A}g{ccr0M0z!m`mV*T@?sLI!ZTs>DnU<n^39y~QLn2Ya^d#RTMOG~
zmGh!%nMorqC&b<apxeRw-|yB7^l~H=Sua2lusL;nbsE>?MHZI4`mt488b0vW^a_x^
z-V-`{ZsEMtsx5Q2H*Ft{^QW-{>QHR(Bii-H@|IHy09;<EDt>O@qn`AcxQVk)L85!!
zj(m=Hp%lnclLCyZh4^amCWK8y%%6}1Ywc6^gA8f4TmZ2s^V&ZHh0heTq-C3e?p7P0
zW2PE6j}hNo@|L`-<;Q9iaBa#VJU>@jkfnDp%1$hDNi<O9F6+*KyEN990oRr$)Ys4u
zYeu<kiXwVPtK3<=-!1dKkSeC0>^_=lw^k07l1H<OvSiwj(u_^LI?zYohC<uYZqzU2
zA01`CNu$ZzCELK7gIxj<0iCubY|JqpZOfiKnwF%-8zu9&%@pqy@jW24|I8?RM1o*#
z$rCkuujhLPKf`poARH<K$dB><X-}`1x;G;}c!sxM2byi}Hp1FU5YRoXY-3^)GAJz1
zBu;o$7=KS%Rnp4V9b%Pc>yng1_7ByJ!Ci`V%VCWP*mcKFfqKKF11G?TH!_+E{MRs7
zHQfmnsvAG_yYsip*CU^|iIUc45>dsLnVc+)vPG)xNb_^Iwfbe<P$Kp*;vR94<hDwb
zpk@_Kd@|6+m}+r4C*Sw`(GA6<1Orp!A@I>2WDIhKbb(#81t}DR_2%lgsWC1+7uOz|
zRrlNHxOPA4q_ZKHmT(JbuY3l&c9Bhf_IV6h+_-Qy;3Spr(``u+sZTE3uWUm6W?(x!
zN$@0te?0_MI&s66z_-DdY>5K_qg=~#0Mm=S{{yw2G21e#g|LZ5hY32n*FrCe(ziTB
zhk|)RF&RA<p>Kr4um0lLvg>$hz~wvB<AGj$%bxM&5<$4^R2(F%PK#3nJXT_VVi>Dk
zz|70-ZPjIgI5`O9BnU7-WIo7Og=Ni0kL_?I^$Q<@?24jL<Qqe<De!1rrtuC7rL)zH
zxz5)!cgR}_u|b+s7SATw>$b6VC~}N)j<#I+SjaaF_2F;nM|tdvs_WuhyK^>p%rEEH
zx5bGwh_v;lC&_l*Q5n?bIC*cU^8QQXrNf!mqN`~VcBL}?W3K^{#DzB+3V82D=@ORD
z1VEe#b(ZpqN#2VJ3;uOV#0$<-?GN2~^ItAkkW-Ww@!qG`p5xX2aXNO4#C>t2E>$(9
z`zys|eCqM;ShAddbjhIw%Z!`VV0LmEn?NO`HCD%b%Ii5-Z2=;$Eoz2%qml=xgI3ZU
z#KzstY;_!=H*2KYp!5m6PmM**L+WLVh>FvfXLU$bEb$|$=j3F=2N(mnkh(lkBrg8k
z<i$*0n@Lm()OsTv4JKIv*?U)W+ylwe!Qy9f9G4FR{YCA)&@Gn0(m?as&5ZAxE0(w@
zS28Okg2(U4n%Z&r<$(KAQ$5tj!_yX}Lt%TX^27Gmv^siMEZLp3&hjwL>d2!FUT)Y*
z7ZB+BlCgKfq0MXPMPKL&AI|}m#4`m&9ryi8=_?Qm>t^celDGl~7YYt73J|R}GL3mY
zk(WmnUPr;&Y51tG)h>??tkN*oOd*6SL)4VfUaD*BCZh-;WAU?B*HFsoFQj62bN%tz
zgR0E2pm0vow}vcoY(FE$(+@iJPcurPvaa}SN>Sb1Eth-<580Ros~XW_Hgr7ePP?8<
zm%SD+BQmVE&$1s|CEe|K4)q&#mkFsBYrbHBppeOw!f1%hb##tEWx2t|RUIGb6zCJ)
zPC($W?(!h?d7VHFT6b8QFYqR{7uZjLtSB@#nXJ`<j)+v(9y)*}H$z!P4{Ro|+S6t2
z;1+qx5Dz7DG3jiR)Beb5MxrpP@Ef$$^VPap)9{2QE;Xm3&8g!9hSO=rV@Vc|{EfIz
z;A|Q141;}wSWDsUlrPY4J2qY?JskA*8r^-2Lx`~Ryq`NS6PWmq5GG2_$%=nf%S~x<
zpk-{oOYPoxH{Id{l06b#C-51_;We>}@`fdxA$2fR2%Dt?jk8VSy?@L>k?k?F@DkQ^
zN<MSsw6DXI5ywal#CCn7K-rjf2|f5;3>pt0Miz}EuRj}YK6UXnn1*c>ExmHNs=}(H
z<@vlHK|QzWE}QY>6YeX#fc;h*j8}|$EfkRtg`U(aUz$Qxb7N>B)apuUzmA~DtPTSl
zgdGv6n<(x!s~{#>p=(#@MZHi1d=Rn2ZPT3QjXFdS@8cb-ligZn1v>NFC^~+O<|Eu|
z;#-TaL*M0lV8%UTn-TwHP^3xosDz@|L%Jum$f0GXXkbBq%)ecLFLBtt!-nu}<a^>U
z6_rgh9zA~1c?M(MrYeLYk#m?Y;$u|#q_XFOlm+hrA&oK*e{DQb!p3c|0?SrxwQ$ld
zoMd7#i<fN1^*Ao}-OFw2tA@gq$gQn|T{Es(BG%tz4RtxFFHsDF%slW95IT<tG+2Yy
zA*e@uz4`x-_3Wsja?J0zzLkFH-T{mADfa43-n<#1EWxG>YFmX&WG8w0alzJVVDcF@
z=WWVO3un~?H;5Al&@$-)nN>2tNdQW>Q%>zK8~wdJ%yzBbBd31<J%IJomG*)0cU{Y!
zd2yd5D&{NRoFRNX4M`&Kn@=dyrwC+LQoxM(EgNLl6GP3NfMBxi7`McPo&N>`)Oj@#
zwJeK;=OMG8W|5LI1GJ?^l<OLZM7~YhQM^5oLyjj=-ue+sAYe^aYFpBmmhjOoS0XAG
zP@RpMF{fP9@;1YnJbPZUW?)kY&#s0KxU5z|b-}^2(aL;+3WBP8Hl;RD1X$koLj2XW
zYKs;nn;BI=5kNdq+a1Wa8f%=0z&+$Txr7O2-HrH%h=?;4;6nf<{jH|*k74@P^Mu=f
zf^x|vzlV-5?4t1vTgf>SfObzhxt6O0&y9Ox1z!uoO#{obc}lUDV~uzg&fXi*zwLN4
zWEg{WaSTnqDiQjLq&r$@{x`G6bz62}ma`D!=x=A|AqJ&q;86^oG2fBi+06-|=H?UQ
zhiS#of<m=Tt6_Q-{4#AmzGqWR*`7l4e@9B{Clk-eMRtoyy#crcwOhyViNQBNqy+Ii
z>h<!`v_~wZB<CX26`QHFJ8#x7ZdLa@&8R%0Ur@BqD4!uh=rC58e}<X*44rUZl3OX*
z>Ul0OA4^JU<;=ptzd-(hd0ke4iuC-;-CG*kp#nI!$%IAU4mv)E5kZ-oUjk;SVh|4!
z%BIEOgM2h45Vb3<8-b`vBgPBwT%JL24|vg4h-~!Ko0fq`0%1Ik-nZjA<xlFh{k6o>
zwSO_;K#{*WHXEO?65h<UUJ5=O=m5CY$++b%N+YT`Y+*@vB6}?)YXomk2JmM<SQr&~
z+e|!cP*a@+W`M0W&+2_B<)T7=cg14HX6199HhaK2dRTqz0J;ye6q*t$FKn1MgHk$F
zJjY5rVXKgJ0S63UUvG^t6F_)?VtMAZt{J#*jX)`G1a91PSQw)A_lHQQ0Qxv6%mR(m
zn$TWw5V1epv<<;v>7t4=5+Dgl8y^5B&%`Vz8LN;k0gRPl0gCYjPnx&&C2Hs7<R`Kv
zFS@f4dX@K6#5v09@S;TqT7EuIHIVM!P+W>^0m7b*pc>MYQ}$Yj?OKQuMetcdD|`c4
zLI?6|3UUglR;l^T?%vP)-S~#}!G$+Bub|Eglg1WAWQ8dD@h1K;>N^8qIl-_c)_#PG
znVj9yMn+^7psNfB!*65KEegd*qI4$#IZ*<@-$ZH8`9x`+7z&+qDL6ai8azL{@}pzG
z;L7UQNpAz*KzbBi4Ku1W<F3_2O%;=sq%F<5Y%^b%su_zzMTowx(8EDS(d6E)CcWc~
zwq$dMmWf*b*xDo^Nd|gYe=}SyK&pjJ7d^#DWxRJoJ=PZdZbjUxco$SZeQn*A;Nrw9
zZHq0W&386IOA%}X@QU5i{9Z>19fwL+#xMxJA0b*i=~>}A*H|v8cW{Jc#As5RNF*P>
zJL0^ck69tRG6+z4%Ae{LFJ^?K(0YPW7~zJb0t>%M3zN-=ik3s>?&7hpt-y7AR>)Q?
zCiUy-DpULXgH!@*Dc9{PRss$O$&lq0VATOeDZ)AZH7Ed288uM<xYz)BJ1`7QG>3Si
z<jWVCP!aT^vj)7G{v?WHGJb|p!t&k?UT?u)-O4yP4#g^>RRLgEq7!GyoDGk7+1jHR
zlLzcDM;UXsGyO5j(vb;;-6b5IGk^_#G$?9s6*xq{Nd*T|g!v$F3X_2!36l&STv_b6
zh{>)ip7FN?uRpV8U4~{f4iNh55r^-%h5&uQ<1Ey~hwD;F8C4Y5016Qb;e1=B*(vjo
z8Bfm1+9K<6{BIn#{-!2W@erdK(VG*AZqUVI+5R#XzsTv6g{YwzsO|Jc^1S0fo1F|m
zNBmQDwS^VZ@)_WFm^*YOEAb>G5#=WuO~oE(FP8fy9+2h9l#hHF@uJiI!;DlS`cB(I
zAlmG?cw+`U;i*i#tQ6Y)!$4elfDR~LI=M;D6L$vhxMFEJ&@y?_gXDQ}O6sx8e27+D
zOR<t4rY|~pMt=4FPj&BP4252pO&ThN(d~QgXdG6j;1tT;%U`*w$E*3BDtC8Qs_S>_
z=VidTGij7(KD567o-6eO<MR_#m3&G)Y$~dzSvNr!wioI#B;Kmb@m!jI4Wv<Q9`yej
zMM~S5WX0!{&tcxAtiB!igB>#1{WFMQcxZM#Rf>$0kIeNDjl2)_gVEhCpT)^shdND<
zBcRIApX+2@%;XaRwtiD=k&t0tLqMl7Jy+gz@gz^t%hAbun^HUCviI;n3A!X3SStHm
zNRI{?c>JT%l5t}3Gs;MgjsH2idqM-n0slFQ^+do-f?70#!?~U_M1~^xrZ1mCQ`8tz
z&Ab8ehu~Mi)+D2lBXHz4T~EVbqx{z%&F6Hx#Gm{4v=&dyDl4I^)U4<5FSpe&=2}8@
zKE|xRNuy-LXFit?gt$X?L$>RX@fw9H;p-8bZeW`PAHEGZc+%k9?iU;ste?oryJ>-E
z3kR1{`-uH{RFPXk*LtSPFvH@~t$P#%k-gveI?2Stm|yxeqJcx<aHt4@)*PqVTxQ^J
zR#(!<H7pk1Fg;ao=TXNJ^FF{InXTA=urx<87o6Lz>m_DteBWTYaVAgTvRYRNerjM+
ztn`#Z?x?flqPKPDD51pi3pH+A$j9yjWG)+VfrC6RJOoV`V3VUW9sx6MdXzx^mOjsO
zwWu2J%y>uMmfd--g}(BjoW3;VmYR&m(bJG^akIRdLzo~>SHB+dC#8MlO<Twh7sZ#<
z58;T)gEbJnc+l)UvpNVkzr(ZV0rzmoVf1y;zkk_BqR)LZqy2xpy?0cT>9_Zd$|%l=
z7*RobQ&dEBq)AswC{k34g`(g{6A>w)2bGZ~#D*Y9ks<;DqSBj6v(ZcF2uLrXg%*-L
z`wHsJ?>z5W=e%pZ>%ISQh8SXU=PLW!`}_Uut)k}Ei&^;SDesX~MhaGE+)98Ep==@7
zO)!k$Evj*lp>kB7T$S|tEM8!D2rZ6&g6e+E&B%}nIT+|7V&evnUi^mCf8PvZxEsfL
z`|BC&o3SK~px}Epv!mT&UR}7ZAf!6%Wc5}rP+K{8tW<)&<8}cTCyf01eaxCH_iR`g
zFAm<ge`TteqGDjr<8=RTEUG`o2KtZ9>0b-?uScVv{@O78lpyjuigwFF1<Rl4^LHw;
z|0PlS<CG!$10N7iGQTjBjfTO-hhP+ct}Abx{0Zn0!eNU0B{JAh778vE(tm%${t5Ho
ziAG+7EgMDyl+Qh6FoIa=H?Wv}uuh@Zp#BPN;3vDO@ZQZ27=OVuqW`ZC=2wUjS^I^0
z<zEXUJkM41hg&<o^xqFtHSVqL11dhhBp2}Pl^B7wK*F!%SKS64-okktZDDZbFd74{
z{XY}u^;__*qbtoB8Nmncv?5gn{Olux3ZU!LoIr^)h=C6QLC^|E<6`XUc@+2*$_?q3
zH!WL9=s$#v$r>Rk9OekR;&F^S%N6zi=$MT7$1Dir?as_+($*w?+GX99IyTc7fc)^<
z0&r(pp7BadhQD;~@UzX?pKsRlpFI#_>}h7LwP*9h{u&eTE^J-4KFD91Bn&67{q4W+
zQq*UJcrx>SA393WFO&IU&izOB39q^X@I<|)Z)MGVM)BI#aWk~ywKidXjOIFPFUe$M
za|>2)bcOw+afe^N$BgbFT=QN3lUQ-hDGRou$kmlWi|6!W+L$R>ml<n%V@j03$<?O_
z_6E2{VxG~S#QgW13&xY+kBch6GAb*uaYFnSmkLHV6?k|}&HUp@TlO)!dcaTr7#`t=
zEi6AD&SCV-`0?x!lb@f_?jIX8I@<jFjLn39-}cO356Auc;X^+kp6CA+bi=69-5j>|
z&-}|54Z|YJ<I9ZWPM)>taQGi1&yTkRq2sZCy~>YAb@lvyMn*rMr}FTZqx0uOO!eRY
zJ&o2L{{Q#o>JOu=1*D8y2Qgo4c))(G@SU?V5$YH8&33jRC0LMJdt3E8+!QD!^T1sI
ztI_rUX@ZvI_FH){8@&F%<AxD^j4@LFApDuo$8XpBIV-aha*<9P>BZCC7Nk^AM1ih&
z+}O;M7?v>irB7K1_F%j6aC9*#kB8p68dLQ@DYltZ1Wza+7d0v)xxk9Sd*lbN0Z?P2
zw}huWrh8M$@RzkPeDB}=*Fx5RW`V|>WHxLx?h;gvs*Tp_dXI;OGzAG5)PdvP+`h0T
zL`YFr<W+EgCA$$>#&kRng`MI_r`7ioqrrvx{ggIJ&oKB4V~)^St8&4uHIBj+-+;C<
zba|%iifa%078n4e+sgVt<tM)So-pQWj0XPqsn2gn9DqKmsZ;>CBlm}bT-`)+{krWN
z?4ceFryN}n+tap4agL1Fyt-802nFni&@ZeQnf-+>3O#NCw1{6hN>QR~UQa5n{g~->
zwN3B><A`0ecKHcjZAmlgzJpbhJ>f6HNQXh*j>Td>GQ8}kkG>}%&JwhmwgnHjEqED6
zqwF)aphiv-JkIvxHEthg#&*qpE7M0jx$-;M!_)uFfh|s8{I>-LL%|rtOr@)X5-E_B
zNP_+%DZ7teNdi$c|12la1870dtRXr@wFVu~Ea*Z56R`!+wSPe64LeVR_rG5g!{-E8
z3e#{v)s(P=aRLRw{KI`Ds4~M-$(29s;(k{|WD`7i$sOaf`Olzn*muT8108Ur2!3`v
zQi~VXtQANM!FS~B)y`aTac~`*>_K@@R7uMGHvRaQzaDP44$9x{Bp=32b-e}It7#55
zyl=)C4vy5b52_k0h|x&FflL4gl9A105@nxS5r)W3V!bTG7Dv`iwql<X9QuvvS7ajB
zW$gyrL7!-uv5`$h+{rT0lEJ0Cp|qL*btGjujS)Bw<+%|&MsJ(oZ-c*TA61Pk#Aud?
zvmn_=LP%%LcdFJcv1Je!Y^{U(0lMnt!<F8g0V2d!>!+)+^Uq~i>x>4LCvQfC<;T?U
z2spXWet<5R-fepe9}gVlkc{_GV?fG~)9yUr3@{_xT=!rCZ$Kvp2AT(6H{J<&8j5T*
z%KReXV5*k8n)`x@vbMhR;@NT~yPTL%1T9;;-feS(FB4uDyeb|Q_fJA~r5nLe7#>-Z
z#crI%&(MXbo@ETfbKL5ea}l^ANL@(K29J0TNFWe!rwN>|vkx+%5|HJ}-MY5OGu87~
z#Vwq9kGcI%V8>J_JDT)xHn4|N`s!Jf_eS&C{B$FveUbPCi9X@-qp`oo%t<Wcn^N{>
z?BqG}@t<hRk1J?fP#x$C3dY9xX?^^S$jG-g+nDN=V^_$XjrxmWdRfJuC(S=x+@rF#
zG{9@x*+5#-78yPd90QjQ!$-jQ#~{F}rpsOTUZE>4_s#RuZ1oVU@wruxqyj$R{lCJJ
z<~GQ#&%H<&zmSVYHM&&j!2&_H^s&Nu(THwgP0M@#3ecpakx3rGWWulZ6dxn3{RY#<
zDqxar7dfK&|MeWn$+c@qd+SLagVQB21(A_4lS}`NsUvv7pR{J0tr>_6w?w?S467&V
z;|c7R|C|(Q^G{-a2F}&ziOD9uI01nF?dIr-gm~~qW>iyjK&WP7&upft)W3ti_&bol
ze~2}Mybua3(e>^f;@#PHlocMLe)?-MX|crX3JNgiaGoRwpc<A?n-`_YiRa3p_VY7M
z#`NMgsHi}g`7?y}(=hxZuz6$E|1RLVT?zYdBUDds{Nw!y-U>Q5El_;uBU_=4He_R?
zp=G<70@t~hbZE)bM8K~O^xFrVrQ1B^hwKm+3`_HlqiYAos~`X6!}6$j$}&h1ttj0M
zIc-F@%M;u{{R@_Hv_^xO<frvYD)vf2k4s*xlTx)uH#@AV;+Y&V<e}km7^sb4nrrGQ
z@nS0&l3XD_x8egO@2*bp6}CXNLp&6ah!VTqvk3z$XMMZmD&zt*Xm~6Crxk97a@PHY
z$a0u8Ku|7~#b1p7XU~&~YiB^u-dY)X0xZjO5VvWzv7GXAi#KiPWvt=<rNsB`=p)F+
z-(r^w85#!$#!%X8o4quo+D0<1gky`E34)%m;*1LOFKenwj#dFKuJ{=EWm4S@?S>9<
zP`*O}M(602uOp`nP8{8&SuqnzMR2Bm`{iSeF*bY4ra$}<Vr4eImv%Nl)`CrR0k^C~
zm~()(9tC4hV!z%zj}dVC9!IeM3i5FT!SRwb;U4s4AMbXG8Ld$Wo|9-*?%Bi{NJg}g
zl_^|VXS(awBlJ4hX#2-i;)*akW<ClNl1M%zFZGL9eV3;)yu`ztEWZ}_(J$6+p6num
zDwY=+E61H3>$V$kE8T^G)(oY__tyJ<)11$JCLfgt^*RsDhrW)GUN5j2;eSyyfn{F-
zxJ_rG#=Lfa7#Tq+3j2e_widD0a0+0CPfSGH2tcj+K7Q;>T-vz}-Y+ja&7wY&dB)OW
z_jp{_UjQX?fq27lXu|1@k7Jh1j5YKuF?&iV+5G3oRe?+yjQKX=CzgvZTEX?v1k$LL
zJ@wyV`xUz-=ehlN7m@5Ts7KBAw=IZVPcarc*q?4ewL@qv^G2C$$V^o%Z=j+YG`i~L
zTfDENh#m+2)W+6^<sVBYlfkBjExfGXTKuv8Hfn_7Ab|iH+Cdok=Ax;>^twKbAXmFp
zw-vY0)k}v*ST+_w(@A^KM<v{(ApOt+PMoW8_u1~6C!W7?gXd{1bX?a0ij#PAN5GrR
zDGr?y2O-2uoPxzwY>A60_kgEydI47-zmsl|55L8@59>(VqEk&OV!f<jFKSOjv?(**
zF4GnzbPm_0m=Ked3npUcOL284tBY;jX<I`X-2xcTYS!}qUG1nt^4?iUlO;pg$1@u^
z7{Fdr+91-ypRl<|CiER|C(;5zF*e_d4oboF-;+3PoT_Oyv*rL~C2*0ep&T_44Q|?@
zJpsf9rmW3H1rQPl6AI<f&hx?zg%@bANzddWd$P|BBh{;ufx6?+DN~F774EE4_L!5X
z=qy}Yr%fqI8Rr}4CHeshsE~b}uder@Pp^kO%4|Y(5i7r-U(yOt2)O)iifSe}{l8e#
zGi*4;aX&3;cGm;H`Q<lxTBGDYL_JW*;<8SBR`dqp>i|T$qbwy@V`QqrYzaSoo1Z5)
zdl6in+6>FRoy1fc|8chNpuHoDWppai{dP;MVcA_I&*Kz6s|(K}eFd{#g_4+~To{#$
zl6R^i*LzS5diTg$LWX=48N>OP-fi0IHHGVu>HgbRZD0W?u<erIlrK)g^(%zV<tRU@
zyXgtz8!G>%4-w<D<xnjJ+^FBjK8CrJ1kD|;t)4yB`jHrYb{K@Dd<#-m)PZ7x#}48X
zZOby3mw4~VS{Uk$6YX!DjbgNk3$>Op5=9fQuMrDWhslSOO9%T4`Xj4zl6Qr<u!h**
zD86!42RDag$(4oG)`da_De@o()Pm*a<IZN}qC?l(spj9i)v+?VMdO7qygh9zRTl+1
zhm%<D`E^WRItkC-1z01c^&;A=-Qiq!6PM+pA_*?l^xA~uGEpy!?C)k0OEY%#*9&qr
zWC2HkuUozBjZFf*gIMbJaZcmm642^;+QKy0?wy4(=5+EvkVB9L1={ir?@?se?E=*T
z{T>XdZU<GIMfvXjW#qz6|7?kmAkE2^HY{~>H@KLmZ(J0%y)&+h8|Nh6lGXPdyH1Rj
zE!BxQq>Dt=y|zTSeJnabu2WORcjxxCDt?gg6kfoYS`~WroPUXD-qQuTqMgIG{^Av$
ziwhl`LiK_}^uAl1mSu=xS1?u-Io|!-#fsHXkKRrn{&9YaQtdNsyWQW`g}eVc9>v1(
zNFYdtjr)F>N7Hn%Kh5o*II~$rQUZ6amKQ7nh08<HA$MkaB%K3nIL)C9l=pt!j9kNA
zGo1z%bH2UXgm^ANF26E&KKZyD*Tck7#i)F%BDso{>X>QaiwO;tzN1h^3_B%>TSSY1
z2Zoi7BoAQJ(e6Ksedy*`>5Oe!?c+;{aXU|I+T#RV?)GxU6)}Z`b1t|{Q}@2VJq%0M
zs4g~l#%o}Ti``LhVSZJiFa|QNK<C4`B}L?{1v&O-m^_fL3-)2M;|4l*9hdbfkiNqb
z$0+%Y51>L@W2Ptf$Z0K8)xx#1u@mdqmr?>*xr;3E;mFDj>RN0VzkFAAK?JI=|D=1G
z>k%RqJ6Y2OG%u|+Ipp4`hhkFXsrEN1HeWNsZKlm&B!D!DQy@1{BD8W)E~;2w<~;Tc
z4yRiaD#X<TLdaUA3?dS&3?2MVtghbYS{jIKS^~LP<oOE-3N!4JL%h8e<UJ5G52kr!
z%ET>ywcffpFR<R9MIcZh+|D(RmR(l(2YDn&_W2qV0U=ke4PSMvBp(U8bXAqv&Lwbi
z^pNTE6w7X5wM0{%5C$OW#fZa*W<l6+sz|0q&9)ssBL13xQYp=v{t_;dp*TtBYU268
zsxIwyzX8NX_Iucp52mIv`~;6B^~(nSw4I?1*^Y9`!yx_>yJI4G3mvmMuN7tV`-Tnt
z31O9Ki-sftyHCB~ECKpJwSIR$qwK^w!Xwhu&JZlOgdFw{bAI+DQ|1T>&{WeJ0Hu&n
zyRMzH?qEzMPug1vK9BGBl>#^wknz#*PgriE{>HlOs@r{&Yi8A{Wa7}HXDR(1*}y<h
z4Kw4pExQXLQFPK|pqg|o%fgBGN6<f}^Xp90{0?HPCPd6>@!8;Pq0a8qHCk#aIhbit
zrexy75n3{18l&#)B<V)HAus3RuL-_UISH*%dkf0>jsj=vOfD?5J*-ipCVLu0%)V5O
z*9tvKIBn(0>{H>Ja0EEPFcjII=v;yd9m8FbR*T|I2FJ*o7~RH}T??2P3;7Qsc6(wa
zV)IOy_s#!BwJJh5sPqR6$I_&FyoSHL+C8<LJ}!*Sc48Rh`0ZWw+;$POSjzV0K`IC8
z6VHJG%DBk?yYx`SMGR{VfMh=#4Iq{{#?&Ab+Eemv-?xpmloyvvsG@7ve918w%^3)z
zAy`-@lw~~!rsf9|3S_7DTIe@4uNKt#Ox=?oz!}$3Jwz}pfbIm8U(&AOhWiytK|W`C
zmUwGs&>U{j9b{Ml7~7{CHQT3UWXjX|=O&hhcjzewT((Z2%AL}U>kOmjVx&6B&z039
zvHrVUc2$3a<_Wb%buKvGr6HNJC)m*RBG;@%SE-@*V7I1M(K+NLo0e7Qrhg_+!s;fr
zT>B>@ud-7v>T=?#Ra6rNt`K4=610(DvwY)W9xV@dl|ZJOo&i{YXttT6k6&pjuu}+M
z(3Om@i&IuMA+sOHAPixt+pcO)lo+v$uk5lwJZa$k=7F%X>QwqWLT%KHXH(pP3_MTP
ztifYpkLAG#U|jH3zu_w^y3;}_<Q|4Y{!y5_H+Nyq|Cm?J0l&^KFP_1cK+MT@M`v}z
z?KNEtr8!AW*imx+aS=q3voC1<dP`0wD;iB^iO!PhizajK%vURp8C?T|LqJ!19Brrb
zp<BY41w&D&Oj!IjJ#0GAGp4u3tz^^@;=e7QTP&$oG^5|Q*ot(Ul?%BfDMUW!E0k9z
zW?W!^tYF-zWc)fT`*E!>pj%|j&Gq4232@TkA3jAgwEG@<Wl=kHfQ*>l3U)k;y?8ue
zWtv=>&F53JaWjOyzPfExE6`^+Dj>thV^9|RYoPt7dn49AGM&7Iz`}S(M=Yud{Bh|I
z7yyR4r*0j#9?eEi*+XA8N*xTd#haB|(k(z{1&Gl((acM0gIZ<se;XsI2~RT4a@%W~
z!ny8k`V7LKMsRf9XpupwDp-F$8EN?+I%t}I*o6EBtrAlQlwoZ!cQlclhNh&|bSF(=
z5_l?_5WS=Ye=Wc74uH)E6WTq1GFdRDY+~W#iU<;!9pt~1i6@e+l;EuX767oOWHWyT
zBAVg!H}L0|Oq<G-3GD~j-N6&55^k2Bzdh)A)WFWk7l+HZI!`qi<#KB=GTAw7jUT<1
z+2hiryR%#|UINL&&{Z;URQ`4}8YKUr>vlitIlWt3H=$d~1^e+hzN_75d3F$S)j`i5
zaqsV`uy&w}92I!R4|Et^K#l-HONCj}CC~9%3At5hM{=2Ko)Sg?b9{TtHi1*}*}Vzy
z8u?Cu0^j(Bd?j9ON!|aVOKZe*xb|_bOY!S*VaU%m3Sd5X9fVFm1mkqtsr?^?)*B;*
ztk{dNUxAhP73=Hra`+z$EK{1{m*+F(sXL|&dY*Q&qi6+iXD|5zrvvLXj|;;bn~1o{
z0z$)UV6=d<4<_l|yWoL8LDS>HZ~<^rU3qPC$7@tl-_jUX{@7>*j~jfhJJ)d|yQa~=
zi?@21>y5pAm`jX#^BTV1pDAWLt$!AG70LYsSg=jVuB$WE!>2x>o&{LNMPNpMKlMrF
zj;xw&xys)rk0|fieD7iRY$$LPO8WNHx%Lx-qBR>x1C1sMn2|c95VWaHAWQ9ZoKuz@
zfZJvGySXiNw@8ddb@@uBC$~4TJ%>H*IUH%F4DVF{w0!o(<*$)P0QS=}6NdYKD(L5=
zf5G;vYGJTp!|p@%CTL_PK7hUt@`Q~Vi4)bZZ3698C99LcdHh~59Qy@?<jZwYQt8hL
zpo2|D6h8MZ(3L|^iq$J9Z-eBajWBFCip(eN&XU=%Mhhxo`F&K+zd-F?1;SIHnF;$3
zLoHd>Nk8!S<t@!*AIPbD7@i*GTB|TI8It~2B89;BLQ#Klh@S`VyiFnB)tXxP3KT`W
z1-Xcc4aLf8&a+@E1n~*v2G!4aIeNo7A~6*UHW1aTUsRC&sN>ZoRhUM@rIXXh-37aO
zJ>?24X`>9Gc#+Llb3|WVd2T#>27jZ(wsc%qA2J`$Vcpo(xjOL%+#@GOLcwsi2D%lw
zrLrQFsqYjs7RrJTioYMm6wro;iIL9v`x&wDOcKV=Y3PadP#Rrf?(5M2)1ng=gmsU8
zrQ8|21|*O;CG}+c{9V2tss4T-Il{uXVCnESCKuo_Agb%l(kQv9M+$aC@P;Vd>fj1=
zu32WS_v*RJ=Y7Xhb@A6>#UjUUBy-1u!}Znajk#o;pPHl@cFwinW{(V1C{9B7c>%O4
z>?<;*GohyBP^O?N>9d(K-9gI>ke=8P$BG<n=I8M({u~virUf_tYU$f02p~EwwfqXC
zKx!Ow!Liy)g6R;)VEM+A{$tJPM2C9G5?mRj+qS<V$WcL0Y56;15HfL9-dW~w^-w9<
zQc)niEo(EALFnwA`K_ov0-ziXo4q|nI7dELsd~x~1NisAW(Q%DWVEa!q>6i7;1svx
z{XXh$zEc^f$3>@O8G}48F<O*yA@4boZ9|6hpc%9}K;NG>nBA6(e44tYUN+<l{@nDS
zEE{j}^!kU*m77X7t~jB)jC|XEZs0OJ{jeHoG3&srx5bFTvlx;_fQ1Cp#Hr{jw!2c?
zqNtv4AkaaC>z(g6!@~4MCtAmp4Q0@$AQ|EUt7*&k$cj>wLNDyQ!`%pi-ZQ`)p#7jX
ztJLxQtH4ly7n&fSWtQFY7T))gU!{PtZ!GH5W4k!jU9cYB65#5D<GC1qs^fDERn7}H
zL^LAuOK?~a!A5D<PCL<oU?;eM+*#_R=LvLUhgLU^lz6V1-MyLfvnCYY1&g~a5G4z^
zc>XE1{W`PzWc=TV7~v2yVR9c1I(R%sDTy??QAciDRyLlZQ=H<?P||+~J(nIjV;IrL
zuZ8&xaQAA$VE<x7YU%eLbIg>faV;5r**F)Du+vVwa-fR{mNU=Fvg}poR4s7yor?xy
zARG_0QIZqv|NE+tg0=~An{zlXi4zAvMH+{^mJ#zOal}Q9Gm|-g$Sv`1K|2%E{Ex}v
z=PRgkiw0G2zt|sojxBqs<Ui^Wf&;0A=0RA0EU8>XvaQKtW521h?}qtUnZ!-}tlc#r
zAlI!~1Md7;Uk#R+sRL8*de7lEY5M<QU4e0Fq40juV?ZWf*A(_<xJIOyH6?T3?+|dx
zpAJMV3Q#bo3n@5G;%7K*G(k&rXQR^url2Y4?qli<-+a@L>}iN!kUNjo*BQ_p&aZTw
z8Re3$Uw7O<!gtdK#s^~TwTyWKKN?_>a|r1PlaW5yfxe(PibOkQ@Z7_P6ZRK0#`Go@
zcnGl0kK<nKxTjoyi5$LAqa_;i2wUGK^zj+=i$JnXh&dV&<o53Fqjp?;7*BBKJHpo`
zc1zci0z0P}^9ghUS6|Y(n*!eIi2#6eT0*Tbz(0^jD|y)7-{(g--wb^mE~-F_Z+ReK
zC-?FL_3pGedfP9q(t4@;bc-hMn=6C1-u^t`eP;6M*%r^y{g2B|w+i5mp-nVqJ2GqC
zRhX*3A`TOcc6z_}MN&_RhveaYJ!<Gh1_r9JbK}%`P&*C-60PXDvyBMm)^)&=4W^0I
z_99jC``^i@ZF?kxS!SNV7F@W{VIRU2dhX2?qb&<T)I}NmoD8IAwTX9bmfrb!1`$<R
z&$*4VNRpVUZR#Z;j9%8d9B5r!afqPJp9F8;W-n&79+pvaW#pA?<RDJ%<3qs1sQC!)
zrp{ff1j*sp>Lz4dLEJvyzukC`Z)d~zJ#YbP?Du5&_|){q7#eP(?LL+&5f#my{N4k_
zF^02fV{drZ2AB~B;YW@T@04LtR@&bc3p@B)894FO3EMD{_53J+*>&)&!4Wk}D4LdZ
zJk};I#?e=YQLPbOTZ~~tc!6MEMGB}F&3SlCZUS_ZV4{O#pjo~k6_k?8@<8Op2yQod
zN^eCn<aqj1T#pBAr~8xQ%NQk`jpqI-5frcqJ%u*Mk?FJ?(DpTVc#f2biDigNM*U#F
zgM?EO4v3~LSbt+l9Y3{zHqq|CH4Qrm-Kj1<gl#`6dl#=a4Kj9Vs=x=4A$m6fDoIGv
zE#bfb)77|=bnr@4Gt^~Ag&qk9I|$LsT@^N-aEwYEcR*BI#HruVa<>Q24#{MH4XB|R
zAIbl=hKg*5#5tc-1k3&W`9_#afLkYgZ@6z%SX!NJldJN>w-S$AEAOf(BRXXx|3Uh3
zhBRJB`&w!LQ-)U(D%L7ga6M=Cn@!08^BhY}fg(@mJ^!1B5#k;av8LfK0rXB-F+uDu
zgxt$Lt8a4|<tq{&K=yK8XX(>o>0*h3oe~2Z`k=?3;)3&WOp5=}hAMtx?M=L6$_G1l
z3i2zXfdUl0O3}SZsRMeS(0lMvcb-AD_Vfpc3J4;B!zNTKD7<(y%Q6Tm2ap;W<JJ&Y
z_y;i(*!X<M2hw(UZUcj1E+89y<I-~s_w(${{DStHmOfXU4}SXnCJJ@s$A<D#!E#uo
zbY|p@?NE#|IGoY61G1UdC`gY#>cEg08;3^jfT{uc_B^_wX*5XmnKK`ijB1k!pZeC@
zdx<05T%t9-G5fa08-#W|kh&wxKnHX06<BUfrBbF&NPDu=>buE4$j|<xGP#j^Er2}i
zhgMoiI?4A@x*K?F9+&#oRG?HqGZA71F==P44Mh0KN>k7A3@Uu~U1)fPd_NFzyERzc
z<bd;9`qKGq^K9Sx5!3?;y9ah|K*KR=xsSHN9$@J0AkBzQGd+)z23C{+O%C54*t7E&
z7E<yb|7*&lNwcxdLb)vp-4Cd4fyBRQ=Wv-6s`8VKMh}tU3m%J*Uy=azMySSU{(x_y
zlvmx;V@KD{05QZO^MrLYF^gsGOl?aa%aZurhQBKWPT%sZiDNMhVtTqQOA!vAmR(m-
zsua5?{DW^;QsV-ofR%51p~!X@1fz(p;JbP6+I{kS_9Hzf>33{VAr=|YO>-_N3{1F8
z94`9+>(H1ZU?O*NKO|;Z#G&R!=^Y`@`)wAcu21F=7sjSmsDiC2r-7pV4!gmvB<dNc
zd6yF#icBT_WjcIsO`%i}U<n}$#Mh$7+^d$a6QJ)q`%o%c%qfEr-Hv4;Po#Dg9C)#c
zGLWp2WZb=q94e?XYK*8AuBF2D!nC;8VD|4{`BBkq4$zO=U?`|$bDAa#?SkfTl-}vS
za<NQy@+n&je(=657i~yvlw<vVto`GG$@H5_zOYs~AbP{&4Enju4qb)03YYFpz4y~s
z7&=u@kp?J4ox^o97Ek5l0UAm)r((IRrb;VnSmGNE1-BvdI@T(C38osbbX>B9G;P6{
z9c)Ifo9~Zw8S<beAjpXa77iE(NPrEsY4BmTDd$|f1E~i09*6*k_Uvic;yV~_GW0u_
zg+GVk?=Q}QjhL@R0|+S**Kfge0^-^EKmi6Ige4`A_+rPzX&sE=DO;Ka0;@L5JNXdC
zy$etviF!bo<e2!zuw|Q}GwcrmjDh_R)Mof;^39<mu$v?tD^l&!O5($@r{>vI5ZH2`
zde43uT^b<N>9CRE;GJYa9W$x4f{4z;b}|Oy&e4}|Y7eyTsS04{zZg^vZ4=_mA=Oa)
z*1CUL_-Voe+1waK)I1R=y3jxh;D5TPV_>FT%Bq6b>?cwCLb?@y9CQh+9Jo%A&sAP<
z=Akd0*Qa{u@p(;TS0<{KgjogDR{vSy0ibx3Q1?~8n@9dFo|G(Ous}P|rj6jlrsOQN
zTAYv2(@BY28Y=!y#&=Hm?nf+v!8B<lU<=JV_E1{;$5CLc!<IAngrg}hPcgz+aV5mk
z^p8PG(Jtb{Hb;}Ec+V)`p43Wd*B<;J3Q-pvR{A7Xyq^lUS$&^Lejd^-LCclZBX8?$
zELipht#L9b&zP9>=e=tB^@L}%;2=lwFe{!q+05{_;D}rqE3ZqUFMX@+cXvzS8}7K@
zOp)TAY-1fN;20jL$cs2}Y|~uV?VHBFlS#`E;{HpC6E_vr^YK3--1KvAX73x?eGc`z
z4Uxq6G{*yqj)7GJ$oqlVrF&X}ih8gE!0ag-KrKK3HN21O?HAH4KSgSRq!Rpm9=y?g
z_XhY9jw>zryu|19yCxi0{ILIXC``O=Xay$a5mP(ns?_puT-Vvm@$;~E0K_Fb*NL|T
z&pmUF)G>WynOV_w*N21hs!OJ9xkf?mb>zdC+b)({&0SlJP(uU{t;ve<id?mOC#^Ao
zn9gPs@LKC5xCF2`Ci5ZGaW*Phx_ZL&i`d_6m2_-BT{L{Xczo7>oVYFw>VI2buP!-U
z9plYtDi{Ol#Q=w9HUu4=5zGT#yo?!in^Q0M6jz_~@)j6|7JvK9hp*R6^Cs-ZLxP~P
zuEMRNj%?^}s3xnLj74CStp2$1)j;K@lR^r@t;ZJ3Cd!2;NlSCqPn|TJ?)Dc4&84(%
z?0<T9c*L7$AgAb$U8%;*RxZ97ZFJ1p1`Zf{5QxbCvm~gyzw6@)^&05U7H%rHaL2Dy
zdvH7-S8{2^#K}bE(7|%pI8+w-01-K(GO*&*_GGIjiO1A&21*@haYL85+f?D;PJt8T
zPKsb|cAn680pHRAOx+m?fEg5hvG-ZIZ9PbuHy7ropN-@9nNej}Cy;3$dgPsuT&Q*;
zyb70{@;P>=<~fF7Cj7NTDvnmN8q+a;mKaujF~*C@KuhvQHR<CQbzx^oNi4g&#~Eiw
z)E@*{<IT7}B?iex_1W_V8`x+2c6V2n0htde$aY32dkOn0#ipEgS1b0FG?Q8Jy`_z?
za>34`xAvz!k#SNC9{+@T^&J8Wyor!P!Y)v?czu+svWJrp^BJ|ns#3(t+WwpaP)0Bn
zO~(jgW@y%XvRP4E!OVu1U<XK6@B5iq8vA!<#P7-u)^EVMxinlGQ<>PHe#W<}GI6eO
z(MUXZ8CuI8TF(Ug_H|ig74?MGqbWp!kEVBLCJMElg7!1eq;DR&z$%;MobipV%$<Y~
zA2_6aTS(r+@*zGJp~G?b(z9_Wc9s~8zNsWC?ElP}NmaadT>Eof0g|jyfyeO4s7|V5
zW&>CGj}B5r9!DY{iH_*O3ZvA^Ted6Vm@l%Yq`S@0r?8`0{8wv?Na{yvK%LwdRh*7l
z$Dz|Ysfo{_r9iiXa1yE1T)%%SEnBxm+PGS}224Gb-88QQT!V>DrEidv*IW?{vre6q
z!7qjW`%Q0rS!`Uq(0QZfXsFBTm&zH+iqym4jg-=0a+Gu3z$iCCDLUe9dP_kocaCoj
zY%`(Ki({@eVSW#4J7wF3_$0Rj7{I%K>olVb0i8so?V2blO5{`}somJ7>s>9SZ)~Pw
zAhnh`W)F%P^#NCF%qnX20I60<jq2_NvA;R}-Qz4lA7YET9DTZ9S&F1{O?za8DxAel
z^Iv^A5?Is<dzzrhq-B|Lr-GSSwuL3#MKV1iWaDUhW?`Diuo1I?nk*I<Iv>7pM!aRt
zJ1qjTw!dVB8w1|oC<$8TANJVeq!=`=?bx%a8)D@1kd?8s7o(b$2#@R;x)jic%Vzrm
zRNLOKiRB^Vr;7D(&Po-YXkV*zW0Z>~pSbt9hXOy&rTuZOWwfVr&7>Zdv%c?yJo0N_
zseRg>ZiN}=tsa0T1S8V^C)}CI-+$`8dE?r5cR{pEP1wCb1SNA^dOU`c8O<a2dq79i
z;ET7GxGu5Guw;ienDVb<6ODBrG20ObeK@Wu+u%g9`H<j6Ov&-3jsj{#dFawMjPy3b
z*{rr$PLtW@Gx|HLg?&pOJOejtw_CMR7~Ag38G=)_Z-^B;MRvh8`5s|uj-X6)N4R4!
zF@;{&tD*%`8wGO*y?QC;nRddtBpAi`i249zsJ<y$(qL1~X2Y{yBwpH^^WpoXRgU-#
zyaJg1Ym1QNd5~@>c^0d3+(NCKtV|nyhNBSfe0NlyF<qg66*0Dp+Q=Q+&@k-{mdIdb
zWy-BQqpK5T197q1&Sj-iCM9P=Hc}*NW#y6a&eYYFKHkaBKqn-L>z74#_&UF08H`+7
zU~ihA)6+#uPjDzHF5l~m;5z1jHwd|g5T%(N7C69del>D1U3~T?cxY}bz%GvHu6zlF
zQ>=zOEvC}`>e7UI<;>{8)=65mTMAiU!D2=>)@vnDlH%hy{wMZ?B#~k1Gol<0h<!0=
zFWsMQUs1rJ%w2a%2lHTtFn8!{%eQE+dYj_iic2oU`tFY_9aohiH;A0jkGh+<c?oGJ
zILzHIA!SMM;vPA!6ya@xzIptD4KwB+S~CJ@_=6v|l}`UH!87Z%4C(=v1_55^uR5$^
zoo(inM-P*yVKv<+-n8ZMlIkkF1ZHHr=3MgPAnC1U#eI+%Eo^3D>1zsMO{LVH+QnIc
zJ4?$;?U3V20#@Jmd$0Zmm%r-)w(~(gCc1uVfy7|@roPM|Ub!LPY6@|1oSjH;FU?n~
zqU1Q0$eYTlD~7oyk6$e~OOoB?^is9DIGDQJ<ve-G&&dG~9X}7456Fj1hqP_&!!(Ed
zM<oE{_VXcE{<tR#+14iDR8E<OS8NhQ{isVCp5kR2{Q2rm@paS_4Q{h+-A6Y#>m4bw
zV5QI9F~A8KljmQuN49lBOW^Pd=`GN9(8R1Vd-9+X&y6JVezw9F;pczTRJ(qBf&|TD
zr6g=Q`1^yXX0+o;+Lm!JcIV>X$m0HKV5kVh?8_6;EVvOKOAP-;)T9{p^rN-1iAzj>
z1)u;?{kp2YR6i`DfYCubi_3@i(|@xOX4ZTpV~Z`H(TekmU+Um)cv*6ZRv94afCsEk
za8Wxpaq+&IFxi1l@nX>SBHoVMUpyhjy3la9bhfu7PiM|Okop>+$<NDZ{8{uEy3D4z
z#wo_m3O4^Ul2>to!|rtt=<SI<+dp%E9T=_#?lL-{Ku;IQbWqKrJ|;RTaDDVj!w~QR
z?mbx+b1P*7@_=wrDjs+im$Jtm-<UYSIsUeveV~Y0%jMdutiK{v^;^am!CDRkYgd@f
zT^N8WJoTb|X4uR7!+erLjv8zrXxXR_2?o%0i9v2e$s~t;oa-4&!?aoE?)4%kiifw=
zO#86jBL&%<AWUYy{V}pm5~E}No1hEnMz6&w#eOgE8KoHz39)UqXUQg|vECcmMtqKB
zJkrz8j4gXm`4p_|`z2B{P(+VR$^~hJrMu-&Ke>?S;J5Xc>JCf>?=$B2>oWb`z=>ZO
zO&Lxz^XFYfEt@f6^$#_u+jL1YM;TeK#zWB7=?|+BJ;@Id0a!I*Z*R_w6wsw98M5Q7
zg0NjPsjAi8afR%?gt(0PeH@guMhKx^0P{?|WG;rJAmT0XLCUhMa%E9%;th*p;Prso
zpUvin(yX~gpWdA&%)Sbmbxk*hirKE?`xz@4=zJ6YqGW+VTk=A6_XNZmd!t^;%N)i6
zK#Q*qpelSa_IR&OXWK@6+gV9*+^*2?4O@EREH5Z|_ShEKErMrMJgT}Z-wjLPYEzZG
zg`BdLw2^HTd$5*5zdO*q6tfKsD+A-aAgu@d!xJE?8|SJSR&4oLt=yUlaQjwKb5Sm`
zmnTnL7xgq|X?tgr)4?oC{W&Scts9;}ER|SSQhSN5CD?v)=Wv8C@krzlAJe>%Bu(SY
z0^s!K9*n7}&LdiYf^~^1W=x!`)v<JW2)LxD{k)_s@zqL5P~Ail9RVNxrOE<c;!ObT
z*xQd|dIzGx$&FO=Vt263=l$Kfpow2)PWGze>iJ*?q$M}I&1iCpI!(7uO7$-f<g@$`
zEc?;O&m~F^5xCDwYHz3!<NBI7Q>co)ry?A@aTx*|r5Gstst@=|eyQ%Z_v}dOJy-2q
zxv4lzZtR6+djpo=>~7+dvXq4P^!x#BemR1C5~#3+O-eXAXG1Jj6V4LyiU-9<Eog%l
zD{p-+F)D0_ZtXJ%1OgnXX6Ftr_;{TCa38uHF&($YG-K8=`^=16&<kbR^kB^`7D+~W
z*fy*pYopCu=RZ&A$OR}=EU0}fM~#b%lSrrnbZFSH*!bx<$hyv(-*87qxvDcX`k{Eo
z{;BrEXT6=O+QDD%SO%tM)>5)zkHG38VRE#^liHnA7V*58^4&B?=CB3CN2kAp#nQdr
zmWySTK1Rnjq55y#iQ1t$XfLEyKdei!?(n3M9?nv`qsKoXG?njCb5;{wY1CmfQieAi
zC3X?7FeSpblY%F#elLh<Dkb6%P0jXR0=IrjHEdmq%U@!<)#vjsIck^TukC*~)twTm
z2_&+PRX%4RhL)C=>CktbqbcK_yV7S(VI4R{z)KS8<z;2B+Dv%+i(}n77efHHe8F7#
zN=#h{i`>%CP`7PQGw!=`L#8sV*QjQ>n=#C4N)pZKS<p8)f;NPwDVVe@D=S|&j+)8R
z*1c%a`Bp3g4xKk#FNex4#@`ROkhk@9!Y(YuI7zlhe;N4jhs4CJ*SFZ<UW+(rI&Kzg
z54EXL2S=|9G<Gt%%eijn&5tn_%D#(61dZ-C01@3*-WOF8=eshhRD#6_vNUX?w%7UQ
zo~@QC8P#2u4+vh2?k~An+v&E@Zk@7NJgm5^FZuXQt(=(8gcZM7k2C5;64#6SBRiwv
zEIkFkl0tPm^fyf*&MvtKgsH<W!rXU>(UEn~{E-q|$68T58Ul?qQczv>%b}u)S2vfz
zi*@kUfP5BSL1;^YME}Z8QePdksYOZ6$T^?xJGK2>ls-0me%te2I<=QX4&A>ZH1s(@
zY5tj|eE*91<gjeN&&U#8{c8E12-6#F_KM99{$qax(^IV5<*lz64&<m)-tNhBW;mf8
z&l_%EO3+$`meGfl;*B$wrawNhemv#7n{~7o7}_C2OR<rNk(1N;`Y)ZD^|Jk{qKak&
z?axH<-1I26N~6TJL`BG}zhi@~eBb}Zv4ekVeA}fzQ2E`cw{lKH_C$c}CP=K3$Oo<_
z-mm>M>%+^RKW49~YCSl<vu<}?H+!frjP+BDvCimWa%+fTOgvR&o2U2yfppVvo+&kV
zT3nfxZ@>)~vc-fOdt06W9xuWl<LFu7KQD6~eJjKqUk+!3;GvP&1HGB0ruwLhgZhYy
zcvurUY3_~nu*^K2O|Y_9R7<ALAZTJ~NyhMTw(yF%%DJjJTqG0%LgM{nZN3lS=XMS!
zF?bm{GDQ6qHg3QqdvP$G(_;R8b)fi<5GRG+f|LjvFUQIN-K-_HH`IILgm7I++vB$9
zcHvnjj<I<S1W;ql+Kbln2#u^DXtpP`H`+>xHS*Vh&LX8Yv#|hTY2Z=Z0bMB}+a;Zh
za`Kf+nhBegd%S|O8oXImb-Psh<a?L(FkA3Riwmfi12S+4tqPtH;L<YXwxXh8%~ys!
z1_?f)yTX~_q1R*XT4lqCg0W*kfX1YtD%gMPLjU<*n`-}O<-g?EN^g$l^Md1Kgl({9
zh??>E<{v&7LDrc|L5v7rYgANuS&MLsiLq79RB{X-*vUGMjBYLOxKFOzK65GYjJ|mH
zG3gIGP{@<EURq9VNyUGgOKX#JJYU)|QC070QKiTh!7vXVik;eYIR(biq4DPEIoo}_
z%JFjl4%0)o3uG^f@oNba#H3ii!qzt565usW`uKa_hHS-bvz%!FQ0nGUJ2P?AN!|S8
z;_F51Mp1(Ylr;c{Rnc|T29aKNi?S=0D@(swe^0~dPIm_lhYU~FM-LFuX68VOkQi@d
z?roYYOcBC(%?yU0$>vs6NoW|pmeJxlRq3%~_>2?+(<wrG5%{2#y$h%Gx8w|L%K2Vn
z!^x8{DnB*ddyZKdYbBZ5CX-E&3wb`CKcIa51&ifA;!Ec%ApPz3H5NP}%w?85ZW8z^
z`sV5umj6=YPu3q>Zy?j~js_>6!89|;q$b&ZcbBdFEHlR=&-=6agLHrN-m9Cil%%uh
za<a6<KCDxwdq?=N9~Tvk^S*&vP41Tqz*gALODb5t;02ZXojbV^7M~K`P$xseRuXF7
zq_e@f({ZbDw_*3WF0HcSOCB?KKeJM51lIF^&a+0nUK;LqFV{E07Lqs|)A|>Eu`)$@
zX+goxgvJ%ngzi*^v%8vtzIeIt2dIqMblh2aCXKUKTogK);5?#d;f-=FrvM-BZo<d=
z1oF13W|FR0VVB{6>A(jz-V(jaAB5w*2IrEW44-5cH|&UYm%Ob_%yR#=Iaei*W8&k~
zHh5Z##<sm-t0<d=^4&9=SA;7*cH>`<)_n!8t@$>>`4w1mA7dw>F3>YD7tgoisdoqT
zPf`p@{3JxsF2uT0S?YY#+>7q1?xMMok9Q!9X1X}CpY72|?X6J~ypB#QEvXtePfA4y
zC1`?B?_c|#sb+|xJnku4&qf&cP%#JmPobo1HSBzQ%;=$w+?XAIBB+WdwO2!eCf!Xx
zTSxb4{#Z?~ckR57%`wUv&d7Tvi{rMPs;tAZs0Sbj9!_C?&XjR0Pz?fI^(@}6w{dPm
zjz&n&P#4<D@Oa-rSi08q4!q{fnusT8GKp0A*yhilL~#xVFI<;Y0_*>tt-pg#7SQIw
zqVChyI)x_kq3monVZ&z<{W<cz$$M*;dw6a?Lpe6iRk_|zN)_D`1d*v83z~DuX8w`X
z+2<sii>2-pK+;xHrW+CWlAL=zPw<hy_9_*N5jq%|vQwmR`UI3WpW9p}1wlT3aD3N$
z&R*aC0@IdODuMc^VnNY(Sua<&K}=CjtQUi9-Ry-?YB+ZH(yOnEYabE*yl4Z=&n+zL
zwojt<K|!u~_R12jbS@@9@@o@L6qFW%?>CWI1X!G=aIMEApOqOo>%nml9eUvQO6<h)
z$LJ|j=S|7AyR9EhP4A9{qygkepLwE>)|Ie7-&xps<WtN<R^(Evf*l8LIE&0Xt?GZy
zrF0G-DVOO%k2zmT(BM-(Nbr1K+~5rnNiyQ!nJ98pD@3))7tK9OnH~AawY;Ryi_?Y<
zE5Jb^M9)zY%=>nb|1^YIKWxr?%v2%Qk!~!(=D7QyGsC9(A`W#FTB72rg?sqpXYMLo
zI~y_3OzahwNr1+ofKw#z9MOAY#^2w&FNP>XV?Coo_Vs0oCqa&6{vjHlyo@h4p|4aF
z2|fFV<&m=uBhnCk2Y*1G+<XRxD>VCf#E2JLj1_R!7~jJNuvW@H+NAhs)A4z=;vr}U
zeWN8)X5DsG^3pn{!};OxHNP$KK1?WF?0Zury*&>=<ODm%FHL6AkrG@@#r%<L1n$g6
zn(|YdF<Mok8J+h`&)pt&enryTLs>q6Kb|mR_k{H5=&&m_uan+o{=3M_08eFn25U>f
zg^&Uc!R;~Rzoyiu)fD8^G*vwe%KP#cP!;QNo9i`}?GFr4OVQ_mdGQ=L#kXD83MD#<
zcv7JM%zk{zGV74T22Rb)EEOEr^2)Zjf_&6WlKiWGQ_dk+W_$*E5BnIAhBq<Uf%+NB
zw=gC6a=1~SEZ!c_QkeR~u}62&I>yzwaH&6}$zwPs0y*?R^taz2f$j5RJ1Ur9a~AtU
z0;Kup=M`QAl*T^f^(CiUxNd$H=(BtHk|Qd>n3>Bg;5}Yd_H7v)*u?bin-pNV05887
zQdW~V6;AK!Rn8S9*pcqXIKTqfcBzJvUKKmhDZETzn}P*n@X|KL8PaE^vnzRjh0b6b
zKUSBmZrxB~TT2Rgy!VfLoN3N^yPQb?bNZa<hH^aSj!k7nmtFXB#PGGkPLoJ}c=1(W
z@1QwkcN(Gf5k*7QKtWE1S^c&_^(-eH0*0nIGr3$HO=Nwd4g;7-j5-p+f1p%j+G2Uw
zC2j2n{b!z65-AsS2LUv9kgujc(kg6!E8U-6Z{IC$J%wy)O=geu=Li&$t<c{rD!;p7
z<eD&2*2lGT`jWxsQwH0^Sw!|QhvV5}{8M!d-1l715=b=BojHW}C8V>@Jn56!A*jG}
z_wUQ|LyENGgamU?3EfQnT|2Tja$mvv<G*=tzR0Pia*LDsPt)~VE`5(6DWxClmiMV0
zZ7QKW?S>{?X_;?~<DO2H5Y6q$dL$|}bF!1$afPq;SpZ)Ya!|M2SzMi~v(74>)s7Vq
z*ltikk^IA#)C?r$Gq&%*v5<4&^sVgE6V_~s^9BnLcs}o_XY^~)+G2;4f_dli)Ls)j
zC*PhkTDcrZP3=vwDMQut77gR8bcFQtunaaP!@6H(GV|sSn>xN>`o8e^#Y)yN@{o8@
zQF?lHUVr16t)F(qd26Os9-vBGX_7F1Xs7Bm6D=ym%#L>@JHEmD4C<#EXWs68ZBnj%
zo=tJt+pX<ETyjT!@MQO>_ja)un5FXH@E)peBh5aqKY8hojcBwOcNUHGls##hF6HQ+
zjb7z^EA&8j)pyh)sYB%=wUdK-CN1arXE=E~G?X^fb{l%vWiL(G<>41Uw27z9w#n1I
zxL@1*ww~V}XtT)a^>8uj5z(S!Ipu2EAC7hS+%ygXzoC}X6bL#v#fb;wkIr-(i(FA$
zEGK;qi|J`E!OnCqIB>^(es~BcfB*VUwS>?W()i=9mFsS!X#r<K(*jAag_pH-i+a^f
z8q|7Z{AMou{&wed&axm)Iqynewm98l>H<zFR(z>8>x{$YZeJg!Dw8}?`*JrwK88A#
zN_jKDM$sSLUG;!@`@6`I7Uu1kBz*nxO@oAe5g9QTsi45SjMBPqh=BPSebP!D)yIFP
zEmbR*E(Cg}>^-qQC=t%mIm}xIE=f}3gMI#7>7S|QkF(oAJ-G57Nnm4lpPz9|Bvtf=
zX-GgE$R%>m??(Rahe1ifn?<HpXJ=SBdW5#gtxpJG=a>)*^eBGodHn55co%Q^w4}!z
zzaG>n;=oxM<)+s~h1(^1#eA&CSEiD5avJu;u^1`QYI4ONSXG2pbng)BRaZ_;wOb!#
zzPm`uh{r2i+$qsbw<}VKA~t^7!QIJfb+K0I&zAGij^pHxncD{*sKAmp^2mNyed)t1
zQ*rpbU0PvZ+`drpA0NN;bUz{b;GRl?jHbZ4NBc9!Yn4|WQl&5UvGGlWRA^BvR)61;
z{BZdhcbs4)CG^C>NT(WJ!WH^#zgW9jbe_z?c+BEh#fhC6V+-RO4wn|X*6E3aEiJ3|
z);z=(JJW?<A074<r{2ky%oo|kloj-D6{LoLRr7gWrM=<4xiX0w7x7)>|AdM4y5>SZ
z1t(U;Ip!S!{J!p`jv!IdEgN;56dBleMl47ntxHt+l$wZ0YAX4Saq$2zNi%sJ>bZL$
zCzB(LpNZ+N#>-n4Upr`QWi-_TtQp)gIOB%<n<k^Xy?ZvzerM`txkysG+|WzwuQlXm
zc}s|PynqoaYN`0U#XY0p#q5k@u0yvTUxSY4UlYb26FzhfeaX8eZLRKa`@7i6j)reE
z^{Tc?ZI1GN;)SFck!SnQR}dtY3}`kBye8iIyq|I%JC_V&cL+Y<!>*rlS34FPa`|QX
zZ*no773<nd@JB`I<}>xFj@otWRUEx~*HON|FDDaV%4wJV=Jza|x_di4BIGxfG4&Gx
z?f9ZY`X@1;Cj03wGx(woE6Gp1h13<MlM44`Ee8uFti?!6%Cp}wce51DyZ3~PIZSrs
zq%zMZ0Lt@E5OW`10-dz@a$<1LQkBdVfGK|NnSb6baUKxQig<sNB=Q0|!R(E6R3e!K
z32N%&zd)7JYoA5T)D+p~z};B{P1=XvQ*z=m+(Fv=8bl;-d6_LtD-|DHC<Xyjs&sBJ
z_27f63ZUvtm3|8|;(+6usHN!at^lNYZ7Xg5!)F$yAWB1}B#Ng`<U;#qL+%ckDD?B|
z14nK*;DrP$ZJ;&px|TDm6YD#yq$Kt}u-w?4zkKA7O=v`!+$GQ43HE^Gj(56I6f<`(
z)!c<EQ5m=RWv+*XPf8R&pmys^r=T@VF=|=l!I3WSsZFy!;=%rZ5R{<Jt9jArlU3{V
z{#(P086bB-Q3MQ2<xyuZO}@4FePUNr>07B=D3!6Qdn%lO2fzp^gx<Dox|g-gVugcM
zMu|{qZ6Z%C;;6bN5mu7#L0u&|Xyy#{KPPYEz>BoJUcIu|ZgDQcE@SlXflWrlj26&t
z`qBELe!HtDq8vs_ir(WIcriXX9UqO??@n8aB{d7PeH`L1#m7n}JXun5f1ig}Oe0SI
zCZ;q;yW?Lp(|wWo)G2XHq|7Ok`*9yB8;y*fQp(+XtyGr3X1z0zd&2*jwq<{hC}#0-
zW$vS#7dm+s{C+bgt%~yZW&4NOeDZ7?194M$HMgOsS;<^hTI)AoJUOquK1j3h`g{X+
zcpZf-B%pY!LRh7Y9rbWvS89HAU&V4?j@tHYiJ3qq`jyQrACO*DAxKRgEpN!Q+J2#D
z_OYQol~i>?g8a#fpqP6}9_yK5GiO7Ia-&=dC-58SZr4;f)^+!j+UaCiyaIXBDa1`B
zguPExn2!)QxmT+f<r|#aGr9L(;2*D`lLD1i$(n)@p@qg>9UbYv{6q%N<56F_9Be0*
zVX6?yw4(1j&70cl%l~qAhM(YIpO@vD(7pI_HhVlg+vMcN2JP7xF+CrP1>#)qL%Vaa
z*M%1B-+Eq}`ul*`xTPeVNXks#__eCf21@-wsKK{}*kfjVEK-Qr{uK>xlJS<{w4lo`
zvQJN{3Eot5+&5P=lJ*4M<~=vn@E}#1w&Yu#$lmn){NoJYZ-jOe6S{QE-dw$*fY-{Z
z*OW*bShZIB>F57Cq|z`+3~-yDTiwuIKdLBSz9;Mj+{e`|Jq;`>3t)-&%2S~-Hf<Hp
zl$$G<Bn$o*y$)b|iktmLWl17j<}F*Qlz0t3N^7)Y(TY6pn_2?RJ+&2Y4xOV6xeO*Y
z45UV^T%OPH6eg$QimeXI9#A`R*UfMl!sK^0F^he-xgTKt_ax>wyyE<*IGN#<a@sNE
z-2`kD?c3s^{U@yZuS2da>tfeUJabRHDmvx0THyV6ZdBV)e`T-d^5?7AEj0S*GtoFl
z%7^PP@SQsMlBD*B7Yc9pn17JQS7grRRhiA+X&M)q{6bb*cz;#i)KyYZ&;bJDQ1l{*
zR3XIlg637A`OdSIyf_&2@(YW1DCzSq?_uIHE-=r*`+%bSKI5#=i|N<!SeO$o`m1q5
z+xIu~k>oGN&2v{ZKKt9P%zo}os$tl*GNrfWs~cLj1qmBxQf}nVhS9CsU^$c6EW-2v
zZM^NrH%V=DQ2?1_`_VduhjuaTxZW8y<VEFp4OyhWz#iEq9#jGDywj<4#)>3)kyMiI
z^bns#{-kMqx;G1CRexT-72KAG656TK^)kYJTJmY=_;vAZe^rh8TyKos2BFAf+qb{9
z`_d$l)aa+0qIdTX5e&2MNV80G$2ZoDzcQxrU*CR$_j@)uqo;u1*W|$Dp@j@3S$c=O
zZ-jQD$>4xRS8l!^QMcQd`r3%xM($`63ybTk>d^`y_1=3WI@H-#=615VfCF|5zo5b3
zGrh!n-ZG_Z@{=7FS9<B{0|`g|3bg0uH}ln}`B=_)<-I7I|6G>L#WepoIZydP)-DTr
zJ_(m$(X=TZAHKYM`yy9MZykou^9J^SYi4H_n~LKD*@QgUv+os8IymYiuR{ryg*Gcf
z^7-N5Eah0Cb;m{SzgVo2Db3!lb*M`9h|_Tq={D!O8G7JEj?yxSCuKzP0;QkIxnAGd
z?K$J^!>v4{M&U?EU%O4ExP^&37l-n1{%O3#9~!6B6?y#{t&al3PJV8Kqki%_V%Ln#
zez9jQPd&e{gS&KL3je3YUm1J<jEj?evz#ppA>GO3n^t_sCnnQoXC$t5#?^72JkZAa
z^KPxQ$-Aw5zr)=>zVo4uH>EZsRnn8)b&7G$=nouc!@GW%H{{+%6u1W4YMLunBt>@0
zUKuaG-$CTD&0|9lfmEvME5%tzq~ovRovc^HnYLtnt-H74_4P!t-jg^iiv2u8DljEl
zE_+n|^tdq)98eiQucvm{D}1}AKg&EGO8loC-bME`M+&~OP=L;`VEB`CKQ-%`<<)(S
zdP!m4GR}K-rb;EHZ@Xr*S|<>a#alG8(yHMsts!hol_LjMsf?9TJ`LSb88Lp@-OO3R
zBQ}B6STdKvRb7B1fc_tp_8|Ake)T%N%FwLJot?q&#{_S6j=v#eX9M*P<r*(9apXBn
z-OY1x=<Ii|DqUnuLmsb6k%MuHQ|}D99xdK4Oge;f=!xyk@5v03TV$MCoxG>=Z=beR
z@#fz}6s$T?Oq|Gi`K7E#elp79cR6^*zV-zUbFJj55eUa%oyN{f;|{ME$-+~|;XR>)
zrgn^1wR}%@=eWu7BZ9}}JC|T2q%``m^pK?PdkZ|+)*NCb-Q$_9uMy`76YjKw!2VCA
z6zR<Q-Jf_DKwWA0<u$T26p<4fUW`Fj%Fnn`HyW=<S4@=_FkU@>W4t`IwXjH9x$~8s
z3G?ANSh&t)$f(ETj%+J>s6t9m7cG?!|4fFhKr4A2#=v~bV~M@t`3qsyr&ARn!mV_O
zE+!^*Upsr~OTsc~s^A;-0IW^CUX@Nes4w&RhkcUpRSc=Je;r?Eqz$<fcTG1r8>1zR
z7NYjYDHbQ|V7dV<((p=u;1Wg5F;@8!A2(l#;^aB97MdzEp^hh$*O8A;Ll+Jzgrb9k
zEG}_2NUaEq@YQPbnWcfy^fRR}qrN=kznfw{`A}b>A^-EWBTtYN=!~t(OmALdFd78s
zoksTuTt@r2A@_9s!#ZngGrWcB;T!4wj+q4m4TjwHA@AqO!JT}Rv#qSpQ}~=z+#0`9
zJMG5rS4e9J-HU1?toUy}MgP8O6TNK5&E=Sl!zRm1GM%}W>qGzKkt6FW?#{QUv?6}7
zB0Z+i@7Znmq&-%BerY26w$+hqrgWNw9OYWVXDfIkOiUk|Wn}ismQLP$Ps(EGhCiR=
zdB5bmD5NsG_T|35Rc8&+Udfbe)|Xg3ZF!<#`16J2>@5#P_4Sh1RZ81bs%Z(#R4dbt
zC~J^=C_Rf;yr#}gVgH){yPQo~p%bdiO-EJ7Ta*ewn0TjR2Wr*WD^XGRf><F9idDsy
z4wFhqNidZM`3*(aQB-o5zN<DK-5_*tIq?hW6F%2|bPUUN>vhT$<<3ObaG7Y!XXo$7
zDMOzmEG?=|GhfC&@Y7Q-I!LML^YHkT!8WY?#ch(8klg48H|YM!1f~2{Zsqm|+A*nU
z9l21f@uYLtq{mzVc2GIad&;8eO-bUIRbE6@Paf&&Ny&4{3qnqnZ}X<Y?anP^n9*}f
zyE~;ChRxA^@-*>|FkDr#{n9je@G>%cFwIK`3GdyDHXh4YzPs1;BicvLLT=vRU;v-z
zK6-nY=KS;uu}rDuGbV^H_!D1;)?R~?0!V#oIHpKYY~^fYpQOS5FW(}^@o7^S>{$vo
zKb*qy=3H1$NI0<gsjtEfyFDmMv)@363qws*N-ck=uk=JaCLP3Ofb6UIOu_js=dW6q
zu(-$JTDp0&runnj*ENuZPN~mO<uL2M+LyYYjAa(|ZQW!QA>NV5+2u2`j*@iROK2O-
z%bNd*<04uF84+>sqj4B0_4hss^hn$ys`{vSiELS>NyKXYAI9E0p6Wh+AD2|ROQJ*+
z-H0M2p=?D~Mz*XXBQx21)Gb>SvSnsxoMSsFBZS1sI7V5=-uvKupKo=K-{bfFd>-HP
zSC9LT+d1#|>-8Mh^LkzvsvW8bN|dz;>qT-Zbwl_3k^&45u}>k#X_oEVeiZK6zO&nV
zY`E6mlEX3c*O~I!J2Tu$Q?ukq<c>lfl#dsyU41>9FPX$La!jHQOTBbqmt!~~G?^lz
zEiMA=-hC7+MurppbMX^pN0`|5<PLx9$pbqe6e5c{P~<shHF}Kax@nqs7sT8WIacN=
z$s(q1rY5ECNJ=R}_cT0k^V`?{O3hhs)~uiDL4s5SF>iqZsiNc+FWiH91qq2X)ne7w
zvTI)(-t$43&sLRyZHKA1iN4eDXqxhD&ll;k9n&(Y)0|?2J&}M)H5AE2zlF&?%t-gf
z__&Qu)zp+a{o-Gz`o%lK8BA=&HV*a;oV9J6IY!*88}u7%b(lLJ+C0zfBHDk2k)O)J
zU_t;M9Bmm_SQFCd$@ng!(#eu{etZD4nah$z9jie(=c^1D-G?`uqt)r3%)c0pRUF))
z=#zUv$!d3$cO#mA!9P&oSJdY1X4lP+t=^bXeQXr8kT6>Hxj!vvgwVoaW9+e^jnQwT
zei`y&)27s`icVZ(jzxM6M>lF+tzl=t(SF;`Dz~xM_VmVChZSw?M&PvqTSo<JhEd*#
z)sH*<g`V$e!$P;7I+SWHO#Zb*J6%@v#a?-Z@++5n&AeerN1MS#yLz&+rrfIZrx^$V
zJj%!5v~SN^?wW01@kMWSIkM+WK(dAfSbUN@H`4hnOKfOjBl)^X$B}jMSuM=A#yUii
zh3_Yp`jM?R)I^Z?DIBtL5whw0De(E}h>(;aB)`nYnkC7hzBlaMslu`gxFAiY^%XX%
zNwkr!=<3(oX-X<5n~2Ytb{?!lO~Nb6cfr66u3OslG5${4q1}0B!P0xH!8i7n>@R7|
zy~+=A%DbpXZYRP#bxX1Iv4~bC2jD4{2n$+Xf_?o4Q6`(LW&xWk9xZ<m!NXqvSm{@k
z@b>zwTMPh)_*lbRawo&hXGhfXMeKMz+ddjIaG#TYzwWoNBShHaxkDtPToSbviG@mU
zh8E+H@)aq|(C5evtQIsUUTN2fQ`>f1W(|(e?QCK^CQ<Qc3%2@<`?iL0FJorPI7vTb
z8CJ7lg-$JO5i-0ZEDkpPh$bX^aP>*vuxjooevx!Vu-Q-}+&jR!YNfR)tKY|brK@0T
z{N1yyG*1>+sX5X|rK7VL{TSF0^vqW?sWyuW(=QCKk?mK*;mhU3BIUc;^>55<6Z$Q>
zeyY39N@~#HmEaC`K5Zktb7okr$=Q^DX;;rfS@53JRb!82*NG#;d;J?PrI+;k_2ZM<
zkRlPix;{J~eH?ur$xtG`E^U#zOzqtIYfp0cgHqx!+rf|fc0O%%U}UV=YDa6w_r%AV
zvs-&>HKp7=*UJw&qlUZxd?hM_8(jaO);Fymt~*b--IdO261;HRI9|-F{`HR8?nW9v
z&Tt@haP9ND6_~*#v(GTf>)qBaS$w0;FzDRbDfViEQFfMLgf6Ov*y%mfgopfWzP0IG
zY@1JCD0Z#iDbUh3;;vi2?#7U{@Tl<i&uv-3ke=%636ng$naq7oR>LaH2R6iK<APJ$
z8n?9@wZ#`c9l_&V$Aq0jG5Ypqoi1OZ){Nqfa25vrTehz8D2wZJR7CCq>jnb<j7;a5
zrLxX5oos0|g&6a_suh@G+HwWK%k$>F+7Z^&Ym=c|kC*%++G&e>{KE80;XyVdCM#*4
zbMZxQct%CT5^D`}__v`q6i7JIv^Im3<QBJQ8Y|Q}jSO?1*z~oV$*wkSuXM&ua@t|;
zDwbLf9ORAMbhbNZ0a#5M_Sh(o!^}X}4&MXjHgOe`2&oa`2GLcFFm7wxyys}PaV9&-
zTuEs9qt*91_RRYzs7*ow4P-A+Apv!^X2H`ohaw>T58_S-F`)+J+oodQ)*v+rvGz>$
z9>C7{z_ZLM;voXs;(iOGw$rD`yQP?Y0eumHy(3*W(?=24NAwrmv~H_-2lNDbT4~K9
zThyx7Dy2GBhGcy`NBU(>LfPEc0)H{p6M>}#S&x$!QFbaJvJ_o>pMtFe*S%VGha!{C
zUX2?&s4?>@t<wrOBTXG_v-%9ViE;lRn{=ggv`-j4O;>5TZ?OiGw{f4KX^@`R&KKi0
za!}B_Qn8(<Q>DKdvJtXjb5R@PMCG{DywJvT25ZUgQ!z+FDBrwa{qRRF047}eyRu$X
z&NqrEsXWdLGIn#{Z?FqH=EOhvhY=-}50hX3|EXqq=Erh^>PwqF_2`CBl(gNarvndg
zEr+UZWCkm{E?72QUuTb0>E;$e<9dYdeRtQK>Q(G6qV>Eol$*FG90}d*yVQ{Z*ay0L
zzd+~1XXeE$u_8MU8GZyc&3A5aHf!A*edx-(&>6JQS6gJNuvem=&-yapLc(U)byBOK
z;j<^qt`EnQu|#Sk)yi$Q5;}Pgp0mF5OQLpVwP_*?EDJ5CX1*V}8p_&#Ig(taiUw0P
z&-%G=^SrAdHB|^3mE1jcf<WZbJWD=WA%rMWzLhc|NB>cq?IqoUYj$iuDy}mm`()EX
zoG@csblx_es_-a97S{MIku7Z899@F5H{nYRtJ3UeDadVb{MzZ^RBuLz)GzFkKj|%;
ztk}uK-08vDL;j-6!aHCtXpX^pIP}NYzr2YLnnvFZ<9h-Jj=bpNO!hS9H*EA&E;7Fz
z+qleEktvUlp4+kBA#7F^pI+#LwxKLXtI@EmU9?R+lnpHBYc9<91&&c+cJT2RBh4eo
zsP!-SlC7c*<SrCJ%9sc|8FXOuXHgSl>%k2c^XfA<7z58UYm4rAl1(G~?OQ8<l8&;d
zfH8-GTt_Kw9+TuElIXjv|A+|r6V2&2Vu_<EJd2~j(FPtILF%fWNb+uXpui%Xe#U)5
z5J4cJw;iEWVq4TSNdr$>(-ijPwHXo8+D7krd)(e30C`SufwF<@@SoH-fNJ*>Wy~MR
z0X0Mex+4})SDn*yi$HE;#<plhjUG{dMMkZ1LeThHM2O>8Bi7^EPiMsO;!U^o$}6`9
zD6iK{GSV)NHU?rTXOqmixE;>(?Y6m+*q2~JqgF>hwwUvXp%@-8(fS){5RHt&%F9pF
z#u}L<5xh1AENN{<ha1G|<qfhJT_ryKm1{~{QF*qWvFS$>t;Z!Sz4XUtPMRa;8rU%J
zn(}wOS3Zl?Zw6?bA1VJ14bMz*IFp@(*Imn_M{mu_<T<E#|EwLX{T_I2xP+srAO^aU
ziC{N7`_7L{B5y3lbC-Lc<y>x0gsLoU9Dv6wkuu$dj0|o!U6^ZygHxi&gXYyew0dkl
zevk088X?s38;WH9B+PaOEZiLxy5*6j9o-w9OMGg2`&NWgy>tCijYn)xRcei<$NKJ8
zhm-V=#m7B+97LTixtE5#DFqCpnb-&Urb2yXZ`CuxL%O+nDLocu`}$M@(`P~(JhY-*
zvkmle10J1ekiw?X>{<*JS1l*c(M@UJNe-?k9xNITt$2C^POXi%layh&nE30T1rJfo
z{S{)_M03<Nyfg!nV9nL*vZd`PyZ{{?bV~L0N-|`3W3tNB3TxBuh_Rc)#2hS7OU!YC
zs5{(<3CD0M*o8O|)?~hMjuz_TlO~cU+&uSu4OG25!lbD4BP3FfL3A3@Jg!;@6Oxm4
z^AYb6nW(AQP9!=eRbPk{?w(=Q7DwX;7rdOid^Vk`ca~eXcmv3&O<a+()7F@kmkt&W
zwM2cT0(JvxPd1YY(FFd%{PVWRo!lJHVj4vJjv#%HmFsfJ0>2t^uEPI0SJGdN^knq_
zg%-I`J9vygF(6pb&e%Ll@W@}iF-n@VldK=axKAK6iT+wT8o?L!f83<HVbI-nVf`d6
zD(=vaCW3?T$!hr~%q8wyO=!obE6R^@#9^og!JFMPU*7~{rV*yk6J7&wboyh$dGweW
zg`lg$?WiWk|IF1MJffOi`jNr(c#~V8whX}rLR%e!m5$SvQxB(6=mop7LHVU==ec4~
z*!t{g&@lD|Qb~(#8!nu6d^z<*Qh@5**<s4Y_3u(wXIcz*#4utf=NKhro0NumhHE#@
zzwfYVes$Zbt2%d{`{Gr%@&z|z_qdBrVPbs5#WMauba^e6<c)|;v|3w#uIW4L;B~?#
zf%3E1*4r|{9sN=rGKwB*7ia1*t>f=z?tJZ(t-Jqe>d|mqwkp%v0{xL*nMJ$Rc+;Sj
z{%<&@sp*ZGqG65L7>j7nk@tVT(y8w)ckh{La_>GT<e2Qi7~~n?noZYx9%nbuGyi47
ztkhpPx@~*Fr6Y=E%3*+_hq3d-nlGXAaM?gvuBg-6TUcm#iP74LXBn<okkCD6C($*d
za=VSCjda7<%7ajlzcnM19Iz4AlPo;S)kjq|G?V^mV>n;D-l;TR{ZaZ&p7qP54l~1i
zVKXRa$T2&of+?>nSQwu2rrk|VwCgThu@qmeOEtJDFv@G#=)P`2;=GFDNYX{Glr1fc
zF0`oLUHm%N!=zLgf|+C(ys>eecsxG_&os&3Hs2Q^Yve*L>)=a9{T1hS*;lF!q&MQ(
zZ@(L!kJy17_b(eWTljeI8_`sGOmbvMmEb|>rwU|YCKvPD2yP~8IVnkqxOxH2)6&*o
zs0D~sy`>V!=cs$WWuvB)!ngo2ZyCKHr9l{b0^=Y-6NHJUW-YN=1u|!j8N^?Q_{HCc
z`1M&x>Ow{r_fFD2@!DSG+menf*H%4*_Z-vj8+k?f*lnd=cEmKra$!^738sM)v<dwh
zcYHhtWNA1z>l;!v>+QB0mC=v9H<WdkpYjc!FbZcVMP48vC0Hz`jk|JOF#Efw#*MwU
zdg*#h5;4iDGjO4~H9rW#oZgGd_u6+18S-sv;HVEuoptBs>Ckm@&T%x<fI}|*@9-FE
zU<0yyG|~?~KN<e1AxCy;Z_|%*ZvDIo83XrD-9d`FueSr8Ha{NiTK*92wxmBG6En=0
zBT@g>&x)CZ6J4^N=uAc_{k}!ECwN4-{>GgKl7ik$81D3R@&-LfCf~k{)+gJO!iAO&
z!>mNq%maUaha1x+kziVv{%0h$%+nFg^{T#&_oz7wc9p_RI+dQ#l(e6Is5{@9YiTs{
z!;fRRm--t>YI_^8lp;~#s0eh4l}3CFvkH%<E>A(&`O!;_YUf@=G^(%u^(Ht-@~55R
ze0kxnM|TgWzfg3ispT0)!hM{^!vZVmtWleH>j6%Mlmp?G%}Z4g{lWz$jcZk@<tNS;
z-c!5#<>YQ|d5#y~?X?$9g=G|ic$&f)>Er;i85V2ffL-17z)#K$!FC?~a@W6xuUKMM
z>)dLdS~XhMhIj_~ESieB&-zl}=y9hdS6Bi^2j|@1<#-@*_KtXBwX^XBuXpE%<IH;y
z$N=kqhFIV=;7C||0fCptpo#$ry@5B05<K+tNr}bOa{tVGu{m>SLr+oM;^bWR_k>?1
z!&QTQU`39>0LTpsXM7mz#;M*AfxtX=^sN6M-xmC#S`b#gbP{(u98vI@5)5UY6h-rR
z-7)f!eRoyUmvBn4)OGcR%kh{GEZcQ3Cyrrfg!yD+UZ=@Bi{!k@oO9w2cA$<Pf5OMM
ziY|W_WyT_IG;KqhI^A$+L)LF;*HG%tip4IGnfr7@L(1np@wGPF&pdh9;A2Wfw;IF;
zFkF~R-{%<qx<gId$js-qD_vE_vz=vEaa995$|RU7b$EL}Nw3J>JNHTUD|NF@^w1s-
z&GT`+nB!cP0fW27HL3}N$-{spk@zT8m>$UIJp5O8{f0{q446FD@Ht-WG{b)m69ny@
z2sZh23B5TA$~Rdl%d-XhCF)Hj1z>_NnsUa<X>UVd%vzYfjg;4zrcaX;9S7>B=v-^H
z0At2N+B$(Ws^OzV$e8bbqL|-b_p{eM`kE)G2k9~e^~3`gVp+_+N<DeEWyu(O!sM)a
z_M1%0DoL*;=QT;?IWptWNADiwYdTPW&@K$}eDuyKP@+_}{G<`i=!Cfm4V<%)>eB}b
zwUYTcv4`u=oyJ{{vlQTE8+8myK3inCbU%%^yC|fd!ETOK9S)|(uY*~8dX&9U;ft@`
ztS(Kn4D(e?El=Z2{o3S>d0xhuLX9SoGuDj6Od2?ze~G(XrToko`gR>7)~Nx$<-_K9
zTyHzw?M}hzP^WW$c_kPUGAO^Vek;lz@zB}%5@bw|mmB2@laA`(YK_yq6;ej0#h+NM
z$v5b+Ye4S}5p*_VSCIIjzNbZ0IFSuV3`RRJ5V<N(Rm$W$N%e@aZd>D&?-HWHVj0LX
zS#aOIhgvY?Mb1VuNA5>p)+GIkcOUDiX_YK>s#q3<xwqF+we5_S4GI~shu#;h{ul|b
zMswVG6e12ebYgr-6Q({@msbkfI?x^~vf|k-MY-F(xjBK?Hg09HBL0d(NJXZ^do}$M
zY3_F$H?}JG*7Y4>Ob+Yo0Ibf;E6OJ4Mk-e7I`%n>Gv?=q2b-KX^UcpZTJi6h+q(b5
zg1z}Lvo@FJt9)nR>7X1%m}T?VJ>3Hqm~lr_a|0g~lYhyjR1NA0@~Q0fh#9`JDdty%
zB<-n72b{?+VZ$V?wDJs?e3ki&i1~*xG&q}7wwLdWm>z%UE*sc*QQh&J+#vV@dP%*(
z^>X(__%$>;`XV};&46#a*SyiZ#Q3b-Xxi>AjfoabN1^#RluW5vsblE^RD(~u>(c%t
zm9-pA%RHlJIIOhP&s&S5Dr8zvJB2$>7@96W(Y7w$xbiH<i<PJsK++Fb2libg?P-36
z#%pmE{HwT~er3=1P|hi8;9EHkKiT+LVWMNN5U@K744j&4dzFs!kN09-Rw!4CI|oX-
zY?zN8Wo_(uAkRf|pE~d?BJ0s7v5VkS!(z=Wjd${En)tRPu!KiZ8b4t?DnSD&r~Cj5
zqusq6t%kocat^<5YBNTSQT^-}z7rEs6QAR;V~N8~A8PYbi!#<4FVZqOWwJkLN-2|i
z(C~z_v&p%S>dLtTtPylKZCJyTsm7=~q~G7k`#^tyhbo=_4D*9rF<IdR$K9IqhooPS
zlX4WKd#@R`TWA-#TtDH}YEXEnQR@ApssjQK0q2I>y|Ygkxlh}aD|X|u0iRzdj^g{#
zB~Meb=ih_9)bw<mSha}bU;Ifh<g+u^Kk(G^=I7rTYIj<T=h%oyZKy)?*Dsx47^Bii
zim^C=D_VBQ!kwynwq}3Ns)<(VO|-=v%<5ak>|6{ATJ&xvrHWcezO<Xg9UY*gV%5KU
zo!XkJE*<Z=`J<X~R4DRbsioYX2X0rdXUp7GM6EY$Nhhe)7bO7HyoD-Jl1dGrQ&>w4
zojFAr@|QuZA)$zJ{aX>QA-cW7#CCE6aKsLuKmnoz#^qDGph*+cdUCP-gtxHp-dAP3
zV~!%}zOaT5cdowral4-dgYn!5QcRMfW~jf5n|-g~9eqUW%)y&+fj?f6KMkajWBIU%
zVAkxfUDk8FlXrnrHkKQC=c=RUg}XY;SKoU%cAh+NB~2$3))>!FEoyho?%t=FJ5`6J
zO4mG2!j$h4YB}$69ecRDkQ^7(8zaqrA}?C+)KRJFjWT_z*9O(!sRE_%Q#=j7FtoX`
zW`q->Sj-JvFT5zmIOFrvKy_S9b#;m5#OG52Qcv`=Msw9_uJTBqe0a7Q(+cT#WP#;F
z8HfG2OYmH%@wukzGbsZFMo&CFypUKsiL!Hsu#8@<5Pv;6+F<7ia9fi6+)bE+b|}SF
zcpHTM7`Qf({C;tPsh5kcY%k8UZ0*}lzpdx{9)M<x`P;eNZ}Ws=Y!ck#ybmj;Zyni=
zkfN?ht5N=?@p7M9@XL2Yi9M*8(tmk~g@luj1W2?Y`De$hD%Vry<Xy7w_0yTCbZR6t
zBZJdb9-$IIwHW*iDyc*abo2R1=~<p!)0CZ)vNB|^i{NjV3&8fVoGj63KnJIkkze6Z
zSdHJ_4XIVpedxhzc;n%H4hr)#C;J0?3m~<Zy&k<9p-~Zj8e4#Jr1#MCH%N#Px~Io4
z6lT2p$3hy7H&f0vt+2BD?x(d**vgQloDuJ^G-jXZa}uAK@ibN(Ma@_64Mob&WuMR0
z?yG)<Z3|AdrD-xrC=Ai~;mp%kxcmKx`%>>49+`=OV!>5HMb?(tSE)Gflw>*9d!Emd
zh4zol>w>*oj(X~xD<i<=f{%j{Ay~M?(raB?z_xF&58*!&&q^}S9o~|@@Y$8gRm%w<
z6W%eu8-KGfpJOO&2lWTs*6Z4uB+81jW@L(t=&`J=4)a$|4a3on=PyKhoYqpb;pdep
zdGL0HNbpzZXaY2Hz&c~OgVFf`2L%^8zx<YiUBmLV`gIzuN)weR!e^DZLu}zF<XO<H
zsMwjz8fPuUz>jRv)1l$jY?;PUidL{h(d+N?!eV>ByYaFK$z7s0+ByA7^!1<ZCPAKM
zuWr86sJVezS74fLFgC6|7i-@-^mXBP*+g=XHS!%dQZK-#lJ(lRCV4jgvH{|l4Q)Np
zBZtDy3l~Fm4vc_AM0X1f|5iUp(yLGQ*#jYWB7m}`+{Jami1@@fQlII<?A7&S;HERn
zp}S46Wmfy+_7;mD;SQ(f>jJ~K{I!NW_KwSLROV{OWvyha3}b!A8muk&C9Y9BcbDl`
zEAa-PkLNON8gozt7>j)?;<nMX(h@{-o&Nh_)OzAKiH4c9_>5~-uG@dX!~;m9$kaBL
zGj{~%9M$u}Yvsk@vyHUm=$Laqw$$mb@3U0gZQOrk7wF&SVdHuuJer@~Eh>5wvo804
zeITLmK$7Z|e`!(4qc&gPR(<?I(5v_&jG)XLV1uZb$8$;n6m(h<DovKz0rMvC@L1Ve
zh1Ktt?|C|}K&+TfCr^Z4(z|GTG9#C<y`4DZFY>nDAQ{6Y49NU)JvEiyHT6X^vep5p
z#ENfch0QlEZM|4XmOnVM+j{)Ll)rbmw=PFi8XfDFe-FxOW+Ryi$WZhunqN&jJux`Z
z$;+g(FVqIm-sMEfZ1vh}2Q}H_AZ))?|Eaw`QmyW9^kKNpcIwKHLJoTqje)0zt}73C
z`((<kN7eKxNb)HItYriX-!|3u%&@*h|1U?QjpmeGwVkTjQS!&hvHK1aDaSIA@o9Qx
z{AXtS9bjH&(UXv{R7_>YFJHiGbBXJL@``5Lk;xB;LZt|A2XcDGTVwFymkyFRF#Aa`
z`?%FPdnML*c8ZS&UbJ~kT}qQ1JhU}Fy1dY?OB2XGJxJUn-p!b{IP<<MP$v2D@t0Pp
z-5}09;_6Q`)oi^8z4Y>@^AQUJf>CjtHo9eni4K;-?)p&#Sw1S4fl!S&nOx*#oW`dr
zojR;;Qjq62iKE<o%bQYsigNei1`!`Ks2qHhROs=-{m2}fK&gXEjBEWA>DC%N?S;GF
zj=0bDlC6w?PS9QV_Y#M``0kgjBXkB_5%o>sItfV+^PsLrZpqg}!4sIOpA*@(!<T!h
zNK$AJP3JQ_1_^_pl06lBpy=t|c#L6^1xZLF2#*(Q<Z5R0`?$<27;dX30c9lR3Kf}K
zKR@P67@@zzS@*n<=8gfhM?jce+I3@1eAm-P(sfNLMTu9|QAA3Z7FSSC>K+^9D}7{#
z=k^g&e&GUV(Qktn#G7lJwZ_G+y}tG=9)}HHQPl}rab-W?ja&rgZ6~tq=<$q1Vzm6T
zoB`#kn;YE-HzZwnt!?m__8fK##kBo^hmqmGKbGXG!MclMjCw&SSWss|3XmZDf96~g
ze0E*k6Rr4~XbEPU^4^7yIE9)eQW7>lt-?KRjyfM$o-_sP0_#fVJrE}=;qh7u?gM4)
zE<Tb{3sB(Ozb|d^f>~ztT-xt12#>#3Q>92LD>prWrSZLn449q9Bttoq+I5{a0(_rS
zJvcR7(v#coVz?B$VU{dBp8|AQ((TD*ch&rJF-cElk?FoFS8J^!ezXsnr(xqbkxtoT
zlwDUf-=pbnd_v-Nd!jmn7emu%IU_I``kn>D@Z_NH;yy$DlP(O1{IPz<7$ahf`mBtC
zjpvOj2kfV8f$Cm#Z)2S1Mt+NDy6Kh19`m)2)!ldX%0ldrP_w*TXWPd)9P`+AP#6aD
zZ$24w+e&NTTbxkB^A?qZjBVRf2s?d!%$^u$kvQ|nX7*9LrIzr*V=rq%4MK`BUrOHA
z(<}JFpVwz>HN?thSNYNn?1qJ1^G#d8!JEl@BKg26>pkDVkD|h%HUw->2}Sr&l0{ph
zL-${OdC!#ZqAXtRlc+g=aUYLftww;0S>ScWSm-#lbuhLf!3H9<g<eSJ5ZLIHfD#G^
zuEKtU#u}m8BF<{c%m*agjl96r!m@<lGH!TM7>w3uVS`bQ-)9I&r0Tk4ts>={9fk_!
z=k6a}ymVMg`s+h7CQUis&zTIqoO5JNr*SrU6tq?jv#ZU0iH2f8OrUhIWTTE1amQkm
zQJpnr!UuBFG-hRt0R{cfV^rsv7=9xzwpHhR{Y#z6B&)9!l=*)@xrPf^mG!Ns?DocX
z#8G-TJ%xo#ljIv$2)U;+v+hSD<N~u}-ir@%_|5))ln+u5J=y55FsZUv;A<$-T(6DU
z+TIo0`yzgjt$*j>slVKv=oL%JsK>odA-9&~D}Ll~9#6tmE-bL9Wt?r@4v<VbQhlig
zb+*iA79;5$&Vuq=%j7;M5NU&|AAZM{S*h-E->-3VM1$92rado-L>2SbOQifWi9j|>
zJ7Mbe7@w>fn8PsNTWj|XqmWT_igQPm%Y>bejz=RghWX9<#ERI<Bc69I{E&KV%a&P0
zCxh_Sv#($9!?1IV)>NL0pMPQ_$GPpf6YEW~9izPeEq$mFnq^5gq4rN~@oYgGu7tqo
z&5Z?06{1VS_+IaHT^m>leF1IDmq`awj<4W5I!>(s)9|7wpLzLnF%puw?R9;ieo2to
zD7nuJWeeDeY<~&PR_CHhsB-G+GG5=D0tqnZ0)K7M*q>{+n6jrgbK+#_s5py~fh0Z^
zE7`e@fCW|v2PXGAf_b%uBb-jRsP>!Dp>V__K4%ZtxEA&RHHJNz(4#&rwqofBNBeeF
zg054+a8vTu5uc*s|IGT~cl8T`S)V$oP*KyCxco(upmxINDtc<!0rXO~NFW)>`>OpQ
z(pd;vv6UVTgj88Z#BRq5d@HBUZuh~aN^w?_8wd9AEWk5;V3VXqVJ;Jr-w;fT7Y{~`
zHKM@PCq|fkm2}`8H*9nWp2i#u@EIdFJu6RU+AzJvPxYvz2XCu@ve1Tjg0Ji6r+V#)
zEOY$-f{E*ojVD3Yw7$i*hO5fi0<~cx=EJkFiSo+gAm@#RjRx<#sQF8^W@N=m7#GDH
z3R@WJ7en0{XQ4B+4r2VPqsPQv|B5{N;z8EI)_IQ|hjRvGEE<hGLN&4Y3|V@+6;~$U
zqVP7Rc6dRw68d8#Y$o{^*b#ZJUSudJr#))U!g&DeP$e3)>rjg82~wJ99NCk38d+Gd
zXALaG|4TSog?o^d{O4Mw==cBEK!W4jg#{Ssl*o#nD(gw*in4}7fn(DUM5FjhM(X|3
zybvB&GEg<jYv!&Pi}Y_Qt6j@q)lJbycvpCwX|uL~b^mL9AP)B-7G``TB#D7OX>L?f
zd<h6YUjE?FjmI5U%LcDhLw}yeaYq`+5Huvo*02o0#zLxw47O^+B5z)M<f&JLtLsGJ
zGj8}pJNm%y#mggZdu{zzu=g=weS$H6<NSq+3xi7&H3l*AgK7!G%umX6zZ7D}d+**w
z8X8Qv_zES-XhYU-`BD;N4r&>2sDh&cTx?LKyG~(xIK=}PW{gjVLRqP`^c^*F4v@UI
zBpmz1o)h%oy^%z3(Lz#!{P8Ru+<CVT@v4tKq!+stgo&>$4jR$mZMHY5j--E^q<I$7
zdSW%GXJ&m*Pz{<mleYeRj+JjnCwzqEd%csF!<J~3wQW^nTJkq0q#NUK>?rEm06y%-
z?tFzhhhd59$DR8WVQux@miXx1oL{$OiP?Am4Zuq<o<KAsk>jt<&>cEP1v8>nFzLH#
z8V+yZ5v+uJ%z;*PSm{L)EdRhx6)ZDY!Hdd1O!BpMM7}0J&mZH|#g~2kNADE1Z0U4?
z3>wIkMdV+trOA{AQCofL3|A38XtuDB>#mW+NS*Cv=Y}aGl@;wA3#RPKoOT6Z6bVC_
zi_G>!SI1VezsG8~)!;^7@6q@Ubv9LAY!{#IkQ}j}tZk}_kzjsfnA=(u>*6*yP@KF*
z*yJOUTxHw`o{;nO;4UJJtBbbM$)Sh?-Bl-8Y>$Z(VHSbq%)U^;p&O>*P!gJfa6+?X
zIAYt_2cjX#3oD9(gRd9FC1|jbvcJO_=z?t>BuUYKp)}~}h}{o1^!>`meET&C)`Nq(
z^ao#0Fzun$>Al50%a_WX>~TtiShJvJg*$1z%JFOCN+Ec=?59lG#T@Mlojk$2JLpj5
z3{||6=(hm{XGgvOG~J~BUD7U!iJs}FR&1FDLS?gN`}u<;<jC)a2-cM<=Wu0ahJ^l}
z;`72z>1K!ZpVS@d0~sS#Ya<9ux@eoh%2_Z;`wSv<JSK?3a0xb73qN;2<zj>sbL3Wi
zM=H2tJwlWR`AJe@>T`wwQ-4*sC~AOU-tfjC#OummD1y)onPL5{u4JZdLaCXSmIRY!
z14$ordx8a?DF$}9kvC43xc1$}D(H58<&l&xK6R7!ziK0Qjd>Og%?8)U)3vs+k;IEZ
zUu!}$qaVUVLy3PfOnRlNr>XYI$5M6r_uIb9k-5hkcJAwkDY~LDUtPkkyDlsVhtFr&
zw|aeF812|mOX6q~C(&U4=XC0qK?W3wz14X+D<QHC2HIG*T95@b?a_DEM?^aCau=QE
z2V%VrUfnwZ-aR7O%6z=x3SI|EYAz}>E;Sf0W6Ks`?`$im!k7#FmX4J;SH-BD@pEuv
z(|#*$h<1YiuwS%EpSOqzZYQduFC**RwLhulq+Ysv;-pV*j_4CK4>edHOBOBQZI(To
zI_yl}%haqija=7d^p#J*bjRraAZq9Qe$@^2Y{-%!hvR%TB~!wADE+bz4^kZ{-9O^_
zB1<<_m=YKQHEJErEb$i-uVOS~jMb7}?0wzTQ8SIq@0|W$9s|m>Ep8Srsv=6V#H^zo
z$-x%8_{?~l7VhfBk5)h=n>y>W<P1wMW{8$!4n=>Fu}qQ_Daj-SAc3e4&EzT-Th)}0
z@ScyXwA%Ec>ZkV`V{us_Z0v|(@1P$+{R!0pdT;vqRJLZAOPhI&c}W91Q)C%VO2w*5
z_5!u9tqIIAXSNoA;&!@>%da~;QS2tLK0W6VOe+T2aojNzp6}nW`ZU~hBglGAy}BLi
zeUlU0s0>X~l!moIkSoeS=P1*N<C)~;p=yyck{hdK$Q(ZVK+2Yg`}Z#}9NRS%>FhN7
zXuf~TFCz#Akd-4IS&FQ+RG469HkQoxF3Vsin0z?)Yf<FR`xFFXr?v95BP^aFVzMC5
zcNN?C-6TdodUx@K_-xB)5NE+>LvhVTaj5%?bxQmx$@{><(5X|JcD$LDBxeNCC3v-S
zTKZaw>>p$#>ci`_&ZfjCL?%`1uUNCTmRCYj4@}CW7gz9M!k4gzuk6%4+d`wJqxA_Y
zdiOSwt%mohF6_)V+#Ae>U=ebEwAYP`L+O*%Mx9MzsFM>+Ciw2WkrGDt7a~xA|A*ww
zs?MF=CnNku;w)czNOy#8CM|6g<*%J-^LB2+Rm_SrCfOP$sf^Pqr<*ky{C;@-d$&dt
z=sh_Z69cR_mku$tcn_gm-Ph-;(3!&$6{+5TO<E2MyE{F$mkMd#e#BunU*xdH0yD<_
z2-C6z{A>uzy-no)p!ELKrf*@t^lQ0?+B%ZbvP1a`i2L;{jj`LQ_U$*>ac0S$s@5Z5
zbaO`lcBde+y7qzdTrs4!M?Hq#p6l7lo*c??ystq^^-o=>5OWTMU}T?nStW&~OGKO_
zCwW(^pe35{YZX-`?==SDt+I=6hOOS+Vt#NjQlmSV24LH0aU#anTzg88RLY2dPw5$o
z<^5_q4^z)c^Yb`oTw~+&12uWQPDO=+$s4|5&suMjO-Vgb<+^k^@~_g$Z`M|7MYfGg
z@4RcA>W3RGyET{f0R*Z#^f*-0F5`!Jm6GOas8i4w$DioJy-gT=tVe*A2~2o4BSO**
z^21Rqq+7;@7Ih&-g<rXHnOr!kCd|Ue$Bna;+wmcj&l1a5U*BG~Pjow0yE`-3C|4GX
zB%jMNyaDb@1x11eBQERzIhIk#v9u&!0i%iik3Uszcaz1MG(5Y<mBqVK{2<djyV|AP
zQBb=*EfP_$63Ay$y>v&8)u$z(f^#A-RrZh5&Auc)Lnq}J#42}^{4YeEJit-ZKNa^^
z;t`Ra;GRktaxI*BM_t!}_b#ltFh(9`u(?5*-tTkY$DS-6&EofgS+=TNXltJ(bLw`f
zzFpK<Kd*&z2F{$I-6lYqIDK$=gbrDZhSgw8LD9q`Ke4&_Z*WSBPgbXx3>V+-@ZYN5
zGe?_UqGF}XJ=CM?Fyg-Klh+xPvS(g(vQYO}9Ha7ntVg+KzezA#YJO3DW>$!PX=r1w
zEulw@cEsiA>kORH6)dTw@riJ|Zkr3%tnY*N3>Ox>ie1ZGJ+Az|)q>xV-G@$plS3cN
z(zM#S2>M7ZrF=6-fJmZ_{gH*Nc_5$HteROE=oHngRmfO*pmWD=E3-!KyLBlh50(F6
zpvW503#yrL?h3b7@Ma~Z`~~M2nQwlD-cyZ&<Xt8Cx!AJVf=o_Z86P{cV@)iYGd6<e
z7fExO|C9!}&qZj6SZe8Ap-Uay86ZJ0dhbcrB9)>@)>=w`iQ4xfs{ZVn?<1;oPrys)
zSFp`Zx5(P>Fh{uAB{1pj;I}yD@(*`QUsYvQbXoisJ{v9acF@=Z%K8;dKCNeVpZjt4
zZJQlMt_NbIL!&Oy7d8JVSYQA)=E6v)JON93vQW(O$AHkbZl1p(&HgjZaDBW#JaHCG
zc2=*YcH|uKWLexBA}+v_J(6m8`rx^@3`PbBCw5tk$>?sq$hA0)uF(>fc1d6(2eLGl
zFvTN>b4t(S@R?V~8}Le{(jJ*oBY8IjbG;pe%d7r<&iI@g@SK6i_UkE=yq*Wkk9Mc|
zbLCTILx`sz>_UnM?-~|AYJLeU^`$!{=!0~W_yl_;fydwG1@rHGWB|L%diksu`r9QQ
z8bhX%tW<dwu&`<p&yyS@TJCaTlG#s-`D6y23spFIebBIs%FaT}p7h?zD<%&aH`IY8
zF{;w7&hd@c)a6fMtZ<!zG}Jo8I)FyT5~q8tG7!6(#&{ruD&c%xM#Ef)Mu!>j+iP<c
zrBFYFG3^JVrlmjJ%llTl#c99tV-2!YZXEgh?DI3^{@&{|>;e=)uo;pxdFjUGZ5du4
zjv<yI&TZq>)?WX~G=9`5Jto+gN!+qY#P6?gK)?)-NpasMn~-5Rv%$NK12ln~=@`{}
zbxddx<&vJYxDnGwNI+jE^c^>B4k(Wzs7y=FH6CdueS}wSEm3V)?af*mP)oO<d%8o$
z=oL9ScrMVGaik=5)9tGwFFWG~N_eG~DV5k*Asdo5na11Ez47ynt!45-yCG`)pKJC{
z0y?6*3eFNMn)WLqe4M9d{bp##Yr3kXn_9$oiIk3NJPEo+(4z}!H9(-Y_+L>nfEjA{
zds*I2WG4kwq*k01{7xP{RZzX$qCQiLpkz?_%H>d0&K9>8g9Tt_|7IUl3F{d=o|k{|
zX1^jbxk!*wM(v@&CSZ^hQea#Z`%jX_MsOYZ1t_LS2cI#KVe)i<i$~dW<-scR2Ub!w
zBaL>Oz~?knr`3*;ajB6R_Z)F_WY#pzH(c|$&aBOj&R`=gFvgBvlQ#0Zp~+8moOZ6i
zfIKs>C-+dGGjrJ7M~wHAGL0l0jqk@IPuNY$GrDk(Oh@{IiX!WiH(pC|>I{kGLI_8(
zbkNInIl#nuT-;J<O2%YfS5ag8vvx?~H4PJkpt%5_3a4;GGWt8JAx1x}iwdQUf?ZqZ
zl~6y|M)YnbC^hMq;f#TA-EuJ9vgHkJkP$KMyhUn$u&3!ImO1Z`x8!kite^R|?O2^I
zAD#&F-$H?|$+NcAE;B>HiB{R#Cu=%<3}MYGLZX^!_ZsY5ui>L@!cj$Zt#5}rfG&E<
z9!Pj2Nr`vLcBg0h{AG|`f&Xxv9rvdG4sDJ$AeA@>3$36R$`VCRm@QF8KdAFlw_FV;
zZiZ)*UENa>o-4KbmOgm!ZBVm5k`y?xGCoi8Y?vhPQJJeoYtLQR+zr)mYxNj(qgv(N
zwf#OJ$u(C%c21JNC~;{r3;P^Xxn1V^LyO&)uhTnq&Wt!$iS~QtPhD60f@@2M@r~I1
zqH7MTc+=dk(U;c+sU<?37}CPWt<jbYESm)_02}1wajdA;p05fU<`;LrBH9&4ULM}@
zOetK{fn(b%#Fu>83NOMeMtMSaxhpJE#vynM1*lScy>@8&Enb_^bC;=`H6;H&y=quE
zy&V6;>CKyfoyXU87KcxDt<T{~R@#Ma%gCq^d(HiW%fNuBk|8*NI)g)>NsI}fS^Hho
zQkl!rh!r>!WeZFq1s;OLSnOJkw?tJP$_6ttPF*lA%Q;~D5L(r~9F1Hk=D@zMI4xXE
z2usqKWO+s<O#7jL=3IjJCT>{+qpL41?)P&6idUzN3GZf`3Su)aWmt0M0>kp0wMiAr
zo3Ywq(HO3p-LecTvpgsI1;di@DO&kq;tlSup-Sf*3bG?nQEyn#M4-!cAlm^{T2`SO
zHRHA7k2t-z2xz~>JDh0z7s_f;;kC~P>HEtKN^hU*0#5xkt9Ys88_S7=%==_5MBU52
z()){YFklt4!UXRvLbuYfH=m3?9(yw7l~;GZXYSb!v1?~Wb9Ec-4RUC$%Qwe1Cd9)<
z%-<)2P;U554@e@*#y4IY8RGUnw$Ii!B`ctQhBg$<PUz`$PnFL&x!3<OfzTMSEy=XE
zR<oMjDc5JrXMS!g*K`&<VYHtETtQ&=-020Tx*<;QB|<b|T=q-hT&^3_xn?Obfrlda
zR+Wh&`p}#N-RPTT4(@rO4cgpslcTn*6Uoc!kN13Y>^qdwa9(R`R-e+!vhLfnpLcvH
zF!SS-T7Lh2o4y_Ni*o`u!Q=_An-OBDRSceUm$8RKAx#&uzSJ%;RYYJ<c-<h|YL>j+
zou!)Z4FeFYN(PxE$r^0C&vP7}#O4~2+##!xT2!bZZ?|#gCwhIG)ee{Wp?+`aO&Hq~
z&%ATOo=?{s<%rzaoQhDONFiv$7lk!n-!O(zlhUKCAZV))K?0)+Z+X;^iB~>%lj+FR
zU-k-zSNCBB<2t~>SzpqzQ_Di4G<hjO+VayB@oqlOeMk8&$VhkrHi!mv11am`EDM_1
z6fLSdvvF=0ee03g6IkxKm!(+AQ6C0I4z>uK9IXIU`0sHgF>d7t&z(t%#Qi7JG7gdB
z6qj#((iHpe)a>vG`nsx%;pE^>-2a9>eDWd^DQf+^JK_HxFHeF!x#G$Po4d*!zYF-Q
zN&jFWDW`8AI*BmAqv+&WBQEvVdb)EQQ2&GsNWjY=qdx^1t^QpDjDm2&@4qSEdBx`j
zX(-E&H$V9;(-7c+TEg+1_s&xGb#q7(eK3Vo{SA5fEdB3TD~Zo~joVt2YGB|6(ic3H
zld14Z+i&6@0dTC0DnfyG$84kmw;W0`M&C&X=`qxE{SkZyfIs+;;yXVn)gD_RxeNyl
z+d4S&O^DAR2swyr4#gnK9S9!VRWeuxnQ9iyB=4dQM7#kV_lwyA0y(_`X*9;n(6v-N
z_KP&{+1(fxj|VkIH`5(y-KHJtqkjOg?1TnG*BaZc;cQxhJtFwopYmqLxcvy7Wq}S1
zp==Sr_SXQYwfJJ0Sb~1#^iP;?kTgaDzCXC0TWE%C)?(v?r`{ba(K(X*#sUiqf{=%`
zel3Rp_<!kHaObI33c-PwgJ9MMZ-0BHu!BuGDZ#=xH-=hP55X|uhs0YPOdU+!t>hx@
zhYhs(S-d#WHAy>#CgQ;Z0HXU4`Oh6Q!B8{Oz?`x+S>~_e+gK=aSCT<F>MrK&5U9Jq
zv32)I7Gjj6_zvc)yWzwo@jIxtKeroxzF<lso?GA@n(;Ja1@D1&&<=oQ+D40Z(o3*S
z1v{b7kV;VH{CwZz>z&lHv$0;klavGwL0RRWL1^W*X=ZU#B-^H)D;xI8?mkb|%_#W;
z0i0IIF61AscmWr|Bv-4j{ghz>EZ4gF`30u;;MgK*>j{WleBbhT>xwm<BD4P{0Va|r
zhTGp_iou($;4yL5U-s51Ts8Qm-m|q2cz!s-ij}%a3fClt=<@D5S*^B~3+-)=sy$X&
zebo!=kNclS;F|ybr^77RZzyt5Ku`&}LOQ?%#}v-k58or1suj$ig(FF&p8AlNFQ}7+
z@aR`wubNB^j$@;qx>z$LfSL;*JG3$6ZtI5Ti}-rMpfJAqc&c@3DD%%-I?WuZa|oiq
zZWNGgQZuizZLLSak3seY_g6vTZ_`okM+M|te2vh4=nYbU*#hSMrH`}gpTG;~Dcwa@
zVbwX5$x>ym`N;lpH4<z|Ob{&^Ccv=eI!<sI5a8%H@6YU~xZwNbYUZ~f%Ae6_aVb)t
z-aYW{%`)>pBd5e1D_Jem$IL5T+9oSUJ&mhgH+RGtSB>^M<?a&f^rUf3wWmdQ7C&YG
z#&bWo^p0ZnRV%)M9R-947|O&8JKJy^NbDWmVL~pv1i_$Y+c;aQF!;j++%`D$oQ2iJ
z86*of`!-!J`v1wY8%SxW{P7+SX-OewZ`%r9r(A~vH|bg-n1W_Db9_WjUR#o=u<-U|
z+6${>1erq~suu;Oylo8usS=;ITn0!N6ueCZhg^(dtLp~=5QOymcsG>wEvpr%D*Y7=
zPVQbp?{@6Xb}a9jn?jV?S|0|2>sH6x1iQwweXv&<Yms=?V*XvAwHR#Lz8IK@+nx*C
zrBkZ@eu!4@C3yAS6zz&Nm={ijAQSAQutP;~1L!x4{zLDR{WJb4sH0k(Fkp8i<9;+(
z#oEu=ZyJ&JNJ&1pJoz89)!twRvN8(pc>8a?-wdm8Nk;Dj)GCwR024;auU2~RG<kpV
zBH)HI`+a167L$o9-b$#YB~Sq6*GG8+Uc!~XBYwt+V1x18h(9T|Sw}g6(}{LT27MwE
zWUKcZ-!tZy$TnL?JGkqLY`T}DLFvP@<Sd`*nB;E6Io5)4Vh3?cyvz0o=o5Kvb;z!M
z&6Xvj4tFaGH9;x!l(j*kS(c)Ys85NNHCV*#+7flw|KjoZQ~AN-dKpG^*VH-U(Fn3k
zw;mDh!8(kVwOEAOK5O_ykTDfz!Qr@c>T~dw6|mmu{SLl}6V25AxQVz;L8i?QN0z;r
ztcmrflpi50uNdo95O6ca?2Pl2gnO-~O~tOSJsrNhFKj(XEnDxD46@tVhp!6gl>i_&
z^kkaq$Rn9r`(e;ZNEX|<i$(?nhe4p~;>PUtZT#?XtTiE~kzf!sL|7j!x%>)bZLnyw
zzip~WtS=uv`GVZf)CHMD6u_)lo#Aw|VEc{H5cL^7R$6Vac!eEKAA)5;1zS9ynUY(k
zBh?tO&DM)A9=!P6GCL8Z|B=zNoXIt`PPL0&*Ai{>1?X#($8lfV*AZJV#Qoa;?l(Jd
z_N0hSc}oLf^vfyO=XdMe;3@y%XVsZ1ZQb!_=Q`rh3uYTJ6tU(H>--L7cZ-eYxPF|F
zwfH7CjNE<rr11SG5|Gnz3xR*UTA(SjYkg1cI%<$~@-|smOq7o?@DN<zd*36QP6lkv
z^@8VX;d}0hrpzB|bLz%Uy|v!kAntk(TQjgczQuY0kv{F>n+tw)qAl`5y;Grf5i|CV
z?O>&&D}go<$h^1N^6Bzr{fZ#fc`z}*y`wnW0Y>p^`J#<jAH+jdH4UIUf&Ex@cz1$Q
zxEK|m<TY0W6>FC*eC128{*9kwKo?QUkldHY2uuZ%gc+^A!@a$dOVl#R)q|TWJ6i-}
z>cL2LsRslop_ip-Ol|^_8fW8d^$Cbbs`)}}@;E8)z`6X3oB?CUXbnB=1fV3UHt?7I
z@b${Q4{&k^ov5E7zOGS+&x4jQ7?-`HEj)Xae`JjXP%yc(_f7OD=yQ^hHP8JZc6Acj
zhHL{ihGn?z;FilaQf`>+E4U#~+$Ze%F=lTtMM;qFmin;O62-YPM%C7T#cvfkpLof6
zlXCECD~3>%*`Gq5k}T@(loN$VP~K;&!ASN)ya}*551CPlR<^9J0oLKks7KT$fq<}a
z1?^S4txc<2>a&XXf`wlWh0t6ni0pVoOv28T6my``D@!`9Xa3Wcb|JqjE;^=v-#>bU
zV~5}5NYO?mGC9L1IvY5Rh6)N;m%!u|!VzAMwdFksH(SA*glvJ}sbC1MmhTZ^o}%O9
zHS4T#w;l~`xsp@M<*fAkTVUT33+C{^L>~l8&+P6>NV6HLX%HRKRW}^sL_U^VT<`X{
z`1h#f!)64+&)9!NXi+E>v%AePyXy)WdnjaPx3xUpXC}51yMu==tIL*N`o|9JB*vb1
z`QbYi+s=RNN;t_X;wXg$Nu-B}dwRCOCDMg7(Hsd}DIRV=oRZG0GMm9Ti+oo^7v-@^
zR^a)@pxQ3_e+E|nNzAWpz&$%#U6jh92Fg5DCdBy$0TisJzGd`5b+a`qzVm|kGNva_
zhtKNj8Zz9`hnsf0U~D+-tzQeEP|D%WcCm1uyPlJj4Y^rzgfdxo)%KN`;RBBc?H49<
z!BVF+l!a0juJ>5Y|8qJXAO!edPeEb|nGDHeOQ7~f3eC%FcAqE&A0cUo@j)$=zpF~O
zk-Sv``R|%8m=#Rb;mZb|DsWIBm$(GpRK|VhhCNWbJqm>z;`3F$aSXmh@A^J=l7e`j
zs9LTMdlS_yP6uk|+#P;A|LZ!LbUgm`6-Y{z{wb{c*AXF&D0&@VFJ~%sQM2|05xaV%
zDMeB}h*u!PoeW9DO+KT@4%U@2zon2r9Y#)JD5Z5*ENHc4d`szMd)aG?*^OhPd*?=a
z)HACBMub`4Qf@T<{(B*m|GW)z9Mt-1*#Pt%L<S>m;GCgMx3mk+P`c$$9`;bnJSS(h
z{k{%rzPC6+L*XZxBFzO1j=(;fBUIG7tHRXN8A32<{>d`(f<vD=L#YKeXaDqSa&0Tw
z-)>uJqkjJT4__7dxASm7RPQ*}Vvuf|(48d~g}mB6L_c_TI=8SLT7ZO|t)eHe9t*z_
znh}cF$+Y;mi${Aw>h$+tZa%iJ3uZB>GWrlsu3~tXOP6yT1BY)tT!k2<tU*2@{Qvyg
z$<N?WuKM_^if@C)dw^0z>Ta`#11g-QWqCS~4^bnw0z+rTXLD6^P+%)$NJ3`?yctI@
z-h}73bT=}^T1XIlQq}28!6IGVVzAnEW&h3er+_iIDOh&9q9G2-UyS?;-@_uw_WLi=
z4Ag=Q|3m<lN+-XTCV8>~8NU}wj1kX`K<0Le=7=>oMd^aAMNVjq>73W+KVPJO>&>}u
zL<Nr+aR*SvBTq!Ve-J6@rKtA@xk$Z);2tpJjq?&-Urn6wkHfdl{@oacv@;gYN47+v
zo#y(1*GFPLjL5DYovhziNrflVzcGzvQn=_g2<F8rJ_~Nht6fiA@L<O_%8(@*K5d2`
zX%aDKeI?<*;g<z3>|>^6H)5ED2$!fc2q*81v6sLvhth_;TYNI*nX2`y2$bS|jy?J@
z7SFskKQU#hS~B~7fMol|;vh^Xqqua6S+V!|sBosN@q)JPXsf<Rh*(_6GPD2jO<OFY
z4{F_C3Y|WxY7ilJMDqYuF+Z@Lix<;PeM8C+u}bZF&TTT)RNEB<ox)u7Rrat3Z-On6
zi+J>^CQ@9$$EVZoe=OSmZxF*sIdDXaks%fKFk&OFsMX5EIjD4j%HJ)V{0Rn1f#QRd
zB3DJbJgI&#`p#=O@2>TjA;LhYh$zswOGPW*o5e#GOB^<~LyoLjRpG0#Ly*r~U!8P_
z8(@~g1V~Xw=%wb7aqoU}?k|F7W@i(NSe!V41W4xJH7I=ZJ52y7u-zvO6z%%^@R%!*
z9TzNtf>1rKoSCWtfnVX80o?)#l&*_g+OE)-s%7{8QppoORb!o+EKMB)?Y}VPG*jys
zRbm_@jCG{=L3oYd_~vkMeUrYjH4Y)ceilqiTM_?JFC62jg*n(YK!}O>urK`sPjZRn
z@8m&p{w&9XO=uRCG6Lt2A=R&AaJmk=&s&jn&V!_hK+4PYM<dG9Y3JY@>`wz{3Nd2J
zpRa+-@M`?Jv~He3jS%5mOzmqf!&(s>U=G_9CIRUe+am4Hc`Vlb+oJ%Svi~w6n@cTj
zAYFvTGa>ygOpG3I92B1ov6OowXvrNU*r^7lcB0!L&zC^4dLsVZpN$jXf?bS2r`~!H
zS**oVlbyRD*sVOj0y5o>`%l9g^J^s3)`HlL?_nqNbxPO>J9zQrK~Qs=iVZZ&Yr=wG
zOOkx3zx<`Yd#B$2x8A8<>Lllm%uA;l^36S4;vB~D^yXmTzxaBP#3qs<?z=KSY?P+e
ze_i;+useU_$~GnOr+E4|q}{rP9FLr}B-zL(P$3}g!zILkPTjIi$}-+`PW4ptUBr=X
z7VQ3P;(F8dBYb{>1dZ}<P$ZjxB*5?@I$Lm9|Ga<C1}pi!Ls%yuot!ZNet=R(sVQ?<
zt`h%@_oyiT;O;)q1P`3<JXGM7b6SQS0wQkiIsDGw?$Mf-oDk#1=2&;E0$#EI>38~_
zewHCrR;gK!1V32bFAeDRfn?nW^@CczJDkg8b^31k2cF_@WUWsHo{PH}9^k15Y1C;A
zt7Vpz@Kip#ndKHuza<1g*K5(e7|=50Qzl<R&MIMV1Ctzs??@hA)qe5jRW!GL91<!-
zyXZ$PoQb2}JK^f|rvvp7T3BQ2SPh$ry;=1ds;Q`pJqrr&IU$GXczQ9ztQyC{RR%im
zb|M|+gfvNt*1xI0DeUINn@rzN`{3Bx3&`c;;Xv)9@|~gjFr?T<Iw-?%Mf{%PYjmKP
z!=Pgiz+t@@#7Q)ergA(xD@i_MI&cdQPk%pIiTF02HB0DpPzqWnVD<`$oY?!udi+6S
zXWOXFclwfdbpU<~sezShTeRs<-a=7CI&c++WctBM9?qZeGYE5F_i$tKig@EQS1OW8
zntu|;*CO)nFji`5=<b|*Ua_gSRp682+rSS7dl-q71W?wBw;1Gw+oevw3STEv)jR%@
zbqUm{na#(}aO=H6ESI5T+kV0m@SGCN8%@zbUd)tZg*x|Yjwf#c{l4VUVJx-F?{|B(
z_TM~xnrZv%3n=7R!vk2UcUeiZS>A~I^#&u3$H;BLwm3sXfb2*fZ8lQc1}*9<`Dc(s
zU$rF-4$`bMKb8ix_FbUBS&l%d5~p)Pc35+yvb}z(zp^jkH(2wb_n*qlNA(<d3@aW)
z*;b54t4||9NHaHdTk4h$V2W&t#3s~Jq~47>3{t%{cv523L*`Pb(M#$Nf%l*hhof>y
z`hl7Y)C|8WGV|+!)*-o)KyT`J6?l60_j_2)L|DmIz>TD5lwmBj-L|%k2ffo(O8c`C
zEGx{Q(e`hZtSYq}Aj^EO6i!F&@lwcpX(dQd!5*F)sNkytNraMp-c<{qabrlPoCs`D
zCaF&wLbn!okr7V6=l%@s{>BbO73GW}K7?mV-+kriM-}*50F=3NP|#b<A0e5%h-iRX
zfzqLX2-`vp;pPLLxc})ZeM<lv;Oy>67|AMS>^%kfVMM`L9wkXtU5jAioXTWRF`&?`
z0HI*3S$VmhX4eWHQc3y|;5*|G?2p}VN&~@|G9>N3=qipF=}`oT?U!2pDG(6_72p4^
zjz9GNOQHF87mg893aeQo!*h2blA2S%^tGb@z-V0zRl7Q8M>BhJg8VbYA3GmHJa${F
zu&iw#gnkycmVZs!?>SJ-((l{Sb2K-aM~c&F=^(8Sly|b{?D`*P!440}*RYQB&MLod
z$e!Dt`#0MMF54&gw@LTk%h!c}&!sxTVB+AnIO8!uiD0Gd5$5Py-lffrp$x#9jrahX
zt)~%}-addoRIROE*Vrabuc2LcXAG0&pH(Kl8AoVQr!GE6x&?9fHo)msv+sqpX|55<
zgS^hj*#=F3ja-fs1brt#*wOhNTnH!3lgKE8R?l0k9`d<^#FOFQTNi+tWix*k^2-lq
z-gJSwG5fnAGH>z(2uBHZ2R0ARU;9v_-xld2MePHrJmdaGzFx((s<B7~1m@%h3cQ({
z)6Uvc-1TGKfI6CNB*)Q}pz3*+hHhVckzHxJ(vH-w*^av+1z=0;51~)a4w?S});wvg
zVC&5qUp71M-{gsL=iWt^DUNv_+<sAUJS75RiO<h}W8ReiAJ+{59Lb108j_)=bn_wt
zj^qF~N<!shU|J<b8ZJ9_&jCsp0SYo6U9yTEYDy$sBL{tDH_y+&CLXDSqUiS_ua**M
zkUXltOOd`dJ$eO{7A_-LrNv+wQgPD%ANI~X9?JLs_mWCcng}f@R7!=iWv^_h>|6Fo
zWKCq>Qpqlr7P}<bvu7QZrIej)F{124vW#tJ&ik71`8>|~{?0j%bN)GhoOwJx@)_fH
z-}iOh@9TZNm*-0m1?#O0v0>@(sb9;wf>6favP1&`HII?c!+8*IuyX|}sp$&tHs{p7
zCh4!{RH0vkK~7v@eLJMYa`syUe<F`xi+#!HYt3<K7K58-Te+zK+E7Oc`ta6*3}7C_
zO~E)@l2I#*-s0HZ@79zpJPL`_7-tt=4oOE5kM0D0`*NYkI;4x_|C0vcNrvj9pFI;V
z0B61|Tj5raYxo-%4eqo6;gezzLDab61VP>E=^OLxz>&^xRlX>+Y9G_it)F4ZKx;h7
zsrA}c5uB%EoZ?Fkx&B31V52rCC?t4D)a|mxQc|`|8-Ac-#I#5*>Uyq&G6J6@zoLLB
ztUMaFXwab(<w)daInFzZ{Hp%QNkCC}n3GRClCtAaFsPV5LiFWR!2wi;D@9&xv_PTs
zar58~`=`$j?J})OVj~J?RV?>TRXCT8$?cQfwU(+$ll$jfIjI{_=n9-i*g;AJlo`uW
zEwKP}S<{;7{UqE|rGf^u1Ef6UnQAn6g_pjk9=V}<Wfhv88<yoTKczHVLZ;i&Z5=^V
zScFK3FiGh0$Uj!|3l+x_<H^J17kCKD`<(1MQi#Ou-O4qZnX7F>2tlvtP&TY@GKbAP
zfS_06G-{VE(pDz8mv}0R^MzvGE8&Q$S64XKoQs<Hf1*#9GyWiHMhHQJBLsW%S9;{Y
z{uwlNp@{nJGK80m==%B2bEgNG%v?v~zU2)Hh9SSwy-;X+%6h}(G@-t*IPEi+m3xjY
zvK6tEsMQE~OO4BomPIbGB6T6bk?_xYAMQgk;s~xHu{(urI%=8{Xm;Za><oj=R$-*?
z!R|BNL`X6<^psyY6$HM*1p_gm=2|Tqg*;hlhZRc2<?1BS4E^UCv}j62=sGJ<A6n&{
z_Z$c&h^f3)W4beo3U}2r9WmFuA@*Z2GgN=EaUzS^iHt((41G8#Tp~d{J57=WYh30!
zZGCp>{H7(y*QK<8*OXmYPhJ97<NRU1H;3*9T%$)p^;X+}s%>bwBVV?$78sS~-l_{p
zZscU;&!FhURb!FDK}dsrW#plxVZ>{^A^mlR7<@LzzIhT&DzYIS#}Ju+@R5RS&$FwX
z;prnBV7=;#vU%X0U27whb|YNJ<-#u|{ZeOJlvvESpZs2&O5<c2KI8L*l2P!O8w*d~
zMKl3h*ab3lkG34{2tF_Z3U?VdIPWXVsXCWgsFmSh;%nG?$|Wq{XEEv&?3dhS9|N*E
zP+h9njRG;R^juJ}wK!B3DP5G>d1o#{HK7kEZGULCn2!|{rfynPxOHC}txU+*d~hjC
zmGSciPJweP(4)b#^TOVszkASeWS5R8bwVMF`)d!*gEe3^E~*5mwFVDbiAJctx^gQX
z#UWITHmC|^U1^#cYH+naX5Q6(StX@qA$tB>xwGWFa=~$rKgB-44g9mH$!nbdG3tKp
zE4`<-ZcEiROV!runNdNun#qG5say=*BGF|8lNQkGk&Z6UpMgG&c}ia*k~S!q#>Krv
zR11C2KL<fo09P_IZG)N)t<0=5YA0Ra#EY2WOgX;rvlA<}d8LR}6k^|=E}fblhJx<r
zfc>5L<T4p;)gF^w+RmcwIYjKDl$_?Gei(~qS?;3k{yG!;v}}q31vx@qrI{5xo)%&r
z_R*4lz{)pN9Vo=7?a*MQlO6MHwslxVt$irmX!LZ`3CQa?^<-DX*}BfoYg$jfN;>)V
zI-93ynpQNL!!pL;4*iqZCdAV!hE@K2Nvn(Y#eb+qPt5@opTEu7pY~f=0{)aO%qIqC
zd!gw{%NWp5bQ=g(q*s5MqjUh{o@slIn=fGg=wXW+wGh_KQ}G(paQkrodflZ17}IE<
zKab<Dq2L;+yO+O3Dl(a6S^4z&Lmva~aS9BT^oCL4Z`S)6F`wOr$xub56@My=63ZM~
z;=0^8q(qk&FdBb+gK5inx<R~R;^{K!A@L(fci45!vGV5dtyN6KZONoR<Y#7Ds!bXo
zByTo%+AE_=Z|Zhq7;Elg%PzIpZCTJFkNM7cRthyP>$@-8Kfp6&?hW<|CN54mY?<uF
zrn*u4T{p#{GF_XwEQQ(TT)$UQfe96j>>eiU5<&((AtuR?(D<4aKRsgCuO5O!9nn^y
zruyR>F`$0YmNiILOxvCrVv;w_UW#YMe_#B}P{Ab*DDbb0W=zW#G>_zEZiv^U;dC;m
zsyz3_pFhG@;p2VWf7i?<PiDF0rviQAv0vm{?e!MRGD8Ecr(83h6qoECY-W*X<YB|l
z>i7tph{mSdqsj*NLbWdZH~X3QmLVOwY!_w+EmJxR7xv7(6pb$*kHB};8I!y_&04@v
zX-Pa_4RUKP>&!aVa0S0NyEqFc?c?r7dNVf66~Y4h!ACNtF%&Q2$yw^HJP)D;Hc<JV
zddJ!uUvo<I40Q>1F4G>C;6|@W$Hir>&rnR03pt1*;3cCBJX&M2Xu@Dc+#hV2qP!o%
z$>521#hZh{<CWa12-O_*b_DuM(ZVNCh&2s_6T4p@E<F865k(XvPm4vo`U&gr7vxaI
z-LPAp$6tP2`6S{iSNF<%kG;JI$5^#1B_<B5Quw0oR6&IXUrje;l%XoL%xC{#PWKLk
z1@$xfX7yX`M89eCii-%%jSy}>er6K!uG?G9BH7BiT$TM#w_FX;rnv^?+Z&U%Iqg$Q
z*>JCyRwg4b;fXnU`t8K47t1LYK&+VDXI<#zL|<BLkD)Dsnns2_J4K$*ng-GAK}?4-
zgQtr3-a=cp|MrFbO8FOUG-zlei!TddnhKz}87!Of-TE|s=bq-V?|aN9p*CE^#>X;c
zdu<6$CwXe6eQT=%@eGrxaW>$wZ9b>@G~E5r(>`kO%?can!$`a?xa@|yD2=mw-rt8Y
z*Sk?<nLe`5A*<#1o=Vj^%OdY+20ej3v)iI;7^*$(g>vKtz$W}8CciT@j~mon+;7S=
zBsT+`Jun3wu8p^eq{Y_Y8HGq`j;j*I7AX)69+X8+LjwJ37bhycsvaTj-cW~mW59H$
zZ#922V(0quG|In0DCUmb%Ki&9!)V*_1qu-ueg$qhd`s0W8}cVp(xgG@>&Rt8t8<*K
z9T?*-h$2b7-nvZ>6?k|qbHI$i5RwiLg)1IE1#Y8+o2<yAtPuI^x!6Qlb=2b(+0_bO
ziKDungl7f2oG^C|OOyCG_TGMYzFhaSBM|Wnt=^u`*y|3&k*_-Hcukrws0N?S);MK@
zllkTY-(=tF(tMFkP)gyvQw6M++{^><b`$znYNh@B8cIkNVLFpx4!Hw)Q}(<gc|1!$
zTH3>Zp4Bo>Q`+U57TW6^BIr`nx!l*4H)GNt5%PL_Z8|R81s7OZtLS(7`?mVbfMSck
zM86T|1gHHt#1h22aTg9FEfv&6GWz0=mVl~QH*fce?rgT$LVaxgmXE1*y0))F8b=jF
zoVyFKbw1yoID~1`6t+8!{~aIG^fXb6g7jmKhFBlcY|Dz;uSSJ8)c=!55sNYzsNwDM
z#*bW<-AaT(-Y^yJ13V~Eu`E@r0As;z$`d5Ji2|GM%K@+4W_f-ny+^(!AT9kCZqG3{
z+1beT;1HGOV{7Kw+z7vuoSoc$%40g2p;SR&ZjOWZ&IWDdj|uLE!sOq?JdJRPgd4em
z3#D#4y@pB&E;LpM+!wX^uB<8!ER2*sVE$&mCWLbcn0H8Bt|wRU6!KBac5km45%kTP
z;HLYy=_`G^e2)7>v<q7;?PjZQ@(AbeHH+;#J!YmmU$Na~g^TLwd}gO~k_wVtaw8w#
z+$yIYLL0S&$lZ-04XS6|F-*Jf=pr%$fMyh`vGHYuSDqf6&);-;-?N<R%vzFZR}N9|
zHB;MNYbWj>EpAp(24$i@YYShPKKu>{z0ZvKA=f09iLUdp(A8`6iCZ)xW@OTEkh?~y
zK2d}4xzD9i%1xY2+zad9n7wnR!@;;TFVmsDUS{-qt;oFnFFx=1#zPJvX2z!RrdeTL
zHqHiS<bk}x5R=;LHA#H*9d-f@5b%lEj_3bIG03WEg4)4RbC07EyP@W9a7y~X^3Ml-
zeZO6D3?rCM%pY|U<EtVOKAfpi{Te(}t*wa`?Z}}LZ}Q4$<YJPN*XA^UIsI3aXM`dM
zNnE4U@jz5JZVz`LO=Tx5j4t^8bh&Obb>$oOCG10w(smXn%-J27301}ohY;ZVDfMp7
z=_;^<aa-)#f)jF;b-sqk1aXj`G5os2GsihHutKg#Ozsb(bq@C8-CR-STu@qP36EGT
z$*WwqYZfS;mPPa7!g^5qyq8+jf7b<W)YK)B@Y-lUIs7EnLbLYmSFd0*=JztyUcvp*
zokbCaywo?5I$Iw$_`N9Crg0%g;_vqtrCWB|FrAgWs7-XFp!3eEaRqvTAIuRfG)+LA
zuZz~sY0TX1UoFBV-~J$)l_?zPQhX^byHlGtP0YDRpzZq}TLb!U!4<_zcT)Zcv(*DZ
ztdHm|v7{W5svCiQXXR|`SuGqcc=Ba0XF%b*ZpYcjgB9~LPirj7m4|Z^moD$`0HGW&
z{DS<x8izeMY^rsGh{5<YmL3GbReB*3ga)<UE(bS#MQ6Nqu-%R*%)zAPknt^eK73I1
zdk0dy@LbkA(}%3ETXegRcYAl*W4FX-4F~;AjRg6^URgP6m!^q!%q<VAv=4`;`AD6M
zd}oo;EPL@lv*_Sz=)ID)69tf<@B8Iw-8?e1k1s-IO-OR1OqahBy8vXOP!+->1*%HX
zpr0GQsQ(F|RSNJ8R@}Su{iV!+1CKsFT@hR!8^gV}*ettKfyO<b*H4Vo@{sqpHh2Pg
z^tQ8y?^fWVy#~#!mm28<@WCC~3_r((a`5$!6bzic*#8l>I^-rBpk*?MQ#hbpPHQy!
zlhv6s%!B*D8(a}>NnpjE&l~l&`UjEJt%FT>HbWJ7_lc`Didm#DSGE%m8A)rWhE}#|
zZ*(^;O=3`}G^Y`5NB)!oTZZ71&bX1~diHRs)=uYU;d+wcw1D~n?aSDZUe<jDCgq|}
zK{{I`8(`wLTgJ5#ap4NMKrM3c2AAfrR`PXQsS3S4EX~>1p<KC_dKVWfA2n+_XV_W%
zLL9k#`(lo*xlJ_|nmQ&|I=?|f%n~0&*^6r&*;85Wq+nF9(8*+)mR@dKOn6ggCdA-;
z5(1mTVhDTE7@;j~Z0570bk<^f4~wl9{Rms8k=O%PYw()|{`$>)vCn3|3^%H#o${G&
zEk0g(b3GnqVnEOGYX1dpN~0a@Cr9^C)#XA?8Cv%_i&egUL8b8So2gi>G5gi&9=_Rh
zpJ^kro*LcGqlXU!?3Uz{OfENhKpT|CpchCGMUeFZuY=Sgoc)K4QVzq7+=kc6!B-25
zL1%~a#i8aj-D)9f`>|?)<C{N*+!rM^OIvfQj=sz8E!MBR#>>f?!V2w6E|{BI9F}4+
zmcypvvOXalb_x?JAw_x*HOiDrYcs8uu1?4w(BZ~y#q4LU&FQUB&9)+XXUM{Q-%;Rp
zeCVaNAAYPFCx7#HnNhhev82MV_Ttxr1qT|h_jCn4KVoI8#pspO+CP6RIN@{mbh>Hj
zT&t&Qd(K`!Zs({HE86CZ+wWP<nfjP6Tg88wE)j|M(Cl$caSTX&!P28q?dHH4`%&|D
z7Vj8grukSsM|q0{RY~S@e9Kw@`ko@E11N}JLm2}1>rK$Xjq+c=?le$2A@{EfWlS<5
zE+KgucBRK5rx*<t9O(WsVBTTQx?tYyOg~V2>|JaC4NW!N*qcH9Pn!c?F-E*gFrw)$
zV9Zyi=!L`rtqc@ds8vwEKd`M==2i$3%pt7H^Uz}$0SvK09fLq2?RxfLlgy}r>2T7X
ztu)<RsWSsBQ*`f?8PRMubQoI(FiJuHt0-Fkv3zNN*HGP23BM3iX%9n~%+*H)lxc!?
zKhDZe4<dRWuXdLA0Dg#0?Tjw>=`;=%0Uxg)_n?GAs_%D+WFD+L5`4AZh0&^qjvEp`
z+09ggo|46}%g481&9fyePiYqPF4;=G8PE;AW;qua%&EGVL@p@M8hOAtd_E^T@o{nM
z8Cl1n>Um8EqnLnU{_>kfEseuTS~1e@iH%fFl#Lwa?uL|ZqGP`Hw_;k2Mogj7kw$7`
zQydC9u^72tErc2ZSgn!BqmF@toUqqYWqkux<$@@HynIe1oS;^&)6En-zOuZ<nT|ho
zQ&B#r_BR7)0#mn@p;3K;v1H-gS<Y&L#FS2*J(uz_)HHfr?yb^<{vOjq-<C*C6U36_
zuIX?s-7h2Ym`@rL3OOHacx$En=EiPE*(4ifT<W=?s;vdhI7H}d|M{7B;Q8*ynfd8y
zFgNA;dkv$-$x<i%YLIgbouI{oJCu^AF;g5HCUb0K=cA8J8W&Z0%Nb`{mClWOswU^?
zVX1vC=j)U??*WGN{O$a$%~mnz1ucwhRNCR8_S~WIYvz%+G)Lyxia<o8`360;a{E22
zQ*h*BO1!r_Y7VF5c^m12e1{b|H&l*5&Cp2{wv9SG@B$`XoWwxoMh2v)Gk8dwNRN5g
z`#C69E=T>kKmeDYzTWl{eL-^X_B-5|x3~TR9U}O-{7zYM>JFjyU#oT<o1{}4A6RiN
z9IBcQ`N@=XYFw9RQlF+@wo>iNKxaqxQ1@6)JnZ{Hlw+ioFL{>`@szW*BNAD7*JD+U
zPqV^KnOC>JGK=SGx>;7W{NQ=|ml2WbGiQe0bPq4dYPLI{=5Wet&CxT6kbJZ~GV&cy
zRUw-8Y;4BEJL_Mth-*YTJML(WQXVdOiM)#ki%Anw8~K?xOUtd^2$LAO12af*Y{jA(
zT07OZ`Zl9>&%#EjWoRozC97yI`Ct0JkqVG(iUA41xpKda9Fkia*+p(qr_#3ZY>qg7
z^bD0`l{d>>*`N)lwc0a65jXzmozrusw<q992ae;AwAuY}J8NcHCz22Dq0+C;KeNGZ
z=R({wXX~X`8fzlIl09qm)dQRC%|wQZa<w03Lx#gV!t&L^8KArn0gF&2p{IS|`h>C9
zsmPlXvw@2~__U(v#e~zbA?=pgy6-EDM5H`k)(7#v5BFcSLX-<HQ64HuoLwGnl#Q1z
zX$C8_3haZ6KX!=v1y{lu>S(UYGboVJ)eMr=&o;2eqGtm#AD0U5ETI<S#!M=ig6|*!
zQMyU#$**p4cEBn?DpDxYA88rwqkhk2!ud$e={ybfw<!;r`WUALQmQs6Gn6GKhMIC9
zLJ-K$(*6#ViO*4&AWipGC%ib70YZDwYpwk|l!o@>(Zch<z$LwopY7=+&c^~L!BK0H
zP;U2SRg_Kmu-JZU0i9<rCQ?NCF1Kl=ruW$m-EAlk*N*m@cS<ThC*am>Df)ml$}LAy
z>xRfMf0D+$+Xb|%__(50;CRJ1g5LYl>S)W{mo;&u5ry1`w94TPGRxN+<6=>`v<qd^
zDM@J<dnmS3Jw#D-IR@p3@k+@XGHD)s1=l=PFd<{NR&=1r;{oCM4?#^cba(#bj9I<7
zb9!*Jk>Q37*^Z68>|Nx+uSw&$Bc)U4B_GbSPi^}hZDIzl#_q+k&M$A=c+eeRFnOLE
zH;{jjY(X^bL7b;l<mR#;w;3I!(%eg5Fo<<b>Yga<kajxipcYUihi7LP-g*8sUt!8I
z{LudEPIXdzqlCtI@8^)dIZ4OA%c5xY+BCIkL{VjB>SmcE4H7e7ZGL>X4^$T2J#<uQ
zmcY>~WoF&Q*?F)psZa6!!JI!g%Hx4e8d)-!!XQ#X0uh|c$z#U~o1t#LQFF|zdY+Fx
zK35idJnN0ePjSNK<RQ+Rvro^NSlLX~4|^Y=;0G^}$5L|kZ9QIR5K&x5tmu$jx@6YW
z>$=5Sgf41A)`5(If|^mfY2RVEZsm(>2jg#d3_%ee+kbya-Ld0Q(~GSfGYT)fHk%xO
zp1gWR@Q+E%Zk_X!{ss3B{7JQE7o+9UHaofb1{1l$rdsAB7eku!0d<;?OCHvPX-U18
zs82l|SYRP!MtkM6-gK%YpStDS1f9SSw^+9aS8WBArG=Ggog<eT?`E4CFI~Wf_5yd{
zotVQB_e2~acOb2Pa1Sl(`$rhT&m)@Uy<fNdvb4w$7C%xl9x-|N;RyHH`;Gy<XnjXd
z)@gV1xM%QSsbIfyXo)@BWLf>cSB(S}C-d*FpXJm4Pkj~RVa;V0G?_LPo<?cgN9Lag
z_kU!;x~Zpa?*xHTQB!^;nuW|Ou9u+I%J~xF--KrLVmZQv_h#nKp9p)8AbF6l2EjtN
z{_FKclb#a#zhjL-C3V2wwEB01womARW)!j|mmwal1^4pE{Mbk)>hI1)lmn~Gsby97
z8xw^|qTzBfy#UGv)y2_BZ(|K-+#Y3`PYC5u%D(*b7m||hGeSLIq&zl(&BG^3#oPTm
zMkR2-Rz3Z+HtCK2l;IrM<q5m88mpZ0b4Ah~rqa+b9HF_7Sk^Q?ymP4f$6QZYXFBW=
zYL?4hp-`LyiFHb9qZVra`Ol4mlr-e*?ycMj`|WBVYgyM%(fvHyaeTzQIw5!lTXYaL
zu0ypVsB&Cg45}0IAv~_{qV$1>ifvc2)}cx4*z%{^qsD_FrPbD!Fcs`WK$tKD!%Nl^
zdQxC-W-EAB5#`JKip-*WFjI3#MA-R@m(Qp0AG*BaqG`QmeW}hhcH%*f7B4mgm$yxQ
z)TJ4cmoY4>MJ@f9yBP}B5{!yYNtrbRuJp;PcY%KI6zu)iNL@8Uc}KKIeGvQ93SVx)
z7k~aa%YzR48Pn|gEBLg!zh(=9A(5*$1A3uki}U`%5GfA@zg13@LlN;ya5e~5(w3!1
znf^A+pzY?Z8DO0cZl)o8hj@%zzcP&&5-)ybq0hoQY2@`SV}fvz%vlN=SX#FXX8nxV
zOSROTRrQZ>vaTRXR<<wO20yKC;gKzwVZ~`7?IOxcE~$dfrdlNBGY@=kIeAPv7@cy4
z8t1XoR96cBGh6Da5FZMu4Hie8wQct`x`G@HOQ@-Jzv9r|pnLhWcKgI@-K&crwiE}V
zZ2u78-?VCl_RI~4s94cXJ|{-rcDsqYDc1YVne1KGZ7EpSU8ET1&@p78k-3Z@^j!dS
zR4!-^?5{V&NuFWYyEJpY?~$|%tdV*<_6Et)auBl#A)P?kpWoIs*v{9prxefA5DR#@
zclZkRHfv&qetNpXvb?wmBku|6*`Hw(4CEQ(nTp-v+SSiPsK%q3GrGUuz)oJrrjCA_
zwv;RCD;>jso0>TrSu^J9IbW6b2g7Qh0aX8%GxyvaT#3Sb^WA5@T58_NN=G(1t&u}(
z;<T#Ppj)HzZqyuwb>?eUMeVO~#f^%Tm}53XnGu~F+Kv3D-?6f>cuaYYly+guem|I4
zI4>Q`=F{n;goTWgdjtwknKsFB-wL?5qgODBaD4Nx`*z{Qv<<-rX5CSgz>UA}rr7ob
zYnaQnOz$N<ynx1&?vHH2+5N#r%tT&488h5~0~mzGx*zpbX+yPM_=XA4e^qI8Qt8?d
zRxSu(+Irstqj5qnZJ6X-z{WrAQRCIF0Ud}#8*=PZ)<{`+8Lx3F_PXF%m)M3GEe59v
z&A<1gapr7$%@{>m8z7qMwkG-rLi$?Ig$d`FKl8y-b9(=WGSM>cXciCr{?}Ssl6<33
z>ZJN>F)0nAJD^UC+Wcg#k2bBEdUsuepF|&RpTpSxeV@7D%>=7H5Jgc>^$1Eo!oc#q
zoOoXc%5*a7zF$U`2g*w9_SNd=gue7D?Ugr6erK;i@cL*+OzDvI3#a`P*q=yy6X6Q~
z^nU}>aJA?_qi7h0wLLhbcm8sfxAfi|EaF|M8hqOL2zK0szqc?rGu>oCVX#!1cAZ~~
z2|;E;evTk+vZzXPB|Osm%!34%%T<ogz2Q1wPp3R<9lwD!NQL3=*_(WLBnq{BzD5FV
z$7;-jA|H?U5=w{FZ@6G+b?M&%^7I5OdbP?>J+cvq#3O~4Nv4%QbEfRRKQL;y!R?Uj
zznm)QP$gwFlUJLIl)p;>6*}6rp_xM(V12LjrUJZ9Irp^k5xsd3wU^yhhtU>uwxwG5
zMh6-IB~>r2IEFM)ZLa<^kB+yE&p#(quvrTM^Kq8LJ7=?wHD1Awb<8{pbUj`h1pbix
zdhHcsSQQ2?VK$0Zeq_k1K1a!ss8o-Ub-)dtKk|?^r{z|;*|xI-=Hdeh<U^60nQ+)3
z#50HQHja998HU?{1gu%a&ue9}P2&g=UL-}B=7Qb}djaR34i#d>8`g>ayh1EG-|Tff
zE9zsXziHm>Q*Ec*+y-9MX-rw=vg=|_H8&g_F=T|965n`nY0)#EvB7-9-u2RxORT#T
z;53`Ql<Z+ur+4N#EM++aUJEJOZcA2-lk4C(3!Is^o@MQ{(e~0yF7`L*4Wgi_8R_g%
zHQD0|gxWXHT0MN2(^KI+P7r#a?4@!3Q6ivgu#73}XB>v)mlSpn-#r%IKJXn^KQDH>
zV^KSYt)^903=R4#7<6gA(GD1N(Px`FW7o3YGL4TZV;*P%>6R4r#dW+>#NDGoyhk}e
z-P*0vNTdqXO%yKE4D{YIo+F3jGD1ssXOL?ycntBzheet`ia^=3DV(gfL>x@u^S~{m
zD7QlNd2)qyUnzb(*&Bp{kIv5_{ML$^|MODj*v|4sk&@Hls`ZNrb!G*fMh;SKne$?h
zV1tT1)^JB!|8L<l1F~W+Qv}%kt@!As#C)NiSg*lPu(+@v%uA*0uCoVMnM^s<x4bGZ
z(5QQkH`Hp_TI$Dn3zYsM)sXG^qR4TY$2tZyb^xpdY5f)wt7E~rCrFYENN))D-9kT$
z)#V~sk1eV0`$UVOtq^k{H|Ne=Zy?3Jc8xh4mFpKGKbR;j0c_nmUA5j$TVuYt<x|Vb
z)Ak(hxzh#W4t)<8>=aL(TPzXy=YoFZ)v`TT`V~0SZFgvVtjaa!Jb%7-49k(0Vh^a8
zoE;>86#HesY~r#$jU^QZ5OL;k+Fz8CGREc>Pzp3`D+xZ+vhyts(#hSwpJup=Ms7xF
z!+CH4RSIs&p1Ze1!;)irQ3t@JXrD@Jb-XlmK&TOdC4Z_g!75VR`ZLvLP@0qe&K~7g
z+236$?8IUx)&1@^2ef;QhsyC=a(ldS8QJiQ<_Ih_<KQb%#wyqE=PKaoyV3w>cWb8G
zy|MZ&S{&)s^Fawc3oA!2X7H2C^TNM=$&C9F7C9~Yz{HX$#;5$m(Pj7$<FIbnZt#L#
zJjzNg9@FXWF0j@>$to|@6>%tm(IbYO^taqSUB~Bmq#jEk*CebUkL2M7oOhqE_R7PS
zo1INNdpmRC>vA3{H%l|`0#q=T*@Wd6a3GEy;<xKMvcsBoFAgP=fzU3TmQXlQSmRth
zU+wIC%+KW8ahps2zg?ueVopGkDOEUkz*@Glb2hl+Rre<`;_}TY+}ExX4@pR<q$u)T
z4+!tFm(6myHC?MmK4ULHB{lcyiOfTL#Du;8f3_he-)W|p<J03<S=9#E*Egx-!VjeB
zPx2AOUn&Od+$v^eI)|eGDkhJ5t2hH{=D0a7P0G1P?RyHP<5-XOE$?})WiPcWUPq*S
zCV^y@D%_6`Cf(4C-z_KLA}21d{%XXLrT0&?ztridX~-rDGZSBn`cyd>BL7#9aNCSM
z)xC6X&{K6TXYcaw{sC!wMSte>%0^PpZQFW>xq$*7&-V}hEFLi8Ej-=eXf1!5@6tU-
z+L?h*OAbc#<+pa6j!A<w;=-avcF<tL7_47uu^!Hcb9E~ZPhQyDa6!TFdA-;|m1cV3
zdQrP?T~Kg7xpA!VCyULYa2OgBPCX*1C?bvopTh6+G`D0c&mG|$c`4;4tNR;o94;2X
zNqvEHA^R{x|1uv(T~Qt*hTd_;O##@&dM5JOXUJHQ%{{XFG8YE~wr`Ne2kce>q?^O`
z&s-Jc;3IlU>}pR3Dyj>=LuP7kVX7gf@(P{aHcUWU-L`kl*=GAVALfVPX`8>H<s)r7
zNG;=%)m_@dv){UQbe^~icJbK!^7Xngafg+l`0XgD4?^72i@P07P6SAFKb{=>CULG{
z=x$ngyJd>0uf1o*w<$C60sBEA&Ku_fOnx~(cDkI8>`pfLu`wU%Yu!Hk2Hu3VMrz~R
z()q@U)oRO<OO&T{=`(On`U_-IbhisqGk0&_Q4DUWP)6q-(&Ulo9=+Qle%i{V^E%t#
z^Sa4Ye=wV=eC#Ys<uPGgrd*G(WT3EY|8aRXh*lTEm)XotEp~6cX)eg4+(1SkB{idA
zYg1LRn{lHo^&Q<G1<b0a^_qoqZrRevv~PJLZyG|OcnY!LF+>pjaRYGC&-V$jG_PyC
zWe?o&@(Iat{X$d$KgP?f9+=<!4-*n+`uWX@ytKv%=RxU9_Ewbp^d5D(Z|tG0Nprl{
zYby%&ja(it5eio=UrZP?6VkpGPQx%~mHxfM$2tGl(oIkKTI+kRMCakJfv!8=H!a;Z
znuv6K9wEy2LbUc)#>i=^&~E9E&{2zCBfA2T>ocN&@$~vONBH%=^B^@d=UZDr-aGRA
z1~lSK<iooZnC_~`b5Z|*d-QDkh5^jYU3ZRP1Usy#E}k$s<YzRt5x<$bY3fU%1ku#}
zHNgN}ia!eFowc1Eox|F9+XvqHOigg*3DLPQv>-VXd|~dGZop42RHg$;>$NNIt9{}O
z-Rll+?>Q4QayqBPc6NN>3ZLK8Ag_!Upxa$~u=8l22iT7<!p2g3Q-n;riy$r;c_a9&
zZqD``za`y6vH{*2^h!ZApd*PH+1tbVUS%#^d-*Y%V{^-iPr6*5W_e#LTKqLM6J~X$
zOEF)eY`C0^JCi+^ZuwDJ%EQu7WEhhs#4-Cpw;X`bi=?*nLpD5<gqxhj=T|PzcI@<$
zXt)pj*v5mbdeV)-<u`Yn-Zgw^<KYiE`+1k>Ww_Rwp#Ug$4fEG)Xyp8ak_Rugcs<bD
z`4M55oadm#s=rhhlXv*hcG<TYG+4=Z3tVn8uC~cvqi99X;G-Hgp5uIb4YJ-w7jLRD
z_AuRXiTIts9H2#aEihg!{6HkFZa9%=bB1jHBIuv>ooIT?5(~+h%NsA5#+!k<+DikR
zyn{p%`<>us{|Ks|2>L`SjT&Ld!{(kezU@&a%YTigsV!LMm2TJV8J(e_3w)-f0Ab^#
z<r`~O;9RWCGnUS|aViwTK<x?1one-P1K7}xkeojgT4X7XEd>?2e1#%$!3s16a@bG@
zEv)2pNzRF!fhk>-nM9y~h!K{YP!QDNXnvguuA@$*w{%SIk}}Qr-Nw8|N5Xt)6cv6O
z5{FeTOK?mvZU~%?YnHkS6;>j>!X+uuGqmk57~IV>C{)!=lC|Eoq*@D=m{R%Dw)moN
z4S@qL)5VO^X1H_Q=fx+jrE&N?8^Ob4XK2ok54+{CG+gx`EW4(f&G9AYWh0ef_y1NS
zejD`KeqU^Iq42ijz+PDP=J8EN6Y*?x>f6(J{Y1v@=5UD~)V9tFlzBi)Gs+!s6lnH}
zS*$iKslWoa?kKEp2m=<QWNQVjM7Zzs0j0zw%pC#DZ!N~NcnWcxYkYPpI?zm?W41HU
zG6|#-vNL@@LyZJYyX;%_6K`KLMzEUwz)5#%Q~S}9uFP|6@l*M-YpVgLqGj2x+f`DA
zUf;g@_h%<oy+cr>S5{_4Y+UuRz3OmdpMX1)Z%@-)P?|m6#rWANXi6<6+%yJycY%qM
z-CAsOeCaaH69tacKw@|yyS4fJ{j?%|Y~vQK{pt0xrv8?B%2mZS0s%#j-L7)RKsZ3Z
zLuJPFG*q<hxv+Z}rNmR0MBkXk-$~m$78mQio31y+DZb@jYfgjo35xNcqEeb2Drfk_
zS3(+I#Erh7%Z9gA3l*7n@`@-tl%;VA(avb`gjn>`I0;T!U%d<}whP<4AxY{5$=_Pt
zEeYZGX@y^qM672_qMUW=!c5}y_TA3ycJ8V`6eV9%frRUV1J4zDzM@rgOG5in)76XK
zPwg+#EJ5B?N~Lt@S=U5%#=gAD#_Oi>oU})4ylfP@c%Oq4o34cAP<r8YBp&OGA73RY
zvEH42(RxF?`Gs90m!^f(NMz35&tC`fN@5#3MB_snhjMj%;{%3w(r4m^tJC5?hP=`l
zD#>XY|7$Wg{udafzmm|fQK-<?Ilb_Vh4io&CY8e1S=guTjPr89P1sKXGgQ?u$*^Fi
z4TNBj(|%Q_A+-MuZNC0uFmCw0joCr%If+rI`v{-vuF$P^Lqu0>mmy6y?iTrR*Vq=4
zuGQN*)Q&@G?hmdE_t~dqqMPC){mAmMW%S|$><RLoDUm0xI8X#NKmyD|`1Vx0DgBHQ
ziJL1aA@9;0X?S~Y;j&1JUvMsmDo=HvDg4pM;Pxde-u`out*C%}+{!bb`mFN79MA8X
zSEfb%S*My`<I_HL+A8etShDT?GfS5o650Gl9m{bc#p}pCMM~F)-A#3Hysawc7KBRj
zlG8c%%-;^~$tB*8J>dgFPR~N+urJoiJnxus*c$G}&%!k9(Y3)Tn(j;E=csblyqXcl
z-956#XYyb99yrL+Q!+cR;E$(^ZJ?Vo)py6kp1!j<P?Rr>yAZ3>a5X9rpZ&o=gqdi<
zJ?M74)|C8Z?-s352!Lev<+bu5fWAT*-%;j|qmlRjrjq}XkC2V_Jry!<nlFpWFL}8i
zCg_9+-;ph+{T4tK;Ews-^m**F`He!`#A7`=o9erH9?3%?y+ztw7H!=N5Tx@9nWlY{
zb_Nu1CPE*R4AZth=dm>u{<}u^GI_mX<`-2XV8qlS7ZX@&tfn1PtnR#n{pFT&?;XfA
zNymmepNqc(yWs!6?2l3nx~IFG)li!=aFBuM<h*i~d=%*KzD7TzHkD_rK?CrQWL~0L
zhMaX^Lla|P8DYbsTo+k_EH3GIl_J-H9?OKD^&GnUBXqf|ue<-e9rdrb*S9o`_x^cT
zMtZ$X<+&>NS}KEzYH1x{Sb2{-Vzqw{X1~h%u@4Id!oB|c^7RJI-oM{AvHa^Ohfl4q
znHB06xgF3YORkn^z`>T+54Lt7su73v(_DXVR&?zs=q;0w|G->;n<4q{U#w(B#T(aW
zp7s*E2lZW~;(%C;UikIyB+CDyFA25lv4HjWng;(*&g}26yMrF#`hixzkzC&*um8lC
z{T~SP+M6=r>w~fO*8e{}DysjN?%sDwDuyyTszE-zi=OlT7wnZN-7O<wk_}|FRa97}
zE2W12$3HTa-~Y9)uI=S`s(H!tw+jD+@eNC_?quN5zBvb1pQhvzpP9_ALZ3xj(pvWb
z{CvG5UNuUGg#Tqj{Kz|VYbE5b%oXL-n!HvY2Gyu#5nL4Bb+oH&zjV?L$`2`DoYvYz
zo(x3#c%0EE|E>ccea`h?>41?n?I@mVVzhm|bJ;A!)B@ZkRs)mhFiy`_=epCx`cbTz
z8f&Nibup8xkDPB<FLv>pP3^_T*Lq2=Qr`bQ%o=gZ>E}O(IqA(o{?`eQ>{vAdBcImK
zMu-I)?z4uiLZ<@)vy`jL$FCn}pV3O`0)g@_<%`VX>Z6@tOR%pH>X~lI17(;6m+60>
z^Pg3dAfs=zSoAD!jv@O}!M7@GICkB3L6&HZ3}Rc11}W@W+~t2hV=~aa^1%2SMbv!P
z-yImM+3J|^TRF^-mmcW6?jEVaZKd4s=kMU|UMd_SmmgmCu_K49*=I9KU?0v~9#5(-
zx-M?yF5E7EgmjXGe#<xTM8%dzihmouO(s?w)hgdqg_6cOj9x$u4wi)<U2_x1nn_-t
zIsC`a#bZaYjMIc^%EXyvSTpA(7gyV!^q58FvVC05({3L&Qb6L9R5Ij<)xVb@zIGeU
zDMxybrJoj?c1ItYJ+gMB^;>izaNk0QblIu)I!yKv$~h%qFL3{zB&urzYxx-sto;z5
zMww9=Me0v+^&?F$B#n9xMN&SWkoxY5wB2_;@jJ4e!=cOO<i)C~YuU>#*(#0jw~1qQ
z(ZeabsOUZIon{YOTvxax?e=LZY|VLtPvj4@r%OLoy4Uj`8H)3l{yv8$if~m0ywLko
zW>+SKuBt6~D)ie5w&Q2uWuL`Hk>Lx<e@~w^YIV-h^V)qiMvu{Wn5);{p9ylUuADN~
zt9Q#pmvXl*V50}-2EEX6O?Y-)K>tGXo;~UdGN*jsS??9CW6l@yP-bA5!Ak_{AyyLO
zm6M0&y$8L!B3e~0fW=ARFm#()(WLf`z|YhWbF)daIE!%NmmVb80k2BMzZ|l6|FIo?
ztyV+qo6^IMXUh7qsPU*CroBx14!7FrE{6x+V&eVTJ|Me7Ihx+VJF-cEPi0L1X=8^o
zXyJ6IvQS>Y=7n?QiAMh!BD}Kr`*GTTFUFCF9sW88m7o5-tRA~SiP^wJ{)V3(JDEyP
z`9rqFe})!Q1@rl03&kSgov0ZfI^V#nK)bX++1u1_anSPmJux0?IM-<$a0qPx3jqmn
zXNTZGcg@XzQDO1xz&$uvNV?+w=@*Qosfoeb<Lm-%t3C@<15^Gs<x5Q@C2s-W$NqaY
zW@Vx5_~Gp*|1?>`@Li&Wyy0zCsegGXz5)kVuUUq$-a!f<a#}xl@4uJ-rrm1?4`KWF
zQPkHC&OiU}Q&c()#Lq)va6EXiZu$4Urjq<2Y2OtUyAW6E?^T78eJJKbiT6@$myCW^
znVa{q?f8o+naYRY#tp6Ds29k2F476w@r$tw*w1ZE$CmdchuYMRhPALg4r!@*%47Yi
zJ#i49wfSYPSi;uwef$xa_p<UdIy&Q7qLwr{toKb`@PwQkYvR#-FywE#l9(veTRs%N
zc>8vtfMLFzMetRT9RPnej(_YpRg8oG2yxhs4!Ru#w=j2-Ct0FKqH&l=RjGQ?^S8Y7
zkB?lbIyRGo>AA%!63;01gsPpmXgu}V-N*gpToCccRN15Ym6{K2*7gi3@#yl_UmtfR
zCY+aq|Fzt);eT+!*pz)&M|=JAG7lKnSVrsbHT|GLJW}+Mpt9>LdoedVd#yH%Eqy7#
zIE9pDP&}Z!wgxoaWFQXErT&F=a^)^->R4$NUH#nEMm=_L+k4=NMY>;^hraG>(765?
z!KMhc;T-Xop;O0xBSRJ|OGC_=$Fb5rQXC@wyUaeJF6waiz{-HZ+VGS<uP`B|8GE3Y
z`rrC-S0tB?gZ)CesUwGRWWCowaoa|!z4hc)7+bNfc=B9a1|elwJ-d^G)WF;I)&BUU
z^7+FulvTl3E$;yBUOwmSDLlSD%NQGHSne*ww=KIJQA$xMmWtHkHDN%-lx+|3l1tol
z9%I$SO3j_%OtReo0|IwKW_g<I1hYhW^@vo*ba&E(IzaQ$#1ZMm3-jOf?YHytoANLo
zQT}?DTj|a&#>1BsvD6`(2$Q{Epp`k&u)_0<q(<rW2YXTZHAC%<eA<>kh0krN8hO)$
zwZk|UXmtfH;$Ta*pg+~tH?cnYR8;&-FnmqkE7ELWVjhPUPz63%1G;oqL9u0Sxd-7o
z0^BIaNnGjp9k4UIqqTMBmxt`tnch;D)@<t7$^Q3uh3+fJKEHI2b=FJv?FU_^I}#X8
zHTM`PFEIuu1VWnco$?kzFc;^MrbN$`)hH=k>7l>(jw<2u_fi)=ararv`8wY0Ymi}9
zX%yC`QIN&lKB~wGb)Us24NIPEsbYdL16{rA2y&+!BN|aoS{euWn4TrclG4)FDet!i
zrOqeBJ?3qYo{SAlrOW&7{xy<tb#ZI6E&mR$PS(%&m?J82`vt46ez><4N$epa%h3IP
zU<7jfMks#7?Oj2vs4`1Wp5z08&y3uU;$Co!Tyo%G866v|19ZqUq``;qC+<%<pYa(t
z%un`4Bi2Q!+st+M^{rz!?mTwkoE2p%R|ZT-wMXi;+v?sDF7Q=)cG9rU2sl1z?=hIY
z0``4nHl&qBu9GWay>om9?*^a$@S&n2&t8x{tND;cUcrM0qn-o&v#1Y8eCKx(2nZRF
zZG+mBpg~+CyBv-BI39nwd>M5Qhr7%<5trtm3s~w)59YbX7g1Kz75wC6!(9>iL1;1E
z_(9S%rWdq##x@-KI|u)xQIJVm^Z}<u=E(94w(s#AY1UwD_wq-a+o9;i(EF(!eXBQ>
z--?;${ij$-4`Feq5!JCdmiu3z^3n!zre-gBRfR1{N=kO6YNVw3Yu}>{hx<DiaGp0U
zkbu2Cu07T(;=Qt9gOH;N;*O;5jvpT%<N-80#i(ntx3p(|g=v$bAg}HZz~*#8f%=nj
zAh~pbJWy+1HNq}sLL2p*zltwSTLTtCXskh0Td6FiN%7#&Hhr$q^R4>01|h!8e7~>#
z1D9#hGPKgSOG<E7O_J1TiQU%O=Fo<s+_=LD;HOA`=KiM9B+QT9puRLpSZI|dw$7&K
ziw|de$sIVC+?8iRM|gv9Sc|Nskjz`b4B81{NH_od{0zq8@5^_ddu?WKvitrng6)iY
znTDy0iwlBW*$h+#j=rb~=m;l>-Rze!x@J_5F4(ZtIhnmF%MMo&t7mRZUh2>Yevdka
zIb1~S`wVVRNW#;>p77TLg};JVTD7q<kKsY&W4IO&A1Q42{rL%_GSRsxGdP>Y<r*`X
z+oN5iIL|+y+o-$Sfq|u-K4ERVtY@Vb46rhDs8Rm{5ag$Eqf_t{->+S(DyHhb12+-9
zd=Gof)QjW+zw4C|g5T!B<);|URC`PTSA+r~9;%?t9~m1{l1yOhE%y*9SV}L8-=jw}
zYSUAg`MXo@x5~XWBTpqGzH4<6Xu8I7(m*jYw-fITaH!M{F*Sa+gS&F*d;(MhCnqP%
zw&!PCZP*2t?$QZ=u5;W7`vk`5q@;#3e0%~XLhAZf1b=?*MlixHJmI714lUMnbdmar
znxf^1ri?gtjnopl=%GMdueqi1(a{TQ!B#3u4r*@7rBX%lIA>)GIt*0Vz;cn=Aq6O(
zZs9~`s?42(CLzs{K{dDjehwBrp|wTt^6Y3z{A+DQZ{8$Cm7mBO9Zc;#*;gKISbXcy
z+}h_8BxzT@9?O@&6NAqqo*kX9^9%r1leK*~yk^y`)(n-5$Ii98Bn!*gh0I*A-YLvf
z`0D_yNo~hL!FQD2+L4>s*Q^?7rw`VIemSfh^W5FsWvcJ;KUc`GeuZz|&@KX5C3RE1
zBk<){9OlN_XX#bz?`>s-i2>~kscW{G3jZU~*z;fk<)lnxo#V%pGRK6EpNZD{ZPEk%
z>CQm1Yb!<Y1f*N1VLt)*CSB*1g=u&bP7@hr_3Yc|M#RSh5lDn@2i9xZ*%{7oHr*WI
za?of<A}ur2ChuGt)X0HLWn#tPa<UgDw(QuiSe{rgvzVSzXZ-_=+hS6-sPlAy$@7*1
zRVKkE`spszDerFXVAr#_^c{%W-+FqY-3bMQbDFbf9ym^g%vS_@i1bNQKNy&Xa%gi{
zAunRxrTb06#&jVCKBS50R?6ly@O*FlX{i}dAf8e9<;EA-C;{C{6YwkbsEJp)d(<dc
z;0JK$7IPRPJ1+5fJy@7}SnN1lSbuvE2L_)0*M}|k*I1+^9=TT!NmU$+UaoS4nJE}W
zP61Qklq*dhm%K8i(wJ<NBfS!<lluav``jIWd3C}jT|c|CZL%rxd{<ZA#;FHjlYZTg
zF+0no#4rSiZ@%MIalnimYkzGd*P_<{y|wi*OP4k;6T6aU7!m`HPwi8>Kj>9Gtp~lx
zW4nVt`~YM0>weSSz>YC}8r+TH?7jg#S0H!#OW3u`PA|8rNK5`)+><35-;rf_vHT9`
zJmyWnv`y71MEV0Tbg3fwdRdw7V^638X@}p?@7&Wcy#I!;Yz&kl-i=-6#8~YzQ`hNe
zB8O_*<E36}GZI#Sgc^(7D#_EH4&*8eqkK!XKD$EE`Dq+0Jm0MILX1lBJ^(Ra6ly#6
zKlgJAf~ngPp~&b8lN;E{6e9~HeP<=~4eBNo3`f}S7pldui8pkdXS$aSKpI?qxskuV
zD?84dOd<+xIUxJ~CXOmlS<GjS>Hd;J*#6JR>c;JfrM(yEAx3>@>|nzUre7j@c^~(Q
z9g-O+#S!hCr~1m<O8K_oMZjpf-`zLqwSQR5+sE9p`lj5@^9B!4_i3Y`_K}d(NPqF`
z-;UK3(LS=&R#lb^C&JT`3mtF59)L8;g~s4yi|E?_)ylK8`mNgYE2D6~(aNO}E?;`<
zmr~)?kNy)d{<nFZcBs)}p>?Q)g|p+BbBuA3o#B^0EMv7m@Xotn)!I+MT4gP#dr3lm
zAGM4%*jX1DS6Rdugo>AYd#aMyJ1!gG5X1TV@81#1Y#LA)k9#X{I?QeVV^;k!w@b&W
z&twsD!mUXo%}I+nfgNksQ><2p)XJj1k77>buf6H*^Xu*FugLcN#oGlPB)M2(5B757
z6C#03!p*SZgQ-Cl{nyFm&|S4w+~TDi;?BqU8rU<Mgd5(&W1I_?Nz5l6`B9~xeel-C
zU*cQ`0+9ofzBEi;j3=L2{(@ckVgqXvfJ~&e<qbAN&x>bVh0<ACwFUA0(}pY{|Ll(U
zA&ngkv!;=tXWlOW)_8*8Lnh?mh`qS_aJT*G3ukVRwb>wQOF$)#OvDWjmwzHJ8IyTE
zV6NxlmNIdBwfZaJByxc-l43N-WT+oH3;p*Dv`Uuq7OYA!SW!}>_Y}dK54+h)?Tgp`
zgS*i(SR1b7z(#t{v2u1EY%)wM9C>-Av6`#qjn5(<*?j&JSNP8ky@+?hgEQf<5^-S1
zGFxlf9?`l63>q@+*fsFH)*^Uj1>myt;*+?QA(1@XN<Ho?R>uI_K1tp=_{Dgo+V~pm
zHyTNESW?Gm*HS=#FmU3`K_i9yJZ=w9SPxJ-{|Hcu{jtj~<dftb;ZjSM^POhl=Hz7`
z^3+5;X*9lNYLbs66*$O*o9pl)cC_Y&4*#`7Q=}i*U*YdpYO;yi^ZUX{&SM*>LWjts
zFtD)`<mF|uNa<qUo$<vb1a1|HmY5a+hf#7inD3P^W$Z&fO==jXYW4abve2Ll;Oqii
zbn;tW;UG2Sd^oDz5)ayW_q{AMExvd4ocaNMH()*7&fdy=xl=eOCV1QX^GrHOpn<O`
z%(N%5Y7zP1&SPz<X`4PF^k;Cg0#{HT?|C+~HDlTSjGmbtf#6mM3LBjE54Sj~?Kga7
z*l1iXr#Ack?w0hp(s!Gcswd9}4zhQ&gSpKG;LB@^<zO?Wj*p-j*>d`$Bg~-*d(x1-
zx_v^UG`Z||x!Li+n|Ji&_~pTRj0qVT*q4`=r@9#bn(MXlAWYUb#7oD!o5RBLDR{<O
zpv`N4$B!(-(myi36$9*7z-(P6D3#Sj+gH3GF4RhA?d8@87f5}jQQNk2_;iDHglLMx
z*V2-bKU1o~qV}L_V23tiTEvNileMrN88Z8AS<T8^i&gZT1a947gzmmPwcBh7U=O*-
zkG0qw)X4UpvA%zO&7i;XN{leA6{NW#A#io?^<QkfSC?*9Av!;kh0VMx^lGn)0bQFW
zM~cmODs#_0n5{oaRNR|6(C;TtRCWPtSvHS*nB$cz3v2@`cyQJ<haKJwYB8~6u5L=E
z9&tB5pDF4y$9$DuA)NhkIq7Am*tTSay#u=l^WcNh(Jdss5#QFo4-<pg)DOG93+1^#
z?(NS%SGq;9ib!m^$hVz#Q^2?xk_ZsVPn?Xddl>ZYf!U?K7v7Uh%+$*!E4-HFB~Lp2
zdA^rWS8{uNb4=?y>A};r@6M=CcX3g1`SAz&aSuoiEQHU;?YE)dSDzC;;|5#84TNhK
zBsVH<{=25i!Sa~TK~@19HFC}Dgv`K?Rhpyk;h>lO@3-AeqLmDKniNpjJvrHSGH5Z$
z@}2s<O-NgVFNp2NS$n2aI&_-?Ob4t=zr%9DQ#=0b!?u^AZs4%ESylq0e~g`7fVqmO
znfcotfk_<*iXXYoeeZBs3C?=ZvY4jrq_TYG)=$N&J1aF*BqQ~bSk7+s`p9K^yc@Q{
z0Ux+Nz?FvV-U7|Y<q_jQ1%#+~1%2QekW^q~#|-2txPG+GF4uM?nR>F@y2={xwb#4_
zdmld5S-Tjl`q--WASwFQNZHyx;UC{MI0MXl6ZH?Co1q5+JAV;D%(anDL?vD-7R3>W
zJFIr!q2j}?+#2g;DScC`JWpAkLJU$D-to8|aK43w)nu$)XX2LeHm>LVSI?35aEfwv
z(=**~bl}*11q2OAZyvN1^K_?5Z<`v7JGt#pLV1<fKC_$2v|ASduOI84#Mtp3W`M?&
zx2r7E?{ML334({^4#*_asuerq^~ORkrG%vlY?h@upG@n;vn_))^_~2{)B-@(hw=Qd
z<&}5^MFle~n=GrIGrng_+Fr>Mcp!+j^bOOXP8oI@Vk?wa_p`NK1#=K}tKK%HB+Jv=
zUL-Xk5FJvs{}T`7L?i_8RQe@Pq1xF^;0%c<MBEJc(8;45#`()Vup?;Z%4`&7Ma@2k
zkqq0(Kh8`H3e9ekbP2UlJg$A<n0oVR1(}XEGdt@X+g;fhEy5?M!JNo}hD)+rjpn#)
zlR^aW*Sz*@<JYsVSiFwi`P}`U!jmU8uQ-8XeIYYqyh>mWg<Gs5tEaPcexFNbeN2Fz
zK9)qNAe7Hee5zt){;^%otP|LR<Ga2$>)gZazTXes=l59F{CE6?wGBxyV(0Pkv)N7i
zFgesHPe4qnkwa}iTIeMVC|(HrNzA4u%t;5>_DkICKTA=90%z6jsts3_9a--FC(NYU
z)F8(XOmasE=Xhst+*sKDGk?qzy^ZOZk6Y?ay9PKicE}~u-Ya$*RUd0sHnj<z&U>Tk
z11|WYkOo7MJ+7g4@)7OTH#)AepTYT{J5Mz*b?@brh(WCIYj5Dtq-tq1{ZUuJ(C<1Z
zl*E?Am47g+UI{bM{N{H8aH5NEt^{FyIGfgXotDyTJBe-?CQAs}o$+Z)+9|kAoXdc7
zTU(OM8Q6aTP(2qh<Ch6jjdW@d(|F-cxSQO3mhR%y<FJ<z<xqQT$mcMrBwnc?;GuR$
z)LhNdDBsNcy9-~%g6Wu04TJ`A!5<%%=AGNlkRTZ&;dZJA$l+Jtox3OQIpu-7Sl%2g
z^H?3@9dZ#<(?lzmy>H3`_A+hzVwLx5phzI>o)NAr-K&}q+T^b!FfTGzvQ@wi^<mG|
zrG=)hPDYvWt!sNSE(|;7;4V-FaYtPDk|}wP_Zv~XBJuo#Km386=F&kj<2j6ygv&9a
zIs8pOVCYkY+#T4H5=4VM%m{9qb!>}PtlsaKW8O6X<r$w!d9HOw)~|zn`9}9JvNx-m
zlN4G{6RUO0V7V^||9ohU{`DI{z;J$OG|Z+7lusXiz64KuiuRReNBm(@Tv(HTMcRGw
zHvRp}FCRX%8a%dozD;`T_g<ChE5ySD#UXmYemDoAX`W3}$m?nxu<E%zubOF;j>q?w
ziZC2DnGFhx-KUm8#M}FbM}uV;Q+w5|yx1P}a^Ek|BKbTut^~7E<wVrcZMeZW3E0HV
zf1u<0Ifz5?mF)SBk>3HV9s9ga$Op(KD{p;BJGWQk2tbJS%t4>V!KxtToi<lSqPmWb
zjxem}ZPpntsbX05`HU-K{)Uqwa8$a!n;lXr&4$(4Vl8@y?<*Ha{5y2h%iaP{=S9+v
zX8~*r9f1Cvs`P>9VD>nd0C;<C$AWK$xo>gu92Uo2IFS}eJ^a$}4{R`=>(vW@qyK?W
z=8TW(f4a><g0nNRFB~kXIWi=O<Ksmr#nmIM@D^9ugPuY_aH^~AmA|iW@47*-+=gB8
zo_{V_6=2;%Q{@hxZ1+3gU0of_LYLi)WL>let9|Y=-QRs%o%U}m1j5ujYrAcygw9N<
zZGI5Ii$d`y92=JD<n%`l5<kN;U0}_T#xW-`)#C*L=avD#J#==LT4%$js>P#XLm)e#
zl-V2{J3Q#cYM^$<aeoo*X3N5?tgH{?A5M~pay&9L;%&<gurg&76&1bCIT7^Bj2;N?
zj#o!y%Bz;Yf<>F#o5Dkt#G{*R*lvA^_^qe{rabIoEXO^51IFrNX6}MVc|?bK1Z~8d
zwJ;P=)Wg?oufXALkGKp>K?I}=2~OM$<RFeHbiva7$8Us(n(de>r?Yr??9%SS@b9lK
zJXTK^c&!p2r$>MI+{R;Q!=Bo1p!S;xZfUa76?l9zF~gRyv@W{tF|$mn)-|-QY_yaB
z{Ay~u@x9wlLGB@`?S5tu^=dCnyddYpfI4;yqJ|+<e<?E;LgKHI{MN!l{bvuX2F?06
zAn&m3fIEZ>y7t+ZMUX=bzor*^5bTUJtshKB9POUQ##MJ~q$pp8+2Hs4T^R3n=U$O+
zw6lk~;&BP%Y+WscLZuUP9mb8?pntUGg5cfdcg}OH8c^*lo2vfZ2NTt1=Ys>k?T&I}
z+NP_5E%`TE)zgoM>6dP{Uwz~%@2&;eDmU^tmxXh7Baa;-#Es~dcqe0dcJyL>umkhL
zn)nzsXNb1KU$@3a)@JdPah^NLbX7!QKN<FE$|&*&yYq>vK*mK~QLu@#rBNx7R}V7)
zflT|?piJ^Rh9a1w2ucaDsiXAqHws@09RF}RYWK|+9W`HtHx~SBNfv(hH8a3|6R|;q
z-$3L!E^d@B=sW|5RE#@=Kke6m*b#*pOQ&gvX1m|BI+~p*sPSQ7`ud*Z8TXetH4mO+
z+dCbQ5a0?vhp;}V%6z%2`&v0RO3zGRJTw)8GpS1i!*`yGx7cH5LD2_kn0-d@e%PNM
zM~=Orw8Dv?nz!1aL;*YI`--fktG6qmT;jjjP*_^19q<50uWfv)^3FyrmjfJOJXMn3
zE3V+qY#LN+>$O37o0CRm&%J=5xu`sa0%GTbuO?Y~A*~vn=$C`LU$R#0?jBv)e#lQn
z8Qda>_I$J;0#sVOUu@s!f@U42D1{u4WcS{p&|TGwf1UqQBbB7)vE_GHIuu|Zf2h6T
zLgv7`YA))dFi-4%b>Lw*TC=|?G_x{KO+)rwaxQ8d!VMd#1vx{^Kx{EphvWYuFwU;L
zT4r)!9I^!n;p$FAv62EYW6x*EL?LAf_UD*Q|Bbgd0f)M8|Aw_oo5_T%p+%N(QT8Pa
z+GOm>QnU!gB>P$@#xgCJlHH(4NSTr~8gwaJ5y_HK_HDB7&-op3-OuuW-uHdp<9$1h
z`+pp_`(I{$zwdIMpY6=YQ`-+Jrk{?I6rgaPyqM(7sp{)(N2y_KzURHK{(2prI+w>*
z*}$ya4CeqJlhjU36{bV#)+59>_)RhQ1=rm{0By%%1zeYU;0@~BYZ`vs0|7h@D>wHl
zpvyGd2OI#z4?ps}h&mZNmn`A_Hn?Cd2fg6X8F%Qx?7_#t@tJCTMv<o=gzdl+<Ht-P
zn`%w-NQyou;||*!zrI`>KR;50<~>~2KBT@+P{{_OWM*t~D^qN@+RIij^aQXbY$aBf
zYVQH!_Z~>w_Pl74Z8_AdUJr-jrR>7r#}}3Db{*w{F_=8{$@j`TaclUu$^aM8aBK2Q
z-<q8^7f*)Q<^no32&)E>9IsF&2ug%5QMiuD%7JTE>0B4Qvc7MfeStZ?Xim!tfSDU`
z$Cn<|0Hd0inEWx{e4dF?o_&Au)4^^{+#c6cq_U>t1#TlX2>kXGa)uFYgVXdb=ohh@
z93i}YqJIQ{5|13`!#QK~kN`PWi{XQDKX|ANaPK378sQgLhd#KIysOe)a%j?H<14?V
z#ph3-9+((L0WYuNMsBbVM@0~H&nJuKfSei=oV-Vbu{@br96h<{A@>y+x^TwP(Xqd+
zDXZy=ZSHJw`qV`IKQ?xmf|7kuU@(Y|HUReLrn^XE38{-tn$x&2MMl}*@Wgg&Xh}c<
z#A`R$7s*w=U$E4m|DO|>lTIt+s;r_FT<q*7+@QZ}=;sO8rJ&tukDbuMOhDK4Td>)^
zA^At~Uwiz!MO$_+0jhH%^Xppxb?qW?H|1~K+5|7l>o1i#G^Jw%;=8()M!U3CXYsB;
zcR0YmIO7KV<jkX^yBjq*%lVh+{5zQ6aUO@gcb<pt(eevZiL77f&%b~?XJVS|;TvZD
zn%Dt$_%P?4uuED}qc9)p%c}{t^0GM2*HT~StFq^h+eK0on!DPIyk?R=!=^Ua((*`(
zf-s^Pw{X^=>2@@K@fCFH#@jvy&n*Jt7BuB|xMci92^2DLbLy-><^DHU?sv&|P>1Sg
zyc+5#QKeLo>*R?($<uG}X1x0Ed~iXngllBZA|o<WiH`ZBx?#BE$_b`uT)>ZaHyr>|
z5Aq{f{$V2fw`I0)GFBmcHNEgZmoU@DG~;us0B$wd`Qg*7at*xTihxN7xefMV5M!Il
zo@tnwxPW+$MsIYM8L<cTgct8WpBt7=LB|PX=$+vdq{EcGl&^J+vm0UDqW|i}j{fOE
znARD7?<};H9e14=E*Jsg0phuT^U}Dl%55l<(KXM;1r23xz3aZTFlCV80Gw7(P<I`q
zkG*HJsYSt**<!cko-Od6J!mPk_L2zW_+q>x_&>8Ng#J6GrfjRznTrYs)o8Tx&~&3o
zG?>k}i&``4ddHC;Q=@l~m~F$cbP3op-ATaKQ!T%t8DHonxlHHh=d-*&f1AzPK;|}7
zFJ7w~xGrI(VA-D!cM&3f8tkoLh6XIS>R9<#FIZjkh?ZTz5T+Zc;-6a`EY?VlQ*aTX
zR6My9SK@h4q&UL9EAvhJ@uF^d=kAl|opAM+16^%S@)mDq+kb(iJZah=x$W{NF)scr
z%Oa7qmDMM_QZgkTBmZy)sC=diK5XB&NoOG9p(K-?sDjA#1hZsmxK!b~pL+gO__Ksa
z9WOex4_Ck<dl?@e-@qLcO<3%|g2-94AhQ`1zTIJM^9Q)3T`<+62Js)Bb@5^8LMAec
zVMo*idE~F}rK~*Ms+Dypa}+YKp)8On+jeI=Z`F3V;@^C)hL!?eS8E>O8-RxTjyGr&
z5uDW3`r%0-7r-(b?6Q!s!I)4#YFZaIW^$VD@ks2<eb0;4hfewdo418jkKQfg`TtZ|
znjdT6LL-@e9hHtmG&{*=<x}{qc1SOTM}cM;@aL^WkOZ_AQy=w0T%Dk8oyVtVWMoLn
zo!g6slb9_)sVYs;as+%1s4D2=3^EpJ-daZ;qu}CL<P1emMLes6OdAW>wBr)mdqov*
zJtyo+)Ti$Yvyf;`wr&*-_e5DD(p{A@(%EIkp8Cx`O>g8u-DFL?a?EO5@h_El4s;M7
z_;G^I&jaDVu56!~z^y~uc@_Tlyom432dJ!py9o3bDaL+`jl_?;xh7o1wHN>s*PkEm
z74jbCZfk4v@Dj883Urg)0o0`yy<~O_xz($6JC9mqAujyH3@?|Pob%Tc_6-U$$JaM#
z`kzd->#{wJkzu<j9ckUF>^<$&f7m!I5_-lNzXRBXH!HX9zwDfh>3YdQ=yxQT#CL8;
zgu~yyFRLB@1D@&EvOS>)MBGp~u@m<JSCGxG>RXr<RD`QkB;Fqwf?MxfMt1S+MYVTm
z=*S@LhwkU+V<wI$HxW%L0upS9U&&o^qF*#Cgqaj<pYj<_;EagPbrBV1z-~>YKC-L=
z@y6r$E6?GcO))+bmH?RK>7o|gU4#0L@~5X0YS3Hv49ByOghQ4r(<eKY)nU-P*{?2u
zTWHfj<0d9{ZU^3-U(wUC`9+ezhPMGB<T@B0hGoB{Rlfk(tbVpHk$5@TbQ)AA>9U@u
zRTpm9MMAYBj`+d;aLd3QRC&=22Q<%*!V(;tH2oSj*2D}zy~Ng%V6SuV0<GAeH)*t<
zMmem9ppA?_7$fg|33Z4K0X21fHg>HKQqK{SwMpGmJ-`Tm&i-l@sDRy|fdb(vw-2bx
zSbEdT8wMnbO*;JVc!t=p3&`QJdC#+xlz!^~B)<G-NPPvNd7zo|>rY*g0w}F@E3<R(
zt!n)>SCch69R~OCDTZ?Fs;TT593Iv!nnlF2K}JdQF=dvS0eTx$L2-ZxNKI5l@T*!r
zYHLBHi-fyS%?MN^Tik;A?P0NV3EVOl)Fk)v;OaDrRJ{7yiF0rDu~fgMxsKDyy*zO$
zPqcIlI_4D1L@YgiMJh2Rx7!%=keFT4uv32PrNa&9i_FJ6Sm|!=^A?u1k|a(x)Ep-~
zI*z%GB560#Mil>ir(T(rVk=sV#rjSQUYX^Hm3wDUVWKkeHv@&aI8GLpVL6rT^cqev
z<?mMB#nZ9jf5DxDF3R*Kt90ALuEC^99k*c83xB&x`C>mj-a%XtyQk(vp!eUmWNAfc
zWCoh(GD32xmh%hWnV{%Omk{xenCo0!WV_?@_-J00QxYtsVA>q4$AJwBrw)+PrPz1*
z6uXx&zk~aCwDW!PV!@G$0y*{q*P+?p1>?K?vLhxJNp#VQAA)oX)VCx099Tun6HG^v
zSz^TK%JFRL_+JUZj+5VwAt@3^^J$1;muL;M_yNd<6~#YSAKPPD;;ZbZxn}5`Vy5=d
zUg)~CC>oxbWIb6HixUOaJ4~=N_93bz9D=82bjNUlCld<_3hX%5tq8@Qo}Rz8t?*kB
zdb6fSh{Z|N&oMLMZFVzWg?MW&8W!hbd}hP*u_j@>9^Zz6MwKNb_=52yJqc1R0U=(~
zFwHEW-HNaTXqm@{Ca!cj{$*f&-KOm_gUSQv;Vf8p%b}%nHtUUXN99DJih|3@a8+&r
zj7Inwy4&D`(<+abe9jK!gwTJ2N@=Fnu3x?zCx;6(+&bw?S3XWkQit?8>a+`_L_I6j
zPdd|y`G3*0{JD0P)jT*%FVy(2pv~SjY-|}Sd@=zD$NmXfQvusl;py<TP3}dPLe|oR
zZ}A>uKAKscM{mKW@Ezr9)D)P4JMUGt&yc-G{dMejgfn_@zN__}d^HFKLQp9a-kc|i
z30LXxe3MS#rPvZJqCL6g(40?XR*0j|z}ddXVskUKe(@aj9e@sfV2#RqLsQuOEZ9qC
zy-x0%9PA!cCl_8WtT|V@#izU{xDw8qFVa&m5#h3j@D~{1V0rjt^4>CbnsW^U|K+E5
zY{jS>d7LCtIk7#-BU5=GI$C7bSa_rEeFqKchKlP{t<1y!Sr7N;`15B0aZ@i2Z$D`1
z3&H`+t}c?+t1TL$xbtHP^Zz7l6&)1Z`qW7-q7N!i`$Jq=IP6bQ02bTPCjwaaV9+UW
zaJcCGogF;|BTZ*p&(<o9o%HoP>{;o%X6MjVu?;$bx_ky2ts``|VZF{B$-6ptqX7pc
zXOoeFuH-e>M8|f7Ta{=?S7Mf4BN;Pn^~8ngWnC7x{hFPt>daid!L4w$RTW0bvK&SS
zly54*+GN5#yUEJ0=wc^EfT*7w?1`%J?L#=lT9WagFMmM`)SjgLyQ-F=#D`sDubt2P
zzLM#hKdj&Ch0o<nP-U4N*cVX_w8q1Zrts|~|4ReoQiq3Y-Ag{_89CD9Xw7i16(n_H
z&eLh-Gk%INdN$%P;SjBm>M`jCszSz}8xjB6jpZb7m8k$W<#$_K2TU-VzdX1{)ePUt
zU;Z537sVOw1;n_9Y|v18meUF}=}S&+Z=DY?C`FjwP-u}MoQU4_n01%%cD^dO1vVBg
z>Zmx!PNA-~-3O7ZZm%6p!j=5O*{50xMv7xB0OT-j(heTMPBlV17vt+|U6=<|M}K7b
zLVL{`b|~{cGTP;W?6&NYd$toktse%Gf!`IR=Ytrr7PP4MRjs#jhkRa81)AVts~aH>
ziB(~UoUU)-ZPAF!-jhfcGR`;tf8K}vr;s#Sh<LOMv!Q9<NXe3~-9<(>$gvsC`&D-C
zKrmOKjvOBa+oz&K){~1k%Tp=mikIQ3lx4ZxWr{n0y>B|4a?ABL`-UluF#T1+!r({i
z!8}Xys1J0=9yh1agpGNHkTOES_*f#hsEwU>xBgvfCBI*+-=jKE()is$Lv%e<)zwgI
zu~fvZ`n_+YnfXB;kPMTcck-3@Z7cRs^jplS<oh^>;iNZa`yS^12$a+8(7XRx3GwGp
zQQNTP7WCqtql`x+2v}bW>5on(hkXxywF~{TWT5=GvmzH;{SniDXogpRctdVQjkWqC
zrvK*><ki3X|HnT!{9lNx;6s$pe_zYwpJYD$BYd#zjy8ymTPsa2Iw!avnqczR%J{X^
zN9{oNi=o~XTEFB}k+t8nV)g~;k{rp2mY6?%lh&zw9ME#^_z&StI{a<;t2bWivfOo-
zTlgPE+KCz~_1@~kVCr>RsVn~dnL_MJ8@u{5|Lq6<fVZnZVoH4ffAgPf{VxQv@J|tE
z-T<Pb@piP7`&-ZsQi^5HTT*saw+h`H2^`q{RDntjySOxK@BHc?tA%P%s{i@8oQH9i
zu!NMS8Gj$Mtf<p#Th)U8`!RV}K;D0U^namNU;Tgl|7@x74g*5>?e;cq)J%?VWfF3M
zGur`mqs=TUzdcTKrHb7YS{Dq0jeSr}nYoVsC>`u?%;+;=;>-f&!$qWiV6=6aw>(z<
zYVY2am#R<)Ak&y&&%)eP&xYD0!)cy^o^_JmNJ8c5<u&FSmM&FMk;i4Tg6T2kDz0oc
z-fs9cjL$gMQ~UIC75T#qeCYH|YMFnu{2=BEqeyjEG_UZ#OhYGEKXQnAH}nlZgK8oX
z28XDi7>Mlj+~{w1DqcyRU&BT$6KiuVtO&Pe)s0toXr(K@5ezN#CG^dp{eKjH5RKzN
z0DB=5m;b#GDVd7ToCc!h%>@9<A&DELT>ts=FC?k(F2|<wrN*7@fJPw75%{jl2-f?~
z6s8-ND)pqI*-R#jPsLjfsnS<F2er9>*(^ah8o~@sj(~#P`{_JTIPjt-cG}p7<w$)s
zR`B?J;WhmJ|Ih@l&>M;2xSPL0ngQqvOY|F<o`rl0kd|Il&dF_a6(6j5`t<47FgF$M
zRj>c}=;A96{%Su0CvRTg*NI`OHek6IrQ~tl^T{AIRNp{7W3X!WGdr>Jw7H2tf&p@U
zV)=NK*}t1xOq1N=zHQ~1RIm6A606PMUQcz>hO)gG=Dbw~Y7e$hM3D}!Q^<E);sZ^0
z%|M-#(D8r_cf7ZL5N^_cWw@CFfA)W3cq>2vJ52K2Ml3zMi=j)oh$KL0Zgcz<M+VN1
z+Rb(4+2tc^diP=kF*by-e<CMGIuel7;a|<{%*xx&4Pg#%29c*LVgyf~K}Z?Urw#Ug
zPj%x!m1;MmEcq4J`wj#I8<niZ5|z;)$+JMh!R^jjY*V?tQ*Py}=7z0cN=FFOqn(4$
z`Yp>JpJ!x<PPABI@d=<{pLhl&%s+k-YEK`_I$9zLdxK~wQzG+*mHyG+cy$$QgwjBt
zGhY&F`sW1&iW3SN-lVE?!O$&3r;Rmh+9|W9F2Xp={Bbo5Qk!73w3~h|f1Em=j}OJU
zM}y_v&4B0Po-y-BUJFEAq7LDp(&+{(^SOw_?*dlzqH3YIX7&1r2~7SAAk-QLco^UR
z<uo6(EhmazqVAqut;b{L*P~YmwzvF-WaZGar!ahva8CN5TIRhV8m-8ya6@=xYI3rh
zg!ITA8zAB1zc_^bkLNfEx^|@H!lcgU8TP$%8FA+MHx7QM*qZ=*Q{ISZ^I{=Cyj}%-
zi7jsQJDZNSvJo5&QELP$;MWbwambj0M8o}&XeK5I-JJW^P=5b!Dy77@wmd>|vif7x
z!Ewf(wuhraj8e7Ie@@t@0C?X$7N28zE)V%Y%)*;K(f5BnhK6tfiGz#+55>>wXFq>j
z$z@yY8AgB}rdn2sJoe{8I@f^pDE(j*lQ+^pqi^Fra)BX<ML7K{;D0Z}I{Rqp*_XQJ
zK_tsBkGq@ia&jZ8WhBw?%1{dh%?j4vkruStE-=}gpuD~BdU5+x<;{0(<4iZbfJSo7
zz<RsJPkI5y5we*5Qa-cegE1ZRmlj{$I|_~Zk5WUDR82>mP37u+B<=(YvOxs4iur4J
z((rb3_M}|L>v%uXr{Bos5I6h#&0PP`5HH<&XYUOFss1_eLzLfdT-)z&-%W9QZe6$L
zNIH&AZI0^YRr=0!90rtcSLon(w#5{FZfuN%F~;8Sx{ktz3@>~!2O#)N1rKQFyo)V=
z!anG8V^UjKRjJ>DmT1?ZlwjP>oH@;>^1#%A9!BskTGo~iedfM*)CBAmiIaEUPx(>0
zbINnDU2n$rXM}Wvm6-Qgik(q^<VwZ<=j43XjIrmV;V&S)I55pGp&e0%NfBp@Ln?q<
z*r>#32#WP;#OtAHtqg%VlBSC?{Y!V6r3gC-5bq|y+%<SO_`Mdnk{1AfOn0&JE&-<d
z2Erl_GbuE}+hGY%)s0h#MD)p@<K&!!u-O<ZdcWX-aQ#`aJJShBYh?BK#*k+)Nh<uW
zaD|YzH%ZydXPePlk1SUw!s2*p*&_#dU$LT=6@qb*<-+qK>K_nl;dv3BTQ%D5o=kC<
zpN9|CvHWkEai-i?aP3|O)DVcLz|SQxyfVGXvH~r6;Zy(Pl23aBrlkvT7y~+qtQ)Xx
zb&DoHf1-B-LNIfkEgV3!%fPN>UNHy<Ey!i~ueAtcj^ABu*V7ICc>0Dg9N?{K9%J#Q
z1-tBvL}m({2mhR7@6rzbzSSAZ6ciOUV2@yB7=;~w3J6K%FT1TTFF@eFKmoAtaGV38
z!x|!pW;MIj_lmM#Dx7SwpCK^y8X}Sy-TR(XyF32F)W#Ghj@!_Nm-7K;q#+;)_6MBE
z5f_o>q-f6i5F&=Ia=-lCPv76oY7<8V#pG}G5j&bR92{4v0z234^-nV7J}}=V@2V8*
zy9}$=?UmYWvYQVB%z?roCBax=+|=Buz-v6atsNM&h2x3wnUo(T6JO7!Z>oFD4jaep
zqEvCY=^qV;O)2Vg%q}7V;QMXu+yLglU>5<T01i0vht+3}hTCSq--VM&PjuzZJvE8A
z7UMI6)EpRY-7p}Qqo|ci_75%=G#6CgFS79Sfa)=E{~By)@v;E}XQR4&%HJR}>t!3}
zZuGZih>RFe!#Ib)PV@*F#mgH1mX$KumK@bu;!d}QbMmqD(-%MT+AQFtwaTkA2|Ta4
zW<rmsz8^%Z4@>r|Jta!Lu=Os0gTkNwM;V|{59{3^W3b70s7XK63`x%zm*51)SSTO?
zr<9q};#O|I{cw_qLof^)51m<a9fZ2TWQ+z2C-NPqSj>8Pdg^aUlm>C11Z5VwJa4<@
zBSozzpF#Kez;xQv;<s&pn)kS?c@O$+jx4D){-vv@2idLN;{c^f(BVA8NF$Fv^oTqD
z3QU1XKb$w+j>COL&NnM=TYi%)^MCkpQ%dVj!O`t!nD5l7{_k&t3c@ZDEkg=t76`g8
z!G_Z<dI?8A`?bL}OaXt2dZxO)IsSrW7!e%QCkJmtH}{eC#cWYg)W7X2m=A(F7KYw*
z=w?oGY&n8tz(^SN9m<K<0H4Ev`-=;FbZ;ew=n$C(7H`Z2+dG4+z^LT?7Ky^UewFZB
zTRJan4YeOb>V5bwF9Bj&{5XbWeDjzlwIW1$_|<;)`3*M5HysoX5`g-@N>GUuu{p{E
z1PulmVk%yW?MurmLd_md;zFkd&F9)M^VYqW!%F8W<A342*Y-4DKO=wJiJB+uN_hzW
zMv9P$s;}8r3FvJ=b+MkgaQyR$b*{UB`Ef>e(uRyv*k>ji?WyG8CQC2z7&!vu#Vw4l
zfD@M5f)QU}((7%X!v2HAZ-5{?;9p`cOEZd1fPz(t=|Y+_wv&nQTm-3@06<r<zv%xC
zlrSuAHdg{Y{SsJ{1S4TwsN{3WhxgF|v@EPB)Gcg3N6U*>bi4LpK;Ciy==pTn>x3d4
z=RdFkwXn>X1fd!a@uqVbntGb+tql7?a=?zX{c8J`0W1y`ccFsO&U+1_M?ePst@S|s
z2{044oLL`hQd87muX1aX_WJuKEdc*9O1<QE1$vZQnY+RG?)PZO3KF}u|FEu+JF+S5
z2Jp)bYx!<8R&4fji{M>_!emS-7CmQo?~&ApGKq_o4}+T*nmLpcs+H<K^rqbt%DofV
zW^KH?SS#lhcTM39M5=xH+PhU<-*oVWesC8%yuZC|#%sp`a9&(i_L;rGC%CgxKz-M<
zw*Vd@qthDFJz`=&RnxPrd#<FwlhPaaq^k&FIx&&i6JR%ZYQ-yDc8;bHw&zj3dF^{l
zDTdI-uk3k46F|7Ew|N`8T!57M)-d<f7`dT1VvS~j=r{P&DJ4E{sn}c{{c*!Nht*1R
zFAnz}Z>|K*M#I2Xe40gWS2+~m2KMfP?t*-gu+hF4<2vy#_<|<sY3v*S+DSLVl(A+j
zw(hxePY(95<qiJwsbr&kcG^VrZkn2prn^RL!6oq{#HrA_`_KmcD%~}~I(2eAo;t;O
zg%c;VYiMmlM8com%eJUF*9Pu|bd$-&xe@T9ZC$NNA7FQFI~}KRn4(Y#EzPF&yr@9{
ziu!m_=UEuwjKl#maBUi7Q;r9X1ng>g6miu15%67?kc<l5o>N^jaO!uLJdJK|Z+8GR
z+(q=c#C6~g9l)UzP^=y3AqHB<rB-yIm1rxG`AO4!k%Btbs2LvkvYQqiF_5`CX`jGw
z9JEo}xZ+uFDx`X){cZ`hzh3qC!9KU`*fkRL*`e2CHL}I@a5(4cqAu~eEpNp{XXt6_
zH}Z6Itl?bsv7cgnFoTydPiI@V7um+m7~>yXHzXUw+QH|Qk^JVn8tmfqJH03ycGKI0
zglP<oS+->y+Cr!kMN5`pFjI~1fEs7fOVFHbCg6>2s`SE1c^9G5o6%HGa8#<OblqIH
z=_Q=pmtl8(Qg!owGtEa2_EkFGkz7#V^-eytsiVZtk5BmM9G94qU{*CVA=o}2`-8P-
z4zBbWp{#qI{m`qp4mRW6EvR{zPF8f2Sry#aVPxq=IQ7uC76A7z3BwYWs_h5bvn{aV
z!z_rc|08(tf5~W6z72hU155ArY9qM$*{&@nqKB@Tz%ebdRTj<WwF^Iqy~k0ch0V7@
z&c^5wSbRoXI+E*rffxS<ij}d%U^85vCbmrbrZ4`kCQk>{)!2;@VTOSUa77=PsG4OT
z(YAdD?8ukwt%q(2k%N~gO_m>*yshwsCD3^{B)4IMw5e-Tkh$$Bh9IsPtYQ8omFW)I
z>5*9+sDMiriBvD@98OM?q8E9b5U%BZZ2m1Q9pns|3e9=OYslTzrL_EF!>G{DkI6R_
zliaf&P|b}F_$_K>D5=mTOU8c)M<*1462b1U)s;4_zWRex_Rq(9=iZ(md1jTTy&=<!
z#?xN+9aDT(c!^dY9B$~}&o^8CuSIGqJ*(l_wfFaL27Mge6GEOP3-$}&%Az>s^CAQD
zJ8OU8wIs>Fdg4FBXiSlssYa2dUmnft+P9afl1hT=dk{aV<bPg<rl>9DS8tsl9D&wI
ze|RgLX|I4Icxrh@Od*6R%rh{Gx;B)#rB|_&|K@s8<L4hZ)=~-28K)grd>)DB+b>#E
z2~49wc256-PZ@N-`WY}Namd5{y%R&J$B@^V<UgdD`TmMDDK=*{V7V3|d6#VApfvzk
z!Hf%jueyj}?uA?+%MCdrc6Ok?=kOh}%x91ftDciOEuDR)SLT0Tzmnf3OfStLzoxQv
zyg)=f0^27hC!bsnEpP2WmN0~hH(uH(rMjzgfzG>ei+Zqp{B$c2(6vyR89LW_DEE9f
z6X<S)f#F5-J$mIsQkAlRun&Sj^i%DGZP^d)WHyq=(=b_Ff^>tz0p)1<Ax=l@@Y1=F
zk^~>%l>#=J<bHRTj-3;xD$P1BO*-~;BpD^BeoZYLt5KYJBBK#LA~3u(-P$qx_08`D
zDdX2>=F)^uHr}L!NawCd>u^J!F~GC)#Z{I9p0&u;AM<njYXwaXix!mNG{fWFraO1|
zHQy~8(h3ez;y&V_Q}hy=h_6@mWp8b_mQqhOeNq2OeKe{rV#F+WoqExhlCGj>L5z{G
zP@`M+Z?if%y+{YalRs;i+(V48UabvRrAXP@+1qSX>h;1mOd+L*Mb*fTQ95CY1fTM<
zFs<MLf#Ia8ashfVhS{KY!=}cHCeBARxrigZ7jvO^mpym$KEyZtYj*d~`E?X})PHyk
zKE2{m_LT7&$b7@1F>+_8vnCuW4p(koi~Sx|xx24sOzP>*qdPTrxw%<K9mRH6=Irj9
z5f2$F0FlI#PbG)TY`f3g$uOvhLFz=<`NyF`k3anNQG@l~u2beDxJIi;wR&rqaAt?w
zsS2U|OVgF#;Aq!&;V&;lrp+%${6kLdgfr8?psxI!pxPy%B)5H+v6dtZc8#PlhjXS+
ze?p-Elb@t(bG<E>jtZ$+4|=V@(1|yF7so&b?^hlFjyIgVK`^z=s(;`9*P&FZhje+_
zy-R`Gfq5Irc_p^>2G}{$je8nmqwW)pCY$DGOx0ME_$Rji3<iOnxOiId6r87ylOU?^
z@iEKD{c+&$thXTf{=3GfzKqPAnKoq|uuIhV!g4j)oVky^J-3A+wj5+wqZucNq#l-#
z4XtRx0B4`~`N2yi(9(OiUrNcA(w92THezwLonlPj5zJLuJEJ|OFtoS3PB0O%;9QOH
zL~VF+?|j}b_BlwsIeV~shFc)31a4S{;ImkuRHsZx{Z(a*oEH79jW=A)^JyK@>a5l_
z{>+-TDS1|1KD1X&UB2O6to9zX`EvUsHnCy$DK`cg1|tgi45iYyo?4@&y@KtrwE`7G
zsp2|Z+QBT<XD&nME+}d+2;70)b*ssy^JJzqUbCKhV=xLoG8%kexOZuBszmjic97h#
zcEr}=<V%M!?0UH`eu7E<S~G>C!v@d+D_@dnEUN%#u4Tu7Kvq|h>lLo>JS&^d6RFKP
zsraN_1PhL#jcgqSXKb_&L-GITGVxEs<*BWg2+O@&ppP}tKJQj!=_o9v$~j^pV<n@H
zkL4?`%CYf0Ai67EyVR|y=f&}CAGqYlx5f!)g_6(RB-hQ>6Q$0>t?shzmt%!HTa&x_
zz{Gs(K6(qL;&X5<zl|49jMn-hsta3Xa=ne(^VEYu+>Hj$#Y60KcHPvLG+u3@Zjt}_
zrOoHDm(pT|$G8TvG9>f;mtir2*(G}LTCRJ-bXKGwXQx-koFy1e5MPh<{+4IJ**Lrt
zb94=^(jK_XZwxt$6x>tg99AcbJ{^+1x+g2)^TdmDrMJrNKJ-j?-2r20CYppXW-pP<
zNHoJ$LdGDBKa!{(w0sMZ-^rD25GgNoSpSw^&S{S#fu>nfiCXJSm=~R}NhJCaGeQp5
zaT3?|4(#g=Ay3P$oy!Q3?}pOc0bQ$5>(2R*82WsO8yS-vC(k^Oa_)e$J~6wa21ygv
z_LbHgjqQ<pMBt&hk1GQ&V!n<LFDkpgSJZWk#I#evV0|_=Q{piab~b7kR>BJ3BD?cS
z6MesmbE^g+oP#&{KBuZRPl(r(--=XcAfEYd)F?$9<B2J4x5;}JKC~|<>6mvGxt50n
zo666lb<=mry%n8uDww_aTGj;Cv0=h|2JfTK(|k?36uR<}xG0E2nPpptWBTXZ$eM<g
zARsk1Z(wZGjgB;@TvH6$+->?vzwdj;;$-3$11&owl0)MA?B{91MeWvQ1-2NClMUMM
zG?K+F@^d>}FqMM)zuuW^Z(OTNWEtd6su$R>_4IljD%7j?VjpZ%$X;n?c^XCKhfS^y
zrWNu>r`vWKimEQd;C1oj-jbK^<hpnGO~2>w4tg)ep)cdeIp&Wa<=yZF6-!&(L#eU&
z<Xaoa&9bgTBwB|cUXmvXgZJih&X(F?c1DxO8PqoX&f$1}o)R}ejn;LiAf-Jj<Dels
z*pOr!A>4i6dVBVb_%8DbLfU*g-8@}#F<iF&gP-wPXV$Sff{K>HfnDW;guzW-*brxv
zaj#8Ybsf;r>SvUA)|6D5BEV3oH!0hd&yhAE*pSph52@v{IT6O4nh5h&MM^Z3OjzWD
zJGeVib$DW!sp)s3G_u+GFqQIU0syf-^h58*ny>IiYnOAS!u`^$kmg>Y8bZBU!o6Ur
z=Ph~M32$yFo#^Cgte9%PA*kYIu1KF!yQj6@{at|0>M`QIIMV~#P4GFV7<+~OGguY!
zEvnT5tg-!#R`vGUcuz_>(*$eiWum&saW;B2YvlxNi%%WWu2#V~L)->>0JxHSo_{V2
z+OkRPFT1^=J}tFxN*0Em6})TEpm+(h=QF@ru8iLNP%pA=Pwb`LNHMvLEMP-vt;Ipb
zQg3$RUc;5e^L1Vq>!!WN@sl)r^|p%Gf1oxp$X2nA5H4c@R_crNMY;!>Q@QvA#k$ju
zR+|NN_jfqW{Z+Zgk|5LvLYdfaax|*gf6~wvaKRew=uxVC8@_htbAtHJ9tGFm{2{{Q
z5jLvL$vWOo$Q_E!0WYJP#6+e^UII18ia^gXe~eF3@AGiiDetdP!)|3RWTqF>-<~+n
zPJe7?#FfA`Gt>2|l2h+sgfk=*jg~nz1qL$P2CH&s<HdCZiw%^sVoEDse9qw)`$X0;
zcP6xUDPk?030Z!l0sJX^l7ML~pAON9!eTVo*6EGyu+JZvT?7Zz?yuB2r*iej<R%Fb
z-RwtE^P~;CBjZ8s&|nwwc{`g>+y~MK{_TU4Vq4Q*k7*}U1@Cko+L@SBJQfGwl#O|z
zd(J4I8LHO70qu<2auNv_%&MnA0wDHBTe^`r6Dix_Ej=+@`wFHm{MtVJ9&>XGKI*I?
z)(7;EW%6;LQwLxPv=NcTmA3C^PXtv&9;M|Z`_<3AegI6LiMW~-kSmsjD$yQOQ5*xq
z!+g0+ix4Q3u3Zr7m44lsq*uF5!um@@@p*|j$#yEI-uMj7$I5Gn;s6rfpb?9VBo)7o
z7vY^mRjXWIp@<osTS6k`_SDOyrqHg2CeUWRM9zZt57Y^LncL;fY%%1p$>z%WMOf)9
zm8E&Q;Z~B@SD)bz&=a4^d|7pj=8An#ihIx*zTGHzb2owkp^#=0X)z-6(F%--$NHH+
z_U^?6{cc<<&y{%{!;#4ritEo|x+pnPGzBOVQWW<!S>m0JiLTqr(8P+^moF@<&T^lE
zR@GPDjb}_AfATCgO4%HbwZM+^j<|qj4Sa`o<>jd(QZ2M!#mH%NXW!q{sb(lZzSk5~
zD$Ok}%mL5WT_z-l99Mmh>$#sZsoXk3>@K?^ftjp_R1eRKQtS<)FI0ykIUSEHTqz70
zC>Zf}ThF2C1kz=TuCXaztK;CUy_&Bd%3KpXX4VJ$j)!$p(hTz=2RSkF0_BX68uYu+
zE}LeMibjJZ^pnsF>y#L>A+eS#+vEms#eV4_KJ5B`GlSTaet!^3H*$qbroqk%$2KG7
z@!ie37!R20vqMf-0_{q-B!3f6+C^kvI*FS5Xwj?(o`+a$ermn4IhjdhFZuL8`nWEJ
zZVGj6I5?}gyrbPmsXQ02_)35lbWc8CdFwv>NpqPub6}ef_Z;5atwvnC)7tliC9W@$
zyeHrBp4+FlQ{usn90Uh9)XIig!F+gczWny%0y}XurCrr$>iMkWUEs1zZ|VScXMp`a
z%3G4i4$$Rxv~JV#ZfCX(W_l=hXoB6|&^jRSIA&1lel33w<#%oQTL<a_KaI1T@a>JG
zm2a4qkcyl6gUAHccA<*Lo}125JGgNP^6g8&hoo=XdS?|Oo$fa&i8hNv?h=MiBT^ac
zH0h0|jr(hC?iaO(p0z%Y$0uqRxt_FrD0dm<?G(K<_9f{m-nKDH*3hK2h~`V!B$>V1
zC4QV3w2!{~Y|?f7skA0R3C8B<3`IFlSKIO_nS9~Vml302*Z4-Sa4*p(wA;<bvIlXi
zvVY}Bd)K%Agpa_zlMlaBU?-zwohxq}>IO}E&{%C`0^FC^uEC|0Zo=Mku!dvk0BEb#
z7g%G~Yo;A78ZX+YaJ6tV-9v~c3BP7*Cuy;l1Qxg91m;rCERb5sP^w@BKj43=MRdAT
zzfp<Gi2{0n?4%drV@wRWOK2k<WaxlP|E;a;wp<{xhvzbie{dzR{gz5<6ANV*Kc4y0
zR1QB<E}rx1^gZ1zs(HQ(o<JGV0?4;!FJbo7^KnsvlT&(ILh0o8&<HzB!2|4-M)$Mh
z#o?CNWf@AGSob=i-r_jE1fR(>vo|J;Se^vW6ne4~r*@4M;GB=(#uO>UTcg5~S-HT-
zKKZmm3*$_YPcqIplE6FWl3|>Ayr|+#jy3KG9Ha0R#*9Y7xj5f4?+gAB3@i)BZEfmA
z5jX-HGDx52ZnU_6IZ1FJc7H|svxa9DfdWSTfz_9vg`daxe)%vO!RmJhYoUr*3h_ka
z)x##y3^M_#DEb*i)Utc9<=}`}uORbkRDOR?DEk}gFcudoto1DIog(`Mnd_HhwbCY)
z&93Asp4H<I-;Oz$KgqQa-$>;&y3y9;{E0Jy9CY--{!_=7p%{NLI7oFfXG7mUAd@@n
z1m-BgG+Nc$NA3yawk~dgZUVQ*C#_^Nz4xHGh&j^4SGq28#3)lZwwvhD2&e(WqlZ);
z@k0{b3ZN<Y`r_>(?2YKFjI!4i$g~EoI1qwePH!v*@7|^G5xUABsr%V{uvY*fyNWcf
zZzT4fP^`+0A#YIa<X`OMe+iV$;R$?h@ROE^BSJ>GHhLKW99py<)g{39DEWFtX6`K2
zMmP8y4eFJ#UEiU`Jo`JC*Gptqkhx3?=<`@AKRbGNasRP)DD_$&@&KzzdJ`vdaAv-Y
z`gkzfVE6I)$K<yyQ2E}jJvOncp!1DLU17AHz_y$#>e8zApXzHMUIhHxL1*ja2!%qz
zf?rhta5=amLJqLmMlXqq0Il2F=)JPwDi73jIrYSZezj{54JPB^rAigc+HVb=5@{Ly
zg&eZtiR`QIbkBbMQ1*}B^YqH}Mip!IX|(a0ti*&7=V`#-=!%hZ8#cEKx2#tWLNQ#%
zJ$Vccgre{+sc{W^Ysby>dg5@BspgmO-@o72uJ1X>^42!jPT=U!>nJpm4eU&D<hJ2~
zOtaEyowD_CAOE#St)L}~9{x3qmwrcx_&zkE5Ab>Y3=hUNFA_TD3cW{z5S7OZe{R8+
z4**e+37mbXY6)U)h61SNPEy%A$R>-1c#o$^F&2z34e1r#&3CvLN0AhdQq`iYlib32
z1e(hRyTa+Y3s7Ri3E?-zL|Jj|)a}J>c;842J)3Ue${P~5VDmJ>Q+T$xS~x%Z4SA&g
zlZ7uacXr`Q4aFNi0o)Oprom%h5*Fdepm|ekR2W}PEl0Rr8Je22%3N=4mXH-CgYaxu
z3h9Dn9yH+~4zxe^VgXJnZZii}bDZMO%AU~LZw@&sNomaAk=Hp*i}4k69-fz@nGZpr
z+*wGfc;C~cc(w3KB*OTOzd5P;QRaLB2~KbHrOjqyn=ZeS)o};l#~|Z*+k4r>wpG&U
zJ{j5yxw>m?vA`*w$ee6CmO$Ap;x?PKs6aTXF0HPlARv4JIRqP(Z~{lGEzOrhIC8V2
zWNnQ{)$6@$fYymOqlmKHjY8ehVJo5c%C`|xmTvU5s@B9X@G8gBB<B2fKy_*$J<1|4
zKBZlO0H2iHCDTe-i%G%f=BS0Sfm7vl(d6%Cw-t!L4Kh5Q1v#37w1vXe17*@S4<Kh!
z-2A&&_uJk^_G)tws8h^Fz`F6ieOq#*wRKUNnpa-G)J(^A<UDM!<40D)%$y{)?9fZ=
z4`ACga+t2bxqo#`*lbUeEpCgc*<1f*CeT)*I#yOVTAFJ(Vpht;SVr}G)!jhX&3A)6
zVD#M)!uBAY+zJ$71<>gw1Uhf$k-Li;(im{)%r;gG<kFwC&CmC!p3ZD3S8}<>%myD?
z`)uaZ;4!dhl^_1@K***h>nnfVwCxw@pSF1vE=+#!<4u(RU&5rX(l_kLV!mVwfmZ#I
zE-o$?p~KWI`q~2g+j3?b?)>yeiIP~)OlN4u5abVn9B8l|KxhFM;GG@(HOp?_^1ahg
z0P1H;=XOm6Z=Q$390CbJ=Av)!Zhau4DsFc_VOxVpgd<PSaiIm3^T6w+8@+}|HH`TF
z&^S?R`cbRuyp0ij%Fzf)o)`|bILe^zcf^~zzX2i-ZVVg!tCiSg`D#nhj`k0SyxsRs
z5UYK>jgCx(^yu$k@^>|snPMw=txcFP)xX-lr#sI&D`PioE$Kv4kGv79A+Pz-JE~%0
zlUHv~>(bjq!fzB`O?k!}llQPI`dTEcE?+er-{+@;U09OwwemHW4stnyWag1FWIUyt
zs3J_%x9^efK}Y0Y*wH~ssFpOYh%pw4cH{5M4<x(D`INUp!od%rtOv&Fu5I(Z+NxC}
z4=zDC#uxu>+~`2q^g>3zzS(%k(CdxqEi>1q2(c~7tE~CC9L_!Ln+@}UU$&zdV`n)|
znMs)C3McS5OxS=mA*jGH7IKRk6ph08RaM{wx$^Xm*)AWFaRKmMcH!Gp=f2hIhZY|X
zO_(Lt#cukhI8q4INY0BVj|-TWOTMAZ$kMe!_}!X%pP!8e*Bz>qJfbQ5xxdzAd@(uB
zivI-ihjF+x&0%oE2+rou`HIX60e!jjOL^oyDtwql$(Bll>sq>uL)Oa3HqSu`xY6#!
zP%C&amaN=gG<!82XsijT<3)%#U(~e0hK~^1UJEJ-VtHTLb%{ydU9H~08v7I~9rnxA
z3yv8m(n%Mt8RkVs)J^6ar_M6qfsXxtby@ojn@2s>dA*L|S*FG;VzKu6fLwh=^Y0Ue
zZ{Kg2GAg*kcLCR_mLvDvXo~~m$n&3+My}2Nt+=tLL!-PKMQg4-B-4gn<&NMw8I_A2
zeGmFZ!a3hQfP8Q4T@bS+iojiz16y+%KQ1Oa%rNXUMnvB}SjVA(b;J+K*!fp~7dN?;
z%(V@o)F0q-?k$-WH64O)M?XVreoe#lywQJ}*?H4=MGjr3*;vL&bbaRdggHl8#5JP!
zyKX2mj6k=LOZNqZJbvi4BudTb&;C-jgUGH`zTQ(*V{gCDR(_A4_Zmd($91`VC<=Fz
zEq1kO5G<{a{u3aaHAjw%iHGU&e+=V!{JkB=h^~GTEW)<0U8lF=I{Sx4-!e`j5re>m
zb6i`FP7#KXJaUJA@Mtje?%qK8KGTmmjvd7g5XO?s#X*|`xsg2Lxn2XfF&M;Q`2q0^
zk6gCKy*R2VUFHb7t@^v#fx&9htJNi$*(M59WBrjhcMa*#AEIFAd^WmJ!f0;iO!J)1
z1DlxST0gvw5`E;VS?6A#ryF!2BDKh=UOS^$JNA+1rbFHn8CFnIKn<)FJYp?nlw&tl
zXFL2+*BHx!t$b=bzZ`tWXO1eb%o;tJr>)yNl6Y@%5pxG-iqJ}DyuK&;NP-C&!bm;J
ztLRt)6{keNUg8nv-C3rh1n__$cK90<I#+|&c(3ODJgAOSl%-T1e~_Qa8tP3X7AAvl
zxa|8Wh(|fEQwHa)zWoK1D+&9?S>r%R*KbCO#y2QIADLA*29NraotGF<Fg7kN6Lk)_
zDZPxWB4Z+bo?&Bs3H&N4#KLEJ9nS9F;=HLkI)nRU!EkIx7H*h<#PaQpQ)(Xs&$3^`
z%eR^ig_r>gVDIlD>6a!+>)KXU?pn>eR75!fh0#4C3jzZCrp|HD0Uq56XRU5+m~zFT
zw6_116!3F&nY*oaj?P|JTv}{%#4#Gk4Kn*4Oy($R)UW>y2ie%I9#?FFtcqJIiiKhu
z5ULNUO!|OSw(!vqt)-Gyxt*OtJa-?Wl+*jyMnJr4%GXh9mSB!#N_O7mcK5FE+Z~GV
zk<#<09a1_Dh^>hJEIB_&{!Jd^4?T;}F3)g-AwD9nAySlj+E`KOSAe&=y1Q!KPzA$#
zQ1xFN-t1#4QcGV<K3yqq{b~vxnMemHtU$gSE&rrbBznLMff^SqGRQNDu5wl&jGOm=
zar<7)n{dN=rAvxDF~F&9Wv(JQ^Y!@3^vhR%6RU`+;c`@et_bR|ro<R!s{J9e+_Ws`
z99+|J<>8nlsvHUgneRc4U|>DOMzr;6QK-%cm)Uay5^3I{+!j1iB#+{f+c?JN8SzIH
z%jX%Mcfaz<=u-&fwn~EC)QT-a?Ey7w&2q&qoXhX<xd6Wm8s+Ga<22Z;f0yXgyQMcm
z4aRbyHnfbBOMHK~4c$oWHfNSy&kz{Lz(Y&twfnYUlecUaC&a4E{Cog*^E}z_E<I#d
z{8dcpJ)r=OiLiYHapOaKSqN4vB*s!>Qn0AsK7(&=wTtY;Wa`~;XgTkj)7#7ldD$=|
zzSf@jwVt|wWU`F36%F2gWezXYN7`jgTS|@ajeSJNJ<33+76jk=<4yk5CmZNK8JUg;
zQEF9Z_l|&rT<@)`wY}qAJ(x-VA&0t&Br3a0^k2PavHqNAODix_(<n$|cft?NH3-&d
zpL}UTwBThV`-O9iaInqL-TP7>-R9kk*&;-YIEAIi+IJd?1==-GcsjCeJJplln?&=z
zs}Ff*;YF~ja9P+B{Nr!(oCE5fms2C^-de}M))!L$btl=PJBipWsgdzsoTx6gQB>)U
zE6U3CUZm)UX<$-b!15_`k)5c^ia9}zod?MwimbZqSV-66lf(~kQgcFWOf!x>*bgBZ
zVOE)Z@BQzsij~&p?6Cn=5|rbiXUWa^XO>?h{hQzqavKV7rp$`Y>QbJu#}Xhg<%t+8
z1hs%J*mpN4CNxt}hX!ngM~N}6yk9C^wUu|j7I~bP>uqqN?bO|b`JWKy<%ij$&yw~c
z%Fe0r*3QN8(@QdxXd93-1%-xi9n4yQjtg>o0`0ICua;kK+$EI!+Gr)J!NULxGbehJ
zNl%RZGUvUeDlM?1c<lPMLr-jdG}cp4qH|J{Q>%35_KI}ebBkaXX{gymTYCi%>qxn6
zeAS!3Z~vkHa1GyMz9QVR`3KlCtu`{t=!?+~?kb<!m5{+k{CW9P6yEf2UR;+@+$U0#
zXtXJ?=EbGk!><Dfx#q!0&ggkS3nBSsnh#g`1fn%|XxOGqZ})M_iGniKuCbPp&37?p
zIvvv~8d=JXJau*uZKd1*ec0bj4_G@fgiP(x6H3vjNDZ<%P0?Exy!-32IUmKpvq+B=
z*vx?bD8`=#*sJSb|86$)8qxaHsjgf;@7Lk7X&>0ax9w1Si|Qqp+nf(TI~fHip)};l
zjg3>X64H+pSK2eht@3c8nmX_A?>nKNEw<k=25;+wu)%&uBzbFGB&yg4DuwOeE5Oc!
zJw>df1u{?B{tX3R59v54A9(SJmC)92Su)2q$l7g6gl>CcZhMYeQZE;Ork%h6j3s{L
zE=kTZb;B-9*eFDdc3*vlRJNTnA@<1_0e+vzGNI#wdY7P4^I+8xDpz)aq5=w9`zN+Z
zdl+vS^n!^?$1_=u1-~tI6}fipsSO*ky}<0AT<!z%Vg8(>ACaUvn{dcH@2*+gML4#=
zyYIAC3V?!=nV6De;)xGd+pHwvKnamU5#%0n8@7KR3oUeiYjX43`hvp^Ur>N4Zfzt;
zZx7S<+?-y-wCL?+`GNqwrn|S?Ghr38-@Z+y-63zDHABhf5<j!CLF0Hms}WXku0w$Y
zaX=lv$SrGw>WNOb^4vs_2)yGmXC||daN7ZTJmyeY9Xj-jrfH#o0|M09BJm^1l9nGa
zm)1+^YE?#<rimY6#}dNu`y=08Vtjf3oHX0T-_XZx+cAD<=UD$lYyod3S#mb&(N)8D
zOCV#zW^Q&z_2QP6re$p?AV|kDD?%tTL)hceJUOnH80|B1zCHO`N358V<4Zjy>tD0#
zcnAWbk2u(MIaS!wvBCNg2=TGSlOVh?$dINI&O+S+;^ChzV)|U^%%9U-#b_=<nq)q<
zpL8ye^QPx}RoI5sb}4>>wKY)%fagT>(0)tNG6|6YZsTlA3(jG@1f2T^TX*-My&qL>
zTfWdF8@8uC`$3tJnRwZ0DAPg+2O_R2*Wiz}K7d6aT1c|K`3b4<E1Nw%P~Zc{Lixf#
z^m3VA5lvp(6}8SzGkE$OP1(lgrt41USGY0#iLIsCMii%T@{EnGEN(!mc#@KxYTT9k
zJ?bxW9C!29%U4fOw&@bPX*X9!UN9w=TfbQZxef&N1IqK;dfGD-C+Ju-VGQ3_^E&09
zAFf{;8yoN9<N%!$X^j)0Zr>tNG!A6$>63NZYkaUpR?rnIpJgxI0zLJitvZ}p%)$pn
ztVuuaFlPgTJ`((1@_5i3Boye@wsMs20<ii-QAMy#F2nsGQR5S67IxuLa^468r!+X;
zJZruQscV((CTO7&?1%I=6Cyy9E%}V~LEbf?FtS<V326xG^gPIAZ{2ATc8ak!m~2jc
zTEbSZDc`@b8oOq*P+X70-%*c5qJ{F|W;(yeBiV3EQ*XoJHA?Qp;UTSS=P)$BO!K+A
zD~v{sQgvHe*O<G*M(N5MIy>izDbD{0YdL@y5V7!5_+&)+-U-920@VzN=M`1(Ci%s!
zs8$J<%V|bp!y&XW2sBE$JR6FWg*?`3SY{9I97Xn-h2t)CFBD>N=QQ=LIE!5HKhsdK
zvFlcmG<gzAEhSuu!L@7&84s-&^IU0M#JfS{vIXQ|f-@_<$rNDXEKgtS^V)%Dsh2bN
z=?G>;%56k(OC<wOb_=YxG2(fZH~DNs4po^;U_Y3~s@5sm$)Bcs(PE+GJ?sSuj?acK
zG=`0_C+r)(Srr#UQ!asiEOpsN@~(LdBAr2G{VC{({i9jt85Iai?Wa5f3LRU6FE_vN
zt583=aHcyZ$bK#H$ZLPy`d+30(<Quq_5@e;<XFOz5~YgKNIW}LFNdit7XJImJ?p~f
z7q_j^TXl!UpbWiE_4_7PK9sD2dkA3w?p{1F$-r<+3Fpvy*I1IA1ZEU}N-U5l8O(gY
z8D@)EHuK%wnW~MgtaOID?xWvnY>CNPPV7x)P?CRSDB;sdawYV9*qtY9$2k%XsF+~K
zwDG>)?WXS<ro5=m7%of+Uy1SV8Y$3NA|+LjV!zDiP>EvGiI#BOR{9xG{m#t4np#jv
z)s9V&lb{bo_Gr0Nd&_gU#e(-~>eK+$Q=)X5pgS9%JWa`4q+v=9)Lem#r`azH<#R}n
zjhrtUwP(!_s7{yeU<t4hR7-82VvOj5(Fo8U=&EcwbFiDhW$}}DOhzifFuKY9jrxe(
zA)NCQsS;0gsN2W7Cq$KGVJi=ICnvFC!zCEeJF}qOhTzGbA=3k+5MKRjNY^0uwJpNB
zjAA$s5Gxu@PvhU}rr?ivc|XUbU6kfHw`WDye$^U8lHV8z%*9moU!G#QA?icq&0RpC
zx!$<vebSO6NQgR>SxE@JH7<Nh!YrlEgy*}k18IYNs<!uSyYgWlRI~Vzn5}IC-P?qp
zk*0Q^<jI~c1mFri(?<4nR0>!JhEcXq-{bC(0aO%g_-21rPp^WfNZzoiOsM}r#QF6(
zFgZrA$t@NlSbS>n(0=(YYy)ADJjg^l5^qXOTn9;RSuI=Wm1th_A0L2&)Y2;?#up83
zqd^N0;~9?W?1F3h!}rv;Wv*<MPi!s4x{Fa&<2hlXu$bx;UTmGUT>)3W@Fk5YBr4%h
zPysbczt-y)V7@_9HbQ@Y^)#HVkS)GvMp>4wmQMxKQ_lz-#q?tAovhi2p4al%?O<7b
zbbE;;q34PE*u1GW+{KjTI!<bh3Oh?Yvg?>FFw%&$4%Ad5@BHb%o1}jVSjv`hMCY7)
zn%gYUo-OQTlLwyZTWg@7e1Ke!%HO%@MS`Q}a}$KhbZ9Pu4nh$e6Kn$fD7M<~>sWJz
zJZV6(=8SaKdsI8D5sjp^9AsIu{4_X2t!tjz)=05L?LgT#6T3Pw_`4QJnBraYvW;4?
zUdqpCZ}$RsPN-j?w&C|o)o%T>IlGy{V7)-d@kNZF9t$b`5%WPLsWOoG7!Nj^{P2UA
zlRyrmlS5;82HA^tzjz{CL54h~6w4uN-V;h9<<t7&DNp!jZ)^Xpc`k@`GiP!3{L_C!
z#gS##*aexFDgH@HbSm37MhXNH>Oo?|LYL~I&0=fGjO^0>xhj+5`|-T-Rtt?*)zGun
zjnEyJhDxe^7n=N(7b0qQJ($i>OaDE03aX2x_6gR?qH(?@n$>*h;L>8pQcS|5PNLwH
zd$_3#w$cw)exFISP`gCCDoZ=RXK&Kr$kO7-E5F4aKiv|AT)B+^Le?z4_nY1^W53l^
zxjo-S6paKadI_?y6ypWzVb=4)gljaPrM`s4g9}x4G_OJ^Ic8|-rR;&4?jJzcSX@|q
zoK(M_!?55Q0#(Kp?Kl#I*!{<SGEL3D4B9`Bp4KJIGeYK7ALcaM$n~V}t*Lhdnw|lK
zaBQrYvA>=7FqB=Xf`BqEEZ$%IarD=Jo#b9uLw@)Ay2;G+(hx>h@}Z1#&GTqD$9@W|
z^TFL51=*h9-#@_Pz^8YTXRL)D7s_&1Tck{AmhXL(P3TOK6IA%~m#w5ue+?U@+gYm&
zAmV1SbQ6Ed<>649iAR1jkG`QS^{-dsRfzdZV}6UZK^wjjwp&}iX>XxN?I?HuBHvY=
zz0i_<(Qopy-$T!feiJ5skye+59-qj@#%$E&RKJp`87NM@#Fn#&ru4wLj_E;4#1*L>
zi&l#t{r*|3U7Asy@t#H*_&>XjKHtRE=b2DSb(06~pg(ef5xQScGFOl;t0a}Z1V)>!
zawMsCsz<O59SscV`&J+7beEZwrZn7%W&u=EE98b!K&?64B}ei4@BI_E;}gHVxbQ=_
zP0a<DKD#f6wR^5(saXBj5zK>Mgm~+}=3uhM>Du;=GY4w$SJqIINh;AkV=*0{!1~jk
zYdzH&T>e*1qA>d>Bv(SR=&_MWlniOrI*y2yr9mmYlIc73)TmYvVV&rY+$C<A_D1di
z;Tl7~8b1qhnPYLvG({>>%g@M%1nr==*@l~*+u4N1w#@#DkRmLUk0I|-yM#pmp+<0z
zja<{YA}TG!G|Kd#$`?39zW*-1t^4!er1;%R$Rcs85+;yoUKCaf_K1b#n3VSBx+?is
z_aS5O=a_^K?uQRHG(zjs7`4^)p0H%Z-8;gc_|l_Pi32Gk+ZUyF6aX$KVdVy(_)KlF
z;Jo76LuOZ@P@HKcq(<2wy$I^w3zhYy__-<%uzVFQk8O!p_R^Y|ZOk2$%C2z#a;EE4
z{S1p#mS)|1opOa>W;J<W-8{P&qh5khOQOe{#H)B@&)$71Ufy@iAWSjYspxdr8A69P
zr+U%w$7wzUEfu}Ydu<cTQ$0t`<8IQwsG}F$WL4tpWAW8277%&WcHD?`Y?toPvv9T{
zl?a0smpKyQ+J;5tLLG%G2&AUCoV46>FR_jCo`&Vjw1dzQC<;B8H|zaL>O_`d<Txvn
z+LUiwPj0Z6z)LFLe;1U)vj;;YW}cvVqnHm5y)q|F0YYIn1pa@^PLr!S`l)t&8;@g;
zWI)u^Qt1v~Jx)Ok&FhAn+YYbdgKLGh^C?Aba>s@o-jE}O<H^=y-BVv&Q3VpkY4C~t
z_Da)tDEzGrUd;E~XH+2{RV8bDn|b<H5_2+;E+f2acBWRd5&vF{hp1J0@Ye-ulskA8
z2O+d3XoM{ZLs0!H)G9FinA4tE#;d;GlgfFdHD|x&2=ou%peC5zuzq5n5}B}GC(P#$
zX^El@>g3e-_TE?v|3L$->Q4<u8If?2YLEXrQz~!wcO$HLCC`vk_ykjk-c{Yyy{_$~
zyMe+-BDC-6AEhI;_R@1P(}*tqB<4uxpF@0?SUZFOIq^1OD{q1)`w^n<IwW|KVWt47
z>pDspx`|C{Av`+(!8P_`;j)C<K`>KIZ0v_f!T`=^ZPEg3*=a8A9zAhu&Tk<s+MLYZ
zs>*rFUo+TCWpN%<Jzu07aUb5J8;3*+*kDbi7Xsw!JCdO2mSx4PWhF%_0(WZuwOb5x
zCa68uRs1ZbEr1uoEK1Y6n>jT2M~vKofFjG-?@;VM<(t?K0^&b}Cd0y5LEQW$DmZ-e
zx8qWq`PfPVPTkfJ-F!FkfzfyI3{2=X|GDLC4b;qXo`okG#}vYfD}{8m{zP1<4=(3M
zAP=>I1s5YSzAHhxtjH$*iT=~T-8?7-0M>i|wnGso(xa4W&i;Cvv0q)7R>;o#)N?0V
z3@z@`hH|HlwMt+N$EqEDrM)0faja)!f!i~Pny%ld^S7p{y7y$&4<ej;(=dV~etBG>
z;kHnS$gcqV?U)|XGgM09$h#1FKD$pzCCoW99P8MUvzT5`@ZH=y0QB8+tBJC<22iS*
z_Tmrje{2P*VMpCW)|_*<u0OGU3OOjqF{U!-OP6CJ)cl|qs6q9`rmGEtEcb0>7fNBh
zT-#3!iNO%-Z0X7<Nz#De_Q|9?Cq!EuiiY+411w-T>!4R|o+bXc&5R3HyH!e++sXZk
z$}^%jr3+y8YbfZ-MuR<xUdk0z&Jw#e&i!SA#}icfD4?<+w1Cb=12oR-Z%_v+b24xp
zBY1mvDvAZ|x_F3B3kJ0<V-lN!H}K`uCEE%f*>8r*w-MvD?|P|aWT5tbDqb)m;*RBP
zIhD-bw%n-Q$QQmJG4nUGH0QG)Uc#xjdXX3RvVzqoX<V@8r=_N3_af{IOy$9~O6SCg
zYB%#LY)*29GrtL$a|GOO=D)G`o>5Ju?cXS3LqsJ~r71;0ihzV(M+jh{L_`HC3W_vE
zh90T~gwSMc44oiFsx(2WAjL+BbfhRqkrpr@2m<eQ2c3DI|9aoE&Zo21S?A=#$Y|Kf
z-uvG7)qbV2jVXU19s3B!tX)ZIQ;?gB7kFY-WIbaD*0A069#7A`){MLRVGf)UQt5ay
z?*FG)QID_v_~khoCr`>0spWwJ|LN$~{rCIxTc42c*BWNQ5cL-^7j?ARiy}d@V+#4H
z4LgXthiz329|+vW=lXv|q|gw<*)F0n00<T3r^U}(>)XH<(Sz`l+pPvxkj@60x9v}d
zIyvp?b`GjBzG4+Mg4Ef}s0Tt;kTRI;pbW;4Ie8a=ao!?Hjf87CoIAa}y$cry{UP2%
zLv~)QIOIS~dICWd4r6h0EN|Ea&1m+&vJ%fS4x5Iq$D3-+%3C4<Yrm8ir0j_mNk6QH
z++Zxb`OqutORxQZMy^Y52z4NJiFg6_uZWKr_!*Nw{02%T+c{qB&42eG)KFC(wIW?C
zJH17xE@;P|Z#FydVZ1J9L3jO4z_W0Xy^%URi3(?5u1bY)o+Hw84*7*71?rbt4*5y?
z-X+aR*H!M{#5ot=i~p)zr+Aq0d+?kp>N`v9stnj3_-opSbZ&|o`pZ2Kn|iEV^a1SK
zSCOBes;%m#y{><88hC&?CSlPd#iWwpR^_s@m1pB#{5s1s|MuALhSZKiCu6j}DPPQQ
z>Yk(u{lzaZSBnQ6GS;cFSprc{`8L`ppe@t*&jkN7;N}Wcy}w^ZO?=QWi82Ks1K;~X
zkR(BFM_)}g)-ZrU{C@*a8Um0hDBKkwK57g8E6tMB_Pf>g`**+w<^KT<p5NUIx}-~J
zL=_J_(w7?u3HTlX%fCmD|9+|emnbo91_*|5IjDVBH=^lF-bS@VcN=U?dINquM-P-`
zDlgcNI=xgRHo_`uqa-EpIKX+@{)cASYozu?Lw3--HF*KezmQb@A9P(<4$}W;YO8HH
zz{YH7+}S~BL>8htgRjXICJ$49M|!8ZQ=rdU3K1gFr6;t%qmjAZ=Ywo;!16x?nT<=&
zDT8EC|4~T*K?VL-g6N-={+Zgn+$`wcSq&bf6T6B4O5u~f>dqF*g}nF(i%5n9v^7m9
zHi68|{f#rSG6U}sjfp?}-FLtzPSpG#r)W+~R!0;^Pbj^C+@ugO2l=KiLK?ZDV_gD%
zsg6iBT}QA!h8Rt$fDRfV&HbOV3h#J7XM?l_tRqz)5lrNe&m#05o_2Xcy9P`PZ1~Vc
z_cWv}|4%p16d9)EK^qOZMF60irQG_=wu?xxeoqx$#`aBnnI0o3WfI>;M8^th3_;<s
zq52_H$D^<8^w;bG2+c|mS>C}&U3$FiUJX{JJ*i_@Z%a!Z*WXTl)L3Nu%Dr5<6_Q3e
z4VPa61HK5VLsKjL{h+t*Kmwn#Dpv6Ay$p}t@yfQSRN5nz;e(*Dt26l&fFtxk8<c9z
z{s%i!bw||iO|dcPuEcM+Q=V}Kj=jn+KX<sR-#q}NG}R<Oc&c&@skj1^OBni87oJ<y
z6Ok4TY_SaijeyemkO)ZHIb|d!gy`z95qrHv@w3&0wtH!?q4Pu9IqMry6)s6-y$wHZ
zQUzI~UIT}g*rQiY5Q35c+@S{AGUmv*5p;^+2s{1(?C^0S)fqt68&RqNQZuT2_zaO(
z7@E)VglT?vLMd8G{Uz|gI3hLv?NUl0S>Y9|ZwZn@%?Le2XdV0y_b~Vh(X<foVCVjd
zDD$OR-3hkXm8DF_8J3pRfmx*N`H@yUT?5M|6iX&*J`p<)Y6aJT6v*jFZBHN~6v9rM
zHsG7j_XTl8p_TnO!ES#OkCT<&d(>$L)O<-{r23iy0;;cZo>1*<-WV2#Wx<&l`frfH
zXI~;n6L^PKw2RTy1CfOE=3`S*dv_)*t06@fKQ?$fdTj{*L(&2?whKWz*b7_iw9ad)
zSoxmfc?^wL8zdl3y%CIbga;K3v*T$~TeLoYDO$~AScar8S$u`4|3jbYrLVJk-E~FZ
z{l!x!e(g7O;Wwc11p^@%3q8d}!NYUe+}xa|g#y!Zj@;NC7y)OfoM>`Uy$@-jZCvnB
zJpw{QgUjj%#J2Q}1}ys2FNil_%s#1+xm7@_6%j2V`kdL-kA^7jkUDG}CW>~L3@OA%
z22kPCbLi&#$p4ner|W$OGZ|owLWp{b%MrL?4Jp5|rVxlsn|Wr#*#&&xkgQ_N2JalS
zj-anEv;;Q*z)%~n0QVcP0kn&XnXc5dqTA#P!nTqsen{pCi4G&VW{vWV+2>X(0Ux*q
zP=Q))4}{bCc>MPRmegdNyOQLNbeuQjdnr&HbvC2ljok=5#-~6c3pM2?9)d_zhyFhz
zXkm891Ovrr!W9gkGo0VXsfW-`ofD;<g-}I-7!sg2sRw==xzKTDJpxH=(^Vv}ftV2i
z?nsajJiuowDZY|4qnw9GC<4iz{L-+YqkGwX6oh<`fA7Ynq=996e|=Of;*o)OZMzt<
ze|AS|KELB<K>k%UK{9q9Yv$$7L#M^PaayuSG=43k9asQJTm6?<4Jdp%{^;$hdStqa
z3#L8n78?(HI1;cy<OmC7O>`>w_wl6wT7^Aayj*C3gywr&{_%9=<3xJtG?ah26Y@Sq
zy6a9!h#j{M&#>y(zgG~HYBh3wPQ8FOir}Kap4bCn5VnG)skt995>@MW_xnYor?wn+
z^fhYrTGx7vIlvXsvo{bqNENI8Ce|al{!KDn9hV+T<sK`~L(3awV3nOnk`4{dMi(8;
z?jpa5@5B4oO9zX8^ju9Gsgbh$@%G$@MEe}zx4NJ!u)fdQ7=%z&)s{ZpmQ<%AEmyaj
z`jxJ=ifNT*u#?yu%Oflv$RzyUW2#r~u0K-WM&+*lexb)nW%=V%c^~lD;gXW%vC=QK
zZM(VM{QbL1AOoWvdgoY)RqpCJXkWEauB$(E8Stmd``=&fNnADgjyg*};!J)LRMryL
z$JUSgljLxddr?3}Q(s_uW$P^=F9zxg`u!hs(7dX9OwCQTW*vLc;Xn^m&9Scz8N~;3
zIuApL!TlVuT)Q&yP!&KHJ=M$S)<qY#c|acy6rN@l!&>G_{8vhTyohi(+L`VOx)x=T
zCx%b`49h>-&<qMtUsg-qt@Zs%t@Q*SsyXpY+BVMl!K}Ifx@hZTj}sLUq1k!rBc5jv
znr782e@^R$HIa|-E|zW|RxY9r8o?rXwa_YAb*~qGnth41(>B1C^-tz$jPWuM(6*s5
zr3zrhrm>v`s;kY*WA~S)ni%tgL#Cq-L>&JNH*l2YX>oAiK1gGm5K#bWw5Tc*@-+?|
za$n&Br7Agi9NM$;ma6iZ({#m`?CvOxKHO=3EM-9Q(3|ZnV^!bOq9Kp`{_UM)y2Uj#
z^eK}dgi!Z}vY+U>lA|17S9}!EK0cS;p+cu(@Kk=%5%!=uRpWh3GSTM)Fk|X`b3Z1%
z3<A$f<s&7%a>?cnfG(ZRt0K+}|5f^YVs$m+|CobWzy5@zBDsub&%b|ot*7AN0+J6K
zc=qGP*~2j$ae(ku<B*Mx?g~-NWzf#M5+OF~ZKdyk7|XGZyb;kC!W8QnlJne}l_QS7
ze<KOD(d%lOhfN<p`<>-<RavPXdvDn=_w?uP+aa=>fEnfV`sc_+>ij`OlpYIPA-3!t
zb5yW@v3(*HIMoWdkW&D49Cpu6p4NO2o@p1&8u4y0`!f!4*E(JEp1<>C8NSR@@_9hV
znNl}q3DmnbAd)Oqfs|2?f#0|LJ`%5P)U8^YzG|IleY7+M23W5f7wspRMIYwI!n0b~
z<Ddigdtw8Qw&w{MD3X`ILMgcI)Psh)&(P3|IsK(ClP+Xw2E)b7LM=Y^c8?7pKfT7a
zC3ZRl?QIl@IG!rv>Qr}`P#j2Wto_jXvyzRC+V}<S5=L;@*{@@dsj}-n%zbx0NiL2q
zNWi%=8|GToYTOd+^1Nz3p09EG#Y7wv#>yxUr`5!CFWCAS032#tBhN>(EgCC}3thfJ
ztbpD29}!qmRnUc2UaF#WBU=qdkd108eXeh+cKk1qW0B#4+A<~Q8UNyR^wkjFrd!wN
z9XH4j$(a)^ANisyx-0jt{UkkC^52UDqz*uByaXAQY|F@QkBX4m_4A2)DXOP)IGu*#
z_!R$qa>QX1RA}FvQ}`Slwy{hefqX6@GBU;712aTz;M`|@rLgw=vC7U%bz_k*A*EeL
zuFo5`lNtCexNK-tYJBiHm8QLE-WD`WjK!I~0BQ7X$1uUC@w_2x9$*~u@zoZm<~j7f
zb4))n+Jl6F?RR0j^TM^s9{U_Z+q6lpy!CD-kvOLOaa)wd>7G)x$kVO3F0LE8h}`)=
z-I|@fe)8;0W?QpWzJbpSX*T$@F7cP}c|d3A3lN^^3>O7Cnu@a(&9=l^9f8qNBsvB}
zRNHo!n{z$G%38_a&NDX(R-N2}Z5M=h#$Ea9$<eg+g9*)5epObq`#^3iA&doOQk8#X
za}$412svAWHSV5g!RM_M==Nnfhgl6r5OVH|1n#Pj-mA`Cyhail$Sdkh;cKiK$OH6b
zt0S#~y|~4S0~sj-m}tt6xtt;FAZCX7K1uqGYC9>STlOMs7nW*4y~l+tlo{8pzxfp1
zug6_t3}?6(+@jK5=Og|oQ|BcJXi>gF7bC6nwlKRzotCdzY_Yf;(fhfpdFNhj=ACrV
zobjDFoJ;Mt6JfVtN~K&qqAGgZfmnBS5D@8AD<>ry(;iwS>-sd4ybrnG3hB2uEvB-<
zBLJ@}cpqLD7aX-r`mV8J9$REh-A}{!EFDLk&hE+2|Kt5SvLsM7GJo%~xXO2XI>8_6
zD4(@Fay>bmwNZ#zF<j1+`seP#N3#JU0g*$lxbFDrboEs``vrOA`jHvQ$!(P#GMT1Z
z9w9H?Q0HcGvQ=}WHzs)|W$9<WO*)33(>c!Cx5m%`aA@9P+ciV-r5he8$c6VZ2wKP=
zle6C;&(*xdXVpiP)oWrv(zF@rzgtcL+qK0%jZaVORjwf9W)4(53-(6yN|(?;`sTKU
zy`l1=!cIUy^~gw%e!YsC)l0mZr=Dm>d2HGDK1MccqR#%#{yHJAQ=MnUY$K2NQow6K
z@CbWkSL6<A)le}lUthos^0SLE*+4o5I#S>uGCyS2s7MhzG&Tqz%ozHu+Exfa-*FzM
z$}Nc0NGJ}OJlwo+G4z>$kQHi8#VNXE9(f)dXz1LJrt`)ensu^8FbgQV!&x^LE}ha#
zD)NlPg|d$<wqK-hB+9aDRDik5j~3Ew;9sS}psufjm8+u<2HwoM%9*DM?9Tg*FB~}f
z*W|6vkH4&%o_HpMe6dEzf0hzAW)0W>(f{3L`CbQCW1Fhovbp3Kx#Hr;Vi^4}5_BE#
zmEO+b;w)WloD-}tns22hGWunkSQVr&S7>6MS=CEZ9YnI`pd!Vd>N;m`m8(#NMwyAB
zKW3_8#aVNNZA-kKEggZruziPO<C2B5kJXIZvt2?b8V~Yyj5=FiUjey<W=kg_;%F0h
zD(pbQVe-ztDvNzCn{)3+KaSMfWG~z9$&$C<VUy@s)JHF%bgGVa4Ett<c&(h*{08<o
z=Ty`4AEnLz*zTP}@LOZ34A!&E3~}4Glj8`_pZ6n{`cfBm=Fc@>98##`3No#|YL6LP
zhSI{g@fl}{)lcGFWpA;O>1~XI&bFOpAuW~QkcDzh+YRkw&jTG|8UlxI2p+8dbCcF7
z*BL0mUq4xnveypKs_=v1ub6w}apZ8w<ZxO(q7CU8p-NOdt|Gi%SWu!fvda%DFd(fG
z`*pq%I<&|uhUM&aw;n^}N*fqwWBb;q&)}TRb&&lj)1gD_Vjg3`4*cvtnHpi1rj$)(
z*;$V22e)tP5G1fi<GRAShz>_{n@IJi7L+>k9dyK%GFU@dhb*|>ta2yHyH6s1RmY7-
zQhyoV*WRjIcPr}ryiw7O%SE9Lwi5p>;f%M`WOL<U<J6h^a|=I{@RZtUyx{9(Q|Iff
z$$N~SsF+Fb;rz_dLCm+-pFk8@cYc@m?{GDLj!ZTz2Sf`W;VpOH10<M+Xm5$Vjh8zz
zjbA0a3bW?xI$12c>CzJi?xBTkVl%suSeTSBci^z}eq|m&OJ3_HM4kX1^O=vf)}@!W
z-G-rupZv96?8WdC%8~M#IawjabaOp-mCx-@RGw)fwd`-?kLa-l*3#q=3w1RopP8ua
z;*hRz>7-t5*-NE0f*nk9LAV=QThy2q`G|9Z7KNtF+REXdVavMhwIPL~eSlpLbr=@j
zTGi-|>=us~Iy9QnU1|H5@}W{e9%~_GdJqOWukj4HzqKKw(Pojj?H%lYF&(lfw{5(i
ze2Y0qkhmZTR(ga*pl?JQ9$^&Vd`hCsegrS~ryZQqA!^;j4wfsX%kfu`DavOG@04`h
z*6q$_!&RbXY64%9UCnoUU^K-8f^ou_z4#&q5q7z{+EOz3l|x86pUt}XO81o|#Lb~Q
zNN{d_2A8PLZpq~F$BC4>VxCYxBKw6pFTjD-(z;Smj%aQXn%@;E(lk~VN4Y_Kq4|D9
zo9t5Tl@%?VJI3Q6!sx{Sx)DwTad%ajJerm35<`GVPhM<k9E%M2PVkS^4wm|1AJ`@B
zvCkz>@b6b)lcb_U2S$&D)=6iwPe@05PLmYJsv=3$eJyOO12ud&YVMxQ=)}k-PGY+Y
zpHf3imBSgOOBEsaqDgMD&Z~7lefx9-6}3|X0!iLd&5dxUe)ceQJ!NfFY<SM#wQr^@
z^siEXt7#n1`uRq@P_3PIR?!dLs8SnXe8u}e`b=~dYrf!Uaat(1Eh@|s?%FT)WbMO;
zyh9INv)&$b-jy6;Rill+=>ch%klP*IFzuf|qO&C!eS&#emyaCdia;Is;<pou&fIy%
z`z&VTDLz+U);?ZRUGN(`(ZT*P?8;oc7^V39OXg4xt4+1GdGAX3vI2GMWcO_n7BqI%
zYa~UUKO@&ye*`xqYqd#J{PMW>wK^(}Uw&QPdwsK`vDaA0z)9h5JeA9F`~4l?i(D;d
z_w+G1nd;vA8<Q^3f3uz8tY(>p@&jWL*@}UN8&`Z9ch<Z!+kRKK<S}a$S7_K<y`;QP
zeL=3)GYoCFg{(aOIQ?mV2H*JgH?j)P>+JM|zg)BQpH%ti+iWxaN^vE7l@iyIKGE)#
zuxqNatJgtNd38l~FrC+GF|xbnNk-H`E}e<~e`Mq`ywq0b+w3|Eqm}LLG<z1*?9V}n
zkz`_xG&O6#|8{TjGKt_jqVP7Oq`^hY@EC>b9FI=>M`e@tFM?(%y5fY$<w?WMtR#2t
z;#LAbt8+xqY5!C=t7JdC?y+`H?p^yb*j5kIL~(8UU8-NKudTE^U2L2LkDI60>1r<4
zdE|=(2n_hA_{#Fngy&1^=P*QyWO1bK6~cR~{|&t&&6?en^{Uw-DgqY5Gs^ilUmMm}
zO8F7%R<p)`LX>vhOT+#c-V)(rXKP5g*mF&94_+v8Hq;dVCF0nmAvaER$cuE|%yj^f
zcz6L6-Lx&&cJY>WLV5zyPz}!{o%e6klTS7201?~|wzecpihGT3TzOPk>lzRS*PdPC
zcPBnAnbb}hs_1l}@2>Rr;M&y;wLW9)c9Kb|qqF{yH<!Bf+7L%|_jiYbF*|`2Xy&mP
zY0G?=I<V1cdf8fUHS;!Y^TYbSD-!IHF_!HG_Now>#<ncW3)pAlHto2wUnh7tcx=i%
zD`FSD71>vq*h>YadBzqO@%baxWN)XrI9%w9VP9yrK7Y^>I~qbcU72)C(*MUhJFF}I
zWUkrHe%I;{Q=dCW&KwgOT4A9cbr_uE6;<MJj<lO!ZOrc?R)rSS3KBxcavbkq5?_HL
zNLwQI5J8eSbLk=9lcSORYAxW8lWt->q6U4O);Al?jU6OrlOj$PVvyzfa#ve66*pJC
zc;qM>e!dFY1|PCj9#YSi3u<PRbXTZ@Ch@dO{Z+#v?uLsvjM6PSLe^9UI5-#Qc>{X<
zv^$Ro<4ciVe(NW}RGzL=*nRCYqeeg*!C<mK=x%NRRqVD5(S+*v4MnDNKgoCS?eAMp
z%&j6sb^o>(5Es9w;}%g439sH^fYr<t+N!wsNESY43k?oE)}K;kTGUf>QA?E)rNgI~
zp3AY2!656T9e!kDV6G3a+j^0%Gk}C~@gqYCnDYM9+JIG!C)q_u<2c@*KAwMB95q(E
zd>ra)mkaC{Fr^>LIZ|S0<oWHXm~YI!Obc>ZoWxR(dTJNZ+f48e*}2ucJDV5eyuVLj
zMJ;`{IY)-^MJ5M1Xx-2xtBN<{WtMdyPc$t3TW@|#eK9mfTAyxQ&*K6WNw)d!th<oH
zyiL4BOn^PN9qAtT)@2)s*<6nS(!NX2>N_Dx3;al84yqx{)pN9E*h3!tgW}l_l&z8B
zfw#7DA_NKyHBY5P9p+*rE$#2JDP)}{kZm^~$5U$oSl^c6HKZat>8;E>$7=!Pdsz4R
z^SZ_rC3pD<BB=XH*l0^9QE@lE!=)UMR>y2>WrB9|>a*)+qsQh3NL8k1D3GC8a><SY
z_enClMFMCv1}`;xNJqN7sdp6oag>z!iH=Vx4Sb0%GX1`b{ej7J`E*rb;rm3ofMPcZ
zGv_hR!Sn(oRv%tQ@iW52M${P;YDMbKceeM^9-%$}di<?zjIVZT@XC{I=Zh@$$L%?r
zGp=Yqsx7`C*YK6M2)<{l-Nuy*fqDG7^F<(Gef6`zg#PI~lgq%W)9VRLEs^w_3k?h$
z(kA9W?^{15^C-QLJ@<B!LSOl&Pk<(Yzo9+nT*4Y8Rgxkp;}24l!&gK(Psy|ivUI&w
z`dCX7k2f-l>jJ(=dBjEoROw7=1B+}9sfq3_^Fn6^u8S~T+|}GOe^IJxrJs_9Hx{Gc
zd#t_Yt=W0Y=g=%p#~b@J<SUf**l(5-9V(3QV^q?FnFJb*q(9~0%ZE8ZZT-AvNBCmw
z*%%N<<}$9YBs|+Bj+6b#aBqAYPE`xT#9C?E#M)&;9_1uoWkX8E@f$)w4@8K~Fpd#(
zBm~oY3v(n)vYCbwlYq3F9eHf>BF7Ym#EJd(;K$kOuvx?EE^z=iZ>y9kk=a-cc8hz?
z@c3Ud()Kyjw0k~D2QTs(0X}R2dM~+tG(0E~_*0jmS1jfzLNr$=CBK&4aG7iUK??f#
zKCm9Sx~61iJe4m~)VveNAu(Dx{ruyHj2{9SBsS$Ad(OtilBisX&RMk-Ynh0FSnL^S
zWnOI!{dD-888?XXy`CwX%$))ekFVq^(a)Hs%mw$4t7#o1om7!h>t~ee@fAK_iFm#z
zc*+`IvMO#2_EKN=%4Tpejnzh{j|)Hx^?^A15~NNFO_@kP9CeMFlulNZh&=Bk_Vb$J
zZFgbL;O9*N2YEc@W{6E(?=27U%ll6R*8%dkEn^}r_WFqwzPW+W7;`jS(7t_c{%=-U
z*;XFhB_Uig-xzeNqp_J2j}ASk2@d+pRuqw-2~YC67p#GdW?tyM(VTv%dp2*)BrPL{
zqa(rsRCBOgaWH{^RnQ)J!Q47r$veFVt!d->t12+D$2x?=b$}(&zAtoO|43+6$lDem
z$rT_+!DP%Hm068TmRh(w{#Y3m5;sLYhkYyqL?htIwZlp+&|522-c26o!*pG7v?4P)
z4_tpS@(7!i$x#Zir1d(j&`;VSz?7V^<Dh%<c-_z?vNy5TYwBXFD1Isd%)nxdD?zl}
z4toPP=J)Im)=C)5NQM*YUK}Qb_Zo)Gf|L9c@+UT4Z+yn4Cg%?0b0g69g9j&#{E~I6
zE_SaL`HhuM5<w5=yc?NVOPG~PscuBE)_AMA>+M+Okujsh<uin<BcZ0wm4OXcL^J)@
zkkod{&CuQpWcu-s*UKfsO@-O991`=_A2ZmBm<sLp-IcT3KazU7=u>(1?5!w3z#8|!
z)?+bYpmKHODwNS)dAjX{$q-YgcCY<@OP|vKqI11`u;}ELL+!+Y+cm*0`5AkLz@*Nu
z-D{%%)%B_$qgeZJupyTY&m5{&y}gPSuIYxsD)tSGY8iL-LDP1sgl=#*F7Q)#e{zOx
z-zi*urwF}{w5Jr2xE8(ze+Np55%tOrW%;?XVm+2QC+@@S9BeO#WiM1JH|w&GDIXKE
zuY^Jx-4^$X^Ob~!q`YZ;)^JbMA!p2^E~#nB;0rxMH+Br$KtR8YmCt&-ZGrOrgR+<<
z-qTNpbt@-!Z=D|uAF&fz<_jI9UXOAuT@Ac>K}Tqw7%?{op@!96BbH`-rX4IDCVbOK
zA7|vJ{{+NuI=<tg_wFGcGnXb=yR*d*#SnnSuG7ToRWxbXaU@NF|5hxK5IC{A2tA;r
z_>GMc96{>(JqF`#j4^z3&>K%TS;0lg5_5`8jgu%6@aNEK<=XP3otzYI(_VBDfRCSw
zH})R`V$x6O<bJUIWQF&eUI`cQ%hFWUE+cLGtHwenKUAN5T^v*T49EyUx$pEb%A4wE
zu()J}{FUQ(bX-5ooPg^OFQ!xYrs91u`wn1a%SdBRf#`Hu<6{*hr!$8;b}j@b?d%oH
z4W()2gPA0s&uon&M5nI?F<I!WPtUJ$@38nA)atkv5arGN%i=Rzqqx#W_G=Sur^tCm
zu1@MOb>%{7--a}Bs}|hDCY$ECzio`8daFV52kVeWIKGNg=D=Pc3#>?WTREs0Tq``u
zV}0i+(^>I*6p4iL>d`=wxv71k^#S5B)!gc}Wh}{<NUzLgcOaxcgQ!KVKUekbVNh<A
zI~s{Tzw|1oc0~uvraIrMDdE(;ah?~)P4`vYcysXa6MP542x)IV$NE=mChjXvz_HRu
zZo7yn^FXtUkz@tQHcFw%*o0XfCZ33e-NRy_5+z|$@Z>s0TgG*GHO>4j<IB>KM;91h
z{XzO(4fEUzj-;rIM4Q89)g>wEhgsuG5IqoNOEktdpe=gti~SxP>|Oi)f6hgS2qb{v
z1LUxudNS#Koyc*9uDM)?Jvn46SObsF3)2hRhYlfs>J%&I8T(lCAw?o%?<yj?LbgSJ
z+%|_qcSk$7acOE|`U%V8O$Mt{7|IkvQ^5vF;paWpw|_k@5#bL`;z(otgP<?&yf&82
z?Sv-J#$~wO)_mipHd{w07$hWW=WrAkkU-W#L`i;nEiBYx9nI1Ok2#(_3YsUU{gGmd
z(-vlRBpO|{I_*T$$6-HW7Ts0!5kEZLu%ahy_r#xHZLE}iBE%v9iOVCBDxw$PZN+|5
zy7KkO%1XN0!c%Of=tMc}Nwy_B2i7&Xpv&?yI3Hy9U23<GmIf?ux{3${UxXcIY^r^K
zd4$#_zh}55k@ik@-QmhcX;=hj2Vs+sSqNS%1~@9#A*cJzClGG7>lEbLhuV8Kn_a-K
z$tTL&iJZiu$Go{1e6t-}5>)Lvhe19?tPh`5LUK_;LlXR|hSulR-13<TmrAXqMq~?V
zGhG6UP-QBqgkilK9Nc4yEqsIp!uYG4s+Z~|zYS_GEKlYo8cjKUAu!FoXsAs8zO0tm
zJ$G;h^Ke^mw9d2oAGxoRMVG^dmBPA?Fjj}Chnm}Am%_{@J(^FXET4Tp?QH;~;*1g0
zfxDr$-NH*$d3K`B?yTc-acIHUuKp;S+Z>k$@q;;R#r>bp?tB5;S6fCVnQ&gv${CI5
z+p=}qUs>T-F0%6Kq{z+}Xyr)QU#~3w))$na=>PSk<%z;f_rzFIOJx|rg{<ggBdNQu
z&j}JZ8RohE(1gGfEj5vT^C|q>cWJf!fv>Is``i24w~g9aZm5wxSSmM>^JeEF{Z-Zn
z8Vu(5$%+L$87~W2i_OX{6KygTZuXy-U0`qIy(A8+Cw{{zOYn5oW}#zvekJT_CP^6$
zfm^!;W|QvkI^>fqK%DdFb8b{j<^|34`l*}2%y$R2{=B)(u&z49|Ko*<QFxN1lWuw8
zm+C<jv;a}wOjg`Z1ZZK~Dj>@BK>WY(e7N3_>->;vgI8#aXU0$rF(`Q{r2pd3&&PIB
zO#)<|y^xjcE>0>m`2rX9K@9>6ee&6&`yk8q(hQVHg>dInO<W%4Cn?*H;WhI*W?ID9
z_ciLTRTe90kc?XN@Dc@KxbC?)dLgB*8>NHu!UP-|mQR%ruFfRMKjI{6!^zE?){Tl@
znZKZApl4P%$D+z~CBtLSBv$hWidiwAYv;M)Pul`p`jEO+Q+!;6`S#ush>iLw%?pT`
z6~66A%*osrqcPYl;%Mki1=sOb#d7sNA8M0bdo>uPjOlHw#N}7Y6+KBHEh>0@`+^my
z8)MO<C+orpE8$U~4wLa6HLcd#+k4a$zB~(57-b*@Hxw#xpghFyh`pwf>1R^t5w06j
zP^X|*{4|UP4N_(d^VHmF8=QC1%7SL4l70E$1^hK>wMO@LCA&Nb&a5F6lRHv%+JbZC
zKtk7Ki~YM!n?Ky~ypdRh@-Y{yR}bF4P;i?#v)tC;dQwt%`j7@39R7=v2~%4D1$aIC
zBL{G$ws&lAf&Qvmc;+^)19K=n!5gzSZ_gBQv;rCioFkl7pF6wVnLC8K#Va5|V{RUh
z2)GAOXo(#8WAE)3xyvknV95c_Evk!O%I{z``>LU+B{S^Z#2zC6p9QZnOT22v{f_HQ
zhWvD@?+`5jf^q*?+Q6j8t8JVQQ0ys2*`d=CbF8Xs){@#0P&x1(3K1><%9RbcxLsMk
z-%#(X*!%{{hS){v_Hu(ngGz5sIP_}yr`0`Aq~WJ9PQ+jVAnIQ>sseiIjHD*^`eD?c
zHR-r$p-yZm-dQ|6C|4k;QSsQ*pfa3KRjGU;GwVb4DsnhM9!yQ!j<B~klD-ch%mxzw
zX(HmHb*6$^y@hX|pWPq2x?Obbnu-qP;yqg*#Eo6P77*<3F&6KUW)caC4x^Vg$3GcY
zia2zu`)`uTP)sD{x<CKcIX=-QriXN3HxNE!S^%-$WrhvLqAj$IZX|e8D7VWq2ecr@
z8Wq~(6^3F^L;lq+`31FMRCFr`u?7y*B@X(pul`sJi@LhnOdU)=_kMby;V@(zvOkes
zRP)$NF@r1HEqs-lh<erTc)8Uw<qwXt0<*rb1>2onXw}@atNhdAN2hAl@Jv&$I7Iz(
z__GqBBQ6x$=*7faws%-X{h5=ov!w8PG06V-$gd5=fUm1TJ8w#LQs=8Z>T$?#q{&p0
ze$IM0z!W5EOYX9Y7`CssW?J0Selh6UwVGCfz<g+$Tj)|>?9(LM^+k0j62qo84lQu8
zaVyvPrgqXctC5fu`*|s?^<!a3{*wP%7z;mJ{#X5ZX(sJT@AG}tN6N+_CRC3LbG@xZ
zkcN%X8fR25<TO@u3t;BfmMzNejqDYgCd6bkNEsSx-OujmvtMGWynUb+Vn7ciLKN2|
z8Xh-DYEfjQg<tqmgOUDSA7MgMfH2Y~S8d&3qdHc%`22fecJOEb)C-H=*SRs9gvhMq
z3u3WlRvZzw4Z-p5LmpGP&VU8lB!5*)(+pdVEx2vypXiL0u6Hw?_X2wi2gWE)FY#~i
zRK5MQ5ftc!-pcZ@yLMf;*f-OXCGtM0W7A$7H|L%4?VMA`W{%QeZ9sa209fCJIUvmn
zo7cx1jQ2#!Iz>tTpFs_>X~m!GX-Ailq-W~BO?wx#*0ttE&k)#2{``LS-qFN550z!o
zHWx}rLP&Q->e=$mw_x=v^#^{Hhd*17c?|k`$PwnpVY{MtVO78IG~>MLz1r&~BKBAj
zM#}g!2y#P3hOfIW6#a=-on_K8(0rt`kMFqQz_>5lRw?*UFpzR>#e@5uhtj8Jg8@T5
z&AJ$}^mDkI6eWI3i{y2XE1l1KD&J?o(nzb4S2sv>z^L*faVbt<Y8X|V8#-@vwh0V>
zNS>CAt1=#d4HIjhNC@q^(Er#lYkWZxyq&POn%QeGxX+k5-%vdqoZzjKZ-FB+J!8p$
ziNLJVBf5n*rvS5nTyij95a*&tA9)4CZOoJ={4}FP)U|dMuxd&7X<9h}a>4Xh$-6no
zFHaX;(2!wcyMEUwpbqdykZHNkW(cd@=CJgUZXzJi)Sf8L>?M!lvBlR>f~#_(9Y@L{
zyRMBjOU5I!^}ujuvM00hu-5HkGIe9^Gie2DVZh{x1uAM)p*A+Dy<DH<oLcQrg~ym-
z^32=sag0fDsoz0(Np$@gac-27K|kg2UcuS{<v+;uQ|^mfSS8kSOAL9Gj^9aCLA~Cy
zY;IJWYd(1Lo8%qjk4Hh6sDeY3{-Bji7-{9tJGwrrU?x;}^J^X2;xy9#V~fjI_7nd?
zkzh~Z2vowhK~JU-Fm6vwj9E`xU-DE1s<&!7Cl^IE;?gs#OFuw1_Cxjr<V^24GCax^
z48XWMwAPn3JG9Pfg|;z9G90$W*6}A~xsQdwc5@jVl_CEiEh@o4*AccvyG})7vyuN;
zF`le)qmkF+OSQK{y;sQWZK$MSTLp?JH6E)(2FV}l%WzZY)dn{e&dsY~!)4*rGfpM<
zwJCb8i3`dtm3bYe(u;lTqno4(%%9CG+ijs!^;>=1QXM;L`BQIkeLb5_q-7<x>YnyX
zUFS~^(+f7|C6s%Xlzi<v@;1%VLnmgJMJ3mS<{s4tlnS-DKEIV|yE7echx-sV6xJ?w
zlB_Fn15mbOTjYvTwkHV;oUBMUoz9SDU(hKk-)-JbHEb9&K9lG)<|f5FBj4{<eV7oz
z94lFOh^gt!eB}-#lfmWoXq-RT;udL<=Mwkke(@*cYkaE4<O`6NXyor~bAmgYw2KsN
z!uo-^oUQ#rnE7*&*A4n~#a44aZ!qs17)~z{(dS^xpt&Pyt6B-)w&k=vL$3XSXlZy$
zGUw?@NIMNuqL5Cl3fSl5cKQF1T)z?{YcO5hx(g-YlnJ~TSM30_@~~p(e5y$=QY>Un
zVUf3<SQGkmf6Q*@s{H^HF~#j{4V}o#`EY#U`$hqdIwCF;&vH)ZS*Z8b?&VA%E;9(c
zPwM%MA#0w=Ye_Z2skZ~ddZ+ha$iNS)R88`Jh4xWU@(mE!XlR6!bh(tx+u2X1;H^Q$
zNy4r>xT|V3#^FP@y;Oa#zI>}qGH@&7+Fr}R+@RL#yGFf(4g=09KU&=)>nzz@lyNiX
zaboT(hWU(LTMu9GSu895oMihrTp__m?x{I^=#O0Sh1#>v9ee(w)S(0fUQLE)SR(2>
zn;1>h6A7`5MVjOnA<Lg3kbcN6p4jS*l(EB;fXJdrwvm$WcQxXYHE^sVhg%uN?vt^3
z0zp0ED(uU4XV?}O&t7{EMM!J-Mg<-VoFy2?+nsd-P$J^2+jW|Ox1KMwhav=V{M-98
zMD8SK98S&9@C6-+bo?-_!;?vX0WYNL-&N~LKW!+d$zO-O4YO?T#ub3UWO>Y+AkkXc
zp{mnaJ>^k#3(KEw@9DfYMO^8DN3d<9X-D_gi1jaKT9Ye>#chzJbhTWo>4kgSZG`s0
z+UEd%5L!}|iwuw@c=L8$!~0e_#)Fo|dE6%M+g~k%!^Memem&Lx{;0e*+^{Ki4S)=o
zZKkgpnh#~=P7j`rLmMIrwZ2R|#O&FXJZCR*8E-V0V2^tK;Mh87b3xbb*B;N4Cvnf?
z<8Cnoc;tGRE>b5%zc&U1Z_WmmU{9Kr7XyAO@d=)))z$zwaT+94XSuiVs=;$$oMGXL
z!YklUt!^)T_|%KBgp(<qcITut{So{R`o=O&Zmqb=E^%w??I4FXFL{UI#P}1#m>SVC
zc^%6J4f%y&wL1>EFAg<j4z2OEpd#_b#{Idw^mzT7<*1%Su~q(pMrc|%F(9y;oN`wD
z`w`Iqk64Ag;zo|KB9EJ@wcN;o%tn>y{)eqrh5NNXR4gU|1Z#Je$5tBU*%K<b@@lP1
zRa29x<Gqs02@ekEu3W!fm62{7&O)w0a56`Ln0}3_vU;2jJC^+y+8NO$odK&W2QFir
z-t!FhkK*|4*GDFIwF4z$r^l?5+cUp*MhD#V3yW(QrQ^!W9HiVT$ceDr7Telnq|m@2
zleqR^oC1gXWVZ3_Xx8O!LBP(!Oa{4b6xd~3U}uD|Lo7x({ld=Rz!m5BSIXxaxZ&1-
zO|4yfp|xfXLg12H*`}jEtjKy-KPEDKA3wuk?uzGH=m=}cJu71=$i*bu<%2au2*dpz
zv80BF2$o>i&V`guD)R0igDU>LO}iU6`d=5n1T)_v9r&5CUM$e3VsD9DSqhs^OFrSR
zJwkHtV#M&_S#$A{ee`926nYB@d`T^cYJ{sv9qdmV&=$fiP7;Q?L**JmR=l%Tb}LB>
z!S0asXajS70COJUr6Hq8x=D&xczY(Vy9`0tZrrv3p*y6pfr^<bnUjAbJwt8d%18%V
z>0n)ZXNOmYjtNn%i#7si-gPgy>j-t>ogC`=PKdeB9yTH?B78R2L$R0!h$D-asI?#q
zvaRD;>v3Y0`gCam8su<>v7o%(e=zV@lr;=u;18C%Wr|k@``0G4T=#I?*SU7YzB&Gh
zg`s8zg|M^Y-CnmZAYG%<lsU2Wf`+hY=8MMS{_Gf!c}8R)x4+TjAc3<CKfkTr{)vCG
z?eHTQFR5l54;7R0p0IImf@{jOL8cm)%6IT5lNP{k73({83r*?pmiV8J-yP1?3X-1j
zZ5;r}*GT<rftHK@HJMWfi})Fri)*&y0>_d??3syOVK%7>-+O~@=?^LjM5K=^^+Tun
zY55{+WdoW8WSGtIW^Iwwiaucye!^Le<dxK;caAOpBaZB#2c}`+rVij81GuAiAF}gG
zzY9vG^(+Dc2)(p}GUnJiIIS`6GV=P}5DOE{zow|UlW`oWCRc;0-|8j(q?<BDcRqWU
zP5sVZJUgx^LRdS`Y{_cBDL!L-U~dfh6?5_YKn(**80`ihcE3#PiS3?u2UALHCR`K#
z849k3#hH?`<r>z=hwmZvIh3<Vf>iE3e7e%Fr6C2nb$0H9zKf}lgz#3cE##$}xM<nd
z0Ad>Qbc+=j2io=0FAaRgu#r{v)_3(@ysM4l_XRZq==WGiT6n`k`5MJH=aCNdJe!fj
zjHyVkjFJ0cZ*jN36w&>C2z6iJw}L)^VA-8n=yk|@IMBzoX;0;#$CeilI(+5;H#FAb
z3qWAG${m8aU%|ys_R8A_LGH66C;QHU>8OdP{;)FNpg;dFM@S~)_7vj8H2*OsQi92I
zFm(o{ftV`@@TK&8fIIdCYljzTMVyiUa!G{bx3Bmmsmy;1nPWj1)S?pZkAHm%`$#TU
zRL9W=GZ_1JQJUcOw)c)uRVeT-JO?6KHZe2}FbFp5k$o2-kJp2a{K^W7yeqpwII*|g
zFAQA==Rxt6Lg*Nagl;@t8st-ZoAwsN3jZ+Q{<FLIB6MUSL)_ZGozF9AJ}5>Z!E*q9
zkDswB|5L?yCDwi;>?vcArePC7i(Ea>jM2m-vla(VAs5CtsXI%`{mcjOd4CJXq>v0P
zf>6N38)J_nnqVsSXq_8}9;Wh@;7}<sCXI_+e(8Wk)`vUfuxED^Bw^PO@tL8GPgb-v
zPgXLAc(y<n(DuZuUqlPRlkKL0BFSglCrNVVXC-8`R`WbOwc1NUEy|6~Ow8gIW)&ns
z+DIuK?2$ba&V$k6<}kt(JkuYT$~1laiMM!26ro#}-!iX?RaW1{oX7a8T*+|!a(YKv
zFvZ954u13ye<kFYyX5Wb7put$VQVwI&W>QLlE%;%yndZE&`8Va4JdPcfS{XHNaIBX
z>}J~v7`i*QYF;bTC2iS04}+ozp%p1LDPcp-sjs=}Kb~+dBYopTGFg0wVF>rirA5`F
z`PK>yKo!H^vgs*c^vM_Q9MB?Hlt92ryU|6|XGt``TjQ}uwRDfMj@|7wa|O3Bn~n5X
z!6|=pvtfezEoFP|I#N$c_GqYQr1Nh3`boryTrVu3XBpy(IP@3Ero`4%WTm`4!*l;0
z^`AFBFPPgM2<<;ZdwA(Cidf;Du3eMUx~4P{mfv0eTwj$F-<D~9hDY`pq4>N0UfF?_
znex0@-v;OUTi<&1I6+nQq>2Gv6>I;p|3*TR?v^@M^K#98TfvDDP|SKGAD+<{JCslW
zgU%0f8X>zZ>?h~u%7Dq&?9Dmkt^8oc3a6q|akkIFAyF~{i6q-~Mt9#!7kMpMH~Fae
zsg6n)YP#3*1&zNt59a1b7t1x_-}Wvh^g$%8v!aw=%F)D1c0GEJ{#wPNLQp~7(DEAl
zxK1hVj#<0d+fJ5CJLXt+3F8_&vS)*d<uhesmfe;H6>Gq6?<lf)s4ye4v?$EAyX?y2
zTT9}@N?#4IboDJ@7MRHQl$e%7x)?byL?x1Z$Ybo`d!4Jm+;t*E`=)J0#;zHWvh7;0
zHK+CWZeH~nawCz4eDnmIa|Q{MIX@^h79Mk|{qSrmHlCIS$5NGN$x)Mv5#@4pf@+Om
zftYGCJT!o8Tv+9<VORJxsM&*FYn0E#7fn5t+X80XYCce&pccRNz~Fo!mR_5<IZx#w
zujfJ^Z<BYd-!#c_+0Elg&nMijL$&3Q9HbiE{$%~fb-~au$gI9&GeJ$|Zu5m#VkfsK
z*40i9kb*cv)9#Ae_vha$wFvNv%ggX;iI%p0xlq(C!Y_9?n9JM=uj4&ivwg*JFTVY8
z>+#}G)P*f|W6Tr}sjg!xSA7zS8_h9e!p%l;c{U=M6!+z06aoyc{q|hAQrhQ48ch1m
zXNXz651ouXOMX1QGWj7VEAj>g>rZ%U{q#r|n3%-O8&3XxHQ{*5TK#0*A<2a*D*wPD
zWH?lUFF8$qH6$UzGrUx%bMhVZ`D?!KV+*0OFXj<eIh_sG0Y(!Igh+40^=n}+JgXee
zOwQGk0xFQSk8h*pJDgEv2Q>t=NWQE$TGFRLEC3$0<h1ISfg+|l&K|Hg^#BkwA$*_A
z=qsB@TUQ4BMO6s!-$8%u`-&O9C_G+2riaI{UFySy!o1reR)fxsysJUC>Tazg@}$Yw
zWS-)X&$iwJY`Aq&|6$P~9~^_GnYVQAwOL}VpGqTOgcv<ugwPS8UWFpSkX}f1Xs}Un
zB5y~EK#bA#($7ItF%G$JB9j;0m?<lWNNVA~y71E*2-%Wsd?#_(zqB-ur|5+N4xho<
zGT7T0b~uoHD4+M{YC5PvAD~U!Qi4tdYzb4DX1X_i8UM=eGJfsG?t2Vl7cTRV<Yb`$
znrh&7dhalRFUb{;%Wbbnss02~z9MFZJZ>)-a2e)L`o3=3n_T^Ak*JV+p4HN1-u!7}
z!;73dE@$MT#`E?cSTm1Hw+VU%zyrruBYrMbD<^!^N!$6WWGX4bY;%+p|3mg`bLG$X
z2+WKCPu)Ke+Ao7`$y;>qEJZXdKB@M$!c{~v{1xn%v^3D*d}hXlypD`NrjUY--+oW1
zX(q1=u?)p&sT=P5jH#?o<HMMe6H6ECRx6+H5u6!wRugTUg&uR)uIi`JKze@;($6T{
zAK%Dl;r<@h5MZqwG;LzI$AAxrU=AU?S-uh?FnO({zq8#Y%CJbJs^lzIm{m6COx>J1
zka_GnRRuHzj_uv%AhqlC*v_c&oDUU-PV&hE%ieo%iN=C@=C|!?MKrPIT2vfX9h=#+
zX)k~C$v(@8t(UNqRoX6a&66-_aRnp;2TU-MF2ssnXj%Rqt|5Fp??~4!c)PtjL?#6%
zgIYr^I$Zl&(CKQPVA66fT}ZQZ+>AWAgt>U;rk|4llfbf5bIF`mU*qs9Yk$i-hI<*o
zls6jkwVas@@wTHjM>qFJUlk#(3(W{t%A+K2{4z({AZ*DR+Yytl?Kay)2x%U%abZUI
zC63qVEi>*LaJ>`^#+~Y=zn{AoG3<b|uGN$8f1o`!(Yfs&$Uc4PI*uL0W_=ZQf4&3^
zHMyi)K3K&#NfiOcpU%_8q(8)RbGr4e0<2tbmsT*vp`sazt=It{;~)h|^3T)dE+=qU
zPaMlH_8=3ky*wp?UAFe9)-`Y7Cz=~Qo-|0c;b{Dz%K-GN-JF{?k*TfIV><|;lZrEk
z^G)7r)TJ?w?Q{qpLlCp-yEu~5=Mdq9*Oc%kpUM-G$7Q@PiH=Fo`@UsQbeWf_r|yh|
zvn_kGmEwOO9M1n@T`=n^f*+Vfa$hgK^fIvDT>+{}q-KFt?t(l1Nb;FenurYr`VihT
zFUG!^>vFMe?F1~;75M>A>#8>0ta{QsGEag!Z&hoqjLk}z*d0ac1Sm@E>GtcXCp<NO
zRsbO4E7=O(<)V3$G5@xf&wj2KyHkGfH&cP8+5GVdYaaFX{+|b$2-xKW@6bhFWgb-2
z4j#OmK_W{;e0_A``r(|p3Fs^KAaII}D#=Scru;4YU?3#;6|>&^Or8C$$2%!;549I^
zqA#p9ThO_d?0n=W91iEoMO{mie1efW&Eq-pbn0c6LApu)e{`0_=T}GNtN*s?=eJkD
zzuT9ML{#t{kE?%<lx_NSCDeR2#isLP$2rURyE52!hW6nY9!zm9ICv&3`fw~9e1Law
zOw0JVO5VSU{|;8y9=dMtGb}-Vw|Zoi4!6*+Pucp^quOp{@tJYZ<mw@UAn>gcy1KbB
zgZDE+5-BQmst(X@foyM+lqQ?%ac94wMZ<dEqY;M*oNpPY_hleX8ko||d&%=CCN7B&
z`SGqQ=P=B}X^F(rvd1KTylZ%^^G~KH&O*f6sD}OZ9oP5hf`{+sSAglG4*C0cU1FUd
zUUoQVd)$A>w{h|5H<^1BBdnR$t6CIx_Zwuz9!Uy@V{y@>J2^!+?UnjgB%pCCir+pA
zh}*SZ4g(lg{8KlbYq{APi~1Zj+nleXK9Y}*8iry2Lif_O8d*W|Q={~6yG(`#{;Z<A
z4H~~ApAY39*Ao1!-o)y=6R<&V<e5SSH)9rGk6+>hi!+@*VL?YhdR0=QkYA&=$ZE)<
zHyRl%N+m-SetBbqVJm`Tt#$CQ4WV~n4M}DrJ)K13Y$&qNjTZ%lQbXc>CuASM<Wakj
zo)^)(!fE4qn6>QS^xC4^3eYY}h76+%1+(*+0kCduROh#7_+sh|vo2K2;1(NO^%{*_
znfkj8AhJm@(;^!P;2Z@oEA|*1jZW$ez0k!kzZ8lM2RFLwaNYlXnM08H_y1@=X*~XI
zCGzh-w2si)9{>IY{N$?mTQKk6zc&Bv3;6F}{r`vi|H!q|IH&9~dI}ZTw6<G7)NlFx
zjkRDt3BaQsH2Xy21^ZEF?xikdEB~&PfLs?4G*ZD@A*cwFuu}gH_#GR>x@<)6lKMc)
zYkvPiQkIr(9ZL8St^&$$j40+Ntw5IA``dVc_SPf^q-C`yGMG8U6k3o?P*DGELpxr<
ze;-c_wtL}^rOwvw@HOUjI}joOh0Q%t=-mNPzbzGMN2TL+f*~ZWb()<AN$gd`s5$~7
zxbx6+f<dmzucvY2&EvKho_y5i&mz7IM#n^xm<<T6_7U1+q;WDHKsd-&Au$oYWvcqt
z@gs04RmT$8)#ns8j-tuohR8ZL(7`(%c?RcM7bELHGy2xyd;?}GzWV($fI<0c03i`N
zE58dLI&42OtQbug$gTMH*0C*3&u&|*Drv_xP)&eMd$FjrBwXk>G(@!|pCuq_`c~@T
zaX~oehKlO1JMFfFvHtHsBCh2CT3zJkL&eHGgJ3^`Cql?eH;F`>XBR>}!Yt&{@~(|<
zPx~(~oEz^3gXALf5zqC_cBt{(>I$K{3Hi3zs9HT<>(1Gq^f6A&SLs5Tt6hw7y{g2_
zHNiK_@r55Us@PmwuFY<_c)9%ISC0><y(dj^T0X|LNwEIrxrDd7E0$ej*#4<@_VrJo
zMF(PTAF?wckHk|$Ox?54B&-~wd7JpVL#Lweg>%V@HrclSk8h8F3@>$Q;e^ii@TR>l
zZwP3R&}RAHTXYx`oX@+nIi?Te!3$mWgWxfCKB%NrZX};V!oQYz@d9TAj!7eE6STte
z+XKR)Xgf2V#v}7+KlBi2=md{u+fF@QwHt{*fL-)g-dX{R@THq~L^2@IuBr;j2#C$1
zAEB}S92&VujfM6kp)ssCAi3I5_D2^$-PpJ_bQD3kw@U2PbPHl5(EbhnIVcN&5|?2B
za=b7TI`UT#q^t0=B>h3e(dl>VGDo%-J2%UsL;Y%+q94(#_d1+q4{fYr4|*p(2>I`L
zIpkBYf+UdtoZLaseqIE<k@cT3pGF%}SwK%y%tGn6w_=5;g5CEYi=+dbnF~PX@X0>c
zAiytPMH0`2nWgFVmDhw!s$I@<b(C1mBw*<S_&CH@_0c>5JG!c8sVjK#iNfq#qn?}R
z67>tM+VadF=vB`|U{fxjD?}3;-F|3Z4)E$zhzuoX-<~nA`vds{<$%^jQ)Y|_H6$ra
zp)*4s`30?`E4AFV403ph66c>CXd2JS=*(_LYcdSGkyO)33Do7P04!sMS_m+{`Scv}
z4hnk0;H7ljQOl5<4>MD>GLsghQ}hnmFNLrO+rXUZJ-ehu++7};HY!}Nm0dZ(0We-b
zzxHcjMaPMUzUX~QU)zeX`=VW{zUQy}x%Du7ef)VzgtO->kUAX(I1i-kg$!3zbV(LB
zf|zNL;)#vOuAvjs?+Q(8*X9<K<E<gB2zW`EX)O`92(%NW0vYg}Pr+h<c0tg?s%z=o
zd<QWLf6r*>c&`Alw+Hr<<{u^%p3ch%P6V%)H}XLvU<x)ym_)%syNWucG2y4sKI)LV
za7+lT9fY%{Yu(VpK|i9Gga;gt26#Iw3zOlWcg6RRVFL!JQMyhhIK)K#o(a-vz%%vl
z>)Nw_K2H{wDpo)%xDNH*vh&6gypNz%_<#I@g!{iA1gC~HJnXdVp>s=hF+ziu9*`QM
z4YvZK{yR63DE{}809uG8bwcg=13TdWo(eGBMNhx*e?_N9u--vd1!l&j&cg+eE2ix$
zM(sFlUtV=T71~$h{Q6&MQtMHaHPXhRSv0^t{>xjjy!Zb0XsiF<{{m7O;xa~CQY<JL
z#NZ=o2{PTX;D3J=1yG}O2Y?|qD+bWo?$B*c+qYo$=bM9eXWW44fkjdE;*)<K#(P>W
z_0Xs<1jfe~DynnV|CYLR?0ZzCkC4A3l5T>|&bL9PK8O<txCwPsH~$qBDCBO;Db|ne
zO>9Hq7(v4K`)Q+lpC~`tFBCBXbD$q{G`}ij@qQIlz1{r8=U5tL0lG0?@{Vmx#zNT-
zbz@$mA(-Xx9Lta?f?ZWn4dlgu#&$-y;_gl2wyIM0p|apa=E369BVtW<bE=_}DJESu
zCJ3ufsd5GCj}PBqzU{G};P;eJz0TQ~&os&v=~4jNrVvnDj;ggqU0!WAu{$$JeBlj2
zfnc^Vpr>n%UX=Ic4-beM`rp8d!t`BW-$KIx07j!Z8!RNdPE)+FIS__ojNPo7t|BiW
zL;(Q2<BJ4PwgXUpZ|{ZnnUrQ;w>rb8P9+64)xeG3n9mB{I*xSSZF0yVV>VJlmD(+*
zC|u6(HAgsyVnWw$Dn#gG28U0q>jsy(w?9)~cxo_0^=!d&L|6wq3r~D^fM$9?^G4C|
zmxur;2`CSKeRBE~U$BU%0Sr;r?X;aMPV>x2F!tq$)}G_qY+pYoXO*#YOf1nzrA4Fe
z1+nD{Y|TFmWa`IQ6VEy2Gq3stuGp3?&3IJDLY%m&(Pd%gf<z<XG>uLeX~w;?B|XLZ
z#Tks4$rXBuaVgvHDhf#%AN-CKZX991huKE%edymxHf=j}OLjsw)UDPV2u!<&EjTGu
zfB?ML6xt>ba}6QSU~kW{<_a8A-nYvYm0OB~ErcOu7##L(>X!izF389JM{i_?V_~S5
z;M8uM=s6VfTw-D-jV=VLR{zq{3ITf;q@xS4g7(QhAVSr}yxr7$(!9{=d(c+Y&6;;{
zQJYH;>>GgrvC`P`gn^m&+(63R<c`6I8P?$LL-nf0#jV!__qwNcT|MCT+2;4fr9DFd
z7)kfeL1f%j&V-K(4_po3Cf+V;pAZtblD~37tli-O2xMRVV0(iL=6v;27#`_p?Lbp<
z=?&QZ9)n#o*HnJJ!0OdR-|uk;Zr<cNaZd|-TI(V%uI=VFopvJi1)zb`utppB4jOE2
zyijbpq)7_47$mY~*Le=symp-%rfV29fw%K;;agCi2^r*AxY#sv*8&XVsfW_F>lYWF
zf4u$<jrGfR$<qsE!p_plfKtVmhCA*BMCk-*EndjCs#grHwB9rixXfsqoG!ghd-1WE
zIdgK#Ldn@x#0*~TUDEa;O|21hA=ee<7wU@FVbt{agNzISk1K-ur?{Nk3x-|z#t-q1
zu~6jYID;+X&IWb6t`tLP&=@O|T7^&&fDtCXMlxc2o}X@>X8g>Cab*raI9H)*QhF-V
zmZuC7fI<+k*mW3WDfD;E^*DAv<41)6p-5G<vBMSwFdP(O1W13_N_Cn3?1%P?u#=W8
z7T)|LtmWV_nIJAXjg|UJ0Q8rpy<JjS1jRFTORQb-x8>k2m^)Is3@J4anTZM!N7sKj
z5KEoLNu<lE2p~JV@Nt9o7oqkQn6*KsIRf5NGAoZXHRh0hU0vRp7gwoH5P3_eWN;1c
zwQo;|J!t>(p+)FX5Ce-_8BYuz2wgJoq;?K_BYaFDtz@{UMYN)TDChPfPjxN{D;?s1
z`hq(N7!L(7F>B)J(#d~R6Pk7l0Ad+Q3Ejt&7q80P>px(1$s5bcDtoB-SjBaob7VIR
zrFwC$u7xJ@#tt1WF6C_n=hfEqfA$l)zCi3~_FAP*?=Ap{_fN$@UDx!bKGNS$swYXL
z@5^D6sp@lm7+s8>PSf>*9dm0bhiwk<bKX{b<T;=aWb3(6EhRZGu*)ar&1gl!s7x(<
zxr{cIS9ut|gH+|GR_r!P?U)``3SPd@9#f7lNsK*lU|r)DpZ#R!*yR3TrE730;J_B#
zz6xU>MFa^1LiO0vKHb+R+KWI>)A+5;)`cYtNN`#iIV#p~Vrfet8ElFrRX(BUg(SI<
zR{Q=gmaSh!rjS+KdjFu+h{(_pAXvqM%^TtJCxHOc^HT1XLfBTZ4!O_(8r?c-O2a7a
z(&stJW8~zV09^YA&;%3NudLiotmaN^g3d^v6AK=zbjEK&!Ys1o3Sv4yJ<}$rDRa*{
z>yFO6p8>f7&G4sSE}6s4j`3HIxB{cso+v?`4=KL&bI^xNoAC;nED{;#=Q;@J)kVX+
z&j$uPD%^RjE2)YwQ=I~F^ize&8;JIa<hy)atyhibonkK`=?gTG%g%!=Y%?ZtL@-k2
z14Wi?ums}fSfW$qq~HvTv#<93lm4HDP(!<Vu_HM+>F>3ez#+F`PLkIVzb=**mPSmM
zH`xUNaW8=QcFe-hk^}Cfr)+~OHoOk$roXb<T;|<$%Vqz!>K8x)@Ge0oRDn`EZ<BeB
zgHjY@AnusgAHZ+#>AbeB0Mnp>Ghdo(+@JSxJEpigqerJdXQ1}y2?Jbv|HRh2cg9nr
zq0o%krT4!Wd-Hgx*YJH@yB0}=5Je}-S|((#Y^SmnO4d@=BFU0%RLBzQw2*Bq#Y70n
zJ|t3vFcFCmV;}oA+wXox=bX;x_4)q3-}fIyG4r11{Vex=-Pd*9Yeh7^`nu#!s*Vg@
z9&U5vOi>k3VKe-eC7PW+w5w=1EpDWZl)6uVT+#B-u<38sddFujzc=NYLb_NLo*h#J
zaX(esRom@-%GGuTZRIcGa&|$KQL<71)`~x8El@)|Z|Doe9_QnG*bOg5X+=ZKmff?9
ziZoz6F&k|5uGit(<%Zdh*<QsFv|um1n5wp%S|#j@Y1RnQz;3SFFydQl!X?O&!;c%V
z=G)r09FdlhVjHZWueoRYl#Am#5xyhoQ{DZ(@8>L^z1$ZF)r9K9-*EQpAv4hiCh80p
zmGC<%VLwfC&OZnH>`dtUzrbFeCyf(l)5W>L?dtovDd=(1MkCbtM2zM)FPQ5$du9q}
z&#-pd|17y@n{NN(MR`u`g4_hZD+7wp|Ff8~dT+@$P*gW|+*BJmqOZDiDYigceyxs%
zpDPF;5h3ywzV*p-%MaQiiZ{yItmPesa^CL>=8Ly#h8mNzsyr!^UAyTN{EyFh;p*Mp
zSi_j3#51XlSc1XbnHLMRmsi?2$fXa+4$3a((sOd=tW(`c$A)n-m$y=avA%&@Ve#>D
zAme8q1E-pcKXUxWo!CI=W^W&wGAd7)iYUYL&zv_j61<Y^w>K;;I;HZS{U?W?Goit^
zzJ3u_?MX=sJoi)Z?IzMU)08bpk*#L_Ly#<fTLkH-j*?9{+MO_B#9)m;FM4NM@;Ry{
zq&K>U;6VPG)a3BTjTFm(kFEM@7KOdfj8k5uRN(aeM$Qbom{{Cs)(pZHR^aG-24Qq?
z{x&JQORp~2c0mzpCz$m$1su2;>zsxn)dM|+DGS`Xe>QWS<C1E|do_APL$9U?AMMoS
zeIQb5Xwn?dR+#E}(8;n5J~3R4Ie68>#F_z-qw$5E)`8pHNvuKACufa_W<LepD?x2b
za<6+E#^(tW{>ymZSK+SmhwhZ(&{)Ujg`Ac(+sMfe5}%x?JZ4BfN(@R>H8-l?g<mX;
zQeCzOV4*-LnbBPO+5Wq-Y7Q$;=>71aWU)M?=W&cD11py$i>WjS;CPM)B}qqah+0_v
z@f}SZK^<bBwUXZm3tFK?Zm4hAdh(B#Nn(#|WG))|a?yOSQac`R3q8bB&>r@EueZF7
zhRE^MTYv0n)W#g*lAMgH885dI=i~4eGQ+51wwpJbl`Ys`!tcmAGpmxC58-&O4CW7l
zP;(b&Pjqq!R!CP$bB}25%qi1$9W0wR$1-v%+tZ_TAepxydB5wHT#;Y+${L>Dg@WMI
zg#sH><|(L5+?G#j!dZ1Lg)3S%3oqcKHT{a^Zj^HvGNN$8hVLXwR2AP|Q;>(vjB&*8
zAO~LUkvhFQCGk9$ItTyiEzea2`0sP=@|iW~n!{pJz)9g-95QtazP-zPrX0?pq+QHh
zN9JO6%5qAIy@ZUE8OB~CxiC+M5pG4j*n7+ocsp-><jXZ&3HP*u!s@niY3i=cjiJMC
zrJsMj<{;_|-QXRWc~2|YUJP$Rv_wrtsh$|laiD|<-7VT0&Uc)TBVvnY>8hHo+~sQ|
zh9o#_TPU&kkin!PyE*5Oonc;y_Idj|$1g*)`aDotBUKmEMGVs_P6>FJ9P;^55q6e7
zQLQI`yh9R#Yq+eR?a#=9-C<t@euv*yq_p7aZ4c{onH7Gt$9uoy=v?yY8F8m%{}90d
zJn2iAlSudR^qo?qec937bB$hEG110CTbnBkjD)%&jy^(iNlJup2Do&cSD%u~g%b<&
zE}WWO-cm3)#tbP+ndqW*wSw>BH6ZF8e1rG0c;ZDDlj7OoFgyy@iH*kv4j{8i9#Xx@
z#s|Dg9#_1d9q`BwnY@!%lWSacGR59%(6#0;_hyEZF`tY#`6oxMrLDSpNYe|QKPqoG
zZhtH2s?ru_o6L;S>p0ub2hMV>d%`uIcZhe&B4V`6#J6Hap%F&zWU4t;*wg?<(352j
z2FvmpmsK|nB^{oHD;g17+p;apcuP3u%FhK@wiSo38`RvhgM)Qjj`15j3CS!PG7z`t
zQ7p}1OS&5;ZQT?hHMkV~iDvC@_IXQmt`#9rGz-4ZgwAxAMm@U-`;&tap)UBK6{WL1
zxXY~fKO-V`pbm`MR3l<VH`Vc3E-%b~bFnM+7(bDpxb6p&pE6xTGITMdK!Dte7ij);
z#vw37>yB+;D3^*I#`>jMVYWV}I<?%3{c>1Za0*K}Yk$&=Mv~4|8%uLebT+q6oB_*G
zu`(@@PZz~>50t+%JRrOczcWIwyoUC|ll2n<vY03>O8{NNqUZyv^=oPP-9#W40My^o
zgS*X$)hUFtZSPkZ=EGPNq`W_Cv{~w8d90t|u2&Yp{l!ng-j?1f0SWadr|JUaA)~cs
z0gM7b&TYQXz-om*Ozhs&BMu|oxdMZWyk|;0jW0{5r5`Nkc@2#<-ZX7xG;C*Ery1U9
zbI?oTiu6g$qERI3EcpEJ)GT-HY2t3wDiWHK=2%htcv@eYm-Doqt#*yRDY&!5`xYDE
z7Y%WrfD2omLb;l%d%#sdv;FKCvE?55Tvm~GjpvG&YQU{bHpLu!lg~E`LuT^8ZjssH
zHo>#|=~d_nmQ%<b8bks$rE~$|tWkdWc_4qzw7fi$;(zXSt_E?H((|^lE{rYndG3fK
zfc9ix!}>J))EE=uo%$c05GMZ849ld@kTE7-^Zt?X;Llrf@#V%!(i#s4V)n@rsL0B<
zBYb^?Z9+RZ?Q*FuAl6`ro<Yvh=lGk?K(Vi3pqXWFa0JlrST^(K+-fPg+&EqF>M4!g
z2#SMi%~_YJMdou#5S7~<;%#E8hBQD}a4my2038;d-yi#d^04lm2(UWTz;5dk;?0e$
zUiN-FZn)XW#ILvzzvpjXfbsq=j5D~V29Z?=`gaUp|9Ld<1aWifFjqE;XgYP7h?K~C
z07Y8xj<0GQV#T=wqWI;d8e*k44QhsyQe&)Kw4=4YU$2*RAPTrnjD+^b!+eN+ES*>}
z<feqEpv}&xY>_j19@$6!dFMn3`Fyj}t|Qm?My%h*HyRduHEi{P*!>=!jsvun$CLz}
zFHSzTh?6|CRta2rGhX9ZPedVag`e(u-pPFBHCpSy-n$O6!)U?%O<>yy++4>d_-H|_
ztYR6@g%odyMRe8{JD8iQtOZeaa;uM@If@xxuasD|?xnDVo(t^y*dQjNo5>S!*UY8-
zaKv($=E&t`XbF$gYG}3!&<NCiRJ>XDK}tIok<das#2wd$IthFDJ3O}Ej)11WZ2@F7
zZ*c+)bk#Ip*M*~U1q`jMB${o>w#8;EoaOi|_?83pYC{EwS<!(bfL6@|?Gfy8Ajpr`
z%5v?GkVh+pQ!{xwtFLQ|g(3S}>mE<@1<kjzsHIG5V?T3hasJvu@r6ZR@R)C|ik^3D
zUp?vdees2{ZGgtu%jSE*iQUVaL+opAmjC?gWD9--*6&G?&Mf?`eYZ77#;1uAnz{#?
zm1Sdmt{MKQezgBg3%;PQ^vl>aZZxY{0($#Ew|F9zuvTX_Bz77}tB}D7Q?>`>985u@
zz}s<6_Y#xf&v#jqr8CT)ln=kNR**mL`M0*-ErlDEeSyXU5Le!v4eV*AcCO>_(w{f}
zIv<H<)k4F|5Fqm3NRGW;;Izt1taB;lQ_9We8TsSoL1S57w3PO?p)Wi8y18`^6gZa*
zr(qlu>`%YgK_)|WTR)#((<9lL^&G#1H{PcgAH#%OSy*Q6zz@KI*shZ$uJwZg#_cne
zAud?Tw+=7{oxYhl0zvbvVN>S9k;5k?u1jZ#Bm&$WalWZ|XGx0SZ2;WUn=5spS7*es
z_iVFvKC;&{C0+ad##1!%H6Mr_zz&F8eMCm&g2`Vxi&=fZ>lXA1Z-p-(K0q7Ep*!*&
zK5Mu}3$y2S3dhj^4N^woyFZnV@r;b$$9&%R7$yl2mXydse^<l6Hc6X`8rp&f12Qt-
zpuA;3^tNyq6((U5AX5+9<H8zG=I^+g@j3g)JZ#iyhF<_`ZNbmQ$0dtr-u;1S6v`V6
z<t<A+uA*8<@a_GvHB7uhlvz8k3_(gHWIzv43)i3W;G_8++SYV{9x@-Trl9Y72Qchs
zo42$!YJP=NLMN3_w@DqpK+XEx*q$bfHaJki8$QEdNbl$?wd4{$_!*WiO=0!vk#%QY
z-(G=ZSpse`3rP5p6^$(?xVvm%8?Xb8a|a~&EwU!Nl)YqNgE9l@w&8e|{Y;R_A~9X{
zv6iu>d!vb~b8PAZ!F%|F;PsdYhLxA0_R)ac7_qpEYo2;Id-Sf%e)CECh883c)e02j
z$^qv%CFrZ=eaRXT)OpgxgTBYqRt=<7(+_FJ)Btqb`mz>qZ;Iso=>5kqs3c`;{Cmos
zyXb=;-8OH-%BbMm=X3c_VP>}&HRlG2CVB~1n8Zp(CcoKv0U*o{=yu!k@@5^~e1#dv
zH%2nl7d5|=<;%_yjIbWeC`W`dv?Do@-xjvZ+L2uGj~H}r$F7s5WT9qjw{{CpU{jZ+
zd%65uxmy5!;%w3XTjIOdaSqwB<O_~xF9dqKPvtqP8rDXvo6y|+tv=(<Rue;AImi05
z7VgHe1$spG)X1-9vv$6eZ#{bXw?bKNt&|~$#?K*fDBGuN%JMX{2_Y9FW-seeoZ518
zRImVMTRWgedQZ#ukvQK<=H?!oo%5yk3pG{LPjSvoE8K06X<?oTiVv9&UhA2dk@kfn
z9<#g|Vsd9awmt=net2_mzn|8gvcg{O-5fPbsJII%)9ky@*9GWAOm_-289n^x__+C0
z&fYQR+I{eI(9&^ZkKMOfLZ>x;99t`WBk$JwghyW{jo+k<7QD2rat6=x|FHNV@iZ&%
z{DRB@+Pl9!N8GbzPAJz!+Zwxe!RhVdaP>v^zRd}?uL|Z5jfB3NgE%-K1c?PHfd88D
z&VH6SezOO<LNr0a#+<kM&^ZpN=F;}`Eg}QVsW!7xjI0dV&c+K}Z$7PAeKGx3a!Az;
zjJJj(mg}|<V1KBZv$U0M%PA%PTgS@Vg+?Ozl1)oZwiuOK;pTnNfq{3U!7|oQrI$mO
zP^d&OmEROpy<!$SfT-5Qw3f<YTE$H62q%)@II}fwc6$YtwI}nuk8)Wmb~wr#*a!9c
zJNGRL2lj$5LLIj7kn%-5QtaF<sZJ9=zN5Ar;5cRC^XpQmLO_3gkZ=|j$&Hl;j`!@r
zap)tGbt>x!Z)&)#;4ya2@*Dx6i0SX_3KhL&i_1)H`n>(Z=<)mlr2qi9;DQysJd)Xp
z&v8Cqt;&T02(-%J-s~os1}HOdu=qG=WcB(wGgaRAw#TL1$i%Zt|5ABRlUpC3wR}o{
z=9*iq6aNr`J$dqi!;O3nW)P@Y^DkE|e3wef!G2I}GM(#*wB!kyZF_d0QP+y#dn~v!
z9x5<{n$+%#@<C!Dg;ih@hfIH<?6l&Oz*)P!mS`5A$~tAAzM_YQeN+{1{UF6A+&1Xz
zs?;4R&8Z&gAw_z1U;X-h>s04cn)(6hszYaoZG_VTiR=85V4r*6oOk%=Crnp`P8X;d
zbpU$S@{*8Z6Pgg)C-_ZIv)#$}$z_bV`$JGaGInOid@FCTXTj92J6Z7%9YGN{v8_BU
zti1cTmQ5RZ{P>dI`ts|n6VK(=oKlg7Ax!Q!?D*<&e7%<68;jqnuTX)v!Tz|lq4C9d
zFdVR3@Xm5ZQ=NuZ*@vMw>liwV^XJ1=Z@-;A4^7D>zae46Tu5aksuOoCv9-IQ?T1;M
z@W}ScM#?OHNSo%7T?F=}*x02cVJ=$;JRD5E*yjM#Fh|teFQrNJeNOrO`EEulp7lit
z#c(!n%lm8P9`F%{RGG(;HA~7Zk+4rlU`AK+U_<r?0pX3%!Ka>oJ735C3j4P=#MkT%
z<1V>-XwBY~bM(n~?CGYX<&buDpfK9j_zs(dnBp6g^$@P`#&}@$k{^?k@qcD;9y8-J
zBoZ-SgLCp~utF&xb4_GpH!3B-R`NSf4Jfq!5FON`W^@3EKA~50>c75f=mzh3Ou{3o
zJ#$<>q(7>}p7=TLg=K^ja4>ITj~5;gQNO5=7>C!@jwsPFcS33~!LA-1{gW!pRSw6V
ztub(4@uCDf5a-O!YvA;$TtS7zF!IGKmt<nLh4wBpvv`X63Jrl4@_pH+*L%!64?4@B
zrV=;ryhZNqV@P^SqV4b*9e??m4VC%QL2SoSo&a=+4}V0P|E2Z0JS^6Ceap7iP$|M<
zA0{JXfp+z=M};a{RV?a-p+O@BDTAo{JBFWrv6;@S<{scKu1%rXwtr6Dkn(});U?04
zO-Y_Zz!2a+_n+XyL5lOMPUE^9tR46@{`vPlAMSEhrjXhXgw)3_q_m5^r|t6e<q;XP
zl__vvSz{|wC*Bl@8f;O|E6*(<Ro>;_H>B(qDt&SzPKY+7?LbsUXW9{^%-5&O*ZsIG
zucNNCC7mS{`s6A{fX1&`FW2cGIAzuL+)`{7Q}m@3JR}>UE8(aqDSd2jY?ghlPhlHJ
zy_|WY?%D?{VrX{|R}9i5HQTLB6^~%{OsKgEod*qqpcqHod#*2EQlkb&tr*_1Z1<SJ
zQo>5r`;nN3v=?ybXTEO^8v{5b0>Y!WH}XCChqHDh^BCT6AqkJA*xVZou#XLJK6_(V
zt!Fl;hwsjput+Hvl=z)X4)U(#u}KLj+)5yL#$+NnrJ1~-{oQkwf^jB9Mc_BQK}WVz
zWQt{=p5<)MiFX5CP|r_)Rq>NfAxoD{)Db1!iA6%1F(=nLa(zkdFI9-~=Uy4nTg+3>
z{x&#R41#1htZEw7fo<2!pvo~AF?_*r=D0z{9WZ_ca9$!7$w2P}%<T#8w{n_F3gBNZ
z7Ez*IZsTA#V<?}f&72Sc9;JXbw?OhTJpPiu@Hmlx618({z5#|Sn9&T3$0=Kar98kc
zgTP1ENzGtA$qNk$Vh?LyvHjer%fiQTiw`-AQl$t$hj+N)zq0qQW|F8r??oC$_?=6<
zV;B1o*}(7%?2!pt4TobaxPnI@fz(TF<J|rB8aJC%ySbZgtT9{K$LD8=N>4n%qF5!*
zzV??wXqkr}usWhYu!URfe})8&Lix`scCG+adcFt!Wlup<--wKh&Dea)oVYD_-8jhw
zLp1K7!bjs!7(JCbv7MjqQ_Mk;hK%)Y%KyDVWCUVqo_+YM1vk?rBE#{^?Ew=xQnlV8
zQN4Jb{I<{p!Hc4C=U4CL)nnR9WgyeQl0(#_p>rq--!S{S6X7Di@Qb%aFbesoeT}Ix
z(dC<=ymKKdk%{>mYfAb6kxutT5WqJtWU56RT|~YE-ly4<`nB>IKI-`u=sv8II&p^U
z)xj85q5nMal&|}rwV}=g7`_<R6#Ncd;Rff}(4c{=?j0AA7MZ9Bd@bG73>b|8wR-|+
z=j1EUm+d)@c|i=@m+!nq9q%cDSZbgf^|^+T0l2VXDvq=EQk=it={KHBuc@T!&Ziw9
zm!Iry`WEF+f2a2CIw?J0n)W_DubBt;EgqOK>ZDjTtUoA8BTHOG&q33K3zDd}W(R8R
zYC90BIkEBpYqU7WSzX9`-}QEJUEOCu#GZZwBHqDmF)6CJ#ZTdK`}X%S!Kan<fJIX7
z>+Ne}bc5GQZxIZHKhl|-ij{aDIT&s7qL8J`GIjgA<6{}8#k1#9*2mg9%=w^37Z=1%
z1WLW0E~+;mpG)aYdkjLjSU3aKO@-I?nR)6qzS~3h>WJu2Vay8I$?F#hGm4kP!drVr
zI4*EJR-;UlvPWjf{^TdF9iq~d=d<#VFb^3S&Y<Wq)>xCRFpeil{=o8TIL9r|oxJCU
zij5fYCRn79<B#0U+Ui2q`0no<wwfLB3o(w7_?s@s!7w=b?QGLZsqUAhUuf8-X=GT^
zYHvL<u6GToAP-n^WkVhQscjarpu#v3Qr7*Li+#ka%A9>8qoB2RAo`Abv1`5+YyR0X
zLiWZ`*ya?%`J9D)ZGnXVy7T6EPXt3jO*nYu4ZrGx^1Nl-;GS(9!W_NZB9<FMZSvSE
z{4D0{&N3Y4zZ~h$kBV&JKI&FIXH0=#*<x9Kje)}P<_}<$w6cnJY@Ue%LYD17NT-*f
zmk)7U`0}pU7xpuEJ@_I?X&r~B7Q0R4WQN)Z;dPW8W3I8&QOr$qJnamsf5r}d&9#B(
z5;k1$8$_-y5ln3IwZ+*)|K(x!@IFn=@jOi(Eoz`bHn1}W`fW4NlfAS3T`d#R$zk1X
z|JbAKuD9-iDGRaE=9h^@c3F^J`9NH<i5#`&Fq9ap)+ZoZ{;;n86ro?x^dNF%gg0OB
zG;JJx*(X}R-lKcw=~$<}zl2I>d!`HZ>KpP`vyMW>n080(_gXdT(t8};n7+86Pjncm
z@G^SiJ-;}HrhK%Tr?EE|fVF4GVT#Lm8CD!PZ!Z|0c=xpah%G`B5o^rWPX$Dd?mR{E
zBP-scUJ*=I&P<IHIMif6=hxe!ArA&y-H-6v^5T`&z*y=4^kLeScpWt;k1ExjeF=)-
zrrHI-mI6GOEr}{aIF!b<4PTGhhIywXKOZVc>9Bbfwy8dOXK8lzvFSP~x*@RwoH?gm
zWi6mJmEUdtzM|OTQV8NE!&pa#+AL&vi|i-FHVGl`Vt<@{kVpAl?^XMoF)d?1f<Uu{
z*;`ZY3T8bwISoaGucZy0>+8A-On`<u9+FsM#q`b^mE%Kz<zWUFoOed=T5gxkixV|}
zAoxO&x~$YOt>*hjsdEEvP)%08EQZ#|c{e|2LXqCv)Z()1qY$G@WJ4bI^|ac+j2(8e
ze|C#8u52tiPtwz0k<x!zelQuaes3gt&pkOu?aElTNC#EA-i2|+kt>GZ#AnJ-?}Tf&
zd}o!7R<DZPuSz-*RRz*86jRGd{<MBoveX5q-aDp_S=n&&#IAdY>VYi^1&`>dvyDf^
z1)wKjL<ZmR%oH<VTCqr!xu{{S&ZP;O-R?A==+vPSfFgj51>B|!w-$ZhNA5E7Y=5l9
zW6cwq;*W_l`jns~&+cg-gm{+^_vs>}d)(Fca=6XCDzB@@8-U3YD``bgZs47`*o)07
zlIs&}J^*XdRp=?y(-8x96lsvpSLz9zg`UB}ggeczx0iNdg!!EN63>gTz8FU6KfVJB
zX<HsAMc8|xz(W<%n)P<?T&$uQ#ASM@Y{w&PKJeRUB>hV{gsH+|{pE%CN^13lsdVh)
z2HJZZ>B4r+quVQvxSo2mKyc{za@IUv@WQi2*t_ZoigwhyYT0PlQiiBl{N)ABT`zWQ
z&QdZari3kT9=RIx8ISkT%qp{g%Yd9TuG6a7=Yfyr6}eorkvZi+;j<ab;kT`zPPNcg
zMQc~VX<S6?4O4#4YLy>Q3~Fl9BnHHlUpN&Xhrilh0!?vR?SJ^@z%#XncEs@4J=XHg
z$+-c=r_G(;M^X&AqIQjhC&KB{;ehd)^RNKjv)hGLKCc{kytE(cjXAcQFjUUL$W-6F
z2Q|3xLDyYGsf#)IcHeiCM#KPaq+PKR&H9|Zu&uOQLrgcTXoK=(<(lVR`rhGb1h4K+
zvIV9Ndf((tmTxigbqV)q44pYU*m$xzhNz@0EMZyZr9%dkSSuwevP6c`X7Mn;r}VP9
z_cQIa>Jt9bcRNUeNAB<PrzOnV+w>I!=dw_aa6^x!=4Yl<{k#<83O(*Yzo(j#oSBLb
zjOke`*FTrRLp|xC#`tsm1Zpc9yyj!61+h^Gs<Bn;hME}$wvsAUWVEbp{WP(f5?<10
zeA5h%ODG28Q>74NwKK=8N!MI{PVPVl!kgH1uXyEwH7dK)Th|6Hm69!nqY*P^FP5~}
z6y)wXv;}W*wG6v$+BYNJDR6Q3$|&<NM|q1+?wX@qmQI?kH-Q+wgnL|It;o%z?OJ9(
z<;i6e?ols<2O`a`1t-lts@!ty1H36-T}tQn@NGmTtSGbne77AvXQP@#S04$^d#Hio
z(paM*Att>kDkSM%o=0Vp5_q)ZS4n0^u||iEW)Gd;f2Oqi_#Z{d_-2WT3$D^)sl#b4
z@!NH!3yyAmydd+)=VHhVX!=2sZ{;c!*{%ka0q<uAIRd60=lDL?_tGdMr%(<8ebp*Z
zd#sEi+Y#;Ge+Fp)cwN7rWnd_S3zqs(kNWi^2~TyGdge(LKBaIX=a(<&)@Rdx*0zXz
zjyYT!g`0r`3M0jx$n(YTK==pk3|34|;cf=ZN$JA^go=`z#7}jd&r(lgQP)VQ%`G2r
z^jWWXv@kL5EB+Z?N|~t3mJ(SGE59r{_4MXQ@+9zQH#z-?2yrv?fehQ`;p3sXP}S&8
z#Tz1hNBRoF<itX3!XgZUt5){q#SK=p73axUvyDpRON=>a!8R5l->nlh>yE^b;8#+Q
zIvV-SrV2G6EPYIfdIx)-e#83Wt?OL1sRlG4!aUc`6sGRsKFL0R)5&kS71u~uC?{WL
z&?*=UvpP{?7i$kP8?<a)k9;|nAJV~BebX|doiT^?JI9(M!L<8T#e(2+v!|&24ZGV4
zJ-KejT?}tTrQ8fzAG5e6#k7~qpp$26>45egpy)G()dt9tbl;>}o{P2NVnvK49AoKj
zQ@dH2^O)_K;F(=!`QzQ?l=#Y9_8K9hIUN8%*q?i`Lzm6<>Z3h`aK?}jEp-fq_EEDt
zYB@`HB9WXAYPv)|;oIcHFu(S8-EnWVabNam3lCEd;H3}XOs{gD`qWR^P96;t&;C&1
zc88;BCz;a2pkQ%5YL1V02pV$KTKP2LLw-Ch!qybuBOeu5P_J>-cxVuRx4Vh|Ek}7=
zV4o6CPx*P*@mf#oy+<ZTij}5`vHst8AsZ)&H$e~jd%pW$ePe&Vhv7Fh#_k_aYkMD^
zS3&DwNUNOAwxZG~9c_2i>W+)-W1N`7visg3s(l!wMxC`~^!lXdRZwb*85OI8qouJE
z8SL4&PPRzY)88%VUl#3Ic8ERf+>={zgtQ@GesLsz3W+JOv>yK$#w_V9y*EAIYNy-r
z*k;L;!I_6R>Rw8C#bP)-H~d>BZFY2^;dG8v_r}9Gyql)9`gqkO{sOe)Qpic&nikxR
zLvHS*3VemIU^pQVM;o*2P@~r}6v#Qec)a`jr3jh(oy%sLJHxxg-HF|OC1E7N3}<C|
z*KsZEpN9BK9DNvPi*V5Ck}35b7vf)x#VCe?&(8<i%kd<y1lFjb?{Nk>k&2%!AAWuH
z1E}RH>504gic=FQSVj-S)6z4lUFejgf`;T0de<1*TOsOE%P8sX$#TtiWR1Slf8h&%
zgV@0ZVzF8veqT)y=19B-{(zTI08jW@?0HndV=`p$9{3xnNQ-IjDXy?kNl_OB$Bft$
z2TGUQl_I}3?CEBpHjJ6jx+i|MpTx7s1;OwZr?|CY+#cG^*cFq&PqIzmN^KO@UatA>
zJybzjUTQ-du5KyCM(A~pTl91-d%SMqanruApUq-3Am!$k<20&v=8sr^fotbb?%|VT
zc^tLfW|-BFnzy*AUKRpGvnNr@m|bPo0QI!Rh--Iog0=2r+dF64=2{yUw)H$^Js0X@
zs^UrxBb#-dkpeHcE0Faq+3_FHJ?i>hlU3iBwCt0;NYHwy+kvwQVF^vKxZoY`Qv=G|
z*$e7=UElf%Jme!2S&y|+7x$MeNI)|>_WR(Kt3vQ8=<CdhPk(Tc)<__wefSTpd5fLZ
za)kcno)V|)v2%;C(=~Ccbuez{98&T9cDSP=c5W0*X3@^K;hap_xP_`@>CLJg4o@zl
z&}v-C!<j{b<@@MwN(vI&;Y9y&;pF!g2cV$@7+W53Z`!t}hba%a{v|Wq^F)Ja<H@p$
zl-&V%vKsVnbTEnhs%+DgNFP-+bV80mO~aWXC1%7PgbtC&3y@_qEi4(PDhRSc#$dJ)
zPz?EYByNYsRT*!&x|XXzsz|`6YN-_HlvUtwY3UYuGBh=*6#N=(ms5u9TE1!%6%4v+
z`Tk_fUG6gF`&_eA*puPbB)heJ!Odvb;R%IEg+znl$1ma+Snq{4=r~3_7jFEMSkNE;
z=!IDY6Al(y2_D4m?3aq(6ZX;2C^E(QY075;nEY0yJ=Lo5dC3MYeVafY&H|L2%Yt?x
zHVD%@$!@Z3ce5WL>{a~2)fZmXZQ1QW@(FR;2SA#iQ<}YAF+|BHHn;9SbYK0RR<%!L
zaCIleCS(RW1Kj<E>;+eRJZtg9k4zu#(AKty5&Sq^L&*)P_`=K?PzGhILLX18_#o&t
zUx2YufcRX7y29zLp5!?^0$Vf9s>!r#mwPvUrwO-F^ov%20*TL|LS)DrXgNQ)@d9Eh
zK&aLF^2o&pSmNvY<x^%HyE#h6yQ)3+kKjq01@Iv<Aw}I`*#+Hwr5vO;LrSM}B0F_*
z{+t!ra^qc0vg2SHYcl`JIN==cA_)8*i{Vg2f_z(!RS!{f&QKt#Jybn7@14joWvsyQ
z%RIE?us#N3x`HYl6rTERe^}>btO>`+6!@nW>@~VIAp>F!_MA{#U#kr%3FJK!qEnsV
z@U(Po!;?cbw1M8cLXDns4z@rBZV$5woiTk<B>kR3eoYa9z&%{Df-<by%i&TslRxH}
zs1OgS>Y^G|Mro-{A4*ziLf`xV99@<K5pL(&KGOMIR(}9Cma1kSh>dtR-!a&GjI*v=
zM`U$h>OA-1`8-Ws%*fp->i41#<=+~0mF;F<RZ|2*SSQr1&K(~R;0n@yBsnsquRNt;
z+3GwvYCJOEuqld_3DUf-`WK}SwHR3dk{z5*Igj=|WL1uVh6^6`l7+9YaCl*ERqJhr
z`u>TiE#?w$A`^6$#ZPJ5RLWN@HDEFwZ`_Uas%TQBTmj@-a}*#%Y~M@=Bu(_2UnVfJ
z+hAmEt_})MYDHy9p#BCq!`;rM<8Piw_)1g0o`nt~TE<rN>F61!H&0VG4nnHC)CA~c
zyr859oYC@sggk@cwe)Gvw&-9wz!YG3T^Ya(IPU>9bz8J(qu!WwarSqAwNEwgk{xVJ
z@acY^prAkXJ#$C9zwGKGiXDFo>3%E6@kSD;#hJ{Ms=@nH*W^W%&O)gWw@Y5}TPZc)
z@0esF?QK+kanIrm#-^yF)c3r{OrSUz&$jPo8Swf4s|1+Ld5lEGULa=HZ;{Rc25WV!
zK5>TW;g?wgCHp*Bayk3UHzBngO5e+Zk8n+OXhz67UTa`o{T14`cQcxq+I30PzoD*O
zl9VRgO)^-mokHjLV<lyNZ_iAX>vU@Q25x{eO^W{P#$DQdF#r&I`=5XDjaj`bK?{?G
zMMpSkcUb;o+^w}IH1-_Xl#BfIEDfC94;B}SO$foMDt&)pp}SwDwrU925p!jmQ<V%c
zI}t96+H}u@`Qbw82ju$H0iekY%R0^Lyzxcs?`c1M7aoNbF>1>Hm=I66;S%bj(Iq5a
z+kz{?)jA(?#a<!N%FKQ#AgmX|0)jc6>}*j6+ai*{Nqp5?m{Skf5FuP3jT%Sm=xy)$
zQ#P0r_O5rh6&3hB3FLqyzZ1X1Jt6P-UWJMi<C5N-eV%KH3!+sL$kbWc%fCq4nf%6$
z^A<HXS3Qs?Ub=F(w=^;m@s)k7x7jGPWF9!u(+xZO7SuH?lqU9oS#Oh%-}!>0r&O3T
z|IrHPWwswcC-=<*0DugC1rz#(T|v~|A~8k2)!yM3v89`-GF=*L46j<B^lj>+wCRp~
z7qTJkVGBME$_iAj4CobK%_odcF4WuT5MmI{S{QOaJWOw6VUjP@S%TG&C?6^$H-Tyv
zC!LYKV{;|Bg5e*Y{_Q0`lGkrz0ypOK*6%l*9Vt@B<lF8XZ@$U?{l*G<`pd-(0H{;I
z%|QyxckPV)2^{Gt+l~b8&)a&rIj%Q<E84JN%Z#`llk0J%2jV>Dh5(_lTz=bBtE#MK
z=kG12L~SQu>QQsuM~M=OPhb3g01`0Qc?3){`dV=xw5$#tpo|rb2nW_t!rbym1B@rM
zkInKkwIvPLpuwfnAK5sp96g%it2fmV?>kyP_C>zC!T;Jw!dP67j|!zUAB$sjSl=Uf
z88yuvndo0~(xpGHpRTRqCsW7nkQm?Cb8eXgSKbR8<rIS%i4^|#lsUE$pdCWhwouk6
zC{{<T2>Wz?$;f0b!NA!E!p|mNe6X-EflIViQC;|O>&beNczub#)N(y+=bH_A(zNrg
zOg&Wl#PfsQh)Oy4!_rVXK$v?lCsBpa)HALhpS~f{FYCpg4IKE%$*b+NruWsh_0aQ$
zF4r?AA1fOrJ*+;`4d`p@O99emt|f?3mtc>zU6>lnER9Tus@u=y&~0}g=le^tD-HW)
zwQ=I=OH>$#Des|i)T(uVR?jfH)hZMzIOpQ!ca<Tat_&_xjoZ2RU{|(&($ZR;$`4Sf
zx)io8R9naoqXg9nNTjNmY-3+fe^`|)yu*!F7U%>*7jIHeyu!W+@A#$Rj!4*-b1SJ7
z(QdtbK}KJ&{xicP!U8`Ye_>$Q<#>^@L~{l~aXg=+C2z|T+}nRrmo}6tsQC`dt3KW!
zq~W!?VMk9YCu4AM%&K8|ZWXYk7k%Za^X@|Co{X`wcJn~z>KSd;_v&!SmE{~~cxwqd
z8p^ecf+6?L!;VI8t`F29P1x{*45UwGwp=M<Y8CHcm~}&RzX2_uN(e3i)%ka^@mdK3
zYC?=S%!unuAk-O>OXnX7tt9=WeP871a+E?Jy0F=DmPp4ZHfh_6nd;sv4HNwx1RED-
zqOfdc%ptI?m-F&d-!GS!pw;aqtIX-{K3cVp8TBXo%#?h^g0~<`i&@}KjiJg$A63~O
z)@#;_9^>=qrae`CyA?gr0o+HItG@dg_bv)V?Fh=(@X|2Hf=E*syjrumn}ph}$)mE_
zw_<ANOnuk_Su@0B@o(ogvQ(;rEg;%tEP>yJs+u4@&I91|IkRG8eW~PccXCLU|2Li8
z7M|SQv~g`U9Ei7bJtbx*FbD(x24@7EfHlLp*8aQoUM6(d-J-(^9Sone*+cE7r1=#o
zFi?~#?IC@BsOKB``ynZx#Wzlkrn7>Kc{KA(ZTil6cF!;-IC-}*51+$A$_r?FjN&RC
z57xiL?@w8FTfMO_#(xxxeIa9=^tdm+M{WsvFtn5X=QC8vO4&6P)Ht^_N{%!-R<VQZ
zs_AuX?GB?Y^KKcQG@~k!1MNrGic;Ush~~?8FPW-JZ?9!!mF`>ED6w(MS61G)LSOw)
z1h!S}eBwW9U(xPY7F{IQ&zE(0fghV_rG5NhR}M_@|6#T@j1iZkb!v9Zj!x*v2B)Il
zNT8k4%_ktGD1!J(p<dGpVGn@6*MHd$SbzAX?UI2C?I9!X_nxumxES;8&f}b4U(K3n
z=ebaat)81Q!dA0Dw5Lq}Snt1|x!I`oSXaraDmmYn&niuuz1i)R$hu0wibYd}Lu#^|
zlD=@H@tlFs=Ftr^@l#}ZTH`b2fTY56KZW+JPB@TV3sTGVoZDM)wxFW0+Z9z?EI4Lo
zM4nli$I-+n38Gs`{YBhcX`?%r6sYtW(LC5fB(dLbg<K0~%^2D>yRDrHfMP{YKsf#0
z?7#b&fh&;G#+tQ-8bH~+!0-@&(%l<>+VU?)h*a_$M5||BY$N5n2`QYg_9SAlbG2A-
z#1US+ASOr{k7a)+GN?)?-9hW$n(h`QFqEI9#{Ir_MoyS}nOsJa_2VYhk~lWgH}LCl
zkR8z0cW1jdb5c}z))!%H#QNMKn+~kzvQ=H~OHxg(BXQo^SpMDPov2z_b|G~leWqtm
zmB<rDuee`!!OYUbRF^?=W}(*v+T$A5*P<n1fQ&1FyG(e3$j>UL3y{AQsy+lfSm`K*
zK7&EnxozFwV0V{@P;7m=(3oZzrBAKkW4|8*D;TOlKhMs%N?eMnnFmDZ%|vm9PQD;o
z8Cd$;u*!h$WWn4Ibbtpj&kUjf?e=f%qo268J|etn0i9k#j5Y@Sw8!F{=k%1dB;#E)
zCGePr!aIa>-MoKnfG^BRwn~JLgPbY%OgOQ^leJpCSalVP*gKHq<^x+|cH_N}DMWW<
z@@KWUnYj?UXZ8K6t{s{V#8kPY<W{1Tk&xd<?H2pVix0ddQhGecvc|q)=TiZ^L<x$5
zs4sw(@^ZjgUA?9+y%5a-pSg$%-Te2GG_}Zh&eN~1x8*$F84)rn>O13;gX0X4;dRx;
z_E%6ZLuv{qf})v<ov&(SljLf>;EN5}VEiglwbOrQ`5?3o%GL+Fd7vYejiK}aJpUd?
zAttHyGiJR4-7CwZ6pv^|=e9sSx50G3HByc}3~O`B$EbmdXjqYSAF+#56d`5op$6|R
z<=!x;Ri3a`*Ia9c=4;Cp`>hr9#v@JcO=?SD_9Rq1kjlmt35sZ3z_*Pr<v0-gN5rKX
z_gT4{sz#E8MivgKGSrSN+rnMjarz&LSpOa-fx7G|C@wLDT<FFsKkQXUGXPz@5B#TF
zt>8RjZcJx;7QbQmW63y$hgvGaEI(3H*S8J2eq+Ne%E;{2ka<g1c7@0l9jU5E*G_d4
zX8Ca^WcjAXdWE95muzn`<d57g9P<+mJiH3Sm+I1jueDySXO3HWGnR&b)!$;85(eb)
z)KvOWKKC>$+CX?KUVEG(^pY`I-rj0I6n0xo^=60kb3+Ebh7G5aDtLJv=PWmA1Z}jC
zbaueGB*Hf(M8F=12%doG1!}lzH<ub(vhO@}p<yDtQS8E(fE)eQ*E0!1lwbG2@_ca$
zOD<*gO}e#V{Lu1Wgz)aWc_Fk<`c1Y?^dGejayO<d9oI-^6Z-zbjPx{cX2Y8^mKJ-S
z85UbA--Hvr>&h+vcYVtpFvl?bB@bPo-;psRw|X>xekq5L;=+3p`@etQt1QQBH|UsC
zA7DnNqOmir7``&U+B&PXjFBh?%*+X>!Hvb&P%p3NoSmmJIz4aEhr+clKg=nSXlR@R
z*Q_l|cJ&E3y(YP`M}D-j`F>CEFQ$kt`&%BL8sR6YGSqKO!?R{yG6KJLWccoc>tH!N
z;3x$1Glq>2QqMPs_ha0dx&ud0>U8`~@)bU|F1y+Yy;Q-wYF<{NJ&ww}si5Ap^Y2_x
zi6mSy;ycLOP~`6&-ZcD0e!Y;+Y5j4MssWny=n5G8ZJPJ}G$TJZ{NiG%wl6}l9^F3*
zOk?N7ycui0ywse$v!nKlSy>KL%$i^0<o&1fXHTeTS;3H8l!^7D3D8Fe*Bfnl^v_c(
z{>NB_g@x^Z^U`=%gK!C&+9>@dPP4CqK@GjKBt-bjHlZJ(6XUSM0)#Y8A;cv>7={_`
z2`!MNtTp&2FEoiPuTLKc{~^A9n$IdhRuzgFzOjHbh+<>>U>is`wVLV<K5(0PYPXJ2
z`HtLOW9XCEKBk)J=iWYrQL3=DQY#=!Cn{N{o?^PU%<+D}wks_yuPr${PGjYz|8JBs
z=BQ~!t|;J`Be-V?Mcm^`^YRXDsSABHy+fn0u@FVLzp`VLQy$Vrq|YATsHnSEV#}PJ
zOfQE~`BY<53%*<t-iP^OEWBHPo8BEW({T<&8&uy-l@@#qV<9g(&vt*Ysg|<dYKuv_
z#Al(cdw4|*^K)>lp2KVZeUAUv@JJLrOplA>pD?4jRCcS6{%*V7Q(0Kf@&BoD)QEus
z7XQNUlc85gDmdV~;(UIp&(k>VTE?h-y#43I->VeKuRtLJDA;vQyrv0WzbJyFM3z6c
zt%2&CFDfr%>ZfM}N!VwOKLxgGjNi1(r+CeOv8aXdhbclNRJiz)=TMe#D*rmu)Q4!Z
zn_=PUx4OZ=M{RX*#V@na|HLoMQGU?B(p(6AWBuVG2Ni{2`GVqhwDXXAB($cy^44=-
z<rA`?6f+s3XTpE%+PJ9d6Rpqw|BldaGu@GS2=qUUrk(acJ2R9Azd0{z$Sq~m16(^!
z8Mn3TR*KV7fqkS8b9>&+@7IotiDsto=q8ek(1ycIlvi#;Zn@9Up-nZDbWb0;G^+N~
zw(?LSX}WxKMJNDYqnyN91V<zDie0g!M_(J19EKp%FzVc1!hok*g6;Se;w~WI&Q`^-
z$F5LmrZt}w=t&){KIpJ^eBkdnW4~h8gkC{?n7R9-ZQoYKxwMzF0|l`S=SK%Op1qW5
z7p0#sh#pZzQ}5uU)q+J*#SdAASOl-%ly*yqhwDF|?3cv{ykOG)LI3_HW;7Z*=LNxV
zUQ;B0f^C-T+zuYQ6}&fOVNOY3Krg>{fIU&|sg{brTVIT_y3Jli1eW1z3vkqPe9cn-
z4*f6hH+XT3W*`R4RC*F<lv$l8em96g9YPGO^CzB&!edZGv!Hj3p{L@#x4uW;u&Cym
zD})|-ezn~v@&zH%E}?cskHhBBOzQH8g{YdaYJ0_UJx@Bvc;7!GBlvHS(dx^netKnz
zu>=q`d|><)(s$fP=D8PzsYSI=6j|O3(Quja@AG4Wsy_82W`u*(*ZVE|&;0AYOKxW`
zE0LE@%|jGRYU&BqBYcrp@5`@{Q;e_|MF|?Z)RE=puPb(hAG>@OQ7-^7M0=axX!b`Y
z7QR$;g+q^HbFIkBltM3|DgWS7#35itIhfHYpTc|f6HDm~g@)jL+$5LcnbswR)r#}o
z@{-Ktjg;_A4%&&W?Nk12`R|xAbq35g#(Y2PxeMU;rFWQ2Z}hy5GkSJ*xabKy6x<oh
z%K8;jAVIxmrI<c)Bi)a_Jf*4?_MB1M?6#Uq4#M%VOt<&x9Y1Q0L^Qq3Q>f@ePqcjb
zeNUPxX^|dU*mTn>lSE~IZsCGy{QHD5Q2lp|Poj{^uA*S-`52tSY1-Z>G`fr}8+(s-
zl8<OY4mZCo2Jn9=WeR1tsuPlyE`z~jQjXeR)vgR+Sxisf>o#c;#NkFWbBYvH4#{wo
zOxBHHpU^T*D-s2VQN$9-HW&ho-H!H_m$h&(4YZpD-m5-XGp9X@;!WmN_peWm{ZkZ0
z$;~wL<iE?QcnE&T&{<xAKA(zfdbj(c;Dv1kn?I^SfHDwOdwWW^LUum|+eVwYLY{VD
zGGmtcjnRtHU6QBdqh%$y)3mQhL^)ONwMgSti8oO*)aN~mMuHgzm(VtirX?cP+#EVK
zZr98fK7#{@a%ME!M8H#^RXh{eNO1hmF73SHwJPGD<@RXw_JZ2|_skpre1A^K?zy3#
z_}~P%oejA%9h7BG*Hlg3btz5TA3mo~m}^BRWBlC>nBx-X$TUJN?8exJLz-e*YcCt2
z15q%fImAhADYt6fe1WB3zspR|)B=SQ>oQyzDM$4`FS(l4q;a``2|&#1Fd7$b`nxwS
zUYQ%4a*$h0y3ITY$p}3{IX)mT9Iu<d8PH2rTXOWR?H$S5m6M(;&16&)Y-`f2O2y((
z(UOUl$Xx$L-9?|}HId0Za(AM;y@4}k|J5m9{cF|YOSh@ELE1M`&ly-9X-5c{ig)(8
zn4X?KYK0PIp<_)G<Tp?s_x#dFRT%W@Y0p|Z)2_LJZ}^`zX8L~)C60Hz5a3NjA+*Q0
zpZb8H1?&Ipzs2P9V5xu=+p#kggbJ(Bp2&}q42gPwhFZdyXRnV46KqCPt|1RWXXTHQ
zBAR)k>IgUb)#~Uq>1q#Xu<H&tFZUJobxqt{s<;e0euVD>`n7GO3)4B~PjLO+q$Ba<
znKGE%LR9K?I1mXoSXq4KuK}I3syO3)?fqHiiD32JT{$8c0{Sg&|LxE7zYXdCOv%-;
z-rRFme?{fcem-Zi_k0Dqy-0Q)nJ#5<QC8@AABk8R!f(!RiY!%Dt8h&ehrY(!O%BFb
zuN8YZ%E=3kEeP~vPB*+hfS2ex4zlw9A@5-R`$#F%afSKy-+v^X{EwL-^Ph*V|ARj<
zzZa_k&#^pk*_dBC;<tQb`3(GP($jxq8xV{2=K%be->;^4-xj_j#r05a-vCQQRSgk2
zu}Ff5S&_IfUyvnWHTV@?Wzag_Fs9Y)T<AZgTOeXVSHkbEj_T6ocSPvR4MNYfR|N=z
zU10-M`Ail_AVV5<K_~a;mCk3(-(+D?-L0^iWxWgNNIIa4<R~3^|I>8Qf5xuh&nrJC
zld>@qtOrqZdk3Q{q{f5}urFHi@Us0klz@tr&TSDEYkS0-PXO<?hA?ES<%8Otqog<B
zzdtJmKbs^_>Pgm1rK?cJ@|hN2>axENuGZSO94rQjz{0z<B0WmgieL&ZZH=cqL9hD+
zh7QJQ#qeU~R;|x*3anxo_{MD93@%8LaX?uW+-v9rcfIls`TvNxz{NMupY#%w;R0<o
zL4TY#mUmM10WFF#&x029FR!XF&1=<QZ71~yrmtU!N{*?QqFstzH9p-~>T*f#Cb`zZ
zM1sy}W{NBVY!$#~#{*gxUV@?5jha1I;qM0~ibYpI0>SLHnre*dT+BvlHbv*lz1=+!
z4S$s5t?*`U2_2*ZPcr>AO=K>ufw2ha_P_jztt0wPcRc#A5ifXl8`@r5``K@;j`|GJ
z3nQ9#>|6|T4+9wlssERAUqfwq!&6yNGq8?}J!sAx)PVWo-)HlX<8Lzx{F?*zF;$_|
znWl8pFW~ClD#lccUI7m)u;YTyL+x1ucko%@x2YbGy$>ePdC_CLk#C-@idK|h0%|M+
zB`bLIhz!6v=_=^KG_3eGqA!88b^?tXdi*so>mchyCRj*nW2=HBF~F>pYRF(JxY1Al
zs)V2~;oTpr`hOIKmZ(y7Xk4HnT+&nKbW?B@hNczQswE4%{sLasD~&7|2oh=##G($E
zH}jX7e^`t%NgnHD1wV3AA7VvyR<p!jL9|*UpzFbk)ypS<u*q=I4$Vvv^ec7$q6~2F
z-naL%Bo!mWJftXW$WUc0HKjKfquc)uT?4?C51uG>3H_qjzacV2>R-3*T?M3TuydA=
z$Ussi=I0DU)->#Y;R|5dGvTZxiN8&LV8sL@cWH23yj48*7i{SL6*SFQIOA7*7gLw%
z%M~;kCFm5}VO6noXI95%A8jP7qZ(_Dz3ZOjR?X<?g&E5-0B+*{nUv5BQVt}Um`oQS
z4|XthirRrEeEa!(KA;CEc%cZoV*i?%2miLof(7y0N=uTII=7sFZrJ{lI=JNr^X)zO
z56a5IYYMy0ldC-hl?HF~n*)!L0=DHP7U=XJkf_qu_#YO+79QqoN`mQ(Mhvd2D~8b-
zZ^5Mu!?zc{3wSUBMX(OoeIBCyM5V<B#4sJ83x$L%?ASVV%YMvzM`EpEDUN$g$P@e(
z8c=sYsvWco>d;o5en4$X2gtWc$=LS|RO{=(pEZF2D*lQOQ4S!X?Ld@I^hg-@fGiqE
zuc>4n5&`r71njSwau#bm-^TlR-YfT^2*je50gdu5Aq$6mL5{^q&<XwAvu2Gu_yAsk
zf;cRjOCSG2-J%@Y6gj8{qa&F)s^o)cYef6g8<74hEA;sa2kg1M*SUPIEt2(N$Y-WT
zkV(JlIjDwH5Jkq7P&1AbYFhd~-B9rM-G&E0@7@TJ=shFUTp7(yTNNbUWtM2yI|F}^
zX}kEc7C9w?MGMHK{&hsV3>)mJd;(g+SAoXP9%)ZREu3aN5TRT9ym*y5(CZbGeuR4;
zIJzAK#JW-OD_Ps?rr!;$q0}VKm~8F1y))|4X8Om9dgcl>WZ5mCcw;DjGUOVR%hQ{G
zd`eVN0%gxqzq_JopjH>?@{R+nyn$Wt6V49S;qZetBoGu_n+Md~Jy0R?BD-$kNJEkB
zjeqkQ0RKYJ(rujUa%%#h2JSZ>v=7faegL^xoF9rsvBo>f_0mHs1HogJYrS-J?x|SJ
za6FD453aDt1oaJkkXao!sH#XZY36s-9cxIP6a}VZuqdgs!0GH8Ag1iua2n0Zf!{C%
z7WMl7VP{yk(9RgYiwsa3(b@ZR2JKI%$Dr!^fCsx*Z&;c1NKkluFCS`#s_dK8wmdh=
zzctOi`hSp`>hu1cQm`F0!qRyHoimh>tj_y&4r?g13N}Dalga@piKvk+tfiCr(=|R(
zHh59hT3}7vA-N?YC(hbixk@1MS=1l?jx`mf3_6A4>%k%6$~<%ayRz$lf08U8bExn1
z?Kayg|0TI7%8;TwJ}3_Xh4s&`g)Ua$oMK&N0G@4YrMdQdmwR*~9#Jm`$NXf3i?0X*
zXTMK|$bic$RT)*W*x#eGY55@mNi?APBGFLCnamFIx=ipfB9Eh{0`JrTYc`e#2fEx(
z@keACrC=?k#z6b`Ee>EI=tiL@F#hi@91uAJ$iR%nfVkSh4FMkbwSW2!Vq@Y2R|WKv
z;oJ%8U4z7Te21l~HiaD%>znIyS9%LvgnXt3xyc6%obKi$0oAQdcaT%^7}8=QF{|J(
zvdw22UE2<LQKxEWZ16j3r=Tm};Dv4IXo%WsPK{eEoDwK!_?0nWvv}f<TBcY2_&sP*
zh_d3F%Y{w5m%K#6H8m!xphAiQ(s4V;VL-O<XKIF5IgPRajjgLGUdzK!=M}wi0nULA
zWKbt^hlk`0opgfU?o8LmH8S~a$5HojYP!jQ0<+tYgSm2TJ7K;+Ss+z7QsmfPxP^fE
z|80Wah+|UnfieyvPSd~fr+dAFkmuSVJVX{J&r-8eFk`9PzG@Q$c>2h`75I*<e&<l^
z!1g_Chj<=r5YJ4bK)z+yv-n<qx-!VNl!jW6Bg3{j)F|=_JkX`G?IqhP>bH?*#jTd=
zj*#BG?2nvTs$9b!&q+6&cQq<Ql}vDP`wO{lsQh&q=tv*83MhOg<^JQv$UJ2JI~7@E
zs=$7T5g%}e*(dLScJoZls2~X08qSkp=`<qxxUH!NgSHUOSF-IWhvpsu*DlxYyTZpr
zgg+&NE8(&INb=qCPNWL$@M;S{;As^xMNS1{NNR)L@^$P#SQdQ8vbzu+#u>3lOTKC?
zFnB(!+2J_1^_qPFh&}vyD-pHo3YfGm6`cb8zPR#)A7%czp-m!|zEt%iSTme^Zljl&
z*;*qBs4g;g^#PNN`Gku9t=j&xh5Y`6BoL^W&zPjOx4v|r-$jXI_wPO-8yuI@xD%I^
zsG{1C$E;2Rz@ab8GBgFLG^qCtf?;CXLTfB&vARLXS0)Yw53!H!fZP{!ivu-?k^>np
zXbqXd<VNUmhMYW^_O#k{sOuPtOu<)lHE*K#$P4y6yz8Bil{I89fG+&)2W{%MW7ip%
ze=G&y!>H%~%AmlU1>Cc5<aDxxvbx3;_ts!i<7!CW0FR}cK0(kkY1N)_@K6o7g)o|d
z^M%e9OqbkIwD7Kga@N5l8&0@O%!vmA0+@JUE@2B><*EF^A!+rCe;@TPeUW|31gJXz
z*n!4K$kaKlqq4@18)uPayADe{!*$VcCCEJg8$KGqF@eba>{szrbHAEDh7s1!J0VO=
zf{Eb^<VgM0Y1Fej4w=Om*HA*Pg?jM9;nC}JpcUpx{z>U_OhX2m;26Gm)F9K)crEtz
zA!T6=9h5kJw)`y?h7d0h+^0yOq+Bh?Z2svK$?SM$rJ2l{B?Aq9s6}yCL7NF3=Mb?N
zDkUgJVK$>QF8uCc##hjYj@=(9_xmj%g6~)=S${KC1}@MQA|3!%0S*Njro^-pNLk1t
zALEn|=UlQsB6bw|5<w-2^$zb#m>y|{R&XTzncBv*r9?VK`wjn~R_NtrZo?9*ka>Aw
zqN~_}Xb#~xl5Cz4+f-ox292|!+hJMtKJc29@THrGZCZm4<MZ0Ta%c1ckop-wHUVl0
zkletsVJ0|E*<M+!D)^NX+UfNnuin2-O2Os_j8<vT)rzU781LcL{KxPeUL?Tezl|<L
zh~d(N7!>q1WS|&GE9)SrOfVUW(14yfjhqM`>!mRxXdN3J_NOjl9LrgwnCet?iz{Yv
z=<b-879LDu<sd0xv4)V)p^Xomt?J%wa0GI^Qbeo^5QQCxDok(a4Codf-hx*_fuI)r
zu6m{g;!H0xdb+<?wwWg0tg3jIZHA{DO5?cI_BtY+b4`Kqhm)?>u^xYY+U^;m{V>p>
zMQT>$;=0gBg{?Ql4>j*TCcJEW=HTd)2rl(wwu+ZKy^KDHuS?q+s~{=0t@XjXD_!h%
zN{z2$*5x}$rUf^8-z_V~xyAM8?4>KbX>#>f8*VPnu2m%|H@Wrfp6mbH3*7qsr*E@H
z83CtTXN#i(rMtW|M~*3UxgU~nQT|Kugz4y$KQ5TgQHeoUEc%xlgMIk9gT^zbu?O92
zAJ)Dr-w>I;mF2qLc=-`ymdZ;v+}(o^!6e)3J9LFN#cS?CUP>?ON<sYd4q~A*^5u}K
z@x;c(orykUX2uV`9S=&}M#sn5fa!R`q8kLT$8~jeM{F(6oH?U#?T7lvbzsBt0CyFq
z2m@$cVtyYvnErhQ%zWU~SALMuH~;gYeww4V1sG+&IKZ}M&6*c{6BcCevl+IvSFp%@
zKfdXo%z%ZIl_`bwTx<!;nDmUxVb3yqatT}GJJjsgGd*U<uQqk-)it{2uth8B;o)fJ
z$4zVU+gqAw#b}QUw$QJ&g8E}^kEw}@T6y@#Fekotx$G%7Pa6G|-7cJ;Z=0*6Dy?}T
zC@j3Lr8Mnq?)b-xCig}+u&_LTR#+(iy09=kyQrX`Ac#O95Or~Rc`eILTkX8}4Gavt
zK)6by{ES}06UUVg7_d{;rS;5<)hBcXKG3To&OVb0d}ks0Zu-5*3vo8rA>YwDc3m$P
zEF(N8SQ1O=zt;CNZur!NYMGGnOn;ZE<ZXT~TLZOmKKp(9KZm+noiQ&h3Jx-I_jG!T
z`*X|3uLMWKkz-${eokE@-|Bx67rPkmnMF9%WnlcE@m`as|LpYe9OF-~fjO+M-6p%V
zg-g^#Uaf<~2rC~s<sKE4HKuAE^iT-_8w0AR7S*%%5?BB7s(jJl_be<ATZu$2IFav{
z^c4aH?iJ8Ph`QfVMx9Xxn_qBjY%EbX2M)WS!NEb|0I{tt7y`Oy6J6j~Tg6kcSVJ5@
zvnM$t<AA%Y%gb`(p*fU)zh`<jqLGQ&v3hUPjmOsmszsfo*dnmrbFYrhe+)T3WTi$-
zDESz^X3}+=f67}9o6w`%zs)no;@?e?+ybfxcq(Ku{v#uk!%+n3gr`M4Tg!HM2vKjo
zt&*^H)2DwQ9L*;SaV>lfcA?vhY!aOyw@IEn%~PdswWM3*UCVx2-oK{Ezj6%iEe~6J
zdW4+8a6m>z=6>VPYL+|f*u{4*;#AbAz3lnd0+SCMI8X)N&AfGWbuCX{Jl(u%dwF^J
z1vutk)W?0K@YaJ+@tBj7)5vw^w5<H}PwC+kn4K7uoH(f7SCzN<SU=8R;R>~SL(9|N
zNW!f5BE!=6a3+pCv3WDe>JeL}m0L|s??WL1#)qNfdQNTYxW0)%7q+i)RLjq!CvHuz
zPeM)*uDlZ$bd);#m_A0$8(9eKDIV&vYj;a~b!)MkS9t0NyFWZ{55jsKb02R>#ss5S
z)vW!&#iY0N)=@?dgOt@uSvuRXT-$$#TrBpIFrR1O+C0?zY>|Sy`AlT<-k5tAzdp>&
zDV9*qohl&?RPE?4og?S_8R_&8Xq^|5*&l8!6?-$cCJYgEW8$IVcwkyu+HcPnW(<4v
zw%ZT>zxKX79?CWRTgQnGQ*?x}=jcSpl4Qw}R9eV3lT`LHMM4s?cFI^%>d00im1RaD
zT7(cLm9>y9gb-rvGZ^N*?s3x5=X`$ezwi5b-{+6AjG5=T@9Vy<@AbX5k-VO3CN?%n
z`K+~if0*_ddK;KnSj6VXKL<&1gZ@4Zy^D@({1ONBj~pBc+9fI;d8uCwhku}=;l4M(
zt5P?Z%J|xwOOz<ro4+c-v~BJf^}WyWUd?~5*|JQyW`lJloY;WDv)xnZY>ZA7>$=yh
zSWp+0X!=}xNM5VQjd6>UDd|~8(POCNbYp5e-F8p6ToU&mNg1sz*7Q;;_s;aW$0fA>
z@xu!N-u69A?LkXQ|C63c!s~2eZkQhT)uh?cYyuy}Hbi&URnd^%apjcpLT!7Xy8KPM
zEnRB}e7Xg5MZK<^*5xHctorX|rmr)aKk~>Z01mM2=HTEcg|1fmHa0ezQ7ZAHe+`^X
zb&lu~Q2ug{w{L$?dA|<rMO|kScakXX&E2bSu|v215hCn-8nVi)tM9tHx6WA;-8Elr
z{HZ*pfv09>EIFs{tB;Cv4hjZ7b!nh(TNwD7Jn0d3X;S&JLpuG%*o4E5Qg32Q54EE6
z(d?Bn%k0uOG_A?1c=lhrv;F<3hbzLOTpx74o5|?+ea(1z!$6tmb45u+ahu<K_UJ|L
zmudmSE%L{Ej&-q{Vr1dK&~kTNP3|sonq`bW6^*oSjgq3h>vw%<h_~~by-)RpqRUoh
zw;Uf=q|9qL-$7<g@82uS#z`K5CjDeb8%s;e!$2?%j^`H?<PJ%@LW_0MyX^sfXIDf7
z^ERD4?u~$xlE)9N?$HY8wx^AK$bD32&7Hu$8~6Ey?IXMIE{wnK&#lF-<LnX9o$6}1
zT07{hz++*xFw)RV?CMdyBe&I7e(a@ki6jS)U)IFaZ^tlyU?0|cDWCfscC~3Ww^C@W
z28SYOybFg1Pj}~6yj;h=op{8*`b5_OIkK6W4&{lo1mo2xTNt*PH*%+t(B82+m14uj
z7yLuBE7*3BoX?y&h_}W_re|avuyRk&%BuZq!yeSigB<GQ<YX4z)Y1}9j+g$76rAG^
zp3nB+754tX$xiE41~wP8Khd8O$`%A|jCAAk=$1S>6SbtunJ*!Vt7B~#H4S&#W+RK#
z@EVaiG_&(A=4&r;E}X38wp{fprg(mz=7IWt-QNXjie)@s@Lr@RbZZ_wg!zUQvd(s%
zisox&huiPz5Sp3y3Sh94Zru_g%Myc4L0NPnOJnYJhLR7dye99^COABRQPL@7ZyXMH
z8O^s;$a?uwdvbE}!L`S~Y`Ea-s~;E`IOzBh&A^j|r?K6(gzec<zqHb9M2|d|kAK|5
zt!90r$cF(N)1CFqNF!ac)%|neaedk)1^I&YjF#|V()Q;W3UbEy8d^a>G?_G46KO4e
z-ladcvFTWhn7&IJGgrRcmb`7g`mubKt;r|$qeFpeo;~J<zT?S+fE(lldhKCG1W8zE
z*Y};6W9@_!YbQXgU=xh3+%18cBok5EG8rqk;}0hn7o*0ifp6bLRqi6miqlwv<UyNA
zdFk@<8Hu_M6{RzRDXxiP$gs9=X5P$CfCV%2JR=x0Ux4e?>THjd<vQhCb`RGpI-)65
z6p*f@FRwgl_l4lXpmUZX`{SwNO!gf|dYMnU)6h!6q^n-S-)3+l;R^w&0=F&J{q=CW
zC58h-L)^o|!=%b9U2Bzh-NWMX_~608!G_+aPo5m7>8}F7kerjV#nUHuZH_zigTNtJ
zl=~xvvE<j`z_Dmt?<W(_ecP0D#f!!0&vCtm$Lo^DERpoK$|)SQQn2k(i4--mvis&e
z?#(jwR(3lDQ|)Dax6Hmy<|Dm(G0`KjxABW#*K0YVe_&xza_!LRnhJDW;}J{wz$uR<
z6Y7sFb2s9B0Cy!ndbHUSs;sx*eYCZ;9XN=Fv6-2fLi4C;knO)>MjOADzg07j<_oFK
z%Kz3*+78XJUrx`@==pH<7-zna$7{?*7HN)*{xvo`TmnsI?_{MY^z)EAqsZ}U(b_`(
z{RWBz+Ey8k+nCkvap^Z!tdnAwt?BbS22d~VjIvvDO3I&}KAxVQc1Uf=9famFYxw!^
zmkBzo-&3f#6C@z1k<b7pTv$ZJ9IzQ%)y5@9rsO8tyFQl-POq=|@`xIDY8C8R^Ub0#
zLmp3{&G!`V$Jcy}mf%Wy_+qQ)y3(A%8PYqUnJVtyH(^D%UisU-Y=6BSc`L)Q^&2dI
zL$BY$>vuRKLrfx8SjT-brKxP9y)3D*B_Rtz!um}_g9!c&b#-;u$=&!vhXl}=k^Dk{
zhIQ}X-^ib6i%&GQu&_7@lG{EBKA`c};o<5*>|Qe~t2>Qw*Ckay{2Zm<qz@K>^aoEU
z?r&^C3lswQCOV%N9V@@NY3DM~dj|+{;edT<=}$u?rR%$90)@qQn7Es^WPiRKzpX`E
z<Eu!>!3VPa=!g#2hUKHp$Jf|sH${;>wkI|5u(74qqfT|?LNb|bVs0Ll-~9|mwa9O<
zdl0|MK!$&6YAX5Oy+1sCB4Ob8*Kgkpt-4SVFao^_mtmw>h*x2c7>T9oelR6L`_$dX
zt6`1&I-7Vr(-frFWa<Kzr~@=U+CL?+rCevF8g8{jjK=JTp(yJNkFcb6THk2#=c8kp
z@7ax1PLOFceqJ``jW2Z<9rLg5C5a?q)yD>gI&bG+4^GjV{d55I$%M~5avsXN7CJgQ
z8hX*dC_F`xL+at-$8fjp?d>gkZ+_WU#OPH_JCoO5;ALFt5#F^{UtbF~Pu`M@m@y@b
z>g}FK$p1JWj#Y(5#wlDfszyn3d+9$xb1?vC=VrYv@)+G-#0&*Ro??&p#YrY^W%$_Q
z?Y`8zt2-GL?mX`*B<G|@3Kjfv`aYa<Jgw{BtJX5gxWVUdDZ$B@>%hLTPSgKS*GnKp
z;j);qI1f!+JuzQp4&0bJIw`|kuoNuB>Q41@e|QEzr>Us6SYw~`y$XC&<go?N?Hb`3
z#>UxNFNT*s!>jx*eSS>yb;ivmo;b0z>5c?hw$Fw@zY65%=bOdyu?r!lOa9zlTshn2
zEWchkQe{R)1~*D~Z>KN%b8RqVG-BoY2#igrle2RfkPl{R8V>$v)-`GBq`}COG!=93
z{uAq3TW{s_%F4-=*(~(hICkd#1LY>85&+%>qX5DhSlc*+dstVHC4jsA7MnQtmamw9
zB&U1RDiGr?^B`=^Pz5z|#czSu%;a;9jDYQ<ho(Or4PX?bXMVeLBbS{5l-&4r8s7e@
zBa^BvL~*81*<^~I-)upp>j^k+5wC5Zn(HEx!yAI#dYTgNn0($xdL*GV2k4=s<<6#a
z$+(aiDs;eN9lHeVVcs$&dzsg}sv6nCPCjG{k<rP3%<Id*a~;&w+CaRqRaJF0_n(^-
z6?ve!^*boTU?~qJU#_`gO(fmuT9@n$X%O5+UyEFQn(1LY>-<atx7e>Le>SgMNu1~@
zx$vz*&YH>cUy|}Q3(~L*Ug`~A9eUywGyJD;cjG<K9RXvKH_<~iZfv3W3JZ%P^&t&i
z)S}<9>={<bgqQL;Xm)nCAvz{n&LUOT)z)@Bno35J${)%s*a_-yaJ)M=+}9q$bIDJi
zst#3Tq@_u7Uu%Y~&K?b2$t{3k&D&iLJPMxMnSP~TN$EmbpytcV@!4V`V1eA8;wKC(
zuoLvWNOe)0RY+d#%G8+3g<eCQA*wtJ`sc;QF3fg_GI=XNDYj^j9PvM)>9KI@jmPcH
zlp<+~3w?s5cQca)oobmuS86-e{SJT4N*vnPNRKXMJ<nG#cw%B=q)J5nr>DOODUSXd
z<WWA`_CXj?vdR+-o*e|=?SRP}sB&|6g;<`n-*j%$>Z@0;BCB)m{CP*owU_KAB9UjQ
z7%+CF1=+>P`ULPJyI^uFo5}IMJDQu3;zXB<V@GP5*~*)@z`H-*{MlFZoK1)K22V<F
z?U3$PSzOn1cGqB*^L&45mq3S-rSa)Pg@;9bISs+`zy1+$CfUlDLP_qnIsx2>Z|MnU
z({?!Cu_4Z#fwP}>pBPXhUTNaZI<W;X&)ZTN4vOd1q3t5}Z%U`}SIh)+f-WP=(jI@6
zrSn3-d5>zSE;4J0QvUqM$V)xtPshQhPd)PltAt1iw;2kxYS!CWdEJS77kMc~0XxPt
zp3?fj;!CNjs$LbQN1~eQ)1$>Wif=e=+XonAu~T1Pf3Rj4dg|^2^l6n&BJFFR41a~G
zuC69kk{&%;4UI4MTG?qaM$1^XGMKMS3#q@5oSgT}`EuZB%AkpsS#0ii{~hVQ`rc20
z!mPD}fA0QD>7w1ZG}}4kw^_ugb8^_hT(}`JGykC$zJBQIfh>aL8f7g>YcGsvC~Y*}
z;F=>%#SBBk3Xi%MX&`;ydkjW_nyb$3KV=*ME*JonnK7ORPN%__WDJjn%5Yd1!Ym=#
zK9*~+MM;VG$kC(bu@+WVRv%#8qrd-rT=Gf?_8Ic)x5JF~u8{)jn&{~0fvSd^v9Sa@
zF;G@w9;oSeP|J@|q;XNx3l*)n-tsO6HeV?|dHM!2j`9i2%!cYh#0C^i+>b4j81|9e
zZm)~OYzl4i)*1A5pwB8K1e$_RvT68jUNO<S2~Mr{P;MbQoA?_2TE-uEKJzLT$MXf)
zUQ3f*E-u5_4iLE=P}^^T*&Iq!9`8_i@#XKj_VzmgL!b5(>55Y?G*!(L=HU!R%q~C>
zDK$ypBeZ%hW9QN0MKN3xQ_~wY2MsaTPM$pZMn}3R(Wo%;22Fq}2#*vO@Shw}eZS7{
zMQ%O(B<?P^rnlLJV|xd~^+h$QpnwL?W_FBSI&E9bd&tJa5*$`fQf13%bsz@$41<n`
zL`M*5Kn&hfZW~7REQ-k=JJp`E0U&Qu{`E)B$2wcwT+8ld`#0We2+r<#+tby-USaO#
z$S)Wjj7TxF*olruffCj}^ET#c+xNR0Z$l(Y3ja*8p<k*h*2fk3F!BpdM+Y~i9&X~1
zv0gMeY_Gwp$T3DkbTI&QlYt$(Bet1ngtM>+fpedYfJGtFrZQ*x`;%_L7p$xA3HSkt
z<OKCP>vX;OuPm@gk>uE|)j2=Z(93vh5I!VK*bn4K%LN{O_HB+wH;udvNt`)BK05*!
z+)VY;n+YE6i7PmxV~;Z>074!6U0-tB>1JN&{VGy4*G?sJihHkz(qNC~wYA#gZ=~!X
zB4r10v{EVf_`AD)_%wY9JT=8icnyO<4ZrpNvI@oYJBwI8yn+_Vl*McCQ)g+UTZQ3Q
zQWu1B?Y>;dDjs=Bx}}|xC+$!|>B@{ERr=QsuGQlgjIrYVXWzc-9M33o7H6mw3#btB
zWp)Ny2&Ufr5xFi&Fn51HS{y#peSrBlnbh`l_TA}|Ma>bS`H^J{e4aoB0(u`D_evu_
zK@<nB7vYR-peqI)4M-zzZ`6)Y=$HO+&p3eo!OnLx(V(0+jKp%pS*t9w^1DT53(}xo
znou-sY$(^8R(!Bxc3!dQ)=Pmapy=GmXZH~GA}Vy5PITWz%XI{?RERtF)VP|If8oeZ
z0T8&B2c??(PZ$SKE3$$uteH&>SBpBg>n>abk7=?>(M;7RC7V?*3ZG2*F^X5IA0y@+
znfcP*JFoP(JRCs!^l+2o6kx;<L6D~mX>#|yoNqEubPrD^;(8h18W(U^JKxlWi3B|V
z1E12*LbB2$7p*d~46W?SKNF?5Sqml>4AE*|RD}B&Csw<1c5t!8|11Z)oc-udOg47i
zC5dj+Rg`Dn?<VEP2ur1YKPElPEZSpuPO*mAE-kla@cEe+lH38IdTiU*Fd`?T!kifm
zja|~T0Q=_8^EgUve)8bofd2uAr#Uh9aO^Elo>hF5zTfIp3$r`pexhDs?A0Xtj=|K8
zM4qkwBT|-kh9eafe?!E?Lx}^*)VCf&LVa%i6&|&2UvmAv#@jq_8Vq*<7|Xi$FE;Q*
zU)$Dbz<P_2CDw&}EB2pzO1d2fPU%iWQxmK1yUYa&fKh%k7=}2Dmd_V3Yv={lO$7FD
z=D)2CwSS{u_?)|PoT+wQ-A{K5#$GFty5LD4kSpG2RWnWOlsnl>F>IYwyK_IWtfRI8
zk>M$4y1P9(K-!*{adJ?u2j8eYlWyN0)w4Eh`v^&I%(o{Ii}^bgAvEvF7qMm*Sjv<C
zT+VX4=|vCvMB_wm*F>@&H-V3n(R0^lC`KelvvvHrZv5nRKSsw(=HqRi8p?+EfG=xN
znzO~0>?)@{5Ab>0)+9)=V;Ti|$b0hfB^|{`VPyl(V+um;IF+}4CRcXe2{2>Wr<W4M
z2i}Z0rw?Zc1cL;qbrHm=OzAe}dWO$@$cOlZB_REnzb7#vv{-mdY%D*7n50Fo(v7@O
zV~#gOdL3ORT>s*lJ|HpdFPH-hImRdP<`<Ffq4;A65R92ygd}~M3p-us=av_U@X=h=
z+i?9+XK_ZzXuU;16p+QW60kygt8I>$dVai4r03GNGd*Y$j<5Li%cQzX<|XEz3+C{K
zy#;nGW6|@aB97p^KO)@SoT$}h*WO;Xsk)iR8Kb6?q<uRX>2!gOyh(P2&y#E2(_hUi
z<>^RKJ^$!pr#zFE{$u1y@|@Eb4|+!b1vC8NAKO7W(?O~?`==?ck^^|WviKdOF!na(
zQQJDuPj)^%HyZe3)o~rOy??gw&K&MGnSF0ll$g&OgReElTMIBo>vSWy@Oc0jS;2&}
zWenDVs*zvAte{bNLtm{AQVFx;yQDwoVAW=VtbiZTa`%6c-6*B={LxhL?O^^0gU0qp
zU5E>?z)B@iah&rGqpuII_(f{9PH}Fq_pUM8Hva;ZHYT5GgzwqH?to^HyoO%N^$?Nb
z>C=O$29F;~nE2UWNAM0V4FWSza`8)0mf7kN#q<mpyUNamFT?AJ$=ynUqID8l#Blvt
z6etLmiV$r`3a7t-5P|&MCv3RVN6*!;Rp?%o)$OY<F|W51pq%s`{ZqH9^~)YkI|Ryd
zQ#R||&hYZnZQ~wWsM(-1ksHi|$?WWAK6f#L1<#YNkRzIwJ7Wh}WYmDU{F3}s{U`ba
zYbKEC&!m9WhE>RYHEu7+IZ-?r!d-?~2Emv+Gp=XKS4?mw&Gcs%^d{8^k6afS4K#+x
zP2gmse3ji6R<sEz!EX~a+ZZ}HMy43&wc5ia`hEfK?Ser3Z70sob|$G0nJ|w>_!Wf|
z1mLqTGQAa(iWXjW8S9+2q#v(N8Tb}Y@x3zCHr~VZob@T*;uu<beBDH%Rus}v$d64`
z=m-2?Xj^++EBwTKP&bl8R=^6Pnn8##gG)&cPDt)4B}^B&vNG3>UZl2QyzL|tq~7D>
ziurinENSB2FV>ayEpD@|v$@W4MCXJ9_Rud19~*I@LmB(0xM}iVay6-OwByQhF;nc0
z-|J_Bw7!!wB@bC~62s_!@+^W1xj&#$Jj<>>(J=4j*N(6sM9KHxm~{U*&)<J`Q~moV
zeg6p?+n>v)3!`8Bzw>q;hg@A<zYYxSLr}WPY6%pumM1O>MJiARQ8vVUk*{9^A<U9b
zKQgS)%YrmcL0))rLBaM(8jawoWsfwD$Bku~GHiXU(9pAI&l-B4JbOljw>y!HIz%cp
z{Qz9(&1`E(z(fESN~#<h7<jvLgMA6w>#9G0x-$=$kHrf)Py8_oR<~-ttj1ta+$kI8
zkex$`I{Tpm3wpcnSKou2oSbY(<w4^L9*UD*ywE`Ir6>H}q;<KND5a@x-Fg{?F~h^d
z&uz>Czk2JoZN!TgFD}0Gzmx6Z&-)62w9SSDnQZ934lf5s^;^fwqoL@o|NM7uJbd3D
zj1>p3>zcCu22D-P%P5o8<iqk$ck94nZlsgR`w8Rrq2>BK+BZ>HTxRosI0WD)B$)fU
z9^_|Rw+A-yBoN$I9pk-~xfeZb&kRthJZ;Zid4T#FFzkS~5T%et$YMfMy8fC(nIqq?
z{-;gWzMHqIsYPmb``C^k(gU?`j9Z~RmNftPmlN>1yK(={TVrGUT!=F@T{{9Kgvp^p
zF*RSbC+qZ+@86eVEhppW2LdXQ3uV4qb(ECsXhtOG(9i(_dfU98-xiUL*|4i%07gSm
z91*<I9q!AIc8L!adMB<%?ZU0Bj~+dW#sTbjy!<t6X)Yaw8aJb(QxvjDq)n4kQz?js
z3jb;E)E@zv`RRO{%ReMMiqD6~FPEIX!otFfOiOEP>rP)^-$8We^yN|;B*_YI!eZnX
zLdY9Y^*hFv@`2$G;L^td!H>wCUQaKtkm>2^#fSUpRZ=j^VdLVBgN)+g?@W#@U(k|O
z{QUgMMMXL+UNad&G^}OU`sr0zpqlw0IBgc&^yw4ue;`ES%g>N4X4xBotHydG(VyN(
z2xeNz;>%u+mU1I|5Y)Xm=^8x}>#6~{Uzwbruj%RI;^Ok(FX@I3OaLg5su>*I&r&r-
zK4}LJs4l)mNkshf0TNm@!y3{{wKOg^uKT&UDv+_OO{xSYlE9)jX6^&I1zQ;mC+Nhy
zbJk0N*}1tgH1RY5-2uc(z_TRyKMrfU0LfFQ-{^{)e!Kt5R|W(cgr#QWQmO3Jyo%W;
zeO4xlwZFeVgrv8dA@rBKR9wn3acpenXnyEUzV&N&dU<(yPqz@tpbJwDThLfK5LY{~
zaO88EK%-1X#S3P=0Lh2R+1#$2f)NIoEul?CP@W^-Y)iIxD?MDRNR%$G3y&9QnnLYC
zt!f~*@W^#vF>(X=DQHjzB-ErRNLw>ez9Ty7aZ5UwMU}!2WWi*uYn>5Yzc!@%_N`lc
zR#zC~L{mGn?eq`lpF5?gqSD>!KXkP7*7%eG@bh-SO0>K*L~6bH$tiOn2>UZ_igi3y
z9DqDTbXv7_NNc{Qvp}oKs+6L@*F(@Vm6hu^I1V22(NQH9UmLO9?7AhQXch2qc91W)
z@;4iq$^JVBFixnUv;f02o$7q*)NdkcXONpeP*qM*y7;(M2vu8<<I$jYQwVUSC-Zi#
zh0ohae)en|zU&T^VIbjFDp)3MB|hn}nB4nMIy)aA)I0=UPb5)7>s@7Kz42>-5T--A
zKBQD=ntMYhdu}vXuY!M)H_PkmR0UgbZrDX`<v4rUreYYfiR+~VU8a8`eCR3*F^_%@
z?SODb)+B1uTVQHppo11j7(`>63eD3}{^7g+Ns)pdZ|raAxNW|YE%-e|ZdX5wd;-a8
ztWd}c$u)htpy@14N)LD6W#pWwECoVG|HO$Cn%j@Tatr*y%g)tZ!i-0Aw6|{E`rynU
z5>QA4sSy@k%gzOsN?2$5apWEMVU9A<?*4?~Tto!1^qo-^%I@~BH9;XQAS6h)twD2l
zL4NH1!Ete)FE>1hClib|QIkmF$$vuJjZ_&%^MPj9EOy<owzz=y1osayT@@#0JbUFd
z*y)B(ZP_w-HWMrwqOuLE`vHtY8H`FcvzUeC9bR$BZyrT$XjOdNN12s23up77KO)j~
zdGzip^~QUyNUkoX`4$T<lm*gxTBr*!A&7@LuE_j5;FcF^7V{Lg()Ug{R&%s5D?pWd
z4toG2M@L;|gLUU}b-7`VRJ&!<a4EN9)rcC0Q8`->>W<e1%|Hjze01jrjLT551xo1!
z#(!bBb73=s#$4z$kL9CE>g3Yr>s_Eb`u$QN`=H&7g}1W3^X9AEbx|G0UaNzJBf!@`
zK%(kcyK;aZ{{Mc(^&B~JWG5t-4H8*7Y4fyB2?)f0h#$MM0)sk10pGTlK!mXU8WerK
zT?hfJkdYBc7N98o1tkE-n|RqJH_CEgzqLM<<K`AR1;+;2|AmDGxJ^jVU&~Uee7e-S
zWPQ?YoiX2<b)j1<LA1H--rsvK>FDnI-P|nU+r@iR=Yg|+Rf8c>COA?wH-h&4oFiCy
zeXZ9y5K7s^)6(hLWOe@+A<!<RP;66+)lpgthErT6=pJxqAl>PJNaRKB9;77&XyWVB
z9zAlweWk#L=JcxydDt=6?F3mQ6X&L~0`DM&AE&)c;oDxja*2k{Fg($nw_#;Wpop<5
zUu<*iua^NpFpCu|!*r_}?gsGH4BxlG<mLi<3F>_l`_NsOBUn;O%87;vk;un?ZMI*(
zn?N88rdF_ymsh=!T8fi>-@AoPms#;Y;Sr?j(56)VptH~#C{<8i&0&uynPCouCS!t8
zdm)pfM{nmBf<_NU7SZS+MlQ4o^<_pl?c6grd-dH6#tnP#otPVO=|Gd2SX##C7ou5x
z<WWc_%OPmv3bXj-4m~(y-}hl5o{aKv@nw`CZuIyr%O8Ku6?U3b*{}CdU<&xh27YUd
zcWClTDOEMKG^cTdBgN|fB<g?>NmHP{l}<8jEMJUsLrLLpU@b^;4<DCqvLD^Ed-v|a
z*RBd9NdqiX7-YZPBKBoJ<`|KKkQgf+QrrHp9{llQn#=uWR%Fr#QpKXU{0|rT&7><`
z24q?H@ncMWsYZSOHGX?#@#$JOROHv_#=3tQj^&SW&B@hO!lQZNS=$*A{*y{#VCPl(
zXs93)PjP<x_n!{dz7SF-zs@Qw)RMQ#-|FduSaf`ssK(jjxHr2oekfgk@OABi5VZA!
zWm?C+%q3DX(4P4cMS7Q!nYjj30VpCs33ia{4S@XX*S+|$@K-BY@O(QA%Or1fga*E(
zcL3GnaqB59qR@&F?}L)E8_Sz@d(`+YBK7LF6#av50OGF^#$s3L&b8E<#Xg5I^SJ7W
zp{!yZywCjnJn|wuDRRU=Beu2-U9(%~u+mHvs^{?LO>J%4Wsga6h_D{1hro>396&pa
zIClgaO1>?JQ66;wvvYWZZlDh5<akpMvS4gP14_l|M*X00y;r9UD~3{UpV^NG4A~~6
z|J%mFfwUyZ<T*x#L)LILX<p@-%A>}^O(@?=WjT(o(nG~2cx%zuNrrJHxbj!C^p{dB
zi$=+SMaQG<CEdycv5c6l!hT@INZ(#bLZ%Qx(<pU<&w&{+Y`Eh0*kfn+k<pS&FT;~T
z8tDLk@IElh%&@VF{18&Atc{J0$>B|hSNu-k;>AW{iD;H|LoezmjgNxFs<nVD&0@{*
zcz%?1q^3Mw+uY&Za}~E*unEn}bX=Sz3SY6VxJ!`E1BMX>X5*?KLf3JB(mN5M^Cq&X
zzpr15igEC)n7K0lqeqY6H$w%lD;I>?vI6IaaH}mKaIvUe{x?1esE9n6-3FWd-GY8_
zhc>JaWU1G-kF2sd=DvH-@gT<Fq?6NrtAmiXL$C2FipnR6fN($%s0)D7yV8}`FwtUD
z2&Ozc^zmO}h`vvCIt!H?;wT$FKLH;4wEsq_j(%i4^AqTP5@0G#tgRDk46A0I0l0w?
zSllRAVeqWu&=Gia+YR4^{ohOjmy5#6y_3_^M5qIX%w{9iP)QDHI4>K}fG7tJZNpfS
zwHLS=Cr_U?v^t29qz@G@41M#wx0LCe3!9M*WoQjXRWmt(8y#pP?JQuf(b(8%2Mu3Q
zN<>hLhu#I$4EOuh7Ya57$NwCQQxY0mK-Sm|8dnptRD{G$S3%9oZ*cHPl|rx_A#23;
zx0kaH!as+r8jvhMtP<(n71jfpV3y-3(TUe0t`D3>PPw?C#A~k2n>P;_4s4Q><A$=o
zy;dDaajOPEG&VUaOVLvU4zxL!YFy<ULDoL|^&5iN<|9u4IUs!YADkBaSYt85BNI_m
zQ{x6@%nuY?A#|IZn!3?51qFJzEwP)3T#yVx-P``H0P1;im4e4Ez(lgro=Dxq{P*1i
zD=7Cwn4M8WWgI-8$$}CQV2A4(8gAwnQUhoO5L!`r^d9VY(#jnXO)xiCA9-JAml8?C
zZfDF9$TgGHP!!Q=^FX)TwzLenP;LT0z=QIXdGcc2`u9yuf+(N2q1R|@!reIJ{R0t^
zdL|EhIvemIWTFZpoY_JGgo%(YsZwrN(5|hA=n!btZw9bESfh|R0a=@6;Kgc2aldB?
z!KRgRRTKaw4lCoz=clV(15`X&tER9w>-#pt|0SZPaA?R~s6GT29fK8BKIFYiw4*cU
z#DQig9|Sw#qgN(%FEKF@XB6pOEk&6V6<+1O4Ypl)ssJ`D&J3osG))^Pm-lO%VK#%p
z3$kCzk!5{O-`&SM+0dEBYr>f*eO@&6sG)Z=44L4*#&QzOz3au|c*{8VWST<~AA;BI
zE!rU5khl*sz06cqJx(y!?S~WlOweGqxk4v~b;A9ZTb?zj>#td~TKmOS^$=7(QT1xR
zU?g7-cj!>+nG5B0K?A5S0d7$z5d^Yaj^EV>!8*UL^jM2-@OYWTf)d^bWwpUxvsMXZ
zXZ*NIL~)RCL@opzfQ!ENn1d!FEX*Zv(`_Tb-TS`?r<Or|*-lUsgJ;p%_h+^&o(G3u
zQ^Sww1JIm0TrV8Bt4GlE<T#_BZyx3tn@0<>udU%XG%@Ucdd>5t#9VWQnX3P5E=(L`
zkMX0-15%}k+<JRRRPIb4k^|2X=DQlTH&h4Do69JxOX*D9K%;Nb;>fJ|>HWzNbO-!J
zsssT#fFBzg89{lW$I>%1A-Bs1Tu5`(dEgSvq6M1}rt~bkI+crcRQh<q_~Wr=-QW-4
zrIQQuc$`6fBbSt-hvawZs?u|(Goi4?(5eF}6l<}DCa00ckA4o`H_j*t`?t~|Z_2qa
zy<Z_lj+}!4Sd9iy{%#KdOr?;O`bq(v!O|+zN@3K68PY=({pFuvii*SFmN%X}b!wlL
z`w$g^-_|}pKIBw`MJ?T4WeEwp<nc8UI&iCy^;cJ4AC;c~aMc8lkIpaMGzBLCB_O=Z
zNKan{z9>uWb^j!(>43eIFRe`U?haEf6G}CQLrqRi1)YJfm*U_kzkXRpr#L<b6e{AD
z@)NFIyJkxBg)&yK+5D3xt32G9hP%KiKOgY~ia|}CSx>UWP_x#n$_{GP4#1P_MQqbx
zstqF(QocgaeAhcdNf42LAe)tzMrbYN21<vekQ!n4y8uvC4#tD^5Jy-rzmSEpB@3wD
zSM@1F#~^2AkSpsZtrmwSJb~V=EkGO$eBe(6O^K*LNP7jB{Yh8X!0qyOnv^c)$B!Q$
zo&gsb9JbCp_VwM_3x`qVHMw+PWJFvb+^zqP7ZKQmhUy5EY$=O83k1?LdOSoQa#HHT
z1`2D;I&{s~77s!80p!m>JyHY}L0qijcXP&iaHSB69SzKPgvR7TvqR)d?F3yh;u<E;
z;McFKIALU5drKpfVvLUiaJUMYj&N4^!ImzZSJwwqa=z*bFm>OsWUvUnj_<)j<TfS4
zgui(5fa$wALQc0zByF1+=0hk8)0sT{>F`40h8XIG4nh|)Ss@&g6b|YP(Z<SUE8)zD
zqY9t=+$+f|9ad^UzF-LC@T8n^LK^_}`h4Ih=jw1A`ULZyEwy1f;y^06@cqq@P9dgG
z3Azd{7u3?2wd+Pr)#>xRd?`U}g<<z`dI(*b$S=PWpS#J)c2!EmuZY-y6}N$$N+ZHX
z#ek223$;uQ#J7OMOV?e~Wn2z!&TG+DSMUW<V$$tAEH9X!b&xZPl>B)Gq5)JTNI^RE
z@%ht-AKULf4>wa1;ax1nLh<!kI9ly4%8ncKLIYSd9!S+$6!@*whEpWOLc<lOJh4qX
z8Wcv*+r^Zg9d?k%M1=Z3X-^-}j`ulc32ne(K|Qeu)SoEJ*a3DRV5}j07|5syOjyZh
zxM7zh2WNTm9C$rMSkrUo^GFzG#oZ97wRmtQFXce2W37E*lSq=@fddBw-tg*g;8+dO
z{weWwRA*K>3YsH)n>^tDY))()mG+8LLR96LL;lUd1)(f&F(|;bAP!$S2@G1-MNaX!
z_XNb=M=hOMRDl6EPlE0(JCg5g+HnsHBIIbt88rn>L<o{x1asJTH0{t0dH^_Hns^-9
z9TW(44fIZ!@e%?$VzftssV)lT+;c7Q53LHeeS+Q>u+n3{3N|z~p*#@zyt@Dc<~K+e
zF=4W97tEJ=W9<ORIjiy@$Bh_luq&5;{d*9El|l*CxTFEx&DI5>NUZQ<BwFn9=SMyX
zA;im4ng7k=ZBP1T!#x-Yr=>OB>_ECLuKdOhO5t5YI1P7W{PU<qb2UQSlw^o{<!qr?
zjN3M4tv_@s>6#x-uiU!}7<ApCmjFGys+<!yr92C)`E%sa<6riJ9xp{3#`@IZ<$QXA
z0pyg5h{M=rRNYdu4nf;IsE*66RcsgyWK=;G;`V}(v9BW|It1_X&nj`%>xn8aSXQ_d
z_$0#otphI11S50v`nayOV;Y@^o<{JoTkU@qtMZbIs86>i#igq>7`*4zq}%y`&PE@(
z`pdC|J_>mUF`JLZ1alb@O7seAfT>mvS*UP;rVn;ggN-dyiAJz<ERfrQ5<XS^QTPX*
zKDX&c_tOfuOZKKtbA<Gmn3z#CNLL{X_6@NlkdT#zI?|XhmQLco(AV8jd)u9u6Y4Mr
zYPz+vGbv!pGthNNT!`TI1?&k~;GCMAybRLq_-bW8mts2DQ8Zo#9XMcH_YyWeFl*BV
zN5l@IOhDAnNf8aICa2)@N^nc@1INXd8)UeFlB!V2)yi1gbWj@iFm@<Q8BD<@WQWC6
z9v!CD#+OQU2eiEKNYjR8-LY?}FA*xt`u?W2TWSQvQH4^r_gMF0+^2Fm&&1aEBqm0H
zm3CNVxeN-h#nq#AE922k5R;0AltGvi{~KyeaQDm7{la(PjMNN5T_iB7+$?zB0ZdLQ
ztou$-3#=^DlqGp)y`0U%%)r2a{?4N4cc|8=kJnoKaMhna+ynTpQh!>zAn4Tk_(C{g
zZcy`1kYq*MESCA1DB1?AjY<<Mk#7J)Emontx+%1qGM+!bF-r68tA@hPAukBL!5R1<
z1h0!b`aik|Z0aZ{I5^fOK;skS@g;+Ud<SfH(2J$A;D1r>tmj-$U4Ed@4|jwuZ4>J?
z=%4@7<GcS}mZh7%d3QOp&icjw4`}}szWcvmcb8P%kFEXxxdlQ0c3IHE{J)b(fgW}r
ccNdehvpab=+jvbadi;I65AMp`Y5Ujz0&M;`WB>pF

literal 0
HcmV?d00001

diff --git a/external/tbb/rfcs/experimental/parallel_phase_for_task_arena/parallel_phase_state_initial.png b/external/tbb/rfcs/experimental/parallel_phase_for_task_arena/parallel_phase_state_initial.png
new file mode 100644
index 0000000000000000000000000000000000000000..29952ba2ea97a4c9cb5e76b89cb36a048b97991d
GIT binary patch
literal 169595
zcmeFZXH=7E*EY<I!*GwNjDmm^qoP!$_m*K4QE4I~C{;iK>Ai-a+@N#;=}kdVkRnAo
z1f;}J1*Ay{5UP~W1Ejs@700>b{XFYk-;eLd_pLS8TCNyeCg*jYdmsBaj=e9!uIp$V
zKFD>Dfq~)h)hm~7FfjZs%E0go<G+3dKe4b^<pM81x!=(ElcA`aXA!*l#YRnAje(&g
zhM9Di5xoD+<;rb$28LrE(4U_s?!$Z-7^ttVUQ)a1W41j0n@@%}Vv>lBwZ58YeS1TA
zwDcTa$I|8;f79tBzd45fY^V8i$e$f-|8i&ADEIg>ae6$|=KjHq>ZBvrCv}?pe(wMI
zwk_Afu`3_qeo1GvDJk=bKW98~&$!~;?Ljw>9=!>MFh`8vxslSXy@l9-i7d9o^vz5Z
zi3h%i)XfzW0IU1qx*>Rl^2-lDVPN2tocj5{esoIapC5hOl7DvMduaT>x)blU%yryO
zFj)M#KU41<-q7IS2BI=juCjiwNbo|DR`mBTWnc)3z4esz+kf8E{w8ky0ZKgj>yHQj
z{OH?${Ie6^<Kmy4_-7~n!3kOn{F4g*q{2U`@c*S$NNGr)kz{E6_ZG$<%Z5OV%=~Ne
zbNIoCoLoO&Yd2@9x9sYRFNH8RW_i`KBV+hy4YsOPFQ`51*>&Z@`66=~2Di0uCiZk|
zOOiL|5)b!|`=8l48R)7tF_Bd4O{we3GdrrTehy=E<_OF_x}y7HwdUUD`}I0%?d0sJ
zV&1!%SLg?G^MxO*R*1MO=!xO}8lf70#rVbHK2%$N;<h<HMc>`Npz4eqV$pRcVk4%S
zRL#XQe@Ncn$$!(d8Y_~3Ir=@H7#PI+{>{t~^qX!KgU|b~LhmIi_aD8<C=t$Yx6jV?
zQ>Wfvd(rM33IALnRk3=TLu_@w>Gr62U`ML%rMqf+Zd=!wqNQ6{WXFz<G)!2#`RRAu
zZ_VE~4@+PUR1oIZ?a<blxI`)4=^nIIUbA)>C&!Pikk=K+^{H?q$56dcVz())zWclw
z>;k8juCt*uuMupNpmHLrn!vZ>pCd+){o-_cbA7Bj^%+n7jeg4Z`tF<(ld|Dn7bU{J
zD17$4z13p+Q2m)(E{c1HseA5QCjAFo>z1xas?_F-Y}h-ff9^I(P||R>)EU@FzIih>
zV5gJU$=@!@ag=OC<y!ixkQwmnWCFPTzb^}q-#8c;STkLIx-OY_=BthAQO!A%<C``n
zsSbUx+j~*#X<k&p%;5k-9_266`DxQ|xBg0^TzS^D&8EYyLwvBP2?t$Ch1)Az2CnNL
z%)^);6f5OKtrb@g)*{x)hs~diKhEqR2den%Du@{e=$qW2&Lx}O_P$*5=;4eUVg3LM
z@s3=~SI6Ct+JxEefxH~f9(;iKsyWs0wThvkX#KfcV*VOhqM4~$p>vnKjSEIeQ9ij-
zN;wTv)K@ZIzD`l58OByghqyjm;X}2_;sfPRV&lxMqHMNHm?9DM1Y5l3`<e3><=rc@
zT*+r?>r=45;rL0H4^_R7DI~Pu(ohNy(pvjNnK!6ismv4HhUfRT1wXR!_iqh4?)#B;
zLyFZaise!wqf@^gUvJY?Wh;A|INOc;=oE^r@HRy@K7a2>c+<iUqAOqI0j{k>_1I>v
zx%8Qs(SVmz4QPtLN4k8v)@7Z0fl-BZGKpRFbIU~~j#xjtC{ORR`WD%&K*fK*f_go@
zybgnRk!t$<J<;c6471)J9`N0hZ#3w@9>>@06lWK_6i&%hnQa}YjuCKPEzZ2bjW;8v
z_;mH9X`H?DGzpbaTsv8Ld6`&$hhjk5Oq)i!ub8WAZ*LrpVV}8BR4qK=Po_rS+cZPo
zf(iJZi*I*_nfs>Q8lcwt^mrn9-%H(!8s5&!Xpo!;>_WT8pzSc$GdFcI2avGLZJCPY
z46=PeoisA-GR5_$?~4Ynb#X4>ZKHy?``2tAVybTXwvU?HU01ioc~Nlsq(RTDF4NZ`
zu_vaqC-!`r&P7ZdW8|xIRe@coy4PjiVxJgkVmsxr!99ho+1I@+{ndqkqjH^t+;<Pf
zf$~_y&&}NftLQ8+VMA@C!oxp2x{8@0$(6a?U6t5a7Zg+REI2^77ET3P0L*{vSbx+z
z{3I~9=+1iDdZ+=_kc~rIho29h${eU9%-{3Tlq;nRC#J#tAU{!q-+f2+WpVw&0W!fr
zO-)Zy!GELok%6aN^aJ@9frGOpZcSoY1M<zb{t9N-@0et2(S2V~?<o`T)+JQOqf*_y
zBXoFV!+}b~8Lvj#R8ZZQZGHKV@Q$89R9C)eM>C5SQ4<6|rjuXWa15b@%qmGLHg$UB
zD`?8t%EZ&!LZwg-<INWj--|d$eRwqG`~>!(eA0GRu^79f>pIUzRcP2-gVj%ym2?A?
z&4%}`dwB6`H~6_EU1$&zeN!(=DAS+@%m%aXjmkf>RfAv#Ha1M%U0zm9)an^~FM{Q0
zofm)Unq8~nO-8y#jVBmeVZ(TtHtf$6s+KfM+Jre8%G<itT<C2U{%|exRO%9p!GdS+
zZw;(<_I<x$t5VTkhrW}o6JD98izzEg<*`{Lxp35y8XLN>d@_K~$JfsDJP5cVv-Qkm
zN#Dzoyhed#dr2@KB+rWcQzb5netFE;){3C;d7Wr8AsB3TgD}A%GFKSIEk-4)$+<g^
z)`|`~*UNd8E0e>uaeMfz7$y@$Q>|4~q-M7*AJy>WeoU{MwSRtNb4TD_DK;X(lj`*8
zQ}dKn*Lq`FRs^`QA^$b(I!8Css*dsj3Da-in0J^w^{1-EIsv|0FF#gcZ&Y~>&nGvY
zR4b+#mt)wj!6Cb{f7hgB#__;q=8d8GyijK}fQJ*ND(Lt{O<@4}<>7m-T_O0W5rd9y
z!JV~FWmz$=xf@uanh<BUvX$Tp>P7m-`tZcaejk@oy1A9H`5h}$$LgL#0a=Mjw_3AF
zT*j2lu@!Do!0hbMFjmFKzPtk8!Fw1P_0xRT=tO|wGj>CMjsJvK;}sE-(O(_}CIXp7
zv}NVfx|DFQ442L5Od820l0@o@op)dFQbMV`EO5f?aQV{IFk&G@zOO{guhf)mE|t8R
z**!c|BO@z|s6^ttwFmkHdCnfWe*Jnf@r%Q9r*kRnAy&ii0=0{R_Z8kVEXTLk&mUko
zpw0{`wL}BCMPNGYg15RoG1GeAeQ(rjYnL)yx1>QX3B9e)!BQjCP_|?wUFmQI!M$W-
zdUB|U)cBk*pCcA<u3@vqe6EPFI@X&)E;yjUZHbG<?=by5r)8{a@#Hk>H{|_+X`j3E
z7n_e@P2Q7CU#qYHII^19iqP>l-AG%9Vcl#<o2*nmt{qkO`jN~TDR>ebySGUobu;A@
zlnZ-jvLE&t-QediY;#wFamKo+siwQ!b&9Gd`8cRnNmRD2b`_SO!X9T)Z#YGf7v}BH
zd;51^3XGb)$i(eE1{-m3?#!$?dyrY+T$ajvQV+f><Lz9cO-s1NqdWD>ysr<p{^t-F
zngu|LYx#U&6nC9%W^~UjT)>jZ&P(tUOO<4OD*soUK=fJjSTpAe5wDXz{HaHjc{}C{
zqq5axZzUZ!Y?F$jDxXQqXFABic3dm`)#l)#suQX(C!fhhRCEsSp5belQJ_1qqCQ65
zRd3`uH)WGR&_7IgRTFhCUU+(Lh)hT}Q9kGGvH!;hLgv25s`A7r>=9=^Nx}XLssUbb
zUCC<TROP)}<vfm&7af({H5REyP6(QaKLuo@ick{M>aNtlF<zg6+1lEe7lO%s#1cUE
z9`P9k7`PB4IdhS<IRTZmVZV$i^hT4HsKU3cdSX6tEk$Qs5GyRX=WdRLJ>&eSX}@f)
zarPraI`T&rahN0-0X7O}1bD%^Hw)#lk6VXIuNTQelJ~Yh3yM?Mq2B&eSKomC1FHuk
z%VV$lo!eo*9dKOjb`C`m(MTR$XX?&VISPFLgJB$TZ7XeeGi}&L+mt7z^OG~~O9CE`
zy$=6Gjz=BgPF;m<cp~3>icu~q_pfEB^^Alt7sWj4%sX&2XVDf-*_~@f{$6`W_K?EQ
z>obG?)5E9cg^F|iT7z7Jr3M0AtO90VP{DGll?d*}Zt<}!j4LX2LLf?_X-ww**YGcI
z+6zlM1&bx<4nFw_?RGDZ#2c?hBMOcAsMjb5^3ptg^R>x*Q&*_>cd2Y$7r1kZofpzN
z{QYXDM{-GTM_B4&1HU}`GKPLJ-nP+~Z={O<BFJgMhX@QN;nJ8`E~V$eR0*x}V-5a|
z?iE#Y`JYdRmV<gz3#(T-Qn|vlweBIjw^?pC6!WW!u2k;eyiWgKSrhfOF&<M`av?aB
zhkdJ9g33k@(|ldjLKZ-A+c(l$H;bpSNxVM#2;aqW_l*Z@d$vs~F@e%Y-mi4?zCx;#
z+7L@j<MOIGZc|U4ajzl*W%!S4>qP4$qL8Rs3R2zcso@wboJ1h?hKe28SApmooAtr?
zoL-qR+oq1dnw8asud10m8DBcv)#qnQl5bJDMz^*XR=9Tq5|VCZmC65$ZvP@}XvNs3
z>BY{Rnp~Q$P}&I_|Ki=S)ru<bab#F?b0quBiVDfngOGkDTE`J=+G$4~G2!#k5p&qz
z84uK53+#Wm?fTLR|4w!@tG%LrDf>NQ5^t=87`W}rNKNYQM^C#D*RmOXS27A+-#FTA
zZD&x3T5mbO_;N9Cs68Hwx&}VAeP)bHDdy23x^=lUK+O{dd1jzHR*?p~51;Aee?%zz
zr{!-B&5y=V)ysLtRhPTg#FUh;JimL#*Krk>f^EC!UK|zPw^*(Dn(91Qzq|c$XPaMx
z&)%vZrEb2ng{>`hxTSR=Eu+>e$9uv|Q5P0-U~g0UV;f1zb9t9ChK}7cvud5Hm|Ixo
zl~0c~x0*M8N>8G?nZE56<{{tV15V0fDK`Vz%NUPh5&QkU9+QhlM-OFrms?STiv7%u
zjM7aMr6T6*WF=Gj;hrkJ<Lpe)M*>hsG;j^u!IydO-xLiWOVEnGJdq<7DC4!2_1Z!5
zL<8Rnk*Usf?^LsG8|P)sj@W>)sV#!Ot5X#HD)@jtVqlm&zliY?Nb0T^s2JlFTP0DR
zIED6fJpSeK4N&9`gfgeHIPt8Hu0<TFlw;vi=Ui4if}S&lhi@C>qa4hgB~P3{>y{tk
zOqMr~dL;w(r@mjTVKk!nOPM3S#%E>^#k=0M#&?05Pkq&T9MhY(qEc@6>0P7C)|OZ6
zi;9fiB!8uh6oZH}@&4S0AAj*?*)8jT0C)Ad*&z1)1Hr4f1SDk`w8WXB9boUfD33?I
zTDuc%bcqebPt4WDie*`*O62K}hc?PRd#1E=8h%3IF4?aNXHjeb9A6Wqzj-Y!+7U!1
zL$~d%x{-xTW1;p6VNshc=p4Dx_<-%k`?m%)tR<nfI*!xy@WPm&NM5&T*TZ7^Hddog
z;v#op(#S6i^11;V6LJ}w+Qp5-hGutorCy7MD-3YdS;qST^<-0LhnV{uqNiwg&CR29
zE|`0|NJG`Hjhm=D&nJga0!lkRC%zCQ*zP*Bc?4~5(<T5*wj3F=cO&5Q()=})cF<&9
za`DF_n-s3jFA1<GfSl;~XF_OHMh(zh?P0~tbRuSQiEi`xXB8AjYPzsKizZQPj&&}S
z!>+hl6fA@>J`RIXMPRjiGp1!<8JOKUE+xW&PPY>=bM3Z&U97xfH92tq*4&_xtNLnR
zUXQ_MQ<N(qr;?B*Wno#p(&arH2*3FwYk^b^zw*@2lQ(k{yTWHT2QQPCMXYWOWd9U=
zfKR<@G6B-NZ_<26PB`CzC#ia3wLdUkyg7nuD~bx)lacjY4{CZCd&Y!;H3<rs?^k3|
z35p2F{^WU#^A0Lty|~S}eyVK!AvcN(5RX63C;MV<hq1eqZp3|k(z)PdJ-^&uT++dg
zWyAY6o1+U+qyeMajlnUlTIp*MoA#a6bfFovnE-v$A3Br-ES9Q?<Q_67y+}5FFD)sn
zm*w6X-<}cTYCTdngeFex&Q_hSYy+}E{qi$<5N<mRwIeP56iK;x)Y*J9%%>v($pduU
zmE1_i*>ga!$yR3JL7`2QfyGpU&Ad0#Io6^;XLkjyUxtz|`5m-pmBo8L=aW5C43V&4
zKfl^I&Gcencj!MOk9tap^%P1_f1%qM23&$E*qFwD-vl8hSG?EpCeMsL<#fZ(B!IQH
zP9wi78E5kL`P&dmW|Um`6>E-Yn6Ek(D19k`6I_?gd&&xdU*i-wj&`?q*n8T1N}y&m
zXU`&BW-!6rs+(?w4C#*l(-2A)bh<+pDDha8vDp${+cTtK%ZVB#o&??LKb8h<SB8_)
zj*#;{U$9q&7Ou3yze>8iQhRdGcI&=>+*L(b_2Q`BO`~+442SXDVswo8?j38QUp!`b
ztHFHV@}}YEOxg3UleQO07R?-Ilsbv_Req)8C4{xyo5-Yq|A$cxY$pY-n#v*y&PbN9
zZBs|{3@Y0Kd5AF%Q2-WisEdG`H@`$K=+GrfrLj0gf?8Zpo&Slo!_m1x<XVJCJm2>i
z1SkCRaDzX1Ymt82#NFV0%4Ut4+|7A8x#H0+mi0ZPuRm!io~r9GLcUV&wcLfcOkHu1
z2OI5em_=z2ZD-SP@Azb%fP9H1@c5}Q%o~K3x5*;;RH?<NqtuNVYGl`*%wU6@LHU2a
z5ELqJh=&CIHXo{~%EQR04)7;q!70L7ne=#lVbeUSD6`wT-ROpq5l_k(w^h$J2Nf--
z94zAnM58xgzos6L*Fg7ylL2QT(W)f~sGz#~V)@L%7R7ZOZE3!AznBzwgm-0FZnEC|
zwycN;b6e(@MUk93WYpmRw^hV4sx7lQExWjfi%xR~ZDv5ZBmTm~$orzT<N^3`Kd1Qv
zCB(^1*_&Bbd)h0#N!p+e-=EDM+q)^osVQpYf?#7~<JWk-1IT>5jO^MTeT;RpKq%b!
z@6wlZ`D)FKJ$N7S{STpE-5v2Sx~ezDU6iwdB#&MH?4^Y%E_u}1IQ59bOO*|1uo-&l
zA&(sy2aD3;R1ay@10I)xV*LS)3Jr5?Blp}1#N*MloZ9(IZXORj%ZfRrFEx$Cn_IPl
z$Y@cc+a`;;ceUU?lf~OL^W!vMd+!>#r!S}`^0<m_Z+WSA^oIV#cMR-cTR~m~Up(e4
zYxk?tF)r?9EgmQPXdQcc!qIk|h7BK*O(ZW6Tqhj|h@0HA?#_IU4@L^!oKNH38Di1K
zJ$&tEV>M|whkDRjn|(?@8GKJd!p(WrBcxMs7i(gWM0mMyyv+Sry1Z{3fusqz%leU`
znZCu@0|!#n%%uWtALJXhC;>lBqR`T5^<(bW7sH=+#bQ^MpmT8TGLW$O5)xZ-mz=(|
zvZ5oJVWuiB-Z!5QJY7=T5*3@Q`pT<i=!Y6B|84mTU!6J-Ji7@KZ$%!s!!(?5n;X7E
zZIBa?d_z{s+xp`6_4nQtZ51j@*~MaMS~@F+MY}o4k|T(KqKpLvaMI3~a6fm<)vHc4
z%&|(mcko*MxX1LL4G(fxqXD3Jw8ye8SQh4Gc(RmZ>pSzK4R7Ab4;IzQOt{Ui=$S|>
zq{Ov_wjm+10giCbaGjbkM4BJl6Vc>PXVw6ou=7(FwZN!>t>Tg?ay(FdrvAN5(-(^O
zY*+mg1%Ai`6B-lbe@52e`gPn0fqMlzam(R3h_LkuZVG>qiQncsIUCmADkNgH&M~5)
z;bD(4;6Uq{@3X>E^f{szME0emA?C4VLf&|VQY!cezKy)IO*J>EUQQGg6ug%EpZjBI
zthQtV{+{>?pqQU<TI+jmKl=hoQt-uS4!|6bqXM^)QEBD`4n0#<Ik^(wz?T8u<kvZG
zU-N<JB~|+qzVraMY=S2q0Mg>ew|QnK`*S-vuE>YXB}VmfjLa;2&KGgBU(Pmu%p>-u
zv#`Xx_Nx`y-r>%we-)K3Xe=E5y60T-5|A#F+5^6j9Tm7#({p*ev*S#>0(ovB`@=LO
zTzp0cs25b%I?TgbWs18H^{?;ntu*$A8dWaB&WsL$BNjvIKnLTkN~xgsj2LJ#DL)Rz
zpnqrYsaAxnA0M;~l`jxqNNDvhB5HMJHMCc&hVU|VJ46-cQ@yK+>%}>NgU1g{#O!TW
zpRa7&(0ghOYS7hHlPc^FE5>Zio=y6Rf&ZoM1Tk0Yi^Xq|Fnq(Rl%9V5a-?}7xiL0$
zxW?NQIAT!;3J*)<Jh=NzCl$)g)`EO>a#GJFpilJ-RK<j^y>-_Rpe~c<@qRNoy=f~~
z`4>SIaV9wLsAhPkHJpS8PTAYA{lsYx5tOt166H}#D)pu%m7e;`4kK%2*u5^yY(Vn!
zY>zum8+{6SMIW<r>>zl#e@j%+ack0F7ojLCJq|A*u0zI>lHoZ_FJ{n@(xy58AUP(?
zu=ao9T(s(xiZvnTCF|EumlMX{&Nj1+?i57eOwn#jj>etPQBH>^4Gw>9B`4{=zi(E!
zH`(?^IF0*wyl!QiY}<Iu#01rcfj<#4kXF5~-h;+ezF(2jAayN1u!;tS2~ZE>oon||
zmm!Pu1foZlVh^e+w#9#9Z6x`YgqWPdK<<O7M@=(UKUWs)MZC$o6WEqEtr6kUv^daH
zqa3JG+4k!`h0pOK4%NycJJAc%PL{nF=oA9@H=G7T-@h}*-d0QxOv8vDkzS?RDOb#P
zf6RPki(!!qJl#OpvdMls?<0A-kagT~z3VYmuwn(F<#GRz{TNF1<Y>CF6(5g@d<IN~
z@M?EL3Yp;_P%gmw{e!{lq{A^ty79l%$f90zz!H77wztp4#|};S%CGuu?fAGYsmPAR
zJSV-K#n!H(T0(P?O7`o&g|4E-0%W*$R3!3a$dEHa?1e`ImX8=bLqE0Ci1}7$mtaHW
zB%iI;;>$GaKa$k84+V$${sjIKXwMWs;oF*1mGjH{ci3z#IPukh-I(mfM*R=JTYauy
zQe}^6cnaOd@db0MG}KXZze(?GSE{bLD+Q3wGxUYCOp}IppMaWVSucc9Z!arWtsj5*
zupAhXddPQ^vGY{X8oy|P{w#ZV?*skqe?92VsD!vvz~=d14{fB)aTAJT5E>P;I<G7~
zSOAmXnS8dg?T&2Z$GwrdrK#PG1Naz?%#Om6)o9?}k^lSKh5O}>DS?^5ZmX<1g0@*6
z_ky7k!T=bcLza|C&FpfYYm&TUKy_OZ8w4zuGP5p?t_NebK12C_-%u<{YjtJdNVzO%
zi%rnlVsYIN$qRw#2__S}Zs9PtKJL0#TMTq@XI7vqXi^OzPrgnZO5bQu)dv)Fy0Leq
z1m$VWvog$~WGvf4;WO4a>lW+Xks34KJ@9g7!CGwD=MB~5FhOGd!FHKwj7U-g-@$_i
z<1v`kz%AWuxzPlks7OFha2sP>#-C7a!tslfTyFLScd_v$jy*BB;q{Bvm_<C*Ud#{q
z`KDNe*4)f3+(W)m++%Lk(^}JU%rAhuf>z<h{d&4nITQuhjQA9Y>erH>p^*&7O=mG4
z0`_m)=h9S);cgE+O7Tkr9Mq_&0~%b}Wke(DkoeBb#a}^FPy?7QZ!#rOaLcDGjGdsp
z$t!RN=VI)>buMj^0Q}S%f1NFJ)!y-wOwqEDM$d!dy9z*Zr@RfUi1oQv+UCU@P(;Pg
zT4A_Gvy@mefOA~zA{w+sGok*<f&X;wK%2;!rdR*^7x9{dad0}&r2RNl3yQEGt}ELA
z{OH?;{Ie6^1LL2a_-7}+@4)xhe`4aFo%p^3-(UZK7ZX9Qc`u(!5+pYJeyEH&G^Z`d
z_1?8!l99x$N;QFSSugi&3ca5veuq|fIXT)7+O)=nSE5UW@X_JfdlGri&)k1zax6s(
z@ip!04-YC>T%r9J`Qik&n{CtK<}u8|SPp~u#7lD=2Y+$DX3o*ds1J3T>lAN(O8Q}5
zyz!~^zFS-e*k_lCg|A=3b8~Zt>;1hCZGHBdsPiqc#>9Oj{h4R6l<B#?f~Fcn-Wf)u
ztH6X)&cx5SGtH}4grfBQkf2u`e#jSS^nF!XDaXalO$=t->j)MS6nrx9)=<OF&W`E|
z1_Vee!LTPeD@14l>1hOeokWqbr#%o(!WPg+e7{_{Xe=Y0qjbb!d8}G0H7zaY^=pC9
z4G*vGbcGU!ky6TTBk1_boE+VX`nYrWq{>GTQQ;VSQPN74N3U@Xa5A*$H{U0P=IL5Z
z6q(jqqN90Tr(43TB|QvHT-AAcPCju~B|V0Q6jCy)6$V70k)4)0I}zdmdUJ=N?h?dd
zf+Xy*4T#?1VNP@mOqYMLD+><4Lj;60i}<H?nF_{Z0h&LlbK0xTDfh__qF=-x(cc!)
z-4x6OHpkJ?QDW?M;q2^eiEVFovaI7Br0w(Sdl!}0I_I-zZLL<z78|^8+ZmXYP1l!{
zuC@VTuSGBH8Cc`LecokzdwXdanbxW1$MIMFUcGu%;xhFiS;qbrVDlWnHEIQ|-PRgy
zBut=2DQ@u-GyykczVQNRtyJO(Mhx5cO$V<QmPa9_GnsDh>>RT)TB)I_sVRB2xT;G2
z>({TAt7FvyjLc?*Ib|{@19sd?d<lHLLrL1X7rkfuj4iiIy)P}kY*$0_(|us04<9Wk
z6#7R-PDDjTl{jM?I9L1oKYaLL^v*)<^Wfl)`N?o#3gC#`t4|VhqN;N|hM-=1k+HA6
z$#s8(wd8-TkVKnank-oQJ7Nj%f*HXj;XF}Cu~pO4)3cULnUT8K-#>a>*Qr|RB<SjU
zZ1d>mUNltNoUXb%@Yr(h^ZuA#%@Td)xu|}-^Mb{dl_*{%uS@Rk?$p^SKLw-fH*Umf
zh2p`)jL$+!PwNgMMxz24O^<VdKO}1Gp>I-88rM_KJO4u>N9ulS>(n^Na@TsTe2rn>
z+S+Py$qEPIE5&}{4qLo{E|?4|wxjM>QS(sYR=gKL>q(P#=jPi}zy?YEXninFh<+<~
zL30A+*Bh`V7bt$?Cbky)a~c{{g@uLB057n=7rNybN6KZA$5JIt@$%Nx+)hGs-$IDz
z>gKVE(|sC48!zOqF<fqacz`MU#f#I?FkRFX^`3!&fu5lu$H2e<W@cH@qd+0BYMr?R
zfyKqHbny4T5CV<Tq4U)WMJD^vf+;r>f5@_K<hPrC6U@YN*~-eQ{Qdh@mn^r$q$CXl
z0@0Z)!6%ubC8^>KO*^uv5J%((dyj!BC26SlAZJ3FGP+r&c<{f@dy;gHcGpjA9UY?p
zLdgg0x`2o*FE581iTm#?OB_AFt8S{YvfeURi!15EMnVm%Z?_$lM1BoCLO#iAIl3GF
ztLwth+&3|C5=3NgU*EB2MEGqJ6Q0fao|rFRzDRJK_j!L2or-&LI4dR>u>_zh@v`1s
z*E+8eC0zJ9=ZNWS%nw;JNur(1AHo?K8NHuBv-uNNdA;5}fA{Vk{MI{*rbm>H`S^Kn
zRZbQ-wX%1xH%`&wx~YU%k@0quk-WbrXm$U1&U-XRGU)Uoi0}+0@5}D)n{*Lw@ppvJ
zClzJx>|#I%L$@+Oq!dvPz$dX2j6b1vEB?3pen^80o0pZ9m0(>~=x9nuvy4r5`kUh7
zn7Ft&Yd4CLi-*7R7JwgM_I%cRJe|D(P5I&8cLeesWDfsvmBZi8B?v<3FYn*NjXw4F
z$NOERblmSwKf%l)8d+LeYAs1oMr}6jQp&t9*$`qs6AV3D>#C;WMzfs;@5N&3>CrLL
z;2Y!*u8!B{<mCzJq|3)@^`!w={5&*-ekP=UCjJDKd%f203odpZ#ic73p!DsQMbnWN
z>nPdSFrj#xndo2WE%2Zc4H{<0^T@lL;^N|(-d)FG&erGW=f8RTHUdDJwPeY%0?Cr(
z(#&Bs^dc&DN65!j&lhC0scUOrrMg<K_>WnAn6^ez=ZlMvEr~lTy@P{^e(~gv_KprH
z5ASy-A5GEXPth^ab*vQ&tXstAlr3HPO7sG4h$>1Pi#l*|SLvN#i%yy=dMcV%iT&{5
z!>+q)Q(&kIl*-Qo1M1q^QC-``eZ3=GF?G8M!^0j(>oVwwMNM2TnpAECOH}*h6FKQ3
zTYjF#1o+?W?CjV&I7B8UCIYB!o}Qjgh9d(z)8xc}kr5~Kx^x~)%zl!}im5L&b|d)9
zrX10RZrZ)q8U2bG%f*=T!5Vtx^ZVtp^R3za$A3q+_yc=;tENYc<Rk@mU8i~hP>Z`3
zmQ_>tl_3`b>W+TaF+Txq2tClItI+n4^@^dPAynGE@DsfC_4OF(j7N_iB`bM5LHDkw
z7puJ~<mpk-#v&Vd+RQdkaDTt_ziO*Hee|S%iyqcLbaiz>IEr{J4@)dts7-V<J%U2}
zgNqDsznQYgCSYdi8n3vZSYfyfN1fcQ!Ew(2zF*n^F9Snc34m?@Fkx+NZ4{p-m#m+4
zvQ$+P&)+^qgYL+3fyxP1c;GtqlA*VT<cS(U9H#fdsIH6waI-N#w7!CRPeT|ct^+En
z7!-yrVXWW6(5TMG_2$i+!~a6Edw`q0$gRqe=B08B482<`dKijUD?n4p&)9W6C%&Hs
zcn#8{)l~6r0D>(Qj-!7?wUB;pOSXDMc1?|9ii@nwia896b<yBa9()Gy2K3j5%slK(
z<f;4rqpp0URX$FEXdZ=Q#+6P{02$83Z?(6#TTXolk+5nzRQwqk4e^M0V|*C8a_ofZ
zI4?Mhxh|vQ&UL%Z5;>(hjdaUn;MAj?@O*W^o9Cdg+%Yz`s?uG*rm2}zR3!S~!Gm9z
z+miWsi8x|UpeQh6mAx~|FdnvG?f_S+F4sEHf#n6g?;pWt?O)KmMfz(+MMWs@TqheJ
zf<$q3b?pT7YpyGegOSlJ3VEL9=lac+fw>&-Rl#xneJ~2;)11$O1}&pY{I~!*$Bm(x
zwuvs8i_6QA5c93|c0NQ9GQE5EE<{RD9LJBV^T%IRZ8jSGpG9>a6jd<x5P2fO^Jlt-
zKEq$n63vGd6%`FvyW1>J)GPV<`^VcULj2?#)N-7ckKuJ1Jq{o9(Qp`ryyScFi=Wtz
zv!m_VQ5SBB5u*e%|GTcHL&)98In>|J+SS!X#_s{(2BB$GZmaj~*)z}t^fo3GL_E$U
zJMgU7Vt8Nqr^4Sm+^U<JW<gJ<4#Z;EehkMZT0%$ajX22eERV1%c`ZL-70@}`zm=<-
zH32&>C?=-MA1Od9s)_#7ps04Lc=a)ff|31`L*{PAT5prnl-ld0=^TFs&Y*8gEC>9~
z*4CCY)<O+1iSuT4@-%W%auiXgG*%%3(Z=3#XT;X*L?0N#jUE#9w}FOVY5lbyP$Ko)
z=k<Z=JX+}-10W3?xUaA8`P-#u^WVOW|BV%s3&ww7PIY|IUga~<eJb0<MadlYhJoVj
zLj}=Vxu<?WoxjG#IbCKx#tzqb+Vd!Rolkjbc<UBBRH{x$-M<75J6G!xbkp(L<}q1L
zd$*vOfW=Q2Qrrzpkn4_mw`KXfXC&ym#@}bqLBOz&Ryals4h{mqEdzi{u}}l>ZShmF
z3m7ASDr!#kJuBKx1C=6@G{IABy2Gt^{ra;X_!AAjyTiJ>yD1h;fR@Ew_1m*(BJFKj
z0p_h|WR$EmWev5a1K+Jj%TIWo^%Tshu{0ZV!8n#!%)QckDs+WjA2eQ~=`j~}PfyR*
zot055{6u}8Tr{fS%^N|0+(hhV(v+6Rb~&1_2XQWQf|3Evmi50d2IC5@<N4Iz6Yfd5
zX{02D(xrCeziB;u7l_PW(%0Aj7T^8O>^&kt<|(+(wLD^E&VKpwY|4jE%L-eTq=jm+
z%kCX*3mx^Z^h|D^G%WTpG-=o!%6a#PGJP)c3qxEqNbea7I|Sa4+N-TqO39T2K@PDK
zOuT>qD`%z+H&y0j;Hq;@8PWD7S>RDhLIe$R!6O8h`3dxisCAwOK{=<=y4o^T{Ida{
zsHv%mv-6X>-}xkjnd35uB*}-d{S%<LHmrRsuC&uOt(pw2a++nba$EoW(fS86VUbNM
z)|__%07ZbJARkEbk-X~s^>ZGi-`*4ylpjsktDOG?YAcx0t}jgETY+=1aU`HqnUPAO
z##@8X6COWQe`T7K;XHle!Uc#n0$r-fzi4ptX3KPIL{5JGwRb^ft6{X~Mevc`MSOV&
zeg$*DPwd6^|M=W(bOMZB&>f9<AT6m6^~dsQ(CGY0l~liYLI;3dpf#mzy0!RSoXSC?
zJSLO)XWb_f`Qv?m5Z$IG)ZD5$FsdFO@jBdv?(-VuY5eZ#4P#?t2W*4Nk(0{FT74p-
zqS4UyLEL0KQmFQbQzTR7o&zYV(4*>-yr~f2j)xQ4^7py_TZ9L#{|S*XizkXoN>(6U
z{sM8J*FeQ@9jkWFdG{&QsjWz$0@PLCDNt8+X?3;#R?9XAQV<M3{RV!I#NSt=JdJd_
zgo1;G&KKel%?M$G>(_q=JRXniK{HPVd;$lI#jaI@5%t(Hu8$zRYuzwiC4M7HpwslD
zI*&X+3z^`B#l^kb@16q>BPBPUg}pOHN`U>m(eLNZox`woi$xKK&@6HjM=xlk-C#P@
zuK9NQON3Jt^8@TtV~&s?M1eevb|C4OWz!%%*#ex0?Ee|m^2q;dVHK53dGrGrOV_1=
zgwAQ0i0y+1;h@d{83^zz8<f^ut&}*ewwMdX6<b)19u<N~`q#yK6t7~FYDqv)p=lBQ
zws`u&OW^#zBd*(w_^|2hQtKZuSd8{vflUnvVs=T1L^KSZ2^hJe=Y#Wi$_0f*M9^Ki
z<ml*VpRakZrx#ymMGIv5oB{et=LFDCuQZd|zPz``?Js>37m5Mq`+Z5%6e1pUj=|$>
z_c!KqD=I3ebu(f;8A_G#ckh6yBPc4W(-8i`7HZ4>r;Nj8o`L5WfQXe(?5XAVcKT5+
zi4W5Dc?OUn2$KE+c0IkL5U?-yzZQt!H23!Q4#4|kBmD98az}U-J-|a@`WTI$1Gf#4
zG7}q#m6t%(m(<4Zj5<TR_p(8?Sk|uZWz|Nzh*ejrOo`w2S3$vdzJY>ZC~mq$8~Y?n
zmShFZH}$`Go8{?SV7k|otan?$;_ui5f0_S@Hoo$wlH1G`X<1p|(JZ}_LnS39wt?if
zn(Iu#SO<J$VqUFTD!L0im6bkCu_!Eg92*6A*GDkz>0!Ge5kjcPBYJyd!4UT!qSZ5T
zRojEcIk~y~+n(ufz|=Oa_(24Ukc|0Tng<#en1Ryr-+qKuEL2a$PrnC}9Ml5bWK%F;
zprBGgLa5q(KKkw9)xA@V9H`w^pWUg)d}-R1djY4mx3|~lk(Bv79OK?(iw1nZmlD)u
zD<mSaL_NV_=JUcw?ck5ZgE;>fJo7fa9|7lycyMdJTTM-pzF@W;`?e{7b1eg?2W%MB
z;F~wunAy)i@!gzLhmL_4mYSM6t)I1j6H*74H|=n*lFYa&v4Q?ngu+c0<+VS?T+zI}
zqoZkBm(ee;#!vT9mU~*5Z+!h~7X!NMtib=c|ILVl_==o~oAFJ<&MsaBFsuIeC7wv*
zldOMI4EDU2hmQhM)jaXU{QC8^G7GgpeWFhpknp?xaB{!A-`2u&!ocS|{hW%5otN5V
zND-i6NM)Kl)xneTNaUCgF6v@5JYZ4NJe-I}QJ+mc0?~i@>eZ`mTkgEPyyU6y7plL0
zU0TAiX6;^L<KPfr4gKmeTI91f($gAE)>Z%8PBN>7glD#S#PrpBKZ3~+l!`&Fg}?;$
zS{)mKo#zZQoa;d!1RAz&<<}ij8zrFp6wH@%VR0JTF8iUPDEp%7T=<NO@Saf%xDj}3
zhWCWRBqA#Y9xx{b28pC>8qNfYCyzR#R4N=s-1@dVkti|bUWeW-*|oME60#OarTDBh
zG2upRvUsKMuQ4Ilm|O=83^R6i-0njUKnA{>a-O!;&;&#qeiiI-#Cs7qXN3K&`IA!J
zbOTll>GmP8j;o@e-bZqeI8?xIt&ui+&_F?lk`5A!Wg#A0?RJlv6%rDH@gVKZ2*6K>
z)vbN7!xsk}nq;A_vEVZB0XDz{VBzHYh}8vgclW$Wm3ZKOf7Xu1S)FspB0yVDY9@)Q
z-~|6r4PSd-j3}h`7#ah65jvUR%-5uzPNbu1<2#VYG^~PL02|#zmNO>4vk4y<o23!g
zObhZ+5~YZd;n5lef>8&5mV$eRDSEnf4%Pyi_m->W5!u!^RByP>^@4Nw`?9beaRg}<
zsRS&(aP&$4^FZ9`RF@zGAtwMbmrY!n7$tl+W~>!eXD>1=4Hd&3%O|rVM8kCvU-iiZ
z^dC)+4E?*PJrfy0XwM<S2dZ89oj6BKA}>Df9@>@1d4!`>;QDii(_=3~{uH|YuTP1i
zW>t=hAveDC&F)l)UH_Ny?e@Mn&7e}#gQu0wdRa~nm*CVBXAqV5G~(Vb4Wy)hI-iI;
zfvIpnsQPW$c6*<<lXjo$v@O6AkiF{bLrC(_NMCT%nCFn`$j`yJgt4~Z@e23(?yhQ+
zQ$lxlVN@KFXHzzCt5?IlCh}0x%Qt6=Ztq6>Y<gxzrpQEOpX%v*7@EO?PC|MaE0<Ha
zdxwx)mh|?^WQ#ted($O=%80*kez?lj%EQa+h++^@xh)0;(@Z>%IkFVPt0b%4V*)2H
z>f(r4YT(w+PA<m%f@zI3WlNVT&99T5tZ&yO1sE&ti+ynvFpi~tiy(tmU%%fKdmq>)
z!HNGmixq*{WFfpr`^D7#=Sd~?^(rc@E-BJQs!sJ^VbjMs0#CIi=yF|g!&cV#eVLxO
zr^+;V3@PRK_Jlt~T&bp4GU*QCP^$G$fT~yecB<I4Ru%~3xZJ(Gf`ZP(<LOAso}Q^`
z#?VvBBEOK|Zo6TFq^+Hr<R>bHfP%M0o`~n)tDXww25uE;=#xNJfZHd@NAsg~zV3cs
zL*}|O{5$dP=P~mqmt?WE-uR~nCFE-u%bcE6f_bPamu`DLeV482CminYJpBWf=3$X|
z_(lnMYRCJOs}h~v(TK^0sFb`TsAYn;icC(}4;F+0^&#D*d;9k7bpO?A*Ispw)|Xc?
z?f4ut1nLXR%UYG0Z-J5TRJ&5Kye)MTr~=pZRt}as!Y&11h4!|#@((a-ZoW31$+6y3
zE#-Fo(YO7so0(;1T2>{n8MJstV0lr#+wiu|RCPV^wZxdiqp&Ap)Me9>fac0ycVaW8
z>5*RNY%4TSYbPKi<TD*6FkON^83FvL(}h9iH*OpQK^UefRxjPHxKtp`t8x;t)e8(O
z<p;n0F)dT<tKA7aa{QT~dE-)R%yV;lTw7GIS+vd4>T0y(Xa(=KSC%TmucGdhIoL*f
zWd55soE1xta?%v<29Eg+z*{tXkmi6e%z7fcx650}_6@(A*UuBImKqFthp5xU<9}x_
z1H)7Jw^iok<nRp^8gq!;DtLk*?!2-K3=a>t1W`Kzo{8n@gpZH;&SwNCG6JF3rY$$l
z2B6AL(nCf@CfID~>Tj*<!wm@kin>W#aK79rS`^e*;9<(CZ2#GxtF3>><=BNHe|6H%
zc2-wlC)-RV%c{y4CpKX6z&g&Ha*=0|=MIK`9!y-Gwx%aZhw_}ilnW(ZFlGnn!qvCt
zD)~8+?fBUcMvMi;<;ZN7(_h=hQ(iU6i}%rZmXPquxH%{P!P@by(b3VEr3yzN#J3~`
zW`Dj|;)-iiLwVf@e_k~?lP~x-JV_K`PMRB_a_Z;zV2JzXwX-(sds%fC0!MaX2P&O)
zQ|XCdvpV$XwYcRrXkh@e1vm8=7F}pudBpcUXh6KSVP*z&hPAb|)lSiG9NMTOi>RIV
z#Zm6v807T;anMRYlTy+8W>1${gRizT#<_(D6dILSep<2y=3zLqPHZ0Q9NO8G7*-Xy
z?r)`q*{ySWT$EW+Wizm{9z}$P^^AEDWDQgXT?Pb=2|<mj%jwoG%0j|M6%MyS2Ta}B
z+1XDgkY6`5{la;9;&NF|dAYQ<Mx_P}Aq^UmF^Vs<o+;K%A1~&-@l&G(fS{~Q#Tt+{
zTc0NZaQ}LN1CXJPS`!Npa3yz}Lvz>#&JJPvUTNxn^!%`{grW?r4+4XZ`ToT3DUUu#
zcXbs7FX6D@>Ef~NVRTM?*}ab;f^@+ZG!6F9;@=~{2T~@jHIKa5UtL`V8CqIH4dF0L
zHWfmGj)>j0>24)FkH;<&6L)T8Nfi5Y(2FbA_@lQG@d!&Gk~DZ_b+0jByLPRwa15~?
zVIG;8ndz}q?NqnkmMnhvgHW}OPf>VjzE5ii?1^#FJ~8>G0o)~RhS1lR-vy5@9wQeS
z4UnkW#Yo#(`n8FF`L=!k2GQPHdauKhyuaN$Fd*~N;8VN-IeuWBL(Gf^_<-8_nI(Xj
z0ja?SqAb<EC`@avg;X;<F`>HPXl!Oi$!=u;_6)52Q+7p#EZ*{A4<Hx4pFX*K?zjaS
zD#eHud);BrKLhV;nQ)>I<14P)zW677(;L!V+Qu51B#&7%j+;QfyR2L#y3h23$2pc#
z1NKrU544ina$;1ubd}dH@hG^R)!x*<eVf)_*zAGBfs<bl4S(|9e(1=ZlWSUw&0$=9
z&i3})TV8o@-uU!>2!Cl}@$N%NKsa;Uv42BUCvc}M>+rrO7LfjyfB(k1tjqVg)dtJs
zT)VC*fxLX9N-sILdc@NO5kQ_Gw2sFhg}*2nv(cOEe?+rER^;mz&~3GvZBHn9Fpv*g
zQ`-F`kbkYftHFI>7K;QFR{Ea!Ro5nqi~A4{05082<7Q{zzyt^4ft!J{RcHj6)UPil
z?Y%mdevkuL9=I6lZcNPWJ1!7(cbM&z3ZCzDK9w1tlU*Qe=DE&<+fJeyXmP>)E#U3=
z*=RHu3T9qSG%fM!Fzp?}ru|_3MCj29@6D@Mn^I-$r;|{mdq5x6EgU4GZ-8_8j=w-L
zTB?(9TQl*xNBru|5!(X_hpF@VQ1#sY)2c1fw|Dg2ix+o4#XSTfn}bZ6AyTI~P)}k4
zw{q5@a%cQ+@nKJBP+%8NC8IQelus4!8_;ezHQ~`EF#R=z{;W~QslR(G@1jcx*Ktpy
z_2?2s{0`d|kvRagozE^TEPOl?h6lu7dn4&koGx(O?{}r%J4fOv1a+7)Ek-%x=jYcq
zgVIWs7E;~A=-y{Ot@EsQwMImhP~D^MjAu41L(QeyPXpnEe_m+^gkRl?qqEY3JvHF?
z&{BWPJ^n-ROF__LTCDoDH@@!?3xMJgNk$#r$6p97DsNSJ)4VQlS9QghdATZ!ruw^^
zs8TC8ME|5)a8U0b5Fonzd9HcRxWXX}un`_lBNdJmtvSOGMgg}fiq=k{GeTsw3KyL-
z!Omgoq32};7Ydcvb3&1Ks)(z#ImP&p;2Ak=fcu!=Qeki+i?o~^I*WwKvL@uQo*OAP
zqwWvch(+9pl)AW?X%42Xk-|sHonXW5_;XJ|x>q^%`ddzHiSX%Lpy<~%-|-R#78Yty
znoXq#>gsX}U{kq{+)GkNAnN-bo%Y$l2*ljsdMZyCbI*DH{M5Lj1VBK`ca%C1oUl!z
zK$g<*Jy`z6#)c12HC$A{#Mr1SD6-ruMw_QK7>*X>B9ux|GPO-mNL06ftlYD_h2`X)
zQ2>#HDzbC(0gnfa&W#J|y+*4a1#wLqpaX&icmoU@yN@A^pn|$CzDjCSm``T~28%$z
zJBrre_&6`OoD+}7f*+VdiN&N>nX`g&Rz_^Iz#=K6J#-x+{!HYQtmBt*A3`mb*L?Q_
z$8^Q0QwO{CFuGe=J>;BgYqfKjoH?;a!shF}1C_3UL|<qVhw%R9W2m{!-jVT4`egZr
z)5DPQcrtKzYPo$E^OSV`rlBDkz%(c1B7h#qOQDOsV`Ds^1-3Zoew>3t!_jf&H{LJU
zcXykgzhaE%*AD+{<A??~A|-f$--2s~QCtG1S+kySJJ(478?N77KHk7kCniml7~wO1
z4;JP+8_yIsMj&KP6!}==GS(Ba>ZQ26RHfhPvh=9ZQ-ar0G)nMv1&e}1d|+v?FakI~
zYLEM4&{eKDOHevWeAcHqmAo8MC3$vM$CVZwrNI6O3JG1U)QNoQWAP4;0)1$~^XIiH
z%>;!$41=!G)15*aXvzaZ#ao4UWE{-n`_bt_No}J}q@*fK3OAqr^=G-&3IW#60fecT
zmJHNxnf#~J<+OwJ6rZ!628X^%9t+nCj7rYjDmLTQh~~N4Pr7;QR@;XVX51rY(I-Hq
zves-+Z4=ly4&?%;N-~9&C^8+dt9k-~(15M#gbPP|rh(3Zim{oCG=!G{n`zicC48L}
zk&@CAz)#r_qe@a1Vkm-uVJR&PX&1#HcON64fW#9N;|vKus5u?(jy;BQ$IWN27DW8I
z6HnTq&Z(dxk@dv!^-ufA2+%2~=chrvG)nWdtobnux;;Up46m!QeKU3LbwR=TZV-)C
z3)vCbz-iG|I11bnxrHD~Si@?3Tm)2T_Q^@2rhc8%k3vI3)ihZ$&2_|qSp-e9)Xkg|
z3quiWQ4tVAN&peKH8%eM>~Rk$J772?o<CA{AfX?3*pTE|w?EC&RuzspaCP;S5O~~U
zJwgCz62Bh2MsxS$Uw1Zh@Neld+a>n~1n4}K)*p#s0+~-Bt$F9pozU`Y2&f4LJWA1q
z-RWdt&851XSsAbO{xn)pSEsDvX*mWwuV8i-sHv*1-YOBnEbBaxp6T}j_;eqwf2D5A
z3Q73%_)oBcf3@2%fpi3DhMivNNvF(dql72?#%-qKe4U?YHT4n_AX#Ee3kL5b#MvX2
z_!C!_=?(43BQ)v6F#u8+Xx*6EjwG1-00kF&C`KT7F3HsEHpJ`?GBblz=#3k76;DV=
zK%YOtnGakOIOvo07tSjJK#IAo{1o(%<nOOHMO06Ri%hqR6!UBm1E@qSY->Zp?-`q6
z%fNg+-$cN;fYtr3>5ptPgi=gyM#pr7cfCqr$trj6=ukX;io49ww(pSe2@h<!ojydz
zN`TG<WK2?A6|uinwbiF-1?c`k=F7?JICR##=|@rAa&6$~nJ&~-?M_F;+%|c-{21^t
zrLXh4X|fkUQ!9F@6h)d9gL$C*XJR$7%gUt2Ez8rS8z9ArM0be!AR|Sxq@T_NViy)y
z!p)WUiq~he>P1os1)Rgk7_&M$GRt7|GcCcHp&227+g5uUvn8HOgQtrx!SA&{t6DDY
zfM&1sOia>q(;a{{rL9|k9oS2L4|d0qRC4g@MIh!%K!RJbvz&d!bk(=1_iPrjE`%A9
z#DHYt-cVKd_Mx+FP;H(iCD8<@8TFgsj2F7rKgQ!Q&W_#RW5N+*0?yM8Hri~GeuaNQ
zQ1RJ|qnM{YrTYP3DCK$cH2N(_64CmtK4`+gOPq44aG~d8!tzBHm96Vr1Q^1IIG5%e
z4K%yQ(n4my21bpUF-|hlWasVMq8eezlpLxsI0_aK(MiT@;GAn(@zHW-<QR#v`>xgp
zH~fX}HSaJ@cX(sjJLCdH{D^*i^s{Q+hiK7OU|Q=1QCO(y0XhpzywdQKICM-5vsj%t
zyQm2#pfOkVb>7c-o#>pX_kZk>#xe&OcO*!B*tY!;=sdJ?m@C`HHcG`Ei)s=z2Dly(
zNGZE;yVUv<66Lk>h1HGM<$m%Fgbomw)M#!XE+d5s!yi4YH1YJT{3b7J34h7UVnMpD
zR*+OMqyRW)ckozPjPk~n0?=FsMGvTp2;dLi$AW%OT5cp8D13`~9Ev_`lkZqooX4sp
z8i?cg%RtJcDi3wZVR?YqTpXMP9-ZXEJ<WC&w^$Mpc*KH&K2x83Z%lmp{P|^FkkuU%
z;)c)Cc2<;nnfcL>lx(0*CN4&;cQL8{4mVpz;arHB4_j2}Y`MloZKx<m-gtb3Hyjd3
z5ORZ&M7z{1Q1y+fT<${Nm7alt=jRtLI`x3isyU~<Y_yd3^!BDX3Tm3naX&wd5NnW^
zOtGTgNe#$oYX2oyJB|JL@#6}3=lM+k)#q88ySNw)^DKikg$hWejPwy&ouLDM?-$5+
zsBYG3Wv~_pov(;2LT-QG|A+I{fkWqO@yrekekF()-p9uGU(^E)+xc{N9TPXqxsew>
zmn%SJQDfR6td9GCb_)t1qmd*HhcDnaIvfk)cB-0E*JM5hyj`%p*V<V&gfIZ4o1SMS
zvH1#$PWou)sR~SZte|oGt@tR=x2ijMs0KVBlxdI^<~&9KPm^Qw7nUmNA7XUbr_t)1
zOBxy)%IhtxC6=w>wsv+W`kwmzg~GL#6krwiKZ|t&`5Js=SwNi~jF>e`mZN}}a&T4q
zcB+tT{oTttVRG?e^Yf%dBY01ViAS$`a3a6M@VnCho<rZaJe0!jxtsB#5M&#xrUFor
z*QSZvz2Jc@)rP%Brs<*tSj<j$a4&p~j%_i#W`@ATB^2^YwwH#`%`9*p(6Z$2`@;+B
zwE+v`T$0H#&=FKFYI46EJyW4H_?${6VBs^<kLvviZCFwlwgq$%`(~=+`Xb=_Iq-0Z
z0AWgG<m6atdidcz7L323<JbhWGL`q<45_;zZ`XPiPXFw7OYhe4;;J>WYli{oC$<gE
z8|23V^@-bUAFpi9&xIWxgZ+5Imu0`L^y}hcn0A_MD}W6)CGS<Oe$v_Iss7ixF;H}Y
z6E1C@PY;ZHNCs+8jVT`wS|;*7YZen1iC68Kpr*t!MRs^-HyFMf4CaScU0FPxM@sK~
zDo$9A*t-Lrc+ym_28`G3;eni?$S`JHWijBcw|8sxz^_%yt+rdT4a+JbT_TN=k!(sw
zluwWkIMY>L@i<5+2T5t&FnR}+Fyu5ijMsR6JTR=Et3@-hlpM_N+({(}Pe&e-oA9x!
zcrtBUQ(KFZ%G%SSd70~@fTKkuvX2F9c8wtH-r=bMm|43A4-~%+LDOwu{AZ>f4zi^h
zm|TEg%$ZIw^i<idcCA-%qu9W&M`ZnGHgp5C0cd5y?g%a`oG;_Tk2I_VqG63E&Ikzt
zZfC5#@sSVE)pXwdli^{k0&M`|py5VCBbQ%&0iRE;S79o1n{D6SMZ-@598@iuB3r|W
z1SFNPTLveV4VPG<pJ%y4I`l&2*s+ihG`ulm86BMW_APgxYPH8=pBfwqX<2suKSYJw
z^QR3skm62(7<2T?bs+G|M7V)8ZTK!tv;0fw=cv<dLtrPKW`c;-(Fev>d(knJO;2Xs
ztqx=bD7|Pf!DI>SBt0;6o0~2K4IzQ#9=Q?J^y_A&(>NDl!rvLP0gSbtF6)DwLUe!H
zhLnymcK=quSN*K^MBcNlCxY_|3!_*9*MiaKwd7L)4MAJQsCa$u@E!LYYK6o`idG;Z
z0JHrLB(S{8<R1WOK~9#w;@t~G_*CSF=ask&c4U`Vo$=x|;iyMcb98tRJT5hNo3{)i
z-db+#D(IQrDZEaXbU{aRo@0;2fwcSb1%*U<F_80KXI_gZ82}OtI@@KfjG=dX99C9V
z)&-Co0$_Wi)jF7?=a$QQq5+FcR}~Oq*j;-J=h1(y)8&h*A@7XhR%`L94}?BER^57G
z1bon^I|IP3M@GR&lS~>Hi1PTl%~EU*@N=~-e0Wq#<yHep`n^^DdyNel$lgwMcjxGi
z9$)=ui8o);D~WW)#OPmuxqThXb$gxL2ZQ-6)#c9tQ&f71m<r*zY+#Vk_ek$lb(b@6
zi3LSOG~;n)z&cF7#+)c>%7r9&Ba;m6)GRv^F9ZjofG4nZlLDIK;tR81-rc<j#(ihE
zHb1O$%H6+Fw^|z0(gk>~)|+&RcPw*+zRsM(-fbMnoeJ={Y<=%g7V;;0i}4T>4GOpb
z*mor!SElUZTo*pQfZVb;5_DimCT>@~3<5$Jb2KH(zgg{3+}?jW5wW{b*eB3YO9Ya3
z>ly-q;s;J3?|XR*PzC_rNz8O)m@uVu_98FnG*CfD`Z$NnhtE2S@Ci5ait8*;ivO{r
z)_PH4O2~B^U{U0d>3rfK{oFOa1AYA<!~QkU+j|t^wg9ix{r&xcWB}td_j@ukc)#d`
z4xXq7mddgDEM#ECAwHp2&Lcx6?%Kd#fPG}QJap@zi!!hwaUj>j8X6j;_rxODFNAl9
z);e4<hsQqi2K+!2Ofh8e_ZR?=9JmI(Pf;v~_~V5lPsl`APLzw_^7#C7ULkDEW)D36
z;?<gZ0Up)8I+zTMZ?@x!FX!n{s}b`8Y7kt0XFWi$4kBU%vUn0dJOVwx`^?N>dP?`B
zFflz4!0B{CalpMu(1C$e!3E4m1K^UFxVHWu%Dy}v>h*o!Ii2c+wv)9)i#7XF$W}*@
zY^@~AC?t`6-$p7GB15(;Wvy&Q_BBEXA<4cc`@W1BGr#+psgC-5|M|@y=j-!*WxSW?
zx$o<~?(4oDM&P|6f9@w_`xIaWF(tC>ZWFKLx7lEvx*cqwKB8BBRt8`yYdIsHk&|;d
zUmKVeq)+0uzUt4%$_znkPjGeP!|2UzN~TUz)r1mK&lj7%noGHhQ!Lu@Trc^Pw{~rR
zY`N}&t!)_=MzTUU5UT<-v+=$6xmLZNpKgumaaME#jb0bZ#L54jU%*hL<|zp%EziZC
zt}fYcB&Qyik(2uR`U21|YEU2(uk>c1e#o997E(8Cj-SJc0Q|dxk3kZ*STb?sHYo~7
zIco;dve_{}<tBSba-mi$*A|u*6U?S=@WgVo342<>l1(pLcWqv~G$>GMU(L({bP2Mi
z0brj|j}YU6o|F;daR1Cl<!{ajqtB^2u;i}X=g{!Joz^)p)f)TYYd3#fsY2<WPvXjP
zdB#0yHvLg;%4Rk$>k0O<8A_k*AQE$C-rWedqpWWt&kUM8|JBviiAT~j$r-5I;ugE2
z$7b0p^XhT0k)p$}f8J_QZgtd)Fr}oYBI@hVy5R~h%30?v+S2tAeJceTgvcQ);>s+%
z*P(+nratLYInHnT8!qMaKcUo0`KrEj>6nEc7L2HiVM^cVj&-;1a|^*(sgnrC0+^cp
zbY3%2g#_{sR56KODZj(ZE8<UU&E4VlTy#ojE#gaomBYgFa-x|fs>^XMxmAhtpdS}M
zX|`TftQe0Ls759<g}y*@j7`>AM12nF@enr|8M*uJMw<9{9pDdm+q{(FUgz>Qi{a%=
z4Rq6<vxV`Na~n4Vazy-6(i15+9h{JzeHbYS%5H5C{gm7fZ3#5b0BAyU7mZRd-1rJU
z81oRZrygr^W|4(1E$RN|OeNw~+G^}y&Uvi^@W(tUNp;I-kYGUfGRw5_5gi>gh7i@Q
zd+AZlrTu#h-*mcIdvuZCF<<Q@@oZu@T5Xn)<f>$}Y3h11*zA(4bR~&*{hR4qp`eLf
z37`Z5M33aQ>cK=VE+o*Rs1N~1M*dmWqIH-o#jZyfmTGSQ2k;2~Ijf{hI%aMvT-xR=
z0|RgMx|jX^E3bS8enF7`R1aZwPIqmURprWCXyIihZiMmzgock|HqbP-wstcur{Tjc
z72_2)vtwPGC7kH4>2qku5M)Ht-J8ootM{&Z?*>tn@`W2XWa_%??(Q~=ECreI38)j`
zYPr>E`YI=7^W>*=9NZ>$uY75X#oW?Ru{l{Z)FoNn+@29ou6Fj9b>2j|`zwzam_Y2q
zrF%)_Q}P$I${~|b$Say-Q(8wn6`+J4w@Jw2f|kIXX!dGU-WaTN)OI}cNM$|W;4Fla
zhR9z~5kEwNJjyc9c=_@WY|MC&L95dkUhg=1dEizy`5*J#p1mF(=!Kum77k2la5JZt
zaqCAzoGEzp(Y-aovNDYS$S!_5Z-y%c3=%Hq=BO4fvY(cg{`Q|D#GFa&fhmK<(J!##
z=REkHC*&PSH<-z}Buf|$;^RHN{u0k1+C~}_{SWG&NLIt(R|_ZB#KZ*lA@GI#0yKRI
zlzmvzA0XB2!u#`vJ!=XFQ(xL0IREPnD^Z9*Yc`NnXWiWhpuWy6am*AHCCU&p)PO99
zH!_3(t($f)`*^Ox4v)2BxZ}jdi~#<xrF<Y)+mypFv+f=HUqdxk9}5)D@%j1EQ0^Wc
zD))|yiwl>wyS5}3{QBR+G|8X8$^}+>n9FmxZ9n{VjYS(^zP6yV8(5#Ml^N;&@`gn^
zD4Q@IjT3^B3I()gPAse-@w*#UT>hZ(XF$#-nWKc+j|CaZrcSz%UoBVP-L)CSEuW}g
zS><JMUbp`Y?J4C}V>5MSpQeLg*erns3FmtzCg`Y~IDYH628~iuh4NCBTp;%7k;%(U
z)EoBuS|TqL;iL*};H?%eUF*J+MUb+my%G}oBFeoJiVUA~t4A_`&Iz$~5`TCFS<S~(
z4@^}nFmCS1QO06DH_9`bT(s$qbE+;H)js)Kpp^<n3)=8g=W8Qni=HBBc#QCVe_7FG
zqlwA6{8|>Pjsl%C^<ZWMba|_WyaFmfM9thipbTEOnW;oo+4F1=-v9-6AJla$V=V)a
zsh<O)g;EGEv8D6v=bJX<NbCc3nXr=>tX1S!7)9d@ZSZt}R)soLH9_mSuP8Hg$0B2B
z1O~;$pTHEL0EqG9o|fHcripUF4S2_<tzLliA`a=L?$ltFTEI9{FOyvon7To?b6s=4
zPYr<!ud{<Q{S~l~p+lFXLPAI#<pY;FV+h?*vmlkbiubXq%6!=C-_rwqPyNZEc~ojY
z*z#Ch&T}31i#m=j(7MVT>in-?zkUJyOusm41(6Wdst{+I|DsU}METS-MShp=5=m@z
z)wM-J5;6V#QBP2YQ8KeRxjxWXA4LhZj5P&VIk;z3LMRFe@E$tktCMxjgpLlz&>+fw
zdvm4wwoUJ@SU<&^ZkuxE-2BtnWe%pxPfv=P)+WMER$IT5HI&g-ks7oIH8qg%Xo|F{
ztt~7GuX36em+77GW*;BeSH*mW7#nB_Z(EmK|7~(y1Kze~KBwg+BIH(^&t+O~TlTNp
zf60s}f<=i!Qww!_+n0wH&H%C$L;(!-u4%kRI-T<PJeO7`U*9B;eVcB~5P1$S8y2^@
z-q9I@a6XM+u92B?jgzpRD}gA79+%lATDtEm9C0TbH)?rq@*0GmVfXC3118}6jpx5`
zoq)vJbn~nX-upcRL(=-W!-LT%4``T!TqOXaEK-sL6V)La0_xq1dc?bE_Ay6;u?}qM
zN~4Fpemy0`x;tOh3&qm)7a9QXxfrTGSO+M|P9>w|)6z^@Bg7-p4rV%@Ynr9Je2Ee(
zpwpJWXjps!J63PdB&u3;m%8@Z6bP%^oxiNNlexjeL+|MHXWkDC$-i7<5ak;AK}r4E
ztR)GlyddrXy$tIU767O>BgJXxb6cNa*|w*zoqprM#)f)n&s7GmRXg}u`GK5iGkb>k
zdW2GT3TbS-TFRl(i{{a`v8!$3xR(TP1-9YU+7LckI-0(}#wRTOHh*>(MF|@bSQ1Vn
z4Mp<lvdd|rC0FMlqpsr;yn;?39C`3E)D1bW455IA>;ltCXjB&sN5b0<HW_)lXw&$z
z@f~Oj;xbCV-*#9dIZdjRbogvI-!Iuk<1ku2{-+@N!;K;$^h|6f5O5}Sw76z(HEtlm
z%U-<7oF&ZqIbeV)3cZy^WFJh{iru9x?C$m<Jdc-_RyJo{c#OJ%77)u>T)8(2-)Iei
z5L$gcID|nBmL=k1hBwlbz5fW4o7>aKH&Sn`+AJ(C19)a?Es;&vo9R4zR!i>H#Tol`
zC4ZR;<%REj2I56X2%#RD8rxeTApkNl`;*3BqH{Up0mL5riJR>V2<*T)XZKT>h#CSf
z-A*!GV_;ktAERg~3p^1r!PSw5XasH{)tqi2sz*tQBJ~aA*0W~}hfQdt_R4n5OkRS-
zdVSi06<&7Y%NMO9NW~PrcIh`9p|Odw3&qe1huybT^~zh&22jEo%#lg_L8HNQbFZMy
z^sd+k2!{8R#7NY4H?L|}4v!S^0spZ%Cxm7FMN)`qsZnSjFrxv}o}L(PJhU|Ra$Y?x
zILfN=7mbF~lVw?^W%*hB7pLc<DC@&xLrGN^>^BvSX?@odp<cTvy(%7csM&K~^+C|3
zf)b?M1#(B}_^sBEKl;>~VN8kt33kVJIehlF2}{+MF7*r@7D)kDO|_RV1HEsp2Ra(`
zlpD5AOG`uB1+i(7Loib-fwr`1v_ok5pEObx+0fP155&qInbi9~^D1dwAQS1L1o3jv
z_bDkVDo%j@3E(`Gv02yZeP5hURsv}+MCkap2upNBlYR5$T%{6WlZzo2E3@gW{Opo2
zj1j-0MG-bi;+g<(h}7q(GG4as7e~r0$O;fDC1^yBBK5p4c;?SNgb7mwC(<3~@HX|J
zGEuo`7iZXqPPX{|@p?u{3a>_iZA5tnbUBEhGxLOOpcZ}fFx-3ED;k=W$G0_a`Vl@8
zRVAhnp1{lX!lcrJ#4HSBSoC}nIPd<F7UmLBl-RFIOP6ES%MLNzkD~JF)iI4`gfM&-
zs6lQTn#OFiwz)jF*5rXRol~$04SJ9WYfmWg_=jj$9b;PBmUW#CFFk}R_F2KqH0n~J
z@(7Ynq8SO&^;MW3rv~zk5Ui~2QRnb|mCQhsj};Y8QSN_jV7cl}Eo;o}ANLObcj!0@
zJ}&Lx@PMRJrlzL!i+pI@8$!{<m)Ecpt%=*@vjwL-2gG5rUpPLaR1$*jg-ic1H{|o7
zgahXUB&-j*)r#mFrQ36@Fd$!01{VTYM46dlx|hy?Koag6-}!3oZJt&A$l&+8o_mQB
zEI{RO@x{#F^Gr1*-VUOPFW5C`7FMDL1AGK1f0fnM)gx(W=mQ(3axOK&wx-st(MkDF
z#D{TE5l&a;&8hre9t0?%>#P3M(Gdx9FhuhWWx#Bb?j`HbI;JO&A3qKYlD@R~-V@;b
zbE|>bi!Y@FTy)E^9;$j0%Zq2vU6{f{MEvn7+ecaE7eEJqBz0fl)+2|6`2<i1M{5Z6
zHW_I8-nrS1chB~92v<K_lG~t*FQ(VJC@lvdAm(|ryQeX&EZ7SE{5Z>_%_yr3^RP$-
z0x{R<xhA6@Ec4ZcQDENv(Nx5F$PFo3g@U10#A~tzvz<`2!`;icbv(A2Ebn~?QiAxW
z`+n(pA|Spm1%+IoP0_l9u?yhSxPu>{?Fbbd(j@Uge#oBhTXi<9XQn75dwau@^7$YD
z(~SUxmL`Pq9$JuH*EZURpr2vL`1m;C;+5l0P9**v3WKRx4Zbk^#VY`eQz|9Lrs7Y(
zabia~Ht{vevDto>D90WM=3BpcyqZ+t4VCfcfC}wPrim&94?vO#l)^AINGJdZ7!Hk5
zGOQ<`mL$0p0F_EhSG3IhYTjH|Z@~X?*YSP;1ia2(2gC;>RUv``0H5Cie73mq7Fc*d
zl6?!W;eL^}usv{X&BHA6N%Md&g_vpTYE!<FB(=U=SK5wVP5gT_00ZR_lwAPt0ab{C
zXv+d!`lzMJ;P!!Mi<rQifZOOr>m5nFVW3w$vsct;pd2P`*YE4T4=4{BGC<4ddo@_I
zujgY3jD#SGJ!oOj9=vuP$~R0Z;fCyMd^MGu(Y-)0w;A^C4e-s}vO#yF=DnXwhla*f
z1YM!&D^M|_k?#$gw<V~MKrV=$AX3)?H{-RLCMrK?8na75ck#uS&SsYXa%_<xQ){v8
zZ`6$SHPkG(-ZTbUEGDLj_ADNV<S?WGJ!Vmdu}?@u0;^HHH-2kxz%ZD0P+^6^zfaB`
z22TUvD754hXlcdPV=3!vsFJhZgd7b(I9dfL03hEypbXHDR-^GHL}dR#qZF1C5Sq9A
zpwnn=X>)u=29LU3?i<oY8$3}G<Oz$vq31Hzf6+T&eVUv+0=g?0B8TRs8uu<B(H{cN
zKM7Sg>~MceO0G@A|2rY`iN%BR%IBJAZ7PY9)o}&dCw^mSG_VL^Xc(d3`(s%;IVGEs
z(9=Xb03`9JWv9y^rlY}N{wJP0wr7xC?HzMZmI$Yyl-nlk>ZG<C!x7;PMaF-xDyjs9
zj;N#<J^?C(ZvFJ>1OPYC$s_?qf7@(Ymcc0vP7>+J7C^0T38(LISM@^3#qAb+57&K{
z28MEx;%FEJLGo|kPC>8X;zdw*dHC;<6jFym#Xxr{9XzGU7bdK_cjHUmX&D@q2S7dr
z-hwY7^d_#0<Yl7>VU(F6&I}DAQnWDNLpg{{?*IbY$5HIj{W`9{^R@fnUQkelI^8-x
znUH8xU+$z-ztSGW_kMk9C>uq|rtI%Fh~-ZttpcbeB50rnQO5%SIeep`)SEY!fj{zW
zF`{Okl&jf9VaQ{7?xZJiFl_*K1<iK<JwY03zwqD%$TaKmGb)V%#jtv9ppm)-Bmnzz
zDipFedUsLxH@xiG=EP|~>GMJl)qbVplqdw!K{e>-!WROd1Y`x|2ZoV}fr$wfK|JTI
zFirv(a=o*COD>q=%FTJ;(;S<d^E_+ZjQ$-~8(vp^mEBK5+xrgUKE5yVId)4oC5X5{
zyrV+)`zn`;xO_Rcx;sT-SAC)O32Ff^a-MBnn&lN)f7cW#eexx6Hb8@zh&C)P#&3Ni
z*9q!t3gt}27*VJ9ILWdAsLY3f0m)SY0jS7}pf-vG8K$(U{y)FLD}M?~)d+%41l+GZ
zWsRfe1x$zmz_`X`K;yMD2{Mjn{;14riwenjpfS|#Bu&S-Y}VqItMcY*HZ<aY-Q_nB
zZjssun0Y69>oCU*85~mgPlQo+s<pX5&NFjv7p0mVA6IYbVz}lz*lY(glp{s*r+sT5
zYpqL-$%umV3clV8j!Pdu?tob;ctMnCejK6^AOh<G=q5p?4aPjEm~@My=5K1Moq|+*
z{5NFPH-sRd^*`UakT{@<eO4Dz0JFe!mQnegEf9grMxUcRdvoPl>h%@Jg(Zh%v#Ev{
zM-#oQ87Cum{17kiuS>lK5!roz9R*(+K<6-52bT!eCn!`zIegYZ-xy)2UFVZWejxlV
zXHD}227?$IXf6tc+nv{QZAd#C!ndB*^a@6}s%*<gm?{Up{k79{4?ISY`ye_5INdnV
zYeKA)YDw)O#v+iRtgC#^^>MGNV{lbHg|iXA!F2LBrb<Hq<%x>tFz5iS9yZiv4<>?A
zqY|`Z05Mq4Ub_B`p2koDDhI!NpFITG&51CHL%H{88-2a}KBudC_=Ml@{Q(6HupmkV
z8Y4zPNKz@08e=h0kX0d61mq;D)Z=T?;h+hGvjU*7g@(vT7@WUhQ`4UN?yen%1Gt>^
z`9g$<VkP}?wB$Q;1PL)w>@Q7e>5zyLx|dBBDCshfm#|MpZ{7^N4Xf4Z#iAc1@o&71
zS3i0``?jNa4rB!dOjFi6ObM_7r5}K_4G@22(~9TM5U+M?8#&CADHKK~Q!D8*+<Dsn
zQPPUgqYE6m4h<F*FaZw2TZg!YLJ|BK6wukam)6V&rY^<?6yMtoVEWfmz7<OO_0)~m
zGfIYxLNz0(0(=iD2S6f+r4IcduwuHA3(J-WETV=0czS%NFA|ISTIUCVQVV#|I{!QT
z!=vw;IRGL-_y(x+pckS6?;G_(K&^Uu7Y)sOeYcTk0Q^d!&7uHzjEY)Zdnvp22kiL^
zA?hq&4mlrPHyHIEQ7m4^+2q}&;6?}f-WqdtKI7x(_XDX4MR*8=+sB(dg<@0KfqCel
z8UZf=J)m0E>T1UM-hceYJOydRE7!keYsy=eZA266P~d@X^$9ngpO5cnxO`ehn*+<B
zw5Me1Qv1Sf=j+{V@mYn3=RESQT<gp8Jo|5o=HF;2vupb$(H2n#XkLIo7EMTlff8U!
zR5T(q4H`HqexZ@F>5$o83FYkpkleCSI|F`Sdl<q#6mkJi4kf+Sx<Dk1I)EZ$Tz5Bq
z*L%Y*#zcPQ39cc&eD#zHUiyaGi=0fl)>e|yAr$YI6H5`yXmzm)+$e5!|F>2M8zR*V
zKOyA{%ru!GZPQ^;?4tDp1rVf1uk-P_88TWHL`Q*MXJz}PH^cgdXJpLG09!g4%>h;Z
zTNtuKu~#V?qB*EHlu>&H>Skce!K@~rJ<GH@T+|5AFO8B9#L0meXiTaXhHjPJ-jI=+
z0=Y-kwDgcrEIA3N7k{wfSz!Aw|9B-+zWFh*ODAEznu^i6)xsYM3OrAhC_-#dj@d|N
zp4(z_*2zsjQ!apQh5PyEh5UX?xoF?SzeBTicaZ}gY#XSffRd&1el$uY=w$<IbLsVH
zC*TYwe2Ks%blbTra-ud}slRpzP<JJ&iMqx?$I{>?GS2$zB9~eNX(PK+21(7Lr}zLc
zbU+;6jTiuZjk?Wjd+rG{8x!cKtxLCFO=|F}t(Aa*^#f_fcWMM=!SMeu0uepLbDHGR
zhcfK`gqRig|4;_hB7+@wr+xF!gXi-vD8s7>)uGl(qu;*WM=B?1oI@1><d-P4I>TX<
z4eaWGUiT751w7;&4N9Y6avWrth&qP0Yz(wzxeypyM-osQ8K!ssXPF~zq}dydNuuv;
zd;59Prma@93d&pH6H!GU&KIEiwR<;nLowfJzeDSXTgrG*2`-fe4R~aK2duzBO3Ot7
zJe-iS4?zQ@L4|gLt8D&ajPp#5aAp5eaZ_(>@BH{!?I`p~z}gFXvyHF))?X~OPokj;
zO-a;BoUR#t=9={CDTU#tF|<b|-teC3`;1UgfEXU)P&;bMGLtO*`4#woyK$*qXgzB1
z{|M-)Zgdz{II)O^Zo<V)HK?6Q8ZV$w_Y9B@lmF>lN(%r50?Zsin?O%w#KC5?NH_lZ
z85NfQR(aG5v@nw&qE!yJZf|e@GyFomr-g-QX@uIQgKx7j0pDxAkW2bd)a$JhsCw03
zYCWm*sQy+ef)WB2H-t#2cl4_Q_U=KP5S1M%^Bes?lC6tAbWd}uR_3x8?*A8n%2*L~
zEOIp)Ob)<U4|OI{Lqk|N5bbTyE}^~szLk<=VQ=r<9K+@u(DS{NS8XUcEF?=v;;lsm
z|IZJ#N#ZXByO2TxQV9}R>EHQnw9@HY2h|n)p&WI6<G|V2KJVsYgHkQh9r#C{{4Le?
z*(bpAVG#vFABk}xm4#8`ITT}+09?Qp3;lf&JrsEr$4hpnL}J;Xtbh*X-7Etp?U?1y
za4w0+PxjdVP{!(~_}L1cr378dRl^f2U3)zGA_xH_>so+-=v|>@O07^)XRw4P8G`37
z^XgmKvssXQ<piI6hlS8S2&>1Qk5VAC!r?zSN{_7UIz=Y~-)>8RaXP3G1L~&N5R|`-
z*IAW~BL6b9_Ti7wLSfj)0D-9xMqc+eeYP<)<Sz|lOTN(PhdO2FQ@(DOtrn&d9DQo2
z)<+-87aJZscWy@Q%JFjsA{UTu5Z)ScL<Iy(ll-rnsVdB+_`wl^u_vuCq{hXtPh?j;
zn+B_sCw2a-d9AA`8g}>%5P}2g@2aA6{M_Y_t*wu_@hLA})G#rDk`N&ok$)_Dvc#rz
z=kcgNO|1il6HyV}>s#p{90)}gwJtS1fG{C^9_@i2py>#%0oN@pq30L?fD_6|G*<vR
zkNBr$V=3r+7ndBWYpXckDUO#iLBl6#y6#a6PYg3?W}MX66-@i^SZ)e?;wAn7vK#um
ze@IDlh$4i#8Q?a&D6r-LR+HMyge_74{6U`6qA8U81W0*M@;iY<rjl#k@&SeKp#6Zp
zs85YD@eDsvo+ry;u<>Ak(xN?3(WBt3fdM<(SLe?M1M65edTl=Du}$NcW;LloHxAn;
z$boLZ)w}lrB@veoP@9<=PN;~6&pt``!Asl#*{B{lQU%6K&^v<o3@sH9JD^8ueRO<s
zJOIMe0~Dq}b5*3;aDzwqVG486L2m8(2i`wQ{bc@M9w}=I;BDPYuS^?1k{|8+P7^{O
zMT}MP6ntxvbXN(_l*d3;)2qS$Z{yRzZJ}z22%UvQ=q%Lw!lQq>PmV&rNp+)u0w1p~
z^h1LbPzSF~>Ozs+6L?J|LW99=Xstju$26x(zitpgPsPc?1HEB<b>LG|#Z}5|m#n|@
zXERrW=hypJ($s9sprtn1e?)x5-b059Jus!))Xe+@SOA%(_7(~Q04-f4+J9hVdh%@<
z#g52&l_Gh73#Ba6s3jcEJ0W!+pWvxlI-eWRHbV#$x-=-d_$zJJ&8^;GUdpmnh8;pQ
z(X$O2d)0UC4446i9fmWo;-4P7MTvq@+faOl&oN6%pw5PJ00A6MEbwM$F&GZ8(M4am
z<2CB(k|TxRJ<HJ#npO=PtmOgrv4_zv*?|4$tt%b+<u#d^HO9yxOJ8b%iDalz(soxN
zuxKg3od>+6mcfPJ%V2SJJ8cD^oh_RR<6mBV*{guA%kVFXh6{e8-nZ5^HYtEeXf$-a
z40MwZyum>m81E-e%whus-8cfNsR@`zp%^D1oktJ|TOd&SXa2{2c||Sd;F^KFjtDlu
z5JSfuFcg(Gq<Qp&Vn>LbtFw9T;nY(ae*q@VK;@$QA;MM%78Nxcvuye0DIUCxmOOCI
z0LQ3H9z98jPbyFzco7{Ob1UbdeXlI($>T}@FzIBf>8A3%4h{i3;!_m%qwm76f$0=H
zMQS$^WMW7zg{+Anf<hog(ZQ#>Bsp?0rdnZ_?sA&%`n;T!XWx_dUub^u>yAGQulq-6
zhVXRmoCtt<K($IaMexx3PC(q&9JqBDW#<iuiG8O-$<A|bqIS)=pS=d_OoSfbL)}J7
zcVM2{f)Yrny?k0axYSTVL0-Ps=O9;EgW+^8%2n+APf9qT*#f!B&eVVzBvYSRv^}-p
zNHJ<kwFd8^b>FM;A|b&LDFi@-Ehx<L5{af@!=e#=2q$GVx#M6nX4-0c)wHhQR<9e9
zGoW%95a~OR?)t`+H-C>&l+Gl4F*QW<%|i~+)+VJql1Dy3&}h-oiGYwtliUMwxvFBk
zls#?lW+Y{3&$_0kuUGg@U(|g4-5>bn?llSko}7es9Tn~%PY$HMg8~+g>p|TS8h^IQ
zXhGCG_G^W4atHu`&B{B%Dj$!K94`b!NWB_f2FWI1#-Lvo7Ee7g6^5GbCu5El)-G<f
zQ)poY-E4!Cdt0g%Sluq~UYDGs=c}Z!4d!vY=f5Xs>tDB&HG=p|Ol;tJ;j=1&(b5VP
z6bP4fu|-)l%HX%+*eL-O#~ml9ea&_?JXAZ5x{vUoS{c9(LljV6{w5~}{B`Y+6%n;x
ziCAtZ#GnGBk@A3p#oj@9VldAo0w-J0BH^TZtyByOC0%d>yz)~h$s+bkIC(WrWzJ!s
zl!{AG6#Z^72s_40ydt!if3Sq7WQW_fo4zDc2_RD!@cH&^cyje@cU?T_JE&>&*)O4#
z{s~}x)Fz?g^0_^EE=oU81>BHz(ir5Z#{k#vwRs30EzmvK8>Wn~$(}HxLDWSDN2qf=
zQLEqUx3AS%&$3WLHCp_<2;_rb+&d3VccIT<XX{FsBX^ILOG|!F&11LHypt8-`)Kz4
znn;Qu6<30zEp$v=Kz)KZMR=&dDTbnz8sCU+9uYw$6;I-SCTEw@UC37fN;B%h4+vY2
zAod9(gB`?lL$g1a2+X-L9UUMOV1uB1_@0}g8G&+h&iiGq7M<YGs>5`>J3)o~Uvd_v
z^aJ4<DDVDJ@c%4+po1Db1-{3%7@Ir~&93ElBXMwGIJFVO2g#`!7!oAMpaf}3N@Al(
z*Wqiad(=i6w7?cH#`WLYhm7|<OqacerZVu;C32TL9HIYBIiWq9u9tP>Lmv0fJ`5W|
zP3S{`PkrIII5cZ&Ve|G3M_gTPE$Zzcj|=oT*)m{LIvZE)o&A<H4IOZE2>tbuZzR$&
z#Hnx*M=j$YjTqS{zkKKOj?T__M7m7F+)p|3$o)@+0)H2kjk9Hu!c|H7+m)>_nm|}0
zhWdkxzMdGUZ}``-1eA^-x>yP@a}Iz-3e7ffyMv4ZL#3sM1l}8`4j^0_b!2MA1wGNh
zGlcXax{<1Y2!=L6SM3iGt}Z`Q)Gtfk_<sl&KE6}6NZXQtg1*--po4xRs41D*v#HR?
zz4Ft~6!m>d`8#?j<3&cQ&=ReKV&UFc1m*V8hVMHe^QAy;>N36&hQ9_WrV9D!og*wt
zp{M=$spYcB%k^>8>+H*n3}M82BXTG`ov1zRUNuw`j4YucNu$!tEBI!2j@#f{o>DeY
z?n9?2OAGQdKQmDS`v3pkyb>JNfF31vDT&ZdLI{D0fqRJ{94R=8TvnhMMKGuA#V6oK
z0xgOTvfo_MSXgjOLL~JP4k|OJ6BpOt`QG(`xr{dxgoR&V1olmCZn6pqMSRMlmnefT
z6`7lm>0(<>C0ST>BVXF(Br{9EU;{+y3_sP8?%kDl6RGr_DWzlm-(@1}J*Y|%H3$I@
z>^abWr-E@Be`8Gxl8WrgkapbSdlHg9xTd8?u}cczi^FxYq<*e>Q%Wo5$9Gz9LTbS8
ziyrP7YG{ZfIJDxUgpL+=4)ibf-mgC5A?&(}a0wbX&=ztw_ZN=+2b^}zT#1g^7XE1f
zu8{O~;CnXp3Q~r;5q*ZPaWXL*HwOZxHvu#CNR(tboB>!p2F!}Unx^uRD)L-GL$}B@
zflm;AM@s!MllHsAbXZBx!7=i#?BIq#$SSTHmJl2zVQ|~c2;`1RnpRUA|6a}@xl^d*
z>1S2nrl(aYFp2VqX;?e~(Xl*6SO%uZ5P<(SISE}5*?Dj_UFk=H0?^JUj|`;)qDOM8
zyBndZr2s7r)AKJ!DzSxgR)ao(<rz(OZN_;gH@-g(w2|zqCDqw%H>|>uX}k%VW*A}X
zM3sBA;GVd`<b$Xf{5EE$*+{*8bSYl_P@sC9HG?JA)ZHB|$N^;O>6XD3*co7{^&P)a
zv@std5A%cEoq?IN6MipBC-j4-334+Em>(%R3KD;4GZD5)R+HE8u~nKJ1ae%qQSUJ^
zXBPvgYXy2&uvv*4A50QHzk_iVKVWwzj!>Tj`Y*j?OAw9!QM7Gf4#1wDBC2d}kFeaD
z4m%1wQ9$L4_NnD|#2>)3Kvmv_3n5A9LLMOZO&^%u>@8a5FalZvDADP}cAgxf1oHM8
z4DykQPhS33S|^{k#NXsPls~))I<-omaNWDMcAJ^~zsop=TC*ZA(fZYupRrK+<1KVE
zTGE(LH)#6OLX&#P&J9dQ?B>Mb*bs<qMK1Gk37n;mk06X77Y(VE_&Gb)f1Ih9|4<$G
zHqMQju|c;X5#?DejturrkvXW%u4(ng2VY9C>Z!e+SkzjnX#sB;(57R2r+N;eP5t9j
zftG2!(z#==Jl9qysz;Ez*xs?kI<Xch{N{%1kZKYYKN1SytweG9LcZU?+#uM%@=z#z
zzQDN-UeJ$f|LZlUx~i3B7@t>ggDEjrV~qW>V^w1;@wELiTXB@(U_h+$;FNM)uGRIs
z?mw;qx(DtX*U;3HwGxae=;z!w6hYJletyJMa~gIH&~2!JRw&1SCYpgLWKr;RXJ8mA
zp=?vroJm4kRd<S2pq${=re1P+X7M0Q%`u)&8950O>o_2{)iKv6!c}II%;ni(F%tvO
zcu3j(*_WDfyA|B8Y8FsKVNp1#6B7}$TN=HiL!2l7O3}{H$lW9fr+rxDzXfq7Rg!_q
zN)TR4(4*)m%4M>F(wR>qpw4{N1NZhNZ-`<k4TNZ3ApuoDq44Ume}+b-t2W2E*Z!t4
zO@-`r32wH)!2(8zSZvLXgP$7m7#Aw|7We$ci?f%}HToT*RH>G}x!o&wrJTMl!t7I2
zj5v|qY89-EUdbbx8G`<gj}O8frbR%nD8Y1Efx`eOZ{ERF;2=&_=mBCFpwOUUgKoh~
z=i$3#amx~7MjW7bV_F|FR~Mvrq#KJ*DFku<&yV4CxOQu$PC$bYd=qqel+b7|46~br
z=`$gZW3{RZe)!jl;^xiGVAw}y(-vHbW;ri*gwj)o8myxJHRwW{x?3pq!}l+KRO(Io
zW7LdBDjw|xG)M(3tC?64&f6Or>?SbrJ%`q*)XtcrFmb4}*8b(q{IhRJl=F-q9?6po
z!UZ)p8S^iGJK<jiv_TPY6=t`PmBBX{Mh1-v65TB=WEIaowDJenQHm;1<O0$gxUY?4
z8V!0I9mmshksr)p!6uED+8$#~EB(9Nno$6T{9L)vOR8P?^d3k%FY$Bdv}WEP45W-I
z8#|+UENJ4!gTM<tr@nU`nNB9iU@AWGrYU_}T|pMN;KMe()n@=+)OG;~R`D@J)}L~6
zav;zor5qo62gLDJG$YlV0IC%7n1skGC;8s;d@NZO+&nlcAxp%87*@{I8oQc|-3^A5
z7kTCV!55i@gYcyqRXgf2OSiVW?-K&|N~GD^<+V%mN5Vl%Ac_+ix4<3-n>JH81Hfjf
z-BcOY7ph;%YFawm_SQ*u?SxTy8OU%xiDi8zBc;L(PZpbbKd_wogT}TEI*ln>X|?I0
zCE!jrQ9D{K?nU%R)B4~&;>dzWPAf1u#qVChI)(i9ggr)8+i}5qp2=tRC>_;<ztD10
zTcG2%2a0HwTp#7kvGeDknl#&Z8ZJho7zI(7C~awKZ2|2nzi^tbr2ag)a>bW#gRYkB
zCK>}h&@js`d{mqr<RD8SNdi2_QE5d<=q1Cns*0XtyGeW7@YeeBh+!TDyb7{xZNG)r
ziw4`2SkgjrdtF4x>!|DSuWQ%|(ALfB1iBH`i1T0T>pb1L6?Ve<{_S$#0<S#K1cTf;
z3OF?_*V80kUOpkvH=+57vKMXe_{gryZm9PbrNtu`3Y7BhHena55Qc|9XLvE6rllhd
zDv%D!d~^e8;T1O_vG9bvzO7cyipZrNIjk{A>B}vBF`CV9^blH_kX|}7hE%|FLp8!+
zwlKJ-mj%(5sIek#qjAmV?Q71qw?GqRnh3QSxZOmu8#z;FU;&i=Sr6i@z0<&d8Cq1$
zY0p$iJLbUWSB?)$gJN6tV827}eKdnu;3m^z>|8|hE%hx>8Byl88_*WsNTZ>!U4dxr
zK533Yiza%e+<QdTm(H?aGzr-@ZEY$y1DSh_Zz-{^^uxCI3S<@>{YdGAiLhUta48J*
zVn7xWV>jj>GT?2x2dsgX$by(zU+s6m>fReB3p4)D1HOe4?sSEqPQD2=kw%%|5~Gg(
zNbM)wOzU24r$?|=H-p%F_UsXuhC&@FmPy>R?hN-~{#n?JCrn5BDpeX&X$>G8!^~Y{
zNqUSiddu6saASB_AF2C<p($>dBx`S5&`!I|2wc&qwscNH**+bc;*t`BevznaC1878
z=~PPSmV!zuQdUsfvS?V)ijsH&Sr1m85)g7$veombH#gXY3~P<L@@&i^IVv|&75i}2
z)KWy_(RXtn5RwV2`)GoK!g28*>|cn0d9efrOb@G~>!2sbqwdpIY1g|$JBsj?SLhHV
z2SbTYP{~rfn*f4-8<k$24>W$Y$R+HevgELknb{Sq2>7`ghKaK(|3)S-S&DC}SA{2#
zT^1M@v1wyG91ME5OW|>Y)#OzSncq#oWogX~>UN52T7%qj*Un|K^=(FGWKfGnDDBOi
zA&$R8Gqrbxkg5xfpdmNIsXpAG)w!>@kcuI<H7GiMTU>u~nry5K6IPgFjF<~b-SM~x
z3jDGcnKsppgXFb2jyRMxd@#T*S{Bbu8;#w;Q#G=N5*<Jr6JyEq*sBnelm-7mUe|+Y
zGl0zh=B3R6+Nqaz_QIUC5unue{XK7s(7Hm-5NvZd1{*`^wIxAA42o5FJ$Ul11d(S*
zl)~}=w`Kx6xCtN}w`L0TvZ4I3_dCCz)t8(MK@)YRBV{L%#b?o!Lxvv^t;sd-MK9UB
z?Ilh2A{At`Wi$)Q21}RTfUlnOw`cb<O*Y+roT~}iT2JyaRsl5rPugBzviU;<_mgn*
ze>dP=9!P&mb3>V#85kL&$#MJfcj%-jHOLA;L820jMk59=*-F1}>BF3WH8b0*fU_%a
z<=hmt>bOWH9m}pG+h+^2w=mvgaON@^9j2H{IJc%4FapvFs-d@PKYQ+u^<;Ki73d<3
zKrq(cMh?`9dIj0>QlaBbkSd$j(fJJ8a&9QX&P!s01vT=(2*q=;1njxOCCr*%kyGh2
zj4}8^aEV&!SuR<Q>a=Q#I|;?o;F8Q;c9)?bXX0#i?D>CVh_RizU`;;Z;mH~5&3T)M
z+<TBHq^5=9{U~K~wZP#j(vE`A{IT2;u_I&ca!!aL2vU^g*uhx+THsyy%a%*wQR5B~
zUEIhwdue6aLfEB7)u%XoQ(vX~V9?&zHk!IWVOC(#*t^j5kqYvM4c3=C;W(6~?G6D;
z%6=7mI+dI{7ZEzsxU0OUgz;X7264KSg6RkA6?|iQM$#|P(fDtJ6foPG;dvN@@FedM
z_L?1&v1{$ImB>JI<xp46>0V@Duy@*XxiHIQi}IeBZtw$khs^pA@By;!jQsPUx)?(&
zn{Lca2)fYJkw2hHr-V!B>qm~s#_G5yRwdH9pXS_EYU-FvX6{m!6WZ?ZiP{ZymDEix
zey>zaseJd*S)9Vs=!C=@lpAW6adudl9=ti`VQ=0l`CXd!+O+dzBF6*%&6)gP$y$1j
z4OS<*b(pI@sHkR6M|j6AWX<JTtd&+iTk7UX<o$z&MTY_a##&R*u@vetkley53Gn(R
zUd`6*meAPbm;n}qD=DR`Dab4eVGy~I(ho6mGD#ZIH!fPUyv31QR8N=3ra=|&#xb&j
zTGW=si=Xo*b2>At`$sy#J%I?u*EOLhsJBBCb?E#3@XBEwLi;a3Q4JZg)KybUWVTu!
z-S8o3Y9Wy^s-i)k=Aw6m{17?c1t3<TsNXlRGEJN0v9uOwuw3CxRwqYzkn2;(qPq5v
ziZEH<qGxfpu(2U~qr}%<hQoYn&No9aUcHq;>gun6Z342Ou(-nIQvglk-=5c$V^ko`
z2F9cQT})`mh9Z2uRlw|E@W@u4UU&(E6q9a;3^#q$fiy!zchP+G^oMQ7HXLkg@})z{
z+4#^PYl|=gSF<AI47+6)cR~#|f4YQ#7=7gBjw*Zf;n6-${##FMyvJ=?T@zm3(8yRy
zMu3`<_8vCXN&-o|qmZ~?oQ9m3RK!*FI7j*TaqNZ1>;YQ|=JDC)Y6}V(Utk39W(&q(
z&*I_XQKsZ9<LoIb_rX12Z*9uSABX*>$l(hGOyK?2CJy(Rw<}}XrMqjec35y|xDOQ!
zFKC+^_eMhSt-hx~?EjK&4gqemkxXnHEShiFlQUiMzy^*UT6wQ5k4~l03{K`EOoPc?
z+7y=7V<{{4;bwN{eF1FvjH_?LN){4r>I8Gy9B8ndE2Em&-A-LL%8sS3Ii+izr4O?j
z<z>2$I>0{?u7q^33rS(--h_dJTzg!EN-%d~&1<g2$^U?5C>sWuqJM{#(-&i1B|KN&
z#n@9jn9ibWxus%qhi$_L;F$p<YmRZdD8U}Z^kkb_Afrs<!{mb6$4sEK&veJnjnFgk
zpku5cJ#&aE_G%lrm=H%}NoF~QhA_Zc`<K_*(KgS?wyS_pM?YhAUSB<#bI0Vb^ef*h
zRR2G}_oSdDm=8{KrrIy3M@LoQQJnk(nsB3^-=Bfp4>iauZ+Vd$Ab1f>&;J_v9F8*y
zPIj=jN5Yb&gXkjB&P0k?%EvH7#=5VJ?lj#$2xNf-%AU?E=<4i1r6}-f_T#1C@^vJ}
zb?n9W8-_7w)C8w|L~7BoS`_=ZWHgqD;=Le^5)Mhgfrvs%-kO#p7GHLN{R#!tz;BgN
zRGXAvhrbNgTXep3+!|3U-nTB%DETB@N&@N*Fi<eJCUE)AZ)e%4f2z;;2R%t6Qp>gB
z6>v?XpIf$Z$Xl#18vdnv8U{;8NTZFgVTQkKrT$9PKkFVBtb26SM8Tp&MMm;H>JZWh
ztBo!)b_B|S8G?LGNiMKype}P2s<uUk6+w`6%=S<U1T7$X`?;h#m?B4UsQYL>s1;D%
z0bFj&&_X7JQ4|u<tWeGS(5?~5n;i@=($-+GoSXsx(uAW<qt%nTV9I8Azi~W@VHce$
zUhY`{S<x}i^pe#v=2VG|vf9*rM*kFUKrw4nIOE}J<ea@<OY6&vDFeZ=L}R3$g;IwZ
zJIgEzj+`)7dpcNLTTFu7za1+jBa63y6C<$fBXHgTo$p?aBx9Dv*=mkJ3~4T`{cQuh
zE7Q%vfm&K3K&D86mltxcv?1X~lpP!v@4H6}<d<ke-Khz7zp?<v+vEI42*tgG;yf?{
zj6;H<O<@y-9QgOjnQir19%w(qc{DMi1nYBWUcvbKghLp;Hc$i7pbuE^_P&?kZw$Ev
z>Ha1h!Y7c)=x9Dqo2de!-MR19=FG4)R#YVohU!|@7&HWZOIBDjL$!*q6gMCe(#<H3
zrS{R!FPz%+olJyHZLzL7WV`~|6j`Gw3m$gP8IqcN9q1vTD=}liu>y`<;QcF`-iQH{
zC`W7ge0n5MAk1Zv8NfSUfFOlq3q&@Jz#~W}R=1q6Ra37$i!*9OlBngxp*fD5GYWk7
zoR>roOIOAC*2U`O43&_<n)jMj#*h&l!{a(-$5p*HL{fn1lZjbj7y6Xv&rdbVWkaLE
zXmP9+;cw%N<)KyV((8WKnngWr?XY5Ejb|`XHrchb{~fRh><>BQU-NWRcd~&Rc``#y
z^C25rpkCs*fj^yXC_natN%)6H^xH_Sn6-<PNxqmRU+tm;C}UA<8lp-{)+Vh?@5yi0
zt(UF|e%3jXkr_>|!M!0Ck*~HE2>5R^=BY?md`$lrxUMJ!GV*H;72`<RZ3cU+oGbPW
zz{Jq*&uw+M{vq`Eg;~Nq>vVf?#SNSGh=6JN{a8qbV0KL$cwX_cacN?}d)j?Orv3P!
zQMV^3qJM#xgC%RIV_Uq2d)pht$@;1Uk_xI4J(|WRuj2?afIbG1$qhiW?Ycn~1rFl_
zU>SBcNA`+{O2oVQI>s12t@p#WMZidW*mgD6zkj%;I1f%gP}x+1nJB2u%`*gmOsR6&
zAz@7Ha}~n<dv{149a|A>z>Dh&1lz!&@W}CDPbFKm0{qt}=xi4r6O086`4mo<$V}yr
z#K5V_%V+7#1C%p+xdS&N2&PeE<a#a#N0hr{yJyI*n<tQ8*sZ-TvyB`v6LlwkUE9+-
zib7H;!jvJ^kHb)kS4hf^h>s<^IR1@q=hxt=sH{1(R3oxHyUjE30(x?T&+f6izBMFR
ztNJJ+3~#E<*r=U}TSAGaa&>V$u;5SUbQIn6`$<VpEPX+MnK=59^LBHMd=^As36~DT
z4J|6KkDZgBxy?Z|{CKfEcDlWCW9;gu<V=&zcqS>fjG-k$g#xj{qN(E4qf}#Zy_KhU
z;lKEK)x&c^^u9c8X6LS<QK9{%K9LN3?)`Ka=i{R_4`xse&^~uJSaia(fPvY4T({Sk
zgEVuGGV15jLGhgfZnZh>?eJwi@CYFyH$UXn>B4wj_F(?jSiXx95@zQjW29i1_CrsM
z3cki#b`!GQKHR3aD+9YWe$PHtA#~_VYzQMV?5}VopFXXV4$#bE%Q4$_%>^R@ScPQ~
z%+6gB3Gw*Ks^X%O*^7=ca+9GBD4~d*&-$QpW0Eua5kBv?y^zQLEyCKdwv<~Mt*;-u
zOISyp5KG3#4rY+XGBP*hRGhv1=#<aNQdF}}=Jv9q;w`wi<oMhg8Imerq3~WSv$xm7
z^h{&dCQP%2chro{P=00U1u{J)tpt*#bnnj)Z#iiQ*SyB#`Db`;k2VUkv1~(i<sb*C
zpCi*Rh~9xlu6;W)zFT?6Bae=&;h6{zp(kQV^RbQW=Y#7M^ePXl+^R)^_u6zk@ae2e
zb+HWP#I;_shdb;fwxx5A5>gLHGx2PcsS$men8*cO1y@^BTPbPL0)O`0QE@h4=~2Js
z*835#(w;E-4#*Cw_ABGa`*&Z#kwc(}V(|qjV~Z!_F{vi`r9t(kZa3S_V3g%0-bhH#
z@Ee=!=Xf+U1YzkutUz8$S~9C4_j2EU1ugKS`zv1Y)B$~s4*wEnncHg#eC>zy>lip=
zg1efB^(As|tcEgbQk0Gk=luY&7z8<kwK47Lt&&}j^yLacNK$C)VoTuK5U0E+p&Jfe
za5P!mNXK--#ANu9fr4s@vRGLcOnY)`s%q_zm35iR(3;aEbpruaGtt-vU5@&Iw(s7D
zAJQ90C|+v2aiojgd&`-Nv0dYCYkYxY@Zlu<J14$f>yiivswPUTkw0}EB(Dj=VjCv5
zn;A`tzz}ZxxJ<rBKu#l1n^9&4m*R(-T4GIG9Y{W8GIJ;A1NZQhU)0uT1i~EOTH<hk
zYdJVUb_ieb894+xa<Fc})h%^TdrCsaddv-mvNta;t%z85<w>yWiRqEbHf%RuzHRDO
zqiTR#I|}}v?UT?bszi`-;@Daimx&~D7+aEBh-@q3c3a~l7|xMCOg^5tr_6up6sICy
zQyy>Z7^}{1>NB6CpMB$E&fnba3V|1i$RrxG_dEt)t6ilE$8k*zYfdTFh#t-lz>OCG
zNwVfo#_4gOq*Vv<zrzA#o*?)71mmyZI4m_bD<sX{08F@BL~!S5dziEfroi3|)i`cC
zxU0Cg0TDG0IJOPAafSS7P=||Hv|%$9Jm91u>1#D7ZT;2L2}3NQ6EdYs=A}z1vHSCh
zHNz@GSlcy@dbB44M{6eSWeG=<?^(%a9y~I2)|$$nSC1deI4T3cmSG`wB9S3LagIY9
zwxy!YVykv+h=SqW79A>D(U^F(2{aI2I~T&*lswceH+1;xfj5|`qX}tbdpr-g>4#PB
z>0PO!<}U*rV^Z+``nNtK!LqE!JV;*V=l*^aa+GcQ*ci-IQP9A)*X$X{Yi|}Axyy99
zNuX-l@%a(fA%&R!X5$@)@vb$EZf|aN8~3dt_i@iOcZA|dM5q=v-u{5%no)oG-S%4}
zrl;wUeHyb~fbj|;%C6x7mujf7-!>c;<#Ap?L3MJaoyUkwZ_PFw$M}-!=_4_vajxgA
zBUM!t#ZsfYJZp9=zIYU(>P{TwXq@s>-V>sc9&eseyrg}5RCvjb3nR>`rm2;ysimdR
z5qqEWc7qj`(211l(%TI(z)_A;x`J-3dFU>#?okwZB9^Cp8P_StS}t!;Gs}a=$Fe3V
z1fkQEs`ff{1qlW@=NKn0XEn03Vu{GUwR%K>jA!oJj9D&dGf`C!7-0#a564azanvy#
zmhIduKXYrs<^W#`zP-^iv{(p<eq;8u-y#jUah~L=K0g-}62MuV0QsNI;gKAxA+}nk
zCrHk7+dar2rQ~JuwZQYr!CgKzeONJxSfYS%j^<5pKh^ywNN)tTxF)O+j!4jWMGo=g
z2Lu~kv!%y+HYuL_2X$pl{Ah859kX3dxK2qIww2jHEF1ETUs#E7pKL2x%5I<YLIjhU
zCvI&vD|XFdiNKzgdVo*=6!i4QC!A@|<Nmxil&@kN%{Dp5Q+>y{S4IA-EAi@(%l{Wn
z!lg!%!m#)-B%zMq#>TA}QB!s$v(`@Rn=`k{CcWTigpmw`82XV|SdBc!myWXbK|m|r
zz1)i>pS|Z2yuU}+s`xPKE*;;z8pwq&T^<_e*)ZN1Mt_SZWq~J=9`F2mz&qi2-}S_e
zD){nx$=)davu;uuEyiWUgB<u%j;BcN;1IdpL|9X3!(8%d+fo8#h#>uwL_Dti(NIYk
z!+o~Krz`VZ{GB|vyO1sOk|)Vs<-t3*p81#wdC9Jd(wZH1=VE3iJY;qD%k$l5Iqg#Q
z!2T$7dlNU-ydK2oj%-#~d27L1IonlgkeX)**3`3b!j|CD1U}>VK!Oy7G<1AS(p!Fv
zVpJ(<ytJfG>dC19I`pG_!dra8g?;(mQze9{c&4|Um7J2@_UChGo)*b2j|joRM8X5(
z81m{_VeFhku-H9!VJxVTfY2tY%C7X?7S2-_2EaVA#>FS_emO564)9umA|rgw`OVzj
zgqeYh8Lq95PV1tHHgrIogoH%VQ%)`y(#&dGsXQTT$hDiNP2G0lbgeMXh&T`D-}uZR
z=B+($zlIfpx>BuG49ry%k#pg)Ih=*vE#TKd=rF2&Ho|1G?b`EL1>9pUh0b@PHlOp7
zG4X1iIZ12ESKaF9u+?m7Hx8-BSzdLy5Gub`=%xyu3e#4Bp$FyKZ=&`X^b>FK{b(>}
z;;xkE0)q`CpWUZhpNyZvRwLOHn>g0ay5s9G4cmCQH{2cK(W#eZP51CrIgv^0aPHD0
zdIlb@o%j$YPTU`ZPQ~N;%6qqI`na`aU=+U5b}2qiorzA(TT?T83!UEqE7Di10XT_{
ztfG6EY>%UVj|G!g*W)`+9AK?gKh27JJKzq5b<N8;7185!F<qsx!tKnsXMH2v$Hc|b
zbh5a?{(sT?k7Xc0q{dUTe1=Jn*`DD31dlAvpb#vD%1O6W06bSjD}=nhoe7=2F>AyT
z0y?k+>eInT?B{WH;d(rc<lQPw8n$HoH)Vz0Z5XVF0e}kr^t=Ovd7h0NjmvO}3T{vA
z9luKYgF$T|+u{-RfI%y_&Q3^~XDr)>Scu3SwcTh2+A1;g**LKPunE6$3ReCWrE_E8
zbiLqx^;SY^AC?$M4ib!N7%9+%-<n(N=OA5)0s~#)Ja$w?L%P?z3L~Sar~W9`>|)~V
zGwp_lZlsy!3Bq!Z-Pt17S)I{*Vau_V<`qmv)O=JUR(%`1Y<SnP#RK_m_2Z#YtO}jh
z`L-Gk?xb8M(%8|}WU`~BK(w@w97w*Xt^gE#NIWgZumXXMfDU;(zWF@NYDVvECPJTS
zkU||#)ULwr*`8VPhUdl(l3ED85%=vOIQQ%U4wtNbRdv%<@<by^pm5c>L~*Rqv4$(m
zSanBCDXp{E7qIPLhC?IGBk5xk`VQ#4CPgqd245@+&h!J%8$JOk-y!*VM79==t<9?n
zAft0Q@x(2Q|ADEPB6(LJ0#9zboP_rI>0ZSBI-bOjY}XLaMBcfS{tB8x8Y<PZt3Rx`
zTOON}@a8EP929DDSHDd7^c4*EKQN_$Ner{zjtrN2bHoJ!Jv9_=-|Mlw^#y?OC@YU~
z-K^?jQ(6ovzxGCI2HdW&=|-oc&H6|d?I*C{EouN>DBul933>ZiN$5{-^65E~mUsIO
z&0$w6I0Bwn7Vr`B9_g88crK;{Uaqn(!o{wUO{e9{;$Jo^1eAt6GEh17$G_^|idA>+
zWY`H$B-Ol~JoVC?`8E8<NYGr@ZTk78vu9j`wmoZOXr|k;Wu|nxX0KTA9hj)PP!c;5
zaZlPQJi={SdW4&Pp44!U!;=?A9MX2|MlNN$mUeJ(OrQO7SG;)J*y1ZVYKGA>ln4ng
z^G53-J^|xIP0AaF|9JVFK!<1k_>|rCVZLsYm0q5D^5Mm%9UBC_+FA#)S?1tW!!TXT
z{K_uu+G5)<@G8OJ^8R^rjHDjH^alnW^jAIe<D)loySe3D7iMnUBEu>0^*1^LtpB<P
z7&e^5j}gG=_IeW1hK7d13702QH&*Q5pDN_YdHGHW%=6LmXOBDQ%~tJE@6VPTU1=V`
zcy!O*eP>m?7|KU7Nk5{o`|`|ypKvXlX2HL37R;sU!?)1WzsYqLl9q12^S7~yNkq=3
z7vFrBdz^0`zEb|zyj>FUuvw)qBQ7S!;7TPaa%O&BylrpsS2JFJpK+;s70wl~wLj!<
z`}^-#xgpK54!gU~l{l9kg#srC&fU0>w<*fHe2c+WLF<oaqUeP3j=^a++w$Q&Q?+B>
zfq{W**Xu_QV{S9o-i!Gb-gM^9`}e2ZR3|Iny$g@!gH!9^D{b%ad~*SqSJou>O#i97
zZTAl81tLR6?~;NOF16Sy%H4g^FduuvTWx9=*V*GegxpPDV)_R*3_YydeBmgwxf_4Z
z*Et`v>e}SCt)ZjI+_g1p9V%+4%xDgvSJrXx2eXJ?+nM9w2Vw#Pptf*;rOJsDCmw2@
z{#;%U_Q!Q$7*8|WEgY`j_UF$x$f!TRmG0vKY)?&#rh*`NEC=u{d}wUUxcKbG`DFgU
zUO22L>HY;j(c;&co-POx-fgYQ{%8jjRuW5x?whBs0QtTiRt{vpN$Xz6yd3udbdYK@
z%9fVt#fc$I{1~vU{|D^3tY(F_3V*yf$iHV77=Na=zFdC3=ctl_bN@#1(pu&`^Rf>S
zrZHx|1;zcq6N^9NKD}Wl)a!$-GdsI`cWKJLE?;S=s}rvdi;li&HLC{3yIuAz>R(3!
ze9E20|E@YtH&+*H6|I1UR#JZ-latvQARV7|A4*i98yFm{Y|EXZ<yq*ue*X@MelEmE
z=mQ+TTYgxvVn>72AbrL|71Py@qn@>!4}5d^v?Dw+1`E%xOkY0j@~Ot~ebRPk{JWfN
zz1{5wMRc6VujhLG2sJYeR|YyGo9UnOUB6jxvQ=8z!_dFW<D3(I%;y<*$cfwkC^^wF
zD|{70FM^+_^qm+*@8x+2Q`neqBh)Jid~u%{JIr-yURLG;;S!9&u3eNTtr+dP@ifJV
zJS>b2f~TzkAfoVcMqW3=#?71CRBX}|Vd7l<4_o|!FK7q#{cVMZqv_N*%=f1<Rhj=G
z8lYBPXmrtSvp${(5lvz~O~~x|yGQ#KKhQ2VK+fZWjxgvUJ>BSbM{e@(f|E4npeEPe
zefeqI$9L~eWaul}Z{v`%E-T7miUo&=&OqnDDJu($RG00hAc#tPWn0Pvv$BVZawJDf
zmd9FE|J<-)QZO-87$X!B5#d-T=eiXL+Z^4*F;{Z&Fsw6aHrxKEg!JPlcNd+}4p1OD
z?|OBC#C9<U&5s<@_x*bzC`H*Rq#e6=e<S9LwrlmK_CT8Jr_29zAHwaN9KNUPQ<oC9
z81~2BBIZ6c9m00=Z|cYadXh9W7gYSlG-W0wTtHP~0^ZkRX3d;gX(#=dmU^ET!xVIF
zqXJm~&{SNPb;Z`XZ}EYVf4-YbIa6U5uk`Tc8RL|VG4L?wFQ2&+--lml(UeSi;b!MA
zAqnL;4&s;=Z?impC^!+8Hh0<6bnvD=$-VEHyMhOt9B^2u#Ag{``|%jhRWldRB&Z!H
z14lineA=uj$A`(EL!qR+YiZNg+>ZnE1%F>`^577?dg88iFhr4X^K<7#pv%8y`}SPj
zM4<hPY}H%6Xp2LSTtjgN5T%NSMnG}mCm8fld!?vvKz1O4U9}dp-c7Ce9!Ev#jmkr4
z?)$b>KPC}zM7(COQ?b_~WSMC?bfaz-r(nk1BL!@%mTl$pZF5c8w}*+(YzFFlC%xL%
zisXx%rN^e!N9H=|oN9=II=HC8-Sne<ruD;gsnW#$!?%ZOjgI<q*s;R1eJ<+h2j%6D
zPoBDVcnN8Bd>9x3$;vmbWH{$boZr?hB`-T6;RKVgfk30|yuZsDnAK~}&CgFN_rHL2
zt9?ly)0oXf8-|%IJR<Qa4$eDb?4e7CH7%3XTp*6cVp-)}-`u(Lsqv*{hxTP-J<{6G
zMT#BX$ogCcOf^C?N=cUiOk1Mn*$`l?v>leu#*V%@hQU;5)G~i{JFlkZzp}d8k#=r(
zcu-{ISgZLteHAseRO_k5$d}JJ4{yQz4dy%}oe@5NN-XuUZ)I*Su}!+Q@hJDfg9j%C
z9h7e$l(-a6%!dUYZER}VDG2v`Z0N~FGh4E@3VZJq>FRC0nOa*`{FmwGsm~mo3*?gE
zU9md6u^Fd=yw}oi85Ljk9-7T^t*xx+++{%H+^#v^!XF(!)nhM&A$D+xjm4I#PE0DC
zp23s^Zy_7(;}B>+=yEdMP8w2xto`LUJ((jhGl-vl>a((S_m2k-Z#W1D{r52FI#jjC
zDg<%Lb8k0uydMly5CXP2OjRiV1hg3iSS7BXNxXY^s+p0fK%7y`hXb=sps96@@rJXK
z-$3^BH^kE<XxuH|xK+T^Gk$2yA-}`%eDcY9IQaAVnMd+)^2Sj?hKvuO`{9(3_+<IG
zX=X<>mUkYG(0C7_VLH1L=u`z4I3Qd7*jtpz(IMFRpNl~}kqK1J!3Ndhq_N(%aVz~h
zOuT}%ZH9kXZEU`f1fb)e9XkwjYp*|5KL5ASM{B07lYAT{Pp^m^-m>>&8y_}i5x?8(
z<E08Z`%*ZDMNnE=dMWgrq7Qu#v<5oT3KC1TIXO8m{B6*lbMwj2@NheND`f;*TGgS#
zY`5X4u+Una&y&>-Zi&x_o~}JVMG#Sla6IiDB`KkGIeRE;=hN4<{D*>KB@^mSW(bCz
zj|HHSar*JU$@y%%2Kb%Srnt2Org+mL>fl?wI)4c&&gyX1)rVSAa;#?oUwP}r3Nm2$
zCkMKrldHmxa^_Np`7pF7Lg5spQ$S-)m}&`fah;6uSkiF;6vWSPy4(X|Pr7x3xR}^b
z*&l5eD{mNq{K`Q~ty}M#Z{Opz_v!op9QLywzie&&ik?N}>A!#ErxSZG`6cb~-NbzT
zm|w0X#(nm#fKKKKv>D(}ygU+qk}jJ^Ge!U%6~(v1X?b;YOLX<)jhCH+nI^_-iNh5a
z#Kgs)oUp#tykm>pHq(L*ta`cO!pJp~whw@vRa{*Qx^L)#E7~DE9`BeE63_@T+g5y@
z&1aCp)3&K?EjgvGzIbEbc6c0TA_g|x8|rK|v#rI3zMqUu4Zb;QLT+fA@#YU4-4|cj
zY9+PbE0X{9*SW^=mf_T}(3<+`v`}?3ljHHb4XkJHOGSLl^89xdJ=m{aebl}S{14bu
z#UC$*XTP6$w@WjGKcnazyK~<kF3a6c!=uTup>Q<r1t@hdKJ&^hf^DvWfWi6j`;jfJ
z#JY@$v=ovXf8H^_zWBJfG5g0$UkyR?!st!ck!xl3^^{_i%+{TJ7^$?B;_2?fwv=Z~
zGyV-J;1gL3M_^n_kKVa+=h8t3MY@lL4&z$;Km5sP7UYSi*|L@RyryUiM22T#!;Q;u
zoYD|b4I$9p?bO}9eJh5K<3NH!FC3FQzPS4{Xrt!s(oWK~Jr)KA%gi$ef#bz1nAtyE
z%%--v;FtH}LbaKmI;ge%9q~o{T=|BVq*S_NgJ-VS4@)vng|e1f1P?`JTGw2ey&{(H
zB=dm&Wg(3Ue8p4g{p&&7$EQc_zwJwoc8o++fS6GgeLiunE)hDJjI=xV!m$(kfCP)w
zY2BS2_T&lw=I!inbhG0ta~<+&-R)k(Zlry?@iOn!^t4s(SXhY@{^H={O#)|#og(%E
z*Td_8oaJhiC!`XgGcPuuBJW#%*!{$9fdKohOWcA-g*h$-M?~;}cf4cDXp{L36_p3w
zwvBMsAE$u82g}DgZ>|S{9zX^jQ>YT-fjB~NSeR+<>CqJd4zF`<62^+v=J@e2A35tu
zc;m-BnrFP*JbU?iGrG;KcFvl${;M&umrqgVZig<7gyU|5nW?z$xk_IKH@`(IO>?2Z
z|Hs%{M@6~5ecy<HA_6K3(xM0=0@59V(kap<(m8a)s0aqq-5{mZ&<!IZAuTaO4j?gf
z=L|6KIqrQw_x-!q^Q`sGKd!ZPPhQt~)aUy>G(JaJG=xt6mAt<Q`HzbxC!4cB)2*9h
z7hE<;1i{_9&vn7TMvyrD*)yvmvur=Vpz6WlWa=>{F^?|iQFRc|Nx8qu%gcv?>|f`B
zEMl7g43-;p;2y+KaxxBSAwcT%GZe`ItK}iU`>agX!s^vh1bz|SJOxde7=W>jzN-fa
z)w8$3!5cOsksz5B(*Gc@onwA+5$2m=tbK``jul*dv9Dhf_^Tv?o9oxK_Y4<4_&qYJ
zQ3Ym*8wzxxBr3W2`MQ@A2iKrhSTm$RUDj!}cCa~}_8?x37D3Tiab>aKV5PziV(>v1
ze%Ly6PfXLWx)}RXga8$trp;O@Y}tj03-Aw9geA$WOiC#l^5g9jU)x{*F9HBO4S}sk
z)v+t+dgkj_f*d8jl<yp21WDG3Z`Sdc8FQL$&;h#{?g4cC@VExp0MWsSOsNbB%$PZU
z2wNFy`ftxZY1EMq8>8pje-cdA4aY?v9@rj$B&oZT8M<CQ3DR&*e4GJIzT`;|^?C59
zdFusoQR-K(UeP^znj^JxP*#I{0SWa_^Ib~L-{Ncxwby?`a%h``N3z*!QGP{D;OgB4
zT+1&2jP$kS78D>=%3E3#tfaj;$*z5+%+AifwWQ+Z<rVT04~J$+owjgj>uz*c8{IvZ
zD#_I_F7vp2R9Q=4dxaX(lW>2sawFkGreLDK{3RuH4Ur`NY#Ft4{dzqp7{8a{P!j*8
zZ1;i^F4sz>V&Zin5sFXc%3<Xy-b3W|#JE6UlSg<lZq(D&g9AXc?alb3RWr`Fo1>r$
zfOuR$0D4G0VB3lYg)HZ<U%x;=0>@J(e&Mre*p8t7OHlJvxX#OiO-o@QY__HaH(<8T
z-n}C_nVdPd{-i#ghgKQr%aHV6=gO<v_5<wWAG99atZSgFD++{CGjM}iK{z}IB#)Bf
z*Fm=71hMlGi^v2!;;vYzk;Mq+=44AD13-4U2&k{<si_LWFtAh`KZv3E7#?0-J2C~9
zLp=a;RbH0M6u{9a#(h8%Nn|1*4;rh@U{ZU@+E{dWmN1>CFQhaL2bRqBfH?z5&$;2J
zZpn|$-x86KOc<^9gR}Ql3wth7<Wk@kxT7`h;<KRY9OMWX&B-BPW)Q-cKpWR90xNQ`
z2cht9_5mC^Cyk~GkRxCUV+tBhXxGbcGK8A}e$i))^E+JUXl-pB`V!);8#3a4Jmo%+
zoC&t;hHn5iqxp04ZWWLA^XIB{!E#{n+5#BA@*y7!FlyU8N=Pnxz5$rq*ETmMh`TLp
z_T%_T<R^`uItM|+CB*%UrVEWg5!MCoU%xLLvBg@l9zPB@iDesZQI0t=s!*j5*Q@<X
z;JZD-<aRzdH1LFv?9*bz0HP<%y(ZPmbKiaUl7>ngS!hRcjTBCO?S!Z9<g}wW%+qmL
zLn$sSG?8&q(#$am9L@Yrkl~|LA;Blyw1A7hyL85MYMldKyQHK(U?7gD-rY^u&S_wA
zoPKCA$blOdvw-o9Zd<wdWl_o@^ODzPUZ*qcur-?jRQLP{9~K}Ypr*%~&Of<@52yb=
zvb4x9UycI3J>?&5Z5v!xKxnY?{MvM!9q%$2Y_I{Gy5#Qx1nR=4fW>43aoSV&<(gAC
z#~qN${QC8+>dyGg4E#x(zMQP=Ln4pmDX={+Yx>9UADx{A21FOP#>(YTersIybD{KL
zHzQMYr1bgNyC2I8j>X6q<fQe0x>LQQ0m|m)YHPs2JG`Z|?oZ>0lsrtr@4j*CWc2O=
zn-i^>iZ;s8i;KyRFWXEY?gZ-;>5gK7FNhO&HnH+id0pL@^WVT%aQvM`sgElr?MKB-
z@>!svaw;Oui9k*1qhR8Zp}S~N*7{6B3&QxY(i#8p3p*fv|Mfk9A6s5SPYn@&D){qz
zGBtLs`yiuKb^5lgYaKNb1up2_Q9Uyya3sW%K70Vn4%<p4<l5$%frA)M&V<pFs*<^G
z?BW41>_QI-fm?<@&q4Lu4K}&)WCmfrfdfYPn?qp+4m^(@=+Uv^Bk8-)(1}PNZm<^?
z6|kpv0<;Z}@WnSN?e^dN=&uiwl|a=UD0F;l5*#}}kzuXG(>a7z0k4eQ*RE~aK%9&x
zh_T&e{pQxp{+%RBFH<LQ^p!?0zR%5X-rj^jo~`L}v6h>xB;6ilc`AEGdg~ye>C43!
z$TY*L;hJ%2<A92XROAX1OW^$5`(3qj(upfm2;6qs+7RM^|0Hyf<BJCrle{-9(&4+7
zz(rw}O5%AndYgb53j`&vbLeOAO!|L41W19cq)^DtqSI8J7J$Cib%!gg`{*if9D@6j
z8;~f6i0*30jH%zzCKr(U9vo9MGedN>VVo1vYW1`A+1IYU?szIEU|3~qUYkPAHHiF9
zNY32_OciQ%xdCW}Prz2Hho+4R)YE?=k;tHDTdRZF!Nz_odAq&*16}x&hzdn@>y}QD
zLvbj@={a`G4V;iYV4p4*EiLWgy}q!FoP4oR{54{;(RRA<NsDozh(1&qGatJ!xTnp!
z^2TBjjiWbr7H7)1(>{>S+Ox@UFER}!C+|VAXRr9Sv1$-={*9DxEq|^8`+NTWVrFO0
zkI6`0tPi*kR~QT`zo6?hrRxJMFP#jn)Co&HKHqkQK#xV-r+T*NI3qKDYs-7tCCxiu
z)@pTHXv!|%{pA^KwKY%G=c_MW;-UHo?(o@C()aCxgy-ASU1YQydcm2m&f@Da<9&2K
z$IhOe)u(B*x-wXClTGo0l;@Y^0rzvEisG{_BHxog=X~WhmgzLBo$rpjpS8{R)+u9=
zPx;X`5<XLNqO~WjJI^KNSq(e~M0`(+P5Em4--(7c;N!Zpcy>{M{l-8Fw&Pceje1-O
zW&GyA755<ZsK5dBghlVj=z@U_E}N^LqsImtP69d%Ccg{0EoI&I#jQSx!Du*~8=!x>
zIvLuVyywqIV)fOXIrCb3;J!icY!bV+D*?W00bMQ%!5^0aoozFDguhb0^8<C7g_Up?
z-J9Cp7{Y=$d_Rj|`)B^je4Yb2+~<mqG8s2$^r??G`BwJW4*<Wk1biTnm6cuR5-i|!
zn*n|2n6xxU5UfD+TPag2a5eX~nH(9Q16VjXIO0o9OP&w|R6H8QJ}Uj$@IPbBLB~(P
zS}Mk0{rxqyAAHZ?0G7(XgD~-H*`ES$tP}NIc_5p558>_ehI+=nd>5ouAV>mGh^bQA
z@WZq|*aOyo^R5G2-2cx<_FRzQc@>=pf`#3?poygXw;kef6%~ZtSklmF2DmYwO+N!w
z|14NS%v$*+;OWzM&3UdT;A&h9rj+`sIdX<?^_&bDTUuLpgF4o+^jkjwxpZmyEEUs3
z(?ps;?YiVI+uzCs>=_;-_wjw&Fn@t6na)WN+Blo@?KN9JT))?QPzAR1-MFTSoiPhK
zJJ7?|D)$8iM^SeHU`108+R|%|Quu<yIQYP4Z*R{EoRdofV241Gw8N{BuUc+9?KCQ&
zHPM{s=SS`jn2KJk*zw6pGV-@eT8GS$0=BWD?4E$>KXI^o=?1vn+5ca0&>!a=K%?za
z6!Lxby{G@;IV@(ORxLSygM!Oz6e;peBaW!b6~~_t*nVjN3(DhfnKj*82<)wRAL<yN
z^Ffh%e`W6#DtgO_nG&T~tPR_*roPe(z`2ZYvCu-StNq@eTnnE?I22y%6De`rCvVU!
zjzqaxwuyywmmpj<RwmU69ek#wOI3tBCA}>|J3C7_3#5JQDc6oI)Wj>Z^f!+ko0~*z
z8twEHq}id{RZr``i$Rq$p#=x0G*baVI#my_;B~qMEyR=q-eGYFj;j8?M-HkIJ7?5I
zIKI4vESp6+lVXe1AmuL{&U${1M*-zetWTdGLgXMr{|08Q!{oS@%!oY97c>SHOO-2^
zlxa6m-hmJR0l7|Ux~fM!P^N0iW@GO=MP8=X04j=mxY(E9Uv3<&LMQXM+{Wl+?^vBr
zJ`6W~Iet(owUJjl<Ji2?Q&LGdaFy#~ao`#DC%0RJXJ4_Bh-|iCXOLRO(p03;qRrZI
zQ?&-2zRUEOk0?|>?dJqi(>rg0`WFo}H|3<p!++dn26c^b-66bP<Yc%!-F_cu?w4V0
zG{5Ltv=yY(9Tjsiyfgsh0Rk84#74(7+wuATzYp6RRma9;20b*{AmZv6=1wHpnQ!3n
zCS^IYs>hf&mzbj1GXsWhdQ;K~bUASPIk=XP$YjmgvN%~~7a6k7L<Q!w5?-Qg2r9=Z
zVy_4YfrW2TpygUWH24<WUMYjAAdjEAiKJwb7~=%t`y$cbfN?gM84QLoQNR&B<@NhX
z=SDSrpoBE-ga&}#IUCU;$j@Si)y36rP*D|~p726Y624$A_mJq@i)V5dy3J@niKBM>
zCREmTOhax4u!Zur_~V{V^=Ve*yW{vkuXrP$?;FqV`?VAOaz`IU!_FmM^wZtc&KV?J
z+!|I^-(co~m`cf%GEV-sl5YCuSw!u2^7W8!Z$NG#;@5P<ZNu48CWNcByD4O??)@*(
zU<-$vhFSY{1&0po5Mz|txd6AR>>0hrYb&RfaubQB=H3RoI#p@Ga(VC(_57v#=%_Mr
zb{~9${2MPbkCKsXM?c0@Xm*~0fUFlr{7RsA;YkrCs@X3}b)9xa*Y=J5bVbN#P<{%-
zZa?tO95J~YJTVsOQ|kZX_32u1#_on%+rppg8~FF&F{813>pskM!t8wOxPQrbRKCj7
zc{6#)B<Orik?Q>U@E~E{93h?1PS^q6ma(8FN#}czcc@41tv@N>JqVX8*&8kDU_oI{
ze+7P7n0I*JHE(kmbL_Ij45sH|+i-j*>fgs}wtFHXb+WCwrPrXdua9(73LOm7@U@*1
z(A0$x8j(M&1499|IjfV`BoN!>KR$60bGjuDgD#k1^H?s5Jfx=wz_lkI#RbTaD;98}
zzW|}a*_#az?a_DCS84fvI$U_%5Bf#)(}LCDsO1Yf^{EHjz!&jpBk*kL!dGv<fBzo(
z@{9}%i3di`5n#>zk9U-H_XGr91Oz;!W(BqNFR;o6pSy#F3`2h=)vup(zq#0O#Yg^0
z`LtLCNaK4Z^(f+`nJ1OLbl+lwsP-h%1Wj|(v{V>JV2|Fm)$W;^vhnmybBptvKr@kl
z_OTl3aSojw{*p~Ha%82n(^{LArf>z1sOIY4mOmFOtTjpvoJ=8p((vUjoU@qcYtJdY
zt5K;P-U(i<rJc<jB{HUI7K}$lw<3-7bY`OK2hLOT{>Yy7UO7QVu8lnULH6Tfz`|B+
z1NhR9;(|7UH%jtqi~`SBx5O8}AkSSyg$vGYKC0sUa*D^|9duW{AHxL8i#XCW9BFJJ
z?a{U(GBys}mrfG;7OR@hVw|TXezQzzY-S9Zl+x2cMapE*B@y%P=Z!ByB{8Y2Q{t1S
zzI~INi}5pFU4_&2*6l&>A3Lbx`sgU>OtV-nXNZ-1=Qf%5i84|yn%OvDr1nsWO`Bq+
z9?Y4k%{n!?G-J@pI4N8WRYP*w1&ubc{RZF3+){k5!u^KWZynB-*Ta}ulE`mn{4kg~
zgOhRVR0*S=c`r7@^g(SvnS6^`qaI(6iCOgk_iZ|MW@AakbFp%jkhO1(`*geLd9h^8
z_+6IE_zpxLapS^}8`^FaO5M|J<{XtbS(&#WGk(es6Ksh+-Rm_S60iB=354TW_5azW
zvRr;Rt`<mqjBnHlIZx?lkLk#fsRII!^h#kP4-c@A(Eb!wgsYHPjVL8F9lvb~I_v9`
zXiNwe^Tk4|Q~o4=KC%iXW3dZH_DLt&Ew-j|Wc$=iOwN#<7D@lZI+N`g&Hdv83B1~t
z4^-O9a+mPc3Yg1O80ie7^{89$1Kc?}d;@^NiNyPA^v~srFWaDRX&LBd8uIdjO~aRS
z@=h<lB45gijIFGJv(w0%qUYa;`L<i@cMH7rel>=9GgA-^PF_+u?DB-bVt6A5VsZV`
zEGOzktqMe#uJC#B<d*~{<<s;G*~Erlr|O+nx^afaXJg)}mfh}Qte6^R*4ZV4A@m#3
z_hi1+A56otdxqy*oE@7a%o&fa6?}Qgb$IsbS)poxU-nfWmk48Agy&S)L#Ct5;tdPt
zOvn{@dZZEAKIAqHPXXoUoe5XrcXgU(+F9qdA5Hp{cPZ$f?=E&6>GsUNU+UI@lty_|
zZ@P&Jo0Y2ah78|h!kY9$eUp19(|kp~%V4*5L6)68?5~J(dve(&@5%MRKi&P&5k28{
z#PJb}s~*nuFW)}(XmYT9V@i3xGww&bUnU4EaXtM#WNFaEHQCg1eo`Tr2n%w^OO^(u
zwOf7A@*YnmMicvcAVp5lJVU%9Si(~sLOYtbUU`F&xe~E1=w3IoFS^t`V>pYyY$1No
z@XwV?Q*h|iU0-!`R=Te)qr8j@Kg?aNKaai(y=p9;pJOauGe0-~`#WJXN!sc9UD2KK
z_TA-TwcV9nOM{wwooQjC2thPHwMovb?Is;~B!E3dMk2Zm*9_N+jb6M4a}r8GFDw{U
z-l0l&hh~oGY^F?^yeg?*F7t)FIX#>A%-;eDTpL;1z;JK;x1|(ejM?78XPU$=9wplM
z7q9O7d7uXMPteJdCZ)dMs_DCqYrOjJaSQ&i<*TTyT%2vKh|hnasHm9tEG~Q$P)4~~
z-#tAG!CbEgOkq~>&ws<?+4?S;@<64H0K~`kfq?<kb9<ooC)XutcA6CW1?J{uhJiru
z`*59oa17rObaQiC*Zl?#%O1c!tO-=%+4_8a-1j#XgvlMM1MNT`z!^+JUU<#4%%YP5
ztg5LsY8Aq`7lNw$mZ@BuMmNs!Z_kj8C8%U^<oq|^$hSM5i<=Avi7`Bv(sWyRAT9wP
z(gYvKH#{R5GkTh^*_9AxX2ea?++ZAJn7R2p$t>B47TdczUmMh<E|eF4W{TqYVaCnG
z#NH<6U!Zun(6X_x%FC!`+uE=oQNMCF$~X6ocsEi5*&|#u%qoaH8(qHSbv2>#Qm5k4
z*NS=57XHqg7tM~l`A%G?O=}~tFy_*DcwiOcW}x^_qt3wJWg@h{@AsmHs)(>P3G|)b
zLLr+C&l`vSplhku6Nb(7@A3zYv#p%yWUl@Ab8&a4!cufCFK>4!ZG)ThDAPH7*rDU6
z3ih$o-nY-x^%|Ru_j4NK1M|y-?hm~45RttzmDj#1)<00;><8V%H^;-J7s?G%Eg`0(
zfnPz#qs_V=Q*vv`mxAu5OSB-Y;4rMBwyr<}J0yza&tKoOA-_<!R1)u2BdG2{A%5w`
z3u_zQ?5UG+zmq+G2jjPd9*@$6S#>+SBFk#)(5!1IZf^wj7+VSbg3NG%1;)5T<r6!(
z2HMWiajT8kP!5Kp1wyKqQE@2{=~pHywKk~^ww|4fj|OYw>-(qqvMWhtwHnOmP%a&0
zDvP8=8bgKkh?M}Wy;Wh_(TvsZR%T5dL+3}t*ic!@KUsin%YV$F1VBYiYwhV{WB7Ue
zg>DE^76~AkD<P%q=^inpFTbiZ+!ZY{7p5?2@VIU^Q!(1`LXL!H*?(&i-SEm7Tw`i3
zZ%DWZ!sDr@w#F+J4!69|ejEdp54)C@AeIoS22?@G-y`#XUN?=3in_yPSXcVC4nROu
z&hr$_q4AUxV86Xn2m#QI6U^GWb$qu4L!FW;H^W6-A~|hEfWj!89aqDlosrr+TFhn|
zFdNm>=u>Na4!^bA8Y4MMy(vDa7a)^?^GuaE-C#@Hemn2~wENvpMN&uY#=(KZ>>#(p
ztlP9xyf3K1>T7sF9b#h3X_R`K3DhM9yTu2mpw+9U)xrd0s%3(zMPl1UCl^~GLJjX|
z7!t=24E|1$jV#8GA0ck$J6x#l=6V<n4TKw<pS!l}EEZL=H!9*swi0{8y1#fHO2Qf*
zwooT$3T35p<i9V9#XRl)6_{h(-xuJ}#69%~1y4>7U%%ljdriPmMsER*?jhfuZ}7nW
zUR{|=s<wvF&g|7%P8dDIbP)F>IbXkFO@nB(_*LWRUXpCn96|jDdam%vc&FovZy>6l
z?$)7$);ay2clVju{rb<H77ZaiN{DhX*~^7gmf>40JJ~}$9Ex*odHxH(m}|Q-(o&$I
z=`lu@gjWUL&80tURO|Xt&=aHP@<c67>W*QlSbi|+H7zlSwLY>iRa&2m(`$6yopQS1
zeQ}GwC4!AVGCqPc-5*UE#_tX~MOmVE|6`EEy0EmQj87N8;68k~Y&TkH7eH!2X3|4b
z0I&`fJVTQ0V`2zwD`Gh-oJv9C=l+EYR-9KJl2ZULsAs{&`YqtUUD=uhjwNijuDs0|
z2CZby&nD!L1|972Lr*SGi^cAEwF*r$^Z{4^abIA>vwbu!?q+S9_CDs??c27s${V0G
zZjyI(EpNs*_eK1SMINa;OJ}FD)^K7aediF5D&P86&=c2Xa%)7dn6W3vkK!<Mh6eSV
z$e`RMkNB-|dOix+Rai*5ocMd?S5*$j`fBNe?8@?9<cZG^u68>I#e#N+_cE}5B5(T6
zu7xkv;dbZfPAm%0xDJf9PReN&_w-`jdygxg1|}^WNnk3+%{cz#&pqW})@m0My)0zZ
zWv;h}PpzMnlZFod@O}SvR>*BLN`zLs?bdFpIQgCWwcO1icJ49MUA7lb(eczjkngCs
zGpAtb45_zS!fLI0=4T+h?!#1cF0YoV1(_J+JxF7t5hZK_MCKEEN+8S7{T03iOL&F|
z@>RZgVV@2?#?IBn3|fSkY94WKofYa^4@ft<rI^*q!2#;j8<#sW5g63`qan!j=ukQN
zc!bb*hVG~zT`Xo%a^kYc%b2HPxe~N;u+ZGzxcHG-DD~Pk4a+S~UgWVs(b0s_(+QHA
z@(#n#q<WwlvyC{OvHI`mCem$XY1swl+4koW9$jZVyQ8)3VKjOT4+A2ZBp()=Zh`sr
zeN#zxuz1Yv?^H;cOlB?TyB7e+ZpkvIh(nGtYduy+lz<P&!*_&0J=FC%8UxI!*xWhc
zubNB0ZlcjPwXZvr+Vnj##MeN>@EDs&?K2V&+<&^kH2-05YW|ms*$d5wangwjUyx<H
z1A2St0pSaHyyW}uFM&y!Q|`~beUGb{hB#}AWu)%G^--pElQ-!bRmhBHlHffhS;2+5
zOVq#gik@5M4R_DZHz;(?MzDAlEmeI8dOo1|@$z=G9(p5=8R@%q6hzK*oas50K}{^a
z>^e{tF)4cb((%Zp@{7NAHfK}jRBbwkqW5vHm^ALp>HT_tslo36UzHl09)+G5t36c3
zHoSF*WhtK+t<acs&8*(@x!wsfxmk6mSx)y!c|g?*y$#q&67vMd2oc#$YUamh`l-IL
zdLG}2G#;TctRUBE0R#9(9lHu(H=l7jZE=1F;rzp;4dDxHVKwm^!!Bz+3iY)4gF=G}
zcZ0j7sAdw%HEMGG*#~t7kYM09t`%%?b>HcJtlzVgwY;|4qTvN;xHIhc+6(zMTPfoP
z1tERx!XOX#Sjt*9n<cod{#Rxm@rq7&8?Xu8pn=DZCq}G*UqiT1lT27c53CrBwjq@b
zUcgUhohw81xr+?I0`$VpJUuseTZvg%SUejFo2kD9fwo&r^2&MQVk#XoGcz`Wb3@vj
z%ykV2_S;w=ba{@#!Bjx$`Sa(^)N%vK{0bG7CVG0qGEu*C6jIAc1+44q>u)X9MHn%*
zc|Mzg0A*lIN{T(i&ToH0`@A7JK7R4Anq5M|7+`sv?^12QN0EpLAlC3y*DTldH&SlH
zuIUQ}IC>V!w3G+w6A2*&cDAi;GtO~H@cX_!Bd5A^0?y~;TG5_j>QWD=xDodDAM`jp
z-milw84YcEG=6he%(S-r#8)nqG|Xk)%tvO$^*shT4Zq&3q_@O8EP3h@^*U5EpjmA6
zrlfxx8k*as$Ei)3$xN=C6g8$x;^`<hM}eZY4v%)|@Q7n}rsc*-R2F!IJv6a11MdV5
zop^{lu`1$tcQi5;p3GL2Rrd3Me=cRHyacv5i)_dvH6FCEeE>JY=I)g)$gCt?sa#6w
z7xg|=3MTZpDh6)Y@_yg8z>LR*4t1)_<A*L$GRn@;q}KWk(+BR_8Y>QVJ|E_dS9T)T
zP`dISUOda-ZqDNPkLoMpIUV6&>a`=BUM)JCS{01#<|_ctA+P5l;=O5X0E#WJfo9T3
zIs7)SEFocci{|RL+1Xj;HcEl9)>O1C81`ObS>_$J(tnpB&c!-<Bst_N<f$OWP42L5
zz5PxY2+E%TuM~&c?f}riJfP+SOToMhK&S|jiPFlES28v>u4Le}H3il$4~=uGO%jnK
zK#$xFrdF!aa1w$MD@9oojz^D*T~PLZkLEig6PK558+DY;wA(ZR?Y90GuNp>!UJ&Ld
zaZhsas|6TUV;7WXlRfO5*Dyo0Hj=f5tO}>gp<vqzMQ=u>{RqW6av}Y;$iJP$Bp6Yv
zQ`0Q5YqiE-@@}{%SgRN`lg42*d^B!E$1J&-J3{DSmL55&2L?71B^@ecb&*@w?R0;8
z58j%9o31oN&8(<z_8^OfEPo>^ZtY&`e6I|q?_Nc|dzDLWFu-~OjPrEyn0xm}NTAiZ
zQ)ib7%>lprRPw#5+2qU`MTFD<+Rc3DLUJRA95tjUaHlbpofUo40GhB78A`NVlD#bD
z1Uem(h#=9Y?~j#>J&V-sG@p#yob6mkls^^fEsqPm{Iu(Xx)lqdS&5>cITz|nC-!VY
z-~_Y=C;}%h{krBr0cu(SVWPh-tN)zf-?bFU;=y#w?gWru#y<$WHm5l7Qt^-tawWY!
z+-xwV>TftdSJFBXmU)cvL-%wxU_8R8^Ee-h`ZR7!-o5)pmiHL+wbvX&&HzaA3-lCU
z^`}!GIg|&S=$xm9bzgC=#x>DO%&AQ<157}$s7-wMPBg3qqg+whT$zH521daeC}7%i
zrKn@gR{~sY_aA*8Z5cdX5pf#ssNR;pDC!Y_3;}g}7wA5M@c_q?VWGP|Y)!2X5P+Pg
zQ{U`do&dA)`@Fnbr>Cc&?GI={N5ZI2pSnL$uf~}2+kmM8pcI^|o(O_ZY^y(zhBTs(
zly09lYUO9|F7)r{?nF`~u=lUt*NfbIU~-Q$)D|3o_w|~}WkLQ~@<fh|LEvetuk=JJ
zVbDM@*^*O#%q{We%3Y{Q_oFc$QEa!=@Mp4vqET05;?HH7HR?MhMhQVe-&iiL#q9MK
zZlS8~H_O!6P)~40k7=5%Fw8-8w;=2JnJM}!44y|d11UWYoAm6Nro#H?fnGfIpv2!V
z>-YEV@mlEe+$xTN_D{Sh8YHZ?_s)1U6U}-5QZrTAS8S|~W{rmV1*scLTNbr+@-@}c
z{TGOMSz2ybgcq$Y&@e_B7hDTHG!GieD}h%zFJevt0++2#hQWA|F$h9VtDhOe<6qG%
zj;pb`*==30ow)qcY%S@c>Q@jlW!z=|Cz{U?LP$uM3x2qGY7T1<=0TUwN>>e`lT05&
z^62ykjuUJjUDO+FS^g5n`tV_)?AYr9F>p#`6L|Hd2%2)WjNCl{r#~IF77fdF!@43g
z9-U8X{1wZt0*3V|8xJuP&_yy^WQh@S)}rnq9qV-}s(V~U4MBnP0BI1OWAQXN#sb14
z`Olx-Rthk8azM-z^{H5ap)<|bu=*Ti4B$X|-t{dD9spuAmfNHuX)tvHEV?X0M%_xs
zF1Eb}_yMP}ToFI$LQ>sbP>q}iJdNO%7V-%pp!-3Gs0R=6;wQGfslqTVvpsMk4oZ}$
z^~Z`!8S$W-n^ar$qwhYu57=8eUHLZ-E^kVgnKi@yjDhw?#l1>r**{H6k>ZV~uC;cj
znXb0C<vX`4Mwf)QxE??2N9Dun#d{7s8=qoQM>iwAl)jzdnNPQVXks_$3@K*QEbTVL
zNf<z;o2($HAa{4$(TeuDvaryYYS`Em17V<%QWU+rv$kQ2XFu6`f@0J`6Q{gqoQgsf
z>}Z>i5l5FYTgGLPnH-GDcZVp{`!X`m+4Mp29ba41|5@w3&KYT^F?0Mhes;zg#H)Vs
zq6e`B7tzRQ5&f%M^HWpCzL=E)E1*KVbp@*-GDoxmBvBz*Zzk|N;zI7c$KTW%(r2sy
z88}RsSV5Ge9%C9xMe?3y08#X}GK{B_h%6Z}19^#255rU|n(B=>msa7rX|6du_z7ln
zYFaK9HyIcl2}P=2jwMGN3C{#n4grc2m?I|uP9E9oZUYjBM11$S_!Xr9v7giM9VQzw
z8<5#qmj<K0v~P>C1M4jF(owq2>}S}yxw*rc?X;G|y#Z++&>7)37xiR(nbk^W2>93U
zaG*K4K}Tm_J2hNsqp>mrhlXTw0SBshAP$@{4qp3ouSy0ta_1xPj&NrJFuwxqtQVgq
zMp#<dw=|tjQY7<PM1Kxg_xANbu#GQOee$x%;ye_;L~~qg$I&8{5g!@HAj0ZjLDuIW
z<khh2A2Iy!B*<^7gdRHnnS@5<{Ut|Kqecz#36KZuTo`{9J{mVw@f|+)So$Nyx1f;I
zC0iB0H%(HIg0%A=H)zk7A$(5OF^<Z6rmdL%&$8pmE6oI-*4<bx7_P%=L*tzKY9FD&
znn9b>DL}ZQAC0A0{V-!_ct+fn9^2Sc65F8Mxt$WiiI8U}=Pp~yYCHTKXr1Ac8fxy?
z^PsG>z-kYcE_n1uc5O=^T+^!;Tk&PmzYmw2!`pB9fjZ#>@dnUNMFYj8jw$ra^H*=L
zK>M46CuE$=f%{qpz;q*IkdW)P<YJt*>hD@%y9?G<EEF>Vd*Qjcxm~Tn)n-<lyu80}
zh9sJq<A6B{FAFKkCvtz^1COltb`MABbPfRHNo%vus2qhzW$YH1<O_0^`Oi-wLRtc`
zDFoL|L{SC+raJ}LL>vI?eFaDU06L0)UM(yjeI=j)j1BGsZ~y=WWAPIN-kvK%&p_(H
zSz=fp#Bv_1Ar;-1D(rvXLjm1Q#?$mtR+GV;nQj{#Ar_lR1R%M&K%;^`n;5jk+mFF+
zn8O@Yo^+?@Ie=N(P|pj&p*95Uh<5ghPG}YZx#+k8)GHyg%#!)|)E3akhOqa{c3IJ(
zH^BwY;DPg$h@&hAU*-4T8>ypq`M2w9YM}uQru{zVAAh3Gb6BU2!i@J2$|s;WR1uM}
zh>6}Z{LZ|NG$fpQz*Y*{O$7^^i7~+kd-X4!mR)Vc50uIv4wZxf7WqXz3dC5&uh4OL
zk<eD3aQm>QxrT0b?m}E3BDZM%lAnms>M(#|Inz@Go2NmCRTP_-H#8TKnY%V!x%f#~
zw+p11bvI}H<=oVx9jh^#VWX-1<j)7cUwfY=R8r!LM)_cVt!g(%*o%A$4yBO@Fr-ZO
zp5)!_zJIp(HrsWGlTGn7VAc9_jq|wd1j&h_kIc9YDO=r3*b(8Qw3VsJbQ5apY<F08
z8#}mqno8QUF&JGX@@42g_$~-!@HUO5KN8^=>aH|dCEQ$x;YRuJe<8q=nja}#^dx&_
z_%)$Pwwa!i)DZNZgZUnC@8ASHkZ~UIA5_+}Y-Z?bc>oxF-_i{RI+5*K_*vgg1H?1e
zYU=P()8+=*=)9b-{`<?n|Ew7`-s+M%+t)q;8&6qzV2*+uqd>b^zmlJ-`a7>cVEYN#
zvjdGzUa&M;2M?}m--f%)$qo+~-rNE`sF(eAz~vas%IP9p0CbQnLtq261Tc=DJZ4Xg
z&43Zf6N7p;tB_kg)i{A%IV`NS!`aDJ<o#g}1b(J#e#>Ke23%o-#ha!<RwpT4eSL!M
zQ_|qQgp?N$cM4Cr1b@EG`y=PaVqw$2_(0<57Q0%CW$Ar99h}gy2%=dcrPT3vtBeQa
z+P?ujV0#^lX9upFrrYWF0R_!!-Z3^_&(xKaNE2WKQU8aW(;5B&Z7xmN;^E4N1A#=}
z0J(<U8#oE6?e&)VhA;DaVF#YL1a1@iw}Apa9Z%YB0xvuHm8ts5=EbgkzdRV+9j)%K
z!ZD2ouDD4Ki0HQ=_R7$fHGjL`&=Z-gB3R3Wv4upll=EbbS_aU2Ua?TJ``!kq2yU?V
zxcDGxC{r>MdR~8uS%WR5EUC8n0_Q0@S_z*rP@i|8KIL1kes1S;*D1ss;B2ePHp=*}
zf6l-+^!&rR`nF)vHa3uIBQ?1XW)77Y?|~$l${Riar3Zx4OapO}^ubQbL{b9eN{zH(
ziX%j{V()#&uW9WDmCUgrXrv?G!1NtvZqGA@u1Nvo>@d&IOLZml>sg&njBpgv!kc^D
zJFzqailkXvJZm4_Y6O+ae=`GPX_Yi+N8ydtW%L4NMuP2?lK6ihy%&1{TuBJojkV79
z)Ea76TwM^XcjgbB*a}xe%-QkJn)lL3vj$0{P3%LZ7DL~KnNCj$b?N(B+;pa1|8fHr
zeO1kBGmwc9qI%1x{{CS}NB-NX;a){MqW_Hu%;g#llPv_THJw9(#%)Nd1*LdpH^oI;
z_cIM!_!aUEwsyvuIr2@k4IjhYRnTdsM!nS?Dee&tYDwC>@Wz_Ft=LN~>M?py@3Z20
zMGw@pXnmux{Xuo855q^2f@KFtdH-6?=Rm~Cw9V4dR5)$Lz2Sqsk(9x;?rC<<M7YMP
z{RBqJy%>2a`0K!(4f2ufAl8EFE-SCtV3poxw;;MF-GLw6x>oo!xCQA`)iCpF1|qOe
zh6h;*H0jgDJYVTN&Z47)HY$Bezfpw0oxfAnsxGfr+#pZkHnB1ZyHe{o{z^Bo)X~$=
z<RB0btJcK+T<RmT+FV{p!q$l(>YQh(W<e);P2dDylI*6@DFn%SDj~MP__`@so#*J<
zZu`97dc$sW1~b?BNN4r;;aCgg+ZS96qkHQNH-O5<-WgLzJ%MCR(k2tBcF_x)0f;9B
zd=o^Idp2pVp}vxN?bU|1YsODYpOAJkxPK-hNeD6+V#EY+32~bdK-bGVmBBoZ?$L`E
z7pXivA?SJS31}D%kI;<5V0>?N2{8tByAhRzEqOy}$Xa6YT~tIaEYDMY*>z=%l9Cd(
zbCNC$$&kRVSF&a0e*M~oGF0wtqBeK9?dbIOdc@NichKSFHopO!JY#`OL!kQ_X&zFT
z{4s}g1h72QFM1i>ArG^ldzgKJq`ykvw9_z<C~A2O;ky#hhx`Fer`(L_92?W8dX$B<
zMrWE#Al9;}``?F#B5YC1)lQ(Lv6NCckKAb}$nYy9ee3%9B01#uTD|-A=KkNnoI6z(
zQ@EVw1I)l!IXJ$_>Z=2ODOsG1`q5(~r=+}w+_QasfwBdFImVOI3%$7P1%_gblcO6D
zo&9>T%xaz<oblk{>B(MSwH~y^?wXt$tWiu?aBMMz#`LjtTen%~WiDGLltGnI%=5i}
z;91c6i&kpB+qXJJF;lD_8)CGUPcSukmoN~F;5Mu}P68KEARnohd)2q|dHDvL<d<Mp
zv7dSYM*fG%DqvoJTE}gISa&^3Z{`DtqLs1iyDBp7vopi6V7N&o^3;IlE@6PG{*TXl
z*sf-6ss#!3d<}-LL(Ey4c_6}wY~54mXtc3N+F24u<@YpYUN5BmQlF?%h2&&aQBG#8
z#`3r>Cf@)2k9`I#q*ogwuLM8L8*mt}2=R!#BGA6#=}JGsJF>`sHudA;?qt5Ifl2$=
z<4#0Q$$ssTR^*1wS`+ug5~}_iM<9H@IFRw>dx8gna5G_q8gISuepN?dh8ZJFnQYAy
zRjjdtg1ZZ-%FM_G6Tbj~_OyaU4l%kd`Qy~6#~|2ZVSEqMeX)Qw<-}VS_JDT${uG0P
z>eqhJ0V$epl-^x9t5sJ8BhVlft}u*>>S_ka+$dQyE`uyyxX)!&_1OKzMPU*n3;oV{
z1JJO*MQpty<Q5>v2HK<bKF)-*OApUyI-+f%>4W0Rfcr?PX^ABHDl$L|L51pX4GVo;
zuM9gqyJXp#@Q6wl+^n-7u_aJBK_T+Jze{iMH#K<3<m3>Ccu#vKa(Kb)Lu^2+U3M8@
zov7k3r@$Sj3*_bZfM)A4F+4tmBCg;GF+exsL2;$x+_)h`rI=OJ>X7}-ofjTlN(9~O
z6Hfhd-0(<%ncrG9o_Nae@yX#NBsKmF*0B1}y|n7Xs4KQp`rJGs`yt)ktbt+KiQOti
z9jwei7&Voi7k8T7wN?-hA^mfBDZul`g+=>#35KarNh8PL+qG4U23bgfMrP2@^I=(Z
zXx1}0o?42mTdk+I2F5;W!1{&vWV3PW;mu2l1w{jEGmRivE&_QkZ}#QIi%R=}cz>!K
z=d>)}-{nPb2r+xv66ErOzIzi6FeNZ9tp>H@-N9?O(}e+FP^$8^4g8-Rc#@ZtZJUIg
z{P&5l-B9kme(C8<@Rewv1K*2okZIZxUhaOM%J5N2FLDl8+woqw3bd%WrYFH9$u6nO
z%N3)xl7e3A`czDVV5D(Hx<K&J9Qbk*#5e2Y0M=;!)^gwbW8t#<{?RAk4%u!@e;}3*
z7mwSLlLej`1cMB=yqgCW^H%*c^1pf#_hUhic&N~-?GhJ4ko-}dm#V_a0p#A|s0y|x
zN<DiB^FU;?Ltd{QW}oLTzzpcI@vg(&VO)4zZRza?ISrwLpIT<(bsiiACbP0jHY#SM
zH>-JBHiTZ$Q;;KbmMX10-A}yEx3*;NW{<Ot45nF4HQh@B3};q75IZ#Bq8$ht9{%OX
zMnZ!`>$7z|FQ$C@Ze*?0dcF#u#e3Eg=-{;u26H5R1Ng4oPE)DaruwxfRsxrwgzcr1
z-L7_dLH1;tqv3_2sxM$LyT5AX{6yAzR2Menx5pSRU;vi!Lf^GnjFgmg7jzIz{wf3%
z@>z%tRSkox-7j(3gB2P@9_wSjZ(0N4g|^og%ITA&r{@;v3@6XN-9<mo^lrbU*99Ee
zjj{=X=72z4vij@vlOu!Rdtlf6I@hR*hDIV_m<Dckh&6&VuTOd9p!_*Ddf6v%K3rHe
zx|sd!2nxK9O*#G?#BJh$wH+&P32=&^Bbulc6B5YH)-F)D4qC1ooDErDcht@;=B#E0
z8uxd`z=vQ6W(F7IIt&E8%f7<%{=n>z2{D)_GhNOW9A_$ZJbN+G_X`s!p7`Zc$eIuF
zUTbVF9pfdnsE0s(c%3=3Vw7g>6LsF&(Yv&;F?Q9YJK!MCFhXkC&^^zB>76$$WFh6#
zImICO7AfX=u(bzj+1RMkI=ntVAyXLB1j=4B5MylL+N9at?p}kzoiosb|MH@07vPN^
zGlG_Q2Eh3&V8r4wDQWcau@9ABmb6V}MFlGtSKnu&GXtX+FD!8z-75p5K=7dt<TmSE
zsB$1Y+2a=g5vAMW_gO@ExFDSUXM6j{%*@Pjh$ICgrJs6HV<;t~*od*pzOnGa0HaUm
z2yK|vQsIk6P*~0;zw>&tJ4P$H`1y?$t`vT9Cb+x4UIMbBm0MJnx)R7hZf4ywuE0!3
zl+hjf=X-tKs}qQ~sF>i<#Md65wiAmwJ>qz$mD`X)`HO$?qsRodR4*NmgM-Ebk3^~R
zJQfG(Qt+F?C+@fl>z>mluzTouo6x?{Q{}-wZ_a*QZ1FrQ)`_up6cs&(a_t1H0Dwd+
zjb&GCC{l;6ER^yfdaz-fxY{rLTtPuV(}CFOOsOd)f}z*J_*bn_3?q6HTyVde7;&PF
zITbHK!!`T%`u5bTGlYxxeeYkQNS>cbH>v#Nq~TQFG3o%{iW8+bk-p@LXrJg@L5MWl
z`iz%P@3oU8@AL=_9|{G+?GVR<@%xPX|EN9e1Js$XaUB_8CCcPJ*!|^4@sbXvlP1K-
z@z2ZkTMI;$Ztx);OhI5gYv!3&;57$thkzN+=ic=`KG-WEyW*8stSs!oGQQouz-FiF
zj*y7<)hfz8e)G$*e(^yOImmB+GsY6$#cwrFoN^(?Wmm%~dEc;+B3iud>F;PEyu24~
zF-9dqCs}Z(&aw5OFP_2T{hAy7JQRizYpN^NHP)G&{`QTYYEbuc?h|v9QS&Zvrz^NE
zpKu&DcLdMkVJL#W8?D4L2mkbzX32?Y1fUHQ<)u>1pjM8&cvT`h<cncbA?Kg9Rm7qm
zq?8ihDZn@R^UJDFl@Ao2$Ib$Vk=Std+tyq-t_AsO3NJDarDQg>8*KZ1&3HB|1cy%=
z4bq#~&X9wx#1vuFTrr?^V+K@pn_h$O8~68yfo^Q_COPr|{S~~tX&+aej2*#il0;jV
z_rj&$=;(5?i9xGDh=pa*7brUIeBMShgJZs*=-SArUW35n**I-=-aSpZi>q(XRk6UD
zWDz_)jPG^3Hl|V?YX#h4;}6MF*xrIu`L(b>_3YbCtv7sUBTq$bTt2JVw*DwFupZrk
zmCQu)?Mh-LHj|v^*sjeTGvyKYSCeudJFBHkN%Jd#7BSz(#L(;4m-5-V>*Xv=WXY(V
zdJ@pZEg1VeG@zTiG%8IewVqDjeESz1oE!G*I+*{XCSLpXr^J@1!&L!lBAOR4-b*wd
z&TBm0YMb1Nk*l*e47cAO1TflQPMdudC}c{yqmDJ*rwaBRY$i~bxkX|$aR@{?QIckG
z2JaiZFhJgmG%;c>=y2wNw!WLD>9J>{gkyMe)x!uiv%SsOhMpOAPr(fUuI>)j(l16s
zgp-9pj$nbj9ZdH1AIoF>4-No0E!_E;+8Yc&-)*m?1Bt7(Eb;0m>U+SMU}YCn;@yBS
za=4O8f452|-D5~;7e5{ZLRUxKd;|e8gvK`#Oo{LaFi@719uyuKzQX{YqAp-Q@Q|EK
zWI{DV!T>blT!(=Hl>28|6*Z1^kFhfId}&zIu5#p+I?kNz8{ij$<3*)0fHS2!|72}5
znDxXBoSG@3W|M1KBmt_KQYQGco2Pw;?tx1OtxXpkcLt#f7zE;DL!7ZozH}oHBI)}A
zciLX;h>q=>AqRvf(u5tjN53a+-9`+sN-Fp{A=kzLzoPJ$Hck=1I~?>SMSuwD^&a5T
z`nWA-SiF)3PaMFEcI$l1?05q{m`w+UqB$ftiy~GY6p(+GVla%-(tK14ZBS>EYL-DI
znKjN+49_1z0y<6NfBXr~@0ws4qmc;8CLqA=D?NSkqPF_o3AXN?7(vFa!}N1*I)rII
zGqt}+6|kEADDjwIsRQT#2H%s6lp~9yK7T(toYqrwXw*gxhSxnr25HzCt04#m=C=E}
zeRnQKl1;PiNu-gSc|XHV3&=O)XhGbef$)2o8Qr|S0ghRG2`4!GN7JO;9r>2+8$P_t
zI4#p$IT_;8to|F^gSJW$__esR%awK*pURk<5!?+|>Pz{W15Vs38$5yC$=L@RARm4S
ze%L4?E}?^?qgrOW01usww6wH)rL$XTG&``L*#A1_0mzMAVBDGFZU_Pmqy(=+7qtPt
zjl4zZTKm!Npj<aF#I3LyVB+BR!rUmhgf)Kt{4QuFN1tI$;3I`+Uqf=qZwYCo1DSh@
zyC%(<UZO`P4X}V9qv4JNws#}8{a_285<KXv*CrpZ=3kF2iX8iGFDrtAZ&iROPYAHb
zeV>l{_nvx!JVMJX(_R_9g9imZv!`G5bNUwPTa3&Bab46UYu#O$ky*?+FdzVotO1i$
z0ycAjeyG9Szgnk4JM+`+xi&QywSa(tY6}4#9*vmTSd-Fm!(5m&a^LT{5x&3Z9t50%
z@w&~(Ae24S{<t5g67P$NHB4kud71-<=X~aUbn0P!grv7!=CYt_q&cuVzX1pq>9<SP
z|9`qC;hiHv8@=5ta^mr!pEfw9?r5BrJ<B+;bBHerZd@Da^ooI|jj4%^aYo}YX#CWI
znM+M*qcBZcKpoEzV}6n(A9_0sEu1GS@j=`Z?2sLCEm});@4YGbog_C4f~Fp7oK-!0
z?(P7cLPmxsifgR0F}A7T&RPKWyoq_$+ywWDwA0JOW0L<iSd7B54$_+cUy2N$mQsD_
z`%$x&5*7H?VXh!G)45k{E*g2B<|9Y5HkO|m^MHn&M_h=DA@je3rRe{qnX=OPhEZ14
z|1i`e*}5+k@H(oK^d0Q-NhkbL<t27JGs*YxQq6&LMc$2WhMCF|-~O@9>-i-tv^)kD
zyVo58?xX9DXgzeet1-*x+Bb4lCWmnB6A3LEOvhqMre}c#c1Rj>j0lijOgWe|?%TX+
zv+2=ZkXmCX8H)$E&@z5*ELXtxDN|#`hD{8;b>bGB>pPbM{FOA3|8`EU{nbln82~uy
zE7Ly>_NF(pgtj|#fM-(E`g*?dU>`IIitsbeZd_s&b({U0X6j%zR@Nlh)ehrj)U_(b
zKrqF?tLzfpSF_NXWM8SMsQOCEZ;j_TuQUzGT9ca(5@G@Qlt@6z$jr;jd*jB9yUl(F
zG3x1Jyz(wDhFva@8~%1EG&SnE)Mjhm6j~}$`Yl{AO;(P~1IKuQB;roOuC$HdV-{}i
z{$8B(bc2$<zJBn#TMQpJYfalcW;n%3$O8x0l2H3C=cQS2_N<e?Hcvis+E=*ijuwFS
z_$T*`KYDaYhy6fPKPXIZ)t4bLTuKfO$lYaH$%Rl0aYoZ>csUWx6h2vTdag%Wu4jvs
zd9#9Wg`v_NCaSYL&j#&2;=v0_W^Zj$?z%ro6mGSi&J3B=&}zQX;tz0JqZ&J5fwyFZ
zNc~_k=kletGel4baU99hpq9Js5;o%z_h@z-dtja_^%id4f90~%g&zHaFMu6|FLdWJ
zIgjFF3&j;d9rO@ZB_e=aWFTdaQh#3jH-*Hp`G%=`AJ$1b-wqsk0@g${bszu9WU8OJ
zT+o!n$9Vz*pMPf~_F?$Hn<ZDfUw7y3paPS0QKB(#VQ}-a1r(2P7nQW*PWO>Ws5eC{
z-W!Xw`R)c+_&xA1zbi0_R~8scHsmxvQ#C(=w@f}dF%{X&PM1~N*-;7v^@tjK-OE=4
zirU6f4Muf#5R}o&D+hvuUwH4-W%-5k*4^oaSD#>^qAg+IrIgmh+%pf-n!eod4?~ma
zcNW670{Wb~W(h~(fn}tjq7Is$?a;RvA7?*~?4Pilh^L*D{Lu?1l~f+Uw*+@*k@Sm;
zGhRu5gE``V2Xp+V1&^<nu3vCs{Ryj{zVVCWQS?IET^N@XFE@)UiRUA(3}@9J7XytW
z#F0|Y5WMM%6w?i6d!Xkee>j#=KH&WE=X<P5<gyIuzLOQ?f<5=6@10W&RUgdIX~ME(
zBisGie1#54)AkGk9xuZLGa23%i{4z<JCGQvFK{2s1~AtCC(@XgGZkyV<d|Se;eXDW
z|Gqa6m?S?u(EFa5V#G>&0^B0JB37umW3f+_UTD($tIS`&{*tj4zUR7iG~w#7v#*43
zttE2~=mb)=lnnU&p3lUi4LW3^PBK*tGxvt7E@-?vX(XXp@0)};qq1073icxt0CxqR
zC&~;^RRSaLLK&A&Cu5xk;0av4o*v5Z2gCRwc;7#F_P_7w-#;`d4{tF?eTfP7QX#`k
z*4^Cq2QFgV4Aks+6ceO|Kt_^rrZ`^)JI=ZZVy}w>RIb@&YVLv*(2tAICSLoC^#R4k
z;XSpU$hE_6K=^p6SjxP=CJGcAKSMC%MossGM)dj_Zr^JY6D*D2oeK;>RLess=w8h-
zSk8WX?10J;ePGCT;K&JG?~S$+cUxDWGsXAQZ<`9)2>iTLTZXw4EUHAiJB(@eQpxpp
zj3SkD4dQ})pg4@z#wzsKu8EO@ZiDfE*gX8759dav!U}~Nu#}KccwF9#eJunyE+E(3
zpLtvwYy4P1J;wdhLeH&l;oNmuKU^;zC*7U@4i@i%w#DL~xsChnQk$cV^hno6hw4!?
z(C$*ScU~#nT77Ho>h^nEgmnMlltFZO@NJ{|DmTPTP%}dkR;#*!>@VhyTv7@<+)Mj(
zDCi;s6MWK=aVd1!r{2TTzurr=DHl!C)2m}wG1Ug@ewK@<!EYsSkB?W&j9zWb2Ppw%
zaBYO6oPEn_6N}uTWnv$E_|nfVog8sx7q0$9esZqk$z1N;^HDJzrfWR-Rj(jm^8Xjo
z_V1_9VsccQVOQcfc|QB%Csei8Wo1Tc%z5-PT!XXTH^2suWsp8OcKOA0;u_d+W;<UF
z=I)MV0RC%w`2y)eJIL}A{9_=$h}>X>iq-7bNt-4-nt^c{@iuc{)+28w*Yl|<Q!w#u
z0O580@72k$&}teuqM8%;n{WrKuKqY=3}bk&;oUDY(D}m<^bPkH%NnG{u=_r{e@Gq8
zk}hkN<hl1QA{98~*mkH{YSN$h>7)eI-)#@7vJU<Ez8lKDe9sK^_yzu23_=8ymVjD-
zuhjqD)m42jH9)-TCDhXvZ-eB>osmOSQw+C%P+GGTmdsy01+RN7U4Qno)NS}!eW@B~
zEz0}nkKffC&VcX5R_cF31pj_f1Yg-zye)eGOxSoISk1&43p6!*e4SgJH!Op8E;#Q}
zuH_G$0d)TaNMe+FN`gXmLdybx!b_vS(&#Sx{-?Mwg(^^%oF7sj**?KJv3tdfvwI5<
zocRVe1k^}8d%oALs{;8{W3wKs2c6-7J9d@Te)y?y{Ob&~hC_GKRardMRz7XAABDvn
z!I&(6a4}rCOm}x@VoTf-wWK;MzgOkwU0Ph>Owq~qv}-X(Oc7mk0ld^Z1B<OC(sZi{
z4$`4^zfDLg-y-0oEj85p&}l6Q(7Lu#&h%odTWAl%{Nha9cPC}|%8^bl9KQ7knm*QU
z%>3f8<wj*Dr&m3VaT#ZkCMpT8Vl7IX1q$%WQkco&R&2LvEt_GjBMX&(O}sbg!T~*P
zV%vqwsYlfMTh-du?1C*(!1e6)#D7rK|8?zUfEM}m%}JVd>6eh}_4Xc@>gRtt4{;S@
z-oE0Jmj-78hdg}aUFnTmBl397=ZYC5u0E9x!h+F2@ZxNzche)VyILEIrLhf4-olao
z&tZzb17gmSdK+&iyVAlDuFy)Ypz3o+iY4dnC@>Y{=WG}M8H(u!xlK3tu!&kGZECz#
z;+R^>Xf)3<C$7=)wQojnD7D14XAC~~i(`0XV#3rHOT7tg^n)$jiU&H7envXZBaIDi
zNsG7ZTnhOXYHbv#x>s4MsVR2=hE(y=Awj~juYN22%BjPjIwq&ZTq!MUsiHeGx^8o2
zA}1?2`EH=!tLm^Ho9ish!3sCIe?9G_L)T`Gjovq&?TP=kdw#>=GqVfyGtWfAeV)?>
zwFKt@p!|M%32TV_y1Co2c(J$M#d`)g`u);I?<aVdGO%{C$&VSS$dNInS1XyO)>g`6
z!9hOw;{SS(Yv7H(HbNTJ#$E^GZ}GV?_1#5sIW?^yK<VvN>veh$j>2KI!&)uPu1Ntd
zeJ_FQ($HzT0m!16GfUlln>!vL#WuaEHxkCzdUR=#f2COgR*XmKv7FMIcn<;4S2^hr
z+oUX+m&(>#adnv6mzFYu$lghbrA%b&Nza5Owoi6{D)7uZtR!jg>XoLfc5drk-3XqS
zyFXa#LF_#$$S1>Qh+cvrEa1~(%G9Uxx7|^A2pbogG>YCjeI=Pqtnjf3l<z>}LS;G&
zT=vp?<h>pvQ?LbWiZgXD`CHQLWLmB6P4>_rW=_^IEN;qhucfV1dlQSzvZX1YzFCJG
zxSN$K#>1gaHL_!hNzk>n3nY6Gad{>&uHQt?aWl2H4l|&Oz~8wId=3^n;h!H5knK7-
zF(F;gR(5Zm97P&g_MiwWOW0ZrlONU^b$-pJr10y{H$>0wNt4GL2$Lrov3tgwr_0_S
z3(~m7JO?TLCCrF42s&9)G;r&*#Y?7d+yYCs5SzdLKla`;tck6E8$}dQ5!oPuQf-KI
z5fSMqA_7tb=~d~ycLFF?ItT=nE=cda1(05(_YzQg36Ty7N!}IQ+h^}*zvrCyT-UkI
zr~iDAn9NKjGi$A1z3=-y8a648kG)MtHR(&n59q@FNjLC5j<eJJbPlC!HwSdV3qNsA
z_y)c~uj3=zM&<t#wik0xyzd5<+sI2EQZl(W^U@l4IA`7SG8``)<Q5IWs9`XGGSR5_
z03NPKE`TG6yDjW8+V9U@85$kye?9*zCE3eF%i^N2$_05Xt7d@vTgJ!ArvL4%NB(?L
zUTy)?_bUF3%R!>UJYO3I=dt>$K!<KhuEgA>pk5{Y1aD?eE?{GtXSQxJZA7!GCY6j%
z*_+-$EE`i(eRA0Uk%0K3!+=RRZW^LoBwRmcg<um$cl2y`j$*GSkB{c<ii-052wLvc
zsg`8kZaAu4m=&|+VTX-9`CE8Z;Q<@J2Eb6plkhLd%v`kIy|nsz$sV)_0N~e-9O5w`
zo2C11`hkB8CDmWo`J%C7yibhuf4B0mf89Tvv>Ytj&p{Df6n(R`EH@3EVIX}_>Xh5n
zJ~+Ay8J!lqlQ>2E@=%DD_^1D#=p+efR~*-p6fEC^qQBhgxZLh|7hyGOak7G-(DFkC
z!NkP?qW4*w_qOh92~R|R`TP39Cvfc|*`(dOWsM&KZm$Rk6{{^!^nIw^4!PLjA?w^N
z)-c5ZaEge0@PNx*{!Bx%{Y3$e9|FHNANLAdi#R}`cn=RRlj1NQ`Qt5@l}^Y(xh)Qm
zVA;2Y$Sx=#^X$)Y0-h(3h9lL};qvyfDbJJ5_MGK=CQdru&2-QQ$aetOTt~T0z9ZN%
zyzCIuLnDKBwJI@zXsdgQ8v|kkJR%l%(DacukUGV!Khl>Sekf7kWzkBpEN8MVI8?8b
zA{zxGralJ1C9bjpWhlnRU)J=I6{3qR1`T^2{VL-4cBQ(3!y;GTa_P+?{jbWTfC8c-
zmB<`eE&=3X#;BXtb#`Yr=V^atl5c$L!t2L6Hs1{J1)|1*l-BDZkcNSH5swPU3GI(C
zul4jpvx(@u2PtfL8jiOZl8qB87gyt<-7RBgR{YKRIsEq&{Z$aNeHj<Imlakod5e{A
zma6>$Q4Ol9;BH~=Bug17)$Hiy26Rl69tYmQvo|0j3)M2D<zKzS1hI?IpsKB2+OAfQ
zSK@qF)fIr_HK}4ovtgn7g4}YbtBiO1;8W~)#IA1nWtue>nuwrMYXtMwS&-^H=AKEq
zS%`%-AH%aGyJ83CM~i%&!{@m~_0PvEJLHOOZugDEF7G8Edb#c))`s_wMh0LB!|X}`
z(|_}Gt-oy9h=NqwD<WB!g${glz9Xh&=*vfL-mDM-p!fs(Ifw3+T6sJ#)Esh;(X5De
zfJNL;o&P+R*lTtAR!5~H+)%^7*~0yeA;YUY_ZuM2a*HS;U>fRW7u1Iv6w>WXYJ@uJ
z_R-O@gAD66k<X{U9dRifpvf&RU~I7RN5ixd?!vKKrAxV+%Fj*B^e$5~#aNAsB095=
zs>bH&23cR;-Vcodtrh8dX#I81iVCLuJ2Qftpfz-R9_8p}(Zm(eEHXXtpePJ9<E!>o
zEX{%h1*HX(jnVx){nlQ3-UHE6YdKDJV5shM1|}uHp0yDE<#Y9O03ZEj#IINtE`Aav
z{pme4#wz4e4|1|80^=v`qreV`lJ4b3c_>|&j#-gG&fGYiu3%Yorp(OfEwy9Dj)*QB
z)`knf(|gtqQ?a67d}^#xA_SyXk6KGa9Fi>+W=&MPNOFd1j7WLo018buQqSVj+aj<~
zZS+_kHbOxy;kgfB=Po1Lj=GbZn54!*H?%DmA58r5zMrCy_~YeN;vmzkXTeTk^4&As
zwV+7h;Ql6tULSjkzz6ln_RXhXKSxmuw49IpB9Qjs|1)b+@gMgx#hBK>_LPe7pHuq3
z|1=u>y<`2KpGN%ef|*~t2tWPr=+gE@m6$@DHA>srBrobTNyy3K@@wbVf6!aw->Z6P
zo24G@+!uSWJbhb_)7_8Yq$-O4NRjzh<^cct*Cw8EKku5^flbCK;*fJEq)#XB|NE>j
zJI`F%U?aO5Uwue15exhHpOXSn%fGc~;ty}+q*X0?HD<HjG(GjVlLr3lC!7E6+U7!k
zjhbKAh5vVsg77yO+2>y#=<xXyq}0jo^fUi?CVw8U`^X1xVox@yOzJ?6eausX{~J0y
zrlJ#?#kmjU+}+U&^-Qv_?2=9pdIVi%=BqbnUI%tZTAN5ecTF>c@;kM?{!q;}a>DwB
z{|28mdUvm2Na0pWFg_Rkw{7?xcw9!!1+xpj)s@{ntq~msyCcSQf9>(lhUb%aow@`X
z=W->_T={FC{^@`Df@}T(mv13%H~zJY&r-mD-#o>_gwq#}7nRQ)^c6Gxz7uj3|NX2|
z;QmByUGZ?JwCdKa&S{$0HoqU{|88ef{ib3_VH|0j2x~KCZxq3-EuN6;*Vg~?Uk`XK
z;bzg?R|A|CAt@o|#)i~iyNWCSD}$27d%Gw_K|}wMk4+T@&uV?LnR5L<`Bkjr-i;>@
z!pG!+922+B&C@3a#b@b8!yRRq=3&vsc<ooXk^`-Jf5T4aVC7H?Tl4uZz3LpiY8jJw
z)XmAJm?+VwP>kebe7W`4TYvs79B6!N2Pudnjlfi1P!P`S>OUzd;y>*d{@0T+4{QAW
zak%ckrhf#5`tQ^KYsm5~o#m+V`P=dC|2n=hmYn14t)joq;q&>=?CoD~fINZbnG<`8
zf5+$MKOj>0x9BO}{C>VEg8zMfpYxB;ao~45*{uIH=c@W6-*)=qWb}UzC|lD19#DTB
zP4NHO>i7GMKmWDT{Ql^FzU=p{`1Ru7M&$Pn|8pCE--=%^{$JVR-^c#XZTx*J{^vIS
z*R44D@BjY;#OHP<Afl$ErglE0rlfo=c4CUM$UoOgcHn!&Z2)cTcmx652_%Z4#iL(T
zX1voO&&TYM6CWc6elO|2eoD^JkH}WotSQj-n}U%Lh)a5TdEK*Lcvj1-q^^Dk0M#pj
zzZ65uZ=G<i_LQyRe`2{RZp@Z6CB=$C<&#M)#-p=?yF$z7;Fg$k9RPm<G-3RdcT7ye
zjan7{eRbs3`Q4=AQIFeWTONes%9Wskze;;mzY>25DNFy?MjF_ypE&@$DXXX$Ib;41
z;Pj*MyxYG#C0mkT%|7A|_r7@em04@ls^CfwE_Vm(RNK$#e@0j34FI#ahv(BarTv?q
z|Lb=XDDwWQwxz5BO1JlKPLoXL2fUAsW$uP@S8ADB;}56;ZAB@-IHw47x^JI3w`XHj
zY0h0+q^`QbLB^wAEu;q1s#P;CRDgmumB)FfnuxN*z!i%R{UaVa`8uDEW}!_)zkQBH
zKh#kNh_&v4Lh<x{SgGexW@<Eg_}%vU?9(nh!obt7q0I6X&gjo;{r%@**KgOW%Ix{U
z*$;p-(6S1r?zVX>I#|v5A5ZzOBl`dTbW^g={q<9ofIc$lXE>P3N4)^u4S@T=ne<y2
z=%x#$7Z|jD2PCw+Kod5;!8!u~tyws=qDP2dGXIRzP%6Ut%n*L8$YW861ZjL{*@a%f
zIsDaX!hS9V%><DoLCZwM6PQh;`Gd3-Z|WJ4hZ+BVCN}dD)n%p_z)}!NVr(4~GkwF%
zGr4ReY`2|78ZhV0P@16+kjyt50KqQ&{qgt~CBqMk$|tX_aW9nY0nO{oxIw*1=#WR7
zCh~)JJMtWX+{_7^ry;l$@JoF@eiAe&?$M4lKN(T@-!AU-pAvXuE*mLV|66-b4yhq(
z3X1DnTU*Yuw{G5)0Bu{=m1{J3&&CCKc=&ksKFgvn=@+a?agS!=ZDu}v;}Ss4;)`P}
z`@zve#7{yLa)YlE<DrsGx!p!b;R&?<%=cBm7=ht^M7e*IYJWWh^DjKaG<fPmTUkII
z^8Bv<JoO)qP(}Paq-S`LzR=z6;L;(0(_x!IVl?o5P#fF=red0GKp*4y5c=I79yu=K
z3+iJ3+)@O72ZXjm`=O7IhH7(feTPkKca|8kirRK~J-Id9Ck2Pur{INowsyW7@c;7!
zpm~lQ_UO;^4o4DSN!S}yasyBiC3Vk!xaJz5nOsPFg~*U&7j^#~SpInmTgSPnp<l0k
z0vY2!+@h(k(7v}FvKUz}_w8XrM5t^~<S3`s_(`bs_pePk`t56G`76XRcUN<BzX!8t
zpPE81Ic|Hv$v0iiGP2C_k?VggQ$S523{2#cEhWxNyHd>>ZJ4;h&PB?7c5f%DvXK7H
z8yF}E{{74Fult36PZ-yxod)ao_@p?7<RYL9LA4TfXJe+`fpo?GZ&&)S<4wJOyX|!g
zeL&$Me-*tjciqExasN{7yJQ7+d{^l|w{PTNAkBS=jQj)4GKXq_N1ccmZP-SCwi+fw
zm@GTYsQ0=U(7g{+F+hlcBkwCnwvsGnGgZpG=sX3e?i;G~1<JjJfLg#;_zy^`mnfb@
zH&nrL-QGec5UIh0(p=sgKQm^q#z4oBulWEmzx@D#<B8pEP{<9y9aehOf>EkiVKeES
zzuM6JI1ffQlmB|Q+-#-@GS<Gvvg|cP2T^+gfKIu%uR6W&;huC=xPM;1=~>Q;8XM@a
zHh_vnco2M~<vh#y&^Bd;jn5nF2^bB^08pwsj+6PujUPYrb6)>^`<Ad1P`fWI7<P7d
zmsYy#0mSsJd-s&^fNZ%>5B5ic9lc9RN_wn-G8vv&1x;~a%B1?VPr}o)ZidpK2dJ`C
zYDs;8AQ9Lx>=gm~^cgk?IfDs2eHm2FXKKpp%hM7P=pB;wzAVEEh7aP0zj{FwNFd+v
zs}?76a4T<qG8N!FM;)?@_n3SFctFAtYH`&kn9$|}GZDHwIQPvLj`hw<w}u-wTpF@*
z8XTpnnbMt2DBMc-SY}3El}8@HU{FbgA%9p+;90+-wbYernn>^e@%;yd9l(fP0UR~@
z^=gYmt?Vw#UHA?qUuH15JSymaeie}R_KbdV1~twZRpE`(1w$VZw;Ya~Pz6E{%<ny<
zRIe%)iF{VXlM&*1OT082)Pl)}kK^xCrCRCJ*(FpAPh(0%nfut6GwYn2tkR_%`@he#
zvWZ>`$%p+kY+!K2antHf;%4%(VuRJ185o<yTykn84@Pgy;c+`IMijA7b_%hudy0qh
z^|$V>eM<lj_N)`u&`l_nz@xK#r4Hi-kBaA+1zW~IL&P-pbNT|+M1D<iyL;c2%!AN!
zIPXLVGCP%kCM+nHm$*gdaqZ26nKcnXmwcF((xglIRqhdig23MTXBL~1(o7bX46G^o
zQpTyr`b)YcA3P+P`OwqSt6P<1+X9~7WQMAtA6b~4Y&~f?`U@dHzyCoFsw*WTQu`i7
zvlk(+eHR{kY%-UT3je6qtY_(~k<aK194&W=+T%?*^jSupyH5m=n9zbKqvS38q!*Wy
zODtA5E|4kzy?Uew{wMi3ry?f;q)_PQfBe7`C96;iF}<S>wt?48<PyO_|B<n`u!giA
zX(P~O<P>t*bo5AWi(s;u-3iavs{Htgf5gc4O#q=I5<Zg=3D<Ei*i)~cz>)FY1|V!s
z(2WO*z}eZ^_;#n-MZn(77vKEoG>>Dl$iO&?T)Y{qUHCRCQ+Zlt+c&78D*5e}36a*>
z%-DKK!$t`Q!;ylzo7AR&w#O)0FcX^4&n}}`nNz2~{|u%Zd%M!BM0J#TdCXj_jzQbD
zspuhK?tg;kLJvB1K?={hRejJ+R$^<R8iqnAvCb?4I@pT`FO<w-p{^S)og7&Z0tq*F
zOHl7!{OJLy5!T>B&z_HX%Tb0)E^CV;7Je99JhK<Z$AVuL^W+LX`4E$_9gb;;JpZ0k
zi&1~+sVIuMsexzqzY1ME$Q2->ajZmbZt;3_fexT_IWn~coHOVSw%$vmZuTfe_A*ei
z59M!Vf2ZL~^bi9c4!S`m+D+@81yxSU&Zhi2^@5iBw^5$}An2t3RiX~DHo&k5G@ux;
zM?a5(sj9cbE;H&B-Va?$HrbD4g-pG(Aw%1Yeyrb)=o{4#J8e(5u}rBr_P_JVK)aC-
zD54aZHSOSA8wW~Rh<?aO5EGL#a{SV#ShcvoAovn!F08%)owD;m5fS{7Sik|0;aYm$
zy#Te3U<d2NLDq_nS))(*bp{f6f24s@$YG-7)2G3OHW~u~l`HX~;o(4}4I~K-W*zhl
zHt?%4{R~{AN^2ilMV%?Xag|k+?*gsu7xoD;PxmxD9Xe}5zM1KpkAwU&ad4ie04n+D
zIB(3t6iB*sO*ceD^K&sNetzv@(tcpcE`~AkOW?Wl<*ENM?o)&E`H*f^@iB29yK@xf
zYoEJJ8_e$d>aCaj5rX?RySNSC>>nE-@Dtl)ys3<q9D7(MZq{`C!#gw%osT6qRjv>#
zAK{r+fYqB-fhzAc<!PPwUc>W(-lhp0N9|WY>%Ddu>DNz$B5fq{(vgcUVNt+A!JkA9
zFb9&_FmVojxh)fEgFssYlEfas)9bb#{3hBo45F|Ew-cG{a;dxkbqHt~&6<U47Rhdh
zbiI8Kx-q+hdS4B;`SR#6Fetx~H^3l>YIWdK41kwfK`zqBB`l7YxXtzcQw1Pt1FErY
zv?T8+H<l+%{wq0t-}#@`<YQ6M-K!_&B!m6?dhlVG#?j?jhKr2Crm7!jYh4OsVq%`D
zs>V$eJR;Pj&u^WsVS^l{*<)&fI}WX@6ZVk(=I7@ZPq?vNn7jN!&2LPMfuBU=Kr^AB
zb<;if`J+c~0EfCfo^6uzau|~s9Jb6*)8M{yTLeejHkY#esQp9c?w;dx9C=W`S5HUB
zU496;6t2>2Xvr40o?oK>4v$5=gDrg5cK3E58QtwSZ{C2`C&1@X0`SSTiwv}sDc|WY
zx)<P?9xA6lw~OjG5^RAE<H{KG4(#dvhX7<A-p}}pasDlaj~#xRHWzrv59`t@KBAIa
z?^!r$`W9GXX1+Dcy|P)4%OGm1(HwW<=FYVn$UBesUkd2;gQ49d)IBpX*O|DaAFvlA
zJGo-^SdZ>y83dg{Rm9EbABaK3g;w#_e*<Id`l|QA(UjD>aLvVZF;QuNb_4_*Qw`pF
z^Ot)H0qt<o!&;LJqTL3K_T46>^?2uHjlx<zCHs9@AQ^Ir<8HrTMU>9hTU^7HkBj#}
zQ8AjIdLt%{^5F3)c!PUng6Lh8ZPRXM_xr^XTz=&ASIVJ%V$Lq_)ihXONUR#7H`Y#}
z2iik;&<EYe(LoQO?@>=x&T<@rK1R<f$B4a}Nt~oAZn?AZ;&n>H`dPo0v&wg7`3qj-
z8XmgT9%DY2M=v+II({j{d@uK9<MhJKn9Xj7$QW+zTdvN+9A{A)eYM;1`-6SvLQ6sJ
z$ARCBFMGEOOM7j&zPrduIv7%ok+Kl}Z*$gsaG@Brxz~;A?1W6=F9uQy@p4}5w9Z97
zP>1lRNEA7Fc`iIe)M8a<%gLPu#MT-nU6=~r)04Na@_nAiuU;}iLwrMz4pwhkZ01kL
zS}c_@x~L_3%rxg$)3AZ=Cz-&z4d)?{=GxrFJvSjEy<(5~)mT|nw?FO5E0QeFBEtx6
zTyGBTw~)2aHCiq_4fhkGavnsO+0nhFts_2KvFoGiki9|dy>h+U^KXcDcC|TW<1UX@
z+xOICN2@MYpls?scp&oZtizD@V;gE-Q`fz5hKYu5Tk3Dx^g+?|w%<v%T$m43C3dc|
z{pGyb_N6XojvvsHgOZP{iZY0Fery6Tv)Y|qKrhn3TA?5>|G@u;%D@d%omHJ?;)GQm
zZtbd~$z^C}AwSSz+{yH%*0&g_+Kdp|tp<^iG11XB(We?QU|U6gc$wiHwkX&aUus{Q
zS=fv<!-pgin}Y`Gk9a+@X2$!sz8-n910fBblx3J8?cJ2+FUJ;^z!v8_EaVlmF8~r*
zAOUv(gf6S@i#I)zAjkKv!;eQ^0f@v24+>u5&FJyf=?n~B=Xz_8ll{&MvJr0rTAH_{
zK5G=(K1=B!csd6CM)tFv=K@I`LW0R<mTSEqNS5+V<Q|?CJ35?f0#hVQcIycA;cfSi
zNtf7aRnTWGJyh7FV+Q19(A`iwPA+ek0qg1|L@eJ$<t#uAS|EyR(WqYlR!isno4sRU
z%#NxXcFd{-xNH|yw`|Bc7rZy$irR0^U4g!~g@i@nP&%p`J^9;57nM;@I&0O)@3nTy
zB#W(lufBcUl(<|wU%DRHL6zC~2H(^G`rlg-gh+sG*#?@DMy4!dSX>+JEIFk91-0e3
z9Or~&LxyFsz719&oT#lkk0&&&sZ?{*CMZlL(wn~fL{REXkOM<4tblQOsUDpp5+U(J
zVlisS1E1O%6<~uz0n5S6U*9l!=GpzlIYLD3LEaW$okP6rVPmC58S;S!1j^b<k|Qcc
ztGXRO;sSZCgWiO2?pC6>ERxZ!NWob~q0gDxyk9=c>IV@+g!w%_3FEpSOhoHCC9eXm
zooV>($Ywh$WfbjvQap=n#qvuJ5hZtR8$E%aKb@W=ivbSllItTL4#>_@k4`6pd2*&)
z;@2zF-R$-@br!gK1H^m>*LSY(rvXuNY+%F0ot+9p4UF2J$$ggn@EEClhXRLIw+o(G
zn1jt6S`rvR*wtT!g<s9hzXtV5#2f=D{evL<v1Ym+OkA5Z7Ia^#X}PdCij#H$RVMS`
z^h7f|$m`c>Gxo`%?bSY$#Y(VRyh@L>@5QqChU4=`HOVRr&;l8~iTsq5Ml4;%t_U02
zW6=hFk@M$msW;w7JNcOG<-Wu;myBig<j?+?-Wq3wd&{+;o7w9;9{?doWlp9+ufT%1
z1R-7vO%*|O=1i3z`-+!|vGHX7npwl%>QFm#nK&8<H5)PR>HQM?-Pdz<tvbm`m|Jgt
zdCqEwV$dbspYkt@qFz*GD-0H0&SxjC@uN1i!;IJz#PI5=zdmm=!%8_C>1%)$P=Hln
zIqcYCVEXC_+M+oU{;@6V(FJARy>sf&#y1LaEV4)vuUI^ULJP37t4{d0+IL!XFV?uI
zO1pb)eZO{AM6WM#OzZ7&S8z%0_TJk4i4Pjo(J6gmK*M*eR|?QyfJBBJ@DI@P%{R`=
zPLp!>W8CJqPu*)_1#+VEla*?nS5<Mi3XOL4Jxt+s5(6xs9_XD~Q!>qOU7p1C60K~S
z(@a0bn+O1k6r<Nn!PpNvge(k>;UYm(f%WAS?ujH$7U5DwuHvNkakaC%i}(hw%cEWZ
zNCdDOQTsC%K+pD7V%KBRGGswz+s0LHj`9NXt0Mu_cgO^;pbtHdUP}gVaI>!0?gX@a
zgzdPTzm_GRTy;&r!#1?r4bNk~ikqXaM!a_d;&FSBFV|`CJZJ?FlZ^BQb&L_tDUnwp
zaY*ay=`KRKoV50G&_h6P+at1mv`iKj>+=Bq!GpHQ7Uff7Frt4(MAhZAgrm1EEWIIg
z<@H`NgJw#h9e#E10le9Tbmh1lT<BAYi{X&hFi&fp`Q4+7%i|atbzkg1vmq(PJH3?z
zr&8Vx#?CmYIAuuo;$iAmE~H6`W>Kz3kv{S9SClspT%0Z8p`m438TZRlJRjB7(w`#M
zjLC00jS|eerYEB|2c*s_S(jY;BmDt6sVrXer4@qGM&xdvB1bXyHk}<Ydv2gK%L^c~
z*0I4MA*INXBv_n7QyekxLlWkflITLULfs!g`p||I;ma%=_srS30)K{Sys8;qk(Luo
zfCOKB4cF)6c+!h&i>2*pzK~Y40ff1TohtX$0fC+jQ%nr#XT~idV=&fK-vo!!wo7rf
zFJT(**C=&=wtT3^_ku%5rq>5S#BAS6=lv|Hz6+<5Y!exxtHbqa=FUehB(RK&*6T+g
z{>F0h)M)u7jEYS%UrA+i=OWGDSxb@JNut_T14g1Aw6dj}+QB{r9u@Ms#}({v4&yQ#
zidqCW8Mq|-H~X<-$XKJ>bziIJP|2en7o5+x*#=TCHn_gfTZMBq()MNaO+{(kX&0#$
z2Ql_oKF~9QSN4888pUQTP<{AGI8z8Oezf<1s~%B2<k7{W)7;wrV%K_a<^wlpl$!V0
z))Kq{!eE~Vt8M&vlUDdUz3$JIRT0Byo>|>8SQU*Lk#@f%!%cRbMH~!B&7_URbqB;8
z)ArT#FC(MD60iUE0{v5sb`OBQv+hgAV^)tOjh25TT<4*j%Xo}+2yBsglG68GF|7H~
zIqNf!EU7#Pp)a5I^;U~lJcX74-**>MNV|Z4v){pSz{0x&%C4lnglNv(i%cEeo1qB(
z%d-FaE3UkpXfsDBe(8(<vF2R9<TBvJ-dF8gSvOVp;pL=qQ9A+@SSbhhL7N&ZoO;26
zLRiLWb6Nwi)dJ#mpiuXL&{@GO6&FB8x1q{P#t8zZO0CVU{df*Gwi2xj^Lw}X4(B43
zw;ls@T1$I-{m7-<w5HQ9Uc7M59mZ?<d5jEUNl&zzfi@mD;1wy=;>*N9V`3KU>n6Pc
zqOJ@dri*{G?7O4YIr~U0+ocPcGw9zeqt@)g)#$xZ`|X~IL4a27hT7AROx*r}VCS7X
z4_d#=g!ChY1X6X?D#v~tt;02#S^CsDa44@*SzB?r`Ul>D=Ok=JS(dey<<*|M1O_kx
z>QDhsQM^7-m0wUZ(Q?w@jyp)vKryZcSgy*D(LN?kus})9;ZUzi>j!I>G2ZJe>xMQ-
z7PwiFjM_6tHM2PH<Z%^wpkZP~FF7;1Zobk83I*0Q0cuO23-5NzjVapXa9ck`98fna
zgC+8pIr2f41@>AZv=+v09jLArh9=EViD_|X(|W$L8FFwOlb*RXURVwon=~77EFPO8
z4=moFTzj#8CdXvl;yuQ`tCZ``hmCk9J!2RjH6rui9od6NoZ)sVbQ$Ou`+_#y<B0uY
z^OZOI$vbw(Q)>+qsyG1>sbN22>glZsV(DHkLC-pOt1969P>!ByfB4T~5u1(S2dfV4
zO{wsht@-w`Zn@d+OPbS&FdqU=&(SmolbW15YO~s#*RD0f)N(2$*Ly*%rGEY8chij4
z6$U}aBCQO^avUI<t6da;gbfeB1RSO9J}?tGSBK}DfPl<8b`WDW(p7(haE4?V(_c)_
zz+hD=oOzuA27`gn2;}rG6H<pi=`#XD0-?%^Xz1yAUb|R*b1!)ZhR@UTMd_&jD5-%_
zzpAvoSuIW)jpU@ceb+@fKo~252tHN;i4EbS&oFrn3M7F0-FqmS4#ooBO#|40oOb`|
zi<<qIKEQ3CJjAvFoG$5uECRFDw(8NxKapdI*w>kF7rLKT&@^Zg3(zNzs|xy|8Q_7f
zQ>8`|z4VojS;}xoAWcJ<`1Op}R1B+vXG2C?Zap*;gF_~3>j7?iPqNh&co(L|W-Kg>
z#yc}@lcZtdR=3N-Fk4yUqh?Y@Y(-g$*E3Jk{L{DAKApQ1Kdti?)79ID{FDzXU9#5Y
zd`vj}G#8nKatm>?mf7IE@!mrVqSm~V{^pe6L4q3Yz)w`K-LSwZ(V-tR@RQu7fZ1$x
z8nCL{EMu~ye>O##5_|=*(Wn3`M%a2UN%)Ala}N^U;&%=RGhdf~^~X*g)?=GwY<{<;
zt<2NScwe>CX{`Y?1y5qyy+{5z3_gm&$VdouzYq=go;szuq9YnP_pFPA-gKOxj$2d|
zzNk$DDmkEn0~{E@uB-3k3xmQ;BnEg^>CdO2=kZdxIh6qEiq_2rW~%aheok89cMiaT
z2~!ghf%Z0$PI`lyMTu5<W}%9<wq>PEpIUo3!-?>XBJTuIO|-WLkBg@tb;(p1o3=pC
z=ax@t2ZI&V%ebSNk#bFjnF(bvE5LcI+TMWiv*vnqPOft-cgV0a+!Ctj1G8%yoc#8B
z6S%Xi{_>LFlu>2xFTOHLJ)KnLXh^cP!-}q426Xb(ev&U2?boZfD6oOEdT89zfm$t<
z@K_tKm`&_uAst_0tk+{TXo}y>YRe}i=g3Vt!+A?Vf8g=*Sbq7%m$v(bNdE4(`5H<;
z%A&oM?XsP`1k0TewGBWjrsTja6A3s}zxh3R7_rwNw|3(Z%*cO#Z*_`qbb2a@vsE54
z!t$U4am^pU#JkDQqo%JHQ!<){arb2=X$uR>gYiW!s$J4fo4g5WbM6e<AFQ@&{60rS
zCUm$iWx-qu@Vjp(<6rH~-dpz+h(O?kU?F}e{^z)V);8wkK+(_#YBnx@6uaFFmTeCe
zhl|3BfRTD%#8nnRc)y)T^#TIRxsk}Th;{%v21@TyQBnK#sLb}b<Yb#lnQEciu>t4l
zA1bQ)P*PFd0%D|q8yt|$-Vzp`wvHtx2f~n3`8j5|*0wfqthBT=7g|kg()&bECZh~z
zPB)4lR9PDkl7&dR@^QeV#Q~GQPB;XE-&t4QUQ7{EaQ3BE7JFb(x>1UCd<c`$DwXk6
z#(Z<>9Hoc8o&)f*cM(FY6miL;8QovX-Zn3*seQxyoEngsOL&k+x^C29o35k?pG$*h
zon?doa<gi+s+Y3=%SJsD$VleN^}3v+%_5tL073?m+lgO^Z{IS<L5V2oJLTG)>@_HG
z4Gu1@d}WQ_w~+j@a4#ekdMp!YYeZkmBnS#@n7L)Kzu;DmWW>D+SrEv_dTT${Qa*$$
zI=HOvTTXbVSXxG`(Jt*z1J>-J1g7@sk!2ur(Q5>>SwwMVZw7wY^f8e!9yWq%F#l7V
zhZXP72<^>&R>kE{S|O4vQGJuiEZ);>6Y>~-QJ%Ci+~N2?pI(29+x|B#f~-@VbMP7`
zi~8v<nh<^}&K75Cp#MIbt9i6+W>-yZ-t2MX#*LoysEha-c2v}>$~qQy_HLM(Ovv8e
zsG=~#dl_GHd_uBPrnRMI{J>n^_hy0w0brKl44meG4Pq@ua`JpqxX^uW$+R{2!cD(p
zIjPzFHri$%_BwmBa@NbPiIQ%Oy_fF*D81Wh3{2B`X+y2+jWvpksn^L7RK}RznftjW
zE`|t)bI#9#&I{I=*9d`nfzG}_ewP<u==ouicu4_79lqTTVme8ds?#n2`L2m!GC?(1
z&Nk>Kt|?vFB%>WIYDj;LtE_0IW>c=Q@d`ZP1od#y;_z=X;sGBIfj-Da567;ix)fyP
zl2$PixQ=Z8^2-x+Ub@Mz&d)KFApsmLI3n;7U3ocgZa;H;s+M6&SwYjZheMM!^pCI*
zsTS#!z$T(hvY@#5$P&>*JW8vV)!u@B?;Tlm)m=U4dRwK%V0zJbZ4-TIelg<sBW=aq
z@ij52e!N!4-!{3+vwo))m(OzD(P4%&fb71L#*tn!zwMkj^s&cqI5kX&o$2lzr+|O}
z7bN?BP+F?1;B5vxdj9+oUsa=kc%zPB91uT8sG8k*EF%*<lcQ^dS+-tzBzM08@BfPr
zrMI?d)@^FTYDGTxqjXBwW?!{CM*P8)`E??F*mI&}to+U_UD=AKMDRKr7EBN=<jj2>
zS<dpl&yYaQ>iH#Fu1IBdYOctBF2y!xb;$Qek<CUob$m&&{N7Ni8jWc&O>|?nj|SR1
zcLWF5ES^m*!7|P8J)eAOSJ&=H27Qp<&4`02$1MmZ^4bjEJ%hO9(x+u$8#>}*mGJfS
zgV7hWi>9+0g*rcWYbN<M31<HQ1WUv;ekj1_!2fdDm$?=!PUENph?&;uYsAiHw@f#6
zfS8=@N|P2TSa5H=G>Q=jH0qm)H{R1ji9&Za$lMbL+;o0WJ>|`jjX(PE=M+f6wg#X&
zgScMd`xvUtf@~rSO}^)337rD!)q3d2W=uLRd626r3}ZTE9R7{grMI1W=6N_70c~`$
z69jSjlH(yNXExB3sqKa_feg)+ek2hCOw=(V63D6Te-2Xs#Y&J5+&F0cp4bd1+s3@g
z_SaB*rwF8&VCP5(oKifaTt7Y7gaqZ~wp+ZZDoshbc1c$ercal|>dm<Ry4)*65{d6?
z$OW24L6AbM8+gLI>h=x}2-Q{sLYLK}gFQ~PR9+G;Ee&+3)c^cx3#=e&qhW4NAB~4`
z%rRmfM_E|DdA1MxVIESautvA4RE2G>saM)q{Hg(*jS`(;`@ojKXBOna{&c<!AJBQT
zi->>>ouc)wgAwU(Gu(Rl&!aH%>=SwqO6rg9NyvdN`%%w{rY*QwzATi_!+wTKH+h;x
z#xwEjDIiwFg(e@C+rs`pOek%<6wc3u2}RUzhp$t7FJY?#<h^3EQ-HW7r_`X36ciYP
zla*Z?0V*V;!%Wz1h!P=`ImS3VQ2N;0roVbw81{L0a+wOI#K5^Q78wj_H9B>gCZeC<
z?MHtu=ZNz$-xDRs1Euod?^#GI)D1emi9T#v6Z6je=>s?n()-Pl>&#a7=~?Y*rzX8&
zDm^E<;-J}E3y)^|DgTO+an8V|Y1r$<_WtG5zw~U$6Qb_`IZcGrfVyMoPpFi<g7CCL
zvYyz>@b!UFuQIdsKfbe&CysvJ7{}g!8IHVaCU&0S=S$0=!fBrBsqgFSQ2q<Cyd<sT
z5rhvvnh}fwn5q3C>MjsP{B}S^dzwt;%9zOGB*Dzeo*K6*OShj7JFy4nw%cb6$dO13
z=st8_<XA^t&)br(5Qj3t7`^UW+Nym(kn-xM+(Uw_)1b4Y5;-!B*ESW_BZY(ia^sz5
zpy~bThYi_%@o!~-cHnW7m(FDvyH5EmP-W(inGBT<1hmgn2Qsa#t<oVMIrPlmy|cqK
z79LxuW|UyNdwR-{ZpjXczJu7@)h*!f&aF^0QRrhB&G;>Ay6O#7wr;*7cY(ka)_K#@
z!-FfK8y(K953Re{y)uE2N7I_THJ|Rs(&h|BHvsG$Y-06mWPpZk%qbloHyq(p%V-P@
z(<XA;OY<1k5dQU4oF+zZ<9<a?Fh+$w=gYTBd$wnK^(<pXBd#{QO=p>%4p8vXfi<D!
zozMPAr_0(!mQvx}RsGfL*gJa#Wz!gI5(oNDfS8G?ODm~%ne;I|M`~(?5t@e21)Qw7
zLu{r@ToX5m&@*B<&_9rfLPFCou;%4rr_A<}hb-2o=WqVm?(QlJQ0_Zdr*38*L>Ai6
z-}YcizJssLf-E}&3n|tv)KHkGvur0>^hMk(UmMlhb0OwOPo2mdjuK89O%%ldiZhOe
zdyQRB11DN*^w>loRV^K`2-%2fdSLR#yuW{~@qmD8+&`MZ@ACmc$9rJuu2nI|9v@v+
z^|0x|dpFmv&HY?Ebbl^0l|-Fn0yG)77rPOvd-r3+`#w{ft4XQ(bF;GYEUVjSauo8<
zEXirw!U5}cEi=&e<p6F~sn(t>`k4eh{ce?0f=cG`j-v_&F;xkA3x>QxLpfwcM<e|J
zoy$1q0bc-5_HO;t&@0zL@B<LfAiwhR&QCE)GKMRB=EL8A;6N*cMww|;6*@O4i3H-^
zzC)LW!%Lj+V+l=NK^1A|Q1Bc*=SgD%t`83JQG1bLLx4;7+l600_4sVP%abQX*YuG_
zYGWl8<+W>@HF4#IHCPuNH5aE43mc0^FI(QeeY>lBNrv+AvzyleE!`ZhZn^iC12=1B
zkDT=!Mnr*;w`sbkN5H{&Gw}$nyqx^O@7<*4QL=n&R%F|OVkx%b`BDLQoUbVL5b6hf
z2-R_#7cEotq9sX7m0g1INPd5$?AXid;L^}7)*LMfiftUEUWZNdh`}bK^-Q;sL9NjF
z(b#;+k$X$;kXjgz429$y#jnCjd0J=q6uNTO!<hT7ch>1CRXyLN%QXpOie=1T3T+`P
zt?Iv4c;3CZAyBMFe1G%6vObbtl$Ez4)#nHnQQ46Uo8G)n=jl+y!0zqwHvNgvWMNi`
z{8Qlyac3ygA1)rR;RebXwdOPq?{VATF0!gk%|#@IDiW79Oh^r2=W&M;rB)x%D=$UX
zBdV=|_~WgRN+?>p3?7}hX7fb@YrHL@*O>$%31!BOV;1g9hg*6gKc!)fQ|Y`fvF?h@
zKc*est3DDkES!X5&1+@b(`BAT&Y${WIpTat#pBwO#!D-u8V~pH8Qgjnb~^q@EKQ5%
zYN&w%!+esTbNu%H=$c*2kn`hcoV13W`vo5%_|zS5y~y>^^7Cy)tq0GC4W62m_nr;C
zvbFMfqAqh1A^v_t?0Hn^VSm8Z(vgjejG0Q}>?HE_h}SD)^kuc~a|+zfxycknISGLb
z?SBA9W(ta^N@J0R=Sz9)_u_&&=q~ZT-sMO&A(xGg$!hC+D59dM%T8+F1#p!M-Cq;x
zm8{M&h|uZ?vC3@<lt=7J+j>@PHRXtG_b23+2+q0<(wgg4MeOz*VT_jMp44k=s&Mny
z*UQ6oE3~*>3^k-*ZSPi}UI<NXt56y1=Cmn<^2gPPv4ZPh$ac}rx@e60z!M_4Sv!mC
zRCU|@#NhrRC|t)?cMZP!!G3<hvA(WwKjnBU#A<uRWWv2#Bth(+Mqr=OZNIBxX7GR+
z6?YwxYF%NQCndsf#uO|ud;HXby0|^&I!5LjYiIwEr!~EzE&ilpt)q$Pj*>j!MQnM}
z9@yZ#{pA_GBwRy7L*9QVNj&A$S0Wi18OsTrl!WagWlSlj+a-O9XAnw2rIaBR!Ppl4
z3{-$YCcahOT%%C8eizCrB%}q>o?#iIsTh#@8vR4Nf3&DiwNUrl9AVl;zb2w5`2f+y
zAV<hkrN1Bc*$|b|5<uuW%~7*oUe3wr63<uv^PL$b!{n9o{c(yLVjEFJO1eY##SJ=5
zM61P3_EW=f`;nIW?_Pq&t`S&e6VX^=Bv)Sof6A+;tW-M@AbPLVU5<P2-f3WRU~%WE
zmpS}_+t2s;))D2Vxa0OOGM=uHTkk9U-#SovKvkJEj>Db0JsfjxJ-J^n6&Xmg@+ozb
zI>5tVwZ47*HLADGjw-8(Xk1K)QJ{16V3KmudUu}GNj*Tw_7WrJa=UIQt<8pKF2c(8
z6yp_Cx8!Ni^}|z<*D=E~l&p25RVCkMNJHZNf}R-D<Xx_M)I3-9Vj>yp`%RZ?hXj&i
zGoO9KlFRZv%lq0ykLouH^leW$X<y*F2EvsaH}pU^Mu*2~<*$qUnR`*Zfy~l|w(FM`
zU4PW(8*T5_S#9sd4Ss&m=+i{RaN3tNs6*a&xO%50?;*psm1afhV`@X_k(JUZa}RL7
zw53Bz?Z|96f5I?#@9Ghuu+Yxp7s^5wNRtE4LEj3y3Aw^OuOE@hb$SgnT8Whk6|o!8
zkEmwUvg<`N6OFK`KBEi#x;T31Si6N+ef3M#>;uuM;o0r|y>~%b5Te(%r*d6`R^kI+
zucS%@cC8G2#wcCe%&(~t#Onb8{ococXY`%j6jD|gB$w{|WCD!{7aymDUspumx|Y?b
zSrxIjK0Wawa_A#qG6KvznChykarKj1Ac%TG<Pv-7-aPGN(zzigNhR;B#RF$)ibn|Q
z(UG`-^rs!9&<k;#<Z@9{nR}zDm)?|&;4~7r7x_r&j5Uy-uH1f)ZhO!}I2#=zmHEt;
zrd_IlWR1Mrn|e_;-%h!Y;obK~y5DSPsdsCtJwIx{bZZ1fK!$Vs<i;p+M_;8I3xzaf
z(Q@QTcU%&qQ%NzWjml>=U|J+k;vwdS?&&ZAWN)!cQ<mX5K0=APawZqI-9PvkWq6x;
zg8teB&wJhu@EKIFrssqLRV72yM~~d{Ip8ogxVq9c1+S=^WA!k3FKqIN{Q>U5>JLv(
zu1YqWWUgVe^P)^R^?Gb3e^?Z6z^w;<SV{^CCqrMQn+pM*tJ{q|FfzT;VK=UORgl|P
zuH8rrKmEpJj4^r1@nW^UVQ@=;yIP@d=L`9(e{g4#nJ4_D>XR4VcMDHA%xvB69vki2
znca-(8>Q(!=FC7@bcWkkN)Y{oZN*@>?#(RjF{u@b9erqZr%YO2_Q0W@Jb5A~u$f7a
z@W2&V|2CH=!vpvEK8qNCtu$!!_I@TW9|z<`>12Dmy1EQ!MWxK|Vb`T?eXi2#Z#z4C
zsDVrgiX8|ydtVPFz&W)8HB+PJ05bR5y6-iGe|#wdGHwRhRzxHu>*B<hP&6nF3vD#Z
z<gn#@g`$cI^TY&a=1(U-(RYgefDqe2+EGm0+w>gP`#32(E9=>TltRkM;-c7cIS3*3
z<c-nxLg!#-c};jwg5Qkb7(%1*9ia}e!XvH7FB;xjw;jf4x|^C2I|E~6?>*Ku^d8p;
zGR{d*c=VxRQE3no+Vej?z15f^O^&}kkQzq*grkS`y>H;8v5;br*IuqgMo#S8*}+T&
zv-k=6ADbVSoy`x+uy)%^BR6k}3a<ne5%#>^La4Uq$yvCl$gE=B?GA=ysTdoMORrN7
zd>bIQ?>09&{7h<C_=&ebOT=lD;AkW!i862Uw5Ynu9ksfWr);0xY%hf)FWq#orXA`h
z7gNC?qoHaK&_yQ7{n(=jxe;{RE~FQ(dYXIV?F7nBq9og?t!7a~P=%7CG~93omv0Dt
zSv&I-uD*l5v>VD|oFV~i@DXNdWs@aS+TM`gK>C&>MsB*y>fC-`xRks-s-CF=5nJPH
zHRe3lP+ZW84R67XdGTl~4GY!;T*j|oJ0ryayXU3zMsR<4Yh&~0I|F2^EQxF=kM$xV
zKbA+q6R9F3@-Vk>+RZ+|kB(fd;TTddy@&lmZBo(n{H*Mz2<+8t;j9j;GGHu4UUG3-
zAC&H+wn?OT6=mLV+G^OVRmI8P*IaDFB`y4XyW-P2k7SigC)StGXmqFBu(#%h!Mh+$
z-yiP-`+B1Fp05o2oJctLil~s2HIjyAp=&=H)25&mN6Wy$vimO9LF!iLu$P^DvhpWe
zJqlhb+}>1TbOZn0WRl&s^7n%aNy_LI!dr*>Ba94dMS=~8B-ymlJ=ybP2XNzy&d<-h
z{6DbD)GJ0eN@o2(D=i%G-ZQc__uIM@)sVZh^f`I)85~YK&oVr)7fu=**t^0mMmMIz
z4Mi40(P9%hg(g8O;{nSTHWQOr`Q_!ux?Sa$BJ?bkm*0$95XsYB;U-UxVm5G>q!XiX
zvyn_aUTXdpt)p#q+ya^RkXkokmZytPfo|nZiBT_Pk4-HM@JfBV8aS3bq4tH`z7BhR
z55>*d^WH<WXc@m4V=%j4FU;3AHq8;<C{d9*&jl(@P%!Q2WG^~7Ik`V|^Zf2%Q%#*b
zby>Tgp0|Yn&4g>^IMk`3|Bw>)7|CZby0W)5jAvU#d5kjwDU8J8VXUA`vZIcI9|>NF
zUEQ1(KLO8qPYrnm?b88Zin49fTO!h11l&eJcf{{j`D8g=;7a){eT|4F#mDU%gyos>
z<M{YXuJdoELUeUkM=#9Pf*B_LVum&tg%&%^x8%%mt_`Z<bfwe2TVoQ#wJEh#TMaqu
z)aa|`{h>i3@bVn-2YxUw*puP+HE)D@&B+2otEgeSd>BA*E^j`low{pD#5C~B7?PWY
zEXE>2!RD+`)nPLGqHnB6dT(?8n>t|d58~$nFuaH4vz={UmvGivT@c5d-5@LN%7F-P
z?%eGIw;AKjJDy4m<Z*X>#L2jP5D^Kt@LuYEUy&4bN6p(DAJf{X)u`<)vd_$XGUds|
zZ|`)qpH6(Zueyxbaj#2=r1-4s@v_;s2X=<$g3LP*oH1oK|3SdtS<K`TH*%jY(yqO;
ze(wVDlBIpak!h*dct_&aC>xqQJk7!Z7y7dOn3k#SR+<4Bu;TcwLk*a0d%ef5k-~QJ
z-qofrgZ-{vPbn%lZ8-LLkyKaX3SEGD;OZE4aVTI7x-Si81Tt?7`F(hZM7x$=d?G@7
zw<^T|xDpf-@0y6(iHT|cD8FDZ7kjCuJ8Sn&eO-Oo(+23Fv23=k=tm+Y+fxOnm_%}u
zFYxqA$ImT1;!}lGXFuUan~z35al24BJF|rn%Np};Y#U?QeyaL9UYjR1@Oh6dz0~1_
z`7mZ8)DH2DZS8BsG)2LILE+MO*7~}-?#0pXBWJns+CiX1dHC|$#XCjTvg$5WZwzLD
zG{g-+)j3=`QA-{0+4WNEdb>Hra+7cGJKJ$`s~OdAtIr@Md3nz-(wlOK28D*k1O>H`
z+vr?>e)IP2Hg(GEoSf+3;PVEZkT=s_z&1U3qN*nMY>2<Ar=QT(e)B<gzDuDGM8POg
zSzJw3sj3EBUZ+mtFCJ*pOLxugl@8tcT6XhwqiLoFsD-W;d+xR;yN^PI3VQkr#_#I#
zi%1)4dxM!ihNwIfBO95QwrT=4uEAIw!J|uhmUp%umJ!^QJ$}{gwesl-SK{e(Oi0ef
zhxv40A0Jm6KMW@{nwojBG3fl^-K)V22XvtrYVrN@F0>`cnoRPjYSruOP{=}#+E~YS
z;$>0)x|GD4@nQLO7qu=IEm@~5!fT;(3Ew*@2g|p<Tc|-J5b&S254@0xMnt+qyqDFo
z_e(?T&n6dJ)c)mJ1Z@nK@7UQ-mBH;ti&_HuTGz-ixB9$mmE}FG-w9*g!WB}9eEPZ=
zvG=uZi<CdZ?k+mB<~Uwt6@e(et#e+q6>u<(KI61x&~b7P87PvDu8iJP`eN9+TF4{v
zc^AM}DqcUXm5DZLSVrdWu@R&SxI!GZ&o-hZh4hj;=)O1UII0H<U_%j?5%)VUP&j!W
zw?u-+4+vNLTZeB`Jt@>ET?+bYYLgmSTYvfT<y8#?DJf}K^23yVx>6)lNI$H=ik_DC
zN~w=ix~SXX&sTuZC!%;EGA72*)8*D~Wp5%K>4kold`b1q^9%bo@xI`_RPn<Kv-)%`
zXq$z84`s!T!mo(5<LP?zh*M>8%C6jn*k0puI}+#3pN3aIFfP6f@<Ldw8#Zs6YZ<3A
z#ZnttL~V&tFG*WL47PSI&)3QpQ9Pep`@zF1FL_+Z0bg`h^v|8H=j&}9%E5f<lr?pz
zHsZ7ID6s~?A9F_pJAbi4sGi=ebv&fiJwa%)0247&8gRRFCFup~jqwnfO~HG<S~kde
zQl7BqAu$CHDuyg%&!<mP3fney7@i|D7p$5qdvh+Dk#6wrQvf)tj6sOqfnQ)X6|?a1
zwQe9doAk@$2S2k!&_X>rLE!$2A7APFu3j&ji`b#(^|j`nDD*alCW32PM$;{B(5Q7B
za~er`CaHU`6b+fQfv3pO3fwvSkz9+#bQ5pOLvyygK(LaG3?^Q-Z~nBN*n6Gat3<`w
z?dmm}Twfwu(h435Ne!p^;sqgwP<__3m1tl+f<6w~C82KJD0u-|yS5UW0WEHN#b{-^
z*(KxNi16?Sag(!vtQnv_TGZ`rXRrp+Zf@0Ei4rMgu?=WLAfQxi7;${;nfde7m@Of@
zMb;zbRFb5utgO2*ha!((BiD1UuRBl%S*6Hh5lcSI6gTTtrD47{&HWm8J##wSb^kCl
z{&Sk^e!?s1!F<_y=ejEW%pMJ`bSBHP=FscsC=J~pdKep(R4SEGJ}U78xeM<*AqI)T
z4RSOQ@&l=teIDS%F$Dq!b(z#wQ@Kp{`Q&<nRK0ocini&L<xjiKp!8>s$M{)tV936)
z%BeJjM@H{pGRtoG#h{6{KeYb<lTQRKJG<P)vNpa`5m6&(rTEqzg09%v*=vn9IoBDV
zf@(^M3A)|hMEW%2p+9Zi{ybN<=$y{kg&&ATd9-1jd4n~>ork`E&CzhLf$KVpUteV3
zyCyJw_^#uVEa}2X>rqMVS8xBg!)a8Pnre3~yYqTK{Oz`;n{BV^k-2g<=l3k|Fs;ZA
z-at3+jGZE08jDLapV~~Opcoh+mBe*BuqX6h2kVARn2|k|izKm2l={t>i?)nx*#$%2
z37s3)+x?yR;^+(Y%;(pEJH;2MFheoGLsB|f+dH_a*|Qk}T<O(e)}jEl9$TBs&zjC#
zeJjtOpPvsyPAX{ab}l_8s#8%@W68+KXp6o{56YlT>gIkhYHDg@j(1d-FH1w}56(g4
z%4hAQntDp{i-)6QmAA2;07x+?r|vaSFLsWmVdQyNDv3L%N9W#}o&IsFPHQ<};#eqW
z9^E2CBTG?v(X@!F2~Akqnfa7RmW6JX>6#A#x#uXOWnHmr>)|G)B`ZN-Q#QrDIw`~E
z9u!j^S4>@rX2j&Q`3G}vi-(QFSUXAz`YQ+=rlMZS#7!LlQ7M{qj!UfHQ9QEW{JC&*
z-{qQCQf*%~0@W&Q_zYdia31H&L39{0Qfy)+r5E}<B8G9`0h5RM3|tqcwLiwk=mCw8
zjk+r<e(F}1=sh{ayuQJd>H^|@>`|}P+`G#;m^`$RjB3IY|12!SSrVob9~GY@dRsKs
z<EOZ4>B$&I@TL+<)3GEn;y#h=95>QIW|IeHSz79_LRv=(tOqB&)dsT*Y#scrx?kUS
z+6gZr$5_Cc1|s~RZ~;&<ZgaUvLe3Zi&=YjBFd$ID4<n_QyWI4-fBI59>ui^km@}1;
zkrCMI?1i)BHqWoykTaAk)DXYE#R6_1pNyOwAIxFA+yc6l=+f^crV;E-2pGBX+uR^e
zwtZjrRZ7bbPM)uvKTL~xgbcgKXVqIu`M+d(cxx%v25;vwyz7()yrq0^>_(=@%M(po
zkg_Eb(t6r;OV?W_Zq4j={m^mWzcUp2=w0-ZQaYsdkWs#M4`khzRf22Gj(Q<Vi-Xvq
zmuM~0z9~}5d7UvUkn37q3WVTtSw)y1<XHrs-w>Zt8GW#s{H#o;;m|p;oT*(mtGl?;
z+9h_Z6;og>SPb=Z+1cQ|?Sh|HA{RgQ(thONNzD;cf3Wa1ij~sh=)*eF)!ct=wgwZb
z<NJZ+i*c*0Ej0X6(j)vR#BWlSof<rY>|8DClt=c;*$Y%t2ca)4x-8ZfQw6jZXD<7T
zLa3#F?TX*KFdSXROA!SXbh2kenOj(dAw2_cSW&&Gr9P_Ur}{eI4eokbo0FK+@EqY8
z!YX2c-L;YK!vcuou&4$A?eg*Qfy9@iW0{}7|5e!=03Sn1Lu116?xl*#D!1PK5icN0
zdmnaUy3CpQpKr2q<1B;xG>uR9apuO#;>tB;a@XmC<7ZS}XmR6E*T>A3kWzhX+&rn+
z4-+uXYyC}5Gdo@83q{QFJz7Jk_D+rFXvgAWk&N-M3Tl;Z7p-pE;JOzn-n~H!0goLy
z^zPlxNVWCWd6bdYHM^{Q?ervWHe@@2kegAUG`WRHoC5a-)x6#HLpZy*$1lR?l*MeN
zgfVdDM0j)_TYBkuPi0PSikag!DmRh?dpn~2f>N9<gmy>f^G2{TSU9bKp@eCNG={#N
zQ5PN{F(D0yYaTi3*h$!)-M{`;BJcWjklx^WHACNxHYe{2%q4}KCu_2(+cto`9OLr}
z*q_UTMN?%@7S@xCo}_i~|1e({&ic;FGhS3H6U??A3V@A&ZfX0=8Y65J11~xX2t9j_
zlcJ(h8~VO|8^MuL-O)x4X4vfuQ5BDkxH%84nV#eF0TyRoC=dvlyaTc%aT~s4_tAbV
zf=bEL^&XYLIDzu<R^l^Y&m1?WT}#VSQpCMVQlnpu73hG;1njT)Tb(*9G5l8xI;W^(
zlEvt5;9R~FoGYdpO8e<KIvdwju&r4b;)bg?h0+(Dp-FEi?q*;)7(GScOdCymom=}}
zm5y-*NHuXK3LWjM@q9YwT_%h9X`Q&(N>nZ1igk7~+TzL_tAFiz5a9gKM7`umz<pww
zDr^HBRp_2b`&plE@b%k8;MiD^pS_YdiL;?0-_9z+R@*pt!7*WP=v~8dBNQA2i9O%U
zuf-;l$F_7_V=c%lWu8vstVbEVQ7$??xjC9$&zz?<zkJX6N(|+7?|Re7&sp%p54C?>
z7-$VJKt=#J)N}-=ry0Nea>EAd0!2EXe^ceDo#S`4z0oi9O6T*lR#zn8FK{+j-@f+T
z;3~}BFYToolPI6%WZ8>8J2l0vom6X@lK$j>QT3JqO~visI31$}X_$ZtN{e)ZfQk}=
zf^;Y#-OXrFQbh?tN|f#z3`Uov5~D}g7^4S_!T)&we)seIpYvibx1Dpob$#mcu@xZt
z@9Nh?nv<vz>-{x%BoRv)SGtp>H2U8c$jj^K_78KkrL}WzR8v(3wS<HtSb?^HR~VqL
zXF*lf*cr>{oqr4047tRzX@CSuF@o029<5~^sAc%#g=e=CD}WG|TT=@JYUMoE)kR#R
zCyLJvTuo1&$g2^XE&I@MIkpfw(g;3&`t<KL>G5}9rm<?nRdFw0y<*p<B_^W=S~}9(
z4){5=0Uekm>vAN+!v8IW6nEeD{+4b`P7&<Ix(7b4Dmn}sx<EZp9Q-6oib&rEYruSB
z*^#jeUXI`l+1pQ=eH#jY-^?TRf=HTF$n%(QAjK_MByh%q^JVijCNq|P(7b7`i@PyT
z?ZNkb^_Q;xuB*SXdJ6qwI60VNxwh42-KdLTc>)P=Q4czOiF@aXG+v-JdbTCPW6p_T
zp*KG0{cG;oenVzSxb8Yg&{sa%=<?zVb%x|a{fOr2qfa74<aS7zrxiK#25`7b*0DCo
z2#pL3vO2AhPGyoIeW;)ysI6I`b;0?FFcfZ;3+!rtqfZ*)FxAt^X-j&H?u-NMD{S)W
zoij{ccTd>9qyc4TFb5nb`6hj(v!)H;FI=QmxQK`A&4H<mU#dBo9!#M7Dx#FYH=WdG
z{=hf}5CZ(&2@JRxbb0aG>ALGrj+;O#a6b0zmpLu7CY_=ucBhfuf92~@-_lkywq5U<
z^J~`4__IrgIEC=p(uKa~568BE#-tR02tmvE{(JiWuC1-9dapu0C9M)=Z|L%o#QzyF
z`6^bUDZaoVmIAbIPSs;zV33GWU;)%rU9og-0uPZjZ{x2jrK`As{W0wmpVoyL)U^}!
zZ#_2l+?O)WYiO7{8{v_VsO^ckRB5p8A}hQ_#&q_B3r!&k;2(Y<!S)BBrA)^DkQzy2
zY-<pfT|23bi-m<BfG2NobGu$1_lFT%y39lWY@dul0D!XgP747VXl^S}MlcAphQ0VF
zAL7l=h-7^GXMyqU6?*lJ8iutnmLv^b_VI(R@aKO}ntE(VsNVhvR%+l^r(+>OR9dK%
zvCb~X=8^NZor7xf7QNz}bm}!GBK!vX8%){CE9B;v0aa~!Vl^<m(h|+(VyO{z$~gI*
zErM{^BC?38sHa$Aj+=tl-}YU&!L1IUVj29n_vt}}k+(YGnW?s)w#KmP+|<$@RvJY>
z?PPg@dmFi4Af)9GAv!b`kzJkFjIX{dq#}F#s46JWB^i>+$KhurUB)rHT3)KvKeh+I
zX?1<x8Gh(h@1}q23fSEbw`X|^_hXV)vaek}`H+6qalv-}jC^C#CWCjc{`Z}W9(i&O
zB!i<_$}0J4-;{k>ip7gZYQUmkggF;#k@OfCTb9Zk_iJNhB3L0u%XepLF=0E{Q*h8e
zfUoFC^ja?%{D^ql+x}=$mvgR)*Da@P2+4mEyZbs884P_r)m(=>Vxjw-g6qR^a@xc&
zA3ssSaTTWJ$hn1eNBK%#(fxO<<p27Ln9xqtc6ar5V3{M5CcfGEOt(MbE5kee8#A4o
zxoFB9tTh+zPV|%a2TgB-x<aB<fwSZtK^-J91%{awMS4$v;f)z)E6lXgmgb^AY|VW^
zi{6lvfiu0&=*1gpwmCtQO8zOt9FD_x=O#;jasY`3`R`3!2Bmc%c)3(7A%xL?h7#*X
z{~}Q@&`IW`nqo69yhM3b$ud2sw<F<9Zvjki0d_WkHZR=hjC|ug>JS2#`!+)E4<Sg=
zw7RClFx>k?=#P(3`eS)Q)7Lbuj6xVBe%+XMSwy(F`HzqxT#PFj-hCnrN|w5ppP68U
zczSWUTX-t_tvkl&tNu=w!i)NMLKqmikb-uUlK^KZG)4_Z%9}uCtX#G!CK;nO>z$Z@
zmhRIyMnDM`uAo)7LePmvY36e}kNPTBA%}g(gG%3&L*WNp3_cIjXTYT6uYksvO8HBz
zttVT5)L9lx0jIXk=-M77lid%M1tDK#gG=Vx#>UP%Aah3Lr~(yVnMwU`00xX30;s<Q
zz1^hzz?N4K2%J-4YhgFSm=0kRT-WpYjy90lz7RcgO#TnZk+qV#20{tA^!+iq6*!i;
zD9A=JkX*pUWE~xn*iceZ0+3HiOrt+6mwn3h>XJhyJ~wQo0L*>LY62VU!gk7@r{dnh
ztOFwoVhj%k=qF&AKXs_U1B4=a66sismvUPaBJ>}4^r$>tA;2@1W}3%Q(7JJ?{;jV~
zzKY&ep}}{MpFQ3sW60c6h&+Uv{yk{#KL2szC&pTvw-;d~inRd-(KDjKjRxd26UKIV
zja@)pf4KeJ_O=r5<Ds@VqKnK$6Vb{msP>MKD#4yg__<=CT|e4D;`aSI?JlSM$9@}@
zX~0UK*nBDpnT`Nh0*~eoOnwN3d*dC1!<phTsw|DB;NXi@mbtYKS<|1rk<|kF=y<<S
z*%x>1y0<t6b4q;SXX{^IybjWPnyvI2`6wLNVSpCkL^H6q^%GC6K<BEmiv>y=>54yO
zUQ;aFx2U|B@hRDOeP+9~^ZCs(_u8G5Oifg5O&L1$NS<S@E&fPRWJe2k4eTgQwvKKe
zUZL&bcjI<P&*nU5UN<1iPsz*XT1@-o7KZwEuat4v`{zpbm0CE$z8Qnfla!o9R35ly
zSfnJCF~?j8Hb~bGkO<po={v}yuOeTt{FlRT29eM7Lu<#n+GOu5zEFZ&Cjb(H#)Wc>
z>sTIjJ$KSg2N+CePq<NcaI7!;{M$dA>vajbA#E>h!}t6+obs@Dvg`Zoj;^Ik8aV)w
zCv*5MPY0=Ub)`sfEwlaGY6h?BpMr6)?DP__4DoR!z&5yP%ik$#Yg)@*{b^su_vR<G
zM(3(p%*a)#*r@CI-~SZ>IH4qIxE;^-$)aE+s5UB@Mb}V2U?&PrzGm+IAn%PkN%fc1
z%&2UF_<hYfTJapXr-_@9_NA|n&5AADBIo&^BCSOdb^i8&z4@nVfcpwK_}d}JG)*n&
ze*iN(Uu|)zX)Qo!&mHp5Z)SX96J$wvHkIRKqRb)1qassSU_!3kR$ZV1Uog4<GIig;
z&Fp_w0U~cA>0Y5f#cnu%ojk`K*W8TzRd^DgMx}WN6+t_%>`o)tz8R8JCj7ZE4W0UO
zM{*bLH^CG|m?d{hRfPRJFQY{MBwV3}o($&-&~+KGyhlowmO`fSC5rITH5w+eY)PRf
zBd;u>qs(hJ_A?tBHKj1csiG5stpL=tD^x0e)x#F&mLuEN2A3xO`SQebd=7OC+1sl5
z+_|>xMc&V*p6F6qk!HGRQ5ji}j=*vA)4flN*ZkREpd@}{;gK~GJ{u`l#Dyouzd6b-
zk)li2e0+NDNX?3r*JN=v!5~^1-lQqSxTDoZbI`}kdm6d^OepW>ogk>&5(r1LD%Shc
z&uBL_fJ6Iu^ztXnB-Y@iX|^=)YjVPeFVFn;$8>94{eHsJj+TEb1`0W%8aT%#o>ruf
zsbiE$JYg05NhhOIH&M3!+asREN^v>ns>=sMJd~az`?t-Da=1BG9_p*A_7H}&gp{0;
z_jb(N^>%FJ3UCtcu#|Wa?CGDz(J1oL^Z2=y2Nz##m=1!DA5l*&?KecI={=(lJF>@|
z(VJ(vMB^?11q;fjoApg!tLAa*|0Qus+dQuMP1k|*_|{wb?pX3|wTbx2E9GjpG7I0A
zK1;b}zvl{*25#UvsrE(@4a?#mtlp1L)Zgr_`BTCbSd6#P86$wQz@L1NuXc4Sw)NC1
zwnwB=sLA}9Cim|p?HQ;Dr-1!-S}%S6vpIz24Q3M8ja)G_&3!KNY7>5MhgH=$Mv#*V
zy3yq?>lgB&Om(iVqdxQIh@Vl3Q?Np2)G7<Mzg$dn=p`!l;4l`DqP$y$%UhT;Dgd+`
z?E(4maIEt1l&yZQS`}M`;OGn6``M-*t<0h&Wd@sT_a{exdx!Q)N!}5@Yy3all<za0
z4_?yQ)`7>h&aLyW+{-->_t*|`Y)NuA%KFBS8cKbqOVUE35p73ni=Nj*@Ibc8>q5~+
z6juH!YSUnUk#?16ME`kfW0x0;L(b@Ab*vKnMPiD}!Qw!PUvN?Lucv=k&)UCG_$)eP
zJvu@S|2%{xOQF0{3f;>Som^Y-J7+Z(<KL?AsA_y~6Jd&P-O1@{2t{wsJN)YL$p=*6
zihpOla4)z8+i=9rf*_?UfxLs0&*m@YC>;bO0n7;8;x6y#<^RKfQHrQAtO6~!zJo6G
z_Y-(A5fM|$yBgtMfJ()?y6GL@rnsOoqe1~5(9!;W2hUd!5^AgOdcjFE=!NhT^#e%@
zI*FyseG_B4C>npNWzbZ{F<~XpAhTeOZO$<|XJ+Bbmy|^X2u>*Y^^09Qv1;^B_TH}7
zu3MB`uC6gw8p>!w;PQtbf76V>wm0DukilR(@P~iM#`?JNtDw=v&;2&x+2lOZM_eob
z@nh1rL?rhOO2)EeU7vLW15))EC!_1>jv=j=i&Owzfzw+xl*8;0&d3Ugcy;XMNxrJq
z(5=JCUpLP2eWq^*Mm!5MIx-{jH(y6GuKN|*b5}plj$say?jRMzZd5<056v2nWQ87J
zyXQIaA62wNx#!%wC>7WD#sjrIqkg2H4gVzdJd#HN@WBD>3M3L{RKfYn%|TjnRStAw
zuheF!d~7eRFm{B9C*$_81xxqu8HHf_(Cg(fBv!~_)~Hj=4}<D*H0HTO`1Z=5;zR5p
znKaYKOg-bPSlO8udirxaP8J0gtDhulZ}TZV8dXUii=eWwxaZ_2Yu6&Wo7+LUe{`_0
z-b6*tB~CRhU4rI5ds7MsB^oC^h+X_HRO-xQsCDB#<$UKUg~f*99(7rAVvF11dQmL@
zxQ;Kc5cShK0?pU!1>QcpKyw*G=>;8sz2#ItsmJ>3g!up5Q0SF&k(u1x`eke9d5WGc
zNn<(^HlQU^5Z*nr5Z@^2AGSTpLhB6*4m&q}>a*2FH~0G`uKrSm;dJ3xmGW?IJLJvn
z+0jD+dUdKThc19!{dXPS{P*JgFz-Uv0J+gNug^a;!xa+Ldes8uQ)ifY$r#lCAF+Xe
zVzok}n#GlpCBXM@o!EcgBVk$MW{ShO$yFBucczek2ETW9iItG7P?U6o(NgbgJyr>P
z_J021&%!H(=3<-ljV11b*i!6P{vD==jlMYp90F15IT{QJPO7iHK!UXWnS&t1%#Cd^
zVpQPy4YM$-C3&3@2N~b1S^-P$oJ>B`31k(On#TTXvA9qIEG@%gYp{K^h3g09NGdVh
z)d_#Wpy=J>j}v#}_A(>$i)WnT*4QSs+_M7awDw=ipK4#f>60kTDY0G2lbyLpui62W
zHGtmaZd%gw$>{Uv?*^BM=E+;1l@C__I{qwF@0#7NSP@#Rbh>!B@Y&K8Sz9Y`3dc=Q
zhah=|*5Mx7W2pi%xVB2atq3DGVro5qKV$;@fk4lnRLdenH~zE6-099+Mj|TuwFKMA
z6Ykdr^fmj#sV@Qo7p2a9onB{>3Rw+>t_?u~VFcJO7`%J!rLAg(h3haWK+RvVWd!yH
zo_VI&hAzRYDQ&^M?XZb6ui#&NU)m(+o}Lc2LHZFXtaZ#*R)En@syt1ER^!0msj96y
zC+EsDbI1rmx5zxoCqt}J<$p@xE*yc@%B#A$mzamSdiq`2zDUVB<kycout{0`&*&yV
z<mcT1YrJGL3p?8T>ge36lUOY<;l~oU(l&2c(hEcyh|Sef5|+7}M?~nFr4h{DbO{T}
zxO+^=w7MAZ)Ggz$^vJfwTQA=)Q(L#N*Fv+Cj$z?!#_p&I3(ps+JCUwgnCey;ooxNS
zONDyyCBuy{J!&(K1u<E3mOC)2KH|OgA1+nO9xeXFtKbW+xE<@f*~M7HIjgKHHLH&D
zo!KihABCpH6j#vc!ivlK#hJ!Z3XF6_W)JeCVqj0-()Zjsq#9yD8m{H?_9MF+MsJfP
zD(f}>vv-u)ww;^Q=?QklCPq$~7r<yj3GR+_Oiq)XEfgB&K-R`LLRmU^l5-YxA22Gw
zDjaARscg)LQ5p$@x>>eJ)M_9VAO*iMTA{_T==nje(dGfj4B14r8Ja)?<!-NDK}-0{
zh$?x$Qs&Acaq!~|t;msH4rCn7TWYoPLTx{HC%jvul0Gl&Xm-5Deq%1#>3)k}R%7)v
z3f-4}J^lK%+&svgD;b?rzL;sejPD!Xk;C4or(5|((cu}5C8BuMj_XUF#P#D{lawjk
zI&m+LLtw#$y_?7q-)ajl27N0s7H^22IGm2v?$aFx9|eIV-|yuL%F323R^&IBcx*L8
zm;^JU=LMV-;^W7aODikWD$HR!`S!I|vVf2Y=!aZjKbj5nc~<@q=h>1G1+<Ff60%a`
zsjCm;j6M+va~%NUKTfV=_sN|;-I)>v650O#{d-$U$pT|r#&{L;`b(mZ`X3o0QoZiP
z*INhIzI*d$gan`g@yIr(s<1-6s3a*VEXPvNrAwLo)$m1h1NOwN*>j=ojAP4wQ9#%y
zSS8Y@G4B2QF&rn38^>U|q11OB@7vy%r%cT%rh?@{U6BEG)Ybx*%Ow9W!naU2kO;-j
z!Qmt%dlB^xFpCDxUGnJ7Cch_QO!7ea11Nal?h$9D^4e|CL;w8&AxF~rC3R0ZrH|NS
zD)8cueOfxvJh6s*>94PwrKbiIujdNf$N~aHXM`UwYBej~7*UUqlOC!|@@cs^dnjxF
zsOI(~@05z~@=sno`Y2MRdEWzB;Et!K=e9cU1K^3@2k*3;89V7j&ibCttZRlh-Q-^C
zYEE}Qs`v#ziDie(>sQ!+eowtuGBTc&v)oZ{`Rv(vt;3_D99y!pZ;?qHoax0|QA5W6
zlv9V7J(0)Mnj4svyc&*0vrQ)EFc(Q;?)@V`8T7QA1GSzccOnOf8mFTBE4a^v`U+zk
zOd`nn#MK7@k<g9V@@l+CB>sLq(w$LWzh0T>=GaxxeY*blbpitqX0H*2Z?@dSOYatJ
zlm9J4Cucgd!0TRkVgrqi6UT@ZpkcPd&8|?w<eBvYdJqxI$J<HdUhb<PWmF3NU4*Vq
zTAB#B1gxnsO;RyeMaPgI#-=f3{^3o4lS9|Ir7IRkeXAmrk#0Re!WOY}`E<dTzu1Gc
z_M7n>ZTM}wIiHspEiM<M!da30JoG+2qn)0*{OYgbdh~vKw}xot-*Cn~Z~6HIMcc>u
zu2e_tY_?q7zdC5f_LoFn{7h2h6!n*#FX*d|jdi~+Nm86Q?x8k6TQFk5eC9x!6oRuJ
z^5h|dWeB9#0VvqsRQ{&X<aXxnMs=d?*gTm+`^CXG#Rjg;S5Ce!e``)cWJGh7(_vtV
zk5+AY_<fZZM)gV`O7I^aDnI)kG<4df&L~=9i*W>K4jZ+Cly&Qe3S!>d%0>eXpV?!W
z$MlKmel{KH-TV()tnam7rD%73H-CfYi?1_gD~7F2oC5{_rY?7T9Nf`-H3cXc<ZiL#
zMCM!Z_9jM98c`U2m%OdtTa1se(Pg3xy7<JQG@d=d-@sGFmV?SS9;Q}nA4(ZDfA|;~
z*^U(^wJ=@2Mx}9z*wa3r$Pu5D4N_DRZQVHY4mhY$_3RzHT{v2|5FYdtniexEdk}!K
zlf0U}>7Oh{%2cZq_)3}W6Lax(Ds2C?q!O%Gsmp%Y^mNyaB3OlC;vMlS2Pn*Ohjy?K
z75^qg6*c<vxnbo8grstxrZI6GMR|@F4%G4I%#5p6p4g81d*#KSy|^i2$$j}k+Q%Ou
znp=c>O?kKImsb}%L)d~-@hd;o*Rq!PSk5xWTm|SKfhk|~-H*84ay}oLUTrzV*6&f#
zckq^(*On8ybN29jt|tk;%bw~IJ&G3B_IvU*h%qdH7!_%=)MmZ{RUV(%oiA6tg#~Kq
z2lpg2k&z1)E2d|M1d>TsQqG(P=>zlMmzV_W?nEfNSF&j|rAN<ZR#T8(0CL#vAl|Si
zBpYt`QZ8GQ8Xo1~>e>0P^Lw?KsCcvHxS*jC^x+wfLVf;GORj!<@;H#~)db{#rh^!Y
zh_dmVuk<EQqMPUIX;o^MrN9vrBE!V?wMKt`?i<~!Y^-eBq%~Xi@||btWlh}oj5?7f
z#p1z=2CY}J_!H=sjsTHW=&EewJIA>{VD~me=4K4puP9W6k3<+G=w0F>#A%vn>LBm+
z>%-l1;*+MS3k5AFy)FOz9XI~sknme4yS&)F56zud-A-0QM0H2fj*8}81`6RTmq%K^
zwoqw<y}k&nrQ#nAt`q^*o`i#~SdK{_&XIuZPW<EfzGts+Z1l%TQtkMl_K+d+iRpvm
zfRf}Q@%F&Vnmg0nEg~b!{?Ct2%$83);GvqWO1<}-)8yTSZfz0bIk8VXbQdbz`AP0A
zW&J}%*EUy!{DYC8J_b<wDEo##nSCUCa?3jo&Xg@byZz7#b{6<cmq-tys_Zre9&?Lk
z=lASJwhOfWo$#*ut?kGgcX$ipA*tQpQPP}2GAw*c-6AtRIG?R&;T#BAcxS+73}evF
z6Y~9C4TI6$hvcJ@%V&L(WNM*PMOSv&w)9(JArb9dVpN;v#Kzwuthjf_#alT~sLmDu
z6nc_$a<~Kf!Atz^pK9XlAMMTG5b+l$<kQ#-=;GhX%8Iu6aNi7Z0oCM0gw9j9bnjks
znX7#vn%Vo$TXWjai|6C9P?^5xFL7+kH^P+SR!1*eC^3I@j8NxvK9@ZHWj{~4n`lN~
zHZeYmM)#e7d%+~L{<V02W>QS#KGJ7Lk+#!UAsVUSaO0F`sg<GujCoEln#xnP{8cb!
z;9f}^R40FeGeOzkl@inUd2%`ib;mFJM<=Ai%VrDb+tIWwI4QCr$-*GJq-dKfyT@O9
zAs#lAql`RDdN0S$L_!Bvnm6`re|9GDnf8%Do#v-Dln`o9twRCSZBEs$&!h;s^tT<T
zok3TNWMpJC8!w2Q;f!@*aedVx>D!AYMT?xMvTI+Dg|;orEql01Khddt++0X~=rv@f
z?p+FP!2TCy+#1wlm7RMRTcF!ajEYD2319VH2$|G9rsb;H?0x06>#9t`Y-m_#4!X^7
z-nTZ8;!_1;kQCjWYHCmnQ=3@)eeGQ`w|%+zm+r6gy%fJ!OuwZwwOe%HSZ3~T>I}PK
zYhsOHX9rr>J>=D%W`M3sytH(<c8=0dpbO}Gm{YdSeZRhs6BGgXlH~^ilJli#8NE>B
z?5xJ;*=Guy?@7)-7wWn~&m&`HVgOIiXp(i>3061tN(2Y)`OP<h>=@<_J*6N~XmKB~
z3aS0G5X+kx=>tdM69cD$<+(p+6-}Z40rVk^3!z)RlK@G(-i$zOvmKY?s`m%p(a^Q1
z0E*!msgzJJ-_o{s-!tw5dSQ|Xe=531D};?5C8KkHeEqK7ezcU&j*Q#jRqrtzA}y)M
zdrlV1$S*)@oZLoz7L$aV9NhqDH@m+?>Pnjwuo7fC_wI^ob?q!+n$M0f<8U|mFeC|E
zYYru*tL2p;rF-9m8#D6S-zOk)TQq6Fy+4RA`Y{;b9|xh2`VV2$Z(5se>Dx{1|7eZ6
zM@rO8&X_#$TXZQDfsNH|{5?o@^s{a@w5P>aJ-i!$WViBZQTFY6ditgIpYXxz)w?qY
z=<^K9yk=u64K;y98qCIJ){VGt;(T`@h?F33`dh~EVF97&|3&5|d#ui80LdOgVmTA1
zQ0NbY6g2CNeohEtz&WCPmUsG(AG09^O=1O(6R14yi%g*lEEw}D-zqIOst}&J{lb0{
z?8CY@8xb2z4@D&Hn+9{g>r{Lg{3?<6iF3+{gbh>K6?*RbVPR#1{LQRD;ylvioN?Vz
z0hEbZ;!;d9f@wQK%xR1a)T2KZH{+$Rl3>HG!ulYh)>01@Guo@~j|U7yCqlh?|9_!!
z<61>Z5Wq&;Z}FO_$egZvdA%9r#u0hxogJG_iU?>%>rOEbM3xMv!NeKGA)5fyw*?`i
zFodq7PiQ2z0ztLEcni+iCmY34r8hxUaJ@cekY9PuDxa8Dux8yJp8(Vw&6j?Dxg9X)
z!&A>MHYj^a1#(_C@TmxO&}k51*PKI&H5Jlo^;V-nIX`~rW~!1NNqy~iQf5Az*UgOV
z)F+X%Jq={Cdu?r*r?OM))1%YlBmhU3!+T3tsd_FdI;hgi&*&V3l!20XQc;$q^BSUQ
zX|A$+9|kpn&l}%IzLh6`liSWn>LfvSM~VrZ;jYXQat)^PR21oLHU1v7XMp-o)yV23
z29viV?}c|kU?GlfTqVQ;_cP0r0+<^14Dl8Dzbse`Y)r*;Y(keM-Z~N9pS`?>FY;U$
z_VRIJucE5=KS|)W(L?~vitQQ>L_$|1^zV6ICk(|b5f9NO;={#hu|s>Af3#vPt#IyO
zDpH7>Fj5#b(FE#=gl;~3`hD=CbQO#v!gbg8GgN*!Vi=KrHSN|W-<oVD*8md<BV*DG
zt+7iMsd}U;ewRjNzxU&WJKk@<jIfs-)hgnA#OT#H0QfQXWztFVRs~GJvkTSuGuSkw
zcF8YSZX>kvboAU&IU|%2f1FYu^rm7*p0(?_KuNCz2}Nc5dHcy_QcyBf`5Xg2^q!93
z5A2KH$-sy+6UM1vfJJ*=dQlOPln)tN2?caKS$q7%Y6@d^mM)$mo*K}xt?W;7Or-dp
zS+Xq-H(|lC+HbZGsC1W3xD8#z=2^k?phzi|Fu5so_V|OfK%ei?xugnn5tI_{$!yDt
z6cP02Pb_tL9+HQ+2V>G>KC&@dFow`0ZoYz!bkvWF-YrscU|Qh&NQT+mDE6RSWmG#l
z2&6b~N6K0xrX+<$_M)})4{LY)`=}QyusMp+PFzgdd}fOZ$jmBN2bQ|z`mviSbO}%6
zU*I0-pR7MF^yyOSI(kS~igJEtw?b)Fnv2X+Chq(!wkmt2l=Pb9blxw}t}Bq)3Ry1t
z3Rm&S_sc}Tg`|aM@ew6xk84%^%PqYQcK0x^-)$4(;cQo?RCMj|^Wk?PhB;fdm)(98
z#?7Ip%&#|keUe1obzslyw_OZ^xES_70!X^K5fkd5FL0z?JZ3XcOvl<;GL#OtdvXVM
z9Kg0I@NB~!bNsAHpKCnqh_^z~L!p6e)97EV>_fcdm-DUhd83w>d&uS441OYr9c#br
zMtN~(YO=+m`&7vzDWo#liM8blrESv2-E%_MI}<c1nZs6N-&rf=z_-vQtSaEIEK{Zx
z1wZXx6M~97wEmkeyJK>JElFNh%;x`f5}%?qvQwDM)qWc+b0wy<e8Jp7AalJsBWSe6
zw`F7}F#c516@D3FQEE#-)G5M|Su!%5q2;Vx!Q-)zh;lQF&8))9#M<D*Wj~=#S6OiY
zjCh=mrX(3v@O_mE86kDYhXY0SDgUCqdBMmaMVHz&Ij6ioGSSH_s&r|Vz?N@nxJ9YM
zC%9<+tkeLv{rx6vy>X|xxPG62gkb@|t@d!fsw(|%lQ@VOP<H>wu}HTLW|8?HzoA11
zX_(sP@v*leM=Pu+afAB$tP@)iOerF^ELo)^(0|&%$`Q(vM|f7LoZHWhip}>Kx<VRO
zhiFlX5V&1L+?*n=J>J}C#&*2*x}4<4vzZZ4n5l$Tbza<hoF`236vv>y1nA%OQNXWh
zG0I0$-3M0i-%_q5&cd^m%KN>;<_ZFZkckR02~xX}wotoYw>7+-(h29yDTLae-<fyr
z8oFGBJlN8958u9E4E()N`1bLr@n*(aW@LLrsOU(F^2kDk8?Th4c2gUGpJo09483x9
zbgs`cxej4;(x_PFOB!@CIm4f;d!ITi>O#M_RC}i>ob>q4w2mIVE;PAubN;1k#;n1f
zVtMl1hxxEfm(cHR2Jrdm<H!QQVo8{bu3$x|Ln>!!=>%VAYk5%3?hU^sJ*<=S4dIHf
zP*gGp2eBRS>~RH=170?kO_YbN>67ukY~a6C=%W&5RLWKrxTEBcqSqncUk^mZ{)SY{
zV&EA`9O!H^?<K<J##H8hgQEr%x$U>v*hgGk|Bvf{&dv{VIDhqEBz=KV&oCi(ws2#8
zD}&7=l<#BS$3r+<Ml-ZWj!^_8tX~$F-#n#+Rrl{m<o`AJj+imaf*4B&!C&1ycR1m0
z?4tTcC8DC*Yp_ZCaXWIw=MxpE2%MS8hpC)K8~S7J-??whVsjlF>{mE5Tm9UxrBR<{
zHb}l!EP_xh=n!z(WP#+x8Fzq^*<jARAU-lPaumZrA4Vj`^uZ*4{Q5*4u8`L-nw2<V
zAkZ7UvI}txy(7~qVi&6UhjFj5zG1<j#%8^-(Ej&_k`R64NO+=6Ug4(8cx|r)G}lL<
z0Jm`b%v>Rw_dX-2LXY+0s-%<I-c7>;*~IsG&395O2K(OIanLAq{!Vg8_7D4AKO?UW
zQo*D9Nfg2=*6bCeaDx!L*RC3w!B=jbA-YU38!~5<M?4X%Eu_)F!n~z)GDw3ptuiO8
zBEGV`G8{)lH?(-aQg~+F*Pn29nT0X12r>t=b|zwywFTqXfkCr+ddQ5?JvGGLB=t@!
zfrl+|F!m1Mlos<brv5i3kY?_Lad~bzQ`)W)YE=6dqmX*_le9}_447|!olG*xQu^LP
zaX;&_h(Hw%7h%?jO_RO^VhCCvp)Iu?2zv=gsPmu=Kk<nf@5Qz6ckY(!$s{7B?OS^N
z!*P=`bh$DtdHd5wqD7)i%F^Vxvnc?`R$+8fA?j6S0<X@aKBPua(SM0_>3B90cJ$i|
zx%)*r^=45uY<-nI8r`OJM;&8{3UF<dyW+kU(uytezhPlz?@qV}wsr27VQ^`(&nR!e
zR3i5#My=}}y5_ZqUbOo+8MuJsRLcp;z$GZ=;~-rCxuz0nXLX?wZg*NyNND@>g7xyl
z4rc;F{ZHv+pVR3ULW59rX}V+ju(o=^Cr`P7jr170iF`pQxOe_Tg;QeFwC}N*WnS{N
zQDW_4XRU;E=~beWI?9K~Vve(`JY1)O{%+V++!*-S(kYB^WRtE4ZJ9Tsz2_(bwaSxI
zD$664vGdqnVePG+=j5z4D)Q<q=RffVU38oXL=<LU*qFxWoo_jvwf<6z5IZNTu%;Iw
zoYOuX44pjZMz{&zE3FvUnEuKgv*b_ICz|a9)l4j$l2V1TW}CN5205jW=89dp`g~8m
zbt}tMoc6~pZp6hF%msjqA<03-JR+mxOPq<~To^8bP2ZMACv<wdM2^hnx6!u`ftu~A
z4`pfHq6DF<ypD^lL~>p(Sn@u6WL~=z_&W-T?~714FJuRs1kz*)9&lq3g?2^Py|Op=
z`P|pw$<l*1KEtaO8xd4`Sr~Scuq!1~bE9FS&8naB_p{XO=cB_?ohCdI4~Uno?~=H*
z7A*F)w1`#qI6Zb&UYxVR>AqO4^uaM)9mA3vw(M=^CxJ1j7708me=<tU_0{FcDKmmD
zT=7g%LDW8knV?Te?VP?Mti5Stsg;DN<6B@7LAa1n3FO0oCqXzvWhrWW6v2X8-}q9B
zg*m`df$k<;@vLS`cL8gXevrza5KYY(k$oVcQz3thp=ask%a_edu%;FF(DuMv^qrTT
z&60g)TD9*NEW=5)<eA$0`ub2-WWn`JoZ&O)@o{m0BjFJyNS@R&huS;*FXYk06|nA4
z$N^vOV<r%hEh(d~{4tiieV?ao9p1pmv_Cp$EQApf{ZiTZ<;=&<Q#WrKKlQG4Eoz80
zL|swjVSh0z_+L}mR8;16=!Iu2ym~U5wC%B%<vEP;`1u<zNpk$M{EVUT!Y@?xX`j$N
ze`C+)9b)LcSu-9<Zdw&jSyzRX@K1rF;23WfSNCD|&joHJD;o_b;Z)<z5l`{$-Pa-Y
z>Hylg_eWiyi)(i8I9zkC*p>xX`m;ejm-zGVKfeBtr$ipN^mTCnc+J*v;JiwG1vxiK
zSEQlfk)XG{B#W_oS;uqRI*ugyT6`Iui%CXpNee7r5B}o%WV6fXQ8-`;|BudjO%Qkn
zO>~4c>DvgCElU3|FsXvTZ_V(C!dm`DQYM>!_A>J@rg!%))H~L?ylUR!T}SOE6#O35
zh%7y%;wPMg{BxVky#iG{drry%c!(R!lp0`WA;I57vL-Z~Y8(4OKO8D0r*)Wo@~cJx
z^q7eqiSM{;-i^6O0=qhxziK}Fn<dK}jTfj1*(gOf`*)dBsQ9nULjt)X<>a$V+np3E
z8aR5=gl~>Yl7<}UZqiNUQEb@%5+Dl#yj<tld<FCO7?GikfXM?zZw~<_x6VMt{Q+jY
ztgIcz&Rz9rf99Ic{_Viz&e;R?U)9%F<qa$viRpxM<`f4#PUZ@7FGHnh{mbp)^S|u7
z{iIu<O-n?<@TAjj=f4y$&rp|K7e~hp)PiEm{`f=_Ev7|NDhvC{d!Lnyq#nJG;MW0v
z$tBh-Ba{%3>l>=tV%bwUxBvs%=wduO)q951Fk4XNvTLqfZ=4|i@fab)6hTxIN1V@}
zjeM6qW!rf(ch%6zPzIUL#TH2Y7PtoU8<>$*tl9*dW2ki*r_+ojR60RT#_xaD>M-1o
zHozTPT_Vb}OKh763m0QO663pgYy0BFxi2gTm+rw%C}KY0pSViN!*S-9U`@do5cE3S
zwC7U5MmnCZT;e(3E;+tK=$W4uuu%!{KI)LN``Fuj4OnGFh)&=1Iv>Y-#g=*%%}(Vx
zCWtL7#1eV#8u`uKG^1ZEkH5TN>TBwzHf%rTF<xQt*)y|Tx;o_{AVhc~p6eh;kHQdY
zdUU5>VbQh2q%6k<eYYd{^q$3gt?}(hF3@Cc0~)!;0~W?+lndGXpq6sb*?9Tib?B<M
z$AjKym+}#W*@hvPlXpt!8eXW-PFtA4tZ}i%6$@fBgd-;coTp5)#H-Ss>}9CSyyonn
zGlOGAEKZV$e(weP5^xTj91!`J8%+c-^*wfyh|dHL6z%n#y}q2G@e`7HB6nY{R?F|t
zlXl*r54565YcD&S9+7UPkSEG=8?&U(Ch|`uu8iH(o@E3rVP1qVsNS`6=unb`FMT6h
zCQ9G!Fo!0|0yw&oQKDWS)$B2l=7DObAbC>v(p}Zd9UqhLXU0NkfdY!(6LEX;7NrVe
zF*{-lu=T60ad_v+-A*&^7a<g(<n;Nmw(P46i)l?%wo}79)9Qq6=N9CZClx#KZTbj3
ziWJX(uY|%6*Ol>Fj*}pdNMQE5klnA9Qc%nqcK|tHIBA|jU)!jEkV80sdh6OkC)N{7
zy1oB3X!6W);R<WSyn|x&L!u;E%-om8tOH)O(rJmYRn)pC#$#Le+Ho)s$IvSaE_HvM
z-hxp=%Ugy5qh}xNHA}>AY>FQ#jxqbR9!JR`mt^>PM}e3I)lKr7tGF<0?9lw9M|(2f
zTOUO%M1+LC0I`NUYWp=c4_aH^4l?5<f|Gd<x?<<{RBhJ=CnhHP0ZQvFc5fjtp*vyU
zxc6d-3Ki$mJzAZh<~+o$yQqrGf8Pp)8e<H0z3O01ZQ_F08^b#^A1}@U=Ipp_a&qQ6
zJRtXUK!rsB@adx~0shR>OhUuz(OMXXwm;y2k>j4vYNzR+af)A?scb-Tfc%TFi9eGJ
zor4!HPXn7UKZFl=5p(OSk{X{4YAh!zNtu`qSIFeJMcRoCbb~+fc}aiSdOP&~7&eo6
zGR!+a(Mg<!ZoTlQ*s7^sxO4BpW0ru>k|`?bhl&}K9kdRi3T9!kKKt&|;EgvZ4AOXN
z`l_*|)`H*dN2nDu$-J0je5cp^TKBN@{8AT<OM&&OCi~x|13ePEl)$UG?-$Dw^V4*7
zO51MD=u>FJ0(V-&T<)xEtt%|qaLzha{4)Ey`>u6w3IZZDCOvkLJ7>=kcXGG@FlY9&
zs)vepp&dg~eZ~@!ROqSz-Fj}f>x5H-kl+T#AJW3Mm~xEVEM2YXlB%def}J0Zfi&N=
z@YFM~DD8j1Fav>+W8YLaz$i>)9VrLqCw{@3WoM`relyNPOj}xMP?N{h)3D0wS0K{`
zi5hf6GUe|{!k2;6vFK2tp~;-D`Fb4&P@{+$UU78^yTfS1`eA5cn2kfQ-2yw)*XKKo
zb7JZOopJh65i7Ps#z|~(m>l$sQ2*IucXQRRB1@bfZ!C({ip6E=&A;c}kfXzlFaD#?
zlcbd+JDh&pqR7$Mt8lM;KW~_K3P_=>TB{&id;*ULo`MkQu#lxaVN#}$9|Q-V#qZHb
zwB(<0_WV4{ni<a!LrspD*8ET#UHQ<dG_<7j_{68o>ziZp5Q&zU%JT*5bMKH(vpMA~
zwl=44m@w(UM7^OAl}&QLj!Z)(U08C&!D+Ye+z|{Lmpc1yKz@76#-ONJxeSw7ev(Vi
ztfvsG_tDr^%I7##fpNdDX-+}pcPC~=NzMDQ5!)B`KVw>A5<91V@y(&IaV`31VF2Is
zu)T>JTPAjdsk=G|BwMg-YtvtRtv~IWB4YO7?n?};F1<ISNZd=#E)QEUJsX9SgH2qG
z7~(*L^kE0Znl9iALC~6MWRQalnftR98IArEbBx;qwciV1dA+O;INz7#v^zvWURkJ{
z9QWn5oldA%_Tb!*P*0=`*D);=n_!C{%6oEgruLDr_cvy;dR-*pD-`phz=B^JEt-G~
z>)hii$>Dj}X}Kw~8()lH;fNr2ob<r1|9a6FFXUln6|>b%(br_3ISXFL(fz)+W6Yhw
zT}&K6ZxV*~V!0p#F^UVy_1bL}B*~X?sDbEjxSt#-78scoS!n**2BdNGN;$d8R=+$s
z2aUCA`(ZFS>1Am5Ni<AMDJT6V!hNr22sP~o*j|6HuQm^MsK=f>8y84DKE6zXR9k%S
zs@7!?v*yl}xdxIRnwD9;$RV2r5RX71qTNBahA+iO3HFS{7E)6GDqmRM^=f*c>y=Ij
z_vvjJiV|AR&pkVs)nZL17c!r1KwXtbcxTc_Zl4U7D@hTh8eS6cJo?G4rzJZ+OOz2R
zdLQF(M^J80qb50f+qS|Y+dtII?OqJ&?lw+;AY65k8I!moFY$|^A364eg35cI@?qc*
z`c0`zzdDmXiXU_<nDycl?3+t5a~Zjpu>t8J3^**{)d@`XE&IX0uRw7@CS`9pDqy~!
zgvJ!lk|9#H=bbqc?6>?j(o;)&kBKJjb=l}EM?;`w0eXpP>0zDbXRtYK$K!JabuJcG
zeu7O35*>V%OXVIiyAzcQ&RAZ9R%o^}Cv}`gd?e%a^2`1UTb`xCydA4ZE>=qPis5&!
zghU38hIL{gJ5W{s8*0zT;Af_G?Ia`8TanPKcQi!P?jaJr6bl`ge3}+Y{;oi)-heEF
z_5+i3i`G{L$EebyhrQ12C_X3!hBVlx_v3A@H#Vm}W`nIYGM36-D+A|r`!GRI?6%X`
zL8~o$l5*CMp$3o5Gj+@Ck|c>1OazgSa1z!M`bzaZO?JK7`zcHK%<@!FPwEhBR#8`4
z+1&Lvc1Fx4QWFpP&4@!yo^GPY5jTtxF=!*iXXq=_bc2nl(^YnBlWS;<7yn}Xu3-om
ze-j<;B{^aaF85XD1R*Y=Qa$H{t9h~(OD3Szjeof_`1nGxQ`<{%B=K_VOy_PZcPr*@
zz9t1P=wTM*%ljg>^j2=t;c#Q7q!V!jjb+xo#p^O$5E6dc#7euS#J2Tcd*dYy-S=SF
zPeUYqJBw?7v&SfJ?otf4bN4~(74#mG%;%K5BLSQ)TyW%(<X+I2)+`;QVcI@?#|dXN
zMW%_fXL*U@C^6<&U~MPb;}afT*!=5DKG%Xi9>!#~USL>^CZCu_nQ;ocADzvWC!%9x
z??Q3^S&D&={v18%eqX@c+9_6QYvxnt#r#cDtbk|e@@Lh<u1fyLJ++0uEBXq5=fn8>
z<q=6A3rEnERHMJ>o{mM!Z<OJ#qKM*3`A;1Lya}S1ZyDdzpkKT|KJ9ZJnVLxw1<#qY
z1gF<t2NBgSTRf0^$?`t`@!5wa+2*lv4hmKC4Ai`4A#H-2z+)f8OjpYB5LRG=^f>$)
z=LoyB*N1-zcpaP^VS9OX_&sqh^~U6Lh*AZNw%wft6ef1$Yxw@hEp}3Qff&_&iM^Kr
zR1z*WF&@V>Om9~(3D3NkQvZCiqj~b>UnX0LzCg0l;pOG`Kr**^uOqU!SbC`>cS1&x
zx+urEdGGNtTv!L3bqk0t*+#TteheRel^dBIEEr-{G!W_3eMTYNo*rSv<i_K_@<+G!
zyWOm!y?@QKm#ew3)f;h1;&X?SmF1u07Z<i(zK_^WsqeYqCX0(EtTjr0<uWEZP+Q#(
z>dB@MP6tHR@c^;Ob8=QG4c8A@isfXYl1}<6P{lDBo)oZ4moVwDI{Fg#<JR9yr6?O~
zk_}_xRz1UbFLuyht)h^Ku*fzD%wY7r>w^8>g`>d-5$cC|{+xXe<H|$Ay*keMUL2QQ
z0zOuLy3v8Dp5sL|)?SIDhC%j0*|Q1414rtoE&?yys038nY>0^XI5l#~C(kZ+l1UHK
zD*YZWD~(1(K3gxLK^h=L9jF+IEJloQ^tC%d#I}RaB;h(>rb>%O!`Lm`(_o;)WDOac
z4UIj0|M5wP&6}r4nMtF3pY{&qq$KAE!!$U%^N3hx@A>kA917yf6~7?f<W@$zyW?VJ
zy5g^r-Ur0>ZFm%=P=;%R%kED|{K{PEj94?1jIq7z=T^jHq_YPGlAfN8A@)X#P?@5_
zE*Q!z`9JU}ypjo5TVLs^tVvc`(vj07j!A-*Z1lk`YARLEbngyRFKH%}*v&dZP{k;F
zYC+}TfP8xR^|vSQ<R(D-5OUkT)tpU#&h)oxAKN*7h9d@EKcmR)@Y&mr<g7gmA|_;%
zm~gsPN04X13JZ=t+NgKL4SVr7fK%v}*&l>f`pqTVM=QO=fRzmqVZR*e@e-5GtAiZ=
zaGDNQD6PiFVc?!bY7tPdiB-K^+Y6<aXj__AH3BB0*FX+I=l=>U|D&>$zPy;ARvf&s
z_H}aS_0ht2#jyX*L0}e&2r&Bx&A7^<MYRFcqw#SCM|8M=L+|caK$-surZe!d%~Hx(
z2{*|)bK1`|b2RbrwL5|&V7CksxZ&sZDimh*3Uax?v%o>MqF)!&8DObK^-Mqv2at!f
z%%n`$Kn<xu_A}7pOMIu^C3oE3HOxPamV2K$4yhMhGxH)$u2{G1&0VM^XWXsmBh8`^
z`ymkRwRx5(5K=UzS_f|*`gv`D8<F!mIdH`5$!zI(NS;c>?GHuVQQ@JFYjD~L$x#F^
zlWuLMud{};Y&=7(2|a+uXDJE|+;d+66uE)DbBY$sli&1ieQ>8ou}UcMnT&R$pNmo0
zg=;K}M~GOMqzfLoe0x64!J4K=Aw7~V%my)>i}x5v8zW-uz0I_k*UzbUJ7Dkqn`FRd
zW)bG$(3p%iHVjZfBFtc=9txRRY$*N59|WDrLCw`*<ZFwqDeB2#)x5>D%=qtWHhS+-
z!>o%IL+;@qNsHFX-j_}e(S>G_r1bZ_0F9y?D*+*;!(fwR*2&#E0zK&aj0S8G#JY3n
zdV?Cb*e(mwXb-uew$3++0npm)aa0h>p#J-orN9^RDA%k9ViqiAjnVtA=5LziMqkHw
z>Ze~|Nt-NKHom=DN2g$4F+KJ5SoIlm_j#6&`SD#*vPG+a*0$qh5a6vR&(P){DP->6
zbx`=lkmWu8L2(_(@o1)j>#ff5JH@qtgbAYfZawRfYoK|FQs!O2i&I*Y%j8%INi1Ki
zMq@lrhL+$edP6|;!XWct!h!mv<gT#~y!|u?)D{nkw}0+_32~*=*f*?qv`lD>_j}kN
znq+>Q`Gc?`NLLR(-K=;dmAd7{GjbEI=HEeuL{DsLB$QJG@r~w*^7WI11G4D}@x-xg
zuAhtKQv?+q^h1$eUnw!q#b{T*bs0R_!FK_%m7f_{@)xnYf0pmUJ5O_p0Hs9cb5`l=
z%M;(3z136O;9ygi>x+n9G$xJd7xDL&nJb|am;@RB4wj1IS#=DrKZwwWHAt*Fma>C}
zLh}}{Bj|rI{Qpc0lkhJN^SjdE8|_^dlGMWgCt8Fz-#4oB<X<d7SS&mxV^s93blT0w
z#Voa@TCv`f65CgHf#8gwc)p>fP(<Q{Myr75{!KgUM}#jP8}-=^8e`f<kUZMH{+844
zqHo1Yr|nHi6cK@%ficK$iuDJ_g>}~4k^lX3@1q-*2#C)7?30@DSAXj>`{Z+$`6lA%
zyL{uk9C6)V*s1<Lr?}fNXm$Ds3kAChp`aZlDO18Q>lXq1Liz{%+Evm=a>mnZm>|f7
z@&`ekAc($gW**Xm=IQ_hStrkG?7$sDm0N8B!8OF77BN`ujF#BlTs<fExJ``_AT05Y
zqST|sSC!{K*CpqO)#UyetZZ)pIjQUGm?Q7y?_6V{;zwdcY6PnTgN|lus?I@Yj$Xx=
zRpl*!n^zT-uDUoUuB3*yNT2nyEJfgT5}VQ)=2&D#(o9AudCcWe`7aWlaD_K1|A(M<
zy>}#MNC3J|yOr<dWJS?w>b{%%krD40e}}%0!?>@fL^=JhP2|rY@2cvxrl|L~6b12d
z^B}G(Ya`{#a^(VI-whWbDG2XhX`W{>KFQuVg&is;J>aZ8x1XT03@4WR(#>A89Irbe
z*{M~cID8e6OTt7PWDu2v4@YXv*#w_R84^@|--?uf$}zgBIO+dKUc@lRbc{TN#{ZnB
z(2Uu*(`oGbugyFrk^-daAIEk(ESH+;=MTEsWgyW+E~<Mz+1l}1=aq{s4a|cDBCS?W
z(-~Hkw1t4TqjJALUugFJT=3qtfjqgMJgO*HWiHAp8Nefc-_J~v<#gI=tHf^w9b8mX
zTPu!}_eeASU2WxxTVWu0OMZ-zPGx>Lw43ZCX;#ZaFk&F%w{pRV@w2e3DP5Kf312E4
zC+C0Y9QvUeA1}1|(sHSFw=~tK=QJ6^C7dF$dR)W54}(sbezz<}s_$VvE;~>|=15lf
zje<U~8L{`}LG1foz$@{et>NEC{wrXANQfa%qn!XxNlY%a{hx@3M~~1nwO~kdg|P^J
z^Zt{jO+mJkGc_Q9^CYn0>Cn{snb(Tpw<3WP_~0&w)*x_D`|ZPDfSNgJ4UeE5B2ylF
zv6f&HTkqJqD`aAkZOStm-1OW|sqNWFpmmdO?Uik4e$^17Q?IB<wup+L9Q9XO)@;;b
zo}G(VOh$jS=H10+XYlKETT32gkjuZ6Ka_CoH=Ut`)S+%Y+v0b|jpOD-w0c#w){U(i
zGXX(P$GfZY!lW$|6w!}?t^A|vy+m}_>kn-+&bkMRfWZO9HeqCHhXUs?2;)C<;C}L-
z7OfKYTu$ZhHpF;PlKKg>NLc%N41IRngx2{Q{k%L!ae1D`557%h&(sV4aPU*n>eo)W
z<1@huXX-}PJTcHnYqSTADxH(FfI!cMby-=%ZjKVA^=IaB54)~KSepf8y1@uzZ+WxW
zx3hW^v?=Grn$+lvDgCOL3J=TQ;TG>uBGt%k=RokLKSAmUe7sf)s{B%NbTe0vE1W1D
zznJ6wUgcHRxXgc&a1R_Y_NBfrD=w%(Yx?h9*|VANbp<|R*Ur9Ygy8fqf36e*QhD;S
zm8n$Jh{DDAEs4f?e$`=^(#CTNi><ug0te|h%)xc`wDhaqQ|DdcS_IR;^#rREi&<Mp
zb>1VmQD5D=$5?l^j6L(Y32ue5-q;7{9<i9{VQ57kyi~z`?Cir284f~zF1Aify>z8K
zztvqd>yci!3x5`Q+sn$PirkQhC^<PU-Z6ena+M7DtTAup94lG1t~q0HYg6}j@Lx-F
zza$iT0h)XyK~zA0wJPYWd{HE6MT}U0UNulve5gWClizItcb_y$?@XN43N@O+=XP-C
zY=~;s&@s(lUy7{iA?2})41cPD?h5~RbPBU(vGdr|KACv(XMg*GcR;Z6YnSp2b_vM(
z{O|RNOH5)lZa(C2URr)VKh5a(Qfynw{@ljXN@NIMpK|MC$oYjy6ChqtT)k~Kpt&5V
zEvCL6pGKRS?8bVhkotXE?nt&`pu(*?YJk`8c0uVX_P*oJdWuhw^Sxbf$sm_c!Oazq
zSqjgHG(stat4hPzaM0g3xWnlwm>xCQJ;pv(<ZG5qQL?aCxBi*Uwy2Y?IAfxa&drz~
zPj2eyG!OJcMM7Phf}GX>?^z8j|G)>xrd0h?xcxZNQ2x#BD5*MP(06I3S5Kb!4EEI*
zy0<WYk!}#aAP4;xAFM58E`iw4{C1!N0@Hwiq!yk!&K@I6=liMk5CNM<x#V_+ea_uz
z8rwejZ0`Y|WOL^23wpDv2W~mEed6}<*q0gXFzn<*=1%KV_b4xKCV{PnA6A@tVXnd;
zlA*tFUxd=ktG_Z-@J9FS?(=C7PX2y3jxD8;$p{t3h&mq;(e``Q57Mp<w)8Roqm>wP
zH6bl-$nx7)yw@m-Iya<zQ(Jylp!C!CpNXm>6jGf{%G2=&H>0P0Z`uMVVP?5ra2v$$
z|6}Z{<D%T!t`$TOkPrkV1r$+Qq)R{qMJ1&h3F#UdMjDZj2I&szmJS)Zq#1fZ8l-#X
z+v7QUp69$@@dq=+%<rCk?|tRE*2*-0W3l-K_h7Pc%xnd^;$P4yZ5=d^Q*y}%-<&PK
z@`B>ZWkEP=yM}^~Y5cg{wXHQiM<@Msf$e$qtCwjVns~M=GzsbL?`C=TJIx4+C~1v7
zu4Km0<nV^RF4;Cn`hp&V(Z$`>>>nq(omMDHjDf|cVxc_t;bf`8WrD4C7?KUiZ$7*4
zW9Q>!b3R{Vr{`dR^MRe{#-nm6#394mCR%vt`WCBXu)8Q5i}Y#ECgFkpS=k6@xs%3M
zWI_`G&Z`m+Kcc~cvTweQ8^ETXx9)vW`^TsnbO2ijM(F2mfa#i~v9ia%w<LJ1!0u5E
zZP|?>`_b8&Y}CDk(q_FcQl@&t<06xQyD4Z6dafVO=JZ9-e*C!L8ObC4#msL1jy3~@
zyZP~FSR@j){xUC=03qqyi9UBQO$!@U>)ix&ZsNO#lPYdr;sT_xaWxJCuLW-VeqwFz
z`OKvI*y3S+w7BRM%#=Gl0(gQcszZ~Og_>j6%h=OHPb6r>i7QX;lcuIi=vkO56_?yC
zHI$7a9oOUoZQY}4(siSGD=A*2g(KY+y%^fjK@uh>$@#c<y@f9((n5-!(8O${cwaW9
z+_uq=z8EN+!N$B(eh2P{VWbEq#~zgVSf=Ps;V-S=$lZFU!X#TVNuJ53M~)LWp;<l~
zoq|IuYcN%n6kpufOYd$qM`5rU0;mbKao$ek!*~?~1yK7>FMlO(yVw$Ux`b>03NB;z
z*8iSv6Whs}3#N|pG5mOU*r+0zN9{0zT`qEs!ZIrTlo$8sCR2lyC|j;Afz*@c8bSAB
z<Cn$zfmZm1O$Y6j3TGeTHX@LEnvLAadkiysmCfVtJ<MYixRup0Z8(%qZO^ZI(d22#
z$6B<UV2RyEzTdIhA@HFer_FFEUoR}Yc*NSwS)H{fb%(l8&@pFSmigR5^UMXey;N&G
zHgAUZ;1xbs^zfld&Y1GDaqax)4vGW}oCNVZDcMAy%G9;iC$SKf+~2Ub&1xO=ogWcX
ze_+7;voGYiIJ!HW85HhzIIUbJG+(%yrS<&yA8QAEF_um&@p%#<PbXm6?$`mm8I9~6
zBUmKLOmnWMb(d{t0^Wi{GQ-f3K9qiswWg#A4@<nz*V>aY+oUnFnsoOJqs?#xo8qGc
zC$nV$<yjHbwpx+zQXmiB(M03+;TZMzHoe&3>By`}flA*v*Ry+cpVCT9gsbvLSC2L;
z4P`4fDxIU()5QRXC0oiPi#P67DJ@93OIKW$BXbZfwi{_p95byGZ#ajTai=tmCoIh*
zYNb}xTwld*PHm|TV-g?MLdc+3svOtX+*6qk;}bpU3)jhsr`pm}5)S<g2)TUVm(N-#
z9$sQfnbES`M#Az>88^1A*^e9xC>VIiluuZjVDfj>vW?Gq4?+kBB^Qx^s!FNe1HtDx
zfB`k9J)90Hy?AXv)OXRz>VwUVU8Far>W5U>`i{+s>CzDFPIS@lB7#F`TSS;P?W!?J
zv$+r|cWs}yt`d?U6NqEVIiAbUcQmiw$##pm;Ee5M@G?&NYR7jloDrINhXypfATv5d
zx55z$w`2>zMnEOt9=(}`1tA>-Q$iX6v5RTXJ0Z&(!;t%hqQahX4-?{#s_Tjl$S_*-
z;h}rGWTIDeb<c=rjIPUmASB#%I!l#KB(H>zKLZ8r+@q>sgsjO}-;Lav*&D=P0UP*#
z><LT$+?c2S4#az5iB-{?(U=EPeUByo*%kKXs(`Az5NeQ^un)k&$S(2R3OBYSBAUA@
zvM(d%h3SKn9~YS|Bkn$U)RFs>w5)gX4c`LcSHlpDxEhH~SN12{wE=gsF+_UOG^_iO
zY4%MH47$yvH-oHwvp!<?I#d)=8evqGy`LDV48M@N@{VeKfZzl1G$7J?CnH}$dYnrw
zH)njEt!Y*=HT=HyhJl|6X;=k$y9Zvlbhk$<OC3|4;3S>q+vH3le){S%Hiv_&Mz?0Z
zRy`vh4Pz+3gjE?UIYYp`R<~Yb#Yv!_Pw*7}!tA`k5-xMJUW`xDCpPc#a2VEus-F2!
zNvgj!0G&lHXfi2*BV>IEev@o*qH_Mo=0bn$3O<ffQ_M}HO^3wGbp?=B`-E?~l^?EI
z;P-XDxoFW@_f?y9)WGm;QGz>7Zd-4`3r7bbPz8qRLOrd-$(vYkeh;Pq-c+pu1Kf(j
zvccD*)?AvR^8#J8*3%!>Wl1n%=)HyUdc~Wt`v!6PcW+kG!b9A3TMh=44@5d>Uwl~`
zIpjT*uj4J#ZmhxF-X;>MOhynAS6~9@z@PibeVLF|i<|S6SFnE}k?PN6$&<R&m;c<w
zcAx9DUlu>BjCF}N_S=2Nas^~ZfI>+=oL)W2hDRV{ow#kA=}E2#QFU^e${2Nc%_XL9
z!7UACq@?NNMu1A^>v|-<v$e7gyb&;vKF?X&hHOqfCtrRnSrji*yHzB(GFI##z9x{H
zw{&rvnUu}<Dt9zSN+=*71p@?AwVgbN2WINfqcdqc)8U<wnalG6*3Fr!jpmJeFHxR2
z>%!%(8Jc_#B|Y3t{m#*(H-p#H-yQ&FVswdCmc7U1zzl&Iv6L|X9L9W_#dB%$(Wg6e
z%kPu7=@3@KH26I>M7~F^hul}=k0mS;Cq24FU>m!mx_1Rv=Pq@dG2rV;oBB-g^ok<Z
zSs<?rS^cDld0R+?QqTO8L!VO{4fKsko5bLl!KskX!L&<vfubw-S1b1m0YJd22%oF-
zKis(jdm&=*{n2zG8`i|FZPWAWS?ihhljJG?Vg@rox`2mVbT4IbhK6?#>tiPjiV3&}
z2jeTNJK3=Oi?z>f1l1npg@l!jvTm_c8`+zUPqg;byeT-4ciwlCI9Q4jhh?J?m%qP;
zeL%Le9{>7>MKU_~mwZ)UK1;>%`>){9;!9nYHVuI3=~z63e7@&yYm~nqLdY5Yne66w
zNv~QSk-VV(an6tScO;6%-(0%F3>Xov8Ab4<N-s?jccO{uK|nfDz4cvKVEouDB<+|;
z2CgQV3oRq_sA?0DXm-7G<;9g7J$%%94~)cV#XJoaH_h6|ZX#TzUCa@j+c>X(=9^TP
z*JwY4^WSNL)XP`j>cG;9oj6+i@a_@naHsUVs=XUN7W7FpX-J3sT3WroL+Ai}c(f~z
z@T%LmgvLWf_u7{JGt9DQD#KTPh!hD~%jK<~*IF{^Kf9cj8!sS*<+vluuk=z{g}ULb
zctBGp=0ZFb<>qk>7+(Y|XxvB&FA@PkEzD}nF|#EPww7n8y`x!^>y!5c9(SnPl0Hfv
zW-si#Fl`?Ll;U@pAM}8aSZTvrY<2yRGDOFermvg0IoMr$n+uY(bN|YVxzq3|{{~uP
zex#f<)D5s+hf)hR6pGSmVMoN;TfcXKu3po0T%fYR2Gj?qaG%ZOPsG!UHSirs>!SVb
zNYMR%z4p0iXKFE|Yf?f%y$!@@li2@R=h2)K!_L_CS2fB*bIdjNEBtexpOTv30$Pd0
zC9G1=Wd=m$gTm=x@V>n5_LxL1B<zliyxw$bazYCslQm@1R<q0k-e#EP-m|~G?H~zI
zKYhwnazv2>-*;$p#JvP$c)P28;)Zu_nh>d4PhVRto$I@{yW8*A0VX0sjc+rWGF#YC
z&5P7SDp8*b*HkSTb+gkY<S;^ynihM5wufuj5(S>C92mAhmYOAy?mXEwTb~HDQbRDu
z6176-5wcc|0-{935K^h-D1ko)CycQ0TRtZz-S<^6kCbfq^=2s$Mxa{6jQVG<+T){D
zE_RPb0h`xtcExn>dp(crzJ58C@E6pS69f4q+gsenIM}K>au4>ZA}c$`sx-PXtY<GH
zimLKiamNv@wJ)AlRVKe_U=X97sIJZHJlr2s5tBs3&Jpws%+6dUt!WZyvg^XW>)$=g
zPEFshBh>LOOK)6Fonh9TEeeD#QD{1sFWOoR+2_t5(C(|iL+hlALM^sz%<10jMnUe_
z=5vDBO`6NhNUw>>i<47oPqSt|qrpOv0UpFPSnx*L8e_W{$}Ot1uap8&REvF)J{9VI
zr6}0rmdVfaXRmjVjEAYH2Edxbi>z^dsHDR>+rRUjq`L5_T(l^f`E^{b->B%mu~TxD
zgjURBNW$^DnVF5jrzF9{FGmn$jdt@Pq9#B0V834_&Rl+(URH^kkI8TZ0=q#h4;R?F
z-*zmb`}cemx^CDZ7;#@V`gJs^GQEJpc!Ax4Kj3$@&j9GAPy6F@esf+$yir|*@S{`r
zEF4gE31M2Ef8gRL`B%zd)$8IB*Q2KLmW5b8#RUv7*{;Sa89ZMM>n~j@0+><Zs8{6G
zfbSJ7B_&Il-`zDsQf1V+=$EAeLo645qTf6@f7EkoZaG1aBK79}z+QC%cy(7XO_+-_
zn!ogH-sq&k7h~c0=N;$y@6EQzfVcHQUf<TWb(pQ#XA5HBBwooV+rcONfJa#yRx|zc
zhk&zPE^3nd)kUwU4xik%3{yc~O#BQ0e6X9jL#H6NR$mc|_|HGAWyPR=vn3olDIX7o
zYrI~&hnD^r<x*vbmR3sBC|#JG^x@V|h398*IG;{kwuQ;H+bF1Ou~*gAYtNV%LSep;
zk+VerJ2`k1SZb-<cr@EqyKj5v7??yfg+vClH2oO)_W%vcgnVHPTmo>8IisWB6V-NA
zKbzG`N1l$^26%1^Tmum23%MCZYjQlActCXJYy&7J9f+_fx__f2Is4XuhN8W@SlG7(
z9DL`>!IImBOvBx*U!Cj&r+Cwg@E>`RHUJS7H0d*$McI9v%de?{(m-B`t@yJbZSA~}
z<TGQdFf=IBP*CqTn*wk@F{qL|D(qE1{u+XLc{_n3HKuWDah#Slcs(iL+UCR1#1Yv-
zfNYK_@n}3V`B<lGAPQz}AD`4u`t6Ss)t`e1?!=p-YIGwHTn)c$V*Hkh1$TL^!CB*Y
zN~O+4Vd6#e$k)~#UM|YM%)J5Zk=gT9U-ubMxTFzCFQWOFqPf|A26QEkdI{>M5=<&k
zw4X;*LO0*H^kW-YMTxpsXt85sBzW7@;mg`>gj!WauZjdLC<{LIw;!}{J1d`Yx!sJl
zLfb!CO*p_d-d`VlCW9^)VJ4f0MLGBCcuVFUh&R?NCXS`9HPJaMX@!cU_N{yB1G3ub
z?Pr-%tA<x#LK%}+5k6XgD{{rG8_?0MFIB8nyB`mkb0@hvBs$dzunXl(Hn}B2utLV1
zvxAFxNf^8qfvVTzeO{k{3!ubQ(|;m^fy{CtwDzxgeMM7h-YQMBBFn#K<}6r!mQr>j
zH)f|+winJAn&ZCw;0n_m#f=M!pX##x@WRRFB#ZX-+1yIvcCNVt6yR*X@Mu?bDu9oe
z>1|vVat!302Q99Zr6=#r5~PMt?A*3Z>VwR#Q9&KtW=K;jQOXeQCJ2S@S#o@%#MXsw
znKr={#nOf00}18Uis4<&_QQVV?N=LKC7YMIEfe(W+S^?p)>XB*vd9K06?r$jZNL_1
zY9&ct?r0Qtqo%h#UiG~VbM*9nBlM5WWwVx8BD5<#=yi8<kI{k+VEic<&<kXNd2;?<
z%LEX+>rD$#%1DV1$|o9{+V%9%PE|zA8ZV1dq!7Vsw&ilja~m-9X7ym_m~880X_F(#
z3us%6=Uz~sY9a1Dd029O0r7uB`>xK>SN~BtR%lW5NRGjJQ!~tl<r6IPQ(+<`wkuA8
zgmM&{4y(}v8j-NOd~bI$w6>0b^%7}odNR>OLA-#USM9MQ{zh8J8@ITJgjDu5j3tT|
z7kU?lxZ9(WX%e;4<RL|yTklO{D6%V8H%usHW>Z42$D&3ZuH&t-5H}<1w>~N?x5gG1
z!ft$(sEVjTKK9LXXc75VF<f$KyVrF1>`ugt2gCxBZ~pHf>!0O%`jlp{4Nx0=RMC7h
zJiM+ZOh|3XQV26&*qIlD-QdPPtJK^ST}QTgNbJ0I1=u;eaXUcz^6j+bn3?&(%kcD?
z+cHTLI?(Y4CYReJ9msMK2Q^aIGWODNvc^<vT=#D^7B+ffE<CEHG_VYJ?mmP<QMKIj
zko`jF#5;8qU)&`7Yx0)Mlef4w8UYjp%xAl_`ANUHWPYF8{kwtJJ?_aycji|Y!CQlL
zfXVm->Alu{b|*A?m;zx|VCWW1a9u%%#n#fwgk+j0dSRXkf((9#u;ZAJ@%PPHm-+JT
zr)4<BO>>rsB7X|S)4M(tGK&P7b_>U4WZP0#9p7wU4hcSTcx448cfWWAcqaZcEBxc-
z!IKImIw9#6ma-XgmC*_TxDBvofI$@yDq||N+<oBHM!nVXV5aD(<Q<5z?T_sAas)vY
zFt_+cAP^B`=hsxAzfjTSNt24)4>Ds>J@7GWx*GU}L!wN}rQQEU=*pZ!TnSX8)8oOU
zW0UHQ+p#xNCGO@Jf;vpbK<Vrwk~fsF<04dz*<1BUf>jRpV$;yNlJX~ktOhw%;x!J@
z`A@eop9H9T*%SkLy(=JebiRRs>5^;r#6Ex_c4;m(dDx~-$02HL%@Eo#tHE459P@yS
zE>g1Zvi{f%X1MXYc#%BR!5ai6K%wLG%eU{N-TeKK;u}yJI~+yI{KEJSF5jEjZ>63a
z2p$AokG{O--c+LB-ykqyIe~l(nHJ_)8lUi>r<Vn)D*tr6!844RXf3?A(|zn2Te=8L
zy1)0^FpomI_d!s&@=b2+M56@ruFqO;O5qB3gdPe%yo2i_h(VgEffp^6A$j$s{3!sU
zXL}7c=g#M8T__R-d)*<mld`wlf^OxBS$i6eZbar--mpOQ^mr>2Z*C4{J4TLn(8#?1
zR!l=&Qyru3H+S94W^rJPIGlL40jsk_FQmnMo$t$-VnqqHUyj8_G8LQFB%Q8z$aNf8
z$4|vD8!L$UevpORW<lEsIv}MII*-^PIa~T-N7e8WGrTn;`JSrJq^y`^fg+G2Atnlv
zq^2x<SDAyD9A*~zX4S4K4){bW+rP#Lm1Xa~-ze6Um_NNXcB?&5c+H*F%kCu~NO!{n
z0z$t1M_UMOnQ&EcSdO>Hc)RY)(8eqTQt`VTr|hu*y<Y8p#VLKZXzr$6025^_cgHnn
z+z)a1ydzTU)Ckm+WPntJn3Lk@;&z1BE^H2vs?q^U`V5`QbaXwU+AP~4?qr6R=cck?
zFYfGpx|jX<p>ad-`1P9WuY={>@50!zbO9qpB+!k4g)bkD&_sT&fq77nliej|qoZnw
zjU`UUbAY!3cK-)CCg%P#HX&-+5+ku<z3}SV7q+aPmw-0hL3Jb%&D-;DB3mIcC8=UJ
z-t{mNu2k{C^48S}{B6b-8#o`e_#*;xxWSx2*A;G>Q%u-INqt(-y|4n)4R}_e#Q8O@
zKn-sRm#6;Hs0{0C+pwLA`c$pT+Ms#NaC#;9xTB@0G8LcG_$o!NM$GHegb|wEF4KGM
zwwj2~KLFLr^Wahd-!d4<#RO6>yHAlbpuA*ip1s&%De$eEdv435LPpEcs=^$4qf)1y
zP(ZnI_BBp4-0Evz+i~j=$5Sct|EwW^!!F-ca+Qpfu6XXgE6w-68Nb)0<@QhELtIOR
zijNkzW3ETXXYEIR!$I|!&r;=M2D+XyJ|;7UR#m*Lj42l(;WOgaiE5NR+$!Srptl9U
zhQ^*A=lLAclOKmWy9=4#2R$*=!cCXT3fL#)=?q~F5`vll{G_;J<O-x9Ux1+tHp7wN
zO#z_h!S=a|#K=Z+R$|V#sxsF@U1>sfDinj6GzUH?Dz_n0?)tX&=7g@%!o57|7kTUZ
zk4`(<(iQDB<n}l|3cxZK9=3aU11g8N=G!I)ogyHj?V5^j?_vfdzCb_a^QI%tMKM`@
zYQK6YyH1MeOWMel7~QM%ilFX|rrO7Ud5zaYKXhhIh~qVNJQIPhx4%btrXcg%3IV^1
zYh0%6fccCrBl{zTj`8(ZO3N8n>R)bRk41m1+Kieug6G&A>^JW`vg3fm6f@U^41~#_
z`Py4leJZc3=Ps3|w!^wv0h4`tHPf$qMf=ciOE>@XDEn)F%dlmKTr;L}5+q)AA^-DD
z*}6tSGSZw)q*$<Mb@UZ;RAjy?KXkFA<ig=$QLZCyi^TCus-ia^LLUCsBmCRfr@e1(
z!ub0+HYwdKx~iftPWS<DJ?~@scJiRgR&rb}-pOQFKkVRBMCk&Bk#1X002;%E^=#`{
z*Dy7I`pr9*4?!<N!@FTwYiahi_|gP1fRp>vPJQ~)XT;DVf>LT-d@*Dz{f%$w!=e&C
zJIx{!{;$xwO{|VpPCDD26{Xve3m(KEp?hICl=KjE5(3v4vhyGkIu#P24!Qf~LH%3P
zM!sCp{Rk=nU}@NsCX^KlK7Q$$ZMX3qdz!q1rM(=^nfr*Y6{+ti>jonG=<R%t=%>$)
zg1)!48if^Uxje=0#$r&kmunrID+9gq{brxy2$^BdIkU#%u9x_V23n57B*L&d!a~}6
z<iRgEkt1raF6e~!Djx7WmZq0*ORgvP#EHrC0QjJwnVIXgl%Z<$wTav;@}VE)dG@uQ
zs5Zsn;N2SF<2nsbTms{Nw)`tg{LLgFPhCx690D8=aUvXIq5clyDSZ>I;RoFKUya2a
z;@s+Uhk+N%Db%r^jv+I!f`hSDMR$(pA)+rZJr75y%yBv}61XM>?(~{MJThHE2c0Zw
zfT|B#Ng-GMu$<Y*UKIK?kN~6g7O?lbRIoWftVt<DueRo544b>MdUM%*Kvi*J<SY>|
zT_2ncJSlytCEF`MHk;Ms!%?49zd3^}z601p<g*UUgs^E|<(U$4`xJ?l*Elqt0P!E1
zfA15A_CNc?m}#^RuE88tfekc(0yEL9cR~<L6i?g(dl0C6^{}lOdU=W_*ln26d{}W1
zELq8_7Og>tXLs18Eu%Ng&X~~&fR5%5dL&a?ErwhG$PkuRN~nCZi$b&?Hbn;1I)={r
z)Rp`WpAc(FtGF7SNSQQ~EFVSy7Q=_odZ(0xao)-awfTYumGug9V_&xFtNXo_O0z<S
zPwF%pXFuz_+@M<ykq)=i66p5N6E0z|^F){&6uxk0iF-{MnSyujt|r@)0bOfy66>Ti
zLRB_+Xtd-b@Jf#aZX(gsPzk(3YP6INPr|m)<49i`Z)Kg~z_0`-tAz{X-SwMCA7#g7
zu~S8*VG3=;T2Qnvv)|9`T#ddIh0ee98?$s1iVDrng-F}d$G7!F%IN|dtP-Xau^;I^
zg99c$P`~q#*HpWoX^M}ld_hAezMQkuPJqMm<fq^5Zwg=fc+q&IpBa_KCB-iQtq<fg
z@u^o>Ct&sto}b>hts|e|jP`N8W`5mvK+dwv@80tm0+EJF-(J@|2z;Zm{QBwi8<L^@
z{Aq_LCe2#e`_WZz;O9#%V(5O1a3Rer>nSo7o-K*}`pcbqfN!CJh*mbAJtq?6UOaV2
z&8G<kAs?6-?W+uD5kR>b^bFrxle=H%a5OO35&migVy_c*YADWCu0$RVF-xUw%wns}
z_XA$>+53@z|5zLeGIi=pzDE?Ex_|=6EprBMSp%S<phVS1@I!yB+>1E2ZSCc8B%maw
z;ecDk?0$B6kZ(c-{W+6nC7u%`Ehr%VJs{veyXwHZ4~N`R{ks-6T!&(txd#MywaEiC
zQk_h<dJPtNht8y5L_&=i>p-&1HcT<Z)ph(~MPKX+d5Ufu2?|LkOJ1X4TrZVMW5jR-
znBXN@acruclwL^Cp%yk>m!Qme@PbcMmH_8hWbDRsL|u7%Go<AtrLRF4cjmr`Qj$PX
z<Cd&b!2>lL+cO~hwy_6@nwn-CdPlev;s?l~jxJejqlcBn)b0qhu>;}_8OG)TZVe66
zBC7RLfh@j|q|fz6q4^yaLVjspwH;qg<Nc3*7IGNrKMR_&Rj|4^V|pfaHmn-h2cM*r
zaa@hd?iIN~KKf=$fLnsxM&ChCNB3~Ny?-?u?{r7~{##fVH8?OG`yo0?`-i*JH8_(3
zY!{|4WWPEn)X2_b;ZQs28f9&@8##Rg$T?@(U>W}2phUqJW^cQbOed^XrDEq@11Q_|
z6**{T9%aU8I*Qk5Cp*TFuh9$ALsd289u!@ureKP3ATF#%_}6wzaz$>=g#rz%b=j2%
z2CisPLx|-pgB2U=r#wsx-kCmajk~m8?1+qv{Y|)erT~|rKlzn2zJ^1&vo$bWZky;L
zTt|ihu~b|ZF(V@32BlPF+d&e)nMY(zQk{dsXM%0906%t+1$EaCaqaV8F7mabnY=px
zS}Go>6+nVVZY|ikC9Co~KRN698G_hoeIvPh8jb;?Zo7w*2cJK@)AlFVWod!zxvx>&
zY_^hdjO<=FWtmWOu&+}wA)L)I3*=Q2oWHn~qD$L$z?*9T8?)xVQZpq|5Oc1s)xA(L
zU{sYfEaQ)P1y}Q|F>8h-9!{HDNjr~Qm2<EU#$`X-ex$J4db9jp?m!(t(GJe&eI%$X
zG+Xh2QbXr$i3p%_vbOS{^>}nBY7yf38x*p2Vr%eW>iCC%)*XGaadA`oV!*{9da|Kn
zuy`KUdBbREqmhYBO82r6QZm)&8dt68ai_A{R8P=6YbV<bJ6irtId_cXo)32C(DGqS
z{OgU}k2}IqaYPTHjpoIgTn`H9&M!$ef*r0Cy}57cfP4~}emIRc`=e`j3TCmEUU{*)
zch<dxP^kZWa2sn9IJPj9mgtNAM^;zw0H^(cowZ}6EqiMmL{iwy`Lol<sPyWUow76M
zo7(Re65!c~(bz_ZQ4JsT1nwXJ+Ro6|5MJ*|^brI$3AlS%gf9o$vVq<;Om@n9z)Nbx
zhW8$`a^sd@x8wT7Xi{a&aK|k9B7g6X&?e9ON`mM5`h;39mmcgB`v}%KPBVRVGe7dX
zbfsq;1>^)os-E8gK2!#8ZxOqDW0UEVo3(P*6bMAv684nXD`rvl$V*=>)VKY9dVfBZ
z*c~mMuIVVa2L|}}Sr!;cbM$7@t0zdtulmHN%w2ChLv!ewKvI)#CU@wFs3UN0q7hx~
z+h91}<D_~^`{t4CCi#6J3iE{Dz$9&lWUze|I(!0i2`cw><L*NlhcQsWd=P6u6cnQO
zuAF>chN&T`urJI?TUcBNGwzJ3Hb?!U03gAp`55K*IN*X94GnT*os3rq&W&9BfOsl<
z5r&D}T*$)8SP=zVRqi@57nr?dD9UL(uwX_wN%;Wa?16;-(@z95V#GB?SmQGta1Dm-
z{Bc&iQpzI;&{F$)RxYCLOFnnHlqR1mu!65=Udv3dVz*0985oT6u9L6ceqWagI|r^L
zD47ofo5=E@_O|<eML_n?20hTIJK2tEU91}7qCC~HR12=F$#~-b3M)|9^lVnMMng+y
zlhcDfJfji?CZvZ?*cJT)oN?iybDx1{&Fkm<afpb0BHc2TUfgf_FyDbfrDT@qlII+2
z9sAw1kl=rtWurf4d6Az~OXmotexmy(b$FDP$778nUn--{byGSHdgkQ364c-Vo0%(2
z5~U9s6C-M=atw)ym$fAzc_KgbYm^Rv-tIeLa1Egh^pe<+kMwwK&wEv%oG<$qEy)I|
zuB`jswid1PC{N&ioICGGr2cD8Bb{5aM()^Tx9!<Rt!5{iCCm8B&})P9H$Z$)Y$@m{
zfdM-R9K{mDald66*Gt`Y)OcbY;nt99bJfKWXq?C)_aqwFwjR^f%~j~&17S9t7He#y
z80h*W@ovgmD-*6{SRWu@ve)&e)>b&%24p=MTPcWRF+C9@L*!Av|Jo<t6y-oOd7-`T
z=c}hE5TAIAv=1=uRb6>Tj2MfTS==^t&zGzp4`oUNBP7j_9twADig<A@0zsmO>^gul
z*~L=aq}iR;Dmrw8^T#G1kqPkizq$~?zHdOdPaZh!s!r>?w>ED(*>vnT;1`|pgwQu>
z8}*%k<+8yba6bU;OS;0DcMo*-MlPmLQCbi;LSa|omKW;Y`mgi1L0fI084t%_jB~s-
z*|58XicCBLsyBKz7PAo!=-WrjvKZ>-d}Xe7ijKs-6CNwS`zlxs%Eus+oNoO}cT!!6
zmE9x841Ut2__1<3iky67cubs;bVcOxm!k8tK)us*UoS_;x$|Qc$d<<&3&h<6S4JN)
zAyA#`c^rBnwWU^?u6YogSV~{ja{R%da`((=KT1Ujo`N$uE$-+8xj?sVYid0B<u8)1
zjTMAKlhVDp2KqyJzU&@$wy&M$q_ms}Z28JycVmx*Mxu+XMG>Ht%<VQGd&o%Isf9QE
z70=T+9*?r<9Z|=Ac}><yRgFmV=~shKrzm7rp{I7W{il6dg0aiW)ih6u`A!Ht?b&k>
z{S<DVNADaH6H>j^z=%arQPs4k-PM+RGxB2`IE0))@njXSpCjr-nnD`6YY#hThh11_
zj3z*o{MB9E%DH=-z_CgcbZ?V{vKu{QL+2in%n)8Yw-62Se**UqoI5>(0`!=}=Tapd
zr$evHkCs)^mwo`%di<Cj<7yYH8%vTVM8p;KqqCBK=_3Cwo1FywaTpB~>g76xPKLpn
z2Wu2+aaG#^EqbJsv!dxmEcHiDYRLHKyH((pO=rLD;BSqfq}dI{-=fbQY<|?>7=*ly
zYayRdcX)KaW1;r`np%w(UazQjnN*>>MFCI`&4RLYL}80e(8se#w!EL%7HxD6ay$Jp
zSTk+_S_n@mu&&|oKG8#hj<kI$GH~|wcNBFb#f)4)u>P0$S#9?I9(a~<lMuzl-kA^p
zC@O0SS++EM)pv6|*&Qv}ZHA=p_w-6AFeDgtNT!nE8V^*CJI+pXYqQZLK9r{m=JHJY
zx!rff>q4b|i7D-5k5_Q9U&qQ3m;H%YXVDv!M#kyQKsol?5f4}Mtkga(1GSg++uX}j
zkJUxwb&T<!53e^k%SKJ@%rFW^*e-c`!%&;(_`rE9K2fSCT1ft&0(#+=bFN5@Evj;M
zqy0n0EkfV&s)S*gh8p(-wlpxbI+TjVr0+Hl*F324<oYOlNbZFtCv6D0CwnsOtZp;Y
z&T^<*CViKom0b~JB*jS$1<r?7*n_3c%q!{Lgn-6D=@jnC0g8v_O)3^6DXu|d>ZN{M
zgGI18!`X*-Afc1IOc^{!*ACZHB60Wu-GY!E@{(HGAzTK>McN9VxLI{So{+bj7W5a-
zcVPzU{6JQ14N`I_f1XImcod1&lW*iN2*sCcFEjguVRWkzL`H7NFPyu56%3HnJ4o7|
zo{t>iR+x7+y+b^l*Ql&f8?3ufoy|{ypS@iwPi02NMNuI;yI~a2!q2e|-?*P`AIp7x
zniwJXHe?68>?NRbv#$5v8~P%;Wjf}CMDydhj_jDT4zwL63bQ<?O-{~5Z1(}`xs`pU
zYulqBdJDvhiWoT#oH!%TDS@n7g^Vo=oAC{UBI8%tO<q4TC*#9O`e`0fb2EICYsv<5
zw<SmpoVWLMf=9*}Vl71LG!Q4$?!<_DeLJ&xA~l*7*8}%S=qcb=$23=lq|8h%r}WPY
z?JPZ8*8Ri*Nqmp7w#-hGQP|(!!Mi5VaqhB^fLx<s>p2$P^oO`WB~yhsj6W(mT^?Pv
zg}8eip2{UA6F>1iDE3p#X!BVyyX8aZ?haSw-r64+gD?eoh-=jfb2`RHZWi$(t#(IZ
z;$I9O%rjD7F>K-P$TgjEMb(5o+8(tzJv9XFmJ5+#9~+O)0!ZuNz06an@+|N3M(me?
z8%F1}Ap@U*+5$lbn7qM&Y$=Sj>u7jEiZ5<y%%GN}PhMD1V&pJZ19Fv6gEKTU(BYt}
z+TPjoQz|bxDiVx!A``oEKe9_RigR@W8ug9EEeGs{tti|1Cvk{J$nz5~PfPz8BKfob
zW7jq@cI4S`c(KNE<>wXIUj@$L&p^{e`kC7vmj@`gwf9=R*lD1~XZ|$}lE(OE#J6kR
zEK9~g?eh)^z3D435v>*E2IPdpS79%wW|)|YqOyNjM2tm~N<WXPZ<|0X5K5Gl+7o}Q
zEo<U62I$F?X{q?7kJs-hICgNxH`K~)eDr#2$74szDDv3&%TRt-gMhJ9xDZEK5gVDm
z?}TAZ)0Qi{@snhJKKZTquw1;KZqtrTERvi(v%_O-ytrR9yu~?5m+!DNYmBqwRK+%C
z=BGZPxs2VPFsoxF7^ytc{mQB+0;r>mb|>8$;!>v(;gWf+>^=~GF{We!)Ul|`78r&v
ziKuDZ1+oz3ZpH}wf!^kAA@{9ITDsS8RMC`&yRh#V^&8hoDP}+h_Oj#W#j!Z&1qeC2
zbe6Y=%Vu0!Dn!v}Xlk7a0VW0_y-|BAKx^ha#+%RKy+J!%=~0{~M?kf2u1SGbh-wG3
zDDhf^q-Bt;;pf<9)qVRR3zJpRH#<NKkl^*2BYqoUd=#-K#kg)*2eTSc-QNln2Yus@
zQrRoFd$2S4CU-xAit5~b4a2ZZxp9^3yiIpG3tlfX-CO|=Igay_Q~i4L`#~q62@|qb
z<QvmEMeT+@>wj?*Hd6Taw(yf$>O-9b3v0!nzzmEJhOmO)ADm4~Y3%omI*3^li(?Qm
zVQv?(4AW8aWmo>FBkr_qG-d9oAz&K+cE~Qb%=<)4G;j~<{=zDo2t(E#R98bYneY#u
zfoSqq@WtX~TS5C5g`nVmDKC-kt{`{Af&lDbd{1e_)BBVHFI5I`)&?inEa&SzKXnot
zC%E(TiiIvK&7q{dH2E})>8_tGr2ai}XF~;kP)a?(M%cUdrIq=T?-xE4Lw*Y-4!t-$
z1%wS9Tfu9X{)?};Lly*_x|3in&W>~HSQnN`E|J>WIWXV9`0TqgUbdg$whb05Q&%zl
z^l<cD9+S)(&at#z@}W5$=Wh4?;g$t64C?Qms_xslS-C@K{C3rh!m5BhXL$KrRm`>}
zPD<0s-pp#8Z8~S)g3EHKj(LQXX!mG0>uRb8dD}5g&82g;(=LX*>q5TzhhS=O0Kqv|
zk(5-WRk5sGzrkE5g1cZN1lT{gju96ji377X=YZCSNy}Xb`BR8_CPEl6;|xK91haC@
zszGCxWSjHy*bP49j~p{OC`Bqv-y9Vu5n(=o3?1DVbhmN$G=_)jquTpgb{49m)sxo8
zJ+9P^V_96hr>G_7!@k8}<8}eYc(o6op`(6*nv)D|RuQ{P)jY=qF56aP+~k9U3)$pG
zw`Q>jlz0BY=z;JcY!iU<*8c8y2;b!YGyGL5@BFHsjZgFh<q@edJCXA7R4zato3uam
z*kVEP<02r$)N?ht>{gMhgdT9Qbh1litK2oZ>PULkfM-vwpMAu40jP=CD>2o@A*XH#
z*RCGk=*Ojg#T0O24M}~8TEC&?WF%#BS@)TFIkOj$-23ehpt`gea>Ubx#a=LQ(W+B+
z%08`D7!r4|8|v!}*rd0bUS`KOBkRajR=n6{J*o=ygpKnM3zd$%D+~5k!^5=U6J|#%
z2)y>V>{KjjV%(HIR6Fk1-NrAF)OcQZ4v<rkV<rI%kq@>Lh598Nhw8;-=A|E1W4sz1
zABlig9o=i+Atu<<%P0I$9k#K?l0JmKD1Gg4-VWl#%CRF8rG9UljeVGoKdI^K^<{6n
zk)0I_6VJvw36~MyDvAn5+6HEtkYdDw+RHzxMqR1YpS(KLgKK|XS-Oc<*q*|jGkH-!
zQN|gfouiFCmV;iJw^%o^7fbr>_90VTI+hWcYnn<*6UZ?EKIOi%cH5Ks8g15`pBpaR
zR#w3T@dE2@OQ0^{<u`y)N{hS5jyihybwh{Q(D!tPvf4;JRxwLwnS4z>pFykrj`h+q
zO0A%1w(k0V)1d)X>$+xYgV1%>l@5;4IXnNMWR1M`RNAT-nN*61fE)wC{}Zg|kAqml
zR`{!#=oYs3lQesR5NsL558h0tSpvVCzjjlYM&6qE(gF9-y;_#u<7>pu44_5Jc=%zk
zjJEGq0u#{B3xdA8y>&Z{<L%C&E%l}Mx63zi#jK^2q{-2eSjL1h3hRk?a^-vb`+^pv
zNFSXW=oR+BmFUleSp4jx(vZqP&dkStGe3s-dvUsbqY`!THdnCI2wVMvIM9kFuMe^q
zS60}xp)*z-fSIhL0YE-8oHr;(M~-6{QWFPZv;{K^w0Z1M@-%}V@;x}g4%DA+u!$vx
zy7^)1UFvp-?iPi13~{mYs@x&Zo6MHgkNtKVt^#z@%~|sfzornBap?ds=yq$+@h3*(
zDyd7DxNmgM*;G(fxvm?XVbl8?-%`awJbdK5sWZ71R$(?7RjhPM3reDw%_#$CkH(c)
z0wD1sOkzjGL4-ScA&o<%J~siBhmN+uc0X)$P4%Z__$geteu{nbIv1%yrS|@OoaxIp
zhsW56d$@<l6ZZzRlj#q!BJWX#g7Sjx$+*($mk>`&tq`G*E+ty6F#pEnY@~-x8G;wa
z?-mkIG{1t$oyTs)Ji*>(=`(cqSx%)ALN#_U+VGjiq;p}w_07EYt`4Ghn-C8#k$}xI
z%0nz8=XU%?YdLDiadM_92)0L&v8G8Y@<}{mO0T_|AeNQJ!Z3-DdR+x!GiWJeja<1+
z`LJ1w+C5J-m|w8#a6Rsah8?>0>v{w_ye_wWXK;jCZcUJ$L&vC+*+7~6yL-(8fcx%J
z;6~O}mC6At7naDAknT0umnW+S=swyv^JXV+j(YD28hMLay)AvIfMABff85E}eS;J^
zkqa*3BedErxifPxiQ%ct$JlK_0VN9b8rvoYB%}m1$md5p=k<pNV&!;~*qc`}O<Bax
zQrM4imz8?zJQ^(H$H|I55Gxm7wMd`DvOt)X*e3||A1aKI5?>#452-BKn|g1ytZj-P
zD34&At8Ux*h#0plF?AhyO}tiT(!zhqVq|oA?<J((XT7UznESesJ8#i!!GH?yP32A~
z5K3^2-nMjLX+9wxv-}b3Guy3*DiSmZWp7-^ZC6)+SuB$M-lL#?tzsBifmvv=bGpL*
zUXHO&<TRr(MJFltCNp`+%P^8t*o#mjnER6w<mq(O^|7QGzmV9URW=^&5UP|={f*tn
za=qk(;~o{$PNAG?_3fLfhfq5ZDBATL8Gjj3UBm+;8KTE_XPjhn=kH4he$Ftd96W$t
zx&HKvnRxkqm=H;yBMx8b`sa@;COboTTtV9yzfqwpIiLZaHi{M%M}KVqsT1>w3OSFd
z^Q)M6zkbzW0Gc$rv_7{}<bYzZ@x>hUnRtNGh(I8o={n&$Hmd68w$)IISG4`68(MO9
z49l5GPCE2j*z_5}3cV|79$al7QeHyFsoyB+V?T=J$F$b*AUE1;7gM|Ujum$KgTSjL
zA@h0c^mj0PpEJ=|6hUl9*dM&aR!gb=Vz&IcCI_!g!jl7DtVMMGe&-UF6chbN+|9Jf
zx%X`LlAe60GAZR!cbcn*K{K8FUOEvzmI+gq)L>+-FUsKwr{Ji8+>2_0I;K3KJ3yV>
zkk>dPljp}fYruZ=!lrO7c>||>BE4^?2B)O_8FW@YRh1O(YsMOMb7x*FQ_eyb;6W)g
zs3lvNq_ZlGS$AavSF&0)4s&)$B$3qw%_pH;JB~u{*3`+HWyA8^iQT+8xJa9pbM_v=
zxvb}Et{E_3aQqaxBN-ej`38H~NhiC#BVoam`mIBGDcK2w5dOBm^>lzmJD*Q+X}a^-
zhn!80>ZVt}`(ZlZhU7qg|0I}yx~V%+e4#d>RT=kpBENX^??yQUzv0SXu=}uj4Dho5
z#9o1@ez79plT#e`564HP{c1Oc?|nOd@VhAR=aE|G-vwq7F{kE8y0K37*B)xmjFY-A
zVgB8{{qvA!fd8MsVz5;@$nZJ-865xn9|d@RZ>?XO34Ake``^7;w~gon*wJMJkhs7c
ze<dSNXX1pMOYPUb<@2OP`%DX{fN`Bi(SN;5T?Ft$odJa0(Vvyo6zRLmW@ESoMIvgv
zxnZ)xym|c-k5W-fH>gPU&i~?s54j3B;Ti2lZ{C*q_1>g8eUxD=NBtYj619RN*(evg
zTp@H_{F7Ez%r8O5oXy{&a1Uwzd}Q>K-7o0ne6%QV($>k|ozr7?FGnWe4?g6t3rByq
zf6Vv)bgNy+8VLZbMSq1k+R`M^-`+`ug}Xj9d+}E7@T}CK-B`h~7<T+_{n-J(2IGFC
zrk6Jr7eDdf;5(pm`pCGCDmOp>u?IbP2RapP=ge>I?UbUal}c!>IYXdGte~mM;!nVR
z5vKsu=6Yf|C4dl7Q1U10pH#h}qDZE*qiukP2#<?<z-8PQIX<q6xDUjX;rYukoe2=h
zzpo1`Z|~XN?h62>9oP!#Uu^`f)?e_@w=t`Rzt+W6P_&+-^_b1NIMDz19scz=sq|F3
zF5&V2T&OfmJhb-e`e=dK@gxvw9v&IFjl!<*^~NUb`kpDXggo1h(Xjj~iQJ88?1<6v
zc<@D~$ib9yUB%L}5Gh=$^8EP+^U3ngcRI^UOFOauwc*m<+fK;_?zlHSQ4soTS=kw7
zlUNc3IKKqv+ym;aQ5TR`{UK7nZqs7nU&(Gx$zo#H=NoF#7Y+H-J8{F*`J5gu8S?IZ
z(bq26W9II(zkE#^TUu7O)Z~c?Q<!TtU;6Oj!}qUt#)$jFGtn$+^z8Nf;gM0?ec#D|
zJT#%maSB@5Pm~V&@ZrPn7R3&m>bXS#c`{ium@d`LJ*LTU?b<b%?711d(n3LT=-j!L
z?ZJZwH>jznErHtR(Tpql#!ggOCGU_xUQ=<uD6Cm~`26*29uM)S!zKS9rqLfyK1IOl
zY3Y<`SrPu`)^P$7Esuy!55*i1#?HS!<1mkhi=N+(7Mj`m*Md+-fs_7=<`n&781)7Y
z8%G71ZquAs$o!9Zt7tDT41)(hUnPrZvDK{5e+UYC>><7hit?Mxyu2z&?uTl^>5bW;
zk>wEU=4r=SR(^hdm;$`Bqhr9}nTtyeJ{6zb>Cra({QSJ_lui3>lz%<iu(V_RF;#zC
zG+ZjrTbfP(I$F3m#B@8h-#@J{lHYG+Nq^KImBK~`Ya}9;*T~7wj|5vm&0%wL#N0$o
zS~}pZp<(B6uHsVNUS9+rdtLGTx(~_gPXltUE#?>#l@{=~BYAIjciL&YNo0k7osRP@
z$Hs_$k+YZE6909e(+r6JWyhFOIGWxE<ha+NkY}atXAb;;^Kd8PS-Mncbas-<3vK76
zo6hGu?Mqqlmf<q&^-5r+()@~^M=(BDRgK-DY>)1Z=UpH0kGE=2L+*q^JCcN5KVOIb
z-l%IifRhZ2vD(HpW-37o`eyIn<UW8k{xSoDB_aRne~^CC#Kf<81g@vU3Ve9b{mTCY
z1kEW$ZNMS>1h=exW!ZS)0B*pizC=Mvl=v%P5+c9aEq7rO3f;jYXN#PiR7dFiK9~Xx
zpab7IQdAg)76OJ&@60??EBo^OSmoD>2#iu6DPDrr_Wz}yf_~B8`2IhM0I*mL#{CSx
z{(bjpU#lV*5E)jbzab2F5)<<*S>(`dy2OtN;<_s&G<E!ZE+9BK>f5)cWCqxu?#V=V
zfW^9NXlMvJ4+{$mi_O@yk;B7Ei2HA=fH_hXIsYk<o0G%gv0(ip&bVvBIGI&mULGck
z(f)g*g-bMgT)h3!69*291)$(RrsU@4K0V9JdpObHUTY4od__RTmjWFPA9^kLs!tT<
zCOqo2UVk(b!Eg7Yqrv?wC^;aA;{SS}ejO2Fd9(k=p#gik@G~ykEm4m;P1nteO0pY6
zgCD^eL4b=MIcq2^>^uG-4Y)6tl3ce2QP-aW9^8}^)Y_M#=!}fJi2F$IOWu+n$yS#&
z2Xx|Hue6Ur&_Gvey#MmSi*Zlz*>rCb{&h)zz7KNdXJtLx-Q7(P$Gg<F0}dL18m~>)
zR%yDdX6`PFqSX8=0kv_5O*^&mxmo&BcTBh7b{)gLd-q_nzjwi3k0Bzzql<rzgMc4h
z_1w?-R+vIM@CU2kGe4F*?FHs43>+f)twxkb+~arQSFo`uQQu8~quy;qUC4HIbp<8=
zS4DxCTI;_)$}dY~k8j3SeTR-t%*)Fw=$`2-ef_laHI>HjT*d4cCMG#ML(g>F527}v
zzA6$>3%vc?ZU4UFm6hgyp)|oTiGiwxg+)X&R!K<-a2w>H3GR6TX}hV?alC`L$HzB*
zoZH&$jcs_iF##N*`Txf|(hG=>6>0$<+7Pbj4lNw^<CA_U+v@77)JEgT7nSZGz45<X
zz`xg#;D4?oeX0D@r#=Y|lkaYjlN+CB41VS|%P1}VuKLeXqn`-~{2Qf<K5|A8jIY9h
z()sFe=gCgO!TOjC1X2NHrT_EG-u|~i|FbiIHSevlU!@0bH2UXHYs7tmwzf6}RaK^g
zgM)wHdjXMufh^JQav}!81Rp;?AW94NS4L&!=)W#^?f8G*)~AcuV1;hnxS`L&od-;h
zgg?RGA=aPErKbIteMR5Z^E-@;&%ouPUzV2_4lbJFugL8G_Oi)qxG`0h(+}6jiX2b7
zdV4qJBzq+#B}?B8F=ihW0Vj)$(mWz;2>kewAA#hgzkBzo0L0egX?AI8>GUKN_}ka+
z#O-EUT8TSFo@U!K^`*{xM%j>d6*V=rCp0p*TC1#PJ-(eTd?_z4m!L)oI&7@`g#X8U
z+|#E>$G^ghSW#%h4)w344|4<&hTAvql&6a<K+~zTF@!Msmn{#o`W?~T2<zzOon^to
z!h(gjg3Y-!X;u`qvSNa`-_Aqoiu~D1Sn76StK|dNZ00a}N6TlO5_F4G92Rt&;dh{+
z16O(dI%LL=7J4pEzQn6i7YGRfN|Ww$84<6;fkZGu=X2HD&Ku6FnKAa9rPqpf=DZ1C
zn40G8L^QooRAiv!G5?e)6Vufd#eCpECE_-IJjT!lgLQ$EZn!aC^5|^`(KP}B9%SZb
zif}UU@e}o~RXZg9*~uR2E=OAyELcgk+YK5;wIez5>5G5N*yeVa6ipbn*(e|N{iOV5
z*X{cIc0YQ;+|Legi`twc->7Ka>+I}=$$s|JM_DyqC?9p!)zuk&?B$%<2RAU4Ju4%l
zeBDV=L*q-Uh;o5?W@zT9mq<%%t6|go%h%UwNk|ylsT~t`iYze2us{enYT)YNP`S9g
z-0g{p9R#(YIJ83{FAN7##7^-Hv|K~?00Vp}2)5M9O~PhSBO@cQ#>cE&T#Cu*KS%0a
z9j9Xg>Nx+=X#ca#o)(<^J+tz+=e1V?*7%nS$glr#00-@>fU*}JIR4om-xWyaGKnN|
zn?-{^-V(K`H14NyKALufG(*kW@(bl~1R!fl{OkE;_P3t6x*htaX__A`CqoPIri2sU
zQJ!JVV}V7j0f9Pi?R9GIYF%J&c02DUcX(mp**kgia&V!5nAl<uSAQgpu*<k|)A{Lo
z(K-g|$0Yvx$25mAqU)r0U2kN3ii*0&Wz;huiLgjbzd}9*mcA6Su58e$_dVme?a5M%
zjJUYhPQ(vq63zGGP^zNiQe=`K$4r8C%Qcs}X3nu_-~Dk}Rb!vDl=m}~D`nXUwt-t8
z#~YCZ98E6ziH)agU&y>Qr#w?Wp&cpX%h;6GTaz~qg<%|5*qsFZ4%S9wj^aTuD`Ub`
zMA*soU*>Q3<sGzEDv{$MW={yUV9@qoCcJK_%($N?`PGM<bY~zQnk!0b?d<n!eTSQ;
z1S(>_`8aS#2Rs!y+u%ayG|_;RC72$582fxihm2i2zfmqfMEs3gDhKpi0CCOn6fPEu
z>8ktI*X6f+KYF!qR_Mb#NKMk28qCHD!=t0KP;h0AvqP?ap>$)*qMRHes~^%&<b^6x
z>qU*DWerEGL)o1op6)gJZMfMjYNSoC;~r&B$ORnwAd#aQR;$HWJw&00hh!e){V(0X
zy*-5t4Gmd5Kqd;iR_1F|y~f4Eqdfg`fLFH5JHk#(GdPTzol*gjU(yZ@$^wsxti47f
zb--h>Bg{g3f0`<vHY9#`*A|##%&YjHfJ36?)P9W4&T4X|D4e`Dzd0dl5|3S1LQ%)<
zqWc@DB)^PHFv|Vb?M9R~y8+pS<#f&J_63$6lU3c0AHhTu-#kUy{52{mjY{*u^-#q9
zd-vL`5cgntV3%o=v1#UD(z_*!UcGobQEGU4z;RW7_Uvp*O+g{;=)$b1o^fJgLL^vE
z73%XkrIB6<la3KTj?u9m%&%0Ey`hwOYM+mLeT@ZEk^b!y+v<JLpxqj5R#1e->TQ5~
zB_bVw6E3!P{yB;?tG`H|PAjt#`3XG;a4Z@yDQg|``a7t>_}PaJT$D+@3_!XW>J%I$
z%Mw*E^5lQ<m>p#A+-YFoVUZ5~;Iu6U@RoyU!FiCG%q7zOw^yVW6}!xYJ1H-{L9sG-
zy$%L~3@c~U#Zi4y@DvGCg5+EaI;4kJSslG&v?0;9+nV~idyEK`0qG%I_*M=_>uC}6
z!t4b6Dzj#?L0@Kr!ADCs%Y*dtnZmbMn|QucXoskf-q9ibE5Lahy0D<H^)wXG9kO#7
zaoy|63^+~<81x$o8XC;ob$cPd5(oB%<CamI>u1O|a-B$!<IM%k;ppg@w>O-0>mbu4
z3^#6377#K1JcL_y3m;7}%)0FbZ_GB%9+SJ$nd6+%pepQU8JMu_R^9dor33~%ft%M7
zHjr3c-8=2(tqL8|q16<9!Fce26Bz{#Or4EBfLJZ}`#nz3N#=*X$KRxRcg`$-_9AeD
z5hz3r4u~4h@~N{?Md_b2he3l@Z?m#%KB`Wgy*OC#Tr-ycl}v;cg`9Pc<yeXS+gJ6d
zxdo^bJFIK=y%zs<0!7f`d2hd+iBR%U3tKjv7(HNO;)te#h0?N*X}cCYm6D<qT|Jg7
zK0R4Z7Q7h|LdpBu>b_CzRjzW~W-qMQWl08p2YRi3o!>r?+<Wlgd4C=)DQO1kI@Y?g
zvva9YFNIo#X%t(4MWKoN>Hezipd|S!h6$93m33r2R1F@l;SUmo+uWv+Nhj20UIq@<
z`GhSvME37zHEJCSl1|+ElZ2&6k6>+Wox!{_Ox{<oo5m8mcZT0P-PW&!k|0G%oAskl
zo_Ok8`rth#m-cj^5wOqMA_p;{%c0GAmECe*jh1|I@I)^;Fe68A6x%l6U)U~1sdRm~
zpR_W%asJ8~+z?3et|24DF^EQ3z3}S~is#bOAPdoPoOQ37iBVn&Rnc*;5UIqtd@8Nz
zySH-GP7AHmC|gZ0>W$-S&%HzicOH48vg(0V>$p8i$FQO}ioh=t1uj*1X6|?un90`J
zr?fr&{bQ0pm{kgg8$Tv<8?FuKy3~CL4dwM%5WK>AzOIA%ZlGmnfZsyRA)-s^a<G;e
zni?5NDr~e+-ON`4qLg~%c=QkL<w(WXVSD|ev(X3bA}$9bDhJ~;n!24GVGNm26w)Oz
zJuNNaP;fFYElu2EW1J41D+W{YR#Lp=&}+HE5BBo@35G#H5eM1%HWW3q%$YBvXw60m
z;ti3)lG&Xqkk;*=m;;wobHQUVdAB>7H6kr7&8U^qsQ2?d<3vcb$Mv-6o<B3&gC(ZG
zN}MmHdD_}S+y56|?;Xx|`2KyXR<+R<t<hn0Q(IB1c8yjQtxbfg+N&g~5sIQUtAp0w
zvtkPg30l=w?JZ)~3<*VoNb-Dqf6x8<-S=}J$Kwyj5i`l>`dsIEzTWTiyp%DGWsgGl
zCT#Y6cZ6CF=X_+ThCKt|M1EyfzYul;;6@0bt@xQ@C`E6`p34r({DXZl{9P!hsd+Ky
z?!Og_z{Rfhpf5j#A6@!<nKL{2hEtGoJBZI~y1cWa>C%Jk+W_v+|M&mTu3KkVUv$i{
z>iZsHJ;69w(op54=PwI%qytrZnG{Kb)HuK0Ya5ZrRGfO5KYpRb^t!t9Z=OnyiS)>;
zW;|N?mm5oQK+<OgzK6%aeNb_(rWv%^7~xgcAP+y;5y7ZEATb|^Y6%yzd)0sd*3h%r
z_Ne_}%M<=ew6)rW|H2Q{ANp(LO6>lF-jCB}T&(RJCIJamv4{CMaJCr<Lk{pg#(E<y
zVtkul(k9@0JW-T#CsJuLd<OK|>UC7q1&z(hL@v9HP7Q`Bf3a=kttw;LF118qcpaZz
z6>!SJ9#G%`Z8F{SyqyE_7vuu6wb~k0=ewg%U)q*nDv{Db1C0m&x}ez`MV#pN>2|+o
zU>6{nl@}Zdk3bxAY?SM9h?gD3m9j)0Vv8i4D3;3B&WGJwOuyECoU7*577Ha<Pft(h
zvXKYZ>sNEk@md$6OynY~Ue&Z;;sv?q@d3n<?%mR*4eC@7QL^PUvhyw=VFZ(!R6^QL
z*}9%)wUWW+tEJn7WfXITgl{I7C?Dnq|EW}x=|Jre9^b|`B=nymLjMC$-Yy?pCatlb
zpM3rQ0tH>*W+w!3eOR`lj4dfY4ilaEcj~`rY-AJEUHa`w=%4qGjsY3!ICs?OXSa*G
z4J1BI*s&8lt!sZr=Is4dP2Vs_aSU^Q@$`<`&-ME~s^p<7XLjLm4UG1t0!ZETdy?jf
z(TKhZTh#9=$8Q0mufbYbg@uLav5WX6o8`puZ<QF5it<v1e}HVYNZ2{1M(m!cYi4R{
zv5Q!z9mm+sV|N{d9q$DE(Mv?QoMzKxVWC7;vUOs$gK-<}9RI#?Y6!^6skO5`(x3;Z
zeNcZM(^-QtSx%bP>erxz0od}1tm4Fx+PQq+3$<AoTQ0BmrNYnkp&K)8MxnXyglLoX
zZ!X{?G~X757MDu<jCAt@$<1Ichs6n$W?Q{r#}3v87us^Bz&EpBXrAQ<2p%bE@;Avz
zP>zre4D^&%inb5g)I~I>A#RF`8+tb_@PT)eunVM@PD1(1?B{&|N4d$z#8Jxj7(8m8
zefIi!cDp58EezPVjZNhvo71Hf0^Qb1I{w@)b8`aOSt3YGg6g-v@xU40zn^@_nR=Aw
zPk}SY-Z>nXH&{A*?u%qz2U7jvO0d0s=)Ihy_WW(!R$)Gl&Gg<d#^AFJR?1EkzkSJ3
z+1qk*J3&nxOB(UKN{p?ot)wyPOTIsok1&z2<>gJlUo&oF<|P5lITQmFV_-ITAJ@A#
zTok}~{A^H&`Xk14#q<TxtEY^3hnD&oI|#{C6%^_C1bsZ(MvhAadImVEyxf_e@gut6
zK^}7<pkULx*O}N>%Kd`zlLr_lRP89iK^)PglvJ;^wiSKj`vnI)_6y&!e(!l!PPF0e
zfx#T!w?0hPTsx}#cESd5G%1@Vuw5IfKQmNTJ%g!mu5q<(vR9vQz7f6Rw;7+CF#puf
z>KzYB^>Y1=06+Z(VAL$4#C;(3Ck9&_&e*g2a|_03j(_u}<l0MMHqkt$)v@;p$A7}?
z|9mQNycx>#B|Vqzb2u$gmDE>j75w;*yLR=`X~oIQ0E-6>w7PJG`!L^=dQpEg)<%{?
z1!N4?;V?Osc!4B~M@e_Ah<YPt!r7lK_vN1Mpo_lyF)b+}aX0Us@;iscV4huDj-N-O
z8c|b0<ypz<Qc^v@Ez2ddkv@H(*8^nOH#x|%>35$$hf9KrS|goK$}L}e-Ojs@1z!;m
z&C^fDTK`SdJht7zpwoiYrgD7gUu%2bmxy-8JKc;|1hP`B`XfYmHCN|b;=WP(9iyy}
zfA<CB=eiim)JgxHmv1%s#gE-~pmQhAovvHqhlE@SrYQC9#`m$l4!PX??ZeYB%Uy7M
zEvMS{yU-RA0i*c((adxec=wC6I`hEa8XZvjMCO#krNcDj3s7Z^(u8L3EoH*9?EE@-
zRdRj|XDIsz7$gvP@87%ktQcsMeX;e?{&0lQX~+{=2QhCf(feM|$H|b##>HN$ftt;)
zh1veIAhb$nU(EjvD6aMd#x}eKJ(rQ<7EIs28T|_w%9HV<!(acpoJ<Cgd8x?%UtnbX
zn4DGE{z@^rm7mMTcfEde^};$L>Pr=EhX}vtxHeJmQCL#4{ARqVWfQ>7#P-K>0d4X?
z6cNmN_wnOj%G$c5R{uXRoKOfEJ*CweKPl>|Kn3TtJtRWH==Elns=btpmoACJrvi(C
z{9~e6lf67n3T?oDOJ7gr`9--aGqd%h_JdKY$hNaQz)bQrxp6eK+*__(EAse?^$rH=
z|L4VW+~lO)9w3`IPh$~57jl9A9M>|}$tNeIG_PPivZtyXBhN@}I5%r0-;Ko&4h(F+
zjEJCSGY^*j)n?NlR$>I5P9<i)Jtrc>O{wvl*CR+x@$@=<m6Vi(f-Ku!#?RLqXRF(@
z>B=u1hBz7-2Pt~^B@cBZTpFloHcF?z+BH39m;U(a6HxYR0u7f9_yDHtw`U>YP<`9H
z%nGi94M13U@aWMaP4=Pxof9Tg|1X^M?A)K{Egqx5u~n+RGn(Lgo`63nN0Y*j+l`X?
z2;W&qh3wmHBt_W&nM$<&Rblccs9RxFeh-e|K6^ILWw#-ke}*g#!QP#D{&%X$zqpxB
z!RzxJJiQdUQx5s{?uw4*t=)R<*<FCrBJKfR&m*&JM%{mn!yTuZ167U{G&fJ~zCD^a
z>))fS&;Dv`Ha|&yAom7PYY(qIq)xS>?O*)5@jflh9l&|0>CkeHT}1fPy)G%tL;iW-
zQtrH%a4QZ}8w~T8p@jtn?Q?6LIB{k3Ii1_i#MIPLLiv=SirMYkw>?kh`SJ=2S9YeV
zk{WeTx`&0jbk?_*n?TiZA3*4v=h$C!*aa?pQhC{y*m`0Rz(vqy?SOzf;2U4r+wX*|
zYaDJQ;jT~h;t%LGZU4I0=eI|<_&MLty7iEk-lW}bu&g^+f3I~Ku>=_JyOy(na$unP
z8Q_h(3-51@#=equ4)Ix{n%}$E`ChA(``=I#{nC$)FlI=}!*u{viUUxKP3-@B6C^_x
zmX?UDwmhNizf+ZUnlh_04=bFkWMN&L=<j;*y4E28u?Sv&6%kl|$f%fLNC?0+^w;=#
z&N|)k!=S#sej4_tF7eB#D)hzO_9}o?WurR0MRyfAzE?<Lcb|e~5-F4zAjSCkhWlEg
zXskWTJ9EnTKMJLGIE&nGATh87a*m2?+ENZc6)^zhXSUB5AuU1mo>R@%?j9acCI$$>
zUL2A#xh06*joGt8Lf!}8kIY_0vK>sFSAJ1&ccb;_ZMT8zhoCFeU6`jEc%Ga3@sJaj
zHIHaabe#*PlGNtl$2o;0OidY*qV4BjaUF$3uyGZI176_J{a--0A0iasYZF2?4%!=_
z{UqXUz3;5{EeVML8-AdG&CA!adua&{xO+qVQCNaO+{a}uX0v5MzM-d;<%KUJV{pA9
z{Ra<AT4vu2$>tFBt@c@ed~B4_9}@v0pQu=4+^Kc$aT%$^l?yjcatrVSSr6;~I%D;}
z2nz7|XQfGB(s<`|;8NzRJpi`KkMyXEf+|W&`#U}#Vx=<|s`53*c|m^P+S}uAupbbb
zo9~vEm&=9DUEulm+{HzBllJ-TCA?!aXjjM1F5`@JYZx%0vU{Y$Hfc=paE{Y|_JFI7
zBF9uO3mjqli^T5E#a(;8T}=6qo-S^zzE{x9*e4n_aIorg-J4Z8+JZ9C^x+FN2BJU^
zWo;#O^Z8_>pZ-_5_Omj`c^p=IIYJ|L(a7mXJTM25h337~lNmI*eQaVFD$wdNuXOsE
zlHymZ>bW;tLOoB8vY*+;@8^3ND=&P!#(Ic^pY`YIKDM!OKX}c+wa{29Ywj|YLdDa$
zPF%RIdESwn0KDa-7Su?~gbI4dqQatLq6}(LF|v<BmerG5xJ*s8oXIWv$GJ{CVfK=L
zDgRQwe|ae*<HM2ZUg*NWxu3sOv#5dDihmgdmRGxh!M`u6(n^Kba%fnoz1<~#Ly55Y
zhSup4%+we3kDfsH$75JE#@^E|{AtSR)~xwK>p)nW+>`dj8k&Z^L%E{o$%E4@W3}-R
z6Ngka4Fym8W_o5*!&AYnt1K)fm=jVg|MPJ<@%@Jnh%0{MQVW{{wJyenMn;nSH%&}8
zGz)+YK+P5xikLC42DGYu@42_jukBN?fMU7k1O(dCAw?7uP0exAKb6kI3RHvh?MRt<
zIS7{;aoa4u*=?|>)y3o-kJSbM566U=yZT}34PN39rJ}wFAfEgLvaqAsZ-o;&O!M_V
ziT5O>0$gd&o9V2>%_m{S1)U8u`uX!`6%de9(`^BabbhBkU;ChD%R4kQG-|2&P9U)Y
z<+=B7A>6WqC;GPMSXCpN+uFk<A+>`|=}Q~8f%3AetBa$VmF041N+sSCA}v}aTkCJA
z&i9q@%ocude)ke|G!{hhVtCj1uuud*qPsB1UAsHMJ9_w<%%)SVS-0Tx7U_+y;IU>U
zC+A#VFFg0|CE#s?a<;Mk&%4L+y&s5j<T$N!<GRg2X+Hw+=+^S5AgQsM8~cwQ0!Xw(
zW?Pe%T(S`rD*zjF9BB^RYAv5|{QdFP9haVr7oE?ym-~m$+HloPhtkY<>FSK#`4_n$
z0|{tFHefYrp-gzdx+GC!JEIUX6X&T&%ekTxeO;nXlV>+MB_*YAugIx0aRJoJYiDAq
zEjNMkfq2tWC9KcxP>5>3k1H)B-2GogE=nVSJxO`v%Ts+}L|wfX{?3M2HH83&Xz1xw
zfH5O{k~U@{?b84Ks<@ORIR5(q3(K2)?rVA<i6lWEFgoBCzg<q^M0EfoO9krQlxM+P
zM<I^(UR3lJ*nK$X?BYV}*?y}I>+h?+Wji^UqjeOQdH??X@ZRfL*d>7Ncd@CK;BhKg
z=I*u3labGRv%IL&VK_p_R<|EriFvTK4&a1MCVeoQ@vQgmRy=3Jn6=fL*hyocdZ8^y
zhkdE)V>LB>nTJ_~1H57q+Vr#|_QjT-S7B3O-g?rV<r`{h1V~(NilnVYc^p|G=F@4#
z{?KKi$9Mi*F%8;YHgy#3Zja*d0<0?GmjC?%#{{|T{`&z7i$MuMj>bP2tGiV;|9eoe
zXJA&mV&4*E4OF2`$jQx=j113UvLM5lVT<yv2e#o`8)7d8i;bl%UzSUehOIvf%Li?{
z;(Y2mfGho*SCLatWyl5y9UK03BS+W;93*Y(PBe=tcumx)4DMl7fOXpz!(ZZ{nk5`G
zZBSVWEO)$-BH@`xcE}6uPJcjJk`Na!w^>Zz-yyQw^Ww3H;2EYn4$$2{aX9u<i0JWZ
zC;b_@PsFimr=~ztr}ZvrTpb|Lv8zA9nDLzHD>lvsMIJk=+i9<LvO7(IBc$m3|F(QF
z!vE)m{s1WUw)uJqtd(c=+18xnKABqy8gV24E-p^24wrW!GF3jNN}3_hh@Be2emd=3
za&ol*`(oku3$}?>A$xG<Z=J%TBAaryukMK~EGdxt_q5C`Dt>43M~M%8>Y-xfGE;%Y
zI|e{ASH<a&T25($fE-OA39FCS<;}2^pC0<O!Ri$T@HE!S2P^2e&wI>djC8el0CZ87
za6#?|0J)E5mkN#`!5-xn6*XS?1~&C4Uwx*rDevE(eQB<CsB<{_YI&(X|L?0=a`FFs
zedl=3DteB|Y?M*bmHmsn#%peDlzj$O)e8@Ex0)m)!I%_cqW!t&e?B_`8eX_%VVQVF
z-c>P%WUyzznPFw2VdLB*YQdDc+Fo_M(94-47!sQ3Inx?Gd`JE8&bxNyA|?*dl1tk8
z2L=Z#0RFYm&ao}jt47Ue0m7F0iA5kJf)4I?r^&e_a(+HhxOYuXu6AOn3J7<pm&!qj
zKfAib`M>`6vwww-n_>O$M=UIJ1%Q+Z6>D?=;!p#WI0Ec5V(#XCMEl@%-ra{gk7YEy
zl%hRGzTUDl0fa?ckN&)<^%i*d0XiztXncm1_hxx*5O^gt+f_`AJW`Rqvoa`x6xNA8
zRXv}iG4)7wUH<SEa|7gsY_*-CCotMN3J;Xj&j2ZMSY3+8&g7D|`f9|-j~^TVh#&4F
z+3df2lF*E)z$HN%og7B)`~j>%gp9UP^m!ov9*8;m+I<w639NMajk5jaT}9Wv%Nu28
zj*eG=1<2KRv#|Pfmzx{G=7#nB@p__VFy@(j{ZVwm1S8YdCa4y@_4P@n3VULID@^jM
z?uY&G-Vwy<)ph3<TM>MTx7$duQH_F!ne>K;LUHhOIh>l>WLUa<$=-Tt_ltqFk9L?Z
z-5xhXq?7B6X#o#6=W|^w<UA&1)aSM4u`$6KEk3x0Un9+%B!45zB166R(>{o2s7bYK
z1$>>WC#{L*C9R0M(c$)I?c_w$rc8Uc2wLR&a73_{^#yOl?E;<6kUrH!YWcpm`tsb!
z^PuS?<K2>lDU<W6=smTU6|jfp43~q<eic817`{6>nW`2>UCdKCMNk7tb#DY=GHcSc
z_X}QpP^>9;J^jNRIq+9-pIT*^4a)V|waJU+5d32OV&gDAxbpp;qX~^KCC!Y6{N`E*
z?fu!-ge*^w^SIUxRT-JkBZ$n^dk;08>amU_(29o#{J*3O^;LE%kWnRUqv6P|na}<H
z*IuR7j~dtCSXBM~S=Nb_$$q$+sxK(Nc$Pr_Cu3rH9Zbi1O`xxBfDXU$RF2$WI&!Op
za_~aHed?2?y<1nRG-tEe9pIM1{C#g2GCN1oCe%*@Vno#=s+*e|3<$ydtc&;3RpCg2
zf3F(0QT-zt>*C_VZf{OnDb8--)Hvvijg4i^mL=j*mC}DK;G1bOz-=15oEsA&8~QGB
zT@p3<6xa(-hTPm_>{N!01N+`tm?yATJ02qLdiP<mjW4T(Id1{A7jN;^ihK8AH6R*|
z!1t5tWrBes2|I>fqq)Z~{QY~(epr3N$1Au55VY{R{NTSwm0<i#U}3JWqoy1Fvn4u>
z)HoYrW}`2aEgT$93>6C5(6X(0c7H~$0|2pSh`{-<Gv)`9R#mON)neFD>J;$fGsbz;
z!y*qjb5MV!S4ZKIUcyCQ=oKb_;$4{3Fs2K@q&Y&KF9Cb}IvD{H?5Fl0Og0DlYs9$P
zmqRrCaD9929MWSzjY|Gz6ak1a8ma)yD_c-EPtjHn-JOl8l8HIw=Xyy(Uia_UZ>1)g
zwj}P+js*v=uC|IhP~i?JGu1Gwh8^$0Kj`PzKZ%oUo-_{s_|sF*j|F>Y_w>|87!9A>
z&SQx>s!}{5OTWEVm9;V=)-?BYNjFfJvR^Pv`3LV>r`;fW&8O@hr02&b3Eyo=6&%Rl
zwZ7LmJK$10=JCN|Z?rx<;-p@qQ^4;W3DrD!w6nPh7Z&M?>4sqXpCf@Ki}5e<w?1F&
z^wB_UTWKhhDi>YXFq>(EMo2;~=L3#3)9@BWuZk88L_)WHeSZUKS9YU#Q=tm%uZj&T
zI_*6@8PxEo0p=ZY=c_Oy_;Px~deyD2J7X>+m3}|Q^I4TH!g-+{OK{@)=x=Xzbh)(D
z`^v>7ys&-tLW6iO?$PxG9X1|;LDVN43@T~)%#HCp*yFc*u-hCcz3OGA*O(ogb;Hc0
zl;}Mzz<cs$3^=$qwDu3_B|NL!%KH57!@oSQe0`JTRh@i2AfE{}5l`_uBqbxex}Jo+
zdP>$MsvLnjUZWN|Z}0z0(tEAM*9>cI<)Da_#j9tS?)xXdd?K5Jq&_+Rd_0sCR9VvK
zM@!81T#Y@=unF6VF{eZVU2;v+!&<sS=;<@Wk584|jJnpBp29VP;S(2Wy{~yG6{@65
z9=mYY048SPGm;UM@|L91ve&I_ZZATd*qb*6Bib55?uw5xwnqeLA>Mm?rGAk?3?W}M
zhJS5ZxkIJsjwHWD)%Wfj<h}WZN$iMU`C@R!2**V6EJ<m{>%&^7e;+f{$_<588@(wh
zNx$%*!0ct12}&MEW``M7$W)d3cEQ3Vo0k?NsRY^2=#WUSM>EjerbqrCk>=f|yk3J8
z;jn)mXTaq)az?&e!_VPi59>%@?!zK5#=;tx2ai8jq&kTVmF?JiM%#+SL#ZxcC)M<P
z^9-84BD=j(^RCMTn|FmDP1S#GDv57*w0fCutijRS-u!$*d&qBKk>bCaM};fg%SwQ}
z^AR8EVAK|)wH?it$f;h}Fm>B){1<-BI=MHg9v5z`F7T%m+I9_X+h}d|cYE6p?duga
zd5{|5OA~S4w6eJk`wK99HNn%hvlZQ)8P*+#9!(woS)mcrxI?(0gCF~el%&%OJgvfi
zB$Dtd-t&tK=3Rb+X$vfhmTsrz(7`rQTITx%lZsFEp@GvC(_y~;PNoWfIQv08xHP;1
z)1ppVb<$4Jr~4*O+UKFY7o?}Fl7i^Bdr^~~q~A1O!F9dm%>EF;*2kBqsCM+8p$4Z3
zS2Rh(hQn+-zSLj2yP_*L``gF_)jJ`_C3m%;$($%gNS(kmVb);Csj6XhkR7|z(%%X6
zF?)89zfzUQ=I8#gUoU!VoZbFN{FMAh?Nq#3S>xxwwTEz9YX}Y6E@@>B3mxM>+?~fH
zx$RiY68|eB*wpkr@_XV#B!>!Y&2<zK*5dr^*)jDGN}C|5m%yHa(DHHB+5pP5`CdzR
zclQ~&VM7{>+(HGixI)}V@VPd&q`Uv#074vcvbqUKP3V-N*Fa@1oM_tc>L6AeSp_8g
z-zO2-GZ7ONc{34|bv(W@bVr;yeXl%mCSo0r!WZ2Cuofqc-8dqMPVywAjYZU2MRMGm
zWjoB;HEx>k4U4l~66Gp{lcyL~VttqG9giEU?R-Q4(6YgA{zt2edp3|^k0+|EmJr+#
zug19TUZK}wlh@ZLzNyeiDgUO)788;_y_>oUxkDYn0ZH<h#T)^M!&$fDrKmt%7&&HZ
zJ<7-O`q#_0x;;3hsz`7Zq(Ry~DH?Q?%zT;Kq8|8Z!BW;Cx2%nAf1mvkaUssnxdO{*
zDy6J)iqnZ@CbHdZ-)h&FNFn-o!Y-zRxSkD>*u+=AKzOqGiJ>v%p)A<F%DE+@bv&>1
z!=3qxvI&&uQ{4ICsn9zTnD(n*GW&4~I8sjnh{OC?Vf(w6CJt?%@>M4M=yLfasj{aw
zybBsYb)Md$!XRGu>eVTxHps>NAdhdaY<8{nP!}h@n)mxu_Ke=RHZgvKhN^{?7Dhcu
z{*2A*6WR~RrBi92LhqWR{3%`@iUR%PNnU|26Bi*eC3$p{)vDlXJg%1NcFrP0KrCg3
zwPn<qy{?uc28CatS=?iL;bRP*Us~|tuZVj&S?<8d`VhPyc*mZ{+n<K<r#HoaM9(ou
zRgYlL$nkH;I(c*pt;M6+5_Qsx3!MTEeaiWz1iuits+X?^Q>B-nhzx@ksmV$m1p2!?
zf<xfIMinw!;hG-MYrgqZl#TCTbw)rHZ7eRV^yEU6e29wbXs-)M>;5y%NRScGC<3Q`
zc-h}FGXh`Sog0e1ch)ZF%ytar0Sc11I`d89V(Q7*(l?2CE2<E+k*LL%Ud^|WEicpM
z4O^;*!2Fr}=e)92E1i~Jvy1;NP~2e~T{`VSj3bDjHS`T%d<;%c73`Z*dCik+p*PDS
z-2JCMSUt@L@~4}6gmp8IG>lU#_`td0W^q&Lsb#<!b$_SbP<Tbzc@6F($LWN?{q8Hu
zusIel+h-cz`Ve}$`AJQ*TJ1`CSj5}~yBwJ)LqgzPe}nXr(Yo?Gp4EysD=7F~!W=Zb
z_hwdXn9tpsI9zs|b{@%>7=a6wnZ_aim?CbkjW}UG9TRa&9BD3@n>7LLHM$4rLju62
z2FBJGd*}Iic4?Wh1?Q|UBLi)EpM(Lw`_eS`pOMcW3U&2AZw~FR0d<nn6{)h@zI@ZU
zU0N(}zUXpB@Z>IHw1WSv-{kE{|F<J~mgx1>_uPT!OGsYx2N^A`1on}MhIhoOqUF8y
zi*THUug#XI3dI8=uU;=@`tH%!PU~>aFc|e&RK}YhaX+-ivyE2*_axwdpqVg#kHOgQ
zXYJl)4fQ?pr-kll2_i%_3mVXL%c?g$3+!?u-$SJIp@uuO%2!;b4(~}gpGRk=!@Tg)
zgsm@$TGxABY=k|Kqjwq6!S?Yktr1zLkud*pWm;W=YXW~km0IRBySn{yuQX0Efnely
zN-8JzKk4V;UdF=mO3Ae^CmfJ2?87agk)YhL1KESrSYE4lKc!|qnTqVC9Wb;&Cr_;R
zNCAdDi%R>yI0*rteFiUELs>o=gsWcaQ>amWO%)4S03^MtL*)PlXfhK3Mt=@i%pbmV
z)iOVQQU0fQ<Lq(Oxi{CoTG!5Lms^QS+?!<uC7W&}wfop3cFX}ohu0@o?t+}0oDpID
zZrl2*r86wo?{yB{q^z+WU90bk-tC#_=ZRbOFc+o&c8>JCmzrYXL*7;M7kxN;K%bZp
z8C{#_h{}`PILlk92DR4+-g~cgr_3Ww;VUYb?p~9a402O%1kQEe+9jFB@cqo8bgw7N
z1!J7#`}kwNZwXlFK2bcw+q{{q$`s>^yIH5Xy(5+uME;#i!RV-3m){l)&L2iPpA){j
zIXg_-fA_{!hob=8^#l9)U-~rJCk);h;u56`1^e1z$v+BXdGk+8zO%1LAJ2E$sb)4c
z>4u+Qy=j;3D$HxOL6MGb+#J7E<{J(+?ayrosW%4+V^&I#rnpM1eP-`8qr-%{1J1*G
zyT`I#1!kC|S{4$E8#K~r?_6<7#8fw?Iu0jIN-S!uQgKtQ)M&2N&=5n$)#X%RFZqC4
z0%!A%sE=JyD0Sbm2Ite5nIbUMl9a$qod30xl3ap{yogmI5>9+m_x!E0_rAJHwhtqu
zirx=~t8z%bNm1D-Zv|7URUa)2nY)HB6O&f(zbnYc@tGuI?YxXJ)Q>6|mC;P=%2ltr
zk=DoB-}FR_@<fB^G8#`>#=Pu|Tf}Gx^mk;&T!E3WUf0e@a<OT;kq}!T#bS(t&Rvw@
z?GKmsl=lW9r)wd?8RrJmEXcWef2(mqi%St&;g?^bA5p2|dax=g^5QDFJoz=B0Rm-j
z&c4f3t;9h*%%GW;qoM*cocb_IuY>-M_X1fuxzF#(ZX8mJ_ciLpyqJA}6jXYo#m-~V
zRh#1;B+NG{Ah=)c!`+uQ<o7czX*q!h#@=>_nGvT{G*M~-8bw)XMV3-_#}Nnh!d?D4
z*S9B&eBX^q3wy$|hpu_|@=Y-E_v>mDClTvpZv>x_Yq)#>MB_K1Qo&L!=((`)+J_VS
z>Yx+5Kh?6q%4Is=JFPp7t~^f49_%Ek6&5>p$cUtVTF=@FKx)8xksxsV;i~eFr4#D+
zJ_j?JcE*ql?6J$$tAxCiWA*WjBWDlq#<ILavOr4x9=;0e4Bm3reQ`*LU!je_r?1j=
zMb<7%A*f);JwY*5RXkiPss2)kmptH8IjsA<@D>xMbpV8HAY*AZA8x*7MoIGyhXIby
zhW`NISi!)*$pH2AgVz{@Y_zd2fSzFhk2PSts@6+zUrZ&(#m0I9onVgh27>*=7r;@p
z;X?y(1K>ESa)<$t%)Zl;Cr;M6Cxt_IbEOT=0Je8&oY(0~KPX)mdwY9#LJwYwOPnGP
zyc~0k*}MF9;z6f2UZ@P9)7X+`v5vp>-P<dJUOgGg4bFyc@TtR022kC~7Sj4;0pXw$
z(RaTjl2d(bU@#7ILEn&#m>u%(t=j%_{vF5m*Dw67p?ymI%@uuLtX%B}f{!hAnU`Bc
zW#(HgPh<gb76JIQQqt2s01{OXG&p=_wCId(*Eo0mjv5@gsTQ<-$gVBB5a;Trx2B~~
z$|slOPn*T$3fhb@GM^ZNs)qK0{$$*>t<6=^)C*&5TxdbSJ?L{di9h211b3PL7$LzS
zlV_*>z{0Daze;WXN+8<04@P56qz$5Oum{|))g^iGf0e8eG(Qz)+TRrGW;XMMa63fG
z-o9$welN6;u*bL?{I|B_2EI6{v`ewEvckvh{%J#szDl8DeI&YgJgvRr4!pbQGeht(
zo3=jX*9Q5<YD9^5lH9emdt}^{pbK=HkGb<?a#X)RO6_A}a$*wbx|u;E{HI!A2f7<u
zUfVM}tzm2SBIHMR7fLwAyGod__sexebnSd;J`z1E)jch+qip8b!R<XA!S-N65gHp`
zG#Dh>k{#O+=5HVZId;~4YQl&z_nH?*joJFv!vxCE@ww)1hR05A&dg??pGuWSn)HlW
zXD}3$n4--=QmMw!J*OK&57<jpi&e_XX`9oX5)G=;=`LX~;ogwiKa8axB@~<=J!s^1
zX}B~C=<)1g-<eyX5Ba=k{d|jj9g`>Tex#V|>a`&kHf4S#@I!Ik1grh6D6r}5q;TTe
zQ$^vy;TOM;xqY?6b=bp~R-}dhpkg{dCK@6Rssezc#i~%`wTnSt&6Mu^7A!t(+klsV
zSCmG2KuuhBlEIG+W1|-v1LteU0~`KyYk(vhL!PnIS}=@=EiF;#@NmQG0dX?4rK%Nc
z+l(EkPF?-+3mOCeHwqnZcWLSE@;+m+G|}g=KP+r9&PsJj+uGh~^PB#jz}8I{OG}$=
zxE3~u?9FB{99wRCI$(Z=J%4hcyK@y*83?z0w4Ck6nKjjwNKUnus&XKuB~aeu$v8yw
zWzRp&s$K~TO|qrh3yW8x9K|FiQBJX5u+dLgoQjaXPN#|PhZZ~!L<g;|k=8VljWgKx
zgA|iS+qC=kys-mn@VDufP_Jc|VVsImaX~Ar8snnA)%_yOXtIJ+u~Kcx-q@<SX9P{F
zL$a-BgN$^^)sSKyX3)Qy(+#pm2rqZk0#2Fr@k^um)crdhp$_Y&DG?9kja`mM+>tMW
zwyf-mZs<}YIigYGCnfqeLr8dMh7i>f{wH893%Z3=;q_=<nHp)nA6YeD<UOpCl{T2C
z=B-AcB)nKs@T5&LT)Xq@-;qwQ{+w2;J?IU(gW1#E>XcU$f(ja2)lGT1XcdkYjCffJ
z4YlEX#^)e}VrY_O@p6ndGR_hUS;)2y;2fId&EO1R;yc0oXnT3#uL-{D(!>++Y)jdH
zZjrXB9Bh49H!s+<2*-M^u_5ZdNBHoihFw|Vi^p>+h380-6WSGq0o@i+6r(G*LF@w|
z=iQU>4NH?-lLT)@NPy=GT5EIyPO>p{H|xDk0BlJp)HIS#n5>+$1UnHGeNa4#DQDJF
zEN*M8hN_KZGAkEj0KbU~k5W!6x0mfQ&U^(ilx*j5qQZsouk9{|PH3W3N~i2MfipYI
z?aBl1J1H5=+xjQ8KMc?qK;KEuY_e^nk2V)6<hk0@C%e}njS9}!hY)te%sY~?qyFen
z1!?!tA%)V`H<t)DcXpS$M!l-}MUYjPgN(*j$h-<<x-ob~OfjXdH;w<&vG$)AG4<aZ
z6d`UQ2=bzP1^=AUv<`LX=;YX&)Id^m=}{~NbrntGZ9aQS#%6UyIE{Y?3c~L0<YpeI
z-B7w?(MauAnU$i3m<3Iy>?^z(fv9-foI943p4igfC2zSbglbFJDeI$C+h@nsuNS&l
z?An!(nbE<|2U-q}DC!@p)bgq%aduxC-J*6oyi98_8ciQbw!u_R{A#&odS-cGfCTp^
z?0u{0V&iia+)cx%li@UOwDg1q{Y#?DvOq!o9t*1Iq4#8KH<K+C%zc{ofS4r^A~f)_
zU#ZWoavti5vw)4BR12|!SfefY7rp=ae_3>`sK>qVf8<QOtwt0*(A7H8wqx=R*@i0m
z>bLYFSL1l@(qp1jcP`p8I?K>2os~BLslb<)n=R|g+>y9>aS6@rfe}5sql!<vuSX*4
zEVwG<?ER>nn8|%j4>806vAi%8x6?vwqCMqMw0v#PPM`Gu5P_(R?#mG7sE`c^Yj$PA
zLVHdXdW9nXi7DFiMG4BOVcgXp`dEbYo*77M2EZ^weS4=JdNOl5d^Mm;7JQUx8N9ah
zL^8f&MEde!7}qq97f^nITE4?}{qevsc`H)!@T=x`0IbW)V3noVt)6cQ+4~3R27uYW
z)=;YH`{T!tS+h%NfMHS@pt{udSTA0i96He1;1hLo@{s7-29~f3y=-OIy|-!{w*LW$
ztKG0QQTl~&l{bL)wPMP4`TK`<R_~S_i|My_0S9&WP^y;h%J2dJI;lr^#j4IczJg0M
zGD=*SW>8QKfIA!b=Pnt3(VP`;>aD^6fD4;OP@@F>`_Fg%`gO9o41sK+*x=T4dEOt|
zvaO##e?B7zoepEtAi;nh@h#$LT{ge{%UqyklMTQfTT8ttcHxjdpyl~2K!yST$~XQ@
zeGkB-NCCX|G?`=cFlWHwav+ey8rtns{klwaS$AGF06C~+dO4Q$#GF=}Fh~#}<I$XH
zR?RQ{K1H4iFv<>G`~qt|!oEvSiblE#&iB2_oLB_@8p<h2t-*r5AZK4-i+U2fe7q!X
zsM?;e8Yw8wtM1!{_YXOe3Ci%%K-%8FGEz`TL~Q=WKe4dfH>82?n#dBas0|=wjo-!Y
zhSL9?3hrv@91*PM&8@%h<{1V|_Rmxi?c)EyRw_fR6#lbCGqG;V23;SLrG5^rXa_wq
zD>-Cq>t8BU&G&_zOHb%`)K9qd2ZQ(5cpw2>ClM{6i)OAjJ$80_jp{AKtX3fUIvuAK
z1;)n#T7iG86FXz}XS-E|V@>0ng_+IA+j)j%^n+FkcFS)$xWr_8g4w;T>z|yZ12x0}
z-~%g%b)81ObS%@b?0288c}rOPG2*6UcHTOOQ7nO<iIaymkMgb`OqOac^C-g11SU~N
zFYeFA9}v3=u{q*tG8cIROD``s(<f4RVs2H<@S=RgdNS%f5rrMw`{P5s(e?FP)GjH@
zcStIlG5m$nE1hCv%F9I9>AHz=eJu$_#%7wo;$8b(rmQ*rME4;k@2YUZTLZ?reN?`f
zy2Pc8oXhbvLSqOceW3w1kL)Z2eI8EO{~K=YsEY(WYFzrZr*5V@FW%qdNAvy0ok<@{
zffrR&YqThIVj(p>F?<J<cLKtcD`F=GRUFsWn&%?6&NmpdJy|_bsa@TtY^eJ~>==U#
z7l$dkxOoaqYYc|2H+Z~DAJpk=Vf}1&s+>A;AtAHp!hME7O1*I>A1v#Vs)}OXRc)~0
zIlhXmO1NIfZ?W@J*2#?x)}yau10%zwY7m{qjF;-$E83TEIS#41i|DK&zx_4DM0AwU
zvVFkdrP_5i6d4~D-z=bu_v_pwARHV1HaQ`QTW|eld(&0@(KHqCQ86(-w)Ew!@~0Dh
zeXQUo9UUHq2$pX>%VhUvFibPpV=!-f(pBPMWxa_qHl}MDBWI=;wVPHOq5D1eILe3A
zsVyU*8x?7cs2|EM2Af(9v^N_y_!)LAJ@%&vC#~B2!wUEQ-Wg4g)vO;eaS4m!DrqHa
zDN1F%n3sn0``?dN^-fK6C68*h<w5%WXj_=AHL??*9xtE&`}8D$*O-Uj{P(t@H`9_g
z(*ye?l{s^MWG7eQ9Y`FS@HMu^;7Nd>`&YZwp5O-tGBG4DXroV|r94nii%oy~0csiz
z?ZYZ}Xz^>IV^+s3?oeX}XqmI5U!#Jg#qaNscyxn$))(Ru6@a1@zWi*!tnpBP*F<uO
z@Wr5<r)wIRz5D(cB;9IxY})r3zv^iB(cD}cu>;G-DD6C+%hlpyzb$?LR3mKn=)>5S
zeYzNCouJ%+b;StBi2Y7srS4MzIHhpkxh}Ekc|c+qc_!3j4WWdn$UZ6`Er!37;Mjd%
z1=bd*WI*1@QDvZTa?)4WXnDbe1k$ek?Yzve3a%{GsdVDV-z_@vcgdxLicXmLNp+K%
z@WqZ^g2LmAHhn+&pK08IRjX0<^4`Cyk1e>V5U^!p3%65EnT*lJLz$f%2et96ujlTM
zny6A+ej{fKP^uzJO~GHX67IF#?2U&!2Q;1?U}gC;BPNYhPoL`BKez**j7A4nh16f3
zhG4`P3_@-u{h(+Qndi#Zt@dyHYS=X40-J-YSH6P9a_I6GW1=-Urdmibs&+-aFwk&X
z#K7ZKSO|8EKauP%WwzOf-eUH2b6>+0?J3-UN6JTMi@&<kUnkhP-5oHBNhj-Qx566t
zH0LeaI6&!R!~QjkK57u~I+E76lR<$Hn{WtujWQOsC`-{l#!;Jjb3qA_)S}AGT(+R+
zXL>j;8l#!6mvG?5p5Ds-$FIgZNH(K%ov1A>!%6hQNkwB1wYu_+BT*+sXLPh~vp4x)
z43g?>^qAwU?4?{`O};oRIZS45JnGO$A8tm{$TaUWr%y|oIE0T}OFIgyM}YE_354D{
zL@rJ>XKyRpd)hkyU+hwA;1;%XP#&??w;`SI#b;8vaWvD1&0$@v`Jsneg>}H6oyiLY
zh<%z12SP@ud%8;XuqlQWh^9jrU1klWOTw;EW+Ut{c5<Zyt>52=!cUBSm~7)D9DeD0
zc<2@Ry13IDK<h*_^fy0mTG`KrBJ_|*1ZaX+h|7lS;$-jYvH)PwU*hoVg59#*43ZB&
z3b=bJ$Y+IY{*<5j3wYEks<#T~<_<f!?s!W`2ADclgW}8cF(G}x{0J|g2h6ckuVVx7
zvX)enW`H~3&=izOrs92YV$eiOeFW6SauzDerZBV^F?Xo3`UHzc*_LpGe!X(0z8@%f
z5m!Q7xtl5ehu(ymY?U8kucTE;XViBc42`9wK=B`^h(Hrb!^v|u$3`j^!tUE_CH~j~
zdJLRW!LToxKraLAk8I~Ixp0mSIIeB8)e(7&zK~Lrk0uvI%$vM_yN^}n)_aWh;K)~E
z1fBwlZ4GDL1=**snd$^IbZhn~x=0?UdsZ~ZsX*qngKH#Kzd%0bmgiOZ5M8H5z`6a8
z8XI{=rR0YOU};&3bU2Y0U7{qKcGWWHjwyG7%Io7Cugur-q>90E@7I8XA8Aj|)6+9l
z`s}v`PEBhmyuWI|%U}A=qT{>RPfqpV^7EQeF@qMK8&RtLkNcZIGCcwlMc3;z@x^(m
z**KYQ{-3%7pDa7B_&l;+Xvpv57h;d|GaoCH8USgTv@Ilx?w6N}F8x%$a6|Wu*xyk9
zf9~lkQzB;>#9)_?Jc|33*>l*?g`T*#;(4rGyc9@X7_BNhu=%cE6nGXudlpx3-L{<l
zioWI%%AuyWdUpJl+OKs>Kh&;)sKM+BlusM7Z=WG{cjRSUbgY8eB&-KZI$)1|7uU-?
zi`g$+!Oj%cY?k6G6DP=z!1JmDu-*q^x8^Klt3lu8)vv8LR?G?V7O<&0uF}aN@GJtQ
zM?fRd?DOLbyj_W3GMAFzvnhfj;|aMAsk=#&pDl`gdEw@t?&yZ|s`xl-$Xif|Lp25G
zt*`K}S|QiVmdWfIW&-61WPEI&xl&O7#@hQnRs;dpDZO=tkKDM$egDe41_)u>+^k%C
z-yz1j`}9$KeboY+ZHWG;L1M6ZiDuxl)S>rV$i$UZ-*V)FSc;hoG=ZExo#r*#qSDpN
zRt;;ha7>RS>u>}?*BIn-XV^mAU`W5c^Hx@@C)6$=!(4u>9QxvZbq&%d%0u)(XTI{P
zN`}fPZ^DsGW8QeS-j0a+^pMN1Vo~Dzv^LJnE^tC7;>F`N{(O~>Jhi{6h9h_%`!A00
z7RBD@O--dW)y3K}1b(xxrSwyL4_EC!{!LuS7)}p??;ETThsPDi9IY~w&3%i!hm!jQ
z@_YWaZE!((M%65{pKR8|63t9r?sN^VcbpU#TW|gvxEcp=q^|BxH1$|-I8w3OCvGe5
zphY4}o-e?sayjFs!dLQAvP1QTHe9$r)HU8>n;I$nDS?d_EHtLj4R_<K5H`DBMvFyq
zfSDlHK7=Om-|tuts9@Po%h8fV+o~tEiMAGT(b&)ai@$#+*&3q|`IE}02<l!*BN{m6
zf)5btvVBktM)6?r(--U|ls#FZ#L-fo-Ok@P5ezlye4l5@yNy%wE2Ot~vnNl^D+s%K
z<?U(CKBnUpq`z<mWKRWGwuD%j7i1Q)H&!zD!UZ3I^mVto$&hqs)G<)0IETsrbwB{E
z<Wq~W`0!xSVm*KHJlmw}*L#NKe1G4!mqgn7SlKv4XXeWIi)m8y<kzVsyS7`6i>IK+
zfpdYj3;jnu1Bfdh-{+Y{vBg7|nB{w)_#X?8YIGrAP~#n5MK>%!AQJV{bf4(#57)-;
zRM_&I$!jfeCJBxGs<;*@NWej9)G&x-{fa5_Mt&|dcd=^5t^)cwi$5SiPdoepJJeX*
zI!yG{y{)`O!zf2rqXIf@C(LCGhqZgWvOBU<X~M;(f9s(pcu&^}>@hy<jqR^a5XmfJ
zMWu+VqE>V=@w{AT?WU#STX8B_@e{~AobZ9k(mt3CvSMT2ALP5{I`vrdrwQ)Nug%{3
zD$F$htn;YG0cZtD@f^XA=KV`0Od6!#TVe(APj7eN`OYKR-Mf05$&NaHO5MjjfkOGH
zz-apGOl`Irw=2O_LQ6-&(#YE(7uViYZm4y~O?ZRxZwr*^u}AUvHc}(In-p%m+dqvQ
z5F!?QreB3<sHiCVU61&F2BAaCS<1MvXL}H=C)SxMQehZD4O5HskQ$zZw_rl+q=w}P
z2x0!-Kxy=n7Ge5o=Csa=ofr>!(FvV$*J*W9^!m&TREnj{RL@AV);`TfWL5d$=qfhz
z@q?a1QU_@M%gl%wI_qlgRwbQts#C#|$iVl2`NIP6<7#rhG~`?#nO7M*<BRuf!<d)g
zlCF;i4z8om*fjYU&hxFL83*71T;<2*@NOg&)gm|Q^I@d^Q^Ex>Che#QhF10?o}`iI
zVMnyi+_LtwCmvDIIwD+unz?%PFdqKbN2|~Swq56=n&ue-HeVqG_k9|B>E|X-Sua!5
zWcuzrGK^a+8AhQ4Qx=S8rQOwd`!s+CMQje%vmYC~H;iBc!L&iVviUahiVQH6f;alQ
z89N)_Hi>|bk<I|>Oc((=I-bqg7NJpbOs_-VHvxwCg8jJQVg(GfsW8o-gQQ6qcCG{c
zz|?Rl=Wp&X-78!>tDj)^c)NLliBO^G?%!hC9qNo&s#G7hwMuiYI_Rj#Q*ok|$SARP
zi_{;kB_}q?*^)JvrarI7$wipGDoOk!cKyu=pz7`;XLEDe;9*MBa1KjuP5JG5F(I>D
zCs##Rwi6}ddsUA*GR27(p`t*miG`KE9<=p<POJ^N;#g-7?KE)G)Q#7QoKQran+!a$
z{>)ZTN+YL5gDED(%X?#b_lE>#rQ6yxJB)YRexZjxIG_57r%7yEOSekw7{|H+P7Vm&
zL#Ngsmdi3LD^qscr(8>|$Vomu4TISSQ}74omb)%Edp`5<hhET4#yD*M-B-XMD_EXR
z7>jKf(}R>p;30H4S~`*Q@scHPZy8I?%@U{G(nuRy=GtQDqo&nDH}!32%go+uxgIv;
z@(5Ye{*Q~z)3`f>&-G0wZ?2j!F+gqTDBU(^oIvxZdJ!WnuU?=IFLVX&Q8tP>4oyWN
zxp|<up0J?z(yx=`t?mUN$_-H}uf*?ObqzqtLqg7<(ki`$m{c>}a!ZXb!nQK?6xmCb
zl^?6z5i4QT;&CVAM%mOoLIvDIK`s1ik0@{&%&Ip47bc7e)D%SV+Ml~6sMvjN^(u01
zCnwY^okm5j`gstVlQYLOy7&{0A5|Pm2(|=wT=Sclk)VCS*bkRNKqyZXZIZ^A=#Cl8
zYwj#3)`7f-XH~8Kl+H1p9Csf7b+q<D`zf*ftA4z%-KPfq5MBdfn3?Ghh_>bi>BnN{
z5kUu!r@b`f>)e<<lIt5&7jCpkCJ#`u73vbwrzbvgNH%WK12Jo8Ft=BBgsitO@l56u
zCPT-Dw#B_t4J!0k8mlNaJ0)1qC!KJPcUsRdibM^oX?=t^Pz~<!Dqf^9=~V*|VW<(x
z!ie5HhVM=SY4%Mlx43z*hS?~ysf*Sv0yW7*V^iT)X>2Ix+IuuU`U|J~bbBJ8ip8vj
zEFe46r!wXv+piYR7qyn*CjqsYd|9oww6<kR(FWv<dHRg@K8LqLZRisu*Bo@|O|-W6
z_GGc<M~B&#5lI`|vdXFTsq7O$iTkwAQ4ITh)(}Fibjb4>wYibn{$oc<Ou&xLqZp{2
z>-q0FFv){PPN8zELPZY;eX83+wu^k~)G{e4DCJ3`uDQU#H3BpK^0pl#JH1vK;T?<P
zyr-je9(c8V-oCxXxl8{{;1J87*5*CV`c%83d8O8h$eU<r@*<~Nuik?t3y(hA=`Zu&
zN+Wpk@|@BZ6MYJ{<=){iwEQW3aygNBRq?ryFAcdgW^n6Zsry&?!9{y&Hn0djtQXww
zrL)Y%gw-GaU%L+riv#DUv@{!}Yh97f(IH;7I-QqBrXsW&M;4&tpBsALm<Pd(O*GP7
z;x6$z>{t`FsS5Ppl@0_ZF%5b*Z|bQ6oq`nr+**iTFLwug(tuht47zmo3NXq75Tcw9
zyR`|x{Hp(WX!`Yqy}Hx+;pa~k5*ff0ojPES*qAXltYSpK0%mXWM#refk)=wc>FG0e
z)sk{h7`4V0xL|Q{mOgJ<HY_qx=GTizv05%?yqr3By5h@xm;Y*6V+TX4x^hYyiL<gC
zPGTFN$KfTh)5D+ST@7e_SSzJ5=W3*hY=`bQ{HFjYZxr9b0zDA>#O<ru+U62`Y5e26
zJOkdNXUHEPdqwqtB$U1(jG<k;yp<XozgUA;%L`NZbqrpW<Q%wBcXB)KT!bu<(!m4D
zftEw3tvXh<4FAPVzWkj~78$H-CgK0%+%&#FjM-4oS19#_J5#0ZI3_n1v;?I~{ffgz
z!uodi*sw1p>waRwU^O&*uL^kjfOg+%Ub`~%h{Yyyk%!mFV%U_V);m>fbYI^&ffg1I
z_DsUe7qeommV*KTY~x6%8s4-VtwU>%-V}R<-C1vf_1AttIKm_dS&>5o>yGHQGmB!+
zga&e>pq#fZBE7|6>LUaWec1gS!npanQlbW*STyaacc@hig*($WB|vLBQ{Ka>R~W@j
zYDBCfQNik;$*RqrPuDU+sP(g*UX7~WAb}DPTZurQ!Z82&se=(uVJTDdAY(QSsDXHv
zA@A9ZKfBJ9SGG>Nwy%W?kRwd`qmK2$jxVc26$+!_gvWsEJR|nE`T5{IjwfrsnGfU8
zZxlW*_5elh4ow98$n4d`D8WD9&n(*_RI-@P&Bj^My6dfIe|3Ek%$;e-7F6mHmKIF@
zaQt}(&*wp)Mu5+sdA!l81gGl{dbM0l6Oj(~jui}Hj;b%;cqu>xRfy}ujj3#8jYi_q
zp`DI()5<k;_h&+JpOeg3H|-j_?o{&x;<`eKPt1-1>Ra&hvA>0v)_h2z{}|gpzX@p@
zSvB^kpJ+O+OPovgeiZjZ236Gf?4By|z3JVa`mABO4v6~arAURRxmT%*#a|mxllt$n
zM4-k>?FnD*4bruvHbBLX+Zakz6$_hA1{ts-d5K)4fo_+sB7)yw!rT~7T-yZ6-L)=Q
zd%oQdV{R=0D@WEJEJ|b=W*&`Ve&3(0ZOiO}7b8z{@EZ6nJ<jC_g1w1K%q7i=paTPc
z#A*w#og>oW?=gvWuv1yW{k7Sw0(rShtWn~(e2sG1Y$`h*P)Aa4B2QeB1M!uvrm<;u
z{2%Q~4xGb4R|(#ua^vckC=UJ+*JSc!lfQ><a&<dPK!~;^1UnfU`&1fKS_aIsGk@th
z^abnrlhq_0n9_s?T<g!8nr5T)!5COQ&?qqpxaX|ArDFNPsCwDPoUecn9}n0`Tu}sA
z`VQc7vs-SB<rQB8esa6>_F2F#C&ka2TS-9IyA#}xuzY%QWxtwkV{H+qcStdJz2BMN
zB7q(|5&-AS#1Bn<2-Ng0V5A}nI&#}Q_;4IHku%~5cANg({5$5V*^Ro(2D&edL!0Ek
zdNA)Fz3pW}TO79d3^7+J5|dv`1qVGe|5=*YX?{}jM3C3O1IXv|YiCNeTL)w6-lE^h
z@U31gCH3Y`6Q?24^)5JTZ;vvrvMXX!p*u8lM_t8L(quWb_CarpHjlQdU5`z@tkk^e
zh}V?&U<$v*E%|~wCYB@T_Fbabv`XHQ#(h%EZvoH7$<E*074FS@cYU<fx!xYLO0t=x
zw}g|g+kMI_xGbp3*8G~Us?_SfqhK}PEp|jpRil-+srQPqN&g2G)JTJ}@hlq?MtxUi
zZws`aZR)~4q<(^xspS}!osPX+aNX4GL`j58_w;I=(8YFcNnVz+-Gi9ILRv8^n0I{L
zo2RN8z^N8>UNL0RO3hd+udy0}I<#{g(@_{jxp)rE_Z0BKI6=lff0^tfl&9>q|0#1H
zDZvVki+|&PcD(c@RoEN*ww^`FU={?D{(Py%qA#O@OC;*}y$2qzMQ~O&3&<%DZ;;P~
zdwNx)yvc*5kk3Gyi&zICefWy{_S9CQsy)+>_(L1sQ~n^T$~a#9%sbPn_@2PJp?cNx
zWtY>Ebab#~+C;C4`zdC!2BkM$E8td@0Ui@oSuG0CdST1ziAHD)L<DHJ+piVvew!8y
zSG4(mxO($&D8s+~zmn7lErznUhtP&1d#Gezvkl2^>@#*k5<(?Q_MI$a-)1l&RQ7c+
z#+r2)WEl+Rcg^Sd9mn&0zW(x$KkB&e>waJ7`#fJKRq&2wM-=ZWx5r_<Nr;zn`)b6V
z7b$D2cH1t+f#Uw*fa9g>f_k7GB;)k{8$A?Dh0&$*oev?9{wf|VaSC5CJ`__09*1q^
z7t{37zSXsVD4*9-%Mg=1;v!Gp3dZq$<s*0~d8kyVEvfqQ{Rp^uhvne;in|c)PFn1y
z5`3i%O<X=wXMJf<Ws&Z+oD<eTc%W{3SGT6~I`2!?jyj#vAbHNp_eak2hSZPjg;zbe
zZAiNgYD*jnYb7phLLux=ww5wW(?oy1Ht7?i3>JII<D~YzUR0Vxj$LiR8vdWrzch5Y
zHzQco!C;>;HM99Ow1zaIX?#vMW$=tIfbq;pl;ht0Ppl{>#YPdIXBL_`*0{I15Kox^
zak4Uy)w*E()({T9#MS<X-jt=her6ScPMNu{+IIv61=qj*)VTD*+<Zx7W*7-jQAiN4
z-qi>#H)kHmRo!gAcL5Uo>;+`axdC9-Kp@K`vU3f5du?O-N2r-p>k2o&CQ8uwBd7+P
zFdY$rg=raH8j-=&ZFjyXZ(|aGF$%nt3y?9;z}znRg`FJybTzbK9~Z9zM2}3k%sx&)
zRytQb7s2Fyrg&B7Qg%@0O{Vac0G(Yjxrc4fv0@{=J4(R+44X$(QqlrrrLOZAn`H@^
zN7tXecJco#!ck<WKa+0V_{u7+>-Q!>LDBrA@{XgW)O`;^SVJAfM_~TUAE9xpkU(c<
zR>}H!&UkL4ugQ}1PoGHnzlue>#OJttpJ`KdOg-OazWit$gV=^T6q=#@>@NEB!8?>6
z;Nm{!6g<kdMvDv!Jx0<e`Az%TWSHvKZxJB8w=a(C0n=5^cCmaD5}ud&TVw(H)g7m<
zYG=khkhp7Kck?>N0yWdEZoRPg*rsD=hN51?ny{hzE4hRsM`W8mE{KUKa}1D4iCvIf
z(r+DkytgxS&_6po!d+9|^ssMnOyIYK^}{M)QCbFr*^4$KU9R4ooXC|p!wc8b*S~n=
z6<0sMA_vvYsGEy?o`Ww)f2T?4w=4Q#lp$|1UdM#=)jt=A(nZWh{gj4CIP=OG79If0
ztJn=Sq7rvre4~-Ah`KRIdTb@u*~8i&KWoyUPb%Ok(7@dgEwKJgs<k=XKYCc)QCN-Y
zr`SX>+35s0b-Zx=i`iO>Y6LoS7n6N~@A%DH^4=ROTbIfxBdg8#M~#=yba6w{PqU>7
z{#EFCHF@V_kK6A&l0WJg#%#f>xLsGHF<?Q5ibm}^Zg~4R+1cs`6f-`=<tTb4ck~<T
z*lQK@vtD5Hoh;Be_A#|JXu);0typ?%t?-jsM1jV+pATU1j)mQGrCc68#0!3JgB$gT
zqt8{ucYW4#1xy)Y;^3zl)omA1!Fs=${MKKpep}g5C9h0v*v-$sjQrNi$8~I@>Hm4B
zv|Ri_W=qq>U)6n1FL0wRGE8JF>}U6h;{Z0ReXWUJl2LVW@O#W!5%ZvxcAlD$zVl=W
zOa>5~i&^eIV>J;0JJ1T%q#5nIh9+RiyRw)SEzG_Q7Er*!G`h1IOTFq3l6Q4eC%(~w
za3kliCv=a=wr;7cFTdd(i<RKf$v^07MpXN|Z8XTXvM7_`mV^f$+-K8Iyvy>gDHp!1
zN|$!eXATp)b2zi@!q3dy?_XF!-h$?k6D=r~22^BK37yv~iMaM{C(8!>SGF;%j9;;c
z!-s`?S}t7;ydtF*N77AE0q&U%4-kl0#w>xXX3Z2T>B^N8)cx1r*U~vfAYPu^p|N6c
zMO(RD;Fl`0w^~Xld^VbX0&%*_?mQ1)%`N+}^i=NtYc1>=^xu1}4h{}#VVGqb6lz*d
zAP#>k@8R7Hi6TR6D?47eyU>vQil6!XGjd8^a4H4;i1mu;KQYHm#i0z~ox9jjj^rNE
zjE6gudFfM&Mm6>yT%+HqENFTy(v`8C%o%;c9k^S@plqyz{0-l$>_@M!+mXvgxy2E_
z%uG+ihu#adwhOsS_qendE7+~Ht16;lLceOf><f;bl+5e|qjN^5c5=W!jN+fevK|&6
zq>A?~bF&%gdyDMyv(ZuQtxLclV`N0+zIAc#$%g&O|KO&Bd&tSr&uvN(mA;;QmFM9?
z^tTvxw}eg!j|MhYIAgtl@T2bMlZU7wgWEq9aXq^sx*{Kkee+$i_wMDVNDf2TM+u8y
z6pk8=cL5Dpi?x;*pXc$XPY_stRRk==RR`qtp9^Fmxc%Oo)N7ywfay;rHI{Rj37co+
zWXG)?f7{(YHHpZo2K@@0!2nZwU2o4(nu;_J^vNyu?$y2f6ciogfXVK>dNho~Qy0Nu
z0b$?s)LY`H!T6lQ_ee#wzAnTt-xL-uExTfIO;0h9D7%T!NMeg@NmVIK8jfTfPk8kO
zwqKu-9)T3v6Bpx~_<tt6*tj^WV#BI(@9h_o#^Den`^-nw!ji@U(I)y#vrwhT=70=+
zyun39Y=u=<!8&DUX`nq(jBx0$$%=`meOVY;G@RvJU0+Ln?oPOu)y=j<Ud7`=^H!?#
zJu^lC_tv2!uD>}rMKe7t=*pi{NjCl>oL7$@`+((*Ly;8?l4^8|gIyG*6Tfll{S@cJ
z)Kxi_5n<)}ea4i^wj1=n1paY|i-;8cxMnJyS~tvahn0S(K{4jkaE<Dw;bc=Oh#JCV
zGe~2Zs0Ii$0VDu=ZaJyHf;(Zz-FO{Chxlg#<D`V)%D)GKZ)8Ir3815HAuLSGQ0^(2
z@{=oHZw{AEbO)ID9nQmVm>en6H^Yq{7HrG059R15Sq<}NZH<5b^)loGqidn*2rMq>
z&elZJW=1o0qB!Q7fNNyD%jUn9W|0E<Ru6%KvpkZK9$g(A)QyL@uJ#W3`TlDD$ioqR
z>p4Q~ys!yIZfxP>-$X{PJ@enElF+^i#^`?$JL=@Oe28|vW1S==!dGbb#gf_F=0n64
z#lOpKJhmRx@O)xjv;RznePQk}fv`Yiz{xopS)+aQY%~L&(433Ba)~mMxngB)q7Qj(
zWE2=FRZ_**5(Xr#ufJm9E|K+c=Dr2}A@VCS;P&5<$6k#e#MwfOswvTYU5bw#8!nEM
zq(;wrh@>o{(pCebW^}72y21qJnfsIT?R`BS*v}~?P0gp)a*NkEGMcQ}!*hIISW0Az
zmPtDv@^E!{^A=Yq;5awZ$paEMZ?{O5*b4FZ@)QWNrpDBix%<VZj`xN>{rRHjxnWFO
zaQHOE@)qUO6U|>g96W^M=iAA~D1(|&1{M088={rnBx8Y-LWcXVT6XE_rAO}Yh&fD{
z*Igm5Sw#|Gd7s3|UA66eCw(y+J)5)6d2B<``S|}T5yyN=X+dH^heO~mh0pzot+r6M
zJ^nmX$OJujQ!Uw`P$G-G*w>Qy@C-HN22@Tx^~q>>_zdiJxggEqI=2u?ZB7nv1T0A>
zCeC5f)w?UBAovWY?DWH~v%FAO7hykpL47|JphC)uO*pYp1w-FoRai;arppDd!~Tws
zZWKLhkKz{M=dX{!12U0AYdG{gmf;wm*s?K?;iGfv7ulfipc45>E_k*`k5^n1Sh%Y}
z#+d#lqk|@wM56vvdgf(m)JzynZBx{_tsk?GwivvbJwW~0O7tandxC?VAM)mxo#}pO
z`s*$zan|V0wN1i?Va1jD)0N6rU#gfNqbyZTOfRveXUNx1@{IkCT1k=f3>*L#l2TF{
z`bdGX6YRQC;R)=aolFhoUka)y`SV?#&^g3!o8<_D;F-ON3}Dub74+Bp?5-<uIE>um
zY+<Cta1Lz}GVK3ULOEx=O^QZKMT?GUx%H7A@$&z=mOA~!9#UiI_>3<~{={<ZnHjKf
z`#W2ur|GF4I@oWoH7ycx;oPyT?a}i4t@+#oNwsUR2d$qVLK>cO8V@{DZq^a2?i(7t
zcdQ6^utvS?L?dJ6&$F@al5l-mF7QQf%r|@u@T^pC?!Ynaq3oTnD*AFUb@xnN3CXo%
zU6FF=>R>rOOiZ1<_}Jhh`rBco8yvH8==i6u<CX6<cC|ju$JLRN+wgx7Mh??s>vbBF
zM#Kd4Q}bgP<g}YiJJo;N${3h!8}hwGc*Yhz-zRs>krHlQz2p>&kzOb{BNOjky*i)T
znwfJfm3RDsT>b6AXBI-gdU!Frql$>z026knR@OqP>FTkW|4xhVm;vKfy2vM{oFKiB
z(>m5JN5CniK}5g(|A_?f?d1@v)*1+=IswH!P(Mr@1an~y^$7bV5$)fLeOble0v)I?
zyP91Z9WJlITCa)qpYgx44mt$NXooDuarsMl5aUA`>X!B!`mbPFT?(?{z}~gL-y=h<
z?>;4QOxC2-g~&`XUqYA8q<U(ZPbD@BRU_J?1AACK*qmbPH}4i6jdm3yBKm`*5auQg
z(k|p@(BXG%C$`)sv8pdtnT0QnH-@Zz;mLko>*--t!Y@_+<&NOrgC0X&8^MdtM?>EO
zNMowzAquNnoJM295_Zd%3I_sgTnZ#QC%oi6Fb+>KCQ(EwxwYZn=1s>d^x@^uGq)RA
zw9fl4jt_ODL@X~$7fhXmhKC^CQQ@fKFU>)WIwPqcrh+ozlHm%H^7D*-Fa(8Qvc&cM
z+1-2)$sEr2?}C;JI9Pab^%U=@6Iz46a1NF9nZ1AdD!Jw{3Vi$j38<abI`4H|@gG#P
z#tr)TJ<<jho?Llz_)2l5vyPj|)f36UsA^_T$}PPcQ#2nrE>&waEDO2BfBJGqB*)4s
z3in6l7pq~q1zYyv86k;C@f60C7#mw^n~1@J!lNLal|vu^jZ}pq3x=ms#;m-W*a9Nk
zBP5POC(;mb{hYh?)rQk;UQZNM2Zy9qYU_NSUvC$}M-qfD=g==0Vy|DVwd>g7g}eA`
zj_f}p#`kV(o1{k_WdtfjF0a8=IokAu3wtGsm-J%KSVZV@lFtqcRcuX8(D*5CdhJwW
zN5q2bbGgq#XU_CIw;#Tn>*ZXPw8{R{r5@bZTU-@T!8b_~HkvJ)p+SuDX|FiZ_Xga>
zjlsSs^1nC+J7zS;d~$NKs|iJBfAJdNv_#a(RtxBu9SrHiMsrm+s5!+28cplKUZ5q+
zWd^vxVvggF@U{2u5!&Rz-*z$F0CEmMT)b4Ayr%SVol0-_0Q!fzYhi0{*$bf9f@dFo
zU}zu%W8WQdaa`!NH*ek;WGPi)49c%U{CYPSa}GxZn^Cb4)60*X&FZ{nfUlwoJnXSP
zYfoSN-8=Pm%nB`k`~s`tIh`G!?1#nJ0r`iAC;XLMTS{g00}cG2xtP~?nKb-%WmK7j
zrT7?$5xh3MRqZvLL^>QMezCtg)n)wZ((sikRDWZYK!sC<o?~S!aYnzB%`S}7C?iCn
zi&K1Eu?zF>4_R=v5Xh+-z%D=^AX5?Thgfy?S+ATx{`+x<m^?Aa9=pPyh@Oq>D>64Y
z-_;*<)reE;%|)kWPi{l7gvTs7aux(be(Kz2lVE;5*WQpsmY2*c5cIej#P~Gj6YhQI
zZ-E!%DG_P^#NZVOKwaqKER=1qg7oSf%lAnP7dihJmYh`cTMXAfTir%b)<Zuw_u-nS
zLrmyjaeNWee-F*)5hLWv8<uXtDG@EU*~BjD=EquVuN!zlZj8-uB^=$9CvHDA9G62B
z3xVAEU~$jmRbrAt1UzeFX~o#bdYOY4c|LnRNQQTkP;w>pNljYH<I2eGPCLCN?>8Q0
zV<wUuvyfrAzm=!@B=U2klTb~A+3$fq!Z9eJ(BvGJey%L%3h`R84AJm*NRa41`QdiM
z;MOrInB2w07}k7U-R*<AB3`zc+#l(qg)dt4W}f#<s%)w(EZ@AB++plN)jdbZCHNkJ
z1Ck)69g89$iVWWsT|D-a;s4-IjvZT>j(Rk6+8+2&r*!W@I~xJ8YYs9$3(m%&orBFD
z%BPdRySs&P=JhuLM8Lmsx5l(#9p*?QtvUd~;*7|_AwcB=eu3>Ax(%R*#sK%@ny}d^
zyBA<G{bM3i4ya<VP97)pO&Y^K2^dYO)D~vRPS7%-H7z!1HMRpzP;fo_L*KRX2atn`
z!0in1jJ8rmum|Nb3`26{&!Iftzj*w2&5g=lD^67$E2U_~clVO2!)PZfo=wXkq5sW7
z>-6%<_p1{c0-d9^H(XjzdsF3WA~O=j@|~E7L)|bV$LT0o%>5=7f8Gn89}6OOifw;2
zem`w(kjF|{%}7~^vp}~UTIhg%-R}A9vb@X`6HWF78LT93BBeUlxX(LpD;GH@$Gw7$
zXD+X+i7aoXu+-QFaM|)2S4B&?S~+2+e+eUJ-oAuoH)1sN3=ki|CnvjCjl7ZDon<)*
zTc}t;UYGxz^k7EU*HrA0?5sZkW9$$WTm`slbPpd@T6>R>2Ws`F&EeS=10`@bTKbei
zFi%+t9Pl0`>YuHCF3w{{BuRGC^3X42tj3@8t8sjSdbTI(R&Fcf%OiV(Y`)*E5et=a
zKyEh8KT6Su74f?I75r#$N_vBtpZeL!(7pwSvN5OE$xff?>-V|+bK$F8F+obQog`V6
z*Wf+MM>%4-c85BlAXqQf;on(@_?l9oj{hO4q$H<o*~0WtPwZCd2VLU40bP|V!F#o@
zEMjG;Bt9gB{R6rU_UH*d73=&~)njw`J%y#Bj+Ef*xh=i(x6W_1EepM?5o{pw1!sju
zx~nU?AGj3Kw~n<cl5^bRhTBYxZj9<OAc~y3zb}V2H_1mFh+4<`Azxl!EeTRoa|fG%
z0a~Q1VP^R7VgMF9H*s;)xMs13VYG*3<(y}GL7y*s2{CWiIPOR?zS}Zy>pIyXCc({X
zY--)@yLIU)P3eGkH|j;jo|{tllSa=RK3LT!nfmwqmRgxpIW<;;TXV7}NoP0T)7r84
z&7HNXpXGL9?KGd}1*-PR|1-^M6apn2$G#IM^!^Y)6CD6gt=d-mHTn}23LOR1b8|qD
z-YThL0?(;U9cfDR`4vbgm+OZro4%`nHw8E}71pU<xo_|nX-LBzfWI9<BZw!`_~QV!
z@S1W|k#75$k#96$lYtEuR8Gh+{7gc9+n8;qcol+uob+D>yoRm-*uL7w!N(I4n5`{U
zzuj*I-3*qJ$gfA`KnmLSJ1zIHi5_AKf}&+@ku3q|1Ay!({r1LZw}ji3Qy?0er<(kz
zuPut3*uwa*=5R}UNHYGoEIg;XI_wVVi>i^w$nd9`qFg5Ogl*t++97|Ua(S$=*NonF
z>=)ePaO~BuLgCJgCKh6NHDxA;5Qv@&O$`9MU9L%AcicPQWQ>zh2Q&XMorM>XJ%3)B
zG&Z69ZPCE*`5N{F`(W${1Ty#JH)sJvd^FLDig73{-X~rWo6DtJ>Ar}@H$LVczMlQ8
z3iV>3j*(wlOMLXHhm3C1#4z`?1?)J4sqji|dS>rC18^-lE66%ft9j2w(L#)emj+MZ
z?oT|~XtX!=ZcH{MNrY>nyY0X(LG_^JXlJICZnfmr&U(lvuw$$QOVgHc!ZHM*WE%hD
zZZtvH<<`-d&-gz=b+H@%5{ppM!_u$0Ih%p<C*4`TFB(R*w=05BI!)x66uNZs+@5bb
zTzBMcI1!6Ae<#vbPsvV2b}e#AHW9E4mG(T<G8?&~3cF|*47U4%Z3Kp_V@VJN1O?1q
z*C<F6y1`q~LV-PTc|j}Pq;cBPxF@uR8{ZYmai`IuvI~Rw%Hn#NAl3Dy<D~eYsA2oO
z(`(a@dZVaA(VRLX$viQk!@9Ka9%XmiSJS>1qoX^RZPtS6f)det0%O95Wxa{B*@3Ti
zx<%gauV+(D#D0;a>hccvr?{wla;rwWRVs)9LwEh2t9`vLgNYBHEx2OU_@Swxp1zBt
z`CxS!Ao8#2jN=o<Ea%Or+SLFMILa0!Cdu%=jv=^B7RIwwV^jJE{6Soe_g~hh`%;t>
z`BML-RUAVuf6vn!X`<%DoBpG(w3Iy3kA=hy1sbgtpF2i>G8uR&8*gK)HJ|<H%}^+Q
z9@8&>l2!&nOBhx=jF$hfo>5*q9I=SrYo61PP>VNq4HNk#?1OqcRsb};;Y!;j5mE>3
z76%@47a=n$h#}BuHao5VTxY^=?c3krp;c627E*my0ELbmLe2<0v61`fBy_LD1S1CC
zKR~P6YNFp>R@6V4v)4dF#m#>NJgq-#`f_q|Qx7(v9ERy$rdHj_wzQJCF2KaWo_b68
zEa5{n$hG&a-!psrX=WyuiD=Yv8pH26R^C$WsP6l=6J!Ug`}|7MKUzgLL#FL6LJ{xS
ztcW9Vs|V2|`DVt75}y;W$e6=_G6O5S%C|<Sz;~|a^nr9)C*?aWI~<8c)~*eDo8boS
z_-jjq(WJsG1#d@l&$qHJr)3GkGewR};|cnK4)F9$8R!lFqohOM&<(lOBwQk#Zs#QA
z#fQI%+Lr?5HKc*5d#98B5N@FMBGS0f--n>wi>$dhmO3S>nPDWtrg!h{n^#R%n7!i1
z$e#+6BMNE4l{fa1=mIW$Q@gC{_o<^Dw_?8r6CGr4fB)X_xDRA9M<&oMdiZM|lOr5_
z-PAX{8;q9K=yo+k_cwl!oE^3wyt~NoX3R&Qxe8Zu$$^3V%%bxc;^cpg6hGLj0Du_a
zr2y#9I-H*Fl+II(mzz6wtL{NvU0vg`U4SwY<hRl_hXeYgpYq1oA_&@40rp`mzR~PF
z3LOvTSl{qxTdAOTuS8@;h>}VJX@Y@7upo*kt4ai{xw<+_P&WY3fF+|q%{q}5mI671
zfeJXEqrC-{@WW6RUdIL>ay1|o?csDYh(`2Bzy;wyf!-cAS_REzRbZ2O>PX4A0ko=!
z0sbhy{6@X@)Z629cR(i>pxHrk0P<2>;H*pUW6$Xj_8C_m`K}a6T<DXR33oHzq_THq
zFmStnVle|=Xw=b!Pbf5)ofTfug}=r)WUC=_V1H3DWrtJz_MzyUs!<Jo*zPtuDx~@5
z&e!x4t3+^rcj#Ohx7+_!5sO*$H~tLB6L@-Rs>31mppJWIss`CYtXPR%(;owt&%H99
zuxmcnBSabA8BFziq(pHC#~>bK7;Z51P1l@9PH~7eAziH<V*Tu7B;}hRqu`~qGy4fK
z)+&rMo0~BOi=T%&c_a&?rF@l~h(qYgr1Cp|1k2T}=f-5DVGaS_K2avSoo^(!0-b1>
zP1M%xLEbHVZC$Imi>PYKlqm9C%0cF8^@QJ`p1^C7m%YBFgf0d*J*T4GG1Xtnsn`i*
zj!NNm40X_S=jUTTxGZwFN9|$!qEza^>oBaIh!<Gu@0-2BE!U~5mPcE?XSk|V=r20%
zqc!fQ+{CnT*K70?W;tg`Y(2_FY}pC+AA75aFJ}Da9f9=>!_Oln+A2Or&BsAZjR0=Q
z1=N?{(Y9)x(asI;v_N=pll*l|spmGMTg0DE!7$2hr(dT@1^+r>wot+DBIa<HL<1N&
zOeU|VIiWzDRoac1mxnc6UO)?)CM>7YT}>i(d;Vkav2gX=bt@8s<3E=oLV%Hw0m@B&
z>gzjC;&#(hBv%kY%GHR}wtFf;UlG~Sh6JIr)z%1xQNU<BC2jQbiiZUu!E2sq>EC%U
zBQtQ7=RqEI(}(JNhOg|uPss@|+d6>0l$x8Wi6_CeZJJ*F$;P_|kigb6Fu1hq;6Ov}
zc@Pls;NzZ?ouI4O1xABP&`d`~i}l~5)kOTyE>KIL_YgEw*v+;_i|E^MF>$jXKI)gP
zfz0)ZG@%>|cK{$atgxD<XOM;CumJ(~z>i)x1!|8E`r9HotwHD1Y2TaPi7_-lIP5J<
zLt{z?S7om+xs)9<qs3M7gAKY9Y8tbjN<-BU0Md2`*a_Q(e#jm_3!M6yEQ$tT!8ldX
zdWxCL2IS=<_x5o(!Mo|1Q^C>F`@eX6R_@8fua0O|&79*F33+CdnkIoLn9So#p@Q0<
zf&aMg)zp}M*^VJ)1R7tshYo+uCHcH_|DtccG0Y8RpC}nE9fH(+?QXx^#bKzG_0us;
zf={55?;)Rg)@0k*Wn&GEN<w&b>;#?BL)&v~XpQ({p|ikAcoqxLu244T>oc?e7V^eC
zRE8NEecV|+*QY;<(!%^JU)!-2avr|sLIH;vIaHDYrz?&f+4n#jfM^!><ZnPxUxzYX
z{4h(4!pMye4jv|Ld3@y(bIao)tZHEBDE+Gx#<X9!IHr4CA90dBKg**&_cYY_`>}h^
zaAX3naK7`$n=`Xt07eYQ7@nqT_agq|bqWB*to}R>GFk1DckYy?9Zp{NkczD6BeTP@
zYU)MXQ}<oJi#Vh5*Nay|!y9X!UW%jpndvG0K|TEwq?S=W{4;cGYjLC%YKjTl)i@U&
z#DL7TFx18zm3AX{q~Xn|A>Q!@ZMWY)WTM^H9!v-$sU`N?X|r)7$`7t$^sG?=m0kGE
zB!g|T0#*sHBh!>p%vpzUi+NOnac4PnP(vNAX3-;uvHqnQ9)7mP{^ZX&2m5rKQ&CHg
z!JCSoOtBXUsA-P-8_$y1XSi1mphV~vNh78E(`EV6kl5dN9W-i)<7LPwv`Zvxx3_A8
zRJr>;=>`648*+P*3v=*x$DHuby68@2p=mOyq(d`+(`f<oSlf+Y;h1`Kx4F)7>>ra0
zBNi+bkBe`VHWkk*C>(Pah9#F~HqWMhVCnJ$Sq1K05+XXt!r#SA8MB-oWp1HF?1fQ1
z-m}z6_C{VVwimVH*>lkRX`ysQJPh)ZP9yyP>MOGHG^v@rzVK2-wO_s)QWw(Yp-k&a
z`H!VVIRKj0xYe(M-0Tv^0}Q8yQH>JLOEKg(jR-~Xr>u$v936a_G4Lx9MAbIa!jr_Y
zBJi~P8woBOHhOQ{VZe9EZ}Ba<LfPm*(rMxeW;ROFSN5r5N{?=-@6M>T(SLwbvV^``
z7Yj})Z}*T{eYXwp23UZLLS>qN_yN0u=&kQlM`$9df|gwogA0&O0VFWMmUq%<Rz9n`
z+b~obXttWH?mcn9M_;y>h^yZPEaFzKAL*~D_bl2*Kv#?pWs-WNFI>qdB}Gt^-unw#
zNVVbeSt*lblGy{{mX&I}V+AOnns9Y<qf3iS-Z7u~8FnP)Uh=DlW$nico8xb#!X#ot
zk6!y-T|87^j9?UlPuiL%o}e3qKlxf+X5R4g5aOa#p)_3dGO!A=DDL<@rS*7HwPOt&
zuM(}P*osHQLhe_;TQQ2bxn1lvyN~dmbY-j={i#S?fx(2!WWYs|w%*)EZ$FS+O`F8~
z3=Hq8Wyq;=4pyirSJu#Bh8h;~GmB;77|+_wpa@D=GHz_dB@Xs}A?%)xt#L^bsV`6o
zk2YDV#U<cICb>~d&mOwW9?hIzU8y}PegVlq@C1;t-;j%Rle;ILHALxl<TCw<yqI47
zFJ$+M+xOvHkhc(~Gx_`ww1jn<7%&D8-@s>mqKBFZ6iv}kSHwI6+X?M-y@z5>_-UD-
zMA3ry^<FNxMR<~aK?^!_Rm^tD+lQ27iKOKdD{nQ{G}c5`Wl@ic8y>nS8npX`yi2)%
zw?hrdD~sqGQzs_yN!2VhCM_;>JnbLbes}Z@*>?oMR%H{#LTePyz{uJKK_8n=d7~=n
zoq#MAN8_FnbNi&?BjdR4JWNYnkuVb>;W6My0q?49Z%FeltJ>WIlE~qR<}Z^XcPH)J
zTyK8@T=)O}e9{1zv)M>--zyeyipJ*~P4v@=4{cv#_qv>XT?)e^I}B@`GY$dFw2YQI
zZk+N2z*I@0e*N=nfKYlki3No;tAKgB(^@RI&x12|i?p;HN`W0)?aK-^0oZ(C0}}`B
ze!h8zArgxt<ACwL1E%YEL0RTl5bC0K^B%1;&?u4)|Nj04oYlRVK$@n*D+3jwLkt1P
zF&spih4dem$R6urg7A5QQY1m4BUqzvod}6aSo2>9mX@buq2b9}6lb7@d|<Y(pfN2&
zLm%1=-d-Pdh6wgmAAqLmO2C)xfZ+s=CUwsR&&$)tf&L(B8SHRbe+Q^e6pi@u<7Yr`
zOf@aYE#W~jp7Yc4eA{drC3EBn8dA>qRs+~-28|%?ujUPan=1e_NlwFGh7-T?Yp(zv
zcc=^r0t5Sht2#fv%40uLbHP?GE^ewh40XAyxv@Rb<lTvUXTMiX^QAIm{Ky>_Z2shx
z;xLgvr~7xH!~KB7d_F1MS{@@=XygTet&`^Z3)pm<Bsi0;Wtyp6=~I)uyTS1QFfhxL
zVpdcCxION@yE^GBP&FIfyKOjjUlK}f@yteLjw%K=vQhYWy)Hr1m^KAWT%?fH8^_;-
z+AbI;LiMvGl7kE`-vVk{Z<|u5rg&_{&_0PbMDHAZ3yEsavS1$_fC)u*?5%tn9x<%B
zP2IejE~a(9aXz?rJ?QIArh;M(e|;r)N83<x_d5O8O!y&oLuHjWO$3QI-nJK&%qg?P
zcu8?cFJ`>Fqz8N=aj`#q)G32Ehx>}T?Zbxy*It@fSW}4%nB`VmfCg{-k;du~CR4Bf
ze%l`ZWc@N<StYVBImgH2)38WY*<Bf};IW$0S&DUBQA=fXi7&SQXs0hofS#Y;@}_us
zGDorkGB?xh`&8ajYLS^oFBV>&0)S@>>mTI#CKBq$NZtXB#fTn1-Pq~WP2yO^6%BTP
z{QEyY&H2B!W+FtYv!W#aeEIU_L>g0#!{~kRID(mIj0W(<EEg26fDY(?Debyj1y_e?
zU{M;V7}m+lVZcXoF`Iyi9?I4;j07_Jw&DPd{`;Ou@JO)&l-`bkcY;LT`1qiE-JC%}
zY+vJiWmI(d=WP#Awxw%s7Wkha1~}nyzh_T=MRY%27y)CQz{+mPi9K)w?e5`B40srQ
zu$e~P3OS@<y;<n`o@6~%4shC-X*H++2Y~vOu!9-);S7b)+7PyrG+4Oo1vnmc;%Oxd
zEgy+Rf!cB{EH7x+TT?;#`PopQJn2M3w<ch~bO0|T>h53J40?!AU*oC+DlBfE9HS=j
zyGQQw<;#IR?~On=8;ugpOWy33><M_+Z7xII>p2|Hjt0f;t)Lx`?mr~^!WP6*e=Bb=
zXwm>EsbfALO^ajvHgto%!}g#ihhG{dWcW4yR>RxX#q4!6<{ZbplqW6=Lg3r)`+tbR
zzNY;M3hTbC+8lKLfLtQa-nD$!qpPhH)h1Puc%$-Ji9{Ey;`gw_Z9<JS{EOecS<*9H
zFi3B%Nb79zK1??$M?5R`qgRdnR)y}33tdsp+qxO|ExFcS-z@^76FgruVbj6boHj=c
z53v^?{qxC78Ru@oMOSud1XYLVxpVlc+g_%qd;x1hQg~BP@EmNTigh2@6JC=Oc+0E}
z5^F}|LQamk!(-p14A?iCX_77cPBw`96-ylsm6z5D>O~UQR&hR~{C!<M5YGhSFjK~H
zS#Is5{i)=qOR1xs-gS@Bxp3;nEgG=&KeA0ACiEo2Z8pc67#<+ad_8EmG{QCFL`gW#
zT524jrN6|%G2W;+6+2p6=OvwPY0EX75IJrfA2U42oi+CAU8CKhUJ|x?%edNUbc9-e
z3<Jyy-&Y4RwkBKJ0E%B(+USkSKb2_9B937^K001)sgo$1`QMNGA5E7+h`k7A<-Ywu
zZsckM85PhfD|ZT9fXVa}fuED;su|b^{pn?}G=kqs^?V)D+JR666|-w!`~f>+Z)V1X
zn>XY_C#b~Z<@C$%*zb-4`~^SVTEFHqw+5GHPrmD~cLjx=V`c3;_CkhVkDBdX0iu-u
zf7(<1%&`(w^~8t2dmdOSNOOogIw*6wyj$BXvA?HTxf;riOgN-fG4t=2+~LbePyYc>
z_9m{YL<<_4+p+@{ac--DS!zoIv(d&`3?P_*VCQ0P_k`Q^*OeVmdejE$(dMJ4QMW%`
zac4HFvePxNd8)XT`kyH6lS_Ba-iq32Y!dDqPnTe_!96ioOldF_uh6>^(i#(os!{Yx
zg11M{DL4mN73nz3E$zDjJ$+d04|9Fr;$(GQm96Ri5dhl4p#Ki-vjAlG9rOdpkBoby
zO>%d_F#JVkUS^m#_GxIJQ|up_8Ku+Wd57=S8CenTRHjyV$8g5yD4L+FFO0?-ZmMA7
za@N*@838f}{YKODb1{VfXcaFu>e}x?oeCPvKIQ-MB!;7-GnTUj!dI9XEg1zCv_(e~
z8%z;&7i^z5SsAfu@fF_V;vi{W)JkN774io<_TR^K)j_nvLwR0x9c&w7O}B8%PimMl
z@ENE<lM932Br3eF5tq6{qm<$4>p^SmB{getU*A6v*vi!wI*tC3sxW=Su>GX%!8Y7T
zoC>m*=erPwX(yLPb(@eI=^9X}8qp8ts6u8Mw=twHNA9)++hN5S;gQ(CO05<*AD-5{
z!mb_fbh^GEk(t!6z4>WO!s;#I%zp_uW_df40Ra@+Jrj^hlwu)^x|IbpGk}kRQ;OoU
zjpP_QB>9frf>HtbJcXwJwdEvv0wTSyxEtag?-NhwadZ(~RY>?h&>X@#8G?mj{dEOw
za5(BlbU-DeaP5!&{{9nbszqB{?%4mFlZP|x*iy9=i9Nq?hK3$s<oM6<3h1gMpe0&>
zNjX0p7)r+0{K=BM&HdnmU%L`Yx(HFI1toc_l>=%OKs`Tobn@8F9ia7YDY}F?zezhg
zS#{s0zkIv;es*cy)dBt6kJ2mO>eCx!p>u9#fARsTl4|vKR(qb?Kef--g=6(}$|FVL
zfZJrQ7`aNg$MK0Uu60r4S>DyKHegWj9@5#BbQ@9<S9;MCu<-HvWXP+O0T2BOJ?Q($
zIyS&18+ac^m{c_is4T{-&^=A8UBi|75Bci`RO6%P=yMi?F_spR0OnQYHv3>=AG6U2
zQ&X|Od}$MnM3~%R=1(qEVcjpi^LONXg<Xwa*9B?j*P4IZy5m-5PMJcZxe@206an~b
zxZY){zRG+P2|HHjLX7%hU10SlK2Gd*w*CDX`^{?JL*-BNOG+gFz=Bt`)whdI*P6Vz
zNK75-1fy-;9$yZiNWDI67HY-WO~>sT7gFZ4NA8l(GjbQwUopQ05xz8yIxL#sfQd(~
zB-$|`N>bAnp1z=z^yZ~s7gy7H7Lk}inYHprJ8SoMzLns`Bq-3IN*ul?=WRudjpbr{
zp`(8t17~Iu8u<&j1jJ#?_VXvVPnzinB`L`BA9L6#=y&^G8aGj#H1yl;l}Vx~%6jQ}
z4)vy9WwB>xkzjaFLf?i=w)HCagCC@Kd6)k8gD*S&WUE(U=Z|2?;J0Ynl$R*(#51!0
zix$z}0i`PM8gKxhX#}TFTyCQR6*<H&!0!#9uLEsQ)VBYpNB0qa@@PI{8I%_By2$x~
zWz6A5|48j(W`ux{@C0CGu7JwX)A$ll-ZBn$m=||BtD;XZ>ZBL?)dOj8^#>hGWv=SA
zwVyeqK{QC7hra&3$|G2NJ=&c#J_?qS)1?-uXt2izy)-GT`I^Wi>UyY*0gc(?w8Eov
zojRzk9*b9pR_QZ9=k1N(`v>^BuT4m;i@(mw^n%vd!<0T=I=>;B)w~NTNhv?hh49))
z3JBKX#<h{%(#!c-nP{~RyYbpGZued}B&a38!;b#3^QNZn3G(yrU)43SrwOA#&-6nc
zZsXd8p7Lpdac0B(j07*OjRqV4bn_6grp?!dz?oPBg(jaxA)n-T?CqEm_laoIz#n#O
zdki{*W%bhqJ%fX#qVdw1^6-58k+s`D-}5hf&o|sJ^07LQ^hgCGnui$6zURDQQmIV}
zG=%l_u#!Ock@=E$2fk8h{c^>{Q*R8hD~oCDf^N&{!#lrAcB%rBhj8o>w<La;&Hs_7
zSeXaT!S76n)89&NaN@*^Ta$&PO<|P;_F(;6&_Pz#*r>G1?Dx9D?wyDQhw=I+MweV8
z3x8C=l6F1pq|oZ`*Q7bN_Qs!3?ED)=?iNPSCIy&CXHAvk(Zxv0z$xp|<0f{n(&1$$
zqvm-Y`rMN(u*{s9AH5~IHmVc3GZq@UEs|B0Ku9%EdT@g6q9tOQ4RnvEiV)U}em-K;
zu#+R*1Z<igdUalg%b2~Xk;dYcyESYD{QRm!qZhyGhK!-fB?T|s_U<`SUo&y^N-4Li
zkgNEL^-onttR?2dUsy=~Bn)_44WZQjan`J?%U#IluJj)o2Zs5zrzazZZmMjG<MkQ;
zsmKp)711#4R0l2GqOYwg*VnaS$)>v6g8ka<b+Dfl!gt-M8glhuu1Xz#3{B~v!{m&8
zcT^1zU)tjrdQ<$W)Yiw~G)#BPnap`upXt}JOsNq!Q&;*g^WBFJ@(emUCCm$uiyG6V
z;Rs!4NpPv+eBxP}0;<LvKft)_w>@;$efyu^0*x;3!B9auw1+_MYHW}|JG>=zABXk5
zw<(G<wxB5{GB*X7rB_N@e6Q?-vwk5M!ir31p_f0)^{AIaG(3QOKV1wYn$yxmSi95D
zy`@dtFcGxgsk4{N+PU052KbFy#*a3TCy2qS{u>dn-R9kAbUGJ`!5YS2Qn!{0R1Cb+
zLUGN+@`5rP1L8}E_Njxu`8_7yOF92(-v9tEYY<F~rY4^-1pO=DP%e<mi$jI+hbz`H
z6*MfD(}0uzCMWNci%)m~9V?C7W8CGaO5TvwJ^k2u`n1KWAkKmdr;Z=PBt`5vSu1a;
z)nq?HkoEdj_b8U3&`7_BZjq`mO&dx7JFEX1AC&mk^ydoW&w1(^zeP^3uhhP0=fa5$
zM6JY}XDeDC%hq+|RKYsIcg9!>9sc!i2kKh|<7-MQ-dAs=yq{HUy&%IGw<?JTkc{dE
zmsT^$Kim~heF!NG^bbz1;_tOGFMW2r{CmSh{rl;^TTSpH58^KSuyU5R_m?WjXbmE%
z=2rbNnHuN9HAmj;puS$mu`+L;KX$xF=d*<~7V7HKVb5fr>2gm9wnQOtPTuLyp5aKC
zf#DId%8T}wCR?OI(Vgw)pdW%2a->A*B5S2_%=^OK9kAwy%YIaBfC!yleKIakr`f6a
zP0=yg>CBn%=kT%KL~+#qBOSixZwf~E55nI8rayOJ`B%LuE<as+Q}>hn)&B9vPlxyy
zpI=dvgS?Ue>}9O~?DNfzGlvxpVC6LR0E%BhY5Seb0fKD2&-><cYCH*Zqz&7nMykTc
z&0S!bT)}_xi5`9mP&yy+2cxw|6aJBiv8mx|La{{+hN1?~xYs9~ov$l*iu3gS{Ch+(
zC&4q57YNZa4gSTEtUMslCkp<X3HM`G@+XRYWlf(fNxQvF(-SK&dM(lGG<sw)!tvx)
z(?t@OUhKreV&i3`FZCsFf9|ZVk*a}?89;$^ds+_Pxb{1gYd#w|Tm|^#E&fiCmI8YQ
zRp;7YHk9%O8-Ny-o=GwyTIa_o`{qBofD?S0|E=9?YJYBoga#|N>YIAytR?${iFu!o
z4xypn+eG5gD}4Yk%ca65=n-1E5p95#xw*_-GDD<k-t1I?eA$pc?l&0185blG%Wv9w
ze2TE9?#1Ko1FAQsZwn;r%gVyf2#!GE)@u_DhX?s^{Y!6A0bMbGqp`p&bKp!It;iE~
zG?v5!(SS4WS$IjoY(WdNHQ2*q7Lz{vkjmTcnV@y63dwscJvYBF6QTiF$9M&aQU8>g
z0Rp8n1MYiQ_AaX|wv$Rj%72UvIYL;n%|S;c2lOb^Qz`eJu8kJ_l`70sQPRfHLXw>Q
zXO3pS+50siG@qH9!gH@S&@9ywX@YlVfS~QN<VhHe3@c<=wz-Chi#kIu`O+|P_r%m%
zToIXjOMww9EScWGz1F4^b86!ZPQ#{&20{*i_4e>cXVq|zhz@x`i(djejrkS2jb4!1
zu5#2gG_G?cSP9;K;n0^Mq0Rp8BX>yTS;xuxKlD~A|HOfAh#MIf<pgPqNt2zwfyF{n
z*}?E4*YO>bskXgdW+70mBBM9RE!Jnw5+(*#N?4H$lTL(cnnZpTmS<Lu9#zAGA4+XV
z$4dEnJ4qH<dq16({wl$;5Ne#nAxT%B)XtiiN$F`T&ap6Q4P1U|9D9x%k%xW##z)fL
z#z>}nGNF7dbe`{M*kQ!Z>&mPypr|3s5%#gHyJuhLY<~eZKS@7(;YUseMzGFHECS2e
zqYvFX&8>7RSHyYq)2olvfS+uOWp%j(P|FH+N7?*D=<&w&0g^_<`L8v3MQ0d=!rQLb
zI9^(q@0k)?Zcyh;p2KBv#Oor8B*oaz_EZDEHU3tG>*~O0U7$>un#(U)-+-Ha(p6!w
zq?6!wzFeX@c(&L?-|2RPqbQq?mFOm6$HRJa*x?_p?LOJza`xNW4rOHNJP94f5W;4>
zl&Wfqc2Ae`G!zN&vuC=XZm9D9l#eYQdR8meuUCSYef--_Vc+BGiQ=`%l<MI|RBIDG
zqie*tn+r+^VZYBu{|gY8EylZZ<Qe__&3t_J?t2KUuURgT@M5Heax^O(Kiy-mQK7`~
zAhK}l3F@BP%Sk=ts(A{*4;~7dQG}Z4Wkvb^uaNnlQSU>r$O8Mw1DMDrJ%nZnBHSXE
z2K!_yn*8E;K|duUQyL6z|3b#T?kle;X8U8Mjt#M1{~~f4>FOlf!^1B-KF%#PdGrJW
zVuIXSx}_5>%tT$oQj9Ob3h;wx5*X+0{s4(=JH#6t^Q4193wN5eD%lUO_uW7~Wrgbc
z+5>iu^(;gquuE{Vq_Xvj`Gv48kcSpSsx39zCh3@Y0aoU4sp*h^jxoJ|0K($%tK6%j
z1|@__6^!=_u*Z<l`7Z<3CKt#xz<x0jwHRy8MASdj#}6cmI$PXpLBBT^fz=VUQbaEn
zJ9q}7wF^}cx((}Hu0E@wLpMTT9PwDmJMHYZb#K(mDwd059#6eH{_O@Zh<hWr2j{!1
z`aE5lAr$Afu`ezq^8S%s+NY|jm2|nBAUV668-x`A(%UDGVck?HLrssxu3tZSRSR7G
zHV8YxQHv?&6uthkhO3agZ>w$lZJ&C>rc<<iH+=3qgnch1mD5S=TIBuUf=*s>(PMYq
z4(XQ@a2&^~_{x9Uad%QPwFLbitC9y1%_nqD9#r^M6uUqdf>+`q|HswE*APD+Xs_f^
zd0z6dhk#j1on4kl`q_Tm&-(!%8W(_lW^+=TOa_m5HQ<Lr4s5sFKbj`iHk%@GzMm$@
z?2c02sHDx;Od=WpS``%#;Asu>J(@f41>(z`boMPn8Zkt<dj;-v_&PsjZdgBZ_T10x
zs)=VcfU1M?0)0hS9zov9cky$Yrkg#I@>n4O>olHL2!uzn_Pi2s)gSo-b(|=$TTckm
ztK`{V&3Js&u#Xm{3^^Y4O5IAW6icms9n7K!Ssut8Ra<ELW7B}xpBhHCd^Wi=u-cL^
z>g8Bm^JG1*3THs}{hoIIWRGRJWW4q2KpV=ny}n@K{)4&<Ne}J=Hxq5LDbOZ17qoix
z5Pe_(g%@x>Aj&s0x`S2@d&4PR_bmtS*VLC(Hx_#QQe&3ealVcJ{=Cp$ftkO*MdC(i
zE0ShSL|5a&-_%A%kKjw;ExM;sq-_fFj*yw3$Cw>$AyNG>o6h?B;Kn~E-kzF!Zmuff
zo<oQOP`$7xFA2?7ETo;|wDu0;XB(Ktp4GMPDi-<h5Mp?pz1ZlrG@<G>1<0Vg@samy
z7Rp>cbK?Ws%0bb?z6x)A4(Sp@3yb^5Bc}r`3UXS4ik9d!!u;mp#{2?Fro+^ffuw!s
zNVm|cu<soekVSRQ@iEf|-%^pQkf=bw*B-eD+Lc~oQ~F#QJgGZkcW$+^`%)KX0+Eya
zQhrm)MXZMFc^2qV8vYU}5$zH+&Pi(qh22$QVo1kEP*TM4DV>y#eSEz=YT2Yp<Gm^#
zIdaW{9c>?=`dc*T>MiK)?|1nh)P1HJKLq_|BPQUp0t%S;`KR<l2LS2$hiOV>LAMD;
zvf^&dFCGsI&5ZkU5U$$UUB^a2uRAG@q9o|f`o9~&EA{51H`>*?326teVX6kKhls<u
z`V&bPTpRKuc83@cm9rE}CGOJnJ^P)4W-v^(_*m{b(?j)?73An~ynVm@*V?|d{c9&l
z{3nyH@&4zYRg(n8{P~iB#^;pqR&|~P-MN{4sg&^9w0*npBBz-9M;gIixzY3CjrVV_
zLe~Xt{>rd3Z7uM7M$MxpY^Vz@pO6!MugEX_PDU=r%`dQaY4-IZVSdiau&<-{ioZuD
z#jhzS>D)DjCdxns)<Fo>uQySNzNPFP`{GDG<F1LLYL3}4#FqdP;7Tl9(=t>~5zDW_
zV5|RKc}{(VDLEvLH;Uy$%;mg$K<UWh8oo(Z1lnEj3-RxM5To6f;h5Ql_z5GU8{(CW
z<PIdUVMT!54`(GfE_!fK)3I92Ur3k6&&;*kmGO8d^qM4v;$F$BlcP~@ExhQ2<DIDc
zyDQ|1qg22|Dx$4W+a<Hlr_Coro&>DSrrK|xJ-3<&YdvCLO@jwK{vJv-Y{-jJuk86L
zD%WI2{Z`ssob`gvveF+XaRdlY28JKO8>B(?@DHGsGDug-x|a;}KqitJ+pwsJdCWq!
z6Fber+|%15h_)7E^u2lCyK%^EdQxq539IK8*0%TMVEGL5$sPA6b^j|L{LgPL<%o85
z<YYVJ3p8G^erisIVN?oyVUjCz1F=>10&SjuJEeC<UilTPC-tk1(ga5EKsm?LPh;*|
zZ{NgFg7-j5>tX#A&8#Ts$f-LuRx3A$H7zR9+@QI0%PumodW^=;IKQLc*#|cRi)ZZ9
z=)Z?c_A47M5iJlx6}E;KM_}K}AGuYF#avi<c`!Cdy0pzAqeS+t{9)?W{w!o>=(+iY
z=zzwb>^i5aoJN20JSnaLo*iBpz2FqGU{+>UUJubJI*riI&UEVg=}mG;7euhU<kxe$
z2XNr#yD_OwA1ve1PVAUuB3r;xVAlw2&@a)X&sP8Gta!utp6!?RZ2bP!qUGB^c_nY*
zCeq4o78#+@C$P>NvNFg)Cdyrp$nTFtcl)jte&dD3zACN$MWVjRU@<>UiU{u-oTdzQ
zFpO>-KDg%1>lfL4)3nZ^RK$vfNyrm?kzqPjSF#03B(u&HV@mr%gm0<rr=a7kV;c#a
z*kxy)B?E2Em5U4cvehsHYxf2+?_@H(1WlBPE8Cenc;bWWlCp=Wv`3-tMJ6qXaG1q^
zv{_hK=q<~NLO+KlZ$?|sqg}o%w73NcbEU!q9%WXDNC1N0=b_(*AtN|I|6{0L^hW|T
zF!I&A$lXiWyOR^&swIjryJq5~REd(b!-X$_jn3*OUlrQrK?Wv{RbjU?^_k*sblsjT
z@jD;%1a&C^wNsL|O;$|bzLw0gkKP__0bNDb;|<C%_H3V`6UjPXv3~5Efv8)>k0A=f
zD%NLh;o`i6A@4VOroDx$Ttlk#zvx!j$f9G>8;p>Z9+FRc;jTf(iD*B77v*8F<?-rW
zCChX#&tlA!GqFanC#3mq2KBW$T&=*2-`@(wo&KNDK<xRHKElAtFX`eJ%@=i&z2|$y
zc7BUe#x~iROQ$8G&z}-pd_)>33xW9<dwAvnaG_??ZUm{ZR;u>~x2OV+NQ}`R`-jM(
zUv405lYf0{SgjH~wYNR{xuIpDl?IKHC!^KOpF((m4r6=1hSY(Ttc>9$GI;1eGJRvw
zkc8PGJ^r58usEC(y7i33xB5}#RBH4*rmFunKJIOqv`d*}0B9!I|Fk^^T7C{Ttrs8s
z?6!%lc2WzM@^Xano=#XDcILR~Q7_&zkzmYmQUlL_Y)(^rE#!Su_ASv$d!>clV>L7B
zEx)=gfi(t0e8;l`BOjnd<vxK<1Bz#()DtUB`EE<Zw@UZmLx5Y6esXj19Jz>$i$PP)
z1^=<>Jc}f5wfB(hS(1l4#_ARbwt`|KDQjI-`s2Wk%Cqh0a)Ju8|9_CBBc?uzI|^K8
z>N&g<!*jeEv>MTT?m?!jTkQWiAovWIzpxvgr5n7VAX!;@D4A#YVrtZLKU|*k!L1%E
z6s-_y-l%Xs(l;<ZTt(N}Ww=*NEZxKn_7j!)v$t6bn!!WJi#^;}L^X2m9yifyfqa&6
zTl3jg8Ccz{^V-pd9({8H`vSk3Hw|lx_$I%TjL2<j9*ga4L{tA4j>N{+ePFD!q(mR}
z=w8n{)Q$h=qrPMd=KUQ-S2=n`{K|X{sEk_Zoxwj_I*eY4F;D4_V6@krqR#&v5_8ji
zvl&d?2VAa@x+7v<Z3zp%UeusR1dcMZnMz7t^b6Lxo|(A@#G`%ri-)E`;m+<K-BI3F
zH}J<zv{(OqUiGt9hW33IT$u=*gc+1MR+x~N@Aw>Sw#L=iCQ*&Avj(L{b?+Z#`hf;U
zJDG{hoD=y~j*~ifCk1-HV*@#(AwrKVHR5=CmZ#98s{`-5BwvIJ59PQ5ehU(fr!uIm
z&0#8+?Kwi-(Yl(kJ8LbMV;Sgg`&zteVuL+}N<_JHiFSA6MexjPv5p|yTa6%HTENUg
z_frLAHS^mwNr`(MVNxq&3X*m9w@23^7AKpBR`)a1+4t|kxGTMgVsJ8GI@8ZU7<w0?
zi1ABwGTj~&wgU~#6v#JMaXo3CxOt}?f@OuFjp=g%e$-IeBQG<1*m`!^>-o01xYcSe
zqm8OUVU)l`of#IngNyMV$ziBuAvTtP`X%xL#q1rFSTLL+sdYF$a(QXKc4k#HslqD8
zPfW7MV@mBEzhnJ(Hy3he|3+>Zuq$bgmkm^B*TMU$ie}Frm_VQ-1vbV6(wZBtQX-Ow
zunDzJiQ$|~SY0SIpu2xC;<5>6@kl{1@*50~XqvB=Ij$sYTdicHDN(4b^37Gf8Wxb^
zd}S>je+qNi9u|sxwqcR&6|)~lJTg8G&A=DlWq_&{ep=UOSlIRX(l){XuEvp0-NI*t
zo*~@Q!rLF_D&pqbD_r4*CpSOO$AK#pB}kj!)k24UIMEFd?)<ZpEP~x|2UST2Qu-m@
z8=3a{iY2RB5ts=P58ThZ3OBgpvjo+vOJ5f!3hj-_>3os&k<k|W)dJ#d?oS@F={e=^
zP87O%nc*IGoc(x6U#EEFZN$}Hr%86?u3-+G&8>U$k-}4P&0yAEM!9a2quP&Df76bX
zTIZS-uqI5}*En7@=z;rys){-FW>n6RI~zE3S7rA0WCL~j!KlNuG}7ENCy?5(mw*!M
zEMAqz*+JIo=2joKwvu8y89-yXjXj}iq`RwKLOFA_S3)x+KQU%&fv7-g&3ydQt)IKy
zqh^w)|94N`zQq66-nECbm92d<o%E6vy`@#E)pm+TF+F9paUGXN+i6QhwM0<Uy49^j
z7>N|4)uMV+rA6IJL#Vn$f`q9{TXmNp651$1h)WPeINNlbr)JJ`{`<b?`M%Tqk(IsH
z-p}6q-D|I`cfG&&_fsr<!bWY|sNT#%@=V86KwhY!v4u@rSQb0+-EQ>|^<L71zr+o%
zD$NPp)tMJzr&BV+w<Gx#KW9vUy@<>>mD0YT*Y}d}a^YdPDGYoDTdv!*+m~NsjLkpk
z)>=u*X+3${vUt(r!aEz`DM)dBV%e_`2qEo(ZK4h5W*>#cZhP-nu6uU=2nV9Aa$~m%
z2Hw%zhVzfojfKaXu-Use3R`;duN#I4bB-ZDdyrg<e8l-dr$yUa@a7&8%>lFR+tP#3
z&LuH+nzsf_8ln>S^kr7)Hp-u>DvlYDPf9l*kOVfrXwyF>dhsD}yZ%|XymsM(#-PFS
z&Vv=V=pql9{77c|uLCW?x2ZE8=#A1EIWT)b3bJatOwi%Xp)m9|ODCOb$YiNBn52md
zdqjZ08Q>bbk^W<QskA|S<N!HU(P}~1V(&#-;8hAQ7v8<DSuqAMUKJDY6fGw@f+%9Z
zZ9Hfn=Gtb~rQo%*NEkvM#$pgdq!Uo|^8sRC4%-j0V~<?s^n0=(s85-!(V`7&;Mm%J
zJe(M7=G<RDH#ajKmejQOr(=Si%pj#w4JIH<Vcy=9wVf*N-YB~Iq;EhO@7+?+tUm=n
zsSGlR#fI@8n?6!$B42TqOS&$HO{lxY!9PY1QrbH!_!7!YY*V}`PGedqHA+uDU@G$B
zs9ZtJE-2n&dUazIU8ObTA+}b6VRVM?UEX4{z`2TIX;|1S%&v{j>;CX~1II>R=$hou
zFW`*a*iW4mKd6mPCM?YkJO%!0^$CDV^TjRj45_`KB~$p=x5f9EM~WNJhQ~se^0jND
zcW#|ET%Kn}HoUpF-*c=&ZOlh%<n8^uklrQZKQ!c#HRavM<F;*E-pT0Dva+qibx6CJ
zP4rdoj@`_zrB?cas4R}==xO^*$t(f|-e-}8k?h0gwr5VpdN-83J(aHJ-vxyR+Y?M(
z93s&S3uCB%54U7Yo1COz0$+zP0fi4&D~w1Hxyh$elDNG`w#@&ELFyH`OmyTkIt+Cf
zXvyB0yxTBWYX4)eAIq&yRx5S^H2qdEuMlrQR54dhI$~qCE4<UvN*quFv62Kv#eo;S
z;jf~kN9BUZb4ivhZvdI2PrAPoOAX}bDXsakZwmm|>qV>fmXl^(vN0E3V`J@5o)NRD
zMQ7=|7*&m|EYfA=__YqmPk`7XPSkYKa@+bBrNbTTc%78jta+&zqDAOS+7dxIcRT{k
zFpKEWDV;+&+x7T%)THzzZe>~?-K=HE9;~eZ#}VNI>s_+|w^(O5xX!2U@NR$2WmZ9P
zf-X5VbT>5UV|PC-N8EVZT{QHVJ7x&G2DyQHsEutno<r_H)6D53y_Pp8mVQP#VJQ=v
zZJ!eNwdkH5ypkp3KI+iqH#Tvz!v)cP%-$>?R&rh{TD7u&-o}Ns?8kP*wMd4Slh?j=
zw=};kpg7bPH2>^u%HcB#?3EAMx)5-FB^CTySIoK8@k~I%67;(J;*;%VyCKva?D@uB
zgp?PN#%_y&NE?T2b#P+y^mFcD;IUFfqUISJ%UsoF6Q|?D7aS4*LcFd9K{-*%!JuV^
zA|(DkXxduhZXh>Wf_LdK&p=*Z8qujA?UCgn6tATkqdn_@DL9s@2n*l{m@+WiJcsA|
z$zZ+WGwrzX*Y{hEEgDqdDlqQ$iko+GjPaLJG2waAB!x?v8bgE-?_`H3Zg)155ZX5O
zN6Q0sp)Y;P6q-aKMV0g(fG2SnPWi<&*kMFL*0xPgIQ@^Zu|ANm`eN@+dp>+AzErXa
zPk`QEnhu`>7LVI0XftXR7Y*%kM=!i-h@D6aeqMXdCx-O9xVtAop{0D!S$G{!w!WmE
zEwuUJ`^zppDYV*kK{)=v`0Z??1%SFgtZyy{G#7%#5q@2`(;Xt1`>F19?<s#e6GIeZ
z4<SqQr4B&75Ud1(%am?9j7w{?k3Di}eNa?HG9yp7yij(syK6?R@+9Aqr2TGDF+v@$
zb)>`4kN8H<Tv$0KGx{lf#%#=&{3L46Y{uks)~`%)p<VoUCbC*+EtxG6;XzRGAPTl#
zWjAj!<}G#Id$qZprWwF$-n7`T+-f4xC9Mq0H%R><FL39l0c9w1Pd7P^KzbQn#x4zp
zg$3UWyO^h+`yh#zCr(mS(dQpDJw+g=9ZpwTOX@Q=*`O7VIs&hwlLz$y2kNJ4p@xNm
zWNOedbSXzaoBJh4#`0*e#fanLjdOlvKR)%n*s<1j2`&%wIVM_C?rLHq^h_Y8ir)Ew
zA;hHdPE!Z=){(~D(h(5$Vk1g-kTx;H)~R=vQO_nJ^@2wB_p&Yvj=p$;ImBsq0p_mD
z;M<!;+1cN-n!`+kT!!6sxgWhpuuD%i`#B|pFK;{Kn-RPR`kSeOt<roCeW6LKo0q4F
z3%zK4`@5($knLULW%MaC9qrAwO01j9sB3_Zgj8qfFaik#P{NP}H^$IWz9csImo&}u
zF_})G)TAEaN1Se_eHlzXzp*(iF~eBoyeGlYrb0_S?aVmzAgko{jv_@~4-ZgUiMDeM
z&3-vc1>UrY*fT|lT8&9(M9qZ)i}lqBXG6SgsC*BXD!E~1?j3q+O)E^9$;P(!Z5^HD
zJxAIhJb$wr5ww8IT8>(6st2IPY)qN<cvj>(kj~SES**eL2U(Yzo;7$G%mSotx-}KC
zdBuQWq^Z*yo}qr1hHrO4;h7Qe-oaMb!9ztxp`gBjelZ{Aut(nZ?s{9Dr&F=FXpZ>)
z`9VQ`qKY?0)W3C)xDlOPn)ZFsGa~X??)B(YFX_}EdynD^pf!-=y-UURbKD~L4eCbz
zMR{caCvHHIot1}ldZRc;r~SQczOt%0Z-gLm<mpX^<H;FZqZ{wC!|4OGLQXJh>is8o
zi25dcKETn>7=10G8PWEE_gZ9IyM9AWrWcLvSO|WVG*gXrN(EsUA}<<KDB0<?$fN<p
zLb~w|jZI`>vc}@YpK?V7tgCnIavY|){)8UvcCY7~!qBAp*qxlMn!fxC9I~+qL<*Tw
z5pr$WMT*{eM0rKk;og1(t0(vYW9`UEKq#qh3bJvzM{aWO@l40<IJW#dGVXTJR!)nI
z`9rniC1ej-{s`oqseLS?-`^!-&G40Mjnv_XltRJevb!P#2-14TY~}?E49mOe4pY54
zS(%Ex^thyE!}@FN#gSYEO34@>1fuO9dSZ3HE3DY;Fmx)OQRJlGd$8bg8@KNj0O+E1
z26#IC5|L;vnSWR0dan1l|CwpUdkoI`2yNYTt`5{j&%o;z{-|>d!5+%efy!mAt&N`X
zEa}z(A*#c{2JI*2s=rAnNl{o=HD<M0qEOgK2cR5U`BKq=C%u`KHz=MK>qac?+j0@-
z?`ykRXpU#~lThTE0aDj5-V|{pyt6hqn0rETigEEG?}&L#3e4ipbguw2N_;T1!3*Vn
zHNdZ<vN4Y{{e&#$sy3(%hvoe)2}G3@yz#Fy=G+gjGX{0RSow`oAkWtyD_ZenY(oQ(
z$Fg=YLoWiF4H@Gb=1w}(sSsPc17&^v1N|9y3(|wbZ-?&RP~C#VG#Yr00wIanpjVcX
zNxIb^0Qlc<lTim|8r!u)%8{lW=^?wH-b3NaZ?i=yDP;i2G8<>m+5uBdwf^A2_$ee=
z_tCu@(GT@yz?chzG^{nR(}H?)Fu5n~#Dre<VM?VUuiSQv{IkBE!^JNSXu}jC@EM5k
z$5Ac4?2!&+ov#}E9FBc$f9csF7XL1@J@J5#81_I=^6~EOp@4VK4)xljh0~3yxgW%t
zd<pKE_{008@4~B%dqvTEJx2hgqj@f;7K+LN2}-k-ghLajB)FnN$6a_&1Qu1u)<<u%
z$n2B%95gbcx+p_?v23c7BcQ#Ds>0h=fo)|ybc+qpuO9g9_snXfGxw$C+kGnWb0H9H
ziq2cv%!hL*yBOMx`I6HCeZ-ItXY1Q4Tm-|X4RZSd-p;wom&4~<7BvGpgxvBsGluGK
z?R$q#A3F9jh0liDi`p)jcmpEB#DZ-oXFjm@UIY&dqQhM|iG3xS6yG5VQ{OYRyEciW
z_AVqw5JWYY!c4TXE64*iNbH@A*-~gtKM)(Z1n>grVtgLO08G^Nye$z>)oo_NxPj<{
z*6U{@cQjB`q~E-XLKGDmcqUqxGCL?%a&P?vESwt`yoYMNndHVQzIv%kJt{VI27AlS
zPE$R5LB7?uoodQEIi;^H6EIV;Wp9n=>rgKm9OL7m+niMYAp~ja1ZuO{&hiKqH^~an
zNa%czZQFrsOWHa^aC1m*VX+tLp~I(?kAV1E(k`ArcUcK~zT|{Va55O?&sT~WTl)Ee
zS5q19_aw=#XHFFr5?`iY!eA*(&a0qX<5}MPpJFeY{=il{l1+WSu{aj?$7Hp7&1WPa
z5lE<MzudBR$8VDnzqy?zVF6CBNE+2A2YQv|<;T1l?SY+feX)reeC3FP#r@WdP|Q2m
zOZ7mwmMCo}p=%O_PI^(P!}}D|y##VEI?vUhV2>^qheT;6rtt5aMJpN@z{lj9U{fAr
zGisC*`VMbWzdZ+))70!lk!l36Qe<cuIB{y}pdfJFYcMWV{AgJ1Drr<p1L~6+hJz|$
zPI_~Bam(5q_wL^5vW1t}n1iAdV=-*xLVRlx&CsjrTX$$P6ZyuZ{DpHc&mTKx*%Dut
zhcr4?!ztV+Eh`m(g?(zrTX-meHmF)4Y8E{pWQy479$l1Os@LLAaz_uhQ4_TN{2qXR
zu*T&EU-L}+VKekPe=*lN%MnBhx7MQJ5e<z`U=OY3;+a}*0zG%m^Dq>N!L?`0wm)pX
z{#}f3gIx}UT<Y?G6e39EC99Je<He<FV77b5s{#Ny&o%_m!%4JD;q>DoEpY3&*`fgT
zyi699sG5C-=No62?<OEN00C9k_pTK^`JS(2Q<_nE9}<RTwy$yD8V1=1JTYK|zD@*^
zLb7*#eq!9v&nZyW02kNrE8=%Mmd9}5W0dRe?DLJa-si2qeJfr0*PefEyZ(4J8u`oi
zORGUgUp7VVTm>fmvg!Zm$u@;U`6ZpRpt&Ef1mrC}1_FnktXKNuS%2QzOWwZ;X;&?a
zxh9-lbX>;~6)%<cla7@rkyZcWF)Nm;j{Y*4ZKd{)a?_E|uj#7F&l^VX{~lIc+3oQD
zzs1~Fn!cWF#S&l5xY`nbZvF3ekgNGAPb-(c;8tF~3S`bQS!z!*6+RALxkltb79tkB
z;4oT%{Xk!-{A+3XwcoEY$=Bgyl{uuOz7CA54f3^vthUF0>>&SktoqmSrkBSm34dMj
zS!qrCZ<;=>-1PsyiQ(5fTd~0E@~h{t+8$E>16}`@nI(vAuaE>jfmlA-39~b%dB%=m
F{{;HU{5t>u

literal 0
HcmV?d00001

diff --git a/external/tbb/rfcs/proposed/README.md b/external/tbb/rfcs/proposed/README.md
new file mode 100644
index 00000000..af243fad
--- /dev/null
+++ b/external/tbb/rfcs/proposed/README.md
@@ -0,0 +1,9 @@
+# Design Documents for Proposed Features
+
+Proposed features in this directory have reached some level of consensus within the 
+community, indicating that they have potential and deserve further development. 
+However, the proposed changes have not yet been released as a
+preview or fully supported feature of the library.
+
+RFCs in the `rfcs/proposed` directory should explain the motivation,
+design, and open questions related to the proposed extension.
diff --git a/external/tbb/rfcs/proposed/loading-dependencies/loading-dependencies-by-module-name.org b/external/tbb/rfcs/proposed/loading-dependencies/loading-dependencies-by-module-name.org
new file mode 100644
index 00000000..c35db330
--- /dev/null
+++ b/external/tbb/rfcs/proposed/loading-dependencies/loading-dependencies-by-module-name.org
@@ -0,0 +1,104 @@
+#+title: Loading Dependencies By Module Name
+
+* Introduction
+There is a well-known attack that involves loading of a malicious dependency
+instead of the original one without notice to the party that does this loading.
+In the industry it is usually called /DLL injection/ or /DLL preloading attack/
+and it is mostly associated with the Windows platform as it is known to be
+particularly vulnerable to this kind of attack [1]. One of the recommendations
+that safeguards against this type of attack is to specify fully qualified path
+to a dependency [2].
+
+Historically, oneTBB loads its optional dependencies during its initialization
+process when these dependencies are used for the first time. The way oneTBB does
+this is by building full paths to their dependencies using the path where the
+oneTBB library itself resides. It is the only sensible path which can be
+obtained by oneTBB, whose usage conditions are not known at the time of
+development. The purpose is to minimize the risk of a DLL injection attack issue
+so that only certain paths are probed by the system loader. However,
+dependencies of a dependency are still searched by their module names only [3].
+So, the risk is minimized only for a dependency itself and not for the libraries
+it depends on, not to mention that the file of a dependency can be replaced in
+the file system by an attacker, which breaks even that protection. Besides that,
+loading of a dependency by specifying full path represents an inconvenience to
+the developers who want to make use of their own variant of a dependency. Not
+only they need to place their variant of a dependency to all of the places from
+which it is going to be found and loaded by every client component that depends
+on it, but also this makes problematic the implementation (if not impossible) of
+some scenarios where the dependency being loaded maintains single state shared
+among all its clients. Such scenarios are hard to implement because copies of
+the same DLL loaded from different paths are considered to be different DLLs and
+in certain cases there is no support for filesystem linking mechanism to point
+to a single file [4, 5].
+
+So, what is the main problem due to which loading by a module name makes Windows
+much more vulnerable to DLL injection than Linux?
+
+Besides difference in the order of accessing paths specified in the environment,
+Windows also prioritizes searching in the directory from which the application
+is loaded and current working directory [2]. Assuming that application is loaded
+from a directory that requires administrative permission on write, which is
+usually the case, it is the current working directory that forms the main DLL
+preloading attack scenario [1].
+
+There are approaches to exclude the current working directory from the search
+order. However, for a library to avoid process-wide changes to the search order
+the only viable solution for run-time loading is to pass
+~LOAD_LIBRARY_SAFE_CURRENT_DIRS~ flag to the ~LoadLibraryEx~ Windows API [6].
+
+With the removal of the current working directory from loader's consideration,
+the search order on Windows starts having little difference with the search
+order on Linux. The difference includes the order in which directories specified
+in the environment and system directories are considered, and the presence of
+the first step of looking into an application directory on Windows [2, 7].
+
+Since the system environment variables and the environment of other processes
+cannot be changed, the only vulnerable place is an application directory [8, 9].
+Because the application can be installed in a directory that does not require
+administrative permissions on write, it still can be started by an account
+having them. Unlike Linux systems, for the process started with administrative
+permissions, the paths specified in the environment and the application
+directory are still considered by the Windows system loader [2, 7]. Therefore,
+an attacker can update permissive installation directory with a malicious
+version of a binary, hence making it loaded in a process with elevated
+permissions. Note that specifying fully qualified path to the dependency does
+not help in this case.
+
+Fortunately, there is a signature verification process that helps validating the
+authenticity of a binary before loading it into process address space and
+starting its execution. This allows making use of the established search order
+while checking that genuine version of the dependency is used. However, not
+loading the binary because of the failed signature verification might not be
+always desired. Especially, during the development phase or for a software
+distributor who does not have the signature with which to sign the binary.
+Therefore, to preserve backward compatibility of such usage models, it is
+essential to have the possibility to disable signature verification.
+
+* Proposal
+Based on the analysis in the "Introduction" section and to support versatile
+distribution models of oneTBB this RFC proposes to:
+
+On Windows only:
+1. Introduce signature verification step to the run-time dependency loading
+   process.
+2. Introduce the ~TBB_VERIFY_DEPENDENCY_SIGNATURE~ compilation option that would
+   enable signature verification, and set it ~ON~ by default.
+3. Update documentation to include information about new
+   ~TBB_VERIFY_DEPENDENCY_SIGNATURE~ flag.
+4. Pass ~LOAD_LIBRARY_SAFE_CURRENT_DIRS~ flag to the ~LoadLibraryEx~ calls so
+   that current working directory is excluded from the list of directories in
+   which the system loader looks when trying to find and resolve dependency.
+
+On all OSes:
+- Change dependency loading approach to load by module names only.
+
+* References
+1. [[https://support.microsoft.com/en-us/topic/secure-loading-of-libraries-to-prevent-dll-preloading-attacks-d41303ec-0748-9211-f317-2edc819682e1][Microsoft, "Secure loading of libraries to prevent DLL preloading attacks".]]
+2. [[https://learn.microsoft.com/en-us/windows/win32/dlls/dynamic-link-library-security][Microsoft, "Dynamic-Link Library Security", 7 January 2021]]
+3. [[https://learn.microsoft.com/en-us/windows/win32/dlls/dynamic-link-library-search-order#factors-that-affect-searching][Microsoft, "Dynamic-link library search order", 9 February 2023]].
+4. [[https://learn.microsoft.com/en-us/windows/win32/dlls/run-time-dynamic-linking][Microsoft, "Run-Time Dynamic Linking", 7 January 2021]]
+5. [[https://github.com/NuGet/Home/issues/10734][NuGet project issue on GitHub, "NuGet packaging should support symlinks within packages", 7 April 2021]]
+6. [[https://learn.microsoft.com/en-us/windows/win32/api/LibLoaderAPI/nf-libloaderapi-loadlibraryexa][Microsoft, "LoadLibraryExA function (libloaderapi.h)", 9 February 2023]]
+7. [[https://www.man7.org/linux/man-pages/man8/ld.so.8.html][Linux man-pages 6.9.1, "ld.so(8) — Linux manual page", 8 May 2024]]
+8. [[https://learn.microsoft.com/en-us/windows/win32/procthread/environment-variables][Microsoft, "Environment Variables", 7 January 2021]]
+9. [[https://learn.microsoft.com/en-us/windows/win32/api/winbase/nf-winbase-setenvironmentvariable][Microsoft, "SetEnvironmentVariable function (winbase.h)", 23 September 2022]]
diff --git a/external/tbb/rfcs/proposed/numa_support/README.md b/external/tbb/rfcs/proposed/numa_support/README.md
new file mode 100755
index 00000000..c19927f4
--- /dev/null
+++ b/external/tbb/rfcs/proposed/numa_support/README.md
@@ -0,0 +1,156 @@
+# NUMA support
+
+## Introduction
+
+In Non-Uniform Memory Access (NUMA) systems, the cost of memory accesses depends on the
+*nearness* of the processor to the memory resource on which the accessed data resides. 
+While oneTBB has core support that enables developers to tune for Non-Uniform Memory 
+Access (NUMA) systems, we believe this support can be simplified and improved to provide 
+an improved user experience.  
+
+This RFC acts as an umbrella for sub-proposals that address four areas for improvement:
+
+1. improved reliability of HWLOC-dependent topology and pinning support in,
+2. addition of a NUMA-aware allocation,
+3. simplified approaches to associate task distribution with data placement and 
+4. where possible, improved out-of-the-box performance for high-level oneTBB features.
+
+We expect that this draft proposal will spawn sub-proposals that will progress
+independently based on feedback and prioritization of the suggested features.
+
+The features for NUMA tuning already available in the oneTBB 1.3 specification include:
+
+- Functions in the `tbb::info` namespace **[info_namespace]** 
+  - `std::vector<numa_node_id> numa_nodes()`
+  - `int default_concurrency(numa_node_id id = oneapi::tbb::task_arena::automatic)`
+- `tbb::task_arena::constraints` in **[scheduler.task_arena]**
+
+Below is the example based on existing oneTBB documentation that demonstrates the use of these APIs
+to pin threads to different arenas to each of the NUMA nodes available on a system, submit work
+across those `task_arena` objects and into associated `task_group` objects, and then wait for work
+again using both the `task_arena` and `task_group` objects.
+
+    void constrain_for_numa_nodes() {
+      std::vector<tbb::numa_node_id> numa_nodes = tbb::info::numa_nodes();
+      std::vector<tbb::task_arena> arenas(numa_nodes.size());
+      std::vector<tbb::task_group> task_groups(numa_nodes.size());
+
+      // initialize each arena, each constrained to a different NUMA node
+      for (int i = 0; i < numa_nodes.size(); i++)
+        arenas[i].initialize(tbb::task_arena::constraints(numa_nodes[i]), 0);
+
+      // enqueue work to all but the first arena, using the task_group to track work
+      // by using defer, the task_group reference count is incremented immediately
+      for (int i = 1; i < numa_nodes.size(); i++)
+        arenas[i].enqueue(
+          task_groups[i].defer([] { 
+            tbb::parallel_for(0, N, [](int j) { f(w); }); 
+          })
+        );
+
+      // directly execute the work to completion in the remaining arena
+      arenas[0].execute([] {
+        tbb::parallel_for(0, N, [](int j) { f(w); });
+      });
+
+      // join the other arenas to wait on their task_groups
+      for (int i = 1; i < numa_nodes.size(); i++)
+        arenas[i].execute([&task_groups, i] { task_groups[i].wait(); });
+    }
+
+### The need for application-specific knowledge
+
+In general when tuning a parallel application for NUMA systems, the goal is to expose sufficient
+parallelism while minimizing (or at least controlling) data access and communication costs. The 
+tradeoffs involved in this tuning often rely on application-specific knowledge. 
+
+In particular, NUMA tuning typically involves:
+
+1. Understanding the overall application problem and its use of algorithms and data containers
+2. Placement/allocation of data container objects onto memory resources
+3. Distribution of tasks to hardware resources that optimize for data placement
+
+As shown in the previous example, the oneTBB 1.3 specification only provides low-level
+support for NUMA optimization. The `tbb::info` namespace provides topology discovery. And the
+combination of `task_arena`, `task_arena::constraints` and `task_group` provide a mechanism for
+placing tasks onto specific processors. There is no high-level support for memory allocation
+or placement, or for guiding the task distribution of algorithms.
+
+### Issues that should be resolved in the oneTBB library
+
+**The behavior of existing features is not always predictable.** There is a note in 
+section **[info_namespace]** of the oneTBB specification that describes
+the function `std::vector<numa_node_id> numa_nodes()`, "If error occurs during system topology 
+parsing, returns vector containing single element that equals to `task_arena::automatic`."  
+
+In practice, the error can occurs because HWLOC is not detected on the system. While the 
+oneTBB documentation states in several places that HWLOC is required for NUMA support and 
+even provides guidance on 
+[how to check for HWLOC](https://www.intel.com/content/www/us/en/docs/onetbb/get-started-guide/2021-12/next-steps.html), 
+the inability to resolve HWLOC at runtime silently returns a default of `task_arena::automatic`. This
+default does not pin threads to NUMA nodes. It is too easy to write code similar to the preceding 
+example and be unaware that a HWLOC installation error (or lack of HWLOC) has undone all your effort.
+
+**Getting good performance using these tools requires notable manual coding effort by users.** As we 
+can see in the preceding example, if we want to spread work across the NUMA nodes in 
+a system we might need to query the topology using functions in the `tbb::info` namespace, create
+one `task_arena` per NUMA node, along with one `task_group` per NUMA node, and then add an
+extra loop that iterates over these `task_arena` and `task_group` objects to execute the
+work on the desired NUMA nodes. We also need to handle all container allocations using OS-specific
+APIs (or behaviors, such as first-touch) to allocator or place them on the appropriate NUMA nodes.
+
+**The out-of-the-box performance of the generic TBB APIs on NUMA systems is not good enough.**
+Should the oneTBB library do anything special by default if the system is a NUMA system?  Or should 
+regular random stealing distribute the work across all of the cores, regardless of which NUMA first 
+touched the data?
+
+Is it reasonable for a developer to expect that a series of loops, such as the ones that follow, will
+try to create a NUMA-friendly distribution of tasks so that accesses to the same elements of `b` and `c`
+in the two loops are from the same NUMA nodes? Or is this too much to expect without providing hints? 
+
+    tbb::parallel_for(0, N, 
+      [](int i) { 
+        b[i] = f(i);
+        c[i] = g(i); 
+      });
+
+    tbb::parallel_for(0, N, 
+      [](int i) { 
+        a[i] = b[i] + c[i]; 
+      });
+
+## Possible Sub-Proposals
+
+### Increased availability of NUMA support
+
+See [sub-RFC for increased availability of NUMA API](tbbbind-link-static-hwloc.org)
+
+
+### Add NUMA-constrained arenas
+
+See [sub-RFC for creation and use of NUMA-constrained arenas](numa-arenas-creation-and-use.org)
+
+### NUMA-aware allocation
+
+Define allocators or other features that simplify the process of allocating or placing data onto
+specific NUMA nodes.
+
+### Simplified approaches to associate task distribution with data placement
+
+As discussed earlier, NUMA-aware allocation is just the first step in optimizing for NUMA architectures.
+We also need to deliver mechanisms to guide task distribution so that tasks are executed on execution
+resources that are near to the data they access. oneTBB already provides low-level support through
+`tbb::info` and `tbb::task_arena`, but we should up-level this support into the high-level algorithms,
+flow graph and containers where appropriate.
+
+### Improved out-of-the-box performance for high-level oneTBB features.
+
+For high-level oneTBB features that are modified to provide improved NUMA support, we can try to 
+align default behaviors for those features with user-expectations when used on NUMA systems.
+
+## Open Questions
+
+1. Do we need simplified support, or are users that want NUMA support in oneTBB
+willing to, or perhaps even prefer, to manage the details manually?
+2. Is it reasonable to expect good out-of-the-box performance on NUMA systems 
+without user hints or guidance.
diff --git a/external/tbb/rfcs/proposed/numa_support/tbbbind-link-static-hwloc.org b/external/tbb/rfcs/proposed/numa_support/tbbbind-link-static-hwloc.org
new file mode 100755
index 00000000..ebda0699
--- /dev/null
+++ b/external/tbb/rfcs/proposed/numa_support/tbbbind-link-static-hwloc.org
@@ -0,0 +1,120 @@
+# -*- fill-column: 80; -*-
+
+#+title: Link ~tbbbind~ with Static HWLOC for NUMA API predictability
+
+*Note:* This document is a sub-RFC of the [[file:README.md][umbrella RFC about improving NUMA
+support]]. Specifically, the "Increased availability of NUMA support" section.
+
+* Introduction
+oneTBB has a soft dependency on several variants of ~tbbbind~, which the library
+loads during the initialization stage. Each ~tbbbind~, in turn, has a hard
+dependency on a specific version of the HWLOC library [1, 2]. The soft
+dependency means that the library continues the execution even if the system
+loader fails to resolve the hard dependency on HWLOC for ~tbbbind~. In this
+case, oneTBB does not discover the hardware topology. Instead, it defaults to
+viewing all CPU cores as uniform, consistent with TBB behavior when NUMA
+constraints are not used. As a result, the following code returns the irrelevant
+values that do not reflect the actual topology:
+
+#+begin_src C++
+std::vector<oneapi::tbb::numa_node_id> numa_nodes = oneapi::tbb::info::numa_nodes();
+std::vector<oneapi::tbb::core_type_id> core_types = oneapi::tbb::info::core_types();
+#+end_src
+
+This lack of valid HW topology, caused by the absence of a third-party library,
+is the major problem with the current oneTBB behavior. The problem lies in the
+lack of diagnostics making it difficult for developers to detect. As a result,
+the code continues to run but fails to use NUMA as intended.
+
+Dependency on a shared HWLOC library has the following benefits:
+1. Code reuse with all of the positive consequences out of this, including
+   relying on the same code that has been tested and debugged, allowing the OS
+   to share it among different processes, which consequently improves on cache
+   locality and memory footprint. That's the primary purpose of shared
+   libraries.
+2. A drop-in replacement. Users are able to use their own version of HWLOC
+   without recompilation of oneTBB. This specific version of HWLOC could include
+   a hotfix to support a particular and/or new hardware that a customer has, but
+   whose support is not yet upstreamed to HWLOC project. It is also possible
+   that such support won't be upstreamed at all if that hardware is not going to
+   be available for massive users. It could also be a development version of
+   HWLOC that someone wants to test on their systems first. Of course, they can
+   do it with the static version as well, but that's more cumbersome as it
+   requires recompilation of every dependent component.
+
+The only disadvantage from depending on HWLOC library dynamically is that the
+developers that use oneTBB's NUMA support API need to make sure the library is
+available and can be found by oneTBB. Depending on the distribution model of a
+developer's code, this is achieved either by:
+1. Asking the end user to have necessary version of a dependency pre-installed.
+2. Bundling necessary HWLOC version together with other pieces of a product
+   release.
+
+However, the requirement to fulfill one of the above steps for the NUMA API to
+start paying off may be considered as an incovenience and, what is more
+important, it is not always obvious that one of these steps is needed.
+Especially, due to silent behavior in case HWLOC library cannot be found in the
+environment.
+
+The proposal is to reduce the effect of the disadvantage of relying on a dynamic
+HWLOC library. The improvements involve statically linking HWLOC with one of the
+~tbbbind~ libraries distributed together with oneTBB. At the same time, you
+retain the flexibility to specify different version of HWLOC library if needed.
+
+Since HWLOC 1.x is an older version and modern operating systems install HWLOC
+2.x by default, the probability of users being restricted to HWLOC 1.x is
+relatively small. Thus, we can reuse the filename of the ~tbbbind~ library
+linked to HWLOC 1.x for the library linked against a static HWLOC 2.x.
+
+* Proposal
+1. Replace the dynamic link of ~tbbbind~ library currently linked
+   against HWLOC 1.x with a link to a static HWLOC library version 2.x.
+2. Add loading of that ~tbbbind~ variant as the last attempt to resolve the
+   dependency on functionality provided by the ~tbbbind~ layer.
+3. Update the oneTBB documentation, including
+   [[https://uxlfoundation.github.io/oneTBB/search.html?q=tbb%3A%3Ainfo][these
+   pages]], to detail the steps for identifying which ~tbbbind~ is being used.
+
+** Advantages
+1. The proposed behavior introduces a fallback mechanism for resolving the HWLOC
+   library dependency when it is not in the environment, while still preferring
+   user-provided versions. As a result, the problematic oneTBB API usage works
+   as expected, returning an enumerated list of actual NUMA nodes and core types
+   on the system the code is running on, provided that the loaded HWLOC library
+   works on that system and that an application properly distributes all
+   binaries of oneTBB, sets the environment so that the necessary variant of
+   ~tbbbind~ library can be found and loaded.
+2. Dropping support for HWLOC 1.x, does not introduce an additional ~tbbbind~
+   variant while maintaining support for widely used versions of HWLOC.
+
+** Disadvantages
+By default, there is still no diagnostics if you fail to correctly setup an
+environment with your version of HWLOC. Although, specifying the ~TBB_VERSION=1~
+environment variable helps identify configuration issues quickly.
+
+* Alternative Handling for Missing System Topology
+The other behavior in case HWLOC library cannot be found is to be more explicit
+about the problem of a missing component and to either issue a warning or to
+refuse working requiring one of the ~tbbbind~ variant to be loaded (e.g., throw
+an exception).
+
+Comparing these alternative approaches to the one proposed.
+** Common Advantages
+- Explicitly indicates that the functionality being used does not work, instead
+  of failing silently.
+- Avoids the need to distribute an additional variant of ~tbbbind~ library.
+
+** Common Disadvantages
+- Requires additional step from the user side to resolve the problem. In other
+  words, it does not provide complete solution to the problem.
+
+*** Disadvantages of Issuing a Warning
+- The warning may be unnoticed, especially if standard streams are closed.
+
+*** Disadvantages of Throwing an Exception
+- May break existing code that does not expect an exception to be thrown.
+- Requires introduction of an additional exception hierarchy.
+
+* References
+1. [[https://www.open-mpi.org/projects/hwloc/][HWLOC project main page]]
+2. [[https://github.com/open-mpi/hwloc][HWLOC project repository on GitHub]]
diff --git a/external/tbb/rfcs/supported/README.md b/external/tbb/rfcs/supported/README.md
new file mode 100644
index 00000000..ebbb3515
--- /dev/null
+++ b/external/tbb/rfcs/supported/README.md
@@ -0,0 +1,11 @@
+# Design Documents for Supported Features
+
+Supported proposals describe extensions implemented and
+released as fully supported features of the oneTBB library. A fully supported
+feature has a high-quality implementation. If the proposal impacted the
+public API of the library, it should appear in the oneTBB specification and
+have supporting documentation in the oneTBB Reference as needed. A fully 
+supported feature is regularly tested.
+
+Proposals that appear in `rfcs/supported` may be retained indefinitely to
+provide insight into the design of existing features.
diff --git a/external/tbb/rfcs/template.md b/external/tbb/rfcs/template.md
new file mode 100644
index 00000000..834840a5
--- /dev/null
+++ b/external/tbb/rfcs/template.md
@@ -0,0 +1,56 @@
+# Descriptive Name for the Proposal
+
+## Introduction
+
+Short description of the idea proposed with explained motivation. 
+
+The motivation could be:
+- Improved users experience for API changes and extensions. Code snippets to
+  showcase the benefits would be nice here.
+- Performance improvements with the data, if available.
+- Improved engineering practices.
+
+Introduction may also include any additional information that sheds light on
+the proposal, such as history of the matter, links to relevant issues and
+discussions, etc.
+
+## Proposal
+
+A full and detailed description of the proposal with highlighted consequences.
+
+Depending on the kind of the proposal, the description should cover:
+
+- New use cases supported by the extension.
+- The expected performance benefit for a modification. 
+- The interface of extensions including class definitions or function 
+declarations.
+
+A proposal should clearly outline the alternatives that were considered, 
+along with their pros and cons. Each alternative should be clearly separated 
+to make discussions easier to follow.
+
+Pay close attention to the following aspects of the library:
+- API and ABI backward compatibility. The library follows semantic versioning
+  so if any of those interfaces are to be broken, the RFC needs to state that
+  explicitly.
+- Performance implications, as performance is one of the main goals of the library.
+- Changes to the build system. While the library's primary building system is
+  CMake, there are some frameworks that may build the library directly from the sources.
+- Dependencies and support matrix: does the proposal bring any new
+  dependencies or affect the supported configurations?
+
+Some other common subsections here are:
+- Discussion: some people like to list all the options first (as separate
+  subsections), and then have a dedicated section with the discussion.
+- List of the proposed API and examples of its usage.
+- Testing aspects.
+- Short explanation and links to the related sub-proposals, if any. Such
+  sub-proposals could be organized as separate standalone RFCs, but this is
+  not mandatory. If the change is insignificant or doesn't make any sense
+  without the original proposal, you can have it in the RFC.
+- Execution plan (next steps), if approved.
+
+## Open Questions
+
+For new proposals (i.e., those in the `rfcs/proposed` directory), list any
+open questions.
diff --git a/external/tbb/src/tbb/CMakeLists.txt b/external/tbb/src/tbb/CMakeLists.txt
index 80fdcdcd..8c84a0b2 100644
--- a/external/tbb/src/tbb/CMakeLists.txt
+++ b/external/tbb/src/tbb/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Intel Corporation
+# Copyright (c) 2020-2024 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@ add_library(tbb
     itt_notify.cpp
     main.cpp
     market.cpp
+    tcm_adaptor.cpp
     misc.cpp
     misc_ex.cpp
     observer_proxy.cpp
@@ -39,12 +40,16 @@ add_library(tbb
     task.cpp
     task_dispatcher.cpp
     task_group_context.cpp
+    thread_dispatcher.cpp
+    thread_request_serializer.cpp
+    threading_control.cpp
     version.cpp
     queuing_rw_mutex.cpp)
 
 add_library(TBB::tbb ALIAS tbb)
 
 if (WIN32)
+    target_sources(tbb PRIVATE tbb.rc)
     set_target_properties(tbb PROPERTIES OUTPUT_NAME "tbb${TBB_BINARY_VERSION}")
 endif()
 
@@ -55,10 +60,11 @@ target_compile_definitions(tbb
                            $<$<CONFIG:DEBUG>:TBB_USE_DEBUG>
                            PRIVATE
                            __TBB_BUILD
+                           ${TBB_RESUMABLE_TASKS_USE_THREADS}
                            $<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:__TBB_DYNAMIC_LOAD_ENABLED=0>
                            $<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:__TBB_SOURCE_DIRECTLY_INCLUDED=1>)
 
-if (NOT ("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "(armv7-a|aarch64|mips|arm64)" OR
+if (NOT ("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "(armv7-a|aarch64|mips|arm64|riscv)" OR
          "${CMAKE_OSX_ARCHITECTURES}" MATCHES "arm64" OR
          WINDOWS_STORE OR
          TBB_WINDOWS_DRIVER))
@@ -79,7 +85,6 @@ target_compile_options(tbb
     ${TBB_WARNING_SUPPRESS}
     ${TBB_LIB_COMPILE_FLAGS}
     ${TBB_COMMON_COMPILE_FLAGS}
-    ${TBB_IPO_COMPILE_FLAGS}
 )
 
 # Avoid use of target_link_libraries here as it changes /DEF option to \DEF on Windows.
@@ -89,10 +94,12 @@ set_target_properties(tbb PROPERTIES
     SOVERSION ${TBB_BINARY_VERSION}
 )
 
+tbb_handle_ipo(tbb)
+
 if (TBB_DEF_FILE_PREFIX) # If there's no prefix, assume we're using export directives
     set_target_properties(tbb PROPERTIES
-        LINK_FLAGS ${TBB_LINK_DEF_FILE_FLAG}${CMAKE_CURRENT_SOURCE_DIR}/def/${TBB_DEF_FILE_PREFIX}-tbb.def
-        LINK_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/def/${TBB_DEF_FILE_PREFIX}-tbb.def
+        LINK_FLAGS "${TBB_LINK_DEF_FILE_FLAG}\"${CMAKE_CURRENT_SOURCE_DIR}/def/${TBB_DEF_FILE_PREFIX}-tbb.def\""
+        LINK_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/def/${TBB_DEF_FILE_PREFIX}-tbb.def"
     )
 endif()
 
@@ -103,14 +110,12 @@ if (COMMAND target_link_options)
         PRIVATE
         ${TBB_LIB_LINK_FLAGS}
         ${TBB_COMMON_LINK_FLAGS}
-        ${TBB_IPO_LINK_FLAGS}
     )
 else()
     target_link_libraries(tbb
         PRIVATE
         ${TBB_LIB_LINK_FLAGS}
         ${TBB_COMMON_LINK_FLAGS}
-        ${TBB_IPO_LINK_FLAGS}
     )
 endif()
 
@@ -121,59 +126,96 @@ target_link_libraries(tbb
     ${TBB_COMMON_LINK_LIBS}
 )
 
-tbb_install_target(tbb)
-
-if (WIN32)
-    # Create a copy of target linker file (tbb<ver>[_debug].lib) with legacy name (tbb[_debug].lib)
-    # to support previous user experience for linkage.
-    install(FILES
-            $<TARGET_LINKER_FILE:tbb>
-            DESTINATION lib
-            CONFIGURATIONS RelWithDebInfo Release MinSizeRel
-            RENAME tbb.lib
-            COMPONENT devel
-    )
-
-    install(FILES
-            $<TARGET_LINKER_FILE:tbb>
-            DESTINATION lib
-            CONFIGURATIONS Debug
-            RENAME tbb_debug.lib
-            COMPONENT devel
-    )
+# Strip debug symbols into a separate .dbg file
+if(TBB_LINUX_SEPARATE_DBG)
+    if(NOT CMAKE_BUILD_TYPE STREQUAL "release")
+        find_program(OBJCOPY_COMMAND objcopy)
+        if(NOT OBJCOPY_COMMAND)
+            message(WARNING "objcopy command not found in the system")
+        else()
+            add_custom_command(TARGET tbb POST_BUILD
+                COMMAND objcopy --only-keep-debug $<TARGET_FILE:tbb> $<TARGET_FILE:tbb>.dbg
+                COMMAND objcopy --strip-debug $<TARGET_FILE:tbb>
+                COMMAND objcopy --add-gnu-debuglink=$<TARGET_FILE:tbb>.dbg $<TARGET_FILE:tbb>
+                COMMENT "Creating and associating .dbg file with tbb"
+            )
+        endif()
+    else()
+        message(WARNING " TBB_LINUX_SEPARATE_DBG flag is not used on release config")
+    endif()
 endif()
 
-set(_tbb_pc_lib_name tbb)
-
-if (WIN32)
-    set(_tbb_pc_lib_name ${_tbb_pc_lib_name}${TBB_BINARY_VERSION})
-endif()
-
-if (CMAKE_SIZEOF_VOID_P EQUAL 8)
-    set(TBB_PC_NAME tbb)
-else()
-    set(TBB_PC_NAME tbb32)
+if(TBB_BUILD_APPLE_FRAMEWORKS)
+    set_target_properties(tbb PROPERTIES
+        FRAMEWORK TRUE
+        FRAMEWORK_VERSION ${TBB_BINARY_VERSION}.${TBB_BINARY_MINOR_VERSION}
+        XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER com.intel.tbb
+        MACOSX_FRAMEWORK_IDENTIFIER com.intel.tbb
+        MACOSX_FRAMEWORK_BUNDLE_VERSION ${TBB_BINARY_VERSION}.${TBB_BINARY_MINOR_VERSION}
+        MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${TBB_BINARY_VERSION})
 endif()
 
-set(_prefix_for_pc_file "${CMAKE_INSTALL_PREFIX}")
-
-if (IS_ABSOLUTE "${CMAKE_INSTALL_LIBDIR}")
-    set(_libdir_for_pc_file "${CMAKE_INSTALL_LIBDIR}")
-else()
-    set(_libdir_for_pc_file "\${prefix}/${CMAKE_INSTALL_LIBDIR}")
-endif()
+tbb_install_target(tbb)
 
-if (IS_ABSOLUTE "${CMAKE_INSTALL_INCLUDEDIR}")
-    set(_includedir_for_pc_file "${CMAKE_INSTALL_INCLUDEDIR}")
-else()
-    set(_includedir_for_pc_file "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
+if (TBB_INSTALL)
+    if (MSVC)
+        # Create a copy of target linker file (tbb<ver>[_debug].lib) with legacy name (tbb[_debug].lib)
+        # to support previous user experience for linkage.
+        install(FILES
+                $<TARGET_LINKER_FILE:tbb>
+                DESTINATION lib
+                CONFIGURATIONS RelWithDebInfo Release MinSizeRel
+                RENAME tbb.lib
+                COMPONENT devel
+        )
+
+        install(FILES
+                $<TARGET_LINKER_FILE:tbb>
+                DESTINATION lib
+                CONFIGURATIONS Debug
+                RENAME tbb_debug.lib
+                COMPONENT devel
+        )
+    endif()
+    if(TBB_LINUX_SEPARATE_DBG)
+        install(FILES
+                $<TARGET_FILE:tbb>.dbg
+                DESTINATION lib
+                COMPONENT devel
+        )
+    endif()
+    set(_tbb_pc_lib_name tbb)
+
+    if (WIN32)
+        set(_tbb_pc_lib_name ${_tbb_pc_lib_name}${TBB_BINARY_VERSION})
+    endif()
+
+    if (CMAKE_SIZEOF_VOID_P EQUAL 8)
+        set(TBB_PC_NAME tbb)
+    else()
+        set(TBB_PC_NAME tbb32)
+    endif()
+
+    set(_prefix_for_pc_file "${CMAKE_INSTALL_PREFIX}")
+
+    if (IS_ABSOLUTE "${CMAKE_INSTALL_LIBDIR}")
+        set(_libdir_for_pc_file "${CMAKE_INSTALL_LIBDIR}")
+    else()
+        set(_libdir_for_pc_file "\${prefix}/${CMAKE_INSTALL_LIBDIR}")
+    endif()
+
+    if (IS_ABSOLUTE "${CMAKE_INSTALL_INCLUDEDIR}")
+        set(_includedir_for_pc_file "${CMAKE_INSTALL_INCLUDEDIR}")
+    else()
+        set(_includedir_for_pc_file "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
+    endif()
+
+    configure_file(${PROJECT_SOURCE_DIR}/integration/pkg-config/tbb.pc.in ${CMAKE_CURRENT_BINARY_DIR}/${TBB_PC_NAME}.pc @ONLY)
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${TBB_PC_NAME}.pc
+            DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig/
+            COMPONENT devel)
 endif()
 
-configure_file(${PROJECT_SOURCE_DIR}/integration/pkg-config/tbb.pc.in ${CMAKE_CURRENT_BINARY_DIR}/${TBB_PC_NAME}.pc @ONLY)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${TBB_PC_NAME}.pc
-        DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig/
-        COMPONENT devel)
-
 if (COMMAND tbb_gen_vars)
     tbb_gen_vars(tbb)
 endif()
diff --git a/external/tbb/src/tbb/address_waiter.cpp b/external/tbb/src/tbb/address_waiter.cpp
index e6f40bf3..1fd3dea8 100644
--- a/external/tbb/src/tbb/address_waiter.cpp
+++ b/external/tbb/src/tbb/address_waiter.cpp
@@ -14,87 +14,93 @@
     limitations under the License.
 */
 
-#include "concurrent_monitor.h"
-#include "governor.h"
 #include "oneapi/tbb/detail/_utils.h"
+#include "governor.h"
+#include "concurrent_monitor.h"
 #include "oneapi/tbb/detail/_waitable_atomic.h"
 
 #include <type_traits>
 
 namespace tbb {
-    namespace detail {
-        namespace r1 {
-
-            struct address_context {
-                address_context() = default;
-
-                address_context(void* address, std::uintptr_t context)
-                    : my_address(address), my_context(context) {}
-
-                void* my_address {nullptr};
-                std::uintptr_t my_context {0};
-            };
-
-            class address_waiter : public concurrent_monitor_base<address_context> {
-                using base_type = concurrent_monitor_base<address_context>;
-
-            public:
-                using base_type::base_type;
-                /** per-thread descriptor for concurrent_monitor */
-                using thread_context = sleep_node<address_context>;
-            };
-
-            // 1024 is a rough estimate based on two assumptions:
-            //   1) there are no more than 1000 threads in the application;
-            //   2) the mutexes are optimized for short critical sections less than a couple of microseconds,
-            //      which is less than 1/1000 of a time slice.
-            // In the worst case, we have single mutex that is locked and its thread is preempted.
-            // Therefore, the probability of a collision while taking unrelated mutex is about 1/size of a table.
-            static constexpr std::size_t num_address_waiters = 2 << 10;
-            static_assert(std::is_standard_layout<address_waiter>::value,
-                          "address_waiter must be with standard layout");
-            static address_waiter address_waiter_table[num_address_waiters];
-
-            void clear_address_waiter_table() {
-                for (std::size_t i = 0; i < num_address_waiters; ++i) { address_waiter_table[i].destroy(); }
-            }
-
-            static address_waiter& get_address_waiter(void* address) {
-                std::uintptr_t tag = std::uintptr_t(address);
-                return address_waiter_table[((tag >> 5) ^ tag) % num_address_waiters];
-            }
-
-            void wait_on_address(void* address, d1::delegate_base& predicate, std::uintptr_t context) {
-                address_waiter& waiter = get_address_waiter(address);
-                waiter.wait<address_waiter::thread_context>(predicate, address_context {address, context});
-            }
-
-            void notify_by_address(void* address, std::uintptr_t target_context) {
-                address_waiter& waiter = get_address_waiter(address);
-
-                auto predicate = [address, target_context](address_context ctx) {
-                    return ctx.my_address == address && ctx.my_context == target_context;
-                };
-
-                waiter.notify_relaxed(predicate);
-            }
-
-            void notify_by_address_one(void* address) {
-                address_waiter& waiter = get_address_waiter(address);
-
-                auto predicate = [address](address_context ctx) { return ctx.my_address == address; };
-
-                waiter.notify_one_relaxed(predicate);
-            }
-
-            void notify_by_address_all(void* address) {
-                address_waiter& waiter = get_address_waiter(address);
-
-                auto predicate = [address](address_context ctx) { return ctx.my_address == address; };
-
-                waiter.notify_relaxed(predicate);
-            }
-
-        }// namespace r1
-    }    // namespace detail
-}// namespace tbb
+namespace detail {
+namespace r1 {
+
+struct address_context {
+    address_context() = default;
+
+    address_context(void* address, std::uintptr_t context) :
+        my_address(address), my_context(context)
+    {}
+
+    void* my_address{nullptr};
+    std::uintptr_t my_context{0};
+};
+
+class address_waiter : public concurrent_monitor_base<address_context> {
+    using base_type = concurrent_monitor_base<address_context>;
+public:
+    using base_type::base_type;
+    /** per-thread descriptor for concurrent_monitor */
+    using thread_context = sleep_node<address_context>;
+};
+
+// 1024 is a rough estimate based on two assumptions:
+//   1) there are no more than 1000 threads in the application;
+//   2) the mutexes are optimized for short critical sections less than a couple of microseconds,
+//      which is less than 1/1000 of a time slice.
+// In the worst case, we have single mutex that is locked and its thread is preempted.
+// Therefore, the probability of a collision while taking unrelated mutex is about 1/size of a table.
+static constexpr std::size_t num_address_waiters = 2 << 10;
+static_assert(std::is_standard_layout<address_waiter>::value,
+              "address_waiter must be with standard layout");
+static address_waiter address_waiter_table[num_address_waiters];
+
+void clear_address_waiter_table() {
+    for (std::size_t i = 0; i < num_address_waiters; ++i) {
+        address_waiter_table[i].destroy();
+    }
+}
+
+static address_waiter& get_address_waiter(void* address) {
+    std::uintptr_t tag = std::uintptr_t(address);
+    return address_waiter_table[((tag >> 5) ^ tag) % num_address_waiters];
+}
+
+void wait_on_address(void* address, d1::delegate_base& predicate, std::uintptr_t context) {
+    address_waiter& waiter = get_address_waiter(address);
+    waiter.wait<address_waiter::thread_context>(predicate, address_context{address, context});
+}
+
+void notify_by_address(void* address, std::uintptr_t target_context) {
+    address_waiter& waiter = get_address_waiter(address);
+
+    auto predicate = [address, target_context] (address_context ctx) {
+        return ctx.my_address == address && ctx.my_context == target_context;
+    };
+
+    waiter.notify_relaxed(predicate);
+}
+
+void notify_by_address_one(void* address) {
+    address_waiter& waiter = get_address_waiter(address);
+
+    auto predicate = [address] (address_context ctx) {
+        return ctx.my_address == address;
+    };
+
+    waiter.notify_one_relaxed(predicate);
+}
+
+void notify_by_address_all(void* address) {
+    address_waiter& waiter = get_address_waiter(address);
+
+    auto predicate = [address] (address_context ctx) {
+        return ctx.my_address == address;
+    };
+
+    waiter.notify_relaxed(predicate);
+}
+
+} // namespace r1
+} // namespace detail
+} // namespace tbb
diff --git a/external/tbb/src/tbb/allocator.cpp b/external/tbb/src/tbb/allocator.cpp
index 93b7cdab..689c5125 100644
--- a/external/tbb/src/tbb/allocator.cpp
+++ b/external/tbb/src/tbb/allocator.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -16,22 +16,40 @@
 
 #include "oneapi/tbb/version.h"
 
-#include "oneapi/tbb/cache_aligned_allocator.h"
-#include "oneapi/tbb/detail/_assert.h"
 #include "oneapi/tbb/detail/_exception.h"
+#include "oneapi/tbb/detail/_assert.h"
 #include "oneapi/tbb/detail/_utils.h"
-#include "oneapi/tbb/tbb_allocator.h"// Is this OK?
+#include "oneapi/tbb/tbb_allocator.h" // Is this OK?
+#include "oneapi/tbb/cache_aligned_allocator.h"
 
 #include "dynamic_link.h"
 #include "misc.h"
 
 #include <cstdlib>
 
-#if _WIN32 || _WIN64
-#include <Windows.h>
+#ifdef _WIN32
+#include <windows.h>
 #else
 #include <dlfcn.h>
-#endif /* _WIN32||_WIN64 */
+#endif
+
+#if (!defined(_WIN32) && !defined(_WIN64)) || defined(__CYGWIN__)
+#include <stdlib.h> // posix_memalign, free
+// With glibc, uClibc and musl on Linux and bionic on Android it is safe to use memalign(), as the allocated memory
+// can be freed with free(). It is also better to use memalign() since posix_memalign() is just a wrapper on top of
+// memalign() and it offers nothing but overhead due to inconvenient interface. This is likely the case with other
+// standard libraries as well, and more libraries can be added to the preprocessor check below. Unfortunately, we
+// can't detect musl, so we simply enable memalign() on Linux and Android in general.
+#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__ANDROID__)
+#include <malloc.h> // memalign
+#define __TBB_USE_MEMALIGN
+#else
+#define __TBB_USE_POSIX_MEMALIGN
+#endif
+#elif defined(_MSC_VER) || defined(__MINGW32__)
+#include <malloc.h> // _aligned_malloc, _aligned_free
+#define __TBB_USE_MSVC_ALIGNED_MALLOC
+#endif
 
 #if __TBB_WEAK_SYMBOLS_PRESENT
 
@@ -41,54 +59,54 @@
 #pragma weak scalable_aligned_free
 
 extern "C" {
-void* scalable_malloc(std::size_t);
-void scalable_free(void*);
-void* scalable_aligned_malloc(std::size_t, std::size_t);
-void scalable_aligned_free(void*);
+    void* scalable_malloc(std::size_t);
+    void  scalable_free(void*);
+    void* scalable_aligned_malloc(std::size_t, std::size_t);
+    void  scalable_aligned_free(void*);
 }
 
 #endif /* __TBB_WEAK_SYMBOLS_PRESENT */
 
 namespace tbb {
-    namespace detail {
-        namespace r1 {
+namespace detail {
+namespace r1 {
 
-            //! Initialization routine used for first indirect call via allocate_handler.
-            static void* initialize_allocate_handler(std::size_t size);
+//! Initialization routine used for first indirect call via allocate_handler.
+static void* initialize_allocate_handler(std::size_t size);
 
-            //! Handler for memory allocation
-            using allocate_handler_type = void* (*) (std::size_t size);
-            static std::atomic<allocate_handler_type> allocate_handler {&initialize_allocate_handler};
-            allocate_handler_type allocate_handler_unsafe = nullptr;
+//! Handler for memory allocation
+using allocate_handler_type = void* (*)(std::size_t size);
+static std::atomic<allocate_handler_type> allocate_handler{ &initialize_allocate_handler };
+allocate_handler_type allocate_handler_unsafe = nullptr;
 
-            //! Handler for memory deallocation
-            static void (*deallocate_handler)(void* pointer) = nullptr;
+//! Handler for memory deallocation
+static void  (*deallocate_handler)(void* pointer) = nullptr;
 
-            //! Initialization routine used for first indirect call via cache_aligned_allocate_handler.
-            static void* initialize_cache_aligned_allocate_handler(std::size_t n, std::size_t alignment);
+//! Initialization routine used for first indirect call via cache_aligned_allocate_handler.
+static void* initialize_cache_aligned_allocate_handler(std::size_t n, std::size_t alignment);
 
-            //! Allocates memory using standard malloc. It is used when scalable_allocator is not available
-            static void* std_cache_aligned_allocate(std::size_t n, std::size_t alignment);
+//! Allocates overaligned memory using standard memory allocator. It is used when scalable_allocator is not available.
+static void* std_cache_aligned_allocate(std::size_t n, std::size_t alignment);
 
-            //! Allocates memory using standard free. It is used when scalable_allocator is not available
-            static void std_cache_aligned_deallocate(void* p);
+//! Deallocates overaligned memory using standard memory allocator. It is used when scalable_allocator is not available.
+static void  std_cache_aligned_deallocate(void* p);
 
-            //! Handler for padded memory allocation
-            using cache_aligned_allocate_handler_type = void* (*) (std::size_t n, std::size_t alignment);
-            static std::atomic<cache_aligned_allocate_handler_type> cache_aligned_allocate_handler {
-                    &initialize_cache_aligned_allocate_handler};
-            cache_aligned_allocate_handler_type cache_aligned_allocate_handler_unsafe = nullptr;
+//! Handler for padded memory allocation
+using cache_aligned_allocate_handler_type = void* (*)(std::size_t n, std::size_t alignment);
+static std::atomic<cache_aligned_allocate_handler_type> cache_aligned_allocate_handler{ &initialize_cache_aligned_allocate_handler };
+cache_aligned_allocate_handler_type cache_aligned_allocate_handler_unsafe = nullptr;
 
-            //! Handler for padded memory deallocation
-            static void (*cache_aligned_deallocate_handler)(void* p) = nullptr;
+//! Handler for padded memory deallocation
+static void (*cache_aligned_deallocate_handler)(void* p) = nullptr;
+
+//! Table describing how to link the handlers.
+static const dynamic_link_descriptor MallocLinkTable[] = {
+    DLD(scalable_malloc, allocate_handler_unsafe),
+    DLD(scalable_free, deallocate_handler),
+    DLD(scalable_aligned_malloc, cache_aligned_allocate_handler_unsafe),
+    DLD(scalable_aligned_free, cache_aligned_deallocate_handler),
+};
 
-            //! Table describing how to link the handlers.
-            static const dynamic_link_descriptor MallocLinkTable[] = {
-                    DLD(scalable_malloc, allocate_handler_unsafe),
-                    DLD(scalable_free, deallocate_handler),
-                    DLD(scalable_aligned_malloc, cache_aligned_allocate_handler_unsafe),
-                    DLD(scalable_aligned_free, cache_aligned_deallocate_handler),
-            };
 
 #if TBB_USE_DEBUG
 #define DEBUG_SUFFIX "_debug"
@@ -97,150 +115,174 @@ namespace tbb {
 #endif /* TBB_USE_DEBUG */
 
 // MALLOCLIB_NAME is the name of the oneTBB memory allocator library.
-#if _WIN32 || _WIN64
+#if _WIN32||_WIN64
 #define MALLOCLIB_NAME "tbbmalloc" DEBUG_SUFFIX ".dll"
 #elif __APPLE__
-#define MALLOCLIB_NAME "libtbbmalloc" DEBUG_SUFFIX ".dylib"
+#define MALLOCLIB_NAME "libtbbmalloc" DEBUG_SUFFIX ".2.dylib"
 #elif __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __sun || _AIX || __ANDROID__
 #define MALLOCLIB_NAME "libtbbmalloc" DEBUG_SUFFIX ".so"
-#elif __unix__// Note that order of these #elif's is important!
+#elif __unix__  // Note that order of these #elif's is important!
 #define MALLOCLIB_NAME "libtbbmalloc" DEBUG_SUFFIX ".so.2"
 #else
 #error Unknown OS
 #endif
 
-            //! Initialize the allocation/free handler pointers.
-            /** Caller is responsible for ensuring this routine is called exactly once.
+//! Initialize the allocation/free handler pointers.
+/** Caller is responsible for ensuring this routine is called exactly once.
     The routine attempts to dynamically link with the TBB memory allocator.
     If that allocator is not found, it links to malloc and free. */
-            void initialize_handler_pointers() {
-                __TBB_ASSERT(allocate_handler == &initialize_allocate_handler, NULL);
-                bool success = dynamic_link(MALLOCLIB_NAME, MallocLinkTable, 4);
-                if (!success) {
-                    // If unsuccessful, set the handlers to the default routines.
-                    // This must be done now, and not before FillDynamicLinks runs, because if other
-                    // threads call the handlers, we want them to go through the DoOneTimeInitializations logic,
-                    // which forces them to wait.
-                    allocate_handler_unsafe = &std::malloc;
-                    deallocate_handler = &std::free;
-                    cache_aligned_allocate_handler_unsafe = &std_cache_aligned_allocate;
-                    cache_aligned_deallocate_handler = &std_cache_aligned_deallocate;
-                }
-
-                allocate_handler.store(allocate_handler_unsafe, std::memory_order_release);
-                cache_aligned_allocate_handler.store(cache_aligned_allocate_handler_unsafe,
-                                                     std::memory_order_release);
-
-                PrintExtraVersionInfo("ALLOCATOR", success ? "scalable_malloc" : "malloc");
-            }
-
-            static std::once_flag initialization_state;
-            void initialize_cache_aligned_allocator() {
-                std::call_once(initialization_state, &initialize_handler_pointers);
-            }
-
-            //! Executed on very first call through allocate_handler
-            static void* initialize_allocate_handler(std::size_t size) {
-                initialize_cache_aligned_allocator();
-                __TBB_ASSERT(allocate_handler != &initialize_allocate_handler, NULL);
-                return (*allocate_handler)(size);
-            }
-
-            //! Executed on very first call through cache_aligned_allocate_handler
-            static void* initialize_cache_aligned_allocate_handler(std::size_t bytes, std::size_t alignment) {
-                initialize_cache_aligned_allocator();
-                __TBB_ASSERT(cache_aligned_allocate_handler != &initialize_cache_aligned_allocate_handler,
-                             NULL);
-                return (*cache_aligned_allocate_handler)(bytes, alignment);
-            }
-
-            // TODO: use CPUID to find actual line size, though consider backward compatibility
-            // nfs - no false sharing
-            static constexpr std::size_t nfs_size = 128;
-
-            std::size_t __TBB_EXPORTED_FUNC cache_line_size() { return nfs_size; }
-
-            void* __TBB_EXPORTED_FUNC cache_aligned_allocate(std::size_t size) {
-                const std::size_t cache_line_size = nfs_size;
-                __TBB_ASSERT(is_power_of_two(cache_line_size), "must be power of two");
-
-                // Check for overflow
-                if (size + cache_line_size < size) { throw_exception(exception_id::bad_alloc); }
-                // scalable_aligned_malloc considers zero size request an error, and returns NULL
-                if (size == 0) size = 1;
-
-                void* result = cache_aligned_allocate_handler.load(std::memory_order_acquire)(
-                        size, cache_line_size);
-                if (!result) { throw_exception(exception_id::bad_alloc); }
-                __TBB_ASSERT(is_aligned(result, cache_line_size), "The returned address isn't aligned");
-                return result;
-            }
-
-            void __TBB_EXPORTED_FUNC cache_aligned_deallocate(void* p) {
-                __TBB_ASSERT(cache_aligned_deallocate_handler, "Initialization has not been yet.");
-                (*cache_aligned_deallocate_handler)(p);
-            }
-
-            static void* std_cache_aligned_allocate(std::size_t bytes, std::size_t alignment) {
-                // TODO: make it common with cache_aligned_resource
-                std::size_t space = alignment + bytes;
-                std::uintptr_t base = reinterpret_cast<std::uintptr_t>(std::malloc(space));
-                if (!base) { return nullptr; }
-                std::uintptr_t result = (base + nfs_size) & ~(nfs_size - 1);
-                // Round up to the next cache line (align the base address)
-                __TBB_ASSERT((result - base) >= sizeof(std::uintptr_t),
-                             "Cannot store a base pointer to the header");
-                __TBB_ASSERT(space - (result - base) >= bytes, "Not enough space for the storage");
-
-                // Record where block actually starts.
-                (reinterpret_cast<std::uintptr_t*>(result))[-1] = base;
-                return reinterpret_cast<void*>(result);
-            }
-
-            static void std_cache_aligned_deallocate(void* p) {
-                if (p) {
-                    __TBB_ASSERT(reinterpret_cast<std::uintptr_t>(p) >= 0x4096,
-                                 "attempt to free block not obtained from cache_aligned_allocator");
-                    // Recover where block actually starts
-                    std::uintptr_t base = (reinterpret_cast<std::uintptr_t*>(p))[-1];
-                    __TBB_ASSERT(((base + nfs_size) & ~(nfs_size - 1)) == reinterpret_cast<std::uintptr_t>(p),
-                                 "Incorrect alignment or not allocated by std_cache_aligned_deallocate?");
-                    std::free(reinterpret_cast<void*>(base));
-                }
-            }
-
-            void* __TBB_EXPORTED_FUNC allocate_memory(std::size_t size) {
-                void* result = allocate_handler.load(std::memory_order_acquire)(size);
-                if (!result) { throw_exception(exception_id::bad_alloc); }
-                return result;
-            }
-
-            void __TBB_EXPORTED_FUNC deallocate_memory(void* p) {
-                if (p) {
-                    __TBB_ASSERT(deallocate_handler, "Initialization has not been yet.");
-                    (*deallocate_handler)(p);
-                }
-            }
-
-            bool __TBB_EXPORTED_FUNC is_tbbmalloc_used() {
-                auto handler_snapshot = allocate_handler.load(std::memory_order_acquire);
-                if (handler_snapshot == &initialize_allocate_handler) {
-                    initialize_cache_aligned_allocator();
-                }
-                handler_snapshot = allocate_handler.load(std::memory_order_relaxed);
-                __TBB_ASSERT(handler_snapshot != &initialize_allocate_handler
-                                     && deallocate_handler != nullptr,
-                             NULL);
-                // Cast to void avoids type mismatch errors on some compilers (e.g. __IBMCPP__)
-                __TBB_ASSERT(
-                        (reinterpret_cast<void*>(handler_snapshot) == reinterpret_cast<void*>(&std::malloc))
-                                == (reinterpret_cast<void*>(deallocate_handler)
-                                    == reinterpret_cast<void*>(&std::free)),
-                        "Both shim pointers must refer to routines from the same package (either TBB or "
-                        "CRT)");
-                return reinterpret_cast<void*>(handler_snapshot) == reinterpret_cast<void*>(&std::malloc);
-            }
-
-        }// namespace r1
-    }    // namespace detail
-}// namespace tbb
+void initialize_handler_pointers() {
+    __TBB_ASSERT(allocate_handler == &initialize_allocate_handler, nullptr);
+    bool success = dynamic_link(MALLOCLIB_NAME, MallocLinkTable, 4);
+    if(!success) {
+        // If unsuccessful, set the handlers to the default routines.
+        // This must be done now, and not before FillDynamicLinks runs, because if other
+        // threads call the handlers, we want them to go through the DoOneTimeInitializations logic,
+        // which forces them to wait.
+        allocate_handler_unsafe = &std::malloc;
+        deallocate_handler = &std::free;
+        cache_aligned_allocate_handler_unsafe = &std_cache_aligned_allocate;
+        cache_aligned_deallocate_handler = &std_cache_aligned_deallocate;
+    }
+
+    allocate_handler.store(allocate_handler_unsafe, std::memory_order_release);
+    cache_aligned_allocate_handler.store(cache_aligned_allocate_handler_unsafe, std::memory_order_release);
+
+    PrintExtraVersionInfo( "ALLOCATOR", success?"scalable_malloc":"malloc" );
+}
+
+static std::once_flag initialization_state;
+void initialize_cache_aligned_allocator() {
+    std::call_once(initialization_state, &initialize_handler_pointers);
+}
+
+//! Executed on very first call through allocate_handler
+/** Only one of initialize_allocate_handler() and initialize_cache_aligned_allocate_handler()
+    is called, since each one of them also initializes the other.
+
+    In the current implementation of oneTBB library initialization, cache_aligned_allocate() is
+    used, which in turn calls initialize_cache_aligned_allocate_handler(). As mentioned above,
+    that also initializes the regular allocate_handler.
+
+    Therefore, initialize_allocate_handler() is not called in the current library implementation. */
+static void* initialize_allocate_handler(std::size_t size) {
+    initialize_cache_aligned_allocator();
+    __TBB_ASSERT(allocate_handler != &initialize_allocate_handler, nullptr);
+    return (*allocate_handler)(size);
+}
+
+//! Executed on very first call through cache_aligned_allocate_handler
+static void* initialize_cache_aligned_allocate_handler(std::size_t bytes, std::size_t alignment) {
+    initialize_cache_aligned_allocator();
+    __TBB_ASSERT(cache_aligned_allocate_handler != &initialize_cache_aligned_allocate_handler, nullptr);
+    return (*cache_aligned_allocate_handler)(bytes, alignment);
+}
+
+// TODO: use CPUID to find actual line size, though consider backward compatibility
+// nfs - no false sharing
+static constexpr std::size_t nfs_size = 128;
+
+std::size_t __TBB_EXPORTED_FUNC cache_line_size() {
+    return nfs_size;
+}
+
+void* __TBB_EXPORTED_FUNC cache_aligned_allocate(std::size_t size) {
+    const std::size_t cache_line_size = nfs_size;
+    __TBB_ASSERT(is_power_of_two(cache_line_size), "must be power of two");
+
+    // Check for overflow
+    if (size + cache_line_size < size) {
+        throw_exception(exception_id::bad_alloc);
+    }
+    // scalable_aligned_malloc considers zero size request an error, and returns nullptr
+    if (size == 0) size = 1;
+
+    void* result = cache_aligned_allocate_handler.load(std::memory_order_acquire)(size, cache_line_size);
+    if (!result) {
+        throw_exception(exception_id::bad_alloc);
+    }
+    __TBB_ASSERT(is_aligned(result, cache_line_size), "The returned address isn't aligned");
+    return result;
+}
+
+void __TBB_EXPORTED_FUNC cache_aligned_deallocate(void* p) {
+    __TBB_ASSERT(cache_aligned_deallocate_handler, "Initialization has not been yet.");
+    (*cache_aligned_deallocate_handler)(p);
+}
+
+static void* std_cache_aligned_allocate(std::size_t bytes, std::size_t alignment) {
+#if defined(__TBB_USE_MEMALIGN)
+    return memalign(alignment, bytes);
+#elif defined(__TBB_USE_POSIX_MEMALIGN)
+    void* p = nullptr;
+    int res = posix_memalign(&p, alignment, bytes);
+    if (res != 0)
+        p = nullptr;
+    return p;
+#elif defined(__TBB_USE_MSVC_ALIGNED_MALLOC)
+    return _aligned_malloc(bytes, alignment);
+#else
+    // TODO: make it common with cache_aligned_resource
+    std::size_t space = alignment + bytes;
+    std::uintptr_t base = reinterpret_cast<std::uintptr_t>(std::malloc(space));
+    if (!base) {
+        return nullptr;
+    }
+    std::uintptr_t result = (base + nfs_size) & ~(nfs_size - 1);
+    // Round up to the next cache line (align the base address)
+    __TBB_ASSERT((result - base) >= sizeof(std::uintptr_t), "Cannot store a base pointer to the header");
+    __TBB_ASSERT(space - (result - base) >= bytes, "Not enough space for the storage");
+
+    // Record where block actually starts.
+    (reinterpret_cast<std::uintptr_t*>(result))[-1] = base;
+    return reinterpret_cast<void*>(result);
+#endif
+}
+
+static void std_cache_aligned_deallocate(void* p) {
+#if defined(__TBB_USE_MEMALIGN) || defined(__TBB_USE_POSIX_MEMALIGN)
+    free(p);
+#elif defined(__TBB_USE_MSVC_ALIGNED_MALLOC)
+    _aligned_free(p);
+#else
+    if (p) {
+        __TBB_ASSERT(reinterpret_cast<std::uintptr_t>(p) >= 0x4096, "attempt to free block not obtained from cache_aligned_allocator");
+        // Recover where block actually starts
+        std::uintptr_t base = (reinterpret_cast<std::uintptr_t*>(p))[-1];
+        __TBB_ASSERT(((base + nfs_size) & ~(nfs_size - 1)) == reinterpret_cast<std::uintptr_t>(p), "Incorrect alignment or not allocated by std_cache_aligned_deallocate?");
+        std::free(reinterpret_cast<void*>(base));
+    }
+#endif
+}
+
+void* __TBB_EXPORTED_FUNC allocate_memory(std::size_t size) {
+    void* result = allocate_handler.load(std::memory_order_acquire)(size);
+    if (!result) {
+        throw_exception(exception_id::bad_alloc);
+    }
+    return result;
+}
+
+void __TBB_EXPORTED_FUNC deallocate_memory(void* p) {
+    if (p) {
+        __TBB_ASSERT(deallocate_handler, "Initialization has not been yet.");
+        (*deallocate_handler)(p);
+    }
+}
+
+bool __TBB_EXPORTED_FUNC is_tbbmalloc_used() {
+    auto handler_snapshot = allocate_handler.load(std::memory_order_acquire);
+    if (handler_snapshot == &initialize_allocate_handler) {
+        initialize_cache_aligned_allocator();
+    }
+    handler_snapshot = allocate_handler.load(std::memory_order_relaxed);
+    __TBB_ASSERT(handler_snapshot != &initialize_allocate_handler && deallocate_handler != nullptr, nullptr);
+    // Cast to void avoids type mismatch errors on some compilers (e.g. __IBMCPP__)
+    __TBB_ASSERT((reinterpret_cast<void*>(handler_snapshot) == reinterpret_cast<void*>(&std::malloc)) == (reinterpret_cast<void*>(deallocate_handler) == reinterpret_cast<void*>(&std::free)),
+                  "Both shim pointers must refer to routines from the same package (either TBB or CRT)");
+    return reinterpret_cast<void*>(handler_snapshot) == reinterpret_cast<void*>(&std::malloc);
+}
+
+} // namespace r1
+} // namespace detail
+} // namespace tbb
diff --git a/external/tbb/src/tbb/arena.cpp b/external/tbb/src/tbb/arena.cpp
index b2697ea9..eb91ddf5 100644
--- a/external/tbb/src/tbb/arena.cpp
+++ b/external/tbb/src/tbb/arena.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2025 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -14,782 +14,943 @@
     limitations under the License.
 */
 
-#include "arena.h"
+#include "task_dispatcher.h"
 #include "governor.h"
+#include "threading_control.h"
+#include "arena.h"
 #include "itt_notify.h"
+#include "semaphore.h"
+#include "waiters.h"
 #include "oneapi/tbb/detail/_task.h"
 #include "oneapi/tbb/info.h"
 #include "oneapi/tbb/tbb_allocator.h"
-#include "semaphore.h"
-#include "task_dispatcher.h"
-#include "waiters.h"
 
 #include <atomic>
 #include <cstring>
 #include <functional>
 
 namespace tbb {
-    namespace detail {
-        namespace r1 {
+namespace detail {
+namespace r1 {
 
 #if __TBB_ARENA_BINDING
-            class numa_binding_observer : public tbb::task_scheduler_observer {
-                binding_handler* my_binding_handler;
-
-            public:
-                numa_binding_observer(d1::task_arena* ta, int num_slots, int numa_id, core_type_id core_type,
-                                      int max_threads_per_core)
-                    : task_scheduler_observer(*ta),
-                      my_binding_handler(construct_binding_handler(num_slots, numa_id, core_type,
-                                                                   max_threads_per_core)) {}
-
-                void on_scheduler_entry(bool) override {
-                    apply_affinity_mask(my_binding_handler, this_task_arena::current_thread_index());
-                }
-
-                void on_scheduler_exit(bool) override {
-                    restore_affinity_mask(my_binding_handler, this_task_arena::current_thread_index());
-                }
-
-                ~numa_binding_observer() { destroy_binding_handler(my_binding_handler); }
-            };
-
-            numa_binding_observer* construct_binding_observer(d1::task_arena* ta, int num_slots, int numa_id,
-                                                              core_type_id core_type,
-                                                              int max_threads_per_core) {
-                numa_binding_observer* binding_observer = nullptr;
-                if ((core_type >= 0 && core_type_count() > 1) || (numa_id >= 0 && numa_node_count() > 1)
-                    || max_threads_per_core > 0) {
-                    binding_observer = new (allocate_memory(sizeof(numa_binding_observer)))
-                            numa_binding_observer(ta, num_slots, numa_id, core_type, max_threads_per_core);
-                    __TBB_ASSERT(binding_observer,
-                                 "Failure during NUMA binding observer allocation and construction");
-                    binding_observer->observe(true);
-                }
-                return binding_observer;
-            }
-
-            void destroy_binding_observer(numa_binding_observer* binding_observer) {
-                __TBB_ASSERT(binding_observer, "Trying to deallocate NULL pointer");
-                binding_observer->observe(false);
-                binding_observer->~numa_binding_observer();
-                deallocate_memory(binding_observer);
-            }
+class numa_binding_observer : public tbb::task_scheduler_observer {
+    binding_handler* my_binding_handler;
+public:
+    numa_binding_observer( d1::task_arena* ta, int num_slots, int numa_id, core_type_id core_type, int max_threads_per_core )
+        : task_scheduler_observer(*ta)
+        , my_binding_handler(construct_binding_handler(num_slots, numa_id, core_type, max_threads_per_core))
+    {}
+
+    void on_scheduler_entry( bool ) override {
+        apply_affinity_mask(my_binding_handler, this_task_arena::current_thread_index());
+    }
+
+    void on_scheduler_exit( bool ) override {
+        restore_affinity_mask(my_binding_handler, this_task_arena::current_thread_index());
+    }
+
+    ~numa_binding_observer() override{
+        destroy_binding_handler(my_binding_handler);
+    }
+};
+
+numa_binding_observer* construct_binding_observer( d1::task_arena* ta, int num_slots, int numa_id, core_type_id core_type, int max_threads_per_core ) {
+    numa_binding_observer* binding_observer = nullptr;
+    if ((core_type >= 0 && core_type_count() > 1) || (numa_id >= 0 && numa_node_count() > 1) || max_threads_per_core > 0) {
+        binding_observer = new(allocate_memory(sizeof(numa_binding_observer))) numa_binding_observer(ta, num_slots, numa_id, core_type, max_threads_per_core);
+        __TBB_ASSERT(binding_observer, "Failure during NUMA binding observer allocation and construction");
+    }
+    return binding_observer;
+}
+
+void destroy_binding_observer( numa_binding_observer* binding_observer ) {
+    __TBB_ASSERT(binding_observer, "Trying to deallocate nullptr pointer");
+    binding_observer->observe(false);
+    binding_observer->~numa_binding_observer();
+    deallocate_memory(binding_observer);
+}
 #endif /*!__TBB_ARENA_BINDING*/
 
-            std::size_t arena::occupy_free_slot_in_range(thread_data& tls, std::size_t lower,
-                                                         std::size_t upper) {
-                if (lower >= upper) return out_of_arena;
-                // Start search for an empty slot from the one we occupied the last time
-                std::size_t index = tls.my_arena_index;
-                if (index < lower || index >= upper) index = tls.my_random.get() % (upper - lower) + lower;
-                __TBB_ASSERT(index >= lower && index < upper, NULL);
-                // Find a free slot
-                for (std::size_t i = index; i < upper; ++i)
-                    if (my_slots[i].try_occupy()) return i;
-                for (std::size_t i = lower; i < index; ++i)
-                    if (my_slots[i].try_occupy()) return i;
-                return out_of_arena;
-            }
-
-            template <bool as_worker>
-            std::size_t arena::occupy_free_slot(thread_data& tls) {
-                // Firstly, external threads try to occupy reserved slots
-                std::size_t index
-                        = as_worker ? out_of_arena : occupy_free_slot_in_range(tls, 0, my_num_reserved_slots);
-                if (index == out_of_arena) {
-                    // Secondly, all threads try to occupy all non-reserved slots
-                    index = occupy_free_slot_in_range(tls, my_num_reserved_slots, my_num_slots);
-                    // Likely this arena is already saturated
-                    if (index == out_of_arena) return out_of_arena;
-                }
-
-                atomic_update(my_limit, (unsigned) (index + 1), std::less<unsigned>());
-                return index;
-            }
-
-            std::uintptr_t arena::calculate_stealing_threshold() {
-                stack_anchor_type anchor;
-                return r1::calculate_stealing_threshold(reinterpret_cast<std::uintptr_t>(&anchor),
-                                                        my_market->worker_stack_size());
-            }
-
-            void arena::process(thread_data& tls) {
-                governor::set_thread_data(tls);// TODO: consider moving to create_one_job.
-                __TBB_ASSERT(is_alive(my_guard), nullptr);
-                __TBB_ASSERT(my_num_slots > 1, nullptr);
-
-                std::size_t index = occupy_free_slot</*as_worker*/ true>(tls);
-                if (index == out_of_arena) {
-                    on_thread_leaving<ref_worker>();
-                    return;
-                }
-                __TBB_ASSERT(index >= my_num_reserved_slots, "Workers cannot occupy reserved slots");
-                tls.attach_arena(*this, index);
-                // worker thread enters the dispatch loop to look for a work
-                tls.my_inbox.set_is_idle(true);
-                if (tls.my_arena_slot->is_task_pool_published()) { tls.my_inbox.set_is_idle(false); }
-
-                task_dispatcher& task_disp = tls.my_arena_slot->default_task_dispatcher();
-                task_disp.set_stealing_threshold(calculate_stealing_threshold());
-                __TBB_ASSERT(task_disp.can_steal(), nullptr);
-                tls.attach_task_dispatcher(task_disp);
-
-                __TBB_ASSERT(!tls.my_last_observer,
-                             "There cannot be notified local observers when entering arena");
-                my_observers.notify_entry_observers(tls.my_last_observer, tls.my_is_worker);
-
-                // Waiting on special object tied to this arena
-                outermost_worker_waiter waiter(*this);
-                d1::task* t = tls.my_task_dispatcher->local_wait_for_all(nullptr, waiter);
-                // For purposes of affinity support, the slot's mailbox is considered idle while no thread is
-                // attached to it.
-                tls.my_inbox.set_is_idle(true);
-
-                __TBB_ASSERT_EX(t == nullptr, "Outermost worker must not leave dispatch loop with a task");
-                __TBB_ASSERT(governor::is_thread_data_set(&tls), nullptr);
-                __TBB_ASSERT(tls.my_task_dispatcher == &task_disp, nullptr);
-
-                my_observers.notify_exit_observers(tls.my_last_observer, tls.my_is_worker);
-                tls.my_last_observer = nullptr;
-
-                task_disp.set_stealing_threshold(0);
-                tls.detach_task_dispatcher();
-
-                // Arena slot detach (arena may be used in market::process)
-                // TODO: Consider moving several calls below into a new method(e.g.detach_arena).
-                tls.my_arena_slot->release();
-                tls.my_arena_slot = nullptr;
-                tls.my_inbox.detach();
-                __TBB_ASSERT(tls.my_inbox.is_idle_state(true), nullptr);
-                __TBB_ASSERT(is_alive(my_guard), nullptr);
-
-                // In contrast to earlier versions of TBB (before 3.0 U5) now it is possible
-                // that arena may be temporarily left unpopulated by threads. See comments in
-                // arena::on_thread_leaving() for more details.
-                on_thread_leaving<ref_worker>();
-                __TBB_ASSERT(tls.my_arena == this,
-                             "my_arena is used as a hint when searching the arena to join");
-            }
-
-            arena::arena(market& m, unsigned num_slots, unsigned num_reserved_slots,
-                         unsigned priority_level) {
-                __TBB_ASSERT(!my_guard, "improperly allocated arena?");
-                __TBB_ASSERT(sizeof(my_slots[0]) % cache_line_size() == 0,
-                             "arena::slot size not multiple of cache line size");
-                __TBB_ASSERT(is_aligned(this, cache_line_size()), "arena misaligned");
-                my_market = &m;
-                my_limit = 1;
-                // Two slots are mandatory: for the external thread, and for 1 worker (required to support starvation resistant tasks).
-                my_num_slots = num_arena_slots(num_slots);
-                my_num_reserved_slots = num_reserved_slots;
-                my_max_num_workers = num_slots - num_reserved_slots;
-                my_priority_level = priority_level;
-                my_references = ref_external;// accounts for the external thread
-                my_aba_epoch = m.my_arenas_aba_epoch.load(std::memory_order_relaxed);
-                my_observers.my_arena = this;
-                my_co_cache.init(4 * num_slots);
-                __TBB_ASSERT(my_max_num_workers <= my_num_slots, NULL);
-                // Initialize the default context. It should be allocated before task_dispatch construction.
-                my_default_ctx = new (cache_aligned_allocate(sizeof(d1::task_group_context)))
-                        d1::task_group_context {d1::task_group_context::isolated,
-                                                d1::task_group_context::fp_settings};
-                // Construct slots. Mark internal synchronization elements for the tools.
-                task_dispatcher* base_td_pointer
-                        = reinterpret_cast<task_dispatcher*>(my_slots + my_num_slots);
-                for (unsigned i = 0; i < my_num_slots; ++i) {
-                    // __TBB_ASSERT( !my_slots[i].my_scheduler && !my_slots[i].task_pool, NULL );
-                    __TBB_ASSERT(!my_slots[i].task_pool_ptr, NULL);
-                    __TBB_ASSERT(!my_slots[i].my_task_pool_size, NULL);
-                    mailbox(i).construct();
-                    my_slots[i].init_task_streams(i);
-                    my_slots[i].my_default_task_dispatcher = new (base_td_pointer + i) task_dispatcher(this);
-                    my_slots[i].my_is_occupied.store(false, std::memory_order_relaxed);
-                }
-                my_fifo_task_stream.initialize(my_num_slots);
-                my_resume_task_stream.initialize(my_num_slots);
-#if __TBB_PREVIEW_CRITICAL_TASKS
-                my_critical_task_stream.initialize(my_num_slots);
+void arena::on_thread_leaving(unsigned ref_param) {
+    //
+    // Implementation of arena destruction synchronization logic contained various
+    // bugs/flaws at the different stages of its evolution, so below is a detailed
+    // description of the issues taken into consideration in the framework of the
+    // current design.
+    //
+    // In case of using fire-and-forget tasks (scheduled via task::enqueue())
+    // external thread is allowed to leave its arena before all its work is executed,
+    // and market may temporarily revoke all workers from this arena. Since revoked
+    // workers never attempt to reset arena state to EMPTY and cancel its request
+    // to RML for threads, the arena object is destroyed only when both the last
+    // thread is leaving it and arena's state is EMPTY (that is its external thread
+    // left and it does not contain any work).
+    // Thus resetting arena to EMPTY state (as earlier TBB versions did) should not
+    // be done here (or anywhere else in the external thread to that matter); doing so
+    // can result either in arena's premature destruction (at least without
+    // additional costly checks in workers) or in unnecessary arena state changes
+    // (and ensuing workers migration).
+    //
+    // A worker that checks for work presence and transitions arena to the EMPTY
+    // state (in snapshot taking procedure arena::out_of_work()) updates
+    // arena::my_pool_state first and only then arena::my_num_workers_requested.
+    // So the check for work absence must be done against the latter field.
+    //
+    // In a time window between decrementing the active threads count and checking
+    // if there is an outstanding request for workers. New worker thread may arrive,
+    // finish remaining work, set arena state to empty, and leave decrementing its
+    // refcount and destroying. Then the current thread will destroy the arena
+    // the second time. To preclude it a local copy of the outstanding request
+    // value can be stored before decrementing active threads count.
+    //
+    // But this technique may cause two other problem. When the stored request is
+    // zero, it is possible that arena still has threads and they can generate new
+    // tasks and thus re-establish non-zero requests. Then all the threads can be
+    // revoked (as described above) leaving this thread the last one, and causing
+    // it to destroy non-empty arena.
+    //
+    // The other problem takes place when the stored request is non-zero. Another
+    // thread may complete the work, set arena state to empty, and leave without
+    // arena destruction before this thread decrements the refcount. This thread
+    // cannot destroy the arena either. Thus the arena may be "orphaned".
+    //
+    // In both cases we cannot dereference arena pointer after the refcount is
+    // decremented, as our arena may already be destroyed.
+    //
+    // If this is the external thread, the market is protected by refcount to it.
+    // In case of workers market's liveness is ensured by the RML connection
+    // rundown protocol, according to which the client (i.e. the market) lives
+    // until RML server notifies it about connection termination, and this
+    // notification is fired only after all workers return into RML.
+    //
+    // Thus if we decremented refcount to zero we ask the market to check arena
+    // state (including the fact if it is alive) under the lock.
+    //
+
+    __TBB_ASSERT(my_references.load(std::memory_order_relaxed) >= ref_param, "broken arena reference counter");
+
+    // When there is no workers someone must free arena, as
+    // without workers, no one calls out_of_work().
+    if (ref_param == ref_external && !my_mandatory_concurrency.test()) {
+        out_of_work();
+    }
+
+    threading_control* tc = my_threading_control;
+    auto tc_client_snapshot = tc->prepare_client_destruction(my_tc_client);
+    // Release our reference to sync with destroy_client
+    unsigned remaining_ref = my_references.fetch_sub(ref_param, std::memory_order_release) - ref_param;
+    // do not access `this` it might be destroyed already
+    if (remaining_ref == 0) {
+        if (tc->try_destroy_client(tc_client_snapshot)) {
+            // We are requested to destroy ourself
+            free_arena();
+        }
+    }
+}
+
+std::size_t arena::occupy_free_slot_in_range( thread_data& tls, std::size_t lower, std::size_t upper ) {
+    if ( lower >= upper ) return out_of_arena;
+    // Start search for an empty slot from the one we occupied the last time
+    std::size_t index = tls.my_arena_index;
+    if ( index < lower || index >= upper ) index = tls.my_random.get() % (upper - lower) + lower;
+    __TBB_ASSERT( index >= lower && index < upper, nullptr);
+    // Find a free slot
+    for ( std::size_t i = index; i < upper; ++i )
+        if (my_slots[i].try_occupy()) return i;
+    for ( std::size_t i = lower; i < index; ++i )
+        if (my_slots[i].try_occupy()) return i;
+    return out_of_arena;
+}
+
+template <bool as_worker>
+std::size_t arena::occupy_free_slot(thread_data& tls) {
+    // Firstly, external threads try to occupy reserved slots
+    std::size_t index = as_worker ? out_of_arena : occupy_free_slot_in_range( tls,  0, my_num_reserved_slots );
+    if ( index == out_of_arena ) {
+        // Secondly, all threads try to occupy all non-reserved slots
+        index = occupy_free_slot_in_range(tls, my_num_reserved_slots, my_num_slots );
+        // Likely this arena is already saturated
+        if ( index == out_of_arena )
+            return out_of_arena;
+    }
+
+    atomic_update( my_limit, (unsigned)(index + 1), std::less<unsigned>() );
+    return index;
+}
+
+std::uintptr_t arena::calculate_stealing_threshold() {
+    stack_anchor_type anchor;
+    return r1::calculate_stealing_threshold(reinterpret_cast<std::uintptr_t>(&anchor), my_threading_control->worker_stack_size());
+}
+
+void arena::process(thread_data& tls) {
+    governor::set_thread_data(tls); // TODO: consider moving to create_one_job.
+    __TBB_ASSERT( is_alive(my_guard), nullptr);
+    __TBB_ASSERT( my_num_slots >= 1, nullptr);
+
+    std::size_t index = occupy_free_slot</*as_worker*/true>(tls);
+    if (index == out_of_arena) {
+        on_thread_leaving(ref_worker);
+        return;
+    }
+
+    __TBB_ASSERT( index >= my_num_reserved_slots, "Workers cannot occupy reserved slots" );
+    tls.attach_arena(*this, index);
+    // worker thread enters the dispatch loop to look for a work
+    tls.my_inbox.set_is_idle(true);
+    if (tls.my_arena_slot->is_task_pool_published()) {
+        tls.my_inbox.set_is_idle(false);
+    }
+
+    task_dispatcher& task_disp = tls.my_arena_slot->default_task_dispatcher();
+    tls.enter_task_dispatcher(task_disp, calculate_stealing_threshold());
+    __TBB_ASSERT(task_disp.can_steal(), nullptr);
+
+    __TBB_ASSERT( !tls.my_last_observer, "There cannot be notified local observers when entering arena" );
+    my_observers.notify_entry_observers(tls.my_last_observer, tls.my_is_worker);
+
+    // Waiting on special object tied to this arena
+    outermost_worker_waiter waiter(*this);
+    d1::task* t = tls.my_task_dispatcher->local_wait_for_all(nullptr, waiter);
+    // For purposes of affinity support, the slot's mailbox is considered idle while no thread is
+    // attached to it.
+    tls.my_inbox.set_is_idle(true);
+
+    __TBB_ASSERT_EX(t == nullptr, "Outermost worker must not leave dispatch loop with a task");
+    __TBB_ASSERT(governor::is_thread_data_set(&tls), nullptr);
+    __TBB_ASSERT(tls.my_task_dispatcher == &task_disp, nullptr);
+
+    my_observers.notify_exit_observers(tls.my_last_observer, tls.my_is_worker);
+    tls.my_last_observer = nullptr;
+
+    tls.leave_task_dispatcher();
+
+    // Arena slot detach (arena may be used in market::process)
+    // TODO: Consider moving several calls below into a new method(e.g.detach_arena).
+    tls.my_arena_slot->release();
+    tls.my_arena_slot = nullptr;
+    tls.my_inbox.detach();
+    __TBB_ASSERT(tls.my_inbox.is_idle_state(true), nullptr);
+    __TBB_ASSERT(is_alive(my_guard), nullptr);
+
+    // In contrast to earlier versions of TBB (before 3.0 U5) now it is possible
+    // that arena may be temporarily left unpopulated by threads. See comments in
+    // arena::on_thread_leaving() for more details.
+    on_thread_leaving(ref_worker);
+    __TBB_ASSERT(tls.my_arena == this, "my_arena is used as a hint when searching the arena to join");
+}
+
+arena::arena(threading_control* control, unsigned num_slots, unsigned num_reserved_slots, unsigned priority_level
+#if __TBB_PREVIEW_PARALLEL_PHASE
+             , tbb::task_arena::leave_policy lp 
 #endif
-#if __TBB_ENQUEUE_ENFORCED_CONCURRENCY
-                my_local_concurrency_requests = 0;
-                my_local_concurrency_flag.clear();
-                my_global_concurrency_mode.store(false, std::memory_order_relaxed);
+)
+{
+    __TBB_ASSERT( !my_guard, "improperly allocated arena?" );
+    __TBB_ASSERT( sizeof(my_slots[0]) % cache_line_size()==0, "arena::slot size not multiple of cache line size" );
+    __TBB_ASSERT( is_aligned(this, cache_line_size()), "arena misaligned" );
+    my_threading_control = control;
+    my_limit = 1;
+    // Two slots are mandatory: for the external thread, and for 1 worker (required to support starvation resistant tasks).
+    my_num_slots = num_arena_slots(num_slots, num_reserved_slots);
+    my_num_reserved_slots = num_reserved_slots;
+    my_max_num_workers = num_slots-num_reserved_slots;
+    my_priority_level = priority_level;
+    my_references = ref_external; // accounts for the external thread
+    my_observers.my_arena = this;
+    my_co_cache.init(4 * num_slots);
+    __TBB_ASSERT ( my_max_num_workers <= my_num_slots, nullptr);
+    // Initialize the default context. It should be allocated before task_dispatch construction.
+    my_default_ctx = new (cache_aligned_allocate(sizeof(d1::task_group_context)))
+        d1::task_group_context{ d1::task_group_context::isolated, d1::task_group_context::fp_settings };
+    // Construct slots. Mark internal synchronization elements for the tools.
+    task_dispatcher* base_td_pointer = reinterpret_cast<task_dispatcher*>(my_slots + my_num_slots);
+    for( unsigned i = 0; i < my_num_slots; ++i ) {
+        // __TBB_ASSERT( !my_slots[i].my_scheduler && !my_slots[i].task_pool, nullptr);
+        __TBB_ASSERT( !my_slots[i].task_pool_ptr, nullptr);
+        __TBB_ASSERT( !my_slots[i].my_task_pool_size, nullptr);
+        mailbox(i).construct();
+        my_slots[i].init_task_streams(i);
+        my_slots[i].my_default_task_dispatcher = new(base_td_pointer + i) task_dispatcher(this);
+        my_slots[i].my_is_occupied.store(false, std::memory_order_relaxed);
+    }
+    my_fifo_task_stream.initialize(my_num_slots);
+    my_resume_task_stream.initialize(my_num_slots);
+#if __TBB_PREVIEW_CRITICAL_TASKS
+    my_critical_task_stream.initialize(my_num_slots);
 #endif
-            }
+    my_mandatory_requests = 0;
 
-            arena& arena::allocate_arena(market& m, unsigned num_slots, unsigned num_reserved_slots,
-                                         unsigned priority_level) {
-                __TBB_ASSERT(sizeof(base_type) + sizeof(arena_slot) == sizeof(arena),
-                             "All arena data fields must go to arena_base");
-                __TBB_ASSERT(sizeof(base_type) % cache_line_size() == 0,
-                             "arena slots area misaligned: wrong padding");
-                __TBB_ASSERT(sizeof(mail_outbox) == max_nfs_size, "Mailbox padding is wrong");
-                std::size_t n = allocation_size(num_arena_slots(num_slots));
-                unsigned char* storage = (unsigned char*) cache_aligned_allocate(n);
-                // Zero all slots to indicate that they are empty
-                std::memset(storage, 0, n);
-                return *new (storage + num_arena_slots(num_slots) * sizeof(mail_outbox))
-                        arena(m, num_slots, num_reserved_slots, priority_level);
-            }
+#if __TBB_PREVIEW_PARALLEL_PHASE
+    my_thread_leave.set_initial_state(lp);
+#endif
+}
 
-            void arena::free_arena() {
-                __TBB_ASSERT(is_alive(my_guard), NULL);
-                __TBB_ASSERT(!my_references.load(std::memory_order_relaxed),
-                             "There are threads in the dying arena");
-                __TBB_ASSERT(!my_num_workers_requested && !my_num_workers_allotted,
-                             "Dying arena requests workers");
-                __TBB_ASSERT(my_pool_state.load(std::memory_order_relaxed) == SNAPSHOT_EMPTY
-                                     || !my_max_num_workers,
-                             "Inconsistent state of a dying arena");
-#if __TBB_ENQUEUE_ENFORCED_CONCURRENCY
-                __TBB_ASSERT(!my_global_concurrency_mode, NULL);
+arena& arena::allocate_arena(threading_control* control, unsigned num_slots, unsigned num_reserved_slots,
+                             unsigned priority_level
+#if __TBB_PREVIEW_PARALLEL_PHASE
+                             , tbb::task_arena::leave_policy lp
+#endif
+)
+{
+    __TBB_ASSERT( sizeof(base_type) + sizeof(arena_slot) == sizeof(arena), "All arena data fields must go to arena_base" );
+    __TBB_ASSERT( sizeof(base_type) % cache_line_size() == 0, "arena slots area misaligned: wrong padding" );
+    __TBB_ASSERT( sizeof(mail_outbox) == max_nfs_size, "Mailbox padding is wrong" );
+    std::size_t n = allocation_size(num_arena_slots(num_slots, num_reserved_slots));
+    unsigned char* storage = (unsigned char*)cache_aligned_allocate(n);
+    // Zero all slots to indicate that they are empty
+    std::memset( storage, 0, n );
+
+    return *new( storage + num_arena_slots(num_slots, num_reserved_slots) * sizeof(mail_outbox) )
+        arena(control, num_slots, num_reserved_slots, priority_level
+#if __TBB_PREVIEW_PARALLEL_PHASE
+              , lp
 #endif
+        );
+}
+
+void arena::free_arena () {
+    __TBB_ASSERT( is_alive(my_guard), nullptr);
+    __TBB_ASSERT( !my_references.load(std::memory_order_relaxed), "There are threads in the dying arena" );
+    __TBB_ASSERT( !my_total_num_workers_requested && !my_num_workers_allotted, "Dying arena requests workers" );
+    __TBB_ASSERT( is_empty(), "Inconsistent state of a dying arena" );
 #if __TBB_ARENA_BINDING
-                if (my_numa_binding_observer != nullptr) {
-                    destroy_binding_observer(my_numa_binding_observer);
-                    my_numa_binding_observer = nullptr;
-                }
+    if (my_numa_binding_observer != nullptr) {
+        destroy_binding_observer(my_numa_binding_observer);
+        my_numa_binding_observer = nullptr;
+    }
 #endif /*__TBB_ARENA_BINDING*/
-                poison_value(my_guard);
-                for (unsigned i = 0; i < my_num_slots; ++i) {
-                    // __TBB_ASSERT( !my_slots[i].my_scheduler, "arena slot is not empty" );
-                    // TODO: understand the assertion and modify
-                    // __TBB_ASSERT( my_slots[i].task_pool == EmptyTaskPool, NULL );
-                    __TBB_ASSERT(my_slots[i].head == my_slots[i].tail,
-                                 NULL);// TODO: replace by is_quiescent_local_task_pool_empty
-                    my_slots[i].free_task_pool();
-                    mailbox(i).drain();
-                    my_slots[i].my_default_task_dispatcher->~task_dispatcher();
-                }
-                __TBB_ASSERT(my_fifo_task_stream.empty(), "Not all enqueued tasks were executed");
-                __TBB_ASSERT(my_resume_task_stream.empty(), "Not all enqueued tasks were executed");
-                // Cleanup coroutines/schedulers cache
-                my_co_cache.cleanup();
-                my_default_ctx->~task_group_context();
-                cache_aligned_deallocate(my_default_ctx);
+    poison_value( my_guard );
+    for ( unsigned i = 0; i < my_num_slots; ++i ) {
+        // __TBB_ASSERT( !my_slots[i].my_scheduler, "arena slot is not empty" );
+        // TODO: understand the assertion and modify
+        // __TBB_ASSERT( my_slots[i].task_pool == EmptyTaskPool, nullptr);
+        __TBB_ASSERT( my_slots[i].head == my_slots[i].tail, nullptr); // TODO: replace by is_quiescent_local_task_pool_empty
+        my_slots[i].free_task_pool();
+        mailbox(i).drain();
+        my_slots[i].my_default_task_dispatcher->~task_dispatcher();
+    }
+    __TBB_ASSERT(my_fifo_task_stream.empty(), "Not all enqueued tasks were executed");
+    __TBB_ASSERT(my_resume_task_stream.empty(), "Not all enqueued tasks were executed");
+    // Cleanup coroutines/schedulers cache
+    my_co_cache.cleanup();
+    my_default_ctx->~task_group_context();
+    cache_aligned_deallocate(my_default_ctx);
 #if __TBB_PREVIEW_CRITICAL_TASKS
-                __TBB_ASSERT(my_critical_task_stream.empty(), "Not all critical tasks were executed");
+    __TBB_ASSERT( my_critical_task_stream.empty(), "Not all critical tasks were executed");
 #endif
-                // remove an internal reference
-                my_market->release(/*is_public=*/false, /*blocking_terminate=*/false);
-
-                // Clear enfources synchronization with observe(false)
-                my_observers.clear();
-
-                void* storage = &mailbox(my_num_slots - 1);
-                __TBB_ASSERT(my_references.load(std::memory_order_relaxed) == 0, NULL);
-                __TBB_ASSERT(my_pool_state.load(std::memory_order_relaxed) == SNAPSHOT_EMPTY
-                                     || !my_max_num_workers,
-                             NULL);
-                this->~arena();
+    // Clear enfources synchronization with observe(false)
+    my_observers.clear();
+
+    void* storage  = &mailbox(my_num_slots-1);
+    __TBB_ASSERT( my_references.load(std::memory_order_relaxed) == 0, nullptr);
+    this->~arena();
 #if TBB_USE_ASSERT > 1
-                std::memset(storage, 0, allocation_size(my_num_slots));
+    std::memset( storage, 0, allocation_size(my_num_slots) );
 #endif /* TBB_USE_ASSERT */
-                cache_aligned_deallocate(storage);
-            }
-
-            bool arena::has_enqueued_tasks() { return !my_fifo_task_stream.empty(); }
-
-            bool arena::is_out_of_work() {
-#if __TBB_ENQUEUE_ENFORCED_CONCURRENCY
-                if (my_local_concurrency_flag.try_clear_if([this] { return !has_enqueued_tasks(); })) {
-                    my_market->adjust_demand(*this, /* delta = */ -1, /* mandatory = */ true);
-                }
-#endif
-
-                // TODO: rework it to return at least a hint about where a task was found; better if the task itself.
-                switch (my_pool_state.load(std::memory_order_acquire)) {
-                    case SNAPSHOT_EMPTY:
-                        return true;
-                    case SNAPSHOT_FULL: {
-                        // Use unique id for "busy" in order to avoid ABA problems.
-                        const pool_state_t busy = pool_state_t(&busy);
-                        // Helper for CAS execution
-                        pool_state_t expected_state;
-
-                        // Request permission to take snapshot
-                        expected_state = SNAPSHOT_FULL;
-                        if (my_pool_state.compare_exchange_strong(expected_state, busy)) {
-                            // Got permission. Take the snapshot.
-                            // NOTE: This is not a lock, as the state can be set to FULL at
-                            //       any moment by a thread that spawns/enqueues new task.
-                            std::size_t n = my_limit.load(std::memory_order_acquire);
-                            // Make local copies of volatile parameters. Their change during
-                            // snapshot taking procedure invalidates the attempt, and returns
-                            // this thread into the dispatch loop.
-                            std::size_t k;
-                            for (k = 0; k < n; ++k) {
-                                if (my_slots[k].task_pool.load(std::memory_order_relaxed) != EmptyTaskPool
-                                    && my_slots[k].head.load(std::memory_order_relaxed)
-                                               < my_slots[k].tail.load(std::memory_order_relaxed)) {
-                                    // k-th primary task pool is nonempty and does contain tasks.
-                                    break;
-                                }
-                                if (my_pool_state.load(std::memory_order_acquire) != busy)
-                                    return false;// the work was published
-                            }
-                            bool work_absent = k == n;
-                            // Test and test-and-set.
-                            if (my_pool_state.load(std::memory_order_acquire) == busy) {
-                                bool no_stream_tasks = !has_enqueued_tasks() && my_resume_task_stream.empty();
+    cache_aligned_deallocate( storage );
+}
+
+bool arena::has_enqueued_tasks() {
+    return !my_fifo_task_stream.empty();
+}
+
+void arena::request_workers(int mandatory_delta, int workers_delta, bool wakeup_threads) {
+    my_threading_control->adjust_demand(my_tc_client, mandatory_delta, workers_delta);
+
+    if (wakeup_threads) {
+        // Notify all sleeping threads that work has appeared in the arena.
+        get_waiting_threads_monitor().notify([&] (market_context context) {
+            return this == context.my_arena_addr;
+        });
+    }
+}
+
+bool arena::has_tasks() {
+    // TODO: rework it to return at least a hint about where a task was found; better if the task itself.
+    std::size_t n = my_limit.load(std::memory_order_acquire);
+    bool tasks_are_available = false;
+    for (std::size_t k = 0; k < n && !tasks_are_available; ++k) {
+        tasks_are_available = !my_slots[k].is_empty();
+    }
+    tasks_are_available = tasks_are_available || has_enqueued_tasks() || !my_resume_task_stream.empty();
 #if __TBB_PREVIEW_CRITICAL_TASKS
-                                no_stream_tasks = no_stream_tasks && my_critical_task_stream.empty();
+    tasks_are_available = tasks_are_available || !my_critical_task_stream.empty();
 #endif
-                                work_absent = work_absent && no_stream_tasks;
-                                if (work_absent) {
-                                    // save current demand value before setting SNAPSHOT_EMPTY,
-                                    // to avoid race with advertise_new_work.
-                                    int current_demand = (int) my_max_num_workers;
-                                    expected_state = busy;
-                                    if (my_pool_state.compare_exchange_strong(expected_state,
-                                                                              SNAPSHOT_EMPTY)) {
-                                        // This thread transitioned pool to empty state, and thus is
-                                        // responsible for telling the market that there is no work to do.
-                                        my_market->adjust_demand(*this, -current_demand,
-                                                                 /* mandatory = */ false);
-                                        return true;
-                                    }
-                                    return false;
-                                }
-                                // Undo previous transition SNAPSHOT_FULL-->busy, unless another thread undid it.
-                                expected_state = busy;
-                                my_pool_state.compare_exchange_strong(expected_state, SNAPSHOT_FULL);
-                            }
-                        }
-                        return false;
-                    }
-                    default:
-                        // Another thread is taking a snapshot.
-                        return false;
-                }
-            }
-
-            void arena::enqueue_task(d1::task& t, d1::task_group_context& ctx, thread_data& td) {
-                task_group_context_impl::bind_to(ctx, &td);
-                task_accessor::context(t) = &ctx;
-                task_accessor::isolation(t) = no_isolation;
-                my_fifo_task_stream.push(&t, random_lane_selector(td.my_random));
-                advertise_new_work<work_enqueued>();
-            }
+    return tasks_are_available;
+}
+
+void arena::out_of_work() {
+    // We should try unset my_pool_state first due to keep arena invariants in consistent state
+    // Otherwise, we might have my_pool_state = false and my_mandatory_concurrency = true that is broken invariant
+    bool disable_mandatory = my_mandatory_concurrency.try_clear_if([this] { return !has_enqueued_tasks(); });
+    bool release_workers = my_pool_state.try_clear_if([this] { return !has_tasks(); });
+
+    if (disable_mandatory || release_workers) {
+        int mandatory_delta = disable_mandatory ? -1 : 0;
+        int workers_delta = release_workers ? -(int)my_max_num_workers : 0;
+
+        if (disable_mandatory && is_arena_workerless()) {
+            // We had set workers_delta to 1 when enabled mandatory concurrency, so revert it now
+            workers_delta = -1;
+        }
+        request_workers(mandatory_delta, workers_delta);
+    }
+}
+
+void arena::set_top_priority(bool is_top_priority) {
+    my_is_top_priority.store(is_top_priority, std::memory_order_relaxed);
+}
+
+bool arena::is_top_priority() const {
+    return my_is_top_priority.load(std::memory_order_relaxed);
+}
+
+bool arena::try_join() {
+    if (is_joinable()) {
+        my_references += arena::ref_worker;
+        return true;
+    }
+    return false;
+}
+
+void arena::set_allotment(unsigned allotment) {
+    if (my_num_workers_allotted.load(std::memory_order_relaxed) != allotment) {
+        my_num_workers_allotted.store(allotment, std::memory_order_relaxed);
+    }
+}
+
+int arena::update_concurrency(unsigned allotment) {
+    int delta = allotment - my_num_workers_allotted.load(std::memory_order_relaxed);
+    if (delta != 0) {
+        my_num_workers_allotted.store(allotment, std::memory_order_relaxed);
+    }
+    return delta;
+}
+
+std::pair<int, int> arena::update_request(int mandatory_delta, int workers_delta) {
+    __TBB_ASSERT(-1 <= mandatory_delta && mandatory_delta <= 1, nullptr);
+
+    int min_workers_request = 0;
+    int max_workers_request = 0;
+
+    // Calculate min request
+    my_mandatory_requests += mandatory_delta;
+    min_workers_request = my_mandatory_requests > 0 ? 1 : 0;
+
+    // Calculate max request
+    my_total_num_workers_requested += workers_delta;
+    // Clamp worker request into interval [0, my_max_num_workers]
+    max_workers_request = clamp(my_total_num_workers_requested, 0,
+        min_workers_request > 0 && is_arena_workerless() ? 1 : (int)my_max_num_workers);
+
+    return { min_workers_request, max_workers_request };
+}
+
+thread_control_monitor& arena::get_waiting_threads_monitor() {
+    return my_threading_control->get_waiting_threads_monitor();
+}
+
+void arena::enqueue_task(d1::task& t, d1::task_group_context& ctx, thread_data& td) {
+    task_group_context_impl::bind_to(ctx, &td);
+    task_accessor::context(t) = &ctx;
+    task_accessor::isolation(t) = no_isolation;
+    my_fifo_task_stream.push( &t, random_lane_selector(td.my_random) );
+    advertise_new_work<work_enqueued>();
+}
+
+arena &arena::create(threading_control *control, unsigned num_slots,
+                     unsigned num_reserved_slots, unsigned arena_priority_level,
+                     d1::constraints constraints
+#if __TBB_PREVIEW_PARALLEL_PHASE
+                     , tbb::task_arena::leave_policy lp 
+#endif
+) {
+    __TBB_ASSERT(num_slots > 0, NULL);
+    __TBB_ASSERT(num_reserved_slots <= num_slots, NULL);
+    // Add public market reference for an external thread/task_arena (that adds an internal reference in exchange).
+    arena& a = arena::allocate_arena(control, num_slots, num_reserved_slots, arena_priority_level
+#if __TBB_PREVIEW_PARALLEL_PHASE
+                                     , lp
+#endif
+    );
+    a.my_tc_client = control->create_client(a);
+    // We should not publish arena until all fields are initialized
+    control->publish_client(a.my_tc_client, constraints);
+    return a;
+}
 
-        }// namespace r1
-    }    // namespace detail
-}// namespace tbb
+} // namespace r1
+} // namespace detail
+} // namespace tbb
 
 // Enable task_arena.h
-#include "oneapi/tbb/task_arena.h"// task_arena_base
+#include "oneapi/tbb/task_arena.h" // task_arena_base
 
 namespace tbb {
-    namespace detail {
-        namespace r1 {
+namespace detail {
+namespace r1 {
 
 #if TBB_USE_ASSERT
-            void assert_arena_priority_valid(tbb::task_arena::priority a_priority) {
-                bool is_arena_priority_correct = a_priority == tbb::task_arena::priority::high
-                                                 || a_priority == tbb::task_arena::priority::normal
-                                                 || a_priority == tbb::task_arena::priority::low;
-                __TBB_ASSERT(is_arena_priority_correct,
-                             "Task arena priority should be equal to one of the predefined values.");
-            }
+void assert_arena_priority_valid( tbb::task_arena::priority a_priority ) {
+    bool is_arena_priority_correct =
+        a_priority == tbb::task_arena::priority::high   ||
+        a_priority == tbb::task_arena::priority::normal ||
+        a_priority == tbb::task_arena::priority::low;
+    __TBB_ASSERT( is_arena_priority_correct,
+                  "Task arena priority should be equal to one of the predefined values." );
+}
 #else
-            void assert_arena_priority_valid(tbb::task_arena::priority) {}
+void assert_arena_priority_valid( tbb::task_arena::priority ) {}
 #endif
 
-            unsigned arena_priority_level(tbb::task_arena::priority a_priority) {
-                assert_arena_priority_valid(a_priority);
-                return market::num_priority_levels - unsigned(int(a_priority) / d1::priority_stride);
-            }
-
-            tbb::task_arena::priority arena_priority(unsigned priority_level) {
-                auto priority = tbb::task_arena::priority((market::num_priority_levels - priority_level)
-                                                          * d1::priority_stride);
-                assert_arena_priority_valid(priority);
-                return priority;
-            }
-
-            struct task_arena_impl {
-                static void initialize(d1::task_arena_base&);
-                static void terminate(d1::task_arena_base&);
-                static bool attach(d1::task_arena_base&);
-                static void execute(d1::task_arena_base&, d1::delegate_base&);
-                static void wait(d1::task_arena_base&);
-                static int max_concurrency(const d1::task_arena_base*);
-                static void enqueue(d1::task&, d1::task_group_context*, d1::task_arena_base*);
-            };
-
-            void __TBB_EXPORTED_FUNC initialize(d1::task_arena_base& ta) { task_arena_impl::initialize(ta); }
-            void __TBB_EXPORTED_FUNC terminate(d1::task_arena_base& ta) { task_arena_impl::terminate(ta); }
-            bool __TBB_EXPORTED_FUNC attach(d1::task_arena_base& ta) { return task_arena_impl::attach(ta); }
-            void __TBB_EXPORTED_FUNC execute(d1::task_arena_base& ta, d1::delegate_base& d) {
-                task_arena_impl::execute(ta, d);
-            }
-            void __TBB_EXPORTED_FUNC wait(d1::task_arena_base& ta) { task_arena_impl::wait(ta); }
-
-            int __TBB_EXPORTED_FUNC max_concurrency(const d1::task_arena_base* ta) {
-                return task_arena_impl::max_concurrency(ta);
-            }
-
-            void __TBB_EXPORTED_FUNC enqueue(d1::task& t, d1::task_arena_base* ta) {
-                task_arena_impl::enqueue(t, nullptr, ta);
-            }
-
-            void __TBB_EXPORTED_FUNC enqueue(d1::task& t, d1::task_group_context& ctx,
-                                             d1::task_arena_base* ta) {
-                task_arena_impl::enqueue(t, &ctx, ta);
-            }
+unsigned arena_priority_level( tbb::task_arena::priority a_priority ) {
+    assert_arena_priority_valid( a_priority );
+    return d1::num_priority_levels - unsigned(int(a_priority) / d1::priority_stride);
+}
+
+tbb::task_arena::priority arena_priority( unsigned priority_level ) {
+    auto priority = tbb::task_arena::priority(
+        (d1::num_priority_levels - priority_level) * d1::priority_stride
+    );
+    assert_arena_priority_valid( priority );
+    return priority;
+}
+
+struct task_arena_impl {
+    static void initialize(d1::task_arena_base&);
+    static void terminate(d1::task_arena_base&);
+    static bool attach(d1::task_arena_base&);
+    static void execute(d1::task_arena_base&, d1::delegate_base&);
+    static void wait(d1::task_arena_base&);
+    static int max_concurrency(const d1::task_arena_base*);
+    static void enqueue(d1::task&, d1::task_group_context*, d1::task_arena_base*);
+    static d1::slot_id execution_slot(const d1::task_arena_base&);
+    static void enter_parallel_phase(d1::task_arena_base*, std::uintptr_t);
+    static void exit_parallel_phase(d1::task_arena_base*, std::uintptr_t);
+};
+
+void __TBB_EXPORTED_FUNC initialize(d1::task_arena_base& ta) {
+    task_arena_impl::initialize(ta);
+}
+void __TBB_EXPORTED_FUNC terminate(d1::task_arena_base& ta) {
+    task_arena_impl::terminate(ta);
+}
+bool __TBB_EXPORTED_FUNC attach(d1::task_arena_base& ta) {
+    return task_arena_impl::attach(ta);
+}
+void __TBB_EXPORTED_FUNC execute(d1::task_arena_base& ta, d1::delegate_base& d) {
+    task_arena_impl::execute(ta, d);
+}
+void __TBB_EXPORTED_FUNC wait(d1::task_arena_base& ta) {
+    task_arena_impl::wait(ta);
+}
+
+int __TBB_EXPORTED_FUNC max_concurrency(const d1::task_arena_base* ta) {
+    return task_arena_impl::max_concurrency(ta);
+}
+
+void __TBB_EXPORTED_FUNC enqueue(d1::task& t, d1::task_arena_base* ta) {
+    task_arena_impl::enqueue(t, nullptr, ta);
+}
+
+void __TBB_EXPORTED_FUNC enqueue(d1::task& t, d1::task_group_context& ctx, d1::task_arena_base* ta) {
+    task_arena_impl::enqueue(t, &ctx, ta);
+}
+
+d1::slot_id __TBB_EXPORTED_FUNC execution_slot(const d1::task_arena_base& arena) {
+    return task_arena_impl::execution_slot(arena);
+}
+
+void __TBB_EXPORTED_FUNC enter_parallel_phase(d1::task_arena_base* ta, std::uintptr_t flags) {
+    task_arena_impl::enter_parallel_phase(ta, flags);
+}
+
+void __TBB_EXPORTED_FUNC exit_parallel_phase(d1::task_arena_base* ta, std::uintptr_t flags) {
+    task_arena_impl::exit_parallel_phase(ta, flags);
+}
+
+void task_arena_impl::initialize(d1::task_arena_base& ta) {
+    // Enforce global market initialization to properly initialize soft limit
+    (void)governor::get_thread_data();
+    d1::constraints arena_constraints;
 
-            void task_arena_impl::initialize(d1::task_arena_base& ta) {
-                // Enforce global market initialization to properly initialize soft limit
-                (void) governor::get_thread_data();
-                if (ta.my_max_concurrency < 1) {
 #if __TBB_ARENA_BINDING
+    arena_constraints = d1::constraints{}
+        .set_core_type(ta.core_type())
+        .set_max_threads_per_core(ta.max_threads_per_core())
+        .set_numa_id(ta.my_numa_id);
+#endif /*__TBB_ARENA_BINDING*/
 
-#if __TBB_PREVIEW_TASK_ARENA_CONSTRAINTS_EXTENSION_PRESENT
-                    d1::constraints arena_constraints
-                            = d1::constraints {}
-                                      .set_core_type(ta.core_type())
-                                      .set_max_threads_per_core(ta.max_threads_per_core())
-                                      .set_numa_id(ta.my_numa_id);
-                    ta.my_max_concurrency = (int) default_concurrency(arena_constraints);
-#else  /*!__TBB_PREVIEW_TASK_ARENA_CONSTRAINTS_EXTENSION_PRESENT*/
-                    ta.my_max_concurrency = (int) default_concurrency(ta.my_numa_id);
-#endif /*!__TBB_PREVIEW_TASK_ARENA_CONSTRAINTS_EXTENSION_PRESENT*/
-
-#else  /*!__TBB_ARENA_BINDING*/
-                    ta.my_max_concurrency = (int) governor::default_num_threads();
-#endif /*!__TBB_ARENA_BINDING*/
-                }
-
-                __TBB_ASSERT(ta.my_arena.load(std::memory_order_relaxed) == nullptr,
-                             "Arena already initialized");
-                unsigned priority_level = arena_priority_level(ta.my_priority);
-                arena* a = market::create_arena(ta.my_max_concurrency, ta.my_num_reserved_slots,
-                                                priority_level, /* stack_size = */ 0);
-                ta.my_arena.store(a, std::memory_order_release);
-                // add an internal market reference; a public reference was added in create_arena
-                market::global_market(/*is_public=*/false);
+    if (ta.my_max_concurrency < 1) {
 #if __TBB_ARENA_BINDING
-                a->my_numa_binding_observer = construct_binding_observer(
-                        static_cast<d1::task_arena*>(&ta), a->my_num_slots, ta.my_numa_id, ta.core_type(),
-                        ta.max_threads_per_core());
-#endif /*__TBB_ARENA_BINDING*/
+        ta.my_max_concurrency = (int)default_concurrency(arena_constraints);
+#else /*!__TBB_ARENA_BINDING*/
+        ta.my_max_concurrency = (int)governor::default_num_threads();
+#endif /*!__TBB_ARENA_BINDING*/
+    }
+
+#if __TBB_CPUBIND_PRESENT
+    numa_binding_observer* observer = construct_binding_observer(
+        static_cast<d1::task_arena*>(&ta), arena::num_arena_slots(ta.my_max_concurrency, ta.my_num_reserved_slots),
+        ta.my_numa_id, ta.core_type(), ta.max_threads_per_core());
+    if (observer) {
+        // TODO: Consider lazy initialization for internal arena so
+        // the direct calls to observer might be omitted until actual initialization.
+        observer->on_scheduler_entry(true);
+    }
+#endif /*__TBB_CPUBIND_PRESENT*/
+
+    __TBB_ASSERT(ta.my_arena.load(std::memory_order_relaxed) == nullptr, "Arena already initialized");
+    unsigned priority_level = arena_priority_level(ta.my_priority);
+    threading_control* thr_control = threading_control::register_public_reference();
+    arena& a = arena::create(thr_control, unsigned(ta.my_max_concurrency), ta.my_num_reserved_slots,
+                             priority_level, arena_constraints
+#if __TBB_PREVIEW_PARALLEL_PHASE
+                             , ta.get_leave_policy()
+#endif
+    );
+
+    ta.my_arena.store(&a, std::memory_order_release);
+#if __TBB_CPUBIND_PRESENT
+    a.my_numa_binding_observer = observer;
+    if (observer) {
+        observer->on_scheduler_exit(true);
+        observer->observe(true);
+    }
+#endif /*__TBB_CPUBIND_PRESENT*/
+}
+
+void task_arena_impl::terminate(d1::task_arena_base& ta) {
+    arena* a = ta.my_arena.load(std::memory_order_relaxed);
+    assert_pointer_valid(a);
+    threading_control::unregister_public_reference(/*blocking_terminate=*/false);
+    a->on_thread_leaving(arena::ref_external);
+    ta.my_arena.store(nullptr, std::memory_order_relaxed);
+}
+
+bool task_arena_impl::attach(d1::task_arena_base& ta) {
+    __TBB_ASSERT(!ta.my_arena.load(std::memory_order_relaxed), nullptr);
+    thread_data* td = governor::get_thread_data_if_initialized();
+    if( td && td->my_arena ) {
+        arena* a = td->my_arena;
+        // There is an active arena to attach to.
+        // It's still used by s, so won't be destroyed right away.
+        __TBB_ASSERT(a->my_references > 0, nullptr);
+        a->my_references += arena::ref_external;
+        ta.my_num_reserved_slots = a->my_num_reserved_slots;
+        ta.my_priority = arena_priority(a->my_priority_level);
+        ta.my_max_concurrency = ta.my_num_reserved_slots + a->my_max_num_workers;
+        __TBB_ASSERT(arena::num_arena_slots(ta.my_max_concurrency, ta.my_num_reserved_slots) == a->my_num_slots, nullptr);
+        ta.my_arena.store(a, std::memory_order_release);
+        // increases threading_control's ref count for task_arena
+        threading_control::register_public_reference();
+        return true;
+    }
+    return false;
+}
+
+void task_arena_impl::enqueue(d1::task& t, d1::task_group_context* c, d1::task_arena_base* ta) {
+    thread_data* td = governor::get_thread_data();  // thread data is only needed for FastRandom instance
+    assert_pointer_valid(td, "thread_data pointer should not be null");
+    arena* a = ta ?
+              ta->my_arena.load(std::memory_order_relaxed)
+            : td->my_arena
+    ;
+    assert_pointer_valid(a, "arena pointer should not be null");
+    auto* ctx = c ? c : a->my_default_ctx;
+    assert_pointer_valid(ctx, "context pointer should not be null");
+    // Is there a better place for checking the state of ctx?
+     __TBB_ASSERT(!a->my_default_ctx->is_group_execution_cancelled(),
+                  "The task will not be executed because its task_group_context is cancelled.");
+     a->enqueue_task(t, *ctx, *td);
+}
+
+d1::slot_id task_arena_impl::execution_slot(const d1::task_arena_base& ta) {
+    thread_data* td = governor::get_thread_data_if_initialized();
+    if (td && (td->is_attached_to(ta.my_arena.load(std::memory_order_relaxed)))) {
+        return td->my_arena_index;
+    }
+    return d1::slot_id(-1);
+}
+
+class nested_arena_context : no_copy {
+public:
+    nested_arena_context(thread_data& td, arena& nested_arena, std::size_t slot_index)
+        : m_orig_execute_data_ext(td.my_task_dispatcher->m_execute_data_ext)
+    {
+        if (td.my_arena != &nested_arena) {
+            m_orig_arena = td.my_arena;
+            m_orig_slot_index = td.my_arena_index;
+            m_orig_last_observer = td.my_last_observer;
+            m_orig_is_thread_registered = td.my_is_registered;
+
+            td.detach_task_dispatcher();
+            td.attach_arena(nested_arena, slot_index);
+            td.my_is_registered = false;
+            if (td.my_inbox.is_idle_state(true))
+                td.my_inbox.set_is_idle(false);
+            task_dispatcher& task_disp = td.my_arena_slot->default_task_dispatcher();
+            td.enter_task_dispatcher(task_disp, m_orig_execute_data_ext.task_disp->m_stealing_threshold);
+
+            // If the calling thread occupies the slots out of external thread reserve we need to notify the
+            // market that this arena requires one worker less.
+            if (td.my_arena_index >= td.my_arena->my_num_reserved_slots) {
+                td.my_arena->request_workers(/* mandatory_delta = */ 0, /* workers_delta = */ -1);
             }
 
-            void task_arena_impl::terminate(d1::task_arena_base& ta) {
-                arena* a = ta.my_arena.load(std::memory_order_relaxed);
-                assert_pointer_valid(a);
-                a->my_market->release(/*is_public=*/true, /*blocking_terminate=*/false);
-                a->on_thread_leaving<arena::ref_external>();
-                ta.my_arena.store(nullptr, std::memory_order_relaxed);
+            td.my_last_observer = nullptr;
+            // The task_arena::execute method considers each calling thread as an external thread.
+            td.my_arena->my_observers.notify_entry_observers(td.my_last_observer, /* worker*/false);
+        }
+
+        m_task_dispatcher = td.my_task_dispatcher;
+        m_orig_fifo_tasks_allowed = m_task_dispatcher->allow_fifo_task(true);
+        m_orig_critical_task_allowed = m_task_dispatcher->m_properties.critical_task_allowed;
+        m_task_dispatcher->m_properties.critical_task_allowed = true;
+
+        execution_data_ext& ed_ext = td.my_task_dispatcher->m_execute_data_ext;
+        ed_ext.context = td.my_arena->my_default_ctx;
+        ed_ext.original_slot = td.my_arena_index;
+        ed_ext.affinity_slot = d1::no_slot;
+        ed_ext.task_disp = td.my_task_dispatcher;
+        ed_ext.isolation = no_isolation;
+
+        __TBB_ASSERT(td.my_arena_slot, nullptr);
+        __TBB_ASSERT(td.my_arena_slot->is_occupied(), nullptr);
+        __TBB_ASSERT(td.my_task_dispatcher, nullptr);
+    }
+    ~nested_arena_context() {
+        thread_data& td = *m_task_dispatcher->m_thread_data;
+        __TBB_ASSERT(governor::is_thread_data_set(&td), nullptr);
+        m_task_dispatcher->allow_fifo_task(m_orig_fifo_tasks_allowed);
+        m_task_dispatcher->m_properties.critical_task_allowed = m_orig_critical_task_allowed;
+        if (m_orig_arena) {
+            td.my_arena->my_observers.notify_exit_observers(td.my_last_observer, /*worker*/ false);
+            td.my_last_observer = m_orig_last_observer;
+
+            // Notify the market that this thread releasing a one slot
+            // that can be used by a worker thread.
+            if (td.my_arena_index >= td.my_arena->my_num_reserved_slots) {
+                td.my_arena->request_workers(/* mandatory_delta = */ 0, /* workers_delta = */ 1);
             }
 
-            bool task_arena_impl::attach(d1::task_arena_base& ta) {
-                __TBB_ASSERT(!ta.my_arena.load(std::memory_order_relaxed), nullptr);
-                thread_data* td = governor::get_thread_data_if_initialized();
-                if (td && td->my_arena) {
-                    arena* a = td->my_arena;
-                    // There is an active arena to attach to.
-                    // It's still used by s, so won't be destroyed right away.
-                    __TBB_ASSERT(a->my_references > 0, NULL);
-                    a->my_references += arena::ref_external;
-                    ta.my_num_reserved_slots = a->my_num_reserved_slots;
-                    ta.my_priority = arena_priority(a->my_priority_level);
-                    ta.my_max_concurrency = ta.my_num_reserved_slots + a->my_max_num_workers;
-                    __TBB_ASSERT(arena::num_arena_slots(ta.my_max_concurrency) == a->my_num_slots, NULL);
-                    ta.my_arena.store(a, std::memory_order_release);
-                    // increases market's ref count for task_arena
-                    market::global_market(/*is_public=*/true);
-                    return true;
+            td.leave_task_dispatcher();
+            td.my_arena_slot->release();
+            td.my_arena->my_exit_monitors.notify_one(); // do not relax!
+            td.my_is_registered = m_orig_is_thread_registered;
+            td.attach_arena(*m_orig_arena, m_orig_slot_index);
+            td.attach_task_dispatcher(*m_orig_execute_data_ext.task_disp);
+            __TBB_ASSERT(td.my_inbox.is_idle_state(false), nullptr);
+        }
+        td.my_task_dispatcher->m_execute_data_ext = m_orig_execute_data_ext;
+    }
+
+private:
+    execution_data_ext    m_orig_execute_data_ext{};
+    arena*              m_orig_arena{ nullptr };
+    observer_proxy*     m_orig_last_observer{ nullptr };
+    task_dispatcher*    m_task_dispatcher{ nullptr };
+    unsigned            m_orig_slot_index{};
+    bool                m_orig_fifo_tasks_allowed{};
+    bool                m_orig_critical_task_allowed{};
+    bool                m_orig_is_thread_registered{};
+};
+
+class delegated_task : public d1::task {
+    d1::delegate_base&  m_delegate;
+    concurrent_monitor& m_monitor;
+    d1::wait_context&   m_wait_ctx;
+    std::atomic<bool>   m_completed;
+    d1::task* execute(d1::execution_data& ed) override {
+        const execution_data_ext& ed_ext = static_cast<const execution_data_ext&>(ed);
+        execution_data_ext orig_execute_data_ext = ed_ext.task_disp->m_execute_data_ext;
+        __TBB_ASSERT(&ed_ext.task_disp->m_execute_data_ext == &ed,
+            "The execute data shall point to the current task dispatcher execute data");
+        __TBB_ASSERT(ed_ext.task_disp->m_execute_data_ext.isolation == no_isolation, nullptr);
+
+        ed_ext.task_disp->m_execute_data_ext.context = ed_ext.task_disp->get_thread_data().my_arena->my_default_ctx;
+        bool fifo_task_allowed = ed_ext.task_disp->allow_fifo_task(true);
+        try_call([&] {
+            m_delegate();
+        }).on_completion([&] {
+            ed_ext.task_disp->m_execute_data_ext = orig_execute_data_ext;
+            ed_ext.task_disp->allow_fifo_task(fifo_task_allowed);
+        });
+
+        finalize();
+        return nullptr;
+    }
+    d1::task* cancel(d1::execution_data&) override {
+        finalize();
+        return nullptr;
+    }
+    void finalize() {
+        m_wait_ctx.release(); // must precede the wakeup
+        m_monitor.notify([this] (std::uintptr_t ctx) {
+            return ctx == std::uintptr_t(&m_delegate);
+        }); // do not relax, it needs a fence!
+        m_completed.store(true, std::memory_order_release);
+    }
+public:
+    delegated_task(d1::delegate_base& d, concurrent_monitor& s, d1::wait_context& wo)
+        : m_delegate(d), m_monitor(s), m_wait_ctx(wo), m_completed{ false }{}
+    ~delegated_task() override {
+        // The destructor can be called earlier than the m_monitor is notified
+        // because the waiting thread can be released after m_wait_ctx.release_wait.
+        // To close that race we wait for the m_completed signal.
+        spin_wait_until_eq(m_completed, true);
+    }
+};
+
+void task_arena_impl::execute(d1::task_arena_base& ta, d1::delegate_base& d) {
+    arena* a = ta.my_arena.load(std::memory_order_relaxed);
+    __TBB_ASSERT(a != nullptr, nullptr);
+    thread_data* td = governor::get_thread_data();
+
+    bool same_arena = td->my_arena == a;
+    std::size_t index1 = td->my_arena_index;
+    if (!same_arena) {
+        index1 = a->occupy_free_slot</*as_worker */false>(*td);
+        if (index1 == arena::out_of_arena) {
+            concurrent_monitor::thread_context waiter((std::uintptr_t)&d);
+            d1::wait_context wo(1);
+            d1::task_group_context exec_context(d1::task_group_context::isolated);
+            task_group_context_impl::copy_fp_settings(exec_context, *a->my_default_ctx);
+
+            delegated_task dt(d, a->my_exit_monitors, wo);
+            a->enqueue_task( dt, exec_context, *td);
+            size_t index2 = arena::out_of_arena;
+            do {
+                a->my_exit_monitors.prepare_wait(waiter);
+                if (!wo.continue_execution()) {
+                    a->my_exit_monitors.cancel_wait(waiter);
+                    break;
+                }
+                index2 = a->occupy_free_slot</*as_worker*/false>(*td);
+                if (index2 != arena::out_of_arena) {
+                    a->my_exit_monitors.cancel_wait(waiter);
+                    nested_arena_context scope(*td, *a, index2 );
+                    r1::wait(wo, exec_context);
+                    __TBB_ASSERT(!exec_context.my_exception.load(std::memory_order_relaxed), nullptr); // exception can be thrown above, not deferred
+                    break;
                 }
-                return false;
+                a->my_exit_monitors.commit_wait(waiter);
+            } while (wo.continue_execution());
+            if (index2 == arena::out_of_arena) {
+                // notify a waiting thread even if this thread did not enter arena,
+                // in case it was woken by a leaving thread but did not need to enter
+                a->my_exit_monitors.notify_one(); // do not relax!
             }
-
-            void task_arena_impl::enqueue(d1::task& t, d1::task_group_context* c, d1::task_arena_base* ta) {
-                thread_data* td
-                        = governor::get_thread_data();// thread data is only needed for FastRandom instance
-                assert_pointer_valid(td, "thread_data pointer should not be null");
-                arena* a = ta ? ta->my_arena.load(std::memory_order_relaxed) : td->my_arena;
-                assert_pointer_valid(a, "arena pointer should not be null");
-                auto* ctx = c ? c : a->my_default_ctx;
-                assert_pointer_valid(ctx, "context pointer should not be null");
-                // Is there a better place for checking the state of ctx?
-                __TBB_ASSERT(!a->my_default_ctx->is_group_execution_cancelled(),
-                             "The task will not be executed because its task_group_context is cancelled.");
-                a->enqueue_task(t, *ctx, *td);
+            // process possible exception
+            auto exception = exec_context.my_exception.load(std::memory_order_acquire);
+            if (exception) {
+                __TBB_ASSERT(exec_context.is_group_execution_cancelled(), "The task group context with an exception should be canceled.");
+                exception->throw_self();
             }
-
-            class nested_arena_context : no_copy {
-            public:
-                nested_arena_context(thread_data& td, arena& nested_arena, std::size_t slot_index)
-                    : m_orig_execute_data_ext(td.my_task_dispatcher->m_execute_data_ext) {
-                    if (td.my_arena != &nested_arena) {
-                        m_orig_arena = td.my_arena;
-                        m_orig_slot_index = td.my_arena_index;
-                        m_orig_last_observer = td.my_last_observer;
-
-                        td.detach_task_dispatcher();
-                        td.attach_arena(nested_arena, slot_index);
-                        if (td.my_inbox.is_idle_state(true)) td.my_inbox.set_is_idle(false);
-                        task_dispatcher& task_disp = td.my_arena_slot->default_task_dispatcher();
-                        task_disp.set_stealing_threshold(
-                                m_orig_execute_data_ext.task_disp->m_stealing_threshold);
-                        td.attach_task_dispatcher(task_disp);
-
-                        // If the calling thread occupies the slots out of external thread reserve we need to notify the
-                        // market that this arena requires one worker less.
-                        if (td.my_arena_index >= td.my_arena->my_num_reserved_slots) {
-                            td.my_arena->my_market->adjust_demand(*td.my_arena, /* delta = */ -1,
-                                                                  /* mandatory = */ false);
-                        }
-
-                        td.my_last_observer = nullptr;
-                        // The task_arena::execute method considers each calling thread as an external thread.
-                        td.my_arena->my_observers.notify_entry_observers(td.my_last_observer,
-                                                                         /* worker*/ false);
-                    }
-
-                    m_task_dispatcher = td.my_task_dispatcher;
-                    m_orig_fifo_tasks_allowed = m_task_dispatcher->allow_fifo_task(true);
-                    m_orig_critical_task_allowed = m_task_dispatcher->m_properties.critical_task_allowed;
-                    m_task_dispatcher->m_properties.critical_task_allowed = true;
-
-                    execution_data_ext& ed_ext = td.my_task_dispatcher->m_execute_data_ext;
-                    ed_ext.context = td.my_arena->my_default_ctx;
-                    ed_ext.original_slot = td.my_arena_index;
-                    ed_ext.affinity_slot = d1::no_slot;
-                    ed_ext.task_disp = td.my_task_dispatcher;
-                    ed_ext.isolation = no_isolation;
-
-                    __TBB_ASSERT(td.my_arena_slot, nullptr);
-                    __TBB_ASSERT(td.my_arena_slot->is_occupied(), nullptr);
-                    __TBB_ASSERT(td.my_task_dispatcher, nullptr);
-                }
-                ~nested_arena_context() {
-                    thread_data& td = *m_task_dispatcher->m_thread_data;
-                    __TBB_ASSERT(governor::is_thread_data_set(&td), nullptr);
-                    m_task_dispatcher->allow_fifo_task(m_orig_fifo_tasks_allowed);
-                    m_task_dispatcher->m_properties.critical_task_allowed = m_orig_critical_task_allowed;
-                    if (m_orig_arena) {
-                        td.my_arena->my_observers.notify_exit_observers(td.my_last_observer,
-                                                                        /*worker*/ false);
-                        td.my_last_observer = m_orig_last_observer;
-
-                        // Notify the market that this thread releasing a one slot
-                        // that can be used by a worker thread.
-                        if (td.my_arena_index >= td.my_arena->my_num_reserved_slots) {
-                            td.my_arena->my_market->adjust_demand(*td.my_arena, /* delta = */ 1,
-                                                                  /* mandatory = */ false);
-                        }
-
-                        td.my_task_dispatcher->set_stealing_threshold(0);
-                        td.detach_task_dispatcher();
-                        td.my_arena_slot->release();
-                        td.my_arena->my_exit_monitors.notify_one();// do not relax!
-
-                        td.attach_arena(*m_orig_arena, m_orig_slot_index);
-                        td.attach_task_dispatcher(*m_orig_execute_data_ext.task_disp);
-                        __TBB_ASSERT(td.my_inbox.is_idle_state(false), nullptr);
-                    }
-                    td.my_task_dispatcher->m_execute_data_ext = m_orig_execute_data_ext;
-                }
-
-            private:
-                execution_data_ext m_orig_execute_data_ext {};
-                arena* m_orig_arena {nullptr};
-                observer_proxy* m_orig_last_observer {nullptr};
-                task_dispatcher* m_task_dispatcher {nullptr};
-                unsigned m_orig_slot_index {};
-                bool m_orig_fifo_tasks_allowed {};
-                bool m_orig_critical_task_allowed {};
-            };
-
-            class delegated_task : public d1::task {
-                d1::delegate_base& m_delegate;
-                concurrent_monitor& m_monitor;
-                d1::wait_context& m_wait_ctx;
-                std::atomic<bool> m_completed;
-                d1::task* execute(d1::execution_data& ed) override {
-                    const execution_data_ext& ed_ext = static_cast<const execution_data_ext&>(ed);
-                    execution_data_ext orig_execute_data_ext = ed_ext.task_disp->m_execute_data_ext;
-                    __TBB_ASSERT(&ed_ext.task_disp->m_execute_data_ext == &ed,
-                                 "The execute data shall point to the current task dispatcher execute data");
-                    __TBB_ASSERT(ed_ext.task_disp->m_execute_data_ext.isolation == no_isolation, nullptr);
-
-                    ed_ext.task_disp->m_execute_data_ext.context
-                            = ed_ext.task_disp->get_thread_data().my_arena->my_default_ctx;
-                    bool fifo_task_allowed = ed_ext.task_disp->allow_fifo_task(true);
-                    try_call([&] { m_delegate(); }).on_completion([&] {
-                        ed_ext.task_disp->m_execute_data_ext = orig_execute_data_ext;
-                        ed_ext.task_disp->allow_fifo_task(fifo_task_allowed);
-                    });
-
-                    finalize();
-                    return nullptr;
-                }
-                d1::task* cancel(d1::execution_data&) override {
-                    finalize();
-                    return nullptr;
-                }
-                void finalize() {
-                    m_wait_ctx.release();// must precede the wakeup
-                    m_monitor.notify([this](std::uintptr_t ctx) {
-                        return ctx == std::uintptr_t(&m_delegate);
-                    });// do not relax, it needs a fence!
-                    m_completed.store(true, std::memory_order_release);
-                }
-
-            public:
-                delegated_task(d1::delegate_base& d, concurrent_monitor& s, d1::wait_context& wo)
-                    : m_delegate(d), m_monitor(s), m_wait_ctx(wo), m_completed {false} {}
-                ~delegated_task() {
-                    // The destructor can be called earlier than the m_monitor is notified
-                    // because the waiting thread can be released after m_wait_ctx.release_wait.
-                    // To close that race we wait for the m_completed signal.
-                    spin_wait_until_eq(m_completed, true);
-                }
-            };
-
-            void task_arena_impl::execute(d1::task_arena_base& ta, d1::delegate_base& d) {
-                arena* a = ta.my_arena.load(std::memory_order_relaxed);
-                __TBB_ASSERT(a != nullptr, nullptr);
-                thread_data* td = governor::get_thread_data();
-
-                bool same_arena = td->my_arena == a;
-                std::size_t index1 = td->my_arena_index;
-                if (!same_arena) {
-                    index1 = a->occupy_free_slot</*as_worker */ false>(*td);
-                    if (index1 == arena::out_of_arena) {
-                        concurrent_monitor::thread_context waiter((std::uintptr_t) &d);
-                        d1::wait_context wo(1);
-                        d1::task_group_context exec_context(d1::task_group_context::isolated);
-                        task_group_context_impl::copy_fp_settings(exec_context, *a->my_default_ctx);
-
-                        delegated_task dt(d, a->my_exit_monitors, wo);
-                        a->enqueue_task(dt, exec_context, *td);
-                        size_t index2 = arena::out_of_arena;
-                        do {
-                            a->my_exit_monitors.prepare_wait(waiter);
-                            if (!wo.continue_execution()) {
-                                a->my_exit_monitors.cancel_wait(waiter);
-                                break;
-                            }
-                            index2 = a->occupy_free_slot</*as_worker*/ false>(*td);
-                            if (index2 != arena::out_of_arena) {
-                                a->my_exit_monitors.cancel_wait(waiter);
-                                nested_arena_context scope(*td, *a, index2);
-                                r1::wait(wo, exec_context);
-                                __TBB_ASSERT(!exec_context.my_exception.load(std::memory_order_relaxed),
-                                             nullptr);// exception can be thrown above, not deferred
-                                break;
-                            }
-                            a->my_exit_monitors.commit_wait(waiter);
-                        } while (wo.continue_execution());
-                        if (index2 == arena::out_of_arena) {
-                            // notify a waiting thread even if this thread did not enter arena,
-                            // in case it was woken by a leaving thread but did not need to enter
-                            a->my_exit_monitors.notify_one();// do not relax!
-                        }
-                        // process possible exception
-                        auto exception = exec_context.my_exception.load(std::memory_order_acquire);
-                        if (exception) {
-                            __TBB_ASSERT(exec_context.is_group_execution_cancelled(),
-                                         "The task group context with an exception should be canceled.");
-                            exception->throw_self();
-                        }
-                        __TBB_ASSERT(governor::is_thread_data_set(td), nullptr);
-                        return;
-                    }// if (index1 == arena::out_of_arena)
-                }    // if (!same_arena)
-
-                context_guard_helper</*report_tasks=*/false> context_guard;
-                context_guard.set_ctx(a->my_default_ctx);
-                nested_arena_context scope(*td, *a, index1);
+            __TBB_ASSERT(governor::is_thread_data_set(td), nullptr);
+            return;
+        } // if (index1 == arena::out_of_arena)
+    } // if (!same_arena)
+
+    context_guard_helper</*report_tasks=*/false> context_guard;
+    context_guard.set_ctx(a->my_default_ctx);
+    nested_arena_context scope(*td, *a, index1);
 #if _WIN64
-                try {
+    try {
 #endif
-                    d();
-                    __TBB_ASSERT(same_arena || governor::is_thread_data_set(td), nullptr);
+        d();
+        __TBB_ASSERT(same_arena || governor::is_thread_data_set(td), nullptr);
 #if _WIN64
-                } catch (...) {
-                    context_guard.restore_default();
-                    throw;
-                }
+    } catch (...) {
+        context_guard.restore_default();
+        throw;
+    }
 #endif
-            }
-
-            void task_arena_impl::wait(d1::task_arena_base& ta) {
-                arena* a = ta.my_arena.load(std::memory_order_relaxed);
-                __TBB_ASSERT(a != nullptr, nullptr);
-                thread_data* td = governor::get_thread_data();
-                __TBB_ASSERT_EX(td, "Scheduler is not initialized");
-                __TBB_ASSERT(td->my_arena != a || td->my_arena_index == 0,
-                             "internal_wait is not supported within a worker context");
-                if (a->my_max_num_workers != 0) {
-                    while (a->num_workers_active()
-                           || a->my_pool_state.load(std::memory_order_acquire) != arena::SNAPSHOT_EMPTY) {
-                        yield();
-                    }
-                }
-            }
-
-            int task_arena_impl::max_concurrency(const d1::task_arena_base* ta) {
-                arena* a = nullptr;
-                if (ta)// for special cases of ta->max_concurrency()
-                    a = ta->my_arena.load(std::memory_order_relaxed);
-                else if (thread_data* td = governor::get_thread_data_if_initialized())
-                    a = td->my_arena;// the current arena if any
-
-                if (a) {// Get parameters from the arena
-                    __TBB_ASSERT(!ta || ta->my_max_concurrency == 1, NULL);
-                    return a->my_num_reserved_slots + a->my_max_num_workers
-#if __TBB_ENQUEUE_ENFORCED_CONCURRENCY
-                           + (a->my_local_concurrency_flag.test() ? 1 : 0)
-#endif
-                            ;
-                }
-
-                if (ta && ta->my_max_concurrency == 1) { return 1; }
+}
+
+void task_arena_impl::wait(d1::task_arena_base& ta) {
+    arena* a = ta.my_arena.load(std::memory_order_relaxed);
+    __TBB_ASSERT(a != nullptr, nullptr);
+    thread_data* td = governor::get_thread_data();
+    __TBB_ASSERT_EX(td, "Scheduler is not initialized");
+    __TBB_ASSERT(td->my_arena != a || td->my_arena_index == 0, "internal_wait is not supported within a worker context" );
+    if (a->my_max_num_workers != 0) {
+        while (a->num_workers_active() || !a->is_empty()) {
+            yield();
+        }
+    }
+}
+
+int task_arena_impl::max_concurrency(const d1::task_arena_base *ta) {
+    arena* a = nullptr;
+    if( ta ) // for special cases of ta->max_concurrency()
+        a = ta->my_arena.load(std::memory_order_relaxed);
+    else if( thread_data* td = governor::get_thread_data_if_initialized() )
+        a = td->my_arena; // the current arena if any
+
+    if( a ) { // Get parameters from the arena
+        __TBB_ASSERT( !ta || ta->my_max_concurrency==1, nullptr);
+        int mandatory_worker = 0;
+        if (a->is_arena_workerless() && a->my_num_reserved_slots == 1) {
+            mandatory_worker = a->my_mandatory_concurrency.test() ? 1 : 0;
+        }
+        return a->my_num_reserved_slots + a->my_max_num_workers + mandatory_worker;
+    }
+
+    if (ta && ta->my_max_concurrency == 1) {
+        return 1;
+    }
 
 #if __TBB_ARENA_BINDING
-                if (ta) {
-#if __TBB_PREVIEW_TASK_ARENA_CONSTRAINTS_EXTENSION_PRESENT
-                    d1::constraints arena_constraints
-                            = d1::constraints {}
-                                      .set_numa_id(ta->my_numa_id)
-                                      .set_core_type(ta->core_type())
-                                      .set_max_threads_per_core(ta->max_threads_per_core());
-                    return (int) default_concurrency(arena_constraints);
-#else  /*!__TBB_PREVIEW_TASK_ARENA_CONSTRAINTS_EXTENSION_PRESENT*/
-                    return (int) default_concurrency(ta->my_numa_id);
-#endif /*!__TBB_PREVIEW_TASK_ARENA_CONSTRAINTS_EXTENSION_PRESENT*/
-                }
+    if (ta) {
+        d1::constraints arena_constraints = d1::constraints{}
+            .set_numa_id(ta->my_numa_id)
+            .set_core_type(ta->core_type())
+            .set_max_threads_per_core(ta->max_threads_per_core());
+        return (int)default_concurrency(arena_constraints);
+    }
 #endif /*!__TBB_ARENA_BINDING*/
 
-                __TBB_ASSERT(!ta || ta->my_max_concurrency == d1::task_arena_base::automatic, NULL);
-                return int(governor::default_num_threads());
-            }
-
-            void isolate_within_arena(d1::delegate_base& d, std::intptr_t isolation) {
-                // TODO: Decide what to do if the scheduler is not initialized. Is there a use case for it?
-                thread_data* tls = governor::get_thread_data();
-                assert_pointers_valid(tls, tls->my_task_dispatcher);
-                task_dispatcher* dispatcher = tls->my_task_dispatcher;
-                isolation_type previous_isolation = dispatcher->m_execute_data_ext.isolation;
-                try_call([&] {
-                    // We temporarily change the isolation tag of the currently running task. It will be restored in the destructor of the guard.
-                    isolation_type current_isolation
-                            = isolation ? isolation : reinterpret_cast<isolation_type>(&d);
-                    // Save the current isolation value and set new one
-                    previous_isolation = dispatcher->set_isolation(current_isolation);
-                    // Isolation within this callable
-                    d();
-                }).on_completion([&] {
-                    __TBB_ASSERT(governor::get_thread_data()->my_task_dispatcher == dispatcher, NULL);
-                    dispatcher->set_isolation(previous_isolation);
-                });
-            }
+    __TBB_ASSERT(!ta || ta->my_max_concurrency==d1::task_arena_base::automatic, nullptr);
+    return int(governor::default_num_threads());
+}
+
+#if __TBB_PREVIEW_PARALLEL_PHASE
+void task_arena_impl::enter_parallel_phase(d1::task_arena_base* ta, std::uintptr_t /*reserved*/) {
+    arena* a = ta ? ta->my_arena.load(std::memory_order_relaxed) : governor::get_thread_data()->my_arena;
+    __TBB_ASSERT(a, nullptr);
+    a->my_thread_leave.register_parallel_phase();
+    a->advertise_new_work<arena::work_enqueued>();
+}
+
+void task_arena_impl::exit_parallel_phase(d1::task_arena_base* ta, std::uintptr_t flags) {
+    arena* a = ta ? ta->my_arena.load(std::memory_order_relaxed) : governor::get_thread_data()->my_arena;
+    __TBB_ASSERT(a, nullptr);
+    a->my_thread_leave.unregister_parallel_phase(/*with_fast_leave=*/static_cast<bool>(flags));
+}
+#endif
 
-        }// namespace r1
-    }    // namespace detail
-}// namespace tbb
+void isolate_within_arena(d1::delegate_base& d, std::intptr_t isolation) {
+    // TODO: Decide what to do if the scheduler is not initialized. Is there a use case for it?
+    thread_data* tls = governor::get_thread_data();
+    assert_pointers_valid(tls, tls->my_task_dispatcher);
+    task_dispatcher* dispatcher = tls->my_task_dispatcher;
+    isolation_type previous_isolation = dispatcher->m_execute_data_ext.isolation;
+    try_call([&] {
+        // We temporarily change the isolation tag of the currently running task. It will be restored in the destructor of the guard.
+        isolation_type current_isolation = isolation ? isolation : reinterpret_cast<isolation_type>(&d);
+        // Save the current isolation value and set new one
+        previous_isolation = dispatcher->set_isolation(current_isolation);
+        // Isolation within this callable
+        d();
+    }).on_completion([&] {
+        __TBB_ASSERT(governor::get_thread_data()->my_task_dispatcher == dispatcher, nullptr);
+        dispatcher->set_isolation(previous_isolation);
+    });
+}
+
+} // namespace r1
+} // namespace detail
+} // namespace tbb
diff --git a/external/tbb/src/tbb/arena.h b/external/tbb/src/tbb/arena.h
index 0479cf53..71aba8fa 100644
--- a/external/tbb/src/tbb/arena.h
+++ b/external/tbb/src/tbb/arena.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2025 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -21,6 +21,8 @@
 #include <cstring>
 
 #include "oneapi/tbb/detail/_task.h"
+#include "oneapi/tbb/detail/_utils.h"
+#include "oneapi/tbb/spin_mutex.h"
 
 #include "scheduler_common.h"
 #include "intrusive_list.h"
@@ -28,11 +30,11 @@
 #include "arena_slot.h"
 #include "rml_tbb.h"
 #include "mailbox.h"
-#include "market.h"
 #include "governor.h"
 #include "concurrent_monitor.h"
 #include "observer_proxy.h"
-#include "oneapi/tbb/spin_mutex.h"
+#include "thread_control_monitor.h"
+#include "threading_control_client.h"
 
 namespace tbb {
 namespace detail {
@@ -40,6 +42,7 @@ namespace r1 {
 
 class task_dispatcher;
 class task_group_context;
+class threading_control;
 class allocate_root_with_context_proxy;
 
 #if __TBB_ARENA_BINDING
@@ -133,11 +136,10 @@ struct stack_anchor_type {
     stack_anchor_type(const stack_anchor_type&) = delete;
 };
 
-#if __TBB_ENQUEUE_ENFORCED_CONCURRENCY
 class atomic_flag {
     static const std::uintptr_t SET = 1;
-    static const std::uintptr_t EMPTY = 0;
-    std::atomic<std::uintptr_t> my_state;
+    static const std::uintptr_t UNSET = 0;
+    std::atomic<std::uintptr_t> my_state{UNSET};
 public:
     bool test_and_set() {
         std::uintptr_t state = my_state.load(std::memory_order_acquire);
@@ -149,13 +151,13 @@ class atomic_flag {
                 // We interrupted clear transaction
                 return false;
             }
-            if (state != EMPTY) {
+            if (state != UNSET) {
                 // We lost our epoch
                 return false;
             }
             // We are too late but still in the same epoch
             __TBB_fallthrough;
-        case EMPTY:
+        case UNSET:
             return my_state.compare_exchange_strong(state, SET);
         }
     }
@@ -165,21 +167,85 @@ class atomic_flag {
         std::uintptr_t state = my_state.load(std::memory_order_acquire);
         if (state == SET && my_state.compare_exchange_strong(state, busy)) {
             if (pred()) {
-                return my_state.compare_exchange_strong(busy, EMPTY);
+                return my_state.compare_exchange_strong(busy, UNSET);
             }
             // The result of the next operation is discarded, always false should be returned.
             my_state.compare_exchange_strong(busy, SET);
         }
         return false;
     }
-    void clear() {
-        my_state.store(EMPTY, std::memory_order_release);
+    bool test(std::memory_order order = std::memory_order_acquire) {
+        return my_state.load(order) != UNSET;
+    }
+};
+
+#if __TBB_PREVIEW_PARALLEL_PHASE
+class thread_leave_manager {
+    static const std::uintptr_t DELAYED_LEAVE       = 0;
+    static const std::uintptr_t FAST_LEAVE          = 1;
+    static const std::uintptr_t ONE_TIME_FAST_LEAVE = 1 << 1;
+    static const std::uintptr_t PARALLEL_PHASE      = 1 << 2;
+
+    std::atomic<std::uintptr_t> my_state{UINTPTR_MAX};
+public:
+    // This method is not thread-safe!
+    // Required to be called after construction to set initial state of the state machine.
+    void set_initial_state(tbb::task_arena::leave_policy lp) {
+        if (lp == tbb::task_arena::leave_policy::automatic) {
+            std::uintptr_t platform_policy = governor::hybrid_cpu() ? FAST_LEAVE : DELAYED_LEAVE;
+            my_state.store(platform_policy, std::memory_order_relaxed);
+        } else {
+            __TBB_ASSERT(lp == tbb::task_arena::leave_policy::fast,
+                         "Was the new value introduced for leave policy?");
+            my_state.store(FAST_LEAVE, std::memory_order_relaxed);
+        }
+    }
+
+    void reset_if_needed() {
+        std::uintptr_t curr = my_state.load(std::memory_order_relaxed);
+        if (curr == ONE_TIME_FAST_LEAVE) {
+            // Potentially can override decision of the parallel phase from future epoch
+            // but it is not a problem because it does not violate the correctness
+            my_state.fetch_and(~ONE_TIME_FAST_LEAVE);
+        }
+    }
+
+    // Indicate start of parallel phase in the state machine
+    void register_parallel_phase() {
+        __TBB_ASSERT(my_state.load(std::memory_order_relaxed) != UINTPTR_MAX, "The initial state was not set");
+
+        std::uintptr_t prev = my_state.fetch_add(PARALLEL_PHASE);
+        __TBB_ASSERT(prev + PARALLEL_PHASE > prev, "Overflow detected");
+        if (prev & ONE_TIME_FAST_LEAVE) {
+            // State was previously transitioned to "One-time Fast leave", thus with the start
+            // of new parallel phase, it should be reset
+            my_state.fetch_and(~ONE_TIME_FAST_LEAVE);
+        }
+    }
+
+    // Indicate the end of parallel phase in the state machine
+    void unregister_parallel_phase(bool enable_fast_leave) {
+        std::uintptr_t prev = my_state.load(std::memory_order_relaxed);
+        __TBB_ASSERT(prev != UINTPTR_MAX, "The initial state was not set");
+
+        std::uintptr_t desired{};
+        do {
+            __TBB_ASSERT(prev - PARALLEL_PHASE < prev,
+                         "A call to unregister without its register complement");
+            desired = prev - PARALLEL_PHASE; // Mark the end of this phase in reference counter
+            if (enable_fast_leave && /*it was the last parallel phase*/desired == DELAYED_LEAVE) {
+                desired = ONE_TIME_FAST_LEAVE;
+            }
+        } while (!my_state.compare_exchange_strong(prev, desired));
     }
-    bool test() {
-        return my_state.load(std::memory_order_acquire) != EMPTY;
+
+    bool is_retention_allowed() {
+        std::uintptr_t curr = my_state.load(std::memory_order_relaxed);
+        __TBB_ASSERT(curr != UINTPTR_MAX, "The initial state was not set");
+        return curr != FAST_LEAVE && curr != ONE_TIME_FAST_LEAVE;
     }
 };
-#endif
+#endif /* __TBB_PREVIEW_PARALLEL_PHASE */
 
 //! The structure of an arena, except the array of slots.
 /** Separated in order to simplify padding.
@@ -220,60 +286,46 @@ struct arena_base : padded<intrusive_list_node> {
     //! The total number of workers that are requested from the resource manager.
     int my_total_num_workers_requested;
 
-    //! The number of workers that are really requested from the resource manager.
-    //! Possible values are in [0, my_max_num_workers]
-    int my_num_workers_requested;
-
     //! The index in the array of per priority lists of arenas this object is in.
     /*const*/ unsigned my_priority_level;
 
-    //! The max priority level of arena in market.
+    //! The max priority level of arena in permit manager.
     std::atomic<bool> my_is_top_priority{false};
 
     //! Current task pool state and estimate of available tasks amount.
-    /** The estimate is either 0 (SNAPSHOT_EMPTY) or infinity (SNAPSHOT_FULL).
-        Special state is "busy" (any other unsigned value).
-        Note that the implementation of arena::is_busy_or_empty() requires
-        my_pool_state to be unsigned. */
-    using pool_state_t = std::uintptr_t ;
-    std::atomic<pool_state_t> my_pool_state;
+    atomic_flag my_pool_state;
 
     //! The list of local observers attached to this arena.
     observer_list my_observers;
 
 #if __TBB_ARENA_BINDING
     //! Pointer to internal observer that allows to bind threads in arena to certain NUMA node.
-    numa_binding_observer* my_numa_binding_observer;
+    numa_binding_observer* my_numa_binding_observer{nullptr};
 #endif /*__TBB_ARENA_BINDING*/
 
     // Below are rarely modified members
 
-    //! The market that owns this arena.
-    market* my_market;
+    threading_control* my_threading_control;
 
     //! Default task group context.
     d1::task_group_context* my_default_ctx;
 
-#if __TBB_ENQUEUE_ENFORCED_CONCURRENCY
-    // arena needs an extra worker despite a global limit
-    std::atomic<bool> my_global_concurrency_mode;
-#endif /* __TBB_ENQUEUE_ENFORCED_CONCURRENCY */
-
     //! Waiting object for external threads that cannot join the arena.
     concurrent_monitor my_exit_monitors;
 
+#if __TBB_PREVIEW_PARALLEL_PHASE
+    //! Manages state of thread_leave state machine
+    thread_leave_manager my_thread_leave;
+#endif
+
     //! Coroutines (task_dispathers) cache buffer
     arena_co_cache my_co_cache;
 
-#if __TBB_ENQUEUE_ENFORCED_CONCURRENCY
     // arena needs an extra worker despite the arena limit
-    atomic_flag my_local_concurrency_flag;
+    atomic_flag my_mandatory_concurrency;
     // the number of local mandatory concurrency requests
-    int my_local_concurrency_requests;
-#endif /* __TBB_ENQUEUE_ENFORCED_CONCURRENCY*/
+    int my_mandatory_requests;
 
-    //! ABA prevention marker.
-    std::uintptr_t my_aba_epoch;
     //! The number of slots in the arena.
     unsigned my_num_slots;
     //! The number of reserved slots (can be occupied only by external threads).
@@ -281,11 +333,7 @@ struct arena_base : padded<intrusive_list_node> {
     //! The number of workers requested by the external thread owning the arena.
     unsigned my_max_num_workers;
 
-    //! The target serialization epoch for callers of adjust_job_count_estimate
-    int my_adjust_demand_target_epoch;
-
-    //! The current serialization epoch for callers of adjust_job_count_estimate
-    d1::waitable_atomic<int> my_adjust_demand_current_epoch;
+    threading_control_client my_tc_client;
 
 #if TBB_USE_ASSERT
     //! Used to trap accesses to the object after its destruction.
@@ -306,17 +354,33 @@ class arena: public padded<arena_base>
     };
 
     //! Constructor
-    arena ( market& m, unsigned max_num_workers, unsigned num_reserved_slots, unsigned priority_level);
+    arena(threading_control* control, unsigned max_num_workers, unsigned num_reserved_slots, unsigned priority_level
+#if __TBB_PREVIEW_PARALLEL_PHASE
+          , tbb::task_arena::leave_policy lp
+#endif
+    );
 
     //! Allocate an instance of arena.
-    static arena& allocate_arena( market& m, unsigned num_slots, unsigned num_reserved_slots,
-                                  unsigned priority_level );
+    static arena& allocate_arena(threading_control* control, unsigned num_slots, unsigned num_reserved_slots,
+                                 unsigned priority_level
+#if __TBB_PREVIEW_PARALLEL_PHASE
+                                 , tbb::task_arena::leave_policy lp
+#endif
+    );
+
+    static arena& create(threading_control* control, unsigned num_slots, unsigned num_reserved_slots,
+                         unsigned arena_priority_level,
+                         d1::constraints constraints = d1::constraints{}
+#if __TBB_PREVIEW_PARALLEL_PHASE
+                         , tbb::task_arena::leave_policy lp = tbb::task_arena::leave_policy::automatic
+#endif
+    );
 
-    static int unsigned num_arena_slots ( unsigned num_slots ) {
-        return max(2u, num_slots);
+    static int unsigned num_arena_slots ( unsigned num_slots, unsigned num_reserved_slots ) {
+        return num_reserved_slots == 0 ? num_slots : max(2u, num_slots);
     }
 
-    static int allocation_size ( unsigned num_slots ) {
+    static int allocation_size( unsigned num_slots ) {
         return sizeof(base_type) + num_slots * (sizeof(mail_outbox) + sizeof(arena_slot) + sizeof(task_dispatcher));
     }
 
@@ -328,13 +392,7 @@ class arena: public padded<arena_base>
     }
 
     //! Completes arena shutdown, destructs and deallocates it.
-    void free_arena ();
-
-    //! No tasks to steal since last snapshot was taken
-    static const pool_state_t SNAPSHOT_EMPTY = 0;
-
-    //! At least one task has been offered for stealing since the last snapshot started
-    static const pool_state_t SNAPSHOT_FULL = pool_state_t(-1);
+    void free_arena();
 
     //! The number of least significant bits for external references
     static const unsigned ref_external_bits = 12; // up to 4095 external and 1M workers
@@ -343,9 +401,6 @@ class arena: public padded<arena_base>
     static const unsigned ref_external = 1;
     static const unsigned ref_worker   = 1 << ref_external_bits;
 
-    //! No tasks to steal or snapshot is being taken.
-    static bool is_busy_or_empty( pool_state_t s ) { return s < SNAPSHOT_FULL; }
-
     //! The number of workers active in the arena.
     unsigned num_workers_active() const {
         return my_references.load(std::memory_order_acquire) >> ref_external_bits;
@@ -356,6 +411,8 @@ class arena: public padded<arena_base>
         return num_workers_active() > my_num_workers_allotted.load(std::memory_order_relaxed);
     }
 
+    void request_workers(int mandatory_delta, int workers_delta, bool wakeup_threads = false);
+
     //! If necessary, raise a flag that there is new job in arena.
     template<arena::new_work_type work_type> void advertise_new_work();
 
@@ -372,8 +429,7 @@ class arena: public padded<arena_base>
 #endif
 
     //! Check if there is job anywhere in arena.
-    /** Return true if no job or if arena is being cleaned up. */
-    bool is_out_of_work();
+    void out_of_work();
 
     //! enqueue a task into starvation-resistance queue
     void enqueue_task(d1::task&, d1::task_group_context&, thread_data&);
@@ -382,12 +438,19 @@ class arena: public padded<arena_base>
     void process(thread_data&);
 
     //! Notification that the thread leaves its arena
-    template<unsigned ref_param>
-    inline void on_thread_leaving ( );
 
-    //! Check for the presence of enqueued tasks at all priority levels
+    void on_thread_leaving(unsigned ref_param);
+
+    //! Check for the presence of enqueued tasks
     bool has_enqueued_tasks();
 
+    //! Check for the presence of any tasks
+    bool has_tasks();
+
+    bool is_empty() { return my_pool_state.test() == /* EMPTY */ false; }
+
+    thread_control_monitor& get_waiting_threads_monitor();
+
     static const std::size_t out_of_arena = ~size_t(0);
     //! Tries to occupy a slot in the arena. On success, returns the slot index; if no slot is available, returns out_of_arena.
     template <bool as_worker>
@@ -397,118 +460,47 @@ class arena: public padded<arena_base>
 
     std::uintptr_t calculate_stealing_threshold();
 
-    /** Must be the last data field */
-    arena_slot my_slots[1];
-}; // class arena
+    unsigned priority_level() { return my_priority_level; }
 
-template<unsigned ref_param>
-inline void arena::on_thread_leaving ( ) {
-    //
-    // Implementation of arena destruction synchronization logic contained various
-    // bugs/flaws at the different stages of its evolution, so below is a detailed
-    // description of the issues taken into consideration in the framework of the
-    // current design.
-    //
-    // In case of using fire-and-forget tasks (scheduled via task::enqueue())
-    // external thread is allowed to leave its arena before all its work is executed,
-    // and market may temporarily revoke all workers from this arena. Since revoked
-    // workers never attempt to reset arena state to EMPTY and cancel its request
-    // to RML for threads, the arena object is destroyed only when both the last
-    // thread is leaving it and arena's state is EMPTY (that is its external thread
-    // left and it does not contain any work).
-    // Thus resetting arena to EMPTY state (as earlier TBB versions did) should not
-    // be done here (or anywhere else in the external thread to that matter); doing so
-    // can result either in arena's premature destruction (at least without
-    // additional costly checks in workers) or in unnecessary arena state changes
-    // (and ensuing workers migration).
-    //
-    // A worker that checks for work presence and transitions arena to the EMPTY
-    // state (in snapshot taking procedure arena::is_out_of_work()) updates
-    // arena::my_pool_state first and only then arena::my_num_workers_requested.
-    // So the check for work absence must be done against the latter field.
-    //
-    // In a time window between decrementing the active threads count and checking
-    // if there is an outstanding request for workers. New worker thread may arrive,
-    // finish remaining work, set arena state to empty, and leave decrementing its
-    // refcount and destroying. Then the current thread will destroy the arena
-    // the second time. To preclude it a local copy of the outstanding request
-    // value can be stored before decrementing active threads count.
-    //
-    // But this technique may cause two other problem. When the stored request is
-    // zero, it is possible that arena still has threads and they can generate new
-    // tasks and thus re-establish non-zero requests. Then all the threads can be
-    // revoked (as described above) leaving this thread the last one, and causing
-    // it to destroy non-empty arena.
-    //
-    // The other problem takes place when the stored request is non-zero. Another
-    // thread may complete the work, set arena state to empty, and leave without
-    // arena destruction before this thread decrements the refcount. This thread
-    // cannot destroy the arena either. Thus the arena may be "orphaned".
-    //
-    // In both cases we cannot dereference arena pointer after the refcount is
-    // decremented, as our arena may already be destroyed.
-    //
-    // If this is the external thread, the market is protected by refcount to it.
-    // In case of workers market's liveness is ensured by the RML connection
-    // rundown protocol, according to which the client (i.e. the market) lives
-    // until RML server notifies it about connection termination, and this
-    // notification is fired only after all workers return into RML.
-    //
-    // Thus if we decremented refcount to zero we ask the market to check arena
-    // state (including the fact if it is alive) under the lock.
-    //
-    std::uintptr_t aba_epoch = my_aba_epoch;
-    unsigned priority_level = my_priority_level;
-    market* m = my_market;
-    __TBB_ASSERT(my_references.load(std::memory_order_relaxed) >= ref_param, "broken arena reference counter");
-#if __TBB_ENQUEUE_ENFORCED_CONCURRENCY
-    // When there is no workers someone must free arena, as
-    // without workers, no one calls is_out_of_work().
-    // Skip workerless arenas because they have no demand for workers.
-    // TODO: consider more strict conditions for the cleanup,
-    // because it can create the demand of workers,
-    // but the arena can be already empty (and so ready for destroying)
-    // TODO: Fix the race: while we check soft limit and it might be changed.
-    if( ref_param==ref_external && my_num_slots != my_num_reserved_slots
-        && 0 == m->my_num_workers_soft_limit.load(std::memory_order_relaxed) &&
-        !my_global_concurrency_mode.load(std::memory_order_relaxed) ) {
-        is_out_of_work();
-        // We expect, that in worst case it's enough to have num_priority_levels-1
-        // calls to restore priorities and yet another is_out_of_work() to conform
-        // that no work was found. But as market::set_active_num_workers() can be called
-        // concurrently, can't guarantee last is_out_of_work() return true.
-    }
-#endif
+    bool has_request() { return my_total_num_workers_requested; }
+
+    unsigned references() const { return my_references.load(std::memory_order_acquire); }
+
+    bool is_arena_workerless() const { return my_max_num_workers == 0; }
 
-    // Release our reference to sync with arena destroy
-    unsigned remaining_ref = my_references.fetch_sub(ref_param, std::memory_order_release) - ref_param;
-    if (remaining_ref == 0) {
-        m->try_destroy_arena( this, aba_epoch, priority_level );
+    void set_top_priority(bool);
+
+    bool is_top_priority() const;
+
+    bool is_joinable() const {
+        return num_workers_active() < my_num_workers_allotted.load(std::memory_order_relaxed);
     }
-}
 
-template<arena::new_work_type work_type>
-void arena::advertise_new_work() {
-    auto is_related_arena = [&] (market_context context) {
-        return this == context.my_arena_addr;
-    };
+    bool try_join();
 
-    if( work_type == work_enqueued ) {
-        atomic_fence(std::memory_order_seq_cst);
-#if __TBB_ENQUEUE_ENFORCED_CONCURRENCY
-        if ( my_market->my_num_workers_soft_limit.load(std::memory_order_acquire) == 0 &&
-            my_global_concurrency_mode.load(std::memory_order_acquire) == false )
-            my_market->enable_mandatory_concurrency(this);
+    void set_allotment(unsigned allotment);
 
-        if (my_max_num_workers == 0 && my_num_reserved_slots == 1 && my_local_concurrency_flag.test_and_set()) {
-            my_market->adjust_demand(*this, /* delta = */ 1, /* mandatory = */ true);
-        }
-#endif /* __TBB_ENQUEUE_ENFORCED_CONCURRENCY */
+    int update_concurrency(unsigned concurrency);
+
+    std::pair</*min workers = */ int, /*max workers = */ int> update_request(int mandatory_delta, int workers_delta);
+
+    /** Must be the last data field */
+    arena_slot my_slots[1];
+}; // class arena
+
+template <arena::new_work_type work_type>
+void arena::advertise_new_work() {
+    bool is_mandatory_needed = false;
+    bool are_workers_needed = false;
+
+    if (work_type != work_spawned) {
         // Local memory fence here and below is required to avoid missed wakeups; see the comment below.
         // Starvation resistant tasks require concurrency, so missed wakeups are unacceptable.
+        atomic_fence_seq_cst();
     }
-    else if( work_type == wakeup ) {
-        atomic_fence(std::memory_order_seq_cst);
+
+    if (work_type == work_enqueued && my_num_slots > my_num_reserved_slots) {
+        is_mandatory_needed = my_mandatory_concurrency.test_and_set();
     }
 
     // Double-check idiom that, in case of spawning, is deliberately sloppy about memory fences.
@@ -517,38 +509,21 @@ void arena::advertise_new_work() {
     // fence might hurt overall performance more than it helps, because the fence would be executed
     // on every task pool release, even when stealing does not occur.  Since TBB allows parallelism,
     // but never promises parallelism, the missed wakeup is not a correctness problem.
-    pool_state_t snapshot = my_pool_state.load(std::memory_order_acquire);
-    if( is_busy_or_empty(snapshot) ) {
-        // Attempt to mark as full.  The compare_and_swap below is a little unusual because the
-        // result is compared to a value that can be different than the comparand argument.
-        pool_state_t expected_state = snapshot;
-        my_pool_state.compare_exchange_strong( expected_state, SNAPSHOT_FULL );
-        if( expected_state == SNAPSHOT_EMPTY ) {
-            if( snapshot != SNAPSHOT_EMPTY ) {
-                // This thread read "busy" into snapshot, and then another thread transitioned
-                // my_pool_state to "empty" in the meantime, which caused the compare_and_swap above
-                // to fail.  Attempt to transition my_pool_state from "empty" to "full".
-                expected_state = SNAPSHOT_EMPTY;
-                if( !my_pool_state.compare_exchange_strong( expected_state, SNAPSHOT_FULL ) ) {
-                    // Some other thread transitioned my_pool_state from "empty", and hence became
-                    // responsible for waking up workers.
-                    return;
-                }
-            }
-            // This thread transitioned pool from empty to full state, and thus is responsible for
-            // telling the market that there is work to do.
-#if __TBB_ENQUEUE_ENFORCED_CONCURRENCY
-            if( work_type == work_spawned ) {
-                if ( my_global_concurrency_mode.load(std::memory_order_acquire) == true )
-                    my_market->mandatory_concurrency_disable( this );
-            }
-#endif /* __TBB_ENQUEUE_ENFORCED_CONCURRENCY */
-            // TODO: investigate adjusting of arena's demand by a single worker.
-            my_market->adjust_demand(*this, my_max_num_workers, /* mandatory = */ false);
+    are_workers_needed = my_pool_state.test_and_set();
+
+    if (is_mandatory_needed || are_workers_needed) {
+        int mandatory_delta = is_mandatory_needed ? 1 : 0;
+        int workers_delta = are_workers_needed ? my_max_num_workers : 0;
 
-            // Notify all sleeping threads that work has appeared in the arena.
-            my_market->get_wait_list().notify(is_related_arena);
+        if (is_mandatory_needed && is_arena_workerless()) {
+            // Set workers_delta to 1 to keep arena invariants consistent
+            workers_delta = 1;
         }
+
+#if __TBB_PREVIEW_PARALLEL_PHASE
+        my_thread_leave.reset_if_needed();
+#endif
+        request_workers(mandatory_delta, workers_delta, /* wakeup_threads = */ true);
     }
 }
 
diff --git a/external/tbb/src/tbb/arena_slot.cpp b/external/tbb/src/tbb/arena_slot.cpp
index c9b884c1..bce5701d 100644
--- a/external/tbb/src/tbb/arena_slot.cpp
+++ b/external/tbb/src/tbb/arena_slot.cpp
@@ -19,194 +19,200 @@
 #include "thread_data.h"
 
 namespace tbb {
-    namespace detail {
-        namespace r1 {
-
-            //------------------------------------------------------------------------
-            // Arena Slot
-            //------------------------------------------------------------------------
-            d1::task* arena_slot::get_task_impl(size_t T, execution_data_ext& ed, bool& tasks_omitted,
-                                                isolation_type isolation) {
-                __TBB_ASSERT(tail.load(std::memory_order_relaxed) <= T || is_local_task_pool_quiescent(),
-                             "Is it safe to get a task at position T?");
-
-                d1::task* result = task_pool_ptr[T];
-                __TBB_ASSERT(!is_poisoned(result), "The poisoned task is going to be processed");
-
-                if (!result) { return nullptr; }
-                bool omit = isolation != no_isolation && isolation != task_accessor::isolation(*result);
-                if (!omit && !task_accessor::is_proxy_task(*result)) {
-                    return result;
-                } else if (omit) {
-                    tasks_omitted = true;
-                    return nullptr;
-                }
-
-                task_proxy& tp = static_cast<task_proxy&>(*result);
-                d1::slot_id aff_id = tp.slot;
-                if (d1::task* t = tp.extract_task<task_proxy::pool_bit>()) {
-                    ed.affinity_slot = aff_id;
-                    return t;
-                }
-                // Proxy was empty, so it's our responsibility to free it
-                tp.allocator.delete_object(&tp, ed);
-
-                if (tasks_omitted) { task_pool_ptr[T] = nullptr; }
-                return nullptr;
+namespace detail {
+namespace r1 {
+
+//------------------------------------------------------------------------
+// Arena Slot
+//------------------------------------------------------------------------
+d1::task* arena_slot::get_task_impl(size_t T, execution_data_ext& ed, bool& tasks_omitted, isolation_type isolation) {
+    __TBB_ASSERT(tail.load(std::memory_order_relaxed) <= T || is_local_task_pool_quiescent(),
+            "Is it safe to get a task at position T?");
+
+    d1::task* result = task_pool_ptr[T];
+    __TBB_ASSERT(!is_poisoned( result ), "The poisoned task is going to be processed");
+
+    if (!result) {
+        return nullptr;
+    }
+    bool omit = isolation != no_isolation && isolation != task_accessor::isolation(*result);
+    if (!omit && !task_accessor::is_proxy_task(*result)) {
+        return result;
+    } else if (omit) {
+        tasks_omitted = true;
+        return nullptr;
+    }
+
+    task_proxy& tp = static_cast<task_proxy&>(*result);
+    d1::slot_id aff_id = tp.slot;
+    if ( d1::task *t = tp.extract_task<task_proxy::pool_bit>() ) {
+        ed.affinity_slot = aff_id;
+        return t;
+    }
+    // Proxy was empty, so it's our responsibility to free it
+    tp.allocator.delete_object(&tp, ed);
+
+    if ( tasks_omitted ) {
+        task_pool_ptr[T] = nullptr;
+    }
+    return nullptr;
+}
+
+d1::task* arena_slot::get_task(execution_data_ext& ed, isolation_type isolation) {
+    __TBB_ASSERT(is_task_pool_published(), nullptr);
+    // The current task position in the task pool.
+    std::size_t T0 = tail.load(std::memory_order_relaxed);
+    // The bounds of available tasks in the task pool. H0 is only used when the head bound is reached.
+    std::size_t H0 = (std::size_t)-1, T = T0;
+    d1::task* result = nullptr;
+    bool task_pool_empty = false;
+    bool tasks_omitted = false;
+    do {
+        __TBB_ASSERT( !result, nullptr );
+        // The full fence is required to sync the store of `tail` with the load of `head` (write-read barrier)
+        T = --tail;
+        // The acquire load of head is required to guarantee consistency of our task pool
+        // when a thief rolls back the head.
+        if ( (std::intptr_t)( head.load(std::memory_order_acquire) ) > (std::intptr_t)T ) {
+            acquire_task_pool();
+            H0 = head.load(std::memory_order_relaxed);
+            if ( (std::intptr_t)H0 > (std::intptr_t)T ) {
+                // The thief has not backed off - nothing to grab.
+                __TBB_ASSERT( H0 == head.load(std::memory_order_relaxed)
+                    && T == tail.load(std::memory_order_relaxed)
+                    && H0 == T + 1, "victim/thief arbitration algorithm failure" );
+                reset_task_pool_and_leave();
+                // No tasks in the task pool.
+                task_pool_empty = true;
+                break;
+            } else if ( H0 == T ) {
+                // There is only one task in the task pool.
+                reset_task_pool_and_leave();
+                task_pool_empty = true;
+            } else {
+                // Release task pool if there are still some tasks.
+                // After the release, the tail will be less than T, thus a thief
+                // will not attempt to get a task at position T.
+                release_task_pool();
             }
-
-            d1::task* arena_slot::get_task(execution_data_ext& ed, isolation_type isolation) {
-                __TBB_ASSERT(is_task_pool_published(), nullptr);
-                // The current task position in the task pool.
-                std::size_t T0 = tail.load(std::memory_order_relaxed);
-                // The bounds of available tasks in the task pool. H0 is only used when the head bound is reached.
-                std::size_t H0 = (std::size_t) -1, T = T0;
-                d1::task* result = nullptr;
-                bool task_pool_empty = false;
-                bool tasks_omitted = false;
-                do {
-                    __TBB_ASSERT(!result, nullptr);
-                    // The full fence is required to sync the store of `tail` with the load of `head` (write-read barrier)
-                    T = --tail;
-                    // The acquire load of head is required to guarantee consistency of our task pool
-                    // when a thief rolls back the head.
-                    if ((std::intptr_t)(head.load(std::memory_order_acquire)) > (std::intptr_t) T) {
-                        acquire_task_pool();
-                        H0 = head.load(std::memory_order_relaxed);
-                        if ((std::intptr_t) H0 > (std::intptr_t) T) {
-                            // The thief has not backed off - nothing to grab.
-                            __TBB_ASSERT(H0 == head.load(std::memory_order_relaxed)
-                                                 && T == tail.load(std::memory_order_relaxed) && H0 == T + 1,
-                                         "victim/thief arbitration algorithm failure");
-                            reset_task_pool_and_leave();
-                            // No tasks in the task pool.
-                            task_pool_empty = true;
-                            break;
-                        } else if (H0 == T) {
-                            // There is only one task in the task pool.
-                            reset_task_pool_and_leave();
-                            task_pool_empty = true;
-                        } else {
-                            // Release task pool if there are still some tasks.
-                            // After the release, the tail will be less than T, thus a thief
-                            // will not attempt to get a task at position T.
-                            release_task_pool();
-                        }
-                    }
-                    result = get_task_impl(T, ed, tasks_omitted, isolation);
-                    if (result) {
-                        poison_pointer(task_pool_ptr[T]);
-                        break;
-                    } else if (!tasks_omitted) {
-                        poison_pointer(task_pool_ptr[T]);
-                        __TBB_ASSERT(T0 == T + 1, nullptr);
-                        T0 = T;
-                    }
-                } while (!result && !task_pool_empty);
-
-                if (tasks_omitted) {
-                    if (task_pool_empty) {
-                        // All tasks have been checked. The task pool should be  in reset state.
-                        // We just restore the bounds for the available tasks.
-                        // TODO: Does it have sense to move them to the beginning of the task pool?
-                        __TBB_ASSERT(is_quiescent_local_task_pool_reset(), nullptr);
-                        if (result) {
-                            // If we have a task, it should be at H0 position.
-                            __TBB_ASSERT(H0 == T, nullptr);
-                            ++H0;
-                        }
-                        __TBB_ASSERT(H0 <= T0, nullptr);
-                        if (H0 < T0) {
-                            // Restore the task pool if there are some tasks.
-                            head.store(H0, std::memory_order_relaxed);
-                            tail.store(T0, std::memory_order_relaxed);
-                            // The release fence is used in publish_task_pool.
-                            publish_task_pool();
-                            // Synchronize with snapshot as we published some tasks.
-                            ed.task_disp->m_thread_data->my_arena->advertise_new_work<arena::wakeup>();
-                        }
-                    } else {
-                        // A task has been obtained. We need to make a hole in position T.
-                        __TBB_ASSERT(is_task_pool_published(), nullptr);
-                        __TBB_ASSERT(result, nullptr);
-                        task_pool_ptr[T] = nullptr;
-                        tail.store(T0, std::memory_order_release);
-                        // Synchronize with snapshot as we published some tasks.
-                        // TODO: consider some approach not to call wakeup for each time. E.g. check if the tail reached the head.
-                        ed.task_disp->m_thread_data->my_arena->advertise_new_work<arena::wakeup>();
-                    }
-                }
-
-                __TBB_ASSERT((std::intptr_t) tail.load(std::memory_order_relaxed) >= 0, nullptr);
-                __TBB_ASSERT(result || tasks_omitted || is_quiescent_local_task_pool_reset(), nullptr);
-                return result;
+        }
+        result = get_task_impl( T, ed, tasks_omitted, isolation );
+        if ( result ) {
+            poison_pointer( task_pool_ptr[T] );
+            break;
+        } else if ( !tasks_omitted ) {
+            poison_pointer( task_pool_ptr[T] );
+            __TBB_ASSERT( T0 == T+1, nullptr );
+            T0 = T;
+        }
+    } while ( !result && !task_pool_empty );
+
+    if ( tasks_omitted ) {
+        if ( task_pool_empty ) {
+            // All tasks have been checked. The task pool should be  in reset state.
+            // We just restore the bounds for the available tasks.
+            // TODO: Does it have sense to move them to the beginning of the task pool?
+            __TBB_ASSERT( is_quiescent_local_task_pool_reset(), nullptr );
+            if ( result ) {
+                // If we have a task, it should be at H0 position.
+                __TBB_ASSERT( H0 == T, nullptr );
+                ++H0;
             }
-
-            d1::task* arena_slot::steal_task(arena& a, isolation_type isolation, std::size_t slot_index) {
-                d1::task** victim_pool = lock_task_pool();
-                if (!victim_pool) { return nullptr; }
-                d1::task* result = nullptr;
-                std::size_t H = head.load(std::memory_order_relaxed);// mirror
-                std::size_t H0 = H;
-                bool tasks_omitted = false;
-                do {
-                    // The full fence is required to sync the store of `head` with the load of `tail` (write-read barrier)
-                    H = ++head;
-                    // The acquire load of tail is required to guarantee consistency of victim_pool
-                    // because the owner synchronizes task spawning via tail.
-                    if ((std::intptr_t) H > (std::intptr_t)(tail.load(std::memory_order_acquire))) {
-                        // Stealing attempt failed, deque contents has not been changed by us
-                        head.store(/*dead: H = */ H0, std::memory_order_relaxed);
-                        __TBB_ASSERT(!result, nullptr);
-                        goto unlock;
-                    }
-                    result = victim_pool[H - 1];
-                    __TBB_ASSERT(!is_poisoned(result), nullptr);
-
-                    if (result) {
-                        if (isolation == no_isolation || isolation == task_accessor::isolation(*result)) {
-                            if (!task_accessor::is_proxy_task(*result)) { break; }
-                            task_proxy& tp = *static_cast<task_proxy*>(result);
-                            // If mailed task is likely to be grabbed by its destination thread, skip it.
-                            if (!task_proxy::is_shared(tp.task_and_tag) || !tp.outbox->recipient_is_idle()
-                                || a.mailbox(slot_index).recipient_is_idle()) {
-                                break;
-                            }
-                        }
-                        // The task cannot be executed either due to isolation or proxy constraints.
-                        result = nullptr;
-                        tasks_omitted = true;
-                    } else if (!tasks_omitted) {
-                        // Cleanup the task pool from holes until a task is skipped.
-                        __TBB_ASSERT(H0 == H - 1, nullptr);
-                        poison_pointer(victim_pool[H0]);
-                        H0 = H;
-                    }
-                } while (!result);
-                __TBB_ASSERT(result, nullptr);
-
-                // emit "task was consumed" signal
-                poison_pointer(victim_pool[H - 1]);
-                if (tasks_omitted) {
-                    // Some proxies in the task pool have been omitted. Set the stolen task to nullptr.
-                    victim_pool[H - 1] = nullptr;
-                    // The release store synchronizes the victim_pool update(the store of nullptr).
-                    head.store(/*dead: H = */ H0, std::memory_order_release);
+            __TBB_ASSERT( H0 <= T0, nullptr );
+            if ( H0 < T0 ) {
+                // Restore the task pool if there are some tasks.
+                head.store(H0, std::memory_order_relaxed);
+                tail.store(T0, std::memory_order_relaxed);
+                // The release fence is used in publish_task_pool.
+                publish_task_pool();
+                // Synchronize with snapshot as we published some tasks.
+                ed.task_disp->m_thread_data->my_arena->advertise_new_work<arena::wakeup>();
+            }
+        } else {
+            // A task has been obtained. We need to make a hole in position T.
+            __TBB_ASSERT( is_task_pool_published(), nullptr );
+            __TBB_ASSERT( result, nullptr );
+            task_pool_ptr[T] = nullptr;
+            tail.store(T0, std::memory_order_release);
+            // Synchronize with snapshot as we published some tasks.
+            // TODO: consider some approach not to call wakeup for each time. E.g. check if the tail reached the head.
+            ed.task_disp->m_thread_data->my_arena->advertise_new_work<arena::wakeup>();
+        }
+    }
+
+    __TBB_ASSERT( (std::intptr_t)tail.load(std::memory_order_relaxed) >= 0, nullptr );
+    __TBB_ASSERT( result || tasks_omitted || is_quiescent_local_task_pool_reset(), nullptr );
+    return result;
+}
+
+d1::task* arena_slot::steal_task(arena& a, isolation_type isolation, std::size_t slot_index) {
+    d1::task** victim_pool = lock_task_pool();
+    if (!victim_pool) {
+        return nullptr;
+    }
+    d1::task* result = nullptr;
+    std::size_t H = head.load(std::memory_order_relaxed); // mirror
+    std::size_t H0 = H;
+    bool tasks_omitted = false;
+    do {
+        // The full fence is required to sync the store of `head` with the load of `tail` (write-read barrier)
+        H = ++head;
+        // The acquire load of tail is required to guarantee consistency of victim_pool
+        // because the owner synchronizes task spawning via tail.
+        if ((std::intptr_t)H > (std::intptr_t)(tail.load(std::memory_order_acquire))) {
+            // Stealing attempt failed, deque contents has not been changed by us
+            head.store( /*dead: H = */ H0, std::memory_order_relaxed );
+            __TBB_ASSERT( !result, nullptr );
+            goto unlock;
+        }
+        result = victim_pool[H-1];
+        __TBB_ASSERT( !is_poisoned( result ), nullptr );
+
+        if (result) {
+            if (isolation == no_isolation || isolation == task_accessor::isolation(*result)) {
+                if (!task_accessor::is_proxy_task(*result)) {
+                    break;
                 }
-            unlock:
-                unlock_task_pool(victim_pool);
-
-#if __TBB_PREFETCHING
-                __TBB_cl_evict(&victim_slot.head);
-                __TBB_cl_evict(&victim_slot.tail);
-#endif
-                if (tasks_omitted) {
-                    // Synchronize with snapshot as the head and tail can be bumped which can falsely trigger EMPTY state
-                    a.advertise_new_work<arena::wakeup>();
+                task_proxy& tp = *static_cast<task_proxy*>(result);
+                // If mailed task is likely to be grabbed by its destination thread, skip it.
+                if (!task_proxy::is_shared(tp.task_and_tag) || !tp.outbox->recipient_is_idle() || a.mailbox(slot_index).recipient_is_idle()) {
+                    break;
                 }
-                return result;
             }
+            // The task cannot be executed either due to isolation or proxy constraints.
+            result = nullptr;
+            tasks_omitted = true;
+        } else if (!tasks_omitted) {
+            // Cleanup the task pool from holes until a task is skipped.
+            __TBB_ASSERT( H0 == H-1, nullptr );
+            poison_pointer( victim_pool[H0] );
+            H0 = H;
+        }
+    } while (!result);
+    __TBB_ASSERT( result, nullptr );
+
+    // emit "task was consumed" signal
+    poison_pointer( victim_pool[H-1] );
+    if (tasks_omitted) {
+        // Some proxies in the task pool have been omitted. Set the stolen task to nullptr.
+        victim_pool[H-1] = nullptr;
+        // The release store synchronizes the victim_pool update(the store of nullptr).
+        head.store( /*dead: H = */ H0, std::memory_order_release );
+    }
+unlock:
+    unlock_task_pool(victim_pool);
 
-        }// namespace r1
-    }    // namespace detail
-}// namespace tbb
+#if __TBB_PREFETCHING
+    __TBB_cl_evict(&victim_slot.head);
+    __TBB_cl_evict(&victim_slot.tail);
+#endif
+    if (tasks_omitted) {
+        // Synchronize with snapshot as the head and tail can be bumped which can falsely trigger EMPTY state
+        a.advertise_new_work<arena::wakeup>();
+    }
+    return result;
+}
+
+} // namespace r1
+} // namespace detail
+} // namespace tbb
diff --git a/external/tbb/src/tbb/arena_slot.h b/external/tbb/src/tbb/arena_slot.h
index 854890d8..c526e474 100644
--- a/external/tbb/src/tbb/arena_slot.h
+++ b/external/tbb/src/tbb/arena_slot.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2023 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -119,18 +119,18 @@ class arena_slot : private arena_slot_shared_state, private arena_slot_private_s
     //! Deallocate task pool that was allocated by means of allocate_task_pool.
     void free_task_pool( ) {
         // TODO: understand the assertion and modify
-        // __TBB_ASSERT( !task_pool /* TODO: == EmptyTaskPool */, NULL);
+        // __TBB_ASSERT( !task_pool /* TODO: == EmptyTaskPool */, nullptr);
         if( task_pool_ptr ) {
-           __TBB_ASSERT( my_task_pool_size, NULL);
+           __TBB_ASSERT( my_task_pool_size, nullptr);
            cache_aligned_deallocate( task_pool_ptr );
-           task_pool_ptr = NULL;
+           task_pool_ptr = nullptr;
            my_task_pool_size = 0;
         }
     }
 
     //! Get a task from the local pool.
     /** Called only by the pool owner.
-        Returns the pointer to the task or NULL if a suitable task is not found.
+        Returns the pointer to the task or nullptr if a suitable task is not found.
         Resets the pool if it is empty. **/
     d1::task* get_task(execution_data_ext&, isolation_type);
 
@@ -157,7 +157,7 @@ class arena_slot : private arena_slot_shared_state, private arena_slot_private_s
     //! Spawn newly created tasks
     void spawn(d1::task& t) {
         std::size_t T = prepare_task_pool(1);
-        __TBB_ASSERT(is_poisoned(task_pool_ptr[T]), NULL);
+        __TBB_ASSERT(is_poisoned(task_pool_ptr[T]), nullptr);
         task_pool_ptr[T] = &t;
         commit_spawned_tasks(T + 1);
         if (!is_task_pool_published()) {
@@ -169,6 +169,11 @@ class arena_slot : private arena_slot_shared_state, private arena_slot_private_s
         return task_pool.load(std::memory_order_relaxed) != EmptyTaskPool;
     }
 
+    bool is_empty() const {
+        return task_pool.load(std::memory_order_relaxed) == EmptyTaskPool ||
+               head.load(std::memory_order_relaxed) >= tail.load(std::memory_order_relaxed);
+    }
+
     bool is_occupied() const {
         return my_is_occupied.load(std::memory_order_relaxed);
     }
@@ -195,7 +200,7 @@ class arena_slot : private arena_slot_shared_state, private arena_slot_private_s
 #endif
 private:
     //! Get a task from the local pool at specified location T.
-    /** Returns the pointer to the task or NULL if the task cannot be executed,
+    /** Returns the pointer to the task or nullptr if the task cannot be executed,
         e.g. proxy has been deallocated or isolation constraint is not met.
         tasks_omitted tells if some tasks have been omitted.
         Called only by the pool owner. The caller should guarantee that the
@@ -213,16 +218,16 @@ class arena_slot : private arena_slot_shared_state, private arena_slot_private_s
 
         std::size_t new_size = num_tasks;
         if ( !my_task_pool_size ) {
-            __TBB_ASSERT( !is_task_pool_published() && is_quiescent_local_task_pool_reset(), NULL );
-            __TBB_ASSERT( !task_pool_ptr, NULL );
+            __TBB_ASSERT( !is_task_pool_published() && is_quiescent_local_task_pool_reset(), nullptr);
+            __TBB_ASSERT( !task_pool_ptr, nullptr);
             if ( num_tasks < min_task_pool_size ) new_size = min_task_pool_size;
             allocate_task_pool( new_size );
             return 0;
         }
         acquire_task_pool();
         std::size_t H =  head.load(std::memory_order_relaxed); // mirror
-        d1::task** new_task_pool = task_pool_ptr;;
-        __TBB_ASSERT( my_task_pool_size >= min_task_pool_size, NULL );
+        d1::task** new_task_pool = task_pool_ptr;
+        __TBB_ASSERT( my_task_pool_size >= min_task_pool_size, nullptr);
         // Count not skipped tasks. Consider using std::count_if.
         for ( std::size_t i = H; i < T; ++i )
             if ( new_task_pool[i] ) ++new_size;
@@ -315,7 +320,7 @@ class arena_slot : private arena_slot_shared_state, private arena_slot_private_s
         task_pool.store( task_pool_ptr, std::memory_order_release );
     }
 
-    //! Locks victim's task pool, and returns pointer to it. The pointer can be NULL.
+    //! Locks victim's task pool, and returns pointer to it. The pointer can be nullptr.
     /** Garbles victim_arena_slot->task_pool for the duration of the lock. **/
     d1::task** lock_task_pool() {
         d1::task** victim_task_pool;
@@ -347,7 +352,7 @@ class arena_slot : private arena_slot_shared_state, private arena_slot_private_s
     /** Restores victim_arena_slot->task_pool munged by lock_task_pool. **/
     void unlock_task_pool(d1::task** victim_task_pool) {
         __TBB_ASSERT(task_pool.load(std::memory_order_relaxed) == LockedTaskPool, "victim arena slot is not locked");
-        __TBB_ASSERT(victim_task_pool != LockedTaskPool, NULL);
+        __TBB_ASSERT(victim_task_pool != LockedTaskPool, nullptr);
         task_pool.store(victim_task_pool, std::memory_order_release);
     }
 
diff --git a/external/tbb/src/tbb/cancellation_disseminator.h b/external/tbb/src/tbb/cancellation_disseminator.h
new file mode 100644
index 00000000..72445829
--- /dev/null
+++ b/external/tbb/src/tbb/cancellation_disseminator.h
@@ -0,0 +1,85 @@
+/*
+    Copyright (c) 2022-2023 Intel Corporation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#ifndef _TBB_cancellation_disseminator_H
+#define _TBB_cancellation_disseminator_H
+
+#include "oneapi/tbb/mutex.h"
+#include "oneapi/tbb/task_group.h"
+
+#include "intrusive_list.h"
+#include "thread_data.h"
+
+namespace tbb {
+namespace detail {
+namespace r1 {
+
+class cancellation_disseminator {
+public:
+    //! Finds all contexts affected by the state change and propagates the new state to them.
+    /*  The propagation is relayed to the cancellation_disseminator because tasks created by one
+        external thread can be passed to and executed by other external threads. This means
+        that context trees can span several arenas at once and thus state change
+        propagation cannot be generally localized to one arena only.
+    */
+    bool propagate_task_group_state(std::atomic<uint32_t> d1::task_group_context::*mptr_state, d1::task_group_context& src, uint32_t new_state) {
+        if (src.my_may_have_children.load(std::memory_order_relaxed) != d1::task_group_context::may_have_children) {
+            return true;
+        }
+
+        // The whole propagation algorithm is under the lock in order to ensure correctness
+        // in case of concurrent state changes at the different levels of the context tree.
+        threads_list_mutex_type::scoped_lock lock(my_threads_list_mutex);
+        // TODO: consider to use double-check idiom
+        if ((src.*mptr_state).load(std::memory_order_relaxed) != new_state) {
+            // Another thread has concurrently changed the state. Back down.
+            return false;
+        }
+
+        // Advance global state propagation epoch
+        ++the_context_state_propagation_epoch;
+        // Propagate to all workers and external threads and sync up their local epochs with the global one
+        // The whole propagation sequence is locked, thus no contention is expected
+        for (auto& thr_data : my_threads_list) {
+            thr_data.propagate_task_group_state(mptr_state, src, new_state);
+        }
+
+        return true;
+    }
+
+    void register_thread(thread_data& td) {
+        threads_list_mutex_type::scoped_lock lock(my_threads_list_mutex);
+        my_threads_list.push_front(td);
+    }
+
+    void unregister_thread(thread_data& td) {
+        threads_list_mutex_type::scoped_lock lock(my_threads_list_mutex);
+        my_threads_list.remove(td);
+    }
+
+private:
+    using thread_data_list_type = intrusive_list<thread_data>;
+    using threads_list_mutex_type = d1::mutex;
+
+    threads_list_mutex_type my_threads_list_mutex;
+    thread_data_list_type my_threads_list;
+};
+
+} // namespace r1
+} // namespace detail
+} // namespace tbb
+
+#endif // _TBB_cancellation_disseminator_H
diff --git a/external/tbb/src/tbb/co_context.h b/external/tbb/src/tbb/co_context.h
index e9fed6e2..60d5437f 100644
--- a/external/tbb/src/tbb/co_context.h
+++ b/external/tbb/src/tbb/co_context.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -114,7 +114,7 @@ class co_context {
         : my_state(stack_size ? co_suspended : co_executing)
     {
         if (stack_size) {
-            __TBB_ASSERT(arg != 0, nullptr);
+            __TBB_ASSERT(arg != nullptr, nullptr);
             create_coroutine(my_coroutine, stack_size, arg);
         } else {
             current_coroutine(my_coroutine);
@@ -122,7 +122,7 @@ class co_context {
     }
 
     ~co_context() {
-        __TBB_ASSERT(1 << my_state & (1 << co_suspended | 1 << co_executing), NULL);
+        __TBB_ASSERT(1 << my_state & (1 << co_suspended | 1 << co_executing), nullptr);
         if (my_state == co_suspended) {
 #if __TBB_RESUMABLE_TASKS_USE_THREADS
             my_state = co_executing;
@@ -134,8 +134,8 @@ class co_context {
 
     void resume(co_context& target) {
         // Do not create non-trivial objects on the stack of this function. They might never be destroyed.
-        __TBB_ASSERT(my_state == co_executing, NULL);
-        __TBB_ASSERT(target.my_state == co_suspended, NULL);
+        __TBB_ASSERT(my_state == co_executing, nullptr);
+        __TBB_ASSERT(target.my_state == co_suspended, nullptr);
 
         my_state = co_suspended;
         target.my_state = co_executing;
@@ -143,7 +143,7 @@ class co_context {
         // 'target' can reference an invalid object after swap_coroutine. Do not access it.
         swap_coroutine(my_coroutine, target.my_coroutine);
 
-        __TBB_ASSERT(my_state == co_executing, NULL);
+        __TBB_ASSERT(my_state == co_executing, nullptr);
     }
 };
 
@@ -277,29 +277,29 @@ inline void destroy_coroutine(coroutine_type& c) {
 }
 #elif _WIN32 || _WIN64
 inline void create_coroutine(coroutine_type& c, std::size_t stack_size, void* arg) {
-    __TBB_ASSERT(arg, NULL);
+    __TBB_ASSERT(arg, nullptr);
     c = CreateFiber(stack_size, co_local_wait_for_all, arg);
-    __TBB_ASSERT(c, NULL);
+    __TBB_ASSERT(c, nullptr);
 }
 
 inline void current_coroutine(coroutine_type& c) {
     c = IsThreadAFiber() ? GetCurrentFiber() :
         ConvertThreadToFiberEx(nullptr, FIBER_FLAG_FLOAT_SWITCH);
-    __TBB_ASSERT(c, NULL);
+    __TBB_ASSERT(c, nullptr);
 }
 
 inline void swap_coroutine(coroutine_type& prev_coroutine, coroutine_type& new_coroutine) {
     if (!IsThreadAFiber()) {
         ConvertThreadToFiberEx(nullptr, FIBER_FLAG_FLOAT_SWITCH);
     }
-    __TBB_ASSERT(new_coroutine, NULL);
+    __TBB_ASSERT(new_coroutine, nullptr);
     prev_coroutine = GetCurrentFiber();
-    __TBB_ASSERT(prev_coroutine, NULL);
+    __TBB_ASSERT(prev_coroutine, nullptr);
     SwitchToFiber(new_coroutine);
 }
 
 inline void destroy_coroutine(coroutine_type& c) {
-    __TBB_ASSERT(c, NULL);
+    __TBB_ASSERT(c, nullptr);
     DeleteFiber(c);
 }
 #else // !(_WIN32 || _WIN64)
@@ -310,21 +310,21 @@ inline void create_coroutine(coroutine_type& c, std::size_t stack_size, void* ar
     const std::size_t protected_stack_size = page_aligned_stack_size + 2 * REG_PAGE_SIZE;
 
     // Allocate the stack with protection property
-    std::uintptr_t stack_ptr = (std::uintptr_t)mmap(NULL, protected_stack_size, PROT_NONE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_STACK, -1, 0);
-    __TBB_ASSERT((void*)stack_ptr != MAP_FAILED, NULL);
+    std::uintptr_t stack_ptr = (std::uintptr_t)mmap(nullptr, protected_stack_size, PROT_NONE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_STACK, -1, 0);
+    __TBB_ASSERT((void*)stack_ptr != MAP_FAILED, nullptr);
 
     // Allow read write on our stack (guarded pages are still protected)
     int err = mprotect((void*)(stack_ptr + REG_PAGE_SIZE), page_aligned_stack_size, PROT_READ | PROT_WRITE);
-    __TBB_ASSERT_EX(!err, NULL);
+    __TBB_ASSERT_EX(!err, nullptr);
 
     // Remember the stack state
     c.my_stack = (void*)(stack_ptr + REG_PAGE_SIZE);
     c.my_stack_size = page_aligned_stack_size;
 
     err = getcontext(&c.my_context);
-    __TBB_ASSERT_EX(!err, NULL);
+    __TBB_ASSERT_EX(!err, nullptr);
 
-    c.my_context.uc_link = 0;
+    c.my_context.uc_link = nullptr;
     // cast to char* to disable FreeBSD clang-3.4.1 'incompatible type' error
     c.my_context.uc_stack.ss_sp = (char*)c.my_stack;
     c.my_context.uc_stack.ss_size = c.my_stack_size;
@@ -342,12 +342,12 @@ inline void create_coroutine(coroutine_type& c, std::size_t stack_size, void* ar
 
 inline void current_coroutine(coroutine_type& c) {
     int err = getcontext(&c.my_context);
-    __TBB_ASSERT_EX(!err, NULL);
+    __TBB_ASSERT_EX(!err, nullptr);
 }
 
 inline void swap_coroutine(coroutine_type& prev_coroutine, coroutine_type& new_coroutine) {
     int err = swapcontext(&prev_coroutine.my_context, &new_coroutine.my_context);
-    __TBB_ASSERT_EX(!err, NULL);
+    __TBB_ASSERT_EX(!err, nullptr);
 }
 
 inline void destroy_coroutine(coroutine_type& c) {
@@ -355,7 +355,7 @@ inline void destroy_coroutine(coroutine_type& c) {
     // Free stack memory with guarded pages
     munmap((void*)((std::uintptr_t)c.my_stack - REG_PAGE_SIZE), c.my_stack_size + 2 * REG_PAGE_SIZE);
     // Clear the stack state afterwards
-    c.my_stack = NULL;
+    c.my_stack = nullptr;
     c.my_stack_size = 0;
 }
 
diff --git a/external/tbb/src/tbb/concurrent_bounded_queue.cpp b/external/tbb/src/tbb/concurrent_bounded_queue.cpp
index 2a1c10db..14617175 100644
--- a/external/tbb/src/tbb/concurrent_bounded_queue.cpp
+++ b/external/tbb/src/tbb/concurrent_bounded_queue.cpp
@@ -14,71 +14,71 @@
     limitations under the License.
 */
 
-#include "concurrent_monitor.h"
-#include "oneapi/tbb/cache_aligned_allocator.h"
-#include "oneapi/tbb/concurrent_queue.h"
 #include "oneapi/tbb/detail/_utils.h"
+#include "oneapi/tbb/concurrent_queue.h"
+#include "oneapi/tbb/cache_aligned_allocator.h"
+#include "concurrent_monitor.h"
 
 namespace tbb {
-    namespace detail {
-        namespace r1 {
-
-            static constexpr std::size_t monitors_number = 2;
-
-            std::uint8_t* __TBB_EXPORTED_FUNC allocate_bounded_queue_rep(std::size_t queue_rep_size) {
-                std::size_t monitors_mem_size = sizeof(concurrent_monitor) * monitors_number;
-                std::uint8_t* mem = static_cast<std::uint8_t*>(
-                        cache_aligned_allocate(queue_rep_size + monitors_mem_size));
-
-                concurrent_monitor* monitors = reinterpret_cast<concurrent_monitor*>(mem + queue_rep_size);
-                for (std::size_t i = 0; i < monitors_number; ++i) { new (monitors + i) concurrent_monitor(); }
-
-                return mem;
-            }
-
-            void __TBB_EXPORTED_FUNC deallocate_bounded_queue_rep(std::uint8_t* mem,
-                                                                  std::size_t queue_rep_size) {
-                concurrent_monitor* monitors = reinterpret_cast<concurrent_monitor*>(mem + queue_rep_size);
-                for (std::size_t i = 0; i < monitors_number; ++i) { monitors[i].~concurrent_monitor(); }
-
-                cache_aligned_deallocate(mem);
-            }
-
-            void __TBB_EXPORTED_FUNC wait_bounded_queue_monitor(concurrent_monitor* monitors,
-                                                                std::size_t monitor_tag,
-                                                                std::ptrdiff_t target,
-                                                                d1::delegate_base& predicate) {
-                __TBB_ASSERT(monitor_tag < monitors_number, nullptr);
-                concurrent_monitor& monitor = monitors[monitor_tag];
-
-                monitor.wait<concurrent_monitor::thread_context>([&] { return !predicate(); },
-                                                                 std::uintptr_t(target));
-            }
-
-            void __TBB_EXPORTED_FUNC abort_bounded_queue_monitors(concurrent_monitor* monitors) {
-                concurrent_monitor& items_avail = monitors[d2::cbq_items_avail_tag];
-                concurrent_monitor& slots_avail = monitors[d2::cbq_slots_avail_tag];
-
-                items_avail.abort_all();
-                slots_avail.abort_all();
-            }
-
-            struct predicate_leq {
-                std::size_t my_ticket;
-                predicate_leq(std::size_t ticket) : my_ticket(ticket) {}
-                bool operator()(std::uintptr_t ticket) const {
-                    return static_cast<std::size_t>(ticket) <= my_ticket;
-                }
-            };
-
-            void __TBB_EXPORTED_FUNC notify_bounded_queue_monitor(concurrent_monitor* monitors,
-                                                                  std::size_t monitor_tag,
-                                                                  std::size_t ticket) {
-                __TBB_ASSERT(monitor_tag < monitors_number, nullptr);
-                concurrent_monitor& monitor = monitors[monitor_tag];
-                monitor.notify(predicate_leq(ticket));
-            }
-
-        }// namespace r1
-    }    // namespace detail
-}// namespace tbb
+namespace detail {
+namespace r1 {
+
+static constexpr std::size_t monitors_number = 2;
+
+std::uint8_t* __TBB_EXPORTED_FUNC allocate_bounded_queue_rep( std::size_t queue_rep_size )
+{
+    std::size_t monitors_mem_size = sizeof(concurrent_monitor) * monitors_number;
+    std::uint8_t* mem = static_cast<std::uint8_t*>(cache_aligned_allocate(queue_rep_size + monitors_mem_size));
+
+    concurrent_monitor* monitors = reinterpret_cast<concurrent_monitor*>(mem + queue_rep_size);
+    for (std::size_t i = 0; i < monitors_number; ++i) {
+        new (monitors + i) concurrent_monitor();
+    }
+
+    return mem;
+}
+
+void __TBB_EXPORTED_FUNC deallocate_bounded_queue_rep( std::uint8_t* mem, std::size_t queue_rep_size )
+{
+    concurrent_monitor* monitors = reinterpret_cast<concurrent_monitor*>(mem + queue_rep_size);
+    for (std::size_t i = 0; i < monitors_number; ++i) {
+        monitors[i].~concurrent_monitor();
+    }
+
+    cache_aligned_deallocate(mem);
+}
+
+void __TBB_EXPORTED_FUNC wait_bounded_queue_monitor( concurrent_monitor* monitors, std::size_t monitor_tag,
+                                                        std::ptrdiff_t target, d1::delegate_base& predicate )
+{
+    __TBB_ASSERT(monitor_tag < monitors_number, nullptr);
+    concurrent_monitor& monitor = monitors[monitor_tag];
+
+    monitor.wait<concurrent_monitor::thread_context>([&] { return !predicate(); }, std::uintptr_t(target));
+}
+
+void __TBB_EXPORTED_FUNC abort_bounded_queue_monitors( concurrent_monitor* monitors ) {
+    concurrent_monitor& items_avail = monitors[d2::cbq_items_avail_tag];
+    concurrent_monitor& slots_avail = monitors[d2::cbq_slots_avail_tag];
+
+    items_avail.abort_all();
+    slots_avail.abort_all();
+}
+
+struct predicate_leq {
+    std::size_t my_ticket;
+    predicate_leq( std::size_t ticket ) : my_ticket(ticket) {}
+    bool operator() ( std::uintptr_t ticket ) const { return static_cast<std::size_t>(ticket) <= my_ticket; }
+};
+
+void __TBB_EXPORTED_FUNC notify_bounded_queue_monitor( concurrent_monitor* monitors,
+                                                               std::size_t monitor_tag, std::size_t ticket)
+{
+    __TBB_ASSERT(monitor_tag < monitors_number, nullptr);
+    concurrent_monitor& monitor = monitors[monitor_tag];
+    monitor.notify(predicate_leq(ticket));
+}
+
+} // namespace r1
+} // namespace detail
+} // namespace tbb
diff --git a/external/tbb/src/tbb/concurrent_monitor.h b/external/tbb/src/tbb/concurrent_monitor.h
index ef75e037..cacfb145 100644
--- a/external/tbb/src/tbb/concurrent_monitor.h
+++ b/external/tbb/src/tbb/concurrent_monitor.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -148,8 +148,7 @@ class sleep_node : public wait_node<Context> {
 public:
     using base_type::base_type;
 
-    // Make it virtual due to Intel Compiler warning
-    virtual ~sleep_node() {
+    ~sleep_node() override {
         if (this->my_initialized) {
             if (this->my_skipped_wakeup) semaphore().P();
             semaphore().~binary_semaphore();
@@ -221,7 +220,7 @@ class concurrent_monitor_base {
 
         // Prepare wait guarantees Write Read memory barrier.
         // In C++ only full fence covers this type of barrier.
-        atomic_fence(std::memory_order_seq_cst);
+        atomic_fence_seq_cst();
     }
 
     //! Commit wait if event count has not changed; otherwise, cancel wait.
@@ -273,7 +272,7 @@ class concurrent_monitor_base {
 
     //! Notify one thread about the event
     void notify_one() {
-        atomic_fence(std::memory_order_seq_cst);
+        atomic_fence_seq_cst();
         notify_one_relaxed();
     }
 
@@ -291,7 +290,17 @@ class concurrent_monitor_base {
             n = my_waitset.front();
             if (n != end) {
                 my_waitset.remove(*n);
+
+// GCC 12.x-14.x issues a warning here that to_wait_node(n)->my_is_in_list might have size 0, since n is
+// a base_node pointer. (This cannot happen, because only wait_node pointers are added to my_waitset.)
+#if (__TBB_GCC_VERSION >= 120100 && __TBB_GCC_VERSION < 150000 ) && !__clang__ && !__INTEL_COMPILER
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wstringop-overflow"
+#endif
                 to_wait_node(n)->my_is_in_list.store(false, std::memory_order_relaxed);
+#if (__TBB_GCC_VERSION >= 120100 && __TBB_GCC_VERSION < 150000 ) && !__clang__ && !__INTEL_COMPILER
+#pragma GCC diagnostic pop
+#endif
             }
         }
 
@@ -302,7 +311,7 @@ class concurrent_monitor_base {
 
     //! Notify all waiting threads of the event
     void notify_all() {
-        atomic_fence(std::memory_order_seq_cst);
+        atomic_fence_seq_cst();
         notify_all_relaxed();
     }
 
@@ -338,7 +347,7 @@ class concurrent_monitor_base {
     //! Notify waiting threads of the event that satisfies the given predicate
     template <typename P>
     void notify( const P& predicate ) {
-        atomic_fence(std::memory_order_seq_cst);
+        atomic_fence_seq_cst();
         notify_relaxed( predicate );
     }
 
@@ -410,7 +419,7 @@ class concurrent_monitor_base {
 
     //! Abort any sleeping threads at the time of the call
     void abort_all() {
-        atomic_fence( std::memory_order_seq_cst );
+        atomic_fence_seq_cst();
         abort_all_relaxed();
     }
 
diff --git a/external/tbb/src/tbb/def/lin32-tbb.def b/external/tbb/src/tbb/def/lin32-tbb.def
index ec03c3aa..da1dc0e6 100644
--- a/external/tbb/src/tbb/def/lin32-tbb.def
+++ b/external/tbb/src/tbb/def/lin32-tbb.def
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2025 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -77,6 +77,7 @@ _ZN3tbb6detail2r17suspendEPFvPvPNS1_18suspend_point_typeEES2_;
 _ZN3tbb6detail2r16resumeEPNS1_18suspend_point_typeE;
 _ZN3tbb6detail2r121current_suspend_pointEv;
 _ZN3tbb6detail2r114notify_waitersEj;
+_ZN3tbb6detail2r127get_thread_reference_vertexEPNS0_2d126wait_tree_vertex_interfaceE;
 
 /* Task dispatcher (task_dispatcher.cpp) */
 _ZN3tbb6detail2r114execution_slotEPKNS0_2d114execution_dataE;
@@ -105,6 +106,9 @@ _ZN3tbb6detail2r120isolate_within_arenaERNS0_2d113delegate_baseEi;
 _ZN3tbb6detail2r17enqueueERNS0_2d14taskEPNS2_15task_arena_baseE;
 _ZN3tbb6detail2r17enqueueERNS0_2d14taskERNS2_18task_group_contextEPNS2_15task_arena_baseE;
 _ZN3tbb6detail2r14waitERNS0_2d115task_arena_baseE;
+_ZN3tbb6detail2r114execution_slotERKNS0_2d115task_arena_baseE;
+_ZN3tbb6detail2r119exit_parallel_phaseEPNS0_2d115task_arena_baseEj;
+_ZN3tbb6detail2r120enter_parallel_phaseEPNS0_2d115task_arena_baseEj;
 
 /* System topology parsing and threads pinning (governor.cpp) */
 _ZN3tbb6detail2r115numa_node_countEv;
@@ -159,4 +163,3 @@ local:
 /* TODO: fill more precisely */
 *;
 };
-
diff --git a/external/tbb/src/tbb/def/lin64-tbb.def b/external/tbb/src/tbb/def/lin64-tbb.def
index 119eea13..b14e1c80 100644
--- a/external/tbb/src/tbb/def/lin64-tbb.def
+++ b/external/tbb/src/tbb/def/lin64-tbb.def
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2025 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -77,6 +77,7 @@ _ZN3tbb6detail2r17suspendEPFvPvPNS1_18suspend_point_typeEES2_;
 _ZN3tbb6detail2r16resumeEPNS1_18suspend_point_typeE;
 _ZN3tbb6detail2r121current_suspend_pointEv;
 _ZN3tbb6detail2r114notify_waitersEm;
+_ZN3tbb6detail2r127get_thread_reference_vertexEPNS0_2d126wait_tree_vertex_interfaceE;
 
 /* Task dispatcher (task_dispatcher.cpp) */
 _ZN3tbb6detail2r114execution_slotEPKNS0_2d114execution_dataE;
@@ -105,6 +106,9 @@ _ZN3tbb6detail2r120isolate_within_arenaERNS0_2d113delegate_baseEl;
 _ZN3tbb6detail2r17enqueueERNS0_2d14taskEPNS2_15task_arena_baseE;
 _ZN3tbb6detail2r17enqueueERNS0_2d14taskERNS2_18task_group_contextEPNS2_15task_arena_baseE;
 _ZN3tbb6detail2r14waitERNS0_2d115task_arena_baseE;
+_ZN3tbb6detail2r114execution_slotERKNS0_2d115task_arena_baseE;
+_ZN3tbb6detail2r119exit_parallel_phaseEPNS0_2d115task_arena_baseEm;
+_ZN3tbb6detail2r120enter_parallel_phaseEPNS0_2d115task_arena_baseEm;
 
 /* System topology parsing and threads pinning (governor.cpp) */
 _ZN3tbb6detail2r115numa_node_countEv;
diff --git a/external/tbb/src/tbb/def/mac64-tbb.def b/external/tbb/src/tbb/def/mac64-tbb.def
index fcccd7b8..fff79a39 100644
--- a/external/tbb/src/tbb/def/mac64-tbb.def
+++ b/external/tbb/src/tbb/def/mac64-tbb.def
@@ -1,4 +1,4 @@
-# Copyright (c) 2005-2021 Intel Corporation
+# Copyright (c) 2005-2025 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -79,6 +79,7 @@ __ZN3tbb6detail2r17suspendEPFvPvPNS1_18suspend_point_typeEES2_
 __ZN3tbb6detail2r16resumeEPNS1_18suspend_point_typeE
 __ZN3tbb6detail2r121current_suspend_pointEv
 __ZN3tbb6detail2r114notify_waitersEm
+__ZN3tbb6detail2r127get_thread_reference_vertexEPNS0_2d126wait_tree_vertex_interfaceE
 
 # Task dispatcher (task_dispatcher.cpp)
 __ZN3tbb6detail2r114execution_slotEPKNS0_2d114execution_dataE
@@ -107,6 +108,9 @@ __ZN3tbb6detail2r120isolate_within_arenaERNS0_2d113delegate_baseEl
 __ZN3tbb6detail2r17enqueueERNS0_2d14taskEPNS2_15task_arena_baseE
 __ZN3tbb6detail2r17enqueueERNS0_2d14taskERNS2_18task_group_contextEPNS2_15task_arena_baseE
 __ZN3tbb6detail2r14waitERNS0_2d115task_arena_baseE
+__ZN3tbb6detail2r114execution_slotERKNS0_2d115task_arena_baseE
+__ZN3tbb6detail2r119exit_parallel_phaseEPNS0_2d115task_arena_baseEm
+__ZN3tbb6detail2r120enter_parallel_phaseEPNS0_2d115task_arena_baseEm
 
 # System topology parsing and threads pinning (governor.cpp)
 __ZN3tbb6detail2r115numa_node_countEv
@@ -156,4 +160,3 @@ __ZN3tbb6detail2r121notify_by_address_allEPv
 # Versioning (version.cpp)
 _TBB_runtime_interface_version
 _TBB_runtime_version
-
diff --git a/external/tbb/src/tbb/def/win32-tbb.def b/external/tbb/src/tbb/def/win32-tbb.def
index 68639140..516075af 100644
--- a/external/tbb/src/tbb/def/win32-tbb.def
+++ b/external/tbb/src/tbb/def/win32-tbb.def
@@ -1,4 +1,4 @@
-; Copyright (c) 2005-2021 Intel Corporation
+; Copyright (c) 2005-2025 Intel Corporation
 ;
 ; Licensed under the Apache License, Version 2.0 (the "License");
 ; you may not use this file except in compliance with the License.
@@ -71,6 +71,7 @@ EXPORTS
 ?resume@r1@detail@tbb@@YAXPAUsuspend_point_type@123@@Z
 ?suspend@r1@detail@tbb@@YAXP6AXPAXPAUsuspend_point_type@123@@Z0@Z
 ?notify_waiters@r1@detail@tbb@@YAXI@Z
+?get_thread_reference_vertex@r1@detail@tbb@@YAPAVwait_tree_vertex_interface@d1@23@PAV4523@@Z
 
 ; Task dispatcher (task_dispatcher.cpp)
 ?spawn@r1@detail@tbb@@YAXAAVtask@d1@23@AAVtask_group_context@523@G@Z
@@ -99,6 +100,9 @@ EXPORTS
 ?terminate@r1@detail@tbb@@YAXAAVtask_arena_base@d1@23@@Z
 ?wait@r1@detail@tbb@@YAXAAVtask_arena_base@d1@23@@Z
 ?enqueue@r1@detail@tbb@@YAXAAVtask@d1@23@AAVtask_group_context@523@PAVtask_arena_base@523@@Z
+?execution_slot@r1@detail@tbb@@YAGABVtask_arena_base@d1@23@@Z
+?enter_parallel_phase@r1@detail@tbb@@YAXPAVtask_arena_base@d1@23@I@Z
+?exit_parallel_phase@r1@detail@tbb@@YAXPAVtask_arena_base@d1@23@I@Z
 
 ; System topology parsing and threads pinning (governor.cpp)
 ?numa_node_count@r1@detail@tbb@@YAIXZ
diff --git a/external/tbb/src/tbb/def/win64-tbb.def b/external/tbb/src/tbb/def/win64-tbb.def
index 306903c1..80273f88 100644
--- a/external/tbb/src/tbb/def/win64-tbb.def
+++ b/external/tbb/src/tbb/def/win64-tbb.def
@@ -1,4 +1,4 @@
-; Copyright (c) 2005-2021 Intel Corporation
+; Copyright (c) 2005-2025 Intel Corporation
 ;
 ; Licensed under the Apache License, Version 2.0 (the "License");
 ; you may not use this file except in compliance with the License.
@@ -71,6 +71,7 @@ EXPORTS
 ?resume@r1@detail@tbb@@YAXPEAUsuspend_point_type@123@@Z
 ?current_suspend_point@r1@detail@tbb@@YAPEAUsuspend_point_type@123@XZ
 ?notify_waiters@r1@detail@tbb@@YAX_K@Z
+?get_thread_reference_vertex@r1@detail@tbb@@YAPEAVwait_tree_vertex_interface@d1@23@PEAV4523@@Z
 
 ; Task dispatcher (task_dispatcher.cpp)
 ?spawn@r1@detail@tbb@@YAXAEAVtask@d1@23@AEAVtask_group_context@523@@Z
@@ -99,6 +100,9 @@ EXPORTS
 ?isolate_within_arena@r1@detail@tbb@@YAXAEAVdelegate_base@d1@23@_J@Z
 ?enqueue@r1@detail@tbb@@YAXAEAVtask@d1@23@PEAVtask_arena_base@523@@Z
 ?enqueue@r1@detail@tbb@@YAXAEAVtask@d1@23@AEAVtask_group_context@523@PEAVtask_arena_base@523@@Z
+?execution_slot@r1@detail@tbb@@YAGAEBVtask_arena_base@d1@23@@Z
+?enter_parallel_phase@r1@detail@tbb@@YAXPEAVtask_arena_base@d1@23@_K@Z
+?exit_parallel_phase@r1@detail@tbb@@YAXPEAVtask_arena_base@d1@23@_K@Z
 
 ; System topology parsing and threads pinning (governor.cpp)
 ?numa_node_count@r1@detail@tbb@@YAIXZ
diff --git a/external/tbb/src/tbb/dynamic_link.cpp b/external/tbb/src/tbb/dynamic_link.cpp
index beeea7da..a21beb5a 100644
--- a/external/tbb/src/tbb/dynamic_link.cpp
+++ b/external/tbb/src/tbb/dynamic_link.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
 */
 
 #include "dynamic_link.h"
+#include "environment.h"
 
 #include "oneapi/tbb/detail/_template_helpers.h"
 #include "oneapi/tbb/detail/_utils.h"
@@ -25,35 +26,38 @@
     __TBB_ASSERT_EX and DYNAMIC_LINK_WARNING instead.
 */
 
-#include <cstdarg>// va_list etc.
-#include <cstring>// strrchr
+#include <cstdarg>          // va_list etc.
+#include <cstring>          // strrchr
 #if _WIN32
-#include <malloc.h>
-
-// Unify system calls
-#define dlopen(name, flags) LoadLibrary(name)
-#define dlsym(handle, name) GetProcAddress(handle, name)
-#define dlclose(handle) (!FreeLibrary(handle))
-#define dlerror() GetLastError()
+    #include <malloc.h>
+
+    // Unify system calls
+    #define dlopen( name, flags )   LoadLibrary( name )
+    #define dlsym( handle, name )   GetProcAddress( handle, name )
+    // FreeLibrary return bool value that is not used.
+    #define dlclose( handle )       (void)( ! FreeLibrary( handle ) )
+    #define dlerror()               GetLastError()
 #ifndef PATH_MAX
-#define PATH_MAX MAX_PATH
+    #define PATH_MAX                MAX_PATH
 #endif
 #else /* _WIN32 */
-#include <dlfcn.h>
-#include <unistd.h>
+    #include <dlfcn.h>
+    #include <unistd.h>
 
-#include <climits>
-#include <cstdlib>
+    #include <climits>
+    #include <cstdlib>
 #endif /* _WIN32 */
 
 #if __TBB_WEAK_SYMBOLS_PRESENT && !__TBB_DYNAMIC_LOAD_ENABLED
-//TODO: use function attribute for weak symbols instead of the pragma.
-#pragma weak dlopen
-#pragma weak dlsym
-#pragma weak dlclose
+    //TODO: use function attribute for weak symbols instead of the pragma.
+    #pragma weak dlopen
+    #pragma weak dlsym
+    #pragma weak dlclose
 #endif /* __TBB_WEAK_SYMBOLS_PRESENT && !__TBB_DYNAMIC_LOAD_ENABLED */
 
-#define __USE_STATIC_DL_INIT (!__ANDROID__)
+
+#define __USE_STATIC_DL_INIT    ( !__ANDROID__ )
+
 
 /*
 dynamic_link is a common interface for searching for required symbols in an
@@ -98,63 +102,67 @@ soon as all of the symbols have been resolved.
 */
 
 namespace tbb {
-    namespace detail {
-        namespace r1 {
+namespace detail {
+namespace r1 {
 
 #if __TBB_WEAK_SYMBOLS_PRESENT || __TBB_DYNAMIC_LOAD_ENABLED
 
 #if !defined(DYNAMIC_LINK_WARNING) && !__TBB_WIN8UI_SUPPORT && __TBB_DYNAMIC_LOAD_ENABLED
-// Report runtime errors and continue.
-#define DYNAMIC_LINK_WARNING dynamic_link_warning
-            static void dynamic_link_warning(dynamic_link_error_t code, ...) {
-                suppress_unused_warning(code);
-            }// library_warning
-#endif       /* !defined(DYNAMIC_LINK_WARNING) && !__TBB_WIN8UI_SUPPORT && __TBB_DYNAMIC_LOAD_ENABLED */
-
-            static bool resolve_symbols(dynamic_link_handle module,
-                                        const dynamic_link_descriptor descriptors[], std::size_t required) {
-                if (!module) return false;
-
-#if !__TBB_DYNAMIC_LOAD_ENABLED /* only __TBB_WEAK_SYMBOLS_PRESENT is defined */
-                if (!dlsym) return false;
-#endif /* !__TBB_DYNAMIC_LOAD_ENABLED */
-
-                const std::size_t n_desc = 20;// Usually we don't have more than 20 descriptors per library
-                __TBB_ASSERT_EX(required <= n_desc, "Too many descriptors is required");
-                if (required > n_desc) return false;
-                pointer_to_handler h[n_desc];
-
-                for (std::size_t k = 0; k < required; ++k) {
-                    dynamic_link_descriptor const& desc = descriptors[k];
-                    pointer_to_handler addr = (pointer_to_handler) dlsym(module, desc.name);
-                    if (!addr) { return false; }
-                    h[k] = addr;
-                }
-
-                // Commit the entry points.
-                // Cannot use memset here, because the writes must be atomic.
-                for (std::size_t k = 0; k < required; ++k) *descriptors[k].handler = h[k];
-                return true;
+    // Report runtime errors and continue.
+    #define DYNAMIC_LINK_WARNING dynamic_link_warning
+    static void dynamic_link_warning( dynamic_link_error_t code, ... ) {
+        suppress_unused_warning(code);
+    } // library_warning
+#endif /* !defined(DYNAMIC_LINK_WARNING) && !__TBB_WIN8UI_SUPPORT && __TBB_DYNAMIC_LOAD_ENABLED */
+
+    static bool resolve_symbols( dynamic_link_handle module, const dynamic_link_descriptor descriptors[], std::size_t required )
+    {
+        if ( !module )
+            return false;
+
+        #if !__TBB_DYNAMIC_LOAD_ENABLED /* only __TBB_WEAK_SYMBOLS_PRESENT is defined */
+            if ( !dlsym ) return false;
+        #endif /* !__TBB_DYNAMIC_LOAD_ENABLED */
+
+        const std::size_t n_desc=20; // Usually we don't have more than 20 descriptors per library
+        __TBB_ASSERT_EX( required <= n_desc, "Too many descriptors is required" );
+        if ( required > n_desc ) return false;
+        pointer_to_handler h[n_desc];
+
+        for ( std::size_t k = 0; k < required; ++k ) {
+            dynamic_link_descriptor const & desc = descriptors[k];
+            pointer_to_handler addr = (pointer_to_handler)dlsym( module, desc.name );
+            if ( !addr ) {
+                return false;
             }
+            h[k] = addr;
+        }
+
+        // Commit the entry points.
+        // Cannot use memset here, because the writes must be atomic.
+        for( std::size_t k = 0; k < required; ++k )
+            *descriptors[k].handler = h[k];
+        return true;
+    }
 
 #if __TBB_WIN8UI_SUPPORT
-            bool dynamic_link(const char* library, const dynamic_link_descriptor descriptors[],
-                              std::size_t required, dynamic_link_handle*, int flags) {
-                dynamic_link_handle tmp_handle = NULL;
-                TCHAR wlibrary[256];
-                if (MultiByteToWideChar(CP_UTF8, 0, library, -1, wlibrary, 255) == 0) return false;
-                if (flags & DYNAMIC_LINK_LOAD) tmp_handle = LoadPackagedLibrary(wlibrary, 0);
-                if (tmp_handle != NULL) {
-                    return resolve_symbols(tmp_handle, descriptors, required);
-                } else {
-                    return false;
-                }
-            }
-            void dynamic_unlink(dynamic_link_handle) {}
-            void dynamic_unlink_all() {}
+    bool dynamic_link( const char*  library, const dynamic_link_descriptor descriptors[], std::size_t required, dynamic_link_handle*, int flags ) {
+        dynamic_link_handle tmp_handle = nullptr;
+        TCHAR wlibrary[256];
+        if ( MultiByteToWideChar(CP_UTF8, 0, library, -1, wlibrary, 255) == 0 ) return false;
+        if ( flags & DYNAMIC_LINK_LOAD )
+            tmp_handle = LoadPackagedLibrary( wlibrary, 0 );
+        if (tmp_handle != nullptr){
+            return resolve_symbols(tmp_handle, descriptors, required);
+        }else{
+            return false;
+        }
+    }
+    void dynamic_unlink( dynamic_link_handle ) {}
+    void dynamic_unlink_all() {}
 #else
 #if __TBB_DYNAMIC_LOAD_ENABLED
-            /*
+/*
     There is a security issue on Windows: LoadLibrary() may load and execute malicious code.
     See http://www.microsoft.com/technet/security/advisory/2269637.mspx for details.
     To avoid the issue, we have to pass full path (not just library name) to LoadLibrary. This
@@ -171,124 +179,127 @@ namespace tbb {
         "malloc\tbbmalloc.dll" would be "c:\program files\common\intel\malloc\tbbmalloc.dll".
 */
 
-// Struct handle_storage is used by dynamic_link routine to store handles of
-// all loaded or pinned dynamic libraries. When TBB is shut down, it calls
-// dynamic_unlink_all() that unloads modules referenced by handle_storage.
-// This struct should not have any constructors since it may be used before
-// the constructor is called.
-#define MAX_LOADED_MODULES 8// The number of maximum possible modules which can be loaded
-
-            using atomic_incrementer = std::atomic<std::size_t>;
-
-            static struct handles_t {
-                atomic_incrementer my_size;
-                dynamic_link_handle my_handles[MAX_LOADED_MODULES];
-
-                void add(const dynamic_link_handle &handle) {
-                    const std::size_t ind = my_size++;
-                    __TBB_ASSERT_EX(ind < MAX_LOADED_MODULES, "Too many modules are loaded");
-                    my_handles[ind] = handle;
-                }
-
-                void free() {
-                    const std::size_t size = my_size;
-                    for (std::size_t i = 0; i < size; ++i) dynamic_unlink(my_handles[i]);
-                }
-            } handles;
-
-            static std::once_flag init_dl_data_state;
-
-            static struct ap_data_t {
-                char _path[PATH_MAX + 1];
-                std::size_t _len;
-            } ap_data;
-
-            static void init_ap_data() {
-#if _WIN32
-                // Get handle of our DLL first.
-                HMODULE handle;
-                BOOL brc = GetModuleHandleEx(
-                        GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
-                        (LPCSTR)(&dynamic_link),// any function inside the library can be used for the address
-                        &handle);
-                if (!brc) {// Error occurred.
-                    int err = GetLastError();
-                    DYNAMIC_LINK_WARNING(dl_sys_fail, "GetModuleHandleEx", err);
-                    return;
-                }
-                // Now get path to our DLL.
-                DWORD drc = GetModuleFileName(handle, ap_data._path, static_cast<DWORD>(PATH_MAX));
-                if (drc == 0) {// Error occurred.
-                    int err = GetLastError();
-                    DYNAMIC_LINK_WARNING(dl_sys_fail, "GetModuleFileName", err);
-                    return;
-                }
-                if (drc >= PATH_MAX) {// Buffer too short.
-                    DYNAMIC_LINK_WARNING(dl_buff_too_small);
-                    return;
-                }
-                // Find the position of the last backslash.
-                char *backslash = std::strrchr(ap_data._path, '\\');
-
-                if (!backslash) {// Backslash not found.
-                    __TBB_ASSERT_EX(backslash != NULL, "Unbelievable.");
-                    return;
-                }
-                __TBB_ASSERT_EX(backslash >= ap_data._path, "Unbelievable.");
-                ap_data._len = (std::size_t)(backslash - ap_data._path) + 1;
-                *(backslash + 1) = 0;
-#else
-                // Get the library path
-                Dl_info dlinfo;
-                int res = dladdr((void *) &dynamic_link,
-                                 &dlinfo);// any function inside the library can be used for the address
-                if (!res) {
-                    char const *err = dlerror();
-                    DYNAMIC_LINK_WARNING(dl_sys_fail, "dladdr", err);
-                    return;
-                } else {
-                    __TBB_ASSERT_EX(dlinfo.dli_fname != NULL, "Unbelievable.");
-                }
-
-                char const *slash = std::strrchr(dlinfo.dli_fname, '/');
-                std::size_t fname_len = 0;
-                if (slash) {
-                    __TBB_ASSERT_EX(slash >= dlinfo.dli_fname, "Unbelievable.");
-                    fname_len = (std::size_t)(slash - dlinfo.dli_fname) + 1;
-                }
-
-                std::size_t rc;
-                if (dlinfo.dli_fname[0] == '/') {
-                    // The library path is absolute
-                    rc = 0;
-                    ap_data._len = 0;
-                } else {
-                    // The library path is relative so get the current working directory
-                    if (!getcwd(ap_data._path, sizeof(ap_data._path) / sizeof(ap_data._path[0]))) {
-                        DYNAMIC_LINK_WARNING(dl_buff_too_small);
-                        return;
-                    }
-                    ap_data._len = std::strlen(ap_data._path);
-                    ap_data._path[ap_data._len++] = '/';
-                    rc = ap_data._len;
-                }
-
-                if (fname_len > 0) {
-                    ap_data._len += fname_len;
-                    if (ap_data._len > PATH_MAX) {
-                        DYNAMIC_LINK_WARNING(dl_buff_too_small);
-                        ap_data._len = 0;
-                        return;
-                    }
-                    std::strncpy(ap_data._path + rc, dlinfo.dli_fname, fname_len);
-                    ap_data._path[ap_data._len] = 0;
-                }
-#endif /* _WIN32 */
+    // Struct handle_storage is used by dynamic_link routine to store handles of
+    // all loaded or pinned dynamic libraries. When TBB is shut down, it calls
+    // dynamic_unlink_all() that unloads modules referenced by handle_storage.
+    // This struct should not have any constructors since it may be used before
+    // the constructor is called.
+    #define MAX_LOADED_MODULES 8 // The number of maximum possible modules which can be loaded
+
+    using atomic_incrementer = std::atomic<std::size_t>;
+
+    static struct handles_t {
+        atomic_incrementer my_size;
+        dynamic_link_handle my_handles[MAX_LOADED_MODULES];
+
+        void add(const dynamic_link_handle &handle) {
+            const std::size_t ind = my_size++;
+            __TBB_ASSERT_EX( ind < MAX_LOADED_MODULES, "Too many modules are loaded" );
+            my_handles[ind] = handle;
+        }
+
+        void free() {
+            const std::size_t size = my_size;
+            for (std::size_t i=0; i<size; ++i)
+                dynamic_unlink( my_handles[i] );
+        }
+    } handles;
+
+    static std::once_flag init_dl_data_state;
+
+    static struct ap_data_t {
+        char _path[PATH_MAX+1];
+        std::size_t _len;
+    } ap_data;
+
+    static void init_ap_data() {
+    #if _WIN32
+        // Get handle of our DLL first.
+        HMODULE handle;
+        BOOL brc = GetModuleHandleEx(
+            GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
+            (LPCSTR)( & dynamic_link ), // any function inside the library can be used for the address
+            & handle
+            );
+        if ( !brc ) { // Error occurred.
+            int err = GetLastError();
+            DYNAMIC_LINK_WARNING( dl_sys_fail, "GetModuleHandleEx", err );
+            return;
+        }
+        // Now get path to our DLL.
+        DWORD drc = GetModuleFileName( handle, ap_data._path, static_cast< DWORD >( PATH_MAX ) );
+        if ( drc == 0 ) { // Error occurred.
+            int err = GetLastError();
+            DYNAMIC_LINK_WARNING( dl_sys_fail, "GetModuleFileName", err );
+            return;
+        }
+        if ( drc >= PATH_MAX ) { // Buffer too short.
+            DYNAMIC_LINK_WARNING( dl_buff_too_small );
+            return;
+        }
+        // Find the position of the last backslash.
+        char *backslash = std::strrchr( ap_data._path, '\\' );
+
+        if ( !backslash ) {    // Backslash not found.
+            __TBB_ASSERT_EX( backslash != nullptr, "Unbelievable.");
+            return;
+        }
+        __TBB_ASSERT_EX( backslash >= ap_data._path, "Unbelievable.");
+        ap_data._len = (std::size_t)(backslash - ap_data._path) + 1;
+        *(backslash+1) = 0;
+    #else
+        // Get the library path
+        Dl_info dlinfo;
+        int res = dladdr( (void*)&dynamic_link, &dlinfo ); // any function inside the library can be used for the address
+        if ( !res ) {
+            char const * err = dlerror();
+            DYNAMIC_LINK_WARNING( dl_sys_fail, "dladdr", err );
+            return;
+        } else {
+            __TBB_ASSERT_EX( dlinfo.dli_fname!=nullptr, "Unbelievable." );
+        }
+
+        char const *slash = std::strrchr( dlinfo.dli_fname, '/' );
+        std::size_t fname_len=0;
+        if ( slash ) {
+            __TBB_ASSERT_EX( slash >= dlinfo.dli_fname, "Unbelievable.");
+            fname_len = (std::size_t)(slash - dlinfo.dli_fname) + 1;
+        }
+
+        std::size_t rc;
+        if ( dlinfo.dli_fname[0]=='/' ) {
+            // The library path is absolute
+            rc = 0;
+            ap_data._len = 0;
+        } else {
+            // The library path is relative so get the current working directory
+            if ( !getcwd( ap_data._path, sizeof(ap_data._path)/sizeof(ap_data._path[0]) ) ) {
+                DYNAMIC_LINK_WARNING( dl_buff_too_small );
+                return;
             }
+            ap_data._len = std::strlen( ap_data._path );
+            ap_data._path[ap_data._len++]='/';
+            rc = ap_data._len;
+        }
+
+        if ( fname_len>0 ) {
+            ap_data._len += fname_len;
+            if ( ap_data._len>PATH_MAX ) {
+                DYNAMIC_LINK_WARNING( dl_buff_too_small );
+                ap_data._len=0;
+                return;
+            }
+            std::strncpy( ap_data._path+rc, dlinfo.dli_fname, fname_len );
+            ap_data._path[ap_data._len]=0;
+        }
+    #endif /* _WIN32 */
+    }
 
-            static void init_dl_data() { init_ap_data(); }
+    static void init_dl_data() {
+        init_ap_data();
+    }
 
-            /*
+    /*
         The function constructs absolute path for given relative path. Important: Base directory is not
         current one, it is the directory libtbb.so loaded from.
 
@@ -300,188 +311,194 @@ namespace tbb {
                     > len     -- Buffer too short, required size returned.
                     otherwise -- Ok, number of characters (incl. terminating null) written to buffer.
     */
-            static std::size_t abs_path(char const *name, char *path, std::size_t len) {
-                if (ap_data._len == 0) return 0;
-
-                std::size_t name_len = std::strlen(name);
-                std::size_t full_len = name_len + ap_data._len;
-                if (full_len < len) {
-                    __TBB_ASSERT(ap_data._path[ap_data._len] == 0, NULL);
-                    __TBB_ASSERT(std::strlen(ap_data._path) == ap_data._len, NULL);
-                    std::strncpy(path, ap_data._path, ap_data._len + 1);
-                    __TBB_ASSERT(path[ap_data._len] == 0, NULL);
-                    std::strncat(path, name, len - ap_data._len);
-                    __TBB_ASSERT(std::strlen(path) == full_len, NULL);
-                }
-                return full_len + 1;// +1 for null character
-            }
-#endif // __TBB_DYNAMIC_LOAD_ENABLED
-            void init_dynamic_link_data() {
-#if __TBB_DYNAMIC_LOAD_ENABLED
-                std::call_once(init_dl_data_state, init_dl_data);
-#endif
-            }
-
-#if __USE_STATIC_DL_INIT
-            // ap_data structure is initialized with current directory on Linux.
-            // So it should be initialized as soon as possible since the current directory may be changed.
-            // static_init_ap_data object provides this initialization during library loading.
-            static struct static_init_dl_data_t {
-                static_init_dl_data_t() { init_dynamic_link_data(); }
-            } static_init_dl_data;
-#endif
-
-#if __TBB_WEAK_SYMBOLS_PRESENT
-            static bool weak_symbol_link(const dynamic_link_descriptor descriptors[], std::size_t required) {
-                // Check if the required entries are present in what was loaded into our process.
-                for (std::size_t k = 0; k < required; ++k)
-                    if (!descriptors[k].ptr) return false;
-                // Commit the entry points.
-                for (std::size_t k = 0; k < required; ++k)
-                    *descriptors[k].handler = (pointer_to_handler) descriptors[k].ptr;
-                return true;
-            }
-#else
-            static bool weak_symbol_link(const dynamic_link_descriptor[], std::size_t) { return false; }
-#endif                          /* __TBB_WEAK_SYMBOLS_PRESENT */
-
-            void dynamic_unlink(dynamic_link_handle handle) {
-#if !__TBB_DYNAMIC_LOAD_ENABLED /* only __TBB_WEAK_SYMBOLS_PRESENT is defined */
-                if (!dlclose) return;
-#endif
-                if (handle) { dlclose(handle); }
-            }
-
-            void dynamic_unlink_all() {
-#if __TBB_DYNAMIC_LOAD_ENABLED
-                handles.free();
-#endif
-            }
-
-            static dynamic_link_handle global_symbols_link(const char *library,
-                                                           const dynamic_link_descriptor descriptors[],
-                                                           std::size_t required) {
-                dynamic_link_handle library_handle {};
+    static std::size_t abs_path( char const * name, char * path, std::size_t len ) {
+        if ( ap_data._len == 0 )
+            return 0;
+
+        std::size_t name_len = std::strlen( name );
+        std::size_t full_len = name_len+ap_data._len;
+        if ( full_len < len ) {
+            __TBB_ASSERT( ap_data._path[ap_data._len] == 0, nullptr);
+            __TBB_ASSERT( std::strlen(ap_data._path) == ap_data._len, nullptr);
+            std::strncpy( path, ap_data._path, ap_data._len + 1 );
+            __TBB_ASSERT( path[ap_data._len] == 0, nullptr);
+            std::strncat( path, name, len - ap_data._len );
+            __TBB_ASSERT( std::strlen(path) == full_len, nullptr);
+        }
+        return full_len+1; // +1 for null character
+    }
+#endif  // __TBB_DYNAMIC_LOAD_ENABLED
+    void init_dynamic_link_data() {
+    #if __TBB_DYNAMIC_LOAD_ENABLED
+        std::call_once( init_dl_data_state, init_dl_data );
+    #endif
+    }
+
+    #if __USE_STATIC_DL_INIT
+    // ap_data structure is initialized with current directory on Linux.
+    // So it should be initialized as soon as possible since the current directory may be changed.
+    // static_init_ap_data object provides this initialization during library loading.
+    static struct static_init_dl_data_t {
+        static_init_dl_data_t() {
+            init_dynamic_link_data();
+        }
+    } static_init_dl_data;
+    #endif
+
+    #if __TBB_WEAK_SYMBOLS_PRESENT
+    static bool weak_symbol_link( const dynamic_link_descriptor descriptors[], std::size_t required )
+    {
+        // Check if the required entries are present in what was loaded into our process.
+        for ( std::size_t k = 0; k < required; ++k )
+            if ( !descriptors[k].ptr )
+                return false;
+        // Commit the entry points.
+        for ( std::size_t k = 0; k < required; ++k )
+            *descriptors[k].handler = (pointer_to_handler) descriptors[k].ptr;
+        return true;
+    }
+    #else
+    static bool weak_symbol_link( const dynamic_link_descriptor[], std::size_t ) {
+        return false;
+    }
+    #endif /* __TBB_WEAK_SYMBOLS_PRESENT */
+
+    void dynamic_unlink( dynamic_link_handle handle ) {
+    #if !__TBB_DYNAMIC_LOAD_ENABLED /* only __TBB_WEAK_SYMBOLS_PRESENT is defined */
+        if ( !dlclose ) return;
+    #endif
+        if ( handle ) {
+            dlclose( handle );
+        }
+    }
+
+    void dynamic_unlink_all() {
+    #if __TBB_DYNAMIC_LOAD_ENABLED
+        handles.free();
+    #endif
+    }
+
+    static dynamic_link_handle global_symbols_link( const char* library, const dynamic_link_descriptor descriptors[], std::size_t required ) {
+        dynamic_link_handle library_handle{};
 #if _WIN32
-                auto res = GetModuleHandleEx(0, library, &library_handle);
-                __TBB_ASSERT_EX((res && library_handle) || (!res && !library_handle), nullptr);
-#else                           /* _WIN32 */
-#if !__TBB_DYNAMIC_LOAD_ENABLED /* only __TBB_WEAK_SYMBOLS_PRESENT is defined */
-                if (!dlopen) return 0;
-#endif                          /* !__TBB_DYNAMIC_LOAD_ENABLED */
-                // RTLD_GLOBAL - to guarantee that old TBB will find the loaded library
-                // RTLD_NOLOAD - not to load the library without the full path
-                library_handle = dlopen(library, RTLD_LAZY | RTLD_GLOBAL | RTLD_NOLOAD);
-#endif                          /* _WIN32 */
-                if (library_handle) {
-                    if (!resolve_symbols(library_handle, descriptors, required)) {
-                        dynamic_unlink(library_handle);
-                        library_handle = nullptr;
-                    }
-                }
-                return library_handle;
-            }
-
-            static void save_library_handle(dynamic_link_handle src, dynamic_link_handle *dst) {
-                __TBB_ASSERT_EX(src, "The library handle to store must be non-zero");
-                if (dst) *dst = src;
-#if __TBB_DYNAMIC_LOAD_ENABLED
-                else
-                    handles.add(src);
-#endif /* __TBB_DYNAMIC_LOAD_ENABLED */
+        auto res = GetModuleHandleEx(0, library, &library_handle);
+        __TBB_ASSERT_EX((res && library_handle) || (!res && !library_handle), nullptr);
+#else /* _WIN32 */
+    #if !__TBB_DYNAMIC_LOAD_ENABLED /* only __TBB_WEAK_SYMBOLS_PRESENT is defined */
+        if ( !dlopen ) return 0;
+    #endif /* !__TBB_DYNAMIC_LOAD_ENABLED */
+        // RTLD_GLOBAL - to guarantee that old TBB will find the loaded library
+        // RTLD_NOLOAD - not to load the library without the full path
+        library_handle = dlopen(library, RTLD_LAZY | RTLD_GLOBAL | RTLD_NOLOAD);
+#endif /* _WIN32 */
+        if (library_handle) {
+            if (!resolve_symbols(library_handle, descriptors, required)) {
+                dynamic_unlink(library_handle);
+                library_handle = nullptr;
             }
+        }
+        return library_handle;
+    }
+
+    static void save_library_handle( dynamic_link_handle src, dynamic_link_handle *dst ) {
+        __TBB_ASSERT_EX( src, "The library handle to store must be non-zero" );
+        if ( dst )
+            *dst = src;
+    #if __TBB_DYNAMIC_LOAD_ENABLED
+        else
+            handles.add( src );
+    #endif /* __TBB_DYNAMIC_LOAD_ENABLED */
+    }
 
 #if !_WIN32
-            int loading_flags(bool local_binding) {
-                int flags = RTLD_NOW;
-                if (local_binding) {
-                    flags = flags | RTLD_LOCAL;
-#if __linux__ && !__ANDROID__ && !__TBB_USE_SANITIZERS
-                    flags = flags | RTLD_DEEPBIND;
-#endif
-                } else {
-                    flags = flags | RTLD_GLOBAL;
-                }
-                return flags;
+    int loading_flags(bool local_binding) {
+        int flags = RTLD_NOW;
+        if (local_binding) {
+            flags = flags | RTLD_LOCAL;
+#if (__linux__ && __GLIBC__) && !__TBB_USE_SANITIZERS
+            if( !GetBoolEnvironmentVariable("TBB_ENABLE_SANITIZERS") ) {
+                flags = flags | RTLD_DEEPBIND;
             }
 #endif
+        } else {
+            flags = flags | RTLD_GLOBAL;
+        }
+        return flags;
+    }
+#endif
 
-            dynamic_link_handle dynamic_load(const char *library, const dynamic_link_descriptor descriptors[],
-                                             std::size_t required, bool local_binding) {
-                ::tbb::detail::suppress_unused_warning(library, descriptors, required, local_binding);
+    dynamic_link_handle dynamic_load( const char* library, const dynamic_link_descriptor descriptors[], std::size_t required, bool local_binding ) {
+        ::tbb::detail::suppress_unused_warning( library, descriptors, required, local_binding );
 #if __TBB_DYNAMIC_LOAD_ENABLED
-                std::size_t const len = PATH_MAX + 1;
-                char path[len];
-                std::size_t rc = abs_path(library, path, len);
-                if (0 < rc && rc <= len) {
+        std::size_t const len = PATH_MAX + 1;
+        char path[ len ];
+        std::size_t rc = abs_path( library, path, len );
+        if ( 0 < rc && rc <= len ) {
 #if _WIN32
-                    // Prevent Windows from displaying silly message boxes if it fails to load library
-                    // (e.g. because of MS runtime problems - one of those crazy manifest related ones)
-                    UINT prev_mode = SetErrorMode(SEM_FAILCRITICALERRORS);
+            // Prevent Windows from displaying silly message boxes if it fails to load library
+            // (e.g. because of MS runtime problems - one of those crazy manifest related ones)
+            UINT prev_mode = SetErrorMode (SEM_FAILCRITICALERRORS);
 #endif /* _WIN32 */
-                    // The second argument (loading_flags) is ignored on Windows
-                    dynamic_link_handle library_handle = dlopen(path, loading_flags(local_binding));
+            // The second argument (loading_flags) is ignored on Windows
+            dynamic_link_handle library_handle = dlopen( path, loading_flags(local_binding) );
 #if _WIN32
-                    SetErrorMode(prev_mode);
+            SetErrorMode (prev_mode);
 #endif /* _WIN32 */
-                    if (library_handle) {
-                        if (!resolve_symbols(library_handle, descriptors, required)) {
-                            // The loaded library does not contain all the expected entry points
-                            dynamic_unlink(library_handle);
-                            library_handle = NULL;
-                        }
-                    } else
-                        DYNAMIC_LINK_WARNING(dl_lib_not_found, path, dlerror());
-                    return library_handle;
-                } else if (rc > len)
-                    DYNAMIC_LINK_WARNING(dl_buff_too_small);
-                    // rc == 0 means failing of init_ap_data so the warning has already been issued.
+            if( library_handle ) {
+                if( !resolve_symbols( library_handle, descriptors, required ) ) {
+                    // The loaded library does not contain all the expected entry points
+                    dynamic_unlink( library_handle );
+                    library_handle = nullptr;
+                }
+            } else
+                DYNAMIC_LINK_WARNING( dl_lib_not_found, path, dlerror() );
+            return library_handle;
+        } else if ( rc>len )
+                DYNAMIC_LINK_WARNING( dl_buff_too_small );
+                // rc == 0 means failing of init_ap_data so the warning has already been issued.
 
 #endif /* __TBB_DYNAMIC_LOAD_ENABLED */
-                return 0;
-            }
+            return nullptr;
+    }
 
-            bool dynamic_link(const char *library, const dynamic_link_descriptor descriptors[],
-                              std::size_t required, dynamic_link_handle *handle, int flags) {
-                init_dynamic_link_data();
+    bool dynamic_link( const char* library, const dynamic_link_descriptor descriptors[], std::size_t required, dynamic_link_handle *handle, int flags ) {
+        init_dynamic_link_data();
 
-                // TODO: May global_symbols_link find weak symbols?
-                dynamic_link_handle library_handle
-                        = (flags & DYNAMIC_LINK_GLOBAL) ? global_symbols_link(library, descriptors, required)
-                                                        : 0;
+        // TODO: May global_symbols_link find weak symbols?
+        dynamic_link_handle library_handle = ( flags & DYNAMIC_LINK_GLOBAL ) ? global_symbols_link( library, descriptors, required ) : nullptr;
 
 #if defined(_MSC_VER) && _MSC_VER <= 1900
-#pragma warning(push)
+#pragma warning (push)
 // MSVC 2015 warning: 'int': forcing value to bool 'true' or 'false'
-#pragma warning(disable : 4800)
+#pragma warning (disable: 4800)
 #endif
-                if (!library_handle && (flags & DYNAMIC_LINK_LOAD))
-                    library_handle = dynamic_load(library, descriptors, required, flags & DYNAMIC_LINK_LOCAL);
+        if ( !library_handle && ( flags & DYNAMIC_LINK_LOAD ) )
+            library_handle = dynamic_load( library, descriptors, required, flags & DYNAMIC_LINK_LOCAL );
 
 #if defined(_MSC_VER) && _MSC_VER <= 1900
-#pragma warning(pop)
+#pragma warning (pop)
 #endif
-                if (!library_handle && (flags & DYNAMIC_LINK_WEAK))
-                    return weak_symbol_link(descriptors, required);
+        if ( !library_handle && ( flags & DYNAMIC_LINK_WEAK ) )
+            return weak_symbol_link( descriptors, required );
 
-                if (library_handle) {
-                    save_library_handle(library_handle, handle);
-                    return true;
-                }
-                return false;
-            }
+        if ( library_handle ) {
+            save_library_handle( library_handle, handle );
+            return true;
+        }
+        return false;
+    }
 
 #endif /*__TBB_WIN8UI_SUPPORT*/
-#else  /* __TBB_WEAK_SYMBOLS_PRESENT || __TBB_DYNAMIC_LOAD_ENABLED */
-            bool dynamic_link(const char *, const dynamic_link_descriptor *, std::size_t,
-                              dynamic_link_handle *handle, int) {
-                if (handle) *handle = 0;
-                return false;
-            }
-            void dynamic_unlink(dynamic_link_handle) {}
-            void dynamic_unlink_all() {}
+#else /* __TBB_WEAK_SYMBOLS_PRESENT || __TBB_DYNAMIC_LOAD_ENABLED */
+    bool dynamic_link( const char*, const dynamic_link_descriptor*, std::size_t, dynamic_link_handle *handle, int ) {
+        if ( handle )
+            *handle=0;
+        return false;
+    }
+    void dynamic_unlink( dynamic_link_handle ) {}
+    void dynamic_unlink_all() {}
 #endif /* __TBB_WEAK_SYMBOLS_PRESENT || __TBB_DYNAMIC_LOAD_ENABLED */
 
-        }// namespace r1
-    }    // namespace detail
-}// namespace tbb
+} // namespace r1
+} // namespace detail
+} // namespace tbb
diff --git a/external/tbb/src/tbb/dynamic_link.h b/external/tbb/src/tbb/dynamic_link.h
index a8a03832..f07750b6 100644
--- a/external/tbb/src/tbb/dynamic_link.h
+++ b/external/tbb/src/tbb/dynamic_link.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -29,8 +29,8 @@
     and CLOSE_INTERNAL_NAMESPACE to override the following default definitions. **/
 
 #include <cstddef>
-#if _WIN32
-#include <Windows.h>
+#ifdef _WIN32
+#include <windows.h>
 #endif /* _WIN32 */
 
 namespace tbb {
@@ -45,7 +45,7 @@ typedef void (*pointer_to_handler)();
 // prevent warnings from some compilers (g++ 4.1)
 #if __TBB_WEAK_SYMBOLS_PRESENT
 #define DLD(s,h) {#s, (pointer_to_handler*)(void*)(&h), (pointer_to_handler)&s}
-#define DLD_NOWEAK(s,h) {#s, (pointer_to_handler*)(void*)(&h), NULL}
+#define DLD_NOWEAK(s,h) {#s, (pointer_to_handler*)(void*)(&h), nullptr}
 #else
 #define DLD(s,h) {#s, (pointer_to_handler*)(void*)(&h)}
 #define DLD_NOWEAK(s,h) DLD(s,h)
@@ -95,7 +95,7 @@ const int DYNAMIC_LINK_DEFAULT       = DYNAMIC_LINK_GLOBAL | DYNAMIC_LINK_LOAD |
 bool dynamic_link( const char* library,
                    const dynamic_link_descriptor descriptors[],
                    std::size_t required,
-                   dynamic_link_handle* handle = 0,
+                   dynamic_link_handle* handle = nullptr,
                    int flags = DYNAMIC_LINK_DEFAULT );
 
 void dynamic_unlink( dynamic_link_handle handle );
diff --git a/external/tbb/src/tbb/environment.h b/external/tbb/src/tbb/environment.h
index 8886ef09..eac6f202 100644
--- a/external/tbb/src/tbb/environment.h
+++ b/external/tbb/src/tbb/environment.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2018-2021 Intel Corporation
+    Copyright (c) 2018-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -44,7 +44,7 @@ static inline bool GetBoolEnvironmentVariable( const char * name ) {
         if (s[index] != '1') return false;
         index++;
         // Memory access after incrementing is safe, since the getenv() returns a
-        // NULL terminated string, and even if the character getting by index is '1',
+        // null-terminated string, and even if the character getting by index is '1',
         // and this character is the end of string, after incrementing we will get
         // an index of character, that contains '\0'
         index += std::strspn(&s[index], " ");
@@ -55,7 +55,7 @@ static inline bool GetBoolEnvironmentVariable( const char * name ) {
 
 static inline long GetIntegralEnvironmentVariable( const char * name ) {
     if ( const char* s = std::getenv(name) ) {
-        char* end = NULL;
+        char* end = nullptr;
         errno = 0;
         long value = std::strtol(s, &end, 10);
 
diff --git a/external/tbb/src/tbb/exception.cpp b/external/tbb/src/tbb/exception.cpp
index 79c4b4a3..efc9b2a4 100644
--- a/external/tbb/src/tbb/exception.cpp
+++ b/external/tbb/src/tbb/exception.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -14,18 +14,18 @@
     limitations under the License.
 */
 
-#include "oneapi/tbb/detail/_assert.h"
 #include "oneapi/tbb/detail/_exception.h"
+#include "oneapi/tbb/detail/_assert.h"
 #include "oneapi/tbb/detail/_template_helpers.h"
 
-#include <cstdio>
 #include <cstring>
+#include <cstdio>
+#include <stdexcept> // std::runtime_error
 #include <new>
-#include <stdexcept>// std::runtime_error
 #include <stdexcept>
 
-#define __TBB_STD_RETHROW_EXCEPTION_POSSIBLY_BROKEN                                                          \
-    (__GLIBCXX__ && __TBB_GLIBCXX_VERSION >= 40700 && __TBB_GLIBCXX_VERSION < 60000 && TBB_USE_EXCEPTIONS)
+#define __TBB_STD_RETHROW_EXCEPTION_POSSIBLY_BROKEN                             \
+    (__GLIBCXX__ && __TBB_GLIBCXX_VERSION>=40700 && __TBB_GLIBCXX_VERSION<60000 && TBB_USE_EXCEPTIONS)
 
 #if __TBB_STD_RETHROW_EXCEPTION_POSSIBLY_BROKEN
 // GCC ABI declarations necessary for a workaround
@@ -33,172 +33,134 @@
 #endif
 
 namespace tbb {
-    namespace detail {
-        namespace r1 {
-
-            const char* bad_last_alloc::what() const noexcept(true) {
-                return "bad allocation in previous or concurrent attempt";
-            }
-            const char* user_abort::what() const noexcept(true) {
-                return "User-initiated abort has terminated this operation";
-            }
-            const char* missing_wait::what() const noexcept(true) {
-                return "wait() was not called on the structured_task_group";
-            }
+namespace detail {
+namespace r1 {
+
+const char* bad_last_alloc::what() const noexcept(true) { return "bad allocation in previous or concurrent attempt"; }
+const char* user_abort::what() const noexcept(true) { return "User-initiated abort has terminated this operation"; }
+const char* missing_wait::what() const noexcept(true) { return "wait() was not called on the structured_task_group"; }
 
 #if TBB_USE_EXCEPTIONS
-            template <typename F>
-            /*[[noreturn]]*/ void do_throw_noexcept(F throw_func) noexcept {
-                throw_func();
-            }
+    template <typename F>
+    /*[[noreturn]]*/ void do_throw_noexcept(F throw_func) noexcept {
+        throw_func();
+    }
 
-            /*[[noreturn]]*/ void do_throw_noexcept(void (*throw_func)()) noexcept {
-                throw_func();
+    /*[[noreturn]]*/ void do_throw_noexcept(void (*throw_func)()) noexcept {
+        throw_func();
 #if __GNUC__ == 7
-                // In release, GCC 7 loses noexcept attribute during tail call optimization.
-                // The following statement prevents tail call optimization.
-                volatile bool reach_this_point = true;
-                suppress_unused_warning(reach_this_point);
+        // In release, GCC 7 loses noexcept attribute during tail call optimization.
+        // The following statement prevents tail call optimization.
+        volatile bool reach_this_point = true;
+        suppress_unused_warning(reach_this_point);
 #endif
-            }
+    }
 
-            bool terminate_on_exception();// defined in global_control.cpp and ipc_server.cpp
+    bool terminate_on_exception(); // defined in global_control.cpp and ipc_server.cpp
 
-            template <typename F>
-            /*[[noreturn]]*/ void do_throw(F throw_func) {
-                if (terminate_on_exception()) { do_throw_noexcept(throw_func); }
-                throw_func();
-            }
+    template <typename F>
+    /*[[noreturn]]*/ void do_throw(F throw_func) {
+        if (terminate_on_exception()) {
+            do_throw_noexcept(throw_func);
+        }
+        throw_func();
+    }
 
-#define DO_THROW(exc, init_args) do_throw([] { throw exc init_args; });
+    #define DO_THROW(exc, init_args) do_throw( []{ throw exc init_args; } );
 #else /* !TBB_USE_EXCEPTIONS */
-#define PRINT_ERROR_AND_ABORT(exc_name, msg)                                                                 \
-    std::fprintf(stderr,                                                                                     \
-                 "Exception %s with message %s would have been thrown, "                                     \
-                 "if exception handling had not been disabled. Aborting.\n",                                 \
-                 exc_name, msg);                                                                             \
-    std::fflush(stderr);                                                                                     \
-    std::abort();
-#define DO_THROW(exc, init_args) PRINT_ERROR_AND_ABORT(#exc, #init_args)
+    #define PRINT_ERROR_AND_ABORT(exc_name, msg) \
+        std::fprintf (stderr, "Exception %s with message %s would have been thrown, "  \
+            "if exception handling had not been disabled. Aborting.\n", exc_name, msg); \
+        std::fflush(stderr); \
+        std::abort();
+    #define DO_THROW(exc, init_args) PRINT_ERROR_AND_ABORT(#exc, #init_args)
 #endif /* !TBB_USE_EXCEPTIONS */
 
-            void throw_exception(exception_id eid) {
-                switch (eid) {
-                    case exception_id::bad_alloc:
-                        DO_THROW(std::bad_alloc, ());
-                        break;
-                    case exception_id::bad_last_alloc:
-                        DO_THROW(bad_last_alloc, ());
-                        break;
-                    case exception_id::user_abort:
-                        DO_THROW(user_abort, ());
-                        break;
-                    case exception_id::nonpositive_step:
-                        DO_THROW(std::invalid_argument, ("Step must be positive"));
-                        break;
-                    case exception_id::out_of_range:
-                        DO_THROW(std::out_of_range, ("Index out of requested size range"));
-                        break;
-                    case exception_id::reservation_length_error:
-                        DO_THROW(std::length_error,
-                                 ("Attempt to exceed implementation defined length limits"));
-                        break;
-                    case exception_id::missing_wait:
-                        DO_THROW(missing_wait, ());
-                        break;
-                    case exception_id::invalid_load_factor:
-                        DO_THROW(std::out_of_range, ("Invalid hash load factor"));
-                        break;
-                    case exception_id::invalid_key:
-                        DO_THROW(std::out_of_range, ("invalid key"));
-                        break;
-                    case exception_id::bad_tagged_msg_cast:
-                        DO_THROW(std::runtime_error, ("Illegal tagged_msg cast"));
-                        break;
-#if __TBB_SUPPORTS_WORKERS_WAITING_IN_TERMINATE
-                    case exception_id::unsafe_wait:
-                        DO_THROW(unsafe_wait, ("Unsafe to wait further"));
-                        break;
-#endif
-#if __TBB_PREVIEW_TASK_GROUP_EXTENSIONS
-                    case exception_id::bad_task_handle:
-                        DO_THROW(std::runtime_error, ("Attempt to schedule empty task_handle"));
-                        break;
-                    case exception_id::bad_task_handle_wrong_task_group:
-                        DO_THROW(std::runtime_error,
-                                 ("Attempt to schedule task_handle into different task_group"));
-                        break;
-#endif
-                    default:
-                        __TBB_ASSERT(false, "Unknown exception ID");
-                }
-                __TBB_ASSERT(false, "Unreachable code");
-            }
-
-            /* The "what" should be fairly short, not more than about 128 characters.
+void throw_exception ( exception_id eid ) {
+    switch ( eid ) {
+    case exception_id::bad_alloc: DO_THROW(std::bad_alloc, ()); break;
+    case exception_id::bad_last_alloc: DO_THROW(bad_last_alloc, ()); break;
+    case exception_id::user_abort: DO_THROW( user_abort, () ); break;
+    case exception_id::nonpositive_step: DO_THROW(std::invalid_argument, ("Step must be positive") ); break;
+    case exception_id::out_of_range: DO_THROW(std::out_of_range, ("Index out of requested size range")); break;
+    case exception_id::reservation_length_error: DO_THROW(std::length_error, ("Attempt to exceed implementation defined length limits")); break;
+    case exception_id::missing_wait: DO_THROW(missing_wait, ()); break;
+    case exception_id::invalid_load_factor: DO_THROW(std::out_of_range, ("Invalid hash load factor")); break;
+    case exception_id::invalid_key: DO_THROW(std::out_of_range, ("invalid key")); break;
+    case exception_id::bad_tagged_msg_cast: DO_THROW(std::runtime_error, ("Illegal tagged_msg cast")); break;
+    case exception_id::unsafe_wait: DO_THROW(unsafe_wait, ("Unsafe to wait further")); break;
+    default: __TBB_ASSERT ( false, "Unknown exception ID" );
+    }
+    __TBB_ASSERT(false, "Unreachable code");
+}
+
+/* The "what" should be fairly short, not more than about 128 characters.
    Because we control all the call sites to handle_perror, it is pointless
    to bullet-proof it for very long strings.
 
    Design note: ADR put this routine off to the side in tbb_misc.cpp instead of
    Task.cpp because the throw generates a pathetic lot of code, and ADR wanted
    this large chunk of code to be placed on a cold page. */
-            void handle_perror(int error_code, const char* what) {
-                const int BUF_SIZE = 255;
-                char buf[BUF_SIZE + 1] = {0};
-                std::strncat(buf, what, BUF_SIZE);
-                std::size_t buf_len = std::strlen(buf);
-                if (error_code) {
-                    std::strncat(buf, ": ", BUF_SIZE - buf_len);
-                    buf_len = std::strlen(buf);
-                    std::strncat(buf, std::strerror(error_code), BUF_SIZE - buf_len);
-                    buf_len = std::strlen(buf);
-                }
-                __TBB_ASSERT(buf_len <= BUF_SIZE && buf[buf_len] == 0, nullptr);
+void handle_perror( int error_code, const char* what ) {
+    const int BUF_SIZE = 255;
+    char buf[BUF_SIZE + 1] = { 0 };
+    std::strncat(buf, what, BUF_SIZE);
+    std::size_t buf_len = std::strlen(buf);
+    if (error_code) {
+        std::strncat(buf, ": ", BUF_SIZE - buf_len);
+        buf_len = std::strlen(buf);
+        std::strncat(buf, std::strerror(error_code), BUF_SIZE - buf_len);
+        buf_len = std::strlen(buf);
+    }
+    __TBB_ASSERT(buf_len <= BUF_SIZE && buf[buf_len] == 0, nullptr);
 #if TBB_USE_EXCEPTIONS
-                do_throw([&buf] { throw std::runtime_error(buf); });
+    do_throw([&buf] { throw std::runtime_error(buf); });
 #else
-                PRINT_ERROR_AND_ABORT("runtime_error", buf);
+    PRINT_ERROR_AND_ABORT( "runtime_error", buf);
 #endif /* !TBB_USE_EXCEPTIONS */
-            }
+}
 
 #if __TBB_STD_RETHROW_EXCEPTION_POSSIBLY_BROKEN
-            // Runtime detection and workaround for the GCC bug 62258.
-            // The problem is that std::rethrow_exception() does not increment a counter
-            // of active exceptions, causing std::uncaught_exception() to return a wrong value.
-            // The code is created after, and roughly reflects, the workaround
-            // at https://gcc.gnu.org/bugzilla/attachment.cgi?id=34683
-
-            void fix_broken_rethrow() {
-                struct gcc_eh_data {
-                    void* caughtExceptions;
-                    unsigned int uncaughtExceptions;
-                };
-                gcc_eh_data* eh_data = punned_cast<gcc_eh_data*>(abi::__cxa_get_globals());
-                ++eh_data->uncaughtExceptions;
-            }
-
-            bool gcc_rethrow_exception_broken() {
-                bool is_broken;
-                __TBB_ASSERT(!std::uncaught_exception(),
-                             "gcc_rethrow_exception_broken() must not be called when an exception is active");
-                try {
-                    // Throw, catch, and rethrow an exception
-                    try {
-                        throw __TBB_GLIBCXX_VERSION;
-                    } catch (...) { std::rethrow_exception(std::current_exception()); }
-                } catch (...) {
-                    // Check the bug presence
-                    is_broken = std::uncaught_exception();
-                }
-                if (is_broken) fix_broken_rethrow();
-                __TBB_ASSERT(!std::uncaught_exception(), NULL);
-                return is_broken;
-            }
+// Runtime detection and workaround for the GCC bug 62258.
+// The problem is that std::rethrow_exception() does not increment a counter
+// of active exceptions, causing std::uncaught_exception() to return a wrong value.
+// The code is created after, and roughly reflects, the workaround
+// at https://gcc.gnu.org/bugzilla/attachment.cgi?id=34683
+
+void fix_broken_rethrow() {
+    struct gcc_eh_data {
+        void *       caughtExceptions;
+        unsigned int uncaughtExceptions;
+    };
+    gcc_eh_data* eh_data = punned_cast<gcc_eh_data*>( abi::__cxa_get_globals() );
+    ++eh_data->uncaughtExceptions;
+}
+
+bool gcc_rethrow_exception_broken() {
+    bool is_broken;
+    __TBB_ASSERT( !std::uncaught_exception(),
+        "gcc_rethrow_exception_broken() must not be called when an exception is active" );
+    try {
+        // Throw, catch, and rethrow an exception
+        try {
+            throw __TBB_GLIBCXX_VERSION;
+        } catch(...) {
+            std::rethrow_exception( std::current_exception() );
+        }
+    } catch(...) {
+        // Check the bug presence
+        is_broken = std::uncaught_exception();
+    }
+    if( is_broken ) fix_broken_rethrow();
+    __TBB_ASSERT( !std::uncaught_exception(), nullptr);
+    return is_broken;
+}
 #else
-            void fix_broken_rethrow() {}
-            bool gcc_rethrow_exception_broken() { return false; }
+void fix_broken_rethrow() {}
+bool gcc_rethrow_exception_broken() { return false; }
 #endif /* __TBB_STD_RETHROW_EXCEPTION_POSSIBLY_BROKEN */
 
-        }// namespace r1
-    }    // namespace detail
-}// namespace tbb
+} // namespace r1
+} // namespace detail
+} // namespace tbb
+
diff --git a/external/tbb/src/tbb/global_control.cpp b/external/tbb/src/tbb/global_control.cpp
index 0703ad57..f45c66b8 100644
--- a/external/tbb/src/tbb/global_control.cpp
+++ b/external/tbb/src/tbb/global_control.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -17,11 +17,13 @@
 #include "oneapi/tbb/detail/_config.h"
 #include "oneapi/tbb/detail/_template_helpers.h"
 
+#include "oneapi/tbb/cache_aligned_allocator.h"
 #include "oneapi/tbb/global_control.h"
-#include "oneapi/tbb/spin_mutex.h"
 #include "oneapi/tbb/tbb_allocator.h"
+#include "oneapi/tbb/spin_mutex.h"
 
 #include "governor.h"
+#include "threading_control.h"
 #include "market.h"
 #include "misc.h"
 
@@ -29,229 +31,255 @@
 #include <set>
 
 namespace tbb {
-    namespace detail {
-        namespace r1 {
-
-            //! Comparator for a set of global_control objects
-            struct control_storage_comparator {
-                bool operator()(const global_control* lhs, const global_control* rhs) const;
-            };
-
-            class control_storage {
-                friend struct global_control_impl;
-                friend std::size_t global_control_active_value(int);
-
-            protected:
-                std::size_t my_active_value {0};
-                std::set<global_control*, control_storage_comparator, tbb_allocator<global_control*>>
-                        my_list {};
-                spin_mutex my_list_mutex {};
-
-            public:
-                virtual std::size_t default_value() const = 0;
-                virtual void apply_active(std::size_t new_active) { my_active_value = new_active; }
-                virtual bool is_first_arg_preferred(std::size_t a, std::size_t b) const {
-                    return a > b;// prefer max by default
-                }
-                virtual std::size_t active_value() {
-                    spin_mutex::scoped_lock lock(my_list_mutex);// protect my_list.empty() call
-                    return !my_list.empty() ? my_active_value : default_value();
-                }
-            };
-
-            class alignas(max_nfs_size) allowed_parallelism_control : public control_storage {
-                virtual std::size_t default_value() const override {
-                    return max(1U, governor::default_num_threads());
-                }
-                virtual bool is_first_arg_preferred(std::size_t a, std::size_t b) const override {
-                    return a < b;// prefer min allowed parallelism
-                }
-                virtual void apply_active(std::size_t new_active) override {
-                    control_storage::apply_active(new_active);
-                    __TBB_ASSERT(my_active_value >= 1, NULL);
-                    // -1 to take external thread into account
-                    market::set_active_num_workers(my_active_value - 1);
-                }
-                virtual std::size_t active_value() override {
-                    spin_mutex::scoped_lock lock(my_list_mutex);// protect my_list.empty() call
-                    if (my_list.empty()) return default_value();
-                    // non-zero, if market is active
-                    const std::size_t workers = market::max_num_workers();
-                    // We can't exceed market's maximal number of workers.
-                    // +1 to take external thread into account
-                    return workers ? min(workers + 1, my_active_value) : my_active_value;
-                }
-
-            public:
-                std::size_t active_value_if_present() const { return !my_list.empty() ? my_active_value : 0; }
-            };
-
-            class alignas(max_nfs_size) stack_size_control : public control_storage {
-                virtual std::size_t default_value() const override { return ThreadStackSize; }
-                virtual void apply_active(std::size_t new_active) override {
-                    control_storage::apply_active(new_active);
+namespace detail {
+namespace r1 {
+
+//! Comparator for a set of global_control objects
+struct control_storage_comparator {
+    bool operator()(const d1::global_control* lhs, const d1::global_control* rhs) const;
+};
+
+class control_storage {
+    friend struct global_control_impl;
+    friend std::size_t global_control_active_value(int);
+    friend void global_control_lock();
+    friend void global_control_unlock();
+    friend std::size_t global_control_active_value_unsafe(d1::global_control::parameter);
+protected:
+    std::size_t my_active_value{0};
+    std::set<d1::global_control*, control_storage_comparator, tbb_allocator<d1::global_control*>> my_list{};
+    spin_mutex my_list_mutex{};
+public:
+    virtual ~control_storage() = default;
+    virtual std::size_t default_value() const = 0;
+    virtual void apply_active(std::size_t new_active) {
+        my_active_value = new_active;
+    }
+    virtual bool is_first_arg_preferred(std::size_t a, std::size_t b) const {
+        return a>b; // prefer max by default
+    }
+    virtual std::size_t active_value() {
+        spin_mutex::scoped_lock lock(my_list_mutex); // protect my_list.empty() call
+        return !my_list.empty() ? my_active_value : default_value();
+    }
+
+    std::size_t active_value_unsafe() {
+        return !my_list.empty() ? my_active_value : default_value();
+    }
+};
+
+class alignas(max_nfs_size) allowed_parallelism_control : public control_storage {
+    std::size_t default_value() const override {
+        return max(1U, governor::default_num_threads());
+    }
+    bool is_first_arg_preferred(std::size_t a, std::size_t b) const override {
+        return a<b; // prefer min allowed parallelism
+    }
+    void apply_active(std::size_t new_active) override {
+        control_storage::apply_active(new_active);
+        __TBB_ASSERT(my_active_value >= 1, nullptr);
+        // -1 to take external thread into account
+        threading_control::set_active_num_workers(my_active_value - 1);
+    }
+    std::size_t active_value() override {
+        spin_mutex::scoped_lock lock(my_list_mutex); // protect my_list.empty() call
+        if (my_list.empty()) {
+            return default_value();
+        }
+
+        // non-zero, if market is active
+        const std::size_t workers = threading_control::max_num_workers();
+        // We can't exceed market's maximal number of workers.
+        // +1 to take external thread into account
+        return workers ? min(workers + 1, my_active_value) : my_active_value;
+    }
+};
+
+class alignas(max_nfs_size) stack_size_control : public control_storage {
+    std::size_t default_value() const override {
+#if _WIN32_WINNT >= 0x0602 /* _WIN32_WINNT_WIN8 */
+        static auto ThreadStackSizeDefault = [] {
+            ULONG_PTR hi, lo;
+            GetCurrentThreadStackLimits(&lo, &hi);
+            return hi - lo;
+        }();
+        return ThreadStackSizeDefault;
+#elif defined(EMSCRIPTEN)
+        return __TBB_EMSCRIPTEN_STACK_SIZE;
+#else
+        return ThreadStackSize;
+#endif
+    }
+    void apply_active(std::size_t new_active) override {
+        control_storage::apply_active(new_active);
 #if __TBB_WIN8UI_SUPPORT && (_WIN32_WINNT < 0x0A00)
-                    __TBB_ASSERT(false, "For Windows 8 Store* apps we must not set stack size");
+        __TBB_ASSERT( false, "For Windows 8 Store* apps we must not set stack size" );
 #endif
-                }
-            };
-
-            class alignas(max_nfs_size) terminate_on_exception_control : public control_storage {
-                virtual std::size_t default_value() const override { return 0; }
-            };
-
-#if __TBB_SUPPORTS_WORKERS_WAITING_IN_TERMINATE
-            class alignas(max_nfs_size) lifetime_control : public control_storage {
-                virtual bool is_first_arg_preferred(std::size_t, std::size_t) const override {
-                    return false;// not interested
-                }
-                virtual std::size_t default_value() const override { return 0; }
-                virtual void apply_active(std::size_t new_active) override {
-                    if (new_active == 1) {
-                        // reserve the market reference
-                        market::global_market_mutex_type::scoped_lock lock(market::theMarketMutex);
-                        if (market::theMarket) { market::add_ref_unsafe(lock, /*is_public*/ true); }
-                    } else if (new_active == 0) {// new_active == 0
-                        // release the market reference
-                        market::global_market_mutex_type::scoped_lock lock(market::theMarketMutex);
-                        if (market::theMarket != nullptr) {
-                            lock.release();
-                            market::theMarket->release(/*is_public*/ true, /*blocking_terminate*/ false);
-                        }
-                    }
-                    control_storage::apply_active(new_active);
-                }
-
-            public:
-                bool is_empty() {
-                    spin_mutex::scoped_lock lock(my_list_mutex);
-                    return my_list.empty();
-                }
-            };
-#endif// __TBB_SUPPORTS_WORKERS_WAITING_IN_TERMINATE
-
-            static allowed_parallelism_control allowed_parallelism_ctl;
-            static stack_size_control stack_size_ctl;
-            static terminate_on_exception_control terminate_on_exception_ctl;
-#if __TBB_SUPPORTS_WORKERS_WAITING_IN_TERMINATE
-            static lifetime_control lifetime_ctl;
-            static control_storage* controls[]
-                    = {&allowed_parallelism_ctl, &stack_size_ctl, &terminate_on_exception_ctl, &lifetime_ctl};
-#else
-            static control_storage* controls[]
-                    = {&allowed_parallelism_ctl, &stack_size_ctl, &terminate_on_exception_ctl};
-#endif// __TBB_SUPPORTS_WORKERS_WAITING_IN_TERMINATE
-
-            //! Comparator for a set of global_control objects
-            inline bool control_storage_comparator::operator()(const global_control* lhs,
-                                                               const global_control* rhs) const {
-                __TBB_ASSERT_RELEASE(lhs->my_param < global_control::parameter_max, NULL);
-                return lhs->my_value < rhs->my_value || (lhs->my_value == rhs->my_value && lhs < rhs);
-            }
-
-            unsigned market::app_parallelism_limit() {
-                return allowed_parallelism_ctl.active_value_if_present();
-            }
-
-            bool terminate_on_exception() {
-                return global_control::active_value(global_control::terminate_on_exception) == 1;
-            }
-
-#if __TBB_SUPPORTS_WORKERS_WAITING_IN_TERMINATE
-            unsigned market::is_lifetime_control_present() { return !lifetime_ctl.is_empty(); }
-#endif// __TBB_SUPPORTS_WORKERS_WAITING_IN_TERMINATE
-
-            struct global_control_impl {
-            private:
-                static bool erase_if_present(control_storage* const c, d1::global_control& gc) {
-                    auto it = c->my_list.find(&gc);
-                    if (it != c->my_list.end()) {
-                        c->my_list.erase(it);
-                        return true;
-                    }
-                    return false;
-                }
-
-            public:
-                static void create(d1::global_control& gc) {
-                    __TBB_ASSERT_RELEASE(gc.my_param < global_control::parameter_max, NULL);
-                    control_storage* const c = controls[gc.my_param];
-
-                    spin_mutex::scoped_lock lock(c->my_list_mutex);
-                    if (c->my_list.empty() || c->is_first_arg_preferred(gc.my_value, c->my_active_value)) {
-                        // to guarantee that apply_active() is called with current active value,
-                        // calls it here and in internal_destroy() under my_list_mutex
-                        c->apply_active(gc.my_value);
-                    }
-                    c->my_list.insert(&gc);
-                }
-
-                static void destroy(d1::global_control& gc) {
-                    __TBB_ASSERT_RELEASE(gc.my_param < global_control::parameter_max, NULL);
-                    control_storage* const c = controls[gc.my_param];
-                    // Concurrent reading and changing global parameter is possible.
-                    spin_mutex::scoped_lock lock(c->my_list_mutex);
-#if __TBB_SUPPORTS_WORKERS_WAITING_IN_TERMINATE
-                    __TBB_ASSERT(gc.my_param == global_control::scheduler_handle || !c->my_list.empty(),
-                                 NULL);
-#else
-                    __TBB_ASSERT(!c->my_list.empty(), NULL);
-#endif// __TBB_SUPPORTS_WORKERS_WAITING_IN_TERMINATE
-                    std::size_t new_active = (std::size_t)(-1), old_active = c->my_active_value;
-
-                    if (!erase_if_present(c, gc)) {
-#if __TBB_SUPPORTS_WORKERS_WAITING_IN_TERMINATE
-                        __TBB_ASSERT(gc.my_param == global_control::scheduler_handle, NULL);
-                        return;
-#else
-                        __TBB_ASSERT(false, "Unreachable code");
-#endif// __TBB_SUPPORTS_WORKERS_WAITING_IN_TERMINATE
-                    }
-                    if (c->my_list.empty()) {
-                        __TBB_ASSERT(new_active == (std::size_t) -1, NULL);
-                        new_active = c->default_value();
-                    } else {
-                        new_active = (*c->my_list.begin())->my_value;
-                    }
-                    if (new_active != old_active) { c->apply_active(new_active); }
-                }
-
-                static bool remove_and_check_if_empty(d1::global_control& gc) {
-                    __TBB_ASSERT_RELEASE(gc.my_param < global_control::parameter_max, NULL);
-                    control_storage* const c = controls[gc.my_param];
-
-                    spin_mutex::scoped_lock lock(c->my_list_mutex);
-                    __TBB_ASSERT(!c->my_list.empty(), NULL);
-                    erase_if_present(c, gc);
-                    return c->my_list.empty();
-                }
+    }
+};
+
+class alignas(max_nfs_size) terminate_on_exception_control : public control_storage {
+    std::size_t default_value() const override {
+        return 0;
+    }
+};
+
+class alignas(max_nfs_size) lifetime_control : public control_storage {
+    bool is_first_arg_preferred(std::size_t, std::size_t) const override {
+        return false; // not interested
+    }
+    std::size_t default_value() const override {
+        return 0;
+    }
+    void apply_active(std::size_t new_active) override {
+        if (new_active == 1) {
+            // reserve the market reference
+            threading_control::register_lifetime_control();
+        } else if (new_active == 0) { // new_active == 0
+            threading_control::unregister_lifetime_control(/*blocking_terminate*/ false);
+        }
+        control_storage::apply_active(new_active);
+    }
+};
+
+static control_storage* controls[] = {nullptr, nullptr, nullptr, nullptr};
+
+void global_control_acquire() {
+    controls[0] = new (cache_aligned_allocate(sizeof(allowed_parallelism_control))) allowed_parallelism_control{};
+    controls[1] = new (cache_aligned_allocate(sizeof(stack_size_control))) stack_size_control{};
+    controls[2] = new (cache_aligned_allocate(sizeof(terminate_on_exception_control))) terminate_on_exception_control{};
+    controls[3] = new (cache_aligned_allocate(sizeof(lifetime_control))) lifetime_control{};
+}
+
+void global_control_release() {
+    for (auto& ptr : controls) {
+        ptr->~control_storage();
+        cache_aligned_deallocate(ptr);
+        ptr = nullptr;
+    }
+}
+
+void global_control_lock() {
+    for (auto& ctl : controls) {
+        ctl->my_list_mutex.lock();
+    }
+}
+
+void global_control_unlock() {
+    int N = std::distance(std::begin(controls), std::end(controls));
+    for (int i = N - 1; i >= 0; --i) {
+        controls[i]->my_list_mutex.unlock();
+    }
+}
+
+std::size_t global_control_active_value_unsafe(d1::global_control::parameter param) {
+    __TBB_ASSERT_RELEASE(param < d1::global_control::parameter_max, nullptr);
+    return controls[param]->active_value_unsafe();
+}
+
+//! Comparator for a set of global_control objects
+inline bool control_storage_comparator::operator()(const d1::global_control* lhs, const d1::global_control* rhs) const {
+    __TBB_ASSERT_RELEASE(lhs->my_param < d1::global_control::parameter_max , nullptr);
+    return lhs->my_value < rhs->my_value || (lhs->my_value == rhs->my_value && lhs < rhs);
+}
+
+bool terminate_on_exception() {
+    return d1::global_control::active_value(d1::global_control::terminate_on_exception) == 1;
+}
+
+struct global_control_impl {
+private:
+    static bool erase_if_present(control_storage* const c, d1::global_control& gc) {
+        auto it = c->my_list.find(&gc);
+        if (it != c->my_list.end()) {
+            c->my_list.erase(it);
+            return true;
+        }
+        return false;
+    }
+
+public:
+
+    static void create(d1::global_control& gc) {
+        __TBB_ASSERT_RELEASE(gc.my_param < d1::global_control::parameter_max, nullptr);
+        control_storage* const c = controls[gc.my_param];
+
+        spin_mutex::scoped_lock lock(c->my_list_mutex);
+        if (c->my_list.empty() || c->is_first_arg_preferred(gc.my_value, c->my_active_value)) {
+            // to guarantee that apply_active() is called with current active value,
+            // calls it here and in internal_destroy() under my_list_mutex
+            c->apply_active(gc.my_value);
+        }
+        c->my_list.insert(&gc);
+    }
+
+    static void destroy(d1::global_control& gc) {
+        __TBB_ASSERT_RELEASE(gc.my_param < d1::global_control::parameter_max, nullptr);
+        control_storage* const c = controls[gc.my_param];
+        // Concurrent reading and changing global parameter is possible.
+        spin_mutex::scoped_lock lock(c->my_list_mutex);
+        __TBB_ASSERT(gc.my_param == d1::global_control::scheduler_handle || !c->my_list.empty(), nullptr);
+        std::size_t new_active = (std::size_t)(-1), old_active = c->my_active_value;
+
+        if (!erase_if_present(c, gc)) {
+            __TBB_ASSERT(gc.my_param == d1::global_control::scheduler_handle , nullptr);
+            return;
+        }
+        if (c->my_list.empty()) {
+            __TBB_ASSERT(new_active == (std::size_t) - 1, nullptr);
+            new_active = c->default_value();
+        } else {
+            new_active = (*c->my_list.begin())->my_value;
+        }
+        if (new_active != old_active) {
+            c->apply_active(new_active);
+        }
+    }
+
+    static bool remove_and_check_if_empty(d1::global_control& gc) {
+        __TBB_ASSERT_RELEASE(gc.my_param < d1::global_control::parameter_max, nullptr);
+        control_storage* const c = controls[gc.my_param];
+
+        spin_mutex::scoped_lock lock(c->my_list_mutex);
+        __TBB_ASSERT(!c->my_list.empty(), nullptr);
+        erase_if_present(c, gc);
+        return c->my_list.empty();
+    }
 #if TBB_USE_ASSERT
-                static bool is_present(d1::global_control& gc) {
-                    __TBB_ASSERT_RELEASE(gc.my_param < global_control::parameter_max, NULL);
-                    control_storage* const c = controls[gc.my_param];
-
-                    spin_mutex::scoped_lock lock(c->my_list_mutex);
-                    auto it = c->my_list.find(&gc);
-                    if (it != c->my_list.end()) { return true; }
-                    return false;
-                }
-#endif// TBB_USE_ASSERT
-            };
-
-            void __TBB_EXPORTED_FUNC create(d1::global_control& gc) { global_control_impl::create(gc); }
-            void __TBB_EXPORTED_FUNC destroy(d1::global_control& gc) { global_control_impl::destroy(gc); }
-
-            bool remove_and_check_if_empty(d1::global_control& gc) {
-                return global_control_impl::remove_and_check_if_empty(gc);
-            }
+    static bool is_present(d1::global_control& gc) {
+        __TBB_ASSERT_RELEASE(gc.my_param < d1::global_control::parameter_max, nullptr);
+        control_storage* const c = controls[gc.my_param];
+
+        spin_mutex::scoped_lock lock(c->my_list_mutex);
+        auto it = c->my_list.find(&gc);
+        if (it != c->my_list.end()) {
+            return true;
+        }
+        return false;
+    }
+#endif // TBB_USE_ASSERT
+};
+
+void __TBB_EXPORTED_FUNC create(d1::global_control& gc) {
+    global_control_impl::create(gc);
+}
+void __TBB_EXPORTED_FUNC destroy(d1::global_control& gc) {
+    global_control_impl::destroy(gc);
+}
+
+bool remove_and_check_if_empty(d1::global_control& gc) {
+    return global_control_impl::remove_and_check_if_empty(gc);
+}
 #if TBB_USE_ASSERT
-            bool is_present(d1::global_control& gc) { return global_control_impl::is_present(gc); }
-#endif// TBB_USE_ASSERT
-            std::size_t __TBB_EXPORTED_FUNC global_control_active_value(int param) {
-                __TBB_ASSERT_RELEASE(param < global_control::parameter_max, NULL);
-                return controls[param]->active_value();
-            }
-
-        }// namespace r1
-    }    // namespace detail
-}// namespace tbb
+bool is_present(d1::global_control& gc) {
+    return global_control_impl::is_present(gc);
+}
+#endif // TBB_USE_ASSERT
+std::size_t __TBB_EXPORTED_FUNC global_control_active_value(int param) {
+    __TBB_ASSERT_RELEASE(param < d1::global_control::parameter_max, nullptr);
+    return controls[param]->active_value();
+}
+
+} // namespace r1
+} // namespace detail
+} // namespace tbb
diff --git a/external/tbb/src/tbb/governor.cpp b/external/tbb/src/tbb/governor.cpp
index 6e57071a..4b417b40 100644
--- a/external/tbb/src/tbb/governor.cpp
+++ b/external/tbb/src/tbb/governor.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -15,102 +15,124 @@
 */
 
 #include "governor.h"
-#include "arena.h"
-#include "concurrent_monitor.h"
-#include "dynamic_link.h"
+#include "threading_control.h"
 #include "main.h"
-#include "market.h"
 #include "thread_data.h"
+#include "market.h"
+#include "arena.h"
+#include "dynamic_link.h"
+#include "concurrent_monitor.h"
+#include "thread_dispatcher.h"
 
-#include "oneapi/tbb/global_control.h"
-#include "oneapi/tbb/info.h"
 #include "oneapi/tbb/task_group.h"
+#include "oneapi/tbb/global_control.h"
 #include "oneapi/tbb/tbb_allocator.h"
+#include "oneapi/tbb/info.h"
 
 #include "task_dispatcher.h"
 
-#include <algorithm>
-#include <atomic>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
+#include <atomic>
+#include <algorithm>
+
+#ifdef EMSCRIPTEN
+#include <emscripten/stack.h>
+#endif
 
 namespace tbb {
-    namespace detail {
-        namespace r1 {
+namespace detail {
+namespace r1 {
 
-            void clear_address_waiter_table();
+#if TBB_USE_ASSERT
+std::atomic<int> the_observer_proxy_count;
+#endif /* TBB_USE_ASSERT */
 
-#if __TBB_SUPPORTS_WORKERS_WAITING_IN_TERMINATE
-            //! global_control.cpp contains definition
-            bool remove_and_check_if_empty(d1::global_control& gc);
-            bool is_present(d1::global_control& gc);
-#endif// __TBB_SUPPORTS_WORKERS_WAITING_IN_TERMINATE
+void clear_address_waiter_table();
+void global_control_acquire();
+void global_control_release();
 
-            namespace rml {
-                tbb_server* make_private_server(tbb_client& client);
-            }// namespace rml
+//! global_control.cpp contains definition
+bool remove_and_check_if_empty(d1::global_control& gc);
+bool is_present(d1::global_control& gc);
 
-            namespace system_topology {
-                void destroy();
-            }
+namespace rml {
+tbb_server* make_private_server( tbb_client& client );
+} // namespace rml
+
+namespace system_topology {
+    void destroy();
+}
 
-            //------------------------------------------------------------------------
-            // governor
-            //------------------------------------------------------------------------
+//------------------------------------------------------------------------
+// governor
+//------------------------------------------------------------------------
 
-            void governor::acquire_resources() {
+void governor::acquire_resources () {
+    global_control_acquire();
 #if __TBB_USE_POSIX
-                int status = theTLS.create(auto_terminate);
+    int status = theTLS.create(auto_terminate);
 #else
-                int status = theTLS.create();
+    int status = theTLS.create();
 #endif
-                if (status) handle_perror(status, "TBB failed to initialize task scheduler TLS\n");
-                detect_cpu_features(cpu_features);
-
-                is_rethrow_broken = gcc_rethrow_exception_broken();
-            }
+    if( status )
+        handle_perror(status, "TBB failed to initialize task scheduler TLS\n");
+    detect_cpu_features(cpu_features);
+
+    is_rethrow_broken = gcc_rethrow_exception_broken();
+}
+
+void governor::release_resources () {
+    theRMLServerFactory.close();
+    destroy_process_mask();
+
+    __TBB_ASSERT(!(__TBB_InitOnce::initialization_done() && theTLS.get()), "TBB is unloaded while thread data still alive?");
+
+    int status = theTLS.destroy();
+    if( status )
+        runtime_warning("failed to destroy task scheduler TLS: %s", std::strerror(status));
+    clear_address_waiter_table();
+
+#if TBB_USE_ASSERT
+    if (the_observer_proxy_count != 0) {
+            runtime_warning("Leaked %ld observer_proxy objects\n", long(the_observer_proxy_count));
+    }
+#endif /* TBB_USE_ASSERT */
+
+    system_topology::destroy();
+    dynamic_unlink_all();
+    global_control_release();
+}
+
+rml::tbb_server* governor::create_rml_server ( rml::tbb_client& client ) {
+    rml::tbb_server* server = nullptr;
+    if( !UsePrivateRML ) {
+        ::rml::factory::status_type status = theRMLServerFactory.make_server( server, client );
+        if( status != ::rml::factory::st_success ) {
+            UsePrivateRML = true;
+            runtime_warning( "rml::tbb_factory::make_server failed with status %x, falling back on private rml", status );
+        }
+    }
+    if ( !server ) {
+        __TBB_ASSERT( UsePrivateRML, nullptr);
+        server = rml::make_private_server( client );
+    }
+    __TBB_ASSERT( server, "Failed to create RML server" );
+    return server;
+}
+
+void governor::one_time_init() {
+    if ( !__TBB_InitOnce::initialization_done() ) {
+        DoOneTimeInitialization();
+    }
+}
+
+bool governor::does_client_join_workers(const rml::tbb_client &client) {
+    return ((const thread_dispatcher&)client).must_join_workers();
+}
 
-            void governor::release_resources() {
-                theRMLServerFactory.close();
-                destroy_process_mask();
-
-                __TBB_ASSERT(!(__TBB_InitOnce::initialization_done() && theTLS.get()),
-                             "TBB is unloaded while thread data still alive?");
-
-                int status = theTLS.destroy();
-                if (status)
-                    runtime_warning("failed to destroy task scheduler TLS: %s", std::strerror(status));
-                clear_address_waiter_table();
-
-                system_topology::destroy();
-                dynamic_unlink_all();
-            }
-
-            rml::tbb_server* governor::create_rml_server(rml::tbb_client& client) {
-                rml::tbb_server* server = NULL;
-                if (!UsePrivateRML) {
-                    ::rml::factory::status_type status = theRMLServerFactory.make_server(server, client);
-                    if (status != ::rml::factory::st_success) {
-                        UsePrivateRML = true;
-                        runtime_warning("rml::tbb_factory::make_server failed with status %x, falling back "
-                                        "on private rml",
-                                        status);
-                    }
-                }
-                if (!server) {
-                    __TBB_ASSERT(UsePrivateRML, NULL);
-                    server = rml::make_private_server(client);
-                }
-                __TBB_ASSERT(server, "Failed to create RML server");
-                return server;
-            }
-
-            void governor::one_time_init() {
-                if (!__TBB_InitOnce::initialization_done()) { DoOneTimeInitialization(); }
-            }
-
-            /*
+/*
     There is no portable way to get stack base address in Posix, however the modern
     Linux versions provide pthread_attr_np API that can be used  to obtain thread's
     stack size and base address. Unfortunately even this function does not provide
@@ -129,179 +151,189 @@ namespace tbb {
     3) If the user app strives to conserve the memory by cutting stack size, it
     should do this for TBB workers too (as in the #1).
 */
-            static std::uintptr_t get_stack_base(std::size_t stack_size) {
-                // Stacks are growing top-down. Highest address is called "stack base",
-                // and the lowest is "stack limit".
-#if USE_WINTHREAD
-                suppress_unused_warning(stack_size);
-                NT_TIB* pteb = (NT_TIB*) NtCurrentTeb();
-                __TBB_ASSERT(&pteb<pteb->StackBase&& & pteb> pteb->StackLimit, "invalid stack info in TEB");
-                return pteb->StackBase;
-#else /* USE_PTHREAD */
-                // There is no portable way to get stack base address in Posix, so we use
-                // non-portable method (on all modern Linux) or the simplified approach
-                // based on the common sense assumptions. The most important assumption
-                // is that the main thread's stack size is not less than that of other threads.
-
-                // Points to the lowest addressable byte of a stack.
-                void* stack_limit = nullptr;
+static void get_stack_attributes(std::uintptr_t& stack_base, std::size_t& stack_size, std::size_t fallback_stack_size) {
+    // Stacks are growing top-down. Highest address is called "stack base",
+    // and the lowest is "stack limit".
+    stack_size = fallback_stack_size;
+#if __TBB_USE_WINAPI
+    NT_TIB* pteb = (NT_TIB*)NtCurrentTeb();
+    __TBB_ASSERT(&pteb < pteb->StackBase && &pteb > pteb->StackLimit, "invalid stack info in TEB");
+    stack_base = reinterpret_cast<std::uintptr_t>(pteb->StackBase);
+#elif defined(EMSCRIPTEN)
+    stack_base = reinterpret_cast<std::uintptr_t>(emscripten_stack_get_base());
+#else
+    // There is no portable way to get stack base address in Posix, so we use
+    // non-portable method (on all modern Linux) or the simplified approach
+    // based on the common sense assumptions. The most important assumption
+    // is that the main thread's stack size is not less than that of other threads.
+
+    // Points to the lowest addressable byte of a stack.
+    void* stack_limit = nullptr;
 #if __linux__ && !__bg__
-                size_t np_stack_size = 0;
-                pthread_attr_t np_attr_stack;
-                if (0 == pthread_getattr_np(pthread_self(), &np_attr_stack)) {
-                    if (0 == pthread_attr_getstack(&np_attr_stack, &stack_limit, &np_stack_size)) {
-                        __TBB_ASSERT(&stack_limit > stack_limit, "stack size must be positive");
-                    }
-                    pthread_attr_destroy(&np_attr_stack);
-                }
+    size_t np_stack_size = 0;
+    pthread_attr_t np_attr_stack;
+    if (0 == pthread_getattr_np(pthread_self(), &np_attr_stack)) {
+        if (0 == pthread_attr_getstack(&np_attr_stack, &stack_limit, &np_stack_size)) {
+            __TBB_ASSERT( &stack_limit > stack_limit, "stack size must be positive" );
+            if (np_stack_size > 0)
+                stack_size = np_stack_size;
+        }
+        pthread_attr_destroy(&np_attr_stack);
+    }
 #endif /* __linux__ */
-                std::uintptr_t stack_base {};
-                if (stack_limit) {
-                    stack_base = reinterpret_cast<std::uintptr_t>(stack_limit) + stack_size;
-                } else {
-                    // Use an anchor as a base stack address.
-                    int anchor {};
-                    stack_base = reinterpret_cast<std::uintptr_t>(&anchor);
-                }
-                return stack_base;
-#endif /* USE_PTHREAD */
-            }
-
-#if (_WIN32 || _WIN64) && !__TBB_DYNAMIC_LOAD_ENABLED
-            static void register_external_thread_destructor() {
-                struct thread_destructor {
-                    ~thread_destructor() { governor::terminate_external_thread(); }
-                };
-                // ~thread_destructor() will be call during the calling thread termination
-                static thread_local thread_destructor thr_destructor;
-            }
-#endif// (_WIN32||_WIN64) && !__TBB_DYNAMIC_LOAD_ENABLED
-
-            void governor::init_external_thread() {
-                one_time_init();
-                // Create new scheduler instance with arena
-                int num_slots = default_num_threads();
-                // TODO_REVAMP: support an external thread without an implicit arena
-                int num_reserved_slots = 1;
-                unsigned arena_priority_level = 1;// corresponds to tbb::task_arena::priority::normal
-                std::size_t stack_size = 0;
-                arena& a = *market::create_arena(num_slots, num_reserved_slots, arena_priority_level,
-                                                 stack_size);
-                // We need an internal reference to the market. TODO: is it legacy?
-                market::global_market(false);
-                // External thread always occupies the first slot
-                thread_data& td = *new (cache_aligned_allocate(sizeof(thread_data))) thread_data(0, false);
-                td.attach_arena(a, /*slot index*/ 0);
-                __TBB_ASSERT(td.my_inbox.is_idle_state(false), nullptr);
-
-                stack_size = a.my_market->worker_stack_size();
-                std::uintptr_t stack_base = get_stack_base(stack_size);
-                task_dispatcher& task_disp = td.my_arena_slot->default_task_dispatcher();
-                task_disp.set_stealing_threshold(calculate_stealing_threshold(stack_base, stack_size));
-                td.attach_task_dispatcher(task_disp);
-
-                td.my_arena_slot->occupy();
-                a.my_market->add_external_thread(td);
-                set_thread_data(td);
-#if (_WIN32 || _WIN64) && !__TBB_DYNAMIC_LOAD_ENABLED
-                // The external thread destructor is called from dllMain but it is not available with a static build.
-                // Therefore, we need to register the current thread to call the destructor during thread termination.
-                register_external_thread_destructor();
+    if (stack_limit) {
+        stack_base = reinterpret_cast<std::uintptr_t>(stack_limit) + stack_size;
+    } else {
+        // Use an anchor as a base stack address.
+        int anchor{};
+        stack_base = reinterpret_cast<std::uintptr_t>(&anchor);
+    }
+#endif /* __TBB_USE_WINAPI */
+}
+
+#if (_WIN32||_WIN64) && !__TBB_DYNAMIC_LOAD_ENABLED
+static void register_external_thread_destructor() {
+    struct thread_destructor {
+        ~thread_destructor() {
+            governor::terminate_external_thread();
+        }
+    };
+    // ~thread_destructor() will be call during the calling thread termination
+    static thread_local thread_destructor thr_destructor;
+}
+#endif // (_WIN32||_WIN64) && !__TBB_DYNAMIC_LOAD_ENABLED
+
+void governor::init_external_thread() {
+    one_time_init();
+    // Create new scheduler instance with arena
+    int num_slots = default_num_threads();
+    // TODO_REVAMP: support an external thread without an implicit arena
+    int num_reserved_slots = 1;
+    unsigned arena_priority_level = 1; // corresponds to tbb::task_arena::priority::normal
+    std::size_t stack_size = 0;
+    threading_control* thr_control = threading_control::register_public_reference();
+    arena& a = arena::create(thr_control, num_slots, num_reserved_slots, arena_priority_level);
+    // External thread always occupies the first slot
+    thread_data& td = *new(cache_aligned_allocate(sizeof(thread_data))) thread_data(0, false);
+    td.attach_arena(a, /*slot index*/ 0);
+    __TBB_ASSERT(td.my_inbox.is_idle_state(false), nullptr);
+
+    std::uintptr_t stack_base{};
+    get_stack_attributes(stack_base, stack_size, a.my_threading_control->worker_stack_size());
+    task_dispatcher& task_disp = td.my_arena_slot->default_task_dispatcher();
+    td.enter_task_dispatcher(task_disp, calculate_stealing_threshold(stack_base, stack_size));
+
+    td.my_arena_slot->occupy();
+    thr_control->register_thread(td);
+    set_thread_data(td);
+#if (_WIN32||_WIN64) && !__TBB_DYNAMIC_LOAD_ENABLED
+    // The external thread destructor is called from dllMain but it is not available with a static build.
+    // Therefore, we need to register the current thread to call the destructor during thread termination.
+    register_external_thread_destructor();
 #endif
+}
+
+void governor::auto_terminate(void* tls) {
+    __TBB_ASSERT(get_thread_data_if_initialized() == nullptr ||
+        get_thread_data_if_initialized() == tls, nullptr);
+    if (tls) {
+        thread_data* td = static_cast<thread_data*>(tls);
+
+        auto clear_tls = [td] {
+            td->~thread_data();
+            cache_aligned_deallocate(td);
+            clear_thread_data();
+        };
+
+        // Only external thread can be inside an arena during termination.
+        if (td->my_arena_slot) {
+            arena* a = td->my_arena;
+            threading_control* thr_control = a->my_threading_control;
+
+            // If the TLS slot is already cleared by OS or underlying concurrency
+            // runtime, restore its value to properly clean up arena
+            if (!is_thread_data_set(td)) {
+                set_thread_data(*td);
             }
 
-            void governor::auto_terminate(void* tls) {
-                __TBB_ASSERT(get_thread_data_if_initialized() == nullptr
-                                     || get_thread_data_if_initialized() == tls,
-                             NULL);
-                if (tls) {
-                    thread_data* td = static_cast<thread_data*>(tls);
-
-                    // Only external thread can be inside an arena during termination.
-                    if (td->my_arena_slot) {
-                        arena* a = td->my_arena;
-                        market* m = a->my_market;
-
-                        a->my_observers.notify_exit_observers(td->my_last_observer, td->my_is_worker);
-
-                        td->my_task_dispatcher->m_stealing_threshold = 0;
-                        td->detach_task_dispatcher();
-                        td->my_arena_slot->release();
-                        // Release an arena
-                        a->on_thread_leaving<arena::ref_external>();
-
-                        m->remove_external_thread(*td);
-                        // If there was an associated arena, it added a public market reference
-                        m->release(/*is_public*/ true, /*blocking_terminate*/ false);
-                    }
-
-                    td->~thread_data();
-                    cache_aligned_deallocate(td);
-
-                    clear_thread_data();
-                }
-                __TBB_ASSERT(get_thread_data_if_initialized() == nullptr, NULL);
-            }
-
-            void governor::initialize_rml_factory() {
-                ::rml::factory::status_type res = theRMLServerFactory.open();
-                UsePrivateRML = res != ::rml::factory::st_success;
+            a->my_observers.notify_exit_observers(td->my_last_observer, td->my_is_worker);
+
+            td->leave_task_dispatcher();
+            td->my_arena_slot->release();
+            // Release an arena
+            a->on_thread_leaving(arena::ref_external);
+
+            thr_control->unregister_thread(*td);
+
+            // The tls should be cleared before market::release because
+            // market can destroy the tls key if we keep the last reference
+            clear_tls();
+
+            // If there was an associated arena, it added a public market reference
+            thr_control->unregister_public_reference(/* blocking terminate =*/ false);
+        } else {
+            clear_tls();
+        }
+    }
+    __TBB_ASSERT(get_thread_data_if_initialized() == nullptr, nullptr);
+}
+
+void governor::initialize_rml_factory () {
+    ::rml::factory::status_type res = theRMLServerFactory.open();
+    UsePrivateRML = res != ::rml::factory::st_success;
+}
+
+void __TBB_EXPORTED_FUNC get(d1::task_scheduler_handle& handle) {
+    handle.m_ctl = new(allocate_memory(sizeof(global_control))) global_control(global_control::scheduler_handle, 1);
+}
+
+void release_impl(d1::task_scheduler_handle& handle) {
+    if (handle.m_ctl != nullptr) {
+        handle.m_ctl->~global_control();
+        deallocate_memory(handle.m_ctl);
+        handle.m_ctl = nullptr;
+    }
+}
+
+bool finalize_impl(d1::task_scheduler_handle& handle) {
+    __TBB_ASSERT_RELEASE(handle, "trying to finalize with null handle");
+    __TBB_ASSERT(is_present(*handle.m_ctl), "finalize or release was already called on this object");
+
+    bool ok = true; // ok if threading_control does not exist yet
+    if (threading_control::is_present()) {
+        thread_data* td = governor::get_thread_data_if_initialized();
+        if (td) {
+            task_dispatcher* task_disp = td->my_task_dispatcher;
+            __TBB_ASSERT(task_disp, nullptr);
+            if (task_disp->m_properties.outermost && !td->my_is_worker) { // is not inside a parallel region
+                governor::auto_terminate(td);
             }
-
-#if __TBB_SUPPORTS_WORKERS_WAITING_IN_TERMINATE
-            void __TBB_EXPORTED_FUNC get(d1::task_scheduler_handle& handle) {
-                handle.m_ctl = new (allocate_memory(sizeof(global_control)))
-                        global_control(global_control::scheduler_handle, 1);
-            }
-
-            void release_impl(d1::task_scheduler_handle& handle) {
-                if (handle.m_ctl != nullptr) {
-                    handle.m_ctl->~global_control();
-                    deallocate_memory(handle.m_ctl);
-                    handle.m_ctl = nullptr;
-                }
-            }
-
-            bool finalize_impl(d1::task_scheduler_handle& handle) {
-                __TBB_ASSERT_RELEASE(handle, "trying to finalize with null handle");
-                market::global_market_mutex_type::scoped_lock lock(market::theMarketMutex);
-                bool ok = true;               // ok if theMarket does not exist yet
-                market* m = market::theMarket;// read the state of theMarket
-                if (m != nullptr) {
-                    lock.release();
-                    __TBB_ASSERT(is_present(*handle.m_ctl),
-                                 "finalize or release was already called on this object");
-                    thread_data* td = governor::get_thread_data_if_initialized();
-                    if (td) {
-                        task_dispatcher* task_disp = td->my_task_dispatcher;
-                        __TBB_ASSERT(task_disp, nullptr);
-                        if (task_disp->m_properties.outermost
-                            && !td->my_is_worker) {// is not inside a parallel region
-                            governor::auto_terminate(td);
-                        }
-                    }
-                    if (remove_and_check_if_empty(*handle.m_ctl)) {
-                        ok = m->release(/*is_public*/ true, /*blocking_terminate*/ true);
-                    } else {
-                        ok = false;
-                    }
-                }
-                return ok;
-            }
-
-            bool __TBB_EXPORTED_FUNC finalize(d1::task_scheduler_handle& handle, std::intptr_t mode) {
-                if (mode == d1::release_nothrowing) {
-                    release_impl(handle);
-                    return true;
-                } else {
-                    bool ok = finalize_impl(handle);
-                    // TODO: it is unsafe when finalize is called concurrently and further library unload
-                    release_impl(handle);
-                    if (mode == d1::finalize_throwing && !ok) { throw_exception(exception_id::unsafe_wait); }
-                    return ok;
-                }
-            }
-#endif// __TBB_SUPPORTS_WORKERS_WAITING_IN_TERMINATE
+        }
+
+        if (remove_and_check_if_empty(*handle.m_ctl)) {
+            ok = threading_control::unregister_lifetime_control(/*blocking_terminate*/ true);
+        } else {
+            ok = false;
+        }
+    }
+
+    return ok;
+}
+
+bool __TBB_EXPORTED_FUNC finalize(d1::task_scheduler_handle& handle, std::intptr_t mode) {
+    if (mode == d1::release_nothrowing) {
+        release_impl(handle);
+        return true;
+    } else {
+        bool ok = finalize_impl(handle);
+        // TODO: it is unsafe when finalize is called concurrently and further library unload
+        release_impl(handle);
+        if (mode == d1::finalize_throwing && !ok) {
+            throw_exception(exception_id::unsafe_wait);
+        }
+        return ok;
+    }
+}
 
 #if __TBB_ARENA_BINDING
 
@@ -314,68 +346,68 @@ namespace tbb {
 #pragma weak __TBB_internal_restore_affinity
 #pragma weak __TBB_internal_get_default_concurrency
 
-            extern "C" {
-            void __TBB_internal_initialize_system_topology(size_t groups_num, int& numa_nodes_count,
-                                                           int*& numa_indexes_list, int& core_types_count,
-                                                           int*& core_types_indexes_list);
-            void __TBB_internal_destroy_system_topology();
+extern "C" {
+void __TBB_internal_initialize_system_topology(
+    size_t groups_num,
+    int& numa_nodes_count, int*& numa_indexes_list,
+    int& core_types_count, int*& core_types_indexes_list
+);
+void __TBB_internal_destroy_system_topology( );
 
-            //TODO: consider renaming to `create_binding_handler` and `destroy_binding_handler`
-            binding_handler* __TBB_internal_allocate_binding_handler(int slot_num, int numa_id,
-                                                                     int core_type_id,
-                                                                     int max_threads_per_core);
-            void __TBB_internal_deallocate_binding_handler(binding_handler* handler_ptr);
+//TODO: consider renaming to `create_binding_handler` and `destroy_binding_handler`
+binding_handler* __TBB_internal_allocate_binding_handler( int slot_num, int numa_id, int core_type_id, int max_threads_per_core );
+void __TBB_internal_deallocate_binding_handler( binding_handler* handler_ptr );
 
-            void __TBB_internal_apply_affinity(binding_handler* handler_ptr, int slot_num);
-            void __TBB_internal_restore_affinity(binding_handler* handler_ptr, int slot_num);
+void __TBB_internal_apply_affinity( binding_handler* handler_ptr, int slot_num );
+void __TBB_internal_restore_affinity( binding_handler* handler_ptr, int slot_num );
 
-            int __TBB_internal_get_default_concurrency(int numa_id, int core_type_id,
-                                                       int max_threads_per_core);
-            }
+int __TBB_internal_get_default_concurrency( int numa_id, int core_type_id, int max_threads_per_core );
+}
 #endif /* __TBB_WEAK_SYMBOLS_PRESENT */
 
-            // Stubs that will be used if TBBbind library is unavailable.
-            static void dummy_destroy_system_topology() {}
-            static binding_handler* dummy_allocate_binding_handler(int, int, int, int) { return nullptr; }
-            static void dummy_deallocate_binding_handler(binding_handler*) {}
-            static void dummy_apply_affinity(binding_handler*, int) {}
-            static void dummy_restore_affinity(binding_handler*, int) {}
-            static int dummy_get_default_concurrency(int, int, int) {
-                return governor::default_num_threads();
-            }
+// Stubs that will be used if TBBbind library is unavailable.
+static void dummy_destroy_system_topology ( ) { }
+static binding_handler* dummy_allocate_binding_handler ( int, int, int, int ) { return nullptr; }
+static void dummy_deallocate_binding_handler ( binding_handler* ) { }
+static void dummy_apply_affinity ( binding_handler*, int ) { }
+static void dummy_restore_affinity ( binding_handler*, int ) { }
+static int dummy_get_default_concurrency( int, int, int ) { return governor::default_num_threads(); }
+
+// Handlers for communication with TBBbind
+static void (*initialize_system_topology_ptr)(
+    size_t groups_num,
+    int& numa_nodes_count, int*& numa_indexes_list,
+    int& core_types_count, int*& core_types_indexes_list
+) = nullptr;
+static void (*destroy_system_topology_ptr)( ) = dummy_destroy_system_topology;
+
+static binding_handler* (*allocate_binding_handler_ptr)( int slot_num, int numa_id, int core_type_id, int max_threads_per_core )
+    = dummy_allocate_binding_handler;
+static void (*deallocate_binding_handler_ptr)( binding_handler* handler_ptr )
+    = dummy_deallocate_binding_handler;
+static void (*apply_affinity_ptr)( binding_handler* handler_ptr, int slot_num )
+    = dummy_apply_affinity;
+static void (*restore_affinity_ptr)( binding_handler* handler_ptr, int slot_num )
+    = dummy_restore_affinity;
+int (*get_default_concurrency_ptr)( int numa_id, int core_type_id, int max_threads_per_core )
+    = dummy_get_default_concurrency;
+
+#if _WIN32 || _WIN64 || __unix__ || __APPLE__
+
+// Table describing how to link the handlers.
+static const dynamic_link_descriptor TbbBindLinkTable[] = {
+    DLD(__TBB_internal_initialize_system_topology, initialize_system_topology_ptr),
+    DLD(__TBB_internal_destroy_system_topology, destroy_system_topology_ptr),
+#if __TBB_CPUBIND_PRESENT
+    DLD(__TBB_internal_allocate_binding_handler, allocate_binding_handler_ptr),
+    DLD(__TBB_internal_deallocate_binding_handler, deallocate_binding_handler_ptr),
+    DLD(__TBB_internal_apply_affinity, apply_affinity_ptr),
+    DLD(__TBB_internal_restore_affinity, restore_affinity_ptr),
+#endif
+    DLD(__TBB_internal_get_default_concurrency, get_default_concurrency_ptr)
+};
 
-            // Handlers for communication with TBBbind
-            static void (*initialize_system_topology_ptr)(size_t groups_num, int& numa_nodes_count,
-                                                          int*& numa_indexes_list, int& core_types_count,
-                                                          int*& core_types_indexes_list)
-                    = nullptr;
-            static void (*destroy_system_topology_ptr)() = dummy_destroy_system_topology;
-
-            static binding_handler* (*allocate_binding_handler_ptr)(int slot_num, int numa_id,
-                                                                    int core_type_id,
-                                                                    int max_threads_per_core)
-                    = dummy_allocate_binding_handler;
-            static void (*deallocate_binding_handler_ptr)(binding_handler* handler_ptr)
-                    = dummy_deallocate_binding_handler;
-            static void (*apply_affinity_ptr)(binding_handler* handler_ptr, int slot_num)
-                    = dummy_apply_affinity;
-            static void (*restore_affinity_ptr)(binding_handler* handler_ptr, int slot_num)
-                    = dummy_restore_affinity;
-            int (*get_default_concurrency_ptr)(int numa_id, int core_type_id, int max_threads_per_core)
-                    = dummy_get_default_concurrency;
-
-#if _WIN32 || _WIN64 || __unix__
-            // Table describing how to link the handlers.
-            static const dynamic_link_descriptor TbbBindLinkTable[]
-                    = {DLD(__TBB_internal_initialize_system_topology, initialize_system_topology_ptr),
-                       DLD(__TBB_internal_destroy_system_topology, destroy_system_topology_ptr),
-                       DLD(__TBB_internal_allocate_binding_handler, allocate_binding_handler_ptr),
-                       DLD(__TBB_internal_deallocate_binding_handler, deallocate_binding_handler_ptr),
-                       DLD(__TBB_internal_apply_affinity, apply_affinity_ptr),
-                       DLD(__TBB_internal_restore_affinity, restore_affinity_ptr),
-                       DLD(__TBB_internal_get_default_concurrency, get_default_concurrency_ptr)};
-
-            static const unsigned LinkTableSize = sizeof(TbbBindLinkTable) / sizeof(dynamic_link_descriptor);
+static const unsigned LinkTableSize = sizeof(TbbBindLinkTable) / sizeof(dynamic_link_descriptor);
 
 #if TBB_USE_DEBUG
 #define DEBUG_SUFFIX "_debug"
@@ -386,8 +418,11 @@ namespace tbb {
 #if _WIN32 || _WIN64
 #define LIBRARY_EXTENSION ".dll"
 #define LIBRARY_PREFIX
+#elif __APPLE__
+#define LIBRARY_EXTENSION __TBB_STRING(.3.dylib)
+#define LIBRARY_PREFIX "lib"
 #elif __unix__
-#define LIBRARY_EXTENSION __TBB_STRING(.so .3)
+#define LIBRARY_EXTENSION __TBB_STRING(.so.3)
 #define LIBRARY_PREFIX "lib"
 #endif /* __unix__ */
 
@@ -397,180 +432,174 @@ namespace tbb {
 #define TBBBIND_2_5_NAME LIBRARY_PREFIX "tbbbind_2_5" DEBUG_SUFFIX LIBRARY_EXTENSION
 #endif /* _WIN32 || _WIN64 || __unix__ */
 
-            // Representation of system hardware topology information on the TBB side.
-            // System topology may be initialized by third-party component (e.g. hwloc)
-            // or just filled in with default stubs.
-            namespace system_topology {
+// Representation of system hardware topology information on the TBB side.
+// System topology may be initialized by third-party component (e.g. hwloc)
+// or just filled in with default stubs.
+namespace system_topology {
 
-                constexpr int automatic = -1;
+constexpr int automatic = -1;
 
-                static std::atomic<do_once_state> initialization_state;
+static std::atomic<do_once_state> initialization_state;
 
-                namespace {
-                    int numa_nodes_count = 0;
-                    int* numa_nodes_indexes = nullptr;
+namespace {
+int  numa_nodes_count = 0;
+int* numa_nodes_indexes = nullptr;
 
-                    int core_types_count = 0;
-                    int* core_types_indexes = nullptr;
+int  core_types_count = 0;
+int* core_types_indexes = nullptr;
 
-                    const char* load_tbbbind_shared_object() {
-#if _WIN32 || _WIN64 || __unix__
+const char* load_tbbbind_shared_object() {
+#if _WIN32 || _WIN64 || __unix__ || __APPLE__
 #if _WIN32 && !_WIN64
-                        // For 32-bit Windows applications, process affinity masks can only support up to 32 logical CPUs.
-                        SYSTEM_INFO si;
-                        GetNativeSystemInfo(&si);
-                        if (si.dwNumberOfProcessors > 32) return nullptr;
+    // For 32-bit Windows applications, process affinity masks can only support up to 32 logical CPUs.
+    SYSTEM_INFO si;
+    GetNativeSystemInfo(&si);
+    if (si.dwNumberOfProcessors > 32) return nullptr;
 #endif /* _WIN32 && !_WIN64 */
-                        for (const auto& tbbbind_version :
-                             {TBBBIND_2_5_NAME, TBBBIND_2_0_NAME, TBBBIND_NAME}) {
-                            if (dynamic_link(tbbbind_version, TbbBindLinkTable, LinkTableSize, nullptr,
-                                             DYNAMIC_LINK_LOCAL_BINDING)) {
-                                return tbbbind_version;
-                            }
-                        }
-#endif /* _WIN32 || _WIN64 || __unix__ */
-                        return nullptr;
-                    }
-
-                    int processor_groups_num() {
+    for (const auto& tbbbind_version : {TBBBIND_2_5_NAME, TBBBIND_2_0_NAME, TBBBIND_NAME}) {
+        if (dynamic_link(tbbbind_version, TbbBindLinkTable, LinkTableSize, nullptr, DYNAMIC_LINK_LOCAL_BINDING)) {
+            return tbbbind_version;
+        }
+    }
+#endif /* _WIN32 || _WIN64 || __unix__ || __APPLE__ */
+    return nullptr;
+}
+
+int processor_groups_num() {
 #if _WIN32
-                        return NumberOfProcessorGroups();
+    return NumberOfProcessorGroups();
 #else
-                        // Stub to improve code readability by reducing number of the compile-time conditions
-                        return 1;
+    // Stub to improve code readability by reducing number of the compile-time conditions
+    return 1;
 #endif
-                    }
-                }// namespace
-
-                // Tries to load TBBbind library API, if success, gets NUMA topology information from it,
-                // in another case, fills NUMA topology by stubs.
-                void initialization_impl() {
-                    governor::one_time_init();
-
-                    if (const char* tbbbind_name = load_tbbbind_shared_object()) {
-                        initialize_system_topology_ptr(processor_groups_num(), numa_nodes_count,
-                                                       numa_nodes_indexes, core_types_count,
-                                                       core_types_indexes);
-
-                        PrintExtraVersionInfo("TBBBIND", tbbbind_name);
-                        return;
-                    }
-
-                    static int dummy_index = automatic;
-
-                    numa_nodes_count = 1;
-                    numa_nodes_indexes = &dummy_index;
-
-                    core_types_count = 1;
-                    core_types_indexes = &dummy_index;
-
-                    PrintExtraVersionInfo("TBBBIND", "UNAVAILABLE");
-                }
-
-                void initialize() { atomic_do_once(initialization_impl, initialization_state); }
-
-                void destroy() { destroy_system_topology_ptr(); }
-            }// namespace system_topology
-
-            binding_handler* construct_binding_handler(int slot_num, int numa_id, int core_type_id,
-                                                       int max_threads_per_core) {
-                system_topology::initialize();
-                return allocate_binding_handler_ptr(slot_num, numa_id, core_type_id, max_threads_per_core);
-            }
-
-            void destroy_binding_handler(binding_handler* handler_ptr) {
-                __TBB_ASSERT(deallocate_binding_handler_ptr, "tbbbind loading was not performed");
-                deallocate_binding_handler_ptr(handler_ptr);
-            }
-
-            void apply_affinity_mask(binding_handler* handler_ptr, int slot_index) {
-                __TBB_ASSERT(slot_index >= 0, "Negative thread index");
-                __TBB_ASSERT(apply_affinity_ptr, "tbbbind loading was not performed");
-                apply_affinity_ptr(handler_ptr, slot_index);
-            }
-
-            void restore_affinity_mask(binding_handler* handler_ptr, int slot_index) {
-                __TBB_ASSERT(slot_index >= 0, "Negative thread index");
-                __TBB_ASSERT(restore_affinity_ptr, "tbbbind loading was not performed");
-                restore_affinity_ptr(handler_ptr, slot_index);
-            }
-
-            unsigned __TBB_EXPORTED_FUNC numa_node_count() {
-                system_topology::initialize();
-                return system_topology::numa_nodes_count;
-            }
-
-            void __TBB_EXPORTED_FUNC fill_numa_indices(int* index_array) {
-                system_topology::initialize();
-                std::memcpy(index_array, system_topology::numa_nodes_indexes,
-                            system_topology::numa_nodes_count * sizeof(int));
-            }
-
-            int __TBB_EXPORTED_FUNC numa_default_concurrency(int node_id) {
-                if (node_id >= 0) {
-                    system_topology::initialize();
-                    int result = get_default_concurrency_ptr(node_id,
-                                                             /*core_type*/ system_topology::automatic,
-                                                             /*threads_per_core*/ system_topology::automatic);
-                    if (result > 0) return result;
-                }
-                return governor::default_num_threads();
-            }
-
-            unsigned __TBB_EXPORTED_FUNC core_type_count(intptr_t /*reserved*/) {
-                system_topology::initialize();
-                return system_topology::core_types_count;
-            }
-
-            void __TBB_EXPORTED_FUNC fill_core_type_indices(int* index_array, intptr_t /*reserved*/) {
-                system_topology::initialize();
-                std::memcpy(index_array, system_topology::core_types_indexes,
-                            system_topology::core_types_count * sizeof(int));
-            }
-
-            void constraints_assertion(d1::constraints c) {
-                bool is_topology_initialized
-                        = system_topology::initialization_state == do_once_state::initialized;
-                __TBB_ASSERT_RELEASE(c.max_threads_per_core == system_topology::automatic
-                                             || c.max_threads_per_core > 0,
-                                     "Wrong max_threads_per_core constraints field value.");
-
-                auto numa_nodes_begin = system_topology::numa_nodes_indexes;
-                auto numa_nodes_end = system_topology::numa_nodes_indexes + system_topology::numa_nodes_count;
-                __TBB_ASSERT_RELEASE(c.numa_id == system_topology::automatic
-                                             || (is_topology_initialized
-                                                 && std::find(numa_nodes_begin, numa_nodes_end, c.numa_id)
-                                                            != numa_nodes_end),
-                                     "The constraints::numa_id value is not known to the library. Use "
-                                     "tbb::info::numa_nodes() to get the list of possible values.");
-
-                int* core_types_begin = system_topology::core_types_indexes;
-                int* core_types_end = system_topology::core_types_indexes + system_topology::core_types_count;
-                __TBB_ASSERT_RELEASE(c.core_type == system_topology::automatic
-                                             || (is_topology_initialized
-                                                 && std::find(core_types_begin, core_types_end, c.core_type)
-                                                            != core_types_end),
-                                     "The constraints::core_type value is not known to the library. Use "
-                                     "tbb::info::core_types() to get the list of possible values.");
-            }
-
-            int __TBB_EXPORTED_FUNC constraints_default_concurrency(const d1::constraints& c,
-                                                                    intptr_t /*reserved*/) {
-                constraints_assertion(c);
-
-                if (c.numa_id >= 0 || c.core_type >= 0 || c.max_threads_per_core > 0) {
-                    system_topology::initialize();
-                    return get_default_concurrency_ptr(c.numa_id, c.core_type, c.max_threads_per_core);
-                }
-                return governor::default_num_threads();
-            }
-
-            int __TBB_EXPORTED_FUNC constraints_threads_per_core(const d1::constraints&,
-                                                                 intptr_t /*reserved*/) {
-                return system_topology::automatic;
-            }
+}
+} // internal namespace
+
+// Tries to load TBBbind library API, if success, gets NUMA topology information from it,
+// in another case, fills NUMA topology by stubs.
+void initialization_impl() {
+    governor::one_time_init();
+
+    if (const char* tbbbind_name = load_tbbbind_shared_object()) {
+        initialize_system_topology_ptr(
+            processor_groups_num(),
+            numa_nodes_count, numa_nodes_indexes,
+            core_types_count, core_types_indexes
+        );
+
+        PrintExtraVersionInfo("TBBBIND", tbbbind_name);
+        return;
+    }
+
+    static int dummy_index = automatic;
+
+    numa_nodes_count = 1;
+    numa_nodes_indexes = &dummy_index;
+
+    core_types_count = 1;
+    core_types_indexes = &dummy_index;
+
+    PrintExtraVersionInfo("TBBBIND", "UNAVAILABLE");
+}
+
+void initialize() {
+    atomic_do_once(initialization_impl, initialization_state);
+}
+
+void destroy() {
+    destroy_system_topology_ptr();
+}
+} // namespace system_topology
+
+binding_handler* construct_binding_handler(int slot_num, int numa_id, int core_type_id, int max_threads_per_core) {
+    system_topology::initialize();
+    return allocate_binding_handler_ptr(slot_num, numa_id, core_type_id, max_threads_per_core);
+}
+
+void destroy_binding_handler(binding_handler* handler_ptr) {
+    __TBB_ASSERT(deallocate_binding_handler_ptr, "tbbbind loading was not performed");
+    deallocate_binding_handler_ptr(handler_ptr);
+}
+
+void apply_affinity_mask(binding_handler* handler_ptr, int slot_index) {
+    __TBB_ASSERT(slot_index >= 0, "Negative thread index");
+    __TBB_ASSERT(apply_affinity_ptr, "tbbbind loading was not performed");
+    apply_affinity_ptr(handler_ptr, slot_index);
+}
+
+void restore_affinity_mask(binding_handler* handler_ptr, int slot_index) {
+    __TBB_ASSERT(slot_index >= 0, "Negative thread index");
+    __TBB_ASSERT(restore_affinity_ptr, "tbbbind loading was not performed");
+    restore_affinity_ptr(handler_ptr, slot_index);
+}
+
+unsigned __TBB_EXPORTED_FUNC numa_node_count() {
+    system_topology::initialize();
+    return system_topology::numa_nodes_count;
+}
+
+void __TBB_EXPORTED_FUNC fill_numa_indices(int* index_array) {
+    system_topology::initialize();
+    std::memcpy(index_array, system_topology::numa_nodes_indexes, system_topology::numa_nodes_count * sizeof(int));
+}
+
+int __TBB_EXPORTED_FUNC numa_default_concurrency(int node_id) {
+    if (node_id >= 0) {
+        system_topology::initialize();
+        int result = get_default_concurrency_ptr(
+            node_id,
+            /*core_type*/system_topology::automatic,
+            /*threads_per_core*/system_topology::automatic
+        );
+        if (result > 0) return result;
+    }
+    return governor::default_num_threads();
+}
+
+unsigned __TBB_EXPORTED_FUNC core_type_count(intptr_t /*reserved*/) {
+    system_topology::initialize();
+    return system_topology::core_types_count;
+}
+
+void __TBB_EXPORTED_FUNC fill_core_type_indices(int* index_array, intptr_t /*reserved*/) {
+    system_topology::initialize();
+    std::memcpy(index_array, system_topology::core_types_indexes, system_topology::core_types_count * sizeof(int));
+}
+
+void constraints_assertion(d1::constraints c) {
+    bool is_topology_initialized = system_topology::initialization_state == do_once_state::initialized;
+    __TBB_ASSERT_RELEASE(c.max_threads_per_core == system_topology::automatic || c.max_threads_per_core > 0,
+        "Wrong max_threads_per_core constraints field value.");
+
+    auto numa_nodes_begin = system_topology::numa_nodes_indexes;
+    auto numa_nodes_end = system_topology::numa_nodes_indexes + system_topology::numa_nodes_count;
+    __TBB_ASSERT_RELEASE(
+        c.numa_id == system_topology::automatic ||
+        (is_topology_initialized && std::find(numa_nodes_begin, numa_nodes_end, c.numa_id) != numa_nodes_end),
+        "The constraints::numa_id value is not known to the library. Use tbb::info::numa_nodes() to get the list of possible values.");
+
+    int* core_types_begin = system_topology::core_types_indexes;
+    int* core_types_end = system_topology::core_types_indexes + system_topology::core_types_count;
+    __TBB_ASSERT_RELEASE(c.core_type == system_topology::automatic ||
+        (is_topology_initialized && std::find(core_types_begin, core_types_end, c.core_type) != core_types_end),
+        "The constraints::core_type value is not known to the library. Use tbb::info::core_types() to get the list of possible values.");
+}
+
+int __TBB_EXPORTED_FUNC constraints_default_concurrency(const d1::constraints& c, intptr_t /*reserved*/) {
+    constraints_assertion(c);
+
+    if (c.numa_id >= 0 || c.core_type >= 0 || c.max_threads_per_core > 0) {
+        system_topology::initialize();
+        return get_default_concurrency_ptr(c.numa_id, c.core_type, c.max_threads_per_core);
+    }
+    return governor::default_num_threads();
+}
+
+int __TBB_EXPORTED_FUNC constraints_threads_per_core(const d1::constraints&, intptr_t /*reserved*/) {
+    return system_topology::automatic;
+}
 #endif /* __TBB_ARENA_BINDING */
 
-        }// namespace r1
-    }    // namespace detail
-}// namespace tbb
+} // namespace r1
+} // namespace detail
+} // namespace tbb
diff --git a/external/tbb/src/tbb/governor.h b/external/tbb/src/tbb/governor.h
index 50109658..573443d7 100644
--- a/external/tbb/src/tbb/governor.h
+++ b/external/tbb/src/tbb/governor.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -47,7 +47,8 @@ typedef std::size_t stack_size_type;
 class governor {
 private:
     friend class __TBB_InitOnce;
-    friend class market;
+    friend class thread_dispatcher;
+    friend class threading_control_impl;
 
     // TODO: consider using thread_local (measure performance and side effects)
     //! TLS for scheduler instances associated with individual threads
@@ -102,7 +103,7 @@ class governor {
         }
         init_external_thread();
         td = theTLS.get();
-        __TBB_ASSERT(td, NULL);
+        __TBB_ASSERT(td, nullptr);
         return td;
     }
 
@@ -118,11 +119,9 @@ class governor {
         return theTLS.get();
     }
 
-#if TBB_USE_ASSERT
     static bool is_thread_data_set(thread_data* td) {
         return theTLS.get() == td;
     }
-#endif
 
     //! Undo automatic initialization if necessary; call when a thread exits.
     static void terminate_external_thread() {
@@ -139,6 +138,8 @@ class governor {
     static bool wait_package_enabled() { return cpu_features.waitpkg_enabled; }
 #endif
 
+    static bool hybrid_cpu() { return cpu_features.hybrid; }
+
     static bool rethrow_exception_broken() { return is_rethrow_broken; }
 
     static bool is_itt_present() {
diff --git a/external/tbb/src/tbb/itt_notify.cpp b/external/tbb/src/tbb/itt_notify.cpp
index ca158bcf..eda5e6ad 100644
--- a/external/tbb/src/tbb/itt_notify.cpp
+++ b/external/tbb/src/tbb/itt_notify.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -16,52 +16,54 @@
 
 #if __TBB_USE_ITT_NOTIFY
 
-#if _WIN32 || _WIN64
-#ifndef UNICODE
-#define UNICODE
-#endif
+#if _WIN32||_WIN64
+    #ifndef UNICODE
+        #define UNICODE
+    #endif
 #else
-#pragma weak dlopen
-#pragma weak dlsym
-#pragma weak dlerror
+    #pragma weak dlopen
+    #pragma weak dlsym
+    #pragma weak dlerror
 #endif /* WIN */
 
 #if __TBB_BUILD
 
 extern "C" void ITT_DoOneTimeInitialization();
-#define __itt_init_ittlib_name(x, y) (ITT_DoOneTimeInitialization(), true)
+#define __itt_init_ittlib_name(x,y) (ITT_DoOneTimeInitialization(), true)
 
 #elif __TBBMALLOC_BUILD
 
 extern "C" void MallocInitializeITT();
-#define __itt_init_ittlib_name(x, y) (MallocInitializeITT(), true)
+#define __itt_init_ittlib_name(x,y) (MallocInitializeITT(), true)
 
 #else
 #error This file is expected to be used for either TBB or TBB allocator build.
-#endif// __TBB_BUILD
+#endif // __TBB_BUILD
 
 #include "tools_api/ittnotify_static.c"
 
 namespace tbb {
-    namespace detail {
-        namespace r1 {
+namespace detail {
+namespace r1 {
 
-            /** This extra proxy method is necessary since __itt_init_lib is declared as static **/
-            int __TBB_load_ittnotify() {
-#if !(_WIN32 || _WIN64)
-                // tool_api crashes without dlopen, check that it's present. Common case
-                // for lack of dlopen is static binaries, i.e. ones build with -static.
-                if (dlopen == NULL) return 0;
+/** This extra proxy method is necessary since __itt_init_lib is declared as static **/
+int __TBB_load_ittnotify() {
+#if !(_WIN32||_WIN64)
+    // tool_api crashes without dlopen, check that it's present. Common case
+    // for lack of dlopen is static binaries, i.e. ones build with -static.
+    if (dlopen == nullptr)
+        return 0;
 #endif
-                return __itt_init_ittlib(NULL,                            // groups for:
-                                         (__itt_group_id)(__itt_group_sync// prepare/cancel/acquired/releasing
-                                                          | __itt_group_thread// name threads
-                                                          | __itt_group_stitch// stack stitching
-                                                          | __itt_group_structure));
-            }
+    return __itt_init_ittlib(nullptr,       // groups for:
+      (__itt_group_id)(__itt_group_sync     // prepare/cancel/acquired/releasing
+                       | __itt_group_thread // name threads
+                       | __itt_group_stitch // stack stitching
+                       | __itt_group_structure
+                           ));
+}
 
-        }//namespace r1
-    }    //namespace detail
-}// namespace tbb
+} //namespace r1
+} //namespace detail
+} // namespace tbb
 
 #endif /* __TBB_USE_ITT_NOTIFY */
diff --git a/external/tbb/src/tbb/itt_notify.h b/external/tbb/src/tbb/itt_notify.h
index 5fc9d542..48ddc5ca 100644
--- a/external/tbb/src/tbb/itt_notify.h
+++ b/external/tbb/src/tbb/itt_notify.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -34,6 +34,7 @@
 #include "tools_api/ittnotify.h"
 #include "tools_api/legacy/ittnotify.h"
 extern "C" void __itt_fini_ittlib(void);
+extern "C" void __itt_release_resources(void);
 
 #if _WIN32||_WIN64
     #undef _T
@@ -75,6 +76,7 @@ extern const tchar
 #define ITT_NOTIFY(name,obj)            __itt_##name(const_cast<void*>(static_cast<volatile void*>(obj)))
 #define ITT_THREAD_SET_NAME(name)       __itt_thread_set_name(name)
 #define ITT_FINI_ITTLIB()               __itt_fini_ittlib()
+#define ITT_RELEASE_RESOURCES()         __itt_release_resources()
 #define ITT_SYNC_CREATE(obj, type, name) __itt_sync_create((void*)(obj), type, name, 2)
 #define ITT_STACK_CREATE(obj)           obj = __itt_stack_caller_create()
 #define ITT_STACK_DESTROY(obj)          (obj!=nullptr) ? __itt_stack_caller_destroy(static_cast<__itt_caller>(obj)) : ((void)0)
@@ -94,6 +96,7 @@ extern const tchar
 #define ITT_NOTIFY(name,obj)            ((void)0)
 #define ITT_THREAD_SET_NAME(name)       ((void)0)
 #define ITT_FINI_ITTLIB()               ((void)0)
+#define ITT_RELEASE_RESOURCES()         ((void)0)
 #define ITT_SYNC_CREATE(obj, type, name) ((void)0)
 #define ITT_STACK_CREATE(obj)           ((void)0)
 #define ITT_STACK_DESTROY(obj)          ((void)0)
diff --git a/external/tbb/src/tbb/mailbox.h b/external/tbb/src/tbb/mailbox.h
index cd5f254b..d9166c12 100644
--- a/external/tbb/src/tbb/mailbox.h
+++ b/external/tbb/src/tbb/mailbox.h
@@ -82,11 +82,11 @@ struct task_proxy : public d1::task {
         return nullptr;
     }
 
-    virtual task* execute(d1::execution_data&) {
+    task* execute(d1::execution_data&) override {
         __TBB_ASSERT_RELEASE(false, nullptr);
         return nullptr;
     }
-    virtual task* cancel(d1::execution_data&) {
+    task* cancel(d1::execution_data&) override {
         __TBB_ASSERT_RELEASE(false, nullptr);
         return nullptr;
     }
diff --git a/external/tbb/src/tbb/main.cpp b/external/tbb/src/tbb/main.cpp
index fb2654c4..f43c33f5 100644
--- a/external/tbb/src/tbb/main.cpp
+++ b/external/tbb/src/tbb/main.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -16,153 +16,146 @@
 
 #include "oneapi/tbb/detail/_config.h"
 
-#include "environment.h"
-#include "governor.h"
-#include "itt_notify.h"
 #include "main.h"
+#include "governor.h"
+#include "threading_control.h"
+#include "environment.h"
 #include "market.h"
+#include "tcm_adaptor.h"
 #include "misc.h"
+#include "itt_notify.h"
 
 namespace tbb {
-    namespace detail {
-        namespace r1 {
+namespace detail {
+namespace r1 {
 
-            //------------------------------------------------------------------------
-            // Begin shared data layout.
-            // The following global data items are mostly read-only after initialization.
-            //------------------------------------------------------------------------
+//------------------------------------------------------------------------
+// Begin shared data layout.
+// The following global data items are mostly read-only after initialization.
+//------------------------------------------------------------------------
 
-            //------------------------------------------------------------------------
-            // governor data
-            basic_tls<thread_data*> governor::theTLS;
-            rml::tbb_factory governor::theRMLServerFactory;
-            bool governor::UsePrivateRML;
-            bool governor::is_rethrow_broken;
+//------------------------------------------------------------------------
+// governor data
+basic_tls<thread_data*> governor::theTLS;
+rml::tbb_factory governor::theRMLServerFactory;
+bool governor::UsePrivateRML;
+bool governor::is_rethrow_broken;
 
-            //------------------------------------------------------------------------
-            // market data
-            market* market::theMarket;
-            market::global_market_mutex_type market::theMarketMutex;
+//------------------------------------------------------------------------
+// threading_control data
+threading_control* threading_control::g_threading_control;
+threading_control::global_mutex_type threading_control::g_threading_control_mutex;
 
-            //------------------------------------------------------------------------
-            // context propagation data
-            context_state_propagation_mutex_type the_context_state_propagation_mutex;
-            std::atomic<uintptr_t> the_context_state_propagation_epoch {};
+//------------------------------------------------------------------------
+// context propagation data
+context_state_propagation_mutex_type the_context_state_propagation_mutex;
+std::atomic<uintptr_t> the_context_state_propagation_epoch{};
 
-            //------------------------------------------------------------------------
-            // One time initialization data
+//------------------------------------------------------------------------
+// One time initialization data
 
-            //! Counter of references to global shared resources such as TLS.
-            std::atomic<int> __TBB_InitOnce::count {};
+//! Counter of references to global shared resources such as TLS.
+std::atomic<int> __TBB_InitOnce::count{};
 
-            std::atomic_flag __TBB_InitOnce::InitializationLock = ATOMIC_FLAG_INIT;
+std::atomic_flag __TBB_InitOnce::InitializationLock = ATOMIC_FLAG_INIT;
 
-            //! Flag that is set to true after one-time initializations are done.
-            std::atomic<bool> __TBB_InitOnce::InitializationDone {};
+//! Flag that is set to true after one-time initializations are done.
+std::atomic<bool> __TBB_InitOnce::InitializationDone{};
 
 #if __TBB_USE_ITT_NOTIFY
-            //! Defined in profiling.cpp
-            extern bool ITT_Present;
-            void ITT_DoUnsafeOneTimeInitialization();
+//! Defined in profiling.cpp
+extern bool ITT_Present;
+void ITT_DoUnsafeOneTimeInitialization();
 #endif
 
-#if !(_WIN32 || _WIN64) || __TBB_SOURCE_DIRECTLY_INCLUDED
-            static __TBB_InitOnce __TBB_InitOnceHiddenInstance;
+#if !(_WIN32||_WIN64) || __TBB_SOURCE_DIRECTLY_INCLUDED
+static __TBB_InitOnce __TBB_InitOnceHiddenInstance;
 #endif
 
-#if TBB_USE_ASSERT
-            std::atomic<int> the_observer_proxy_count;
-
-            struct check_observer_proxy_count {
-                ~check_observer_proxy_count() {
-                    if (the_observer_proxy_count != 0) {
-                        runtime_warning("Leaked %ld observer_proxy objects\n",
-                                        long(the_observer_proxy_count));
-                    }
-                }
-            };
-            // The proxy count checker shall be defined after __TBB_InitOnceHiddenInstance to check the count
-            // after auto termination.
-            static check_observer_proxy_count the_check_observer_proxy_count;
-#endif /* TBB_USE_ASSERT */
-
-            //------------------------------------------------------------------------
-            // __TBB_InitOnce
-            //------------------------------------------------------------------------
-
-            void __TBB_InitOnce::add_ref() {
-                if (++count == 1) governor::acquire_resources();
-            }
-
-            void __TBB_InitOnce::remove_ref() {
-                int k = --count;
-                __TBB_ASSERT(k >= 0, "removed __TBB_InitOnce ref that was not added?");
-                if (k == 0) {
-                    governor::release_resources();
-                    ITT_FINI_ITTLIB();
-                }
-            }
-
-            //------------------------------------------------------------------------
-            // One-time Initializations
-            //------------------------------------------------------------------------
-
-            //! Defined in cache_aligned_allocator.cpp
-            void initialize_cache_aligned_allocator();
-
-            //! Performs thread-safe lazy one-time general TBB initialization.
-            void DoOneTimeInitialization() {
-                __TBB_InitOnce::lock();
-                // No fence required for load of InitializationDone, because we are inside a critical section.
-                if (!__TBB_InitOnce::InitializationDone) {
-                    __TBB_InitOnce::add_ref();
-                    if (GetBoolEnvironmentVariable("TBB_VERSION")) PrintVersion();
-                    bool itt_present = false;
+//------------------------------------------------------------------------
+// __TBB_InitOnce
+//------------------------------------------------------------------------
+
+void __TBB_InitOnce::add_ref() {
+    if (++count == 1) {
+        governor::acquire_resources();
+        tcm_adaptor::initialize();
+    }
+}
+
+void __TBB_InitOnce::remove_ref() {
+    int k = --count;
+    __TBB_ASSERT(k>=0,"removed __TBB_InitOnce ref that was not added?");
+    if( k==0 ) {
+        governor::release_resources();
+        ITT_FINI_ITTLIB();
+        ITT_RELEASE_RESOURCES();
+    }
+}
+
+//------------------------------------------------------------------------
+// One-time Initializations
+//------------------------------------------------------------------------
+
+//! Defined in cache_aligned_allocator.cpp
+void initialize_cache_aligned_allocator();
+
+//! Performs thread-safe lazy one-time general TBB initialization.
+void DoOneTimeInitialization() {
+    __TBB_InitOnce::lock();
+    // No fence required for load of InitializationDone, because we are inside a critical section.
+    if( !__TBB_InitOnce::InitializationDone ) {
+        __TBB_InitOnce::add_ref();
+        if( GetBoolEnvironmentVariable("TBB_VERSION") ) {
+            PrintVersion();
+            tcm_adaptor::print_version();
+        }
+        bool itt_present = false;
 #if __TBB_USE_ITT_NOTIFY
-                    ITT_DoUnsafeOneTimeInitialization();
-                    itt_present = ITT_Present;
+        ITT_DoUnsafeOneTimeInitialization();
+        itt_present = ITT_Present;
 #endif /* __TBB_USE_ITT_NOTIFY */
-                    initialize_cache_aligned_allocator();
-                    governor::initialize_rml_factory();
-                    // Force processor groups support detection
-                    governor::default_num_threads();
-                    // Force OS regular page size detection
-                    governor::default_page_size();
-                    PrintExtraVersionInfo("TOOLS SUPPORT", itt_present ? "enabled" : "disabled");
-                    __TBB_InitOnce::InitializationDone = true;
-                }
-                __TBB_InitOnce::unlock();
+        initialize_cache_aligned_allocator();
+        governor::initialize_rml_factory();
+        // Force processor groups support detection
+        governor::default_num_threads();
+        // Force OS regular page size detection
+        governor::default_page_size();
+        PrintExtraVersionInfo( "TOOLS SUPPORT", itt_present ? "enabled" : "disabled" );
+        __TBB_InitOnce::InitializationDone = true;
+    }
+    __TBB_InitOnce::unlock();
+}
+
+#if (_WIN32||_WIN64) && !__TBB_SOURCE_DIRECTLY_INCLUDED
+//! Windows "DllMain" that handles startup and shutdown of dynamic library.
+extern "C" bool WINAPI DllMain( HANDLE /*hinstDLL*/, DWORD reason, LPVOID lpvReserved ) {
+    switch( reason ) {
+        case DLL_PROCESS_ATTACH:
+            __TBB_InitOnce::add_ref();
+            break;
+        case DLL_PROCESS_DETACH:
+            // Since THREAD_DETACH is not called for the main thread, call auto-termination
+            // here as well - but not during process shutdown (due to risk of a deadlock).
+            if ( lpvReserved == nullptr ) { // library unload
+                governor::terminate_external_thread();
             }
-
-#if (_WIN32 || _WIN64) && !__TBB_SOURCE_DIRECTLY_INCLUDED
-            //! Windows "DllMain" that handles startup and shutdown of dynamic library.
-            extern "C" bool WINAPI DllMain(HANDLE /*hinstDLL*/, DWORD reason, LPVOID lpvReserved) {
-                switch (reason) {
-                    case DLL_PROCESS_ATTACH:
-                        __TBB_InitOnce::add_ref();
-                        break;
-                    case DLL_PROCESS_DETACH:
-                        // Since THREAD_DETACH is not called for the main thread, call auto-termination
-                        // here as well - but not during process shutdown (due to risk of a deadlock).
-                        if (lpvReserved == NULL) {// library unload
-                            governor::terminate_external_thread();
-                        }
-                        __TBB_InitOnce::remove_ref();
-                        // It is assumed that InitializationDone is not set after DLL_PROCESS_DETACH,
-                        // and thus no race on InitializationDone is possible.
-                        if (__TBB_InitOnce::initialization_done()) {
-                            // Remove reference that we added in DoOneTimeInitialization.
-                            __TBB_InitOnce::remove_ref();
-                        }
-                        break;
-                    case DLL_THREAD_DETACH:
-                        governor::terminate_external_thread();
-                        break;
-                }
-                return true;
+            __TBB_InitOnce::remove_ref();
+            // It is assumed that InitializationDone is not set after DLL_PROCESS_DETACH,
+            // and thus no race on InitializationDone is possible.
+            if ( __TBB_InitOnce::initialization_done() ) {
+                // Remove reference that we added in DoOneTimeInitialization.
+                __TBB_InitOnce::remove_ref();
             }
+            break;
+        case DLL_THREAD_DETACH:
+            governor::terminate_external_thread();
+            break;
+    }
+    return true;
+}
 #endif /* (_WIN32||_WIN64) && !__TBB_SOURCE_DIRECTLY_INCLUDED */
 
-        }// namespace r1
-    }    // namespace detail
-}// namespace tbb
+} // namespace r1
+} // namespace detail
+} // namespace tbb
diff --git a/external/tbb/src/tbb/market.cpp b/external/tbb/src/tbb/market.cpp
index bf39e4fe..ae3fadd4 100644
--- a/external/tbb/src/tbb/market.cpp
+++ b/external/tbb/src/tbb/market.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2023 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -14,617 +14,130 @@
     limitations under the License.
 */
 
-#include "oneapi/tbb/global_control.h"// global_control::active_value
-
 #include "arena.h"
-#include "governor.h"
-#include "itt_notify.h"
-#include "main.h"
 #include "market.h"
-#include "thread_data.h"
 
-#include <cstring>// std::memset()
+#include <algorithm> // std::find
 
 namespace tbb {
-    namespace detail {
-        namespace r1 {
-
-            /** This method must be invoked under my_arenas_list_mutex. **/
-            arena* market::select_next_arena(arena* hint) {
-                unsigned next_arena_priority_level = num_priority_levels;
-                if (hint) next_arena_priority_level = hint->my_priority_level;
-                for (unsigned idx = 0; idx < next_arena_priority_level; ++idx) {
-                    if (!my_arenas[idx].empty()) return &*my_arenas[idx].begin();
-                }
-                // don't change if arena with higher priority is not found.
-                return hint;
-            }
-
-            void market::insert_arena_into_list(arena& a) {
-                __TBB_ASSERT(a.my_priority_level < num_priority_levels, nullptr);
-                my_arenas[a.my_priority_level].push_front(a);
-                __TBB_ASSERT(!my_next_arena || my_next_arena->my_priority_level < num_priority_levels,
-                             nullptr);
-                my_next_arena = select_next_arena(my_next_arena);
-            }
-
-            void market::remove_arena_from_list(arena& a) {
-                __TBB_ASSERT(a.my_priority_level < num_priority_levels, nullptr);
-                my_arenas[a.my_priority_level].remove(a);
-                if (my_next_arena == &a) my_next_arena = nullptr;
-                my_next_arena = select_next_arena(my_next_arena);
-            }
-
-            //------------------------------------------------------------------------
-            // market
-            //------------------------------------------------------------------------
-
-            market::market(unsigned workers_soft_limit, unsigned workers_hard_limit, std::size_t stack_size)
-                : my_num_workers_hard_limit(workers_hard_limit),
-                  my_num_workers_soft_limit(workers_soft_limit), my_next_arena(nullptr), my_ref_count(1),
-                  my_stack_size(stack_size), my_workers_soft_limit_to_report(workers_soft_limit) {
-                // Once created RML server will start initializing workers that will need
-                // global market instance to get worker stack size
-                my_server = governor::create_rml_server(*this);
-                __TBB_ASSERT(my_server, "Failed to create RML server");
-            }
-
-            static unsigned calc_workers_soft_limit(unsigned workers_soft_limit,
-                                                    unsigned workers_hard_limit) {
-                if (int soft_limit = market::app_parallelism_limit()) workers_soft_limit = soft_limit - 1;
-                else// if user set no limits (yet), use market's parameter
-                    workers_soft_limit = max(governor::default_num_threads() - 1, workers_soft_limit);
-                if (workers_soft_limit >= workers_hard_limit) workers_soft_limit = workers_hard_limit - 1;
-                return workers_soft_limit;
-            }
-
-            bool market::add_ref_unsafe(global_market_mutex_type::scoped_lock& lock, bool is_public,
-                                        unsigned workers_requested, std::size_t stack_size) {
-                market* m = theMarket;
-                if (m) {
-                    ++m->my_ref_count;
-                    const unsigned old_public_count
-                            = is_public ? m->my_public_ref_count++ : /*any non-zero value*/ 1;
-                    lock.release();
-                    if (old_public_count == 0)
-                        set_active_num_workers(
-                                calc_workers_soft_limit(workers_requested, m->my_num_workers_hard_limit));
-
-                    // do not warn if default number of workers is requested
-                    if (workers_requested != governor::default_num_threads() - 1) {
-                        __TBB_ASSERT(
-                                skip_soft_limit_warning > workers_requested,
-                                "skip_soft_limit_warning must be larger than any valid workers_requested");
-                        unsigned soft_limit_to_report
-                                = m->my_workers_soft_limit_to_report.load(std::memory_order_relaxed);
-                        if (soft_limit_to_report < workers_requested) {
-                            runtime_warning("The number of workers is currently limited to %u. "
-                                            "The request for %u workers is ignored. Further requests for "
-                                            "more workers "
-                                            "will be silently ignored until the limit changes.\n",
-                                            soft_limit_to_report, workers_requested);
-                            // The race is possible when multiple threads report warnings.
-                            // We are OK with that, as there are just multiple warnings.
-                            unsigned expected_limit = soft_limit_to_report;
-                            m->my_workers_soft_limit_to_report.compare_exchange_strong(
-                                    expected_limit, skip_soft_limit_warning);
-                        }
-                    }
-                    if (m->my_stack_size < stack_size)
-                        runtime_warning("Thread stack size has been already set to %u. "
-                                        "The request for larger stack (%u) cannot be satisfied.\n",
-                                        m->my_stack_size, stack_size);
-                    return true;
-                }
-                return false;
-            }
-
-            market& market::global_market(bool is_public, unsigned workers_requested,
-                                          std::size_t stack_size) {
-                global_market_mutex_type::scoped_lock lock(theMarketMutex);
-                if (!market::add_ref_unsafe(lock, is_public, workers_requested, stack_size)) {
-                    // TODO: A lot is done under theMarketMutex locked. Can anything be moved out?
-                    if (stack_size == 0)
-                        stack_size = global_control::active_value(global_control::thread_stack_size);
-                    // Expecting that 4P is suitable for most applications.
-                    // Limit to 2P for large thread number.
-                    // TODO: ask RML for max concurrency and possibly correct hard_limit
-                    const unsigned factor = governor::default_num_threads() <= 128 ? 4 : 2;
-                    // The requested number of threads is intentionally not considered in
-                    // computation of the hard limit, in order to separate responsibilities
-                    // and avoid complicated interactions between global_control and task_scheduler_init.
-                    // The market guarantees that at least 256 threads might be created.
-                    const unsigned workers_hard_limit = max(
-                            max(factor * governor::default_num_threads(), 256u), app_parallelism_limit());
-                    const unsigned workers_soft_limit
-                            = calc_workers_soft_limit(workers_requested, workers_hard_limit);
-                    // Create the global market instance
-                    std::size_t size = sizeof(market);
-                    __TBB_ASSERT(__TBB_offsetof(market, my_workers) + sizeof(std::atomic<thread_data*>)
-                                         == sizeof(market),
-                                 "my_workers must be the last data field of the market class");
-                    size += sizeof(std::atomic<thread_data*>) * (workers_hard_limit - 1);
-                    __TBB_InitOnce::add_ref();
-                    void* storage = cache_aligned_allocate(size);
-                    std::memset(storage, 0, size);
-                    // Initialize and publish global market
-                    market* m = new (storage) market(workers_soft_limit, workers_hard_limit, stack_size);
-                    if (is_public) m->my_public_ref_count.store(1, std::memory_order_relaxed);
-#if __TBB_SUPPORTS_WORKERS_WAITING_IN_TERMINATE
-                    if (market::is_lifetime_control_present()) {
-                        ++m->my_public_ref_count;
-                        ++m->my_ref_count;
-                    }
-#endif// __TBB_SUPPORTS_WORKERS_WAITING_IN_TERMINATE
-                    theMarket = m;
-                    // This check relies on the fact that for shared RML default_concurrency==max_concurrency
-                    if (!governor::UsePrivateRML && m->my_server->default_concurrency() < workers_soft_limit)
-                        runtime_warning(
-                                "RML might limit the number of workers to %u while %u is requested.\n",
-                                m->my_server->default_concurrency(), workers_soft_limit);
-                }
-                return *theMarket;
-            }
-
-            void market::destroy() {
-                this->market::~market();// qualified to suppress warning
-                cache_aligned_deallocate(this);
-                __TBB_InitOnce::remove_ref();
-            }
-
-            bool market::release(bool is_public, bool blocking_terminate) {
-                market::enforce([this] { return theMarket == this; },
-                                "Global market instance was destroyed prematurely?");
-                bool do_release = false;
-                {
-                    global_market_mutex_type::scoped_lock lock(theMarketMutex);
-                    if (blocking_terminate) {
-                        __TBB_ASSERT(
-                                is_public,
-                                "Only an object with a public reference can request the blocking terminate");
-                        while (my_public_ref_count.load(std::memory_order_relaxed) == 1
-                               && my_ref_count.load(std::memory_order_relaxed) > 1) {
-                            lock.release();
-                            // To guarantee that request_close_connection() is called by the last external thread, we need to wait till all
-                            // references are released. Re-read my_public_ref_count to limit waiting if new external threads are created.
-                            // Theoretically, new private references to the market can be added during waiting making it potentially
-                            // endless.
-                            // TODO: revise why the weak scheduler needs market's pointer and try to remove this wait.
-                            // Note that the market should know about its schedulers for cancellation/exception/priority propagation,
-                            // see e.g. task_group_context::cancel_group_execution()
-                            while (my_public_ref_count.load(std::memory_order_acquire) == 1
-                                   && my_ref_count.load(std::memory_order_acquire) > 1) {
-                                yield();
-                            }
-                            lock.acquire(theMarketMutex);
-                        }
-                    }
-                    if (is_public) {
-                        __TBB_ASSERT(theMarket == this, "Global market instance was destroyed prematurely?");
-                        __TBB_ASSERT(my_public_ref_count.load(std::memory_order_relaxed), NULL);
-                        --my_public_ref_count;
-                    }
-                    if (--my_ref_count == 0) {
-                        __TBB_ASSERT(!my_public_ref_count.load(std::memory_order_relaxed), NULL);
-                        do_release = true;
-                        theMarket = NULL;
-                    }
-                }
-                if (do_release) {
-                    __TBB_ASSERT(!my_public_ref_count.load(std::memory_order_relaxed),
-                                 "No public references remain if we remove the market.");
-                    // inform RML that blocking termination is required
-                    my_join_workers = blocking_terminate;
-                    my_server->request_close_connection();
-                    return blocking_terminate;
-                }
-                return false;
-            }
-
-            int market::update_workers_request() {
-                int old_request = my_num_workers_requested;
-                my_num_workers_requested
-                        = min(my_total_demand.load(std::memory_order_relaxed),
-                              (int) my_num_workers_soft_limit.load(std::memory_order_relaxed));
-#if __TBB_ENQUEUE_ENFORCED_CONCURRENCY
-                if (my_mandatory_num_requested > 0) {
-                    __TBB_ASSERT(my_num_workers_soft_limit.load(std::memory_order_relaxed) == 0, NULL);
-                    my_num_workers_requested = 1;
-                }
-#endif
-                update_allotment(my_num_workers_requested);
-                return my_num_workers_requested - old_request;
-            }
-
-            void market::set_active_num_workers(unsigned soft_limit) {
-                market* m;
-
-                {
-                    global_market_mutex_type::scoped_lock lock(theMarketMutex);
-                    if (!theMarket) return;// actual value will be used at market creation
-                    m = theMarket;
-                    if (m->my_num_workers_soft_limit.load(std::memory_order_relaxed) == soft_limit) return;
-                    ++m->my_ref_count;
-                }
-                // have my_ref_count for market, use it safely
-
-                int delta = 0;
-                {
-                    arenas_list_mutex_type::scoped_lock lock(m->my_arenas_list_mutex);
-                    __TBB_ASSERT(soft_limit <= m->my_num_workers_hard_limit, NULL);
-
-#if __TBB_ENQUEUE_ENFORCED_CONCURRENCY
-                    arena_list_type* arenas = m->my_arenas;
-
-                    if (m->my_num_workers_soft_limit.load(std::memory_order_relaxed) == 0
-                        && m->my_mandatory_num_requested > 0) {
-                        for (unsigned level = 0; level < num_priority_levels; ++level)
-                            for (arena_list_type::iterator it = arenas[level].begin();
-                                 it != arenas[level].end(); ++it)
-                                if (it->my_global_concurrency_mode.load(std::memory_order_relaxed))
-                                    m->disable_mandatory_concurrency_impl(&*it);
-                    }
-                    __TBB_ASSERT(m->my_mandatory_num_requested == 0, NULL);
-#endif
-
-                    m->my_num_workers_soft_limit.store(soft_limit, std::memory_order_release);
-                    // report only once after new soft limit value is set
-                    m->my_workers_soft_limit_to_report.store(soft_limit, std::memory_order_relaxed);
-
-#if __TBB_ENQUEUE_ENFORCED_CONCURRENCY
-                    if (m->my_num_workers_soft_limit.load(std::memory_order_relaxed) == 0) {
-                        for (unsigned level = 0; level < num_priority_levels; ++level)
-                            for (arena_list_type::iterator it = arenas[level].begin();
-                                 it != arenas[level].end(); ++it)
-                                if (it->has_enqueued_tasks()) m->enable_mandatory_concurrency_impl(&*it);
-                    }
-#endif
-
-                    delta = m->update_workers_request();
-                }
-                // adjust_job_count_estimate must be called outside of any locks
-                if (delta != 0) m->my_server->adjust_job_count_estimate(delta);
-                // release internal market reference to match ++m->my_ref_count above
-                m->release(/*is_public=*/false, /*blocking_terminate=*/false);
-            }
-
-            bool governor::does_client_join_workers(const rml::tbb_client& client) {
-                return ((const market&) client).must_join_workers();
-            }
-
-            arena* market::create_arena(int num_slots, int num_reserved_slots, unsigned arena_priority_level,
-                                        std::size_t stack_size) {
-                __TBB_ASSERT(num_slots > 0, NULL);
-                __TBB_ASSERT(num_reserved_slots <= num_slots, NULL);
-                // Add public market reference for an external thread/task_arena (that adds an internal reference in exchange).
-                market& m = global_market(/*is_public=*/true, num_slots - num_reserved_slots, stack_size);
-                arena& a = arena::allocate_arena(m, num_slots, num_reserved_slots, arena_priority_level);
-                // Add newly created arena into the existing market's list.
-                arenas_list_mutex_type::scoped_lock lock(m.my_arenas_list_mutex);
-                m.insert_arena_into_list(a);
-                return &a;
-            }
-
-            /** This method must be invoked under my_arenas_list_mutex. **/
-            void market::detach_arena(arena& a) {
-                market::enforce([this] { return theMarket == this; },
-                                "Global market instance was destroyed prematurely?");
-                __TBB_ASSERT(!a.my_slots[0].is_occupied(), NULL);
-                if (a.my_global_concurrency_mode.load(std::memory_order_relaxed))
-                    disable_mandatory_concurrency_impl(&a);
-
-                remove_arena_from_list(a);
-                if (a.my_aba_epoch == my_arenas_aba_epoch.load(std::memory_order_relaxed)) {
-                    my_arenas_aba_epoch.store(my_arenas_aba_epoch.load(std::memory_order_relaxed) + 1,
-                                              std::memory_order_relaxed);
-                }
-            }
-
-            void market::try_destroy_arena(arena* a, uintptr_t aba_epoch, unsigned priority_level) {
-                bool locked = true;
-                __TBB_ASSERT(a, NULL);
-                // we hold reference to the market, so it cannot be destroyed at any moment here
-                market::enforce([this] { return theMarket == this; }, NULL);
-                __TBB_ASSERT(my_ref_count != 0, NULL);
-                my_arenas_list_mutex.lock();
-                arena_list_type::iterator it = my_arenas[priority_level].begin();
-                for (; it != my_arenas[priority_level].end(); ++it) {
-                    if (a == &*it) {
-                        if (it->my_aba_epoch == aba_epoch) {
-                            // Arena is alive
-                            // Acquire my_references to sync with threads that just left the arena
-                            if (!a->my_num_workers_requested
-                                && !a->my_references.load(std::memory_order_acquire)) {
-                                __TBB_ASSERT(!a->my_num_workers_allotted.load(std::memory_order_relaxed)
-                                                     && (a->my_pool_state == arena::SNAPSHOT_EMPTY
-                                                         || !a->my_max_num_workers),
-                                             "Inconsistent arena state");
-                                // Arena is abandoned. Destroy it.
-                                detach_arena(*a);
-                                my_arenas_list_mutex.unlock();
-                                locked = false;
-                                a->free_arena();
-                            }
-                        }
-                        if (locked) my_arenas_list_mutex.unlock();
-                        return;
-                    }
-                }
-                my_arenas_list_mutex.unlock();
-            }
-
-            /** This method must be invoked under my_arenas_list_mutex. **/
-            arena* market::arena_in_need(arena_list_type* arenas, arena* hint) {
-                // TODO: make sure arena with higher priority returned only if there are available slots in it.
-                hint = select_next_arena(hint);
-                if (!hint) return nullptr;
-                arena_list_type::iterator it = hint;
-                unsigned curr_priority_level = hint->my_priority_level;
-                __TBB_ASSERT(it != arenas[curr_priority_level].end(), nullptr);
-                do {
-                    arena& a = *it;
-                    if (++it == arenas[curr_priority_level].end()) {
-                        do {
-                            ++curr_priority_level %= num_priority_levels;
-                        } while (arenas[curr_priority_level].empty());
-                        it = arenas[curr_priority_level].begin();
-                    }
-                    if (a.num_workers_active() < a.my_num_workers_allotted.load(std::memory_order_relaxed)) {
-                        a.my_references += arena::ref_worker;
-                        return &a;
-                    }
-                } while (it != hint);
-                return nullptr;
-            }
-
-            arena* market::arena_in_need(arena* prev) {
-                if (my_total_demand.load(std::memory_order_acquire) <= 0) return nullptr;
-                arenas_list_mutex_type::scoped_lock lock(my_arenas_list_mutex, /*is_writer=*/false);
-                // TODO: introduce three state response: alive, not_alive, no_market_arenas
-                if (is_arena_alive(prev)) return arena_in_need(my_arenas, prev);
-                return arena_in_need(my_arenas, my_next_arena);
-            }
-
-            int market::update_allotment(arena_list_type* arenas, int workers_demand, int max_workers) {
-                __TBB_ASSERT(workers_demand > 0, nullptr);
-                max_workers = min(workers_demand, max_workers);
-                int unassigned_workers = max_workers;
-                int assigned = 0;
-                int carry = 0;
-                unsigned max_priority_level = num_priority_levels;
-                for (unsigned list_idx = 0; list_idx < num_priority_levels; ++list_idx) {
-                    int assigned_per_priority = min(my_priority_level_demand[list_idx], unassigned_workers);
-                    unassigned_workers -= assigned_per_priority;
-                    for (arena_list_type::iterator it = arenas[list_idx].begin();
-                         it != arenas[list_idx].end(); ++it) {
-                        arena& a = *it;
-                        __TBB_ASSERT(a.my_num_workers_requested >= 0, nullptr);
-                        __TBB_ASSERT(a.my_num_workers_requested <= int(a.my_max_num_workers)
-                                             || (a.my_max_num_workers == 0
-                                                 && a.my_local_concurrency_requests > 0
-                                                 && a.my_num_workers_requested == 1),
-                                     nullptr);
-                        if (a.my_num_workers_requested == 0) {
-                            __TBB_ASSERT(!a.my_num_workers_allotted.load(std::memory_order_relaxed), nullptr);
-                            continue;
-                        }
-
-                        if (max_priority_level == num_priority_levels) { max_priority_level = list_idx; }
-
-                        int allotted = 0;
-#if __TBB_ENQUEUE_ENFORCED_CONCURRENCY
-                        if (my_num_workers_soft_limit.load(std::memory_order_relaxed) == 0) {
-                            __TBB_ASSERT(max_workers == 0 || max_workers == 1, nullptr);
-                            allotted = a.my_global_concurrency_mode.load(std::memory_order_relaxed)
-                                                       && assigned < max_workers
-                                               ? 1
-                                               : 0;
-                        } else
-#endif
-                        {
-                            int tmp = a.my_num_workers_requested * assigned_per_priority + carry;
-                            allotted = tmp / my_priority_level_demand[list_idx];
-                            carry = tmp % my_priority_level_demand[list_idx];
-                            __TBB_ASSERT(allotted <= a.my_num_workers_requested, nullptr);
-                            __TBB_ASSERT(allotted <= int(a.my_num_slots - a.my_num_reserved_slots), nullptr);
-                        }
-                        a.my_num_workers_allotted.store(allotted, std::memory_order_relaxed);
-                        a.my_is_top_priority.store(list_idx == max_priority_level, std::memory_order_relaxed);
-                        assigned += allotted;
-                    }
-                }
-                __TBB_ASSERT(0 <= assigned && assigned <= max_workers, nullptr);
-                return assigned;
-            }
-
-            /** This method must be invoked under my_arenas_list_mutex. **/
-            bool market::is_arena_in_list(arena_list_type& arenas, arena* a) {
-                __TBB_ASSERT(a, "Expected non-null pointer to arena.");
-                for (arena_list_type::iterator it = arenas.begin(); it != arenas.end(); ++it)
-                    if (a == &*it) return true;
-                return false;
-            }
-
-            /** This method must be invoked under my_arenas_list_mutex. **/
-            bool market::is_arena_alive(arena* a) {
-                if (!a) return false;
-
-                // Still cannot access internals of the arena since the object itself might be destroyed.
-
-                for (unsigned idx = 0; idx < num_priority_levels; ++idx) {
-                    if (is_arena_in_list(my_arenas[idx], a)) return true;
-                }
-                return false;
-            }
-
-#if __TBB_ENQUEUE_ENFORCED_CONCURRENCY
-            void market::enable_mandatory_concurrency_impl(arena* a) {
-                __TBB_ASSERT(!a->my_global_concurrency_mode.load(std::memory_order_relaxed), NULL);
-                __TBB_ASSERT(my_num_workers_soft_limit.load(std::memory_order_relaxed) == 0, NULL);
-
-                a->my_global_concurrency_mode.store(true, std::memory_order_relaxed);
-                my_mandatory_num_requested++;
-            }
-
-            void market::enable_mandatory_concurrency(arena* a) {
-                int delta = 0;
-                {
-                    arenas_list_mutex_type::scoped_lock lock(my_arenas_list_mutex);
-                    if (my_num_workers_soft_limit.load(std::memory_order_relaxed) != 0
-                        || a->my_global_concurrency_mode.load(std::memory_order_relaxed))
-                        return;
-
-                    enable_mandatory_concurrency_impl(a);
-                    delta = update_workers_request();
-                }
-
-                if (delta != 0) my_server->adjust_job_count_estimate(delta);
-            }
-
-            void market::disable_mandatory_concurrency_impl(arena* a) {
-                __TBB_ASSERT(a->my_global_concurrency_mode.load(std::memory_order_relaxed), NULL);
-                __TBB_ASSERT(my_mandatory_num_requested > 0, NULL);
-
-                a->my_global_concurrency_mode.store(false, std::memory_order_relaxed);
-                my_mandatory_num_requested--;
-            }
-
-            void market::mandatory_concurrency_disable(arena* a) {
-                int delta = 0;
-                {
-                    arenas_list_mutex_type::scoped_lock lock(my_arenas_list_mutex);
-                    if (!a->my_global_concurrency_mode.load(std::memory_order_relaxed)) return;
-                    // There is a racy window in advertise_new_work between mandtory concurrency enabling and
-                    // setting SNAPSHOT_FULL. It gives a chance to spawn request to disable mandatory concurrency.
-                    // Therefore, we double check that there is no enqueued tasks.
-                    if (a->has_enqueued_tasks()) return;
-
-                    __TBB_ASSERT(my_num_workers_soft_limit.load(std::memory_order_relaxed) == 0, NULL);
-                    disable_mandatory_concurrency_impl(a);
-
-                    delta = update_workers_request();
-                }
-                if (delta != 0) my_server->adjust_job_count_estimate(delta);
-            }
-#endif /* __TBB_ENQUEUE_ENFORCED_CONCURRENCY */
-
-            void market::adjust_demand(arena& a, int delta, bool mandatory) {
-                if (!delta) { return; }
-                int target_epoch {};
-                {
-                    arenas_list_mutex_type::scoped_lock lock(my_arenas_list_mutex);
-                    __TBB_ASSERT(theMarket != nullptr, "market instance was destroyed prematurely?");
-#if __TBB_ENQUEUE_ENFORCED_CONCURRENCY
-                    if (mandatory) {
-                        __TBB_ASSERT(delta == 1 || delta == -1, nullptr);
-                        // Count the number of mandatory requests and proceed only for 0->1 and 1->0 transitions.
-                        a.my_local_concurrency_requests += delta;
-                        if ((delta > 0 && a.my_local_concurrency_requests != 1)
-                            || (delta < 0 && a.my_local_concurrency_requests != 0)) {
-                            return;
-                        }
-                    }
-#endif
-                    a.my_total_num_workers_requested += delta;
-                    int target_workers = 0;
-                    // Cap target_workers into interval [0, a.my_max_num_workers]
-                    if (a.my_total_num_workers_requested > 0) {
-#if __TBB_ENQUEUE_ENFORCED_CONCURRENCY
-                        // At least one thread should be requested when mandatory concurrency
-                        int max_num_workers = int(a.my_max_num_workers);
-                        if (a.my_local_concurrency_requests > 0 && max_num_workers == 0) {
-                            max_num_workers = 1;
-                        }
-#endif
-                        target_workers = min(a.my_total_num_workers_requested, max_num_workers);
-                    }
-
-                    delta = target_workers - a.my_num_workers_requested;
-
-                    if (delta == 0) { return; }
-
-                    a.my_num_workers_requested += delta;
-                    if (a.my_num_workers_requested == 0) {
-                        a.my_num_workers_allotted.store(0, std::memory_order_relaxed);
-                    }
-
-                    int total_demand = my_total_demand.load(std::memory_order_relaxed) + delta;
-                    my_total_demand.store(total_demand, std::memory_order_relaxed);
-                    my_priority_level_demand[a.my_priority_level] += delta;
-                    unsigned effective_soft_limit = my_num_workers_soft_limit.load(std::memory_order_relaxed);
-                    if (my_mandatory_num_requested > 0) {
-                        __TBB_ASSERT(effective_soft_limit == 0, NULL);
-                        effective_soft_limit = 1;
-                    }
-
-                    update_allotment(effective_soft_limit);
-                    if (delta > 0) {
-                        // can't overflow soft_limit, but remember values request by arenas in
-                        // my_total_demand to not prematurely release workers to RML
-                        if (my_num_workers_requested + delta > (int) effective_soft_limit)
-                            delta = effective_soft_limit - my_num_workers_requested;
-                    } else {
-                        // the number of workers should not be decreased below my_total_demand
-                        if (my_num_workers_requested + delta < total_demand)
-                            delta = min(total_demand, (int) effective_soft_limit) - my_num_workers_requested;
-                    }
-                    my_num_workers_requested += delta;
-                    __TBB_ASSERT(my_num_workers_requested <= (int) effective_soft_limit, NULL);
-
-                    target_epoch = a.my_adjust_demand_target_epoch++;
-                }
-
-                a.my_adjust_demand_current_epoch.wait_until(target_epoch, /* context = */ target_epoch,
-                                                            std::memory_order_relaxed);
-                // Must be called outside of any locks
-                my_server->adjust_job_count_estimate(delta);
-                a.my_adjust_demand_current_epoch.exchange(target_epoch + 1);
-                a.my_adjust_demand_current_epoch.notify_relaxed(target_epoch + 1);
-            }
-
-            void market::process(job& j) {
-                thread_data& td = static_cast<thread_data&>(j);
-                // td.my_arena can be dead. Don't access it until arena_in_need is called
-                arena* a = td.my_arena;
-                for (int i = 0; i < 2; ++i) {
-                    while ((a = arena_in_need(a))) { a->process(td); }
-                    // Workers leave market because there is no arena in need. It can happen earlier than
-                    // adjust_job_count_estimate() decreases my_slack and RML can put this thread to sleep.
-                    // It might result in a busy-loop checking for my_slack<0 and calling this method instantly.
-                    // the yield refines this spinning.
-                    if (!i) { yield(); }
-                }
-            }
-
-            void market::cleanup(job& j) {
-                market::enforce([this] { return theMarket != this; }, NULL);
-                governor::auto_terminate(&j);
-            }
-
-            void market::acknowledge_close_connection() { destroy(); }
-
-            ::rml::job* market::create_one_job() {
-                unsigned short index = ++my_first_unused_worker_idx;
-                __TBB_ASSERT(index > 0, NULL);
-                ITT_THREAD_SET_NAME(_T("TBB Worker Thread"));
-                // index serves as a hint decreasing conflicts between workers when they migrate between arenas
-                thread_data* td = new (cache_aligned_allocate(sizeof(thread_data))) thread_data {index, true};
-                __TBB_ASSERT(index <= my_num_workers_hard_limit, NULL);
-                __TBB_ASSERT(my_workers[index - 1].load(std::memory_order_relaxed) == nullptr, NULL);
-                my_workers[index - 1].store(td, std::memory_order_release);
-                return td;
-            }
-
-            void market::add_external_thread(thread_data& td) {
-                context_state_propagation_mutex_type::scoped_lock lock(the_context_state_propagation_mutex);
-                my_masters.push_front(td);
-            }
-
-            void market::remove_external_thread(thread_data& td) {
-                context_state_propagation_mutex_type::scoped_lock lock(the_context_state_propagation_mutex);
-                my_masters.remove(td);
-            }
-
-        }// namespace r1
-    }    // namespace detail
-}// namespace tbb
+namespace detail {
+namespace r1 {
+
+
+class tbb_permit_manager_client : public pm_client {
+public:
+    tbb_permit_manager_client(arena& a) : pm_client(a) {}
+
+    void register_thread() override {}
+
+    void unregister_thread() override {}
+
+    void set_allotment(unsigned allotment) {
+        my_arena.set_allotment(allotment);
+    }
+};
+
+//------------------------------------------------------------------------
+// market
+//------------------------------------------------------------------------
+
+market::market(unsigned workers_soft_limit)
+    : my_num_workers_soft_limit(workers_soft_limit)
+{}
+
+pm_client* market::create_client(arena& a) {
+    return new (cache_aligned_allocate(sizeof(tbb_permit_manager_client))) tbb_permit_manager_client(a);
+}
+
+void market::register_client(pm_client* c, d1::constraints&) {
+    mutex_type::scoped_lock lock(my_mutex);
+    my_clients[c->priority_level()].push_back(c);
+}
+
+void market::unregister_and_destroy_client(pm_client& c) {
+    {
+        mutex_type::scoped_lock lock(my_mutex);
+        auto& clients = my_clients[c.priority_level()];
+        auto it = std::find(clients.begin(), clients.end(), &c);
+        __TBB_ASSERT(it != clients.end(), "Destroying of an unregistered client");
+        clients.erase(it);
+    }
+
+    auto client = static_cast<tbb_permit_manager_client*>(&c);
+    client->~tbb_permit_manager_client();
+    cache_aligned_deallocate(client);
+}
+
+void market::update_allotment() {
+    int effective_soft_limit = my_mandatory_num_requested > 0 && my_num_workers_soft_limit == 0 ? 1 : my_num_workers_soft_limit;
+    int max_workers = min(my_total_demand, effective_soft_limit);
+    __TBB_ASSERT(max_workers >= 0, nullptr);
+
+    int unassigned_workers = max_workers;
+    int assigned = 0;
+    int carry = 0;
+    unsigned max_priority_level = num_priority_levels;
+    for (unsigned list_idx = 0; list_idx < num_priority_levels; ++list_idx ) {
+        int assigned_per_priority = min(my_priority_level_demand[list_idx], unassigned_workers);
+        unassigned_workers -= assigned_per_priority;
+        // We use reverse iterator there to serve last added clients first
+        for (auto it = my_clients[list_idx].rbegin(); it != my_clients[list_idx].rend(); ++it) {
+            tbb_permit_manager_client& client = static_cast<tbb_permit_manager_client&>(**it);
+            if (client.max_workers() == 0) {
+                client.set_allotment(0);
+                continue;
+            }
+
+            if (max_priority_level == num_priority_levels) {
+                max_priority_level = list_idx;
+            }
+
+            int allotted = 0;
+            if (my_num_workers_soft_limit == 0) {
+                __TBB_ASSERT(max_workers == 0 || max_workers == 1, nullptr);
+                allotted = client.min_workers() > 0 && assigned < max_workers ? 1 : 0;
+            } else {
+                int tmp = client.max_workers() * assigned_per_priority + carry;
+                allotted = tmp / my_priority_level_demand[list_idx];
+                carry = tmp % my_priority_level_demand[list_idx];
+                __TBB_ASSERT(allotted <= client.max_workers(), nullptr);
+            }
+            client.set_allotment(allotted);
+            client.set_top_priority(list_idx == max_priority_level);
+            assigned += allotted;
+        }
+    }
+    __TBB_ASSERT(assigned == max_workers, nullptr);
+}
+
+void market::set_active_num_workers(int soft_limit) {
+    mutex_type::scoped_lock lock(my_mutex);
+    if (my_num_workers_soft_limit != soft_limit) {
+        my_num_workers_soft_limit = soft_limit;
+        update_allotment();
+    }
+}
+
+void market::adjust_demand(pm_client& c, int mandatory_delta, int workers_delta) {
+    __TBB_ASSERT(-1 <= mandatory_delta && mandatory_delta <= 1, nullptr);
+
+    int delta{};
+    {
+        mutex_type::scoped_lock lock(my_mutex);
+        // Update client's state
+        delta = c.update_request(mandatory_delta, workers_delta);
+
+        // Update market's state
+        my_total_demand += delta;
+        my_priority_level_demand[c.priority_level()] += delta;
+        my_mandatory_num_requested += mandatory_delta;
+
+        update_allotment();
+    }
+
+    notify_thread_request(delta);
+}
+
+} // namespace r1
+} // namespace detail
+} // namespace tbb
diff --git a/external/tbb/src/tbb/market.h b/external/tbb/src/tbb/market.h
index 7827903e..85532ff1 100644
--- a/external/tbb/src/tbb/market.h
+++ b/external/tbb/src/tbb/market.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2023 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -17,296 +17,62 @@
 #ifndef _TBB_market_H
 #define _TBB_market_H
 
-#include "scheduler_common.h"
-#include "market_concurrent_monitor.h"
-#include "intrusive_list.h"
-#include "rml_tbb.h"
 #include "oneapi/tbb/rw_mutex.h"
+#include "oneapi/tbb/tbb_allocator.h"
+#include "oneapi/tbb/task_arena.h"
 
-#include "oneapi/tbb/spin_rw_mutex.h"
-#include "oneapi/tbb/task_group.h"
+#include "permit_manager.h"
+#include "pm_client.h"
 
 #include <atomic>
-
-#if defined(_MSC_VER) && defined(_Wp64)
-    // Workaround for overzealous compiler warnings in /Wp64 mode
-    #pragma warning (push)
-    #pragma warning (disable: 4244)
-#endif
+#include <vector>
 
 namespace tbb {
 namespace detail {
-
-#if __TBB_SUPPORTS_WORKERS_WAITING_IN_TERMINATE
-namespace d1 {
-class task_scheduler_handle;
-}
-#endif
-
 namespace r1 {
 
-class task_arena_base;
-class task_group_context;
-
-//------------------------------------------------------------------------
-// Class market
-//------------------------------------------------------------------------
-
-class market : no_copy, rml::tbb_client {
-    friend class arena;
-    friend class task_arena_base;
-    template<typename SchedulerTraits> friend class custom_scheduler;
-    friend class task_group_context;
-    friend class governor;
-#if __TBB_SUPPORTS_WORKERS_WAITING_IN_TERMINATE
-    friend class lifetime_control;
-#endif
-
+class market : public permit_manager {
 public:
-    //! Keys for the arena map array. The lower the value the higher priority of the arena list.
-    static constexpr unsigned num_priority_levels = 3;
-
-private:
-    friend void ITT_DoUnsafeOneTimeInitialization ();
-#if __TBB_SUPPORTS_WORKERS_WAITING_IN_TERMINATE
-    friend bool finalize_impl(d1::task_scheduler_handle& handle);
-#endif
-
-    typedef intrusive_list<arena> arena_list_type;
-    typedef intrusive_list<thread_data> thread_data_list_type;
+    market(unsigned soft_limit);
 
-    //! Currently active global market
-    static market* theMarket;
+    pm_client* create_client(arena& a) override;
+    void register_client(pm_client* client, d1::constraints&) override;
+    void unregister_and_destroy_client(pm_client& c) override;
 
-    typedef scheduler_mutex_type global_market_mutex_type;
-
-    //! Mutex guarding creation/destruction of theMarket, insertions/deletions in my_arenas, and cancellation propagation
-    static global_market_mutex_type  theMarketMutex;
-
-    //! Lightweight mutex guarding accounting operations with arenas list
-    typedef rw_mutex arenas_list_mutex_type;
-    // TODO: introduce fine-grained (per priority list) locking of arenas.
-    arenas_list_mutex_type my_arenas_list_mutex;
-
-    //! Pointer to the RML server object that services this TBB instance.
-    rml::tbb_server* my_server;
-
-    //! Waiting object for external and coroutine waiters.
-    market_concurrent_monitor my_sleep_monitor;
+    //! Request that arena's need in workers should be adjusted.
+    void adjust_demand(pm_client&, int mandatory_delta, int workers_delta) override;
 
-    //! Maximal number of workers allowed for use by the underlying resource manager
-    /** It can't be changed after market creation. **/
-    unsigned my_num_workers_hard_limit;
+    //! Set number of active workers
+    void set_active_num_workers(int soft_limit) override;
+private:
+    //! Recalculates the number of workers assigned to each arena in the list.
+    void update_allotment();
 
-    //! Current application-imposed limit on the number of workers (see set_active_num_workers())
-    /** It can't be more than my_num_workers_hard_limit. **/
-    std::atomic<unsigned> my_num_workers_soft_limit;
+    //! Keys for the arena map array. The lower the value the higher priority of the arena list.
+    static constexpr unsigned num_priority_levels = d1::num_priority_levels;
 
-    //! Number of workers currently requested from RML
-    int my_num_workers_requested;
+    using mutex_type = d1::rw_mutex;
+    mutex_type my_mutex;
 
-    //! First unused index of worker
-    /** Used to assign indices to the new workers coming from RML, and busy part
-        of my_workers array. **/
-    std::atomic<unsigned> my_first_unused_worker_idx;
+    //! Current application-imposed limit on the number of workers
+    int my_num_workers_soft_limit;
 
     //! Number of workers that were requested by all arenas on all priority levels
-    std::atomic<int> my_total_demand;
+    int my_total_demand{0};
 
     //! Number of workers that were requested by arenas per single priority list item
-    int my_priority_level_demand[num_priority_levels];
+    int my_priority_level_demand[num_priority_levels] = {0};
 
-#if __TBB_ENQUEUE_ENFORCED_CONCURRENCY
     //! How many times mandatory concurrency was requested from the market
-    int my_mandatory_num_requested;
-#endif
+    int my_mandatory_num_requested{0};
 
     //! Per priority list of registered arenas
-    arena_list_type my_arenas[num_priority_levels];
-
-    //! The first arena to be checked when idle worker seeks for an arena to enter
-    /** The check happens in round-robin fashion. **/
-    arena *my_next_arena;
-
-    //! ABA prevention marker to assign to newly created arenas
-    std::atomic<uintptr_t> my_arenas_aba_epoch;
-
-    //! Reference count controlling market object lifetime
-    std::atomic<unsigned> my_ref_count;
-
-    //! Count of external threads attached
-    std::atomic<unsigned> my_public_ref_count;
-
-    //! Stack size of worker threads
-    std::size_t my_stack_size;
-
-    //! Shutdown mode
-    bool my_join_workers;
-
-    //! The value indicating that the soft limit warning is unnecessary
-    static const unsigned skip_soft_limit_warning = ~0U;
-
-    //! Either workers soft limit to be reported via runtime_warning() or skip_soft_limit_warning
-    std::atomic<unsigned> my_workers_soft_limit_to_report;
-
-    //! Constructor
-    market ( unsigned workers_soft_limit, unsigned workers_hard_limit, std::size_t stack_size );
-
-    //! Destroys and deallocates market object created by market::create()
-    void destroy ();
-
-    //! Recalculates the number of workers requested from RML and updates the allotment.
-    int update_workers_request();
-
-    //! Recalculates the number of workers assigned to each arena in the list.
-    /** The actual number of workers servicing a particular arena may temporarily
-        deviate from the calculated value. **/
-    void update_allotment (unsigned effective_soft_limit) {
-        int total_demand = my_total_demand.load(std::memory_order_relaxed);
-        if (total_demand) {
-            update_allotment(my_arenas, total_demand, (int)effective_soft_limit);
-        }
-    }
-
-    //! Returns next arena that needs more workers, or NULL.
-    arena* arena_in_need(arena* prev);
-
-    template <typename Pred>
-    static void enforce (Pred pred, const char* msg) {
-        suppress_unused_warning(pred, msg);
-#if TBB_USE_ASSERT
-        global_market_mutex_type::scoped_lock lock(theMarketMutex);
-        __TBB_ASSERT(pred(), msg);
-#endif
-    }
-
-    ////////////////////////////////////////////////////////////////////////////////
-    // Helpers to unify code branches dependent on priority feature presence
-
-    arena* select_next_arena( arena* hint );
-
-    void insert_arena_into_list ( arena& a );
-
-    void remove_arena_from_list ( arena& a );
-
-    arena* arena_in_need ( arena_list_type* arenas, arena* hint );
-
-    int update_allotment ( arena_list_type* arenas, int total_demand, int max_workers );
-
-    bool is_arena_in_list( arena_list_type& arenas, arena* a );
-
-    bool is_arena_alive( arena* a );
-
-    ////////////////////////////////////////////////////////////////////////////////
-    // Implementation of rml::tbb_client interface methods
-
-    version_type version () const override { return 0; }
-
-    unsigned max_job_count () const override { return my_num_workers_hard_limit; }
-
-    std::size_t min_stack_size () const override { return worker_stack_size(); }
-
-    job* create_one_job () override;
-
-    void cleanup( job& j ) override;
-
-    void acknowledge_close_connection () override;
-
-    void process( job& j ) override;
-
-public:
-    //! Factory method creating new market object
-    static market& global_market( bool is_public, unsigned max_num_workers = 0, std::size_t stack_size = 0 );
-
-    //! Add reference to market if theMarket exists
-    static bool add_ref_unsafe( global_market_mutex_type::scoped_lock& lock, bool is_public, unsigned max_num_workers = 0, std::size_t stack_size = 0 );
-
-    //! Creates an arena object
-    /** If necessary, also creates global market instance, and boosts its ref count.
-        Each call to create_arena() must be matched by the call to arena::free_arena(). **/
-    static arena* create_arena ( int num_slots, int num_reserved_slots,
-                                 unsigned arena_index, std::size_t stack_size );
-
-    //! Removes the arena from the market's list
-    void try_destroy_arena ( arena*, uintptr_t aba_epoch, unsigned pririty_level );
-
-    //! Removes the arena from the market's list
-    void detach_arena ( arena& );
-
-    //! Decrements market's refcount and destroys it in the end
-    bool release ( bool is_public, bool blocking_terminate );
-
-    //! Return wait list
-    market_concurrent_monitor& get_wait_list() { return my_sleep_monitor; }
-
-#if __TBB_ENQUEUE_ENFORCED_CONCURRENCY
-    //! Imlpementation of mandatory concurrency enabling
-    void enable_mandatory_concurrency_impl ( arena *a );
-
-    //! Inform the external thread that there is an arena with mandatory concurrency
-    void enable_mandatory_concurrency ( arena *a );
-
-    //! Inform the external thread that the arena is no more interested in mandatory concurrency
-    void disable_mandatory_concurrency_impl(arena* a);
-
-    //! Inform the external thread that the arena is no more interested in mandatory concurrency
-    void mandatory_concurrency_disable ( arena *a );
-#endif /* __TBB_ENQUEUE_ENFORCED_CONCURRENCY */
-
-    //! Request that arena's need in workers should be adjusted.
-    /** Concurrent invocations are possible only on behalf of different arenas. **/
-    void adjust_demand ( arena&, int delta, bool mandatory );
-
-    //! Used when RML asks for join mode during workers termination.
-    bool must_join_workers () const { return my_join_workers; }
-
-    //! Returns the requested stack size of worker threads.
-    std::size_t worker_stack_size () const { return my_stack_size; }
-
-    //! Set number of active workers
-    static void set_active_num_workers( unsigned w );
-
-    //! Reports active parallelism level according to user's settings
-    static unsigned app_parallelism_limit();
-
-#if __TBB_SUPPORTS_WORKERS_WAITING_IN_TERMINATE
-    //! Reports if any active global lifetime references are present
-    static unsigned is_lifetime_control_present();
-#endif
-
-    //! Finds all contexts affected by the state change and propagates the new state to them.
-    /** The propagation is relayed to the market because tasks created by one
-        external thread can be passed to and executed by other external threads. This means
-        that context trees can span several arenas at once and thus state change
-        propagation cannot be generally localized to one arena only. **/
-    template <typename T>
-    bool propagate_task_group_state (std::atomic<T> d1::task_group_context::*mptr_state, d1::task_group_context& src, T new_state );
-
-    //! List of registered external threads
-    thread_data_list_type my_masters;
-
-    //! Array of pointers to the registered workers
-    /** Used by cancellation propagation mechanism.
-        Must be the last data member of the class market. **/
-    std::atomic<thread_data*> my_workers[1];
-
-    static unsigned max_num_workers() {
-        global_market_mutex_type::scoped_lock lock( theMarketMutex );
-        return theMarket? theMarket->my_num_workers_hard_limit : 0;
-    }
-
-    void add_external_thread(thread_data& td);
-
-    void remove_external_thread(thread_data& td);
+    using clients_container_type = std::vector<pm_client*, tbb::tbb_allocator<pm_client*>>;
+    clients_container_type my_clients[num_priority_levels];
 }; // class market
 
 } // namespace r1
 } // namespace detail
 } // namespace tbb
 
-#if defined(_MSC_VER) && defined(_Wp64)
-    // Workaround for overzealous compiler warnings in /Wp64 mode
-    #pragma warning (pop)
-#endif // warning 4244 is back
-
 #endif /* _TBB_market_H */
diff --git a/external/tbb/src/tbb/market_concurrent_monitor.h b/external/tbb/src/tbb/market_concurrent_monitor.h
index d81c0566..37927617 100644
--- a/external/tbb/src/tbb/market_concurrent_monitor.h
+++ b/external/tbb/src/tbb/market_concurrent_monitor.h
@@ -46,7 +46,7 @@ class resume_node : public wait_node<market_context> {
         , my_suspend_point(my_curr_dispatcher->get_suspend_point())
     {}
 
-    virtual ~resume_node() {
+    ~resume_node() override {
         if (this->my_skipped_wakeup) {
             spin_wait_until_eq(this->my_notify_calls, 1);
         }
diff --git a/external/tbb/src/tbb/misc.cpp b/external/tbb/src/tbb/misc.cpp
index 62bb414a..115a5f38 100644
--- a/external/tbb/src/tbb/misc.cpp
+++ b/external/tbb/src/tbb/misc.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -22,125 +22,135 @@
 
 #include "oneapi/tbb/version.h"
 
-#include "assert_impl.h"// Out-of-line TBB assertion handling routines are instantiated here.
-#include "concurrent_monitor_mutex.h"
-#include "governor.h"
 #include "misc.h"
+#include "governor.h"
+#include "assert_impl.h" // Out-of-line TBB assertion handling routines are instantiated here.
+#include "concurrent_monitor_mutex.h"
 
-#include <cstdarg>
 #include <cstdio>
 #include <cstdlib>
-#include <cstring>
 #include <stdexcept>
+#include <cstring>
+#include <cstdarg>
 
-#if _WIN32 || _WIN64
+#if _WIN32||_WIN64
 #include <windows.h>
 #endif
 
 #if !_WIN32
-#include <unistd.h>// sysconf(_SC_PAGESIZE)
+#include <unistd.h> // sysconf(_SC_PAGESIZE)
 #endif
 
 namespace tbb {
-    namespace detail {
-        namespace r1 {
+namespace detail {
+namespace r1 {
 
-            //------------------------------------------------------------------------
-            // governor data
-            //------------------------------------------------------------------------
-            cpu_features_type governor::cpu_features;
+//------------------------------------------------------------------------
+// governor data
+//------------------------------------------------------------------------
+cpu_features_type governor::cpu_features;
 
 //------------------------------------------------------------------------
 // concurrent_monitor_mutex data
 //------------------------------------------------------------------------
 #if !__TBB_USE_FUTEX
-            std::mutex concurrent_monitor_mutex::my_init_mutex;
+std::mutex concurrent_monitor_mutex::my_init_mutex;
 #endif
 
-            size_t DefaultSystemPageSize() {
+
+size_t DefaultSystemPageSize() {
 #if _WIN32
-                SYSTEM_INFO si;
-                GetSystemInfo(&si);
-                return si.dwPageSize;
+    SYSTEM_INFO si;
+    GetSystemInfo(&si);
+    return si.dwPageSize;
 #else
-                return sysconf(_SC_PAGESIZE);
+    return sysconf(_SC_PAGESIZE);
 #endif
-            }
-
-            /** The leading "\0" is here so that applying "strings" to the binary delivers a clean result. */
-            static const char VersionString[] = "\0" TBB_VERSION_STRINGS;
-
-            static bool PrintVersionFlag = false;
-
-            void PrintVersion() {
-                PrintVersionFlag = true;
-                std::fputs(VersionString + 1, stderr);
-            }
-
-            void PrintExtraVersionInfo(const char* category, const char* format, ...) {
-                if (PrintVersionFlag) {
-                    char str[1024];
-                    std::memset(str, 0, 1024);
-                    va_list args;
-                    va_start(args, format);
-                    // Note: correct vsnprintf definition obtained from tbb_assert_impl.h
-                    std::vsnprintf(str, 1024 - 1, format, args);
-                    va_end(args);
-                    std::fprintf(stderr, "oneTBB: %s\t%s\n", category, str);
-                }
-            }
+}
+
+/** The leading "\0" is here so that applying "strings" to the binary delivers a clean result. */
+static const char VersionString[] = "\0" TBB_VERSION_STRINGS;
+
+static bool PrintVersionFlag = false;
+
+void PrintVersion() {
+    PrintVersionFlag = true;
+    std::fputs(VersionString+1,stderr);
+}
+
+void PrintExtraVersionInfo( const char* category, const char* format, ... ) {
+    if( PrintVersionFlag ) {
+        char str[1024]; std::memset(str, 0, 1024);
+        va_list args; va_start(args, format);
+        // Note: correct vsnprintf definition obtained from tbb_assert_impl.h
+        std::vsnprintf( str, 1024-1, format, args);
+        va_end(args);
+        std::fprintf(stderr, "oneTBB: %s\t%s\n", category, str );
+    }
+}
 
 //! check for transaction support.
 #if _MSC_VER
-#include <intrin.h>// for __cpuid
+#include <intrin.h> // for __cpuid
+#elif __APPLE__
+#include <sys/sysctl.h>
 #endif
 
 #if __TBB_x86_32 || __TBB_x86_64
-            void check_cpuid(int leaf, int sub_leaf, int registers[4]) {
+void check_cpuid(int leaf, int sub_leaf, int registers[4]) {
 #if _MSC_VER
-                __cpuidex(registers, leaf, sub_leaf);
+    __cpuidex(registers, leaf, sub_leaf);
 #else
-                int reg_eax = 0;
-                int reg_ebx = 0;
-                int reg_ecx = 0;
-                int reg_edx = 0;
+    int reg_eax = 0;
+    int reg_ebx = 0;
+    int reg_ecx = 0;
+    int reg_edx = 0;
 #if __TBB_x86_32 && __PIC__
-                // On 32-bit systems with position-independent code GCC fails to work around the stuff in EBX
-                // register. We help it using backup and restore.
-                __asm__("mov %%ebx, %%esi\n\t"
-                        "cpuid\n\t"
-                        "xchg %%ebx, %%esi"
-                        : "=a"(reg_eax), "=S"(reg_ebx), "=c"(reg_ecx), "=d"(reg_edx)
-                        : "0"(leaf), "2"(sub_leaf)// read value from eax and ecx
-                );
+    // On 32-bit systems with position-independent code GCC fails to work around the stuff in EBX
+    // register. We help it using backup and restore.
+    __asm__("mov %%ebx, %%esi\n\t"
+            "cpuid\n\t"
+            "xchg %%ebx, %%esi"
+            : "=a"(reg_eax), "=S"(reg_ebx), "=c"(reg_ecx), "=d"(reg_edx)
+            : "0"(leaf), "2"(sub_leaf) // read value from eax and ecx
+    );
 #else
-                __asm__("cpuid"
-                        : "=a"(reg_eax), "=b"(reg_ebx), "=c"(reg_ecx), "=d"(reg_edx)
-                        : "0"(leaf), "2"(sub_leaf)// read value from eax and ecx
-                );
+    __asm__("cpuid"
+            : "=a"(reg_eax), "=b"(reg_ebx), "=c"(reg_ecx), "=d"(reg_edx)
+            : "0"(leaf), "2"(sub_leaf) // read value from eax and ecx
+    );
 #endif
-                registers[0] = reg_eax;
-                registers[1] = reg_ebx;
-                registers[2] = reg_ecx;
-                registers[3] = reg_edx;
+    registers[0] = reg_eax;
+    registers[1] = reg_ebx;
+    registers[2] = reg_ecx;
+    registers[3] = reg_edx;
 #endif
-            }
+}
 #endif
 
-            void detect_cpu_features(cpu_features_type& cpu_features) {
-                suppress_unused_warning(cpu_features);
+void detect_cpu_features(cpu_features_type& cpu_features) {
+    suppress_unused_warning(cpu_features);
 #if __TBB_x86_32 || __TBB_x86_64
-                const int rtm_ebx_mask = 1 << 11;
-                const int waitpkg_ecx_mask = 1 << 5;
-                int registers[4] = {0};
-
-                // Check RTM and WAITPKG
-                check_cpuid(7, 0, registers);
-                cpu_features.rtm_enabled = (registers[1] & rtm_ebx_mask) != 0;
-                cpu_features.waitpkg_enabled = (registers[2] & waitpkg_ecx_mask) != 0;
-#endif /* (__TBB_x86_32 || __TBB_x86_64) */
-            }
-
-        }// namespace r1
-    }    // namespace detail
-}// namespace tbb
+    const int rtm_ebx_mask = 1 << 11;
+    const int waitpkg_ecx_mask = 1 << 5;
+    const int hybrid_edx_mask = 1 << 15;
+    int registers[4] = {0};
+
+    // Check RTM, WAITPKG, HYBRID
+    check_cpuid(7, 0, registers);
+    cpu_features.rtm_enabled = (registers[1] & rtm_ebx_mask) != 0;
+    cpu_features.waitpkg_enabled = (registers[2] & waitpkg_ecx_mask) != 0;
+    cpu_features.hybrid = (registers[3] & hybrid_edx_mask) != 0;
+#elif __APPLE__
+    // Check HYBRID (hw.nperflevels > 1)
+    uint64_t nperflevels = 0;
+    size_t nperflevels_size = sizeof(nperflevels);
+    if (!sysctlbyname("hw.nperflevels", &nperflevels, &nperflevels_size, nullptr, 0)) {
+        cpu_features.hybrid = (nperflevels > 1);
+    }
+#endif
+}
+
+} // namespace r1
+} // namespace detail
+} // namespace tbb
diff --git a/external/tbb/src/tbb/misc.h b/external/tbb/src/tbb/misc.h
index 2e78eab2..988c29b1 100644
--- a/external/tbb/src/tbb/misc.h
+++ b/external/tbb/src/tbb/misc.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -53,11 +53,9 @@ class task_scheduler_observer;
 
 const std::size_t MByte = 1024*1024;
 
-#if __TBB_WIN8UI_SUPPORT && (_WIN32_WINNT < 0x0A00)
-// In Win8UI mode (Windows 8 Store* applications), TBB uses a thread creation API
-// that does not allow to specify the stack size.
-// Still, the thread stack size value, either explicit or default, is used by the scheduler.
-// So here we set the default value to match the platform's default of 1MB.
+#if __TBB_USE_WINAPI
+// The Microsoft Documentation about Thread Stack Size states that
+// "The default stack reservation size used by the linker is 1 MB"
 const std::size_t ThreadStackSize = 1*MByte;
 #else
 const std::size_t ThreadStackSize = (sizeof(uintptr_t) <= 4 ? 2 : 4 )*MByte;
@@ -196,7 +194,7 @@ T1 atomic_update(std::atomic<T1>& dst, T1 newValue, Pred compare) {
         basic_mask_t* threadMask;
         int is_changed;
     public:
-        affinity_helper() : threadMask(NULL), is_changed(0) {}
+        affinity_helper() : threadMask(nullptr), is_changed(0) {}
         ~affinity_helper();
         void protect_affinity_mask( bool restore_process_mask  );
         void dismiss();
@@ -213,6 +211,7 @@ T1 atomic_update(std::atomic<T1>& dst, T1 newValue, Pred compare) {
 struct cpu_features_type {
     bool rtm_enabled{false};
     bool waitpkg_enabled{false};
+    bool hybrid{false};
 };
 
 void detect_cpu_features(cpu_features_type& cpu_features);
diff --git a/external/tbb/src/tbb/misc_ex.cpp b/external/tbb/src/tbb/misc_ex.cpp
index 614861dd..03b33b46 100644
--- a/external/tbb/src/tbb/misc_ex.cpp
+++ b/external/tbb/src/tbb/misc_ex.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -22,10 +22,10 @@
 #if !defined(__TBB_HardwareConcurrency)
 
 #include "dynamic_link.h"
-#include <limits.h>
 #include <stdio.h>
+#include <limits.h>
 
-#if _WIN32 || _WIN64
+#if _WIN32||_WIN64
 #include <windows.h>
 #if __TBB_WIN8UI_SUPPORT
 #include <thread>
@@ -36,362 +36,374 @@
 #if __linux__
 #include <sys/sysinfo.h>
 #endif
-#include <cerrno>
 #include <cstring>
 #include <sched.h>
+#include <cerrno>
 #elif __sun
 #include <sys/sysinfo.h>
 #elif __FreeBSD__
 #include <cerrno>
 #include <cstring>
+#include <sys/param.h>  // Required by <sys/cpuset.h>
 #include <sys/cpuset.h>
-#include <sys/param.h>// Required by <sys/cpuset.h>
 #endif
 #endif
 
 namespace tbb {
-    namespace detail {
-        namespace r1 {
+namespace detail {
+namespace r1 {
 
 #if __TBB_USE_OS_AFFINITY_SYSCALL
 
 #if __unix__
-            // Handlers for interoperation with libiomp
-            static int (*libiomp_try_restoring_original_mask)();
-            // Table for mapping to libiomp entry points
-            static const dynamic_link_descriptor iompLinkTable[]
-                    = {DLD_NOWEAK(kmp_set_thread_affinity_mask_initial, libiomp_try_restoring_original_mask)};
+// Handlers for interoperation with libiomp
+static int (*libiomp_try_restoring_original_mask)();
+// Table for mapping to libiomp entry points
+static const dynamic_link_descriptor iompLinkTable[] = {
+    DLD_NOWEAK( kmp_set_thread_affinity_mask_initial, libiomp_try_restoring_original_mask )
+};
 #endif
 
-            static void set_thread_affinity_mask(std::size_t maskSize, const basic_mask_t* threadMask) {
+static void set_thread_affinity_mask( std::size_t maskSize, const basic_mask_t* threadMask ) {
 #if __FreeBSD__ || __NetBSD__ || __OpenBSD__
-                if (cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_TID, -1, maskSize, threadMask))
+    if( cpuset_setaffinity( CPU_LEVEL_WHICH, CPU_WHICH_TID, -1, maskSize, threadMask ) )
 #else /* __unix__ */
-                if (sched_setaffinity(0, maskSize, threadMask))
+    if( sched_setaffinity( 0, maskSize, threadMask ) )
 #endif
-                    // Here and below the error severity is lowered from critical level
-                    // because it may happen during TBB library unload because of not
-                    // waiting for workers to complete (current RML policy, to be fixed).
-                    // handle_perror( errno, "setaffinity syscall" );
-                    runtime_warning("setaffinity syscall failed");
-            }
-
-            static void get_thread_affinity_mask(std::size_t maskSize, basic_mask_t* threadMask) {
+        // Here and below the error severity is lowered from critical level
+        // because it may happen during TBB library unload because of not
+        // waiting for workers to complete (current RML policy, to be fixed).
+        // handle_perror( errno, "setaffinity syscall" );
+        runtime_warning( "setaffinity syscall failed" );
+}
+
+static void get_thread_affinity_mask( std::size_t maskSize, basic_mask_t* threadMask ) {
 #if __FreeBSD__ || __NetBSD__ || __OpenBSD__
-                if (cpuset_getaffinity(CPU_LEVEL_WHICH, CPU_WHICH_TID, -1, maskSize, threadMask))
+    if( cpuset_getaffinity( CPU_LEVEL_WHICH, CPU_WHICH_TID, -1, maskSize, threadMask ) )
 #else /* __unix__ */
-                if (sched_getaffinity(0, maskSize, threadMask))
+    if( sched_getaffinity( 0, maskSize, threadMask ) )
 #endif
-                    runtime_warning("getaffinity syscall failed");
-            }
+    runtime_warning( "getaffinity syscall failed" );
+}
 
-            static basic_mask_t* process_mask;
-            static int num_masks;
+static basic_mask_t* process_mask;
+static int num_masks;
 
-            void destroy_process_mask() {
-                if (process_mask) { delete[] process_mask; }
-            }
+void destroy_process_mask() {
+    delete [] process_mask;
+    process_mask = nullptr;
+}
 
 #define curMaskSize sizeof(basic_mask_t) * num_masks
-            affinity_helper::~affinity_helper() {
-                if (threadMask) {
-                    if (is_changed) { set_thread_affinity_mask(curMaskSize, threadMask); }
-                    delete[] threadMask;
-                }
-            }
-            void affinity_helper::protect_affinity_mask(bool restore_process_mask) {
-                if (threadMask == NULL && num_masks) {// TODO: assert num_masks validity?
-                    threadMask = new basic_mask_t[num_masks];
-                    std::memset(threadMask, 0, curMaskSize);
-                    get_thread_affinity_mask(curMaskSize, threadMask);
-                    if (restore_process_mask) {
-                        __TBB_ASSERT(process_mask, "A process mask is requested but not yet stored");
-                        is_changed = memcmp(process_mask, threadMask, curMaskSize);
-                        if (is_changed) set_thread_affinity_mask(curMaskSize, process_mask);
-                    } else {
-                        // Assume that the mask will be changed by the caller.
-                        is_changed = 1;
-                    }
-                }
-            }
-            void affinity_helper::dismiss() {
-                if (threadMask) {
-                    delete[] threadMask;
-                    threadMask = NULL;
-                }
-                is_changed = 0;
-            }
+affinity_helper::~affinity_helper() {
+    if( threadMask ) {
+        if( is_changed ) {
+            set_thread_affinity_mask( curMaskSize, threadMask );
+        }
+        delete [] threadMask;
+    }
+}
+void affinity_helper::protect_affinity_mask( bool restore_process_mask ) {
+    if( threadMask == nullptr && num_masks ) { // TODO: assert num_masks validity?
+        threadMask = new basic_mask_t [num_masks];
+        std::memset( threadMask, 0, curMaskSize );
+        get_thread_affinity_mask( curMaskSize, threadMask );
+        if( restore_process_mask ) {
+            __TBB_ASSERT( process_mask, "A process mask is requested but not yet stored" );
+            is_changed = memcmp( process_mask, threadMask, curMaskSize );
+            if( is_changed )
+                set_thread_affinity_mask( curMaskSize, process_mask );
+        } else {
+            // Assume that the mask will be changed by the caller.
+            is_changed = 1;
+        }
+    }
+}
+void affinity_helper::dismiss() {
+    delete [] threadMask;
+    threadMask = nullptr;
+    is_changed = 0;
+}
 #undef curMaskSize
 
-            static std::atomic<do_once_state> hardware_concurrency_info;
-
-            static int theNumProcs;
-
-            static void initialize_hardware_concurrency_info() {
-                int err;
-                int availableProcs = 0;
-                int numMasks = 1;
-                int maxProcs = sysconf(_SC_NPROCESSORS_ONLN);
-                basic_mask_t* processMask;
-                const std::size_t BasicMaskSize = sizeof(basic_mask_t);
-                for (;;) {
-                    const int curMaskSize = BasicMaskSize * numMasks;
-                    processMask = new basic_mask_t[numMasks];
-                    std::memset(processMask, 0, curMaskSize);
+static std::atomic<do_once_state> hardware_concurrency_info;
+
+static int theNumProcs;
+
+static void initialize_hardware_concurrency_info () {
+    int err;
+    int availableProcs = 0;
+    int numMasks = 1;
+    int maxProcs = sysconf(_SC_NPROCESSORS_ONLN);
+    basic_mask_t* processMask;
+    const std::size_t BasicMaskSize =  sizeof(basic_mask_t);
+    for (;;) {
+        const int curMaskSize = BasicMaskSize * numMasks;
+        processMask = new basic_mask_t[numMasks];
+        std::memset( processMask, 0, curMaskSize );
 #if __FreeBSD__ || __NetBSD__ || __OpenBSD__
-                    // CPU_LEVEL_WHICH - anonymous (current) mask, CPU_LEVEL_CPUSET - assigned mask
-                    err = cpuset_getaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID, -1, curMaskSize, processMask);
-                    if (!err || errno != ERANGE || curMaskSize * CHAR_BIT >= 16 * 1024) break;
+        // CPU_LEVEL_WHICH - anonymous (current) mask, CPU_LEVEL_CPUSET - assigned mask
+        err = cpuset_getaffinity( CPU_LEVEL_WHICH, CPU_WHICH_PID, -1, curMaskSize, processMask );
+        if ( !err || errno != ERANGE || curMaskSize * CHAR_BIT >= 16 * 1024 )
+            break;
 #else /* __unix__ */
-                    int pid = getpid();
-                    err = sched_getaffinity(pid, curMaskSize, processMask);
-                    if (!err || errno != EINVAL || curMaskSize * CHAR_BIT >= 256 * 1024) break;
+        int pid = getpid();
+        err = sched_getaffinity( pid, curMaskSize, processMask );
+        if ( !err || errno != EINVAL || curMaskSize * CHAR_BIT >= 256 * 1024 )
+             break;
 #endif
-                    delete[] processMask;
-                    numMasks <<= 1;
-                }
-                if (!err) {
-                    // We have found the mask size and captured the process affinity mask into processMask.
-                    num_masks = numMasks;// do here because it's needed for affinity_helper to work
+        delete[] processMask;
+        numMasks <<= 1;
+    }
+    if ( !err ) {
+        // We have found the mask size and captured the process affinity mask into processMask.
+        num_masks = numMasks; // do here because it's needed for affinity_helper to work
 #if __unix__
-                    // For better coexistence with libiomp which might have changed the mask already,
-                    // check for its presence and ask it to restore the mask.
-                    dynamic_link_handle libhandle;
-                    if (dynamic_link("libiomp5.so", iompLinkTable, 1, &libhandle, DYNAMIC_LINK_GLOBAL)) {
-                        // We have found the symbol provided by libiomp5 for restoring original thread affinity.
-                        affinity_helper affhelp;
-                        affhelp.protect_affinity_mask(/*restore_process_mask=*/false);
-                        if (libiomp_try_restoring_original_mask() == 0) {
-                            // Now we have the right mask to capture, restored by libiomp.
-                            const int curMaskSize = BasicMaskSize * numMasks;
-                            std::memset(processMask, 0, curMaskSize);
-                            get_thread_affinity_mask(curMaskSize, processMask);
-                        } else
-                            affhelp.dismiss();// thread mask has not changed
-                        dynamic_unlink(libhandle);
-                        // Destructor of affinity_helper restores the thread mask (unless dismissed).
-                    }
+        // For better coexistence with libiomp which might have changed the mask already,
+        // check for its presence and ask it to restore the mask.
+        dynamic_link_handle libhandle;
+        if ( dynamic_link( "libiomp5.so", iompLinkTable, 1, &libhandle, DYNAMIC_LINK_GLOBAL ) ) {
+            // We have found the symbol provided by libiomp5 for restoring original thread affinity.
+            affinity_helper affhelp;
+            affhelp.protect_affinity_mask( /*restore_process_mask=*/false );
+            if ( libiomp_try_restoring_original_mask()==0 ) {
+                // Now we have the right mask to capture, restored by libiomp.
+                const int curMaskSize = BasicMaskSize * numMasks;
+                std::memset( processMask, 0, curMaskSize );
+                get_thread_affinity_mask( curMaskSize, processMask );
+            } else
+                affhelp.dismiss();  // thread mask has not changed
+            dynamic_unlink( libhandle );
+            // Destructor of affinity_helper restores the thread mask (unless dismissed).
+        }
 #endif
-                    for (int m = 0; availableProcs < maxProcs && m < numMasks; ++m) {
-                        for (std::size_t i = 0; (availableProcs < maxProcs) && (i < BasicMaskSize * CHAR_BIT);
-                             ++i) {
-                            if (CPU_ISSET(i, processMask + m)) ++availableProcs;
-                        }
-                    }
-                    process_mask = processMask;
-                } else {
-                    // Failed to get the process affinity mask; assume the whole machine can be used.
-                    availableProcs = (maxProcs == INT_MAX) ? sysconf(_SC_NPROCESSORS_ONLN) : maxProcs;
-                    delete[] processMask;
-                }
-                theNumProcs = availableProcs > 0 ? availableProcs : 1;// Fail safety strap
-                __TBB_ASSERT(theNumProcs <= sysconf(_SC_NPROCESSORS_ONLN), NULL);
-            }
-
-            int AvailableHwConcurrency() {
-                atomic_do_once(&initialize_hardware_concurrency_info, hardware_concurrency_info);
-                return theNumProcs;
+        for ( int m = 0; availableProcs < maxProcs && m < numMasks; ++m ) {
+            for ( std::size_t i = 0; (availableProcs < maxProcs) && (i < BasicMaskSize * CHAR_BIT); ++i ) {
+                if ( CPU_ISSET( i, processMask + m ) )
+                    ++availableProcs;
             }
+        }
+        process_mask = processMask;
+    }
+    else {
+        // Failed to get the process affinity mask; assume the whole machine can be used.
+        availableProcs = (maxProcs == INT_MAX) ? sysconf(_SC_NPROCESSORS_ONLN) : maxProcs;
+        delete[] processMask;
+    }
+    theNumProcs = availableProcs > 0 ? availableProcs : 1; // Fail safety strap
+    __TBB_ASSERT( theNumProcs <= sysconf(_SC_NPROCESSORS_ONLN), nullptr);
+}
+
+int AvailableHwConcurrency() {
+    atomic_do_once( &initialize_hardware_concurrency_info, hardware_concurrency_info );
+    return theNumProcs;
+}
 
 /* End of __TBB_USE_OS_AFFINITY_SYSCALL implementation */
 #elif __ANDROID__
 
-            // Work-around for Android that reads the correct number of available CPUs since system calls are unreliable.
-            // Format of "present" file is: ([<int>-<int>|<int>],)+
-            int AvailableHwConcurrency() {
-                FILE *fp = fopen("/sys/devices/system/cpu/present", "r");
-                if (fp == NULL) return 1;
-                int num_args, lower, upper, num_cpus = 0;
-                while ((num_args = fscanf(fp, "%u-%u", &lower, &upper)) != EOF) {
-                    switch (num_args) {
-                        case 2:
-                            num_cpus += upper - lower + 1;
-                            break;
-                        case 1:
-                            num_cpus += 1;
-                            break;
-                    }
-                    fscanf(fp, ",");
-                }
-                return (num_cpus > 0) ? num_cpus : 1;
-            }
+// Work-around for Android that reads the correct number of available CPUs since system calls are unreliable.
+// Format of "present" file is: ([<int>-<int>|<int>],)+
+int AvailableHwConcurrency() {
+    FILE *fp = fopen("/sys/devices/system/cpu/present", "r");
+    if (fp == nullptr) return 1;
+    int num_args, lower, upper, num_cpus=0;
+    while ((num_args = fscanf(fp, "%u-%u", &lower, &upper)) != EOF) {
+        switch(num_args) {
+            case 2: num_cpus += upper - lower + 1; break;
+            case 1: num_cpus += 1; break;
+        }
+        fscanf(fp, ",");
+    }
+    fclose(fp);
+    return (num_cpus > 0) ? num_cpus : 1;
+}
 
 #elif defined(_SC_NPROCESSORS_ONLN)
 
-            int AvailableHwConcurrency() {
-                int n = sysconf(_SC_NPROCESSORS_ONLN);
-                return (n > 0) ? n : 1;
-            }
+int AvailableHwConcurrency() {
+    int n = sysconf(_SC_NPROCESSORS_ONLN);
+    return (n > 0) ? n : 1;
+}
 
-#elif _WIN32 || _WIN64
+#elif _WIN32||_WIN64
 
-            static std::atomic<do_once_state> hardware_concurrency_info;
+static std::atomic<do_once_state> hardware_concurrency_info;
 
-            static const WORD TBB_ALL_PROCESSOR_GROUPS = 0xffff;
+static const WORD TBB_ALL_PROCESSOR_GROUPS = 0xffff;
 
-            // Statically allocate an array for processor group information.
-            // Windows 7 supports maximum 4 groups, but let's look ahead a little.
-            static const WORD MaxProcessorGroups = 64;
+// Statically allocate an array for processor group information.
+// Windows 7 supports maximum 4 groups, but let's look ahead a little.
+static const WORD MaxProcessorGroups = 64;
 
-            struct ProcessorGroupInfo {
-                DWORD_PTR mask;          ///< Affinity mask covering the whole group
-                int numProcs;            ///< Number of processors in the group
-                int numProcsRunningTotal;///< Subtotal of processors in this and preceding groups
+struct ProcessorGroupInfo {
+    DWORD_PTR   mask;                   ///< Affinity mask covering the whole group
+    int         numProcs;               ///< Number of processors in the group
+    int         numProcsRunningTotal;   ///< Subtotal of processors in this and preceding groups
 
-                //! Total number of processor groups in the system
-                static int NumGroups;
+    //! Total number of processor groups in the system
+    static int NumGroups;
 
-                //! Index of the group with a slot reserved for the first external thread
-                /** In the context of multiple processor groups support current implementation
+    //! Index of the group with a slot reserved for the first external thread
+    /** In the context of multiple processor groups support current implementation
         defines "the first external thread" as the first thread to invoke
         AvailableHwConcurrency().
 
         TODO:   Implement a dynamic scheme remapping workers depending on the pending
                 external threads affinity. **/
-                static int HoleIndex;
-            };
-
-            int ProcessorGroupInfo::NumGroups = 1;
-            int ProcessorGroupInfo::HoleIndex = 0;
-
-            ProcessorGroupInfo theProcessorGroups[MaxProcessorGroups];
-
-            struct TBB_GROUP_AFFINITY {
-                DWORD_PTR Mask;
-                WORD Group;
-                WORD Reserved[3];
-            };
-
-            static DWORD(WINAPI *TBB_GetActiveProcessorCount)(WORD groupIndex) = NULL;
-            static WORD(WINAPI *TBB_GetActiveProcessorGroupCount)() = NULL;
-            static BOOL(WINAPI *TBB_SetThreadGroupAffinity)(HANDLE hThread, const TBB_GROUP_AFFINITY *newAff,
-                                                            TBB_GROUP_AFFINITY *prevAff);
-            static BOOL(WINAPI *TBB_GetThreadGroupAffinity)(HANDLE hThread, TBB_GROUP_AFFINITY *);
-
-            static const dynamic_link_descriptor ProcessorGroupsApiLinkTable[]
-                    = {DLD(GetActiveProcessorCount, TBB_GetActiveProcessorCount),
-                       DLD(GetActiveProcessorGroupCount, TBB_GetActiveProcessorGroupCount),
-                       DLD(SetThreadGroupAffinity, TBB_SetThreadGroupAffinity),
-                       DLD(GetThreadGroupAffinity, TBB_GetThreadGroupAffinity)};
-
-            static void initialize_hardware_concurrency_info() {
-                suppress_unused_warning(TBB_ALL_PROCESSOR_GROUPS);
+    static int HoleIndex;
+};
+
+int ProcessorGroupInfo::NumGroups = 1;
+int ProcessorGroupInfo::HoleIndex = 0;
+
+ProcessorGroupInfo theProcessorGroups[MaxProcessorGroups];
+int calculate_numa[MaxProcessorGroups];  //Array needed for FindProcessorGroupIndex to calculate Processor Group when number of threads > number of cores to distribute threads evenly between processor groups
+int numaSum;
+struct TBB_GROUP_AFFINITY {
+    DWORD_PTR Mask;
+    WORD   Group;
+    WORD   Reserved[3];
+};
+
+static DWORD (WINAPI *TBB_GetActiveProcessorCount)( WORD groupIndex ) = nullptr;
+static WORD (WINAPI *TBB_GetActiveProcessorGroupCount)() = nullptr;
+static BOOL (WINAPI *TBB_SetThreadGroupAffinity)( HANDLE hThread,
+                        const TBB_GROUP_AFFINITY* newAff, TBB_GROUP_AFFINITY *prevAff );
+static BOOL (WINAPI *TBB_GetThreadGroupAffinity)( HANDLE hThread, TBB_GROUP_AFFINITY* );
+
+static const dynamic_link_descriptor ProcessorGroupsApiLinkTable[] = {
+      DLD(GetActiveProcessorCount, TBB_GetActiveProcessorCount)
+    , DLD(GetActiveProcessorGroupCount, TBB_GetActiveProcessorGroupCount)
+    , DLD(SetThreadGroupAffinity, TBB_SetThreadGroupAffinity)
+    , DLD(GetThreadGroupAffinity, TBB_GetThreadGroupAffinity)
+};
+
+static void initialize_hardware_concurrency_info () {
+    suppress_unused_warning(TBB_ALL_PROCESSOR_GROUPS);
 #if __TBB_WIN8UI_SUPPORT
-                // For these applications processor groups info is unavailable
-                // Setting up a number of processors for one processor group
-                theProcessorGroups[0].numProcs = theProcessorGroups[0].numProcsRunningTotal
-                        = std::thread::hardware_concurrency();
-#else  /* __TBB_WIN8UI_SUPPORT */
-                dynamic_link("Kernel32.dll", ProcessorGroupsApiLinkTable,
-                             sizeof(ProcessorGroupsApiLinkTable) / sizeof(dynamic_link_descriptor));
-                SYSTEM_INFO si;
-                GetNativeSystemInfo(&si);
-                DWORD_PTR pam, sam, m = 1;
-                GetProcessAffinityMask(GetCurrentProcess(), &pam, &sam);
-                int nproc = 0;
-                for (std::size_t i = 0; i < sizeof(DWORD_PTR) * CHAR_BIT; ++i, m <<= 1) {
-                    if (pam & m) ++nproc;
-                }
-                __TBB_ASSERT(nproc <= (int) si.dwNumberOfProcessors, NULL);
-                // By default setting up a number of processors for one processor group
-                theProcessorGroups[0].numProcs = theProcessorGroups[0].numProcsRunningTotal = nproc;
-                // Setting up processor groups in case the process does not restrict affinity mask and more than one processor group is present
-                if (nproc == (int) si.dwNumberOfProcessors && TBB_GetActiveProcessorCount) {
-                    // The process does not have restricting affinity mask and multiple processor groups are possible
-                    ProcessorGroupInfo::NumGroups = (int) TBB_GetActiveProcessorGroupCount();
-                    __TBB_ASSERT(ProcessorGroupInfo::NumGroups <= MaxProcessorGroups, NULL);
-                    // Fail safety bootstrap. Release versions will limit available concurrency
-                    // level, while debug ones would assert.
-                    if (ProcessorGroupInfo::NumGroups > MaxProcessorGroups)
-                        ProcessorGroupInfo::NumGroups = MaxProcessorGroups;
-                    if (ProcessorGroupInfo::NumGroups > 1) {
-                        TBB_GROUP_AFFINITY ga;
-                        if (TBB_GetThreadGroupAffinity(GetCurrentThread(), &ga))
-                            ProcessorGroupInfo::HoleIndex = ga.Group;
-                        int nprocs = 0;
-                        for (WORD i = 0; i < ProcessorGroupInfo::NumGroups; ++i) {
-                            ProcessorGroupInfo &pgi = theProcessorGroups[i];
-                            pgi.numProcs = (int) TBB_GetActiveProcessorCount(i);
-                            __TBB_ASSERT(pgi.numProcs <= (int) sizeof(DWORD_PTR) * CHAR_BIT, NULL);
-                            pgi.mask = pgi.numProcs == sizeof(DWORD_PTR) * CHAR_BIT
-                                               ? ~(DWORD_PTR) 0
-                                               : (DWORD_PTR(1) << pgi.numProcs) - 1;
-                            pgi.numProcsRunningTotal = nprocs += pgi.numProcs;
-                        }
-                        __TBB_ASSERT(nprocs == (int) TBB_GetActiveProcessorCount(TBB_ALL_PROCESSOR_GROUPS),
-                                     NULL);
-                    }
-                }
-#endif /* __TBB_WIN8UI_SUPPORT */
-
-                PrintExtraVersionInfo("Processor groups", "%d", ProcessorGroupInfo::NumGroups);
-                if (ProcessorGroupInfo::NumGroups > 1)
-                    for (int i = 0; i < ProcessorGroupInfo::NumGroups; ++i)
-                        PrintExtraVersionInfo("----- Group", "%d: size %d", i,
-                                              theProcessorGroups[i].numProcs);
+    // For these applications processor groups info is unavailable
+    // Setting up a number of processors for one processor group
+    theProcessorGroups[0].numProcs = theProcessorGroups[0].numProcsRunningTotal = std::thread::hardware_concurrency();
+#else /* __TBB_WIN8UI_SUPPORT */
+    dynamic_link( "Kernel32.dll", ProcessorGroupsApiLinkTable,
+                  sizeof(ProcessorGroupsApiLinkTable)/sizeof(dynamic_link_descriptor) );
+    SYSTEM_INFO si;
+    GetNativeSystemInfo(&si);
+    DWORD_PTR pam, sam, m = 1;
+    GetProcessAffinityMask( GetCurrentProcess(), &pam, &sam );
+    int nproc = 0;
+    for ( std::size_t i = 0; i < sizeof(DWORD_PTR) * CHAR_BIT; ++i, m <<= 1 ) {
+        if ( pam & m )
+            ++nproc;
+    }
+    int number_of_processors = (int)si.dwNumberOfProcessors;
+    if (nproc > number_of_processors && TBB_GetThreadGroupAffinity) {
+        // Sometimes on systems with multiple processor groups GetNativeSystemInfo
+        // reports mask and processor count from the parent process
+        TBB_GROUP_AFFINITY ga;
+        if (TBB_GetThreadGroupAffinity(GetCurrentThread(), &ga)) {
+            number_of_processors = (int)TBB_GetActiveProcessorCount(ga.Group);
+        }
+    }
+
+    __TBB_ASSERT( nproc <= number_of_processors, nullptr);
+    // By default setting up a number of processors for one processor group
+    theProcessorGroups[0].numProcs = theProcessorGroups[0].numProcsRunningTotal = nproc;
+    // Setting up processor groups in case the process does not restrict affinity mask and more than one processor group is present
+    if ( nproc == number_of_processors && TBB_GetActiveProcessorCount ) {
+        // The process does not have restricting affinity mask and multiple processor groups are possible
+        ProcessorGroupInfo::NumGroups = (int)TBB_GetActiveProcessorGroupCount();
+        __TBB_ASSERT( ProcessorGroupInfo::NumGroups <= MaxProcessorGroups, nullptr);
+        // Fail safety bootstrap. Release versions will limit available concurrency
+        // level, while debug ones would assert.
+        if ( ProcessorGroupInfo::NumGroups > MaxProcessorGroups )
+            ProcessorGroupInfo::NumGroups = MaxProcessorGroups;
+        if ( ProcessorGroupInfo::NumGroups > 1 ) {
+            TBB_GROUP_AFFINITY ga;
+            if ( TBB_GetThreadGroupAffinity( GetCurrentThread(), &ga ) )
+                ProcessorGroupInfo::HoleIndex = ga.Group;
+            int nprocs = 0;
+            int min_procs = INT_MAX;
+            for ( WORD i = 0; i < ProcessorGroupInfo::NumGroups; ++i ) {
+                ProcessorGroupInfo  &pgi = theProcessorGroups[i];
+                pgi.numProcs = (int)TBB_GetActiveProcessorCount(i);
+                if (pgi.numProcs < min_procs) min_procs = pgi.numProcs;  //Finding the minimum number of processors in the Processor Groups
+                calculate_numa[i] = pgi.numProcs;
+                __TBB_ASSERT( pgi.numProcs <= (int)sizeof(DWORD_PTR) * CHAR_BIT, nullptr);
+                pgi.mask = pgi.numProcs == sizeof(DWORD_PTR) * CHAR_BIT ? ~(DWORD_PTR)0 : (DWORD_PTR(1) << pgi.numProcs) - 1;
+                pgi.numProcsRunningTotal = nprocs += pgi.numProcs;
             }
+            __TBB_ASSERT( nprocs == (int)TBB_GetActiveProcessorCount( TBB_ALL_PROCESSOR_GROUPS ), nullptr);
 
-            int NumberOfProcessorGroups() {
-                __TBB_ASSERT(hardware_concurrency_info == do_once_state::initialized,
-                             "NumberOfProcessorGroups is used before AvailableHwConcurrency");
-                return ProcessorGroupInfo::NumGroups;
+            calculate_numa[0] = (calculate_numa[0] / min_procs)-1;
+            for (WORD i = 1; i < ProcessorGroupInfo::NumGroups; ++i) {
+                calculate_numa[i] = calculate_numa[i-1] + (calculate_numa[i] / min_procs);
             }
 
-// Offset for the slot reserved for the first external thread
-#define HoleAdjusted(procIdx, grpIdx) (procIdx + (holeIdx <= grpIdx))
-
-            int FindProcessorGroupIndex(int procIdx) {
-                // In case of oversubscription spread extra workers in a round robin manner
-                int holeIdx;
-                const int numProcs
-                        = theProcessorGroups[ProcessorGroupInfo::NumGroups - 1].numProcsRunningTotal;
-                if (procIdx >= numProcs - 1) {
-                    holeIdx = INT_MAX;
-                    procIdx = (procIdx - numProcs + 1) % numProcs;
-                } else
-                    holeIdx = ProcessorGroupInfo::HoleIndex;
-                __TBB_ASSERT(hardware_concurrency_info == do_once_state::initialized,
-                             "FindProcessorGroupIndex is used before AvailableHwConcurrency");
-                // Approximate the likely group index assuming all groups are of the same size
-                int i = procIdx / theProcessorGroups[0].numProcs;
-                // Make sure the approximation is a valid group index
-                if (i >= ProcessorGroupInfo::NumGroups) i = ProcessorGroupInfo::NumGroups - 1;
-                // Now adjust the approximation up or down
-                if (theProcessorGroups[i].numProcsRunningTotal > HoleAdjusted(procIdx, i)) {
-                    while (theProcessorGroups[i].numProcsRunningTotal - theProcessorGroups[i].numProcs
-                           > HoleAdjusted(procIdx, i)) {
-                        __TBB_ASSERT(i > 0, NULL);
-                        --i;
-                    }
-                } else {
-                    do {
-                        ++i;
-                    } while (theProcessorGroups[i].numProcsRunningTotal <= HoleAdjusted(procIdx, i));
-                }
-                __TBB_ASSERT(i < ProcessorGroupInfo::NumGroups, NULL);
-                return i;
-            }
+            numaSum = calculate_numa[ProcessorGroupInfo::NumGroups - 1];
 
-            void MoveThreadIntoProcessorGroup(void *hThread, int groupIndex) {
-                __TBB_ASSERT(hardware_concurrency_info == do_once_state::initialized,
-                             "MoveThreadIntoProcessorGroup is used before AvailableHwConcurrency");
-                if (!TBB_SetThreadGroupAffinity) return;
-                TBB_GROUP_AFFINITY ga = {theProcessorGroups[groupIndex].mask, (WORD) groupIndex, {0, 0, 0}};
-                TBB_SetThreadGroupAffinity(hThread, &ga, NULL);
-            }
+        }
 
-            int AvailableHwConcurrency() {
-                atomic_do_once(&initialize_hardware_concurrency_info, hardware_concurrency_info);
-                return theProcessorGroups[ProcessorGroupInfo::NumGroups - 1].numProcsRunningTotal;
-            }
+    }
+#endif /* __TBB_WIN8UI_SUPPORT */
+
+    PrintExtraVersionInfo("Processor groups", "%d", ProcessorGroupInfo::NumGroups);
+    if (ProcessorGroupInfo::NumGroups>1)
+        for (int i=0; i<ProcessorGroupInfo::NumGroups; ++i)
+            PrintExtraVersionInfo( "----- Group", "%d: size %d", i, theProcessorGroups[i].numProcs);
+}
+
+int NumberOfProcessorGroups() {
+    __TBB_ASSERT( hardware_concurrency_info == do_once_state::initialized, "NumberOfProcessorGroups is used before AvailableHwConcurrency" );
+    return ProcessorGroupInfo::NumGroups;
+}
+
+int FindProcessorGroupIndex ( int procIdx ) {
+    int current_grp_idx = ProcessorGroupInfo::HoleIndex;
+    if (procIdx >= theProcessorGroups[current_grp_idx].numProcs  && procIdx < theProcessorGroups[ProcessorGroupInfo::NumGroups - 1].numProcsRunningTotal) {
+        procIdx = procIdx - theProcessorGroups[current_grp_idx].numProcs;
+        do {
+            current_grp_idx = (current_grp_idx + 1) % (ProcessorGroupInfo::NumGroups);
+            procIdx = procIdx - theProcessorGroups[current_grp_idx].numProcs;
+
+        } while (procIdx >= 0);
+    }
+    else if (procIdx >= theProcessorGroups[ProcessorGroupInfo::NumGroups - 1].numProcsRunningTotal) {
+        int temp_grp_index = 0;
+        procIdx = procIdx - theProcessorGroups[ProcessorGroupInfo::NumGroups - 1].numProcsRunningTotal; 
+        procIdx = procIdx % (numaSum+1);  //ProcIdx to stay between 0 and numaSum
+
+        while (procIdx - calculate_numa[temp_grp_index] > 0) {
+            temp_grp_index = (temp_grp_index + 1) % ProcessorGroupInfo::NumGroups;
+        }
+        current_grp_idx = temp_grp_index;
+    }
+    __TBB_ASSERT(current_grp_idx < ProcessorGroupInfo::NumGroups, nullptr);
+
+    return current_grp_idx;
+}
+
+void MoveThreadIntoProcessorGroup( void* hThread, int groupIndex ) {
+    __TBB_ASSERT( hardware_concurrency_info == do_once_state::initialized, "MoveThreadIntoProcessorGroup is used before AvailableHwConcurrency" );
+    if ( !TBB_SetThreadGroupAffinity )
+        return;
+    TBB_GROUP_AFFINITY ga = { theProcessorGroups[groupIndex].mask, (WORD)groupIndex, {0,0,0} };
+    TBB_SetThreadGroupAffinity( hThread, &ga, nullptr);
+}
+
+int AvailableHwConcurrency() {
+    atomic_do_once( &initialize_hardware_concurrency_info, hardware_concurrency_info );
+    return theProcessorGroups[ProcessorGroupInfo::NumGroups - 1].numProcsRunningTotal;
+}
 
 /* End of _WIN32||_WIN64 implementation */
 #else
-#error AvailableHwConcurrency is not implemented for this OS
+    #error AvailableHwConcurrency is not implemented for this OS
 #endif
 
-        }// namespace r1
-    }    // namespace detail
-}// namespace tbb
+} // namespace r1
+} // namespace detail
+} // namespace tbb
 
 #endif /* !__TBB_HardwareConcurrency */
diff --git a/external/tbb/src/tbb/observer_proxy.cpp b/external/tbb/src/tbb/observer_proxy.cpp
index de994287..2717d740 100644
--- a/external/tbb/src/tbb/observer_proxy.cpp
+++ b/external/tbb/src/tbb/observer_proxy.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -17,298 +17,303 @@
 #include "oneapi/tbb/detail/_config.h"
 #include "oneapi/tbb/detail/_utils.h"
 
+#include "observer_proxy.h"
 #include "arena.h"
 #include "main.h"
-#include "observer_proxy.h"
 #include "thread_data.h"
 
 #include <atomic>
 
 namespace tbb {
-    namespace detail {
-        namespace r1 {
+namespace detail {
+namespace r1 {
 
 #if TBB_USE_ASSERT
-            extern std::atomic<int> the_observer_proxy_count;
+extern std::atomic<int> the_observer_proxy_count;
 #endif /* TBB_USE_ASSERT */
 
-            observer_proxy::observer_proxy(d1::task_scheduler_observer& tso)
-                : my_ref_count(1), my_list(NULL), my_next(NULL), my_prev(NULL), my_observer(&tso) {
+observer_proxy::observer_proxy( d1::task_scheduler_observer& tso )
+    : my_ref_count(1), my_list(nullptr), my_next(nullptr), my_prev(nullptr), my_observer(&tso)
+{
 #if TBB_USE_ASSERT
-                ++the_observer_proxy_count;
+    ++the_observer_proxy_count;
 #endif /* TBB_USE_ASSERT */
-            }
+}
 
-            observer_proxy::~observer_proxy() {
-                __TBB_ASSERT(!my_ref_count, "Attempt to destroy proxy still in use");
-                poison_value(my_ref_count);
-                poison_pointer(my_prev);
-                poison_pointer(my_next);
+observer_proxy::~observer_proxy() {
+    __TBB_ASSERT( !my_ref_count, "Attempt to destroy proxy still in use" );
+    poison_value(my_ref_count);
+    poison_pointer(my_prev);
+    poison_pointer(my_next);
 #if TBB_USE_ASSERT
-                --the_observer_proxy_count;
+    --the_observer_proxy_count;
 #endif /* TBB_USE_ASSERT */
-            }
-
-            void observer_list::clear() {
-                {
-                    scoped_lock lock(mutex(), /*is_writer=*/true);
-                    observer_proxy* next = my_head.load(std::memory_order_relaxed);
-                    while (observer_proxy* p = next) {
-                        next = p->my_next;
-                        // Both proxy p and observer p->my_observer (if non-null) are guaranteed
-                        // to be alive while the list is locked.
-                        d1::task_scheduler_observer* obs = p->my_observer;
-                        // Make sure that possible concurrent observer destruction does not
-                        // conflict with the proxy list cleanup.
-                        if (!obs || !(p = obs->my_proxy.exchange(nullptr))) { continue; }
-                        // accessing 'obs' after detaching of obs->my_proxy leads to the race with observer destruction
-                        __TBB_ASSERT(!next || p == next->my_prev, nullptr);
-                        __TBB_ASSERT(is_alive(p->my_ref_count), "Observer's proxy died prematurely");
-                        __TBB_ASSERT(p->my_ref_count.load(std::memory_order_relaxed) == 1,
-                                     "Reference for observer is missing");
-                        poison_pointer(p->my_observer);
-                        remove(p);
-                        --p->my_ref_count;
-                        delete p;
-                    }
-                }
-
-                // If observe(false) is called concurrently with the destruction of the arena,
-                // need to wait until all proxies are removed.
-                for (atomic_backoff backoff;; backoff.pause()) {
-                    scoped_lock lock(mutex(), /*is_writer=*/false);
-                    if (my_head.load(std::memory_order_relaxed) == nullptr) { break; }
-                }
-
-                __TBB_ASSERT(my_head.load(std::memory_order_relaxed) == nullptr
-                                     && my_tail.load(std::memory_order_relaxed) == nullptr,
-                             nullptr);
-            }
+}
 
-            void observer_list::insert(observer_proxy* p) {
-                scoped_lock lock(mutex(), /*is_writer=*/true);
-                if (my_head.load(std::memory_order_relaxed)) {
-                    p->my_prev = my_tail.load(std::memory_order_relaxed);
-                    my_tail.load(std::memory_order_relaxed)->my_next = p;
-                } else {
-                    my_head.store(p, std::memory_order_relaxed);
-                }
-                my_tail.store(p, std::memory_order_relaxed);
+void observer_list::clear() {
+    {
+        scoped_lock lock(mutex(), /*is_writer=*/true);
+        observer_proxy *next = my_head.load(std::memory_order_relaxed);
+        while ( observer_proxy *p = next ) {
+            next = p->my_next;
+            // Both proxy p and observer p->my_observer (if non-null) are guaranteed
+            // to be alive while the list is locked.
+            d1::task_scheduler_observer *obs = p->my_observer;
+            // Make sure that possible concurrent observer destruction does not
+            // conflict with the proxy list cleanup.
+            if (!obs || !(p = obs->my_proxy.exchange(nullptr))) {
+                continue;
             }
+            // accessing 'obs' after detaching of obs->my_proxy leads to the race with observer destruction
+            __TBB_ASSERT(!next || p == next->my_prev, nullptr);
+            __TBB_ASSERT(is_alive(p->my_ref_count), "Observer's proxy died prematurely");
+            __TBB_ASSERT(p->my_ref_count.load(std::memory_order_relaxed) == 1, "Reference for observer is missing");
+            poison_pointer(p->my_observer);
+            remove(p);
+            --p->my_ref_count;
+            delete p;
+        }
+    }
 
-            void observer_list::remove(observer_proxy* p) {
-                __TBB_ASSERT(my_head.load(std::memory_order_relaxed),
-                             "Attempt to remove an item from an empty list");
-                __TBB_ASSERT(!my_tail.load(std::memory_order_relaxed)->my_next,
-                             "Last item's my_next must be NULL");
-                if (p == my_tail.load(std::memory_order_relaxed)) {
-                    __TBB_ASSERT(!p->my_next, nullptr);
-                    my_tail.store(p->my_prev, std::memory_order_relaxed);
-                } else {
-                    __TBB_ASSERT(p->my_next, nullptr);
-                    p->my_next->my_prev = p->my_prev;
-                }
-                if (p == my_head.load(std::memory_order_relaxed)) {
-                    __TBB_ASSERT(!p->my_prev, nullptr);
-                    my_head.store(p->my_next, std::memory_order_relaxed);
-                } else {
-                    __TBB_ASSERT(p->my_prev, nullptr);
-                    p->my_prev->my_next = p->my_next;
-                }
-                __TBB_ASSERT(
-                        (my_head.load(std::memory_order_relaxed) && my_tail.load(std::memory_order_relaxed))
-                                || (!my_head.load(std::memory_order_relaxed)
-                                    && !my_tail.load(std::memory_order_relaxed)),
-                        nullptr);
-            }
+    // If observe(false) is called concurrently with the destruction of the arena,
+    // need to wait until all proxies are removed.
+    for (atomic_backoff backoff; ; backoff.pause()) {
+        scoped_lock lock(mutex(), /*is_writer=*/false);
+        if (my_head.load(std::memory_order_relaxed) == nullptr) {
+            break;
+        }
+    }
 
-            void observer_list::remove_ref(observer_proxy* p) {
-                std::uintptr_t r = p->my_ref_count.load(std::memory_order_acquire);
-                __TBB_ASSERT(is_alive(r), nullptr);
-                while (r > 1) {
-                    if (p->my_ref_count.compare_exchange_strong(r, r - 1)) { return; }
-                }
-                __TBB_ASSERT(r == 1, nullptr);
-                // Reference count might go to zero
-                {
-                    // Use lock to avoid resurrection by a thread concurrently walking the list
-                    observer_list::scoped_lock lock(mutex(), /*is_writer=*/true);
-                    r = --p->my_ref_count;
-                    if (!r) { remove(p); }
-                }
-                __TBB_ASSERT(r || !p->my_ref_count, nullptr);
-                if (!r) { delete p; }
-            }
+    __TBB_ASSERT(my_head.load(std::memory_order_relaxed) == nullptr && my_tail.load(std::memory_order_relaxed) == nullptr, nullptr);
+}
 
-            void observer_list::do_notify_entry_observers(observer_proxy*& last, bool worker) {
-                // Pointer p marches though the list from last (exclusively) to the end.
-                observer_proxy *p = last, *prev = p;
-                for (;;) {
-                    d1::task_scheduler_observer* tso = nullptr;
-                    // Hold lock on list only long enough to advance to the next proxy in the list.
-                    {
-                        scoped_lock lock(mutex(), /*is_writer=*/false);
-                        do {
-                            if (p) {
-                                // We were already processing the list.
-                                if (observer_proxy* q = p->my_next) {
-                                    if (p == prev) {
-                                        remove_ref_fast(prev);// sets prev to NULL if successful
-                                    }
-                                    p = q;
-                                } else {
-                                    // Reached the end of the list.
-                                    if (p == prev) {
-                                        // Keep the reference as we store the 'last' pointer in scheduler
-                                        __TBB_ASSERT(int(p->my_ref_count.load(std::memory_order_relaxed))
-                                                             >= 1 + (p->my_observer ? 1 : 0),
-                                                     nullptr);
-                                    } else {
-                                        // The last few proxies were empty
-                                        __TBB_ASSERT(int(p->my_ref_count.load(std::memory_order_relaxed)),
-                                                     nullptr);
-                                        ++p->my_ref_count;
-                                        if (prev) {
-                                            lock.release();
-                                            remove_ref(prev);
-                                        }
-                                    }
-                                    last = p;
-                                    return;
-                                }
-                            } else {
-                                // Starting pass through the list
-                                p = my_head.load(std::memory_order_relaxed);
-                                if (!p) { return; }
-                            }
-                            tso = p->my_observer;
-                        } while (!tso);
-                        ++p->my_ref_count;
-                        ++tso->my_busy_count;
-                    }
-                    __TBB_ASSERT(!prev || p != prev, nullptr);
-                    // Release the proxy pinned before p
-                    if (prev) { remove_ref(prev); }
-                    // Do not hold any locks on the list while calling user's code.
-                    // Do not intercept any exceptions that may escape the callback so that
-                    // they are either handled by the TBB scheduler or passed to the debugger.
-                    tso->on_scheduler_entry(worker);
-                    __TBB_ASSERT(p->my_ref_count.load(std::memory_order_relaxed), nullptr);
-                    intptr_t bc = --tso->my_busy_count;
-                    __TBB_ASSERT_EX(bc >= 0, "my_busy_count underflowed");
-                    prev = p;
-                }
-            }
+void observer_list::insert( observer_proxy* p ) {
+    scoped_lock lock(mutex(), /*is_writer=*/true);
+    if (my_head.load(std::memory_order_relaxed)) {
+        p->my_prev = my_tail.load(std::memory_order_relaxed);
+        my_tail.load(std::memory_order_relaxed)->my_next = p;
+    } else {
+        my_head.store(p, std::memory_order_relaxed);
+    }
+    my_tail.store(p, std::memory_order_relaxed);
+}
 
-            void observer_list::do_notify_exit_observers(observer_proxy* last, bool worker) {
-                // Pointer p marches though the list from the beginning to last (inclusively).
-                observer_proxy *p = nullptr, *prev = nullptr;
-                for (;;) {
-                    d1::task_scheduler_observer* tso = nullptr;
-                    // Hold lock on list only long enough to advance to the next proxy in the list.
-                    {
-                        scoped_lock lock(mutex(), /*is_writer=*/false);
-                        do {
-                            if (p) {
-                                // We were already processing the list.
-                                if (p != last) {
-                                    __TBB_ASSERT(p->my_next,
-                                                 "List items before 'last' must have valid my_next pointer");
-                                    if (p == prev) remove_ref_fast(prev);// sets prev to NULL if successful
-                                    p = p->my_next;
-                                } else {
-                                    // remove the reference from the last item
-                                    remove_ref_fast(p);
-                                    if (p) {
-                                        lock.release();
-                                        if (p != prev && prev) { remove_ref(prev); }
-                                        remove_ref(p);
-                                    }
-                                    return;
-                                }
-                            } else {
-                                // Starting pass through the list
-                                p = my_head.load(std::memory_order_relaxed);
-                                __TBB_ASSERT(
-                                        p, "Nonzero 'last' must guarantee that the global list is non-empty");
-                            }
-                            tso = p->my_observer;
-                        } while (!tso);
-                        // The item is already refcounted
-                        if (p != last)// the last is already referenced since entry notification
-                            ++p->my_ref_count;
-                        ++tso->my_busy_count;
-                    }
-                    __TBB_ASSERT(!prev || p != prev, nullptr);
-                    if (prev) remove_ref(prev);
-                    // Do not hold any locks on the list while calling user's code.
-                    // Do not intercept any exceptions that may escape the callback so that
-                    // they are either handled by the TBB scheduler or passed to the debugger.
-                    tso->on_scheduler_exit(worker);
-                    __TBB_ASSERT(p->my_ref_count || p == last, nullptr);
-                    intptr_t bc = --tso->my_busy_count;
-                    __TBB_ASSERT_EX(bc >= 0, "my_busy_count underflowed");
-                    prev = p;
-                }
-            }
+void observer_list::remove(observer_proxy* p) {
+    __TBB_ASSERT(my_head.load(std::memory_order_relaxed), "Attempt to remove an item from an empty list");
+    __TBB_ASSERT(!my_tail.load(std::memory_order_relaxed)->my_next, "Last item's my_next must be nullptr");
+    if (p == my_tail.load(std::memory_order_relaxed)) {
+        __TBB_ASSERT(!p->my_next, nullptr);
+        my_tail.store(p->my_prev, std::memory_order_relaxed);
+    } else {
+        __TBB_ASSERT(p->my_next, nullptr);
+        p->my_next->my_prev = p->my_prev;
+    }
+    if (p == my_head.load(std::memory_order_relaxed)) {
+        __TBB_ASSERT(!p->my_prev, nullptr);
+        my_head.store(p->my_next, std::memory_order_relaxed);
+    } else {
+        __TBB_ASSERT(p->my_prev, nullptr);
+        p->my_prev->my_next = p->my_next;
+    }
+    __TBB_ASSERT((my_head.load(std::memory_order_relaxed) && my_tail.load(std::memory_order_relaxed)) ||
+        (!my_head.load(std::memory_order_relaxed) && !my_tail.load(std::memory_order_relaxed)), nullptr);
+}
 
-            void __TBB_EXPORTED_FUNC observe(d1::task_scheduler_observer& tso, bool enable) {
-                if (enable) {
-                    if (!tso.my_proxy.load(std::memory_order_relaxed)) {
-                        observer_proxy* p = new observer_proxy(tso);
-                        tso.my_proxy.store(p, std::memory_order_relaxed);
-                        tso.my_busy_count.store(0, std::memory_order_relaxed);
+void observer_list::remove_ref(observer_proxy* p) {
+    std::uintptr_t r = p->my_ref_count.load(std::memory_order_acquire);
+    __TBB_ASSERT(is_alive(r), nullptr);
+    while (r > 1) {
+        if (p->my_ref_count.compare_exchange_strong(r, r - 1)) {
+            return;
+        }
+    }
+    __TBB_ASSERT(r == 1, nullptr);
+    // Reference count might go to zero
+    {
+        // Use lock to avoid resurrection by a thread concurrently walking the list
+        observer_list::scoped_lock lock(mutex(), /*is_writer=*/true);
+        r = --p->my_ref_count;
+        if (!r) {
+            remove(p);
+        }
+    }
+    __TBB_ASSERT(r || !p->my_ref_count, nullptr);
+    if (!r) {
+        delete p;
+    }
+}
 
-                        thread_data* td = governor::get_thread_data_if_initialized();
-                        if (p->my_observer->my_task_arena == nullptr) {
-                            if (!(td && td->my_arena)) { td = governor::get_thread_data(); }
-                            __TBB_ASSERT(__TBB_InitOnce::initialization_done(), nullptr);
-                            __TBB_ASSERT(td && td->my_arena, nullptr);
-                            p->my_list = &td->my_arena->my_observers;
+void observer_list::do_notify_entry_observers(observer_proxy*& last, bool worker) {
+    // Pointer p marches though the list from last (exclusively) to the end.
+    observer_proxy* p = last, * prev = p;
+    for (;;) {
+        d1::task_scheduler_observer* tso = nullptr;
+        // Hold lock on list only long enough to advance to the next proxy in the list.
+        {
+            scoped_lock lock(mutex(), /*is_writer=*/false);
+            do {
+                if (p) {
+                    // We were already processing the list.
+                    if (observer_proxy* q = p->my_next) {
+                        if (p == prev) {
+                            remove_ref_fast(prev); // sets prev to nullptr if successful
+                        }
+                        p = q;
+                    } else {
+                        // Reached the end of the list.
+                        if (p == prev) {
+                            // Keep the reference as we store the 'last' pointer in scheduler
+                            __TBB_ASSERT(int(p->my_ref_count.load(std::memory_order_relaxed)) >= 1 + (p->my_observer ? 1 : 0), nullptr);
                         } else {
-                            d1::task_arena* ta = p->my_observer->my_task_arena;
-                            arena* a = ta->my_arena.load(std::memory_order_acquire);
-                            if (a == nullptr) {// Avoid recursion during arena initialization
-                                ta->initialize();
-                                a = ta->my_arena.load(std::memory_order_relaxed);
+                            // The last few proxies were empty
+                            __TBB_ASSERT(int(p->my_ref_count.load(std::memory_order_relaxed)), nullptr);
+                            ++p->my_ref_count;
+                            if (prev) {
+                                lock.release();
+                                remove_ref(prev);
                             }
-                            __TBB_ASSERT(a != nullptr, nullptr);
-                            p->my_list = &a->my_observers;
-                        }
-                        p->my_list->insert(p);
-                        // Notify newly activated observer and other pending ones if it belongs to current arena
-                        if (td && td->my_arena && &td->my_arena->my_observers == p->my_list) {
-                            p->my_list->notify_entry_observers(td->my_last_observer, td->my_is_worker);
                         }
+                        last = p;
+                        return;
                     }
                 } else {
-                    // Make sure that possible concurrent proxy list cleanup does not conflict
-                    // with the observer destruction here.
-                    if (observer_proxy* proxy = tso.my_proxy.exchange(nullptr)) {
-                        // List destruction should not touch this proxy after we've won the above interlocked exchange.
-                        __TBB_ASSERT(proxy->my_observer == &tso, nullptr);
-                        __TBB_ASSERT(is_alive(proxy->my_ref_count.load(std::memory_order_relaxed)),
-                                     "Observer's proxy died prematurely");
-                        __TBB_ASSERT(proxy->my_ref_count.load(std::memory_order_relaxed) >= 1,
-                                     "reference for observer missing");
-                        observer_list& list = *proxy->my_list;
-                        {
-                            // Ensure that none of the list walkers relies on observer pointer validity
-                            observer_list::scoped_lock lock(list.mutex(), /*is_writer=*/true);
-                            proxy->my_observer = nullptr;
-                            // Proxy may still be held by other threads (to track the last notified observer)
-                            if (!--proxy->my_ref_count) {// nobody can increase it under exclusive lock
-                                list.remove(proxy);
-                                __TBB_ASSERT(!proxy->my_ref_count, NULL);
-                                delete proxy;
+                    // Starting pass through the list
+                    p = my_head.load(std::memory_order_relaxed);
+                    if (!p) {
+                        return;
+                    }
+                }
+                tso = p->my_observer;
+            } while (!tso);
+            ++p->my_ref_count;
+            ++tso->my_busy_count;
+        }
+        __TBB_ASSERT(!prev || p != prev, nullptr);
+        // Release the proxy pinned before p
+        if (prev) {
+            remove_ref(prev);
+        }
+        // Do not hold any locks on the list while calling user's code.
+        // Do not intercept any exceptions that may escape the callback so that
+        // they are either handled by the TBB scheduler or passed to the debugger.
+        tso->on_scheduler_entry(worker);
+        __TBB_ASSERT(p->my_ref_count.load(std::memory_order_relaxed), nullptr);
+        intptr_t bc = --tso->my_busy_count;
+        __TBB_ASSERT_EX(bc >= 0, "my_busy_count underflowed");
+        prev = p;
+    }
+}
+
+void observer_list::do_notify_exit_observers(observer_proxy* last, bool worker) {
+    // Pointer p marches though the list from the beginning to last (inclusively).
+    observer_proxy* p = nullptr, * prev = nullptr;
+    for (;;) {
+        d1::task_scheduler_observer* tso = nullptr;
+        // Hold lock on list only long enough to advance to the next proxy in the list.
+        {
+            scoped_lock lock(mutex(), /*is_writer=*/false);
+            do {
+                if (p) {
+                    // We were already processing the list.
+                    if (p != last) {
+                        __TBB_ASSERT(p->my_next, "List items before 'last' must have valid my_next pointer");
+                        if (p == prev)
+                            remove_ref_fast(prev); // sets prev to nullptr if successful
+                        p = p->my_next;
+                    } else {
+                        // remove the reference from the last item
+                        remove_ref_fast(p);
+                        if (p) {
+                            lock.release();
+                            if (p != prev && prev) {
+                                remove_ref(prev);
                             }
+                            remove_ref(p);
                         }
-                        spin_wait_until_eq(tso.my_busy_count,
-                                           0);// other threads are still accessing the callback
+                        return;
                     }
+                } else {
+                    // Starting pass through the list
+                    p = my_head.load(std::memory_order_relaxed);
+                    __TBB_ASSERT(p, "Nonzero 'last' must guarantee that the global list is non-empty");
+                }
+                tso = p->my_observer;
+            } while (!tso);
+            // The item is already refcounted
+            if (p != last) // the last is already referenced since entry notification
+                ++p->my_ref_count;
+            ++tso->my_busy_count;
+        }
+        __TBB_ASSERT(!prev || p != prev, nullptr);
+        if (prev)
+            remove_ref(prev);
+        // Do not hold any locks on the list while calling user's code.
+        // Do not intercept any exceptions that may escape the callback so that
+        // they are either handled by the TBB scheduler or passed to the debugger.
+        tso->on_scheduler_exit(worker);
+        __TBB_ASSERT(p->my_ref_count || p == last, nullptr);
+        intptr_t bc = --tso->my_busy_count;
+        __TBB_ASSERT_EX(bc >= 0, "my_busy_count underflowed");
+        prev = p;
+    }
+}
+
+void __TBB_EXPORTED_FUNC observe(d1::task_scheduler_observer &tso, bool enable) {
+    if( enable ) {
+        if( !tso.my_proxy.load(std::memory_order_relaxed) ) {
+            observer_proxy* p = new observer_proxy(tso);
+            tso.my_proxy.store(p, std::memory_order_relaxed);
+            tso.my_busy_count.store(0, std::memory_order_relaxed);
+
+            thread_data* td = governor::get_thread_data_if_initialized();
+            if (p->my_observer->my_task_arena == nullptr) {
+                if (!(td && td->my_arena)) {
+                    td = governor::get_thread_data();
+                }
+                __TBB_ASSERT(__TBB_InitOnce::initialization_done(), nullptr);
+                __TBB_ASSERT(td && td->my_arena, nullptr);
+                p->my_list = &td->my_arena->my_observers;
+            } else {
+                d1::task_arena* ta = p->my_observer->my_task_arena;
+                arena* a = ta->my_arena.load(std::memory_order_acquire);
+                if (a == nullptr) { // Avoid recursion during arena initialization
+                    ta->initialize();
+                    a = ta->my_arena.load(std::memory_order_relaxed);
+                }
+                __TBB_ASSERT(a != nullptr, nullptr);
+                p->my_list = &a->my_observers;
+            }
+            p->my_list->insert(p);
+            // Notify newly activated observer and other pending ones if it belongs to current arena
+            if (td && td->my_arena && &td->my_arena->my_observers == p->my_list) {
+                p->my_list->notify_entry_observers(td->my_last_observer, td->my_is_worker);
+            }
+        }
+    } else {
+        // Make sure that possible concurrent proxy list cleanup does not conflict
+        // with the observer destruction here.
+        if ( observer_proxy* proxy = tso.my_proxy.exchange(nullptr) ) {
+            // List destruction should not touch this proxy after we've won the above interlocked exchange.
+            __TBB_ASSERT( proxy->my_observer == &tso, nullptr);
+            __TBB_ASSERT( is_alive(proxy->my_ref_count.load(std::memory_order_relaxed)), "Observer's proxy died prematurely" );
+            __TBB_ASSERT( proxy->my_ref_count.load(std::memory_order_relaxed) >= 1, "reference for observer missing" );
+            observer_list &list = *proxy->my_list;
+            {
+                // Ensure that none of the list walkers relies on observer pointer validity
+                observer_list::scoped_lock lock(list.mutex(), /*is_writer=*/true);
+                proxy->my_observer = nullptr;
+                // Proxy may still be held by other threads (to track the last notified observer)
+                if( !--proxy->my_ref_count ) {// nobody can increase it under exclusive lock
+                    list.remove(proxy);
+                    __TBB_ASSERT( !proxy->my_ref_count, nullptr);
+                    delete proxy;
                 }
             }
+            spin_wait_until_eq(tso.my_busy_count, 0); // other threads are still accessing the callback
+        }
+    }
+}
 
-        }// namespace r1
-    }    // namespace detail
-}// namespace tbb
+} // namespace r1
+} // namespace detail
+} // namespace tbb
diff --git a/external/tbb/src/tbb/observer_proxy.h b/external/tbb/src/tbb/observer_proxy.h
index 6a9b464a..0ca2839d 100644
--- a/external/tbb/src/tbb/observer_proxy.h
+++ b/external/tbb/src/tbb/observer_proxy.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -47,7 +47,7 @@ class observer_list {
     arena* my_arena;
 
     //! Decrement refcount of the proxy p if there are other outstanding references.
-    /** In case of success sets p to NULL. Must be invoked from under the list lock. **/
+    /** In case of success sets p to nullptr. Must be invoked from under the list lock. **/
     inline static void remove_ref_fast( observer_proxy*& p );
 
     //! Implements notify_entry_observers functionality.
@@ -104,7 +104,7 @@ class observer_proxy {
     //! Reference to the list this observer belongs to.
     observer_list* my_list;
     //! Pointer to next observer in the list specified by my_head.
-    /** NULL for the last item in the list. **/
+    /** nullptr for the last item in the list. **/
     observer_proxy* my_next;
     //! Pointer to the previous observer in the list specified by my_head.
     /** For the head of the list points to the last item. **/
@@ -122,8 +122,8 @@ void observer_list::remove_ref_fast( observer_proxy*& p ) {
     if( p->my_observer ) {
         // Can decrement refcount quickly, as it cannot drop to zero while under the lock.
         std::uintptr_t r = --p->my_ref_count;
-        __TBB_ASSERT_EX( r, NULL );
-        p = NULL;
+        __TBB_ASSERT_EX( r, nullptr);
+        p = nullptr;
     } else {
         // Use slow form of refcount decrementing, after the lock is released.
     }
@@ -139,9 +139,9 @@ void observer_list::notify_exit_observers( observer_proxy*& last, bool worker )
     if (last == nullptr) {
         return;
     }
-    __TBB_ASSERT(!is_poisoned(last), NULL);
+    __TBB_ASSERT(!is_poisoned(last), nullptr);
     do_notify_exit_observers( last, worker );
-    __TBB_ASSERT(last != nullptr, NULL);
+    __TBB_ASSERT(last != nullptr, nullptr);
     poison_pointer(last);
 }
 
diff --git a/external/tbb/src/tbb/parallel_pipeline.cpp b/external/tbb/src/tbb/parallel_pipeline.cpp
index f16dca89..bb8587b9 100644
--- a/external/tbb/src/tbb/parallel_pipeline.cpp
+++ b/external/tbb/src/tbb/parallel_pipeline.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -15,430 +15,457 @@
 */
 
 #include "oneapi/tbb/parallel_pipeline.h"
-#include "itt_notify.h"
-#include "oneapi/tbb/cache_aligned_allocator.h"
-#include "oneapi/tbb/detail/_exception.h"
-#include "oneapi/tbb/detail/_small_object_pool.h"
 #include "oneapi/tbb/spin_mutex.h"
 #include "oneapi/tbb/tbb_allocator.h"
+#include "oneapi/tbb/cache_aligned_allocator.h"
+#include "itt_notify.h"
 #include "tls.h"
+#include "oneapi/tbb/detail/_exception.h"
+#include "oneapi/tbb/detail/_small_object_pool.h"
 
 namespace tbb {
-    namespace detail {
-        namespace r1 {
-
-            void handle_perror(int error_code, const char* aux_info);
-
-            using Token = unsigned long;
-
-            //! A processing pipeline that applies filters to items.
-            /** @ingroup algorithms */
-            class pipeline {
-                friend void parallel_pipeline(d1::task_group_context&, std::size_t, const d1::filter_node&);
-
-            public:
-                //! Construct empty pipeline.
-                pipeline(d1::task_group_context& cxt, std::size_t max_token)
-                    : my_context(cxt), first_filter(nullptr), last_filter(nullptr),
-                      input_tokens(Token(max_token)), end_of_input(false), wait_ctx(0) {
-                    __TBB_ASSERT(max_token > 0, "pipeline::run must have at least one token");
-                }
-
-                ~pipeline();
-
-                //! Add filter to end of pipeline.
-                void add_filter(d1::base_filter&);
-
-                //! Traverse tree of fitler-node in-order and add filter for each leaf
-                void fill_pipeline(const d1::filter_node& root) {
-                    if (root.left && root.right) {
-                        fill_pipeline(*root.left);
-                        fill_pipeline(*root.right);
-                    } else {
-                        __TBB_ASSERT(!root.left && !root.right, "tree should be full");
-                        add_filter(*root.create_filter());
-                    }
-                }
-
-            private:
-                friend class stage_task;
-                friend class base_filter;
-                friend void set_end_of_input(d1::base_filter& bf);
-
-                task_group_context& my_context;
-
-                //! Pointer to first filter in the pipeline.
-                d1::base_filter* first_filter;
-
-                //! Pointer to last filter in the pipeline.
-                d1::base_filter* last_filter;
-
-                //! Number of idle tokens waiting for input stage.
-                std::atomic<Token> input_tokens;
-
-                //! False until flow_control::stop() is called.
-                std::atomic<bool> end_of_input;
-
-                d1::wait_context wait_ctx;
-            };
-
-            //! This structure is used to store task information in an input buffer
-            struct task_info {
-                void* my_object = nullptr;
-                //! Invalid unless a task went through an ordered stage.
-                Token my_token = 0;
-                //! False until my_token is set.
-                bool my_token_ready = false;
-                //! True if my_object is valid.
-                bool is_valid = false;
-                //! Set to initial state (no object, no token)
-                void reset() {
-                    my_object = nullptr;
-                    my_token = 0;
-                    my_token_ready = false;
-                    is_valid = false;
-                }
-            };
-
-            //! A buffer of input items for a filter.
-            /** Each item is a task_info, inserted into a position in the buffer corresponding to a Token. */
-            class input_buffer {
-                friend class base_filter;
-                friend class stage_task;
-                friend class pipeline;
-                friend void set_end_of_input(d1::base_filter& bf);
-
-                using size_type = Token;
-
-                //! Array of deferred tasks that cannot yet start executing.
-                task_info* array;
-
-                //! Size of array
-                /** Always 0 or a power of 2 */
-                size_type array_size;
-
-                //! Lowest token that can start executing.
-                /** All prior Token have already been seen. */
-                Token low_token;
-
-                //! Serializes updates.
-                spin_mutex array_mutex;
-
-                //! Resize "array".
-                /** Caller is responsible to acquiring a lock on "array_mutex". */
-                void grow(size_type minimum_size);
-
-                //! Initial size for "array"
-                /** Must be a power of 2 */
-                static const size_type initial_buffer_size = 4;
-
-                //! Used for out of order buffer, and for assigning my_token if is_ordered and my_token not already assigned
-                Token high_token;
-
-                //! True for ordered filter, false otherwise.
-                const bool is_ordered;
-
-                //! for parallel filters that accepts NULLs, thread-local flag for reaching end_of_input
-                using end_of_input_tls_t = basic_tls<input_buffer*>;
-                end_of_input_tls_t end_of_input_tls;
-                bool end_of_input_tls_allocated;// no way to test pthread creation of TLS
-
-            public:
-                input_buffer(const input_buffer&) = delete;
-                input_buffer& operator=(const input_buffer&) = delete;
-
-                //! Construct empty buffer.
-                input_buffer(bool ordered)
-                    : array(nullptr), array_size(0), low_token(0), high_token(0), is_ordered(ordered),
-                      end_of_input_tls(), end_of_input_tls_allocated(false) {
-                    grow(initial_buffer_size);
-                    __TBB_ASSERT(array, nullptr);
-                }
-
-                //! Destroy the buffer.
-                ~input_buffer() {
-                    __TBB_ASSERT(array, nullptr);
-                    cache_aligned_allocator<task_info>().deallocate(array, array_size);
-                    poison_pointer(array);
-                    if (end_of_input_tls_allocated) { destroy_my_tls(); }
-                }
-
-                //! Define order when the first filter is serial_in_order.
-                Token get_ordered_token() { return high_token++; }
-
-                //! Put a token into the buffer.
-                /** If task information was placed into buffer, returns true;
+namespace detail {
+namespace r1 {
+
+void handle_perror(int error_code, const char* aux_info);
+
+using Token = unsigned long;
+
+//! A processing pipeline that applies filters to items.
+/** @ingroup algorithms */
+class pipeline {
+    friend void parallel_pipeline(d1::task_group_context&, std::size_t, const d1::filter_node&);
+public:
+
+    //! Construct empty pipeline.
+    pipeline(d1::task_group_context& cxt, std::size_t max_token) :
+        my_context(cxt),
+        first_filter(nullptr),
+        last_filter(nullptr),
+        input_tokens(Token(max_token)),
+        end_of_input(false),
+        wait_ctx(0) {
+            __TBB_ASSERT( max_token>0, "pipeline::run must have at least one token" );
+        }
+
+    ~pipeline();
+
+    //! Add filter to end of pipeline.
+    void add_filter( d1::base_filter& );
+
+    //! Traverse tree of fitler-node in-order and add filter for each leaf
+    void fill_pipeline(const d1::filter_node& root) {
+        if( root.left && root.right ) {
+            fill_pipeline(*root.left);
+            fill_pipeline(*root.right);
+        }
+        else {
+            __TBB_ASSERT(!root.left && !root.right, "tree should be full");
+            add_filter(*root.create_filter());
+        }
+    }
+
+private:
+    friend class stage_task;
+    friend class base_filter;
+    friend void set_end_of_input(d1::base_filter& bf);
+
+    task_group_context& my_context;
+
+    //! Pointer to first filter in the pipeline.
+    d1::base_filter* first_filter;
+
+    //! Pointer to last filter in the pipeline.
+    d1::base_filter* last_filter;
+
+    //! Number of idle tokens waiting for input stage.
+    std::atomic<Token> input_tokens;
+
+    //! False until flow_control::stop() is called.
+    std::atomic<bool> end_of_input;
+
+    d1::wait_context wait_ctx;
+};
+
+//! This structure is used to store task information in an input buffer
+struct task_info {
+    void* my_object = nullptr;
+    //! Invalid unless a task went through an ordered stage.
+    Token my_token = 0;
+    //! False until my_token is set.
+    bool my_token_ready  = false;
+    //! True if my_object is valid.
+    bool is_valid = false;
+    //! Set to initial state (no object, no token)
+    void reset() {
+        my_object = nullptr;
+        my_token = 0;
+        my_token_ready = false;
+        is_valid = false;
+    }
+};
+
+//! A buffer of input items for a filter.
+/** Each item is a task_info, inserted into a position in the buffer corresponding to a Token. */
+class input_buffer {
+    friend class base_filter;
+    friend class stage_task;
+    friend class pipeline;
+    friend void set_end_of_input(d1::base_filter& bf);
+
+    using size_type = Token;
+
+    //! Array of deferred tasks that cannot yet start executing.
+    task_info* array;
+
+    //! Size of array
+    /** Always 0 or a power of 2 */
+    size_type array_size;
+
+    //! Lowest token that can start executing.
+    /** All prior Token have already been seen. */
+    Token low_token;
+
+    //! Serializes updates.
+    spin_mutex array_mutex;
+
+    //! Resize "array".
+    /** Caller is responsible to acquiring a lock on "array_mutex". */
+    void grow( size_type minimum_size );
+
+    //! Initial size for "array"
+    /** Must be a power of 2 */
+    static const size_type initial_buffer_size = 4;
+
+    //! Used for out of order buffer, and for assigning my_token if is_ordered and my_token not already assigned
+    Token high_token;
+
+    //! True for ordered filter, false otherwise.
+    const bool is_ordered;
+
+    //! for parallel filters that accepts nullptrs, thread-local flag for reaching end_of_input
+    using end_of_input_tls_t = basic_tls<input_buffer*>;
+    end_of_input_tls_t end_of_input_tls;
+    bool end_of_input_tls_allocated; // no way to test pthread creation of TLS
+
+public:
+    input_buffer(const input_buffer&) = delete;
+    input_buffer& operator=(const input_buffer&) = delete;
+
+    //! Construct empty buffer.
+    input_buffer( bool ordered) :
+            array(nullptr),
+            array_size(0),
+            low_token(0),
+            high_token(0),
+            is_ordered(ordered),
+            end_of_input_tls(),
+            end_of_input_tls_allocated(false) {
+        grow(initial_buffer_size);
+        __TBB_ASSERT( array, nullptr );
+    }
+
+    //! Destroy the buffer.
+    ~input_buffer() {
+        __TBB_ASSERT( array, nullptr );
+        cache_aligned_allocator<task_info>().deallocate(array,array_size);
+        poison_pointer( array );
+        if( end_of_input_tls_allocated ) {
+            destroy_my_tls();
+        }
+    }
+
+    //! Define order when the first filter is serial_in_order.
+    Token get_ordered_token(){
+        return high_token++;
+    }
+
+    //! Put a token into the buffer.
+    /** If task information was placed into buffer, returns true;
         otherwise returns false, informing the caller to create and spawn a task.
     */
-                bool try_put_token(task_info& info) {
-                    info.is_valid = true;
-                    spin_mutex::scoped_lock lock(array_mutex);
-                    Token token;
-                    if (is_ordered) {
-                        if (!info.my_token_ready) {
-                            info.my_token = high_token++;
-                            info.my_token_ready = true;
-                        }
-                        token = info.my_token;
-                    } else
-                        token = high_token++;
-                    __TBB_ASSERT((long) (token - low_token) >= 0, nullptr);
-                    if (token != low_token) {
-                        // Trying to put token that is beyond low_token.
-                        // Need to wait until low_token catches up before dispatching.
-                        if (token - low_token >= array_size) grow(token - low_token + 1);
-                        ITT_NOTIFY(sync_releasing, this);
-                        array[token & (array_size - 1)] = info;
-                        return true;
-                    }
-                    return false;
-                }
-
-                //! Note that processing of a token is finished.
-                /** Fires up processing of the next token, if processing was deferred. */
-                // Uses template to avoid explicit dependency on stage_task.
-                template <typename StageTask>
-                void try_to_spawn_task_for_next_token(StageTask& spawner, d1::execution_data& ed) {
-                    task_info wakee;
-                    {
-                        spin_mutex::scoped_lock lock(array_mutex);
-                        // Wake the next task
-                        task_info& item = array[++low_token & (array_size - 1)];
-                        ITT_NOTIFY(sync_acquired, this);
-                        wakee = item;
-                        item.is_valid = false;
-                    }
-                    if (wakee.is_valid) spawner.spawn_stage_task(wakee, ed);
-                }
-
-                // end_of_input signal for parallel_pipeline, parallel input filters with 0 tokens allowed.
-                void create_my_tls() {
-                    int status = end_of_input_tls.create();
-                    if (status) handle_perror(status, "TLS not allocated for filter");
-                    end_of_input_tls_allocated = true;
-                }
-                void destroy_my_tls() {
-                    int status = end_of_input_tls.destroy();
-                    if (status) handle_perror(status, "Failed to destroy filter TLS");
-                }
-                bool my_tls_end_of_input() { return end_of_input_tls.get() != nullptr; }
-                void set_my_tls_end_of_input() { end_of_input_tls.set(this); }
-            };
-
-            void input_buffer::grow(size_type minimum_size) {
-                size_type old_size = array_size;
-                size_type new_size = old_size ? 2 * old_size : initial_buffer_size;
-                while (new_size < minimum_size) new_size *= 2;
-                task_info* new_array = cache_aligned_allocator<task_info>().allocate(new_size);
-                task_info* old_array = array;
-                for (size_type i = 0; i < new_size; ++i) new_array[i].is_valid = false;
-                Token t = low_token;
-                for (size_type i = 0; i < old_size; ++i, ++t)
-                    new_array[t & (new_size - 1)] = old_array[t & (old_size - 1)];
-                array = new_array;
-                array_size = new_size;
-                if (old_array) cache_aligned_allocator<task_info>().deallocate(old_array, old_size);
+    bool try_put_token( task_info& info ) {
+        info.is_valid = true;
+        spin_mutex::scoped_lock lock( array_mutex );
+        Token token;
+        if( is_ordered ) {
+            if( !info.my_token_ready ) {
+                info.my_token = high_token++;
+                info.my_token_ready = true;
             }
-
-            class stage_task : public d1::task, public task_info {
-            private:
-                friend class pipeline;
-                pipeline& my_pipeline;
-                d1::base_filter* my_filter;
-                d1::small_object_allocator m_allocator;
-                //! True if this task has not yet read the input.
-                bool my_at_start;
-
-                //! True if this can be executed again.
-                bool execute_filter(d1::execution_data& ed);
-
-                //! Spawn task if token is available.
-                void try_spawn_stage_task(d1::execution_data& ed) {
-                    ITT_NOTIFY(sync_releasing, &my_pipeline.input_tokens);
-                    if ((my_pipeline.input_tokens.fetch_sub(1, std::memory_order_release)) > 1) {
-                        d1::small_object_allocator alloc {};
-                        r1::spawn(*alloc.new_object<stage_task>(ed, my_pipeline, alloc),
-                                  my_pipeline.my_context);
-                    }
-                }
-
-            public:
-                //! Construct stage_task for first stage in a pipeline.
-                /** Such a stage has not read any input yet. */
-                stage_task(pipeline& pipeline, d1::small_object_allocator& alloc)
-                    : my_pipeline(pipeline), my_filter(pipeline.first_filter), m_allocator(alloc),
-                      my_at_start(true) {
-                    task_info::reset();
-                    my_pipeline.wait_ctx.reserve();
-                }
-                //! Construct stage_task for a subsequent stage in a pipeline.
-                stage_task(pipeline& pipeline, d1::base_filter* filter, const task_info& info,
-                           d1::small_object_allocator& alloc)
-                    : task_info(info), my_pipeline(pipeline), my_filter(filter), m_allocator(alloc),
-                      my_at_start(false) {
-                    my_pipeline.wait_ctx.reserve();
-                }
-                //! Roughly equivalent to the constructor of input stage task
-                void reset() {
-                    task_info::reset();
-                    my_filter = my_pipeline.first_filter;
-                    my_at_start = true;
-                }
-                void finalize(d1::execution_data& ed) { m_allocator.delete_object(this, ed); }
-                //! The virtual task execution method
-                task* execute(d1::execution_data& ed) override {
-                    if (!execute_filter(ed)) {
-                        finalize(ed);
-                        return nullptr;
-                    }
-                    return this;
-                }
-                task* cancel(d1::execution_data& ed) override {
-                    finalize(ed);
-                    return nullptr;
-                }
-
-                ~stage_task() {
-                    if (my_filter && my_object) {
-                        my_filter->finalize(my_object);
-                        my_object = nullptr;
-                    }
-                    my_pipeline.wait_ctx.release();
+            token = info.my_token;
+        } else
+            token = high_token++;
+        __TBB_ASSERT( (long)(token-low_token)>=0, nullptr );
+        if( token!=low_token ) {
+            // Trying to put token that is beyond low_token.
+            // Need to wait until low_token catches up before dispatching.
+            if( token-low_token>=array_size )
+                grow( token-low_token+1 );
+            ITT_NOTIFY( sync_releasing, this );
+            array[token&(array_size-1)] = info;
+            return true;
+        }
+        return false;
+    }
+
+    //! Note that processing of a token is finished.
+    /** Fires up processing of the next token, if processing was deferred. */
+    // Uses template to avoid explicit dependency on stage_task.
+    template<typename StageTask>
+    void try_to_spawn_task_for_next_token(StageTask& spawner, d1::execution_data& ed) {
+        task_info wakee;
+        {
+            spin_mutex::scoped_lock lock( array_mutex );
+            // Wake the next task
+            task_info& item = array[++low_token & (array_size-1)];
+            ITT_NOTIFY( sync_acquired, this );
+            wakee = item;
+            item.is_valid = false;
+        }
+        if( wakee.is_valid )
+            spawner.spawn_stage_task(wakee, ed);
+    }
+
+    // end_of_input signal for parallel_pipeline, parallel input filters with 0 tokens allowed.
+    void create_my_tls() {
+        int status = end_of_input_tls.create();
+        if(status)
+            handle_perror(status, "TLS not allocated for filter");
+        end_of_input_tls_allocated = true;
+    }
+    void destroy_my_tls() {
+        int status = end_of_input_tls.destroy();
+        if(status)
+            handle_perror(status, "Failed to destroy filter TLS");
+    }
+    bool my_tls_end_of_input() {
+        return end_of_input_tls.get() != nullptr;
+    }
+    void set_my_tls_end_of_input() {
+        end_of_input_tls.set(this);
+    }
+};
+
+void input_buffer::grow( size_type minimum_size ) {
+    size_type old_size = array_size;
+    size_type new_size = old_size ? 2*old_size : initial_buffer_size;
+    while( new_size<minimum_size )
+        new_size*=2;
+    task_info* new_array = cache_aligned_allocator<task_info>().allocate(new_size);
+    task_info* old_array = array;
+    for( size_type i=0; i<new_size; ++i )
+        new_array[i].is_valid = false;
+    Token t=low_token;
+    for( size_type i=0; i<old_size; ++i, ++t )
+        new_array[t&(new_size-1)] = old_array[t&(old_size-1)];
+    array = new_array;
+    array_size = new_size;
+    if( old_array )
+        cache_aligned_allocator<task_info>().deallocate(old_array,old_size);
+}
+
+class stage_task : public d1::task, public task_info {
+private:
+    friend class pipeline;
+    pipeline& my_pipeline;
+    d1::base_filter* my_filter;
+    d1::small_object_allocator m_allocator;
+    //! True if this task has not yet read the input.
+    bool my_at_start;
+
+    //! True if this can be executed again.
+    bool execute_filter(d1::execution_data& ed);
+
+    //! Spawn task if token is available.
+    void try_spawn_stage_task(d1::execution_data& ed) {
+        ITT_NOTIFY( sync_releasing, &my_pipeline.input_tokens );
+        if( (my_pipeline.input_tokens.fetch_sub(1, std::memory_order_release)) > 1 ) {
+            d1::small_object_allocator alloc{};
+            r1::spawn( *alloc.new_object<stage_task>(ed, my_pipeline, alloc ), my_pipeline.my_context );
+        }
+    }
+
+public:
+
+    //! Construct stage_task for first stage in a pipeline.
+    /** Such a stage has not read any input yet. */
+    stage_task(pipeline& pipeline, d1::small_object_allocator& alloc ) :
+        my_pipeline(pipeline),
+        my_filter(pipeline.first_filter),
+        m_allocator(alloc),
+        my_at_start(true)
+    {
+        task_info::reset();
+        my_pipeline.wait_ctx.reserve();
+    }
+    //! Construct stage_task for a subsequent stage in a pipeline.
+    stage_task(pipeline& pipeline, d1::base_filter* filter, const task_info& info, d1::small_object_allocator& alloc) :
+        task_info(info),
+        my_pipeline(pipeline),
+        my_filter(filter),
+        m_allocator(alloc),
+        my_at_start(false)
+    {
+        my_pipeline.wait_ctx.reserve();
+    }
+    //! Roughly equivalent to the constructor of input stage task
+    void reset() {
+        task_info::reset();
+        my_filter = my_pipeline.first_filter;
+        my_at_start = true;
+    }
+    void finalize(d1::execution_data& ed) {
+        m_allocator.delete_object(this, ed);
+    }
+    //! The virtual task execution method
+    task* execute(d1::execution_data& ed) override {
+        if(!execute_filter(ed)) {
+            finalize(ed);
+            return nullptr;
+        }
+        return this;
+    }
+    task* cancel(d1::execution_data& ed) override {
+        finalize(ed);
+        return nullptr;
+    }
+
+    ~stage_task() override {
+        if ( my_filter && my_object ) {
+            my_filter->finalize(my_object);
+            my_object = nullptr;
+        }
+        my_pipeline.wait_ctx.release();
+    }
+    //! Creates and spawns stage_task from task_info
+    void spawn_stage_task(const task_info& info, d1::execution_data& ed) {
+        d1::small_object_allocator alloc{};
+        stage_task* clone = alloc.new_object<stage_task>(ed, my_pipeline, my_filter, info, alloc);
+        r1::spawn(*clone, my_pipeline.my_context);
+    }
+};
+
+bool stage_task::execute_filter(d1::execution_data& ed) {
+    __TBB_ASSERT( !my_at_start || !my_object, "invalid state of task" );
+    if( my_at_start ) {
+        if( my_filter->is_serial() ) {
+            my_object = (*my_filter)(my_object);
+            if( my_object || ( my_filter->object_may_be_null() && !my_pipeline.end_of_input.load(std::memory_order_relaxed)) ) {
+                if( my_filter->is_ordered() ) {
+                    my_token = my_filter->my_input_buffer->get_ordered_token();
+                    my_token_ready = true;
                 }
-                //! Creates and spawns stage_task from task_info
-                void spawn_stage_task(const task_info& info, d1::execution_data& ed) {
-                    d1::small_object_allocator alloc {};
-                    stage_task* clone = alloc.new_object<stage_task>(ed, my_pipeline, my_filter, info, alloc);
-                    r1::spawn(*clone, my_pipeline.my_context);
-                }
-            };
-
-            bool stage_task::execute_filter(d1::execution_data& ed) {
-                __TBB_ASSERT(!my_at_start || !my_object, "invalid state of task");
-                if (my_at_start) {
-                    if (my_filter->is_serial()) {
-                        my_object = (*my_filter)(my_object);
-                        if (my_object
-                            || (my_filter->object_may_be_null()
-                                && !my_pipeline.end_of_input.load(std::memory_order_relaxed))) {
-                            if (my_filter->is_ordered()) {
-                                my_token = my_filter->my_input_buffer->get_ordered_token();
-                                my_token_ready = true;
-                            }
-                            if (!my_filter->next_filter_in_pipeline) {// we're only filter in pipeline
-                                reset();
-                                return true;
-                            } else {
-                                try_spawn_stage_task(ed);
-                            }
-                        } else {
-                            my_pipeline.end_of_input.store(true, std::memory_order_relaxed);
-                            return false;
-                        }
-                    } else /*not is_serial*/ {
-                        if (my_pipeline.end_of_input.load(std::memory_order_relaxed)) { return false; }
-
-                        try_spawn_stage_task(ed);
-
-                        my_object = (*my_filter)(my_object);
-                        if (!my_object
-                            && (!my_filter->object_may_be_null()
-                                || my_filter->my_input_buffer->my_tls_end_of_input())) {
-                            my_pipeline.end_of_input.store(true, std::memory_order_relaxed);
-                            return false;
-                        }
-                    }
-                    my_at_start = false;
-                } else {
-                    my_object = (*my_filter)(my_object);
-                    if (my_filter->is_serial())
-                        my_filter->my_input_buffer->try_to_spawn_task_for_next_token(*this, ed);
-                }
-                my_filter = my_filter->next_filter_in_pipeline;
-                if (my_filter) {
-                    // There is another filter to execute.
-                    if (my_filter->is_serial()) {
-                        // The next filter must execute tokens when they are available (in order for serial_in_order)
-                        if (my_filter->my_input_buffer->try_put_token(*this)) {
-                            my_filter = nullptr;// To prevent deleting my_object twice if exception occurs
-                            return false;
-                        }
-                    }
-                } else {
-                    // Reached end of the pipe.
-                    std::size_t ntokens_avail
-                            = my_pipeline.input_tokens.fetch_add(1, std::memory_order_acquire);
-
-                    if (ntokens_avail > 0// Only recycle if there is one available token
-                        || my_pipeline.end_of_input.load(std::memory_order_relaxed)) {
-                        return false;// No need to recycle for new input
-                    }
-                    ITT_NOTIFY(sync_acquired, &my_pipeline.input_tokens);
-                    // Recycle as an input stage task.
+                if( !my_filter->next_filter_in_pipeline ) { // we're only filter in pipeline
                     reset();
-                }
-                return true;
-            }
-
-            pipeline::~pipeline() {
-                while (first_filter) {
-                    d1::base_filter* f = first_filter;
-                    if (input_buffer* b = f->my_input_buffer) {
-                        b->~input_buffer();
-                        deallocate_memory(b);
-                    }
-                    first_filter = f->next_filter_in_pipeline;
-                    f->~base_filter();
-                    deallocate_memory(f);
-                }
-            }
-
-            void pipeline::add_filter(d1::base_filter& new_fitler) {
-                __TBB_ASSERT(new_fitler.next_filter_in_pipeline == d1::base_filter::not_in_pipeline(),
-                             "filter already part of pipeline?");
-                new_fitler.my_pipeline = this;
-                if (first_filter == nullptr) first_filter = &new_fitler;
-                else
-                    last_filter->next_filter_in_pipeline = &new_fitler;
-                new_fitler.next_filter_in_pipeline = nullptr;
-                last_filter = &new_fitler;
-                if (new_fitler.is_serial()) {
-                    new_fitler.my_input_buffer = new (allocate_memory(sizeof(input_buffer)))
-                            input_buffer(new_fitler.is_ordered());
+                    return true;
                 } else {
-                    if (first_filter == &new_fitler && new_fitler.object_may_be_null()) {
-                        //TODO: buffer only needed to hold TLS; could improve
-                        new_fitler.my_input_buffer = new (allocate_memory(sizeof(input_buffer)))
-                                input_buffer(/*is_ordered*/ false);
-                        new_fitler.my_input_buffer->create_my_tls();
-                    }
+                    try_spawn_stage_task(ed);
                 }
+            } else {
+                my_pipeline.end_of_input.store(true, std::memory_order_relaxed);
+                return false;
+            }
+        } else /*not is_serial*/ {
+            if ( my_pipeline.end_of_input.load(std::memory_order_relaxed) ) {
+                return false;
             }
 
-            void __TBB_EXPORTED_FUNC parallel_pipeline(d1::task_group_context& cxt, std::size_t max_token,
-                                                       const d1::filter_node& fn) {
-                pipeline pipe(cxt, max_token);
-
-                pipe.fill_pipeline(fn);
-
-                d1::small_object_allocator alloc {};
-                stage_task& st = *alloc.new_object<stage_task>(pipe, alloc);
+            try_spawn_stage_task(ed);
 
-                // Start execution of tasks
-                r1::execute_and_wait(st, cxt, pipe.wait_ctx, cxt);
+            my_object = (*my_filter)(my_object);
+            if( !my_object && (!my_filter->object_may_be_null() || my_filter->my_input_buffer->my_tls_end_of_input()) ){
+                my_pipeline.end_of_input.store(true, std::memory_order_relaxed);
+                return false;
             }
-
-            void __TBB_EXPORTED_FUNC set_end_of_input(d1::base_filter& bf) {
-                __TBB_ASSERT(bf.my_input_buffer, nullptr);
-                __TBB_ASSERT(bf.object_may_be_null(), nullptr);
-                if (bf.is_serial()) {
-                    bf.my_pipeline->end_of_input.store(true, std::memory_order_relaxed);
-                } else {
-                    __TBB_ASSERT(bf.my_input_buffer->end_of_input_tls_allocated, nullptr);
-                    bf.my_input_buffer->set_my_tls_end_of_input();
-                }
+        }
+        my_at_start = false;
+    } else {
+        my_object = (*my_filter)(my_object);
+        if( my_filter->is_serial() )
+            my_filter->my_input_buffer->try_to_spawn_task_for_next_token(*this, ed);
+    }
+    my_filter = my_filter->next_filter_in_pipeline;
+    if( my_filter ) {
+        // There is another filter to execute.
+        if( my_filter->is_serial() ) {
+            // The next filter must execute tokens when they are available (in order for serial_in_order)
+            if( my_filter->my_input_buffer->try_put_token(*this) ){
+                my_filter = nullptr; // To prevent deleting my_object twice if exception occurs
+                return false;
             }
-
-        }// namespace r1
-    }    // namespace detail
-}// namespace tbb
+        }
+    } else {
+        // Reached end of the pipe.
+        std::size_t ntokens_avail = my_pipeline.input_tokens.fetch_add(1, std::memory_order_acquire);
+
+        if( ntokens_avail>0  // Only recycle if there is one available token
+                || my_pipeline.end_of_input.load(std::memory_order_relaxed) ) {
+            return false; // No need to recycle for new input
+        }
+        ITT_NOTIFY( sync_acquired, &my_pipeline.input_tokens );
+        // Recycle as an input stage task.
+        reset();
+    }
+    return true;
+}
+
+pipeline::~pipeline() {
+    while( first_filter ) {
+        d1::base_filter* f = first_filter;
+        if( input_buffer* b = f->my_input_buffer ) {
+            b->~input_buffer();
+            deallocate_memory(b);
+        }
+        first_filter = f->next_filter_in_pipeline;
+        f->~base_filter();
+        deallocate_memory(f);
+    }
+}
+
+void pipeline::add_filter( d1::base_filter& new_fitler ) {
+    __TBB_ASSERT( new_fitler.next_filter_in_pipeline==d1::base_filter::not_in_pipeline(), "filter already part of pipeline?" );
+    new_fitler.my_pipeline = this;
+    if ( first_filter == nullptr )
+        first_filter = &new_fitler;
+    else
+        last_filter->next_filter_in_pipeline = &new_fitler;
+    new_fitler.next_filter_in_pipeline = nullptr;
+    last_filter = &new_fitler;
+    if( new_fitler.is_serial() ) {
+        new_fitler.my_input_buffer = new (allocate_memory(sizeof(input_buffer))) input_buffer( new_fitler.is_ordered() );
+    } else {
+        if( first_filter == &new_fitler && new_fitler.object_may_be_null() ) {
+            //TODO: buffer only needed to hold TLS; could improve
+            new_fitler.my_input_buffer = new (allocate_memory(sizeof(input_buffer))) input_buffer( /*is_ordered*/false );
+            new_fitler.my_input_buffer->create_my_tls();
+        }
+    }
+}
+
+void __TBB_EXPORTED_FUNC parallel_pipeline(d1::task_group_context& cxt, std::size_t max_token, const d1::filter_node& fn) {
+    pipeline pipe(cxt, max_token);
+
+    pipe.fill_pipeline(fn);
+
+    d1::small_object_allocator alloc{};
+    stage_task& st = *alloc.new_object<stage_task>(pipe, alloc);
+
+    // Start execution of tasks
+    r1::execute_and_wait(st, cxt, pipe.wait_ctx, cxt);
+}
+
+void __TBB_EXPORTED_FUNC set_end_of_input(d1::base_filter& bf) {
+    __TBB_ASSERT(bf.my_input_buffer, nullptr);
+    __TBB_ASSERT(bf.object_may_be_null(), nullptr);
+    if(bf.is_serial() ) {
+        bf.my_pipeline->end_of_input.store(true, std::memory_order_relaxed);
+    } else {
+        __TBB_ASSERT(bf.my_input_buffer->end_of_input_tls_allocated, nullptr);
+        bf.my_input_buffer->set_my_tls_end_of_input();
+    }
+}
+
+} // namespace r1
+} // namespace detail
+} // namespace tbb
diff --git a/external/tbb/src/tbb/permit_manager.h b/external/tbb/src/tbb/permit_manager.h
new file mode 100644
index 00000000..0a6a737c
--- /dev/null
+++ b/external/tbb/src/tbb/permit_manager.h
@@ -0,0 +1,61 @@
+/*
+    Copyright (c) 2022-2023 Intel Corporation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#ifndef _TBB_permit_manager_H
+#define _TBB_permit_manager_H
+
+#include "oneapi/tbb/info.h"
+#include "oneapi/tbb/detail/_utils.h"
+#include "thread_request_serializer.h"
+
+namespace tbb {
+namespace detail {
+namespace r1 {
+
+class arena;
+class pm_client;
+
+class permit_manager : no_copy {
+public:
+    virtual ~permit_manager() {}
+    virtual pm_client* create_client(arena& a) = 0;
+    virtual void register_client(pm_client* client, d1::constraints& constraints) = 0;
+    virtual void unregister_and_destroy_client(pm_client& c) = 0;
+
+    virtual void set_active_num_workers(int soft_limit) = 0;
+    virtual void adjust_demand(pm_client&, int mandatory_delta, int workers_delta) = 0;
+
+    void set_thread_request_observer(thread_request_observer& tr_observer) {
+        __TBB_ASSERT(!my_thread_request_observer, "set_thread_request_observer was called already?");
+        my_thread_request_observer = &tr_observer;
+    }
+protected:
+    void notify_thread_request(int delta) {
+        __TBB_ASSERT(my_thread_request_observer, "set_thread_request_observer was not called?");
+        if (delta) {
+            my_thread_request_observer->update(delta);
+        }
+    }
+private:
+    thread_request_observer* my_thread_request_observer{nullptr};
+};
+
+
+} // namespace r1
+} // namespace detail
+} // namespace tbb
+
+#endif // _TBB_permit_manager_H
diff --git a/external/tbb/src/tbb/pm_client.h b/external/tbb/src/tbb/pm_client.h
new file mode 100644
index 00000000..d08af824
--- /dev/null
+++ b/external/tbb/src/tbb/pm_client.h
@@ -0,0 +1,76 @@
+/*
+    Copyright (c) 2022-2023 Intel Corporation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#ifndef _TBB_pm_client_H
+#define _TBB_pm_client_H
+
+#include "arena.h"
+
+namespace tbb {
+namespace detail {
+namespace r1 {
+
+class pm_client {
+public:
+    pm_client(arena& a) : my_arena(a) {}
+    virtual ~pm_client() {}
+
+    unsigned priority_level() {
+        return my_arena.priority_level();
+    }
+
+    void set_top_priority(bool b) {
+        my_arena.set_top_priority(b);
+    }
+
+    int min_workers() const {
+        return my_min_workers;
+    }
+
+    int max_workers() const {
+        return my_max_workers;
+    }
+
+    int update_request(int mandatory_delta, int workers_delta) {
+        auto min_max_workers = my_arena.update_request(mandatory_delta, workers_delta);
+        int delta = min_max_workers.second - my_max_workers;
+        set_workers(min_max_workers.first, min_max_workers.second);
+        return delta;
+    }
+
+    virtual void register_thread() = 0;
+
+    virtual void unregister_thread() = 0;
+
+
+protected:
+    void set_workers(int mn_w, int mx_w) {
+        __TBB_ASSERT(mn_w >= 0, nullptr);
+        __TBB_ASSERT(mx_w >= 0, nullptr);
+        my_min_workers = mn_w;
+        my_max_workers = mx_w;
+    }
+
+    arena& my_arena;
+    int my_min_workers{0};
+    int my_max_workers{0};
+};
+
+} // namespace r1
+} // namespace detail
+} // namespace tbb
+
+#endif // _TBB_pm_client_H
diff --git a/external/tbb/src/tbb/private_server.cpp b/external/tbb/src/tbb/private_server.cpp
index ac01fb3a..fbdbaba1 100644
--- a/external/tbb/src/tbb/private_server.cpp
+++ b/external/tbb/src/tbb/private_server.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -20,412 +20,417 @@
 #include "rml_tbb.h"
 #include "rml_thread_monitor.h"
 
+#include "scheduler_common.h"
 #include "governor.h"
 #include "misc.h"
-#include "scheduler_common.h"
 
 #include <atomic>
 
+
 namespace tbb {
-    namespace detail {
-        namespace r1 {
-            namespace rml {
+namespace detail {
+namespace r1 {
+namespace rml {
 
-                using rml::internal::thread_monitor;
-                typedef thread_monitor::handle_type thread_handle;
+using rml::internal::thread_monitor;
+typedef thread_monitor::handle_type thread_handle;
 
-                class private_server;
+class private_server;
 
-                class private_worker : no_copy {
-                private:
-                    //! State in finite-state machine that controls the worker.
-                    /** State diagram:
+class private_worker: no_copy {
+private:
+    //! State in finite-state machine that controls the worker.
+    /** State diagram:
         init --> starting --> normal
           |         |           |
           |         V           |
           \------> quit <------/
       */
-                    enum state_t {
-                        //! *this is initialized
-                        st_init,
-                        //! *this has associated thread that is starting up.
-                        st_starting,
-                        //! Associated thread is doing normal life sequence.
-                        st_normal,
-                        //! Associated thread has ended normal life sequence and promises to never touch *this again.
-                        st_quit
-                    };
-                    std::atomic<state_t> my_state;
-
-                    //! Associated server
-                    private_server& my_server;
-
-                    //! Associated client
-                    tbb_client& my_client;
-
-                    //! index used for avoiding the 64K aliasing problem
-                    const std::size_t my_index;
-
-                    //! Monitor for sleeping when there is no work to do.
-                    /** The invariant that holds for sleeping workers is:
+    enum state_t {
+        //! *this is initialized
+        st_init,
+        //! *this has associated thread that is starting up.
+        st_starting,
+        //! Associated thread is doing normal life sequence.
+        st_normal,
+        //! Associated thread has ended normal life sequence and promises to never touch *this again.
+        st_quit
+    };
+    std::atomic<state_t> my_state;
+
+    //! Associated server
+    private_server& my_server;
+
+    //! Associated client
+    tbb_client& my_client;
+
+    //! index used for avoiding the 64K aliasing problem
+    const std::size_t my_index;
+
+    //! Monitor for sleeping when there is no work to do.
+    /** The invariant that holds for sleeping workers is:
         "my_slack<=0 && my_state==st_normal && I am on server's list of asleep threads" */
-                    thread_monitor my_thread_monitor;
+    thread_monitor my_thread_monitor;
 
-                    //! Handle of the OS thread associated with this worker
-                    thread_handle my_handle;
+    //! Handle of the OS thread associated with this worker
+    thread_handle my_handle;
 
-                    //! Link for list of workers that are sleeping or have no associated thread.
-                    private_worker* my_next;
+    //! Link for list of workers that are sleeping or have no associated thread.
+    private_worker* my_next;
 
-                    friend class private_server;
+    friend class private_server;
 
-                    //! Actions executed by the associated thread
-                    void run() noexcept;
+    //! Actions executed by the associated thread
+    void run() noexcept;
 
-                    //! Wake up associated thread (or launch a thread if there is none)
-                    void wake_or_launch();
+    //! Wake up associated thread (or launch a thread if there is none)
+    void wake_or_launch();
 
-                    //! Called by a thread (usually not the associated thread) to commence termination.
-                    void start_shutdown();
+    //! Called by a thread (usually not the associated thread) to commence termination.
+    void start_shutdown();
 
-                    static __RML_DECL_THREAD_ROUTINE thread_routine(void* arg);
+    static __RML_DECL_THREAD_ROUTINE thread_routine( void* arg );
 
-                    static void release_handle(thread_handle my_handle, bool join);
+    static void release_handle(thread_handle my_handle, bool join);
 
-                protected:
-                    private_worker(private_server& server, tbb_client& client, const std::size_t i)
-                        : my_state(st_init), my_server(server), my_client(client), my_index(i),
-                          my_thread_monitor(), my_handle(), my_next() {}
-                };
+protected:
+    private_worker( private_server& server, tbb_client& client, const std::size_t i ) :
+        my_state(st_init), my_server(server), my_client(client), my_index(i),
+        my_handle(), my_next()
+    {}
+};
 
-                static const std::size_t cache_line_size = tbb::detail::max_nfs_size;
+static const std::size_t cache_line_size = tbb::detail::max_nfs_size;
 
 #if _MSC_VER && !defined(__INTEL_COMPILER)
-// Suppress overzealous compiler warnings about uninstantiable class
-#pragma warning(push)
-#pragma warning(disable : 4510 4610)
+    // Suppress overzealous compiler warnings about uninstantiable class
+    #pragma warning(push)
+    #pragma warning(disable:4510 4610)
 #endif
-                class padded_private_worker : public private_worker {
-                    char pad[cache_line_size - sizeof(private_worker) % cache_line_size];
-
-                public:
-                    padded_private_worker(private_server& server, tbb_client& client, const std::size_t i)
-                        : private_worker(server, client, i) {
-                        suppress_unused_warning(pad);
-                    }
-                };
+class padded_private_worker: public private_worker {
+    char pad[cache_line_size - sizeof(private_worker)%cache_line_size];
+public:
+    padded_private_worker( private_server& server, tbb_client& client, const std::size_t i )
+    : private_worker(server,client,i) { suppress_unused_warning(pad); }
+};
 #if _MSC_VER && !defined(__INTEL_COMPILER)
-#pragma warning(pop)
+    #pragma warning(pop)
 #endif
 
-                class private_server : public tbb_server, no_copy {
-                private:
-                    tbb_client& my_client;
-                    //! Maximum number of threads to be created.
-                    /** Threads are created lazily, so maximum might not actually be reached. */
-                    const tbb_client::size_type my_n_thread;
+class private_server: public tbb_server, no_copy {
+private:
+    tbb_client& my_client;
+    //! Maximum number of threads to be created.
+    /** Threads are created lazily, so maximum might not actually be reached. */
+    const tbb_client::size_type my_n_thread;
 
-                    //! Stack size for each thread. */
-                    const std::size_t my_stack_size;
+    //! Stack size for each thread. */
+    const std::size_t my_stack_size;
 
-                    //! Number of jobs that could use their associated thread minus number of active threads.
-                    /** If negative, indicates oversubscription.
+    //! Number of jobs that could use their associated thread minus number of active threads.
+    /** If negative, indicates oversubscription.
         If positive, indicates that more threads should run.
         Can be lowered asynchronously, but must be raised only while holding my_asleep_list_mutex,
         because raising it impacts the invariant for sleeping threads. */
-                    std::atomic<int> my_slack;
+    std::atomic<int> my_slack;
 
-                    //! Counter used to determine when to delete this.
-                    std::atomic<int> my_ref_count;
+    //! Counter used to determine when to delete this.
+    std::atomic<int> my_ref_count;
 
-                    padded_private_worker* my_thread_array;
+    padded_private_worker* my_thread_array;
 
-                    //! List of workers that are asleep or committed to sleeping until notified by another thread.
-                    std::atomic<private_worker*> my_asleep_list_root;
+    //! List of workers that are asleep or committed to sleeping until notified by another thread.
+    std::atomic<private_worker*> my_asleep_list_root;
 
-                    //! Protects my_asleep_list_root
-                    typedef mutex asleep_list_mutex_type;
-                    asleep_list_mutex_type my_asleep_list_mutex;
+    //! Protects my_asleep_list_root
+    typedef mutex asleep_list_mutex_type;
+    asleep_list_mutex_type my_asleep_list_mutex;
 
 #if TBB_USE_ASSERT
-                    std::atomic<int> my_net_slack_requests;
+    std::atomic<int> my_net_slack_requests;
 #endif /* TBB_USE_ASSERT */
 
-                    //! Wake up to two sleeping workers, if there are any sleeping.
-                    /** The call is used to propagate a chain reaction where each thread wakes up two threads,
+    //! Wake up to two sleeping workers, if there are any sleeping.
+    /** The call is used to propagate a chain reaction where each thread wakes up two threads,
         which in turn each wake up two threads, etc. */
-                    void propagate_chain_reaction() {
-                        // First test of a double-check idiom.  Second test is inside wake_some(0).
-                        if (my_asleep_list_root.load(std::memory_order_relaxed)) wake_some(0);
-                    }
-
-                    //! Try to add t to list of sleeping workers
-                    bool try_insert_in_asleep_list(private_worker& t);
+    void propagate_chain_reaction() {
+        // First test of a double-check idiom.  Second test is inside wake_some(0).
+        if( my_asleep_list_root.load(std::memory_order_relaxed) )
+            wake_some(0);
+    }
 
-                    //! Equivalent of adding additional_slack to my_slack and waking up to 2 threads if my_slack permits.
-                    void wake_some(int additional_slack);
+    //! Try to add t to list of sleeping workers
+    bool try_insert_in_asleep_list( private_worker& t );
 
-                    virtual ~private_server();
+    //! Equivalent of adding additional_slack to my_slack and waking up to 2 threads if my_slack permits.
+    void wake_some( int additional_slack );
 
-                    void remove_server_ref() {
-                        if (--my_ref_count == 0) {
-                            my_client.acknowledge_close_connection();
-                            this->~private_server();
-                            tbb::cache_aligned_allocator<private_server>().deallocate(this, 1);
-                        }
-                    }
+    ~private_server() override;
 
-                    friend class private_worker;
+    void remove_server_ref() {
+        if( --my_ref_count==0 ) {
+            my_client.acknowledge_close_connection();
+            this->~private_server();
+            tbb::cache_aligned_allocator<private_server>().deallocate( this, 1 );
+        }
+    }
 
-                public:
-                    private_server(tbb_client& client);
+    friend class private_worker;
+public:
+    private_server( tbb_client& client );
 
-                    version_type version() const override { return 0; }
+    version_type version() const override {
+        return 0;
+    }
 
-                    void request_close_connection(bool /*exiting*/) override {
-                        for (std::size_t i = 0; i < my_n_thread; ++i) my_thread_array[i].start_shutdown();
-                        remove_server_ref();
-                    }
+    void request_close_connection( bool /*exiting*/ ) override {
+        for( std::size_t i=0; i<my_n_thread; ++i )
+            my_thread_array[i].start_shutdown();
+        remove_server_ref();
+    }
 
-                    void yield() override { d0::yield(); }
+    void yield() override { d0::yield(); }
 
-                    void independent_thread_number_changed(int) override { __TBB_ASSERT(false, NULL); }
+    void independent_thread_number_changed( int ) override {__TBB_ASSERT(false, nullptr);}
 
-                    unsigned default_concurrency() const override {
-                        return governor::default_num_threads() - 1;
-                    }
+    unsigned default_concurrency() const override { return governor::default_num_threads() - 1; }
 
-                    void adjust_job_count_estimate(int delta) override;
+    void adjust_job_count_estimate( int delta ) override;
 
 #if _WIN32 || _WIN64
-                    void register_external_thread(::rml::server::execution_resource_t&) override {}
-                    void unregister_external_thread(::rml::server::execution_resource_t) override {}
+    void register_external_thread ( ::rml::server::execution_resource_t& ) override {}
+    void unregister_external_thread ( ::rml::server::execution_resource_t ) override {}
 #endif /* _WIN32||_WIN64 */
-                };
+};
 
 //------------------------------------------------------------------------
 // Methods of private_worker
 //------------------------------------------------------------------------
 #if _MSC_VER && !defined(__INTEL_COMPILER)
-// Suppress overzealous compiler warnings about an initialized variable 'sink_for_alloca' not referenced
-#pragma warning(push)
-#pragma warning(disable : 4189)
+    // Suppress overzealous compiler warnings about an initialized variable 'sink_for_alloca' not referenced
+    #pragma warning(push)
+    #pragma warning(disable:4189)
 #endif
-#if __MINGW32__ && __GNUC__ == 4 && __GNUC_MINOR__ >= 2 && !__MINGW64__
-                // ensure that stack is properly aligned for TBB threads
-                __attribute__((force_align_arg_pointer))
+#if __MINGW32__ && __GNUC__==4 &&__GNUC_MINOR__>=2 && !__MINGW64__
+// ensure that stack is properly aligned for TBB threads
+__attribute__((force_align_arg_pointer))
 #endif
-                __RML_DECL_THREAD_ROUTINE
-                private_worker::thread_routine(void* arg) {
-                    private_worker* self = static_cast<private_worker*>(arg);
-                    AVOID_64K_ALIASING(self->my_index);
-                    self->run();
-                    return 0;
-                }
+__RML_DECL_THREAD_ROUTINE private_worker::thread_routine( void* arg ) {
+    private_worker* self = static_cast<private_worker*>(arg);
+    AVOID_64K_ALIASING( self->my_index );
+    self->run();
+    // return 0 instead of nullptr due to the difference in the type __RML_DECL_THREAD_ROUTINE on various OSs
+    return 0;
+}
 #if _MSC_VER && !defined(__INTEL_COMPILER)
-#pragma warning(pop)
+    #pragma warning(pop)
 #endif
 
-                void private_worker::release_handle(thread_handle handle, bool join) {
-                    if (join) thread_monitor::join(handle);
-                    else
-                        thread_monitor::detach_thread(handle);
-                }
-
-                void private_worker::start_shutdown() {
-                    state_t expected_state = my_state.load(std::memory_order_acquire);
-                    __TBB_ASSERT(expected_state != st_quit, NULL);
-
-                    while (!my_state.compare_exchange_strong(expected_state, st_quit))
-                        ;
-
-                    if (expected_state == st_normal || expected_state == st_starting) {
-                        // May have invalidated invariant for sleeping, so wake up the thread.
-                        // Note that the notify() here occurs without maintaining invariants for my_slack.
-                        // It does not matter, because my_state==st_quit overrides checking of my_slack.
-                        my_thread_monitor.notify();
-                        // Do not need release handle in st_init state,
-                        // because in this case the thread wasn't started yet.
-                        // For st_starting release is done at launch site.
-                        if (expected_state == st_normal)
-                            release_handle(my_handle, governor::does_client_join_workers(my_client));
-                    } else if (expected_state == st_init) {
-                        // Perform action that otherwise would be performed by associated thread when it quits.
-                        my_server.remove_server_ref();
-                    }
-                }
-
-                void private_worker::run() noexcept {
-                    my_server.propagate_chain_reaction();
-
-                    // Transiting to st_normal here would require setting my_handle,
-                    // which would create race with the launching thread and
-                    // complications in handle management on Windows.
-
-                    ::rml::job& j = *my_client.create_one_job();
-                    while (my_state.load(std::memory_order_acquire) != st_quit) {
-                        if (my_server.my_slack.load(std::memory_order_acquire) >= 0) {
-                            my_client.process(j);
-                        } else {
-                            thread_monitor::cookie c;
-                            // Prepare to wait
-                            my_thread_monitor.prepare_wait(c);
-                            // Check/set the invariant for sleeping
-                            if (my_state.load(std::memory_order_acquire) != st_quit
-                                && my_server.try_insert_in_asleep_list(*this)) {
-                                my_thread_monitor.commit_wait(c);
-                                __TBB_ASSERT(my_state == st_quit || !my_next,
-                                             "Thread monitor missed a spurious wakeup?");
-                                my_server.propagate_chain_reaction();
-                            } else {
-                                // Invariant broken
-                                my_thread_monitor.cancel_wait();
-                            }
-                        }
-                    }
-                    my_client.cleanup(j);
-
-                    ++my_server.my_slack;
-                    my_server.remove_server_ref();
-                }
-
-                inline void private_worker::wake_or_launch() {
-                    state_t expected_state = st_init;
-                    if (my_state.compare_exchange_strong(expected_state, st_starting)) {
-                        // after this point, remove_server_ref() must be done by created thread
+void private_worker::release_handle(thread_handle handle, bool join) {
+    if (join)
+        thread_monitor::join(handle);
+    else
+        thread_monitor::detach_thread(handle);
+}
+
+void private_worker::start_shutdown() {
+    __TBB_ASSERT(my_state.load(std::memory_order_relaxed) != st_quit, "The quit state is expected to be set only once");
+
+    // `acq` to acquire my_handle
+    // `rel` to release market state
+    state_t prev_state = my_state.exchange(st_quit, std::memory_order_acq_rel);
+
+    if (prev_state == st_init) {
+        // Perform action that otherwise would be performed by associated thread when it quits.
+        my_server.remove_server_ref();
+    } else {
+        __TBB_ASSERT(prev_state == st_normal || prev_state == st_starting, nullptr);
+        // May have invalidated invariant for sleeping, so wake up the thread.
+        // Note that the notify() here occurs without maintaining invariants for my_slack.
+        // It does not matter, because my_state==st_quit overrides checking of my_slack.
+        my_thread_monitor.notify();
+        // Do not need release handle in st_init state,
+        // because in this case the thread wasn't started yet.
+        // For st_starting release is done at launch site.
+        if (prev_state == st_normal)
+            release_handle(my_handle, governor::does_client_join_workers(my_client));
+    }
+}
+
+void private_worker::run() noexcept {
+    my_server.propagate_chain_reaction();
+
+    // Transiting to st_normal here would require setting my_handle,
+    // which would create race with the launching thread and
+    // complications in handle management on Windows.
+
+    ::rml::job& j = *my_client.create_one_job();
+    // memory_order_seq_cst to be strictly ordered after thread_monitor::wait on the next iteration
+    while( my_state.load(std::memory_order_seq_cst)!=st_quit ) {
+        if( my_server.my_slack.load(std::memory_order_acquire)>=0 ) {
+            my_client.process(j);
+        } else if( my_server.try_insert_in_asleep_list(*this) ) {
+            my_thread_monitor.wait();
+            __TBB_ASSERT(my_state.load(std::memory_order_relaxed) == st_quit || !my_next, "Thread monitor missed a spurious wakeup?" );
+            my_server.propagate_chain_reaction();
+        }
+    }
+    my_client.cleanup(j);
+
+    ++my_server.my_slack;
+    my_server.remove_server_ref();
+}
+
+inline void private_worker::wake_or_launch() {
+    state_t state = my_state.load(std::memory_order_relaxed);
+
+    switch (state) {
+    case st_starting:
+        __TBB_fallthrough;
+    case st_normal:
+        __TBB_ASSERT(!my_next, "Should not wake a thread while it's still in asleep list");
+        my_thread_monitor.notify();
+        break;
+    case st_init:
+        if (my_state.compare_exchange_strong(state, st_starting)) {
+            // after this point, remove_server_ref() must be done by created thread
 #if __TBB_USE_WINAPI
-                        my_handle = thread_monitor::launch(thread_routine, this, my_server.my_stack_size,
-                                                           &this->my_index);
+            // Win thread_monitor::launch is designed on the assumption that the workers thread id go from 1 to Hard limit set by TBB market::global_market
+            const std::size_t worker_idx = my_server.my_n_thread - this->my_index; 
+            my_handle = thread_monitor::launch(thread_routine, this, my_server.my_stack_size, &worker_idx);
 #elif __TBB_USE_POSIX
-                        {
-                            affinity_helper fpa;
-                            fpa.protect_affinity_mask(/*restore_process_mask=*/true);
-                            my_handle = thread_monitor::launch(thread_routine, this, my_server.my_stack_size);
-                            // Implicit destruction of fpa resets original affinity mask.
-                        }
+            {
+                affinity_helper fpa;
+                fpa.protect_affinity_mask( /*restore_process_mask=*/true);
+                my_handle = thread_monitor::launch(thread_routine, this, my_server.my_stack_size);
+                // Implicit destruction of fpa resets original affinity mask.
+            }
 #endif /* __TBB_USE_POSIX */
-                        expected_state = st_starting;
-                        if (!my_state.compare_exchange_strong(expected_state, st_normal)) {
-                            // Do shutdown during startup. my_handle can't be released
-                            // by start_shutdown, because my_handle value might be not set yet
-                            // at time of transition from st_starting to st_quit.
-                            __TBB_ASSERT(expected_state == st_quit, NULL);
-                            release_handle(my_handle, governor::does_client_join_workers(my_client));
-                        }
-                    } else {
-                        __TBB_ASSERT(!my_next, "Should not wake a thread while it's still in asleep list");
-                        my_thread_monitor.notify();
-                    }
-                }
-
-                //------------------------------------------------------------------------
-                // Methods of private_server
-                //------------------------------------------------------------------------
-                private_server::private_server(tbb_client& client)
-                    : my_client(client), my_n_thread(client.max_job_count()),
-                      my_stack_size(client.min_stack_size()), my_slack(0), my_ref_count(my_n_thread + 1),
-                      my_thread_array(NULL), my_asleep_list_root(NULL)
+            state = st_starting;
+            if (!my_state.compare_exchange_strong(state, st_normal)) {
+                // Do shutdown during startup. my_handle can't be released
+                // by start_shutdown, because my_handle value might be not set yet
+                // at time of transition from st_starting to st_quit.
+                __TBB_ASSERT(state == st_quit, nullptr);
+                release_handle(my_handle, governor::does_client_join_workers(my_client));
+            }
+        }
+        break;
+    default:
+        __TBB_ASSERT(state == st_quit, nullptr);
+    }
+}
+
+//------------------------------------------------------------------------
+// Methods of private_server
+//------------------------------------------------------------------------
+private_server::private_server( tbb_client& client ) :
+    my_client(client),
+    my_n_thread(client.max_job_count()),
+    my_stack_size(client.min_stack_size()),
+    my_slack(0),
+    my_ref_count(my_n_thread+1),
+    my_thread_array(nullptr),
+    my_asleep_list_root(nullptr)
 #if TBB_USE_ASSERT
-                      ,
-                      my_net_slack_requests(0)
+    , my_net_slack_requests(0)
 #endif /* TBB_USE_ASSERT */
-                {
-                    my_thread_array
-                            = tbb::cache_aligned_allocator<padded_private_worker>().allocate(my_n_thread);
-                    for (std::size_t i = 0; i < my_n_thread; ++i) {
-                        private_worker* t = new (&my_thread_array[i]) padded_private_worker(*this, client, i);
-                        t->my_next = my_asleep_list_root.load(std::memory_order_relaxed);
-                        my_asleep_list_root.store(t, std::memory_order_relaxed);
-                    }
-                }
-
-                private_server::~private_server() {
-                    __TBB_ASSERT(my_net_slack_requests == 0, NULL);
-                    for (std::size_t i = my_n_thread; i--;) my_thread_array[i].~padded_private_worker();
-                    tbb::cache_aligned_allocator<padded_private_worker>().deallocate(my_thread_array,
-                                                                                     my_n_thread);
-                    tbb::detail::poison_pointer(my_thread_array);
-                }
-
-                inline bool private_server::try_insert_in_asleep_list(private_worker& t) {
-                    asleep_list_mutex_type::scoped_lock lock;
-                    if (!lock.try_acquire(my_asleep_list_mutex)) return false;
-                    // Contribute to slack under lock so that if another takes that unit of slack,
-                    // it sees us sleeping on the list and wakes us up.
-                    auto expected = my_slack.load(std::memory_order_relaxed);
-                    while (expected < 0) {
-                        if (my_slack.compare_exchange_strong(expected, expected + 1)) {
-                            t.my_next = my_asleep_list_root.load(std::memory_order_relaxed);
-                            my_asleep_list_root.store(&t, std::memory_order_relaxed);
-                            return true;
-                        }
-                    }
-
-                    return false;
-                }
-
-                void private_server::wake_some(int additional_slack) {
-                    __TBB_ASSERT(additional_slack >= 0, nullptr);
-                    private_worker* wakee[2];
-                    private_worker** w = wakee;
-
-                    if (additional_slack) {
-                        // Contribute our unused slack to my_slack.
-                        my_slack += additional_slack;
-                    }
-
-                    int allotted_slack = 0;
-                    while (allotted_slack < 2) {
-                        // Chain reaction; Try to claim unit of slack
-                        int old = my_slack.load(std::memory_order_relaxed);
-                        do {
-                            if (old <= 0) goto done;
-                        } while (!my_slack.compare_exchange_strong(old, old - 1));
-                        ++allotted_slack;
-                    }
-                done:
-
-                    if (allotted_slack) {
-                        asleep_list_mutex_type::scoped_lock lock(my_asleep_list_mutex);
-
-                        while (my_asleep_list_root.load(std::memory_order_relaxed) && w < wakee + 2
-                               && allotted_slack) {
-                            --allotted_slack;
-                            // Pop sleeping worker to combine with claimed unit of slack
-                            auto old = my_asleep_list_root.load(std::memory_order_relaxed);
-                            my_asleep_list_root.store(old->my_next, std::memory_order_relaxed);
-                            *w++ = old;
-                        }
-                        if (allotted_slack) {
-                            // Contribute our unused slack to my_slack.
-                            my_slack += allotted_slack;
-                        }
-                    }
-                    while (w > wakee) {
-                        private_worker* ww = *--w;
-                        ww->my_next = nullptr;
-                        ww->wake_or_launch();
-                    }
-                }
-
-                void private_server::adjust_job_count_estimate(int delta) {
+{
+    my_thread_array = tbb::cache_aligned_allocator<padded_private_worker>().allocate( my_n_thread );
+    for( std::size_t i=0; i<my_n_thread; ++i ) {
+        private_worker* t = new( &my_thread_array[i] ) padded_private_worker( *this, client, i );
+        t->my_next = my_asleep_list_root.load(std::memory_order_relaxed);
+        my_asleep_list_root.store(t, std::memory_order_relaxed);
+    }
+}
+
+private_server::~private_server() {
+    __TBB_ASSERT( my_net_slack_requests==0, nullptr);
+    for( std::size_t i=my_n_thread; i--; )
+        my_thread_array[i].~padded_private_worker();
+    tbb::cache_aligned_allocator<padded_private_worker>().deallocate( my_thread_array, my_n_thread );
+    tbb::detail::poison_pointer( my_thread_array );
+}
+
+inline bool private_server::try_insert_in_asleep_list( private_worker& t ) {
+    asleep_list_mutex_type::scoped_lock lock;
+    if( !lock.try_acquire(my_asleep_list_mutex) )
+        return false;
+    // Contribute to slack under lock so that if another takes that unit of slack,
+    // it sees us sleeping on the list and wakes us up.
+    auto expected = my_slack.load(std::memory_order_relaxed);
+    while (expected < 0) {
+        if (my_slack.compare_exchange_strong(expected, expected + 1)) {
+            t.my_next = my_asleep_list_root.load(std::memory_order_relaxed);
+            my_asleep_list_root.store(&t, std::memory_order_relaxed);
+            return true;
+        }
+    }
+
+    return false;
+}
+
+void private_server::wake_some( int additional_slack ) {
+    __TBB_ASSERT( additional_slack>=0, nullptr );
+    private_worker* wakee[2];
+    private_worker**w = wakee;
+
+    if (additional_slack) {
+        // Contribute our unused slack to my_slack.
+        my_slack += additional_slack;
+    }
+
+    int allotted_slack = 0;
+    while (allotted_slack < 2) {
+        // Chain reaction; Try to claim unit of slack
+        int old = my_slack.load(std::memory_order_relaxed);
+        do {
+            if (old <= 0) goto done;
+        } while (!my_slack.compare_exchange_strong(old, old - 1));
+        ++allotted_slack;
+    }
+done:
+
+    if (allotted_slack) {
+        asleep_list_mutex_type::scoped_lock lock(my_asleep_list_mutex);
+        auto root = my_asleep_list_root.load(std::memory_order_relaxed);
+        while( root && w<wakee+2 && allotted_slack) {
+            --allotted_slack;
+            // Pop sleeping worker to combine with claimed unit of slack
+            *w++ = root;
+            root = root->my_next;
+        }
+        my_asleep_list_root.store(root, std::memory_order_relaxed);
+        if(allotted_slack) {
+            // Contribute our unused slack to my_slack.
+            my_slack += allotted_slack;
+        }
+    }
+    while( w>wakee ) {
+        private_worker* ww = *--w;
+        ww->my_next = nullptr;
+        ww->wake_or_launch();
+    }
+}
+
+void private_server::adjust_job_count_estimate( int delta ) {
 #if TBB_USE_ASSERT
-                    my_net_slack_requests += delta;
+    my_net_slack_requests+=delta;
 #endif /* TBB_USE_ASSERT */
-                    if (delta < 0) {
-                        my_slack += delta;
-                    } else if (delta > 0) {
-                        wake_some(delta);
-                    }
-                }
-
-                //! Factory method called from task.cpp to create a private_server.
-                tbb_server* make_private_server(tbb_client& client) {
-                    return new (tbb::cache_aligned_allocator<private_server>().allocate(1))
-                            private_server(client);
-                }
-
-            }// namespace rml
-        }    // namespace r1
-    }        // namespace detail
-}// namespace tbb
+    if( delta<0 ) {
+        my_slack+=delta;
+    } else if( delta>0 ) {
+        wake_some( delta );
+    }
+}
+
+//! Factory method called from task.cpp to create a private_server.
+tbb_server* make_private_server( tbb_client& client ) {
+    return new( tbb::cache_aligned_allocator<private_server>().allocate(1) ) private_server(client);
+}
+
+} // namespace rml
+} // namespace r1
+} // namespace detail
+} // namespace tbb
+
diff --git a/external/tbb/src/tbb/profiling.cpp b/external/tbb/src/tbb/profiling.cpp
index 8b152c2d..3cf4da3c 100644
--- a/external/tbb/src/tbb/profiling.cpp
+++ b/external/tbb/src/tbb/profiling.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -17,257 +17,249 @@
 #include "oneapi/tbb/detail/_config.h"
 #include "oneapi/tbb/detail/_template_helpers.h"
 
-#include "itt_notify.h"
 #include "main.h"
+#include "itt_notify.h"
 
 #include "oneapi/tbb/profiling.h"
 
 #include <string.h>
 
 namespace tbb {
-    namespace detail {
-        namespace r1 {
+namespace detail {
+namespace r1 {
 
 #if __TBB_USE_ITT_NOTIFY
-            bool ITT_Present;
-            static std::atomic<bool> ITT_InitializationDone;
+bool ITT_Present;
+static std::atomic<bool> ITT_InitializationDone;
 
-            static __itt_domain *tbb_domains[d1::ITT_NUM_DOMAINS] = {};
+static __itt_domain *tbb_domains[d1::ITT_NUM_DOMAINS] = {};
 
-            struct resource_string {
-                const char *str;
-                __itt_string_handle *itt_str_handle;
-            };
+struct resource_string {
+    const char *str;
+    __itt_string_handle *itt_str_handle;
+};
 
 //
 // populate resource strings
 //
-#define TBB_STRING_RESOURCE(index_name, str) {str, nullptr},
-            static resource_string strings_for_itt[] = {
-#include "oneapi/tbb/detail/_string_resource.h"
-                    {"num_resource_strings", nullptr}};
+#define TBB_STRING_RESOURCE( index_name, str ) { str, nullptr },
+static resource_string strings_for_itt[] = {
+    #include "oneapi/tbb/detail/_string_resource.h"
+    { "num_resource_strings", nullptr }
+};
 #undef TBB_STRING_RESOURCE
 
-            static __itt_string_handle *ITT_get_string_handle(std::uintptr_t idx) {
-                __TBB_ASSERT(idx < NUM_STRINGS, "string handle out of valid range");
-                return idx < NUM_STRINGS ? strings_for_itt[idx].itt_str_handle : NULL;
-            }
-
-            static void ITT_init_domains() {
-                tbb_domains[d1::ITT_DOMAIN_MAIN] = __itt_domain_create(_T("tbb"));
-                tbb_domains[d1::ITT_DOMAIN_MAIN]->flags = 1;
-                tbb_domains[d1::ITT_DOMAIN_FLOW] = __itt_domain_create(_T("tbb.flow"));
-                tbb_domains[d1::ITT_DOMAIN_FLOW]->flags = 1;
-                tbb_domains[d1::ITT_DOMAIN_ALGO] = __itt_domain_create(_T("tbb.algorithm"));
-                tbb_domains[d1::ITT_DOMAIN_ALGO]->flags = 1;
-            }
-
-            static void ITT_init_strings() {
-                for (std::uintptr_t i = 0; i < NUM_STRINGS; ++i) {
-#if _WIN32 || _WIN64
-                    strings_for_itt[i].itt_str_handle = __itt_string_handle_createA(strings_for_itt[i].str);
+static __itt_string_handle* ITT_get_string_handle(std::uintptr_t idx) {
+    __TBB_ASSERT(idx < NUM_STRINGS, "string handle out of valid range");
+    return idx < NUM_STRINGS ? strings_for_itt[idx].itt_str_handle : nullptr;
+}
+
+static void ITT_init_domains() {
+    tbb_domains[d1::ITT_DOMAIN_MAIN] = __itt_domain_create( _T("tbb") );
+    tbb_domains[d1::ITT_DOMAIN_MAIN]->flags = 1;
+    tbb_domains[d1::ITT_DOMAIN_FLOW] = __itt_domain_create( _T("tbb.flow") );
+    tbb_domains[d1::ITT_DOMAIN_FLOW]->flags = 1;
+    tbb_domains[d1::ITT_DOMAIN_ALGO] = __itt_domain_create( _T("tbb.algorithm") );
+    tbb_domains[d1::ITT_DOMAIN_ALGO]->flags = 1;
+}
+
+static void ITT_init_strings() {
+    for ( std::uintptr_t i = 0; i < NUM_STRINGS; ++i ) {
+#if _WIN32||_WIN64
+        strings_for_itt[i].itt_str_handle = __itt_string_handle_createA( strings_for_itt[i].str );
 #else
-                    strings_for_itt[i].itt_str_handle = __itt_string_handle_create(strings_for_itt[i].str);
+        strings_for_itt[i].itt_str_handle = __itt_string_handle_create( strings_for_itt[i].str );
 #endif
-                }
-            }
+    }
+}
 
-            static void ITT_init() {
-                ITT_init_domains();
-                ITT_init_strings();
-            }
+static void ITT_init() {
+    ITT_init_domains();
+    ITT_init_strings();
+}
 
-            /** Thread-unsafe lazy one-time initialization of tools interop.
+/** Thread-unsafe lazy one-time initialization of tools interop.
     Used by both dummy handlers and general TBB one-time initialization routine. **/
-            void ITT_DoUnsafeOneTimeInitialization() {
-                // Double check ITT_InitializationDone is necessary because the first check
-                // in ITT_DoOneTimeInitialization is not guarded with the __TBB_InitOnce lock.
-                if (!ITT_InitializationDone) {
-                    ITT_Present = (__TBB_load_ittnotify() != 0);
-                    if (ITT_Present) ITT_init();
-                    ITT_InitializationDone = true;
-                }
-            }
-
-            /** Thread-safe lazy one-time initialization of tools interop.
+void ITT_DoUnsafeOneTimeInitialization () {
+    // Double check ITT_InitializationDone is necessary because the first check
+    // in ITT_DoOneTimeInitialization is not guarded with the __TBB_InitOnce lock.
+    if ( !ITT_InitializationDone ) {
+        ITT_Present = (__TBB_load_ittnotify()!=0);
+        if (ITT_Present) ITT_init();
+        ITT_InitializationDone = true;
+    }
+}
+
+/** Thread-safe lazy one-time initialization of tools interop.
     Used by dummy handlers only. **/
-            extern "C" void ITT_DoOneTimeInitialization() {
-                if (!ITT_InitializationDone) {
-                    __TBB_InitOnce::lock();
-                    ITT_DoUnsafeOneTimeInitialization();
-                    __TBB_InitOnce::unlock();
-                }
-            }
-
-            void create_itt_sync(void *ptr, const tchar *objtype, const tchar *objname) {
-                ITT_SYNC_CREATE(ptr, objtype, objname);
-            }
-
-            void call_itt_notify(int t, void *ptr) {
-                switch (t) {
-                    case 0:
-                        ITT_NOTIFY(sync_prepare, ptr);
-                        break;
-                    case 1:
-                        ITT_NOTIFY(sync_cancel, ptr);
-                        break;
-                    case 2:
-                        ITT_NOTIFY(sync_acquired, ptr);
-                        break;
-                    case 3:
-                        ITT_NOTIFY(sync_releasing, ptr);
-                        break;
-                    case 4:
-                        ITT_NOTIFY(sync_destroy, ptr);
-                        break;
-                }
-            }
-
-            void itt_set_sync_name(void *obj, const tchar *name) { __itt_sync_rename(obj, name); }
-
-            const __itt_id itt_null_id = {0, 0, 0};
-
-            static inline __itt_domain *get_itt_domain(d1::itt_domain_enum idx) {
-                if (tbb_domains[idx] == NULL) { ITT_DoOneTimeInitialization(); }
-                return tbb_domains[idx];
-            }
-
-            static inline void itt_id_make(__itt_id *id, void *addr, unsigned long long extra) {
-                *id = __itt_id_make(addr, extra);
-            }
-
-            static inline void itt_id_create(const __itt_domain *domain, __itt_id id) {
-                __itt_id_create(domain, id);
-            }
-
-            void itt_make_task_group(d1::itt_domain_enum domain, void *group, unsigned long long group_extra,
-                                     void *parent, unsigned long long parent_extra,
-                                     string_resource_index name_index) {
-                if (__itt_domain *d = get_itt_domain(domain)) {
-                    __itt_id group_id = itt_null_id;
-                    __itt_id parent_id = itt_null_id;
-                    itt_id_make(&group_id, group, group_extra);
-                    itt_id_create(d, group_id);
-                    if (parent) { itt_id_make(&parent_id, parent, parent_extra); }
-                    __itt_string_handle *n = ITT_get_string_handle(name_index);
-                    __itt_task_group(d, group_id, parent_id, n);
-                }
-            }
-
-            void __TBB_EXPORTED_FUNC itt_metadata_str_add(d1::itt_domain_enum domain, void *addr,
-                                                          unsigned long long addr_extra,
-                                                          string_resource_index key, const char *value) {
-                if (__itt_domain *d = get_itt_domain(domain)) {
-                    __itt_id id = itt_null_id;
-                    itt_id_make(&id, addr, addr_extra);
-                    __itt_string_handle *k = ITT_get_string_handle(key);
-                    size_t value_length = strlen(value);
-#if _WIN32 || _WIN64
-                    __itt_metadata_str_addA(d, id, k, value, value_length);
+extern "C"
+void ITT_DoOneTimeInitialization() {
+    if ( !ITT_InitializationDone ) {
+        __TBB_InitOnce::lock();
+        ITT_DoUnsafeOneTimeInitialization();
+        __TBB_InitOnce::unlock();
+    }
+}
+
+void create_itt_sync(void* ptr, const tchar* objtype, const tchar* objname) {
+        ITT_SYNC_CREATE(ptr, objtype, objname);
+}
+
+void call_itt_notify(int t, void *ptr) {
+    switch (t) {
+    case 0: ITT_NOTIFY(sync_prepare, ptr); break;
+    case 1: ITT_NOTIFY(sync_cancel, ptr); break;
+    case 2: ITT_NOTIFY(sync_acquired, ptr); break;
+    case 3: ITT_NOTIFY(sync_releasing, ptr); break;
+    case 4: ITT_NOTIFY(sync_destroy, ptr); break;
+    }
+}
+
+void itt_set_sync_name(void* obj, const tchar* name) {
+    __itt_sync_rename(obj, name);
+}
+
+const __itt_id itt_null_id = { 0, 0, 0 };
+
+static inline __itt_domain* get_itt_domain(d1::itt_domain_enum idx) {
+    if (tbb_domains[idx] == nullptr) {
+        ITT_DoOneTimeInitialization();
+    }
+    return tbb_domains[idx];
+}
+
+static inline void itt_id_make(__itt_id* id, void* addr, unsigned long long extra) {
+    *id = __itt_id_make(addr, extra);
+}
+
+static inline void itt_id_create(const __itt_domain* domain, __itt_id id) {
+    __itt_id_create(domain, id);
+}
+
+void itt_make_task_group(d1::itt_domain_enum domain, void* group, unsigned long long group_extra,
+                         void* parent, unsigned long long parent_extra, string_resource_index name_index) {
+    if (__itt_domain* d = get_itt_domain(domain)) {
+        __itt_id group_id = itt_null_id;
+        __itt_id parent_id = itt_null_id;
+        itt_id_make(&group_id, group, group_extra);
+        itt_id_create(d, group_id);
+        if (parent) {
+            itt_id_make(&parent_id, parent, parent_extra);
+        }
+        __itt_string_handle* n = ITT_get_string_handle(name_index);
+        __itt_task_group(d, group_id, parent_id, n);
+    }
+}
+
+void __TBB_EXPORTED_FUNC itt_metadata_str_add(d1::itt_domain_enum domain, void *addr, unsigned long long addr_extra,
+                                              string_resource_index key, const char *value ) {
+    if ( __itt_domain *d = get_itt_domain( domain ) ) {
+        __itt_id id = itt_null_id;
+        itt_id_make( &id, addr, addr_extra );
+        __itt_string_handle *k = ITT_get_string_handle(key);
+        size_t value_length = strlen( value );
+#if _WIN32||_WIN64
+        __itt_metadata_str_addA(d, id, k, value, value_length);
 #else
-                    __itt_metadata_str_add(d, id, k, value, value_length);
+        __itt_metadata_str_add(d, id, k, value, value_length);
 #endif
-                }
-            }
-
-            void __TBB_EXPORTED_FUNC itt_metadata_ptr_add(d1::itt_domain_enum domain, void *addr,
-                                                          unsigned long long addr_extra,
-                                                          string_resource_index key, void *value) {
-                if (__itt_domain *d = get_itt_domain(domain)) {
-                    __itt_id id = itt_null_id;
-                    itt_id_make(&id, addr, addr_extra);
-                    __itt_string_handle *k = ITT_get_string_handle(key);
+    }
+}
+
+void __TBB_EXPORTED_FUNC itt_metadata_ptr_add(d1::itt_domain_enum domain, void *addr, unsigned long long addr_extra,
+                                              string_resource_index key, void *value ) {
+    if ( __itt_domain *d = get_itt_domain( domain ) ) {
+        __itt_id id = itt_null_id;
+        itt_id_make( &id, addr, addr_extra );
+        __itt_string_handle *k = ITT_get_string_handle(key);
 #if __TBB_x86_32
-                    __itt_metadata_add(d, id, k, __itt_metadata_u32, 1, value);
+        __itt_metadata_add(d, id, k, __itt_metadata_u32, 1, value);
 #else
-                    __itt_metadata_add(d, id, k, __itt_metadata_u64, 1, value);
+        __itt_metadata_add(d, id, k, __itt_metadata_u64, 1, value);
 #endif
-                }
-            }
-
-            void __TBB_EXPORTED_FUNC itt_relation_add(d1::itt_domain_enum domain, void *addr0,
-                                                      unsigned long long addr0_extra, itt_relation relation,
-                                                      void *addr1, unsigned long long addr1_extra) {
-                if (__itt_domain *d = get_itt_domain(domain)) {
-                    __itt_id id0 = itt_null_id;
-                    __itt_id id1 = itt_null_id;
-                    itt_id_make(&id0, addr0, addr0_extra);
-                    itt_id_make(&id1, addr1, addr1_extra);
-                    __itt_relation_add(d, id0, (__itt_relation) relation, id1);
-                }
-            }
-
-            void __TBB_EXPORTED_FUNC itt_task_begin(d1::itt_domain_enum domain, void *task,
-                                                    unsigned long long task_extra, void *parent,
-                                                    unsigned long long parent_extra,
-                                                    string_resource_index name_index) {
-                if (__itt_domain *d = get_itt_domain(domain)) {
-                    __itt_id task_id = itt_null_id;
-                    __itt_id parent_id = itt_null_id;
-                    if (task) { itt_id_make(&task_id, task, task_extra); }
-                    if (parent) { itt_id_make(&parent_id, parent, parent_extra); }
-                    __itt_string_handle *n = ITT_get_string_handle(name_index);
-                    __itt_task_begin(d, task_id, parent_id, n);
-                }
-            }
-
-            void __TBB_EXPORTED_FUNC itt_task_end(d1::itt_domain_enum domain) {
-                if (__itt_domain *d = get_itt_domain(domain)) { __itt_task_end(d); }
-            }
-
-            void __TBB_EXPORTED_FUNC itt_region_begin(d1::itt_domain_enum domain, void *region,
-                                                      unsigned long long region_extra, void *parent,
-                                                      unsigned long long parent_extra,
-                                                      string_resource_index /* name_index */) {
-                if (__itt_domain *d = get_itt_domain(domain)) {
-                    __itt_id region_id = itt_null_id;
-                    __itt_id parent_id = itt_null_id;
-                    itt_id_make(&region_id, region, region_extra);
-                    if (parent) { itt_id_make(&parent_id, parent, parent_extra); }
-                    __itt_region_begin(d, region_id, parent_id, NULL);
-                }
-            }
-
-            void __TBB_EXPORTED_FUNC itt_region_end(d1::itt_domain_enum domain, void *region,
-                                                    unsigned long long region_extra) {
-                if (__itt_domain *d = get_itt_domain(domain)) {
-                    __itt_id region_id = itt_null_id;
-                    itt_id_make(&region_id, region, region_extra);
-                    __itt_region_end(d, region_id);
-                }
-            }
+    }
+}
+
+void __TBB_EXPORTED_FUNC itt_relation_add(d1::itt_domain_enum domain, void *addr0, unsigned long long addr0_extra,
+                                          itt_relation relation, void *addr1, unsigned long long addr1_extra ) {
+    if ( __itt_domain *d = get_itt_domain( domain ) ) {
+        __itt_id id0 = itt_null_id;
+        __itt_id id1 = itt_null_id;
+        itt_id_make( &id0, addr0, addr0_extra );
+        itt_id_make( &id1, addr1, addr1_extra );
+         __itt_relation_add( d, id0, (__itt_relation)relation, id1 );
+    }
+}
+
+void __TBB_EXPORTED_FUNC itt_task_begin(d1::itt_domain_enum domain, void* task, unsigned long long task_extra,
+                    void* parent, unsigned long long parent_extra, string_resource_index name_index) {
+    if (__itt_domain* d = get_itt_domain(domain)) {
+        __itt_id task_id = itt_null_id;
+        __itt_id parent_id = itt_null_id;
+        if (task) {
+            itt_id_make(&task_id, task, task_extra);
+        }
+        if (parent) {
+            itt_id_make(&parent_id, parent, parent_extra);
+        }
+        __itt_string_handle* n = ITT_get_string_handle(name_index);
+        __itt_task_begin(d, task_id, parent_id, n);
+    }
+}
+
+void __TBB_EXPORTED_FUNC itt_task_end(d1::itt_domain_enum domain) {
+    if (__itt_domain* d = get_itt_domain(domain)) {
+        __itt_task_end(d);
+    }
+}
+
+void __TBB_EXPORTED_FUNC itt_region_begin(d1::itt_domain_enum domain, void *region, unsigned long long region_extra,
+                      void *parent, unsigned long long parent_extra, string_resource_index /* name_index */ ) {
+    if ( __itt_domain *d = get_itt_domain( domain ) ) {
+        __itt_id region_id = itt_null_id;
+        __itt_id parent_id = itt_null_id;
+        itt_id_make( &region_id, region, region_extra );
+        if ( parent ) {
+            itt_id_make( &parent_id, parent, parent_extra );
+        }
+         __itt_region_begin( d, region_id, parent_id, nullptr );
+    }
+}
+
+void __TBB_EXPORTED_FUNC itt_region_end(d1::itt_domain_enum domain, void *region, unsigned long long region_extra ) {
+    if ( __itt_domain *d = get_itt_domain( domain ) ) {
+        __itt_id region_id = itt_null_id;
+        itt_id_make( &region_id, region, region_extra );
+         __itt_region_end( d, region_id );
+    }
+}
 
 #else
-            void create_itt_sync(void* /*ptr*/, const tchar* /*objtype*/, const tchar* /*objname*/) {}
-            void call_itt_notify(int /*t*/, void* /*ptr*/) {}
-            void itt_set_sync_name(void* /*obj*/, const tchar* /*name*/) {}
-            void itt_make_task_group(d1::itt_domain_enum /*domain*/, void* /*group*/,
-                                     unsigned long long /*group_extra*/, void* /*parent*/,
-                                     unsigned long long /*parent_extra*/,
-                                     string_resource_index /*name_index*/) {}
-            void itt_metadata_str_add(d1::itt_domain_enum /*domain*/, void* /*addr*/,
-                                      unsigned long long /*addr_extra*/, string_resource_index /*key*/,
-                                      const char* /*value*/) {}
-            void itt_metadata_ptr_add(d1::itt_domain_enum /*domain*/, void* /*addr*/,
-                                      unsigned long long /*addr_extra*/, string_resource_index /*key*/,
-                                      void* /*value*/) {}
-            void itt_relation_add(d1::itt_domain_enum /*domain*/, void* /*addr0*/,
-                                  unsigned long long /*addr0_extra*/, itt_relation /*relation*/,
-                                  void* /*addr1*/, unsigned long long /*addr1_extra*/) {}
-            void itt_task_begin(d1::itt_domain_enum /*domain*/, void* /*task*/,
-                                unsigned long long /*task_extra*/, void* /*parent*/,
-                                unsigned long long /*parent_extra*/, string_resource_index /*name_index*/) {}
-            void itt_task_end(d1::itt_domain_enum /*domain*/) {}
-            void itt_region_begin(d1::itt_domain_enum /*domain*/, void* /*region*/,
-                                  unsigned long long /*region_extra*/, void* /*parent*/,
-                                  unsigned long long /*parent_extra*/, string_resource_index /*name_index*/) {
-            }
-            void itt_region_end(d1::itt_domain_enum /*domain*/, void* /*region*/,
-                                unsigned long long /*region_extra*/) {}
+void create_itt_sync(void* /*ptr*/, const tchar* /*objtype*/, const tchar* /*objname*/) {}
+void call_itt_notify(int /*t*/, void* /*ptr*/) {}
+void itt_set_sync_name(void* /*obj*/, const tchar* /*name*/) {}
+void itt_make_task_group(d1::itt_domain_enum /*domain*/, void* /*group*/, unsigned long long /*group_extra*/,
+                         void* /*parent*/, unsigned long long /*parent_extra*/, string_resource_index /*name_index*/) {}
+void itt_metadata_str_add(d1::itt_domain_enum /*domain*/, void* /*addr*/, unsigned long long /*addr_extra*/,
+                          string_resource_index /*key*/, const char* /*value*/ ) { }
+void itt_metadata_ptr_add(d1::itt_domain_enum /*domain*/, void * /*addr*/, unsigned long long /*addr_extra*/,
+                          string_resource_index /*key*/, void * /*value*/ ) {}
+void itt_relation_add(d1::itt_domain_enum /*domain*/, void* /*addr0*/, unsigned long long /*addr0_extra*/,
+                      itt_relation /*relation*/, void* /*addr1*/, unsigned long long /*addr1_extra*/ ) { }
+void itt_task_begin(d1::itt_domain_enum /*domain*/, void* /*task*/, unsigned long long /*task_extra*/,
+                        void* /*parent*/, unsigned long long /*parent_extra*/, string_resource_index /*name_index*/ ) { }
+void itt_task_end(d1::itt_domain_enum /*domain*/ ) { }
+void itt_region_begin(d1::itt_domain_enum /*domain*/, void* /*region*/, unsigned long long /*region_extra*/,
+                          void* /*parent*/, unsigned long long /*parent_extra*/, string_resource_index /*name_index*/ ) { }
+void itt_region_end(d1::itt_domain_enum /*domain*/, void* /*region*/, unsigned long long /*region_extra*/ ) { }
 #endif /* __TBB_USE_ITT_NOTIFY */
 
-            const tchar *SyncType_Scheduler = _T("%Constant");
-            const tchar *SyncObj_ContextsList = _T("TBB Scheduler");
-        }// namespace r1
-    }    // namespace detail
-}// namespace tbb
+const tchar
+    *SyncType_Scheduler = _T("%Constant")
+    ;
+const tchar
+    *SyncObj_ContextsList = _T("TBB Scheduler")
+    ;
+} // namespace r1
+} // namespace detail
+} // namespace tbb
diff --git a/external/tbb/src/tbb/queuing_rw_mutex.cpp b/external/tbb/src/tbb/queuing_rw_mutex.cpp
index f04cd37b..5826592b 100644
--- a/external/tbb/src/tbb/queuing_rw_mutex.cpp
+++ b/external/tbb/src/tbb/queuing_rw_mutex.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -19,658 +19,599 @@
     There could be some code looking as "can be restructured" but its structure does matter! */
 
 #include "oneapi/tbb/queuing_rw_mutex.h"
-#include "itt_notify.h"
 #include "oneapi/tbb/detail/_assert.h"
 #include "oneapi/tbb/detail/_utils.h"
+#include "itt_notify.h"
 
 namespace tbb {
-    namespace detail {
-        namespace r1 {
+namespace detail {
+namespace r1 {
 
 #if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
-// Workaround for overzealous compiler warnings
-#pragma warning(push)
-#pragma warning(disable : 4311 4312)
+    // Workaround for overzealous compiler warnings
+    #pragma warning (push)
+    #pragma warning (disable: 4311 4312)
 #endif
 
-            //! A view of a T* with additional functionality for twiddling low-order bits.
-            template <typename T>
-            class tricky_atomic_pointer {
-            public:
-                using word = uintptr_t;
-
-                static T* fetch_add(std::atomic<word>& location, word addend,
-                                    std::memory_order memory_order) {
-                    return reinterpret_cast<T*>(location.fetch_add(addend, memory_order));
-                }
-
-                static T* exchange(std::atomic<word>& location, T* value, std::memory_order memory_order) {
-                    return reinterpret_cast<T*>(
-                            location.exchange(reinterpret_cast<word>(value), memory_order));
-                }
-
-                static T* compare_exchange_strong(std::atomic<word>& obj, const T* expected, const T* desired,
-                                                  std::memory_order memory_order) {
-                    word expd = reinterpret_cast<word>(expected);
-                    obj.compare_exchange_strong(expd, reinterpret_cast<word>(desired), memory_order);
-                    return reinterpret_cast<T*>(expd);
-                }
-
-                static void store(std::atomic<word>& location, const T* value,
-                                  std::memory_order memory_order) {
-                    location.store(reinterpret_cast<word>(value), memory_order);
-                }
-
-                static T* load(std::atomic<word>& location, std::memory_order memory_order) {
-                    return reinterpret_cast<T*>(location.load(memory_order));
-                }
-
-                static void spin_wait_while_eq(const std::atomic<word>& location, const T* value) {
-                    tbb::detail::d0::spin_wait_while_eq(location, reinterpret_cast<word>(value));
-                }
-
-                T*& ref;
-                tricky_atomic_pointer(T*& original) : ref(original) {};
-                tricky_atomic_pointer(const tricky_atomic_pointer&) = delete;
-                tricky_atomic_pointer& operator=(const tricky_atomic_pointer&) = delete;
-                T* operator&(const word operand2) const {
-                    return reinterpret_cast<T*>(reinterpret_cast<word>(ref) & operand2);
-                }
-                T* operator|(const word operand2) const {
-                    return reinterpret_cast<T*>(reinterpret_cast<word>(ref) | operand2);
-                }
-            };
-
-            using tricky_pointer = tricky_atomic_pointer<queuing_rw_mutex::scoped_lock>;
+//! A view of a T* with additional functionality for twiddling low-order bits.
+template<typename T>
+class tricky_atomic_pointer {
+public:
+    using word = uintptr_t;
+
+    static T* fetch_add( std::atomic<word>& location, word addend, std::memory_order memory_order ) {
+        return reinterpret_cast<T*>(location.fetch_add(addend, memory_order));
+    }
+
+    static T* exchange( std::atomic<word>& location, T* value, std::memory_order memory_order ) {
+        return reinterpret_cast<T*>(location.exchange(reinterpret_cast<word>(value), memory_order));
+    }
+
+    static T* compare_exchange_strong( std::atomic<word>& obj, const T* expected, const T* desired, std::memory_order memory_order ) {
+        word expd = reinterpret_cast<word>(expected);
+        obj.compare_exchange_strong(expd, reinterpret_cast<word>(desired), memory_order);
+        return reinterpret_cast<T*>(expd);
+    }
+
+    static void store( std::atomic<word>& location, const T* value, std::memory_order memory_order ) {
+        location.store(reinterpret_cast<word>(value), memory_order);
+    }
+
+    static T* load( std::atomic<word>& location, std::memory_order memory_order ) {
+        return reinterpret_cast<T*>(location.load(memory_order));
+    }
+
+    static void spin_wait_while_eq(const std::atomic<word>& location, const T* value) {
+        tbb::detail::d0::spin_wait_while_eq(location, reinterpret_cast<word>(value) );
+    }
+
+    T* & ref;
+    tricky_atomic_pointer( T*& original ) : ref(original) {};
+    tricky_atomic_pointer(const tricky_atomic_pointer&) = delete;
+    tricky_atomic_pointer& operator=(const tricky_atomic_pointer&) = delete;
+    T* operator&( const word operand2 ) const {
+        return reinterpret_cast<T*>( reinterpret_cast<word>(ref) & operand2 );
+    }
+    T* operator|( const word operand2 ) const {
+        return reinterpret_cast<T*>( reinterpret_cast<word>(ref) | operand2 );
+    }
+};
+
+using tricky_pointer = tricky_atomic_pointer<queuing_rw_mutex::scoped_lock>;
 
 #if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
-// Workaround for overzealous compiler warnings
-#pragma warning(pop)
+    // Workaround for overzealous compiler warnings
+    #pragma warning (pop)
 #endif
 
-            //! Flag bits in a state_t that specify information about a locking request.
-            enum state_t_flags : unsigned char {
-                STATE_NONE = 0,
-                STATE_WRITER = 1 << 0,
-                STATE_READER = 1 << 1,
-                STATE_READER_UNBLOCKNEXT = 1 << 2,
-                STATE_ACTIVEREADER = 1 << 3,
-                STATE_UPGRADE_REQUESTED = 1 << 4,
-                STATE_UPGRADE_WAITING = 1 << 5,
-                STATE_UPGRADE_LOSER = 1 << 6,
-                STATE_COMBINED_WAITINGREADER = STATE_READER | STATE_READER_UNBLOCKNEXT,
-                STATE_COMBINED_READER = STATE_COMBINED_WAITINGREADER | STATE_ACTIVEREADER,
-                STATE_COMBINED_UPGRADING = STATE_UPGRADE_WAITING | STATE_UPGRADE_LOSER
-            };
-
-            static const unsigned char RELEASED = 0;
-            static const unsigned char ACQUIRED = 1;
-
-            struct queuing_rw_mutex_impl {
-                //! Try to acquire the internal lock
-                /** Returns true if lock was successfully acquired. */
-                static bool try_acquire_internal_lock(d1::queuing_rw_mutex::scoped_lock& s) {
-                    auto expected = RELEASED;
-                    return s.my_internal_lock.compare_exchange_strong(expected, ACQUIRED);
-                }
-
-                //! Acquire the internal lock
-                static void acquire_internal_lock(d1::queuing_rw_mutex::scoped_lock& s) {
-                    // Usually, we would use the test-test-and-set idiom here, with exponential backoff.
-                    // But so far, experiments indicate there is no value in doing so here.
-                    while (!try_acquire_internal_lock(s)) { machine_pause(1); }
-                }
-
-                //! Release the internal lock
-                static void release_internal_lock(d1::queuing_rw_mutex::scoped_lock& s) {
-                    s.my_internal_lock.store(RELEASED, std::memory_order_release);
-                }
-
-                //! Wait for internal lock to be released
-                static void wait_for_release_of_internal_lock(d1::queuing_rw_mutex::scoped_lock& s) {
-                    spin_wait_until_eq(s.my_internal_lock, RELEASED);
-                }
+//! Flag bits in a state_t that specify information about a locking request.
+enum state_t_flags : unsigned char {
+    STATE_NONE                   = 0,
+    STATE_WRITER                 = 1<<0,
+    STATE_READER                 = 1<<1,
+    STATE_READER_UNBLOCKNEXT     = 1<<2,
+    STATE_ACTIVEREADER           = 1<<3,
+    STATE_UPGRADE_REQUESTED      = 1<<4,
+    STATE_UPGRADE_WAITING        = 1<<5,
+    STATE_UPGRADE_LOSER          = 1<<6,
+    STATE_COMBINED_WAITINGREADER = STATE_READER | STATE_READER_UNBLOCKNEXT,
+    STATE_COMBINED_READER        = STATE_COMBINED_WAITINGREADER | STATE_ACTIVEREADER,
+    STATE_COMBINED_UPGRADING     = STATE_UPGRADE_WAITING | STATE_UPGRADE_LOSER
+};
+
+static const unsigned char RELEASED = 0;
+static const unsigned char ACQUIRED = 1;
+
+struct queuing_rw_mutex_impl {
+    //! Try to acquire the internal lock
+    /** Returns true if lock was successfully acquired. */
+    static bool try_acquire_internal_lock(d1::queuing_rw_mutex::scoped_lock& s)
+    {
+        auto expected = RELEASED;
+        return s.my_internal_lock.compare_exchange_strong(expected, ACQUIRED);
+    }
+
+    //! Acquire the internal lock
+    static void acquire_internal_lock(d1::queuing_rw_mutex::scoped_lock& s)
+    {
+        // Usually, we would use the test-test-and-set idiom here, with exponential backoff.
+        // But so far, experiments indicate there is no value in doing so here.
+        while( !try_acquire_internal_lock(s) ) {
+            machine_pause(1);
+        }
+    }
+
+    //! Release the internal lock
+    static void release_internal_lock(d1::queuing_rw_mutex::scoped_lock& s)
+    {
+        s.my_internal_lock.store(RELEASED, std::memory_order_release);
+    }
+
+    //! Wait for internal lock to be released
+    static void wait_for_release_of_internal_lock(d1::queuing_rw_mutex::scoped_lock& s)
+    {
+        spin_wait_until_eq(s.my_internal_lock, RELEASED);
+    }
+
+    //! A helper function
+    static void unblock_or_wait_on_internal_lock(d1::queuing_rw_mutex::scoped_lock& s, uintptr_t flag ) {
+        if( flag ) {
+            wait_for_release_of_internal_lock(s);
+        }
+        else {
+            release_internal_lock(s);
+        }
+    }
+
+    //! Mask for low order bit of a pointer.
+    static const tricky_pointer::word FLAG = 0x1;
+
+    static uintptr_t get_flag( d1::queuing_rw_mutex::scoped_lock* ptr ) {
+        return reinterpret_cast<uintptr_t>(ptr) & FLAG;
+    }
+
+    //------------------------------------------------------------------------
+    // Methods of queuing_rw_mutex::scoped_lock
+    //------------------------------------------------------------------------
+
+    //! A method to acquire queuing_rw_mutex lock
+    static void acquire(d1::queuing_rw_mutex& m, d1::queuing_rw_mutex::scoped_lock& s, bool write)
+    {
+        __TBB_ASSERT( !s.my_mutex, "scoped_lock is already holding a mutex");
+
+        // Must set all fields before the exchange, because once the
+        // exchange executes, *this becomes accessible to other threads.
+        s.my_mutex = &m;
+        s.my_prev.store(0U, std::memory_order_relaxed);
+        s.my_next.store(0U, std::memory_order_relaxed);
+        s.my_going.store(0U, std::memory_order_relaxed);
+        s.my_state.store(d1::queuing_rw_mutex::scoped_lock::state_t(write ? STATE_WRITER : STATE_READER), std::memory_order_relaxed);
+        s.my_internal_lock.store(RELEASED, std::memory_order_relaxed);
+
+
+        // The CAS must have release semantics, because we are
+        // "sending" the fields initialized above to other actors.
+        // We need acquire semantics, because we are acquiring the predecessor (or mutex if no predecessor)
+        queuing_rw_mutex::scoped_lock* predecessor = m.q_tail.exchange(&s, std::memory_order_acq_rel);
+
+        if( write ) {       // Acquiring for write
+
+            if( predecessor ) {
+                ITT_NOTIFY(sync_prepare, s.my_mutex);
+                predecessor = tricky_pointer(predecessor) & ~FLAG;
+                __TBB_ASSERT( !predecessor->my_next, "the predecessor has another successor!");
+                tricky_pointer::store(predecessor->my_next, &s, std::memory_order_release);
+                // We are acquiring the mutex
+                spin_wait_until_eq(s.my_going, 1U, std::memory_order_acquire);
+            }
 
-                //! A helper function
-                static void unblock_or_wait_on_internal_lock(d1::queuing_rw_mutex::scoped_lock& s,
-                                                             uintptr_t flag) {
-                    if (flag) {
-                        wait_for_release_of_internal_lock(s);
-                    } else {
-                        release_internal_lock(s);
+        } else {            // Acquiring for read
+    #if __TBB_USE_ITT_NOTIFY
+            bool sync_prepare_done = false;
+    #endif
+            if( predecessor ) {
+                unsigned char pred_state{};
+                __TBB_ASSERT( !s.my_prev.load(std::memory_order_relaxed), "the predecessor is already set" );
+                if( tricky_pointer(predecessor) & FLAG ) {
+                    /* this is only possible if predecessor is an upgrading reader and it signals us to wait */
+                    pred_state = STATE_UPGRADE_WAITING;
+                    predecessor = tricky_pointer(predecessor) & ~FLAG;
+                } else {
+                    // Load predecessor->my_state now, because once predecessor->my_next becomes
+                    // non-null, we must assume that *predecessor might be destroyed.
+                    pred_state = predecessor->my_state.load(std::memory_order_relaxed);
+                    if (pred_state == STATE_READER) {
+                        // Notify the previous reader to unblock us.
+                        predecessor->my_state.compare_exchange_strong(pred_state, STATE_READER_UNBLOCKNEXT, std::memory_order_relaxed);
+                    }
+                    if (pred_state == STATE_ACTIVEREADER)  { // either we initially read it or CAS failed
+                        // Active reader means that the predecessor already acquired the mutex and cannot notify us.
+                        // Therefore, we need to acquire the mutex ourselves by re-reading predecessor state.
+                        (void)predecessor->my_state.load(std::memory_order_acquire);
                     }
                 }
-
-                //! Mask for low order bit of a pointer.
-                static const tricky_pointer::word FLAG = 0x1;
-
-                static uintptr_t get_flag(d1::queuing_rw_mutex::scoped_lock* ptr) {
-                    return reinterpret_cast<uintptr_t>(ptr) & FLAG;
+                tricky_pointer::store(s.my_prev, predecessor, std::memory_order_relaxed);
+                __TBB_ASSERT( !( tricky_pointer(predecessor) & FLAG ), "use of corrupted pointer!" );
+                __TBB_ASSERT( !predecessor->my_next.load(std::memory_order_relaxed), "the predecessor has another successor!");
+                tricky_pointer::store(predecessor->my_next, &s, std::memory_order_release);
+                if( pred_state != STATE_ACTIVEREADER ) {
+    #if __TBB_USE_ITT_NOTIFY
+                    sync_prepare_done = true;
+                    ITT_NOTIFY(sync_prepare, s.my_mutex);
+    #endif
+                    // We are acquiring the mutex
+                    spin_wait_until_eq(s.my_going, 1U, std::memory_order_acquire);
                 }
+            }
 
-                //------------------------------------------------------------------------
-                // Methods of queuing_rw_mutex::scoped_lock
-                //------------------------------------------------------------------------
-
-                //! A method to acquire queuing_rw_mutex lock
-                static void acquire(d1::queuing_rw_mutex& m, d1::queuing_rw_mutex::scoped_lock& s,
-                                    bool write) {
-                    __TBB_ASSERT(!s.my_mutex, "scoped_lock is already holding a mutex");
-
-                    // Must set all fields before the exchange, because once the
-                    // exchange executes, *this becomes accessible to other threads.
-                    s.my_mutex = &m;
-                    s.my_prev.store(0U, std::memory_order_relaxed);
-                    s.my_next.store(0U, std::memory_order_relaxed);
-                    s.my_going.store(0U, std::memory_order_relaxed);
-                    s.my_state.store(
-                            d1::queuing_rw_mutex::scoped_lock::state_t(write ? STATE_WRITER : STATE_READER),
-                            std::memory_order_relaxed);
-                    s.my_internal_lock.store(RELEASED, std::memory_order_relaxed);
-
-                    // The CAS must have release semantics, because we are
-                    // "sending" the fields initialized above to other actors.
-                    // We need acquire semantics, because we are acquiring the predecessor (or mutex if no predecessor)
-                    queuing_rw_mutex::scoped_lock* predecessor
-                            = m.q_tail.exchange(&s, std::memory_order_acq_rel);
-
-                    if (write) {// Acquiring for write
-
-                        if (predecessor) {
-                            ITT_NOTIFY(sync_prepare, s.my_mutex);
-                            predecessor = tricky_pointer(predecessor) & ~FLAG;
-                            __TBB_ASSERT(!predecessor->my_next, "the predecessor has another successor!");
-                            tricky_pointer::store(predecessor->my_next, &s, std::memory_order_release);
-                            // We are acquiring the mutex
-                            spin_wait_until_eq(s.my_going, 1U, std::memory_order_acquire);
-                        }
-
-                    } else {// Acquiring for read
+            // The protected state must have been acquired here before it can be further released to any other reader(s):
+            unsigned char old_state = STATE_READER;
+            // When this reader is signaled by previous actor it acquires the mutex.
+            // We need to build happens-before relation with all other coming readers that will read our ACTIVEREADER
+            // without blocking on my_going. Therefore, we need to publish ACTIVEREADER with release semantics.
+            // On fail it is relaxed, because we will build happens-before on my_going.
+            s.my_state.compare_exchange_strong(old_state, STATE_ACTIVEREADER, std::memory_order_release, std::memory_order_relaxed);
+            if( old_state!=STATE_READER ) {
 #if __TBB_USE_ITT_NOTIFY
-                        bool sync_prepare_done = false;
-#endif
-                        if (predecessor) {
-                            unsigned char pred_state {};
-                            __TBB_ASSERT(!s.my_prev.load(std::memory_order_relaxed),
-                                         "the predecessor is already set");
-                            if (tricky_pointer(predecessor) & FLAG) {
-                                /* this is only possible if predecessor is an upgrading reader and it signals us to wait */
-                                pred_state = STATE_UPGRADE_WAITING;
-                                predecessor = tricky_pointer(predecessor) & ~FLAG;
-                            } else {
-                                // Load predecessor->my_state now, because once predecessor->my_next becomes
-                                // non-NULL, we must assume that *predecessor might be destroyed.
-                                pred_state = predecessor->my_state.load(std::memory_order_relaxed);
-                                if (pred_state == STATE_READER) {
-                                    // Notify the previous reader to unblock us.
-                                    predecessor->my_state.compare_exchange_strong(
-                                            pred_state, STATE_READER_UNBLOCKNEXT, std::memory_order_relaxed);
-                                }
-                                if (pred_state
-                                    == STATE_ACTIVEREADER) {// either we initially read it or CAS failed
-                                    // Active reader means that the predecessor already acquired the mutex and cannot notify us.
-                                    // Therefore, we need to acquire the mutex ourselves by re-reading predecessor state.
-                                    (void) predecessor->my_state.load(std::memory_order_acquire);
-                                }
-                            }
-                            tricky_pointer::store(s.my_prev, predecessor, std::memory_order_relaxed);
-                            __TBB_ASSERT(!(tricky_pointer(predecessor) & FLAG), "use of corrupted pointer!");
-                            __TBB_ASSERT(!predecessor->my_next.load(std::memory_order_relaxed),
-                                         "the predecessor has another successor!");
-                            tricky_pointer::store(predecessor->my_next, &s, std::memory_order_release);
-                            if (pred_state != STATE_ACTIVEREADER) {
-#if __TBB_USE_ITT_NOTIFY
-                                sync_prepare_done = true;
-                                ITT_NOTIFY(sync_prepare, s.my_mutex);
-#endif
-                                // We are acquiring the mutex
-                                spin_wait_until_eq(s.my_going, 1U, std::memory_order_acquire);
-                            }
-                        }
-
-                        // The protected state must have been acquired here before it can be further released to any other reader(s):
-                        unsigned char old_state = STATE_READER;
-                        // When this reader is signaled by previous actor it acquires the mutex.
-                        // We need to build happens-before relation with all other coming readers that will read our ACTIVEREADER
-                        // without blocking on my_going. Therefore, we need to publish ACTIVEREADER with release semantics.
-                        // On fail it is relaxed, because we will build happens-before on my_going.
-                        s.my_state.compare_exchange_strong(old_state, STATE_ACTIVEREADER,
-                                                           std::memory_order_release,
-                                                           std::memory_order_relaxed);
-                        if (old_state != STATE_READER) {
-#if __TBB_USE_ITT_NOTIFY
-                            if (!sync_prepare_done) ITT_NOTIFY(sync_prepare, s.my_mutex);
+                if( !sync_prepare_done )
+                    ITT_NOTIFY(sync_prepare, s.my_mutex);
 #endif
-                            // Failed to become active reader -> need to unblock the next waiting reader first
-                            __TBB_ASSERT(s.my_state.load(std::memory_order_relaxed)
-                                                 == STATE_READER_UNBLOCKNEXT,
-                                         "unexpected state");
-                            spin_wait_while_eq(s.my_next, 0U, std::memory_order_acquire);
-                            /* my_state should be changed before unblocking the next otherwise it might finish
+                // Failed to become active reader -> need to unblock the next waiting reader first
+                __TBB_ASSERT( s.my_state.load(std::memory_order_relaxed)==STATE_READER_UNBLOCKNEXT, "unexpected state" );
+                spin_wait_while_eq(s.my_next, 0U, std::memory_order_acquire);
+                /* my_state should be changed before unblocking the next otherwise it might finish
                    and another thread can get our old state and left blocked */
-                            s.my_state.store(STATE_ACTIVEREADER, std::memory_order_relaxed);
-                            tricky_pointer::load(s.my_next, std::memory_order_relaxed)
-                                    ->my_going.store(1U, std::memory_order_release);
-                        }
-                        __TBB_ASSERT(s.my_state.load(std::memory_order_relaxed) == STATE_ACTIVEREADER,
-                                     "unlocked reader is active reader");
-                    }
-
-                    ITT_NOTIFY(sync_acquired, s.my_mutex);
-                }
-
-                //! A method to acquire queuing_rw_mutex if it is free
-                static bool try_acquire(d1::queuing_rw_mutex& m, d1::queuing_rw_mutex::scoped_lock& s,
-                                        bool write) {
-                    __TBB_ASSERT(!s.my_mutex, "scoped_lock is already holding a mutex");
-
-                    if (m.q_tail.load(std::memory_order_relaxed))
-                        return false;// Someone already took the lock
-
-                    // Must set all fields before the exchange, because once the
-                    // exchange executes, *this becomes accessible to other threads.
-                    s.my_prev.store(0U, std::memory_order_relaxed);
-                    s.my_next.store(0U, std::memory_order_relaxed);
-                    s.my_going.store(0U, std::memory_order_relaxed);// TODO: remove dead assignment?
-                    s.my_state.store(d1::queuing_rw_mutex::scoped_lock::state_t(write ? STATE_WRITER
-                                                                                      : STATE_ACTIVEREADER),
-                                     std::memory_order_relaxed);
-                    s.my_internal_lock.store(RELEASED, std::memory_order_relaxed);
-
-                    // The CAS must have release semantics, because we are
-                    // "sending" the fields initialized above to other actors.
-                    // We need acquire semantics, because we are acquiring the mutex
-                    d1::queuing_rw_mutex::scoped_lock* expected = nullptr;
-                    if (!m.q_tail.compare_exchange_strong(expected, &s, std::memory_order_acq_rel))
-                        return false;// Someone already took the lock
-                    s.my_mutex = &m;
-                    ITT_NOTIFY(sync_acquired, s.my_mutex);
-                    return true;
+                s.my_state.store(STATE_ACTIVEREADER, std::memory_order_relaxed);
+                tricky_pointer::load(s.my_next, std::memory_order_relaxed)->my_going.store(1U, std::memory_order_release);
+            }
+            __TBB_ASSERT(s.my_state.load(std::memory_order_relaxed) == STATE_ACTIVEREADER, "unlocked reader is active reader");
+        }
+
+        ITT_NOTIFY(sync_acquired, s.my_mutex);
+    }
+
+    //! A method to acquire queuing_rw_mutex if it is free
+    static bool try_acquire(d1::queuing_rw_mutex& m, d1::queuing_rw_mutex::scoped_lock& s, bool write)
+    {
+        __TBB_ASSERT( !s.my_mutex, "scoped_lock is already holding a mutex");
+
+        if( m.q_tail.load(std::memory_order_relaxed) )
+            return false; // Someone already took the lock
+
+        // Must set all fields before the exchange, because once the
+        // exchange executes, *this becomes accessible to other threads.
+        s.my_prev.store(0U, std::memory_order_relaxed);
+        s.my_next.store(0U, std::memory_order_relaxed);
+        s.my_going.store(0U, std::memory_order_relaxed); // TODO: remove dead assignment?
+        s.my_state.store(d1::queuing_rw_mutex::scoped_lock::state_t(write ? STATE_WRITER : STATE_ACTIVEREADER), std::memory_order_relaxed);
+        s.my_internal_lock.store(RELEASED, std::memory_order_relaxed);
+
+        // The CAS must have release semantics, because we are
+        // "sending" the fields initialized above to other actors.
+        // We need acquire semantics, because we are acquiring the mutex
+        d1::queuing_rw_mutex::scoped_lock* expected = nullptr;
+        if (!m.q_tail.compare_exchange_strong(expected, &s, std::memory_order_acq_rel))
+            return false; // Someone already took the lock
+        s.my_mutex = &m;
+        ITT_NOTIFY(sync_acquired, s.my_mutex);
+        return true;
+    }
+
+    //! A method to release queuing_rw_mutex lock
+    static void release(d1::queuing_rw_mutex::scoped_lock& s) {
+        __TBB_ASSERT(s.my_mutex!=nullptr, "no lock acquired");
+
+        ITT_NOTIFY(sync_releasing, s.my_mutex);
+
+        if( s.my_state.load(std::memory_order_relaxed) == STATE_WRITER ) { // Acquired for write
+
+            // The logic below is the same as "writerUnlock", but elides
+            // "return" from the middle of the routine.
+            // In the statement below, acquire semantics of reading my_next is required
+            // so that following operations with fields of my_next are safe.
+            d1::queuing_rw_mutex::scoped_lock* next = tricky_pointer::load(s.my_next, std::memory_order_acquire);
+            if( !next ) {
+                d1::queuing_rw_mutex::scoped_lock* expected = &s;
+                // Release mutex on success otherwise wait for successor publication
+                if( s.my_mutex->q_tail.compare_exchange_strong(expected, nullptr,
+                    std::memory_order_release, std::memory_order_relaxed) )
+                {
+                    // this was the only item in the queue, and the queue is now empty.
+                    goto done;
                 }
+                spin_wait_while_eq(s.my_next, 0U, std::memory_order_relaxed);
+                next = tricky_pointer::load(s.my_next, std::memory_order_acquire);
+            }
+            next->my_going.store(2U, std::memory_order_relaxed); // protect next queue node from being destroyed too early
+            // If the next is STATE_UPGRADE_WAITING, it is expected to acquire all other released readers via release
+            // sequence in next->my_state. In that case, we need to preserve release sequence in next->my_state
+            // contributed by other reader. So, there are two approaches not to break the release sequence:
+            //   1. Use read-modify-write (exchange) operation to store with release the UPGRADE_LOSER state;
+            //   2. Acquire the release sequence and store the sequence and UPGRADE_LOSER state.
+            // The second approach seems better on x86 because it does not involve interlocked operations.
+            // Therefore, we read next->my_state with acquire while it is not required for else branch to get the 
+            // release sequence.
+            if( next->my_state.load(std::memory_order_acquire)==STATE_UPGRADE_WAITING ) {
+                // the next waiting for upgrade means this writer was upgraded before.
+                acquire_internal_lock(s);
+                // Responsibility transition, the one who reads uncorrupted my_prev will do release.
+                // Guarantee that above store of 2 into next->my_going happens-before resetting of next->my_prev
+                d1::queuing_rw_mutex::scoped_lock* tmp = tricky_pointer::exchange(next->my_prev, nullptr, std::memory_order_release);
+                // Pass the release sequence that we acquired with the above load of next->my_state.
+                next->my_state.store(STATE_UPGRADE_LOSER, std::memory_order_release);
+                // We are releasing the mutex
+                next->my_going.store(1U, std::memory_order_release);
+                unblock_or_wait_on_internal_lock(s, get_flag(tmp));
+            } else {
+                // next->state cannot be STATE_UPGRADE_REQUESTED
+                __TBB_ASSERT( next->my_state.load(std::memory_order_relaxed) & (STATE_COMBINED_WAITINGREADER | STATE_WRITER), "unexpected state" );
+                __TBB_ASSERT( !( next->my_prev.load(std::memory_order_relaxed) & FLAG ), "use of corrupted pointer!" );
+                // Guarantee that above store of 2 into next->my_going happens-before resetting of next->my_prev
+                tricky_pointer::store(next->my_prev, nullptr, std::memory_order_release);
+                // We are releasing the mutex
+                next->my_going.store(1U, std::memory_order_release);
+            }
 
-                //! A method to release queuing_rw_mutex lock
-                static void release(d1::queuing_rw_mutex::scoped_lock& s) {
-                    __TBB_ASSERT(s.my_mutex != nullptr, "no lock acquired");
-
-                    ITT_NOTIFY(sync_releasing, s.my_mutex);
-
-                    if (s.my_state.load(std::memory_order_relaxed) == STATE_WRITER) {// Acquired for write
-
-                        // The logic below is the same as "writerUnlock", but elides
-                        // "return" from the middle of the routine.
-                        // In the statement below, acquire semantics of reading my_next is required
-                        // so that following operations with fields of my_next are safe.
-                        d1::queuing_rw_mutex::scoped_lock* next
-                                = tricky_pointer::load(s.my_next, std::memory_order_acquire);
-                        if (!next) {
-                            d1::queuing_rw_mutex::scoped_lock* expected = &s;
-                            // Release mutex on success otherwise wait for successor publication
-                            if (s.my_mutex->q_tail.compare_exchange_strong(expected, nullptr,
-                                                                           std::memory_order_release,
-                                                                           std::memory_order_relaxed)) {
-                                // this was the only item in the queue, and the queue is now empty.
-                                goto done;
-                            }
-                            spin_wait_while_eq(s.my_next, 0U, std::memory_order_relaxed);
-                            next = tricky_pointer::load(s.my_next, std::memory_order_acquire);
-                        }
-                        next->my_going.store(
-                                2U,
-                                std::memory_order_relaxed);// protect next queue node from being destroyed too early
-                        // If the next is STATE_UPGRADE_WAITING, it is expected to acquire all other released readers via release
-                        // sequence in next->my_state. In that case, we need to preserve release sequence in next->my_state
-                        // contributed by other reader. So, there are two approaches not to break the release sequence:
-                        //   1. Use read-modify-write (exchange) operation to store with release the UPGRADE_LOSER state;
-                        //   2. Acquire the release sequence and store the sequence and UPGRADE_LOSER state.
-                        // The second approach seems better on x86 because it does not involve interlocked operations.
-                        // Therefore, we read next->my_state with acquire while it is not required for else branch to get the
-                        // release sequence.
-                        if (next->my_state.load(std::memory_order_acquire) == STATE_UPGRADE_WAITING) {
-                            // the next waiting for upgrade means this writer was upgraded before.
-                            acquire_internal_lock(s);
-                            // Responsibility transition, the one who reads uncorrupted my_prev will do release.
-                            // Guarantee that above store of 2 into next->my_going happens-before resetting of next->my_prev
-                            d1::queuing_rw_mutex::scoped_lock* tmp = tricky_pointer::exchange(
-                                    next->my_prev, nullptr, std::memory_order_release);
-                            // Pass the release sequence that we acquired with the above load of next->my_state.
-                            next->my_state.store(STATE_UPGRADE_LOSER, std::memory_order_release);
-                            // We are releasing the mutex
-                            next->my_going.store(1U, std::memory_order_release);
-                            unblock_or_wait_on_internal_lock(s, get_flag(tmp));
-                        } else {
-                            // next->state cannot be STATE_UPGRADE_REQUESTED
-                            __TBB_ASSERT(next->my_state.load(std::memory_order_relaxed)
-                                                 & (STATE_COMBINED_WAITINGREADER | STATE_WRITER),
-                                         "unexpected state");
-                            __TBB_ASSERT(!(next->my_prev.load(std::memory_order_relaxed) & FLAG),
-                                         "use of corrupted pointer!");
-                            // Guarantee that above store of 2 into next->my_going happens-before resetting of next->my_prev
-                            tricky_pointer::store(next->my_prev, nullptr, std::memory_order_release);
-                            // We are releasing the mutex
-                            next->my_going.store(1U, std::memory_order_release);
-                        }
-
-                    } else {// Acquired for read
-                        // The basic idea it to build happens-before relation with left and right readers via prev and next. In addition,
-                        // the first reader should acquire the left (prev) signal and propagate to right (next). To simplify, we always
-                        // build happens-before relation between left and right (left is happened before right).
-                        queuing_rw_mutex::scoped_lock* tmp = nullptr;
-                    retry:
-                        // Addition to the original paper: Mark my_prev as in use
-                        queuing_rw_mutex::scoped_lock* predecessor
-                                = tricky_pointer::fetch_add(s.my_prev, FLAG, std::memory_order_acquire);
-
-                        if (predecessor) {
-                            if (!(try_acquire_internal_lock(*predecessor))) {
-                                // Failed to acquire the lock on predecessor. The predecessor either unlinks or upgrades.
-                                // In the second case, it could or could not know my "in use" flag - need to check
-                                // Responsibility transition, the one who reads uncorrupted my_prev will do release.
-                                tmp = tricky_pointer::compare_exchange_strong(
-                                        s.my_prev, tricky_pointer(predecessor) | FLAG, predecessor,
-                                        std::memory_order_acquire);
-                                if (!(tricky_pointer(tmp) & FLAG)) {
-                                    __TBB_ASSERT(tricky_pointer::load(s.my_prev, std::memory_order_relaxed)
-                                                         != (tricky_pointer(predecessor) | FLAG),
-                                                 nullptr);
-                                    // Now owner of predecessor is waiting for _us_ to release its lock
-                                    release_internal_lock(*predecessor);
-                                }
-                                // else the "in use" flag is back -> the predecessor didn't get it and will release itself; nothing to do
-
-                                tmp = nullptr;
-                                goto retry;
-                            }
-                            __TBB_ASSERT(
-                                    predecessor
-                                            && predecessor->my_internal_lock.load(std::memory_order_relaxed)
-                                                       == ACQUIRED,
-                                    "predecessor's lock is not acquired");
-                            tricky_pointer::store(s.my_prev, predecessor, std::memory_order_relaxed);
-                            acquire_internal_lock(s);
-
-                            tricky_pointer::store(predecessor->my_next, nullptr, std::memory_order_release);
-
-                            d1::queuing_rw_mutex::scoped_lock* expected = &s;
-                            if (!tricky_pointer::load(s.my_next, std::memory_order_acquire)
-                                && !s.my_mutex->q_tail.compare_exchange_strong(expected, predecessor,
-                                                                               std::memory_order_release)) {
-                                spin_wait_while_eq(s.my_next, 0U, std::memory_order_acquire);
-                            }
-                            __TBB_ASSERT(!(s.my_next.load(std::memory_order_relaxed) & FLAG),
-                                         "use of corrupted pointer");
-
-                            // my_next is acquired either with load or spin_wait.
-                            if (d1::queuing_rw_mutex::scoped_lock* const l_next = tricky_pointer::load(
-                                        s.my_next,
-                                        std::memory_order_relaxed)) {// I->next != nil, TODO: rename to next after clearing up and adapting the n in the comment two lines below
-                                // Equivalent to I->next->prev = I->prev but protected against (prev[n]&FLAG)!=0
-                                tmp = tricky_pointer::exchange(l_next->my_prev, predecessor,
-                                                               std::memory_order_release);
-                                // I->prev->next = I->next;
-                                __TBB_ASSERT(tricky_pointer::load(s.my_prev, std::memory_order_relaxed)
-                                                     == predecessor,
-                                             nullptr);
-                                predecessor->my_next.store(s.my_next.load(std::memory_order_relaxed),
-                                                           std::memory_order_release);
-                            }
-                            // Safe to release in the order opposite to acquiring which makes the code simpler
-                            release_internal_lock(*predecessor);
-
-                        } else {                     // No predecessor when we looked
-                            acquire_internal_lock(s);// "exclusiveLock(&I->EL)"
-                            d1::queuing_rw_mutex::scoped_lock* next
-                                    = tricky_pointer::load(s.my_next, std::memory_order_acquire);
-                            if (!next) {
-                                d1::queuing_rw_mutex::scoped_lock* expected = &s;
-                                // Release mutex on success otherwise wait for successor publication
-                                if (!s.my_mutex->q_tail.compare_exchange_strong(expected, nullptr,
-                                                                                std::memory_order_release,
-                                                                                std::memory_order_relaxed)) {
-                                    spin_wait_while_eq(s.my_next, 0U, std::memory_order_relaxed);
-                                    next = tricky_pointer::load(s.my_next, std::memory_order_acquire);
-                                } else {
-                                    goto unlock_self;
-                                }
-                            }
-                            next->my_going.store(2U, std::memory_order_relaxed);
-                            // Responsibility transition, the one who reads uncorrupted my_prev will do release.
-                            tmp = tricky_pointer::exchange(next->my_prev, nullptr, std::memory_order_release);
-                            next->my_going.store(1U, std::memory_order_release);
-                        }
-                    unlock_self:
-                        unblock_or_wait_on_internal_lock(s, get_flag(tmp));
+        } else { // Acquired for read
+            // The basic idea it to build happens-before relation with left and right readers via prev and next. In addition,
+            // the first reader should acquire the left (prev) signal and propagate to right (next). To simplify, we always
+            // build happens-before relation between left and right (left is happened before right).
+            queuing_rw_mutex::scoped_lock *tmp = nullptr;
+    retry:
+            // Addition to the original paper: Mark my_prev as in use
+            queuing_rw_mutex::scoped_lock *predecessor = tricky_pointer::fetch_add(s.my_prev, FLAG, std::memory_order_acquire);
+
+            if( predecessor ) {
+                if( !(try_acquire_internal_lock(*predecessor)) )
+                {
+                    // Failed to acquire the lock on predecessor. The predecessor either unlinks or upgrades.
+                    // In the second case, it could or could not know my "in use" flag - need to check
+                    // Responsibility transition, the one who reads uncorrupted my_prev will do release.
+                    tmp = tricky_pointer::compare_exchange_strong(s.my_prev, tricky_pointer(predecessor) | FLAG, predecessor, std::memory_order_acquire);
+                    if( !(tricky_pointer(tmp) & FLAG) ) {
+                        __TBB_ASSERT(tricky_pointer::load(s.my_prev, std::memory_order_relaxed) != (tricky_pointer(predecessor) | FLAG), nullptr);
+                        // Now owner of predecessor is waiting for _us_ to release its lock
+                        release_internal_lock(*predecessor);
                     }
-                done:
-                    // Lifetime synchronization, no need to build happens-before relation
-                    spin_wait_while_eq(s.my_going, 2U, std::memory_order_relaxed);
+                    // else the "in use" flag is back -> the predecessor didn't get it and will release itself; nothing to do
 
-                    s.initialize();
+                    tmp = nullptr;
+                    goto retry;
                 }
+                __TBB_ASSERT(predecessor && predecessor->my_internal_lock.load(std::memory_order_relaxed)==ACQUIRED, "predecessor's lock is not acquired");
+                tricky_pointer::store(s.my_prev, predecessor, std::memory_order_relaxed);
+                acquire_internal_lock(s);
 
-                static bool downgrade_to_reader(d1::queuing_rw_mutex::scoped_lock& s) {
-                    if (s.my_state.load(std::memory_order_relaxed) == STATE_ACTIVEREADER)
-                        return true;// Already a reader
-
-                    ITT_NOTIFY(sync_releasing, s.my_mutex);
-                    d1::queuing_rw_mutex::scoped_lock* next
-                            = tricky_pointer::load(s.my_next, std::memory_order_acquire);
-                    if (!next) {
-                        s.my_state.store(STATE_READER, std::memory_order_seq_cst);
-                        // the following load of q_tail must not be reordered with setting STATE_READER above
-                        if (&s == s.my_mutex->q_tail.load(std::memory_order_seq_cst)) {
-                            unsigned char old_state = STATE_READER;
-                            // When this reader is signaled by previous actor it acquires the mutex.
-                            // We need to build happens-before relation with all other coming readers that will read our ACTIVEREADER
-                            // without blocking on my_going. Therefore, we need to publish ACTIVEREADER with release semantics.
-                            // On fail it is relaxed, because we will build happens-before on my_going.
-                            s.my_state.compare_exchange_strong(old_state, STATE_ACTIVEREADER,
-                                                               std::memory_order_release,
-                                                               std::memory_order_relaxed);
-                            if (old_state == STATE_READER) return true;// Downgrade completed
-                        }
-                        /* wait for the next to register */
-                        spin_wait_while_eq(s.my_next, 0U, std::memory_order_relaxed);
-                        next = tricky_pointer::load(s.my_next, std::memory_order_acquire);
-                    }
+                tricky_pointer::store(predecessor->my_next, nullptr, std::memory_order_release);
 
-                    __TBB_ASSERT(next, "still no successor at this point!");
-                    if (next->my_state.load(std::memory_order_relaxed) & STATE_COMBINED_WAITINGREADER)
-                        next->my_going.store(1U, std::memory_order_release);
-                    // If the next is STATE_UPGRADE_WAITING, it is expected to acquire all other released readers via release
-                    // sequence in next->my_state. In that case, we need to preserve release sequence in next->my_state
-                    // contributed by other reader. So, there are two approaches not to break the release sequence:
-                    //   1. Use read-modify-write (exchange) operation to store with release the UPGRADE_LOSER state;
-                    //   2. Acquire the release sequence and store the sequence and UPGRADE_LOSER state.
-                    // The second approach seems better on x86 because it does not involve interlocked operations.
-                    // Therefore, we read next->my_state with acquire while it is not required for else branch to get the
-                    // release sequence.
-                    else if (next->my_state.load(std::memory_order_acquire) == STATE_UPGRADE_WAITING)
-                        // the next waiting for upgrade means this writer was upgraded before.
-                        // To safe release sequence on next->my_state read it with acquire
-                        next->my_state.store(STATE_UPGRADE_LOSER, std::memory_order_release);
-                    s.my_state.store(STATE_ACTIVEREADER, std::memory_order_release);
-                    return true;
+                d1::queuing_rw_mutex::scoped_lock* expected = &s;
+                if( !tricky_pointer::load(s.my_next, std::memory_order_acquire) && !s.my_mutex->q_tail.compare_exchange_strong(expected, predecessor, std::memory_order_release) ) {
+                    spin_wait_while_eq( s.my_next, 0U, std::memory_order_acquire );
                 }
+                __TBB_ASSERT( !(s.my_next.load(std::memory_order_relaxed) & FLAG), "use of corrupted pointer" );
+
+                // my_next is acquired either with load or spin_wait.
+                if(d1::queuing_rw_mutex::scoped_lock *const l_next = tricky_pointer::load(s.my_next, std::memory_order_relaxed) ) { // I->next != nil, TODO: rename to next after clearing up and adapting the n in the comment two lines below
+                    // Equivalent to I->next->prev = I->prev but protected against (prev[n]&FLAG)!=0
+                    tmp = tricky_pointer::exchange(l_next->my_prev, predecessor, std::memory_order_release);
+                    // I->prev->next = I->next;
+                    __TBB_ASSERT(tricky_pointer::load(s.my_prev, std::memory_order_relaxed)==predecessor, nullptr);
+                    predecessor->my_next.store(s.my_next.load(std::memory_order_relaxed), std::memory_order_release);
+                }
+                // Safe to release in the order opposite to acquiring which makes the code simpler
+                release_internal_lock(*predecessor);
 
-                static bool upgrade_to_writer(d1::queuing_rw_mutex::scoped_lock& s) {
-                    if (s.my_state.load(std::memory_order_relaxed) == STATE_WRITER) {
-                        // Already a writer
-                        return true;
-                    }
-
-                    __TBB_ASSERT(s.my_state.load(std::memory_order_relaxed) == STATE_ACTIVEREADER,
-                                 "only active reader can be updated");
-
-                    queuing_rw_mutex::scoped_lock* tmp {};
-                    queuing_rw_mutex::scoped_lock* me = &s;
-
-                    ITT_NOTIFY(sync_releasing, s.my_mutex);
-                    // Publish ourselves into my_state that other UPGRADE_WAITING actors can acquire our state.
-                    s.my_state.store(STATE_UPGRADE_REQUESTED, std::memory_order_release);
-                requested:
-                    __TBB_ASSERT(!(s.my_next.load(std::memory_order_relaxed) & FLAG),
-                                 "use of corrupted pointer!");
-                    acquire_internal_lock(s);
+            } else { // No predecessor when we looked
+                acquire_internal_lock(s);  // "exclusiveLock(&I->EL)"
+                d1::queuing_rw_mutex::scoped_lock* next = tricky_pointer::load(s.my_next, std::memory_order_acquire);
+                if( !next ) {
                     d1::queuing_rw_mutex::scoped_lock* expected = &s;
-                    if (!s.my_mutex->q_tail.compare_exchange_strong(expected, tricky_pointer(me) | FLAG,
-                                                                    std::memory_order_acq_rel)) {
-                        spin_wait_while_eq(s.my_next, 0U, std::memory_order_relaxed);
-                        queuing_rw_mutex::scoped_lock* next;
-                        next = tricky_pointer::fetch_add(s.my_next, FLAG, std::memory_order_acquire);
-                        // While we were READER the next READER might reach STATE_UPGRADE_WAITING state.
-                        // Therefore, it did not build happens before relation with us and we need to acquire the
-                        // next->my_state to build the happens before relation ourselves
-                        unsigned short n_state = next->my_state.load(std::memory_order_acquire);
-                        /* the next reader can be blocked by our state. the best thing to do is to unblock it */
-                        if (n_state & STATE_COMBINED_WAITINGREADER)
-                            next->my_going.store(1U, std::memory_order_release);
-                        // Responsibility transition, the one who reads uncorrupted my_prev will do release.
-                        tmp = tricky_pointer::exchange(next->my_prev, &s, std::memory_order_release);
-                        unblock_or_wait_on_internal_lock(s, get_flag(tmp));
-                        if (n_state & (STATE_COMBINED_READER | STATE_UPGRADE_REQUESTED)) {
-                            // save next|FLAG for simplicity of following comparisons
-                            tmp = tricky_pointer(next) | FLAG;
-                            for (atomic_backoff b;
-                                 tricky_pointer::load(s.my_next, std::memory_order_relaxed) == tmp;
-                                 b.pause()) {
-                                if (s.my_state.load(std::memory_order_acquire) & STATE_COMBINED_UPGRADING) {
-                                    if (tricky_pointer::load(s.my_next, std::memory_order_acquire) == tmp)
-                                        tricky_pointer::store(s.my_next, next, std::memory_order_relaxed);
-                                    goto waiting;
-                                }
-                            }
-                            __TBB_ASSERT(tricky_pointer::load(s.my_next, std::memory_order_relaxed)
-                                                 != (tricky_pointer(next) | FLAG),
-                                         nullptr);
-                            goto requested;
-                        } else {
-                            __TBB_ASSERT(n_state & (STATE_WRITER | STATE_UPGRADE_WAITING),
-                                         "unexpected state");
-                            __TBB_ASSERT(
-                                    (tricky_pointer(next) | FLAG)
-                                            == tricky_pointer::load(s.my_next, std::memory_order_relaxed),
-                                    nullptr);
-                            tricky_pointer::store(s.my_next, next, std::memory_order_relaxed);
-                        }
-                    } else {
-                        /* We are in the tail; whoever comes next is blocked by q_tail&FLAG */
-                        release_internal_lock(s);
-                    }// if( this != my_mutex->q_tail... )
+                    // Release mutex on success otherwise wait for successor publication
+                    if( !s.my_mutex->q_tail.compare_exchange_strong(expected, nullptr,
+                        std::memory_order_release, std::memory_order_relaxed) )
                     {
-                        unsigned char old_state = STATE_UPGRADE_REQUESTED;
-                        // If we reach STATE_UPGRADE_WAITING state we do not build happens-before relation with READER on
-                        // left. We delegate this responsibility to READER on left when it try upgrading. Therefore, we are releasing
-                        // on success.
-                        // Otherwise, on fail, we already acquired the next->my_state.
-                        s.my_state.compare_exchange_strong(old_state, STATE_UPGRADE_WAITING,
-                                                           std::memory_order_release,
-                                                           std::memory_order_relaxed);
-                    }
-                waiting:
-                    __TBB_ASSERT(!(s.my_next.load(std::memory_order_relaxed) & FLAG),
-                                 "use of corrupted pointer!");
-                    __TBB_ASSERT(s.my_state & STATE_COMBINED_UPGRADING,
-                                 "wrong state at upgrade waiting_retry");
-                    __TBB_ASSERT(me == &s, nullptr);
-                    ITT_NOTIFY(sync_prepare, s.my_mutex);
-                    /* if no one was blocked by the "corrupted" q_tail, turn it back */
-                    expected = tricky_pointer(me) | FLAG;
-                    s.my_mutex->q_tail.compare_exchange_strong(expected, &s, std::memory_order_release);
-                    queuing_rw_mutex::scoped_lock* predecessor;
-                    // Mark my_prev as 'in use' to prevent predecessor from releasing
-                    predecessor = tricky_pointer::fetch_add(s.my_prev, FLAG, std::memory_order_acquire);
-                    if (predecessor) {
-                        bool success = try_acquire_internal_lock(*predecessor);
-                        {
-                            // While the predecessor pointer (my_prev) is in use (FLAG is set), we can safely update the node`s state.
-                            // Corrupted pointer transitions responsibility to release the predecessor`s node on us.
-                            unsigned char old_state = STATE_UPGRADE_REQUESTED;
-                            // Try to build happens before with the upgrading READER on left. If fail, the predecessor state is not
-                            // important for us because it will acquire our state.
-                            predecessor->my_state.compare_exchange_strong(old_state, STATE_UPGRADE_WAITING,
-                                                                          std::memory_order_release,
-                                                                          std::memory_order_relaxed);
-                        }
-                        if (!success) {
-                            // Responsibility transition, the one who reads uncorrupted my_prev will do release.
-                            tmp = tricky_pointer::compare_exchange_strong(
-                                    s.my_prev, tricky_pointer(predecessor) | FLAG, predecessor,
-                                    std::memory_order_acquire);
-                            if (tricky_pointer(tmp) & FLAG) {
-                                tricky_pointer::spin_wait_while_eq(s.my_prev, predecessor);
-                                predecessor = tricky_pointer::load(s.my_prev, std::memory_order_relaxed);
-                            } else {
-                                // TODO: spin_wait condition seems never reachable
-                                tricky_pointer::spin_wait_while_eq(s.my_prev,
-                                                                   tricky_pointer(predecessor) | FLAG);
-                                release_internal_lock(*predecessor);
-                            }
-                        } else {
-                            tricky_pointer::store(s.my_prev, predecessor, std::memory_order_relaxed);
-                            release_internal_lock(*predecessor);
-                            tricky_pointer::spin_wait_while_eq(s.my_prev, predecessor);
-                            predecessor = tricky_pointer::load(s.my_prev, std::memory_order_relaxed);
-                        }
-                        if (predecessor) goto waiting;
+                        spin_wait_while_eq( s.my_next, 0U, std::memory_order_relaxed );
+                        next = tricky_pointer::load(s.my_next, std::memory_order_acquire);
                     } else {
-                        tricky_pointer::store(s.my_prev, nullptr, std::memory_order_relaxed);
+                        goto unlock_self;
                     }
-                    __TBB_ASSERT(!predecessor && !s.my_prev, nullptr);
-
-                    // additional lifetime issue prevention checks
-                    // wait for the successor to finish working with my fields
-                    wait_for_release_of_internal_lock(s);
-                    // now wait for the predecessor to finish working with my fields
-                    spin_wait_while_eq(s.my_going, 2U);
-
-                    bool result = (s.my_state != STATE_UPGRADE_LOSER);
-                    s.my_state.store(STATE_WRITER, std::memory_order_relaxed);
-                    s.my_going.store(1U, std::memory_order_relaxed);
-
-                    ITT_NOTIFY(sync_acquired, s.my_mutex);
-                    return result;
-                }
-
-                static bool is_writer(const d1::queuing_rw_mutex::scoped_lock& m) {
-                    return m.my_state.load(std::memory_order_relaxed) == STATE_WRITER;
-                }
-
-                static void construct(d1::queuing_rw_mutex& m) {
-                    suppress_unused_warning(m);
-                    ITT_SYNC_CREATE(&m, _T("tbb::queuing_rw_mutex"), _T(""));
                 }
-            };
-
-            void __TBB_EXPORTED_FUNC acquire(d1::queuing_rw_mutex& m, d1::queuing_rw_mutex::scoped_lock& s,
-                                             bool write) {
-                queuing_rw_mutex_impl::acquire(m, s, write);
+                next->my_going.store(2U, std::memory_order_relaxed);
+                // Responsibility transition, the one who reads uncorrupted my_prev will do release.
+                tmp = tricky_pointer::exchange(next->my_prev, nullptr, std::memory_order_release);
+                next->my_going.store(1U, std::memory_order_release);
             }
-
-            bool __TBB_EXPORTED_FUNC try_acquire(d1::queuing_rw_mutex& m,
-                                                 d1::queuing_rw_mutex::scoped_lock& s, bool write) {
-                return queuing_rw_mutex_impl::try_acquire(m, s, write);
+    unlock_self:
+            unblock_or_wait_on_internal_lock(s, get_flag(tmp));
+        }
+    done:
+        // Lifetime synchronization, no need to build happens-before relation
+        spin_wait_while_eq( s.my_going, 2U, std::memory_order_relaxed );
+
+        s.initialize();
+    }
+
+    static bool downgrade_to_reader(d1::queuing_rw_mutex::scoped_lock& s) {
+        if ( s.my_state.load(std::memory_order_relaxed) == STATE_ACTIVEREADER ) return true; // Already a reader
+
+        ITT_NOTIFY(sync_releasing, s.my_mutex);
+        d1::queuing_rw_mutex::scoped_lock* next = tricky_pointer::load(s.my_next, std::memory_order_acquire);
+        if( !next ) {
+            s.my_state.store(STATE_READER, std::memory_order_seq_cst);
+            // the following load of q_tail must not be reordered with setting STATE_READER above
+            if( &s == s.my_mutex->q_tail.load(std::memory_order_seq_cst) ) {
+                unsigned char old_state = STATE_READER;
+                // When this reader is signaled by previous actor it acquires the mutex.
+                // We need to build happens-before relation with all other coming readers that will read our ACTIVEREADER
+                // without blocking on my_going. Therefore, we need to publish ACTIVEREADER with release semantics.
+                // On fail it is relaxed, because we will build happens-before on my_going.
+                s.my_state.compare_exchange_strong(old_state, STATE_ACTIVEREADER, std::memory_order_release, std::memory_order_relaxed);
+                if( old_state==STATE_READER )
+                    return true; // Downgrade completed
             }
-
-            void __TBB_EXPORTED_FUNC release(d1::queuing_rw_mutex::scoped_lock& s) {
-                queuing_rw_mutex_impl::release(s);
-            }
-
-            bool __TBB_EXPORTED_FUNC upgrade_to_writer(d1::queuing_rw_mutex::scoped_lock& s) {
-                return queuing_rw_mutex_impl::upgrade_to_writer(s);
+            /* wait for the next to register */
+            spin_wait_while_eq(s.my_next, 0U, std::memory_order_relaxed);
+            next = tricky_pointer::load(s.my_next, std::memory_order_acquire);
+        }
+
+        __TBB_ASSERT( next, "still no successor at this point!" );
+        if( next->my_state.load(std::memory_order_relaxed) & STATE_COMBINED_WAITINGREADER )
+            next->my_going.store(1U, std::memory_order_release);
+        // If the next is STATE_UPGRADE_WAITING, it is expected to acquire all other released readers via release
+        // sequence in next->my_state. In that case, we need to preserve release sequence in next->my_state
+        // contributed by other reader. So, there are two approaches not to break the release sequence:
+        //   1. Use read-modify-write (exchange) operation to store with release the UPGRADE_LOSER state;
+        //   2. Acquire the release sequence and store the sequence and UPGRADE_LOSER state.
+        // The second approach seems better on x86 because it does not involve interlocked operations.
+        // Therefore, we read next->my_state with acquire while it is not required for else branch to get the 
+        // release sequence.
+        else if( next->my_state.load(std::memory_order_acquire)==STATE_UPGRADE_WAITING )
+            // the next waiting for upgrade means this writer was upgraded before.
+            // To safe release sequence on next->my_state read it with acquire
+            next->my_state.store(STATE_UPGRADE_LOSER, std::memory_order_release);
+        s.my_state.store(STATE_ACTIVEREADER, std::memory_order_release);
+        return true;
+    }
+
+    static bool upgrade_to_writer(d1::queuing_rw_mutex::scoped_lock& s) {
+        if (s.my_state.load(std::memory_order_relaxed) == STATE_WRITER) {
+            // Already a writer
+            return true;
+        }
+
+        __TBB_ASSERT(s.my_state.load(std::memory_order_relaxed) == STATE_ACTIVEREADER, "only active reader can be updated");
+
+        queuing_rw_mutex::scoped_lock* tmp{};
+        queuing_rw_mutex::scoped_lock* me = &s;
+
+        ITT_NOTIFY(sync_releasing, s.my_mutex);
+        // Publish ourselves into my_state that other UPGRADE_WAITING actors can acquire our state.
+        s.my_state.store(STATE_UPGRADE_REQUESTED, std::memory_order_release);
+    requested:
+        __TBB_ASSERT( !(s.my_next.load(std::memory_order_relaxed) & FLAG), "use of corrupted pointer!" );
+        acquire_internal_lock(s);
+        d1::queuing_rw_mutex::scoped_lock* expected = &s;
+        if( !s.my_mutex->q_tail.compare_exchange_strong(expected, tricky_pointer(me)|FLAG, std::memory_order_acq_rel) ) {
+            spin_wait_while_eq( s.my_next, 0U, std::memory_order_relaxed );
+            queuing_rw_mutex::scoped_lock * next;
+            next = tricky_pointer::fetch_add(s.my_next, FLAG, std::memory_order_acquire);
+            // While we were READER the next READER might reach STATE_UPGRADE_WAITING state.
+            // Therefore, it did not build happens before relation with us and we need to acquire the 
+            // next->my_state to build the happens before relation ourselves
+            unsigned short n_state = next->my_state.load(std::memory_order_acquire);
+            /* the next reader can be blocked by our state. the best thing to do is to unblock it */
+            if( n_state & STATE_COMBINED_WAITINGREADER )
+                next->my_going.store(1U, std::memory_order_release);
+            // Responsibility transition, the one who reads uncorrupted my_prev will do release.
+            tmp = tricky_pointer::exchange(next->my_prev, &s, std::memory_order_release);
+            unblock_or_wait_on_internal_lock(s, get_flag(tmp));
+            if( n_state & (STATE_COMBINED_READER | STATE_UPGRADE_REQUESTED) ) {
+                // save next|FLAG for simplicity of following comparisons
+                tmp = tricky_pointer(next)|FLAG;
+                for( atomic_backoff b; tricky_pointer::load(s.my_next, std::memory_order_relaxed)==tmp; b.pause() ) {
+                    if( s.my_state.load(std::memory_order_acquire) & STATE_COMBINED_UPGRADING ) {
+                        if( tricky_pointer::load(s.my_next, std::memory_order_acquire)==tmp )
+                            tricky_pointer::store(s.my_next, next, std::memory_order_relaxed);
+                        goto waiting;
+                    }
+                }
+                __TBB_ASSERT(tricky_pointer::load(s.my_next, std::memory_order_relaxed) != (tricky_pointer(next)|FLAG), nullptr);
+                goto requested;
+            } else {
+                __TBB_ASSERT( n_state & (STATE_WRITER | STATE_UPGRADE_WAITING), "unexpected state");
+                __TBB_ASSERT( (tricky_pointer(next)|FLAG) == tricky_pointer::load(s.my_next, std::memory_order_relaxed), nullptr);
+                tricky_pointer::store(s.my_next, next, std::memory_order_relaxed);
             }
-
-            bool __TBB_EXPORTED_FUNC is_writer(const d1::queuing_rw_mutex::scoped_lock& s) {
-                return queuing_rw_mutex_impl::is_writer(s);
+        } else {
+            /* We are in the tail; whoever comes next is blocked by q_tail&FLAG */
+            release_internal_lock(s);
+        } // if( this != my_mutex->q_tail... )
+        {
+            unsigned char old_state = STATE_UPGRADE_REQUESTED;
+            // If we reach STATE_UPGRADE_WAITING state we do not build happens-before relation with READER on
+            // left. We delegate this responsibility to READER on left when it try upgrading. Therefore, we are releasing
+            // on success.
+            // Otherwise, on fail, we already acquired the next->my_state.
+            s.my_state.compare_exchange_strong(old_state, STATE_UPGRADE_WAITING, std::memory_order_release, std::memory_order_relaxed);
+        }
+    waiting:
+        __TBB_ASSERT( !( s.my_next.load(std::memory_order_relaxed) & FLAG ), "use of corrupted pointer!" );
+        __TBB_ASSERT( s.my_state & STATE_COMBINED_UPGRADING, "wrong state at upgrade waiting_retry" );
+        __TBB_ASSERT( me==&s, nullptr );
+        ITT_NOTIFY(sync_prepare, s.my_mutex);
+        /* if no one was blocked by the "corrupted" q_tail, turn it back */
+        expected = tricky_pointer(me)|FLAG;
+        s.my_mutex->q_tail.compare_exchange_strong(expected, &s, std::memory_order_release);
+        queuing_rw_mutex::scoped_lock * predecessor;
+        // Mark my_prev as 'in use' to prevent predecessor from releasing
+        predecessor = tricky_pointer::fetch_add(s.my_prev, FLAG, std::memory_order_acquire);
+        if( predecessor ) {
+            bool success = try_acquire_internal_lock(*predecessor);
+            {
+                // While the predecessor pointer (my_prev) is in use (FLAG is set), we can safely update the node`s state.
+                // Corrupted pointer transitions responsibility to release the predecessor`s node on us.
+                unsigned char old_state = STATE_UPGRADE_REQUESTED;
+                // Try to build happens before with the upgrading READER on left. If fail, the predecessor state is not
+                // important for us because it will acquire our state.
+                predecessor->my_state.compare_exchange_strong(old_state, STATE_UPGRADE_WAITING, std::memory_order_release,
+                    std::memory_order_relaxed);
             }
-
-            bool __TBB_EXPORTED_FUNC downgrade_to_reader(d1::queuing_rw_mutex::scoped_lock& s) {
-                return queuing_rw_mutex_impl::downgrade_to_reader(s);
-            }
-
-            void __TBB_EXPORTED_FUNC construct(d1::queuing_rw_mutex& m) {
-                queuing_rw_mutex_impl::construct(m);
+            if( !success ) {
+                // Responsibility transition, the one who reads uncorrupted my_prev will do release.
+                tmp = tricky_pointer::compare_exchange_strong(s.my_prev, tricky_pointer(predecessor)|FLAG, predecessor, std::memory_order_acquire);
+                if( tricky_pointer(tmp) & FLAG ) {
+                    tricky_pointer::spin_wait_while_eq(s.my_prev, predecessor);
+                    predecessor = tricky_pointer::load(s.my_prev, std::memory_order_relaxed);
+                } else {
+                    // TODO: spin_wait condition seems never reachable
+                    tricky_pointer::spin_wait_while_eq(s.my_prev, tricky_pointer(predecessor)|FLAG);
+                    release_internal_lock(*predecessor);
+                }
+            } else {
+                tricky_pointer::store(s.my_prev, predecessor, std::memory_order_relaxed);
+                release_internal_lock(*predecessor);
+                tricky_pointer::spin_wait_while_eq(s.my_prev, predecessor);
+                predecessor = tricky_pointer::load(s.my_prev, std::memory_order_relaxed);
             }
-
-        }// namespace r1
-    }    // namespace detail
-}// namespace tbb
+            if( predecessor )
+                goto waiting;
+        } else {
+            tricky_pointer::store(s.my_prev, nullptr, std::memory_order_relaxed);
+        }
+        __TBB_ASSERT( !predecessor && !s.my_prev, nullptr );
+
+        // additional lifetime issue prevention checks
+        // wait for the successor to finish working with my fields
+        wait_for_release_of_internal_lock(s);
+        // now wait for the predecessor to finish working with my fields
+        spin_wait_while_eq( s.my_going, 2U );
+
+        bool result = ( s.my_state != STATE_UPGRADE_LOSER );
+        s.my_state.store(STATE_WRITER, std::memory_order_relaxed);
+        s.my_going.store(1U, std::memory_order_relaxed);
+
+        ITT_NOTIFY(sync_acquired, s.my_mutex);
+        return result;
+    }
+
+    static bool is_writer(const d1::queuing_rw_mutex::scoped_lock& m) {
+        return m.my_state.load(std::memory_order_relaxed) == STATE_WRITER;
+    }
+
+    static void construct(d1::queuing_rw_mutex& m) {
+        suppress_unused_warning(m);
+        ITT_SYNC_CREATE(&m, _T("tbb::queuing_rw_mutex"), _T(""));
+    }
+};
+
+void __TBB_EXPORTED_FUNC acquire(d1::queuing_rw_mutex& m, d1::queuing_rw_mutex::scoped_lock& s, bool write) {
+    queuing_rw_mutex_impl::acquire(m, s, write);
+}
+
+bool __TBB_EXPORTED_FUNC try_acquire(d1::queuing_rw_mutex& m, d1::queuing_rw_mutex::scoped_lock& s, bool write) {
+    return queuing_rw_mutex_impl::try_acquire(m, s, write);
+}
+
+void __TBB_EXPORTED_FUNC release(d1::queuing_rw_mutex::scoped_lock& s) {
+    queuing_rw_mutex_impl::release(s);
+}
+
+bool __TBB_EXPORTED_FUNC upgrade_to_writer(d1::queuing_rw_mutex::scoped_lock& s) {
+    return queuing_rw_mutex_impl::upgrade_to_writer(s);
+}
+
+bool __TBB_EXPORTED_FUNC is_writer(const d1::queuing_rw_mutex::scoped_lock& s) {
+    return queuing_rw_mutex_impl::is_writer(s);
+}
+
+bool __TBB_EXPORTED_FUNC downgrade_to_reader(d1::queuing_rw_mutex::scoped_lock& s) {
+    return queuing_rw_mutex_impl::downgrade_to_reader(s);
+}
+
+TBB_EXPORT void __TBB_EXPORTED_FUNC construct(d1::queuing_rw_mutex& m) {
+    queuing_rw_mutex_impl::construct(m);
+}
+
+} // namespace r1
+} // namespace detail
+} // namespace tbb
diff --git a/external/tbb/src/tbb/rml_tbb.cpp b/external/tbb/src/tbb/rml_tbb.cpp
index d2020412..d1cd285c 100644
--- a/external/tbb/src/tbb/rml_tbb.cpp
+++ b/external/tbb/src/tbb/rml_tbb.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2023 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -16,28 +16,27 @@
 
 #include "oneapi/tbb/detail/_assert.h"
 
-#include "dynamic_link.h"
 #include "rml_tbb.h"
+#include "dynamic_link.h"
 
 namespace tbb {
-    namespace detail {
-        namespace r1 {
-            namespace rml {
+namespace detail {
+namespace r1 {
+namespace rml {
 
-#define MAKE_SERVER(x) DLD(__TBB_make_rml_server, x)
-#define GET_INFO(x) DLD(__TBB_call_with_my_server_info, x)
+#define MAKE_SERVER(x) DLD(__TBB_make_rml_server,x)
+#define GET_INFO(x) DLD(__TBB_call_with_my_server_info,x)
 #define SERVER tbb_server
 #define CLIENT tbb_client
 #define FACTORY tbb_factory
 
 #if __TBB_WEAK_SYMBOLS_PRESENT
-#pragma weak __TBB_make_rml_server
-#pragma weak __TBB_call_with_my_server_info
-                extern "C" {
-                ::rml::factory::status_type
-                __TBB_make_rml_server(rml::tbb_factory& f, rml::tbb_server*& server, rml::tbb_client& client);
-                void __TBB_call_with_my_server_info(::rml::server_info_callback_t cb, void* arg);
-                }
+    #pragma weak __TBB_make_rml_server
+    #pragma weak __TBB_call_with_my_server_info
+    extern "C" {
+        ::rml::factory::status_type __TBB_make_rml_server( rml::tbb_factory& f, rml::tbb_server*& server, rml::tbb_client& client );
+        void __TBB_call_with_my_server_info( ::rml::server_info_callback_t cb, void* arg );
+    }
 #endif /* __TBB_WEAK_SYMBOLS_PRESENT */
 
 #if TBB_USE_DEBUG
@@ -50,7 +49,7 @@ namespace tbb {
 #if _WIN32 || _WIN64
 #define RML_SERVER_NAME "irml" DEBUG_SUFFIX ".dll"
 #elif __APPLE__
-#define RML_SERVER_NAME "libirml" DEBUG_SUFFIX ".dylib"
+#define RML_SERVER_NAME "libirml" DEBUG_SUFFIX ".1.dylib"
 #elif __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __sun || _AIX
 #define RML_SERVER_NAME "libirml" DEBUG_SUFFIX ".so"
 #elif __unix__
@@ -59,56 +58,55 @@ namespace tbb {
 #error Unknown OS
 #endif
 
-                const ::rml::versioned_object::version_type CLIENT_VERSION = 2;
+const ::rml::versioned_object::version_type CLIENT_VERSION = 2;
 
 #if __TBB_WEAK_SYMBOLS_PRESENT
-#pragma weak __RML_open_factory
-#pragma weak __RML_close_factory
-                extern "C" {
-                ::rml::factory::status_type __RML_open_factory(::rml::factory&,
-                                                               ::rml::versioned_object::version_type&,
-                                                               ::rml::versioned_object::version_type);
-                void __RML_close_factory(::rml::factory& f);
-                }
+    #pragma weak __RML_open_factory
+    #pragma weak __RML_close_factory
+    extern "C" {
+        ::rml::factory::status_type __RML_open_factory ( ::rml::factory&, ::rml::versioned_object::version_type&, ::rml::versioned_object::version_type );
+        void __RML_close_factory( ::rml::factory& f );
+    }
 #endif /* __TBB_WEAK_SYMBOLS_PRESENT */
 
-                ::rml::factory::status_type FACTORY::open() {
-                    // Failure of following assertion indicates that factory is already open, or not zero-inited.
-                    __TBB_ASSERT_EX(!library_handle, NULL);
-                    status_type (*open_factory_routine)(factory&, version_type&, version_type);
-                    dynamic_link_descriptor server_link_table[4] = {
-                            DLD(__RML_open_factory, open_factory_routine),
-                            MAKE_SERVER(my_make_server_routine),
-                            DLD(__RML_close_factory, my_wait_to_close_routine),
-                            GET_INFO(my_call_with_server_info_routine),
-                    };
-                    status_type result;
-                    if (dynamic_link(RML_SERVER_NAME, server_link_table, 4, &library_handle)) {
-                        version_type server_version;
-                        result = (*open_factory_routine)(*this, server_version, CLIENT_VERSION);
-                        // server_version can be checked here for incompatibility if necessary.
-                    } else {
-                        library_handle = NULL;
-                        result = st_not_found;
-                    }
-                    return result;
-                }
-
-                void FACTORY::close() {
-                    if (library_handle) (*my_wait_to_close_routine)(*this);
-                    if ((size_t) library_handle > FACTORY::c_dont_unload) {
-                        dynamic_unlink(library_handle);
-                        library_handle = NULL;
-                    }
-                }
-
-                ::rml::factory::status_type FACTORY::make_server(SERVER*& s, CLIENT& c) {
-                    // Failure of following assertion means that factory was not successfully opened.
-                    __TBB_ASSERT_EX(my_make_server_routine, NULL);
-                    return (*my_make_server_routine)(*this, s, c);
-                }
-
-            }// namespace rml
-        }    // namespace r1
-    }        // namespace detail
-}// namespace tbb
+::rml::factory::status_type FACTORY::open() {
+    // Failure of following assertion indicates that factory is already open, or not zero-inited.
+    __TBB_ASSERT_EX( !library_handle, nullptr);
+    status_type (*open_factory_routine)( factory&, version_type&, version_type );
+    dynamic_link_descriptor server_link_table[4] = {
+        DLD(__RML_open_factory,open_factory_routine),
+        MAKE_SERVER(my_make_server_routine),
+        DLD(__RML_close_factory,my_wait_to_close_routine),
+        GET_INFO(my_call_with_server_info_routine),
+    };
+    status_type result;
+    if ( dynamic_link( RML_SERVER_NAME, server_link_table, 4, &library_handle ) ) {
+        version_type server_version;
+        result = (*open_factory_routine)( *this, server_version, CLIENT_VERSION );
+        // server_version can be checked here for incompatibility if necessary.
+    } else {
+        library_handle = nullptr;
+        result = st_not_found;
+    }
+    return result;
+}
+
+void FACTORY::close() {
+    if ( library_handle )
+        (*my_wait_to_close_routine)(*this);
+    if ( (size_t)library_handle>FACTORY::c_dont_unload ) {
+        dynamic_unlink(library_handle);
+        library_handle = nullptr;
+    }
+}
+
+::rml::factory::status_type FACTORY::make_server( SERVER*& s, CLIENT& c) {
+    // Failure of following assertion means that factory was not successfully opened.
+    __TBB_ASSERT_EX( my_make_server_routine, nullptr);
+    return (*my_make_server_routine)(*this,s,c);
+}
+
+} // namespace rml
+} // namespace r1
+} // namespace detail
+} // namespace tbb
diff --git a/external/tbb/src/tbb/rml_thread_monitor.h b/external/tbb/src/tbb/rml_thread_monitor.h
index c833f3c3..57e9c30b 100644
--- a/external/tbb/src/tbb/rml_thread_monitor.h
+++ b/external/tbb/src/tbb/rml_thread_monitor.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -31,6 +31,7 @@
 #include <pthread.h>
 #include <cstring>
 #include <cstdlib>
+#include <time.h>
 #else
 #error Unsupported platform
 #endif
@@ -78,29 +79,17 @@ static const ::tbb::detail::r1::tchar *SyncObj_ThreadMonitor = _T("RML Thr Monit
 /** At most one thread should wait on an instance at a time. */
 class thread_monitor {
 public:
-    class cookie {
-        friend class thread_monitor;
-        std::atomic<std::size_t> my_epoch{0};
-    };
-    thread_monitor() : skipped_wakeup(false), my_sema() {
+    thread_monitor() {
         ITT_SYNC_CREATE(&my_sema, SyncType_RML, SyncObj_ThreadMonitor);
     }
     ~thread_monitor() {}
 
-    //! If a thread is waiting or started a two-phase wait, notify it.
+    //! Notify waiting thread
     /** Can be called by any thread. */
     void notify();
 
-    //! Begin two-phase wait.
-    /** Should only be called by thread that owns the monitor.
-        The caller must either complete the wait or cancel it. */
-    void prepare_wait( cookie& c );
-
-    //! Complete a two-phase wait and wait until notification occurs after the earlier prepare_wait.
-    void commit_wait( cookie& c );
-
-    //! Cancel a two-phase wait.
-    void cancel_wait();
+    //! Wait for notification
+    void wait();
 
 #if __TBB_USE_WINAPI
     typedef HANDLE handle_type;
@@ -109,7 +98,7 @@ class thread_monitor {
     typedef unsigned (WINAPI *thread_routine_type)(void*);
 
     //! Launch a thread
-    static handle_type launch( thread_routine_type thread_routine, void* arg, std::size_t stack_size, const size_t* worker_index = NULL );
+    static handle_type launch( thread_routine_type thread_routine, void* arg, std::size_t stack_size, const size_t* worker_index = nullptr );
 
 #elif __TBB_USE_POSIX
     typedef pthread_t handle_type;
@@ -127,9 +116,8 @@ class thread_monitor {
     //! Detach thread
     static void detach_thread(handle_type handle);
 private:
-    cookie my_cookie; // epoch counter
-    std::atomic<bool> in_wait{false};
-    bool skipped_wakeup;
+    // The protection from double notification of the binary semaphore
+    std::atomic<bool> my_notified{ false };
     binary_semaphore my_sema;
 #if __TBB_USE_POSIX
     static void check( int error_code, const char* routine );
@@ -154,7 +142,7 @@ inline thread_monitor::handle_type thread_monitor::launch( thread_routine_type t
     unsigned thread_id;
     int number_of_processor_groups = ( worker_index ) ? NumberOfProcessorGroups() : 0;
     unsigned create_flags = ( number_of_processor_groups > 1 ) ? CREATE_SUSPENDED : 0;
-    HANDLE h = (HANDLE)_beginthreadex( NULL, unsigned(stack_size), thread_routine, arg, STACK_SIZE_PARAM_IS_A_RESERVATION | create_flags, &thread_id );
+    HANDLE h = (HANDLE)_beginthreadex( nullptr, unsigned(stack_size), thread_routine, arg, STACK_SIZE_PARAM_IS_A_RESERVATION | create_flags, &thread_id );
     if( !h ) {
         handle_perror(0, "thread_monitor::launch: _beginthreadex failed\n");
     }
@@ -171,12 +159,12 @@ void thread_monitor::join(handle_type handle) {
     DWORD res =
 #endif
         WaitForSingleObjectEx(handle, INFINITE, FALSE);
-    __TBB_ASSERT( res==WAIT_OBJECT_0, NULL );
+    __TBB_ASSERT( res==WAIT_OBJECT_0, nullptr);
 #if TBB_USE_ASSERT
     BOOL val =
 #endif
         CloseHandle(handle);
-    __TBB_ASSERT( val, NULL );
+    __TBB_ASSERT( val, nullptr);
 }
 
 void thread_monitor::detach_thread(handle_type handle) {
@@ -184,7 +172,7 @@ void thread_monitor::detach_thread(handle_type handle) {
     BOOL val =
 #endif
         CloseHandle(handle);
-    __TBB_ASSERT( val, NULL );
+    __TBB_ASSERT( val, nullptr);
 }
 
 #endif /* __TBB_USE_WINAPI */
@@ -204,14 +192,31 @@ inline thread_monitor::handle_type thread_monitor::launch( void* (*thread_routin
     check(pthread_attr_init( &s ), "pthread_attr_init has failed");
     if( stack_size>0 )
         check(pthread_attr_setstacksize( &s, stack_size ), "pthread_attr_setstack_size has failed" );
+
+    // pthread_create(2) can spuriously fail with EAGAIN. We retry
+    // max_num_tries times with progressively longer wait times.
     pthread_t handle;
-    check( pthread_create( &handle, &s, thread_routine, arg ), "pthread_create has failed" );
+    const int max_num_tries = 20;
+    int error = EAGAIN;
+
+    for (int i = 0; i < max_num_tries && error == EAGAIN; i++) {
+      if (i != 0) {
+        // Wait i milliseconds
+        struct timespec ts = {0, i * 1000 * 1000};
+        nanosleep(&ts, NULL);
+      }
+      error = pthread_create(&handle, &s, thread_routine, arg);
+    }
+
+    if (error)
+      handle_perror(error, "pthread_create has failed");
+
     check( pthread_attr_destroy( &s ), "pthread_attr_destroy has failed" );
     return handle;
 }
 
 void thread_monitor::join(handle_type handle) {
-    check(pthread_join(handle, NULL), "pthread_join has failed");
+    check(pthread_join(handle, nullptr), "pthread_join has failed");
 }
 
 void thread_monitor::detach_thread(handle_type handle) {
@@ -220,38 +225,17 @@ void thread_monitor::detach_thread(handle_type handle) {
 #endif /* __TBB_USE_POSIX */
 
 inline void thread_monitor::notify() {
-    my_cookie.my_epoch.store(my_cookie.my_epoch.load(std::memory_order_acquire) + 1, std::memory_order_release);
-    bool do_signal = in_wait.exchange( false );
-    if( do_signal )
+    // Check that the semaphore is not notified twice
+    if (!my_notified.exchange(true, std::memory_order_release)) {
         my_sema.V();
-}
-
-inline void thread_monitor::prepare_wait( cookie& c ) {
-    if( skipped_wakeup ) {
-        // Lazily consume a signal that was skipped due to cancel_wait
-        skipped_wakeup = false;
-        my_sema.P(); // does not really wait on the semaphore
-    }
-    // Former c = my_cookie
-    c.my_epoch.store(my_cookie.my_epoch.load(std::memory_order_acquire), std::memory_order_release);
-    in_wait.store( true, std::memory_order_seq_cst );
-}
-
-inline void thread_monitor::commit_wait( cookie& c ) {
-    bool do_it = ( c.my_epoch.load(std::memory_order_relaxed) == my_cookie.my_epoch.load(std::memory_order_acquire) );
-    if( do_it ) {
-        my_sema.P();
-    } else {
-        tbb::detail::atomic_backoff backoff;
-        while (in_wait.load(std::memory_order_relaxed)) { backoff.pause(); }
-        skipped_wakeup = true;
     }
 }
 
-inline void thread_monitor::cancel_wait() {
-    // if not in_wait, then some thread has sent us a signal;
-    // it will be consumed by the next prepare_wait call
-    skipped_wakeup = ! in_wait.exchange( false );
+inline void thread_monitor::wait() {
+    my_sema.P();
+    // memory_order_seq_cst is required here to be ordered with
+    // further load checking shutdown state
+    my_notified.store(false, std::memory_order_seq_cst);
 }
 
 } // namespace internal
diff --git a/external/tbb/src/tbb/rtm_mutex.cpp b/external/tbb/src/tbb/rtm_mutex.cpp
index 6c93ba8a..f386735b 100644
--- a/external/tbb/src/tbb/rtm_mutex.cpp
+++ b/external/tbb/src/tbb/rtm_mutex.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -14,103 +14,108 @@
     limitations under the License.
 */
 
-#include "governor.h"
-#include "itt_notify.h"
-#include "misc.h"
 #include "oneapi/tbb/detail/_assert.h"
 #include "oneapi/tbb/detail/_rtm_mutex.h"
+#include "itt_notify.h"
+#include "governor.h"
+#include "misc.h"
 
 #include <atomic>
 
 namespace tbb {
-    namespace detail {
-        namespace r1 {
+namespace detail {
+namespace r1 {
 
-            struct rtm_mutex_impl {
-                // maximum number of times to retry
-                // TODO: experiment on retry values.
-                static constexpr int retry_threshold = 10;
-                using transaction_result_type = decltype(begin_transaction());
 
-                //! Release speculative mutex
-                static void release(d1::rtm_mutex::scoped_lock& s) {
-                    switch (s.m_transaction_state) {
-                        case d1::rtm_mutex::rtm_state::rtm_transacting:
-                            __TBB_ASSERT(is_in_transaction(), "m_transaction_state && not speculating");
-                            end_transaction();
-                            s.m_mutex = nullptr;
-                            break;
-                        case d1::rtm_mutex::rtm_state::rtm_real:
-                            s.m_mutex->unlock();
-                            s.m_mutex = nullptr;
-                            break;
-                        case d1::rtm_mutex::rtm_state::rtm_none:
-                            __TBB_ASSERT(false, "mutex is not locked, but in release");
-                            break;
-                        default:
-                            __TBB_ASSERT(false, "invalid m_transaction_state");
-                    }
-                    s.m_transaction_state = d1::rtm_mutex::rtm_state::rtm_none;
-                }
+struct rtm_mutex_impl {
+    // maximum number of times to retry
+    // TODO: experiment on retry values.
+    static constexpr int retry_threshold = 10;
+    using transaction_result_type = decltype(begin_transaction());
 
-                //! Acquire lock on the given mutex.
-                static void acquire(d1::rtm_mutex& m, d1::rtm_mutex::scoped_lock& s, bool only_speculate) {
-                    __TBB_ASSERT(s.m_transaction_state == d1::rtm_mutex::rtm_state::rtm_none,
-                                 "scoped_lock already in transaction");
-                    if (governor::speculation_enabled()) {
-                        int num_retries = 0;
-                        transaction_result_type abort_code = 0;
-                        do {
-                            if (m.m_flag.load(std::memory_order_acquire)) {
-                                if (only_speculate) return;
-                                spin_wait_while_eq(m.m_flag, true);
-                            }
-                            // _xbegin returns -1 on success or the abort code, so capture it
-                            if ((abort_code = begin_transaction())
-                                == transaction_result_type(speculation_successful_begin)) {
-                                // started speculation
-                                if (m.m_flag.load(std::memory_order_relaxed)) { abort_transaction(); }
-                                s.m_transaction_state = d1::rtm_mutex::rtm_state::rtm_transacting;
-                                // Don not wrap the following assignment to a function,
-                                // because it can abort the transaction in debug. Need mutex for release().
-                                s.m_mutex = &m;
-                                return;// successfully started speculation
-                            }
-                            ++num_retries;
-                        } while ((abort_code & speculation_retry) != 0 && (num_retries < retry_threshold));
-                    }
+    //! Release speculative mutex
+    static void release(d1::rtm_mutex::scoped_lock& s) {
+        switch(s.m_transaction_state) {
+        case d1::rtm_mutex::rtm_state::rtm_transacting:
+            __TBB_ASSERT(is_in_transaction(), "m_transaction_state && not speculating");
+            end_transaction();
+            s.m_mutex = nullptr;
+            break;
+        case d1::rtm_mutex::rtm_state::rtm_real:
+            s.m_mutex->unlock();
+            s.m_mutex = nullptr;
+            break;
+        case d1::rtm_mutex::rtm_state::rtm_none:
+            __TBB_ASSERT(false, "mutex is not locked, but in release");
+            break;
+        default:
+            __TBB_ASSERT(false, "invalid m_transaction_state");
+        }
+        s.m_transaction_state = d1::rtm_mutex::rtm_state::rtm_none;
+    }
 
-                    if (only_speculate) return;
-                    s.m_mutex = &m;
-                    s.m_mutex->lock();
-                    s.m_transaction_state = d1::rtm_mutex::rtm_state::rtm_real;
-                    return;
+    //! Acquire lock on the given mutex.
+    static void acquire(d1::rtm_mutex& m, d1::rtm_mutex::scoped_lock& s, bool only_speculate) {
+        __TBB_ASSERT(s.m_transaction_state == d1::rtm_mutex::rtm_state::rtm_none, "scoped_lock already in transaction");
+        if(governor::speculation_enabled()) {
+            int num_retries = 0;
+            transaction_result_type abort_code = 0;
+            do {
+                if(m.m_flag.load(std::memory_order_acquire)) {
+                    if(only_speculate) return;
+                    spin_wait_while_eq(m.m_flag, true);
                 }
-
-                //! Try to acquire lock on the given mutex.
-                static bool try_acquire(d1::rtm_mutex& m, d1::rtm_mutex::scoped_lock& s) {
-                    acquire(m, s, /*only_speculate=*/true);
-                    if (s.m_transaction_state == d1::rtm_mutex::rtm_state::rtm_transacting) { return true; }
-                    __TBB_ASSERT(s.m_transaction_state == d1::rtm_mutex::rtm_state::rtm_none, NULL);
-                    // transacting acquire failed. try_lock the real mutex
-                    if (m.try_lock()) {
-                        s.m_mutex = &m;
-                        s.m_transaction_state = d1::rtm_mutex::rtm_state::rtm_real;
-                        return true;
+                // _xbegin returns -1 on success or the abort code, so capture it
+                if((abort_code = begin_transaction()) == transaction_result_type(speculation_successful_begin))
+                {
+                    // started speculation
+                    if(m.m_flag.load(std::memory_order_relaxed)) {
+                        abort_transaction();
                     }
-                    return false;
+                    s.m_transaction_state = d1::rtm_mutex::rtm_state::rtm_transacting;
+                    // Don not wrap the following assignment to a function,
+                    // because it can abort the transaction in debug. Need mutex for release().
+                    s.m_mutex = &m;
+                    return;  // successfully started speculation
                 }
-            };
+                ++num_retries;
+            } while((abort_code & speculation_retry) != 0 && (num_retries < retry_threshold));
+        }
+
+        if(only_speculate) return;
+        s.m_mutex = &m;
+        s.m_mutex->lock();
+        s.m_transaction_state = d1::rtm_mutex::rtm_state::rtm_real;
+    }
+
+    //! Try to acquire lock on the given mutex.
+    static bool try_acquire(d1::rtm_mutex& m, d1::rtm_mutex::scoped_lock& s) {
+        acquire(m, s, /*only_speculate=*/true);
+        if (s.m_transaction_state == d1::rtm_mutex::rtm_state::rtm_transacting) {
+            return true;
+        }
+        __TBB_ASSERT(s.m_transaction_state == d1::rtm_mutex::rtm_state::rtm_none, nullptr);
+        // transacting acquire failed. try_lock the real mutex
+        if (m.try_lock()) {
+            s.m_mutex = &m;
+            s.m_transaction_state = d1::rtm_mutex::rtm_state::rtm_real;
+            return true;
+        }
+        return false;
+    }
+};
+
+void __TBB_EXPORTED_FUNC acquire(d1::rtm_mutex& m, d1::rtm_mutex::scoped_lock& s, bool only_speculate) {
+    rtm_mutex_impl::acquire(m, s, only_speculate);
+}
+bool __TBB_EXPORTED_FUNC try_acquire(d1::rtm_mutex& m, d1::rtm_mutex::scoped_lock& s) {
+    return rtm_mutex_impl::try_acquire(m, s);
+}
+void __TBB_EXPORTED_FUNC release(d1::rtm_mutex::scoped_lock& s) {
+    rtm_mutex_impl::release(s);
+}
 
-            void __TBB_EXPORTED_FUNC acquire(d1::rtm_mutex& m, d1::rtm_mutex::scoped_lock& s,
-                                             bool only_speculate) {
-                rtm_mutex_impl::acquire(m, s, only_speculate);
-            }
-            bool __TBB_EXPORTED_FUNC try_acquire(d1::rtm_mutex& m, d1::rtm_mutex::scoped_lock& s) {
-                return rtm_mutex_impl::try_acquire(m, s);
-            }
-            void __TBB_EXPORTED_FUNC release(d1::rtm_mutex::scoped_lock& s) { rtm_mutex_impl::release(s); }
+} // namespace r1
+} // namespace detail
+} // namespace tbb
 
-        }// namespace r1
-    }    // namespace detail
-}// namespace tbb
diff --git a/external/tbb/src/tbb/rtm_rw_mutex.cpp b/external/tbb/src/tbb/rtm_rw_mutex.cpp
index 6cc24ad2..fa87d0e3 100644
--- a/external/tbb/src/tbb/rtm_rw_mutex.cpp
+++ b/external/tbb/src/tbb/rtm_rw_mutex.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -14,274 +14,258 @@
     limitations under the License.
 */
 
-#include "governor.h"
-#include "itt_notify.h"
-#include "misc.h"
 #include "oneapi/tbb/detail/_assert.h"
 #include "oneapi/tbb/detail/_rtm_rw_mutex.h"
+#include "itt_notify.h"
+#include "governor.h"
+#include "misc.h"
 
 #include <atomic>
 
 namespace tbb {
-    namespace detail {
-        namespace r1 {
+namespace detail {
+namespace r1 {
 
-            struct rtm_rw_mutex_impl {
-                // maximum number of times to retry
-                // TODO: experiment on retry values.
-                static constexpr int retry_threshold_read = 10;
-                static constexpr int retry_threshold_write = 10;
-                using transaction_result_type = decltype(begin_transaction());
+struct rtm_rw_mutex_impl {
+    // maximum number of times to retry
+    // TODO: experiment on retry values.
+    static constexpr int retry_threshold_read = 10;
+    static constexpr int retry_threshold_write = 10;
+    using transaction_result_type = decltype(begin_transaction());
 
-                //! Release speculative mutex
-                static void release(d1::rtm_rw_mutex::scoped_lock& s) {
-                    switch (s.m_transaction_state) {
-                        case d1::rtm_rw_mutex::rtm_type::rtm_transacting_writer:
-                        case d1::rtm_rw_mutex::rtm_type::rtm_transacting_reader:
-                            __TBB_ASSERT(is_in_transaction(), "m_transaction_state && not speculating");
-                            end_transaction();
-                            s.m_mutex = nullptr;
-                            break;
-                        case d1::rtm_rw_mutex::rtm_type::rtm_real_reader:
-                            __TBB_ASSERT(!s.m_mutex->write_flag.load(std::memory_order_relaxed),
-                                         "write_flag set but read lock acquired");
-                            s.m_mutex->unlock_shared();
-                            s.m_mutex = nullptr;
-                            break;
-                        case d1::rtm_rw_mutex::rtm_type::rtm_real_writer:
-                            __TBB_ASSERT(s.m_mutex->write_flag.load(std::memory_order_relaxed),
-                                         "write_flag unset but write lock acquired");
-                            s.m_mutex->write_flag.store(false, std::memory_order_relaxed);
-                            s.m_mutex->unlock();
-                            s.m_mutex = nullptr;
-                            break;
-                        case d1::rtm_rw_mutex::rtm_type::rtm_not_in_mutex:
-                            __TBB_ASSERT(false, "rtm_not_in_mutex, but in release");
-                            break;
-                        default:
-                            __TBB_ASSERT(false, "invalid m_transaction_state");
-                    }
-                    s.m_transaction_state = d1::rtm_rw_mutex::rtm_type::rtm_not_in_mutex;
-                }
+    //! Release speculative mutex
+    static void release(d1::rtm_rw_mutex::scoped_lock& s) {
+        switch(s.m_transaction_state) {
+        case d1::rtm_rw_mutex::rtm_type::rtm_transacting_writer:
+        case d1::rtm_rw_mutex::rtm_type::rtm_transacting_reader:
+            __TBB_ASSERT(is_in_transaction(), "m_transaction_state && not speculating");
+            end_transaction();
+            s.m_mutex = nullptr;
+            break;
+        case d1::rtm_rw_mutex::rtm_type::rtm_real_reader:
+            __TBB_ASSERT(!s.m_mutex->write_flag.load(std::memory_order_relaxed), "write_flag set but read lock acquired");
+            s.m_mutex->unlock_shared();
+            s.m_mutex = nullptr;
+            break;
+        case d1::rtm_rw_mutex::rtm_type::rtm_real_writer:
+            __TBB_ASSERT(s.m_mutex->write_flag.load(std::memory_order_relaxed), "write_flag unset but write lock acquired");
+            s.m_mutex->write_flag.store(false, std::memory_order_relaxed);
+            s.m_mutex->unlock();
+            s.m_mutex = nullptr;
+            break;
+        case d1::rtm_rw_mutex::rtm_type::rtm_not_in_mutex:
+            __TBB_ASSERT(false, "rtm_not_in_mutex, but in release");
+            break;
+        default:
+            __TBB_ASSERT(false, "invalid m_transaction_state");
+        }
+        s.m_transaction_state = d1::rtm_rw_mutex::rtm_type::rtm_not_in_mutex;
+    }
 
-                //! Acquire write lock on the given mutex.
-                static void acquire_writer(d1::rtm_rw_mutex& m, d1::rtm_rw_mutex::scoped_lock& s,
-                                           bool only_speculate) {
-                    __TBB_ASSERT(s.m_transaction_state == d1::rtm_rw_mutex::rtm_type::rtm_not_in_mutex,
-                                 "scoped_lock already in transaction");
-                    if (governor::speculation_enabled()) {
-                        int num_retries = 0;
-                        transaction_result_type abort_code = 0;
-                        do {
-                            if (m.m_state.load(std::memory_order_acquire)) {
-                                if (only_speculate) return;
-                                spin_wait_until_eq(m.m_state, d1::rtm_rw_mutex::state_type(0));
-                            }
-                            // _xbegin returns -1 on success or the abort code, so capture it
-                            if ((abort_code = begin_transaction())
-                                == transaction_result_type(speculation_successful_begin)) {
-                                // started speculation
-                                if (m.m_state.load(
-                                            std::memory_order_relaxed)) {// add spin_rw_mutex to read-set.
-                                    // reader or writer grabbed the lock, so abort.
-                                    abort_transaction();
-                                }
-                                s.m_transaction_state = d1::rtm_rw_mutex::rtm_type::rtm_transacting_writer;
-                                // Don not wrap the following assignment to a function,
-                                // because it can abort the transaction in debug. Need mutex for release().
-                                s.m_mutex = &m;
-                                return;// successfully started speculation
-                            }
-                            ++num_retries;
-                        } while ((abort_code & speculation_retry) != 0
-                                 && (num_retries < retry_threshold_write));
-                    }
-
-                    if (only_speculate) return;
-                    s.m_mutex = &m;   // should apply a real try_lock...
-                    s.m_mutex->lock();// kill transactional writers
-                    __TBB_ASSERT(!m.write_flag.load(std::memory_order_relaxed),
-                                 "After acquire for write, write_flag already true");
-                    m.write_flag.store(true, std::memory_order_relaxed);// kill transactional readers
-                    s.m_transaction_state = d1::rtm_rw_mutex::rtm_type::rtm_real_writer;
-                    return;
+    //! Acquire write lock on the given mutex.
+    static void acquire_writer(d1::rtm_rw_mutex& m, d1::rtm_rw_mutex::scoped_lock& s, bool only_speculate) {
+        __TBB_ASSERT(s.m_transaction_state == d1::rtm_rw_mutex::rtm_type::rtm_not_in_mutex, "scoped_lock already in transaction");
+        if(governor::speculation_enabled()) {
+            int num_retries = 0;
+            transaction_result_type abort_code = 0;
+            do {
+                if(m.m_state.load(std::memory_order_acquire)) {
+                    if(only_speculate) return;
+                    spin_wait_until_eq(m.m_state, d1::rtm_rw_mutex::state_type(0));
                 }
-
-                //! Acquire read lock on given mutex.
-                //  only_speculate : true if we are doing a try_acquire.  If true and we fail to speculate, don't
-                //     really acquire the lock, return and do a try_acquire on the contained spin_rw_mutex.  If
-                //     the lock is already held by a writer, just return.
-                static void acquire_reader(d1::rtm_rw_mutex& m, d1::rtm_rw_mutex::scoped_lock& s,
-                                           bool only_speculate) {
-                    __TBB_ASSERT(s.m_transaction_state == d1::rtm_rw_mutex::rtm_type::rtm_not_in_mutex,
-                                 "scoped_lock already in transaction");
-                    if (governor::speculation_enabled()) {
-                        int num_retries = 0;
-                        transaction_result_type abort_code = 0;
-                        do {
-                            // if in try_acquire, and lock is held as writer, don't attempt to speculate.
-                            if (m.write_flag.load(std::memory_order_acquire)) {
-                                if (only_speculate) return;
-                                spin_wait_while_eq(m.write_flag, true);
-                            }
-                            // _xbegin returns -1 on success or the abort code, so capture it
-                            if ((abort_code = begin_transaction())
-                                == transaction_result_type(speculation_successful_begin)) {
-                                // started speculation
-                                if (m.write_flag.load(
-                                            std::memory_order_relaxed)) {// add write_flag to read-set.
-                                    abort_transaction();                 // writer grabbed the lock, so abort.
-                                }
-                                s.m_transaction_state = d1::rtm_rw_mutex::rtm_type::rtm_transacting_reader;
-                                // Don not wrap the following assignment to a function,
-                                // because it can abort the transaction in debug. Need mutex for release().
-                                s.m_mutex = &m;
-                                return;// successfully started speculation
-                            }
-                            // fallback path
-                            // retry only if there is any hope of getting into a transaction soon
-                            // Retry in the following cases (from Section 8.3.5 of
-                            // Intel(R) Architecture Instruction Set Extensions Programming Reference):
-                            // 1. abort caused by XABORT instruction (bit 0 of EAX register is set)
-                            // 2. the transaction may succeed on a retry (bit 1 of EAX register is set)
-                            // 3. if another logical processor conflicted with a memory address
-                            //    that was part of the transaction that aborted (bit 2 of EAX register is set)
-                            // That is, retry if (abort_code & 0x7) is non-zero
-                            ++num_retries;
-                        } while ((abort_code & speculation_retry) != 0
-                                 && (num_retries < retry_threshold_read));
+                // _xbegin returns -1 on success or the abort code, so capture it
+                if((abort_code = begin_transaction()) == transaction_result_type(speculation_successful_begin))
+                {
+                    // started speculation
+                    if(m.m_state.load(std::memory_order_relaxed)) {  // add spin_rw_mutex to read-set.
+                        // reader or writer grabbed the lock, so abort.
+                        abort_transaction();
                     }
-
-                    if (only_speculate) return;
+                    s.m_transaction_state = d1::rtm_rw_mutex::rtm_type::rtm_transacting_writer;
+                    // Don not wrap the following assignment to a function,
+                    // because it can abort the transaction in debug. Need mutex for release().
                     s.m_mutex = &m;
-                    s.m_mutex->lock_shared();
-                    s.m_transaction_state = d1::rtm_rw_mutex::rtm_type::rtm_real_reader;
+                    return;  // successfully started speculation
                 }
+                ++num_retries;
+            } while((abort_code & speculation_retry) != 0 && (num_retries < retry_threshold_write));
+        }
 
-                //! Upgrade reader to become a writer.
-                /** Returns whether the upgrade happened without releasing and re-acquiring the lock */
-                static bool upgrade(d1::rtm_rw_mutex::scoped_lock& s) {
-                    switch (s.m_transaction_state) {
-                        case d1::rtm_rw_mutex::rtm_type::rtm_real_reader: {
-                            s.m_transaction_state = d1::rtm_rw_mutex::rtm_type::rtm_real_writer;
-                            bool no_release = s.m_mutex->upgrade();
-                            __TBB_ASSERT(!s.m_mutex->write_flag.load(std::memory_order_relaxed),
-                                         "After upgrade, write_flag already true");
-                            s.m_mutex->write_flag.store(true, std::memory_order_relaxed);
-                            return no_release;
-                        }
-                        case d1::rtm_rw_mutex::rtm_type::rtm_transacting_reader: {
-                            d1::rtm_rw_mutex& m = *s.m_mutex;
-                            if (m.m_state.load(std::memory_order_acquire)) {// add spin_rw_mutex to read-set.
-                                // Real reader or writer holds the lock; so commit the read and re-acquire for write.
-                                release(s);
-                                acquire_writer(m, s, false);
-                                return false;
-                            } else {
-                                s.m_transaction_state = d1::rtm_rw_mutex::rtm_type::rtm_transacting_writer;
-                                return true;
-                            }
-                        }
-                        default:
-                            __TBB_ASSERT(false, "Invalid state for upgrade");
-                            return false;
-                    }
-                }
+        if(only_speculate) return;
+        s.m_mutex = &m;                                                          // should apply a real try_lock...
+        s.m_mutex->lock();                                                       // kill transactional writers
+        __TBB_ASSERT(!m.write_flag.load(std::memory_order_relaxed), "After acquire for write, write_flag already true");
+        m.write_flag.store(true, std::memory_order_relaxed);                       // kill transactional readers
+        s.m_transaction_state = d1::rtm_rw_mutex::rtm_type::rtm_real_writer;
+    }
 
-                //! Downgrade writer to a reader.
-                static bool downgrade(d1::rtm_rw_mutex::scoped_lock& s) {
-                    switch (s.m_transaction_state) {
-                        case d1::rtm_rw_mutex::rtm_type::rtm_real_writer:
-                            s.m_transaction_state = d1::rtm_rw_mutex::rtm_type::rtm_real_reader;
-                            __TBB_ASSERT(s.m_mutex->write_flag.load(std::memory_order_relaxed),
-                                         "Before downgrade write_flag not true");
-                            s.m_mutex->write_flag.store(false, std::memory_order_relaxed);
-                            s.m_mutex->downgrade();
-                            return true;
-                        case d1::rtm_rw_mutex::rtm_type::rtm_transacting_writer:
-                            s.m_transaction_state = d1::rtm_rw_mutex::rtm_type::rtm_transacting_reader;
-                            return true;
-                        default:
-                            __TBB_ASSERT(false, "Invalid state for downgrade");
-                            return false;
-                    }
+    //! Acquire read lock on given mutex.
+    //  only_speculate : true if we are doing a try_acquire.  If true and we fail to speculate, don't
+    //     really acquire the lock, return and do a try_acquire on the contained spin_rw_mutex.  If
+    //     the lock is already held by a writer, just return.
+    static void acquire_reader(d1::rtm_rw_mutex& m, d1::rtm_rw_mutex::scoped_lock& s, bool only_speculate) {
+        __TBB_ASSERT(s.m_transaction_state == d1::rtm_rw_mutex::rtm_type::rtm_not_in_mutex, "scoped_lock already in transaction");
+        if(governor::speculation_enabled()) {
+            int num_retries = 0;
+            transaction_result_type abort_code = 0;
+            do {
+                // if in try_acquire, and lock is held as writer, don't attempt to speculate.
+                if(m.write_flag.load(std::memory_order_acquire)) {
+                    if(only_speculate) return;
+                    spin_wait_while_eq(m.write_flag, true);
                 }
-
-                //! Try to acquire write lock on the given mutex.
-                //  There may be reader(s) which acquired the spin_rw_mutex, as well as possibly
-                //  transactional reader(s).  If this is the case, the acquire will fail, and assigning
-                //  write_flag will kill the transactors.  So we only assign write_flag if we have successfully
-                //  acquired the lock.
-                static bool try_acquire_writer(d1::rtm_rw_mutex& m, d1::rtm_rw_mutex::scoped_lock& s) {
-                    acquire_writer(m, s, /*only_speculate=*/true);
-                    if (s.m_transaction_state == d1::rtm_rw_mutex::rtm_type::rtm_transacting_writer) {
-                        return true;
-                    }
-                    __TBB_ASSERT(s.m_transaction_state == d1::rtm_rw_mutex::rtm_type::rtm_not_in_mutex, NULL);
-                    // transacting write acquire failed. try_lock the real mutex
-                    if (m.try_lock()) {
-                        s.m_mutex = &m;
-                        // only shoot down readers if we're not transacting ourselves
-                        __TBB_ASSERT(!m.write_flag.load(std::memory_order_relaxed),
-                                     "After try_acquire_writer, write_flag already true");
-                        m.write_flag.store(true, std::memory_order_relaxed);
-                        s.m_transaction_state = d1::rtm_rw_mutex::rtm_type::rtm_real_writer;
-                        return true;
+                // _xbegin returns -1 on success or the abort code, so capture it
+                if((abort_code = begin_transaction()) == transaction_result_type(speculation_successful_begin))
+                {
+                    // started speculation
+                    if(m.write_flag.load(std::memory_order_relaxed)) {  // add write_flag to read-set.
+                        abort_transaction();  // writer grabbed the lock, so abort.
                     }
-                    return false;
+                    s.m_transaction_state = d1::rtm_rw_mutex::rtm_type::rtm_transacting_reader;
+                    // Don not wrap the following assignment to a function,
+                    // because it can abort the transaction in debug. Need mutex for release().
+                    s.m_mutex = &m;
+                    return;  // successfully started speculation
                 }
+                // fallback path
+                // retry only if there is any hope of getting into a transaction soon
+                // Retry in the following cases (from Section 8.3.5 of
+                // Intel(R) Architecture Instruction Set Extensions Programming Reference):
+                // 1. abort caused by XABORT instruction (bit 0 of EAX register is set)
+                // 2. the transaction may succeed on a retry (bit 1 of EAX register is set)
+                // 3. if another logical processor conflicted with a memory address
+                //    that was part of the transaction that aborted (bit 2 of EAX register is set)
+                // That is, retry if (abort_code & 0x7) is non-zero
+                ++num_retries;
+            } while((abort_code & speculation_retry) != 0 && (num_retries < retry_threshold_read));
+        }
 
-                //! Try to acquire read lock on the given mutex.
-                static bool try_acquire_reader(d1::rtm_rw_mutex& m, d1::rtm_rw_mutex::scoped_lock& s) {
-                    // speculatively acquire the lock. If this fails, do try_lock_shared on the spin_rw_mutex.
-                    acquire_reader(m, s, /*only_speculate=*/true);
-                    if (s.m_transaction_state == d1::rtm_rw_mutex::rtm_type::rtm_transacting_reader) {
-                        return true;
-                    }
-                    __TBB_ASSERT(s.m_transaction_state == d1::rtm_rw_mutex::rtm_type::rtm_not_in_mutex, NULL);
-                    // transacting read acquire failed. try_lock_shared the real mutex
-                    if (m.try_lock_shared()) {
-                        s.m_mutex = &m;
-                        s.m_transaction_state = d1::rtm_rw_mutex::rtm_type::rtm_real_reader;
-                        return true;
-                    }
-                    return false;
-                }
-            };
+        if(only_speculate) return;
+        s.m_mutex = &m;
+        s.m_mutex->lock_shared();
+        s.m_transaction_state = d1::rtm_rw_mutex::rtm_type::rtm_real_reader;
+    }
 
-            void __TBB_EXPORTED_FUNC acquire_writer(d1::rtm_rw_mutex& m, d1::rtm_rw_mutex::scoped_lock& s,
-                                                    bool only_speculate) {
-                rtm_rw_mutex_impl::acquire_writer(m, s, only_speculate);
-            }
-            //! Internal acquire read lock.
-            // only_speculate == true if we're doing a try_lock, else false.
-            void __TBB_EXPORTED_FUNC acquire_reader(d1::rtm_rw_mutex& m, d1::rtm_rw_mutex::scoped_lock& s,
-                                                    bool only_speculate) {
-                rtm_rw_mutex_impl::acquire_reader(m, s, only_speculate);
-            }
-            //! Internal upgrade reader to become a writer.
-            bool __TBB_EXPORTED_FUNC upgrade(d1::rtm_rw_mutex::scoped_lock& s) {
-                return rtm_rw_mutex_impl::upgrade(s);
-            }
-            //! Internal downgrade writer to become a reader.
-            bool __TBB_EXPORTED_FUNC downgrade(d1::rtm_rw_mutex::scoped_lock& s) {
-                return rtm_rw_mutex_impl::downgrade(s);
-            }
-            //! Internal try_acquire write lock.
-            bool __TBB_EXPORTED_FUNC try_acquire_writer(d1::rtm_rw_mutex& m,
-                                                        d1::rtm_rw_mutex::scoped_lock& s) {
-                return rtm_rw_mutex_impl::try_acquire_writer(m, s);
-            }
-            //! Internal try_acquire read lock.
-            bool __TBB_EXPORTED_FUNC try_acquire_reader(d1::rtm_rw_mutex& m,
-                                                        d1::rtm_rw_mutex::scoped_lock& s) {
-                return rtm_rw_mutex_impl::try_acquire_reader(m, s);
-            }
-            //! Internal release lock.
-            void __TBB_EXPORTED_FUNC release(d1::rtm_rw_mutex::scoped_lock& s) {
-                rtm_rw_mutex_impl::release(s);
+    //! Upgrade reader to become a writer.
+    /** Returns whether the upgrade happened without releasing and re-acquiring the lock */
+    static bool upgrade(d1::rtm_rw_mutex::scoped_lock& s) {
+        switch(s.m_transaction_state) {
+        case d1::rtm_rw_mutex::rtm_type::rtm_real_reader: {
+            s.m_transaction_state = d1::rtm_rw_mutex::rtm_type::rtm_real_writer;
+            bool no_release = s.m_mutex->upgrade();
+            __TBB_ASSERT(!s.m_mutex->write_flag.load(std::memory_order_relaxed), "After upgrade, write_flag already true");
+            s.m_mutex->write_flag.store(true, std::memory_order_relaxed);
+            return no_release;
+        }
+        case d1::rtm_rw_mutex::rtm_type::rtm_transacting_reader: {
+            d1::rtm_rw_mutex& m = *s.m_mutex;
+            if(m.m_state.load(std::memory_order_acquire)) {  // add spin_rw_mutex to read-set.
+                // Real reader or writer holds the lock; so commit the read and re-acquire for write.
+                release(s);
+                acquire_writer(m, s, false);
+                return false;
+            } else
+            {
+                s.m_transaction_state = d1::rtm_rw_mutex::rtm_type::rtm_transacting_writer;
+                return true;
             }
+        }
+        default:
+            __TBB_ASSERT(false, "Invalid state for upgrade");
+            return false;
+        }
+    }
+
+    //! Downgrade writer to a reader.
+    static bool downgrade(d1::rtm_rw_mutex::scoped_lock& s) {
+        switch (s.m_transaction_state) {
+        case d1::rtm_rw_mutex::rtm_type::rtm_real_writer:
+            s.m_transaction_state = d1::rtm_rw_mutex::rtm_type::rtm_real_reader;
+            __TBB_ASSERT(s.m_mutex->write_flag.load(std::memory_order_relaxed), "Before downgrade write_flag not true");
+            s.m_mutex->write_flag.store(false, std::memory_order_relaxed);
+            s.m_mutex->downgrade();
+            return true;
+        case d1::rtm_rw_mutex::rtm_type::rtm_transacting_writer:
+            s.m_transaction_state = d1::rtm_rw_mutex::rtm_type::rtm_transacting_reader;
+            return true;
+        default:
+            __TBB_ASSERT(false, "Invalid state for downgrade");
+            return false;
+        }
+    }
+
+    //! Try to acquire write lock on the given mutex.
+    //  There may be reader(s) which acquired the spin_rw_mutex, as well as possibly
+    //  transactional reader(s).  If this is the case, the acquire will fail, and assigning
+    //  write_flag will kill the transactors.  So we only assign write_flag if we have successfully
+    //  acquired the lock.
+    static bool try_acquire_writer(d1::rtm_rw_mutex& m, d1::rtm_rw_mutex::scoped_lock& s) {
+        acquire_writer(m, s, /*only_speculate=*/true);
+        if (s.m_transaction_state == d1::rtm_rw_mutex::rtm_type::rtm_transacting_writer) {
+            return true;
+        }
+        __TBB_ASSERT(s.m_transaction_state == d1::rtm_rw_mutex::rtm_type::rtm_not_in_mutex, nullptr);
+        // transacting write acquire failed. try_lock the real mutex
+        if (m.try_lock()) {
+            s.m_mutex = &m;
+            // only shoot down readers if we're not transacting ourselves
+            __TBB_ASSERT(!m.write_flag.load(std::memory_order_relaxed), "After try_acquire_writer, write_flag already true");
+            m.write_flag.store(true, std::memory_order_relaxed);
+            s.m_transaction_state = d1::rtm_rw_mutex::rtm_type::rtm_real_writer;
+            return true;
+        }
+        return false;
+    }
+
+    //! Try to acquire read lock on the given mutex.
+    static bool try_acquire_reader(d1::rtm_rw_mutex& m, d1::rtm_rw_mutex::scoped_lock& s) {
+        // speculatively acquire the lock. If this fails, do try_lock_shared on the spin_rw_mutex.
+        acquire_reader(m, s, /*only_speculate=*/true);
+        if (s.m_transaction_state == d1::rtm_rw_mutex::rtm_type::rtm_transacting_reader) {
+            return true;
+        }
+        __TBB_ASSERT(s.m_transaction_state == d1::rtm_rw_mutex::rtm_type::rtm_not_in_mutex, nullptr);
+        // transacting read acquire failed. try_lock_shared the real mutex
+        if (m.try_lock_shared()) {
+            s.m_mutex = &m;
+            s.m_transaction_state = d1::rtm_rw_mutex::rtm_type::rtm_real_reader;
+            return true;
+        }
+        return false;
+    }
+};
+
+void __TBB_EXPORTED_FUNC acquire_writer(d1::rtm_rw_mutex& m, d1::rtm_rw_mutex::scoped_lock& s, bool only_speculate) {
+    rtm_rw_mutex_impl::acquire_writer(m, s, only_speculate);
+}
+//! Internal acquire read lock.
+// only_speculate == true if we're doing a try_lock, else false.
+void __TBB_EXPORTED_FUNC acquire_reader(d1::rtm_rw_mutex& m, d1::rtm_rw_mutex::scoped_lock& s, bool only_speculate) {
+    rtm_rw_mutex_impl::acquire_reader(m, s, only_speculate);
+}
+//! Internal upgrade reader to become a writer.
+bool __TBB_EXPORTED_FUNC upgrade(d1::rtm_rw_mutex::scoped_lock& s) {
+    return rtm_rw_mutex_impl::upgrade(s);
+}
+//! Internal downgrade writer to become a reader.
+bool __TBB_EXPORTED_FUNC downgrade(d1::rtm_rw_mutex::scoped_lock& s) {
+    return rtm_rw_mutex_impl::downgrade(s);
+}
+//! Internal try_acquire write lock.
+bool __TBB_EXPORTED_FUNC try_acquire_writer(d1::rtm_rw_mutex& m, d1::rtm_rw_mutex::scoped_lock& s) {
+    return rtm_rw_mutex_impl::try_acquire_writer(m, s);
+}
+//! Internal try_acquire read lock.
+bool __TBB_EXPORTED_FUNC try_acquire_reader(d1::rtm_rw_mutex& m, d1::rtm_rw_mutex::scoped_lock& s) {
+    return rtm_rw_mutex_impl::try_acquire_reader(m, s);
+}
+//! Internal release lock.
+void __TBB_EXPORTED_FUNC release(d1::rtm_rw_mutex::scoped_lock& s) {
+    rtm_rw_mutex_impl::release(s);
+}
+
+} // namespace r1
+} // namespace detail
+} // namespace tbb
+
 
-        }// namespace r1
-    }    // namespace detail
-}// namespace tbb
diff --git a/external/tbb/src/tbb/scheduler_common.h b/external/tbb/src/tbb/scheduler_common.h
index 66bd66bb..e4686e16 100644
--- a/external/tbb/src/tbb/scheduler_common.h
+++ b/external/tbb/src/tbb/scheduler_common.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@
 #include "oneapi/tbb/detail/_machine.h"
 #include "oneapi/tbb/task_group.h"
 #include "oneapi/tbb/cache_aligned_allocator.h"
+#include "oneapi/tbb/tbb_allocator.h"
 #include "itt_notify.h"
 #include "co_context.h"
 #include "misc.h"
@@ -41,6 +42,8 @@
 
 #include <cstdint>
 #include <exception>
+#include <memory> // unique_ptr
+#include <unordered_map>
 
 //! Mutex type for global locks in the scheduler
 using scheduler_mutex_type = __TBB_SCHEDULER_MUTEX_TYPE;
@@ -68,6 +71,22 @@ template<task_stream_accessor_type> class task_stream;
 using isolation_type = std::intptr_t;
 constexpr isolation_type no_isolation = 0;
 
+struct cache_aligned_deleter {
+    template <typename T>
+    void operator() (T* ptr) const {
+        ptr->~T();
+        cache_aligned_deallocate(ptr);
+    }
+};
+
+template <typename T>
+using cache_aligned_unique_ptr = std::unique_ptr<T, cache_aligned_deleter>;
+
+template <typename T, typename ...Args>
+cache_aligned_unique_ptr<T> make_cache_aligned_unique(Args&& ...args) {
+    return cache_aligned_unique_ptr<T>(new (cache_aligned_allocate(sizeof(T))) T(std::forward<Args>(args)...));
+}
+
 //------------------------------------------------------------------------
 // Extended execute data
 //------------------------------------------------------------------------
@@ -115,7 +134,7 @@ struct task_accessor {
 //------------------------------------------------------------------------
 //! Extended variant of the standard offsetof macro
 /** The standard offsetof macro is not sufficient for TBB as it can be used for
-    POD-types only. The constant 0x1000 (not NULL) is necessary to appease GCC. **/
+    POD-types only. The constant 0x1000 (not nullptr) is necessary to appease GCC. **/
 #define __TBB_offsetof(class_name, member_name) \
     ((ptrdiff_t)&(reinterpret_cast<class_name*>(0x1000)->member_name) - 0x1000)
 
@@ -133,7 +152,7 @@ class context_guard_helper {
     d1::cpu_ctl_env guard_cpu_ctl_env;
     d1::cpu_ctl_env curr_cpu_ctl_env;
 public:
-    context_guard_helper() : curr_ctx(NULL) {
+    context_guard_helper() : curr_ctx(nullptr) {
         guard_cpu_ctl_env.get_env();
         curr_cpu_ctl_env = guard_cpu_ctl_env;
     }
@@ -160,8 +179,8 @@ class context_guard_helper {
                 ITT_TASK_END;
             // reporting begin of new task group context execution frame.
             // using address of task group context object to group tasks (parent).
-            // id of task execution frame is NULL and reserved for future use.
-            ITT_TASK_BEGIN(ctx, ctx->my_name, NULL);
+            // id of task execution frame is nullptr and reserved for future use.
+            ITT_TASK_BEGIN(ctx, ctx->my_name, nullptr);
             curr_ctx = ctx;
         }
     }
@@ -175,7 +194,7 @@ class context_guard_helper {
 #endif // _WIN64
 };
 
-#if (_WIN32 || _WIN64 || __unix__) && (__TBB_x86_32 || __TBB_x86_64)
+#if (_WIN32 || _WIN64 || __unix__ || __APPLE__) && (__TBB_x86_32 || __TBB_x86_64)
 #if _MSC_VER
 #pragma intrinsic(__rdtsc)
 #endif
@@ -220,14 +239,15 @@ inline void prolonged_pause_impl() {
 #endif
 
 inline void prolonged_pause() {
-#if __TBB_WAITPKG_INTRINSICS_PRESENT && (_WIN32 || _WIN64 || __unix__) && (__TBB_x86_32 || __TBB_x86_64)
+#if __TBB_WAITPKG_INTRINSICS_PRESENT
     if (governor::wait_package_enabled()) {
         std::uint64_t time_stamp = machine_time_stamp();
         // _tpause function directs the processor to enter an implementation-dependent optimized state
         // until the Time Stamp Counter reaches or exceeds the value specified in second parameter.
-        // Constant "700" is ticks to wait for.
+        // Constant "1000" is ticks to wait for.
+        // TODO : Modify this parameter based on empirical study of benchmarks.
         // First parameter 0 selects between a lower power (cleared) or faster wakeup (set) optimized state.
-        _tpause(0, time_stamp + 700);
+        _tpause(0, time_stamp + 1000);
     }
     else
 #endif
@@ -245,17 +265,12 @@ class stealing_loop_backoff {
     int my_yield_count;
 public:
     // my_yield_threshold = 100 is an experimental value. Ideally, once we start calling __TBB_Yield(),
-    // the time spent spinning before calling is_out_of_work() should be approximately
+    // the time spent spinning before calling out_of_work() should be approximately
     // the time it takes for a thread to be woken up. Doing so would guarantee that we do
     // no worse than 2x the optimal spin time. Or perhaps a time-slice quantum is the right amount.
     stealing_loop_backoff(int num_workers, int yields_multiplier)
         : my_pause_threshold{ 2 * (num_workers + 1) }
-#if __APPLE__
-        // threshold value tuned separately for macOS due to high cost of sched_yield there
-        , my_yield_threshold{10 * yields_multiplier}
-#else
         , my_yield_threshold{100 * yields_multiplier}
-#endif
         , my_pause_count{}
         , my_yield_count{}
     {}
@@ -353,6 +368,54 @@ struct suspend_point_type {
     bool m_is_critical{ false };
     //! Associated coroutine
     co_context m_co_context;
+    //! Supend point before resume
+    suspend_point_type* m_prev_suspend_point{nullptr};
+
+    // Possible state transitions:
+    // A -> S -> N -> A
+    // A -> N -> S -> N -> A
+    enum class stack_state {
+        active, // some thread is working with this stack
+        suspended, // no thread is working with this stack
+        notified // some thread tried to resume this stack
+    };
+
+    //! The flag required to protect suspend finish and resume call
+    std::atomic<stack_state> m_stack_state{stack_state::active};
+
+    void resume(suspend_point_type* sp) {
+        __TBB_ASSERT(m_stack_state.load(std::memory_order_relaxed) != stack_state::suspended, "The stack is expected to be active");
+
+        sp->m_prev_suspend_point = this;
+
+        // Do not access sp after resume
+        m_co_context.resume(sp->m_co_context);
+        __TBB_ASSERT(m_stack_state.load(std::memory_order_relaxed) != stack_state::active, nullptr);
+
+        finilize_resume();
+    }
+
+    void finilize_resume() {
+        m_stack_state.store(stack_state::active, std::memory_order_relaxed);
+        // Set the suspended state for the stack that we left. If the state is already notified, it means that
+        // someone already tried to resume our previous stack but failed. So, we need to resume it.
+        // m_prev_suspend_point might be nullptr when destroying co_context based on threads
+        if (m_prev_suspend_point && m_prev_suspend_point->m_stack_state.exchange(stack_state::suspended) == stack_state::notified) {
+            r1::resume(m_prev_suspend_point);
+        }
+        m_prev_suspend_point = nullptr;
+    }
+
+    bool try_notify_resume() {
+        // Check that stack is already suspended. Return false if not yet.
+        return m_stack_state.exchange(stack_state::notified) == stack_state::suspended;
+    }
+
+    void recall_owner() {
+        __TBB_ASSERT(m_stack_state.load(std::memory_order_relaxed) == stack_state::suspended, nullptr);
+        m_stack_state.store(stack_state::notified, std::memory_order_relaxed);
+        m_is_owner_recalled.store(true, std::memory_order_release);
+    }
 
     struct resume_task final : public d1::task {
         task_dispatcher& m_target;
@@ -385,6 +448,15 @@ class alignas (max_nfs_size) task_dispatcher {
     friend class delegated_task;
     friend struct base_waiter;
 
+    //! The list of possible post resume actions.
+    enum class post_resume_action {
+        invalid,
+        register_waiter,
+        cleanup,
+        notify,
+        none
+    };
+
     //! The data of the current thread attached to this task_dispatcher
     thread_data* m_thread_data{ nullptr };
 
@@ -404,9 +476,16 @@ class alignas (max_nfs_size) task_dispatcher {
     //! Suspend point (null if this task dispatcher has been never suspended)
     suspend_point_type* m_suspend_point{ nullptr };
 
+    //! Used to improve scalability of d1::wait_context by using per thread reference_counter
+    std::unordered_map<d1::wait_tree_vertex_interface*, d1::reference_vertex*,
+                       std::hash<d1::wait_tree_vertex_interface*>, std::equal_to<d1::wait_tree_vertex_interface*>,
+                       tbb_allocator<std::pair<d1::wait_tree_vertex_interface* const, d1::reference_vertex*>>
+                      >
+        m_reference_vertex_map;
+
     //! Attempt to get a task from the mailbox.
     /** Gets a task only if it has not been executed by its sender or a thief
-        that has stolen it from the sender's task pool. Otherwise returns NULL.
+        that has stolen it from the sender's task pool. Otherwise returns nullptr.
         This method is intended to be used only by the thread extracting the proxy
         from its mailbox. (In contrast to local task pool, mailbox can be read only
         by its owner). **/
@@ -432,6 +511,14 @@ class alignas (max_nfs_size) task_dispatcher {
             m_suspend_point->~suspend_point_type();
             cache_aligned_deallocate(m_suspend_point);
         }
+
+        for (auto& elem : m_reference_vertex_map) {
+            d1::reference_vertex*& node = elem.second;
+            node->~reference_vertex();
+            cache_aligned_deallocate(node);
+            poison_pointer(node);
+        }
+
         poison_pointer(m_thread_data);
         poison_pointer(m_suspend_point);
     }
@@ -475,6 +562,9 @@ class alignas (max_nfs_size) task_dispatcher {
 #if __TBB_RESUMABLE_TASKS
     /* [[noreturn]] */ void co_local_wait_for_all() noexcept;
     void suspend(suspend_callback_type suspend_callback, void* user_callback);
+    void internal_suspend();
+    void do_post_resume_action();
+
     bool resume(task_dispatcher& target);
     suspend_point_type* get_suspend_point();
     void init_suspend_point(arena* a, std::size_t stack_size);
@@ -488,6 +578,8 @@ class alignas (max_nfs_size) task_dispatcher {
 #endif
 
 inline std::uintptr_t calculate_stealing_threshold(std::uintptr_t base, std::size_t stack_size) {
+    __TBB_ASSERT(stack_size != 0, "Stack size cannot be zero");
+    __TBB_ASSERT(base > stack_size / 2, "Stack anchor calculation overflow");
     return base - stack_size / 2;
 }
 
@@ -497,8 +589,7 @@ struct task_group_context_impl {
     static void register_with(d1::task_group_context&, thread_data*);
     static void bind_to_impl(d1::task_group_context&, thread_data*);
     static void bind_to(d1::task_group_context&, thread_data*);
-    template <typename T>
-    static void propagate_task_group_state(d1::task_group_context&, std::atomic<T> d1::task_group_context::*, d1::task_group_context&, T);
+    static void propagate_task_group_state(d1::task_group_context&, std::atomic<uint32_t> d1::task_group_context::*, d1::task_group_context&, uint32_t);
     static bool cancel_group_execution(d1::task_group_context&);
     static bool is_group_execution_cancelled(const d1::task_group_context&);
     static void reset(d1::task_group_context&);
diff --git a/external/tbb/src/tbb/semaphore.cpp b/external/tbb/src/tbb/semaphore.cpp
index 416f1cbe..211091d1 100644
--- a/external/tbb/src/tbb/semaphore.cpp
+++ b/external/tbb/src/tbb/semaphore.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -16,77 +16,77 @@
 
 #include "semaphore.h"
 #if __TBB_USE_SRWLOCK
-#include "dynamic_link.h"// Refers to src/tbb, not include/tbb
+#include "dynamic_link.h" // Refers to src/tbb, not include/tbb
 #include "tbb_misc.h"
 #endif
 
 namespace tbb {
-    namespace detail {
-        namespace r1 {
+namespace detail {
+namespace r1 {
 
 // TODO: For new win UI port, we can use SRWLock API without dynamic_link etc.
 #if __TBB_USE_SRWLOCK
 
-            static std::atomic<do_once_state> concmon_module_inited;
-
-            void WINAPI init_binsem_using_event(SRWLOCK* h_) {
-                srwl_or_handle* shptr = (srwl_or_handle*) h_;
-                shptr->h = CreateEventEx(NULL, NULL, 0, EVENT_ALL_ACCESS | SEMAPHORE_ALL_ACCESS);
-            }
-
-            void WINAPI acquire_binsem_using_event(SRWLOCK* h_) {
-                srwl_or_handle* shptr = (srwl_or_handle*) h_;
-                WaitForSingleObjectEx(shptr->h, INFINITE, FALSE);
-            }
-
-            void WINAPI release_binsem_using_event(SRWLOCK* h_) {
-                srwl_or_handle* shptr = (srwl_or_handle*) h_;
-                SetEvent(shptr->h);
-            }
-
-            static void(WINAPI* __TBB_init_binsem)(SRWLOCK*)
-                    = (void(WINAPI*)(SRWLOCK*)) & init_binsem_using_event;
-            static void(WINAPI* __TBB_acquire_binsem)(SRWLOCK*)
-                    = (void(WINAPI*)(SRWLOCK*)) & acquire_binsem_using_event;
-            static void(WINAPI* __TBB_release_binsem)(SRWLOCK*)
-                    = (void(WINAPI*)(SRWLOCK*)) & release_binsem_using_event;
-
-            //! Table describing the how to link the handlers.
-            static const dynamic_link_descriptor SRWLLinkTable[]
-                    = {DLD(InitializeSRWLock, __TBB_init_binsem),
-                       DLD(AcquireSRWLockExclusive, __TBB_acquire_binsem),
-                       DLD(ReleaseSRWLockExclusive, __TBB_release_binsem)};
-
-            inline void init_concmon_module() {
-                __TBB_ASSERT((uintptr_t) __TBB_init_binsem == (uintptr_t) &init_binsem_using_event, NULL);
-                if (dynamic_link("Kernel32.dll", SRWLLinkTable,
-                                 sizeof(SRWLLinkTable) / sizeof(dynamic_link_descriptor))) {
-                    __TBB_ASSERT((uintptr_t) __TBB_init_binsem != (uintptr_t) &init_binsem_using_event, NULL);
-                    __TBB_ASSERT((uintptr_t) __TBB_acquire_binsem != (uintptr_t) &acquire_binsem_using_event,
-                                 NULL);
-                    __TBB_ASSERT((uintptr_t) __TBB_release_binsem != (uintptr_t) &release_binsem_using_event,
-                                 NULL);
-                }
-            }
-
-            binary_semaphore::binary_semaphore() {
-                atomic_do_once(&init_concmon_module, concmon_module_inited);
-
-                __TBB_init_binsem(&my_sem.lock);
-                if ((uintptr_t) __TBB_init_binsem != (uintptr_t) &init_binsem_using_event) P();
-            }
-
-            binary_semaphore::~binary_semaphore() {
-                if ((uintptr_t) __TBB_init_binsem == (uintptr_t) &init_binsem_using_event)
-                    CloseHandle(my_sem.h);
-            }
-
-            void binary_semaphore::P() { __TBB_acquire_binsem(&my_sem.lock); }
-
-            void binary_semaphore::V() { __TBB_release_binsem(&my_sem.lock); }
+static std::atomic<do_once_state> concmon_module_inited;
+
+void WINAPI init_binsem_using_event( SRWLOCK* h_ )
+{
+    srwl_or_handle* shptr = (srwl_or_handle*) h_;
+    shptr->h = CreateEventEx( nullptr, nullptr, 0, EVENT_ALL_ACCESS|SEMAPHORE_ALL_ACCESS );
+}
+
+void WINAPI acquire_binsem_using_event( SRWLOCK* h_ )
+{
+    srwl_or_handle* shptr = (srwl_or_handle*) h_;
+    WaitForSingleObjectEx( shptr->h, INFINITE, FALSE );
+}
+
+void WINAPI release_binsem_using_event( SRWLOCK* h_ )
+{
+    srwl_or_handle* shptr = (srwl_or_handle*) h_;
+    SetEvent( shptr->h );
+}
+
+static void (WINAPI *__TBB_init_binsem)( SRWLOCK* ) = (void (WINAPI *)(SRWLOCK*))&init_binsem_using_event;
+static void (WINAPI *__TBB_acquire_binsem)( SRWLOCK* ) = (void (WINAPI *)(SRWLOCK*))&acquire_binsem_using_event;
+static void (WINAPI *__TBB_release_binsem)( SRWLOCK* ) = (void (WINAPI *)(SRWLOCK*))&release_binsem_using_event;
+
+//! Table describing the how to link the handlers.
+static const dynamic_link_descriptor SRWLLinkTable[] = {
+    DLD(InitializeSRWLock,       __TBB_init_binsem),
+    DLD(AcquireSRWLockExclusive, __TBB_acquire_binsem),
+    DLD(ReleaseSRWLockExclusive, __TBB_release_binsem)
+};
+
+inline void init_concmon_module()
+{
+    __TBB_ASSERT( (uintptr_t)__TBB_init_binsem==(uintptr_t)&init_binsem_using_event, nullptr);
+    if( dynamic_link( "Kernel32.dll", SRWLLinkTable, sizeof(SRWLLinkTable)/sizeof(dynamic_link_descriptor) ) ) {
+        __TBB_ASSERT( (uintptr_t)__TBB_init_binsem!=(uintptr_t)&init_binsem_using_event, nullptr);
+        __TBB_ASSERT( (uintptr_t)__TBB_acquire_binsem!=(uintptr_t)&acquire_binsem_using_event, nullptr);
+        __TBB_ASSERT( (uintptr_t)__TBB_release_binsem!=(uintptr_t)&release_binsem_using_event, nullptr);
+    }
+}
+
+binary_semaphore::binary_semaphore() {
+    atomic_do_once( &init_concmon_module, concmon_module_inited );
+
+    __TBB_init_binsem( &my_sem.lock );
+    if( (uintptr_t)__TBB_init_binsem!=(uintptr_t)&init_binsem_using_event )
+        P();
+}
+
+binary_semaphore::~binary_semaphore() {
+    if( (uintptr_t)__TBB_init_binsem==(uintptr_t)&init_binsem_using_event )
+        CloseHandle( my_sem.h );
+}
+
+void binary_semaphore::P() { __TBB_acquire_binsem( &my_sem.lock ); }
+
+void binary_semaphore::V() { __TBB_release_binsem( &my_sem.lock ); }
 
 #endif /* __TBB_USE_SRWLOCK */
 
-        }// namespace r1
-    }    // namespace detail
-}// namespace tbb
+} // namespace r1
+} // namespace detail
+} // namespace tbb
diff --git a/external/tbb/src/tbb/semaphore.h b/external/tbb/src/tbb/semaphore.h
index 8a0fc310..d4eadc2c 100644
--- a/external/tbb/src/tbb/semaphore.h
+++ b/external/tbb/src/tbb/semaphore.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -22,10 +22,7 @@
 #if _WIN32||_WIN64
 #include <windows.h>
 #elif __APPLE__
-#include <mach/semaphore.h>
-#include <mach/task.h>
-#include <mach/mach_init.h>
-#include <mach/error.h>
+#include <dispatch/dispatch.h>
 #else
 #include <semaphore.h>
 #ifdef TBB_USE_DEBUG
@@ -101,7 +98,11 @@ namespace r1 {
 #if __TBB_USE_FUTEX
 
 static inline int futex_wait( void *futex, int comparand ) {
-    int r = ::syscall(SYS_futex, futex, __TBB_FUTEX_WAIT, comparand, NULL, NULL, 0);
+#ifdef __OpenBSD__
+    int r = ::futex((volatile uint32_t *)futex, __TBB_FUTEX_WAIT, comparand, nullptr, nullptr);
+#else
+    int r = ::syscall(SYS_futex, futex, __TBB_FUTEX_WAIT, comparand, nullptr, nullptr, 0);
+#endif
 #if TBB_USE_ASSERT
     int e = errno;
     __TBB_ASSERT(r == 0 || r == EWOULDBLOCK || (r == -1 && (e == EAGAIN || e == EINTR)), "futex_wait failed.");
@@ -110,14 +111,18 @@ static inline int futex_wait( void *futex, int comparand ) {
 }
 
 static inline int futex_wakeup_one( void *futex ) {
-    int r = ::syscall(SYS_futex, futex, __TBB_FUTEX_WAKE, 1, NULL, NULL, 0);
+#ifdef __OpenBSD__
+    int r = ::futex((volatile uint32_t *)futex, __TBB_FUTEX_WAKE, 1 , nullptr, nullptr);
+#else
+    int r = ::syscall(SYS_futex, futex, __TBB_FUTEX_WAKE, 1, nullptr, nullptr, 0);
+#endif
     __TBB_ASSERT(r == 0 || r == 1, "futex_wakeup_one: more than one thread woken up?");
     return r;
 }
 
 // Additional possible methods that are not required right now
 // static inline int futex_wakeup_all( void *futex ) {
-//     int r = ::syscall( SYS_futex,futex,__TBB_FUTEX_WAKE,INT_MAX,NULL,NULL,0 );
+//     int r = ::syscall( SYS_futex,futex,__TBB_FUTEX_WAKE,INT_MAX,nullptr,nullptr,0 );
 //     __TBB_ASSERT( r>=0, "futex_wakeup_all: error in waking up threads" );
 //     return r;
 // }
@@ -138,11 +143,11 @@ class semaphore : no_copy {
     //! wait/acquire
     void P() {WaitForSingleObjectEx( sem, INFINITE, FALSE );}
     //! post/release
-    void V() {ReleaseSemaphore( sem, 1, NULL );}
+    void V() {ReleaseSemaphore( sem, 1, nullptr);}
 private:
     HANDLE sem;
     void init_semaphore(size_t start_cnt_) {
-        sem = CreateSemaphoreEx( NULL, LONG(start_cnt_), max_semaphore_cnt, NULL, 0, SEMAPHORE_ALL_ACCESS );
+        sem = CreateSemaphoreEx( nullptr, LONG(start_cnt_), max_semaphore_cnt, nullptr, 0, SEMAPHORE_ALL_ACCESS );
     }
 };
 #elif __APPLE__
@@ -150,28 +155,18 @@ class semaphore : no_copy {
 class semaphore : no_copy {
 public:
     //! ctor
-    semaphore(int start_cnt_ = 0) : sem(start_cnt_) { init_semaphore(start_cnt_); }
+    semaphore(int start_cnt_ = 0) { my_sem = dispatch_semaphore_create(start_cnt_); }
     //! dtor
-    ~semaphore() {
-        kern_return_t ret = semaphore_destroy( mach_task_self(), sem );
-        __TBB_ASSERT_EX( ret==err_none, NULL );
-    }
+    ~semaphore() { dispatch_release(my_sem); }
     //! wait/acquire
     void P() {
-        int ret;
-        do {
-            ret = semaphore_wait( sem );
-        } while( ret==KERN_ABORTED );
-        __TBB_ASSERT( ret==KERN_SUCCESS, "semaphore_wait() failed" );
+        std::intptr_t ret = dispatch_semaphore_wait(my_sem, DISPATCH_TIME_FOREVER);
+        __TBB_ASSERT_EX(ret == 0, "dispatch_semaphore_wait() failed");
     }
     //! post/release
-    void V() { semaphore_signal( sem ); }
+    void V() { dispatch_semaphore_signal(my_sem); }
 private:
-    semaphore_t sem;
-    void init_semaphore(int start_cnt_) {
-        kern_return_t ret = semaphore_create( mach_task_self(), &sem, SYNC_POLICY_FIFO, start_cnt_ );
-        __TBB_ASSERT_EX( ret==err_none, "failed to create a semaphore" );
-    }
+    dispatch_semaphore_t my_sem;
 };
 #else /* Linux/Unix */
 typedef uint32_t sem_count_t;
@@ -184,12 +179,12 @@ class semaphore : no_copy {
     //! dtor
     ~semaphore() {
         int ret = sem_destroy( &sem );
-        __TBB_ASSERT_EX( !ret, NULL );
+        __TBB_ASSERT_EX( !ret, nullptr);
     }
     //! wait/acquire
     void P() {
         while( sem_wait( &sem )!=0 )
-            __TBB_ASSERT( errno==EINTR, NULL );
+            __TBB_ASSERT( errno==EINTR, nullptr);
     }
     //! post/release
     void V() { sem_post( &sem ); }
@@ -197,7 +192,7 @@ class semaphore : no_copy {
     sem_t sem;
     void init_semaphore(int start_cnt_) {
         int ret = sem_init( &sem, /*shared among threads*/ 0, start_cnt_ );
-        __TBB_ASSERT_EX( !ret, NULL );
+        __TBB_ASSERT_EX( !ret, nullptr);
     }
 };
 #endif /* _WIN32||_WIN64 */
@@ -210,7 +205,7 @@ class semaphore : no_copy {
 class binary_semaphore : no_copy {
 public:
     //! ctor
-    binary_semaphore() { my_sem = CreateEventEx( NULL, NULL, 0, EVENT_ALL_ACCESS );  }
+    binary_semaphore() { my_sem = CreateEventEx( nullptr, nullptr, 0, EVENT_ALL_ACCESS );  }
     //! dtor
     ~binary_semaphore() { CloseHandle( my_sem ); }
     //! wait/acquire
@@ -244,31 +239,7 @@ class binary_semaphore : no_copy {
 #endif /* !__TBB_USE_SRWLOCK */
 #elif __APPLE__
 //! binary_semaphore for concurrent monitor
-class binary_semaphore : no_copy {
-public:
-    //! ctor
-    binary_semaphore() : my_sem(0) {
-        kern_return_t ret = semaphore_create( mach_task_self(), &my_sem, SYNC_POLICY_FIFO, 0 );
-        __TBB_ASSERT_EX( ret==err_none, "failed to create a semaphore" );
-    }
-    //! dtor
-    ~binary_semaphore() {
-        kern_return_t ret = semaphore_destroy( mach_task_self(), my_sem );
-        __TBB_ASSERT_EX( ret==err_none, NULL );
-    }
-    //! wait/acquire
-    void P() {
-        int ret;
-        do {
-            ret = semaphore_wait( my_sem );
-        } while( ret==KERN_ABORTED );
-        __TBB_ASSERT( ret==KERN_SUCCESS, "semaphore_wait() failed" );
-    }
-    //! post/release
-    void V() { semaphore_signal( my_sem ); }
-private:
-    semaphore_t my_sem;
-};
+using binary_semaphore = semaphore;
 #else /* Linux/Unix */
 
 #if __TBB_USE_FUTEX
@@ -309,17 +280,17 @@ class binary_semaphore : no_copy {
     //! ctor
     binary_semaphore() {
         int ret = sem_init( &my_sem, /*shared among threads*/ 0, 0 );
-        __TBB_ASSERT_EX( !ret, NULL );
+        __TBB_ASSERT_EX( !ret, nullptr);
     }
     //! dtor
     ~binary_semaphore() {
         int ret = sem_destroy( &my_sem );
-        __TBB_ASSERT_EX( !ret, NULL );
+        __TBB_ASSERT_EX( !ret, nullptr);
     }
     //! wait/acquire
     void P() {
         while( sem_wait( &my_sem )!=0 )
-            __TBB_ASSERT( errno==EINTR, NULL );
+            __TBB_ASSERT( errno==EINTR, nullptr);
     }
     //! post/release
     void V() { sem_post( &my_sem ); }
diff --git a/external/tbb/src/tbb/small_object_pool.cpp b/external/tbb/src/tbb/small_object_pool.cpp
index 16cf4bb7..c7926e8a 100644
--- a/external/tbb/src/tbb/small_object_pool.cpp
+++ b/external/tbb/src/tbb/small_object_pool.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2020-2021 Intel Corporation
+    Copyright (c) 2020-2025 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -14,142 +14,143 @@
     limitations under the License.
 */
 
-#include "governor.h"
 #include "oneapi/tbb/cache_aligned_allocator.h"
 #include "oneapi/tbb/detail/_small_object_pool.h"
 #include "oneapi/tbb/detail/_task.h"
-#include "task_dispatcher.h"
+#include "governor.h"
 #include "thread_data.h"
+#include "task_dispatcher.h"
 
 #include <cstddef>
 
 namespace tbb {
-    namespace detail {
-        namespace r1 {
-
-            small_object_pool_impl::small_object* const small_object_pool_impl::dead_public_list
-                    = reinterpret_cast<small_object_pool_impl::small_object*>(1);
-
-            void* __TBB_EXPORTED_FUNC allocate(d1::small_object_pool*& allocator, std::size_t number_of_bytes,
-                                               const d1::execution_data& ed) {
-                auto& tls = static_cast<const execution_data_ext&>(ed).task_disp->get_thread_data();
-                auto pool = tls.my_small_object_pool;
-                return pool->allocate_impl(allocator, number_of_bytes);
-            }
-
-            void* __TBB_EXPORTED_FUNC allocate(d1::small_object_pool*& allocator,
-                                               std::size_t number_of_bytes) {
-                // TODO: optimize if the allocator contains a valid pool.
-                auto tls = governor::get_thread_data();
-                auto pool = tls->my_small_object_pool;
-                return pool->allocate_impl(allocator, number_of_bytes);
-            }
-
-            void* small_object_pool_impl::allocate_impl(d1::small_object_pool*& allocator,
-                                                        std::size_t number_of_bytes) {
-                small_object* obj {nullptr};
-
-                if (number_of_bytes <= small_object_size) {
-                    if (m_private_list) {
-                        obj = m_private_list;
-                        m_private_list = m_private_list->next;
-                    } else if (m_public_list.load(std::memory_order_relaxed)) {
-                        // No fence required for read of my_public_list above, because std::atomic::exchange() has a fence.
-                        obj = m_public_list.exchange(nullptr);
-                        __TBB_ASSERT(obj, "another thread emptied the my_public_list");
-                        m_private_list = obj->next;
-                    } else {
-                        obj = new (cache_aligned_allocate(small_object_size)) small_object {nullptr};
-                        ++m_private_counter;
-                    }
-                } else {
-                    obj = new (cache_aligned_allocate(number_of_bytes)) small_object {nullptr};
-                }
-                allocator = this;
-
-                // Return uninitialized memory for further construction on user side.
-                obj->~small_object();
-                return obj;
-            }
-
-            void __TBB_EXPORTED_FUNC deallocate(d1::small_object_pool& allocator, void* ptr,
-                                                std::size_t number_of_bytes) {
-                auto pool = static_cast<small_object_pool_impl*>(&allocator);
-                auto tls = governor::get_thread_data();
-                pool->deallocate_impl(ptr, number_of_bytes, *tls);
-            }
-
-            void __TBB_EXPORTED_FUNC deallocate(d1::small_object_pool& allocator, void* ptr,
-                                                std::size_t number_of_bytes, const d1::execution_data& ed) {
-                auto& tls = static_cast<const execution_data_ext&>(ed).task_disp->get_thread_data();
-                auto pool = static_cast<small_object_pool_impl*>(&allocator);
-                pool->deallocate_impl(ptr, number_of_bytes, tls);
-            }
-
-            void small_object_pool_impl::deallocate_impl(void* ptr, std::size_t number_of_bytes,
-                                                         thread_data& td) {
-                __TBB_ASSERT(ptr != nullptr, "pointer to deallocate should not be null");
-                __TBB_ASSERT(number_of_bytes >= sizeof(small_object),
-                             "number of bytes should be at least sizeof(small_object)");
-
-                if (number_of_bytes <= small_object_size) {
-                    auto obj = new (ptr) small_object {nullptr};
-                    if (td.my_small_object_pool == this) {
-                        obj->next = m_private_list;
-                        m_private_list = obj;
-                    } else {
-                        auto old_public_list = m_public_list.load(std::memory_order_relaxed);
-
-                        for (;;) {
-                            if (old_public_list == dead_public_list) {
-                                obj->~small_object();
-                                cache_aligned_deallocate(obj);
-                                if (++m_public_counter == 0) {
-                                    this->~small_object_pool_impl();
-                                    cache_aligned_deallocate(this);
-                                }
-                                break;
-                            }
-                            obj->next = old_public_list;
-                            if (m_public_list.compare_exchange_strong(old_public_list, obj)) { break; }
-                        }
+namespace detail {
+namespace r1 {
+
+small_object_pool_impl::small_object* const small_object_pool_impl::dead_public_list =
+                reinterpret_cast<small_object_pool_impl::small_object*>(1);
+
+void* __TBB_EXPORTED_FUNC allocate(d1::small_object_pool*& allocator, std::size_t number_of_bytes, const d1::execution_data& ed) {
+    auto& tls = static_cast<const execution_data_ext&>(ed).task_disp->get_thread_data();
+    auto pool = tls.my_small_object_pool;
+    return pool->allocate_impl(allocator, number_of_bytes);
+}
+
+void* __TBB_EXPORTED_FUNC allocate(d1::small_object_pool*& allocator, std::size_t number_of_bytes) {
+    // TODO: optimize if the allocator contains a valid pool.
+    auto tls = governor::get_thread_data();
+    auto pool = tls->my_small_object_pool;
+    return pool->allocate_impl(allocator, number_of_bytes);
+}
+
+void* small_object_pool_impl::allocate_impl(d1::small_object_pool*& allocator, std::size_t number_of_bytes)
+{
+    __TBB_ASSERT(allocator == nullptr || allocator == this,
+                 "An attempt was made to allocate using another thread's small memory pool");
+    small_object* obj{nullptr};
+
+    if (number_of_bytes <= small_object_size) {
+        if (m_private_list) {
+            obj = m_private_list;
+            m_private_list = m_private_list->next;
+        } else if (m_public_list.load(std::memory_order_relaxed)) {
+            // No fence required for read of my_public_list above, because std::atomic::exchange() has a fence.
+            obj = m_public_list.exchange(nullptr);
+            __TBB_ASSERT( obj, "another thread emptied the my_public_list" );
+            m_private_list = obj->next;
+        } else {
+            obj = new (cache_aligned_allocate(small_object_size)) small_object{nullptr};
+            ++m_private_counter;
+        }
+    } else {
+        obj = new (cache_aligned_allocate(number_of_bytes)) small_object{nullptr};
+    }
+    allocator = this;
+
+    // Return uninitialized memory for further construction on user side.
+    obj->~small_object();
+    return obj;
+}
+
+void __TBB_EXPORTED_FUNC deallocate(d1::small_object_pool& allocator, void* ptr, std::size_t number_of_bytes) {
+    auto pool = static_cast<small_object_pool_impl*>(&allocator);
+    auto tls = governor::get_thread_data();
+    pool->deallocate_impl(ptr, number_of_bytes, *tls);
+}
+
+void __TBB_EXPORTED_FUNC deallocate(d1::small_object_pool& allocator, void* ptr, std::size_t number_of_bytes, const d1::execution_data& ed) {
+    auto& tls = static_cast<const execution_data_ext&>(ed).task_disp->get_thread_data();
+    auto pool = static_cast<small_object_pool_impl*>(&allocator);
+    pool->deallocate_impl(ptr, number_of_bytes, tls);
+}
+
+void small_object_pool_impl::deallocate_impl(void* ptr, std::size_t number_of_bytes, thread_data& td) {
+    __TBB_ASSERT(ptr != nullptr, "pointer to deallocate should not be null");
+    __TBB_ASSERT(number_of_bytes >= sizeof(small_object), "number of bytes should be at least sizeof(small_object)");
+
+    if (number_of_bytes <= small_object_size) {
+        auto obj = new (ptr) small_object{nullptr};
+        if (td.my_small_object_pool == this) {
+            obj->next = m_private_list;
+            m_private_list = obj;
+        } else {
+            auto old_public_list = m_public_list.load(std::memory_order_relaxed);
+
+            for (;;) {
+                if (old_public_list == dead_public_list) {
+                    obj->~small_object();
+                    cache_aligned_deallocate(obj);
+                    if (++m_public_counter == 0)
+                    {
+                        this->~small_object_pool_impl();
+                        cache_aligned_deallocate(this);
                     }
-                } else {
-                    cache_aligned_deallocate(ptr);
+                    break;
                 }
-            }
-
-            std::int64_t small_object_pool_impl::cleanup_list(small_object* list) {
-                std::int64_t removed_count {};
-
-                while (list) {
-                    small_object* current = list;
-                    list = list->next;
-                    current->~small_object();
-                    cache_aligned_deallocate(current);
-                    ++removed_count;
-                }
-                return removed_count;
-            }
-
-            void small_object_pool_impl::destroy() {
-                // clean up private list and subtract the removed count from private counter
-                m_private_counter -= cleanup_list(m_private_list);
-                // Grab public list and place dead mark
-                small_object* public_list = m_public_list.exchange(dead_public_list);
-                // clean up public list and subtract from private (intentionally) counter
-                m_private_counter -= cleanup_list(public_list);
-                __TBB_ASSERT(m_private_counter >= 0, "Private counter may not be less than 0");
-                // Equivalent to fetch_sub(m_private_counter) - m_private_counter. But we need to do it
-                // atomically with operator-= not to access m_private_counter after the subtraction.
-                auto new_value = m_public_counter -= m_private_counter;
-                // check if this method is responsible to clean up the resources
-                if (new_value == 0) {
-                    this->~small_object_pool_impl();
-                    cache_aligned_deallocate(this);
+                obj->next = old_public_list;
+                if (m_public_list.compare_exchange_strong(old_public_list, obj)) {
+                    break;
                 }
             }
-
-        }// namespace r1
-    }    // namespace detail
-}// namespace tbb
+        }
+    } else {
+        cache_aligned_deallocate(ptr);
+    }
+}
+
+std::int64_t small_object_pool_impl::cleanup_list(small_object* list)
+{
+    std::int64_t removed_count{};
+
+    while (list) {
+        small_object* current = list;
+        list = list->next;
+        current->~small_object();
+        cache_aligned_deallocate(current);
+        ++removed_count;
+    }
+    return removed_count;
+}
+
+void small_object_pool_impl::destroy()
+{
+    // clean up private list and subtract the removed count from private counter
+    m_private_counter -= cleanup_list(m_private_list);
+    // Grab public list and place dead mark
+    small_object* public_list = m_public_list.exchange(dead_public_list);
+    // clean up public list and subtract from private (intentionally) counter
+    m_private_counter -= cleanup_list(public_list);
+    __TBB_ASSERT(m_private_counter >= 0, "Private counter may not be less than 0");
+    // Equivalent to fetch_sub(m_private_counter) - m_private_counter. But we need to do it
+    // atomically with operator-= not to access m_private_counter after the subtraction.
+    auto new_value = m_public_counter -= m_private_counter;
+    // check if this method is responsible to clean up the resources
+    if (new_value == 0) {
+        this->~small_object_pool_impl();
+        cache_aligned_deallocate(this);
+    }
+}
+
+} // namespace r1
+} // namespace detail
+} // namespace tbb
diff --git a/external/tbb/src/tbb/task.cpp b/external/tbb/src/tbb/task.cpp
index a9953278..84b4278f 100644
--- a/external/tbb/src/tbb/task.cpp
+++ b/external/tbb/src/tbb/task.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -15,13 +15,13 @@
 */
 
 // Do not include task.h directly. Use scheduler_common.h instead
-#include "arena.h"
-#include "governor.h"
-#include "itt_notify.h"
 #include "scheduler_common.h"
-#include "task_dispatcher.h"
+#include "governor.h"
+#include "arena.h"
 #include "thread_data.h"
+#include "task_dispatcher.h"
 #include "waiters.h"
+#include "itt_notify.h"
 
 #include "oneapi/tbb/detail/_task.h"
 #include "oneapi/tbb/partitioner.h"
@@ -30,201 +30,228 @@
 #include <cstring>
 
 namespace tbb {
-    namespace detail {
-        namespace r1 {
+namespace detail {
+namespace r1 {
 
 //------------------------------------------------------------------------
 // resumable tasks
 //------------------------------------------------------------------------
 #if __TBB_RESUMABLE_TASKS
 
-            void suspend(suspend_callback_type suspend_callback, void* user_callback) {
-                thread_data& td = *governor::get_thread_data();
-                td.my_task_dispatcher->suspend(suspend_callback, user_callback);
-                // Do not access td after suspend.
-            }
-
-            void resume(suspend_point_type* sp) {
-                assert_pointers_valid(sp, sp->m_arena);
-                task_dispatcher& task_disp = sp->m_resume_task.m_target;
-                __TBB_ASSERT(task_disp.m_thread_data == nullptr, nullptr);
-
-                // TODO: remove this work-around
-                // Prolong the arena's lifetime while all coroutines are alive
-                // (otherwise the arena can be destroyed while some tasks are suspended).
-                arena& a = *sp->m_arena;
-                a.my_references += arena::ref_external;
-
-                if (task_disp.m_properties.critical_task_allowed) {
-                    // The target is not in the process of executing critical task, so the resume task is not critical.
-                    a.my_resume_task_stream.push(&sp->m_resume_task, random_lane_selector(sp->m_random));
-                } else {
-#if __TBB_PREVIEW_CRITICAL_TASKS
-                    // The target is in the process of executing critical task, so the resume task is critical.
-                    a.my_critical_task_stream.push(&sp->m_resume_task, random_lane_selector(sp->m_random));
-#endif
-                }
-
-                // Do not access target after that point.
-                a.advertise_new_work<arena::wakeup>();
-
-                // Release our reference to my_arena.
-                a.on_thread_leaving<arena::ref_external>();
-            }
-
-            suspend_point_type* current_suspend_point() {
-                thread_data& td = *governor::get_thread_data();
-                return td.my_task_dispatcher->get_suspend_point();
-            }
-
-            static task_dispatcher& create_coroutine(thread_data& td) {
-                // We may have some task dispatchers cached
-                task_dispatcher* task_disp = td.my_arena->my_co_cache.pop();
-                if (!task_disp) {
-                    void* ptr = cache_aligned_allocate(sizeof(task_dispatcher));
-                    task_disp = new (ptr) task_dispatcher(td.my_arena);
-                    task_disp->init_suspend_point(td.my_arena, td.my_arena->my_market->worker_stack_size());
-                }
-                // Prolong the arena's lifetime until all coroutines is alive
-                // (otherwise the arena can be destroyed while some tasks are suspended).
-                // TODO: consider behavior if there are more than 4K external references.
-                td.my_arena->my_references += arena::ref_external;
-                return *task_disp;
-            }
-
-            void task_dispatcher::suspend(suspend_callback_type suspend_callback, void* user_callback) {
-                __TBB_ASSERT(suspend_callback != nullptr, nullptr);
-                __TBB_ASSERT(user_callback != nullptr, nullptr);
-                __TBB_ASSERT(m_thread_data != nullptr, nullptr);
+void suspend(suspend_callback_type suspend_callback, void* user_callback) {
+    thread_data& td = *governor::get_thread_data();
+    td.my_task_dispatcher->suspend(suspend_callback, user_callback);
+    // Do not access td after suspend.
+}
+
+void resume(suspend_point_type* sp) {
+    assert_pointers_valid(sp, sp->m_arena);
+    task_dispatcher& task_disp = sp->m_resume_task.m_target;
+
+    if (sp->try_notify_resume()) {
+        // TODO: remove this work-around
+        // Prolong the arena's lifetime while all coroutines are alive
+        // (otherwise the arena can be destroyed while some tasks are suspended).
+        arena& a = *sp->m_arena;
+        a.my_references += arena::ref_worker;
+
+        if (task_disp.m_properties.critical_task_allowed) {
+            // The target is not in the process of executing critical task, so the resume task is not critical.
+            a.my_resume_task_stream.push(&sp->m_resume_task, random_lane_selector(sp->m_random));
+        } else {
+    #if __TBB_PREVIEW_CRITICAL_TASKS
+            // The target is in the process of executing critical task, so the resume task is critical.
+            a.my_critical_task_stream.push(&sp->m_resume_task, random_lane_selector(sp->m_random));
+    #endif
+        }
+        // Do not access target after that point.
+        a.advertise_new_work<arena::wakeup>();
+        // Release our reference to my_arena.
+        a.on_thread_leaving(arena::ref_worker);
+    }
+
+}
+
+suspend_point_type* current_suspend_point() {
+    thread_data& td = *governor::get_thread_data();
+    return td.my_task_dispatcher->get_suspend_point();
+}
+
+task_dispatcher& create_coroutine(thread_data& td) {
+    // We may have some task dispatchers cached
+    task_dispatcher* task_disp = td.my_arena->my_co_cache.pop();
+    if (!task_disp) {
+        void* ptr = cache_aligned_allocate(sizeof(task_dispatcher));
+        task_disp = new(ptr) task_dispatcher(td.my_arena);
+        task_disp->init_suspend_point(td.my_arena, td.my_arena->my_threading_control->worker_stack_size());
+    }
+    // Prolong the arena's lifetime until all coroutines is alive
+    // (otherwise the arena can be destroyed while some tasks are suspended).
+    // TODO: consider behavior if there are more than 4K external references.
+    td.my_arena->my_references += arena::ref_external;
+    return *task_disp;
+}
+
+void task_dispatcher::internal_suspend() {
+    __TBB_ASSERT(m_thread_data != nullptr, nullptr);
+
+    arena_slot* slot = m_thread_data->my_arena_slot;
+    __TBB_ASSERT(slot != nullptr, nullptr);
+
+    task_dispatcher& default_task_disp = slot->default_task_dispatcher();
+    // TODO: simplify the next line, e.g. is_task_dispatcher_recalled( task_dispatcher& )
+    bool is_recalled = default_task_disp.get_suspend_point()->m_is_owner_recalled.load(std::memory_order_acquire);
+    task_dispatcher& target = is_recalled ? default_task_disp : create_coroutine(*m_thread_data);
+
+    resume(target);
+
+    if (m_properties.outermost) {
+        recall_point();
+    }
+}
+
+void task_dispatcher::suspend(suspend_callback_type suspend_callback, void* user_callback) {
+    __TBB_ASSERT(suspend_callback != nullptr, nullptr);
+    __TBB_ASSERT(user_callback != nullptr, nullptr);
+    suspend_callback(user_callback, get_suspend_point());
+
+    __TBB_ASSERT(m_thread_data != nullptr, nullptr);
+    __TBB_ASSERT(m_thread_data->my_post_resume_action == post_resume_action::none, nullptr);
+    __TBB_ASSERT(m_thread_data->my_post_resume_arg == nullptr, nullptr);
+    internal_suspend();
+}
+
+bool task_dispatcher::resume(task_dispatcher& target) {
+    // Do not create non-trivial objects on the stack of this function. They might never be destroyed
+    {
+        thread_data* td = m_thread_data;
+        __TBB_ASSERT(&target != this, "We cannot resume to ourself");
+        __TBB_ASSERT(td != nullptr, "This task dispatcher must be attach to a thread data");
+        __TBB_ASSERT(td->my_task_dispatcher == this, "Thread data must be attached to this task dispatcher");
+
+        // Change the task dispatcher
+        td->detach_task_dispatcher();
+        td->attach_task_dispatcher(target);
+    }
+    __TBB_ASSERT(m_suspend_point != nullptr, "Suspend point must be created");
+    __TBB_ASSERT(target.m_suspend_point != nullptr, "Suspend point must be created");
+    // Swap to the target coroutine.
+
+    m_suspend_point->resume(target.m_suspend_point);
+    // Pay attention that m_thread_data can be changed after resume
+    if (m_thread_data) {
+        thread_data* td = m_thread_data;
+        __TBB_ASSERT(td != nullptr, "This task dispatcher must be attach to a thread data");
+        __TBB_ASSERT(td->my_task_dispatcher == this, "Thread data must be attached to this task dispatcher");
+        do_post_resume_action();
+
+        // Remove the recall flag if the thread in its original task dispatcher
+        arena_slot* slot = td->my_arena_slot;
+        __TBB_ASSERT(slot != nullptr, nullptr);
+        if (this == slot->my_default_task_dispatcher) {
+            __TBB_ASSERT(m_suspend_point != nullptr, nullptr);
+            m_suspend_point->m_is_owner_recalled.store(false, std::memory_order_relaxed);
+        }
+        return true;
+    }
+    return false;
+}
+
+void task_dispatcher::do_post_resume_action() {
+    thread_data* td = m_thread_data;
+    switch (td->my_post_resume_action) {
+    case post_resume_action::register_waiter:
+    {
+        __TBB_ASSERT(td->my_post_resume_arg, "The post resume action must have an argument");
+        static_cast<thread_control_monitor::resume_context*>(td->my_post_resume_arg)->notify();
+        break;
+    }
+    case post_resume_action::cleanup:
+    {
+        __TBB_ASSERT(td->my_post_resume_arg, "The post resume action must have an argument");
+        task_dispatcher* to_cleanup = static_cast<task_dispatcher*>(td->my_post_resume_arg);
+        // Release coroutine's reference to my_arena
+        td->my_arena->on_thread_leaving(arena::ref_external);
+        // Cache the coroutine for possible later re-usage
+        td->my_arena->my_co_cache.push(to_cleanup);
+        break;
+    }
+    case post_resume_action::notify:
+    {
+        __TBB_ASSERT(td->my_post_resume_arg, "The post resume action must have an argument");
+        suspend_point_type* sp = static_cast<suspend_point_type*>(td->my_post_resume_arg);
+        sp->recall_owner();
+        // Do not access sp because it can be destroyed after recall
+
+        auto is_our_suspend_point = [sp] (market_context ctx) {
+            return std::uintptr_t(sp) == ctx.my_uniq_addr;
+        };
+        td->my_arena->get_waiting_threads_monitor().notify(is_our_suspend_point);
+        break;
+    }
+    default:
+        __TBB_ASSERT(td->my_post_resume_action == post_resume_action::none, "Unknown post resume action");
+        __TBB_ASSERT(td->my_post_resume_arg == nullptr, "The post resume argument should not be set");
+    }
+    td->clear_post_resume_action();
+}
 
-                arena_slot* slot = m_thread_data->my_arena_slot;
-                __TBB_ASSERT(slot != nullptr, nullptr);
+#else
 
-                task_dispatcher& default_task_disp = slot->default_task_dispatcher();
-                // TODO: simplify the next line, e.g. is_task_dispatcher_recalled( task_dispatcher& )
-                bool is_recalled = default_task_disp.get_suspend_point()->m_is_owner_recalled.load(
-                        std::memory_order_acquire);
-                task_dispatcher& target = is_recalled ? default_task_disp : create_coroutine(*m_thread_data);
+void suspend(suspend_callback_type, void*) {
+    __TBB_ASSERT_RELEASE(false, "Resumable tasks are unsupported on this platform");
+}
 
-                thread_data::suspend_callback_wrapper callback
-                        = {suspend_callback, user_callback, get_suspend_point()};
-                m_thread_data->set_post_resume_action(thread_data::post_resume_action::callback, &callback);
-                resume(target);
+void resume(suspend_point_type*) {
+    __TBB_ASSERT_RELEASE(false, "Resumable tasks are unsupported on this platform");
+}
 
-                if (m_properties.outermost) { recall_point(); }
-            }
+suspend_point_type* current_suspend_point() {
+    __TBB_ASSERT_RELEASE(false, "Resumable tasks are unsupported on this platform");
+    return nullptr;
+}
 
-            bool task_dispatcher::resume(task_dispatcher& target) {
-                // Do not create non-trivial objects on the stack of this function. They might never be destroyed
-                {
-                    thread_data* td = m_thread_data;
-                    __TBB_ASSERT(&target != this, "We cannot resume to ourself");
-                    __TBB_ASSERT(td != nullptr, "This task dispatcher must be attach to a thread data");
-                    __TBB_ASSERT(td->my_task_dispatcher == this,
-                                 "Thread data must be attached to this task dispatcher");
-                    __TBB_ASSERT(td->my_post_resume_action != thread_data::post_resume_action::none,
-                                 "The post resume action must be set");
-                    __TBB_ASSERT(td->my_post_resume_arg, "The post resume action must have an argument");
-
-                    // Change the task dispatcher
-                    td->detach_task_dispatcher();
-                    td->attach_task_dispatcher(target);
-                }
-                __TBB_ASSERT(m_suspend_point != nullptr, "Suspend point must be created");
-                __TBB_ASSERT(target.m_suspend_point != nullptr, "Suspend point must be created");
-                // Swap to the target coroutine.
-                m_suspend_point->m_co_context.resume(target.m_suspend_point->m_co_context);
-                // Pay attention that m_thread_data can be changed after resume
-                if (m_thread_data) {
-                    thread_data* td = m_thread_data;
-                    __TBB_ASSERT(td != nullptr, "This task dispatcher must be attach to a thread data");
-                    __TBB_ASSERT(td->my_task_dispatcher == this,
-                                 "Thread data must be attached to this task dispatcher");
-                    td->do_post_resume_action();
-
-                    // Remove the recall flag if the thread in its original task dispatcher
-                    arena_slot* slot = td->my_arena_slot;
-                    __TBB_ASSERT(slot != nullptr, nullptr);
-                    if (this == slot->my_default_task_dispatcher) {
-                        __TBB_ASSERT(m_suspend_point != nullptr, nullptr);
-                        m_suspend_point->m_is_owner_recalled.store(false, std::memory_order_relaxed);
-                    }
-                    return true;
-                }
-                return false;
-            }
+#endif /* __TBB_RESUMABLE_TASKS */
 
-            void thread_data::do_post_resume_action() {
-                __TBB_ASSERT(my_post_resume_action != thread_data::post_resume_action::none,
-                             "The post resume action must be set");
-                __TBB_ASSERT(my_post_resume_arg, "The post resume action must have an argument");
-
-                switch (my_post_resume_action) {
-                    case post_resume_action::register_waiter: {
-                        static_cast<market_concurrent_monitor::resume_context*>(my_post_resume_arg)->notify();
-                        break;
-                    }
-                    case post_resume_action::resume: {
-                        r1::resume(static_cast<suspend_point_type*>(my_post_resume_arg));
-                        break;
-                    }
-                    case post_resume_action::callback: {
-                        suspend_callback_wrapper callback
-                                = *static_cast<suspend_callback_wrapper*>(my_post_resume_arg);
-                        callback();
-                        break;
-                    }
-                    case post_resume_action::cleanup: {
-                        task_dispatcher* to_cleanup = static_cast<task_dispatcher*>(my_post_resume_arg);
-                        // Release coroutine's reference to my_arena
-                        my_arena->on_thread_leaving<arena::ref_external>();
-                        // Cache the coroutine for possible later re-usage
-                        my_arena->my_co_cache.push(to_cleanup);
-                        break;
-                    }
-                    case post_resume_action::notify: {
-                        suspend_point_type* sp = static_cast<suspend_point_type*>(my_post_resume_arg);
-                        sp->m_is_owner_recalled.store(true, std::memory_order_release);
-                        // Do not access sp because it can be destroyed after the store
-
-                        auto is_our_suspend_point
-                                = [sp](market_context ctx) { return std::uintptr_t(sp) == ctx.my_uniq_addr; };
-                        my_arena->my_market->get_wait_list().notify(is_our_suspend_point);
-                        break;
-                    }
-                    default:
-                        __TBB_ASSERT(false, "Unknown post resume action");
+void notify_waiters(std::uintptr_t wait_ctx_addr) {
+    auto is_related_wait_ctx = [&] (market_context context) {
+        return wait_ctx_addr == context.my_uniq_addr;
+    };
+
+    governor::get_thread_data()->my_arena->get_waiting_threads_monitor().notify(is_related_wait_ctx);
+}
+
+d1::wait_tree_vertex_interface* get_thread_reference_vertex(d1::wait_tree_vertex_interface* top_wait_context) {
+    __TBB_ASSERT(top_wait_context, nullptr);
+    auto& dispatcher = *governor::get_thread_data()->my_task_dispatcher;
+
+    d1::reference_vertex* ref_counter{nullptr};
+    auto& reference_map = dispatcher.m_reference_vertex_map;
+    auto pos = reference_map.find(top_wait_context);
+    if (pos != reference_map.end()) {
+        ref_counter = pos->second;
+    } else {
+        constexpr std::size_t max_reference_vertex_map_size = 1000;
+        if (reference_map.size() > max_reference_vertex_map_size) {
+            // TODO: Research the possibility of using better approach for a clean-up
+            for (auto it = reference_map.begin(); it != reference_map.end();) {
+                if (it->second->get_num_child() == 0) {
+                    it->second->~reference_vertex();
+                    cache_aligned_deallocate(it->second);
+                    it = reference_map.erase(it);
+                } else {
+                    ++it;
                 }
-
-                my_post_resume_action = post_resume_action::none;
-                my_post_resume_arg = nullptr;
             }
+        }
 
-#else
+        reference_map[top_wait_context] = ref_counter =
+            new (cache_aligned_allocate(sizeof(d1::reference_vertex))) d1::reference_vertex(top_wait_context, 0);
+    }
 
-            void suspend(suspend_callback_type, void*) {
-                __TBB_ASSERT_RELEASE(false, "Resumable tasks are unsupported on this platform");
-            }
-
-            void resume(suspend_point_type*) {
-                __TBB_ASSERT_RELEASE(false, "Resumable tasks are unsupported on this platform");
-            }
-
-            suspend_point_type* current_suspend_point() {
-                __TBB_ASSERT_RELEASE(false, "Resumable tasks are unsupported on this platform");
-                return nullptr;
-            }
-
-#endif /* __TBB_RESUMABLE_TASKS */
-
-            void notify_waiters(std::uintptr_t wait_ctx_addr) {
-                auto is_related_wait_ctx
-                        = [&](market_context context) { return wait_ctx_addr == context.my_uniq_addr; };
-
-                r1::governor::get_thread_data()->my_arena->my_market->get_wait_list().notify(
-                        is_related_wait_ctx);
-            }
+    return ref_counter;
+}
 
-        }// namespace r1
-    }    // namespace detail
-}// namespace tbb
+} // namespace r1
+} // namespace detail
+} // namespace tbb
diff --git a/external/tbb/src/tbb/task_dispatcher.cpp b/external/tbb/src/tbb/task_dispatcher.cpp
index 52436f05..5ea7d3f5 100644
--- a/external/tbb/src/tbb/task_dispatcher.cpp
+++ b/external/tbb/src/tbb/task_dispatcher.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2020-2021 Intel Corporation
+    Copyright (c) 2020-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -18,232 +18,227 @@
 #include "waiters.h"
 
 namespace tbb {
-    namespace detail {
-        namespace r1 {
-
-            static inline void spawn_and_notify(d1::task& t, arena_slot* slot, arena* a) {
-                slot->spawn(t);
-                a->advertise_new_work<arena::work_spawned>();
-                // TODO: TBB_REVAMP_TODO slot->assert_task_pool_valid();
-            }
-
-            void __TBB_EXPORTED_FUNC spawn(d1::task& t, d1::task_group_context& ctx) {
-                thread_data* tls = governor::get_thread_data();
-                task_group_context_impl::bind_to(ctx, tls);
-                arena* a = tls->my_arena;
-                arena_slot* slot = tls->my_arena_slot;
-                // Capture current context
-                task_accessor::context(t) = &ctx;
-                // Mark isolation
-                task_accessor::isolation(t) = tls->my_task_dispatcher->m_execute_data_ext.isolation;
-                spawn_and_notify(t, slot, a);
-            }
-
-            void __TBB_EXPORTED_FUNC spawn(d1::task& t, d1::task_group_context& ctx, d1::slot_id id) {
-                thread_data* tls = governor::get_thread_data();
-                task_group_context_impl::bind_to(ctx, tls);
-                arena* a = tls->my_arena;
-                arena_slot* slot = tls->my_arena_slot;
-                execution_data_ext& ed = tls->my_task_dispatcher->m_execute_data_ext;
-
-                // Capture context
-                task_accessor::context(t) = &ctx;
-                // Mark isolation
-                task_accessor::isolation(t) = ed.isolation;
-
-                if (id != d1::no_slot && id != tls->my_arena_index && id < a->my_num_slots) {
-                    // Allocate proxy task
-                    d1::small_object_allocator alloc {};
-                    auto proxy = alloc.new_object<task_proxy>(static_cast<d1::execution_data&>(ed));
-                    // Mark as a proxy
-                    task_accessor::set_proxy_trait(*proxy);
-                    // Mark isolation for the proxy task
-                    task_accessor::isolation(*proxy) = ed.isolation;
-                    // Deallocation hint (tls) from the task allocator
-                    proxy->allocator = alloc;
-                    proxy->slot = id;
-                    proxy->outbox = &a->mailbox(id);
-                    // Mark proxy as present in both locations (sender's task pool and destination mailbox)
-                    proxy->task_and_tag = intptr_t(&t) | task_proxy::location_mask;
-                    // Mail the proxy - after this point t may be destroyed by another thread at any moment.
-                    proxy->outbox->push(proxy);
-                    // Spawn proxy to the local task pool
-                    spawn_and_notify(*proxy, slot, a);
-                } else {
-                    spawn_and_notify(t, slot, a);
-                }
-            }
-
-            void __TBB_EXPORTED_FUNC submit(d1::task& t, d1::task_group_context& ctx, arena* a,
-                                            std::uintptr_t as_critical) {
-                suppress_unused_warning(as_critical);
-                assert_pointer_valid(a);
-                thread_data& tls = *governor::get_thread_data();
-
-                // TODO revamp: for each use case investigate neccesity to make this call
-                task_group_context_impl::bind_to(ctx, &tls);
-                task_accessor::context(t) = &ctx;
-                // TODO revamp: consider respecting task isolation if this call is being made by external thread
-                task_accessor::isolation(t) = tls.my_task_dispatcher->m_execute_data_ext.isolation;
-
-                // TODO: consider code refactoring when lane selection mechanism is unified.
-
-                if (tls.is_attached_to(a)) {
-                    arena_slot* slot = tls.my_arena_slot;
+namespace detail {
+namespace r1 {
+
+static inline void spawn_and_notify(d1::task& t, arena_slot* slot, arena* a) {
+    slot->spawn(t);
+    a->advertise_new_work<arena::work_spawned>();
+    // TODO: TBB_REVAMP_TODO slot->assert_task_pool_valid();
+}
+
+void __TBB_EXPORTED_FUNC spawn(d1::task& t, d1::task_group_context& ctx) {
+    thread_data* tls = governor::get_thread_data();
+    task_group_context_impl::bind_to(ctx, tls);
+    arena* a = tls->my_arena;
+    arena_slot* slot = tls->my_arena_slot;
+    // Capture current context
+    task_accessor::context(t) = &ctx;
+    // Mark isolation
+    task_accessor::isolation(t) = tls->my_task_dispatcher->m_execute_data_ext.isolation;
+    spawn_and_notify(t, slot, a);
+}
+
+void __TBB_EXPORTED_FUNC spawn(d1::task& t, d1::task_group_context& ctx, d1::slot_id id) {
+    thread_data* tls = governor::get_thread_data();
+    task_group_context_impl::bind_to(ctx, tls);
+    arena* a = tls->my_arena;
+    arena_slot* slot = tls->my_arena_slot;
+    execution_data_ext& ed = tls->my_task_dispatcher->m_execute_data_ext;
+
+    // Capture context
+    task_accessor::context(t) = &ctx;
+    // Mark isolation
+    task_accessor::isolation(t) = ed.isolation;
+
+    if ( id != d1::no_slot && id != tls->my_arena_index && id < a->my_num_slots) {
+        // Allocate proxy task
+        d1::small_object_allocator alloc{};
+        auto proxy = alloc.new_object<task_proxy>(static_cast<d1::execution_data&>(ed));
+        // Mark as a proxy
+        task_accessor::set_proxy_trait(*proxy);
+        // Mark isolation for the proxy task
+        task_accessor::isolation(*proxy) = ed.isolation;
+        // Deallocation hint (tls) from the task allocator
+        proxy->allocator = alloc;
+        proxy->slot = id;
+        proxy->outbox = &a->mailbox(id);
+        // Mark proxy as present in both locations (sender's task pool and destination mailbox)
+        proxy->task_and_tag = intptr_t(&t) | task_proxy::location_mask;
+        // Mail the proxy - after this point t may be destroyed by another thread at any moment.
+        proxy->outbox->push(proxy);
+        // Spawn proxy to the local task pool
+        spawn_and_notify(*proxy, slot, a);
+    } else {
+        spawn_and_notify(t, slot, a);
+    }
+}
+
+void __TBB_EXPORTED_FUNC submit(d1::task& t, d1::task_group_context& ctx, arena* a, std::uintptr_t as_critical) {
+    suppress_unused_warning(as_critical);
+    assert_pointer_valid(a);
+    thread_data& tls = *governor::get_thread_data();
+
+    // TODO revamp: for each use case investigate neccesity to make this call
+    task_group_context_impl::bind_to(ctx, &tls);
+    task_accessor::context(t) = &ctx;
+    // TODO revamp: consider respecting task isolation if this call is being made by external thread
+    task_accessor::isolation(t) = tls.my_task_dispatcher->m_execute_data_ext.isolation;
+
+    // TODO: consider code refactoring when lane selection mechanism is unified.
+
+    if ( tls.is_attached_to(a) ) {
+        arena_slot* slot = tls.my_arena_slot;
 #if __TBB_PREVIEW_CRITICAL_TASKS
-                    if (as_critical) {
-                        a->my_critical_task_stream.push(&t, subsequent_lane_selector(slot->critical_hint()));
-                    } else
+        if( as_critical ) {
+            a->my_critical_task_stream.push( &t, subsequent_lane_selector(slot->critical_hint()) );
+        } else
 #endif
-                    {
-                        slot->spawn(t);
-                    }
-                } else {
-                    random_lane_selector lane_selector {tls.my_random};
+        {
+            slot->spawn(t);
+        }
+    } else {
+        random_lane_selector lane_selector{tls.my_random};
 #if !__TBB_PREVIEW_CRITICAL_TASKS
-                    suppress_unused_warning(as_critical);
+        suppress_unused_warning(as_critical);
 #else
-                    if (as_critical) {
-                        a->my_critical_task_stream.push(&t, lane_selector);
-                    } else
+        if ( as_critical ) {
+            a->my_critical_task_stream.push( &t, lane_selector );
+        } else
 #endif
-                    {
-                        // Avoid joining the arena the thread is not currently in.
-                        a->my_fifo_task_stream.push(&t, lane_selector);
-                    }
-                }
-                // It is assumed that some thread will explicitly wait in the arena the task is submitted
-                // into. Therefore, no need to utilize mandatory concurrency here.
-                a->advertise_new_work<arena::work_spawned>();
-            }
-
-            void __TBB_EXPORTED_FUNC execute_and_wait(d1::task& t, d1::task_group_context& t_ctx,
-                                                      d1::wait_context& wait_ctx,
-                                                      d1::task_group_context& w_ctx) {
-                task_accessor::context(t) = &t_ctx;
-                task_dispatcher::execute_and_wait(&t, wait_ctx, w_ctx);
-            }
-
-            void __TBB_EXPORTED_FUNC wait(d1::wait_context& wait_ctx, d1::task_group_context& w_ctx) {
-                // Enter the task dispatch loop without a task
-                task_dispatcher::execute_and_wait(nullptr, wait_ctx, w_ctx);
-            }
-
-            d1::slot_id __TBB_EXPORTED_FUNC execution_slot(const d1::execution_data* ed) {
-                if (ed) {
-                    const execution_data_ext* ed_ext = static_cast<const execution_data_ext*>(ed);
-                    assert_pointers_valid(ed_ext->task_disp, ed_ext->task_disp->m_thread_data);
-                    return ed_ext->task_disp->m_thread_data->my_arena_index;
-                } else {
-                    thread_data* td = governor::get_thread_data_if_initialized();
-                    return td ? td->my_arena_index : d1::slot_id(-1);
-                }
-            }
-
-            d1::task_group_context* __TBB_EXPORTED_FUNC current_context() {
-                thread_data* td = governor::get_thread_data();
-                assert_pointers_valid(td, td->my_task_dispatcher);
-
-                task_dispatcher* task_disp = td->my_task_dispatcher;
-                if (task_disp->m_properties.outermost) {
-                    // No one task is executed, so no execute_data.
-                    return nullptr;
-                } else {
-                    return td->my_task_dispatcher->m_execute_data_ext.context;
-                }
-            }
-
-            void task_dispatcher::execute_and_wait(d1::task* t, d1::wait_context& wait_ctx,
-                                                   d1::task_group_context& w_ctx) {
-                // Get an associated task dispatcher
-                thread_data* tls = governor::get_thread_data();
-                __TBB_ASSERT(tls->my_task_dispatcher != nullptr, nullptr);
-                task_dispatcher& local_td = *tls->my_task_dispatcher;
-
-                // TODO: factor out the binding to execute_and_wait_impl
-                if (t) {
-                    task_group_context_impl::bind_to(*task_accessor::context(*t), tls);
-                    // Propagate the isolation to the task executed without spawn.
-                    task_accessor::isolation(*t) = tls->my_task_dispatcher->m_execute_data_ext.isolation;
-                }
-
-                // Waiting on special object tied to a waiting thread.
-                external_waiter waiter {*tls->my_arena, wait_ctx};
-                t = local_td.local_wait_for_all(t, waiter);
-                __TBB_ASSERT_EX(t == nullptr, "External waiter must not leave dispatch loop with a task");
-
-                // The external thread couldn't exit the dispatch loop in an idle state
-                if (local_td.m_thread_data->my_inbox.is_idle_state(true)) {
-                    local_td.m_thread_data->my_inbox.set_is_idle(false);
-                }
-
-                auto exception = w_ctx.my_exception.load(std::memory_order_acquire);
-                if (exception) {
-                    __TBB_ASSERT(w_ctx.is_group_execution_cancelled(),
-                                 "The task group context with an exception should be canceled.");
-                    exception->throw_self();
-                }
-            }
+        {
+            // Avoid joining the arena the thread is not currently in.
+            a->my_fifo_task_stream.push( &t, lane_selector );
+        }
+    }
+    // It is assumed that some thread will explicitly wait in the arena the task is submitted
+    // into. Therefore, no need to utilize mandatory concurrency here.
+    a->advertise_new_work<arena::work_spawned>();
+}
+
+void __TBB_EXPORTED_FUNC execute_and_wait(d1::task& t, d1::task_group_context& t_ctx, d1::wait_context& wait_ctx, d1::task_group_context& w_ctx) {
+    task_accessor::context(t) = &t_ctx;
+    task_dispatcher::execute_and_wait(&t, wait_ctx, w_ctx);
+}
+
+void __TBB_EXPORTED_FUNC wait(d1::wait_context& wait_ctx, d1::task_group_context& w_ctx) {
+    // Enter the task dispatch loop without a task
+    task_dispatcher::execute_and_wait(nullptr, wait_ctx, w_ctx);
+}
+
+d1::slot_id __TBB_EXPORTED_FUNC execution_slot(const d1::execution_data* ed) {
+    if (ed) {
+        const execution_data_ext* ed_ext = static_cast<const execution_data_ext*>(ed);
+        assert_pointers_valid(ed_ext->task_disp, ed_ext->task_disp->m_thread_data);
+        return ed_ext->task_disp->m_thread_data->my_arena_index;
+    } else {
+        thread_data* td = governor::get_thread_data_if_initialized();
+        return td ? td->my_arena_index : d1::slot_id(-1);
+    }
+}
+
+d1::task_group_context* __TBB_EXPORTED_FUNC current_context() {
+    thread_data* td = governor::get_thread_data();
+    assert_pointers_valid(td, td->my_task_dispatcher);
+
+    task_dispatcher* task_disp = td->my_task_dispatcher;
+    if (task_disp->m_properties.outermost) {
+        // No one task is executed, so no execute_data.
+        return nullptr;
+    } else {
+        return td->my_task_dispatcher->m_execute_data_ext.context;
+    }
+}
+
+void task_dispatcher::execute_and_wait(d1::task* t, d1::wait_context& wait_ctx, d1::task_group_context& w_ctx) {
+    // Get an associated task dispatcher
+    thread_data* tls = governor::get_thread_data();
+    __TBB_ASSERT(tls->my_task_dispatcher != nullptr, nullptr);
+    task_dispatcher& local_td = *tls->my_task_dispatcher;
+
+    // TODO: factor out the binding to execute_and_wait_impl
+    if (t) {
+        task_group_context_impl::bind_to(*task_accessor::context(*t), tls);
+        // Propagate the isolation to the task executed without spawn.
+        task_accessor::isolation(*t) = tls->my_task_dispatcher->m_execute_data_ext.isolation;
+    }
+
+    // Waiting on special object tied to a waiting thread.
+    external_waiter waiter{ *tls->my_arena, wait_ctx };
+    t = local_td.local_wait_for_all(t, waiter);
+    __TBB_ASSERT_EX(t == nullptr, "External waiter must not leave dispatch loop with a task");
+
+    // The external thread couldn't exit the dispatch loop in an idle state
+    if (local_td.m_thread_data->my_inbox.is_idle_state(true)) {
+        local_td.m_thread_data->my_inbox.set_is_idle(false);
+    }
+
+    auto exception = w_ctx.my_exception.load(std::memory_order_acquire);
+    if (exception) {
+        __TBB_ASSERT(w_ctx.is_group_execution_cancelled(), "The task group context with an exception should be canceled.");
+        exception->throw_self();
+    }
+}
 
 #if __TBB_RESUMABLE_TASKS
 
 #if _WIN32
-            /* [[noreturn]] */ void __stdcall co_local_wait_for_all(void* addr) noexcept
+/* [[noreturn]] */ void __stdcall co_local_wait_for_all(void* addr) noexcept
 #else
-            /* [[noreturn]] */ void co_local_wait_for_all(unsigned hi, unsigned lo) noexcept
+/* [[noreturn]] */ void co_local_wait_for_all(unsigned hi, unsigned lo) noexcept
 #endif
-            {
+{
 #if !_WIN32
-                std::uintptr_t addr = lo;
-                __TBB_ASSERT(sizeof(addr) == 8 || hi == 0, nullptr);
-                addr += std::uintptr_t(std::uint64_t(hi) << 32);
+    std::uintptr_t addr = lo;
+    __TBB_ASSERT(sizeof(addr) == 8 || hi == 0, nullptr);
+    addr += std::uintptr_t(std::uint64_t(hi) << 32);
 #endif
-                task_dispatcher& task_disp = *reinterpret_cast<task_dispatcher*>(addr);
-                assert_pointers_valid(task_disp.m_thread_data, task_disp.m_thread_data->my_arena);
-                task_disp.set_stealing_threshold(
-                        task_disp.m_thread_data->my_arena->calculate_stealing_threshold());
-                __TBB_ASSERT(task_disp.can_steal(), nullptr);
-                task_disp.co_local_wait_for_all();
-                // This code is unreachable
-            }
-
-            /* [[noreturn]] */ void task_dispatcher::co_local_wait_for_all() noexcept {
-                // Do not create non-trivial objects on the stack of this function. They will never be destroyed.
-                assert_pointer_valid(m_thread_data);
-
-                // Basically calls the user callback passed to the tbb::task::suspend function
-                m_thread_data->do_post_resume_action();
-
-                // Endless loop here because coroutine could be reused
-                d1::task* resume_task {};
-                do {
-                    arena* a = m_thread_data->my_arena;
-                    coroutine_waiter waiter(*a);
-                    resume_task = local_wait_for_all(nullptr, waiter);
-                    assert_task_valid(resume_task);
-                    __TBB_ASSERT(this == m_thread_data->my_task_dispatcher, nullptr);
-
-                    m_thread_data->set_post_resume_action(thread_data::post_resume_action::cleanup, this);
-
-                } while (resume(static_cast<suspend_point_type::resume_task*>(resume_task)->m_target));
-                // This code might be unreachable
-            }
-
-            d1::suspend_point task_dispatcher::get_suspend_point() {
-                if (m_suspend_point == nullptr) {
-                    assert_pointer_valid(m_thread_data);
-                    // 0 means that we attach this task dispatcher to the current stack
-                    init_suspend_point(m_thread_data->my_arena, 0);
-                }
-                assert_pointer_valid(m_suspend_point);
-                return m_suspend_point;
-            }
-            void task_dispatcher::init_suspend_point(arena* a, std::size_t stack_size) {
-                __TBB_ASSERT(m_suspend_point == nullptr, nullptr);
-                m_suspend_point = new (cache_aligned_allocate(sizeof(suspend_point_type)))
-                        suspend_point_type(a, stack_size, *this);
-            }
-#endif   /* __TBB_RESUMABLE_TASKS */
-        }// namespace r1
-    }    // namespace detail
-}// namespace tbb
+    task_dispatcher& task_disp = *reinterpret_cast<task_dispatcher*>(addr);
+    assert_pointers_valid(task_disp.m_thread_data, task_disp.m_thread_data->my_arena);
+    task_disp.set_stealing_threshold(task_disp.m_thread_data->my_arena->calculate_stealing_threshold());
+    __TBB_ASSERT(task_disp.can_steal(), nullptr);
+    task_disp.co_local_wait_for_all();
+    // This code is unreachable
+}
+
+/* [[noreturn]] */ void task_dispatcher::co_local_wait_for_all() noexcept {
+    // Do not create non-trivial objects on the stack of this function. They will never be destroyed.
+    assert_pointer_valid(m_thread_data);
+
+    m_suspend_point->finilize_resume();
+    // Basically calls the user callback passed to the tbb::task::suspend function
+    do_post_resume_action();
+
+    // Endless loop here because coroutine could be reused
+    d1::task* resume_task{};
+    do {
+        arena* a = m_thread_data->my_arena;
+        coroutine_waiter waiter(*a);
+        resume_task = local_wait_for_all(nullptr, waiter);
+        assert_task_valid(resume_task);
+        __TBB_ASSERT(this == m_thread_data->my_task_dispatcher, nullptr);
+
+        m_thread_data->set_post_resume_action(post_resume_action::cleanup, this);
+
+    } while (resume(static_cast<suspend_point_type::resume_task*>(resume_task)->m_target));
+    // This code might be unreachable
+}
+
+d1::suspend_point task_dispatcher::get_suspend_point() {
+    if (m_suspend_point == nullptr) {
+        assert_pointer_valid(m_thread_data);
+        // 0 means that we attach this task dispatcher to the current stack
+        init_suspend_point(m_thread_data->my_arena, 0);
+    }
+    assert_pointer_valid(m_suspend_point);
+    return m_suspend_point;
+}
+void task_dispatcher::init_suspend_point(arena* a, std::size_t stack_size) {
+    __TBB_ASSERT(m_suspend_point == nullptr, nullptr);
+    m_suspend_point = new(cache_aligned_allocate(sizeof(suspend_point_type)))
+        suspend_point_type(a, stack_size, *this);
+}
+#endif /* __TBB_RESUMABLE_TASKS */
+} // namespace r1
+} // namespace detail
+} // namespace tbb
diff --git a/external/tbb/src/tbb/task_dispatcher.h b/external/tbb/src/tbb/task_dispatcher.h
index 65a78f99..c818934e 100644
--- a/external/tbb/src/tbb/task_dispatcher.h
+++ b/external/tbb/src/tbb/task_dispatcher.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2020-2021 Intel Corporation
+    Copyright (c) 2020-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -29,6 +29,7 @@
 #include "mailbox.h"
 #include "itt_notify.h"
 #include "concurrent_monitor.h"
+#include "threading_control.h"
 
 #include <atomic>
 
@@ -65,24 +66,24 @@ inline d1::task* suspend_point_type::resume_task::execute(d1::execution_data& ed
     execution_data_ext& ed_ext = static_cast<execution_data_ext&>(ed);
 
     if (ed_ext.wait_ctx) {
-        market_concurrent_monitor::resume_context monitor_node{{std::uintptr_t(ed_ext.wait_ctx), nullptr}, ed_ext, m_target};
+        thread_control_monitor::resume_context monitor_node{{std::uintptr_t(ed_ext.wait_ctx), nullptr}, ed_ext, m_target};
         // The wait_ctx is present only in external_waiter. In that case we leave the current stack
         // in the abandoned state to resume when waiting completes.
         thread_data* td = ed_ext.task_disp->m_thread_data;
-        td->set_post_resume_action(thread_data::post_resume_action::register_waiter, &monitor_node);
+        td->set_post_resume_action(task_dispatcher::post_resume_action::register_waiter, &monitor_node);
 
-        market_concurrent_monitor& wait_list = td->my_arena->my_market->get_wait_list();
+        thread_control_monitor& wait_list = td->my_arena->get_waiting_threads_monitor();
 
         if (wait_list.wait([&] { return !ed_ext.wait_ctx->continue_execution(); }, monitor_node)) {
             return nullptr;
         }
 
         td->clear_post_resume_action();
-        td->set_post_resume_action(thread_data::post_resume_action::resume, ed_ext.task_disp->get_suspend_point());
+        r1::resume(ed_ext.task_disp->get_suspend_point());
     } else {
         // If wait_ctx is null, it can be only a worker thread on outermost level because
         // coroutine_waiter interrupts bypass loop before the resume_task execution.
-        ed_ext.task_disp->m_thread_data->set_post_resume_action(thread_data::post_resume_action::notify,
+        ed_ext.task_disp->m_thread_data->set_post_resume_action(task_dispatcher::post_resume_action::notify,
             ed_ext.task_disp->get_suspend_point());
     }
     // Do not access this task because it might be destroyed
@@ -171,7 +172,7 @@ d1::task* task_dispatcher::receive_or_steal_task(
     thread_data& tls, execution_data_ext& ed, Waiter& waiter, isolation_type isolation,
     bool fifo_allowed, bool critical_allowed)
 {
-    __TBB_ASSERT(governor::is_thread_data_set(&tls), NULL);
+    __TBB_ASSERT(governor::is_thread_data_set(&tls), nullptr);
     // Task to return
     d1::task* t = nullptr;
     // Get tls data (again)
@@ -248,15 +249,21 @@ d1::task* task_dispatcher::local_wait_for_all(d1::task* t, Waiter& waiter ) {
         task_dispatcher& task_disp;
         execution_data_ext old_execute_data_ext;
         properties old_properties;
+        bool is_initially_registered;
 
         ~dispatch_loop_guard() {
             task_disp.m_execute_data_ext = old_execute_data_ext;
             task_disp.m_properties = old_properties;
 
+            if (!is_initially_registered) {
+                task_disp.m_thread_data->my_arena->my_tc_client.get_pm_client()->unregister_thread();
+                task_disp.m_thread_data->my_is_registered = false;
+            }
+
             __TBB_ASSERT(task_disp.m_thread_data && governor::is_thread_data_set(task_disp.m_thread_data), nullptr);
             __TBB_ASSERT(task_disp.m_thread_data->my_task_dispatcher == &task_disp, nullptr);
         }
-    } dl_guard{ *this, m_execute_data_ext, m_properties };
+    } dl_guard{ *this, m_execute_data_ext, m_properties, m_thread_data->my_is_registered };
 
     // The context guard to track fp setting and itt tasks.
     context_guard_helper</*report_tasks=*/ITTPossible> context_guard;
@@ -281,6 +288,11 @@ d1::task* task_dispatcher::local_wait_for_all(d1::task* t, Waiter& waiter ) {
     m_properties.outermost = false;
     m_properties.fifo_tasks_allowed = false;
 
+    if (!dl_guard.is_initially_registered) {
+        m_thread_data->my_arena->my_tc_client.get_pm_client()->register_thread();
+        m_thread_data->my_is_registered = true;
+    }
+
     t = get_critical_task(t, ed, isolation, critical_allowed);
     if (t && m_thread_data->my_inbox.is_idle_state(true)) {
         // The thread has a work to do. Therefore, marking its inbox as not idle so that
@@ -300,8 +312,8 @@ d1::task* task_dispatcher::local_wait_for_all(d1::task* t, Waiter& waiter ) {
                 while (t != nullptr) {
                     assert_task_valid(t);
                     assert_pointer_valid</*alignment = */alignof(void*)>(ed.context);
-                    __TBB_ASSERT(ed.context->my_lifetime_state == d1::task_group_context::lifetime_state::bound ||
-                        ed.context->my_lifetime_state == d1::task_group_context::lifetime_state::isolated, nullptr);
+                    __TBB_ASSERT(ed.context->my_state == d1::task_group_context::state::bound ||
+                        ed.context->my_state == d1::task_group_context::state::isolated, nullptr);
                     __TBB_ASSERT(m_thread_data->my_inbox.is_idle_state(false), nullptr);
                     __TBB_ASSERT(task_accessor::is_resume_task(*t) || isolation == no_isolation || isolation == ed.isolation, nullptr);
                     // Check premature leave
@@ -341,7 +353,7 @@ d1::task* task_dispatcher::local_wait_for_all(d1::task* t, Waiter& waiter ) {
                 }
                 // Retrieve the task from local task pool
                 if (t || (slot.is_task_pool_published() && (t = slot.get_task(ed, isolation)))) {
-                    __TBB_ASSERT(ed.original_slot == m_thread_data->my_arena_index, NULL);
+                    __TBB_ASSERT(ed.original_slot == m_thread_data->my_arena_index, nullptr);
                     ed.context = task_accessor::context(*t);
                     ed.isolation = task_accessor::isolation(*t);
                     continue;
@@ -380,14 +392,9 @@ inline void task_dispatcher::recall_point() {
     if (this != &m_thread_data->my_arena_slot->default_task_dispatcher()) {
         __TBB_ASSERT(m_suspend_point != nullptr, nullptr);
         __TBB_ASSERT(m_suspend_point->m_is_owner_recalled.load(std::memory_order_relaxed) == false, nullptr);
-        d1::suspend([](suspend_point_type* sp) {
-            sp->m_is_owner_recalled.store(true, std::memory_order_release);
-            auto is_related_suspend_point = [sp] (market_context context) {
-                std::uintptr_t sp_addr = std::uintptr_t(sp);
-                return sp_addr == context.my_uniq_addr;
-            };
-            sp->m_arena->my_market->get_wait_list().notify(is_related_suspend_point);
-        });
+
+        m_thread_data->set_post_resume_action(post_resume_action::notify, get_suspend_point());
+        internal_suspend();
 
         if (m_thread_data->my_inbox.is_idle_state(true)) {
             m_thread_data->my_inbox.set_is_idle(false);
@@ -452,7 +459,7 @@ inline d1::task* task_dispatcher::get_mailbox_task(mail_inbox& my_inbox, executi
         // We have exclusive access to the proxy, and can destroy it.
         tp->allocator.delete_object(tp, ed);
     }
-    return NULL;
+    return nullptr;
 }
 
 template <typename Waiter>
diff --git a/external/tbb/src/tbb/task_group_context.cpp b/external/tbb/src/tbb/task_group_context.cpp
index 63f17824..c20b2790 100644
--- a/external/tbb/src/tbb/task_group_context.cpp
+++ b/external/tbb/src/tbb/task_group_context.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2023 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -14,222 +14,192 @@
     limitations under the License.
 */
 
-#include "governor.h"
-#include "itt_notify.h"
 #include "oneapi/tbb/detail/_config.h"
-#include "oneapi/tbb/task_group.h"
 #include "oneapi/tbb/tbb_allocator.h"
+#include "oneapi/tbb/task_group.h"
+#include "governor.h"
+#include "thread_data.h"
 #include "scheduler_common.h"
+#include "itt_notify.h"
 #include "task_dispatcher.h"
-#include "thread_data.h"
 
 #include <type_traits>
 
 namespace tbb {
-    namespace detail {
-        namespace r1 {
-
-            //------------------------------------------------------------------------
-            // tbb_exception_ptr
-            //------------------------------------------------------------------------
-            tbb_exception_ptr* tbb_exception_ptr::allocate() noexcept {
-                tbb_exception_ptr* eptr = (tbb_exception_ptr*) allocate_memory(sizeof(tbb_exception_ptr));
-                return eptr ? new (eptr) tbb_exception_ptr(std::current_exception()) : nullptr;
-            }
-
-            void tbb_exception_ptr::destroy() noexcept {
-                this->~tbb_exception_ptr();
-                deallocate_memory(this);
-            }
-
-            void tbb_exception_ptr::throw_self() {
-                if (governor::rethrow_exception_broken()) fix_broken_rethrow();
-                std::rethrow_exception(my_ptr);
-            }
-
-            //------------------------------------------------------------------------
-            // task_group_context
-            //------------------------------------------------------------------------
-
-            void task_group_context_impl::destroy(d1::task_group_context& ctx) {
-                __TBB_ASSERT(!is_poisoned(ctx.my_context_list), nullptr);
-
-                if (ctx.my_context_list != nullptr) {
-                    __TBB_ASSERT(ctx.my_lifetime_state.load(std::memory_order_relaxed)
-                                         == d1::task_group_context::lifetime_state::bound,
-                                 nullptr);
-                    // The owner can be destroyed at any moment. Access the associate data with caution.
-                    ctx.my_context_list->remove(ctx.my_node);
-                }
-                d1::cpu_ctl_env* ctl = reinterpret_cast<d1::cpu_ctl_env*>(&ctx.my_cpu_ctl_env);
+namespace detail {
+namespace r1 {
+
+//------------------------------------------------------------------------
+// tbb_exception_ptr
+//------------------------------------------------------------------------
+tbb_exception_ptr* tbb_exception_ptr::allocate() noexcept {
+    tbb_exception_ptr* eptr = (tbb_exception_ptr*)allocate_memory(sizeof(tbb_exception_ptr));
+    return eptr ? new (eptr) tbb_exception_ptr(std::current_exception()) : nullptr;
+}
+
+void tbb_exception_ptr::destroy() noexcept {
+    this->~tbb_exception_ptr();
+    deallocate_memory(this);
+}
+
+void tbb_exception_ptr::throw_self() {
+    if (governor::rethrow_exception_broken()) fix_broken_rethrow();
+    std::rethrow_exception(my_ptr);
+}
+
+//------------------------------------------------------------------------
+// task_group_context
+//------------------------------------------------------------------------
+
+void task_group_context_impl::destroy(d1::task_group_context& ctx) {
+    __TBB_ASSERT(!is_poisoned(ctx.my_context_list), nullptr);
+
+    if (ctx.my_context_list != nullptr) {
+        __TBB_ASSERT(ctx.my_state.load(std::memory_order_relaxed) == d1::task_group_context::state::bound, nullptr);
+        // The owner can be destroyed at any moment. Access the associate data with caution.
+        ctx.my_context_list->remove(ctx.my_node);
+    }
+    d1::cpu_ctl_env* ctl = reinterpret_cast<d1::cpu_ctl_env*>(&ctx.my_cpu_ctl_env);
 #if _MSC_VER && _MSC_VER <= 1900 && !__INTEL_COMPILER
-                suppress_unused_warning(ctl);
+    suppress_unused_warning(ctl);
 #endif
-                ctl->~cpu_ctl_env();
-
-                auto exception = ctx.my_exception.load(std::memory_order_relaxed);
-                if (exception) { exception->destroy(); }
-                ITT_STACK_DESTROY(ctx.my_itt_caller);
-
-                poison_pointer(ctx.my_parent);
-                poison_pointer(ctx.my_context_list);
-                poison_pointer(ctx.my_node.my_next_node);
-                poison_pointer(ctx.my_node.my_prev_node);
-                poison_pointer(ctx.my_exception);
-                poison_pointer(ctx.my_itt_caller);
-
-                ctx.my_lifetime_state.store(d1::task_group_context::lifetime_state::dead,
-                                            std::memory_order_release);
-            }
-
-            void task_group_context_impl::initialize(d1::task_group_context& ctx) {
-                ITT_TASK_GROUP(&ctx, ctx.my_name, nullptr);
-
-                ctx.my_node.my_next_node = &ctx.my_node;
-                ctx.my_node.my_prev_node = &ctx.my_node;
-                ctx.my_cpu_ctl_env = 0;
-                ctx.my_cancellation_requested = 0;
-                ctx.my_state.store(0, std::memory_order_relaxed);
-                // Set the created state to bound at the first usage.
-                ctx.my_lifetime_state.store(d1::task_group_context::lifetime_state::created,
-                                            std::memory_order_relaxed);
-                ctx.my_parent = nullptr;
-                ctx.my_context_list = nullptr;
-                ctx.my_exception.store(nullptr, std::memory_order_relaxed);
-                ctx.my_itt_caller = nullptr;
-
-                static_assert(sizeof(d1::cpu_ctl_env) <= sizeof(ctx.my_cpu_ctl_env),
-                              "FPU settings storage does not fit to uint64_t");
-                d1::cpu_ctl_env* ctl = new (&ctx.my_cpu_ctl_env) d1::cpu_ctl_env;
-                if (ctx.my_traits.fp_settings) ctl->get_env();
-            }
-
-            void task_group_context_impl::register_with(d1::task_group_context& ctx, thread_data* td) {
-                __TBB_ASSERT(!is_poisoned(ctx.my_context_list), nullptr);
-                __TBB_ASSERT(td, nullptr);
-                ctx.my_context_list = td->my_context_list;
-
-                ctx.my_context_list->push_front(ctx.my_node);
-            }
-
-            void task_group_context_impl::bind_to_impl(d1::task_group_context& ctx, thread_data* td) {
-                __TBB_ASSERT(!is_poisoned(ctx.my_context_list), nullptr);
-                __TBB_ASSERT(ctx.my_lifetime_state.load(std::memory_order_relaxed)
-                                     == d1::task_group_context::lifetime_state::locked,
-                             "The context can be bound only under the lock.");
-                __TBB_ASSERT(!ctx.my_parent, "Parent is set before initial binding");
-
-                ctx.my_parent = td->my_task_dispatcher->m_execute_data_ext.context;
-                __TBB_ASSERT(ctx.my_parent, nullptr);
-
-                // Inherit FPU settings only if the context has not captured FPU settings yet.
-                if (!ctx.my_traits.fp_settings) copy_fp_settings(ctx, *ctx.my_parent);
-
-                // Condition below prevents unnecessary thrashing parent context's cache line
-                if (ctx.my_parent->my_state.load(std::memory_order_relaxed)
-                    != d1::task_group_context::may_have_children) {
-                    ctx.my_parent->my_state.store(d1::task_group_context::may_have_children,
-                                                  std::memory_order_relaxed);// full fence is below
-                }
-                if (ctx.my_parent->my_parent) {
-                    // Even if this context were made accessible for state change propagation
-                    // (by placing store_with_release(td->my_context_list_state.head.my_next, &ctx.my_node)
-                    // above), it still could be missed if state propagation from a grand-ancestor
-                    // was underway concurrently with binding.
-                    // Speculative propagation from the parent together with epoch counters
-                    // detecting possibility of such a race allow to avoid taking locks when
-                    // there is no contention.
-
-                    // Acquire fence is necessary to prevent reordering subsequent speculative
-                    // loads of parent state data out of the scope where epoch counters comparison
-                    // can reliably validate it.
-                    uintptr_t local_count_snapshot
-                            = ctx.my_parent->my_context_list->epoch.load(std::memory_order_acquire);
-                    // Speculative propagation of parent's state. The speculation will be
-                    // validated by the epoch counters check further on.
-                    ctx.my_cancellation_requested.store(
-                            ctx.my_parent->my_cancellation_requested.load(std::memory_order_relaxed),
-                            std::memory_order_relaxed);
-                    register_with(ctx, td);// Issues full fence
-
-                    // If no state propagation was detected by the following condition, the above
-                    // full fence guarantees that the parent had correct state during speculative
-                    // propagation before the fence. Otherwise the propagation from parent is
-                    // repeated under the lock.
-                    if (local_count_snapshot
-                        != the_context_state_propagation_epoch.load(std::memory_order_relaxed)) {
-                        // Another thread may be propagating state change right now. So resort to lock.
-                        context_state_propagation_mutex_type::scoped_lock lock(
-                                the_context_state_propagation_mutex);
-                        ctx.my_cancellation_requested.store(
-                                ctx.my_parent->my_cancellation_requested.load(std::memory_order_relaxed),
-                                std::memory_order_relaxed);
-                    }
-                } else {
-                    register_with(ctx, td);// Issues full fence
-                    // As we do not have grand-ancestors, concurrent state propagation (if any)
-                    // may originate only from the parent context, and thus it is safe to directly
-                    // copy the state from it.
-                    ctx.my_cancellation_requested.store(
-                            ctx.my_parent->my_cancellation_requested.load(std::memory_order_relaxed),
-                            std::memory_order_relaxed);
-                }
-            }
-
-            void task_group_context_impl::bind_to(d1::task_group_context& ctx, thread_data* td) {
-                __TBB_ASSERT(!is_poisoned(ctx.my_context_list), nullptr);
-                d1::task_group_context::lifetime_state state
-                        = ctx.my_lifetime_state.load(std::memory_order_acquire);
-                if (state <= d1::task_group_context::lifetime_state::locked) {
-                    if (state == d1::task_group_context::lifetime_state::created &&
+    ctl->~cpu_ctl_env();
+
+    auto exception = ctx.my_exception.load(std::memory_order_relaxed);
+    if (exception) {
+        exception->destroy();
+    }
+    ITT_STACK_DESTROY(ctx.my_itt_caller);
+
+    poison_pointer(ctx.my_parent);
+    poison_pointer(ctx.my_context_list);
+    poison_pointer(ctx.my_node.my_next_node);
+    poison_pointer(ctx.my_node.my_prev_node);
+    poison_pointer(ctx.my_exception);
+    poison_pointer(ctx.my_itt_caller);
+
+    ctx.my_state.store(d1::task_group_context::state::dead, std::memory_order_release);
+}
+
+void task_group_context_impl::initialize(d1::task_group_context& ctx) {
+    ITT_TASK_GROUP(&ctx, ctx.my_name, nullptr);
+
+    ctx.my_node.my_next_node = &ctx.my_node;
+    ctx.my_node.my_prev_node = &ctx.my_node;
+    ctx.my_cpu_ctl_env = 0;
+    ctx.my_cancellation_requested = 0;
+    ctx.my_may_have_children.store(0, std::memory_order_relaxed);
+    // Set the created state to bound at the first usage.
+    ctx.my_state.store(d1::task_group_context::state::created, std::memory_order_relaxed);
+    ctx.my_parent = nullptr;
+    ctx.my_context_list = nullptr;
+    ctx.my_exception.store(nullptr, std::memory_order_relaxed);
+    ctx.my_itt_caller = nullptr;
+
+    static_assert(sizeof(d1::cpu_ctl_env) <= sizeof(ctx.my_cpu_ctl_env), "FPU settings storage does not fit to uint64_t");
+    d1::cpu_ctl_env* ctl = new (&ctx.my_cpu_ctl_env) d1::cpu_ctl_env;
+    if (ctx.my_traits.fp_settings)
+        ctl->get_env();
+}
+
+void task_group_context_impl::register_with(d1::task_group_context& ctx, thread_data* td) {
+    __TBB_ASSERT(!is_poisoned(ctx.my_context_list), nullptr);
+    __TBB_ASSERT(td, nullptr);
+    ctx.my_context_list = td->my_context_list;
+
+    ctx.my_context_list->push_front(ctx.my_node);
+}
+
+void task_group_context_impl::bind_to_impl(d1::task_group_context& ctx, thread_data* td) {
+    __TBB_ASSERT(!is_poisoned(ctx.my_context_list), nullptr);
+    __TBB_ASSERT(ctx.my_state.load(std::memory_order_relaxed) == d1::task_group_context::state::locked, "The context can be bound only under the lock.");
+    __TBB_ASSERT(!ctx.my_parent, "Parent is set before initial binding");
+
+    ctx.my_parent = td->my_task_dispatcher->m_execute_data_ext.context;
+    __TBB_ASSERT(ctx.my_parent, nullptr);
+
+    // Inherit FPU settings only if the context has not captured FPU settings yet.
+    if (!ctx.my_traits.fp_settings)
+        copy_fp_settings(ctx, *ctx.my_parent);
+
+    // Condition below prevents unnecessary thrashing parent context's cache line
+    if (ctx.my_parent->my_may_have_children.load(std::memory_order_relaxed) != d1::task_group_context::may_have_children) {
+        ctx.my_parent->my_may_have_children.store(d1::task_group_context::may_have_children, std::memory_order_relaxed); // full fence is below
+    }
+    if (ctx.my_parent->my_parent) {
+        // Even if this context were made accessible for state change propagation
+        // (by placing store_with_release(td->my_context_list_state.head.my_next, &ctx.my_node)
+        // above), it still could be missed if state propagation from a grand-ancestor
+        // was underway concurrently with binding.
+        // Speculative propagation from the parent together with epoch counters
+        // detecting possibility of such a race allow to avoid taking locks when
+        // there is no contention.
+
+        // Acquire fence is necessary to prevent reordering subsequent speculative
+        // loads of parent state data out of the scope where epoch counters comparison
+        // can reliably validate it.
+        uintptr_t local_count_snapshot = ctx.my_parent->my_context_list->epoch.load(std::memory_order_acquire);
+        // Speculative propagation of parent's state. The speculation will be
+        // validated by the epoch counters check further on.
+        ctx.my_cancellation_requested.store(ctx.my_parent->my_cancellation_requested.load(std::memory_order_relaxed), std::memory_order_relaxed);
+        register_with(ctx, td); // Issues full fence
+
+        // If no state propagation was detected by the following condition, the above
+        // full fence guarantees that the parent had correct state during speculative
+        // propagation before the fence. Otherwise the propagation from parent is
+        // repeated under the lock.
+        if (local_count_snapshot != the_context_state_propagation_epoch.load(std::memory_order_relaxed)) {
+            // Another thread may be propagating state change right now. So resort to lock.
+            context_state_propagation_mutex_type::scoped_lock lock(the_context_state_propagation_mutex);
+            ctx.my_cancellation_requested.store(ctx.my_parent->my_cancellation_requested.load(std::memory_order_relaxed), std::memory_order_relaxed);
+        }
+    } else {
+        register_with(ctx, td); // Issues full fence
+        // As we do not have grand-ancestors, concurrent state propagation (if any)
+        // may originate only from the parent context, and thus it is safe to directly
+        // copy the state from it.
+        ctx.my_cancellation_requested.store(ctx.my_parent->my_cancellation_requested.load(std::memory_order_relaxed), std::memory_order_relaxed);
+    }
+}
+
+void task_group_context_impl::bind_to(d1::task_group_context& ctx, thread_data* td) {
+    d1::task_group_context::state state = ctx.my_state.load(std::memory_order_acquire);
+    if (state <= d1::task_group_context::state::locked) {
+        if (state == d1::task_group_context::state::created &&
 #if defined(__INTEL_COMPILER) && __INTEL_COMPILER <= 1910
-                        ((std::atomic<typename std::underlying_type<
-                                  d1::task_group_context::lifetime_state>::type>&) ctx.my_lifetime_state)
-                                .compare_exchange_strong(
-                                        (typename std::underlying_type<
-                                                d1::task_group_context::lifetime_state>::type&) state,
-                                        (typename std::underlying_type<
-                                                d1::task_group_context::lifetime_state>::type)
-                                                d1::task_group_context::lifetime_state::locked)
+            ((std::atomic<typename std::underlying_type<d1::task_group_context::state>::type>&)ctx.my_state).compare_exchange_strong(
+                (typename std::underlying_type<d1::task_group_context::state>::type&)state,
+                (typename std::underlying_type<d1::task_group_context::state>::type)d1::task_group_context::state::locked)
 #else
-                        ctx.my_lifetime_state.compare_exchange_strong(
-                                state, d1::task_group_context::lifetime_state::locked)
+            ctx.my_state.compare_exchange_strong(state, d1::task_group_context::state::locked)
 #endif
-                    ) {
-                        // If we are in the outermost task dispatch loop of an external thread, then
-                        // there is nothing to bind this context to, and we skip the binding part
-                        // treating the context as isolated.
-                        __TBB_ASSERT(td->my_task_dispatcher->m_execute_data_ext.context != nullptr, nullptr);
-                        d1::task_group_context::lifetime_state release_state {};
-                        if (td->my_task_dispatcher->m_execute_data_ext.context == td->my_arena->my_default_ctx
-                            || !ctx.my_traits.bound) {
-                            if (!ctx.my_traits.fp_settings) {
-                                copy_fp_settings(ctx, *td->my_arena->my_default_ctx);
-                            }
-                            release_state = d1::task_group_context::lifetime_state::isolated;
-                        } else {
-                            bind_to_impl(ctx, td);
-                            release_state = d1::task_group_context::lifetime_state::bound;
-                        }
-                        ITT_STACK_CREATE(ctx.my_itt_caller);
-                        ctx.my_lifetime_state.store(release_state, std::memory_order_release);
-                    }
-                    spin_wait_while_eq(ctx.my_lifetime_state, d1::task_group_context::lifetime_state::locked);
+            ) {
+            // If we are in the outermost task dispatch loop of an external thread, then
+            // there is nothing to bind this context to, and we skip the binding part
+            // treating the context as isolated.
+            __TBB_ASSERT(td->my_task_dispatcher->m_execute_data_ext.context != nullptr, nullptr);
+            d1::task_group_context::state release_state{};
+            if (td->my_task_dispatcher->m_execute_data_ext.context == td->my_arena->my_default_ctx || !ctx.my_traits.bound) {
+                if (!ctx.my_traits.fp_settings) {
+                    copy_fp_settings(ctx, *td->my_arena->my_default_ctx);
                 }
-                __TBB_ASSERT(ctx.my_lifetime_state.load(std::memory_order_relaxed)
-                                     != d1::task_group_context::lifetime_state::created,
-                             nullptr);
-                __TBB_ASSERT(ctx.my_lifetime_state.load(std::memory_order_relaxed)
-                                     != d1::task_group_context::lifetime_state::locked,
-                             nullptr);
+                release_state = d1::task_group_context::state::isolated;
+            } else {
+                bind_to_impl(ctx, td);
+                release_state = d1::task_group_context::state::bound;
             }
-
-            template <typename T>
-            void task_group_context_impl::propagate_task_group_state(
-                    d1::task_group_context& ctx, std::atomic<T> d1::task_group_context::*mptr_state,
-                    d1::task_group_context& src, T new_state) {
-                __TBB_ASSERT(!is_poisoned(ctx.my_context_list), nullptr);
-                /*  1. if ((ctx.*mptr_state).load(std::memory_order_relaxed) == new_state):
+            ITT_STACK_CREATE(ctx.my_itt_caller);
+            ctx.my_state.store(release_state, std::memory_order_release);
+        }
+        spin_wait_while_eq(ctx.my_state, d1::task_group_context::state::locked);
+    }
+    __TBB_ASSERT(ctx.my_state.load(std::memory_order_relaxed) != d1::task_group_context::state::created, nullptr);
+    __TBB_ASSERT(ctx.my_state.load(std::memory_order_relaxed) != d1::task_group_context::state::locked, nullptr);
+}
+
+void task_group_context_impl::propagate_task_group_state(d1::task_group_context& ctx, std::atomic<std::uint32_t> d1::task_group_context::* mptr_state, d1::task_group_context& src, std::uint32_t new_state) {
+    __TBB_ASSERT(!is_poisoned(ctx.my_context_list), nullptr);
+    /*  1. if ((ctx.*mptr_state).load(std::memory_order_relaxed) == new_state):
             Nothing to do, whether descending from "src" or not, so no need to scan.
             Hopefully this happens often thanks to earlier invocations.
             This optimization is enabled by LIFO order in the context lists:
@@ -242,129 +212,74 @@ namespace tbb {
             Such interference is probably not frequent enough to aim for optimisation by writing new_state again (to make the other thread back down).
             Letting the other thread prevail may also be fairer.
     */
-                if ((ctx.*mptr_state).load(std::memory_order_relaxed) != new_state && &ctx != &src) {
-                    for (d1::task_group_context* ancestor = ctx.my_parent; ancestor != nullptr;
-                         ancestor = ancestor->my_parent) {
-                        if (ancestor == &src) {
-                            for (d1::task_group_context* c = &ctx; c != ancestor; c = c->my_parent)
-                                (c->*mptr_state).store(new_state, std::memory_order_relaxed);
-                            break;
-                        }
-                    }
-                }
-            }
-
-            template <typename T>
-            void thread_data::propagate_task_group_state(std::atomic<T> d1::task_group_context::*mptr_state,
-                                                         d1::task_group_context& src, T new_state) {
-                mutex::scoped_lock lock(my_context_list->m_mutex);
-                // Acquire fence is necessary to ensure that the subsequent node->my_next load
-                // returned the correct value in case it was just inserted in another thread.
-                // The fence also ensures visibility of the correct ctx.my_parent value.
-                for (context_list::iterator it = my_context_list->begin(); it != my_context_list->end();
-                     ++it) {
-                    d1::task_group_context& ctx
-                            = __TBB_get_object_ref(d1::task_group_context, my_node, &(*it));
-                    if ((ctx.*mptr_state).load(std::memory_order_relaxed) != new_state)
-                        task_group_context_impl::propagate_task_group_state(ctx, mptr_state, src, new_state);
-                }
-                // Sync up local propagation epoch with the global one. Release fence prevents
-                // reordering of possible store to *mptr_state after the sync point.
-                my_context_list->epoch.store(
-                        the_context_state_propagation_epoch.load(std::memory_order_relaxed),
-                        std::memory_order_release);
-            }
-
-            template <typename T>
-            bool market::propagate_task_group_state(std::atomic<T> d1::task_group_context::*mptr_state,
-                                                    d1::task_group_context& src, T new_state) {
-                if (src.my_state.load(std::memory_order_relaxed) != d1::task_group_context::may_have_children)
-                    return true;
-                // The whole propagation algorithm is under the lock in order to ensure correctness
-                // in case of concurrent state changes at the different levels of the context tree.
-                // See comment at the bottom of scheduler.cpp
-                context_state_propagation_mutex_type::scoped_lock lock(the_context_state_propagation_mutex);
-                if ((src.*mptr_state).load(std::memory_order_relaxed) != new_state)
-                    // Another thread has concurrently changed the state. Back down.
-                    return false;
-                // Advance global state propagation epoch
-                ++the_context_state_propagation_epoch;
-                // Propagate to all workers and external threads and sync up their local epochs with the global one
-                unsigned num_workers = my_first_unused_worker_idx;
-                for (unsigned i = 0; i < num_workers; ++i) {
-                    thread_data* td = my_workers[i].load(std::memory_order_acquire);
-                    // If the worker is only about to be registered, skip it.
-                    if (td) td->propagate_task_group_state(mptr_state, src, new_state);
-                }
-                // Propagate to all external threads
-                // The whole propagation sequence is locked, thus no contention is expected
-                for (thread_data_list_type::iterator it = my_masters.begin(); it != my_masters.end(); it++)
-                    it->propagate_task_group_state(mptr_state, src, new_state);
-                return true;
-            }
-
-            bool task_group_context_impl::cancel_group_execution(d1::task_group_context& ctx) {
-                __TBB_ASSERT(!is_poisoned(ctx.my_context_list), nullptr);
-                __TBB_ASSERT(ctx.my_cancellation_requested.load(std::memory_order_relaxed) <= 1,
-                             "The cancellation state can be either 0 or 1");
-                if (ctx.my_cancellation_requested.load(std::memory_order_relaxed)
-                    || ctx.my_cancellation_requested.exchange(1)) {
-                    // This task group and any descendants have already been canceled.
-                    // (A newly added descendant would inherit its parent's ctx.my_cancellation_requested,
-                    // not missing out on any cancellation still being propagated, and a context cannot be uncanceled.)
-                    return false;
-                }
-                governor::get_thread_data()->my_arena->my_market->propagate_task_group_state(
-                        &d1::task_group_context::my_cancellation_requested, ctx, uint32_t(1));
-                return true;
-            }
-
-            bool task_group_context_impl::is_group_execution_cancelled(const d1::task_group_context& ctx) {
-                return ctx.my_cancellation_requested.load(std::memory_order_relaxed) != 0;
-            }
-
-            // IMPORTANT: It is assumed that this method is not used concurrently!
-            void task_group_context_impl::reset(d1::task_group_context& ctx) {
-                __TBB_ASSERT(!is_poisoned(ctx.my_context_list), nullptr);
-                //! TODO: Add assertion that this context does not have children
-                // No fences are necessary since this context can be accessed from another thread
-                // only after stealing happened (which means necessary fences were used).
-
-                auto exception = ctx.my_exception.load(std::memory_order_relaxed);
-                if (exception) {
-                    exception->destroy();
-                    ctx.my_exception.store(nullptr, std::memory_order_relaxed);
-                }
-                ctx.my_cancellation_requested = 0;
-            }
-
-            // IMPORTANT: It is assumed that this method is not used concurrently!
-            void task_group_context_impl::capture_fp_settings(d1::task_group_context& ctx) {
-                __TBB_ASSERT(!is_poisoned(ctx.my_context_list), nullptr);
-                //! TODO: Add assertion that this context does not have children
-                // No fences are necessary since this context can be accessed from another thread
-                // only after stealing happened (which means necessary fences were used).
-                d1::cpu_ctl_env* ctl = reinterpret_cast<d1::cpu_ctl_env*>(&ctx.my_cpu_ctl_env);
-                if (!ctx.my_traits.fp_settings) {
-                    ctl = new (&ctx.my_cpu_ctl_env) d1::cpu_ctl_env;
-                    ctx.my_traits.fp_settings = true;
-                }
-                ctl->get_env();
-            }
-
-            void task_group_context_impl::copy_fp_settings(d1::task_group_context& ctx,
-                                                           const d1::task_group_context& src) {
-                __TBB_ASSERT(!is_poisoned(ctx.my_context_list), nullptr);
-                __TBB_ASSERT(!ctx.my_traits.fp_settings, "The context already has FPU settings.");
-                __TBB_ASSERT(src.my_traits.fp_settings, "The source context does not have FPU settings.");
-
-                const d1::cpu_ctl_env* src_ctl
-                        = reinterpret_cast<const d1::cpu_ctl_env*>(&src.my_cpu_ctl_env);
-                new (&ctx.my_cpu_ctl_env) d1::cpu_ctl_env(*src_ctl);
-                ctx.my_traits.fp_settings = true;
+    if ((ctx.*mptr_state).load(std::memory_order_relaxed) != new_state && &ctx != &src) {
+        for (d1::task_group_context* ancestor = ctx.my_parent; ancestor != nullptr; ancestor = ancestor->my_parent) {
+            if (ancestor == &src) {
+                for (d1::task_group_context* c = &ctx; c != ancestor; c = c->my_parent)
+                    (c->*mptr_state).store(new_state, std::memory_order_relaxed);
+                break;
             }
+        }
+    }
+}
+
+bool task_group_context_impl::cancel_group_execution(d1::task_group_context& ctx) {
+    __TBB_ASSERT(!is_poisoned(ctx.my_context_list), nullptr);
+    __TBB_ASSERT(ctx.my_cancellation_requested.load(std::memory_order_relaxed) <= 1, "The cancellation state can be either 0 or 1");
+    if (ctx.my_cancellation_requested.load(std::memory_order_relaxed) || ctx.my_cancellation_requested.exchange(1)) {
+        // This task group and any descendants have already been canceled.
+        // (A newly added descendant would inherit its parent's ctx.my_cancellation_requested,
+        // not missing out on any cancellation still being propagated, and a context cannot be uncanceled.)
+        return false;
+    }
+    governor::get_thread_data()->my_arena->my_threading_control->propagate_task_group_state(&d1::task_group_context::my_cancellation_requested, ctx, uint32_t(1));
+    return true;
+}
+
+bool task_group_context_impl::is_group_execution_cancelled(const d1::task_group_context& ctx) {
+    return ctx.my_cancellation_requested.load(std::memory_order_relaxed) != 0;
+}
+
+// IMPORTANT: It is assumed that this method is not used concurrently!
+void task_group_context_impl::reset(d1::task_group_context& ctx) {
+    __TBB_ASSERT(!is_poisoned(ctx.my_context_list), nullptr);
+    //! TODO: Add assertion that this context does not have children
+    // No fences are necessary since this context can be accessed from another thread
+    // only after stealing happened (which means necessary fences were used).
+
+    auto exception = ctx.my_exception.load(std::memory_order_relaxed);
+    if (exception) {
+        exception->destroy();
+        ctx.my_exception.store(nullptr, std::memory_order_relaxed);
+    }
+    ctx.my_cancellation_requested = 0;
+}
+
+// IMPORTANT: It is assumed that this method is not used concurrently!
+void task_group_context_impl::capture_fp_settings(d1::task_group_context& ctx) {
+    __TBB_ASSERT(!is_poisoned(ctx.my_context_list), nullptr);
+    //! TODO: Add assertion that this context does not have children
+    // No fences are necessary since this context can be accessed from another thread
+    // only after stealing happened (which means necessary fences were used).
+    d1::cpu_ctl_env* ctl = reinterpret_cast<d1::cpu_ctl_env*>(&ctx.my_cpu_ctl_env);
+    if (!ctx.my_traits.fp_settings) {
+        ctl = new (&ctx.my_cpu_ctl_env) d1::cpu_ctl_env;
+        ctx.my_traits.fp_settings = true;
+    }
+    ctl->get_env();
+}
+
+void task_group_context_impl::copy_fp_settings(d1::task_group_context& ctx, const d1::task_group_context& src) {
+    __TBB_ASSERT(!is_poisoned(ctx.my_context_list), nullptr);
+    __TBB_ASSERT(!ctx.my_traits.fp_settings, "The context already has FPU settings.");
+    __TBB_ASSERT(src.my_traits.fp_settings, "The source context does not have FPU settings.");
+
+    const d1::cpu_ctl_env* src_ctl = reinterpret_cast<const d1::cpu_ctl_env*>(&src.my_cpu_ctl_env);
+    new (&ctx.my_cpu_ctl_env) d1::cpu_ctl_env(*src_ctl);
+    ctx.my_traits.fp_settings = true;
+}
 
-            /*
+/*
     Comments:
 
 1.  The premise of the cancellation support implementation is that cancellations are
@@ -418,25 +333,26 @@ namespace tbb {
     However this version of the algorithm requires more analysis and verification.
 */
 
-            void __TBB_EXPORTED_FUNC initialize(d1::task_group_context& ctx) {
-                task_group_context_impl::initialize(ctx);
-            }
-            void __TBB_EXPORTED_FUNC destroy(d1::task_group_context& ctx) {
-                task_group_context_impl::destroy(ctx);
-            }
-            void __TBB_EXPORTED_FUNC reset(d1::task_group_context& ctx) {
-                task_group_context_impl::reset(ctx);
-            }
-            bool __TBB_EXPORTED_FUNC cancel_group_execution(d1::task_group_context& ctx) {
-                return task_group_context_impl::cancel_group_execution(ctx);
-            }
-            bool __TBB_EXPORTED_FUNC is_group_execution_cancelled(d1::task_group_context& ctx) {
-                return task_group_context_impl::is_group_execution_cancelled(ctx);
-            }
-            void __TBB_EXPORTED_FUNC capture_fp_settings(d1::task_group_context& ctx) {
-                task_group_context_impl::capture_fp_settings(ctx);
-            }
+void __TBB_EXPORTED_FUNC initialize(d1::task_group_context& ctx) {
+    task_group_context_impl::initialize(ctx);
+}
+void __TBB_EXPORTED_FUNC destroy(d1::task_group_context& ctx) {
+    task_group_context_impl::destroy(ctx);
+}
+void __TBB_EXPORTED_FUNC reset(d1::task_group_context& ctx) {
+    task_group_context_impl::reset(ctx);
+}
+bool __TBB_EXPORTED_FUNC cancel_group_execution(d1::task_group_context& ctx) {
+    return task_group_context_impl::cancel_group_execution(ctx);
+}
+bool __TBB_EXPORTED_FUNC is_group_execution_cancelled(d1::task_group_context& ctx) {
+    return task_group_context_impl::is_group_execution_cancelled(ctx);
+}
+void __TBB_EXPORTED_FUNC capture_fp_settings(d1::task_group_context& ctx) {
+    task_group_context_impl::capture_fp_settings(ctx);
+}
+
+} // namespace r1
+} // namespace detail
+} // namespace tbb
 
-        }// namespace r1
-    }    // namespace detail
-}// namespace tbb
diff --git a/external/tbb/src/tbb/task_stream.h b/external/tbb/src/tbb/task_stream.h
index 889ddf25..0aaace52 100644
--- a/external/tbb/src/tbb/task_stream.h
+++ b/external/tbb/src/tbb/task_stream.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -54,20 +54,20 @@ using population_t = uintptr_t;
 const population_t one = 1;
 
 inline void set_one_bit( std::atomic<population_t>& dest, int pos ) {
-    __TBB_ASSERT( pos>=0, NULL );
-    __TBB_ASSERT( pos<int(sizeof(population_t)*CHAR_BIT), NULL );
+    __TBB_ASSERT( pos>=0, nullptr);
+    __TBB_ASSERT( pos<int(sizeof(population_t)*CHAR_BIT), nullptr);
     dest.fetch_or( one<<pos );
 }
 
 inline void clear_one_bit( std::atomic<population_t>& dest, int pos ) {
-    __TBB_ASSERT( pos>=0, NULL );
-    __TBB_ASSERT( pos<int(sizeof(population_t)*CHAR_BIT), NULL );
+    __TBB_ASSERT( pos>=0, nullptr);
+    __TBB_ASSERT( pos<int(sizeof(population_t)*CHAR_BIT), nullptr);
     dest.fetch_and( ~(one<<pos) );
 }
 
 inline bool is_bit_set( population_t val, int pos ) {
-    __TBB_ASSERT( pos>=0, NULL );
-    __TBB_ASSERT( pos<int(sizeof(population_t)*CHAR_BIT), NULL );
+    __TBB_ASSERT( pos>=0, nullptr);
+    __TBB_ASSERT( pos<int(sizeof(population_t)*CHAR_BIT), nullptr);
     return (val & (one<<pos)) != 0;
 }
 
@@ -159,12 +159,12 @@ class task_stream : public task_stream_accessor< accessor > {
 
         N = n_lanes >= max_lanes ? max_lanes : n_lanes > 2 ? 1 << (tbb::detail::log2(n_lanes - 1) + 1) : 2;
         __TBB_ASSERT( N == max_lanes || (N >= n_lanes && ((N - 1) & N) == 0), "number of lanes miscalculated" );
-        __TBB_ASSERT( N <= sizeof(population_t) * CHAR_BIT, NULL );
+        __TBB_ASSERT( N <= sizeof(population_t) * CHAR_BIT, nullptr);
         lanes = static_cast<lane_t*>(cache_aligned_allocate(sizeof(lane_t) * N));
         for (unsigned i = 0; i < N; ++i) {
             new (lanes + i) lane_t;
         }
-        __TBB_ASSERT( !population.load(std::memory_order_relaxed), NULL );
+        __TBB_ASSERT( !population.load(std::memory_order_relaxed), nullptr);
     }
 
     ~task_stream() {
@@ -191,18 +191,19 @@ class task_stream : public task_stream_accessor< accessor > {
     //! updated inside lane selector.
     template<typename lane_selector_t>
     d1::task* pop( const lane_selector_t& next_lane ) {
-        d1::task* popped = NULL;
+        d1::task* popped = nullptr;
         unsigned lane = 0;
-        do {
-            lane = next_lane( /*out_of=*/N );
-            __TBB_ASSERT( lane < N, "Incorrect lane index." );
-        } while( !empty() && !(popped = try_pop( lane )) );
+        for (atomic_backoff b; !empty() && !popped; b.pause()) {
+            lane = next_lane( /*out_of=*/N);
+            __TBB_ASSERT(lane < N, "Incorrect lane index.");
+            popped = try_pop(lane);
+        }
         return popped;
     }
 
     //! Try finding and popping a related task.
     d1::task* pop_specific( unsigned& last_used_lane, isolation_type isolation ) {
-        d1::task* result = NULL;
+        d1::task* result = nullptr;
         // Lane selection is round-robin in backward direction.
         unsigned idx = last_used_lane & (N-1);
         do {
@@ -240,11 +241,11 @@ class task_stream : public task_stream_accessor< accessor > {
         return false;
     }
 
-    //! Returns pointer to task on successful pop, otherwise - NULL.
+    //! Returns pointer to task on successful pop, otherwise - nullptr.
     d1::task* try_pop( unsigned lane_idx ) {
         if( !is_bit_set( population.load(std::memory_order_relaxed), lane_idx ) )
-            return NULL;
-        d1::task* result = NULL;
+            return nullptr;
+        d1::task* result = nullptr;
         lane_t& lane = lanes[lane_idx];
         mutex::scoped_lock lock;
         if( lock.try_acquire( lane.my_mutex ) && !lane.my_queue.empty() ) {
@@ -257,7 +258,7 @@ class task_stream : public task_stream_accessor< accessor > {
 
     // TODO: unify '*_specific' logic with 'pop' methods above
     d1::task* look_specific( typename lane_t::queue_base_t& queue, isolation_type isolation ) {
-        __TBB_ASSERT( !queue.empty(), NULL );
+        __TBB_ASSERT( !queue.empty(), nullptr);
         // TODO: add a worst-case performance test and consider an alternative container with better
         // performance for isolation search.
         typename lane_t::queue_base_t::iterator curr = queue.end();
@@ -268,12 +269,12 @@ class task_stream : public task_stream_accessor< accessor > {
                 if( queue.end() - curr == 1 )
                     queue.pop_back(); // a little of housekeeping along the way
                 else
-                    *curr = 0;      // grabbing task with the same isolation
+                    *curr = nullptr;      // grabbing task with the same isolation
                 // TODO: move one of the container's ends instead if the task has been found there
                 return result;
             }
         } while( curr != queue.begin() );
-        return NULL;
+        return nullptr;
     }
 
 }; // task_stream
diff --git a/external/tbb/src/tbb/tbb.rc b/external/tbb/src/tbb/tbb.rc
new file mode 100644
index 00000000..3eeed09c
--- /dev/null
+++ b/external/tbb/src/tbb/tbb.rc
@@ -0,0 +1,74 @@
+// Copyright (c) 2005-2025 Intel Corporation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Includes
+//
+#include <winresrc.h>
+#include "../../include/oneapi/tbb/version.h"
+
+/////////////////////////////////////////////////////////////////////////////
+// Neutral resources
+
+#ifdef _WIN32
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+#define TBB_VERNUMBERS TBB_VERSION_MAJOR,TBB_VERSION_MINOR,TBB_VERSION_PATCH
+#define TBB_VERSION TBB_VERSION_STRING
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION TBB_VERNUMBERS
+ PRODUCTVERSION TBB_VERNUMBERS
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "000004b0"
+        BEGIN
+            VALUE "CompanyName", "Intel Corporation\0"
+            VALUE "FileDescription", "oneAPI Threading Building Blocks (oneTBB) library\0"
+            VALUE "FileVersion", TBB_VERSION "\0"
+            VALUE "LegalCopyright", "Copyright 2005-2025 Intel Corporation.  All Rights Reserved.\0"
+            VALUE "LegalTrademarks", "\0"
+#ifndef TBB_USE_DEBUG
+            VALUE "OriginalFilename", "tbb12.dll\0"
+#else
+            VALUE "OriginalFilename", "tbb12_debug.dll\0"
+#endif
+            VALUE "ProductName", "oneAPI Threading Building Blocks (oneTBB)\0"
+            VALUE "ProductVersion", TBB_VERSION "\0"
+            VALUE "PrivateBuild", "\0"
+            VALUE "SpecialBuild", "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x0, 1200
+    END
+END
diff --git a/external/tbb/src/tbb/tcm.h b/external/tbb/src/tbb/tcm.h
new file mode 100644
index 00000000..66ee18a2
--- /dev/null
+++ b/external/tbb/src/tbb/tcm.h
@@ -0,0 +1,174 @@
+/*
+    Copyright (c) 2023-2024 Intel Corporation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#ifndef _TBB_tcm_H
+#define _TBB_tcm_H
+
+#include <stdint.h>
+#include <stdbool.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// Support for the TCM API return value
+
+typedef enum _tcm_result_t {
+  TCM_RESULT_SUCCESS = 0x0,
+  TCM_RESULT_ERROR_INVALID_ARGUMENT = 0x78000004,
+  TCM_RESULT_ERROR_UNKNOWN = 0x7ffffffe
+} tcm_result_t;
+
+// Support for permit states
+
+enum tcm_permit_states_t {
+  TCM_PERMIT_STATE_VOID,
+  TCM_PERMIT_STATE_INACTIVE,
+  TCM_PERMIT_STATE_PENDING,
+  TCM_PERMIT_STATE_IDLE,
+  TCM_PERMIT_STATE_ACTIVE
+};
+
+typedef uint8_t tcm_permit_state_t;
+
+// Support for permit flags
+
+typedef struct _tcm_permit_flags_t {
+  uint32_t stale : 1;
+  uint32_t rigid_concurrency : 1;
+  uint32_t exclusive : 1;
+  uint32_t request_as_inactive : 1;
+  uint32_t reserved : 28;
+} tcm_permit_flags_t;
+
+typedef struct _tcm_callback_flags_t {
+  uint32_t new_concurrency : 1;
+  uint32_t new_state : 1;
+  uint32_t reserved : 30;
+} tcm_callback_flags_t;
+
+// Support for cpu masks
+
+struct hwloc_bitmap_s;
+typedef struct hwloc_bitmap_s* hwloc_bitmap_t;
+typedef hwloc_bitmap_t tcm_cpu_mask_t;
+
+// Support for ids
+
+typedef uint64_t tcm_client_id_t;
+
+// Support for permits
+
+typedef struct _tcm_permit_t {
+  uint32_t* concurrencies;
+  tcm_cpu_mask_t* cpu_masks;
+  uint32_t size;
+  tcm_permit_state_t state;
+  tcm_permit_flags_t flags;
+} tcm_permit_t;
+
+// Support for permit handle
+
+typedef struct tcm_permit_rep_t* tcm_permit_handle_t;
+
+// Support for constraints
+
+typedef int32_t tcm_numa_node_t;
+typedef int32_t tcm_core_type_t;
+
+const int8_t tcm_automatic = -1;
+const int8_t tcm_any = -2;
+
+#define TCM_PERMIT_REQUEST_CONSTRAINTS_INITIALIZER {tcm_automatic, tcm_automatic, NULL, \
+                                                     tcm_automatic, tcm_automatic, tcm_automatic}
+
+typedef struct _tcm_cpu_constraints_t {
+  int32_t min_concurrency;
+  int32_t max_concurrency;
+  tcm_cpu_mask_t mask;
+  tcm_numa_node_t numa_id;
+  tcm_core_type_t core_type_id;
+  int32_t threads_per_core;
+} tcm_cpu_constraints_t;
+
+// Support for priorities
+
+enum tcm_request_priorities_t {
+  TCM_REQUEST_PRIORITY_LOW    = (INT32_MAX / 4) * 1,
+  TCM_REQUEST_PRIORITY_NORMAL = (INT32_MAX / 4) * 2,
+  TCM_REQUEST_PRIORITY_HIGH   = (INT32_MAX / 4) * 3
+};
+
+typedef int32_t tcm_request_priority_t;
+
+// Support for requests
+
+#define TCM_PERMIT_REQUEST_INITIALIZER {tcm_automatic, tcm_automatic, \
+                                         NULL, 0, TCM_REQUEST_PRIORITY_NORMAL, {}, {}}
+
+typedef struct _tcm_permit_request_t {
+  int32_t min_sw_threads;
+  int32_t max_sw_threads;
+  tcm_cpu_constraints_t* cpu_constraints;
+  uint32_t constraints_size;
+  tcm_request_priority_t priority;
+  tcm_permit_flags_t flags;
+  char reserved[4];
+} tcm_permit_request_t;
+
+// Support for client callback
+
+typedef tcm_result_t (*tcm_callback_t)(tcm_permit_handle_t p, void* callback_arg, tcm_callback_flags_t);
+
+#if _WIN32
+  #define __TCM_EXPORT __declspec(dllexport)
+#else
+  #define __TCM_EXPORT
+#endif
+
+
+__TCM_EXPORT tcm_result_t tcmConnect(tcm_callback_t callback,
+                                     tcm_client_id_t *client_id);
+__TCM_EXPORT tcm_result_t tcmDisconnect(tcm_client_id_t client_id);
+
+__TCM_EXPORT tcm_result_t tcmRequestPermit(tcm_client_id_t client_id,
+                                           tcm_permit_request_t request,
+                                           void* callback_arg,
+                                           tcm_permit_handle_t* permit_handle,
+                                           tcm_permit_t* permit);
+
+__TCM_EXPORT tcm_result_t tcmGetPermitData(tcm_permit_handle_t permit_handle,
+                                           tcm_permit_t* permit);
+
+__TCM_EXPORT tcm_result_t tcmReleasePermit(tcm_permit_handle_t permit);
+
+__TCM_EXPORT tcm_result_t tcmIdlePermit(tcm_permit_handle_t permit_handle);
+
+__TCM_EXPORT tcm_result_t tcmDeactivatePermit(tcm_permit_handle_t permit_handle);
+
+__TCM_EXPORT tcm_result_t tcmActivatePermit(tcm_permit_handle_t permit_handle);
+
+__TCM_EXPORT tcm_result_t tcmRegisterThread(tcm_permit_handle_t permit_handle);
+
+__TCM_EXPORT tcm_result_t tcmUnregisterThread();
+
+__TCM_EXPORT tcm_result_t tcmGetVersionInfo(char* buffer, uint32_t buffer_size);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+#endif /* _TBB_tcm_H */
diff --git a/external/tbb/src/tbb/tcm_adaptor.cpp b/external/tbb/src/tbb/tcm_adaptor.cpp
new file mode 100644
index 00000000..85ca125b
--- /dev/null
+++ b/external/tbb/src/tbb/tcm_adaptor.cpp
@@ -0,0 +1,327 @@
+/*
+    Copyright (c) 2023-2024 Intel Corporation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#include "oneapi/tbb/detail/_intrusive_list_node.h"
+#include "oneapi/tbb/detail/_template_helpers.h"
+#include "oneapi/tbb/task_arena.h"
+
+#include "pm_client.h"
+#include "dynamic_link.h"
+#include "misc.h"
+#include "tcm.h"
+#include "tcm_adaptor.h"
+
+#include <iostream>
+
+namespace tbb {
+namespace detail {
+namespace r1 {
+
+namespace {
+#if __TBB_WEAK_SYMBOLS_PRESENT
+#pragma weak tcmConnect
+#pragma weak tcmDisconnect
+#pragma weak tcmRequestPermit
+#pragma weak tcmGetPermitData
+#pragma weak tcmReleasePermit
+#pragma weak tcmIdlePermit
+#pragma weak tcmDeactivatePermit
+#pragma weak tcmActivatePermit
+#pragma weak tcmRegisterThread
+#pragma weak tcmUnregisterThread
+#pragma weak tcmGetVersionInfo
+#endif /* __TBB_WEAK_SYMBOLS_PRESENT */
+
+tcm_result_t(*tcm_connect)(tcm_callback_t callback, tcm_client_id_t* client_id){nullptr};
+tcm_result_t(*tcm_disconnect)(tcm_client_id_t client_id){ nullptr };
+tcm_result_t(*tcm_request_permit)(tcm_client_id_t client_id, tcm_permit_request_t request,
+    void* callback_arg, tcm_permit_handle_t* permit_handle, tcm_permit_t* permit){nullptr};
+tcm_result_t(*tcm_get_permit_data)(tcm_permit_handle_t permit_handle, tcm_permit_t* permit){nullptr};
+tcm_result_t(*tcm_release_permit)(tcm_permit_handle_t permit){nullptr};
+tcm_result_t(*tcm_idle_permit)(tcm_permit_handle_t permit_handle){nullptr};
+tcm_result_t(*tcm_deactivate_permit)(tcm_permit_handle_t permit_handle){nullptr};
+tcm_result_t(*tcm_activate_permit)(tcm_permit_handle_t permit_handle){nullptr};
+tcm_result_t(*tcm_register_thread)(tcm_permit_handle_t permit_handle){nullptr};
+tcm_result_t(*tcm_unregister_thread)(){nullptr};
+tcm_result_t (*tcm_get_version_info)(char* buffer, uint32_t buffer_size){nullptr};
+
+static const dynamic_link_descriptor tcm_link_table[] = {
+    DLD(tcmConnect, tcm_connect),
+    DLD(tcmDisconnect, tcm_disconnect),
+    DLD(tcmRequestPermit, tcm_request_permit),
+    DLD(tcmGetPermitData, tcm_get_permit_data),
+    DLD(tcmReleasePermit, tcm_release_permit),
+    DLD(tcmIdlePermit, tcm_idle_permit),
+    DLD(tcmDeactivatePermit, tcm_deactivate_permit),
+    DLD(tcmActivatePermit, tcm_activate_permit),
+    DLD(tcmRegisterThread, tcm_register_thread),
+    DLD(tcmUnregisterThread, tcm_unregister_thread),
+    DLD(tcmGetVersionInfo, tcm_get_version_info)
+};
+
+#if TBB_USE_DEBUG
+#define DEBUG_SUFFIX "_debug"
+#else
+#define DEBUG_SUFFIX
+#endif /* TBB_USE_DEBUG */
+
+#if _WIN32 || _WIN64
+#define LIBRARY_EXTENSION ".dll"
+#define LIBRARY_PREFIX
+#elif __unix__
+#define LIBRARY_EXTENSION ".so.1"
+#define LIBRARY_PREFIX "lib"
+#else
+#define LIBRARY_EXTENSION
+#define LIBRARY_PREFIX
+#endif /* __unix__ */
+
+#define TCMLIB_NAME LIBRARY_PREFIX "tcm" DEBUG_SUFFIX LIBRARY_EXTENSION
+
+static bool tcm_functions_loaded{ false };
+}
+
+class tcm_client : public pm_client {
+    using tcm_client_mutex_type = d1::mutex;
+public:
+    tcm_client(tcm_adaptor& adaptor, arena& a) : pm_client(a), my_tcm_adaptor(adaptor) {}
+
+    ~tcm_client() {
+        if (my_permit_handle) {
+            __TBB_ASSERT(tcm_release_permit, nullptr);
+            auto res = tcm_release_permit(my_permit_handle);
+            __TBB_ASSERT_EX(res == TCM_RESULT_SUCCESS, nullptr);
+        }
+    }
+
+    int update_concurrency(uint32_t concurrency) {
+        return my_arena.update_concurrency(concurrency);
+    }
+
+    unsigned priority_level() {
+        return my_arena.priority_level();
+    }
+
+    tcm_permit_request_t& permit_request() {
+        return my_permit_request;
+    }
+
+    tcm_permit_handle_t& permit_handle() {
+        return my_permit_handle;
+    }
+
+    void actualize_permit() {
+        __TBB_ASSERT(tcm_get_permit_data, nullptr);
+        int delta{};
+        {
+            tcm_client_mutex_type::scoped_lock lock(my_permit_mutex);
+
+            uint32_t new_concurrency{};
+            tcm_permit_t new_permit{ &new_concurrency, nullptr, 1, TCM_PERMIT_STATE_VOID, {} };
+            auto res = tcm_get_permit_data(my_permit_handle, &new_permit);
+            __TBB_ASSERT_EX(res == TCM_RESULT_SUCCESS, nullptr);
+
+            // The permit has changed during the reading, so the callback will be invoked soon one more time and
+            // we can just skip this renegotiation iteration.
+            if (!new_permit.flags.stale) {
+                // If there is no other demand in TCM, the permit may still have granted concurrency but
+                // be in the deactivated state thus we enforce 0 allotment to preserve arena invariants.
+                delta = update_concurrency(new_permit.state != TCM_PERMIT_STATE_INACTIVE ? new_concurrency : 0);
+            }
+        }
+        if (delta) {
+            my_tcm_adaptor.notify_thread_request(delta);
+        }
+    }
+
+    void request_permit(tcm_client_id_t client_id) {
+        __TBB_ASSERT(tcm_request_permit, nullptr);
+
+        my_permit_request.max_sw_threads = max_workers();
+        my_permit_request.min_sw_threads = my_permit_request.max_sw_threads == 0 ? 0 : min_workers();
+
+        if (my_permit_request.constraints_size > 0) {
+            my_permit_request.cpu_constraints->min_concurrency = my_permit_request.min_sw_threads;
+            my_permit_request.cpu_constraints->max_concurrency = my_permit_request.max_sw_threads;
+        }
+
+        __TBB_ASSERT(my_permit_request.max_sw_threads >= my_permit_request.min_sw_threads, nullptr);
+
+        tcm_result_t res = tcm_request_permit(client_id, my_permit_request, this, &my_permit_handle, nullptr);
+        __TBB_ASSERT_EX(res == TCM_RESULT_SUCCESS, nullptr);
+    }
+
+    void deactivate_permit() {
+         __TBB_ASSERT(tcm_deactivate_permit, nullptr);
+        tcm_result_t res = tcm_deactivate_permit(my_permit_handle);
+        __TBB_ASSERT_EX(res == TCM_RESULT_SUCCESS, nullptr);
+    }
+
+    void init(tcm_client_id_t client_id, d1::constraints& constraints) {
+        __TBB_ASSERT(tcm_request_permit, nullptr);
+        __TBB_ASSERT(tcm_deactivate_permit, nullptr);
+
+        if (constraints.core_type            != d1::task_arena::automatic ||
+            constraints.numa_id              != d1::task_arena::automatic ||
+            constraints.max_threads_per_core != d1::task_arena::automatic)
+        {
+            my_permit_constraints.max_concurrency = constraints.max_concurrency;
+            my_permit_constraints.min_concurrency = 0;
+            my_permit_constraints.core_type_id = constraints.core_type;
+            my_permit_constraints.numa_id = constraints.numa_id;
+            my_permit_constraints.threads_per_core = constraints.max_threads_per_core;
+
+            my_permit_request.cpu_constraints = &my_permit_constraints;
+            my_permit_request.constraints_size = 1;
+        }
+
+        my_permit_request.min_sw_threads = 0;
+        my_permit_request.max_sw_threads = 0;
+        my_permit_request.flags.request_as_inactive = 1;
+
+        tcm_result_t res = tcm_request_permit(client_id, my_permit_request, this, &my_permit_handle, nullptr);
+        __TBB_ASSERT_EX(res == TCM_RESULT_SUCCESS, nullptr);
+
+        my_permit_request.flags.request_as_inactive = 0;
+    }
+
+    void register_thread() override {
+        __TBB_ASSERT(tcm_register_thread, nullptr);
+        auto return_code = tcm_register_thread(my_permit_handle);
+        __TBB_ASSERT_EX(return_code == TCM_RESULT_SUCCESS, nullptr);
+    }
+
+    void unregister_thread() override {
+        __TBB_ASSERT(tcm_unregister_thread, nullptr);
+        auto return_code = tcm_unregister_thread();
+        __TBB_ASSERT_EX(return_code == TCM_RESULT_SUCCESS, nullptr);
+    }
+
+private:
+    tcm_cpu_constraints_t my_permit_constraints = TCM_PERMIT_REQUEST_CONSTRAINTS_INITIALIZER;
+    tcm_permit_request_t my_permit_request = TCM_PERMIT_REQUEST_INITIALIZER;
+    tcm_permit_handle_t my_permit_handle{};
+    tcm_client_mutex_type my_permit_mutex;
+    tcm_adaptor& my_tcm_adaptor;
+};
+
+//------------------------------------------------------------------------
+// tcm_adaptor_impl
+//------------------------------------------------------------------------
+
+struct tcm_adaptor_impl {
+    using demand_mutex_type = d1::mutex;
+    demand_mutex_type my_demand_mutex;
+    tcm_client_id_t client_id{};
+
+    tcm_adaptor_impl(tcm_client_id_t id) : client_id(id)
+    {}
+};
+
+//------------------------------------------------------------------------
+// tcm_adaptor
+//------------------------------------------------------------------------
+
+tcm_result_t renegotiation_callback(tcm_permit_handle_t, void* client_ptr, tcm_callback_flags_t) {
+    __TBB_ASSERT(client_ptr, nullptr);
+    static_cast<tcm_client*>(client_ptr)->actualize_permit();
+    return TCM_RESULT_SUCCESS;
+}
+
+void tcm_adaptor::initialize() {
+    tcm_functions_loaded = dynamic_link(TCMLIB_NAME, tcm_link_table, /* tcm_link_table size = */ 11);
+}
+
+bool tcm_adaptor::is_initialized() {
+    return tcm_functions_loaded;
+}
+
+void tcm_adaptor::print_version() {
+    if (is_initialized()) {
+        __TBB_ASSERT(tcm_get_version_info, nullptr);
+        char buffer[1024];
+        tcm_get_version_info(buffer, 1024);
+        std::fprintf(stderr, "%.*s", 1024, buffer);
+    }
+}
+
+tcm_adaptor::tcm_adaptor() {
+    __TBB_ASSERT(tcm_connect, nullptr);
+    tcm_client_id_t client_id{};
+    auto return_code = tcm_connect(renegotiation_callback, &client_id);
+    if (return_code == TCM_RESULT_SUCCESS) {
+        my_impl = make_cache_aligned_unique<tcm_adaptor_impl>(client_id);
+    }
+}
+
+tcm_adaptor::~tcm_adaptor() {
+    if (my_impl) {
+        __TBB_ASSERT(tcm_disconnect, nullptr);
+        auto return_code = tcm_disconnect(my_impl->client_id);
+        __TBB_ASSERT_EX(return_code == TCM_RESULT_SUCCESS, nullptr);
+        my_impl = nullptr;
+    }
+}
+
+bool tcm_adaptor::is_connected() {
+    return my_impl != nullptr;
+}
+
+pm_client* tcm_adaptor::create_client(arena& a) {
+    return new (cache_aligned_allocate(sizeof(tcm_client))) tcm_client(*this, a);
+}
+
+void tcm_adaptor::register_client(pm_client* c, d1::constraints& constraints) {
+    static_cast<tcm_client*>(c)->init(my_impl->client_id, constraints);
+}
+
+void tcm_adaptor::unregister_and_destroy_client(pm_client& c) {
+    auto& client = static_cast<tcm_client&>(c);
+
+    {
+        tcm_adaptor_impl::demand_mutex_type::scoped_lock lock(my_impl->my_demand_mutex);
+        client.~tcm_client();
+    }
+    cache_aligned_deallocate(&client);
+}
+
+void tcm_adaptor::set_active_num_workers(int) {}
+
+
+void tcm_adaptor::adjust_demand(pm_client& c, int mandatory_delta, int workers_delta) {
+    __TBB_ASSERT(-1 <= mandatory_delta && mandatory_delta <= 1, nullptr);
+
+    auto& client = static_cast<tcm_client&>(c);
+    {
+        tcm_adaptor_impl::demand_mutex_type::scoped_lock lock(my_impl->my_demand_mutex);
+
+        // Update client's state
+        workers_delta = client.update_request(mandatory_delta, workers_delta);
+        if (workers_delta == 0) return;
+
+        if (client.max_workers() == 0) {
+            client.deactivate_permit();
+        } else {
+            client.request_permit(my_impl->client_id);
+        }
+    }
+
+    client.actualize_permit();
+}
+
+} // namespace r1
+} // namespace detail
+} // namespace tbb
diff --git a/external/tbb/src/tbb/tcm_adaptor.h b/external/tbb/src/tbb/tcm_adaptor.h
new file mode 100644
index 00000000..f9f4d527
--- /dev/null
+++ b/external/tbb/src/tbb/tcm_adaptor.h
@@ -0,0 +1,63 @@
+/*
+    Copyright (c) 2023 Intel Corporation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#ifndef _TBB_tcm_adaptor_H
+#define _TBB_tcm_adaptor_H
+
+#include "scheduler_common.h"
+
+#include "permit_manager.h"
+#include "pm_client.h"
+
+namespace tbb {
+namespace detail {
+namespace r1 {
+
+struct tcm_adaptor_impl;
+
+//------------------------------------------------------------------------
+// Class tcm_adaptor
+//------------------------------------------------------------------------
+
+class tcm_adaptor : public permit_manager {
+public:
+    tcm_adaptor();
+    ~tcm_adaptor();
+
+    pm_client* create_client(arena& a) override;
+    void register_client(pm_client* client, d1::constraints& constraints) override;
+    void unregister_and_destroy_client(pm_client& c) override;
+
+    void set_active_num_workers(int soft_limit) override;
+
+    void adjust_demand(pm_client& c, int mandatory_delta, int workers_delta)  override;
+
+    bool is_connected();
+
+    static void initialize();
+    static bool is_initialized();
+    static void print_version();
+private:
+    cache_aligned_unique_ptr<tcm_adaptor_impl> my_impl;
+
+    friend class tcm_client;
+}; // class tcm_adaptor
+
+} // namespace r1
+} // namespace detail
+} // namespace tbb
+
+#endif /* _TBB_tcm_adaptor_H */
diff --git a/external/tbb/src/tbb/thread_control_monitor.h b/external/tbb/src/tbb/thread_control_monitor.h
new file mode 100644
index 00000000..f9c3cacc
--- /dev/null
+++ b/external/tbb/src/tbb/thread_control_monitor.h
@@ -0,0 +1,116 @@
+/*
+    Copyright (c) 2021-2023 Intel Corporation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#ifndef __TBB_thread_control_monitor_H
+#define __TBB_thread_control_monitor_H
+
+#include "concurrent_monitor.h"
+#include "scheduler_common.h"
+
+#include <atomic>
+
+namespace tbb {
+namespace detail {
+namespace r1 {
+
+struct market_context {
+    market_context() = default;
+
+    market_context(std::uintptr_t first_addr, arena* a) :
+        my_uniq_addr(first_addr), my_arena_addr(a)
+    {}
+
+    std::uintptr_t my_uniq_addr{0};
+    arena* my_arena_addr{nullptr};
+};
+
+#if __TBB_RESUMABLE_TASKS
+class resume_node : public wait_node<market_context> {
+    using base_type = wait_node<market_context>;
+public:
+    resume_node(market_context ctx, execution_data_ext& ed_ext, task_dispatcher& target)
+        : base_type(ctx), my_curr_dispatcher(ed_ext.task_disp), my_target_dispatcher(&target)
+        , my_suspend_point(my_curr_dispatcher->get_suspend_point())
+    {}
+
+    ~resume_node() override {
+        if (this->my_skipped_wakeup) {
+            spin_wait_until_eq(this->my_notify_calls, 1);
+        }
+
+        poison_pointer(my_curr_dispatcher);
+        poison_pointer(my_target_dispatcher);
+        poison_pointer(my_suspend_point);
+    }
+
+    void init() override {
+        base_type::init();
+    }
+
+    void wait() override {
+        my_curr_dispatcher->resume(*my_target_dispatcher);
+        __TBB_ASSERT(!this->my_is_in_list.load(std::memory_order_relaxed), "Still in the queue?");
+    }
+
+    void reset() override {
+        base_type::reset();
+        spin_wait_until_eq(this->my_notify_calls, 1);
+        my_notify_calls.store(0, std::memory_order_relaxed);
+    }
+
+    // notify is called (perhaps, concurrently) twice from:
+    //   - concurrent_monitor::notify
+    //   - post_resume_action::register_waiter
+    // The second notify is called after thread switches the stack
+    // (Because we can not call resume while the stack is occupied)
+    // We need calling resume only when both notifications are performed.
+    void notify() override {
+        if (++my_notify_calls == 2) {
+            r1::resume(my_suspend_point);
+        }
+    }
+
+private:
+    friend class thread_data;
+    friend struct suspend_point_type::resume_task;
+    task_dispatcher* my_curr_dispatcher;
+    task_dispatcher* my_target_dispatcher;
+    suspend_point_type* my_suspend_point;
+    std::atomic<int> my_notify_calls{0};
+};
+#endif // __TBB_RESUMABLE_TASKS
+
+class thread_control_monitor : public concurrent_monitor_base<market_context> {
+    using base_type = concurrent_monitor_base<market_context>;
+public:
+    using base_type::base_type;
+
+    ~thread_control_monitor() {
+        destroy();
+    }
+
+    /** per-thread descriptor for concurrent_monitor */
+    using thread_context = sleep_node<market_context>;
+#if __TBB_RESUMABLE_TASKS
+    using resume_context = resume_node;
+#endif
+};
+
+} // namespace r1
+} // namespace detail
+} // namespace tbb
+
+#endif // __TBB_thread_control_monitor_H
diff --git a/external/tbb/src/tbb/thread_data.h b/external/tbb/src/tbb/thread_data.h
index d8733d22..422ec694 100644
--- a/external/tbb/src/tbb/thread_data.h
+++ b/external/tbb/src/tbb/thread_data.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2020-2021 Intel Corporation
+    Copyright (c) 2020-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -28,6 +28,7 @@
 #include "mailbox.h"
 #include "misc.h" // FastRandom
 #include "small_object_pool_impl.h"
+#include "intrusive_list.h"
 
 #include <atomic>
 
@@ -39,8 +40,9 @@ class task;
 class arena_slot;
 class task_group_context;
 class task_dispatcher;
+class thread_dispatcher_client;
 
-class context_list : public intrusive_list<intrusive_list_node> {
+class context_list : public intrusive_list<d1::intrusive_list_node> {
 public:
     bool orphaned{false};
 
@@ -61,10 +63,10 @@ class context_list : public intrusive_list<intrusive_list_node> {
         cache_aligned_deallocate(this);
     }
 
-    void remove(intrusive_list_node& val) {
+    void remove(d1::intrusive_list_node& val) {
         mutex::scoped_lock lock(m_mutex);
 
-        intrusive_list<intrusive_list_node>::remove(val);
+        intrusive_list<d1::intrusive_list_node>::remove(val);
 
         if (orphaned && empty()) {
             lock.release();
@@ -72,10 +74,10 @@ class context_list : public intrusive_list<intrusive_list_node> {
         }
     }
 
-    void push_front(intrusive_list_node& val) {
+    void push_front(d1::intrusive_list_node& val) {
         mutex::scoped_lock lock(m_mutex);
 
-        intrusive_list<intrusive_list_node>::push_front(val);
+        intrusive_list<d1::intrusive_list_node>::push_front(val);
     }
 
     void orphan() {
@@ -93,22 +95,23 @@ class context_list : public intrusive_list<intrusive_list_node> {
 // Thread Data
 //------------------------------------------------------------------------
 class thread_data : public ::rml::job
-                  , public intrusive_list_node
+                  , public d1::intrusive_list_node
                   , no_copy {
 public:
     thread_data(unsigned short index, bool is_worker)
         : my_arena_index{ index }
         , my_is_worker{ is_worker }
+        , my_is_registered { false }
         , my_task_dispatcher{ nullptr }
-        , my_arena{}
+        , my_arena{ nullptr }
+        , my_last_client{ nullptr }
         , my_arena_slot{}
-        , my_inbox{}
         , my_random{ this }
         , my_last_observer{ nullptr }
         , my_small_object_pool{new (cache_aligned_allocate(sizeof(small_object_pool_impl))) small_object_pool_impl{}}
         , my_context_list(new (cache_aligned_allocate(sizeof(context_list))) context_list{})
 #if __TBB_RESUMABLE_TASKS
-        , my_post_resume_action{ post_resume_action::none }
+        , my_post_resume_action{ task_dispatcher::post_resume_action::none }
         , my_post_resume_arg{nullptr}
 #endif /* __TBB_RESUMABLE_TASKS */
     {
@@ -133,9 +136,9 @@ class thread_data : public ::rml::job
     bool is_attached_to(arena*);
     void attach_task_dispatcher(task_dispatcher&);
     void detach_task_dispatcher();
-    void context_list_cleanup();
-    template <typename T>
-    void propagate_task_group_state(std::atomic<T> d1::task_group_context::* mptr_state, d1::task_group_context& src, T new_state);
+    void enter_task_dispatcher(task_dispatcher& task_disp, std::uintptr_t stealing_threshold);
+    void leave_task_dispatcher();
+    void propagate_task_group_state(std::atomic<uint32_t> d1::task_group_context::* mptr_state, d1::task_group_context& src, uint32_t new_state);
 
     //! Index of the arena slot the scheduler occupies now, or occupied last time
     unsigned short my_arena_index;
@@ -143,12 +146,16 @@ class thread_data : public ::rml::job
     //! Indicates if the thread is created by RML
     const bool my_is_worker;
 
+    bool my_is_registered;
+
     //! The current task dipsatcher
     task_dispatcher* my_task_dispatcher;
 
     //! The arena that I own (if external thread) or am servicing at the moment (if worker)
     arena* my_arena;
 
+    thread_dispatcher_client* my_last_client;
+
     //! Pointer to the slot in the arena we own at the moment
     arena_slot* my_arena_slot;
 
@@ -166,29 +173,6 @@ class thread_data : public ::rml::job
 
     context_list* my_context_list;
 #if __TBB_RESUMABLE_TASKS
-    //! The list of possible post resume actions.
-    enum class post_resume_action {
-        invalid,
-        register_waiter,
-        resume,
-        callback,
-        cleanup,
-        notify,
-        none
-    };
-
-    //! The callback to call the user callback passed to tbb::suspend.
-    struct suspend_callback_wrapper {
-        suspend_callback_type suspend_callback;
-        void* user_callback;
-        suspend_point_type* tag;
-
-        void operator()() {
-            __TBB_ASSERT(suspend_callback && user_callback && tag, nullptr);
-            suspend_callback(user_callback, tag);
-        }
-    };
-
     //! Suspends the current coroutine (task_dispatcher).
     void suspend(void* suspend_callback, void* user_callback);
 
@@ -196,23 +180,20 @@ class thread_data : public ::rml::job
     void resume(task_dispatcher& target);
 
     //! Set post resume action to perform after resume.
-    void set_post_resume_action(post_resume_action pra, void* arg) {
-        __TBB_ASSERT(my_post_resume_action == post_resume_action::none, "The Post resume action must not be set");
+    void set_post_resume_action(task_dispatcher::post_resume_action pra, void* arg) {
+        __TBB_ASSERT(my_post_resume_action == task_dispatcher::post_resume_action::none, "The Post resume action must not be set");
         __TBB_ASSERT(!my_post_resume_arg, "The post resume action must not have an argument");
         my_post_resume_action = pra;
         my_post_resume_arg = arg;
     }
 
     void clear_post_resume_action() {
-        my_post_resume_action = thread_data::post_resume_action::none;
+        my_post_resume_action = task_dispatcher::post_resume_action::none;
         my_post_resume_arg = nullptr;
     }
 
-    //! Performs post resume action.
-    void do_post_resume_action();
-
     //! The post resume action requested after the swap contexts.
-    post_resume_action my_post_resume_action;
+    task_dispatcher::post_resume_action my_post_resume_action;
 
     //! The post resume action argument.
     void* my_post_resume_arg;
@@ -248,6 +229,31 @@ inline void thread_data::detach_task_dispatcher() {
     my_task_dispatcher = nullptr;
 }
 
+inline void thread_data::enter_task_dispatcher(task_dispatcher& task_disp, std::uintptr_t stealing_threshold) {
+    task_disp.set_stealing_threshold(stealing_threshold);
+    attach_task_dispatcher(task_disp);
+}
+
+inline void thread_data::leave_task_dispatcher() {
+    my_task_dispatcher->set_stealing_threshold(0);
+    detach_task_dispatcher();
+}
+
+inline void thread_data::propagate_task_group_state(std::atomic<std::uint32_t> d1::task_group_context::* mptr_state, d1::task_group_context& src, std::uint32_t new_state) {
+    mutex::scoped_lock lock(my_context_list->m_mutex);
+    // Acquire fence is necessary to ensure that the subsequent node->my_next load
+    // returned the correct value in case it was just inserted in another thread.
+    // The fence also ensures visibility of the correct ctx.my_parent value.
+    for (context_list::iterator it = my_context_list->begin(); it != my_context_list->end(); ++it) {
+        d1::task_group_context& ctx = __TBB_get_object_ref(d1::task_group_context, my_node, &(*it));
+        if ((ctx.*mptr_state).load(std::memory_order_relaxed) != new_state)
+            task_group_context_impl::propagate_task_group_state(ctx, mptr_state, src, new_state);
+    }
+    // Sync up local propagation epoch with the global one. Release fence prevents
+    // reordering of possible store to *mptr_state after the sync point.
+    my_context_list->epoch.store(the_context_state_propagation_epoch.load(std::memory_order_relaxed), std::memory_order_release);
+}
+
 } // namespace r1
 } // namespace detail
 } // namespace tbb
diff --git a/external/tbb/src/tbb/thread_dispatcher.cpp b/external/tbb/src/tbb/thread_dispatcher.cpp
new file mode 100644
index 00000000..69a108d6
--- /dev/null
+++ b/external/tbb/src/tbb/thread_dispatcher.cpp
@@ -0,0 +1,236 @@
+/*
+    Copyright (c) 2022-2024 Intel Corporation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#include "thread_dispatcher.h"
+#include "threading_control.h"
+
+namespace tbb {
+namespace detail {
+namespace r1 {
+
+thread_dispatcher::thread_dispatcher(threading_control& tc, unsigned hard_limit, std::size_t stack_size)
+    : my_threading_control(tc)
+    , my_num_workers_hard_limit(hard_limit)
+    , my_stack_size(stack_size)
+{
+    my_server = governor::create_rml_server( *this );
+    __TBB_ASSERT( my_server, "Failed to create RML server" );
+}
+
+thread_dispatcher::~thread_dispatcher() {
+    poison_pointer(my_server);
+}
+
+thread_dispatcher_client* thread_dispatcher::select_next_client(thread_dispatcher_client* hint) {
+    unsigned next_client_priority_level = num_priority_levels;
+    if (hint) {
+        next_client_priority_level = hint->priority_level();
+    }
+
+    for (unsigned idx = 0; idx < next_client_priority_level; ++idx) {
+        if (!my_client_list[idx].empty()) {
+            return &*my_client_list[idx].begin();
+        }
+    }
+
+    return hint;
+}
+
+thread_dispatcher_client* thread_dispatcher::create_client(arena& a) {
+    return new (cache_aligned_allocate(sizeof(thread_dispatcher_client))) thread_dispatcher_client(a, my_clients_aba_epoch);
+}
+
+
+void thread_dispatcher::register_client(thread_dispatcher_client* client) {
+    client_list_mutex_type::scoped_lock lock(my_list_mutex);
+    insert_client(*client);
+}
+
+bool thread_dispatcher::try_unregister_client(thread_dispatcher_client* client, std::uint64_t aba_epoch, unsigned priority) {
+    __TBB_ASSERT(client, nullptr);
+    // we hold reference to the server, so market cannot be destroyed at any moment here
+    __TBB_ASSERT(!is_poisoned(my_server), nullptr);
+    my_list_mutex.lock();
+    for (auto& it : my_client_list[priority]) {
+        if (client == &it) {
+            if (it.get_aba_epoch() == aba_epoch) {
+                // Client is alive
+                // Acquire my_references to sync with threads that just left the arena
+                // Pay attention that references should be read before workers_requested because
+                // if references is no zero some other thread might call adjust_demand and lead to
+                // a race over workers_requested
+                if (!client->references() && !client->has_request()) {
+                    // Client is abandoned. Destroy it.
+                    remove_client(*client);
+                    ++my_clients_aba_epoch;
+
+                    my_list_mutex.unlock();
+                    destroy_client(client);
+
+                    return true;
+                }
+            }
+            break;
+        }
+    }
+    my_list_mutex.unlock();
+    return false;
+}
+
+void thread_dispatcher::destroy_client(thread_dispatcher_client* client) {
+    client->~thread_dispatcher_client();
+    cache_aligned_deallocate(client);
+}
+
+// Should be called under lock
+void thread_dispatcher::insert_client(thread_dispatcher_client& client) {
+    __TBB_ASSERT(client.priority_level() < num_priority_levels, nullptr);
+    my_client_list[client.priority_level()].push_front(client);
+
+    __TBB_ASSERT(!my_next_client || my_next_client->priority_level() < num_priority_levels, nullptr);
+    my_next_client = select_next_client(my_next_client);
+}
+
+// Should be called under lock
+void thread_dispatcher::remove_client(thread_dispatcher_client& client) {
+    __TBB_ASSERT(client.priority_level() < num_priority_levels, nullptr);
+    my_client_list[client.priority_level()].remove(client);
+
+    if (my_next_client == &client) {
+        my_next_client = nullptr;
+    }
+    my_next_client = select_next_client(my_next_client);
+}
+
+bool thread_dispatcher::is_client_alive(thread_dispatcher_client* client) {
+    if (!client) {
+        return false;
+    }
+
+    // Still cannot access internals of the client since the object itself might be destroyed.
+    for (auto& priority_list : my_client_list) {
+        for (auto& c : priority_list) {
+            if (client == &c) {
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
+thread_dispatcher_client* thread_dispatcher::client_in_need(client_list_type* clients, thread_dispatcher_client* hint) {
+    // TODO: make sure client with higher priority returned only if there are available slots in it.
+    hint = select_next_client(hint);
+    if (!hint) {
+        return nullptr;
+    }
+
+    client_list_type::iterator it = hint;
+    unsigned curr_priority_level = hint->priority_level();
+    __TBB_ASSERT(it != clients[curr_priority_level].end(), nullptr);
+    do {
+        thread_dispatcher_client& t = *it;
+        if (++it == clients[curr_priority_level].end()) {
+            do {
+                ++curr_priority_level %= num_priority_levels;
+            } while (clients[curr_priority_level].empty());
+            it = clients[curr_priority_level].begin();
+        }
+        if (t.try_join()) {
+            return &t;
+        }
+    } while (it != hint);
+    return nullptr;
+}
+
+thread_dispatcher_client* thread_dispatcher::client_in_need(thread_dispatcher_client* prev) {
+    client_list_mutex_type::scoped_lock lock(my_list_mutex, /*is_writer=*/false);
+    if (is_client_alive(prev)) {
+        return client_in_need(my_client_list, prev);
+    }
+    return client_in_need(my_client_list, my_next_client);
+}
+
+bool thread_dispatcher::is_any_client_in_need() {
+    client_list_mutex_type::scoped_lock lock(my_list_mutex, /*is_writer=*/false);
+    for (auto& priority_list : my_client_list) {
+        for (auto& client : priority_list) {
+            if (client.is_joinable()) {
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
+void thread_dispatcher::adjust_job_count_estimate(int delta) {
+    my_server->adjust_job_count_estimate(delta);
+}
+
+void thread_dispatcher::release(bool blocking_terminate) {
+    my_join_workers = blocking_terminate;
+    my_server->request_close_connection();
+}
+
+void thread_dispatcher::process(job& j) {
+    thread_data& td = static_cast<thread_data&>(j);
+    // td.my_last_client can be dead. Don't access it until client_in_need is called
+    thread_dispatcher_client* client = td.my_last_client;
+    for (int i = 0; i < 2; ++i) {
+        while ((client = client_in_need(client)) ) {
+            td.my_last_client = client;
+            client->process(td);
+        }
+        // Workers leave thread_dispatcher because there is no client in need. It can happen earlier than
+        // adjust_job_count_estimate() decreases my_slack and RML can put this thread to sleep.
+        // It might result in a busy-loop checking for my_slack<0 and calling this method instantly.
+        // the yield refines this spinning.
+        if ( !i ) {
+            yield();
+        }
+    }
+}
+
+
+//! Used when RML asks for join mode during workers termination.
+bool thread_dispatcher::must_join_workers() const { return my_join_workers; }
+
+//! Returns the requested stack size of worker threads.
+std::size_t thread_dispatcher::worker_stack_size() const { return my_stack_size; }
+
+void thread_dispatcher::acknowledge_close_connection() {
+    my_threading_control.destroy();
+}
+
+::rml::job* thread_dispatcher::create_one_job() {
+    unsigned short index = ++my_first_unused_worker_idx;
+    __TBB_ASSERT(index > 0, nullptr);
+    ITT_THREAD_SET_NAME(_T("TBB Worker Thread"));
+    // index serves as a hint decreasing conflicts between workers when they migrate between arenas
+    thread_data* td = new (cache_aligned_allocate(sizeof(thread_data))) thread_data{ index, true };
+    __TBB_ASSERT(index <= my_num_workers_hard_limit, nullptr);
+    my_threading_control.register_thread(*td);
+    return td;
+}
+
+void thread_dispatcher::cleanup(job& j) {
+    my_threading_control.unregister_thread(static_cast<thread_data&>(j));
+    governor::auto_terminate(&j);
+}
+
+} // namespace r1
+} // namespace detail
+} // namespace tbb
diff --git a/external/tbb/src/tbb/thread_dispatcher.h b/external/tbb/src/tbb/thread_dispatcher.h
new file mode 100644
index 00000000..e511e2b7
--- /dev/null
+++ b/external/tbb/src/tbb/thread_dispatcher.h
@@ -0,0 +1,107 @@
+/*
+    Copyright (c) 2022-2024 Intel Corporation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#ifndef _TBB_thread_dispatcher_H
+#define _TBB_thread_dispatcher_H
+
+#include "oneapi/tbb/detail/_config.h"
+#include "oneapi/tbb/detail/_utils.h"
+#include "oneapi/tbb/rw_mutex.h"
+#include "oneapi/tbb/task_arena.h"
+
+#include "arena.h"
+#include "governor.h"
+#include "thread_data.h"
+#include "rml_tbb.h"
+#include "thread_dispatcher_client.h"
+
+namespace tbb {
+namespace detail {
+namespace r1 {
+
+class threading_control_impl;
+
+class thread_dispatcher : no_copy, rml::tbb_client {
+    using client_list_type = intrusive_list<thread_dispatcher_client>;
+    using client_list_mutex_type = d1::rw_mutex;
+public:
+    thread_dispatcher(threading_control& tc, unsigned hard_limit, std::size_t stack_size);
+    ~thread_dispatcher();
+
+    thread_dispatcher_client* create_client(arena& a);
+    void register_client(thread_dispatcher_client* client);
+    bool try_unregister_client(thread_dispatcher_client* client, std::uint64_t aba_epoch, unsigned priority);
+    bool is_any_client_in_need();
+
+    void adjust_job_count_estimate(int delta);
+    void release(bool blocking_terminate);
+    void process(job& j) override;
+    //! Used when RML asks for join mode during workers termination.
+    bool must_join_workers() const;
+    //! Returns the requested stack size of worker threads.
+    std::size_t worker_stack_size() const;
+
+private:
+    version_type version () const override { return 0; }
+    unsigned max_job_count () const override { return my_num_workers_hard_limit; }
+    std::size_t min_stack_size () const override { return worker_stack_size(); }
+    void cleanup(job& j) override;
+    void acknowledge_close_connection() override;
+    ::rml::job* create_one_job() override;
+
+    thread_dispatcher_client* select_next_client(thread_dispatcher_client* hint);
+    void destroy_client(thread_dispatcher_client* client);
+    void insert_client(thread_dispatcher_client& client);
+    void remove_client(thread_dispatcher_client& client);
+    bool is_client_alive(thread_dispatcher_client* client);
+    thread_dispatcher_client* client_in_need(client_list_type* clients, thread_dispatcher_client* hint);
+    thread_dispatcher_client* client_in_need(thread_dispatcher_client* prev);
+
+    friend class threading_control_impl;
+    static constexpr unsigned num_priority_levels = d1::num_priority_levels;
+    client_list_mutex_type my_list_mutex;
+    client_list_type my_client_list[num_priority_levels];
+
+    thread_dispatcher_client* my_next_client{nullptr};
+
+    //! Shutdown mode
+    bool my_join_workers{false};
+
+    threading_control& my_threading_control;
+
+    //! ABA prevention marker to assign to newly created clients
+    std::atomic<std::uint64_t> my_clients_aba_epoch{0};
+
+    //! Maximal number of workers allowed for use by the underlying resource manager
+    /** It can't be changed after thread_dispatcher creation. **/
+    unsigned my_num_workers_hard_limit{0};
+
+    //! Stack size of worker threads
+    std::size_t my_stack_size{0};
+
+    //! First unused index of worker
+    /** Used to assign indices to the new workers coming from RML **/
+    std::atomic<unsigned> my_first_unused_worker_idx{0};
+
+    //! Pointer to the RML server object that services this TBB instance.
+    rml::tbb_server* my_server{nullptr};
+};
+
+} // namespace r1
+} // namespace detail
+} // namespace tbb
+
+#endif // _TBB_thread_dispatcher_H
diff --git a/external/tbb/src/tbb/thread_dispatcher_client.h b/external/tbb/src/tbb/thread_dispatcher_client.h
new file mode 100644
index 00000000..f7c199cb
--- /dev/null
+++ b/external/tbb/src/tbb/thread_dispatcher_client.h
@@ -0,0 +1,69 @@
+/*
+    Copyright (c) 2022-2024 Intel Corporation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#ifndef _TBB_thread_dispatcher_client_H
+#define _TBB_thread_dispatcher_client_H
+
+#include "oneapi/tbb/detail/_intrusive_list_node.h"
+#include "arena.h"
+
+namespace tbb {
+namespace detail {
+namespace r1 {
+
+class thread_dispatcher_client : public d1::intrusive_list_node /* Need for list in thread pool */ {
+public:
+    thread_dispatcher_client(arena& a, std::uint64_t aba_epoch) : my_arena(a), my_aba_epoch(aba_epoch) {}
+
+    // Interface of communication with thread pool
+    bool try_join() {
+        return my_arena.try_join();
+    }
+
+    bool is_joinable() {
+        return my_arena.is_joinable();
+    }
+
+    void process(thread_data& td) {
+        my_arena.process(td);
+    }
+
+    unsigned priority_level() {
+        return my_arena.priority_level();
+    }
+
+    std::uint64_t get_aba_epoch() {
+        return my_aba_epoch;
+    }
+
+    unsigned references() {
+        return my_arena.references();
+    }
+
+    bool has_request() {
+        return my_arena.has_request();
+    }
+
+private:
+    arena& my_arena;
+    std::uint64_t my_aba_epoch;
+};
+
+} // namespace r1
+} // namespace detail
+} // namespace tbb
+
+#endif // _TBB_thread_dispatcher_client_H
diff --git a/external/tbb/src/tbb/thread_request_serializer.cpp b/external/tbb/src/tbb/thread_request_serializer.cpp
new file mode 100644
index 00000000..41cf51b0
--- /dev/null
+++ b/external/tbb/src/tbb/thread_request_serializer.cpp
@@ -0,0 +1,139 @@
+/*
+    Copyright (c) 2022-2024 Intel Corporation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#include "misc.h"
+#include "thread_request_serializer.h"
+
+namespace tbb {
+namespace detail {
+namespace r1 {
+
+thread_request_serializer::thread_request_serializer(thread_dispatcher& td, int soft_limit)
+    : my_thread_dispatcher(td)
+    , my_soft_limit(soft_limit)
+{}
+
+void thread_request_serializer::update(int delta) {
+    constexpr std::uint64_t delta_mask = (pending_delta_base << 1) - 1;
+    constexpr std::uint64_t counter_value = delta_mask + 1;
+
+    int prev_pending_delta = my_pending_delta.fetch_add(counter_value + delta);
+
+    // There is a pseudo request aggregator, so only thread that see pending_delta_base in my_pending_delta
+    // Will enter to critical section and call adjust_job_count_estimate
+    if (prev_pending_delta == pending_delta_base) {
+        delta = int(my_pending_delta.exchange(pending_delta_base) & delta_mask) - int(pending_delta_base);
+        mutex_type::scoped_lock lock(my_mutex);
+        my_total_request.store(my_total_request.load(std::memory_order_relaxed) + delta, std::memory_order_relaxed);
+        delta = limit_delta(delta, my_soft_limit, my_total_request.load(std::memory_order_relaxed));
+        my_thread_dispatcher.adjust_job_count_estimate(delta);
+    }
+}
+
+void thread_request_serializer::set_active_num_workers(int soft_limit) {
+    mutex_type::scoped_lock lock(my_mutex);
+    int delta = soft_limit - my_soft_limit;
+    delta = limit_delta(delta, my_total_request.load(std::memory_order_relaxed), soft_limit);
+    my_thread_dispatcher.adjust_job_count_estimate(delta);
+    my_soft_limit = soft_limit;
+}
+
+int thread_request_serializer::limit_delta(int delta, int limit, int new_value) {
+    // This method can be described with such pseudocode:
+    // bool above_limit = prev_value >= limit && new_value >= limit;
+    // bool below_limit = prev_value <= limit && new_value <= limit;
+    // enum request_type { ABOVE_LIMIT, CROSS_LIMIT, BELOW_LIMIT };
+    // request = above_limit ? ABOVE_LIMIT : below_limit ? BELOW_LIMIT : CROSS_LIMIT;
+
+    // switch (request) {
+    // case ABOVE_LIMIT:
+    //     delta = 0;
+    // case CROSS_LIMIT:
+    //     delta = delta > 0 ? limit - prev_value : new_value - limit;
+    // case BELOW_LIMIT:
+    //     // No changes to delta
+    // }
+
+   int prev_value = new_value - delta;
+
+    // actual new_value and prev_value cannot exceed the limit
+    new_value = min(limit, new_value);
+    prev_value = min(limit, prev_value);
+    return new_value - prev_value;
+}
+
+
+thread_request_serializer_proxy::thread_request_serializer_proxy(thread_dispatcher& td, int soft_limit) : my_serializer(td, soft_limit)
+{}
+
+void thread_request_serializer_proxy::register_mandatory_request(int mandatory_delta) {
+    if (mandatory_delta != 0) {
+        mutex_type::scoped_lock lock(my_mutex, /* is_write = */ false);
+        int prev_value = my_num_mandatory_requests.fetch_add(mandatory_delta);
+
+        const bool should_try_enable = mandatory_delta > 0 && prev_value == 0;
+        const bool should_try_disable = mandatory_delta < 0 && prev_value == 1;
+
+        if (should_try_enable) {
+            enable_mandatory_concurrency(lock);
+        } else if (should_try_disable) {
+            disable_mandatory_concurrency(lock);
+        }
+    }
+}
+
+void thread_request_serializer_proxy::set_active_num_workers(int soft_limit) {
+    mutex_type::scoped_lock lock(my_mutex, /* is_write = */ true);
+
+    if (soft_limit != 0) {
+        my_is_mandatory_concurrency_enabled = false;
+    } else if (my_num_mandatory_requests > 0) {
+        my_is_mandatory_concurrency_enabled = true;
+        soft_limit = 1;
+    }
+
+    my_serializer.set_active_num_workers(soft_limit);
+}
+
+int thread_request_serializer_proxy::num_workers_requested() { return my_serializer.num_workers_requested(); }
+
+void thread_request_serializer_proxy::update(int delta) { my_serializer.update(delta); }
+
+void thread_request_serializer_proxy::enable_mandatory_concurrency(mutex_type::scoped_lock& lock) {
+    lock.upgrade_to_writer();
+    bool still_should_enable = my_num_mandatory_requests.load(std::memory_order_relaxed) > 0 &&
+            !my_is_mandatory_concurrency_enabled && my_serializer.is_no_workers_avaliable();
+
+    if (still_should_enable) {
+        my_is_mandatory_concurrency_enabled = true;
+        my_serializer.set_active_num_workers(1);
+    }
+}
+
+void thread_request_serializer_proxy::disable_mandatory_concurrency(mutex_type::scoped_lock& lock) {
+    lock.upgrade_to_writer();
+    bool still_should_disable = my_num_mandatory_requests.load(std::memory_order_relaxed) <= 0 &&
+            my_is_mandatory_concurrency_enabled && !my_serializer.is_no_workers_avaliable();
+
+    if (still_should_disable) {
+        my_is_mandatory_concurrency_enabled = false;
+        my_serializer.set_active_num_workers(0);
+    }
+}
+
+} // r1
+} // detail
+} // tbb
diff --git a/external/tbb/src/tbb/thread_request_serializer.h b/external/tbb/src/tbb/thread_request_serializer.h
new file mode 100644
index 00000000..9dc9799e
--- /dev/null
+++ b/external/tbb/src/tbb/thread_request_serializer.h
@@ -0,0 +1,84 @@
+/*
+    Copyright (c) 2022-2024 Intel Corporation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#ifndef _TBB_thread_serializer_handlers_H
+#define _TBB_thread_serializer_handlers_H
+
+#include "oneapi/tbb/mutex.h"
+#include "oneapi/tbb/rw_mutex.h"
+
+#include "thread_dispatcher.h"
+
+namespace tbb {
+namespace detail {
+namespace r1 {
+
+class thread_request_observer {
+protected:
+    virtual ~thread_request_observer() {}
+public:
+    virtual void update(int delta) = 0;
+};
+
+
+class thread_request_serializer : public thread_request_observer {
+    using mutex_type = d1::mutex;
+public:
+    thread_request_serializer(thread_dispatcher& td, int soft_limit);
+    void set_active_num_workers(int soft_limit);
+    int num_workers_requested() { return my_total_request.load(std::memory_order_relaxed); }
+    bool is_no_workers_avaliable() { return my_soft_limit == 0; }
+
+private:
+    friend class thread_request_serializer_proxy;
+    void update(int delta) override;
+    static int limit_delta(int delta, int limit, int new_value);
+
+    thread_dispatcher& my_thread_dispatcher;
+    int my_soft_limit{ 0 };
+    std::atomic<int> my_total_request{ 0 };
+    // my_pending_delta is set to pending_delta_base to have ability to hold negative values
+    // consider increase base since thead number will be bigger than 1 << 15
+    static constexpr std::uint64_t pending_delta_base = 1 << 15;
+    std::atomic<std::uint64_t> my_pending_delta{ pending_delta_base };
+    mutex_type my_mutex;
+};
+
+// Handles mandatory concurrency i.e. enables worker threads for enqueue tasks
+class thread_request_serializer_proxy : public thread_request_observer {
+    using mutex_type = d1::rw_mutex;
+public:
+    thread_request_serializer_proxy(thread_dispatcher& td, int soft_limit);
+    void register_mandatory_request(int mandatory_delta);
+    void set_active_num_workers(int soft_limit);
+    int num_workers_requested();
+
+private:
+    void update(int delta) override;
+    void enable_mandatory_concurrency(mutex_type::scoped_lock& lock);
+    void disable_mandatory_concurrency(mutex_type::scoped_lock& lock);
+
+    std::atomic<int> my_num_mandatory_requests{0};
+    bool my_is_mandatory_concurrency_enabled{false};
+    thread_request_serializer my_serializer;
+    mutex_type my_mutex;
+};
+
+} // namespace r1
+} // namespace detail
+} // namespace tbb
+
+#endif // _TBB_thread_serializer_handlers_H
diff --git a/external/tbb/src/tbb/threading_control.cpp b/external/tbb/src/tbb/threading_control.cpp
new file mode 100644
index 00000000..7a62b337
--- /dev/null
+++ b/external/tbb/src/tbb/threading_control.cpp
@@ -0,0 +1,411 @@
+/*
+    Copyright (c) 2022-2024 Intel Corporation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#include "threading_control.h"
+#include "permit_manager.h"
+#include "market.h"
+#include "tcm_adaptor.h"
+#include "thread_dispatcher.h"
+#include "governor.h"
+#include "thread_dispatcher_client.h"
+
+namespace tbb {
+namespace detail {
+namespace r1 {
+
+// ---------------------------------------- threading_control_impl --------------------------------------------------------------
+
+std::size_t global_control_active_value_unsafe(d1::global_control::parameter);
+
+std::pair<unsigned, unsigned> threading_control_impl::calculate_workers_limits() {
+    // Expecting that 4P is suitable for most applications.
+    // Limit to 2P for large thread number.
+    // TODO: ask RML for max concurrency and possibly correct hard_limit
+    unsigned factor = governor::default_num_threads() <= 128 ? 4 : 2;
+
+    // The requested number of threads is intentionally not considered in
+    // computation of the hard limit, in order to separate responsibilities
+    // and avoid complicated interactions between global_control and task_scheduler_init.
+    // The threading control guarantees that at least 256 threads might be created.
+    unsigned workers_app_limit = global_control_active_value_unsafe(global_control::max_allowed_parallelism);
+    unsigned workers_hard_limit = max(max(factor * governor::default_num_threads(), 256u), workers_app_limit);
+    unsigned workers_soft_limit = calc_workers_soft_limit(workers_hard_limit);
+    
+    return std::make_pair(workers_soft_limit, workers_hard_limit);
+}
+
+unsigned threading_control_impl::calc_workers_soft_limit(unsigned workers_hard_limit) {
+    unsigned workers_soft_limit{};
+    unsigned soft_limit = global_control_active_value_unsafe(global_control::max_allowed_parallelism);
+
+    // if user set no limits (yet), use default value
+    workers_soft_limit = soft_limit != 0 ? soft_limit - 1 : governor::default_num_threads() - 1;
+
+    if (workers_soft_limit >= workers_hard_limit) {
+        workers_soft_limit = workers_hard_limit - 1;
+    }
+
+    return workers_soft_limit;
+}
+
+cache_aligned_unique_ptr<permit_manager> threading_control_impl::make_permit_manager(unsigned workers_soft_limit) {
+     if (tcm_adaptor::is_initialized()) {
+        auto tcm = make_cache_aligned_unique<tcm_adaptor>();
+        if (tcm->is_connected()) {
+            return tcm;
+        }
+    }
+    return make_cache_aligned_unique<market>(workers_soft_limit);
+}
+
+cache_aligned_unique_ptr<thread_dispatcher> threading_control_impl::make_thread_dispatcher(threading_control& tc,
+                                                                                           unsigned workers_soft_limit,
+                                                                                           unsigned workers_hard_limit)
+{
+    stack_size_type stack_size = global_control_active_value_unsafe(global_control::thread_stack_size);
+
+    cache_aligned_unique_ptr<thread_dispatcher> td =
+        make_cache_aligned_unique<thread_dispatcher>(tc, workers_hard_limit, stack_size);
+    // This check relies on the fact that for shared RML default_concurrency == max_concurrency
+    if (!governor::UsePrivateRML && td->my_server->default_concurrency() < workers_soft_limit) {
+        runtime_warning("RML might limit the number of workers to %u while %u is requested.\n",
+            td->my_server->default_concurrency(), workers_soft_limit);
+    }
+
+    return td;
+}
+
+threading_control_impl::threading_control_impl(threading_control* tc) {
+    unsigned workers_soft_limit{}, workers_hard_limit{};
+    std::tie(workers_soft_limit, workers_hard_limit) = calculate_workers_limits();
+
+    my_permit_manager = make_permit_manager(workers_soft_limit);
+    my_thread_dispatcher = make_thread_dispatcher(*tc, workers_soft_limit, workers_hard_limit);
+    my_thread_request_serializer =
+        make_cache_aligned_unique<thread_request_serializer_proxy>(*my_thread_dispatcher, workers_soft_limit);
+    my_permit_manager->set_thread_request_observer(*my_thread_request_serializer);
+
+    my_cancellation_disseminator = make_cache_aligned_unique<cancellation_disseminator>();
+    my_waiting_threads_monitor = make_cache_aligned_unique<thread_control_monitor>();
+}
+
+void threading_control_impl::release(bool blocking_terminate) {
+    my_thread_dispatcher->release(blocking_terminate);
+}
+
+void threading_control_impl::set_active_num_workers(unsigned soft_limit) {
+    __TBB_ASSERT(soft_limit <= my_thread_dispatcher->my_num_workers_hard_limit, nullptr);
+    my_thread_request_serializer->set_active_num_workers(soft_limit);
+    my_permit_manager->set_active_num_workers(soft_limit);
+}
+
+threading_control_client threading_control_impl::create_client(arena& a) {
+    pm_client* pm_client = my_permit_manager->create_client(a);
+    thread_dispatcher_client* td_client = my_thread_dispatcher->create_client(a);
+
+    return threading_control_client{pm_client, td_client};
+}
+
+threading_control_impl::client_snapshot threading_control_impl::prepare_client_destruction(threading_control_client client) {
+    auto td_client = client.get_thread_dispatcher_client();
+    return {td_client->get_aba_epoch(), td_client->priority_level(), td_client, client.get_pm_client()};
+}
+
+bool threading_control_impl::try_destroy_client(threading_control_impl::client_snapshot snapshot) {
+    if (my_thread_dispatcher->try_unregister_client(snapshot.my_td_client, snapshot.aba_epoch, snapshot.priority_level)) {
+        my_permit_manager->unregister_and_destroy_client(*snapshot.my_pm_client);
+        return true;
+    }
+    return false;
+}
+
+void threading_control_impl::publish_client(threading_control_client tc_client, d1::constraints& constraints) {
+    my_permit_manager->register_client(tc_client.get_pm_client(), constraints);
+    my_thread_dispatcher->register_client(tc_client.get_thread_dispatcher_client());
+}
+
+void threading_control_impl::register_thread(thread_data& td) {
+    my_cancellation_disseminator->register_thread(td);
+}
+void threading_control_impl::unregister_thread(thread_data& td) {
+    my_cancellation_disseminator->unregister_thread(td);
+}
+
+void threading_control_impl::propagate_task_group_state(std::atomic<uint32_t> d1::task_group_context::*mptr_state,
+                                                        d1::task_group_context& src, uint32_t new_state)
+{
+    my_cancellation_disseminator->propagate_task_group_state(mptr_state, src, new_state);
+}
+
+std::size_t threading_control_impl::worker_stack_size() {
+    return my_thread_dispatcher->worker_stack_size();
+}
+
+unsigned threading_control_impl::max_num_workers() {
+    return my_thread_dispatcher->my_num_workers_hard_limit;
+}
+
+void threading_control_impl::adjust_demand(threading_control_client tc_client, int mandatory_delta, int workers_delta) {
+    auto& c = *tc_client.get_pm_client();
+    my_thread_request_serializer->register_mandatory_request(mandatory_delta);
+    my_permit_manager->adjust_demand(c, mandatory_delta, workers_delta);
+}
+
+bool threading_control_impl::is_any_other_client_active() {
+    return my_thread_request_serializer->num_workers_requested() > 0 ? my_thread_dispatcher->is_any_client_in_need() : false;
+}
+
+thread_control_monitor& threading_control_impl::get_waiting_threads_monitor() {
+    return *my_waiting_threads_monitor;
+}
+
+// ---------------------------------------- threading_control -------------------------------------------------------------------
+
+// Defined in global_control.cpp
+void global_control_lock();
+void global_control_unlock();
+
+void threading_control::add_ref(bool is_public) {
+    ++my_ref_count;
+    if (is_public) {
+        my_public_ref_count++;
+    }
+}
+
+bool threading_control::remove_ref(bool is_public) {
+    if (is_public) {
+        __TBB_ASSERT(g_threading_control == this, "Global threading control instance was destroyed prematurely?");
+        __TBB_ASSERT(my_public_ref_count.load(std::memory_order_relaxed), nullptr);
+        --my_public_ref_count;
+    }
+
+    bool is_last_ref = --my_ref_count == 0;
+    if (is_last_ref) {
+        __TBB_ASSERT(!my_public_ref_count.load(std::memory_order_relaxed), nullptr);
+        g_threading_control = nullptr;
+    }
+
+    return is_last_ref;
+}
+
+threading_control* threading_control::get_threading_control(bool is_public) {
+    threading_control* control = g_threading_control;
+    if (control) {
+        control->add_ref(is_public);
+    }
+
+    return control;
+}
+
+threading_control* threading_control::create_threading_control() {
+    // Global control should be locked before threading_control_impl
+    global_control_lock();
+
+    threading_control* thr_control{ nullptr };
+    try_call([&] {
+        global_mutex_type::scoped_lock lock(g_threading_control_mutex);
+
+        thr_control = get_threading_control(/*public = */ true);
+        if (thr_control == nullptr) {
+            thr_control =  new (cache_aligned_allocate(sizeof(threading_control))) threading_control(/*public_ref = */ 1, /*private_ref = */ 1);
+            thr_control->my_pimpl = make_cache_aligned_unique<threading_control_impl>(thr_control);
+
+            __TBB_InitOnce::add_ref();
+
+            if (global_control_active_value_unsafe(global_control::scheduler_handle)) {
+                ++thr_control->my_public_ref_count;
+                ++thr_control->my_ref_count;
+            }
+
+            g_threading_control = thr_control;
+        }
+    }).on_exception([&] {
+        global_control_unlock();
+
+        cache_aligned_deleter deleter{};
+        deleter(thr_control);
+    });
+
+    global_control_unlock();
+    return thr_control;
+}
+
+void threading_control::destroy () {
+    cache_aligned_deleter deleter;
+    deleter(this);
+    __TBB_InitOnce::remove_ref();
+}
+
+void threading_control::wait_last_reference(global_mutex_type::scoped_lock& lock) {
+    while (my_public_ref_count.load(std::memory_order_relaxed) == 1 && my_ref_count.load(std::memory_order_relaxed) > 1) {
+        lock.release();
+        // To guarantee that request_close_connection() is called by the last external thread, we need to wait till all
+        // references are released. Re-read my_public_ref_count to limit waiting if new external threads are created.
+        // Theoretically, new private references to the threading control can be added during waiting making it potentially
+        // endless.
+        // TODO: revise why the weak scheduler needs threading control's pointer and try to remove this wait.
+        // Note that the threading control should know about its schedulers for cancellation/exception/priority propagation,
+        // see e.g. task_group_context::cancel_group_execution()
+        while (my_public_ref_count.load(std::memory_order_acquire) == 1 && my_ref_count.load(std::memory_order_acquire) > 1) {
+            yield();
+        }
+        lock.acquire(g_threading_control_mutex);
+    }
+}
+
+bool threading_control::release(bool is_public, bool blocking_terminate) {
+    bool do_release = false;
+    {
+        global_mutex_type::scoped_lock lock(g_threading_control_mutex);
+        if (blocking_terminate) {
+            __TBB_ASSERT(is_public, "Only an object with a public reference can request the blocking terminate");
+            wait_last_reference(lock);
+        }
+        do_release = remove_ref(is_public);
+    }
+
+    if (do_release) {
+        __TBB_ASSERT(!my_public_ref_count.load(std::memory_order_relaxed), "No public references must remain if we remove the threading control.");
+        // inform RML that blocking termination is required
+        my_pimpl->release(blocking_terminate);
+        return blocking_terminate;
+    }
+    return false;
+}
+
+threading_control::threading_control(unsigned public_ref, unsigned ref) : my_public_ref_count(public_ref), my_ref_count(ref)
+{}
+
+threading_control* threading_control::register_public_reference() {
+    threading_control* control{nullptr};
+    global_mutex_type::scoped_lock lock(g_threading_control_mutex);
+    control = get_threading_control(/*public = */ true);
+    if (!control) {
+        // We are going to create threading_control_impl, we should acquire mutexes in right order
+        lock.release();
+        control = create_threading_control();
+    }
+
+    return control;
+}
+
+bool threading_control::unregister_public_reference(bool blocking_terminate) {
+    __TBB_ASSERT(g_threading_control, "Threading control should exist until last public reference");
+    __TBB_ASSERT(g_threading_control->my_public_ref_count.load(std::memory_order_relaxed), nullptr);
+    return g_threading_control->release(/*public = */ true, /*blocking_terminate = */ blocking_terminate);
+}
+
+threading_control_client threading_control::create_client(arena& a) {
+    {
+        global_mutex_type::scoped_lock lock(g_threading_control_mutex);
+        add_ref(/*public = */ false);
+    }
+
+    return my_pimpl->create_client(a);
+}
+
+void threading_control::publish_client(threading_control_client client, d1::constraints& constraints) {
+    return my_pimpl->publish_client(client, constraints);
+}
+
+threading_control::client_snapshot threading_control::prepare_client_destruction(threading_control_client client) {
+    return my_pimpl->prepare_client_destruction(client);
+}
+
+bool threading_control::try_destroy_client(threading_control::client_snapshot deleter) {
+    bool res = my_pimpl->try_destroy_client(deleter);
+    if (res) {
+        release(/*public = */ false, /*blocking_terminate = */ false);
+    }
+    return res;
+}
+
+void threading_control::set_active_num_workers(unsigned soft_limit) {
+    threading_control* thr_control{nullptr};
+    {
+        global_mutex_type::scoped_lock lock(g_threading_control_mutex);
+        thr_control = get_threading_control(/*public = */ false);
+    }
+
+    if (thr_control != nullptr) {
+        thr_control->my_pimpl->set_active_num_workers(soft_limit);
+        thr_control->release(/*is_public=*/false, /*blocking_terminate=*/false);
+    }
+}
+
+bool threading_control::is_present() {
+    global_mutex_type::scoped_lock lock(g_threading_control_mutex);
+    return g_threading_control != nullptr;
+}
+
+bool threading_control::register_lifetime_control() {
+    global_mutex_type::scoped_lock lock(g_threading_control_mutex);
+    return get_threading_control(/*public = */ true) != nullptr;
+}
+
+bool threading_control::unregister_lifetime_control(bool blocking_terminate) {
+    threading_control* thr_control{nullptr};
+    {
+        global_mutex_type::scoped_lock lock(g_threading_control_mutex);
+        thr_control = g_threading_control;
+    }
+
+    bool released{true};
+    if (thr_control) {
+        released = thr_control->release(/*public = */ true, /*blocking_terminate = */ blocking_terminate);
+    }
+
+    return released;
+}
+
+void threading_control::register_thread(thread_data& td) {
+    my_pimpl->register_thread(td);
+}
+
+void threading_control::unregister_thread(thread_data& td) {
+    my_pimpl->unregister_thread(td);
+}
+
+void threading_control::propagate_task_group_state(std::atomic<uint32_t> d1::task_group_context::*mptr_state,
+                                                   d1::task_group_context& src, uint32_t new_state)
+{
+    my_pimpl->propagate_task_group_state(mptr_state, src, new_state);
+}
+
+std::size_t threading_control::worker_stack_size() {
+    return my_pimpl->worker_stack_size();
+}
+
+unsigned threading_control::max_num_workers() {
+    global_mutex_type::scoped_lock lock(g_threading_control_mutex);
+    return g_threading_control ? g_threading_control->my_pimpl->max_num_workers() : 0;
+}
+
+void threading_control::adjust_demand(threading_control_client client, int mandatory_delta, int workers_delta) {
+    my_pimpl->adjust_demand(client, mandatory_delta, workers_delta);
+}
+
+bool threading_control::is_any_other_client_active() {
+    return my_pimpl->is_any_other_client_active();
+}
+
+thread_control_monitor& threading_control::get_waiting_threads_monitor() {
+    return my_pimpl->get_waiting_threads_monitor();
+}
+
+} // r1
+} // detail
+} // tbb
diff --git a/external/tbb/src/tbb/threading_control.h b/external/tbb/src/tbb/threading_control.h
new file mode 100644
index 00000000..7381b297
--- /dev/null
+++ b/external/tbb/src/tbb/threading_control.h
@@ -0,0 +1,154 @@
+/*
+    Copyright (c) 2022-2024 Intel Corporation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#ifndef _TBB_threading_control_H
+#define _TBB_threading_control_H
+
+#include "oneapi/tbb/mutex.h"
+#include "oneapi/tbb/global_control.h"
+
+#include "threading_control_client.h"
+#include "intrusive_list.h"
+#include "main.h"
+#include "permit_manager.h"
+#include "pm_client.h"
+#include "thread_dispatcher.h"
+#include "cancellation_disseminator.h"
+#include "thread_request_serializer.h"
+#include "scheduler_common.h"
+
+namespace tbb {
+namespace detail {
+namespace r1 {
+
+class arena;
+class thread_data;
+
+class threading_control;
+
+class threading_control_impl {
+public:
+    threading_control_impl(threading_control*);
+
+public:
+    void release(bool blocking_terminate);
+
+    threading_control_client create_client(arena& a);
+    void publish_client(threading_control_client client, d1::constraints& constraints);
+
+    struct client_snapshot {
+        std::uint64_t aba_epoch;
+        unsigned priority_level;
+        thread_dispatcher_client* my_td_client;
+        pm_client* my_pm_client;
+    };
+
+    client_snapshot prepare_client_destruction(threading_control_client client);
+    bool try_destroy_client(client_snapshot deleter);
+
+    void register_thread(thread_data& td);
+    void unregister_thread(thread_data& td);
+    void propagate_task_group_state(std::atomic<uint32_t> d1::task_group_context::*mptr_state,
+                                    d1::task_group_context& src, uint32_t new_state);
+
+    void set_active_num_workers(unsigned soft_limit);
+    std::size_t worker_stack_size();
+    unsigned max_num_workers();
+
+    void adjust_demand(threading_control_client, int mandatory_delta, int workers_delta);
+    bool is_any_other_client_active();
+
+    thread_control_monitor& get_waiting_threads_monitor();
+
+private:
+    static unsigned calc_workers_soft_limit(unsigned workers_hard_limit);
+    static std::pair<unsigned, unsigned> calculate_workers_limits();
+    static cache_aligned_unique_ptr<permit_manager> make_permit_manager(unsigned workers_soft_limit);
+    static cache_aligned_unique_ptr<thread_dispatcher> make_thread_dispatcher(threading_control& control,
+                                                                              unsigned workers_soft_limit,
+                                                                              unsigned workers_hard_limit);
+
+    // TODO: Consider allocation one chunk of memory and construct objects on it
+    cache_aligned_unique_ptr<permit_manager> my_permit_manager{nullptr};
+    cache_aligned_unique_ptr<thread_dispatcher> my_thread_dispatcher{nullptr};
+    cache_aligned_unique_ptr<thread_request_serializer_proxy> my_thread_request_serializer{nullptr};
+    cache_aligned_unique_ptr<cancellation_disseminator> my_cancellation_disseminator{nullptr};
+    cache_aligned_unique_ptr<thread_control_monitor> my_waiting_threads_monitor{nullptr};
+};
+
+
+class threading_control {
+    using global_mutex_type = d1::mutex;
+public:
+    using client_snapshot = threading_control_impl::client_snapshot;
+
+    static threading_control* register_public_reference();
+    static bool unregister_public_reference(bool blocking_terminate);
+
+    static bool is_present();
+    static void set_active_num_workers(unsigned soft_limit);
+    static bool register_lifetime_control();
+    static bool unregister_lifetime_control(bool blocking_terminate);
+
+    threading_control_client create_client(arena& a);
+    void publish_client(threading_control_client client, d1::constraints& constraints);
+    client_snapshot prepare_client_destruction(threading_control_client client);
+    bool try_destroy_client(client_snapshot deleter);
+
+    void register_thread(thread_data& td);
+    void unregister_thread(thread_data& td);
+    void propagate_task_group_state(std::atomic<uint32_t> d1::task_group_context::*mptr_state,
+                                    d1::task_group_context& src, uint32_t new_state);
+
+    std::size_t worker_stack_size();
+    static unsigned max_num_workers();
+
+    void adjust_demand(threading_control_client client, int mandatory_delta, int workers_delta);
+    bool is_any_other_client_active();
+
+    thread_control_monitor& get_waiting_threads_monitor();
+
+private:
+    threading_control(unsigned public_ref, unsigned ref);
+    void add_ref(bool is_public);
+    bool remove_ref(bool is_public);
+
+    static threading_control* get_threading_control(bool is_public);
+    static threading_control* create_threading_control();
+
+    bool release(bool is_public, bool blocking_terminate);
+    void wait_last_reference(global_mutex_type::scoped_lock& lock);
+    void destroy();
+
+    friend class thread_dispatcher;
+
+    static threading_control* g_threading_control;
+    //! Mutex guarding creation/destruction of g_threading_control, insertions/deletions in my_arenas, and cancellation propagation
+    static global_mutex_type g_threading_control_mutex;
+
+    cache_aligned_unique_ptr<threading_control_impl> my_pimpl{nullptr};
+    //! Count of external threads attached
+    std::atomic<unsigned> my_public_ref_count{0};
+    //! Reference count controlling threading_control object lifetime
+    std::atomic<unsigned> my_ref_count{0};
+};
+
+} // r1
+} // detail
+} // tbb
+
+
+#endif // _TBB_threading_control_H
diff --git a/external/tbb/src/tbb/threading_control_client.h b/external/tbb/src/tbb/threading_control_client.h
new file mode 100644
index 00000000..4ff9359c
--- /dev/null
+++ b/external/tbb/src/tbb/threading_control_client.h
@@ -0,0 +1,58 @@
+/*
+    Copyright (c) 2022-2023 Intel Corporation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#ifndef _TBB_threading_control_client_H
+#define _TBB_threading_control_client_H
+
+#include "oneapi/tbb/detail/_assert.h"
+
+namespace tbb {
+namespace detail {
+namespace r1 {
+
+class pm_client;
+class thread_dispatcher_client;
+
+class threading_control_client {
+public:
+    threading_control_client() = default;
+    threading_control_client(const threading_control_client&) = default;
+    threading_control_client& operator=(const threading_control_client&) = default;
+
+    threading_control_client(pm_client* p, thread_dispatcher_client* t) : my_pm_client(p), my_thread_dispatcher_client(t) {
+        __TBB_ASSERT(my_pm_client, nullptr);
+        __TBB_ASSERT(my_thread_dispatcher_client, nullptr);
+    }
+
+    pm_client* get_pm_client() {
+        return my_pm_client;
+    }
+
+    thread_dispatcher_client* get_thread_dispatcher_client() {
+        return my_thread_dispatcher_client;
+    }
+
+private:
+    pm_client* my_pm_client{nullptr};
+    thread_dispatcher_client* my_thread_dispatcher_client{nullptr};
+};
+
+
+}
+}
+}
+
+#endif // _TBB_threading_control_client_H
diff --git a/external/tbb/src/tbb/tls.h b/external/tbb/src/tbb/tls.h
index 828b7b72..e87a943a 100644
--- a/external/tbb/src/tbb/tls.h
+++ b/external/tbb/src/tbb/tls.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -37,7 +37,7 @@ class basic_tls {
 #if __TBB_USE_POSIX
     typedef pthread_key_t tls_key_t;
 public:
-    int  create( tls_dtor_t dtor = NULL ) {
+    int  create( tls_dtor_t dtor = nullptr ) {
         return pthread_key_create(&my_key, dtor);
     }
     int  destroy()      { return pthread_key_delete(my_key); }
@@ -59,7 +59,7 @@ class basic_tls {
     T    get()          { return (T)TlsGetValue(my_key); }
 #else /*!__TBB_WIN8UI_SUPPORT*/
     int create() {
-        tls_key_t tmp = FlsAlloc(NULL);
+        tls_key_t tmp = FlsAlloc(nullptr);
         if( tmp== (DWORD)0xFFFFFFFF )
             return (DWORD)0xFFFFFFFF;
         my_key = tmp;
diff --git a/external/tbb/src/tbb/tools_api/disable_warnings.h b/external/tbb/src/tbb/tools_api/disable_warnings.h
index 27aa3ee0..977569d0 100644
--- a/external/tbb/src/tbb/tools_api/disable_warnings.h
+++ b/external/tbb/src/tbb/tools_api/disable_warnings.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -16,7 +16,9 @@
 
 #include "ittnotify_config.h"
 
-#if ITT_PLATFORM==ITT_PLATFORM_WIN && _MSC_VER
+#if ITT_PLATFORM==ITT_PLATFORM_WIN
+
+#if defined _MSC_VER
 
 #pragma warning (disable: 593)   /* parameter "XXXX" was set but never used                 */
 #pragma warning (disable: 344)   /* typedef name has already been declared (with same type) */
@@ -24,6 +26,8 @@
 #pragma warning (disable: 4127)  /* conditional expression is constant                      */
 #pragma warning (disable: 4306)  /* conversion from '?' to '?' of greater size              */
 
+#endif
+
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 
 #if defined __INTEL_COMPILER
diff --git a/external/tbb/src/tbb/tools_api/ittnotify.h b/external/tbb/src/tbb/tools_api/ittnotify.h
index 1eecd2fa..eb1571dc 100644
--- a/external/tbb/src/tbb/tools_api/ittnotify.h
+++ b/external/tbb/src/tbb/tools_api/ittnotify.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@
 @brief Public User API functions and types
 @mainpage
 
-The Instrumentation and Tracing Technology API (ITT API) is used to 
+The Instrumentation and Tracing Technology API (ITT API) is used to
 annotate a user's program with additional information
 that can be used by correctness and performance tools. The user inserts
 calls in their program. Those calls generate information that is collected
@@ -101,6 +101,11 @@ The same ID may not be reused for different instances, unless a previous
 #  define ITT_OS_FREEBSD   4
 #endif /* ITT_OS_FREEBSD */
 
+#ifndef ITT_OS_OPENBSD
+#  define ITT_OS_OPENBSD 5
+#endif /* ITT_OS_OPENBSD */
+
+
 #ifndef ITT_OS
 #  if defined WIN32 || defined _WIN32
 #    define ITT_OS ITT_OS_WIN
@@ -108,6 +113,8 @@ The same ID may not be reused for different instances, unless a previous
 #    define ITT_OS ITT_OS_MAC
 #  elif defined( __FreeBSD__ )
 #    define ITT_OS ITT_OS_FREEBSD
+#  elif defined( __OpenBSD__ )
+#    define ITT_OS ITT_OS_OPENBSD
 #  else
 #    define ITT_OS ITT_OS_LINUX
 #  endif
@@ -129,6 +136,10 @@ The same ID may not be reused for different instances, unless a previous
 #  define ITT_PLATFORM_FREEBSD 4
 #endif /* ITT_PLATFORM_FREEBSD */
 
+#ifndef ITT_PLATFORM_OPENBSD
+#  define ITT_PLATFORM_OPENBSD 5
+#endif /* ITT_PLATFORM_OPENBSD */
+
 #ifndef ITT_PLATFORM
 #  if ITT_OS==ITT_OS_WIN
 #    define ITT_PLATFORM ITT_PLATFORM_WIN
@@ -136,6 +147,8 @@ The same ID may not be reused for different instances, unless a previous
 #    define ITT_PLATFORM ITT_PLATFORM_MAC
 #  elif ITT_OS==ITT_OS_FREEBSD
 #    define ITT_PLATFORM ITT_PLATFORM_FREEBSD
+#  elif ITT_OS==ITT_OS_OPENBSD
+#    define ITT_PLATFORM ITT_PLATFORM_OPENBSD
 #  else
 #    define ITT_PLATFORM ITT_PLATFORM_POSIX
 #  endif
@@ -188,7 +201,12 @@ The same ID may not be reused for different instances, unless a previous
 
 #if ITT_PLATFORM==ITT_PLATFORM_WIN
 /* use __forceinline (VC++ specific) */
+#if defined(__MINGW32__) && !defined(__cplusplus)
+#define ITT_INLINE           static __inline__ __attribute__((__always_inline__,__gnu_inline__))
+#else
 #define ITT_INLINE           static __forceinline
+#endif /* __MINGW32__ */
+
 #define ITT_INLINE_ATTRIBUTE /* nothing */
 #else  /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 /*
@@ -249,20 +267,20 @@ The same ID may not be reused for different instances, unless a previous
 #define ITTNOTIFY_VOID(n) (!ITTNOTIFY_NAME(n)) ? (void)0 : ITTNOTIFY_NAME(n)
 #define ITTNOTIFY_DATA(n) (!ITTNOTIFY_NAME(n)) ?       0 : ITTNOTIFY_NAME(n)
 
-#define ITTNOTIFY_VOID_D0(n,d)       (!(d)->flags) ? (void)0 : (!ITTNOTIFY_NAME(n)) ? (void)0 : ITTNOTIFY_NAME(n)(d)
-#define ITTNOTIFY_VOID_D1(n,d,x)     (!(d)->flags) ? (void)0 : (!ITTNOTIFY_NAME(n)) ? (void)0 : ITTNOTIFY_NAME(n)(d,x)
-#define ITTNOTIFY_VOID_D2(n,d,x,y)   (!(d)->flags) ? (void)0 : (!ITTNOTIFY_NAME(n)) ? (void)0 : ITTNOTIFY_NAME(n)(d,x,y)
-#define ITTNOTIFY_VOID_D3(n,d,x,y,z) (!(d)->flags) ? (void)0 : (!ITTNOTIFY_NAME(n)) ? (void)0 : ITTNOTIFY_NAME(n)(d,x,y,z)
-#define ITTNOTIFY_VOID_D4(n,d,x,y,z,a)     (!(d)->flags) ? (void)0 : (!ITTNOTIFY_NAME(n)) ? (void)0 : ITTNOTIFY_NAME(n)(d,x,y,z,a)
-#define ITTNOTIFY_VOID_D5(n,d,x,y,z,a,b)   (!(d)->flags) ? (void)0 : (!ITTNOTIFY_NAME(n)) ? (void)0 : ITTNOTIFY_NAME(n)(d,x,y,z,a,b)
-#define ITTNOTIFY_VOID_D6(n,d,x,y,z,a,b,c) (!(d)->flags) ? (void)0 : (!ITTNOTIFY_NAME(n)) ? (void)0 : ITTNOTIFY_NAME(n)(d,x,y,z,a,b,c)
-#define ITTNOTIFY_DATA_D0(n,d)       (!(d)->flags) ?       0 : (!ITTNOTIFY_NAME(n)) ?       0 : ITTNOTIFY_NAME(n)(d)
-#define ITTNOTIFY_DATA_D1(n,d,x)     (!(d)->flags) ?       0 : (!ITTNOTIFY_NAME(n)) ?       0 : ITTNOTIFY_NAME(n)(d,x)
-#define ITTNOTIFY_DATA_D2(n,d,x,y)   (!(d)->flags) ?       0 : (!ITTNOTIFY_NAME(n)) ?       0 : ITTNOTIFY_NAME(n)(d,x,y)
-#define ITTNOTIFY_DATA_D3(n,d,x,y,z) (!(d)->flags) ?       0 : (!ITTNOTIFY_NAME(n)) ?       0 : ITTNOTIFY_NAME(n)(d,x,y,z)
-#define ITTNOTIFY_DATA_D4(n,d,x,y,z,a)     (!(d)->flags) ? 0 : (!ITTNOTIFY_NAME(n)) ?       0 : ITTNOTIFY_NAME(n)(d,x,y,z,a)
-#define ITTNOTIFY_DATA_D5(n,d,x,y,z,a,b)   (!(d)->flags) ? 0 : (!ITTNOTIFY_NAME(n)) ?       0 : ITTNOTIFY_NAME(n)(d,x,y,z,a,b)
-#define ITTNOTIFY_DATA_D6(n,d,x,y,z,a,b,c) (!(d)->flags) ? 0 : (!ITTNOTIFY_NAME(n)) ?       0 : ITTNOTIFY_NAME(n)(d,x,y,z,a,b,c)
+#define ITTNOTIFY_VOID_D0(n,d)       (d == NULL) ? (void)0 : (!(d)->flags) ? (void)0 : (!ITTNOTIFY_NAME(n)) ? (void)0 : ITTNOTIFY_NAME(n)(d)
+#define ITTNOTIFY_VOID_D1(n,d,x)     (d == NULL) ? (void)0 : (!(d)->flags) ? (void)0 : (!ITTNOTIFY_NAME(n)) ? (void)0 : ITTNOTIFY_NAME(n)(d,x)
+#define ITTNOTIFY_VOID_D2(n,d,x,y)   (d == NULL) ? (void)0 : (!(d)->flags) ? (void)0 : (!ITTNOTIFY_NAME(n)) ? (void)0 : ITTNOTIFY_NAME(n)(d,x,y)
+#define ITTNOTIFY_VOID_D3(n,d,x,y,z) (d == NULL) ? (void)0 : (!(d)->flags) ? (void)0 : (!ITTNOTIFY_NAME(n)) ? (void)0 : ITTNOTIFY_NAME(n)(d,x,y,z)
+#define ITTNOTIFY_VOID_D4(n,d,x,y,z,a)     (d == NULL) ? (void)0 : (!(d)->flags) ? (void)0 : (!ITTNOTIFY_NAME(n)) ? (void)0 : ITTNOTIFY_NAME(n)(d,x,y,z,a)
+#define ITTNOTIFY_VOID_D5(n,d,x,y,z,a,b)   (d == NULL) ? (void)0 : (!(d)->flags) ? (void)0 : (!ITTNOTIFY_NAME(n)) ? (void)0 : ITTNOTIFY_NAME(n)(d,x,y,z,a,b)
+#define ITTNOTIFY_VOID_D6(n,d,x,y,z,a,b,c) (d == NULL) ? (void)0 : (!(d)->flags) ? (void)0 : (!ITTNOTIFY_NAME(n)) ? (void)0 : ITTNOTIFY_NAME(n)(d,x,y,z,a,b,c)
+#define ITTNOTIFY_DATA_D0(n,d)       (d == NULL) ? 0 : (!(d)->flags) ?       0 : (!ITTNOTIFY_NAME(n)) ?       0 : ITTNOTIFY_NAME(n)(d)
+#define ITTNOTIFY_DATA_D1(n,d,x)     (d == NULL) ? 0 : (!(d)->flags) ?       0 : (!ITTNOTIFY_NAME(n)) ?       0 : ITTNOTIFY_NAME(n)(d,x)
+#define ITTNOTIFY_DATA_D2(n,d,x,y)   (d == NULL) ? 0 : (!(d)->flags) ?       0 : (!ITTNOTIFY_NAME(n)) ?       0 : ITTNOTIFY_NAME(n)(d,x,y)
+#define ITTNOTIFY_DATA_D3(n,d,x,y,z) (d == NULL) ? 0 : (!(d)->flags) ?       0 : (!ITTNOTIFY_NAME(n)) ?       0 : ITTNOTIFY_NAME(n)(d,x,y,z)
+#define ITTNOTIFY_DATA_D4(n,d,x,y,z,a)     (d == NULL) ? 0 : (!(d)->flags) ? 0 : (!ITTNOTIFY_NAME(n)) ?       0 : ITTNOTIFY_NAME(n)(d,x,y,z,a)
+#define ITTNOTIFY_DATA_D5(n,d,x,y,z,a,b)   (d == NULL) ? 0 : (!(d)->flags) ? 0 : (!ITTNOTIFY_NAME(n)) ?       0 : ITTNOTIFY_NAME(n)(d,x,y,z,a,b)
+#define ITTNOTIFY_DATA_D6(n,d,x,y,z,a,b,c) (d == NULL) ? 0 : (!(d)->flags) ? 0 : (!ITTNOTIFY_NAME(n)) ?       0 : ITTNOTIFY_NAME(n)(d,x,y,z,a,b,c)
 
 #ifdef ITT_STUB
 #undef ITT_STUB
@@ -300,7 +318,7 @@ extern "C" {
  *     only pauses tracing and analyzing memory access.
  *     It does not pause tracing or analyzing threading APIs.
  *   .
- * - Intel(R) Parallel Amplifier and Intel(R) VTune(TM) Amplifier XE:
+ * Intel(R) VTune(TM) Profiler:
  *   - Does continue to record when new threads are started.
  *   .
  * - Other effects:
@@ -315,30 +333,57 @@ void ITTAPI __itt_resume(void);
 /** @brief Detach collection */
 void ITTAPI __itt_detach(void);
 
+/**
+ * @enum __itt_collection_scope
+ * @brief Enumerator for collection scopes
+ */
+typedef enum {
+    __itt_collection_scope_host    = 1 << 0,
+    __itt_collection_scope_offload = 1 << 1,
+    __itt_collection_scope_all     = 0x7FFFFFFF
+} __itt_collection_scope;
+
+/** @brief Pause scoped collection */
+void ITTAPI __itt_pause_scoped(__itt_collection_scope);
+/** @brief Resume scoped collection */
+void ITTAPI __itt_resume_scoped(__itt_collection_scope);
+  
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-ITT_STUBV(ITTAPI, void, pause,  (void))
-ITT_STUBV(ITTAPI, void, resume, (void))
-ITT_STUBV(ITTAPI, void, detach, (void))
-#define __itt_pause      ITTNOTIFY_VOID(pause)
-#define __itt_pause_ptr  ITTNOTIFY_NAME(pause)
-#define __itt_resume     ITTNOTIFY_VOID(resume)
-#define __itt_resume_ptr ITTNOTIFY_NAME(resume)
-#define __itt_detach     ITTNOTIFY_VOID(detach)
-#define __itt_detach_ptr ITTNOTIFY_NAME(detach)
+ITT_STUBV(ITTAPI, void, pause,         (void))
+ITT_STUBV(ITTAPI, void, pause_scoped,  (__itt_collection_scope))
+ITT_STUBV(ITTAPI, void, resume,        (void))
+ITT_STUBV(ITTAPI, void, resume_scoped, (__itt_collection_scope))
+ITT_STUBV(ITTAPI, void, detach,        (void))
+#define __itt_pause             ITTNOTIFY_VOID(pause)
+#define __itt_pause_ptr         ITTNOTIFY_NAME(pause)
+#define __itt_pause_scoped      ITTNOTIFY_VOID(pause_scoped)
+#define __itt_pause_scoped_ptr  ITTNOTIFY_NAME(pause_scoped)
+#define __itt_resume            ITTNOTIFY_VOID(resume)
+#define __itt_resume_ptr        ITTNOTIFY_NAME(resume)
+#define __itt_resume_scoped     ITTNOTIFY_VOID(resume_scoped)
+#define __itt_resume_scoped_ptr ITTNOTIFY_NAME(resume_scoped)
+#define __itt_detach            ITTNOTIFY_VOID(detach)
+#define __itt_detach_ptr        ITTNOTIFY_NAME(detach)
 #else  /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_pause()
-#define __itt_pause_ptr  0
+#define __itt_pause_ptr           0
+#define __itt_pause_scoped(scope)
+#define __itt_pause_scoped_ptr    0
 #define __itt_resume()
-#define __itt_resume_ptr 0
+#define __itt_resume_ptr          0
+#define __itt_resume_scoped(scope)
+#define __itt_resume_scoped_ptr   0
 #define __itt_detach()
-#define __itt_detach_ptr 0
+#define __itt_detach_ptr          0
 #endif /* INTEL_NO_ITTNOTIFY_API */
 #else  /* INTEL_NO_MACRO_BODY */
-#define __itt_pause_ptr  0
-#define __itt_resume_ptr 0
-#define __itt_detach_ptr 0
+#define __itt_pause_ptr           0
+#define __itt_pause_scoped_ptr    0
+#define __itt_resume_ptr          0
+#define __itt_resume_scoped_ptr   0
+#define __itt_detach_ptr          0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
 /** @} control group */
@@ -348,7 +393,7 @@ ITT_STUBV(ITTAPI, void, detach, (void))
  * @defgroup Intel Processor Trace control
  * API from this group provides control over collection and analysis of Intel Processor Trace (Intel PT) data
  * Information about Intel Processor Trace technology can be found here (Volume 3 chapter 35):
- * https://software.intel.com/sites/default/files/managed/39/c5/325462-sdm-vol-1-2abcd-3abcd.pdf
+ * https://github.com/tpn/pdfs/blob/master/Intel%2064%20and%20IA-32%20Architectures%20Software%20Developer's%20Manual%20-%20Combined%20Volumes%201-4%20-%20May%202018%20(325462-sdm-vol-1-2abcd-3abcd).pdf
  * Use this API to mark particular code regions for loading detailed performance statistics.
  * This mode makes your analysis faster and more accurate.
  * @{
@@ -582,14 +627,26 @@ ITT_STUBV(ITTAPI, void, suppress_pop, (void))
 /** @endcond */
 
 /**
- * @enum __itt_model_disable
- * @brief Enumerator for the disable methods
+ * @enum __itt_suppress_mode
+ * @brief Enumerator for the suppressing modes
  */
 typedef enum __itt_suppress_mode {
     __itt_unsuppress_range,
     __itt_suppress_range
 } __itt_suppress_mode_t;
 
+/**
+ * @enum __itt_collection_state
+ * @brief Enumerator for collection state.
+ */
+typedef enum {
+    __itt_collection_uninitialized = 0, /* uninitialized */
+    __itt_collection_init_fail = 1, /* failed to init */
+    __itt_collection_collector_absent = 2, /* non work state collector is absent */
+    __itt_collection_collector_exists = 3, /* work state collector exists */
+    __itt_collection_init_successful = 4 /* success to init */
+} __itt_collection_state;
+
 /**
  * @brief Mark a range of memory for error suppression or unsuppression for error types included in mask
  */
@@ -2328,7 +2385,7 @@ ITT_STUBV(ITTAPI, void, task_end_overlapped,   (const __itt_domain *domain, __it
 
 /**
  * @defgroup markers Markers
- * Markers represent a single discreet event in time. Markers have a scope,
+ * Markers represent a single discrete event in time. Markers have a scope,
  * described by an enumerated type __itt_scope. Markers are created by
  * the API call __itt_marker. A marker instance can be given an ID for use in
  * adding metadata.
@@ -3869,6 +3926,292 @@ ITT_STUBV(ITTAPI, void, module_unload_with_sections,  (__itt_module_object* modu
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
 
+/** @cond exclude_from_documentation */
+#pragma pack(push, 8)
+
+typedef struct ___itt_histogram
+{
+    const __itt_domain* domain;      /*!< Domain of the histogram*/
+    const char* nameA;               /*!< Name of the histogram */
+#if defined(UNICODE) || defined(_UNICODE)
+    const wchar_t* nameW;
+#else  /* UNICODE || _UNICODE */
+    void* nameW;
+#endif /* UNICODE || _UNICODE */
+    __itt_metadata_type x_type;     /*!< Type of the histogram X axis */
+    __itt_metadata_type y_type;     /*!< Type of the histogram Y axis */
+    int   extra1;                   /*!< Reserved to the runtime */
+    void* extra2;                   /*!< Reserved to the runtime */
+    struct ___itt_histogram* next;
+}  __itt_histogram;
+
+#pragma pack(pop)
+/** @endcond */
+
+/**
+ * @brief Create a typed histogram instance with given name/domain.
+ * @param[in] domain The domain controlling the call.
+ * @param[in] name   The name of the histogram.
+ * @param[in] x_type The type of the X axis in histogram (may be 0 to calculate batch statistics).
+ * @param[in] y_type The type of the Y axis in histogram.
+*/
+#if ITT_PLATFORM==ITT_PLATFORM_WIN
+__itt_histogram* ITTAPI __itt_histogram_createA(const __itt_domain* domain, const char* name, __itt_metadata_type x_type, __itt_metadata_type y_type);
+__itt_histogram* ITTAPI __itt_histogram_createW(const __itt_domain* domain, const wchar_t* name, __itt_metadata_type x_type, __itt_metadata_type y_type);
+#if defined(UNICODE) || defined(_UNICODE)
+#  define __itt_histogram_create     __itt_histogram_createW
+#  define __itt_histogram_create_ptr __itt_histogram_createW_ptr
+#else /* UNICODE */
+#  define __itt_histogram_create     __itt_histogram_createA
+#  define __itt_histogram_create_ptr __itt_histogram_createA_ptr
+#endif /* UNICODE */
+#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+__itt_histogram* ITTAPI __itt_histogram_create(const __itt_domain* domain, const char* name, __itt_metadata_type x_type, __itt_metadata_type y_type);
+#endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+
+/** @cond exclude_from_documentation */
+#ifndef INTEL_NO_MACRO_BODY
+#ifndef INTEL_NO_ITTNOTIFY_API
+#if ITT_PLATFORM==ITT_PLATFORM_WIN
+ITT_STUB(ITTAPI, __itt_histogram*, histogram_createA, (const __itt_domain* domain, const char* name, __itt_metadata_type x_type, __itt_metadata_type y_type))
+ITT_STUB(ITTAPI, __itt_histogram*, histogram_createW, (const __itt_domain* domain, const wchar_t* name, __itt_metadata_type x_type, __itt_metadata_type y_type))
+#else  /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+ITT_STUB(ITTAPI, __itt_histogram*, histogram_create, (const __itt_domain* domain, const char* name, __itt_metadata_type x_type, __itt_metadata_type y_type))
+#endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#define __itt_histogram_createA     ITTNOTIFY_DATA(histogram_createA)
+#define __itt_histogram_createA_ptr ITTNOTIFY_NAME(histogram_createA)
+#define __itt_histogram_createW     ITTNOTIFY_DATA(histogram_createW)
+#define __itt_histogram_createW_ptr ITTNOTIFY_NAME(histogram_createW)
+#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+#define __itt_histogram_create     ITTNOTIFY_DATA(histogram_create)
+#define __itt_histogram_create_ptr ITTNOTIFY_NAME(histogram_create)
+#endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+#else  /* INTEL_NO_ITTNOTIFY_API */
+#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#define __itt_histogram_createA(domain, name, x_type, y_type) (__itt_histogram*)0
+#define __itt_histogram_createA_ptr 0
+#define __itt_histogram_createW(domain, name, x_type, y_type) (__itt_histogram*)0
+#define __itt_histogram_createW_ptr 0
+#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+#define __itt_histogram_create(domain, name, x_type, y_type) (__itt_histogram*)0
+#define __itt_histogram_create_ptr 0
+#endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+#endif /* INTEL_NO_ITTNOTIFY_API */
+#else  /* INTEL_NO_MACRO_BODY */
+#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#define __itt_histogram_createA_ptr 0
+#define __itt_histogram_createW_ptr 0
+#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+#define __itt_histogram_create_ptr 0
+#endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+#endif /* INTEL_NO_MACRO_BODY */
+/** @endcond */
+
+/**
+ * @brief Submit statistics for a histogram instance.
+ * @param[in] histogram    Pointer to the histogram instance to which the histogram statistic is to be dumped.
+ * @param[in] length  The number of elements in dumped axis data array.
+ * @param[in] x_data  The X axis dumped data itself (may be NULL to calculate batch statistics).
+ * @param[in] y_data  The Y axis dumped data itself.
+*/
+void ITTAPI __itt_histogram_submit(__itt_histogram* histogram, size_t length, void* x_data, void* y_data);
+
+/** @cond exclude_from_documentation */
+#ifndef INTEL_NO_MACRO_BODY
+#ifndef INTEL_NO_ITTNOTIFY_API
+ITT_STUBV(ITTAPI, void, histogram_submit, (__itt_histogram* histogram, size_t length, void* x_data, void* y_data))
+#define __itt_histogram_submit     ITTNOTIFY_VOID(histogram_submit)
+#define __itt_histogram_submit_ptr ITTNOTIFY_NAME(histogram_submit)
+#else  /* INTEL_NO_ITTNOTIFY_API */
+#define __itt_histogram_submit(histogram, length, x_data, y_data)
+#define __itt_histogram_submit_ptr 0
+#endif /* INTEL_NO_ITTNOTIFY_API */
+#else  /* INTEL_NO_MACRO_BODY */
+#define __itt_histogram_submit_ptr 0
+#endif /* INTEL_NO_MACRO_BODY */
+
+/**
+* @brief function allows to obtain the current collection state at the moment
+* @return collection state as a enum __itt_collection_state
+*/
+__itt_collection_state __itt_get_collection_state(void);
+
+/**
+* @brief function releases resources allocated by ITT API static part
+* this API should be called from the library destructor
+* @return void
+*/
+void __itt_release_resources(void);
+/** @endcond */
+
+/**
+ * @brief Create a typed counter with given domain pointer, string name and counter type
+*/
+#if ITT_PLATFORM==ITT_PLATFORM_WIN
+__itt_counter ITTAPI __itt_counter_createA_v3(const __itt_domain* domain, const char* name, __itt_metadata_type type);
+__itt_counter ITTAPI __itt_counter_createW_v3(const __itt_domain* domain, const wchar_t* name, __itt_metadata_type type);
+#if defined(UNICODE) || defined(_UNICODE)
+#  define __itt_counter_create_v3     __itt_counter_createW_v3
+#  define __itt_counter_create_v3_ptr __itt_counter_createW_v3_ptr
+#else /* UNICODE */
+#  define __itt_counter_create_v3     __itt_counter_createA_v3
+#  define __itt_counter_create_v3_ptr __itt_counter_createA_v3_ptr
+#endif /* UNICODE */
+#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+__itt_counter ITTAPI __itt_counter_create_v3(const __itt_domain* domain, const char* name, __itt_metadata_type type);
+#endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+
+#ifndef INTEL_NO_MACRO_BODY
+#ifndef INTEL_NO_ITTNOTIFY_API
+#if ITT_PLATFORM==ITT_PLATFORM_WIN
+ITT_STUB(ITTAPI, __itt_counter, counter_createA_v3, (const __itt_domain* domain, const char* name, __itt_metadata_type type))
+ITT_STUB(ITTAPI, __itt_counter, counter_createW_v3, (const __itt_domain* domain, const wchar_t* name, __itt_metadata_type type))
+#else  /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+ITT_STUB(ITTAPI, __itt_counter, counter_create_v3,  (const __itt_domain* domain, const char* name, __itt_metadata_type type))
+#endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#define __itt_counter_createA_v3     ITTNOTIFY_DATA(counter_createA_v3)
+#define __itt_counter_createA_v3_ptr ITTNOTIFY_NAME(counter_createA_v3)
+#define __itt_counter_createW_v3     ITTNOTIFY_DATA(counter_createW_v3)
+#define __itt_counter_createW_v3_ptr ITTNOTIFY_NAME(counter_createW_v3)
+#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+#define __itt_counter_create_v3     ITTNOTIFY_DATA(counter_create_v3)
+#define __itt_counter_create_v3_ptr ITTNOTIFY_NAME(counter_create_v3)
+#endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+#else  /* INTEL_NO_ITTNOTIFY_API */
+#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#define __itt_counter_createA_v3(domain, name, type) (__itt_counter)0
+#define __itt_counter_createA_v3_ptr 0
+#define __itt_counter_createW_v3(domain, name, type) (__itt_counter)0
+#define __itt_counter_create_typedW_ptr 0
+#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+#define __itt_counter_create_v3(domain, name, type) (__itt_counter)0
+#define __itt_counter_create_v3_ptr  0
+#endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+#endif /* INTEL_NO_ITTNOTIFY_API */
+#else  /* INTEL_NO_MACRO_BODY */
+#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#define __itt_counter_createA_v3_ptr 0
+#define __itt_counter_createW_v3_ptr 0
+#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+#define __itt_counter_create_v3_ptr  0
+#endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+#endif /* INTEL_NO_MACRO_BODY */
+/** @endcond */
+
+/**
+ * @brief Set the counter value api
+ */
+void ITTAPI __itt_counter_set_value_v3(__itt_counter counter, void *value_ptr);
+
+#ifndef INTEL_NO_MACRO_BODY
+#ifndef INTEL_NO_ITTNOTIFY_API
+ITT_STUBV(ITTAPI, void, counter_set_value_v3, (__itt_counter counter, void *value_ptr))
+#define __itt_counter_set_value_v3     ITTNOTIFY_VOID(counter_set_value_v3)
+#define __itt_counter_set_value_v3_ptr ITTNOTIFY_NAME(counter_set_value_v3)
+#else  /* INTEL_NO_ITTNOTIFY_API */
+#define __itt_counter_set_value_v3(counter, value_ptr)
+#define __itt_counter_set_value_v3_ptr 0
+#endif /* INTEL_NO_ITTNOTIFY_API */
+#else  /* INTEL_NO_MACRO_BODY */
+#define __itt_counter_set_value_v3_ptr 0
+#endif /* INTEL_NO_MACRO_BODY */
+/** @endcond */
+
+/**
+ * @brief describes the type of context metadata
+*/
+typedef enum {
+    __itt_context_unknown = 0,              /*!< Undefined type */
+    __itt_context_nameA,                    /*!< ASCII string char* type */
+    __itt_context_nameW,                    /*!< Unicode string wchar_t* type */
+    __itt_context_deviceA,                  /*!< ASCII string char* type */
+    __itt_context_deviceW,                  /*!< Unicode string wchar_t* type */
+    __itt_context_unitsA,                   /*!< ASCII string char* type */
+    __itt_context_unitsW,                   /*!< Unicode string wchar_t* type */
+    __itt_context_pci_addrA,                /*!< ASCII string char* type */
+    __itt_context_pci_addrW,                /*!< Unicode string wchar_t* type */
+    __itt_context_tid,                      /*!< Unsigned 64-bit integer type */
+    __itt_context_max_val,                  /*!< Unsigned 64-bit integer type */
+    __itt_context_bandwidth_flag,           /*!< Unsigned 64-bit integer type */
+    __itt_context_latency_flag,             /*!< Unsigned 64-bit integer type */
+    __itt_context_occupancy_flag,           /*!< Unsigned 64-bit integer type */
+    __itt_context_on_thread_flag,           /*!< Unsigned 64-bit integer type */
+    __itt_context_is_abs_val_flag,          /*!< Unsigned 64-bit integer type */
+    __itt_context_cpu_instructions_flag,    /*!< Unsigned 64-bit integer type */
+    __itt_context_cpu_cycles_flag           /*!< Unsigned 64-bit integer type */
+} __itt_context_type;
+
+#if defined(UNICODE) || defined(_UNICODE)
+#  define __itt_context_name __itt_context_nameW
+#  define __itt_context_device __itt_context_deviceW
+#  define __itt_context_units __itt_context_unitsW
+#  define __itt_context_pci_addr __itt_context_pci_addrW
+#else  /* UNICODE || _UNICODE */
+#  define __itt_context_name __itt_context_nameA
+#  define __itt_context_device __itt_context_deviceA
+#  define __itt_context_units __itt_context_unitsA
+#  define __itt_context_pci_addr __itt_context_pci_addrA
+#endif /* UNICODE || _UNICODE */
+
+/** @cond exclude_from_documentation */
+#pragma pack(push, 8)
+
+typedef struct ___itt_context_metadata
+{
+    __itt_context_type type;    /*!< Type of the context metadata value */
+    void* value;                /*!< Pointer to context metadata value itself */
+}  __itt_context_metadata;
+
+#pragma pack(pop)
+/** @endcond */
+
+/** @cond exclude_from_documentation */
+#pragma pack(push, 8)
+
+typedef struct ___itt_counter_metadata
+{
+    __itt_counter counter;              /*!< Associated context metadata counter */
+    __itt_context_type type;            /*!< Type of the context metadata value */
+    const char* str_valueA;             /*!< String context metadata value */
+#if defined(UNICODE) || defined(_UNICODE)
+    const wchar_t* str_valueW;
+#else  /* UNICODE || _UNICODE */
+    void* str_valueW;
+#endif /* UNICODE || _UNICODE */
+    unsigned long long value;           /*!< Numeric context metadata value */
+    int   extra1;                       /*!< Reserved to the runtime */
+    void* extra2;                       /*!< Reserved to the runtime */
+    struct ___itt_counter_metadata* next;
+}  __itt_counter_metadata;
+
+#pragma pack(pop)
+/** @endcond */
+
+/**
+ * @brief Bind context metadata to counter instance
+ * @param[in] counter   Pointer to the counter instance to which the context metadata is to be associated.
+ * @param[in] length    The number of elements in context metadata array.
+ * @param[in] metadata  The context metadata itself.
+*/
+void ITTAPI __itt_bind_context_metadata_to_counter(__itt_counter counter, size_t length, __itt_context_metadata* metadata);
+
+/** @cond exclude_from_documentation */
+#ifndef INTEL_NO_MACRO_BODY
+#ifndef INTEL_NO_ITTNOTIFY_API
+ITT_STUBV(ITTAPI, void, bind_context_metadata_to_counter, (__itt_counter counter, size_t length, __itt_context_metadata* metadata))
+#define __itt_bind_context_metadata_to_counter     ITTNOTIFY_VOID(bind_context_metadata_to_counter)
+#define __itt_bind_context_metadata_to_counter_ptr ITTNOTIFY_NAME(bind_context_metadata_to_counter)
+#else  /* INTEL_NO_ITTNOTIFY_API */
+#define __itt_bind_context_metadata_to_counter(counter, length, metadata)
+#define __itt_bind_context_metadata_to_counter_ptr 0
+#endif /* INTEL_NO_ITTNOTIFY_API */
+#else  /* INTEL_NO_MACRO_BODY */
+#define __itt_bind_context_metadata_to_counter_ptr 0
+#endif /* INTEL_NO_MACRO_BODY */
+/** @endcond */
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
@@ -4287,7 +4630,7 @@ typedef enum __itt_error_code
 {
     __itt_error_success       = 0, /*!< no error */
     __itt_error_no_module     = 1, /*!< module can't be loaded */
-    /* %1$s -- library name; win: %2$d -- system error code; unx: %2$s -- system error message. */
+    /* %1$s -- library name; win: %2$d -- system error code; unix: %2$s -- system error message. */
     __itt_error_no_symbol     = 2, /*!< symbol not found */
     /* %1$s -- library name, %2$s -- symbol name. */
     __itt_error_unknown_group = 3, /*!< unknown group specified */
diff --git a/external/tbb/src/tbb/tools_api/ittnotify_config.h b/external/tbb/src/tbb/tools_api/ittnotify_config.h
index 8ecc2378..001d42e0 100644
--- a/external/tbb/src/tbb/tools_api/ittnotify_config.h
+++ b/external/tbb/src/tbb/tools_api/ittnotify_config.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -34,6 +34,10 @@
 #  define ITT_OS_FREEBSD   4
 #endif /* ITT_OS_FREEBSD */
 
+#ifndef ITT_OS_OPENBSD
+#  define ITT_OS_OPENBSD   5
+#endif /* ITT_OS_OPENBSD */
+
 #ifndef ITT_OS
 #  if defined WIN32 || defined _WIN32
 #    define ITT_OS ITT_OS_WIN
@@ -41,6 +45,8 @@
 #    define ITT_OS ITT_OS_MAC
 #  elif defined( __FreeBSD__ )
 #    define ITT_OS ITT_OS_FREEBSD
+#  elif defined( __OpenBSD__ )
+#    define ITT_OS ITT_OS_OPENBSD
 #  else
 #    define ITT_OS ITT_OS_LINUX
 #  endif
@@ -62,6 +68,10 @@
 #  define ITT_PLATFORM_FREEBSD 4
 #endif /* ITT_PLATFORM_FREEBSD */
 
+#ifndef ITT_PLATFORM_OPENBSD
+#  define ITT_PLATFORM_OPENBSD 5
+#endif /* ITT_PLATFORM_OPENBSD */
+
 #ifndef ITT_PLATFORM
 #  if ITT_OS==ITT_OS_WIN
 #    define ITT_PLATFORM ITT_PLATFORM_WIN
@@ -69,6 +79,8 @@
 #    define ITT_PLATFORM ITT_PLATFORM_MAC
 #  elif ITT_OS==ITT_OS_FREEBSD
 #    define ITT_PLATFORM ITT_PLATFORM_FREEBSD
+#  elif ITT_OS==ITT_OS_OPENBSD
+#    define ITT_PLATFORM ITT_PLATFORM_OPENBSD
 #  else
 #    define ITT_PLATFORM ITT_PLATFORM_POSIX
 #  endif
@@ -121,7 +133,12 @@
 
 #if ITT_PLATFORM==ITT_PLATFORM_WIN
 /* use __forceinline (VC++ specific) */
+#if defined(__MINGW32__) && !defined(__cplusplus)
+#define ITT_INLINE           static __inline__ __attribute__((__always_inline__,__gnu_inline__))
+#else
 #define ITT_INLINE           static __forceinline
+#endif /* __MINGW32__ */
+
 #define ITT_INLINE_ATTRIBUTE /* nothing */
 #else  /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 /*
@@ -147,6 +164,10 @@
 #  define ITT_ARCH_IA32E 2
 #endif /* ITT_ARCH_IA32E */
 
+#ifndef ITT_ARCH_IA64
+#  define ITT_ARCH_IA64 3
+#endif /* ITT_ARCH_IA64 */
+
 #ifndef ITT_ARCH_ARM
 #  define ITT_ARCH_ARM  4
 #endif /* ITT_ARCH_ARM */
@@ -159,6 +180,22 @@
 #  define ITT_ARCH_ARM64  6
 #endif /* ITT_ARCH_ARM64 */
 
+#ifndef ITT_ARCH_LOONGARCH64
+#  define ITT_ARCH_LOONGARCH64  7
+#endif /* ITT_ARCH_LOONGARCH64 */
+
+#ifndef ITT_ARCH_S390X
+#  define ITT_ARCH_S390X  8
+#endif /* ITT_ARCH_S390X */
+
+#ifndef ITT_ARCH_HPPA
+#  define ITT_ARCH_HPPA  9
+#endif /* ITT_ARCH_HPPA */
+
+#ifndef ITT_ARCH_RISCV64
+#  define ITT_ARCH_RISCV64  10
+#endif /* ITT_ARCH_RISCV64 */
+
 #ifndef ITT_ARCH
 #  if defined _M_IX86 || defined __i386__
 #    define ITT_ARCH ITT_ARCH_IA32
@@ -172,7 +209,16 @@
 #    define ITT_ARCH ITT_ARCH_ARM64
 #  elif defined __powerpc64__
 #    define ITT_ARCH ITT_ARCH_PPC64
+#  elif defined __loongarch__
+#    define ITT_ARCH ITT_ARCH_LOONGARCH64
+#  elif defined __s390__ || defined __s390x__
+#    define ITT_ARCH ITT_ARCH_S390X
+#  elif defined __hppa__
+#    define ITT_ARCH ITT_ARCH_HPPA
+#  elif defined __riscv && __riscv_xlen == 64
+#    define ITT_ARCH ITT_ARCH_RISCV64
 #  endif
+
 #endif
 
 #ifdef __cplusplus
@@ -198,10 +244,10 @@
 #define ITT_MAGIC { 0xED, 0xAB, 0xAB, 0xEC, 0x0D, 0xEE, 0xDA, 0x30 }
 
 /* Replace with snapshot date YYYYMMDD for promotion build. */
-#define API_VERSION_BUILD    20180723
+#define API_VERSION_BUILD    20230630
 
 #ifndef API_VERSION_NUM
-#define API_VERSION_NUM 3.18.6
+#define API_VERSION_NUM 3.24.4
 #endif /* API_VERSION_NUM */
 
 #define API_VERSION "ITT-API-Version " ITT_TO_STR(API_VERSION_NUM) \
@@ -245,13 +291,13 @@ typedef pthread_mutex_t   mutex_t;
 #define __itt_mutex_init(mutex)   InitializeCriticalSection(mutex)
 #define __itt_mutex_lock(mutex)   EnterCriticalSection(mutex)
 #define __itt_mutex_unlock(mutex) LeaveCriticalSection(mutex)
+#define __itt_mutex_destroy(mutex) DeleteCriticalSection(mutex)
 #define __itt_load_lib(name)      LoadLibraryA(name)
 #define __itt_unload_lib(handle)  FreeLibrary(handle)
 #define __itt_system_error()      (int)GetLastError()
 #define __itt_fstrcmp(s1, s2)     lstrcmpA(s1, s2)
 #define __itt_fstrnlen(s, l)      strnlen_s(s, l)
 #define __itt_fstrcpyn(s1, b, s2, l) strncpy_s(s1, b, s2, l)
-#define __itt_fstrdup(s)          _strdup(s)
 #define __itt_thread_id()         GetCurrentThreadId()
 #define __itt_thread_yield()      SwitchToThread()
 #ifndef ITT_SIMPLE_INIT
@@ -261,6 +307,13 @@ ITT_INLINE long __itt_interlocked_increment(volatile long* ptr)
 {
     return InterlockedIncrement(ptr);
 }
+ITT_INLINE long
+__itt_interlocked_compare_exchange(volatile long* ptr, long exchange, long comperand) ITT_INLINE_ATTRIBUTE;
+ITT_INLINE long
+__itt_interlocked_compare_exchange(volatile long* ptr, long exchange, long comperand)
+{
+    return InterlockedCompareExchange(ptr, exchange, comperand);
+}
 #endif /* ITT_SIMPLE_INIT */
 
 #define DL_SYMBOLS (1)
@@ -290,6 +343,7 @@ ITT_INLINE long __itt_interlocked_increment(volatile long* ptr)
 }
 #define __itt_mutex_lock(mutex)   pthread_mutex_lock(mutex)
 #define __itt_mutex_unlock(mutex) pthread_mutex_unlock(mutex)
+#define __itt_mutex_destroy(mutex) pthread_mutex_destroy(mutex)
 #define __itt_load_lib(name)      dlopen(name, RTLD_LAZY)
 #define __itt_unload_lib(handle)  dlclose(handle)
 #define __itt_system_error()      errno
@@ -316,14 +370,13 @@ ITT_INLINE long __itt_interlocked_increment(volatile long* ptr)
 }
 #endif /* SDL_STRNCPY_S */
 
-#define __itt_fstrdup(s)          strdup(s)
 #define __itt_thread_id()         pthread_self()
 #define __itt_thread_yield()      sched_yield()
 #if ITT_ARCH==ITT_ARCH_IA64
 #ifdef __INTEL_COMPILER
 #define __TBB_machine_fetchadd4(addr, val) __fetchadd4_acq((void *)addr, val)
 #else  /* __INTEL_COMPILER */
-/* TODO: Add Support for not Intel compilers for IA-64 architecture */
+#define __TBB_machine_fetchadd4(addr, val) __sync_fetch_and_add(addr, val)
 #endif /* __INTEL_COMPILER */
 #elif ITT_ARCH==ITT_ARCH_IA32 || ITT_ARCH==ITT_ARCH_IA32E /* ITT_ARCH!=ITT_ARCH_IA64 */
 ITT_INLINE long
@@ -347,6 +400,13 @@ ITT_INLINE long __itt_interlocked_increment(volatile long* ptr)
 {
     return __TBB_machine_fetchadd4(ptr, 1) + 1L;
 }
+ITT_INLINE long
+__itt_interlocked_compare_exchange(volatile long* ptr, long exchange, long comperand) ITT_INLINE_ATTRIBUTE;
+ITT_INLINE long
+__itt_interlocked_compare_exchange(volatile long* ptr, long exchange, long comperand)
+{
+    return __sync_val_compare_and_swap(ptr, exchange, comperand);
+}
 #endif /* ITT_SIMPLE_INIT */
 
 void* dlopen(const char*, int) __attribute__((weak));
@@ -366,10 +426,20 @@ pthread_t pthread_self(void) __attribute__((weak));
 
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 
-typedef enum {
-    __itt_collection_normal = 0,
-    __itt_collection_paused = 1
-} __itt_collection_state;
+/* strdup() is not included into C99 which results in a compiler warning about
+ * implicitly declared symbol. To avoid the issue strdup is implemented
+ * manually.
+ */
+#define ITT_STRDUP_MAX_STRING_SIZE 4096
+#define __itt_fstrdup(s, new_s) do {                                        \
+    if (s != NULL) {                                                        \
+        size_t s_len = __itt_fstrnlen(s, ITT_STRDUP_MAX_STRING_SIZE);       \
+        new_s = (char *)malloc(s_len + 1);                                  \
+        if (new_s != NULL) {                                                \
+            __itt_fstrcpyn(new_s, s_len + 1, s, s_len);                     \
+        }                                                                   \
+    }                                                                       \
+} while(0)
 
 typedef enum {
     __itt_thread_normal  = 0,
@@ -435,6 +505,10 @@ typedef struct __itt_counter_info
 
 struct ___itt_domain;
 struct ___itt_string_handle;
+struct ___itt_histogram;
+struct ___itt_counter_metadata;
+
+#include "ittnotify.h"
 
 typedef struct ___itt_global
 {
@@ -456,8 +530,10 @@ typedef struct ___itt_global
     struct ___itt_domain*  domain_list;
     struct ___itt_string_handle* string_list;
     __itt_collection_state state;
-    __itt_counter_info_t* counter_list;
+    __itt_counter_info_t*  counter_list;
     unsigned int           ipt_collect_events;
+    struct ___itt_histogram* histogram_list;
+    struct ___itt_counter_metadata* counter_metadata_list;
 } __itt_global;
 
 #pragma pack(pop)
@@ -483,7 +559,9 @@ typedef struct ___itt_global
     h = (__itt_thread_info*)malloc(sizeof(__itt_thread_info)); \
     if (h != NULL) { \
         h->tid    = t; \
-        h->nameA  = n ? __itt_fstrdup(n) : NULL; \
+        char *n_copy = NULL; \
+        __itt_fstrdup(n, n_copy); \
+        h->nameA  = n_copy; \
         h->nameW  = NULL; \
         h->state  = s; \
         h->extra1 = 0;    /* reserved */ \
@@ -516,7 +594,9 @@ typedef struct ___itt_global
     h = (__itt_domain*)malloc(sizeof(__itt_domain)); \
     if (h != NULL) { \
         h->flags  = 1;    /* domain is enabled by default */ \
-        h->nameA  = name ? __itt_fstrdup(name) : NULL; \
+        char *name_copy = NULL; \
+        __itt_fstrdup(name, name_copy); \
+        h->nameA  = name_copy; \
         h->nameW  = NULL; \
         h->extra1 = 0;    /* reserved */ \
         h->extra2 = NULL; /* reserved */ \
@@ -546,7 +626,9 @@ typedef struct ___itt_global
 #define NEW_STRING_HANDLE_A(gptr,h,h_tail,name) { \
     h = (__itt_string_handle*)malloc(sizeof(__itt_string_handle)); \
     if (h != NULL) { \
-        h->strA   = name ? __itt_fstrdup(name) : NULL; \
+        char *name_copy = NULL; \
+        __itt_fstrdup(name, name_copy); \
+        h->strA  = name_copy; \
         h->strW   = NULL; \
         h->extra1 = 0;    /* reserved */ \
         h->extra2 = NULL; /* reserved */ \
@@ -564,7 +646,7 @@ typedef struct ___itt_global
         h->nameA   = NULL; \
         h->nameW   = name ? _wcsdup(name) : NULL; \
         h->domainA   = NULL; \
-        h->domainW   = name ? _wcsdup(domain) : NULL; \
+        h->domainW   = domain ? _wcsdup(domain) : NULL; \
         h->type = type; \
         h->index = 0; \
         h->next   = NULL; \
@@ -578,9 +660,13 @@ typedef struct ___itt_global
 #define NEW_COUNTER_A(gptr,h,h_tail,name,domain,type) { \
     h = (__itt_counter_info_t*)malloc(sizeof(__itt_counter_info_t)); \
     if (h != NULL) { \
-        h->nameA   = name ? __itt_fstrdup(name) : NULL; \
+        char *name_copy = NULL; \
+        __itt_fstrdup(name, name_copy); \
+        h->nameA  = name_copy; \
         h->nameW   = NULL; \
-        h->domainA   = domain ? __itt_fstrdup(domain) : NULL; \
+        char *domain_copy = NULL; \
+        __itt_fstrdup(domain, domain_copy); \
+        h->domainA  = domain_copy; \
         h->domainW   = NULL; \
         h->type = type; \
         h->index = 0; \
@@ -592,4 +678,98 @@ typedef struct ___itt_global
     } \
 }
 
+#define NEW_HISTOGRAM_W(gptr,h,h_tail,domain,name,x_type,y_type) { \
+    h = (__itt_histogram*)malloc(sizeof(__itt_histogram)); \
+    if (h != NULL) { \
+        h->domain = domain; \
+        h->nameA  = NULL; \
+        h->nameW  = name ? _wcsdup(name) : NULL; \
+        h->x_type = x_type; \
+        h->y_type = y_type; \
+        h->extra1 = 0; \
+        h->extra2 = NULL; \
+	h->next = NULL; \
+        if (h_tail == NULL) \
+            (gptr)->histogram_list = h; \
+        else \
+            h_tail->next = h; \
+    } \
+}
+
+#define NEW_HISTOGRAM_A(gptr,h,h_tail,domain,name,x_type,y_type) { \
+    h = (__itt_histogram*)malloc(sizeof(__itt_histogram)); \
+    if (h != NULL) { \
+        h->domain = domain; \
+        char *name_copy = NULL; \
+        __itt_fstrdup(name, name_copy); \
+        h->nameA  = name_copy; \
+        h->nameW  = NULL; \
+        h->x_type = x_type; \
+        h->y_type = y_type; \
+        h->extra1 = 0; \
+        h->extra2 = NULL; \
+	h->next = NULL; \
+        if (h_tail == NULL) \
+            (gptr)->histogram_list = h; \
+        else \
+            h_tail->next = h; \
+    } \
+}
+
+#define NEW_COUNTER_METADATA_NUM(gptr,h,h_tail,counter,type,value) { \
+    h = (__itt_counter_metadata*)malloc(sizeof(__itt_counter_metadata)); \
+    if (h != NULL) { \
+        h->counter = counter; \
+        h->type = type; \
+        h->str_valueA = NULL; \
+        h->str_valueW = NULL; \
+        h->value = value; \
+        h->extra1 = 0; \
+        h->extra2 = NULL; \
+        h->next   = NULL; \
+        if (h_tail == NULL) \
+            (gptr)->counter_metadata_list = h; \
+        else \
+            h_tail->next = h; \
+    } \
+}
+
+#define NEW_COUNTER_METADATA_STR_A(gptr,h,h_tail,counter,type,str_valueA) { \
+    h = (__itt_counter_metadata*)malloc(sizeof(__itt_counter_metadata)); \
+    if (h != NULL) { \
+        h->counter = counter; \
+        h->type = type; \
+        char *str_value_copy = NULL; \
+        __itt_fstrdup(str_valueA, str_value_copy); \
+        h->str_valueA = str_value_copy; \
+        h->str_valueW = NULL; \
+        h->value = 0; \
+        h->extra1 = 0; \
+        h->extra2 = NULL; \
+        h->next   = NULL; \
+        if (h_tail == NULL) \
+            (gptr)->counter_metadata_list = h; \
+        else \
+            h_tail->next = h; \
+    } \
+}
+
+#define NEW_COUNTER_METADATA_STR_W(gptr,h,h_tail,counter,type,str_valueW) { \
+    h = (__itt_counter_metadata*)malloc(sizeof(__itt_counter_metadata)); \
+    if (h != NULL) { \
+        h->counter = counter; \
+        h->type = type; \
+        h->str_valueA = NULL; \
+        h->str_valueW = str_valueW ? _wcsdup(str_valueW) : NULL; \
+        h->value = 0; \
+        h->extra1 = 0; \
+        h->extra2 = NULL; \
+        h->next   = NULL; \
+        if (h_tail == NULL) \
+            (gptr)->counter_metadata_list = h; \
+        else \
+            h_tail->next = h; \
+    } \
+}
+
 #endif /* _ITTNOTIFY_CONFIG_H_ */
diff --git a/external/tbb/src/tbb/tools_api/ittnotify_static.c b/external/tbb/src/tbb/tools_api/ittnotify_static.c
index 44dc8a02..c3a53bf0 100644
--- a/external/tbb/src/tbb/tools_api/ittnotify_static.c
+++ b/external/tbb/src/tbb/tools_api/ittnotify_static.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -14,13 +14,14 @@
     limitations under the License.
 */
 
+#define INTEL_NO_MACRO_BODY
+#define INTEL_ITTNOTIFY_API_PRIVATE
 #include "ittnotify_config.h"
 
 #if ITT_PLATFORM==ITT_PLATFORM_WIN
-#ifdef PATH_MAX
-#undef PATH_MAX
-#endif
+#if !defined(PATH_MAX)
 #define PATH_MAX 512
+#endif
 #else /* ITT_PLATFORM!=ITT_PLATFORM_WIN */
 #include <limits.h>
 #include <dlfcn.h>
@@ -31,8 +32,6 @@
 #include <stdarg.h>
 #include <string.h>
 
-#define INTEL_NO_MACRO_BODY 
-#define INTEL_ITTNOTIFY_API_PRIVATE
 #include "ittnotify.h"
 #include "legacy/ittnotify.h"
 
@@ -82,7 +81,7 @@ static const char api_version[] = API_VERSION "\0\n@(#) $Revision$\n";
 
 #if ITT_OS==ITT_OS_WIN
 static const char* ittnotify_lib_name = "libittnotify.dll";
-#elif ITT_OS==ITT_OS_LINUX || ITT_OS==ITT_OS_FREEBSD
+#elif ITT_OS==ITT_OS_LINUX || ITT_OS==ITT_OS_FREEBSD|| ITT_OS==ITT_OS_OPENBSD
 static const char* ittnotify_lib_name = "libittnotify.so";
 #elif ITT_OS==ITT_OS_MAC
 static const char* ittnotify_lib_name = "libittnotify.dylib";
@@ -138,7 +137,7 @@ static const char* ittnotify_lib_name = "libittnotify.dylib";
     {                                                                \
         if (!p.mutex_initialized)                                    \
         {                                                            \
-            if (__itt_interlocked_increment(&p.atomic_counter) == 1) \
+            if (__itt_interlocked_compare_exchange(&p.atomic_counter, 1, 0) == 0) \
             {                                                        \
                 __itt_mutex_init(&p.mutex);                          \
                 p.mutex_initialized = 1;                             \
@@ -151,6 +150,20 @@ static const char* ittnotify_lib_name = "libittnotify.dylib";
     }                                                                \
 }
 
+#define ITT_MUTEX_DESTROY(p) {                                       \
+    if (PTHREAD_SYMBOLS)                                             \
+    {                                                                \
+        if (p.mutex_initialized)                                     \
+        {                                                            \
+            if (__itt_interlocked_compare_exchange(&p.atomic_counter, 0, 1) == 1) \
+            {                                                        \
+                __itt_mutex_destroy(&p.mutex);                       \
+                p.mutex_initialized = 0;                             \
+            }                                                        \
+        }                                                            \
+    }                                                                \
+}
+
 #define ITT_MODULE_OBJECT_VERSION 1
 
 typedef int (__itt_init_ittlib_t)(const char*, __itt_group_id);
@@ -242,9 +255,11 @@ static __itt_group_alias group_alias[] = {
 
 #pragma pack(pop)
 
-#if ITT_PLATFORM==ITT_PLATFORM_WIN && _MSC_VER
+#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#if _MSC_VER
 #pragma warning(push)
 #pragma warning(disable: 4054) /* warning C4054: 'type cast' : from function pointer 'XXX' to data pointer 'void *' */
+#endif
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 
 static __itt_api_info api_list[] = {
@@ -265,8 +280,10 @@ static __itt_api_info api_list[] = {
     {NULL, NULL, NULL, NULL, __itt_group_none}
 };
 
-#if ITT_PLATFORM==ITT_PLATFORM_WIN && _MSC_VER
+#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#if _MSC_VER
 #pragma warning(pop)
+#endif
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 
 /* static part descriptor which handles. all notification api attributes. */
@@ -285,9 +302,11 @@ __itt_global _N_(_ittapi_global) = {
     NULL,                                          /* thread_list */
     NULL,                                          /* domain_list */
     NULL,                                          /* string_list */
-    __itt_collection_normal,                       /* collection state */
+    __itt_collection_uninitialized,                /* collection state */
     NULL,                                          /* counter_list */
-    0                                              /* ipt_collect_events */
+    0,                                             /* ipt_collect_events */
+    NULL,                                          /* histogram_list */
+    NULL                                           /* counter_metadata_list */
 };
 
 typedef void (__itt_api_init_t)(__itt_global*, __itt_group_id);
@@ -300,9 +319,11 @@ static __itt_domain dummy_domain;
 ITT_EXTERN_C void _N_(error_handler)(__itt_error_code, va_list args);
 #endif /* ITT_NOTIFY_EXT_REPORT */
 
-#if ITT_PLATFORM==ITT_PLATFORM_WIN && _MSC_VER
+#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#if _MSC_VER
 #pragma warning(push)
 #pragma warning(disable: 4055) /* warning C4055: 'type cast' : from data pointer 'void *' to function pointer 'XXX' */
+#endif
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 
 static void __itt_report_error(int code, ...)
@@ -320,8 +341,12 @@ static void __itt_report_error(int code, ...)
     va_end(args);
 }
 
-#if ITT_PLATFORM==ITT_PLATFORM_WIN && _MSC_VER
+static int __itt_is_collector_available(void);
+
+#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#if _MSC_VER
 #pragma warning(pop)
+#endif
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 
 #if ITT_PLATFORM==ITT_PLATFORM_WIN
@@ -348,13 +373,16 @@ static __itt_domain* ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(domain_createW),_init))(
             return &dummy_domain;
         }
     }
-    for (h_tail = NULL, h = _N_(_ittapi_global).domain_list; h != NULL; h_tail = h, h = h->next)
+    if (__itt_is_collector_available())
     {
-        if (h->nameW != NULL && !wcscmp(h->nameW, name)) break;
-    }
-    if (h == NULL)
-    {
-        NEW_DOMAIN_W(&_N_(_ittapi_global),h,h_tail,name);
+        for (h_tail = NULL, h = _N_(_ittapi_global).domain_list; h != NULL; h_tail = h, h = h->next)
+        {
+            if (h->nameW != NULL && !wcscmp(h->nameW, name)) break;
+        }
+        if (h == NULL)
+        {
+            NEW_DOMAIN_W(&_N_(_ittapi_global), h, h_tail, name);
+        }
     }
     if (PTHREAD_SYMBOLS) __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
     return h;
@@ -398,13 +426,16 @@ static __itt_domain* ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(domain_create),_init))(c
             return &dummy_domain;
         }
     }
-    for (h_tail = NULL, h = _N_(_ittapi_global).domain_list; h != NULL; h_tail = h, h = h->next)
-    {
-        if (h->nameA != NULL && !__itt_fstrcmp(h->nameA, name)) break;
-    }
-    if (h == NULL)
+    if (__itt_is_collector_available())
     {
-        NEW_DOMAIN_A(&_N_(_ittapi_global),h,h_tail,name);
+        for (h_tail = NULL, h = _N_(_ittapi_global).domain_list; h != NULL; h_tail = h, h = h->next)
+        {
+            if (h->nameA != NULL && !__itt_fstrcmp(h->nameA, name)) break;
+        }
+        if (h == NULL)
+        {
+            NEW_DOMAIN_A(&_N_(_ittapi_global), h, h_tail, name);
+        }
     }
     if (PTHREAD_SYMBOLS) __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
     return h;
@@ -466,13 +497,16 @@ static __itt_string_handle* ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(string_handle_cre
             return NULL;
         }
     }
-    for (h_tail = NULL, h = _N_(_ittapi_global).string_list; h != NULL; h_tail = h, h = h->next)
-    {
-        if (h->strW != NULL && !wcscmp(h->strW, name)) break;
-    }
-    if (h == NULL)
+    if (__itt_is_collector_available())
     {
-        NEW_STRING_HANDLE_W(&_N_(_ittapi_global),h,h_tail,name);
+        for (h_tail = NULL, h = _N_(_ittapi_global).string_list; h != NULL; h_tail = h, h = h->next)
+        {
+            if (h->strW != NULL && !wcscmp(h->strW, name)) break;
+        }
+        if (h == NULL)
+        {
+            NEW_STRING_HANDLE_W(&_N_(_ittapi_global), h, h_tail, name);
+        }
     }
     __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
     return h;
@@ -516,13 +550,16 @@ static __itt_string_handle* ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(string_handle_cre
             return NULL;
         }
     }
-    for (h_tail = NULL, h = _N_(_ittapi_global).string_list; h != NULL; h_tail = h, h = h->next)
+    if (__itt_is_collector_available())
     {
-        if (h->strA != NULL && !__itt_fstrcmp(h->strA, name)) break;
-    }
-    if (h == NULL)
-    {
-        NEW_STRING_HANDLE_A(&_N_(_ittapi_global),h,h_tail,name);
+        for (h_tail = NULL, h = _N_(_ittapi_global).string_list; h != NULL; h_tail = h, h = h->next)
+        {
+            if (h->strA != NULL && !__itt_fstrcmp(h->strA, name)) break;
+        }
+        if (h == NULL)
+        {
+            NEW_STRING_HANDLE_A(&_N_(_ittapi_global), h, h_tail, name);
+        }
     }
     if (PTHREAD_SYMBOLS) __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
     return h;
@@ -553,15 +590,18 @@ static __itt_counter ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(counter_createW),_init))
             return NULL;
         }
     }
-    for (h_tail = NULL, h = _N_(_ittapi_global).counter_list; h != NULL; h_tail = h, h = h->next)
+    if (__itt_is_collector_available())
     {
-        if (h->nameW != NULL  && h->type == (int)type && !wcscmp(h->nameW, name) && ((h->domainW == NULL && domain == NULL) ||
-            (h->domainW != NULL && domain != NULL && !wcscmp(h->domainW, domain)))) break;
+        for (h_tail = NULL, h = _N_(_ittapi_global).counter_list; h != NULL; h_tail = h, h = h->next)
+        {
+            if (h->nameW != NULL && h->type == (int)type && !wcscmp(h->nameW, name) && ((h->domainW == NULL && domain == NULL) ||
+                (h->domainW != NULL && domain != NULL && !wcscmp(h->domainW, domain)))) break;
 
-    }
-    if (h == NULL)
-    {
-        NEW_COUNTER_W(&_N_(_ittapi_global),h,h_tail,name,domain,type);
+        }
+        if (h == NULL)
+        {
+            NEW_COUNTER_W(&_N_(_ittapi_global), h, h_tail, name, domain, type);
+        }
     }
     __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
     return (__itt_counter)h;
@@ -606,14 +646,17 @@ static __itt_counter ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(counter_create),_init))(
             return NULL;
         }
     }
-    for (h_tail = NULL, h = _N_(_ittapi_global).counter_list; h != NULL; h_tail = h, h = h->next)
+    if (__itt_is_collector_available())
     {
-        if (h->nameA != NULL  && h->type == (int)type && !__itt_fstrcmp(h->nameA, name) && ((h->domainA == NULL && domain == NULL) ||
-            (h->domainA != NULL && domain != NULL && !__itt_fstrcmp(h->domainA, domain)))) break;
-    }
-    if (h == NULL)
-    {
-       NEW_COUNTER_A(&_N_(_ittapi_global),h,h_tail,name,domain,type);
+        for (h_tail = NULL, h = _N_(_ittapi_global).counter_list; h != NULL; h_tail = h, h = h->next)
+        {
+            if (h->nameA != NULL && h->type == (int)type && !__itt_fstrcmp(h->nameA, name) && ((h->domainA == NULL && domain == NULL) ||
+                (h->domainA != NULL && domain != NULL && !__itt_fstrcmp(h->domainA, domain)))) break;
+        }
+        if (h == NULL)
+        {
+            NEW_COUNTER_A(&_N_(_ittapi_global), h, h_tail, name, domain, type);
+        }
     }
     if (PTHREAD_SYMBOLS) __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
     return (__itt_counter)h;
@@ -643,15 +686,18 @@ static __itt_counter ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(counter_create_typedW),_
             return NULL;
         }
     }
-    for (h_tail = NULL, h = _N_(_ittapi_global).counter_list; h != NULL; h_tail = h, h = h->next)
+    if (__itt_is_collector_available())
     {
-        if (h->nameW != NULL  && h->type == (int)type && !wcscmp(h->nameW, name) && ((h->domainW == NULL && domain == NULL) ||
-            (h->domainW != NULL && domain != NULL && !wcscmp(h->domainW, domain)))) break;
+        for (h_tail = NULL, h = _N_(_ittapi_global).counter_list; h != NULL; h_tail = h, h = h->next)
+        {
+            if (h->nameW != NULL && h->type == (int)type && !wcscmp(h->nameW, name) && ((h->domainW == NULL && domain == NULL) ||
+                (h->domainW != NULL && domain != NULL && !wcscmp(h->domainW, domain)))) break;
 
-    }
-    if (h == NULL)
-    {
-        NEW_COUNTER_W(&_N_(_ittapi_global),h,h_tail,name,domain,type);
+        }
+        if (h == NULL)
+        {
+            NEW_COUNTER_W(&_N_(_ittapi_global), h, h_tail, name, domain, type);
+        }
     }
     __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
     return (__itt_counter)h;
@@ -695,19 +741,279 @@ static __itt_counter ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(counter_create_typed),_i
             return NULL;
         }
     }
-    for (h_tail = NULL, h = _N_(_ittapi_global).counter_list; h != NULL; h_tail = h, h = h->next)
+    if (__itt_is_collector_available())
+    {
+        for (h_tail = NULL, h = _N_(_ittapi_global).counter_list; h != NULL; h_tail = h, h = h->next)
+        {
+            if (h->nameA != NULL && h->type == (int)type && !__itt_fstrcmp(h->nameA, name) && ((h->domainA == NULL && domain == NULL) ||
+                (h->domainA != NULL && domain != NULL && !__itt_fstrcmp(h->domainA, domain)))) break;
+        }
+        if (h == NULL)
+        {
+            NEW_COUNTER_A(&_N_(_ittapi_global), h, h_tail, name, domain, type);
+        }
+    }
+    if (PTHREAD_SYMBOLS) __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
+    return (__itt_counter)h;
+}
+
+#if ITT_PLATFORM==ITT_PLATFORM_WIN
+static __itt_histogram* ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(histogram_createW),_init))(const __itt_domain* domain, const wchar_t* name, __itt_metadata_type x_type, __itt_metadata_type y_type)
+{
+    __itt_histogram *h_tail = NULL, *h = NULL;
+
+    if (domain == NULL || name == NULL)
+    {
+        return NULL;
+    }
+
+    ITT_MUTEX_INIT_AND_LOCK(_N_(_ittapi_global));
+    if (_N_(_ittapi_global).api_initialized)
+    {
+        if (ITTNOTIFY_NAME(histogram_createW) && ITTNOTIFY_NAME(histogram_createW) != ITT_VERSIONIZE(ITT_JOIN(_N_(histogram_createW),_init)))
+        {
+            __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
+            return ITTNOTIFY_NAME(histogram_createW)(domain, name, x_type, y_type);
+        }
+        else
+        {
+            __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
+            return NULL;
+        }
+    }
+    if (__itt_is_collector_available())
+    {
+        for (h_tail = NULL, h = _N_(_ittapi_global).histogram_list; h != NULL; h_tail = h, h = h->next)
+        {
+            if (h->domain == NULL) continue;
+            else if (h->domain == domain && h->nameW != NULL && !wcscmp(h->nameW, name)) break;
+        }
+        if (h == NULL)
+        {
+            NEW_HISTOGRAM_W(&_N_(_ittapi_global), h, h_tail, domain, name, x_type, y_type);
+        }
+    }
+    __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
+    return (__itt_histogram*)h;
+}
+
+static __itt_histogram* ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(histogram_createA),_init))(const __itt_domain* domain, const char* name, __itt_metadata_type x_type, __itt_metadata_type y_type)
+#else  /* ITT_PLATFORM!=ITT_PLATFORM_WIN */
+static __itt_histogram* ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(histogram_create),_init))(const __itt_domain* domain, const char* name, __itt_metadata_type x_type, __itt_metadata_type y_type)
+#endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+{
+    __itt_histogram *h_tail = NULL, *h = NULL;
+
+    if (domain == NULL || name == NULL)
+    {
+        return NULL;
+    }
+
+    ITT_MUTEX_INIT_AND_LOCK(_N_(_ittapi_global));
+    if (_N_(_ittapi_global).api_initialized)
+    {
+#if ITT_PLATFORM==ITT_PLATFORM_WIN
+        if (ITTNOTIFY_NAME(histogram_createA) && ITTNOTIFY_NAME(histogram_createA) != ITT_VERSIONIZE(ITT_JOIN(_N_(histogram_createA),_init)))
+        {
+            __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
+            return ITTNOTIFY_NAME(histogram_createA)(domain, name, x_type, y_type);
+        }
+#else
+        if (ITTNOTIFY_NAME(histogram_create) && ITTNOTIFY_NAME(histogram_create) != ITT_VERSIONIZE(ITT_JOIN(_N_(histogram_create),_init)))
+        {
+            if (PTHREAD_SYMBOLS) __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
+            return ITTNOTIFY_NAME(histogram_create)(domain, name, x_type, y_type);
+        }
+#endif
+        else
+        {
+#if ITT_PLATFORM==ITT_PLATFORM_WIN
+            __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
+#else
+            if (PTHREAD_SYMBOLS) __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
+#endif
+            return NULL;
+        }
+    }
+    if (__itt_is_collector_available())
+    {
+        for (h_tail = NULL, h = _N_(_ittapi_global).histogram_list; h != NULL; h_tail = h, h = h->next)
+        {
+            if (h->domain == NULL) continue;
+            else if (h->domain == domain && h->nameA != NULL && !__itt_fstrcmp(h->nameA, name)) break;
+        }
+        if (h == NULL)
+        {
+            NEW_HISTOGRAM_A(&_N_(_ittapi_global), h, h_tail, domain, name, x_type, y_type);
+        }
+    }
+    if (PTHREAD_SYMBOLS) __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
+    return (__itt_histogram*)h;
+}
+
+#if ITT_PLATFORM==ITT_PLATFORM_WIN
+static __itt_counter ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(counter_createW_v3),_init))(const __itt_domain* domain, const wchar_t* name, __itt_metadata_type type)
+{
+    __itt_counter_info_t *h_tail = NULL, *h = NULL;
+
+    if (name == NULL || domain == NULL)
+    {
+        return NULL;
+    }
+
+    ITT_MUTEX_INIT_AND_LOCK(_N_(_ittapi_global));
+    if (_N_(_ittapi_global).api_initialized)
+    {
+        if (ITTNOTIFY_NAME(counter_createW_v3) && ITTNOTIFY_NAME(counter_createW_v3) != ITT_VERSIONIZE(ITT_JOIN(_N_(counter_createW_v3),_init)))
+        {
+            __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
+            return ITTNOTIFY_NAME(counter_createW_v3)(domain, name, type);
+        }
+        else
+        {
+            __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
+            return NULL;
+        }
+    }
+    if (__itt_is_collector_available())
+    {
+        for (h_tail = NULL, h = _N_(_ittapi_global).counter_list; h != NULL; h_tail = h, h = h->next)
+        {
+            if (h->nameW != NULL  && h->type == (int)type && !wcscmp(h->nameW, name) && ((h->domainW == NULL && domain->nameW == NULL) ||
+                (h->domainW != NULL && domain->nameW != NULL && !wcscmp(h->domainW, domain->nameW)))) break;
+
+        }
+        if (h == NULL)
+        {
+            NEW_COUNTER_W(&_N_(_ittapi_global),h,h_tail,name,domain->nameW,type);
+        }
+    }
+    __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
+    return (__itt_counter)h;
+}
+
+static __itt_counter ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(counter_createA_v3),_init))(const __itt_domain* domain, const char* name, __itt_metadata_type type)
+#else  /* ITT_PLATFORM!=ITT_PLATFORM_WIN */
+static __itt_counter ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(counter_create_v3),_init))(const __itt_domain* domain, const char* name, __itt_metadata_type type)
+#endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+{
+    __itt_counter_info_t *h_tail = NULL, *h = NULL;
+
+    if (name == NULL || domain == NULL)
+    {
+        return NULL;
+    }
+
+    ITT_MUTEX_INIT_AND_LOCK(_N_(_ittapi_global));
+    if (_N_(_ittapi_global).api_initialized)
     {
-        if (h->nameA != NULL  && h->type == (int)type && !__itt_fstrcmp(h->nameA, name) && ((h->domainA == NULL && domain == NULL) ||
-            (h->domainA != NULL && domain != NULL && !__itt_fstrcmp(h->domainA, domain)))) break;
+#if ITT_PLATFORM==ITT_PLATFORM_WIN
+        if (ITTNOTIFY_NAME(counter_createA_v3) && ITTNOTIFY_NAME(counter_createA_v3) != ITT_VERSIONIZE(ITT_JOIN(_N_(counter_createA_v3),_init)))
+        {
+            __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
+            return ITTNOTIFY_NAME(counter_createA_v3)(domain, name, type);
+        }
+#else
+        if (ITTNOTIFY_NAME(counter_create_v3) && ITTNOTIFY_NAME(counter_create_v3) != ITT_VERSIONIZE(ITT_JOIN(_N_(counter_create_v3),_init)))
+        {
+            if (PTHREAD_SYMBOLS) __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
+            return ITTNOTIFY_NAME(counter_create_v3)(domain, name, type);
+        }
+#endif
+        else
+        {
+#if ITT_PLATFORM==ITT_PLATFORM_WIN
+            __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
+#else
+            if (PTHREAD_SYMBOLS) __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
+#endif
+            return NULL;
+        }
     }
-    if (h == NULL)
+    if (__itt_is_collector_available())
     {
-       NEW_COUNTER_A(&_N_(_ittapi_global),h,h_tail,name,domain,type);
+        for (h_tail = NULL, h = _N_(_ittapi_global).counter_list; h != NULL; h_tail = h, h = h->next)
+        {
+            if (h->nameA != NULL  && h->type == (int)type && !__itt_fstrcmp(h->nameA, name) && ((h->domainA == NULL && domain->nameA == NULL) ||
+                (h->domainA != NULL && domain->nameA != NULL && !__itt_fstrcmp(h->domainA, domain->nameA)))) break;
+        }
+        if (h == NULL)
+        {
+            NEW_COUNTER_A(&_N_(_ittapi_global),h,h_tail,name,domain->nameA,type);
+        }
     }
     if (PTHREAD_SYMBOLS) __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
     return (__itt_counter)h;
 }
 
+static void ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(bind_context_metadata_to_counter),_init))(__itt_counter counter, size_t length, __itt_context_metadata* metadata)
+{
+    __itt_counter_metadata *h_tail = NULL, *h = NULL;
+
+    if (counter == NULL || length == 0 || metadata == NULL)
+    {
+        return;
+    }
+
+    ITT_MUTEX_INIT_AND_LOCK(_N_(_ittapi_global));
+    if (_N_(_ittapi_global).api_initialized)
+    {
+        if (ITTNOTIFY_NAME(bind_context_metadata_to_counter) && ITTNOTIFY_NAME(bind_context_metadata_to_counter) != ITT_VERSIONIZE(ITT_JOIN(_N_(bind_context_metadata_to_counter),_init)))
+        {
+            if (PTHREAD_SYMBOLS) __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
+            ITTNOTIFY_NAME(bind_context_metadata_to_counter)(counter, length, metadata);
+        }
+        else
+        {
+#if ITT_PLATFORM==ITT_PLATFORM_WIN
+            __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
+#else
+            if (PTHREAD_SYMBOLS) __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
+#endif
+            return;
+        }
+    }
+    if (__itt_is_collector_available())
+    {
+        size_t item;
+        char* str_valueA = NULL;
+#if ITT_PLATFORM==ITT_PLATFORM_WIN
+        wchar_t* str_valueW = NULL;
+#endif
+        unsigned long long value = 0;
+        __itt_context_type type = __itt_context_unknown;
+
+        for (item = 0; item < length; item++)
+        {
+            type = metadata[item].type;
+            for (h_tail = NULL, h = _N_(_ittapi_global).counter_metadata_list; h != NULL; h_tail = h, h = h->next)
+            {
+                if (h->counter != NULL && h->counter == counter && h->type == type) break;
+            }
+            if (h == NULL && counter != NULL && type != __itt_context_unknown)
+            {
+                if (type == __itt_context_nameA || type == __itt_context_deviceA || type == __itt_context_unitsA || type == __itt_context_pci_addrA)
+                {
+                    str_valueA = (char*)(metadata[item].value);
+                    NEW_COUNTER_METADATA_STR_A(&_N_(_ittapi_global),h,h_tail,counter,type,str_valueA);
+                }
+#if ITT_PLATFORM==ITT_PLATFORM_WIN
+                else if (type == __itt_context_nameW || type == __itt_context_deviceW || type == __itt_context_unitsW || type == __itt_context_pci_addrW)
+                {
+                    str_valueW = (wchar_t*)(metadata[item].value);
+                    NEW_COUNTER_METADATA_STR_W(&_N_(_ittapi_global),h,h_tail,counter,type,str_valueW);
+                }
+#endif
+                else if (type >= __itt_context_tid && type <= __itt_context_cpu_cycles_flag)
+                {
+                    value = *(unsigned long long*)(metadata[item].value);
+                    NEW_COUNTER_METADATA_NUM(&_N_(_ittapi_global),h,h_tail,counter,type,value);
+                }
+            }
+        }
+    }
+    if (PTHREAD_SYMBOLS) __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
+}
 /* -------------------------------------------------------------------------- */
 
 static void ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(pause),_init))(void)
@@ -720,10 +1026,6 @@ static void ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(pause),_init))(void)
     {
         ITTNOTIFY_NAME(pause)();
     }
-    else
-    {
-        _N_(_ittapi_global).state = __itt_collection_paused;
-    }
 }
 
 static void ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(resume),_init))(void)
@@ -736,9 +1038,29 @@ static void ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(resume),_init))(void)
     {
         ITTNOTIFY_NAME(resume)();
     }
-    else
+}
+
+static void ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(pause_scoped),_init))(__itt_collection_scope scope)
+{
+    if (!_N_(_ittapi_global).api_initialized && _N_(_ittapi_global).thread_list == NULL)
+    {
+        __itt_init_ittlib_name(NULL, __itt_group_all);
+    }
+    if (ITTNOTIFY_NAME(pause_scoped) && ITTNOTIFY_NAME(pause_scoped) != ITT_VERSIONIZE(ITT_JOIN(_N_(pause_scoped),_init)))
+    {
+        ITTNOTIFY_NAME(pause_scoped)(scope);
+    }
+}
+
+static void ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(resume_scoped),_init))(__itt_collection_scope scope)
+{
+    if (!_N_(_ittapi_global).api_initialized && _N_(_ittapi_global).thread_list == NULL)
+    {
+        __itt_init_ittlib_name(NULL, __itt_group_all);
+    }
+    if (ITTNOTIFY_NAME(resume_scoped) && ITTNOTIFY_NAME(resume_scoped) != ITT_VERSIONIZE(ITT_JOIN(_N_(resume_scoped),_init)))
     {
-        _N_(_ittapi_global).state = __itt_collection_normal;
+        ITTNOTIFY_NAME(resume_scoped)(scope);
     }
 }
 
@@ -1143,10 +1465,27 @@ static void __itt_nullify_all_pointers(void)
         *_N_(_ittapi_global).api_list_ptr[i].func_ptr = _N_(_ittapi_global).api_list_ptr[i].null_func;
 }
 
-#if ITT_PLATFORM==ITT_PLATFORM_WIN && _MSC_VER
+static int __itt_is_collector_available(void)
+{
+    int is_available;
+
+    ITT_MUTEX_INIT_AND_LOCK(_N_(_ittapi_global));
+    if (_N_(_ittapi_global).state == __itt_collection_uninitialized)
+    {
+        _N_(_ittapi_global).state = (NULL == __itt_get_lib_name()) ? __itt_collection_collector_absent : __itt_collection_collector_exists;
+    }
+    is_available = (_N_(_ittapi_global).state == __itt_collection_collector_exists ||
+        _N_(_ittapi_global).state == __itt_collection_init_successful);
+    __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
+    return is_available;
+}
+
+#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#if _MSC_VER
 #pragma warning(push)
 #pragma warning(disable: 4054) /* warning C4054: 'type cast' : from function pointer 'XXX' to data pointer 'void *' */
 #pragma warning(disable: 4055) /* warning C4055: 'type cast' : from data pointer 'void *' to function pointer 'XXX' */
+#endif
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 
 ITT_EXTERN_C void _N_(fini_ittlib)(void)
@@ -1186,6 +1525,78 @@ ITT_EXTERN_C void _N_(fini_ittlib)(void)
     }
 }
 
+/* !!! this function should be called under mutex lock !!! */
+static void __itt_free_allocated_resources(void)
+{
+    __itt_string_handle* current_string = _N_(_ittapi_global).string_list;
+    while (current_string != NULL)
+    {
+        __itt_string_handle* tmp = current_string->next;
+        free((char*)current_string->strA);
+#if ITT_PLATFORM==ITT_PLATFORM_WIN
+        free((wchar_t*)current_string->strW);
+#endif
+        free(current_string);
+        current_string = tmp;
+    }
+    _N_(_ittapi_global).string_list = NULL;
+
+    __itt_domain* current_domain = _N_(_ittapi_global).domain_list;
+    while (current_domain != NULL)
+    {
+        __itt_domain* tmp = current_domain->next;
+        free((char*)current_domain->nameA);
+#if ITT_PLATFORM==ITT_PLATFORM_WIN
+        free((wchar_t*)current_domain->nameW);
+#endif
+        free(current_domain);
+        current_domain = tmp;
+    }
+    _N_(_ittapi_global).domain_list = NULL;
+
+    __itt_counter_info_t* current_couter = _N_(_ittapi_global).counter_list;
+    while (current_couter != NULL)
+    {
+        __itt_counter_info_t* tmp = current_couter->next;
+        free((char*)current_couter->nameA);
+        free((char*)current_couter->domainA);
+#if ITT_PLATFORM==ITT_PLATFORM_WIN
+        free((wchar_t*)current_couter->nameW);
+        free((wchar_t*)current_couter->domainW);
+#endif
+        free(current_couter);
+        current_couter = tmp;
+    }
+    _N_(_ittapi_global).counter_list = NULL;
+
+    __itt_histogram* current_histogram = _N_(_ittapi_global).histogram_list;
+    while (current_histogram != NULL)
+    {
+        __itt_histogram* tmp = current_histogram->next;
+        free((char*)current_histogram->nameA);
+#if ITT_PLATFORM==ITT_PLATFORM_WIN
+        free((wchar_t*)current_histogram->nameW);
+#endif
+        free(current_histogram);
+        current_histogram = tmp;
+    }
+    _N_(_ittapi_global).histogram_list = NULL;
+
+    
+    __itt_counter_metadata* current_counter_metadata = _N_(_ittapi_global).counter_metadata_list;
+    while (current_counter_metadata != NULL)
+    {
+        __itt_counter_metadata* tmp = current_counter_metadata->next;
+        free((char*)current_counter_metadata->str_valueA);
+#if ITT_PLATFORM==ITT_PLATFORM_WIN
+        free((wchar_t*)current_counter_metadata->str_valueW);
+#endif
+        free(current_counter_metadata);
+        current_counter_metadata = tmp;
+    }
+    _N_(_ittapi_global).counter_metadata_list = NULL;
+}
+
 ITT_EXTERN_C int _N_(init_ittlib)(const char* lib_name, __itt_group_id init_groups)
 {
     int i;
@@ -1217,6 +1628,7 @@ ITT_EXTERN_C int _N_(init_ittlib)(const char* lib_name, __itt_group_id init_grou
 
                     if (_N_(_ittapi_global).lib != NULL)
                     {
+                        _N_(_ittapi_global).state = __itt_collection_init_successful;
                         __itt_api_init_t* __itt_api_init_ptr;
                         int lib_version = __itt_lib_version(_N_(_ittapi_global).lib);
 
@@ -1277,6 +1689,8 @@ ITT_EXTERN_C int _N_(init_ittlib)(const char* lib_name, __itt_group_id init_grou
                     }
                     else
                     {
+                        _N_(_ittapi_global).state = __itt_collection_init_fail;
+                        __itt_free_allocated_resources();
                         __itt_nullify_all_pointers();
 
                         __itt_report_error(__itt_error_no_module, lib_name,
@@ -1290,6 +1704,7 @@ ITT_EXTERN_C int _N_(init_ittlib)(const char* lib_name, __itt_group_id init_grou
                 }
                 else
                 {
+                    _N_(_ittapi_global).state = __itt_collection_collector_absent;
                     __itt_nullify_all_pointers();
                 }
                 _N_(_ittapi_global).api_initialized = 1;
@@ -1323,8 +1738,10 @@ ITT_EXTERN_C __itt_error_handler_t* _N_(set_error_handler)(__itt_error_handler_t
     return prev;
 }
 
-#if ITT_PLATFORM==ITT_PLATFORM_WIN && _MSC_VER
+#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#if _MSC_VER
 #pragma warning(pop)
+#endif
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 
 /** __itt_mark_pt_region functions marks region of interest
@@ -1367,3 +1784,24 @@ ITT_EXTERN_C void _N_(mark_pt_region_end)(__itt_pt_region region)
      (void)region;
 #endif
 }
+
+ITT_EXTERN_C __itt_collection_state (_N_(get_collection_state))(void)
+{
+    if (!_N_(_ittapi_global).api_initialized && _N_(_ittapi_global).thread_list == NULL)
+    {
+        __itt_init_ittlib_name(NULL, __itt_group_all);
+    }
+    return _N_(_ittapi_global).state;
+}
+
+/* !!! should be called from the library destructor !!!
+ * this function destroys the mutex and frees resources
+ * allocated by ITT API static part
+ */
+ITT_EXTERN_C void (_N_(release_resources))(void)
+{
+    ITT_MUTEX_INIT_AND_LOCK(_N_(_ittapi_global));
+    __itt_free_allocated_resources();
+    if (PTHREAD_SYMBOLS) __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
+    ITT_MUTEX_DESTROY(_N_(_ittapi_global));
+}
diff --git a/external/tbb/src/tbb/tools_api/ittnotify_static.h b/external/tbb/src/tbb/tools_api/ittnotify_static.h
index 0aab7c87..7f572914 100644
--- a/external/tbb/src/tbb/tools_api/ittnotify_static.h
+++ b/external/tbb/src/tbb/tools_api/ittnotify_static.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2023 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -66,6 +66,8 @@ ITT_STUB(ITTAPI, __itt_counter, counter_create_typed,  (const char    *name, con
 
 ITT_STUBV(ITTAPI, void, pause,  (void), (ITT_NO_PARAMS), pause,  __itt_group_control | __itt_group_legacy, "no args")
 ITT_STUBV(ITTAPI, void, resume, (void), (ITT_NO_PARAMS), resume, __itt_group_control | __itt_group_legacy, "no args")
+ITT_STUBV(ITTAPI, void, pause_scoped,  (__itt_collection_scope scope), (ITT_FORMAT scope), pause_scoped,  __itt_group_control, "%d")
+ITT_STUBV(ITTAPI, void, resume_scoped, (__itt_collection_scope scope), (ITT_FORMAT scope), resume_scoped, __itt_group_control, "%d")
 
 #if ITT_PLATFORM==ITT_PLATFORM_WIN
 ITT_STUBV(ITTAPI, void, thread_set_nameA, (const char    *name), (ITT_FORMAT name), thread_set_nameA, __itt_group_thread, "\"%s\"")
@@ -82,6 +84,23 @@ ITT_STUB(LIBITTAPI, int,  thr_name_setW, (const wchar_t *name, int namelen), (IT
 ITT_STUB(LIBITTAPI, int,  thr_name_set,  (const char    *name, int namelen), (ITT_FORMAT name, namelen), thr_name_set,  __itt_group_thread | __itt_group_legacy, "\"%s\", %d")
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 ITT_STUBV(LIBITTAPI, void, thr_ignore,   (void),                             (ITT_NO_PARAMS),            thr_ignore,    __itt_group_thread | __itt_group_legacy, "no args")
+
+#if ITT_PLATFORM==ITT_PLATFORM_WIN
+ITT_STUB(ITTAPI, __itt_histogram*, histogram_createA, (const __itt_domain* domain, const char* name, __itt_metadata_type x_type, __itt_metadata_type y_type), (ITT_FORMAT domain, name, x_type, y_type), histogram_createA, __itt_group_structure, "%p, \"%s\", %d, %d")
+ITT_STUB(ITTAPI, __itt_histogram*, histogram_createW, (const __itt_domain* domain, const wchar_t* name, __itt_metadata_type x_type, __itt_metadata_type y_type), (ITT_FORMAT domain, name, x_type, y_type), histogram_createW, __itt_group_structure, "%p, \"%s\", %d, %d")
+#else  /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+ITT_STUB(ITTAPI, __itt_histogram*, histogram_create, (const __itt_domain* domain, const char* name, __itt_metadata_type x_type, __itt_metadata_type y_type), (ITT_FORMAT domain, name, x_type, y_type), histogram_create, __itt_group_structure, "%p, \"%s\", %d, %d")
+#endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+
+  #if ITT_PLATFORM==ITT_PLATFORM_WIN
+ITT_STUB(ITTAPI, __itt_counter, counter_createA_v3, (const __itt_domain* domain, const char    *name, __itt_metadata_type type), (ITT_FORMAT domain, name, type), counter_createA_v3, __itt_group_counter, "%p, \"%s\", %d")
+ITT_STUB(ITTAPI, __itt_counter, counter_createW_v3, (const __itt_domain* domain, const wchar_t *name, __itt_metadata_type type), (ITT_FORMAT domain, name, type), counter_createW_v3, __itt_group_counter, "%p, \"%s\", %d")
+#else  /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+ITT_STUB(ITTAPI, __itt_counter, counter_create_v3,  (const __itt_domain* domain, const char    *name, __itt_metadata_type type), (ITT_FORMAT domain, name, type), counter_create_v3,  __itt_group_counter, "%p, \"%s\", %d")
+#endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+
+ITT_STUBV(ITTAPI, void, bind_context_metadata_to_counter, (__itt_counter counter, size_t length, __itt_context_metadata* metadata), (ITT_FORMAT counter, length, metadata), bind_context_metadata_to_counter, __itt_group_structure, "%p, %lu, %p")
+  
 #endif /* __ITT_INTERNAL_BODY */
 
 ITT_STUBV(ITTAPI, void, enable_attach, (void), (ITT_NO_PARAMS), enable_attach, __itt_group_all, "no args")
@@ -352,5 +371,8 @@ ITT_STUBV(ITTAPI, void, module_load, (void *start_addr, void *end_addr, const ch
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 ITT_STUBV(ITTAPI, void, module_unload, (void *start_addr), (ITT_FORMAT start_addr), module_unload, __itt_group_module, "%p")
 
+ITT_STUBV(ITTAPI, void, histogram_submit, (__itt_histogram* histogram, size_t length, void* x_data, void* y_data), (ITT_FORMAT histogram, length, x_data, y_data), histogram_submit, __itt_group_structure, "%p, %lu, %p, %p")
 
+ITT_STUBV(ITTAPI, void, counter_set_value_v3, (__itt_counter counter, void *value_ptr), (ITT_FORMAT counter, value_ptr), counter_set_value_v3, __itt_group_counter, "%p, %p")
+  
 #endif /* __ITT_INTERNAL_INIT */
diff --git a/external/tbb/src/tbb/tools_api/ittnotify_types.h b/external/tbb/src/tbb/tools_api/ittnotify_types.h
index 7693c46f..1c0fded4 100644
--- a/external/tbb/src/tbb/tools_api/ittnotify_types.h
+++ b/external/tbb/src/tbb/tools_api/ittnotify_types.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/external/tbb/src/tbb/tools_api/legacy/ittnotify.h b/external/tbb/src/tbb/tools_api/legacy/ittnotify.h
index 3d3561ec..837bc480 100644
--- a/external/tbb/src/tbb/tools_api/legacy/ittnotify.h
+++ b/external/tbb/src/tbb/tools_api/legacy/ittnotify.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -39,6 +39,10 @@
 #  define ITT_OS_FREEBSD   4
 #endif /* ITT_OS_FREEBSD */
 
+#ifndef ITT_OS_OPENBSD
+#  define ITT_OS_OPENBSD   5
+#endif /* ITT_OS_OPENBSD */
+
 #ifndef ITT_OS
 #  if defined WIN32 || defined _WIN32
 #    define ITT_OS ITT_OS_WIN
@@ -46,6 +50,8 @@
 #    define ITT_OS ITT_OS_MAC
 #  elif defined( __FreeBSD__ )
 #    define ITT_OS ITT_OS_FREEBSD
+#  elif defined( __OpenBSD__ )
+#    define ITT_OS ITT_OS_OPENBSD
 #  else
 #    define ITT_OS ITT_OS_LINUX
 #  endif
@@ -67,6 +73,10 @@
 #  define ITT_PLATFORM_FREEBSD 4
 #endif /* ITT_PLATFORM_FREEBSD */
 
+#ifndef ITT_PLATFORM_OPENBSD
+#  define ITT_PLATFORM_OPENBSD 5
+#endif /* ITT_PLATFORM_OPENBSD */
+
 #ifndef ITT_PLATFORM
 #  if ITT_OS==ITT_OS_WIN
 #    define ITT_PLATFORM ITT_PLATFORM_WIN
@@ -74,6 +84,8 @@
 #    define ITT_PLATFORM ITT_PLATFORM_MAC
 #  elif ITT_OS==ITT_OS_FREEBSD
 #    define ITT_PLATFORM ITT_PLATFORM_FREEBSD
+#  elif ITT_OS==ITT_OS_OPENBSD
+#    define ITT_PLATFORM ITT_PLATFORM_OPENBSD
 #  else
 #    define ITT_PLATFORM ITT_PLATFORM_POSIX
 #  endif
@@ -126,7 +138,12 @@
 
 #if ITT_PLATFORM==ITT_PLATFORM_WIN
 /* use __forceinline (VC++ specific) */
+#if defined(__MINGW32__) && !defined(__cplusplus)
+#define ITT_INLINE           static __inline__ __attribute__((__always_inline__,__gnu_inline__))
+#else
 #define ITT_INLINE           static __forceinline
+#endif /* __MINGW32__ */
+
 #define ITT_INLINE_ATTRIBUTE /* nothing */
 #else  /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 /*
@@ -178,20 +195,20 @@
 #define ITTNOTIFY_VOID(n) (!ITTNOTIFY_NAME(n)) ? (void)0 : ITTNOTIFY_NAME(n)
 #define ITTNOTIFY_DATA(n) (!ITTNOTIFY_NAME(n)) ?       0 : ITTNOTIFY_NAME(n)
 
-#define ITTNOTIFY_VOID_D0(n,d)       (!(d)->flags) ? (void)0 : (!ITTNOTIFY_NAME(n)) ? (void)0 : ITTNOTIFY_NAME(n)(d)
-#define ITTNOTIFY_VOID_D1(n,d,x)     (!(d)->flags) ? (void)0 : (!ITTNOTIFY_NAME(n)) ? (void)0 : ITTNOTIFY_NAME(n)(d,x)
-#define ITTNOTIFY_VOID_D2(n,d,x,y)   (!(d)->flags) ? (void)0 : (!ITTNOTIFY_NAME(n)) ? (void)0 : ITTNOTIFY_NAME(n)(d,x,y)
-#define ITTNOTIFY_VOID_D3(n,d,x,y,z) (!(d)->flags) ? (void)0 : (!ITTNOTIFY_NAME(n)) ? (void)0 : ITTNOTIFY_NAME(n)(d,x,y,z)
-#define ITTNOTIFY_VOID_D4(n,d,x,y,z,a)     (!(d)->flags) ? (void)0 : (!ITTNOTIFY_NAME(n)) ? (void)0 : ITTNOTIFY_NAME(n)(d,x,y,z,a)
-#define ITTNOTIFY_VOID_D5(n,d,x,y,z,a,b)   (!(d)->flags) ? (void)0 : (!ITTNOTIFY_NAME(n)) ? (void)0 : ITTNOTIFY_NAME(n)(d,x,y,z,a,b)
-#define ITTNOTIFY_VOID_D6(n,d,x,y,z,a,b,c) (!(d)->flags) ? (void)0 : (!ITTNOTIFY_NAME(n)) ? (void)0 : ITTNOTIFY_NAME(n)(d,x,y,z,a,b,c)
-#define ITTNOTIFY_DATA_D0(n,d)       (!(d)->flags) ?       0 : (!ITTNOTIFY_NAME(n)) ?       0 : ITTNOTIFY_NAME(n)(d)
-#define ITTNOTIFY_DATA_D1(n,d,x)     (!(d)->flags) ?       0 : (!ITTNOTIFY_NAME(n)) ?       0 : ITTNOTIFY_NAME(n)(d,x)
-#define ITTNOTIFY_DATA_D2(n,d,x,y)   (!(d)->flags) ?       0 : (!ITTNOTIFY_NAME(n)) ?       0 : ITTNOTIFY_NAME(n)(d,x,y)
-#define ITTNOTIFY_DATA_D3(n,d,x,y,z) (!(d)->flags) ?       0 : (!ITTNOTIFY_NAME(n)) ?       0 : ITTNOTIFY_NAME(n)(d,x,y,z)
-#define ITTNOTIFY_DATA_D4(n,d,x,y,z,a)     (!(d)->flags) ? 0 : (!ITTNOTIFY_NAME(n)) ?       0 : ITTNOTIFY_NAME(n)(d,x,y,z,a)
-#define ITTNOTIFY_DATA_D5(n,d,x,y,z,a,b)   (!(d)->flags) ? 0 : (!ITTNOTIFY_NAME(n)) ?       0 : ITTNOTIFY_NAME(n)(d,x,y,z,a,b)
-#define ITTNOTIFY_DATA_D6(n,d,x,y,z,a,b,c) (!(d)->flags) ? 0 : (!ITTNOTIFY_NAME(n)) ?       0 : ITTNOTIFY_NAME(n)(d,x,y,z,a,b,c)
+#define ITTNOTIFY_VOID_D0(n,d)       (d == NULL) ? (void)0 : (!(d)->flags) ? (void)0 : (!ITTNOTIFY_NAME(n)) ? (void)0 : ITTNOTIFY_NAME(n)(d)
+#define ITTNOTIFY_VOID_D1(n,d,x)     (d == NULL) ? (void)0 : (!(d)->flags) ? (void)0 : (!ITTNOTIFY_NAME(n)) ? (void)0 : ITTNOTIFY_NAME(n)(d,x)
+#define ITTNOTIFY_VOID_D2(n,d,x,y)   (d == NULL) ? (void)0 : (!(d)->flags) ? (void)0 : (!ITTNOTIFY_NAME(n)) ? (void)0 : ITTNOTIFY_NAME(n)(d,x,y)
+#define ITTNOTIFY_VOID_D3(n,d,x,y,z) (d == NULL) ? (void)0 : (!(d)->flags) ? (void)0 : (!ITTNOTIFY_NAME(n)) ? (void)0 : ITTNOTIFY_NAME(n)(d,x,y,z)
+#define ITTNOTIFY_VOID_D4(n,d,x,y,z,a)     (d == NULL) ? (void)0 : (!(d)->flags) ? (void)0 : (!ITTNOTIFY_NAME(n)) ? (void)0 : ITTNOTIFY_NAME(n)(d,x,y,z,a)
+#define ITTNOTIFY_VOID_D5(n,d,x,y,z,a,b)   (d == NULL) ? (void)0 : (!(d)->flags) ? (void)0 : (!ITTNOTIFY_NAME(n)) ? (void)0 : ITTNOTIFY_NAME(n)(d,x,y,z,a,b)
+#define ITTNOTIFY_VOID_D6(n,d,x,y,z,a,b,c) (d == NULL) ? (void)0 : (!(d)->flags) ? (void)0 : (!ITTNOTIFY_NAME(n)) ? (void)0 : ITTNOTIFY_NAME(n)(d,x,y,z,a,b,c)
+#define ITTNOTIFY_DATA_D0(n,d)       (d == NULL) ? 0 : (!(d)->flags) ?       0 : (!ITTNOTIFY_NAME(n)) ?       0 : ITTNOTIFY_NAME(n)(d)
+#define ITTNOTIFY_DATA_D1(n,d,x)     (d == NULL) ? 0 : (!(d)->flags) ?       0 : (!ITTNOTIFY_NAME(n)) ?       0 : ITTNOTIFY_NAME(n)(d,x)
+#define ITTNOTIFY_DATA_D2(n,d,x,y)   (d == NULL) ? 0 : (!(d)->flags) ?       0 : (!ITTNOTIFY_NAME(n)) ?       0 : ITTNOTIFY_NAME(n)(d,x,y)
+#define ITTNOTIFY_DATA_D3(n,d,x,y,z) (d == NULL) ? 0 : (!(d)->flags) ?       0 : (!ITTNOTIFY_NAME(n)) ?       0 : ITTNOTIFY_NAME(n)(d,x,y,z)
+#define ITTNOTIFY_DATA_D4(n,d,x,y,z,a)     (d == NULL) ? 0 : (!(d)->flags) ? 0 : (!ITTNOTIFY_NAME(n)) ?       0 : ITTNOTIFY_NAME(n)(d,x,y,z,a)
+#define ITTNOTIFY_DATA_D5(n,d,x,y,z,a,b)   (d == NULL) ? 0 : (!(d)->flags) ? 0 : (!ITTNOTIFY_NAME(n)) ?       0 : ITTNOTIFY_NAME(n)(d,x,y,z,a,b)
+#define ITTNOTIFY_DATA_D6(n,d,x,y,z,a,b,c) (d == NULL) ? 0 : (!(d)->flags) ? 0 : (!ITTNOTIFY_NAME(n)) ?       0 : ITTNOTIFY_NAME(n)(d,x,y,z,a,b,c)
 
 #ifdef ITT_STUB
 #undef ITT_STUB
@@ -228,7 +245,7 @@ extern "C" {
  *     only pauses tracing and analyzing memory access.
  *     It does not pause tracing or analyzing threading APIs.
  *   .
- * - Intel(R) Parallel Amplifier and Intel(R) VTune(TM) Amplifier XE:
+ * - Intel(R) VTune(TM) Profiler:
  *   - Does continue to record when new threads are started.
  *   .
  * - Other effects:
diff --git a/external/tbb/src/tbb/version.cpp b/external/tbb/src/tbb/version.cpp
index c4c7c2cc..ca113372 100644
--- a/external/tbb/src/tbb/version.cpp
+++ b/external/tbb/src/tbb/version.cpp
@@ -16,7 +16,9 @@
 
 #include "oneapi/tbb/version.h"
 
-extern "C" int TBB_runtime_interface_version() { return TBB_INTERFACE_VERSION; }
+extern "C" int TBB_runtime_interface_version() {
+    return TBB_INTERFACE_VERSION;
+}
 
 extern "C" const char* TBB_runtime_version() {
     static const char version_str[] = TBB_VERSION_STRING;
diff --git a/external/tbb/src/tbb/waiters.h b/external/tbb/src/tbb/waiters.h
index 7e0906be..5ec2710f 100644
--- a/external/tbb/src/tbb/waiters.h
+++ b/external/tbb/src/tbb/waiters.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2025 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
 #include "oneapi/tbb/detail/_task.h"
 #include "scheduler_common.h"
 #include "arena.h"
+#include "threading_control.h"
 
 namespace tbb {
 namespace detail {
@@ -33,7 +34,7 @@ class waiter_base {
 
     bool pause() {
         if (my_backoff.pause()) {
-            my_arena.is_out_of_work();
+            my_arena.out_of_work();
             return true;
         }
 
@@ -53,10 +54,31 @@ class outermost_worker_waiter : public waiter_base {
 public:
     using waiter_base::waiter_base;
 
-    bool continue_execution(arena_slot& slot, d1::task*& t) const {
+    bool continue_execution(arena_slot& slot, d1::task*& t) {
         __TBB_ASSERT(t == nullptr, nullptr);
 
         if (is_worker_should_leave(slot)) {
+            if (is_delayed_leave_enabled()) {
+                static constexpr std::chrono::microseconds worker_wait_leave_duration(1000);
+                static_assert(worker_wait_leave_duration > std::chrono::steady_clock::duration(1),
+                              "Clock resolution is not enough for measured interval.");
+
+                for (auto t1 = std::chrono::steady_clock::now(), t2 = t1;
+                    std::chrono::duration_cast<std::chrono::microseconds>(t2 - t1) < worker_wait_leave_duration;
+                    t2 = std::chrono::steady_clock::now())
+                {
+                    if (!my_arena.is_empty() && !my_arena.is_recall_requested()) {
+                        return true;
+                    }
+
+                    if (!my_arena.my_thread_leave.is_retention_allowed() ||
+                        my_arena.my_threading_control->is_any_other_client_active())
+                    {
+                        break;
+                    }
+                    d0::yield();
+                }
+            }
             // Leave dispatch loop
             return false;
         }
@@ -81,8 +103,16 @@ class outermost_worker_waiter : public waiter_base {
 private:
     using base_type = waiter_base;
 
+    bool is_delayed_leave_enabled() {
+#if __TBB_PREVIEW_PARALLEL_PHASE
+       return my_arena.my_thread_leave.is_retention_allowed();
+#else
+       return !governor::hybrid_cpu();
+#endif   
+    }
+
     bool is_worker_should_leave(arena_slot& slot) const {
-        bool is_top_priority_arena = my_arena.my_is_top_priority.load(std::memory_order_relaxed);
+        bool is_top_priority_arena = my_arena.is_top_priority();
         bool is_task_pool_empty = slot.task_pool.load(std::memory_order_relaxed) == EmptyTaskPool;
 
         if (is_top_priority_arena) {
@@ -109,14 +139,11 @@ class sleep_waiter : public waiter_base {
 protected:
     using waiter_base::waiter_base;
 
-    bool is_arena_empty() {
-        return my_arena.my_pool_state.load(std::memory_order_relaxed) == arena::SNAPSHOT_EMPTY;
-    }
-
     template <typename Pred>
     void sleep(std::uintptr_t uniq_tag, Pred wakeup_condition) {
-        my_arena.my_market->get_wait_list().wait<market_concurrent_monitor::thread_context>(wakeup_condition,
+        my_arena.get_waiting_threads_monitor().wait<thread_control_monitor::thread_context>(wakeup_condition,
             market_context{uniq_tag, &my_arena});
+        reset_wait();
     }
 };
 
@@ -139,10 +166,9 @@ class external_waiter : public sleep_waiter {
             return;
         }
 
-        auto wakeup_condition = [&] { return !is_arena_empty() || !my_wait_ctx.continue_execution(); };
+        auto wakeup_condition = [&] { return !my_arena.is_empty() || !my_wait_ctx.continue_execution(); };
 
         sleep(std::uintptr_t(&my_wait_ctx), wakeup_condition);
-        my_backoff.reset_wait();
     }
 
     d1::wait_context* wait_ctx() {
@@ -176,14 +202,9 @@ class coroutine_waiter : public sleep_waiter {
 
         suspend_point_type* sp = slot.default_task_dispatcher().m_suspend_point;
 
-        auto wakeup_condition = [&] { return !is_arena_empty() || sp->m_is_owner_recalled.load(std::memory_order_relaxed); };
+        auto wakeup_condition = [&] { return !my_arena.is_empty() || sp->m_is_owner_recalled.load(std::memory_order_relaxed); };
 
         sleep(std::uintptr_t(sp), wakeup_condition);
-        my_backoff.reset_wait();
-    }
-
-    void reset_wait() {
-        my_backoff.reset_wait();
     }
 
     d1::wait_context* wait_ctx() {
diff --git a/external/tbb/src/tbbbind/CMakeLists.txt b/external/tbb/src/tbbbind/CMakeLists.txt
index 99b7ccaa..993dc8b8 100644
--- a/external/tbb/src/tbbbind/CMakeLists.txt
+++ b/external/tbb/src/tbbbind/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Intel Corporation
+# Copyright (c) 2020-2023 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,9 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-if (DEFINED CMAKE_SKIP_BUILD_RPATH)
-    set(CMAKE_SKIP_BUILD_RPATH_OLD_VALUE ${CMAKE_SKIP_BUILD_RPATH})
-endif()
 set(CMAKE_SKIP_BUILD_RPATH TRUE)
 
 function(tbbbind_build TBBBIND_NAME REQUIRED_HWLOC_TARGET)
@@ -24,6 +21,11 @@ function(tbbbind_build TBBBIND_NAME REQUIRED_HWLOC_TARGET)
         return()
     endif()
     add_library(${TBBBIND_NAME} tbb_bind.cpp)
+
+    if (WIN32)
+        target_sources(${TBBBIND_NAME} PRIVATE tbb_bind.rc)
+    endif()
+
     add_library(TBB::${TBBBIND_NAME} ALIAS ${TBBBIND_NAME})
 
     target_compile_definitions(${TBBBIND_NAME}
@@ -46,7 +48,6 @@ function(tbbbind_build TBBBIND_NAME REQUIRED_HWLOC_TARGET)
         ${TBB_WARNING_LEVEL}
         ${TBB_LIB_COMPILE_FLAGS}
         ${TBB_COMMON_COMPILE_FLAGS}
-        ${TBB_IPO_COMPILE_FLAGS}
     )
 
     # Avoid use of target_link_libraries here as it changes /DEF option to \DEF on Windows.
@@ -55,10 +56,13 @@ function(tbbbind_build TBBBIND_NAME REQUIRED_HWLOC_TARGET)
         VERSION ${TBBBIND_BINARY_VERSION}.${TBB_BINARY_MINOR_VERSION}
         SOVERSION ${TBBBIND_BINARY_VERSION}
     )
+
+    tbb_handle_ipo(${TBBBIND_NAME})
+
     if (TBB_DEF_FILE_PREFIX) # If there's no prefix, assume we're using export directives
         set_target_properties(${TBBBIND_NAME} PROPERTIES
-            LINK_FLAGS ${TBB_LINK_DEF_FILE_FLAG}${CMAKE_CURRENT_SOURCE_DIR}/def/${TBB_DEF_FILE_PREFIX}-tbbbind.def
-            LINK_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/def/${TBB_DEF_FILE_PREFIX}-tbbbind.def
+            LINK_FLAGS "${TBB_LINK_DEF_FILE_FLAG}\"${CMAKE_CURRENT_SOURCE_DIR}/def/${TBB_DEF_FILE_PREFIX}-tbbbind.def\""
+            LINK_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/def/${TBB_DEF_FILE_PREFIX}-tbbbind.def"
         )
     endif()
 
@@ -69,14 +73,12 @@ function(tbbbind_build TBBBIND_NAME REQUIRED_HWLOC_TARGET)
             PRIVATE
             ${TBB_LIB_LINK_FLAGS}
             ${TBB_COMMON_LINK_FLAGS}
-            ${TBB_IPO_LINK_FLAGS}
         )
     else()
         target_link_libraries(${TBBBIND_NAME}
             PRIVATE
             ${TBB_LIB_LINK_FLAGS}
             ${TBB_COMMON_LINK_FLAGS}
-            ${TBB_IPO_LINK_FLAGS}
         )
     endif()
 
@@ -90,9 +92,6 @@ function(tbbbind_build TBBBIND_NAME REQUIRED_HWLOC_TARGET)
 
     tbb_install_target(${TBBBIND_NAME})
 
-    if (COMMAND tbb_gen_vars)
-        tbb_gen_vars(${TBBBIND_NAME})
-    endif()
 endfunction()
 
 if (NOT DEFINED HWLOC_TARGET_EXPLICITLY_DEFINED AND TARGET PkgConfig::HWLOC)
@@ -104,10 +103,3 @@ else()
     tbbbind_build(tbbbind_2_5 HWLOC::hwloc_2_5 )
 endif()
 
-
-if (DEFINED CMAKE_SKIP_BUILD_RPATH_OLD_VALUE)
-    set(CMAKE_SKIP_BUILD_RPATH ${CMAKE_SKIP_BUILD_RPATH_OLD_VALUE})
-    unset(CMAKE_SKIP_BUILD_RPATH_OLD_VALUE)
-else()
-    unset(CMAKE_SKIP_BUILD_RPATH)
-endif()
diff --git a/external/tbb/src/tbbbind/def/mac64-tbbbind.def b/external/tbb/src/tbbbind/def/mac64-tbbbind.def
new file mode 100755
index 00000000..be72bcf9
--- /dev/null
+++ b/external/tbb/src/tbbbind/def/mac64-tbbbind.def
@@ -0,0 +1,18 @@
+# Copyright (c) 2023 Intel Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+___TBB_internal_initialize_system_topology
+___TBB_internal_get_default_concurrency
+___TBB_internal_destroy_system_topology
+
diff --git a/external/tbb/src/tbbbind/def/win32-tbbbind.def b/external/tbb/src/tbbbind/def/win32-tbbbind.def
index dd6592c0..be4f714e 100644
--- a/external/tbb/src/tbbbind/def/win32-tbbbind.def
+++ b/external/tbb/src/tbbbind/def/win32-tbbbind.def
@@ -14,7 +14,6 @@
 
 EXPORTS
 
-global
 __TBB_internal_initialize_system_topology
 __TBB_internal_apply_affinity
 __TBB_internal_restore_affinity
diff --git a/external/tbb/src/tbbbind/def/win64-tbbbind.def b/external/tbb/src/tbbbind/def/win64-tbbbind.def
index dd6592c0..be4f714e 100644
--- a/external/tbb/src/tbbbind/def/win64-tbbbind.def
+++ b/external/tbb/src/tbbbind/def/win64-tbbbind.def
@@ -14,7 +14,6 @@
 
 EXPORTS
 
-global
 __TBB_internal_initialize_system_topology
 __TBB_internal_apply_affinity
 __TBB_internal_restore_affinity
diff --git a/external/tbb/src/tbbbind/tbb_bind.cpp b/external/tbb/src/tbbbind/tbb_bind.cpp
index 70198f8c..143d1433 100644
--- a/external/tbb/src/tbbbind/tbb_bind.cpp
+++ b/external/tbb/src/tbbbind/tbb_bind.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2019-2021 Intel Corporation
+    Copyright (c) 2019-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -14,537 +14,591 @@
     limitations under the License.
 */
 
-#include <mutex>
 #include <vector>
+#include <mutex>
 
-#include "../tbb/assert_impl.h"// Out-of-line TBB assertion handling routines are instantiated here.
+#include "../tbb/assert_impl.h" // Out-of-line TBB assertion handling routines are instantiated here.
 #include "oneapi/tbb/detail/_assert.h"
 #include "oneapi/tbb/detail/_config.h"
 
 #if _MSC_VER && !__INTEL_COMPILER && !__clang__
-#pragma warning(push)
-#pragma warning(disable : 4100)
+#pragma warning( push )
+#pragma warning( disable : 4100 )
 #elif _MSC_VER && __clang__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #endif
 #include <hwloc.h>
 #if _MSC_VER && !__INTEL_COMPILER && !__clang__
-#pragma warning(pop)
+#pragma warning( pop )
 #elif _MSC_VER && __clang__
 #pragma GCC diagnostic pop
 #endif
 
 #define __TBBBIND_HWLOC_HYBRID_CPUS_INTERFACES_PRESENT (HWLOC_API_VERSION >= 0x20400)
 #define __TBBBIND_HWLOC_TOPOLOGY_FLAG_RESTRICT_TO_CPUBINDING_PRESENT (HWLOC_API_VERSION >= 0x20500)
+#define __TBBBIND_HWLOC_WINDOWS_API_AVAILABLE (_WIN32 && HWLOC_API_VERSION >= 0x20500)
+#if __TBBBIND_HWLOC_WINDOWS_API_AVAILABLE
+    #include <hwloc/windows.h>
+#endif
 
 // Most of hwloc calls returns negative exit code on error.
 // This macro tracks error codes that are returned from the hwloc interfaces.
-#define assertion_hwloc_wrapper(command, ...)                                                                \
-    __TBB_ASSERT_EX((command(__VA_ARGS__)) >= 0, "Error occurred during call to hwloc API.");
+#define assertion_hwloc_wrapper(command, ...) \
+        __TBB_ASSERT_EX( (command(__VA_ARGS__)) >= 0, "Error occurred during call to hwloc API.");
 
 namespace tbb {
-    namespace detail {
-        namespace r1 {
-
-            //------------------------------------------------------------------------
-            // Information about the machine's hardware TBB is happen to work on
-            //------------------------------------------------------------------------
-            class system_topology {
-                friend class binding_handler;
-
-                // Common topology members
-                hwloc_topology_t topology {nullptr};
-                hwloc_cpuset_t process_cpu_affinity_mask {nullptr};
-                hwloc_nodeset_t process_node_affinity_mask {nullptr};
-                std::size_t number_of_processors_groups {1};
-
-                // NUMA API related topology members
-                std::vector<hwloc_cpuset_t> numa_affinity_masks_list {};
-                std::vector<int> numa_indexes_list {};
-                int numa_nodes_count {0};
-
-                // Hybrid CPUs API related topology members
-                std::vector<hwloc_cpuset_t> core_types_affinity_masks_list {};
-                std::vector<int> core_types_indexes_list {};
-
-                enum init_stages {
-                    uninitialized,
-                    started,
-                    topology_allocated,
-                    topology_loaded,
-                    topology_parsed
-                } initialization_state;
-
-                // Binding threads that locate in another Windows Processor groups
-                // is allowed only if machine topology contains several Windows Processors groups
-                // and process affinity mask wasn`t limited manually (affinity mask cannot violates
-                // processors group boundaries).
-                bool intergroup_binding_allowed(std::size_t groups_num) { return groups_num > 1; }
-
-            private:
-                void topology_initialization(std::size_t groups_num) {
-                    initialization_state = started;
-
-                    // Parse topology
-                    if (hwloc_topology_init(&topology) == 0) {
-                        initialization_state = topology_allocated;
+namespace detail {
+namespace r1 {
+
+//------------------------------------------------------------------------
+// Information about the machine's hardware TBB is happen to work on
+//------------------------------------------------------------------------
+class system_topology {
+    friend class binding_handler;
+
+    // Common topology members
+    hwloc_topology_t topology{nullptr};
+    hwloc_cpuset_t   process_cpu_affinity_mask{nullptr};
+    hwloc_nodeset_t  process_node_affinity_mask{nullptr};
+    std::size_t number_of_processors_groups{1};
+    std::vector<hwloc_cpuset_t> processor_groups_affinity_masks_list{};
+
+    // NUMA API related topology members
+    std::vector<hwloc_cpuset_t> numa_affinity_masks_list{};
+    std::vector<int> numa_indexes_list{};
+    int numa_nodes_count{0};
+
+    // Hybrid CPUs API related topology members
+    std::vector<hwloc_cpuset_t> core_types_affinity_masks_list{};
+    std::vector<int> core_types_indexes_list{};
+
+    enum init_stages { uninitialized,
+                       started,
+                       topology_allocated,
+                       topology_loaded,
+                       topology_parsed } initialization_state;
+
+    // Binding threads that locate in another Windows Processor groups
+    // is allowed only if machine topology contains several Windows Processors groups
+    // and process affinity mask wasn't limited manually (affinity mask cannot violate
+    // processors group boundaries).
+    bool intergroup_binding_allowed(std::size_t groups_num) { return groups_num > 1; }
+
+private:
+    void topology_initialization(std::size_t groups_num) {
+        initialization_state = started;
+
+        // Parse topology
+        if ( hwloc_topology_init( &topology ) == 0 ) {
+            initialization_state = topology_allocated;
 #if __TBBBIND_HWLOC_TOPOLOGY_FLAG_RESTRICT_TO_CPUBINDING_PRESENT
-                        if (groups_num == 1
-                            && hwloc_topology_set_flags(topology,
-                                                        HWLOC_TOPOLOGY_FLAG_IS_THISSYSTEM
-                                                                | HWLOC_TOPOLOGY_FLAG_RESTRICT_TO_CPUBINDING)
-                                       != 0) {
-                            return;
-                        }
+            unsigned long flags = 0;
+            if (groups_num > 1) {
+                // HWLOC x86 backend might interfere with process affinity mask on
+                // Windows systems with multiple processor groups.
+                flags = HWLOC_TOPOLOGY_FLAG_DONT_CHANGE_BINDING;
+            } else {
+                flags = HWLOC_TOPOLOGY_FLAG_IS_THISSYSTEM | HWLOC_TOPOLOGY_FLAG_RESTRICT_TO_CPUBINDING;
+            }
+            if (hwloc_topology_set_flags(topology, flags) != 0) {
+                return;
+            }
+#endif
+            if ( hwloc_topology_load( topology ) == 0 ) {
+                initialization_state = topology_loaded;
+            }
+        }
+        if ( initialization_state != topology_loaded )
+            return;
+
+#if __TBB_CPUBIND_PRESENT
+        // Getting process affinity mask
+        if ( intergroup_binding_allowed(groups_num) ) {
+            process_cpu_affinity_mask  = hwloc_bitmap_dup(hwloc_topology_get_complete_cpuset (topology));
+            process_node_affinity_mask = hwloc_bitmap_dup(hwloc_topology_get_complete_nodeset(topology));
+        } else {
+            process_cpu_affinity_mask  = hwloc_bitmap_alloc();
+            process_node_affinity_mask = hwloc_bitmap_alloc();
+
+            assertion_hwloc_wrapper(hwloc_get_cpubind, topology, process_cpu_affinity_mask, 0);
+            hwloc_cpuset_to_nodeset(topology, process_cpu_affinity_mask, process_node_affinity_mask);
+        }
+#else
+        process_cpu_affinity_mask  = hwloc_bitmap_dup(hwloc_topology_get_complete_cpuset (topology));
+        process_node_affinity_mask = hwloc_bitmap_dup(hwloc_topology_get_complete_nodeset(topology));
 #endif
-                        if (hwloc_topology_load(topology) == 0) { initialization_state = topology_loaded; }
-                    }
-                    if (initialization_state != topology_loaded) return;
-
-                    // Getting process affinity mask
-                    if (intergroup_binding_allowed(groups_num)) {
-                        process_cpu_affinity_mask
-                                = hwloc_bitmap_dup(hwloc_topology_get_complete_cpuset(topology));
-                        process_node_affinity_mask
-                                = hwloc_bitmap_dup(hwloc_topology_get_complete_nodeset(topology));
-                    } else {
-                        process_cpu_affinity_mask = hwloc_bitmap_alloc();
-                        process_node_affinity_mask = hwloc_bitmap_alloc();
-
-                        assertion_hwloc_wrapper(hwloc_get_cpubind, topology, process_cpu_affinity_mask, 0);
-                        hwloc_cpuset_to_nodeset(topology, process_cpu_affinity_mask,
-                                                process_node_affinity_mask);
-                    }
 
-                    number_of_processors_groups = groups_num;
+        number_of_processors_groups = groups_num;
+    }
+
+    void numa_topology_parsing() {
+        // Fill parameters with stubs if topology parsing is broken.
+        if ( initialization_state != topology_loaded ) {
+            numa_nodes_count = 1;
+            numa_indexes_list.push_back(-1);
+            return;
+        }
+
+        // If system contains no NUMA nodes, HWLOC 1.11 returns an infinitely filled bitmap.
+        // hwloc_bitmap_weight() returns negative value for such bitmaps, so we use this check
+        // to change way of topology initialization.
+        numa_nodes_count = hwloc_bitmap_weight(process_node_affinity_mask);
+        if (numa_nodes_count <= 0) {
+            // numa_nodes_count may be empty if the process affinity mask is empty too (invalid case)
+            // or if some internal HWLOC error occurred.
+            // So we place -1 as index in this case.
+            numa_indexes_list.push_back(numa_nodes_count == 0 ? -1 : 0);
+            numa_nodes_count = 1;
+
+            numa_affinity_masks_list.push_back(hwloc_bitmap_dup(process_cpu_affinity_mask));
+        } else {
+            // Get NUMA logical indexes list
+            unsigned counter = 0;
+            int i = 0;
+            int max_numa_index = -1;
+            numa_indexes_list.resize(numa_nodes_count);
+            hwloc_obj_t node_buffer;
+            hwloc_bitmap_foreach_begin(i, process_node_affinity_mask) {
+                node_buffer = hwloc_get_numanode_obj_by_os_index(topology, i);
+                numa_indexes_list[counter] = static_cast<int>(node_buffer->logical_index);
+
+                if ( numa_indexes_list[counter] > max_numa_index ) {
+                    max_numa_index = numa_indexes_list[counter];
                 }
 
-                void numa_topology_parsing() {
-                    // Fill parameters with stubs if topology parsing is broken.
-                    if (initialization_state != topology_loaded) {
-                        numa_nodes_count = 1;
-                        numa_indexes_list.push_back(-1);
-                        return;
-                    }
+                counter++;
+            } hwloc_bitmap_foreach_end();
+            __TBB_ASSERT(max_numa_index >= 0, "Maximal NUMA index must not be negative");
+
+            // Fill concurrency and affinity masks lists
+            numa_affinity_masks_list.resize(max_numa_index + 1);
+            int index = 0;
+            hwloc_bitmap_foreach_begin(i, process_node_affinity_mask) {
+                node_buffer = hwloc_get_numanode_obj_by_os_index(topology, i);
+                index = static_cast<int>(node_buffer->logical_index);
+
+                hwloc_cpuset_t& current_mask = numa_affinity_masks_list[index];
+                current_mask = hwloc_bitmap_dup(node_buffer->cpuset);
+
+                hwloc_bitmap_and(current_mask, current_mask, process_cpu_affinity_mask);
+                __TBB_ASSERT(!hwloc_bitmap_iszero(current_mask), "hwloc detected unavailable NUMA node");
+            } hwloc_bitmap_foreach_end();
+        }
+    }
+
+    void core_types_topology_parsing() {
+        // Fill parameters with stubs if topology parsing is broken.
+        if ( initialization_state != topology_loaded ) {
+            core_types_indexes_list.push_back(-1);
+            return;
+        }
+#if __TBBBIND_HWLOC_HYBRID_CPUS_INTERFACES_PRESENT
+        __TBB_ASSERT(hwloc_get_api_version() >= 0x20400, "Hybrid CPUs support interfaces required HWLOC >= 2.4");
+        // Parsing the hybrid CPU topology
+        int core_types_number = hwloc_cpukinds_get_nr(topology, 0);
+        bool core_types_parsing_broken = core_types_number <= 0;
+        if (!core_types_parsing_broken) {
+            core_types_affinity_masks_list.resize(core_types_number);
+            int efficiency{-1};
+
+            for (int core_type = 0; core_type < core_types_number; ++core_type) {
+                hwloc_cpuset_t& current_mask = core_types_affinity_masks_list[core_type];
+                current_mask = hwloc_bitmap_alloc();
+
+                if (!hwloc_cpukinds_get_info(topology, core_type, current_mask, &efficiency, nullptr, nullptr, 0)
+                    && efficiency >= 0
+                ) {
+                    hwloc_bitmap_and(current_mask, current_mask, process_cpu_affinity_mask);
 
-                    // If system contains no NUMA nodes, HWLOC 1.11 returns an infinitely filled bitmap.
-                    // hwloc_bitmap_weight() returns negative value for such bitmaps, so we use this check
-                    // to change way of topology initialization.
-                    numa_nodes_count = hwloc_bitmap_weight(process_node_affinity_mask);
-                    if (numa_nodes_count <= 0) {
-                        // numa_nodes_count may be empty if the process affinity mask is empty too (invalid case)
-                        // or if some internal HWLOC error occurred.
-                        // So we place -1 as index in this case.
-                        numa_indexes_list.push_back(numa_nodes_count == 0 ? -1 : 0);
-                        numa_nodes_count = 1;
-
-                        numa_affinity_masks_list.push_back(hwloc_bitmap_dup(process_cpu_affinity_mask));
-                    } else {
-                        // Get NUMA logical indexes list
-                        unsigned counter = 0;
-                        int i = 0;
-                        int max_numa_index = -1;
-                        numa_indexes_list.resize(numa_nodes_count);
-                        hwloc_obj_t node_buffer;
-                        hwloc_bitmap_foreach_begin(i, process_node_affinity_mask) {
-                            node_buffer = hwloc_get_numanode_obj_by_os_index(topology, i);
-                            numa_indexes_list[counter] = static_cast<int>(node_buffer->logical_index);
-
-                            if (numa_indexes_list[counter] > max_numa_index) {
-                                max_numa_index = numa_indexes_list[counter];
-                            }
-
-                            counter++;
-                        }
-                        hwloc_bitmap_foreach_end();
-                        __TBB_ASSERT(max_numa_index >= 0, "Maximal NUMA index must not be negative");
-
-                        // Fill concurrency and affinity masks lists
-                        numa_affinity_masks_list.resize(max_numa_index + 1);
-                        int index = 0;
-                        hwloc_bitmap_foreach_begin(i, process_node_affinity_mask) {
-                            node_buffer = hwloc_get_numanode_obj_by_os_index(topology, i);
-                            index = static_cast<int>(node_buffer->logical_index);
-
-                            hwloc_cpuset_t& current_mask = numa_affinity_masks_list[index];
-                            current_mask = hwloc_bitmap_dup(node_buffer->cpuset);
-
-                            hwloc_bitmap_and(current_mask, current_mask, process_cpu_affinity_mask);
-                            __TBB_ASSERT(!hwloc_bitmap_iszero(current_mask),
-                                         "hwloc detected unavailable NUMA node");
-                        }
-                        hwloc_bitmap_foreach_end();
+                    if (hwloc_bitmap_weight(current_mask) > 0) {
+                        core_types_indexes_list.push_back(core_type);
                     }
+                    __TBB_ASSERT(hwloc_bitmap_weight(current_mask) >= 0, "Infinivitely filled core type mask");
+                } else {
+                    core_types_parsing_broken = true;
+                    break;
                 }
-
-                void core_types_topology_parsing() {
-                    // Fill parameters with stubs if topology parsing is broken.
-                    if (initialization_state != topology_loaded) {
-                        core_types_indexes_list.push_back(-1);
-                        return;
-                    }
-#if __TBBBIND_HWLOC_HYBRID_CPUS_INTERFACES_PRESENT
-                    __TBB_ASSERT(hwloc_get_api_version() >= 0x20400,
-                                 "Hybrid CPUs support interfaces required HWLOC >= 2.4");
-                    // Parsing the hybrid CPU topology
-                    int core_types_number = hwloc_cpukinds_get_nr(topology, 0);
-                    bool core_types_parsing_broken = core_types_number <= 0;
-                    if (!core_types_parsing_broken) {
-                        core_types_affinity_masks_list.resize(core_types_number);
-                        int efficiency {-1};
-
-                        for (int core_type = 0; core_type < core_types_number; ++core_type) {
-                            hwloc_cpuset_t& current_mask = core_types_affinity_masks_list[core_type];
-                            current_mask = hwloc_bitmap_alloc();
-
-                            if (!hwloc_cpukinds_get_info(topology, core_type, current_mask, &efficiency,
-                                                         nullptr, nullptr, 0)
-                                && efficiency >= 0) {
-                                hwloc_bitmap_and(current_mask, current_mask, process_cpu_affinity_mask);
-
-                                if (hwloc_bitmap_weight(current_mask) > 0) {
-                                    core_types_indexes_list.push_back(core_type);
-                                }
-                                __TBB_ASSERT(hwloc_bitmap_weight(current_mask) >= 0,
-                                             "Infinivitely filled core type mask");
-                            } else {
-                                core_types_parsing_broken = true;
-                                break;
-                            }
-                        }
-                    }
-#else  /*!__TBBBIND_HWLOC_HYBRID_CPUS_INTERFACES_PRESENT*/
-                    bool core_types_parsing_broken {true};
+            }
+        }
+#else /*!__TBBBIND_HWLOC_HYBRID_CPUS_INTERFACES_PRESENT*/
+        bool core_types_parsing_broken{true};
 #endif /*__TBBBIND_HWLOC_HYBRID_CPUS_INTERFACES_PRESENT*/
 
-                    if (core_types_parsing_broken) {
-                        for (auto& core_type_mask : core_types_affinity_masks_list) {
-                            hwloc_bitmap_free(core_type_mask);
-                        }
-                        core_types_affinity_masks_list.resize(1);
-                        core_types_indexes_list.resize(1);
-
-                        core_types_affinity_masks_list[0] = hwloc_bitmap_dup(process_cpu_affinity_mask);
-                        core_types_indexes_list[0] = -1;
-                    }
-                }
+        if (core_types_parsing_broken) {
+            for (auto& core_type_mask : core_types_affinity_masks_list) {
+                hwloc_bitmap_free(core_type_mask);
+            }
+            core_types_affinity_masks_list.resize(1);
+            core_types_indexes_list.resize(1);
+
+            core_types_affinity_masks_list[0] = hwloc_bitmap_dup(process_cpu_affinity_mask);
+            core_types_indexes_list[0] = -1;
+        }
+    }
+
+#if __TBBBIND_HWLOC_WINDOWS_API_AVAILABLE
+    void processor_groups_topology_parsing() {
+        __TBB_ASSERT(number_of_processors_groups > 1, nullptr);
+        processor_groups_affinity_masks_list.resize(number_of_processors_groups);
+        for (unsigned group = 0; group < number_of_processors_groups; ++group) {
+            processor_groups_affinity_masks_list[group] = hwloc_bitmap_alloc();
+            assertion_hwloc_wrapper(hwloc_windows_get_processor_group_cpuset, topology, group,
+                                    processor_groups_affinity_masks_list[group], /*flags*/0);
+        }
+
+#if TBB_USE_ASSERT
+        affinity_mask tmp = hwloc_bitmap_alloc();
+        for (auto proc_group_mask : processor_groups_affinity_masks_list) {
+            __TBB_ASSERT(!hwloc_bitmap_intersects(tmp, proc_group_mask), "Masks of processor groups intersect.");
+            hwloc_bitmap_or(tmp, tmp, proc_group_mask);
+        }
+        hwloc_bitmap_free(tmp);
+#endif
+    }
+#endif
 
-                void enforce_hwloc_2_5_runtime_linkage() {
-                    // Without the call of this function HWLOC 2.4 can be successfully loaded during the tbbbind_2_5 loading.
-                    // It is possible since tbbbind_2_5 don't use any new entry points that were introduced in HWLOC 2.5
-                    // But tbbbind_2_5 compiles with HWLOC 2.5 header, therefore such situation requires binary forward compatibility
-                    // which are not guaranteed by the HWLOC library. To enforce linkage tbbbind_2_5 only with HWLOC >= 2.5 version
-                    // this function calls the interface that is available in the HWLOC 2.5 only.
+    void enforce_hwloc_2_5_runtime_linkage() {
+        // Without the call of this function HWLOC 2.4 can be successfully loaded during the tbbbind_2_5 loading.
+        // It is possible since tbbbind_2_5 don't use any new entry points that were introduced in HWLOC 2.5
+        // But tbbbind_2_5 compiles with HWLOC 2.5 header, therefore such situation requires binary forward compatibility
+        // which are not guaranteed by the HWLOC library. To enforce linkage tbbbind_2_5 only with HWLOC >= 2.5 version
+        // this function calls the interface that is available in the HWLOC 2.5 only.
 #if HWLOC_API_VERSION >= 0x20500
-                    auto some_core = hwloc_get_next_obj_by_type(topology, HWLOC_OBJ_CORE, nullptr);
-                    hwloc_get_obj_with_same_locality(topology, some_core, HWLOC_OBJ_CORE, nullptr, nullptr,
-                                                     0);
+        auto some_core = hwloc_get_next_obj_by_type(topology, HWLOC_OBJ_CORE, nullptr);
+        hwloc_get_obj_with_same_locality(topology, some_core, HWLOC_OBJ_CORE, nullptr, nullptr, 0);
 #endif
-                }
-
-                void initialize(std::size_t groups_num) {
-                    if (initialization_state != uninitialized) return;
+    }
 
-                    topology_initialization(groups_num);
-                    numa_topology_parsing();
-                    core_types_topology_parsing();
-
-                    enforce_hwloc_2_5_runtime_linkage();
-
-                    if (initialization_state == topology_loaded) initialization_state = topology_parsed;
-                }
 
-                static system_topology* instance_ptr;
-
-            public:
-                typedef hwloc_cpuset_t affinity_mask;
-                typedef hwloc_const_cpuset_t const_affinity_mask;
-
-                bool is_topology_parsed() { return initialization_state == topology_parsed; }
-
-                static void construct(std::size_t groups_num) {
-                    if (instance_ptr == nullptr) {
-                        instance_ptr = new system_topology();
-                        instance_ptr->initialize(groups_num);
-                    }
-                }
+    void initialize( std::size_t groups_num ) {
+        if ( initialization_state != uninitialized )
+            return;
 
-                static system_topology& instance() {
-                    __TBB_ASSERT(instance_ptr != nullptr, "Getting instance of non-constructed topology");
-                    return *instance_ptr;
-                }
+        topology_initialization(groups_num);
+        numa_topology_parsing();
+        core_types_topology_parsing();
+#if __TBBBIND_HWLOC_WINDOWS_API_AVAILABLE
+        if (intergroup_binding_allowed(groups_num)) {
+           processor_groups_topology_parsing();
+        }
+#endif
 
-                static void destroy() {
-                    __TBB_ASSERT(instance_ptr != nullptr, "Destroying non-constructed topology");
-                    delete instance_ptr;
-                }
+        enforce_hwloc_2_5_runtime_linkage();
 
-                ~system_topology() {
-                    if (is_topology_parsed()) {
-                        for (auto& numa_node_mask : numa_affinity_masks_list) {
-                            hwloc_bitmap_free(numa_node_mask);
-                        }
+        if (initialization_state == topology_loaded)
+            initialization_state = topology_parsed;
+    }
 
-                        for (auto& core_type_mask : core_types_affinity_masks_list) {
-                            hwloc_bitmap_free(core_type_mask);
-                        }
+    static system_topology* instance_ptr;
+public:
+    typedef hwloc_cpuset_t             affinity_mask;
+    typedef hwloc_const_cpuset_t const_affinity_mask;
 
-                        hwloc_bitmap_free(process_node_affinity_mask);
-                        hwloc_bitmap_free(process_cpu_affinity_mask);
-                    }
+    bool is_topology_parsed() { return initialization_state == topology_parsed; }
 
-                    if (initialization_state >= topology_allocated) { hwloc_topology_destroy(topology); }
+    static void construct( std::size_t groups_num ) {
+        if (instance_ptr == nullptr) {
+            instance_ptr = new system_topology();
+            instance_ptr->initialize(groups_num);
+        }
+    }
 
-                    initialization_state = uninitialized;
-                }
+    static system_topology& instance() {
+        __TBB_ASSERT(instance_ptr != nullptr, "Getting instance of non-constructed topology");
+        return *instance_ptr;
+    }
 
-                void fill_topology_information(int& _numa_nodes_count, int*& _numa_indexes_list,
-                                               int& _core_types_count, int*& _core_types_indexes_list) {
-                    __TBB_ASSERT(is_topology_parsed(),
-                                 "Trying to get access to uninitialized system_topology");
-                    _numa_nodes_count = numa_nodes_count;
-                    _numa_indexes_list = numa_indexes_list.data();
+    static void destroy() {
+        __TBB_ASSERT(instance_ptr != nullptr, "Destroying non-constructed topology");
+        delete instance_ptr;
+    }
 
-                    _core_types_count = (int) core_types_indexes_list.size();
-                    _core_types_indexes_list = core_types_indexes_list.data();
-                }
+    ~system_topology() {
+        if ( is_topology_parsed() ) {
+            for (auto& numa_node_mask : numa_affinity_masks_list) {
+                hwloc_bitmap_free(numa_node_mask);
+            }
 
-                void fill_constraints_affinity_mask(affinity_mask input_mask, int numa_node_index,
-                                                    int core_type_index, int max_threads_per_core) {
-                    __TBB_ASSERT(is_topology_parsed(),
-                                 "Trying to get access to uninitialized system_topology");
-                    __TBB_ASSERT(numa_node_index < (int) numa_affinity_masks_list.size(),
-                                 "Wrong NUMA node id");
-                    __TBB_ASSERT(core_type_index < (int) core_types_affinity_masks_list.size(),
-                                 "Wrong core type id");
-                    __TBB_ASSERT(max_threads_per_core == -1 || max_threads_per_core > 0,
-                                 "Wrong max_threads_per_core");
-
-                    hwloc_cpuset_t constraints_mask = hwloc_bitmap_alloc();
-                    hwloc_cpuset_t core_mask = hwloc_bitmap_alloc();
-
-                    hwloc_bitmap_copy(constraints_mask, process_cpu_affinity_mask);
-                    if (numa_node_index >= 0) {
-                        hwloc_bitmap_and(constraints_mask, constraints_mask,
-                                         numa_affinity_masks_list[numa_node_index]);
-                    }
-                    if (core_type_index >= 0) {
-                        hwloc_bitmap_and(constraints_mask, constraints_mask,
-                                         core_types_affinity_masks_list[core_type_index]);
-                    }
-                    if (max_threads_per_core > 0) {
-                        // clear input mask
-                        hwloc_bitmap_zero(input_mask);
-
-                        hwloc_obj_t current_core = nullptr;
-                        while ((current_core
-                                = hwloc_get_next_obj_by_type(topology, HWLOC_OBJ_CORE, current_core))
-                               != nullptr) {
-                            hwloc_bitmap_and(core_mask, constraints_mask, current_core->cpuset);
-
-                            // fit the core mask to required bits number
-                            int current_threads_per_core = 0;
-                            for (int id = hwloc_bitmap_first(core_mask); id != -1;
-                                 id = hwloc_bitmap_next(core_mask, id)) {
-                                if (++current_threads_per_core > max_threads_per_core) {
-                                    hwloc_bitmap_clr(core_mask, id);
-                                }
-                            }
-
-                            hwloc_bitmap_or(input_mask, input_mask, core_mask);
-                        }
-                    } else {
-                        hwloc_bitmap_copy(input_mask, constraints_mask);
-                    }
+            for (auto& core_type_mask : core_types_affinity_masks_list) {
+                hwloc_bitmap_free(core_type_mask);
+            }
 
-                    hwloc_bitmap_free(core_mask);
-                    hwloc_bitmap_free(constraints_mask);
-                }
+            for (auto& processor_group : processor_groups_affinity_masks_list) {
+                hwloc_bitmap_free(processor_group);
+            }
 
-                void fit_num_threads_per_core(affinity_mask result_mask, affinity_mask current_mask,
-                                              affinity_mask constraints_mask) {
-                    hwloc_bitmap_zero(result_mask);
-                    hwloc_obj_t current_core = nullptr;
-                    while ((current_core = hwloc_get_next_obj_by_type(topology, HWLOC_OBJ_CORE, current_core))
-                           != nullptr) {
-                        if (hwloc_bitmap_intersects(current_mask, current_core->cpuset)) {
-                            hwloc_bitmap_or(result_mask, result_mask, current_core->cpuset);
-                        }
+            hwloc_bitmap_free(process_node_affinity_mask);
+            hwloc_bitmap_free(process_cpu_affinity_mask);
+        }
+
+        if ( initialization_state >= topology_allocated ) {
+            hwloc_topology_destroy(topology);
+        }
+
+        initialization_state = uninitialized;
+    }
+
+    void fill_topology_information(
+        int& _numa_nodes_count, int*& _numa_indexes_list,
+        int& _core_types_count, int*& _core_types_indexes_list
+    ) {
+        __TBB_ASSERT(is_topology_parsed(), "Trying to get access to uninitialized system_topology");
+        _numa_nodes_count = numa_nodes_count;
+        _numa_indexes_list = numa_indexes_list.data();
+
+        _core_types_count = (int)core_types_indexes_list.size();
+        _core_types_indexes_list = core_types_indexes_list.data();
+    }
+
+    void fill_constraints_affinity_mask(affinity_mask input_mask, int numa_node_index, int core_type_index, int max_threads_per_core) {
+        __TBB_ASSERT(is_topology_parsed(), "Trying to get access to uninitialized system_topology");
+        __TBB_ASSERT(numa_node_index < (int)numa_affinity_masks_list.size(), "Wrong NUMA node id");
+        __TBB_ASSERT(core_type_index < (int)core_types_affinity_masks_list.size(), "Wrong core type id");
+        __TBB_ASSERT(max_threads_per_core == -1 || max_threads_per_core > 0, "Wrong max_threads_per_core");
+
+        hwloc_cpuset_t constraints_mask = hwloc_bitmap_alloc();
+        hwloc_cpuset_t core_mask = hwloc_bitmap_alloc();
+
+        hwloc_bitmap_copy(constraints_mask, process_cpu_affinity_mask);
+        if (numa_node_index >= 0) {
+            hwloc_bitmap_and(constraints_mask, constraints_mask, numa_affinity_masks_list[numa_node_index]);
+        }
+        if (core_type_index >= 0) {
+            hwloc_bitmap_and(constraints_mask, constraints_mask, core_types_affinity_masks_list[core_type_index]);
+        }
+        if (max_threads_per_core > 0) {
+            // clear input mask
+            hwloc_bitmap_zero(input_mask);
+
+            hwloc_obj_t current_core = nullptr;
+            while ((current_core = hwloc_get_next_obj_by_type(topology, HWLOC_OBJ_CORE, current_core)) != nullptr) {
+                hwloc_bitmap_and(core_mask, constraints_mask, current_core->cpuset);
+
+                // fit the core mask to required bits number
+                int current_threads_per_core = 0;
+                for (int id = hwloc_bitmap_first(core_mask); id != -1; id = hwloc_bitmap_next(core_mask, id)) {
+                    if (++current_threads_per_core > max_threads_per_core) {
+                        hwloc_bitmap_clr(core_mask, id);
                     }
-                    hwloc_bitmap_and(result_mask, result_mask, constraints_mask);
-                }
-
-                int get_default_concurrency(int numa_node_index, int core_type_index,
-                                            int max_threads_per_core) {
-                    __TBB_ASSERT(is_topology_parsed(),
-                                 "Trying to get access to uninitialized system_topology");
-
-                    hwloc_cpuset_t constraints_mask = hwloc_bitmap_alloc();
-                    fill_constraints_affinity_mask(constraints_mask, numa_node_index, core_type_index,
-                                                   max_threads_per_core);
-
-                    int default_concurrency = hwloc_bitmap_weight(constraints_mask);
-                    hwloc_bitmap_free(constraints_mask);
-                    return default_concurrency;
-                }
-
-                affinity_mask allocate_process_affinity_mask() {
-                    __TBB_ASSERT(is_topology_parsed(),
-                                 "Trying to get access to uninitialized system_topology");
-                    return hwloc_bitmap_dup(process_cpu_affinity_mask);
-                }
-
-                void free_affinity_mask(affinity_mask mask_to_free) {
-                    hwloc_bitmap_free(mask_to_free);// If bitmap is nullptr, no operation is performed.
                 }
 
-                void store_current_affinity_mask(affinity_mask current_mask) {
-                    assertion_hwloc_wrapper(hwloc_get_cpubind, topology, current_mask, HWLOC_CPUBIND_THREAD);
-
-                    hwloc_bitmap_and(current_mask, current_mask, process_cpu_affinity_mask);
-                    __TBB_ASSERT(!hwloc_bitmap_iszero(current_mask),
-                                 "Current affinity mask must intersects with process affinity mask");
-                }
-
-                void set_affinity_mask(const_affinity_mask mask) {
-                    if (hwloc_bitmap_weight(mask) > 0) {
-                        assertion_hwloc_wrapper(hwloc_set_cpubind, topology, mask, HWLOC_CPUBIND_THREAD);
-                    }
+                hwloc_bitmap_or(input_mask, input_mask, core_mask);
+            }
+        } else {
+            hwloc_bitmap_copy(input_mask, constraints_mask);
+        }
+
+        hwloc_bitmap_free(core_mask);
+        hwloc_bitmap_free(constraints_mask);
+    }
+
+    void fit_num_threads_per_core(affinity_mask result_mask, affinity_mask current_mask, affinity_mask constraints_mask) {
+        hwloc_bitmap_zero(result_mask);
+        hwloc_obj_t current_core = nullptr;
+        while ((current_core = hwloc_get_next_obj_by_type(topology, HWLOC_OBJ_CORE, current_core)) != nullptr) {
+            if (hwloc_bitmap_intersects(current_mask, current_core->cpuset)) {
+                hwloc_bitmap_or(result_mask, result_mask, current_core->cpuset);
+            }
+        }
+        hwloc_bitmap_and(result_mask, result_mask, constraints_mask);
+    }
+
+    /**
+     * Finds processor group for the passed slot number, which are from 0 to max concurrency - 1, by
+     * traversing masks of processor groups one by one, intersecting them with the constrained mask.
+     * Once total weight of processor groups united mask is greater than the slot number, the mask
+     * of the last traversed processor group is returned, denoting the mask to apply to the thread
+     * occupying given slot number.
+     */
+    void fit_to_processor_group(affinity_mask result_mask, affinity_mask constraints_mask, std::size_t slot_num) {
+        __TBB_ASSERT(number_of_processors_groups > 1, nullptr);
+        hwloc_bitmap_zero(result_mask);
+        int constraints_mask_weight = hwloc_bitmap_weight(constraints_mask);
+        // Map slot number to a number within constraints mask if
+        // max concurrency is greater than weight of the mask.
+        slot_num %= constraints_mask_weight;
+        std::size_t total_weight = 0;
+        for (auto& processor_group : processor_groups_affinity_masks_list) {
+            if (hwloc_bitmap_intersects(constraints_mask, processor_group)) {
+                hwloc_bitmap_and(result_mask, processor_group, constraints_mask);
+                total_weight += hwloc_bitmap_weight(result_mask);
+                if (slot_num < total_weight) {
+                    return;     // Corresponding processor group where to bind the thread is found
                 }
-            };
-
-            system_topology* system_topology::instance_ptr {nullptr};
-
-            class binding_handler {
-                // Following vector saves thread affinity mask on scheduler entry to return it to this thread
-                // on scheduler exit.
-                typedef std::vector<system_topology::affinity_mask> affinity_masks_container;
-                affinity_masks_container affinity_backup;
-                system_topology::affinity_mask handler_affinity_mask;
-
-#if WIN32
-                affinity_masks_container affinity_buffer;
-                int my_numa_node_id;
-                int my_core_type_id;
-                int my_max_threads_per_core;
+            }
+        }
+    }
+
+    int get_default_concurrency(int numa_node_index, int core_type_index, int max_threads_per_core) {
+        __TBB_ASSERT(is_topology_parsed(), "Trying to get access to uninitialized system_topology");
+
+        hwloc_cpuset_t constraints_mask = hwloc_bitmap_alloc();
+        fill_constraints_affinity_mask(constraints_mask, numa_node_index, core_type_index, max_threads_per_core);
+
+        int default_concurrency = hwloc_bitmap_weight(constraints_mask);
+        hwloc_bitmap_free(constraints_mask);
+        return default_concurrency;
+    }
+
+    affinity_mask allocate_process_affinity_mask() {
+        __TBB_ASSERT(is_topology_parsed(), "Trying to get access to uninitialized system_topology");
+        return hwloc_bitmap_dup(process_cpu_affinity_mask);
+    }
+
+    void free_affinity_mask( affinity_mask mask_to_free ) {
+        hwloc_bitmap_free(mask_to_free); // If bitmap is nullptr, no operation is performed.
+    }
+
+    void store_current_affinity_mask( affinity_mask current_mask ) {
+        assertion_hwloc_wrapper(hwloc_get_cpubind, topology, current_mask, HWLOC_CPUBIND_THREAD);
+
+        hwloc_bitmap_and(current_mask, current_mask, process_cpu_affinity_mask);
+        __TBB_ASSERT(!hwloc_bitmap_iszero(current_mask),
+            "Current affinity mask must intersects with process affinity mask");
+    }
+
+    void set_affinity_mask( const_affinity_mask mask ) {
+        if (hwloc_bitmap_weight(mask) > 0) {
+            assertion_hwloc_wrapper(hwloc_set_cpubind, topology, mask, HWLOC_CPUBIND_THREAD);
+        }
+    }
+};
+
+system_topology* system_topology::instance_ptr{nullptr};
+
+class binding_handler {
+    // Following vector saves thread affinity mask on scheduler entry to return it to this thread
+    // on scheduler exit.
+    typedef std::vector<system_topology::affinity_mask> affinity_masks_container;
+    affinity_masks_container affinity_backup;
+    system_topology::affinity_mask handler_affinity_mask;
+
+#ifdef _WIN32
+    affinity_masks_container affinity_buffer;
+    int my_numa_node_id;
+    int my_core_type_id;
+    int my_max_threads_per_core;
 #endif
 
-            public:
-                binding_handler(std::size_t size, int numa_node_id, int core_type_id,
-                                int max_threads_per_core)
-                    : affinity_backup(size)
-#if WIN32
-                      ,
-                      affinity_buffer(size), my_numa_node_id(numa_node_id), my_core_type_id(core_type_id),
-                      my_max_threads_per_core(max_threads_per_core)
+public:
+    binding_handler( std::size_t size, int numa_node_id, int core_type_id, int max_threads_per_core )
+        : affinity_backup(size)
+#ifdef _WIN32
+        , affinity_buffer(size)
+        , my_numa_node_id(numa_node_id)
+        , my_core_type_id(core_type_id)
+        , my_max_threads_per_core(max_threads_per_core)
 #endif
-                {
-                    for (std::size_t i = 0; i < size; ++i) {
-                        affinity_backup[i] = system_topology::instance().allocate_process_affinity_mask();
-#if WIN32
-                        affinity_buffer[i] = system_topology::instance().allocate_process_affinity_mask();
+    {
+        for (std::size_t i = 0; i < size; ++i) {
+            affinity_backup[i] = system_topology::instance().allocate_process_affinity_mask();
+#ifdef _WIN32
+            affinity_buffer[i] = system_topology::instance().allocate_process_affinity_mask();
 #endif
-                    }
-                    handler_affinity_mask = system_topology::instance().allocate_process_affinity_mask();
-                    system_topology::instance().fill_constraints_affinity_mask(
-                            handler_affinity_mask, numa_node_id, core_type_id, max_threads_per_core);
-                }
-
-                ~binding_handler() {
-                    for (std::size_t i = 0; i < affinity_backup.size(); ++i) {
-                        system_topology::instance().free_affinity_mask(affinity_backup[i]);
-#if WIN32
-                        system_topology::instance().free_affinity_mask(affinity_buffer[i]);
+        }
+        handler_affinity_mask = system_topology::instance().allocate_process_affinity_mask();
+        system_topology::instance().fill_constraints_affinity_mask
+            (handler_affinity_mask, numa_node_id, core_type_id, max_threads_per_core);
+    }
+
+    ~binding_handler() {
+        for (std::size_t i = 0; i < affinity_backup.size(); ++i) {
+            system_topology::instance().free_affinity_mask(affinity_backup[i]);
+#ifdef _WIN32
+            system_topology::instance().free_affinity_mask(affinity_buffer[i]);
 #endif
-                    }
-                    system_topology::instance().free_affinity_mask(handler_affinity_mask);
-                }
-
-                void apply_affinity(unsigned slot_num) {
-                    auto& topology = system_topology::instance();
-                    __TBB_ASSERT(slot_num < affinity_backup.size(),
-                                 "The slot number is greater than the number of slots in the arena");
-                    __TBB_ASSERT(topology.is_topology_parsed(),
-                                 "Trying to get access to uninitialized system_topology");
-
-                    topology.store_current_affinity_mask(affinity_backup[slot_num]);
-
-#if WIN32
-                    // TBBBind supports only systems where NUMA nodes and core types do not cross the border
-                    // between several processor groups. So if a certain NUMA node or core type constraint
-                    // specified, then the constraints affinity mask will not cross the processor groups' border.
-
-                    // But if we have constraint based only on the max_threads_per_core setting, then the
-                    // constraints affinity mask does may cross the border between several processor groups
-                    // on machines with more then 64 hardware threads. That is why we need to use the special
-                    // function, which regulates the number of threads in the current threads mask.
-                    if (topology.number_of_processors_groups > 1 && my_max_threads_per_core != -1
-                        && (my_numa_node_id == -1 || topology.numa_indexes_list.size() == 1)
-                        && (my_core_type_id == -1 || topology.core_types_indexes_list.size() == 1)) {
-                        topology.fit_num_threads_per_core(affinity_buffer[slot_num],
-                                                          affinity_backup[slot_num], handler_affinity_mask);
-                        topology.set_affinity_mask(affinity_buffer[slot_num]);
-                        return;
-                    }
+        }
+        system_topology::instance().free_affinity_mask(handler_affinity_mask);
+    }
+
+    void apply_affinity( unsigned slot_num ) {
+        auto& topology = system_topology::instance();
+        __TBB_ASSERT(slot_num < affinity_backup.size(),
+            "The slot number is greater than the number of slots in the arena");
+        __TBB_ASSERT(topology.is_topology_parsed(),
+            "Trying to get access to uninitialized system_topology");
+
+        topology.store_current_affinity_mask(affinity_backup[slot_num]);
+        system_topology::affinity_mask thread_affinity = handler_affinity_mask;
+#ifdef _WIN32
+        // If we have a constraint based only on the max_threads_per_core setting, then the
+        // constraints affinity mask may cross the border between several processor groups
+        // on systems with more then 64 logical processors. That is why we need to use the special
+        // function, which regulates the number of threads in the current threads mask.
+        bool is_default_numa = my_numa_node_id == -1 || topology.numa_indexes_list.size() == 1;
+        bool is_default_core_type = my_core_type_id == -1 || topology.core_types_indexes_list.size() == 1;
+        if (topology.number_of_processors_groups > 1 && my_max_threads_per_core != -1 &&
+            is_default_numa && is_default_core_type
+        ) {
+            topology.fit_num_threads_per_core(affinity_buffer[slot_num], affinity_backup[slot_num], handler_affinity_mask);
+            thread_affinity = affinity_buffer[slot_num];
+        }
+    #if __TBBBIND_HWLOC_WINDOWS_API_AVAILABLE
+        else if (topology.number_of_processors_groups > 1) {
+            topology.fit_to_processor_group(affinity_buffer[slot_num], handler_affinity_mask, slot_num);
+            thread_affinity = affinity_buffer[slot_num];
+        }
+    #endif
 #endif
-                    topology.set_affinity_mask(handler_affinity_mask);
-                }
-
-                void restore_previous_affinity_mask(unsigned slot_num) {
-                    auto& topology = system_topology::instance();
-                    __TBB_ASSERT(topology.is_topology_parsed(),
-                                 "Trying to get access to uninitialized system_topology");
-                    topology.set_affinity_mask(affinity_backup[slot_num]);
-                };
-            };
-
-            extern "C" {// exported to TBB interfaces
-
-            TBBBIND_EXPORT void __TBB_internal_initialize_system_topology(std::size_t groups_num,
-                                                                          int& numa_nodes_count,
-                                                                          int*& numa_indexes_list,
-                                                                          int& core_types_count,
-                                                                          int*& core_types_indexes_list) {
-                system_topology::construct(groups_num);
-                system_topology::instance().fill_topology_information(
-                        numa_nodes_count, numa_indexes_list, core_types_count, core_types_indexes_list);
-            }
-
-            TBBBIND_EXPORT binding_handler*
-            __TBB_internal_allocate_binding_handler(int number_of_slots, int numa_id, int core_type_id,
-                                                    int max_threads_per_core) {
-                __TBB_ASSERT(number_of_slots > 0, "Trying to create numa handler for 0 threads.");
-                return new binding_handler(number_of_slots, numa_id, core_type_id, max_threads_per_core);
-            }
-
-            TBBBIND_EXPORT void __TBB_internal_deallocate_binding_handler(binding_handler* handler_ptr) {
-                __TBB_ASSERT(handler_ptr != nullptr, "Trying to deallocate nullptr pointer.");
-                delete handler_ptr;
-            }
-
-            TBBBIND_EXPORT void __TBB_internal_apply_affinity(binding_handler* handler_ptr, int slot_num) {
-                __TBB_ASSERT(handler_ptr != nullptr, "Trying to get access to uninitialized metadata.");
-                handler_ptr->apply_affinity(slot_num);
-            }
-
-            TBBBIND_EXPORT void __TBB_internal_restore_affinity(binding_handler* handler_ptr, int slot_num) {
-                __TBB_ASSERT(handler_ptr != nullptr, "Trying to get access to uninitialized metadata.");
-                handler_ptr->restore_previous_affinity_mask(slot_num);
-            }
-
-            TBBBIND_EXPORT int __TBB_internal_get_default_concurrency(int numa_id, int core_type_id,
-                                                                      int max_threads_per_core) {
-                return system_topology::instance().get_default_concurrency(numa_id, core_type_id,
-                                                                           max_threads_per_core);
-            }
-
-            void __TBB_internal_destroy_system_topology() { return system_topology::destroy(); }
-
-            }// extern "C"
-
-        }// namespace r1
-    }    // namespace detail
-}// namespace tbb
+        topology.set_affinity_mask(thread_affinity);
+    }
+
+    void restore_previous_affinity_mask( unsigned slot_num ) {
+        auto& topology = system_topology::instance();
+        __TBB_ASSERT(topology.is_topology_parsed(),
+            "Trying to get access to uninitialized system_topology");
+        topology.set_affinity_mask(affinity_backup[slot_num]);
+    };
+
+};
+
+extern "C" { // exported to TBB interfaces
+
+TBBBIND_EXPORT void __TBB_internal_initialize_system_topology(
+    std::size_t groups_num,
+    int& numa_nodes_count, int*& numa_indexes_list,
+    int& core_types_count, int*& core_types_indexes_list
+) {
+    system_topology::construct(groups_num);
+    system_topology::instance().fill_topology_information(
+        numa_nodes_count, numa_indexes_list,
+        core_types_count, core_types_indexes_list
+    );
+}
+
+TBBBIND_EXPORT binding_handler* __TBB_internal_allocate_binding_handler(int number_of_slots, int numa_id, int core_type_id, int max_threads_per_core) {
+    __TBB_ASSERT(number_of_slots > 0, "Trying to create numa handler for 0 threads.");
+    return new binding_handler(number_of_slots, numa_id, core_type_id, max_threads_per_core);
+}
+
+TBBBIND_EXPORT void __TBB_internal_deallocate_binding_handler(binding_handler* handler_ptr) {
+    __TBB_ASSERT(handler_ptr != nullptr, "Trying to deallocate nullptr pointer.");
+    delete handler_ptr;
+}
+
+TBBBIND_EXPORT void __TBB_internal_apply_affinity(binding_handler* handler_ptr, int slot_num) {
+    __TBB_ASSERT(handler_ptr != nullptr, "Trying to get access to uninitialized metadata.");
+    handler_ptr->apply_affinity(slot_num);
+}
+
+TBBBIND_EXPORT void __TBB_internal_restore_affinity(binding_handler* handler_ptr, int slot_num) {
+    __TBB_ASSERT(handler_ptr != nullptr, "Trying to get access to uninitialized metadata.");
+    handler_ptr->restore_previous_affinity_mask(slot_num);
+}
+
+TBBBIND_EXPORT int __TBB_internal_get_default_concurrency(int numa_id, int core_type_id, int max_threads_per_core) {
+    return system_topology::instance().get_default_concurrency(numa_id, core_type_id, max_threads_per_core);
+}
+
+TBBBIND_EXPORT void __TBB_internal_destroy_system_topology() {
+    return system_topology::destroy();
+}
+
+} // extern "C"
+
+} // namespace r1
+} // namespace detail
+} // namespace tbb
 
 #undef assertion_hwloc_wrapper
diff --git a/external/tbb/src/tbbbind/tbb_bind.rc b/external/tbb/src/tbbbind/tbb_bind.rc
new file mode 100644
index 00000000..d84d7310
--- /dev/null
+++ b/external/tbb/src/tbbbind/tbb_bind.rc
@@ -0,0 +1,74 @@
+// Copyright (c) 2005-2025 Intel Corporation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Includes
+//
+#include <winresrc.h>
+#include "../../include/oneapi/tbb/version.h"
+
+/////////////////////////////////////////////////////////////////////////////
+// Neutral resources
+
+#ifdef _WIN32
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+#define TBB_VERNUMBERS TBB_VERSION_MAJOR,TBB_VERSION_MINOR,TBB_VERSION_PATCH
+#define TBB_VERSION TBB_VERSION_STRING
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION TBB_VERNUMBERS
+ PRODUCTVERSION TBB_VERNUMBERS
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "000004b0"
+        BEGIN
+            VALUE "CompanyName", "Intel Corporation\0"
+            VALUE "FileDescription", "oneAPI Threading Building Blocks (oneTBB) library\0"
+            VALUE "FileVersion", TBB_VERSION "\0"
+            VALUE "LegalCopyright", "Copyright 2005-2025 Intel Corporation.  All Rights Reserved.\0"
+            VALUE "LegalTrademarks", "\0"
+#ifndef TBB_USE_DEBUG
+            VALUE "OriginalFilename", "tbbbind.dll\0"
+#else
+            VALUE "OriginalFilename", "tbbbind_debug.dll\0"
+#endif
+            VALUE "ProductName", "oneAPI Threading Building Blocks (oneTBB)\0"
+            VALUE "ProductVersion", TBB_VERSION "\0"
+            VALUE "PrivateBuild", "\0"
+            VALUE "SpecialBuild", "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x0, 1200
+    END
+END
diff --git a/external/tbb/src/tbbmalloc/CMakeLists.txt b/external/tbb/src/tbbmalloc/CMakeLists.txt
index f77bc8f1..76044fce 100644
--- a/external/tbb/src/tbbmalloc/CMakeLists.txt
+++ b/external/tbb/src/tbbmalloc/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Intel Corporation
+# Copyright (c) 2020-2024 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,6 +19,10 @@ add_library(tbbmalloc
     large_objects.cpp
     tbbmalloc.cpp
     ../tbb/itt_notify.cpp)
+    
+if (WIN32)
+    target_sources(tbbmalloc PRIVATE tbbmalloc.rc)
+endif()
 
 add_library(TBB::tbbmalloc ALIAS tbbmalloc)
 
@@ -30,7 +34,7 @@ target_compile_definitions(tbbmalloc
                            $<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:__TBB_DYNAMIC_LOAD_ENABLED=0>
                            $<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:__TBB_SOURCE_DIRECTLY_INCLUDED=1>)
 
-if (NOT ("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "(armv7-a|aarch64|mips|arm64)" OR
+if (NOT ("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "(armv7-a|aarch64|mips|arm64|riscv)" OR
          "${CMAKE_OSX_ARCHITECTURES}" MATCHES "arm64" OR
          WINDOWS_STORE OR
          TBB_WINDOWS_DRIVER OR
@@ -46,20 +50,19 @@ target_include_directories(tbbmalloc
 # TODO: fix warnings
 if (MSVC)
     # signed unsigned mismatch, declaration hides class member
-    set(TBB_WARNING_SUPPRESS ${TBB_WARNING_SUPPRESS} /wd4267 /wd4244 /wd4245 /wd4018 /wd4458)
+    set(TBB_WARNING_SUPPRESS ${TBB_WARNING_SUPPRESS} /wd4267 /wd4244 /wd4245 /wd4458)
 endif()
 
-# TODO: add ${TBB_WARNING_LEVEL} and fix problems
 target_compile_options(tbbmalloc
     PRIVATE
     ${TBB_CXX_STD_FLAG} # TODO: consider making it PUBLIC.
     ${TBB_MMD_FLAG}
     ${TBB_DSE_FLAG}
+    ${TBB_WARNING_LEVEL}
     ${TBB_WARNING_SUPPRESS}
     ${TBB_LIB_COMPILE_FLAGS}
     ${TBBMALLOC_LIB_COMPILE_FLAGS}
     ${TBB_COMMON_COMPILE_FLAGS}
-    ${TBB_IPO_COMPILE_FLAGS}
 )
 
 enable_language(C)
@@ -72,10 +75,12 @@ set_target_properties(tbbmalloc PROPERTIES
     LINKER_LANGUAGE C
 )
 
+tbb_handle_ipo(tbbmalloc)
+
 if (TBB_DEF_FILE_PREFIX) # If there's no prefix, assume we're using export directives
     set_target_properties(tbbmalloc PROPERTIES
-        LINK_FLAGS ${TBB_LINK_DEF_FILE_FLAG}${CMAKE_CURRENT_SOURCE_DIR}/def/${TBB_DEF_FILE_PREFIX}-tbbmalloc.def
-        LINK_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/def/${TBB_DEF_FILE_PREFIX}-tbbmalloc.def
+        LINK_FLAGS "${TBB_LINK_DEF_FILE_FLAG}\"${CMAKE_CURRENT_SOURCE_DIR}/def/${TBB_DEF_FILE_PREFIX}-tbbmalloc.def\""
+        LINK_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/def/${TBB_DEF_FILE_PREFIX}-tbbmalloc.def"
     )
 endif()
 
@@ -88,14 +93,12 @@ if (COMMAND target_link_options)
         PRIVATE
         ${TBB_LIB_LINK_FLAGS}
         ${TBB_COMMON_LINK_FLAGS}
-        ${TBB_IPO_LINK_FLAGS}
     )
 else()
     target_link_libraries(tbbmalloc
         PRIVATE
         ${TBB_LIB_LINK_FLAGS}
         ${TBB_COMMON_LINK_FLAGS}
-        ${TBB_IPO_LINK_FLAGS}
     )
 endif()
 
@@ -106,5 +109,15 @@ target_link_libraries(tbbmalloc
     ${TBB_COMMON_LINK_LIBS}
 )
 
-tbb_install_target(tbbmalloc)
+if(TBB_BUILD_APPLE_FRAMEWORKS)
+    set_target_properties(tbbmalloc PROPERTIES 
+        FRAMEWORK TRUE
+        FRAMEWORK_VERSION ${TBBMALLOC_BINARY_VERSION}.${TBB_BINARY_MINOR_VERSION}
+        XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER com.intel.tbbmalloc
+        MACOSX_FRAMEWORK_IDENTIFIER com.intel.tbbmalloc
+        MACOSX_FRAMEWORK_BUNDLE_VERSION ${TBBMALLOC_BINARY_VERSION}.${TBB_BINARY_MINOR_VERSION}
+        MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${TBBMALLOC_BINARY_VERSION}
+    )
+endif()
 
+tbb_install_target(tbbmalloc)
diff --git a/external/tbb/src/tbbmalloc/Customize.h b/external/tbb/src/tbbmalloc/Customize.h
index bd62f268..fdb61643 100644
--- a/external/tbb/src/tbbmalloc/Customize.h
+++ b/external/tbb/src/tbbmalloc/Customize.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2023 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -37,16 +37,18 @@
 #define MALLOC_ITT_SYNC_RELEASING(pointer) ITT_NOTIFY(sync_releasing, (pointer))
 #define MALLOC_ITT_SYNC_CANCEL(pointer) ITT_NOTIFY(sync_cancel, (pointer))
 #define MALLOC_ITT_FINI_ITTLIB()        ITT_FINI_ITTLIB()
+#define MALLOC_ITT_RELEASE_RESOURCES()  ITT_RELEASE_RESOURCES()
 #else
 #define MALLOC_ITT_SYNC_PREPARE(pointer) ((void)0)
 #define MALLOC_ITT_SYNC_ACQUIRED(pointer) ((void)0)
 #define MALLOC_ITT_SYNC_RELEASING(pointer) ((void)0)
 #define MALLOC_ITT_SYNC_CANCEL(pointer) ((void)0)
 #define MALLOC_ITT_FINI_ITTLIB()        ((void)0)
+#define MALLOC_ITT_RELEASE_RESOURCES()  ((void)0)
 #endif
 
 inline intptr_t BitScanRev(uintptr_t x) {
-    return !x? -1 : tbb::detail::log2(x);
+    return x == 0 ? -1 : static_cast<intptr_t>(tbb::detail::log2(x));
 }
 
 template<typename T>
diff --git a/external/tbb/src/tbbmalloc/MapMemory.h b/external/tbb/src/tbbmalloc/MapMemory.h
index 9dd96553..63b4bc37 100644
--- a/external/tbb/src/tbbmalloc/MapMemory.h
+++ b/external/tbb/src/tbbmalloc/MapMemory.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -44,7 +44,7 @@
  #undef XPG4_WAS_DEFINED
 #endif
 
-inline void* mmap_impl(size_t map_size, void* map_hint = NULL, int map_flags = 0) {
+inline void* mmap_impl(size_t map_size, void* map_hint = nullptr, int map_flags = 0) {
 #ifndef MAP_ANONYMOUS
 // macOS* defines MAP_ANON, which is deprecated in Linux*.
 #define MAP_ANONYMOUS MAP_ANON
@@ -63,7 +63,7 @@ inline void* mmapTHP(size_t bytes) {
 
     // Something went wrong
     if (result == MAP_FAILED) {
-        hint = NULL;
+        hint = nullptr;
         return MAP_FAILED;
     }
 
@@ -78,7 +78,7 @@ inline void* mmapTHP(size_t bytes) {
 
         // Something went wrong
         if (result == MAP_FAILED) {
-            hint = NULL;
+            hint = nullptr;
             return MAP_FAILED;
         }
 
@@ -113,7 +113,7 @@ inline void* mmapTHP(size_t bytes) {
 #define MEMORY_MAPPING_USES_MALLOC 0
 void* MapMemory (size_t bytes, PageType pageType)
 {
-    void* result = 0;
+    void* result = nullptr;
     int prevErrno = errno;
 
     switch (pageType) {
@@ -125,7 +125,7 @@ void* MapMemory (size_t bytes, PageType pageType)
         case PREALLOCATED_HUGE_PAGE:
         {
             MALLOC_ASSERT((bytes % HUGE_PAGE_SIZE) == 0, "Mapping size should be divisible by huge page size");
-            result = mmap_impl(bytes, NULL, __TBB_MAP_HUGETLB);
+            result = mmap_impl(bytes, nullptr, __TBB_MAP_HUGETLB);
             break;
         }
         case TRANSPARENT_HUGE_PAGE:
@@ -142,7 +142,7 @@ void* MapMemory (size_t bytes, PageType pageType)
 
     if (result == MAP_FAILED) {
         errno = prevErrno;
-        return 0;
+        return nullptr;
     }
 
     return result;
@@ -164,7 +164,7 @@ int UnmapMemory(void *area, size_t bytes)
 void* MapMemory (size_t bytes, PageType)
 {
     /* Is VirtualAlloc thread safe? */
-    return VirtualAlloc(NULL, bytes, MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE);
+    return VirtualAlloc(nullptr, bytes, MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE);
 }
 
 int UnmapMemory(void *area, size_t /*bytes*/)
diff --git a/external/tbb/src/tbbmalloc/Statistics.h b/external/tbb/src/tbbmalloc/Statistics.h
index 456d7192..a8767a81 100644
--- a/external/tbb/src/tbbmalloc/Statistics.h
+++ b/external/tbb/src/tbbmalloc/Statistics.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -63,7 +63,7 @@ static inline int STAT_increment(int thread, int bin, int ctr)
 
 static inline void initStatisticsCollection() {
 #if defined(MALLOCENV_COLLECT_STATISTICS)
-    if (NULL != getenv(MALLOCENV_COLLECT_STATISTICS))
+    if (nullptr != getenv(MALLOCENV_COLLECT_STATISTICS))
         reportAllocationStatistics = true;
 #endif
 }
diff --git a/external/tbb/src/tbbmalloc/Synchronize.h b/external/tbb/src/tbbmalloc/Synchronize.h
index faa6553c..b25d7e24 100644
--- a/external/tbb/src/tbbmalloc/Synchronize.h
+++ b/external/tbb/src/tbbmalloc/Synchronize.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2023 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -62,6 +62,10 @@ class MallocMutex : tbb::detail::no_copy {
             }
             if (locked) *locked = m_taken;
         }
+
+        scoped_lock(scoped_lock& other) = delete;
+        scoped_lock& operator=(scoped_lock&) = delete;
+
         ~scoped_lock() {
             if (m_taken) {
                 m_mutex.unlock();
diff --git a/external/tbb/src/tbbmalloc/TypeDefinitions.h b/external/tbb/src/tbbmalloc/TypeDefinitions.h
index 81149166..bfadf61d 100644
--- a/external/tbb/src/tbbmalloc/TypeDefinitions.h
+++ b/external/tbb/src/tbbmalloc/TypeDefinitions.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2023 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@
 #       define __ARCH_ipf 1
 #   elif defined(_M_IX86)||defined(__i386__) // the latter for MinGW support
 #       define __ARCH_x86_32 1
-#   elif defined(_M_ARM) || defined(_M_ARM64)
+#   elif defined(_M_ARM) || defined(_M_ARM64) || defined(__aarch64__) // the latter for MinGW support
 #       define __ARCH_other 1
 #   else
 #       error Unknown processor architecture for Windows
diff --git a/external/tbb/src/tbbmalloc/backend.cpp b/external/tbb/src/tbbmalloc/backend.cpp
index 9e8fb086..87531f81 100644
--- a/external/tbb/src/tbbmalloc/backend.cpp
+++ b/external/tbb/src/tbbmalloc/backend.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2023 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -14,16 +14,16 @@
     limitations under the License.
 */
 
-#include "tbbmalloc_internal.h"
+#include <string.h>   /* for memset */
 #include <errno.h>
-#include <string.h> /* for memset */
+#include "tbbmalloc_internal.h"
 
 namespace rml {
-    namespace internal {
+namespace internal {
 
-        /*********** Code to acquire memory from the OS or other executive ****************/
+/*********** Code to acquire memory from the OS or other executive ****************/
 
-        /*
+/*
   syscall/malloc can set non-zero errno in case of failure,
   but later allocator might be able to find memory to fulfill the request.
   And we do not want changing of errno by successful scalable_malloc call.
@@ -39,1362 +39,1475 @@ namespace rml {
 /* assume MapMemory and UnmapMemory are customized */
 #endif
 
-        void *getRawMemory(size_t size, PageType pageType) { return MapMemory(size, pageType); }
+void* getRawMemory (size_t size, PageType pageType) {
+    return MapMemory(size, pageType);
+}
 
-        int freeRawMemory(void *object, size_t size) { return UnmapMemory(object, size); }
+int freeRawMemory (void *object, size_t size) {
+    return UnmapMemory(object, size);
+}
 
 #if CHECK_ALLOCATION_RANGE
 
-        void Backend::UsedAddressRange::registerAlloc(uintptr_t left, uintptr_t right) {
-            MallocMutex::scoped_lock lock(mutex);
-            if (left < leftBound.load(std::memory_order_relaxed))
-                leftBound.store(left, std::memory_order_relaxed);
-            if (right > rightBound.load(std::memory_order_relaxed))
-                rightBound.store(right, std::memory_order_relaxed);
-            MALLOC_ASSERT(leftBound.load(std::memory_order_relaxed), ASSERT_TEXT);
-            MALLOC_ASSERT(leftBound.load(std::memory_order_relaxed)
-                                  < rightBound.load(std::memory_order_relaxed),
-                          ASSERT_TEXT);
-            MALLOC_ASSERT(leftBound.load(std::memory_order_relaxed) <= left
-                                  && right <= rightBound.load(std::memory_order_relaxed),
-                          ASSERT_TEXT);
+void Backend::UsedAddressRange::registerAlloc(uintptr_t left, uintptr_t right)
+{
+    MallocMutex::scoped_lock lock(mutex);
+    if (left < leftBound.load(std::memory_order_relaxed))
+        leftBound.store(left, std::memory_order_relaxed);
+    if (right > rightBound.load(std::memory_order_relaxed))
+        rightBound.store(right, std::memory_order_relaxed);
+    MALLOC_ASSERT(leftBound.load(std::memory_order_relaxed), ASSERT_TEXT);
+    MALLOC_ASSERT(leftBound.load(std::memory_order_relaxed) < rightBound.load(std::memory_order_relaxed), ASSERT_TEXT);
+    MALLOC_ASSERT(leftBound.load(std::memory_order_relaxed) <= left && right <= rightBound.load(std::memory_order_relaxed), ASSERT_TEXT);
+}
+
+void Backend::UsedAddressRange::registerFree(uintptr_t left, uintptr_t right)
+{
+    MallocMutex::scoped_lock lock(mutex);
+    if (leftBound.load(std::memory_order_relaxed) == left) {
+        if (rightBound.load(std::memory_order_relaxed) == right) {
+            leftBound.store(ADDRESS_UPPER_BOUND, std::memory_order_relaxed);
+            rightBound.store(0, std::memory_order_relaxed);
+        } else
+            leftBound.store(right, std::memory_order_relaxed);
+    } else if (rightBound.load(std::memory_order_relaxed) == right)
+        rightBound.store(left, std::memory_order_relaxed);
+    MALLOC_ASSERT((!rightBound.load(std::memory_order_relaxed) && leftBound.load(std::memory_order_relaxed) == ADDRESS_UPPER_BOUND)
+                  || leftBound.load(std::memory_order_relaxed) < rightBound.load(std::memory_order_relaxed), ASSERT_TEXT);
+}
+#endif // CHECK_ALLOCATION_RANGE
+
+// Initialized in frontend inside defaultMemPool
+extern HugePagesStatus hugePages;
+
+void *Backend::allocRawMem(size_t &size)
+{
+    void *res = nullptr;
+    size_t allocSize = 0;
+
+    if (extMemPool->userPool()) {
+        if (extMemPool->fixedPool && bootsrapMemDone == bootsrapMemStatus.load(std::memory_order_acquire))
+            return nullptr;
+        MALLOC_ASSERT(bootsrapMemStatus != bootsrapMemNotDone,
+                      "Backend::allocRawMem() called prematurely?");
+        // TODO: support for raw mem not aligned at sizeof(uintptr_t)
+        // memory from fixed pool is asked once and only once
+        allocSize = alignUpGeneric(size, extMemPool->granularity);
+        res = (*extMemPool->rawAlloc)(extMemPool->poolId, allocSize);
+    } else {
+        // Align allocation on page size
+        size_t pageSize = hugePages.isEnabled ? hugePages.getGranularity() : extMemPool->granularity;
+        MALLOC_ASSERT(pageSize, "Page size cannot be zero.");
+        allocSize = alignUpGeneric(size, pageSize);
+
+        // If user requested huge pages and they are available, try to use preallocated ones firstly.
+        // If there are none, lets check transparent huge pages support and use them instead.
+        if (hugePages.isEnabled) {
+            if (hugePages.isHPAvailable) {
+                res = getRawMemory(allocSize, PREALLOCATED_HUGE_PAGE);
+            }
+            if (!res && hugePages.isTHPAvailable) {
+                res = getRawMemory(allocSize, TRANSPARENT_HUGE_PAGE);
+            }
         }
 
-        void Backend::UsedAddressRange::registerFree(uintptr_t left, uintptr_t right) {
-            MallocMutex::scoped_lock lock(mutex);
-            if (leftBound.load(std::memory_order_relaxed) == left) {
-                if (rightBound.load(std::memory_order_relaxed) == right) {
-                    leftBound.store(ADDRESS_UPPER_BOUND, std::memory_order_relaxed);
-                    rightBound.store(0, std::memory_order_relaxed);
-                } else
-                    leftBound.store(right, std::memory_order_relaxed);
-            } else if (rightBound.load(std::memory_order_relaxed) == right)
-                rightBound.store(left, std::memory_order_relaxed);
-            MALLOC_ASSERT((!rightBound.load(std::memory_order_relaxed)
-                           && leftBound.load(std::memory_order_relaxed) == ADDRESS_UPPER_BOUND)
-                                  || leftBound.load(std::memory_order_relaxed)
-                                             < rightBound.load(std::memory_order_relaxed),
-                          ASSERT_TEXT);
+        if (!res) {
+            res = getRawMemory(allocSize, REGULAR);
         }
-#endif// CHECK_ALLOCATION_RANGE
-
-        // Initialized in frontend inside defaultMemPool
-        extern HugePagesStatus hugePages;
-
-        void *Backend::allocRawMem(size_t &size) {
-            void *res = NULL;
-            size_t allocSize = 0;
-
-            if (extMemPool->userPool()) {
-                if (extMemPool->fixedPool
-                    && bootsrapMemDone == bootsrapMemStatus.load(std::memory_order_acquire))
-                    return NULL;
-                MALLOC_ASSERT(bootsrapMemStatus != bootsrapMemNotDone,
-                              "Backend::allocRawMem() called prematurely?");
-                // TODO: support for raw mem not aligned at sizeof(uintptr_t)
-                // memory from fixed pool is asked once and only once
-                allocSize = alignUpGeneric(size, extMemPool->granularity);
-                res = (*extMemPool->rawAlloc)(extMemPool->poolId, allocSize);
-            } else {
-                // Align allocation on page size
-                size_t pageSize = hugePages.isEnabled ? hugePages.getGranularity() : extMemPool->granularity;
-                MALLOC_ASSERT(pageSize, "Page size cannot be zero.");
-                allocSize = alignUpGeneric(size, pageSize);
-
-                // If user requested huge pages and they are available, try to use preallocated ones firstly.
-                // If there are none, lets check transparent huge pages support and use them instead.
-                if (hugePages.isEnabled) {
-                    if (hugePages.isHPAvailable) { res = getRawMemory(allocSize, PREALLOCATED_HUGE_PAGE); }
-                    if (!res && hugePages.isTHPAvailable) {
-                        res = getRawMemory(allocSize, TRANSPARENT_HUGE_PAGE);
-                    }
-                }
-
-                if (!res) { res = getRawMemory(allocSize, REGULAR); }
-            }
+    }
 
-            if (res) {
-                MALLOC_ASSERT(allocSize > 0, "Invalid size of an allocated region.");
-                size = allocSize;
-                if (!extMemPool->userPool())
-                    usedAddrRange.registerAlloc((uintptr_t) res, (uintptr_t) res + size);
+    if (res) {
+        MALLOC_ASSERT(allocSize > 0, "Invalid size of an allocated region.");
+        size = allocSize;
+        if (!extMemPool->userPool())
+            usedAddrRange.registerAlloc((uintptr_t)res, (uintptr_t)res+size);
 #if MALLOC_DEBUG
-                volatile size_t curTotalSize = totalMemSize;// to read global value once
-                MALLOC_ASSERT(curTotalSize + size > curTotalSize, "Overflow allocation size.");
+        volatile size_t curTotalSize = totalMemSize; // to read global value once
+        MALLOC_ASSERT(curTotalSize+size > curTotalSize, "Overflow allocation size.");
 #endif
-                totalMemSize.fetch_add(size);
-            }
+        totalMemSize.fetch_add(size);
+    }
 
-            return res;
-        }
+    return res;
+}
 
-        bool Backend::freeRawMem(void *object, size_t size) {
-            bool fail;
+bool Backend::freeRawMem(void *object, size_t size)
+{
+    bool fail;
 #if MALLOC_DEBUG
-            volatile size_t curTotalSize = totalMemSize;// to read global value once
-            MALLOC_ASSERT(curTotalSize - size < curTotalSize, "Negative allocation size.");
+    volatile size_t curTotalSize = totalMemSize; // to read global value once
+    MALLOC_ASSERT(curTotalSize-size < curTotalSize, "Negative allocation size.");
 #endif
-            totalMemSize.fetch_sub(size);
-            if (extMemPool->userPool()) {
-                MALLOC_ASSERT(!extMemPool->fixedPool, "No free for fixed-size pools.");
-                fail = (*extMemPool->rawFree)(extMemPool->poolId, object, size);
-            } else {
-                usedAddrRange.registerFree((uintptr_t) object, (uintptr_t) object + size);
-                fail = freeRawMemory(object, size);
-            }
-            // TODO: use result in all freeRawMem() callers
-            return !fail;
-        }
-
-        /********* End memory acquisition code ********************************/
-
-        // Protected object size. After successful locking returns size of locked block,
-        // and releasing requires setting block size.
-        class GuardedSize : tbb::detail::no_copy {
-            std::atomic<uintptr_t> value;
-
-        public:
-            enum State {
-                LOCKED,
-                COAL_BLOCK,// block is coalescing now
-                MAX_LOCKED_VAL = COAL_BLOCK,
-                LAST_REGION_BLOCK,// used to mark last block in region
-                // values after this are "normal" block sizes
-                MAX_SPEC_VAL = LAST_REGION_BLOCK
-            };
-
-            void initLocked() {
-                value.store(LOCKED, std::memory_order_release);
-            }// TBB_REVAMP_TODO: was relaxed
-            void makeCoalscing() {
-                MALLOC_ASSERT(value.load(std::memory_order_relaxed) == LOCKED, ASSERT_TEXT);
-                value.store(COAL_BLOCK, std::memory_order_release);// TBB_REVAMP_TODO: was relaxed
-            }
-            size_t tryLock(State state) {
-                MALLOC_ASSERT(state <= MAX_LOCKED_VAL, ASSERT_TEXT);
-                size_t sz = value.load(std::memory_order_acquire);
-                for (;;) {
-                    if (sz <= MAX_LOCKED_VAL) { break; }
-                    if (value.compare_exchange_strong(sz, state)) { break; }
-                }
-                return sz;
-            }
-            void unlock(size_t size) {
-                MALLOC_ASSERT(value.load(std::memory_order_relaxed) <= MAX_LOCKED_VAL,
-                              "The lock is not locked");
-                MALLOC_ASSERT(size > MAX_LOCKED_VAL, ASSERT_TEXT);
-                value.store(size, std::memory_order_release);
-            }
-            bool isLastRegionBlock() const {
-                return value.load(std::memory_order_relaxed) == LAST_REGION_BLOCK;
-            }
-            friend void Backend::IndexedBins::verify();
-        };
-
-        struct MemRegion {
-            MemRegion *next,// keep all regions in any pool to release all them on
-                    *prev;  // pool destroying, 2-linked list to release individual
-                            // regions.
-            size_t allocSz, // got from pool callback
-                    blockSz;// initial and maximal inner block size
-            MemRegionType type;
-        };
-
-        // this data must be unmodified while block is in use, so separate it
-        class BlockMutexes {
-        protected:
-            GuardedSize myL,// lock for me
-                    leftL;  // lock for left neighbor
-        };
-
-        class FreeBlock : BlockMutexes {
-        public:
-            static const size_t minBlockSize;
-            friend void Backend::IndexedBins::verify();
-
-            FreeBlock *prev,// in 2-linked list related to bin
-                    *next,
-                    *nextToFree;// used to form a queue during coalescing
-            // valid only when block is in processing, i.e. one is not free and not
-            size_t sizeTmp;// used outside of backend
-            int myBin;     // bin that is owner of the block
-            bool slabAligned;
-            bool blockInBin;// this block in myBin already
-
-            FreeBlock *rightNeig(size_t sz) const {
-                MALLOC_ASSERT(sz, ASSERT_TEXT);
-                return (FreeBlock *) ((uintptr_t) this + sz);
-            }
-            FreeBlock *leftNeig(size_t sz) const {
-                MALLOC_ASSERT(sz, ASSERT_TEXT);
-                return (FreeBlock *) ((uintptr_t) this - sz);
-            }
-
-            void initHeader() {
-                myL.initLocked();
-                leftL.initLocked();
+    totalMemSize.fetch_sub(size);
+    if (extMemPool->userPool()) {
+        MALLOC_ASSERT(!extMemPool->fixedPool, "No free for fixed-size pools.");
+        fail = (*extMemPool->rawFree)(extMemPool->poolId, object, size);
+    } else {
+        usedAddrRange.registerFree((uintptr_t)object, (uintptr_t)object + size);
+        fail = freeRawMemory(object, size);
+    }
+    // TODO: use result in all freeRawMem() callers
+    return !fail;
+}
+
+/********* End memory acquisition code ********************************/
+
+// Protected object size. After successful locking returns size of locked block,
+// and releasing requires setting block size.
+class GuardedSize : tbb::detail::no_copy {
+    std::atomic<uintptr_t> value;
+public:
+    enum State {
+        LOCKED,
+        COAL_BLOCK,        // block is coalescing now
+        MAX_LOCKED_VAL = COAL_BLOCK,
+        LAST_REGION_BLOCK, // used to mark last block in region
+        // values after this are "normal" block sizes
+        MAX_SPEC_VAL = LAST_REGION_BLOCK
+    };
+
+    void initLocked() { value.store(LOCKED, std::memory_order_release); } // TBB_REVAMP_TODO: was relaxed
+    void makeCoalscing() {
+        MALLOC_ASSERT(value.load(std::memory_order_relaxed) == LOCKED, ASSERT_TEXT);
+        value.store(COAL_BLOCK, std::memory_order_release); // TBB_REVAMP_TODO: was relaxed
+    }
+    size_t tryLock(State state) {
+        MALLOC_ASSERT(state <= MAX_LOCKED_VAL, ASSERT_TEXT);
+        size_t sz = value.load(std::memory_order_acquire);
+        for (;;) {
+            if (sz <= MAX_LOCKED_VAL) {
+                break;
             }
-            void setMeFree(size_t size) { myL.unlock(size); }
-            size_t trySetMeUsed(GuardedSize::State s) { return myL.tryLock(s); }
-            bool isLastRegionBlock() const { return myL.isLastRegionBlock(); }
-
-            void setLeftFree(size_t sz) { leftL.unlock(sz); }
-            size_t trySetLeftUsed(GuardedSize::State s) { return leftL.tryLock(s); }
-
-            size_t tryLockBlock() {
-                size_t rSz, sz = trySetMeUsed(GuardedSize::LOCKED);
-
-                if (sz <= GuardedSize::MAX_LOCKED_VAL) return false;
-                rSz = rightNeig(sz)->trySetLeftUsed(GuardedSize::LOCKED);
-                if (rSz <= GuardedSize::MAX_LOCKED_VAL) {
-                    setMeFree(sz);
-                    return false;
-                }
-                MALLOC_ASSERT(rSz == sz, ASSERT_TEXT);
-                return sz;
-            }
-            void markCoalescing(size_t blockSz) {
-                myL.makeCoalscing();
-                rightNeig(blockSz)->leftL.makeCoalscing();
-                sizeTmp = blockSz;
-                nextToFree = NULL;
-            }
-            void markUsed() {
-                myL.initLocked();
-                rightNeig(sizeTmp)->leftL.initLocked();
-                nextToFree = NULL;
+            if (value.compare_exchange_strong(sz, state)) {
+                break;
             }
-            static void markBlocks(FreeBlock *fBlock, int num, size_t size) {
-                for (int i = 1; i < num; i++) {
-                    fBlock = (FreeBlock *) ((uintptr_t) fBlock + size);
-                    fBlock->initHeader();
-                }
-            }
-        };
-
-        // Last block in any region. Its "size" field is GuardedSize::LAST_REGION_BLOCK,
-        // This kind of blocks used to find region header
-        // and have a possibility to return region back to OS
-        struct LastFreeBlock : public FreeBlock {
-            MemRegion *memRegion;
-        };
-
-        const size_t FreeBlock::minBlockSize = sizeof(FreeBlock);
-
-        inline bool BackendSync::waitTillBlockReleased(intptr_t startModifiedCnt) {
-            AtomicBackoff backoff;
-#if __TBB_MALLOC_BACKEND_STAT
-            class ITT_Guard {
-                void *ptr;
-
-            public:
-                ITT_Guard(void *p) : ptr(p) { MALLOC_ITT_SYNC_PREPARE(ptr); }
-                ~ITT_Guard() { MALLOC_ITT_SYNC_ACQUIRED(ptr); }
-            };
-            ITT_Guard ittGuard(&inFlyBlocks);
-#endif
-            for (intptr_t myBinsInFlyBlocks = inFlyBlocks.load(std::memory_order_acquire),
-                          myCoalescQInFlyBlocks = backend->blocksInCoalescing();
-                 ; backoff.pause()) {
-                MALLOC_ASSERT(myBinsInFlyBlocks >= 0 && myCoalescQInFlyBlocks >= 0, NULL);
-                intptr_t currBinsInFlyBlocks = inFlyBlocks.load(std::memory_order_acquire),
-                         currCoalescQInFlyBlocks = backend->blocksInCoalescing();
-                WhiteboxTestingYield();
-                // Stop waiting iff:
-
-                // 1) blocks were removed from processing, not added
-                if (myBinsInFlyBlocks > currBinsInFlyBlocks
-                    // 2) released during delayed coalescing queue
-                    || myCoalescQInFlyBlocks > currCoalescQInFlyBlocks)
-                    break;
-                // 3) if there are blocks in coalescing, and no progress in its processing,
-                // try to scan coalescing queue and stop waiting, if changes were made
-                // (if there are no changes and in-fly blocks exist, we continue
-                //  waiting to not increase load on coalescQ)
-                if (currCoalescQInFlyBlocks > 0 && backend->scanCoalescQ(/*forceCoalescQDrop=*/false)) break;
-                // 4) when there are no blocks
-                if (!currBinsInFlyBlocks && !currCoalescQInFlyBlocks)
-                    // re-scan make sense only if bins were modified since scanned
-                    return startModifiedCnt != getNumOfMods();
-                myBinsInFlyBlocks = currBinsInFlyBlocks;
-                myCoalescQInFlyBlocks = currCoalescQInFlyBlocks;
-            }
-            return true;
         }
-
-        void CoalRequestQ::putBlock(FreeBlock *fBlock) {
-            MALLOC_ASSERT(fBlock->sizeTmp >= FreeBlock::minBlockSize, ASSERT_TEXT);
-            fBlock->markUsed();
-            // the block is in the queue, do not forget that it's here
-            inFlyBlocks++;
-
-            FreeBlock *myBlToFree = blocksToFree.load(std::memory_order_acquire);
-            for (;;) {
-                fBlock->nextToFree = myBlToFree;
-                if (blocksToFree.compare_exchange_strong(myBlToFree, fBlock)) { return; }
-            }
+        return sz;
+    }
+    void unlock(size_t size) {
+        MALLOC_ASSERT(value.load(std::memory_order_relaxed) <= MAX_LOCKED_VAL, "The lock is not locked");
+        MALLOC_ASSERT(size > MAX_LOCKED_VAL, ASSERT_TEXT);
+        value.store(size, std::memory_order_release);
+    }
+    bool isLastRegionBlock() const { return value.load(std::memory_order_relaxed) == LAST_REGION_BLOCK; }
+    friend void Backend::IndexedBins::verify();
+};
+
+struct MemRegion {
+    MemRegion *next,      // keep all regions in any pool to release all them on
+              *prev;      // pool destroying, 2-linked list to release individual
+                          // regions.
+    size_t     allocSz,   // got from pool callback
+               blockSz;   // initial and maximal inner block size
+    MemRegionType type;
+};
+
+// this data must be unmodified while block is in use, so separate it
+class BlockMutexes {
+protected:
+    GuardedSize myL,   // lock for me
+                leftL; // lock for left neighbor
+};
+
+class FreeBlock : BlockMutexes {
+public:
+    static const size_t minBlockSize;
+    friend void Backend::IndexedBins::verify();
+
+    FreeBlock    *prev,       // in 2-linked list related to bin
+                 *next,
+                 *nextToFree; // used to form a queue during coalescing
+    // valid only when block is in processing, i.e. one is not free and not
+    size_t        sizeTmp;    // used outside of backend
+    int           myBin;      // bin that is owner of the block
+    bool          slabAligned;
+    bool          blockInBin; // this block in myBin already
+
+    FreeBlock *rightNeig(size_t sz) const {
+        MALLOC_ASSERT(sz, ASSERT_TEXT);
+        return (FreeBlock*)((uintptr_t)this+sz);
+    }
+    FreeBlock *leftNeig(size_t sz) const {
+        MALLOC_ASSERT(sz, ASSERT_TEXT);
+        return (FreeBlock*)((uintptr_t)this - sz);
+    }
+
+    void initHeader() { myL.initLocked(); leftL.initLocked(); }
+    void setMeFree(size_t size) { myL.unlock(size); }
+    size_t trySetMeUsed(GuardedSize::State s) { return myL.tryLock(s); }
+    bool isLastRegionBlock() const { return myL.isLastRegionBlock(); }
+
+    void setLeftFree(size_t sz) { leftL.unlock(sz); }
+    size_t trySetLeftUsed(GuardedSize::State s) { return leftL.tryLock(s); }
+
+    size_t tryLockBlock() {
+        size_t rSz, sz = trySetMeUsed(GuardedSize::LOCKED);
+
+        if (sz <= GuardedSize::MAX_LOCKED_VAL)
+            return false;
+        rSz = rightNeig(sz)->trySetLeftUsed(GuardedSize::LOCKED);
+        if (rSz <= GuardedSize::MAX_LOCKED_VAL) {
+            setMeFree(sz);
+            return false;
         }
-
-        FreeBlock *CoalRequestQ::getAll() {
-            for (;;) {
-                FreeBlock *myBlToFree = blocksToFree.load(std::memory_order_acquire);
-
-                if (!myBlToFree) {
-                    return NULL;
-                } else {
-                    if (blocksToFree.compare_exchange_strong(myBlToFree, 0)) {
-                        return myBlToFree;
-                    } else {
-                        continue;
-                    }
-                }
-            }
+        MALLOC_ASSERT(rSz == sz, ASSERT_TEXT);
+        return sz;
+    }
+    void markCoalescing(size_t blockSz) {
+        myL.makeCoalscing();
+        rightNeig(blockSz)->leftL.makeCoalscing();
+        sizeTmp = blockSz;
+        nextToFree = nullptr;
+    }
+    void markUsed() {
+        myL.initLocked();
+        rightNeig(sizeTmp)->leftL.initLocked();
+        nextToFree = nullptr;
+    }
+    static void markBlocks(FreeBlock *fBlock, int num, size_t size) {
+        for (int i=1; i<num; i++) {
+            fBlock = (FreeBlock*)((uintptr_t)fBlock + size);
+            fBlock->initHeader();
         }
+    }
+};
 
-        inline void CoalRequestQ::blockWasProcessed() {
-            bkndSync->binsModified();
-            int prev = inFlyBlocks.fetch_sub(1);
-            MALLOC_ASSERT(prev > 0, ASSERT_TEXT);
-        }
+// Last block in any region. Its "size" field is GuardedSize::LAST_REGION_BLOCK,
+// This kind of blocks used to find region header
+// and have a possibility to return region back to OS
+struct LastFreeBlock : public FreeBlock {
+    MemRegion *memRegion;
+};
 
-        // Try to get a block from a bin.
-        // If the remaining free space would stay in the same bin,
-        //     split the block without removing it.
-        // If the free space should go to other bin(s), remove the block.
-        // alignedBin is true, if all blocks in the bin have slab-aligned right side.
-        FreeBlock *Backend::IndexedBins::getFromBin(int binIdx, BackendSync *sync, size_t size,
-                                                    bool needAlignedRes, bool alignedBin, bool wait,
-                                                    int *binLocked) {
-            Bin *b = &freeBins[binIdx];
-        try_next:
-            FreeBlock *fBlock = NULL;
-            if (!b->empty()) {
-                bool locked;
-                MallocMutex::scoped_lock scopedLock(b->tLock, wait, &locked);
-
-                if (!locked) {
-                    if (binLocked) (*binLocked)++;
-                    return NULL;
-                }
+const size_t FreeBlock::minBlockSize = sizeof(FreeBlock);
 
-                for (FreeBlock *curr = b->head.load(std::memory_order_relaxed); curr; curr = curr->next) {
-                    size_t szBlock = curr->tryLockBlock();
-                    if (!szBlock) {
-                        // block is locked, re-do bin lock, as there is no place to spin
-                        // while block coalescing
-                        goto try_next;
-                    }
-
-                    // GENERAL CASE
-                    if (alignedBin || !needAlignedRes) {
-                        size_t splitSz = szBlock - size;
-                        // If we got a block as split result, it must have a room for control structures.
-                        if (szBlock >= size && (splitSz >= FreeBlock::minBlockSize || !splitSz))
-                            fBlock = curr;
-                    } else {
-                        // SPECIAL CASE, to get aligned block from unaligned bin we have to cut the middle of a block
-                        // and return remaining left and right part. Possible only in fixed pool scenario, assert for this
-                        // is set inside splitBlock() function.
-
-                        void *newB = alignUp(curr, slabSize);
-                        uintptr_t rightNew = (uintptr_t) newB + size;
-                        uintptr_t rightCurr = (uintptr_t) curr + szBlock;
-                        // Check if the block size is sufficient,
-                        // and also left and right split results are either big enough or non-existent
-                        if (rightNew <= rightCurr
-                            && (newB == curr
-                                || ((uintptr_t) newB - (uintptr_t) curr) >= FreeBlock::minBlockSize)
-                            && (rightNew == rightCurr || (rightCurr - rightNew) >= FreeBlock::minBlockSize))
-                            fBlock = curr;
-                    }
-
-                    if (fBlock) {
-                        // consume must be called before result of removing from a bin is visible externally.
-                        sync->blockConsumed();
-                        // TODO: think about cases when block stays in the same bin
-                        b->removeBlock(fBlock);
-                        if (freeBins[binIdx].empty()) bitMask.set(binIdx, false);
-                        fBlock->sizeTmp = szBlock;
-                        break;
-                    } else {// block size is not valid, search for next block in the bin
-                        curr->setMeFree(szBlock);
-                        curr->rightNeig(szBlock)->setLeftFree(szBlock);
-                    }
-                }
-            }
-            return fBlock;
-        }
-
-        bool Backend::IndexedBins::tryReleaseRegions(int binIdx, Backend *backend) {
-            Bin *b = &freeBins[binIdx];
-            FreeBlock *fBlockList = NULL;
-
-            // got all blocks from the bin and re-do coalesce on them
-            // to release single-block regions
-        try_next:
-            if (!b->empty()) {
-                MallocMutex::scoped_lock binLock(b->tLock);
-                for (FreeBlock *curr = b->head.load(std::memory_order_relaxed); curr;) {
-                    size_t szBlock = curr->tryLockBlock();
-                    if (!szBlock) goto try_next;
-
-                    FreeBlock *next = curr->next;
-
-                    b->removeBlock(curr);
-                    curr->sizeTmp = szBlock;
-                    curr->nextToFree = fBlockList;
-                    fBlockList = curr;
-                    curr = next;
-                }
-            }
-            return backend->coalescAndPutList(fBlockList, /*forceCoalescQDrop=*/true,
-                                              /*reportBlocksProcessed=*/false);
+inline bool BackendSync::waitTillBlockReleased(intptr_t startModifiedCnt)
+{
+    AtomicBackoff backoff;
+#if __TBB_MALLOC_BACKEND_STAT
+    class ITT_Guard {
+        void *ptr;
+    public:
+        ITT_Guard(void *p) : ptr(p) {
+            MALLOC_ITT_SYNC_PREPARE(ptr);
         }
-
-        void Backend::Bin::removeBlock(FreeBlock *fBlock) {
-            MALLOC_ASSERT(fBlock->next || fBlock->prev || fBlock == head.load(std::memory_order_relaxed),
-                          "Detected that a block is not in the bin.");
-            if (head.load(std::memory_order_relaxed) == fBlock)
-                head.store(fBlock->next, std::memory_order_relaxed);
-            if (tail == fBlock) tail = fBlock->prev;
-            if (fBlock->prev) fBlock->prev->next = fBlock->next;
-            if (fBlock->next) fBlock->next->prev = fBlock->prev;
+        ~ITT_Guard() {
+            MALLOC_ITT_SYNC_ACQUIRED(ptr);
         }
-
-        void Backend::IndexedBins::addBlock(int binIdx, FreeBlock *fBlock, size_t /* blockSz */,
-                                            bool addToTail) {
-            Bin *b = &freeBins[binIdx];
-            fBlock->myBin = binIdx;
-            fBlock->next = fBlock->prev = NULL;
-            {
-                MallocMutex::scoped_lock scopedLock(b->tLock);
-                if (addToTail) {
-                    fBlock->prev = b->tail;
-                    b->tail = fBlock;
-                    if (fBlock->prev) fBlock->prev->next = fBlock;
-                    if (!b->head.load(std::memory_order_relaxed))
-                        b->head.store(fBlock, std::memory_order_relaxed);
-                } else {
-                    fBlock->next = b->head.load(std::memory_order_relaxed);
-                    b->head.store(fBlock, std::memory_order_relaxed);
-                    if (fBlock->next) fBlock->next->prev = fBlock;
-                    if (!b->tail) b->tail = fBlock;
-                }
-            }
-            bitMask.set(binIdx, true);
-        }
-
-        bool Backend::IndexedBins::tryAddBlock(int binIdx, FreeBlock *fBlock, bool addToTail) {
-            bool locked;
-            Bin *b = &freeBins[binIdx];
-            fBlock->myBin = binIdx;
-            if (addToTail) {
-                fBlock->next = NULL;
-                {
-                    MallocMutex::scoped_lock scopedLock(b->tLock, /*wait=*/false, &locked);
-                    if (!locked) return false;
-                    fBlock->prev = b->tail;
-                    b->tail = fBlock;
-                    if (fBlock->prev) fBlock->prev->next = fBlock;
-                    if (!b->head.load(std::memory_order_relaxed))
-                        b->head.store(fBlock, std::memory_order_relaxed);
-                }
-            } else {
-                fBlock->prev = NULL;
-                {
-                    MallocMutex::scoped_lock scopedLock(b->tLock, /*wait=*/false, &locked);
-                    if (!locked) return false;
-                    fBlock->next = b->head.load(std::memory_order_relaxed);
-                    b->head.store(fBlock, std::memory_order_relaxed);
-                    if (fBlock->next) fBlock->next->prev = fBlock;
-                    if (!b->tail) b->tail = fBlock;
-                }
+    };
+    ITT_Guard ittGuard(&inFlyBlocks);
+#endif
+    intptr_t myBinsInFlyBlocks = inFlyBlocks.load(std::memory_order_acquire);
+    intptr_t myCoalescQInFlyBlocks = backend->blocksInCoalescing();
+    while (true) {
+        MALLOC_ASSERT(myBinsInFlyBlocks>=0 && myCoalescQInFlyBlocks>=0, nullptr);
+
+        intptr_t currBinsInFlyBlocks = inFlyBlocks.load(std::memory_order_acquire);
+        intptr_t currCoalescQInFlyBlocks = backend->blocksInCoalescing();
+        WhiteboxTestingYield();
+        // Stop waiting iff:
+
+        // 1) blocks were removed from processing, not added
+        if (myBinsInFlyBlocks > currBinsInFlyBlocks
+        // 2) released during delayed coalescing queue
+            || myCoalescQInFlyBlocks > currCoalescQInFlyBlocks)
+            break;
+        // 3) if there are blocks in coalescing, and no progress in its processing,
+        // try to scan coalescing queue and stop waiting, if changes were made
+        // (if there are no changes and in-fly blocks exist, we continue
+        //  waiting to not increase load on coalescQ)
+        if (currCoalescQInFlyBlocks > 0 && backend->scanCoalescQ(/*forceCoalescQDrop=*/false))
+            break;
+        // 4) when there are no blocks
+        if (!currBinsInFlyBlocks && !currCoalescQInFlyBlocks) {
+            // re-scan make sense only if bins were modified since scanned
+            auto pool = backend->extMemPool;
+            if (pool->hardCachesCleanupInProgress.load(std::memory_order_acquire) ||
+                pool->softCachesCleanupInProgress.load(std::memory_order_acquire)) {
+                backoff.pause();
+                continue;
             }
-            bitMask.set(binIdx, true);
-            return true;
-        }
 
-        void Backend::IndexedBins::reset() {
-            for (unsigned i = 0; i < Backend::freeBinsNum; i++) freeBins[i].reset();
-            bitMask.reset();
+            return startModifiedCnt != getNumOfMods();
         }
-
-        void Backend::IndexedBins::lockRemoveBlock(int binIdx, FreeBlock *fBlock) {
-            MallocMutex::scoped_lock scopedLock(freeBins[binIdx].tLock);
-            freeBins[binIdx].removeBlock(fBlock);
-            if (freeBins[binIdx].empty()) bitMask.set(binIdx, false);
+        myBinsInFlyBlocks = currBinsInFlyBlocks;
+        myCoalescQInFlyBlocks = currCoalescQInFlyBlocks;
+        backoff.pause();
+    }
+    return true;
+}
+
+void CoalRequestQ::putBlock(FreeBlock *fBlock)
+{
+    MALLOC_ASSERT(fBlock->sizeTmp >= FreeBlock::minBlockSize, ASSERT_TEXT);
+    fBlock->markUsed();
+    // the block is in the queue, do not forget that it's here
+    inFlyBlocks++;
+
+    FreeBlock *myBlToFree = blocksToFree.load(std::memory_order_acquire);
+    for (;;) {
+        fBlock->nextToFree = myBlToFree;
+        if (blocksToFree.compare_exchange_strong(myBlToFree, fBlock)) {
+            return;
         }
-
-        bool ExtMemoryPool::regionsAreReleaseable() const { return !keepAllMemory && !delayRegsReleasing; }
-
-        FreeBlock *Backend::splitBlock(FreeBlock *fBlock, int num, size_t size, bool blockIsAligned,
-                                       bool needAlignedBlock) {
-            const size_t totalSize = num * size;
-
-            // SPECIAL CASE, for unaligned block we have to cut the middle of a block
-            // and return remaining left and right part. Possible only in a fixed pool scenario.
-            if (needAlignedBlock && !blockIsAligned) {
-                MALLOC_ASSERT(
-                        extMemPool->fixedPool,
-                        "Aligned block request from unaligned bin possible only in fixed pool scenario.");
-
-                // Space to use is in the middle
-                FreeBlock *newBlock = alignUp(fBlock, slabSize);
-                FreeBlock *rightPart = (FreeBlock *) ((uintptr_t) newBlock + totalSize);
-                uintptr_t fBlockEnd = (uintptr_t) fBlock + fBlock->sizeTmp;
-
-                // Return free right part
-                if ((uintptr_t) rightPart != fBlockEnd) {
-                    rightPart->initHeader();// to prevent coalescing rightPart with fBlock
-                    size_t rightSize = fBlockEnd - (uintptr_t) rightPart;
-                    coalescAndPut(rightPart, rightSize, toAlignedBin(rightPart, rightSize));
-                }
-                // And free left part
-                if (newBlock != fBlock) {
-                    newBlock->initHeader();// to prevent coalescing fBlock with newB
-                    size_t leftSize = (uintptr_t) newBlock - (uintptr_t) fBlock;
-                    coalescAndPut(fBlock, leftSize, toAlignedBin(fBlock, leftSize));
-                }
-                fBlock = newBlock;
-            } else if (size_t splitSize = fBlock->sizeTmp - totalSize) {// need to split the block
-                // GENERAL CASE, cut the left or right part of the block
-                FreeBlock *splitBlock = NULL;
-                if (needAlignedBlock) {
-                    // For slab aligned blocks cut the right side of the block
-                    // and return it to a requester, original block returns to backend
-                    splitBlock = fBlock;
-                    fBlock = (FreeBlock *) ((uintptr_t) splitBlock + splitSize);
-                    fBlock->initHeader();
-                } else {
-                    // For large object blocks cut original block and put free righ part to backend
-                    splitBlock = (FreeBlock *) ((uintptr_t) fBlock + totalSize);
-                    splitBlock->initHeader();
-                }
-                // Mark free block as it`s parent only when the requested type (needAlignedBlock)
-                // and returned from Bins/OS block (isAligned) are equal (XOR operation used)
-                bool markAligned = (blockIsAligned ^ needAlignedBlock) ? toAlignedBin(splitBlock, splitSize)
-                                                                       : blockIsAligned;
-                coalescAndPut(splitBlock, splitSize, markAligned);
+    }
+}
+
+FreeBlock *CoalRequestQ::getAll()
+{
+    for (;;) {
+        FreeBlock *myBlToFree = blocksToFree.load(std::memory_order_acquire);
+
+        if (!myBlToFree) {
+            return nullptr;
+        } else {
+            if (blocksToFree.compare_exchange_strong(myBlToFree, nullptr)) {
+                return myBlToFree;
+            } else {
+                continue;
             }
-            MALLOC_ASSERT(!needAlignedBlock || isAligned(fBlock, slabSize),
-                          "Expect to get aligned block, if one was requested.");
-            FreeBlock::markBlocks(fBlock, num, size);
-            return fBlock;
-        }
-
-        size_t Backend::getMaxBinnedSize() const {
-            return hugePages.isEnabled && !inUserPool() ? maxBinned_HugePage : maxBinned_SmallPage;
         }
-
-        inline bool Backend::MaxRequestComparator::operator()(size_t oldMaxReq, size_t requestSize) const {
-            return requestSize > oldMaxReq && requestSize < backend->getMaxBinnedSize();
+    }
+}
+
+inline void CoalRequestQ::blockWasProcessed()
+{
+    bkndSync->binsModified();
+    int prev = inFlyBlocks.fetch_sub(1);
+    tbb::detail::suppress_unused_warning(prev);
+    MALLOC_ASSERT(prev > 0, ASSERT_TEXT);
+}
+
+// Try to get a block from a bin.
+// If the remaining free space would stay in the same bin,
+//     split the block without removing it.
+// If the free space should go to other bin(s), remove the block.
+// alignedBin is true, if all blocks in the bin have slab-aligned right side.
+FreeBlock *Backend::IndexedBins::getFromBin(int binIdx, BackendSync *sync, size_t size,
+        bool needAlignedRes, bool alignedBin,  bool wait, int *binLocked)
+{
+    Bin *b = &freeBins[binIdx];
+try_next:
+    FreeBlock *fBlock = nullptr;
+    if (!b->empty()) {
+        bool locked = false;
+        MallocMutex::scoped_lock scopedLock(b->tLock, wait, &locked);
+
+        if (!locked) {
+            if (binLocked) (*binLocked)++;
+            return nullptr;
         }
 
-        // last chance to get memory
-        FreeBlock *Backend::releaseMemInCaches(intptr_t startModifiedCnt, int *lockedBinsThreshold,
-                                               int numOfLockedBins) {
-            // something released from caches
-            if (extMemPool->hardCachesCleanup()
-                // ..or can use blocks that are in processing now
-                || bkndSync.waitTillBlockReleased(startModifiedCnt))
-                return (FreeBlock *) VALID_BLOCK_IN_BIN;
-            // OS can't give us more memory, but we have some in locked bins
-            if (*lockedBinsThreshold && numOfLockedBins) {
-                *lockedBinsThreshold = 0;
-                return (FreeBlock *) VALID_BLOCK_IN_BIN;
+        for (FreeBlock *curr = b->head.load(std::memory_order_relaxed); curr; curr = curr->next) {
+            size_t szBlock = curr->tryLockBlock();
+            if (!szBlock) {
+                // block is locked, re-do bin lock, as there is no place to spin
+                // while block coalescing
+                goto try_next;
             }
-            return NULL;// nothing found, give up
-        }
 
-        FreeBlock *Backend::askMemFromOS(size_t blockSize, intptr_t startModifiedCnt,
-                                         int *lockedBinsThreshold, int numOfLockedBins, bool *splittableRet,
-                                         bool needSlabRegion) {
-            FreeBlock *block;
-            // The block sizes can be divided into 3 groups:
-            //   1. "quite small": popular object size, we are in bootstarp or something
-            //      like; request several regions.
-            //   2. "quite large": we want to have several such blocks in the region
-            //      but not want several pre-allocated regions.
-            //   3. "huge": exact fit, we allocate only one block and do not allow
-            //       any other allocations to placed in a region.
-            // Dividing the block sizes in these groups we are trying to balance between
-            // too small regions (that leads to fragmentation) and too large ones (that
-            // leads to excessive address space consumption). If a region is "too
-            // large", allocate only one, to prevent fragmentation. It supposedly
-            // doesn't hurt performance, because the object requested by user is large.
-            // Bounds for the groups are:
-            const size_t maxBinned = getMaxBinnedSize();
-            const size_t quiteSmall = maxBinned / 8;
-            const size_t quiteLarge = maxBinned;
-
-            if (blockSize >= quiteLarge) {
-                // Do not interact with other threads via semaphores, as for exact fit
-                // we can't share regions with them, memory requesting is individual.
-                block = addNewRegion(blockSize, MEMREG_ONE_BLOCK, /*addToBin=*/false);
-                if (!block) return releaseMemInCaches(startModifiedCnt, lockedBinsThreshold, numOfLockedBins);
-                *splittableRet = false;
+            // GENERAL CASE
+            if (alignedBin || !needAlignedRes) {
+                size_t splitSz = szBlock - size;
+                // If we got a block as split result, it must have a room for control structures.
+                if (szBlock >= size && (splitSz >= FreeBlock::minBlockSize || !splitSz))
+                    fBlock = curr;
             } else {
-                const size_t regSz_sizeBased = alignUp(4 * maxRequestedSize, 1024 * 1024);
-                // Another thread is modifying backend while we can't get the block.
-                // Wait while it leaves and re-do the scan
-                // before trying other ways to extend the backend.
-                if (bkndSync.waitTillBlockReleased(startModifiedCnt)
-                    // semaphore is protecting adding more more memory from OS
-                    || memExtendingSema.wait())
-                    return (FreeBlock *) VALID_BLOCK_IN_BIN;
-
-                if (startModifiedCnt != bkndSync.getNumOfMods()) {
-                    memExtendingSema.signal();
-                    return (FreeBlock *) VALID_BLOCK_IN_BIN;
-                }
-
-                if (blockSize < quiteSmall) {
-                    // For this size of blocks, add NUM_OF_REG "advance" regions in bin,
-                    // and return one as a result.
-                    // TODO: add to bin first, because other threads can use them right away.
-                    // This must be done carefully, because blocks in bins can be released
-                    // in releaseCachesToLimit().
-                    const unsigned NUM_OF_REG = 3;
-                    MemRegionType regType = needSlabRegion ? MEMREG_SLAB_BLOCKS : MEMREG_LARGE_BLOCKS;
-                    block = addNewRegion(regSz_sizeBased, regType, /*addToBin=*/false);
-                    if (block)
-                        for (unsigned idx = 0; idx < NUM_OF_REG; idx++)
-                            if (!addNewRegion(regSz_sizeBased, regType, /*addToBin=*/true)) break;
-                } else {
-                    block = addNewRegion(regSz_sizeBased, MEMREG_LARGE_BLOCKS, /*addToBin=*/false);
-                }
-                memExtendingSema.signal();
-
-                // no regions found, try to clean cache
-                if (!block || block == (FreeBlock *) VALID_BLOCK_IN_BIN)
-                    return releaseMemInCaches(startModifiedCnt, lockedBinsThreshold, numOfLockedBins);
-                // Since a region can hold more than one block it can be split.
-                *splittableRet = true;
+                // SPECIAL CASE, to get aligned block from unaligned bin we have to cut the middle of a block
+                // and return remaining left and right part. Possible only in fixed pool scenario, assert for this
+                // is set inside splitBlock() function.
+
+                void *newB = alignUp(curr, slabSize);
+                uintptr_t rightNew = (uintptr_t)newB + size;
+                uintptr_t rightCurr = (uintptr_t)curr + szBlock;
+                // Check if the block size is sufficient,
+                // and also left and right split results are either big enough or non-existent
+                if (rightNew <= rightCurr
+                        && (newB == curr || ((uintptr_t)newB - (uintptr_t)curr) >= FreeBlock::minBlockSize)
+                        && (rightNew == rightCurr || (rightCurr - rightNew) >= FreeBlock::minBlockSize))
+                    fBlock = curr;
             }
-            // after asking memory from OS, release caches if we above the memory limits
-            releaseCachesToLimit();
-
-            return block;
-        }
 
-        void Backend::releaseCachesToLimit() {
-            if (!memSoftLimit.load(std::memory_order_relaxed)
-                || totalMemSize.load(std::memory_order_relaxed)
-                           <= memSoftLimit.load(std::memory_order_relaxed)) {
-                return;
+            if (fBlock) {
+                // consume must be called before result of removing from a bin is visible externally.
+                sync->blockConsumed();
+                // TODO: think about cases when block stays in the same bin
+                b->removeBlock(fBlock);
+                if (freeBins[binIdx].empty())
+                    bitMask.set(binIdx, false);
+                fBlock->sizeTmp = szBlock;
+                break;
+            } else { // block size is not valid, search for next block in the bin
+                curr->setMeFree(szBlock);
+                curr->rightNeig(szBlock)->setLeftFree(szBlock);
             }
-            size_t locTotalMemSize, locMemSoftLimit;
-
-            scanCoalescQ(/*forceCoalescQDrop=*/false);
-            if (extMemPool->softCachesCleanup()
-                && (locTotalMemSize = totalMemSize.load(std::memory_order_acquire))
-                           <= (locMemSoftLimit = memSoftLimit.load(std::memory_order_acquire)))
-                return;
-            // clean global large-object cache, if this is not enough, clean local caches
-            // do this in several tries, because backend fragmentation can prevent
-            // region from releasing
-            for (int cleanLocal = 0; cleanLocal < 2; cleanLocal++)
-                while (cleanLocal ? extMemPool->allLocalCaches.cleanup(/*cleanOnlyUnused=*/true)
-                                  : extMemPool->loc.decreasingCleanup())
-                    if ((locTotalMemSize = totalMemSize.load(std::memory_order_acquire))
-                        <= (locMemSoftLimit = memSoftLimit.load(std::memory_order_acquire)))
-                        return;
-            // last chance to match memSoftLimit
-            extMemPool->hardCachesCleanup();
         }
-
-        int Backend::IndexedBins::getMinNonemptyBin(unsigned startBin) const {
-            int p = bitMask.getMinTrue(startBin);
-            return p == -1 ? Backend::freeBinsNum : p;
+    }
+    return fBlock;
+}
+
+bool Backend::IndexedBins::tryReleaseRegions(int binIdx, Backend *backend)
+{
+    Bin *b = &freeBins[binIdx];
+    FreeBlock *fBlockList = nullptr;
+
+    // got all blocks from the bin and re-do coalesce on them
+    // to release single-block regions
+try_next:
+    if (!b->empty()) {
+        MallocMutex::scoped_lock binLock(b->tLock);
+        for (FreeBlock *curr = b->head.load(std::memory_order_relaxed); curr; ) {
+            size_t szBlock = curr->tryLockBlock();
+            if (!szBlock)
+                goto try_next;
+
+            FreeBlock *next = curr->next;
+
+            b->removeBlock(curr);
+            curr->sizeTmp = szBlock;
+            curr->nextToFree = fBlockList;
+            fBlockList = curr;
+            curr = next;
         }
-
-        FreeBlock *Backend::IndexedBins::findBlock(int nativeBin, BackendSync *sync, size_t size,
-                                                   bool needAlignedBlock, bool alignedBin,
-                                                   int *numOfLockedBins) {
-            for (int i = getMinNonemptyBin(nativeBin); i < freeBinsNum; i = getMinNonemptyBin(i + 1))
-                if (FreeBlock *block = getFromBin(i, sync, size, needAlignedBlock, alignedBin, /*wait=*/false,
-                                                  numOfLockedBins))
-                    return block;
-
-            return NULL;
+    }
+    return backend->coalescAndPutList(fBlockList, /*forceCoalescQDrop=*/true,
+                                      /*reportBlocksProcessed=*/false);
+}
+
+void Backend::Bin::removeBlock(FreeBlock *fBlock)
+{
+    MALLOC_ASSERT(fBlock->next||fBlock->prev||fBlock== head.load(std::memory_order_relaxed),
+                  "Detected that a block is not in the bin.");
+    if (head.load(std::memory_order_relaxed) == fBlock)
+        head.store(fBlock->next, std::memory_order_relaxed);
+    if (tail == fBlock)
+        tail = fBlock->prev;
+    if (fBlock->prev)
+        fBlock->prev->next = fBlock->next;
+    if (fBlock->next)
+        fBlock->next->prev = fBlock->prev;
+}
+
+void Backend::IndexedBins::addBlock(int binIdx, FreeBlock *fBlock, size_t /* blockSz */, bool addToTail)
+{
+    Bin *b = &freeBins[binIdx];
+    fBlock->myBin = binIdx;
+    fBlock->next = fBlock->prev = nullptr;
+    {
+        MallocMutex::scoped_lock scopedLock(b->tLock);
+        if (addToTail) {
+            fBlock->prev = b->tail;
+            b->tail = fBlock;
+            if (fBlock->prev)
+                fBlock->prev->next = fBlock;
+            if (!b->head.load(std::memory_order_relaxed))
+                b->head.store(fBlock, std::memory_order_relaxed);
+        } else {
+            fBlock->next = b->head.load(std::memory_order_relaxed);
+            b->head.store(fBlock, std::memory_order_relaxed);
+            if (fBlock->next)
+                fBlock->next->prev = fBlock;
+            if (!b->tail)
+                b->tail = fBlock;
         }
-
-        void Backend::requestBootstrapMem() {
-            if (bootsrapMemDone == bootsrapMemStatus.load(std::memory_order_acquire)) return;
-            MallocMutex::scoped_lock lock(bootsrapMemStatusMutex);
-            if (bootsrapMemDone == bootsrapMemStatus) return;
-            MALLOC_ASSERT(bootsrapMemNotDone == bootsrapMemStatus, ASSERT_TEXT);
-            bootsrapMemStatus = bootsrapMemInitializing;
-            // request some rather big region during bootstrap in advance
-            // ok to get NULL here, as later we re-do a request with more modest size
-            addNewRegion(2 * 1024 * 1024, MEMREG_SLAB_BLOCKS, /*addToBin=*/true);
-            bootsrapMemStatus = bootsrapMemDone;
+    }
+    bitMask.set(binIdx, true);
+}
+
+bool Backend::IndexedBins::tryAddBlock(int binIdx, FreeBlock *fBlock, bool addToTail)
+{
+    bool locked = false;
+    Bin *b = &freeBins[binIdx];
+    fBlock->myBin = binIdx;
+    if (addToTail) {
+        fBlock->next = nullptr;
+        {
+            MallocMutex::scoped_lock scopedLock(b->tLock, /*wait=*/false, &locked);
+            if (!locked)
+                return false;
+            fBlock->prev = b->tail;
+            b->tail = fBlock;
+            if (fBlock->prev)
+                fBlock->prev->next = fBlock;
+            if (!b->head.load(std::memory_order_relaxed))
+                b->head.store(fBlock, std::memory_order_relaxed);
         }
-
-        // try to allocate size Byte block in available bins
-        // needAlignedRes is true if result must be slab-aligned
-        FreeBlock *Backend::genericGetBlock(int num, size_t size, bool needAlignedBlock) {
-            FreeBlock *block = NULL;
-            const size_t totalReqSize = num * size;
-            // no splitting after requesting new region, asks exact size
-            const int nativeBin = sizeToBin(totalReqSize);
-
-            requestBootstrapMem();
-            // If we found 2 or less locked bins, it's time to ask more memory from OS.
-            // But nothing can be asked from fixed pool. And we prefer wait, not ask
-            // for more memory, if block is quite large.
-            int lockedBinsThreshold = extMemPool->fixedPool || size >= maxBinned_SmallPage ? 0 : 2;
-
-            // Find maximal requested size limited by getMaxBinnedSize()
-            AtomicUpdate(maxRequestedSize, totalReqSize, MaxRequestComparator(this));
-            scanCoalescQ(/*forceCoalescQDrop=*/false);
-
-            bool splittable = true;
-            for (;;) {
-                const intptr_t startModifiedCnt = bkndSync.getNumOfMods();
-                int numOfLockedBins;
-
-                do {
-                    numOfLockedBins = 0;
-                    if (needAlignedBlock) {
-                        block = freeSlabAlignedBins.findBlock(nativeBin, &bkndSync, num * size,
-                                                              needAlignedBlock,
-                                                              /*alignedBin=*/true, &numOfLockedBins);
-                        if (!block && extMemPool->fixedPool)
-                            block = freeLargeBlockBins.findBlock(nativeBin, &bkndSync, num * size,
-                                                                 needAlignedBlock,
-                                                                 /*alignedBin=*/false, &numOfLockedBins);
-                    } else {
-                        block = freeLargeBlockBins.findBlock(nativeBin, &bkndSync, num * size,
-                                                             needAlignedBlock,
-                                                             /*alignedBin=*/false, &numOfLockedBins);
-                        if (!block && extMemPool->fixedPool)
-                            block = freeSlabAlignedBins.findBlock(nativeBin, &bkndSync, num * size,
-                                                                  needAlignedBlock,
-                                                                  /*alignedBin=*/true, &numOfLockedBins);
-                    }
-                } while (!block && numOfLockedBins > lockedBinsThreshold);
-
-                if (block) break;
-
-                if (!(scanCoalescQ(/*forceCoalescQDrop=*/true) | extMemPool->softCachesCleanup())) {
-                    // bins are not updated,
-                    // only remaining possibility is to ask for more memory
-                    block = askMemFromOS(totalReqSize, startModifiedCnt, &lockedBinsThreshold,
-                                         numOfLockedBins, &splittable, needAlignedBlock);
-                    if (!block) return NULL;
-                    if (block != (FreeBlock *) VALID_BLOCK_IN_BIN) {
-                        // size can be increased in askMemFromOS, that's why >=
-                        MALLOC_ASSERT(block->sizeTmp >= size, ASSERT_TEXT);
-                        break;
-                    }
-                    // valid block somewhere in bins, let's find it
-                    block = NULL;
-                }
-            }
-            MALLOC_ASSERT(block, ASSERT_TEXT);
-            if (splittable) {
-                // At this point we have to be sure that slabAligned attribute describes the right block state
-                block = splitBlock(block, num, size, block->slabAligned, needAlignedBlock);
-            }
-            // matched blockConsumed() from startUseBlock()
-            bkndSync.blockReleased();
-
-            return block;
+    } else {
+        fBlock->prev = nullptr;
+        {
+            MallocMutex::scoped_lock scopedLock(b->tLock, /*wait=*/false, &locked);
+            if (!locked)
+                return false;
+            fBlock->next = b->head.load(std::memory_order_relaxed);
+            b->head.store(fBlock, std::memory_order_relaxed);
+            if (fBlock->next)
+                fBlock->next->prev = fBlock;
+            if (!b->tail)
+                b->tail = fBlock;
         }
-
-        LargeMemoryBlock *Backend::getLargeBlock(size_t size) {
-            LargeMemoryBlock *lmb = (LargeMemoryBlock *) genericGetBlock(1, size, /*needAlignedRes=*/false);
-            if (lmb) {
-                lmb->unalignedSize = size;
-                if (extMemPool->userPool()) extMemPool->lmbList.add(lmb);
-            }
-            return lmb;
+    }
+    bitMask.set(binIdx, true);
+    return true;
+}
+
+void Backend::IndexedBins::reset()
+{
+    for (unsigned i=0; i<Backend::freeBinsNum; i++)
+        freeBins[i].reset();
+    bitMask.reset();
+}
+
+void Backend::IndexedBins::lockRemoveBlock(int binIdx, FreeBlock *fBlock)
+{
+    MallocMutex::scoped_lock scopedLock(freeBins[binIdx].tLock);
+    freeBins[binIdx].removeBlock(fBlock);
+    if (freeBins[binIdx].empty())
+        bitMask.set(binIdx, false);
+}
+
+bool ExtMemoryPool::regionsAreReleaseable() const
+{
+    return !keepAllMemory && !delayRegsReleasing;
+}
+
+FreeBlock *Backend::splitBlock(FreeBlock *fBlock, int num, size_t size, bool blockIsAligned, bool needAlignedBlock)
+{
+    const size_t totalSize = num * size;
+
+    // SPECIAL CASE, for unaligned block we have to cut the middle of a block
+    // and return remaining left and right part. Possible only in a fixed pool scenario.
+    if (needAlignedBlock && !blockIsAligned) {
+        MALLOC_ASSERT(extMemPool->fixedPool,
+                "Aligned block request from unaligned bin possible only in fixed pool scenario.");
+
+        // Space to use is in the middle
+        FreeBlock *newBlock = alignUp(fBlock, slabSize);
+        FreeBlock *rightPart = (FreeBlock*)((uintptr_t)newBlock + totalSize);
+        uintptr_t fBlockEnd = (uintptr_t)fBlock + fBlock->sizeTmp;
+
+        // Return free right part
+        if ((uintptr_t)rightPart != fBlockEnd) {
+            rightPart->initHeader();  // to prevent coalescing rightPart with fBlock
+            size_t rightSize = fBlockEnd - (uintptr_t)rightPart;
+            coalescAndPut(rightPart, rightSize, toAlignedBin(rightPart, rightSize));
         }
-
-        BlockI *Backend::getSlabBlock(int num) {
-            BlockI *b = (BlockI *) genericGetBlock(num, slabSize, /*slabAligned=*/true);
-            MALLOC_ASSERT(isAligned(b, slabSize), ASSERT_TEXT);
-            return b;
+        // And free left part
+        if (newBlock != fBlock) {
+            newBlock->initHeader(); // to prevent coalescing fBlock with newB
+            size_t leftSize = (uintptr_t)newBlock - (uintptr_t)fBlock;
+            coalescAndPut(fBlock, leftSize, toAlignedBin(fBlock, leftSize));
         }
-
-        void Backend::putSlabBlock(BlockI *block) {
-            genericPutBlock((FreeBlock *) block, slabSize, /*slabAligned=*/true);
+        fBlock = newBlock;
+    } else if (size_t splitSize = fBlock->sizeTmp - totalSize) { // need to split the block
+        // GENERAL CASE, cut the left or right part of the block
+        FreeBlock *splitBlock = nullptr;
+        if (needAlignedBlock) {
+            // For slab aligned blocks cut the right side of the block
+            // and return it to a requester, original block returns to backend
+            splitBlock = fBlock;
+            fBlock = (FreeBlock*)((uintptr_t)splitBlock + splitSize);
+            fBlock->initHeader();
+        } else {
+            // For large object blocks cut original block and put free right part to backend
+            splitBlock = (FreeBlock*)((uintptr_t)fBlock + totalSize);
+            splitBlock->initHeader();
         }
-
-        void *Backend::getBackRefSpace(size_t size, bool *rawMemUsed) {
-            // This block is released only at shutdown, so it can prevent
-            // a entire region releasing when it's received from the backend,
-            // so prefer getRawMemory using.
-            if (void *ret = getRawMemory(size, REGULAR)) {
-                *rawMemUsed = true;
-                return ret;
-            }
-            void *ret = genericGetBlock(1, size, /*needAlignedRes=*/false);
-            if (ret) *rawMemUsed = false;
-            return ret;
+        // Mark free block as it`s parent only when the requested type (needAlignedBlock)
+        // and returned from Bins/OS block (isAligned) are equal (XOR operation used)
+        bool markAligned = (blockIsAligned ^ needAlignedBlock) ? toAlignedBin(splitBlock, splitSize) : blockIsAligned;
+        coalescAndPut(splitBlock, splitSize, markAligned);
+    }
+    MALLOC_ASSERT(!needAlignedBlock || isAligned(fBlock, slabSize), "Expect to get aligned block, if one was requested.");
+    FreeBlock::markBlocks(fBlock, num, size);
+    return fBlock;
+}
+
+size_t Backend::getMaxBinnedSize() const
+{
+    return hugePages.isEnabled && !inUserPool() ?
+        maxBinned_HugePage : maxBinned_SmallPage;
+}
+
+inline bool Backend::MaxRequestComparator::operator()(size_t oldMaxReq, size_t requestSize) const
+{
+    return requestSize > oldMaxReq && requestSize < backend->getMaxBinnedSize();
+}
+
+// last chance to get memory
+FreeBlock *Backend::releaseMemInCaches(intptr_t startModifiedCnt,
+                                    int *lockedBinsThreshold, int numOfLockedBins)
+{
+    // something released from caches
+    if (extMemPool->hardCachesCleanup(false))
+        return (FreeBlock*)VALID_BLOCK_IN_BIN;
+
+    if (bkndSync.waitTillBlockReleased(startModifiedCnt))
+        return (FreeBlock*)VALID_BLOCK_IN_BIN;
+
+    // OS can't give us more memory, but we have some in locked bins
+    if (*lockedBinsThreshold && numOfLockedBins) {
+        *lockedBinsThreshold = 0;
+        return (FreeBlock*)VALID_BLOCK_IN_BIN;
+    }
+    return nullptr; // nothing found, give up
+}
+
+FreeBlock *Backend::askMemFromOS(size_t blockSize, intptr_t startModifiedCnt,
+                                 int *lockedBinsThreshold, int numOfLockedBins,
+                                 bool *splittableRet, bool needSlabRegion)
+{
+    FreeBlock *block;
+    // The block sizes can be divided into 3 groups:
+    //   1. "quite small": popular object size, we are in bootstarp or something
+    //      like; request several regions.
+    //   2. "quite large": we want to have several such blocks in the region
+    //      but not want several pre-allocated regions.
+    //   3. "huge": exact fit, we allocate only one block and do not allow
+    //       any other allocations to placed in a region.
+    // Dividing the block sizes in these groups we are trying to balance between
+    // too small regions (that leads to fragmentation) and too large ones (that
+    // leads to excessive address space consumption). If a region is "too
+    // large", allocate only one, to prevent fragmentation. It supposedly
+    // doesn't hurt performance, because the object requested by user is large.
+    // Bounds for the groups are:
+    const size_t maxBinned = getMaxBinnedSize();
+    const size_t quiteSmall = maxBinned / 8;
+    const size_t quiteLarge = maxBinned;
+
+    if (blockSize >= quiteLarge) {
+        // Do not interact with other threads via semaphores, as for exact fit
+        // we can't share regions with them, memory requesting is individual.
+        block = addNewRegion(blockSize, MEMREG_ONE_BLOCK, /*addToBin=*/false);
+        if (!block)
+            return releaseMemInCaches(startModifiedCnt, lockedBinsThreshold, numOfLockedBins);
+        *splittableRet = false;
+    } else {
+        const size_t regSz_sizeBased = alignUp(4*maxRequestedSize, 1024*1024);
+        // Another thread is modifying backend while we can't get the block.
+        // Wait while it leaves and re-do the scan
+        // before trying other ways to extend the backend.
+        if (bkndSync.waitTillBlockReleased(startModifiedCnt)
+            // semaphore is protecting adding more more memory from OS
+            || memExtendingSema.wait())
+            return (FreeBlock*)VALID_BLOCK_IN_BIN;
+
+        if (startModifiedCnt != bkndSync.getNumOfMods()) {
+            memExtendingSema.signal();
+            return (FreeBlock*)VALID_BLOCK_IN_BIN;
         }
 
-        void Backend::putBackRefSpace(void *b, size_t size, bool rawMemUsed) {
-            if (rawMemUsed) freeRawMemory(b, size);
-            // ignore not raw mem, as it released on region releasing
+        if (blockSize < quiteSmall) {
+            // For this size of blocks, add NUM_OF_REG "advance" regions in bin,
+            // and return one as a result.
+            // TODO: add to bin first, because other threads can use them right away.
+            // This must be done carefully, because blocks in bins can be released
+            // in releaseCachesToLimit().
+            const unsigned NUM_OF_REG = 3;
+            MemRegionType regType = needSlabRegion ? MEMREG_SLAB_BLOCKS : MEMREG_LARGE_BLOCKS;
+            block = addNewRegion(regSz_sizeBased, regType, /*addToBin=*/false);
+            if (block)
+                for (unsigned idx=0; idx<NUM_OF_REG; idx++)
+                    if (! addNewRegion(regSz_sizeBased, regType, /*addToBin=*/true))
+                        break;
+        } else {
+            block = addNewRegion(regSz_sizeBased, MEMREG_LARGE_BLOCKS, /*addToBin=*/false);
         }
+        memExtendingSema.signal();
+
+        // no regions found, try to clean cache
+        if (!block || block == (FreeBlock*)VALID_BLOCK_IN_BIN)
+            return releaseMemInCaches(startModifiedCnt, lockedBinsThreshold, numOfLockedBins);
+        // Since a region can hold more than one block it can be split.
+        *splittableRet = true;
+    }
+    // after asking memory from OS, release caches if we above the memory limits
+    releaseCachesToLimit();
+
+    return block;
+}
+
+void Backend::releaseCachesToLimit()
+{
+    if (!memSoftLimit.load(std::memory_order_relaxed)
+            || totalMemSize.load(std::memory_order_relaxed) <= memSoftLimit.load(std::memory_order_relaxed)) {
+        return;
+    }
+    size_t locTotalMemSize, locMemSoftLimit;
+
+    scanCoalescQ(/*forceCoalescQDrop=*/false);
+    if (extMemPool->softCachesCleanup() &&
+        (locTotalMemSize = totalMemSize.load(std::memory_order_acquire)) <=
+        (locMemSoftLimit = memSoftLimit.load(std::memory_order_acquire)))
+        return;
+    // clean global large-object cache, if this is not enough, clean local caches
+    // do this in several tries, because backend fragmentation can prevent
+    // region from releasing
+    for (int cleanLocal = 0; cleanLocal<2; cleanLocal++)
+        while (cleanLocal ?
+                 extMemPool->allLocalCaches.cleanup(/*cleanOnlyUnused=*/true) :
+                 extMemPool->loc.decreasingCleanup())
+            if ((locTotalMemSize = totalMemSize.load(std::memory_order_acquire)) <=
+                (locMemSoftLimit = memSoftLimit.load(std::memory_order_acquire)))
+                return;
+    // last chance to match memSoftLimit
+    extMemPool->hardCachesCleanup(true);
+}
+
+int Backend::IndexedBins::getMinNonemptyBin(unsigned startBin) const
+{
+    int p = bitMask.getMinTrue(startBin);
+    return p == -1 ? Backend::freeBinsNum : p;
+}
+
+FreeBlock *Backend::IndexedBins::findBlock(int nativeBin, BackendSync *sync, size_t size,
+        bool needAlignedBlock, bool alignedBin, int *numOfLockedBins)
+{
+    for (int i=getMinNonemptyBin(nativeBin); i<(int)freeBinsNum; i=getMinNonemptyBin(i+1))
+        if (FreeBlock *block = getFromBin(i, sync, size, needAlignedBlock, alignedBin, /*wait=*/false, numOfLockedBins))
+            return block;
 
-        void Backend::removeBlockFromBin(FreeBlock *fBlock) {
-            if (fBlock->myBin != Backend::NO_BIN) {
-                if (fBlock->slabAligned) freeSlabAlignedBins.lockRemoveBlock(fBlock->myBin, fBlock);
-                else
-                    freeLargeBlockBins.lockRemoveBlock(fBlock->myBin, fBlock);
+    return nullptr;
+}
+
+void Backend::requestBootstrapMem()
+{
+    if (bootsrapMemDone == bootsrapMemStatus.load(std::memory_order_acquire))
+        return;
+    MallocMutex::scoped_lock lock( bootsrapMemStatusMutex );
+    if (bootsrapMemDone == bootsrapMemStatus)
+        return;
+    MALLOC_ASSERT(bootsrapMemNotDone == bootsrapMemStatus, ASSERT_TEXT);
+    bootsrapMemStatus = bootsrapMemInitializing;
+    // request some rather big region during bootstrap in advance
+    // ok to get nullptr here, as later we re-do a request with more modest size
+    addNewRegion(2*1024*1024, MEMREG_SLAB_BLOCKS, /*addToBin=*/true);
+    bootsrapMemStatus = bootsrapMemDone;
+}
+
+// try to allocate size Byte block in available bins
+// needAlignedRes is true if result must be slab-aligned
+FreeBlock *Backend::genericGetBlock(int num, size_t size, bool needAlignedBlock)
+{
+    FreeBlock *block = nullptr;
+    const size_t totalReqSize = num*size;
+    // no splitting after requesting new region, asks exact size
+    const int nativeBin = sizeToBin(totalReqSize);
+
+    requestBootstrapMem();
+    // If we found 2 or less locked bins, it's time to ask more memory from OS.
+    // But nothing can be asked from fixed pool. And we prefer wait, not ask
+    // for more memory, if block is quite large.
+    int lockedBinsThreshold = extMemPool->fixedPool || size>=maxBinned_SmallPage? 0 : 2;
+
+    // Find maximal requested size limited by getMaxBinnedSize()
+    AtomicUpdate(maxRequestedSize, totalReqSize, MaxRequestComparator(this));
+    scanCoalescQ(/*forceCoalescQDrop=*/false);
+
+    bool splittable = true;
+    for (;;) {
+        const intptr_t startModifiedCnt = bkndSync.getNumOfMods();
+        int numOfLockedBins;
+        intptr_t cleanCnt;
+        do {
+            cleanCnt = backendCleanCnt.load(std::memory_order_acquire);
+            numOfLockedBins = 0;
+            if (needAlignedBlock) {
+                block = freeSlabAlignedBins.findBlock(nativeBin, &bkndSync, num*size, needAlignedBlock,
+                                                        /*alignedBin=*/true, &numOfLockedBins);
+                if (!block && extMemPool->fixedPool)
+                    block = freeLargeBlockBins.findBlock(nativeBin, &bkndSync, num*size, needAlignedBlock,
+                                                        /*alignedBin=*/false, &numOfLockedBins);
+            } else {
+                block = freeLargeBlockBins.findBlock(nativeBin, &bkndSync, num*size, needAlignedBlock,
+                                                        /*alignedBin=*/false, &numOfLockedBins);
+                if (!block && extMemPool->fixedPool)
+                    block = freeSlabAlignedBins.findBlock(nativeBin, &bkndSync, num*size, needAlignedBlock,
+                                                        /*alignedBin=*/true, &numOfLockedBins);
             }
+        } while (!block && (numOfLockedBins>lockedBinsThreshold || cleanCnt % 2 == 1 ||
+                            cleanCnt != backendCleanCnt.load(std::memory_order_acquire)));
+
+        if (block)
+            break;
+
+        bool retScanCoalescQ = scanCoalescQ(/*forceCoalescQDrop=*/true);
+        bool retSoftCachesCleanup = extMemPool->softCachesCleanup();
+        if (!(retScanCoalescQ || retSoftCachesCleanup)) {
+            // bins are not updated,
+            // only remaining possibility is to ask for more memory
+            block = askMemFromOS(totalReqSize, startModifiedCnt, &lockedBinsThreshold,
+                        numOfLockedBins, &splittable, needAlignedBlock);
+            if (!block)
+                return nullptr;
+            if (block != (FreeBlock*)VALID_BLOCK_IN_BIN) {
+                // size can be increased in askMemFromOS, that's why >=
+                MALLOC_ASSERT(block->sizeTmp >= size, ASSERT_TEXT);
+                break;
+            }
+            // valid block somewhere in bins, let's find it
+            block = nullptr;
         }
-
-        void Backend::genericPutBlock(FreeBlock *fBlock, size_t blockSz, bool slabAligned) {
-            bkndSync.blockConsumed();
-            coalescAndPut(fBlock, blockSz, slabAligned);
-            bkndSync.blockReleased();
-        }
-
-        void AllLargeBlocksList::add(LargeMemoryBlock *lmb) {
-            MallocMutex::scoped_lock scoped_cs(largeObjLock);
-            lmb->gPrev = NULL;
-            lmb->gNext = loHead;
-            if (lmb->gNext) lmb->gNext->gPrev = lmb;
-            loHead = lmb;
-        }
-
-        void AllLargeBlocksList::remove(LargeMemoryBlock *lmb) {
-            MallocMutex::scoped_lock scoped_cs(largeObjLock);
-            if (loHead == lmb) loHead = lmb->gNext;
-            if (lmb->gNext) lmb->gNext->gPrev = lmb->gPrev;
-            if (lmb->gPrev) lmb->gPrev->gNext = lmb->gNext;
-        }
-
-        void Backend::putLargeBlock(LargeMemoryBlock *lmb) {
-            if (extMemPool->userPool()) extMemPool->lmbList.remove(lmb);
-            genericPutBlock((FreeBlock *) lmb, lmb->unalignedSize, false);
-        }
-
-        void Backend::returnLargeObject(LargeMemoryBlock *lmb) {
-            removeBackRef(lmb->backRefIdx);
-            putLargeBlock(lmb);
-            STAT_increment(getThreadId(), ThreadCommonCounters, freeLargeObj);
-        }
+    }
+    MALLOC_ASSERT(block, ASSERT_TEXT);
+    if (splittable) {
+        // At this point we have to be sure that slabAligned attribute describes the right block state
+        block = splitBlock(block, num, size, block->slabAligned, needAlignedBlock);
+    }
+    // matched blockConsumed() from startUseBlock()
+    bkndSync.blockReleased();
+
+    return block;
+}
+
+LargeMemoryBlock *Backend::getLargeBlock(size_t size)
+{
+    LargeMemoryBlock *lmb =
+        (LargeMemoryBlock*)genericGetBlock(1, size, /*needAlignedRes=*/false);
+    if (lmb) {
+        lmb->unalignedSize = size;
+        if (extMemPool->userPool())
+            extMemPool->lmbList.add(lmb);
+    }
+    return lmb;
+}
+
+BlockI *Backend::getSlabBlock(int num) {
+    BlockI *b = (BlockI*)genericGetBlock(num, slabSize, /*slabAligned=*/true);
+    MALLOC_ASSERT(isAligned(b, slabSize), ASSERT_TEXT);
+    return b;
+}
+
+void Backend::putSlabBlock(BlockI *block) {
+    genericPutBlock((FreeBlock *)block, slabSize, /*slabAligned=*/true);
+}
+
+void *Backend::getBackRefSpace(size_t size, bool *rawMemUsed)
+{
+    // This block is released only at shutdown, so it can prevent
+    // a entire region releasing when it's received from the backend,
+    // so prefer getRawMemory using.
+    if (void *ret = getRawMemory(size, REGULAR)) {
+        *rawMemUsed = true;
+        return ret;
+    }
+    void *ret = genericGetBlock(1, size, /*needAlignedRes=*/false);
+    if (ret) *rawMemUsed = false;
+    return ret;
+}
+
+void Backend::putBackRefSpace(void *b, size_t size, bool rawMemUsed)
+{
+    if (rawMemUsed)
+        freeRawMemory(b, size);
+    // ignore not raw mem, as it released on region releasing
+}
+
+void Backend::removeBlockFromBin(FreeBlock *fBlock)
+{
+    if (fBlock->myBin != Backend::NO_BIN) {
+        if (fBlock->slabAligned)
+            freeSlabAlignedBins.lockRemoveBlock(fBlock->myBin, fBlock);
+        else
+            freeLargeBlockBins.lockRemoveBlock(fBlock->myBin, fBlock);
+    }
+}
+
+void Backend::genericPutBlock(FreeBlock *fBlock, size_t blockSz, bool slabAligned)
+{
+    bkndSync.blockConsumed();
+    coalescAndPut(fBlock, blockSz, slabAligned);
+    bkndSync.blockReleased();
+}
+
+void AllLargeBlocksList::add(LargeMemoryBlock *lmb)
+{
+    MallocMutex::scoped_lock scoped_cs(largeObjLock);
+    lmb->gPrev = nullptr;
+    lmb->gNext = loHead;
+    if (lmb->gNext)
+        lmb->gNext->gPrev = lmb;
+    loHead = lmb;
+}
+
+void AllLargeBlocksList::remove(LargeMemoryBlock *lmb)
+{
+    MallocMutex::scoped_lock scoped_cs(largeObjLock);
+    if (loHead == lmb)
+        loHead = lmb->gNext;
+    if (lmb->gNext)
+        lmb->gNext->gPrev = lmb->gPrev;
+    if (lmb->gPrev)
+        lmb->gPrev->gNext = lmb->gNext;
+}
+
+void Backend::putLargeBlock(LargeMemoryBlock *lmb)
+{
+    if (extMemPool->userPool())
+        extMemPool->lmbList.remove(lmb);
+    genericPutBlock((FreeBlock *)lmb, lmb->unalignedSize, false);
+}
+
+void Backend::returnLargeObject(LargeMemoryBlock *lmb)
+{
+    removeBackRef(lmb->backRefIdx);
+    putLargeBlock(lmb);
+    STAT_increment(getThreadId(), ThreadCommonCounters, freeLargeObj);
+}
 
 #if BACKEND_HAS_MREMAP
-        void *Backend::remap(void *ptr, size_t oldSize, size_t newSize, size_t alignment) {
-            // no remap for user pools and for object too small that living in bins
-            if (inUserPool()
-                || min(oldSize, newSize) < maxBinned_SmallPage
-                // during remap, can't guarantee alignment more strict than current or
-                // more strict than page alignment
-                || !isAligned(ptr, alignment) || alignment > extMemPool->granularity)
-                return NULL;
-            const LargeMemoryBlock *lmbOld = ((LargeObjectHdr *) ptr - 1)->memoryBlock;
-            const size_t oldUnalignedSize = lmbOld->unalignedSize;
-            FreeBlock *oldFBlock = (FreeBlock *) lmbOld;
-            FreeBlock *right = oldFBlock->rightNeig(oldUnalignedSize);
-            // in every region only one block can have LAST_REGION_BLOCK on right,
-            // so don't need no synchronization
-            if (!right->isLastRegionBlock()) return NULL;
-
-            MemRegion *oldRegion = static_cast<LastFreeBlock *>(right)->memRegion;
-            MALLOC_ASSERT(oldRegion < ptr, ASSERT_TEXT);
-            const size_t oldRegionSize = oldRegion->allocSz;
-            if (oldRegion->type != MEMREG_ONE_BLOCK) return NULL;// we are not single in the region
-            const size_t userOffset = (uintptr_t) ptr - (uintptr_t) oldRegion;
-            const size_t alignedSize = LargeObjectCache::alignToBin(newSize + userOffset);
-            const size_t requestSize = alignUp(sizeof(MemRegion) + alignedSize + sizeof(LastFreeBlock),
-                                               extMemPool->granularity);
-            if (requestSize < alignedSize)// is wrapped around?
-                return NULL;
-            regionList.remove(oldRegion);
-
-            // The deallocation should be registered in address range before mremap to
-            // prevent a race condition with allocation on another thread.
-            // (OS can reuse the memory and registerAlloc will be missed on another thread)
-            usedAddrRange.registerFree((uintptr_t) oldRegion, (uintptr_t) oldRegion + oldRegionSize);
-
-            void *ret = mremap(oldRegion, oldRegion->allocSz, requestSize, MREMAP_MAYMOVE);
-            if (MAP_FAILED == ret) {// can't remap, revert and leave
-                regionList.add(oldRegion);
-                usedAddrRange.registerAlloc((uintptr_t) oldRegion, (uintptr_t) oldRegion + oldRegionSize);
-                return NULL;
-            }
-            MemRegion *region = (MemRegion *) ret;
-            MALLOC_ASSERT(region->type == MEMREG_ONE_BLOCK, ASSERT_TEXT);
-            region->allocSz = requestSize;
-            region->blockSz = alignedSize;
-
-            FreeBlock *fBlock
-                    = (FreeBlock *) alignUp((uintptr_t) region + sizeof(MemRegion), largeObjectAlignment);
-
-            regionList.add(region);
-            startUseBlock(region, fBlock, /*addToBin=*/false);
-            MALLOC_ASSERT(fBlock->sizeTmp == region->blockSz, ASSERT_TEXT);
-            // matched blockConsumed() in startUseBlock().
-            // TODO: get rid of useless pair blockConsumed()/blockReleased()
-            bkndSync.blockReleased();
-
-            // object must start at same offset from region's start
-            void *object = (void *) ((uintptr_t) region + userOffset);
-            MALLOC_ASSERT(isAligned(object, alignment), ASSERT_TEXT);
-            LargeObjectHdr *header = (LargeObjectHdr *) object - 1;
-            setBackRef(header->backRefIdx, header);
-
-            LargeMemoryBlock *lmb = (LargeMemoryBlock *) fBlock;
-            lmb->unalignedSize = region->blockSz;
-            lmb->objectSize = newSize;
-            lmb->backRefIdx = header->backRefIdx;
-            header->memoryBlock = lmb;
-            MALLOC_ASSERT((uintptr_t) lmb + lmb->unalignedSize >= (uintptr_t) object + lmb->objectSize,
-                          "An object must fit to the block.");
-
-            usedAddrRange.registerAlloc((uintptr_t) region, (uintptr_t) region + requestSize);
-            totalMemSize.fetch_add(region->allocSz - oldRegionSize);
-
-            return object;
-        }
+void *Backend::remap(void *ptr, size_t oldSize, size_t newSize, size_t alignment)
+{
+    // no remap for user pools and for object too small that living in bins
+    if (inUserPool() || min(oldSize, newSize)<maxBinned_SmallPage
+        // during remap, can't guarantee alignment more strict than current or
+        // more strict than page alignment
+        || !isAligned(ptr, alignment) || alignment>extMemPool->granularity)
+        return nullptr;
+    const LargeMemoryBlock* lmbOld = ((LargeObjectHdr *)ptr - 1)->memoryBlock;
+    const size_t oldUnalignedSize = lmbOld->unalignedSize;
+    FreeBlock *oldFBlock = (FreeBlock *)lmbOld;
+    FreeBlock *right = oldFBlock->rightNeig(oldUnalignedSize);
+    // in every region only one block can have LAST_REGION_BLOCK on right,
+    // so don't need no synchronization
+    if (!right->isLastRegionBlock())
+        return nullptr;
+
+    MemRegion *oldRegion = static_cast<LastFreeBlock*>(right)->memRegion;
+    MALLOC_ASSERT( oldRegion < ptr, ASSERT_TEXT );
+    const size_t oldRegionSize = oldRegion->allocSz;
+    if (oldRegion->type != MEMREG_ONE_BLOCK)
+        return nullptr;  // we are not single in the region
+    const size_t userOffset = (uintptr_t)ptr - (uintptr_t)oldRegion;
+    const size_t alignedSize = LargeObjectCache::alignToBin(newSize + userOffset);
+    const size_t requestSize =
+        alignUp(sizeof(MemRegion) + alignedSize + sizeof(LastFreeBlock), extMemPool->granularity);
+    if (requestSize < alignedSize) // is wrapped around?
+        return nullptr;
+    regionList.remove(oldRegion);
+
+    // The deallocation should be registered in address range before mremap to
+    // prevent a race condition with allocation on another thread.
+    // (OS can reuse the memory and registerAlloc will be missed on another thread)
+    usedAddrRange.registerFree((uintptr_t)oldRegion, (uintptr_t)oldRegion + oldRegionSize);
+
+    void *ret = mremap(oldRegion, oldRegion->allocSz, requestSize, MREMAP_MAYMOVE);
+    if (MAP_FAILED == ret) { // can't remap, revert and leave
+        regionList.add(oldRegion);
+        usedAddrRange.registerAlloc((uintptr_t)oldRegion, (uintptr_t)oldRegion + oldRegionSize);
+        return nullptr;
+    }
+    MemRegion *region = (MemRegion*)ret;
+    MALLOC_ASSERT(region->type == MEMREG_ONE_BLOCK, ASSERT_TEXT);
+    region->allocSz = requestSize;
+    region->blockSz = alignedSize;
+
+    FreeBlock *fBlock = (FreeBlock *)alignUp((uintptr_t)region + sizeof(MemRegion),
+                                             largeObjectAlignment);
+
+    regionList.add(region);
+    startUseBlock(region, fBlock, /*addToBin=*/false);
+    MALLOC_ASSERT(fBlock->sizeTmp == region->blockSz, ASSERT_TEXT);
+    // matched blockConsumed() in startUseBlock().
+    // TODO: get rid of useless pair blockConsumed()/blockReleased()
+    bkndSync.blockReleased();
+
+    // object must start at same offset from region's start
+    void *object = (void*)((uintptr_t)region + userOffset);
+    MALLOC_ASSERT(isAligned(object, alignment), ASSERT_TEXT);
+    LargeObjectHdr *header = (LargeObjectHdr*)object - 1;
+    setBackRef(header->backRefIdx, header);
+
+    LargeMemoryBlock *lmb = (LargeMemoryBlock*)fBlock;
+    lmb->unalignedSize = region->blockSz;
+    lmb->objectSize = newSize;
+    lmb->backRefIdx = header->backRefIdx;
+    header->memoryBlock = lmb;
+    MALLOC_ASSERT((uintptr_t)lmb + lmb->unalignedSize >=
+                  (uintptr_t)object + lmb->objectSize, "An object must fit to the block.");
+
+    usedAddrRange.registerAlloc((uintptr_t)region, (uintptr_t)region + requestSize);
+    totalMemSize.fetch_add(region->allocSz - oldRegionSize);
+
+    return object;
+}
 #endif /* BACKEND_HAS_MREMAP */
 
-        void Backend::releaseRegion(MemRegion *memRegion) {
-            regionList.remove(memRegion);
-            freeRawMem(memRegion, memRegion->allocSz);
-        }
-
-        // coalesce fBlock with its neighborhood
-        FreeBlock *Backend::doCoalesc(FreeBlock *fBlock, MemRegion **mRegion) {
-            FreeBlock *resBlock = fBlock;
-            size_t resSize = fBlock->sizeTmp;
-            MemRegion *memRegion = NULL;
-
-            fBlock->markCoalescing(resSize);
-            resBlock->blockInBin = false;
-
-            // coalescing with left neighbor
-            size_t leftSz = fBlock->trySetLeftUsed(GuardedSize::COAL_BLOCK);
-            if (leftSz != GuardedSize::LOCKED) {
-                if (leftSz == GuardedSize::COAL_BLOCK) {
-                    coalescQ.putBlock(fBlock);
-                    return NULL;
-                } else {
-                    FreeBlock *left = fBlock->leftNeig(leftSz);
-                    size_t lSz = left->trySetMeUsed(GuardedSize::COAL_BLOCK);
-                    if (lSz <= GuardedSize::MAX_LOCKED_VAL) {
-                        fBlock->setLeftFree(leftSz);// rollback
-                        coalescQ.putBlock(fBlock);
-                        return NULL;
-                    } else {
-                        MALLOC_ASSERT(lSz == leftSz, "Invalid header");
-                        left->blockInBin = true;
-                        resBlock = left;
-                        resSize += leftSz;
-                        resBlock->sizeTmp = resSize;
-                    }
-                }
-            }
-            // coalescing with right neighbor
-            FreeBlock *right = fBlock->rightNeig(fBlock->sizeTmp);
-            size_t rightSz = right->trySetMeUsed(GuardedSize::COAL_BLOCK);
-            if (rightSz != GuardedSize::LOCKED) {
-                // LastFreeBlock is on the right side
-                if (GuardedSize::LAST_REGION_BLOCK == rightSz) {
-                    right->setMeFree(GuardedSize::LAST_REGION_BLOCK);
-                    memRegion = static_cast<LastFreeBlock *>(right)->memRegion;
-                } else if (GuardedSize::COAL_BLOCK == rightSz) {
-                    if (resBlock->blockInBin) {
-                        resBlock->blockInBin = false;
-                        removeBlockFromBin(resBlock);
-                    }
-                    coalescQ.putBlock(resBlock);
-                    return NULL;
-                } else {
-                    size_t rSz = right->rightNeig(rightSz)->trySetLeftUsed(GuardedSize::COAL_BLOCK);
-                    if (rSz <= GuardedSize::MAX_LOCKED_VAL) {
-                        right->setMeFree(rightSz);// rollback
-                        if (resBlock->blockInBin) {
-                            resBlock->blockInBin = false;
-                            removeBlockFromBin(resBlock);
-                        }
-                        coalescQ.putBlock(resBlock);
-                        return NULL;
-                    } else {
-                        MALLOC_ASSERT(rSz == rightSz, "Invalid header");
-                        removeBlockFromBin(right);
-                        resSize += rightSz;
-
-                        // Is LastFreeBlock on the right side of right?
-                        FreeBlock *nextRight = right->rightNeig(rightSz);
-                        size_t nextRightSz = nextRight->trySetMeUsed(GuardedSize::COAL_BLOCK);
-                        if (nextRightSz > GuardedSize::MAX_LOCKED_VAL) {
-                            if (nextRightSz == GuardedSize::LAST_REGION_BLOCK)
-                                memRegion = static_cast<LastFreeBlock *>(nextRight)->memRegion;
-
-                            nextRight->setMeFree(nextRightSz);
-                        }
-                    }
-                }
+void Backend::releaseRegion(MemRegion *memRegion)
+{
+    regionList.remove(memRegion);
+    freeRawMem(memRegion, memRegion->allocSz);
+}
+
+// coalesce fBlock with its neighborhood
+FreeBlock *Backend::doCoalesc(FreeBlock *fBlock, MemRegion **mRegion)
+{
+    FreeBlock *resBlock = fBlock;
+    size_t resSize = fBlock->sizeTmp;
+    MemRegion *memRegion = nullptr;
+
+    fBlock->markCoalescing(resSize);
+    resBlock->blockInBin = false;
+
+    // coalescing with left neighbor
+    size_t leftSz = fBlock->trySetLeftUsed(GuardedSize::COAL_BLOCK);
+    if (leftSz != GuardedSize::LOCKED) {
+        if (leftSz == GuardedSize::COAL_BLOCK) {
+            coalescQ.putBlock(fBlock);
+            return nullptr;
+        } else {
+            FreeBlock *left = fBlock->leftNeig(leftSz);
+            size_t lSz = left->trySetMeUsed(GuardedSize::COAL_BLOCK);
+            if (lSz <= GuardedSize::MAX_LOCKED_VAL) {
+                fBlock->setLeftFree(leftSz); // rollback
+                coalescQ.putBlock(fBlock);
+                return nullptr;
+            } else {
+                MALLOC_ASSERT(lSz == leftSz, "Invalid header");
+                left->blockInBin = true;
+                resBlock = left;
+                resSize += leftSz;
+                resBlock->sizeTmp = resSize;
             }
-            if (memRegion) {
-                MALLOC_ASSERT((uintptr_t) memRegion + memRegion->allocSz
-                                      >= (uintptr_t) right + sizeof(LastFreeBlock),
-                              ASSERT_TEXT);
-                MALLOC_ASSERT((uintptr_t) memRegion < (uintptr_t) resBlock, ASSERT_TEXT);
-                *mRegion = memRegion;
-            } else
-                *mRegion = NULL;
-            resBlock->sizeTmp = resSize;
-            return resBlock;
         }
-
-        bool Backend::coalescAndPutList(FreeBlock *list, bool forceCoalescQDrop, bool reportBlocksProcessed) {
-            bool regionReleased = false;
-
-            for (FreeBlock *helper; list; list = helper,
-                                          // matches block enqueue in CoalRequestQ::putBlock()
-                                          reportBlocksProcessed ? coalescQ.blockWasProcessed() : (void) 0) {
-                MemRegion *memRegion;
-                bool addToTail = false;
-
-                helper = list->nextToFree;
-                FreeBlock *toRet = doCoalesc(list, &memRegion);
-                if (!toRet) continue;
-
-                if (memRegion && memRegion->blockSz == toRet->sizeTmp && !extMemPool->fixedPool) {
-                    if (extMemPool->regionsAreReleaseable()) {
-                        // release the region, because there is no used blocks in it
-                        if (toRet->blockInBin) removeBlockFromBin(toRet);
-                        releaseRegion(memRegion);
-                        regionReleased = true;
-                        continue;
-                    } else               // add block from empty region to end of bin,
-                        addToTail = true;// preserving for exact fit
-                }
-                size_t currSz = toRet->sizeTmp;
-                int bin = sizeToBin(currSz);
-                bool toAligned = extMemPool->fixedPool ? toAlignedBin(toRet, currSz) : toRet->slabAligned;
-                bool needAddToBin = true;
-
-                if (toRet->blockInBin) {
-                    // Does it stay in same bin?
-                    if (toRet->myBin == bin && toRet->slabAligned == toAligned) needAddToBin = false;
-                    else {
-                        toRet->blockInBin = false;
-                        removeBlockFromBin(toRet);
-                    }
+    }
+    // coalescing with right neighbor
+    FreeBlock *right = fBlock->rightNeig(fBlock->sizeTmp);
+    size_t rightSz = right->trySetMeUsed(GuardedSize::COAL_BLOCK);
+    if (rightSz != GuardedSize::LOCKED) {
+        // LastFreeBlock is on the right side
+        if (GuardedSize::LAST_REGION_BLOCK == rightSz) {
+            right->setMeFree(GuardedSize::LAST_REGION_BLOCK);
+            memRegion = static_cast<LastFreeBlock*>(right)->memRegion;
+        } else if (GuardedSize::COAL_BLOCK == rightSz) {
+            if (resBlock->blockInBin) {
+                resBlock->blockInBin = false;
+                removeBlockFromBin(resBlock);
+            }
+            coalescQ.putBlock(resBlock);
+            return nullptr;
+        } else {
+            size_t rSz = right->rightNeig(rightSz)->
+                trySetLeftUsed(GuardedSize::COAL_BLOCK);
+            if (rSz <= GuardedSize::MAX_LOCKED_VAL) {
+                right->setMeFree(rightSz);  // rollback
+                if (resBlock->blockInBin) {
+                    resBlock->blockInBin = false;
+                    removeBlockFromBin(resBlock);
                 }
-
-                // Does not stay in same bin, or bin-less; add it
-                if (needAddToBin) {
-                    toRet->prev = toRet->next = toRet->nextToFree = NULL;
-                    toRet->myBin = NO_BIN;
-                    toRet->slabAligned = toAligned;
-
-                    // If the block is too small to fit in any bin, keep it bin-less.
-                    // It's not a leak because the block later can be coalesced.
-                    if (currSz >= minBinnedSize) {
-                        toRet->sizeTmp = currSz;
-                        IndexedBins *target = toRet->slabAligned ? &freeSlabAlignedBins : &freeLargeBlockBins;
-                        if (forceCoalescQDrop) {
-                            target->addBlock(bin, toRet, toRet->sizeTmp, addToTail);
-                        } else if (!target->tryAddBlock(bin, toRet, addToTail)) {
-                            coalescQ.putBlock(toRet);
-                            continue;
-                        }
-                    }
-                    toRet->sizeTmp = 0;
+                coalescQ.putBlock(resBlock);
+                return nullptr;
+            } else {
+                MALLOC_ASSERT(rSz == rightSz, "Invalid header");
+                removeBlockFromBin(right);
+                resSize += rightSz;
+
+                // Is LastFreeBlock on the right side of right?
+                FreeBlock *nextRight = right->rightNeig(rightSz);
+                size_t nextRightSz = nextRight->
+                    trySetMeUsed(GuardedSize::COAL_BLOCK);
+                if (nextRightSz > GuardedSize::MAX_LOCKED_VAL) {
+                    if (nextRightSz == GuardedSize::LAST_REGION_BLOCK)
+                        memRegion = static_cast<LastFreeBlock*>(nextRight)->memRegion;
+
+                    nextRight->setMeFree(nextRightSz);
                 }
-                // Free (possibly coalesced) free block.
-                // Adding to bin must be done before this point,
-                // because after a block is free it can be coalesced, and
-                // using its pointer became unsafe.
-                // Remember that coalescing is not done under any global lock.
-                toRet->setMeFree(currSz);
-                toRet->rightNeig(currSz)->setLeftFree(currSz);
             }
-            return regionReleased;
         }
-
-        // Coalesce fBlock and add it back to a bin;
-        // processing delayed coalescing requests.
-        void Backend::coalescAndPut(FreeBlock *fBlock, size_t blockSz, bool slabAligned) {
-            fBlock->sizeTmp = blockSz;
-            fBlock->nextToFree = NULL;
-            fBlock->slabAligned = slabAligned;
-
-            coalescAndPutList(fBlock, /*forceCoalescQDrop=*/false, /*reportBlocksProcessed=*/false);
+    }
+    if (memRegion) {
+        MALLOC_ASSERT((uintptr_t)memRegion + memRegion->allocSz >=
+                      (uintptr_t)right + sizeof(LastFreeBlock), ASSERT_TEXT);
+        MALLOC_ASSERT((uintptr_t)memRegion < (uintptr_t)resBlock, ASSERT_TEXT);
+        *mRegion = memRegion;
+    } else
+        *mRegion = nullptr;
+    resBlock->sizeTmp = resSize;
+    return resBlock;
+}
+
+bool Backend::coalescAndPutList(FreeBlock *list, bool forceCoalescQDrop, bool reportBlocksProcessed)
+{
+    bool regionReleased = false;
+
+    for (FreeBlock *helper; list;
+         list = helper,
+             // matches block enqueue in CoalRequestQ::putBlock()
+             reportBlocksProcessed? coalescQ.blockWasProcessed() : (void)0) {
+        MemRegion *memRegion;
+        bool addToTail = false;
+
+        helper = list->nextToFree;
+        FreeBlock *toRet = doCoalesc(list, &memRegion);
+        if (!toRet)
+            continue;
+
+        if (memRegion && memRegion->blockSz == toRet->sizeTmp
+            && !extMemPool->fixedPool) {
+            if (extMemPool->regionsAreReleaseable()) {
+                // release the region, because there is no used blocks in it
+                if (toRet->blockInBin)
+                    removeBlockFromBin(toRet);
+                releaseRegion(memRegion);
+                regionReleased = true;
+                continue;
+            } else // add block from empty region to end of bin,
+                addToTail = true; // preserving for exact fit
         }
-
-        bool Backend::scanCoalescQ(bool forceCoalescQDrop) {
-            FreeBlock *currCoalescList = coalescQ.getAll();
-
-            if (currCoalescList)
-                // reportBlocksProcessed=true informs that the blocks leave coalescQ,
-                // matches blockConsumed() from CoalRequestQ::putBlock()
-                coalescAndPutList(currCoalescList, forceCoalescQDrop,
-                                  /*reportBlocksProcessed=*/true);
-            // returns status of coalescQ.getAll(), as an indication of possible changes in backend
-            // TODO: coalescAndPutList() may report is some new free blocks became available or not
-            return currCoalescList;
-        }
-
-        FreeBlock *Backend::findBlockInRegion(MemRegion *region, size_t exactBlockSize) {
-            FreeBlock *fBlock;
-            size_t blockSz;
-            uintptr_t fBlockEnd, lastFreeBlock = (uintptr_t) region + region->allocSz - sizeof(LastFreeBlock);
-
-            static_assert(sizeof(LastFreeBlock) % sizeof(uintptr_t) == 0,
-                          "Atomic applied on LastFreeBlock, and we put it at the end of region, that"
-                          " is uintptr_t-aligned, so no unaligned atomic operations are possible.");
-            // right bound is slab-aligned, keep LastFreeBlock after it
-            if (region->type == MEMREG_SLAB_BLOCKS) {
-                fBlock = (FreeBlock *) alignUp((uintptr_t) region + sizeof(MemRegion), sizeof(uintptr_t));
-                fBlockEnd = alignDown(lastFreeBlock, slabSize);
-            } else {
-                fBlock = (FreeBlock *) alignUp((uintptr_t) region + sizeof(MemRegion), largeObjectAlignment);
-                fBlockEnd = (uintptr_t) fBlock + exactBlockSize;
-                MALLOC_ASSERT(fBlockEnd <= lastFreeBlock, ASSERT_TEXT);
+        size_t currSz = toRet->sizeTmp;
+        int bin = sizeToBin(currSz);
+        bool toAligned = extMemPool->fixedPool ? toAlignedBin(toRet, currSz) : toRet->slabAligned;
+        bool needAddToBin = true;
+
+        if (toRet->blockInBin) {
+            // Does it stay in same bin?
+            if (toRet->myBin == bin && toRet->slabAligned == toAligned)
+                needAddToBin = false;
+            else {
+                toRet->blockInBin = false;
+                removeBlockFromBin(toRet);
             }
-            if (fBlockEnd <= (uintptr_t) fBlock) return NULL;// allocSz is too small
-            blockSz = fBlockEnd - (uintptr_t) fBlock;
-            // TODO: extend getSlabBlock to support degradation, i.e. getting less blocks
-            // then requested, and then relax this check
-            // (now all or nothing is implemented, check according to this)
-            if (blockSz < numOfSlabAllocOnMiss * slabSize) return NULL;
-
-            region->blockSz = blockSz;
-            return fBlock;
         }
 
-        // startUseBlock may add the free block to a bin, the block can be used and
-        // even released after this, so the region must be added to regionList already
-        void Backend::startUseBlock(MemRegion *region, FreeBlock *fBlock, bool addToBin) {
-            size_t blockSz = region->blockSz;
-            fBlock->initHeader();
-            fBlock->setMeFree(blockSz);
-
-            LastFreeBlock *lastBl = static_cast<LastFreeBlock *>(fBlock->rightNeig(blockSz));
-            // to not get unaligned atomics during LastFreeBlock access
-            MALLOC_ASSERT(isAligned(lastBl, sizeof(uintptr_t)), NULL);
-            lastBl->initHeader();
-            lastBl->setMeFree(GuardedSize::LAST_REGION_BLOCK);
-            lastBl->setLeftFree(blockSz);
-            lastBl->myBin = NO_BIN;
-            lastBl->memRegion = region;
-
-            if (addToBin) {
-                unsigned targetBin = sizeToBin(blockSz);
-                // during adding advance regions, register bin for a largest block in region
-                advRegBins.registerBin(targetBin);
-                if (region->type == MEMREG_SLAB_BLOCKS) {
-                    fBlock->slabAligned = true;
-                    freeSlabAlignedBins.addBlock(targetBin, fBlock, blockSz, /*addToTail=*/false);
-                } else {
-                    fBlock->slabAligned = false;
-                    freeLargeBlockBins.addBlock(targetBin, fBlock, blockSz, /*addToTail=*/false);
+        // Does not stay in same bin, or bin-less; add it
+        if (needAddToBin) {
+            toRet->prev = toRet->next = toRet->nextToFree = nullptr;
+            toRet->myBin = NO_BIN;
+            toRet->slabAligned = toAligned;
+
+            // If the block is too small to fit in any bin, keep it bin-less.
+            // It's not a leak because the block later can be coalesced.
+            if (currSz >= minBinnedSize) {
+                toRet->sizeTmp = currSz;
+                IndexedBins *target = toRet->slabAligned ? &freeSlabAlignedBins : &freeLargeBlockBins;
+                if (forceCoalescQDrop) {
+                    target->addBlock(bin, toRet, toRet->sizeTmp, addToTail);
+                } else if (!target->tryAddBlock(bin, toRet, addToTail)) {
+                    coalescQ.putBlock(toRet);
+                    continue;
                 }
-            } else {
-                // to match with blockReleased() in genericGetBlock
-                bkndSync.blockConsumed();
-                // Understand our alignment for correct splitBlock operation
-                fBlock->slabAligned = region->type == MEMREG_SLAB_BLOCKS ? true : false;
-                fBlock->sizeTmp = fBlock->tryLockBlock();
-                MALLOC_ASSERT(fBlock->sizeTmp >= FreeBlock::minBlockSize, "Locking must be successful");
             }
+            toRet->sizeTmp = 0;
         }
-
-        void MemRegionList::add(MemRegion *r) {
-            r->prev = NULL;
-            MallocMutex::scoped_lock lock(regionListLock);
-            r->next = head;
-            head = r;
-            if (head->next) head->next->prev = head;
-        }
-
-        void MemRegionList::remove(MemRegion *r) {
-            MallocMutex::scoped_lock lock(regionListLock);
-            if (head == r) head = head->next;
-            if (r->next) r->next->prev = r->prev;
-            if (r->prev) r->prev->next = r->next;
+        // Free (possibly coalesced) free block.
+        // Adding to bin must be done before this point,
+        // because after a block is free it can be coalesced, and
+        // using its pointer became unsafe.
+        // Remember that coalescing is not done under any global lock.
+        toRet->setMeFree(currSz);
+        toRet->rightNeig(currSz)->setLeftFree(currSz);
+    }
+    return regionReleased;
+}
+
+// Coalesce fBlock and add it back to a bin;
+// processing delayed coalescing requests.
+void Backend::coalescAndPut(FreeBlock *fBlock, size_t blockSz, bool slabAligned)
+{
+    fBlock->sizeTmp = blockSz;
+    fBlock->nextToFree = nullptr;
+    fBlock->slabAligned = slabAligned;
+
+    coalescAndPutList(fBlock, /*forceCoalescQDrop=*/false, /*reportBlocksProcessed=*/false);
+}
+
+bool Backend::scanCoalescQ(bool forceCoalescQDrop)
+{
+    FreeBlock *currCoalescList = coalescQ.getAll();
+
+    if (currCoalescList)
+        // reportBlocksProcessed=true informs that the blocks leave coalescQ,
+        // matches blockConsumed() from CoalRequestQ::putBlock()
+        coalescAndPutList(currCoalescList, forceCoalescQDrop,
+                          /*reportBlocksProcessed=*/true);
+    // returns status of coalescQ.getAll(), as an indication of possible changes in backend
+    // TODO: coalescAndPutList() may report is some new free blocks became available or not
+    return currCoalescList;
+}
+
+FreeBlock *Backend::findBlockInRegion(MemRegion *region, size_t exactBlockSize)
+{
+    FreeBlock *fBlock;
+    size_t blockSz;
+    uintptr_t fBlockEnd,
+        lastFreeBlock = (uintptr_t)region + region->allocSz - sizeof(LastFreeBlock);
+
+    static_assert(sizeof(LastFreeBlock) % sizeof(uintptr_t) == 0,
+        "Atomic applied on LastFreeBlock, and we put it at the end of region, that"
+        " is uintptr_t-aligned, so no unaligned atomic operations are possible.");
+     // right bound is slab-aligned, keep LastFreeBlock after it
+    if (region->type == MEMREG_SLAB_BLOCKS) {
+        fBlock = (FreeBlock *)alignUp((uintptr_t)region + sizeof(MemRegion), sizeof(uintptr_t));
+        fBlockEnd = alignDown(lastFreeBlock, slabSize);
+    } else {
+        fBlock = (FreeBlock *)alignUp((uintptr_t)region + sizeof(MemRegion), largeObjectAlignment);
+        fBlockEnd = (uintptr_t)fBlock + exactBlockSize;
+        MALLOC_ASSERT(fBlockEnd <= lastFreeBlock, ASSERT_TEXT);
+    }
+    if (fBlockEnd <= (uintptr_t)fBlock)
+        return nullptr; // allocSz is too small
+    blockSz = fBlockEnd - (uintptr_t)fBlock;
+    // TODO: extend getSlabBlock to support degradation, i.e. getting less blocks
+    // then requested, and then relax this check
+    // (now all or nothing is implemented, check according to this)
+    if (blockSz < numOfSlabAllocOnMiss*slabSize)
+        return nullptr;
+
+    region->blockSz = blockSz;
+    return fBlock;
+}
+
+// startUseBlock may add the free block to a bin, the block can be used and
+// even released after this, so the region must be added to regionList already
+void Backend::startUseBlock(MemRegion *region, FreeBlock *fBlock, bool addToBin)
+{
+    size_t blockSz = region->blockSz;
+    fBlock->initHeader();
+    fBlock->setMeFree(blockSz);
+
+    LastFreeBlock *lastBl = static_cast<LastFreeBlock*>(fBlock->rightNeig(blockSz));
+    // to not get unaligned atomics during LastFreeBlock access
+    MALLOC_ASSERT(isAligned(lastBl, sizeof(uintptr_t)), nullptr);
+    lastBl->initHeader();
+    lastBl->setMeFree(GuardedSize::LAST_REGION_BLOCK);
+    lastBl->setLeftFree(blockSz);
+    lastBl->myBin = NO_BIN;
+    lastBl->memRegion = region;
+
+    if (addToBin) {
+        unsigned targetBin = sizeToBin(blockSz);
+        // during adding advance regions, register bin for a largest block in region
+        advRegBins.registerBin(targetBin);
+        if (region->type == MEMREG_SLAB_BLOCKS) {
+            fBlock->slabAligned = true;
+            freeSlabAlignedBins.addBlock(targetBin, fBlock, blockSz, /*addToTail=*/false);
+        } else {
+            fBlock->slabAligned = false;
+            freeLargeBlockBins.addBlock(targetBin, fBlock, blockSz, /*addToTail=*/false);
         }
+    } else {
+        // to match with blockReleased() in genericGetBlock
+        bkndSync.blockConsumed();
+        // Understand our alignment for correct splitBlock operation
+        fBlock->slabAligned = region->type == MEMREG_SLAB_BLOCKS ? true : false;
+        fBlock->sizeTmp = fBlock->tryLockBlock();
+        MALLOC_ASSERT(fBlock->sizeTmp >= FreeBlock::minBlockSize, "Locking must be successful");
+    }
+}
+
+void MemRegionList::add(MemRegion *r)
+{
+    r->prev = nullptr;
+    MallocMutex::scoped_lock lock(regionListLock);
+    r->next = head;
+    head = r;
+    if (head->next)
+        head->next->prev = head;
+}
+
+void MemRegionList::remove(MemRegion *r)
+{
+    MallocMutex::scoped_lock lock(regionListLock);
+    if (head == r)
+        head = head->next;
+    if (r->next)
+        r->next->prev = r->prev;
+    if (r->prev)
+        r->prev->next = r->next;
+}
 
 #if __TBB_MALLOC_BACKEND_STAT
-        int MemRegionList::reportStat(FILE *f) {
-            int regNum = 0;
-            MallocMutex::scoped_lock lock(regionListLock);
-            for (MemRegion *curr = head; curr; curr = curr->next) {
-                fprintf(f, "%p: max block %lu B, ", curr, curr->blockSz);
-                regNum++;
-            }
-            return regNum;
-        }
+int MemRegionList::reportStat(FILE *f)
+{
+    int regNum = 0;
+    MallocMutex::scoped_lock lock(regionListLock);
+    for (MemRegion *curr = head; curr; curr = curr->next) {
+        fprintf(f, "%p: max block %lu B, ", curr, curr->blockSz);
+        regNum++;
+    }
+    return regNum;
+}
 #endif
 
-        FreeBlock *Backend::addNewRegion(size_t size, MemRegionType memRegType, bool addToBin) {
-            static_assert(sizeof(BlockMutexes) <= sizeof(BlockI),
-                          "Header must be not overwritten in used blocks");
-            MALLOC_ASSERT(FreeBlock::minBlockSize > GuardedSize::MAX_SPEC_VAL,
-                          "Block length must not conflict with special values of GuardedSize");
-            // If the region is not "for slabs" we should reserve some space for
-            // a region header, the worst case alignment and the last block mark.
-            const size_t requestSize = memRegType == MEMREG_SLAB_BLOCKS
-                                               ? size
-                                               : size + sizeof(MemRegion) + largeObjectAlignment
-                                                         + FreeBlock::minBlockSize + sizeof(LastFreeBlock);
-
-            size_t rawSize = requestSize;
-            MemRegion *region = (MemRegion *) allocRawMem(rawSize);
-            if (!region) {
-                MALLOC_ASSERT(rawSize == requestSize,
-                              "getRawMem has not allocated memory but changed the allocated size.");
-                return NULL;
-            }
-            if (rawSize < sizeof(MemRegion)) {
-                if (!extMemPool->fixedPool) freeRawMem(region, rawSize);
-                return NULL;
-            }
-
-            region->type = memRegType;
-            region->allocSz = rawSize;
-            FreeBlock *fBlock = findBlockInRegion(region, size);
-            if (!fBlock) {
-                if (!extMemPool->fixedPool) freeRawMem(region, rawSize);
-                return NULL;
-            }
-            regionList.add(region);
-            startUseBlock(region, fBlock, addToBin);
-            bkndSync.binsModified();
-            return addToBin ? (FreeBlock *) VALID_BLOCK_IN_BIN : fBlock;
-        }
-
-        void Backend::init(ExtMemoryPool *extMemoryPool) {
-            extMemPool = extMemoryPool;
-            usedAddrRange.init();
-            coalescQ.init(&bkndSync);
-            bkndSync.init(this);
-        }
-
-        void Backend::reset() {
-            MALLOC_ASSERT(extMemPool->userPool(), "Only user pool can be reset.");
-            // no active threads are allowed in backend while reset() called
-            verify();
-
-            freeLargeBlockBins.reset();
-            freeSlabAlignedBins.reset();
-            advRegBins.reset();
-
-            for (MemRegion *curr = regionList.head; curr; curr = curr->next) {
-                FreeBlock *fBlock = findBlockInRegion(curr, curr->blockSz);
-                MALLOC_ASSERT(fBlock, "A memory region unexpectedly got smaller");
-                startUseBlock(curr, fBlock, /*addToBin=*/true);
-            }
-        }
-
-        bool Backend::destroy() {
-            bool noError = true;
-            // no active threads are allowed in backend while destroy() called
-            verify();
-            if (!inUserPool()) {
-                freeLargeBlockBins.reset();
-                freeSlabAlignedBins.reset();
-            }
-            while (regionList.head) {
-                MemRegion *helper = regionList.head->next;
-                noError &= freeRawMem(regionList.head, regionList.head->allocSz);
-                regionList.head = helper;
-            }
-            return noError;
-        }
-
-        bool Backend::clean() {
-            scanCoalescQ(/*forceCoalescQDrop=*/false);
-
-            bool res = false;
-            // We can have several blocks occupying a whole region,
-            // because such regions are added in advance (see askMemFromOS() and reset()),
-            // and never used. Release them all.
-            for (int i = advRegBins.getMinUsedBin(0); i != -1; i = advRegBins.getMinUsedBin(i + 1)) {
-                if (i == freeSlabAlignedBins.getMinNonemptyBin(i))
-                    res |= freeSlabAlignedBins.tryReleaseRegions(i, this);
-                if (i == freeLargeBlockBins.getMinNonemptyBin(i))
-                    res |= freeLargeBlockBins.tryReleaseRegions(i, this);
-            }
-
-            return res;
-        }
-
-        void Backend::IndexedBins::verify() {
+FreeBlock *Backend::addNewRegion(size_t size, MemRegionType memRegType, bool addToBin)
+{
+    static_assert(sizeof(BlockMutexes) <= sizeof(BlockI), "Header must be not overwritten in used blocks");
+    MALLOC_ASSERT(FreeBlock::minBlockSize > GuardedSize::MAX_SPEC_VAL,
+          "Block length must not conflict with special values of GuardedSize");
+    // If the region is not "for slabs" we should reserve some space for
+    // a region header, the worst case alignment and the last block mark.
+    const size_t requestSize = memRegType == MEMREG_SLAB_BLOCKS ? size :
+        size + sizeof(MemRegion) + largeObjectAlignment
+             +  FreeBlock::minBlockSize + sizeof(LastFreeBlock);
+
+    size_t rawSize = requestSize;
+    MemRegion *region = (MemRegion*)allocRawMem(rawSize);
+    if (!region) {
+        MALLOC_ASSERT(rawSize==requestSize, "getRawMem has not allocated memory but changed the allocated size.");
+        return nullptr;
+    }
+    if (rawSize < sizeof(MemRegion)) {
+        if (!extMemPool->fixedPool)
+            freeRawMem(region, rawSize);
+        return nullptr;
+    }
+
+    region->type = memRegType;
+    region->allocSz = rawSize;
+    FreeBlock *fBlock = findBlockInRegion(region, size);
+    if (!fBlock) {
+        if (!extMemPool->fixedPool)
+            freeRawMem(region, rawSize);
+        return nullptr;
+    }
+    regionList.add(region);
+    startUseBlock(region, fBlock, addToBin);
+    bkndSync.binsModified();
+    return addToBin? (FreeBlock*)VALID_BLOCK_IN_BIN : fBlock;
+}
+
+void Backend::init(ExtMemoryPool *extMemoryPool)
+{
+    extMemPool = extMemoryPool;
+    usedAddrRange.init();
+    coalescQ.init(&bkndSync);
+    bkndSync.init(this);
+}
+
+void Backend::reset()
+{
+    MALLOC_ASSERT(extMemPool->userPool(), "Only user pool can be reset.");
+    // no active threads are allowed in backend while reset() called
+    verify();
+
+    freeLargeBlockBins.reset();
+    freeSlabAlignedBins.reset();
+    advRegBins.reset();
+
+    for (MemRegion *curr = regionList.head; curr; curr = curr->next) {
+        FreeBlock *fBlock = findBlockInRegion(curr, curr->blockSz);
+        MALLOC_ASSERT(fBlock, "A memory region unexpectedly got smaller");
+        startUseBlock(curr, fBlock, /*addToBin=*/true);
+    }
+}
+
+bool Backend::destroy()
+{
+    bool noError = true;
+    // no active threads are allowed in backend while destroy() called
+    verify();
+    if (!inUserPool()) {
+        freeLargeBlockBins.reset();
+        freeSlabAlignedBins.reset();
+    }
+    while (regionList.head) {
+        MemRegion *helper = regionList.head->next;
+        noError &= freeRawMem(regionList.head, regionList.head->allocSz);
+        regionList.head = helper;
+    }
+    return noError;
+}
+
+bool Backend::clean()
+{
+    scanCoalescQ(/*forceCoalescQDrop=*/false);
+    // Backend::clean is always called under synchronization so only one thread can
+    // enter to this method at once.
+    // backendCleanCnt%2== 1 means that clean operation is in progress
+    backendCleanCnt.fetch_add(1, std::memory_order_acq_rel);
+    bool res = false;
+    // We can have several blocks occupying a whole region,
+    // because such regions are added in advance (see askMemFromOS() and reset()),
+    // and never used. Release them all.
+    for (int i = advRegBins.getMinUsedBin(0); i != -1; i = advRegBins.getMinUsedBin(i+1)) {
+        if (i == freeSlabAlignedBins.getMinNonemptyBin(i))
+            res |= freeSlabAlignedBins.tryReleaseRegions(i, this);
+        if (i == freeLargeBlockBins.getMinNonemptyBin(i))
+            res |= freeLargeBlockBins.tryReleaseRegions(i, this);
+    }
+    backendCleanCnt.fetch_add(1, std::memory_order_acq_rel);
+    return res;
+}
+
+void Backend::IndexedBins::verify()
+{
 #if MALLOC_DEBUG
-            for (int i = 0; i < freeBinsNum; i++) {
-                for (FreeBlock *fb = freeBins[i].head.load(std::memory_order_relaxed); fb; fb = fb->next) {
-                    uintptr_t mySz = fb->myL.value;
-                    MALLOC_ASSERT(mySz > GuardedSize::MAX_SPEC_VAL, ASSERT_TEXT);
-                    FreeBlock *right = (FreeBlock *) ((uintptr_t) fb + mySz);
-                    suppress_unused_warning(right);
-                    MALLOC_ASSERT(right->myL.value <= GuardedSize::MAX_SPEC_VAL, ASSERT_TEXT);
-                    MALLOC_ASSERT(right->leftL.value == mySz, ASSERT_TEXT);
-                    MALLOC_ASSERT(fb->leftL.value <= GuardedSize::MAX_SPEC_VAL, ASSERT_TEXT);
-                }
-            }
-#endif
+    for (int i=0; i<(int)freeBinsNum; i++) {
+        for (FreeBlock *fb = freeBins[i].head.load(std::memory_order_relaxed); fb; fb=fb->next) {
+            uintptr_t mySz = fb->myL.value;
+            MALLOC_ASSERT(mySz>GuardedSize::MAX_SPEC_VAL, ASSERT_TEXT);
+            FreeBlock *right = (FreeBlock*)((uintptr_t)fb + mySz);
+            suppress_unused_warning(right);
+            MALLOC_ASSERT(right->myL.value<=GuardedSize::MAX_SPEC_VAL, ASSERT_TEXT);
+            MALLOC_ASSERT(right->leftL.value==mySz, ASSERT_TEXT);
+            MALLOC_ASSERT(fb->leftL.value<=GuardedSize::MAX_SPEC_VAL, ASSERT_TEXT);
         }
+    }
+#endif
+}
 
-        // For correct operation, it must be called when no other threads
-        // is changing backend.
-        void Backend::verify() {
+// For correct operation, it must be called when no other threads
+// is changing backend.
+void Backend::verify()
+{
 #if MALLOC_DEBUG
-            scanCoalescQ(/*forceCoalescQDrop=*/false);
-#endif// MALLOC_DEBUG
+    scanCoalescQ(/*forceCoalescQDrop=*/false);
+#endif // MALLOC_DEBUG
 
-            freeLargeBlockBins.verify();
-            freeSlabAlignedBins.verify();
-        }
+    freeLargeBlockBins.verify();
+    freeSlabAlignedBins.verify();
+}
 
 #if __TBB_MALLOC_BACKEND_STAT
-        size_t Backend::Bin::countFreeBlocks() {
-            size_t cnt = 0;
-            {
-                MallocMutex::scoped_lock lock(tLock);
-                for (FreeBlock *fb = head; fb; fb = fb->next) cnt++;
-            }
-            return cnt;
-        }
-
-        size_t Backend::Bin::reportFreeBlocks(FILE *f) {
-            size_t totalSz = 0;
-            MallocMutex::scoped_lock lock(tLock);
-            for (FreeBlock *fb = head; fb; fb = fb->next) {
-                size_t sz = fb->tryLockBlock();
-                fb->setMeFree(sz);
-                fprintf(f, " [%p;%p]", fb, (void *) ((uintptr_t) fb + sz));
-                totalSz += sz;
-            }
-            return totalSz;
+size_t Backend::Bin::countFreeBlocks()
+{
+    size_t cnt = 0;
+    {
+        MallocMutex::scoped_lock lock(tLock);
+        for (FreeBlock *fb = head; fb; fb = fb->next)
+            cnt++;
+    }
+    return cnt;
+}
+
+size_t Backend::Bin::reportFreeBlocks(FILE *f)
+{
+    size_t totalSz = 0;
+    MallocMutex::scoped_lock lock(tLock);
+    for (FreeBlock *fb = head; fb; fb = fb->next) {
+        size_t sz = fb->tryLockBlock();
+        fb->setMeFree(sz);
+        fb->rightNeig(sz)->setLeftFree(sz);
+        fprintf(f, " [%p;%p]", fb, (void*)((uintptr_t)fb+sz));
+        totalSz += sz;
+    }
+    return totalSz;
+}
+
+void Backend::IndexedBins::reportStat(FILE *f)
+{
+    size_t totalSize = 0;
+
+    for (int i=0; i<Backend::freeBinsNum; i++)
+        if (size_t cnt = freeBins[i].countFreeBlocks()) {
+            totalSize += freeBins[i].reportFreeBlocks(f);
+            fprintf(f, " %d:%lu, ", i, cnt);
         }
-
-        void Backend::IndexedBins::reportStat(FILE *f) {
-            size_t totalSize = 0;
-
-            for (int i = 0; i < Backend::freeBinsNum; i++)
-                if (size_t cnt = freeBins[i].countFreeBlocks()) {
-                    totalSize += freeBins[i].reportFreeBlocks(f);
-                    fprintf(f, " %d:%lu, ", i, cnt);
-                }
-            fprintf(f, "\ttotal size %lu KB", totalSize / 1024);
-        }
-
-        void Backend::reportStat(FILE *f) {
-            scanCoalescQ(/*forceCoalescQDrop=*/false);
-
-            fprintf(f, "\n  regions:\n");
-            int regNum = regionList.reportStat(f);
-            fprintf(f, "\n%d regions, %lu KB in all regions\n  free bins:\nlarge bins: ", regNum,
-                    totalMemSize / 1024);
-            freeLargeBlockBins.reportStat(f);
-            fprintf(f, "\naligned bins: ");
-            freeSlabAlignedBins.reportStat(f);
-            fprintf(f, "\n");
-        }
-#endif// __TBB_MALLOC_BACKEND_STAT
-
-    }// namespace internal
-}// namespace rml
+    fprintf(f, "\ttotal size %lu KB", totalSize/1024);
+}
+
+void Backend::reportStat(FILE *f)
+{
+    scanCoalescQ(/*forceCoalescQDrop=*/false);
+
+    fprintf(f, "\n  regions:\n");
+    int regNum = regionList.reportStat(f);
+    fprintf(f, "\n%d regions, %lu KB in all regions\n  free bins:\nlarge bins: ",
+            regNum, totalMemSize/1024);
+    freeLargeBlockBins.reportStat(f);
+    fprintf(f, "\naligned bins: ");
+    freeSlabAlignedBins.reportStat(f);
+    fprintf(f, "\n");
+}
+#endif // __TBB_MALLOC_BACKEND_STAT
+
+} } // namespaces
diff --git a/external/tbb/src/tbbmalloc/backend.h b/external/tbb/src/tbbmalloc/backend.h
index 1880ab46..cbf62c0b 100644
--- a/external/tbb/src/tbbmalloc/backend.h
+++ b/external/tbb/src/tbbmalloc/backend.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2023 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -265,6 +265,7 @@ class Backend {
     IndexedBins freeLargeBlockBins,
                 freeSlabAlignedBins;
 
+    std::atomic<intptr_t> backendCleanCnt;
     // Our friends
     friend class BackendSync;
 
diff --git a/external/tbb/src/tbbmalloc/backref.cpp b/external/tbb/src/tbbmalloc/backref.cpp
index fdb4701d..b0ea8306 100644
--- a/external/tbb/src/tbbmalloc/backref.cpp
+++ b/external/tbb/src/tbbmalloc/backref.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2023 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -15,351 +15,344 @@
 */
 
 #include "tbbmalloc_internal.h"
-#include <new> /* for placement new */
+#include <new>        /* for placement new */
 
 namespace rml {
-    namespace internal {
+namespace internal {
 
-        /********* backreferences ***********************/
-        /* Each slab block and each large memory object header contains BackRefIdx
+
+/********* backreferences ***********************/
+/* Each slab block and each large memory object header contains BackRefIdx
  * that points out in some BackRefBlock which points back to this block or header.
  */
-        struct BackRefBlock : public BlockI {
-            BackRefBlock *nextForUse;// the next in the chain of blocks with free items
-            FreeObject *bumpPtr;     // bump pointer moves from the end to the beginning of the block
-            FreeObject *freeList;
-            // list of all blocks that were allocated from raw mem (i.e., not from backend)
-            BackRefBlock *nextRawMemBlock;
-            std::atomic<int> allocatedCount;// the number of objects allocated
-            BackRefIdx::main_t myNum;       // the index in the main
-            MallocMutex blockMutex;
-            // true if this block has been added to the listForUse chain,
-            // modifications protected by mainMutex
-            std::atomic<bool> addedToForUse;
-
-            BackRefBlock(const BackRefBlock *blockToUse, intptr_t num)
-                : nextForUse(NULL),
-                  bumpPtr((FreeObject *) ((uintptr_t) blockToUse + slabSize - sizeof(void *))),
-                  freeList(NULL), nextRawMemBlock(NULL), allocatedCount(0), myNum(num), addedToForUse(false) {
-                memset(&blockMutex, 0, sizeof(MallocMutex));
-
-                MALLOC_ASSERT(!(num >> CHAR_BIT * sizeof(BackRefIdx::main_t)),
-                              "index in BackRefMain must fit to BackRefIdx::main");
-            }
-            // clean all but header
-            void zeroSet() { memset(this + 1, 0, BackRefBlock::bytes - sizeof(BackRefBlock)); }
-            static const int bytes = slabSize;
-        };
-
-        // max number of backreference pointers in slab block
-        static const int BR_MAX_CNT = (BackRefBlock::bytes - sizeof(BackRefBlock)) / sizeof(void *);
-
-        struct BackRefMain {
-            /* On 64-bit systems a slab block can hold up to ~2K back pointers to slab blocks
+struct BackRefBlock : public BlockI {
+    BackRefBlock *nextForUse;     // the next in the chain of blocks with free items
+    FreeObject   *bumpPtr;        // bump pointer moves from the end to the beginning of the block
+    FreeObject   *freeList;
+    // list of all blocks that were allocated from raw mem (i.e., not from backend)
+    BackRefBlock *nextRawMemBlock;
+    std::atomic<int> allocatedCount; // the number of objects allocated
+    BackRefIdx::main_t myNum;   // the index in the main
+    MallocMutex   blockMutex;
+    // true if this block has been added to the listForUse chain,
+    // modifications protected by mainMutex
+    std::atomic<bool> addedToForUse;
+
+    BackRefBlock(const BackRefBlock *blockToUse, intptr_t num) :
+        nextForUse(nullptr), bumpPtr((FreeObject*)((uintptr_t)blockToUse + slabSize - sizeof(void*))),
+        freeList(nullptr), nextRawMemBlock(nullptr), allocatedCount(0), myNum(num),
+        addedToForUse(false) {
+        memset(static_cast<void*>(&blockMutex), 0, sizeof(MallocMutex));
+
+        MALLOC_ASSERT(!(num >> CHAR_BIT*sizeof(BackRefIdx::main_t)),
+                      "index in BackRefMain must fit to BackRefIdx::main");
+    }
+    // clean all but header
+    void zeroSet() { memset(static_cast<void*>(this+1), 0, BackRefBlock::bytes-sizeof(BackRefBlock)); }
+    static const int bytes = slabSize;
+};
+
+// max number of backreference pointers in slab block
+static const int BR_MAX_CNT = (BackRefBlock::bytes-sizeof(BackRefBlock))/sizeof(void*);
+
+struct BackRefMain {
+/* On 64-bit systems a slab block can hold up to ~2K back pointers to slab blocks
  * or large objects, so it can address at least 32MB. The main array of 256KB
  * holds 32K pointers to such blocks, addressing ~1 TB.
  * On 32-bit systems there is ~4K back pointers in a slab block, so ~64MB can be addressed.
  * The main array of 8KB holds 2K pointers to leaves, so ~128 GB can addressed.
  */
-            static const size_t bytes = sizeof(uintptr_t) > 4 ? 256 * 1024 : 8 * 1024;
-            static const int dataSz;
-            /* space is reserved for main table and 4 leaves
+    static const size_t bytes = sizeof(uintptr_t)>4? 256*1024 : 8*1024;
+    static const int dataSz;
+/* space is reserved for main table and 4 leaves
    taking into account VirtualAlloc allocation granularity */
-            static const int leaves = 4;
-            static const size_t mainSize = BackRefMain::bytes + leaves * BackRefBlock::bytes;
-            // The size of memory request for a few more leaf blocks;
-            // selected to match VirtualAlloc granularity
-            static const size_t blockSpaceSize = 64 * 1024;
-
-            Backend *backend;
-            std::atomic<BackRefBlock *> active;    // if defined, use it for allocations
-            std::atomic<BackRefBlock *> listForUse;// the chain of data blocks with free items
-            BackRefBlock *allRawMemBlocks;
-            std::atomic<intptr_t> lastUsed;// index of the last used block
-            bool rawMemUsed;
-            MallocMutex requestNewSpaceMutex;
-            BackRefBlock *backRefBl[1];// the real size of the array is dataSz
-
-            BackRefBlock *findFreeBlock();
-            void addToForUseList(BackRefBlock *bl);
-            void initEmptyBackRefBlock(BackRefBlock *newBl);
-            bool requestNewSpace();
-        };
-
-        const int BackRefMain::dataSz
-                = 1 + (BackRefMain::bytes - sizeof(BackRefMain)) / sizeof(BackRefBlock *);
-
-        static MallocMutex mainMutex;
-        static std::atomic<BackRefMain *> backRefMain;
-
-        bool initBackRefMain(Backend *backend) {
-            bool rawMemUsed;
-            BackRefMain *main = (BackRefMain *) backend->getBackRefSpace(BackRefMain::mainSize, &rawMemUsed);
-            if (!main) return false;
-            main->backend = backend;
-            main->listForUse.store(nullptr, std::memory_order_relaxed);
-            main->allRawMemBlocks = nullptr;
-            main->rawMemUsed = rawMemUsed;
-            main->lastUsed = -1;
-            memset(&main->requestNewSpaceMutex, 0, sizeof(MallocMutex));
-            for (int i = 0; i < BackRefMain::leaves; i++) {
-                BackRefBlock *bl
-                        = (BackRefBlock *) ((uintptr_t) main + BackRefMain::bytes + i * BackRefBlock::bytes);
-                bl->zeroSet();
-                main->initEmptyBackRefBlock(bl);
-                if (i) main->addToForUseList(bl);
-                else// active leaf is not needed in listForUse
-                    main->active.store(bl, std::memory_order_relaxed);
-            }
-            // backRefMain is read in getBackRef, so publish it in consistent state
-            backRefMain.store(main, std::memory_order_release);
-            return true;
-        }
+    static const int leaves = 4;
+    static const size_t mainSize = BackRefMain::bytes+leaves*BackRefBlock::bytes;
+    // The size of memory request for a few more leaf blocks;
+    // selected to match VirtualAlloc granularity
+    static const size_t blockSpaceSize = 64*1024;
+
+    Backend       *backend;
+    std::atomic<BackRefBlock*> active;         // if defined, use it for allocations
+    std::atomic<BackRefBlock*> listForUse;     // the chain of data blocks with free items
+    BackRefBlock  *allRawMemBlocks;
+    std::atomic <intptr_t> lastUsed; // index of the last used block
+    bool           rawMemUsed;
+    MallocMutex    requestNewSpaceMutex;
+    BackRefBlock  *backRefBl[1];   // the real size of the array is dataSz
+
+    BackRefBlock *findFreeBlock();
+    void          addToForUseList(BackRefBlock *bl);
+    void          initEmptyBackRefBlock(BackRefBlock *newBl);
+    bool          requestNewSpace();
+};
+
+const int BackRefMain::dataSz
+    = 1+(BackRefMain::bytes-sizeof(BackRefMain))/sizeof(BackRefBlock*);
+
+static MallocMutex mainMutex;
+static std::atomic<BackRefMain*> backRefMain;
+
+bool initBackRefMain(Backend *backend)
+{
+    bool rawMemUsed;
+    BackRefMain *main =
+        (BackRefMain*)backend->getBackRefSpace(BackRefMain::mainSize,
+                                                 &rawMemUsed);
+    if (! main)
+        return false;
+    main->backend = backend;
+    main->listForUse.store(nullptr, std::memory_order_relaxed);
+    main->allRawMemBlocks = nullptr;
+    main->rawMemUsed = rawMemUsed;
+    main->lastUsed = -1;
+    memset(static_cast<void*>(&main->requestNewSpaceMutex), 0, sizeof(MallocMutex));
+    for (int i=0; i<BackRefMain::leaves; i++) {
+        BackRefBlock *bl = (BackRefBlock*)((uintptr_t)main + BackRefMain::bytes + i*BackRefBlock::bytes);
+        bl->zeroSet();
+        main->initEmptyBackRefBlock(bl);
+        if (i)
+            main->addToForUseList(bl);
+        else // active leaf is not needed in listForUse
+            main->active.store(bl, std::memory_order_relaxed);
+    }
+    // backRefMain is read in getBackRef, so publish it in consistent state
+    backRefMain.store(main, std::memory_order_release);
+    return true;
+}
 
 #if __TBB_SOURCE_DIRECTLY_INCLUDED
-        void destroyBackRefMain(Backend *backend) {
-            if (backRefMain.load(std::memory_order_acquire)) {// Is initBackRefMain() called?
-                for (BackRefBlock *curr = backRefMain.load(std::memory_order_relaxed)->allRawMemBlocks;
-                     curr;) {
-                    BackRefBlock *next = curr->nextRawMemBlock;
-                    // allRawMemBlocks list is only for raw mem blocks
-                    backend->putBackRefSpace(curr, BackRefMain::blockSpaceSize,
-                                             /*rawMemUsed=*/true);
-                    curr = next;
-                }
-                backend->putBackRefSpace(backRefMain.load(std::memory_order_relaxed), BackRefMain::mainSize,
-                                         backRefMain.load(std::memory_order_relaxed)->rawMemUsed);
-            }
+void destroyBackRefMain(Backend *backend)
+{
+    if (backRefMain.load(std::memory_order_acquire)) { // Is initBackRefMain() called?
+        for (BackRefBlock *curr = backRefMain.load(std::memory_order_relaxed)->allRawMemBlocks; curr; ) {
+            BackRefBlock *next = curr->nextRawMemBlock;
+            // allRawMemBlocks list is only for raw mem blocks
+            backend->putBackRefSpace(curr, BackRefMain::blockSpaceSize,
+                                     /*rawMemUsed=*/true);
+            curr = next;
         }
+        backend->putBackRefSpace(backRefMain.load(std::memory_order_relaxed), BackRefMain::mainSize,
+                                 backRefMain.load(std::memory_order_relaxed)->rawMemUsed);
+    }
+}
 #endif
 
-        void BackRefMain::addToForUseList(BackRefBlock *bl) {
-            bl->nextForUse = listForUse.load(std::memory_order_relaxed);
-            listForUse.store(bl, std::memory_order_relaxed);
-            bl->addedToForUse.store(true, std::memory_order_relaxed);
-        }
-
-        void BackRefMain::initEmptyBackRefBlock(BackRefBlock *newBl) {
-            intptr_t nextLU = lastUsed + 1;
-            new (newBl) BackRefBlock(newBl, nextLU);
-            MALLOC_ASSERT(nextLU < dataSz, NULL);
-            backRefBl[nextLU] = newBl;
-            // lastUsed is read in getBackRef, and access to backRefBl[lastUsed]
-            // is possible only after checking backref against current lastUsed
-            lastUsed.store(nextLU, std::memory_order_release);
+void BackRefMain::addToForUseList(BackRefBlock *bl)
+{
+    bl->nextForUse = listForUse.load(std::memory_order_relaxed);
+    listForUse.store(bl, std::memory_order_relaxed);
+    bl->addedToForUse.store(true, std::memory_order_relaxed);
+}
+
+void BackRefMain::initEmptyBackRefBlock(BackRefBlock *newBl)
+{
+    intptr_t nextLU = lastUsed+1;
+    new (newBl) BackRefBlock(newBl, nextLU);
+    MALLOC_ASSERT(nextLU < dataSz, nullptr);
+    backRefBl[nextLU] = newBl;
+    // lastUsed is read in getBackRef, and access to backRefBl[lastUsed]
+    // is possible only after checking backref against current lastUsed
+    lastUsed.store(nextLU, std::memory_order_release);
+}
+
+bool BackRefMain::requestNewSpace()
+{
+    bool isRawMemUsed;
+    static_assert(!(blockSpaceSize % BackRefBlock::bytes),
+                         "Must request space for whole number of blocks.");
+
+    if (BackRefMain::dataSz <= lastUsed + 1) // no space in main
+        return false;
+
+    // only one thread at a time may add blocks
+    MallocMutex::scoped_lock newSpaceLock(requestNewSpaceMutex);
+
+    if (listForUse.load(std::memory_order_relaxed)) // double check that only one block is available
+        return true;
+    BackRefBlock *newBl = (BackRefBlock*)backend->getBackRefSpace(blockSpaceSize, &isRawMemUsed);
+    if (!newBl) return false;
+
+    // touch a page for the 1st time without taking mainMutex ...
+    for (BackRefBlock *bl = newBl; (uintptr_t)bl < (uintptr_t)newBl + blockSpaceSize;
+         bl = (BackRefBlock*)((uintptr_t)bl + BackRefBlock::bytes)) {
+        bl->zeroSet();
+    }
+
+    MallocMutex::scoped_lock lock(mainMutex); // ... and share under lock
+
+    const size_t numOfUnusedIdxs = BackRefMain::dataSz - lastUsed - 1;
+    if (numOfUnusedIdxs <= 0) { // no space in main under lock, roll back
+        backend->putBackRefSpace(newBl, blockSpaceSize, isRawMemUsed);
+        return false;
+    }
+    // It's possible that only part of newBl is used, due to lack of indices in main.
+    // This is OK as such underutilization is possible only once for backreferneces table.
+    int blocksToUse = min(numOfUnusedIdxs, blockSpaceSize / BackRefBlock::bytes);
+
+    // use the first block in the batch to maintain the list of "raw" memory
+    // to be released at shutdown
+    if (isRawMemUsed) {
+        newBl->nextRawMemBlock = backRefMain.load(std::memory_order_relaxed)->allRawMemBlocks;
+        backRefMain.load(std::memory_order_relaxed)->allRawMemBlocks = newBl;
+    }
+    for (BackRefBlock *bl = newBl; blocksToUse>0; bl = (BackRefBlock*)((uintptr_t)bl + BackRefBlock::bytes), blocksToUse--) {
+        initEmptyBackRefBlock(bl);
+        if (active.load(std::memory_order_relaxed)->allocatedCount.load(std::memory_order_relaxed) == BR_MAX_CNT) {
+            active.store(bl, std::memory_order_release); // active leaf is not needed in listForUse
+        } else {
+            addToForUseList(bl);
         }
-
-        bool BackRefMain::requestNewSpace() {
-            bool isRawMemUsed;
-            static_assert(!(blockSpaceSize % BackRefBlock::bytes),
-                          "Must request space for whole number of blocks.");
-
-            if (backRefMain.load(std::memory_order_relaxed)->dataSz <= lastUsed + 1)// no space in main
-                return false;
-
-            // only one thread at a time may add blocks
-            MallocMutex::scoped_lock newSpaceLock(requestNewSpaceMutex);
-
-            if (listForUse.load(std::memory_order_relaxed))// double check that only one block is available
-                return true;
-            BackRefBlock *newBl = (BackRefBlock *) backend->getBackRefSpace(blockSpaceSize, &isRawMemUsed);
-            if (!newBl) return false;
-
-            // touch a page for the 1st time without taking mainMutex ...
-            for (BackRefBlock *bl = newBl; (uintptr_t) bl < (uintptr_t) newBl + blockSpaceSize;
-                 bl = (BackRefBlock *) ((uintptr_t) bl + BackRefBlock::bytes)) {
-                bl->zeroSet();
-            }
-
-            MallocMutex::scoped_lock lock(mainMutex);// ... and share under lock
-
-            const size_t numOfUnusedIdxs = backRefMain.load(std::memory_order_relaxed)->dataSz - lastUsed - 1;
-            if (numOfUnusedIdxs <= 0) {// no space in main under lock, roll back
-                backend->putBackRefSpace(newBl, blockSpaceSize, isRawMemUsed);
-                return false;
+    }
+    return true;
+}
+
+BackRefBlock *BackRefMain::findFreeBlock()
+{
+    BackRefBlock* active_block = active.load(std::memory_order_acquire);
+    MALLOC_ASSERT(active_block, ASSERT_TEXT);
+
+    if (active_block->allocatedCount.load(std::memory_order_relaxed) < BR_MAX_CNT)
+        return active_block;
+
+    if (listForUse.load(std::memory_order_relaxed)) { // use released list
+        MallocMutex::scoped_lock lock(mainMutex);
+
+        if (active_block->allocatedCount.load(std::memory_order_relaxed) == BR_MAX_CNT) {
+            active_block = listForUse.load(std::memory_order_relaxed);
+            if (active_block) {
+                active.store(active_block, std::memory_order_release);
+                listForUse.store(active_block->nextForUse, std::memory_order_relaxed);
+                MALLOC_ASSERT(active_block->addedToForUse.load(std::memory_order_relaxed), ASSERT_TEXT);
+                active_block->addedToForUse.store(false, std::memory_order_relaxed);
             }
-            // It's possible that only part of newBl is used, due to lack of indices in main.
-            // This is OK as such underutilization is possible only once for backreferneces table.
-            int blocksToUse = min(numOfUnusedIdxs, blockSpaceSize / BackRefBlock::bytes);
-
-            // use the first block in the batch to maintain the list of "raw" memory
-            // to be released at shutdown
-            if (isRawMemUsed) {
-                newBl->nextRawMemBlock = backRefMain.load(std::memory_order_relaxed)->allRawMemBlocks;
-                backRefMain.load(std::memory_order_relaxed)->allRawMemBlocks = newBl;
-            }
-            for (BackRefBlock *bl = newBl; blocksToUse > 0;
-                 bl = (BackRefBlock *) ((uintptr_t) bl + BackRefBlock::bytes), blocksToUse--) {
-                initEmptyBackRefBlock(bl);
-                if (active.load(std::memory_order_relaxed)->allocatedCount.load(std::memory_order_relaxed)
-                    == BR_MAX_CNT) {
-                    active.store(bl, std::memory_order_release);// active leaf is not needed in listForUse
-                } else {
-                    addToForUseList(bl);
+        }
+    } else // allocate new data node
+        if (!requestNewSpace())
+            return nullptr;
+    return active.load(std::memory_order_acquire); // reread because of requestNewSpace
+}
+
+void *getBackRef(BackRefIdx backRefIdx)
+{
+    // !backRefMain means no initialization done, so it can't be valid memory
+    // see addEmptyBackRefBlock for fences around lastUsed
+    if (!(backRefMain.load(std::memory_order_acquire))
+        || backRefIdx.getMain() > (backRefMain.load(std::memory_order_relaxed)->lastUsed.load(std::memory_order_acquire))
+        || backRefIdx.getOffset() >= BR_MAX_CNT)
+    {
+        return nullptr;
+    }
+    std::atomic<void*>& backRefEntry = *(std::atomic<void*>*)(
+            (uintptr_t)backRefMain.load(std::memory_order_relaxed)->backRefBl[backRefIdx.getMain()]
+            + sizeof(BackRefBlock) + backRefIdx.getOffset() * sizeof(std::atomic<void*>)
+        );
+    return backRefEntry.load(std::memory_order_relaxed);
+}
+
+void setBackRef(BackRefIdx backRefIdx, void *newPtr)
+{
+    MALLOC_ASSERT(backRefIdx.getMain()<=backRefMain.load(std::memory_order_relaxed)->lastUsed.load(std::memory_order_relaxed)
+                                 && backRefIdx.getOffset()<BR_MAX_CNT, ASSERT_TEXT);
+    ((std::atomic<void*>*)((uintptr_t)backRefMain.load(std::memory_order_relaxed)->backRefBl[backRefIdx.getMain()]
+        + sizeof(BackRefBlock) + backRefIdx.getOffset() * sizeof(void*)))->store(newPtr, std::memory_order_relaxed);
+}
+
+BackRefIdx BackRefIdx::newBackRef(bool largeObj)
+{
+    BackRefBlock *blockToUse;
+    void **toUse;
+    BackRefIdx res;
+    bool lastBlockFirstUsed = false;
+
+    do {
+        MALLOC_ASSERT(backRefMain.load(std::memory_order_relaxed), ASSERT_TEXT);
+        blockToUse = backRefMain.load(std::memory_order_relaxed)->findFreeBlock();
+        if (!blockToUse)
+            return BackRefIdx();
+        toUse = nullptr;
+        { // the block is locked to find a reference
+            MallocMutex::scoped_lock lock(blockToUse->blockMutex);
+
+            if (blockToUse->freeList) {
+                toUse = (void**)blockToUse->freeList;
+                blockToUse->freeList = blockToUse->freeList->next;
+                MALLOC_ASSERT(!blockToUse->freeList ||
+                              ((uintptr_t)blockToUse->freeList>=(uintptr_t)blockToUse
+                               && (uintptr_t)blockToUse->freeList <
+                               (uintptr_t)blockToUse + slabSize), ASSERT_TEXT);
+            } else if (blockToUse->allocatedCount.load(std::memory_order_relaxed) < BR_MAX_CNT) {
+                toUse = (void**)blockToUse->bumpPtr;
+                blockToUse->bumpPtr =
+                    (FreeObject*)((uintptr_t)blockToUse->bumpPtr - sizeof(void*));
+                if (blockToUse->allocatedCount.load(std::memory_order_relaxed) == BR_MAX_CNT-1) {
+                    MALLOC_ASSERT((uintptr_t)blockToUse->bumpPtr
+                                  < (uintptr_t)blockToUse+sizeof(BackRefBlock),
+                                  ASSERT_TEXT);
+                    blockToUse->bumpPtr = nullptr;
                 }
             }
-            return true;
-        }
-
-        BackRefBlock *BackRefMain::findFreeBlock() {
-            BackRefBlock *active_block = active.load(std::memory_order_acquire);
-            MALLOC_ASSERT(active_block, ASSERT_TEXT);
-
-            if (active_block->allocatedCount.load(std::memory_order_relaxed) < BR_MAX_CNT)
-                return active_block;
-
-            if (listForUse.load(std::memory_order_relaxed)) {// use released list
-                MallocMutex::scoped_lock lock(mainMutex);
-
-                if (active_block->allocatedCount.load(std::memory_order_relaxed) == BR_MAX_CNT) {
-                    active_block = listForUse.load(std::memory_order_relaxed);
-                    if (active_block) {
-                        active.store(active_block, std::memory_order_release);
-                        listForUse.store(active_block->nextForUse, std::memory_order_relaxed);
-                        MALLOC_ASSERT(active_block->addedToForUse.load(std::memory_order_relaxed),
-                                      ASSERT_TEXT);
-                        active_block->addedToForUse.store(false, std::memory_order_relaxed);
-                    }
+            if (toUse) {
+                if (!blockToUse->allocatedCount.load(std::memory_order_relaxed) &&
+                    !backRefMain.load(std::memory_order_relaxed)->listForUse.load(std::memory_order_relaxed)) {
+                    lastBlockFirstUsed = true;
                 }
-            } else// allocate new data node
-                    if (!requestNewSpace())
-                return NULL;
-            return active.load(std::memory_order_acquire);// reread because of requestNewSpace
-        }
-
-        void *getBackRef(BackRefIdx backRefIdx) {
-            // !backRefMain means no initialization done, so it can't be valid memory
-            // see addEmptyBackRefBlock for fences around lastUsed
-            if (!(backRefMain.load(std::memory_order_acquire))
-                || backRefIdx.getMain() > (backRefMain.load(std::memory_order_relaxed)
-                                                   ->lastUsed.load(std::memory_order_acquire))
-                || backRefIdx.getOffset() >= BR_MAX_CNT) {
-                return NULL;
+                blockToUse->allocatedCount.store(blockToUse->allocatedCount.load(std::memory_order_relaxed) + 1, std::memory_order_relaxed);
             }
-            std::atomic<void *> &backRefEntry
-                    = *(std::atomic<void *> *) ((uintptr_t) backRefMain.load(std::memory_order_relaxed)
-                                                        ->backRefBl[backRefIdx.getMain()]
-                                                + sizeof(BackRefBlock)
-                                                + backRefIdx.getOffset() * sizeof(std::atomic<void *>));
-            return backRefEntry.load(std::memory_order_relaxed);
-        }
-
-        void setBackRef(BackRefIdx backRefIdx, void *newPtr) {
-            MALLOC_ASSERT(backRefIdx.getMain() <= backRefMain.load(std::memory_order_relaxed)
-                                                          ->lastUsed.load(std::memory_order_relaxed)
-                                  && backRefIdx.getOffset() < BR_MAX_CNT,
-                          ASSERT_TEXT);
-            ((std::atomic<void *> *) ((uintptr_t) backRefMain.load(std::memory_order_relaxed)
-                                              ->backRefBl[backRefIdx.getMain()]
-                                      + sizeof(BackRefBlock) + backRefIdx.getOffset() * sizeof(void *)))
-                    ->store(newPtr, std::memory_order_relaxed);
-        }
-
-        BackRefIdx BackRefIdx::newBackRef(bool largeObj) {
-            BackRefBlock *blockToUse;
-            void **toUse;
-            BackRefIdx res;
-            bool lastBlockFirstUsed = false;
-
-            do {
-                MALLOC_ASSERT(backRefMain.load(std::memory_order_relaxed), ASSERT_TEXT);
-                blockToUse = backRefMain.load(std::memory_order_relaxed)->findFreeBlock();
-                if (!blockToUse) return BackRefIdx();
-                toUse = NULL;
-                {// the block is locked to find a reference
-                    MallocMutex::scoped_lock lock(blockToUse->blockMutex);
-
-                    if (blockToUse->freeList) {
-                        toUse = (void **) blockToUse->freeList;
-                        blockToUse->freeList = blockToUse->freeList->next;
-                        MALLOC_ASSERT(!blockToUse->freeList
-                                              || ((uintptr_t) blockToUse->freeList >= (uintptr_t) blockToUse
-                                                  && (uintptr_t) blockToUse->freeList
-                                                             < (uintptr_t) blockToUse + slabSize),
-                                      ASSERT_TEXT);
-                    } else if (blockToUse->allocatedCount.load(std::memory_order_relaxed) < BR_MAX_CNT) {
-                        toUse = (void **) blockToUse->bumpPtr;
-                        blockToUse->bumpPtr
-                                = (FreeObject *) ((uintptr_t) blockToUse->bumpPtr - sizeof(void *));
-                        if (blockToUse->allocatedCount.load(std::memory_order_relaxed) == BR_MAX_CNT - 1) {
-                            MALLOC_ASSERT((uintptr_t) blockToUse->bumpPtr
-                                                  < (uintptr_t) blockToUse + sizeof(BackRefBlock),
-                                          ASSERT_TEXT);
-                            blockToUse->bumpPtr = NULL;
-                        }
-                    }
-                    if (toUse) {
-                        if (!blockToUse->allocatedCount.load(std::memory_order_relaxed)
-                            && !backRefMain.load(std::memory_order_relaxed)
-                                        ->listForUse.load(std::memory_order_relaxed)) {
-                            lastBlockFirstUsed = true;
-                        }
-                        blockToUse->allocatedCount.store(
-                                blockToUse->allocatedCount.load(std::memory_order_relaxed) + 1,
-                                std::memory_order_relaxed);
-                    }
-                }// end of lock scope
-            } while (!toUse);
-            // The first thread that uses the last block requests new space in advance;
-            // possible failures are ignored.
-            if (lastBlockFirstUsed) backRefMain.load(std::memory_order_relaxed)->requestNewSpace();
-
-            res.main = blockToUse->myNum;
-            uintptr_t offset
-                    = ((uintptr_t) toUse - ((uintptr_t) blockToUse + sizeof(BackRefBlock))) / sizeof(void *);
-            // Is offset too big?
-            MALLOC_ASSERT(!(offset >> 15), ASSERT_TEXT);
-            res.offset = offset;
-            if (largeObj) res.largeObj = largeObj;
-
-            return res;
-        }
-
-        void removeBackRef(BackRefIdx backRefIdx) {
-            MALLOC_ASSERT(!backRefIdx.isInvalid(), ASSERT_TEXT);
-            MALLOC_ASSERT(backRefIdx.getMain() <= backRefMain.load(std::memory_order_relaxed)
-                                                          ->lastUsed.load(std::memory_order_relaxed)
-                                  && backRefIdx.getOffset() < BR_MAX_CNT,
-                          ASSERT_TEXT);
-            BackRefBlock *currBlock
-                    = backRefMain.load(std::memory_order_relaxed)->backRefBl[backRefIdx.getMain()];
-            std::atomic<void *> &backRefEntry
-                    = *(std::atomic<void *> *) ((uintptr_t) currBlock + sizeof(BackRefBlock)
-                                                + backRefIdx.getOffset() * sizeof(std::atomic<void *>));
-            MALLOC_ASSERT(((uintptr_t) &backRefEntry > (uintptr_t) currBlock
-                           && (uintptr_t) &backRefEntry < (uintptr_t) currBlock + slabSize),
-                          ASSERT_TEXT);
-            {
-                MallocMutex::scoped_lock lock(currBlock->blockMutex);
-
-                backRefEntry.store(currBlock->freeList, std::memory_order_relaxed);
+        } // end of lock scope
+    } while (!toUse);
+    // The first thread that uses the last block requests new space in advance;
+    // possible failures are ignored.
+    if (lastBlockFirstUsed)
+        backRefMain.load(std::memory_order_relaxed)->requestNewSpace();
+
+    res.main = blockToUse->myNum;
+    uintptr_t offset =
+        ((uintptr_t)toUse - ((uintptr_t)blockToUse + sizeof(BackRefBlock)))/sizeof(void*);
+    // Is offset too big?
+    MALLOC_ASSERT(!(offset >> 15), ASSERT_TEXT);
+    res.offset = offset;
+    if (largeObj) res.largeObj = largeObj;
+
+    return res;
+}
+
+void removeBackRef(BackRefIdx backRefIdx)
+{
+    MALLOC_ASSERT(!backRefIdx.isInvalid(), ASSERT_TEXT);
+    MALLOC_ASSERT(backRefIdx.getMain()<=backRefMain.load(std::memory_order_relaxed)->lastUsed.load(std::memory_order_relaxed)
+                  && backRefIdx.getOffset()<BR_MAX_CNT, ASSERT_TEXT);
+    BackRefBlock *currBlock = backRefMain.load(std::memory_order_relaxed)->backRefBl[backRefIdx.getMain()];
+    std::atomic<void*>& backRefEntry = *(std::atomic<void*>*)((uintptr_t)currBlock + sizeof(BackRefBlock)
+                                        + backRefIdx.getOffset()*sizeof(std::atomic<void*>));
+    MALLOC_ASSERT(((uintptr_t)&backRefEntry >(uintptr_t)currBlock &&
+                   (uintptr_t)&backRefEntry <(uintptr_t)currBlock + slabSize), ASSERT_TEXT);
+    {
+        MallocMutex::scoped_lock lock(currBlock->blockMutex);
+
+        backRefEntry.store(currBlock->freeList, std::memory_order_relaxed);
 #if MALLOC_DEBUG
-                uintptr_t backRefEntryValue = (uintptr_t) backRefEntry.load(std::memory_order_relaxed);
-                MALLOC_ASSERT(!backRefEntryValue
-                                      || (backRefEntryValue > (uintptr_t) currBlock
-                                          && backRefEntryValue < (uintptr_t) currBlock + slabSize),
-                              ASSERT_TEXT);
+        uintptr_t backRefEntryValue = (uintptr_t)backRefEntry.load(std::memory_order_relaxed);
+        MALLOC_ASSERT(!backRefEntryValue ||
+                      (backRefEntryValue > (uintptr_t)currBlock
+                       && backRefEntryValue < (uintptr_t)currBlock + slabSize), ASSERT_TEXT);
 #endif
-                currBlock->freeList = (FreeObject *) &backRefEntry;
-                currBlock->allocatedCount.store(currBlock->allocatedCount.load(std::memory_order_relaxed) - 1,
-                                                std::memory_order_relaxed);
-            }
-            // TODO: do we need double-check here?
-            if (!currBlock->addedToForUse.load(std::memory_order_relaxed)
-                && currBlock
-                           != backRefMain.load(std::memory_order_relaxed)
-                                      ->active.load(std::memory_order_relaxed)) {
-                MallocMutex::scoped_lock lock(mainMutex);
-
-                if (!currBlock->addedToForUse.load(std::memory_order_relaxed)
-                    && currBlock
-                               != backRefMain.load(std::memory_order_relaxed)
-                                          ->active.load(std::memory_order_relaxed))
-                    backRefMain.load(std::memory_order_relaxed)->addToForUseList(currBlock);
-            }
-        }
+        currBlock->freeList = (FreeObject*)&backRefEntry;
+        currBlock->allocatedCount.store(currBlock->allocatedCount.load(std::memory_order_relaxed)-1, std::memory_order_relaxed);
+    }
+    // TODO: do we need double-check here?
+    if (!currBlock->addedToForUse.load(std::memory_order_relaxed) &&
+        currBlock!=backRefMain.load(std::memory_order_relaxed)->active.load(std::memory_order_relaxed)) {
+        MallocMutex::scoped_lock lock(mainMutex);
+
+        if (!currBlock->addedToForUse.load(std::memory_order_relaxed) &&
+            currBlock!=backRefMain.load(std::memory_order_relaxed)->active.load(std::memory_order_relaxed))
+            backRefMain.load(std::memory_order_relaxed)->addToForUseList(currBlock);
+    }
+}
+
+/********* End of backreferences ***********************/
 
-        /********* End of backreferences ***********************/
+} // namespace internal
+} // namespace rml
 
-    }// namespace internal
-}// namespace rml
diff --git a/external/tbb/src/tbbmalloc/frontend.cpp b/external/tbb/src/tbbmalloc/frontend.cpp
index dbd54ed2..f05aff23 100644
--- a/external/tbb/src/tbbmalloc/frontend.cpp
+++ b/external/tbb/src/tbbmalloc/frontend.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -16,225 +16,234 @@
 
 #include "tbbmalloc_internal.h"
 #include <errno.h>
-#include <new>      /* for placement new */
-#include <string.h> /* for memset */
+#include <new>        /* for placement new */
+#include <string.h>   /* for memset */
 
-#include "../tbb/environment.h"
-#include "../tbb/itt_notify.h"// for __TBB_load_ittnotify()
 #include "oneapi/tbb/version.h"
+#include "../tbb/environment.h"
+#include "../tbb/itt_notify.h" // for __TBB_load_ittnotify()
 
 #if USE_PTHREAD
-#define TlsSetValue_func pthread_setspecific
-#define TlsGetValue_func pthread_getspecific
-#define GetMyTID() pthread_self()
-#include <sched.h>
-extern "C" {
-static void mallocThreadShutdownNotification(void *);
-}
-#if __sun || __SUNPRO_CC
-#define __asm__ asm
-#endif
-#include <unistd.h>// sysconf(_SC_PAGESIZE)
+    #define TlsSetValue_func pthread_setspecific
+    #define TlsGetValue_func pthread_getspecific
+    #define GetMyTID() pthread_self()
+    #include <sched.h>
+    extern "C" { static void mallocThreadShutdownNotification(void*); }
+    #if __sun || __SUNPRO_CC
+    #define __asm__ asm
+    #endif
+    #include <unistd.h> // sysconf(_SC_PAGESIZE)
 #elif USE_WINTHREAD
-#define GetMyTID() GetCurrentThreadId()
+    #define GetMyTID() GetCurrentThreadId()
 #if __TBB_WIN8UI_SUPPORT
-#include <thread>
-#define TlsSetValue_func FlsSetValue
-#define TlsGetValue_func FlsGetValue
-#define TlsAlloc() FlsAlloc(NULL)
-#define TLS_ALLOC_FAILURE FLS_OUT_OF_INDEXES
-#define TlsFree FlsFree
+    #include<thread>
+    #define TlsSetValue_func FlsSetValue
+    #define TlsGetValue_func FlsGetValue
+    #define TlsAlloc() FlsAlloc(nullptr)
+    #define TLS_ALLOC_FAILURE FLS_OUT_OF_INDEXES
+    #define TlsFree FlsFree
 #else
-#define TlsSetValue_func TlsSetValue
-#define TlsGetValue_func TlsGetValue
-#define TLS_ALLOC_FAILURE TLS_OUT_OF_INDEXES
+    #define TlsSetValue_func TlsSetValue
+    #define TlsGetValue_func TlsGetValue
+    #define TLS_ALLOC_FAILURE TLS_OUT_OF_INDEXES
 #endif
 #else
-#error Must define USE_PTHREAD or USE_WINTHREAD
+    #error Must define USE_PTHREAD or USE_WINTHREAD
 #endif
 
 #define FREELIST_NONBLOCKING 1
 
 namespace rml {
-    class MemoryPool;
-    namespace internal {
+class MemoryPool;
+namespace internal {
 
-        class Block;
-        class MemoryPool;
+class Block;
+class MemoryPool;
 
 #if MALLOC_CHECK_RECURSION
 
-        inline bool isMallocInitialized();
+inline bool isMallocInitialized();
 
-#endif// MALLOC_CHECK_RECURSION
+#endif // MALLOC_CHECK_RECURSION
 
-        /** Support for handling the special UNUSABLE pointer state **/
-        const intptr_t UNUSABLE = 0x1;
-        inline bool isSolidPtr(void *ptr) { return (UNUSABLE | (intptr_t) ptr) != UNUSABLE; }
-        inline bool isNotForUse(void *ptr) { return (intptr_t) ptr == UNUSABLE; }
+/** Support for handling the special UNUSABLE pointer state **/
+const intptr_t UNUSABLE = 0x1;
+inline bool isSolidPtr( void* ptr ) {
+    return (UNUSABLE|(intptr_t)ptr)!=UNUSABLE;
+}
+inline bool isNotForUse( void* ptr ) {
+    return (intptr_t)ptr==UNUSABLE;
+}
 
-        /*
+/*
  * Block::objectSize value used to mark blocks allocated by startupAlloc
  */
-        const uint16_t startupAllocObjSizeMark = ~(uint16_t) 0;
+const uint16_t startupAllocObjSizeMark = ~(uint16_t)0;
 
-        /*
+/*
  * The following constant is used to define the size of struct Block, the block header.
  * The intent is to have the size of a Block multiple of the cache line size, this allows us to
  * get good alignment at the cost of some overhead equal to the amount of padding included in the Block.
  */
-        const int blockHeaderAlignment = estimatedCacheLineSize;
+const int blockHeaderAlignment = estimatedCacheLineSize;
 
-        /********* The data structures and global objects        **************/
+/********* The data structures and global objects        **************/
 
-        /*
+/*
  * The malloc routines themselves need to be able to occasionally malloc some space,
  * in order to set up the structures used by the thread local structures. This
  * routine performs that functions.
  */
-        class BootStrapBlocks {
-            MallocMutex bootStrapLock;
-            Block *bootStrapBlock;
-            Block *bootStrapBlockUsed;
-            FreeObject *bootStrapObjectList;
-
-        public:
-            void *allocate(MemoryPool *memPool, size_t size);
-            void free(void *ptr);
-            void reset();
-        };
+class BootStrapBlocks {
+    MallocMutex bootStrapLock;
+    Block      *bootStrapBlock;
+    Block      *bootStrapBlockUsed;
+    FreeObject *bootStrapObjectList;
+public:
+    void *allocate(MemoryPool *memPool, size_t size);
+    void free(void* ptr);
+    void reset();
+};
 
 #if USE_INTERNAL_TID
-        class ThreadId {
-            static tls_key_t Tid_key;
-            std::atomic<intptr_t> ThreadCount;
-
-            unsigned int id;
-
-            static unsigned int tlsNumber() {
-                unsigned int result = reinterpret_cast<intptr_t>(TlsGetValue_func(Tid_key));
-                if (!result) {
-                    RecursiveMallocCallProtector scoped;
-                    // Thread-local value is zero -> first call from this thread,
-                    // need to initialize with next ID value (IDs start from 1)
-                    result = ++ThreadCount;// returned new value!
-                    TlsSetValue_func(Tid_key, reinterpret_cast<void *>(result));
-                }
-                return result;
-            }
+class ThreadId {
+    static tls_key_t Tid_key;
+    std::atomic<intptr_t> ThreadCount;
+
+    unsigned int id;
 
-        public:
-            static bool init() {
+    static unsigned int tlsNumber() {
+        unsigned int result = reinterpret_cast<intptr_t>(TlsGetValue_func(Tid_key));
+        if( !result ) {
+            RecursiveMallocCallProtector scoped;
+            // Thread-local value is zero -> first call from this thread,
+            // need to initialize with next ID value (IDs start from 1)
+            result = ++ThreadCount; // returned new value!
+            TlsSetValue_func( Tid_key, reinterpret_cast<void*>(result) );
+        }
+        return result;
+    }
+public:
+    static bool init() {
 #if USE_WINTHREAD
-                Tid_key = TlsAlloc();
-                if (Tid_key == TLS_ALLOC_FAILURE) return false;
+        Tid_key = TlsAlloc();
+        if (Tid_key == TLS_ALLOC_FAILURE)
+            return false;
 #else
-                int status = pthread_key_create(&Tid_key, NULL);
-                if (status) {
-                    fprintf(stderr, "The memory manager cannot create tls key during initialization\n");
-                    return false;
-                }
+        int status = pthread_key_create( &Tid_key, nullptr );
+        if ( status ) {
+            fprintf (stderr, "The memory manager cannot create tls key during initialization\n");
+            return false;
+        }
 #endif /* USE_WINTHREAD */
-                return true;
-            }
+        return true;
+    }
 #if __TBB_SOURCE_DIRECTLY_INCLUDED
-            static void destroy() {
-                if (Tid_key) {
+    static void destroy() {
+        if( Tid_key ) {
 #if USE_WINTHREAD
-                    BOOL status = !(TlsFree(Tid_key));// fail is zero
+            BOOL status = !(TlsFree( Tid_key ));  // fail is zero
 #else
-                    int status = pthread_key_delete(Tid_key);
+            int status = pthread_key_delete( Tid_key );
 #endif /* USE_WINTHREAD */
-                    if (status) fprintf(stderr, "The memory manager cannot delete tls key\n");
-                    Tid_key = 0;
-                }
-            }
+            if ( status )
+                fprintf (stderr, "The memory manager cannot delete tls key\n");
+            Tid_key = 0;
+        }
+    }
 #endif
 
-            ThreadId() : id(ThreadId::tlsNumber()) {}
-            bool isCurrentThreadId() const { return id == ThreadId::tlsNumber(); }
+    ThreadId() : id(ThreadId::tlsNumber()) {}
+    bool isCurrentThreadId() const { return id == ThreadId::tlsNumber(); }
 
 #if COLLECT_STATISTICS || MALLOC_TRACE
-            friend unsigned int getThreadId() { return ThreadId::tlsNumber(); }
+    friend unsigned int getThreadId() { return ThreadId::tlsNumber(); }
 #endif
 #if COLLECT_STATISTICS
-            static unsigned getMaxThreadId() { return ThreadCount.load(std::memory_order_relaxed); }
+    static unsigned getMaxThreadId() { return ThreadCount.load(std::memory_order_relaxed); }
 
-            friend int STAT_increment(ThreadId tid, int bin, int ctr);
+    friend int STAT_increment(ThreadId tid, int bin, int ctr);
 #endif
-        };
+};
 
-        tls_key_t ThreadId::Tid_key;
-        intptr_t ThreadId::ThreadCount;
+tls_key_t ThreadId::Tid_key;
+intptr_t ThreadId::ThreadCount;
 
 #if COLLECT_STATISTICS
-        int STAT_increment(ThreadId tid, int bin, int ctr) { return ::STAT_increment(tid.id, bin, ctr); }
+int STAT_increment(ThreadId tid, int bin, int ctr)
+{
+    return ::STAT_increment(tid.id, bin, ctr);
+}
 #endif
 
-#else// USE_INTERNAL_TID
+#else // USE_INTERNAL_TID
 
-        class ThreadId {
+class ThreadId {
 #if USE_PTHREAD
-            std::atomic<pthread_t> tid;
+    std::atomic<pthread_t> tid;
 #else
-            std::atomic<DWORD> tid;
+    std::atomic<DWORD>     tid;
 #endif
-        public:
-            ThreadId() : tid(GetMyTID()) {}
+public:
+    ThreadId() : tid(GetMyTID()) {}
+    ThreadId(ThreadId &other) = delete;
+    ~ThreadId() = default;
+
 #if USE_PTHREAD
-            bool isCurrentThreadId() const {
-                return pthread_equal(pthread_self(), tid.load(std::memory_order_relaxed));
-            }
+    bool isCurrentThreadId() const { return pthread_equal(pthread_self(), tid.load(std::memory_order_relaxed)); }
 #else
-            bool isCurrentThreadId() const {
-                return GetCurrentThreadId() == tid.load(std::memory_order_relaxed);
-            }
+    bool isCurrentThreadId() const { return GetCurrentThreadId() == tid.load(std::memory_order_relaxed); }
 #endif
-            ThreadId &operator=(const ThreadId &other) {
-                tid.store(other.tid.load(std::memory_order_relaxed), std::memory_order_relaxed);
-                return *this;
-            }
-            static bool init() { return true; }
+    ThreadId& operator=(const ThreadId& other) {
+        tid.store(other.tid.load(std::memory_order_relaxed), std::memory_order_relaxed);
+        return *this;
+    }
+    static bool init() { return true; }
 #if __TBB_SOURCE_DIRECTLY_INCLUDED
-            static void destroy() {}
+    static void destroy() {}
 #endif
-        };
+};
 
-#endif// USE_INTERNAL_TID
+#endif // USE_INTERNAL_TID
 
-        /*********** Code to provide thread ID and a thread-local void pointer **********/
+/*********** Code to provide thread ID and a thread-local void pointer **********/
 
-        bool TLSKey::init() {
+bool TLSKey::init()
+{
 #if USE_WINTHREAD
-            TLS_pointer_key = TlsAlloc();
-            if (TLS_pointer_key == TLS_ALLOC_FAILURE) return false;
+    TLS_pointer_key = TlsAlloc();
+    if (TLS_pointer_key == TLS_ALLOC_FAILURE)
+        return false;
 #else
-            int status = pthread_key_create(&TLS_pointer_key, mallocThreadShutdownNotification);
-            if (status) return false;
+    int status = pthread_key_create( &TLS_pointer_key, mallocThreadShutdownNotification );
+    if ( status )
+        return false;
 #endif /* USE_WINTHREAD */
-            return true;
-        }
+    return true;
+}
 
-        bool TLSKey::destroy() {
+bool TLSKey::destroy()
+{
 #if USE_WINTHREAD
-            BOOL status1 = !(TlsFree(TLS_pointer_key));// fail is zero
+    BOOL status1 = !(TlsFree(TLS_pointer_key)); // fail is zero
 #else
-            int status1 = pthread_key_delete(TLS_pointer_key);
+    int status1 = pthread_key_delete(TLS_pointer_key);
 #endif /* USE_WINTHREAD */
-            MALLOC_ASSERT(!status1, "The memory manager cannot delete tls key.");
-            return status1 == 0;
-        }
+    MALLOC_ASSERT(!status1, "The memory manager cannot delete tls key.");
+    return status1==0;
+}
 
-        inline TLSData *TLSKey::getThreadMallocTLS() const {
-            return (TLSData *) TlsGetValue_func(TLS_pointer_key);
-        }
+inline TLSData* TLSKey::getThreadMallocTLS() const
+{
+    return (TLSData *)TlsGetValue_func( TLS_pointer_key );
+}
 
-        inline void TLSKey::setThreadMallocTLS(TLSData *newvalue) {
-            RecursiveMallocCallProtector scoped;
-            TlsSetValue_func(TLS_pointer_key, newvalue);
-        }
+inline void TLSKey::setThreadMallocTLS( TLSData * newvalue ) {
+    RecursiveMallocCallProtector scoped;
+    TlsSetValue_func( TLS_pointer_key, newvalue );
+}
 
-        /* The 'next' field in the block header has to maintain some invariants:
+/* The 'next' field in the block header has to maintain some invariants:
  *   it needs to be on a 16K boundary and the first field in the block.
  *   Any value stored there needs to have the lower 14 bits set to 0
  *   so that various assert work. This means that if you want to smash this memory
@@ -246,506 +255,509 @@ namespace rml {
  * Changing the size of the block header would require to change
  * some bin allocation sizes, in particular "fitting" sizes (see above).
  */
-        class Bin;
-        class StartupBlock;
-
-        class MemoryPool {
-            // if no explicit grainsize, expect to see malloc in user's pAlloc
-            // and set reasonable low granularity
-            static const size_t defaultGranularity = estimatedCacheLineSize;
-
-            MemoryPool();// deny
-        public:
-            static MallocMutex memPoolListLock;
-
-            // list of all active pools is used to release
-            // all TLS data on thread termination or library unload
-            MemoryPool *next, *prev;
-            ExtMemoryPool extMemPool;
-            BootStrapBlocks bootStrapBlocks;
-
-            static void initDefaultPool();
-
-            bool init(intptr_t poolId, const MemPoolPolicy *memPoolPolicy);
-            bool reset();
-            bool destroy();
-            void onThreadShutdown(TLSData *tlsData);
-
-            inline TLSData *getTLS(bool create);
-            void clearTLS() { extMemPool.tlsPointerKey.setThreadMallocTLS(NULL); }
-
-            Block *getEmptyBlock(size_t size);
-            void returnEmptyBlock(Block *block, bool poolTheBlock);
-
-            // get/put large object to/from local large object cache
-            void *getFromLLOCache(TLSData *tls, size_t size, size_t alignment);
-            void putToLLOCache(TLSData *tls, void *object);
-        };
-
-        static intptr_t defaultMemPool_space[sizeof(MemoryPool) / sizeof(intptr_t)
-                                             + (sizeof(MemoryPool) % sizeof(intptr_t) ? 1 : 0)];
-        static MemoryPool *defaultMemPool = (MemoryPool *) defaultMemPool_space;
-        const size_t MemoryPool::defaultGranularity;
-        // zero-initialized
-        MallocMutex MemoryPool::memPoolListLock;
-        // TODO: move huge page status to default pool, because that's its states
-        HugePagesStatus hugePages;
-        static bool usedBySrcIncluded = false;
-
-        // Padding helpers
-        template <size_t padd>
-        struct PaddingImpl {
-            size_t __padding[padd];
-        };
-
-        template <>
-        struct PaddingImpl<0> {};
-
-        template <int N>
-        struct Padding : PaddingImpl<N / sizeof(size_t)> {};
-
-        // Slab block is 16KB-aligned. To prevent false sharing, separate locally-accessed
-        // fields and fields commonly accessed by not owner threads.
-        class GlobalBlockFields : public BlockI {
-        protected:
-            std::atomic<FreeObject *> publicFreeList;
-            std::atomic<Block *> nextPrivatizable;
-            MemoryPool *poolPtr;
-        };
-
-        class LocalBlockFields : public GlobalBlockFields,
-                                 Padding<blockHeaderAlignment - sizeof(GlobalBlockFields)> {
-        protected:
-            Block *next;
-            Block *previous;     /* Use double linked list to speed up removal */
-            FreeObject *bumpPtr; /* Bump pointer moves from the end to the beginning of a block */
-            FreeObject *freeList;
-            /* Pointer to local data for the owner thread. Used for fast finding tls
+class Bin;
+class StartupBlock;
+
+class MemoryPool {
+    // if no explicit grainsize, expect to see malloc in user's pAlloc
+    // and set reasonable low granularity
+    static const size_t defaultGranularity = estimatedCacheLineSize;
+
+    MemoryPool() = delete;                  // deny
+public:
+    static MallocMutex  memPoolListLock;
+
+    // list of all active pools is used to release
+    // all TLS data on thread termination or library unload
+    MemoryPool    *next,
+                  *prev;
+    ExtMemoryPool  extMemPool;
+    BootStrapBlocks bootStrapBlocks;
+
+    static void initDefaultPool();
+
+    bool init(intptr_t poolId, const MemPoolPolicy* memPoolPolicy);
+    bool reset();
+    bool destroy();
+    void onThreadShutdown(TLSData *tlsData);
+
+    inline TLSData *getTLS(bool create);
+    void clearTLS() { extMemPool.tlsPointerKey.setThreadMallocTLS(nullptr); }
+
+    Block *getEmptyBlock(size_t size);
+    void returnEmptyBlock(Block *block, bool poolTheBlock);
+
+    // get/put large object to/from local large object cache
+    void *getFromLLOCache(TLSData *tls, size_t size, size_t alignment);
+    void putToLLOCache(TLSData *tls, void *object);
+};
+
+static intptr_t defaultMemPool_space[sizeof(MemoryPool)/sizeof(intptr_t) +
+                                     (sizeof(MemoryPool)%sizeof(intptr_t)? 1 : 0)];
+static MemoryPool *defaultMemPool = (MemoryPool*)defaultMemPool_space;
+const size_t MemoryPool::defaultGranularity;
+// zero-initialized
+MallocMutex  MemoryPool::memPoolListLock;
+// TODO: move huge page status to default pool, because that's its states
+HugePagesStatus hugePages;
+static bool usedBySrcIncluded = false;
+
+// Padding helpers
+template<size_t padd>
+struct PaddingImpl {
+    size_t       __padding[padd];
+};
+
+template<>
+struct PaddingImpl<0> {};
+
+template<int N>
+struct Padding : PaddingImpl<N/sizeof(size_t)> {};
+
+// Slab block is 16KB-aligned. To prevent false sharing, separate locally-accessed
+// fields and fields commonly accessed by not owner threads.
+class GlobalBlockFields : public BlockI {
+protected:
+    std::atomic<FreeObject*> publicFreeList;
+    std::atomic<Block*> nextPrivatizable;
+    MemoryPool  *poolPtr;
+};
+
+class LocalBlockFields : public GlobalBlockFields, Padding<blockHeaderAlignment - sizeof(GlobalBlockFields)>  {
+protected:
+    Block       *next;
+    Block       *previous;        /* Use double linked list to speed up removal */
+    FreeObject  *bumpPtr;         /* Bump pointer moves from the end to the beginning of a block */
+    FreeObject  *freeList;
+    /* Pointer to local data for the owner thread. Used for fast finding tls
        when releasing object from a block that current thread owned.
-       NULL for orphaned blocks. */
-            std::atomic<TLSData *> tlsPtr;
-            ThreadId ownerTid; /* the ID of the thread that owns or last owned the block */
-            BackRefIdx backRefIdx;
-            uint16_t allocatedCount; /* Number of objects allocated (obviously by the owning thread) */
-            uint16_t objectSize;
-            bool isFull;
-
-            friend class FreeBlockPool;
-            friend class StartupBlock;
-            friend class LifoList;
-            friend void *BootStrapBlocks::allocate(MemoryPool *, size_t);
-            friend bool OrphanedBlocks::cleanup(Backend *);
-            friend Block *MemoryPool::getEmptyBlock(size_t);
-        };
-
-        // Use inheritance to guarantee that a user data start on next cache line.
-        // Can't use member for it, because when LocalBlockFields already on cache line,
-        // we must have no additional memory consumption for all compilers.
-        class Block : public LocalBlockFields, Padding<2 * blockHeaderAlignment - sizeof(LocalBlockFields)> {
-        public:
-            bool empty() const {
-                if (allocatedCount > 0) return false;
-                MALLOC_ASSERT(!isSolidPtr(publicFreeList.load(std::memory_order_relaxed)), ASSERT_TEXT);
-                return true;
-            }
-            inline FreeObject *allocate();
-            inline FreeObject *allocateFromFreeList();
+       nullptr for orphaned blocks. */
+    std::atomic<TLSData*> tlsPtr;
+    ThreadId     ownerTid;        /* the ID of the thread that owns or last owned the block */
+    BackRefIdx   backRefIdx;
+    uint16_t     allocatedCount;  /* Number of objects allocated (obviously by the owning thread) */
+    uint16_t     objectSize;
+    bool         isFull;
+
+    friend class FreeBlockPool;
+    friend class StartupBlock;
+    friend class LifoList;
+    friend void *BootStrapBlocks::allocate(MemoryPool *, size_t);
+    friend bool OrphanedBlocks::cleanup(Backend*);
+    friend Block *MemoryPool::getEmptyBlock(size_t);
+};
+
+// Use inheritance to guarantee that a user data start on next cache line.
+// Can't use member for it, because when LocalBlockFields already on cache line,
+// we must have no additional memory consumption for all compilers.
+class Block : public LocalBlockFields,
+              Padding<2*blockHeaderAlignment - sizeof(LocalBlockFields)> {
+public:
+    bool empty() const {
+        if (allocatedCount > 0) return false;
+        MALLOC_ASSERT(!isSolidPtr(publicFreeList.load(std::memory_order_relaxed)), ASSERT_TEXT);
+        return true;
+    }
+    inline FreeObject* allocate();
+    inline FreeObject *allocateFromFreeList();
 
-            inline bool adjustFullness();
-            void adjustPositionInBin(Bin *bin = NULL);
+    inline bool adjustFullness();
+    void adjustPositionInBin(Bin* bin = nullptr);
 #if MALLOC_DEBUG
-            bool freeListNonNull() { return freeList; }
+    bool freeListNonNull() { return freeList; }
 #endif
-            void freePublicObject(FreeObject *objectToFree);
-            inline void freeOwnObject(void *object);
-            void reset();
-            void privatizePublicFreeList(bool reset = true);
-            void restoreBumpPtr();
-            void privatizeOrphaned(TLSData *tls, unsigned index);
-            bool readyToShare();
-            void shareOrphaned(intptr_t binTag, unsigned index);
-            unsigned int getSize() const {
-                MALLOC_ASSERT(isStartupAllocObject() || objectSize < minLargeObjectSize,
-                              "Invalid object size");
-                return isStartupAllocObject() ? 0 : objectSize;
-            }
-            const BackRefIdx *getBackRefIdx() const { return &backRefIdx; }
-            inline bool isOwnedByCurrentThread() const;
-            bool isStartupAllocObject() const { return objectSize == startupAllocObjSizeMark; }
-            inline FreeObject *findObjectToFree(const void *object) const;
-            void checkFreePrecond(const void *object) const {
+    void freePublicObject(FreeObject *objectToFree);
+    inline void freeOwnObject(void *object);
+    void reset();
+    void privatizePublicFreeList( bool reset = true );
+    void restoreBumpPtr();
+    void privatizeOrphaned(TLSData *tls, unsigned index);
+    bool readyToShare();
+    void shareOrphaned(intptr_t binTag, unsigned index);
+    unsigned int getSize() const {
+        MALLOC_ASSERT(isStartupAllocObject() || objectSize<minLargeObjectSize,
+                      "Invalid object size");
+        return isStartupAllocObject()? 0 : objectSize;
+    }
+    const BackRefIdx *getBackRefIdx() const { return &backRefIdx; }
+    inline bool isOwnedByCurrentThread() const;
+    bool isStartupAllocObject() const { return objectSize == startupAllocObjSizeMark; }
+    inline FreeObject *findObjectToFree(const void *object) const;
+    void checkFreePrecond(const void *object) const {
 #if MALLOC_DEBUG
-                const char *msg = "Possible double free or heap corruption.";
-                // small objects are always at least sizeof(size_t) Byte aligned,
-                // try to check this before this dereference as for invalid objects
-                // this may be unreadable
-                MALLOC_ASSERT(isAligned(object, sizeof(size_t)), "Try to free invalid small object");
+        const char *msg = "Possible double free or heap corruption.";
+        // small objects are always at least sizeof(size_t) Byte aligned,
+        // try to check this before this dereference as for invalid objects
+        // this may be unreadable
+        MALLOC_ASSERT(isAligned(object, sizeof(size_t)), "Try to free invalid small object");
 #if !__TBB_USE_THREAD_SANITIZER
-                // releasing to free slab
-                MALLOC_ASSERT(allocatedCount > 0, msg);
+        // releasing to free slab
+        MALLOC_ASSERT(allocatedCount>0, msg);
 #endif
-                // must not point to slab's header
-                MALLOC_ASSERT((uintptr_t) object - (uintptr_t) this >= sizeof(Block), msg);
-                if (startupAllocObjSizeMark == objectSize)// startup block
-                    MALLOC_ASSERT(object <= bumpPtr, msg);
-                else {
-                    // non-startup objects are 8 Byte aligned
-                    MALLOC_ASSERT(isAligned(object, 8), "Try to free invalid small object");
-                    FreeObject *toFree = findObjectToFree(object);
+        // must not point to slab's header
+        MALLOC_ASSERT((uintptr_t)object - (uintptr_t)this >= sizeof(Block), msg);
+        if (startupAllocObjSizeMark == objectSize) // startup block
+            MALLOC_ASSERT(object<=bumpPtr, msg);
+        else {
+            // non-startup objects are 8 Byte aligned
+            MALLOC_ASSERT(isAligned(object, 8), "Try to free invalid small object");
+            FreeObject *toFree = findObjectToFree(object);
 #if !__TBB_USE_THREAD_SANITIZER
-                    MALLOC_ASSERT(allocatedCount <= (slabSize - sizeof(Block)) / objectSize
-                                          && (!bumpPtr || object > bumpPtr),
-                                  msg);
-                    // check against head of freeList, as this is mostly
-                    // expected after double free
-                    MALLOC_ASSERT(toFree != freeList, msg);
+            MALLOC_ASSERT(allocatedCount <= (slabSize-sizeof(Block))/objectSize
+                          && (!bumpPtr || object>bumpPtr), msg);
+            // check against head of freeList, as this is mostly
+            // expected after double free
+            MALLOC_ASSERT(toFree != freeList, msg);
 #endif
-                    // check against head of publicFreeList, to detect double free
-                    // involving foreign thread
-                    MALLOC_ASSERT(toFree != publicFreeList.load(std::memory_order_relaxed), msg);
-                }
+            // check against head of publicFreeList, to detect double free
+            // involving foreign thread
+            MALLOC_ASSERT(toFree != publicFreeList.load(std::memory_order_relaxed), msg);
+        }
 #else
-                suppress_unused_warning(object);
+        suppress_unused_warning(object);
 #endif
-            }
-            void initEmptyBlock(TLSData *tls, size_t size);
-            size_t findObjectSize(void *object) const;
-            MemoryPool *getMemPool() const { return poolPtr; }// do not use on the hot path!
+    }
+    void initEmptyBlock(TLSData *tls, size_t size);
+    size_t findObjectSize(void *object) const;
+    MemoryPool *getMemPool() const { return poolPtr; } // do not use on the hot path!
 
-        protected:
-            void cleanBlockHeader();
+protected:
+    void cleanBlockHeader();
 
-        private:
-            static const float emptyEnoughRatio; /* Threshold on free space needed to "reactivate" a block */
+private:
+    static const float emptyEnoughRatio; /* Threshold on free space needed to "reactivate" a block */
 
-            inline FreeObject *allocateFromBumpPtr();
-            inline FreeObject *findAllocatedObject(const void *address) const;
+    inline FreeObject *allocateFromBumpPtr();
+    inline FreeObject *findAllocatedObject(const void *address) const;
 #if MALLOC_DEBUG
-            inline bool isProperlyPlaced(const void *object) const;
+    inline bool isProperlyPlaced(const void *object) const;
 #endif
-            inline void markOwned(TLSData *tls) {
-                MALLOC_ASSERT(!tlsPtr.load(std::memory_order_relaxed), ASSERT_TEXT);
-                ownerTid = ThreadId(); /* save the ID of the current thread */
-                tlsPtr.store(tls, std::memory_order_relaxed);
-            }
-            inline void markOrphaned() {
-                MALLOC_ASSERT(tlsPtr.load(std::memory_order_relaxed), ASSERT_TEXT);
-                tlsPtr.store(nullptr, std::memory_order_relaxed);
-            }
+    inline void markOwned(TLSData *tls) {
+        MALLOC_ASSERT(!tlsPtr.load(std::memory_order_relaxed), ASSERT_TEXT);
+        ownerTid = ThreadId(); /* save the ID of the current thread */
+        tlsPtr.store(tls, std::memory_order_relaxed);
+    }
+    inline void markOrphaned() {
+        MALLOC_ASSERT(tlsPtr.load(std::memory_order_relaxed), ASSERT_TEXT);
+        tlsPtr.store(nullptr, std::memory_order_relaxed);
+    }
 
-            friend class Bin;
-            friend class TLSData;
-            friend bool MemoryPool::destroy();
-        };
-
-        const float Block::emptyEnoughRatio = 1.0 / 4.0;
-
-        static_assert(sizeof(Block) <= 2 * estimatedCacheLineSize,
-                      "The class Block does not fit into 2 cache lines on this platform. "
-                      "Defining USE_INTERNAL_TID may help to fix it.");
-
-        class Bin {
-        private:
-        public:
-            Block *activeBlk;
-            std::atomic<Block *> mailbox;
-            MallocMutex mailLock;
-
-        public:
-            inline Block *getActiveBlock() const { return activeBlk; }
-            void resetActiveBlock() { activeBlk = NULL; }
-            inline void setActiveBlock(Block *block);
-            inline Block *setPreviousBlockActive();
-            Block *getPrivatizedFreeListBlock();
-            void moveBlockToFront(Block *block);
-            bool cleanPublicFreeLists();
-            void processEmptyBlock(Block *block, bool poolTheBlock);
-            void addPublicFreeListBlock(Block *block);
-
-            void outofTLSBin(Block *block);
-            void verifyTLSBin(size_t size) const;
-            void pushTLSBin(Block *block);
+    friend class Bin;
+    friend class TLSData;
+    friend bool MemoryPool::destroy();
+};
+
+const float Block::emptyEnoughRatio = 1.0 / 4.0;
+
+static_assert(sizeof(Block) <= 2*estimatedCacheLineSize,
+    "The class Block does not fit into 2 cache lines on this platform. "
+    "Defining USE_INTERNAL_TID may help to fix it.");
+
+class Bin {
+private:
+public:
+    Block *activeBlk;
+    std::atomic<Block*> mailbox;
+    MallocMutex mailLock;
+
+public:
+    inline Block* getActiveBlock() const { return activeBlk; }
+    void resetActiveBlock() { activeBlk = nullptr; }
+    inline void setActiveBlock(Block *block);
+    inline Block* setPreviousBlockActive();
+    Block* getPrivatizedFreeListBlock();
+    void moveBlockToFront(Block *block);
+    bool cleanPublicFreeLists();
+    void processEmptyBlock(Block *block, bool poolTheBlock);
+    void addPublicFreeListBlock(Block* block);
+
+    void outofTLSBin(Block* block);
+    void verifyTLSBin(size_t size) const;
+    void pushTLSBin(Block* block);
 
 #if MALLOC_DEBUG
-            void verifyInitState() const {
-                MALLOC_ASSERT(!activeBlk, ASSERT_TEXT);
-                MALLOC_ASSERT(!mailbox.load(std::memory_order_relaxed), ASSERT_TEXT);
-            }
+    void verifyInitState() const {
+        MALLOC_ASSERT( !activeBlk, ASSERT_TEXT );
+        MALLOC_ASSERT( !mailbox.load(std::memory_order_relaxed), ASSERT_TEXT );
+    }
 #endif
 
-            friend void Block::freePublicObject(FreeObject *objectToFree);
-        };
+    friend void Block::freePublicObject (FreeObject *objectToFree);
+};
 
-        /********* End of the data structures                    **************/
+/********* End of the data structures                    **************/
 
-        /*
+/*
  * There are bins for all 8 byte aligned objects less than this segregated size; 8 bins in total
  */
-        const uint32_t minSmallObjectIndex = 0;
-        const uint32_t numSmallObjectBins = 8;
-        const uint32_t maxSmallObjectSize = 64;
+const uint32_t minSmallObjectIndex = 0;
+const uint32_t numSmallObjectBins = 8;
+const uint32_t maxSmallObjectSize = 64;
 
-        /*
+/*
  * There are 4 bins between each couple of powers of 2 [64-128-256-...]
  * from maxSmallObjectSize till this size; 16 bins in total
  */
-        const uint32_t minSegregatedObjectIndex = minSmallObjectIndex + numSmallObjectBins;
-        const uint32_t numSegregatedObjectBins = 16;
-        const uint32_t maxSegregatedObjectSize = 1024;
+const uint32_t minSegregatedObjectIndex = minSmallObjectIndex+numSmallObjectBins;
+const uint32_t numSegregatedObjectBins = 16;
+const uint32_t maxSegregatedObjectSize = 1024;
 
-        /*
+/*
  * And there are 5 bins with allocation sizes that are multiples of estimatedCacheLineSize
  * and selected to fit 9, 6, 4, 3, and 2 allocations in a block.
  */
-        const uint32_t minFittingIndex = minSegregatedObjectIndex + numSegregatedObjectBins;
-        const uint32_t numFittingBins = 5;
-
-        const uint32_t fittingAlignment = estimatedCacheLineSize;
-
-#define SET_FITTING_SIZE(N) ((slabSize - sizeof(Block)) / N) & ~(fittingAlignment - 1)
-        // For blockSize=16*1024, sizeof(Block)=2*estimatedCacheLineSize and fittingAlignment=estimatedCacheLineSize,
-        // the comments show the fitting sizes and the amounts left unused for estimatedCacheLineSize=64/128:
-        const uint32_t fittingSize1 = SET_FITTING_SIZE(9);// 1792/1792 128/000
-        const uint32_t fittingSize2 = SET_FITTING_SIZE(6);// 2688/2688 128/000
-        const uint32_t fittingSize3 = SET_FITTING_SIZE(4);// 4032/3968 128/256
-        const uint32_t fittingSize4 = SET_FITTING_SIZE(3);// 5376/5376 128/000
-        const uint32_t fittingSize5 = SET_FITTING_SIZE(2);// 8128/8064 000/000
+const uint32_t minFittingIndex = minSegregatedObjectIndex+numSegregatedObjectBins;
+const uint32_t numFittingBins = 5;
+
+const uint32_t fittingAlignment = estimatedCacheLineSize;
+
+#define SET_FITTING_SIZE(N) ( (slabSize-sizeof(Block))/N ) & ~(fittingAlignment-1)
+// For blockSize=16*1024, sizeof(Block)=2*estimatedCacheLineSize and fittingAlignment=estimatedCacheLineSize,
+// the comments show the fitting sizes and the amounts left unused for estimatedCacheLineSize=64/128:
+const uint32_t fittingSize1 = SET_FITTING_SIZE(9); // 1792/1792 128/000
+const uint32_t fittingSize2 = SET_FITTING_SIZE(6); // 2688/2688 128/000
+const uint32_t fittingSize3 = SET_FITTING_SIZE(4); // 4032/3968 128/256
+const uint32_t fittingSize4 = SET_FITTING_SIZE(3); // 5376/5376 128/000
+const uint32_t fittingSize5 = SET_FITTING_SIZE(2); // 8128/8064 000/000
 #undef SET_FITTING_SIZE
 
-        /*
+/*
  * The total number of thread-specific Block-based bins
  */
-        const uint32_t numBlockBins = minFittingIndex + numFittingBins;
+const uint32_t numBlockBins = minFittingIndex+numFittingBins;
 
-        /*
+/*
  * Objects of this size and larger are considered large objects.
  */
-        const uint32_t minLargeObjectSize = fittingSize5 + 1;
+const uint32_t minLargeObjectSize = fittingSize5 + 1;
 
-        /*
+/*
  * Per-thread pool of slab blocks. Idea behind it is to not share with other
  * threads memory that are likely in local cache(s) of our CPU.
  */
-        class FreeBlockPool {
-        private:
-            std::atomic<Block *> head;
-            int size;
-            Backend *backend;
-            bool lastAccessMiss;
-
-        public:
-            static const int POOL_HIGH_MARK = 32;
-            static const int POOL_LOW_MARK = 8;
-
-            class ResOfGet {
-                ResOfGet();
-
-            public:
-                Block *block;
-                bool lastAccMiss;
-                ResOfGet(Block *b, bool lastMiss) : block(b), lastAccMiss(lastMiss) {}
-            };
-
-            // allocated in zero-initialized memory
-            FreeBlockPool(Backend *bknd) : backend(bknd) {}
-            ResOfGet getBlock();
-            void returnBlock(Block *block);
-            bool externalCleanup();// can be called by another thread
-        };
-
-        template <int LOW_MARK, int HIGH_MARK>
-        class LocalLOCImpl {
-        private:
-            static const size_t MAX_TOTAL_SIZE = 4 * 1024 * 1024;
-            // TODO: can single-linked list be faster here?
-            LargeMemoryBlock *tail;// need it when do releasing on overflow
-            std::atomic<LargeMemoryBlock *> head;
-            size_t totalSize;
-            int numOfBlocks;
-
-        public:
-            bool put(LargeMemoryBlock *object, ExtMemoryPool *extMemPool);
-            LargeMemoryBlock *get(size_t size);
-            bool externalCleanup(ExtMemoryPool *extMemPool);
+class FreeBlockPool {
+private:
+    std::atomic<Block*> head;
+    int         size;
+    Backend    *backend;
+public:
+    static const int POOL_HIGH_MARK = 32;
+    static const int POOL_LOW_MARK  = 8;
+
+    class ResOfGet {
+        ResOfGet() = delete;
+    public:
+        Block* block;
+        bool   lastAccMiss;
+        ResOfGet(Block *b, bool lastMiss) : block(b), lastAccMiss(lastMiss) {}
+    };
+
+    // allocated in zero-initialized memory
+    FreeBlockPool(Backend *bknd) : backend(bknd) {}
+    ResOfGet getBlock();
+    void returnBlock(Block *block);
+    bool externalCleanup(); // can be called by another thread
+};
+
+template<int LOW_MARK, int HIGH_MARK>
+class LocalLOCImpl {
+private:
+    static const size_t MAX_TOTAL_SIZE = 4*1024*1024;
+    // TODO: can single-linked list be faster here?
+    LargeMemoryBlock *tail; // need it when do releasing on overflow
+    std::atomic<LargeMemoryBlock*> head;
+    size_t            totalSize;
+    int               numOfBlocks;
+public:
+    bool put(LargeMemoryBlock *object, ExtMemoryPool *extMemPool);
+    LargeMemoryBlock *get(size_t size);
+    bool externalCleanup(ExtMemoryPool *extMemPool);
 #if __TBB_MALLOC_WHITEBOX_TEST
-            LocalLOCImpl() : tail(NULL), head(NULL), totalSize(0), numOfBlocks(0) {}
-            static size_t getMaxSize() { return MAX_TOTAL_SIZE; }
-            static const int LOC_HIGH_MARK = HIGH_MARK;
+    LocalLOCImpl() : tail(nullptr), head(nullptr), totalSize(0), numOfBlocks(0) {}
+    static size_t getMaxSize() { return MAX_TOTAL_SIZE; }
+    static const int LOC_HIGH_MARK = HIGH_MARK;
 #else
-            // no ctor, object must be created in zero-initialized memory
+    // no ctor, object must be created in zero-initialized memory
 #endif
-        };
-
-        typedef LocalLOCImpl<8, 32> LocalLOC;// set production code parameters
-
-        class TLSData : public TLSRemote {
-            MemoryPool *memPool;
-
-        public:
-            Bin bin[numBlockBinLimit];
-            FreeBlockPool freeSlabBlocks;
-            LocalLOC lloc;
-            unsigned currCacheIdx;
-
-        private:
-            std::atomic<bool> unused;
-
-        public:
-            TLSData(MemoryPool *mPool, Backend *bknd) : memPool(mPool), freeSlabBlocks(bknd) {}
-            MemoryPool *getMemPool() const { return memPool; }
-            Bin *getAllocationBin(size_t size);
-            void release();
-            bool externalCleanup(bool cleanOnlyUnused, bool cleanBins) {
-                if (!unused.load(std::memory_order_relaxed) && cleanOnlyUnused) return false;
-                // Heavy operation in terms of synchronization complexity,
-                // should be called only for the current thread
-                bool released = cleanBins ? cleanupBlockBins() : false;
-                // both cleanups to be called, and the order is not important
-                return released | lloc.externalCleanup(&memPool->extMemPool)
-                       | freeSlabBlocks.externalCleanup();
-            }
-            bool cleanupBlockBins();
-            void markUsed() {
-                unused.store(false, std::memory_order_relaxed);
-            }// called by owner when TLS touched
-            void markUnused() {
-                unused.store(true, std::memory_order_relaxed);
-            }// can be called by not owner thread
-        };
-
-        TLSData *TLSKey::createTLS(MemoryPool *memPool, Backend *backend) {
-            MALLOC_ASSERT(sizeof(TLSData) >= sizeof(Bin) * numBlockBins + sizeof(FreeBlockPool), ASSERT_TEXT);
-            TLSData *tls = (TLSData *) memPool->bootStrapBlocks.allocate(memPool, sizeof(TLSData));
-            if (!tls) return NULL;
-            new (tls) TLSData(memPool, backend);
-            /* the block contains zeroes after bootStrapMalloc, so bins are initialized */
+};
+
+typedef LocalLOCImpl<8,32> LocalLOC; // set production code parameters
+
+class TLSData : public TLSRemote {
+    MemoryPool   *memPool;
+public:
+    Bin           bin[numBlockBinLimit];
+    FreeBlockPool freeSlabBlocks;
+    LocalLOC      lloc;
+    unsigned      currCacheIdx;
+private:
+    std::atomic<bool> unused;
+public:
+    TLSData(MemoryPool *mPool, Backend *bknd) : memPool(mPool), freeSlabBlocks(bknd), currCacheIdx(0) {}
+    MemoryPool *getMemPool() const { return memPool; }
+    Bin* getAllocationBin(size_t size);
+    void release();
+    bool externalCleanup(bool cleanOnlyUnused, bool cleanBins) {
+        if (!unused.load(std::memory_order_relaxed) && cleanOnlyUnused) return false;
+        // Heavy operation in terms of synchronization complexity,
+        // should be called only for the current thread
+        bool released = cleanBins ? cleanupBlockBins() : false;
+        // both cleanups to be called, and the order is not important
+        bool lloc_cleaned = lloc.externalCleanup(&memPool->extMemPool);
+        bool free_slab_blocks_cleaned = freeSlabBlocks.externalCleanup();
+        return released || lloc_cleaned || free_slab_blocks_cleaned;
+    }
+    bool cleanupBlockBins();
+    void markUsed() { unused.store(false, std::memory_order_relaxed); } // called by owner when TLS touched
+    void markUnused() { unused.store(true, std::memory_order_relaxed); } // can be called by not owner thread
+};
+
+TLSData *TLSKey::createTLS(MemoryPool *memPool, Backend *backend)
+{
+    MALLOC_ASSERT( sizeof(TLSData) >= sizeof(Bin) * numBlockBins + sizeof(FreeBlockPool), ASSERT_TEXT );
+    TLSData* tls = (TLSData*) memPool->bootStrapBlocks.allocate(memPool, sizeof(TLSData));
+    if ( !tls )
+        return nullptr;
+    new(tls) TLSData(memPool, backend);
+    /* the block contains zeroes after bootStrapMalloc, so bins are initialized */
 #if MALLOC_DEBUG
-            for (uint32_t i = 0; i < numBlockBinLimit; i++) tls->bin[i].verifyInitState();
+    for (uint32_t i = 0; i < numBlockBinLimit; i++)
+        tls->bin[i].verifyInitState();
 #endif
-            setThreadMallocTLS(tls);
-            memPool->extMemPool.allLocalCaches.registerThread(tls);
-            return tls;
-        }
+    setThreadMallocTLS(tls);
+    memPool->extMemPool.allLocalCaches.registerThread(tls);
+    return tls;
+}
 
-        bool TLSData::cleanupBlockBins() {
-            bool released = false;
-            for (uint32_t i = 0; i < numBlockBinLimit; i++) {
-                released |= bin[i].cleanPublicFreeLists();
-                // After cleaning public free lists, only the active block might be empty.
-                // Do not use processEmptyBlock because it will just restore bumpPtr.
-                Block *block = bin[i].getActiveBlock();
-                if (block && block->empty()) {
-                    bin[i].outofTLSBin(block);
-                    memPool->returnEmptyBlock(block, /*poolTheBlock=*/false);
-                    released = true;
-                }
-            }
-            return released;
+bool TLSData::cleanupBlockBins()
+{
+    bool released = false;
+    for (uint32_t i = 0; i < numBlockBinLimit; i++) {
+        released |= bin[i].cleanPublicFreeLists();
+        // After cleaning public free lists, only the active block might be empty.
+        // Do not use processEmptyBlock because it will just restore bumpPtr.
+        Block *block = bin[i].getActiveBlock();
+        if (block && block->empty()) {
+            bin[i].outofTLSBin(block);
+            memPool->returnEmptyBlock(block, /*poolTheBlock=*/false);
+            released = true;
         }
+    }
+    return released;
+}
 
-        bool ExtMemoryPool::releaseAllLocalCaches() {
-            // Iterate all registered TLS data and clean LLOC and Slab pools
-            bool released = allLocalCaches.cleanup(/*cleanOnlyUnused=*/false);
+bool ExtMemoryPool::releaseAllLocalCaches()
+{
+    // Iterate all registered TLS data and clean LLOC and Slab pools
+    bool released = allLocalCaches.cleanup(/*cleanOnlyUnused=*/false);
 
-            // Bins privatization is done only for the current thread
-            if (TLSData *tlsData = tlsPointerKey.getThreadMallocTLS())
-                released |= tlsData->cleanupBlockBins();
+    // Bins privatization is done only for the current thread
+    if (TLSData *tlsData = tlsPointerKey.getThreadMallocTLS())
+        released |= tlsData->cleanupBlockBins();
 
-            return released;
-        }
+    return released;
+}
 
-        void AllLocalCaches::registerThread(TLSRemote *tls) {
-            tls->prev = NULL;
-            MallocMutex::scoped_lock lock(listLock);
-            MALLOC_ASSERT(head != tls, ASSERT_TEXT);
-            tls->next = head;
-            if (head) head->prev = tls;
-            head = tls;
-            MALLOC_ASSERT(head->next != head, ASSERT_TEXT);
-        }
+void AllLocalCaches::registerThread(TLSRemote *tls)
+{
+    tls->prev = nullptr;
+    MallocMutex::scoped_lock lock(listLock);
+    MALLOC_ASSERT(head!=tls, ASSERT_TEXT);
+    tls->next = head;
+    if (head)
+        head->prev = tls;
+    head = tls;
+    MALLOC_ASSERT(head->next!=head, ASSERT_TEXT);
+}
 
-        void AllLocalCaches::unregisterThread(TLSRemote *tls) {
-            MallocMutex::scoped_lock lock(listLock);
-            MALLOC_ASSERT(head, "Can't unregister thread: no threads are registered.");
-            if (head == tls) head = tls->next;
-            if (tls->next) tls->next->prev = tls->prev;
-            if (tls->prev) tls->prev->next = tls->next;
-            MALLOC_ASSERT(!tls->next || tls->next->next != tls->next, ASSERT_TEXT);
-        }
+void AllLocalCaches::unregisterThread(TLSRemote *tls)
+{
+    MallocMutex::scoped_lock lock(listLock);
+    MALLOC_ASSERT(head, "Can't unregister thread: no threads are registered.");
+    if (head == tls)
+        head = tls->next;
+    if (tls->next)
+        tls->next->prev = tls->prev;
+    if (tls->prev)
+        tls->prev->next = tls->next;
+    MALLOC_ASSERT(!tls->next || tls->next->next!=tls->next, ASSERT_TEXT);
+}
 
-        bool AllLocalCaches::cleanup(bool cleanOnlyUnused) {
-            bool released = false;
-            {
-                MallocMutex::scoped_lock lock(listLock);
-                for (TLSRemote *curr = head; curr; curr = curr->next)
-                    released |= static_cast<TLSData *>(curr)->externalCleanup(cleanOnlyUnused,
-                                                                              /*cleanBins=*/false);
-            }
-            return released;
-        }
+bool AllLocalCaches::cleanup(bool cleanOnlyUnused)
+{
+    bool released = false;
+    {
+        MallocMutex::scoped_lock lock(listLock);
+        for (TLSRemote *curr=head; curr; curr=curr->next)
+            released |= static_cast<TLSData*>(curr)->externalCleanup(cleanOnlyUnused, /*cleanBins=*/false);
+    }
+    return released;
+}
 
-        void AllLocalCaches::markUnused() {
-            bool locked;
-            MallocMutex::scoped_lock lock(listLock, /*block=*/false, &locked);
-            if (!locked)// not wait for marking if someone doing something with it
-                return;
+void AllLocalCaches::markUnused()
+{
+    bool locked = false;
+    MallocMutex::scoped_lock lock(listLock, /*block=*/false, &locked);
+    if (!locked) // not wait for marking if someone doing something with it
+        return;
 
-            for (TLSRemote *curr = head; curr; curr = curr->next) static_cast<TLSData *>(curr)->markUnused();
-        }
+    for (TLSRemote *curr=head; curr; curr=curr->next)
+        static_cast<TLSData*>(curr)->markUnused();
+}
 
 #if MALLOC_CHECK_RECURSION
-        MallocMutex RecursiveMallocCallProtector::rmc_mutex;
-        std::atomic<pthread_t> RecursiveMallocCallProtector::owner_thread;
-        std::atomic<void *> RecursiveMallocCallProtector::autoObjPtr;
-        bool RecursiveMallocCallProtector::mallocRecursionDetected;
+MallocMutex RecursiveMallocCallProtector::rmc_mutex;
+std::atomic<pthread_t> RecursiveMallocCallProtector::owner_thread;
+std::atomic<void*> RecursiveMallocCallProtector::autoObjPtr;
+bool        RecursiveMallocCallProtector::mallocRecursionDetected;
 #if __FreeBSD__
-        bool RecursiveMallocCallProtector::canUsePthread;
+bool        RecursiveMallocCallProtector::canUsePthread;
 #endif
 
 #endif
 
-        /*********** End code to provide thread ID and a TLS pointer **********/
+/*********** End code to provide thread ID and a TLS pointer **********/
 
-        // Parameter for isLargeObject, keeps our expectations on memory origin.
-        // Assertions must use unknownMem to reliably report object invalidity.
-        enum MemoryOrigin {
-            ourMem,   // allocated by TBB allocator
-            unknownMem// can be allocated by system allocator or TBB allocator
-        };
+// Parameter for isLargeObject, keeps our expectations on memory origin.
+// Assertions must use unknownMem to reliably report object invalidity.
+enum MemoryOrigin {
+    ourMem,    // allocated by TBB allocator
+    unknownMem // can be allocated by system allocator or TBB allocator
+};
 
-        template <MemoryOrigin>
+template<MemoryOrigin>
 #if __TBB_USE_THREAD_SANITIZER
-        // We have a real race when accessing the large object header for
-        // non large objects (e.g. small or foreign objects).
-        // Therefore, we need to hide this access from the thread sanitizer
-        __attribute__((no_sanitize("thread")))
+// We have a real race when accessing the large object header for
+// non large objects (e.g. small or foreign objects).
+// Therefore, we need to hide this access from the thread sanitizer
+__attribute__((no_sanitize("thread")))
 #endif
-        bool
-        isLargeObject(void *object);
-        static void *internalMalloc(size_t size);
-        static void internalFree(void *object);
-        static void *internalPoolMalloc(MemoryPool *mPool, size_t size);
-        static bool internalPoolFree(MemoryPool *mPool, void *object, size_t size);
+bool isLargeObject(void *object);
+static void *internalMalloc(size_t size);
+static void internalFree(void *object);
+static void *internalPoolMalloc(MemoryPool* mPool, size_t size);
+static bool internalPoolFree(MemoryPool *mPool, void *object, size_t size);
 
 #if !MALLOC_DEBUG
 #if __INTEL_COMPILER || _MSC_VER
 #define NOINLINE(decl) __declspec(noinline) decl
 #define ALWAYSINLINE(decl) __forceinline decl
 #elif __GNUC__
-#define NOINLINE(decl) decl __attribute__((noinline))
-#define ALWAYSINLINE(decl) decl __attribute__((always_inline))
+#define NOINLINE(decl) decl __attribute__ ((noinline))
+#define ALWAYSINLINE(decl) decl __attribute__ ((always_inline))
 #else
 #define NOINLINE(decl) decl
 #define ALWAYSINLINE(decl) decl
 #endif
 
-        static NOINLINE(bool doInitialization());
-        ALWAYSINLINE(bool isMallocInitialized());
+static NOINLINE( bool doInitialization() );
+ALWAYSINLINE( bool isMallocInitialized() );
 
 #undef ALWAYSINLINE
 #undef NOINLINE
 #endif /* !MALLOC_DEBUG */
 
+
 /********* Now some rough utility code to deal with indexing the size bins. **************/
 
 /*
@@ -754,983 +766,1065 @@ namespace rml {
  * This is enough for current algorithm of distribution of sizes among bins.
  * __TBB_Log2 is not used here to minimize dependencies on TBB specific sources.
  */
-#if _WIN64 && _MSC_VER >= 1400 && !__INTEL_COMPILER
-        extern "C" unsigned char _BitScanReverse(unsigned long *i, unsigned long w);
+#if _WIN64 && _MSC_VER>=1400 && !__INTEL_COMPILER
+extern "C" unsigned char _BitScanReverse( unsigned long* i, unsigned long w );
 #pragma intrinsic(_BitScanReverse)
 #endif
-        static inline unsigned int highestBitPos(unsigned int n) {
-            MALLOC_ASSERT(n >= 64 && n < 1024,
-                          ASSERT_TEXT);// only needed for bsr array lookup, but always true
-            unsigned int pos;
-#if __ARCH_x86_32 || __ARCH_x86_64
-
-#if __unix__ || __APPLE__ || __MINGW32__
-            __asm__("bsr %1,%0" : "=r"(pos) : "r"(n));
-#elif (_WIN32 && (!_WIN64 || __INTEL_COMPILER))
-            __asm
-            {
+static inline unsigned int highestBitPos(unsigned int n)
+{
+    MALLOC_ASSERT( n>=64 && n<1024, ASSERT_TEXT ); // only needed for bsr array lookup, but always true
+    unsigned int pos;
+#if __ARCH_x86_32||__ARCH_x86_64
+
+# if __unix__||__APPLE__||__MINGW32__
+    __asm__ ("bsr %1,%0" : "=r"(pos) : "r"(n));
+# elif (_WIN32 && (!_WIN64 || __INTEL_COMPILER))
+    __asm
+    {
         bsr eax, n
         mov pos, eax
-            }
-#elif _WIN64 && _MSC_VER >= 1400
-            _BitScanReverse((unsigned long *) &pos, (unsigned long) n);
-#else
-#error highestBitPos() not implemented for this platform
-#endif
+    }
+# elif _WIN64 && _MSC_VER>=1400
+    _BitScanReverse((unsigned long*)&pos, (unsigned long)n);
+# else
+#   error highestBitPos() not implemented for this platform
+# endif
 #elif __arm__
-            __asm__ __volatile__("clz %0, %1\n"
-                                 "rsb %0, %0, %2\n"
-                                 : "=r"(pos)
-                                 : "r"(n), "I"(31));
+    __asm__ __volatile__
+    (
+       "clz %0, %1\n"
+       "rsb %0, %0, %2\n"
+       :"=r" (pos) :"r" (n), "I" (31)
+    );
 #else
-            static unsigned int bsr[16] = {0 /*N/A*/, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9};
-            pos = bsr[n >> 6];
+    static unsigned int bsr[16] = {0/*N/A*/,6,7,7,8,8,8,8,9,9,9,9,9,9,9,9};
+    pos = bsr[ n>>6 ];
 #endif /* __ARCH_* */
-            return pos;
-        }
+    return pos;
+}
 
-        unsigned int getSmallObjectIndex(unsigned int size) {
-            unsigned int result = (size - 1) >> 3;
-            if (sizeof(void *) == 8) {
-                // For 64-bit malloc, 16 byte alignment is needed except for bin 0.
-                if (result) result |= 1;// 0,1,3,5,7; bins 2,4,6 are not aligned to 16 bytes
-            }
-            return result;
-        }
+unsigned int getSmallObjectIndex(unsigned int size)
+{
+    unsigned int result = (size-1)>>3;
+    constexpr bool is_64bit = (8 == sizeof(void*));
+    if (is_64bit) {
+        // For 64-bit malloc, 16 byte alignment is needed except for bin 0.
+        if (result) result |= 1; // 0,1,3,5,7; bins 2,4,6 are not aligned to 16 bytes
+    }
+    return result;
+}
 
-        /*
+/*
  * Depending on indexRequest, for a given size return either the index into the bin
  * for objects of this size, or the actual size of objects in this bin.
+ * TODO: Change return type to unsigned short.
  */
-        template <bool indexRequest>
-        static unsigned int getIndexOrObjectSize(unsigned int size) {
-            if (size <= maxSmallObjectSize) {// selection from 8/16/24/32/40/48/56/64
-                unsigned int index = getSmallObjectIndex(size);
-                /* Bin 0 is for 8 bytes, bin 1 is for 16, and so forth */
-                return indexRequest ? index : (index + 1) << 3;
-            } else if (
-                    size
-                    <= maxSegregatedObjectSize) {// 80/96/112/128 / 160/192/224/256 / 320/384/448/512 / 640/768/896/1024
-                unsigned int order = highestBitPos(size - 1);// which group of bin sizes?
-                MALLOC_ASSERT(6 <= order && order <= 9, ASSERT_TEXT);
-                if (indexRequest)
-                    return minSegregatedObjectIndex - (4 * 6) - 4 + (4 * order) + ((size - 1) >> (order - 2));
-                else {
-                    unsigned int alignment = 128 >> (9 - order);// alignment in the group
-                    MALLOC_ASSERT(alignment == 16 || alignment == 32 || alignment == 64 || alignment == 128,
-                                  ASSERT_TEXT);
-                    return alignUp(size, alignment);
-                }
+template<bool indexRequest>
+static unsigned int getIndexOrObjectSize (unsigned int size)
+{
+    if (size <= maxSmallObjectSize) { // selection from 8/16/24/32/40/48/56/64
+        unsigned int index = getSmallObjectIndex( size );
+         /* Bin 0 is for 8 bytes, bin 1 is for 16, and so forth */
+        return indexRequest ? index : (index+1)<<3;
+    }
+    else if (size <= maxSegregatedObjectSize ) { // 80/96/112/128 / 160/192/224/256 / 320/384/448/512 / 640/768/896/1024
+        unsigned int order = highestBitPos(size-1); // which group of bin sizes?
+        MALLOC_ASSERT( 6<=order && order<=9, ASSERT_TEXT );
+        if (indexRequest)
+            return minSegregatedObjectIndex - (4*6) - 4 + (4*order) + ((size-1)>>(order-2));
+        else {
+            unsigned int alignment = 128 >> (9-order); // alignment in the group
+            MALLOC_ASSERT( alignment==16 || alignment==32 || alignment==64 || alignment==128, ASSERT_TEXT );
+            return alignUp(size,alignment);
+        }
+    }
+    else {
+        if( size <= fittingSize3 ) {
+            if( size <= fittingSize2 ) {
+                if( size <= fittingSize1 )
+                    return indexRequest ? minFittingIndex : fittingSize1;
+                else
+                    return indexRequest ? minFittingIndex+1 : fittingSize2;
+            } else
+                return indexRequest ? minFittingIndex+2 : fittingSize3;
+        } else {
+            if( size <= fittingSize5 ) {
+                if( size <= fittingSize4 )
+                    return indexRequest ? minFittingIndex+3 : fittingSize4;
+                else
+                    return indexRequest ? minFittingIndex+4 : fittingSize5;
             } else {
-                if (size <= fittingSize3) {
-                    if (size <= fittingSize2) {
-                        if (size <= fittingSize1) return indexRequest ? minFittingIndex : fittingSize1;
-                        else
-                            return indexRequest ? minFittingIndex + 1 : fittingSize2;
-                    } else
-                        return indexRequest ? minFittingIndex + 2 : fittingSize3;
-                } else {
-                    if (size <= fittingSize5) {
-                        if (size <= fittingSize4) return indexRequest ? minFittingIndex + 3 : fittingSize4;
-                        else
-                            return indexRequest ? minFittingIndex + 4 : fittingSize5;
-                    } else {
-                        MALLOC_ASSERT(0, ASSERT_TEXT);// this should not happen
-                        return ~0U;
-                    }
-                }
+                MALLOC_ASSERT( 0,ASSERT_TEXT ); // this should not happen
+                return ~0U;
             }
         }
+    }
+}
 
-        static unsigned int getIndex(unsigned int size) {
-            return getIndexOrObjectSize</*indexRequest=*/true>(size);
-        }
+static unsigned int getIndex (unsigned int size)
+{
+    return getIndexOrObjectSize</*indexRequest=*/true>(size);
+}
 
-        static unsigned int getObjectSize(unsigned int size) {
-            return getIndexOrObjectSize</*indexRequest=*/false>(size);
-        }
+static unsigned int getObjectSize (unsigned int size)
+{
+    return getIndexOrObjectSize</*indexRequest=*/false>(size);
+}
 
-        void *BootStrapBlocks::allocate(MemoryPool *memPool, size_t size) {
-            FreeObject *result;
 
-            MALLOC_ASSERT(size == sizeof(TLSData), ASSERT_TEXT);
+void *BootStrapBlocks::allocate(MemoryPool *memPool, size_t size)
+{
+    FreeObject *result;
 
-            {// Lock with acquire
-                MallocMutex::scoped_lock scoped_cs(bootStrapLock);
+    MALLOC_ASSERT( size == sizeof(TLSData), ASSERT_TEXT );
 
-                if (bootStrapObjectList) {
-                    result = bootStrapObjectList;
-                    bootStrapObjectList = bootStrapObjectList->next;
-                } else {
-                    if (!bootStrapBlock) {
-                        bootStrapBlock = memPool->getEmptyBlock(size);
-                        if (!bootStrapBlock) return NULL;
-                    }
-                    result = bootStrapBlock->bumpPtr;
-                    bootStrapBlock->bumpPtr = (FreeObject *) ((uintptr_t) bootStrapBlock->bumpPtr
-                                                              - bootStrapBlock->objectSize);
-                    if ((uintptr_t) bootStrapBlock->bumpPtr < (uintptr_t) bootStrapBlock + sizeof(Block)) {
-                        bootStrapBlock->bumpPtr = NULL;
-                        bootStrapBlock->next = bootStrapBlockUsed;
-                        bootStrapBlockUsed = bootStrapBlock;
-                        bootStrapBlock = NULL;
-                    }
-                }
-            }// Unlock with release
-            memset(result, 0, size);
-            return (void *) result;
-        }
+    { // Lock with acquire
+        MallocMutex::scoped_lock scoped_cs(bootStrapLock);
 
-        void BootStrapBlocks::free(void *ptr) {
-            MALLOC_ASSERT(ptr, ASSERT_TEXT);
-            {// Lock with acquire
-                MallocMutex::scoped_lock scoped_cs(bootStrapLock);
-                ((FreeObject *) ptr)->next = bootStrapObjectList;
-                bootStrapObjectList = (FreeObject *) ptr;
-            }// Unlock with release
-        }
+        if( bootStrapObjectList) {
+            result = bootStrapObjectList;
+            bootStrapObjectList = bootStrapObjectList->next;
+        } else {
+            if (!bootStrapBlock) {
+                bootStrapBlock = memPool->getEmptyBlock(size);
+                if (!bootStrapBlock) return nullptr;
+            }
+            result = bootStrapBlock->bumpPtr;
+            bootStrapBlock->bumpPtr = (FreeObject *)((uintptr_t)bootStrapBlock->bumpPtr - bootStrapBlock->objectSize);
+            if ((uintptr_t)bootStrapBlock->bumpPtr < (uintptr_t)bootStrapBlock+sizeof(Block)) {
+                bootStrapBlock->bumpPtr = nullptr;
+                bootStrapBlock->next = bootStrapBlockUsed;
+                bootStrapBlockUsed = bootStrapBlock;
+                bootStrapBlock = nullptr;
+            }
+        }
+    } // Unlock with release
+    memset (result, 0, size);
+    return (void*)result;
+}
 
-        void BootStrapBlocks::reset() {
-            bootStrapBlock = bootStrapBlockUsed = NULL;
-            bootStrapObjectList = NULL;
-        }
+void BootStrapBlocks::free(void* ptr)
+{
+    MALLOC_ASSERT( ptr, ASSERT_TEXT );
+    { // Lock with acquire
+        MallocMutex::scoped_lock scoped_cs(bootStrapLock);
+        ((FreeObject*)ptr)->next = bootStrapObjectList;
+        bootStrapObjectList = (FreeObject*)ptr;
+    } // Unlock with release
+}
+
+void BootStrapBlocks::reset()
+{
+    bootStrapBlock = bootStrapBlockUsed = nullptr;
+    bootStrapObjectList = nullptr;
+}
 
 #if !(FREELIST_NONBLOCKING)
-        static MallocMutex publicFreeListLock;// lock for changes of publicFreeList
+static MallocMutex publicFreeListLock; // lock for changes of publicFreeList
 #endif
 
-        /********* End rough utility code  **************/
+/********* End rough utility code  **************/
 
-        /* LifoList assumes zero initialization so a vector of it can be created
+/* LifoList assumes zero initialization so a vector of it can be created
  * by just allocating some space with no call to constructor.
  * On Linux, it seems to be necessary to avoid linking with C++ libraries.
  *
  * By usage convention there is no race on the initialization. */
-        LifoList::LifoList() : top(nullptr) {
-            // MallocMutex assumes zero initialization
-            memset(&lock, 0, sizeof(MallocMutex));
-        }
+LifoList::LifoList( ) : top(nullptr)
+{
+    // MallocMutex assumes zero initialization
+    memset(static_cast<void*>(&lock), 0, sizeof(MallocMutex));
+}
 
-        void LifoList::push(Block *block) {
-            MallocMutex::scoped_lock scoped_cs(lock);
-            block->next = top.load(std::memory_order_relaxed);
-            top.store(block, std::memory_order_relaxed);
-        }
+void LifoList::push(Block *block)
+{
+    MallocMutex::scoped_lock scoped_cs(lock);
+    block->next = top.load(std::memory_order_relaxed);
+    top.store(block, std::memory_order_relaxed);
+}
 
-        Block *LifoList::pop() {
-            Block *block = nullptr;
-            if (top.load(std::memory_order_relaxed)) {
-                MallocMutex::scoped_lock scoped_cs(lock);
-                block = top.load(std::memory_order_relaxed);
-                if (block) { top.store(block->next, std::memory_order_relaxed); }
-            }
-            return block;
+Block *LifoList::pop()
+{
+    Block* block = nullptr;
+    if (top.load(std::memory_order_relaxed)) {
+        MallocMutex::scoped_lock scoped_cs(lock);
+        block = top.load(std::memory_order_relaxed);
+        if (block) {
+            top.store(block->next, std::memory_order_relaxed);
         }
+    }
+    return block;
+}
 
-        Block *LifoList::grab() {
-            Block *block = nullptr;
-            if (top.load(std::memory_order_relaxed)) {
-                MallocMutex::scoped_lock scoped_cs(lock);
-                block = top.load(std::memory_order_relaxed);
-                top.store(nullptr, std::memory_order_relaxed);
-            }
-            return block;
-        }
+Block *LifoList::grab()
+{
+    Block *block = nullptr;
+    if (top.load(std::memory_order_relaxed)) {
+        MallocMutex::scoped_lock scoped_cs(lock);
+        block = top.load(std::memory_order_relaxed);
+        top.store(nullptr, std::memory_order_relaxed);
+    }
+    return block;
+}
 
-        /********* Thread and block related code      *************/
-
-        template <bool poolDestroy>
-        void AllLargeBlocksList::releaseAll(Backend *backend) {
-            LargeMemoryBlock *next, *lmb = loHead;
-            loHead = NULL;
-
-            for (; lmb; lmb = next) {
-                next = lmb->gNext;
-                if (poolDestroy) {
-                    // as it's pool destruction, no need to return object to backend,
-                    // only remove backrefs, as they are global
-                    removeBackRef(lmb->backRefIdx);
-                } else {
-                    // clean g(Next|Prev) to prevent removing lmb
-                    // from AllLargeBlocksList inside returnLargeObject
-                    lmb->gNext = lmb->gPrev = NULL;
-                    backend->returnLargeObject(lmb);
-                }
-            }
-        }
+/********* Thread and block related code      *************/
+
+template<bool poolDestroy> void AllLargeBlocksList::releaseAll(Backend *backend) {
+     LargeMemoryBlock *next, *lmb = loHead;
+     loHead = nullptr;
+
+     for (; lmb; lmb = next) {
+         next = lmb->gNext;
+         if (poolDestroy) {
+             // as it's pool destruction, no need to return object to backend,
+             // only remove backrefs, as they are global
+             removeBackRef(lmb->backRefIdx);
+         } else {
+             // clean g(Next|Prev) to prevent removing lmb
+             // from AllLargeBlocksList inside returnLargeObject
+             lmb->gNext = lmb->gPrev = nullptr;
+             backend->returnLargeObject(lmb);
+         }
+     }
+}
 
-        TLSData *MemoryPool::getTLS(bool create) {
-            TLSData *tls = extMemPool.tlsPointerKey.getThreadMallocTLS();
-            if (create && !tls) tls = extMemPool.tlsPointerKey.createTLS(this, &extMemPool.backend);
-            return tls;
-        }
+TLSData* MemoryPool::getTLS(bool create)
+{
+    TLSData* tls = extMemPool.tlsPointerKey.getThreadMallocTLS();
+    if (create && !tls)
+        tls = extMemPool.tlsPointerKey.createTLS(this, &extMemPool.backend);
+    return tls;
+}
 
-        /*
+/*
  * Return the bin for the given size.
  */
-        inline Bin *TLSData::getAllocationBin(size_t size) { return bin + getIndex(size); }
-
-        /* Return an empty uninitialized block in a non-blocking fashion. */
-        Block *MemoryPool::getEmptyBlock(size_t size) {
-            TLSData *tls = getTLS(/*create=*/false);
-            // try to use per-thread cache, if TLS available
-            FreeBlockPool::ResOfGet resOfGet
-                    = tls ? tls->freeSlabBlocks.getBlock() : FreeBlockPool::ResOfGet(NULL, false);
-            Block *result = resOfGet.block;
-
-            if (!result) {// not found in local cache, asks backend for slabs
-                int num = resOfGet.lastAccMiss ? Backend::numOfSlabAllocOnMiss : 1;
-                BackRefIdx backRefIdx[Backend::numOfSlabAllocOnMiss];
-
-                result = static_cast<Block *>(extMemPool.backend.getSlabBlock(num));
-                if (!result) return NULL;
-
-                if (!extMemPool.userPool())
-                    for (int i = 0; i < num; i++) {
-                        backRefIdx[i] = BackRefIdx::newBackRef(/*largeObj=*/false);
-                        if (backRefIdx[i].isInvalid()) {
-                            // roll back resource allocation
-                            for (int j = 0; j < i; j++) removeBackRef(backRefIdx[j]);
-                            Block *b = result;
-                            for (int j = 0; j < num; b = (Block *) ((uintptr_t) b + slabSize), j++)
-                                extMemPool.backend.putSlabBlock(b);
-                            return NULL;
-                        }
-                    }
-                // resources were allocated, register blocks
-                Block *b = result;
-                for (int i = 0; i < num; b = (Block *) ((uintptr_t) b + slabSize), i++) {
-                    // slab block in user's pool must have invalid backRefIdx
-                    if (extMemPool.userPool()) {
-                        new (&b->backRefIdx) BackRefIdx();
-                    } else {
-                        setBackRef(backRefIdx[i], b);
-                        b->backRefIdx = backRefIdx[i];
-                    }
-                    b->tlsPtr.store(tls, std::memory_order_relaxed);
-                    b->poolPtr = this;
-                    // all but first one go to per-thread pool
-                    if (i > 0) {
-                        MALLOC_ASSERT(tls, ASSERT_TEXT);
-                        tls->freeSlabBlocks.returnBlock(b);
-                    }
+inline Bin* TLSData::getAllocationBin(size_t size)
+{
+    return bin + getIndex(size);
+}
+
+/* Return an empty uninitialized block in a non-blocking fashion. */
+Block *MemoryPool::getEmptyBlock(size_t size)
+{
+    TLSData* tls = getTLS(/*create=*/false);
+    // try to use per-thread cache, if TLS available
+    FreeBlockPool::ResOfGet resOfGet = tls?
+        tls->freeSlabBlocks.getBlock() : FreeBlockPool::ResOfGet(nullptr, false);
+    Block *result = resOfGet.block;
+
+    if (!result) { // not found in local cache, asks backend for slabs
+        int num = resOfGet.lastAccMiss? Backend::numOfSlabAllocOnMiss : 1;
+        BackRefIdx backRefIdx[Backend::numOfSlabAllocOnMiss];
+
+        result = static_cast<Block*>(extMemPool.backend.getSlabBlock(num));
+        if (!result) return nullptr;
+
+        if (!extMemPool.userPool())
+            for (int i=0; i<num; i++) {
+                backRefIdx[i] = BackRefIdx::newBackRef(/*largeObj=*/false);
+                if (backRefIdx[i].isInvalid()) {
+                    // roll back resource allocation
+                    for (int j=0; j<i; j++)
+                        removeBackRef(backRefIdx[j]);
+                    Block *b = result;
+                    for (int j=0; j<num; b=(Block*)((uintptr_t)b+slabSize), j++)
+                        extMemPool.backend.putSlabBlock(b);
+                    return nullptr;
                 }
             }
-            MALLOC_ASSERT(result, ASSERT_TEXT);
-            result->initEmptyBlock(tls, size);
-            STAT_increment(getThreadId(), getIndex(result->objectSize), allocBlockNew);
-            return result;
-        }
-
-        void MemoryPool::returnEmptyBlock(Block *block, bool poolTheBlock) {
-            block->reset();
-            if (poolTheBlock) {
-                getTLS(/*create=*/false)->freeSlabBlocks.returnBlock(block);
+        // resources were allocated, register blocks
+        Block *b = result;
+        for (int i=0; i<num; b=(Block*)((uintptr_t)b+slabSize), i++) {
+            // slab block in user's pool must have invalid backRefIdx
+            if (extMemPool.userPool()) {
+                new (&b->backRefIdx) BackRefIdx();
             } else {
-                // slab blocks in user's pools do not have valid backRefIdx
-                if (!extMemPool.userPool()) removeBackRef(*(block->getBackRefIdx()));
-                extMemPool.backend.putSlabBlock(block);
+                setBackRef(backRefIdx[i], b);
+                b->backRefIdx = backRefIdx[i];
+            }
+            b->tlsPtr.store(tls, std::memory_order_relaxed);
+            b->poolPtr = this;
+            // all but first one go to per-thread pool
+            if (i > 0) {
+                MALLOC_ASSERT(tls, ASSERT_TEXT);
+                tls->freeSlabBlocks.returnBlock(b);
             }
         }
+    }
+    MALLOC_ASSERT(result, ASSERT_TEXT);
+    result->initEmptyBlock(tls, size);
+    STAT_increment(getThreadId(), getIndex(result->objectSize), allocBlockNew);
+    return result;
+}
 
-        bool ExtMemoryPool::init(intptr_t poolId, rawAllocType rawAlloc, rawFreeType rawFree,
-                                 size_t granularity, bool keepAllMemory, bool fixedPool) {
-            this->poolId = poolId;
-            this->rawAlloc = rawAlloc;
-            this->rawFree = rawFree;
-            this->granularity = granularity;
-            this->keepAllMemory = keepAllMemory;
-            this->fixedPool = fixedPool;
-            this->delayRegsReleasing = false;
-            if (!initTLS()) return false;
-            loc.init(this);
-            backend.init(this);
-            MALLOC_ASSERT(isPoolValid(), NULL);
-            return true;
-        }
+void MemoryPool::returnEmptyBlock(Block *block, bool poolTheBlock)
+{
+    block->reset();
+    if (poolTheBlock) {
+        getTLS(/*create=*/false)->freeSlabBlocks.returnBlock(block);
+    } else {
+        // slab blocks in user's pools do not have valid backRefIdx
+        if (!extMemPool.userPool())
+            removeBackRef(*(block->getBackRefIdx()));
+        extMemPool.backend.putSlabBlock(block);
+    }
+}
 
-        bool ExtMemoryPool::initTLS() { return tlsPointerKey.init(); }
-
-        bool MemoryPool::init(intptr_t poolId, const MemPoolPolicy *policy) {
-            if (!extMemPool.init(poolId, policy->pAlloc, policy->pFree,
-                                 policy->granularity ? policy->granularity : defaultGranularity,
-                                 policy->keepAllMemory, policy->fixedPool))
-                return false;
-            {
-                MallocMutex::scoped_lock lock(memPoolListLock);
-                next = defaultMemPool->next;
-                defaultMemPool->next = this;
-                prev = defaultMemPool;
-                if (next) next->prev = this;
-            }
-            return true;
-        }
+bool ExtMemoryPool::init(intptr_t poolId, rawAllocType rawAlloc,
+                         rawFreeType rawFree, size_t granularity,
+                         bool keepAllMemory, bool fixedPool)
+{
+    this->poolId = poolId;
+    this->rawAlloc = rawAlloc;
+    this->rawFree = rawFree;
+    this->granularity = granularity;
+    this->keepAllMemory = keepAllMemory;
+    this->fixedPool = fixedPool;
+    this->delayRegsReleasing = false;
+    if (!initTLS())
+        return false;
+    loc.init(this);
+    backend.init(this);
+    MALLOC_ASSERT(isPoolValid(), nullptr);
+    return true;
+}
 
-        bool MemoryPool::reset() {
-            MALLOC_ASSERT(extMemPool.userPool(), "No reset for the system pool.");
-            // memory is not releasing during pool reset
-            // TODO: mark regions to release unused on next reset()
-            extMemPool.delayRegionsReleasing(true);
+bool ExtMemoryPool::initTLS() { return tlsPointerKey.init(); }
 
-            bootStrapBlocks.reset();
-            extMemPool.lmbList.releaseAll</*poolDestroy=*/false>(&extMemPool.backend);
-            if (!extMemPool.reset()) return false;
+bool MemoryPool::init(intptr_t poolId, const MemPoolPolicy *policy)
+{
+    if (!extMemPool.init(poolId, policy->pAlloc, policy->pFree,
+               policy->granularity? policy->granularity : defaultGranularity,
+               policy->keepAllMemory, policy->fixedPool))
+        return false;
+    {
+        MallocMutex::scoped_lock lock(memPoolListLock);
+        next = defaultMemPool->next;
+        defaultMemPool->next = this;
+        prev = defaultMemPool;
+        if (next)
+            next->prev = this;
+    }
+    return true;
+}
 
-            if (!extMemPool.initTLS()) return false;
-            extMemPool.delayRegionsReleasing(false);
-            return true;
-        }
+bool MemoryPool::reset()
+{
+    MALLOC_ASSERT(extMemPool.userPool(), "No reset for the system pool.");
+    // memory is not releasing during pool reset
+    // TODO: mark regions to release unused on next reset()
+    extMemPool.delayRegionsReleasing(true);
+
+    bootStrapBlocks.reset();
+    extMemPool.lmbList.releaseAll</*poolDestroy=*/false>(&extMemPool.backend);
+    if (!extMemPool.reset())
+        return false;
+
+    if (!extMemPool.initTLS())
+        return false;
+    extMemPool.delayRegionsReleasing(false);
+    return true;
+}
 
-        bool MemoryPool::destroy() {
+bool MemoryPool::destroy()
+{
 #if __TBB_MALLOC_LOCACHE_STAT
-            extMemPool.loc.reportStat(stdout);
+    extMemPool.loc.reportStat(stdout);
 #endif
 #if __TBB_MALLOC_BACKEND_STAT
-            extMemPool.backend.reportStat(stdout);
+    extMemPool.backend.reportStat(stdout);
 #endif
-            {
-                MallocMutex::scoped_lock lock(memPoolListLock);
-                // remove itself from global pool list
-                if (prev) prev->next = next;
-                if (next) next->prev = prev;
-            }
-            // slab blocks in non-default pool do not have backreferences,
-            // only large objects do
-            if (extMemPool.userPool())
-                extMemPool.lmbList.releaseAll</*poolDestroy=*/true>(&extMemPool.backend);
-            else {
-                // only one non-userPool() is supported now
-                MALLOC_ASSERT(this == defaultMemPool, NULL);
-                // There and below in extMemPool.destroy(), do not restore initial state
-                // for user pool, because it's just about to be released. But for system
-                // pool restoring, we do not want to do zeroing of it on subsequent reload.
-                bootStrapBlocks.reset();
-                extMemPool.orphanedBlocks.reset();
-            }
-            return extMemPool.destroy();
-        }
+    {
+        MallocMutex::scoped_lock lock(memPoolListLock);
+        // remove itself from global pool list
+        if (prev)
+            prev->next = next;
+        if (next)
+            next->prev = prev;
+    }
+    // slab blocks in non-default pool do not have backreferences,
+    // only large objects do
+    if (extMemPool.userPool())
+        extMemPool.lmbList.releaseAll</*poolDestroy=*/true>(&extMemPool.backend);
+    else {
+        // only one non-userPool() is supported now
+        MALLOC_ASSERT(this==defaultMemPool, nullptr);
+        // There and below in extMemPool.destroy(), do not restore initial state
+        // for user pool, because it's just about to be released. But for system
+        // pool restoring, we do not want to do zeroing of it on subsequent reload.
+        bootStrapBlocks.reset();
+        extMemPool.orphanedBlocks.reset();
+    }
+    return extMemPool.destroy();
+}
 
-        void MemoryPool::onThreadShutdown(TLSData *tlsData) {
-            if (tlsData) {// might be called for "empty" TLS
-                tlsData->release();
-                bootStrapBlocks.free(tlsData);
-                clearTLS();
-            }
-        }
+void MemoryPool::onThreadShutdown(TLSData *tlsData)
+{
+    if (tlsData) { // might be called for "empty" TLS
+        tlsData->release();
+        bootStrapBlocks.free(tlsData);
+        clearTLS();
+    }
+}
 
 #if MALLOC_DEBUG
-        void Bin::verifyTLSBin(size_t size) const {
-            /* The debug version verifies the TLSBin as needed */
-            uint32_t objSize = getObjectSize(size);
-
-            if (activeBlk) {
-                MALLOC_ASSERT(activeBlk->isOwnedByCurrentThread(), ASSERT_TEXT);
-                MALLOC_ASSERT(activeBlk->objectSize == objSize, ASSERT_TEXT);
-#if MALLOC_DEBUG > 1
-                for (Block *temp = activeBlk->next; temp; temp = temp->next) {
-                    MALLOC_ASSERT(temp != activeBlk, ASSERT_TEXT);
-                    MALLOC_ASSERT(temp->isOwnedByCurrentThread(), ASSERT_TEXT);
-                    MALLOC_ASSERT(temp->objectSize == objSize, ASSERT_TEXT);
-                    MALLOC_ASSERT(temp->previous->next == temp, ASSERT_TEXT);
-                    if (temp->next) { MALLOC_ASSERT(temp->next->previous == temp, ASSERT_TEXT); }
-                }
-                for (Block *temp = activeBlk->previous; temp; temp = temp->previous) {
-                    MALLOC_ASSERT(temp != activeBlk, ASSERT_TEXT);
-                    MALLOC_ASSERT(temp->isOwnedByCurrentThread(), ASSERT_TEXT);
-                    MALLOC_ASSERT(temp->objectSize == objSize, ASSERT_TEXT);
-                    MALLOC_ASSERT(temp->next->previous == temp, ASSERT_TEXT);
-                    if (temp->previous) { MALLOC_ASSERT(temp->previous->next == temp, ASSERT_TEXT); }
-                }
-#endif /* MALLOC_DEBUG>1 */
+void Bin::verifyTLSBin (size_t size) const
+{
+/* The debug version verifies the TLSBin as needed */
+    uint32_t objSize = getObjectSize(size);
+
+    if (activeBlk) {
+        MALLOC_ASSERT( activeBlk->isOwnedByCurrentThread(), ASSERT_TEXT );
+        MALLOC_ASSERT( activeBlk->objectSize == objSize, ASSERT_TEXT );
+#if MALLOC_DEBUG>1
+        for (Block* temp = activeBlk->next; temp; temp=temp->next) {
+            MALLOC_ASSERT( temp!=activeBlk, ASSERT_TEXT );
+            MALLOC_ASSERT( temp->isOwnedByCurrentThread(), ASSERT_TEXT );
+            MALLOC_ASSERT( temp->objectSize == objSize, ASSERT_TEXT );
+            MALLOC_ASSERT( temp->previous->next == temp, ASSERT_TEXT );
+            if (temp->next) {
+                MALLOC_ASSERT( temp->next->previous == temp, ASSERT_TEXT );
+            }
+        }
+        for (Block* temp = activeBlk->previous; temp; temp=temp->previous) {
+            MALLOC_ASSERT( temp!=activeBlk, ASSERT_TEXT );
+            MALLOC_ASSERT( temp->isOwnedByCurrentThread(), ASSERT_TEXT );
+            MALLOC_ASSERT( temp->objectSize == objSize, ASSERT_TEXT );
+            MALLOC_ASSERT( temp->next->previous == temp, ASSERT_TEXT );
+            if (temp->previous) {
+                MALLOC_ASSERT( temp->previous->next == temp, ASSERT_TEXT );
             }
         }
-#else  /* MALLOC_DEBUG */
-        inline void Bin::verifyTLSBin(size_t) const {}
+#endif /* MALLOC_DEBUG>1 */
+    }
+}
+#else /* MALLOC_DEBUG */
+inline void Bin::verifyTLSBin (size_t) const { }
 #endif /* MALLOC_DEBUG */
 
-        /*
+/*
  * Add a block to the start of this tls bin list.
  */
-        void Bin::pushTLSBin(Block *block) {
-            /* The objectSize should be defined and not a parameter
+void Bin::pushTLSBin(Block* block)
+{
+    /* The objectSize should be defined and not a parameter
        because the function is applied to partially filled blocks as well */
-            unsigned int size = block->objectSize;
-
-            MALLOC_ASSERT(block->isOwnedByCurrentThread(), ASSERT_TEXT);
-            MALLOC_ASSERT(block->objectSize != 0, ASSERT_TEXT);
-            MALLOC_ASSERT(block->next == NULL, ASSERT_TEXT);
-            MALLOC_ASSERT(block->previous == NULL, ASSERT_TEXT);
-
-            MALLOC_ASSERT(this, ASSERT_TEXT);
-            verifyTLSBin(size);
-
-            block->next = activeBlk;
-            if (activeBlk) {
-                block->previous = activeBlk->previous;
-                activeBlk->previous = block;
-                if (block->previous) block->previous->next = block;
-            } else {
-                activeBlk = block;
-            }
+    unsigned int size = block->objectSize;
+
+    MALLOC_ASSERT( block->isOwnedByCurrentThread(), ASSERT_TEXT );
+    MALLOC_ASSERT( block->objectSize != 0, ASSERT_TEXT );
+    MALLOC_ASSERT( block->next == nullptr, ASSERT_TEXT );
+    MALLOC_ASSERT( block->previous == nullptr, ASSERT_TEXT );
+
+    MALLOC_ASSERT( this, ASSERT_TEXT );
+    verifyTLSBin(size);
+
+    block->next = activeBlk;
+    if( activeBlk ) {
+        block->previous = activeBlk->previous;
+        activeBlk->previous = block;
+        if( block->previous )
+            block->previous->next = block;
+    } else {
+        activeBlk = block;
+    }
 
-            verifyTLSBin(size);
-        }
+    verifyTLSBin(size);
+}
 
-        /*
+/*
  * Take a block out of its tls bin (e.g. before removal).
  */
-        void Bin::outofTLSBin(Block *block) {
-            unsigned int size = block->objectSize;
-
-            MALLOC_ASSERT(block->isOwnedByCurrentThread(), ASSERT_TEXT);
-            MALLOC_ASSERT(block->objectSize != 0, ASSERT_TEXT);
+void Bin::outofTLSBin(Block* block)
+{
+    unsigned int size = block->objectSize;
 
-            MALLOC_ASSERT(this, ASSERT_TEXT);
-            verifyTLSBin(size);
+    MALLOC_ASSERT( block->isOwnedByCurrentThread(), ASSERT_TEXT );
+    MALLOC_ASSERT( block->objectSize != 0, ASSERT_TEXT );
 
-            if (block == activeBlk) { activeBlk = block->previous ? block->previous : block->next; }
-            /* Unlink the block */
-            if (block->previous) {
-                MALLOC_ASSERT(block->previous->next == block, ASSERT_TEXT);
-                block->previous->next = block->next;
-            }
-            if (block->next) {
-                MALLOC_ASSERT(block->next->previous == block, ASSERT_TEXT);
-                block->next->previous = block->previous;
-            }
-            block->next = NULL;
-            block->previous = NULL;
+    MALLOC_ASSERT( this, ASSERT_TEXT );
+    verifyTLSBin(size);
 
-            verifyTLSBin(size);
-        }
+    if (block == activeBlk) {
+        activeBlk = block->previous? block->previous : block->next;
+    }
+    /* Unlink the block */
+    if (block->previous) {
+        MALLOC_ASSERT( block->previous->next == block, ASSERT_TEXT );
+        block->previous->next = block->next;
+    }
+    if (block->next) {
+        MALLOC_ASSERT( block->next->previous == block, ASSERT_TEXT );
+        block->next->previous = block->previous;
+    }
+    block->next = nullptr;
+    block->previous = nullptr;
 
-        Block *Bin::getPrivatizedFreeListBlock() {
-            Block *block;
-            MALLOC_ASSERT(this, ASSERT_TEXT);
-            // if this method is called, active block usage must be unsuccessful
-            MALLOC_ASSERT(!activeBlk && !mailbox.load(std::memory_order_relaxed)
-                                  || activeBlk && activeBlk->isFull,
-                          ASSERT_TEXT);
+    verifyTLSBin(size);
+}
 
-            // the counter should be changed    STAT_increment(getThreadId(), ThreadCommonCounters, lockPublicFreeList);
-            if (!mailbox.load(std::memory_order_acquire))// hotpath is empty mailbox
-                return NULL;
-            else {// mailbox is not empty, take lock and inspect it
-                MallocMutex::scoped_lock scoped_cs(mailLock);
-                block = mailbox.load(std::memory_order_relaxed);
-                if (block) {
-                    MALLOC_ASSERT(block->isOwnedByCurrentThread(), ASSERT_TEXT);
-                    MALLOC_ASSERT(!isNotForUse(block->nextPrivatizable.load(std::memory_order_relaxed)),
-                                  ASSERT_TEXT);
-                    mailbox.store(block->nextPrivatizable.load(std::memory_order_relaxed),
-                                  std::memory_order_relaxed);
-                    block->nextPrivatizable.store((Block *) this, std::memory_order_relaxed);
-                }
-            }
-            if (block) {
-                MALLOC_ASSERT(isSolidPtr(block->publicFreeList.load(std::memory_order_relaxed)), ASSERT_TEXT);
-                block->privatizePublicFreeList();
-                block->adjustPositionInBin(this);
-            }
-            return block;
+Block* Bin::getPrivatizedFreeListBlock()
+{
+    Block* block;
+    MALLOC_ASSERT( this, ASSERT_TEXT );
+    // if this method is called, active block usage must be unsuccessful
+    MALLOC_ASSERT( (!activeBlk && !mailbox.load(std::memory_order_relaxed)) || (activeBlk && activeBlk->isFull), ASSERT_TEXT );
+
+// the counter should be changed    STAT_increment(getThreadId(), ThreadCommonCounters, lockPublicFreeList);
+    if (!mailbox.load(std::memory_order_acquire)) // hotpath is empty mailbox
+        return nullptr;
+    else { // mailbox is not empty, take lock and inspect it
+        MallocMutex::scoped_lock scoped_cs(mailLock);
+        block = mailbox.load(std::memory_order_relaxed);
+        if( block ) {
+            MALLOC_ASSERT( block->isOwnedByCurrentThread(), ASSERT_TEXT );
+            MALLOC_ASSERT( !isNotForUse(block->nextPrivatizable.load(std::memory_order_relaxed)), ASSERT_TEXT );
+            mailbox.store(block->nextPrivatizable.load(std::memory_order_relaxed), std::memory_order_relaxed);
+            block->nextPrivatizable.store((Block*)this, std::memory_order_relaxed);
         }
+    }
+    if( block ) {
+        MALLOC_ASSERT( isSolidPtr(block->publicFreeList.load(std::memory_order_relaxed)), ASSERT_TEXT );
+        block->privatizePublicFreeList();
+        block->adjustPositionInBin(this);
+    }
+    return block;
+}
 
-        void Bin::addPublicFreeListBlock(Block *block) {
-            MallocMutex::scoped_lock scoped_cs(mailLock);
-            block->nextPrivatizable.store(mailbox.load(std::memory_order_relaxed), std::memory_order_relaxed);
-            mailbox.store(block, std::memory_order_relaxed);
-        }
+void Bin::addPublicFreeListBlock(Block* block)
+{
+    MallocMutex::scoped_lock scoped_cs(mailLock);
+    block->nextPrivatizable.store(mailbox.load(std::memory_order_relaxed), std::memory_order_relaxed);
+    mailbox.store(block, std::memory_order_relaxed);
+}
 
-        // Process publicly freed objects in all blocks and return empty blocks
-        // to the backend in order to reduce overall footprint.
-        bool Bin::cleanPublicFreeLists() {
-            Block *block;
-            if (!mailbox.load(std::memory_order_acquire)) return false;
-            else {
-                // Grab all the blocks in the mailbox
-                MallocMutex::scoped_lock scoped_cs(mailLock);
-                block = mailbox.load(std::memory_order_relaxed);
-                mailbox.store(NULL, std::memory_order_relaxed);
-            }
-            bool released = false;
-            while (block) {
-                MALLOC_ASSERT(block->isOwnedByCurrentThread(), ASSERT_TEXT);
-                Block *tmp = block->nextPrivatizable.load(std::memory_order_relaxed);
-                block->nextPrivatizable.store((Block *) this, std::memory_order_relaxed);
-                block->privatizePublicFreeList();
-                if (block->empty()) {
-                    processEmptyBlock(block, /*poolTheBlock=*/false);
-                    released = true;
-                } else
-                    block->adjustPositionInBin(this);
-                block = tmp;
-            }
-            return released;
-        }
+// Process publicly freed objects in all blocks and return empty blocks
+// to the backend in order to reduce overall footprint.
+bool Bin::cleanPublicFreeLists()
+{
+    Block* block;
+    if (!mailbox.load(std::memory_order_acquire))
+        return false;
+    else {
+        // Grab all the blocks in the mailbox
+        MallocMutex::scoped_lock scoped_cs(mailLock);
+        block = mailbox.load(std::memory_order_relaxed);
+        mailbox.store(nullptr, std::memory_order_relaxed);
+    }
+    bool released = false;
+    while (block) {
+        MALLOC_ASSERT( block->isOwnedByCurrentThread(), ASSERT_TEXT );
+        Block* tmp = block->nextPrivatizable.load(std::memory_order_relaxed);
+        block->nextPrivatizable.store((Block*)this, std::memory_order_relaxed);
+        block->privatizePublicFreeList();
+        if (block->empty()) {
+            processEmptyBlock(block, /*poolTheBlock=*/false);
+            released = true;
+        } else
+            block->adjustPositionInBin(this);
+        block = tmp;
+    }
+    return released;
+}
 
-        bool Block::adjustFullness() {
-            if (bumpPtr) {
-                /* If we are still using a bump ptr for this block it is empty enough to use. */
-                STAT_increment(getThreadId(), getIndex(objectSize), examineEmptyEnough);
-                isFull = false;
-            } else {
-                const float threshold = (slabSize - sizeof(Block)) * (1 - emptyEnoughRatio);
-                /* allocatedCount shows how many objects in the block are in use; however it still counts
+bool Block::adjustFullness()
+{
+    if (bumpPtr) {
+        /* If we are still using a bump ptr for this block it is empty enough to use. */
+        STAT_increment(getThreadId(), getIndex(objectSize), examineEmptyEnough);
+        isFull = false;
+    } else {
+        const float threshold = (slabSize - sizeof(Block)) * (1 - emptyEnoughRatio);
+        /* allocatedCount shows how many objects in the block are in use; however it still counts
          * blocks freed by other threads; so prior call to privatizePublicFreeList() is recommended */
-                isFull = (allocatedCount * objectSize > threshold) ? true : false;
+        isFull = (allocatedCount*objectSize > threshold) ? true : false;
 #if COLLECT_STATISTICS
-                if (isFull) STAT_increment(getThreadId(), getIndex(objectSize), examineNotEmpty);
-                else
-                    STAT_increment(getThreadId(), getIndex(objectSize), examineEmptyEnough);
+        if (isFull)
+            STAT_increment(getThreadId(), getIndex(objectSize), examineNotEmpty);
+        else
+            STAT_increment(getThreadId(), getIndex(objectSize), examineEmptyEnough);
 #endif
-            }
-            return isFull;
-        }
+    }
+    return isFull;
+}
 
-        // This method resides in class Block, and not in class Bin, in order to avoid
-        // calling getAllocationBin on a reasonably hot path in Block::freeOwnObject
-        void Block::adjustPositionInBin(Bin *bin /*=NULL*/) {
-            // If the block were full, but became empty enough to use,
-            // move it to the front of the list
-            if (isFull && !adjustFullness()) {
-                if (!bin) bin = tlsPtr.load(std::memory_order_relaxed)->getAllocationBin(objectSize);
-                bin->moveBlockToFront(this);
-            }
-        }
+// This method resides in class Block, and not in class Bin, in order to avoid
+// calling getAllocationBin on a reasonably hot path in Block::freeOwnObject
+void Block::adjustPositionInBin(Bin* bin/*=nullptr*/)
+{
+    // If the block were full, but became empty enough to use,
+    // move it to the front of the list
+    if (isFull && !adjustFullness()) {
+        if (!bin)
+            bin = tlsPtr.load(std::memory_order_relaxed)->getAllocationBin(objectSize);
+        bin->moveBlockToFront(this);
+    }
+}
 
-        /* Restore the bump pointer for an empty block that is planned to use */
-        void Block::restoreBumpPtr() {
-            MALLOC_ASSERT(allocatedCount == 0, ASSERT_TEXT);
-            MALLOC_ASSERT(!isSolidPtr(publicFreeList.load(std::memory_order_relaxed)), ASSERT_TEXT);
-            STAT_increment(getThreadId(), getIndex(objectSize), freeRestoreBumpPtr);
-            bumpPtr = (FreeObject *) ((uintptr_t) this + slabSize - objectSize);
-            freeList = NULL;
-            isFull = false;
-        }
+/* Restore the bump pointer for an empty block that is planned to use */
+void Block::restoreBumpPtr()
+{
+    MALLOC_ASSERT( allocatedCount == 0, ASSERT_TEXT );
+    MALLOC_ASSERT( !isSolidPtr(publicFreeList.load(std::memory_order_relaxed)), ASSERT_TEXT );
+    STAT_increment(getThreadId(), getIndex(objectSize), freeRestoreBumpPtr);
+    bumpPtr = (FreeObject *)((uintptr_t)this + slabSize - objectSize);
+    freeList = nullptr;
+    isFull = false;
+}
 
-        void Block::freeOwnObject(void *object) {
-            tlsPtr.load(std::memory_order_relaxed)->markUsed();
-            allocatedCount--;
-            MALLOC_ASSERT(allocatedCount < (slabSize - sizeof(Block)) / objectSize, ASSERT_TEXT);
+void Block::freeOwnObject(void *object)
+{
+    tlsPtr.load(std::memory_order_relaxed)->markUsed();
+    allocatedCount--;
+    MALLOC_ASSERT( allocatedCount < (slabSize-sizeof(Block))/objectSize, ASSERT_TEXT );
 #if COLLECT_STATISTICS
-            // Note that getAllocationBin is not called on the hottest path with statistics off.
-            if (tlsPtr.load(std::memory_order_relaxed)->getAllocationBin(objectSize)->getActiveBlock()
-                != this)
-                STAT_increment(getThreadId(), getIndex(objectSize), freeToInactiveBlock);
-            else
-                STAT_increment(getThreadId(), getIndex(objectSize), freeToActiveBlock);
+    // Note that getAllocationBin is not called on the hottest path with statistics off.
+    if (tlsPtr.load(std::memory_order_relaxed)->getAllocationBin(objectSize)->getActiveBlock() != this)
+        STAT_increment(getThreadId(), getIndex(objectSize), freeToInactiveBlock);
+    else
+        STAT_increment(getThreadId(), getIndex(objectSize), freeToActiveBlock);
 #endif
-            if (empty()) {
-                // If the last object of a slab is freed, the slab cannot be marked full
-                MALLOC_ASSERT(!isFull, ASSERT_TEXT);
-                tlsPtr.load(std::memory_order_relaxed)
-                        ->getAllocationBin(objectSize)
-                        ->processEmptyBlock(this, /*poolTheBlock=*/true);
-            } else {// hot path
-                FreeObject *objectToFree = findObjectToFree(object);
-                objectToFree->next = freeList;
-                freeList = objectToFree;
-                adjustPositionInBin();
-            }
-        }
+    if (empty()) {
+        // If the last object of a slab is freed, the slab cannot be marked full
+        MALLOC_ASSERT(!isFull, ASSERT_TEXT);
+        tlsPtr.load(std::memory_order_relaxed)->getAllocationBin(objectSize)->processEmptyBlock(this, /*poolTheBlock=*/true);
+    } else { // hot path
+        FreeObject *objectToFree = findObjectToFree(object);
+        objectToFree->next = freeList;
+        freeList = objectToFree;
+        adjustPositionInBin();
+    }
+}
 
-        void Block::freePublicObject(FreeObject *objectToFree) {
-            FreeObject *localPublicFreeList {};
+void Block::freePublicObject (FreeObject *objectToFree)
+{
+    FreeObject* localPublicFreeList{};
 
-            MALLOC_ITT_SYNC_RELEASING(&publicFreeList);
+    MALLOC_ITT_SYNC_RELEASING(&publicFreeList);
 #if FREELIST_NONBLOCKING
-            // TBB_REVAMP_TODO: make it non atomic in non-blocking scenario
-            localPublicFreeList = publicFreeList.load(std::memory_order_relaxed);
-            do {
-                objectToFree->next = localPublicFreeList;
-                // no backoff necessary because trying to make change, not waiting for a change
-            } while (!publicFreeList.compare_exchange_strong(localPublicFreeList, objectToFree));
+    // TBB_REVAMP_TODO: make it non atomic in non-blocking scenario
+    localPublicFreeList = publicFreeList.load(std::memory_order_relaxed);
+    do {
+        objectToFree->next = localPublicFreeList;
+        // no backoff necessary because trying to make change, not waiting for a change
+    } while( !publicFreeList.compare_exchange_strong(localPublicFreeList, objectToFree) );
 #else
-            STAT_increment(getThreadId(), ThreadCommonCounters, lockPublicFreeList);
-            {
-                MallocMutex::scoped_lock scoped_cs(publicFreeListLock);
-                localPublicFreeList = objectToFree->next = publicFreeList;
-                publicFreeList = objectToFree;
-            }
+    STAT_increment(getThreadId(), ThreadCommonCounters, lockPublicFreeList);
+    {
+        MallocMutex::scoped_lock scoped_cs(publicFreeListLock);
+        localPublicFreeList = objectToFree->next = publicFreeList;
+        publicFreeList = objectToFree;
+    }
 #endif
 
-            if (localPublicFreeList == NULL) {
-                // if the block is abandoned, its nextPrivatizable pointer should be UNUSABLE
-                // otherwise, it should point to the bin the block belongs to.
-                // reading nextPrivatizable is thread-safe below, because:
-                // 1) the executing thread atomically got publicFreeList==NULL and changed it to non-NULL;
-                // 2) only owning thread can change it back to NULL,
-                // 3) but it can not be done until the block is put to the mailbox
-                // So the executing thread is now the only one that can change nextPrivatizable
-                Block *next = nextPrivatizable.load(std::memory_order_acquire);
-                if (!isNotForUse(next)) {
-                    MALLOC_ASSERT(next != nullptr, ASSERT_TEXT);
-                    Bin *theBin = (Bin *) next;
+    if( localPublicFreeList==nullptr ) {
+        // if the block is abandoned, its nextPrivatizable pointer should be UNUSABLE
+        // otherwise, it should point to the bin the block belongs to.
+        // reading nextPrivatizable is thread-safe below, because:
+        // 1) the executing thread atomically got publicFreeList==nullptr and changed it to non-nullptr;
+        // 2) only owning thread can change it back to nullptr,
+        // 3) but it can not be done until the block is put to the mailbox
+        // So the executing thread is now the only one that can change nextPrivatizable
+        Block* next = nextPrivatizable.load(std::memory_order_acquire);
+        if( !isNotForUse(next) ) {
+            MALLOC_ASSERT( next!=nullptr, ASSERT_TEXT );
+            Bin* theBin = (Bin*) next;
 #if MALLOC_DEBUG && TBB_REVAMP_TODO
-                    // FIXME: The thread that returns the block is not the block's owner.
-                    // The below assertion compares 'theBin' against the caller's local bin, thus, it always fails.
-                    // Need to find a way to get the correct remote bin for comparison.
-                    {// check that nextPrivatizable points to the bin the block belongs to
-                        uint32_t index = getIndex(objectSize);
-                        TLSData *tls = getThreadMallocTLS();
-                        MALLOC_ASSERT(theBin == tls->bin + index, ASSERT_TEXT);
-                    }
-#endif// MALLOC_DEBUG
-                    theBin->addPublicFreeListBlock(this);
-                }
+            // FIXME: The thread that returns the block is not the block's owner.
+            // The below assertion compares 'theBin' against the caller's local bin, thus, it always fails.
+            // Need to find a way to get the correct remote bin for comparison.
+            { // check that nextPrivatizable points to the bin the block belongs to
+                uint32_t index = getIndex( objectSize );
+                TLSData* tls = getThreadMallocTLS();
+                MALLOC_ASSERT( theBin==tls->bin+index, ASSERT_TEXT );
             }
-            STAT_increment(getThreadId(), ThreadCommonCounters, freeToOtherThread);
-            STAT_increment(ownerTid.load(std::memory_order_relaxed), getIndex(objectSize), freeByOtherThread);
+#endif // MALLOC_DEBUG
+            theBin->addPublicFreeListBlock(this);
         }
+    }
+    STAT_increment(getThreadId(), ThreadCommonCounters, freeToOtherThread);
+    STAT_increment(ownerTid.load(std::memory_order_relaxed), getIndex(objectSize), freeByOtherThread);
+}
 
-        // Make objects freed by other threads available for use again
-        void Block::privatizePublicFreeList(bool reset) {
-            FreeObject *localPublicFreeList;
-            // If reset is false, publicFreeList should not be zeroed but set to UNUSABLE
-            // to properly synchronize with other threads freeing objects to this slab.
-            const intptr_t endMarker = reset ? 0 : UNUSABLE;
+// Make objects freed by other threads available for use again
+void Block::privatizePublicFreeList( bool reset )
+{
+    FreeObject *localPublicFreeList;
+    // If reset is false, publicFreeList should not be zeroed but set to UNUSABLE
+    // to properly synchronize with other threads freeing objects to this slab.
+    const intptr_t endMarker = reset ? 0 : UNUSABLE;
 
-            // Only the owner thread may reset the pointer to NULL
-            MALLOC_ASSERT(isOwnedByCurrentThread() || !reset, ASSERT_TEXT);
+    // Only the owner thread may reset the pointer to nullptr
+    MALLOC_ASSERT( isOwnedByCurrentThread() || !reset, ASSERT_TEXT );
 #if FREELIST_NONBLOCKING
-            localPublicFreeList = publicFreeList.exchange((FreeObject *) endMarker);
+    localPublicFreeList = publicFreeList.exchange((FreeObject*)endMarker);
 #else
-            STAT_increment(getThreadId(), ThreadCommonCounters, lockPublicFreeList);
-            {
-                MallocMutex::scoped_lock scoped_cs(publicFreeListLock);
-                localPublicFreeList = publicFreeList;
-                publicFreeList = endMarker;
-            }
+    STAT_increment(getThreadId(), ThreadCommonCounters, lockPublicFreeList);
+    {
+        MallocMutex::scoped_lock scoped_cs(publicFreeListLock);
+        localPublicFreeList = publicFreeList;
+        publicFreeList = endMarker;
+    }
 #endif
-            MALLOC_ITT_SYNC_ACQUIRED(&publicFreeList);
-            MALLOC_ASSERT(!(reset && isNotForUse(publicFreeList)), ASSERT_TEXT);
-
-            // publicFreeList must have been UNUSABLE or valid, but not NULL
-            MALLOC_ASSERT(localPublicFreeList != NULL, ASSERT_TEXT);
-            if (isSolidPtr(localPublicFreeList)) {
-                MALLOC_ASSERT(allocatedCount <= (slabSize - sizeof(Block)) / objectSize, ASSERT_TEXT);
-                /* other threads did not change the counter freeing our blocks */
-                allocatedCount--;
-                FreeObject *temp = localPublicFreeList;
-                while (isSolidPtr(temp->next)) {// the list will end with either NULL or UNUSABLE
-                    temp = temp->next;
-                    allocatedCount--;
-                    MALLOC_ASSERT(allocatedCount < (slabSize - sizeof(Block)) / objectSize, ASSERT_TEXT);
-                }
-                /* merge with local freeList */
-                temp->next = freeList;
-                freeList = localPublicFreeList;
-                STAT_increment(getThreadId(), getIndex(objectSize), allocPrivatized);
-            }
+    MALLOC_ITT_SYNC_ACQUIRED(&publicFreeList);
+    MALLOC_ASSERT( !(reset && isNotForUse(publicFreeList)), ASSERT_TEXT );
+
+    // publicFreeList must have been UNUSABLE or valid, but not nullptr
+    MALLOC_ASSERT( localPublicFreeList!=nullptr, ASSERT_TEXT );
+    if( isSolidPtr(localPublicFreeList) ) {
+        MALLOC_ASSERT( allocatedCount <= (slabSize-sizeof(Block))/objectSize, ASSERT_TEXT );
+        /* other threads did not change the counter freeing our blocks */
+        allocatedCount--;
+        FreeObject *temp = localPublicFreeList;
+        while( isSolidPtr(temp->next) ){ // the list will end with either nullptr or UNUSABLE
+            temp = temp->next;
+            allocatedCount--;
+            MALLOC_ASSERT( allocatedCount < (slabSize-sizeof(Block))/objectSize, ASSERT_TEXT );
         }
+        /* merge with local freeList */
+        temp->next = freeList;
+        freeList = localPublicFreeList;
+        STAT_increment(getThreadId(), getIndex(objectSize), allocPrivatized);
+    }
+}
 
-        void Block::privatizeOrphaned(TLSData *tls, unsigned index) {
-            Bin *bin = tls->bin + index;
-            STAT_increment(getThreadId(), index, allocBlockPublic);
-            next = NULL;
-            previous = NULL;
-            MALLOC_ASSERT(publicFreeList.load(std::memory_order_relaxed) != NULL, ASSERT_TEXT);
-            /* There is not a race here since no other thread owns this block */
-            markOwned(tls);
-            // It is safe to change nextPrivatizable, as publicFreeList is not null
-            MALLOC_ASSERT(isNotForUse(nextPrivatizable.load(std::memory_order_relaxed)), ASSERT_TEXT);
-            nextPrivatizable.store((Block *) bin, std::memory_order_relaxed);
-            // the next call is required to change publicFreeList to 0
-            privatizePublicFreeList();
-            if (empty()) {
-                restoreBumpPtr();
-            } else {
-                adjustFullness();// check the block fullness and set isFull
-            }
-            MALLOC_ASSERT(!isNotForUse(publicFreeList.load(std::memory_order_relaxed)), ASSERT_TEXT);
-        }
+void Block::privatizeOrphaned(TLSData *tls, unsigned index)
+{
+    Bin* bin = tls->bin + index;
+    STAT_increment(getThreadId(), index, allocBlockPublic);
+    next = nullptr;
+    previous = nullptr;
+    MALLOC_ASSERT( publicFreeList.load(std::memory_order_relaxed) != nullptr, ASSERT_TEXT );
+    /* There is not a race here since no other thread owns this block */
+    markOwned(tls);
+    // It is safe to change nextPrivatizable, as publicFreeList is not null
+    MALLOC_ASSERT( isNotForUse(nextPrivatizable.load(std::memory_order_relaxed)), ASSERT_TEXT );
+    nextPrivatizable.store((Block*)bin, std::memory_order_relaxed);
+    // the next call is required to change publicFreeList to 0
+    privatizePublicFreeList();
+    if( empty() ) {
+        restoreBumpPtr();
+    } else {
+        adjustFullness(); // check the block fullness and set isFull
+    }
+    MALLOC_ASSERT( !isNotForUse(publicFreeList.load(std::memory_order_relaxed)), ASSERT_TEXT );
+}
 
-        bool Block::readyToShare() {
-            FreeObject *oldVal = NULL;
+
+bool Block::readyToShare()
+{
+    FreeObject* oldVal = nullptr;
 #if FREELIST_NONBLOCKING
-            publicFreeList.compare_exchange_strong(oldVal, (FreeObject *) UNUSABLE);
+    publicFreeList.compare_exchange_strong(oldVal, (FreeObject*)UNUSABLE);
 #else
-            STAT_increment(getThreadId(), ThreadCommonCounters, lockPublicFreeList);
-            {
-                MallocMutex::scoped_lock scoped_cs(publicFreeListLock);
-                if ((oldVal = publicFreeList) == NULL) (intptr_t &) (publicFreeList) = UNUSABLE;
-            }
+    STAT_increment(getThreadId(), ThreadCommonCounters, lockPublicFreeList);
+    {
+        MallocMutex::scoped_lock scoped_cs(publicFreeListLock);
+        if ( (oldVal=publicFreeList)==nullptr )
+            publicFreeList = reinterpret_cast<FreeObject *>(UNUSABLE);
+    }
 #endif
-            return oldVal == NULL;
-        }
+    return oldVal==nullptr;
+}
 
-        void Block::shareOrphaned(intptr_t binTag, unsigned index) {
-            MALLOC_ASSERT(binTag, ASSERT_TEXT);
-            // unreferenced formal parameter warning
-            tbb::detail::suppress_unused_warning(index);
-            STAT_increment(getThreadId(), index, freeBlockPublic);
-            markOrphaned();
-            if ((intptr_t) nextPrivatizable.load(std::memory_order_relaxed) == binTag) {
-                // First check passed: the block is not in mailbox yet.
-                // Need to set publicFreeList to non-zero, so other threads
-                // will not change nextPrivatizable and it can be zeroed.
-                if (!readyToShare()) {
-                    // another thread freed an object; we need to wait until it finishes.
-                    // There is no need for exponential backoff, as the wait here is not for a lock;
-                    // but need to yield, so the thread we wait has a chance to run.
-                    // TODO: add a pause to also be friendly to hyperthreads
-                    int count = 256;
-                    while ((intptr_t) nextPrivatizable.load(std::memory_order_relaxed) == binTag) {
-                        if (--count == 0) {
-                            do_yield();
-                            count = 256;
-                        }
-                    }
+void Block::shareOrphaned(intptr_t binTag, unsigned index)
+{
+    MALLOC_ASSERT( binTag, ASSERT_TEXT );
+    // unreferenced formal parameter warning
+    tbb::detail::suppress_unused_warning(index);
+    STAT_increment(getThreadId(), index, freeBlockPublic);
+    markOrphaned();
+    if ((intptr_t)nextPrivatizable.load(std::memory_order_relaxed) == binTag) {
+        // First check passed: the block is not in mailbox yet.
+        // Need to set publicFreeList to non-zero, so other threads
+        // will not change nextPrivatizable and it can be zeroed.
+        if ( !readyToShare() ) {
+            // another thread freed an object; we need to wait until it finishes.
+            // There is no need for exponential backoff, as the wait here is not for a lock;
+            // but need to yield, so the thread we wait has a chance to run.
+            // TODO: add a pause to also be friendly to hyperthreads
+            int count = 256;
+            while ((intptr_t)nextPrivatizable.load(std::memory_order_relaxed) == binTag) {
+                if (--count==0) {
+                    do_yield();
+                    count = 256;
                 }
             }
-            MALLOC_ASSERT(publicFreeList.load(std::memory_order_relaxed) != NULL, ASSERT_TEXT);
-            // now it is safe to change our data
-            previous = NULL;
-            // it is caller responsibility to ensure that the list of blocks
-            // formed by nextPrivatizable pointers is kept consistent if required.
-            // if only called from thread shutdown code, it does not matter.
-            nextPrivatizable.store((Block *) UNUSABLE, std::memory_order_relaxed);
         }
+    }
+    MALLOC_ASSERT( publicFreeList.load(std::memory_order_relaxed) !=nullptr, ASSERT_TEXT );
+    // now it is safe to change our data
+    previous = nullptr;
+    // it is caller responsibility to ensure that the list of blocks
+    // formed by nextPrivatizable pointers is kept consistent if required.
+    // if only called from thread shutdown code, it does not matter.
+    nextPrivatizable.store((Block*)UNUSABLE, std::memory_order_relaxed);
+}
 
-        void Block::cleanBlockHeader() {
-            next = nullptr;
-            previous = nullptr;
-            freeList = nullptr;
-            allocatedCount = 0;
-            isFull = false;
-            tlsPtr.store(nullptr, std::memory_order_relaxed);
+void Block::cleanBlockHeader()
+{
+    next = nullptr;
+    previous = nullptr;
+    freeList = nullptr;
+    allocatedCount = 0;
+    isFull = false;
+    tlsPtr.store(nullptr, std::memory_order_relaxed);
 
-            publicFreeList.store(nullptr, std::memory_order_relaxed);
-        }
+    publicFreeList.store(nullptr, std::memory_order_relaxed);
+}
 
-        void Block::initEmptyBlock(TLSData *tls, size_t size) {
-            // Having getIndex and getObjectSize called next to each other
-            // allows better compiler optimization as they basically share the code.
-            unsigned int index = getIndex(size);
-            unsigned int objSz = getObjectSize(size);
-
-            cleanBlockHeader();
-            objectSize = objSz;
-            markOwned(tls);
-            // bump pointer should be prepared for first allocation - thus mode it down to objectSize
-            bumpPtr = (FreeObject *) ((uintptr_t) this + slabSize - objectSize);
-
-            // each block should have the address where the head of the list of "privatizable" blocks is kept
-            // the only exception is a block for boot strap which is initialized when TLS is yet NULL
-            nextPrivatizable.store(tls ? (Block *) (tls->bin + index) : nullptr, std::memory_order_relaxed);
-            TRACEF(("[ScalableMalloc trace] Empty block %p is initialized, owner is %ld, objectSize is %d, "
-                    "bumpPtr is %p\n",
-                    this, tlsPtr.load(std::memory_order_relaxed) ? getThreadId() : -1, objectSize, bumpPtr));
-        }
+void Block::initEmptyBlock(TLSData *tls, size_t size)
+{
+    // Having getIndex and getObjectSize called next to each other
+    // allows better compiler optimization as they basically share the code.
+    unsigned int index = getIndex(size);
+    unsigned int objSz = getObjectSize(size);
+
+    cleanBlockHeader();
+    MALLOC_ASSERT(objSz <= USHRT_MAX, "objSz must not be less 2^16-1");
+    objectSize = objSz;
+    markOwned(tls);
+    // bump pointer should be prepared for first allocation - thus mode it down to objectSize
+    bumpPtr = (FreeObject *)((uintptr_t)this + slabSize - objectSize);
+
+    // each block should have the address where the head of the list of "privatizable" blocks is kept
+    // the only exception is a block for boot strap which is initialized when TLS is yet nullptr
+    nextPrivatizable.store( tls? (Block*)(tls->bin + index) : nullptr, std::memory_order_relaxed);
+    TRACEF(( "[ScalableMalloc trace] Empty block %p is initialized, owner is %ld, objectSize is %d, bumpPtr is %p\n",
+             this, tlsPtr.load(std::memory_order_relaxed) ? getThreadId() : -1, objectSize, bumpPtr ));
+}
 
-        Block *OrphanedBlocks::get(TLSData *tls, unsigned int size) {
-            // TODO: try to use index from getAllocationBin
-            unsigned int index = getIndex(size);
-            Block *block = bins[index].pop();
-            if (block) {
-                MALLOC_ITT_SYNC_ACQUIRED(bins + index);
-                block->privatizeOrphaned(tls, index);
-            }
-            return block;
-        }
+Block *OrphanedBlocks::get(TLSData *tls, unsigned int size)
+{
+    // TODO: try to use index from getAllocationBin
+    unsigned int index = getIndex(size);
+    Block *block = bins[index].pop();
+    if (block) {
+        MALLOC_ITT_SYNC_ACQUIRED(bins+index);
+        block->privatizeOrphaned(tls, index);
+    }
+    return block;
+}
 
-        void OrphanedBlocks::put(intptr_t binTag, Block *block) {
-            unsigned int index = getIndex(block->getSize());
-            block->shareOrphaned(binTag, index);
-            MALLOC_ITT_SYNC_RELEASING(bins + index);
-            bins[index].push(block);
-        }
+void OrphanedBlocks::put(intptr_t binTag, Block *block)
+{
+    unsigned int index = getIndex(block->getSize());
+    block->shareOrphaned(binTag, index);
+    MALLOC_ITT_SYNC_RELEASING(bins+index);
+    bins[index].push(block);
+}
 
-        void OrphanedBlocks::reset() {
-            for (uint32_t i = 0; i < numBlockBinLimit; i++) new (bins + i) LifoList();
-        }
+void OrphanedBlocks::reset()
+{
+    for (uint32_t i=0; i<numBlockBinLimit; i++)
+        new (bins+i) LifoList();
+}
 
-        bool OrphanedBlocks::cleanup(Backend *backend) {
-            bool released = false;
-            for (uint32_t i = 0; i < numBlockBinLimit; i++) {
-                Block *block = bins[i].grab();
-                MALLOC_ITT_SYNC_ACQUIRED(bins + i);
-                while (block) {
-                    Block *next = block->next;
-                    block->privatizePublicFreeList(/*reset=*/false);// do not set publicFreeList to NULL
-                    if (block->empty()) {
-                        block->reset();
-                        // slab blocks in user's pools do not have valid backRefIdx
-                        if (!backend->inUserPool()) removeBackRef(*(block->getBackRefIdx()));
-                        backend->putSlabBlock(block);
-                        released = true;
-                    } else {
-                        MALLOC_ITT_SYNC_RELEASING(bins + i);
-                        bins[i].push(block);
-                    }
-                    block = next;
-                }
+bool OrphanedBlocks::cleanup(Backend* backend)
+{
+    bool released = false;
+    for (uint32_t i=0; i<numBlockBinLimit; i++) {
+        Block* block = bins[i].grab();
+        MALLOC_ITT_SYNC_ACQUIRED(bins+i);
+        while (block) {
+            Block* next = block->next;
+            block->privatizePublicFreeList( /*reset=*/false ); // do not set publicFreeList to nullptr
+            if (block->empty()) {
+                block->reset();
+                // slab blocks in user's pools do not have valid backRefIdx
+                if (!backend->inUserPool())
+                    removeBackRef(*(block->getBackRefIdx()));
+                backend->putSlabBlock(block);
+                released = true;
+            } else {
+                MALLOC_ITT_SYNC_RELEASING(bins+i);
+                bins[i].push(block);
             }
-            return released;
+            block = next;
         }
+    }
+    return released;
+}
 
-        FreeBlockPool::ResOfGet FreeBlockPool::getBlock() {
-            Block *b = head.exchange(NULL);
+FreeBlockPool::ResOfGet FreeBlockPool::getBlock()
+{
+    Block *b = head.exchange(nullptr);
+    bool lastAccessMiss;
+
+    if (b) {
+        size--;
+        Block *newHead = b->next;
+        lastAccessMiss = false;
+        head.store(newHead, std::memory_order_release);
+    } else {
+        lastAccessMiss = true;
+    }
+    return ResOfGet(b, lastAccessMiss);
+}
 
-            if (b) {
-                size--;
-                Block *newHead = b->next;
-                lastAccessMiss = false;
-                head.store(newHead, std::memory_order_release);
-            } else {
-                lastAccessMiss = true;
-            }
-            return ResOfGet(b, lastAccessMiss);
+void FreeBlockPool::returnBlock(Block *block)
+{
+    MALLOC_ASSERT( size <= POOL_HIGH_MARK, ASSERT_TEXT );
+    Block *localHead = head.exchange(nullptr);
+
+    if (!localHead) {
+        size = 0; // head was stolen by externalClean, correct size accordingly
+    } else if (size == POOL_HIGH_MARK) {
+        // release cold blocks and add hot one,
+        // so keep POOL_LOW_MARK-1 blocks and add new block to head
+        Block *headToFree = localHead, *helper;
+        for (int i=0; i<POOL_LOW_MARK-2; i++)
+            headToFree = headToFree->next;
+        Block *last = headToFree;
+        headToFree = headToFree->next;
+        last->next = nullptr;
+        size = POOL_LOW_MARK-1;
+        for (Block *currBl = headToFree; currBl; currBl = helper) {
+            helper = currBl->next;
+            // slab blocks in user's pools do not have valid backRefIdx
+            if (!backend->inUserPool())
+                removeBackRef(currBl->backRefIdx);
+            backend->putSlabBlock(currBl);
         }
+    }
+    size++;
+    block->next = localHead;
+    head.store(block, std::memory_order_release);
+}
 
-        void FreeBlockPool::returnBlock(Block *block) {
-            MALLOC_ASSERT(size <= POOL_HIGH_MARK, ASSERT_TEXT);
-            Block *localHead = head.exchange(NULL);
-
-            if (!localHead) {
-                size = 0;// head was stolen by externalClean, correct size accordingly
-            } else if (size == POOL_HIGH_MARK) {
-                // release cold blocks and add hot one,
-                // so keep POOL_LOW_MARK-1 blocks and add new block to head
-                Block *headToFree = localHead, *helper;
-                for (int i = 0; i < POOL_LOW_MARK - 2; i++) headToFree = headToFree->next;
-                Block *last = headToFree;
-                headToFree = headToFree->next;
-                last->next = NULL;
-                size = POOL_LOW_MARK - 1;
-                for (Block *currBl = headToFree; currBl; currBl = helper) {
-                    helper = currBl->next;
-                    // slab blocks in user's pools do not have valid backRefIdx
-                    if (!backend->inUserPool()) removeBackRef(currBl->backRefIdx);
-                    backend->putSlabBlock(currBl);
-                }
-            }
-            size++;
-            block->next = localHead;
-            head.store(block, std::memory_order_release);
-        }
+bool FreeBlockPool::externalCleanup()
+{
+    Block *helper;
+    bool released = false;
 
-        bool FreeBlockPool::externalCleanup() {
-            Block *helper;
-            bool released = false;
+    for (Block *currBl=head.exchange(nullptr); currBl; currBl=helper) {
+        helper = currBl->next;
+        // slab blocks in user's pools do not have valid backRefIdx
+        if (!backend->inUserPool())
+            removeBackRef(currBl->backRefIdx);
+        backend->putSlabBlock(currBl);
+        released = true;
+    }
+    return released;
+}
 
-            for (Block *currBl = head.exchange(NULL); currBl; currBl = helper) {
-                helper = currBl->next;
-                // slab blocks in user's pools do not have valid backRefIdx
-                if (!backend->inUserPool()) removeBackRef(currBl->backRefIdx);
-                backend->putSlabBlock(currBl);
-                released = true;
-            }
-            return released;
-        }
+/* Prepare the block for returning to FreeBlockPool */
+void Block::reset()
+{
+    // it is caller's responsibility to ensure no data is lost before calling this
+    MALLOC_ASSERT( allocatedCount==0, ASSERT_TEXT );
+    MALLOC_ASSERT( !isSolidPtr(publicFreeList.load(std::memory_order_relaxed)), ASSERT_TEXT );
+    if (!isStartupAllocObject())
+        STAT_increment(getThreadId(), getIndex(objectSize), freeBlockBack);
 
-        /* Prepare the block for returning to FreeBlockPool */
-        void Block::reset() {
-            // it is caller's responsibility to ensure no data is lost before calling this
-            MALLOC_ASSERT(allocatedCount == 0, ASSERT_TEXT);
-            MALLOC_ASSERT(!isSolidPtr(publicFreeList.load(std::memory_order_relaxed)), ASSERT_TEXT);
-            if (!isStartupAllocObject()) STAT_increment(getThreadId(), getIndex(objectSize), freeBlockBack);
+    cleanBlockHeader();
 
-            cleanBlockHeader();
+    nextPrivatizable.store(nullptr, std::memory_order_relaxed);
 
-            nextPrivatizable.store(nullptr, std::memory_order_relaxed);
+    objectSize = 0;
+    // for an empty block, bump pointer should point right after the end of the block
+    bumpPtr = (FreeObject *)((uintptr_t)this + slabSize);
+}
 
-            objectSize = 0;
-            // for an empty block, bump pointer should point right after the end of the block
-            bumpPtr = (FreeObject *) ((uintptr_t) this + slabSize);
-        }
+inline void Bin::setActiveBlock (Block *block)
+{
+//    MALLOC_ASSERT( bin, ASSERT_TEXT );
+    MALLOC_ASSERT( block->isOwnedByCurrentThread(), ASSERT_TEXT );
+    // it is the caller responsibility to keep bin consistence (i.e. ensure this block is in the bin list)
+    activeBlk = block;
+}
 
-        inline void Bin::setActiveBlock(Block *block) {
-            //    MALLOC_ASSERT( bin, ASSERT_TEXT );
-            MALLOC_ASSERT(block->isOwnedByCurrentThread(), ASSERT_TEXT);
-            // it is the caller responsibility to keep bin consistence (i.e. ensure this block is in the bin list)
-            activeBlk = block;
-        }
+inline Block* Bin::setPreviousBlockActive()
+{
+    MALLOC_ASSERT( activeBlk, ASSERT_TEXT );
+    Block* temp = activeBlk->previous;
+    if( temp ) {
+        MALLOC_ASSERT( !(temp->isFull), ASSERT_TEXT );
+        activeBlk = temp;
+    }
+    return temp;
+}
 
-        inline Block *Bin::setPreviousBlockActive() {
-            MALLOC_ASSERT(activeBlk, ASSERT_TEXT);
-            Block *temp = activeBlk->previous;
-            if (temp) {
-                MALLOC_ASSERT(!(temp->isFull), ASSERT_TEXT);
-                activeBlk = temp;
-            }
-            return temp;
-        }
+inline bool Block::isOwnedByCurrentThread() const {
+    return tlsPtr.load(std::memory_order_relaxed) && ownerTid.isCurrentThreadId();
+}
 
-        inline bool Block::isOwnedByCurrentThread() const {
-            return tlsPtr.load(std::memory_order_relaxed) && ownerTid.isCurrentThreadId();
-        }
+FreeObject *Block::findObjectToFree(const void *object) const
+{
+    FreeObject *objectToFree;
+    // Due to aligned allocations, a pointer passed to scalable_free
+    // might differ from the address of internally allocated object.
+    // Small objects however should always be fine.
+    if (objectSize <= maxSegregatedObjectSize)
+        objectToFree = (FreeObject*)object;
+    // "Fitting size" allocations are suspicious if aligned higher than naturally
+    else {
+        if ( ! isAligned(object,2*fittingAlignment) )
+            // TODO: the above check is questionable - it gives false negatives in ~50% cases,
+            //       so might even be slower in average than unconditional use of findAllocatedObject.
+            // here it should be a "real" object
+            objectToFree = (FreeObject*)object;
+        else
+            // here object can be an aligned address, so applying additional checks
+            objectToFree = findAllocatedObject(object);
+        MALLOC_ASSERT( isAligned(objectToFree,fittingAlignment), ASSERT_TEXT );
+    }
+    MALLOC_ASSERT( isProperlyPlaced(objectToFree), ASSERT_TEXT );
 
-        FreeObject *Block::findObjectToFree(const void *object) const {
-            FreeObject *objectToFree;
-            // Due to aligned allocations, a pointer passed to scalable_free
-            // might differ from the address of internally allocated object.
-            // Small objects however should always be fine.
-            if (objectSize <= maxSegregatedObjectSize) objectToFree = (FreeObject *) object;
-            // "Fitting size" allocations are suspicious if aligned higher than naturally
-            else {
-                if (!isAligned(object, 2 * fittingAlignment))
-                    // TODO: the above check is questionable - it gives false negatives in ~50% cases,
-                    //       so might even be slower in average than unconditional use of findAllocatedObject.
-                    // here it should be a "real" object
-                    objectToFree = (FreeObject *) object;
-                else
-                    // here object can be an aligned address, so applying additional checks
-                    objectToFree = findAllocatedObject(object);
-                MALLOC_ASSERT(isAligned(objectToFree, fittingAlignment), ASSERT_TEXT);
-            }
-            MALLOC_ASSERT(isProperlyPlaced(objectToFree), ASSERT_TEXT);
+    return objectToFree;
+}
 
-            return objectToFree;
+void TLSData::release()
+{
+    memPool->extMemPool.allLocalCaches.unregisterThread(this);
+    externalCleanup(/*cleanOnlyUnused=*/false, /*cleanBins=*/false);
+
+    for (unsigned index = 0; index < numBlockBins; index++) {
+        Block *activeBlk = bin[index].getActiveBlock();
+        if (!activeBlk)
+            continue;
+        Block *threadlessBlock = activeBlk->previous;
+        bool syncOnMailbox = false;
+        while (threadlessBlock) {
+            Block *threadBlock = threadlessBlock->previous;
+            if (threadlessBlock->empty()) {
+                /* we destroy the thread, so not use its block pool */
+                memPool->returnEmptyBlock(threadlessBlock, /*poolTheBlock=*/false);
+            } else {
+                memPool->extMemPool.orphanedBlocks.put(intptr_t(bin+index), threadlessBlock);
+                syncOnMailbox = true;
+            }
+            threadlessBlock = threadBlock;
         }
-
-        void TLSData::release() {
-            memPool->extMemPool.allLocalCaches.unregisterThread(this);
-            externalCleanup(/*cleanOnlyUnused=*/false, /*cleanBins=*/false);
-
-            for (unsigned index = 0; index < numBlockBins; index++) {
-                Block *activeBlk = bin[index].getActiveBlock();
-                if (!activeBlk) continue;
-                Block *threadlessBlock = activeBlk->previous;
-                bool syncOnMailbox = false;
-                while (threadlessBlock) {
-                    Block *threadBlock = threadlessBlock->previous;
-                    if (threadlessBlock->empty()) {
-                        /* we destroy the thread, so not use its block pool */
-                        memPool->returnEmptyBlock(threadlessBlock, /*poolTheBlock=*/false);
-                    } else {
-                        memPool->extMemPool.orphanedBlocks.put(intptr_t(bin + index), threadlessBlock);
-                        syncOnMailbox = true;
-                    }
-                    threadlessBlock = threadBlock;
-                }
-                threadlessBlock = activeBlk;
-                while (threadlessBlock) {
-                    Block *threadBlock = threadlessBlock->next;
-                    if (threadlessBlock->empty()) {
-                        /* we destroy the thread, so not use its block pool */
-                        memPool->returnEmptyBlock(threadlessBlock, /*poolTheBlock=*/false);
-                    } else {
-                        memPool->extMemPool.orphanedBlocks.put(intptr_t(bin + index), threadlessBlock);
-                        syncOnMailbox = true;
-                    }
-                    threadlessBlock = threadBlock;
-                }
-                bin[index].resetActiveBlock();
-
-                if (syncOnMailbox) {
-                    // Although, we synchronized on nextPrivatizable inside a block, we still need to
-                    // synchronize on the bin lifetime because the thread releasing an object into the public
-                    // free list is touching the bin (mailbox and mailLock)
-                    MallocMutex::scoped_lock scoped_cs(bin[index].mailLock);
-                }
+        threadlessBlock = activeBlk;
+        while (threadlessBlock) {
+            Block *threadBlock = threadlessBlock->next;
+            if (threadlessBlock->empty()) {
+                /* we destroy the thread, so not use its block pool */
+                memPool->returnEmptyBlock(threadlessBlock, /*poolTheBlock=*/false);
+            } else {
+                memPool->extMemPool.orphanedBlocks.put(intptr_t(bin+index), threadlessBlock);
+                syncOnMailbox = true;
             }
+            threadlessBlock = threadBlock;
+        }
+        bin[index].resetActiveBlock();
+
+        if (syncOnMailbox) {
+            // Although, we synchronized on nextPrivatizable inside a block, we still need to
+            // synchronize on the bin lifetime because the thread releasing an object into the public
+            // free list is touching the bin (mailbox and mailLock)
+            MallocMutex::scoped_lock scoped_cs(bin[index].mailLock);
         }
+    }
+}
+
 
 #if MALLOC_CHECK_RECURSION
-        // TODO: Use dedicated heap for this
+// TODO: Use dedicated heap for this
 
-        /*
+/*
  * It's a special kind of allocation that can be used when malloc is
  * not available (either during startup or when malloc was already called and
  * we are, say, inside pthread_setspecific's call).
@@ -1741,481 +1835,526 @@ namespace rml {
  * TODO: make bump pointer to grow to the same backward direction as all the others.
  */
 
-        class StartupBlock : public Block {
-            size_t availableSize() const { return slabSize - ((uintptr_t) bumpPtr - (uintptr_t) this); }
-            static StartupBlock *getBlock();
-
-        public:
-            static FreeObject *allocate(size_t size);
-            static size_t msize(void *ptr) { return *((size_t *) ptr - 1); }
-            void free(void *ptr);
-        };
-
-        static MallocMutex startupMallocLock;
-        static StartupBlock *firstStartupBlock;
-
-        StartupBlock *StartupBlock::getBlock() {
-            BackRefIdx backRefIdx = BackRefIdx::newBackRef(/*largeObj=*/false);
-            if (backRefIdx.isInvalid()) return NULL;
-
-            StartupBlock *block
-                    = static_cast<StartupBlock *>(defaultMemPool->extMemPool.backend.getSlabBlock(1));
-            if (!block) return NULL;
-
-            block->cleanBlockHeader();
-            setBackRef(backRefIdx, block);
-            block->backRefIdx = backRefIdx;
-            // use startupAllocObjSizeMark to mark objects from startup block marker
-            block->objectSize = startupAllocObjSizeMark;
-            block->bumpPtr = (FreeObject *) ((uintptr_t) block + sizeof(StartupBlock));
-            return block;
-        }
+class StartupBlock : public Block {
+    size_t availableSize() const {
+        return slabSize - ((uintptr_t)bumpPtr - (uintptr_t)this);
+    }
+    static StartupBlock *getBlock();
+public:
+    static FreeObject *allocate(size_t size);
+    static size_t msize(void *ptr) { return *((size_t*)ptr - 1); }
+    void free(void *ptr);
+};
+
+static MallocMutex startupMallocLock;
+static StartupBlock *firstStartupBlock;
+
+StartupBlock *StartupBlock::getBlock()
+{
+    BackRefIdx backRefIdx = BackRefIdx::newBackRef(/*largeObj=*/false);
+    if (backRefIdx.isInvalid()) return nullptr;
+
+    StartupBlock *block = static_cast<StartupBlock*>(
+        defaultMemPool->extMemPool.backend.getSlabBlock(1));
+    if (!block) return nullptr;
+
+    block->cleanBlockHeader();
+    setBackRef(backRefIdx, block);
+    block->backRefIdx = backRefIdx;
+    // use startupAllocObjSizeMark to mark objects from startup block marker
+    block->objectSize = startupAllocObjSizeMark;
+    block->bumpPtr = (FreeObject *)((uintptr_t)block + sizeof(StartupBlock));
+    return block;
+}
 
-        FreeObject *StartupBlock::allocate(size_t size) {
-            FreeObject *result;
-            StartupBlock *newBlock = NULL;
-            bool newBlockUnused = false;
+FreeObject *StartupBlock::allocate(size_t size)
+{
+    FreeObject *result;
+    StartupBlock *newBlock = nullptr;
 
-            /* Objects must be aligned on their natural bounds,
+    /* Objects must be aligned on their natural bounds,
        and objects bigger than word on word's bound. */
-            size = alignUp(size, sizeof(size_t));
-            // We need size of an object to implement msize.
-            size_t reqSize = size + sizeof(size_t);
-            {
-                MallocMutex::scoped_lock scoped_cs(startupMallocLock);
-                // Re-check whether we need a new block (conditions might have changed)
-                if (!firstStartupBlock || firstStartupBlock->availableSize() < reqSize) {
-                    if (!newBlock) {
-                        newBlock = StartupBlock::getBlock();
-                        if (!newBlock) return NULL;
-                    }
-                    newBlock->next = (Block *) firstStartupBlock;
-                    if (firstStartupBlock) firstStartupBlock->previous = (Block *) newBlock;
-                    firstStartupBlock = newBlock;
-                }
-                result = firstStartupBlock->bumpPtr;
-                firstStartupBlock->allocatedCount++;
-                firstStartupBlock->bumpPtr
-                        = (FreeObject *) ((uintptr_t) firstStartupBlock->bumpPtr + reqSize);
-            }
+    size = alignUp(size, sizeof(size_t));
+    // We need size of an object to implement msize.
+    size_t reqSize = size + sizeof(size_t);
+    {
+        MallocMutex::scoped_lock scoped_cs(startupMallocLock);
+        // Re-check whether we need a new block (conditions might have changed)
+        if (!firstStartupBlock || firstStartupBlock->availableSize() < reqSize) {
+            if (!newBlock) {
+                newBlock = StartupBlock::getBlock();
+                if (!newBlock) return nullptr;
+            }
+            newBlock->next = (Block*)firstStartupBlock;
+            if (firstStartupBlock)
+                firstStartupBlock->previous = (Block*)newBlock;
+            firstStartupBlock = newBlock;
+        }
+        result = firstStartupBlock->bumpPtr;
+        firstStartupBlock->allocatedCount++;
+        firstStartupBlock->bumpPtr =
+            (FreeObject *)((uintptr_t)firstStartupBlock->bumpPtr + reqSize);
+    }
 
-            // keep object size at the negative offset
-            *((size_t *) result) = size;
-            return (FreeObject *) ((size_t *) result + 1);
-        }
+    // keep object size at the negative offset
+    *((size_t*)result) = size;
+    return (FreeObject*)((size_t*)result+1);
+}
 
-        void StartupBlock::free(void *ptr) {
-            Block *blockToRelease = NULL;
-            {
-                MallocMutex::scoped_lock scoped_cs(startupMallocLock);
-
-                MALLOC_ASSERT(firstStartupBlock, ASSERT_TEXT);
-                MALLOC_ASSERT(startupAllocObjSizeMark == objectSize && allocatedCount > 0, ASSERT_TEXT);
-                MALLOC_ASSERT((uintptr_t) ptr >= (uintptr_t) this + sizeof(StartupBlock)
-                                      && (uintptr_t) ptr + StartupBlock::msize(ptr)
-                                                 <= (uintptr_t) this + slabSize,
-                              ASSERT_TEXT);
-                if (0 == --allocatedCount) {
-                    if (this == firstStartupBlock)
-                        firstStartupBlock = (StartupBlock *) firstStartupBlock->next;
-                    if (previous) previous->next = next;
-                    if (next) next->previous = previous;
-                    blockToRelease = this;
-                } else if ((uintptr_t) ptr + StartupBlock::msize(ptr) == (uintptr_t) bumpPtr) {
-                    // last object in the block released
-                    FreeObject *newBump = (FreeObject *) ((size_t *) ptr - 1);
-                    MALLOC_ASSERT((uintptr_t) newBump > (uintptr_t) this + sizeof(StartupBlock), ASSERT_TEXT);
-                    bumpPtr = newBump;
-                }
-            }
-            if (blockToRelease) {
-                blockToRelease->previous = blockToRelease->next = NULL;
-                defaultMemPool->returnEmptyBlock(blockToRelease, /*poolTheBlock=*/false);
-            }
+void StartupBlock::free(void *ptr)
+{
+    Block* blockToRelease = nullptr;
+    {
+        MallocMutex::scoped_lock scoped_cs(startupMallocLock);
+
+        MALLOC_ASSERT(firstStartupBlock, ASSERT_TEXT);
+        MALLOC_ASSERT(startupAllocObjSizeMark==objectSize
+                      && allocatedCount>0, ASSERT_TEXT);
+        MALLOC_ASSERT((uintptr_t)ptr>=(uintptr_t)this+sizeof(StartupBlock)
+                      && (uintptr_t)ptr+StartupBlock::msize(ptr)<=(uintptr_t)this+slabSize,
+                      ASSERT_TEXT);
+        if (0 == --allocatedCount) {
+            if (this == firstStartupBlock)
+                firstStartupBlock = (StartupBlock*)firstStartupBlock->next;
+            if (previous)
+                previous->next = next;
+            if (next)
+                next->previous = previous;
+            blockToRelease = this;
+        } else if ((uintptr_t)ptr + StartupBlock::msize(ptr) == (uintptr_t)bumpPtr) {
+            // last object in the block released
+            FreeObject *newBump = (FreeObject*)((size_t*)ptr - 1);
+            MALLOC_ASSERT((uintptr_t)newBump>(uintptr_t)this+sizeof(StartupBlock),
+                          ASSERT_TEXT);
+            bumpPtr = newBump;
         }
+    }
+    if (blockToRelease) {
+        blockToRelease->previous = blockToRelease->next = nullptr;
+        defaultMemPool->returnEmptyBlock(blockToRelease, /*poolTheBlock=*/false);
+    }
+}
 
 #endif /* MALLOC_CHECK_RECURSION */
 
-        /********* End thread related code  *************/
+/********* End thread related code  *************/
 
-        /********* Library initialization *************/
+/********* Library initialization *************/
 
-        //! Value indicating the state of initialization.
-        /* 0 = initialization not started.
+//! Value indicating the state of initialization.
+/* 0 = initialization not started.
  * 1 = initialization started but not finished.
  * 2 = initialization finished.
  * In theory, we only need values 0 and 2. But value 1 is nonetheless
  * useful for detecting errors in the double-check pattern.
  */
-        static std::atomic<intptr_t> mallocInitialized {0};// implicitly initialized to 0
-        static MallocMutex initMutex;
+static std::atomic<intptr_t> mallocInitialized{0};   // implicitly initialized to 0
+static MallocMutex initMutex;
 
-        /** The leading "\0" is here so that applying "strings" to the binary
+/** The leading "\0" is here so that applying "strings" to the binary
     delivers a clean result. */
-        static char VersionString[] = "\0" TBBMALLOC_VERSION_STRINGS;
+static char VersionString[] = "\0" TBBMALLOC_VERSION_STRINGS;
 
 #if USE_PTHREAD && __TBB_SOURCE_DIRECTLY_INCLUDED
 
-        /* Decrease race interval between dynamic library unloading and pthread key
+/* Decrease race interval between dynamic library unloading and pthread key
    destructor. Protect only Pthreads with supported unloading. */
-        class ShutdownSync {
-            /* flag is the number of threads in pthread key dtor body
+class ShutdownSync {
+/* flag is the number of threads in pthread key dtor body
    (i.e., between threadDtorStart() and threadDtorDone())
    or the signal to skip dtor, if flag < 0 */
-            std::atomic<intptr_t> flag;
-            static const intptr_t skipDtor = INTPTR_MIN / 2;
-
-        public:
-            void init() { flag.store(0, std::memory_order_release); }
-            /* Suppose that 2*abs(skipDtor) or more threads never call threadDtorStart()
+    std::atomic<intptr_t> flag;
+    static const intptr_t skipDtor = INTPTR_MIN/2;
+public:
+    void init() { flag.store(0, std::memory_order_release); }
+/* Suppose that 2*abs(skipDtor) or more threads never call threadDtorStart()
    simultaneously, so flag never becomes negative because of that. */
-            bool threadDtorStart() {
-                if (flag.load(std::memory_order_acquire) < 0) return false;
-                if (++flag <= 0) {    // note that new value returned
-                    flag.fetch_sub(1);// flag is spoiled by us, restore it
-                    return false;
-                }
-                return true;
-            }
-            void threadDtorDone() { flag.fetch_sub(1); }
-            void processExit() {
-                if (flag.fetch_add(skipDtor) != 0) { SpinWaitUntilEq(flag, skipDtor); }
-            }
-        };
+    bool threadDtorStart() {
+        if (flag.load(std::memory_order_acquire) < 0)
+            return false;
+        if (++flag <= 0) { // note that new value returned
+            flag.fetch_sub(1); // flag is spoiled by us, restore it
+            return false;
+        }
+        return true;
+    }
+    void threadDtorDone() {
+        flag.fetch_sub(1);
+    }
+    void processExit() {
+        if (flag.fetch_add(skipDtor) != 0) {
+            SpinWaitUntilEq(flag, skipDtor);
+        }
+    }
+};
 
 #else
 
-        class ShutdownSync {
-        public:
-            void init() {}
-            bool threadDtorStart() { return true; }
-            void threadDtorDone() {}
-            void processExit() {}
-        };
+class ShutdownSync {
+public:
+    void init() { }
+    bool threadDtorStart() { return true; }
+    void threadDtorDone() { }
+    void processExit() { }
+};
 
-#endif// USE_PTHREAD && __TBB_SOURCE_DIRECTLY_INCLUDED
+#endif // USE_PTHREAD && __TBB_SOURCE_DIRECTLY_INCLUDED
 
-        static ShutdownSync shutdownSync;
+static ShutdownSync shutdownSync;
 
-        inline bool isMallocInitialized() {
-            // Load must have acquire fence; otherwise thread taking "initialized" path
-            // might perform textually later loads *before* mallocInitialized becomes 2.
-            return 2 == mallocInitialized.load(std::memory_order_acquire);
-        }
+inline bool isMallocInitialized() {
+    // Load must have acquire fence; otherwise thread taking "initialized" path
+    // might perform textually later loads *before* mallocInitialized becomes 2.
+    return 2 == mallocInitialized.load(std::memory_order_acquire);
+}
 
-        /* Caller is responsible for ensuring this routine is called exactly once. */
-        extern "C" void MallocInitializeITT() {
+/* Caller is responsible for ensuring this routine is called exactly once. */
+extern "C" void MallocInitializeITT() {
 #if __TBB_USE_ITT_NOTIFY
-            if (!usedBySrcIncluded) tbb::detail::r1::__TBB_load_ittnotify();
+    if (!usedBySrcIncluded)
+        tbb::detail::r1::__TBB_load_ittnotify();
 #endif
-        }
+}
 
-        void MemoryPool::initDefaultPool() { hugePages.init(); }
+void MemoryPool::initDefaultPool() {
+    hugePages.init();
+}
 
-        /*
+/*
  * Allocator initialization routine;
  * it is called lazily on the very first scalable_malloc call.
  */
-        static bool initMemoryManager() {
-            TRACEF(("[ScalableMalloc trace] sizeof(Block) is %d (expected 128); sizeof(uintptr_t) is %d\n",
-                    sizeof(Block), sizeof(uintptr_t)));
-            MALLOC_ASSERT(2 * blockHeaderAlignment == sizeof(Block), ASSERT_TEXT);
-            MALLOC_ASSERT(sizeof(FreeObject) == sizeof(void *), ASSERT_TEXT);
-            MALLOC_ASSERT(isAligned(defaultMemPool, sizeof(intptr_t)),
-                          "Memory pool must be void*-aligned for atomic to work over aligned arguments.");
+static bool initMemoryManager()
+{
+    TRACEF(( "[ScalableMalloc trace] sizeof(Block) is %d (expected 128); sizeof(uintptr_t) is %d\n",
+             sizeof(Block), sizeof(uintptr_t) ));
+    MALLOC_ASSERT( 2*blockHeaderAlignment == sizeof(Block), ASSERT_TEXT );
+    MALLOC_ASSERT( sizeof(FreeObject) == sizeof(void*), ASSERT_TEXT );
+    MALLOC_ASSERT( isAligned(defaultMemPool, sizeof(intptr_t)),
+                   "Memory pool must be void*-aligned for atomic to work over aligned arguments.");
 
 #if USE_WINTHREAD
-            const size_t granularity = 64 * 1024;// granulatity of VirtualAlloc
+    const size_t granularity = 64*1024; // granulatity of VirtualAlloc
 #else
-            // POSIX.1-2001-compliant way to get page size
-            const size_t granularity = sysconf(_SC_PAGESIZE);
+    // POSIX.1-2001-compliant way to get page size
+    const size_t granularity = sysconf(_SC_PAGESIZE);
 #endif
-            if (!defaultMemPool) {
-                // Do not rely on static constructors and do the assignment in case
-                // of library static section not initialized at this call yet.
-                defaultMemPool = (MemoryPool *) defaultMemPool_space;
-            }
-            bool initOk = defaultMemPool->extMemPool.init(0, NULL, NULL, granularity,
-                                                          /*keepAllMemory=*/false, /*fixedPool=*/false);
-            // TODO: extMemPool.init() to not allocate memory
-            if (!initOk || !initBackRefMain(&defaultMemPool->extMemPool.backend) || !ThreadId::init())
-                return false;
-            MemoryPool::initDefaultPool();
-            // init() is required iff initMemoryManager() is called
-            // after mallocProcessShutdownNotification()
-            shutdownSync.init();
+    if (!defaultMemPool) {
+        // Do not rely on static constructors and do the assignment in case
+        // of library static section not initialized at this call yet.
+        defaultMemPool = (MemoryPool*)defaultMemPool_space;
+    }
+    bool initOk = defaultMemPool->
+        extMemPool.init(0, nullptr, nullptr, granularity,
+                        /*keepAllMemory=*/false, /*fixedPool=*/false);
+// TODO: extMemPool.init() to not allocate memory
+    if (!initOk || !initBackRefMain(&defaultMemPool->extMemPool.backend) || !ThreadId::init())
+        return false;
+    MemoryPool::initDefaultPool();
+    // init() is required iff initMemoryManager() is called
+    // after mallocProcessShutdownNotification()
+    shutdownSync.init();
 #if COLLECT_STATISTICS
-            initStatisticsCollection();
+    initStatisticsCollection();
 #endif
-            return true;
-        }
+    return true;
+}
 
-        static bool GetBoolEnvironmentVariable(const char *name) {
-            return tbb::detail::r1::GetBoolEnvironmentVariable(name);
-        }
+static bool GetBoolEnvironmentVariable(const char* name) {
+    return tbb::detail::r1::GetBoolEnvironmentVariable(name);
+}
 
-        //! Ensures that initMemoryManager() is called once and only once.
-        /** Does not return until initMemoryManager() has been completed by a thread.
+//! Ensures that initMemoryManager() is called once and only once.
+/** Does not return until initMemoryManager() has been completed by a thread.
     There is no need to call this routine if mallocInitialized==2 . */
-        static bool doInitialization() {
-            MallocMutex::scoped_lock lock(initMutex);
-            if (mallocInitialized.load(std::memory_order_relaxed) != 2) {
-                MALLOC_ASSERT(mallocInitialized.load(std::memory_order_relaxed) == 0, ASSERT_TEXT);
-                mallocInitialized.store(1, std::memory_order_relaxed);
-                RecursiveMallocCallProtector scoped;
-                if (!initMemoryManager()) {
-                    mallocInitialized.store(0, std::memory_order_relaxed);// restore and out
-                    return false;
-                }
-#ifdef MALLOC_EXTRA_INITIALIZATION
-                MALLOC_EXTRA_INITIALIZATION;
+static bool doInitialization()
+{
+    MallocMutex::scoped_lock lock( initMutex );
+    if (mallocInitialized.load(std::memory_order_relaxed)!=2) {
+        MALLOC_ASSERT( mallocInitialized.load(std::memory_order_relaxed)==0, ASSERT_TEXT );
+        mallocInitialized.store(1, std::memory_order_relaxed);
+        RecursiveMallocCallProtector scoped;
+        if (!initMemoryManager()) {
+            mallocInitialized.store(0, std::memory_order_relaxed); // restore and out
+            return false;
+        }
+#ifdef  MALLOC_EXTRA_INITIALIZATION
+        MALLOC_EXTRA_INITIALIZATION;
 #endif
 #if MALLOC_CHECK_RECURSION
-                RecursiveMallocCallProtector::detectNaiveOverload();
+        RecursiveMallocCallProtector::detectNaiveOverload();
 #endif
-                MALLOC_ASSERT(mallocInitialized.load(std::memory_order_relaxed) == 1, ASSERT_TEXT);
-                // Store must have release fence, otherwise mallocInitialized==2
-                // might become remotely visible before side effects of
-                // initMemoryManager() become remotely visible.
-                mallocInitialized.store(2, std::memory_order_release);
-                if (GetBoolEnvironmentVariable("TBB_VERSION")) {
-                    fputs(VersionString + 1, stderr);
-                    hugePages.printStatus();
-                }
-            }
-            /* It can't be 0 or I would have initialized it */
-            MALLOC_ASSERT(mallocInitialized.load(std::memory_order_relaxed) == 2, ASSERT_TEXT);
-            return true;
+        MALLOC_ASSERT( mallocInitialized.load(std::memory_order_relaxed)==1, ASSERT_TEXT );
+        // Store must have release fence, otherwise mallocInitialized==2
+        // might become remotely visible before side effects of
+        // initMemoryManager() become remotely visible.
+        mallocInitialized.store(2, std::memory_order_release);
+        if( GetBoolEnvironmentVariable("TBB_VERSION") ) {
+            fputs(VersionString+1,stderr);
+            hugePages.printStatus();
         }
+    }
+    /* It can't be 0 or I would have initialized it */
+    MALLOC_ASSERT( mallocInitialized.load(std::memory_order_relaxed)==2, ASSERT_TEXT );
+    return true;
+}
 
-        /********* End library initialization *************/
+/********* End library initialization *************/
 
-        /********* The malloc show begins     *************/
+/********* The malloc show begins     *************/
 
-        FreeObject *Block::allocateFromFreeList() {
-            FreeObject *result;
 
-            if (!freeList) return NULL;
+FreeObject *Block::allocateFromFreeList()
+{
+    FreeObject *result;
 
-            result = freeList;
-            MALLOC_ASSERT(result, ASSERT_TEXT);
+    if (!freeList) return nullptr;
 
-            freeList = result->next;
-            MALLOC_ASSERT(allocatedCount < (slabSize - sizeof(Block)) / objectSize, ASSERT_TEXT);
-            allocatedCount++;
-            STAT_increment(getThreadId(), getIndex(objectSize), allocFreeListUsed);
+    result = freeList;
+    MALLOC_ASSERT( result, ASSERT_TEXT );
 
-            return result;
-        }
+    freeList = result->next;
+    MALLOC_ASSERT( allocatedCount < (slabSize-sizeof(Block))/objectSize, ASSERT_TEXT );
+    allocatedCount++;
+    STAT_increment(getThreadId(), getIndex(objectSize), allocFreeListUsed);
 
-        FreeObject *Block::allocateFromBumpPtr() {
-            FreeObject *result = bumpPtr;
-            if (result) {
-                bumpPtr = (FreeObject *) ((uintptr_t) bumpPtr - objectSize);
-                if ((uintptr_t) bumpPtr < (uintptr_t) this + sizeof(Block)) { bumpPtr = NULL; }
-                MALLOC_ASSERT(allocatedCount < (slabSize - sizeof(Block)) / objectSize, ASSERT_TEXT);
-                allocatedCount++;
-                STAT_increment(getThreadId(), getIndex(objectSize), allocBumpPtrUsed);
-            }
-            return result;
-        }
+    return result;
+}
+
+FreeObject *Block::allocateFromBumpPtr()
+{
+    FreeObject *result = bumpPtr;
+    if (result) {
+        bumpPtr = (FreeObject *) ((uintptr_t) bumpPtr - objectSize);
+        if ( (uintptr_t)bumpPtr < (uintptr_t)this+sizeof(Block) ) {
+            bumpPtr = nullptr;
+        }
+        MALLOC_ASSERT( allocatedCount < (slabSize-sizeof(Block))/objectSize, ASSERT_TEXT );
+        allocatedCount++;
+        STAT_increment(getThreadId(), getIndex(objectSize), allocBumpPtrUsed);
+    }
+    return result;
+}
 
-        inline FreeObject *Block::allocate() {
-            MALLOC_ASSERT(isOwnedByCurrentThread(), ASSERT_TEXT);
+inline FreeObject* Block::allocate()
+{
+    MALLOC_ASSERT( isOwnedByCurrentThread(), ASSERT_TEXT );
 
-            /* for better cache locality, first looking in the free list. */
-            if (FreeObject *result = allocateFromFreeList()) { return result; }
-            MALLOC_ASSERT(!freeList, ASSERT_TEXT);
+    /* for better cache locality, first looking in the free list. */
+    if ( FreeObject *result = allocateFromFreeList() ) {
+        return result;
+    }
+    MALLOC_ASSERT( !freeList, ASSERT_TEXT );
 
-            /* if free list is empty, try thread local bump pointer allocation. */
-            if (FreeObject *result = allocateFromBumpPtr()) { return result; }
-            MALLOC_ASSERT(!bumpPtr, ASSERT_TEXT);
+    /* if free list is empty, try thread local bump pointer allocation. */
+    if ( FreeObject *result = allocateFromBumpPtr() ) {
+        return result;
+    }
+    MALLOC_ASSERT( !bumpPtr, ASSERT_TEXT );
 
-            /* the block is considered full. */
-            isFull = true;
-            return NULL;
-        }
+    /* the block is considered full. */
+    isFull = true;
+    return nullptr;
+}
 
-        size_t Block::findObjectSize(void *object) const {
-            size_t blSize = getSize();
+size_t Block::findObjectSize(void *object) const
+{
+    size_t blSize = getSize();
 #if MALLOC_CHECK_RECURSION
-            // Currently, there is no aligned allocations from startup blocks,
-            // so we can return just StartupBlock::msize().
-            // TODO: This must be extended if we add aligned allocation from startup blocks.
-            if (!blSize) return StartupBlock::msize(object);
+    // Currently, there is no aligned allocations from startup blocks,
+    // so we can return just StartupBlock::msize().
+    // TODO: This must be extended if we add aligned allocation from startup blocks.
+    if (!blSize)
+        return StartupBlock::msize(object);
 #endif
-            // object can be aligned, so real size can be less than block's
-            size_t size = blSize - ((uintptr_t) object - (uintptr_t) findObjectToFree(object));
-            MALLOC_ASSERT(size > 0 && size < minLargeObjectSize, ASSERT_TEXT);
-            return size;
-        }
-
-        void Bin::moveBlockToFront(Block *block) {
-            /* move the block to the front of the bin */
-            if (block == activeBlk) return;
-            outofTLSBin(block);
-            pushTLSBin(block);
-        }
-
-        void Bin::processEmptyBlock(Block *block, bool poolTheBlock) {
-            if (block != activeBlk) {
-                /* We are not using this block; return it to the pool */
-                outofTLSBin(block);
-                block->getMemPool()->returnEmptyBlock(block, poolTheBlock);
-            } else {
-                /* all objects are free - let's restore the bump pointer */
-                block->restoreBumpPtr();
-            }
-        }
-
-        template <int LOW_MARK, int HIGH_MARK>
-        bool LocalLOCImpl<LOW_MARK, HIGH_MARK>::put(LargeMemoryBlock *object, ExtMemoryPool *extMemPool) {
-            const size_t size = object->unalignedSize;
-            // not spoil cache with too large object, that can cause its total cleanup
-            if (size > MAX_TOTAL_SIZE) return false;
-            LargeMemoryBlock *localHead = head.exchange(NULL);
-
-            object->prev = NULL;
-            object->next = localHead;
-            if (localHead) localHead->prev = object;
-            else {
-                // those might not be cleaned during local cache stealing, correct them
-                totalSize = 0;
-                numOfBlocks = 0;
-                tail = object;
-            }
-            localHead = object;
-            totalSize += size;
-            numOfBlocks++;
-            // must meet both size and number of cached objects constrains
-            if (totalSize > MAX_TOTAL_SIZE || numOfBlocks >= HIGH_MARK) {
-                // scanning from tail until meet conditions
-                while (totalSize > MAX_TOTAL_SIZE || numOfBlocks > LOW_MARK) {
-                    totalSize -= tail->unalignedSize;
-                    numOfBlocks--;
-                    tail = tail->prev;
-                }
-                LargeMemoryBlock *headToRelease = tail->next;
-                tail->next = NULL;
+    // object can be aligned, so real size can be less than block's
+    size_t size =
+        blSize - ((uintptr_t)object - (uintptr_t)findObjectToFree(object));
+    MALLOC_ASSERT(size>0 && size<minLargeObjectSize, ASSERT_TEXT);
+    return size;
+}
 
-                extMemPool->freeLargeObjectList(headToRelease);
-            }
+void Bin::moveBlockToFront(Block *block)
+{
+    /* move the block to the front of the bin */
+    if (block == activeBlk) return;
+    outofTLSBin(block);
+    pushTLSBin(block);
+}
 
-            head.store(localHead, std::memory_order_release);
-            return true;
-        }
+void Bin::processEmptyBlock(Block *block, bool poolTheBlock)
+{
+    if (block != activeBlk) {
+        /* We are not using this block; return it to the pool */
+        outofTLSBin(block);
+        block->getMemPool()->returnEmptyBlock(block, poolTheBlock);
+    } else {
+        /* all objects are free - let's restore the bump pointer */
+        block->restoreBumpPtr();
+    }
+}
 
-        template <int LOW_MARK, int HIGH_MARK>
-        LargeMemoryBlock *LocalLOCImpl<LOW_MARK, HIGH_MARK>::get(size_t size) {
-            LargeMemoryBlock *localHead, *res = NULL;
+template<int LOW_MARK, int HIGH_MARK>
+bool LocalLOCImpl<LOW_MARK, HIGH_MARK>::put(LargeMemoryBlock *object, ExtMemoryPool *extMemPool)
+{
+    const size_t size = object->unalignedSize;
+    // not spoil cache with too large object, that can cause its total cleanup
+    if (size > MAX_TOTAL_SIZE)
+        return false;
+    LargeMemoryBlock *localHead = head.exchange(nullptr);
+
+    object->prev = nullptr;
+    object->next = localHead;
+    if (localHead)
+        localHead->prev = object;
+    else {
+        // those might not be cleaned during local cache stealing, correct them
+        totalSize = 0;
+        numOfBlocks = 0;
+        tail = object;
+    }
+    localHead = object;
+    totalSize += size;
+    numOfBlocks++;
+    // must meet both size and number of cached objects constrains
+    if (totalSize > MAX_TOTAL_SIZE || numOfBlocks >= HIGH_MARK) {
+        // scanning from tail until meet conditions
+        while (totalSize > MAX_TOTAL_SIZE || numOfBlocks > LOW_MARK) {
+            totalSize -= tail->unalignedSize;
+            numOfBlocks--;
+            tail = tail->prev;
+        }
+        LargeMemoryBlock *headToRelease = tail->next;
+        tail->next = nullptr;
+
+        extMemPool->freeLargeObjectList(headToRelease);
+    }
 
-            if (size > MAX_TOTAL_SIZE) return NULL;
+    head.store(localHead, std::memory_order_release);
+    return true;
+}
 
-            // TBB_REVAMP_TODO: review this line
-            if (!head.load(std::memory_order_acquire) || (localHead = head.exchange(NULL)) == NULL) {
-                // do not restore totalSize, numOfBlocks and tail at this point,
-                // as they are used only in put(), where they must be restored
-                return NULL;
-            }
+template<int LOW_MARK, int HIGH_MARK>
+LargeMemoryBlock *LocalLOCImpl<LOW_MARK, HIGH_MARK>::get(size_t size)
+{
+    LargeMemoryBlock *localHead, *res = nullptr;
 
-            for (LargeMemoryBlock *curr = localHead; curr; curr = curr->next) {
-                if (curr->unalignedSize == size) {
-                    res = curr;
-                    if (curr->next) curr->next->prev = curr->prev;
-                    else
-                        tail = curr->prev;
-                    if (curr != localHead) curr->prev->next = curr->next;
-                    else
-                        localHead = curr->next;
-                    totalSize -= size;
-                    numOfBlocks--;
-                    break;
-                }
-            }
+    if (size > MAX_TOTAL_SIZE)
+        return nullptr;
 
-            head.store(localHead, std::memory_order_release);
-            return res;
-        }
+    // TBB_REVAMP_TODO: review this line
+    if (!head.load(std::memory_order_acquire) || (localHead = head.exchange(nullptr)) == nullptr) {
+        // do not restore totalSize, numOfBlocks and tail at this point,
+        // as they are used only in put(), where they must be restored
+        return nullptr;
+    }
 
-        template <int LOW_MARK, int HIGH_MARK>
-        bool LocalLOCImpl<LOW_MARK, HIGH_MARK>::externalCleanup(ExtMemoryPool *extMemPool) {
-            if (LargeMemoryBlock *localHead = head.exchange(NULL)) {
-                extMemPool->freeLargeObjectList(localHead);
-                return true;
-            }
-            return false;
+    for (LargeMemoryBlock *curr = localHead; curr; curr=curr->next) {
+        if (curr->unalignedSize == size) {
+            res = curr;
+            if (curr->next)
+                curr->next->prev = curr->prev;
+            else
+                tail = curr->prev;
+            if (curr != localHead)
+                curr->prev->next = curr->next;
+            else
+                localHead = curr->next;
+            totalSize -= size;
+            numOfBlocks--;
+            break;
         }
+    }
 
-        void *MemoryPool::getFromLLOCache(TLSData *tls, size_t size, size_t alignment) {
-            LargeMemoryBlock *lmb = NULL;
-
-            size_t headersSize = sizeof(LargeMemoryBlock) + sizeof(LargeObjectHdr);
-            size_t allocationSize = LargeObjectCache::alignToBin(size + headersSize + alignment);
-            if (allocationSize < size)// allocationSize is wrapped around after alignToBin
-                return NULL;
-            MALLOC_ASSERT(allocationSize >= alignment, "Overflow must be checked before.");
+    head.store(localHead, std::memory_order_release);
+    return res;
+}
 
-            if (tls) {
-                tls->markUsed();
-                lmb = tls->lloc.get(allocationSize);
-            }
-            if (!lmb) lmb = extMemPool.mallocLargeObject(this, allocationSize);
-
-            if (lmb) {
-                // doing shuffle we suppose that alignment offset guarantees
-                // that different cache lines are in use
-                MALLOC_ASSERT(alignment >= estimatedCacheLineSize, ASSERT_TEXT);
-
-                void *alignedArea = (void *) alignUp((uintptr_t) lmb + headersSize, alignment);
-                uintptr_t alignedRight = alignDown((uintptr_t) lmb + lmb->unalignedSize - size, alignment);
-                // Has some room to shuffle object between cache lines?
-                // Note that alignedRight and alignedArea are aligned at alignment.
-                unsigned ptrDelta = alignedRight - (uintptr_t) alignedArea;
-                if (ptrDelta && tls) {// !tls is cold path
-                    // for the hot path of alignment==estimatedCacheLineSize,
-                    // allow compilers to use shift for division
-                    // (since estimatedCacheLineSize is a power-of-2 constant)
-                    unsigned numOfPossibleOffsets = alignment == estimatedCacheLineSize
-                                                            ? ptrDelta / estimatedCacheLineSize
-                                                            : ptrDelta / alignment;
-                    unsigned myCacheIdx = ++tls->currCacheIdx;
-                    unsigned offset = myCacheIdx % numOfPossibleOffsets;
-
-                    // Move object to a cache line with an offset that is different from
-                    // previous allocation. This supposedly allows us to use cache
-                    // associativity more efficiently.
-                    alignedArea = (void *) ((uintptr_t) alignedArea + offset * alignment);
-                }
-                MALLOC_ASSERT((uintptr_t) lmb + lmb->unalignedSize >= (uintptr_t) alignedArea + size,
-                              "Object doesn't fit the block.");
-                LargeObjectHdr *header = (LargeObjectHdr *) alignedArea - 1;
-                header->memoryBlock = lmb;
-                header->backRefIdx = lmb->backRefIdx;
-                setBackRef(header->backRefIdx, header);
+template<int LOW_MARK, int HIGH_MARK>
+bool LocalLOCImpl<LOW_MARK, HIGH_MARK>::externalCleanup(ExtMemoryPool *extMemPool)
+{
+    if (LargeMemoryBlock *localHead = head.exchange(nullptr)) {
+        extMemPool->freeLargeObjectList(localHead);
+        return true;
+    }
+    return false;
+}
 
-                lmb->objectSize = size;
+void *MemoryPool::getFromLLOCache(TLSData* tls, size_t size, size_t alignment)
+{
+    LargeMemoryBlock *lmb = nullptr;
 
-                MALLOC_ASSERT(isLargeObject<unknownMem>(alignedArea), ASSERT_TEXT);
-                MALLOC_ASSERT(isAligned(alignedArea, alignment), ASSERT_TEXT);
+    size_t headersSize = sizeof(LargeMemoryBlock)+sizeof(LargeObjectHdr);
+    size_t allocationSize = LargeObjectCache::alignToBin(size+headersSize+alignment);
+    if (allocationSize < size) // allocationSize is wrapped around after alignToBin
+        return nullptr;
+    MALLOC_ASSERT(allocationSize >= alignment, "Overflow must be checked before.");
 
-                return alignedArea;
-            }
-            return NULL;
-        }
+    if (tls) {
+        tls->markUsed();
+        lmb = tls->lloc.get(allocationSize);
+    }
+    if (!lmb)
+        lmb = extMemPool.mallocLargeObject(this, allocationSize);
+
+    if (lmb) {
+        // doing shuffle we suppose that alignment offset guarantees
+        // that different cache lines are in use
+        MALLOC_ASSERT(alignment >= estimatedCacheLineSize, ASSERT_TEXT);
+
+        void *alignedArea = (void*)alignUp((uintptr_t)lmb+headersSize, alignment);
+        uintptr_t alignedRight =
+            alignDown((uintptr_t)lmb+lmb->unalignedSize - size, alignment);
+        // Has some room to shuffle object between cache lines?
+        // Note that alignedRight and alignedArea are aligned at alignment.
+        unsigned ptrDelta = alignedRight - (uintptr_t)alignedArea;
+        if (ptrDelta && tls) { // !tls is cold path
+            // for the hot path of alignment==estimatedCacheLineSize,
+            // allow compilers to use shift for division
+            // (since estimatedCacheLineSize is a power-of-2 constant)
+            unsigned numOfPossibleOffsets = alignment == estimatedCacheLineSize?
+                  ptrDelta / estimatedCacheLineSize :
+                  ptrDelta / alignment;
+            unsigned myCacheIdx = ++tls->currCacheIdx;
+            unsigned offset = myCacheIdx % numOfPossibleOffsets;
+
+            // Move object to a cache line with an offset that is different from
+            // previous allocation. This supposedly allows us to use cache
+            // associativity more efficiently.
+            alignedArea = (void*)((uintptr_t)alignedArea + offset*alignment);
+        }
+        MALLOC_ASSERT((uintptr_t)lmb+lmb->unalignedSize >=
+                      (uintptr_t)alignedArea+size, "Object doesn't fit the block.");
+        LargeObjectHdr *header = (LargeObjectHdr*)alignedArea-1;
+        header->memoryBlock = lmb;
+        header->backRefIdx = lmb->backRefIdx;
+        setBackRef(header->backRefIdx, header);
+
+        lmb->objectSize = size;
+
+        MALLOC_ASSERT( isLargeObject<unknownMem>(alignedArea), ASSERT_TEXT );
+        MALLOC_ASSERT( isAligned(alignedArea, alignment), ASSERT_TEXT );
+
+        return alignedArea;
+    }
+    return nullptr;
+}
 
-        void MemoryPool::putToLLOCache(TLSData *tls, void *object) {
-            LargeObjectHdr *header = (LargeObjectHdr *) object - 1;
-            // overwrite backRefIdx to simplify double free detection
-            header->backRefIdx = BackRefIdx();
+void MemoryPool::putToLLOCache(TLSData *tls, void *object)
+{
+    LargeObjectHdr *header = (LargeObjectHdr*)object - 1;
+    // overwrite backRefIdx to simplify double free detection
+    header->backRefIdx = BackRefIdx();
 
-            if (tls) {
-                tls->markUsed();
-                if (tls->lloc.put(header->memoryBlock, &extMemPool)) return;
-            }
-            extMemPool.freeLargeObject(header->memoryBlock);
-        }
+    if (tls) {
+        tls->markUsed();
+        if (tls->lloc.put(header->memoryBlock, &extMemPool))
+            return;
+    }
+    extMemPool.freeLargeObject(header->memoryBlock);
+}
 
-        /*
+/*
  * All aligned allocations fall into one of the following categories:
  *  1. if both request size and alignment are <= maxSegregatedObjectSize,
  *       we just align the size up, and request this amount, because for every size
@@ -2227,430 +2366,471 @@ namespace rml {
  *       alignment plus minLargeObjectSize can't lead to wrapping.
  * 4. otherwise, aligned large object is allocated.
  */
-        static void *allocateAligned(MemoryPool *memPool, size_t size, size_t alignment) {
-            MALLOC_ASSERT(isPowerOfTwo(alignment), ASSERT_TEXT);
-
-            if (!isMallocInitialized())
-                if (!doInitialization()) return NULL;
-
-            void *result;
-            if (size <= maxSegregatedObjectSize && alignment <= maxSegregatedObjectSize)
-                result = internalPoolMalloc(memPool, alignUp(size ? size : sizeof(size_t), alignment));
-            else if (size < minLargeObjectSize) {
-                if (alignment <= fittingAlignment) result = internalPoolMalloc(memPool, size);
-                else if (size + alignment < minLargeObjectSize) {
-                    void *unaligned = internalPoolMalloc(memPool, size + alignment);
-                    if (!unaligned) return NULL;
-                    result = alignUp(unaligned, alignment);
-                } else
-                    goto LargeObjAlloc;
-            } else {
-            LargeObjAlloc:
-                TLSData *tls = memPool->getTLS(/*create=*/true);
-                // take into account only alignment that are higher then natural
-                result = memPool->getFromLLOCache(
-                        tls, size, largeObjectAlignment > alignment ? largeObjectAlignment : alignment);
-            }
+static void *allocateAligned(MemoryPool *memPool, size_t size, size_t alignment)
+{
+    MALLOC_ASSERT( isPowerOfTwo(alignment), ASSERT_TEXT );
+
+    if (!isMallocInitialized())
+        if (!doInitialization())
+            return nullptr;
+
+    void *result;
+    if (size<=maxSegregatedObjectSize && alignment<=maxSegregatedObjectSize)
+        result = internalPoolMalloc(memPool, alignUp(size? size: sizeof(size_t), alignment));
+    else if (size<minLargeObjectSize) {
+        if (alignment<=fittingAlignment)
+            result = internalPoolMalloc(memPool, size);
+        else if (size+alignment < minLargeObjectSize) {
+            void *unaligned = internalPoolMalloc(memPool, size+alignment);
+            if (!unaligned) return nullptr;
+            result = alignUp(unaligned, alignment);
+        } else
+            goto LargeObjAlloc;
+    } else {
+    LargeObjAlloc:
+        TLSData *tls = memPool->getTLS(/*create=*/true);
+        // take into account only alignment that are higher then natural
+        result =
+            memPool->getFromLLOCache(tls, size, largeObjectAlignment>alignment?
+                                               largeObjectAlignment: alignment);
+    }
 
-            MALLOC_ASSERT(isAligned(result, alignment), ASSERT_TEXT);
-            return result;
-        }
+    MALLOC_ASSERT( isAligned(result, alignment), ASSERT_TEXT );
+    return result;
+}
 
-        static void *reallocAligned(MemoryPool *memPool, void *ptr, size_t newSize, size_t alignment = 0) {
-            void *result;
-            size_t copySize;
+static void *reallocAligned(MemoryPool *memPool, void *ptr,
+                            size_t newSize, size_t alignment = 0)
+{
+    void *result;
+    size_t copySize;
 
-            if (isLargeObject<ourMem>(ptr)) {
-                LargeMemoryBlock *lmb = ((LargeObjectHdr *) ptr - 1)->memoryBlock;
-                copySize = lmb->unalignedSize - ((uintptr_t) ptr - (uintptr_t) lmb);
+    if (isLargeObject<ourMem>(ptr)) {
+        LargeMemoryBlock* lmb = ((LargeObjectHdr *)ptr - 1)->memoryBlock;
+        copySize = lmb->unalignedSize-((uintptr_t)ptr-(uintptr_t)lmb);
 
-                // Apply different strategies if size decreases
-                if (newSize <= copySize && (0 == alignment || isAligned(ptr, alignment))) {
+        // Apply different strategies if size decreases
+        if (newSize <= copySize && (0 == alignment || isAligned(ptr, alignment))) {
 
-                    // For huge objects (that do not fit in backend cache), keep the same space unless
-                    // the new size is at least twice smaller
-                    bool isMemoryBlockHuge = copySize > memPool->extMemPool.backend.getMaxBinnedSize();
-                    size_t threshold = isMemoryBlockHuge ? copySize / 2 : 0;
-                    if (newSize > threshold) {
-                        lmb->objectSize = newSize;
-                        return ptr;
-                    }
-                    // TODO: For large objects suitable for the backend cache,
-                    // split out the excessive part and put it to the backend.
-                }
-                // Reallocate for real
-                copySize = lmb->objectSize;
+            // For huge objects (that do not fit in backend cache), keep the same space unless
+            // the new size is at least twice smaller
+            bool isMemoryBlockHuge = copySize > memPool->extMemPool.backend.getMaxBinnedSize();
+            size_t threshold = isMemoryBlockHuge ? copySize / 2 : 0;
+            if (newSize > threshold) {
+                lmb->objectSize = newSize;
+                return ptr;
+            }
+            // TODO: For large objects suitable for the backend cache,
+            // split out the excessive part and put it to the backend.
+        }
+        // Reallocate for real
+        copySize = lmb->objectSize;
 #if BACKEND_HAS_MREMAP
-                if (void *r = memPool->extMemPool.remap(
-                            ptr, copySize, newSize,
-                            alignment < largeObjectAlignment ? largeObjectAlignment : alignment))
-                    return r;
+        if (void *r = memPool->extMemPool.remap(ptr, copySize, newSize,
+                          alignment < largeObjectAlignment ? largeObjectAlignment : alignment))
+            return r;
 #endif
-                result = alignment ? allocateAligned(memPool, newSize, alignment)
-                                   : internalPoolMalloc(memPool, newSize);
+        result = alignment ? allocateAligned(memPool, newSize, alignment) :
+            internalPoolMalloc(memPool, newSize);
 
-            } else {
-                Block *block = (Block *) alignDown(ptr, slabSize);
-                copySize = block->findObjectSize(ptr);
-
-                // TODO: Move object to another bin if size decreases and the current bin is "empty enough".
-                // Currently, in case of size decreasing, old pointer is returned
-                if (newSize <= copySize && (0 == alignment || isAligned(ptr, alignment))) {
-                    return ptr;
-                } else {
-                    result = alignment ? allocateAligned(memPool, newSize, alignment)
-                                       : internalPoolMalloc(memPool, newSize);
-                }
-            }
-            if (result) {
-                memcpy(result, ptr, copySize < newSize ? copySize : newSize);
-                internalPoolFree(memPool, ptr, 0);
-            }
-            return result;
+    } else {
+        Block* block = (Block *)alignDown(ptr, slabSize);
+        copySize = block->findObjectSize(ptr);
+
+        // TODO: Move object to another bin if size decreases and the current bin is "empty enough".
+        // Currently, in case of size decreasing, old pointer is returned
+        if (newSize <= copySize && (0==alignment || isAligned(ptr, alignment))) {
+            return ptr;
+        } else {
+            result = alignment ? allocateAligned(memPool, newSize, alignment) :
+                internalPoolMalloc(memPool, newSize);
         }
+    }
+    if (result) {
+        memcpy(result, ptr, copySize < newSize ? copySize : newSize);
+        internalPoolFree(memPool, ptr, 0);
+    }
+    return result;
+}
 
 #if MALLOC_DEBUG
-        /* A predicate checks if an object is properly placed inside its block */
-        inline bool Block::isProperlyPlaced(const void *object) const {
-            return 0 == ((uintptr_t) this + slabSize - (uintptr_t) object) % objectSize;
-        }
+/* A predicate checks if an object is properly placed inside its block */
+inline bool Block::isProperlyPlaced(const void *object) const
+{
+    return 0 == ((uintptr_t)this + slabSize - (uintptr_t)object) % objectSize;
+}
 #endif
 
-        /* Finds the real object inside the block */
-        FreeObject *Block::findAllocatedObject(const void *address) const {
-            // calculate offset from the end of the block space
-            uint16_t offset = (uintptr_t) this + slabSize - (uintptr_t) address;
-            MALLOC_ASSERT(offset <= slabSize - sizeof(Block), ASSERT_TEXT);
-            // find offset difference from a multiple of allocation size
-            offset %= objectSize;
-            // and move the address down to where the real object starts.
-            return (FreeObject *) ((uintptr_t) address - (offset ? objectSize - offset : 0));
-        }
+/* Finds the real object inside the block */
+FreeObject *Block::findAllocatedObject(const void *address) const
+{
+    // calculate offset from the end of the block space
+    uint16_t offset = (uintptr_t)this + slabSize - (uintptr_t)address;
+    MALLOC_ASSERT( offset<=slabSize-sizeof(Block), ASSERT_TEXT );
+    // find offset difference from a multiple of allocation size
+    offset %= objectSize;
+    // and move the address down to where the real object starts.
+    return (FreeObject*)((uintptr_t)address - (offset? objectSize-offset: 0));
+}
 
-        /*
+/*
  * Bad dereference caused by a foreign pointer is possible only here, not earlier in call chain.
  * Separate function isolates SEH code, as it has bad influence on compiler optimization.
  */
-        static inline BackRefIdx safer_dereference(const BackRefIdx *ptr) {
-            BackRefIdx id;
+static inline BackRefIdx safer_dereference (const BackRefIdx *ptr)
+{
+    BackRefIdx id;
 #if _MSC_VER
-            __try {
+    __try {
 #endif
-                id = dereference(ptr);
+        id = dereference(ptr);
 #if _MSC_VER
-            } __except (GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION ? EXCEPTION_EXECUTE_HANDLER
-                                                                         : EXCEPTION_CONTINUE_SEARCH) {
-                id = BackRefIdx();
-            }
+    } __except( GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION?
+                EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH ) {
+        id = BackRefIdx();
+    }
 #endif
-            return id;
-        }
+    return id;
+}
 
-        template <MemoryOrigin memOrigin>
-        bool isLargeObject(void *object) {
-            if (!isAligned(object, largeObjectAlignment)) return false;
-            LargeObjectHdr *header = (LargeObjectHdr *) object - 1;
-            BackRefIdx idx = (memOrigin == unknownMem) ? safer_dereference(&header->backRefIdx)
-                                                       : dereference(&header->backRefIdx);
-
-            return idx.isLargeObject()
-                   // in valid LargeObjectHdr memoryBlock is not NULL
-                   && header->memoryBlock
-                   // in valid LargeObjectHdr memoryBlock points somewhere before header
-                   // TODO: more strict check
-                   && (uintptr_t) header->memoryBlock < (uintptr_t) header && getBackRef(idx) == header;
-        }
+template<MemoryOrigin memOrigin>
+bool isLargeObject(void *object)
+{
+    if (!isAligned(object, largeObjectAlignment))
+        return false;
+    LargeObjectHdr *header = (LargeObjectHdr*)object - 1;
+    BackRefIdx idx = (memOrigin == unknownMem) ?
+        safer_dereference(&header->backRefIdx) : dereference(&header->backRefIdx);
+
+    return idx.isLargeObject()
+        // in valid LargeObjectHdr memoryBlock is not nullptr
+        && header->memoryBlock
+        // in valid LargeObjectHdr memoryBlock points somewhere before header
+        // TODO: more strict check
+        && (uintptr_t)header->memoryBlock < (uintptr_t)header
+        && getBackRef(idx) == header;
+}
 
-        static inline bool isSmallObject(void *ptr) {
-            Block *expectedBlock = (Block *) alignDown(ptr, slabSize);
-            const BackRefIdx *idx = expectedBlock->getBackRefIdx();
+static inline bool isSmallObject (void *ptr)
+{
+    Block* expectedBlock = (Block*)alignDown(ptr, slabSize);
+    const BackRefIdx* idx = expectedBlock->getBackRefIdx();
 
-            bool isSmall = expectedBlock == getBackRef(safer_dereference(idx));
-            if (isSmall) expectedBlock->checkFreePrecond(ptr);
-            return isSmall;
-        }
+    bool isSmall = expectedBlock == getBackRef(safer_dereference(idx));
+    if (isSmall)
+        expectedBlock->checkFreePrecond(ptr);
+    return isSmall;
+}
 
-        /**** Check if an object was allocated by scalable_malloc ****/
-        static inline bool isRecognized(void *ptr) {
-            return defaultMemPool->extMemPool.backend.ptrCanBeValid(ptr)
-                   && (isLargeObject<unknownMem>(ptr) || isSmallObject(ptr));
-        }
+/**** Check if an object was allocated by scalable_malloc ****/
+static inline bool isRecognized (void* ptr)
+{
+    return defaultMemPool->extMemPool.backend.ptrCanBeValid(ptr) &&
+        (isLargeObject<unknownMem>(ptr) || isSmallObject(ptr));
+}
 
-        static inline void freeSmallObject(void *object) {
-            /* mask low bits to get the block */
-            Block *block = (Block *) alignDown(object, slabSize);
-            block->checkFreePrecond(object);
+static inline void freeSmallObject(void *object)
+{
+    /* mask low bits to get the block */
+    Block *block = (Block *)alignDown(object, slabSize);
+    block->checkFreePrecond(object);
 
 #if MALLOC_CHECK_RECURSION
-            if (block->isStartupAllocObject()) {
-                ((StartupBlock *) block)->free(object);
-                return;
-            }
+    if (block->isStartupAllocObject()) {
+        ((StartupBlock *)block)->free(object);
+        return;
+    }
 #endif
-            if (block->isOwnedByCurrentThread()) {
-                block->freeOwnObject(object);
-            } else { /* Slower path to add to the shared list, the allocatedCount is updated by the owner thread in malloc. */
-                FreeObject *objectToFree = block->findObjectToFree(object);
-                block->freePublicObject(objectToFree);
-            }
-        }
+    if (block->isOwnedByCurrentThread()) {
+        block->freeOwnObject(object);
+    } else { /* Slower path to add to the shared list, the allocatedCount is updated by the owner thread in malloc. */
+        FreeObject *objectToFree = block->findObjectToFree(object);
+        block->freePublicObject(objectToFree);
+    }
+}
 
-        static void *internalPoolMalloc(MemoryPool *memPool, size_t size) {
-            Bin *bin;
-            Block *mallocBlock;
+static void *internalPoolMalloc(MemoryPool* memPool, size_t size)
+{
+    Bin* bin;
+    Block * mallocBlock;
 
-            if (!memPool) return NULL;
+    if (!memPool) return nullptr;
 
-            if (!size) size = sizeof(size_t);
+    if (!size) size = sizeof(size_t);
 
-            TLSData *tls = memPool->getTLS(/*create=*/true);
+    TLSData *tls = memPool->getTLS(/*create=*/true);
 
-            /* Allocate a large object */
-            if (size >= minLargeObjectSize) return memPool->getFromLLOCache(tls, size, largeObjectAlignment);
+    /* Allocate a large object */
+    if (size >= minLargeObjectSize)
+        return memPool->getFromLLOCache(tls, size, largeObjectAlignment);
 
-            if (!tls) return NULL;
+    if (!tls) return nullptr;
 
-            tls->markUsed();
-            /*
+    tls->markUsed();
+    /*
      * Get an element in thread-local array corresponding to the given size;
      * It keeps ptr to the active block for allocations of this size
      */
-            bin = tls->getAllocationBin(size);
-            if (!bin) return NULL;
-
-            /* Get a block to try to allocate in. */
-            for (mallocBlock = bin->getActiveBlock(); mallocBlock;
-                 mallocBlock = bin->setPreviousBlockActive())// the previous block should be empty enough
-            {
-                if (FreeObject *result = mallocBlock->allocate()) return result;
-            }
+    bin = tls->getAllocationBin(size);
+    if ( !bin ) return nullptr;
+
+    /* Get a block to try to allocate in. */
+    for( mallocBlock = bin->getActiveBlock(); mallocBlock;
+         mallocBlock = bin->setPreviousBlockActive() ) // the previous block should be empty enough
+    {
+        if( FreeObject *result = mallocBlock->allocate() )
+            return result;
+    }
 
-            /*
+    /*
      * else privatize publicly freed objects in some block and allocate from it
      */
-            mallocBlock = bin->getPrivatizedFreeListBlock();
-            if (mallocBlock) {
-                MALLOC_ASSERT(mallocBlock->freeListNonNull(), ASSERT_TEXT);
-                if (FreeObject *result = mallocBlock->allocateFromFreeList()) return result;
-                /* Else something strange happened, need to retry from the beginning; */
-                TRACEF(("[ScalableMalloc trace] Something is wrong: no objects in public free list; "
-                        "reentering.\n"));
-                return internalPoolMalloc(memPool, size);
-            }
+    mallocBlock = bin->getPrivatizedFreeListBlock();
+    if (mallocBlock) {
+        MALLOC_ASSERT( mallocBlock->freeListNonNull(), ASSERT_TEXT );
+        if ( FreeObject *result = mallocBlock->allocateFromFreeList() )
+            return result;
+        /* Else something strange happened, need to retry from the beginning; */
+        TRACEF(( "[ScalableMalloc trace] Something is wrong: no objects in public free list; reentering.\n" ));
+        return internalPoolMalloc(memPool, size);
+    }
 
-            /*
+    /*
      * no suitable own blocks, try to get a partial block that some other thread has discarded.
      */
-            mallocBlock = memPool->extMemPool.orphanedBlocks.get(tls, size);
-            while (mallocBlock) {
-                bin->pushTLSBin(mallocBlock);
-                bin->setActiveBlock(mallocBlock);// TODO: move under the below condition?
-                if (FreeObject *result = mallocBlock->allocate()) return result;
-                mallocBlock = memPool->extMemPool.orphanedBlocks.get(tls, size);
-            }
+    mallocBlock = memPool->extMemPool.orphanedBlocks.get(tls, size);
+    while (mallocBlock) {
+        bin->pushTLSBin(mallocBlock);
+        bin->setActiveBlock(mallocBlock); // TODO: move under the below condition?
+        if( FreeObject *result = mallocBlock->allocate() )
+            return result;
+        mallocBlock = memPool->extMemPool.orphanedBlocks.get(tls, size);
+    }
 
-            /*
+    /*
      * else try to get a new empty block
      */
-            mallocBlock = memPool->getEmptyBlock(size);
-            if (mallocBlock) {
-                bin->pushTLSBin(mallocBlock);
-                bin->setActiveBlock(mallocBlock);
-                if (FreeObject *result = mallocBlock->allocate()) return result;
-                /* Else something strange happened, need to retry from the beginning; */
-                TRACEF(("[ScalableMalloc trace] Something is wrong: no objects in empty block; "
-                        "reentering.\n"));
-                return internalPoolMalloc(memPool, size);
-            }
-            /*
-     * else nothing works so return NULL
+    mallocBlock = memPool->getEmptyBlock(size);
+    if (mallocBlock) {
+        bin->pushTLSBin(mallocBlock);
+        bin->setActiveBlock(mallocBlock);
+        if( FreeObject *result = mallocBlock->allocate() )
+            return result;
+        /* Else something strange happened, need to retry from the beginning; */
+        TRACEF(( "[ScalableMalloc trace] Something is wrong: no objects in empty block; reentering.\n" ));
+        return internalPoolMalloc(memPool, size);
+    }
+    /*
+     * else nothing works so return nullptr
      */
-            TRACEF(("[ScalableMalloc trace] No memory found, returning NULL.\n"));
-            return NULL;
-        }
+    TRACEF(( "[ScalableMalloc trace] No memory found, returning nullptr.\n" ));
+    return nullptr;
+}
 
-        // When size==0 (i.e. unknown), detect here whether the object is large.
-        // For size is known and < minLargeObjectSize, we still need to check
-        // if the actual object is large, because large objects might be used
-        // for aligned small allocations.
-        static bool internalPoolFree(MemoryPool *memPool, void *object, size_t size) {
-            if (!memPool || !object) return false;
-
-            // The library is initialized at allocation call, so releasing while
-            // not initialized means foreign object is releasing.
-            MALLOC_ASSERT(isMallocInitialized(), ASSERT_TEXT);
-            MALLOC_ASSERT(memPool->extMemPool.userPool() || isRecognized(object),
-                          "Invalid pointer during object releasing is detected.");
-
-            if (size >= minLargeObjectSize || isLargeObject<ourMem>(object))
-                memPool->putToLLOCache(memPool->getTLS(/*create=*/false), object);
-            else
-                freeSmallObject(object);
-            return true;
-        }
+// When size==0 (i.e. unknown), detect here whether the object is large.
+// For size is known and < minLargeObjectSize, we still need to check
+// if the actual object is large, because large objects might be used
+// for aligned small allocations.
+static bool internalPoolFree(MemoryPool *memPool, void *object, size_t size)
+{
+    if (!memPool || !object) return false;
+
+    // The library is initialized at allocation call, so releasing while
+    // not initialized means foreign object is releasing.
+    MALLOC_ASSERT(isMallocInitialized(), ASSERT_TEXT);
+    MALLOC_ASSERT(memPool->extMemPool.userPool() || isRecognized(object),
+                  "Invalid pointer during object releasing is detected.");
+
+    if (size >= minLargeObjectSize || isLargeObject<ourMem>(object))
+        memPool->putToLLOCache(memPool->getTLS(/*create=*/false), object);
+    else
+        freeSmallObject(object);
+    return true;
+}
 
-        static void *internalMalloc(size_t size) {
-            if (!size) size = sizeof(size_t);
+static void *internalMalloc(size_t size)
+{
+    if (!size) size = sizeof(size_t);
 
 #if MALLOC_CHECK_RECURSION
-            if (RecursiveMallocCallProtector::sameThreadActive())
-                return size < minLargeObjectSize ? StartupBlock::allocate(size) :
-                                                 // nested allocation, so skip tls
-                               (FreeObject *) defaultMemPool->getFromLLOCache(NULL, size, slabSize);
+    if (RecursiveMallocCallProtector::sameThreadActive())
+        return size<minLargeObjectSize? StartupBlock::allocate(size) :
+            // nested allocation, so skip tls
+            (FreeObject*)defaultMemPool->getFromLLOCache(nullptr, size, slabSize);
 #endif
 
-            if (!isMallocInitialized())
-                if (!doInitialization()) return NULL;
-            return internalPoolMalloc(defaultMemPool, size);
-        }
+    if (!isMallocInitialized())
+        if (!doInitialization())
+            return nullptr;
+    return internalPoolMalloc(defaultMemPool, size);
+}
 
-        static void internalFree(void *object) { internalPoolFree(defaultMemPool, object, 0); }
+static void internalFree(void *object)
+{
+    internalPoolFree(defaultMemPool, object, 0);
+}
 
-        static size_t internalMsize(void *ptr) {
-            MALLOC_ASSERT(ptr, "Invalid pointer passed to internalMsize");
-            if (isLargeObject<ourMem>(ptr)) {
-                // TODO: return the maximum memory size, that can be written to this object
-                LargeMemoryBlock *lmb = ((LargeObjectHdr *) ptr - 1)->memoryBlock;
-                return lmb->objectSize;
-            } else {
-                Block *block = (Block *) alignDown(ptr, slabSize);
-                return block->findObjectSize(ptr);
-            }
-        }
+static size_t internalMsize(void* ptr)
+{
+    MALLOC_ASSERT(ptr, "Invalid pointer passed to internalMsize");
+    if (isLargeObject<ourMem>(ptr)) {
+        // TODO: return the maximum memory size, that can be written to this object
+        LargeMemoryBlock* lmb = ((LargeObjectHdr*)ptr - 1)->memoryBlock;
+        return lmb->objectSize;
+    } else {
+        Block *block = (Block*)alignDown(ptr, slabSize);
+        return block->findObjectSize(ptr);
+    }
+}
 
-    }// namespace internal
+} // namespace internal
 
-    using namespace rml::internal;
+using namespace rml::internal;
 
-    // legacy entry point saved for compatibility with binaries complied
-    // with pre-6003 versions of TBB
-    TBBMALLOC_EXPORT rml::MemoryPool *pool_create(intptr_t pool_id, const MemPoolPolicy *policy) {
-        rml::MemoryPool *pool;
-        MemPoolPolicy pol(policy->pAlloc, policy->pFree, policy->granularity);
+// legacy entry point saved for compatibility with binaries complied
+// with pre-6003 versions of TBB
+TBBMALLOC_EXPORT rml::MemoryPool *pool_create(intptr_t pool_id, const MemPoolPolicy *policy)
+{
+    rml::MemoryPool *pool;
+    MemPoolPolicy pol(policy->pAlloc, policy->pFree, policy->granularity);
 
-        pool_create_v1(pool_id, &pol, &pool);
-        return pool;
-    }
+    pool_create_v1(pool_id, &pol, &pool);
+    return pool;
+}
 
-    rml::MemPoolError pool_create_v1(intptr_t pool_id, const MemPoolPolicy *policy, rml::MemoryPool **pool) {
-        if (!policy->pAlloc
-            || policy->version < MemPoolPolicy::TBBMALLOC_POOL_VERSION
-            // empty pFree allowed only for fixed pools
-            || !(policy->fixedPool || policy->pFree)) {
-            *pool = NULL;
-            return INVALID_POLICY;
-        }
-        if (policy->version > MemPoolPolicy::TBBMALLOC_POOL_VERSION// future versions are not supported
-            // new flags can be added in place of reserved, but default
-            // behaviour must be supported by this version
-            || policy->reserved) {
-            *pool = NULL;
-            return UNSUPPORTED_POLICY;
-        }
-        if (!isMallocInitialized())
-            if (!doInitialization()) {
-                *pool = NULL;
-                return NO_MEMORY;
-            }
-        rml::internal::MemoryPool *memPool
-                = (rml::internal::MemoryPool *) internalMalloc((sizeof(rml::internal::MemoryPool)));
-        if (!memPool) {
-            *pool = NULL;
-            return NO_MEMORY;
-        }
-        memset(memPool, 0, sizeof(rml::internal::MemoryPool));
-        if (!memPool->init(pool_id, policy)) {
-            internalFree(memPool);
-            *pool = NULL;
+rml::MemPoolError pool_create_v1(intptr_t pool_id, const MemPoolPolicy *policy,
+                                 rml::MemoryPool **pool)
+{
+    if ( !policy->pAlloc || policy->version<MemPoolPolicy::TBBMALLOC_POOL_VERSION
+         // empty pFree allowed only for fixed pools
+         || !(policy->fixedPool || policy->pFree)) {
+        *pool = nullptr;
+        return INVALID_POLICY;
+    }
+    if ( policy->version>MemPoolPolicy::TBBMALLOC_POOL_VERSION // future versions are not supported
+         // new flags can be added in place of reserved, but default
+         // behaviour must be supported by this version
+         || policy->reserved ) {
+        *pool = nullptr;
+        return UNSUPPORTED_POLICY;
+    }
+    if (!isMallocInitialized())
+        if (!doInitialization()) {
+            *pool = nullptr;
             return NO_MEMORY;
         }
-
-        *pool = (rml::MemoryPool *) memPool;
-        return POOL_OK;
+    rml::internal::MemoryPool *memPool =
+        (rml::internal::MemoryPool*)internalMalloc((sizeof(rml::internal::MemoryPool)));
+    if (!memPool) {
+        *pool = nullptr;
+        return NO_MEMORY;
     }
-
-    bool pool_destroy(rml::MemoryPool *memPool) {
-        if (!memPool) return false;
-        bool ret = ((rml::internal::MemoryPool *) memPool)->destroy();
+    memset(static_cast<void*>(memPool), 0, sizeof(rml::internal::MemoryPool));
+    if (!memPool->init(pool_id, policy)) {
         internalFree(memPool);
-
-        return ret;
+        *pool = nullptr;
+        return NO_MEMORY;
     }
 
-    bool pool_reset(rml::MemoryPool *memPool) {
-        if (!memPool) return false;
+    *pool = (rml::MemoryPool*)memPool;
+    return POOL_OK;
+}
 
-        return ((rml::internal::MemoryPool *) memPool)->reset();
-    }
+bool pool_destroy(rml::MemoryPool* memPool)
+{
+    if (!memPool) return false;
+    bool ret = ((rml::internal::MemoryPool*)memPool)->destroy();
+    internalFree(memPool);
 
-    void *pool_malloc(rml::MemoryPool *mPool, size_t size) {
-        return internalPoolMalloc((rml::internal::MemoryPool *) mPool, size);
-    }
+    return ret;
+}
 
-    void *pool_realloc(rml::MemoryPool *mPool, void *object, size_t size) {
-        if (!object) return internalPoolMalloc((rml::internal::MemoryPool *) mPool, size);
-        if (!size) {
-            internalPoolFree((rml::internal::MemoryPool *) mPool, object, 0);
-            return NULL;
-        }
-        return reallocAligned((rml::internal::MemoryPool *) mPool, object, size, 0);
-    }
+bool pool_reset(rml::MemoryPool* memPool)
+{
+    if (!memPool) return false;
+
+    return ((rml::internal::MemoryPool*)memPool)->reset();
+}
 
-    void *pool_aligned_malloc(rml::MemoryPool *mPool, size_t size, size_t alignment) {
-        if (!isPowerOfTwo(alignment) || 0 == size) return NULL;
+void *pool_malloc(rml::MemoryPool* mPool, size_t size)
+{
+    return internalPoolMalloc((rml::internal::MemoryPool*)mPool, size);
+}
 
-        return allocateAligned((rml::internal::MemoryPool *) mPool, size, alignment);
+void *pool_realloc(rml::MemoryPool* mPool, void *object, size_t size)
+{
+    if (!object)
+        return internalPoolMalloc((rml::internal::MemoryPool*)mPool, size);
+    if (!size) {
+        internalPoolFree((rml::internal::MemoryPool*)mPool, object, 0);
+        return nullptr;
     }
+    return reallocAligned((rml::internal::MemoryPool*)mPool, object, size, 0);
+}
 
-    void *pool_aligned_realloc(rml::MemoryPool *memPool, void *ptr, size_t size, size_t alignment) {
-        if (!isPowerOfTwo(alignment)) return NULL;
-        rml::internal::MemoryPool *mPool = (rml::internal::MemoryPool *) memPool;
-        void *tmp;
+void *pool_aligned_malloc(rml::MemoryPool* mPool, size_t size, size_t alignment)
+{
+    if (!isPowerOfTwo(alignment) || 0==size)
+        return nullptr;
 
-        if (!ptr) tmp = allocateAligned(mPool, size, alignment);
-        else if (!size) {
-            internalPoolFree(mPool, ptr, 0);
-            return NULL;
-        } else
-            tmp = reallocAligned(mPool, ptr, size, alignment);
+    return allocateAligned((rml::internal::MemoryPool*)mPool, size, alignment);
+}
 
-        return tmp;
-    }
+void *pool_aligned_realloc(rml::MemoryPool* memPool, void *ptr, size_t size, size_t alignment)
+{
+    if (!isPowerOfTwo(alignment))
+        return nullptr;
+    rml::internal::MemoryPool *mPool = (rml::internal::MemoryPool*)memPool;
+    void *tmp;
+
+    if (!ptr)
+        tmp = allocateAligned(mPool, size, alignment);
+    else if (!size) {
+        internalPoolFree(mPool, ptr, 0);
+        return nullptr;
+    } else
+        tmp = reallocAligned(mPool, ptr, size, alignment);
+
+    return tmp;
+}
 
-    bool pool_free(rml::MemoryPool *mPool, void *object) {
-        return internalPoolFree((rml::internal::MemoryPool *) mPool, object, 0);
+bool pool_free(rml::MemoryPool *mPool, void *object)
+{
+    return internalPoolFree((rml::internal::MemoryPool*)mPool, object, 0);
+}
+
+rml::MemoryPool *pool_identify(void *object)
+{
+    rml::internal::MemoryPool *pool;
+    if (isLargeObject<ourMem>(object)) {
+        LargeObjectHdr *header = (LargeObjectHdr*)object - 1;
+        pool = header->memoryBlock->pool;
+    } else {
+        Block *block = (Block*)alignDown(object, slabSize);
+        pool = block->getMemPool();
     }
+    // do not return defaultMemPool, as it can't be used in pool_free() etc
+    __TBB_ASSERT_RELEASE(pool!=defaultMemPool,
+        "rml::pool_identify() can't be used for scalable_malloc() etc results.");
+    return (rml::MemoryPool*)pool;
+}
 
-    rml::MemoryPool *pool_identify(void *object) {
-        rml::internal::MemoryPool *pool;
-        if (isLargeObject<ourMem>(object)) {
-            LargeObjectHdr *header = (LargeObjectHdr *) object - 1;
-            pool = header->memoryBlock->pool;
-        } else {
-            Block *block = (Block *) alignDown(object, slabSize);
-            pool = block->getMemPool();
-        }
-        // do not return defaultMemPool, as it can't be used in pool_free() etc
-        __TBB_ASSERT_RELEASE(pool != defaultMemPool,
-                             "rml::pool_identify() can't be used for scalable_malloc() etc results.");
-        return (rml::MemoryPool *) pool;
-    }
-
-    size_t pool_msize(rml::MemoryPool *mPool, void *object) {
-        if (object) {
-            // No assert for object recognition, cause objects allocated from non-default
-            // memory pool do not participate in range checking and do not have valid backreferences for
-            // small objects. Instead, check that an object belong to the certain memory pool.
-            MALLOC_ASSERT_EX(mPool == pool_identify(object), "Object does not belong to the specified pool");
-            return internalMsize(object);
-        }
-        errno = EINVAL;
-        // Unlike _msize, return 0 in case of parameter error.
-        // Returning size_t(-1) looks more like the way to troubles.
-        return 0;
+size_t pool_msize(rml::MemoryPool *mPool, void* object)
+{
+    if (object) {
+        // No assert for object recognition, cause objects allocated from non-default
+        // memory pool do not participate in range checking and do not have valid backreferences for
+        // small objects. Instead, check that an object belong to the certain memory pool.
+        MALLOC_ASSERT_EX(mPool == pool_identify(object), "Object does not belong to the specified pool");
+        return internalMsize(object);
     }
+    errno = EINVAL;
+    // Unlike _msize, return 0 in case of parameter error.
+    // Returning size_t(-1) looks more like the way to troubles.
+    return 0;
+}
 
-}// namespace rml
+} // namespace rml
 
 using namespace rml::internal;
 
@@ -2660,11 +2840,11 @@ static unsigned int threadGoingDownCount = 0;
 
 /*
  * When a thread is shutting down this routine should be called to remove all the thread ids
- * from the malloc blocks and replace them with a NULL thread id.
+ * from the malloc blocks and replace them with a nullptr thread id.
  *
  * For pthreads, the function is set as a callback in pthread_key_create for TLS bin.
  * It will be automatically called at thread exit with the key value as the argument,
- * unless that value is NULL.
+ * unless that value is nullptr.
  * For Windows, it is called from DllMain( DLL_THREAD_DETACH ).
  *
  * However neither of the above is called for the main process thread, so the routine
@@ -2672,9 +2852,10 @@ static unsigned int threadGoingDownCount = 0;
  *
 */
 // TODO: Consider making this function part of class MemoryPool.
-void doThreadShutdownNotification(TLSData *tls, bool main_thread) {
-    TRACEF(("[ScalableMalloc trace] Thread id %d blocks return start %d\n", getThreadId(),
-            threadGoingDownCount++));
+void doThreadShutdownNotification(TLSData* tls, bool main_thread)
+{
+    TRACEF(( "[ScalableMalloc trace] Thread id %d blocks return start %d\n",
+             getThreadId(),  threadGoingDownCount++ ));
 
 #if USE_PTHREAD
     if (tls) {
@@ -2684,7 +2865,7 @@ void doThreadShutdownNotification(TLSData *tls, bool main_thread) {
     } else
 #endif
     {
-        suppress_unused_warning(tls);// not used on Windows
+        suppress_unused_warning(tls); // not used on Windows
         // The default pool is safe to use at this point:
         //   on Linux, only the main thread can go here before destroying defaultMemPool;
         //   on Windows, shutdown is synchronized via loader lock and isMallocInitialized().
@@ -2692,71 +2873,86 @@ void doThreadShutdownNotification(TLSData *tls, bool main_thread) {
         defaultMemPool->onThreadShutdown(defaultMemPool->getTLS(/*create=*/false));
         // Take lock to walk through other pools; but waiting might be dangerous at this point
         // (e.g. on Windows the main thread might deadlock)
-        bool locked;
+        bool locked = false;
         MallocMutex::scoped_lock lock(MemoryPool::memPoolListLock, /*wait=*/!main_thread, &locked);
-        if (locked) {// the list is safe to process
+        if (locked) { // the list is safe to process
             for (MemoryPool *memPool = defaultMemPool->next; memPool; memPool = memPool->next)
                 memPool->onThreadShutdown(memPool->getTLS(/*create=*/false));
         }
     }
 
-    TRACEF(("[ScalableMalloc trace] Thread id %d blocks return end\n", getThreadId()));
+    TRACEF(( "[ScalableMalloc trace] Thread id %d blocks return end\n", getThreadId() ));
 }
 
 #if USE_PTHREAD
-void mallocThreadShutdownNotification(void *arg) {
+void mallocThreadShutdownNotification(void* arg)
+{
     // The routine is called for each pool (as TLS dtor) on each thread, except for the main thread
     if (!isMallocInitialized()) return;
-    doThreadShutdownNotification((TLSData *) arg, false);
+    doThreadShutdownNotification((TLSData*)arg, false);
 }
 #else
-extern "C" void __TBB_mallocThreadShutdownNotification() {
+extern "C" void __TBB_mallocThreadShutdownNotification()
+{
     // The routine is called once per thread on Windows
     if (!isMallocInitialized()) return;
-    doThreadShutdownNotification(NULL, false);
+    doThreadShutdownNotification(nullptr, false);
 }
 #endif
 
-extern "C" void __TBB_mallocProcessShutdownNotification(bool windows_process_dying) {
+extern "C" void __TBB_mallocProcessShutdownNotification(bool windows_process_dying)
+{
     if (!isMallocInitialized()) return;
 
     // Don't clean allocator internals if the entire process is exiting
-    if (!windows_process_dying) { doThreadShutdownNotification(NULL, /*main_thread=*/true); }
-#if __TBB_MALLOC_LOCACHE_STAT
-    printf("cache hit ratio %f, size hit %f\n", 1. * cacheHits / mallocCalls, 1. * memHitKB / memAllocKB);
+    if (!windows_process_dying) {
+        doThreadShutdownNotification(nullptr, /*main_thread=*/true);
+    }
+#if  __TBB_MALLOC_LOCACHE_STAT
+    printf("cache hit ratio %f, size hit %f\n",
+           1.*cacheHits/mallocCalls, 1.*memHitKB/memAllocKB);
     defaultMemPool->extMemPool.loc.reportStat(stdout);
 #endif
 
     shutdownSync.processExit();
 #if __TBB_SOURCE_DIRECTLY_INCLUDED
-    /* Pthread keys must be deleted as soon as possible to not call key dtor
+/* Pthread keys must be deleted as soon as possible to not call key dtor
    on thread termination when then the tbbmalloc code can be already unloaded.
 */
     defaultMemPool->destroy();
     destroyBackRefMain(&defaultMemPool->extMemPool.backend);
-    ThreadId::destroy();// Delete key for thread id
+    ThreadId::destroy();      // Delete key for thread id
     hugePages.reset();
     // new total malloc initialization is possible after this point
     mallocInitialized.store(0, std::memory_order_release);
-#endif// __TBB_SOURCE_DIRECTLY_INCLUDED
+#endif // __TBB_SOURCE_DIRECTLY_INCLUDED
 
 #if COLLECT_STATISTICS
     unsigned nThreads = ThreadId::getMaxThreadId();
-    for (int i = 1; i <= nThreads && i < MAX_THREADS; ++i) STAT_print(i);
+    for( int i=1; i<=nThreads && i<MAX_THREADS; ++i )
+        STAT_print(i);
 #endif
-    if (!usedBySrcIncluded) MALLOC_ITT_FINI_ITTLIB();
+    if (!usedBySrcIncluded) {
+        MALLOC_ITT_FINI_ITTLIB();
+        MALLOC_ITT_RELEASE_RESOURCES();
+    }
 }
 
-extern "C" void *scalable_malloc(size_t size) {
+extern "C" void * scalable_malloc(size_t size)
+{
     void *ptr = internalMalloc(size);
     if (!ptr) errno = ENOMEM;
     return ptr;
 }
 
-extern "C" void scalable_free(void *object) { internalFree(object); }
+extern "C" void scalable_free(void *object)
+{
+    internalFree(object);
+}
 
 #if MALLOC_ZONE_OVERLOAD_ENABLED
-extern "C" void __TBB_malloc_free_definite_size(void *object, size_t size) {
+extern "C" TBBMALLOC_EXPORT void __TBB_malloc_free_definite_size(void *object, size_t size)
+{
     internalPoolFree(defaultMemPool, object, size);
 }
 #endif
@@ -2765,12 +2961,13 @@ extern "C" void __TBB_malloc_free_definite_size(void *object, size_t size) {
  * A variant that provides additional memory safety, by checking whether the given address
  * was obtained with this allocator, and if not redirecting to the provided alternative call.
  */
-extern "C" TBBMALLOC_EXPORT void __TBB_malloc_safer_free(void *object, void (*original_free)(void *)) {
-    if (!object) return;
+extern "C" TBBMALLOC_EXPORT void __TBB_malloc_safer_free(void *object, void (*original_free)(void*))
+{
+    if (!object)
+        return;
 
     // tbbmalloc can allocate object only when tbbmalloc has been initialized
-    if (mallocInitialized.load(std::memory_order_acquire)
-        && defaultMemPool->extMemPool.backend.ptrCanBeValid(object)) {
+    if (mallocInitialized.load(std::memory_order_acquire) && defaultMemPool->extMemPool.backend.ptrCanBeValid(object)) {
         if (isLargeObject<unknownMem>(object)) {
             // must check 1st for large object, because small object check touches 4 pages on left,
             // and it can be inaccessible
@@ -2783,7 +2980,8 @@ extern "C" TBBMALLOC_EXPORT void __TBB_malloc_safer_free(void *object, void (*or
             return;
         }
     }
-    if (original_free) original_free(object);
+    if (original_free)
+        original_free(object);
 }
 
 /********* End the free code        *************/
@@ -2795,16 +2993,18 @@ extern "C" TBBMALLOC_EXPORT void __TBB_malloc_safer_free(void *object, void (*or
  * "realloc changes the size of the object pointed to by p to size. The contents will
  * be unchanged up to the minimum of the old and the new sizes. If the new size is larger,
  * the new space is uninitialized. realloc returns a pointer to the new space, or
- * NULL if the request cannot be satisfied, in which case *p is unchanged."
+ * nullptr if the request cannot be satisfied, in which case *p is unchanged."
  *
  */
-extern "C" void *scalable_realloc(void *ptr, size_t size) {
+extern "C" void* scalable_realloc(void* ptr, size_t size)
+{
     void *tmp;
 
-    if (!ptr) tmp = internalMalloc(size);
+    if (!ptr)
+        tmp = internalMalloc(size);
     else if (!size) {
         internalFree(ptr);
-        return NULL;
+        return nullptr;
     } else
         tmp = reallocAligned(defaultMemPool, ptr, size, 0);
 
@@ -2816,42 +3016,44 @@ extern "C" void *scalable_realloc(void *ptr, size_t size) {
  * A variant that provides additional memory safety, by checking whether the given address
  * was obtained with this allocator, and if not redirecting to the provided alternative call.
  */
-extern "C" TBBMALLOC_EXPORT void *__TBB_malloc_safer_realloc(void *ptr, size_t sz, void *original_realloc) {
-    void *tmp;// TODO: fix warnings about uninitialized use of tmp
+extern "C" TBBMALLOC_EXPORT void* __TBB_malloc_safer_realloc(void* ptr, size_t sz, void* original_realloc)
+{
+    void *tmp; // TODO: fix warnings about uninitialized use of tmp
 
     if (!ptr) {
         tmp = internalMalloc(sz);
     } else if (mallocInitialized.load(std::memory_order_acquire) && isRecognized(ptr)) {
         if (!sz) {
             internalFree(ptr);
-            return NULL;
+            return nullptr;
         } else {
             tmp = reallocAligned(defaultMemPool, ptr, sz, 0);
         }
     }
 #if USE_WINTHREAD
     else if (original_realloc && sz) {
-        orig_ptrs *original_ptrs = static_cast<orig_ptrs *>(original_realloc);
-        if (original_ptrs->msize) {
+        orig_ptrs *original_ptrs = static_cast<orig_ptrs*>(original_realloc);
+        if ( original_ptrs->msize ){
             size_t oldSize = original_ptrs->msize(ptr);
             tmp = internalMalloc(sz);
             if (tmp) {
-                memcpy(tmp, ptr, sz < oldSize ? sz : oldSize);
-                if (original_ptrs->free) { original_ptrs->free(ptr); }
+                memcpy(tmp, ptr, sz<oldSize? sz : oldSize);
+                if ( original_ptrs->free ){
+                    original_ptrs->free( ptr );
+                }
             }
         } else
-            tmp = NULL;
+            tmp = nullptr;
     }
 #else
     else if (original_realloc) {
-        typedef void *(*realloc_ptr_t)(void *, size_t);
+        typedef void* (*realloc_ptr_t)(void*,size_t);
         realloc_ptr_t original_realloc_ptr;
-        (void *&) original_realloc_ptr = original_realloc;
-        tmp = original_realloc_ptr(ptr, sz);
+        (void *&)original_realloc_ptr = original_realloc;
+        tmp = original_realloc_ptr(ptr,sz);
     }
 #endif
-    else
-        tmp = NULL;
+    else tmp = nullptr;
 
     if (!tmp) errno = ENOMEM;
     return tmp;
@@ -2864,24 +3066,26 @@ extern "C" TBBMALLOC_EXPORT void *__TBB_malloc_safer_realloc(void *ptr, size_t s
 /*
  * From K&R
  * calloc returns a pointer to space for an array of nobj objects,
- * each of size size, or NULL if the request cannot be satisfied.
+ * each of size size, or nullptr if the request cannot be satisfied.
  * The space is initialized to zero bytes.
  *
  */
 
-extern "C" void *scalable_calloc(size_t nobj, size_t size) {
+extern "C" void * scalable_calloc(size_t nobj, size_t size)
+{
     // it's square root of maximal size_t value
-    const size_t mult_not_overflow = size_t(1) << (sizeof(size_t) * CHAR_BIT / 2);
+    const size_t mult_not_overflow = size_t(1) << (sizeof(size_t)*CHAR_BIT/2);
     const size_t arraySize = nobj * size;
 
     // check for overflow during multiplication:
-    if (nobj >= mult_not_overflow || size >= mult_not_overflow)// 1) heuristic check
-        if (nobj && arraySize / nobj != size) {                // 2) exact check
+    if (nobj>=mult_not_overflow || size>=mult_not_overflow) // 1) heuristic check
+        if (nobj && arraySize / nobj != size) {             // 2) exact check
             errno = ENOMEM;
-            return NULL;
+            return nullptr;
         }
-    void *result = internalMalloc(arraySize);
-    if (result) memset(result, 0, arraySize);
+    void* result = internalMalloc(arraySize);
+    if (result)
+        memset(result, 0, arraySize);
     else
         errno = ENOMEM;
     return result;
@@ -2891,35 +3095,41 @@ extern "C" void *scalable_calloc(size_t nobj, size_t size) {
 
 /********* Code for aligned allocation API **********/
 
-extern "C" int scalable_posix_memalign(void **memptr, size_t alignment, size_t size) {
-    if (!isPowerOfTwoAtLeast(alignment, sizeof(void *))) return EINVAL;
+extern "C" int scalable_posix_memalign(void **memptr, size_t alignment, size_t size)
+{
+    if ( !isPowerOfTwoAtLeast(alignment, sizeof(void*)) )
+        return EINVAL;
     void *result = allocateAligned(defaultMemPool, size, alignment);
-    if (!result) return ENOMEM;
+    if (!result)
+        return ENOMEM;
     *memptr = result;
     return 0;
 }
 
-extern "C" void *scalable_aligned_malloc(size_t size, size_t alignment) {
-    if (!isPowerOfTwo(alignment) || 0 == size) {
+extern "C" void * scalable_aligned_malloc(size_t size, size_t alignment)
+{
+    if (!isPowerOfTwo(alignment) || 0==size) {
         errno = EINVAL;
-        return NULL;
+        return nullptr;
     }
     void *tmp = allocateAligned(defaultMemPool, size, alignment);
     if (!tmp) errno = ENOMEM;
     return tmp;
 }
 
-extern "C" void *scalable_aligned_realloc(void *ptr, size_t size, size_t alignment) {
+extern "C" void * scalable_aligned_realloc(void *ptr, size_t size, size_t alignment)
+{
     if (!isPowerOfTwo(alignment)) {
         errno = EINVAL;
-        return NULL;
+        return nullptr;
     }
     void *tmp;
 
-    if (!ptr) tmp = allocateAligned(defaultMemPool, size, alignment);
+    if (!ptr)
+        tmp = allocateAligned(defaultMemPool, size, alignment);
     else if (!size) {
         scalable_free(ptr);
-        return NULL;
+        return nullptr;
     } else
         tmp = reallocAligned(defaultMemPool, ptr, size, alignment);
 
@@ -2927,43 +3137,47 @@ extern "C" void *scalable_aligned_realloc(void *ptr, size_t size, size_t alignme
     return tmp;
 }
 
-extern "C" TBBMALLOC_EXPORT void *__TBB_malloc_safer_aligned_realloc(void *ptr, size_t size, size_t alignment,
-                                                                     void *orig_function) {
+extern "C" TBBMALLOC_EXPORT void * __TBB_malloc_safer_aligned_realloc(void *ptr, size_t size, size_t alignment, void* orig_function)
+{
     /* corner cases left out of reallocAligned to not deal with errno there */
     if (!isPowerOfTwo(alignment)) {
         errno = EINVAL;
-        return NULL;
+        return nullptr;
     }
-    void *tmp = NULL;
+    void *tmp = nullptr;
 
     if (!ptr) {
         tmp = allocateAligned(defaultMemPool, size, alignment);
     } else if (mallocInitialized.load(std::memory_order_acquire) && isRecognized(ptr)) {
         if (!size) {
             internalFree(ptr);
-            return NULL;
+            return nullptr;
         } else {
             tmp = reallocAligned(defaultMemPool, ptr, size, alignment);
         }
     }
 #if USE_WINTHREAD
     else {
-        orig_aligned_ptrs *original_ptrs = static_cast<orig_aligned_ptrs *>(orig_function);
+        orig_aligned_ptrs *original_ptrs = static_cast<orig_aligned_ptrs*>(orig_function);
         if (size) {
             // Without orig_msize, we can't do anything with this.
             // Just keeping old pointer.
-            if (original_ptrs->aligned_msize) {
+            if ( original_ptrs->aligned_msize ){
                 // set alignment and offset to have possibly correct oldSize
-                size_t oldSize = original_ptrs->aligned_msize(ptr, sizeof(void *), 0);
+                size_t oldSize = original_ptrs->aligned_msize(ptr, sizeof(void*), 0);
                 tmp = allocateAligned(defaultMemPool, size, alignment);
                 if (tmp) {
-                    memcpy(tmp, ptr, size < oldSize ? size : oldSize);
-                    if (original_ptrs->aligned_free) { original_ptrs->aligned_free(ptr); }
+                    memcpy(tmp, ptr, size<oldSize? size : oldSize);
+                    if ( original_ptrs->aligned_free ){
+                        original_ptrs->aligned_free( ptr );
+                    }
                 }
             }
         } else {
-            if (original_ptrs->aligned_free) { original_ptrs->aligned_free(ptr); }
-            return NULL;
+            if ( original_ptrs->aligned_free ){
+                original_ptrs->aligned_free( ptr );
+            }
+            return nullptr;
         }
     }
 #else
@@ -2975,7 +3189,10 @@ extern "C" TBBMALLOC_EXPORT void *__TBB_malloc_safer_aligned_realloc(void *ptr,
     return tmp;
 }
 
-extern "C" void scalable_aligned_free(void *ptr) { internalFree(ptr); }
+extern "C" void scalable_aligned_free(void *ptr)
+{
+    internalFree(ptr);
+}
 
 /********* end code for aligned allocation API **********/
 
@@ -2984,7 +3201,8 @@ extern "C" void scalable_aligned_free(void *ptr) { internalFree(ptr); }
 /*
  * Returns the size of a memory block allocated in the heap.
  */
-extern "C" size_t scalable_msize(void *ptr) {
+extern "C" size_t scalable_msize(void* ptr)
+{
     if (ptr) {
         MALLOC_ASSERT(isRecognized(ptr), "Invalid pointer in scalable_msize detected.");
         return internalMsize(ptr);
@@ -2999,7 +3217,8 @@ extern "C" size_t scalable_msize(void *ptr) {
  * A variant that provides additional memory safety, by checking whether the given address
  * was obtained with this allocator, and if not redirecting to the provided alternative call.
  */
-extern "C" TBBMALLOC_EXPORT size_t __TBB_malloc_safer_msize(void *object, size_t (*original_msize)(void *)) {
+extern "C" TBBMALLOC_EXPORT size_t __TBB_malloc_safer_msize(void *object, size_t (*original_msize)(void*))
+{
     if (object) {
         // Check if the memory was allocated by scalable_malloc
         if (mallocInitialized.load(std::memory_order_acquire) && isRecognized(object))
@@ -3007,9 +3226,9 @@ extern "C" TBBMALLOC_EXPORT size_t __TBB_malloc_safer_msize(void *object, size_t
         else if (original_msize)
             return original_msize(object);
     }
-    // object is NULL or unknown, or foreign and no original_msize
+    // object is nullptr or unknown, or foreign and no original_msize
 #if USE_WINTHREAD
-    errno = EINVAL;// errno expected to be set only on this platform
+    errno = EINVAL; // errno expected to be set only on this platform
 #endif
     return 0;
 }
@@ -3017,35 +3236,36 @@ extern "C" TBBMALLOC_EXPORT size_t __TBB_malloc_safer_msize(void *object, size_t
 /*
  * The same as above but for _aligned_msize case
  */
-extern "C" TBBMALLOC_EXPORT size_t __TBB_malloc_safer_aligned_msize(
-        void *object, size_t alignment, size_t offset, size_t (*orig_aligned_msize)(void *, size_t, size_t)) {
+extern "C" TBBMALLOC_EXPORT size_t __TBB_malloc_safer_aligned_msize(void *object, size_t alignment, size_t offset, size_t (*orig_aligned_msize)(void*,size_t,size_t))
+{
     if (object) {
         // Check if the memory was allocated by scalable_malloc
         if (mallocInitialized.load(std::memory_order_acquire) && isRecognized(object))
             return internalMsize(object);
         else if (orig_aligned_msize)
-            return orig_aligned_msize(object, alignment, offset);
+            return orig_aligned_msize(object,alignment,offset);
     }
-    // object is NULL or unknown
+    // object is nullptr or unknown
     errno = EINVAL;
     return 0;
 }
 
 /********* End code for scalable_msize   ***********/
 
-extern "C" int scalable_allocation_mode(int param, intptr_t value) {
+extern "C" int scalable_allocation_mode(int param, intptr_t value)
+{
     if (param == TBBMALLOC_SET_SOFT_HEAP_LIMIT) {
-        defaultMemPool->extMemPool.backend.setRecommendedMaxSize((size_t) value);
+        defaultMemPool->extMemPool.backend.setRecommendedMaxSize((size_t)value);
         return TBBMALLOC_OK;
     } else if (param == USE_HUGE_PAGES) {
 #if __unix__
         switch (value) {
-            case 0:
-            case 1:
-                hugePages.setMode(value);
-                return TBBMALLOC_OK;
-            default:
-                return TBBMALLOC_INVALID_PARAM;
+        case 0:
+        case 1:
+            hugePages.setMode(value);
+            return TBBMALLOC_OK;
+        default:
+            return TBBMALLOC_INVALID_PARAM;
         }
 #else
         return TBBMALLOC_NO_EFFECT;
@@ -3053,35 +3273,37 @@ extern "C" int scalable_allocation_mode(int param, intptr_t value) {
 #if __TBB_SOURCE_DIRECTLY_INCLUDED
     } else if (param == TBBMALLOC_INTERNAL_SOURCE_INCLUDED) {
         switch (value) {
-            case 0:// used by dynamic library
-            case 1:// used by static library or directly included sources
-                usedBySrcIncluded = value;
-                return TBBMALLOC_OK;
-            default:
-                return TBBMALLOC_INVALID_PARAM;
+        case 0: // used by dynamic library
+        case 1: // used by static library or directly included sources
+            usedBySrcIncluded = value;
+            return TBBMALLOC_OK;
+        default:
+            return TBBMALLOC_INVALID_PARAM;
         }
 #endif
     } else if (param == TBBMALLOC_SET_HUGE_SIZE_THRESHOLD) {
-        defaultMemPool->extMemPool.loc.setHugeSizeThreshold((size_t) value);
+        defaultMemPool->extMemPool.loc.setHugeSizeThreshold((size_t)value);
         return TBBMALLOC_OK;
     }
     return TBBMALLOC_INVALID_PARAM;
 }
 
-extern "C" int scalable_allocation_command(int cmd, void *param) {
-    if (param) return TBBMALLOC_INVALID_PARAM;
+extern "C" int scalable_allocation_command(int cmd, void *param)
+{
+    if (param)
+        return TBBMALLOC_INVALID_PARAM;
 
     bool released = false;
-    switch (cmd) {
-        case TBBMALLOC_CLEAN_THREAD_BUFFERS:
-            if (TLSData *tls = defaultMemPool->getTLS(/*create=*/false))
-                released = tls->externalCleanup(/*cleanOnlyUnused*/ false, /*cleanBins=*/true);
-            break;
-        case TBBMALLOC_CLEAN_ALL_BUFFERS:
-            released = defaultMemPool->extMemPool.hardCachesCleanup();
-            break;
-        default:
-            return TBBMALLOC_INVALID_PARAM;
+    switch(cmd) {
+    case TBBMALLOC_CLEAN_THREAD_BUFFERS:
+        if (TLSData *tls = defaultMemPool->getTLS(/*create=*/false))
+            released = tls->externalCleanup(/*cleanOnlyUnused*/false, /*cleanBins=*/true);
+        break;
+    case TBBMALLOC_CLEAN_ALL_BUFFERS:
+        released = defaultMemPool->extMemPool.hardCachesCleanup(true);
+        break;
+    default:
+        return TBBMALLOC_INVALID_PARAM;
     }
     return released ? TBBMALLOC_OK : TBBMALLOC_NO_EFFECT;
 }
diff --git a/external/tbb/src/tbbmalloc/large_objects.cpp b/external/tbb/src/tbbmalloc/large_objects.cpp
index 0676294b..3454ca62 100644
--- a/external/tbb/src/tbbmalloc/large_objects.cpp
+++ b/external/tbb/src/tbbmalloc/large_objects.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2023 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -14,986 +14,1060 @@
     limitations under the License.
 */
 
-#include "../src/tbb/environment.h"
 #include "tbbmalloc_internal.h"
+#include "../src/tbb/environment.h"
 
 #if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
-// Suppress warning: unary minus operator applied to unsigned type, result still unsigned
-// TBB_REVAMP_TODO: review this warning
-#pragma warning(push)
-#pragma warning(disable : 4146)
+    // Suppress warning: unary minus operator applied to unsigned type, result still unsigned
+    // TBB_REVAMP_TODO: review this warning
+    #pragma warning(push)
+    #pragma warning(disable:4146)
 #endif
 
 /******************************* Allocation of large objects *********************************************/
 
 namespace rml {
-    namespace internal {
-
-        /* ---------------------------- Large Object cache init section ---------------------------------------- */
-
-        void LargeObjectCache::init(ExtMemoryPool *memPool) {
-            extMemPool = memPool;
-            // scalable_allocation_mode can be called before allocator initialization, respect this manual request
-            if (hugeSizeThreshold == 0) {
-                // Huge size threshold initialization if environment variable was set
-                long requestedThreshold = tbb::detail::r1::GetIntegralEnvironmentVariable(
-                        "TBB_MALLOC_SET_HUGE_SIZE_THRESHOLD");
-                // Read valid env or initialize by default with max possible values
-                if (requestedThreshold != -1) {
-                    setHugeSizeThreshold(requestedThreshold);
-                } else {
-                    setHugeSizeThreshold(maxHugeSize);
-                }
-            }
-        }
-
-        /* ----------------------------- Huge size threshold settings ----------------------------------------- */
-
-        void LargeObjectCache::setHugeSizeThreshold(size_t value) {
-            // Valid in the huge cache range: [MaxLargeSize, MaxHugeSize].
-            if (value <= maxHugeSize) {
-                hugeSizeThreshold = value >= maxLargeSize ? alignToBin(value) : maxLargeSize;
-
-                // Calculate local indexes for the global threshold size (for fast search inside a regular cleanup)
-                largeCache.hugeSizeThresholdIdx = LargeCacheType::numBins;
-                hugeCache.hugeSizeThresholdIdx = HugeCacheType::sizeToIdx(hugeSizeThreshold);
-            }
-        }
-
-        bool LargeObjectCache::sizeInCacheRange(size_t size) {
-            return size <= maxHugeSize && (size <= defaultMaxHugeSize || size >= hugeSizeThreshold);
+namespace internal {
+
+/* ---------------------------- Large Object cache init section ---------------------------------------- */
+
+void LargeObjectCache::init(ExtMemoryPool *memPool)
+{
+    extMemPool = memPool;
+    // scalable_allocation_mode can be called before allocator initialization, respect this manual request
+    if (hugeSizeThreshold == 0) {
+        // Huge size threshold initialization if environment variable was set
+        long requestedThreshold = tbb::detail::r1::GetIntegralEnvironmentVariable("TBB_MALLOC_SET_HUGE_SIZE_THRESHOLD");
+        // Read valid env or initialize by default with max possible values
+        if (requestedThreshold != -1) {
+            setHugeSizeThreshold(requestedThreshold);
+        } else {
+            setHugeSizeThreshold(maxHugeSize);
         }
-
-        /* ----------------------------------------------------------------------------------------------------- */
-
-        /* The functor called by the aggregator for the operation list */
-        template <typename Props>
-        class CacheBinFunctor {
-            typename LargeObjectCacheImpl<Props>::CacheBin *const bin;
-            ExtMemoryPool *const extMemPool;
-            typename LargeObjectCacheImpl<Props>::BinBitMask *const bitMask;
-            const int idx;
-
-            LargeMemoryBlock *toRelease;
-            bool needCleanup;
-            uintptr_t currTime;
-
-            /* Do preprocessing under the operation list. */
-            /* All the OP_PUT_LIST operations are merged in the one operation.
+    }
+}
+
+/* ----------------------------- Huge size threshold settings ----------------------------------------- */
+
+void LargeObjectCache::setHugeSizeThreshold(size_t value)
+{
+    // Valid in the huge cache range: [MaxLargeSize, MaxHugeSize].
+    if (value <= maxHugeSize) {
+        hugeSizeThreshold = value >= maxLargeSize ? alignToBin(value) : maxLargeSize;
+
+        // Calculate local indexes for the global threshold size (for fast search inside a regular cleanup)
+        largeCache.hugeSizeThresholdIdx = LargeCacheType::numBins;
+        hugeCache.hugeSizeThresholdIdx = HugeCacheType::sizeToIdx(hugeSizeThreshold);
+    }
+}
+
+bool LargeObjectCache::sizeInCacheRange(size_t size)
+{
+    return size < maxHugeSize && (size <= defaultMaxHugeSize || size >= hugeSizeThreshold);
+}
+
+/* ----------------------------------------------------------------------------------------------------- */
+
+/* The functor called by the aggregator for the operation list */
+template<typename Props>
+class CacheBinFunctor {
+    typename LargeObjectCacheImpl<Props>::CacheBin *const bin;
+    ExtMemoryPool *const extMemPool;
+    typename LargeObjectCacheImpl<Props>::BinBitMask *const bitMask;
+    const int idx;
+
+    LargeMemoryBlock *toRelease;
+    bool needCleanup;
+    uintptr_t currTime;
+
+    /* Do preprocessing under the operation list. */
+    /* All the OP_PUT_LIST operations are merged in the one operation.
        All OP_GET operations are merged with the OP_PUT_LIST operations but
        it demands the update of the moving average value in the bin.
        Only the last OP_CLEAN_TO_THRESHOLD operation has sense.
        The OP_CLEAN_ALL operation also should be performed only once.
        Moreover it cancels the OP_CLEAN_TO_THRESHOLD operation. */
-            class OperationPreprocessor {
-                // TODO: remove the dependency on CacheBin.
-                typename LargeObjectCacheImpl<Props>::CacheBin *const bin;
+    class OperationPreprocessor {
+        // TODO: remove the dependency on CacheBin.
+        typename LargeObjectCacheImpl<Props>::CacheBin *const  bin;
 
-                /* Contains the relative time in the operation list.
+        /* Contains the relative time in the operation list.
            It counts in the reverse order since the aggregator also
            provides operations in the reverse order. */
-                uintptr_t lclTime;
+        uintptr_t lclTime;
 
-                /* opGet contains only OP_GET operations which cannot be merge with OP_PUT operations
+        /* opGet contains only OP_GET operations which cannot be merge with OP_PUT operations
            opClean contains all OP_CLEAN_TO_THRESHOLD and OP_CLEAN_ALL operations. */
-                CacheBinOperation *opGet, *opClean;
-                /* The time of the last OP_CLEAN_TO_THRESHOLD operations */
-                uintptr_t cleanTime;
+        CacheBinOperation *opGet, *opClean;
+        /* The time of the last OP_CLEAN_TO_THRESHOLD operations */
+        uintptr_t cleanTime;
 
-                /* lastGetOpTime - the time of the last OP_GET operation.
+        /* lastGetOpTime - the time of the last OP_GET operation.
            lastGet - the same meaning as CacheBin::lastGet */
-                uintptr_t lastGetOpTime, lastGet;
-
-                /* The total sum of all usedSize changes requested with CBOP_UPDATE_USED_SIZE operations. */
-                size_t updateUsedSize;
-
-                /* The list of blocks for the OP_PUT_LIST operation. */
-                LargeMemoryBlock *head, *tail;
-                int putListNum;
-
-                /* if the OP_CLEAN_ALL is requested. */
-                bool isCleanAll;
-
-                inline void commitOperation(CacheBinOperation *op) const;
-                inline void addOpToOpList(CacheBinOperation *op, CacheBinOperation **opList) const;
-                bool getFromPutList(CacheBinOperation *opGet, uintptr_t currTime);
-                void addToPutList(LargeMemoryBlock *head, LargeMemoryBlock *tail, int num);
-
-            public:
-                OperationPreprocessor(typename LargeObjectCacheImpl<Props>::CacheBin *bin)
-                    : bin(bin), lclTime(0), opGet(NULL), opClean(NULL), cleanTime(0), lastGetOpTime(0),
-                      updateUsedSize(0), head(NULL), isCleanAll(false) {}
-                void operator()(CacheBinOperation *opList);
-                uintptr_t getTimeRange() const { return -lclTime; }
-
-                friend class CacheBinFunctor;
-            };
-
-        public:
-            CacheBinFunctor(typename LargeObjectCacheImpl<Props>::CacheBin *bin, ExtMemoryPool *extMemPool,
-                            typename LargeObjectCacheImpl<Props>::BinBitMask *bitMask, int idx)
-                : bin(bin), extMemPool(extMemPool), bitMask(bitMask), idx(idx), toRelease(NULL),
-                  needCleanup(false) {}
-            void operator()(CacheBinOperation *opList);
-
-            bool isCleanupNeeded() const { return needCleanup; }
-            LargeMemoryBlock *getToRelease() const { return toRelease; }
-            uintptr_t getCurrTime() const { return currTime; }
-        };
-
-        /* ---------------- Cache Bin Aggregator Operation Helpers ---------------- */
-
-        // The list of structures which describe the operation data
-        struct OpGet {
-            static const CacheBinOperationType type = CBOP_GET;
-            LargeMemoryBlock **res;
-            size_t size;
-            uintptr_t currTime;
-        };
-
-        struct OpPutList {
-            static const CacheBinOperationType type = CBOP_PUT_LIST;
-            LargeMemoryBlock *head;
-        };
-
-        struct OpCleanToThreshold {
-            static const CacheBinOperationType type = CBOP_CLEAN_TO_THRESHOLD;
-            LargeMemoryBlock **res;
-            uintptr_t currTime;
-        };
-
-        struct OpCleanAll {
-            static const CacheBinOperationType type = CBOP_CLEAN_ALL;
-            LargeMemoryBlock **res;
-        };
-
-        struct OpUpdateUsedSize {
-            static const CacheBinOperationType type = CBOP_UPDATE_USED_SIZE;
-            size_t size;
-        };
-
-        union CacheBinOperationData {
-        private:
-            OpGet opGet;
-            OpPutList opPutList;
-            OpCleanToThreshold opCleanToThreshold;
-            OpCleanAll opCleanAll;
-            OpUpdateUsedSize opUpdateUsedSize;
-        };
-
-        // Forward declarations
-        template <typename OpTypeData>
-        OpTypeData &opCast(CacheBinOperation &op);
-
-        // Describes the aggregator operation
-        struct CacheBinOperation : public MallocAggregatedOperation<CacheBinOperation>::type {
-            CacheBinOperationType type;
-
-            template <typename OpTypeData>
-            CacheBinOperation(OpTypeData &d, CacheBinOperationStatus st = CBST_WAIT) {
-                opCast<OpTypeData>(*this) = d;
-                type = OpTypeData::type;
-                MallocAggregatedOperation<CacheBinOperation>::type::status = st;
-            }
-
-        private:
-            CacheBinOperationData data;
-
-            template <typename OpTypeData>
-            friend OpTypeData &opCast(CacheBinOperation &op);
-        };
-
-        // The opCast function can be the member of CacheBinOperation but it will have
-        // small stylistic ambiguity: it will look like a getter (with a cast) for the
-        // CacheBinOperation::data data member but it should return a reference to
-        // simplify the code from a lot of getter/setter calls. So the global cast in
-        // the style of static_cast (or reinterpret_cast) seems to be more readable and
-        // have more explicit semantic.
-        template <typename OpTypeData>
-        OpTypeData &opCast(CacheBinOperation &op) {
-            return *reinterpret_cast<OpTypeData *>(&op.data);
-        }
-
-        /* ------------------------------------------------------------------------ */
+        uintptr_t lastGetOpTime, lastGet;
+
+        /* The total sum of all usedSize changes requested with CBOP_UPDATE_USED_SIZE operations. */
+        size_t updateUsedSize;
+
+        /* The list of blocks for the OP_PUT_LIST operation. */
+        LargeMemoryBlock *head, *tail;
+        int putListNum;
+
+        /* if the OP_CLEAN_ALL is requested. */
+        bool isCleanAll;
+
+        inline void commitOperation(CacheBinOperation *op) const;
+        inline void addOpToOpList(CacheBinOperation *op, CacheBinOperation **opList) const;
+        bool getFromPutList(CacheBinOperation* opGet, uintptr_t currTime);
+        void addToPutList( LargeMemoryBlock *head, LargeMemoryBlock *tail, int num );
+
+    public:
+        OperationPreprocessor(typename LargeObjectCacheImpl<Props>::CacheBin *bin) :
+            bin(bin), lclTime(0), opGet(nullptr), opClean(nullptr), cleanTime(0),
+            lastGetOpTime(0), lastGet(0), updateUsedSize(0), head(nullptr), tail(nullptr), putListNum(0), isCleanAll(false)  {}
+        void operator()(CacheBinOperation* opList);
+        uintptr_t getTimeRange() const { return -lclTime; }
+
+        friend class CacheBinFunctor;
+    };
+
+public:
+    CacheBinFunctor(typename LargeObjectCacheImpl<Props>::CacheBin *bin, ExtMemoryPool *extMemPool,
+                    typename LargeObjectCacheImpl<Props>::BinBitMask *bitMask, int idx) :
+        bin(bin), extMemPool(extMemPool), bitMask(bitMask), idx(idx), toRelease(nullptr), needCleanup(false), currTime(0) {}
+    void operator()(CacheBinOperation* opList);
+
+    bool isCleanupNeeded() const { return needCleanup; }
+    LargeMemoryBlock *getToRelease() const { return toRelease; }
+    uintptr_t getCurrTime() const { return currTime; }
+};
+
+/* ---------------- Cache Bin Aggregator Operation Helpers ---------------- */
+
+// The list of structures which describe the operation data
+struct OpGet {
+    static const CacheBinOperationType type = CBOP_GET;
+    LargeMemoryBlock **res;
+    size_t size;
+    uintptr_t currTime;
+};
+
+struct OpPutList {
+    static const CacheBinOperationType type = CBOP_PUT_LIST;
+    LargeMemoryBlock *head;
+};
+
+struct OpCleanToThreshold {
+    static const CacheBinOperationType type = CBOP_CLEAN_TO_THRESHOLD;
+    LargeMemoryBlock **res;
+    uintptr_t currTime;
+};
+
+struct OpCleanAll {
+    static const CacheBinOperationType type = CBOP_CLEAN_ALL;
+    LargeMemoryBlock **res;
+};
+
+struct OpUpdateUsedSize {
+    static const CacheBinOperationType type = CBOP_UPDATE_USED_SIZE;
+    size_t size;
+};
+
+union CacheBinOperationData {
+private:
+    OpGet opGet;
+    OpPutList opPutList;
+    OpCleanToThreshold opCleanToThreshold;
+    OpCleanAll opCleanAll;
+    OpUpdateUsedSize opUpdateUsedSize;
+};
+
+// Forward declarations
+template <typename OpTypeData> OpTypeData& opCast(CacheBinOperation &op);
+
+// Describes the aggregator operation
+struct CacheBinOperation : public MallocAggregatedOperation<CacheBinOperation>::type {
+    CacheBinOperationType type;
+
+    template <typename OpTypeData>
+    CacheBinOperation(OpTypeData &d, CacheBinOperationStatus st = CBST_WAIT) {
+        opCast<OpTypeData>(*this) = d;
+        type = OpTypeData::type;
+        MallocAggregatedOperation<CacheBinOperation>::type::status = st;
+    }
+private:
+    CacheBinOperationData data;
+
+    template <typename OpTypeData>
+    friend OpTypeData& opCast(CacheBinOperation &op);
+};
+
+// The opCast function can be the member of CacheBinOperation but it will have
+// small stylistic ambiguity: it will look like a getter (with a cast) for the
+// CacheBinOperation::data data member but it should return a reference to
+// simplify the code from a lot of getter/setter calls. So the global cast in
+// the style of static_cast (or reinterpret_cast) seems to be more readable and
+// have more explicit semantic.
+template <typename OpTypeData>
+OpTypeData& opCast(CacheBinOperation &op) {
+    return *reinterpret_cast<OpTypeData*>(&op.data);
+}
+
+/* ------------------------------------------------------------------------ */
 
 #if __TBB_MALLOC_LOCACHE_STAT
-        //intptr_t mallocCalls, cacheHits;
-        std::atomic<intptr_t> mallocCalls, cacheHits;
-        //intptr_t memAllocKB, memHitKB;
-        std::atomic<intptr_t> memAllocKB, memHitKB;
+//intptr_t mallocCalls, cacheHits;
+std::atomic<intptr_t> mallocCalls, cacheHits;
+//intptr_t memAllocKB, memHitKB;
+std::atomic<intptr_t> memAllocKB, memHitKB;
 #endif
 
 #if MALLOC_DEBUG
-        inline bool lessThanWithOverflow(intptr_t a, intptr_t b) {
-            return (a < b && (b - a < UINTPTR_MAX / 2)) || (a > b && (a - b > UINTPTR_MAX / 2));
-        }
+inline bool lessThanWithOverflow(intptr_t a, intptr_t b)
+{
+    return (a < b && (b - a < static_cast<intptr_t>(UINTPTR_MAX/2))) ||
+           (a > b && (a - b > static_cast<intptr_t>(UINTPTR_MAX/2)));
+}
 #endif
 
-        /* ----------------------------------- Operation processing methods ------------------------------------ */
-
-        template <typename Props>
-        void CacheBinFunctor<Props>::OperationPreprocessor::commitOperation(CacheBinOperation *op) const {
-            // FencedStore( (intptr_t&)(op->status), CBST_DONE );
-            op->status.store(CBST_DONE, std::memory_order_release);
-        }
+/* ----------------------------------- Operation processing methods ------------------------------------ */
+
+template<typename Props> void CacheBinFunctor<Props>::
+    OperationPreprocessor::commitOperation(CacheBinOperation *op) const
+{
+    // FencedStore( (intptr_t&)(op->status), CBST_DONE );
+    op->status.store(CBST_DONE, std::memory_order_release);
+}
+
+template<typename Props> void CacheBinFunctor<Props>::
+    OperationPreprocessor::addOpToOpList(CacheBinOperation *op, CacheBinOperation **opList) const
+{
+    op->next = *opList;
+    *opList = op;
+}
+
+template<typename Props> bool CacheBinFunctor<Props>::
+    OperationPreprocessor::getFromPutList(CacheBinOperation *opGet, uintptr_t currTime)
+{
+    if ( head ) {
+        uintptr_t age = head->age;
+        LargeMemoryBlock *next = head->next;
+        *opCast<OpGet>(*opGet).res = head;
+        commitOperation( opGet );
+        head = next;
+        putListNum--;
+        MALLOC_ASSERT( putListNum>=0, ASSERT_TEXT );
+
+        // use moving average with current hit interval
+        bin->updateMeanHitRange( currTime - age );
+        return true;
+    }
+    return false;
+}
+
+template<typename Props> void CacheBinFunctor<Props>::
+    OperationPreprocessor::addToPutList(LargeMemoryBlock *h, LargeMemoryBlock *t, int num)
+{
+    if ( head ) {
+        MALLOC_ASSERT( tail, ASSERT_TEXT );
+        tail->next = h;
+        h->prev = tail;
+        tail = t;
+        putListNum += num;
+    } else {
+        head = h;
+        tail = t;
+        putListNum = num;
+    }
+}
+
+template<typename Props> void CacheBinFunctor<Props>::
+    OperationPreprocessor::operator()(CacheBinOperation* opList)
+{
+    for ( CacheBinOperation *op = opList, *opNext; op; op = opNext ) {
+        opNext = op->next;
+        switch ( op->type ) {
+        case CBOP_GET:
+            {
+                lclTime--;
+                if ( !lastGetOpTime ) {
+                    lastGetOpTime = lclTime;
+                    lastGet = 0;
+                } else if ( !lastGet ) lastGet = lclTime;
+
+                if ( !getFromPutList(op,lclTime) ) {
+                    opCast<OpGet>(*op).currTime = lclTime;
+                    addOpToOpList( op, &opGet );
+                }
+            }
+            break;
 
-        template <typename Props>
-        void CacheBinFunctor<Props>::OperationPreprocessor::addOpToOpList(CacheBinOperation *op,
-                                                                          CacheBinOperation **opList) const {
-            op->next = *opList;
-            *opList = op;
-        }
+        case CBOP_PUT_LIST:
+            {
+                LargeMemoryBlock *head = opCast<OpPutList>(*op).head;
+                LargeMemoryBlock *curr = head, *prev = nullptr;
 
-        template <typename Props>
-        bool CacheBinFunctor<Props>::OperationPreprocessor::getFromPutList(CacheBinOperation *opGet,
-                                                                           uintptr_t currTime) {
-            if (head) {
-                uintptr_t age = head->age;
-                LargeMemoryBlock *next = head->next;
-                *opCast<OpGet>(*opGet).res = head;
-                commitOperation(opGet);
-                head = next;
-                putListNum--;
-                MALLOC_ASSERT(putListNum >= 0, ASSERT_TEXT);
-
-                // use moving average with current hit interval
-                bin->updateMeanHitRange(currTime - age);
-                return true;
-            }
-            return false;
-        }
+                int num = 0;
+                do {
+                    // we do not kept prev pointers during assigning blocks to bins, set them now
+                    curr->prev = prev;
 
-        template <typename Props>
-        void CacheBinFunctor<Props>::OperationPreprocessor::addToPutList(LargeMemoryBlock *h,
-                                                                         LargeMemoryBlock *t, int num) {
-            if (head) {
-                MALLOC_ASSERT(tail, ASSERT_TEXT);
-                tail->next = h;
-                h->prev = tail;
-                tail = t;
-                putListNum += num;
-            } else {
-                head = h;
-                tail = t;
-                putListNum = num;
-            }
-        }
+                    // Save the local times to the memory blocks. Local times are necessary
+                    // for the getFromPutList function which updates the hit range value in
+                    // CacheBin when OP_GET and OP_PUT_LIST operations are merged successfully.
+                    // The age will be updated to the correct global time after preprocessing
+                    // when global cache time is updated.
+                    curr->age = --lclTime;
 
-        template <typename Props>
-        void CacheBinFunctor<Props>::OperationPreprocessor::operator()(CacheBinOperation *opList) {
-            for (CacheBinOperation *op = opList, *opNext; op; op = opNext) {
-                opNext = op->next;
-                switch (op->type) {
-                    case CBOP_GET: {
-                        lclTime--;
-                        if (!lastGetOpTime) {
-                            lastGetOpTime = lclTime;
-                            lastGet = 0;
-                        } else if (!lastGet)
-                            lastGet = lclTime;
-
-                        if (!getFromPutList(op, lclTime)) {
-                            opCast<OpGet>(*op).currTime = lclTime;
-                            addOpToOpList(op, &opGet);
-                        }
-                    } break;
-
-                    case CBOP_PUT_LIST: {
-                        LargeMemoryBlock *head = opCast<OpPutList>(*op).head;
-                        LargeMemoryBlock *curr = head, *prev = NULL;
-
-                        int num = 0;
-                        do {
-                            // we do not kept prev pointers during assigning blocks to bins, set them now
-                            curr->prev = prev;
-
-                            // Save the local times to the memory blocks. Local times are necessary
-                            // for the getFromPutList function which updates the hit range value in
-                            // CacheBin when OP_GET and OP_PUT_LIST operations are merged successfully.
-                            // The age will be updated to the correct global time after preprocessing
-                            // when global cache time is updated.
-                            curr->age = --lclTime;
-
-                            prev = curr;
-                            num += 1;
-
-                            STAT_increment(getThreadId(), ThreadCommonCounters, cacheLargeObj);
-                        } while ((curr = curr->next) != NULL);
-
-                        LargeMemoryBlock *tail = prev;
-                        addToPutList(head, tail, num);
-
-                        while (opGet) {
-                            CacheBinOperation *next = opGet->next;
-                            if (!getFromPutList(opGet, opCast<OpGet>(*opGet).currTime)) break;
-                            opGet = next;
-                        }
-                    } break;
-
-                    case CBOP_UPDATE_USED_SIZE:
-                        updateUsedSize += opCast<OpUpdateUsedSize>(*op).size;
-                        commitOperation(op);
-                        break;
+                    prev = curr;
+                    num += 1;
 
-                    case CBOP_CLEAN_ALL:
-                        isCleanAll = true;
-                        addOpToOpList(op, &opClean);
-                        break;
+                    STAT_increment(getThreadId(), ThreadCommonCounters, cacheLargeObj);
+                } while ((curr = curr->next) != nullptr);
 
-                    case CBOP_CLEAN_TO_THRESHOLD: {
-                        uintptr_t currTime = opCast<OpCleanToThreshold>(*op).currTime;
-                        // We don't worry about currTime overflow since it is a rare
-                        // occurrence and doesn't affect correctness
-                        cleanTime = cleanTime < currTime ? currTime : cleanTime;
-                        addOpToOpList(op, &opClean);
-                    } break;
+                LargeMemoryBlock *tail = prev;
+                addToPutList(head, tail, num);
 
-                    default:
-                        MALLOC_ASSERT(false, "Unknown operation.");
+                while ( opGet ) {
+                    CacheBinOperation *next = opGet->next;
+                    if ( !getFromPutList(opGet, opCast<OpGet>(*opGet).currTime) )
+                        break;
+                    opGet = next;
                 }
             }
-            MALLOC_ASSERT(!(opGet && head), "Not all put/get pairs are processed!");
+            break;
+
+        case CBOP_UPDATE_USED_SIZE:
+            updateUsedSize += opCast<OpUpdateUsedSize>(*op).size;
+            commitOperation( op );
+            break;
+
+        case CBOP_CLEAN_ALL:
+            isCleanAll = true;
+            addOpToOpList( op, &opClean );
+            break;
+
+        case CBOP_CLEAN_TO_THRESHOLD:
+            {
+                uintptr_t currTime = opCast<OpCleanToThreshold>(*op).currTime;
+                // We don't worry about currTime overflow since it is a rare
+                // occurrence and doesn't affect correctness
+                cleanTime = cleanTime < currTime ? currTime : cleanTime;
+                addOpToOpList( op, &opClean );
+            }
+            break;
+
+        default:
+            MALLOC_ASSERT( false, "Unknown operation." );
         }
+    }
+    MALLOC_ASSERT( !( opGet && head ), "Not all put/get pairs are processed!" );
+}
 
-        template <typename Props>
-        void CacheBinFunctor<Props>::operator()(CacheBinOperation *opList) {
-            MALLOC_ASSERT(opList, "Empty operation list is passed into operation handler.");
+template<typename Props> void CacheBinFunctor<Props>::operator()(CacheBinOperation* opList)
+{
+    MALLOC_ASSERT( opList, "Empty operation list is passed into operation handler." );
 
-            OperationPreprocessor prep(bin);
-            prep(opList);
+    OperationPreprocessor prep(bin);
+    prep(opList);
 
-            if (uintptr_t timeRange = prep.getTimeRange()) {
-                uintptr_t startTime = extMemPool->loc.getCurrTimeRange(timeRange);
-                // endTime is used as the current (base) time since the local time is negative.
-                uintptr_t endTime = startTime + timeRange;
+    if ( uintptr_t timeRange = prep.getTimeRange() ) {
+        uintptr_t startTime = extMemPool->loc.getCurrTimeRange(timeRange);
+        // endTime is used as the current (base) time since the local time is negative.
+        uintptr_t endTime = startTime + timeRange;
 
-                if (prep.lastGetOpTime && prep.lastGet) bin->setLastGet(prep.lastGet + endTime);
+        if ( prep.lastGetOpTime && prep.lastGet ) bin->setLastGet(prep.lastGet+endTime);
 
-                if (CacheBinOperation *opGet = prep.opGet) {
-                    bool isEmpty = false;
-                    do {
+        if ( CacheBinOperation *opGet = prep.opGet ) {
+            bool isEmpty = false;
+            do {
 #if __TBB_MALLOC_WHITEBOX_TEST
-                        tbbmalloc_whitebox::locGetProcessed++;
+                tbbmalloc_whitebox::locGetProcessed++;
 #endif
-                        const OpGet &opGetData = opCast<OpGet>(*opGet);
-                        if (!isEmpty) {
-                            if (LargeMemoryBlock *res = bin->get()) {
-                                uintptr_t getTime = opGetData.currTime + endTime;
-                                // use moving average with current hit interval
-                                bin->updateMeanHitRange(getTime - res->age);
-                                bin->updateCachedSize(-opGetData.size);
-                                *opGetData.res = res;
-                            } else {
-                                isEmpty = true;
-                                uintptr_t lastGetOpTime = prep.lastGetOpTime + endTime;
-                                bin->forgetOutdatedState(lastGetOpTime);
-                                bin->updateAgeThreshold(lastGetOpTime);
-                            }
-                        }
-
-                        CacheBinOperation *opNext = opGet->next;
-                        bin->updateUsedSize(opGetData.size, bitMask, idx);
-                        prep.commitOperation(opGet);
-                        opGet = opNext;
-                    } while (opGet);
-                    if (prep.lastGetOpTime) bin->setLastGet(prep.lastGetOpTime + endTime);
-                } else if (LargeMemoryBlock *curr = prep.head) {
-                    curr->prev = NULL;
-                    while (curr) {
-                        // Update local times to global times
-                        curr->age += endTime;
-                        curr = curr->next;
+                const OpGet &opGetData = opCast<OpGet>(*opGet);
+                if ( !isEmpty ) {
+                    if ( LargeMemoryBlock *res = bin->get() ) {
+                        uintptr_t getTime = opGetData.currTime + endTime;
+                        // use moving average with current hit interval
+                        bin->updateMeanHitRange( getTime - res->age);
+                        bin->updateCachedSize( -opGetData.size );
+                        *opGetData.res = res;
+                    } else {
+                        isEmpty = true;
+                        uintptr_t lastGetOpTime = prep.lastGetOpTime+endTime;
+                        bin->forgetOutdatedState(lastGetOpTime);
+                        bin->updateAgeThreshold(lastGetOpTime);
                     }
-#if __TBB_MALLOC_WHITEBOX_TEST
-                    tbbmalloc_whitebox::locPutProcessed += prep.putListNum;
-#endif
-                    toRelease = bin->putList(prep.head, prep.tail, bitMask, idx, prep.putListNum,
-                                             extMemPool->loc.hugeSizeThreshold);
                 }
-                needCleanup = extMemPool->loc.isCleanupNeededOnRange(timeRange, startTime);
-                currTime = endTime - 1;
-            }
-
-            if (CacheBinOperation *opClean = prep.opClean) {
-                if (prep.isCleanAll) *opCast<OpCleanAll>(*opClean).res = bin->cleanAll(bitMask, idx);
-                else
-                    *opCast<OpCleanToThreshold>(*opClean).res
-                            = bin->cleanToThreshold(prep.cleanTime, bitMask, idx);
-
-                CacheBinOperation *opNext = opClean->next;
-                prep.commitOperation(opClean);
 
-                while ((opClean = opNext) != NULL) {
-                    opNext = opClean->next;
-                    prep.commitOperation(opClean);
-                }
-            }
-
-            if (size_t size = prep.updateUsedSize) bin->updateUsedSize(size, bitMask, idx);
-        }
-        /* ----------------------------------------------------------------------------------------------------- */
-        /* --------------------------- Methods for creating and executing operations --------------------------- */
-        template <typename Props>
-        void LargeObjectCacheImpl<Props>::CacheBin::ExecuteOperation(CacheBinOperation *op,
-                                                                     ExtMemoryPool *extMemPool,
-                                                                     BinBitMask *bitMask, int idx,
-                                                                     bool longLifeTime) {
-            CacheBinFunctor<Props> func(this, extMemPool, bitMask, idx);
-            aggregator.execute(op, func, longLifeTime);
-
-            if (LargeMemoryBlock *toRelease = func.getToRelease()) {
-                extMemPool->backend.returnLargeObject(toRelease);
-            }
-
-            if (func.isCleanupNeeded()) {
-                extMemPool->loc.doCleanup(func.getCurrTime(), /*doThreshDecr=*/false);
+                CacheBinOperation *opNext = opGet->next;
+                bin->updateUsedSize( opGetData.size, bitMask, idx );
+                prep.commitOperation( opGet );
+                opGet = opNext;
+            } while ( opGet );
+            if ( prep.lastGetOpTime )
+                bin->setLastGet( prep.lastGetOpTime + endTime );
+        } else if ( LargeMemoryBlock *curr = prep.head ) {
+            curr->prev = nullptr;
+            while ( curr ) {
+                // Update local times to global times
+                curr->age += endTime;
+                curr=curr->next;
             }
+#if __TBB_MALLOC_WHITEBOX_TEST
+            tbbmalloc_whitebox::locPutProcessed+=prep.putListNum;
+#endif
+            toRelease = bin->putList(prep.head, prep.tail, bitMask, idx, prep.putListNum, extMemPool->loc.hugeSizeThreshold);
         }
-
-        template <typename Props>
-        LargeMemoryBlock *LargeObjectCacheImpl<Props>::CacheBin::get(ExtMemoryPool *extMemPool, size_t size,
-                                                                     BinBitMask *bitMask, int idx) {
-            LargeMemoryBlock *lmb = NULL;
-            OpGet data = {&lmb, size};
-            CacheBinOperation op(data);
-            ExecuteOperation(&op, extMemPool, bitMask, idx);
-            return lmb;
-        }
-
-        template <typename Props>
-        void LargeObjectCacheImpl<Props>::CacheBin::putList(ExtMemoryPool *extMemPool, LargeMemoryBlock *head,
-                                                            BinBitMask *bitMask, int idx) {
-            MALLOC_ASSERT(sizeof(LargeMemoryBlock) + sizeof(CacheBinOperation) <= head->unalignedSize,
-                          "CacheBinOperation is too large to be placed in LargeMemoryBlock!");
-
-            OpPutList data = {head};
-            CacheBinOperation *op = new (head + 1) CacheBinOperation(data, CBST_NOWAIT);
-            ExecuteOperation(op, extMemPool, bitMask, idx, false);
+        needCleanup = extMemPool->loc.isCleanupNeededOnRange(timeRange, startTime);
+        currTime = endTime - 1;
+    }
+
+    if ( CacheBinOperation *opClean = prep.opClean ) {
+        if ( prep.isCleanAll )
+            *opCast<OpCleanAll>(*opClean).res = bin->cleanAll(bitMask, idx);
+        else
+            *opCast<OpCleanToThreshold>(*opClean).res = bin->cleanToThreshold(prep.cleanTime, bitMask, idx);
+
+        CacheBinOperation *opNext = opClean->next;
+        prep.commitOperation( opClean );
+
+        while ((opClean = opNext) != nullptr) {
+            opNext = opClean->next;
+            prep.commitOperation(opClean);
         }
-
-        template <typename Props>
-        bool LargeObjectCacheImpl<Props>::CacheBin::cleanToThreshold(ExtMemoryPool *extMemPool,
-                                                                     BinBitMask *bitMask, uintptr_t currTime,
-                                                                     int idx) {
-            LargeMemoryBlock *toRelease = NULL;
-
-            /* oldest may be more recent then age, that's why cast to signed type
+    }
+
+    if ( size_t size = prep.updateUsedSize )
+        bin->updateUsedSize(size, bitMask, idx);
+}
+/* ----------------------------------------------------------------------------------------------------- */
+/* --------------------------- Methods for creating and executing operations --------------------------- */
+template<typename Props> void LargeObjectCacheImpl<Props>::
+    CacheBin::ExecuteOperation(CacheBinOperation *op, ExtMemoryPool *extMemPool, BinBitMask *bitMask, int idx, bool longLifeTime)
+{
+    CacheBinFunctor<Props> func( this, extMemPool, bitMask, idx );
+    aggregator.execute( op, func, longLifeTime );
+
+    if ( LargeMemoryBlock *toRelease = func.getToRelease()) {
+        extMemPool->backend.returnLargeObject(toRelease);
+    }
+
+    if ( func.isCleanupNeeded() ) {
+        extMemPool->loc.doCleanup( func.getCurrTime(), /*doThreshDecr=*/false);
+    }
+}
+
+template<typename Props> LargeMemoryBlock *LargeObjectCacheImpl<Props>::
+    CacheBin::get(ExtMemoryPool *extMemPool, size_t size, BinBitMask *bitMask, int idx)
+{
+    LargeMemoryBlock *lmb=nullptr;
+    OpGet data = {&lmb, size, static_cast<uintptr_t>(0)};
+    CacheBinOperation op(data);
+    ExecuteOperation( &op, extMemPool, bitMask, idx );
+    return lmb;
+}
+
+template<typename Props> void LargeObjectCacheImpl<Props>::
+    CacheBin::putList(ExtMemoryPool *extMemPool, LargeMemoryBlock *head, BinBitMask *bitMask, int idx)
+{
+    MALLOC_ASSERT(sizeof(LargeMemoryBlock)+sizeof(CacheBinOperation)<=head->unalignedSize, "CacheBinOperation is too large to be placed in LargeMemoryBlock!");
+
+    OpPutList data = {head};
+    CacheBinOperation *op = new (head+1) CacheBinOperation(data, CBST_NOWAIT);
+    ExecuteOperation( op, extMemPool, bitMask, idx, false );
+}
+
+template<typename Props> bool LargeObjectCacheImpl<Props>::
+    CacheBin::cleanToThreshold(ExtMemoryPool *extMemPool, BinBitMask *bitMask, uintptr_t currTime, int idx)
+{
+    LargeMemoryBlock *toRelease = nullptr;
+
+    /* oldest may be more recent then age, that's why cast to signed type
        was used. age overflow is also processed correctly. */
-            if (last.load(std::memory_order_relaxed)
-                && (intptr_t)(currTime - oldest.load(std::memory_order_relaxed))
-                           > ageThreshold.load(std::memory_order_relaxed)) {
-                OpCleanToThreshold data = {&toRelease, currTime};
-                CacheBinOperation op(data);
-                ExecuteOperation(&op, extMemPool, bitMask, idx);
-            }
-            bool released = toRelease;
-
-            Backend *backend = &extMemPool->backend;
-            while (toRelease) {
-                LargeMemoryBlock *helper = toRelease->next;
-                backend->returnLargeObject(toRelease);
-                toRelease = helper;
-            }
-            return released;
-        }
-
-        template <typename Props>
-        bool LargeObjectCacheImpl<Props>::CacheBin::releaseAllToBackend(ExtMemoryPool *extMemPool,
-                                                                        BinBitMask *bitMask, int idx) {
-            LargeMemoryBlock *toRelease = NULL;
-
-            if (last.load(std::memory_order_relaxed)) {
-                OpCleanAll data = {&toRelease};
-                CacheBinOperation op(data);
-                ExecuteOperation(&op, extMemPool, bitMask, idx);
-            }
-            bool released = toRelease;
-
-            Backend *backend = &extMemPool->backend;
-            while (toRelease) {
-                LargeMemoryBlock *helper = toRelease->next;
-                MALLOC_ASSERT(!helper || lessThanWithOverflow(helper->age, toRelease->age), ASSERT_TEXT);
-                backend->returnLargeObject(toRelease);
-                toRelease = helper;
-            }
-            return released;
-        }
-
-        template <typename Props>
-        void LargeObjectCacheImpl<Props>::CacheBin::updateUsedSize(ExtMemoryPool *extMemPool, size_t size,
-                                                                   BinBitMask *bitMask, int idx) {
-            OpUpdateUsedSize data = {size};
-            CacheBinOperation op(data);
-            ExecuteOperation(&op, extMemPool, bitMask, idx);
-        }
-
-        /* ------------------------------ Unsafe methods used with the aggregator ------------------------------ */
-
-        template <typename Props>
-        LargeMemoryBlock *LargeObjectCacheImpl<Props>::CacheBin::putList(LargeMemoryBlock *head,
-                                                                         LargeMemoryBlock *tail,
-                                                                         BinBitMask *bitMask, int idx,
-                                                                         int num, size_t hugeSizeThreshold) {
-            size_t size = head->unalignedSize;
-            usedSize.store(usedSize.load(std::memory_order_relaxed) - num * size, std::memory_order_relaxed);
-            MALLOC_ASSERT(!last.load(std::memory_order_relaxed)
-                                  || (last.load(std::memory_order_relaxed)->age != 0
-                                      && last.load(std::memory_order_relaxed)->age != -1U),
-                          ASSERT_TEXT);
-            MALLOC_ASSERT((tail == head && num == 1) || (tail != head && num > 1), ASSERT_TEXT);
-            LargeMemoryBlock *toRelease = NULL;
-            if (size < hugeSizeThreshold && !lastCleanedAge) {
-                // 1st object of such size was released.
-                // Not cache it, and remember when this occurs
-                // to take into account during cache miss.
-                lastCleanedAge = tail->age;
-                toRelease = tail;
-                tail = tail->prev;
-                if (tail) tail->next = NULL;
-                else
-                    head = NULL;
-                num--;
-            }
-            if (num) {
-                // add [head;tail] list to cache
-                MALLOC_ASSERT(tail, ASSERT_TEXT);
-                tail->next = first;
-                if (first) first->prev = tail;
-                first = head;
-                if (!last.load(std::memory_order_relaxed)) {
-                    MALLOC_ASSERT(0 == oldest.load(std::memory_order_relaxed), ASSERT_TEXT);
-                    oldest.store(tail->age, std::memory_order_relaxed);
-                    last.store(tail, std::memory_order_relaxed);
-                }
-
-                cachedSize.store(cachedSize.load(std::memory_order_relaxed) + num * size,
-                                 std::memory_order_relaxed);
-            }
-
-            // No used object, and nothing in the bin, mark the bin as empty
-            if (!usedSize.load(std::memory_order_relaxed) && !first) bitMask->set(idx, false);
-
-            return toRelease;
-        }
-
-        template <typename Props>
-        LargeMemoryBlock *LargeObjectCacheImpl<Props>::CacheBin::get() {
-            LargeMemoryBlock *result = first;
-            if (result) {
-                first = result->next;
-                if (first) first->prev = NULL;
-                else {
-                    last.store(nullptr, std::memory_order_relaxed);
-                    oldest.store(0, std::memory_order_relaxed);
-                }
-            }
-
-            return result;
+    if (last.load(std::memory_order_relaxed) &&
+        (intptr_t)(currTime - oldest.load(std::memory_order_relaxed)) > ageThreshold.load(std::memory_order_relaxed)) {
+        OpCleanToThreshold data = {&toRelease, currTime};
+        CacheBinOperation op(data);
+        ExecuteOperation( &op, extMemPool, bitMask, idx );
+    }
+    bool released = toRelease;
+
+    Backend *backend = &extMemPool->backend;
+    while ( toRelease ) {
+        LargeMemoryBlock *helper = toRelease->next;
+        backend->returnLargeObject(toRelease);
+        toRelease = helper;
+    }
+    return released;
+}
+
+template<typename Props> bool LargeObjectCacheImpl<Props>::
+    CacheBin::releaseAllToBackend(ExtMemoryPool *extMemPool, BinBitMask *bitMask, int idx)
+{
+    LargeMemoryBlock *toRelease = nullptr;
+
+    if (last.load(std::memory_order_relaxed)) {
+        OpCleanAll data = {&toRelease};
+        CacheBinOperation op(data);
+        ExecuteOperation(&op, extMemPool, bitMask, idx);
+    }
+    bool released = toRelease;
+
+    Backend *backend = &extMemPool->backend;
+    while ( toRelease ) {
+        LargeMemoryBlock *helper = toRelease->next;
+        MALLOC_ASSERT(!helper || lessThanWithOverflow(helper->age, toRelease->age),
+                      ASSERT_TEXT);
+        backend->returnLargeObject(toRelease);
+        toRelease = helper;
+    }
+    return released;
+}
+
+template<typename Props> void LargeObjectCacheImpl<Props>::
+    CacheBin::updateUsedSize(ExtMemoryPool *extMemPool, size_t size, BinBitMask *bitMask, int idx)
+{
+    OpUpdateUsedSize data = {size};
+    CacheBinOperation op(data);
+    ExecuteOperation( &op, extMemPool, bitMask, idx );
+}
+
+/* ------------------------------ Unsafe methods used with the aggregator ------------------------------ */
+
+template<typename Props> LargeMemoryBlock *LargeObjectCacheImpl<Props>::
+    CacheBin::putList(LargeMemoryBlock *head, LargeMemoryBlock *tail, BinBitMask *bitMask, int idx, int num, size_t hugeSizeThreshold)
+{
+    size_t size = head->unalignedSize;
+    usedSize.store(usedSize.load(std::memory_order_relaxed) - num * size, std::memory_order_relaxed);
+    MALLOC_ASSERT( !last.load(std::memory_order_relaxed) ||
+        (last.load(std::memory_order_relaxed)->age != 0 && last.load(std::memory_order_relaxed)->age != -1U), ASSERT_TEXT );
+    MALLOC_ASSERT( (tail==head && num==1) || (tail!=head && num>1), ASSERT_TEXT );
+    MALLOC_ASSERT( tail, ASSERT_TEXT );
+    LargeMemoryBlock *toRelease = nullptr;
+    if (size < hugeSizeThreshold && !lastCleanedAge) {
+        // 1st object of such size was released.
+        // Not cache it, and remember when this occurs
+        // to take into account during cache miss.
+        lastCleanedAge = tail->age;
+        toRelease = tail;
+        tail = tail->prev;
+        if (tail)
+            tail->next = nullptr;
+        else
+            head = nullptr;
+        num--;
+    }
+    if (num) {
+        // add [head;tail] list to cache
+        tail->next = first;
+        if (first)
+            first->prev = tail;
+        first = head;
+        if (!last.load(std::memory_order_relaxed)) {
+            MALLOC_ASSERT(0 == oldest.load(std::memory_order_relaxed), ASSERT_TEXT);
+            oldest.store(tail->age, std::memory_order_relaxed);
+            last.store(tail, std::memory_order_relaxed);
         }
 
-        template <typename Props>
-        void LargeObjectCacheImpl<Props>::CacheBin::forgetOutdatedState(uintptr_t currTime) {
-            // If the time since the last get is LongWaitFactor times more than ageThreshold
-            // for the bin, treat the bin as rarely-used and forget everything we know
-            // about it.
-            // If LongWaitFactor is too small, we forget too early and
-            // so prevents good caching, while if too high, caching blocks
-            // with unrelated usage pattern occurs.
-            const uintptr_t sinceLastGet = currTime - lastGet;
-            bool doCleanup = false;
-
-            intptr_t threshold = ageThreshold.load(std::memory_order_relaxed);
-            if (threshold) doCleanup = sinceLastGet > Props::LongWaitFactor * threshold;
-            else if (lastCleanedAge)
-                doCleanup = sinceLastGet > Props::LongWaitFactor * (lastCleanedAge - lastGet);
-
-            if (doCleanup) {
-                lastCleanedAge = 0;
-                ageThreshold.store(0, std::memory_order_relaxed);
-            }
+        cachedSize.store(cachedSize.load(std::memory_order_relaxed) + num * size, std::memory_order_relaxed);
+    }
+
+    // No used object, and nothing in the bin, mark the bin as empty
+    if (!usedSize.load(std::memory_order_relaxed) && !first)
+        bitMask->set(idx, false);
+
+    return toRelease;
+}
+
+template<typename Props> LargeMemoryBlock *LargeObjectCacheImpl<Props>::
+    CacheBin::get()
+{
+    LargeMemoryBlock *result=first;
+    if (result) {
+        first = result->next;
+        if (first)
+            first->prev = nullptr;
+        else {
+            last.store(nullptr, std::memory_order_relaxed);
+            oldest.store(0, std::memory_order_relaxed);
         }
-
-        template <typename Props>
-        LargeMemoryBlock *LargeObjectCacheImpl<Props>::CacheBin::cleanToThreshold(uintptr_t currTime,
-                                                                                  BinBitMask *bitMask,
-                                                                                  int idx) {
-            /* oldest may be more recent then age, that's why cast to signed type
+    }
+
+    return result;
+}
+
+template<typename Props> void LargeObjectCacheImpl<Props>::
+    CacheBin::forgetOutdatedState(uintptr_t currTime)
+{
+    // If the time since the last get is LongWaitFactor times more than ageThreshold
+    // for the bin, treat the bin as rarely-used and forget everything we know
+    // about it.
+    // If LongWaitFactor is too small, we forget too early and
+    // so prevents good caching, while if too high, caching blocks
+    // with unrelated usage pattern occurs.
+    const uintptr_t sinceLastGet = currTime - lastGet;
+    bool doCleanup = false;
+
+    intptr_t threshold = ageThreshold.load(std::memory_order_relaxed);
+    if (threshold)
+        doCleanup = sinceLastGet > static_cast<uintptr_t>(Props::LongWaitFactor * threshold);
+    else if (lastCleanedAge)
+        doCleanup = sinceLastGet > static_cast<uintptr_t>(Props::LongWaitFactor * (lastCleanedAge - lastGet));
+
+    if (doCleanup) {
+        lastCleanedAge = 0;
+        ageThreshold.store(0, std::memory_order_relaxed);
+    }
+
+}
+
+template<typename Props> LargeMemoryBlock *LargeObjectCacheImpl<Props>::
+    CacheBin::cleanToThreshold(uintptr_t currTime, BinBitMask *bitMask, int idx)
+{
+    /* oldest may be more recent then age, that's why cast to signed type
     was used. age overflow is also processed correctly. */
-            if (!last.load(std::memory_order_relaxed)
-                || (intptr_t)(currTime - last.load(std::memory_order_relaxed)->age)
-                           < ageThreshold.load(std::memory_order_relaxed))
-                return nullptr;
+    if ( !last.load(std::memory_order_relaxed) ||
+        (intptr_t)(currTime - last.load(std::memory_order_relaxed)->age) < ageThreshold.load(std::memory_order_relaxed) )
+        return nullptr;
 
 #if MALLOC_DEBUG
-            uintptr_t nextAge = 0;
+    uintptr_t nextAge = 0;
 #endif
-            do {
+    do {
 #if MALLOC_DEBUG
-                // check that list ordered
-                MALLOC_ASSERT(
-                        !nextAge || lessThanWithOverflow(nextAge, last.load(std::memory_order_relaxed)->age),
-                        ASSERT_TEXT);
-                nextAge = last.load(std::memory_order_relaxed)->age;
+        // check that list ordered
+        MALLOC_ASSERT(!nextAge || lessThanWithOverflow(nextAge, last.load(std::memory_order_relaxed)->age),
+            ASSERT_TEXT);
+        nextAge = last.load(std::memory_order_relaxed)->age;
 #endif
-                cachedSize.store(cachedSize.load(std::memory_order_relaxed)
-                                         - last.load(std::memory_order_relaxed)->unalignedSize,
-                                 std::memory_order_relaxed);
-                last.store(last.load(std::memory_order_relaxed)->prev, std::memory_order_relaxed);
-            } while (last.load(std::memory_order_relaxed)
-                     && (intptr_t)(currTime - last.load(std::memory_order_relaxed)->age)
-                                > ageThreshold.load(std::memory_order_relaxed));
-
-            LargeMemoryBlock *toRelease = NULL;
-            if (last.load(std::memory_order_relaxed)) {
-                toRelease = last.load(std::memory_order_relaxed)->next;
-                oldest.store(last.load(std::memory_order_relaxed)->age, std::memory_order_relaxed);
-                last.load(std::memory_order_relaxed)->next = NULL;
-            } else {
-                toRelease = first;
-                first = NULL;
-                oldest.store(0, std::memory_order_relaxed);
-                if (!usedSize.load(std::memory_order_relaxed)) bitMask->set(idx, false);
-            }
-            MALLOC_ASSERT(toRelease, ASSERT_TEXT);
-            lastCleanedAge = toRelease->age;
-
-            return toRelease;
-        }
-
-        template <typename Props>
-        LargeMemoryBlock *LargeObjectCacheImpl<Props>::CacheBin::cleanAll(BinBitMask *bitMask, int idx) {
-            if (!last.load(std::memory_order_relaxed)) return NULL;
-
-            LargeMemoryBlock *toRelease = first;
-            last.store(NULL, std::memory_order_relaxed);
-            first = NULL;
-            oldest.store(0, std::memory_order_relaxed);
-            cachedSize.store(0, std::memory_order_relaxed);
-            if (!usedSize.load(std::memory_order_relaxed)) bitMask->set(idx, false);
-
-            return toRelease;
-        }
-
-        /* ----------------------------------------------------------------------------------------------------- */
+        cachedSize.store(cachedSize.load(std::memory_order_relaxed) - last.load(std::memory_order_relaxed)->unalignedSize, std::memory_order_relaxed);
+        last.store(last.load(std::memory_order_relaxed)->prev, std::memory_order_relaxed);
+    } while (last.load(std::memory_order_relaxed) &&
+        (intptr_t)(currTime - last.load(std::memory_order_relaxed)->age) > ageThreshold.load(std::memory_order_relaxed));
+
+    LargeMemoryBlock *toRelease = nullptr;
+    if (last.load(std::memory_order_relaxed)) {
+        toRelease = last.load(std::memory_order_relaxed)->next;
+        oldest.store(last.load(std::memory_order_relaxed)->age, std::memory_order_relaxed);
+        last.load(std::memory_order_relaxed)->next = nullptr;
+    } else {
+        toRelease = first;
+        first = nullptr;
+        oldest.store(0, std::memory_order_relaxed);
+        if (!usedSize.load(std::memory_order_relaxed))
+            bitMask->set(idx, false);
+    }
+    MALLOC_ASSERT( toRelease, ASSERT_TEXT );
+    lastCleanedAge = toRelease->age;
+
+    return toRelease;
+}
+
+template<typename Props> LargeMemoryBlock *LargeObjectCacheImpl<Props>::
+    CacheBin::cleanAll(BinBitMask *bitMask, int idx)
+{
+    if (!last.load(std::memory_order_relaxed)) return nullptr;
+
+    LargeMemoryBlock *toRelease = first;
+    last.store(nullptr, std::memory_order_relaxed);
+    first = nullptr;
+    oldest.store(0, std::memory_order_relaxed);
+    cachedSize.store(0, std::memory_order_relaxed);
+    if (!usedSize.load(std::memory_order_relaxed))
+        bitMask->set(idx, false);
+
+    return toRelease;
+}
+
+/* ----------------------------------------------------------------------------------------------------- */
 
 #if __TBB_MALLOC_BACKEND_STAT
-        template <typename Props>
-        size_t LargeObjectCacheImpl<Props>::CacheBin::reportStat(int num, FILE *f) {
+template<typename Props> size_t LargeObjectCacheImpl<Props>::
+    CacheBin::reportStat(int num, FILE *f)
+{
 #if __TBB_MALLOC_LOCACHE_STAT
-            if (first)
-                printf("%d(%lu): total %lu KB thr %ld lastCln %lu oldest %lu\n", num,
-                       num * Props::CacheStep + Props::MinSize,
-                       cachedSize.load(std::memory_order_relaxed) / 1024,
-                       ageThresholdageThreshold.load(std::memory_order_relaxed), lastCleanedAge,
-                       oldest.load(std::memory_order_relaxed));
+    if (first)
+        printf("%d(%lu): total %lu KB thr %ld lastCln %lu oldest %lu\n",
+               num, num*Props::CacheStep+Props::MinSize,
+               cachedSize.load(std::memory_order_relaxed)/1024, ageThresholdageThreshold.load(std::memory_order_relaxed), lastCleanedAge, oldest.load(std::memory_order_relaxed));
 #else
-            suppress_unused_warning(num);
-            suppress_unused_warning(f);
+    suppress_unused_warning(num);
+    suppress_unused_warning(f);
 #endif
-            return cachedSize.load(std::memory_order_relaxed);
-        }
+    return cachedSize.load(std::memory_order_relaxed);
+}
 #endif
 
-        // Release objects from cache blocks that are older than ageThreshold
-        template <typename Props>
-        bool LargeObjectCacheImpl<Props>::regularCleanup(ExtMemoryPool *extMemPool, uintptr_t currTime,
-                                                         bool doThreshDecr) {
-            bool released = false;
-            BinsSummary binsSummary;
-
-            // Threshold settings is below this cache or starts from zero index
-            if (hugeSizeThresholdIdx == 0) return false;
-
-            // Starting searching for bin that is less than huge size threshold (can be cleaned-up)
-            int startSearchIdx = hugeSizeThresholdIdx - 1;
-
-            for (int i = bitMask.getMaxTrue(startSearchIdx); i >= 0; i = bitMask.getMaxTrue(i - 1)) {
-                bin[i].updateBinsSummary(&binsSummary);
-                if (!doThreshDecr && tooLargeLOC.load(std::memory_order_relaxed) > 2
-                    && binsSummary.isLOCTooLarge()) {
-                    // if LOC is too large for quite long time, decrease the threshold
-                    // based on bin hit statistics.
-                    // For this, redo cleanup from the beginning.
-                    // Note: on this iteration total usedSz can be not too large
-                    // in comparison to total cachedSz, as we calculated it only
-                    // partially. We are ok with it.
-                    i = bitMask.getMaxTrue(startSearchIdx) + 1;
-                    doThreshDecr = true;
-                    binsSummary.reset();
-                    continue;
-                }
-                if (doThreshDecr) bin[i].decreaseThreshold();
-
-                if (bin[i].cleanToThreshold(extMemPool, &bitMask, currTime, i)) { released = true; }
-            }
-            // We want to find if LOC was too large for some time continuously,
-            // so OK with races between incrementing and zeroing, but incrementing
-            // must be atomic.
-            if (binsSummary.isLOCTooLarge()) {
-                tooLargeLOC++;
-            } else {
-                tooLargeLOC.store(0, std::memory_order_relaxed);
-            }
-            return released;
-        }
-
-        template <typename Props>
-        bool LargeObjectCacheImpl<Props>::cleanAll(ExtMemoryPool *extMemPool) {
-            bool released = false;
-            for (int i = numBins - 1; i >= 0; i--) {
-                released |= bin[i].releaseAllToBackend(extMemPool, &bitMask, i);
-            }
-            return released;
+// Release objects from cache blocks that are older than ageThreshold
+template<typename Props>
+bool LargeObjectCacheImpl<Props>::regularCleanup(ExtMemoryPool *extMemPool, uintptr_t currTime, bool doThreshDecr)
+{
+    bool released = false;
+    BinsSummary binsSummary;
+
+    // Threshold settings is below this cache or starts from zero index
+    if (hugeSizeThresholdIdx == 0) return false;
+
+    // Starting searching for bin that is less than huge size threshold (can be cleaned-up)
+    int startSearchIdx = hugeSizeThresholdIdx - 1;
+
+    for (int i = bitMask.getMaxTrue(startSearchIdx); i >= 0; i = bitMask.getMaxTrue(i-1)) {
+        bin[i].updateBinsSummary(&binsSummary);
+        if (!doThreshDecr && tooLargeLOC.load(std::memory_order_relaxed) > 2 && binsSummary.isLOCTooLarge()) {
+            // if LOC is too large for quite long time, decrease the threshold
+            // based on bin hit statistics.
+            // For this, redo cleanup from the beginning.
+            // Note: on this iteration total usedSz can be not too large
+            // in comparison to total cachedSz, as we calculated it only
+            // partially. We are ok with it.
+            i = bitMask.getMaxTrue(startSearchIdx)+1;
+            doThreshDecr = true;
+            binsSummary.reset();
+            continue;
         }
+        if (doThreshDecr)
+            bin[i].decreaseThreshold();
 
-        template <typename Props>
-        void LargeObjectCacheImpl<Props>::reset() {
-            tooLargeLOC.store(0, std::memory_order_relaxed);
-            for (int i = numBins - 1; i >= 0; i--) bin[i].init();
-            bitMask.reset();
+        if (bin[i].cleanToThreshold(extMemPool, &bitMask, currTime, i)) {
+            released = true;
         }
+    }
+    // We want to find if LOC was too large for some time continuously,
+    // so OK with races between incrementing and zeroing, but incrementing
+    // must be atomic.
+    if (binsSummary.isLOCTooLarge()) {
+        tooLargeLOC++;
+    } else {
+        tooLargeLOC.store(0, std::memory_order_relaxed);
+    }
+    return released;
+}
+
+template<typename Props>
+bool LargeObjectCacheImpl<Props>::cleanAll(ExtMemoryPool *extMemPool)
+{
+    bool released = false;
+    for (int i = numBins-1; i >= 0; i--) {
+        released |= bin[i].releaseAllToBackend(extMemPool, &bitMask, i);
+    }
+    return released;
+}
+
+template<typename Props>
+void LargeObjectCacheImpl<Props>::reset() {
+    tooLargeLOC.store(0, std::memory_order_relaxed);
+    for (int i = numBins-1; i >= 0; i--)
+        bin[i].init();
+    bitMask.reset();
+}
 
 #if __TBB_MALLOC_WHITEBOX_TEST
-        template <typename Props>
-        size_t LargeObjectCacheImpl<Props>::getLOCSize() const {
-            size_t size = 0;
-            for (int i = numBins - 1; i >= 0; i--) size += bin[i].getSize();
-            return size;
-        }
-
-        size_t LargeObjectCache::getLOCSize() const {
-            return largeCache.getLOCSize() + hugeCache.getLOCSize();
-        }
-
-        template <typename Props>
-        size_t LargeObjectCacheImpl<Props>::getUsedSize() const {
-            size_t size = 0;
-            for (int i = numBins - 1; i >= 0; i--) size += bin[i].getUsedSize();
-            return size;
-        }
-
-        size_t LargeObjectCache::getUsedSize() const {
-            return largeCache.getUsedSize() + hugeCache.getUsedSize();
-        }
-#endif// __TBB_MALLOC_WHITEBOX_TEST
-
-        inline bool LargeObjectCache::isCleanupNeededOnRange(uintptr_t range, uintptr_t currTime) {
-            return range >= cacheCleanupFreq
-                   || currTime + range < currTime - 1// overflow, 0 is power of 2, do cleanup
-                   // (prev;prev+range] contains n*cacheCleanupFreq
-                   || alignUp(currTime, cacheCleanupFreq) < currTime + range;
-        }
-
-        bool LargeObjectCache::doCleanup(uintptr_t currTime, bool doThreshDecr) {
-            if (!doThreshDecr) extMemPool->allLocalCaches.markUnused();
-            return largeCache.regularCleanup(extMemPool, currTime, doThreshDecr)
-                   | hugeCache.regularCleanup(extMemPool, currTime, doThreshDecr);
-        }
-
-        bool LargeObjectCache::decreasingCleanup() {
-            return doCleanup(cacheCurrTime.load(std::memory_order_acquire), /*doThreshDecr=*/true);
-        }
-
-        bool LargeObjectCache::regularCleanup() {
-            return doCleanup(cacheCurrTime.load(std::memory_order_acquire), /*doThreshDecr=*/false);
-        }
-
-        bool LargeObjectCache::cleanAll() {
-            return largeCache.cleanAll(extMemPool) | hugeCache.cleanAll(extMemPool);
-        }
-
-        void LargeObjectCache::reset() {
-            largeCache.reset();
-            hugeCache.reset();
-        }
-
-        template <typename Props>
-        LargeMemoryBlock *LargeObjectCacheImpl<Props>::get(ExtMemoryPool *extMemoryPool, size_t size) {
-            int idx = Props::sizeToIdx(size);
-
-            LargeMemoryBlock *lmb = bin[idx].get(extMemoryPool, size, &bitMask, idx);
-
-            if (lmb) {
-                MALLOC_ITT_SYNC_ACQUIRED(bin + idx);
-                STAT_increment(getThreadId(), ThreadCommonCounters, allocCachedLargeObj);
-            }
-            return lmb;
-        }
-
-        template <typename Props>
-        void LargeObjectCacheImpl<Props>::updateCacheState(ExtMemoryPool *extMemPool, DecreaseOrIncrease op,
-                                                           size_t size) {
-            int idx = Props::sizeToIdx(size);
-            MALLOC_ASSERT(idx < numBins, ASSERT_TEXT);
-            bin[idx].updateUsedSize(extMemPool, op == decrease ? -size : size, &bitMask, idx);
-        }
+template<typename Props>
+size_t LargeObjectCacheImpl<Props>::getLOCSize() const
+{
+    size_t size = 0;
+    for (int i = numBins-1; i >= 0; i--)
+        size += bin[i].getSize();
+    return size;
+}
+
+size_t LargeObjectCache::getLOCSize() const
+{
+    return largeCache.getLOCSize() + hugeCache.getLOCSize();
+}
+
+template<typename Props>
+size_t LargeObjectCacheImpl<Props>::getUsedSize() const
+{
+    size_t size = 0;
+    for (int i = numBins-1; i >= 0; i--)
+        size += bin[i].getUsedSize();
+    return size;
+}
+
+size_t LargeObjectCache::getUsedSize() const
+{
+    return largeCache.getUsedSize() + hugeCache.getUsedSize();
+}
+#endif // __TBB_MALLOC_WHITEBOX_TEST
+
+inline bool LargeObjectCache::isCleanupNeededOnRange(uintptr_t range, uintptr_t currTime)
+{
+    return range >= cacheCleanupFreq
+        || currTime+range < currTime-1 // overflow, 0 is power of 2, do cleanup
+        // (prev;prev+range] contains n*cacheCleanupFreq
+        || alignUp(currTime, cacheCleanupFreq)<currTime+range;
+}
+
+bool LargeObjectCache::doCleanup(uintptr_t currTime, bool doThreshDecr)
+{
+    if (!doThreshDecr)
+        extMemPool->allLocalCaches.markUnused();
+
+    bool large_cache_cleaned = largeCache.regularCleanup(extMemPool, currTime, doThreshDecr);
+    bool huge_cache_cleaned = hugeCache.regularCleanup(extMemPool, currTime, doThreshDecr);
+    return large_cache_cleaned || huge_cache_cleaned;
+}
+
+bool LargeObjectCache::decreasingCleanup()
+{
+    return doCleanup(cacheCurrTime.load(std::memory_order_acquire), /*doThreshDecr=*/true);
+}
+
+bool LargeObjectCache::regularCleanup()
+{
+    return doCleanup(cacheCurrTime.load(std::memory_order_acquire), /*doThreshDecr=*/false);
+}
+
+bool LargeObjectCache::cleanAll()
+{
+    bool large_cache_cleaned = largeCache.cleanAll(extMemPool);
+    bool huge_cache_cleaned = hugeCache.cleanAll(extMemPool);
+    return large_cache_cleaned || huge_cache_cleaned;
+}
+
+void LargeObjectCache::reset()
+{
+    largeCache.reset();
+    hugeCache.reset();
+}
+
+template<typename Props>
+LargeMemoryBlock *LargeObjectCacheImpl<Props>::get(ExtMemoryPool *extMemoryPool, size_t size)
+{
+    int idx = Props::sizeToIdx(size);
+
+    LargeMemoryBlock *lmb = bin[idx].get(extMemoryPool, size, &bitMask, idx);
+
+    if (lmb) {
+        MALLOC_ITT_SYNC_ACQUIRED(bin+idx);
+        STAT_increment(getThreadId(), ThreadCommonCounters, allocCachedLargeObj);
+    }
+    return lmb;
+}
+
+template<typename Props>
+void LargeObjectCacheImpl<Props>::updateCacheState(ExtMemoryPool *extMemPool, DecreaseOrIncrease op, size_t size)
+{
+    int idx = Props::sizeToIdx(size);
+    MALLOC_ASSERT(idx < static_cast<int>(numBins), ASSERT_TEXT);
+    bin[idx].updateUsedSize(extMemPool, op==decrease? -size : size, &bitMask, idx);
+}
 
 #if __TBB_MALLOC_LOCACHE_STAT
-        template <typename Props>
-        void LargeObjectCacheImpl<Props>::reportStat(FILE *f) {
-            size_t cachedSize = 0;
-            for (int i = 0; i < numBins; i++) cachedSize += bin[i].reportStat(i, f);
-            fprintf(f, "total LOC size %lu MB\n", cachedSize / 1024 / 1024);
-        }
-
-        void LargeObjectCache::reportStat(FILE *f) {
-            largeCache.reportStat(f);
-            hugeCache.reportStat(f);
-            fprintf(f, "cache time %lu\n", cacheCurrTime.load(std::memory_order_relaxed));
-        }
+template<typename Props>
+void LargeObjectCacheImpl<Props>::reportStat(FILE *f)
+{
+    size_t cachedSize = 0;
+    for (int i=0; i<numBins; i++)
+        cachedSize += bin[i].reportStat(i, f);
+    fprintf(f, "total LOC size %lu MB\n", cachedSize/1024/1024);
+}
+
+void LargeObjectCache::reportStat(FILE *f)
+{
+    largeCache.reportStat(f);
+    hugeCache.reportStat(f);
+    fprintf(f, "cache time %lu\n", cacheCurrTime.load(std::memory_order_relaxed));
+}
 #endif
 
-        template <typename Props>
-        void LargeObjectCacheImpl<Props>::putList(ExtMemoryPool *extMemPool, LargeMemoryBlock *toCache) {
-            int toBinIdx = Props::sizeToIdx(toCache->unalignedSize);
-
-            MALLOC_ITT_SYNC_RELEASING(bin + toBinIdx);
-            bin[toBinIdx].putList(extMemPool, toCache, &bitMask, toBinIdx);
-        }
-
-        void LargeObjectCache::updateCacheState(DecreaseOrIncrease op, size_t size) {
-            if (size < maxLargeSize) largeCache.updateCacheState(extMemPool, op, size);
-            else if (size < maxHugeSize)
-                hugeCache.updateCacheState(extMemPool, op, size);
-        }
-
-        uintptr_t LargeObjectCache::getCurrTimeRange(uintptr_t range) {
-            return (cacheCurrTime.fetch_add(range) + 1);
-        }
-
-        void LargeObjectCache::registerRealloc(size_t oldSize, size_t newSize) {
-            updateCacheState(decrease, oldSize);
-            updateCacheState(increase, alignToBin(newSize));
+template<typename Props>
+void LargeObjectCacheImpl<Props>::putList(ExtMemoryPool *extMemPool, LargeMemoryBlock *toCache)
+{
+    int toBinIdx = Props::sizeToIdx(toCache->unalignedSize);
+
+    MALLOC_ITT_SYNC_RELEASING(bin+toBinIdx);
+    bin[toBinIdx].putList(extMemPool, toCache, &bitMask, toBinIdx);
+}
+
+void LargeObjectCache::updateCacheState(DecreaseOrIncrease op, size_t size)
+{
+    if (size < maxLargeSize)
+        largeCache.updateCacheState(extMemPool, op, size);
+    else if (size < maxHugeSize)
+        hugeCache.updateCacheState(extMemPool, op, size);
+}
+
+
+uintptr_t LargeObjectCache::getCurrTimeRange(uintptr_t range)
+{
+    return (cacheCurrTime.fetch_add(range) + 1);
+}
+
+void LargeObjectCache::registerRealloc(size_t oldSize, size_t newSize)
+{
+    updateCacheState(decrease, oldSize);
+    updateCacheState(increase, alignToBin(newSize));
+}
+
+size_t LargeObjectCache::alignToBin(size_t size) {
+    return size < maxLargeSize ? LargeCacheType::alignToBin(size) : HugeCacheType::alignToBin(size);
+}
+
+// Used for internal purpose
+int LargeObjectCache::sizeToIdx(size_t size)
+{
+    MALLOC_ASSERT(size <= maxHugeSize, ASSERT_TEXT);
+    return size < maxLargeSize ?
+        LargeCacheType::sizeToIdx(size) :
+        LargeCacheType::numBins + HugeCacheType::sizeToIdx(size);
+}
+
+void LargeObjectCache::putList(LargeMemoryBlock *list)
+{
+    LargeMemoryBlock *toProcess, *n;
+
+    for (LargeMemoryBlock *curr = list; curr; curr = toProcess) {
+        LargeMemoryBlock *tail = curr;
+        toProcess = curr->next;
+        if (!sizeInCacheRange(curr->unalignedSize)) {
+            extMemPool->backend.returnLargeObject(curr);
+            continue;
         }
-
-        size_t LargeObjectCache::alignToBin(size_t size) {
-            return size < maxLargeSize ? LargeCacheType::alignToBin(size) : HugeCacheType::alignToBin(size);
-        }
-
-        // Used for internal purpose
-        int LargeObjectCache::sizeToIdx(size_t size) {
-            MALLOC_ASSERT(size <= maxHugeSize, ASSERT_TEXT);
-            return size < maxLargeSize ? LargeCacheType::sizeToIdx(size)
-                                       : LargeCacheType::numBins + HugeCacheType::sizeToIdx(size);
-        }
-
-        void LargeObjectCache::putList(LargeMemoryBlock *list) {
-            LargeMemoryBlock *toProcess, *n;
-
-            for (LargeMemoryBlock *curr = list; curr; curr = toProcess) {
-                LargeMemoryBlock *tail = curr;
-                toProcess = curr->next;
-                if (!sizeInCacheRange(curr->unalignedSize)) {
-                    extMemPool->backend.returnLargeObject(curr);
-                    continue;
-                }
-                int currIdx = sizeToIdx(curr->unalignedSize);
-
-                // Find all blocks fitting to same bin. Not use more efficient sorting
-                // algorithm because list is short (commonly,
-                // LocalLOC's HIGH_MARK-LOW_MARK, i.e. 24 items).
-                for (LargeMemoryBlock *b = toProcess; b; b = n) {
-                    n = b->next;
-                    if (sizeToIdx(b->unalignedSize) == currIdx) {
-                        tail->next = b;
-                        tail = b;
-                        if (toProcess == b) toProcess = toProcess->next;
-                        else {
-                            b->prev->next = b->next;
-                            if (b->next) b->next->prev = b->prev;
-                        }
-                    }
+        int currIdx = sizeToIdx(curr->unalignedSize);
+
+        // Find all blocks fitting to same bin. Not use more efficient sorting
+        // algorithm because list is short (commonly,
+        // LocalLOC's HIGH_MARK-LOW_MARK, i.e. 24 items).
+        for (LargeMemoryBlock *b = toProcess; b; b = n) {
+            n = b->next;
+            if (sizeToIdx(b->unalignedSize) == currIdx) {
+                tail->next = b;
+                tail = b;
+                if (toProcess == b)
+                    toProcess = toProcess->next;
+                else {
+                    b->prev->next = b->next;
+                    if (b->next)
+                        b->next->prev = b->prev;
                 }
-                tail->next = NULL;
-                if (curr->unalignedSize < maxLargeSize) largeCache.putList(extMemPool, curr);
-                else
-                    hugeCache.putList(extMemPool, curr);
-            }
-        }
-
-        void LargeObjectCache::put(LargeMemoryBlock *largeBlock) {
-            size_t blockSize = largeBlock->unalignedSize;
-            if (sizeInCacheRange(blockSize)) {
-                largeBlock->next = NULL;
-                if (blockSize < maxLargeSize) largeCache.putList(extMemPool, largeBlock);
-                else
-                    hugeCache.putList(extMemPool, largeBlock);
-            } else {
-                extMemPool->backend.returnLargeObject(largeBlock);
-            }
-        }
-
-        LargeMemoryBlock *LargeObjectCache::get(size_t size) {
-            MALLOC_ASSERT(size >= minLargeSize, ASSERT_TEXT);
-            if (sizeInCacheRange(size)) {
-                return size < maxLargeSize ? largeCache.get(extMemPool, size)
-                                           : hugeCache.get(extMemPool, size);
             }
-            return NULL;
         }
-
-        LargeMemoryBlock *ExtMemoryPool::mallocLargeObject(MemoryPool *pool, size_t allocationSize) {
+        tail->next = nullptr;
+        if (curr->unalignedSize < maxLargeSize)
+            largeCache.putList(extMemPool, curr);
+        else
+            hugeCache.putList(extMemPool, curr);
+    }
+}
+
+void LargeObjectCache::put(LargeMemoryBlock *largeBlock)
+{
+    size_t blockSize = largeBlock->unalignedSize;
+    if (sizeInCacheRange(blockSize)) {
+        largeBlock->next = nullptr;
+        if (blockSize < maxLargeSize)
+            largeCache.putList(extMemPool, largeBlock);
+        else
+            hugeCache.putList(extMemPool, largeBlock);
+    } else {
+        extMemPool->backend.returnLargeObject(largeBlock);
+    }
+}
+
+LargeMemoryBlock *LargeObjectCache::get(size_t size)
+{
+    MALLOC_ASSERT( size >= minLargeSize, ASSERT_TEXT );
+    if (sizeInCacheRange(size)) {
+        return size < maxLargeSize ?
+            largeCache.get(extMemPool, size) : hugeCache.get(extMemPool, size);
+    }
+    return nullptr;
+}
+
+LargeMemoryBlock *ExtMemoryPool::mallocLargeObject(MemoryPool *pool, size_t allocationSize)
+{
 #if __TBB_MALLOC_LOCACHE_STAT
-            mallocCalls++;
-            memAllocKB.fetch_add(allocationSize / 1024);
+    mallocCalls++;
+    memAllocKB.fetch_add(allocationSize/1024);
 #endif
-            LargeMemoryBlock *lmb = loc.get(allocationSize);
-            if (!lmb) {
-                BackRefIdx backRefIdx = BackRefIdx::newBackRef(/*largeObj=*/true);
-                if (backRefIdx.isInvalid()) return NULL;
-
-                // unalignedSize is set in getLargeBlock
-                lmb = backend.getLargeBlock(allocationSize);
-                if (!lmb) {
-                    removeBackRef(backRefIdx);
-                    loc.updateCacheState(decrease, allocationSize);
-                    return NULL;
-                }
-                lmb->backRefIdx = backRefIdx;
-                lmb->pool = pool;
-                STAT_increment(getThreadId(), ThreadCommonCounters, allocNewLargeObj);
-            } else {
+    LargeMemoryBlock* lmb = loc.get(allocationSize);
+    if (!lmb) {
+        BackRefIdx backRefIdx = BackRefIdx::newBackRef(/*largeObj=*/true);
+        if (backRefIdx.isInvalid())
+            return nullptr;
+
+        // unalignedSize is set in getLargeBlock
+        lmb = backend.getLargeBlock(allocationSize);
+        if (!lmb) {
+            removeBackRef(backRefIdx);
+            loc.updateCacheState(decrease, allocationSize);
+            return nullptr;
+        }
+        lmb->backRefIdx = backRefIdx;
+        lmb->pool = pool;
+        STAT_increment(getThreadId(), ThreadCommonCounters, allocNewLargeObj);
+    } else {
 #if __TBB_MALLOC_LOCACHE_STAT
-                cacheHits++;
-                memHitKB.fetch_add(allocationSize / 1024);
+        cacheHits++;
+        memHitKB.fetch_add(allocationSize/1024);
 #endif
-            }
-            return lmb;
-        }
-
-        void ExtMemoryPool::freeLargeObject(LargeMemoryBlock *mBlock) { loc.put(mBlock); }
+    }
+    return lmb;
+}
+
+void ExtMemoryPool::freeLargeObject(LargeMemoryBlock *mBlock)
+{
+    loc.put(mBlock);
+}
+
+void ExtMemoryPool::freeLargeObjectList(LargeMemoryBlock *head)
+{
+    loc.putList(head);
+}
+
+bool ExtMemoryPool::softCachesCleanup()
+{
+    bool ret = false;
+    if (!softCachesCleanupInProgress.exchange(1, std::memory_order_acq_rel)) {
+        ret = loc.regularCleanup();
+        softCachesCleanupInProgress.store(0, std::memory_order_release);
+    }
+    return ret;
+}
+
+bool ExtMemoryPool::hardCachesCleanup(bool wait)
+{
+    if (hardCachesCleanupInProgress.exchange(1, std::memory_order_acq_rel)) {
+        if (!wait)
+            return false;
 
-        void ExtMemoryPool::freeLargeObjectList(LargeMemoryBlock *head) { loc.putList(head); }
+        AtomicBackoff backoff;
+        while (hardCachesCleanupInProgress.exchange(1, std::memory_order_acq_rel))
+            backoff.pause();
+    }
 
-        bool ExtMemoryPool::softCachesCleanup() { return loc.regularCleanup(); }
+    // thread-local caches must be cleaned before LOC,
+    // because object from thread-local cache can be released to LOC
+    bool ret = releaseAllLocalCaches();
+    ret |= orphanedBlocks.cleanup(&backend);
+    ret |= loc.cleanAll();
+    ret |= backend.clean();
 
-        bool ExtMemoryPool::hardCachesCleanup() {
-            // thread-local caches must be cleaned before LOC,
-            // because object from thread-local cache can be released to LOC
-            bool ret = releaseAllLocalCaches();
-            ret |= orphanedBlocks.cleanup(&backend);
-            ret |= loc.cleanAll();
-            ret |= backend.clean();
-            return ret;
-        }
+    hardCachesCleanupInProgress.store(0, std::memory_order_release);
+    return ret;
+}
 
 #if BACKEND_HAS_MREMAP
-        void *ExtMemoryPool::remap(void *ptr, size_t oldSize, size_t newSize, size_t alignment) {
-            const size_t oldUnalignedSize = ((LargeObjectHdr *) ptr - 1)->memoryBlock->unalignedSize;
-            void *o = backend.remap(ptr, oldSize, newSize, alignment);
-            if (o) {
-                LargeMemoryBlock *lmb = ((LargeObjectHdr *) o - 1)->memoryBlock;
-                loc.registerRealloc(oldUnalignedSize, lmb->unalignedSize);
-            }
-            return o;
-        }
+void *ExtMemoryPool::remap(void *ptr, size_t oldSize, size_t newSize, size_t alignment)
+{
+    const size_t oldUnalignedSize = ((LargeObjectHdr*)ptr - 1)->memoryBlock->unalignedSize;
+    void *o = backend.remap(ptr, oldSize, newSize, alignment);
+    if (o) {
+        LargeMemoryBlock *lmb = ((LargeObjectHdr*)o - 1)->memoryBlock;
+        loc.registerRealloc(oldUnalignedSize, lmb->unalignedSize);
+    }
+    return o;
+}
 #endif /* BACKEND_HAS_MREMAP */
 
-        /*********** End allocation of large objects **********/
+/*********** End allocation of large objects **********/
 
-    }// namespace internal
-}// namespace rml
+} // namespace internal
+} // namespace rml
 
 #if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
-#pragma warning(pop)
+    #pragma warning(pop)
 #endif
diff --git a/external/tbb/src/tbbmalloc/large_objects.h b/external/tbb/src/tbbmalloc/large_objects.h
index 556d3fbf..58d7c81a 100644
--- a/external/tbb/src/tbbmalloc/large_objects.h
+++ b/external/tbb/src/tbbmalloc/large_objects.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -80,16 +80,26 @@ struct HugeBinStructureProps {
     static const unsigned NumBins = (MaxSizeExp - MinSizeExp) * StepFactor;
 
     static size_t alignToBin(size_t size) {
-        size_t minorStepExp = BitScanRev(size) - StepFactorExp;
+        MALLOC_ASSERT(size >= StepFactor, "Size must not be less than the StepFactor");
+
+        int sizeExp = (int)BitScanRev(size);
+        MALLOC_ASSERT(sizeExp >= 0, "BitScanRev() cannot return -1, as size >= stepfactor > 0");
+        MALLOC_ASSERT(sizeExp >= StepFactorExp, "sizeExp >= StepFactorExp, because size >= stepFactor");
+        int minorStepExp = sizeExp - StepFactorExp;
+
         return alignUp(size, 1ULL << minorStepExp);
     }
 
-    // Sizes between the power of 2 values are aproximated to StepFactor.
+    // Sizes between the power of 2 values are approximated to StepFactor.
     static int sizeToIdx(size_t size) {
         MALLOC_ASSERT(MinSize <= size && size <= MaxSize, ASSERT_TEXT);
+
         int sizeExp = (int)BitScanRev(size); // same as __TBB_Log2
-        size_t majorStepSize = 1ULL << sizeExp;
+        MALLOC_ASSERT(sizeExp >= 0, "BitScanRev() cannot return -1, as size >= stepfactor > 0");
+        MALLOC_ASSERT(sizeExp >= StepFactorExp, "sizeExp >= StepFactorExp, because size >= stepFactor");
         int minorStepExp = sizeExp - StepFactorExp;
+
+        size_t majorStepSize = 1ULL << sizeExp;
         int minorIdx = (size - majorStepSize) >> minorStepExp;
         MALLOC_ASSERT(size == majorStepSize + ((size_t)minorIdx << minorStepExp),
             "Size is not aligned on the bin");
@@ -174,7 +184,7 @@ class LargeObjectCacheImpl {
 
     public:
         void init() {
-            memset(this, 0, sizeof(CacheBin));
+            memset(static_cast<void*>(this), 0, sizeof(CacheBin));
         }
 
         /* ---------- Cache accessors ---------- */
@@ -240,7 +250,7 @@ class LargeObjectCacheImpl {
     // for fast finding of used bins and bins with non-zero usedSize;
     // indexed from the end, as we need largest 1st
     BinBitMask   bitMask;
-    // bins with lists of recently freed large blocks cached for re-use
+    // bins with lists of recently freed large blocks cached for reuse
     CacheBin bin[numBins];
 
 public:
diff --git a/external/tbb/src/tbbmalloc/shared_utils.h b/external/tbb/src/tbbmalloc/shared_utils.h
index f90881de..39418c85 100644
--- a/external/tbb/src/tbbmalloc/shared_utils.h
+++ b/external/tbb/src/tbbmalloc/shared_utils.h
@@ -90,7 +90,7 @@ T min ( const T& val1, const T& val2 ) {
 // TODO: add a constructor to remove warnings suppression
 struct parseFileItem {
     const char* format;
-    unsigned long long& value;
+    long long& value;
 };
 
 #if defined(_MSC_VER) && (_MSC_VER<1900) && !defined(__INTEL_COMPILER)
diff --git a/external/tbb/src/tbbmalloc/tbbmalloc.cpp b/external/tbb/src/tbbmalloc/tbbmalloc.cpp
index aa91b5b9..b72e03a7 100644
--- a/external/tbb/src/tbbmalloc/tbbmalloc.cpp
+++ b/external/tbb/src/tbbmalloc/tbbmalloc.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2023 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -14,23 +14,23 @@
     limitations under the License.
 */
 
-#include "TypeDefinitions.h"// Customize.h and proxy.h get included
+#include "TypeDefinitions.h" // Customize.h and proxy.h get included
 #include "tbbmalloc_internal_api.h"
 
-#include "../tbb/assert_impl.h"// Out-of-line TBB assertion handling routines are instantiated here.
-#include "oneapi/tbb/scalable_allocator.h"
+#include "../tbb/assert_impl.h" // Out-of-line TBB assertion handling routines are instantiated here.
 #include "oneapi/tbb/version.h"
+#include "oneapi/tbb/scalable_allocator.h"
 
 #undef UNICODE
 
 #if USE_PTHREAD
-#include <dlfcn.h>// dlopen
+#include <dlfcn.h> // dlopen
 #elif USE_WINTHREAD
 #include <windows.h>
 #endif
 
 namespace rml {
-    namespace internal {
+namespace internal {
 
 #if TBB_USE_DEBUG
 #define DEBUG_SUFFIX "_debug"
@@ -39,66 +39,77 @@ namespace rml {
 #endif /* TBB_USE_DEBUG */
 
 // MALLOCLIB_NAME is the name of the oneTBB memory allocator library.
-#if _WIN32 || _WIN64
+#if _WIN32||_WIN64
 #define MALLOCLIB_NAME "tbbmalloc" DEBUG_SUFFIX ".dll"
 #elif __APPLE__
-#define MALLOCLIB_NAME "libtbbmalloc" DEBUG_SUFFIX ".dylib"
+#define MALLOCLIB_NAME "libtbbmalloc" DEBUG_SUFFIX ".2.dylib"
 #elif __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __sun || _AIX || __ANDROID__
 #define MALLOCLIB_NAME "libtbbmalloc" DEBUG_SUFFIX ".so"
 #elif __unix__
-#define MALLOCLIB_NAME "libtbbmalloc" DEBUG_SUFFIX __TBB_STRING(.so .2)
+#define MALLOCLIB_NAME "libtbbmalloc" DEBUG_SUFFIX  __TBB_STRING(.so.2)
 #else
 #error Unknown OS
 #endif
 
-        void init_tbbmalloc() {
+void init_tbbmalloc() {
 #if __TBB_USE_ITT_NOTIFY
-            MallocInitializeITT();
+    MallocInitializeITT();
 #endif
 
 /* Preventing TBB allocator library from unloading to prevent
    resource leak, as memory is not released on the library unload.
 */
 #if USE_WINTHREAD && !__TBB_SOURCE_DIRECTLY_INCLUDED && !__TBB_WIN8UI_SUPPORT
-            // Prevent Windows from displaying message boxes if it fails to load library
-            UINT prev_mode = SetErrorMode(SEM_FAILCRITICALERRORS);
-            HMODULE lib;
-            BOOL ret = GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS
-                                                 | GET_MODULE_HANDLE_EX_FLAG_PIN,
-                                         (LPCTSTR) &scalable_malloc, &lib);
-            MALLOC_ASSERT(lib && ret, "Allocator can't find itself.");
-            SetErrorMode(prev_mode);
+    // Prevent Windows from displaying message boxes if it fails to load library
+    UINT prev_mode = SetErrorMode (SEM_FAILCRITICALERRORS);
+    HMODULE lib;
+    BOOL ret = GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS
+                                 |GET_MODULE_HANDLE_EX_FLAG_PIN,
+                                 (LPCTSTR)&scalable_malloc, &lib);
+    MALLOC_ASSERT(lib && ret, "Allocator can't find itself.");
+    tbb::detail::suppress_unused_warning(ret);
+    SetErrorMode (prev_mode);
 #endif /* USE_PTHREAD && !__TBB_SOURCE_DIRECTLY_INCLUDED */
-        }
+}
 
 #if !__TBB_SOURCE_DIRECTLY_INCLUDED
 #if USE_WINTHREAD
-        extern "C" BOOL WINAPI DllMain(HINSTANCE /*hInst*/, DWORD callReason, LPVOID lpvReserved) {
-            if (callReason == DLL_THREAD_DETACH) {
-                __TBB_mallocThreadShutdownNotification();
-            } else if (callReason == DLL_PROCESS_DETACH) {
-                __TBB_mallocProcessShutdownNotification(lpvReserved != NULL);
-            }
-            return TRUE;
-        }
-#else  /* !USE_WINTHREAD */
-        struct RegisterProcessShutdownNotification {
-            // Work around non-reentrancy in dlopen() on Android
-            RegisterProcessShutdownNotification() {
-                // prevents unloading, POSIX case
-
-                // We need better support for the library pinning
-                // when dlopen can't find TBBmalloc library.
-                // for example: void *ret = dlopen(MALLOCLIB_NAME, RTLD_NOW);
-                // MALLOC_ASSERT(ret, "Allocator can't load itself.");
-                dlopen(MALLOCLIB_NAME, RTLD_NOW);
-            }
-            ~RegisterProcessShutdownNotification() { __TBB_mallocProcessShutdownNotification(false); }
-        };
-
-        static RegisterProcessShutdownNotification reg;
+extern "C" BOOL WINAPI DllMain( HINSTANCE /*hInst*/, DWORD callReason, LPVOID lpvReserved)
+{
+    if (callReason==DLL_THREAD_DETACH)
+    {
+        __TBB_mallocThreadShutdownNotification();
+    }
+    else if (callReason==DLL_PROCESS_DETACH)
+    {
+        __TBB_mallocProcessShutdownNotification(lpvReserved != nullptr);
+    }
+    return TRUE;
+}
+#else /* !USE_WINTHREAD */
+struct RegisterProcessShutdownNotification {
+// Work around non-reentrancy in dlopen() on Android
+    RegisterProcessShutdownNotification() {
+        // prevents unloading, POSIX case
+
+        // We need better support for the library pinning
+        // when dlopen can't find TBBmalloc library.
+        // for example: void *ret = dlopen(MALLOCLIB_NAME, RTLD_NOW);
+        // MALLOC_ASSERT(ret, "Allocator can't load itself.");
+        dlopen(MALLOCLIB_NAME, RTLD_NOW);
+    }
+
+    RegisterProcessShutdownNotification(RegisterProcessShutdownNotification&) = delete;
+    RegisterProcessShutdownNotification& operator=(const RegisterProcessShutdownNotification&) = delete;
+
+    ~RegisterProcessShutdownNotification() {
+        __TBB_mallocProcessShutdownNotification(false);
+    }
+};
+
+static RegisterProcessShutdownNotification reg;
 #endif /* !USE_WINTHREAD */
 #endif /* !__TBB_SOURCE_DIRECTLY_INCLUDED */
 
-    }// namespace internal
-}// namespace rml
+} } // namespaces
+
diff --git a/external/tbb/src/tbbmalloc/tbbmalloc.rc b/external/tbb/src/tbbmalloc/tbbmalloc.rc
new file mode 100644
index 00000000..08d098cf
--- /dev/null
+++ b/external/tbb/src/tbbmalloc/tbbmalloc.rc
@@ -0,0 +1,74 @@
+// Copyright (c) 2005-2025 Intel Corporation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Includes
+//
+#include <winresrc.h>
+#include "../../include/oneapi/tbb/version.h"
+
+/////////////////////////////////////////////////////////////////////////////
+// Neutral resources
+
+#ifdef _WIN32
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+#define TBB_VERNUMBERS TBB_VERSION_MAJOR,TBB_VERSION_MINOR,TBB_VERSION_PATCH
+#define TBB_VERSION TBB_VERSION_STRING
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION TBB_VERNUMBERS
+ PRODUCTVERSION TBB_VERNUMBERS
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "000004b0"
+        BEGIN
+            VALUE "CompanyName", "Intel Corporation\0"
+            VALUE "FileDescription", "oneAPI Threading Building Blocks (oneTBB) library\0"
+            VALUE "FileVersion", TBB_VERSION "\0"
+            VALUE "LegalCopyright", "Copyright 2005-2025 Intel Corporation.  All Rights Reserved.\0"
+            VALUE "LegalTrademarks", "\0"
+#ifndef TBB_USE_DEBUG
+            VALUE "OriginalFilename", "tbbmalloc.dll\0"
+#else
+            VALUE "OriginalFilename", "tbbmalloc_debug.dll\0"
+#endif
+            VALUE "ProductName", "oneAPI Threading Building Blocks (oneTBB)\0"
+            VALUE "ProductVersion", TBB_VERSION "\0"
+            VALUE "PrivateBuild", "\0"
+            VALUE "SpecialBuild", "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x0, 1200
+    END
+END
diff --git a/external/tbb/src/tbbmalloc/tbbmalloc_internal.h b/external/tbb/src/tbbmalloc/tbbmalloc_internal.h
index fe4ad74e..bc0ee2ff 100644
--- a/external/tbb/src/tbbmalloc/tbbmalloc_internal.h
+++ b/external/tbb/src/tbbmalloc/tbbmalloc_internal.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -67,7 +67,7 @@
 #define TRACEF(x) ((void)0)
 #endif /* MALLOC_TRACE */
 
-#define ASSERT_TEXT NULL
+#define ASSERT_TEXT nullptr
 
 #define COLLECT_STATISTICS ( MALLOC_DEBUG && MALLOCENV_COLLECT_STATISTICS )
 #ifndef USE_INTERNAL_TID
@@ -102,9 +102,13 @@ void suppress_unused_warning( const T& ) {}
 /*
  * Default huge page size
  */
+#if defined __loongarch64
+static const size_t HUGE_PAGE_SIZE = 32 * 1024 * 1024;
+#else
 static const size_t HUGE_PAGE_SIZE = 2 * 1024 * 1024;
+#endif
 
-/********** End of global default constatns *********/
+/********** End of global default constants *********/
 
 /********** Various numeric parameters controlling allocations ********/
 
@@ -228,9 +232,13 @@ template<unsigned NUM>
 class BitMaskMax : public BitMaskBasic<NUM> {
 public:
     void set(size_t idx, bool val) {
+        MALLOC_ASSERT(NUM >= idx + 1, ASSERT_TEXT);
+
         BitMaskBasic<NUM>::set(NUM - 1 - idx, val);
     }
     int getMaxTrue(unsigned startIdx) const {
+        MALLOC_ASSERT(NUM >= startIdx + 1, ASSERT_TEXT);
+
         int p = BitMaskBasic<NUM>::getMinTrue(NUM-startIdx-1);
         return -1==p? -1 : (int)NUM - 1 - p;
     }
@@ -253,7 +261,7 @@ class AllLocalCaches {
     void unregisterThread(TLSRemote *tls);
     bool cleanup(bool cleanOnlyUnused);
     void markUnused();
-    void reset() { head = NULL; }
+    void reset() { head = nullptr; }
 };
 
 class LifoList {
@@ -339,12 +347,12 @@ class BackRefIdx { // composite index to backreference array
 // Block header is used during block coalescing
 // and must be preserved in used blocks.
 class BlockI {
-#if __clang__
+#if __clang__ && !__INTEL_COMPILER
     #pragma clang diagnostic push
     #pragma clang diagnostic ignored "-Wunused-private-field"
 #endif
     intptr_t     blockState[2];
-#if __clang__
+#if __clang__ && !__INTEL_COMPILER
     #pragma clang diagnostic pop // "-Wunused-private-field"
 #endif
 };
@@ -447,31 +455,31 @@ class HugePagesStatus {
     void parseSystemMemInfo() {
         bool hpAvailable  = false;
         bool thpAvailable = false;
-        unsigned long long hugePageSize = 0;
+        long long hugePageSize = -1;
 
 #if __unix__
         // Check huge pages existence
-        unsigned long long meminfoHugePagesTotal = 0;
+        long long meminfoHugePagesTotal = 0;
 
         parseFileItem meminfoItems[] = {
             // Parse system huge page size
-            { "Hugepagesize: %llu kB", hugePageSize },
+            { "Hugepagesize: %lld kB", hugePageSize },
             // Check if there are preallocated huge pages on the system
             // https://www.kernel.org/doc/Documentation/vm/hugetlbpage.txt
-            { "HugePages_Total: %llu", meminfoHugePagesTotal } };
+            { "HugePages_Total: %lld", meminfoHugePagesTotal } };
 
         parseFile</*BUFF_SIZE=*/100>("/proc/meminfo", meminfoItems);
 
         // Double check another system information regarding preallocated
         // huge pages if there are no information in /proc/meminfo
-        unsigned long long vmHugePagesTotal = 0;
+        long long vmHugePagesTotal = 0;
 
-        parseFileItem vmItem[] = { { "%llu", vmHugePagesTotal } };
+        parseFileItem vmItem[] = { { "%lld", vmHugePagesTotal } };
 
         // We parse a counter number, it can't be huge
         parseFile</*BUFF_SIZE=*/100>("/proc/sys/vm/nr_hugepages", vmItem);
 
-        if (meminfoHugePagesTotal > 0 || vmHugePagesTotal > 0) {
+        if (hugePageSize > -1 && (meminfoHugePagesTotal > 0 || vmHugePagesTotal > 0)) {
             MALLOC_ASSERT(hugePageSize != 0, "Huge Page size can't be zero if we found preallocated.");
 
             // Any non zero value clearly states that there are preallocated
@@ -480,11 +488,11 @@ class HugePagesStatus {
         }
 
         // Check if there is transparent huge pages support on the system
-        unsigned long long thpPresent = 'n';
+        long long thpPresent = 'n';
         parseFileItem thpItem[] = { { "[alwa%cs] madvise never\n", thpPresent } };
         parseFile</*BUFF_SIZE=*/100>("/sys/kernel/mm/transparent_hugepage/enabled", thpItem);
 
-        if (thpPresent == 'y') {
+        if (hugePageSize > -1 && thpPresent == 'y') {
             MALLOC_ASSERT(hugePageSize != 0, "Huge Page size can't be zero if we found thp existence.");
             thpAvailable = true;
         }
@@ -492,7 +500,11 @@ class HugePagesStatus {
         MALLOC_ASSERT(!pageSize, "Huge page size can't be set twice. Double initialization.");
 
         // Initialize object variables
-        pageSize       = hugePageSize * 1024; // was read in KB from meminfo
+        if (hugePageSize > -1) {
+            pageSize = hugePageSize * 1024; // was read in KB from meminfo
+        } else {
+            pageSize = 0;
+        }
         isHPAvailable  = hpAvailable;
         isTHPAvailable = thpAvailable;
     }
@@ -576,6 +588,9 @@ struct ExtMemoryPool {
                       fixedPool;
     TLSKey            tlsPointerKey;  // per-pool TLS key
 
+    std::atomic<int> softCachesCleanupInProgress;
+    std::atomic<int> hardCachesCleanupInProgress;
+
     bool init(intptr_t poolId, rawAllocType rawAlloc, rawFreeType rawFree,
               size_t granularity, bool keepAllMemory, bool fixedPool);
     bool initTLS();
@@ -586,7 +601,7 @@ struct ExtMemoryPool {
      // true if something has been released
     bool softCachesCleanup();
     bool releaseAllLocalCaches();
-    bool hardCachesCleanup();
+    bool hardCachesCleanup(bool wait);
     void *remap(void *ptr, size_t oldSize, size_t newSize, size_t alignment);
     bool reset() {
         loc.reset();
@@ -669,13 +684,16 @@ class RecursiveMallocCallProtector {
     char scoped_lock_space[sizeof(MallocMutex::scoped_lock)+1];
     
 public:
-
-    RecursiveMallocCallProtector() : lock_acquired(NULL) {
+    RecursiveMallocCallProtector() : lock_acquired(nullptr) {
         lock_acquired = new (scoped_lock_space) MallocMutex::scoped_lock( rmc_mutex );
         if (canUsePthread)
             owner_thread.store(pthread_self(), std::memory_order_relaxed);
         autoObjPtr.store(&scoped_lock_space, std::memory_order_relaxed);
     }
+
+    RecursiveMallocCallProtector(RecursiveMallocCallProtector&) = delete;
+    RecursiveMallocCallProtector& operator=(RecursiveMallocCallProtector) = delete;
+
     ~RecursiveMallocCallProtector() {
         if (lock_acquired) {
             autoObjPtr.store(nullptr, std::memory_order_relaxed);
diff --git a/external/tbb/src/tbbmalloc_proxy/CMakeLists.txt b/external/tbb/src/tbbmalloc_proxy/CMakeLists.txt
index d2024924..554ddc85 100644
--- a/external/tbb/src/tbbmalloc_proxy/CMakeLists.txt
+++ b/external/tbb/src/tbbmalloc_proxy/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Intel Corporation
+# Copyright (c) 2020-2024 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,6 +20,10 @@ add_library(tbbmalloc_proxy
     function_replacement.cpp
     proxy.cpp)
 
+if (WIN32)
+    target_sources(tbbmalloc_proxy PRIVATE tbbmalloc_proxy.rc)
+endif()
+
 add_library(TBB::tbbmalloc_proxy ALIAS tbbmalloc_proxy)
 
 target_compile_definitions(tbbmalloc_proxy
@@ -86,4 +90,14 @@ target_link_libraries(tbbmalloc_proxy
     ${TBB_COMMON_LINK_LIBS}
 )
 
+if(TBB_BUILD_APPLE_FRAMEWORKS)
+    set_target_properties(tbbmalloc_proxy PROPERTIES 
+        FRAMEWORK TRUE
+        FRAMEWORK_VERSION ${TBBMALLOC_BINARY_VERSION}.${TBB_BINARY_MINOR_VERSION}
+        XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER com.intel.tbbmalloc-proxy
+        MACOSX_FRAMEWORK_IDENTIFIER com.intel.tbbmalloc-proxy
+        MACOSX_FRAMEWORK_BUNDLE_VERSION ${TBBMALLOC_BINARY_VERSION}.${TBB_BINARY_MINOR_VERSION}
+        MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${TBBMALLOC_BINARY_VERSION})
+endif()
+
 tbb_install_target(tbbmalloc_proxy)
diff --git a/external/tbb/src/tbbmalloc_proxy/function_replacement.cpp b/external/tbb/src/tbbmalloc_proxy/function_replacement.cpp
index 647fd2c2..ad05354f 100644
--- a/external/tbb/src/tbbmalloc_proxy/function_replacement.cpp
+++ b/external/tbb/src/tbbmalloc_proxy/function_replacement.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -14,9 +14,9 @@
     limitations under the License.
 */
 
-#include "../tbb/assert_impl.h"
-#include "oneapi/tbb/detail/_assert.h"
 #include "oneapi/tbb/detail/_config.h"
+#include "oneapi/tbb/detail/_assert.h"
+#include "../tbb/assert_impl.h"
 
 #if !__TBB_WIN8UI_SUPPORT && defined(_WIN32)
 
@@ -25,23 +25,23 @@
 #endif
 
 // no standard-conforming implementation of snprintf prior to VS 2015
-#if !defined(_MSC_VER) || _MSC_VER >= 1900
+#if !defined(_MSC_VER) || _MSC_VER>=1900
 #define LOG_PRINT(s, n, format, ...) snprintf(s, n, format, __VA_ARGS__)
 #else
 #define LOG_PRINT(s, n, format, ...) _snprintf_s(s, n, _TRUNCATE, format, __VA_ARGS__)
 #endif
 
+#include <windows.h>
 #include <new>
 #include <stdio.h>
 #include <string.h>
-#include <windows.h>
 
 #include "function_replacement.h"
 
 // The information about a standard memory allocation function for the replacement log
 struct FunctionInfo {
-    const char *funcName;
-    const char *dllName;
+    const char* funcName;
+    const char* dllName;
 };
 
 // Namespace that processes and manages the output of records to the Log journal
@@ -52,7 +52,7 @@ namespace Log {
     static const unsigned RECORDS_COUNT = 8 * 8;
     static const unsigned RECORD_LENGTH = MAX_PATH;
 
-    // Need to add 1 to count of records, because last record must be always NULL
+    // Need to add 1 to count of records, because last record must be always nullptr
     static char *records[RECORDS_COUNT + 1];
     static bool replacement_status = true;
 
@@ -63,7 +63,7 @@ namespace Log {
     // functionInfo - information about a standard memory allocation function for the replacement log
     // opcodeString - string, that contain byte code of this function
     // status - information about function replacement status
-    static void record(FunctionInfo functionInfo, const char *opcodeString, bool status) {
+    static void record(FunctionInfo functionInfo, const char * opcodeString, bool status) {
         __TBB_ASSERT(functionInfo.dllName, "Empty DLL name value");
         __TBB_ASSERT(functionInfo.funcName, "Empty function name value");
         __TBB_ASSERT(opcodeString, "Empty opcode");
@@ -79,32 +79,35 @@ namespace Log {
             return;
         }
 
-        char *entry = (char *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, RECORD_LENGTH);
+        char* entry = (char*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, RECORD_LENGTH);
         __TBB_ASSERT(entry, "Invalid memory was returned");
 
-        LOG_PRINT(entry, RECORD_LENGTH, "%s: %s (%s), byte pattern: <%s>", status ? "Success" : "Fail",
-                  functionInfo.funcName, functionInfo.dllName, opcodeString);
+        LOG_PRINT(entry, RECORD_LENGTH, "%s: %s (%s), byte pattern: <%s>",
+            status ? "Success" : "Fail", functionInfo.funcName, functionInfo.dllName, opcodeString);
 
         records[record_number++] = entry;
     }
-};// namespace Log
+};
 
-inline UINT_PTR Ptr2Addrint(LPVOID ptr) {
+inline UINT_PTR Ptr2Addrint(LPVOID ptr)
+{
     Int2Ptr i2p;
     i2p.lpv = ptr;
     return i2p.uip;
 }
 
-inline LPVOID Addrint2Ptr(UINT_PTR ptr) {
+inline LPVOID Addrint2Ptr(UINT_PTR ptr)
+{
     Int2Ptr i2p;
     i2p.uip = ptr;
     return i2p.lpv;
 }
 
 // Is the distance between addr1 and addr2 smaller than dist
-inline bool IsInDistance(UINT_PTR addr1, UINT_PTR addr2, __int64 dist) {
-    __int64 diff = addr1 > addr2 ? addr1 - addr2 : addr2 - addr1;
-    return diff < dist;
+inline bool IsInDistance(UINT_PTR addr1, UINT_PTR addr2, __int64 dist)
+{
+    __int64 diff = addr1>addr2 ? addr1-addr2 : addr2-addr1;
+    return diff<dist;
 }
 
 /*
@@ -125,45 +128,52 @@ inline bool IsInDistance(UINT_PTR addr1, UINT_PTR addr2, __int64 dist) {
 class MemoryProvider {
 private:
     struct MemoryBuffer {
-        UINT_PTR m_base;// base address of the buffer
-        UINT_PTR m_next;// next free location in the buffer
-        DWORD m_size;   // size of buffer
+        UINT_PTR m_base;    // base address of the buffer
+        UINT_PTR m_next;    // next free location in the buffer
+        DWORD    m_size;    // size of buffer
 
         // Default constructor
         MemoryBuffer() : m_base(0), m_next(0), m_size(0) {}
 
         // Constructor
-        MemoryBuffer(void *base, DWORD size) {
+        MemoryBuffer(void *base, DWORD size)
+        {
             m_base = Ptr2Addrint(base);
             m_next = m_base;
             m_size = size;
         }
     };
 
-    MemoryBuffer *CreateBuffer(UINT_PTR addr) {
+MemoryBuffer *CreateBuffer(UINT_PTR addr)
+    {
         // No more room in the pages database
-        if (m_lastBuffer - m_pages == MAX_NUM_BUFFERS) return 0;
+        if (m_lastBuffer - m_pages == MAX_NUM_BUFFERS)
+            return 0;
 
         void *newAddr = Addrint2Ptr(addr);
         // Get information for the region which the given address belongs to
         MEMORY_BASIC_INFORMATION memInfo;
-        if (VirtualQuery(newAddr, &memInfo, sizeof(memInfo)) != sizeof(memInfo)) return 0;
+        if (VirtualQuery(newAddr, &memInfo, sizeof(memInfo)) != sizeof(memInfo))
+            return 0;
 
-        for (;;) {
+        for(;;) {
             // The new address to check is beyond the current region and aligned to allocation size
-            newAddr = Addrint2Ptr((Ptr2Addrint(memInfo.BaseAddress) + memInfo.RegionSize + m_allocSize)
-                                  & ~(UINT_PTR)(m_allocSize - 1));
+            newAddr = Addrint2Ptr( (Ptr2Addrint(memInfo.BaseAddress) + memInfo.RegionSize + m_allocSize) & ~(UINT_PTR)(m_allocSize-1) );
 
             // Check that the address is in the right distance.
             // VirtualAlloc can only round the address down; so it will remain in the right distance
-            if (!IsInDistance(addr, Ptr2Addrint(newAddr), MAX_DISTANCE)) break;
+            if (!IsInDistance(addr, Ptr2Addrint(newAddr), MAX_DISTANCE))
+                break;
 
-            if (VirtualQuery(newAddr, &memInfo, sizeof(memInfo)) != sizeof(memInfo)) break;
+            if (VirtualQuery(newAddr, &memInfo, sizeof(memInfo)) != sizeof(memInfo))
+                break;
 
-            if (memInfo.State == MEM_FREE && memInfo.RegionSize >= m_allocSize) {
+            if (memInfo.State == MEM_FREE && memInfo.RegionSize >= m_allocSize)
+            {
                 // Found a free region, try to allocate a page in this region
-                void *newPage = VirtualAlloc(newAddr, m_allocSize, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
-                if (!newPage) break;
+                void *newPage = VirtualAlloc(newAddr, m_allocSize, MEM_COMMIT|MEM_RESERVE, PAGE_READWRITE);
+                if (!newPage)
+                    break;
 
                 // Add the new page to the pages database
                 MemoryBuffer *pBuff = new (m_lastBuffer) MemoryBuffer(newPage, m_allocSize);
@@ -177,7 +187,8 @@ class MemoryProvider {
     }
 
 public:
-    MemoryProvider() {
+    MemoryProvider()
+    {
         SYSTEM_INFO sysInfo;
         GetSystemInfo(&sysInfo);
         m_allocSize = sysInfo.dwAllocationGranularity;
@@ -187,13 +198,18 @@ class MemoryProvider {
     // We can't free the pages in the destructor because the trampolines
     // are using these memory locations and a replaced function might be called
     // after the destructor was called.
-    ~MemoryProvider() {}
+    ~MemoryProvider()
+    {
+    }
 
     // Return a memory location in distance less than 2^31 from input address
-    UINT_PTR GetLocation(UINT_PTR addr) {
+    UINT_PTR GetLocation(UINT_PTR addr)
+    {
         MemoryBuffer *pBuff = m_pages;
-        for (; pBuff < m_lastBuffer && IsInDistance(pBuff->m_next, addr, MAX_DISTANCE); ++pBuff) {
-            if (pBuff->m_next < pBuff->m_base + pBuff->m_size) {
+        for (; pBuff<m_lastBuffer && IsInDistance(pBuff->m_next, addr, MAX_DISTANCE); ++pBuff)
+        {
+            if (pBuff->m_next < pBuff->m_base + pBuff->m_size)
+            {
                 UINT_PTR loc = pBuff->m_next;
                 pBuff->m_next += MAX_PROBE_SIZE;
                 return loc;
@@ -201,7 +217,8 @@ class MemoryProvider {
         }
 
         pBuff = CreateBuffer(addr);
-        if (!pBuff) return 0;
+        if(!pBuff)
+            return 0;
 
         UINT_PTR loc = pBuff->m_next;
         pBuff->m_next += MAX_PROBE_SIZE;
@@ -219,11 +236,12 @@ static MemoryProvider memProvider;
 // Compare opcodes from dictionary (str1) and opcodes from code (str2)
 // str1 might contain '*' to mask addresses
 // RETURN: 0 if opcodes did not match, 1 on success
-size_t compareStrings(const char *str1, const char *str2) {
-    for (size_t i = 0; str1[i] != 0; i++) {
-        if (str1[i] != '*' && str1[i] != '#' && str1[i] != str2[i]) return 0;
-    }
-    return 1;
+size_t compareStrings( const char *str1, const char *str2 )
+{
+   for (size_t i=0; str1[i]!=0; i++){
+       if( str1[i]!='*' && str1[i]!='#' && str1[i]!=str2[i] ) return 0;
+   }
+   return 1;
 }
 
 // Check function prologue with known prologues from the dictionary
@@ -232,56 +250,61 @@ size_t compareStrings(const char *str1, const char *str2) {
 // Dictionary contains opcodes for several full asm instructions
 // + one opcode byte for the next asm instruction for safe address processing
 // RETURN: 1 + the index of the matched pattern, or 0 if no match found.
-static UINT CheckOpcodes(const char **opcodes, void *inpAddr, bool abortOnError,
-                         const FunctionInfo *functionInfo = NULL) {
+static UINT CheckOpcodes( const char ** opcodes, void *inpAddr, bool abortOnError, const FunctionInfo* functionInfo = nullptr)
+{
     static size_t opcodesStringsCount = 0;
     static size_t maxOpcodesLength = 0;
-    static size_t opcodes_pointer = (size_t) opcodes;
-    char opcodeString[2 * MAX_PATTERN_SIZE + 1];
+    static size_t opcodes_pointer = (size_t)opcodes;
+    char opcodeString[2*MAX_PATTERN_SIZE+1];
     size_t i;
     size_t result = 0;
 
     // Get the values for static variables
     // max length and number of patterns
-    if (!opcodesStringsCount || opcodes_pointer != (size_t) opcodes) {
-        while (*(opcodes + opcodesStringsCount) != NULL) {
-            if ((i = strlen(*(opcodes + opcodesStringsCount))) > maxOpcodesLength) maxOpcodesLength = i;
+    if( !opcodesStringsCount || opcodes_pointer != (size_t)opcodes ){
+        while( *(opcodes + opcodesStringsCount)!= nullptr ){
+            if( (i=strlen(*(opcodes + opcodesStringsCount))) > maxOpcodesLength )
+                maxOpcodesLength = i;
             opcodesStringsCount++;
         }
-        opcodes_pointer = (size_t) opcodes;
-        __TBB_ASSERT(maxOpcodesLength / 2 <= MAX_PATTERN_SIZE,
-                     "Pattern exceeded the limit of 28 opcodes/56 symbols");
+        opcodes_pointer = (size_t)opcodes;
+        __TBB_ASSERT( maxOpcodesLength/2 <= MAX_PATTERN_SIZE, "Pattern exceeded the limit of 28 opcodes/56 symbols" );
     }
 
     // Translate prologue opcodes to string format to compare
-    for (i = 0; i < maxOpcodesLength / 2 && i < MAX_PATTERN_SIZE; ++i) {
-        sprintf(opcodeString + 2 * i, "%.2X", *((unsigned char *) inpAddr + i));
+    for( i=0; i<maxOpcodesLength/2 && i<MAX_PATTERN_SIZE; ++i ){
+        sprintf( opcodeString + 2*i, "%.2X", *((unsigned char*)inpAddr+i) );
     }
-    opcodeString[2 * i] = 0;
+    opcodeString[2*i] = 0;
 
     // Compare translated opcodes with patterns
-    for (UINT idx = 0; idx < opcodesStringsCount; ++idx) {
-        result = compareStrings(opcodes[idx], opcodeString);
-        if (result) {
-            if (functionInfo) { Log::record(*functionInfo, opcodeString, /*status*/ true); }
-            return idx + 1;// avoid 0 which indicates a failure
+    for( UINT idx=0; idx<opcodesStringsCount; ++idx ){
+        result = compareStrings( opcodes[idx],opcodeString );
+        if( result ) {
+            if (functionInfo) {
+                Log::record(*functionInfo, opcodeString, /*status*/ true);
+            }
+            return idx + 1; // avoid 0 which indicates a failure
         }
     }
-    if (functionInfo) { Log::record(*functionInfo, opcodeString, /*status*/ false); }
+    if (functionInfo) {
+        Log::record(*functionInfo, opcodeString, /*status*/ false);
+    }
     if (abortOnError) {
         // Impossibility to find opcodes in the dictionary is a serious issue,
         // as if we unable to call original function, leak or crash is expected result.
-        __TBB_ASSERT_RELEASE(false, "CheckOpcodes failed");
+        __TBB_ASSERT_RELEASE( false, "CheckOpcodes failed" );
     }
     return 0;
 }
 
 // Modify offsets in original code after moving it to a trampoline.
 // We do not have more than one offset to correct in existing opcode patterns.
-static void CorrectOffset(UINT_PTR address, const char *pattern, UINT distance) {
-    const char *pos = strstr(pattern, "#*******");
-    if (pos) {
-        address += (pos - pattern) / 2;// compute the offset position
+static void CorrectOffset( UINT_PTR address, const char* pattern, UINT distance )
+{
+    const char* pos = strstr(pattern, "#*******");
+    if( pos ) {
+        address += (pos - pattern)/2; // compute the offset position
         UINT value;
         // UINT assignment is not used to avoid potential alignment issues
         memcpy(&value, Addrint2Ptr(address), sizeof(value));
@@ -292,22 +315,25 @@ static void CorrectOffset(UINT_PTR address, const char *pattern, UINT distance)
 
 // Insert jump relative instruction to the input address
 // RETURN: the size of the trampoline or 0 on failure
-static DWORD InsertTrampoline32(void *inpAddr, void *targetAddr, const char *pattern, void **storedAddr) {
+static DWORD InsertTrampoline32(void *inpAddr, void *targetAddr, const char* pattern, void** storedAddr)
+{
     size_t bytesToMove = SIZE_OF_RELJUMP;
     UINT_PTR srcAddr = Ptr2Addrint(inpAddr);
     UINT_PTR tgtAddr = Ptr2Addrint(targetAddr);
     // Check that the target fits in 32 bits
-    if (!IsInDistance(srcAddr, tgtAddr, MAX_DISTANCE)) return 0;
+    if (!IsInDistance(srcAddr, tgtAddr, MAX_DISTANCE))
+        return 0;
 
     UINT_PTR offset;
     UINT offset32;
-    UCHAR *codePtr = (UCHAR *) inpAddr;
+    UCHAR *codePtr = (UCHAR *)inpAddr;
 
-    if (storedAddr) {                         // If requested, store original function code
-        bytesToMove = strlen(pattern) / 2 - 1;// The last byte matching the pattern must not be copied
-        __TBB_ASSERT_RELEASE(bytesToMove >= SIZE_OF_RELJUMP, "Incorrect bytecode pattern?");
+    if ( storedAddr ){ // If requested, store original function code
+        bytesToMove = strlen(pattern)/2-1; // The last byte matching the pattern must not be copied
+        __TBB_ASSERT_RELEASE( bytesToMove >= SIZE_OF_RELJUMP, "Incorrect bytecode pattern?" );
         UINT_PTR trampAddr = memProvider.GetLocation(srcAddr);
-        if (!trampAddr) return 0;
+        if (!trampAddr)
+            return 0;
         *storedAddr = Addrint2Ptr(trampAddr);
         // Set 'executable' flag for original instructions in the new place
         DWORD pageFlags = PAGE_EXECUTE_READWRITE;
@@ -316,11 +342,11 @@ static DWORD InsertTrampoline32(void *inpAddr, void *targetAddr, const char *pat
         memcpy(*storedAddr, codePtr, bytesToMove);
         offset = srcAddr - trampAddr;
         offset32 = (UINT)(offset & 0xFFFFFFFF);
-        CorrectOffset(trampAddr, pattern, offset32);
+        CorrectOffset( trampAddr, pattern, offset32 );
         // Set jump to the code after replacement
         offset32 -= SIZE_OF_RELJUMP;
-        *(UCHAR *) (trampAddr + bytesToMove) = 0xE9;
-        memcpy((UCHAR *) (trampAddr + bytesToMove + 1), &offset32, sizeof(offset32));
+        *(UCHAR*)(trampAddr+bytesToMove) = 0xE9;
+        memcpy((UCHAR*)(trampAddr+bytesToMove+1), &offset32, sizeof(offset32));
     }
 
     // The following will work correctly even if srcAddr>tgtAddr, as long as
@@ -329,10 +355,12 @@ static DWORD InsertTrampoline32(void *inpAddr, void *targetAddr, const char *pat
     offset32 = (UINT)(offset & 0xFFFFFFFF);
     // Insert the jump to the new code
     *codePtr = 0xE9;
-    memcpy(codePtr + 1, &offset32, sizeof(offset32));
+    memcpy(codePtr+1, &offset32, sizeof(offset32));
 
     // Fill the rest with NOPs to correctly see disassembler of old code in debugger.
-    for (unsigned i = SIZE_OF_RELJUMP; i < bytesToMove; i++) { *(codePtr + i) = 0x90; }
+    for( unsigned i=SIZE_OF_RELJUMP; i<bytesToMove; i++ ){
+        *(codePtr+i) = 0x90;
+    }
 
     return SIZE_OF_RELJUMP;
 }
@@ -342,7 +370,8 @@ static DWORD InsertTrampoline32(void *inpAddr, void *targetAddr, const char *pat
 // 2  Put jump RIP relative indirect through the address in the close page
 // 3  Put the absolute address of the target in the allocated location
 // RETURN: the size of the trampoline or 0 on failure
-static DWORD InsertTrampoline64(void *inpAddr, void *targetAddr, const char *pattern, void **storedAddr) {
+static DWORD InsertTrampoline64(void *inpAddr, void *targetAddr, const char* pattern, void** storedAddr)
+{
     size_t bytesToMove = SIZE_OF_INDJUMP;
 
     UINT_PTR srcAddr = Ptr2Addrint(inpAddr);
@@ -350,21 +379,23 @@ static DWORD InsertTrampoline64(void *inpAddr, void *targetAddr, const char *pat
 
     // Get a location close to the source address
     UINT_PTR location = memProvider.GetLocation(srcAddr);
-    if (!location) return 0;
+    if (!location)
+        return 0;
 
     UINT_PTR offset;
     UINT offset32;
-    UCHAR *codePtr = (UCHAR *) inpAddr;
+    UCHAR *codePtr = (UCHAR *)inpAddr;
 
     // Fill the location
-    UINT_PTR *locPtr = (UINT_PTR *) Addrint2Ptr(location);
+    UINT_PTR *locPtr = (UINT_PTR *)Addrint2Ptr(location);
     *locPtr = tgtAddr;
 
-    if (storedAddr) {                         // If requested, store original function code
-        bytesToMove = strlen(pattern) / 2 - 1;// The last byte matching the pattern must not be copied
-        __TBB_ASSERT_RELEASE(bytesToMove >= SIZE_OF_INDJUMP, "Incorrect bytecode pattern?");
+    if ( storedAddr ){ // If requested, store original function code
+        bytesToMove = strlen(pattern)/2-1; // The last byte matching the pattern must not be copied
+        __TBB_ASSERT_RELEASE( bytesToMove >= SIZE_OF_INDJUMP, "Incorrect bytecode pattern?" );
         UINT_PTR trampAddr = memProvider.GetLocation(srcAddr);
-        if (!trampAddr) return 0;
+        if (!trampAddr)
+            return 0;
         *storedAddr = Addrint2Ptr(trampAddr);
         // Set 'executable' flag for original instructions in the new place
         DWORD pageFlags = PAGE_EXECUTE_READWRITE;
@@ -373,22 +404,24 @@ static DWORD InsertTrampoline64(void *inpAddr, void *targetAddr, const char *pat
         memcpy(*storedAddr, codePtr, bytesToMove);
         offset = srcAddr - trampAddr;
         offset32 = (UINT)(offset & 0xFFFFFFFF);
-        CorrectOffset(trampAddr, pattern, offset32);
+        CorrectOffset( trampAddr, pattern, offset32 );
         // Set jump to the code after replacement. It is within the distance of relative jump!
         offset32 -= SIZE_OF_RELJUMP;
-        *(UCHAR *) (trampAddr + bytesToMove) = 0xE9;
-        memcpy((UCHAR *) (trampAddr + bytesToMove + 1), &offset32, sizeof(offset32));
+        *(UCHAR*)(trampAddr+bytesToMove) = 0xE9;
+        memcpy((UCHAR*)(trampAddr+bytesToMove+1), &offset32, sizeof(offset32));
     }
 
     // Fill the buffer
     offset = location - srcAddr - SIZE_OF_INDJUMP;
     offset32 = (UINT)(offset & 0xFFFFFFFF);
     *(codePtr) = 0xFF;
-    *(codePtr + 1) = 0x25;
-    memcpy(codePtr + 2, &offset32, sizeof(offset32));
+    *(codePtr+1) = 0x25;
+    memcpy(codePtr+2, &offset32, sizeof(offset32));
 
     // Fill the rest with NOPs to correctly see disassembler of old code in debugger.
-    for (unsigned i = SIZE_OF_INDJUMP; i < bytesToMove; i++) { *(codePtr + i) = 0x90; }
+    for( unsigned i=SIZE_OF_INDJUMP; i<bytesToMove; i++ ){
+        *(codePtr+i) = 0x90;
+    }
 
     return SIZE_OF_INDJUMP;
 }
@@ -399,36 +432,40 @@ static DWORD InsertTrampoline64(void *inpAddr, void *targetAddr, const char *pat
 // 3. Call InsertTrampoline32 or InsertTrampoline64
 // 4. Restore memory protection
 // RETURN: FALSE on failure, TRUE on success
-static bool InsertTrampoline(void *inpAddr, void *targetAddr, const char **opcodes, void **origFunc) {
+static bool InsertTrampoline(void *inpAddr, void *targetAddr, const char ** opcodes, void** origFunc)
+{
     DWORD probeSize;
     // Change page protection to EXECUTE+WRITE
     DWORD origProt = 0;
-    if (!VirtualProtect(inpAddr, MAX_PROBE_SIZE, PAGE_EXECUTE_WRITECOPY, &origProt)) return FALSE;
+    if (!VirtualProtect(inpAddr, MAX_PROBE_SIZE, PAGE_EXECUTE_WRITECOPY, &origProt))
+        return FALSE;
 
-    const char *pattern = NULL;
-    if (origFunc) {// Need to store original function code
-        UCHAR *const codePtr = (UCHAR *) inpAddr;
-        if (*codePtr == 0xE9) {// JMP relative instruction
+    const char* pattern = nullptr;
+    if ( origFunc ){ // Need to store original function code
+        UCHAR * const codePtr = (UCHAR *)inpAddr;
+        if ( *codePtr == 0xE9 ){ // JMP relative instruction
             // For the special case when a system function consists of a single near jump,
             // instead of moving it somewhere we use the target of the jump as the original function.
-            unsigned offsetInJmp = *(unsigned *) (codePtr + 1);
-            *origFunc = (void *) (Ptr2Addrint(inpAddr) + offsetInJmp + SIZE_OF_RELJUMP);
-            origFunc = NULL;// now it must be ignored by InsertTrampoline32/64
+            unsigned offsetInJmp = *(unsigned*)(codePtr + 1);
+            *origFunc = (void*)(Ptr2Addrint(inpAddr) + offsetInJmp + SIZE_OF_RELJUMP);
+            origFunc = nullptr; // now it must be ignored by InsertTrampoline32/64
         } else {
             // find the right opcode pattern
-            UINT opcodeIdx = CheckOpcodes(opcodes, inpAddr, /*abortOnError=*/true);
-            __TBB_ASSERT(opcodeIdx > 0, "abortOnError ignored in CheckOpcodes?");
-            pattern = opcodes[opcodeIdx - 1];// -1 compensates for +1 in CheckOpcodes
+            UINT opcodeIdx = CheckOpcodes( opcodes, inpAddr, /*abortOnError=*/true );
+            __TBB_ASSERT( opcodeIdx > 0, "abortOnError ignored in CheckOpcodes?" );
+            pattern = opcodes[opcodeIdx-1];  // -1 compensates for +1 in CheckOpcodes
         }
     }
 
     probeSize = InsertTrampoline32(inpAddr, targetAddr, pattern, origFunc);
-    if (!probeSize) probeSize = InsertTrampoline64(inpAddr, targetAddr, pattern, origFunc);
+    if (!probeSize)
+        probeSize = InsertTrampoline64(inpAddr, targetAddr, pattern, origFunc);
 
     // Restore original protection
     VirtualProtect(inpAddr, MAX_PROBE_SIZE, origProt, &origProt);
 
-    if (!probeSize) return FALSE;
+    if (!probeSize)
+        return FALSE;
 
     FlushInstructionCache(GetCurrentProcess(), inpAddr, probeSize);
     FlushInstructionCache(GetCurrentProcess(), origFunc, probeSize);
@@ -438,19 +475,22 @@ static bool InsertTrampoline(void *inpAddr, void *targetAddr, const char **opcod
 
 // Routine to replace the functions
 // TODO: replace opcodesNumber with opcodes and opcodes number to check if we replace right code.
-FRR_TYPE ReplaceFunctionA(const char *dllName, const char *funcName, FUNCPTR newFunc, const char **opcodes,
-                          FUNCPTR *origFunc) {
+FRR_TYPE ReplaceFunctionA(const char *dllName, const char *funcName, FUNCPTR newFunc, const char ** opcodes, FUNCPTR* origFunc)
+{
     // Cache the results of the last search for the module
     // Assume that there was no DLL unload between
-    static char cachedName[MAX_PATH + 1];
+    static char cachedName[MAX_PATH+1];
     static HMODULE cachedHM = 0;
 
-    if (!dllName || !*dllName) return FRR_NODLL;
+    if (!dllName || !*dllName)
+        return FRR_NODLL;
 
-    if (!cachedHM || strncmp(dllName, cachedName, MAX_PATH) != 0) {
+    if (!cachedHM || strncmp(dllName, cachedName, MAX_PATH) != 0)
+    {
         // Find the module handle for the input dll
         HMODULE hModule = GetModuleHandleA(dllName);
-        if (hModule == 0) {
+        if (hModule == 0)
+        {
             // Couldn't find the module with the input name
             cachedHM = 0;
             return FRR_NODLL;
@@ -461,12 +501,13 @@ FRR_TYPE ReplaceFunctionA(const char *dllName, const char *funcName, FUNCPTR new
     }
 
     FARPROC inpFunc = GetProcAddress(cachedHM, funcName);
-    if (inpFunc == 0) {
+    if (inpFunc == 0)
+    {
         // Function was not found
         return FRR_NOFUNC;
     }
 
-    if (!InsertTrampoline((void *) inpFunc, (void *) newFunc, opcodes, (void **) origFunc)) {
+    if (!InsertTrampoline((void*)inpFunc, (void*)newFunc, opcodes, (void**)origFunc)){
         // Failed to insert the trampoline to the target address
         return FRR_FAILED;
     }
@@ -474,19 +515,22 @@ FRR_TYPE ReplaceFunctionA(const char *dllName, const char *funcName, FUNCPTR new
     return FRR_OK;
 }
 
-FRR_TYPE ReplaceFunctionW(const wchar_t *dllName, const char *funcName, FUNCPTR newFunc, const char **opcodes,
-                          FUNCPTR *origFunc) {
+FRR_TYPE ReplaceFunctionW(const wchar_t *dllName, const char *funcName, FUNCPTR newFunc, const char ** opcodes, FUNCPTR* origFunc)
+{
     // Cache the results of the last search for the module
     // Assume that there was no DLL unload between
-    static wchar_t cachedName[MAX_PATH + 1];
+    static wchar_t cachedName[MAX_PATH+1];
     static HMODULE cachedHM = 0;
 
-    if (!dllName || !*dllName) return FRR_NODLL;
+    if (!dllName || !*dllName)
+        return FRR_NODLL;
 
-    if (!cachedHM || wcsncmp(dllName, cachedName, MAX_PATH) != 0) {
+    if (!cachedHM || wcsncmp(dllName, cachedName, MAX_PATH) != 0)
+    {
         // Find the module handle for the input dll
         HMODULE hModule = GetModuleHandleW(dllName);
-        if (hModule == 0) {
+        if (hModule == 0)
+        {
             // Couldn't find the module with the input name
             cachedHM = 0;
             return FRR_NODLL;
@@ -497,12 +541,13 @@ FRR_TYPE ReplaceFunctionW(const wchar_t *dllName, const char *funcName, FUNCPTR
     }
 
     FARPROC inpFunc = GetProcAddress(cachedHM, funcName);
-    if (inpFunc == 0) {
+    if (inpFunc == 0)
+    {
         // Function was not found
         return FRR_NOFUNC;
     }
 
-    if (!InsertTrampoline((void *) inpFunc, (void *) newFunc, opcodes, (void **) origFunc)) {
+    if (!InsertTrampoline((void*)inpFunc, (void*)newFunc, opcodes, (void**)origFunc)){
         // Failed to insert the trampoline to the target address
         return FRR_FAILED;
     }
@@ -510,24 +555,28 @@ FRR_TYPE ReplaceFunctionW(const wchar_t *dllName, const char *funcName, FUNCPTR
     return FRR_OK;
 }
 
-bool IsPrologueKnown(const char *dllName, const char *funcName, const char **opcodes, HMODULE module) {
+bool IsPrologueKnown(const char* dllName, const char *funcName, const char **opcodes, HMODULE module)
+{
     FARPROC inpFunc = GetProcAddress(module, funcName);
-    FunctionInfo functionInfo = {funcName, dllName};
+    FunctionInfo functionInfo = { funcName, dllName };
 
     if (!inpFunc) {
         Log::record(functionInfo, "unknown", /*status*/ false);
         return false;
     }
 
-    return CheckOpcodes(opcodes, (void *) inpFunc, /*abortOnError=*/false, &functionInfo) != 0;
+    return CheckOpcodes( opcodes, (void*)inpFunc, /*abortOnError=*/false, &functionInfo) != 0;
 }
 
 // Public Windows API
-extern "C" __declspec(dllexport) int TBB_malloc_replacement_log(char ***function_replacement_log_ptr) {
-    if (function_replacement_log_ptr != NULL) { *function_replacement_log_ptr = Log::records; }
+extern "C" __declspec(dllexport) int TBB_malloc_replacement_log(char *** function_replacement_log_ptr)
+{
+    if (function_replacement_log_ptr != nullptr) {
+        *function_replacement_log_ptr = Log::records;
+    }
 
     // If we have no logs -> return false status
-    return Log::replacement_status && Log::records[0] != NULL ? 0 : -1;
+    return Log::replacement_status && Log::records[0] != nullptr ? 0 : -1;
 }
 
 #endif /* !__TBB_WIN8UI_SUPPORT && defined(_WIN32) */
diff --git a/external/tbb/src/tbbmalloc_proxy/function_replacement.h b/external/tbb/src/tbbmalloc_proxy/function_replacement.h
index c60c3d30..a3ec138a 100644
--- a/external/tbb/src/tbbmalloc_proxy/function_replacement.h
+++ b/external/tbb/src/tbbmalloc_proxy/function_replacement.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -38,8 +38,8 @@ typedef void (*FUNCPTR)();
 #define ReplaceFunction ReplaceFunctionW
 #endif //UNICODE
 
-FRR_TYPE ReplaceFunctionA(const char *dllName, const char *funcName, FUNCPTR newFunc, const char ** opcodes, FUNCPTR* origFunc=NULL);
-FRR_TYPE ReplaceFunctionW(const wchar_t *dllName, const char *funcName, FUNCPTR newFunc, const char ** opcodes, FUNCPTR* origFunc=NULL);
+FRR_TYPE ReplaceFunctionA(const char *dllName, const char *funcName, FUNCPTR newFunc, const char ** opcodes, FUNCPTR* origFunc=nullptr);
+FRR_TYPE ReplaceFunctionW(const wchar_t *dllName, const char *funcName, FUNCPTR newFunc, const char ** opcodes, FUNCPTR* origFunc=nullptr);
 
 bool IsPrologueKnown(const char* dllName, const char *funcName, const char **opcodes, HMODULE module);
 
diff --git a/external/tbb/src/tbbmalloc_proxy/proxy.cpp b/external/tbb/src/tbbmalloc_proxy/proxy.cpp
index e2cdd60c..d27591bb 100644
--- a/external/tbb/src/tbbmalloc_proxy/proxy.cpp
+++ b/external/tbb/src/tbbmalloc_proxy/proxy.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -33,25 +33,25 @@
 // Fix the state and undefine the trick
 #include <cstdlib>
 #undef aligned_alloc
-#endif// !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC
-#endif// defined(__GLIBC_PREREQ)
+#endif // !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC
+#endif // defined(__GLIBC_PREREQ)
 #include <cstdlib>
-#endif// __unix__ && !__ANDROID__
+#endif // __unix__ && !__ANDROID__
 
 #include "proxy.h"
 
-#include "../tbb/environment.h"
 #include "oneapi/tbb/detail/_config.h"
 #include "oneapi/tbb/scalable_allocator.h"
+#include "../tbb/environment.h"
 
 #if !defined(__EXCEPTIONS) && !defined(_CPPUNWIND) && !defined(__SUNPRO_CC)
-#if TBB_USE_EXCEPTIONS
-#error Compilation settings do not support exception handling. Please do not set TBB_USE_EXCEPTIONS macro or set it to 0.
-#elif !defined(TBB_USE_EXCEPTIONS)
-#define TBB_USE_EXCEPTIONS 0
-#endif
+    #if TBB_USE_EXCEPTIONS
+        #error Compilation settings do not support exception handling. Please do not set TBB_USE_EXCEPTIONS macro or set it to 0.
+    #elif !defined(TBB_USE_EXCEPTIONS)
+        #define TBB_USE_EXCEPTIONS 0
+    #endif
 #elif !defined(TBB_USE_EXCEPTIONS)
-#define TBB_USE_EXCEPTIONS 1
+    #define TBB_USE_EXCEPTIONS 1
 #endif
 
 #if MALLOC_UNIXLIKE_OVERLOAD_ENABLED || _WIN32 && !__TBB_WIN8UI_SUPPORT
@@ -65,13 +65,13 @@ typedef MallocMutex ProxyMutex;
 
 // Adds aliasing and copy attributes to function if available
 #if defined(__has_attribute)
-#if __has_attribute(__copy__)
-#define __TBB_ALIAS_ATTR_COPY(name) __attribute__((alias(#name), __copy__(name)))
-#endif
+    #if __has_attribute(__copy__)
+        #define __TBB_ALIAS_ATTR_COPY(name) __attribute__((alias (#name), __copy__(name)))
+    #endif
 #endif
 
 #ifndef __TBB_ALIAS_ATTR_COPY
-#define __TBB_ALIAS_ATTR_COPY(name) __attribute__((alias(#name)))
+    #define __TBB_ALIAS_ATTR_COPY(name) __attribute__((alias (#name)))
 #endif
 
 // In case there is no std::get_new_handler function
@@ -80,8 +80,8 @@ typedef MallocMutex ProxyMutex;
 static ProxyMutex new_lock;
 #endif
 
-static inline void *InternalOperatorNew(size_t sz) {
-    void *res = scalable_malloc(sz);
+static inline void* InternalOperatorNew(size_t sz) {
+    void* res = scalable_malloc(sz);
 #if TBB_USE_EXCEPTIONS
     while (!res) {
         std::new_handler handler;
@@ -100,12 +100,12 @@ static inline void *InternalOperatorNew(size_t sz) {
             throw std::bad_alloc();
         }
         res = scalable_malloc(sz);
-    }
+}
 #endif /* TBB_USE_EXCEPTIONS */
     return res;
 }
 /*** end of internal global operator new implementation ***/
-#endif// MALLOC_UNIXLIKE_OVERLOAD_ENABLED || _WIN32 && !__TBB_WIN8UI_SUPPORT
+#endif // MALLOC_UNIXLIKE_OVERLOAD_ENABLED || _WIN32 && !__TBB_WIN8UI_SUPPORT
 
 #if MALLOC_UNIXLIKE_OVERLOAD_ENABLED || MALLOC_ZONE_OVERLOAD_ENABLED
 
@@ -114,23 +114,26 @@ static inline void *InternalOperatorNew(size_t sz) {
 #endif
 
 /*** service functions and variables ***/
-#include <string.h>// for memset
-#include <unistd.h>// for sysconf
+#include <string.h> // for memset
+#include <unistd.h> // for sysconf
 
 static long memoryPageSize;
 
-static inline void initPageSize() { memoryPageSize = sysconf(_SC_PAGESIZE); }
+static inline void initPageSize()
+{
+    memoryPageSize = sysconf(_SC_PAGESIZE);
+}
 
 #if MALLOC_UNIXLIKE_OVERLOAD_ENABLED
 #include <dlfcn.h>
-#include <malloc.h>// mallinfo
+#include <malloc.h>    // mallinfo
 
 /* __TBB_malloc_proxy used as a weak symbol by libtbbmalloc for:
    1) detection that the proxy library is loaded
    2) check that dlsym("malloc") found something different from our replacement malloc
 */
 
-extern "C" void *__TBB_malloc_proxy(size_t) __TBB_ALIAS_ATTR_COPY(malloc);
+extern "C" TBBMALLOCPROXY_EXPORT void *__TBB_malloc_proxy(size_t) __TBB_ALIAS_ATTR_COPY(malloc);
 
 static void *orig_msize;
 
@@ -138,22 +141,25 @@ static void *orig_msize;
 
 #include "proxy_overload_osx.h"
 
-#endif// MALLOC_ZONE_OVERLOAD_ENABLED
+#endif // MALLOC_ZONE_OVERLOAD_ENABLED
 
 // Original (i.e., replaced) functions,
 // they are never changed for MALLOC_ZONE_OVERLOAD_ENABLED.
-static void *orig_free, *orig_realloc;
+static void *orig_free,
+    *orig_realloc;
 
 #if MALLOC_UNIXLIKE_OVERLOAD_ENABLED
 #define ZONE_ARG
 #define PREFIX(name) name
 
-static void *orig_libc_free, *orig_libc_realloc;
+static void *orig_libc_free,
+    *orig_libc_realloc;
 
 // We already tried to find ptr to original functions.
-static std::atomic<bool> origFuncSearched {false};
+static std::atomic<bool> origFuncSearched{false};
 
-inline void InitOrigPointers() {
+inline void InitOrigPointers()
+{
     // race is OK here, as different threads found same functions
     if (!origFuncSearched.load(std::memory_order_acquire)) {
         orig_free = dlsym(RTLD_NEXT, "free");
@@ -176,18 +182,26 @@ extern "C" {
 // not interested in original functions for zone overload
 inline void InitOrigPointers() {}
 
-#endif// MALLOC_UNIXLIKE_OVERLOAD_ENABLED and MALLOC_ZONE_OVERLOAD_ENABLED
+#endif // MALLOC_UNIXLIKE_OVERLOAD_ENABLED and MALLOC_ZONE_OVERLOAD_ENABLED
 
-void *PREFIX(malloc)(ZONE_ARG size_t size) __THROW { return scalable_malloc(size); }
+TBBMALLOCPROXY_EXPORT void *PREFIX(malloc)(ZONE_ARG size_t size) __THROW
+{
+    return scalable_malloc(size);
+}
 
-void *PREFIX(calloc)(ZONE_ARG size_t num, size_t size) __THROW { return scalable_calloc(num, size); }
+TBBMALLOCPROXY_EXPORT void *PREFIX(calloc)(ZONE_ARG size_t num, size_t size) __THROW
+{
+    return scalable_calloc(num, size);
+}
 
-void PREFIX(free)(ZONE_ARG void *object) __THROW {
+TBBMALLOCPROXY_EXPORT void PREFIX(free)(ZONE_ARG void *object) __THROW
+{
     InitOrigPointers();
-    __TBB_malloc_safer_free(object, (void (*)(void *)) orig_free);
+    __TBB_malloc_safer_free(object, (void (*)(void*))orig_free);
 }
 
-void *PREFIX(realloc)(ZONE_ARG void *ptr, size_t sz) __THROW {
+TBBMALLOCPROXY_EXPORT void *PREFIX(realloc)(ZONE_ARG void* ptr, size_t sz) __THROW
+{
     InitOrigPointers();
     return __TBB_malloc_safer_realloc(ptr, sz, orig_realloc);
 }
@@ -195,13 +209,15 @@ void *PREFIX(realloc)(ZONE_ARG void *ptr, size_t sz) __THROW {
 /* The older *NIX interface for aligned allocations;
    it's formally substituted by posix_memalign and deprecated,
    so we do not expect it to cause cyclic dependency with C RTL. */
-void *PREFIX(memalign)(ZONE_ARG size_t alignment, size_t size) __THROW {
+TBBMALLOCPROXY_EXPORT void *PREFIX(memalign)(ZONE_ARG size_t alignment, size_t size) __THROW
+{
     return scalable_aligned_malloc(size, alignment);
 }
 
 /* valloc allocates memory aligned on a page boundary */
-void *PREFIX(valloc)(ZONE_ARG size_t size) __THROW {
-    if (!memoryPageSize) initPageSize();
+TBBMALLOCPROXY_EXPORT void *PREFIX(valloc)(ZONE_ARG size_t size) __THROW
+{
+    if (! memoryPageSize) initPageSize();
 
     return scalable_aligned_malloc(size, memoryPageSize);
 }
@@ -213,94 +229,112 @@ void *PREFIX(valloc)(ZONE_ARG size_t size) __THROW {
 
 // match prototype from system headers
 #if __ANDROID__
-size_t malloc_usable_size(const void *ptr) __THROW
+TBBMALLOCPROXY_EXPORT size_t malloc_usable_size(const void *ptr) __THROW
 #else
-size_t malloc_usable_size(void *ptr) __THROW
+TBBMALLOCPROXY_EXPORT size_t malloc_usable_size(void *ptr) __THROW
 #endif
 {
     InitOrigPointers();
-    return __TBB_malloc_safer_msize(const_cast<void *>(ptr), (size_t(*)(void *)) orig_msize);
+    return __TBB_malloc_safer_msize(const_cast<void*>(ptr), (size_t (*)(void*))orig_msize);
 }
 
-int posix_memalign(void **memptr, size_t alignment, size_t size) __THROW {
+TBBMALLOCPROXY_EXPORT int posix_memalign(void **memptr, size_t alignment, size_t size) __THROW
+{
     return scalable_posix_memalign(memptr, alignment, size);
 }
 
 /* pvalloc allocates smallest set of complete pages which can hold
    the requested number of bytes. Result is aligned on page boundary. */
-void *pvalloc(size_t size) __THROW {
-    if (!memoryPageSize) initPageSize();
+TBBMALLOCPROXY_EXPORT void *pvalloc(size_t size) __THROW
+{
+    if (! memoryPageSize) initPageSize();
     // align size up to the page size,
     // pvalloc(0) returns 1 page, see man libmpatrol
-    size = size ? ((size - 1) | (memoryPageSize - 1)) + 1 : memoryPageSize;
+    size = size? ((size-1) | (memoryPageSize-1)) + 1 : memoryPageSize;
 
     return scalable_aligned_malloc(size, memoryPageSize);
 }
 
-int mallopt(int /*param*/, int /*value*/) __THROW { return 1; }
+TBBMALLOCPROXY_EXPORT int mallopt(int /*param*/, int /*value*/) __THROW
+{
+    return 1;
+}
 
-struct mallinfo mallinfo() __THROW {
+#if defined(__GLIBC__) || defined(__ANDROID__)
+TBBMALLOCPROXY_EXPORT struct mallinfo mallinfo() __THROW
+{
     struct mallinfo m;
     memset(&m, 0, sizeof(struct mallinfo));
 
     return m;
 }
+#endif
 
 #if __ANDROID__
 // Android doesn't have malloc_usable_size, provide it to be compatible
 // with Linux, in addition overload dlmalloc_usable_size() that presented
 // under Android.
-size_t dlmalloc_usable_size(const void *ptr) __TBB_ALIAS_ATTR_COPY(malloc_usable_size);
+TBBMALLOCPROXY_EXPORT size_t dlmalloc_usable_size(const void *ptr) __TBB_ALIAS_ATTR_COPY(malloc_usable_size);
 #else // __ANDROID__
 // TODO: consider using __typeof__ to guarantee the correct declaration types
 // C11 function, supported starting GLIBC 2.16
-void *aligned_alloc(size_t alignment, size_t size) __TBB_ALIAS_ATTR_COPY(memalign);
+TBBMALLOCPROXY_EXPORT void *aligned_alloc(size_t alignment, size_t size) __TBB_ALIAS_ATTR_COPY(memalign);
 // Those non-standard functions are exported by GLIBC, and might be used
 // in conjunction with standard malloc/free, so we must overload them.
 // Bionic doesn't have them. Not removing from the linker scripts,
 // as absent entry points are ignored by the linker.
 
-void *__libc_malloc(size_t size) __TBB_ALIAS_ATTR_COPY(malloc);
-void *__libc_calloc(size_t num, size_t size) __TBB_ALIAS_ATTR_COPY(calloc);
-void *__libc_memalign(size_t alignment, size_t size) __TBB_ALIAS_ATTR_COPY(memalign);
-void *__libc_pvalloc(size_t size) __TBB_ALIAS_ATTR_COPY(pvalloc);
-void *__libc_valloc(size_t size) __TBB_ALIAS_ATTR_COPY(valloc);
+TBBMALLOCPROXY_EXPORT void *__libc_malloc(size_t size) __TBB_ALIAS_ATTR_COPY(malloc);
+TBBMALLOCPROXY_EXPORT void *__libc_calloc(size_t num, size_t size) __TBB_ALIAS_ATTR_COPY(calloc);
+TBBMALLOCPROXY_EXPORT void *__libc_memalign(size_t alignment, size_t size) __TBB_ALIAS_ATTR_COPY(memalign);
+TBBMALLOCPROXY_EXPORT void *__libc_pvalloc(size_t size) __TBB_ALIAS_ATTR_COPY(pvalloc);
+TBBMALLOCPROXY_EXPORT void *__libc_valloc(size_t size) __TBB_ALIAS_ATTR_COPY(valloc);
 
 // call original __libc_* to support naive replacement of free via __libc_free etc
-void __libc_free(void *ptr) {
+TBBMALLOCPROXY_EXPORT void __libc_free(void *ptr)
+{
     InitOrigPointers();
-    __TBB_malloc_safer_free(ptr, (void (*)(void *)) orig_libc_free);
+    __TBB_malloc_safer_free(ptr, (void (*)(void*))orig_libc_free);
 }
 
-void *__libc_realloc(void *ptr, size_t size) {
+TBBMALLOCPROXY_EXPORT void *__libc_realloc(void *ptr, size_t size)
+{
     InitOrigPointers();
     return __TBB_malloc_safer_realloc(ptr, size, orig_libc_realloc);
 }
-#endif// !__ANDROID__
+#endif // !__ANDROID__
 
 } /* extern "C" */
 
 /*** replacements for global operators new and delete ***/
 
-void *operator new(size_t sz) { return InternalOperatorNew(sz); }
-void *operator new[](size_t sz) { return InternalOperatorNew(sz); }
-void operator delete(void *ptr) noexcept {
+TBBMALLOCPROXY_EXPORT void* operator new(size_t sz) {
+    return InternalOperatorNew(sz);
+}
+TBBMALLOCPROXY_EXPORT void* operator new[](size_t sz) {
+    return InternalOperatorNew(sz);
+}
+TBBMALLOCPROXY_EXPORT void operator delete(void* ptr) noexcept {
     InitOrigPointers();
-    __TBB_malloc_safer_free(ptr, (void (*)(void *)) orig_free);
+    __TBB_malloc_safer_free(ptr, (void (*)(void*))orig_free);
 }
-void operator delete[](void *ptr) noexcept {
+TBBMALLOCPROXY_EXPORT void operator delete[](void* ptr) noexcept {
     InitOrigPointers();
-    __TBB_malloc_safer_free(ptr, (void (*)(void *)) orig_free);
+    __TBB_malloc_safer_free(ptr, (void (*)(void*))orig_free);
+}
+TBBMALLOCPROXY_EXPORT void* operator new(size_t sz, const std::nothrow_t&) noexcept {
+    return scalable_malloc(sz);
 }
-void *operator new(size_t sz, const std::nothrow_t &) noexcept { return scalable_malloc(sz); }
-void *operator new[](std::size_t sz, const std::nothrow_t &) noexcept { return scalable_malloc(sz); }
-void operator delete(void *ptr, const std::nothrow_t &) noexcept {
+TBBMALLOCPROXY_EXPORT void* operator new[](std::size_t sz, const std::nothrow_t&) noexcept {
+    return scalable_malloc(sz);
+}
+TBBMALLOCPROXY_EXPORT void operator delete(void* ptr, const std::nothrow_t&) noexcept {
     InitOrigPointers();
-    __TBB_malloc_safer_free(ptr, (void (*)(void *)) orig_free);
+    __TBB_malloc_safer_free(ptr, (void (*)(void*))orig_free);
 }
-void operator delete[](void *ptr, const std::nothrow_t &) noexcept {
+TBBMALLOCPROXY_EXPORT void operator delete[](void* ptr, const std::nothrow_t&) noexcept {
     InitOrigPointers();
-    __TBB_malloc_safer_free(ptr, (void (*)(void *)) orig_free);
+    __TBB_malloc_safer_free(ptr, (void (*)(void*))orig_free);
 }
 
 #endif /* MALLOC_UNIXLIKE_OVERLOAD_ENABLED */
@@ -315,56 +349,77 @@ void operator delete[](void *ptr, const std::nothrow_t &) noexcept {
 
 #include "function_replacement.h"
 
-template <typename T, size_t N>// generic function to find length of array
-inline size_t arrayLength(const T (&)[N]) {
+template<typename T, size_t N> // generic function to find length of array
+inline size_t arrayLength(const T(&)[N]) {
     return N;
 }
 
-void __TBB_malloc_safer_delete(void *ptr) { __TBB_malloc_safer_free(ptr, NULL); }
+void __TBB_malloc_safer_delete( void *ptr)
+{
+    __TBB_malloc_safer_free( ptr, nullptr );
+}
 
-void *safer_aligned_malloc(size_t size, size_t alignment) {
+void* safer_aligned_malloc( size_t size, size_t alignment )
+{
     // workaround for "is power of 2 pow N" bug that accepts zeros
-    return scalable_aligned_malloc(size, alignment > sizeof(size_t *) ? alignment : sizeof(size_t *));
+    return scalable_aligned_malloc( size, alignment>sizeof(size_t*)?alignment:sizeof(size_t*) );
 }
 
 // we do not support _expand();
-void *safer_expand(void *, size_t) { return NULL; }
-
-#define __TBB_ORIG_ALLOCATOR_REPLACEMENT_WRAPPER(CRTLIB)                                                     \
-    void (*orig_free_##CRTLIB)(void *);                                                                      \
-    void __TBB_malloc_safer_free_##CRTLIB(void *ptr) { __TBB_malloc_safer_free(ptr, orig_free_##CRTLIB); }   \
-                                                                                                             \
-    void (*orig__aligned_free_##CRTLIB)(void *);                                                             \
-    void __TBB_malloc_safer__aligned_free_##CRTLIB(void *ptr) {                                              \
-        __TBB_malloc_safer_free(ptr, orig__aligned_free_##CRTLIB);                                           \
-    }                                                                                                        \
-                                                                                                             \
-    size_t (*orig__msize_##CRTLIB)(void *);                                                                  \
-    size_t __TBB_malloc_safer__msize_##CRTLIB(void *ptr) {                                                   \
-        return __TBB_malloc_safer_msize(ptr, orig__msize_##CRTLIB);                                          \
-    }                                                                                                        \
-                                                                                                             \
-    size_t (*orig__aligned_msize_##CRTLIB)(void *, size_t, size_t);                                          \
-    size_t __TBB_malloc_safer__aligned_msize_##CRTLIB(void *ptr, size_t alignment, size_t offset) {          \
-        return __TBB_malloc_safer_aligned_msize(ptr, alignment, offset, orig__aligned_msize_##CRTLIB);       \
-    }                                                                                                        \
-                                                                                                             \
-    void *__TBB_malloc_safer_realloc_##CRTLIB(void *ptr, size_t size) {                                      \
-        orig_ptrs func_ptrs = {orig_free_##CRTLIB, orig__msize_##CRTLIB};                                    \
-        return __TBB_malloc_safer_realloc(ptr, size, &func_ptrs);                                            \
-    }                                                                                                        \
-                                                                                                             \
-    void *__TBB_malloc_safer__aligned_realloc_##CRTLIB(void *ptr, size_t size, size_t alignment) {           \
-        orig_aligned_ptrs func_ptrs = {orig__aligned_free_##CRTLIB, orig__aligned_msize_##CRTLIB};           \
-        return __TBB_malloc_safer_aligned_realloc(ptr, size, alignment, &func_ptrs);                         \
-    }
+void* safer_expand( void *, size_t )
+{
+    return nullptr;
+}
+
+#define __TBB_ORIG_ALLOCATOR_REPLACEMENT_WRAPPER(CRTLIB)                                             \
+void (*orig_free_##CRTLIB)(void*);                                                                   \
+void __TBB_malloc_safer_free_##CRTLIB(void *ptr)                                                     \
+{                                                                                                    \
+    __TBB_malloc_safer_free( ptr, orig_free_##CRTLIB );                                              \
+}                                                                                                    \
+                                                                                                     \
+void (*orig__aligned_free_##CRTLIB)(void*);                                                          \
+void __TBB_malloc_safer__aligned_free_##CRTLIB(void *ptr)                                            \
+{                                                                                                    \
+    __TBB_malloc_safer_free( ptr, orig__aligned_free_##CRTLIB );                                     \
+}                                                                                                    \
+                                                                                                     \
+size_t (*orig__msize_##CRTLIB)(void*);                                                               \
+size_t __TBB_malloc_safer__msize_##CRTLIB(void *ptr)                                                 \
+{                                                                                                    \
+    return __TBB_malloc_safer_msize( ptr, orig__msize_##CRTLIB );                                    \
+}                                                                                                    \
+                                                                                                     \
+size_t (*orig__aligned_msize_##CRTLIB)(void*, size_t, size_t);                                       \
+size_t __TBB_malloc_safer__aligned_msize_##CRTLIB( void *ptr, size_t alignment, size_t offset)       \
+{                                                                                                    \
+    return __TBB_malloc_safer_aligned_msize( ptr, alignment, offset, orig__aligned_msize_##CRTLIB ); \
+}                                                                                                    \
+                                                                                                     \
+void* __TBB_malloc_safer_realloc_##CRTLIB( void *ptr, size_t size )                                  \
+{                                                                                                    \
+    orig_ptrs func_ptrs = {orig_free_##CRTLIB, orig__msize_##CRTLIB};                                \
+    return __TBB_malloc_safer_realloc( ptr, size, &func_ptrs );                                      \
+}                                                                                                    \
+                                                                                                     \
+void* __TBB_malloc_safer__aligned_realloc_##CRTLIB( void *ptr, size_t size, size_t alignment )       \
+{                                                                                                    \
+    orig_aligned_ptrs func_ptrs = {orig__aligned_free_##CRTLIB, orig__aligned_msize_##CRTLIB};       \
+    return __TBB_malloc_safer_aligned_realloc( ptr, size, alignment, &func_ptrs );                   \
+}
 
 // Only for ucrtbase: substitution for _o_free
-void (*orig__o_free)(void *);
-void __TBB_malloc__o_free(void *ptr) { __TBB_malloc_safer_free(ptr, orig__o_free); }
+void (*orig__o_free)(void*);
+void __TBB_malloc__o_free(void *ptr)
+{
+    __TBB_malloc_safer_free( ptr, orig__o_free );
+}
 // Only for ucrtbase: substitution for _free_base
-void (*orig__free_base)(void *);
-void __TBB_malloc__free_base(void *ptr) { __TBB_malloc_safer_free(ptr, orig__free_base); }
+void(*orig__free_base)(void*);
+void __TBB_malloc__free_base(void *ptr)
+{
+    __TBB_malloc_safer_free(ptr, orig__free_base);
+}
 
 // Size limit is MAX_PATTERN_SIZE (28) byte codes / 56 symbols per line.
 // * can be used to match any digit in byte codes.
@@ -373,78 +428,75 @@ void __TBB_malloc__free_base(void *ptr) { __TBB_malloc_safer_free(ptr, orig__fre
 // full instructions plus one extra byte code. It's not required for the patterns
 // to be unique (i.e., it's OK to have same pattern for unrelated functions).
 // TODO: use hot patch prologues if exist
-const char *known_bytecodes[] = {
+const char* known_bytecodes[] = {
 #if _WIN64
-        //  "========================================================" - 56 symbols
-        "4883EC284885C974",      // release free()
-        "4883EC284885C975",      // release _msize()
-        "4885C974375348",        // release free() 8.0.50727.42, 10.0
-        "E907000000CCCC",        // release _aligned_msize(), _aligned_free() ucrtbase.dll
-        "C7442410000000008B",    // release free() ucrtbase.dll 10.0.14393.33
-        "E90B000000CCCC",        // release _msize() ucrtbase.dll 10.0.14393.33
-        "48895C24085748",        // release _aligned_msize() ucrtbase.dll 10.0.14393.33
-        "E903000000CCCC",        // release _aligned_msize() ucrtbase.dll 10.0.16299.522
-        "48894C24084883EC28BA",  // debug prologue
-        "4C894424184889542410",  // debug _aligned_msize() 10.0
-        "48894C24084883EC2848",  // debug _aligned_free 10.0
-        "488BD1488D0D#*******E9",// _o_free(), ucrtbase.dll
-#if __TBB_OVERLOAD_OLD_MSVCR
-        "48895C2408574883EC3049",// release _aligned_msize 9.0
-        "4883EC384885C975",      // release _msize() 9.0
-        "4C8BC1488B0DA6E4040033",// an old win64 SDK
-#endif
-#else// _WIN32                                                                                            \
-        //  "========================================================" - 56 symbols
-        "8BFF558BEC8B",        // multiple
-        "8BFF558BEC83",        // release free() & _msize() 10.0.40219.325, _msize() ucrtbase.dll
-        "8BFF558BECFF",        // release _aligned_msize ucrtbase.dll
-        "8BFF558BEC51",        // release free() & _msize() ucrtbase.dll 10.0.14393.33
-        "558BEC8B450885C074",  // release _aligned_free 11.0
-        "558BEC837D08000F",    // release _msize() 11.0.51106.1
-        "558BEC837D08007419FF",// release free() 11.0.50727.1
-        "558BEC8B450885C075",  // release _aligned_msize() 11.0.50727.1
-        "558BEC6A018B",        // debug free() & _msize() 11.0
-        "558BEC8B451050",      // debug _aligned_msize() 11.0
-        "558BEC8B450850",      // debug _aligned_free 11.0
-        "8BFF558BEC6A",        // debug free() & _msize() 10.0.40219.325
-#if __TBB_OVERLOAD_OLD_MSVCR
-        "6A1868********E8",    // release free() 8.0.50727.4053, 9.0
-        "6A1C68********E8",    // release _msize() 8.0.50727.4053, 9.0
-#endif
-#endif// _WIN64/_WIN32
-        NULL};
-
-#define __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_ENTRY(CRT_VER, function_name, dbgsuffix)                       \
-    ReplaceFunctionWithStore(#CRT_VER #dbgsuffix ".dll", #function_name,                                     \
-                             (FUNCPTR) __TBB_malloc_safer_##function_name##_##CRT_VER##dbgsuffix,            \
-                             known_bytecodes, (FUNCPTR *) &orig_##function_name##_##CRT_VER##dbgsuffix);
-
-#define __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_ENTRY_NO_FALLBACK(CRT_VER, function_name, dbgsuffix)           \
-    ReplaceFunctionWithStore(#CRT_VER #dbgsuffix ".dll", #function_name,                                     \
-                             (FUNCPTR) __TBB_malloc_safer_##function_name##_##CRT_VER##dbgsuffix, 0, NULL);
-
-#define __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_ENTRY_REDIRECT(CRT_VER, function_name, dest_func, dbgsuffix)   \
-    ReplaceFunctionWithStore(#CRT_VER #dbgsuffix ".dll", #function_name,                                     \
-                             (FUNCPTR) __TBB_malloc_safer_##dest_func##_##CRT_VER##dbgsuffix, 0, NULL);
-
-#define __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_IMPL(CRT_VER, dbgsuffix)                                       \
-    if (BytecodesAreKnown(#CRT_VER #dbgsuffix ".dll")) {                                                     \
-        __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_ENTRY(CRT_VER, free, dbgsuffix)                                \
-        __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_ENTRY(CRT_VER, _msize, dbgsuffix)                              \
-        __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_ENTRY_NO_FALLBACK(CRT_VER, realloc, dbgsuffix)                 \
-        __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_ENTRY(CRT_VER, _aligned_free, dbgsuffix)                       \
-        __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_ENTRY(CRT_VER, _aligned_msize, dbgsuffix)                      \
-        __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_ENTRY_NO_FALLBACK(CRT_VER, _aligned_realloc, dbgsuffix)        \
-    } else                                                                                                   \
+//  "========================================================" - 56 symbols
+    "E9********CCCC",         // multiple - jmp(0xE9) with address followed by empty space (0xCC - INT 3)
+    "4883EC284885C974",       // release free()
+    "4883EC284885C975",       // release _msize()
+    "4885C974375348",         // release free() 8.0.50727.42, 10.0
+    "C7442410000000008B",     // release free() ucrtbase.dll 10.0.14393.33
+    "48895C24085748",         // release _aligned_msize() ucrtbase.dll 10.0.14393.33
+    "48894C24084883EC28BA",   // debug prologue
+    "4C894424184889542410",   // debug _aligned_msize() 10.0
+    "48894C24084883EC2848",   // debug _aligned_free 10.0
+    "488BD1488D0D#*******E9", // _o_free(), ucrtbase.dll
+ #if __TBB_OVERLOAD_OLD_MSVCR
+    "48895C2408574883EC3049", // release _aligned_msize 9.0
+    "4883EC384885C975",       // release _msize() 9.0
+    "4C8BC1488B0DA6E4040033", // an old win64 SDK
+ #endif
+#else // _WIN32
+//  "========================================================" - 56 symbols
+    "8BFF558BEC8B",           // multiple
+    "8BFF558BEC83",           // release free() & _msize() 10.0.40219.325, _msize() ucrtbase.dll
+    "8BFF558BECFF",           // release _aligned_msize ucrtbase.dll
+    "8BFF558BEC51",           // release free() & _msize() ucrtbase.dll 10.0.14393.33
+    "558BEC8B450885C074",     // release _aligned_free 11.0
+    "558BEC837D08000F",       // release _msize() 11.0.51106.1
+    "558BEC837D08007419FF",   // release free() 11.0.50727.1
+    "558BEC8B450885C075",     // release _aligned_msize() 11.0.50727.1
+    "558BEC6A018B",           // debug free() & _msize() 11.0
+    "558BEC8B451050",         // debug _aligned_msize() 11.0
+    "558BEC8B450850",         // debug _aligned_free 11.0
+    "8BFF558BEC6A",           // debug free() & _msize() 10.0.40219.325
+ #if __TBB_OVERLOAD_OLD_MSVCR
+    "6A1868********E8",       // release free() 8.0.50727.4053, 9.0
+    "6A1C68********E8",       // release _msize() 8.0.50727.4053, 9.0
+ #endif
+#endif // _WIN64/_WIN32
+    nullptr
+    };
+
+#define __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_ENTRY(CRT_VER,function_name,dbgsuffix) \
+    ReplaceFunctionWithStore( #CRT_VER #dbgsuffix ".dll", #function_name, \
+      (FUNCPTR)__TBB_malloc_safer_##function_name##_##CRT_VER##dbgsuffix, \
+      known_bytecodes, (FUNCPTR*)&orig_##function_name##_##CRT_VER##dbgsuffix );
+
+#define __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_ENTRY_NO_FALLBACK(CRT_VER,function_name,dbgsuffix) \
+    ReplaceFunctionWithStore( #CRT_VER #dbgsuffix ".dll", #function_name, \
+      (FUNCPTR)__TBB_malloc_safer_##function_name##_##CRT_VER##dbgsuffix, 0, nullptr );
+
+#define __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_ENTRY_REDIRECT(CRT_VER,function_name,dest_func,dbgsuffix) \
+    ReplaceFunctionWithStore( #CRT_VER #dbgsuffix ".dll", #function_name, \
+      (FUNCPTR)__TBB_malloc_safer_##dest_func##_##CRT_VER##dbgsuffix, 0, nullptr );
+
+#define __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_IMPL(CRT_VER,dbgsuffix)                             \
+    if (BytecodesAreKnown(#CRT_VER #dbgsuffix ".dll")) {                                          \
+      __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_ENTRY(CRT_VER,free,dbgsuffix)                         \
+      __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_ENTRY(CRT_VER,_msize,dbgsuffix)                       \
+      __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_ENTRY_NO_FALLBACK(CRT_VER,realloc,dbgsuffix)          \
+      __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_ENTRY(CRT_VER,_aligned_free,dbgsuffix)                \
+      __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_ENTRY(CRT_VER,_aligned_msize,dbgsuffix)               \
+      __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_ENTRY_NO_FALLBACK(CRT_VER,_aligned_realloc,dbgsuffix) \
+    } else                                                                                        \
         SkipReplacement(#CRT_VER #dbgsuffix ".dll");
 
-#define __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_RELEASE(CRT_VER)                                               \
-    __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_IMPL(CRT_VER, )
-#define __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_DEBUG(CRT_VER)                                                 \
-    __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_IMPL(CRT_VER, d)
+#define __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_RELEASE(CRT_VER) __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_IMPL(CRT_VER,)
+#define __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_DEBUG(CRT_VER) __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_IMPL(CRT_VER,d)
 
-#define __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL(CRT_VER)                                                       \
-    __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_RELEASE(CRT_VER)                                                   \
+#define __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL(CRT_VER)     \
+    __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_RELEASE(CRT_VER) \
     __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_DEBUG(CRT_VER)
 
 #if __TBB_OVERLOAD_OLD_MSVCR
@@ -468,55 +520,71 @@ __TBB_ORIG_ALLOCATOR_REPLACEMENT_WRAPPER(ucrtbase);
 /*** replacements for global operators new and delete ***/
 
 #if _MSC_VER && !defined(__INTEL_COMPILER)
-#pragma warning(push)
-#pragma warning(disable : 4290)
+#pragma warning( push )
+#pragma warning( disable : 4290 )
 #endif
 
 /*** operator new overloads internals (Linux, Windows) ***/
 
-void *operator_new(size_t sz) { return InternalOperatorNew(sz); }
-void *operator_new_arr(size_t sz) { return InternalOperatorNew(sz); }
-void operator_delete(void *ptr) noexcept { __TBB_malloc_safer_delete(ptr); }
+void* operator_new(size_t sz) {
+    return InternalOperatorNew(sz);
+}
+void* operator_new_arr(size_t sz) {
+    return InternalOperatorNew(sz);
+}
+void operator_delete(void* ptr) noexcept {
+    __TBB_malloc_safer_delete(ptr);
+}
 #if _MSC_VER && !defined(__INTEL_COMPILER)
-#pragma warning(pop)
+#pragma warning( pop )
 #endif
 
-void operator_delete_arr(void *ptr) noexcept { __TBB_malloc_safer_delete(ptr); }
-void *operator_new_t(size_t sz, const std::nothrow_t &) noexcept { return scalable_malloc(sz); }
-void *operator_new_arr_t(std::size_t sz, const std::nothrow_t &) noexcept { return scalable_malloc(sz); }
-void operator_delete_t(void *ptr, const std::nothrow_t &) noexcept { __TBB_malloc_safer_delete(ptr); }
-void operator_delete_arr_t(void *ptr, const std::nothrow_t &) noexcept { __TBB_malloc_safer_delete(ptr); }
+void operator_delete_arr(void* ptr) noexcept {
+    __TBB_malloc_safer_delete(ptr);
+}
+void* operator_new_t(size_t sz, const std::nothrow_t&) noexcept {
+    return scalable_malloc(sz);
+}
+void* operator_new_arr_t(std::size_t sz, const std::nothrow_t&) noexcept {
+    return scalable_malloc(sz);
+}
+void operator_delete_t(void* ptr, const std::nothrow_t&) noexcept {
+    __TBB_malloc_safer_delete(ptr);
+}
+void operator_delete_arr_t(void* ptr, const std::nothrow_t&) noexcept {
+    __TBB_malloc_safer_delete(ptr);
+}
 
 struct Module {
     const char *name;
-    bool doFuncReplacement;// do replacement in the DLL
+    bool        doFuncReplacement; // do replacement in the DLL
 };
 
 Module modules_to_replace[] = {
-        {"msvcr100d.dll", true},
-        {"msvcr100.dll", true},
-        {"msvcr110d.dll", true},
-        {"msvcr110.dll", true},
-        {"msvcr120d.dll", true},
-        {"msvcr120.dll", true},
-        {"ucrtbase.dll", true},
+    {"msvcr100d.dll", true},
+    {"msvcr100.dll", true},
+    {"msvcr110d.dll", true},
+    {"msvcr110.dll", true},
+    {"msvcr120d.dll", true},
+    {"msvcr120.dll", true},
+    {"ucrtbase.dll", true},
 //    "ucrtbased.dll" is not supported because of problems with _dbg functions
 #if __TBB_OVERLOAD_OLD_MSVCR
-        {"msvcr90d.dll", true},
-        {"msvcr90.dll", true},
-        {"msvcr80d.dll", true},
-        {"msvcr80.dll", true},
-        {"msvcr70d.dll", true},
-        {"msvcr70.dll", true},
-        {"msvcr71d.dll", true},
-        {"msvcr71.dll", true},
+    {"msvcr90d.dll", true},
+    {"msvcr90.dll", true},
+    {"msvcr80d.dll", true},
+    {"msvcr80.dll", true},
+    {"msvcr70d.dll", true},
+    {"msvcr70.dll", true},
+    {"msvcr71d.dll", true},
+    {"msvcr71.dll", true},
 #endif
 #if __TBB_TODO
-        // TODO: Try enabling replacement for non-versioned system binaries below
-        {"msvcrtd.dll", true},
-        {"msvcrt.dll", true},
+    // TODO: Try enabling replacement for non-versioned system binaries below
+    {"msvcrtd.dll", true},
+    {"msvcrt.dll", true},
 #endif
-};
+    };
 
 /*
 We need to replace following functions:
@@ -532,8 +600,8 @@ _expand (by dummy implementation)
 ??_V@YAXPEAX@Z    void * operator new[](unsigned __int64) (intel64)
 ??3@YAXPEAX@Z     operator delete                         (intel64)
 ??_V@YAXPEAX@Z    operator delete[]                       (intel64)
-??2@YAPAXIABUnothrow_t@std@@@Z      void * operator new (size_t sz, const std::nothrow_t&) throw()  (optional)
-??_U@YAPAXIABUnothrow_t@std@@@Z     void * operator new[] (size_t sz, const std::nothrow_t&) throw() (optional)
+??2@YAPAXIABUnothrow_t@std@@@Z      void * operator new (size_t sz, const std::nothrow_t&) noexcept  (optional)
+??_U@YAPAXIABUnothrow_t@std@@@Z     void * operator new[] (size_t sz, const std::nothrow_t&) noexcept (optional)
 
 and these functions have runtime-specific replacement:
 realloc
@@ -552,26 +620,27 @@ typedef struct FRData_t {
 } FRDATA;
 
 FRDATA c_routines_to_replace[] = {
-        {"malloc", (FUNCPTR) scalable_malloc, FRR_FAIL},
-        {"calloc", (FUNCPTR) scalable_calloc, FRR_FAIL},
-        {"_aligned_malloc", (FUNCPTR) safer_aligned_malloc, FRR_FAIL},
-        {"_expand", (FUNCPTR) safer_expand, FRR_IGNORE},
+    { "malloc",  (FUNCPTR)scalable_malloc, FRR_FAIL },
+    { "calloc",  (FUNCPTR)scalable_calloc, FRR_FAIL },
+    { "_aligned_malloc",  (FUNCPTR)safer_aligned_malloc, FRR_FAIL },
+    { "_expand",  (FUNCPTR)safer_expand, FRR_IGNORE },
 };
 
 FRDATA cxx_routines_to_replace[] = {
 #if _WIN64
-        {"??2@YAPEAX_K@Z", (FUNCPTR) operator_new, FRR_FAIL},
-        {"??_U@YAPEAX_K@Z", (FUNCPTR) operator_new_arr, FRR_FAIL},
-        {"??3@YAXPEAX@Z", (FUNCPTR) operator_delete, FRR_FAIL},
-        {"??_V@YAXPEAX@Z", (FUNCPTR) operator_delete_arr, FRR_FAIL},
+    { "??2@YAPEAX_K@Z", (FUNCPTR)operator_new, FRR_FAIL },
+    { "??_U@YAPEAX_K@Z", (FUNCPTR)operator_new_arr, FRR_FAIL },
+    { "??3@YAXPEAX@Z", (FUNCPTR)operator_delete, FRR_FAIL },
+    { "??_V@YAXPEAX@Z", (FUNCPTR)operator_delete_arr, FRR_FAIL },
 #else
-        {"??2@YAPAXI@Z", (FUNCPTR) operator_new, FRR_FAIL},
-        {"??_U@YAPAXI@Z", (FUNCPTR) operator_new_arr, FRR_FAIL},
-        {"??3@YAXPAX@Z", (FUNCPTR) operator_delete, FRR_FAIL},
-        {"??_V@YAXPAX@Z", (FUNCPTR) operator_delete_arr, FRR_FAIL},
+    { "??2@YAPAXI@Z", (FUNCPTR)operator_new, FRR_FAIL },
+    { "??_U@YAPAXI@Z", (FUNCPTR)operator_new_arr, FRR_FAIL },
+    { "??3@YAXPAX@Z", (FUNCPTR)operator_delete, FRR_FAIL },
+    { "??_V@YAXPAX@Z", (FUNCPTR)operator_delete_arr, FRR_FAIL },
 #endif
-        {"??2@YAPAXIABUnothrow_t@std@@@Z", (FUNCPTR) operator_new_t, FRR_IGNORE},
-        {"??_U@YAPAXIABUnothrow_t@std@@@Z", (FUNCPTR) operator_new_arr_t, FRR_IGNORE}};
+    { "??2@YAPAXIABUnothrow_t@std@@@Z", (FUNCPTR)operator_new_t, FRR_IGNORE },
+    { "??_U@YAPAXIABUnothrow_t@std@@@Z", (FUNCPTR)operator_new_arr_t, FRR_IGNORE }
+};
 
 #ifndef UNICODE
 typedef char unicode_char_t;
@@ -583,51 +652,53 @@ typedef wchar_t unicode_char_t;
 
 // Check that we recognize bytecodes that should be replaced by trampolines.
 // If some functions have unknown prologue patterns, replacement should not be done.
-bool BytecodesAreKnown(const unicode_char_t *dllName) {
+bool BytecodesAreKnown(const unicode_char_t *dllName)
+{
     const char *funcName[] = {"free", "_msize", "_aligned_free", "_aligned_msize", 0};
     HMODULE module = GetModuleHandle(dllName);
 
-    if (!module) return false;
-    for (int i = 0; funcName[i]; i++)
-        if (!IsPrologueKnown(dllName, funcName[i], known_bytecodes, module)) {
-            fprintf(stderr,
-                    "TBBmalloc: skip allocation functions replacement in " WCHAR_SPEC
-                    ": unknown prologue for function " WCHAR_SPEC "\n",
-                    dllName, funcName[i]);
+    if (!module)
+        return false;
+    for (int i=0; funcName[i]; i++)
+        if (! IsPrologueKnown(dllName, funcName[i], known_bytecodes, module)) {
+            fprintf(stderr, "TBBmalloc: skip allocation functions replacement in " WCHAR_SPEC
+                    ": unknown prologue for function " WCHAR_SPEC "\n", dllName, funcName[i]);
             return false;
         }
     return true;
 }
 
-void SkipReplacement(const unicode_char_t *dllName) {
+void SkipReplacement(const unicode_char_t *dllName)
+{
 #ifndef UNICODE
     const char *dllStr = dllName;
 #else
-    const size_t sz = 128;// all DLL name must fit
+    const size_t sz = 128; // all DLL name must fit
 
     char buffer[sz];
     size_t real_sz;
     char *dllStr = buffer;
 
-    errno_t ret = wcstombs_s(&real_sz, dllStr, sz, dllName, sz - 1);
+    errno_t ret = wcstombs_s(&real_sz, dllStr, sz, dllName, sz-1);
     __TBB_ASSERT(!ret, "Dll name conversion failed");
 #endif
 
-    for (size_t i = 0; i < arrayLength(modules_to_replace); i++)
+    for (size_t i=0; i<arrayLength(modules_to_replace); i++)
         if (!strcmp(modules_to_replace[i].name, dllStr)) {
             modules_to_replace[i].doFuncReplacement = false;
             break;
         }
 }
 
-void ReplaceFunctionWithStore(const unicode_char_t *dllName, const char *funcName, FUNCPTR newFunc,
-                              const char **opcodes, FUNCPTR *origFunc, FRR_ON_ERROR on_error = FRR_FAIL) {
-    FRR_TYPE res = ReplaceFunction(dllName, funcName, newFunc, opcodes, origFunc);
+void ReplaceFunctionWithStore( const unicode_char_t *dllName, const char *funcName, FUNCPTR newFunc, const char ** opcodes, FUNCPTR* origFunc,  FRR_ON_ERROR on_error = FRR_FAIL )
+{
+    FRR_TYPE res = ReplaceFunction( dllName, funcName, newFunc, opcodes, origFunc );
 
-    if (res == FRR_OK || res == FRR_NODLL || (res == FRR_NOFUNC && on_error == FRR_IGNORE)) return;
+    if (res == FRR_OK || res == FRR_NODLL || (res == FRR_NOFUNC && on_error == FRR_IGNORE))
+        return;
 
-    fprintf(stderr, "Failed to %s function %s in module %s\n", res == FRR_NOFUNC ? "find" : "replace",
-            funcName, dllName);
+    fprintf(stderr, "Failed to %s function %s in module %s\n",
+            res==FRR_NOFUNC? "find" : "replace", funcName, dllName);
 
     // Unable to replace a required function
     // Aborting because incomplete replacement of memory management functions
@@ -635,7 +706,8 @@ void ReplaceFunctionWithStore(const unicode_char_t *dllName, const char *funcNam
     abort();
 }
 
-void doMallocReplacement() {
+void doMallocReplacement()
+{
     // Replace functions and keep backup of original code (separate for each runtime)
 #if __TBB_OVERLOAD_OLD_MSVCR
     __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL(msvcr70)
@@ -650,77 +722,75 @@ void doMallocReplacement() {
 
     // Replace functions without storing original code
     for (size_t j = 0; j < arrayLength(modules_to_replace); j++) {
-        if (!modules_to_replace[j].doFuncReplacement) continue;
-        for (size_t i = 0; i < arrayLength(c_routines_to_replace); i++) {
-            ReplaceFunctionWithStore(modules_to_replace[j].name, c_routines_to_replace[i]._func,
-                                     c_routines_to_replace[i]._fptr, NULL, NULL,
-                                     c_routines_to_replace[i]._on_error);
+        if (!modules_to_replace[j].doFuncReplacement)
+            continue;
+        for (size_t i = 0; i < arrayLength(c_routines_to_replace); i++)
+        {
+            ReplaceFunctionWithStore( modules_to_replace[j].name, c_routines_to_replace[i]._func, c_routines_to_replace[i]._fptr, nullptr, nullptr,  c_routines_to_replace[i]._on_error );
         }
-        if (strcmp(modules_to_replace[j].name, "ucrtbase.dll") == 0) {
+        if ( strcmp(modules_to_replace[j].name, "ucrtbase.dll") == 0 ) {
             HMODULE ucrtbase_handle = GetModuleHandle("ucrtbase.dll");
-            if (!ucrtbase_handle) continue;
+            if (!ucrtbase_handle)
+                continue;
             // If _o_free function is present and patchable, redirect it to tbbmalloc as well
             // This prevents issues with other _o_* functions which might allocate memory with malloc
-            if (IsPrologueKnown("ucrtbase.dll", "_o_free", known_bytecodes, ucrtbase_handle)) {
-                ReplaceFunctionWithStore("ucrtbase.dll", "_o_free", (FUNCPTR) __TBB_malloc__o_free,
-                                         known_bytecodes, (FUNCPTR *) &orig__o_free, FRR_FAIL);
+            if ( IsPrologueKnown("ucrtbase.dll", "_o_free", known_bytecodes, ucrtbase_handle)) {
+                ReplaceFunctionWithStore( "ucrtbase.dll", "_o_free", (FUNCPTR)__TBB_malloc__o_free, known_bytecodes, (FUNCPTR*)&orig__o_free,  FRR_FAIL );
             }
             // Similarly for _free_base
             if (IsPrologueKnown("ucrtbase.dll", "_free_base", known_bytecodes, ucrtbase_handle)) {
-                ReplaceFunctionWithStore("ucrtbase.dll", "_free_base", (FUNCPTR) __TBB_malloc__free_base,
-                                         known_bytecodes, (FUNCPTR *) &orig__free_base, FRR_FAIL);
+                ReplaceFunctionWithStore("ucrtbase.dll", "_free_base", (FUNCPTR)__TBB_malloc__free_base, known_bytecodes, (FUNCPTR*)&orig__free_base, FRR_FAIL);
             }
             // ucrtbase.dll does not export operator new/delete, so skip the rest of the loop.
             continue;
         }
 
-        for (size_t i = 0; i < arrayLength(cxx_routines_to_replace); i++) {
+        for (size_t i = 0; i < arrayLength(cxx_routines_to_replace); i++)
+        {
 #if !_WIN64
             // in Microsoft* Visual Studio* 2012 and 2013 32-bit operator delete consists of 2 bytes only: short jump to free(ptr);
             // replacement should be skipped for this particular case.
-            if (((strcmp(modules_to_replace[j].name, "msvcr110.dll") == 0)
-                 || (strcmp(modules_to_replace[j].name, "msvcr120.dll") == 0))
-                && (strcmp(cxx_routines_to_replace[i]._func, "??3@YAXPAX@Z") == 0))
-                continue;
+            if ( ((strcmp(modules_to_replace[j].name, "msvcr110.dll") == 0) || (strcmp(modules_to_replace[j].name, "msvcr120.dll") == 0)) && (strcmp(cxx_routines_to_replace[i]._func, "??3@YAXPAX@Z") == 0) ) continue;
             // in Microsoft* Visual Studio* 2013 32-bit operator delete[] consists of 2 bytes only: short jump to free(ptr);
             // replacement should be skipped for this particular case.
-            if ((strcmp(modules_to_replace[j].name, "msvcr120.dll") == 0)
-                && (strcmp(cxx_routines_to_replace[i]._func, "??_V@YAXPAX@Z") == 0))
-                continue;
+            if ( (strcmp(modules_to_replace[j].name, "msvcr120.dll") == 0) && (strcmp(cxx_routines_to_replace[i]._func, "??_V@YAXPAX@Z") == 0) ) continue;
 #endif
-            ReplaceFunctionWithStore(modules_to_replace[j].name, cxx_routines_to_replace[i]._func,
-                                     cxx_routines_to_replace[i]._fptr, NULL, NULL,
-                                     cxx_routines_to_replace[i]._on_error);
+            ReplaceFunctionWithStore( modules_to_replace[j].name, cxx_routines_to_replace[i]._func, cxx_routines_to_replace[i]._fptr, nullptr, nullptr,  cxx_routines_to_replace[i]._on_error );
         }
     }
 }
 
-#endif// !__TBB_WIN8UI_SUPPORT
+#endif // !__TBB_WIN8UI_SUPPORT
 
 #if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
-// Suppress warning for UWP build ('main' signature found without threading model)
-#pragma warning(push)
-#pragma warning(disable : 4447)
+    // Suppress warning for UWP build ('main' signature found without threading model)
+    #pragma warning(push)
+    #pragma warning(disable:4447)
 #endif
 
-extern "C" BOOL WINAPI DllMain(HINSTANCE hInst, DWORD callReason, LPVOID reserved) {
+extern "C" BOOL WINAPI DllMain( HINSTANCE hInst, DWORD callReason, LPVOID reserved )
+{
 
-    if (callReason == DLL_PROCESS_ATTACH && reserved && hInst) {
+    if ( callReason==DLL_PROCESS_ATTACH && reserved && hInst ) {
 #if !__TBB_WIN8UI_SUPPORT
-        if (!tbb::detail::r1::GetBoolEnvironmentVariable("TBB_MALLOC_DISABLE_REPLACEMENT")) {
+        if (!tbb::detail::r1::GetBoolEnvironmentVariable("TBB_MALLOC_DISABLE_REPLACEMENT"))
+        {
             doMallocReplacement();
         }
-#endif// !__TBB_WIN8UI_SUPPORT
+#endif // !__TBB_WIN8UI_SUPPORT
     }
 
     return TRUE;
 }
 
 #if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
-#pragma warning(pop)
+    #pragma warning(pop)
 #endif
 
 // Just to make the linker happy and link the DLL to the application
-extern "C" __declspec(dllexport) void __TBB_malloc_proxy() {}
+extern "C" __declspec(dllexport) void __TBB_malloc_proxy()
+{
+
+}
 
-#endif//_WIN32
+#endif //_WIN32
diff --git a/external/tbb/src/tbbmalloc_proxy/proxy.h b/external/tbb/src/tbbmalloc_proxy/proxy.h
index 5f0133f9..d45def3e 100644
--- a/external/tbb/src/tbbmalloc_proxy/proxy.h
+++ b/external/tbb/src/tbbmalloc_proxy/proxy.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -37,7 +37,7 @@ extern "C" {
     TBBMALLOC_EXPORT size_t __TBB_malloc_safer_aligned_msize( void *ptr, size_t, size_t, size_t (*orig_msize_crt80d)(void*,size_t,size_t));
 
 #if MALLOC_ZONE_OVERLOAD_ENABLED
-    void   __TBB_malloc_free_definite_size(void *object, size_t size);
+    TBBMALLOC_EXPORT void   __TBB_malloc_free_definite_size(void *object, size_t size);
 #endif
 } // extern "C"
 
diff --git a/external/tbb/src/tbbmalloc_proxy/proxy_overload_osx.h b/external/tbb/src/tbbmalloc_proxy/proxy_overload_osx.h
index 5875a868..69582983 100644
--- a/external/tbb/src/tbbmalloc_proxy/proxy_overload_osx.h
+++ b/external/tbb/src/tbbmalloc_proxy/proxy_overload_osx.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -95,7 +95,7 @@ static size_t impl_malloc_usable_size(struct _malloc_zone_t *, const void *ptr)
 {
     // malloc_usable_size() is used by macOS* to recognize which memory manager
     // allocated the address, so our wrapper must not redirect to the original function.
-    return __TBB_malloc_safer_msize(const_cast<void*>(ptr), NULL);
+    return __TBB_malloc_safer_msize(const_cast<void*>(ptr), nullptr);
 }
 
 static void *impl_malloc(struct _malloc_zone_t *, size_t size);
@@ -117,7 +117,7 @@ static size_t impl_pressure_relief(struct _malloc_zone_t *, size_t  /* goal */)
     return 0;
 }
 
-static malloc_zone_t *system_zone = NULL;
+static malloc_zone_t *system_zone = nullptr;
 
 struct DoMallocReplacement {
     DoMallocReplacement() {
@@ -158,8 +158,8 @@ struct DoMallocReplacement {
         void* ptr = malloc(1);
         // get all registered memory zones
         unsigned zcount = 0;
-        malloc_zone_t** zone_array = NULL;
-        kern_return_t errorcode = malloc_get_all_zones(mach_task_self(),NULL,(vm_address_t**)&zone_array,&zcount);
+        malloc_zone_t** zone_array = nullptr;
+        kern_return_t errorcode = malloc_get_all_zones(mach_task_self(),nullptr,(vm_address_t**)&zone_array,&zcount);
         if (!errorcode && zone_array && zcount>0) {
             // find the zone that allocated ptr
             for (unsigned i=0; i<zcount; ++i) {
diff --git a/external/tbb/src/tbbmalloc_proxy/tbbmalloc_proxy.rc b/external/tbb/src/tbbmalloc_proxy/tbbmalloc_proxy.rc
new file mode 100644
index 00000000..aa1fc533
--- /dev/null
+++ b/external/tbb/src/tbbmalloc_proxy/tbbmalloc_proxy.rc
@@ -0,0 +1,74 @@
+// Copyright (c) 2005-2025 Intel Corporation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Includes
+//
+#include <winresrc.h>
+#include "../../include/oneapi/tbb/version.h"
+
+/////////////////////////////////////////////////////////////////////////////
+// Neutral resources
+
+#ifdef _WIN32
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+#define TBB_VERNUMBERS TBB_VERSION_MAJOR,TBB_VERSION_MINOR,TBB_VERSION_PATCH
+#define TBB_VERSION TBB_VERSION_STRING
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION TBB_VERNUMBERS
+ PRODUCTVERSION TBB_VERNUMBERS
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "000004b0"
+        BEGIN
+            VALUE "CompanyName", "Intel Corporation\0"
+            VALUE "FileDescription", "oneAPI Threading Building Blocks (oneTBB) library\0"
+            VALUE "FileVersion", TBB_VERSION "\0"
+            VALUE "LegalCopyright", "Copyright 2005-2025 Intel Corporation.  All Rights Reserved.\0"
+            VALUE "LegalTrademarks", "\0"
+#ifndef TBB_USE_DEBUG
+            VALUE "OriginalFilename", "tbbmalloc_proxy.dll\0"
+#else
+            VALUE "OriginalFilename", "tbbmalloc_proxy_debug.dll\0"
+#endif
+            VALUE "ProductName", "oneAPI Threading Building Blocks (oneTBB)\0"
+            VALUE "ProductVersion", TBB_VERSION "\0"
+            VALUE "PrivateBuild", "\0"
+            VALUE "SpecialBuild", "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x0, 1200
+    END
+END
diff --git a/external/tbb/test/CMakeLists.txt b/external/tbb/test/CMakeLists.txt
index 9534dce8..0526b909 100644
--- a/external/tbb/test/CMakeLists.txt
+++ b/external/tbb/test/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Intel Corporation
+# Copyright (c) 2020-2025 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -29,6 +29,9 @@ function(tbb_add_test)
     add_executable(${_tbb_test_TARGET_NAME} ${_tbb_test_SUBDIR}/${_tbb_test_NAME}.cpp)
     target_include_directories(${_tbb_test_TARGET_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR})
 
+    # cmake>=3.4 no longer adds flags to export symbols from executables (CMP0065)
+    set_property(TARGET ${_tbb_test_TARGET_NAME} PROPERTY ENABLE_EXPORTS TRUE)
+
     target_compile_options(${_tbb_test_TARGET_NAME}
         PRIVATE
         ${TBB_CXX_STD_FLAG}
@@ -40,45 +43,50 @@ function(tbb_add_test)
         ${TBB_COMMON_COMPILE_FLAGS}
     )
 
+    if (TBB_BUILD_APPLE_FRAMEWORKS)
+        add_compile_definitions(TBB_USE_APPLE_FRAMEWORKS)
+    endif()
+
     if (ANDROID_PLATFORM)
         # Expand the linker rpath by the CMAKE_LIBRARY_OUTPUT_DIRECTORY path since clang compiler from Android SDK
         # doesn't respect the -L flag.
         target_link_libraries(${_tbb_test_TARGET_NAME} PRIVATE "-Wl,--rpath-link,${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
-        target_link_libraries(${_tbb_test_TARGET_NAME} PRIVATE -rdynamic) # for the test_dynamic_link
         add_test(NAME ${_tbb_test_TARGET_NAME}
                  COMMAND ${CMAKE_COMMAND}
                          -DBINARIES_PATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
                          -DTEST_NAME=${_tbb_test_TARGET_NAME}
                          -P ${PROJECT_SOURCE_DIR}/cmake/android/test_launcher.cmake)
     else()
-        add_test(NAME ${_tbb_test_TARGET_NAME} COMMAND ${_tbb_test_TARGET_NAME} --force-colors=1 WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+        add_test(NAME ${_tbb_test_TARGET_NAME} COMMAND ${_tbb_test_TARGET_NAME} --force-colors=1 WORKING_DIRECTORY ${TBB_TEST_WORKING_DIRECTORY})
         # Additional testing scenarios if Intel(R) Software Development Emulator is found
         if (UNIX AND ";test_mutex;conformance_mutex;" MATCHES ";${_tbb_test_TARGET_NAME};" AND SDE_EXE)
-            add_test(NAME ${_tbb_test_TARGET_NAME}_SDE COMMAND ${SDE_EXE} -nhm -rtm_mode disabled -- ./${_tbb_test_TARGET_NAME} --force-colors=1 WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+            add_test(NAME ${_tbb_test_TARGET_NAME}_SDE COMMAND ${SDE_EXE} -nhm -rtm_mode disabled -- ./${_tbb_test_TARGET_NAME} --force-colors=1 WORKING_DIRECTORY ${TBB_TEST_WORKING_DIRECTORY})
             set_property(TEST ${_tbb_test_TARGET_NAME}_SDE PROPERTY ENVIRONMENT ${TBB_TESTS_ENVIRONMENT} APPEND)
         endif()
     endif()
 
     set_property(TEST ${_tbb_test_TARGET_NAME} PROPERTY ENVIRONMENT ${TBB_TESTS_ENVIRONMENT} APPEND)
+    set_property(TEST ${_tbb_test_TARGET_NAME} PROPERTY RUN_SERIAL TRUE)
 
     # Prefer using target_link_options instead of target_link_libraries to specify link options because
     # target_link_libraries may incorrectly handle some options (on Windows, for example).
     if (COMMAND target_link_options)
-        target_link_options(${_tbb_test_TARGET_NAME} PRIVATE ${TBB_COMMON_LINK_FLAGS})
+        target_link_options(${_tbb_test_TARGET_NAME} PRIVATE ${TBB_COMMON_LINK_FLAGS} ${TBB_TEST_LINK_FLAGS})
     else()
-        target_link_libraries(${_tbb_test_TARGET_NAME} PRIVATE ${TBB_COMMON_LINK_FLAGS})
+        target_link_libraries(${_tbb_test_TARGET_NAME} PRIVATE ${TBB_COMMON_LINK_FLAGS} ${TBB_TEST_LINK_FLAGS})
     endif()
 
     target_compile_definitions(${_tbb_test_TARGET_NAME} PRIVATE
         $<$<CONFIG:DEBUG>:TBB_USE_DEBUG>
         $<$<BOOL:${TBB_CPF}>:__TBB_CPF_BUILD=1>
         $<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:__TBB_DYNAMIC_LOAD_ENABLED=0>
-        $<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:__TBB_SOURCE_DIRECTLY_INCLUDED=1>)
+        $<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:__TBB_SOURCE_DIRECTLY_INCLUDED=1>
+        $<$<BOOL:${TBB_TCM_TESTING}>:__TBB_TCM_TESTING_ENABLED=1>)
 
     target_link_libraries(${_tbb_test_TARGET_NAME} PRIVATE ${_tbb_test_DEPENDENCIES} Threads::Threads ${TBB_COMMON_LINK_LIBS})
 
     if (COMMAND _tbb_run_memcheck)
-        _tbb_run_memcheck(${_tbb_test_NAME})
+        _tbb_run_memcheck(${_tbb_test_NAME} ${_tbb_test_SUBDIR})
     endif()
 endfunction()
 
@@ -94,17 +102,17 @@ function(tbb_add_c_test)
     target_include_directories(${_tbb_test_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR})
 
     if (ANDROID_PLATFORM)
-        target_link_libraries(${_tbb_test_NAME} PRIVATE -rdynamic) # for the test_dynamic_link
         add_test(NAME ${_tbb_test_NAME}
                 COMMAND ${CMAKE_COMMAND}
                         -DBINARIES_PATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
                         -DTEST_NAME=${_tbb_test_NAME}
                         -P ${PROJECT_SOURCE_DIR}/cmake/android/test_launcher.cmake)
     else()
-        add_test(NAME ${_tbb_test_NAME} COMMAND ${_tbb_test_NAME} --force-colors=1 WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+        add_test(NAME ${_tbb_test_NAME} COMMAND ${_tbb_test_NAME} --force-colors=1 WORKING_DIRECTORY ${TBB_TEST_WORKING_DIRECTORY})
     endif()
 
     set_property(TEST ${_tbb_test_NAME} PROPERTY ENVIRONMENT ${TBB_TESTS_ENVIRONMENT} APPEND)
+    set_property(TEST ${_tbb_test_NAME} PROPERTY RUN_SERIAL TRUE)
 
     target_compile_definitions(${_tbb_test_NAME} PRIVATE
         $<$<CONFIG:DEBUG>:TBB_USE_DEBUG>
@@ -269,16 +277,40 @@ function(tbb_add_tbbbind_test)
     endif()
 
     # Disable all HWLOC dependent tests in case of unsupported environment.
-    if (TBB_WINDOWS_DRIVER OR ANDROID_PLATFORM)
+    if (TBB_WINDOWS_DRIVER OR ANDROID_PLATFORM OR APPLE OR NOT BUILD_SHARED_LIBS)
         return()
     endif()
     ProcessorCount(SYSTEM_CONCURRENCY)
 
+    # Make sure fake HWLOC is found before system one
+    if (UNIX AND NOT TARGET HWLOC::hwloc_stub AND NOT TBB_TCM_TESTING)
+        # The idea is to produce fake HWLOC library and link it with the test
+        # to ensure that TBBBind won't be loaded in order to simulate the case
+        # when real HWLOC is not present in the system.
+        file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/stubhwloc.cpp "void hwloc_stub(){}")
+        add_library(hwloc_stub SHARED ${CMAKE_CURRENT_BINARY_DIR}/stubhwloc.cpp)
+        add_library(HWLOC::hwloc_stub ALIAS hwloc_stub)
+
+        set_target_properties(hwloc_stub PROPERTIES
+            OUTPUT_NAME "hwloc" SOVERSION 15
+        )
+    endif()
+
     set_tests_properties(${_tbbbind_test_NAME} PROPERTIES
         PASS_REGULAR_EXPRESSION "oneTBB: TBBBIND.*UNAVAILABLE"
         FAIL_REGULAR_EXPRESSION "Status:.*FAILURE"
     )
 
+    if (TARGET HWLOC::hwloc_stub)
+        _tbb_get_hwloc_runtime_vars(
+            ENV_EXTENSION_VARIABLE HWLOC_RUNTIME_VARS
+            HWLOC_VERSION_LIST "hwloc_stub"
+        )
+        target_link_libraries(${_tbbbind_test_NAME} PRIVATE HWLOC::hwloc_stub)
+
+        set_property(TEST ${_tbbbind_test_NAME} PROPERTY ENVIRONMENT "${HWLOC_RUNTIME_VARS}" APPEND)
+    endif()
+
     if (TARGET HWLOC::hwloc_2_5 AND NOT HWLOC_2_5_TESTS_STATUS_SHOWN)
         message(STATUS "HWLOC 2.5 dependent tests were enabled.")
         set(HWLOC_2_5_TESTS_STATUS_SHOWN TRUE PARENT_SCOPE)
@@ -363,12 +395,32 @@ unset(_sde_find_name)
 # Common target for the tbbbind related tests
 add_custom_target(test_suite_arena_constraints)
 
+# Check support for --no-as-needed linker option
+if (MINGW OR NOT WIN32)
+    include(CheckCXXSourceCompiles)
+    set(CMAKE_REQUIRED_LIBRARIES "-Wl,--no-as-needed")
+    check_cxx_source_compiles("int main(int, char*[]) { return 0; }" LINKER_HAS_NO_AS_NEEDED)
+    unset(CMAKE_REQUIRED_LIBRARIES)
+endif()
+
 if (TARGET TBB::tbb)
     # Define the tests
     tbb_add_test(SUBDIR tbb NAME test_tick_count DEPENDENCIES TBB::tbb)
     tbb_add_test(SUBDIR tbb NAME test_allocators DEPENDENCIES TBB::tbb)
-    tbb_add_test(SUBDIR tbb NAME test_arena_priorities DEPENDENCIES TBB::tbb)
+    if (NOT TBB_TCM_TESTING)
+        tbb_add_test(SUBDIR tbb NAME test_arena_priorities DEPENDENCIES TBB::tbb)
+    endif()
     tbb_add_test(SUBDIR tbb NAME test_dynamic_link DEPENDENCIES TBB::tbb)
+    if (LINKER_HAS_NO_AS_NEEDED)
+        # The linker may not detect a dependency on pthread in static variable constructors.
+        target_link_libraries(test_dynamic_link PRIVATE "-Wl,--no-as-needed")
+    endif()
+    if (APPLE OR ANDROID_PLATFORM)
+        target_link_libraries(test_dynamic_link PRIVATE -rdynamic)
+    endif()
+    if (WIN32 AND NOT TBB_TCM_TESTING)
+        tbb_add_test(SUBDIR tbb NAME test_numa_dist DEPENDENCIES TBB::tbb)
+    endif()
     tbb_add_test(SUBDIR tbb NAME test_collaborative_call_once DEPENDENCIES TBB::tbb)
     tbb_add_test(SUBDIR tbb NAME test_concurrent_lru_cache DEPENDENCIES TBB::tbb)
     tbb_add_test(SUBDIR tbb NAME test_concurrent_unordered_map DEPENDENCIES TBB::tbb)
@@ -390,11 +442,11 @@ if (TARGET TBB::tbb)
     tbb_add_test(SUBDIR tbb NAME test_task_group DEPENDENCIES TBB::tbb)
     tbb_add_test(SUBDIR tbb NAME test_concurrent_hash_map DEPENDENCIES TBB::tbb)
     tbb_add_test(SUBDIR tbb NAME test_task_arena DEPENDENCIES TBB::tbb)
+    tbb_add_test(SUBDIR tbb NAME test_parallel_phase DEPENDENCIES TBB::tbb)
     tbb_add_test(SUBDIR tbb NAME test_enumerable_thread_specific DEPENDENCIES TBB::tbb)
     tbb_add_test(SUBDIR tbb NAME test_concurrent_queue DEPENDENCIES TBB::tbb)
     tbb_add_test(SUBDIR tbb NAME test_resumable_tasks DEPENDENCIES TBB::tbb)
     tbb_add_test(SUBDIR tbb NAME test_mutex DEPENDENCIES TBB::tbb)
-    tbb_add_test(SUBDIR tbb NAME test_adaptive_mutex DEPENDENCIES TBB::tbb)
     tbb_add_test(SUBDIR tbb NAME test_function_node DEPENDENCIES TBB::tbb)
     tbb_add_test(SUBDIR tbb NAME test_multifunction_node DEPENDENCIES TBB::tbb)
     tbb_add_test(SUBDIR tbb NAME test_broadcast_node DEPENDENCIES TBB::tbb)
@@ -408,7 +460,10 @@ if (TARGET TBB::tbb)
     tbb_add_test(SUBDIR tbb NAME test_indexer_node DEPENDENCIES TBB::tbb)
     tbb_add_test(SUBDIR tbb NAME test_join_node DEPENDENCIES TBB::tbb)
     tbb_add_test(SUBDIR tbb NAME test_join_node_key_matching DEPENDENCIES TBB::tbb)
+    tbb_add_test(SUBDIR tbb NAME test_join_node_key_matching_n_args DEPENDENCIES TBB::tbb)
     tbb_add_test(SUBDIR tbb NAME test_join_node_msg_key_matching DEPENDENCIES TBB::tbb)
+    tbb_add_test(SUBDIR tbb NAME test_join_node_msg_key_matching_n_args DEPENDENCIES TBB::tbb)
+    tbb_add_test(SUBDIR tbb NAME test_join_node_preview DEPENDENCIES TBB::tbb)
     tbb_add_test(SUBDIR tbb NAME test_limiter_node DEPENDENCIES TBB::tbb)
     tbb_add_test(SUBDIR tbb NAME test_priority_queue_node DEPENDENCIES TBB::tbb)
     tbb_add_test(SUBDIR tbb NAME test_queue_node DEPENDENCIES TBB::tbb)
@@ -426,8 +481,34 @@ if (TARGET TBB::tbb)
     tbb_add_test(SUBDIR tbb NAME test_environment_whitebox DEPENDENCIES TBB::tbb)
     tbb_add_test(SUBDIR tbb NAME test_hw_concurrency DEPENDENCIES TBB::tbb)
     tbb_add_test(SUBDIR tbb NAME test_eh_thread DEPENDENCIES TBB::tbb)
-    tbb_add_test(SUBDIR tbb NAME test_global_control DEPENDENCIES TBB::tbb)
+    if (NOT TBB_TCM_TESTING)
+        tbb_add_test(SUBDIR tbb NAME test_global_control DEPENDENCIES TBB::tbb)
+    endif()
     tbb_add_test(SUBDIR tbb NAME test_task DEPENDENCIES TBB::tbb)
+    if (TBB_TCM_TESTING AND NOT WINDOWS_STORE AND NOT TBB_WINDOWS_DRIVER)
+        add_test(NAME test_tcm_enabled COMMAND test_task --force-colors=1 WORKING_DIRECTORY ${TBB_TEST_WORKING_DIRECTORY})
+        set_tests_properties(test_tcm_enabled PROPERTIES
+            ENVIRONMENT "TBB_VERSION=1;TCM_ENABLE=1"
+            PASS_REGULAR_EXPRESSION "TCM: VERSION.*"
+            FAIL_REGULAR_EXPRESSION "TCM: TCM *disabled"
+        )
+        add_test(NAME test_tcm_disabled COMMAND test_task --force-colors=1 WORKING_DIRECTORY ${TBB_TEST_WORKING_DIRECTORY})
+        set_tests_properties(test_tcm_disabled PROPERTIES
+            ENVIRONMENT "TBB_VERSION=1;TCM_ENABLE=0"
+            PASS_REGULAR_EXPRESSION "TCM: TCM *disabled"
+        )
+    endif()
+
+    if (TBB_FUZZ_TESTING AND NOT WIN32)
+        if (NOT ((CMAKE_CXX_COMPILER_ID STREQUAL Clang) OR (CMAKE_CXX_COMPILER_ID STREQUAL IntelLLVM)))
+            message(FATAL_ERROR "Fuzzing requires Clang or IntelLLVM compiler.")
+        endif()
+        tbb_add_test(SUBDIR tbb NAME test_fuzzing)
+        add_dependencies(test_fuzzing test_task)
+        target_compile_definitions(test_fuzzing PRIVATE CMD="$<TARGET_FILE:test_task> >/dev/null 2>&1")
+        target_link_options(test_fuzzing PRIVATE -fsanitize=fuzzer)
+    endif()
+
     tbb_add_test(SUBDIR tbb NAME test_concurrent_monitor DEPENDENCIES TBB::tbb)
     tbb_add_test(SUBDIR tbb NAME test_scheduler_mix DEPENDENCIES TBB::tbb)
 
@@ -438,9 +519,11 @@ if (TARGET TBB::tbb)
     )
 
     # HWLOC related test
-    tbb_add_tbbbind_test(SUBDIR tbb NAME test_arena_constraints)
+    if (NOT TBB_EMSCRIPTEN)
+        tbb_add_tbbbind_test(SUBDIR tbb NAME test_arena_constraints)
+    endif()
 
-    if (NOT "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "mips")
+    if ((NOT "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "mips") AND (NOT TBB_EMSCRIPTEN))
         # TODO: Fix for MIPS
         tbb_add_test(SUBDIR tbb NAME test_tbb_fork DEPENDENCIES TBB::tbb)
     endif()
@@ -461,8 +544,10 @@ if (TARGET TBB::tbb)
     tbb_add_test(SUBDIR conformance NAME conformance_tick_count DEPENDENCIES TBB::tbb)
     tbb_add_test(SUBDIR conformance NAME conformance_allocators DEPENDENCIES TBB::tbb)
     tbb_add_test(SUBDIR conformance NAME conformance_mutex DEPENDENCIES TBB::tbb)
+    tbb_add_test(SUBDIR conformance NAME conformance_task_group DEPENDENCIES TBB::tbb)
     tbb_add_test(SUBDIR conformance NAME conformance_task_group_context DEPENDENCIES TBB::tbb)
     tbb_add_test(SUBDIR conformance NAME conformance_task_arena DEPENDENCIES TBB::tbb)
+    tbb_add_test(SUBDIR conformance NAME conformance_collaborative_call_once DEPENDENCIES TBB::tbb)
     tbb_add_test(SUBDIR conformance NAME conformance_concurrent_lru_cache DEPENDENCIES TBB::tbb)
     tbb_add_test(SUBDIR conformance NAME conformance_concurrent_unordered_map DEPENDENCIES TBB::tbb)
     tbb_add_test(SUBDIR conformance NAME conformance_concurrent_unordered_set DEPENDENCIES TBB::tbb)
@@ -479,9 +564,11 @@ if (TARGET TBB::tbb)
     tbb_add_test(SUBDIR conformance NAME conformance_blocked_range DEPENDENCIES TBB::tbb)
     tbb_add_test(SUBDIR conformance NAME conformance_blocked_range2d DEPENDENCIES TBB::tbb)
     tbb_add_test(SUBDIR conformance NAME conformance_blocked_range3d DEPENDENCIES TBB::tbb)
-    tbb_add_test(SUBDIR conformance NAME conformance_blocked_rangeNd DEPENDENCIES TBB::tbb)
+    tbb_add_test(SUBDIR conformance NAME conformance_blocked_nd_range DEPENDENCIES TBB::tbb)
     tbb_add_test(SUBDIR conformance NAME conformance_concurrent_vector DEPENDENCIES TBB::tbb)
-    tbb_add_test(SUBDIR conformance NAME conformance_global_control DEPENDENCIES TBB::tbb)
+    if (NOT TBB_TCM_TESTING)
+        tbb_add_test(SUBDIR conformance NAME conformance_global_control DEPENDENCIES TBB::tbb)
+    endif()
     tbb_add_test(SUBDIR conformance NAME conformance_concurrent_hash_map DEPENDENCIES TBB::tbb)
     tbb_add_test(SUBDIR conformance NAME conformance_enumerable_thread_specific DEPENDENCIES TBB::tbb)
     tbb_add_test(SUBDIR conformance NAME conformance_combinable DEPENDENCIES TBB::tbb)
@@ -513,7 +600,9 @@ if (TARGET TBB::tbb)
     tbb_add_test(SUBDIR conformance NAME conformance_graph DEPENDENCIES TBB::tbb)
 
     # HWLOC related conformance
-    tbb_add_tbbbind_test(SUBDIR conformance NAME conformance_arena_constraints)
+    if (NOT TBB_EMSCRIPTEN)
+        tbb_add_tbbbind_test(SUBDIR conformance NAME conformance_arena_constraints)
+    endif()
 
     if (MSVC AND BUILD_SHARED_LIBS AND CMAKE_VERSION VERSION_GREATER 3.13) # LINK_OPTIONS property first appeared in 3.13
                                                     # version of the CMake
@@ -523,7 +612,7 @@ if (TARGET TBB::tbb)
         target_include_directories(test_implicit_linkage_on_windows PRIVATE
         $<TARGET_PROPERTY:TBB::tbb,INTERFACE_INCLUDE_DIRECTORIES>)
         set_target_properties(test_implicit_linkage_on_windows PROPERTIES
-        LINK_OPTIONS /LIBPATH:$<TARGET_LINKER_FILE_DIR:TBB::tbb>)
+        LINK_OPTIONS LINKER:/LIBPATH:$<TARGET_LINKER_FILE_DIR:TBB::tbb>)
         add_dependencies(test_implicit_linkage_on_windows TBB::tbb)
     endif()
 endif()
@@ -531,63 +620,63 @@ endif()
 if (TARGET TBB::tbbmalloc)
     # TBB allocator tests
     if (NOT "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "mips")
-        # Define TBB malloc tests
-        tbb_add_test(SUBDIR tbbmalloc NAME test_scalable_allocator DEPENDENCIES TBB::tbbmalloc)
-        tbb_add_test(SUBDIR tbbmalloc NAME test_malloc_pools DEPENDENCIES TBB::tbbmalloc)
-        tbb_add_test(SUBDIR tbbmalloc NAME test_malloc_init_shutdown DEPENDENCIES TBB::tbbmalloc)
-        tbb_add_test(SUBDIR tbbmalloc NAME test_malloc_regression DEPENDENCIES TBB::tbbmalloc)
-        if (TARGET TBB::tbb)
-            tbb_add_test(SUBDIR tbbmalloc NAME test_malloc_shutdown_hang DEPENDENCIES TBB::tbb TBB::tbbmalloc)
-        endif()
-
-        if (NOT (WINDOWS_STORE OR TBB_WINDOWS_DRIVER))
-            # TODO: Consider adding following tests on WINDOWS_STORE and TBB_WINDOWS_DRIVER platforms
-            tbb_add_test(SUBDIR tbbmalloc NAME test_malloc_compliance DEPENDENCIES TBB::tbbmalloc)
-            tbb_add_lib_test(SUBDIR tbbmalloc NAME test_malloc_used_by_lib DEPENDENCIES TBB::tbbmalloc)
-            tbb_add_test(SUBDIR tbbmalloc NAME test_malloc_used_by_lib DEPENDENCIES _test_malloc_used_by_lib)
-            tbb_add_lib_test(SUBDIR tbbmalloc NAME test_malloc_lib_unload)
-            tbb_add_test(SUBDIR tbbmalloc NAME test_malloc_lib_unload DEPENDENCIES _test_malloc_lib_unload)
-        endif()
+        if (NOT TBB_EMSCRIPTEN)
+            # Define TBB malloc tests
+	    tbb_add_test(SUBDIR tbbmalloc NAME test_scalable_allocator DEPENDENCIES TBB::tbbmalloc)
+            tbb_add_test(SUBDIR tbbmalloc NAME test_malloc_pools DEPENDENCIES TBB::tbbmalloc)
+            tbb_add_test(SUBDIR tbbmalloc NAME test_malloc_init_shutdown DEPENDENCIES TBB::tbbmalloc)
+            tbb_add_test(SUBDIR tbbmalloc NAME test_malloc_regression DEPENDENCIES TBB::tbbmalloc)
+            if (TARGET TBB::tbb)
+                tbb_add_test(SUBDIR tbbmalloc NAME test_malloc_shutdown_hang DEPENDENCIES TBB::tbb TBB::tbbmalloc)
+            endif()
 
-        enable_language(C)
-        tbb_add_c_test(SUBDIR tbbmalloc NAME test_malloc_pure_c DEPENDENCIES TBB::tbbmalloc)
+            if (NOT (WINDOWS_STORE OR TBB_WINDOWS_DRIVER))
+                # TODO: Consider adding following tests on WINDOWS_STORE and TBB_WINDOWS_DRIVER platforms
+                tbb_add_test(SUBDIR tbbmalloc NAME test_malloc_compliance DEPENDENCIES TBB::tbbmalloc)
+                tbb_add_lib_test(SUBDIR tbbmalloc NAME test_malloc_used_by_lib DEPENDENCIES TBB::tbbmalloc)
+                tbb_add_test(SUBDIR tbbmalloc NAME test_malloc_used_by_lib DEPENDENCIES _test_malloc_used_by_lib)
+                tbb_add_lib_test(SUBDIR tbbmalloc NAME test_malloc_lib_unload)
+                tbb_add_test(SUBDIR tbbmalloc NAME test_malloc_lib_unload DEPENDENCIES _test_malloc_lib_unload)
+            endif()
 
+            enable_language(C)
+            tbb_add_c_test(SUBDIR tbbmalloc NAME test_malloc_pure_c DEPENDENCIES TBB::tbbmalloc)
+        endif()
         # ----------------------------------------------------------------------------------------
         # Whitebox testing
-
-        add_executable(test_malloc_whitebox tbbmalloc/test_malloc_whitebox.cpp)
-
-        target_include_directories(test_malloc_whitebox
-            PRIVATE
-            ${CMAKE_CURRENT_SOURCE_DIR}/../include
-            ${CMAKE_CURRENT_SOURCE_DIR}/..
-            ${CMAKE_CURRENT_SOURCE_DIR})
-        target_compile_definitions(test_malloc_whitebox PRIVATE __TBBMALLOC_BUILD)
-        target_compile_options(test_malloc_whitebox
-            PRIVATE
-            ${TBB_CXX_STD_FLAG}
-            ${TBB_WARNING_SUPPRESS}
-            ${TBB_TEST_COMPILE_FLAGS}
-            ${TBB_COMMON_COMPILE_FLAGS}
-            ${TBBMALLOC_LIB_COMPILE_FLAGS}
-        )
-        if (ANDROID_PLATFORM)
-            target_link_libraries(test_malloc_whitebox PRIVATE -rdynamic) # for the test_dynamic_link
-            add_test(NAME test_malloc_whitebox
-                    COMMAND ${CMAKE_COMMAND}
-                            -DBINARIES_PATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
-                            -DTEST_NAME=test_malloc_whitebox
-                            -P ${PROJECT_SOURCE_DIR}/cmake/android/test_launcher.cmake)
-        else()
-            add_test(NAME test_malloc_whitebox COMMAND test_malloc_whitebox --force-colors=1)
-        endif()
-        if (COMMAND target_link_options)
-            target_link_options(test_malloc_whitebox PRIVATE ${TBB_COMMON_LINK_FLAGS})
-        else()
-            target_link_libraries(test_malloc_whitebox PRIVATE ${TBB_COMMON_LINK_FLAGS})
+        if (NOT TBB_EMSCRIPTEN)
+	    add_executable(test_malloc_whitebox tbbmalloc/test_malloc_whitebox.cpp)
+
+            target_include_directories(test_malloc_whitebox
+                PRIVATE
+                ${CMAKE_CURRENT_SOURCE_DIR}/../include
+                ${CMAKE_CURRENT_SOURCE_DIR}/..
+                ${CMAKE_CURRENT_SOURCE_DIR})
+            target_compile_definitions(test_malloc_whitebox PRIVATE __TBBMALLOC_BUILD)
+            target_compile_options(test_malloc_whitebox
+                PRIVATE
+                ${TBB_CXX_STD_FLAG}
+                ${TBB_WARNING_SUPPRESS}
+                ${TBB_TEST_COMPILE_FLAGS}
+                ${TBB_COMMON_COMPILE_FLAGS}
+                ${TBBMALLOC_LIB_COMPILE_FLAGS}
+            )
+            if (ANDROID_PLATFORM)
+                add_test(NAME test_malloc_whitebox
+                        COMMAND ${CMAKE_COMMAND}
+                                -DBINARIES_PATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
+                                -DTEST_NAME=test_malloc_whitebox
+                                -P ${PROJECT_SOURCE_DIR}/cmake/android/test_launcher.cmake)
+            else()
+                add_test(NAME test_malloc_whitebox COMMAND test_malloc_whitebox --force-colors=1)
+            endif()
+            if (COMMAND target_link_options)
+                target_link_options(test_malloc_whitebox PRIVATE ${TBB_COMMON_LINK_FLAGS})
+            else()
+                target_link_libraries(test_malloc_whitebox PRIVATE ${TBB_COMMON_LINK_FLAGS})
+            endif()
+            target_link_libraries(test_malloc_whitebox PRIVATE Threads::Threads ${TBB_COMMON_LINK_LIBS})
         endif()
-        target_link_libraries(test_malloc_whitebox PRIVATE Threads::Threads ${TBB_COMMON_LINK_LIBS})
-
         # ------------------------------------------------------------------------------------------
 
         # Define TBB malloc conformance tests
@@ -602,10 +691,12 @@ if (TARGET TBB::tbbmalloc)
         endif()
 
         # Thread Sanitizer overloads memory management routines that conflicts with tbbmalloc_proxy.
-        if (BUILD_SHARED_LIBS AND NOT TBB_SANITIZE MATCHES "thread")
+        if (BUILD_SHARED_LIBS AND NOT TBB_SANITIZE MATCHES "thread" AND TBBMALLOC_PROXY_BUILD AND NOT MSVC_CXX_ARCHITECTURE_ID MATCHES "ARM64")
             # Define TBB malloc proxy tests
             tbb_add_lib_test(SUBDIR tbbmalloc NAME test_malloc_atexit DEPENDENCIES TBB::tbbmalloc_proxy TBB::tbbmalloc)
-            tbb_add_test(SUBDIR tbbmalloc NAME test_malloc_atexit DEPENDENCIES TBB::tbbmalloc_proxy TBB::tbbmalloc _test_malloc_atexit)
+	    if (NOT TBB_EMSCRIPTEN)
+	        tbb_add_test(SUBDIR tbbmalloc NAME test_malloc_atexit DEPENDENCIES TBB::tbbmalloc_proxy TBB::tbbmalloc _test_malloc_atexit)
+	    endif()
             tbb_add_test(SUBDIR tbbmalloc NAME test_malloc_overload DEPENDENCIES TBB::tbbmalloc_proxy)
             tbb_add_test(SUBDIR tbbmalloc NAME test_malloc_overload_disable DEPENDENCIES TBB::tbbmalloc_proxy TBB::tbbmalloc) # safer_msize call need to be available
             tbb_add_test(SUBDIR tbbmalloc NAME test_malloc_new_handler DEPENDENCIES TBB::tbbmalloc_proxy)
diff --git a/external/tbb/test/common/allocator_test_common.h b/external/tbb/test/common/allocator_test_common.h
index 0eb355a1..6486b1f4 100644
--- a/external/tbb/test/common/allocator_test_common.h
+++ b/external/tbb/test/common/allocator_test_common.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -247,14 +247,14 @@ struct Body: utils::NoAssign {
         for(std::size_t j=0; j < size * sizeof(value_type); ++j)
             REQUIRE_MESSAGE(s[j] == PseudoRandomValue(i, t), "Thread safety test failed");
         a.deallocate(array[i], size);
-        array[i] = 0;
+        array[i] = nullptr;
     }
 
     void operator()(std::size_t thread_id) const {
         pointer_type array[256];
 
         for(std::size_t k = 0; k < 256; ++k)
-            array[k] = 0;
+            array[k] = nullptr;
         for(std::size_t k = 0; k < max_k; ++k) {
             std::size_t i = static_cast<unsigned char>(PseudoRandomValue(k, thread_id));
             if(!array[i]) check_allocate(array, i, thread_id);
diff --git a/external/tbb/test/common/common_arena_constraints.h b/external/tbb/test/common/common_arena_constraints.h
index 5844d396..22c0d053 100644
--- a/external/tbb/test/common/common_arena_constraints.h
+++ b/external/tbb/test/common/common_arena_constraints.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2019-2021 Intel Corporation
+    Copyright (c) 2019-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -17,8 +17,6 @@
 #ifndef __TBB_test_common_arena_constraints_H_
 #define __TBB_test_common_arena_constraints_H_
 
-#define TBB_PREVIEW_TASK_ARENA_CONSTRAINTS_EXTENSION 1
-
 #if _WIN32 || _WIN64
 #define _CRT_SECURE_NO_WARNINGS
 #endif
@@ -91,6 +89,7 @@ int get_processors_group_count() { return 1; }
 #define __HWLOC_HYBRID_CPUS_INTERFACES_VALID (!_WIN32 || _WIN64)
 
 #define __HYBRID_CPUS_TESTING __HWLOC_HYBRID_CPUS_INTERFACES_PRESENT && __HWLOC_HYBRID_CPUS_INTERFACES_VALID
+#define __HWLOC_CPUBIND_PRESENT (!__APPLE__)
 
 // Macro to check hwloc interfaces return codes
 #define hwloc_require_ex(command, ...)                                          \
@@ -181,12 +180,16 @@ class system_info {
 #endif
         hwloc_require_ex(hwloc_topology_load, topology);
 
+#if __HWLOC_CPUBIND_PRESENT
         if ( get_processors_group_count() > 1 ) {
             process_cpuset = hwloc_bitmap_dup(hwloc_topology_get_complete_cpuset(topology));
         } else {
             process_cpuset = hwloc_bitmap_alloc();
             hwloc_require_ex(hwloc_get_cpubind, topology, process_cpuset, 0);
         }
+#else
+        process_cpuset = hwloc_bitmap_dup(hwloc_topology_get_complete_cpuset(topology));
+#endif
 
         hwloc_obj_t current_numa_node = nullptr;
         index_info current_node_info{};
@@ -351,7 +354,11 @@ class system_info {
     static affinity_mask allocate_current_affinity_mask() {
         affinity_mask result = hwloc_bitmap_alloc();
         instance().memory_handler.insert(result);
+#if __HWLOC_CPUBIND_PRESENT
         hwloc_require_ex(hwloc_get_cpubind, instance().topology, result, HWLOC_CPUBIND_THREAD);
+#else
+        hwloc_bitmap_copy(result, hwloc_topology_get_complete_cpuset(instance().topology));
+#endif
         REQUIRE_MESSAGE(!hwloc_bitmap_iszero(result), "Empty current affinity mask.");
         return result;
     }
@@ -553,16 +560,19 @@ constraints_container generate_constraints_variety() {
 #endif /*__HYBRID_CPUS_TESTING*/
         }
 
+        int max_threads_per_core = system_info::get_available_max_threads_values().back();
         // Some constraints may cause unexpected behavior, which would be fixed later.
         if (get_processors_group_count() > 1) {
-            for(auto it = results.begin(); it != results.end(); ++it) {
-                if (it->max_threads_per_core != tbb::task_arena::automatic
+            for(auto it = results.begin(); it != results.end();) {
+                if (it->max_threads_per_core != max_threads_per_core
                    && (it->numa_id == tbb::task_arena::automatic || tbb::info::numa_nodes().size() == 1)
 #if __HYBRID_CPUS_TESTING
                    && (it->core_type == tbb::task_arena::automatic || tbb::info::core_types().size() == 1)
 #endif /*__HYBRID_CPUS_TESTING*/
                 ) {
                     it = results.erase(it);
+                } else {
+                    ++it;
                 }
             }
         }
diff --git a/external/tbb/test/common/concepts_common.h b/external/tbb/test/common/concepts_common.h
index 8e5a0310..dca9700d 100644
--- a/external/tbb/test/common/concepts_common.h
+++ b/external/tbb/test/common/concepts_common.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2021 Intel Corporation
+    Copyright (c) 2021-2025 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -235,20 +235,47 @@ template <typename T, typename F = T> using WithFeederOperatorRoundBracketsNonCo
 template <typename T, typename F = T> using WithFeederWrongFirstInputOperatorRoundBrackets = ParallelForEachFeederBody<T, F, /*() = */State::incorrect_first_input>;
 template <typename T, typename F = T> using WithFeederWrongSecondInputOperatorRoundBrackets = ParallelForEachFeederBody<T, F, /*() = */State::incorrect_second_input>;
 } // namespace parallel_for_each_body
-namespace container_based_sequence {
+namespace parallel_sort_value {
+template<bool MovableV, bool MoveAssignableV, bool ComparableV>
+struct ParallelSortValue
+{
+    ParallelSortValue(ParallelSortValue&&) requires MovableV = default;
+    ParallelSortValue& operator=(ParallelSortValue&&) requires MoveAssignableV = default;
+
+    friend bool operator<(const ParallelSortValue&, const ParallelSortValue&) requires ComparableV { return true; }
+};
 
-using iterator = int*;
+using CorrectValue = ParallelSortValue</*MovableV = */true, /*MoveAssignableV = */true, /*ComparableV = */true>;
+using NonMovableValue = ParallelSortValue</*MovableV = */false, /*MoveAssignableV = */true, /*ComparableV = */true>;
+using NonMoveAssignableValue = ParallelSortValue</*MovableV = */true, /*MoveAssignableV = */false, /*ComparableV = */true>;
+using NonComparableValue = ParallelSortValue</*MovableV = */true, /*MoveAssignableV = */true, /*ComparableV = */false>;
+} // namespace parallel_sort_value
+template <typename T>
+class ConstantIT {
+    T data{};
+    const T& operator* () const { return data; }
+};
+namespace container_based_sequence {
 
-template <bool EnableBegin, bool EnableEnd>
+template <bool EnableBegin, bool EnableEnd, typename T = int>
 struct ContainerBasedSequence {
-    int* begin() requires EnableBegin { return nullptr; }
-    int* end() requires EnableEnd { return nullptr; }
+    using iterator = T*;
+    T* begin() requires EnableBegin { return nullptr; }
+    T* end() requires EnableEnd { return nullptr; }
 };
 
 using Correct = ContainerBasedSequence</*Begin = */true, /*End = */true>;
 using NoBegin = ContainerBasedSequence</*Begin = */false, /*End = */true>;
 using NoEnd = ContainerBasedSequence</*Begin = */true, /*End = */false>;
 
+template <typename T>
+using CustomValueCBS = ContainerBasedSequence</*Begin = */true, /*End = */true, T>;
+
+struct ConstantCBS {
+    ConstantIT<int> begin() const { return ConstantIT<int>{}; }
+    ConstantIT<int> end() const { return ConstantIT<int>{}; }
+};
+
 struct ForwardIteratorCBS {
     utils::ForwardIterator<int> begin() { return utils::ForwardIterator<int>{}; }
     utils::ForwardIterator<int> end() { return begin(); }
@@ -358,7 +385,7 @@ struct ParallelScanFunction {
     T operator()( Dummy, const T& a, bool ) const requires (EnableFunctionCallOperator == State::incorrect_first_input) { return a; }
     T operator()( const Range&, Dummy, bool ) const requires (EnableFunctionCallOperator == State::incorrect_second_input) { return T{}; }
     T operator()( const Range&, const T& a, Dummy ) const requires (EnableFunctionCallOperator == State::incorrect_third_input) { return a; }
-    Dummy operator()( const Range&, const T& a, bool ) const requires (EnableFunctionCallOperator == State::incorrect_return_type) { return Dummy{}; }
+    Dummy operator()( const Range&, const T&, bool ) const requires (EnableFunctionCallOperator == State::incorrect_return_type) { return Dummy{}; }
 };
 
 template <typename R, typename T> using Correct = ParallelScanFunction<R, T, /*() = */State::correct>;
diff --git a/external/tbb/test/common/concurrency_tracker.h b/external/tbb/test/common/concurrency_tracker.h
index 583f85da..fcc4a191 100644
--- a/external/tbb/test/common/concurrency_tracker.h
+++ b/external/tbb/test/common/concurrency_tracker.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2023 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -96,7 +96,7 @@ struct ExactConcurrencyLevel : NoCopy {
     static std::mutex global_mutex;
 
     ExactConcurrencyLevel(double timeout, size_t concLevel) :
-        myBarrier(NULL),
+        myBarrier(nullptr),
         myUniqueThreadsCnt(0), myReachedMax(false),
         myTimeout(timeout), myConcLevel(concLevel) {
         myActiveBodyCnt = 0;
@@ -112,7 +112,7 @@ struct ExactConcurrencyLevel : NoCopy {
 public:
     void operator()(size_t) const {
         size_t v = ++myActiveBodyCnt;
-        CHECK_MESSAGE(v <= myConcLevel, "Number of active bodies is too high.");
+        REQUIRE_MESSAGE(v <= myConcLevel, "Number of active bodies is too high.");
         if (v == myConcLevel) // record that the max expected concurrency was observed
             myReachedMax = true;
         // try to get barrier when 1st time in the thread
diff --git a/external/tbb/test/common/concurrent_associative_common.h b/external/tbb/test/common/concurrent_associative_common.h
index d50ee04d..ecf28168 100644
--- a/external/tbb/test/common/concurrent_associative_common.h
+++ b/external/tbb/test/common/concurrent_associative_common.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2023 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -369,7 +369,7 @@ void check_unequal( const T& cont1, const T& cont2 ) {
     REQUIRE_MESSAGE(cont1 != cont2, "Containers should be unequal");
     REQUIRE_MESSAGE(cont2 != cont1, "Containers should be unequal");
     REQUIRE_MESSAGE(!(cont1 == cont2), "Containers should not be equal");
-    REQUIRE_MESSAGE(!(cont2 == cont1), "Containers shuold not be equal");
+    REQUIRE_MESSAGE(!(cont2 == cont1), "Containers should not be equal");
 }
 
 // Break value for maps
@@ -425,6 +425,16 @@ void test_comparison_operators() {
     check_unequal(cont, cont6);
 }
 
+template <typename Range, typename Container>
+void test_empty_container_range(Container&& cont) {
+    REQUIRE(cont.empty());
+    Range r = cont.range();
+    REQUIRE_MESSAGE(r.empty(), "Empty container range should be empty");
+    REQUIRE_MESSAGE(!r.is_divisible(), "Empty container range should not be divisible");
+    REQUIRE_MESSAGE(r.begin() == r.end(), "Incorrect iterators on empty range");
+    REQUIRE_MESSAGE(r.begin() == cont.begin(), "Incorrect iterators on empty range");
+}
+
 template<typename T, typename CheckElementState>
 void test_basic_common()
 {
@@ -446,6 +456,25 @@ void test_basic_common()
     REQUIRE_MESSAGE(ccont.begin() == ccont.end(), "Concurrent container iterators are invalid after construction");
     REQUIRE_MESSAGE(cont.cbegin() == cont.cend(), "Concurrent container iterators are invalid after construction");
 
+    // Test range for empty container
+    using range_type = typename T::range_type;
+    using const_range_type = typename T::const_range_type;
+    test_empty_container_range<range_type>(cont);
+    test_empty_container_range<const_range_type>(cont);
+    test_empty_container_range<const_range_type>(ccont);
+
+    T empty_cont;
+    const T& empty_ccont = empty_cont;
+
+    for (int i = 0; i < 1000; ++i) {
+        empty_cont.insert(Value<T>::make(i));
+    }
+    empty_cont.clear();
+
+    test_empty_container_range<range_type>(empty_cont);
+    test_empty_container_range<const_range_type>(empty_cont);
+    test_empty_container_range<const_range_type>(empty_ccont);
+
     //std::pair<iterator, bool> insert(const value_type& obj);
     std::pair<typename T::iterator, bool> ins = cont.insert(Value<T>::make(1));
     REQUIRE_MESSAGE((ins.second == true && Value<T>::get(*(ins.first)) == 1), "Element 1 has not been inserted properly");
diff --git a/external/tbb/test/common/concurrent_lru_cache_common.h b/external/tbb/test/common/concurrent_lru_cache_common.h
index dccf5ef2..ef1dd3ac 100644
--- a/external/tbb/test/common/concurrent_lru_cache_common.h
+++ b/external/tbb/test/common/concurrent_lru_cache_common.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
 
 
 #include "test.h"
+#include "utils.h"
 #include <tbb/concurrent_lru_cache.h>
 
 //-----------------------------------------------------------------------------
@@ -114,10 +115,17 @@ namespace concurrent_lru_cache_helpers {
         }
 
         ~instance_counter() {
-            if (! --(*my_p_count))
+            bool is_last = ! --(*my_p_count);
+#if __GNUC__ == 12
+        // GCC 12 warns about using my_p_count after delete.
+        // The test was investigated and no problems were detected
+        // The following statement silence the warning
+        static bool unused_is_last = is_last;
+        utils::suppress_unused_warning(unused_is_last);
+#endif
+            if (is_last)
                 delete(my_p_count);
         }
-
         std::size_t instances_count() const { return *my_p_count; }
     };
 
diff --git a/external/tbb/test/common/concurrent_unordered_common.h b/external/tbb/test/common/concurrent_unordered_common.h
index 895fbfb6..7f1a393d 100644
--- a/external/tbb/test/common/concurrent_unordered_common.h
+++ b/external/tbb/test/common/concurrent_unordered_common.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2023 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -372,4 +372,22 @@ void test_set_comparisons() {
     test_two_way_comparable_container<two_way_comparable_container>();
 }
 
+template <typename Container>
+void test_reserve_regression() {
+    Container container;
+
+    float lf = container.max_load_factor();
+    std::size_t buckets = container.unsafe_bucket_count();
+    std::size_t capacity = std::size_t(buckets * lf);
+
+    for (std::size_t elements = 0; elements < capacity; ++elements) {
+        container.reserve(elements);
+        REQUIRE_MESSAGE(container.unsafe_bucket_count() == buckets,
+                        "reserve() should not increase bucket count if the capacity is not reached");
+    }
+
+    container.reserve(capacity * 2);
+    REQUIRE_MESSAGE(container.unsafe_bucket_count() > buckets, "reserve() should increase bucket count if the capacity is reached");
+}
+
 #endif // __TBB_test_common_concurrent_unordered_common
diff --git a/external/tbb/test/common/config.h b/external/tbb/test/common/config.h
index 03ab8f8d..d2a8396c 100644
--- a/external/tbb/test/common/config.h
+++ b/external/tbb/test/common/config.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2025 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -30,21 +30,21 @@
 #ifndef TBB_PREVIEW_TASK_GROUP_EXTENSIONS
 #define TBB_PREVIEW_TASK_GROUP_EXTENSIONS 1
 #endif
-#ifndef TBB_PREVIEW_COLLABORATIVE_CALL_ONCE
-#define TBB_PREVIEW_COLLABORATIVE_CALL_ONCE 1
-#endif
 #ifndef TBB_PREVIEW_CONCURRENT_LRU_CACHE
 #define TBB_PREVIEW_CONCURRENT_LRU_CACHE 1
 #endif
 #ifndef TBB_PREVIEW_VARIADIC_PARALLEL_INVOKE
 #define TBB_PREVIEW_VARIADIC_PARALLEL_INVOKE 1
 #endif
-#ifndef TBB_PREVIEW_BLOCKED_RANGE_ND
-#define TBB_PREVIEW_BLOCKED_RANGE_ND 1
-#endif
 #ifndef TBB_PREVIEW_ISOLATED_TASK_GROUP
 #define TBB_PREVIEW_ISOLATED_TASK_GROUP 1
 #endif
+#ifndef TBB_PREVIEW_PARALLEL_PHASE
+#define TBB_PREVIEW_PARALLEL_PHASE 1
+#endif
+#ifndef TBB_PREVIEW_BLOCKED_ND_RANGE_DEDUCTION_GUIDES
+#define TBB_PREVIEW_BLOCKED_ND_RANGE_DEDUCTION_GUIDES 1
+#endif
 #endif
 
 #include "oneapi/tbb/detail/_config.h"
diff --git a/external/tbb/test/common/cpu_usertime.h b/external/tbb/test/common/cpu_usertime.h
index b0b0201d..dd71283b 100644
--- a/external/tbb/test/common/cpu_usertime.h
+++ b/external/tbb/test/common/cpu_usertime.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2023 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -41,7 +41,7 @@ inline double GetCPUUserTime() {
 #elif _WIN32
     FILETIME my_times[4];
     bool status = GetProcessTimes(GetCurrentProcess(), my_times, my_times+1, my_times+2, my_times+3)!=0;
-    CHECK( status );
+    CHECK_FAST(status);
     LARGE_INTEGER usrtime;
     usrtime.LowPart = my_times[3].dwLowDateTime;
     usrtime.HighPart = my_times[3].dwHighDateTime;
diff --git a/external/tbb/test/common/custom_allocators.h b/external/tbb/test/common/custom_allocators.h
index 09d61bf6..68343946 100644
--- a/external/tbb/test/common/custom_allocators.h
+++ b/external/tbb/test/common/custom_allocators.h
@@ -391,8 +391,8 @@ class StaticSharedCountingAllocator
     };
 
     StaticSharedCountingAllocator() = default;
-
     StaticSharedCountingAllocator( const StaticSharedCountingAllocator& ) = default;
+    StaticSharedCountingAllocator& operator=( const StaticSharedCountingAllocator& ) = default;
 
     template <typename U>
     StaticSharedCountingAllocator( const StaticSharedCountingAllocator<U>& other) : alloc_base_type(other) {}
diff --git a/external/tbb/test/common/doctest.h b/external/tbb/test/common/doctest.h
index 4c638f6f..413a5b3f 100644
--- a/external/tbb/test/common/doctest.h
+++ b/external/tbb/test/common/doctest.h
@@ -1,5 +1,5 @@
 /*
-    Modifications Copyright (c) 2020-2021 Intel Corporation
+    Modifications Copyright (c) 2020-2023 Intel Corporation
     Modifications Licensed under the Apache License, Version 2.0;
     You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
 */
@@ -10,14 +10,14 @@
 //
 // doctest.h - the lightest feature-rich C++ single-header testing framework for unit tests and TDD
 //
-// Copyright (c) 2016-2021 Viktor Kirilov
+// Copyright (c) 2016-2023 Viktor Kirilov
 //
 // Distributed under the MIT Software License
 // See accompanying file LICENSE.txt or copy at
 // https://opensource.org/licenses/MIT
 //
 // The documentation can be found at the library's page:
-// https://github.com/onqtam/doctest/blob/master/doc/markdown/readme.md
+// https://github.com/doctest/doctest/blob/master/doc/markdown/readme.md
 //
 // =================================================================================================
 // =================================================================================================
@@ -54,8 +54,16 @@
 
 #define DOCTEST_VERSION_MAJOR 2
 #define DOCTEST_VERSION_MINOR 4
-#define DOCTEST_VERSION_PATCH 6
-#define DOCTEST_VERSION_STR "2.4.6"
+#define DOCTEST_VERSION_PATCH 11
+
+// util we need here
+#define DOCTEST_TOSTR_IMPL(x) #x
+#define DOCTEST_TOSTR(x) DOCTEST_TOSTR_IMPL(x)
+
+#define DOCTEST_VERSION_STR                                                                        \
+    DOCTEST_TOSTR(DOCTEST_VERSION_MAJOR) "."                                                       \
+    DOCTEST_TOSTR(DOCTEST_VERSION_MINOR) "."                                                       \
+    DOCTEST_TOSTR(DOCTEST_VERSION_PATCH)
 
 #define DOCTEST_VERSION                                                                            \
     (DOCTEST_VERSION_MAJOR * 10000 + DOCTEST_VERSION_MINOR * 100 + DOCTEST_VERSION_PATCH)
@@ -66,6 +74,12 @@
 
 // ideas for the version stuff are taken from here: https://github.com/cxxstuff/cxx_detect
 
+#ifdef _MSC_VER
+#define DOCTEST_CPLUSPLUS _MSVC_LANG
+#else
+#define DOCTEST_CPLUSPLUS __cplusplus
+#endif
+
 #define DOCTEST_COMPILER(MAJOR, MINOR, PATCH) ((MAJOR)*10000000 + (MINOR)*100000 + (PATCH))
 
 // GCC/Clang and GCC/MSVC are mutually exclusive, but Clang/MSVC are not because of clang-cl...
@@ -77,15 +91,14 @@
     DOCTEST_COMPILER(_MSC_VER / 100, (_MSC_FULL_VER / 100000) % 100, _MSC_FULL_VER % 100000)
 #endif // MSVC
 #endif // MSVC
-#if defined(__clang__) && defined(__clang_minor__)
+#if defined(__clang__) && defined(__clang_minor__) && defined(__clang_patchlevel__)
 #define DOCTEST_CLANG DOCTEST_COMPILER(__clang_major__, __clang_minor__, __clang_patchlevel__)
 #elif defined(__GNUC__) && defined(__GNUC_MINOR__) && defined(__GNUC_PATCHLEVEL__) &&              \
         !defined(__INTEL_COMPILER)
 #define DOCTEST_GCC DOCTEST_COMPILER(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__)
 #endif // GCC
-// TODO: upstream the change to doctest : Intel Compiler support
 #if defined(__INTEL_COMPILER)
-#define DOCTEST_ICC DOCTEST_COMPILER(__INTEL_COMPILER / 100, __INTEL_COMPILER % 100, __INTEL_COMPILER % 10000)
+#define DOCTEST_ICC DOCTEST_COMPILER(__INTEL_COMPILER / 100, __INTEL_COMPILER % 100, 0)
 #endif // ICC
 
 #ifndef DOCTEST_MSVC
@@ -150,85 +163,94 @@
 // == COMPILER WARNINGS ============================================================================
 // =================================================================================================
 
+// both the header and the implementation suppress all of these,
+// so it only makes sense to aggregate them like so
+#define DOCTEST_SUPPRESS_COMMON_WARNINGS_PUSH                                                      \
+    DOCTEST_CLANG_SUPPRESS_WARNING_PUSH                                                            \
+    DOCTEST_CLANG_SUPPRESS_WARNING("-Wunknown-pragmas")                                            \
+    DOCTEST_CLANG_SUPPRESS_WARNING("-Wweak-vtables")                                               \
+    DOCTEST_CLANG_SUPPRESS_WARNING("-Wpadded")                                                     \
+    DOCTEST_CLANG_SUPPRESS_WARNING("-Wmissing-prototypes")                                         \
+    DOCTEST_CLANG_SUPPRESS_WARNING("-Wc++98-compat")                                               \
+    DOCTEST_CLANG_SUPPRESS_WARNING("-Wc++98-compat-pedantic")                                      \
+                                                                                                   \
+    DOCTEST_GCC_SUPPRESS_WARNING_PUSH                                                              \
+    DOCTEST_GCC_SUPPRESS_WARNING("-Wunknown-pragmas")                                              \
+    DOCTEST_GCC_SUPPRESS_WARNING("-Wpragmas")                                                      \
+    DOCTEST_GCC_SUPPRESS_WARNING("-Weffc++")                                                       \
+    DOCTEST_GCC_SUPPRESS_WARNING("-Wstrict-overflow")                                              \
+    DOCTEST_GCC_SUPPRESS_WARNING("-Wstrict-aliasing")                                              \
+    DOCTEST_GCC_SUPPRESS_WARNING("-Wmissing-declarations")                                         \
+    DOCTEST_GCC_SUPPRESS_WARNING("-Wuseless-cast")                                                 \
+    DOCTEST_GCC_SUPPRESS_WARNING("-Wnoexcept")                                                     \
+                                                                                                   \
+    DOCTEST_MSVC_SUPPRESS_WARNING_PUSH                                                             \
+    /* these 4 also disabled globally via cmake: */                                                \
+    DOCTEST_MSVC_SUPPRESS_WARNING(4514) /* unreferenced inline function has been removed */        \
+    DOCTEST_MSVC_SUPPRESS_WARNING(4571) /* SEH related */                                          \
+    DOCTEST_MSVC_SUPPRESS_WARNING(4710) /* function not inlined */                                 \
+    DOCTEST_MSVC_SUPPRESS_WARNING(4711) /* function selected for inline expansion*/                \
+    /* common ones */                                                                              \
+    DOCTEST_MSVC_SUPPRESS_WARNING(4616) /* invalid compiler warning */                             \
+    DOCTEST_MSVC_SUPPRESS_WARNING(4619) /* invalid compiler warning */                             \
+    DOCTEST_MSVC_SUPPRESS_WARNING(4996) /* The compiler encountered a deprecated declaration */    \
+    DOCTEST_MSVC_SUPPRESS_WARNING(4706) /* assignment within conditional expression */             \
+    DOCTEST_MSVC_SUPPRESS_WARNING(4512) /* 'class' : assignment operator could not be generated */ \
+    DOCTEST_MSVC_SUPPRESS_WARNING(4127) /* conditional expression is constant */                   \
+    DOCTEST_MSVC_SUPPRESS_WARNING(4820) /* padding */                                              \
+    DOCTEST_MSVC_SUPPRESS_WARNING(4625) /* copy constructor was implicitly deleted */              \
+    DOCTEST_MSVC_SUPPRESS_WARNING(4626) /* assignment operator was implicitly deleted */           \
+    DOCTEST_MSVC_SUPPRESS_WARNING(5027) /* move assignment operator implicitly deleted */          \
+    DOCTEST_MSVC_SUPPRESS_WARNING(5026) /* move constructor was implicitly deleted */              \
+    DOCTEST_MSVC_SUPPRESS_WARNING(4640) /* construction of local static object not thread-safe */  \
+    DOCTEST_MSVC_SUPPRESS_WARNING(5045) /* Spectre mitigation for memory load */                   \
+    DOCTEST_MSVC_SUPPRESS_WARNING(5264) /* 'variable-name': 'const' variable is not used */        \
+    /* static analysis */                                                                          \
+    DOCTEST_MSVC_SUPPRESS_WARNING(26439) /* Function may not throw. Declare it 'noexcept' */       \
+    DOCTEST_MSVC_SUPPRESS_WARNING(26495) /* Always initialize a member variable */                 \
+    DOCTEST_MSVC_SUPPRESS_WARNING(26451) /* Arithmetic overflow ... */                             \
+    DOCTEST_MSVC_SUPPRESS_WARNING(26444) /* Avoid unnamed objects with custom ctor and dtor... */  \
+    DOCTEST_MSVC_SUPPRESS_WARNING(26812) /* Prefer 'enum class' over 'enum' */
+
+#define DOCTEST_SUPPRESS_COMMON_WARNINGS_POP                                                       \
+    DOCTEST_CLANG_SUPPRESS_WARNING_POP                                                             \
+    DOCTEST_GCC_SUPPRESS_WARNING_POP                                                               \
+    DOCTEST_MSVC_SUPPRESS_WARNING_POP
+
+DOCTEST_SUPPRESS_COMMON_WARNINGS_PUSH
+
 DOCTEST_CLANG_SUPPRESS_WARNING_PUSH
-DOCTEST_CLANG_SUPPRESS_WARNING("-Wunknown-pragmas")
 DOCTEST_CLANG_SUPPRESS_WARNING("-Wnon-virtual-dtor")
-DOCTEST_CLANG_SUPPRESS_WARNING("-Wweak-vtables")
-DOCTEST_CLANG_SUPPRESS_WARNING("-Wpadded")
 DOCTEST_CLANG_SUPPRESS_WARNING("-Wdeprecated")
-DOCTEST_CLANG_SUPPRESS_WARNING("-Wmissing-prototypes")
-DOCTEST_CLANG_SUPPRESS_WARNING("-Wunused-local-typedef")
-DOCTEST_CLANG_SUPPRESS_WARNING("-Wc++98-compat")
-DOCTEST_CLANG_SUPPRESS_WARNING("-Wc++98-compat-pedantic")
 
 DOCTEST_GCC_SUPPRESS_WARNING_PUSH
-DOCTEST_GCC_SUPPRESS_WARNING("-Wunknown-pragmas")
-DOCTEST_GCC_SUPPRESS_WARNING("-Wpragmas")
-DOCTEST_GCC_SUPPRESS_WARNING("-Weffc++")
-DOCTEST_GCC_SUPPRESS_WARNING("-Wstrict-overflow")
-DOCTEST_GCC_SUPPRESS_WARNING("-Wstrict-aliasing")
 DOCTEST_GCC_SUPPRESS_WARNING("-Wctor-dtor-privacy")
-DOCTEST_GCC_SUPPRESS_WARNING("-Wmissing-declarations")
 DOCTEST_GCC_SUPPRESS_WARNING("-Wnon-virtual-dtor")
-DOCTEST_GCC_SUPPRESS_WARNING("-Wunused-local-typedefs")
-DOCTEST_GCC_SUPPRESS_WARNING("-Wuseless-cast")
-DOCTEST_GCC_SUPPRESS_WARNING("-Wnoexcept")
 DOCTEST_GCC_SUPPRESS_WARNING("-Wsign-promo")
 
 DOCTEST_MSVC_SUPPRESS_WARNING_PUSH
-DOCTEST_MSVC_SUPPRESS_WARNING(4616) // invalid compiler warning
-DOCTEST_MSVC_SUPPRESS_WARNING(4619) // invalid compiler warning
-DOCTEST_MSVC_SUPPRESS_WARNING(4996) // The compiler encountered a deprecated declaration
-DOCTEST_MSVC_SUPPRESS_WARNING(4706) // assignment within conditional expression
-DOCTEST_MSVC_SUPPRESS_WARNING(4512) // 'class' : assignment operator could not be generated
-DOCTEST_MSVC_SUPPRESS_WARNING(4127) // conditional expression is constant
-DOCTEST_MSVC_SUPPRESS_WARNING(4820) // padding
-DOCTEST_MSVC_SUPPRESS_WARNING(4625) // copy constructor was implicitly defined as deleted
-DOCTEST_MSVC_SUPPRESS_WARNING(4626) // assignment operator was implicitly defined as deleted
-DOCTEST_MSVC_SUPPRESS_WARNING(5027) // move assignment operator was implicitly defined as deleted
-DOCTEST_MSVC_SUPPRESS_WARNING(5026) // move constructor was implicitly defined as deleted
 DOCTEST_MSVC_SUPPRESS_WARNING(4623) // default constructor was implicitly defined as deleted
-DOCTEST_MSVC_SUPPRESS_WARNING(4640) // construction of local static object is not thread-safe
-// static analysis
-DOCTEST_MSVC_SUPPRESS_WARNING(26439) // This kind of function may not throw. Declare it 'noexcept'
-DOCTEST_MSVC_SUPPRESS_WARNING(26495) // Always initialize a member variable
-DOCTEST_MSVC_SUPPRESS_WARNING(26451) // Arithmetic overflow ...
-DOCTEST_MSVC_SUPPRESS_WARNING(26444) // Avoid unnamed objects with custom construction and dtr...
-DOCTEST_MSVC_SUPPRESS_WARNING(26812) // Prefer 'enum class' over 'enum'
-
-// 4548 - expression before comma has no effect; expected expression with side - effect
-// 4265 - class has virtual functions, but destructor is not virtual
-// 4986 - exception specification does not match previous declaration
-// 4350 - behavior change: 'member1' called instead of 'member2'
-// 4668 - 'x' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif'
-// 4365 - conversion from 'int' to 'unsigned long', signed/unsigned mismatch
-// 4774 - format string expected in argument 'x' is not a string literal
-// 4820 - padding in structs
-
-// only 4 should be disabled globally:
-// - 4514 # unreferenced inline function has been removed
-// - 4571 # SEH related
-// - 4710 # function not inlined
-// - 4711 # function 'x' selected for automatic inline expansion
 
 #define DOCTEST_MAKE_STD_HEADERS_CLEAN_FROM_WARNINGS_ON_WALL_BEGIN                                 \
     DOCTEST_MSVC_SUPPRESS_WARNING_PUSH                                                             \
-    DOCTEST_MSVC_SUPPRESS_WARNING(4548)                                                            \
-    DOCTEST_MSVC_SUPPRESS_WARNING(4265)                                                            \
-    DOCTEST_MSVC_SUPPRESS_WARNING(4986)                                                            \
-    DOCTEST_MSVC_SUPPRESS_WARNING(4350)                                                            \
-    DOCTEST_MSVC_SUPPRESS_WARNING(4668)                                                            \
-    DOCTEST_MSVC_SUPPRESS_WARNING(4365)                                                            \
-    DOCTEST_MSVC_SUPPRESS_WARNING(4774)                                                            \
-    DOCTEST_MSVC_SUPPRESS_WARNING(4820)                                                            \
-    DOCTEST_MSVC_SUPPRESS_WARNING(4625)                                                            \
-    DOCTEST_MSVC_SUPPRESS_WARNING(4626)                                                            \
-    DOCTEST_MSVC_SUPPRESS_WARNING(5027)                                                            \
-    DOCTEST_MSVC_SUPPRESS_WARNING(5026)                                                            \
-    DOCTEST_MSVC_SUPPRESS_WARNING(4623)                                                            \
-    DOCTEST_MSVC_SUPPRESS_WARNING(5039)                                                            \
-    DOCTEST_MSVC_SUPPRESS_WARNING(5045)                                                            \
-    DOCTEST_MSVC_SUPPRESS_WARNING(5105)
+    DOCTEST_MSVC_SUPPRESS_WARNING(4548) /* before comma no effect; expected side - effect */       \
+    DOCTEST_MSVC_SUPPRESS_WARNING(4265) /* virtual functions, but destructor is not virtual */     \
+    DOCTEST_MSVC_SUPPRESS_WARNING(4986) /* exception specification does not match previous */      \
+    DOCTEST_MSVC_SUPPRESS_WARNING(4350) /* 'member1' called instead of 'member2' */                \
+    DOCTEST_MSVC_SUPPRESS_WARNING(4668) /* not defined as a preprocessor macro */                  \
+    DOCTEST_MSVC_SUPPRESS_WARNING(4365) /* signed/unsigned mismatch */                             \
+    DOCTEST_MSVC_SUPPRESS_WARNING(4774) /* format string not a string literal */                   \
+    DOCTEST_MSVC_SUPPRESS_WARNING(4820) /* padding */                                              \
+    DOCTEST_MSVC_SUPPRESS_WARNING(4625) /* copy constructor was implicitly deleted */              \
+    DOCTEST_MSVC_SUPPRESS_WARNING(4626) /* assignment operator was implicitly deleted */           \
+    DOCTEST_MSVC_SUPPRESS_WARNING(5027) /* move assignment operator implicitly deleted */          \
+    DOCTEST_MSVC_SUPPRESS_WARNING(5026) /* move constructor was implicitly deleted */              \
+    DOCTEST_MSVC_SUPPRESS_WARNING(4623) /* default constructor was implicitly deleted */           \
+    DOCTEST_MSVC_SUPPRESS_WARNING(5039) /* pointer to pot. throwing function passed to extern C */ \
+    DOCTEST_MSVC_SUPPRESS_WARNING(5045) /* Spectre mitigation for memory load */                   \
+    DOCTEST_MSVC_SUPPRESS_WARNING(5105) /* macro producing 'defined' has undefined behavior */     \
+    DOCTEST_MSVC_SUPPRESS_WARNING(4738) /* storing float result in memory, loss of performance */  \
+    DOCTEST_MSVC_SUPPRESS_WARNING(5262) /* implicit fall-through */
 
 #define DOCTEST_MAKE_STD_HEADERS_CLEAN_FROM_WARNINGS_ON_WALL_END DOCTEST_MSVC_SUPPRESS_WARNING_POP
 
@@ -241,6 +263,7 @@ DOCTEST_MSVC_SUPPRESS_WARNING(26812) // Prefer 'enum class' over 'enum'
 // GCC C++11 feature support table: https://gcc.gnu.org/projects/cxx-status.html
 // MSVC version table:
 // https://en.wikipedia.org/wiki/Microsoft_Visual_C%2B%2B#Internal_version_numbering
+// MSVC++ 14.3 (17) _MSC_VER == 1930 (Visual Studio 2022)
 // MSVC++ 14.2 (16) _MSC_VER == 1920 (Visual Studio 2019)
 // MSVC++ 14.1 (15) _MSC_VER == 1910 (Visual Studio 2017)
 // MSVC++ 14.0      _MSC_VER == 1900 (Visual Studio 2015)
@@ -250,6 +273,10 @@ DOCTEST_MSVC_SUPPRESS_WARNING(26812) // Prefer 'enum class' over 'enum'
 // MSVC++ 9.0       _MSC_VER == 1500 (Visual Studio 2008)
 // MSVC++ 8.0       _MSC_VER == 1400 (Visual Studio 2005)
 
+// Universal Windows Platform support
+#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP)
+#define DOCTEST_CONFIG_NO_WINDOWS_SEH
+#endif // WINAPI_FAMILY
 #if DOCTEST_MSVC && !defined(DOCTEST_CONFIG_WINDOWS_SEH)
 #define DOCTEST_CONFIG_WINDOWS_SEH
 #endif // MSVC
@@ -258,7 +285,7 @@ DOCTEST_MSVC_SUPPRESS_WARNING(26812) // Prefer 'enum class' over 'enum'
 #endif // DOCTEST_CONFIG_NO_WINDOWS_SEH
 
 #if !defined(_WIN32) && !defined(__QNX__) && !defined(DOCTEST_CONFIG_POSIX_SIGNALS) &&             \
-        !defined(__EMSCRIPTEN__)
+        !defined(__EMSCRIPTEN__) && !defined(__wasi__)
 #define DOCTEST_CONFIG_POSIX_SIGNALS
 #endif // _WIN32
 #if defined(DOCTEST_CONFIG_NO_POSIX_SIGNALS) && defined(DOCTEST_CONFIG_POSIX_SIGNALS)
@@ -266,7 +293,8 @@ DOCTEST_MSVC_SUPPRESS_WARNING(26812) // Prefer 'enum class' over 'enum'
 #endif // DOCTEST_CONFIG_NO_POSIX_SIGNALS
 
 #ifndef DOCTEST_CONFIG_NO_EXCEPTIONS
-#if !defined(__cpp_exceptions) && !defined(__EXCEPTIONS) && !defined(_CPPUNWIND)
+#if !defined(__cpp_exceptions) && !defined(__EXCEPTIONS) && !defined(_CPPUNWIND)                   \
+        || defined(__wasi__)
 #define DOCTEST_CONFIG_NO_EXCEPTIONS
 #endif // no exceptions
 #endif // DOCTEST_CONFIG_NO_EXCEPTIONS
@@ -281,6 +309,10 @@ DOCTEST_MSVC_SUPPRESS_WARNING(26812) // Prefer 'enum class' over 'enum'
 #define DOCTEST_CONFIG_NO_TRY_CATCH_IN_ASSERTS
 #endif // DOCTEST_CONFIG_NO_EXCEPTIONS && !DOCTEST_CONFIG_NO_TRY_CATCH_IN_ASSERTS
 
+#ifdef __wasi__
+#define DOCTEST_CONFIG_NO_MULTITHREADING
+#endif
+
 #if defined(DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN) && !defined(DOCTEST_CONFIG_IMPLEMENT)
 #define DOCTEST_CONFIG_IMPLEMENT
 #endif // DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
@@ -308,6 +340,16 @@ DOCTEST_MSVC_SUPPRESS_WARNING(26812) // Prefer 'enum class' over 'enum'
 #define DOCTEST_INTERFACE
 #endif // DOCTEST_CONFIG_IMPLEMENTATION_IN_DLL
 
+// needed for extern template instantiations
+// see https://github.com/fmtlib/fmt/issues/2228
+#if DOCTEST_MSVC
+#define DOCTEST_INTERFACE_DECL
+#define DOCTEST_INTERFACE_DEF DOCTEST_INTERFACE
+#else // DOCTEST_MSVC
+#define DOCTEST_INTERFACE_DECL DOCTEST_INTERFACE
+#define DOCTEST_INTERFACE_DEF
+#endif // DOCTEST_MSVC
+
 #define DOCTEST_EMPTY
 
 #if DOCTEST_MSVC
@@ -323,24 +365,69 @@ DOCTEST_MSVC_SUPPRESS_WARNING(26812) // Prefer 'enum class' over 'enum'
 #define DOCTEST_UNUSED __attribute__((unused))
 #define DOCTEST_ALIGNMENT(x) __attribute__((aligned(x)))
 #endif
+
 // TODO: upstream the change to doctest : Work-around for the warning: 'routine is both "inline" and "noinline"'
 #if DOCTEST_ICC
 #undef DOCTEST_NOINLINE
 #define DOCTEST_NOINLINE
 #endif // ICC
 
+#ifdef DOCTEST_CONFIG_NO_CONTRADICTING_INLINE
+#define DOCTEST_INLINE_NOINLINE inline
+#else
+#define DOCTEST_INLINE_NOINLINE inline DOCTEST_NOINLINE
+#endif
+
 #ifndef DOCTEST_NORETURN
+#if DOCTEST_MSVC && (DOCTEST_MSVC < DOCTEST_COMPILER(19, 0, 0))
+#define DOCTEST_NORETURN
+#else // DOCTEST_MSVC
 #define DOCTEST_NORETURN [[noreturn]]
+#endif // DOCTEST_MSVC
 #endif // DOCTEST_NORETURN
 
 #ifndef DOCTEST_NOEXCEPT
+#if DOCTEST_MSVC && (DOCTEST_MSVC < DOCTEST_COMPILER(19, 0, 0))
+#define DOCTEST_NOEXCEPT
+#else // DOCTEST_MSVC
 #define DOCTEST_NOEXCEPT noexcept
+#endif // DOCTEST_MSVC
 #endif // DOCTEST_NOEXCEPT
 
+#ifndef DOCTEST_CONSTEXPR
+#if DOCTEST_MSVC && (DOCTEST_MSVC < DOCTEST_COMPILER(19, 0, 0))
+#define DOCTEST_CONSTEXPR const
+#define DOCTEST_CONSTEXPR_FUNC inline
+#else // DOCTEST_MSVC
+#define DOCTEST_CONSTEXPR constexpr
+#define DOCTEST_CONSTEXPR_FUNC constexpr
+#endif // DOCTEST_MSVC
+#endif // DOCTEST_CONSTEXPR
+
+#ifndef DOCTEST_NO_SANITIZE_INTEGER
+// TODO: upstream the change to doctest : Work-around for the error on macOS with icpc: error #1292: unknown attribute "no_sanitize"
+#if DOCTEST_CLANG >= DOCTEST_COMPILER(3, 7, 0) && !DOCTEST_ICC
+#define DOCTEST_NO_SANITIZE_INTEGER __attribute__((no_sanitize("integer")))
+#else
+#define DOCTEST_NO_SANITIZE_INTEGER
+#endif
+#endif // DOCTEST_NO_SANITIZE_INTEGER
+
 // =================================================================================================
 // == FEATURE DETECTION END ========================================================================
 // =================================================================================================
 
+#define DOCTEST_DECLARE_INTERFACE(name)                                                            \
+    virtual ~name();                                                                               \
+    name() = default;                                                                              \
+    name(const name&) = delete;                                                                    \
+    name(name&&) = delete;                                                                         \
+    name& operator=(const name&) = delete;                                                         \
+    name& operator=(name&&) = delete;
+
+#define DOCTEST_DEFINE_INTERFACE(name)                                                             \
+    name::~name() = default;
+
 // internal macros for string concatenation and anonymous variable name generation
 #define DOCTEST_CAT_IMPL(s1, s2) s1##s2
 #define DOCTEST_CAT(s1, s2) DOCTEST_CAT_IMPL(s1, s2)
@@ -350,8 +437,6 @@ DOCTEST_MSVC_SUPPRESS_WARNING(26812) // Prefer 'enum class' over 'enum'
 #define DOCTEST_ANONYMOUS(x) DOCTEST_CAT(x, __LINE__)
 #endif // __COUNTER__
 
-#define DOCTEST_TOSTR(x) #x
-
 #ifndef DOCTEST_CONFIG_ASSERTION_PARAMETERS_BY_VALUE
 #define DOCTEST_REF_WRAP(x) x&
 #else // DOCTEST_CONFIG_ASSERTION_PARAMETERS_BY_VALUE
@@ -365,32 +450,39 @@ DOCTEST_MSVC_SUPPRESS_WARNING(26812) // Prefer 'enum class' over 'enum'
 #define DOCTEST_PLATFORM_IPHONE
 #elif defined(_WIN32)
 #define DOCTEST_PLATFORM_WINDOWS
+#elif defined(__wasi__)
+#define DOCTEST_PLATFORM_WASI
 #else // DOCTEST_PLATFORM
 #define DOCTEST_PLATFORM_LINUX
 #endif // DOCTEST_PLATFORM
 
-// TODO: upstream the change to doctest : make variable volatile to suppress unused warning
-#define DOCTEST_GLOBAL_NO_WARNINGS(var)                                                            \
-    DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wglobal-constructors")                              \
-    DOCTEST_CLANG_SUPPRESS_WARNING("-Wunused-variable")                                            \
-    static volatile int var DOCTEST_UNUSED // NOLINT(fuchsia-statically-constructed-objects,cert-err58-cpp)
-#define DOCTEST_GLOBAL_NO_WARNINGS_END() DOCTEST_CLANG_SUPPRESS_WARNING_POP
+namespace doctest { namespace detail {
+    static DOCTEST_CONSTEXPR int consume(const int*, int) noexcept { return 0; }
+}}
+
+#define DOCTEST_GLOBAL_NO_WARNINGS(var, ...)                                                         \
+    DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wglobal-constructors")                                \
+    static const int var = doctest::detail::consume(&var, __VA_ARGS__);                              \
+    DOCTEST_CLANG_SUPPRESS_WARNING_POP
 
 #ifndef DOCTEST_BREAK_INTO_DEBUGGER
 // should probably take a look at https://github.com/scottt/debugbreak
 #ifdef DOCTEST_PLATFORM_LINUX
 #if defined(__GNUC__) && (defined(__i386) || defined(__x86_64))
 // Break at the location of the failing check if possible
-#define DOCTEST_BREAK_INTO_DEBUGGER() __asm__("int $3\n" : :) // NOLINT (hicpp-no-assembler)
+#define DOCTEST_BREAK_INTO_DEBUGGER() __asm__("int $3\n" : :) // NOLINT(hicpp-no-assembler)
 #else
 #include <signal.h>
 #define DOCTEST_BREAK_INTO_DEBUGGER() raise(SIGTRAP)
 #endif
 #elif defined(DOCTEST_PLATFORM_MAC)
 #if defined(__x86_64) || defined(__x86_64__) || defined(__amd64__) || defined(__i386)
-#define DOCTEST_BREAK_INTO_DEBUGGER() __asm__("int $3\n" : :) // NOLINT (hicpp-no-assembler)
+#define DOCTEST_BREAK_INTO_DEBUGGER() __asm__("int $3\n" : :) // NOLINT(hicpp-no-assembler)
+#elif defined(__ppc__) || defined(__ppc64__)
+// https://www.cocoawithlove.com/2008/03/break-into-debugger.html
+#define DOCTEST_BREAK_INTO_DEBUGGER() __asm__("li r0, 20\nsc\nnop\nli r0, 37\nli r4, 2\nsc\nnop\n": : : "memory","r0","r3","r4") // NOLINT(hicpp-no-assembler)
 #else
-#define DOCTEST_BREAK_INTO_DEBUGGER() __asm__("brk #0"); // NOLINT (hicpp-no-assembler)
+#define DOCTEST_BREAK_INTO_DEBUGGER() __asm__("brk #0"); // NOLINT(hicpp-no-assembler)
 #endif
 #elif DOCTEST_MSVC
 #define DOCTEST_BREAK_INTO_DEBUGGER() __debugbreak()
@@ -406,54 +498,67 @@ DOCTEST_GCC_SUPPRESS_WARNING_POP
 
 // this is kept here for backwards compatibility since the config option was changed
 #ifdef DOCTEST_CONFIG_USE_IOSFWD
+#ifndef DOCTEST_CONFIG_USE_STD_HEADERS
 #define DOCTEST_CONFIG_USE_STD_HEADERS
+#endif
 #endif // DOCTEST_CONFIG_USE_IOSFWD
 
+// for clang - always include ciso646 (which drags some std stuff) because
+// we want to check if we are using libc++ with the _LIBCPP_VERSION macro in
+// which case we don't want to forward declare stuff from std - for reference:
+// https://github.com/doctest/doctest/issues/126
+// https://github.com/doctest/doctest/issues/356
+#if DOCTEST_CLANG
+#include <ciso646>
+#endif // clang
+
+#ifdef _LIBCPP_VERSION
+#ifndef DOCTEST_CONFIG_USE_STD_HEADERS
+#define DOCTEST_CONFIG_USE_STD_HEADERS
+#endif
+#endif // _LIBCPP_VERSION
+
 #ifdef DOCTEST_CONFIG_USE_STD_HEADERS
 #ifndef DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS
 #define DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS
 #endif // DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS
-#include <iosfwd>
+DOCTEST_MAKE_STD_HEADERS_CLEAN_FROM_WARNINGS_ON_WALL_BEGIN
 #include <cstddef>
 #include <ostream>
+#include <istream>
+DOCTEST_MAKE_STD_HEADERS_CLEAN_FROM_WARNINGS_ON_WALL_END
 #else // DOCTEST_CONFIG_USE_STD_HEADERS
 
-#if DOCTEST_CLANG
-// to detect if libc++ is being used with clang (the _LIBCPP_VERSION identifier)
-#include <ciso646>
-#endif // clang
-
-#ifdef _LIBCPP_VERSION
-#define DOCTEST_STD_NAMESPACE_BEGIN _LIBCPP_BEGIN_NAMESPACE_STD
-#define DOCTEST_STD_NAMESPACE_END _LIBCPP_END_NAMESPACE_STD
-#else // _LIBCPP_VERSION
-#define DOCTEST_STD_NAMESPACE_BEGIN namespace std {
-#define DOCTEST_STD_NAMESPACE_END }
-#endif // _LIBCPP_VERSION
-
 // Forward declaring 'X' in namespace std is not permitted by the C++ Standard.
 DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(4643)
 
-DOCTEST_STD_NAMESPACE_BEGIN // NOLINT (cert-dcl58-cpp)
-typedef decltype(nullptr) nullptr_t;
+namespace std { // NOLINT(cert-dcl58-cpp)
+typedef decltype(nullptr) nullptr_t; // NOLINT(modernize-use-using)
+typedef decltype(sizeof(void*)) size_t; // NOLINT(modernize-use-using)
 template <class charT>
 struct char_traits;
 template <>
 struct char_traits<char>;
 template <class charT, class traits>
-class basic_ostream;
-typedef basic_ostream<char, char_traits<char>> ostream;
+class basic_ostream; // NOLINT(fuchsia-virtual-inheritance)
+typedef basic_ostream<char, char_traits<char>> ostream; // NOLINT(modernize-use-using)
+template<class traits>
+// NOLINTNEXTLINE
+basic_ostream<char, traits>& operator<<(basic_ostream<char, traits>&, const char*);
+template <class charT, class traits>
+class basic_istream;
+typedef basic_istream<char, char_traits<char>> istream; // NOLINT(modernize-use-using)
 template <class... Types>
 class tuple;
 #if DOCTEST_MSVC >= DOCTEST_COMPILER(19, 20, 0)
-// see this issue on why this is needed: https://github.com/onqtam/doctest/issues/183
-template <class _Ty>
+// see this issue on why this is needed: https://github.com/doctest/doctest/issues/183
+template <class Ty>
 class allocator;
-template <class _Elem, class _Traits, class _Alloc>
+template <class Elem, class Traits, class Alloc>
 class basic_string;
 using string = basic_string<char, char_traits<char>, allocator<char>>;
 #endif // VS 2019
-DOCTEST_STD_NAMESPACE_END
+} // namespace std
 
 DOCTEST_MSVC_SUPPRESS_WARNING_POP
 
@@ -465,9 +570,15 @@ DOCTEST_MSVC_SUPPRESS_WARNING_POP
 
 namespace doctest {
 
+using std::size_t;
+
 DOCTEST_INTERFACE extern bool is_running_in_test;
 
-#if _MSC_VER
+#ifndef DOCTEST_CONFIG_STRING_SIZE_TYPE
+#define DOCTEST_CONFIG_STRING_SIZE_TYPE unsigned
+#endif
+
+#if DOCTEST_MSVC
 // TODO: upstream the change to doctest :
 // Due to race between exiting the process and starting of a new detached thread in Windows, thread
 // local variables, which constructors or destructors have calls to runtime functions (e.g. free()
@@ -494,14 +605,14 @@ struct doctest_thread_local_wrapper {
     union { T value; };
     bool initialized = false;
 };
-#else  // _MSC_VER
+#else  // DOCTEST_MSVC
 template <typename T>
 struct doctest_thread_local_wrapper {
     T& get() { return value; }
 private:
     T value{};
 };
-#endif // _MSC_VER
+#endif // DOCTEST_MSVC
 
 // A 24 byte string class (can be as small as 17 for x64 and 13 for x86) that can hold strings with length
 // of up to 23 chars on the stack before going on the heap - the last byte of the buffer is used for:
@@ -515,7 +626,6 @@ struct doctest_thread_local_wrapper {
 // TODO:
 // - optimizations - like not deleting memory unnecessarily in operator= and etc.
 // - resize/reserve/clear
-// - substr
 // - replace
 // - back/front
 // - iterator stuff
@@ -525,63 +635,84 @@ struct doctest_thread_local_wrapper {
 // - relational operators as free functions - taking const char* as one of the params
 class DOCTEST_INTERFACE String
 {
-    static const unsigned len  = 24;      //!OCLINT avoid private static members
-    static const unsigned last = len - 1; //!OCLINT avoid private static members
+public:
+    using size_type = DOCTEST_CONFIG_STRING_SIZE_TYPE;
+
+private:
+    static DOCTEST_CONSTEXPR size_type len  = 24;      //!OCLINT avoid private static members
+    static DOCTEST_CONSTEXPR size_type last = len - 1; //!OCLINT avoid private static members
 
     struct view // len should be more than sizeof(view) - because of the final byte for flags
     {
         char*    ptr;
-        unsigned size;
-        unsigned capacity;
+        size_type size;
+        size_type capacity;
     };
 
     union
     {
-        char buf[len];
+        char buf[len]; // NOLINT(*-avoid-c-arrays)
         view data;
     };
 
-    bool isOnStack() const { return (buf[last] & 128) == 0; }
-    void setOnHeap();
-    void setLast(unsigned in = last);
+    char* allocate(size_type sz);
+
+    bool isOnStack() const noexcept { return (buf[last] & 128) == 0; }
+    void setOnHeap() noexcept;
+    void setLast(size_type in = last) noexcept;
+    void setSize(size_type sz) noexcept;
 
     void copy(const String& other);
 
 public:
-    String();
+    static DOCTEST_CONSTEXPR size_type npos = static_cast<size_type>(-1);
+
+    String() noexcept;
     ~String();
 
     // cppcheck-suppress noExplicitConstructor
     String(const char* in);
-    String(const char* in, unsigned in_size);
+    String(const char* in, size_type in_size);
+
+    String(std::istream& in, size_type in_size);
 
     String(const String& other);
     String& operator=(const String& other);
 
     String& operator+=(const String& other);
-    String  operator+(const String& other) const;
 
-    String(String&& other);
-    String& operator=(String&& other);
+    String(String&& other) noexcept;
+    String& operator=(String&& other) noexcept;
 
-    char  operator[](unsigned i) const;
-    char& operator[](unsigned i);
+    char  operator[](size_type i) const;
+    char& operator[](size_type i);
 
     // the only functions I'm willing to leave in the interface - available for inlining
     const char* c_str() const { return const_cast<String*>(this)->c_str(); } // NOLINT
     char*       c_str() {
-        if(isOnStack())
+        if (isOnStack()) {
             return reinterpret_cast<char*>(buf);
+        }
         return data.ptr;
     }
 
-    unsigned size() const;
-    unsigned capacity() const;
+    size_type size() const;
+    size_type capacity() const;
+
+    String substr(size_type pos, size_type cnt = npos) &&;
+    String substr(size_type pos, size_type cnt = npos) const &;
+
+    size_type find(char ch, size_type pos = 0) const;
+    size_type rfind(char ch, size_type pos = npos) const;
 
     int compare(const char* other, bool no_case = false) const;
     int compare(const String& other, bool no_case = false) const;
+
+friend DOCTEST_INTERFACE std::ostream& operator<<(std::ostream& s, const String& in);
 };
 
+DOCTEST_INTERFACE String operator+(const String& lhs, const String& rhs);
+
 DOCTEST_INTERFACE bool operator==(const String& lhs, const String& rhs);
 DOCTEST_INTERFACE bool operator!=(const String& lhs, const String& rhs);
 DOCTEST_INTERFACE bool operator<(const String& lhs, const String& rhs);
@@ -589,7 +720,21 @@ DOCTEST_INTERFACE bool operator>(const String& lhs, const String& rhs);
 DOCTEST_INTERFACE bool operator<=(const String& lhs, const String& rhs);
 DOCTEST_INTERFACE bool operator>=(const String& lhs, const String& rhs);
 
-DOCTEST_INTERFACE std::ostream& operator<<(std::ostream& s, const String& in);
+class DOCTEST_INTERFACE Contains {
+public:
+    explicit Contains(const String& string);
+
+    bool checkWith(const String& other) const;
+
+    String string;
+};
+
+DOCTEST_INTERFACE String toString(const Contains& in);
+
+DOCTEST_INTERFACE bool operator==(const String& lhs, const Contains& rhs);
+DOCTEST_INTERFACE bool operator==(const Contains& lhs, const String& rhs);
+DOCTEST_INTERFACE bool operator!=(const String& lhs, const Contains& rhs);
+DOCTEST_INTERFACE bool operator!=(const Contains& lhs, const String& rhs);
 
 namespace Color {
     enum Enum
@@ -662,7 +807,7 @@ namespace assertType {
         DT_WARN_THROWS_WITH    = is_throws_with | is_warn,
         DT_CHECK_THROWS_WITH   = is_throws_with | is_check,
         DT_REQUIRE_THROWS_WITH = is_throws_with | is_require,
-        
+
         DT_WARN_THROWS_WITH_AS    = is_throws_with | is_throws_as | is_warn,
         DT_CHECK_THROWS_WITH_AS   = is_throws_with | is_throws_as | is_check,
         DT_REQUIRE_THROWS_WITH_AS = is_throws_with | is_throws_as | is_require,
@@ -743,9 +888,27 @@ struct DOCTEST_INTERFACE AssertData
     String m_decomp;
 
     // for specific exception-related asserts
-    bool        m_threw_as;
-    const char* m_exception_type;
-    const char* m_exception_string;
+    bool           m_threw_as;
+    const char*    m_exception_type;
+
+    class DOCTEST_INTERFACE StringContains {
+        private:
+            Contains content;
+            bool isContains;
+
+        public:
+            StringContains(const String& str) : content(str), isContains(false) { }
+            StringContains(Contains cntn) : content(static_cast<Contains&&>(cntn)), isContains(true) { }
+
+            bool check(const String& str) { return isContains ? (content == str) : (content.string == str); }
+
+            operator const String&() const { return content.string; }
+
+            const char* c_str() const { return content.string.c_str(); }
+    } m_exception_string;
+
+    AssertData(assertType::Enum at, const char* file, int line, const char* expr,
+        const char* exception_type, const StringContains& exception_string);
 };
 
 struct DOCTEST_INTERFACE MessageData
@@ -762,13 +925,13 @@ struct DOCTEST_INTERFACE SubcaseSignature
     const char* m_file;
     int         m_line;
 
+    bool operator==(const SubcaseSignature& other) const;
     bool operator<(const SubcaseSignature& other) const;
 };
 
 struct DOCTEST_INTERFACE IContextScope
 {
-    IContextScope();
-    virtual ~IContextScope();
+    DOCTEST_DECLARE_INTERFACE(IContextScope)
     virtual void stringify(std::ostream*) const = 0;
 };
 
@@ -778,9 +941,8 @@ namespace detail {
 
 struct ContextOptions //!OCLINT too many fields
 {
-    std::ostream* cout;        // stdout stream - std::cout by default
-    std::ostream* cerr;        // stderr stream - std::cerr by default
-    String        binary_name; // the test binary name
+    std::ostream* cout = nullptr; // stdout stream
+    String        binary_name;    // the test binary name
 
     const detail::TestCase* currentTest = nullptr;
 
@@ -799,9 +961,12 @@ struct ContextOptions //!OCLINT too many fields
     bool case_sensitive;       // if filtering should be case sensitive
     bool exit;                 // if the program should be exited after the tests are ran/whatever
     bool duration;             // print the time duration of each test case
+    bool minimal;              // minimal console output (only test failures)
+    bool quiet;                // no console output
     bool no_throw;             // to skip exceptions-related assertion macros
     bool no_exitcode;          // if the framework should return 0 as the exitcode
     bool no_run;               // to not run the tests at all (can be done with an "*" exclude)
+    bool no_intro;             // to not print the intro of the framework
     bool no_version;           // to not print the version of the framework
     bool no_colors;            // if output to the console should be colorized
     bool force_colors;         // forces the use of colors even when a tty cannot be detected
@@ -823,151 +988,189 @@ struct ContextOptions //!OCLINT too many fields
 };
 
 namespace detail {
-    template <bool CONDITION, typename TYPE = void>
-    struct enable_if
-    {};
+    namespace types {
+#ifdef DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS
+        using namespace std;
+#else
+        template <bool COND, typename T = void>
+        struct enable_if { };
 
-    template <typename TYPE>
-    struct enable_if<true, TYPE>
-    { typedef TYPE type; };
+        template <typename T>
+        struct enable_if<true, T> { using type = T; };
 
-    // clang-format off
-    template<class T> struct remove_reference      { typedef T type; };
-    template<class T> struct remove_reference<T&>  { typedef T type; };
-    template<class T> struct remove_reference<T&&> { typedef T type; };
+        struct true_type { static DOCTEST_CONSTEXPR bool value = true; };
+        struct false_type { static DOCTEST_CONSTEXPR bool value = false; };
+
+        template <typename T> struct remove_reference { using type = T; };
+        template <typename T> struct remove_reference<T&> { using type = T; };
+        template <typename T> struct remove_reference<T&&> { using type = T; };
+
+        template <typename T> struct is_rvalue_reference : false_type { };
+        template <typename T> struct is_rvalue_reference<T&&> : true_type { };
 
-    template<typename T, typename U = T&&> U declval(int); 
+        template<typename T> struct remove_const { using type = T; };
+        template <typename T> struct remove_const<const T> { using type = T; };
 
-    template<typename T> T declval(long); 
+        // Compiler intrinsics
+        template <typename T> struct is_enum { static DOCTEST_CONSTEXPR bool value = __is_enum(T); };
+        template <typename T> struct underlying_type { using type = __underlying_type(T); };
 
-    template<typename T> auto declval() DOCTEST_NOEXCEPT -> decltype(declval<T>(0)) ;
+        template <typename T> struct is_pointer : false_type { };
+        template <typename T> struct is_pointer<T*> : true_type { };
 
-    // TODO: upstream the change to doctest : fix "storage class is not first" warning
-    template<class T> struct is_lvalue_reference { static const bool value=false; };
-    template<class T> struct is_lvalue_reference<T&> { static const bool value=true; };
+        template <typename T> struct is_array : false_type { };
+        // NOLINTNEXTLINE(*-avoid-c-arrays)
+        template <typename T, size_t SIZE> struct is_array<T[SIZE]> : true_type { };
+#endif
+    }
+
+    // <utility>
+    template <typename T>
+    T&& declval();
 
     template <class T>
-    inline T&& forward(typename remove_reference<T>::type& t) DOCTEST_NOEXCEPT
-    {
+    DOCTEST_CONSTEXPR_FUNC T&& forward(typename types::remove_reference<T>::type& t) DOCTEST_NOEXCEPT {
         return static_cast<T&&>(t);
     }
 
     template <class T>
-    inline T&& forward(typename remove_reference<T>::type&& t) DOCTEST_NOEXCEPT
-    {
-        static_assert(!is_lvalue_reference<T>::value,
-                        "Can not forward an rvalue as an lvalue.");
+    DOCTEST_CONSTEXPR_FUNC T&& forward(typename types::remove_reference<T>::type&& t) DOCTEST_NOEXCEPT {
         return static_cast<T&&>(t);
     }
 
-    template<class T> struct remove_const          { typedef T type; };
-    template<class T> struct remove_const<const T> { typedef T type; };
-#ifdef DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS
-    template<class T> struct is_enum : public std::is_enum<T> {};
-    template<class T> struct underlying_type : public std::underlying_type<T> {};
-#else
-    // Use compiler intrinsics
-    template<class T> struct is_enum { constexpr static bool value = __is_enum(T); };
-    template<class T> struct underlying_type { typedef __underlying_type(T) type; };
-#endif
-    // clang-format on
+    template <typename T>
+    struct deferred_false : types::false_type { };
+
+// MSVS 2015 :(
+#if !DOCTEST_CLANG && defined(_MSC_VER) && _MSC_VER <= 1900
+    template <typename T, typename = void>
+    struct has_global_insertion_operator : types::false_type { };
 
     template <typename T>
-    struct deferred_false
-    // cppcheck-suppress unusedStructMember
-    { static const bool value = false; };
-
-    namespace has_insertion_operator_impl {
-        std::ostream &os();
-        template<class T>
-        DOCTEST_REF_WRAP(T) val();
-
-        template<class, class = void>
-        struct check {
-            static constexpr bool value = false;
-        };
+    struct has_global_insertion_operator<T, decltype(::operator<<(declval<std::ostream&>(), declval<const T&>()), void())> : types::true_type { };
 
-        template<class T>
-        struct check<T, decltype(os() << val<T>(), void())> {
-            static constexpr bool value = true;
-        };
-    } // namespace has_insertion_operator_impl
+    template <typename T, typename = void>
+    struct has_insertion_operator { static DOCTEST_CONSTEXPR bool value = has_global_insertion_operator<T>::value; };
+
+    template <typename T, bool global>
+    struct insert_hack;
+
+    template <typename T>
+    struct insert_hack<T, true> {
+        static void insert(std::ostream& os, const T& t) { ::operator<<(os, t); }
+    };
+
+    template <typename T>
+    struct insert_hack<T, false> {
+        static void insert(std::ostream& os, const T& t) { operator<<(os, t); }
+    };
+
+    template <typename T>
+    using insert_hack_t = insert_hack<T, has_global_insertion_operator<T>::value>;
+#else
+    template <typename T, typename = void>
+    struct has_insertion_operator : types::false_type { };
+#endif
 
-    template<class T>
-    using has_insertion_operator = has_insertion_operator_impl::check<const T>;
+    template <typename T>
+    struct has_insertion_operator<T, decltype(operator<<(declval<std::ostream&>(), declval<const T&>()), void())> : types::true_type { };
 
-    DOCTEST_INTERFACE void my_memcpy(void* dest, const void* src, unsigned num);
+    template <typename T>
+    struct should_stringify_as_underlying_type {
+        static DOCTEST_CONSTEXPR bool value = detail::types::is_enum<T>::value && !doctest::detail::has_insertion_operator<T>::value;
+    };
 
-    DOCTEST_INTERFACE std::ostream* getTlsOss(); // returns a thread-local ostringstream
-    DOCTEST_INTERFACE String getTlsOssResult();
+    DOCTEST_INTERFACE std::ostream* tlssPush();
+    DOCTEST_INTERFACE String tlssPop();
 
     template <bool C>
-    struct StringMakerBase
-    {
+    struct StringMakerBase {
         template <typename T>
         static String convert(const DOCTEST_REF_WRAP(T)) {
+#ifdef DOCTEST_CONFIG_REQUIRE_STRINGIFICATION_FOR_ALL_USED_TYPES
+            static_assert(deferred_false<T>::value, "No stringification detected for type T. See string conversion manual");
+#endif
             return "{?}";
         }
     };
 
-    template <>
-    struct StringMakerBase<true>
-    {
-        template <typename T>
-        static String convert(const DOCTEST_REF_WRAP(T) in) {
-            *getTlsOss() << in;
-            return getTlsOssResult();
-        }
-    };
-
-    DOCTEST_INTERFACE String rawMemoryToString(const void* object, unsigned size);
+    template <typename T>
+    struct filldata;
 
     template <typename T>
-    String rawMemoryToString(const DOCTEST_REF_WRAP(T) object) {
-        return rawMemoryToString(&object, sizeof(object));
+    void filloss(std::ostream* stream, const T& in) {
+        filldata<T>::fill(stream, in);
+    }
+
+    template <typename T, size_t N>
+    void filloss(std::ostream* stream, const T (&in)[N]) { // NOLINT(*-avoid-c-arrays)
+        // T[N], T(&)[N], T(&&)[N] have same behaviour.
+        // Hence remove reference.
+        filloss<typename types::remove_reference<decltype(in)>::type>(stream, in);
     }
 
     template <typename T>
-    const char* type_to_string() {
-        return "<>";
+    String toStream(const T& in) {
+        std::ostream* stream = tlssPush();
+        filloss(stream, in);
+        return tlssPop();
     }
+
+    template <>
+    struct StringMakerBase<true> {
+        template <typename T>
+        static String convert(const DOCTEST_REF_WRAP(T) in) {
+            return toStream(in);
+        }
+    };
 } // namespace detail
 
 template <typename T>
-struct StringMaker : public detail::StringMakerBase<detail::has_insertion_operator<T>::value>
+struct StringMaker : public detail::StringMakerBase<
+    detail::has_insertion_operator<T>::value || detail::types::is_pointer<T>::value || detail::types::is_array<T>::value>
 {};
 
-template <typename T>
-struct StringMaker<T*>
-{
-    template <typename U>
-    static String convert(U* p) {
-        if(p)
-            return detail::rawMemoryToString(p);
-        return "NULL";
-    }
-};
+#ifndef DOCTEST_STRINGIFY
+#ifdef DOCTEST_CONFIG_DOUBLE_STRINGIFY
+#define DOCTEST_STRINGIFY(...) toString(toString(__VA_ARGS__))
+#else
+#define DOCTEST_STRINGIFY(...) toString(__VA_ARGS__)
+#endif
+#endif
 
-template <typename R, typename C>
-struct StringMaker<R C::*>
-{
-    static String convert(R C::*p) {
-        if(p)
-            return detail::rawMemoryToString(p);
-        return "NULL";
-    }
-};
+template <typename T>
+String toString() {
+#if DOCTEST_CLANG == 0 && DOCTEST_GCC == 0 && DOCTEST_ICC == 0
+    String ret = __FUNCSIG__; // class doctest::String __cdecl doctest::toString<TYPE>(void)
+    String::size_type beginPos = ret.find('<');
+    return ret.substr(beginPos + 1, ret.size() - beginPos - static_cast<String::size_type>(sizeof(">(void)")));
+#else
+    String ret = __PRETTY_FUNCTION__; // doctest::String toString() [with T = TYPE]
+    String::size_type begin = ret.find('=') + 2;
+    return ret.substr(begin, ret.size() - begin - 1);
+#endif
+}
 
-template <typename T, typename detail::enable_if<!detail::is_enum<T>::value, bool>::type = true>
+template <typename T, typename detail::types::enable_if<!detail::should_stringify_as_underlying_type<T>::value, bool>::type = true>
 String toString(const DOCTEST_REF_WRAP(T) value) {
     return StringMaker<T>::convert(value);
 }
 
 #ifdef DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
-DOCTEST_INTERFACE String toString(char* in);
 DOCTEST_INTERFACE String toString(const char* in);
 #endif // DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
+
+#if DOCTEST_MSVC >= DOCTEST_COMPILER(19, 20, 0)
+// see this issue on why this is needed: https://github.com/doctest/doctest/issues/183
+DOCTEST_INTERFACE String toString(const std::string& in);
+#endif // VS 2019
+
+DOCTEST_INTERFACE String toString(String in);
+
+DOCTEST_INTERFACE String toString(std::nullptr_t);
+
 DOCTEST_INTERFACE String toString(bool in);
+
 DOCTEST_INTERFACE String toString(float in);
 DOCTEST_INTERFACE String toString(double in);
 DOCTEST_INTERFACE String toString(double long in);
@@ -975,40 +1178,95 @@ DOCTEST_INTERFACE String toString(double long in);
 DOCTEST_INTERFACE String toString(char in);
 DOCTEST_INTERFACE String toString(char signed in);
 DOCTEST_INTERFACE String toString(char unsigned in);
-DOCTEST_INTERFACE String toString(int short in);
-DOCTEST_INTERFACE String toString(int short unsigned in);
-DOCTEST_INTERFACE String toString(int in);
-DOCTEST_INTERFACE String toString(int unsigned in);
-DOCTEST_INTERFACE String toString(int long in);
-DOCTEST_INTERFACE String toString(int long unsigned in);
-DOCTEST_INTERFACE String toString(int long long in);
-DOCTEST_INTERFACE String toString(int long long unsigned in);
-DOCTEST_INTERFACE String toString(std::nullptr_t in);
-
-template <typename T, typename detail::enable_if<detail::is_enum<T>::value, bool>::type = true>
+DOCTEST_INTERFACE String toString(short in);
+DOCTEST_INTERFACE String toString(short unsigned in);
+DOCTEST_INTERFACE String toString(signed in);
+DOCTEST_INTERFACE String toString(unsigned in);
+DOCTEST_INTERFACE String toString(long in);
+DOCTEST_INTERFACE String toString(long unsigned in);
+DOCTEST_INTERFACE String toString(long long in);
+DOCTEST_INTERFACE String toString(long long unsigned in);
+
+template <typename T, typename detail::types::enable_if<detail::should_stringify_as_underlying_type<T>::value, bool>::type = true>
 String toString(const DOCTEST_REF_WRAP(T) value) {
-    typedef typename detail::underlying_type<T>::type UT;
-    return toString(static_cast<UT>(value));
+    using UT = typename detail::types::underlying_type<T>::type;
+    return (DOCTEST_STRINGIFY(static_cast<UT>(value)));
 }
 
-#if DOCTEST_MSVC >= DOCTEST_COMPILER(19, 20, 0)
-// see this issue on why this is needed: https://github.com/onqtam/doctest/issues/183
-DOCTEST_INTERFACE String toString(const std::string& in);
-#endif // VS 2019
+namespace detail {
+    template <typename T>
+    struct filldata
+    {
+        static void fill(std::ostream* stream, const T& in) {
+#if defined(_MSC_VER) && _MSC_VER <= 1900
+        insert_hack_t<T>::insert(*stream, in);
+#else
+        operator<<(*stream, in);
+#endif
+        }
+    };
+
+DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(4866)
+// NOLINTBEGIN(*-avoid-c-arrays)
+    template <typename T, size_t N>
+    struct filldata<T[N]> {
+        static void fill(std::ostream* stream, const T(&in)[N]) {
+            *stream << "[";
+            for (size_t i = 0; i < N; i++) {
+                if (i != 0) { *stream << ", "; }
+                *stream << (DOCTEST_STRINGIFY(in[i]));
+            }
+            *stream << "]";
+        }
+    };
+// NOLINTEND(*-avoid-c-arrays)
+DOCTEST_MSVC_SUPPRESS_WARNING_POP
+
+    // Specialized since we don't want the terminating null byte!
+// NOLINTBEGIN(*-avoid-c-arrays)
+    template <size_t N>
+    struct filldata<const char[N]> {
+        static void fill(std::ostream* stream, const char (&in)[N]) {
+            *stream << String(in, in[N - 1] ? N : N - 1);
+        } // NOLINT(clang-analyzer-cplusplus.NewDeleteLeaks)
+    };
+// NOLINTEND(*-avoid-c-arrays)
+
+    template <>
+    struct filldata<const void*> {
+        static void fill(std::ostream* stream, const void* in);
+    };
 
-class DOCTEST_INTERFACE Approx
+    template <typename T>
+    struct filldata<T*> {
+DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(4180)
+        static void fill(std::ostream* stream, const T* in) {
+DOCTEST_MSVC_SUPPRESS_WARNING_POP
+DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wmicrosoft-cast")
+            filldata<const void*>::fill(stream,
+#if DOCTEST_GCC == 0 || DOCTEST_GCC >= DOCTEST_COMPILER(4, 9, 0)
+                reinterpret_cast<const void*>(in)
+#else
+                *reinterpret_cast<const void* const*>(&in)
+#endif
+            );
+DOCTEST_CLANG_SUPPRESS_WARNING_POP
+        }
+    };
+}
+
+struct DOCTEST_INTERFACE Approx
 {
-public:
-    explicit Approx(double value);
+    Approx(double value);
 
     Approx operator()(double value) const;
 
 #ifdef DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS
     template <typename T>
     explicit Approx(const T& value,
-                    typename detail::enable_if<std::is_constructible<double, T>::value>::type* =
+                    typename detail::types::enable_if<std::is_constructible<double, T>::value>::type* =
                             static_cast<T*>(nullptr)) {
-        *this = Approx(static_cast<double>(value));
+        *this = static_cast<double>(value);
     }
 #endif // DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS
 
@@ -1016,7 +1274,7 @@ class DOCTEST_INTERFACE Approx
 
 #ifdef DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS
     template <typename T>
-    typename detail::enable_if<std::is_constructible<double, T>::value, Approx&>::type epsilon(
+    typename std::enable_if<std::is_constructible<double, T>::value, Approx&>::type epsilon(
             const T& newEpsilon) {
         m_epsilon = static_cast<double>(newEpsilon);
         return *this;
@@ -1027,7 +1285,7 @@ class DOCTEST_INTERFACE Approx
 
 #ifdef DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS
     template <typename T>
-    typename detail::enable_if<std::is_constructible<double, T>::value, Approx&>::type scale(
+    typename std::enable_if<std::is_constructible<double, T>::value, Approx&>::type scale(
             const T& newScale) {
         m_scale = static_cast<double>(newScale);
         return *this;
@@ -1048,30 +1306,27 @@ class DOCTEST_INTERFACE Approx
     DOCTEST_INTERFACE friend bool operator> (double lhs, const Approx & rhs);
     DOCTEST_INTERFACE friend bool operator> (const Approx & lhs, double rhs);
 
-    DOCTEST_INTERFACE friend String toString(const Approx& in);
-
 #ifdef DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS
 #define DOCTEST_APPROX_PREFIX \
-    template <typename T> friend typename detail::enable_if<std::is_constructible<double, T>::value, bool>::type
+    template <typename T> friend typename std::enable_if<std::is_constructible<double, T>::value, bool>::type
 
-    DOCTEST_APPROX_PREFIX operator==(const T& lhs, const Approx& rhs) { return operator==(double(lhs), rhs); }
+    DOCTEST_APPROX_PREFIX operator==(const T& lhs, const Approx& rhs) { return operator==(static_cast<double>(lhs), rhs); }
     DOCTEST_APPROX_PREFIX operator==(const Approx& lhs, const T& rhs) { return operator==(rhs, lhs); }
     DOCTEST_APPROX_PREFIX operator!=(const T& lhs, const Approx& rhs) { return !operator==(lhs, rhs); }
     DOCTEST_APPROX_PREFIX operator!=(const Approx& lhs, const T& rhs) { return !operator==(rhs, lhs); }
-    DOCTEST_APPROX_PREFIX operator<=(const T& lhs, const Approx& rhs) { return double(lhs) < rhs.m_value || lhs == rhs; }
-    DOCTEST_APPROX_PREFIX operator<=(const Approx& lhs, const T& rhs) { return lhs.m_value < double(rhs) || lhs == rhs; }
-    DOCTEST_APPROX_PREFIX operator>=(const T& lhs, const Approx& rhs) { return double(lhs) > rhs.m_value || lhs == rhs; }
-    DOCTEST_APPROX_PREFIX operator>=(const Approx& lhs, const T& rhs) { return lhs.m_value > double(rhs) || lhs == rhs; }
-    DOCTEST_APPROX_PREFIX operator< (const T& lhs, const Approx& rhs) { return double(lhs) < rhs.m_value && lhs != rhs; }
-    DOCTEST_APPROX_PREFIX operator< (const Approx& lhs, const T& rhs) { return lhs.m_value < double(rhs) && lhs != rhs; }
-    DOCTEST_APPROX_PREFIX operator> (const T& lhs, const Approx& rhs) { return double(lhs) > rhs.m_value && lhs != rhs; }
-    DOCTEST_APPROX_PREFIX operator> (const Approx& lhs, const T& rhs) { return lhs.m_value > double(rhs) && lhs != rhs; }
+    DOCTEST_APPROX_PREFIX operator<=(const T& lhs, const Approx& rhs) { return static_cast<double>(lhs) < rhs.m_value || lhs == rhs; }
+    DOCTEST_APPROX_PREFIX operator<=(const Approx& lhs, const T& rhs) { return lhs.m_value < static_cast<double>(rhs) || lhs == rhs; }
+    DOCTEST_APPROX_PREFIX operator>=(const T& lhs, const Approx& rhs) { return static_cast<double>(lhs) > rhs.m_value || lhs == rhs; }
+    DOCTEST_APPROX_PREFIX operator>=(const Approx& lhs, const T& rhs) { return lhs.m_value > static_cast<double>(rhs) || lhs == rhs; }
+    DOCTEST_APPROX_PREFIX operator< (const T& lhs, const Approx& rhs) { return static_cast<double>(lhs) < rhs.m_value && lhs != rhs; }
+    DOCTEST_APPROX_PREFIX operator< (const Approx& lhs, const T& rhs) { return lhs.m_value < static_cast<double>(rhs) && lhs != rhs; }
+    DOCTEST_APPROX_PREFIX operator> (const T& lhs, const Approx& rhs) { return static_cast<double>(lhs) > rhs.m_value && lhs != rhs; }
+    DOCTEST_APPROX_PREFIX operator> (const Approx& lhs, const T& rhs) { return lhs.m_value > static_cast<double>(rhs) && lhs != rhs; }
 #undef DOCTEST_APPROX_PREFIX
 #endif // DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS
 
     // clang-format on
 
-private:
     double m_epsilon;
     double m_scale;
     double m_value;
@@ -1081,18 +1336,35 @@ DOCTEST_INTERFACE String toString(const Approx& in);
 
 DOCTEST_INTERFACE const ContextOptions* getContextOptions();
 
-#if !defined(DOCTEST_CONFIG_DISABLE)
+template <typename F>
+struct DOCTEST_INTERFACE_DECL IsNaN
+{
+    F value; bool flipped;
+    IsNaN(F f, bool flip = false) : value(f), flipped(flip) { }
+    IsNaN<F> operator!() const { return { value, !flipped }; }
+    operator bool() const;
+};
+#ifndef __MINGW32__
+extern template struct DOCTEST_INTERFACE_DECL IsNaN<float>;
+extern template struct DOCTEST_INTERFACE_DECL IsNaN<double>;
+extern template struct DOCTEST_INTERFACE_DECL IsNaN<long double>;
+#endif
+DOCTEST_INTERFACE String toString(IsNaN<float> in);
+DOCTEST_INTERFACE String toString(IsNaN<double> in);
+DOCTEST_INTERFACE String toString(IsNaN<double long> in);
+
+#ifndef DOCTEST_CONFIG_DISABLE
 
 namespace detail {
     // clang-format off
 #ifdef DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
-    template<class T>               struct decay_array       { typedef T type; };
-    template<class T, unsigned N>   struct decay_array<T[N]> { typedef T* type; };
-    template<class T>               struct decay_array<T[]>  { typedef T* type; };
+    template<class T>               struct decay_array       { using type = T; };
+    template<class T, unsigned N>   struct decay_array<T[N]> { using type = T*; };
+    template<class T>               struct decay_array<T[]>  { using type = T*; };
 
-    template<class T>   struct not_char_pointer              { enum { value = 1 }; };
-    template<>          struct not_char_pointer<char*>       { enum { value = 0 }; };
-    template<>          struct not_char_pointer<const char*> { enum { value = 0 }; };
+    template<class T>   struct not_char_pointer              { static DOCTEST_CONSTEXPR int value = 1; };
+    template<>          struct not_char_pointer<char*>       { static DOCTEST_CONSTEXPR int value = 0; };
+    template<>          struct not_char_pointer<const char*> { static DOCTEST_CONSTEXPR int value = 0; };
 
     template<class T> struct can_use_op : public not_char_pointer<typename decay_array<T>::type> {};
 #endif // DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
@@ -1115,16 +1387,22 @@ namespace detail {
         bool             m_entered = false;
 
         Subcase(const String& name, const char* file, int line);
+        Subcase(const Subcase&) = delete;
+        Subcase(Subcase&&) = delete;
+        Subcase& operator=(const Subcase&) = delete;
+        Subcase& operator=(Subcase&&) = delete;
         ~Subcase();
 
         operator bool() const;
+
+        private:
+            bool checkFilters();
     };
 
     template <typename L, typename R>
     String stringifyBinaryExpr(const DOCTEST_REF_WRAP(L) lhs, const char* op,
                                const DOCTEST_REF_WRAP(R) rhs) {
-        // NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks)
-        return toString(lhs) + op + toString(rhs);
+        return (DOCTEST_STRINGIFY(lhs)) + op + (DOCTEST_STRINGIFY(rhs));
     }
 
 #if DOCTEST_CLANG && DOCTEST_CLANG < DOCTEST_COMPILER(3, 6, 0)
@@ -1135,18 +1413,16 @@ DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wunused-comparison")
 // If not it doesn't find the operator or if the operator at global scope is defined after
 // this template, the template won't be instantiated due to SFINAE. Once the template is not
 // instantiated it can look for global operator using normal conversions.
-// TODO: upstream the change to doctest : Implement old version of check due to Intel Compiler
-// internal error: assertion failed at: "shared/cfe/edgcpfe/exprutil.c", line 5155
-#if !DOCTEST_ICC
-#define SFINAE_OP(ret,op) decltype(doctest::detail::declval<L>() op doctest::detail::declval<R>(),static_cast<ret>(0))
-#else
+#ifdef __NVCC__
 #define SFINAE_OP(ret,op) ret
+#else
+#define SFINAE_OP(ret,op) decltype((void)(doctest::detail::declval<L>() op doctest::detail::declval<R>()),ret{})
 #endif
 
 #define DOCTEST_DO_BINARY_EXPRESSION_COMPARISON(op, op_str, op_macro)                              \
     template <typename R>                                                                          \
     DOCTEST_NOINLINE SFINAE_OP(Result,op) operator op(R&& rhs) {                                   \
-        bool res = op_macro(doctest::detail::forward<L>(lhs), doctest::detail::forward<R>(rhs));   \
+    bool res = op_macro(doctest::detail::forward<const L>(lhs), doctest::detail::forward<R>(rhs)); \
         if(m_at & assertType::is_false)                                                            \
             res = !res;                                                                            \
         if(!res || doctest::getContextOptions()->success)                                          \
@@ -1165,11 +1441,12 @@ DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wunused-comparison")
         return *this;                                                                              \
     }
 
-    struct DOCTEST_INTERFACE Result
+    struct DOCTEST_INTERFACE Result // NOLINT(*-member-init)
     {
         bool   m_passed;
         String m_decomp;
 
+        Result() = default; // TODO: Why do we need this? (To remove NOLINT)
         Result(bool passed, const String& decomposition = String());
 
         // forbidding some expressions based on this table: https://en.cppreference.com/w/cpp/language/operator_precedence
@@ -1226,8 +1503,7 @@ DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wunused-comparison")
 #ifndef DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
 #define DOCTEST_COMPARISON_RETURN_TYPE bool
 #else // DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
-#define DOCTEST_COMPARISON_RETURN_TYPE typename enable_if<can_use_op<L>::value || can_use_op<R>::value, bool>::type
-    // NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks)
+#define DOCTEST_COMPARISON_RETURN_TYPE typename types::enable_if<can_use_op<L>::value || can_use_op<R>::value, bool>::type
     inline bool eq(const char* lhs, const char* rhs) { return String(lhs) == String(rhs); }
     inline bool ne(const char* lhs, const char* rhs) { return String(lhs) != String(rhs); }
     inline bool lt(const char* lhs, const char* rhs) { return String(lhs) <  String(rhs); }
@@ -1275,26 +1551,29 @@ DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wunused-comparison")
         assertType::Enum m_at;
 
         explicit Expression_lhs(L&& in, assertType::Enum at)
-                : lhs(doctest::detail::forward<L>(in))
+                : lhs(static_cast<L&&>(in))
                 , m_at(at) {}
 
         DOCTEST_NOINLINE operator Result() {
-// this is needed only foc MSVC 2015:
-// https://ci.appveyor.com/project/onqtam/doctest/builds/38181202
+// TODO: upstream the change to doctest : Work-around for the warning: 'address will never be NULL'
+DOCTEST_GCC_SUPPRESS_WARNING_WITH_PUSH("-Waddress")
+// this is needed only for MSVC 2015
 DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(4800) // 'int': forcing value to bool
             bool res = static_cast<bool>(lhs);
 DOCTEST_MSVC_SUPPRESS_WARNING_POP
-            if(m_at & assertType::is_false) //!OCLINT bitwise operator in conditional
+DOCTEST_GCC_SUPPRESS_WARNING_POP
+            if(m_at & assertType::is_false) { //!OCLINT bitwise operator in conditional
                 res = !res;
+            }
 
-            if(!res || getContextOptions()->success)
-                return Result(res, toString(lhs));
-            return Result(res);
+            if(!res || getContextOptions()->success) {
+                return { res, (DOCTEST_STRINGIFY(lhs)) };
+            }
+            return { res };
         }
 
-	/* This is required for user-defined conversions from Expression_lhs to L */
-	//operator L() const { return lhs; }
-	operator L() const { return lhs; }
+        /* This is required for user-defined conversions from Expression_lhs to L */
+        operator L() const { return lhs; }
 
         // clang-format off
         DOCTEST_DO_BINARY_EXPRESSION_COMPARISON(==, " == ", DOCTEST_CMP_EQ) //!OCLINT bitwise operator in conditional
@@ -1303,7 +1582,6 @@ DOCTEST_MSVC_SUPPRESS_WARNING_POP
         DOCTEST_DO_BINARY_EXPRESSION_COMPARISON(<,  " <  ", DOCTEST_CMP_LT) //!OCLINT bitwise operator in conditional
         DOCTEST_DO_BINARY_EXPRESSION_COMPARISON(>=, " >= ", DOCTEST_CMP_GE) //!OCLINT bitwise operator in conditional
         DOCTEST_DO_BINARY_EXPRESSION_COMPARISON(<=, " <= ", DOCTEST_CMP_LE) //!OCLINT bitwise operator in conditional
-
         // clang-format on
 
         // forbidding some expressions based on this table: https://en.cppreference.com/w/cpp/language/operator_precedence
@@ -1352,14 +1630,18 @@ DOCTEST_CLANG_SUPPRESS_WARNING_POP
         // https://github.com/catchorg/Catch2/issues/870
         // https://github.com/catchorg/Catch2/issues/565
         template <typename L>
-	Expression_lhs<L> operator<<(L &&operand) {
-            return Expression_lhs<L>(doctest::detail::forward<L>(operand), m_at);
+        Expression_lhs<L> operator<<(L&& operand) {
+            return Expression_lhs<L>(static_cast<L&&>(operand), m_at);
+        }
+
+        template <typename L,typename types::enable_if<!doctest::detail::types::is_rvalue_reference<L>::value,void >::type* = nullptr>
+        Expression_lhs<const L&> operator<<(const L &operand) {
+            return Expression_lhs<const L&>(operand, m_at);
         }
     };
 
     struct DOCTEST_INTERFACE TestSuite
     {
-        // TODO: upstream the change to doctest : missing initializer for member
         const char* m_test_suite = nullptr;
         const char* m_description = nullptr;
         bool        m_skip = false;
@@ -1370,11 +1652,6 @@ DOCTEST_CLANG_SUPPRESS_WARNING_POP
         int         m_expected_failures = 0;
         double      m_timeout = 0;
 
-        // TODO: upstream the change to doctest : Fix segfault on Intel Compiler 2021 during the DOCTEST_TEST_SUITE_END execution
-        TestSuite(const char* in = nullptr) {
-            m_test_suite = in;
-        }
-
         TestSuite& operator*(const char* in);
 
         template <typename T>
@@ -1384,25 +1661,28 @@ DOCTEST_CLANG_SUPPRESS_WARNING_POP
         }
     };
 
-    typedef void (*funcType)();
+    using funcType = void (*)();
 
     struct DOCTEST_INTERFACE TestCase : public TestCaseData
     {
         funcType m_test; // a function pointer to the test case
 
-        const char* m_type; // for templated test cases - gets appended to the real name
+        String m_type; // for templated test cases - gets appended to the real name
         int m_template_id; // an ID used to distinguish between the different versions of a templated test case
         String m_full_name; // contains the name (only for templated test cases!) + the template type
 
         TestCase(funcType test, const char* file, unsigned line, const TestSuite& test_suite,
-                 const char* type = "", int template_id = -1);
+                 const String& type = String(), int template_id = -1);
 
         TestCase(const TestCase& other);
+        TestCase(TestCase&&) = delete;
 
         DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(26434) // hides a non-virtual function
         TestCase& operator=(const TestCase& other);
         DOCTEST_MSVC_SUPPRESS_WARNING_POP
 
+        TestCase& operator=(TestCase&&) = delete;
+
         TestCase& operator*(const char* in);
 
         template <typename T>
@@ -1412,6 +1692,8 @@ DOCTEST_CLANG_SUPPRESS_WARNING_POP
         }
 
         bool operator<(const TestCase& other) const;
+
+        ~TestCase() = default;
     };
 
     // forward declarations of functions used by the macros
@@ -1451,27 +1733,36 @@ DOCTEST_CLANG_SUPPRESS_WARNING_POP
     struct DOCTEST_INTERFACE ResultBuilder : public AssertData
     {
         ResultBuilder(assertType::Enum at, const char* file, int line, const char* expr,
-                      const char* exception_type = "", const char* exception_string = "");
+                      const char* exception_type = "", const String& exception_string = "");
+
+        ResultBuilder(assertType::Enum at, const char* file, int line, const char* expr,
+                      const char* exception_type, const Contains& exception_string);
 
         void setResult(const Result& res);
 
         template <int comparison, typename L, typename R>
-        DOCTEST_NOINLINE void binary_assert(const DOCTEST_REF_WRAP(L) lhs,
+        DOCTEST_NOINLINE bool binary_assert(const DOCTEST_REF_WRAP(L) lhs,
                                             const DOCTEST_REF_WRAP(R) rhs) {
             m_failed = !RelationalComparator<comparison, L, R>()(lhs, rhs);
-            if(m_failed || getContextOptions()->success)
+            if (m_failed || getContextOptions()->success) {
                 m_decomp = stringifyBinaryExpr(lhs, ", ", rhs);
+            }
+            return !m_failed;
         }
 
         template <typename L>
-        DOCTEST_NOINLINE void unary_assert(const DOCTEST_REF_WRAP(L) val) {
+        DOCTEST_NOINLINE bool unary_assert(const DOCTEST_REF_WRAP(L) val) {
             m_failed = !val;
 
-            if(m_at & assertType::is_false) //!OCLINT bitwise operator in conditional
+            if (m_at & assertType::is_false) { //!OCLINT bitwise operator in conditional
                 m_failed = !m_failed;
+            }
+
+            if (m_failed || getContextOptions()->success) {
+                m_decomp = (DOCTEST_STRINGIFY(val));
+            }
 
-            if(m_failed || getContextOptions()->success)
-                m_decomp = toString(val);
+            return !m_failed;
         }
 
         void translateException();
@@ -1491,8 +1782,8 @@ DOCTEST_CLANG_SUPPRESS_WARNING_POP
 
     DOCTEST_INTERFACE void failed_out_of_a_testing_context(const AssertData& ad);
 
-    DOCTEST_INTERFACE void decomp_assert(assertType::Enum at, const char* file, int line,
-                                         const char* expr, Result result);
+    DOCTEST_INTERFACE bool decomp_assert(assertType::Enum at, const char* file, int line,
+                                         const char* expr, const Result& result);
 
 #define DOCTEST_ASSERT_OUT_OF_TESTS(decomp)                                                        \
     do {                                                                                           \
@@ -1507,7 +1798,7 @@ DOCTEST_CLANG_SUPPRESS_WARNING_POP
                 if(checkIfShouldThrow(at))                                                         \
                     throwException();                                                              \
             }                                                                                      \
-            return;                                                                                \
+            return !failed;                                                                        \
         }                                                                                          \
     } while(false)
 
@@ -1522,7 +1813,7 @@ DOCTEST_CLANG_SUPPRESS_WARNING_POP
     throwException()
 
     template <int comparison, typename L, typename R>
-    DOCTEST_NOINLINE void binary_assert(assertType::Enum at, const char* file, int line,
+    DOCTEST_NOINLINE bool binary_assert(assertType::Enum at, const char* file, int line,
                                         const char* expr, const DOCTEST_REF_WRAP(L) lhs,
                                         const DOCTEST_REF_WRAP(R) rhs) {
         bool failed = !RelationalComparator<comparison, L, R>()(lhs, rhs);
@@ -1533,10 +1824,11 @@ DOCTEST_CLANG_SUPPRESS_WARNING_POP
         // ###################################################################################
         DOCTEST_ASSERT_OUT_OF_TESTS(stringifyBinaryExpr(lhs, ", ", rhs));
         DOCTEST_ASSERT_IN_TESTS(stringifyBinaryExpr(lhs, ", ", rhs));
+        return !failed;
     }
 
     template <typename L>
-    DOCTEST_NOINLINE void unary_assert(assertType::Enum at, const char* file, int line,
+    DOCTEST_NOINLINE bool unary_assert(assertType::Enum at, const char* file, int line,
                                        const char* expr, const DOCTEST_REF_WRAP(L) val) {
         bool failed = !val;
 
@@ -1547,14 +1839,14 @@ DOCTEST_CLANG_SUPPRESS_WARNING_POP
         // IF THE DEBUGGER BREAKS HERE - GO 1 LEVEL UP IN THE CALLSTACK FOR THE FAILING ASSERT
         // THIS IS THE EFFECT OF HAVING 'DOCTEST_CONFIG_SUPER_FAST_ASSERTS' DEFINED
         // ###################################################################################
-        DOCTEST_ASSERT_OUT_OF_TESTS(toString(val));
-        DOCTEST_ASSERT_IN_TESTS(toString(val));
+        DOCTEST_ASSERT_OUT_OF_TESTS((DOCTEST_STRINGIFY(val)));
+        DOCTEST_ASSERT_IN_TESTS((DOCTEST_STRINGIFY(val)));
+        return !failed;
     }
 
     struct DOCTEST_INTERFACE IExceptionTranslator
     {
-        IExceptionTranslator();
-        virtual ~IExceptionTranslator();
+        DOCTEST_DECLARE_INTERFACE(IExceptionTranslator)
         virtual bool translate(String&) const = 0;
     };
 
@@ -1570,7 +1862,7 @@ DOCTEST_CLANG_SUPPRESS_WARNING_POP
             try {
                 throw; // lgtm [cpp/rethrow-no-exception]
                 // cppcheck-suppress catchExceptionByValue
-            } catch(T ex) {                    // NOLINT
+            } catch(const T& ex) {
                 res = m_translateFunction(ex); //!OCLINT parameter reassignment
                 return true;
             } catch(...) {}         //!OCLINT -  empty catch statement
@@ -1585,64 +1877,19 @@ DOCTEST_CLANG_SUPPRESS_WARNING_POP
 
     DOCTEST_INTERFACE void registerExceptionTranslatorImpl(const IExceptionTranslator* et);
 
-    template <bool C>
-    struct StringStreamBase
-    {
-        template <typename T>
-        static void convert(std::ostream* s, const T& in) {
-            *s << toString(in);
-        }
-
-        // always treat char* as a string in this context - no matter
-        // if DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING is defined
-        static void convert(std::ostream* s, const char* in) { *s << String(in); }
-    };
-
-    template <>
-    struct StringStreamBase<true>
-    {
-        template <typename T>
-        static void convert(std::ostream* s, const T& in) {
-            *s << in;
-        }
-    };
+    // ContextScope base class used to allow implementing methods of ContextScope
+    // that don't depend on the template parameter in doctest.cpp.
+    struct DOCTEST_INTERFACE ContextScopeBase : public IContextScope {
+        ContextScopeBase(const ContextScopeBase&) = delete;
 
-    template <typename T>
-    struct StringStream : public StringStreamBase<has_insertion_operator<T>::value>
-    {};
+        ContextScopeBase& operator=(const ContextScopeBase&) = delete;
+        ContextScopeBase& operator=(ContextScopeBase&&) = delete;
 
-    template <typename T>
-    void toStream(std::ostream* s, const T& value) {
-        StringStream<T>::convert(s, value);
-    }
+        ~ContextScopeBase() override = default;
 
-#ifdef DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
-    DOCTEST_INTERFACE void toStream(std::ostream* s, char* in);
-    DOCTEST_INTERFACE void toStream(std::ostream* s, const char* in);
-#endif // DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
-    DOCTEST_INTERFACE void toStream(std::ostream* s, bool in);
-    DOCTEST_INTERFACE void toStream(std::ostream* s, float in);
-    DOCTEST_INTERFACE void toStream(std::ostream* s, double in);
-    DOCTEST_INTERFACE void toStream(std::ostream* s, double long in);
-
-    DOCTEST_INTERFACE void toStream(std::ostream* s, char in);
-    DOCTEST_INTERFACE void toStream(std::ostream* s, char signed in);
-    DOCTEST_INTERFACE void toStream(std::ostream* s, char unsigned in);
-    DOCTEST_INTERFACE void toStream(std::ostream* s, int short in);
-    DOCTEST_INTERFACE void toStream(std::ostream* s, int short unsigned in);
-    DOCTEST_INTERFACE void toStream(std::ostream* s, int in);
-    DOCTEST_INTERFACE void toStream(std::ostream* s, int unsigned in);
-    DOCTEST_INTERFACE void toStream(std::ostream* s, int long in);
-    DOCTEST_INTERFACE void toStream(std::ostream* s, int long unsigned in);
-    DOCTEST_INTERFACE void toStream(std::ostream* s, int long long in);
-    DOCTEST_INTERFACE void toStream(std::ostream* s, int long long unsigned in);
-
-    // ContextScope base class used to allow implementing methods of ContextScope 
-    // that don't depend on the template parameter in doctest.cpp.
-    class DOCTEST_INTERFACE ContextScopeBase : public IContextScope {
     protected:
         ContextScopeBase();
-        ContextScopeBase(ContextScopeBase&& other);
+        ContextScopeBase(ContextScopeBase&& other) noexcept;
 
         void destroy();
         bool need_to_destroy{true};
@@ -1650,15 +1897,17 @@ DOCTEST_CLANG_SUPPRESS_WARNING_POP
 
     template <typename L> class ContextScope : public ContextScopeBase
     {
-        const L lambda_;
+        L lambda_;
 
     public:
-    
-        explicit ContextScope(const L &lambda) : ContextScopeBase(), lambda_(lambda) {}
+        explicit ContextScope(const L &lambda) : lambda_(lambda) {}
+        explicit ContextScope(L&& lambda) : lambda_(static_cast<L&&>(lambda)) { }
+
+        ContextScope(const ContextScope&) = delete;
+        ContextScope(ContextScope&&) noexcept = default;
 
-        // TODO: upstream the change to doctest : fix copy elision absence case
-        // std::move cannot be applied here since there is no utility header included in this place (by some reason all headers are included later)
-        ContextScope(ContextScope &&other) : ContextScopeBase(static_cast<ContextScopeBase&&>(other)), lambda_(other.lambda_) {}
+        ContextScope& operator=(const ContextScope&) = delete;
+        ContextScope& operator=(ContextScope&&) = delete;
 
         void stringify(std::ostream* s) const override { lambda_(s); }
 
@@ -1667,25 +1916,31 @@ DOCTEST_CLANG_SUPPRESS_WARNING_POP
                 destroy();
             }
         }
-
-        template <typename F>
-        friend ContextScope<F> MakeContextScope(const F &lambda);
     };
 
     struct DOCTEST_INTERFACE MessageBuilder : public MessageData
     {
         std::ostream* m_stream;
+        bool          logged = false;
 
         MessageBuilder(const char* file, int line, assertType::Enum severity);
-        MessageBuilder() = delete;
+
+        MessageBuilder(const MessageBuilder&) = delete;
+        MessageBuilder(MessageBuilder&&) = delete;
+
+        MessageBuilder& operator=(const MessageBuilder&) = delete;
+        MessageBuilder& operator=(MessageBuilder&&) = delete;
+
         ~MessageBuilder();
 
         // the preferred way of chaining parameters for stringification
+DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(4866)
         template <typename T>
         MessageBuilder& operator,(const T& in) {
-            toStream(m_stream, in);
+            *m_stream << (DOCTEST_STRINGIFY(in));
             return *this;
         }
+DOCTEST_MSVC_SUPPRESS_WARNING_POP
 
         // kept here just for backwards-compatibility - the comma operator should be preferred now
         template <typename T>
@@ -1701,7 +1956,7 @@ DOCTEST_CLANG_SUPPRESS_WARNING_POP
         bool log();
         void react();
     };
-    
+
     template <typename L>
     ContextScope<L> MakeContextScope(const L &lambda) {
         return ContextScope<L>(lambda);
@@ -1754,7 +2009,7 @@ int registerExceptionTranslator(String (*)(T)) {
 #endif // DOCTEST_CONFIG_DISABLE
 
 namespace detail {
-    typedef void (*assert_handler)(const AssertData&);
+    using assert_handler = void (*)(const AssertData&);
     struct ContextState;
 } // namespace detail
 
@@ -1767,12 +2022,19 @@ class DOCTEST_INTERFACE Context
 public:
     explicit Context(int argc = 0, const char* const* argv = nullptr);
 
-    ~Context();
+    Context(const Context&) = delete;
+    Context(Context&&) = delete;
+
+    Context& operator=(const Context&) = delete;
+    Context& operator=(Context&&) = delete;
+
+    ~Context(); // NOLINT(performance-trivially-destructible)
 
     void applyCommandLine(int argc, const char* const* argv);
 
     void addFilter(const char* filter, const char* value);
     void clearFilters();
+    void setOption(const char* option, bool value);
     void setOption(const char* option, int value);
     void setOption(const char* option, const char* value);
 
@@ -1782,6 +2044,8 @@ class DOCTEST_INTERFACE Context
 
     void setAssertHandler(detail::assert_handler ah);
 
+    void setCout(std::ostream* out);
+
     int run();
 };
 
@@ -1808,6 +2072,7 @@ struct DOCTEST_INTERFACE CurrentTestCaseStats
     int    numAssertsFailedCurrentTest;
     double seconds;
     int    failure_flags; // use TestCaseFailureReason::Enum
+    bool   testCaseSuccess;
 };
 
 struct DOCTEST_INTERFACE TestCaseException
@@ -1871,8 +2136,7 @@ struct DOCTEST_INTERFACE IReporter
     // or isn't in the execution range (between first and last) (safe to cache a pointer to the input)
     virtual void test_case_skipped(const TestCaseData&) = 0;
 
-    // doctest will not be managing the lifetimes of reporters given to it but this would still be nice to have
-    virtual ~IReporter();
+    DOCTEST_DECLARE_INTERFACE(IReporter)
 
     // can obtain all currently active contexts and stringify them if one wishes to do so
     static int                         get_num_active_contexts();
@@ -1884,7 +2148,7 @@ struct DOCTEST_INTERFACE IReporter
 };
 
 namespace detail {
-    typedef IReporter* (*reporterCreatorFunc)(const ContextOptions&);
+    using reporterCreatorFunc =  IReporter* (*)(const ContextOptions&);
 
     DOCTEST_INTERFACE void registerReporterImpl(const char* name, int prio, reporterCreatorFunc c, bool isReporter);
 
@@ -1901,14 +2165,30 @@ int registerReporter(const char* name, int priority, bool isReporter) {
 }
 } // namespace doctest
 
+#ifdef DOCTEST_CONFIG_ASSERTS_RETURN_VALUES
+#define DOCTEST_FUNC_EMPTY [] { return false; }()
+#else
+#define DOCTEST_FUNC_EMPTY (void)0
+#endif
+
 // if registering is not disabled
-#if !defined(DOCTEST_CONFIG_DISABLE)
+#ifndef DOCTEST_CONFIG_DISABLE
+
+#ifdef DOCTEST_CONFIG_ASSERTS_RETURN_VALUES
+#define DOCTEST_FUNC_SCOPE_BEGIN [&]
+#define DOCTEST_FUNC_SCOPE_END ()
+#define DOCTEST_FUNC_SCOPE_RET(v) return v
+#else
+#define DOCTEST_FUNC_SCOPE_BEGIN do
+#define DOCTEST_FUNC_SCOPE_END while(false)
+#define DOCTEST_FUNC_SCOPE_RET(v) (void)0
+#endif
 
 // common code in asserts - for convenience
-#define DOCTEST_ASSERT_LOG_AND_REACT(b)                                                            \
-    if(b.log())                                                                                    \
-        DOCTEST_BREAK_INTO_DEBUGGER();                                                             \
-    b.react()
+#define DOCTEST_ASSERT_LOG_REACT_RETURN(b)                                                         \
+    if(b.log()) DOCTEST_BREAK_INTO_DEBUGGER();                                                     \
+    b.react();                                                                                     \
+    DOCTEST_FUNC_SCOPE_RET(!b.m_failed)
 
 #ifdef DOCTEST_CONFIG_NO_TRY_CATCH_IN_ASSERTS
 #define DOCTEST_WRAP_IN_TRY(x) x;
@@ -1916,7 +2196,7 @@ int registerReporter(const char* name, int priority, bool isReporter) {
 #define DOCTEST_WRAP_IN_TRY(x)                                                                     \
     try {                                                                                          \
         x;                                                                                         \
-    } catch(...) { _DOCTEST_RB.translateException(); }
+    } catch(...) { DOCTEST_RB.translateException(); }
 #endif // DOCTEST_CONFIG_NO_TRY_CATCH_IN_ASSERTS
 
 #ifdef DOCTEST_CONFIG_VOID_CAST_EXPRESSIONS
@@ -1930,27 +2210,26 @@ int registerReporter(const char* name, int priority, bool isReporter) {
 
 // registers the test by initializing a dummy var with a function
 #define DOCTEST_REGISTER_FUNCTION(global_prefix, f, decorators)                                    \
-    global_prefix DOCTEST_GLOBAL_NO_WARNINGS(DOCTEST_ANONYMOUS(_DOCTEST_ANON_VAR_)) =              \
+    global_prefix DOCTEST_GLOBAL_NO_WARNINGS(DOCTEST_ANONYMOUS(DOCTEST_ANON_VAR_), /* NOLINT */    \
             doctest::detail::regTest(                                                              \
                     doctest::detail::TestCase(                                                     \
                             f, __FILE__, __LINE__,                                                 \
                             doctest_detail_test_suite_ns::getCurrentTestSuite()) *                 \
-                    decorators);                                                                   \
-    DOCTEST_GLOBAL_NO_WARNINGS_END()
+                    decorators))
 
 #define DOCTEST_IMPLEMENT_FIXTURE(der, base, func, decorators)                                     \
-    namespace {                                                                                    \
+    namespace { /* NOLINT */                                                                       \
         struct der : public base                                                                   \
         {                                                                                          \
             void f();                                                                              \
         };                                                                                         \
-        static void func() {                                                                       \
+        static DOCTEST_INLINE_NOINLINE void func() {                                               \
             der v;                                                                                 \
             v.f();                                                                                 \
         }                                                                                          \
         DOCTEST_REGISTER_FUNCTION(DOCTEST_EMPTY, func, decorators)                                 \
     }                                                                                              \
-    inline DOCTEST_NOINLINE void der::f()
+    DOCTEST_INLINE_NOINLINE void der::f() // NOLINT(misc-definitions-in-headers)
 
 #define DOCTEST_CREATE_AND_REGISTER_FUNCTION(f, decorators)                                        \
     static void f();                                                                               \
@@ -1959,18 +2238,18 @@ int registerReporter(const char* name, int priority, bool isReporter) {
 
 #define DOCTEST_CREATE_AND_REGISTER_FUNCTION_IN_CLASS(f, proxy, decorators)                        \
     static doctest::detail::funcType proxy() { return f; }                                         \
-    DOCTEST_REGISTER_FUNCTION(inline const, proxy(), decorators)                                   \
+    DOCTEST_REGISTER_FUNCTION(inline, proxy(), decorators)                                         \
     static void f()
 
 // for registering tests
 #define DOCTEST_TEST_CASE(decorators)                                                              \
-    DOCTEST_CREATE_AND_REGISTER_FUNCTION(DOCTEST_ANONYMOUS(_DOCTEST_ANON_FUNC_), decorators)
+    DOCTEST_CREATE_AND_REGISTER_FUNCTION(DOCTEST_ANONYMOUS(DOCTEST_ANON_FUNC_), decorators)
 
 // for registering tests in classes - requires C++17 for inline variables!
-#if __cplusplus >= 201703L || (DOCTEST_MSVC >= DOCTEST_COMPILER(19, 12, 0) && _MSVC_LANG >= 201703L)
+#if DOCTEST_CPLUSPLUS >= 201703L
 #define DOCTEST_TEST_CASE_CLASS(decorators)                                                        \
-    DOCTEST_CREATE_AND_REGISTER_FUNCTION_IN_CLASS(DOCTEST_ANONYMOUS(_DOCTEST_ANON_FUNC_),          \
-                                                  DOCTEST_ANONYMOUS(_DOCTEST_ANON_PROXY_),         \
+    DOCTEST_CREATE_AND_REGISTER_FUNCTION_IN_CLASS(DOCTEST_ANONYMOUS(DOCTEST_ANON_FUNC_),           \
+                                                  DOCTEST_ANONYMOUS(DOCTEST_ANON_PROXY_),          \
                                                   decorators)
 #else // DOCTEST_TEST_CASE_CLASS
 #define DOCTEST_TEST_CASE_CLASS(...)                                                               \
@@ -1979,26 +2258,25 @@ int registerReporter(const char* name, int priority, bool isReporter) {
 
 // for registering tests with a fixture
 #define DOCTEST_TEST_CASE_FIXTURE(c, decorators)                                                   \
-    DOCTEST_IMPLEMENT_FIXTURE(DOCTEST_ANONYMOUS(_DOCTEST_ANON_CLASS_), c,                          \
-                              DOCTEST_ANONYMOUS(_DOCTEST_ANON_FUNC_), decorators)
+    DOCTEST_IMPLEMENT_FIXTURE(DOCTEST_ANONYMOUS(DOCTEST_ANON_CLASS_), c,                           \
+                              DOCTEST_ANONYMOUS(DOCTEST_ANON_FUNC_), decorators)
 
 // for converting types to strings without the <typeinfo> header and demangling
-#define DOCTEST_TYPE_TO_STRING_IMPL(...)                                                           \
-    template <>                                                                                    \
-    inline const char* type_to_string<__VA_ARGS__>() {                                             \
-        return "<" #__VA_ARGS__ ">";                                                               \
-    }
-#define DOCTEST_TYPE_TO_STRING(...)                                                                \
-    namespace doctest { namespace detail {                                                         \
-            DOCTEST_TYPE_TO_STRING_IMPL(__VA_ARGS__)                                               \
+#define DOCTEST_TYPE_TO_STRING_AS(str, ...)                                                        \
+    namespace doctest {                                                                            \
+        template <>                                                                                \
+        inline String toString<__VA_ARGS__>() {                                                    \
+            return str;                                                                            \
         }                                                                                          \
     }                                                                                              \
-    typedef int DOCTEST_ANONYMOUS(_DOCTEST_ANON_FOR_SEMICOLON_)
+    static_assert(true, "")
+
+#define DOCTEST_TYPE_TO_STRING(...) DOCTEST_TYPE_TO_STRING_AS(#__VA_ARGS__, __VA_ARGS__)
 
 #define DOCTEST_TEST_CASE_TEMPLATE_DEFINE_IMPL(dec, T, iter, func)                                 \
     template <typename T>                                                                          \
     static void func();                                                                            \
-    namespace {                                                                                    \
+    namespace { /* NOLINT */                                                                       \
         template <typename Tuple>                                                                  \
         struct iter;                                                                               \
         template <typename Type, typename... Rest>                                                 \
@@ -2007,7 +2285,7 @@ int registerReporter(const char* name, int priority, bool isReporter) {
             iter(const char* file, unsigned line, int index) {                                     \
                 doctest::detail::regTest(doctest::detail::TestCase(func<Type>, file, line,         \
                                             doctest_detail_test_suite_ns::getCurrentTestSuite(),   \
-                                            doctest::detail::type_to_string<Type>(),               \
+                                            doctest::toString<Type>(),                             \
                                             int(line) * 1000 + index)                              \
                                          * dec);                                                   \
                 iter<std::tuple<Rest...>>(file, line, index + 1);                                  \
@@ -2024,20 +2302,20 @@ int registerReporter(const char* name, int priority, bool isReporter) {
 
 #define DOCTEST_TEST_CASE_TEMPLATE_DEFINE(dec, T, id)                                              \
     DOCTEST_TEST_CASE_TEMPLATE_DEFINE_IMPL(dec, T, DOCTEST_CAT(id, ITERATOR),                      \
-                                           DOCTEST_ANONYMOUS(_DOCTEST_ANON_TMP_))
+                                           DOCTEST_ANONYMOUS(DOCTEST_ANON_TMP_))
 
 #define DOCTEST_TEST_CASE_TEMPLATE_INSTANTIATE_IMPL(id, anon, ...)                                 \
-    DOCTEST_GLOBAL_NO_WARNINGS(DOCTEST_CAT(anon, DUMMY)) =                                         \
-        doctest::detail::instantiationHelper(DOCTEST_CAT(id, ITERATOR)<__VA_ARGS__>(__FILE__, __LINE__, 0));\
-    DOCTEST_GLOBAL_NO_WARNINGS_END()
+    DOCTEST_GLOBAL_NO_WARNINGS(DOCTEST_CAT(anon, DUMMY), /* NOLINT(cert-err58-cpp, fuchsia-statically-constructed-objects) */ \
+        doctest::detail::instantiationHelper(                                                      \
+            DOCTEST_CAT(id, ITERATOR)<__VA_ARGS__>(__FILE__, __LINE__, 0)))
 
 #define DOCTEST_TEST_CASE_TEMPLATE_INVOKE(id, ...)                                                 \
-    DOCTEST_TEST_CASE_TEMPLATE_INSTANTIATE_IMPL(id, DOCTEST_ANONYMOUS(_DOCTEST_ANON_TMP_), std::tuple<__VA_ARGS__>) \
-    typedef int DOCTEST_ANONYMOUS(_DOCTEST_ANON_FOR_SEMICOLON_)
+    DOCTEST_TEST_CASE_TEMPLATE_INSTANTIATE_IMPL(id, DOCTEST_ANONYMOUS(DOCTEST_ANON_TMP_), std::tuple<__VA_ARGS__>) \
+    static_assert(true, "")
 
 #define DOCTEST_TEST_CASE_TEMPLATE_APPLY(id, ...)                                                  \
-    DOCTEST_TEST_CASE_TEMPLATE_INSTANTIATE_IMPL(id, DOCTEST_ANONYMOUS(_DOCTEST_ANON_TMP_), __VA_ARGS__) \
-    typedef int DOCTEST_ANONYMOUS(_DOCTEST_ANON_FOR_SEMICOLON_)
+    DOCTEST_TEST_CASE_TEMPLATE_INSTANTIATE_IMPL(id, DOCTEST_ANONYMOUS(DOCTEST_ANON_TMP_), __VA_ARGS__) \
+    static_assert(true, "")
 
 #define DOCTEST_TEST_CASE_TEMPLATE_IMPL(dec, T, anon, ...)                                         \
     DOCTEST_TEST_CASE_TEMPLATE_DEFINE_IMPL(dec, T, DOCTEST_CAT(anon, ITERATOR), anon);             \
@@ -2046,17 +2324,17 @@ int registerReporter(const char* name, int priority, bool isReporter) {
     static void anon()
 
 #define DOCTEST_TEST_CASE_TEMPLATE(dec, T, ...)                                                    \
-    DOCTEST_TEST_CASE_TEMPLATE_IMPL(dec, T, DOCTEST_ANONYMOUS(_DOCTEST_ANON_TMP_), __VA_ARGS__)
+    DOCTEST_TEST_CASE_TEMPLATE_IMPL(dec, T, DOCTEST_ANONYMOUS(DOCTEST_ANON_TMP_), __VA_ARGS__)
 
 // for subcases
 #define DOCTEST_SUBCASE(name)                                                                      \
-    if(const doctest::detail::Subcase & DOCTEST_ANONYMOUS(_DOCTEST_ANON_SUBCASE_) DOCTEST_UNUSED = \
+    if(const doctest::detail::Subcase & DOCTEST_ANONYMOUS(DOCTEST_ANON_SUBCASE_) DOCTEST_UNUSED =  \
                doctest::detail::Subcase(name, __FILE__, __LINE__))
 
 // for grouping tests in test suites by using code blocks
 #define DOCTEST_TEST_SUITE_IMPL(decorators, ns_name)                                               \
     namespace ns_name { namespace doctest_detail_test_suite_ns {                                   \
-            static DOCTEST_NOINLINE doctest::detail::TestSuite& getCurrentTestSuite() {            \
+            static DOCTEST_NOINLINE doctest::detail::TestSuite& getCurrentTestSuite() noexcept {   \
                 DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(4640)                                      \
                 DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wexit-time-destructors")                \
                 DOCTEST_GCC_SUPPRESS_WARNING_WITH_PUSH("-Wmissing-field-initializers")             \
@@ -2076,55 +2354,53 @@ int registerReporter(const char* name, int priority, bool isReporter) {
     namespace ns_name
 
 #define DOCTEST_TEST_SUITE(decorators)                                                             \
-    DOCTEST_TEST_SUITE_IMPL(decorators, DOCTEST_ANONYMOUS(_DOCTEST_ANON_SUITE_))
+    DOCTEST_TEST_SUITE_IMPL(decorators, DOCTEST_ANONYMOUS(DOCTEST_ANON_SUITE_))
 
 // for starting a testsuite block
 #define DOCTEST_TEST_SUITE_BEGIN(decorators)                                                       \
-    DOCTEST_GLOBAL_NO_WARNINGS(DOCTEST_ANONYMOUS(_DOCTEST_ANON_VAR_)) =                            \
-            doctest::detail::setTestSuite(doctest::detail::TestSuite() * decorators);              \
-    DOCTEST_GLOBAL_NO_WARNINGS_END()                                                               \
-    typedef int DOCTEST_ANONYMOUS(_DOCTEST_ANON_FOR_SEMICOLON_)
+    DOCTEST_GLOBAL_NO_WARNINGS(DOCTEST_ANONYMOUS(DOCTEST_ANON_VAR_), /* NOLINT(cert-err58-cpp) */  \
+            doctest::detail::setTestSuite(doctest::detail::TestSuite() * decorators))              \
+    static_assert(true, "")
 
 // for ending a testsuite block
 #define DOCTEST_TEST_SUITE_END                                                                     \
-    DOCTEST_GLOBAL_NO_WARNINGS(DOCTEST_ANONYMOUS(_DOCTEST_ANON_VAR_)) =                            \
-            doctest::detail::setTestSuite(doctest::detail::TestSuite(""));                      \
-    DOCTEST_GLOBAL_NO_WARNINGS_END()                                                               \
-    typedef int DOCTEST_ANONYMOUS(_DOCTEST_ANON_FOR_SEMICOLON_)
+    DOCTEST_GLOBAL_NO_WARNINGS(DOCTEST_ANONYMOUS(DOCTEST_ANON_VAR_), /* NOLINT(cert-err58-cpp) */  \
+            doctest::detail::setTestSuite(doctest::detail::TestSuite() * ""))                      \
+    using DOCTEST_ANONYMOUS(DOCTEST_ANON_FOR_SEMICOLON_) = int
 
 // for registering exception translators
 #define DOCTEST_REGISTER_EXCEPTION_TRANSLATOR_IMPL(translatorName, signature)                      \
     inline doctest::String translatorName(signature);                                              \
-    DOCTEST_GLOBAL_NO_WARNINGS(DOCTEST_ANONYMOUS(_DOCTEST_ANON_TRANSLATOR_)) =                     \
-            doctest::registerExceptionTranslator(translatorName);                                  \
-    DOCTEST_GLOBAL_NO_WARNINGS_END()                                                               \
+    DOCTEST_GLOBAL_NO_WARNINGS(DOCTEST_ANONYMOUS(DOCTEST_ANON_TRANSLATOR_), /* NOLINT(cert-err58-cpp) */ \
+            doctest::registerExceptionTranslator(translatorName))                                  \
     doctest::String translatorName(signature)
 
 #define DOCTEST_REGISTER_EXCEPTION_TRANSLATOR(signature)                                           \
-    DOCTEST_REGISTER_EXCEPTION_TRANSLATOR_IMPL(DOCTEST_ANONYMOUS(_DOCTEST_ANON_TRANSLATOR_),       \
+    DOCTEST_REGISTER_EXCEPTION_TRANSLATOR_IMPL(DOCTEST_ANONYMOUS(DOCTEST_ANON_TRANSLATOR_),        \
                                                signature)
 
 // for registering reporters
 #define DOCTEST_REGISTER_REPORTER(name, priority, reporter)                                        \
-    DOCTEST_GLOBAL_NO_WARNINGS(DOCTEST_ANONYMOUS(_DOCTEST_ANON_REPORTER_)) =                       \
-            doctest::registerReporter<reporter>(name, priority, true);                             \
-    DOCTEST_GLOBAL_NO_WARNINGS_END() typedef int DOCTEST_ANONYMOUS(_DOCTEST_ANON_FOR_SEMICOLON_)
+    DOCTEST_GLOBAL_NO_WARNINGS(DOCTEST_ANONYMOUS(DOCTEST_ANON_REPORTER_), /* NOLINT(cert-err58-cpp) */ \
+            doctest::registerReporter<reporter>(name, priority, true))                             \
+    static_assert(true, "")
 
 // for registering listeners
 #define DOCTEST_REGISTER_LISTENER(name, priority, reporter)                                        \
-    DOCTEST_GLOBAL_NO_WARNINGS(DOCTEST_ANONYMOUS(_DOCTEST_ANON_REPORTER_)) =                       \
-            doctest::registerReporter<reporter>(name, priority, false);                            \
-    DOCTEST_GLOBAL_NO_WARNINGS_END() typedef int DOCTEST_ANONYMOUS(_DOCTEST_ANON_FOR_SEMICOLON_)
+    DOCTEST_GLOBAL_NO_WARNINGS(DOCTEST_ANONYMOUS(DOCTEST_ANON_REPORTER_), /* NOLINT(cert-err58-cpp) */ \
+            doctest::registerReporter<reporter>(name, priority, false))                            \
+    static_assert(true, "")
 
-// for logging
-// TODO: upstream the change to doctest : DOCTEST_ANONYMOUS doesn't work on the same line here on MSVS 15.9.13
+// clang-format off
+// for logging - disabling formatting because it's important to have these on 2 separate lines - see PR #557
 #define DOCTEST_INFO(...)                                                                          \
-    DOCTEST_INFO_IMPL(DOCTEST_ANONYMOUS(_DOCTEST_CAPTURE_),                                        \
-                      _DOCTEST_CAPTURE_##__COUNTER__,                                              \
+    DOCTEST_INFO_IMPL(DOCTEST_ANONYMOUS(DOCTEST_CAPTURE_),                                         \
+                      DOCTEST_ANONYMOUS(DOCTEST_CAPTURE_OTHER_),                                   \
                       __VA_ARGS__)
+// clang-format on
 
 #define DOCTEST_INFO_IMPL(mb_name, s_name, ...)                                       \
-    auto DOCTEST_ANONYMOUS(_DOCTEST_CAPTURE_) = doctest::detail::MakeContextScope(                 \
+    auto DOCTEST_ANONYMOUS(DOCTEST_CAPTURE_) = doctest::detail::MakeContextScope(                  \
         [&](std::ostream* s_name) {                                                                \
         doctest::detail::MessageBuilder mb_name(__FILE__, __LINE__, doctest::assertType::is_warn); \
         mb_name.m_stream = s_name;                                                                 \
@@ -2134,16 +2410,18 @@ int registerReporter(const char* name, int priority, bool isReporter) {
 #define DOCTEST_CAPTURE(x) DOCTEST_INFO(#x " := ", x)
 
 #define DOCTEST_ADD_AT_IMPL(type, file, line, mb, ...)                                             \
-    do {                                                                                           \
+    DOCTEST_FUNC_SCOPE_BEGIN {                                                                     \
         doctest::detail::MessageBuilder mb(file, line, doctest::assertType::type);                 \
         mb * __VA_ARGS__;                                                                          \
-        DOCTEST_ASSERT_LOG_AND_REACT(mb);                                                          \
-    } while(false)
+        if(mb.log())                                                                               \
+            DOCTEST_BREAK_INTO_DEBUGGER();                                                         \
+        mb.react();                                                                                \
+    } DOCTEST_FUNC_SCOPE_END
 
 // clang-format off
-#define DOCTEST_ADD_MESSAGE_AT(file, line, ...) DOCTEST_ADD_AT_IMPL(is_warn, file, line, DOCTEST_ANONYMOUS(_DOCTEST_MESSAGE_), __VA_ARGS__)
-#define DOCTEST_ADD_FAIL_CHECK_AT(file, line, ...) DOCTEST_ADD_AT_IMPL(is_check, file, line, DOCTEST_ANONYMOUS(_DOCTEST_MESSAGE_), __VA_ARGS__)
-#define DOCTEST_ADD_FAIL_AT(file, line, ...) DOCTEST_ADD_AT_IMPL(is_require, file, line, DOCTEST_ANONYMOUS(_DOCTEST_MESSAGE_), __VA_ARGS__)
+#define DOCTEST_ADD_MESSAGE_AT(file, line, ...) DOCTEST_ADD_AT_IMPL(is_warn, file, line, DOCTEST_ANONYMOUS(DOCTEST_MESSAGE_), __VA_ARGS__)
+#define DOCTEST_ADD_FAIL_CHECK_AT(file, line, ...) DOCTEST_ADD_AT_IMPL(is_check, file, line, DOCTEST_ANONYMOUS(DOCTEST_MESSAGE_), __VA_ARGS__)
+#define DOCTEST_ADD_FAIL_AT(file, line, ...) DOCTEST_ADD_AT_IMPL(is_require, file, line, DOCTEST_ANONYMOUS(DOCTEST_MESSAGE_), __VA_ARGS__)
 // clang-format on
 
 #define DOCTEST_MESSAGE(...) DOCTEST_ADD_MESSAGE_AT(__FILE__, __LINE__, __VA_ARGS__)
@@ -2156,18 +2434,37 @@ int registerReporter(const char* name, int priority, bool isReporter) {
 
 #define DOCTEST_ASSERT_IMPLEMENT_2(assert_type, ...)                                               \
     DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Woverloaded-shift-op-parentheses")                  \
-    doctest::detail::ResultBuilder _DOCTEST_RB(doctest::assertType::assert_type, __FILE__,         \
+    /* NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks) */                                  \
+    doctest::detail::ResultBuilder DOCTEST_RB(doctest::assertType::assert_type, __FILE__,          \
                                                __LINE__, #__VA_ARGS__);                            \
-    DOCTEST_WRAP_IN_TRY(_DOCTEST_RB.setResult(                                                     \
+    DOCTEST_WRAP_IN_TRY(DOCTEST_RB.setResult(                                                      \
             doctest::detail::ExpressionDecomposer(doctest::assertType::assert_type)                \
-            << __VA_ARGS__))                                                                       \
-    DOCTEST_ASSERT_LOG_AND_REACT(_DOCTEST_RB)                                                      \
+            << __VA_ARGS__)) /* NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks) */         \
+    DOCTEST_ASSERT_LOG_REACT_RETURN(DOCTEST_RB)                                                    \
     DOCTEST_CLANG_SUPPRESS_WARNING_POP
 
 #define DOCTEST_ASSERT_IMPLEMENT_1(assert_type, ...)                                               \
-    do {                                                                                           \
+    DOCTEST_FUNC_SCOPE_BEGIN {                                                                     \
         DOCTEST_ASSERT_IMPLEMENT_2(assert_type, __VA_ARGS__);                                      \
-    } while(false)
+    } DOCTEST_FUNC_SCOPE_END // NOLINT(clang-analyzer-cplusplus.NewDeleteLeaks)
+
+#define DOCTEST_BINARY_ASSERT(assert_type, comp, ...)                                              \
+    DOCTEST_FUNC_SCOPE_BEGIN {                                                                     \
+        doctest::detail::ResultBuilder DOCTEST_RB(doctest::assertType::assert_type, __FILE__,      \
+                                                   __LINE__, #__VA_ARGS__);                        \
+        DOCTEST_WRAP_IN_TRY(                                                                       \
+                DOCTEST_RB.binary_assert<doctest::detail::binaryAssertComparison::comp>(           \
+                        __VA_ARGS__))                                                              \
+        DOCTEST_ASSERT_LOG_REACT_RETURN(DOCTEST_RB);                                               \
+    } DOCTEST_FUNC_SCOPE_END
+
+#define DOCTEST_UNARY_ASSERT(assert_type, ...)                                                     \
+    DOCTEST_FUNC_SCOPE_BEGIN {                                                                     \
+        doctest::detail::ResultBuilder DOCTEST_RB(doctest::assertType::assert_type, __FILE__,      \
+                                                   __LINE__, #__VA_ARGS__);                        \
+        DOCTEST_WRAP_IN_TRY(DOCTEST_RB.unary_assert(__VA_ARGS__))                                  \
+        DOCTEST_ASSERT_LOG_REACT_RETURN(DOCTEST_RB);                                               \
+    } DOCTEST_FUNC_SCOPE_END
 
 #else // DOCTEST_CONFIG_SUPER_FAST_ASSERTS
 
@@ -2181,6 +2478,14 @@ int registerReporter(const char* name, int priority, bool isReporter) {
             doctest::detail::ExpressionDecomposer(doctest::assertType::assert_type)                \
                     << __VA_ARGS__) DOCTEST_CLANG_SUPPRESS_WARNING_POP
 
+#define DOCTEST_BINARY_ASSERT(assert_type, comparison, ...)                                        \
+    doctest::detail::binary_assert<doctest::detail::binaryAssertComparison::comparison>(           \
+            doctest::assertType::assert_type, __FILE__, __LINE__, #__VA_ARGS__, __VA_ARGS__)
+
+#define DOCTEST_UNARY_ASSERT(assert_type, ...)                                                     \
+    doctest::detail::unary_assert(doctest::assertType::assert_type, __FILE__, __LINE__,            \
+                                  #__VA_ARGS__, __VA_ARGS__)
+
 #endif // DOCTEST_CONFIG_SUPER_FAST_ASSERTS
 
 #define DOCTEST_WARN(...) DOCTEST_ASSERT_IMPLEMENT_1(DT_WARN, __VA_ARGS__)
@@ -2191,51 +2496,83 @@ int registerReporter(const char* name, int priority, bool isReporter) {
 #define DOCTEST_REQUIRE_FALSE(...) DOCTEST_ASSERT_IMPLEMENT_1(DT_REQUIRE_FALSE, __VA_ARGS__)
 
 // clang-format off
-#define DOCTEST_WARN_MESSAGE(cond, ...) do { DOCTEST_INFO(__VA_ARGS__); DOCTEST_ASSERT_IMPLEMENT_2(DT_WARN, cond); } while(false)
-#define DOCTEST_CHECK_MESSAGE(cond, ...) do { DOCTEST_INFO(__VA_ARGS__); DOCTEST_ASSERT_IMPLEMENT_2(DT_CHECK, cond); } while(false)
-#define DOCTEST_REQUIRE_MESSAGE(cond, ...) do { DOCTEST_INFO(__VA_ARGS__); DOCTEST_ASSERT_IMPLEMENT_2(DT_REQUIRE, cond); } while(false)
-#define DOCTEST_WARN_FALSE_MESSAGE(cond, ...) do { DOCTEST_INFO(__VA_ARGS__); DOCTEST_ASSERT_IMPLEMENT_2(DT_WARN_FALSE, cond); } while(false)
-#define DOCTEST_CHECK_FALSE_MESSAGE(cond, ...) do { DOCTEST_INFO(__VA_ARGS__); DOCTEST_ASSERT_IMPLEMENT_2(DT_CHECK_FALSE, cond); } while(false)
-#define DOCTEST_REQUIRE_FALSE_MESSAGE(cond, ...) do { DOCTEST_INFO(__VA_ARGS__); DOCTEST_ASSERT_IMPLEMENT_2(DT_REQUIRE_FALSE, cond); } while(false)
+#define DOCTEST_WARN_MESSAGE(cond, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_ASSERT_IMPLEMENT_2(DT_WARN, cond); } DOCTEST_FUNC_SCOPE_END
+#define DOCTEST_CHECK_MESSAGE(cond, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_ASSERT_IMPLEMENT_2(DT_CHECK, cond); } DOCTEST_FUNC_SCOPE_END
+#define DOCTEST_REQUIRE_MESSAGE(cond, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_ASSERT_IMPLEMENT_2(DT_REQUIRE, cond); } DOCTEST_FUNC_SCOPE_END
+#define DOCTEST_WARN_FALSE_MESSAGE(cond, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_ASSERT_IMPLEMENT_2(DT_WARN_FALSE, cond); } DOCTEST_FUNC_SCOPE_END
+#define DOCTEST_CHECK_FALSE_MESSAGE(cond, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_ASSERT_IMPLEMENT_2(DT_CHECK_FALSE, cond); } DOCTEST_FUNC_SCOPE_END
+#define DOCTEST_REQUIRE_FALSE_MESSAGE(cond, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_ASSERT_IMPLEMENT_2(DT_REQUIRE_FALSE, cond); } DOCTEST_FUNC_SCOPE_END
 // clang-format on
 
+#define DOCTEST_WARN_EQ(...) DOCTEST_BINARY_ASSERT(DT_WARN_EQ, eq, __VA_ARGS__)
+#define DOCTEST_CHECK_EQ(...) DOCTEST_BINARY_ASSERT(DT_CHECK_EQ, eq, __VA_ARGS__)
+#define DOCTEST_REQUIRE_EQ(...) DOCTEST_BINARY_ASSERT(DT_REQUIRE_EQ, eq, __VA_ARGS__)
+#define DOCTEST_WARN_NE(...) DOCTEST_BINARY_ASSERT(DT_WARN_NE, ne, __VA_ARGS__)
+#define DOCTEST_CHECK_NE(...) DOCTEST_BINARY_ASSERT(DT_CHECK_NE, ne, __VA_ARGS__)
+#define DOCTEST_REQUIRE_NE(...) DOCTEST_BINARY_ASSERT(DT_REQUIRE_NE, ne, __VA_ARGS__)
+#define DOCTEST_WARN_GT(...) DOCTEST_BINARY_ASSERT(DT_WARN_GT, gt, __VA_ARGS__)
+#define DOCTEST_CHECK_GT(...) DOCTEST_BINARY_ASSERT(DT_CHECK_GT, gt, __VA_ARGS__)
+#define DOCTEST_REQUIRE_GT(...) DOCTEST_BINARY_ASSERT(DT_REQUIRE_GT, gt, __VA_ARGS__)
+#define DOCTEST_WARN_LT(...) DOCTEST_BINARY_ASSERT(DT_WARN_LT, lt, __VA_ARGS__)
+#define DOCTEST_CHECK_LT(...) DOCTEST_BINARY_ASSERT(DT_CHECK_LT, lt, __VA_ARGS__)
+#define DOCTEST_REQUIRE_LT(...) DOCTEST_BINARY_ASSERT(DT_REQUIRE_LT, lt, __VA_ARGS__)
+#define DOCTEST_WARN_GE(...) DOCTEST_BINARY_ASSERT(DT_WARN_GE, ge, __VA_ARGS__)
+#define DOCTEST_CHECK_GE(...) DOCTEST_BINARY_ASSERT(DT_CHECK_GE, ge, __VA_ARGS__)
+#define DOCTEST_REQUIRE_GE(...) DOCTEST_BINARY_ASSERT(DT_REQUIRE_GE, ge, __VA_ARGS__)
+#define DOCTEST_WARN_LE(...) DOCTEST_BINARY_ASSERT(DT_WARN_LE, le, __VA_ARGS__)
+#define DOCTEST_CHECK_LE(...) DOCTEST_BINARY_ASSERT(DT_CHECK_LE, le, __VA_ARGS__)
+#define DOCTEST_REQUIRE_LE(...) DOCTEST_BINARY_ASSERT(DT_REQUIRE_LE, le, __VA_ARGS__)
+
+#define DOCTEST_WARN_UNARY(...) DOCTEST_UNARY_ASSERT(DT_WARN_UNARY, __VA_ARGS__)
+#define DOCTEST_CHECK_UNARY(...) DOCTEST_UNARY_ASSERT(DT_CHECK_UNARY, __VA_ARGS__)
+#define DOCTEST_REQUIRE_UNARY(...) DOCTEST_UNARY_ASSERT(DT_REQUIRE_UNARY, __VA_ARGS__)
+#define DOCTEST_WARN_UNARY_FALSE(...) DOCTEST_UNARY_ASSERT(DT_WARN_UNARY_FALSE, __VA_ARGS__)
+#define DOCTEST_CHECK_UNARY_FALSE(...) DOCTEST_UNARY_ASSERT(DT_CHECK_UNARY_FALSE, __VA_ARGS__)
+#define DOCTEST_REQUIRE_UNARY_FALSE(...) DOCTEST_UNARY_ASSERT(DT_REQUIRE_UNARY_FALSE, __VA_ARGS__)
+
+#ifndef DOCTEST_CONFIG_NO_EXCEPTIONS
+
 #define DOCTEST_ASSERT_THROWS_AS(expr, assert_type, message, ...)                                  \
-    do {                                                                                           \
+    DOCTEST_FUNC_SCOPE_BEGIN {                                                                     \
         if(!doctest::getContextOptions()->no_throw) {                                              \
-            doctest::detail::ResultBuilder _DOCTEST_RB(doctest::assertType::assert_type, __FILE__, \
+            doctest::detail::ResultBuilder DOCTEST_RB(doctest::assertType::assert_type, __FILE__,  \
                                                        __LINE__, #expr, #__VA_ARGS__, message);    \
             try {                                                                                  \
                 DOCTEST_CAST_TO_VOID(expr)                                                         \
-            } catch(const typename doctest::detail::remove_const<                                  \
-                    typename doctest::detail::remove_reference<__VA_ARGS__>::type>::type&) {       \
-                _DOCTEST_RB.translateException();                                                  \
-                _DOCTEST_RB.m_threw_as = true;                                                     \
-            } catch(...) { _DOCTEST_RB.translateException(); }                                     \
-            DOCTEST_ASSERT_LOG_AND_REACT(_DOCTEST_RB);                                             \
+            } catch(const typename doctest::detail::types::remove_const<                           \
+                    typename doctest::detail::types::remove_reference<__VA_ARGS__>::type>::type&) {\
+                DOCTEST_RB.translateException();                                                   \
+                DOCTEST_RB.m_threw_as = true;                                                      \
+            } catch(...) { DOCTEST_RB.translateException(); }                                      \
+            DOCTEST_ASSERT_LOG_REACT_RETURN(DOCTEST_RB);                                           \
+        } else { /* NOLINT(*-else-after-return) */                                                 \
+            DOCTEST_FUNC_SCOPE_RET(false);                                                         \
         }                                                                                          \
-    } while(false)
+    } DOCTEST_FUNC_SCOPE_END
 
 #define DOCTEST_ASSERT_THROWS_WITH(expr, expr_str, assert_type, ...)                               \
-    do {                                                                                           \
+    DOCTEST_FUNC_SCOPE_BEGIN {                                                                     \
         if(!doctest::getContextOptions()->no_throw) {                                              \
-            doctest::detail::ResultBuilder _DOCTEST_RB(doctest::assertType::assert_type, __FILE__, \
+            doctest::detail::ResultBuilder DOCTEST_RB(doctest::assertType::assert_type, __FILE__,  \
                                                        __LINE__, expr_str, "", __VA_ARGS__);       \
             try {                                                                                  \
                 DOCTEST_CAST_TO_VOID(expr)                                                         \
-            } catch(...) { _DOCTEST_RB.translateException(); }                                     \
-            DOCTEST_ASSERT_LOG_AND_REACT(_DOCTEST_RB);                                             \
+            } catch(...) { DOCTEST_RB.translateException(); }                                      \
+            DOCTEST_ASSERT_LOG_REACT_RETURN(DOCTEST_RB);                                           \
+        } else { /* NOLINT(*-else-after-return) */                                                 \
+           DOCTEST_FUNC_SCOPE_RET(false);                                                          \
         }                                                                                          \
-    } while(false)
+    } DOCTEST_FUNC_SCOPE_END
 
 #define DOCTEST_ASSERT_NOTHROW(assert_type, ...)                                                   \
-    do {                                                                                           \
-        doctest::detail::ResultBuilder _DOCTEST_RB(doctest::assertType::assert_type, __FILE__,     \
+    DOCTEST_FUNC_SCOPE_BEGIN {                                                                     \
+        doctest::detail::ResultBuilder DOCTEST_RB(doctest::assertType::assert_type, __FILE__,      \
                                                    __LINE__, #__VA_ARGS__);                        \
         try {                                                                                      \
             DOCTEST_CAST_TO_VOID(__VA_ARGS__)                                                      \
-        } catch(...) { _DOCTEST_RB.translateException(); }                                         \
-        DOCTEST_ASSERT_LOG_AND_REACT(_DOCTEST_RB);                                                 \
-    } while(false)
+        } catch(...) { DOCTEST_RB.translateException(); }                                          \
+        DOCTEST_ASSERT_LOG_REACT_RETURN(DOCTEST_RB);                                               \
+    } DOCTEST_FUNC_SCOPE_END
 
 // clang-format off
 #define DOCTEST_WARN_THROWS(...) DOCTEST_ASSERT_THROWS_WITH((__VA_ARGS__), #__VA_ARGS__, DT_WARN_THROWS, "")
@@ -2258,166 +2595,23 @@ int registerReporter(const char* name, int priority, bool isReporter) {
 #define DOCTEST_CHECK_NOTHROW(...) DOCTEST_ASSERT_NOTHROW(DT_CHECK_NOTHROW, __VA_ARGS__)
 #define DOCTEST_REQUIRE_NOTHROW(...) DOCTEST_ASSERT_NOTHROW(DT_REQUIRE_NOTHROW, __VA_ARGS__)
 
-#define DOCTEST_WARN_THROWS_MESSAGE(expr, ...) do { DOCTEST_INFO(__VA_ARGS__); DOCTEST_WARN_THROWS(expr); } while(false)
-#define DOCTEST_CHECK_THROWS_MESSAGE(expr, ...) do { DOCTEST_INFO(__VA_ARGS__); DOCTEST_CHECK_THROWS(expr); } while(false)
-#define DOCTEST_REQUIRE_THROWS_MESSAGE(expr, ...) do { DOCTEST_INFO(__VA_ARGS__); DOCTEST_REQUIRE_THROWS(expr); } while(false)
-#define DOCTEST_WARN_THROWS_AS_MESSAGE(expr, ex, ...) do { DOCTEST_INFO(__VA_ARGS__); DOCTEST_WARN_THROWS_AS(expr, ex); } while(false)
-#define DOCTEST_CHECK_THROWS_AS_MESSAGE(expr, ex, ...) do { DOCTEST_INFO(__VA_ARGS__); DOCTEST_CHECK_THROWS_AS(expr, ex); } while(false)
-#define DOCTEST_REQUIRE_THROWS_AS_MESSAGE(expr, ex, ...) do { DOCTEST_INFO(__VA_ARGS__); DOCTEST_REQUIRE_THROWS_AS(expr, ex); } while(false)
-#define DOCTEST_WARN_THROWS_WITH_MESSAGE(expr, with, ...) do { DOCTEST_INFO(__VA_ARGS__); DOCTEST_WARN_THROWS_WITH(expr, with); } while(false)
-#define DOCTEST_CHECK_THROWS_WITH_MESSAGE(expr, with, ...) do { DOCTEST_INFO(__VA_ARGS__); DOCTEST_CHECK_THROWS_WITH(expr, with); } while(false)
-#define DOCTEST_REQUIRE_THROWS_WITH_MESSAGE(expr, with, ...) do { DOCTEST_INFO(__VA_ARGS__); DOCTEST_REQUIRE_THROWS_WITH(expr, with); } while(false)
-#define DOCTEST_WARN_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) do { DOCTEST_INFO(__VA_ARGS__); DOCTEST_WARN_THROWS_WITH_AS(expr, with, ex); } while(false)
-#define DOCTEST_CHECK_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) do { DOCTEST_INFO(__VA_ARGS__); DOCTEST_CHECK_THROWS_WITH_AS(expr, with, ex); } while(false)
-#define DOCTEST_REQUIRE_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) do { DOCTEST_INFO(__VA_ARGS__); DOCTEST_REQUIRE_THROWS_WITH_AS(expr, with, ex); } while(false)
-#define DOCTEST_WARN_NOTHROW_MESSAGE(expr, ...) do { DOCTEST_INFO(__VA_ARGS__); DOCTEST_WARN_NOTHROW(expr); } while(false)
-#define DOCTEST_CHECK_NOTHROW_MESSAGE(expr, ...) do { DOCTEST_INFO(__VA_ARGS__); DOCTEST_CHECK_NOTHROW(expr); } while(false)
-#define DOCTEST_REQUIRE_NOTHROW_MESSAGE(expr, ...) do { DOCTEST_INFO(__VA_ARGS__); DOCTEST_REQUIRE_NOTHROW(expr); } while(false)
+#define DOCTEST_WARN_THROWS_MESSAGE(expr, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_WARN_THROWS(expr); } DOCTEST_FUNC_SCOPE_END
+#define DOCTEST_CHECK_THROWS_MESSAGE(expr, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_CHECK_THROWS(expr); } DOCTEST_FUNC_SCOPE_END
+#define DOCTEST_REQUIRE_THROWS_MESSAGE(expr, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_REQUIRE_THROWS(expr); } DOCTEST_FUNC_SCOPE_END
+#define DOCTEST_WARN_THROWS_AS_MESSAGE(expr, ex, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_WARN_THROWS_AS(expr, ex); } DOCTEST_FUNC_SCOPE_END
+#define DOCTEST_CHECK_THROWS_AS_MESSAGE(expr, ex, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_CHECK_THROWS_AS(expr, ex); } DOCTEST_FUNC_SCOPE_END
+#define DOCTEST_REQUIRE_THROWS_AS_MESSAGE(expr, ex, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_REQUIRE_THROWS_AS(expr, ex); } DOCTEST_FUNC_SCOPE_END
+#define DOCTEST_WARN_THROWS_WITH_MESSAGE(expr, with, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_WARN_THROWS_WITH(expr, with); } DOCTEST_FUNC_SCOPE_END
+#define DOCTEST_CHECK_THROWS_WITH_MESSAGE(expr, with, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_CHECK_THROWS_WITH(expr, with); } DOCTEST_FUNC_SCOPE_END
+#define DOCTEST_REQUIRE_THROWS_WITH_MESSAGE(expr, with, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_REQUIRE_THROWS_WITH(expr, with); } DOCTEST_FUNC_SCOPE_END
+#define DOCTEST_WARN_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_WARN_THROWS_WITH_AS(expr, with, ex); } DOCTEST_FUNC_SCOPE_END
+#define DOCTEST_CHECK_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_CHECK_THROWS_WITH_AS(expr, with, ex); } DOCTEST_FUNC_SCOPE_END
+#define DOCTEST_REQUIRE_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_REQUIRE_THROWS_WITH_AS(expr, with, ex); } DOCTEST_FUNC_SCOPE_END
+#define DOCTEST_WARN_NOTHROW_MESSAGE(expr, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_WARN_NOTHROW(expr); } DOCTEST_FUNC_SCOPE_END
+#define DOCTEST_CHECK_NOTHROW_MESSAGE(expr, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_CHECK_NOTHROW(expr); } DOCTEST_FUNC_SCOPE_END
+#define DOCTEST_REQUIRE_NOTHROW_MESSAGE(expr, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_REQUIRE_NOTHROW(expr); } DOCTEST_FUNC_SCOPE_END
 // clang-format on
 
-#ifndef DOCTEST_CONFIG_SUPER_FAST_ASSERTS
-
-#define DOCTEST_BINARY_ASSERT(assert_type, comp, ...)                                              \
-    do {                                                                                           \
-        doctest::detail::ResultBuilder _DOCTEST_RB(doctest::assertType::assert_type, __FILE__,     \
-                                                   __LINE__, #__VA_ARGS__);                        \
-        DOCTEST_WRAP_IN_TRY(                                                                       \
-                _DOCTEST_RB.binary_assert<doctest::detail::binaryAssertComparison::comp>(          \
-                        __VA_ARGS__))                                                              \
-        DOCTEST_ASSERT_LOG_AND_REACT(_DOCTEST_RB);                                                 \
-    } while(false)
-
-#define DOCTEST_UNARY_ASSERT(assert_type, ...)                                                     \
-    do {                                                                                           \
-        doctest::detail::ResultBuilder _DOCTEST_RB(doctest::assertType::assert_type, __FILE__,     \
-                                                   __LINE__, #__VA_ARGS__);                        \
-        DOCTEST_WRAP_IN_TRY(_DOCTEST_RB.unary_assert(__VA_ARGS__))                                 \
-        DOCTEST_ASSERT_LOG_AND_REACT(_DOCTEST_RB);                                                 \
-    } while(false)
-
-#else // DOCTEST_CONFIG_SUPER_FAST_ASSERTS
-
-#define DOCTEST_BINARY_ASSERT(assert_type, comparison, ...)                                        \
-    doctest::detail::binary_assert<doctest::detail::binaryAssertComparison::comparison>(           \
-            doctest::assertType::assert_type, __FILE__, __LINE__, #__VA_ARGS__, __VA_ARGS__)
-
-#define DOCTEST_UNARY_ASSERT(assert_type, ...)                                                     \
-    doctest::detail::unary_assert(doctest::assertType::assert_type, __FILE__, __LINE__,            \
-                                  #__VA_ARGS__, __VA_ARGS__)
-
-#endif // DOCTEST_CONFIG_SUPER_FAST_ASSERTS
-
-#define DOCTEST_WARN_EQ(...) DOCTEST_BINARY_ASSERT(DT_WARN_EQ, eq, __VA_ARGS__)
-#define DOCTEST_CHECK_EQ(...) DOCTEST_BINARY_ASSERT(DT_CHECK_EQ, eq, __VA_ARGS__)
-#define DOCTEST_REQUIRE_EQ(...) DOCTEST_BINARY_ASSERT(DT_REQUIRE_EQ, eq, __VA_ARGS__)
-#define DOCTEST_WARN_NE(...) DOCTEST_BINARY_ASSERT(DT_WARN_NE, ne, __VA_ARGS__)
-#define DOCTEST_CHECK_NE(...) DOCTEST_BINARY_ASSERT(DT_CHECK_NE, ne, __VA_ARGS__)
-#define DOCTEST_REQUIRE_NE(...) DOCTEST_BINARY_ASSERT(DT_REQUIRE_NE, ne, __VA_ARGS__)
-#define DOCTEST_WARN_GT(...) DOCTEST_BINARY_ASSERT(DT_WARN_GT, gt, __VA_ARGS__)
-#define DOCTEST_CHECK_GT(...) DOCTEST_BINARY_ASSERT(DT_CHECK_GT, gt, __VA_ARGS__)
-#define DOCTEST_REQUIRE_GT(...) DOCTEST_BINARY_ASSERT(DT_REQUIRE_GT, gt, __VA_ARGS__)
-#define DOCTEST_WARN_LT(...) DOCTEST_BINARY_ASSERT(DT_WARN_LT, lt, __VA_ARGS__)
-#define DOCTEST_CHECK_LT(...) DOCTEST_BINARY_ASSERT(DT_CHECK_LT, lt, __VA_ARGS__)
-#define DOCTEST_REQUIRE_LT(...) DOCTEST_BINARY_ASSERT(DT_REQUIRE_LT, lt, __VA_ARGS__)
-#define DOCTEST_WARN_GE(...) DOCTEST_BINARY_ASSERT(DT_WARN_GE, ge, __VA_ARGS__)
-#define DOCTEST_CHECK_GE(...) DOCTEST_BINARY_ASSERT(DT_CHECK_GE, ge, __VA_ARGS__)
-#define DOCTEST_REQUIRE_GE(...) DOCTEST_BINARY_ASSERT(DT_REQUIRE_GE, ge, __VA_ARGS__)
-#define DOCTEST_WARN_LE(...) DOCTEST_BINARY_ASSERT(DT_WARN_LE, le, __VA_ARGS__)
-#define DOCTEST_CHECK_LE(...) DOCTEST_BINARY_ASSERT(DT_CHECK_LE, le, __VA_ARGS__)
-#define DOCTEST_REQUIRE_LE(...) DOCTEST_BINARY_ASSERT(DT_REQUIRE_LE, le, __VA_ARGS__)
-
-#define DOCTEST_WARN_UNARY(...) DOCTEST_UNARY_ASSERT(DT_WARN_UNARY, __VA_ARGS__)
-#define DOCTEST_CHECK_UNARY(...) DOCTEST_UNARY_ASSERT(DT_CHECK_UNARY, __VA_ARGS__)
-#define DOCTEST_REQUIRE_UNARY(...) DOCTEST_UNARY_ASSERT(DT_REQUIRE_UNARY, __VA_ARGS__)
-#define DOCTEST_WARN_UNARY_FALSE(...) DOCTEST_UNARY_ASSERT(DT_WARN_UNARY_FALSE, __VA_ARGS__)
-#define DOCTEST_CHECK_UNARY_FALSE(...) DOCTEST_UNARY_ASSERT(DT_CHECK_UNARY_FALSE, __VA_ARGS__)
-#define DOCTEST_REQUIRE_UNARY_FALSE(...) DOCTEST_UNARY_ASSERT(DT_REQUIRE_UNARY_FALSE, __VA_ARGS__)
-
-#ifdef DOCTEST_CONFIG_NO_EXCEPTIONS
-
-#undef DOCTEST_WARN_THROWS
-#undef DOCTEST_CHECK_THROWS
-#undef DOCTEST_REQUIRE_THROWS
-#undef DOCTEST_WARN_THROWS_AS
-#undef DOCTEST_CHECK_THROWS_AS
-#undef DOCTEST_REQUIRE_THROWS_AS
-#undef DOCTEST_WARN_THROWS_WITH
-#undef DOCTEST_CHECK_THROWS_WITH
-#undef DOCTEST_REQUIRE_THROWS_WITH
-#undef DOCTEST_WARN_THROWS_WITH_AS
-#undef DOCTEST_CHECK_THROWS_WITH_AS
-#undef DOCTEST_REQUIRE_THROWS_WITH_AS
-#undef DOCTEST_WARN_NOTHROW
-#undef DOCTEST_CHECK_NOTHROW
-#undef DOCTEST_REQUIRE_NOTHROW
-
-#undef DOCTEST_WARN_THROWS_MESSAGE
-#undef DOCTEST_CHECK_THROWS_MESSAGE
-#undef DOCTEST_REQUIRE_THROWS_MESSAGE
-#undef DOCTEST_WARN_THROWS_AS_MESSAGE
-#undef DOCTEST_CHECK_THROWS_AS_MESSAGE
-#undef DOCTEST_REQUIRE_THROWS_AS_MESSAGE
-#undef DOCTEST_WARN_THROWS_WITH_MESSAGE
-#undef DOCTEST_CHECK_THROWS_WITH_MESSAGE
-#undef DOCTEST_REQUIRE_THROWS_WITH_MESSAGE
-#undef DOCTEST_WARN_THROWS_WITH_AS_MESSAGE
-#undef DOCTEST_CHECK_THROWS_WITH_AS_MESSAGE
-#undef DOCTEST_REQUIRE_THROWS_WITH_AS_MESSAGE
-#undef DOCTEST_WARN_NOTHROW_MESSAGE
-#undef DOCTEST_CHECK_NOTHROW_MESSAGE
-#undef DOCTEST_REQUIRE_NOTHROW_MESSAGE
-
-#ifdef DOCTEST_CONFIG_NO_EXCEPTIONS_BUT_WITH_ALL_ASSERTS
-
-#define DOCTEST_WARN_THROWS(...) (static_cast<void>(0))
-#define DOCTEST_CHECK_THROWS(...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_THROWS(...) (static_cast<void>(0))
-#define DOCTEST_WARN_THROWS_AS(expr, ...) (static_cast<void>(0))
-#define DOCTEST_CHECK_THROWS_AS(expr, ...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_THROWS_AS(expr, ...) (static_cast<void>(0))
-#define DOCTEST_WARN_THROWS_WITH(expr, ...) (static_cast<void>(0))
-#define DOCTEST_CHECK_THROWS_WITH(expr, ...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_THROWS_WITH(expr, ...) (static_cast<void>(0))
-#define DOCTEST_WARN_THROWS_WITH_AS(expr, with, ...) (static_cast<void>(0))
-#define DOCTEST_CHECK_THROWS_WITH_AS(expr, with, ...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_THROWS_WITH_AS(expr, with, ...) (static_cast<void>(0))
-#define DOCTEST_WARN_NOTHROW(...) (static_cast<void>(0))
-#define DOCTEST_CHECK_NOTHROW(...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_NOTHROW(...) (static_cast<void>(0))
-
-#define DOCTEST_WARN_THROWS_MESSAGE(expr, ...) (static_cast<void>(0))
-#define DOCTEST_CHECK_THROWS_MESSAGE(expr, ...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_THROWS_MESSAGE(expr, ...) (static_cast<void>(0))
-#define DOCTEST_WARN_THROWS_AS_MESSAGE(expr, ex, ...) (static_cast<void>(0))
-#define DOCTEST_CHECK_THROWS_AS_MESSAGE(expr, ex, ...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_THROWS_AS_MESSAGE(expr, ex, ...) (static_cast<void>(0))
-#define DOCTEST_WARN_THROWS_WITH_MESSAGE(expr, with, ...) (static_cast<void>(0))
-#define DOCTEST_CHECK_THROWS_WITH_MESSAGE(expr, with, ...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_THROWS_WITH_MESSAGE(expr, with, ...) (static_cast<void>(0))
-#define DOCTEST_WARN_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) (static_cast<void>(0))
-#define DOCTEST_CHECK_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) (static_cast<void>(0))
-#define DOCTEST_WARN_NOTHROW_MESSAGE(expr, ...) (static_cast<void>(0))
-#define DOCTEST_CHECK_NOTHROW_MESSAGE(expr, ...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_NOTHROW_MESSAGE(expr, ...) (static_cast<void>(0))
-
-#else // DOCTEST_CONFIG_NO_EXCEPTIONS_BUT_WITH_ALL_ASSERTS
-
-#undef DOCTEST_REQUIRE
-#undef DOCTEST_REQUIRE_FALSE
-#undef DOCTEST_REQUIRE_MESSAGE
-#undef DOCTEST_REQUIRE_FALSE_MESSAGE
-#undef DOCTEST_REQUIRE_EQ
-#undef DOCTEST_REQUIRE_NE
-#undef DOCTEST_REQUIRE_GT
-#undef DOCTEST_REQUIRE_LT
-#undef DOCTEST_REQUIRE_GE
-#undef DOCTEST_REQUIRE_LE
-#undef DOCTEST_REQUIRE_UNARY
-#undef DOCTEST_REQUIRE_UNARY_FALSE
-
-#endif // DOCTEST_CONFIG_NO_EXCEPTIONS_BUT_WITH_ALL_ASSERTS
-
 #endif // DOCTEST_CONFIG_NO_EXCEPTIONS
 
 // =================================================================================================
@@ -2427,7 +2621,7 @@ int registerReporter(const char* name, int priority, bool isReporter) {
 #else // DOCTEST_CONFIG_DISABLE
 
 #define DOCTEST_IMPLEMENT_FIXTURE(der, base, func, name)                                           \
-    namespace {                                                                                    \
+    namespace /* NOLINT */ {                                                                       \
         template <typename DOCTEST_UNUSED_TEMPLATE_TYPE>                                           \
         struct der : public base                                                                   \
         { void f(); };                                                                             \
@@ -2441,51 +2635,48 @@ int registerReporter(const char* name, int priority, bool isReporter) {
 
 // for registering tests
 #define DOCTEST_TEST_CASE(name)                                                                    \
-    DOCTEST_CREATE_AND_REGISTER_FUNCTION(DOCTEST_ANONYMOUS(_DOCTEST_ANON_FUNC_), name)
+    DOCTEST_CREATE_AND_REGISTER_FUNCTION(DOCTEST_ANONYMOUS(DOCTEST_ANON_FUNC_), name)
 
 // for registering tests in classes
 #define DOCTEST_TEST_CASE_CLASS(name)                                                              \
-    DOCTEST_CREATE_AND_REGISTER_FUNCTION(DOCTEST_ANONYMOUS(_DOCTEST_ANON_FUNC_), name)
+    DOCTEST_CREATE_AND_REGISTER_FUNCTION(DOCTEST_ANONYMOUS(DOCTEST_ANON_FUNC_), name)
 
 // for registering tests with a fixture
 #define DOCTEST_TEST_CASE_FIXTURE(x, name)                                                         \
-    DOCTEST_IMPLEMENT_FIXTURE(DOCTEST_ANONYMOUS(_DOCTEST_ANON_CLASS_), x,                          \
-                              DOCTEST_ANONYMOUS(_DOCTEST_ANON_FUNC_), name)
+    DOCTEST_IMPLEMENT_FIXTURE(DOCTEST_ANONYMOUS(DOCTEST_ANON_CLASS_), x,                           \
+                              DOCTEST_ANONYMOUS(DOCTEST_ANON_FUNC_), name)
 
 // for converting types to strings without the <typeinfo> header and demangling
-#define DOCTEST_TYPE_TO_STRING(...) typedef int DOCTEST_ANONYMOUS(_DOCTEST_ANON_FOR_SEMICOLON_)
-#define DOCTEST_TYPE_TO_STRING_IMPL(...)
+#define DOCTEST_TYPE_TO_STRING_AS(str, ...) static_assert(true, "")
+#define DOCTEST_TYPE_TO_STRING(...) static_assert(true, "")
 
 // for typed tests
 #define DOCTEST_TEST_CASE_TEMPLATE(name, type, ...)                                                \
     template <typename type>                                                                       \
-    inline void DOCTEST_ANONYMOUS(_DOCTEST_ANON_TMP_)()
+    inline void DOCTEST_ANONYMOUS(DOCTEST_ANON_TMP_)()
 
 #define DOCTEST_TEST_CASE_TEMPLATE_DEFINE(name, type, id)                                          \
     template <typename type>                                                                       \
-    inline void DOCTEST_ANONYMOUS(_DOCTEST_ANON_TMP_)()
+    inline void DOCTEST_ANONYMOUS(DOCTEST_ANON_TMP_)()
 
-#define DOCTEST_TEST_CASE_TEMPLATE_INVOKE(id, ...)                                                 \
-    typedef int DOCTEST_ANONYMOUS(_DOCTEST_ANON_FOR_SEMICOLON_)
-
-#define DOCTEST_TEST_CASE_TEMPLATE_APPLY(id, ...)                                                  \
-    typedef int DOCTEST_ANONYMOUS(_DOCTEST_ANON_FOR_SEMICOLON_)
+#define DOCTEST_TEST_CASE_TEMPLATE_INVOKE(id, ...) static_assert(true, "")
+#define DOCTEST_TEST_CASE_TEMPLATE_APPLY(id, ...) static_assert(true, "")
 
 // for subcases
 #define DOCTEST_SUBCASE(name)
 
 // for a testsuite block
-#define DOCTEST_TEST_SUITE(name) namespace
+#define DOCTEST_TEST_SUITE(name) namespace // NOLINT
 
 // for starting a testsuite block
-#define DOCTEST_TEST_SUITE_BEGIN(name) typedef int DOCTEST_ANONYMOUS(_DOCTEST_ANON_FOR_SEMICOLON_)
+#define DOCTEST_TEST_SUITE_BEGIN(name) static_assert(true, "")
 
 // for ending a testsuite block
-#define DOCTEST_TEST_SUITE_END typedef int DOCTEST_ANONYMOUS(_DOCTEST_ANON_FOR_SEMICOLON_)
+#define DOCTEST_TEST_SUITE_END using DOCTEST_ANONYMOUS(DOCTEST_ANON_FOR_SEMICOLON_) = int
 
 #define DOCTEST_REGISTER_EXCEPTION_TRANSLATOR(signature)                                           \
     template <typename DOCTEST_UNUSED_TEMPLATE_TYPE>                                               \
-    static inline doctest::String DOCTEST_ANONYMOUS(_DOCTEST_ANON_TRANSLATOR_)(signature)
+    static inline doctest::String DOCTEST_ANONYMOUS(DOCTEST_ANON_TRANSLATOR_)(signature)
 
 #define DOCTEST_REGISTER_REPORTER(name, priority, reporter)
 #define DOCTEST_REGISTER_LISTENER(name, priority, reporter)
@@ -2499,80 +2690,253 @@ int registerReporter(const char* name, int priority, bool isReporter) {
 #define DOCTEST_FAIL_CHECK(...) (static_cast<void>(0))
 #define DOCTEST_FAIL(...) (static_cast<void>(0))
 
-#define DOCTEST_WARN(...) (static_cast<void>(0))
-#define DOCTEST_CHECK(...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE(...) (static_cast<void>(0))
-#define DOCTEST_WARN_FALSE(...) (static_cast<void>(0))
-#define DOCTEST_CHECK_FALSE(...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_FALSE(...) (static_cast<void>(0))
-
-#define DOCTEST_WARN_MESSAGE(cond, ...) (static_cast<void>(0))
-#define DOCTEST_CHECK_MESSAGE(cond, ...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_MESSAGE(cond, ...) (static_cast<void>(0))
-#define DOCTEST_WARN_FALSE_MESSAGE(cond, ...) (static_cast<void>(0))
-#define DOCTEST_CHECK_FALSE_MESSAGE(cond, ...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_FALSE_MESSAGE(cond, ...) (static_cast<void>(0))
-
-#define DOCTEST_WARN_THROWS(...) (static_cast<void>(0))
-#define DOCTEST_CHECK_THROWS(...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_THROWS(...) (static_cast<void>(0))
-#define DOCTEST_WARN_THROWS_AS(expr, ...) (static_cast<void>(0))
-#define DOCTEST_CHECK_THROWS_AS(expr, ...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_THROWS_AS(expr, ...) (static_cast<void>(0))
-#define DOCTEST_WARN_THROWS_WITH(expr, ...) (static_cast<void>(0))
-#define DOCTEST_CHECK_THROWS_WITH(expr, ...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_THROWS_WITH(expr, ...) (static_cast<void>(0))
-#define DOCTEST_WARN_THROWS_WITH_AS(expr, with, ...) (static_cast<void>(0))
-#define DOCTEST_CHECK_THROWS_WITH_AS(expr, with, ...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_THROWS_WITH_AS(expr, with, ...) (static_cast<void>(0))
-#define DOCTEST_WARN_NOTHROW(...) (static_cast<void>(0))
-#define DOCTEST_CHECK_NOTHROW(...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_NOTHROW(...) (static_cast<void>(0))
-
-#define DOCTEST_WARN_THROWS_MESSAGE(expr, ...) (static_cast<void>(0))
-#define DOCTEST_CHECK_THROWS_MESSAGE(expr, ...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_THROWS_MESSAGE(expr, ...) (static_cast<void>(0))
-#define DOCTEST_WARN_THROWS_AS_MESSAGE(expr, ex, ...) (static_cast<void>(0))
-#define DOCTEST_CHECK_THROWS_AS_MESSAGE(expr, ex, ...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_THROWS_AS_MESSAGE(expr, ex, ...) (static_cast<void>(0))
-#define DOCTEST_WARN_THROWS_WITH_MESSAGE(expr, with, ...) (static_cast<void>(0))
-#define DOCTEST_CHECK_THROWS_WITH_MESSAGE(expr, with, ...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_THROWS_WITH_MESSAGE(expr, with, ...) (static_cast<void>(0))
-#define DOCTEST_WARN_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) (static_cast<void>(0))
-#define DOCTEST_CHECK_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) (static_cast<void>(0))
-#define DOCTEST_WARN_NOTHROW_MESSAGE(expr, ...) (static_cast<void>(0))
-#define DOCTEST_CHECK_NOTHROW_MESSAGE(expr, ...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_NOTHROW_MESSAGE(expr, ...) (static_cast<void>(0))
-
-#define DOCTEST_WARN_EQ(...) (static_cast<void>(0))
-#define DOCTEST_CHECK_EQ(...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_EQ(...) (static_cast<void>(0))
-#define DOCTEST_WARN_NE(...) (static_cast<void>(0))
-#define DOCTEST_CHECK_NE(...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_NE(...) (static_cast<void>(0))
-#define DOCTEST_WARN_GT(...) (static_cast<void>(0))
-#define DOCTEST_CHECK_GT(...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_GT(...) (static_cast<void>(0))
-#define DOCTEST_WARN_LT(...) (static_cast<void>(0))
-#define DOCTEST_CHECK_LT(...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_LT(...) (static_cast<void>(0))
-#define DOCTEST_WARN_GE(...) (static_cast<void>(0))
-#define DOCTEST_CHECK_GE(...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_GE(...) (static_cast<void>(0))
-#define DOCTEST_WARN_LE(...) (static_cast<void>(0))
-#define DOCTEST_CHECK_LE(...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_LE(...) (static_cast<void>(0))
-
-#define DOCTEST_WARN_UNARY(...) (static_cast<void>(0))
-#define DOCTEST_CHECK_UNARY(...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_UNARY(...) (static_cast<void>(0))
-#define DOCTEST_WARN_UNARY_FALSE(...) (static_cast<void>(0))
-#define DOCTEST_CHECK_UNARY_FALSE(...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_UNARY_FALSE(...) (static_cast<void>(0))
+#if defined(DOCTEST_CONFIG_EVALUATE_ASSERTS_EVEN_WHEN_DISABLED)                                    \
+ && defined(DOCTEST_CONFIG_ASSERTS_RETURN_VALUES)
+
+#define DOCTEST_WARN(...) [&] { return __VA_ARGS__; }()
+#define DOCTEST_CHECK(...) [&] { return __VA_ARGS__; }()
+#define DOCTEST_REQUIRE(...) [&] { return __VA_ARGS__; }()
+#define DOCTEST_WARN_FALSE(...) [&] { return !(__VA_ARGS__); }()
+#define DOCTEST_CHECK_FALSE(...) [&] { return !(__VA_ARGS__); }()
+#define DOCTEST_REQUIRE_FALSE(...) [&] { return !(__VA_ARGS__); }()
+
+#define DOCTEST_WARN_MESSAGE(cond, ...) [&] { return cond; }()
+#define DOCTEST_CHECK_MESSAGE(cond, ...) [&] { return cond; }()
+#define DOCTEST_REQUIRE_MESSAGE(cond, ...) [&] { return cond; }()
+#define DOCTEST_WARN_FALSE_MESSAGE(cond, ...) [&] { return !(cond); }()
+#define DOCTEST_CHECK_FALSE_MESSAGE(cond, ...) [&] { return !(cond); }()
+#define DOCTEST_REQUIRE_FALSE_MESSAGE(cond, ...) [&] { return !(cond); }()
+
+namespace doctest {
+namespace detail {
+#define DOCTEST_RELATIONAL_OP(name, op)                                                            \
+    template <typename L, typename R>                                                              \
+    bool name(const DOCTEST_REF_WRAP(L) lhs, const DOCTEST_REF_WRAP(R) rhs) { return lhs op rhs; }
+
+    DOCTEST_RELATIONAL_OP(eq, ==)
+    DOCTEST_RELATIONAL_OP(ne, !=)
+    DOCTEST_RELATIONAL_OP(lt, <)
+    DOCTEST_RELATIONAL_OP(gt, >)
+    DOCTEST_RELATIONAL_OP(le, <=)
+    DOCTEST_RELATIONAL_OP(ge, >=)
+} // namespace detail
+} // namespace doctest
+
+#define DOCTEST_WARN_EQ(...) [&] { return doctest::detail::eq(__VA_ARGS__); }()
+#define DOCTEST_CHECK_EQ(...) [&] { return doctest::detail::eq(__VA_ARGS__); }()
+#define DOCTEST_REQUIRE_EQ(...) [&] { return doctest::detail::eq(__VA_ARGS__); }()
+#define DOCTEST_WARN_NE(...) [&] { return doctest::detail::ne(__VA_ARGS__); }()
+#define DOCTEST_CHECK_NE(...) [&] { return doctest::detail::ne(__VA_ARGS__); }()
+#define DOCTEST_REQUIRE_NE(...) [&] { return doctest::detail::ne(__VA_ARGS__); }()
+#define DOCTEST_WARN_LT(...) [&] { return doctest::detail::lt(__VA_ARGS__); }()
+#define DOCTEST_CHECK_LT(...) [&] { return doctest::detail::lt(__VA_ARGS__); }()
+#define DOCTEST_REQUIRE_LT(...) [&] { return doctest::detail::lt(__VA_ARGS__); }()
+#define DOCTEST_WARN_GT(...) [&] { return doctest::detail::gt(__VA_ARGS__); }()
+#define DOCTEST_CHECK_GT(...) [&] { return doctest::detail::gt(__VA_ARGS__); }()
+#define DOCTEST_REQUIRE_GT(...) [&] { return doctest::detail::gt(__VA_ARGS__); }()
+#define DOCTEST_WARN_LE(...) [&] { return doctest::detail::le(__VA_ARGS__); }()
+#define DOCTEST_CHECK_LE(...) [&] { return doctest::detail::le(__VA_ARGS__); }()
+#define DOCTEST_REQUIRE_LE(...) [&] { return doctest::detail::le(__VA_ARGS__); }()
+#define DOCTEST_WARN_GE(...) [&] { return doctest::detail::ge(__VA_ARGS__); }()
+#define DOCTEST_CHECK_GE(...) [&] { return doctest::detail::ge(__VA_ARGS__); }()
+#define DOCTEST_REQUIRE_GE(...) [&] { return doctest::detail::ge(__VA_ARGS__); }()
+#define DOCTEST_WARN_UNARY(...) [&] { return __VA_ARGS__; }()
+#define DOCTEST_CHECK_UNARY(...) [&] { return __VA_ARGS__; }()
+#define DOCTEST_REQUIRE_UNARY(...) [&] { return __VA_ARGS__; }()
+#define DOCTEST_WARN_UNARY_FALSE(...) [&] { return !(__VA_ARGS__); }()
+#define DOCTEST_CHECK_UNARY_FALSE(...) [&] { return !(__VA_ARGS__); }()
+#define DOCTEST_REQUIRE_UNARY_FALSE(...) [&] { return !(__VA_ARGS__); }()
+
+#ifndef DOCTEST_CONFIG_NO_EXCEPTIONS
+
+#define DOCTEST_WARN_THROWS_WITH(expr, with, ...) [] { static_assert(false, "Exception translation is not available when doctest is disabled."); return false; }()
+#define DOCTEST_CHECK_THROWS_WITH(expr, with, ...) DOCTEST_WARN_THROWS_WITH(,,)
+#define DOCTEST_REQUIRE_THROWS_WITH(expr, with, ...) DOCTEST_WARN_THROWS_WITH(,,)
+#define DOCTEST_WARN_THROWS_WITH_AS(expr, with, ex, ...) DOCTEST_WARN_THROWS_WITH(,,)
+#define DOCTEST_CHECK_THROWS_WITH_AS(expr, with, ex, ...) DOCTEST_WARN_THROWS_WITH(,,)
+#define DOCTEST_REQUIRE_THROWS_WITH_AS(expr, with, ex, ...) DOCTEST_WARN_THROWS_WITH(,,)
+
+#define DOCTEST_WARN_THROWS_WITH_MESSAGE(expr, with, ...) DOCTEST_WARN_THROWS_WITH(,,)
+#define DOCTEST_CHECK_THROWS_WITH_MESSAGE(expr, with, ...) DOCTEST_WARN_THROWS_WITH(,,)
+#define DOCTEST_REQUIRE_THROWS_WITH_MESSAGE(expr, with, ...) DOCTEST_WARN_THROWS_WITH(,,)
+#define DOCTEST_WARN_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) DOCTEST_WARN_THROWS_WITH(,,)
+#define DOCTEST_CHECK_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) DOCTEST_WARN_THROWS_WITH(,,)
+#define DOCTEST_REQUIRE_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) DOCTEST_WARN_THROWS_WITH(,,)
+
+#define DOCTEST_WARN_THROWS(...) [&] { try { __VA_ARGS__; return false; } catch (...) { return true; } }()
+#define DOCTEST_CHECK_THROWS(...) [&] { try { __VA_ARGS__; return false; } catch (...) { return true; } }()
+#define DOCTEST_REQUIRE_THROWS(...) [&] { try { __VA_ARGS__; return false; } catch (...) { return true; } }()
+#define DOCTEST_WARN_THROWS_AS(expr, ...) [&] { try { expr; } catch (__VA_ARGS__) { return true; } catch (...) { } return false; }()
+#define DOCTEST_CHECK_THROWS_AS(expr, ...) [&] { try { expr; } catch (__VA_ARGS__) { return true; } catch (...) { } return false; }()
+#define DOCTEST_REQUIRE_THROWS_AS(expr, ...) [&] { try { expr; } catch (__VA_ARGS__) { return true; } catch (...) { } return false; }()
+#define DOCTEST_WARN_NOTHROW(...) [&] { try { __VA_ARGS__; return true; } catch (...) { return false; } }()
+#define DOCTEST_CHECK_NOTHROW(...) [&] { try { __VA_ARGS__; return true; } catch (...) { return false; } }()
+#define DOCTEST_REQUIRE_NOTHROW(...) [&] { try { __VA_ARGS__; return true; } catch (...) { return false; } }()
+
+#define DOCTEST_WARN_THROWS_MESSAGE(expr, ...) [&] { try { __VA_ARGS__; return false; } catch (...) { return true; } }()
+#define DOCTEST_CHECK_THROWS_MESSAGE(expr, ...) [&] { try { __VA_ARGS__; return false; } catch (...) { return true; } }()
+#define DOCTEST_REQUIRE_THROWS_MESSAGE(expr, ...) [&] { try { __VA_ARGS__; return false; } catch (...) { return true; } }()
+#define DOCTEST_WARN_THROWS_AS_MESSAGE(expr, ex, ...) [&] { try { expr; } catch (__VA_ARGS__) { return true; } catch (...) { } return false; }()
+#define DOCTEST_CHECK_THROWS_AS_MESSAGE(expr, ex, ...) [&] { try { expr; } catch (__VA_ARGS__) { return true; } catch (...) { } return false; }()
+#define DOCTEST_REQUIRE_THROWS_AS_MESSAGE(expr, ex, ...) [&] { try { expr; } catch (__VA_ARGS__) { return true; } catch (...) { } return false; }()
+#define DOCTEST_WARN_NOTHROW_MESSAGE(expr, ...) [&] { try { __VA_ARGS__; return true; } catch (...) { return false; } }()
+#define DOCTEST_CHECK_NOTHROW_MESSAGE(expr, ...) [&] { try { __VA_ARGS__; return true; } catch (...) { return false; } }()
+#define DOCTEST_REQUIRE_NOTHROW_MESSAGE(expr, ...) [&] { try { __VA_ARGS__; return true; } catch (...) { return false; } }()
+
+#endif // DOCTEST_CONFIG_NO_EXCEPTIONS
+
+#else // DOCTEST_CONFIG_EVALUATE_ASSERTS_EVEN_WHEN_DISABLED
+
+#define DOCTEST_WARN(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_CHECK(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_REQUIRE(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_WARN_FALSE(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_CHECK_FALSE(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_REQUIRE_FALSE(...) DOCTEST_FUNC_EMPTY
+
+#define DOCTEST_WARN_MESSAGE(cond, ...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_CHECK_MESSAGE(cond, ...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_REQUIRE_MESSAGE(cond, ...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_WARN_FALSE_MESSAGE(cond, ...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_CHECK_FALSE_MESSAGE(cond, ...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_REQUIRE_FALSE_MESSAGE(cond, ...) DOCTEST_FUNC_EMPTY
+
+#define DOCTEST_WARN_EQ(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_CHECK_EQ(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_REQUIRE_EQ(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_WARN_NE(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_CHECK_NE(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_REQUIRE_NE(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_WARN_GT(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_CHECK_GT(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_REQUIRE_GT(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_WARN_LT(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_CHECK_LT(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_REQUIRE_LT(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_WARN_GE(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_CHECK_GE(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_REQUIRE_GE(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_WARN_LE(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_CHECK_LE(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_REQUIRE_LE(...) DOCTEST_FUNC_EMPTY
+
+#define DOCTEST_WARN_UNARY(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_CHECK_UNARY(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_REQUIRE_UNARY(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_WARN_UNARY_FALSE(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_CHECK_UNARY_FALSE(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_REQUIRE_UNARY_FALSE(...) DOCTEST_FUNC_EMPTY
+
+#ifndef DOCTEST_CONFIG_NO_EXCEPTIONS
+
+#define DOCTEST_WARN_THROWS(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_CHECK_THROWS(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_REQUIRE_THROWS(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_WARN_THROWS_AS(expr, ...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_CHECK_THROWS_AS(expr, ...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_REQUIRE_THROWS_AS(expr, ...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_WARN_THROWS_WITH(expr, ...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_CHECK_THROWS_WITH(expr, ...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_REQUIRE_THROWS_WITH(expr, ...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_WARN_THROWS_WITH_AS(expr, with, ...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_CHECK_THROWS_WITH_AS(expr, with, ...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_REQUIRE_THROWS_WITH_AS(expr, with, ...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_WARN_NOTHROW(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_CHECK_NOTHROW(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_REQUIRE_NOTHROW(...) DOCTEST_FUNC_EMPTY
+
+#define DOCTEST_WARN_THROWS_MESSAGE(expr, ...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_CHECK_THROWS_MESSAGE(expr, ...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_REQUIRE_THROWS_MESSAGE(expr, ...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_WARN_THROWS_AS_MESSAGE(expr, ex, ...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_CHECK_THROWS_AS_MESSAGE(expr, ex, ...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_REQUIRE_THROWS_AS_MESSAGE(expr, ex, ...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_WARN_THROWS_WITH_MESSAGE(expr, with, ...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_CHECK_THROWS_WITH_MESSAGE(expr, with, ...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_REQUIRE_THROWS_WITH_MESSAGE(expr, with, ...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_WARN_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_CHECK_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_REQUIRE_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_WARN_NOTHROW_MESSAGE(expr, ...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_CHECK_NOTHROW_MESSAGE(expr, ...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_REQUIRE_NOTHROW_MESSAGE(expr, ...) DOCTEST_FUNC_EMPTY
+
+#endif // DOCTEST_CONFIG_NO_EXCEPTIONS
+
+#endif // DOCTEST_CONFIG_EVALUATE_ASSERTS_EVEN_WHEN_DISABLED
 
 #endif // DOCTEST_CONFIG_DISABLE
 
+#ifdef DOCTEST_CONFIG_NO_EXCEPTIONS
+
+#ifdef DOCTEST_CONFIG_NO_EXCEPTIONS_BUT_WITH_ALL_ASSERTS
+#define DOCTEST_EXCEPTION_EMPTY_FUNC DOCTEST_FUNC_EMPTY
+#else // DOCTEST_CONFIG_NO_EXCEPTIONS_BUT_WITH_ALL_ASSERTS
+#define DOCTEST_EXCEPTION_EMPTY_FUNC [] { static_assert(false, "Exceptions are disabled! " \
+    "Use DOCTEST_CONFIG_NO_EXCEPTIONS_BUT_WITH_ALL_ASSERTS if you want to compile with exceptions disabled."); return false; }()
+
+#undef DOCTEST_REQUIRE
+#undef DOCTEST_REQUIRE_FALSE
+#undef DOCTEST_REQUIRE_MESSAGE
+#undef DOCTEST_REQUIRE_FALSE_MESSAGE
+#undef DOCTEST_REQUIRE_EQ
+#undef DOCTEST_REQUIRE_NE
+#undef DOCTEST_REQUIRE_GT
+#undef DOCTEST_REQUIRE_LT
+#undef DOCTEST_REQUIRE_GE
+#undef DOCTEST_REQUIRE_LE
+#undef DOCTEST_REQUIRE_UNARY
+#undef DOCTEST_REQUIRE_UNARY_FALSE
+
+#define DOCTEST_REQUIRE DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_REQUIRE_FALSE DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_REQUIRE_MESSAGE DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_REQUIRE_FALSE_MESSAGE DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_REQUIRE_EQ DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_REQUIRE_NE DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_REQUIRE_GT DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_REQUIRE_LT DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_REQUIRE_GE DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_REQUIRE_LE DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_REQUIRE_UNARY DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_REQUIRE_UNARY_FALSE DOCTEST_EXCEPTION_EMPTY_FUNC
+
+#endif // DOCTEST_CONFIG_NO_EXCEPTIONS_BUT_WITH_ALL_ASSERTS
+
+#define DOCTEST_WARN_THROWS(...) DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_CHECK_THROWS(...) DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_REQUIRE_THROWS(...) DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_WARN_THROWS_AS(expr, ...) DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_CHECK_THROWS_AS(expr, ...) DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_REQUIRE_THROWS_AS(expr, ...) DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_WARN_THROWS_WITH(expr, ...) DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_CHECK_THROWS_WITH(expr, ...) DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_REQUIRE_THROWS_WITH(expr, ...) DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_WARN_THROWS_WITH_AS(expr, with, ...) DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_CHECK_THROWS_WITH_AS(expr, with, ...) DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_REQUIRE_THROWS_WITH_AS(expr, with, ...) DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_WARN_NOTHROW(...) DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_CHECK_NOTHROW(...) DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_REQUIRE_NOTHROW(...) DOCTEST_EXCEPTION_EMPTY_FUNC
+
+#define DOCTEST_WARN_THROWS_MESSAGE(expr, ...) DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_CHECK_THROWS_MESSAGE(expr, ...) DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_REQUIRE_THROWS_MESSAGE(expr, ...) DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_WARN_THROWS_AS_MESSAGE(expr, ex, ...) DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_CHECK_THROWS_AS_MESSAGE(expr, ex, ...) DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_REQUIRE_THROWS_AS_MESSAGE(expr, ex, ...) DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_WARN_THROWS_WITH_MESSAGE(expr, with, ...) DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_CHECK_THROWS_WITH_MESSAGE(expr, with, ...) DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_REQUIRE_THROWS_WITH_MESSAGE(expr, with, ...) DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_WARN_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_CHECK_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_REQUIRE_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_WARN_NOTHROW_MESSAGE(expr, ...) DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_CHECK_NOTHROW_MESSAGE(expr, ...) DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_REQUIRE_NOTHROW_MESSAGE(expr, ...) DOCTEST_EXCEPTION_EMPTY_FUNC
+
+#endif // DOCTEST_CONFIG_NO_EXCEPTIONS
+
 // clang-format off
 // KEPT FOR BACKWARDS COMPATIBILITY - FORWARDING TO THE RIGHT MACROS
 #define DOCTEST_FAST_WARN_EQ             DOCTEST_WARN_EQ
@@ -2619,11 +2983,12 @@ int registerReporter(const char* name, int priority, bool isReporter) {
 // clang-format on
 
 // == SHORT VERSIONS OF THE MACROS
-#if !defined(DOCTEST_CONFIG_NO_SHORT_MACRO_NAMES)
+#ifndef DOCTEST_CONFIG_NO_SHORT_MACRO_NAMES
 
 #define TEST_CASE(name) DOCTEST_TEST_CASE(name)
 #define TEST_CASE_CLASS(name) DOCTEST_TEST_CASE_CLASS(name)
 #define TEST_CASE_FIXTURE(x, name) DOCTEST_TEST_CASE_FIXTURE(x, name)
+#define TYPE_TO_STRING_AS(str, ...) DOCTEST_TYPE_TO_STRING_AS(str, __VA_ARGS__)
 #define TYPE_TO_STRING(...) DOCTEST_TYPE_TO_STRING(__VA_ARGS__)
 #define TEST_CASE_TEMPLATE(name, T, ...) DOCTEST_TEST_CASE_TEMPLATE(name, T, __VA_ARGS__)
 #define TEST_CASE_TEMPLATE_DEFINE(name, T, id) DOCTEST_TEST_CASE_TEMPLATE_DEFINE(name, T, id)
@@ -2756,39 +3121,19 @@ int registerReporter(const char* name, int priority, bool isReporter) {
 
 #endif // DOCTEST_CONFIG_NO_SHORT_MACRO_NAMES
 
-#if !defined(DOCTEST_CONFIG_DISABLE)
+#ifndef DOCTEST_CONFIG_DISABLE
 
 // this is here to clear the 'current test suite' for the current translation unit - at the top
 DOCTEST_TEST_SUITE_END();
 
-// add stringification for primitive/fundamental types
-namespace doctest { namespace detail {
-    DOCTEST_TYPE_TO_STRING_IMPL(bool)
-    DOCTEST_TYPE_TO_STRING_IMPL(float)
-    DOCTEST_TYPE_TO_STRING_IMPL(double)
-    DOCTEST_TYPE_TO_STRING_IMPL(long double)
-    DOCTEST_TYPE_TO_STRING_IMPL(char)
-    DOCTEST_TYPE_TO_STRING_IMPL(signed char)
-    DOCTEST_TYPE_TO_STRING_IMPL(unsigned char)
-#if !DOCTEST_MSVC || defined(_NATIVE_WCHAR_T_DEFINED)
-    DOCTEST_TYPE_TO_STRING_IMPL(wchar_t)
-#endif // not MSVC or wchar_t support enabled
-    DOCTEST_TYPE_TO_STRING_IMPL(short int)
-    DOCTEST_TYPE_TO_STRING_IMPL(unsigned short int)
-    DOCTEST_TYPE_TO_STRING_IMPL(int)
-    DOCTEST_TYPE_TO_STRING_IMPL(unsigned int)
-    DOCTEST_TYPE_TO_STRING_IMPL(long int)
-    DOCTEST_TYPE_TO_STRING_IMPL(unsigned long int)
-    DOCTEST_TYPE_TO_STRING_IMPL(long long int)
-    DOCTEST_TYPE_TO_STRING_IMPL(unsigned long long int)
-}} // namespace doctest::detail
-
 #endif // DOCTEST_CONFIG_DISABLE
 
 DOCTEST_CLANG_SUPPRESS_WARNING_POP
 DOCTEST_MSVC_SUPPRESS_WARNING_POP
 DOCTEST_GCC_SUPPRESS_WARNING_POP
 
+DOCTEST_SUPPRESS_COMMON_WARNINGS_POP
+
 #endif // DOCTEST_LIBRARY_INCLUDED
 
 #ifndef DOCTEST_SINGLE_HEADER
@@ -2808,13 +3153,11 @@ DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wunused-macros")
 
 DOCTEST_CLANG_SUPPRESS_WARNING_POP
 
+DOCTEST_SUPPRESS_COMMON_WARNINGS_PUSH
+
 DOCTEST_CLANG_SUPPRESS_WARNING_PUSH
-DOCTEST_CLANG_SUPPRESS_WARNING("-Wunknown-pragmas")
-DOCTEST_CLANG_SUPPRESS_WARNING("-Wpadded")
-DOCTEST_CLANG_SUPPRESS_WARNING("-Wweak-vtables")
 DOCTEST_CLANG_SUPPRESS_WARNING("-Wglobal-constructors")
 DOCTEST_CLANG_SUPPRESS_WARNING("-Wexit-time-destructors")
-DOCTEST_CLANG_SUPPRESS_WARNING("-Wmissing-prototypes")
 DOCTEST_CLANG_SUPPRESS_WARNING("-Wsign-conversion")
 DOCTEST_CLANG_SUPPRESS_WARNING("-Wshorten-64-to-32")
 DOCTEST_CLANG_SUPPRESS_WARNING("-Wmissing-variable-declarations")
@@ -2822,65 +3165,35 @@ DOCTEST_CLANG_SUPPRESS_WARNING("-Wswitch")
 DOCTEST_CLANG_SUPPRESS_WARNING("-Wswitch-enum")
 DOCTEST_CLANG_SUPPRESS_WARNING("-Wcovered-switch-default")
 DOCTEST_CLANG_SUPPRESS_WARNING("-Wmissing-noreturn")
-DOCTEST_CLANG_SUPPRESS_WARNING("-Wunused-local-typedef")
 DOCTEST_CLANG_SUPPRESS_WARNING("-Wdisabled-macro-expansion")
 DOCTEST_CLANG_SUPPRESS_WARNING("-Wmissing-braces")
 DOCTEST_CLANG_SUPPRESS_WARNING("-Wmissing-field-initializers")
-DOCTEST_CLANG_SUPPRESS_WARNING("-Wc++98-compat")
-DOCTEST_CLANG_SUPPRESS_WARNING("-Wc++98-compat-pedantic")
 DOCTEST_CLANG_SUPPRESS_WARNING("-Wunused-member-function")
 DOCTEST_CLANG_SUPPRESS_WARNING("-Wnonportable-system-include-path")
 
 DOCTEST_GCC_SUPPRESS_WARNING_PUSH
-DOCTEST_GCC_SUPPRESS_WARNING("-Wunknown-pragmas")
-DOCTEST_GCC_SUPPRESS_WARNING("-Wpragmas")
 DOCTEST_GCC_SUPPRESS_WARNING("-Wconversion")
-DOCTEST_GCC_SUPPRESS_WARNING("-Weffc++")
 DOCTEST_GCC_SUPPRESS_WARNING("-Wsign-conversion")
-DOCTEST_GCC_SUPPRESS_WARNING("-Wstrict-overflow")
-DOCTEST_GCC_SUPPRESS_WARNING("-Wstrict-aliasing")
 DOCTEST_GCC_SUPPRESS_WARNING("-Wmissing-field-initializers")
 DOCTEST_GCC_SUPPRESS_WARNING("-Wmissing-braces")
-DOCTEST_GCC_SUPPRESS_WARNING("-Wmissing-declarations")
 DOCTEST_GCC_SUPPRESS_WARNING("-Wswitch")
 DOCTEST_GCC_SUPPRESS_WARNING("-Wswitch-enum")
 DOCTEST_GCC_SUPPRESS_WARNING("-Wswitch-default")
 DOCTEST_GCC_SUPPRESS_WARNING("-Wunsafe-loop-optimizations")
 DOCTEST_GCC_SUPPRESS_WARNING("-Wold-style-cast")
-DOCTEST_GCC_SUPPRESS_WARNING("-Wunused-local-typedefs")
-DOCTEST_GCC_SUPPRESS_WARNING("-Wuseless-cast")
 DOCTEST_GCC_SUPPRESS_WARNING("-Wunused-function")
 DOCTEST_GCC_SUPPRESS_WARNING("-Wmultiple-inheritance")
-DOCTEST_GCC_SUPPRESS_WARNING("-Wnoexcept")
 DOCTEST_GCC_SUPPRESS_WARNING("-Wsuggest-attribute")
 
 DOCTEST_MSVC_SUPPRESS_WARNING_PUSH
-DOCTEST_MSVC_SUPPRESS_WARNING(4616) // invalid compiler warning
-DOCTEST_MSVC_SUPPRESS_WARNING(4619) // invalid compiler warning
-DOCTEST_MSVC_SUPPRESS_WARNING(4996) // The compiler encountered a deprecated declaration
 DOCTEST_MSVC_SUPPRESS_WARNING(4267) // 'var' : conversion from 'x' to 'y', possible loss of data
-DOCTEST_MSVC_SUPPRESS_WARNING(4706) // assignment within conditional expression
-DOCTEST_MSVC_SUPPRESS_WARNING(4512) // 'class' : assignment operator could not be generated
-DOCTEST_MSVC_SUPPRESS_WARNING(4127) // conditional expression is constant
 DOCTEST_MSVC_SUPPRESS_WARNING(4530) // C++ exception handler used, but unwind semantics not enabled
 DOCTEST_MSVC_SUPPRESS_WARNING(4577) // 'noexcept' used with no exception handling mode specified
 DOCTEST_MSVC_SUPPRESS_WARNING(4774) // format string expected in argument is not a string literal
 DOCTEST_MSVC_SUPPRESS_WARNING(4365) // conversion from 'int' to 'unsigned', signed/unsigned mismatch
-DOCTEST_MSVC_SUPPRESS_WARNING(4820) // padding in structs
-DOCTEST_MSVC_SUPPRESS_WARNING(4640) // construction of local static object is not thread-safe
 DOCTEST_MSVC_SUPPRESS_WARNING(5039) // pointer to potentially throwing function passed to extern C
-DOCTEST_MSVC_SUPPRESS_WARNING(5045) // Spectre mitigation stuff
-DOCTEST_MSVC_SUPPRESS_WARNING(4626) // assignment operator was implicitly defined as deleted
-DOCTEST_MSVC_SUPPRESS_WARNING(5027) // move assignment operator was implicitly defined as deleted
-DOCTEST_MSVC_SUPPRESS_WARNING(5026) // move constructor was implicitly defined as deleted
-DOCTEST_MSVC_SUPPRESS_WARNING(4625) // copy constructor was implicitly defined as deleted
 DOCTEST_MSVC_SUPPRESS_WARNING(4800) // forcing value to bool 'true' or 'false' (performance warning)
-// static analysis
-DOCTEST_MSVC_SUPPRESS_WARNING(26439) // This kind of function may not throw. Declare it 'noexcept'
-DOCTEST_MSVC_SUPPRESS_WARNING(26495) // Always initialize a member variable
-DOCTEST_MSVC_SUPPRESS_WARNING(26451) // Arithmetic overflow ...
-DOCTEST_MSVC_SUPPRESS_WARNING(26444) // Avoid unnamed objects with custom construction and dtor...
-DOCTEST_MSVC_SUPPRESS_WARNING(26812) // Prefer 'enum class' over 'enum'
+DOCTEST_MSVC_SUPPRESS_WARNING(5245) // unreferenced function with internal linkage has been removed
 
 DOCTEST_MAKE_STD_HEADERS_CLEAN_FROM_WARNINGS_ON_WALL_BEGIN
 
@@ -2888,7 +3201,7 @@ DOCTEST_MAKE_STD_HEADERS_CLEAN_FROM_WARNINGS_ON_WALL_BEGIN
 #include <ctime>
 #include <cmath>
 #include <climits>
-// borland (Embarcadero) compiler requires math.h and not cmath - https://github.com/onqtam/doctest/pull/37
+// borland (Embarcadero) compiler requires math.h and not cmath - https://github.com/doctest/doctest/pull/37
 #ifdef __BORLANDC__
 #include <math.h>
 #endif // __BORLANDC__
@@ -2900,20 +3213,33 @@ DOCTEST_MAKE_STD_HEADERS_CLEAN_FROM_WARNINGS_ON_WALL_BEGIN
 #include <utility>
 #include <fstream>
 #include <sstream>
+#ifndef DOCTEST_CONFIG_NO_INCLUDE_IOSTREAM
 #include <iostream>
+#endif // DOCTEST_CONFIG_NO_INCLUDE_IOSTREAM
 #include <algorithm>
 #include <iomanip>
 #include <vector>
+#ifndef DOCTEST_CONFIG_NO_MULTITHREADING
 #include <atomic>
 #include <mutex>
+#define DOCTEST_DECLARE_MUTEX(name) std::mutex name;
+#define DOCTEST_DECLARE_STATIC_MUTEX(name) static DOCTEST_DECLARE_MUTEX(name)
+#define DOCTEST_LOCK_MUTEX(name) std::lock_guard<std::mutex> DOCTEST_ANONYMOUS(DOCTEST_ANON_LOCK_)(name);
+#else // DOCTEST_CONFIG_NO_MULTITHREADING
+#define DOCTEST_DECLARE_MUTEX(name)
+#define DOCTEST_DECLARE_STATIC_MUTEX(name)
+#define DOCTEST_LOCK_MUTEX(name)
+#endif // DOCTEST_CONFIG_NO_MULTITHREADING
 #include <set>
 #include <map>
+#include <unordered_set>
 #include <exception>
 #include <stdexcept>
 #include <csignal>
 #include <cfloat>
 #include <cctype>
 #include <cstdint>
+#include <string>
 
 #ifdef DOCTEST_PLATFORM_MAC
 #include <sys/types.h>
@@ -2926,9 +3252,11 @@ DOCTEST_MAKE_STD_HEADERS_CLEAN_FROM_WARNINGS_ON_WALL_BEGIN
 // defines for a leaner windows.h
 #ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
+#define DOCTEST_UNDEF_WIN32_LEAN_AND_MEAN
 #endif // WIN32_LEAN_AND_MEAN
 #ifndef NOMINMAX
 #define NOMINMAX
+#define DOCTEST_UNDEF_NOMINMAX
 #endif // NOMINMAX
 
 // not sure what AfxWin.h is for - here I do what Catch does
@@ -2946,7 +3274,7 @@ DOCTEST_MAKE_STD_HEADERS_CLEAN_FROM_WARNINGS_ON_WALL_BEGIN
 
 #endif // DOCTEST_PLATFORM_WINDOWS
 
-// this is a fix for https://github.com/onqtam/doctest/issues/348
+// this is a fix for https://github.com/doctest/doctest/issues/348
 // https://mail.gnome.org/archives/xml/2012-January/msg00000.html
 #if !defined(HAVE_UNISTD_H) && !defined(STDOUT_FILENO)
 #define STDOUT_FILENO fileno(stdout)
@@ -2968,8 +3296,12 @@ DOCTEST_MAKE_STD_HEADERS_CLEAN_FROM_WARNINGS_ON_WALL_END
 #endif
 
 #ifndef DOCTEST_THREAD_LOCAL
+#if defined(DOCTEST_CONFIG_NO_MULTITHREADING) || DOCTEST_MSVC && (DOCTEST_MSVC < DOCTEST_COMPILER(19, 0, 0))
+#define DOCTEST_THREAD_LOCAL
+#else // DOCTEST_MSVC
 #define DOCTEST_THREAD_LOCAL thread_local
-#endif
+#endif // DOCTEST_MSVC
+#endif // DOCTEST_THREAD_LOCAL
 
 #ifndef DOCTEST_MULTI_LANE_ATOMICS_THREAD_LANES
 #define DOCTEST_MULTI_LANE_ATOMICS_THREAD_LANES 32
@@ -2989,12 +3321,40 @@ DOCTEST_MAKE_STD_HEADERS_CLEAN_FROM_WARNINGS_ON_WALL_END
 #define DOCTEST_CONFIG_NO_MULTI_LANE_ATOMICS
 #endif
 
+#ifndef DOCTEST_CDECL
+#define DOCTEST_CDECL __cdecl
+#endif
+
 namespace doctest {
 
 bool is_running_in_test = false;
 
-namespace {
-    using namespace detail;
+namespace {
+    using namespace detail;
+
+    template <typename Ex>
+    DOCTEST_NORETURN void throw_exception(Ex const& e) {
+#ifndef DOCTEST_CONFIG_NO_EXCEPTIONS
+        throw e;
+#else  // DOCTEST_CONFIG_NO_EXCEPTIONS
+#ifdef DOCTEST_CONFIG_HANDLE_EXCEPTION
+        DOCTEST_CONFIG_HANDLE_EXCEPTION(e);
+#else // DOCTEST_CONFIG_HANDLE_EXCEPTION
+#ifndef DOCTEST_CONFIG_NO_INCLUDE_IOSTREAM
+        std::cerr << "doctest will terminate because it needed to throw an exception.\n"
+                  << "The message was: " << e.what() << '\n';
+#endif // DOCTEST_CONFIG_NO_INCLUDE_IOSTREAM
+#endif // DOCTEST_CONFIG_HANDLE_EXCEPTION
+        std::terminate();
+#endif // DOCTEST_CONFIG_NO_EXCEPTIONS
+    }
+
+#ifndef DOCTEST_INTERNAL_ERROR
+#define DOCTEST_INTERNAL_ERROR(msg)                                                                \
+    throw_exception(std::logic_error(                                                              \
+            __FILE__ ":" DOCTEST_TOSTR(__LINE__) ": Internal doctest error: " msg))
+#endif // DOCTEST_INTERNAL_ERROR
+
     // case insensitive strcmp
     int stricmp(const char* a, const char* b) {
         for(;; a++, b++) {
@@ -3004,20 +3364,6 @@ namespace {
         }
     }
 
-    template <typename T>
-    String fpToString(T value, int precision) {
-        std::ostringstream oss;
-        oss << std::setprecision(precision) << std::fixed << value;
-        std::string d = oss.str();
-        size_t      i = d.find_last_not_of('0');
-        if(i != std::string::npos && i != d.size() - 1) {
-            if(d[i] == '.')
-                i++;
-            d = d.substr(0, i + 1);
-        }
-        return d.c_str();
-    }
-
     struct Endianness
     {
         enum Arch
@@ -3038,59 +3384,57 @@ namespace {
 } // namespace
 
 namespace detail {
-    void my_memcpy(void* dest, const void* src, unsigned num) { memcpy(dest, src, num); }
+    class os_ostream {
+        std::vector<std::streampos> stack;
+        std::stringstream           ss;
 
-    String rawMemoryToString(const void* object, unsigned size) {
-        // Reverse order for little endian architectures
-        int i = 0, end = static_cast<int>(size), inc = 1;
-        if(Endianness::which() == Endianness::Little) {
-            i   = end - 1;
-            end = inc = -1;
+    public:
+        std::ostream* push() {
+            stack.push_back(ss.tellp());
+            return &ss;
         }
 
-        unsigned const char* bytes = static_cast<unsigned const char*>(object);
-        std::ostringstream   oss;
-        oss << "0x" << std::setfill('0') << std::hex;
-        for(; i != end; i += inc)
-            oss << std::setw(2) << static_cast<unsigned>(bytes[i]);
-        return oss.str().c_str();
-    }
+        String pop() {
+            if (stack.empty())
+                DOCTEST_INTERNAL_ERROR("TLSS was empty when trying to pop!");
+
+            std::streampos pos = stack.back();
+            stack.pop_back();
+            unsigned sz = static_cast<unsigned>(ss.tellp() - pos);
+            ss.rdbuf()->pubseekpos(pos, std::ios::in | std::ios::out);
+            return String(ss, sz);
+        }
+    };
 
-    DOCTEST_THREAD_LOCAL doctest_thread_local_wrapper<std::ostringstream> wrapped_g_oss; // NOLINT(cert-err58-cpp)
+    DOCTEST_THREAD_LOCAL doctest_thread_local_wrapper<os_ostream> wrapped_g_oss;
 
-    std::ostream* getTlsOss() {
-        auto& g_oss = wrapped_g_oss.get();
-        g_oss.clear(); // there shouldn't be anything worth clearing in the flags
-        g_oss.str(""); // the slow way of resetting a string stream
-        //g_oss.seekp(0); // optimal reset - as seen here: https://stackoverflow.com/a/624291/3162383
-        return &g_oss;
+    std::ostream* tlssPush() {
+        return wrapped_g_oss.get().push();
     }
 
-    String getTlsOssResult() {
-        //g_oss << std::ends; // needed - as shown here: https://stackoverflow.com/a/624291/3162383
-        return wrapped_g_oss.get().str().c_str();
+    String tlssPop() {
+        return wrapped_g_oss.get().pop();
     }
 
 #ifndef DOCTEST_CONFIG_DISABLE
 
 namespace timer_large_integer
 {
-    
+
 #if defined(DOCTEST_PLATFORM_WINDOWS)
-    typedef ULONGLONG type;
+    using type = ULONGLONG;
 #else // DOCTEST_PLATFORM_WINDOWS
-    using namespace std;
-    typedef uint64_t type;
+    using type = std::uint64_t;
 #endif // DOCTEST_PLATFORM_WINDOWS
 }
 
-typedef timer_large_integer::type ticks_t;
+using ticks_t = timer_large_integer::type;
 
 #ifdef DOCTEST_CONFIG_GETCURRENTTICKS
     ticks_t getCurrentTicks() { return DOCTEST_CONFIG_GETCURRENTTICKS(); }
 #elif defined(DOCTEST_PLATFORM_WINDOWS)
     ticks_t getCurrentTicks() {
-        static LARGE_INTEGER hz = {0}, hzo = {0};
+        static LARGE_INTEGER hz = { {0} }, hzo = { {0} };
         if(!hz.QuadPart) {
             QueryPerformanceFrequency(&hz);
             QueryPerformanceCounter(&hzo);
@@ -3122,9 +3466,17 @@ typedef timer_large_integer::type ticks_t;
         ticks_t m_ticks = 0;
     };
 
-#ifdef DOCTEST_CONFIG_NO_MULTI_LANE_ATOMICS
+#ifdef DOCTEST_CONFIG_NO_MULTITHREADING
+    template <typename T>
+    using Atomic = T;
+#else // DOCTEST_CONFIG_NO_MULTITHREADING
+    template <typename T>
+    using Atomic = std::atomic<T>;
+#endif // DOCTEST_CONFIG_NO_MULTITHREADING
+
+#if defined(DOCTEST_CONFIG_NO_MULTI_LANE_ATOMICS) || defined(DOCTEST_CONFIG_NO_MULTITHREADING)
     template <typename T>
-    using AtomicOrMultiLaneAtomic = std::atomic<T>;
+    using MultiLaneAtomic = Atomic<T>;
 #else // DOCTEST_CONFIG_NO_MULTI_LANE_ATOMICS
     // Provides a multilane implementation of an atomic variable that supports add, sub, load,
     // store. Instead of using a single atomic variable, this splits up into multiple ones,
@@ -3141,8 +3493,8 @@ typedef timer_large_integer::type ticks_t;
     {
         struct CacheLineAlignedAtomic
         {
-            std::atomic<T> atomic{};
-            char padding[DOCTEST_MULTI_LANE_ATOMICS_CACHE_LINE_SIZE - sizeof(std::atomic<T>)];
+            Atomic<T> atomic{};
+            char padding[DOCTEST_MULTI_LANE_ATOMICS_CACHE_LINE_SIZE - sizeof(Atomic<T>)];
         };
         CacheLineAlignedAtomic m_atomics[DOCTEST_MULTI_LANE_ATOMICS_THREAD_LANES];
 
@@ -3172,7 +3524,7 @@ typedef timer_large_integer::type ticks_t;
             return result;
         }
 
-        T operator=(T desired) DOCTEST_NOEXCEPT {
+        T operator=(T desired) DOCTEST_NOEXCEPT { // lgtm [cpp/assignment-does-not-return-this]
             store(desired);
             return desired;
         }
@@ -3186,7 +3538,6 @@ typedef timer_large_integer::type ticks_t;
         }
 
     private:
-        // TODO: upstream the change to doctest : Fix the typo (word "degrade")
         // Each thread has a different atomic that it operates on. If more than NumLanes threads
         // use this, some will use the same atomic. So performance will degrade a bit, but still
         // everything will work.
@@ -3199,24 +3550,21 @@ typedef timer_large_integer::type ticks_t;
         //    assigned in a round-robin fashion.
         // 3. This tlsLaneIdx is stored in the thread local data, so it is directly available with
         //    little overhead.
-        std::atomic<T>& myAtomic() DOCTEST_NOEXCEPT {
-            static std::atomic<size_t> laneCounter;
+        Atomic<T>& myAtomic() DOCTEST_NOEXCEPT {
+            static Atomic<size_t> laneCounter;
             DOCTEST_THREAD_LOCAL size_t tlsLaneIdx =
                     laneCounter++ % DOCTEST_MULTI_LANE_ATOMICS_THREAD_LANES;
 
             return m_atomics[tlsLaneIdx].atomic;
         }
     };
-
-    template <typename T>
-    using AtomicOrMultiLaneAtomic = MultiLaneAtomic<T>;
 #endif // DOCTEST_CONFIG_NO_MULTI_LANE_ATOMICS
 
     // this holds both parameters from the command line and runtime data for tests
     struct ContextState : ContextOptions, TestRunStats, CurrentTestCaseStats
     {
-        AtomicOrMultiLaneAtomic<int> numAssertsCurrentTest_atomic;
-        AtomicOrMultiLaneAtomic<int> numAssertsFailedCurrentTest_atomic;
+        MultiLaneAtomic<int> numAssertsCurrentTest_atomic;
+        MultiLaneAtomic<int> numAssertsFailedCurrentTest_atomic;
 
         std::vector<std::vector<String>> filters = decltype(filters)(9); // 9 different filters
 
@@ -3229,11 +3577,12 @@ typedef timer_large_integer::type ticks_t;
         std::vector<String> stringifiedContexts; // logging from INFO() due to an exception
 
         // stuff for subcases
-        std::vector<SubcaseSignature>     subcasesStack;
-        std::set<decltype(subcasesStack)> subcasesPassed;
-        int                               subcasesCurrentMaxLevel;
-        bool                              should_reenter;
-        std::atomic<bool>                 shouldLogCurrentException;
+        bool reachedLeaf;
+        std::vector<SubcaseSignature> subcaseStack;
+        std::vector<SubcaseSignature> nextSubcaseStack;
+        std::unordered_set<unsigned long long> fullyTraversedSubcases;
+        size_t currentSubcaseDepth;
+        Atomic<bool> shouldLogCurrentException;
 
         void resetRunData() {
             numTestCases                = 0;
@@ -3283,7 +3632,8 @@ typedef timer_large_integer::type ticks_t;
                               (TestCaseFailureReason::FailedExactlyNumTimes & failure_flags);
 
             // if any subcase has failed - the whole test case has failed
-            if(failure_flags && !ok_to_fail)
+            testCaseSuccess = !(failure_flags && !ok_to_fail);
+            if(!testCaseSuccess)
                 numTestCasesFailed++;
         }
     };
@@ -3298,23 +3648,37 @@ typedef timer_large_integer::type ticks_t;
 #endif // DOCTEST_CONFIG_DISABLE
 } // namespace detail
 
-void String::setOnHeap() { *reinterpret_cast<unsigned char*>(&buf[last]) = 128; }
-void String::setLast(unsigned in) { buf[last] = char(in); }
+char* String::allocate(size_type sz) {
+    if (sz <= last) {
+        buf[sz] = '\0';
+        setLast(last - sz);
+        return buf;
+    } else {
+        setOnHeap();
+        data.size = sz;
+        data.capacity = data.size + 1;
+        data.ptr = new char[data.capacity];
+        data.ptr[sz] = '\0';
+        return data.ptr;
+    }
+}
+
+void String::setOnHeap() noexcept { *reinterpret_cast<unsigned char*>(&buf[last]) = 128; }
+void String::setLast(size_type in) noexcept { buf[last] = char(in); }
+void String::setSize(size_type sz) noexcept {
+    if (isOnStack()) { buf[sz] = '\0'; setLast(last - sz); }
+    else { data.ptr[sz] = '\0'; data.size = sz; }
+}
 
 void String::copy(const String& other) {
-    using namespace std;
     if(other.isOnStack()) {
         memcpy(buf, other.buf, len);
     } else {
-        setOnHeap();
-        data.size     = other.data.size;
-        data.capacity = data.size + 1;
-        data.ptr      = new char[data.capacity];
-        memcpy(data.ptr, other.data.ptr, data.size + 1);
+        memcpy(allocate(other.data.size), other.data.ptr, other.data.size);
     }
 }
 
-String::String() {
+String::String() noexcept {
     buf[0] = '\0';
     setLast();
 }
@@ -3322,26 +3686,17 @@ String::String() {
 String::~String() {
     if(!isOnStack())
         delete[] data.ptr;
-    // NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks)
-}
+} // NOLINT(clang-analyzer-cplusplus.NewDeleteLeaks)
 
 String::String(const char* in)
         : String(in, strlen(in)) {}
 
-String::String(const char* in, unsigned in_size) {
-    using namespace std;
-    if(in_size <= last) {
-        memcpy(buf, in, in_size);
-        buf[in_size] = '\0';
-        setLast(last - in_size);
-    } else {
-        setOnHeap();
-        data.size     = in_size;
-        data.capacity = data.size + 1;
-        data.ptr      = new char[data.capacity];
-        memcpy(data.ptr, in, in_size);
-        data.ptr[in_size] = '\0';
-    }
+String::String(const char* in, size_type in_size) {
+    memcpy(allocate(in_size), in, in_size);
+}
+
+String::String(std::istream& in, size_type in_size) {
+    in.read(allocate(in_size), in_size);
 }
 
 String::String(const String& other) { copy(other); }
@@ -3358,10 +3713,9 @@ String& String::operator=(const String& other) {
 }
 
 String& String::operator+=(const String& other) {
-    const unsigned my_old_size = size();
-    const unsigned other_size  = other.size();
-    const unsigned total_size  = my_old_size + other_size;
-    using namespace std;
+    const size_type my_old_size = size();
+    const size_type other_size  = other.size();
+    const size_type total_size  = my_old_size + other_size;
     if(isOnStack()) {
         if(total_size < len) {
             // append to the current stack space
@@ -3408,18 +3762,13 @@ String& String::operator+=(const String& other) {
     return *this;
 }
 
-// NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks)
-String String::operator+(const String& other) const { return String(*this) += other; }
-
-String::String(String&& other) {
-    using namespace std;
+String::String(String&& other) noexcept {
     memcpy(buf, other.buf, len);
     other.buf[0] = '\0';
     other.setLast();
 }
 
-String& String::operator=(String&& other) {
-    using namespace std;
+String& String::operator=(String&& other) noexcept {
     if(this != &other) {
         if(!isOnStack())
             delete[] data.ptr;
@@ -3430,30 +3779,60 @@ String& String::operator=(String&& other) {
     return *this;
 }
 
-char String::operator[](unsigned i) const {
-    return const_cast<String*>(this)->operator[](i); // NOLINT
+char String::operator[](size_type i) const {
+    return const_cast<String*>(this)->operator[](i);
 }
 
-char& String::operator[](unsigned i) {
+char& String::operator[](size_type i) {
     if(isOnStack())
         return reinterpret_cast<char*>(buf)[i];
     return data.ptr[i];
 }
 
 DOCTEST_GCC_SUPPRESS_WARNING_WITH_PUSH("-Wmaybe-uninitialized")
-unsigned String::size() const {
+String::size_type String::size() const {
     if(isOnStack())
-        return last - (unsigned(buf[last]) & 31); // using "last" would work only if "len" is 32
+        return last - (size_type(buf[last]) & 31); // using "last" would work only if "len" is 32
     return data.size;
 }
 DOCTEST_GCC_SUPPRESS_WARNING_POP
 
-unsigned String::capacity() const {
+String::size_type String::capacity() const {
     if(isOnStack())
         return len;
     return data.capacity;
 }
 
+String String::substr(size_type pos, size_type cnt) && {
+    cnt = std::min(cnt, size() - 1 - pos);
+    char* cptr = c_str();
+    memmove(cptr, cptr + pos, cnt);
+    setSize(cnt);
+    return std::move(*this);
+}
+
+String String::substr(size_type pos, size_type cnt) const & {
+    cnt = std::min(cnt, size() - 1 - pos);
+    return String{ c_str() + pos, cnt };
+}
+
+String::size_type String::find(char ch, size_type pos) const {
+    const char* begin = c_str();
+    const char* end = begin + size();
+    const char* it = begin + pos;
+    for (; it < end && *it != ch; it++);
+    if (it < end) { return static_cast<size_type>(it - begin); }
+    else { return npos; }
+}
+
+String::size_type String::rfind(char ch, size_type pos) const {
+    const char* begin = c_str();
+    const char* it = begin + std::min(pos, size() - 1);
+    for (; it >= begin && *it != ch; it--);
+    if (it >= begin) { return static_cast<size_type>(it - begin); }
+    else { return npos; }
+}
+
 int String::compare(const char* other, bool no_case) const {
     if(no_case)
         return doctest::stricmp(c_str(), other);
@@ -3464,17 +3843,32 @@ int String::compare(const String& other, bool no_case) const {
     return compare(other.c_str(), no_case);
 }
 
-// clang-format off
+String operator+(const String& lhs, const String& rhs) { return  String(lhs) += rhs; }
+
 bool operator==(const String& lhs, const String& rhs) { return lhs.compare(rhs) == 0; }
 bool operator!=(const String& lhs, const String& rhs) { return lhs.compare(rhs) != 0; }
 bool operator< (const String& lhs, const String& rhs) { return lhs.compare(rhs) < 0; }
 bool operator> (const String& lhs, const String& rhs) { return lhs.compare(rhs) > 0; }
 bool operator<=(const String& lhs, const String& rhs) { return (lhs != rhs) ? lhs.compare(rhs) < 0 : true; }
 bool operator>=(const String& lhs, const String& rhs) { return (lhs != rhs) ? lhs.compare(rhs) > 0 : true; }
-// clang-format on
 
 std::ostream& operator<<(std::ostream& s, const String& in) { return s << in.c_str(); }
 
+Contains::Contains(const String& str) : string(str) { }
+
+bool Contains::checkWith(const String& other) const {
+    return strstr(other.c_str(), string.c_str()) != nullptr;
+}
+
+String toString(const Contains& in) {
+    return "Contains( " + in.string + " )";
+}
+
+bool operator==(const String& lhs, const Contains& rhs) { return rhs.checkWith(lhs); }
+bool operator==(const Contains& lhs, const String& rhs) { return lhs.checkWith(rhs); }
+bool operator!=(const String& lhs, const Contains& rhs) { return !rhs.checkWith(lhs); }
+bool operator!=(const Contains& lhs, const String& rhs) { return !lhs.checkWith(rhs); }
+
 namespace {
     void color_to_stream(std::ostream&, Color::Enum) DOCTEST_BRANCH_ON_DISABLED({}, ;)
 } // namespace
@@ -3488,64 +3882,42 @@ namespace Color {
 
 // clang-format off
 const char* assertString(assertType::Enum at) {
-    DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(4062) // enum 'x' in switch of enum 'y' is not handled
-    switch(at) {  //!OCLINT missing default in switch statements
-        case assertType::DT_WARN                    : return "WARN";
-        case assertType::DT_CHECK                   : return "CHECK";
-        case assertType::DT_REQUIRE                 : return "REQUIRE";
-
-        case assertType::DT_WARN_FALSE              : return "WARN_FALSE";
-        case assertType::DT_CHECK_FALSE             : return "CHECK_FALSE";
-        case assertType::DT_REQUIRE_FALSE           : return "REQUIRE_FALSE";
-
-        case assertType::DT_WARN_THROWS             : return "WARN_THROWS";
-        case assertType::DT_CHECK_THROWS            : return "CHECK_THROWS";
-        case assertType::DT_REQUIRE_THROWS          : return "REQUIRE_THROWS";
-
-        case assertType::DT_WARN_THROWS_AS          : return "WARN_THROWS_AS";
-        case assertType::DT_CHECK_THROWS_AS         : return "CHECK_THROWS_AS";
-        case assertType::DT_REQUIRE_THROWS_AS       : return "REQUIRE_THROWS_AS";
-
-        case assertType::DT_WARN_THROWS_WITH        : return "WARN_THROWS_WITH";
-        case assertType::DT_CHECK_THROWS_WITH       : return "CHECK_THROWS_WITH";
-        case assertType::DT_REQUIRE_THROWS_WITH     : return "REQUIRE_THROWS_WITH";
-
-        case assertType::DT_WARN_THROWS_WITH_AS     : return "WARN_THROWS_WITH_AS";
-        case assertType::DT_CHECK_THROWS_WITH_AS    : return "CHECK_THROWS_WITH_AS";
-        case assertType::DT_REQUIRE_THROWS_WITH_AS  : return "REQUIRE_THROWS_WITH_AS";
-
-        case assertType::DT_WARN_NOTHROW            : return "WARN_NOTHROW";
-        case assertType::DT_CHECK_NOTHROW           : return "CHECK_NOTHROW";
-        case assertType::DT_REQUIRE_NOTHROW         : return "REQUIRE_NOTHROW";
-
-        case assertType::DT_WARN_EQ                 : return "WARN_EQ";
-        case assertType::DT_CHECK_EQ                : return "CHECK_EQ";
-        case assertType::DT_REQUIRE_EQ              : return "REQUIRE_EQ";
-        case assertType::DT_WARN_NE                 : return "WARN_NE";
-        case assertType::DT_CHECK_NE                : return "CHECK_NE";
-        case assertType::DT_REQUIRE_NE              : return "REQUIRE_NE";
-        case assertType::DT_WARN_GT                 : return "WARN_GT";
-        case assertType::DT_CHECK_GT                : return "CHECK_GT";
-        case assertType::DT_REQUIRE_GT              : return "REQUIRE_GT";
-        case assertType::DT_WARN_LT                 : return "WARN_LT";
-        case assertType::DT_CHECK_LT                : return "CHECK_LT";
-        case assertType::DT_REQUIRE_LT              : return "REQUIRE_LT";
-        case assertType::DT_WARN_GE                 : return "WARN_GE";
-        case assertType::DT_CHECK_GE                : return "CHECK_GE";
-        case assertType::DT_REQUIRE_GE              : return "REQUIRE_GE";
-        case assertType::DT_WARN_LE                 : return "WARN_LE";
-        case assertType::DT_CHECK_LE                : return "CHECK_LE";
-        case assertType::DT_REQUIRE_LE              : return "REQUIRE_LE";
-
-        case assertType::DT_WARN_UNARY              : return "WARN_UNARY";
-        case assertType::DT_CHECK_UNARY             : return "CHECK_UNARY";
-        case assertType::DT_REQUIRE_UNARY           : return "REQUIRE_UNARY";
-        case assertType::DT_WARN_UNARY_FALSE        : return "WARN_UNARY_FALSE";
-        case assertType::DT_CHECK_UNARY_FALSE       : return "CHECK_UNARY_FALSE";
-        case assertType::DT_REQUIRE_UNARY_FALSE     : return "REQUIRE_UNARY_FALSE";
+    DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(4061) // enum 'x' in switch of enum 'y' is not explicitly handled
+    #define DOCTEST_GENERATE_ASSERT_TYPE_CASE(assert_type) case assertType::DT_ ## assert_type: return #assert_type
+    #define DOCTEST_GENERATE_ASSERT_TYPE_CASES(assert_type) \
+        DOCTEST_GENERATE_ASSERT_TYPE_CASE(WARN_ ## assert_type); \
+        DOCTEST_GENERATE_ASSERT_TYPE_CASE(CHECK_ ## assert_type); \
+        DOCTEST_GENERATE_ASSERT_TYPE_CASE(REQUIRE_ ## assert_type)
+    switch(at) {
+        DOCTEST_GENERATE_ASSERT_TYPE_CASE(WARN);
+        DOCTEST_GENERATE_ASSERT_TYPE_CASE(CHECK);
+        DOCTEST_GENERATE_ASSERT_TYPE_CASE(REQUIRE);
+
+        DOCTEST_GENERATE_ASSERT_TYPE_CASES(FALSE);
+
+        DOCTEST_GENERATE_ASSERT_TYPE_CASES(THROWS);
+
+        DOCTEST_GENERATE_ASSERT_TYPE_CASES(THROWS_AS);
+
+        DOCTEST_GENERATE_ASSERT_TYPE_CASES(THROWS_WITH);
+
+        DOCTEST_GENERATE_ASSERT_TYPE_CASES(THROWS_WITH_AS);
+
+        DOCTEST_GENERATE_ASSERT_TYPE_CASES(NOTHROW);
+
+        DOCTEST_GENERATE_ASSERT_TYPE_CASES(EQ);
+        DOCTEST_GENERATE_ASSERT_TYPE_CASES(NE);
+        DOCTEST_GENERATE_ASSERT_TYPE_CASES(GT);
+        DOCTEST_GENERATE_ASSERT_TYPE_CASES(LT);
+        DOCTEST_GENERATE_ASSERT_TYPE_CASES(GE);
+        DOCTEST_GENERATE_ASSERT_TYPE_CASES(LE);
+
+        DOCTEST_GENERATE_ASSERT_TYPE_CASES(UNARY);
+        DOCTEST_GENERATE_ASSERT_TYPE_CASES(UNARY_FALSE);
+
+        default: DOCTEST_INTERNAL_ERROR("Tried stringifying invalid assert type!");
     }
     DOCTEST_MSVC_SUPPRESS_WARNING_POP
-    return "";
 }
 // clang-format on
 
@@ -3579,6 +3951,12 @@ const char* skipPathFromFilename(const char* file) {
 DOCTEST_CLANG_SUPPRESS_WARNING_POP
 DOCTEST_GCC_SUPPRESS_WARNING_POP
 
+bool SubcaseSignature::operator==(const SubcaseSignature& other) const {
+    return m_line == other.m_line
+        && std::strcmp(m_file, other.m_file) == 0
+        && m_name == other.m_name;
+}
+
 bool SubcaseSignature::operator<(const SubcaseSignature& other) const {
     if(m_line != other.m_line)
         return m_line < other.m_line;
@@ -3587,45 +3965,53 @@ bool SubcaseSignature::operator<(const SubcaseSignature& other) const {
     return m_name.compare(other.m_name) < 0;
 }
 
-IContextScope::IContextScope()  = default;
-IContextScope::~IContextScope() = default;
+DOCTEST_DEFINE_INTERFACE(IContextScope)
+
+namespace detail {
+    void filldata<const void*>::fill(std::ostream* stream, const void* in) {
+        if (in) { *stream << in; }
+        else { *stream << "nullptr"; }
+    }
+
+    template <typename T>
+    String toStreamLit(T t) {
+        std::ostream* os = tlssPush();
+        os->operator<<(t);
+        return tlssPop();
+    }
+}
 
 #ifdef DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
-String toString(char* in) { return toString(static_cast<const char*>(in)); }
-// NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks)
 String toString(const char* in) { return String("\"") + (in ? in : "{null string}") + "\""; }
 #endif // DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
-String toString(bool in) { return in ? "true" : "false"; }
-String toString(float in) { return fpToString(in, 5) + "f"; }
-String toString(double in) { return fpToString(in, 10); }
-String toString(double long in) { return fpToString(in, 15); }
-
-#define DOCTEST_TO_STRING_OVERLOAD(type, fmt)                                                      \
-    String toString(type in) {                                                                     \
-        char buf[64];                                                                              \
-        std::sprintf(buf, fmt, in);                                                                \
-        return buf;                                                                                \
-    }
-
-DOCTEST_TO_STRING_OVERLOAD(char, "%d")
-DOCTEST_TO_STRING_OVERLOAD(char signed, "%d")
-DOCTEST_TO_STRING_OVERLOAD(char unsigned, "%u")
-DOCTEST_TO_STRING_OVERLOAD(int short, "%d")
-DOCTEST_TO_STRING_OVERLOAD(int short unsigned, "%u")
-DOCTEST_TO_STRING_OVERLOAD(int, "%d")
-DOCTEST_TO_STRING_OVERLOAD(unsigned, "%u")
-DOCTEST_TO_STRING_OVERLOAD(int long, "%ld")
-DOCTEST_TO_STRING_OVERLOAD(int long unsigned, "%lu")
-DOCTEST_TO_STRING_OVERLOAD(int long long, "%lld")
-DOCTEST_TO_STRING_OVERLOAD(int long long unsigned, "%llu")
-
-String toString(std::nullptr_t) { return "NULL"; }
 
 #if DOCTEST_MSVC >= DOCTEST_COMPILER(19, 20, 0)
-// see this issue on why this is needed: https://github.com/onqtam/doctest/issues/183
+// see this issue on why this is needed: https://github.com/doctest/doctest/issues/183
 String toString(const std::string& in) { return in.c_str(); }
 #endif // VS 2019
 
+String toString(String in) { return in; }
+
+String toString(std::nullptr_t) { return "nullptr"; }
+
+String toString(bool in) { return in ? "true" : "false"; }
+
+String toString(float in) { return toStreamLit(in); }
+String toString(double in) { return toStreamLit(in); }
+String toString(double long in) { return toStreamLit(in); }
+
+String toString(char in) { return toStreamLit(static_cast<signed>(in)); }
+String toString(char signed in) { return toStreamLit(static_cast<signed>(in)); }
+String toString(char unsigned in) { return toStreamLit(static_cast<unsigned>(in)); }
+String toString(short in) { return toStreamLit(in); }
+String toString(short unsigned in) { return toStreamLit(in); }
+String toString(signed in) { return toStreamLit(in); }
+String toString(unsigned in) { return toStreamLit(in); }
+String toString(long in) { return toStreamLit(in); }
+String toString(long unsigned in) { return toStreamLit(in); }
+String toString(long long in) { return toStreamLit(in); }
+String toString(long long unsigned in) { return toStreamLit(in); }
+
 Approx::Approx(double value)
         : m_epsilon(static_cast<double>(std::numeric_limits<float>::epsilon()) * 100)
         , m_scale(1.0)
@@ -3665,11 +4051,25 @@ bool operator>(double lhs, const Approx& rhs) { return lhs > rhs.m_value && lhs
 bool operator>(const Approx& lhs, double rhs) { return lhs.m_value > rhs && lhs != rhs; }
 
 String toString(const Approx& in) {
-    // NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks)
-    return String("Approx( ") + doctest::toString(in.m_value) + " )";
+    return "Approx( " + doctest::toString(in.m_value) + " )";
 }
 const ContextOptions* getContextOptions() { return DOCTEST_BRANCH_ON_DISABLED(nullptr, g_cs); }
 
+DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(4738)
+template <typename F>
+IsNaN<F>::operator bool() const {
+    return std::isnan(value) ^ flipped;
+}
+DOCTEST_MSVC_SUPPRESS_WARNING_POP
+template struct DOCTEST_INTERFACE_DEF IsNaN<float>;
+template struct DOCTEST_INTERFACE_DEF IsNaN<double>;
+template struct DOCTEST_INTERFACE_DEF IsNaN<long double>;
+template <typename F>
+String toString(IsNaN<F> in) { return String(in.flipped ? "! " : "") + "IsNaN( " + doctest::toString(in.value) + " )"; }
+String toString(IsNaN<float> in) { return toString<float>(in); }
+String toString(IsNaN<double> in) { return toString<double>(in); }
+String toString(IsNaN<double long> in) { return toString<double long>(in); }
+
 } // namespace doctest
 
 #ifdef DOCTEST_CONFIG_DISABLE
@@ -3679,15 +4079,15 @@ Context::~Context() = default;
 void Context::applyCommandLine(int, const char* const*) {}
 void Context::addFilter(const char*, const char*) {}
 void Context::clearFilters() {}
+void Context::setOption(const char*, bool) {}
 void Context::setOption(const char*, int) {}
 void Context::setOption(const char*, const char*) {}
 bool Context::shouldExit() { return false; }
 void Context::setAsDefaultForAssertsOutOfTestCases() {}
 void Context::setAssertHandler(detail::assert_handler) {}
+void Context::setCout(std::ostream*) {}
 int  Context::run() { return 0; }
 
-IReporter::~IReporter() = default;
-
 int                         IReporter::get_num_active_contexts() { return 0; }
 const IContextScope* const* IReporter::get_active_contexts() { return nullptr; }
 int                         IReporter::get_num_stringified_contexts() { return 0; }
@@ -3720,7 +4120,7 @@ namespace doctest {
 namespace {
     // the int (priority) is part of the key for automatic sorting - sadly one can register a
     // reporter with a duplicate name and a different priority but hopefully that won't happen often :|
-    typedef std::map<std::pair<int, String>, reporterCreatorFunc> reporterMap;
+    using reporterMap = std::map<std::pair<int, String>, reporterCreatorFunc>;
 
     reporterMap& getReporters() {
         static reporterMap data;
@@ -3752,8 +4152,8 @@ namespace detail {
 #ifndef DOCTEST_CONFIG_NO_EXCEPTIONS
     DOCTEST_NORETURN void throwException() {
         g_cs->shouldLogCurrentException = false;
-        throw TestFailureException();
-    } // NOLINT(cert-err60-cpp)
+        throw TestFailureException(); // NOLINT(hicpp-exception-baseclass)
+    }
 #else // DOCTEST_CONFIG_NO_EXCEPTIONS
     void throwException() {}
 #endif // DOCTEST_CONFIG_NO_EXCEPTIONS
@@ -3799,91 +4199,134 @@ namespace {
         return !*wild;
     }
 
-    //// C string hash function (djb2) - taken from http://www.cse.yorku.ca/~oz/hash.html
-    //unsigned hashStr(unsigned const char* str) {
-    //    unsigned long hash = 5381;
-    //    char          c;
-    //    while((c = *str++))
-    //        hash = ((hash << 5) + hash) + c; // hash * 33 + c
-    //    return hash;
-    //}
-
     // checks if the name matches any of the filters (and can be configured what to do when empty)
     bool matchesAny(const char* name, const std::vector<String>& filters, bool matchEmpty,
-                    bool caseSensitive) {
-        if(filters.empty() && matchEmpty)
+        bool caseSensitive) {
+        if (filters.empty() && matchEmpty)
             return true;
-        for(auto& curr : filters)
-            if(wildcmp(name, curr.c_str(), caseSensitive))
+        for (auto& curr : filters)
+            if (wildcmp(name, curr.c_str(), caseSensitive))
                 return true;
         return false;
     }
-} // namespace
-namespace detail {
 
-    Subcase::Subcase(const String& name, const char* file, int line)
-            : m_signature({name, file, line}) {
-        auto* s = g_cs;
+    DOCTEST_NO_SANITIZE_INTEGER
+    unsigned long long hash(unsigned long long a, unsigned long long b) {
+        return (a << 5) + b;
+    }
 
-        // check subcase filters
-        if(s->subcasesStack.size() < size_t(s->subcase_filter_levels)) {
-            if(!matchesAny(m_signature.m_name.c_str(), s->filters[6], true, s->case_sensitive))
-                return;
-            if(matchesAny(m_signature.m_name.c_str(), s->filters[7], false, s->case_sensitive))
-                return;
-        }
-        
-        // if a Subcase on the same level has already been entered
-        if(s->subcasesStack.size() < size_t(s->subcasesCurrentMaxLevel)) {
-            s->should_reenter = true;
-            return;
-        }
+    // C string hash function (djb2) - taken from http://www.cse.yorku.ca/~oz/hash.html
+    DOCTEST_NO_SANITIZE_INTEGER
+    unsigned long long hash(const char* str) {
+        unsigned long long hash = 5381;
+        char c;
+        while ((c = *str++))
+            hash = ((hash << 5) + hash) + c; // hash * 33 + c
+        return hash;
+    }
 
-        // push the current signature to the stack so we can check if the
-        // current stack + the current new subcase have been traversed
-        s->subcasesStack.push_back(m_signature);
-        if(s->subcasesPassed.count(s->subcasesStack) != 0) {
-            // pop - revert to previous stack since we've already passed this
-            s->subcasesStack.pop_back();
-            return;
+    unsigned long long hash(const SubcaseSignature& sig) {
+        return hash(hash(hash(sig.m_file), hash(sig.m_name.c_str())), sig.m_line);
+    }
+
+    unsigned long long hash(const std::vector<SubcaseSignature>& sigs, size_t count) {
+        unsigned long long running = 0;
+        auto end = sigs.begin() + count;
+        for (auto it = sigs.begin(); it != end; it++) {
+            running = hash(running, hash(*it));
         }
+        return running;
+    }
 
-        s->subcasesCurrentMaxLevel = s->subcasesStack.size();
-        m_entered = true;
+    unsigned long long hash(const std::vector<SubcaseSignature>& sigs) {
+        unsigned long long running = 0;
+        for (const SubcaseSignature& sig : sigs) {
+            running = hash(running, hash(sig));
+        }
+        return running;
+    }
+} // namespace
+namespace detail {
+    bool Subcase::checkFilters() {
+        if (g_cs->subcaseStack.size() < size_t(g_cs->subcase_filter_levels)) {
+            if (!matchesAny(m_signature.m_name.c_str(), g_cs->filters[6], true, g_cs->case_sensitive))
+                return true;
+            if (matchesAny(m_signature.m_name.c_str(), g_cs->filters[7], false, g_cs->case_sensitive))
+                return true;
+        }
+        return false;
+    }
 
-        DOCTEST_ITERATE_THROUGH_REPORTERS(subcase_start, m_signature);
+    Subcase::Subcase(const String& name, const char* file, int line)
+            : m_signature({name, file, line}) {
+        if (!g_cs->reachedLeaf) {
+            if (g_cs->nextSubcaseStack.size() <= g_cs->subcaseStack.size()
+                || g_cs->nextSubcaseStack[g_cs->subcaseStack.size()] == m_signature) {
+                // Going down.
+                if (checkFilters()) { return; }
+
+                g_cs->subcaseStack.push_back(m_signature);
+                g_cs->currentSubcaseDepth++;
+                m_entered = true;
+                DOCTEST_ITERATE_THROUGH_REPORTERS(subcase_start, m_signature);
+            }
+        } else {
+            if (g_cs->subcaseStack[g_cs->currentSubcaseDepth] == m_signature) {
+                // This subcase is reentered via control flow.
+                g_cs->currentSubcaseDepth++;
+                m_entered = true;
+                DOCTEST_ITERATE_THROUGH_REPORTERS(subcase_start, m_signature);
+            } else if (g_cs->nextSubcaseStack.size() <= g_cs->currentSubcaseDepth
+                    && g_cs->fullyTraversedSubcases.find(hash(hash(g_cs->subcaseStack, g_cs->currentSubcaseDepth), hash(m_signature)))
+                    == g_cs->fullyTraversedSubcases.end()) {
+                if (checkFilters()) { return; }
+                // This subcase is part of the one to be executed next.
+                g_cs->nextSubcaseStack.clear();
+                g_cs->nextSubcaseStack.insert(g_cs->nextSubcaseStack.end(),
+                    g_cs->subcaseStack.begin(), g_cs->subcaseStack.begin() + g_cs->currentSubcaseDepth);
+                g_cs->nextSubcaseStack.push_back(m_signature);
+            }
+        }
     }
 
-    DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(4996) // std::uncaught_exception is deprecated in C++17	
-    DOCTEST_GCC_SUPPRESS_WARNING_WITH_PUSH("-Wdeprecated-declarations")	
+    DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(4996) // std::uncaught_exception is deprecated in C++17
+    DOCTEST_GCC_SUPPRESS_WARNING_WITH_PUSH("-Wdeprecated-declarations")
     DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wdeprecated-declarations")
 
     Subcase::~Subcase() {
-        if(m_entered) {
-            // only mark the subcase stack as passed if no subcases have been skipped
-            if(g_cs->should_reenter == false)
-                g_cs->subcasesPassed.insert(g_cs->subcasesStack);
-            g_cs->subcasesStack.pop_back();
+        if (m_entered) {
+            g_cs->currentSubcaseDepth--;
+
+            if (!g_cs->reachedLeaf) {
+                // Leaf.
+                g_cs->fullyTraversedSubcases.insert(hash(g_cs->subcaseStack));
+                g_cs->nextSubcaseStack.clear();
+                g_cs->reachedLeaf = true;
+            } else if (g_cs->nextSubcaseStack.empty()) {
+                // All children are finished.
+                g_cs->fullyTraversedSubcases.insert(hash(g_cs->subcaseStack));
+            }
 
 #if defined(__cpp_lib_uncaught_exceptions) && __cpp_lib_uncaught_exceptions >= 201411L && (!defined(__MAC_OS_X_VERSION_MIN_REQUIRED) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200)
             if(std::uncaught_exceptions() > 0
 #else
             if(std::uncaught_exception()
 #endif
-            && g_cs->shouldLogCurrentException) {
+                && g_cs->shouldLogCurrentException) {
                 DOCTEST_ITERATE_THROUGH_REPORTERS(
                         test_case_exception, {"exception thrown in subcase - will translate later "
-                                              "when the whole test case has been exited (cannot "
-                                              "translate while there is an active exception)",
-                                              false});
+                                                "when the whole test case has been exited (cannot "
+                                                "translate while there is an active exception)",
+                                                false});
                 g_cs->shouldLogCurrentException = false;
             }
+
             DOCTEST_ITERATE_THROUGH_REPORTERS(subcase_end, DOCTEST_EMPTY);
         }
     }
 
-    DOCTEST_CLANG_SUPPRESS_WARNING_POP	
-    DOCTEST_GCC_SUPPRESS_WARNING_POP	
+    DOCTEST_CLANG_SUPPRESS_WARNING_POP
+    DOCTEST_GCC_SUPPRESS_WARNING_POP
     DOCTEST_MSVC_SUPPRESS_WARNING_POP
 
     Subcase::operator bool() const { return m_entered; }
@@ -3897,20 +4340,11 @@ namespace detail {
 
     TestSuite& TestSuite::operator*(const char* in) {
         m_test_suite = in;
-        // clear state
-        m_description       = nullptr;
-        m_skip              = false;
-        m_no_breaks         = false;
-        m_no_output         = false;
-        m_may_fail          = false;
-        m_should_fail       = false;
-        m_expected_failures = 0;
-        m_timeout           = 0;
         return *this;
     }
 
     TestCase::TestCase(funcType test, const char* file, unsigned line, const TestSuite& test_suite,
-                       const char* type, int template_id) {
+                       const String& type, int template_id) {
         m_file              = file;
         m_line              = line;
         m_name              = nullptr; // will be later overridden in operator*
@@ -3935,10 +4369,8 @@ namespace detail {
     }
 
     DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(26434) // hides a non-virtual function
-    DOCTEST_MSVC_SUPPRESS_WARNING(26437)           // Do not slice
     TestCase& TestCase::operator=(const TestCase& other) {
-        static_cast<TestCaseData&>(*this) = static_cast<const TestCaseData&>(other);
-
+        TestCaseData::operator=(other);
         m_test        = other.m_test;
         m_type        = other.m_type;
         m_template_id = other.m_template_id;
@@ -3954,7 +4386,7 @@ namespace detail {
         m_name = in;
         // make a new name with an appended type for templated test case
         if(m_template_id != -1) {
-            m_full_name = String(m_name) + m_type;
+            m_full_name = String(m_name) + "<" + m_type + ">";
             // redirect the name to point to the newly constructed full name
             m_name = m_full_name.c_str();
         }
@@ -4010,30 +4442,6 @@ namespace {
         return suiteOrderComparator(lhs, rhs);
     }
 
-#ifdef DOCTEST_CONFIG_COLORS_WINDOWS
-    HANDLE g_stdoutHandle;
-    WORD   g_origFgAttrs;
-    WORD   g_origBgAttrs;
-    bool   g_attrsInitted = false;
-
-    int colors_init() {
-        if(!g_attrsInitted) {
-            g_stdoutHandle = GetStdHandle(STD_OUTPUT_HANDLE);
-            g_attrsInitted = true;
-            CONSOLE_SCREEN_BUFFER_INFO csbiInfo;
-            GetConsoleScreenBufferInfo(g_stdoutHandle, &csbiInfo);
-            g_origFgAttrs = csbiInfo.wAttributes & ~(BACKGROUND_GREEN | BACKGROUND_RED |
-                                                     BACKGROUND_BLUE | BACKGROUND_INTENSITY);
-            g_origBgAttrs = csbiInfo.wAttributes & ~(FOREGROUND_GREEN | FOREGROUND_RED |
-                                                     FOREGROUND_BLUE | FOREGROUND_INTENSITY);
-        }
-        return 0;
-    }
-
-    // TODO: upstream the change to doctest : add volatile to get rid of "unused variable warning" + fix typo
-    volatile int dummy_init_console_colors = colors_init();
-#endif // DOCTEST_CONFIG_COLORS_WINDOWS
-
     DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wdeprecated-declarations")
     void color_to_stream(std::ostream& s, Color::Enum code) {
         static_cast<void>(s);    // for DOCTEST_CONFIG_COLORS_NONE or DOCTEST_CONFIG_COLORS_WINDOWS
@@ -4067,10 +4475,26 @@ namespace {
 
 #ifdef DOCTEST_CONFIG_COLORS_WINDOWS
         if(g_no_colors ||
-           (isatty(fileno(stdout)) == false && getContextOptions()->force_colors == false))
+           (_isatty(_fileno(stdout)) == false && getContextOptions()->force_colors == false))
             return;
 
-#define DOCTEST_SET_ATTR(x) SetConsoleTextAttribute(g_stdoutHandle, x | g_origBgAttrs)
+        static struct ConsoleHelper {
+            HANDLE stdoutHandle;
+            WORD   origFgAttrs;
+            WORD   origBgAttrs;
+
+            ConsoleHelper() {
+                stdoutHandle = GetStdHandle(STD_OUTPUT_HANDLE);
+                CONSOLE_SCREEN_BUFFER_INFO csbiInfo;
+                GetConsoleScreenBufferInfo(stdoutHandle, &csbiInfo);
+                origFgAttrs = csbiInfo.wAttributes & ~(BACKGROUND_GREEN | BACKGROUND_RED |
+                    BACKGROUND_BLUE | BACKGROUND_INTENSITY);
+                origBgAttrs = csbiInfo.wAttributes & ~(FOREGROUND_GREEN | FOREGROUND_RED |
+                    FOREGROUND_BLUE | FOREGROUND_INTENSITY);
+            }
+        } ch;
+
+#define DOCTEST_SET_ATTR(x) SetConsoleTextAttribute(ch.stdoutHandle, x | ch.origBgAttrs)
 
         // clang-format off
         switch (code) {
@@ -4087,7 +4511,7 @@ namespace {
             case Color::BrightWhite: DOCTEST_SET_ATTR(FOREGROUND_INTENSITY | FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE); break;
             case Color::None:
             case Color::Bright: // invalid
-            default:                 DOCTEST_SET_ATTR(g_origFgAttrs);
+            default:                 DOCTEST_SET_ATTR(ch.origFgAttrs);
         }
             // clang-format on
 #endif // DOCTEST_CONFIG_COLORS_WINDOWS
@@ -4204,35 +4628,13 @@ namespace detail {
             getExceptionTranslators().push_back(et);
     }
 
-#ifdef DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
-    void toStream(std::ostream* s, char* in) { *s << in; }
-    void toStream(std::ostream* s, const char* in) { *s << in; }
-#endif // DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
-    void toStream(std::ostream* s, bool in) { *s << std::boolalpha << in << std::noboolalpha; }
-    void toStream(std::ostream* s, float in) { *s << in; }
-    void toStream(std::ostream* s, double in) { *s << in; }
-    void toStream(std::ostream* s, double long in) { *s << in; }
-
-    void toStream(std::ostream* s, char in) { *s << in; }
-    void toStream(std::ostream* s, char signed in) { *s << in; }
-    void toStream(std::ostream* s, char unsigned in) { *s << in; }
-    void toStream(std::ostream* s, int short in) { *s << in; }
-    void toStream(std::ostream* s, int short unsigned in) { *s << in; }
-    void toStream(std::ostream* s, int in) { *s << in; }
-    void toStream(std::ostream* s, int unsigned in) { *s << in; }
-    void toStream(std::ostream* s, int long in) { *s << in; }
-    void toStream(std::ostream* s, int long unsigned in) { *s << in; }
-    void toStream(std::ostream* s, int long long in) { *s << in; }
-    void toStream(std::ostream* s, int long long unsigned in) { *s << in; }
-
     DOCTEST_THREAD_LOCAL doctest_thread_local_wrapper<std::vector<IContextScope*>> wrapped_g_infoContexts; // for logging with INFO()
 
     ContextScopeBase::ContextScopeBase() {
         wrapped_g_infoContexts.get().push_back(this);
     }
 
-    // TODO: upstream the change to doctest : fix copy elision absence case
-    ContextScopeBase::ContextScopeBase(ContextScopeBase&& other) {
+    ContextScopeBase::ContextScopeBase(ContextScopeBase&& other) noexcept {
         if (other.need_to_destroy) {
             other.destroy();
         }
@@ -4240,8 +4642,8 @@ namespace detail {
         wrapped_g_infoContexts.get().push_back(this);
     }
 
-    DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(4996) // std::uncaught_exception is deprecated in C++17	
-    DOCTEST_GCC_SUPPRESS_WARNING_WITH_PUSH("-Wdeprecated-declarations")	
+    DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(4996) // std::uncaught_exception is deprecated in C++17
+    DOCTEST_GCC_SUPPRESS_WARNING_WITH_PUSH("-Wdeprecated-declarations")
     DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wdeprecated-declarations")
 
     // destroy cannot be inlined into the destructor because that would mean calling stringify after
@@ -4260,15 +4662,14 @@ namespace detail {
         wrapped_g_infoContexts.get().pop_back();
     }
 
-    DOCTEST_CLANG_SUPPRESS_WARNING_POP	
-    DOCTEST_GCC_SUPPRESS_WARNING_POP	
+    DOCTEST_CLANG_SUPPRESS_WARNING_POP
+    DOCTEST_GCC_SUPPRESS_WARNING_POP
     DOCTEST_MSVC_SUPPRESS_WARNING_POP
 } // namespace detail
 namespace {
     using namespace detail;
 
-// TODO: upstream the change to doctest : Universal Windows Platform support
-#if !defined(DOCTEST_CONFIG_POSIX_SIGNALS) && (!defined(DOCTEST_CONFIG_WINDOWS_SEH) || defined(WINAPI_FAMILY))
+#if !defined(DOCTEST_CONFIG_POSIX_SIGNALS) && !defined(DOCTEST_CONFIG_WINDOWS_SEH)
     struct FatalConditionHandler
     {
         static void reset() {}
@@ -4303,10 +4704,10 @@ namespace {
         static LONG CALLBACK handleException(PEXCEPTION_POINTERS ExceptionInfo) {
             // Multiple threads may enter this filter/handler at once. We want the error message to be printed on the
             // console just once no matter how many threads have crashed.
-            static std::mutex mutex;
+            DOCTEST_DECLARE_STATIC_MUTEX(mutex)
             static bool execute = true;
             {
-                std::lock_guard<std::mutex> lock(mutex);
+                DOCTEST_LOCK_MUTEX(mutex)
                 if(execute) {
                     bool reported = false;
                     for(size_t i = 0; i < DOCTEST_COUNTOF(signalDefs); ++i) {
@@ -4409,7 +4810,7 @@ namespace {
         static unsigned int prev_abort_behavior;
         static int          prev_report_mode;
         static _HFILE       prev_report_file;
-        static void (*prev_sigabrt_handler)(int);
+        static void (DOCTEST_CDECL *prev_sigabrt_handler)(int);
         static std::terminate_handler original_terminate_handler;
         static bool isSet;
         static ULONG guaranteeSize;
@@ -4421,7 +4822,7 @@ namespace {
     unsigned int FatalConditionHandler::prev_abort_behavior;
     int          FatalConditionHandler::prev_report_mode;
     _HFILE       FatalConditionHandler::prev_report_file;
-    void (*FatalConditionHandler::prev_sigabrt_handler)(int);
+    void (DOCTEST_CDECL *FatalConditionHandler::prev_sigabrt_handler)(int);
     std::terminate_handler FatalConditionHandler::original_terminate_handler;
     bool FatalConditionHandler::isSet = false;
     ULONG FatalConditionHandler::guaranteeSize = 0;
@@ -4479,7 +4880,7 @@ namespace {
             sigStack.ss_flags = 0;
             sigaltstack(&sigStack, &oldSigStack);
             struct sigaction sa = {};
-            sa.sa_handler       = handleSignal; // NOLINT
+            sa.sa_handler       = handleSignal;
             sa.sa_flags         = SA_ONSTACK;
             for(std::size_t i = 0; i < DOCTEST_COUNTOF(signalDefs); ++i) {
                 sigaction(signalDefs[i].id, &sa, &oldSigActions[i]);
@@ -4518,7 +4919,7 @@ namespace {
 #define DOCTEST_OUTPUT_DEBUG_STRING(text) ::OutputDebugStringA(text)
 #else
     // TODO: integration with XCode and other IDEs
-#define DOCTEST_OUTPUT_DEBUG_STRING(text) // NOLINT(clang-diagnostic-unused-macros)
+#define DOCTEST_OUTPUT_DEBUG_STRING(text)
 #endif // Platform
 
     void addAssert(assertType::Enum at) {
@@ -4531,15 +4932,14 @@ namespace {
             g_cs->numAssertsFailedCurrentTest_atomic++;
     }
 
-// TODO: upstream the change to doctest : Universal Windows Platform support
-#if defined(DOCTEST_CONFIG_POSIX_SIGNALS) || (defined(DOCTEST_CONFIG_WINDOWS_SEH) && !defined(WINAPI_FAMILY))
+#if defined(DOCTEST_CONFIG_POSIX_SIGNALS) || defined(DOCTEST_CONFIG_WINDOWS_SEH)
     void reportFatal(const std::string& message) {
         g_cs->failure_flags |= TestCaseFailureReason::Crash;
 
         DOCTEST_ITERATE_THROUGH_REPORTERS(test_case_exception, {message.c_str(), true});
 
-        while(g_cs->subcasesStack.size()) {
-            g_cs->subcasesStack.pop_back();
+        while (g_cs->subcaseStack.size()) {
+            g_cs->subcaseStack.pop_back();
             DOCTEST_ITERATE_THROUGH_REPORTERS(subcase_end, DOCTEST_EMPTY);
         }
 
@@ -4551,25 +4951,26 @@ namespace {
     }
 #endif // DOCTEST_CONFIG_POSIX_SIGNALS || DOCTEST_CONFIG_WINDOWS_SEH
 } // namespace
-namespace detail {
 
-    ResultBuilder::ResultBuilder(assertType::Enum at, const char* file, int line, const char* expr,
-                                 const char* exception_type, const char* exception_string) {
-        m_test_case        = g_cs->currentTest;
-        m_at               = at;
-        m_file             = file;
-        m_line             = line;
-        m_expr             = expr;
-        m_failed           = true;
-        m_threw            = false;
-        m_threw_as         = false;
-        m_exception_type   = exception_type;
-        m_exception_string = exception_string;
+AssertData::AssertData(assertType::Enum at, const char* file, int line, const char* expr,
+    const char* exception_type, const StringContains& exception_string)
+    : m_test_case(g_cs->currentTest), m_at(at), m_file(file), m_line(line), m_expr(expr),
+    m_failed(true), m_threw(false), m_threw_as(false), m_exception_type(exception_type),
+    m_exception_string(exception_string) {
 #if DOCTEST_MSVC
-        if(m_expr[0] == ' ') // this happens when variadic macros are disabled under MSVC
-            ++m_expr;
+    if (m_expr[0] == ' ') // this happens when variadic macros are disabled under MSVC
+        ++m_expr;
 #endif // MSVC
-    }
+}
+
+namespace detail {
+    ResultBuilder::ResultBuilder(assertType::Enum at, const char* file, int line, const char* expr,
+                                 const char* exception_type, const String& exception_string)
+        : AssertData(at, file, line, expr, exception_type, exception_string) { }
+
+    ResultBuilder::ResultBuilder(assertType::Enum at, const char* file, int line, const char* expr,
+        const char* exception_type, const Contains& exception_string)
+        : AssertData(at, file, line, expr, exception_type, exception_string) { }
 
     void ResultBuilder::setResult(const Result& res) {
         m_decomp = res.m_decomp;
@@ -4585,17 +4986,17 @@ namespace detail {
         if(m_at & assertType::is_throws) { //!OCLINT bitwise operator in conditional
             m_failed = !m_threw;
         } else if((m_at & assertType::is_throws_as) && (m_at & assertType::is_throws_with)) { //!OCLINT
-            m_failed = !m_threw_as || (m_exception != m_exception_string);
+            m_failed = !m_threw_as || !m_exception_string.check(m_exception);
         } else if(m_at & assertType::is_throws_as) { //!OCLINT bitwise operator in conditional
             m_failed = !m_threw_as;
         } else if(m_at & assertType::is_throws_with) { //!OCLINT bitwise operator in conditional
-            m_failed = m_exception != m_exception_string;
+            m_failed = !m_exception_string.check(m_exception);
         } else if(m_at & assertType::is_nothrow) { //!OCLINT bitwise operator in conditional
             m_failed = m_threw;
         }
 
         if(m_exception.size())
-            m_exception = String("\"") + m_exception + "\"";
+            m_exception = "\"" + m_exception + "\"";
 
         if(is_running_in_test) {
             addAssert(m_at);
@@ -4623,8 +5024,8 @@ namespace detail {
             std::abort();
     }
 
-    void decomp_assert(assertType::Enum at, const char* file, int line, const char* expr,
-                       Result result) {
+    bool decomp_assert(assertType::Enum at, const char* file, int line, const char* expr,
+                       const Result& result) {
         bool failed = !result.m_passed;
 
         // ###################################################################################
@@ -4633,21 +5034,29 @@ namespace detail {
         // ###################################################################################
         DOCTEST_ASSERT_OUT_OF_TESTS(result.m_decomp);
         DOCTEST_ASSERT_IN_TESTS(result.m_decomp);
-        // NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks)
+        return !failed;
     }
 
     MessageBuilder::MessageBuilder(const char* file, int line, assertType::Enum severity) {
-        m_stream   = getTlsOss();
+        m_stream   = tlssPush();
         m_file     = file;
         m_line     = line;
         m_severity = severity;
     }
 
-    IExceptionTranslator::IExceptionTranslator()  = default;
-    IExceptionTranslator::~IExceptionTranslator() = default;
+    MessageBuilder::~MessageBuilder() {
+        if (!logged)
+            tlssPop();
+    }
+
+    DOCTEST_DEFINE_INTERFACE(IExceptionTranslator)
 
     bool MessageBuilder::log() {
-        m_string = getTlsOssResult();
+        if (!logged) {
+            m_string = tlssPop();
+            logged = true;
+        }
+
         DOCTEST_ITERATE_THROUGH_REPORTERS(log_message, *this);
 
         const bool isWarn = m_severity & assertType::is_warn;
@@ -4666,29 +5075,10 @@ namespace detail {
         if(m_severity & assertType::is_require) //!OCLINT bitwise operator in conditional
             throwException();
     }
-
-    MessageBuilder::~MessageBuilder() = default;
 } // namespace detail
 namespace {
     using namespace detail;
 
-    template <typename Ex>
-    DOCTEST_NORETURN void throw_exception(Ex const& e) {
-#ifndef DOCTEST_CONFIG_NO_EXCEPTIONS
-        throw e;
-#else  // DOCTEST_CONFIG_NO_EXCEPTIONS
-        std::cerr << "doctest will terminate because it needed to throw an exception.\n"
-                  << "The message was: " << e.what() << '\n';
-        std::terminate();
-#endif // DOCTEST_CONFIG_NO_EXCEPTIONS
-    }
-
-#ifndef DOCTEST_INTERNAL_ERROR
-#define DOCTEST_INTERNAL_ERROR(msg)                                                                \
-    throw_exception(std::logic_error(                                                              \
-            __FILE__ ":" DOCTEST_TOSTR(__LINE__) ": Internal doctest error: " msg))
-#endif // DOCTEST_INTERNAL_ERROR
-
     // clang-format off
 
 // =================================================================================================
@@ -4735,7 +5125,11 @@ namespace {
             mutable XmlWriter* m_writer = nullptr;
         };
 
+#ifndef DOCTEST_CONFIG_NO_INCLUDE_IOSTREAM
         XmlWriter( std::ostream& os = std::cout );
+#else // DOCTEST_CONFIG_NO_INCLUDE_IOSTREAM
+        XmlWriter( std::ostream& os );
+#endif // DOCTEST_CONFIG_NO_INCLUDE_IOSTREAM
         ~XmlWriter();
 
         XmlWriter( XmlWriter const& ) = delete;
@@ -4770,10 +5164,10 @@ namespace {
 
         void ensureTagClosed();
 
-    private:
-
         void writeDeclaration();
 
+    private:
+
         void newlineIfNecessary();
 
         bool m_tagIsOpen = false;
@@ -4962,7 +5356,7 @@ namespace {
 
     XmlWriter::XmlWriter( std::ostream& os ) : m_os( os )
     {
-        writeDeclaration();
+        // writeDeclaration(); // called explicitly by the reporters that use the writer class - see issue #627
     }
 
     XmlWriter::~XmlWriter() {
@@ -5073,8 +5467,8 @@ namespace {
 
     struct XmlReporter : public IReporter
     {
-        XmlWriter  xml;
-        std::mutex mutex;
+        XmlWriter xml;
+        DOCTEST_DECLARE_MUTEX(mutex)
 
         // caching pointers/references to objects of these types - safe to do
         const ContextOptions& opt;
@@ -5151,7 +5545,8 @@ namespace {
                     xml.scopedElement("TestCase").writeAttribute("name", in.data[i]->m_name)
                         .writeAttribute("testsuite", in.data[i]->m_test_suite)
                         .writeAttribute("filename", skipPathFromFilename(in.data[i]->m_file.c_str()))
-                        .writeAttribute("line", line(in.data[i]->m_line));
+                        .writeAttribute("line", line(in.data[i]->m_line))
+                        .writeAttribute("skipped", in.data[i]->m_skip);
                 }
                 xml.scopedElement("OverallResultsTestCases")
                         .writeAttribute("unskipped", in.run_stats->numTestCasesPassingFilters);
@@ -5167,6 +5562,8 @@ namespace {
         }
 
         void test_run_start() override {
+            xml.writeDeclaration();
+
             // remove .exe extension - mainly to have the same output on UNIX and Windows
             std::string binary_name = skipPathFromFilename(opt.binary_name.c_str());
 #ifdef DOCTEST_PLATFORM_WINDOWS
@@ -5214,14 +5611,15 @@ namespace {
             test_case_start_impl(in);
             xml.ensureTagClosed();
         }
-        
+
         void test_case_reenter(const TestCaseData&) override {}
 
         void test_case_end(const CurrentTestCaseStats& st) override {
             xml.startElement("OverallResultsAsserts")
                     .writeAttribute("successes",
                                     st.numAssertsCurrentTest - st.numAssertsFailedCurrentTest)
-                    .writeAttribute("failures", st.numAssertsFailedCurrentTest);
+                    .writeAttribute("failures", st.numAssertsFailedCurrentTest)
+                    .writeAttribute("test_case_success", st.testCaseSuccess);
             if(opt.duration)
                 xml.writeAttribute("duration", st.seconds);
             if(tc->m_expected_failures)
@@ -5232,7 +5630,7 @@ namespace {
         }
 
         void test_case_exception(const TestCaseException& e) override {
-            std::lock_guard<std::mutex> lock(mutex);
+            DOCTEST_LOCK_MUTEX(mutex)
 
             xml.scopedElement("Exception")
                     .writeAttribute("crash", e.is_crash)
@@ -5240,8 +5638,6 @@ namespace {
         }
 
         void subcase_start(const SubcaseSignature& in) override {
-            std::lock_guard<std::mutex> lock(mutex);
-
             xml.startElement("SubCase")
                     .writeAttribute("name", in.m_name)
                     .writeAttribute("filename", skipPathFromFilename(in.m_file))
@@ -5255,7 +5651,7 @@ namespace {
             if(!rb.m_failed && !opt.success)
                 return;
 
-            std::lock_guard<std::mutex> lock(mutex);
+            DOCTEST_LOCK_MUTEX(mutex)
 
             xml.startElement("Expression")
                     .writeAttribute("success", !rb.m_failed)
@@ -5271,7 +5667,7 @@ namespace {
             if(rb.m_at & assertType::is_throws_as)
                 xml.scopedElement("ExpectedException").writeText(rb.m_exception_type);
             if(rb.m_at & assertType::is_throws_with)
-                xml.scopedElement("ExpectedExceptionString").writeText(rb.m_exception_string);
+                xml.scopedElement("ExpectedExceptionString").writeText(rb.m_exception_string.c_str());
             if((rb.m_at & assertType::is_normal) && !rb.m_threw)
                 xml.scopedElement("Expanded").writeText(rb.m_decomp.c_str());
 
@@ -5281,7 +5677,7 @@ namespace {
         }
 
         void log_message(const MessageData& mb) override {
-            std::lock_guard<std::mutex> lock(mutex);
+            DOCTEST_LOCK_MUTEX(mutex)
 
             xml.startElement("Message")
                     .writeAttribute("type", failureString(mb.m_severity))
@@ -5317,7 +5713,8 @@ namespace {
         } else if((rb.m_at & assertType::is_throws_as) &&
                     (rb.m_at & assertType::is_throws_with)) { //!OCLINT
             s << Color::Cyan << assertString(rb.m_at) << "( " << rb.m_expr << ", \""
-                << rb.m_exception_string << "\", " << rb.m_exception_type << " ) " << Color::None;
+                << rb.m_exception_string.c_str()
+                << "\", " << rb.m_exception_type << " ) " << Color::None;
             if(rb.m_threw) {
                 if(!rb.m_failed) {
                     s << "threw as expected!\n";
@@ -5338,7 +5735,8 @@ namespace {
         } else if(rb.m_at &
                     assertType::is_throws_with) { //!OCLINT bitwise operator in conditional
             s << Color::Cyan << assertString(rb.m_at) << "( " << rb.m_expr << ", \""
-                << rb.m_exception_string << "\" ) " << Color::None
+                << rb.m_exception_string.c_str()
+                << "\" ) " << Color::None
                 << (rb.m_threw ? (!rb.m_failed ? "threw as expected!" :
                                                 "threw a DIFFERENT exception: ") :
                                 "did NOT throw at all!")
@@ -5363,8 +5761,8 @@ namespace {
     // - more attributes in tags
     struct JUnitReporter : public IReporter
     {
-        XmlWriter  xml;
-        std::mutex mutex;
+        XmlWriter xml;
+        DOCTEST_DECLARE_MUTEX(mutex)
         Timer timer;
         std::vector<String> deepestSubcaseStackNames;
 
@@ -5460,9 +5858,13 @@ namespace {
         // WHAT FOLLOWS ARE OVERRIDES OF THE VIRTUAL METHODS OF THE REPORTER INTERFACE
         // =========================================================================================
 
-        void report_query(const QueryData&) override {}
+        void report_query(const QueryData&) override {
+            xml.writeDeclaration();
+        }
 
-        void test_run_start() override {}
+        void test_run_start() override {
+            xml.writeDeclaration();
+        }
 
         void test_run_end(const TestRunStats& p) override {
             // remove .exe extension - mainly to have the same output on UNIX and Windows
@@ -5532,12 +5934,11 @@ namespace {
         }
 
         void test_case_exception(const TestCaseException& e) override {
-            std::lock_guard<std::mutex> lock(mutex);
+            DOCTEST_LOCK_MUTEX(mutex)
             testCaseData.addError("exception", e.error_string.c_str());
         }
 
         void subcase_start(const SubcaseSignature& in) override {
-            std::lock_guard<std::mutex> lock(mutex);
             deepestSubcaseStackNames.push_back(in.m_name);
         }
 
@@ -5547,7 +5948,7 @@ namespace {
             if(!rb.m_failed) // report only failures & ignore the `success` option
                 return;
 
-            std::lock_guard<std::mutex> lock(mutex);
+            DOCTEST_LOCK_MUTEX(mutex)
 
             std::ostringstream os;
             os << skipPathFromFilename(rb.m_file) << (opt.gnu_file_line ? ":" : "(")
@@ -5558,7 +5959,22 @@ namespace {
             testCaseData.addFailure(rb.m_decomp.c_str(), assertString(rb.m_at), os.str());
         }
 
-        void log_message(const MessageData&) override {}
+        void log_message(const MessageData& mb) override {
+            if(mb.m_severity & assertType::is_warn) // report only failures
+                return;
+
+            DOCTEST_LOCK_MUTEX(mutex)
+
+            std::ostringstream os;
+            os << skipPathFromFilename(mb.m_file) << (opt.gnu_file_line ? ":" : "(")
+              << line(mb.m_line) << (opt.gnu_file_line ? ":" : "):") << std::endl;
+
+            os << mb.m_string.c_str() << "\n";
+            log_contexts(os);
+
+            testCaseData.addFailure(mb.m_string.c_str(),
+                mb.m_severity & assertType::is_check ? "FAIL_CHECK" : "FAIL", os.str());
+        }
 
         void test_case_skipped(const TestCaseData&) override {}
 
@@ -5598,7 +6014,7 @@ namespace {
         bool                          hasLoggedCurrentTestStart;
         std::vector<SubcaseSignature> subcasesStack;
         size_t                        currentSubcaseLevel;
-        std::mutex                    mutex;
+        DOCTEST_DECLARE_MUTEX(mutex)
 
         // caching pointers/references to objects of these types - safe to do
         const ContextOptions& opt;
@@ -5703,9 +6119,11 @@ namespace {
         }
 
         void printIntro() {
-            printVersion();
-            s << Color::Cyan << "[doctest] " << Color::None
-              << "run with \"--" DOCTEST_OPTIONS_PREFIX_DISPLAY "help\" for options\n";
+            if(opt.no_intro == false) {
+                printVersion();
+                s << Color::Cyan << "[doctest] " << Color::None
+                  << "run with \"--" DOCTEST_OPTIONS_PREFIX_DISPLAY "help\" for options\n";
+            }
         }
 
         void printHelp() {
@@ -5790,12 +6208,18 @@ namespace {
               << Whitespace(sizePrefixDisplay*1) << "exits after the tests finish\n";
             s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "d,   --" DOCTEST_OPTIONS_PREFIX_DISPLAY "duration=<bool>               "
               << Whitespace(sizePrefixDisplay*1) << "prints the time duration of each test\n";
+            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "m,   --" DOCTEST_OPTIONS_PREFIX_DISPLAY "minimal=<bool>                "
+              << Whitespace(sizePrefixDisplay*1) << "minimal console output (only failures)\n";
+            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "q,   --" DOCTEST_OPTIONS_PREFIX_DISPLAY "quiet=<bool>                  "
+              << Whitespace(sizePrefixDisplay*1) << "no console output\n";
             s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "nt,  --" DOCTEST_OPTIONS_PREFIX_DISPLAY "no-throw=<bool>               "
               << Whitespace(sizePrefixDisplay*1) << "skips exceptions-related assert checks\n";
             s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "ne,  --" DOCTEST_OPTIONS_PREFIX_DISPLAY "no-exitcode=<bool>            "
               << Whitespace(sizePrefixDisplay*1) << "returns (or exits) always with success\n";
             s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "nr,  --" DOCTEST_OPTIONS_PREFIX_DISPLAY "no-run=<bool>                 "
               << Whitespace(sizePrefixDisplay*1) << "skips all runtime doctest operations\n";
+            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "ni,  --" DOCTEST_OPTIONS_PREFIX_DISPLAY "no-intro=<bool>               "
+              << Whitespace(sizePrefixDisplay*1) << "omit the framework intro in the output\n";
             s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "nv,  --" DOCTEST_OPTIONS_PREFIX_DISPLAY "no-version=<bool>             "
               << Whitespace(sizePrefixDisplay*1) << "omit the framework version in the output\n";
             s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "nc,  --" DOCTEST_OPTIONS_PREFIX_DISPLAY "no-colors=<bool>              "
@@ -5833,25 +6257,6 @@ namespace {
             printReporters(getReporters(), "reporters");
         }
 
-// TODO: upstream the change to doctest : list_query_results() was declared but never referenced
-#if 0 /* dead code */
-        void list_query_results() {
-            separator_to_stream();
-            if(opt.count || opt.list_test_cases) {
-                s << Color::Cyan << "[doctest] " << Color::None
-                  << "unskipped test cases passing the current filters: "
-                  << g_cs->numTestCasesPassingFilters << "\n";
-            } else if(opt.list_test_suites) {
-                s << Color::Cyan << "[doctest] " << Color::None
-                  << "unskipped test cases passing the current filters: "
-                  << g_cs->numTestCasesPassingFilters << "\n";
-                s << Color::Cyan << "[doctest] " << Color::None
-                  << "test suites with unskipped test cases passing the current filters: "
-                  << g_cs->numTestSuitesPassingFilters << "\n";
-            }
-        }
-#endif
-
         // =========================================================================================
         // WHAT FOLLOWS ARE OVERRIDES OF THE VIRTUAL METHODS OF THE REPORTER INTERFACE
         // =========================================================================================
@@ -5897,15 +6302,21 @@ namespace {
             }
         }
 
-        void test_run_start() override { printIntro(); }
+        void test_run_start() override {
+            if(!opt.minimal)
+                printIntro();
+        }
 
         void test_run_end(const TestRunStats& p) override {
+            if(opt.minimal && p.numTestCasesFailed == 0)
+                return;
+
             separator_to_stream();
             s << std::dec;
 
-            auto totwidth = int(std::ceil(log10((std::max(p.numTestCasesPassingFilters, static_cast<unsigned>(p.numAsserts))) + 1)));
-            auto passwidth = int(std::ceil(log10((std::max(p.numTestCasesPassingFilters - p.numTestCasesFailed, static_cast<unsigned>(p.numAsserts - p.numAssertsFailed))) + 1)));
-            auto failwidth = int(std::ceil(log10((std::max(p.numTestCasesFailed, static_cast<unsigned>(p.numAssertsFailed))) + 1)));
+            auto totwidth = int(std::ceil(log10(static_cast<double>(std::max(p.numTestCasesPassingFilters, static_cast<unsigned>(p.numAsserts))) + 1)));
+            auto passwidth = int(std::ceil(log10(static_cast<double>(std::max(p.numTestCasesPassingFilters - p.numTestCasesFailed, static_cast<unsigned>(p.numAsserts - p.numAssertsFailed))) + 1)));
+            auto failwidth = int(std::ceil(log10(static_cast<double>(std::max(p.numTestCasesFailed, static_cast<unsigned>(p.numAssertsFailed))) + 1)));
             const bool anythingFailed = p.numTestCasesFailed > 0 || p.numAssertsFailed > 0;
             s << Color::Cyan << "[doctest] " << Color::None << "test cases: " << std::setw(totwidth)
               << p.numTestCasesPassingFilters << " | "
@@ -5937,7 +6348,7 @@ namespace {
             subcasesStack.clear();
             currentSubcaseLevel = 0;
         }
-        
+
         void test_case_reenter(const TestCaseData&) override {
             subcasesStack.clear();
         }
@@ -5949,7 +6360,7 @@ namespace {
             // log the preamble of the test case only if there is something
             // else to print - something other than that an assert has failed
             if(opt.duration ||
-               (st.failure_flags && st.failure_flags != TestCaseFailureReason::AssertFailure))
+               (st.failure_flags && st.failure_flags != static_cast<int>(TestCaseFailureReason::AssertFailure)))
                 logTestStart();
 
             if(opt.duration)
@@ -5980,6 +6391,7 @@ namespace {
         }
 
         void test_case_exception(const TestCaseException& e) override {
+            DOCTEST_LOCK_MUTEX(mutex)
             if(tc->m_no_output)
                 return;
 
@@ -6004,14 +6416,12 @@ namespace {
         }
 
         void subcase_start(const SubcaseSignature& subc) override {
-            std::lock_guard<std::mutex> lock(mutex);
             subcasesStack.push_back(subc);
             ++currentSubcaseLevel;
             hasLoggedCurrentTestStart = false;
         }
 
         void subcase_end() override {
-            std::lock_guard<std::mutex> lock(mutex);
             --currentSubcaseLevel;
             hasLoggedCurrentTestStart = false;
         }
@@ -6020,7 +6430,7 @@ namespace {
             if((!rb.m_failed && !opt.success) || tc->m_no_output)
                 return;
 
-            std::lock_guard<std::mutex> lock(mutex);
+            DOCTEST_LOCK_MUTEX(mutex)
 
             logTestStart();
 
@@ -6036,7 +6446,7 @@ namespace {
             if(tc->m_no_output)
                 return;
 
-            std::lock_guard<std::mutex> lock(mutex);
+            DOCTEST_LOCK_MUTEX(mutex)
 
             logTestStart();
 
@@ -6066,9 +6476,9 @@ namespace {
         bool with_col = g_no_colors;                                                               \
         g_no_colors   = false;                                                                     \
         ConsoleReporter::func(arg);                                                                \
-        if(wrapped_oss.get().tellp() != std::streampos{}) {                                                      \
-            DOCTEST_OUTPUT_DEBUG_STRING(wrapped_oss.get().str().c_str());                                        \
-            wrapped_oss.get().str("");                                                                           \
+        if(wrapped_oss.get().tellp() != std::streampos{}) {                                        \
+            DOCTEST_OUTPUT_DEBUG_STRING(wrapped_oss.get().str().c_str());                          \
+            wrapped_oss.get().str("");                                                             \
         }                                                                                          \
         g_no_colors = with_col;                                                                    \
     }
@@ -6147,18 +6557,42 @@ namespace {
                            std::vector<String>& res) {
         String filtersString;
         if(parseOption(argc, argv, pattern, &filtersString)) {
-            // tokenize with "," as a separator
-            // cppcheck-suppress strtokCalled
-            DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wdeprecated-declarations")
-            auto pch = std::strtok(filtersString.c_str(), ","); // modifies the string
-            while(pch != nullptr) {
-                if(strlen(pch))
-                    res.push_back(pch);
-                // uses the strtok() internal state to go to the next token
-                // cppcheck-suppress strtokCalled
-                pch = std::strtok(nullptr, ",");
+            // tokenize with "," as a separator, unless escaped with backslash
+            std::ostringstream s;
+            auto flush = [&s, &res]() {
+                auto string = s.str();
+                if(string.size() > 0) {
+                    res.push_back(string.c_str());
+                }
+                s.str("");
+            };
+
+            bool seenBackslash = false;
+            const char* current = filtersString.c_str();
+            const char* end = current + strlen(current);
+            while(current != end) {
+                char character = *current++;
+                if(seenBackslash) {
+                    seenBackslash = false;
+                    if(character == ',' || character == '\\') {
+                        s.put(character);
+                        continue;
+                    }
+                    s.put('\\');
+                }
+                if(character == '\\') {
+                    seenBackslash = true;
+                } else if(character == ',') {
+                    flush();
+                } else {
+                    s.put(character);
+                }
+            }
+
+            if(seenBackslash) {
+                s.put('\\');
             }
-            DOCTEST_CLANG_SUPPRESS_WARNING_POP
+            flush();
             return true;
         }
         return false;
@@ -6177,30 +6611,30 @@ namespace {
         if(!parseOption(argc, argv, pattern, &parsedValue))
             return false;
 
-        if(type == 0) {
+        if(type) {
+            // integer
+            // TODO: change this to use std::stoi or something else! currently it uses undefined behavior - assumes '0' on failed parse...
+            int theInt = std::atoi(parsedValue.c_str());
+            if (theInt != 0) {
+                res = theInt; //!OCLINT parameter reassignment
+                return true;
+            }
+        } else {
             // boolean
-            const char positive[][5] = {"1", "true", "on", "yes"};  // 5 - strlen("true") + 1
-            const char negative[][6] = {"0", "false", "off", "no"}; // 6 - strlen("false") + 1
+            const char positive[][5] = { "1", "true", "on", "yes" };  // 5 - strlen("true") + 1
+            const char negative[][6] = { "0", "false", "off", "no" }; // 6 - strlen("false") + 1
 
             // if the value matches any of the positive/negative possibilities
-            for(unsigned i = 0; i < 4; i++) {
-                if(parsedValue.compare(positive[i], true) == 0) {
+            for (unsigned i = 0; i < 4; i++) {
+                if (parsedValue.compare(positive[i], true) == 0) {
                     res = 1; //!OCLINT parameter reassignment
                     return true;
                 }
-                if(parsedValue.compare(negative[i], true) == 0) {
+                if (parsedValue.compare(negative[i], true) == 0) {
                     res = 0; //!OCLINT parameter reassignment
                     return true;
                 }
             }
-        } else {
-            // integer
-            // TODO: change this to use std::stoi or something else! currently it uses undefined behavior - assumes '0' on failed parse...
-            int theInt = std::atoi(parsedValue.c_str()); // NOLINT
-            if(theInt != 0) {
-                res = theInt; //!OCLINT parameter reassignment
-                return true;
-            }
         }
         return false;
     }
@@ -6291,9 +6725,12 @@ void Context::parseArgs(int argc, const char* const* argv, bool withDefaults) {
     DOCTEST_PARSE_AS_BOOL_OR_FLAG("case-sensitive", "cs", case_sensitive, false);
     DOCTEST_PARSE_AS_BOOL_OR_FLAG("exit", "e", exit, false);
     DOCTEST_PARSE_AS_BOOL_OR_FLAG("duration", "d", duration, false);
+    DOCTEST_PARSE_AS_BOOL_OR_FLAG("minimal", "m", minimal, false);
+    DOCTEST_PARSE_AS_BOOL_OR_FLAG("quiet", "q", quiet, false);
     DOCTEST_PARSE_AS_BOOL_OR_FLAG("no-throw", "nt", no_throw, false);
     DOCTEST_PARSE_AS_BOOL_OR_FLAG("no-exitcode", "ne", no_exitcode, false);
     DOCTEST_PARSE_AS_BOOL_OR_FLAG("no-run", "nr", no_run, false);
+    DOCTEST_PARSE_AS_BOOL_OR_FLAG("no-intro", "ni", no_intro, false);
     DOCTEST_PARSE_AS_BOOL_OR_FLAG("no-version", "nv", no_version, false);
     DOCTEST_PARSE_AS_BOOL_OR_FLAG("no-colors", "nc", no_colors, false);
     DOCTEST_PARSE_AS_BOOL_OR_FLAG("force-colors", "fc", force_colors, false);
@@ -6357,10 +6794,14 @@ void Context::clearFilters() {
         curr.clear();
 }
 
-// allows the user to override procedurally the int/bool options from the command line
+// allows the user to override procedurally the bool options from the command line
+void Context::setOption(const char* option, bool value) {
+    setOption(option, value ? "true" : "false");
+}
+
+// allows the user to override procedurally the int options from the command line
 void Context::setOption(const char* option, int value) {
     setOption(option, toString(value).c_str());
-    // NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks)
 }
 
 // allows the user to override procedurally the string options from the command line
@@ -6377,6 +6818,31 @@ void Context::setAsDefaultForAssertsOutOfTestCases() { g_cs = p; }
 
 void Context::setAssertHandler(detail::assert_handler ah) { p->ah = ah; }
 
+void Context::setCout(std::ostream* out) { p->cout = out; }
+
+static class DiscardOStream : public std::ostream
+{
+private:
+    class : public std::streambuf
+    {
+    private:
+        // allowing some buffering decreases the amount of calls to overflow
+        char buf[1024];
+
+    protected:
+        std::streamsize xsputn(const char_type*, std::streamsize count) override { return count; }
+
+        int_type overflow(int_type ch) override {
+            setp(std::begin(buf), std::end(buf));
+            return traits_type::not_eof(ch);
+        }
+    } discardBuf;
+
+public:
+    DiscardOStream()
+            : std::ostream(&discardBuf) {}
+} discardOut;
+
 // the main function that does all the filtering and test running
 int Context::run() {
     using namespace detail;
@@ -6390,15 +6856,22 @@ int Context::run() {
     g_no_colors = p->no_colors;
     p->resetRunData();
 
-    // stdout by default
-    p->cout = &std::cout;
-    p->cerr = &std::cerr;
-
-    // or to a file if specified
     std::fstream fstr;
-    if(p->out.size()) {
-        fstr.open(p->out.c_str(), std::fstream::out);
-        p->cout = &fstr;
+    if(p->cout == nullptr) {
+        if(p->quiet) {
+            p->cout = &discardOut;
+        } else if(p->out.size()) {
+            // to a file if specified
+            fstr.open(p->out.c_str(), std::fstream::out);
+            p->cout = &fstr;
+        } else {
+#ifndef DOCTEST_CONFIG_NO_INCLUDE_IOSTREAM
+            // stdout by default
+            p->cout = &std::cout;
+#else // DOCTEST_CONFIG_NO_INCLUDE_IOSTREAM
+            return EXIT_FAILURE;
+#endif // DOCTEST_CONFIG_NO_INCLUDE_IOSTREAM
+        }
     }
 
     FatalConditionHandler::allocateAltStackMem();
@@ -6470,7 +6943,7 @@ int Context::run() {
             // random_shuffle implementation
             const auto first = &testArray[0];
             for(size_t i = testArray.size() - 1; i > 0; --i) {
-                int idxToSwap = std::rand() % (i + 1); // NOLINT
+                int idxToSwap = std::rand() % (i + 1);
 
                 const auto temp = first[i];
 
@@ -6557,19 +7030,20 @@ int Context::run() {
             p->numAssertsFailedCurrentTest_atomic = 0;
             p->numAssertsCurrentTest_atomic       = 0;
 
-            p->subcasesPassed.clear();
+            p->fullyTraversedSubcases.clear();
 
             DOCTEST_ITERATE_THROUGH_REPORTERS(test_case_start, tc);
 
             p->timer.start();
-            
+
             bool run_test = true;
 
             do {
                 // reset some of the fields for subcases (except for the set of fully passed ones)
-                p->should_reenter          = false;
-                p->subcasesCurrentMaxLevel = 0;
-                p->subcasesStack.clear();
+                p->reachedLeaf = false;
+                // May not be empty if previous subcase exited via exception.
+                p->subcaseStack.clear();
+                p->currentSubcaseDepth = 0;
 
                 p->shouldLogCurrentException = true;
 
@@ -6602,10 +7076,10 @@ DOCTEST_MSVC_SUPPRESS_WARNING_POP
                     run_test = false;
                     p->failure_flags |= TestCaseFailureReason::TooManyFailedAsserts;
                 }
-                
-                if(p->should_reenter && run_test)
+
+                if(!p->nextSubcaseStack.empty() && run_test)
                     DOCTEST_ITERATE_THROUGH_REPORTERS(test_case_reenter, tc);
-                if(!p->should_reenter)
+                if(p->nextSubcaseStack.empty())
                     run_test = false;
             } while(run_test);
 
@@ -6631,17 +7105,10 @@ DOCTEST_MSVC_SUPPRESS_WARNING_POP
         DOCTEST_ITERATE_THROUGH_REPORTERS(report_query, qdata);
     }
 
-    // see these issues on the reasoning for this:
-    // - https://github.com/onqtam/doctest/issues/143#issuecomment-414418903
-    // - https://github.com/onqtam/doctest/issues/126
-    auto DOCTEST_FIX_FOR_MACOS_LIBCPP_IOSFWD_STRING_LINK_ERRORS = []() DOCTEST_NOINLINE
-        { std::cout << std::string(); };
-    DOCTEST_FIX_FOR_MACOS_LIBCPP_IOSFWD_STRING_LINK_ERRORS();
-
     return cleanup_and_return();
 }
 
-IReporter::~IReporter() = default;
+DOCTEST_DEFINE_INTERFACE(IReporter)
 
 int IReporter::get_num_active_contexts() { return detail::wrapped_g_infoContexts.get().size(); }
 const IContextScope* const* IReporter::get_active_contexts() {
@@ -6676,5 +7143,17 @@ DOCTEST_CLANG_SUPPRESS_WARNING_POP
 DOCTEST_MSVC_SUPPRESS_WARNING_POP
 DOCTEST_GCC_SUPPRESS_WARNING_POP
 
+DOCTEST_SUPPRESS_COMMON_WARNINGS_POP
+
 #endif // DOCTEST_LIBRARY_IMPLEMENTATION
 #endif // DOCTEST_CONFIG_IMPLEMENT
+
+#ifdef DOCTEST_UNDEF_WIN32_LEAN_AND_MEAN
+#undef WIN32_LEAN_AND_MEAN
+#undef DOCTEST_UNDEF_WIN32_LEAN_AND_MEAN
+#endif // DOCTEST_UNDEF_WIN32_LEAN_AND_MEAN
+
+#ifdef DOCTEST_UNDEF_NOMINMAX
+#undef NOMINMAX
+#undef DOCTEST_UNDEF_NOMINMAX
+#endif // DOCTEST_UNDEF_NOMINMAX
diff --git a/external/tbb/test/common/dummy_body.h b/external/tbb/test/common/dummy_body.h
index 9c80476a..2a26f203 100644
--- a/external/tbb/test/common/dummy_body.h
+++ b/external/tbb/test/common/dummy_body.h
@@ -29,7 +29,7 @@ static void doDummyWork(std::size_t N) {
 class DummyBody {
     int m_numIters;
 public:
-    explicit DummyBody( int iters ) : m_numIters( iters ) {}
+    explicit DummyBody( int iters = 0 ) : m_numIters( iters ) {}
     void operator()( int ) const {
         doDummyWork(m_numIters);
     }
diff --git a/external/tbb/test/common/exception_handling.h b/external/tbb/test/common/exception_handling.h
index 9e182f3c..1d1b62c3 100644
--- a/external/tbb/test/common/exception_handling.h
+++ b/external/tbb/test/common/exception_handling.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -102,7 +102,7 @@ class test_exception : public std::exception {
 public:
     test_exception ( const char* description ) : my_description(description) {}
 
-    const char* what() const throw() override { return my_description; }
+    const char* what() const noexcept override { return my_description; }
 };
 
 class solitary_test_exception : public test_exception {
@@ -173,9 +173,11 @@ inline void ThrowTestException ( intptr_t threshold ) {
 
 #define CATCH()     \
     } catch ( PropagatedException& e ) { \
-        intptr_t exprected = 0;\
-        g_ExecutedAtFirstCatch.compare_exchange_strong(exprected, g_CurExecuted); \
-        g_ExecutedAtLastCatch = g_CurExecuted.load(); \
+        intptr_t expected = 0;\
+        g_ExecutedAtFirstCatch.compare_exchange_strong(expected , g_CurExecuted); \
+        intptr_t curExecuted = g_CurExecuted.load(); \
+        expected = g_ExecutedAtLastCatch.load();\
+        while (expected < curExecuted) g_ExecutedAtLastCatch.compare_exchange_strong(expected, curExecuted); \
         REQUIRE_MESSAGE(e.what(), "Empty what() string" );  \
         REQUIRE_MESSAGE((strcmp(EXCEPTION_NAME(e), (g_SolitaryException ? typeid(solitary_test_exception) : typeid(test_exception)).name() ) == 0), "Unexpected original exception name"); \
         REQUIRE_MESSAGE((strcmp(e.what(), EXCEPTION_DESCR) == 0), "Unexpected original exception info"); \
diff --git a/external/tbb/test/common/graph_utils.h b/external/tbb/test/common/graph_utils.h
index a19bcddf..2c2099f6 100644
--- a/external/tbb/test/common/graph_utils.h
+++ b/external/tbb/test/common/graph_utils.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@
 #include "config.h"
 
 #include "oneapi/tbb/flow_graph.h"
+#include "oneapi/tbb/task.h"
 #include "oneapi/tbb/null_rw_mutex.h"
 #include "oneapi/tbb/concurrent_unordered_set.h"
 
@@ -34,7 +35,7 @@
 
 #include "common/spin_barrier.h"
 
-using tbb::detail::d1::SUCCESSFULLY_ENQUEUED;
+using tbb::detail::d2::SUCCESSFULLY_ENQUEUED;
 
 // Needed conversion to and from continue_msg, but didn't want to add
 // conversion operators to the class, since we don't want it in general,
@@ -276,11 +277,17 @@ struct harness_counting_receiver : public tbb::flow::receiver<T> {
         return my_graph;
     }
 
-    tbb::detail::d1::graph_task *try_put_task( const T & ) override {
+    tbb::detail::d2::graph_task *try_put_task( const T & ) override {
       ++my_count;
-      return const_cast<tbb::detail::d1::graph_task*>(SUCCESSFULLY_ENQUEUED);
+      return const_cast<tbb::detail::d2::graph_task*>(SUCCESSFULLY_ENQUEUED);
     }
 
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+    tbb::detail::d2::graph_task *try_put_task( const T &t, const tbb::detail::d2::message_metainfo& ) override {
+      return try_put_task(t);
+    }
+#endif
+
     void validate() {
         size_t n = my_count;
         CHECK( n == num_copies*max_value );
@@ -300,7 +307,7 @@ struct harness_mapped_receiver : public tbb::flow::receiver<T> {
     multiset_type *my_multiset;
     tbb::flow::graph& my_graph;
 
-    harness_mapped_receiver(tbb::flow::graph& g) : my_multiset(NULL), my_graph(g) {
+    harness_mapped_receiver(tbb::flow::graph& g) : my_multiset(nullptr), my_graph(g) {
        my_count = 0;
     }
 
@@ -310,26 +317,33 @@ struct harness_mapped_receiver : public tbb::flow::receiver<T> {
     virtual
 #endif
     ~harness_mapped_receiver() {
-        if ( my_multiset ) delete my_multiset;
+        delete my_multiset;
+        my_multiset = nullptr;
     }
 
     void initialize_map( const T& m, size_t c ) {
        my_count = 0;
        max_value = m;
        num_copies = c;
-       if ( my_multiset ) delete my_multiset;
+       delete my_multiset;
        my_multiset = new multiset_type;
     }
 
-    tbb::detail::d1::graph_task* try_put_task( const T &t ) override {
+    tbb::detail::d2::graph_task* try_put_task( const T &t ) override {
       if ( my_multiset ) {
           (*my_multiset).emplace( t );
       } else {
           ++my_count;
       }
-      return const_cast<tbb::detail::d1::graph_task*>(SUCCESSFULLY_ENQUEUED);
+      return const_cast<tbb::detail::d2::graph_task*>(SUCCESSFULLY_ENQUEUED);
     }
 
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+    tbb::detail::d2::graph_task *try_put_task( const T &t, const tbb::detail::d2::message_metainfo& ) override {
+      return try_put_task(t);
+    }
+#endif
+
     tbb::flow::graph& graph_reference() const override {
         return my_graph;
     }
@@ -369,13 +383,13 @@ struct harness_counting_sender : public tbb::flow::sender<T> {
     size_t my_limit;
 
     harness_counting_sender( ) : my_limit(~size_t(0)) {
-       my_receiver = NULL;
+       my_receiver = nullptr;
        my_count = 0;
        my_received = 0;
     }
 
     harness_counting_sender( size_t limit ) : my_limit(limit) {
-       my_receiver = NULL;
+       my_receiver = nullptr;
        my_count = 0;
        my_received = 0;
     }
@@ -386,7 +400,7 @@ struct harness_counting_sender : public tbb::flow::sender<T> {
     }
 
     bool remove_successor( successor_type &r ) override {
-        successor_type *s = my_receiver.exchange( NULL );
+        successor_type *s = my_receiver.exchange( nullptr );
         CHECK( s == &r );
         return true;
     }
@@ -402,6 +416,12 @@ struct harness_counting_sender : public tbb::flow::sender<T> {
         }
     }
 
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+    bool try_get( T & v, tbb::detail::d2::message_metainfo& ) override {
+        return try_get(v);
+    }
+#endif
+
     bool try_put_once() {
         successor_type *s = my_receiver;
         size_t i = my_count++;
@@ -687,7 +707,7 @@ class native_loop_body {
 public:
     native_loop_body(NodeType& node) : my_node(node) {}
 
-    void operator()(int) const {
+    void operator()(int) const noexcept {
         std::thread::id this_id = std::this_thread::get_id();
         my_node.try_put(this_id);
     }
@@ -700,9 +720,9 @@ class concurrency_checker_body {
     concurrency_checker_body() { g_body_count = 0; }
 
     template<typename gateway_type>
-    void operator()(const std::thread::id& input, gateway_type&) { increase_and_check(input); }
+    void operator()(const std::thread::id& input, gateway_type&) noexcept { increase_and_check(input); }
 
-    output_tuple_type operator()(const std::thread::id& input) {
+    output_tuple_type operator()(const std::thread::id& input) noexcept {
         increase_and_check(input);
         return output_tuple_type();
     }
@@ -739,7 +759,7 @@ class native_loop_limited_body {
 public:
     native_loop_limited_body(NodeType& node, utils::SpinBarrier& barrier):
         my_node(node), my_barrier(barrier) {}
-    void operator()(int) const {
+    void operator()(int) const noexcept {
         std::thread::id this_id = std::this_thread::get_id();
         my_node.try_put(this_id);
         if(!lightweight_work_processed) {
@@ -759,6 +779,7 @@ struct condition_predicate {
 std::atomic<unsigned> g_lightweight_count;
 std::atomic<unsigned> g_task_count;
 
+template <bool NoExcept>
 class limited_lightweight_checker_body {
 public:
     limited_lightweight_checker_body() {
@@ -769,10 +790,9 @@ class limited_lightweight_checker_body {
 private:
     void increase_and_check(const std::thread::id& /*input*/) {
         ++g_body_count;
-        // TODO revamp: in order not to rely on scheduler functionality anymore add
-        // __TBB_EXTRA_DEBUG for counting the number of tasks actually created by the flow graph,
-        // hence consider moving lightweight testing into whitebox test for the flow graph.
-        bool is_inside_task = false;/*tbb::task::self().state() == tbb::task::executing;*/
+
+        bool is_inside_task = oneapi::tbb::task::current_context() != nullptr;
+
         if(is_inside_task) {
             ++g_task_count;
         } else {
@@ -784,10 +804,10 @@ class limited_lightweight_checker_body {
     }
 public:
     template<typename gateway_type>
-    void operator()(const std::thread::id& input, gateway_type&) {
+    void operator()(const std::thread::id& input, gateway_type&) noexcept(NoExcept) {
         increase_and_check(input);
     }
-    output_tuple_type operator()(const std::thread::id& input) {
+    output_tuple_type operator()(const std::thread::id& input) noexcept(NoExcept) {
         increase_and_check(input);
         return output_tuple_type();
     }
@@ -798,25 +818,102 @@ void test_limited_lightweight_execution(unsigned N, unsigned concurrency) {
     CHECK_MESSAGE(concurrency != tbb::flow::unlimited,
                   "Test for limited concurrency cannot be called with unlimited concurrency argument");
     tbb::flow::graph g;
-    NodeType node(g, concurrency, limited_lightweight_checker_body());
+    NodeType node(g, concurrency, limited_lightweight_checker_body</*NoExcept*/true>());
     // Execute first body as lightweight, then wait for all other threads to fill internal buffer.
     // Then unblock the lightweight thread and check if other body executions are inside oneTBB task.
     utils::SpinBarrier barrier(N - concurrency);
     utils::NativeParallelFor(N, native_loop_limited_body<NodeType>(node, barrier));
     g.wait_for_all();
     CHECK_MESSAGE(g_body_count == N, "Body needs to be executed N times");
-    // TODO revamp: enable the following checks once whitebox flow graph testing is ready for it.
-    // CHECK_MESSAGE(g_lightweight_count == concurrency, "Body needs to be executed as lightweight once");
-    // CHECK_MESSAGE(g_task_count == N - concurrency, "Body needs to be executed as not lightweight N - 1 times");
+    CHECK_MESSAGE(g_lightweight_count == concurrency, "Body needs to be executed as lightweight once");
+    CHECK_MESSAGE(g_task_count == N - concurrency, "Body needs to be executed as not lightweight N - 1 times");
     work_submitted = false;
     lightweight_work_processed = false;
 }
 
+template<typename NodeType>
+void test_limited_lightweight_execution_with_throwing_body(unsigned N, unsigned concurrency) {
+    CHECK_MESSAGE(concurrency != tbb::flow::unlimited,
+                  "Test for limited concurrency cannot be called with unlimited concurrency argument");
+    tbb::flow::graph g;
+    NodeType node(g, concurrency, limited_lightweight_checker_body</*NoExcept*/false>());
+    // Body is no noexcept, in this case it must be executed as tasks, instead of lightweight execution
+    utils::SpinBarrier barrier(N);
+    utils::NativeParallelFor(N, native_loop_limited_body<NodeType>(node, barrier));
+    g.wait_for_all();
+    CHECK_MESSAGE(g_body_count == N, "Body needs to be executed N times");
+    CHECK_MESSAGE(g_lightweight_count == 0, "Body needs to be executed with queueing policy");
+    CHECK_MESSAGE(g_task_count == N, "Body needs to be executed as task N times");
+    work_submitted = false;
+    lightweight_work_processed = false;
+}
+
+template <int Threshold>
+struct throwing_body{
+    std::atomic<int>& my_counter;
+
+    throwing_body(std::atomic<int>& counter) : my_counter(counter) {}
+
+    template<typename input_type, typename gateway_type>
+    void operator()(const input_type&, gateway_type&) {
+        ++my_counter;
+        if(my_counter == Threshold)
+            throw Threshold;
+    }
+
+    template<typename input_type>
+    output_tuple_type operator()(const input_type&) {
+        ++my_counter;
+        if(my_counter == Threshold)
+            throw Threshold;
+        return output_tuple_type();
+    }
+};
+
+#if TBB_USE_EXCEPTIONS
+//! Test excesption thrown in node with lightweight policy was rethrown by graph
+template<template<typename, typename, typename> class NodeType>
+void test_exception_ligthweight_policy(){
+    std::atomic<int> counter {0};
+    constexpr int threshold = 10;
+
+    using IndexerNodeType = oneapi::tbb::flow::indexer_node<int, int>;
+    using FuncNodeType = NodeType<IndexerNodeType::output_type, output_tuple_type, tbb::flow::lightweight>;
+    oneapi::tbb::flow::graph g;
+
+    IndexerNodeType indexer(g);
+    FuncNodeType tested_node(g, oneapi::tbb::flow::serial, throwing_body<threshold>(counter));
+    oneapi::tbb::flow::make_edge(indexer, tested_node);
+
+    utils::NativeParallelFor( threshold * 2, [&](int i){
+        if(i % 2)
+            std::get<1>(indexer.input_ports()).try_put(1);
+        else
+            std::get<0>(indexer.input_ports()).try_put(0);
+    });
+
+    bool catchException = false;
+    try
+    {
+        g.wait_for_all();
+    }
+    catch (const int& exc)
+    {
+        catchException = true;
+        CHECK_MESSAGE( exc == threshold, "graph.wait_for_all() rethrow current exception" );
+    }
+    CHECK_MESSAGE( catchException, "The exception must be thrown from graph.wait_for_all()" );
+    CHECK_MESSAGE( counter == threshold, "Graph must cancel all tasks after exception" );
+}
+#endif /* TBB_USE_EXCEPTIONS */
+
 template<typename NodeType>
 void test_lightweight(unsigned N) {
     test_unlimited_lightweight_execution<NodeType>(N);
     test_limited_lightweight_execution<NodeType>(N, tbb::flow::serial);
     test_limited_lightweight_execution<NodeType>(N, (std::min)(std::thread::hardware_concurrency() / 2, N/2));
+
+    test_limited_lightweight_execution_with_throwing_body<NodeType>(N, tbb::flow::serial);
 }
 
 template<template<typename, typename, typename> class NodeType>
@@ -824,6 +921,10 @@ void test(unsigned N) {
     typedef std::thread::id input_type;
     typedef NodeType<input_type, output_tuple_type, tbb::flow::queueing_lightweight> node_type;
     test_lightweight<node_type>(N);
+
+#if TBB_USE_EXCEPTIONS
+    test_exception_ligthweight_policy<NodeType>();
+#endif /* TBB_USE_EXCEPTIONS */
 }
 
 } // namespace lightweight_testing
diff --git a/external/tbb/test/common/initializer_list_support.h b/external/tbb/test/common/initializer_list_support.h
index e17ad853..8198ec22 100644
--- a/external/tbb/test/common/initializer_list_support.h
+++ b/external/tbb/test/common/initializer_list_support.h
@@ -21,6 +21,7 @@
 
 #include <initializer_list>
 #include <vector>
+#include <type_traits>
 
 namespace initializer_list_support_tests {
 
@@ -33,6 +34,9 @@ void test_ctor( std::initializer_list<ElementType> init, const ContainerType& ex
 template <typename ContainerType, typename ElementType>
 void test_assignment_operator( std::initializer_list<ElementType> init, const ContainerType& expected ) {
     ContainerType cont;
+    static_assert(std::is_same< decltype(cont = init), ContainerType& >::value == true,
+        "ContainerType::operator=(std::intializer_list) must return ContainerType&");
+
     cont = init;
     REQUIRE_MESSAGE(cont == expected, "Assignment from the initializer_list failed");
 }
diff --git a/external/tbb/test/common/memory_usage.h b/external/tbb/test/common/memory_usage.h
index c4e31550..cf8b4180 100644
--- a/external/tbb/test/common/memory_usage.h
+++ b/external/tbb/test/common/memory_usage.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -91,16 +91,16 @@ namespace utils {
 #elif _WIN32
         PROCESS_MEMORY_COUNTERS mem;
         bool status = GetProcessMemoryInfo(GetCurrentProcess(), &mem, sizeof(mem)) != 0;
-        ASSERT(status, NULL);
+        ASSERT(status, nullptr);
         return stat == currentUsage ? mem.PagefileUsage : mem.PeakPagefileUsage;
 #elif __unix__
         long unsigned size = 0;
         FILE* fst = fopen("/proc/self/status", "r");
-        ASSERT(fst != nullptr, NULL);
+        ASSERT(fst != nullptr, nullptr);
         const int BUF_SZ = 200;
         char buf_stat[BUF_SZ];
         const char* pattern = stat == peakUsage ? "VmPeak: %lu" : "VmSize: %lu";
-        while (NULL != fgets(buf_stat, BUF_SZ, fst)) {
+        while (nullptr != fgets(buf_stat, BUF_SZ, fst)) {
             if (1 == sscanf(buf_stat, pattern, &size)) {
                 ASSERT(size, "Invalid value of memory consumption.");
                 break;
@@ -119,7 +119,7 @@ namespace utils {
         task_basic_info info;
         mach_msg_type_number_t msg_type = TASK_BASIC_INFO_COUNT;
         status = task_info(mach_task_self(), TASK_BASIC_INFO, reinterpret_cast<task_info_t>(&info), &msg_type);
-        ASSERT(status == KERN_SUCCESS, NULL);
+        ASSERT(status == KERN_SUCCESS, nullptr);
         return info.virtual_size - shared_size;
 #else
         return 0;
@@ -128,7 +128,7 @@ namespace utils {
 
     //! Use approximately a specified amount of stack space.
     /** Recursion is used here instead of alloca because some implementations of alloca do not use the stack. */
-    void UseStackSpace(size_t amount, char* top = 0) {
+    void UseStackSpace(size_t amount, char* top = nullptr) {
         char x[1000];
         memset(x, -1, sizeof(x));
         if (!top)
@@ -141,27 +141,32 @@ namespace utils {
 #if __unix__
 
     inline bool isTHPEnabledOnMachine() {
-        unsigned long long thpPresent = 'n';
+        long long thpPresent = 'n';
+        long long hugePageSize = -1;
+
         parseFileItem thpItem[] = { { "[alwa%cs] madvise never\n", thpPresent } };
+        parseFileItem hpSizeItem[] = { { "Hugepagesize: %lld kB", hugePageSize } };
+
         parseFile</*BUFF_SIZE=*/100>("/sys/kernel/mm/transparent_hugepage/enabled", thpItem);
+        parseFile</*BUFF_SIZE=*/100>("/proc/meminfo", hpSizeItem);
 
-        if (thpPresent == 'y') {
+        if (hugePageSize > -1 && thpPresent == 'y') {
             return true;
         } else {
             return false;
         }
     }
-    inline unsigned long long getSystemTHPAllocatedSize() {
-        unsigned long long anonHugePagesSize = 0;
+    inline long long getSystemTHPAllocatedSize() {
+        long long anonHugePagesSize = 0;
         parseFileItem meminfoItems[] = {
-            { "AnonHugePages: %llu kB", anonHugePagesSize } };
+            { "AnonHugePages: %lld kB", anonHugePagesSize } };
         parseFile</*BUFF_SIZE=*/100>("/proc/meminfo", meminfoItems);
         return anonHugePagesSize;
     }
-    inline unsigned long long getSystemTHPCount() {
-        unsigned long long anonHugePages = 0;
+    inline long long getSystemTHPCount() {
+        long long anonHugePages = 0;
         parseFileItem vmstatItems[] = {
-            { "nr_anon_transparent_hugepages %llu", anonHugePages } };
+            { "nr_anon_transparent_hugepages %lld", anonHugePages } };
         parseFile</*BUFF_SIZE=*/100>("/proc/vmstat", vmstatItems);
         return anonHugePages;
     }
diff --git a/external/tbb/test/common/parallel_for_each_common.h b/external/tbb/test/common/parallel_for_each_common.h
index 3e680715..345d7980 100644
--- a/external/tbb/test/common/parallel_for_each_common.h
+++ b/external/tbb/test/common/parallel_for_each_common.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -36,12 +36,12 @@
 constexpr std::size_t depths_nubmer = 20;
 static std::atomic<int> g_values_counter;
 
-class value_t {
+class value_t : public utils::NoAfterlife {
     size_t x;
     value_t& operator=(const value_t&);
 public:
     value_t(size_t xx) : x(xx) { ++g_values_counter; }
-    value_t(const value_t& v) : x(v.x) { ++g_values_counter; }
+    value_t(const value_t& v) : utils::NoAfterlife(v), x(v.x) { ++g_values_counter; }
     value_t(value_t&& v) : x(v.x) { ++g_values_counter; }
     ~value_t() { --g_values_counter; }
     size_t value() const volatile { return x; }
diff --git a/external/tbb/test/common/test_invoke.h b/external/tbb/test/common/test_invoke.h
new file mode 100644
index 00000000..42b4b2b7
--- /dev/null
+++ b/external/tbb/test/common/test_invoke.h
@@ -0,0 +1,145 @@
+/*
+    Copyright (c) 2023 Intel Corporation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#ifndef __TBB_test_common_test_invoke_H
+#define __TBB_test_common_test_invoke_H
+
+#include "test.h"
+#include "oneapi/tbb/flow_graph.h"
+#include "oneapi/tbb/blocked_range.h"
+
+#if __TBB_CPP17_INVOKE_PRESENT
+namespace test_invoke {
+
+// Can be customized
+template <typename T>
+std::size_t get_real_index(const T& obj) {
+    return obj;
+}
+
+template <typename Value>
+class SmartRange : public oneapi::tbb::blocked_range<Value> {
+    using base_range = oneapi::tbb::blocked_range<Value>;
+public:
+    SmartRange(const Value& first, const Value& last) : base_range(first, last), change_vector(nullptr) {}
+    SmartRange(const Value& first, const Value& last, std::vector<std::size_t>& cv)
+        : base_range(first, last), change_vector(&cv) {}
+
+    SmartRange(const SmartRange&) = default;
+    SmartRange(SmartRange& other, oneapi::tbb::split)
+        : base_range(other, oneapi::tbb::split{}), change_vector(other.change_vector) {}
+
+    void increase() const {
+        CHECK_MESSAGE(change_vector, "Attempt to operate with no associated vector");
+        for (std::size_t index = get_real_index(this->begin()); index != get_real_index(this->end()); ++index) {
+            ++(*change_vector)[index];
+        }
+    }
+
+    Value reduction(const Value& idx) const {
+        Value result = idx;
+        for (std::size_t index = get_real_index(this->begin()); index != get_real_index(this->end()); ++index) {
+            result = result + Value(index);
+        }
+        return Value(result);
+    }
+
+    Value scan(const Value& idx, bool is_final_scan) const {
+        CHECK_MESSAGE(change_vector, "Attempt to operate with no associated vector");
+        Value result = idx;
+        for (std::size_t index = get_real_index(this->begin()); index != get_real_index(this->end()); ++index) {
+            result = result + Value(index);
+            if (is_final_scan) (*change_vector)[index] = get_real_index(result);
+        }
+        return result;
+    }
+private:
+    std::vector<std::size_t>* change_vector;
+};
+
+template <typename IDType>
+class SmartID {
+public:
+    SmartID() : id(999), operate_signal_point(nullptr) {}
+    SmartID(std::size_t* sp) : id(999), operate_signal_point(sp) {}
+
+    SmartID(const IDType& n) : id(n), operate_signal_point(nullptr) {}
+    SmartID(const IDType& n, std::size_t* sp) : id(n), operate_signal_point(sp) {}
+
+    IDType get_id() const { return id; }
+    const IDType& get_id_ref() const { return id; }
+
+private:
+    template <typename TupleOfPorts, std::size_t... Is>
+    void send_id_impl(TupleOfPorts& ports, std::index_sequence<Is...>) const {
+        (std::get<Is>(ports).try_put(id) , ...);
+    }
+public:
+    template <typename TupleOfPorts>
+    void send_id(TupleOfPorts& ports) const {
+        send_id_impl(ports, std::make_index_sequence<std::tuple_size<TupleOfPorts>::value>());
+    }
+
+    template <typename GatewayType>
+    void send_id_to_gateway(GatewayType& gateway) const {
+        gateway.reserve_wait();
+        gateway.try_put(id);
+        gateway.release_wait();
+    }
+
+    void operate() const {
+        CHECK_MESSAGE(operate_signal_point, "incorrect test setup");
+        ++(*operate_signal_point);
+    }
+
+    IDType id;
+private:
+    std::size_t* operate_signal_point;
+};
+
+class SmartValue {
+public:
+    SmartValue(std::size_t rv) : real_value(rv) {}
+    SmartValue(const SmartValue&) = default;
+    SmartValue& operator=(const SmartValue&) = default;
+
+    SmartValue operator+(const SmartValue& other) const {
+        return SmartValue{real_value + other.real_value};
+    }
+    std::size_t operator-(const SmartValue& other) const {
+        return real_value - other.real_value;
+    }
+
+    std::size_t get() const { return real_value; }
+
+    bool operator<(const SmartValue& other) const {
+        return real_value < other.real_value;
+    }
+
+    SmartValue& operator++() { ++real_value; return *this; }
+private:
+    std::size_t real_value;
+};
+
+std::size_t get_real_index(const SmartValue& value) {
+    return value.get();
+}
+
+
+} // namespace test_invoke
+
+#endif // __TBB_CPP17_INVOKE_PRESENT
+#endif // __TBB_test_common_test_invoke_H
diff --git a/external/tbb/test/common/test_join_node_multiple_predecessors.h b/external/tbb/test/common/test_join_node_multiple_predecessors.h
new file mode 100644
index 00000000..9ae85e2b
--- /dev/null
+++ b/external/tbb/test/common/test_join_node_multiple_predecessors.h
@@ -0,0 +1,117 @@
+/*
+    Copyright (c) 2022 Intel Corporation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#ifndef __TBB_test_common_test_join_node_multiple_predecessors_H_
+#define __TBB_test_common_test_join_node_multiple_predecessors_H_
+
+#include "config.h"
+#include "oneapi/tbb/flow_graph.h"
+
+namespace multiple_predecessors {
+
+using namespace tbb::flow;
+
+using join_node_t = join_node<std::tuple<continue_msg, continue_msg, continue_msg>, reserving>;
+using queue_node_t = queue_node<std::tuple<continue_msg, continue_msg, continue_msg>>;
+
+void twist_join_connections(
+    buffer_node<continue_msg>& bn1, buffer_node<continue_msg>& bn2, buffer_node<continue_msg>& bn3,
+    join_node_t& jn)
+{
+    // order, in which edges are created/destroyed, is important
+    make_edge(bn1, input_port<0>(jn));
+    make_edge(bn2, input_port<0>(jn));
+    make_edge(bn3, input_port<0>(jn));
+
+    remove_edge(bn3, input_port<0>(jn));
+    make_edge  (bn3, input_port<2>(jn));
+
+    remove_edge(bn2, input_port<0>(jn));
+    make_edge  (bn2, input_port<1>(jn));
+}
+
+std::unique_ptr<join_node_t> connect_join_via_make_edge(
+    graph& g, buffer_node<continue_msg>& bn1, buffer_node<continue_msg>& bn2,
+    buffer_node<continue_msg>& bn3, queue_node_t& qn)
+{
+    std::unique_ptr<join_node_t> jn( new join_node_t(g) );
+    twist_join_connections( bn1, bn2, bn3, *jn );
+    make_edge(*jn, qn);
+    return jn;
+}
+
+#if TBB_PREVIEW_FLOW_GRAPH_FEATURES
+std::unique_ptr<join_node_t> connect_join_via_follows(
+    graph&, buffer_node<continue_msg>& bn1, buffer_node<continue_msg>& bn2,
+    buffer_node<continue_msg>& bn3, queue_node_t& qn)
+{
+    auto bn_set = make_node_set(bn1, bn2, bn3);
+    std::unique_ptr<join_node_t> jn( new join_node_t(follows(bn_set)) );
+    make_edge(*jn, qn);
+    return jn;
+}
+
+std::unique_ptr<join_node_t> connect_join_via_precedes(
+    graph&, buffer_node<continue_msg>& bn1, buffer_node<continue_msg>& bn2,
+    buffer_node<continue_msg>& bn3, queue_node_t& qn)
+{
+    auto qn_set = make_node_set(qn);
+    auto qn_copy_set = qn_set;
+    std::unique_ptr<join_node_t> jn( new join_node_t(precedes(qn_copy_set)) );
+    twist_join_connections( bn1, bn2, bn3, *jn );
+    return jn;
+}
+#endif // TBB_PREVIEW_FLOW_GRAPH_FEATURES
+
+void run_and_check(
+    graph& g, buffer_node<continue_msg>& bn1, buffer_node<continue_msg>& bn2,
+    buffer_node<continue_msg>& bn3, queue_node_t& qn, bool expected)
+{
+    std::tuple<continue_msg, continue_msg, continue_msg> msg;
+
+    bn1.try_put(continue_msg());
+    bn2.try_put(continue_msg());
+    bn3.try_put(continue_msg());
+    g.wait_for_all();
+
+    CHECK_MESSAGE(
+        (qn.try_get(msg) == expected),
+        "Unexpected message absence/existence at the end of the graph."
+    );
+}
+
+template<typename ConnectJoinNodeFunc>
+void test(ConnectJoinNodeFunc&& connect_join_node) {
+    graph g;
+    buffer_node<continue_msg> bn1(g);
+    buffer_node<continue_msg> bn2(g);
+    buffer_node<continue_msg> bn3(g);
+    queue_node_t qn(g);
+
+    auto jn = connect_join_node(g, bn1, bn2, bn3, qn);
+
+    run_and_check(g, bn1, bn2, bn3, qn, /*expected=*/true);
+
+    remove_edge(bn3, input_port<2>(*jn));
+    remove_edge(bn2, input_port<1>(*jn));
+    remove_edge(bn1, *jn); //Removes an edge between a sender and port 0 of a multi-input successor.
+    remove_edge(*jn, qn);
+
+    run_and_check(g, bn1, bn2, bn3, qn, /*expected=*/false);
+}
+} // namespace multiple_predecessors
+
+#endif // __TBB_test_common_test_join_node_multiple_predecessors_H_
diff --git a/external/tbb/test/common/tls_limit.h b/external/tbb/test/common/tls_limit.h
index 2039ba11..694753db 100644
--- a/external/tbb/test/common/tls_limit.h
+++ b/external/tbb/test/common/tls_limit.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@ class LimitTLSKeysTo {
 #if _WIN32 || _WIN64
     #if __TBB_WIN8UI_SUPPORT && !defined(TLS_OUT_OF_INDEXES)
         // for SDKs for Windows*8 Store Apps that did not redirect TLS to FLS
-        #define TlsAlloc() FlsAlloc(NULL)
+        #define TlsAlloc() FlsAlloc(nullptr)
         #define TlsFree FlsFree
         #define TLS_OUT_OF_INDEXES FLS_OUT_OF_INDEXES
     #endif
@@ -43,7 +43,7 @@ class LimitTLSKeysTo {
             if (h==TLS_OUT_OF_INDEXES)
 #else
             int setspecific_dummy=10;
-            if (pthread_key_create(&handles[lastUsedIdx], NULL)!=0)
+            if (pthread_key_create(&handles[lastUsedIdx], nullptr)!=0)
 #endif
             {
                 break;
diff --git a/external/tbb/test/common/utils.h b/external/tbb/test/common/utils.h
index febf7e07..5c4113de 100644
--- a/external/tbb/test/common/utils.h
+++ b/external/tbb/test/common/utils.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -32,6 +32,7 @@
 #include <algorithm>
 #include <cstring>
 #include <chrono>
+#include <unordered_set>
 
 #if HARNESS_TBBMALLOC_THREAD_SHUTDOWN && __TBB_SOURCE_DIRECTLY_INCLUDED && (_WIN32 || _WIN64)
 #include "../../src/tbbmalloc/tbbmalloc_internal_api.h"
@@ -437,6 +438,43 @@ concept well_formed_instantiation = requires {
 };
 #endif // __TBB_CPP20_CONCEPTS_PRESENT
 
+class LifeTrackableObject {
+    using set_type = std::unordered_set<const LifeTrackableObject*>;
+    static set_type alive_objects;
+public:
+    LifeTrackableObject() {
+        alive_objects.insert(this);
+    }
+
+    LifeTrackableObject(const LifeTrackableObject&) {
+        alive_objects.insert(this);
+    }
+
+    LifeTrackableObject(LifeTrackableObject&&) {
+        alive_objects.insert(this);
+    }
+
+    LifeTrackableObject& operator=(const LifeTrackableObject&) = default;
+    LifeTrackableObject& operator=(LifeTrackableObject&&) = default;
+
+    ~LifeTrackableObject() {
+        alive_objects.erase(this);
+    }
+
+    static bool is_alive(const LifeTrackableObject& object) {
+        return is_alive(&object);
+    }
+
+    static bool is_alive(const LifeTrackableObject* object) {
+        return alive_objects.find(object) != alive_objects.end();
+    }
+
+    static const set_type& set() {
+        return alive_objects;
+    }
+};
+std::unordered_set<const LifeTrackableObject*> LifeTrackableObject::alive_objects{};
+
 } // namespace utils
 
 #endif // __TBB_test_common_utils_H
diff --git a/external/tbb/test/common/utils_assert.h b/external/tbb/test/common/utils_assert.h
index 33bc8ab4..0123ab88 100644
--- a/external/tbb/test/common/utils_assert.h
+++ b/external/tbb/test/common/utils_assert.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2023 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -20,6 +20,8 @@
 #include "config.h"
 #include "utils_report.h"
 
+#include <cstdlib>
+
 #define REPORT_FATAL_ERROR REPORT
 
 namespace utils {
@@ -31,7 +33,7 @@ void ReportError( const char* filename, int line, const char* expression, const
     fflush(stdout); fflush(stderr);
 
 #if _MSC_VER && _DEBUG
-    if(1 == _CrtDbgReport(_CRT_ASSERT, filename, line, NULL, "%s\r\n%s", expression, message?message:""))
+    if(1 == _CrtDbgReport(_CRT_ASSERT, filename, line, nullptr, "%s\r\n%s", expression, message?message:""))
         _CrtDbgBreak();
 #else
     abort();
diff --git a/external/tbb/test/common/utils_concurrency_limit.h b/external/tbb/test/common/utils_concurrency_limit.h
index 9c86c08b..9d0b3c77 100644
--- a/external/tbb/test/common/utils_concurrency_limit.h
+++ b/external/tbb/test/common/utils_concurrency_limit.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2020-2021 Intel Corporation
+    Copyright (c) 2020-2023 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -37,13 +37,12 @@
 #endif
 #include <string.h>
 #include <sched.h>
-#elif __FreeBSD__
-#include <unistd.h>
+#if __FreeBSD__
 #include <errno.h>
-#include <string.h>
 #include <sys/param.h>
 #include <sys/cpuset.h>
 #endif
+#endif
 #include <thread>
 
 namespace utils {
@@ -184,7 +183,7 @@ void get_thread_affinity_mask(std::size_t& ncpus, std::vector<int>& free_indexes
         if (!err) break;
 
         CPU_FREE(mask);
-        mask = NULL;
+        mask = nullptr;
         if (errno != EINVAL) break;
         ncpus <<= 1;
     } while (ncpus < 16 * 1024 /* some reasonable limit */ );
@@ -258,7 +257,9 @@ class pinning_observer : public tbb::task_scheduler_observer {
         is_pinned = true;
     }
 
-    ~pinning_observer() { }
+    ~pinning_observer() {
+        observe(false);
+    }
 };
 
 #if __unix__
@@ -286,27 +287,44 @@ bool can_change_thread_priority() {
     return false;
 }
 
-void increase_thread_priority() {
 #if __unix__
-    pthread_t this_thread = pthread_self();
-    sched_param params;
-    params.sched_priority = sched_get_priority_max(SCHED_FIFO);
-    ASSERT(params.sched_priority != -1, nullptr);
-    int err = pthread_setschedparam(this_thread, SCHED_FIFO, &params);
-    ASSERT(err == 0, "Can not change thread priority.");
-#endif
-}
+class increased_priority_guard {
+public:
+    increased_priority_guard() : m_backup(get_current_schedparam()) {
+        increase_thread_priority();
+    }
 
-void decrease_thread_priority() {
-#if __unix__
-    pthread_t this_thread = pthread_self();
-    sched_param params;
-    params.sched_priority = sched_get_priority_min(SCHED_FIFO);
-    ASSERT(params.sched_priority != -1, nullptr);
-    int err = pthread_setschedparam(this_thread, SCHED_FIFO, &params);
-    ASSERT(err == 0, "Can not change thread priority.");
+    ~increased_priority_guard() {
+        // restore priority on destruction
+        pthread_t this_thread = pthread_self();
+        int err = pthread_setschedparam(this_thread, 
+            /*policy*/ m_backup.first, /*sched_param*/ &m_backup.second);
+        ASSERT(err == 0, nullptr);
+    }
+private:
+    std::pair<int, sched_param> get_current_schedparam() {
+        pthread_t this_thread = pthread_self();
+        sched_param params;
+        int policy = 0;
+        int err = pthread_getschedparam(this_thread, &policy, &params);
+        ASSERT(err == 0, nullptr);
+        return std::make_pair(policy, params);
+    }
+
+    void increase_thread_priority() {
+        pthread_t this_thread = pthread_self();
+        sched_param params;
+        params.sched_priority = sched_get_priority_max(SCHED_FIFO);
+        ASSERT(params.sched_priority != -1, nullptr);
+        int err = pthread_setschedparam(this_thread, SCHED_FIFO, &params);
+        ASSERT(err == 0, "Can not change thread priority.");
+    }
+
+    std::pair<int, sched_param> m_backup;
+};
+#else
+    class increased_priority_guard{};
 #endif
-}
 
 } // namespace utils
 
diff --git a/external/tbb/test/common/utils_dynamic_libs.h b/external/tbb/test/common/utils_dynamic_libs.h
index 22927fe1..99afca38 100644
--- a/external/tbb/test/common/utils_dynamic_libs.h
+++ b/external/tbb/test/common/utils_dynamic_libs.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -22,8 +22,8 @@
 
 #if __TBB_DYNAMIC_LOAD_ENABLED
 
-#if _WIN32 || _WIN64
-#include <Windows.h>
+#ifdef _WIN32
+#include <windows.h>
 #else
 #include <dlfcn.h>
 #endif
@@ -46,11 +46,19 @@ namespace utils {
 #endif
 #define EXT ".dll"
 #else
+#if TBB_USE_APPLE_FRAMEWORKS
+#define PREFIX // When built as Apple* Framework, the binary has no lib prefix
+#else
 #define PREFIX "lib"
+#endif
 #if __APPLE__
+#if TBB_USE_APPLE_FRAMEWORKS
+#define EXT // When built as Apple* Framework, the binary has no extension
+#else
 #define EXT ".dylib"
+#endif
 // Android SDK build system does not support .so file name versioning
-#elif __FreeBSD__ || __NetBSD__ || __sun || _AIX || __ANDROID__
+#elif __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __sun || _AIX || __ANDROID__
 #define EXT ".so"
 #elif __unix__  // Order of these elif's matters!
 #define EXT __TBB_STRING(.so.2)
@@ -58,10 +66,15 @@ namespace utils {
 #error Unknown OS
 #endif
 #endif
+#if TBB_USE_APPLE_FRAMEWORKS
+#define MALLOCFRAMEWORK "tbbmalloc.framework/"
+#else
+#define MALLOCFRAMEWORK
+#endif
 
 // Form the names of the TBB memory allocator binaries.
-#define MALLOCLIB_NAME1 PREFIX "tbbmalloc" SUFFIX1 EXT
-#define MALLOCLIB_NAME2 PREFIX "tbbmalloc" SUFFIX2 EXT
+#define MALLOCLIB_NAME1 MALLOCFRAMEWORK PREFIX "tbbmalloc" SUFFIX1 EXT
+#define MALLOCLIB_NAME2 MALLOCFRAMEWORK PREFIX "tbbmalloc" SUFFIX2 EXT
 
 #if _WIN32 || _WIN64
 using LIBRARY_HANDLE = HMODULE;
diff --git a/external/tbb/test/common/utils_env.h b/external/tbb/test/common/utils_env.h
index 4fb56956..a2634010 100644
--- a/external/tbb/test/common/utils_env.h
+++ b/external/tbb/test/common/utils_env.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -51,7 +51,7 @@ int SetEnv( const char *envname, const char *envval ) {
 char* GetEnv(const char *envname) {
     CHECK_MESSAGE(envname, "Harness::GetEnv() requires a valid C string");
 #if __TBB_WIN8UI_SUPPORT
-    return NULL;
+    return nullptr;
 #else
     return std::getenv(envname);
 #endif
diff --git a/external/tbb/test/common/utils_report.h b/external/tbb/test/common/utils_report.h
index dff75329..b1dcff69 100644
--- a/external/tbb/test/common/utils_report.h
+++ b/external/tbb/test/common/utils_report.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -53,6 +53,10 @@
         // Suppress "typedef ignored ... when no variable is declared" warning by vc14
         #pragma warning (push)
         #pragma warning (disable: 4091)
+        #ifndef NOMINMAX
+            #define NOMINMAX
+        #endif
+        #include <windows.h>
         #include <dbghelp.h>
         #pragma warning (pop)
         #pragma comment (lib, "dbghelp.lib")
@@ -154,11 +158,11 @@ inline void print_call_stack() {
     #elif _WIN32_WINNT > 0x0501 && _MSC_VER>=1500 && !__TBB_WIN8UI_SUPPORT && !defined(WINAPI_FAMILY)
         const int sz = 62; // XP limitation for number of frames
         void *buff[sz];
-        int n = CaptureStackBackTrace(0, sz, buff, NULL);
+        int n = CaptureStackBackTrace(0, sz, buff, nullptr);
         REPORT("Call stack info (%d):\n", n);
         static LONG once = 0;
         if( !InterlockedExchange(&once, 1) )
-            SymInitialize(GetCurrentProcess(), NULL, TRUE);
+            SymInitialize(GetCurrentProcess(), nullptr, TRUE);
         const int len = 255; // just some reasonable string buffer size
         union { SYMBOL_INFO sym; char pad[sizeof(SYMBOL_INFO)+len]; };
         sym.MaxNameLen = len;
diff --git a/external/tbb/test/conformance/conformance_allocators.cpp b/external/tbb/test/conformance/conformance_allocators.cpp
index e01c58c6..60ec5cae 100644
--- a/external/tbb/test/conformance/conformance_allocators.cpp
+++ b/external/tbb/test/conformance/conformance_allocators.cpp
@@ -18,8 +18,8 @@
 #include "oneapi/tbb/tbb_allocator.h"
 
 // the real body of the test is there:
-#include "common/allocator_stl_test_common.h"
 #include "common/allocator_test_common.h"
+#include "common/allocator_stl_test_common.h"
 
 //! \file conformance_allocators.cpp
 //! \brief Test for [memory_allocation.cache_aligned_allocator memory_allocation.tbb_allocator memory_allocation.cache_aligned_resource] specifications
@@ -37,9 +37,7 @@ TEST_CASE("Allocator concept") {
     AssertSameType(allocator.max_size(), typename std::allocator_traits<Allocator>::size_type(0));
     // Following assertion catches case where max_size() is so large that computation of
     // number of bytes for such an allocation would overflow size_type.
-    REQUIRE_MESSAGE((allocator.max_size() * typename std::allocator_traits<Allocator>::size_type(sizeof(int))
-                     >= allocator.max_size()),
-                    "max_size larger than reasonable");
+    REQUIRE_MESSAGE((allocator.max_size() * typename std::allocator_traits<Allocator>::size_type(sizeof(int)) >= allocator.max_size()), "max_size larger than reasonable");
 
     // operator==
     TestAllocator<oneapi::tbb::cache_aligned_allocator<void>>(Comparison);
@@ -70,8 +68,7 @@ TEST_CASE("Thread safety") {
 //! Testing tbb_allocator to return the type of allocation library used
 //! \brief \ref requirement
 TEST_CASE("tbb_allocator allocator type") {
-    using Allocator = oneapi::tbb::tbb_allocator<int>;
-    Allocator tbb_alloc;
+    using Allocator = oneapi::tbb::tbb_allocator<int>; Allocator tbb_alloc;
 #if _MSC_VER && _MSC_VER <= 1900 && !__INTEL_COMPILER
     utils::suppress_unused_warning(tbb_alloc);
 #endif
@@ -86,7 +83,7 @@ TEST_CASE("tbb_allocator allocator type") {
 //! \brief \ref interface \ref requirement
 TEST_CASE("polymorphic_allocator test") {
     oneapi::tbb::cache_aligned_resource aligned_resource;
-    TestAllocator<std::pmr::polymorphic_allocator<void>>(
-            Concept, std::pmr::polymorphic_allocator<void>(&aligned_resource));
+    TestAllocator<std::pmr::polymorphic_allocator<void>>(Concept, std::pmr::polymorphic_allocator<void>(&aligned_resource));
 }
 #endif
+
diff --git a/external/tbb/test/conformance/conformance_arena_constraints.cpp b/external/tbb/test/conformance/conformance_arena_constraints.cpp
index 0cac59af..de70fe8c 100644
--- a/external/tbb/test/conformance/conformance_arena_constraints.cpp
+++ b/external/tbb/test/conformance/conformance_arena_constraints.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2019-2021 Intel Corporation
+    Copyright (c) 2019-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -25,16 +25,16 @@
 //! \brief \ref interface \ref requirement
 TEST_CASE("NUMA aware arenas task execution test") {
     system_info::initialize();
-    for (auto& numa_index : oneapi::tbb::info::numa_nodes()) {
-        oneapi::tbb::task_arena arena(oneapi::tbb::task_arena::constraints {numa_index});
+    for(auto& numa_index: oneapi::tbb::info::numa_nodes()) {
+        oneapi::tbb::task_arena arena(oneapi::tbb::task_arena::constraints{numa_index});
 
-        std::atomic<bool> task_done {false};
-        arena.execute([&] { task_done = true; });
+        std::atomic<bool> task_done{false};
+        arena.execute([&]{ task_done = true; });
         REQUIRE_MESSAGE(task_done, "Execute was performed but task was not executed.");
 
         task_done = false;
-        arena.enqueue([&] { task_done = true; });
-        while (!task_done) { utils::yield(); }
+        arena.enqueue([&]{ task_done = true; });
+        while(!task_done) { utils::yield(); }
     }
 }
 
@@ -45,9 +45,10 @@ TEST_CASE("Test NUMA topology traversal correctness") {
     std::vector<index_info> numa_nodes_info = system_info::get_numa_nodes_info();
 
     std::vector<oneapi::tbb::numa_node_id> numa_indexes = oneapi::tbb::info::numa_nodes();
-    for (const auto& numa_id : numa_indexes) {
+    for (const auto& numa_id: numa_indexes) {
         auto pos = std::find_if(numa_nodes_info.begin(), numa_nodes_info.end(),
-                                [&](const index_info& numa_info) { return numa_info.index == numa_id; });
+            [&](const index_info& numa_info){ return numa_info.index == numa_id; }
+        );
 
         REQUIRE_MESSAGE(pos != numa_nodes_info.end(), "Wrong, extra or repeated NUMA node index detected.");
         numa_nodes_info.erase(pos);
@@ -56,6 +57,21 @@ TEST_CASE("Test NUMA topology traversal correctness") {
     REQUIRE_MESSAGE(numa_nodes_info.empty(), "Some available NUMA nodes indexes were not detected.");
 }
 
+#if __HYBRID_CPUS_TESTING
+//! Testing NUMA topology traversal correctness
+//! \brief \ref interface \ref requirement
+TEST_CASE("Test core types topology traversal correctness") {
+    system_info::initialize();
+    std::vector<index_info> core_types_info = system_info::get_cpu_kinds_info();
+    std::vector<tbb::core_type_id> core_types = tbb::info::core_types();
+
+    REQUIRE_MESSAGE(core_types_info.size() == core_types.size(), "Wrong core types number detected.");
+    for (unsigned i = 0; i < core_types.size(); ++i) {
+        REQUIRE_MESSAGE(core_types[i] == core_types_info[i].index, "Wrong core type index detected.");
+    }
+}
+#endif /*__HYBRID_CPUS_TESTING*/
+
 #else /*!__TBB_HWLOC_VALID_ENVIRONMENT*/
 
 //! Testing NUMA support interfaces validity when HWLOC is not presented on system
@@ -64,13 +80,11 @@ TEST_CASE("Test validity of NUMA interfaces when HWLOC is not present on the sys
     std::vector<oneapi::tbb::numa_node_id> numa_indexes = oneapi::tbb::info::numa_nodes();
 
     REQUIRE_MESSAGE(numa_indexes.size() == 1,
-                    "Number of NUMA nodes must be pinned to 1, if we have no HWLOC on the system.");
+        "Number of NUMA nodes must be pinned to 1, if we have no HWLOC on the system.");
     REQUIRE_MESSAGE(numa_indexes[0] == -1,
-                    "Index of NUMA node must be pinned to -1, if we have no HWLOC on the system.");
-    REQUIRE_MESSAGE(oneapi::tbb::info::default_concurrency(numa_indexes[0])
-                            == utils::get_platform_max_threads(),
-                    "Concurrency for NUMA node must be equal to default_num_threads(), if we have no HWLOC "
-                    "on the system.");
+        "Index of NUMA node must be pinned to -1, if we have no HWLOC on the system.");
+    REQUIRE_MESSAGE(oneapi::tbb::info::default_concurrency(numa_indexes[0]) == utils::get_platform_max_threads(),
+        "Concurrency for NUMA node must be equal to default_num_threads(), if we have no HWLOC on the system.");
 }
 
 #endif /*__TBB_HWLOC_VALID_ENVIRONMENT*/
diff --git a/external/tbb/test/conformance/conformance_async_node.cpp b/external/tbb/test/conformance/conformance_async_node.cpp
index 9a9be40b..486e61d5 100644
--- a/external/tbb/test/conformance/conformance_async_node.cpp
+++ b/external/tbb/test/conformance/conformance_async_node.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2020-2021 Intel Corporation
+    Copyright (c) 2020-2023 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -15,20 +15,21 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
 #endif
 
 #include "conformance_flowgraph.h"
+#include "common/test_invoke.h"
 
 //! \file conformance_async_node.cpp
 //! \brief Test for [flow_graph.async_node] specification
 
-using input_msg = conformance::message</*default_ctor*/ true, /*copy_ctor*/ true, /*copy_assign*/ false>;
-using output_msg = conformance::message</*default_ctor*/ false, /*copy_ctor*/ false, /*copy_assign*/ false>;
+using input_msg = conformance::message</*default_ctor*/true, /*copy_ctor*/true, /*copy_assign*/false>;
+using output_msg = conformance::message</*default_ctor*/false, /*copy_ctor*/false, /*copy_assign*/false>;
 
 //! Test async_node constructors
 //! \brief \ref requirement
-TEST_CASE("async_node constructors") {
+TEST_CASE("async_node constructors"){
     using namespace oneapi::tbb::flow;
     graph g;
 
@@ -38,76 +39,68 @@ TEST_CASE("async_node constructors") {
     async_node<int, int> fn2(g, unlimited, fun, oneapi::tbb::flow::node_priority_t(1));
 
     async_node<int, int, lightweight> lw_node1(g, serial, fun, lightweight());
-    async_node<int, int, lightweight> lw_node2(g, serial, fun, lightweight(),
-                                               oneapi::tbb::flow::node_priority_t(1));
+    async_node<int, int, lightweight> lw_node2(g, serial, fun, lightweight(), oneapi::tbb::flow::node_priority_t(1));
 }
 
 //! Test buffering property
 //! \brief \ref requirement
 TEST_CASE("async_node buffering") {
     conformance::dummy_functor<int> fun;
-    conformance::test_buffering<oneapi::tbb::flow::async_node<input_msg, int>, input_msg>(
-            oneapi::tbb::flow::unlimited, fun);
+    conformance::test_buffering<oneapi::tbb::flow::async_node<input_msg, int>, input_msg>(oneapi::tbb::flow::unlimited, fun);
 }
 
 //! Test priorities work in single-threaded configuration
 //! \brief \ref requirement
-TEST_CASE("async_node priority support") {
-    conformance::test_priority<oneapi::tbb::flow::async_node<input_msg, int>, input_msg>(
-            oneapi::tbb::flow::unlimited);
+TEST_CASE("async_node priority support"){
+    conformance::test_priority<oneapi::tbb::flow::async_node<input_msg, int>, input_msg>(oneapi::tbb::flow::unlimited);
 }
 
 //! The node that is constructed has a reference to the same graph object as src, has a copy of the initial body used by src, and has the same concurrency threshold as src.
 //! The predecessors and successors of src are not copied.
 //! \brief \ref requirement
-TEST_CASE("async_node copy constructor") {
+TEST_CASE("async_node copy constructor"){
     conformance::test_copy_ctor<oneapi::tbb::flow::async_node<int, int>>();
 }
 
 //! Test calling async body
 //! \brief \ref interface \ref requirement
 TEST_CASE("Test async_node body") {
-    conformance::test_body_exec<oneapi::tbb::flow::async_node<input_msg, output_msg>, input_msg, output_msg>(
-            oneapi::tbb::flow::unlimited);
+    conformance::test_body_exec<oneapi::tbb::flow::async_node<input_msg, output_msg>, input_msg, output_msg>(oneapi::tbb::flow::unlimited);
 }
 
 //! Test async_node inheritance relations
 //! \brief \ref interface
-TEST_CASE("async_node superclasses") {
+TEST_CASE("async_node superclasses"){
     conformance::test_inheritance<oneapi::tbb::flow::async_node<int, int>, int, int>();
     conformance::test_inheritance<oneapi::tbb::flow::async_node<void*, float>, void*, float>();
-    conformance::test_inheritance<oneapi::tbb::flow::async_node<input_msg, output_msg>, input_msg,
-                                  output_msg>();
+    conformance::test_inheritance<oneapi::tbb::flow::async_node<input_msg, output_msg>, input_msg, output_msg>();
 }
 
 //! Test node broadcast messages to successors
 //! \brief \ref requirement
-TEST_CASE("async_node broadcast") {
+TEST_CASE("async_node broadcast"){
     conformance::counting_functor<int> fun(conformance::expected);
-    conformance::test_forwarding<oneapi::tbb::flow::async_node<input_msg, int>, input_msg, int>(
-            1, oneapi::tbb::flow::unlimited, fun);
+    conformance::test_forwarding<oneapi::tbb::flow::async_node<input_msg, int>, input_msg, int>(1, oneapi::tbb::flow::unlimited, fun);
 }
 
 //! Test async_node has a user-settable concurrency limit. It can be set to one of predefined values.
 //! The user can also provide a value of type std::size_t to limit concurrency.
 //! Test that not more than limited threads works in parallel.
 //! \brief \ref requirement
-TEST_CASE("concurrency follows set limits") {
+TEST_CASE("concurrency follows set limits"){
     conformance::test_concurrency<oneapi::tbb::flow::async_node<int, int>>();
 }
 
 //! Test body copying and copy_body logic
 //! Test the body object passed to a node is copied
 //! \brief \ref interface
-TEST_CASE("async_node body copying") {
-    conformance::test_copy_body_function<oneapi::tbb::flow::async_node<int, int>,
-                                         conformance::copy_counting_object<int>>(
-            oneapi::tbb::flow::unlimited);
+TEST_CASE("async_node body copying"){
+    conformance::test_copy_body_function<oneapi::tbb::flow::async_node<int, int>, conformance::copy_counting_object<int>>(oneapi::tbb::flow::unlimited);
 }
 
 //! Test node reject the incoming message if the concurrency limit achieved.
 //! \brief \ref interface
-TEST_CASE("async_node with rejecting policy") {
+TEST_CASE("async_node with rejecting policy"){
     conformance::test_rejecting<oneapi::tbb::flow::async_node<int, int, oneapi::tbb::flow::rejecting>>();
 }
 
@@ -120,25 +113,56 @@ TEST_CASE("Test async_node Output and Input class") {
 
 //! Test the body of assync_node typically submits the messages to an external activity for processing outside of the graph.
 //! \brief \ref interface
-TEST_CASE("async_node with rejecting policy") {
+TEST_CASE("async_node with rejecting policy"){
     using async_node_type = tbb::flow::async_node<int, int>;
     using gateway_type = async_node_type::gateway_type;
 
     oneapi::tbb::flow::graph g;
-    std::atomic<bool> flag {false};
+    std::atomic<bool> flag{false};
     std::thread thr;
-    async_node_type testing_node {g, tbb::flow::unlimited, [&](const int& input, gateway_type& gateway) {
-                                      gateway.reserve_wait();
-                                      thr = std::thread {[&] {
-                                          flag = true;
-                                          gateway.try_put(input);
-                                          gateway.release_wait();
-                                      }};
-                                  }};
+    async_node_type testing_node{
+      g, tbb::flow::unlimited,
+      [&](const int& input, gateway_type& gateway) {
+          gateway.reserve_wait();
+          thr = std::thread{[&]{
+              flag = true;
+              gateway.try_put(input);
+              gateway.release_wait();
+          }};
+      }
+    };
 
     testing_node.try_put(1);
     g.wait_for_all();
-    CHECK_MESSAGE((flag.load()), "The body of assync_node must submits the messages to an external activity "
-                                 "for processing outside of the graph");
+    CHECK_MESSAGE((flag.load()), "The body of assync_node must submits the messages to an external activity for processing outside of the graph");
     thr.join();
 }
+
+#if __TBB_CPP17_INVOKE_PRESENT
+//! Test that async_node uses std::invoke to run the body
+//! \brief \ref requirement
+TEST_CASE("async_node and std::invoke") {
+    using namespace oneapi::tbb::flow;
+
+    using start_node_type = function_node<std::size_t, test_invoke::SmartID<std::size_t>>;
+    using async_node_type = async_node<test_invoke::SmartID<std::size_t>, std::size_t>;
+
+    auto async_body = &test_invoke::SmartID<std::size_t>::template send_id_to_gateway<typename async_node_type::gateway_type>;
+
+    graph g;
+    start_node_type starter(g, serial, [](std::size_t i) -> test_invoke::SmartID<std::size_t> { return {i}; });
+    async_node_type activity_submitter(g, serial, async_body);
+    buffer_node<std::size_t> buf(g);
+
+    make_edge(starter, activity_submitter);
+    make_edge(activity_submitter, buf);
+
+    starter.try_put(1);
+
+    g.wait_for_all();
+    std::size_t result = 0;
+    CHECK(buf.try_get(result));
+    CHECK(result == 1);
+    CHECK(!buf.try_get(result));
+}
+#endif
diff --git a/external/tbb/test/conformance/conformance_blocked_nd_range.cpp b/external/tbb/test/conformance/conformance_blocked_nd_range.cpp
new file mode 100644
index 00000000..999eacb3
--- /dev/null
+++ b/external/tbb/test/conformance/conformance_blocked_nd_range.cpp
@@ -0,0 +1,293 @@
+/*
+    Copyright (c) 2017-2024 Intel Corporation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#include "common/test.h"
+#include "common/utils.h"
+#include "common/utils_assert.h"
+#include "common/utils_concurrency_limit.h"
+
+//! \file conformance_blocked_nd_range.cpp
+//! \brief Test for [algorithms.blocked_nd_range] specification
+
+#include "oneapi/tbb/blocked_nd_range.h"
+#include "oneapi/tbb/parallel_for.h"
+#include "oneapi/tbb/global_control.h"
+
+#include <algorithm> // std::for_each
+#include <array>
+
+// AbstractValueType class represents Value concept's requirements in the most abstract way
+class AbstractValueType {
+    int value;
+    AbstractValueType() {}
+public:
+    friend AbstractValueType MakeAbstractValue(int i);
+    friend int GetValueOf(const AbstractValueType& v);
+};
+
+int GetValueOf(const AbstractValueType& v) { return v.value; }
+
+AbstractValueType MakeAbstractValue(int i) {
+    AbstractValueType x;
+    x.value = i;
+    return x;
+}
+
+// operator- returns amount of elements of AbstractValueType between u and v
+std::size_t operator-(const AbstractValueType& u, const AbstractValueType& v) {
+    return GetValueOf(u) - GetValueOf(v);
+}
+
+bool operator<(const AbstractValueType& u, const AbstractValueType& v) {
+    return GetValueOf(u) < GetValueOf(v);
+}
+
+AbstractValueType operator+(const AbstractValueType& u, std::size_t offset) {
+    return MakeAbstractValue(GetValueOf(u) + int(offset));
+}
+
+template<typename range_t, unsigned int N>
+struct range_utils {
+    using val_t = typename range_t::value_type;
+
+    template<typename EntityType, std::size_t DimSize>
+    using data_type = std::array<typename range_utils<range_t, N - 1>::template data_type<EntityType, DimSize>, DimSize>;
+
+    template<typename EntityType, std::size_t DimSize>
+    static void init_data(data_type<EntityType, DimSize>& data) {
+        std::for_each(data.begin(), data.end(), range_utils<range_t, N - 1>::template init_data<EntityType, DimSize>);
+    }
+
+    template<typename EntityType, std::size_t DimSize>
+    static void increment_data(const range_t& range, data_type<EntityType, DimSize>& data) {
+        auto begin = data.begin() + range.dim(N - 1).begin();
+        // same as "auto end = out.begin() + range.dim(N - 1).end();"
+        auto end = begin + range.dim(N - 1).size();
+        for (auto i = begin; i != end; ++i) {
+            range_utils<range_t, N - 1>::template increment_data<EntityType, DimSize>(range, *i);
+        }
+    }
+
+    template<typename EntityType, std::size_t DimSize>
+    static void check_data(const range_t& range, data_type<EntityType, DimSize>& data) {
+        auto begin = data.begin() + range.dim(N - 1).begin();
+        // same as "auto end = out.begin() + range.dim(N - 1).end();"
+        auto end = begin + range.dim(N - 1).size();
+        for (auto i = begin; i != end; ++i) {
+            range_utils<range_t, N - 1>::template check_data<EntityType, DimSize>(range, *i);
+        }
+    }
+
+// BullseyeCoverage Compile C++ with GCC 5.4 warning suppression
+// Sequence points error in braced initializer list
+#if __GNUC__ && !defined(__clang__) && !defined(__INTEL_COMPILER)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wsequence-point"
+#endif
+    template<typename input_t, std::size_t... Is>
+    static range_t make_range(std::size_t shift, bool negative, val_t(*gen)(input_t), oneapi::tbb::detail::index_sequence<Is...>) {
+        return range_t( { { gen(negative ? -input_t(Is + shift) : 0), gen(input_t(Is + shift)), Is + 1} ... } );
+    }
+#if __GNUC__ && !defined(__clang__) && !defined(__INTEL_COMPILER)
+#pragma GCC diagnostic pop
+#endif
+
+    static bool is_empty(const range_t& range) {
+        if (range.dim(N - 1).empty()) { return true; }
+        return range_utils<range_t, N - 1>::is_empty(range);
+    }
+
+    static bool is_divisible(const range_t& range) {
+        if (range.dim(N - 1).is_divisible()) { return true; }
+        return range_utils<range_t, N - 1>::is_divisible(range);
+    }
+
+    static void check_splitting(const range_t& range_split, const range_t& range_new, int(*get)(const val_t&), bool split_checker = false) {
+        if (get(range_split.dim(N - 1).begin()) == get(range_new.dim(N - 1).begin())) {
+            REQUIRE(get(range_split.dim(N - 1).end()) == get(range_new.dim(N - 1).end()));
+        }
+        else {
+            REQUIRE((get(range_split.dim(N - 1).end()) == get(range_new.dim(N - 1).begin()) && !split_checker));
+            split_checker = true;
+        }
+        range_utils<range_t, N - 1>::check_splitting(range_split, range_new, get, split_checker);
+    }
+
+};
+
+template<typename range_t>
+struct range_utils<range_t, 0> {
+    using val_t = typename range_t::value_type;
+
+    template<typename EntityType, std::size_t DimSize>
+    using data_type = EntityType;
+
+    template<typename EntityType, std::size_t DimSize>
+    static void init_data(data_type<EntityType, DimSize>& data) { data = 0; }
+
+    template<typename EntityType, std::size_t DimSize>
+    static void increment_data(const range_t&, data_type<EntityType, DimSize>& data) { ++data; }
+
+    template<typename EntityType, std::size_t DimSize>
+    static void check_data(const range_t&, data_type<EntityType, DimSize>& data) {
+        REQUIRE(data == 1);
+    }
+
+    static bool is_empty(const range_t&) { return false; }
+
+    static bool is_divisible(const range_t&) { return false; }
+
+    static void check_splitting(const range_t&, const range_t&, int(*)(const val_t&), bool) {}
+};
+
+// We need MakeInt function to pass it into make_range as factory function
+// because of matching make_range with AbstractValueType and other types too
+int MakeInt(int i) { return i; }
+
+template<unsigned int DimAmount>
+void SerialTest() {
+    static_assert((oneapi::tbb::blocked_nd_range<int, DimAmount>::dim_count() == oneapi::tbb::blocked_nd_range<AbstractValueType, DimAmount>::dim_count()),
+                         "different amount of dimensions");
+
+    using range_t = oneapi::tbb::blocked_nd_range<AbstractValueType, DimAmount>;
+    using utils_t = range_utils<range_t, DimAmount>;
+
+    // Generate empty range
+    range_t r = utils_t::make_range(0, true, &MakeAbstractValue, oneapi::tbb::detail::make_index_sequence<DimAmount>());
+
+    utils::AssertSameType(r.is_divisible(), bool());
+    utils::AssertSameType(r.empty(), bool());
+    utils::AssertSameType(range_t::dim_count(), 0U);
+
+    REQUIRE((r.empty() == utils_t::is_empty(r) && r.empty()));
+    REQUIRE(r.is_divisible() == utils_t::is_divisible(r));
+
+    // Generate not-empty range divisible range
+    r = utils_t::make_range(1, true, &MakeAbstractValue, oneapi::tbb::detail::make_index_sequence<DimAmount>());
+    REQUIRE((r.empty() == utils_t::is_empty(r) && !r.empty()));
+    REQUIRE((r.is_divisible() == utils_t::is_divisible(r) && r.is_divisible()));
+
+    range_t r_new(r, oneapi::tbb::split());
+    utils_t::check_splitting(r, r_new, &GetValueOf);
+
+    SerialTest<DimAmount - 1>();
+}
+template<> void SerialTest<0>() {}
+
+template<unsigned int DimAmount>
+void ParallelTest() {
+    using range_t = oneapi::tbb::blocked_nd_range<int, DimAmount>;
+    using utils_t = range_utils<range_t, DimAmount>;
+
+    // Max size is                                 1 << 20 - 1 bytes
+    // Thus size of one dimension's elements is    1 << (20 / DimAmount - 1) bytes
+    typename utils_t::template data_type<unsigned char, 1 << (20 / DimAmount - 1)> data;
+    utils_t::init_data(data);
+
+    range_t r = utils_t::make_range((1 << (20 / DimAmount - 1)) - DimAmount, false, &MakeInt, oneapi::tbb::detail::make_index_sequence<DimAmount>());
+
+    oneapi::tbb::parallel_for(r, [&data](const range_t& range) {
+        utils_t::increment_data(range, data);
+    });
+
+    utils_t::check_data(r, data);
+
+    ParallelTest<DimAmount - 1>();
+}
+template<> void ParallelTest<0>() {}
+
+//! Testing blocked_nd_range construction
+//! \brief \ref interface
+TEST_CASE("Construction") {
+    oneapi::tbb::blocked_nd_range<int, 1>{ { 0,13,3 } };
+
+    oneapi::tbb::blocked_nd_range<int, 1>{ oneapi::tbb::blocked_range<int>{ 0,13,3 } };
+
+    oneapi::tbb::blocked_nd_range<int, 2>(oneapi::tbb::blocked_range<int>(-8923, 8884, 13), oneapi::tbb::blocked_range<int>(-8923, 5, 13));
+
+    oneapi::tbb::blocked_nd_range<int, 2>({ -8923, 8884, 13 }, { -8923, 8884, 13 });
+
+    oneapi::tbb::blocked_range<int> r1(0, 13);
+
+    oneapi::tbb::blocked_range<int> r2(-12, 23);
+
+    oneapi::tbb::blocked_nd_range<int, 2>({ { -8923, 8884, 13 }, r1});
+
+    oneapi::tbb::blocked_nd_range<int, 2>({ r2, r1 });
+
+    oneapi::tbb::blocked_nd_range<int, 2>(r1, r2);
+
+    int sizes[] = {174, 39, 2481, 93};
+    oneapi::tbb::blocked_nd_range<int, 4> rNd_1(sizes, /*grainsize*/7);
+
+    oneapi::tbb::blocked_nd_range<int, 4> rNd_2({174, 39, 2481, 93}, /*grainsize*/11);
+
+    for (unsigned i = 0; i < rNd_1.dim_count(); ++i) {
+        oneapi::tbb::blocked_nd_range<int, 4>::dim_range_type dim1 = rNd_1.dim(i);
+        oneapi::tbb::blocked_nd_range<int, 4>::dim_range_type dim2 = rNd_2.dim(i);
+        REQUIRE(dim1.begin()==0);
+        REQUIRE(dim2.begin()==0);
+        unsigned int szi = sizes[i]; // to compare with unsigned integrals without warnings
+        REQUIRE(dim1.size()==szi);
+        REQUIRE(dim2.size()==szi);
+        REQUIRE(dim1.grainsize()==7);
+        REQUIRE(dim2.grainsize()==11);
+    }
+
+    oneapi::tbb::blocked_nd_range<AbstractValueType, 4>({ MakeAbstractValue(-3), MakeAbstractValue(13), 8 },
+                                               { MakeAbstractValue(-53), MakeAbstractValue(23), 2 },
+                                               { MakeAbstractValue(-23), MakeAbstractValue(33), 1 },
+                                               { MakeAbstractValue(-13), MakeAbstractValue(43), 7 });
+}
+
+static const std::size_t N = 4;
+
+//! Testing blocked_nd_range interface
+//! \brief \ref interface \ref requirement
+TEST_CASE("Serial test") {
+    SerialTest<N>();
+}
+
+#if !EMSCRIPTEN
+//! Testing blocked_nd_range interface with parallel_for
+//! \brief \ref requirement
+TEST_CASE("Parallel test") {
+    for ( auto concurrency_level : utils::concurrency_range() ) {
+        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism, concurrency_level);
+        ParallelTest<N>();
+    }
+}
+#endif
+
+//! Testing blocked_nd_range with proportional splitting
+//! \brief \ref interface \ref requirement
+TEST_CASE("blocked_nd_range proportional splitting") {
+    oneapi::tbb::blocked_nd_range<int, 2> original{{0, 100}, {0, 100}};
+    oneapi::tbb::blocked_nd_range<int, 2> first(original);
+    oneapi::tbb::proportional_split ps(3, 1);
+    oneapi::tbb::blocked_nd_range<int, 2> second(first, ps);
+
+    int expected_first_end = static_cast<int>(
+        original.dim(0).begin() + ps.left() * (original.dim(0).end() - original.dim(0).begin()) / (ps.left() + ps.right())
+    );
+    if (first.dim(0).size() == second.dim(0).size()) {
+        // Splitting was made by cols
+        utils::check_range_bounds_after_splitting(original.dim(1), first.dim(1), second.dim(1), expected_first_end);
+    } else {
+        // Splitting was made by rows
+        utils::check_range_bounds_after_splitting(original.dim(0), first.dim(0), second.dim(0), expected_first_end);
+    }
+}
diff --git a/external/tbb/test/conformance/conformance_blocked_range.cpp b/external/tbb/test/conformance/conformance_blocked_range.cpp
index f217a6ff..b4afe06e 100644
--- a/external/tbb/test/conformance/conformance_blocked_range.cpp
+++ b/external/tbb/test/conformance/conformance_blocked_range.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -20,8 +20,8 @@
 #include "common/utils_concurrency_limit.h"
 
 #include "oneapi/tbb/blocked_range.h"
-#include "oneapi/tbb/global_control.h"
 #include "oneapi/tbb/parallel_for.h"
+#include "oneapi/tbb/global_control.h"
 
 #include <vector>
 
@@ -31,57 +31,55 @@
 class AbstractValueType {
     AbstractValueType() {}
     int value;
-
 public:
-    friend AbstractValueType MakeAbstractValueType(int i);
-    friend int GetValueOf(const AbstractValueType& v) { return v.value; }
+    friend AbstractValueType MakeAbstractValueType( int i );
+    friend int GetValueOf( const AbstractValueType& v ) {return v.value;}
 };
 
-AbstractValueType MakeAbstractValueType(int i) {
+AbstractValueType MakeAbstractValueType( int i ) {
     AbstractValueType x;
     x.value = i;
     return x;
 }
 
-std::size_t operator-(const AbstractValueType& u, const AbstractValueType& v) {
+std::size_t operator-( const AbstractValueType& u, const AbstractValueType& v ) {
     return GetValueOf(u) - GetValueOf(v);
 }
 
-bool operator<(const AbstractValueType& u, const AbstractValueType& v) {
+bool operator<( const AbstractValueType& u, const AbstractValueType& v ) {
     return GetValueOf(u) < GetValueOf(v);
 }
 
-AbstractValueType operator+(const AbstractValueType& u, std::size_t offset) {
+AbstractValueType operator+( const AbstractValueType& u, std::size_t offset ) {
     return MakeAbstractValueType(GetValueOf(u) + int(offset));
 }
 
 static void SerialTest() {
-    for (int x = -10; x < 10; ++x) {
-        for (int y = -10; y < 10; ++y) {
+    for( int x=-10; x<10; ++x ) {
+        for( int y=-10; y<10; ++y ) {
             AbstractValueType i = MakeAbstractValueType(x);
             AbstractValueType j = MakeAbstractValueType(y);
-            for (std::size_t k = 1; k < 10; ++k) {
+            for( std::size_t k=1; k<10; ++k ) {
                 typedef oneapi::tbb::blocked_range<AbstractValueType> range_type;
-                range_type r(i, j, k);
-                utils::AssertSameType(r.empty(), true);
-                utils::AssertSameType(range_type::size_type(), std::size_t());
-                utils::AssertSameType(static_cast<range_type::const_iterator*>(0),
-                                      static_cast<AbstractValueType*>(0));
-                utils::AssertSameType(r.begin(), MakeAbstractValueType(0));
-                utils::AssertSameType(r.end(), MakeAbstractValueType(0));
-                CHECK(r.empty() == (y <= x));
-                CHECK(r.grainsize() == k);
-                if (x <= y) {
-                    utils::AssertSameType(r.is_divisible(), true);
-                    CHECK(r.is_divisible() == (std::size_t(y - x) > k));
-                    CHECK(r.size() == std::size_t(y - x));
-                    if (r.is_divisible()) {
-                        oneapi::tbb::blocked_range<AbstractValueType> r2(r, oneapi::tbb::split());
-                        CHECK(GetValueOf(r.begin()) == x);
-                        CHECK(GetValueOf(r.end()) == GetValueOf(r2.begin()));
-                        CHECK(GetValueOf(r2.end()) == y);
-                        CHECK(r.grainsize() == k);
-                        CHECK(r2.grainsize() == k);
+                range_type r( i, j, k );
+                utils::AssertSameType( r.empty(), true );
+                utils::AssertSameType( range_type::size_type(), std::size_t() );
+                utils::AssertSameType( static_cast<range_type::const_iterator*>(nullptr), static_cast<AbstractValueType*>(nullptr) );
+                utils::AssertSameType( r.begin(), MakeAbstractValueType(0) );
+                utils::AssertSameType( r.end(), MakeAbstractValueType(0) );
+                CHECK( r.empty()==(y<=x));
+                CHECK( r.grainsize()==k);
+                if( x<=y ) {
+                    utils::AssertSameType( r.is_divisible(), true );
+                    CHECK( r.is_divisible()==(std::size_t(y-x)>k) );
+                    CHECK( r.size()==std::size_t(y-x) );
+                    if( r.is_divisible() ) {
+                        oneapi::tbb::blocked_range<AbstractValueType> r2(r,oneapi::tbb::split());
+                        CHECK( GetValueOf(r.begin())==x );
+                        CHECK( GetValueOf(r.end())==GetValueOf(r2.begin()) );
+                        CHECK( GetValueOf(r2.end())==y );
+                        CHECK( r.grainsize()==k );
+                        CHECK( r2.grainsize()==k );
                     }
                 }
             }
@@ -89,21 +87,22 @@ static void SerialTest() {
     }
 }
 
-const int N = 1 << 22;
+const int N = 1<<22;
 unsigned char Array[N];
 
 struct Striker {
-    void operator()(const oneapi::tbb::blocked_range<int>& r) const {
-        for (oneapi::tbb::blocked_range<int>::const_iterator i = r.begin(); i != r.end(); ++i) ++Array[i];
+    void operator()( const oneapi::tbb::blocked_range<int>& r ) const {
+        for( oneapi::tbb::blocked_range<int>::const_iterator i=r.begin(); i!=r.end(); ++i )
+            ++Array[i];
     }
 };
 
 void ParallelTest() {
-    for (int i = 0; i < N; i = i < 3 ? i + 1 : i * 3) {
-        const oneapi::tbb::blocked_range<int> r(0, i, 10);
-        oneapi::tbb::parallel_for(r, Striker());
-        for (int k = 0; k < N; ++k) {
-            if (Array[k] != (k < i)) CHECK(false);
+    for (int i=0; i<N; i=i<3 ? i+1 : i*3) {
+        const oneapi::tbb::blocked_range<int> r( 0, i, 10 );
+        oneapi::tbb::parallel_for( r, Striker() );
+        for (int k=0; k<N; ++k) {
+            if (Array[k] != (k<i)) CHECK(false);
             Array[k] = 0;
         }
     }
@@ -111,14 +110,15 @@ void ParallelTest() {
 
 //! Testing blocked_range interface
 //! \brief \ref interface \ref requirement
-TEST_CASE("Basic serial") { SerialTest(); }
+TEST_CASE("Basic serial") {
+    SerialTest();
+}
 
 //! Testing blocked_range interface with parallel_for
 //! \brief \ref requirement
 TEST_CASE("Basic parallel") {
-    for (auto concurrency_level : utils::concurrency_range()) {
-        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism,
-                                            concurrency_level);
+    for ( auto concurrency_level : utils::concurrency_range() ) {
+        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism, concurrency_level);
         ParallelTest();
     }
 }
@@ -138,8 +138,10 @@ TEST_CASE("blocked_range proportional splitting") {
     CHECK(copy.size() == original.size() / 2);
     CHECK(splitted_copy.size() == copy.size());
 
+
     int expected_first_end = static_cast<int>(
-            original.begin() + ps.left() * (original.end() - original.begin()) / (ps.left() + ps.right()));
+        original.begin() + ps.left() * (original.end() - original.begin()) / (ps.left() + ps.right())
+    );
     utils::check_range_bounds_after_splitting(original, first, second, expected_first_end);
 }
 
@@ -147,7 +149,7 @@ TEST_CASE("blocked_range proportional splitting") {
 //! Testing blocked_range deduction guides
 //! \brief \ref interface
 TEST_CASE("Deduction guides") {
-    std::vector<const int*> v;
+    std::vector<const int *> v;
 
     // check blocked_range(Value, Value, size_t)
     oneapi::tbb::blocked_range r1(v.begin(), v.end());
@@ -162,3 +164,4 @@ TEST_CASE("Deduction guides") {
     static_assert(std::is_same<decltype(r3), decltype(r1)>::value);
 }
 #endif
+
diff --git a/external/tbb/test/conformance/conformance_blocked_range2d.cpp b/external/tbb/test/conformance/conformance_blocked_range2d.cpp
index efc69724..31636968 100644
--- a/external/tbb/test/conformance/conformance_blocked_range2d.cpp
+++ b/external/tbb/test/conformance/conformance_blocked_range2d.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -20,50 +20,47 @@
 #include "common/utils_concurrency_limit.h"
 
 #include "oneapi/tbb/blocked_range2d.h"
-#include "oneapi/tbb/global_control.h"
 #include "oneapi/tbb/parallel_for.h"
+#include "oneapi/tbb/global_control.h"
 
 //! \file conformance_blocked_range2d.cpp
 //! \brief Test for [algorithms.blocked_range2d] specification
 
-template <typename Tag>
+template<typename Tag>
 class AbstractValueType {
     AbstractValueType() {}
     int value;
-
 public:
-    template <typename OtherTag>
-    friend AbstractValueType<OtherTag> MakeAbstractValueType(int i);
+    template<typename OtherTag>
+    friend AbstractValueType<OtherTag> MakeAbstractValueType( int i );
 
-    template <typename OtherTag>
-    friend int GetValueOf(const AbstractValueType<OtherTag>& v);
+    template<typename OtherTag>
+    friend int GetValueOf( const AbstractValueType<OtherTag>& v ) ;
 };
 
-template <typename Tag>
-AbstractValueType<Tag> MakeAbstractValueType(int i) {
+template<typename Tag>
+AbstractValueType<Tag> MakeAbstractValueType( int i ) {
     AbstractValueType<Tag> x;
     x.value = i;
     return x;
 }
 
-template <typename Tag>
-int GetValueOf(const AbstractValueType<Tag>& v) {
-    return v.value;
-}
+template<typename Tag>
+int GetValueOf( const AbstractValueType<Tag>& v ) {return v.value;}
 
-template <typename Tag>
-bool operator<(const AbstractValueType<Tag>& u, const AbstractValueType<Tag>& v) {
-    return GetValueOf(u) < GetValueOf(v);
+template<typename Tag>
+bool operator<( const AbstractValueType<Tag>& u, const AbstractValueType<Tag>& v ) {
+    return GetValueOf(u)<GetValueOf(v);
 }
 
-template <typename Tag>
-std::size_t operator-(const AbstractValueType<Tag>& u, const AbstractValueType<Tag>& v) {
-    return GetValueOf(u) - GetValueOf(v);
+template<typename Tag>
+std::size_t operator-( const AbstractValueType<Tag>& u, const AbstractValueType<Tag>& v ) {
+    return GetValueOf(u)-GetValueOf(v);
 }
 
-template <typename Tag>
-AbstractValueType<Tag> operator+(const AbstractValueType<Tag>& u, std::size_t offset) {
-    return MakeAbstractValueType<Tag>(GetValueOf(u) + int(offset));
+template<typename Tag>
+AbstractValueType<Tag> operator+( const AbstractValueType<Tag>& u, std::size_t offset ) {
+    return MakeAbstractValueType<Tag>(GetValueOf(u)+int(offset));
 }
 
 struct RowTag {};
@@ -72,39 +69,34 @@ struct ColTag {};
 static void SerialTest() {
     typedef AbstractValueType<RowTag> row_type;
     typedef AbstractValueType<ColTag> col_type;
-    typedef oneapi::tbb::blocked_range2d<row_type, col_type> range_type;
-    for (int row_x = -10; row_x < 10; ++row_x) {
-        for (int row_y = row_x; row_y < 10; ++row_y) {
+    typedef oneapi::tbb::blocked_range2d<row_type,col_type> range_type;
+    for( int row_x=-10; row_x<10; ++row_x ) {
+        for( int row_y=row_x; row_y<10; ++row_y ) {
             row_type row_i = MakeAbstractValueType<RowTag>(row_x);
             row_type row_j = MakeAbstractValueType<RowTag>(row_y);
-            for (int row_grain = 1; row_grain < 10; ++row_grain) {
-                for (int col_x = -10; col_x < 10; ++col_x) {
-                    for (int col_y = col_x; col_y < 10; ++col_y) {
+            for( int row_grain=1; row_grain<10; ++row_grain ) {
+                for( int col_x=-10; col_x<10; ++col_x ) {
+                    for( int col_y=col_x; col_y<10; ++col_y ) {
                         col_type col_i = MakeAbstractValueType<ColTag>(col_x);
                         col_type col_j = MakeAbstractValueType<ColTag>(col_y);
-                        for (int col_grain = 1; col_grain < 10; ++col_grain) {
-                            range_type r(row_i, row_j, row_grain, col_i, col_j, col_grain);
-                            utils::AssertSameType(r.is_divisible(), true);
-                            utils::AssertSameType(r.empty(), true);
-                            utils::AssertSameType(static_cast<range_type::row_range_type::const_iterator*>(0),
-                                                  static_cast<row_type*>(0));
-                            utils::AssertSameType(static_cast<range_type::col_range_type::const_iterator*>(0),
-                                                  static_cast<col_type*>(0));
-                            utils::AssertSameType(r.rows(),
-                                                  oneapi::tbb::blocked_range<row_type>(row_i, row_j, 1));
-                            utils::AssertSameType(r.cols(),
-                                                  oneapi::tbb::blocked_range<col_type>(col_i, col_j, 1));
-                            REQUIRE(r.empty() == (row_x == row_y || col_x == col_y));
-                            REQUIRE(r.is_divisible()
-                                    == (row_y - row_x > row_grain || col_y - col_x > col_grain));
-                            if (r.is_divisible()) {
-                                range_type r2(r, oneapi::tbb::split());
-                                if (GetValueOf(r2.rows().begin()) == GetValueOf(r.rows().begin())) {
-                                    REQUIRE(GetValueOf(r2.rows().end()) == GetValueOf(r.rows().end()));
-                                    REQUIRE(GetValueOf(r2.cols().begin()) == GetValueOf(r.cols().end()));
+                        for( int col_grain=1; col_grain<10; ++col_grain ) {
+                            range_type r( row_i, row_j, row_grain, col_i, col_j, col_grain );
+                            utils::AssertSameType( r.is_divisible(), true );
+                            utils::AssertSameType( r.empty(), true );
+                            utils::AssertSameType( static_cast<range_type::row_range_type::const_iterator*>(nullptr), static_cast<row_type*>(nullptr) );
+                            utils::AssertSameType( static_cast<range_type::col_range_type::const_iterator*>(nullptr), static_cast<col_type*>(nullptr) );
+                            utils::AssertSameType( r.rows(), oneapi::tbb::blocked_range<row_type>( row_i, row_j, 1 ));
+                            utils::AssertSameType( r.cols(), oneapi::tbb::blocked_range<col_type>( col_i, col_j, 1 ));
+                            REQUIRE( r.empty()==(row_x==row_y||col_x==col_y) );
+                            REQUIRE( r.is_divisible()==(row_y-row_x>row_grain||col_y-col_x>col_grain) );
+                            if( r.is_divisible() ) {
+                                range_type r2(r,oneapi::tbb::split());
+                                if( GetValueOf(r2.rows().begin())==GetValueOf(r.rows().begin()) ) {
+                                    REQUIRE( GetValueOf(r2.rows().end())==GetValueOf(r.rows().end()) );
+                                    REQUIRE( GetValueOf(r2.cols().begin())==GetValueOf(r.cols().end()) );
                                 } else {
-                                    REQUIRE(GetValueOf(r2.cols().end()) == GetValueOf(r.cols().end()));
-                                    REQUIRE(GetValueOf(r2.rows().begin()) == GetValueOf(r.rows().end()));
+                                    REQUIRE( GetValueOf(r2.cols().end())==GetValueOf(r.cols().end()) );
+                                    REQUIRE( GetValueOf(r2.rows().begin())==GetValueOf(r.rows().end()) );
                                 }
                             }
                         }
@@ -115,28 +107,27 @@ static void SerialTest() {
     }
 }
 
-const int N = 1 << 10;
+const int N = 1<<10;
 
 unsigned char Array[N][N];
 
 struct Striker {
-    // Note: we use <int> here instead of <long> in order to test for problems similar to Quad 407676
-    void operator()(const oneapi::tbb::blocked_range2d<int>& r) const {
-        for (oneapi::tbb::blocked_range<int>::const_iterator i = r.rows().begin(); i != r.rows().end(); ++i)
-            for (oneapi::tbb::blocked_range<int>::const_iterator j = r.cols().begin(); j != r.cols().end();
-                 ++j)
+   // Note: we use <int> here instead of <long> in order to test for problems similar to Quad 407676
+    void operator()( const oneapi::tbb::blocked_range2d<int>& r ) const {
+        for( oneapi::tbb::blocked_range<int>::const_iterator i=r.rows().begin(); i!=r.rows().end(); ++i )
+            for( oneapi::tbb::blocked_range<int>::const_iterator j=r.cols().begin(); j!=r.cols().end(); ++j )
                 ++Array[i][j];
     }
 };
 
 void ParallelTest() {
-    for (int i = 0; i < N; i = i < 3 ? i + 1 : i * 3) {
-        for (int j = 0; j < N; j = j < 3 ? j + 1 : j * 3) {
-            const oneapi::tbb::blocked_range2d<int> r(0, i, 7, 0, j, 5);
-            oneapi::tbb::parallel_for(r, Striker());
-            for (int k = 0; k < N; ++k) {
-                for (int l = 0; l < N; ++l) {
-                    if (Array[k][l] != (k < i && l < j)) REQUIRE(false);
+    for( int i=0; i<N; i=i<3 ? i+1 : i*3 ) {
+        for( int j=0; j<N; j=j<3 ? j+1 : j*3 ) {
+            const oneapi::tbb::blocked_range2d<int> r( 0, i, 7, 0, j, 5 );
+            oneapi::tbb::parallel_for( r, Striker() );
+            for( int k=0; k<N; ++k ) {
+                for( int l=0; l<N; ++l ) {
+                    if( Array[k][l] != (k<i && l<j) ) REQUIRE(false);
                     Array[k][l] = 0;
                 }
             }
@@ -146,14 +137,15 @@ void ParallelTest() {
 
 //! Testing blocked_range2d interface
 //! \brief \ref interface \ref requirement
-TEST_CASE("Serial test") { SerialTest(); }
+TEST_CASE("Serial test") {
+    SerialTest();
+}
 
 //! Testing blocked_range2d interface with parallel_for
 //! \brief \ref requirement
 TEST_CASE("Parallel test") {
-    for (auto concurrency_level : utils::concurrency_range()) {
-        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism,
-                                            concurrency_level);
+    for ( auto concurrency_level : utils::concurrency_range() ) {
+        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism, concurrency_level);
         ParallelTest();
     }
 }
@@ -166,17 +158,15 @@ TEST_CASE("blocked_range2d proportional splitting") {
     oneapi::tbb::proportional_split ps(3, 1);
     oneapi::tbb::blocked_range2d<int> second(first, ps);
 
-    int expected_first_end = static_cast<int>(original.rows().begin()
-                                              + ps.left() * (original.rows().end() - original.rows().begin())
-                                                        / (ps.left() + ps.right()));
+    int expected_first_end = static_cast<int>(
+        original.rows().begin() + ps.left() * (original.rows().end() - original.rows().begin()) / (ps.left() + ps.right())
+    );
     if (first.rows().size() == second.rows().size()) {
         // Splitting was made by cols
-        utils::check_range_bounds_after_splitting(original.cols(), first.cols(), second.cols(),
-                                                  expected_first_end);
+        utils::check_range_bounds_after_splitting(original.cols(), first.cols(), second.cols(), expected_first_end);
     } else {
         // Splitting was made by rows
-        utils::check_range_bounds_after_splitting(original.rows(), first.rows(), second.rows(),
-                                                  expected_first_end);
+        utils::check_range_bounds_after_splitting(original.rows(), first.rows(), second.rows(), expected_first_end);
     }
 }
 
@@ -184,14 +174,12 @@ TEST_CASE("blocked_range2d proportional splitting") {
 //! Testing blocked_range2d deduction guides
 //! \brief \ref interface
 TEST_CASE("Deduction guides") {
-    std::vector<const unsigned long*> v;
+    std::vector<const unsigned long *> v;
     std::vector<double> v2;
 
     // check blocked_range2d(RowValue, RowValue, size_t, ColValue, ColValue, size_t)
     oneapi::tbb::blocked_range2d r1(v.begin(), v.end(), 2, v2.begin(), v2.end(), 2);
-    static_assert(
-            std::is_same<decltype(r1),
-                         oneapi::tbb::blocked_range2d<decltype(v)::iterator, decltype(v2)::iterator>>::value);
+    static_assert(std::is_same<decltype(r1), oneapi::tbb::blocked_range2d<decltype(v)::iterator, decltype(v2)::iterator>>::value);
 
     // check blocked_range2d(blocked_range2d &)
     oneapi::tbb::blocked_range2d r2(r1);
@@ -202,3 +190,4 @@ TEST_CASE("Deduction guides") {
     static_assert(std::is_same<decltype(r3), decltype(r1)>::value);
 }
 #endif
+
diff --git a/external/tbb/test/conformance/conformance_blocked_range3d.cpp b/external/tbb/test/conformance/conformance_blocked_range3d.cpp
index 97fc9515..b5888a10 100644
--- a/external/tbb/test/conformance/conformance_blocked_range3d.cpp
+++ b/external/tbb/test/conformance/conformance_blocked_range3d.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -20,52 +20,49 @@
 #include "common/utils_concurrency_limit.h"
 
 #include "oneapi/tbb/blocked_range3d.h"
-#include "oneapi/tbb/global_control.h"
 #include "oneapi/tbb/parallel_for.h"
+#include "oneapi/tbb/global_control.h"
 
 #include <vector>
 
 //! \file conformance_blocked_range3d.cpp
 //! \brief Test for [algorithms.blocked_range3d] specification
 
-template <typename Tag>
+template<typename Tag>
 class AbstractValueType {
     AbstractValueType() {}
     int value;
-
 public:
-    template <typename OtherTag>
-    friend AbstractValueType<OtherTag> MakeAbstractValueType(int i);
+    template<typename OtherTag>
+    friend AbstractValueType<OtherTag> MakeAbstractValueType( int i );
 
-    template <typename OtherTag>
-    friend int GetValueOf(const AbstractValueType<OtherTag>& v);
+    template<typename OtherTag>
+    friend int GetValueOf( const AbstractValueType<OtherTag>& v ) ;
 };
 
-template <typename Tag>
-AbstractValueType<Tag> MakeAbstractValueType(int i) {
+template<typename Tag>
+AbstractValueType<Tag> MakeAbstractValueType( int i ) {
     AbstractValueType<Tag> x;
     x.value = i;
     return x;
 }
 
-template <typename Tag>
-int GetValueOf(const AbstractValueType<Tag>& v) {
-    return v.value;
-}
+template<typename Tag>
+int GetValueOf( const AbstractValueType<Tag>& v ) {return v.value;}
 
-template <typename Tag>
-bool operator<(const AbstractValueType<Tag>& u, const AbstractValueType<Tag>& v) {
-    return GetValueOf(u) < GetValueOf(v);
+template<typename Tag>
+bool operator<( const AbstractValueType<Tag>& u, const AbstractValueType<Tag>& v ) {
+    return GetValueOf(u)<GetValueOf(v);
 }
 
-template <typename Tag>
-std::size_t operator-(const AbstractValueType<Tag>& u, const AbstractValueType<Tag>& v) {
-    return GetValueOf(u) - GetValueOf(v);
+template<typename Tag>
+std::size_t operator-( const AbstractValueType<Tag>& u, const AbstractValueType<Tag>& v ) {
+    return GetValueOf(u)-GetValueOf(v);
 }
 
-template <typename Tag>
-AbstractValueType<Tag> operator+(const AbstractValueType<Tag>& u, std::size_t offset) {
-    return MakeAbstractValueType<Tag>(GetValueOf(u) + int(offset));
+template<typename Tag>
+AbstractValueType<Tag> operator+( const AbstractValueType<Tag>& u, std::size_t offset ) {
+    return MakeAbstractValueType<Tag>(GetValueOf(u)+int(offset));
 }
 
 struct PageTag {};
@@ -76,83 +73,54 @@ static void SerialTest() {
     typedef AbstractValueType<PageTag> page_type;
     typedef AbstractValueType<RowTag> row_type;
     typedef AbstractValueType<ColTag> col_type;
-    typedef oneapi::tbb::blocked_range3d<page_type, row_type, col_type> range_type;
-    for (int page_x = -4; page_x < 4; ++page_x) {
-        for (int page_y = page_x; page_y < 4; ++page_y) {
+    typedef oneapi::tbb::blocked_range3d<page_type,row_type,col_type> range_type;
+    for( int page_x=-4; page_x<4; ++page_x ) {
+        for( int page_y=page_x; page_y<4; ++page_y ) {
             page_type page_i = MakeAbstractValueType<PageTag>(page_x);
             page_type page_j = MakeAbstractValueType<PageTag>(page_y);
-            for (int page_grain = 1; page_grain < 4; ++page_grain) {
-                for (int row_x = -4; row_x < 4; ++row_x) {
-                    for (int row_y = row_x; row_y < 4; ++row_y) {
+            for( int page_grain=1; page_grain<4; ++page_grain ) {
+                for( int row_x=-4; row_x<4; ++row_x ) {
+                    for( int row_y=row_x; row_y<4; ++row_y ) {
                         row_type row_i = MakeAbstractValueType<RowTag>(row_x);
                         row_type row_j = MakeAbstractValueType<RowTag>(row_y);
-                        for (int row_grain = 1; row_grain < 4; ++row_grain) {
-                            for (int col_x = -4; col_x < 4; ++col_x) {
-                                for (int col_y = col_x; col_y < 4; ++col_y) {
+                        for( int row_grain=1; row_grain<4; ++row_grain ) {
+                            for( int col_x=-4; col_x<4; ++col_x ) {
+                                for( int col_y=col_x; col_y<4; ++col_y ) {
                                     col_type col_i = MakeAbstractValueType<ColTag>(col_x);
                                     col_type col_j = MakeAbstractValueType<ColTag>(col_y);
-                                    for (int col_grain = 1; col_grain < 4; ++col_grain) {
-                                        range_type r(page_i, page_j, page_grain, row_i, row_j, row_grain,
-                                                     col_i, col_j, col_grain);
-                                        utils::AssertSameType(r.is_divisible(), true);
-
-                                        utils::AssertSameType(r.empty(), true);
-
-                                        utils::AssertSameType(
-                                                static_cast<range_type::page_range_type::const_iterator*>(0),
-                                                static_cast<page_type*>(0));
-                                        utils::AssertSameType(
-                                                static_cast<range_type::row_range_type::const_iterator*>(0),
-                                                static_cast<row_type*>(0));
-                                        utils::AssertSameType(
-                                                static_cast<range_type::col_range_type::const_iterator*>(0),
-                                                static_cast<col_type*>(0));
-
-                                        utils::AssertSameType(
-                                                r.pages(),
-                                                oneapi::tbb::blocked_range<page_type>(page_i, page_j, 1));
-                                        utils::AssertSameType(r.rows(), oneapi::tbb::blocked_range<row_type>(
-                                                                                row_i, row_j, 1));
-                                        utils::AssertSameType(r.cols(), oneapi::tbb::blocked_range<col_type>(
-                                                                                col_i, col_j, 1));
-
-                                        REQUIRE(r.empty()
-                                                == (page_x == page_y || row_x == row_y || col_x == col_y));
-
-                                        REQUIRE(r.is_divisible()
-                                                == (page_y - page_x > page_grain || row_y - row_x > row_grain
-                                                    || col_y - col_x > col_grain));
-
-                                        if (r.is_divisible()) {
-                                            range_type r2(r, oneapi::tbb::split());
-                                            if ((GetValueOf(r2.pages().begin())
-                                                 == GetValueOf(r.pages().begin()))
-                                                && (GetValueOf(r2.rows().begin())
-                                                    == GetValueOf(r.rows().begin()))) {
-                                                REQUIRE(GetValueOf(r2.pages().end())
-                                                        == GetValueOf(r.pages().end()));
-                                                REQUIRE(GetValueOf(r2.rows().end())
-                                                        == GetValueOf(r.rows().end()));
-                                                REQUIRE(GetValueOf(r2.cols().begin())
-                                                        == GetValueOf(r.cols().end()));
+                                    for( int col_grain=1; col_grain<4; ++col_grain ) {
+                                        range_type r( page_i, page_j, page_grain, row_i, row_j, row_grain, col_i, col_j, col_grain );
+                                        utils::AssertSameType( r.is_divisible(), true );
+
+                                        utils::AssertSameType( r.empty(), true );
+
+                                        utils::AssertSameType( static_cast<range_type::page_range_type::const_iterator*>(nullptr), static_cast<page_type*>(nullptr) );
+                                        utils::AssertSameType( static_cast<range_type::row_range_type::const_iterator*>(nullptr), static_cast<row_type*>(nullptr) );
+                                        utils::AssertSameType( static_cast<range_type::col_range_type::const_iterator*>(nullptr), static_cast<col_type*>(nullptr) );
+
+                                        utils::AssertSameType( r.pages(), oneapi::tbb::blocked_range<page_type>( page_i, page_j, 1 ));
+                                        utils::AssertSameType( r.rows(), oneapi::tbb::blocked_range<row_type>( row_i, row_j, 1 ));
+                                        utils::AssertSameType( r.cols(), oneapi::tbb::blocked_range<col_type>( col_i, col_j, 1 ));
+
+                                        REQUIRE( r.empty()==(page_x==page_y||row_x==row_y||col_x==col_y) );
+
+                                        REQUIRE( r.is_divisible()==(page_y-page_x>page_grain||row_y-row_x>row_grain||col_y-col_x>col_grain) );
+
+                                        if( r.is_divisible() ) {
+                                            range_type r2(r,oneapi::tbb::split());
+                                            if( (GetValueOf(r2.pages().begin())==GetValueOf(r.pages().begin())) && (GetValueOf(r2.rows().begin())==GetValueOf(r.rows().begin())) ) {
+                                                REQUIRE( GetValueOf(r2.pages().end())==GetValueOf(r.pages().end()) );
+                                                REQUIRE( GetValueOf(r2.rows().end())==GetValueOf(r.rows().end()) );
+                                                REQUIRE( GetValueOf(r2.cols().begin())==GetValueOf(r.cols().end()) );
                                             } else {
-                                                if ((GetValueOf(r2.pages().begin())
-                                                     == GetValueOf(r.pages().begin()))
-                                                    && (GetValueOf(r2.cols().begin())
-                                                        == GetValueOf(r.cols().begin()))) {
-                                                    REQUIRE(GetValueOf(r2.pages().end())
-                                                            == GetValueOf(r.pages().end()));
-                                                    REQUIRE(GetValueOf(r2.cols().end())
-                                                            == GetValueOf(r.cols().end()));
-                                                    REQUIRE(GetValueOf(r2.rows().begin())
-                                                            == GetValueOf(r.rows().end()));
+                                                if ( (GetValueOf(r2.pages().begin())==GetValueOf(r.pages().begin())) && (GetValueOf(r2.cols().begin())==GetValueOf(r.cols().begin())) ) {
+                                                    REQUIRE( GetValueOf(r2.pages().end())==GetValueOf(r.pages().end()) );
+                                                    REQUIRE( GetValueOf(r2.cols().end())==GetValueOf(r.cols().end()) );
+                                                    REQUIRE( GetValueOf(r2.rows().begin())==GetValueOf(r.rows().end()) );
                                                 } else {
-                                                    REQUIRE(GetValueOf(r2.rows().end())
-                                                            == GetValueOf(r.rows().end()));
-                                                    REQUIRE(GetValueOf(r2.cols().end())
-                                                            == GetValueOf(r.cols().end()));
-                                                    REQUIRE(GetValueOf(r2.pages().begin())
-                                                            == GetValueOf(r.pages().end()));
+                                                    REQUIRE( GetValueOf(r2.rows().end())==GetValueOf(r.rows().end()) );
+                                                    REQUIRE( GetValueOf(r2.cols().end())==GetValueOf(r.cols().end()) );
+                                                    REQUIRE( GetValueOf(r2.pages().begin())==GetValueOf(r.pages().end()) );
                                                 }
                                             }
                                         }
@@ -167,33 +135,31 @@ static void SerialTest() {
     }
 }
 
-const int N = 1 << 5;
+const int N = 1<<5;
 
 unsigned char Array[N][N][N];
 
 struct Striker {
-    // Note: we use <int> here instead of <long> in order to test for problems similar to Quad 407676
-    void operator()(const oneapi::tbb::blocked_range3d<int>& r) const {
-        for (oneapi::tbb::blocked_range<int>::const_iterator i = r.pages().begin(); i != r.pages().end(); ++i)
-            for (oneapi::tbb::blocked_range<int>::const_iterator j = r.rows().begin(); j != r.rows().end();
-                 ++j)
-                for (oneapi::tbb::blocked_range<int>::const_iterator k = r.cols().begin();
-                     k != r.cols().end(); ++k)
+   // Note: we use <int> here instead of <long> in order to test for problems similar to Quad 407676
+    void operator()( const oneapi::tbb::blocked_range3d<int>& r ) const {
+        for( oneapi::tbb::blocked_range<int>::const_iterator i=r.pages().begin(); i!=r.pages().end(); ++i )
+            for( oneapi::tbb::blocked_range<int>::const_iterator j=r.rows().begin(); j!=r.rows().end(); ++j )
+                for( oneapi::tbb::blocked_range<int>::const_iterator k=r.cols().begin(); k!=r.cols().end(); ++k )
                     ++Array[i][j][k];
     }
 };
 
 void ParallelTest() {
-    for (int i = 0; i < N; i = i < 3 ? i + 1 : i * 3) {
-        for (int j = 0; j < N; j = j < 3 ? j + 1 : j * 3) {
-            for (int k = 0; k < N; k = k < 3 ? k + 1 : k * 3) {
-                const oneapi::tbb::blocked_range3d<int> r(0, i, 5, 0, j, 3, 0, k, 1);
-                oneapi::tbb::parallel_for(r, Striker());
-                for (int l = 0; l < N; ++l) {
-                    for (int m = 0; m < N; ++m) {
-                        for (int n = 0; n < N; ++n) {
-                            if (Array[l][m][n] != (l < i && m < j && n < k)) REQUIRE(false);
-                            Array[l][m][n] = 0;
+    for( int i=0; i<N; i=i<3 ? i+1 : i*3 ) {
+        for( int j=0; j<N; j=j<3 ? j+1 : j*3 ) {
+            for( int k=0; k<N; k=k<3 ? k+1 : k*3 ) {
+                const oneapi::tbb::blocked_range3d<int> r( 0, i, 5, 0, j, 3, 0, k, 1 );
+                oneapi::tbb::parallel_for( r, Striker() );
+                for( int l=0; l<N; ++l ) {
+                    for( int m=0; m<N; ++m ) {
+                        for( int n=0; n<N; ++n ) {
+                             if( Array[l][m][n] != (l<i && m<j && n<k) ) REQUIRE(false);
+                             Array[l][m][n] = 0;
                         }
                     }
                 }
@@ -204,14 +170,15 @@ void ParallelTest() {
 
 //! Testing blocked_range3d interface
 //! \brief \ref interface \ref requirement
-TEST_CASE("Serial test") { SerialTest(); }
+TEST_CASE("Serial test") {
+    SerialTest();
+}
 
 //! Testing blocked_range3d interface with parallel_for
 //! \brief \ref requirement
 TEST_CASE("Parallel test") {
-    for (auto concurrency_level : utils::concurrency_range()) {
-        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism,
-                                            concurrency_level);
+    for ( auto concurrency_level : utils::concurrency_range() ) {
+        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism, concurrency_level);
         ParallelTest();
     }
 }
@@ -224,23 +191,20 @@ TEST_CASE("blocked_range3d proportional splitting") {
     oneapi::tbb::proportional_split ps(3, 1);
     oneapi::tbb::blocked_range3d<int> second(first, ps);
 
-    int expected_first_end = static_cast<int>(original.rows().begin()
-                                              + ps.left() * (original.rows().end() - original.rows().begin())
-                                                        / (ps.left() + ps.right()));
+    int expected_first_end = static_cast<int>(
+        original.rows().begin() + ps.left() * (original.rows().end() - original.rows().begin()) / (ps.left() + ps.right())
+    );
     if (first.rows().size() == second.rows().size()) {
         if (first.cols().size() == second.cols().size()) {
             // Splitting was made by pages
-            utils::check_range_bounds_after_splitting(original.pages(), first.pages(), second.pages(),
-                                                      expected_first_end);
+            utils::check_range_bounds_after_splitting(original.pages(), first.pages(), second.pages(), expected_first_end);
         } else {
             // Splitting was made by cols
-            utils::check_range_bounds_after_splitting(original.cols(), first.cols(), second.cols(),
-                                                      expected_first_end);
+            utils::check_range_bounds_after_splitting(original.cols(), first.cols(), second.cols(), expected_first_end);
         }
     } else {
         // Splitting was made by rows
-        utils::check_range_bounds_after_splitting(original.rows(), first.rows(), second.rows(),
-                                                  expected_first_end);
+        utils::check_range_bounds_after_splitting(original.rows(), first.rows(), second.rows(), expected_first_end);
     }
 }
 
@@ -248,15 +212,14 @@ TEST_CASE("blocked_range3d proportional splitting") {
 //! Testing blocked_range3d deduction guides
 //! \brief \ref interface
 TEST_CASE("Deduction guides") {
-    std::vector<const unsigned long*> v;
+    std::vector<const unsigned long *> v;
     std::vector<double> v2;
     std::vector<std::vector<int>> v3;
 
     // check blocked_range2d(PageValue, PageValue, size_t, RowValue, RowValue, size_t, ColValue, ColValue, size_t)
     oneapi::tbb::blocked_range3d r1(v.begin(), v.end(), 2, v2.begin(), v2.end(), 2, v3.begin(), v3.end(), 6);
     static_assert(std::is_same<decltype(r1),
-                               oneapi::tbb::blocked_range3d<decltype(v)::iterator, decltype(v2)::iterator,
-                                                            decltype(v3)::iterator>>::value);
+        oneapi::tbb::blocked_range3d<decltype(v)::iterator, decltype(v2)::iterator, decltype(v3)::iterator>>::value);
 
     // check blocked_range2d(blocked_range3d &)
     oneapi::tbb::blocked_range3d r2(r1);
@@ -267,3 +230,4 @@ TEST_CASE("Deduction guides") {
     static_assert(std::is_same<decltype(r3), decltype(r1)>::value);
 }
 #endif
+
diff --git a/external/tbb/test/conformance/conformance_blocked_rangeNd.cpp b/external/tbb/test/conformance/conformance_blocked_rangeNd.cpp
index d2cb012c..52faac52 100644
--- a/external/tbb/test/conformance/conformance_blocked_rangeNd.cpp
+++ b/external/tbb/test/conformance/conformance_blocked_rangeNd.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2017-2021 Intel Corporation
+    Copyright (c) 2017-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -24,17 +24,16 @@
 
 #define TBB_PREVIEW_BLOCKED_RANGE_ND 1
 #include "oneapi/tbb/blocked_rangeNd.h"
-#include "oneapi/tbb/global_control.h"
 #include "oneapi/tbb/parallel_for.h"
+#include "oneapi/tbb/global_control.h"
 
-#include <algorithm>// std::for_each
+#include <algorithm> // std::for_each
 #include <array>
 
 // AbstractValueType class represents Value concept's requirements in the most abstract way
 class AbstractValueType {
     int value;
     AbstractValueType() {}
-
 public:
     friend AbstractValueType MakeAbstractValue(int i);
     friend int GetValueOf(const AbstractValueType& v);
@@ -61,22 +60,19 @@ AbstractValueType operator+(const AbstractValueType& u, std::size_t offset) {
     return MakeAbstractValue(GetValueOf(u) + int(offset));
 }
 
-template <typename range_t, unsigned int N>
+template<typename range_t, unsigned int N>
 struct range_utils {
     using val_t = typename range_t::value_type;
 
-    template <typename EntityType, std::size_t DimSize>
-    using data_type
-            = std::array<typename range_utils<range_t, N - 1>::template data_type<EntityType, DimSize>,
-                         DimSize>;
+    template<typename EntityType, std::size_t DimSize>
+    using data_type = std::array<typename range_utils<range_t, N - 1>::template data_type<EntityType, DimSize>, DimSize>;
 
-    template <typename EntityType, std::size_t DimSize>
+    template<typename EntityType, std::size_t DimSize>
     static void init_data(data_type<EntityType, DimSize>& data) {
-        std::for_each(data.begin(), data.end(),
-                      range_utils<range_t, N - 1>::template init_data<EntityType, DimSize>);
+        std::for_each(data.begin(), data.end(), range_utils<range_t, N - 1>::template init_data<EntityType, DimSize>);
     }
 
-    template <typename EntityType, std::size_t DimSize>
+    template<typename EntityType, std::size_t DimSize>
     static void increment_data(const range_t& range, data_type<EntityType, DimSize>& data) {
         auto begin = data.begin() + range.dim(N - 1).begin();
         // same as "auto end = out.begin() + range.dim(N - 1).end();"
@@ -86,7 +82,7 @@ struct range_utils {
         }
     }
 
-    template <typename EntityType, std::size_t DimSize>
+    template<typename EntityType, std::size_t DimSize>
     static void check_data(const range_t& range, data_type<EntityType, DimSize>& data) {
         auto begin = data.begin() + range.dim(N - 1).begin();
         // same as "auto end = out.begin() + range.dim(N - 1).end();"
@@ -102,10 +98,9 @@ struct range_utils {
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wsequence-point"
 #endif
-    template <typename input_t, std::size_t... Is>
-    static range_t make_range(std::size_t shift, bool negative, val_t (*gen)(input_t),
-                              oneapi::tbb::detail::index_sequence<Is...>) {
-        return range_t({{gen(negative ? -input_t(Is + shift) : 0), gen(input_t(Is + shift)), Is + 1}...});
+    template<typename input_t, std::size_t... Is>
+    static range_t make_range(std::size_t shift, bool negative, val_t(*gen)(input_t), oneapi::tbb::detail::index_sequence<Is...>) {
+        return range_t( { { gen(negative ? -input_t(Is + shift) : 0), gen(input_t(Is + shift)), Is + 1} ... } );
     }
 #if __GNUC__ && !defined(__clang__) && !defined(__INTEL_COMPILER)
 #pragma GCC diagnostic pop
@@ -121,37 +116,33 @@ struct range_utils {
         return range_utils<range_t, N - 1>::is_divisible(range);
     }
 
-    static void check_splitting(const range_t& range_split, const range_t& range_new,
-                                int (*get)(const val_t&), bool split_checker = false) {
+    static void check_splitting(const range_t& range_split, const range_t& range_new, int(*get)(const val_t&), bool split_checker = false) {
         if (get(range_split.dim(N - 1).begin()) == get(range_new.dim(N - 1).begin())) {
             REQUIRE(get(range_split.dim(N - 1).end()) == get(range_new.dim(N - 1).end()));
-        } else {
-            REQUIRE((get(range_split.dim(N - 1).end()) == get(range_new.dim(N - 1).begin())
-                     && !split_checker));
+        }
+        else {
+            REQUIRE((get(range_split.dim(N - 1).end()) == get(range_new.dim(N - 1).begin()) && !split_checker));
             split_checker = true;
         }
         range_utils<range_t, N - 1>::check_splitting(range_split, range_new, get, split_checker);
     }
+
 };
 
-template <typename range_t>
+template<typename range_t>
 struct range_utils<range_t, 0> {
     using val_t = typename range_t::value_type;
 
-    template <typename EntityType, std::size_t DimSize>
+    template<typename EntityType, std::size_t DimSize>
     using data_type = EntityType;
 
-    template <typename EntityType, std::size_t DimSize>
-    static void init_data(data_type<EntityType, DimSize>& data) {
-        data = 0;
-    }
+    template<typename EntityType, std::size_t DimSize>
+    static void init_data(data_type<EntityType, DimSize>& data) { data = 0; }
 
-    template <typename EntityType, std::size_t DimSize>
-    static void increment_data(const range_t&, data_type<EntityType, DimSize>& data) {
-        ++data;
-    }
+    template<typename EntityType, std::size_t DimSize>
+    static void increment_data(const range_t&, data_type<EntityType, DimSize>& data) { ++data; }
 
-    template <typename EntityType, std::size_t DimSize>
+    template<typename EntityType, std::size_t DimSize>
     static void check_data(const range_t&, data_type<EntityType, DimSize>& data) {
         REQUIRE(data == 1);
     }
@@ -160,25 +151,23 @@ struct range_utils<range_t, 0> {
 
     static bool is_divisible(const range_t&) { return false; }
 
-    static void check_splitting(const range_t&, const range_t&, int (*)(const val_t&), bool) {}
+    static void check_splitting(const range_t&, const range_t&, int(*)(const val_t&), bool) {}
 };
 
 // We need MakeInt function to pass it into make_range as factory function
 // because of matching make_range with AbstractValueType and other types too
 int MakeInt(int i) { return i; }
 
-template <unsigned int DimAmount>
+template<unsigned int DimAmount>
 void SerialTest() {
-    static_assert((oneapi::tbb::blocked_rangeNd<int, DimAmount>::ndims()
-                   == oneapi::tbb::blocked_rangeNd<AbstractValueType, DimAmount>::ndims()),
-                  "different amount of dimensions");
+    static_assert((oneapi::tbb::blocked_rangeNd<int, DimAmount>::ndims() == oneapi::tbb::blocked_rangeNd<AbstractValueType, DimAmount>::ndims()),
+                         "different amount of dimensions");
 
     using range_t = oneapi::tbb::blocked_rangeNd<AbstractValueType, DimAmount>;
     using utils_t = range_utils<range_t, DimAmount>;
 
     // Generate empty range
-    range_t r = utils_t::make_range(0, true, &MakeAbstractValue,
-                                    oneapi::tbb::detail::make_index_sequence<DimAmount>());
+    range_t r = utils_t::make_range(0, true, &MakeAbstractValue, oneapi::tbb::detail::make_index_sequence<DimAmount>());
 
     utils::AssertSameType(r.is_divisible(), bool());
     utils::AssertSameType(r.empty(), bool());
@@ -188,8 +177,7 @@ void SerialTest() {
     REQUIRE(r.is_divisible() == utils_t::is_divisible(r));
 
     // Generate not-empty range divisible range
-    r = utils_t::make_range(1, true, &MakeAbstractValue,
-                            oneapi::tbb::detail::make_index_sequence<DimAmount>());
+    r = utils_t::make_range(1, true, &MakeAbstractValue, oneapi::tbb::detail::make_index_sequence<DimAmount>());
     REQUIRE((r.empty() == utils_t::is_empty(r) && !r.empty()));
     REQUIRE((r.is_divisible() == utils_t::is_divisible(r) && r.is_divisible()));
 
@@ -198,10 +186,9 @@ void SerialTest() {
 
     SerialTest<DimAmount - 1>();
 }
-template <>
-void SerialTest<0>() {}
+template<> void SerialTest<0>() {}
 
-template <unsigned int DimAmount>
+template<unsigned int DimAmount>
 void ParallelTest() {
     using range_t = oneapi::tbb::blocked_rangeNd<int, DimAmount>;
     using utils_t = range_utils<range_t, DimAmount>;
@@ -211,80 +198,80 @@ void ParallelTest() {
     typename utils_t::template data_type<unsigned char, 1 << (20 / DimAmount - 1)> data;
     utils_t::init_data(data);
 
-    range_t r = utils_t::make_range((1 << (20 / DimAmount - 1)) - DimAmount, false, &MakeInt,
-                                    oneapi::tbb::detail::make_index_sequence<DimAmount>());
+    range_t r = utils_t::make_range((1 << (20 / DimAmount - 1)) - DimAmount, false, &MakeInt, oneapi::tbb::detail::make_index_sequence<DimAmount>());
 
-    oneapi::tbb::parallel_for(r, [&data](const range_t& range) { utils_t::increment_data(range, data); });
+    oneapi::tbb::parallel_for(r, [&data](const range_t& range) {
+        utils_t::increment_data(range, data);
+    });
 
     utils_t::check_data(r, data);
 
     ParallelTest<DimAmount - 1>();
 }
-template <>
-void ParallelTest<0>() {}
+template<> void ParallelTest<0>() {}
 
 //! Testing blocked_rangeNd construction
 //! \brief \ref interface
 TEST_CASE("Construction") {
-    oneapi::tbb::blocked_rangeNd<int, 1> {{0, 13, 3}};
+    oneapi::tbb::blocked_rangeNd<int, 1>{ { 0,13,3 } };
 
-    oneapi::tbb::blocked_rangeNd<int, 1> {oneapi::tbb::blocked_range<int> {0, 13, 3}};
+    oneapi::tbb::blocked_rangeNd<int, 1>{ oneapi::tbb::blocked_range<int>{ 0,13,3 } };
 
-    oneapi::tbb::blocked_rangeNd<int, 2>(oneapi::tbb::blocked_range<int>(-8923, 8884, 13),
-                                         oneapi::tbb::blocked_range<int>(-8923, 5, 13));
+    oneapi::tbb::blocked_rangeNd<int, 2>(oneapi::tbb::blocked_range<int>(-8923, 8884, 13), oneapi::tbb::blocked_range<int>(-8923, 5, 13));
 
-    oneapi::tbb::blocked_rangeNd<int, 2>({-8923, 8884, 13}, {-8923, 8884, 13});
+    oneapi::tbb::blocked_rangeNd<int, 2>({ -8923, 8884, 13 }, { -8923, 8884, 13 });
 
     oneapi::tbb::blocked_range<int> r1(0, 13);
 
     oneapi::tbb::blocked_range<int> r2(-12, 23);
 
-    oneapi::tbb::blocked_rangeNd<int, 2>({{-8923, 8884, 13}, r1});
+    oneapi::tbb::blocked_rangeNd<int, 2>({ { -8923, 8884, 13 }, r1});
 
-    oneapi::tbb::blocked_rangeNd<int, 2>({r2, r1});
+    oneapi::tbb::blocked_rangeNd<int, 2>({ r2, r1 });
 
     oneapi::tbb::blocked_rangeNd<int, 2>(r1, r2);
 
-    oneapi::tbb::blocked_rangeNd<AbstractValueType, 4>({MakeAbstractValue(-3), MakeAbstractValue(13), 8},
-                                                       {MakeAbstractValue(-53), MakeAbstractValue(23), 2},
-                                                       {MakeAbstractValue(-23), MakeAbstractValue(33), 1},
-                                                       {MakeAbstractValue(-13), MakeAbstractValue(43), 7});
+    oneapi::tbb::blocked_rangeNd<AbstractValueType, 4>({ MakeAbstractValue(-3), MakeAbstractValue(13), 8 },
+                                               { MakeAbstractValue(-53), MakeAbstractValue(23), 2 },
+                                               { MakeAbstractValue(-23), MakeAbstractValue(33), 1 },
+                                               { MakeAbstractValue(-13), MakeAbstractValue(43), 7 });
 }
 
 static const std::size_t N = 4;
 
 //! Testing blocked_rangeNd interface
 //! \brief \ref interface \ref requirement
-TEST_CASE("Serial test") { SerialTest<N>(); }
+TEST_CASE("Serial test") {
+    SerialTest<N>();
+}
 
+#if !EMSCRIPTEN
 //! Testing blocked_rangeNd interface with parallel_for
 //! \brief \ref requirement
 TEST_CASE("Parallel test") {
-    for (auto concurrency_level : utils::concurrency_range()) {
-        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism,
-                                            concurrency_level);
+    for ( auto concurrency_level : utils::concurrency_range() ) {
+        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism, concurrency_level);
         ParallelTest<N>();
     }
 }
+#endif
 
 //! Testing blocked_rangeNd with proportional splitting
 //! \brief \ref interface \ref requirement
 TEST_CASE("blocked_rangeNd proportional splitting") {
-    oneapi::tbb::blocked_rangeNd<int, 2> original {{0, 100}, {0, 100}};
+    oneapi::tbb::blocked_rangeNd<int, 2> original{{0, 100}, {0, 100}};
     oneapi::tbb::blocked_rangeNd<int, 2> first(original);
     oneapi::tbb::proportional_split ps(3, 1);
     oneapi::tbb::blocked_rangeNd<int, 2> second(first, ps);
 
-    int expected_first_end = static_cast<int>(original.dim(0).begin()
-                                              + ps.left() * (original.dim(0).end() - original.dim(0).begin())
-                                                        / (ps.left() + ps.right()));
+    int expected_first_end = static_cast<int>(
+        original.dim(0).begin() + ps.left() * (original.dim(0).end() - original.dim(0).begin()) / (ps.left() + ps.right())
+    );
     if (first.dim(0).size() == second.dim(0).size()) {
         // Splitting was made by cols
-        utils::check_range_bounds_after_splitting(original.dim(1), first.dim(1), second.dim(1),
-                                                  expected_first_end);
+        utils::check_range_bounds_after_splitting(original.dim(1), first.dim(1), second.dim(1), expected_first_end);
     } else {
         // Splitting was made by rows
-        utils::check_range_bounds_after_splitting(original.dim(0), first.dim(0), second.dim(0),
-                                                  expected_first_end);
+        utils::check_range_bounds_after_splitting(original.dim(0), first.dim(0), second.dim(0), expected_first_end);
     }
 }
diff --git a/external/tbb/test/conformance/conformance_broadcast_node.cpp b/external/tbb/test/conformance/conformance_broadcast_node.cpp
index 7c1ce68b..f39819fd 100644
--- a/external/tbb/test/conformance/conformance_broadcast_node.cpp
+++ b/external/tbb/test/conformance/conformance_broadcast_node.cpp
@@ -15,7 +15,7 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
 #endif
 
 #include "conformance_flowgraph.h"
@@ -23,26 +23,24 @@
 //! \file conformance_broadcast_node.cpp
 //! \brief Test for [flow_graph.broadcast_node] specification
 
-using input_msg
-        = conformance::message</*default_ctor*/ false, /*copy_ctor*/ true /*enable for queue_node successor*/,
-                               /*copy_assign*/ true /*enable for queue_node successor*/>;
+using input_msg = conformance::message</*default_ctor*/false, /*copy_ctor*/true/*enable for queue_node successor*/, /*copy_assign*/true/*enable for queue_node successor*/>;
 
 //! Test function_node broadcast
 //! \brief \ref requirement
-TEST_CASE("broadcast_node broadcasts") {
+TEST_CASE("broadcast_node broadcasts"){
     conformance::test_forwarding<oneapi::tbb::flow::broadcast_node<int>, int>(1);
     conformance::test_forwarding<oneapi::tbb::flow::broadcast_node<input_msg>, input_msg>(1);
 }
 
 //! Test broadcast_node buffering
 //! \brief \ref requirement
-TEST_CASE("broadcast_node buffering") {
+TEST_CASE("broadcast_node buffering"){
     conformance::test_buffering<oneapi::tbb::flow::broadcast_node<int>, int>();
 }
 
 //! Test inheritance relations
 //! \brief \ref interface
-TEST_CASE("broadcast_node superclasses") {
+TEST_CASE("broadcast_node superclasses"){
     conformance::test_inheritance<oneapi::tbb::flow::broadcast_node<int>, int, int>();
     conformance::test_inheritance<oneapi::tbb::flow::broadcast_node<float>, float, float>();
     conformance::test_inheritance<oneapi::tbb::flow::broadcast_node<input_msg>, input_msg, input_msg>();
@@ -51,7 +49,7 @@ TEST_CASE("broadcast_node superclasses") {
 //! The node that is constructed has a reference to the same graph object as src.
 //! The predecessors and successors of src are not copied.
 //! \brief \ref interface
-TEST_CASE("broadcast_node copy constructor") {
+TEST_CASE("broadcast_node copy constructor"){
     using namespace oneapi::tbb::flow;
     graph g;
 
@@ -70,12 +68,10 @@ TEST_CASE("broadcast_node copy constructor") {
     node_copy.try_put(1);
     g.wait_for_all();
 
-    CHECK_MESSAGE((conformance::get_values(node2).size() == 0 && conformance::get_values(node3).size() == 1),
-                  "Copied node doesn`t copy successor");
+    CHECK_MESSAGE((conformance::get_values(node2).size() == 0 && conformance::get_values(node3).size() == 1), "Copied node doesn`t copy successor");
 
     node0.try_put(1);
     g.wait_for_all();
 
-    CHECK_MESSAGE((conformance::get_values(node2).size() == 1 && conformance::get_values(node3).size() == 0),
-                  "Copied node doesn`t copy predecessor");
+    CHECK_MESSAGE((conformance::get_values(node2).size() == 1 && conformance::get_values(node3).size() == 0), "Copied node doesn`t copy predecessor");
 }
diff --git a/external/tbb/test/conformance/conformance_buffer_node.cpp b/external/tbb/test/conformance/conformance_buffer_node.cpp
index 6f06e53c..5c355f43 100644
--- a/external/tbb/test/conformance/conformance_buffer_node.cpp
+++ b/external/tbb/test/conformance/conformance_buffer_node.cpp
@@ -15,7 +15,7 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
 #endif
 
 #define CONFORMANCE_BUFFERING_NODES
@@ -27,41 +27,40 @@
 
 //! Test buffer_node broadcast
 //! \brief \ref requirement
-TEST_CASE("buffer_node single_push") {
+TEST_CASE("buffer_node single_push"){
     conformance::test_forwarding_single_push<oneapi::tbb::flow::buffer_node<int>>();
 }
 
 //! Test function_node buffering
 //! \brief \ref requirement
-TEST_CASE("buffer_node buffering") {
+TEST_CASE("buffer_node buffering"){
     conformance::test_buffering<oneapi::tbb::flow::buffer_node<int>, int>();
 }
 
 //! Constructs an empty buffer_node that belongs to the same graph g as src.
 //! Any intermediate state of src, including its links to predecessors and successors, is not copied.
 //! \brief \ref requirement
-TEST_CASE("buffer_node copy constructor") {
+TEST_CASE("buffer_node copy constructor"){
     conformance::test_copy_ctor_for_buffering_nodes<oneapi::tbb::flow::buffer_node<int>>();
 }
 
 //! Test inheritance relations
 //! \brief \ref interface
-TEST_CASE("buffer_node superclasses") {
+TEST_CASE("buffer_node superclasses"){
     conformance::test_inheritance<oneapi::tbb::flow::buffer_node<int>, int, int>();
     conformance::test_inheritance<oneapi::tbb::flow::buffer_node<void*>, void*, void*>();
 }
 
 //! Test buffer_node node `try_put()` and `try_get()`
 //! \brief \ref requirement
-TEST_CASE("buffer_node methods") {
+TEST_CASE("buffer_node methods"){
     oneapi::tbb::flow::graph g;
     oneapi::tbb::flow::buffer_node<int> testing_node(g);
 
     int tmp1 = -1;
     int tmp2 = -1;
 
-    CHECK_MESSAGE((!testing_node.try_get(tmp1) && tmp1 == -1),
-                  "`try_get` must returns false if there is no non-reserved item currently in the node.");
+    CHECK_MESSAGE((!testing_node.try_get(tmp1) && tmp1 == -1), "`try_get` must returns false if there is no non-reserved item currently in the node.");
 
     testing_node.try_put(1);
     testing_node.try_put(2);
@@ -71,6 +70,5 @@ TEST_CASE("buffer_node methods") {
     CHECK_MESSAGE((tmp1 == 1 || tmp1 == 2), "Messages must be an arbitrary order");
 
     testing_node.try_get(tmp2);
-    CHECK_MESSAGE((tmp2 != -1 && tmp2 != tmp1),
-                  "Additional `try_get()' does not receive the same value as previous");
+    CHECK_MESSAGE((tmp2 != -1 && tmp2 != tmp1), "Additional `try_get()' does not receive the same value as previous");
 }
diff --git a/external/tbb/test/conformance/conformance_collaborative_call_once.cpp b/external/tbb/test/conformance/conformance_collaborative_call_once.cpp
new file mode 100644
index 00000000..2c5ddfc1
--- /dev/null
+++ b/external/tbb/test/conformance/conformance_collaborative_call_once.cpp
@@ -0,0 +1,125 @@
+/*
+    Copyright (c) 2021 Intel Corporation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#if _MSC_VER && !defined(__INTEL_COMPILER)
+    // unreachable code
+    #pragma warning( push )
+    #pragma warning( disable: 4702 )
+#endif
+
+#if __INTEL_COMPILER && _MSC_VER
+#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
+#endif
+
+#include "common/test.h"
+#include "oneapi/tbb/collaborative_call_once.h"
+
+#include "common/utils.h"
+#include "common/utils_concurrency_limit.h"
+#include "common/spin_barrier.h"
+#include "oneapi/tbb/parallel_for.h"
+#include "oneapi/tbb/task_group.h"
+
+#include <type_traits>
+#include <exception>
+
+//! \file conformance_collaborative_call_once.cpp
+//! \brief Test for [algorithms.collaborative_call_once] specification
+
+//! Test for collaborative_once_flag member functions to be matched with spec
+//! \brief \ref interface \ref requirement
+TEST_CASE("collaborative_once_flag member functions match") {
+    REQUIRE_MESSAGE(std::is_default_constructible<oneapi::tbb::collaborative_once_flag>::value == true, 
+        "collaborative_once_flag must be default constructible");
+    REQUIRE_MESSAGE(std::is_copy_constructible<oneapi::tbb::collaborative_once_flag>::value == false, 
+        "collaborative_once_flag must not be copy constructible");
+    REQUIRE_MESSAGE(std::is_copy_assignable<oneapi::tbb::collaborative_once_flag>::value == false, 
+        "collaborative_once_flag must not be copy assignable");
+    REQUIRE_MESSAGE(std::is_move_constructible<oneapi::tbb::collaborative_once_flag>::value == false, 
+        "collaborative_once_flag must not be move constructible");
+    REQUIRE_MESSAGE(std::is_move_assignable<oneapi::tbb::collaborative_once_flag>::value == false, 
+        "collaborative_once_flag must not be move assignable");
+}
+
+//! Test for collaborative_call_once to execute function exactly once
+//! \brief \ref interface \ref requirement
+TEST_CASE("collaborative_call_once executes function exactly once") {
+    oneapi::tbb::collaborative_once_flag once_flag;
+
+    for (int iter = 0; iter < 100; ++iter) {
+        oneapi::tbb::collaborative_call_once(once_flag, [](int number) {
+            // Will be executed only on first iteration
+            REQUIRE(number == 0);
+        }, iter);
+    }
+
+    // concurrent call
+    std::size_t num_threads = utils::get_platform_max_threads();
+    utils::SpinBarrier barrier{num_threads};
+
+    int flag = 0;
+    auto func = [&flag] { flag++; };
+
+    oneapi::tbb::collaborative_once_flag once_flag_concurrent;
+    utils::NativeParallelFor(num_threads, [&](std::size_t) {
+        barrier.wait();
+        oneapi::tbb::collaborative_call_once(once_flag_concurrent, func);
+    });
+    REQUIRE(flag == 1);
+}
+
+
+#if TBB_USE_EXCEPTIONS
+
+//! Exception is received only by winner thread
+//! \brief \ref error_guessing \ref requirement
+TEST_CASE("Exception is received only by winner thread") {
+    int num_threads = static_cast<int>(utils::get_platform_max_threads());
+    utils::SpinBarrier barrier(num_threads);
+
+    oneapi::tbb::task_group tg;
+    oneapi::tbb::collaborative_once_flag flag;
+
+    for (int i = 0; i < num_threads-1; ++i) {
+        tg.run([&flag, &barrier] {
+            barrier.wait();
+            try {
+                oneapi::tbb::collaborative_call_once(flag, [] { });
+            } catch(...) {
+                REQUIRE_MESSAGE(false, "Unreachable code");
+            }
+        });
+    };
+
+    bool exception_happened{false};
+    try {
+        oneapi::tbb::collaborative_call_once(flag, [&barrier] {
+            barrier.wait();
+            throw std::exception{};
+        });
+    } catch (std::exception&) {
+        exception_happened = true;
+    }
+
+    REQUIRE_MESSAGE(exception_happened == true, "Exception hasn't been received from the winner thread");
+    tg.wait();
+}
+
+#endif
+
+#if _MSC_VER && !defined(__INTEL_COMPILER)
+    #pragma warning( pop )
+#endif
diff --git a/external/tbb/test/conformance/conformance_combinable.cpp b/external/tbb/test/conformance/conformance_combinable.cpp
index bfac4044..9f1ef774 100644
--- a/external/tbb/test/conformance/conformance_combinable.cpp
+++ b/external/tbb/test/conformance/conformance_combinable.cpp
@@ -14,24 +14,24 @@
     limitations under the License.
 */
 
-#include "common/checktype.h"
-#include "common/spin_barrier.h"
 #include "common/test.h"
 #include "common/utils.h"
 #include "common/utils_report.h"
+#include "common/spin_barrier.h"
+#include "common/checktype.h"
 
 #include "common/container_move_support.h"
 
-#include "oneapi/tbb/blocked_range.h"
 #include "oneapi/tbb/combinable.h"
-#include "oneapi/tbb/global_control.h"
 #include "oneapi/tbb/parallel_for.h"
+#include "oneapi/tbb/blocked_range.h"
+#include "oneapi/tbb/global_control.h"
 #include "oneapi/tbb/tbb_allocator.h"
 // INFO: #include "oneapi/tbb/tick_count.h"
 
 #include <cstring>
-#include <utility>
 #include <vector>
+#include <utility>
 
 //! \file conformance_combinable.cpp
 //! \brief Test for [tls.combinable] specification
@@ -55,25 +55,18 @@ const double EXPECTED_SUM = (REPETITIONS + 1) * N;
 // also operator=
 //
 
-class minimal {
+class minimalCombinable {
 private:
     int my_value;
-
 public:
-    minimal(int val = 0) : my_value(val) { ++construction_counter; }
-    minimal(const minimal& m) : my_value(m.my_value) { ++construction_counter; }
-    minimal& operator=(const minimal& other) {
-        my_value = other.my_value;
-        return *this;
-    }
-    minimal& operator+=(const minimal& other) {
-        my_value += other.my_value;
-        return *this;
-    }
+    minimalCombinable(int val=0) : my_value(val) { ++construction_counter; }
+    minimalCombinable( const minimalCombinable&m ) : my_value(m.my_value) { ++construction_counter; }
+    minimalCombinable& operator=(const minimalCombinable& other) { my_value = other.my_value; return *this; }
+    minimalCombinable& operator+=(const minimalCombinable& other) { my_value += other.my_value; return *this; }
     operator int() const { return my_value; }
-    ~minimal() { ++destruction_counter; }
-    void set_value(const int i) { my_value = i; }
-    int value() const { return my_value; }
+    ~minimalCombinable() { ++destruction_counter; }
+    void set_value( const int i ) { my_value = i; }
+    int value( ) const { return my_value; }
 };
 
 //// functors for initialization and combine
@@ -90,30 +83,29 @@ struct FunctorAddFinit7 {
 
 template <typename T>
 struct FunctorAddCombine {
-    T operator()(T left, T right) const { return left + right; }
+    T operator()(T left, T right ) const {
+        return left + right;
+    }
 };
 
 template <typename T>
 struct FunctorAddCombineRef {
-    T operator()(const T& left, const T& right) const { return left + right; }
+    T operator()(const T& left, const T& right ) const {
+        return left + right;
+    }
 };
 
 template <typename T>
-T my_combine(T left, T right) {
-    return left + right;
-}
+T my_combine( T left, T right) { return left + right; }
 
 template <typename T>
-T my_combine_ref(const T& left, const T& right) {
-    return left + right;
-}
+T my_combine_ref( const T &left, const T &right) { return left + right; }
 
 template <typename T>
 class CombineEachHelper {
 public:
     CombineEachHelper(T& _result) : my_result(_result) {}
-    void operator()(const T& new_bit) { my_result += new_bit; }
-
+    void operator()(const T& new_bit) { my_result +=  new_bit; }
 private:
     T& my_result;
 };
@@ -122,11 +114,7 @@ template <typename T>
 class CombineEachHelperCnt {
 public:
     CombineEachHelperCnt(T& _result, int& _nbuckets) : my_result(_result), nBuckets(_nbuckets) {}
-    void operator()(const T& new_bit) {
-        my_result += new_bit;
-        ++nBuckets;
-    }
-
+    void operator()(const T& new_bit) { my_result +=  new_bit; ++nBuckets; }
 private:
     T& my_result;
     int& nBuckets;
@@ -135,11 +123,11 @@ class CombineEachHelperCnt {
 template <typename T>
 class CombineEachVectorHelper {
 public:
-    typedef std::vector<T, oneapi::tbb::tbb_allocator<T>> ContainerType;
-    CombineEachVectorHelper(T& _result) : my_result(_result) {}
+    typedef std::vector<T, oneapi::tbb::tbb_allocator<T> > ContainerType;
+    CombineEachVectorHelper(T& _result) : my_result(_result) { }
     void operator()(const ContainerType& new_bit) {
-        for (typename ContainerType::const_iterator ci = new_bit.begin(); ci != new_bit.end(); ++ci) {
-            my_result += *ci;
+        for(typename ContainerType::const_iterator ci = new_bit.begin(); ci != new_bit.end(); ++ci) {
+            my_result +=  *ci;
         }
     }
 
@@ -151,38 +139,44 @@ class CombineEachVectorHelper {
 
 // parallel body with a test for first access
 template <typename T>
-class ParallelScalarBody : utils::NoAssign {
+class ParallelScalarBody: utils::NoAssign {
 
-    oneapi::tbb::combinable<T>& sums;
+    oneapi::tbb::combinable<T> &sums;
 
 public:
-    ParallelScalarBody(oneapi::tbb::combinable<T>& _sums) : sums(_sums) {}
 
-    void operator()(const oneapi::tbb::blocked_range<int>& r) const {
+    ParallelScalarBody ( oneapi::tbb::combinable<T> &_sums ) : sums(_sums) { }
+
+    void operator()( const oneapi::tbb::blocked_range<int> &r ) const {
         for (int i = r.begin(); i != r.end(); ++i) {
             bool was_there;
             T& my_local = sums.local(was_there);
-            if (!was_there) my_local = 0;
-            my_local += 1;
+            if(!was_there) my_local = 0;
+             my_local +=  1 ;
         }
     }
+
 };
 
 // parallel body with no test for first access
 template <typename T>
-class ParallelScalarBodyNoInit : utils::NoAssign {
+class ParallelScalarBodyNoInit: utils::NoAssign {
 
-    oneapi::tbb::combinable<T>& sums;
+    oneapi::tbb::combinable<T> &sums;
 
 public:
-    ParallelScalarBodyNoInit(oneapi::tbb::combinable<T>& _sums) : sums(_sums) {}
 
-    void operator()(const oneapi::tbb::blocked_range<int>& r) const {
-        for (int i = r.begin(); i != r.end(); ++i) { sums.local() += 1; }
+    ParallelScalarBodyNoInit ( oneapi::tbb::combinable<T> &_sums ) : sums(_sums) { }
+
+    void operator()( const oneapi::tbb::blocked_range<int> &r ) const {
+        for (int i = r.begin(); i != r.end(); ++i) {
+             sums.local() +=  1 ;
+        }
     }
+
 };
 
-template <typename T>
+template< typename T >
 void RunParallelScalarTests(const char* /* test_name */) {
     for (int p = MinThread; p <= MaxThread; ++p) {
 
@@ -205,23 +199,20 @@ void RunParallelScalarTests(const char* /* test_name */) {
 
             // test uninitialized parallel combinable
             oneapi::tbb::combinable<T> sums;
-            oneapi::tbb::parallel_for(oneapi::tbb::blocked_range<int>(0, N, 10000),
-                                      ParallelScalarBody<T>(sums));
+            oneapi::tbb::parallel_for( oneapi::tbb::blocked_range<int>( 0, N, 10000 ), ParallelScalarBody<T>( sums ) );
             combine_sum += sums.combine(my_combine<T>);
             combine_ref_sum += sums.combine(my_combine_ref<T>);
 
             // test combinable::clear()
             oneapi::tbb::combinable<T> sums_to_clear;
-            oneapi::tbb::parallel_for(oneapi::tbb::blocked_range<int>(0, N, 10000),
-                                      ParallelScalarBody<T>(sums_to_clear));
+            oneapi::tbb::parallel_for( oneapi::tbb::blocked_range<int>(0, N, 10000), ParallelScalarBody<T>(sums_to_clear) );
             sums_to_clear.clear();
             CHECK_MESSAGE(sums_to_clear.combine(my_combine<T>) == 0, "Failed combinable::clear test");
 
             // test parallel combinable preinitialized with a functor that returns 0
             FunctorAddFinit<T> my_finit_decl;
             oneapi::tbb::combinable<T> finit_combinable(my_finit_decl);
-            oneapi::tbb::parallel_for(oneapi::tbb::blocked_range<int>(0, N, 10000),
-                                      ParallelScalarBodyNoInit<T>(finit_combinable));
+            oneapi::tbb::parallel_for( oneapi::tbb::blocked_range<int>( 0, N, 10000 ), ParallelScalarBodyNoInit<T>( finit_combinable ) );
             combine_finit_sum += finit_combinable.combine(my_combine<T>);
 
             // test another way of combining the elements using CombineEachHelper<T> functor
@@ -243,42 +234,45 @@ void RunParallelScalarTests(const char* /* test_name */) {
 
             // test move assignment for uninitialized parallel combinable
             oneapi::tbb::combinable<T> moved2;
-            moved2 = std::move(finit_combinable);
+            moved2=std::move(finit_combinable);
             move_assign_sum += moved2.combine(my_combine<T>);
         }
         // Here and below comparison for equality of float numbers succeeds
         // as the rounding error doesn't accumulate and doesn't affect the comparison
-        REQUIRE(EXPECTED_SUM == combine_sum);
-        REQUIRE(EXPECTED_SUM == combine_ref_sum);
-        REQUIRE(EXPECTED_SUM == combine_finit_sum);
-        REQUIRE(EXPECTED_SUM == combine_each_sum);
-        REQUIRE(EXPECTED_SUM == copy_construct_sum);
-        REQUIRE(EXPECTED_SUM == copy_assign_sum);
-        REQUIRE(EXPECTED_SUM == move_construct_sum);
-        REQUIRE(EXPECTED_SUM == move_assign_sum);
+        REQUIRE( EXPECTED_SUM == combine_sum );
+        REQUIRE( EXPECTED_SUM == combine_ref_sum );
+        REQUIRE( EXPECTED_SUM == combine_finit_sum );
+        REQUIRE( EXPECTED_SUM == combine_each_sum );
+        REQUIRE( EXPECTED_SUM == copy_construct_sum );
+        REQUIRE( EXPECTED_SUM == copy_assign_sum );
+        REQUIRE( EXPECTED_SUM == move_construct_sum );
+        REQUIRE( EXPECTED_SUM == move_assign_sum );
         // REMARK("  done parallel %s, %d, %g, %g\n", test_name, p, static_cast<double>(combine_sum), ( oneapi::tbb::tick_count::now() - t0).seconds());
     }
 }
 
 template <typename T>
-class ParallelVectorForBody : utils::NoAssign {
+class ParallelVectorForBody: utils::NoAssign {
 
-    oneapi::tbb::combinable<std::vector<T, oneapi::tbb::tbb_allocator<T>>>& locals;
+    oneapi::tbb::combinable< std::vector<T, oneapi::tbb::tbb_allocator<T> > > &locals;
 
 public:
-    ParallelVectorForBody(oneapi::tbb::combinable<std::vector<T, oneapi::tbb::tbb_allocator<T>>>& _locals)
-        : locals(_locals) {}
 
-    void operator()(const oneapi::tbb::blocked_range<int>& r) const {
+    ParallelVectorForBody ( oneapi::tbb::combinable< std::vector<T, oneapi::tbb::tbb_allocator<T> > > &_locals ) : locals(_locals) { }
+
+    void operator()( const oneapi::tbb::blocked_range<int> &r ) const {
         T one = 1;
 
-        for (int i = r.begin(); i < r.end(); ++i) { locals.local().push_back(one); }
+        for (int i = r.begin(); i < r.end(); ++i) {
+            locals.local().push_back( one );
+        }
     }
+
 };
 
-template <typename T>
+template< typename T >
 void RunParallelVectorTests(const char* /* test_name */) {
-    typedef std::vector<T, oneapi::tbb::tbb_allocator<T>> ContainerType;
+    typedef std::vector<T, oneapi::tbb::tbb_allocator<T> > ContainerType;
 
     for (int p = MinThread; p <= MaxThread; ++p) {
 
@@ -296,14 +290,13 @@ void RunParallelVectorTests(const char* /* test_name */) {
         for (int t = -1; t < REPETITIONS; ++t) {
             // if (Verbose && t == 0) t0 = oneapi::tbb::tick_count::now();
 
-            typedef typename oneapi::tbb::combinable<ContainerType> CombinableType;
+            typedef typename oneapi::tbb::combinable< ContainerType > CombinableType;
 
             // test uninitialized parallel combinable
             CombinableType vs;
-            oneapi::tbb::parallel_for(oneapi::tbb::blocked_range<int>(0, N, 10000),
-                                      ParallelVectorForBody<T>(vs));
+            oneapi::tbb::parallel_for( oneapi::tbb::blocked_range<int> (0, N, 10000), ParallelVectorForBody<T>( vs ) );
             CombineEachVectorHelper<T> MyCombineEach(defaultConstructed_sum);
-            vs.combine_each(MyCombineEach);// combine_each sums all elements of each vector into the result
+            vs.combine_each(MyCombineEach); // combine_each sums all elements of each vector into the result
 
             // test copy constructor for parallel combinable with vectors
             CombinableType vs2(vs);
@@ -322,110 +315,106 @@ void RunParallelVectorTests(const char* /* test_name */) {
             vs4.combine_each(MyCombineEach4);
 
             // test move assignment for uninitialized parallel combinable with vectors
-            vs4 = std::move(vs3);
+            vs4=std::move(vs3);
             CombineEachVectorHelper<T> MyCombineEach5(moveAssigned_sum);
             vs4.combine_each(MyCombineEach5);
         }
 
         double ResultValue = defaultConstructed_sum;
-        REQUIRE(EXPECTED_SUM == ResultValue);
+        REQUIRE( EXPECTED_SUM == ResultValue );
         ResultValue = copyConstructed_sum;
-        REQUIRE(EXPECTED_SUM == ResultValue);
+        REQUIRE( EXPECTED_SUM == ResultValue );
         ResultValue = copyAssigned_sum;
-        REQUIRE(EXPECTED_SUM == ResultValue);
+        REQUIRE( EXPECTED_SUM == ResultValue );
         ResultValue = moveConstructed_sum;
-        REQUIRE(EXPECTED_SUM == ResultValue);
+        REQUIRE( EXPECTED_SUM == ResultValue );
         ResultValue = moveAssigned_sum;
-        REQUIRE(EXPECTED_SUM == ResultValue);
+        REQUIRE( EXPECTED_SUM == ResultValue );
 
         // REMARK("  done parallel %s, %d, %g, %g\n", test_name, p, ResultValue, ( oneapi::tbb::tick_count::now() - t0).seconds());
     }
 }
 
-void RunParallelTests() {
+void
+RunParallelTests() {
     // REMARK("Running RunParallelTests\n");
     RunParallelScalarTests<int>("int");
     RunParallelScalarTests<double>("double");
-    RunParallelScalarTests<minimal>("minimal");
+    RunParallelScalarTests<minimalCombinable>("minimalCombinable");
     RunParallelVectorTests<int>("std::vector<int, oneapi::tbb::tbb_allocator<int> >");
     RunParallelVectorTests<double>("std::vector<double, oneapi::tbb::tbb_allocator<double> >");
 }
 
 template <typename T>
-void RunAssignmentAndCopyConstructorTest(const char* /* test_name */) {
+void
+RunAssignmentAndCopyConstructorTest(const char* /* test_name */) {
     // REMARK("  Testing assignment and copy construction for combinable<%s>...\n", test_name);
 
     // test creation with finit function (combine returns finit return value if no threads have created locals)
     FunctorAddFinit7<T> my_finit7_decl;
     oneapi::tbb::combinable<T> create1(my_finit7_decl);
-    REQUIRE_MESSAGE(7 == create1.combine(my_combine<T>),
-                    "Unexpected combine result for combinable object preinitialized with functor");
+    REQUIRE_MESSAGE(7 == create1.combine(my_combine<T>), "Unexpected combine result for combinable object preinitialized with functor");
 
     // test copy construction with function initializer
     oneapi::tbb::combinable<T> copy1(create1);
-    REQUIRE_MESSAGE(7 == copy1.combine(my_combine<T>),
-                    "Unexpected combine result for copy-constructed combinable object");
+    REQUIRE_MESSAGE(7 == copy1.combine(my_combine<T>), "Unexpected combine result for copy-constructed combinable object");
 
     // test copy assignment with function initializer
     FunctorAddFinit<T> my_finit_decl;
     oneapi::tbb::combinable<T> assign1(my_finit_decl);
     assign1 = create1;
-    REQUIRE_MESSAGE(7 == assign1.combine(my_combine<T>),
-                    "Unexpected combine result for copy-assigned combinable object");
+    REQUIRE_MESSAGE(7 == assign1.combine(my_combine<T>), "Unexpected combine result for copy-assigned combinable object");
 
     // test move construction with function initializer
     oneapi::tbb::combinable<T> move1(std::move(create1));
-    REQUIRE_MESSAGE(7 == move1.combine(my_combine<T>),
-                    "Unexpected combine result for move-constructed combinable object");
+    REQUIRE_MESSAGE(7 == move1.combine(my_combine<T>), "Unexpected combine result for move-constructed combinable object");
 
     // test move assignment with function initializer
     oneapi::tbb::combinable<T> move2;
-    move2 = std::move(copy1);
-    REQUIRE_MESSAGE(7 == move2.combine(my_combine<T>),
-                    "Unexpected combine result for move-assigned combinable object");
+    move2=std::move(copy1);
+    REQUIRE_MESSAGE(7 == move2.combine(my_combine<T>), "Unexpected combine result for move-assigned combinable object");
 
     // REMARK("  done\n");
+
 }
 
 void RunAssignmentAndCopyConstructorTests() {
     // REMARK("Running assignment and copy constructor tests:\n");
     RunAssignmentAndCopyConstructorTest<int>("int");
     RunAssignmentAndCopyConstructorTest<double>("double");
-    RunAssignmentAndCopyConstructorTest<minimal>("minimal");
+    RunAssignmentAndCopyConstructorTest<minimalCombinable>("minimalCombinable");
 }
 
 void RunMoveSemanticsForStateTrackableObjectTest() {
     // REMARK("Testing move assignment and move construction for combinable<Harness::StateTrackable>...\n");
 
-    oneapi::tbb::combinable<StateTrackable<true>> create1;
+    oneapi::tbb::combinable< StateTrackable<true> > create1;
     REQUIRE_MESSAGE(create1.local().state == StateTrackable<true>::DefaultInitialized,
-                    "Unexpected value in default combinable object");
+           "Unexpected value in default combinable object");
 
     // Copy constructing of the new combinable causes copying of stored values
-    oneapi::tbb::combinable<StateTrackable<true>> copy1(create1);
+    oneapi::tbb::combinable< StateTrackable<true> > copy1(create1);
     REQUIRE_MESSAGE(copy1.local().state == StateTrackable<true>::CopyInitialized,
-                    "Unexpected value in copy-constructed combinable object");
+           "Unexpected value in copy-constructed combinable object");
 
     // Copy assignment also causes copying of stored values
-    oneapi::tbb::combinable<StateTrackable<true>> copy2;
+    oneapi::tbb::combinable< StateTrackable<true> > copy2;
     REQUIRE_MESSAGE(copy2.local().state == StateTrackable<true>::DefaultInitialized,
-                    "Unexpected value in default combinable object");
-    copy2 = create1;
+           "Unexpected value in default combinable object");
+    copy2=create1;
     REQUIRE_MESSAGE(copy2.local().state == StateTrackable<true>::CopyInitialized,
-                    "Unexpected value in copy-assigned combinable object");
+           "Unexpected value in copy-assigned combinable object");
 
     // Store some marked values in the initial combinable object
     create1.local().state = StateTrackableBase::Unspecified;
 
     // Move constructing of the new combinable must not cause copying of stored values
-    oneapi::tbb::combinable<StateTrackable<true>> move1(std::move(create1));
-    REQUIRE_MESSAGE(move1.local().state == StateTrackableBase::Unspecified,
-                    "Unexpected value in move-constructed combinable object");
+    oneapi::tbb::combinable< StateTrackable<true> > move1(std::move(create1));
+    REQUIRE_MESSAGE(move1.local().state == StateTrackableBase::Unspecified, "Unexpected value in move-constructed combinable object");
 
     // Move assignment must not cause copying of stored values
-    copy1 = std::move(move1);
-    REQUIRE_MESSAGE(copy1.local().state == StateTrackableBase::Unspecified,
-                    "Unexpected value in move-assigned combinable object");
+    copy1=std::move(move1);
+    REQUIRE_MESSAGE(copy1.local().state == StateTrackableBase::Unspecified, "Unexpected value in move-assigned combinable object");
 
     // Make the stored values valid again in order to delete StateTrackable object correctly
     copy1.local().state = StateTrackable<true>::MoveAssigned;
@@ -439,12 +428,12 @@ struct Body : utils::NoAssign {
     oneapi::tbb::combinable<int>* locals;
     const int nthread;
     const int nIters;
-    Body(int nthread_, int niters_) : nthread(nthread_), nIters(niters_) { sBarrier.initialize(nthread_); }
+    Body( int nthread_, int niters_ ) : nthread(nthread_), nIters(niters_) { sBarrier.initialize(nthread_); }
 
-    void operator()(int thread_id) const {
+    void operator()(int thread_id ) const {
         bool existed;
         sBarrier.wait();
-        for (int i = 0; i < nIters; ++i) {
+        for(int i = 0; i < nIters; ++i ) {
             existed = thread_id & 1;
             int oldval = locals->local(existed);
             REQUIRE_MESSAGE(existed == (i > 0), "Error on first reference");
@@ -456,14 +445,14 @@ struct Body : utils::NoAssign {
     }
 };
 
-void TestLocalAllocations(int nthread) {
+void TestLocalAllocations( int nthread ) {
     REQUIRE_MESSAGE(nthread > 0, "nthread must be positive");
 #define NITERATIONS 1000
     Body myBody(nthread, NITERATIONS);
     oneapi::tbb::combinable<int> myCombinable;
     myBody.locals = &myCombinable;
 
-    NativeParallelFor(nthread, myBody);
+    NativeParallelFor( nthread, myBody );
 
     int mySum = 0;
     int mySlots = 0;
@@ -476,9 +465,11 @@ void TestLocalAllocations(int nthread) {
 
 void RunLocalAllocationsTests() {
     // REMARK("Testing local() allocations\n");
-    for (int i = 1 <= MinThread ? MinThread : 1; i <= MaxThread; ++i) {
+    for(int i = 1 <= MinThread ? MinThread : 1; i <= MaxThread; ++i) {
         // REMARK("  Testing local() allocation with nthreads=%d...\n", i);
-        for (int j = 0; j < 100; ++j) { TestLocalAllocations(i); }
+        for(int j = 0; j < 100; ++j) {
+            TestLocalAllocations(i);
+        }
         // REMARK("  done\n");
     }
 }
@@ -492,8 +483,13 @@ TEST_CASE("Parallel scenario") {
 
 //! Test assignment and copy construction
 //! \brief \ref interface \ref requirement
-TEST_CASE("Assignment and copy constructor test") { RunAssignmentAndCopyConstructorTests(); }
+TEST_CASE("Assignment and copy constructor test") {
+    RunAssignmentAndCopyConstructorTests();
+}
 
 //! Test move support
 //! \brief \ref interface \ref requirement
-TEST_CASE("Move semantics") { RunMoveSemanticsForStateTrackableObjectTest(); }
+TEST_CASE("Move semantics") {
+    RunMoveSemanticsForStateTrackableObjectTest();
+}
+
diff --git a/external/tbb/test/conformance/conformance_composite_node.cpp b/external/tbb/test/conformance/conformance_composite_node.cpp
index eef1cd6e..cb0821e5 100644
--- a/external/tbb/test/conformance/conformance_composite_node.cpp
+++ b/external/tbb/test/conformance/conformance_composite_node.cpp
@@ -15,7 +15,7 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
 #endif
 
 #include "conformance_flowgraph.h"
@@ -24,66 +24,62 @@
 //! \brief Test for [flow_graph.composite_node] specification
 
 class adder : public oneapi::tbb::flow::composite_node<std::tuple<int, int>, std::tuple<int>> {
-    oneapi::tbb::flow::join_node<std::tuple<int, int>, oneapi::tbb::flow::queueing> j;
-    oneapi::tbb::flow::function_node<std::tuple<int, int>, int> f;
+    oneapi::tbb::flow::join_node<std::tuple<int,int>, oneapi::tbb::flow::queueing> j;
+    oneapi::tbb::flow::function_node<std::tuple<int,int>, int> f;
     oneapi::tbb::flow::queue_node<int> qn;
-    using base_type = oneapi::tbb::flow::composite_node<std::tuple<int, int>, std::tuple<int>>;
+    using base_type = oneapi::tbb::flow::composite_node<std::tuple<int,int>, std::tuple<int>>;
 
     struct f_body {
-        int operator()(const std::tuple<int, int> &t) {
+        int operator()(const std::tuple<int,int> &t) {
             int sum = std::get<0>(t) + std::get<1>(t);
-            return sum;
+            return  sum;
         }
     };
 
 public:
-    adder(oneapi::tbb::flow::graph &g)
-        : base_type(g), j(g), f(g, oneapi::tbb::flow::unlimited, f_body()), qn(g) {
+    adder(oneapi::tbb::flow::graph &g) : base_type(g), j(g), f(g, oneapi::tbb::flow::unlimited, f_body()), qn(g) {
         make_edge(j, f);
         make_edge(f, qn);
 
-        base_type::input_ports_type input_tuple(oneapi::tbb::flow::input_port<0>(j),
-                                                oneapi::tbb::flow::input_port<1>(j));
+        base_type::input_ports_type input_tuple(oneapi::tbb::flow::input_port<0>(j), oneapi::tbb::flow::input_port<1>(j));
         base_type::output_ports_type output_tuple(qn);
         base_type::set_external_ports(input_tuple, output_tuple);
     }
 };
 
-template <int N, typename T1, typename T2>
+template<int N, typename T1, typename T2>
 struct compare {
     static void compare_refs(T1 tuple1, T2 tuple2) {
-        CHECK_MESSAGE((&std::get<N>(tuple1) == &std::get<N>(tuple2)), "ports not set correctly");
-        compare<N - 1, T1, T2>::compare_refs(tuple1, tuple2);
+    CHECK_MESSAGE(( &std::get<N>(tuple1) == &std::get<N>(tuple2)), "ports not set correctly");
+    compare<N-1, T1, T2>::compare_refs(tuple1, tuple2);
     }
 };
 
-template <typename T1, typename T2>
+template<typename T1, typename T2>
 struct compare<1, T1, T2> {
     static void compare_refs(T1 tuple1, T2 tuple2) {
-        CHECK_MESSAGE((&std::get<0>(tuple1) == &std::get<0>(tuple2)), "port 0 not correctly set");
+    CHECK_MESSAGE((&std::get<0>(tuple1) == &std::get<0>(tuple2)), "port 0 not correctly set");
     }
 };
 
 //! Test inheritance relations
 //! \brief \ref interface
-TEST_CASE("composite_node superclasses") {
-    CHECK_MESSAGE((std::is_base_of<oneapi::tbb::flow::graph_node, adder>::value),
-                  "composite_node should be derived from graph_node");
+TEST_CASE("composite_node superclasses"){
+    CHECK_MESSAGE((std::is_base_of<oneapi::tbb::flow::graph_node, adder>::value), "composite_node should be derived from graph_node");
 }
 
 //! Test composite_node ports
 //! \brief \ref interface \ref requirement
-TEST_CASE("composite_node ports") {
+TEST_CASE("composite_node ports"){
     oneapi::tbb::flow::graph g;
 
-    using InputTupleType = std::tuple<tbb::flow::continue_msg, std::tuple<int, int>, int, int, int, int, int,
-                                      int, int, int, int, int, int, int>;
+    using InputTupleType = std::tuple<tbb::flow::continue_msg, std::tuple<int, int>, int, int, int, int,
+                             int, int, int, int, int, int, int, int>;
 
-    using OutputTupleType = std::tuple<tbb::flow::continue_msg, std::tuple<int, int>,
-                                       oneapi::tbb::flow::tagged_msg<size_t, int, float>, int, int, int, int,
-                                       int, int, int, int, int, int, int, int>;
+    using OutputTupleType = std::tuple<tbb::flow::continue_msg, std::tuple<int, int>, oneapi::tbb::flow::tagged_msg<size_t, int, float>,
+                             int, int, int, int, int, int, int, int, int, int, int, int>;
 
-    using EmptyTupleType = std::tuple<>;
+    using EmptyTupleType= std::tuple<>;
 
     using input_output_type = oneapi::tbb::flow::composite_node<InputTupleType, OutputTupleType>;
     using input_only_type = oneapi::tbb::flow::composite_node<InputTupleType, EmptyTupleType>;
@@ -96,15 +92,14 @@ TEST_CASE("composite_node ports") {
 
     //node types
     oneapi::tbb::flow::continue_node<tbb::flow::continue_msg> ct(g, body());
-    oneapi::tbb::flow::split_node<std::tuple<int, int>> s(g);
+    oneapi::tbb::flow::split_node< std::tuple<int, int> > s(g);
     oneapi::tbb::flow::input_node<int> src(g, body());
     oneapi::tbb::flow::function_node<int, int> fxn(g, oneapi::tbb::flow::unlimited, body());
-    oneapi::tbb::flow::multifunction_node<int, std::tuple<int, int>> m_fxn(g, oneapi::tbb::flow::unlimited,
-                                                                           body());
+    oneapi::tbb::flow::multifunction_node<int, std::tuple<int, int> > m_fxn(g, oneapi::tbb::flow::unlimited, body());
     oneapi::tbb::flow::broadcast_node<int> bc(g);
     oneapi::tbb::flow::limiter_node<int> lim(g, 2);
     oneapi::tbb::flow::indexer_node<int, float> ind(g);
-    oneapi::tbb::flow::join_node<std::tuple<int, int>, oneapi::tbb::flow::queueing> j(g);
+    oneapi::tbb::flow::join_node< std::tuple< int, int >, oneapi::tbb::flow::queueing > j(g);
     oneapi::tbb::flow::queue_node<int> q(g);
     oneapi::tbb::flow::buffer_node<int> bf(g);
     oneapi::tbb::flow::priority_queue_node<int> pq(g);
@@ -112,10 +107,10 @@ TEST_CASE("composite_node ports") {
     oneapi::tbb::flow::overwrite_node<int> ovw(g);
     oneapi::tbb::flow::sequencer_node<int> seq(g, conformance::sequencer_functor<int>());
 
-    auto input_tuple = std::tie(ct, s, m_fxn, fxn, bc, oneapi::tbb::flow::input_port<0>(j), lim, q,
-                                oneapi::tbb::flow::input_port<0>(ind), pq, ovw, wo, bf, seq);
-    auto output_tuple = std::tie(ct, j, ind, fxn, src, bc, oneapi::tbb::flow::output_port<0>(s), lim,
-                                 oneapi::tbb::flow::output_port<0>(m_fxn), q, pq, ovw, wo, bf, seq);
+    auto input_tuple = std::tie(ct, s, m_fxn, fxn, bc, oneapi::tbb::flow::input_port<0>(j), lim, q, oneapi::tbb::flow::input_port<0>(ind),
+                                pq, ovw, wo, bf, seq);
+    auto output_tuple = std::tie(ct,j, ind, fxn, src, bc, oneapi::tbb::flow::output_port<0>(s), lim, oneapi::tbb::flow::output_port<0>(m_fxn),
+                                 q, pq, ovw, wo, bf, seq);
 
     //composite_node with both input_ports and output_ports
     input_output_type a_node(g);
@@ -125,16 +120,12 @@ TEST_CASE("composite_node ports") {
     a_node.add_nodes(src, fxn, m_fxn, bc, lim, ind, s, ct, j, q, bf, pq, wo, ovw, seq);
 
     auto a_node_input_ports_ptr = a_node.input_ports();
-    compare<NUM_INPUTS - 1, decltype(a_node_input_ports_ptr), decltype(input_tuple)>::compare_refs(
-            a_node_input_ports_ptr, input_tuple);
-    CHECK_MESSAGE(NUM_INPUTS == std::tuple_size<decltype(a_node_input_ports_ptr)>::value,
-                  "not all declared input ports were bound to nodes");
+    compare<NUM_INPUTS-1, decltype(a_node_input_ports_ptr), decltype(input_tuple)>::compare_refs(a_node_input_ports_ptr, input_tuple);
+    CHECK_MESSAGE(NUM_INPUTS == std::tuple_size<decltype(a_node_input_ports_ptr)>::value, "not all declared input ports were bound to nodes");
 
     auto a_node_output_ports_ptr = a_node.output_ports();
-    compare<NUM_OUTPUTS - 1, decltype(a_node_output_ports_ptr), decltype(output_tuple)>::compare_refs(
-            a_node_output_ports_ptr, output_tuple);
-    CHECK_MESSAGE((NUM_OUTPUTS == std::tuple_size<decltype(a_node_output_ports_ptr)>::value),
-                  "not all declared output ports were bound to nodes");
+    compare<NUM_OUTPUTS-1, decltype(a_node_output_ports_ptr), decltype(output_tuple)>::compare_refs(a_node_output_ports_ptr, output_tuple);
+    CHECK_MESSAGE((NUM_OUTPUTS == std::tuple_size<decltype(a_node_output_ports_ptr)>::value), "not all declared output ports were bound to nodes");
 
     //composite_node with only input_ports
     input_only_type b_node(g);
@@ -144,10 +135,8 @@ TEST_CASE("composite_node ports") {
     b_node.add_nodes(src, fxn, m_fxn, bc, lim, ind, s, ct, j, q, bf, pq, wo, ovw, seq);
 
     auto b_node_input_ports_ptr = b_node.input_ports();
-    compare<NUM_INPUTS - 1, decltype(b_node_input_ports_ptr), decltype(input_tuple)>::compare_refs(
-            b_node_input_ports_ptr, input_tuple);
-    CHECK_MESSAGE(NUM_INPUTS == std::tuple_size<decltype(b_node_input_ports_ptr)>::value,
-                  "not all declared input ports were bound to nodes");
+    compare<NUM_INPUTS-1, decltype(b_node_input_ports_ptr), decltype(input_tuple)>::compare_refs(b_node_input_ports_ptr, input_tuple);
+    CHECK_MESSAGE(NUM_INPUTS == std::tuple_size<decltype(b_node_input_ports_ptr)>::value, "not all declared input ports were bound to nodes");
 
     //composite_node with only output_ports
     output_only_type c_node(g);
@@ -161,15 +150,13 @@ TEST_CASE("composite_node ports") {
     c_node.add_nodes(src, fxn, m_fxn, bc, lim, ind, s, ct, j, q, bf, pq, wo, ovw, seq);
 
     auto c_node_output_ports_ptr = c_node.output_ports();
-    compare<NUM_OUTPUTS - 1, decltype(c_node_output_ports_ptr), decltype(output_tuple)>::compare_refs(
-            c_node_output_ports_ptr, output_tuple);
-    CHECK_MESSAGE(NUM_OUTPUTS == std::tuple_size<decltype(c_node_output_ports_ptr)>::value,
-                  "not all declared input ports were bound to nodes");
+    compare<NUM_OUTPUTS-1, decltype(c_node_output_ports_ptr), decltype(output_tuple)>::compare_refs(c_node_output_ports_ptr, output_tuple);
+    CHECK_MESSAGE(NUM_OUTPUTS == std::tuple_size<decltype(c_node_output_ports_ptr)>::value, "not all declared input ports were bound to nodes");
 }
 
 //! Test composite_node construction and message passing
 //! \brief \ref interface \ref requirement
-TEST_CASE("composite_node construction and message test") {
+TEST_CASE("composite_node construction and message test"){
     using namespace oneapi::tbb::flow;
     graph g;
     split_node<std::tuple<int, int, int, int>> s(g);
@@ -180,16 +167,16 @@ TEST_CASE("composite_node construction and message test") {
     make_edge(output_port<0>(s), input_port<0>(a0));
     make_edge(output_port<1>(s), input_port<1>(a0));
 
-    make_edge(output_port<0>(a0), input_port<0>(a1));
+    make_edge(output_port<0>(a0),input_port<0>(a1));
     make_edge(output_port<2>(s), input_port<1>(a1));
 
     make_edge(output_port<0>(a1), input_port<0>(a2));
     make_edge(output_port<3>(s), input_port<1>(a2));
 
-    s.try_put(std::make_tuple(1, 3, 5, 7));
+    s.try_put(std::make_tuple(1,3,5,7));
     g.wait_for_all();
 
     int tmp = -1;
     CHECK_MESSAGE((output_port<0>(a2).try_get(tmp) == true), "Composite node should produce a value");
-    CHECK_MESSAGE((tmp == 1 + 3 + 5 + 7), "Composite node should produce correct sum");
+    CHECK_MESSAGE((tmp == 1+3+5+7), "Composite node should produce correct sum");
 }
diff --git a/external/tbb/test/conformance/conformance_concurrent_hash_map.cpp b/external/tbb/test/conformance/conformance_concurrent_hash_map.cpp
index 335cc861..889739b9 100644
--- a/external/tbb/test/conformance/conformance_concurrent_hash_map.cpp
+++ b/external/tbb/test/conformance/conformance_concurrent_hash_map.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -14,19 +14,19 @@
     limitations under the License.
 */
 
+#include <common/test.h>
+#include <common/utils.h>
 #include "common/utils_report.h"
-#include "oneapi/tbb/concurrent_hash_map.h"
-#include "oneapi/tbb/global_control.h"
-#include "oneapi/tbb/parallel_for.h"
+#include <common/spin_barrier.h>
+#include <common/state_trackable.h>
 #include <common/container_move_support.h>
 #include <common/containers_common.h>
 #include <common/initializer_list_support.h>
-#include <common/spin_barrier.h>
-#include <common/state_trackable.h>
-#include <common/test.h>
-#include <common/test_comparisons.h>
-#include <common/utils.h>
 #include <common/vector_types.h>
+#include <common/test_comparisons.h>
+#include "oneapi/tbb/concurrent_hash_map.h"
+#include "oneapi/tbb/global_control.h"
+#include "oneapi/tbb/parallel_for.h"
 
 //! \file conformance_concurrent_hash_map.cpp
 //! \brief Test for [containers.concurrent_hash_map containers.tbb_hash_compare] specification
@@ -35,8 +35,8 @@
     that concurrent_hash_map uses only the required interface. */
 class MyException : public std::bad_alloc {
 public:
-    virtual const char* what() const throw() override { return "out of items limit"; }
-    virtual ~MyException() throw() {}
+    virtual const char *what() const noexcept override { return "out of items limit"; }
+    virtual ~MyException() noexcept {}
 };
 
 /** Has tightly controlled interface so that we can verify
@@ -46,12 +46,11 @@ class MyKey {
     int key;
     friend class MyHashCompare;
     friend class YourHashCompare;
-
 public:
     MyKey() = default;
-    MyKey(const MyKey&) = default;
-    void operator=(const MyKey&) = delete;
-    static MyKey make(int i) {
+    MyKey( const MyKey& ) = default;
+    void operator=( const MyKey&  ) = delete;
+    static MyKey make( int i ) {
         MyKey result;
         result.key = i;
         return result;
@@ -67,21 +66,28 @@ class MyData {
 protected:
     friend class MyData2;
     int data;
-    enum state_t { LIVE = 0x1234, DEAD = 0x5678 } my_state;
-    void operator=(const MyData&);// Deny access
+    enum state_t {
+        LIVE=0x1234,
+        DEAD=0x5678
+    } my_state;
+    void operator=( const MyData& );    // Deny access
 public:
     MyData(int i = 0) {
         my_state = LIVE;
         data = i;
-        if (MyDataCountLimit && MyDataCount + 1 >= MyDataCountLimit) { TBB_TEST_THROW(MyException {}); }
+        if (MyDataCountLimit && MyDataCount + 1 >= MyDataCountLimit) {
+            TBB_TEST_THROW(MyException{});
+        }
         ++MyDataCount;
     }
 
-    MyData(const MyData& other) {
-        CHECK(other.my_state == LIVE);
+    MyData( const MyData& other ) {
+        CHECK_FAST(other.my_state==LIVE);
         my_state = LIVE;
         data = other.data;
-        if (MyDataCountLimit && MyDataCount + 1 >= MyDataCountLimit) { TBB_TEST_THROW(MyException {}); }
+        if(MyDataCountLimit && MyDataCount + 1 >= MyDataCountLimit) {
+            TBB_TEST_THROW(MyException{});
+        }
         ++MyDataCount;
     }
 
@@ -90,76 +96,84 @@ class MyData {
         my_state = DEAD;
     }
 
-    static MyData make(int i) {
+    static MyData make( int i ) {
         MyData result;
         result.data = i;
         return result;
     }
 
     int value_of() const {
-        CHECK(my_state == LIVE);
+        CHECK_FAST(my_state==LIVE);
         return data;
     }
 
-    void set_value(int i) {
-        CHECK(my_state == LIVE);
+    void set_value( int i ) {
+        CHECK_FAST(my_state==LIVE);
         data = i;
     }
 
-    bool operator==(const MyData& other) const {
-        CHECK(other.my_state == LIVE);
-        CHECK(my_state == LIVE);
+    bool operator==( const MyData& other ) const {
+        CHECK_FAST(other.my_state==LIVE);
+        CHECK_FAST(my_state==LIVE);
         return data == other.data;
     }
 };
 
 class MyData2 : public MyData {
 public:
-    MyData2() {}
+    MyData2( ) {}
 
-    MyData2(const MyData2& other) : MyData() {
-        CHECK(other.my_state == LIVE);
-        CHECK(my_state == LIVE);
+    MyData2( const MyData2& other ) : MyData() {
+        CHECK_FAST(other.my_state==LIVE);
+        CHECK_FAST(my_state==LIVE);
         data = other.data;
     }
 
-    MyData2(const MyData& other) {
-        CHECK(other.my_state == LIVE);
-        CHECK(my_state == LIVE);
+    MyData2( const MyData& other ) {
+        CHECK_FAST(other.my_state==LIVE);
+        CHECK_FAST(my_state==LIVE);
         data = other.data;
     }
 
-    void operator=(const MyData& other) {
-        CHECK(other.my_state == LIVE);
-        CHECK(my_state == LIVE);
+    void operator=( const MyData& other ) {
+        CHECK_FAST(other.my_state==LIVE);
+        CHECK_FAST(my_state==LIVE);
         data = other.data;
     }
 
-    void operator=(const MyData2& other) {
-        CHECK(other.my_state == LIVE);
-        CHECK(my_state == LIVE);
+    void operator=( const MyData2& other ) {
+        CHECK_FAST(other.my_state==LIVE);
+        CHECK_FAST(my_state==LIVE);
         data = other.data;
     }
 
-    bool operator==(const MyData2& other) const {
-        CHECK(other.my_state == LIVE);
-        CHECK(my_state == LIVE);
+    bool operator==( const MyData2& other ) const {
+        CHECK_FAST(other.my_state==LIVE);
+        CHECK_FAST(my_state==LIVE);
         return data == other.data;
     }
 };
 
 class MyHashCompare {
 public:
-    bool equal(const MyKey& j, const MyKey& k) const { return j.key == k.key; }
+    bool equal( const MyKey& j, const MyKey& k ) const {
+        return j.key==k.key;
+    }
 
-    std::size_t hash(const MyKey& k) const { return k.key; }
+    std::size_t hash( const MyKey& k ) const {
+        return k.key;
+    }
 };
 
 class YourHashCompare {
 public:
-    bool equal(const MyKey& j, const MyKey& k) const { return j.key == k.key; }
+    bool equal( const MyKey& j, const MyKey& k ) const {
+        return j.key==k.key;
+    }
 
-    std::size_t hash(const MyKey&) const { return 1; }
+    std::size_t hash( const MyKey& ) const {
+        return 1;
+    }
 };
 
 using test_allocator_type = StaticSharedCountingAllocator<std::allocator<std::pair<const MyKey, MyData>>>;
@@ -169,8 +183,7 @@ using other_test_table_type = oneapi::tbb::concurrent_hash_map<MyKey, MyData2, M
 template <template <typename...> class ContainerType>
 void test_member_types() {
     using container_type = ContainerType<int, int>;
-    static_assert(std::is_same<typename container_type::allocator_type,
-                               oneapi::tbb::tbb_allocator<std::pair<const int, int>>>::value,
+    static_assert(std::is_same<typename container_type::allocator_type, oneapi::tbb::tbb_allocator<std::pair<const int, int>>>::value,
                   "Incorrect default template allocator");
 
     static_assert(std::is_same<typename container_type::key_type, int>::value,
@@ -189,11 +202,9 @@ void test_member_types() {
     static_assert(std::is_same<typename container_type::const_reference, const value_type&>::value,
                   "Incorrect container const_reference member type");
     using allocator_type = typename container_type::allocator_type;
-    static_assert(std::is_same<typename container_type::pointer,
-                               typename std::allocator_traits<allocator_type>::pointer>::value,
+    static_assert(std::is_same<typename container_type::pointer, typename std::allocator_traits<allocator_type>::pointer>::value,
                   "Incorrect container pointer member type");
-    static_assert(std::is_same<typename container_type::const_pointer,
-                               typename std::allocator_traits<allocator_type>::const_pointer>::value,
+    static_assert(std::is_same<typename container_type::const_pointer, typename std::allocator_traits<allocator_type>::const_pointer>::value,
                   "Incorrect container const_pointer member type");
 
     static_assert(utils::is_forward_iterator<typename container_type::iterator>::value,
@@ -206,88 +217,89 @@ void test_member_types() {
                   "Incorrect container iterator member type");
 }
 
-template <typename test_table_type>
-void FillTable(test_table_type& x, int n) {
-    for (int i = 1; i <= n; ++i) {
-        MyKey key(MyKey::make(-i));// hash values must not be specified in direct order
+template<typename test_table_type>
+void FillTable( test_table_type& x, int n ) {
+    for( int i=1; i<=n; ++i ) {
+        MyKey key( MyKey::make(-i) ); // hash values must not be specified in direct order
         typename test_table_type::accessor a;
-        bool b = x.insert(a, key);
-        CHECK(b);
-        a->second.set_value(i * i);
+        bool b = x.insert(a,key);
+        CHECK_FAST(b);
+        a->second.set_value( i*i );
     }
 }
 
-template <typename test_table_type>
-static void CheckTable(const test_table_type& x, int n) {
-    REQUIRE_MESSAGE(x.size() == size_t(n), "table is different size than expected");
-    CHECK(x.empty() == (n == 0));
-    CHECK(x.size() <= x.max_size());
-    for (int i = 1; i <= n; ++i) {
-        MyKey key(MyKey::make(-i));
+template<typename test_table_type>
+static void CheckTable( const test_table_type& x, int n ) {
+    REQUIRE_MESSAGE( x.size()==size_t(n), "table is different size than expected" );
+    CHECK(x.empty()==(n==0));
+    CHECK(x.size()<=x.max_size());
+    for( int i=1; i<=n; ++i ) {
+        MyKey key( MyKey::make(-i) );
         typename test_table_type::const_accessor a;
-        bool b = x.find(a, key);
-        CHECK(b);
-        CHECK(a->second.value_of() == i * i);
+        bool b = x.find(a,key);
+        CHECK_FAST(b);
+        CHECK_FAST(a->second.value_of()==i*i);
     }
     int count = 0;
     int key_sum = 0;
-    for (typename test_table_type::const_iterator i(x.begin()); i != x.end(); ++i) {
+    for( typename test_table_type::const_iterator i(x.begin()); i!=x.end(); ++i ) {
         ++count;
         key_sum += -i->first.value_of();
     }
-    CHECK(count == n);
-    CHECK(key_sum == n * (n + 1) / 2);
+    CHECK(count==n);
+    CHECK(key_sum==n*(n+1)/2);
 }
 
 void TestCopy() {
     INFO("testing copy\n");
     test_table_type t1;
-    for (int i = 0; i < 10000; i = (i < 100 ? i + 1 : i * 3)) {
+    for( int i=0; i<10000; i=(i<100 ? i+1 : i*3) ) {
         MyDataCount = 0;
 
-        FillTable(t1, i);
+        FillTable(t1,i);
         // Do not call CheckTable(t1,i) before copying, it enforces rehashing
 
         test_table_type t2(t1);
         // Check that copy constructor did not mangle source table.
-        CheckTable(t1, i);
+        CheckTable(t1,i);
         swap(t1, t2);
-        CheckTable(t1, i);
+        CheckTable(t1,i);
         CHECK(!(t1 != t2));
 
         // Clear original table
         t2.clear();
         swap(t2, t1);
-        CheckTable(t1, 0);
+        CheckTable(t1,0);
 
         // Verify that copy of t1 is correct, even after t1 is cleared.
-        CheckTable(t2, i);
+        CheckTable(t2,i);
         t2.clear();
-        t1.swap(t2);
-        CheckTable(t1, 0);
-        CheckTable(t2, 0);
-        REQUIRE_MESSAGE(MyDataCount == 0, "data leak?");
+        t1.swap( t2 );
+        CheckTable(t1,0);
+        CheckTable(t2,0);
+        REQUIRE_MESSAGE( MyDataCount==0, "data leak?" );
     }
 }
 
 void TestRehash() {
     INFO("testing rehashing\n");
     test_table_type w;
-    w.insert(std::make_pair(MyKey::make(-5), MyData()));
-    w.rehash();// without this, assertion will fail
+    w.insert( std::make_pair(MyKey::make(-5), MyData()) );
+    w.rehash(); // without this, assertion will fail
     test_table_type::iterator it = w.begin();
-    int i = 0;// check for non-rehashed buckets
-    for (; it != w.end(); i++) w.count((it++)->first);
+    int i = 0; // check for non-rehashed buckets
+    for( ; it != w.end(); i++ )
+        w.count( (it++)->first );
     CHECK(i == 1);
-    for (i = 0; i < 1000; i = (i < 29 ? i + 1 : i * 2)) {
-        for (int j = std::max(256 + i, i * 2); j < 10000; j *= 3) {
+    for( i=0; i<1000; i=(i<29 ? i+1 : i*2) ) {
+        for( int j=std::max(256+i, i*2); j<10000; j*=3 ) {
             test_table_type v;
-            FillTable(v, i);
+            FillTable( v, i );
             CHECK(int(v.size()) == i);
             CHECK(int(v.bucket_count()) <= j);
-            v.rehash(j);
+            v.rehash( j );
             CHECK(int(v.bucket_count()) >= j);
-            CheckTable(v, i);
+            CheckTable( v, i );
         }
     }
 }
@@ -295,73 +307,72 @@ void TestRehash() {
 void TestAssignment() {
     INFO("testing assignment\n");
     oneapi::tbb::concurrent_hash_map<int, int> test_map({{1, 2}, {2, 4}});
-    test_map.operator=(test_map);// suppress self assign warning
+    test_map.operator=(test_map); // suppress self assign warning
     CHECK(!test_map.empty());
 
-    for (int i = 0; i < 1000; i = (i < 30 ? i + 1 : i * 5)) {
-        for (int j = 0; j < 1000; j = (j < 30 ? j + 1 : j * 7)) {
+    for( int i=0; i<1000; i=(i<30 ? i+1 : i*5) ) {
+        for( int j=0; j<1000; j=(j<30 ? j+1 : j*7) ) {
             test_table_type t1;
             test_table_type t2;
-            FillTable(t1, i);
-            FillTable(t2, j);
+            FillTable(t1,i);
+            FillTable(t2,j);
             CHECK((t1 == t2) == (i == j));
-            CheckTable(t2, j);
+            CheckTable(t2,j);
 
-            test_table_type& tref = t2 = t1;
-            CHECK(&tref == &t2);
+            test_table_type& tref = t2=t1;
+            CHECK(&tref==&t2);
             CHECK(t1 == t2);
-            CheckTable(t1, i);
-            CheckTable(t2, i);
+            CheckTable(t1,i);
+            CheckTable(t2,i);
 
             t1.clear();
-            CheckTable(t1, 0);
-            CheckTable(t2, i);
-            REQUIRE_MESSAGE(MyDataCount == i, "data leak?");
+            CheckTable(t1,0);
+            CheckTable(t2,i);
+            REQUIRE_MESSAGE( MyDataCount==i, "data leak?" );
 
             t2.clear();
-            CheckTable(t1, 0);
-            CheckTable(t2, 0);
-            REQUIRE_MESSAGE(MyDataCount == 0, "data leak?");
+            CheckTable(t1,0);
+            CheckTable(t2,0);
+            REQUIRE_MESSAGE( MyDataCount==0, "data leak?" );
         }
     }
 }
 
-template <typename Iterator, typename T>
+template<typename Iterator, typename T>
 void TestIteratorTraits() {
     T x;
     typename Iterator::reference xr = x;
     typename Iterator::pointer xp = &x;
-    CHECK(&xr == xp);
+    CHECK(&xr==xp);
 }
 
-template <typename Iterator1, typename Iterator2>
-void TestIteratorAssignment(Iterator2 j) {
+template<typename Iterator1, typename Iterator2>
+void TestIteratorAssignment( Iterator2 j ) {
     Iterator1 i(j), k;
-    CHECK(i == j);
-    CHECK(!(i != j));
+    CHECK(i==j);
+    CHECK(!(i!=j));
     k = j;
-    CHECK(k == j);
-    CHECK(!(k != j));
+    CHECK(k==j);
+    CHECK(!(k!=j));
 }
 
-template <typename Range1, typename Range2>
-void TestRangeAssignment(Range2 r2) {
-    Range1 r1(r2);
-    r1 = r2;
+template<typename Range1, typename Range2>
+void TestRangeAssignment( Range2 r2 ) {
+    Range1 r1(r2); r1 = r2;
 }
 
 void TestIteratorsAndRanges() {
     INFO("testing iterators compliance\n");
-    TestIteratorTraits<test_table_type::iterator, test_table_type::value_type>();
-    TestIteratorTraits<test_table_type::const_iterator, const test_table_type::value_type>();
+    TestIteratorTraits<test_table_type::iterator,test_table_type::value_type>();
+    TestIteratorTraits<test_table_type::const_iterator,const test_table_type::value_type>();
 
     test_table_type v;
     CHECK(v.range().grainsize() == 1);
-    test_table_type const& u = v;
+    test_table_type const &u = v;
 
-    TestIteratorAssignment<test_table_type::const_iterator>(u.begin());
-    TestIteratorAssignment<test_table_type::const_iterator>(v.begin());
-    TestIteratorAssignment<test_table_type::iterator>(v.begin());
+    TestIteratorAssignment<test_table_type::const_iterator>( u.begin() );
+    TestIteratorAssignment<test_table_type::const_iterator>( v.begin() );
+    TestIteratorAssignment<test_table_type::iterator>( v.begin() );
     // doesn't compile as expected: TestIteratorAssignment<typename V::iterator>( u.begin() );
 
     // check for non-existing
@@ -369,70 +380,65 @@ void TestIteratorsAndRanges() {
     CHECK(u.equal_range(MyKey::make(-1)) == std::make_pair(u.end(), u.end()));
 
     INFO("testing ranges compliance\n");
-    TestRangeAssignment<test_table_type::const_range_type>(u.range());
-    TestRangeAssignment<test_table_type::range_type>(v.range());
+    TestRangeAssignment<test_table_type::const_range_type>( u.range() );
+    TestRangeAssignment<test_table_type::range_type>( v.range() );
     // doesn't compile as expected: TestRangeAssignment<typename V::range_type>( u.range() );
 
     INFO("testing construction and insertion from iterators range\n");
-    FillTable(v, 1000);
+    FillTable( v, 1000 );
     other_test_table_type t(v.begin(), v.end());
     v.rehash();
     CheckTable(t, 1000);
-    t.insert(v.begin(), v.end());// do nothing
+    t.insert(v.begin(), v.end()); // do nothing
     CheckTable(t, 1000);
     t.clear();
-    t.insert(v.begin(), v.end());// restore
+    t.insert(v.begin(), v.end()); // restore
     CheckTable(t, 1000);
 
     INFO("testing comparison\n");
-    using test_allocator_type2
-            = StaticSharedCountingAllocator<std::allocator<std::pair<const MyKey, MyData2>>>;
-    using YourTable1
-            = oneapi::tbb::concurrent_hash_map<MyKey, MyData2, YourHashCompare, test_allocator_type2>;
-    using YourTable2 = oneapi::tbb::concurrent_hash_map<MyKey, MyData2, YourHashCompare>;
+    using test_allocator_type2 = StaticSharedCountingAllocator<std::allocator<std::pair<const MyKey, MyData2>>>;
+    using YourTable1 = oneapi::tbb::concurrent_hash_map<MyKey,MyData2,YourHashCompare, test_allocator_type2>;
+    using YourTable2 = oneapi::tbb::concurrent_hash_map<MyKey,MyData2,YourHashCompare>;
     YourTable1 t1;
-    FillTable(t1, 10);
-    CheckTable(t1, 10);
+    FillTable( t1, 10 );
+    CheckTable(t1, 10 );
     YourTable2 t2(t1.begin(), t1.end());
-    MyKey key(MyKey::make(-5));
-    MyData2 data;
+    MyKey key( MyKey::make(-5) ); MyData2 data;
     CHECK(t2.erase(key));
     YourTable2::accessor a;
     CHECK(t2.insert(a, key));
-    data.set_value(0);
-    a->second = data;
+    data.set_value(0);   a->second = data;
     CHECK(t1 != t2);
-    data.set_value(5 * 5);
-    a->second = data;
+    data.set_value(5*5); a->second = data;
     CHECK(t1 == t2);
 }
 
 struct test_insert {
-    template <typename container_type, typename element_type>
-    static void test(std::initializer_list<element_type> il, container_type const& expected) {
+    template<typename container_type, typename element_type>
+    static void test( std::initializer_list<element_type> il, container_type const& expected ) {
         container_type vd;
-        vd.insert(il);
-        REQUIRE_MESSAGE(vd == expected, "inserting with an initializer list failed");
+        vd.insert( il );
+        REQUIRE_MESSAGE( vd == expected, "inserting with an initializer list failed" );
     }
 };
 
 struct ctor_test {
-    template <typename container_type, typename element_type>
-    static void test(std::initializer_list<element_type> il, container_type const& expected) {
-        container_type vd(il, tbb::tbb_allocator<std::pair<element_type, element_type>> {});
-        REQUIRE_MESSAGE(vd == expected, "inserting with an initializer list failed");
+ template<typename container_type, typename element_type>
+    static void test( std::initializer_list<element_type> il, container_type const& expected ) {
+        container_type vd(il, tbb::tbb_allocator<std::pair<element_type, element_type>>{});
+        REQUIRE_MESSAGE( vd == expected, "inserting with an initializer list failed" );
     }
 };
 
-void TestInitList() {
+void TestInitList(){
     using namespace initializer_list_support_tests;
     INFO("testing initializer_list methods \n");
 
-    using ch_map_type = oneapi::tbb::concurrent_hash_map<int, int>;
-    std::initializer_list<ch_map_type::value_type> pairs_il = {{1, 1}, {2, 2}, {3, 3}, {4, 4}, {5, 5}};
+    using ch_map_type = oneapi::tbb::concurrent_hash_map<int,int>;
+    std::initializer_list<ch_map_type::value_type> pairs_il = {{1,1},{2,2},{3,3},{4,4},{5,5}};
 
-    test_initializer_list_support_without_assign<ch_map_type, test_insert>(pairs_il);
-    test_initializer_list_support_without_assign<ch_map_type, test_insert>({});
+    test_initializer_list_support_without_assign<ch_map_type, test_insert>( pairs_il );
+    test_initializer_list_support_without_assign<ch_map_type, test_insert>( {} );
     test_initializer_list_support_without_assign<ch_map_type, ctor_test>(pairs_il);
 }
 
@@ -440,9 +446,8 @@ template <typename base_alloc_type>
 class only_node_counting_allocator : public StaticSharedCountingAllocator<base_alloc_type> {
     using base_type = StaticSharedCountingAllocator<base_alloc_type>;
     using base_traits = oneapi::tbb::detail::allocator_traits<base_alloc_type>;
-
 public:
-    template <typename U>
+    template<typename U>
     struct rebind {
         using other = only_node_counting_allocator<typename base_traits::template rebind_alloc<U>>;
     };
@@ -450,11 +455,11 @@ class only_node_counting_allocator : public StaticSharedCountingAllocator<base_a
     only_node_counting_allocator() : base_type() {}
     only_node_counting_allocator(const only_node_counting_allocator& a) : base_type(a) {}
 
-    template <typename U>
+    template<typename U>
     only_node_counting_allocator(const only_node_counting_allocator<U>& a) : base_type(a) {}
 
     typename base_type::value_type* allocate(const std::size_t n) {
-        if (n > 1) {
+        if ( n > 1) {
             return base_alloc_type::allocate(n);
         } else {
             return base_type::allocate(n);
@@ -464,89 +469,93 @@ class only_node_counting_allocator : public StaticSharedCountingAllocator<base_a
 
 #if TBB_USE_EXCEPTIONS
 void TestExceptions() {
-    using allocator_type
-            = only_node_counting_allocator<oneapi::tbb::tbb_allocator<std::pair<const MyKey, MyData2>>>;
+    using allocator_type = only_node_counting_allocator<oneapi::tbb::tbb_allocator<std::pair<const MyKey, MyData2>>>;
     using throwing_table = oneapi::tbb::concurrent_hash_map<MyKey, MyData2, MyHashCompare, allocator_type>;
-    enum methods { zero_method = 0, ctor_copy, op_assign, op_insert, all_methods };
+    enum methods {
+        zero_method = 0,
+        ctor_copy, op_assign, op_insert,
+        all_methods
+    };
 
     INFO("testing exception-safety guarantees\n");
     throwing_table src;
-    FillTable(src, 1000);
-    CHECK(MyDataCount == 1000);
+    FillTable( src, 1000 );
+    CHECK(MyDataCount==1000);
 
     try {
-        for (int t = 0; t < 2; t++)// exception type
-            for (int m = zero_method + 1; m < all_methods; m++) {
-                allocator_type a;
-                allocator_type::init_counters();
-                if (t) MyDataCountLimit = 101;
-                else
-                    a.set_limits(101);
-                throwing_table victim(a);
-                MyDataCount = 0;
-
-                try {
-                    switch (m) {
-                        case ctor_copy: {
-                            throwing_table acopy(src, a);
-                        } break;
-                        case op_assign: {
-                            victim = src;
-                        } break;
-                        case op_insert: {
-                            // Insertion in cpp11 don't make copy constructions
-                            // during the insertion, so we need to decrement limit
-                            // to throw an exception in the right place and to prevent
-                            // successful insertion of one unexpected item
-                            if (MyDataCountLimit) --MyDataCountLimit;
-                            FillTable(victim, 1000);
-                        } break;
-                        default:;
-                    }
-                    REQUIRE_MESSAGE(false, "should throw an exception");
-                } catch (std::bad_alloc& e) {
-                    MyDataCountLimit = 0;
-                    size_t size = victim.size();
-                    switch (m) {
-                        case op_assign:
-                            REQUIRE_MESSAGE(MyDataCount == 100, "data leak?");
-                            CHECK(size >= 100);
-                            utils_fallthrough;
-                        case ctor_copy:
-                            CheckTable(src, 1000);
-                            break;
-                        case op_insert:
-                            CHECK(size == size_t(100 - t));
-                            REQUIRE_MESSAGE(MyDataCount == 100 - t, "data leak?");
-                            CheckTable(victim, 100 - t);
-                            break;
-
-                        default:;// nothing to check here
-                    }
-                    INFO("Exception " << m << " : " << e.what() << "- ok ()");
-                } catch (...) { REQUIRE_MESSAGE(false, "Unrecognized exception"); }
+        for(int t = 0; t < 2; t++) // exception type
+        for(int m = zero_method+1; m < all_methods; m++)
+        {
+            allocator_type a;
+            allocator_type::init_counters();
+            if(t) MyDataCountLimit = 101;
+            else a.set_limits(101);
+            throwing_table victim(a);
+            MyDataCount = 0;
+
+            try {
+                switch(m) {
+                case ctor_copy: {
+                        throwing_table acopy(src, a);
+                    } break;
+                case op_assign: {
+                        victim = src;
+                    } break;
+                case op_insert: {
+                        // Insertion in cpp11 don't make copy constructions
+                        // during the insertion, so we need to decrement limit
+                        // to throw an exception in the right place and to prevent
+                        // successful insertion of one unexpected item
+                        if (MyDataCountLimit)
+                            --MyDataCountLimit;
+                        FillTable( victim, 1000 );
+                    } break;
+                default:;
+                }
+                REQUIRE_MESSAGE(false, "should throw an exception");
+            } catch(std::bad_alloc &e) {
+                MyDataCountLimit = 0;
+                size_t size = victim.size();
+                switch(m) {
+                case op_assign:
+                    REQUIRE_MESSAGE( MyDataCount==100, "data leak?" );
+                    CHECK(size>=100);
+                    utils_fallthrough;
+                case ctor_copy:
+                    CheckTable(src, 1000);
+                    break;
+                case op_insert:
+                    CHECK(size==size_t(100-t));
+                    REQUIRE_MESSAGE( MyDataCount==100-t, "data leak?" );
+                    CheckTable(victim, 100-t);
+                    break;
+
+                default:; // nothing to check here
+                }
+                INFO("Exception "<< m << " : " << e.what() << "- ok ()");
+            }
+            catch ( ... ) {
+                REQUIRE_MESSAGE( false, "Unrecognized exception" );
             }
-    } catch (...) { REQUIRE_MESSAGE(false, "unexpected exception"); }
-    src.clear();
-    MyDataCount = 0;
+        }
+    } catch(...) {
+        REQUIRE_MESSAGE(false, "unexpected exception");
+    }
+    src.clear(); MyDataCount = 0;
     allocator_type::max_items = 0;
 }
 #endif
 
 struct default_container_traits {
     template <typename container_type, typename iterator_type>
-    static container_type&
-    construct_container(typename std::aligned_storage<sizeof(container_type)>::type& storage,
-                        iterator_type begin, iterator_type end) {
+    static container_type& construct_container(typename std::aligned_storage<sizeof(container_type)>::type& storage, iterator_type begin, iterator_type end){
         container_type* ptr = reinterpret_cast<container_type*>(&storage);
         new (ptr) container_type(begin, end);
         return *ptr;
     }
 
     template <typename container_type, typename iterator_type, typename allocator_type>
-    static container_type&
-    construct_container(typename std::aligned_storage<sizeof(container_type)>::type& storage,
-                        iterator_type begin, iterator_type end, allocator_type const& a) {
+    static container_type& construct_container(typename std::aligned_storage<sizeof(container_type)>::type& storage, iterator_type begin, iterator_type end, allocator_type const& a){
         container_type* ptr = reinterpret_cast<container_type*>(&storage);
         new (ptr) container_type(begin, end, a);
         return *ptr;
@@ -554,12 +563,16 @@ struct default_container_traits {
 };
 
 struct hash_map_traits : default_container_traits {
-    enum { expected_number_of_items_to_allocate_for_steal_move = 0 };
+    enum{ expected_number_of_items_to_allocate_for_steal_move = 0 };
 
-    template <typename T>
+    template<typename T>
     struct hash_compare {
-        bool equal(const T& lhs, const T& rhs) const { return lhs == rhs; }
-        size_t hash(const T& k) const { return my_hash_func(k); }
+        bool equal( const T& lhs, const T& rhs ) const {
+            return lhs==rhs;
+        }
+        size_t hash( const T& k ) const {
+            return my_hash_func(k);
+        }
         std::hash<T> my_hash_func;
     };
 
@@ -569,20 +582,22 @@ struct hash_map_traits : default_container_traits {
     template <typename T>
     using container_value_type = std::pair<const T, T>;
 
-    template <typename element_type, typename allocator_type>
+    template<typename element_type, typename allocator_type>
     struct apply {
-        using type = oneapi::tbb::concurrent_hash_map<element_type, element_type, hash_compare<element_type>,
-                                                      allocator_type>;
+        using type = oneapi::tbb::concurrent_hash_map<element_type, element_type, hash_compare<element_type>, allocator_type>;
     };
 
     using init_iterator_type = move_support_tests::FooPairIterator;
     template <typename hash_map_type, typename iterator>
-    static bool equal(hash_map_type const& c, iterator begin, iterator end) {
-        bool equal_sizes = (static_cast<size_t>(std::distance(begin, end)) == c.size());
-        if (!equal_sizes) return false;
-
-        for (iterator it = begin; it != end; ++it) {
-            if (c.count((*it).first) == 0) { return false; }
+    static bool equal(hash_map_type const& c, iterator begin, iterator end){
+        bool equal_sizes = ( static_cast<size_t>(std::distance(begin, end)) == c.size() );
+        if (!equal_sizes)
+            return false;
+
+        for (iterator it = begin; it != end; ++it ){
+            if (c.count( (*it).first) == 0){
+                return false;
+            }
         }
         return true;
     }
@@ -591,26 +606,27 @@ struct hash_map_traits : default_container_traits {
 using DataStateTrackedTable = oneapi::tbb::concurrent_hash_map<MyKey, move_support_tests::Foo, MyHashCompare>;
 
 struct RvalueInsert {
-    static void apply(DataStateTrackedTable& table, int i) {
+    static void apply( DataStateTrackedTable& table, int i ) {
         DataStateTrackedTable::accessor a;
         int next = i + 1;
-        REQUIRE_MESSAGE((table.insert(a, std::make_pair(MyKey::make(i), move_support_tests::Foo(next)))),
-                        "already present while should not ?");
-        CHECK((*a).second == next);
-        CHECK((*a).second.state == StateTrackableBase::MoveInitialized);
+        CHECK_FAST_MESSAGE((table.insert( a, std::make_pair(MyKey::make(i), move_support_tests::Foo(next)))),
+            "already present while should not ?" );
+        CHECK_FAST((*a).second == next);
+        CHECK_FAST((*a).second.state == StateTrackableBase::MoveInitialized);
     }
 };
 
 struct Emplace {
     template <typename Accessor>
-    static void apply_impl(DataStateTrackedTable& table, int i) {
+    static void apply_impl( DataStateTrackedTable& table, int i) {
         Accessor a;
-        REQUIRE_MESSAGE((table.emplace(a, MyKey::make(i), (i + 1))), "already present while should not ?");
-        CHECK((*a).second == i + 1);
-        CHECK((*a).second.state == StateTrackableBase::DirectInitialized);
+        CHECK_FAST_MESSAGE((table.emplace( a, MyKey::make(i), (i + 1))),
+                "already present while should not ?" );
+        CHECK_FAST((*a).second == i + 1);
+        CHECK_FAST((*a).second.state == StateTrackableBase::DirectInitialized);
     }
 
-    static void apply(DataStateTrackedTable& table, int i) {
+    static void apply( DataStateTrackedTable& table, int i ) {
         // TODO: investigate ability to rewrite apply methods with use apply_imp method.
         if (i % 2) {
             apply_impl<DataStateTrackedTable::accessor>(table, i);
@@ -620,131 +636,136 @@ struct Emplace {
     }
 };
 
-template <typename Op, typename test_table_type>
+template<typename Op, typename test_table_type>
 class TableOperation {
     test_table_type& my_table;
-
 public:
-    void operator()(const oneapi::tbb::blocked_range<int>& range) const {
-        for (int i = range.begin(); i != range.end(); ++i) Op::apply(my_table, i);
+    void operator()( const oneapi::tbb::blocked_range<int>& range ) const {
+        for( int i=range.begin(); i!=range.end(); ++i )
+            Op::apply(my_table,i);
     }
-    TableOperation(test_table_type& table) : my_table(table) {}
+    TableOperation( test_table_type& table ) : my_table(table) {}
 };
 
-bool UseKey(size_t i) { return (i & 3) != 3; }
+bool UseKey( size_t i ) {
+    return (i&3)!=3;
+}
 
 struct Insert {
-    static void apply(test_table_type& table, int i) {
-        if (UseKey(i)) {
-            if (i & 4) {
+    static void apply( test_table_type& table, int i ) {
+        if( UseKey(i) ) {
+            if( i&4 ) {
                 test_table_type::accessor a;
-                table.insert(a, MyKey::make(i));
-                if (i & 1) (*a).second.set_value(i * i);
+                table.insert( a, MyKey::make(i) );
+                if( i&1 )
+                    (*a).second.set_value(i*i);
                 else
-                    a->second.set_value(i * i);
-            } else if (i & 1) {
-                test_table_type::accessor a;
-                table.insert(a, std::make_pair(MyKey::make(i), MyData(i * i)));
-                CHECK((*a).second.value_of() == i * i);
-            } else {
-                test_table_type::const_accessor ca;
-                table.insert(ca, std::make_pair(MyKey::make(i), MyData(i * i)));
-                CHECK(ca->second.value_of() == i * i);
-            }
+                    a->second.set_value(i*i);
+            } else
+                if( i&1 ) {
+                    test_table_type::accessor a;
+                    table.insert( a, std::make_pair(MyKey::make(i), MyData(i*i)) );
+                    CHECK_FAST((*a).second.value_of()==i*i);
+                } else {
+                    test_table_type::const_accessor ca;
+                    table.insert( ca, std::make_pair(MyKey::make(i), MyData(i*i)) );
+                    CHECK_FAST(ca->second.value_of()==i*i);
+                }
         }
     }
 };
 
 struct Find {
-    static void apply(test_table_type& table, int i) {
+    static void apply( test_table_type& table, int i ) {
         test_table_type::accessor a;
         const test_table_type::accessor& ca = a;
-        bool b = table.find(a, MyKey::make(i));
-        CHECK(b == !a.empty());
-        if (b) {
-            if (!UseKey(i)) REPORT("Line %d: unexpected key %d present\n", __LINE__, i);
-            CHECK(ca->second.value_of() == i * i);
-            CHECK((*ca).second.value_of() == i * i);
-            if (i & 1) ca->second.set_value(~ca->second.value_of());
+        bool b = table.find( a, MyKey::make(i) );
+        CHECK_FAST(b==!a.empty());
+        if( b ) {
+            if( !UseKey(i) )
+                REPORT("Line %d: unexpected key %d present\n",__LINE__,i);
+            CHECK_FAST(ca->second.value_of()==i*i);
+            CHECK_FAST((*ca).second.value_of()==i*i);
+            if( i&1 )
+                ca->second.set_value( ~ca->second.value_of() );
             else
-                (*ca).second.set_value(~ca->second.value_of());
+                (*ca).second.set_value( ~ca->second.value_of() );
         } else {
-            if (UseKey(i)) REPORT("Line %d: key %d missing\n", __LINE__, i);
+            if( UseKey(i) )
+                REPORT("Line %d: key %d missing\n",__LINE__,i);
         }
     }
 };
 
 struct FindConst {
-    static void apply(const test_table_type& table, int i) {
+    static void apply( const test_table_type& table, int i ) {
         test_table_type::const_accessor a;
         const test_table_type::const_accessor& ca = a;
-        bool b = table.find(a, MyKey::make(i));
-        CHECK(b == (table.count(MyKey::make(i)) > 0));
-        CHECK(b == !a.empty());
-        CHECK(b == UseKey(i));
-        if (b) {
-            CHECK(ca->second.value_of() == ~(i * i));
-            CHECK((*ca).second.value_of() == ~(i * i));
+        bool b = table.find( a, MyKey::make(i) );
+        CHECK_FAST(b==(table.count(MyKey::make(i))>0));
+        CHECK_FAST(b==!a.empty());
+        CHECK_FAST(b==UseKey(i));
+        if( b ) {
+            CHECK_FAST(ca->second.value_of()==~(i*i));
+            CHECK_FAST((*ca).second.value_of()==~(i*i));
         }
     }
 };
 
 struct InsertInitList {
-    static void apply(test_table_type& table, int i) {
-        if (UseKey(i)) {
+    static void apply( test_table_type& table, int i ) {
+        if ( UseKey( i ) ) {
             // TODO: investigate why the following sequence causes an additional allocation sometimes:
             // table.insert( test_table_type::value_type( MyKey::make( i ), i*i ) );
             // table.insert( test_table_type::value_type( MyKey::make( i ), i*i+1 ) );
             std::initializer_list<test_table_type::value_type> il = {
-                    test_table_type::value_type(MyKey::make(i), i * i)
-                    /*, test_table_type::value_type( MyKey::make( i ), i*i+1 ) */
-            };
-            table.insert(il);
+                test_table_type::value_type( MyKey::make( i ), i*i )
+                /*, test_table_type::value_type( MyKey::make( i ), i*i+1 ) */
+                                                                    };
+            table.insert( il );
         }
     }
 };
 
-template <typename Op, typename TableType>
-void DoConcurrentOperations(TableType& table, int n, const char* what, std::size_t nthread) {
+template<typename Op, typename TableType>
+void DoConcurrentOperations( TableType& table, int n, const char* what, std::size_t nthread ) {
     INFO("testing " << what << " with " << nthread << " threads");
-    oneapi::tbb::parallel_for(oneapi::tbb::blocked_range<int>(0, n, 100),
-                              TableOperation<Op, TableType>(table));
+    oneapi::tbb::parallel_for(oneapi::tbb::blocked_range<int>(0, n ,100), TableOperation<Op, TableType>(table));
 }
 
 //! Test traversing the table with an iterator.
-void TraverseTable(test_table_type& table, size_t n, size_t expected_size) {
+void TraverseTable( test_table_type& table, size_t n, size_t expected_size ) {
     INFO("testing traversal\n");
     size_t actual_size = table.size();
-    CHECK(actual_size == expected_size);
+    CHECK(actual_size==expected_size);
     size_t count = 0;
     bool* array = new bool[n];
-    memset(array, 0, n * sizeof(bool));
+    memset( array, 0, n*sizeof(bool) );
     const test_table_type& const_table = table;
     test_table_type::const_iterator ci = const_table.begin();
-    for (test_table_type::iterator i = table.begin(); i != table.end(); ++i) {
+    for( test_table_type::iterator i = table.begin(); i!=table.end(); ++i ) {
         // Check iterator
         int k = i->first.value_of();
-        CHECK(UseKey(k));
-        CHECK((*i).first.value_of() == k);
-        REQUIRE_MESSAGE((0 <= k && size_t(k) < n), "out of bounds key");
-        REQUIRE_MESSAGE(!array[k], "duplicate key");
+        CHECK_FAST(UseKey(k));
+        CHECK_FAST((*i).first.value_of()==k);
+        CHECK_FAST_MESSAGE((0<=k && size_t(k)<n), "out of bounds key" );
+        CHECK_FAST_MESSAGE( !array[k], "duplicate key" );
         array[k] = true;
         ++count;
 
         // Check lower/upper bounds
         std::pair<test_table_type::iterator, test_table_type::iterator> er = table.equal_range(i->first);
-        std::pair<test_table_type::const_iterator, test_table_type::const_iterator> cer
-                = const_table.equal_range(i->first);
-        CHECK((cer.first == er.first && cer.second == er.second));
-        CHECK(cer.first == i);
-        CHECK(std::distance(cer.first, cer.second) == 1);
+        std::pair<test_table_type::const_iterator, test_table_type::const_iterator> cer = const_table.equal_range(i->first);
+        CHECK_FAST((cer.first == er.first && cer.second == er.second));
+        CHECK_FAST(cer.first == i);
+        CHECK_FAST(std::distance(cer.first, cer.second) == 1);
 
         // Check const_iterator
         test_table_type::const_iterator cic = ci++;
-        CHECK(cic->first.value_of() == k);
-        CHECK((*cic).first.value_of() == k);
+        CHECK_FAST(cic->first.value_of()==k);
+        CHECK_FAST((*cic).first.value_of()==k);
     }
-    CHECK(ci == const_table.end());
+    CHECK(ci==const_table.end());
     delete[] array;
     if (count != expected_size) {
         INFO("Line " << __LINE__ << ": count=" << count << " but should be " << expected_size);
@@ -754,20 +775,20 @@ void TraverseTable(test_table_type& table, size_t n, size_t expected_size) {
 std::atomic<int> EraseCount;
 
 struct Erase {
-    static void apply(test_table_type& table, int i) {
+    static void apply( test_table_type& table, int i ) {
         bool b;
-        if (i & 4) {
-            if (i & 8) {
+        if(i&4) {
+            if(i&8) {
                 test_table_type::const_accessor a;
-                b = table.find(a, MyKey::make(i)) && table.erase(a);
+                b = table.find( a, MyKey::make(i) ) && table.erase( a );
             } else {
                 test_table_type::accessor a;
-                b = table.find(a, MyKey::make(i)) && table.erase(a);
+                b = table.find( a, MyKey::make(i) ) && table.erase( a );
             }
         } else
-            b = table.erase(MyKey::make(i));
-        if (b) ++EraseCount;
-        CHECK(table.count(MyKey::make(i)) == 0);
+            b = table.erase( MyKey::make(i) );
+        if( b ) ++EraseCount;
+        CHECK_FAST(table.count(MyKey::make(i)) == 0);
     }
 };
 
@@ -775,162 +796,168 @@ using YourTable = oneapi::tbb::concurrent_hash_map<MyKey, MyData, YourHashCompar
 static const int IE_SIZE = 2;
 std::atomic<YourTable::size_type> InsertEraseCount[IE_SIZE];
 
-struct InsertErase {
-    static void apply(YourTable& table, int i) {
-        if (i % 3) {
-            int key = i % IE_SIZE;
-            if (table.insert(std::make_pair(MyKey::make(key), MyData2()))) ++InsertEraseCount[key];
+struct InsertErase  {
+    static void apply( YourTable& table, int i ) {
+        if ( i%3 ) {
+            int key = i%IE_SIZE;
+            if ( table.insert( std::make_pair(MyKey::make(key), MyData2()) ) )
+                ++InsertEraseCount[key];
         } else {
-            int key = i % IE_SIZE;
-            if (i & 1) {
+            int key = i%IE_SIZE;
+            if( i&1 ) {
                 YourTable::accessor res;
-                if (table.find(res, MyKey::make(key)) && table.erase(res)) --InsertEraseCount[key];
+                if(table.find( res, MyKey::make(key) ) && table.erase( res ) )
+                    --InsertEraseCount[key];
             } else {
                 YourTable::const_accessor res;
-                if (table.find(res, MyKey::make(key)) && table.erase(res)) --InsertEraseCount[key];
+                if(table.find( res, MyKey::make(key) ) && table.erase( res ) )
+                    --InsertEraseCount[key];
             }
         }
     }
 };
 
 struct InnerInsert {
-    static void apply(YourTable& table, int i) {
+    static void apply( YourTable& table, int i ) {
         YourTable::accessor a1, a2;
-        if (i & 1) utils::yield();
-        table.insert(a1, MyKey::make(1));
+        if(i&1) utils::yield();
+        table.insert( a1, MyKey::make(1) );
         utils::yield();
-        table.insert(a2, MyKey::make(1 + (1 << 30)));// the same chain
-        table.erase(a2);// if erase by key it would lead to deadlock for single thread
+        table.insert( a2, MyKey::make(1 + (1<<30)) ); // the same chain
+        table.erase( a2 ); // if erase by key it would lead to deadlock for single thread
     }
 };
 
 struct FakeExclusive {
     utils::SpinBarrier& barrier;
     YourTable& table;
-    FakeExclusive(utils::SpinBarrier& b, YourTable& t) : barrier(b), table(t) {}
-    void operator()(std::size_t i) const {
-        if (i) {
+    FakeExclusive(utils::SpinBarrier& b, YourTable&t) : barrier(b), table(t) {}
+    void operator()( std::size_t i ) const {
+        if(i) {
             YourTable::const_accessor real_ca;
             // const accessor on non-const table acquired as reader (shared)
-            CHECK(table.find(real_ca, MyKey::make(1)));
-            barrier.wait();                                            // item can be erased
-            std::this_thread::sleep_for(std::chrono::milliseconds(10));// let it enter the erase
-            real_ca->second.value_of();// check the state while holding accessor
+            CHECK(table.find(real_ca,MyKey::make(1)));
+            barrier.wait(); // item can be erased
+            std::this_thread::sleep_for(std::chrono::milliseconds(10)); // let it enter the erase
+            real_ca->second.value_of(); // check the state while holding accessor
         } else {
             YourTable::accessor fake_ca;
-            const YourTable& const_table = table;
+            const YourTable &const_table = table;
             // non-const accessor on const table acquired as reader (shared)
-            CHECK(const_table.find(fake_ca, MyKey::make(1)));
-            barrier.wait();// readers acquired
+            CHECK(const_table.find(fake_ca,MyKey::make(1)));
+            barrier.wait(); // readers acquired
             // can mistakenly remove the item while other readers still refers to it
-            table.erase(fake_ca);
+            table.erase( fake_ca );
         }
     }
 };
 
 using AtomicByte = std::atomic<unsigned char>;
 
-template <typename RangeType>
+template<typename RangeType>
 struct ParallelTraverseBody {
     const size_t n;
     AtomicByte* const array;
-    ParallelTraverseBody(AtomicByte array_[], size_t n_) : n(n_), array(array_) {}
-    void operator()(const RangeType& range) const {
-        for (typename RangeType::iterator i = range.begin(); i != range.end(); ++i) {
+    ParallelTraverseBody( AtomicByte array_[], size_t n_ ) :
+        n(n_),
+        array(array_)
+    {}
+    void operator()( const RangeType& range ) const {
+        for( typename RangeType::iterator i = range.begin(); i!=range.end(); ++i ) {
             int k = i->first.value_of();
-            CHECK((0 <= k && size_t(k) < n));
+            CHECK_FAST((0<=k && size_t(k)<n));
             ++array[k];
         }
     }
 };
 
-void Check(AtomicByte array[], size_t n, size_t expected_size) {
-    if (expected_size)
-        for (size_t k = 0; k < n; ++k) {
-            if (array[k] != int(UseKey(k))) {
-                REPORT("array[%d]=%d != %d=UseKey(%d)\n", int(k), int(array[k]), int(UseKey(k)), int(k));
+void Check( AtomicByte array[], size_t n, size_t expected_size ) {
+    if( expected_size )
+        for( size_t k=0; k<n; ++k ) {
+            if( array[k] != int(UseKey(k)) ) {
+                REPORT("array[%d]=%d != %d=UseKey(%d)\n",
+                       int(k), int(array[k]), int(UseKey(k)), int(k));
                 CHECK(false);
             }
         }
 }
 
 //! Test traversing the table with a parallel range
-void ParallelTraverseTable(test_table_type& table, size_t n, size_t expected_size) {
+void ParallelTraverseTable( test_table_type& table, size_t n, size_t expected_size ) {
     INFO("testing parallel traversal\n");
-    CHECK(table.size() == expected_size);
+    CHECK(table.size()==expected_size);
     AtomicByte* array = new AtomicByte[n];
 
-    memset(static_cast<void*>(array), 0, n * sizeof(AtomicByte));
+    memset( static_cast<void*>(array), 0, n*sizeof(AtomicByte) );
     test_table_type::range_type r = table.range(10);
-    oneapi::tbb::parallel_for(r, ParallelTraverseBody<test_table_type::range_type>(array, n));
-    Check(array, n, expected_size);
+    oneapi::tbb::parallel_for( r, ParallelTraverseBody<test_table_type::range_type>( array, n ));
+    Check( array, n, expected_size );
 
     const test_table_type& const_table = table;
-    memset(static_cast<void*>(array), 0, n * sizeof(AtomicByte));
+    memset( static_cast<void*>(array), 0, n*sizeof(AtomicByte) );
     test_table_type::const_range_type cr = const_table.range(10);
-    oneapi::tbb::parallel_for(cr, ParallelTraverseBody<test_table_type::const_range_type>(array, n));
-    Check(array, n, expected_size);
+    oneapi::tbb::parallel_for( cr, ParallelTraverseBody<test_table_type::const_range_type>( array, n ));
+    Check( array, n, expected_size );
 
     delete[] array;
 }
 
-void TestInsertFindErase(std::size_t nthread) {
-    int n = 250000;
+void TestInsertFindErase( std::size_t nthread ) {
+    int n=250000;
 
     // compute m = number of unique keys
     int m = 0;
-    for (int i = 0; i < n; ++i) m += UseKey(i);
+    for( int i=0; i<n; ++i )
+        m += UseKey(i);
     {
         test_allocator_type alloc;
         test_allocator_type::init_counters();
-        CHECK(MyDataCount == 0);
+        CHECK(MyDataCount==0);
         test_table_type table(alloc);
-        TraverseTable(table, n, 0);
-        ParallelTraverseTable(table, n, 0);
-
-        int expected_allocs = 0, expected_frees = 100;
-        for (int i = 0; i < 2; ++i) {
-            if (i == 0)
-                DoConcurrentOperations<InsertInitList, test_table_type>(
-                        table, n, "insert(std::initializer_list)", nthread);
+        TraverseTable(table,n,0);
+        ParallelTraverseTable(table,n,0);
+
+        for ( int i = 0; i < 2; ++i ) {
+            if ( i==0 )
+                DoConcurrentOperations<InsertInitList, test_table_type>( table, n, "insert(std::initializer_list)", nthread );
             else
-                DoConcurrentOperations<Insert, test_table_type>(table, n, "insert", nthread);
+                DoConcurrentOperations<Insert, test_table_type>( table, n, "insert", nthread );
             CHECK(MyDataCount == m);
-            TraverseTable(table, n, m);
-            ParallelTraverseTable(table, n, m);
-            expected_allocs += m;
+            TraverseTable( table, n, m );
+            ParallelTraverseTable( table, n, m );
 
-            DoConcurrentOperations<Find, test_table_type>(table, n, "find", nthread);
+            DoConcurrentOperations<Find, test_table_type>( table, n, "find", nthread );
             CHECK(MyDataCount == m);
 
-            DoConcurrentOperations<FindConst, test_table_type>(table, n, "find(const)", nthread);
+            DoConcurrentOperations<FindConst, test_table_type>( table, n, "find(const)", nthread );
             CHECK(MyDataCount == m);
 
             EraseCount = 0;
-            DoConcurrentOperations<Erase, test_table_type>(table, n, "erase", nthread);
+            DoConcurrentOperations<Erase, test_table_type>( table, n, "erase", nthread );
             CHECK(EraseCount == m);
             CHECK(MyDataCount == 0);
-            TraverseTable(table, n, 0);
-            expected_frees += m;
+            TraverseTable( table, n, 0 );
 
             table.clear();
         }
 
-        if (nthread > 1) {
+        if( nthread > 1 ) {
             YourTable ie_table;
-            for (int i = 0; i < IE_SIZE; ++i) InsertEraseCount[i] = 0;
-            DoConcurrentOperations<InsertErase, YourTable>(ie_table, n / 2, "insert_erase", nthread);
-            for (int i = 0; i < IE_SIZE; ++i) CHECK(InsertEraseCount[i] == ie_table.count(MyKey::make(i)));
+            for( int i=0; i<IE_SIZE; ++i )
+                InsertEraseCount[i] = 0;
+            DoConcurrentOperations<InsertErase,YourTable>(ie_table,n/2,"insert_erase",nthread);
+            for( int i=0; i<IE_SIZE; ++i )
+                CHECK(InsertEraseCount[i]==ie_table.count(MyKey::make(i)));
 
-            DoConcurrentOperations<InnerInsert, YourTable>(ie_table, 2000, "inner insert", nthread);
+            DoConcurrentOperations<InnerInsert, YourTable>(ie_table,2000,"inner insert",nthread);
             utils::SpinBarrier barrier(nthread);
             INFO("testing erase on fake exclusive accessor\n");
-            utils::NativeParallelFor(nthread, FakeExclusive(barrier, ie_table));
+            utils::NativeParallelFor( nthread, FakeExclusive(barrier, ie_table));
         }
     }
-    REQUIRE(test_allocator_type::items_constructed == test_allocator_type::items_destroyed);
-    REQUIRE(test_allocator_type::items_allocated == test_allocator_type::items_freed);
-    REQUIRE(test_allocator_type::allocations == test_allocator_type::frees);
+    REQUIRE( test_allocator_type::items_constructed == test_allocator_type::items_destroyed );
+    REQUIRE( test_allocator_type::items_allocated == test_allocator_type::items_freed );
+    REQUIRE( test_allocator_type::allocations == test_allocator_type::frees );
 }
 
 std::atomic<int> Counter;
@@ -939,16 +966,14 @@ class AddToTable {
     test_table_type& my_table;
     const std::size_t my_nthread;
     const int my_m;
-
 public:
-    AddToTable(test_table_type& table, std::size_t nthread, int m)
-        : my_table(table), my_nthread(nthread), my_m(m) {}
-    void operator()(std::size_t) const {
-        for (int i = 0; i < my_m; ++i) {
+    AddToTable( test_table_type& table, std::size_t nthread, int m ) : my_table(table), my_nthread(nthread), my_m(m) {}
+    void operator()( std::size_t ) const {
+        for( int i=0; i<my_m; ++i ) {
             // Busy wait to synchronize threads
             int j = 0;
-            while (Counter < i) {
-                if (++j == 1000000) {
+            while( Counter<i ) {
+                if( ++j==1000000 ) {
                     // If Counter<i after a million iterations, then we almost surely have
                     // more logical threads than physical threads, and should yield in
                     // order to let suspended logical threads make progress.
@@ -961,12 +986,14 @@ class AddToTable {
             {
                 test_table_type::accessor a;
                 MyKey key = MyKey::make(i);
-                if (my_table.insert(a, key)) a->second.set_value(1);
+                if( my_table.insert( a, key ) )
+                    a->second.set_value( 1 );
                 else
-                    a->second.set_value(a->second.value_of() + 1);
+                    a->second.set_value( a->second.value_of()+1 );
                 k = a->second.value_of();
             }
-            if (std::size_t(k) == my_nthread) Counter = i + 1;
+            if( std::size_t(k) == my_nthread )
+                Counter=i+1;
         }
     }
 };
@@ -974,56 +1001,55 @@ class AddToTable {
 class RemoveFromTable {
     test_table_type& my_table;
     const int my_m;
-
 public:
-    RemoveFromTable(test_table_type& table, int m) : my_table(table), my_m(m) {}
+    RemoveFromTable( test_table_type& table, int m ) : my_table(table), my_m(m) {}
     void operator()(std::size_t) const {
-        for (int i = 0; i < my_m; ++i) {
+        for( int i=0; i<my_m; ++i ) {
             bool b;
-            if (i & 4) {
-                if (i & 8) {
+            if(i&4) {
+                if(i&8) {
                     test_table_type::const_accessor a;
-                    b = my_table.find(a, MyKey::make(i)) && my_table.erase(a);
+                    b = my_table.find( a, MyKey::make(i) ) && my_table.erase( a );
                 } else {
                     test_table_type::accessor a;
-                    b = my_table.find(a, MyKey::make(i)) && my_table.erase(a);
+                    b = my_table.find( a, MyKey::make(i) ) && my_table.erase( a );
                 }
             } else
-                b = my_table.erase(MyKey::make(i));
-            if (b) ++EraseCount;
+                b = my_table.erase( MyKey::make(i) );
+            if( b ) ++EraseCount;
         }
     }
 };
 
-void TestConcurrency(std::size_t nthread) {
+void TestConcurrency( std::size_t nthread ) {
     INFO("testing multiple insertions/deletions of same key with " << nthread << " threads");
     test_allocator_type::init_counters();
     {
-        CHECK(MyDataCount == 0);
+        CHECK( MyDataCount==0);
         test_table_type table;
         const int m = 1000;
         Counter = 0;
         oneapi::tbb::tick_count t0 = oneapi::tbb::tick_count::now();
-        utils::NativeParallelFor(nthread, AddToTable(table, nthread, m));
-        REQUIRE_MESSAGE(MyDataCount == m, "memory leak detected");
+        utils::NativeParallelFor( nthread, AddToTable(table,nthread,m) );
+        REQUIRE_MESSAGE( MyDataCount==m, "memory leak detected" );
 
         EraseCount = 0;
         t0 = oneapi::tbb::tick_count::now();
-        utils::NativeParallelFor(nthread, RemoveFromTable(table, m));
-        REQUIRE_MESSAGE(MyDataCount == 0, "memory leak detected");
-        REQUIRE_MESSAGE(EraseCount == m, "return value of erase() is broken");
+        utils::NativeParallelFor( nthread, RemoveFromTable(table,m) );
+        REQUIRE_MESSAGE(MyDataCount==0, "memory leak detected");
+        REQUIRE_MESSAGE(EraseCount==m, "return value of erase() is broken");
+
     }
-    REQUIRE(test_allocator_type::items_constructed == test_allocator_type::items_destroyed);
-    REQUIRE(test_allocator_type::items_allocated == test_allocator_type::items_freed);
-    REQUIRE(test_allocator_type::allocations == test_allocator_type::frees);
-    REQUIRE_MESSAGE(MyDataCount == 0, "memory leak detected");
+    REQUIRE( test_allocator_type::items_constructed == test_allocator_type::items_destroyed );
+    REQUIRE( test_allocator_type::items_allocated == test_allocator_type::items_freed );
+    REQUIRE( test_allocator_type::allocations == test_allocator_type::frees );
+    REQUIRE_MESSAGE(MyDataCount==0, "memory leak detected");
 }
 
-template <typename Key>
+template<typename Key>
 struct non_default_constructible_hash_compare : oneapi::tbb::detail::d1::tbb_hash_compare<Key> {
     non_default_constructible_hash_compare() {
-        REQUIRE_MESSAGE(false, "Hash compare object must not default construct during the construction of "
-                               "hash_map with compare argument");
+        REQUIRE_MESSAGE(false, "Hash compare object must not default construct during the construction of hash_map with compare argument");
     }
 
     non_default_constructible_hash_compare(int) {}
@@ -1031,8 +1057,7 @@ struct non_default_constructible_hash_compare : oneapi::tbb::detail::d1::tbb_has
 
 void TestHashCompareConstructors() {
     using key_type = int;
-    using map_type = oneapi::tbb::concurrent_hash_map<key_type, key_type,
-                                                      non_default_constructible_hash_compare<key_type>>;
+    using map_type = oneapi::tbb::concurrent_hash_map<key_type, key_type, non_default_constructible_hash_compare<key_type>>;
 
     non_default_constructible_hash_compare<key_type> compare(0);
     map_type::allocator_type allocator;
@@ -1069,7 +1094,7 @@ void TestDeductionGuides() {
     using Allocator = std::allocator<ComplexTypeConst>;
 
     std::vector<ComplexType> v;
-    auto l = {ComplexTypeConst(1, "one"), ComplexTypeConst(2, "two")};
+    auto l = { ComplexTypeConst(1, "one"), ComplexTypeConst(2, "two") };
     Compare compare;
     Allocator allocator;
 
@@ -1121,19 +1146,19 @@ void TestDeductionGuides() {
     TMap m12(std::move(m4), allocator);
     static_assert(std::is_same<decltype(m12), decltype(m4)>::value);
 }
-#endif// __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
+#endif // __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 
 template <typename CHMapType>
 void test_comparisons_basic() {
     using comparisons_testing::testEqualityComparisons;
     CHMapType c1, c2;
-    testEqualityComparisons</*ExpectEqual = */ true>(c1, c2);
+    testEqualityComparisons</*ExpectEqual = */true>(c1, c2);
 
     c1.emplace(1, 1);
-    testEqualityComparisons</*ExpectEqual = */ false>(c1, c2);
+    testEqualityComparisons</*ExpectEqual = */false>(c1, c2);
 
     c2.emplace(1, 1);
-    testEqualityComparisons</*ExpectEqual = */ true>(c1, c2);
+    testEqualityComparisons</*ExpectEqual = */true>(c1, c2);
 }
 
 template <typename TwoWayComparableContainerType>
@@ -1150,9 +1175,8 @@ void test_two_way_comparable_chmap() {
 
 void TestCHMapComparisons() {
     using integral_container = oneapi::tbb::concurrent_hash_map<int, int>;
-    using two_way_comparable_container
-            = oneapi::tbb::concurrent_hash_map<comparisons_testing::TwoWayComparable,
-                                               comparisons_testing::TwoWayComparable>;
+    using two_way_comparable_container = oneapi::tbb::concurrent_hash_map<comparisons_testing::TwoWayComparable,
+                                                                          comparisons_testing::TwoWayComparable>;
 
     test_comparisons_basic<integral_container>();
     test_comparisons_basic<two_way_comparable_container>();
@@ -1160,60 +1184,357 @@ void TestCHMapComparisons() {
 }
 
 template <typename Iterator, typename CHMapType>
-void TestCHMapIteratorComparisonsBasic(CHMapType& chmap) {
+void TestCHMapIteratorComparisonsBasic( CHMapType& chmap ) {
     REQUIRE_MESSAGE(!chmap.empty(), "Incorrect test setup");
     using namespace comparisons_testing;
     Iterator it1, it2;
-    testEqualityComparisons</*ExpectEqual = */ true>(it1, it2);
+    testEqualityComparisons</*ExpectEqual = */true>(it1, it2);
     it1 = chmap.begin();
-    testEqualityComparisons</*ExpectEqual = */ false>(it1, it2);
+    testEqualityComparisons</*ExpectEqual = */false>(it1, it2);
     it2 = chmap.begin();
-    testEqualityComparisons</*ExpectEqual = */ true>(it1, it2);
+    testEqualityComparisons</*ExpectEqual = */true>(it1, it2);
     it2 = chmap.end();
-    testEqualityComparisons</*ExpectEqual = */ false>(it1, it2);
+    testEqualityComparisons</*ExpectEqual = */false>(it1, it2);
 }
 
 void TestCHMapIteratorComparisons() {
     using chmap_type = oneapi::tbb::concurrent_hash_map<int, int>;
     using value_type = typename chmap_type::value_type;
-    chmap_type chmap = {value_type {1, 1}, value_type {2, 2}, value_type {3, 3}};
+    chmap_type chmap = {value_type{1, 1}, value_type{2, 2}, value_type{3, 3}};
     TestCHMapIteratorComparisonsBasic<typename chmap_type::iterator>(chmap);
     const chmap_type& cchmap = chmap;
     TestCHMapIteratorComparisonsBasic<typename chmap_type::const_iterator>(cchmap);
 }
 
-//! Test consruction with hash_compare
+template <bool IsConstructible>
+class HeterogeneousKey {
+public:
+    static std::size_t heterogeneous_keys_count;
+
+    int integer_key() const { return my_key; }
+
+    template <bool I = IsConstructible, typename = typename std::enable_if<I>::type>
+    HeterogeneousKey(int key) : my_key(key) { ++heterogeneous_keys_count; }
+
+    HeterogeneousKey(const HeterogeneousKey&) = delete;
+    HeterogeneousKey& operator=(const HeterogeneousKey&) = delete;
+
+    static void reset() { heterogeneous_keys_count = 0; }
+
+    struct construct_flag {};
+
+    HeterogeneousKey( construct_flag, int key ) : my_key(key) {}
+
+private:
+    int my_key;
+}; // class HeterogeneousKey
+
+template <bool IsConstructible>
+std::size_t HeterogeneousKey<IsConstructible>::heterogeneous_keys_count = 0;
+
+struct HeterogeneousHashCompare {
+    using is_transparent = void;
+
+    template <bool IsConstructible>
+    std::size_t hash( const HeterogeneousKey<IsConstructible>& key ) const {
+        return my_hash_object(key.integer_key());
+    }
+
+    std::size_t hash( const int& key ) const {
+        return my_hash_object(key);
+    }
+
+    bool equal( const int& key1, const int& key2 ) const {
+        return key1 == key2;
+    }
+
+    template <bool IsConstructible>
+    bool equal( const int& key1, const HeterogeneousKey<IsConstructible>& key2 ) const {
+        return key1 == key2.integer_key();
+    }
+
+    template <bool IsConstructible>
+    bool equal( const HeterogeneousKey<IsConstructible>& key1, const int& key2 ) const {
+        return key1.integer_key() == key2;
+    }
+
+    template <bool IsConstructible>
+    bool equal( const HeterogeneousKey<IsConstructible>& key1, const HeterogeneousKey<IsConstructible>& key2 ) const {
+        return key1.integer_key() == key2.integer_key();
+    }
+
+    std::hash<int> my_hash_object;
+}; // struct HeterogeneousHashCompare
+
+class DefaultConstructibleValue {
+public:
+    DefaultConstructibleValue() : my_i(default_value) {};
+
+    int value() const { return my_i; }
+    static constexpr int default_value = -4242;
+private:
+    int my_i;
+}; // class DefaultConstructibleValue
+
+constexpr int DefaultConstructibleValue::default_value;
+
+void test_heterogeneous_find() {
+    using key_type = HeterogeneousKey</*IsConstructible = */false>;
+    using chmap_type = oneapi::tbb::concurrent_hash_map<key_type, int, HeterogeneousHashCompare>;
+
+    chmap_type chmap;
+    using const_accessor = typename chmap_type::const_accessor;
+    using accessor = typename chmap_type::accessor;
+    const_accessor cacc;
+    accessor acc;
+
+    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 0, "Incorrect test setup");
+
+    key_type key(key_type::construct_flag{}, 1);
+    bool regular_result = chmap.find(cacc, key);
+    bool heterogeneous_result = chmap.find(cacc, int(1));
+
+    REQUIRE(!regular_result);
+    REQUIRE_MESSAGE(regular_result == heterogeneous_result,
+                    "Incorrect heterogeneous find result with const_accessor (no element)");
+    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 0, "Temporary key object was created during find call with const_accessor (no element)");
+
+    regular_result = chmap.find(acc, key);
+    heterogeneous_result = chmap.find(acc, int(1));
+
+    REQUIRE(!regular_result);
+    REQUIRE_MESSAGE(regular_result == heterogeneous_result,
+                    "Incorrect heterogeneous find result with accessor (no element)");
+    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 0, "Temporary key object was created during find call with accessor (no element)");
+
+    bool tmp_result = chmap.emplace(cacc, std::piecewise_construct,
+                                    std::forward_as_tuple(key_type::construct_flag{}, 1), std::forward_as_tuple(100));
+    REQUIRE(tmp_result);
+
+    regular_result = chmap.find(cacc, key);
+    heterogeneous_result = chmap.find(cacc, int(1));
+
+    REQUIRE(regular_result);
+    REQUIRE_MESSAGE(regular_result == heterogeneous_result, "Incorrect heterogeneous find result with const_accessor (element exists)");
+    REQUIRE_MESSAGE(cacc->first.integer_key() == 1, "Incorrect accessor returned");
+    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 0, "Temporary key object was created during find call with const_accessor (element exists)");
+    cacc.release();
+
+    regular_result = chmap.find(acc, key);
+    heterogeneous_result = chmap.find(acc, int(1));
+
+    REQUIRE(regular_result);
+    REQUIRE_MESSAGE(regular_result == heterogeneous_result, "Incorrect heterogeneous find result with accessor (element exists)");
+    REQUIRE_MESSAGE(acc->first.integer_key() == 1, "Incorrect accessor returned");
+    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 0, "Temporary key object was created during find call with accessor (element exists)");
+    key_type::reset();
+}
+
+void test_heterogeneous_count() {
+    using key_type = HeterogeneousKey</*IsConstructible = */false>;
+    using chmap_type = oneapi::tbb::concurrent_hash_map<key_type, int, HeterogeneousHashCompare>;
+
+    chmap_type chmap;
+
+    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 0, "Incorrect test setup");
+    key_type key(key_type::construct_flag{}, 1);
+
+    typename chmap_type::size_type regular_count = chmap.count(key);
+    typename chmap_type::size_type heterogeneous_count = chmap.count(int(1));
+
+    REQUIRE(regular_count == 0);
+    REQUIRE_MESSAGE(regular_count == heterogeneous_count, "Incorrect heterogeneous count result (no element)");
+    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 0, "Temporary key object was created during count call (no element)");
+
+    chmap.emplace(std::piecewise_construct, std::forward_as_tuple(key_type::construct_flag{}, 1), std::forward_as_tuple(100));
+
+    regular_count = chmap.count(key);
+    heterogeneous_count = chmap.count(int(1));
+
+    REQUIRE(regular_count == 1);
+    REQUIRE_MESSAGE(regular_count == heterogeneous_count, "Incorrect heterogeneous count result (element exists)");
+    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 0, "Temporary key object was created during count call (element exists)");
+    key_type::reset();
+}
+
+void test_heterogeneous_equal_range() {
+    using key_type = HeterogeneousKey</*IsConstructible = */false>;
+    using chmap_type = oneapi::tbb::concurrent_hash_map<key_type, int, HeterogeneousHashCompare>;
+
+    chmap_type chmap;
+    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 0, "Incorrect test setup");
+
+    using iterator = typename chmap_type::iterator;
+    using const_iterator = typename chmap_type::const_iterator;
+    using result = std::pair<iterator, iterator>;
+    using const_result = std::pair<const_iterator, const_iterator>;
+    key_type key(key_type::construct_flag{}, 1);
+
+    result regular_result = chmap.equal_range(key);
+    result heterogeneous_result = chmap.equal_range(int(1));
+
+    REQUIRE(regular_result.first == chmap.end());
+    REQUIRE(regular_result.second == chmap.end());
+    REQUIRE_MESSAGE(regular_result == heterogeneous_result, "Incorrect heterogeneous equal_range result (non const, no element)");
+    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 0, "Temporary key object was created during equal_range call (non const, no element)");
+
+    const chmap_type& cchmap = chmap;
+
+    const_result regular_const_result = cchmap.equal_range(key);
+    const_result heterogeneous_const_result = cchmap.equal_range(int(1));
+
+    REQUIRE(regular_const_result.first == cchmap.end());
+    REQUIRE(regular_const_result.second == cchmap.end());
+    REQUIRE_MESSAGE(regular_const_result == heterogeneous_const_result,
+                    "Incorrect heterogeneous equal_range result (const, no element)");
+    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 0, "Temporary key object was created during equal_range call (const, no element)");
+
+    chmap.emplace(std::piecewise_construct, std::forward_as_tuple(key_type::construct_flag{}, 1), std::forward_as_tuple(100));
+
+    regular_result = chmap.equal_range(key);
+    heterogeneous_result = chmap.equal_range(int(1));
+
+    REQUIRE(regular_result.first != chmap.end());
+    REQUIRE(regular_result.first->first.integer_key() == 1);
+    REQUIRE(regular_result.second == chmap.end());
+    REQUIRE_MESSAGE(regular_result == heterogeneous_result, "Incorrect heterogeneous equal_range result (non const, element exists)");
+    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 0, "Temporary key object was created during equal_range call (non const, element exists)");
+
+    regular_const_result = cchmap.equal_range(key);
+    heterogeneous_const_result = cchmap.equal_range(int(1));
+    REQUIRE_MESSAGE(regular_const_result == heterogeneous_const_result,
+                    "Incorrect heterogeneous equal_range result (const, element exists)");
+    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 0, "Temporary key object was created during equal_range call (const, element exists)");
+    key_type::reset();
+}
+
+void test_heterogeneous_insert() {
+    using key_type = HeterogeneousKey</*IsConstructible = */true>;
+    using chmap_type = oneapi::tbb::concurrent_hash_map<key_type, DefaultConstructibleValue, HeterogeneousHashCompare>;
+
+    chmap_type chmap;
+    using const_accessor = typename chmap_type::const_accessor;
+    using accessor = typename chmap_type::accessor;
+    const_accessor cacc;
+    accessor acc;
+
+    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 0, "Incorrect test setup");
+
+    bool result = chmap.insert(cacc, int(1));
+
+    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 1, "Only one heterogeneous key should be created");
+    REQUIRE_MESSAGE(result, "Incorrect heterogeneous insert result (const_accessor)");
+    REQUIRE_MESSAGE(cacc->first.integer_key() == 1, "Incorrect accessor");
+    REQUIRE_MESSAGE(cacc->second.value() == DefaultConstructibleValue::default_value, "Value should be default constructed");
+
+    result = chmap.insert(cacc, int(1));
+
+    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 1, "No extra keys should be created");
+    REQUIRE_MESSAGE(!result, "Incorrect heterogeneous insert result (const_accessor)");
+    REQUIRE_MESSAGE(cacc->first.integer_key() == 1, "Incorrect accessor");
+    REQUIRE_MESSAGE(cacc->second.value() == DefaultConstructibleValue::default_value, "Value should be default constructed");
+
+    result = chmap.insert(acc, int(2));
+
+    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 2, "Only one extra heterogeneous key should be created");
+    REQUIRE_MESSAGE(result, "Incorrect heterogeneous insert result (accessor)");
+    REQUIRE_MESSAGE(acc->first.integer_key() == 2, "Incorrect accessor");
+    REQUIRE_MESSAGE(acc->second.value() == DefaultConstructibleValue::default_value, "Value should be default constructed");
+
+    result = chmap.insert(acc, int(2));
+
+    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 2, "No extra keys should be created");
+    REQUIRE_MESSAGE(!result, "Incorrect heterogeneous insert result (accessor)");
+    REQUIRE_MESSAGE(acc->first.integer_key() == 2, "Incorrect accessor");
+    REQUIRE_MESSAGE(acc->second.value() == DefaultConstructibleValue::default_value, "Value should be default constructed");
+
+    key_type::reset();
+}
+
+void test_heterogeneous_erase() {
+    using key_type = HeterogeneousKey</*IsConstructible = */false>;
+    using chmap_type = oneapi::tbb::concurrent_hash_map<key_type, int, HeterogeneousHashCompare>;
+
+    chmap_type chmap;
+
+    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 0, "Incorrect test setup");
+
+    chmap.emplace(std::piecewise_construct, std::forward_as_tuple(key_type::construct_flag{}, 1), std::forward_as_tuple(100));
+    chmap.emplace(std::piecewise_construct, std::forward_as_tuple(key_type::construct_flag{}, 2), std::forward_as_tuple(200));
+
+    typename chmap_type::const_accessor cacc;
+
+    REQUIRE(chmap.find(cacc, int(1)));
+    REQUIRE(chmap.find(cacc, int(2)));
+
+    cacc.release();
+
+    bool result = chmap.erase(int(1));
+    REQUIRE_MESSAGE(result, "Erasure should be successful");
+    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 0, "No extra keys should be created");
+    REQUIRE_MESSAGE(!chmap.find(cacc, int(1)), "Element was not erased");
+
+
+    result = chmap.erase(int(1));
+    REQUIRE_MESSAGE(!result, "Erasure should fail");
+    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 0, "No extra keys should be created");
+    key_type::reset();
+}
+
+void test_heterogeneous_lookup() {
+    test_heterogeneous_find();
+    test_heterogeneous_count();
+    test_heterogeneous_equal_range();
+}
+
+//! Test construction with hash_compare
 //! \brief \ref interface \ref requirement
-TEST_CASE("testing consruction with hash_compare") { TestHashCompareConstructors(); }
+TEST_CASE("testing construction with hash_compare") {
+    TestHashCompareConstructors();
+}
 
 //! Test concurrent_hash_map member types
 //! \brief \ref interface \ref requirement
-TEST_CASE("test types") { test_member_types<oneapi::tbb::concurrent_hash_map>(); }
+TEST_CASE("test types"){
+    test_member_types<oneapi::tbb::concurrent_hash_map>();
+}
 
 //! Test swap and clear operations
 //! \brief \ref interface \ref requirement
-TEST_CASE("test copy operations") { TestCopy(); }
+TEST_CASE("test copy operations") {
+    TestCopy();
+}
 
 //! Test rehash operation
 //! \brief \ref interface \ref requirement
-TEST_CASE("test rehash operation") { TestRehash(); }
+TEST_CASE("test rehash operation") {
+    TestRehash();
+}
 
 //! Test assignment operation
 //! \brief \ref interface \ref requirement
-TEST_CASE("test assignment operation") { TestAssignment(); }
+TEST_CASE("test assignment operation") {
+    TestAssignment();
+}
 
 //! Test iterators and ranges
 //! \brief \ref interface \ref requirement
-TEST_CASE("test iterators and ranges") { TestIteratorsAndRanges(); }
+TEST_CASE("test iterators and ranges") {
+    TestIteratorsAndRanges();
+}
 
 //! Test work with initializer_list
 //! \brief \ref interface \ref requirement
-TEST_CASE("test work with initializer_list") { TestInitList(); }
+TEST_CASE("test work with initializer_list") {
+    TestInitList();
+}
 
 #if TBB_USE_EXCEPTIONS
 //! Test exception safety
 //! \brief \ref requirement
-TEST_CASE("test exception safety") { TestExceptions(); }
+TEST_CASE("test exception safety") {
+    TestExceptions();
+}
 
 //! Test exceptions safety guarantees for move constructor
 //! \brief \ref requirement
@@ -1225,33 +1546,39 @@ TEST_CASE("test move support with exceptions") {
 
 //! Test move constructor
 //! \brief \ref interface \ref requirement
-TEST_CASE("testing move constructor") { move_support_tests::test_move_constructor<hash_map_traits>(); }
+TEST_CASE("testing move constructor"){
+    move_support_tests::test_move_constructor<hash_map_traits>();
+}
 
 //! Test move assign operator
 //! \brief \ref interface \ref requirement
-TEST_CASE("testing move assign operator") { move_support_tests::test_move_assignment<hash_map_traits>(); }
+TEST_CASE("testing move assign operator"){
+    move_support_tests::test_move_assignment<hash_map_traits>();
+}
 
 //! Test insert and empace
 //! \brief \ref interface \ref requirement
-TEST_CASE("testing concurrent insert and emplace") {
-    int n = 250000;
+TEST_CASE("testing concurrent insert and emplace"){
+    int n=250000;
     {
         DataStateTrackedTable table;
-        DoConcurrentOperations<RvalueInsert, DataStateTrackedTable>(table, n, "rvalue ref insert", 1);
+        DoConcurrentOperations<RvalueInsert, DataStateTrackedTable>( table, n, "rvalue ref insert", 1 );
     }
     {
         DataStateTrackedTable table;
-        DoConcurrentOperations<Emplace, DataStateTrackedTable>(table, n, "emplace", 1);
+        DoConcurrentOperations<Emplace, DataStateTrackedTable>( table, n, "emplace", 1 );
     }
 }
 
 //! Test allocator traits
 //! \brief \ref requirement
-TEST_CASE("testing allocator traits") { test_allocator_traits_support<hash_map_traits>(); }
+TEST_CASE("testing allocator traits") {
+    test_allocator_traits_support<hash_map_traits>();
+}
 
 //! Test concurrent operations
 //! \brief \ref requirement
-TEST_CASE("testing concurrency") {
+TEST_CASE("testing concurrency"){
     for (std::size_t p = 1; p <= 4; ++p) {
         oneapi::tbb::global_control limit(oneapi::tbb::global_control::max_allowed_parallelism, p);
         TestInsertFindErase(p);
@@ -1262,11 +1589,32 @@ TEST_CASE("testing concurrency") {
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 //! Test deduction guides
 //! \brief \ref interface
-TEST_CASE("testing deduction guides") { TestDeductionGuides<oneapi::tbb::concurrent_hash_map>(); }
-#endif// __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
+TEST_CASE("testing deduction guides") {
+    TestDeductionGuides<oneapi::tbb::concurrent_hash_map>();
+}
+#endif // __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
+
+//! \brief \ref interface \ref requirement
+TEST_CASE("concurrent_hash_map comparisons") {
+    TestCHMapComparisons();
+}
+
+//! \brief \ref interface \ref requirement
+TEST_CASE("concurrent_hash_map iterator comparisons") {
+    TestCHMapIteratorComparisons();
+}
 
 //! \brief \ref interface \ref requirement
-TEST_CASE("concurrent_hash_map comparisons") { TestCHMapComparisons(); }
+TEST_CASE("test concurrent_hash_map heterogeneous lookup") {
+    test_heterogeneous_lookup();
+}
 
 //! \brief \ref interface \ref requirement
-TEST_CASE("concurrent_hash_map iterator comparisons") { TestCHMapIteratorComparisons(); }
+TEST_CASE("test concurrent_hash_map heterogeneous insert") {
+    test_heterogeneous_insert();
+}
+
+//! \brief \ref interface \ref requirement
+TEST_CASE("test concurrent_hash_map heterogeneous erase") {
+    test_heterogeneous_erase();
+}
diff --git a/external/tbb/test/conformance/conformance_concurrent_lru_cache.cpp b/external/tbb/test/conformance/conformance_concurrent_lru_cache.cpp
index bcdd4f43..85024f70 100644
--- a/external/tbb/test/conformance/conformance_concurrent_lru_cache.cpp
+++ b/external/tbb/test/conformance/conformance_concurrent_lru_cache.cpp
@@ -15,7 +15,7 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
 #endif
 
 #define TBB_PREVIEW_CONCURRENT_LRU_CACHE 1
@@ -38,19 +38,19 @@ TEST_CASE("basic test for creation and use") {
     auto callback = [](int key) -> int { return key; };
     std::size_t number_of_lru_history_items = 8;
 
-    preset preset_object {callback, number_of_lru_history_items};
+    preset preset_object{callback, number_of_lru_history_items};
     preset::cache_type& cache = preset_object.cache;
 
     int dummy_key = 0;
     preset::handle_type h = cache[dummy_key];
     int value = h.value();
-    (void) value;
+    (void)value;
 }
 
 //! \brief \ref interface \ref requirement
 TEST_CASE("basic test for std::move") {
     using preset = concurrent_lru_cache_presets::preset1;
-    preset preset_object {};
+    preset preset_object{};
     preset::cache_type& cache = preset_object.cache;
 
     // retain handle object to keep an item in the cache
@@ -75,9 +75,10 @@ TEST_CASE("basic test for std::move") {
 TEST_CASE("basic test for to bool conversion") {
     using concurrent_lru_cache_presets::preset1;
 
-    preset1 preset_instance {};
+    preset1 preset_instance{};
     preset1::cache_type& cache = preset_instance.cache;
 
+
     preset1::handle_type handle;
     preset1::handle_type foobar = preset1::handle_type();
 
@@ -89,8 +90,12 @@ TEST_CASE("basic test for to bool conversion") {
 
     handle = std::move(handle1);
 
-    REQUIRE_MESSAGE(!preset1::handle_type(), "user-defined to-bool conversion does not work");
-    REQUIRE_MESSAGE(handle, "user-defined to-bool conversion does not work");
+    REQUIRE_MESSAGE(
+        !preset1::handle_type(),
+        "user-defined to-bool conversion does not work");
+    REQUIRE_MESSAGE(
+        handle,
+        "user-defined to-bool conversion does not work");
 
     handle = preset1::handle_type();
 }
@@ -98,23 +103,28 @@ TEST_CASE("basic test for to bool conversion") {
 //! \brief \ref requirement
 TEST_CASE("basic test for cache hit") {
     using preset = concurrent_lru_cache_presets::preset_call_count<__LINE__>;
-    preset preset_object {};
+    preset preset_object{};
     preset::cache_type& cache = preset_object.cache;
 
     int dummy_key = 0;
     cache[dummy_key];
     cache[dummy_key];
 
-    REQUIRE_MESSAGE(preset::counter_type::calls == 1, "value function should be called only on a cache miss");
+    REQUIRE_MESSAGE(
+        preset::counter_type::calls == 1,
+        "value function should be called only on a cache miss");
 }
 
 //! \brief \ref requirement
 TEST_CASE("basic test for unused objects") {
     using preset = concurrent_lru_cache_presets::preset_instance_count;
-    preset preset_object {};
+    preset preset_object{};
 
-    for (std::size_t i = 0; i < preset_object.number_of_lru_history_items; ++i) preset_object.cache[i];
+    for (std::size_t i = 0; i < preset_object.number_of_lru_history_items; ++i)
+        preset_object.cache[i];
 
-    REQUIRE_MESSAGE(preset_object.source.instances_count() == preset_object.number_of_lru_history_items + 1,
-                    "cache should respect number of stored unused objects to number passed in constructor");
+    REQUIRE_MESSAGE(
+        preset_object.source.instances_count() == preset_object.number_of_lru_history_items+1,
+        "cache should respect number of stored unused objects to number passed in constructor");
 }
+
diff --git a/external/tbb/test/conformance/conformance_concurrent_map.cpp b/external/tbb/test/conformance/conformance_concurrent_map.cpp
index 6d177019..7d82366e 100644
--- a/external/tbb/test/conformance/conformance_concurrent_map.cpp
+++ b/external/tbb/test/conformance/conformance_concurrent_map.cpp
@@ -15,16 +15,16 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
 #endif
 
 #ifndef NOMINMAX
 #define NOMINMAX
 #endif
 #include "oneapi/tbb/concurrent_map.h"
-#include <common/concurrent_ordered_common.h>
 #include <common/test.h>
 #include <common/utils.h>
+#include <common/concurrent_ordered_common.h>
 #include <memory>
 #include <type_traits>
 
@@ -42,12 +42,16 @@ using multimap_type = oneapi::tbb::concurrent_multimap<int, int, std::less<int>,
 
 template <>
 struct SpecialTests<map_type> {
-    static void Test() { SpecialMapTests<map_type>(); }
+    static void Test() {
+        SpecialMapTests<map_type>();
+    }
 };
 
 template <>
 struct SpecialTests<multimap_type> {
-    static void Test() { SpecialMultiMapTests<multimap_type>(); }
+    static void Test() {
+        SpecialMultiMapTests<multimap_type>();
+    }
 };
 
 template <template <typename...> class ContainerType>
@@ -55,11 +59,10 @@ void test_member_types() {
     using default_container_type = ContainerType<int, int>;
     static_assert(std::is_same<typename default_container_type::key_compare, std::less<int>>::value,
                   "Incorrect default template comparator");
-    static_assert(std::is_same<typename default_container_type::allocator_type,
-                               oneapi::tbb::tbb_allocator<std::pair<const int, int>>>::value,
+    static_assert(std::is_same<typename default_container_type::allocator_type, oneapi::tbb::tbb_allocator<std::pair<const int, int>>>::value,
                   "Incorrect default template allocator");
 
-    auto test_comparator = [](const int&, const int&) -> bool { return true; };
+    auto test_comparator = [](const int&, const int&)->bool { return true; };
     using test_allocator_type = std::allocator<std::pair<const int, int>>;
 
     using container_type = ContainerType<int, int, decltype(test_comparator), test_allocator_type>;
@@ -87,11 +90,9 @@ void test_member_types() {
     static_assert(std::is_same<typename container_type::const_reference, const value_type&>::value,
                   "Incorrect container const_reference member type");
     using allocator_type = typename container_type::allocator_type;
-    static_assert(std::is_same<typename container_type::pointer,
-                               typename std::allocator_traits<allocator_type>::pointer>::value,
+    static_assert(std::is_same<typename container_type::pointer, typename std::allocator_traits<allocator_type>::pointer>::value,
                   "Incorrect container pointer member type");
-    static_assert(std::is_same<typename container_type::const_pointer,
-                               typename std::allocator_traits<allocator_type>::const_pointer>::value,
+    static_assert(std::is_same<typename container_type::const_pointer, typename std::allocator_traits<allocator_type>::const_pointer>::value,
                   "Incorrect container const_pointer member type");
 
     static_assert(utils::is_forward_iterator<typename container_type::iterator>::value,
@@ -109,38 +110,34 @@ template <template <typename...> typename TMap>
 void test_deduction_guides() {
     std::vector<std::pair<int, int>> v(10, {0, 0});
     TMap map(v.begin(), v.end());
-    static_assert(std::is_same_v<decltype(map), TMap<int, int>>, "WRONG\n");
+    static_assert(std::is_same_v<decltype(map), TMap<int, int> >, "WRONG\n");
 
     std::greater<int> compare;
     std::allocator<std::pair<const int, int>> allocator;
     TMap map2(v.begin(), v.end(), compare);
-    static_assert(std::is_same_v<decltype(map2), TMap<int, int, decltype(compare)>>, "WRONG\n");
+    static_assert(std::is_same_v<decltype(map2), TMap<int, int, decltype(compare)> >, "WRONG\n");
 
     TMap map3(v.begin(), v.end(), allocator);
-    static_assert(std::is_same_v<decltype(map3), TMap<int, int, std::less<int>, decltype(allocator)>>,
-                  "WRONG\n");
+    static_assert(std::is_same_v<decltype(map3), TMap<int, int, std::less<int>, decltype(allocator)> >, "WRONG\n");
 
     TMap map4(v.begin(), v.end(), compare, allocator);
-    static_assert(std::is_same_v<decltype(map4), TMap<int, int, decltype(compare), decltype(allocator)>>,
-                  "WRONG\n");
+    static_assert(std::is_same_v<decltype(map4), TMap<int, int, decltype(compare), decltype(allocator)> >, "WRONG\n");
 
     using pair_t = std::pair<const int, int>;
-    auto init = {pair_t {1, 1}, pair_t {2, 2}, pair_t {3, 3}};
+    auto init = { pair_t{1, 1}, pair_t{2, 2}, pair_t{3, 3} };
     TMap map5(init);
-    static_assert(std::is_same_v<decltype(map5), TMap<int, int>>, "WRONG\n");
+    static_assert(std::is_same_v<decltype(map5), TMap<int, int> >, "WRONG\n");
 
     TMap map6(init, compare);
-    static_assert(std::is_same_v<decltype(map6), TMap<int, int, decltype(compare)>>, "WRONG\n");
+    static_assert(std::is_same_v<decltype(map6), TMap<int, int, decltype(compare)> >, "WRONG\n");
 
     TMap map7(init, allocator);
-    static_assert(std::is_same_v<decltype(map7), TMap<int, int, std::less<int>, decltype(allocator)>>,
-                  "WRONG\n");
+    static_assert(std::is_same_v<decltype(map7), TMap<int, int, std::less<int>, decltype(allocator)> >, "WRONG\n");
 
     TMap map8(init, compare, allocator);
-    static_assert(std::is_same_v<decltype(map8), TMap<int, int, decltype(compare), decltype(allocator)>>,
-                  "WRONG\n");
+    static_assert(std::is_same_v<decltype(map8), TMap<int, int, decltype(compare), decltype(allocator)> >, "WRONG\n");
 }
-#endif// __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
+#endif // __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 
 template <template <typename...> class MapType>
 void test_heterogeneous_functions() {
@@ -157,7 +154,7 @@ struct COMapTraits : OrderedMoveTraitsBase {
     using container_value_type = std::pair<const T, T>;
 
     using init_iterator_type = move_support_tests::FooPairIterator;
-};// struct COMapTraits
+}; // struct COMapTraits
 
 struct COMultimapTraits : OrderedMoveTraitsBase {
     template <typename T, typename Allocator>
@@ -167,23 +164,31 @@ struct COMultimapTraits : OrderedMoveTraitsBase {
     using container_value_type = std::pair<const T, T>;
 
     using init_iterator_type = move_support_tests::FooPairIterator;
-};// struct COMultimapTraits
+}; // struct COMultimapTraits
 
 //! Testing concurrent_map member types
 //! \brief \ref interface \ref requirement
-TEST_CASE("concurrent_map member types") { test_member_types<oneapi::tbb::concurrent_map>(); }
+TEST_CASE("concurrent_map member types") {
+    test_member_types<oneapi::tbb::concurrent_map>();
+}
 
 //! Testing requirements of concurrent_map
 //! \brief \ref interface \ref requirement
-TEST_CASE("concurrent_map requirements") { test_basic<map_type>(); }
+TEST_CASE("concurrent_map requirements") {
+    test_basic<map_type>();
+}
 
 //! Testing multithreading support in concurrent_map
 //! \brief \ref requirement
-TEST_CASE("concurrent_map multithreading support") { test_concurrent<map_type>(); }
+TEST_CASE("concurrent_map multithreading support") {
+    test_concurrent<map_type>();
+}
 
 //! Testing move constructors and assignment operator in concurrent_map
 //! \brief \ref interface \ref requirement
-TEST_CASE("concurrent_map move semantics support") { test_rvalue_ref_support<COMapTraits>(); }
+TEST_CASE("concurrent_map move semantics support") {
+    test_rvalue_ref_support<COMapTraits>();
+}
 
 //! Testing std::initializer_list constructors and modifiers in concurrent_map
 //! \brief \ref interface \ref requirement
@@ -199,7 +204,9 @@ TEST_CASE("node handling support in concurrent_map") {
 
 //! Testing std::allocator_traits support in concurrent_map
 //! \brief \ref interface \ref requirement
-TEST_CASE("std::allocator_traits support in concurrent_map") { test_allocator_traits_support<COMapTraits>(); }
+TEST_CASE("std::allocator_traits support in concurrent_map") {
+    test_allocator_traits_support<COMapTraits>();
+}
 
 //! Testing heterogeneous overloads in concurrent_map
 //! \brief \ref interface \ref requirement
@@ -216,28 +223,40 @@ TEST_CASE("insertion by generic pair in concurrent_map") {
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 //! Testing Class Template Argument Deduction in concurrent_map
 //! \brief \ref interface \ref requirement
-TEST_CASE("CTAD support in concurrent_map") { test_deduction_guides<oneapi::tbb::concurrent_map>(); }
-#endif// __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
+TEST_CASE("CTAD support in concurrent_map") {
+    test_deduction_guides<oneapi::tbb::concurrent_map>();
+}
+#endif // __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 
 //! Testing comparisons of concurrent_map
 //! \brief \ref interface \ref requirement
-TEST_CASE("test concurrent_map comparisons") { test_map_comparisons<oneapi::tbb::concurrent_map>(); }
+TEST_CASE("test concurrent_map comparisons") {
+    test_map_comparisons<oneapi::tbb::concurrent_map>();
+}
 
 //! Testing concurrent_multimap member types
 //! \brief \ref interface \ref requirement
-TEST_CASE("concurrent_multimap member types") { test_member_types<oneapi::tbb::concurrent_multimap>(); }
+TEST_CASE("concurrent_multimap member types") {
+    test_member_types<oneapi::tbb::concurrent_multimap>();
+}
 
 //! Testing requirements of concurrent_multimap
 //! \brief \ref interface \ref requirement
-TEST_CASE("concurrent_multimap requirements") { test_basic<multimap_type>(); }
+TEST_CASE("concurrent_multimap requirements") {
+    test_basic<multimap_type>();
+}
 
 //! Testing multithreading support in concurrent_multimap
 //! \brief \ref requirement
-TEST_CASE("concurrent_multimap multithreading support") { test_concurrent<multimap_type>(); }
+TEST_CASE("concurrent_multimap multithreading support") {
+    test_concurrent<multimap_type>();
+}
 
 //! Testing move constructors and assignment operator in concurrent_multimap
 //! \brief \ref interface \ref requirement
-TEST_CASE("concurrent_multimap multithreading support") { test_rvalue_ref_support<COMultimapTraits>(); }
+TEST_CASE("concurrent_multimap multithreading support") {
+    test_rvalue_ref_support<COMultimapTraits>();
+}
 
 //! Testing std::initializer_list constructors and modifiers in concurrent_multimap
 //! \brief \ref interface \ref requirement
@@ -275,7 +294,7 @@ TEST_CASE("insertion by generic pair in concurrent_multimap") {
 TEST_CASE("CTAD support in concurrent_multimap") {
     test_deduction_guides<oneapi::tbb::concurrent_multimap>();
 }
-#endif// __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
+#endif // __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 
 //! Testing comparison operators in concurrent_multimap
 //! \brief \ref interface \ref requirement
@@ -285,4 +304,6 @@ TEST_CASE("test concurrent_multimap comparisons") {
 
 //! Testing of merge operations in concurrent_map and concurrent_multimap
 //! \brief \ref interface \ref requirement
-TEST_CASE("merge operations") { node_handling_tests::test_merge<map_type, multimap_type>(1000); }
+TEST_CASE("merge operations") {
+    node_handling_tests::test_merge<map_type, multimap_type>(1000);
+}
diff --git a/external/tbb/test/conformance/conformance_concurrent_priority_queue.cpp b/external/tbb/test/conformance/conformance_concurrent_priority_queue.cpp
index 8acca9a6..ccb145b3 100644
--- a/external/tbb/test/conformance/conformance_concurrent_priority_queue.cpp
+++ b/external/tbb/test/conformance/conformance_concurrent_priority_queue.cpp
@@ -15,13 +15,13 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
 #endif
 
 #include <common/concurrent_priority_queue_common.h>
+#include <common/initializer_list_support.h>
 #include <common/container_move_support.h>
 #include <common/containers_common.h>
-#include <common/initializer_list_support.h>
 #include <common/test_comparisons.h>
 #include <scoped_allocator>
 
@@ -38,8 +38,7 @@ void test_to_vector() {
     std::vector<int> from_cpq = toVector(q);
 
     std::sort(source.begin(), source.end());
-    REQUIRE_MESSAGE(source == from_cpq,
-                    "equality_comparison_helpers::toVector incorrectly copied items from CPQ");
+    REQUIRE_MESSAGE(source == from_cpq, "equality_comparison_helpers::toVector incorrectly copied items from CPQ");
 }
 
 void test_basic() {
@@ -47,9 +46,10 @@ void test_basic() {
     utils::FastRandom<> rnd(1234);
 
     std::vector<int> arrInt;
-    for (int i = 0; i < NUMBER; ++i) arrInt.emplace_back(rnd.get());
+    for (int i = 0; i < NUMBER; ++i)
+        arrInt.emplace_back(rnd.get());
 
-    type_tester(arrInt);// Test integers
+    type_tester(arrInt); // Test integers
 }
 
 void test_initializer_list() {
@@ -63,13 +63,13 @@ struct SpecialMemberCalls {
     std::size_t move_ctor_called_times;
     std::size_t copy_assign_called_times;
     std::size_t move_assign_called_times;
-};// struct SpecialMemberCalls
+}; // struct SpecialMemberCalls
 
-bool operator==(const SpecialMemberCalls& lhs, const SpecialMemberCalls& rhs) {
-    return lhs.copy_ctor_called_times == rhs.copy_ctor_called_times
-           && lhs.move_ctor_called_times == rhs.move_ctor_called_times
-           && lhs.copy_assign_called_times == rhs.copy_assign_called_times
-           && lhs.move_assign_called_times == rhs.move_assign_called_times;
+bool operator==( const SpecialMemberCalls& lhs, const SpecialMemberCalls& rhs ) {
+    return lhs.copy_ctor_called_times == rhs.copy_ctor_called_times &&
+           lhs.move_ctor_called_times == rhs.move_ctor_called_times &&
+           lhs.copy_assign_called_times == rhs.copy_assign_called_times &&
+           lhs.move_assign_called_times == rhs.move_assign_called_times;
 }
 
 template <typename CounterType>
@@ -80,35 +80,34 @@ struct MoveOperationTrackerBase {
     static CounterType move_assign_called_times;
 
     static SpecialMemberCalls special_member_calls() {
-        return SpecialMemberCalls {copy_ctor_called_times, move_ctor_called_times, copy_assign_called_times,
-                                   move_assign_called_times};
+        return SpecialMemberCalls{copy_ctor_called_times, move_ctor_called_times, copy_assign_called_times, move_assign_called_times};
     }
     static CounterType value_counter;
     std::size_t value;
 
     MoveOperationTrackerBase() : value(++value_counter) {}
-    explicit MoveOperationTrackerBase(const std::size_t val) : value(val) {}
+    explicit MoveOperationTrackerBase( const std::size_t val ) : value(val) {}
     ~MoveOperationTrackerBase() { value = 0; }
 
-    MoveOperationTrackerBase(const MoveOperationTrackerBase& other) : value(other.value) {
+    MoveOperationTrackerBase( const MoveOperationTrackerBase& other ) : value(other.value) {
         REQUIRE_MESSAGE(other.value, "The object has been moved or destroyed");
         ++copy_ctor_called_times;
     }
 
-    MoveOperationTrackerBase(MoveOperationTrackerBase&& other) noexcept : value(other.value) {
+    MoveOperationTrackerBase( MoveOperationTrackerBase&& other ) noexcept : value(other.value) {
         REQUIRE_MESSAGE(other.value, "The object has been moved or destroyed");
         other.value = 0;
         ++move_ctor_called_times;
     }
 
-    MoveOperationTrackerBase& operator=(const MoveOperationTrackerBase& other) {
+    MoveOperationTrackerBase& operator=( const MoveOperationTrackerBase& other ) {
         REQUIRE_MESSAGE(other.value, "The object has been moved or destroyed");
         value = other.value;
         ++copy_assign_called_times;
         return *this;
     }
 
-    MoveOperationTrackerBase& operator=(MoveOperationTrackerBase&& other) noexcept {
+    MoveOperationTrackerBase& operator=( MoveOperationTrackerBase&& other ) noexcept {
         REQUIRE_MESSAGE(other.value, "The object has been moved or destroyed");
         value = other.value;
         other.value = 0;
@@ -116,43 +115,35 @@ struct MoveOperationTrackerBase {
         return *this;
     }
 
-    bool operator<(const MoveOperationTrackerBase& other) const {
+    bool operator<( const MoveOperationTrackerBase& other ) const {
         REQUIRE_MESSAGE(value, "The object has been moved or destroyed");
         REQUIRE_MESSAGE(other.value, "The object has been moved or destroyed");
         return value < other.value;
     }
-};// struct MoveOperationTrackerBase
+}; // struct MoveOperationTrackerBase
 
-template <typename CounterType>
-bool operator==(const MoveOperationTrackerBase<CounterType>& lhs,
-                const MoveOperationTrackerBase<CounterType>& rhs) {
+template<typename CounterType>
+bool operator==( const MoveOperationTrackerBase<CounterType>& lhs, const MoveOperationTrackerBase<CounterType>& rhs ) {
     return !(lhs < rhs) && !(rhs < lhs);
 }
 
 using MoveOperationTracker = MoveOperationTrackerBase<std::size_t>;
 using MoveOperationTrackerConc = MoveOperationTrackerBase<std::atomic<std::size_t>>;
 
-template <typename CounterType>
-CounterType MoveOperationTrackerBase<CounterType>::copy_ctor_called_times(0);
-template <typename CounterType>
-CounterType MoveOperationTrackerBase<CounterType>::move_ctor_called_times(0);
-template <typename CounterType>
-CounterType MoveOperationTrackerBase<CounterType>::copy_assign_called_times(0);
-template <typename CounterType>
-CounterType MoveOperationTrackerBase<CounterType>::move_assign_called_times(0);
-template <typename CounterType>
-CounterType MoveOperationTrackerBase<CounterType>::value_counter(0);
+template <typename CounterType> CounterType MoveOperationTrackerBase<CounterType>::copy_ctor_called_times(0);
+template <typename CounterType> CounterType MoveOperationTrackerBase<CounterType>::move_ctor_called_times(0);
+template <typename CounterType> CounterType MoveOperationTrackerBase<CounterType>::copy_assign_called_times(0);
+template <typename CounterType> CounterType MoveOperationTrackerBase<CounterType>::move_assign_called_times(0);
+template <typename CounterType> CounterType MoveOperationTrackerBase<CounterType>::value_counter(0);
 
 template <typename Allocator = std::allocator<MoveOperationTracker>>
 struct CPQSrcFixture {
-    CPQSrcFixture& operator=(const CPQSrcFixture&) = delete;
+    CPQSrcFixture& operator=( const CPQSrcFixture& ) = delete;
 
-    enum { default_container_size = 100 };
+    enum {default_container_size = 100};
     using cpq_compare_type = std::less<MoveOperationTracker>;
-    using cpq_allocator_type =
-            typename std::allocator_traits<Allocator>::template rebind_alloc<MoveOperationTracker>;
-    using cpq_type = oneapi::tbb::concurrent_priority_queue<MoveOperationTracker, cpq_compare_type,
-                                                            cpq_allocator_type>;
+    using cpq_allocator_type = typename std::allocator_traits<Allocator>::template rebind_alloc<MoveOperationTracker>;
+    using cpq_type = oneapi::tbb::concurrent_priority_queue<MoveOperationTracker, cpq_compare_type, cpq_allocator_type>;
 
     cpq_type cpq_src;
     const std::size_t container_size;
@@ -164,29 +155,31 @@ struct CPQSrcFixture {
         std::size_t& mact = MoveOperationTracker::move_assign_called_times;
         mcct = ccct = cact = mact = 0;
 
-        for (std::size_t i = 1; i <= container_size; ++i) { cpq_src.push(MoveOperationTracker(i)); }
+        for (std::size_t i = 1; i <= container_size; ++i) {
+            cpq_src.push(MoveOperationTracker(i));
+        }
         REQUIRE_MESSAGE(cpq_src.size() == container_size, "Error in test setup");
     }
 
-    CPQSrcFixture(std::size_t size = default_container_size)
+    CPQSrcFixture( std::size_t size = default_container_size )
         : CPQSrcFixture(typename cpq_type::allocator_type(), size) {}
 
-    CPQSrcFixture(const typename cpq_type::allocator_type& a, std::size_t size = default_container_size)
-        : cpq_src(a), container_size(size) {
+    CPQSrcFixture( const typename cpq_type::allocator_type& a, std::size_t size = default_container_size )
+        : cpq_src(a), container_size(size)
+    {
         init();
     }
-};// struct CPQSrcFixture
+}; // struct CPQSrcFixture
 
 void test_steal_move_ctor() {
     using fixture_type = CPQSrcFixture<>;
     using container_type = typename fixture_type::cpq_type;
     fixture_type fixture;
-    container_type src_copy {fixture.cpq_src};
+    container_type src_copy{fixture.cpq_src};
 
     SpecialMemberCalls previous = MoveOperationTracker::special_member_calls();
-    container_type dst {std::move(fixture.cpq_src)};
-    REQUIRE_MESSAGE(previous == MoveOperationTracker::special_member_calls(),
-                    "Steal move ctor should not create any new elements");
+    container_type dst{std::move(fixture.cpq_src)};
+    REQUIRE_MESSAGE(previous == MoveOperationTracker::special_member_calls(), "Steal move ctor should not create any new elements");
     REQUIRE_MESSAGE(dst == src_copy, "cpq content changed during steal move");
     REQUIRE_MESSAGE(!(dst != src_copy), "cpq content changed during steal move");
 }
@@ -201,8 +194,7 @@ void test_steal_move_ctor_with_allocator() {
 
     SpecialMemberCalls previous = MoveOperationTracker::special_member_calls();
     fixture_type::cpq_type dst(std::move(fixture.cpq_src), arena_fixture.source_allocator);
-    REQUIRE_MESSAGE(previous == MoveOperationTracker::special_member_calls(),
-                    "Steal move ctor should not create any new elements");
+    REQUIRE_MESSAGE(previous == MoveOperationTracker::special_member_calls(), "Steal move ctor should not create any new elements");
     REQUIRE_MESSAGE(dst == src_copy, "cpq content changed during steal move");
     REQUIRE_MESSAGE(!(dst != src_copy), "cpq content changed during steal move");
 }
@@ -235,16 +227,14 @@ void test_steal_move_assign_operator() {
     SpecialMemberCalls previous = MoveOperationTracker::special_member_calls();
     dst = std::move(fixture.cpq_src);
 
-    REQUIRE_MESSAGE(previous == MoveOperationTracker::special_member_calls(),
-                    "Steal move assign operator should not create any new elements");
+    REQUIRE_MESSAGE(previous == MoveOperationTracker::special_member_calls(), "Steal move assign operator should not create any new elements");
     REQUIRE_MESSAGE(dst == src_copy, "cpq content changed during steal move assignment");
     REQUIRE_MESSAGE(!(dst != src_copy), "cpq content changed during steal move assignment");
 }
 
 void test_steal_move_assign_operator_with_stateful_allocator() {
     // Use stateful allocator which is propagated on move assignment
-    using arena_fixture_type
-            = move_support_tests::TwoMemoryArenasFixture<MoveOperationTracker, /*POCMA = */ std::true_type>;
+    using arena_fixture_type = move_support_tests::TwoMemoryArenasFixture<MoveOperationTracker, /*POCMA = */std::true_type>;
     using fixture_type = CPQSrcFixture<arena_fixture_type::allocator_type>;
 
     arena_fixture_type arena_fixture(8 * fixture_type::default_container_size);
@@ -254,16 +244,14 @@ void test_steal_move_assign_operator_with_stateful_allocator() {
 
     SpecialMemberCalls previous = MoveOperationTracker::special_member_calls();
     dst = std::move(fixture.cpq_src);
-    REQUIRE_MESSAGE(previous == MoveOperationTracker::special_member_calls(),
-                    "Steal move assign operator should not create any new elements");
+    REQUIRE_MESSAGE(previous == MoveOperationTracker::special_member_calls(), "Steal move assign operator should not create any new elements");
     REQUIRE_MESSAGE(dst == src_copy, "cpq content changed during steal move assignment");
     REQUIRE_MESSAGE(!(dst != src_copy), "cpq content changed during steal move assignment");
 }
 
 void test_per_element_move_assign_operator() {
     // Use stateful allocator which is not prepagated on move assignment
-    using arena_fixture_type
-            = move_support_tests::TwoMemoryArenasFixture<MoveOperationTracker, /*POCMA = */ std::false_type>;
+    using arena_fixture_type = move_support_tests::TwoMemoryArenasFixture<MoveOperationTracker, /*POCMA = */std::false_type>;
     using fixture_type = CPQSrcFixture<arena_fixture_type::allocator_type>;
 
     arena_fixture_type arena_fixture(8 * fixture_type::default_container_size);
@@ -292,41 +280,42 @@ void test_cpq_move_assignment() {
     test_per_element_move_assign_operator();
 }
 
+
 struct NoDefaultCtorType {
     NoDefaultCtorType() = delete;
 
-    NoDefaultCtorType(std::size_t val1, std::size_t val2) : value1(val1), value2(val2) {}
+    NoDefaultCtorType( std::size_t val1, std::size_t val2 ) : value1(val1), value2(val2) {}
     bool operator<(const NoDefaultCtorType& other) const {
         return value1 + value2 < other.value1 + other.value2;
     }
 
     std::size_t value1, value2;
-};// struct NoDefaultCtorType
+}; // struct NoDefaultCtorType
 
 struct ForwardInEmplaceTester {
     int a;
     static bool move_ctor_called;
     static bool move_assign_called;
 
-    ForwardInEmplaceTester(int val) : a(val) {}
-    ForwardInEmplaceTester(const ForwardInEmplaceTester&) = default;
-    ForwardInEmplaceTester(ForwardInEmplaceTester&&) = default;
+    ForwardInEmplaceTester( int val ) : a(val) {}
+    ForwardInEmplaceTester( const ForwardInEmplaceTester& ) = default;
+    ForwardInEmplaceTester( ForwardInEmplaceTester&& ) = default;
 
-    ForwardInEmplaceTester(ForwardInEmplaceTester&& obj, int val) : a(obj.a) {
+    ForwardInEmplaceTester( ForwardInEmplaceTester&& obj, int val ) : a(obj.a) {
         move_ctor_called = true;
         obj.a = val;
     }
 
-    ForwardInEmplaceTester& operator=(const ForwardInEmplaceTester&) = default;
+    ForwardInEmplaceTester& operator=( const ForwardInEmplaceTester& ) = default;
 
-    ForwardInEmplaceTester& operator=(ForwardInEmplaceTester&& obj) {
+    ForwardInEmplaceTester& operator=( ForwardInEmplaceTester&& obj ) {
         a = obj.a;
         move_assign_called = true;
         return *this;
     }
 
-    bool operator<(const ForwardInEmplaceTester&) const { return true; }
-};// struct ForwardInEmplaceTester
+    bool operator<( const ForwardInEmplaceTester& ) const { return true; }
+}; // struct ForwardInEmplaceTester
 
 bool ForwardInEmplaceTester::move_ctor_called = false;
 bool ForwardInEmplaceTester::move_assign_called = false;
@@ -343,7 +332,7 @@ void test_move_support_in_push_pop() {
     REQUIRE_MESSAGE(mcct == 0, "Value must be zero-initialized");
     REQUIRE_MESSAGE(ccct == 0, "Value must be zero-initialized");
 
-    q1.push(MoveOperationTracker {});
+    q1.push(MoveOperationTracker{});
     REQUIRE_MESSAGE(mcct > 0, "Not working push(T&&)");
     REQUIRE_MESSAGE(ccct == 0, "Copying of arg occurred during push(T&&)");
 
@@ -375,13 +364,12 @@ void test_move_support_in_push_pop() {
 
     oneapi::tbb::concurrent_priority_queue<ForwardInEmplaceTester> q3;
     REQUIRE(ForwardInEmplaceTester::move_ctor_called == false);
-    q3.emplace(ForwardInEmplaceTester {5}, 2);
+    q3.emplace(ForwardInEmplaceTester{5}, 2);
     REQUIRE_MESSAGE(ForwardInEmplaceTester::move_ctor_called == true, "Not used std::forward in emplace()");
     ForwardInEmplaceTester obj(0);
     q3.try_pop(obj);
 
-    REQUIRE_MESSAGE(ForwardInEmplaceTester::move_assign_called == true,
-                    "Not used move assignment in try_pop");
+    REQUIRE_MESSAGE(ForwardInEmplaceTester::move_assign_called == true, "Not used move assignment in try_pop");
     REQUIRE_MESSAGE(obj.a == 5, "Not used std::forward in emplace");
     REQUIRE_MESSAGE(!q3.try_pop(obj), "The queue should be empty");
 }
@@ -390,10 +378,10 @@ void test_move_support_in_push_pop() {
 template <typename T>
 class LessA : public std::less<T> {
 public:
-    explicit LessA(bool no_assert = false) {
+    explicit LessA( bool no_assert = false ) {
         REQUIRE_MESSAGE(no_assert, "Default ctor should not be called");
     }
-};// class LessA
+}; // class LessA
 
 // TODO: consider use of TEST_SUITE for these tests
 // TODO: combine with the constructors test from the common part
@@ -403,8 +391,7 @@ void test_ctors_dtor_accessors() {
 
     using cpq_type = oneapi::tbb::concurrent_priority_queue<int, std::less<int>>;
     using cpq_with_compare_type = oneapi::tbb::concurrent_priority_queue<int, LessA<int>>;
-    using cpq_with_compare_and_allocator_type
-            = oneapi::tbb::concurrent_priority_queue<int, LessA<int>, std::allocator<int>>;
+    using cpq_with_compare_and_allocator_type = oneapi::tbb::concurrent_priority_queue<int, LessA<int>, std::allocator<int>>;
 
     LessA<int> l(true);
 
@@ -439,7 +426,9 @@ void test_ctors_dtor_accessors() {
     REQUIRE_MESSAGE(cpq6.empty(), "Failed empty test for capacity+compare+allocator ctor");
 
     // Test half-open range ctor
-    for (int i = 0; i < 42; ++i) { v.emplace_back(i); }
+    for (int i = 0; i < 42; ++i) {
+        v.emplace_back(i);
+    }
     using equality_comparison_helpers::toVector;
     cpq_type cpq7(v.begin(), v.end());
     REQUIRE_MESSAGE(cpq7.size() == 42, "Failed size test for half-open range ctor");
@@ -465,7 +454,8 @@ void test_assignment_clear_swap() {
     std::vector<int> v;
     int e;
 
-    for (int i = 0; i < 42; ++i) v.emplace_back(i);
+    for( int i = 0; i < 42; ++i )
+        v.emplace_back(i);
 
     cpq_type q(v.begin(), v.end());
     cpq_type qo;
@@ -491,13 +481,15 @@ void test_assignment_clear_swap() {
     REQUIRE_MESSAGE(q.empty(), "Failed clear empty test");
 
     // Test assignment again
-    for (std::size_t i = 0; i < 5; ++i) qo.try_pop(e);
+    for (std::size_t i = 0; i < 5; ++i)
+        qo.try_pop(e);
 
     q = qo;
     REQUIRE_MESSAGE(q.size() == 37, "Failed assignment size test");
     REQUIRE_MESSAGE(!q.empty(), "Failed assignment empty test");
 
-    for (std::size_t i = 0; i < 5; ++i) qo.try_pop(e);
+    for (std::size_t i = 0; i < 5; ++i)
+        qo.try_pop(e);
 
     q.swap(qo);
 
@@ -516,14 +508,14 @@ void test_serial_push_pop() {
     // Test serial push
     for (std::size_t i = 0; i < MAX_ITER; ++i) {
         push_selector(q, e, i);
-        e = e * -1 + int(i);
+        e = e*-1 + int(i);
     }
 
     REQUIRE_MESSAGE(q.size() == MAX_ITER, "Failed push size test");
     REQUIRE_MESSAGE(!q.empty(), "Failed push empty test");
 
     // Test serial pop
-    while (!q.empty()) {
+    while(!q.empty()) {
         REQUIRE_MESSAGE(q.try_pop(e), "Failed pop test");
         REQUIRE_MESSAGE(prev >= e, "Failed pop priority test");
         prev = e;
@@ -537,19 +529,20 @@ void test_serial_push_pop() {
 
 void test_concurrent(std::size_t n) {
     test_parallel_push_pop<std::less<int>>(n, INT_MAX, INT_MIN);
-    test_parallel_push_pop<std::less<int>>(n, (unsigned char) CHAR_MAX, (unsigned char) CHAR_MIN);
+    test_parallel_push_pop<std::less<int>>(n, (unsigned char)CHAR_MAX, (unsigned char)CHAR_MIN);
 
     test_flogger<std::less<int>, int>(n);
     test_flogger<std::less<int>, unsigned char>(n);
 
     MoveOperationTrackerConc::copy_assign_called_times = 0;
     test_flogger<std::less<MoveOperationTrackerConc>, MoveOperationTrackerConc>(n);
-    REQUIRE_MESSAGE(MoveOperationTrackerConc::copy_assign_called_times == 0,
-                    "Copy assignment called during try_pop");
+    REQUIRE_MESSAGE(MoveOperationTrackerConc::copy_assign_called_times == 0, "Copy assignment called during try_pop");
 }
 
 void test_multithreading() {
-    for (std::size_t n = utils::MinThread; n != utils::MaxThread; ++n) { test_concurrent(n); }
+    for (std::size_t n = utils::MinThread; n != utils::MaxThread; ++n) {
+        test_concurrent(n);
+    }
 }
 
 struct CPQTraits {
@@ -558,25 +551,24 @@ struct CPQTraits {
 
     template <typename T, typename Allocator>
     using container_type = oneapi::tbb::concurrent_priority_queue<T, std::less<T>, Allocator>;
-};// struct CPQTraits
+}; // struct CPQTraits
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
-template <template <typename...> typename TQueue>
+template <template <typename...>typename TQueue>
 void TestDeductionGuides() {
     using ComplexType = const std::string*;
     std::string s("s");
     std::vector<ComplexType> v;
-    auto l = {ComplexType(&s), ComplexType(&s)};
+    auto l = {ComplexType(&s), ComplexType(&s) };
 
     // check TQueue(InputIterator, InputIterator)
     TQueue qv(v.begin(), v.end());
-    static_assert(std::is_same<decltype(qv), TQueue<ComplexType>>::value);
+    static_assert(std::is_same<decltype(qv), TQueue<ComplexType> >::value);
 
     // check TQueue(InputIterator, InputIterator, Allocator)
     TQueue qva(v.begin(), v.end(), std::allocator<ComplexType>());
-    static_assert(
-            std::is_same<decltype(qva),
-                         TQueue<ComplexType, std::less<ComplexType>, std::allocator<ComplexType>>>::value);
+    static_assert(std::is_same<decltype(qva), TQueue<ComplexType, std::less<ComplexType>,
+        std::allocator<ComplexType>>>::value);
 
     // check TQueue(InputIterator, InputIterator, Compare)
     TQueue qvc(v.begin(), v.end(), LessA<ComplexType>(true));
@@ -584,8 +576,8 @@ void TestDeductionGuides() {
 
     // check TQueue(InputIterator, InputIterator, Compare, Allocator)
     TQueue qvca(v.begin(), v.end(), LessA<ComplexType>(true), std::allocator<ComplexType>());
-    static_assert(std::is_same<decltype(qvca),
-                               TQueue<ComplexType, LessA<ComplexType>, std::allocator<ComplexType>>>::value);
+    static_assert(std::is_same<decltype(qvca), TQueue<ComplexType, LessA<ComplexType>,
+        std::allocator<ComplexType>>>::value);
 
     // check TQueue(std::initializer_list)
     TQueue ql(l);
@@ -593,9 +585,8 @@ void TestDeductionGuides() {
 
     // check TQueue(std::initializer_list, Allocator)
     TQueue qla(l, std::allocator<ComplexType>());
-    static_assert(
-            std::is_same<decltype(qla),
-                         TQueue<ComplexType, std::less<ComplexType>, std::allocator<ComplexType>>>::value);
+    static_assert(std::is_same<decltype(qla), TQueue<ComplexType, std::less<ComplexType>,
+        std::allocator<ComplexType>>>::value);
 
     // check TQueue(std::initializer_list, Compare)
     TQueue qlc(l, LessA<ComplexType>(true));
@@ -603,8 +594,8 @@ void TestDeductionGuides() {
 
     // check TQueue(std::initializer_list, Compare, Allocator)
     TQueue qlca(l, LessA<ComplexType>(true), std::allocator<ComplexType>());
-    static_assert(std::is_same<decltype(qlca),
-                               TQueue<ComplexType, LessA<ComplexType>, std::allocator<ComplexType>>>::value);
+    static_assert(std::is_same<decltype(qlca), TQueue<ComplexType, LessA<ComplexType>,
+        std::allocator<ComplexType>>>::value);
 
     // check TQueue(TQueue &)
     TQueue qc(qv);
@@ -622,19 +613,19 @@ void TestDeductionGuides() {
     TQueue qma(std::move(qva), std::allocator<ComplexType>());
     static_assert(std::is_same<decltype(qma), decltype(qva)>::value);
 }
-#endif// __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
+#endif // __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 
 template <typename CPQType>
 void TestComparisonsBasic() {
     using comparisons_testing::testEqualityComparisons;
     CPQType c1, c2;
-    testEqualityComparisons</*ExpectEqual = */ true>(c1, c2);
+    testEqualityComparisons</*ExpectEqual = */true>(c1, c2);
 
     c1.emplace(1);
-    testEqualityComparisons</*ExpectEqual = */ false>(c1, c2);
+    testEqualityComparisons</*ExpectEqual = */false>(c1, c2);
 
     c2.emplace(1);
-    testEqualityComparisons</*ExpectEqual = */ true>(c1, c2);
+    testEqualityComparisons</*ExpectEqual = */true>(c1, c2);
 }
 
 template <typename TwoWayComparableCPQType>
@@ -651,8 +642,7 @@ void TestTwoWayComparableCPQ() {
 
 void TestCPQComparisons() {
     using integral_container = oneapi::tbb::concurrent_priority_queue<int>;
-    using two_way_comparable_container
-            = oneapi::tbb::concurrent_priority_queue<comparisons_testing::TwoWayComparable>;
+    using two_way_comparable_container = oneapi::tbb::concurrent_priority_queue<comparisons_testing::TwoWayComparable>;
 
     TestComparisonsBasic<integral_container>();
     TestComparisonsBasic<two_way_comparable_container>();
@@ -662,39 +652,55 @@ void TestCPQComparisons() {
 // Testing basic operations with concurrent_priority_queue with integral value type
 //! \brief \ref interface \ref requirement
 TEST_CASE("basic test for concurrent_priority_queue") {
-    test_to_vector();// Test concurrent_priority_queue helper
+    test_to_vector(); // Test concurrent_priority_queue helper
     test_basic();
 }
 
 // Testing std::initializer_list interfaces in concurrent_priority_queue
 //! \brief \ref interface \ref requirement
-TEST_CASE("std::initializer_list support in concurrent_priority_queue") { test_initializer_list(); }
+TEST_CASE("std::initializer_list support in concurrent_priority_queue") {
+    test_initializer_list();
+}
 
 //! Testing concurrent_priority_queue moving constructors
 //! \brief \ref interface \ref requirement
-TEST_CASE("concurrent_priority_queue move constructor") { test_cpq_move_constructor(); }
+TEST_CASE("concurrent_priority_queue move constructor") {
+    test_cpq_move_constructor();
+}
 
 //! Testing concurrent_priority_queue move assignment operator with different allocator types
 //! \brief \ref interface \ref requirement
-TEST_CASE("concurrent_priority_queue move assignment operator") { test_cpq_move_assignment(); }
+TEST_CASE("concurrent_priority_queue move assignment operator") {
+    test_cpq_move_assignment();
+}
 
 //! Testing move semantics on basic push-pop operations
 //! \brief \ref requirement
-TEST_CASE("move semantics support on push-pop operations") { test_move_support_in_push_pop(); }
+TEST_CASE("move semantics support on push-pop operations") {
+    test_move_support_in_push_pop();
+}
 
 //! \brief \ref interface \ref requirement
-TEST_CASE("constructors, destructor and accessors") { test_ctors_dtor_accessors(); }
+TEST_CASE("constructors, destructor and accessors") {
+    test_ctors_dtor_accessors();
+}
 
 //! \brief \ref interface \ref requirement
-TEST_CASE("assignment, clear and swap operations") { test_assignment_clear_swap(); }
+TEST_CASE("assignment, clear and swap operations") {
+    test_assignment_clear_swap();
+}
 
 //! Testing push-pop operations in concurrent_priority_queue
 //! \brief \ref requirement
-TEST_CASE("serial push-pop") { test_serial_push_pop(); }
+TEST_CASE("serial push-pop") {
+    test_serial_push_pop();
+}
 
 //! Testing push-pop operations in concurrent_priority_queue with multithreading
 //! \brief \ref requirement
-TEST_CASE("multithreading support in concurrent_priority_queue") { test_multithreading(); }
+TEST_CASE("multithreading support in concurrent_priority_queue") {
+    test_multithreading();
+}
 
 #if !_MSC_VER || _MSC_VER > 1900
 // MSVC 2015 does not provide required level of allocator support for standard containers
@@ -711,7 +717,9 @@ TEST_CASE("std::allocator_traits support in concurrent_priority_queue") {
 TEST_CASE("CTAD support in concurrent_priority_queue") {
     TestDeductionGuides<oneapi::tbb::concurrent_priority_queue>();
 }
-#endif// __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
+#endif // __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 
 //! \brief \ref interface \ref requirement
-TEST_CASE("concurrent_priority_queue iterator comparisons") { TestCPQComparisons(); }
+TEST_CASE("concurrent_priority_queue iterator comparisons") {
+    TestCPQComparisons();
+}
diff --git a/external/tbb/test/conformance/conformance_concurrent_queue.cpp b/external/tbb/test/conformance/conformance_concurrent_queue.cpp
index 6b51cb46..9bda9a46 100644
--- a/external/tbb/test/conformance/conformance_concurrent_queue.cpp
+++ b/external/tbb/test/conformance/conformance_concurrent_queue.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -14,17 +14,17 @@
     limitations under the License.
 */
 
-#include <common/container_move_support.h>
-#include <common/custom_allocators.h>
 #include <common/test.h>
-#include <common/test_comparisons.h>
 #include <common/utils.h>
 #include <common/utils_report.h>
+#include <common/custom_allocators.h>
+#include <common/container_move_support.h>
+#include <common/test_comparisons.h>
 
-#include "oneapi/tbb/cache_aligned_allocator.h"
 #include "oneapi/tbb/concurrent_queue.h"
-#include <atomic>
+#include "oneapi/tbb/cache_aligned_allocator.h"
 #include <type_traits>
+#include <atomic>
 
 //! \file conformance_concurrent_queue.cpp
 //! \brief Test for [containers.concurrent_queue containers.concurrent_bounded_queue] specification
@@ -42,43 +42,40 @@ static std::atomic<long> PopKind[3];
 
 static int Sum[MAXTHREAD];
 
-template <typename CQ, typename ValueType, typename CounterType>
+template<typename CQ, typename ValueType, typename CounterType>
 void push(CQ& q, ValueType v, CounterType i) {
     switch (i % 3) {
-        case 0:
-            q.push(v);
-            break;
-        case 1:
-            q.push(std::move(v));
-            break;
-        case 2:
-            q.emplace(v);
-            break;
-        default:
-            CHECK(false);
-            break;
+        case 0: q.push( v); break;
+        case 1: q.push( std::move(v)); break;
+        case 2: q.emplace( v); break;
+        default: CHECK(false); break;
     }
 }
 
-template <typename T>
+template<typename T>
 class ConcQWithCapacity : public oneapi::tbb::concurrent_queue<T, test_allocator<T>> {
     using base_type = oneapi::tbb::concurrent_queue<T, test_allocator<T>>;
-
 public:
-    ConcQWithCapacity() : my_capacity(std::size_t(-1) / (sizeof(void*) + sizeof(T))) {}
-    std::size_t size() const { return this->unsafe_size(); }
+    ConcQWithCapacity() : my_capacity( std::size_t(-1) / (sizeof(void*) + sizeof(T)) ) {}
+    std::size_t size() const {
+        return this->unsafe_size();
+    }
 
-    std::size_t capacity() const { return my_capacity; }
+    std::size_t capacity() const {
+        return my_capacity;
+    }
 
-    void set_capacity(const std::size_t n) { my_capacity = n; }
+    void set_capacity( const std::size_t n ) {
+        my_capacity = n;
+    }
 
-    bool try_push(const T& source) {
-        base_type::push(source);
+    bool try_push( const T& source ) {
+        base_type::push( source);
         return source.get_serial() < my_capacity;
     }
 
-    bool try_pop(T& dest) {
-        base_type::try_pop(dest);
+    bool try_pop( T& dest ) {
+        base_type::try_pop( dest);
         return dest.get_serial() < my_capacity;
     }
 
@@ -86,12 +83,12 @@ class ConcQWithCapacity : public oneapi::tbb::concurrent_queue<T, test_allocator
     std::size_t my_capacity;
 };
 
-template <typename CQ, typename T>
+template<typename CQ, typename T>
 void TestEmptyQueue() {
     const CQ queue;
     CHECK(queue.size() == 0);
-    CHECK(queue.capacity() > 0);
-    CHECK(size_t(queue.capacity()) >= std::size_t(-1) / (sizeof(void*) + sizeof(T)));
+    CHECK(queue.capacity()> 0);
+    CHECK(size_t(queue.capacity())>= std::size_t(-1)/(sizeof(void*)+sizeof(T)));
 }
 
 void TestEmptiness() {
@@ -99,11 +96,10 @@ void TestEmptiness() {
     TestEmptyQueue<ConcQWithCapacity<move_support_tests::Foo>, move_support_tests::Foo>();
     TestEmptyQueue<oneapi::tbb::concurrent_bounded_queue<char, test_allocator<char>>, char>();
     TestEmptyQueue<oneapi::tbb::concurrent_bounded_queue<move_support_tests::Foo,
-                                                         test_allocator<move_support_tests::Foo>>,
-                   move_support_tests::Foo>();
+           test_allocator<move_support_tests::Foo>>, move_support_tests::Foo>();
 }
 
-template <typename CQ, typename T>
+template<typename CQ, typename T>
 void TestFullQueue() {
     using allocator_type = decltype(std::declval<CQ>().get_allocator());
 
@@ -115,7 +111,7 @@ void TestFullQueue() {
             for (std::size_t i = 0; i <= n; ++i) {
                 T f;
                 f.set_serial(i);
-                bool result = queue.try_push(f);
+                bool result = queue.try_push( f);
                 CHECK((result == (i < n)));
             }
 
@@ -133,12 +129,10 @@ void TestFullQueue() {
 
 void TestFullness() {
     TestFullQueue<ConcQWithCapacity<move_support_tests::Foo>, move_support_tests::Foo>();
-    TestFullQueue<oneapi::tbb::concurrent_bounded_queue<move_support_tests::Foo,
-                                                        test_allocator<move_support_tests::Foo>>,
-                  move_support_tests::Foo>();
+    TestFullQueue<oneapi::tbb::concurrent_bounded_queue<move_support_tests::Foo, test_allocator<move_support_tests::Foo>>, move_support_tests::Foo>();
 }
 
-template <typename CQ>
+template<typename CQ>
 void TestClear() {
     using allocator_type = decltype(std::declval<CQ>().get_allocator());
     allocator_type::init_counters();
@@ -157,11 +151,11 @@ void TestClear() {
     CHECK(queue.size() == n);
 
     queue.clear();
-    CHECK(queue.size() == 0);
+    CHECK(queue.size()==0);
     for (std::size_t i = 0; i < n; ++i) {
         move_support_tests::Foo f;
         f.set_serial(i);
-        queue.push(f);
+        queue.push( f);
     }
 
     CHECK(queue.size() == n);
@@ -174,23 +168,22 @@ void TestClear() {
         queue.push(f);
     }
 
-    CHECK(queue.size() == n);
+    CHECK(queue.size()==n);
 }
 
 void TestClearWorks() {
     TestClear<ConcQWithCapacity<move_support_tests::Foo>>();
-    TestClear<oneapi::tbb::concurrent_bounded_queue<move_support_tests::Foo,
-                                                    test_allocator<move_support_tests::Foo>>>();
+    TestClear<oneapi::tbb::concurrent_bounded_queue<move_support_tests::Foo, test_allocator<move_support_tests::Foo>>>();
 }
 
-template <typename Iterator1, typename Iterator2>
-void TestIteratorAux(Iterator1 i, Iterator2 j, int size) {
-    Iterator1 old_i;// assigned at first iteration below
-    for (std::size_t k = 0; k < (std::size_t) size; ++k) {
+template<typename Iterator1, typename Iterator2>
+void TestIteratorAux( Iterator1 i, Iterator2 j, int size ) {
+    Iterator1 old_i; // assigned at first iteration below
+    for (std::size_t k = 0; k < (std::size_t)size; ++k) {
         CHECK_FAST(i != j);
         CHECK_FAST(!(i == j));
         // Test "->"
-        CHECK_FAST((k + 1 == i->get_serial()));
+        CHECK_FAST((k+1 == i->get_serial()));
         if (k & 1) {
             // Test post-increment
             move_support_tests::Foo f = *old_i++;
@@ -202,8 +195,7 @@ void TestIteratorAux(Iterator1 i, Iterator2 j, int size) {
             if (k < std::size_t(size - 1)) {
                 move_support_tests::Foo f = *++i;
                 CHECK_FAST((k + 2 == f.get_serial()));
-            } else
-                ++i;
+            } else ++i;
             // Test assignment
             old_i = i;
         }
@@ -212,8 +204,8 @@ void TestIteratorAux(Iterator1 i, Iterator2 j, int size) {
     CHECK_FAST(i == j);
 }
 
-template <typename Iterator1, typename Iterator2>
-void TestIteratorAssignment(Iterator2 j) {
+template<typename Iterator1, typename Iterator2>
+void TestIteratorAssignment( Iterator2 j ) {
     Iterator1 i(j);
     CHECK(i == j);
     CHECK(!(i != j));
@@ -224,10 +216,9 @@ void TestIteratorAssignment(Iterator2 j) {
     CHECK(!(k != j));
 }
 
-template <typename Iterator, typename T>
+template<typename Iterator, typename T>
 void TestIteratorTraits() {
-    static_assert(std::is_same<typename Iterator::iterator_category, std::forward_iterator_tag>::value,
-                  "wrong iterator category");
+    static_assert( std::is_same<typename Iterator::iterator_category, std::forward_iterator_tag>::value, "wrong iterator category");
 
     T x;
 
@@ -241,63 +232,63 @@ template <typename CQ>
 void TestIterator() {
     CQ queue;
     const CQ& const_queue = queue;
-    for (int j = 0; j < 500; ++j) {
-        TestIteratorAux(queue.unsafe_begin(), queue.unsafe_end(), j);
-        TestIteratorAux(queue.unsafe_cbegin(), queue.unsafe_cend(), j);
-        TestIteratorAux(const_queue.unsafe_begin(), const_queue.unsafe_end(), j);
-        TestIteratorAux(const_queue.unsafe_begin(), queue.unsafe_end(), j);
-        TestIteratorAux(queue.unsafe_begin(), const_queue.unsafe_end(), j);
+    for (int j=0; j < 500; ++j) {
+        TestIteratorAux( queue.unsafe_begin()      , queue.unsafe_end()      , j);
+        TestIteratorAux( queue.unsafe_cbegin()      , queue.unsafe_cend()      , j);
+        TestIteratorAux( const_queue.unsafe_begin(), const_queue.unsafe_end(), j);
+        TestIteratorAux( const_queue.unsafe_begin(), queue.unsafe_end()      , j);
+        TestIteratorAux( queue.unsafe_begin()      , const_queue.unsafe_end(), j);
         move_support_tests::Foo f;
-        f.set_serial(j + 1);
+        f.set_serial(j+1);
         queue.push(f);
     }
-    TestIteratorAssignment<typename CQ::const_iterator>(const_queue.unsafe_begin());
-    TestIteratorAssignment<typename CQ::const_iterator>(queue.unsafe_begin());
-    TestIteratorAssignment<typename CQ::iterator>(queue.unsafe_begin());
+    TestIteratorAssignment<typename CQ::const_iterator>( const_queue.unsafe_begin());
+    TestIteratorAssignment<typename CQ::const_iterator>( queue.unsafe_begin());
+    TestIteratorAssignment<typename CQ::iterator>( queue.unsafe_begin());
     TestIteratorTraits<typename CQ::const_iterator, const move_support_tests::Foo>();
     TestIteratorTraits<typename CQ::iterator, move_support_tests::Foo>();
 }
 
 void TestQueueIteratorWorks() {
-    TestIterator<oneapi::tbb::concurrent_queue<move_support_tests::Foo,
-                                               test_allocator<move_support_tests::Foo>>>();
-    TestIterator<oneapi::tbb::concurrent_bounded_queue<move_support_tests::Foo,
-                                                       test_allocator<move_support_tests::Foo>>>();
+    TestIterator<oneapi::tbb::concurrent_queue<move_support_tests::Foo, test_allocator<move_support_tests::Foo>>>();
+    TestIterator<oneapi::tbb::concurrent_bounded_queue<move_support_tests::Foo, test_allocator<move_support_tests::Foo>>>();
 }
 
 // Define wrapper classes to test oneapi::tbb::concurrent_queue<T>
-template <typename T, typename A = oneapi::tbb::cache_aligned_allocator<T>>
+template<typename T, typename A = oneapi::tbb::cache_aligned_allocator<T>>
 class ConcQWithSizeWrapper : public oneapi::tbb::concurrent_queue<T, A> {
 public:
     ConcQWithSizeWrapper() {}
-    ConcQWithSizeWrapper(const ConcQWithSizeWrapper& q) : oneapi::tbb::concurrent_queue<T, A>(q) {}
-    ConcQWithSizeWrapper(const ConcQWithSizeWrapper& q, const A& a)
-        : oneapi::tbb::concurrent_queue<T, A>(q, a) {}
-    ConcQWithSizeWrapper(const A& a) : oneapi::tbb::concurrent_queue<T, A>(a) {}
+    ConcQWithSizeWrapper( const ConcQWithSizeWrapper& q ) : oneapi::tbb::concurrent_queue<T, A>(q) {}
+    ConcQWithSizeWrapper( const ConcQWithSizeWrapper& q, const A& a ) : oneapi::tbb::concurrent_queue<T, A>(q, a) {}
+    ConcQWithSizeWrapper( const A& a ) : oneapi::tbb::concurrent_queue<T, A>( a ) {}
 
-    ConcQWithSizeWrapper(ConcQWithSizeWrapper&& q) : oneapi::tbb::concurrent_queue<T>(std::move(q)) {}
-    ConcQWithSizeWrapper(ConcQWithSizeWrapper&& q, const A& a)
-        : oneapi::tbb::concurrent_queue<T, A>(std::move(q), a) {}
+    ConcQWithSizeWrapper( ConcQWithSizeWrapper&& q ) : oneapi::tbb::concurrent_queue<T>(std::move(q)) {}
+    ConcQWithSizeWrapper( ConcQWithSizeWrapper&& q, const A& a )
+        : oneapi::tbb::concurrent_queue<T, A>(std::move(q), a) { }
 
-    template <typename InputIterator>
-    ConcQWithSizeWrapper(InputIterator begin, InputIterator end, const A& a = A())
+    template<typename InputIterator>
+    ConcQWithSizeWrapper( InputIterator begin, InputIterator end, const A& a = A() )
         : oneapi::tbb::concurrent_queue<T, A>(begin, end, a) {}
     typename oneapi::tbb::concurrent_queue<T, A>::size_type size() const { return this->unsafe_size(); }
 };
 
-enum state_type { LIVE = 0x1234, DEAD = 0xDEAD };
+enum state_type {
+    LIVE = 0x1234,
+    DEAD = 0xDEAD
+};
 
 class Bar {
     state_type state;
-
 public:
     static std::size_t construction_num, destruction_num;
     std::ptrdiff_t my_id;
-    Bar() : state(LIVE), my_id(-1) {}
+    Bar() : state(LIVE), my_id(-1)
+    {}
 
-    Bar(std::size_t _i) : state(LIVE), my_id(_i) { construction_num++; }
+    Bar( std::size_t _i ) : state(LIVE), my_id(_i) { construction_num++; }
 
-    Bar(const Bar& a_bar) : state(LIVE) {
+    Bar( const Bar& a_bar ) : state(LIVE) {
         CHECK_FAST(a_bar.state == LIVE);
         my_id = a_bar.my_id;
         construction_num++;
@@ -310,18 +301,18 @@ class Bar {
         destruction_num++;
     }
 
-    void operator=(const Bar& a_bar) {
+    void operator=( const Bar& a_bar ) {
         CHECK_FAST(a_bar.state == LIVE);
         CHECK_FAST(state == LIVE);
         my_id = a_bar.my_id;
     }
-    friend bool operator==(const Bar& bar1, const Bar& bar2);
+    friend bool operator==( const Bar& bar1, const Bar& bar2 ) ;
 };
 
 std::size_t Bar::construction_num = 0;
 std::size_t Bar::destruction_num = 0;
 
-bool operator==(const Bar& bar1, const Bar& bar2) {
+bool operator==( const Bar& bar1, const Bar& bar2 ) {
     CHECK_FAST(bar1.state == LIVE);
     CHECK_FAST(bar2.state == LIVE);
     return bar1.my_id == bar2.my_id;
@@ -330,9 +321,10 @@ bool operator==(const Bar& bar1, const Bar& bar2) {
 class BarIterator {
     Bar* bar_ptr;
     BarIterator(Bar* bp_) : bar_ptr(bp_) {}
-
 public:
-    Bar& operator*() const { return *bar_ptr; }
+    Bar& operator*() const {
+        return *bar_ptr;
+    }
     BarIterator& operator++() {
         ++bar_ptr;
         return *this;
@@ -342,43 +334,54 @@ class BarIterator {
         operator++();
         return result;
     }
-    friend bool operator==(const BarIterator& bia, const BarIterator& bib);
-    friend bool operator!=(const BarIterator& bia, const BarIterator& bib);
-    template <typename CQ, typename T, typename TIter, typename CQ_EX, typename T_EX>
-    friend void TestConstructors();
-};
+    friend bool operator==(const BarIterator& bia, const BarIterator& bib) ;
+    friend bool operator!=(const BarIterator& bia, const BarIterator& bib) ;
+    template<typename CQ, typename T, typename TIter, typename CQ_EX, typename T_EX>
+    friend void TestConstructors ();
+} ;
+
+bool operator==(const BarIterator& bia, const BarIterator& bib) {
+    return bia.bar_ptr==bib.bar_ptr;
+}
 
-bool operator==(const BarIterator& bia, const BarIterator& bib) { return bia.bar_ptr == bib.bar_ptr; }
+bool operator!=(const BarIterator& bia, const BarIterator& bib) {
+    return bia.bar_ptr!=bib.bar_ptr;
+}
 
-bool operator!=(const BarIterator& bia, const BarIterator& bib) { return bia.bar_ptr != bib.bar_ptr; }
 
 class Bar_exception : public std::bad_alloc {
 public:
-    virtual const char* what() const noexcept override { return "making the entry invalid"; }
+    virtual const char *what() const noexcept override { return "making the entry invalid"; }
     virtual ~Bar_exception() noexcept {}
 };
 
 class BarEx {
     static int count;
-
 public:
     state_type state;
-    typedef enum { PREPARATION, COPY_CONSTRUCT } mode_type;
+    typedef enum {
+        PREPARATION,
+        COPY_CONSTRUCT
+    } mode_type;
     static mode_type mode;
     std::ptrdiff_t my_id;
     std::ptrdiff_t my_tilda_id;
 
     static int button;
 
-    BarEx() : state(LIVE), my_id(-1), my_tilda_id(-1) {}
+    BarEx() : state(LIVE), my_id(-1), my_tilda_id(-1)
+    {}
 
-    BarEx(std::size_t _i) : state(LIVE), my_id(_i), my_tilda_id(my_id ^ (-1)) {}
+    BarEx(std::size_t _i) : state(LIVE), my_id(_i), my_tilda_id(my_id^(-1))
+    {}
 
-    BarEx(const BarEx& a_bar) : state(LIVE) {
+    BarEx( const BarEx& a_bar ) : state(LIVE) {
         CHECK_FAST(a_bar.state == LIVE);
         my_id = a_bar.my_id;
         if (mode == PREPARATION)
-            if (!(++count % 100)) { TBB_TEST_THROW(Bar_exception()); }
+            if (!(++count % 100)) {
+                TBB_TEST_THROW(Bar_exception());
+            }
         my_tilda_id = a_bar.my_tilda_id;
     }
 
@@ -387,16 +390,16 @@ class BarEx {
         state = DEAD;
         my_id = DEAD;
     }
-    static void set_mode(mode_type m) { mode = m; }
+    static void set_mode( mode_type m ) { mode = m; }
 
-    void operator=(const BarEx& a_bar) {
+    void operator=( const BarEx& a_bar ) {
         CHECK_FAST(a_bar.state == LIVE);
         CHECK_FAST(state == LIVE);
         my_id = a_bar.my_id;
         my_tilda_id = a_bar.my_tilda_id;
     }
 
-    friend bool operator==(const BarEx& bar1, const BarEx& bar2);
+    friend bool operator==(const BarEx& bar1, const BarEx& bar2 ) ;
 };
 
 int BarEx::count = 0;
@@ -410,8 +413,8 @@ bool operator==(const BarEx& bar1, const BarEx& bar2) {
     return bar1.my_id == bar2.my_id && bar1.my_tilda_id == bar2.my_tilda_id;
 }
 
-template <typename CQ, typename T, typename TIter, typename CQ_EX, typename T_EX>
-void TestConstructors() {
+template<typename CQ, typename T, typename TIter, typename CQ_EX, typename T_EX>
+void TestConstructors () {
     CQ src_queue;
     typename CQ::const_iterator dqb;
     typename CQ::const_iterator dqe;
@@ -419,9 +422,10 @@ void TestConstructors() {
     using size_type = typename CQ::size_type;
 
     for (size_type size = 0; size < 1001; ++size) {
-        for (size_type i = 0; i < size; ++i) src_queue.push(T(i + (i ^ size)));
-        typename CQ::const_iterator sqb(src_queue.unsafe_begin());
-        typename CQ::const_iterator sqe(src_queue.unsafe_end());
+        for (size_type i = 0; i < size; ++i)
+            src_queue.push(T(i + (i ^ size)));
+        typename CQ::const_iterator sqb( src_queue.unsafe_begin());
+        typename CQ::const_iterator sqe( src_queue.unsafe_end()  );
 
         CQ dst_queue(sqb, sqe);
         CQ copy_with_alloc(src_queue, typename CQ::allocator_type());
@@ -433,8 +437,10 @@ void TestConstructors() {
     }
 
     T bar_array[1001];
-    for (size_type size = 0; size < 1001; ++size) {
-        for (size_type i = 0; i < size; ++i) { bar_array[i] = T(i + (i ^ size)); }
+    for (size_type size=0; size < 1001; ++size) {
+        for (size_type i=0; i < size; ++i) {
+            bar_array[i] = T(i+(i^size));
+        }
 
         const TIter sab(bar_array + 0);
         const TIter sae(bar_array + size);
@@ -442,13 +448,13 @@ void TestConstructors() {
         CQ dst_queue2(sab, sae);
 
         CHECK_FAST(size == dst_queue2.size());
-        CHECK_FAST(sab == TIter(bar_array + 0));
-        CHECK_FAST(sae == TIter(bar_array + size));
+        CHECK_FAST(sab == TIter(bar_array+0));
+        CHECK_FAST(sae == TIter(bar_array+size));
 
         dqb = dst_queue2.unsafe_begin();
         dqe = dst_queue2.unsafe_end();
         auto res = std::mismatch(dqb, dqe, bar_array);
-        CHECK_FAST_MESSAGE(res.first == dqe, "unexpected element");
+        CHECK_FAST_MESSAGE(res.first == dqe,  "unexpected element");
         CHECK_FAST_MESSAGE(res.second == bar_array + size, "different size?");
     }
 
@@ -465,7 +471,7 @@ void TestConstructors() {
         src_queue.push(T(++k));
         src_queue.try_pop(tmp_bar);
 
-        CQ dst_queue4(src_queue);
+        CQ dst_queue4( src_queue);
 
         CHECK_FAST(src_queue.size() == dst_queue4.size());
 
@@ -485,7 +491,7 @@ void TestConstructors() {
     iter = src_queue.unsafe_begin();
     REQUIRE_MESSAGE(std::equal(dqb, dqe, iter), "unexpected element");
 
-    for (size_type i = 0; i < 100; ++i) {
+    for (size_type i=0; i<100; ++i) {
         T tmp_bar;
         src_queue.push(T(i + 1000));
         src_queue.push(T(i + 1000));
@@ -515,12 +521,14 @@ void TestConstructors() {
         try {
             src_queue_ex.push(T_EX(k + (k ^ size)));
             ++n_successful_pushes;
-        } catch (...) {}
+        } catch (...) {
+        }
         ++k;
         try {
             src_queue_ex.push(T_EX(k + (k ^ size)));
             ++n_successful_pushes;
-        } catch (...) {}
+        } catch (...) {
+        }
         ++k;
         src_queue_ex.try_pop(tmp_bar_ex);
         n_elements += (n_successful_pushes - 1);
@@ -543,26 +551,30 @@ void TestConstructors() {
     src_queue.clear();
 
     for (size_type size = 0; size < 1001; ++size) {
-        for (size_type i = 0; i < size; ++i) { src_queue.push(T(i + (i ^ size))); }
+        for (size_type i = 0; i < size; ++i) {
+            src_queue.push(T(i + (i ^ size)));
+        }
         std::vector<const T*> locations(size);
         typename CQ::const_iterator qit = src_queue.unsafe_begin();
-        for (size_type i = 0; i < size; ++i, ++qit) { locations[i] = &(*qit); }
+        for (size_type i = 0; i < size; ++i, ++qit) {
+            locations[i] = &(*qit);
+        }
 
         size_type size_of_queue = src_queue.size();
         CQ dst_queue(std::move(src_queue));
 
         CHECK_FAST_MESSAGE((src_queue.empty() && src_queue.size() == 0), "not working move constructor?");
-        CHECK_FAST_MESSAGE((size == size_of_queue && size_of_queue == dst_queue.size()),
-                           "not working move constructor?");
+        CHECK_FAST_MESSAGE((size == size_of_queue && size_of_queue == dst_queue.size()), "not working move constructor?");
 
-        CHECK_FAST_MESSAGE(std::equal(locations.begin(), locations.end(), dst_queue.unsafe_begin(),
-                                      [](const T* t1, const T& r2) { return t1 == &r2; }),
-                           "there was data movement during move constructor");
+        CHECK_FAST_MESSAGE(
+            std::equal(locations.begin(), locations.end(), dst_queue.unsafe_begin(), [](const T* t1, const T& r2) { return t1 == &r2; }),
+            "there was data movement during move constructor"
+        );
 
         for (size_type i = 0; i < size; ++i) {
             T test(i + (i ^ size));
             T popped;
-            bool pop_result = dst_queue.try_pop(popped);
+            bool pop_result = dst_queue.try_pop( popped);
 
             CHECK_FAST(pop_result);
             CHECK_FAST(test == popped);
@@ -572,23 +584,23 @@ void TestConstructors() {
 
 void TestQueueConstructors() {
     TestConstructors<ConcQWithSizeWrapper<Bar>, Bar, BarIterator, ConcQWithSizeWrapper<BarEx>, BarEx>();
-    TestConstructors<oneapi::tbb::concurrent_bounded_queue<Bar>, Bar, BarIterator,
-                     oneapi::tbb::concurrent_bounded_queue<BarEx>, BarEx>();
+    TestConstructors<oneapi::tbb::concurrent_bounded_queue<Bar>, Bar, BarIterator, oneapi::tbb::concurrent_bounded_queue<BarEx>, BarEx>();
 }
 
-template <typename T>
+template<typename T>
 struct TestNegativeQueueBody {
     oneapi::tbb::concurrent_bounded_queue<T>& queue;
     const std::size_t nthread;
-    TestNegativeQueueBody(oneapi::tbb::concurrent_bounded_queue<T>& q, std::size_t n)
-        : queue(q), nthread(n) {}
-    void operator()(std::size_t k) const {
+    TestNegativeQueueBody( oneapi::tbb::concurrent_bounded_queue<T>& q, std::size_t n ) : queue(q), nthread(n) {}
+    void operator()( std::size_t k ) const {
         if (k == 0) {
             int number_of_pops = int(nthread) - 1;
             // Wait for all pops to pend.
-            while (int(queue.size()) > -number_of_pops) { utils::yield(); }
+            while (int(queue.size())> -number_of_pops) {
+                utils::yield();
+            }
 
-            for (int i = 0;; ++i) {
+            for (int i = 0; ; ++i) {
                 CHECK(queue.size() == std::size_t(i - number_of_pops));
                 CHECK((queue.empty() == (queue.size() <= 0)));
                 if (i == number_of_pops) break;
@@ -604,30 +616,31 @@ struct TestNegativeQueueBody {
 };
 
 //! Test a queue with a negative size.
-template <typename T>
-void TestNegativeQueue(std::size_t nthread) {
+template<typename T>
+void TestNegativeQueue( std::size_t nthread ) {
     oneapi::tbb::concurrent_bounded_queue<T> queue;
-    utils::NativeParallelFor(nthread, TestNegativeQueueBody<T>(queue, nthread));
+    utils::NativeParallelFor( nthread, TestNegativeQueueBody<T>(queue,nthread));
 }
 
-template <typename T>
+template<typename T>
 class ConcQPushPopWrapper : public oneapi::tbb::concurrent_queue<T, test_allocator<T>> {
 public:
-    ConcQPushPopWrapper() : my_capacity(std::size_t(-1) / (sizeof(void*) + sizeof(T))) {}
+    ConcQPushPopWrapper() : my_capacity(std::size_t(-1) / (sizeof(void*) + sizeof(T)))
+    {}
 
     std::size_t size() const { return this->unsafe_size(); }
-    void set_capacity(const ptrdiff_t n) { my_capacity = n; }
-    bool try_push(const T& source) { return this->push(source); }
-    bool try_pop(T& dest) { return this->oneapi::tbb::concurrent_queue<T, test_allocator<T>>::try_pop(dest); }
+    void set_capacity( const ptrdiff_t n ) { my_capacity = n; }
+    bool try_push( const T& source ) { return this->push( source); }
+    bool try_pop( T& dest ) { return this->oneapi::tbb::concurrent_queue<T, test_allocator<T>>::try_pop(dest); }
     std::size_t my_capacity;
 };
 
-template <typename CQ, typename T>
+template<typename CQ, typename T>
 struct Body {
     CQ* queue;
     const std::size_t nthread;
-    Body(std::size_t nthread_) : nthread(nthread_) {}
-    void operator()(std::size_t thread_id) const {
+    Body( std::size_t nthread_ ) : nthread(nthread_) {}
+    void operator()( std::size_t thread_id ) const {
         long pop_kind[3] = {0, 0, 0};
         std::size_t serial[MAXTHREAD + 1];
         memset(serial, 0, nthread * sizeof(std::size_t));
@@ -648,34 +661,38 @@ struct Body {
             g.set_serial(j + 1);
             push(*queue, g, j);
             if (!prepopped) {
-                while (!(queue)->try_pop(f)) utils::yield();
+                while(!(queue)->try_pop(f)) utils::yield();
                 ++pop_kind[2];
             }
             CHECK_FAST(f.get_thread_id() <= nthread);
-            CHECK_FAST_MESSAGE((f.get_thread_id() == nthread || serial[f.get_thread_id()] < f.get_serial()),
-                               "partial order violation");
+            CHECK_FAST_MESSAGE((f.get_thread_id() == nthread || serial[f.get_thread_id()] < f.get_serial()), "partial order violation");
             serial[f.get_thread_id()] = f.get_serial();
             sum += int(f.get_serial() - 1);
         }
         Sum[thread_id] = sum;
-        for (std::size_t k = 0; k < 3; ++k) PopKind[k] += pop_kind[k];
+        for (std::size_t k = 0; k < 3; ++k)
+            PopKind[k] += pop_kind[k];
     }
 };
 
-template <typename CQ, typename T>
-void TestPushPop(typename CQ::size_type prefill, std::ptrdiff_t capacity, std::size_t nthread) {
+template<typename CQ, typename T>
+void TestPushPop(typename CQ::size_type prefill, std::ptrdiff_t capacity, std::size_t nthread ) {
     using allocator_type = decltype(std::declval<CQ>().get_allocator());
-    CHECK(nthread > 0);
+    CHECK(nthread> 0);
     std::ptrdiff_t signed_prefill = std::ptrdiff_t(prefill);
 
-    if (signed_prefill + 1 >= capacity) { return; }
+    if (signed_prefill + 1>= capacity) {
+        return;
+    }
 
     bool success = false;
-    for (std::size_t k = 0; k < 3; ++k) { PopKind[k] = 0; }
+    for (std::size_t k=0; k < 3; ++k) {
+        PopKind[k] = 0;
+    }
 
     for (std::size_t trial = 0; !success; ++trial) {
         allocator_type::init_counters();
-        Body<CQ, T> body(nthread);
+        Body<CQ,T> body(nthread);
         CQ queue;
         queue.set_capacity(capacity);
         body.queue = &queue;
@@ -688,13 +705,15 @@ void TestPushPop(typename CQ::size_type prefill, std::ptrdiff_t capacity, std::s
             CHECK_FAST(!queue.empty());
         }
 
-        utils::NativeParallelFor(nthread, body);
+        utils::NativeParallelFor( nthread, body);
 
         int sum = 0;
-        for (std::size_t k = 0; k < nthread; ++k) { sum += Sum[k]; }
+        for (std::size_t k = 0; k < nthread; ++k) {
+            sum += Sum[k];
+        }
 
-        int expected = int(nthread * ((M - 1) * M / 2) + ((prefill - 1) * prefill) / 2);
-        for (int i = int(prefill); --i >= 0;) {
+        int expected = int( nthread * ((M - 1) * M / 2) + ((prefill - 1) * prefill) / 2);
+        for (int i = int(prefill); --i>=0;) {
             CHECK_FAST(!queue.empty());
             T f;
             bool result = queue.try_pop(f);
@@ -704,27 +723,27 @@ void TestPushPop(typename CQ::size_type prefill, std::ptrdiff_t capacity, std::s
         }
         REQUIRE_MESSAGE(queue.empty(), "The queue should be empty");
         REQUIRE_MESSAGE(queue.size() == 0, "The queue should have zero size");
-        if (sum != expected) { REPORT("sum=%d expected=%d\n", sum, expected); }
+        if (sum != expected) {
+            REPORT("sum=%d expected=%d\n",sum,expected);
+        }
 
         success = true;
-        if (nthread > 1 && prefill == 0) {
+        if (nthread> 1 && prefill == 0) {
             // Check that pop_if_present got sufficient exercise
             for (std::size_t k = 0; k < 2; ++k) {
                 const int min_requirement = 100;
                 const int max_trial = 20;
 
                 if (PopKind[k] < min_requirement) {
-                    if (trial >= max_trial) {
-                        REPORT("Warning: %d threads had only %ld pop_if_present operations %s after %d "
-                               "trials (expected at least %d). "
-                               "This problem may merely be unlucky scheduling. "
-                               "Investigate only if it happens repeatedly.\n",
-                               nthread, long(PopKind[k]), k == 0 ? "failed" : "succeeded", max_trial,
-                               min_requirement);
+                    if (trial>= max_trial) {
+                        REPORT("Warning: %d threads had only %ld pop_if_present operations %s after %d trials (expected at least %d). "
+                            "This problem may merely be unlucky scheduling. "
+                            "Investigate only if it happens repeatedly.\n",
+                            nthread, long(PopKind[k]), k==0?"failed":"succeeded", max_trial, min_requirement);
                     } else {
                         success = false;
                     }
-                }
+               }
             }
         }
     }
@@ -732,44 +751,34 @@ void TestPushPop(typename CQ::size_type prefill, std::ptrdiff_t capacity, std::s
 
 void TestConcurrentPushPop() {
     for (std::size_t nthread = MinThread; nthread <= MaxThread; ++nthread) {
-        INFO(" Testing with " << nthread << " thread(s)");
+        INFO(" Testing with "<< nthread << " thread(s)");
         TestNegativeQueue<move_support_tests::Foo>(nthread);
-        for (std::size_t prefill = 0; prefill < 64; prefill += (1 + prefill / 3)) {
-            TestPushPop<ConcQPushPopWrapper<move_support_tests::Foo>, move_support_tests::Foo>(
-                    prefill, std::ptrdiff_t(-1), nthread);
-            TestPushPop<ConcQPushPopWrapper<move_support_tests::Foo>, move_support_tests::Foo>(
-                    prefill, std::ptrdiff_t(1), nthread);
-            TestPushPop<ConcQPushPopWrapper<move_support_tests::Foo>, move_support_tests::Foo>(
-                    prefill, std::ptrdiff_t(2), nthread);
-            TestPushPop<ConcQPushPopWrapper<move_support_tests::Foo>, move_support_tests::Foo>(
-                    prefill, std::ptrdiff_t(10), nthread);
-            TestPushPop<ConcQPushPopWrapper<move_support_tests::Foo>, move_support_tests::Foo>(
-                    prefill, std::ptrdiff_t(100), nthread);
+        for (std::size_t prefill=0; prefill < 64; prefill += (1 + prefill / 3)) {
+            TestPushPop<ConcQPushPopWrapper<move_support_tests::Foo>, move_support_tests::Foo>(prefill, std::ptrdiff_t(-1), nthread);
+            TestPushPop<ConcQPushPopWrapper<move_support_tests::Foo>, move_support_tests::Foo>(prefill, std::ptrdiff_t(1), nthread);
+            TestPushPop<ConcQPushPopWrapper<move_support_tests::Foo>, move_support_tests::Foo>(prefill, std::ptrdiff_t(2), nthread);
+            TestPushPop<ConcQPushPopWrapper<move_support_tests::Foo>, move_support_tests::Foo>(prefill, std::ptrdiff_t(10), nthread);
+            TestPushPop<ConcQPushPopWrapper<move_support_tests::Foo>, move_support_tests::Foo>(prefill, std::ptrdiff_t(100), nthread);
         }
-        for (std::size_t prefill = 0; prefill < 64; prefill += (1 + prefill / 3)) {
-            TestPushPop<oneapi::tbb::concurrent_bounded_queue<move_support_tests::Foo,
-                                                              test_allocator<move_support_tests::Foo>>,
-                        move_support_tests::Foo>(prefill, std::ptrdiff_t(-1), nthread);
-            TestPushPop<oneapi::tbb::concurrent_bounded_queue<move_support_tests::Foo,
-                                                              test_allocator<move_support_tests::Foo>>,
-                        move_support_tests::Foo>(prefill, std::ptrdiff_t(1), nthread);
-            TestPushPop<oneapi::tbb::concurrent_bounded_queue<move_support_tests::Foo,
-                                                              test_allocator<move_support_tests::Foo>>,
-                        move_support_tests::Foo>(prefill, std::ptrdiff_t(2), nthread);
-            TestPushPop<oneapi::tbb::concurrent_bounded_queue<move_support_tests::Foo,
-                                                              test_allocator<move_support_tests::Foo>>,
-                        move_support_tests::Foo>(prefill, std::ptrdiff_t(10), nthread);
-            TestPushPop<oneapi::tbb::concurrent_bounded_queue<move_support_tests::Foo,
-                                                              test_allocator<move_support_tests::Foo>>,
-                        move_support_tests::Foo>(prefill, std::ptrdiff_t(100), nthread);
+        for (std::size_t prefill = 0; prefill < 64; prefill += (1 + prefill / 3) ) {
+            TestPushPop<oneapi::tbb::concurrent_bounded_queue<move_support_tests::Foo, test_allocator<move_support_tests::Foo>>,
+                move_support_tests::Foo>(prefill, std::ptrdiff_t(-1), nthread);
+            TestPushPop<oneapi::tbb::concurrent_bounded_queue<move_support_tests::Foo, test_allocator<move_support_tests::Foo>>,
+                move_support_tests::Foo>(prefill, std::ptrdiff_t(1), nthread);
+            TestPushPop<oneapi::tbb::concurrent_bounded_queue<move_support_tests::Foo, test_allocator<move_support_tests::Foo>>,
+                move_support_tests::Foo>(prefill, std::ptrdiff_t(2), nthread);
+            TestPushPop<oneapi::tbb::concurrent_bounded_queue<move_support_tests::Foo, test_allocator<move_support_tests::Foo>>,
+                move_support_tests::Foo>(prefill, std::ptrdiff_t(10), nthread);
+            TestPushPop<oneapi::tbb::concurrent_bounded_queue<move_support_tests::Foo, test_allocator<move_support_tests::Foo>>,
+                move_support_tests::Foo>(prefill, std::ptrdiff_t(100), nthread);
         }
     }
 }
 
 class Foo_exception : public std::bad_alloc {
 public:
-    virtual const char* what() const throw() override { return "out of Foo limit"; }
-    virtual ~Foo_exception() throw() {}
+    virtual const char *what() const noexcept override { return "out of Foo limit"; }
+    virtual ~Foo_exception() noexcept {}
 };
 
 #if TBB_USE_EXCEPTIONS
@@ -781,7 +790,6 @@ static const long Threshold = 400;
 
 class FooEx {
     state_type state;
-
 public:
     int serial;
     FooEx() : state(LIVE) {
@@ -789,123 +797,127 @@ class FooEx {
         serial = serial_source++;
     }
 
-    FooEx(const FooEx& item) : state(LIVE) {
+    FooEx( const FooEx& item ) : state(LIVE) {
         CHECK(item.state == LIVE);
         ++FooExConstructed;
-        if (MaxFooCount && (FooExConstructed - FooExDestroyed) >= MaxFooCount) {// in push()
+        if (MaxFooCount && (FooExConstructed - FooExDestroyed) >= MaxFooCount) { // in push()
             throw Foo_exception();
         }
         serial = item.serial;
     }
 
     ~FooEx() {
-        CHECK(state == LIVE);
+        CHECK(state==LIVE);
         ++FooExDestroyed;
-        state = DEAD;
-        serial = DEAD;
+        state=DEAD;
+        serial=DEAD;
     }
 
-    void operator=(FooEx& item) {
-        CHECK(item.state == LIVE);
-        CHECK(state == LIVE);
+    void operator=( FooEx& item ) {
+        CHECK(item.state==LIVE);
+        CHECK(state==LIVE);
         serial = item.serial;
-        if (MaxFooCount == 2 * Threshold && (FooExConstructed - FooExDestroyed) <= MaxFooCount / 4)// in pop()
+        if( MaxFooCount==2*Threshold && (FooExConstructed-FooExDestroyed) <= MaxFooCount/4 ) // in pop()
             throw Foo_exception();
     }
 
-    void operator=(FooEx&& item) {
-        operator=(item);
+    void operator=( FooEx&& item ) {
+        operator=( item );
         item.serial = 0;
     }
+
 };
 
 template <template <typename, typename> class CQ, typename A1, typename A2, typename T>
 void TestExceptionBody() {
-    enum methods { m_push = 0, m_pop };
+    enum methods {
+        m_push = 0,
+        m_pop
+    };
 
-    const int N = 1000;// # of bytes
+    const int N = 1000;     // # of bytes
 
     MaxFooCount = 5;
 
     try {
-        int n_pushed = 0, n_popped = 0;
-        for (int t = 0; t <= 1; t++)// exception type -- 0 : from allocator(), 1 : from Foo's constructor
+        int n_pushed=0, n_popped=0;
+        for(int t = 0; t <= 1; t++)// exception type -- 0 : from allocator(), 1 : from Foo's constructor
         {
-            CQ<T, A1> queue_test;
-            for (int m = m_push; m <= m_pop; m++) {
+            CQ<T,A1> queue_test;
+            for( int m=m_push; m<=m_pop; m++ ) {
                 // concurrent_queue internally rebinds the allocator to the one for 'char'
                 A2::init_counters();
 
-                if (t) MaxFooCount = MaxFooCount + 400;
-                else
-                    A2::set_limits(N / 2);
+                if(t) MaxFooCount = MaxFooCount + 400;
+                else A2::set_limits(N/2);
 
                 try {
-                    switch (m) {
-                        case m_push:
-                            for (int k = 0; k < N; k++) {
-                                push(queue_test, T(), k);
-                                n_pushed++;
-                            }
-                            break;
-                        case m_pop:
-                            n_popped = 0;
-                            for (int k = 0; k < n_pushed; k++) {
-                                T elt;
-                                queue_test.try_pop(elt);
-                                n_popped++;
-                            }
-                            n_pushed = 0;
-                            A2::set_limits();
-                            break;
+                    switch(m) {
+                    case m_push:
+                        for( int k=0; k<N; k++ ) {
+                            push( queue_test, T(), k);
+                            n_pushed++;
+                        }
+                        break;
+                    case m_pop:
+                        n_popped=0;
+                        for( int k=0; k<n_pushed; k++ ) {
+                            T elt;
+                            queue_test.try_pop( elt);
+                            n_popped++;
+                        }
+                        n_pushed = 0;
+                        A2::set_limits();
+                        break;
                     }
-                    if (!t && m == m_push) REQUIRE_MESSAGE(false, "should throw an exception");
-                } catch (Foo_exception&) {
+                    if( !t && m==m_push ) REQUIRE_MESSAGE(false, "should throw an exception");
+                } catch ( Foo_exception & ) {
                     long tc = MaxFooCount;
-                    MaxFooCount = 0;// disable exception
-                    switch (m) {
-                        case m_push:
-                            REQUIRE_MESSAGE(ptrdiff_t(queue_test.size()) == n_pushed, "incorrect queue size");
-                            for (int k = 0; k < (int) tc; k++) {
-                                push(queue_test, T(), k);
-                                n_pushed++;
-                            }
-                            break;
-                        case m_pop:
-                            n_pushed -= (n_popped + 1);// including one that threw the exception
-                            REQUIRE_MESSAGE(n_pushed >= 0, "n_pushed cannot be less than 0");
-                            for (int k = 0; k < 1000; k++) {
-                                push(queue_test, T(), k);
-                                n_pushed++;
-                            }
-                            REQUIRE_MESSAGE(!queue_test.empty(), "queue must not be empty");
-                            REQUIRE_MESSAGE(ptrdiff_t(queue_test.size()) == n_pushed,
-                                            "queue size must be equal to n pushed");
-                            for (int k = 0; k < n_pushed; k++) {
-                                T elt;
-                                queue_test.try_pop(elt);
-                            }
-                            REQUIRE_MESSAGE(queue_test.empty(), "queue must be empty");
-                            REQUIRE_MESSAGE(queue_test.size() == 0, "queue must be empty");
-                            break;
+                    MaxFooCount = 0; // disable exception
+                    switch(m) {
+                    case m_push:
+                        REQUIRE_MESSAGE(ptrdiff_t(queue_test.size())==n_pushed, "incorrect queue size");
+                        for( int k=0; k<(int)tc; k++ ) {
+                            push( queue_test, T(), k);
+                            n_pushed++;
+                        }
+                        break;
+                    case m_pop:
+                        n_pushed -= (n_popped+1); // including one that threw the exception
+                        REQUIRE_MESSAGE(n_pushed>=0, "n_pushed cannot be less than 0");
+                        for( int k=0; k<1000; k++ ) {
+                            push( queue_test, T(), k);
+                            n_pushed++;
+                        }
+                        REQUIRE_MESSAGE(!queue_test.empty(), "queue must not be empty");
+                        REQUIRE_MESSAGE(ptrdiff_t(queue_test.size())==n_pushed, "queue size must be equal to n pushed");
+                        for( int k=0; k<n_pushed; k++ ) {
+                            T elt;
+                            queue_test.try_pop( elt);
+                        }
+                        REQUIRE_MESSAGE(queue_test.empty(), "queue must be empty");
+                        REQUIRE_MESSAGE(queue_test.size()==0, "queue must be empty");
+                        break;
                     }
                     MaxFooCount = tc;
-                } catch (std::bad_alloc&) {
-                    A2::set_limits();// disable exception from allocator
+                } catch ( std::bad_alloc & ) {
+                    A2::set_limits(); // disable exception from allocator
                     std::size_t size = queue_test.size();
-                    switch (m) {
+                    switch(m) {
                         case m_push:
-                            REQUIRE_MESSAGE(size > 0, "incorrect queue size");
+                            REQUIRE_MESSAGE(size>0, "incorrect queue size");
                             break;
                         case m_pop:
-                            if (!t) REQUIRE_MESSAGE(false, "should not throw an exception");
+                            if( !t ) REQUIRE_MESSAGE(false, "should not throw an exception");
                             break;
                     }
                 }
                 INFO("for t= " << t << "and m= " << m << " exception test passed");
             }
         }
-    } catch (...) { REQUIRE_MESSAGE(false, "unexpected exception"); }
+    } catch(...) {
+        REQUIRE_MESSAGE(false, "unexpected exception");
+    }
 }
 
 void TestExceptions() {
@@ -913,6 +925,7 @@ void TestExceptions() {
     using allocator_char_t = StaticSharedCountingAllocator<oneapi::tbb::cache_aligned_allocator<char>>;
     TestExceptionBody<ConcQWithSizeWrapper, allocator_t, allocator_char_t, FooEx>();
     TestExceptionBody<oneapi::tbb::concurrent_bounded_queue, allocator_t, allocator_char_t, FooEx>();
+
 }
 
 std::atomic<std::size_t> num_pushed;
@@ -923,20 +936,23 @@ std::atomic<std::size_t> failed_pops;
 class SimplePushBody {
     oneapi::tbb::concurrent_bounded_queue<int>* q;
     std::size_t max;
-
 public:
     SimplePushBody(oneapi::tbb::concurrent_bounded_queue<int>* _q, std::size_t hi_thr) : q(_q), max(hi_thr) {}
 
     void operator()(std::size_t thread_id) const {
         if (thread_id == max) {
-            while (q->size() < std::ptrdiff_t(max)) { utils::yield(); }
+            while ( q->size() < std::ptrdiff_t(max) ) {
+                utils::yield();
+            }
             q->abort();
             return;
         }
         try {
             q->push(42);
             ++num_pushed;
-        } catch (...) { ++failed_pushes; }
+        } catch (...) {
+            ++failed_pushes;
+        }
     }
 };
 
@@ -944,15 +960,16 @@ class SimplePopBody {
     oneapi::tbb::concurrent_bounded_queue<int>* q;
     std::ptrdiff_t max;
     std::ptrdiff_t prefill;
-
 public:
     SimplePopBody(oneapi::tbb::concurrent_bounded_queue<int>* _q, std::size_t hi_thr, std::size_t nitems)
-        : q(_q), max(hi_thr), prefill(nitems) {}
+    : q(_q), max(hi_thr), prefill(nitems) {}
 
     void operator()(std::size_t thread_id) const {
         int e;
         if (thread_id == std::size_t(max)) {
-            while (q->size() > prefill - max) { utils::yield(); }
+            while (q->size()> prefill - max) {
+                utils::yield();
+            }
 
             q->abort();
             return;
@@ -960,7 +977,9 @@ class SimplePopBody {
         try {
             q->pop(e);
             ++num_popped;
-        } catch (...) { ++failed_pops; }
+        } catch ( ... ) {
+            ++failed_pops;
+        }
     }
 };
 
@@ -976,8 +995,7 @@ void TestAbort() {
             SimplePushBody my_push_body1(&iq1, nthreads);
             utils::NativeParallelFor(nthreads + 1, my_push_body1);
             REQUIRE_MESSAGE(num_pushed == 0, "no elements should have been pushed to zero-sized queue");
-            REQUIRE_MESSAGE(failed_pushes == nthreads,
-                            "All threads should have failed to push an element to zero-sized queue");
+            REQUIRE_MESSAGE(failed_pushes == nthreads, "All threads should have failed to push an element to zero-sized queue");
             // Do not test popping each time in order to test queue destruction with no previous pops
             if (nthreads < (MaxThread + MinThread) / 2) {
                 int e;
@@ -988,7 +1006,7 @@ void TestAbort() {
 
         oneapi::tbb::concurrent_bounded_queue<int> iq2;
         iq2.set_capacity(2);
-        for (std::size_t i = 0; i < 10; ++i) {
+        for (std::size_t i=0; i < 10; ++i) {
             num_pushed.store(0, std::memory_order_relaxed);
             num_popped.store(0, std::memory_order_relaxed);
             failed_pushes.store(0, std::memory_order_relaxed);
@@ -996,13 +1014,10 @@ void TestAbort() {
             SimplePushBody my_push_body2(&iq2, nthreads);
             utils::NativeParallelFor(nthreads + 1, my_push_body2);
             REQUIRE_MESSAGE(num_pushed <= 2, "at most 2 elements should have been pushed to queue of size 2");
-            if (nthreads >= 2)
-                REQUIRE_MESSAGE(
-                        failed_pushes == nthreads - 2,
-                        "nthreads-2 threads should have failed to push an element to queue of size 2");
+            if (nthreads>= 2)
+                REQUIRE_MESSAGE(failed_pushes == nthreads - 2, "nthreads-2 threads should have failed to push an element to queue of size 2");
             int e;
-            while (iq2.try_pop(e))
-                ;
+            while (iq2.try_pop(e)) ;
         }
 
         oneapi::tbb::concurrent_bounded_queue<int> iq3;
@@ -1015,13 +1030,10 @@ void TestAbort() {
             iq3.push(42);
             iq3.push(42);
             SimplePopBody my_pop_body(&iq3, nthreads, 2);
-            utils::NativeParallelFor(nthreads + 1, my_pop_body);
-            REQUIRE_MESSAGE(num_popped <= 2,
-                            "at most 2 elements should have been popped from queue of size 2");
-            if (nthreads >= 2)
-                REQUIRE_MESSAGE(
-                        failed_pops == nthreads - 2,
-                        "nthreads-2 threads should have failed to pop an element from queue of size 2");
+            utils::NativeParallelFor( nthreads+1, my_pop_body );
+            REQUIRE_MESSAGE(num_popped <= 2, "at most 2 elements should have been popped from queue of size 2");
+            if (nthreads>= 2)
+                REQUIRE_MESSAGE(failed_pops == nthreads - 2, "nthreads-2 threads should have failed to pop an element from queue of size 2");
             else {
                 int e;
                 iq3.pop(e);
@@ -1032,31 +1044,24 @@ void TestAbort() {
         std::size_t cap = nthreads / 2;
         if (!cap) cap = 1;
         iq4.set_capacity(cap);
-        for (int i = 0; i < 10; ++i) {
+        for (int i=0; i<10; ++i) {
             num_pushed.store(0, std::memory_order_relaxed);
             num_popped.store(0, std::memory_order_relaxed);
             failed_pushes.store(0, std::memory_order_relaxed);
             failed_pops.store(0, std::memory_order_relaxed);
             SimplePushBody my_push_body2(&iq4, nthreads);
             utils::NativeParallelFor(nthreads + 1, my_push_body2);
-            REQUIRE_MESSAGE(num_pushed <= cap,
-                            "at most cap elements should have been pushed to queue of size cap");
-            if (nthreads >= cap)
-                REQUIRE_MESSAGE(
-                        failed_pushes == nthreads - cap,
-                        "nthreads-cap threads should have failed to push an element to queue of size cap");
+            REQUIRE_MESSAGE(num_pushed <= cap, "at most cap elements should have been pushed to queue of size cap");
+            if (nthreads>= cap)
+                REQUIRE_MESSAGE(failed_pushes == nthreads-cap, "nthreads-cap threads should have failed to push an element to queue of size cap");
             SimplePopBody my_pop_body(&iq4, nthreads, num_pushed);
-            utils::NativeParallelFor(nthreads + 1, my_pop_body);
-            REQUIRE_MESSAGE((int) num_popped <= cap,
-                            "at most cap elements should have been popped from queue of size cap");
-            if (nthreads >= cap)
-                REQUIRE_MESSAGE(
-                        failed_pops == nthreads - cap,
-                        "nthreads-cap threads should have failed to pop an element from queue of size cap");
+            utils::NativeParallelFor( nthreads+1, my_pop_body );
+            REQUIRE_MESSAGE((int)num_popped <= cap, "at most cap elements should have been popped from queue of size cap");
+            if (nthreads>= cap)
+                REQUIRE_MESSAGE(failed_pops == nthreads-cap, "nthreads-cap threads should have failed to pop an element from queue of size cap");
             else {
                 int e;
-                while (iq4.try_pop(e))
-                    ;
+                while (iq4.try_pop(e)) ;
             }
         }
     }
@@ -1066,8 +1071,7 @@ void TestAbort() {
 template <template <typename...> class ContainerType>
 void test_member_types() {
     using container_type = ContainerType<int>;
-    static_assert(std::is_same<typename container_type::allocator_type,
-                               oneapi::tbb::cache_aligned_allocator<int>>::value,
+    static_assert(std::is_same<typename container_type::allocator_type, oneapi::tbb::cache_aligned_allocator<int>>::value,
                   "Incorrect default template allocator");
 
     static_assert(std::is_same<typename container_type::value_type, int>::value,
@@ -1082,11 +1086,9 @@ void test_member_types() {
     static_assert(std::is_same<typename container_type::const_reference, const value_type&>::value,
                   "Incorrect container const_reference member type");
     using allocator_type = typename container_type::allocator_type;
-    static_assert(std::is_same<typename container_type::pointer,
-                               typename std::allocator_traits<allocator_type>::pointer>::value,
+    static_assert(std::is_same<typename container_type::pointer, typename std::allocator_traits<allocator_type>::pointer>::value,
                   "Incorrect container pointer member type");
-    static_assert(std::is_same<typename container_type::const_pointer,
-                               typename std::allocator_traits<allocator_type>::const_pointer>::value,
+    static_assert(std::is_same<typename container_type::const_pointer, typename std::allocator_traits<allocator_type>::const_pointer>::value,
                   "Incorrect container const_pointer member type");
 
     static_assert(utils::is_forward_iterator<typename container_type::iterator>::value,
@@ -1101,40 +1103,40 @@ void test_member_types() {
 
 enum push_t { push_op, try_push_op };
 
-template <push_t push_op>
+template<push_t push_op>
 struct pusher {
-    template <typename CQ, typename VType>
-    static bool push(CQ& queue, VType&& val) {
-        queue.push(std::forward<VType>(val));
+    template<typename CQ, typename VType>
+    static bool push( CQ& queue, VType&& val ) {
+        queue.push( std::forward<VType>( val ) );
         return true;
     }
 };
 
-template <>
-struct pusher<try_push_op> {
-    template <typename CQ, typename VType>
-    static bool push(CQ& queue, VType&& val) {
-        return queue.try_push(std::forward<VType>(val));
+template<>
+struct pusher< try_push_op> {
+    template<typename CQ, typename VType>
+    static bool push( CQ& queue, VType&& val ) {
+        return queue.try_push( std::forward<VType>( val ) );
     }
 };
 
 enum pop_t { pop_op, try_pop_op };
 
-template <pop_t pop_op>
+template<pop_t pop_op>
 struct popper {
-    template <typename CQ, typename VType>
-    static bool pop(CQ& queue, VType&& val) {
-        if (queue.empty()) return false;
-        queue.pop(std::forward<VType>(val));
+    template<typename CQ, typename VType>
+    static bool pop( CQ& queue, VType&& val ) {
+        if( queue.empty() ) return false;
+        queue.pop( std::forward<VType>( val ) );
         return true;
     }
 };
 
-template <>
+template<>
 struct popper<try_pop_op> {
-    template <typename CQ, typename VType>
-    static bool pop(CQ& queue, VType&& val) {
-        return queue.try_pop(std::forward<VType>(val));
+    template<typename CQ, typename VType>
+    static bool pop( CQ& queue, VType&& val ) {
+        return queue.try_pop( std::forward<VType>( val ) );
     }
 };
 
@@ -1145,8 +1147,12 @@ struct MoveOperationTracker {
     static std::size_t move_assignment_called_times;
 
     MoveOperationTracker() {}
-    MoveOperationTracker(const MoveOperationTracker&) { ++copy_constructor_called_times; }
-    MoveOperationTracker(MoveOperationTracker&&) { ++move_constructor_called_times; }
+    MoveOperationTracker(const MoveOperationTracker&) {
+        ++copy_constructor_called_times;
+    }
+    MoveOperationTracker(MoveOperationTracker&&) {
+        ++move_constructor_called_times;
+    }
     MoveOperationTracker& operator=(MoveOperationTracker const&) {
         ++copy_assignment_called_times;
         return *this;
@@ -1164,29 +1170,29 @@ size_t MoveOperationTracker::move_assignment_called_times = 0;
 
 template <class CQ, push_t push_op, pop_t pop_op>
 void TestMoveSupport() {
-    std::size_t& mcct = MoveOperationTracker::move_constructor_called_times;
-    std::size_t& ccct = MoveOperationTracker::copy_constructor_called_times;
-    std::size_t& cact = MoveOperationTracker::copy_assignment_called_times;
-    std::size_t& mact = MoveOperationTracker::move_assignment_called_times;
+    std::size_t &mcct = MoveOperationTracker::move_constructor_called_times;
+    std::size_t &ccct = MoveOperationTracker::copy_constructor_called_times;
+    std::size_t &cact = MoveOperationTracker::copy_assignment_called_times;
+    std::size_t &mact = MoveOperationTracker::move_assignment_called_times;
     mcct = ccct = cact = mact = 0;
 
     CQ q;
 
     REQUIRE_MESSAGE(mcct == 0, "Value must be zero-initialized");
     REQUIRE_MESSAGE(ccct == 0, "Value must be zero-initialized");
-    CHECK(pusher<push_op>::push(q, MoveOperationTracker()));
+    CHECK(pusher<push_op>::push( q, MoveOperationTracker() ));
     REQUIRE_MESSAGE(mcct == 1, "Not working push(T&&) or try_push(T&&)?");
     REQUIRE_MESSAGE(ccct == 0, "Copying of arg occurred during push(T&&) or try_push(T&&)");
 
     MoveOperationTracker ob;
-    CHECK(pusher<push_op>::push(q, std::move(ob)));
+    CHECK(pusher<push_op>::push( q, std::move(ob) ));
     REQUIRE_MESSAGE(mcct == 2, "Not working push(T&&) or try_push(T&&)?");
     REQUIRE_MESSAGE(ccct == 0, "Copying of arg occurred during push(T&&) or try_push(T&&)");
 
     REQUIRE_MESSAGE(cact == 0, "Copy assignment called during push(T&&) or try_push(T&&)");
     REQUIRE_MESSAGE(mact == 0, "Move assignment called during push(T&&) or try_push(T&&)");
 
-    bool result = popper<pop_op>::pop(q, ob);
+    bool result = popper<pop_op>::pop( q, ob );
     CHECK(result);
     REQUIRE_MESSAGE(cact == 0, "Copy assignment called during try_pop(T&&)");
     REQUIRE_MESSAGE(mact == 1, "Move assignment was not called during try_pop(T&&)");
@@ -1198,13 +1204,13 @@ void TestMoveSupportInPushPop() {
     TestMoveSupport<oneapi::tbb::concurrent_bounded_queue<MoveOperationTracker>, try_push_op, try_pop_op>();
 }
 
-template <class T>
-class allocator : public oneapi::tbb::cache_aligned_allocator<T> {
+template<class T>
+class allocator: public oneapi::tbb::cache_aligned_allocator<T> {
 public:
     state_type state = LIVE;
     std::size_t m_unique_id;
 
-    allocator() : m_unique_id(0) {}
+    allocator() : m_unique_id( 0 ) {}
     allocator(size_t unique_id) { m_unique_id = unique_id; }
 
     ~allocator() {
@@ -1212,16 +1218,14 @@ class allocator : public oneapi::tbb::cache_aligned_allocator<T> {
         state = DEAD;
     }
 
-    template <typename U>
+    template<typename U>
     allocator(const allocator<U>& a) noexcept {
         REQUIRE_MESSAGE(a.state == LIVE, "Destroyed allocator has been used.");
         m_unique_id = a.m_unique_id;
     }
 
-    template <typename U>
-    struct rebind {
-        typedef allocator<U> other;
-    };
+    template<typename U>
+    struct rebind { typedef allocator<U> other; };
 
     friend bool operator==(const allocator& lhs, const allocator& rhs) {
         REQUIRE_MESSAGE(lhs.state == LIVE, "Destroyed allocator has been used.");
@@ -1231,13 +1235,13 @@ class allocator : public oneapi::tbb::cache_aligned_allocator<T> {
 };
 
 template <typename Queue>
-void AssertEquality(Queue& q, const std::vector<typename Queue::value_type>& vec) {
+void AssertEquality(Queue &q, const std::vector<typename Queue::value_type> &vec) {
     CHECK(q.size() == typename Queue::size_type(vec.size()));
     CHECK(std::equal(q.unsafe_begin(), q.unsafe_end(), vec.begin()));
 }
 
 template <typename Queue>
-void AssertEmptiness(Queue& q) {
+void AssertEmptiness(Queue &q) {
     CHECK(q.empty());
     CHECK(!q.size());
     typename Queue::value_type elem;
@@ -1245,15 +1249,14 @@ void AssertEmptiness(Queue& q) {
 }
 
 template <push_t push_op, typename Queue>
-void FillTest(Queue& q, const std::vector<typename Queue::value_type>& vec) {
-    for (typename std::vector<typename Queue::value_type>::const_iterator it = vec.begin(); it != vec.end();
-         ++it)
+void FillTest(Queue &q, const std::vector<typename Queue::value_type> &vec) {
+    for (typename std::vector<typename Queue::value_type>::const_iterator it = vec.begin(); it != vec.end(); ++it)
         CHECK(pusher<push_op>::push(q, *it));
     AssertEquality(q, vec);
 }
 
 template <pop_t pop_op, typename Queue>
-void EmptyTest(Queue& q, const std::vector<typename Queue::value_type>& vec) {
+void EmptyTest(Queue &q, const std::vector<typename Queue::value_type> &vec) {
     typedef typename Queue::value_type value_type;
 
     value_type elem;
@@ -1267,12 +1270,10 @@ void EmptyTest(Queue& q, const std::vector<typename Queue::value_type>& vec) {
 }
 
 template <typename T, typename A>
-void bounded_queue_specific_test(oneapi::tbb::concurrent_queue<T, A>&,
-                                 const std::vector<T>&) { /* do nothing */
-}
+void bounded_queue_specific_test(oneapi::tbb::concurrent_queue<T, A> &, const std::vector<T> &) { /* do nothing */ }
 
 template <typename T, typename A>
-void bounded_queue_specific_test(oneapi::tbb::concurrent_bounded_queue<T, A>& q, const std::vector<T>& vec) {
+void bounded_queue_specific_test(oneapi::tbb::concurrent_bounded_queue<T, A> &q, const std::vector<T> &vec) {
     typedef typename oneapi::tbb::concurrent_bounded_queue<T, A>::size_type size_type;
 
     FillTest<try_push_op>(q, vec);
@@ -1288,61 +1289,63 @@ void bounded_queue_specific_test(oneapi::tbb::concurrent_bounded_queue<T, A>& q,
 }
 
 // Checks operability of the queue the data was moved from
-template <typename T, typename CQ>
-void TestQueueOperabilityAfterDataMove(CQ& queue) {
+template<typename T, typename CQ>
+void TestQueueOperabilityAfterDataMove( CQ& queue ) {
     const std::size_t size = 10;
     std::vector<T> v(size);
-    for (std::size_t i = 0; i < size; ++i) v[i] = T(i * i + i);
+    for( std::size_t i = 0; i < size; ++i ) v[i] = T( i * i + i );
 
     FillTest<push_op>(queue, v);
     EmptyTest<try_pop_op>(queue, v);
     bounded_queue_specific_test(queue, v);
 }
 
-template <class CQ, class T>
+template<class CQ, class T>
 void TestMoveConstructors() {
     T::construction_num = T::destruction_num = 0;
-    CQ src_queue(allocator<T>(0));
+    CQ src_queue( allocator<T>(0) );
     const std::size_t size = 10;
-    for (std::size_t i = 0; i < size; ++i) src_queue.push(T(i + (i ^ size)));
+    for( std::size_t i = 0; i < size; ++i )
+        src_queue.push( T(i + (i ^ size)) );
     CHECK(T::construction_num == 2 * size);
     CHECK(T::destruction_num == size);
 
     const T* locations[size];
     typename CQ::const_iterator qit = src_queue.unsafe_begin();
-    for (std::size_t i = 0; i < size; ++i, ++qit) locations[i] = &(*qit);
+    for( std::size_t i = 0; i < size; ++i, ++qit )
+        locations[i] = &(*qit);
 
     // Ensuring allocation operation takes place during move when allocators are different
     T::construction_num = T::destruction_num = 0;
-    CQ dst_queue(std::move(src_queue), allocator<T>(1));
+    CQ dst_queue( std::move(src_queue), allocator<T>(1) );
     CHECK(T::construction_num == size);
-    CHECK(T::destruction_num == size * 2);// One item is used by the queue destructor
+    CHECK(T::destruction_num == size);
 
-    TestQueueOperabilityAfterDataMove<T>(src_queue);
+    TestQueueOperabilityAfterDataMove<T>( src_queue );
 
     qit = dst_queue.unsafe_begin();
-    for (std::size_t i = 0; i < size; ++i, ++qit) {
-        REQUIRE_MESSAGE(locations[i] != &(*qit), "an item should have been copied but was not");
+    for( std::size_t i = 0; i < size; ++i, ++qit ) {
+        REQUIRE_MESSAGE(locations[i] != &(*qit), "an item should have been copied but was not" );
         locations[i] = &(*qit);
     }
 
     T::construction_num = T::destruction_num = 0;
     // Ensuring there is no allocation operation during move with equal allocators
-    CQ dst_queue2(std::move(dst_queue), allocator<T>(1));
+    CQ dst_queue2( std::move(dst_queue), allocator<T>(1) );
     CHECK(T::construction_num == 0);
     CHECK(T::destruction_num == 0);
 
-    TestQueueOperabilityAfterDataMove<T>(dst_queue);
+    TestQueueOperabilityAfterDataMove<T>( dst_queue );
 
     qit = dst_queue2.unsafe_begin();
-    for (std::size_t i = 0; i < size; ++i, ++qit) {
-        REQUIRE_MESSAGE(locations[i] == &(*qit), "an item should have been moved but was not");
+    for( std::size_t i = 0; i < size; ++i, ++qit ) {
+        REQUIRE_MESSAGE(locations[i] == &(*qit), "an item should have been moved but was not" );
     }
 
-    for (std::size_t i = 0; i < size; ++i) {
+    for( std::size_t i = 0; i < size; ++i) {
         T test(i + (i ^ size));
         T popped;
-        bool pop_result = dst_queue2.try_pop(popped);
+        bool pop_result = dst_queue2.try_pop( popped );
         CHECK(pop_result);
         CHECK(test == popped);
     }
@@ -1357,12 +1360,11 @@ void TestMoveConstruction() {
 
 class NonTrivialConstructorType {
 public:
-    NonTrivialConstructorType(int a = 0) : m_a(a), m_str("") {}
-    NonTrivialConstructorType(const std::string& str) : m_a(0), m_str(str) {}
-    NonTrivialConstructorType(int a, const std::string& str) : m_a(a), m_str(str) {}
+    NonTrivialConstructorType( int a = 0 ) : m_a( a ), m_str( "" ) {}
+    NonTrivialConstructorType( const std::string& str ) : m_a( 0 ), m_str( str ) {}
+    NonTrivialConstructorType( int a, const std::string& str ) : m_a( a ), m_str( str ) {}
     int get_a() const { return m_a; }
     std::string get_str() const { return m_str; }
-
 private:
     int m_a;
     std::string m_str;
@@ -1370,43 +1372,41 @@ class NonTrivialConstructorType {
 
 enum emplace_t { emplace_op, try_emplace_op };
 
-template <emplace_t emplace_op>
+template<emplace_t emplace_op>
 struct emplacer {
-    template <typename CQ, typename... Args>
-    static void emplace(CQ& queue, Args&&... val) {
-        queue.emplace(std::forward<Args>(val)...);
-    }
+    template<typename CQ, typename... Args>
+    static void emplace( CQ& queue, Args&&... val ) { queue.emplace( std::forward<Args>( val )... ); }
 };
 
-template <>
-struct emplacer<try_emplace_op> {
-    template <typename CQ, typename... Args>
-    static void emplace(CQ& queue, Args&&... val) {
-        bool result = queue.try_emplace(std::forward<Args>(val)...);
+template<>
+struct emplacer <try_emplace_op> {
+    template<typename CQ, typename... Args>
+    static void emplace( CQ& queue, Args&&... val ) {
+        bool result = queue.try_emplace( std::forward<Args>( val )... );
         REQUIRE_MESSAGE(result, "try_emplace error\n");
     }
 };
 
-template <typename CQ, emplace_t emplace_op>
+template<typename CQ, emplace_t emplace_op>
 void TestEmplaceInQueue() {
     CQ cq;
     std::string test_str = "I'm being emplaced!";
     {
-        emplacer<emplace_op>::emplace(cq, 5);
+        emplacer<emplace_op>::emplace( cq, 5 );
         CHECK(cq.size() == 1);
-        NonTrivialConstructorType popped(-1);
-        bool result = cq.try_pop(popped);
+        NonTrivialConstructorType popped( -1 );
+        bool result = cq.try_pop( popped );
         CHECK(result);
         CHECK(popped.get_a() == 5);
-        CHECK(popped.get_str() == std::string(""));
+        CHECK(popped.get_str() == std::string( "" ));
     }
 
     CHECK(cq.empty());
 
     {
-        NonTrivialConstructorType popped(-1);
-        emplacer<emplace_op>::emplace(cq, std::string(test_str));
-        bool result = cq.try_pop(popped);
+        NonTrivialConstructorType popped( -1 );
+        emplacer<emplace_op>::emplace( cq, std::string(test_str) );
+        bool result = cq.try_pop( popped );
         CHECK(result);
         CHECK(popped.get_a() == 0);
         CHECK(popped.get_str() == test_str);
@@ -1415,9 +1415,9 @@ void TestEmplaceInQueue() {
     CHECK(cq.empty());
 
     {
-        NonTrivialConstructorType popped(-1, "");
-        emplacer<emplace_op>::emplace(cq, 5, std::string(test_str));
-        bool result = cq.try_pop(popped);
+        NonTrivialConstructorType popped( -1, "" );
+        emplacer<emplace_op>::emplace( cq, 5, std::string(test_str) );
+        bool result = cq.try_pop( popped );
         CHECK(result);
         CHECK(popped.get_a() == 5);
         CHECK(popped.get_str() == test_str);
@@ -1462,17 +1462,17 @@ void TestDeductionGuides() {
 #endif
 
 template <typename Iterator, typename QueueType>
-void TestQueueIteratorComparisonsBasic(QueueType& q) {
+void TestQueueIteratorComparisonsBasic( QueueType& q ) {
     REQUIRE_MESSAGE(!q.empty(), "Incorrect test setup");
     using namespace comparisons_testing;
     Iterator it1, it2;
-    testEqualityComparisons</*ExpectEqual = */ true>(it1, it2);
+    testEqualityComparisons</*ExpectEqual = */true>(it1, it2);
     it1 = q.unsafe_begin();
-    testEqualityComparisons</*ExpectEqual = */ false>(it1, it2);
+    testEqualityComparisons</*ExpectEqual = */false>(it1, it2);
     it2 = q.unsafe_begin();
-    testEqualityComparisons</*ExpectEqual = */ true>(it1, it2);
+    testEqualityComparisons</*ExpectEqual = */true>(it1, it2);
     it2 = q.unsafe_end();
-    testEqualityComparisons</*ExpectEqual = */ false>(it1, it2);
+    testEqualityComparisons</*ExpectEqual = */false>(it1, it2);
 }
 
 template <typename QueueType>
@@ -1488,35 +1488,49 @@ void TestQueueIteratorComparisons() {
 
 //! Test constructors
 //! \brief \ref interface \ref requirement
-TEST_CASE("testing constructors") { TestQueueConstructors(); }
+TEST_CASE("testing constructors") {
+    TestQueueConstructors();
+}
 
 //! Test work with empty queue
 //! \brief \ref interface \ref requirement
-TEST_CASE("testing work with empty queue") { TestEmptiness(); }
+TEST_CASE("testing work with empty queue") {
+    TestEmptiness();
+}
 
 //! Test set capacity operation
 //! \brief \ref interface \ref requirement
-TEST_CASE("testing set capacity operation") { TestFullness(); }
+TEST_CASE("testing set capacity operation") {
+    TestFullness();
+}
 
 //! Test clean operation
 //! \brief \ref interface \ref requirement
-TEST_CASE("testing clean operation") { TestClearWorks(); }
+TEST_CASE("testing clean operation") {
+    TestClearWorks();
+}
 
 //! Test move constructors
 //! \brief \ref interface \ref requirement
-TEST_CASE("testing move constructor") { TestMoveConstruction(); }
+TEST_CASE("testing move constructor") {
+    TestMoveConstruction();
+}
 
 //! Test move support in push and pop
 //! \brief \ref requirement
-TEST_CASE("testing move support in push and pop") { TestMoveSupportInPushPop(); }
+TEST_CASE("testing move support in push and pop") {
+    TestMoveSupportInPushPop();
+}
 
 //! Test emplace operation
 //! \brief \ref interface \ref requirement
-TEST_CASE("testing emplace") { TestEmplace(); }
+TEST_CASE("testing emplace") {
+    TestEmplace();
+}
 
 //! Test concurrent_queues member types
 //! \brief \ref interface \ref requirement
-TEST_CASE("testing concurrent_queues member types") {
+TEST_CASE("testing concurrent_queues member types"){
     test_member_types<oneapi::tbb::concurrent_queue>();
     test_member_types<oneapi::tbb::concurrent_bounded_queue>();
 
@@ -1529,20 +1543,28 @@ TEST_CASE("testing concurrent_queues member types") {
 
 //! Test iterators
 //! \brief \ref interface \ref requirement
-TEST_CASE("testing iterators") { TestQueueIteratorWorks(); }
+TEST_CASE("testing iterators") {
+    TestQueueIteratorWorks();
+}
 
-//! Test concurrent oprations support
+//! Test concurrent operations support
 //! \brief \ref requirement
-TEST_CASE("testing concurrent oprations support") { TestConcurrentPushPop(); }
+TEST_CASE("testing concurrent operations support") {
+    TestConcurrentPushPop();
+}
 
 #if TBB_USE_EXCEPTIONS
 //! Test exception safety
 //! \brief \ref requirement
-TEST_CASE("testing exception safety") { TestExceptions(); }
+TEST_CASE("testing exception safety") {
+    TestExceptions();
+}
 
 //! Test abort operation
 //! \brief \ref interface \ref requirement
-TEST_CASE("testing abort operation") { TestAbort(); }
+TEST_CASE("testing abort operation") {
+    TestAbort();
+}
 #endif
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
@@ -1563,3 +1585,301 @@ TEST_CASE("concurrent_queue iterator comparisons") {
 TEST_CASE("concurrent_bounded_queue iterator comparisons") {
     TestQueueIteratorComparisons<oneapi::tbb::concurrent_bounded_queue<int>>();
 }
+
+class MinimalisticObject {
+public:
+    struct flag {};
+
+    MinimalisticObject() = delete;
+    MinimalisticObject(flag) : underlying_obj(default_obj) {}
+
+    MinimalisticObject(const MinimalisticObject&) = delete;
+    MinimalisticObject& operator=(const MinimalisticObject&) = delete;
+
+    std::size_t get_obj() const { return underlying_obj; }
+    std::size_t get_default_obj() const { return default_obj; }
+
+protected:
+    static constexpr std::size_t default_obj = 42;
+    std::size_t underlying_obj;
+    friend struct MoveAssignableMinimalisticObject;
+};
+
+struct MoveAssignableMinimalisticObject : MinimalisticObject {
+public:
+    using MinimalisticObject::MinimalisticObject;
+
+    MoveAssignableMinimalisticObject& operator=(MoveAssignableMinimalisticObject&& other) {
+        if (this != &other) {
+            underlying_obj = other.underlying_obj;
+            other.underlying_obj = 0;
+        }
+        return *this;
+    }
+};
+
+template <typename Container>
+void test_basics(Container& container, std::size_t desired_size) {
+    CHECK(!container.empty());
+
+    std::size_t counter = 0;
+    for (auto it = container.unsafe_begin(); it != container.unsafe_end(); ++it) {
+        CHECK(it->get_obj() == it->get_default_obj());
+        ++counter;
+    }
+    CHECK(counter == desired_size);
+
+    container.clear();
+    CHECK(container.empty());
+}
+
+template <template <class...> class Container>
+void test_with_minimalistic_objects() {
+    // Test with MinimalisticObject and no pop operations
+    const std::size_t elements_count = 100;
+    {
+        Container<MinimalisticObject> default_container;
+
+        for (std::size_t i = 0; i < elements_count; ++i) {
+            default_container.emplace(MinimalisticObject::flag{});
+        }
+        test_basics(default_container, elements_count);
+    }
+    // Test with MoveAssignableMinimalisticObject with pop operation
+    {
+        Container<MoveAssignableMinimalisticObject> default_container;
+
+        for (std::size_t i = 0; i < elements_count; ++i) {
+            default_container.emplace(MinimalisticObject::flag{});
+        }
+        test_basics(default_container, elements_count);
+
+        // Refill again
+        for (std::size_t i = 0; i < elements_count; ++i) {
+            default_container.emplace(MinimalisticObject::flag{});
+        }
+
+        MoveAssignableMinimalisticObject result(MinimalisticObject::flag{});
+
+        std::size_t element_counter = 0;
+        while (!default_container.empty()) {
+            CHECK(default_container.try_pop(result));
+            ++element_counter;
+        }
+
+        CHECK(element_counter == elements_count);
+        CHECK(default_container.empty());
+    }
+}
+
+//! \brief \ref requirement
+TEST_CASE("Test with minimalistic object type") {
+    test_with_minimalistic_objects<oneapi::tbb::concurrent_queue>();
+    test_with_minimalistic_objects<oneapi::tbb::concurrent_bounded_queue>();
+}
+
+//TODO: Once support for std::allocator_traits::propagate_on_container_* is implemented,
+//      most of the 4 test cases below can be replaced with move_support_tests::test_*.
+
+template<typename CQ>
+void test_queue_helper() {
+    int size = 5;
+    typename CQ::value_type vec_1(size, 0), vec_2(size, 0), vec_3(size, 0), vec_4(size, 0);
+    srand(static_cast<unsigned>(time(0)));
+    generate(vec_1.begin(), vec_1.end(), rand);
+    generate(vec_2.begin(), vec_2.end(), rand);
+    generate(vec_3.begin(), vec_3.end(), rand);
+    generate(vec_4.begin(), vec_4.end(), rand);
+
+    CQ q1, q2, q3;
+    q3 = {vec_4, vec_2, vec_3};
+    CQ q4({vec_1, vec_2, vec_3});
+
+    q1 = q3;
+    q2 = std::move(q3);
+    CHECK(q3.empty());
+
+    CHECK(q1 != q4);
+    q1.swap(q4);
+    CHECK(q2 == q4);
+
+    swap(q2, q3);
+    CHECK(q2.empty());
+    CHECK(q3 == q4);
+}
+
+//! Test assignment (copy/move/initializer_list) and swapping
+//! \brief \ref interface \ref requirement
+TEST_CASE("testing assignment and swapping") {
+    test_queue_helper<tbb::concurrent_queue<std::vector<int>>>();
+    test_queue_helper<tbb::concurrent_bounded_queue<std::vector<int>>>();
+}
+
+template <typename QueueType>
+void TestMoveQueue() {
+    using allocator_type = typename QueueType::allocator_type;
+
+    QueueType q1, q2;
+    move_support_tests::Foo obj;
+    size_t n1(15), n2(7);
+
+    allocator_type::init_counters();
+    for(size_t i =0; i < n1; i++)
+        q1.push(obj);
+    size_t q1_items_constructed = allocator_type::items_constructed;
+    size_t q1_items_allocated =  allocator_type::items_allocated;
+
+    allocator_type::init_counters();
+    for(size_t i =0; i < n2; i++)
+        q2.push(obj);
+    size_t q2_items_allocated =  allocator_type::items_allocated;
+
+    allocator_type::init_counters();
+    q1 = std::move(q2);
+
+    CHECK(q1_items_allocated == allocator_type::items_freed);
+    CHECK(q1_items_constructed == allocator_type::items_destroyed);
+    CHECK(q2_items_allocated >= allocator_type::items_allocated);
+}
+
+//! move assignment test for equal counting allocator
+//! \brief \ref interface \ref requirement
+TEST_CASE("testing move assignment with equal counting allocators") {
+    using allocator_type = StaticSharedCountingAllocator<std::allocator<move_support_tests::Foo>>;
+    TestMoveQueue<tbb::concurrent_queue<move_support_tests::Foo, allocator_type>>();
+    TestMoveQueue<tbb::concurrent_bounded_queue<move_support_tests::Foo, allocator_type>>();
+}
+
+template<class T>
+struct stateful_allocator {
+    typedef T value_type;
+    stateful_allocator() = default;
+    int state = 0;
+    template<class U>
+    constexpr stateful_allocator(const stateful_allocator<U>& src) noexcept : state(src.state) {}
+
+    T* allocate(std::size_t n) {
+        return static_cast<T*>(::operator new(n * sizeof(T)));
+    }
+
+    void deallocate(T* p, std::size_t) noexcept {
+        ::operator delete(p);
+    }
+};
+
+template<class T, class U>
+bool operator==(const stateful_allocator<T>& lhs, const stateful_allocator<U>& rhs) { return lhs.state == rhs.state; }
+
+template<class T, class U>
+bool operator!=(const stateful_allocator<T>& lhs, const stateful_allocator<U>& rhs) { return lhs.state != rhs.state; }
+
+template <typename QueueType>
+void TestMoveQueueUnequal() {
+    using allocator_type = typename QueueType::allocator_type;
+    allocator_type alloc1, alloc2;
+    alloc1.state = 0;
+    alloc2.state = 1;
+
+    QueueType q1(alloc1), q2(alloc2);
+    move_support_tests::Foo obj;
+    size_t n1(15), n2(7);
+
+    allocator_type::init_counters();
+    for(size_t i =0; i < n1; i++)
+        q1.push(obj);
+
+    allocator_type::init_counters();
+    for(size_t i =0; i < n2; i++)
+        q2.push(obj);
+    size_t q2_items_allocated =  allocator_type::items_allocated;
+
+    allocator_type::init_counters();
+    q1 = std::move(q2);
+
+    REQUIRE_MESSAGE(allocator_type::items_allocated == q2_items_allocated, "More than expected memory allocated?");
+    REQUIRE_MESSAGE(std::all_of(q1.unsafe_begin(), q1.unsafe_end(), is_state_predicate<move_support_tests::Foo::MoveInitialized>()),
+                    "Container did not move construct some elements");
+    REQUIRE_MESSAGE(std::all_of(q2.unsafe_begin(), q2.unsafe_end(), is_state_predicate<move_support_tests::Foo::MovedFrom>()),
+                    "Container did not move all the elements");
+}
+
+//! move assignment test for unequal counting allocator
+//! \brief \ref interface \ref requirement
+TEST_CASE("testing move assignment with unequal counting allocators") {
+    using allocator_type = StaticSharedCountingAllocator<stateful_allocator<move_support_tests::Foo>>;
+    TestMoveQueueUnequal<tbb::concurrent_queue<move_support_tests::Foo, allocator_type>>();
+    TestMoveQueueUnequal<tbb::concurrent_bounded_queue<move_support_tests::Foo, allocator_type>>();
+}
+
+template<typename Container>
+void test_check_move_allocator(Container& src, Container& dst, Container& cpy) {
+    REQUIRE_MESSAGE(src.empty(), "Source didn't clear");
+    REQUIRE_MESSAGE(std::equal(dst.unsafe_begin(), dst.unsafe_end(), cpy.unsafe_begin()), "Elements are not equal");
+}
+
+void test_move_assignment_test_equal() {
+    int n = 5;
+    std::vector<int> vect1(n, 10), vect2(n,20), vect3(n, 30);
+
+    tbb::concurrent_queue<std::vector<int>> src({vect1, vect2, vect3});
+    tbb::concurrent_queue<std::vector<int>> dst(src.get_allocator());
+    tbb::concurrent_queue<std::vector<int>> cpy(src.get_allocator());
+    REQUIRE_MESSAGE(src.get_allocator() == dst.get_allocator(), "Incorrect test setup: allocators should be equal");
+    cpy = src;
+    dst = std::move(src);
+
+    tbb::concurrent_bounded_queue<std::vector<int>> src_bnd({vect1, vect2, vect3});
+    tbb::concurrent_bounded_queue<std::vector<int>> dst_bnd(src_bnd.get_allocator());
+    tbb::concurrent_bounded_queue<std::vector<int>> cpy_bnd(src_bnd.get_allocator());
+    REQUIRE_MESSAGE(src_bnd.get_allocator() == dst_bnd.get_allocator(), "Incorrect test setup: allocators should be equal");
+    cpy_bnd = src_bnd;
+    dst_bnd = std::move(src_bnd);
+
+    test_check_move_allocator<tbb::concurrent_queue<std::vector<int>>>(src, dst, cpy);
+    REQUIRE_MESSAGE(cpy.unsafe_size() == dst.unsafe_size(), "Queues are not equal");
+
+    test_check_move_allocator<tbb::concurrent_bounded_queue<std::vector<int>>>(src_bnd, dst_bnd, cpy_bnd);
+    REQUIRE_MESSAGE(cpy_bnd.size() == dst_bnd.size(), "Queues are not equal");
+}
+
+void test_move_assignment_test_unequal() {
+    stateful_allocator<int> src_alloc;
+    src_alloc.state = 0;
+    std::vector<int, stateful_allocator<int>> v(8, 0, src_alloc);
+    tbb::concurrent_queue<std::vector<int, stateful_allocator<int>>, stateful_allocator<int>> src(src_alloc);
+
+    v.push_back(42);
+    v.push_back(82);
+    src.push(v);
+    src.push(v);
+
+    stateful_allocator<int> dst_alloc;
+    dst_alloc.state = 1;
+    tbb::concurrent_queue<std::vector<int, stateful_allocator<int>>, stateful_allocator<int>> dst(dst_alloc);
+    tbb::concurrent_queue<std::vector<int, stateful_allocator<int>>, stateful_allocator<int>> cpy(src_alloc);
+    REQUIRE_MESSAGE(src.get_allocator() != dst.get_allocator(), "Incorrect test setup: allocators should be unequal");
+    cpy = src;
+    dst = std::move(src);
+
+    tbb::concurrent_bounded_queue<std::vector<int, stateful_allocator<int>>, stateful_allocator<int>> src_bnd(src_alloc);
+    tbb::concurrent_bounded_queue<std::vector<int, stateful_allocator<int>>, stateful_allocator<int>> dst_bnd(dst_alloc);
+    tbb::concurrent_bounded_queue<std::vector<int, stateful_allocator<int>>, stateful_allocator<int>> cpy_bnd(src_alloc);
+    REQUIRE_MESSAGE(src_bnd.get_allocator() != dst_bnd.get_allocator(), "Incorrect test setup: allocators should be unequal");
+    src_bnd.push(v);
+    src_bnd.push(v);
+    cpy_bnd = src_bnd;
+    dst_bnd = std::move(src_bnd);
+
+    test_check_move_allocator<tbb::concurrent_queue<std::vector<int, stateful_allocator<int>>, stateful_allocator<int>>>(src, dst, cpy);
+    REQUIRE_MESSAGE(dst.unsafe_size() == cpy.unsafe_size(), "Queues are not equal");
+
+    test_check_move_allocator<tbb::concurrent_bounded_queue<std::vector<int, stateful_allocator<int>>, stateful_allocator<int>>>(src_bnd, dst_bnd, cpy_bnd);
+    REQUIRE_MESSAGE(dst_bnd.size() == cpy_bnd.size(), "Queues are not equal");
+}
+
+//! move assignment test for equal and unequal allocator
+//! \brief \ref interface \ref requirement
+TEST_CASE("testing move assignment with equal and unequal allocators") {
+    test_move_assignment_test_equal();
+    test_move_assignment_test_unequal();
+}
diff --git a/external/tbb/test/conformance/conformance_concurrent_set.cpp b/external/tbb/test/conformance/conformance_concurrent_set.cpp
index 28227fb5..beb874b5 100644
--- a/external/tbb/test/conformance/conformance_concurrent_set.cpp
+++ b/external/tbb/test/conformance/conformance_concurrent_set.cpp
@@ -18,9 +18,9 @@
 #define NOMINMAX
 #endif
 #include "oneapi/tbb/concurrent_set.h"
-#include <common/concurrent_ordered_common.h>
 #include <common/test.h>
 #include <common/utils.h>
+#include <common/concurrent_ordered_common.h>
 #include <memory>
 #include <type_traits>
 
@@ -41,11 +41,10 @@ void test_member_types() {
     using default_container_type = ContainerType<int>;
     static_assert(std::is_same<typename default_container_type::key_compare, std::less<int>>::value,
                   "Incorrect default template comparator");
-    static_assert(std::is_same<typename default_container_type::allocator_type,
-                               oneapi::tbb::tbb_allocator<int>>::value,
+    static_assert(std::is_same<typename default_container_type::allocator_type, oneapi::tbb::tbb_allocator<int>>::value,
                   "Incorrect default template allocator");
 
-    auto test_comparator = [](const int&, const int&) -> bool { return true; };
+    auto test_comparator = [](const int&, const int&)->bool { return true; };
     using test_allocator_type = std::allocator<int>;
 
     using container_type = ContainerType<int, decltype(test_comparator), test_allocator_type>;
@@ -71,11 +70,9 @@ void test_member_types() {
     static_assert(std::is_same<typename container_type::const_reference, const value_type&>::value,
                   "Incorrect container const_reference member type");
     using allocator_type = typename container_type::allocator_type;
-    static_assert(std::is_same<typename container_type::pointer,
-                               typename std::allocator_traits<allocator_type>::pointer>::value,
+    static_assert(std::is_same<typename container_type::pointer, typename std::allocator_traits<allocator_type>::pointer>::value,
                   "Incorrect container pointer member type");
-    static_assert(std::is_same<typename container_type::const_pointer,
-                               typename std::allocator_traits<allocator_type>::const_pointer>::value,
+    static_assert(std::is_same<typename container_type::const_pointer, typename std::allocator_traits<allocator_type>::const_pointer>::value,
                   "Incorrect container const_pointer member type");
 
     static_assert(utils::is_forward_iterator<typename container_type::iterator>::value,
@@ -89,7 +86,7 @@ void test_member_types() {
 }
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
-template <template <typename...> typename TSet>
+template <template <typename ...> typename TSet>
 void test_deduction_guides() {
     std::vector<int> vc({1, 2, 3});
     TSet set(vc.begin(), vc.end());
@@ -107,7 +104,7 @@ void test_deduction_guides() {
     TSet set4(vc.begin(), vc.end(), compare, allocator);
     static_assert(std::is_same_v<decltype(set4), TSet<int, decltype(compare), decltype(allocator)>>, "Wrong");
 
-    auto init_list = {int(1), int(2), int(3)};
+    auto init_list = { int(1), int(2), int(3) };
 
     TSet set5(init_list);
     static_assert(std::is_same_v<decltype(set5), TSet<int>>, "Wrong");
@@ -138,7 +135,7 @@ struct COSetTraits : OrderedMoveTraitsBase {
     using container_value_type = T;
 
     using init_iterator_type = move_support_tests::FooIterator;
-};// struct COSetTraits
+}; // struct COSetTraits
 
 struct COMultisetTraits : OrderedMoveTraitsBase {
     template <typename T, typename Allocator>
@@ -148,19 +145,25 @@ struct COMultisetTraits : OrderedMoveTraitsBase {
     using container_value_type = T;
 
     using init_iterator_type = move_support_tests::FooIterator;
-};// struct COMultisetTraits
+}; // struct COMultisetTraits
 
 //! Testing concurrent_set member types
 //! \brief \ref interface \ref requirement
-TEST_CASE("concurrent_set member types") { test_member_types<oneapi::tbb::concurrent_set>(); }
+TEST_CASE("concurrent_set member types") {
+    test_member_types<oneapi::tbb::concurrent_set>();
+}
 
 //! Testing multithreading support in concurrent_set
 //! \brief \ref requirement
-TEST_CASE("concurrent_set multithreading support") { test_concurrent<set_type>(); }
+TEST_CASE("concurrent_set multithreading support") {
+    test_concurrent<set_type>();
+}
 
 //! Testing move constructors and assignment operator in concurrent_set
 //! \brief \ref interface \ref requirement
-TEST_CASE("concurrent_set move semantics support") { test_rvalue_ref_support<COSetTraits>(); }
+TEST_CASE("concurrent_set move semantics support") {
+    test_rvalue_ref_support<COSetTraits>();
+}
 
 //! Testing std::initializer_list constructors and modifiers in concurrent_set
 //! \brief \ref interface \ref requirement
@@ -176,7 +179,9 @@ TEST_CASE("node handling support in concurrent_set") {
 
 //! Testing std::allocator_traits support in concurrent_set
 //! \brief \ref interface \ref requirement
-TEST_CASE("std::allocator_traits support in concurrent_set") { test_allocator_traits_support<COSetTraits>(); }
+TEST_CASE("std::allocator_traits support in concurrent_set") {
+    test_allocator_traits_support<COSetTraits>();
+}
 
 //! Testing heterogeneous overloads in concurrent_set
 //! \brief \ref interface \ref requirement
@@ -187,28 +192,40 @@ TEST_CASE("heterogeneous overloads in concurrent_set") {
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 //! Testing Class Template Argument Deduction in concurrent_set
 //! \brief \ref interface \ref requirement
-TEST_CASE("CTAD support in concurrent_set") { test_deduction_guides<oneapi::tbb::concurrent_set>(); }
-#endif// __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
+TEST_CASE("CTAD support in concurrent_set") {
+    test_deduction_guides<oneapi::tbb::concurrent_set>();
+}
+#endif // __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 
 //! Testing comparison operators in concurrent_set
 //! \brief \ref interface \ref requirement
-TEST_CASE("test concurrent_set comparisons") { test_set_comparisons<oneapi::tbb::concurrent_set>(); }
+TEST_CASE("test concurrent_set comparisons") {
+    test_set_comparisons<oneapi::tbb::concurrent_set>();
+}
 
 //! Testing concurrent_multiset member types
 //! \brief \ref interface \ref requirement
-TEST_CASE("concurrent_multiset member types") { test_member_types<oneapi::tbb::concurrent_multiset>(); }
+TEST_CASE("concurrent_multiset member types") {
+    test_member_types<oneapi::tbb::concurrent_multiset>();
+}
 
 //! Testing requirements of concurrent_multiset
 //! \brief \ref interface \ref requirement
-TEST_CASE("concurrent_multiset requirements") { test_basic<multiset_type>(); }
+TEST_CASE("concurrent_multiset requirements") {
+    test_basic<multiset_type>();
+}
 
 //! Testing multithreading support in concurrent_multiset
 //! \brief \ref requirement
-TEST_CASE("concurrent_multiset multithreading support") { test_concurrent<multiset_type>(); }
+TEST_CASE("concurrent_multiset multithreading support") {
+    test_concurrent<multiset_type>();
+}
 
 //! Testing move constructors and assignment operator in concurrent_multiset
 //! \brief \ref interface \ref requirement
-TEST_CASE("concurrent_multiset multithreading support") { test_rvalue_ref_support<COMultisetTraits>(); }
+TEST_CASE("concurrent_multiset multithreading support") {
+    test_rvalue_ref_support<COMultisetTraits>();
+}
 
 //! Testing std::initializer_list constructors and modifiers in concurrent_multiset
 //! \brief \ref interface \ref requirement
@@ -240,12 +257,16 @@ TEST_CASE("heterogeneous overloads in concurrent_multiset") {
 TEST_CASE("CTAD support in concurrent_multiset") {
     test_deduction_guides<oneapi::tbb::concurrent_multiset>();
 }
-#endif// __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
+#endif // __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 
 //! Testing comparison operators in concurrent_multiset
 //! \brief \ref interface \ref requirement
-TEST_CASE("test concurrent_set comparisons") { test_set_comparisons<oneapi::tbb::concurrent_multiset>(); }
+TEST_CASE("test concurrent_set comparisons") {
+    test_set_comparisons<oneapi::tbb::concurrent_multiset>();
+}
 
 //! Testing of merge operations in concurrent_set and concurrent_multiset
 //! \brief \ref interface \ref requirement
-TEST_CASE("merge operations") { node_handling_tests::test_merge<set_type, multiset_type>(1000); }
+TEST_CASE("merge operations") {
+    node_handling_tests::test_merge<set_type, multiset_type>(1000);
+}
diff --git a/external/tbb/test/conformance/conformance_concurrent_unordered_map.cpp b/external/tbb/test/conformance/conformance_concurrent_unordered_map.cpp
index b19a2c37..11202f4e 100644
--- a/external/tbb/test/conformance/conformance_concurrent_unordered_map.cpp
+++ b/external/tbb/test/conformance/conformance_concurrent_unordered_map.cpp
@@ -15,13 +15,13 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
 #endif
 
 #include "oneapi/tbb/concurrent_unordered_map.h"
-#include <common/concurrent_unordered_common.h>
 #include <common/test.h>
 #include <common/utils.h>
+#include <common/concurrent_unordered_common.h>
 #include <memory>
 #include <type_traits>
 
@@ -34,22 +34,24 @@ struct AllowMultimapping<oneapi::tbb::concurrent_unordered_multimap<Args...>> :
 template <typename Key, typename Mapped>
 using Allocator = LocalCountingAllocator<std::allocator<std::pair<const Key, Mapped>>>;
 
-using map_type = oneapi::tbb::concurrent_unordered_map<int, int, std::hash<int>, std::equal_to<int>,
-                                                       Allocator<int, int>>;
-using multimap_type = oneapi::tbb::concurrent_unordered_multimap<int, int, std::hash<int>, std::equal_to<int>,
-                                                                 Allocator<int, int>>;
+using map_type = oneapi::tbb::concurrent_unordered_map<int, int, std::hash<int>, std::equal_to<int>, Allocator<int, int>>;
+using multimap_type = oneapi::tbb::concurrent_unordered_multimap<int, int, std::hash<int>, std::equal_to<int>, Allocator<int, int>>;
 
 template <>
 struct SpecialTests<map_type> {
-    static void Test() { SpecialMapTests<map_type>(); }
+    static void Test() {
+        SpecialMapTests<map_type>();
+    }
 };
 
 template <>
 struct SpecialTests<multimap_type> {
-    static void Test() { SpecialMultiMapTests<multimap_type>(); }
+    static void Test() {
+        SpecialMultiMapTests<multimap_type>();
+    }
 };
 
-template <template <typename...> class ContainerType>
+template <template <typename... > class ContainerType>
 void test_member_types() {
     using default_container_type = ContainerType<int, int>;
     static_assert(std::is_same<typename default_container_type::hasher, std::hash<int>>::value,
@@ -60,12 +62,12 @@ void test_member_types() {
                                oneapi::tbb::tbb_allocator<std::pair<const int, int>>>::value,
                   "Incorrect default template allocator");
 
-    auto test_hasher = [](const int&) -> std::size_t { return 0; };
-    auto test_equality = [](const int&, const int&) -> bool { return true; };
+    auto test_hasher = [](const int&)->std::size_t { return 0; };
+    auto test_equality = [](const int&, const int&)->bool { return true; };
     using test_allocator_type = std::allocator<std::pair<const int, int>>;
 
-    using container_type
-            = ContainerType<int, int, decltype(test_hasher), decltype(test_equality), test_allocator_type>;
+    using container_type = ContainerType<int, int, decltype(test_hasher),
+                                         decltype(test_equality), test_allocator_type>;
 
     static_assert(std::is_same<typename container_type::key_type, int>::value,
                   "Incorrect container key_type member type");
@@ -87,9 +89,8 @@ void test_member_types() {
     using transparent_container_type = ContainerType<int, int, hasher_with_transparent_key_equal,
                                                      std::equal_to<int>, test_allocator_type>;
 
-    static_assert(
-            std::is_same<typename transparent_container_type::key_equal, transparent_key_equality>::value,
-            "Incorrect container key_equal member type");
+    static_assert(std::is_same<typename transparent_container_type::key_equal, transparent_key_equality>::value,
+                  "Incorrect container key_equal member type");
     static_assert(std::is_same<typename container_type::allocator_type, test_allocator_type>::value,
                   "Incorrect container allocator_type member type");
 
@@ -99,11 +100,9 @@ void test_member_types() {
     static_assert(std::is_same<typename container_type::const_reference, const value_type&>::value,
                   "Incorrect container const_reference member type");
     using allocator_type = typename container_type::allocator_type;
-    static_assert(std::is_same<typename container_type::pointer,
-                               typename std::allocator_traits<allocator_type>::pointer>::value,
+    static_assert(std::is_same<typename container_type::pointer, typename std::allocator_traits<allocator_type>::pointer>::value,
                   "Incorrect container pointer member type");
-    static_assert(std::is_same<typename container_type::const_pointer,
-                               typename std::allocator_traits<allocator_type>::const_pointer>::value,
+    static_assert(std::is_same<typename container_type::const_pointer, typename std::allocator_traits<allocator_type>::const_pointer>::value,
                   "Incorrect container const_pointer member type");
 
     static_assert(utils::is_forward_iterator<typename container_type::iterator>::value,
@@ -130,7 +129,7 @@ void test_deduction_guides() {
     using ComplexType = std::pair<int, std::string>;
     using ComplexTypeConst = std::pair<const int, std::string>;
     std::vector<ComplexType> v;
-    auto l = {ComplexTypeConst(1, "one"), ComplexTypeConst(2, "two")};
+    auto l = { ComplexTypeConst(1, "one"), ComplexTypeConst(2, "two")};
     using custom_allocator_type = std::allocator<ComplexTypeConst>;
 
     // check TMap(InputIterator, InputIterator)
@@ -147,23 +146,22 @@ void test_deduction_guides() {
 
     // check TMap(InputIterator, InputIterator, size_t, Hasher, Equality)
     TMap m3(v.begin(), v.end(), 4, degenerate_hash<int>(), std::less<int>());
-    static_assert(
-            std::is_same<decltype(m3), TMap<int, std::string, degenerate_hash<int>, std::less<int>>>::value);
+    static_assert(std::is_same<decltype(m3), TMap<int, std::string, degenerate_hash<int>, std::less<int>>>::value);
 
     // check TMap(InputIterator, InputIterator, size_t, Hasher, Equality, Allocator)
-    TMap m4(v.begin(), v.end(), 4, degenerate_hash<int>(), std::less<int>(), custom_allocator_type {});
-    static_assert(std::is_same<decltype(m4), TMap<int, std::string, degenerate_hash<int>, std::less<int>,
-                                                  custom_allocator_type>>::value);
+    TMap m4(v.begin(), v.end(), 4, degenerate_hash<int>(), std::less<int>(), custom_allocator_type{});
+    static_assert(std::is_same<decltype(m4), TMap<int, std::string, degenerate_hash<int>,
+        std::less<int>, custom_allocator_type>>::value);
 
     // check TMap(InputIterator, InputIterator, size_t, Allocator)
-    TMap m5(v.begin(), v.end(), 5, custom_allocator_type {});
-    static_assert(std::is_same<decltype(m5), TMap<int, std::string, std::hash<int>, std::equal_to<int>,
-                                                  custom_allocator_type>>::value);
+    TMap m5(v.begin(), v.end(), 5, custom_allocator_type{});
+    static_assert(std::is_same<decltype(m5), TMap<int, std::string, std::hash<int>,
+        std::equal_to<int>, custom_allocator_type>>::value);
 
     // check TMap(InputIterator, InputIterator, size_t, Hasher, Allocator)
-    TMap m6(v.begin(), v.end(), 4, degenerate_hash<int>(), custom_allocator_type {});
-    static_assert(std::is_same<decltype(m6), TMap<int, std::string, degenerate_hash<int>, std::equal_to<int>,
-                                                  custom_allocator_type>>::value);
+    TMap m6(v.begin(), v.end(), 4, degenerate_hash<int>(), custom_allocator_type{});
+    static_assert(std::is_same<decltype(m6), TMap<int, std::string, degenerate_hash<int>,
+        std::equal_to<int>, custom_allocator_type>>::value);
 
     // check TMap(std::initializer_list)
     TMap m7(l);
@@ -179,23 +177,22 @@ void test_deduction_guides() {
 
     // check TMap(std::initializer_list, size_t, Hasher, Equality)
     TMap m10(l, 4, degenerate_hash<int>(), std::less<int>());
-    static_assert(
-            std::is_same<decltype(m10), TMap<int, std::string, degenerate_hash<int>, std::less<int>>>::value);
+    static_assert(std::is_same<decltype(m10), TMap<int, std::string, degenerate_hash<int>, std::less<int>>>::value);
 
     // check TMap(std::initializer_list, size_t, Hasher, Equality, Allocator)
-    TMap m11(l, 4, degenerate_hash<int>(), std::less<int>(), custom_allocator_type {});
-    static_assert(std::is_same<decltype(m11), TMap<int, std::string, degenerate_hash<int>, std::less<int>,
-                                                   custom_allocator_type>>::value);
+    TMap m11(l, 4, degenerate_hash<int>(), std::less<int>(), custom_allocator_type{});
+    static_assert(std::is_same<decltype(m11), TMap<int, std::string, degenerate_hash<int>,
+        std::less<int>, custom_allocator_type>>::value);
 
     // check TMap(std::initializer_list, size_t, Allocator)
-    TMap m12(l, 4, custom_allocator_type {});
-    static_assert(std::is_same<decltype(m12), TMap<int, std::string, std::hash<int>, std::equal_to<int>,
-                                                   custom_allocator_type>>::value);
+    TMap m12(l, 4, custom_allocator_type{});
+    static_assert(std::is_same<decltype(m12), TMap<int, std::string, std::hash<int>,
+        std::equal_to<int>, custom_allocator_type>>::value);
 
     // check TMap(std::initializer_list, size_t, Hasher, Allocator)
-    TMap m13(l, 4, degenerate_hash<int>(), custom_allocator_type {});
-    static_assert(std::is_same<decltype(m13), TMap<int, std::string, degenerate_hash<int>, std::equal_to<int>,
-                                                   custom_allocator_type>>::value);
+    TMap m13(l, 4, degenerate_hash<int>(), custom_allocator_type{});
+    static_assert(std::is_same<decltype(m13), TMap<int, std::string, degenerate_hash<int>,
+        std::equal_to<int>, custom_allocator_type>>::value);
 
     // check TMap(TMap &)
     TMap m14(m1);
@@ -203,7 +200,7 @@ void test_deduction_guides() {
 
     // check TMap(TMap &, Allocator)
     // TODO: investigate why no implicit deduction guides generated for this ctor
-    TMap m15(m5, custom_allocator_type {});
+    TMap m15(m5, custom_allocator_type{});
     static_assert(std::is_same<decltype(m15), decltype(m5)>::value);
 
     // check TMap(TMap &&)
@@ -212,7 +209,7 @@ void test_deduction_guides() {
 
     // check TMap(TMap &&, Allocator)
     // TODO: investigate why no implicit deduction guides generated for this ctor
-    TMap m17(std::move(m5), custom_allocator_type {});
+    TMap m17(std::move(m5), custom_allocator_type{});
     static_assert(std::is_same<decltype(m17), decltype(m5)>::value);
 }
 #endif
@@ -220,33 +217,29 @@ void test_deduction_guides() {
 void test_heterogeneous_functions() {
     check_heterogeneous_functions_key_int<oneapi::tbb::concurrent_unordered_map, int, int>();
     check_heterogeneous_functions_key_int<oneapi::tbb::concurrent_unordered_multimap, int, int>();
-    check_heterogeneous_functions_key_string<oneapi::tbb::concurrent_unordered_map, std::string,
-                                             std::string>();
-    check_heterogeneous_functions_key_string<oneapi::tbb::concurrent_unordered_multimap, std::string,
-                                             std::string>();
+    check_heterogeneous_functions_key_string<oneapi::tbb::concurrent_unordered_map, std::string, std::string>();
+    check_heterogeneous_functions_key_string<oneapi::tbb::concurrent_unordered_multimap, std::string, std::string>();
 }
 
 struct CumapTraits : UnorderedMoveTraitsBase {
     template <typename T, typename Allocator>
-    using container_type
-            = oneapi::tbb::concurrent_unordered_map<T, T, std::hash<T>, std::equal_to<T>, Allocator>;
+    using container_type = oneapi::tbb::concurrent_unordered_map<T, T, std::hash<T>, std::equal_to<T>, Allocator>;
 
     template <typename T>
     using container_value_type = std::pair<const T, T>;
 
     using init_iterator_type = move_support_tests::FooPairIterator;
-};// struct CumapTraits
+}; // struct CumapTraits
 
 struct CumultimapTraits : UnorderedMoveTraitsBase {
     template <typename T, typename Allocator>
-    using container_type
-            = oneapi::tbb::concurrent_unordered_multimap<T, T, std::hash<T>, std::equal_to<T>, Allocator>;
+    using container_type = oneapi::tbb::concurrent_unordered_multimap<T, T, std::hash<T>, std::equal_to<T>, Allocator>;
 
     template <typename T>
     using container_value_type = std::pair<const T, T>;
 
     using init_iterator_type = move_support_tests::FooPairIterator;
-};// struct CumultimapTraits
+}; // struct CumultimapTraits
 
 //! Testing concurrent_unordered_map member types
 //! \brief \ref interface \ref requirement
@@ -256,15 +249,21 @@ TEST_CASE("concurrent_unordered_map member types") {
 
 //! Testing requirements of concurrent_unordered_map
 //! \brief \ref interface \ref requirement
-TEST_CASE("concurrent_unordered_map requirements") { test_basic<map_type>(); }
+TEST_CASE("concurrent_unordered_map requirements") {
+    test_basic<map_type>();
+}
 
 //! Testing multithreading support in concurrent_unordered_map
 //! \brief \ref requirement
-TEST_CASE("concurrent_unordered_map multithreading support") { test_concurrent<map_type>(); }
+TEST_CASE("concurrent_unordered_map multithreading support") {
+    test_concurrent<map_type>();
+}
 
 //! Testing move constructors and assignment operator in concurrent_unordered_map
 //! \brief \ref interface \ref requirement
-TEST_CASE("concurrent_unordered_map move semantics support") { test_rvalue_ref_support<CumapTraits>(); }
+TEST_CASE("concurrent_unordered_map move semantics support") {
+    test_rvalue_ref_support<CumapTraits>();
+}
 
 //! Testing std::initializer_list constructors and modifiers in concurrent_unordered_map
 //! \brief \ref interface \ref requirement
@@ -288,8 +287,7 @@ TEST_CASE("std::allocator_traits support in concurrent_unordered_map") {
 //! \brief \ref interface \ref requirement
 TEST_CASE("heterogeneous overloads in concurrent_unordered_map") {
     check_heterogeneous_functions_key_int<oneapi::tbb::concurrent_unordered_map, int, int>();
-    check_heterogeneous_functions_key_string<oneapi::tbb::concurrent_unordered_map, std::string,
-                                             std::string>();
+    check_heterogeneous_functions_key_string<oneapi::tbb::concurrent_unordered_map, std::string, std::string>();
 }
 
 //! Testing insert overloads with generic pair in concurrent_unordered_map
@@ -320,11 +318,15 @@ TEST_CASE("concurrent_unordered_multimap member types") {
 
 //! Testing requirements of concurrent_unordered_multimap
 //! \brief \ref interface \ref requirement
-TEST_CASE("concurrent_unordered_multimap requirements") { test_basic<multimap_type>(); }
+TEST_CASE("concurrent_unordered_multimap requirements") {
+    test_basic<multimap_type>();
+}
 
 //! Testing multithreading support in concurrent_unordered_multimap
 //! \brief \ref requirement
-TEST_CASE("concurrent_unordered_multimap multithreading support") { test_concurrent<multimap_type>(); }
+TEST_CASE("concurrent_unordered_multimap multithreading support") {
+    test_concurrent<multimap_type>();
+}
 
 //! Testing move constructors and assignment operator in concurrent_unordered_multimap
 //! \brief \ref interface \ref requirement
@@ -354,8 +356,7 @@ TEST_CASE("std::allocator_traits support in concurrent_unordered_multimap") {
 //! \brief \ref interface \ref requirement
 TEST_CASE("heterogeneous overloads in concurrent_unordered_multimap") {
     check_heterogeneous_functions_key_int<oneapi::tbb::concurrent_unordered_multimap, int, int>();
-    check_heterogeneous_functions_key_string<oneapi::tbb::concurrent_unordered_multimap, std::string,
-                                             std::string>();
+    check_heterogeneous_functions_key_string<oneapi::tbb::concurrent_unordered_multimap, std::string, std::string>();
 }
 
 //! Testing insert overloads with generic pair in concurrent_unordered_multimap
@@ -380,4 +381,6 @@ TEST_CASE("concurrent_unordered_multimap comparisons") {
 
 //! Testing of merge operations in concurrent_unordered_map and concurrent_unordered_multimap
 //! \brief \ref interface \ref requirement
-TEST_CASE("merge operations") { node_handling_tests::test_merge<map_type, multimap_type>(1000); }
+TEST_CASE("merge operations") {
+    node_handling_tests::test_merge<map_type, multimap_type>(1000);
+}
diff --git a/external/tbb/test/conformance/conformance_concurrent_unordered_set.cpp b/external/tbb/test/conformance/conformance_concurrent_unordered_set.cpp
index c6556547..c69c9b2c 100644
--- a/external/tbb/test/conformance/conformance_concurrent_unordered_set.cpp
+++ b/external/tbb/test/conformance/conformance_concurrent_unordered_set.cpp
@@ -15,13 +15,14 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
 #endif
 
+
 #include "oneapi/tbb/concurrent_unordered_set.h"
-#include <common/concurrent_unordered_common.h>
 #include <common/test.h>
 #include <common/utils.h>
+#include <common/concurrent_unordered_common.h>
 #include <memory>
 #include <type_traits>
 
@@ -34,10 +35,8 @@ struct AllowMultimapping<oneapi::tbb::concurrent_unordered_multiset<Args...>> :
 template <typename Key>
 using Allocator = LocalCountingAllocator<std::allocator<Key>>;
 
-using set_type
-        = oneapi::tbb::concurrent_unordered_set<int, std::hash<int>, std::equal_to<int>, Allocator<int>>;
-using multiset_type
-        = oneapi::tbb::concurrent_unordered_multiset<int, std::hash<int>, std::equal_to<int>, Allocator<int>>;
+using set_type = oneapi::tbb::concurrent_unordered_set<int, std::hash<int>, std::equal_to<int>, Allocator<int>>;
+using multiset_type = oneapi::tbb::concurrent_unordered_multiset<int, std::hash<int>, std::equal_to<int>, Allocator<int>>;
 
 template <template <typename...> class ContainerType>
 void test_member_types() {
@@ -46,16 +45,14 @@ void test_member_types() {
                   "Incorrect default template hasher");
     static_assert(std::is_same<typename default_container_type::key_equal, std::equal_to<int>>::value,
                   "Incorrect default template key equality");
-    static_assert(std::is_same<typename default_container_type::allocator_type,
-                               oneapi::tbb::tbb_allocator<int>>::value,
+    static_assert(std::is_same<typename default_container_type::allocator_type, oneapi::tbb::tbb_allocator<int>>::value,
                   "Incorrect default template allocator");
 
-    auto test_hasher = [](const int &) -> std::size_t { return 0; };
-    auto test_equality = [](const int &, const int &) -> bool { return true; };
+    auto test_hasher = [](const int&)->std::size_t { return 0; };
+    auto test_equality = [](const int&, const int&)->bool { return true; };
     using test_allocator_type = std::allocator<int>;
 
-    using container_type
-            = ContainerType<int, decltype(test_hasher), decltype(test_equality), test_allocator_type>;
+    using container_type = ContainerType<int, decltype(test_hasher), decltype(test_equality), test_allocator_type>;
 
     static_assert(std::is_same<typename container_type::key_type, int>::value,
                   "Incorrect container key_type member type");
@@ -72,26 +69,23 @@ void test_member_types() {
     static_assert(std::is_same<typename container_type::key_equal, decltype(test_equality)>::value,
                   "Incorrect container key_equal member type");
 
-    using transparent_container_type
-            = ContainerType<int, hasher_with_transparent_key_equal, std::equal_to<int>, test_allocator_type>;
+    using transparent_container_type = ContainerType<int, hasher_with_transparent_key_equal,
+                                                     std::equal_to<int>, test_allocator_type>;
 
-    static_assert(
-            std::is_same<typename transparent_container_type::key_equal, transparent_key_equality>::value,
-            "Incorrect container key_equal member type");
+    static_assert(std::is_same<typename transparent_container_type::key_equal, transparent_key_equality>::value,
+                  "Incorrect container key_equal member type");
     static_assert(std::is_same<typename container_type::allocator_type, test_allocator_type>::value,
                   "Incorrect container allocator_type member type");
 
     using value_type = typename container_type::value_type;
-    static_assert(std::is_same<typename container_type::reference, value_type &>::value,
+    static_assert(std::is_same<typename container_type::reference, value_type&>::value,
                   "Incorrect container reference member type");
-    static_assert(std::is_same<typename container_type::const_reference, const value_type &>::value,
+    static_assert(std::is_same<typename container_type::const_reference, const value_type&>::value,
                   "Incorrect container const_reference member type");
     using allocator_type = typename container_type::allocator_type;
-    static_assert(std::is_same<typename container_type::pointer,
-                               typename std::allocator_traits<allocator_type>::pointer>::value,
+    static_assert(std::is_same<typename container_type::pointer, typename std::allocator_traits<allocator_type>::pointer>::value,
                   "Incorrect container pointer member type");
-    static_assert(std::is_same<typename container_type::const_pointer,
-                               typename std::allocator_traits<allocator_type>::const_pointer>::value,
+    static_assert(std::is_same<typename container_type::const_pointer, typename std::allocator_traits<allocator_type>::const_pointer>::value,
                   "Incorrect container const_pointer member type");
 
     static_assert(utils::is_forward_iterator<typename container_type::iterator>::value,
@@ -114,33 +108,31 @@ void test_member_types() {
 
 struct CusetTraits : UnorderedMoveTraitsBase {
     template <typename T, typename Allocator>
-    using container_type
-            = oneapi::tbb::concurrent_unordered_set<T, std::hash<T>, std::equal_to<T>, Allocator>;
+    using container_type = oneapi::tbb::concurrent_unordered_set<T, std::hash<T>, std::equal_to<T>, Allocator>;
 
     template <typename T>
     using container_value_type = T;
 
     using init_iterator_type = move_support_tests::FooIterator;
-};// struct CusetTraits
+}; // struct CusetTraits
 
 struct CumultisetTraits : UnorderedMoveTraitsBase {
     template <typename T, typename Allocator>
-    using container_type
-            = oneapi::tbb::concurrent_unordered_multiset<T, std::hash<T>, std::equal_to<T>, Allocator>;
+    using container_type = oneapi::tbb::concurrent_unordered_multiset<T, std::hash<T>, std::equal_to<T>, Allocator>;
 
     template <typename T>
     using container_value_type = T;
 
     using init_iterator_type = move_support_tests::FooIterator;
-};// struct CumultisetTraits
+}; // struct CumultisetTraits
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
-template <template <typename...> typename TSet>
+template <template <typename ...> typename TSet>
 void test_deduction_guides() {
     using ComplexType = const std::string *;
     std::vector<ComplexType> v;
     std::string s = "s";
-    auto l = {ComplexType(&s), ComplexType(&s)};
+    auto l = { ComplexType(&s), ComplexType(&s)};
     using custom_allocator_type = std::allocator<ComplexType>;
 
     // check TSet(InputIterator,InputIterator)
@@ -153,25 +145,24 @@ void test_deduction_guides() {
 
     // check TSet(InputIterator,InputIterator, size_t, Hasher, Equality)
     TSet s3(v.begin(), v.end(), 5, degenerate_hash<ComplexType>(), std::less<ComplexType>());
-    static_assert(
-            std::is_same<decltype(s3),
-                         TSet<ComplexType, degenerate_hash<ComplexType>, std::less<ComplexType>>>::value);
+    static_assert(std::is_same<decltype(s3), TSet<ComplexType, degenerate_hash<ComplexType>,
+        std::less<ComplexType>>>::value);
 
     // check TSet(InputIterator,InputIterator, size_t, Hasher, Equality, Allocator)
     TSet s4(v.begin(), v.end(), 5, degenerate_hash<ComplexType>(), std::less<ComplexType>(),
-            custom_allocator_type {});
+            custom_allocator_type{});
     static_assert(std::is_same<decltype(s4), TSet<ComplexType, degenerate_hash<ComplexType>,
-                                                  std::less<ComplexType>, custom_allocator_type>>::value);
+        std::less<ComplexType>, custom_allocator_type>>::value);
 
     // check TSet(InputIterator,InputIterator, size_t, Allocator)
-    TSet s5(v.begin(), v.end(), 5, custom_allocator_type {});
+    TSet s5(v.begin(), v.end(), 5, custom_allocator_type{});
     static_assert(std::is_same<decltype(s5), TSet<ComplexType, std::hash<ComplexType>,
-                                                  std::equal_to<ComplexType>, custom_allocator_type>>::value);
+        std::equal_to<ComplexType>, custom_allocator_type>>::value);
 
     // check TSet(InputIterator,InputIterator, size_t, Hasher, Allocator)
-    TSet s6(v.begin(), v.end(), 5, degenerate_hash<ComplexType>(), custom_allocator_type {});
+    TSet s6(v.begin(), v.end(), 5, degenerate_hash<ComplexType>(), custom_allocator_type{});
     static_assert(std::is_same<decltype(s6), TSet<ComplexType, degenerate_hash<ComplexType>,
-                                                  std::equal_to<ComplexType>, custom_allocator_type>>::value);
+        std::equal_to<ComplexType>, custom_allocator_type>>::value);
 
     // check TSet(std::initializer_list)
     TSet s7(l);
@@ -183,33 +174,30 @@ void test_deduction_guides() {
 
     // check TSet(std::initializer_list, size_t, Hasher, Equality)
     TSet s9(l, 5, degenerate_hash<ComplexType>(), std::less<ComplexType>());
-    static_assert(
-            std::is_same<decltype(s9),
-                         TSet<ComplexType, degenerate_hash<ComplexType>, std::less<ComplexType>>>::value);
+    static_assert(std::is_same<decltype(s9), TSet<ComplexType, degenerate_hash<ComplexType>,
+        std::less<ComplexType>>>::value);
 
     // check TSet(std::initializer_list, size_t, Hasher, Equality, Allocator)
-    TSet s10(l, 5, degenerate_hash<ComplexType>(), std::less<ComplexType>(), custom_allocator_type {});
+    TSet s10(l, 5, degenerate_hash<ComplexType>(), std::less<ComplexType>(), custom_allocator_type{});
     static_assert(std::is_same<decltype(s10), TSet<ComplexType, degenerate_hash<ComplexType>,
-                                                   std::less<ComplexType>, custom_allocator_type>>::value);
+        std::less<ComplexType>, custom_allocator_type>>::value);
 
     // check TSet(std::initializer_list, size_t, Allocator)
-    TSet s11(l, 5, custom_allocator_type {});
-    static_assert(
-            std::is_same<decltype(s11), TSet<ComplexType, std::hash<ComplexType>, std::equal_to<ComplexType>,
-                                             custom_allocator_type>>::value);
+    TSet s11(l, 5, custom_allocator_type{});
+    static_assert(std::is_same<decltype(s11), TSet<ComplexType, std::hash<ComplexType>,
+        std::equal_to<ComplexType>, custom_allocator_type>>::value);
 
     // check TSet(std::initializer_list, size_t, Hasher, Allocator)
-    TSet s12(l, 5, std::hash<ComplexType>(), custom_allocator_type {});
-    static_assert(
-            std::is_same<decltype(s12), TSet<ComplexType, std::hash<ComplexType>, std::equal_to<ComplexType>,
-                                             custom_allocator_type>>::value);
+    TSet s12(l, 5, std::hash<ComplexType>(), custom_allocator_type{});
+    static_assert(std::is_same<decltype(s12), TSet<ComplexType, std::hash<ComplexType>,
+        std::equal_to<ComplexType>, custom_allocator_type>>::value);
 
     // check TSet(TSet &)
     TSet s13(s1);
     static_assert(std::is_same<decltype(s13), decltype(s1)>::value);
 
     // check TSet(TSet &, Allocator)
-    TSet s14(s5, custom_allocator_type {});
+    TSet s14(s5, custom_allocator_type{});
     // TODO: investigate why no implicit deduction guides generated for this ctor
     static_assert(std::is_same<decltype(s14), decltype(s5)>::value);
 
@@ -218,11 +206,11 @@ void test_deduction_guides() {
     static_assert(std::is_same<decltype(s15), decltype(s1)>::value);
 
     // check TSet(TSet &&, Allocator)
-    TSet s16(std::move(s5), custom_allocator_type {});
+    TSet s16(std::move(s5), custom_allocator_type{});
     // TODO: investigate why no implicit deduction guides generated for this ctor
     static_assert(std::is_same<decltype(s16), decltype(s5)>::value);
 }
-#endif// __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
+#endif // __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 
 //! Testing concurrent_unordered_set member types
 //! \brief \ref interface \ref requirement
@@ -232,15 +220,21 @@ TEST_CASE("concurrent_unordered_set member types") {
 
 //! Testing requirements of concurrent_unordered_set
 //! \brief \ref interface \ref requirement
-TEST_CASE("concurrent_unordered_set requirements") { test_basic<set_type>(); }
+TEST_CASE("concurrent_unordered_set requirements") {
+    test_basic<set_type>();
+}
 
 //! Testing multithreading support in concurrent_unordered_set
 //! \brief \ref requirement
-TEST_CASE("concurrent_unordered_set multithreading support") { test_concurrent<set_type>(); }
+TEST_CASE("concurrent_unordered_set multithreading support") {
+    test_concurrent<set_type>();
+}
 
 //! Testing move constructors and assignment operator in concurrent_unordered_set
 //! \brief \ref interface \ref requirement
-TEST_CASE("concurrent_unordered_set move semantics support") { test_rvalue_ref_support<CusetTraits>(); }
+TEST_CASE("concurrent_unordered_set move semantics support") {
+    test_rvalue_ref_support<CusetTraits>();
+}
 
 //! Testing std::initializer_list constructors and modifiers in concurrent_unordered_set
 //! \brief \ref interface \ref requirement
@@ -289,11 +283,15 @@ TEST_CASE("concurrent_unordered_multiset member types") {
 
 //! Testing requirements of concurrent_unordered_multiset
 //! \brief \ref interface \ref requirement
-TEST_CASE("concurrent_unordered_multiset requirements") { test_basic<multiset_type>(); }
+TEST_CASE("concurrent_unordered_multiset requirements") {
+    test_basic<multiset_type>();
+}
 
 //! Testing move constructors and assignment operator in concurrent_unordered_multiset
 //! \brief \ref requirement
-TEST_CASE("concurrent_unordered_multiset multithreading support") { test_concurrent<multiset_type>(); }
+TEST_CASE("concurrent_unordered_multiset multithreading support") {
+    test_concurrent<multiset_type>();
+}
 
 //! Testing move constructors and assignment operator in concurrent_unordered_multiset
 //! \brief \ref interface \ref requirement
@@ -342,4 +340,6 @@ TEST_CASE("concurrent_unordered_multiset comparisons") {
 
 //! Testing of merge operation in concurrent_unordered_set and concurrent_unordered_multiset
 //! \brief \ref interface \ref requirement
-TEST_CASE("merge operations") { node_handling_tests::test_merge<set_type, multiset_type>(1000); }
+TEST_CASE("merge operations") {
+    node_handling_tests::test_merge<set_type, multiset_type>(1000);
+}
diff --git a/external/tbb/test/conformance/conformance_concurrent_vector.cpp b/external/tbb/test/conformance/conformance_concurrent_vector.cpp
index c48dbc7d..8bc67a60 100644
--- a/external/tbb/test/conformance/conformance_concurrent_vector.cpp
+++ b/external/tbb/test/conformance/conformance_concurrent_vector.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2023 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -14,20 +14,20 @@
     limitations under the License.
 */
 
-#include "common/container_move_support.h"
-#include "common/containers_common.h"
-#include "common/custom_allocators.h"
-#include "common/initializer_list_support.h"
-#include "common/state_trackable.h"
 #include "common/test.h"
 #include "common/utils.h"
 #include "common/utils_report.h"
-#define __TBB_TEST_CPP20_COMPARISONS __TBB_CPP20_COMPARISONS_PRESENT&& __TBB_CPP20_CONCEPTS_PRESENT
+#include "common/state_trackable.h"
+#include "common/container_move_support.h"
+#include "common/custom_allocators.h"
+#include "common/initializer_list_support.h"
+#include "common/containers_common.h"
+#define __TBB_TEST_CPP20_COMPARISONS __TBB_CPP20_COMPARISONS_PRESENT && __TBB_CPP20_CONCEPTS_PRESENT
 #include "common/test_comparisons.h"
 #include "oneapi/tbb/concurrent_vector.h"
-#include "oneapi/tbb/global_control.h"
 #include "oneapi/tbb/parallel_for.h"
 #include "oneapi/tbb/tick_count.h"
+#include "oneapi/tbb/global_control.h"
 #include <initializer_list>
 #include <numeric>
 
@@ -36,34 +36,34 @@
 
 const size_t N = 8192;
 
-template <typename Vector, typename Iterator>
-void CheckConstIterator(const Vector& u, int i, const Iterator& cp) {
+template<typename Vector, typename Iterator>
+void CheckConstIterator( const Vector& u, int i, const Iterator& cp ) {
     typename Vector::const_reference pref = *cp;
-    CHECK((pref.bar() == i));
-    typename Vector::difference_type delta = cp - u.begin();
-    REQUIRE(delta == i);
-    CHECK((u[i].bar() == i));
-    REQUIRE(u.begin()[i].bar() == i);
+    CHECK((pref.bar()==i));
+    typename Vector::difference_type delta = cp-u.begin();
+    REQUIRE( delta==i );
+    CHECK((u[i].bar()==i));
+    REQUIRE( u.begin()[i].bar()==i );
 }
 
-template <typename Iterator1, typename Iterator2, typename V>
-void CheckIteratorComparison(V& u) {
+template<typename Iterator1, typename Iterator2, typename V>
+void CheckIteratorComparison( V& u ) {
     V u2 = u;
     Iterator1 i = u.begin();
 
-    for (int i_count = 0; i_count < 100; ++i_count) {
+    for( int i_count=0; i_count<100; ++i_count ) {
         Iterator2 j = u.begin();
         Iterator2 i2 = u2.begin();
-        for (int j_count = 0; j_count < 100; ++j_count) {
-            REQUIRE(((i == j) == (i_count == j_count)));
-            REQUIRE(((i != j) == (i_count != j_count)));
-            REQUIRE(((i - j) == (i_count - j_count)));
-            REQUIRE(((i < j) == (i_count < j_count)));
-            REQUIRE(((i > j) == (i_count > j_count)));
-            REQUIRE(((i <= j) == (i_count <= j_count)));
-            REQUIRE(((i >= j) == (i_count >= j_count)));
-            REQUIRE((!(i == i2)));
-            REQUIRE(i != i2);
+        for( int j_count=0; j_count<100; ++j_count ) {
+            REQUIRE( ((i==j)==(i_count==j_count)) );
+            REQUIRE( ((i!=j)==(i_count!=j_count)) );
+            REQUIRE( ((i-j)==(i_count-j_count)) );
+            REQUIRE( ((i<j)==(i_count<j_count)) );
+            REQUIRE( ((i>j)==(i_count>j_count)) );
+            REQUIRE( ((i<=j)==(i_count<=j_count)) );
+            REQUIRE( ((i>=j)==(i_count>=j_count)) );
+            REQUIRE( (!(i==i2)) );
+            REQUIRE( i!=i2 );
             ++j;
             ++i2;
         }
@@ -71,24 +71,23 @@ void CheckIteratorComparison(V& u) {
     }
 }
 
-template <typename Iterator1, typename Iterator2>
-void TestIteratorAssignment(Iterator2 j) {
+template<typename Iterator1, typename Iterator2>
+void TestIteratorAssignment( Iterator2 j ) {
     Iterator1 i(j);
-    REQUIRE(i == j);
-    REQUIRE(!(i != j));
+    REQUIRE( i==j );
+    REQUIRE( !(i!=j) );
     Iterator1 k;
     k = j;
-    REQUIRE(k == j);
-    REQUIRE(!(k != j));
+    REQUIRE( k==j );
+    REQUIRE( !(k!=j) );
 }
 
-template <typename Range1, typename Range2>
-void TestRangeAssignment(Range2 r2) {
-    Range1 r1(r2);
-    r1 = r2;
+template<typename Range1, typename Range2>
+void TestRangeAssignment( Range2 r2 ) {
+    Range1 r1(r2); r1 = r2;
 }
 
-template <typename T>
+template<typename T>
 void TestSequentialFor() {
     using V = oneapi::tbb::concurrent_vector<move_support_tests::FooWithAssign>;
     V v(N);
@@ -96,78 +95,78 @@ void TestSequentialFor() {
 
     // Check iterator
     typename V::iterator p = v.begin();
-    REQUIRE(!(*p).is_const());
-    REQUIRE(!p->is_const());
-    for (int i = 0; std::size_t(i) < v.size(); ++i, ++p) {
-        CHECK(((*p).state == move_support_tests::Foo::DefaultInitialized));
+    REQUIRE( !(*p).is_const() );
+    REQUIRE( !p->is_const() );
+    for( int i=0; std::size_t(i)<v.size(); ++i, ++p ) {
+        CHECK( ((*p).state==move_support_tests::Foo::DefaultInitialized) );
         typename V::reference pref = *p;
         pref.bar() = i;
-        typename V::difference_type delta = p - v.begin();
-        REQUIRE(delta == i);
-        REQUIRE_MESSAGE((-delta <= 0), "difference type not signed?");
+        typename V::difference_type delta = p-v.begin();
+        REQUIRE( delta==i );
+        REQUIRE_MESSAGE( (-delta<=0), "difference type not signed?" );
     }
 
     // Check const_iterator going forwards
     const V& u = v;
     typename V::const_iterator cp = u.begin();
-    REQUIRE(cp == v.cbegin());
-    REQUIRE((*cp).is_const());
-    REQUIRE((cp->is_const()));
-    REQUIRE((*cp == v.front()));
-    for (int i = 0; std::size_t(i) < u.size(); ++i) {
-        CheckConstIterator(u, i, cp);
-        V::const_iterator& cpr = ++cp;
-        REQUIRE_MESSAGE((&cpr == &cp), "pre-increment not returning a reference?");
+    REQUIRE( cp == v.cbegin() );
+    REQUIRE( (*cp).is_const() );
+    REQUIRE( (cp->is_const()) );
+    REQUIRE( (*cp == v.front()) );
+    for( int i=0; std::size_t(i)<u.size(); ++i ) {
+        CheckConstIterator(u,i,cp);
+        V::const_iterator &cpr = ++cp;
+        REQUIRE_MESSAGE( (&cpr == &cp), "pre-increment not returning a reference?");
     }
 
     // Now go backwards
     cp = u.end();
-    REQUIRE(cp == v.cend());
-    for (int i = int(u.size()); i > 0;) {
+    REQUIRE( cp == v.cend() );
+    for( int i=int(u.size()); i>0; ) {
         --i;
-        V::const_iterator& cpr = --cp;
-        REQUIRE_MESSAGE(&cpr == &cp, "pre-decrement not returning a reference?");
-        if (i > 0) {
+        V::const_iterator &cpr = --cp;
+        REQUIRE_MESSAGE( &cpr == &cp, "pre-decrement not returning a reference?");
+        if( i>0 ) {
             typename V::const_iterator cp_old = cp--;
             intptr_t here = (*cp_old).bar();
-            REQUIRE(here == u[i].bar());
+            REQUIRE( here==u[i].bar() );
             typename V::const_iterator cp_new = cp++;
             intptr_t prev = (*cp_new).bar();
-            REQUIRE(prev == u[i - 1].bar());
+            REQUIRE( prev==u[i-1].bar() );
         }
-        CheckConstIterator(u, i, cp);
+        CheckConstIterator(u,i,cp);
     }
 
     // Now go forwards and backwards
     std::ptrdiff_t k = 0;
     cp = u.begin();
-    for (std::size_t i = 0; i < u.size(); ++i) {
-        CheckConstIterator(u, int(k), cp);
-        typename V::difference_type delta = i * 3 % u.size();
-        if (0 <= k + delta && std::size_t(k + delta) < u.size()) {
-            V::const_iterator& cpr = (cp += delta);
-            REQUIRE_MESSAGE((&cpr == &cp), "+= not returning a reference?");
+    for( std::size_t i=0; i<u.size(); ++i ) {
+        CheckConstIterator(u,int(k),cp);
+        typename V::difference_type delta = i*3 % u.size();
+        if( 0<=k+delta && std::size_t(k+delta)<u.size() ) {
+            V::const_iterator &cpr = (cp += delta);
+            REQUIRE_MESSAGE( (&cpr == &cp), "+= not returning a reference?");
             k += delta;
         }
-        delta = i * 7 % u.size();
-        if (0 <= k - delta && std::size_t(k - delta) < u.size()) {
-            if (i & 1) {
-                V::const_iterator& cpr = (cp -= delta);
-                REQUIRE_MESSAGE((&cpr == &cp), "-= not returning a reference?");
+        delta = i*7 % u.size();
+        if( 0<=k-delta && std::size_t(k-delta)<u.size() ) {
+            if( i&1 ) {
+                V::const_iterator &cpr = (cp -= delta);
+                REQUIRE_MESSAGE( (&cpr == &cp), "-= not returning a reference?");
             } else
-                cp = cp - delta;// Test operator-
+                cp = cp - delta;        // Test operator-
             k -= delta;
         }
     }
 
-    for (int i = 0; std::size_t(i) < u.size(); i = (i < 50 ? i + 1 : i * 3))
-        for (int j = -i; std::size_t(i + j) < u.size(); j = (j < 50 ? j + 1 : j * 5)) {
-            REQUIRE(((u.begin() + i)[j].bar() == i + j));
-            REQUIRE(((v.begin() + i)[j].bar() == i + j));
-            REQUIRE(((v.cbegin() + i)[j].bar() == i + j));
-            REQUIRE(((i + u.begin())[j].bar() == i + j));
-            REQUIRE(((i + v.begin())[j].bar() == i + j));
-            REQUIRE(((i + v.cbegin())[j].bar() == i + j));
+    for( int i=0; std::size_t(i)<u.size(); i=(i<50?i+1:i*3) )
+        for( int j=-i; std::size_t(i+j)<u.size(); j=(j<50?j+1:j*5) ) {
+            REQUIRE( ((u.begin()+i)[j].bar()==i+j) );
+            REQUIRE( ((v.begin()+i)[j].bar()==i+j) );
+            REQUIRE( ((v.cbegin()+i)[j].bar()==i+j) );
+            REQUIRE( ((i+u.begin())[j].bar()==i+j) );
+            REQUIRE( ((i+v.begin())[j].bar()==i+j) );
+            REQUIRE(((i+v.cbegin())[j].bar()==i+j) );
         }
 
     CheckIteratorComparison<typename V::iterator, typename V::iterator>(v);
@@ -175,40 +174,40 @@ void TestSequentialFor() {
     CheckIteratorComparison<typename V::const_iterator, typename V::iterator>(v);
     CheckIteratorComparison<typename V::const_iterator, typename V::const_iterator>(v);
 
-    TestIteratorAssignment<typename V::const_iterator>(u.begin());
-    TestIteratorAssignment<typename V::const_iterator>(v.begin());
-    TestIteratorAssignment<typename V::const_iterator>(v.cbegin());
-    TestIteratorAssignment<typename V::iterator>(v.begin());
+    TestIteratorAssignment<typename V::const_iterator>( u.begin() );
+    TestIteratorAssignment<typename V::const_iterator>( v.begin() );
+    TestIteratorAssignment<typename V::const_iterator>( v.cbegin() );
+    TestIteratorAssignment<typename V::iterator>( v.begin() );
     // doesn't compile as expected: TestIteratorAssignment<typename V::iterator>( u.begin() );
 
-    TestRangeAssignment<typename V::const_range_type>(u.range());
-    TestRangeAssignment<typename V::const_range_type>(v.range());
-    TestRangeAssignment<typename V::range_type>(v.range());
+    TestRangeAssignment<typename V::const_range_type>( u.range() );
+    TestRangeAssignment<typename V::const_range_type>( v.range() );
+    TestRangeAssignment<typename V::range_type>( v.range() );
     // doesn't compile as expected: TestRangeAssignment<typename V::range_type>( u.range() );
 
     // Check reverse_iterator
     typename V::reverse_iterator rp = v.rbegin();
-    for (std::size_t i = v.size(); i > 0; --i, ++rp) {
+    for( std::size_t i=v.size(); i>0; --i, ++rp ) {
         typename V::reference pref = *rp;
-        REQUIRE((std::size_t(pref.bar()) == i - 1));
-        REQUIRE((rp != v.rend()));
+        REQUIRE( (std::size_t(pref.bar())==i-1) );
+        REQUIRE( (rp!=v.rend()) );
     }
-    REQUIRE(rp == v.rend());
+    REQUIRE( rp==v.rend() );
 
     // Check const_reverse_iterator
     typename V::const_reverse_iterator crp = u.rbegin();
-    REQUIRE(crp == v.crbegin());
-    REQUIRE(*crp == v.back());
-    for (std::size_t i = v.size(); i > 0; --i, ++crp) {
+    REQUIRE( crp == v.crbegin() );
+    REQUIRE( *crp == v.back() );
+    for(std::size_t i = v.size(); i>0; --i, ++crp) {
         typename V::const_reference cpref = *crp;
-        REQUIRE((std::size_t(cpref.bar()) == i - 1));
-        REQUIRE(crp != u.rend());
+        REQUIRE( (std::size_t(cpref.bar())==i-1) );
+        REQUIRE( crp!=u.rend() );
     }
-    REQUIRE(crp == u.rend());
-    REQUIRE(crp == v.crend());
+    REQUIRE( crp == u.rend() );
+    REQUIRE( crp == v.crend() );
 
-    TestIteratorAssignment<typename V::const_reverse_iterator>(u.rbegin());
-    TestIteratorAssignment<typename V::reverse_iterator>(v.rbegin());
+    TestIteratorAssignment<typename V::const_reverse_iterator>( u.rbegin() );
+    TestIteratorAssignment<typename V::reverse_iterator>( v.rbegin() );
 
     {
         oneapi::tbb::concurrent_vector<int> v1, v2(1ul, 100);
@@ -218,165 +217,167 @@ void TestSequentialFor() {
     }
 }
 
-inline void NextSize(int& s) {
-    if (s <= 32) ++s;
-    else
-        s += s / 10;
+inline void NextSize( int& s ) {
+    if( s<=32 ) ++s;
+    else s += s/10;
 }
 
-template <typename T, std::size_t N>
-inline T* end(T (&array)[N]) {
-    return array + utils::array_length(array);
+
+template<typename T, std::size_t N>
+inline T* end( T(& array)[N]) {
+    return array + utils::array_length(array) ;
 }
 
-template <typename vector_t>
-static void CheckVector(const vector_t& cv, std::size_t expected_size, std::size_t /*old_size*/) {
-    REQUIRE(cv.capacity() >= expected_size);
-    REQUIRE(cv.size() == expected_size);
-    REQUIRE(cv.empty() == (expected_size == 0));
-    for (int j = 0; j < int(expected_size); ++j) { CHECK((cv[j].bar() == ~j)); }
+template<typename vector_t>
+static void CheckVector( const vector_t& cv, std::size_t expected_size, std::size_t /*old_size*/ ) {
+    REQUIRE( cv.capacity()>=expected_size );
+    REQUIRE( cv.size()==expected_size );
+    REQUIRE( cv.empty()==(expected_size==0) );
+    for( int j=0; j<int(expected_size); ++j ) {
+        CHECK((cv[j].bar()==~j));
+    }
 }
 
 void TestResizeAndCopy() {
     using allocator_t = StaticSharedCountingAllocator<std::allocator<move_support_tests::Foo>>;
     using vector_t = oneapi::tbb::concurrent_vector<move_support_tests::Foo, allocator_t>;
     allocator_t::init_counters();
-    for (int old_size = 0; old_size <= 0; NextSize(old_size)) {
-        for (int new_size = 0; new_size <= 8; NextSize(new_size)) {
+    for( int old_size=0; old_size<=0; NextSize( old_size ) ) {
+        for( int new_size=0; new_size<=8; NextSize( new_size ) ) {
             std::size_t count = move_support_tests::foo_count;
 
             vector_t v;
-            REQUIRE(count == move_support_tests::foo_count);
-            v.assign(old_size / 2, move_support_tests::Foo());
-            REQUIRE(((count + old_size / 2) == move_support_tests::foo_count));
-            for (int j = 0; j < old_size / 2; ++j) {
-                REQUIRE(v[j].state == move_support_tests::Foo::CopyInitialized);
+            REQUIRE( count==move_support_tests::foo_count );
+            v.assign(old_size/2, move_support_tests::Foo() );
+            REQUIRE( ((count+old_size/2) == move_support_tests::foo_count) );
+            for( int j=0; j<old_size/2; ++j ){
+                REQUIRE( v[j].state == move_support_tests::Foo::CopyInitialized);
             }
 
             v.assign(move_support_tests::FooIterator(0), move_support_tests::FooIterator(old_size));
-            v.resize(new_size, move_support_tests::Foo(33));
-            REQUIRE(count + new_size == move_support_tests::foo_count);
-            for (int j = 0; j < new_size; ++j) {
-                int expected = j < old_size ? j : 33;
-                CHECK((v[j].bar() == expected));
+            v.resize(new_size, move_support_tests::Foo(33) );
+            REQUIRE(count+new_size==move_support_tests::foo_count);
+            for( int j=0; j<new_size; ++j ) {
+                int expected = j<old_size ? j : 33;
+                CHECK((v[j].bar()==expected));
+            }
+            REQUIRE( v.size()==std::size_t(new_size) );
+            for( int j=0; j<new_size; ++j ) {
+                v[j].bar() = ~j;
             }
-            REQUIRE(v.size() == std::size_t(new_size));
-            for (int j = 0; j < new_size; ++j) { v[j].bar() = ~j; }
 
             const vector_t& cv = v;
             // Try copy constructor
             vector_t copy_of_v(cv);
-            CheckVector(cv, new_size, old_size);
+            CheckVector(cv,new_size,old_size);
 
-            REQUIRE(!(v != copy_of_v));
+            REQUIRE( !(v != copy_of_v) );
             v.clear();
 
-            REQUIRE(v.empty());
+            REQUIRE( v.empty() );
             swap(v, copy_of_v);
-            REQUIRE(copy_of_v.empty());
-            CheckVector(v, new_size, old_size);
+            REQUIRE( copy_of_v.empty() );
+            CheckVector(v,new_size,old_size);
         }
     }
-    REQUIRE(allocator_t::items_constructed == allocator_t::items_destroyed);
-    REQUIRE(allocator_t::items_allocated == allocator_t::items_freed);
-    REQUIRE(allocator_t::allocations == allocator_t::frees);
+    REQUIRE( allocator_t::items_constructed == allocator_t::items_destroyed );
+    REQUIRE( allocator_t::items_allocated == allocator_t::items_freed );
+    REQUIRE( allocator_t::allocations == allocator_t::frees );
 }
 
+
 void TestCopyAssignment() {
     using allocator_t = StaticCountingAllocator<std::allocator<move_support_tests::FooWithAssign>>;
     using vector_t = oneapi::tbb::concurrent_vector<move_support_tests::FooWithAssign, allocator_t>;
     StaticCountingAllocator<std::allocator<move_support_tests::FooWithAssign>> init_alloc;
-    for (int dst_size = 1; dst_size <= 128; NextSize(dst_size)) {
-        for (int src_size = 2; src_size <= 128; NextSize(src_size)) {
-            vector_t u(move_support_tests::FooIterator(0), move_support_tests::FooIterator(src_size),
-                       init_alloc);
-            for (int i = 0; i < src_size; ++i) REQUIRE(u[i].bar() == i);
+    for( int dst_size=1; dst_size<=128; NextSize( dst_size ) ) {
+        for( int src_size=2; src_size<=128; NextSize( src_size ) ) {
+            vector_t u(move_support_tests::FooIterator(0), move_support_tests::FooIterator(src_size), init_alloc);
+            for( int i=0; i<src_size; ++i )
+                REQUIRE( u[i].bar()==i );
             vector_t v(dst_size, move_support_tests::FooWithAssign(), init_alloc);
-            for (int i = 0; i < dst_size; ++i) {
-                REQUIRE(v[i].state == move_support_tests::Foo::CopyInitialized);
+            for( int i=0; i<dst_size; ++i ) {
+                REQUIRE( v[i].state==move_support_tests::Foo::CopyInitialized );
                 v[i].bar() = ~i;
             }
-            REQUIRE(v != u);
+            REQUIRE( v != u );
             v.swap(u);
             CheckVector(u, dst_size, src_size);
             u.swap(v);
             // using assignment
             v = u;
-            REQUIRE(v == u);
+            REQUIRE( v == u );
             u.clear();
-            REQUIRE(u.size() == 0);
-            REQUIRE(v.size() == std::size_t(src_size));
-            for (int i = 0; i < src_size; ++i) { REQUIRE(v[i].bar() == i); }
-            u.shrink_to_fit();// deallocate unused memory
+            REQUIRE( u.size()==0 );
+            REQUIRE( v.size()==std::size_t(src_size) );
+            for( int i=0; i<src_size; ++i ){
+                REQUIRE( v[i].bar()==i );
+            }
+            u.shrink_to_fit(); // deallocate unused memory
         }
     }
-    REQUIRE(allocator_t::items_allocated == allocator_t::items_freed);
-    REQUIRE(allocator_t::allocations == allocator_t::frees);
+    REQUIRE( allocator_t::items_allocated == allocator_t::items_freed );
+    REQUIRE( allocator_t::allocations == allocator_t::frees );
 }
 
-template <typename Vector, typename T>
-void TestGrowToAtLeastWithSourceParameter(T const& src) {
+template<typename Vector, typename T>
+void TestGrowToAtLeastWithSourceParameter(T const& src){
     static const std::size_t vector_size = 10;
-    Vector v1(vector_size, src);
+    Vector v1(vector_size,src);
     Vector v2;
-    v2.grow_to_at_least(vector_size, src);
-    REQUIRE_MESSAGE(v1 == v2, "grow_to_at_least(vector_size,src) did not properly initialize new elements ?");
+    v2.grow_to_at_least(vector_size,src);
+    REQUIRE_MESSAGE(v1==v2,"grow_to_at_least(vector_size,src) did not properly initialize new elements ?");
 }
 
 void TestCapacity() {
-    using allocator_t = StaticCountingAllocator<
-            std::allocator<move_support_tests::Foo> /*TODO: oneapi::tbb::cache_aligned_allocator*/>;
+    using allocator_t = StaticCountingAllocator<std::allocator<move_support_tests::Foo> /*TODO: oneapi::tbb::cache_aligned_allocator*/>;
     using vector_t = oneapi::tbb::concurrent_vector<move_support_tests::Foo, allocator_t>;
     allocator_t::init_counters();
-    for (std::size_t old_size = 0; old_size <= 11000;
-         old_size = (old_size < 5 ? old_size + 1 : 3 * old_size)) {
-        for (std::size_t new_size = 0; new_size <= 11000;
-             new_size = (new_size < 5 ? new_size + 1 : 3 * new_size)) {
+    for( std::size_t old_size=0; old_size<=11000; old_size=(old_size<5 ? old_size+1 : 3*old_size) ) {
+        for( std::size_t new_size=0; new_size<=11000; new_size=(new_size<5 ? new_size+1 : 3*new_size) ) {
             std::size_t count = move_support_tests::foo_count;
             {
-                vector_t v;
-                v.reserve(old_size);
-                REQUIRE(v.capacity() >= old_size);
-                v.reserve(new_size);
-                REQUIRE(v.capacity() >= old_size);
-                REQUIRE(v.capacity() >= new_size);
-                REQUIRE(v.empty());
-                std::size_t fill_size = 2 * new_size;
-                for (std::size_t i = 0; i < fill_size; ++i) {
-                    REQUIRE(std::size_t(move_support_tests::foo_count) == count + i);
+                vector_t v; v.reserve(old_size);
+                REQUIRE( v.capacity()>=old_size );
+                v.reserve( new_size );
+                REQUIRE( v.capacity()>=old_size );
+                REQUIRE( v.capacity()>=new_size );
+                REQUIRE( v.empty() );
+                std::size_t fill_size = 2*new_size;
+                for (std::size_t i=0; i<fill_size; ++i) {
+                    REQUIRE( std::size_t(move_support_tests::foo_count)==count+i );
                     std::size_t j = v.grow_by(1) - v.begin();
-                    REQUIRE(j == i);
+                    REQUIRE( j==i );
                     v[j].bar() = int(~j);
                 }
-                vector_t copy_of_v(v);// should allocate first segment with same size as for shrink_to_fit()
-                if (oneapi::tbb::detail::log2(/*reserved size*/ old_size | 1)
-                    > oneapi::tbb::detail::log2(fill_size | 1)) {
-                    REQUIRE(v.capacity() != copy_of_v.capacity());
+                vector_t copy_of_v(v); // should allocate first segment with same size as for shrink_to_fit()
+                if(oneapi::tbb::detail::log2(/*reserved size*/old_size|1) > oneapi::tbb::detail::log2(fill_size|1) ){
+                   REQUIRE( v.capacity() != copy_of_v.capacity() );
                 }
                 v.shrink_to_fit();
-                REQUIRE(v.capacity() == copy_of_v.capacity());
-                CheckVector(v, new_size * 2, old_size);// check vector correctness
-                REQUIRE(v == copy_of_v);               // TODO: check also segments layout equality
+                REQUIRE( v.capacity() == copy_of_v.capacity() );
+                CheckVector(v, new_size*2, old_size); // check vector correctness
+                REQUIRE( v==copy_of_v ); // TODO: check also segments layout equality
             }
-            REQUIRE(move_support_tests::foo_count == count);
+            REQUIRE( move_support_tests::foo_count==count );
         }
     }
-    REQUIRE(allocator_t::items_allocated == allocator_t::items_freed);
-    REQUIRE(allocator_t::allocations == allocator_t::frees);
+    REQUIRE( allocator_t::items_allocated == allocator_t::items_freed );
+    REQUIRE( allocator_t::allocations == allocator_t::frees );
 }
 
-template <typename c_vector>
-std::size_t get_early_size(c_vector& v) {
-    return v.grow_by(0) - v.begin();
+template<typename c_vector>
+std::size_t get_early_size(c_vector & v){
+      return v.grow_by(0) - v.begin();
 }
 
-void verify_c_vector_size(std::size_t size, std::size_t capacity, std::size_t early_size) {
-    REQUIRE(size <= capacity);
-    REQUIRE(early_size >= size);
+void verify_c_vector_size(std::size_t size, std::size_t capacity, std::size_t early_size){
+    REQUIRE( size <= capacity );
+    REQUIRE( early_size >= size );
 }
 
-template <typename c_vector_t>
-void verify_c_vector_size(c_vector_t& c_v) {
+template<typename c_vector_t>
+void verify_c_vector_size(c_vector_t & c_v){
     verify_c_vector_size(c_v.size(), c_v.capacity(), get_early_size(c_v));
 }
 
@@ -387,147 +388,139 @@ void TestExceptions() {
 
     enum methods {
         zero_method = 0,
-        ctor_copy,
-        ctor_size,
-        assign_nt,
-        assign_ir,
-        reserve,
-        compact,
+        ctor_copy, ctor_size, assign_nt, assign_ir, reserve, compact,
         all_methods
     };
-    REQUIRE(!move_support_tests::foo_count);
+    REQUIRE( !move_support_tests::foo_count );
 
     try {
-        vector_t src(move_support_tests::FooIterator(0), move_support_tests::FooIterator(N));// original data
-
-        for (int t = 0; t < 2; ++t)// exception type
-            for (int m = zero_method + 1; m < all_methods; ++m) {
-                move_support_tests::track_foo_count<__LINE__> check_all_foo_destroyed_on_exit {};
-                move_support_tests::track_allocator_memory<allocator_t> verify_no_leak_at_exit {};
-                allocator_t::init_counters();
-                if (t) move_support_tests::max_foo_count = move_support_tests::foo_count + N / 4;
-                else
-                    allocator_t::set_limits(N / 4);
-                vector_t victim;
-                try {
-                    switch (m) {
-                        case ctor_copy: {
-                            vector_t acopy(src);
-                        } break;// auto destruction after exception is checked by ~Foo
-                        case ctor_size: {
-                            vector_t sized(N);
-                        } break;// auto destruction after exception is checked by ~Foo
-                        // Do not test assignment constructor due to reusing of same methods as below
-                        case assign_nt: {
-                            victim.assign(N, move_support_tests::FooWithAssign());
-                        } break;
-                        case assign_ir: {
-                            victim.assign(move_support_tests::FooIterator(0),
-                                          move_support_tests::FooIterator(N));
-                        } break;
-                        case reserve: {
-                            try {
-                                victim.reserve(victim.max_size() + 1);
-                            } catch (std::length_error&) {
-                            } catch (...) { INFO("ERROR: unrecognized exception - known compiler issue\n"); }
-                            victim.reserve(N);
-                        } break;
-                        case compact: {
-                            if (t) move_support_tests::max_foo_count = 0;
-                            else
-                                allocator_t::set_limits();// reset limits
-                            victim.reserve(2);
-                            victim = src;// fragmented assignment
-                            if (t) {
-                                move_support_tests::max_foo_count = move_support_tests::foo_count + 10;
-                            } else {
-                                allocator_t::set_limits(1);// block any allocation
+        vector_t src(move_support_tests::FooIterator(0), move_support_tests::FooIterator(N)); // original data
+
+        for(int t = 0; t < 2; ++t) // exception type
+        for(int m = zero_method+1; m < all_methods; ++m)
+        {
+            move_support_tests::track_foo_count<__LINE__> check_all_foo_destroyed_on_exit{};
+            move_support_tests::track_allocator_memory<allocator_t> verify_no_leak_at_exit{};
+            allocator_t::init_counters();
+            if(t) move_support_tests::max_foo_count = move_support_tests::foo_count + N/4;
+            else allocator_t::set_limits(N/4);
+            vector_t victim;
+            try {
+                switch(m) {
+                case ctor_copy: {
+                        vector_t acopy(src);
+                    } break; // auto destruction after exception is checked by ~Foo
+                case ctor_size: {
+                        vector_t sized(N);
+                    } break; // auto destruction after exception is checked by ~Foo
+                // Do not test assignment constructor due to reusing of same methods as below
+                case assign_nt: {
+                        victim.assign(N, move_support_tests::FooWithAssign());
+                    } break;
+                case assign_ir: {
+                        victim.assign(move_support_tests::FooIterator(0), move_support_tests::FooIterator(N));
+                    } break;
+                case reserve: {
+                        try {
+                            victim.reserve(victim.max_size()+1);
+                        } catch(std::length_error &) {
+                        } catch(...) {
+                            INFO("ERROR: unrecognized exception - known compiler issue\n");
+                        }
+                        victim.reserve(N);
+                    } break;
+                case compact: {
+                        if(t) move_support_tests::max_foo_count = 0; else allocator_t::set_limits(); // reset limits
+                        victim.reserve(2);
+                        victim = src; // fragmented assignment
+                        if(t) {
+                            move_support_tests::max_foo_count = move_support_tests::foo_count + 10;
+                        }
+                        else {
+                            allocator_t::set_limits(1); // block any allocation
+                        }
+                        victim.shrink_to_fit(); // should start defragmenting first segment
+                    } break;
+                default:;
+                }
+                if(!t || m != reserve) REQUIRE_MESSAGE(false, "should throw an exception");
+            } catch(std::bad_alloc &e) {
+                allocator_t::set_limits(); move_support_tests::max_foo_count = 0;
+                std::size_t capacity = victim.capacity();
+                std::size_t size = victim.size();
+
+                std::size_t req_size = get_early_size(victim);
+
+                verify_c_vector_size(size, capacity, req_size);
+
+                switch(m) {
+                case reserve:
+                    if(t) REQUIRE(false);
+                    utils_fallthrough;
+                case assign_nt:
+                case assign_ir:
+                    if(!t) {
+                        REQUIRE_MESSAGE(capacity < N/2, "unexpected capacity");
+                        REQUIRE_MESSAGE(size == 0, "unexpected size");
+                        break;
+                    } else {
+                        REQUIRE_MESSAGE(size == N, "unexpected size");
+                        REQUIRE_MESSAGE(capacity >= N, "unexpected capacity");
+                        int i;
+                        for(i = 1; ; ++i)
+                            if(!victim[i].zero_bar()) break;
+                            else {
+                                REQUIRE(victim[i].bar() == (m == assign_ir? i : move_support_tests::initial_bar));
                             }
-                            victim.shrink_to_fit();// should start defragmenting first segment
-                        } break;
-                        default:;
+                        for(; size_t(i) < size; ++i) {
+                            REQUIRE(!victim[i].zero_bar());
+                        }
+                        REQUIRE(size_t(i) == size);
+                        break;
                     }
-                    if (!t || m != reserve) REQUIRE_MESSAGE(false, "should throw an exception");
-                } catch (std::bad_alloc& e) {
-                    allocator_t::set_limits();
-                    move_support_tests::max_foo_count = 0;
-                    std::size_t capacity = victim.capacity();
-                    std::size_t size = victim.size();
-
-                    std::size_t req_size = get_early_size(victim);
-
-                    verify_c_vector_size(size, capacity, req_size);
-
-                    switch (m) {
-                        case reserve:
-                            if (t) REQUIRE(false);
-                            utils_fallthrough;
-                        case assign_nt:
-                        case assign_ir:
-                            if (!t) {
-                                REQUIRE_MESSAGE(capacity < N / 2, "unexpected capacity");
-                                REQUIRE_MESSAGE(size == 0, "unexpected size");
-                                break;
-                            } else {
-                                REQUIRE_MESSAGE(size == N, "unexpected size");
-                                REQUIRE_MESSAGE(capacity >= N, "unexpected capacity");
-                                int i;
-                                for (i = 1;; ++i)
-                                    if (!victim[i].zero_bar()) break;
-                                    else {
-                                        REQUIRE(victim[i].bar()
-                                                == (m == assign_ir ? i : move_support_tests::initial_bar));
-                                    }
-                                for (; size_t(i) < size; ++i) { REQUIRE(!victim[i].zero_bar()); }
-                                REQUIRE(size_t(i) == size);
-                                break;
-                            }
-                        case compact:
-                            REQUIRE_MESSAGE(capacity > 0, "unexpected capacity");
-                            REQUIRE_MESSAGE(victim == src, "shrink_to_fit() is broken");
-                            break;
+                case compact:
+                    REQUIRE_MESSAGE(capacity > 0, "unexpected capacity");
+                    REQUIRE_MESSAGE(victim == src, "shrink_to_fit() is broken");
+                    break;
 
-                        default:;// nothing to check here
-                    }
-                    INFO("Exception " << m << ": " << e.what() << "\t- ok\n");
+                default:; // nothing to check here
                 }
+                INFO("Exception " << m << ": " << e.what() << "\t- ok\n");
             }
-    } catch (...) { REQUIRE_MESSAGE(false, "unexpected exception"); }
+        }
+    } catch(...) {
+        REQUIRE_MESSAGE(false, "unexpected exception");
+    }
 }
 #endif
 
-void verify_c_vector_capacity_is_below(size_t capacity, size_t high) {
+void verify_c_vector_capacity_is_below(size_t capacity, size_t high){
     REQUIRE_MESSAGE(capacity > 0, "unexpected capacity");
     REQUIRE_MESSAGE(capacity < high, "unexpected capacity");
 }
 
-template <typename allocator_t>
+template<typename allocator_t>
 void verify_vector_partially_copied(
-        oneapi::tbb::concurrent_vector<move_support_tests::FooWithAssign, allocator_t> const& victim,
-        size_t planned_victim_size,
-        oneapi::tbb::concurrent_vector<move_support_tests::FooWithAssign, allocator_t> const& src,
-        bool is_memory_allocation_failure) {
-    if (is_memory_allocation_failure) {// allocator generated exception
+        oneapi::tbb::concurrent_vector<move_support_tests::FooWithAssign, allocator_t> const& victim, size_t planned_victim_size,
+        oneapi::tbb::concurrent_vector<move_support_tests::FooWithAssign, allocator_t> const& src,  bool is_memory_allocation_failure)
+{
+    if (is_memory_allocation_failure) { // allocator generated exception
         using vector_t = oneapi::tbb::concurrent_vector<move_support_tests::FooWithAssign, allocator_t>;
-        REQUIRE_MESSAGE(victim == vector_t(src.begin(), src.begin() + victim.size(), src.get_allocator()),
-                        "failed to properly copy of source ?");
-    } else {
-        REQUIRE_MESSAGE(std::equal(victim.begin(), victim.begin() + planned_victim_size, src.begin()),
-                        "failed to properly copy items before the exception?");
-        REQUIRE_MESSAGE((std::all_of(victim.begin() + planned_victim_size, victim.end(),
-                                     is_state_predicate<move_support_tests::Foo::ZeroInitialized>())),
-                        "failed to zero-initialize items left not constructed after the exception?");
+        REQUIRE_MESSAGE( victim == vector_t(src.begin(), src.begin() + victim.size(), src.get_allocator()), "failed to properly copy of source ?" );
+    }else{
+        REQUIRE_MESSAGE( std::equal(victim.begin(), victim.begin() + planned_victim_size, src.begin()), "failed to properly copy items before the exception?" );
+        REQUIRE_MESSAGE( (std::all_of( victim.begin() + planned_victim_size, victim.end(), is_state_predicate<move_support_tests::Foo::ZeroInitialized>()) ), "failed to zero-initialize items left not constructed after the exception?" );
     }
 }
 
-template <typename vector_t>
-void verify_last_segment_allocation_failed(vector_t const& victim) {
+template<typename vector_t>
+void verify_last_segment_allocation_failed(vector_t const& victim){
     utils::suppress_unused_warning(victim);
     CHECK_THROWS_AS((victim.at(victim.size())), std::out_of_range);
 }
 
-template <typename vector_t>
-void verify_copy_and_assign_from_produce_the_same(vector_t const& victim) {
+template<typename vector_t>
+void verify_copy_and_assign_from_produce_the_same(vector_t const& victim){
     //TODO: remove explicit copy of allocator when full support of C++11 allocator_traits in concurrent_vector is present
     vector_t copy_of_victim(victim, victim.get_allocator());
     REQUIRE_MESSAGE(copy_of_victim == victim, "copy doesn't match original");
@@ -536,110 +529,105 @@ void verify_copy_and_assign_from_produce_the_same(vector_t const& victim) {
     REQUIRE_MESSAGE(copy_of_victim == copy_of_victim2, "assignment doesn't match copying");
 }
 
-template <typename vector_t>
-void verify_assignment_operator_throws_bad_last_alloc(vector_t& victim) {
+template<typename vector_t>
+void verify_assignment_operator_throws_bad_last_alloc(vector_t & victim){
     vector_t copy_of_victim(victim, victim.get_allocator());
     //CHECK_THROWS_AS(victim = copy_of_victim, oneapi::tbb::bad_last_alloc); //TODO exceptions support
 }
 
 #if _MSC_VER
-#pragma warning(push)
+#pragma warning (push)
 // Forcing value to bool 'true' or 'false'
-#pragma warning(disable : 4800)
-#endif//#if _MSC_VER
+#pragma warning (disable: 4800)
+#endif //#if _MSC_VER
 
 //TODO: split into two separate tests
 //TODO: remove code duplication in exception safety tests
-void test_ex_assign_operator() {
+void test_ex_assign_operator(){
     //TODO: use __FUNCTION__ for test name
     using allocator_t = StaticCountingAllocator<std::allocator<move_support_tests::FooWithAssign>>;
     using vector_t = oneapi::tbb::concurrent_vector<move_support_tests::FooWithAssign, allocator_t>;
 
-    move_support_tests::track_foo_count<__LINE__> check_all_foo_destroyed_on_exit {};
-    move_support_tests::track_allocator_memory<allocator_t> verify_no_leak_at_exit {};
+    move_support_tests::track_foo_count<__LINE__> check_all_foo_destroyed_on_exit{};
+    move_support_tests::track_allocator_memory<allocator_t> verify_no_leak_at_exit{};
 
-    vector_t src(move_support_tests::FooIterator(0), move_support_tests::FooIterator(N));// original data
+    vector_t src(move_support_tests::FooIterator(0), move_support_tests::FooIterator(N)); // original data
 
-    const size_t planned_victim_size = N / 4;
+    const size_t planned_victim_size = N/4;
 
-    for (int t = 0; t < 2; ++t) {// exception type
+    for(int t = 0; t < 2; ++t) { // exception type
         vector_t victim;
-        victim.reserve(2);// get fragmented assignment
-        REQUIRE_THROWS_AS(
-                [&]() {
-                    move_support_tests::LimitFooCountInScope foo_limit(
-                            move_support_tests::foo_count + planned_victim_size, t);
-                    move_support_tests::LimitAllocatedItemsInScope<allocator_t> allocator_limit(
-                            allocator_t::items_allocated + planned_victim_size, !t);
-
-                    victim = src;// fragmented assignment
-                }(),
-                const std::bad_alloc);
+        victim.reserve(2); // get fragmented assignment
+        REQUIRE_THROWS_AS([&](){
+            move_support_tests::LimitFooCountInScope foo_limit(move_support_tests::foo_count + planned_victim_size, t);
+            move_support_tests::LimitAllocatedItemsInScope<allocator_t> allocator_limit(allocator_t::items_allocated + planned_victim_size, !t);
+
+            victim = src; // fragmented assignment
+        }(), const std::bad_alloc);
 
         verify_c_vector_size(victim);
 
-        if (!t) { verify_c_vector_capacity_is_below(victim.capacity(), N); }
+        if(!t) {
+            verify_c_vector_capacity_is_below(victim.capacity(), N);
+        }
 
         verify_vector_partially_copied(victim, planned_victim_size, src, !t);
         verify_last_segment_allocation_failed(victim);
         verify_copy_and_assign_from_produce_the_same(victim);
-        verify_assignment_operator_throws_bad_last_alloc(victim);//TODO exceptions support
+        verify_assignment_operator_throws_bad_last_alloc(victim); //TODO exceptions support
     }
 }
 
 #if _MSC_VER
-#pragma warning(pop)
+#pragma warning (pop)
 #endif
 
-template <typename T>
-void AssertSameType(const T& /*x*/, const T& /*y*/) {}
+template<typename T>
+void AssertSameType( const T& /*x*/, const T& /*y*/ ) {}
 
 struct test_grow_by {
-    template <typename container_type, typename element_type>
-    static void test(std::initializer_list<element_type> const& il, container_type const& expected) {
+    template<typename container_type, typename element_type>
+    static void test( std::initializer_list<element_type> const& il, container_type const& expected ) {
         container_type vd;
-        vd.grow_by(il);
-        REQUIRE_MESSAGE(vd == expected, "grow_by with an initializer list failed");
+        vd.grow_by( il );
+        REQUIRE_MESSAGE( vd == expected, "grow_by with an initializer list failed" );
     }
 };
 
-template <typename Iterator, typename T>
+template<typename Iterator, typename T>
 void TestIteratorTraits() {
-    AssertSameType(static_cast<typename Iterator::difference_type*>(0), static_cast<std::ptrdiff_t*>(0));
-    AssertSameType(static_cast<typename Iterator::value_type*>(0), static_cast<T*>(0));
-    AssertSameType(static_cast<typename Iterator::pointer*>(0), static_cast<T**>(0));
-    AssertSameType(static_cast<typename Iterator::iterator_category*>(0),
-                   static_cast<std::random_access_iterator_tag*>(0));
+    AssertSameType( static_cast<typename Iterator::difference_type*>(nullptr), static_cast<std::ptrdiff_t*>(nullptr) );
+    AssertSameType( static_cast<typename Iterator::value_type*>(nullptr), static_cast<T*>(nullptr) );
+    AssertSameType( static_cast<typename Iterator::pointer*>(nullptr), static_cast<T**>(nullptr) );
+    AssertSameType( static_cast<typename Iterator::iterator_category*>(nullptr), static_cast<std::random_access_iterator_tag*>(nullptr) );
     T x;
     typename Iterator::reference xr = x;
     typename Iterator::pointer xp = &x;
-    REQUIRE(&xr == xp);
+    REQUIRE( &xr==xp );
 }
 
 void TestInitList() {
     using namespace initializer_list_support_tests;
-    test_initializer_list_support<oneapi::tbb::concurrent_vector<char>, test_grow_by>({1, 2, 3, 4, 5});
-    test_initializer_list_support<oneapi::tbb::concurrent_vector<int>, test_grow_by>({});
+    test_initializer_list_support<oneapi::tbb::concurrent_vector<char>, test_grow_by>( { 1, 2, 3, 4, 5 } );
+    test_initializer_list_support<oneapi::tbb::concurrent_vector<int>, test_grow_by>( {} );
 }
 
 namespace TestMoveInShrinkToFitHelpers {
-    struct dummy : StateTrackable<> {
+    struct dummy : StateTrackable<>{
         int i;
         dummy(int an_i) noexcept : StateTrackable<>(0), i(an_i) {}
 
-        friend bool operator==(const dummy& lhs, const dummy& rhs) { return lhs.i == rhs.i; }
+        friend bool operator== (const dummy &lhs, const dummy &rhs){ return lhs.i == rhs.i; }
     };
-}// namespace TestMoveInShrinkToFitHelpers
+}
 
-void TestSerialMoveInShrinkToFit() {
+void TestSerialMoveInShrinkToFit(){
     using TestMoveInShrinkToFitHelpers::dummy;
 
-    static_assert(std::is_nothrow_move_constructible<dummy>::value,
-                  "incorrect test setup or broken configuration?");
+    static_assert(std::is_nothrow_move_constructible<dummy>::value,"incorrect test setup or broken configuration?");
     {
         dummy src(0);
-        REQUIRE_MESSAGE(is_state<StateTrackableBase::MoveInitialized>(dummy(std::move_if_noexcept(src))),
-                        "broken configuration ?");
+        REQUIRE_MESSAGE(is_state<StateTrackableBase::MoveInitialized>(dummy(std::move_if_noexcept(src))),"broken configuration ?");
     }
     static const std::size_t sequence_size = 15;
     using c_vector_t = oneapi::tbb::concurrent_vector<dummy>;
@@ -647,35 +635,27 @@ void TestSerialMoveInShrinkToFit() {
     std::generate_n(source.begin(), source.size(), std::rand);
 
     c_vector_t c_vector;
-    c_vector.reserve(1);//make it fragmented
+    c_vector.reserve(1); //make it fragmented
 
     c_vector.assign(source.begin(), source.end());
     move_support_tests::MemoryLocations c_vector_before_shrink(c_vector);
     c_vector.shrink_to_fit();
 
-    REQUIRE_MESSAGE(c_vector_before_shrink.content_location_changed(c_vector),
-                    "incorrect test setup? shrink_to_fit should cause moving elements to other memory "
-                    "locations while it is not");
-    REQUIRE_MESSAGE((std::all_of(c_vector.begin(), c_vector.end(),
-                                 is_state_predicate<StateTrackableBase::MoveInitialized>())),
-                    "container did not move construct some elements?");
-    REQUIRE((c_vector == c_vector_t(source.begin(), source.end())));
+    REQUIRE_MESSAGE(c_vector_before_shrink.content_location_changed(c_vector), "incorrect test setup? shrink_to_fit should cause moving elements to other memory locations while it is not");
+    REQUIRE_MESSAGE((std::all_of(c_vector.begin(), c_vector.end(), is_state_predicate<StateTrackableBase::MoveInitialized>())), "container did not move construct some elements?");
+    REQUIRE((c_vector == c_vector_t(source.begin(),source.end())));
 }
 
 struct default_container_traits {
     template <typename container_type, typename iterator_type>
-    static container_type&
-    construct_container(typename std::aligned_storage<sizeof(container_type)>::type& storage,
-                        iterator_type begin, iterator_type end) {
+    static container_type& construct_container(typename std::aligned_storage<sizeof(container_type)>::type& storage, iterator_type begin, iterator_type end){
         container_type* ptr = reinterpret_cast<container_type*>(&storage);
         new (ptr) container_type(begin, end);
         return *ptr;
     }
 
     template <typename container_type, typename iterator_type, typename allocator_type>
-    static container_type&
-    construct_container(typename std::aligned_storage<sizeof(container_type)>::type& storage,
-                        iterator_type begin, iterator_type end, allocator_type const& a) {
+    static container_type& construct_container(typename std::aligned_storage<sizeof(container_type)>::type& storage, iterator_type begin, iterator_type end, allocator_type const& a){
         container_type* ptr = reinterpret_cast<container_type*>(&storage);
         new (ptr) container_type(begin, end, a);
         return *ptr;
@@ -690,70 +670,66 @@ struct c_vector_type : default_container_traits {
     using container_value_type = T;
 
     using init_iterator_type = move_support_tests::FooIterator;
-    template <typename element_type, typename allocator_type>
-    struct apply {
-        using type = oneapi::tbb::concurrent_vector<element_type, allocator_type>;
+    template<typename element_type, typename allocator_type>
+    struct apply{
+        using type = oneapi::tbb::concurrent_vector<element_type,  allocator_type >;
     };
 
-    enum { expected_number_of_items_to_allocate_for_steal_move = 0 };
+    enum{ expected_number_of_items_to_allocate_for_steal_move = 0 };
 
-    template <typename element_type, typename allocator_type, typename iterator>
-    static bool equal(oneapi::tbb::concurrent_vector<element_type, allocator_type> const& c, iterator begin,
-                      iterator end) {
-        bool equal_sizes = (std::size_t) std::distance(begin, end) == c.size();
-        return equal_sizes && std::equal(c.begin(), c.end(), begin);
+    template<typename element_type, typename allocator_type, typename iterator>
+    static bool equal(oneapi::tbb::concurrent_vector<element_type, allocator_type > const& c, iterator begin, iterator end){
+        bool equal_sizes = (std::size_t)std::distance(begin, end) == c.size();
+        return  equal_sizes && std::equal(c.begin(), c.end(), begin);
     }
 };
 
-void TestSerialGrowByWithMoveIterators() {
+void TestSerialGrowByWithMoveIterators(){
     using fixture_t = move_support_tests::DefaultStatefulFixtureHelper<c_vector_type>::type;
     using vector_t = fixture_t::container_type;
 
     fixture_t fixture;
 
     vector_t dst(fixture.dst_allocator);
-    dst.grow_by(std::make_move_iterator(fixture.source.begin()),
-                std::make_move_iterator(fixture.source.end()));
+    dst.grow_by(std::make_move_iterator(fixture.source.begin()), std::make_move_iterator(fixture.source.end()));
 
     fixture.verify_content_deep_moved(dst);
 }
 
 namespace test_grow_to_at_least_helpers {
-    template <typename MyVector>
+    template<typename MyVector >
     class GrowToAtLeast {
         using const_reference = typename MyVector::const_reference;
 
-        const bool my_use_two_args_form;
+        const bool my_use_two_args_form ;
         MyVector& my_vector;
         const_reference my_init_from;
-
     public:
-        void operator()(const oneapi::tbb::blocked_range<std::size_t>& range) const {
-            for (std::size_t i = range.begin(); i != range.end(); ++i) {
+        void operator()( const oneapi::tbb::blocked_range<std::size_t>& range ) const {
+            for( std::size_t i=range.begin(); i!=range.end(); ++i ) {
                 std::size_t n = my_vector.size();
-                std::size_t req = (i % (2 * n + 1)) + 1;
+                std::size_t req = (i % (2*n+1))+1;
 
                 typename MyVector::iterator p;
                 move_support_tests::Foo::State desired_state;
-                if (my_use_two_args_form) {
-                    p = my_vector.grow_to_at_least(req, my_init_from);
+                if (my_use_two_args_form){
+                    p = my_vector.grow_to_at_least(req,my_init_from);
                     desired_state = move_support_tests::Foo::CopyInitialized;
-                } else {
+                }else{
                     p = my_vector.grow_to_at_least(req);
                     desired_state = move_support_tests::Foo::DefaultInitialized;
                 }
-                if (p - my_vector.begin() < typename MyVector::difference_type(req))
-                    CHECK((p->state == desired_state
-                           || p->state == move_support_tests::Foo::ZeroInitialized));
+                if( p-my_vector.begin() < typename MyVector::difference_type(req) )
+                    CHECK((p->state == desired_state || p->state == move_support_tests::Foo::ZeroInitialized));
                 CHECK(my_vector.size() >= req);
             }
         }
-        GrowToAtLeast(bool use_two_args_form, MyVector& vector, const_reference init_from)
+        GrowToAtLeast(bool use_two_args_form, MyVector& vector, const_reference init_from )
             : my_use_two_args_form(use_two_args_form), my_vector(vector), my_init_from(init_from) {}
     };
-}// namespace test_grow_to_at_least_helpers
+}
 
-template <bool use_two_arg_form>
+template<bool use_two_arg_form>
 void TestConcurrentGrowToAtLeastImpl() {
     using namespace test_grow_to_at_least_helpers;
     using MyAllocator = StaticCountingAllocator<std::allocator<move_support_tests::Foo>>;
@@ -761,46 +737,49 @@ void TestConcurrentGrowToAtLeastImpl() {
     move_support_tests::Foo copy_from;
     MyAllocator::init_counters();
     MyVector v(2, move_support_tests::Foo(), MyAllocator());
-    for (std::size_t s = 1; s < 1000; s *= 10) {
-        oneapi::tbb::parallel_for(oneapi::tbb::blocked_range<std::size_t>(0, 10000 * s, s),
-                                  GrowToAtLeast<MyVector>(use_two_arg_form, v, copy_from),
-                                  oneapi::tbb::simple_partitioner());
+    for (std::size_t s=1; s<1000; s*=10) {
+        oneapi::tbb::parallel_for(oneapi::tbb::blocked_range<std::size_t>(0, 10000*s, s), GrowToAtLeast<MyVector>(use_two_arg_form, v, copy_from), oneapi::tbb::simple_partitioner());
     }
 
     v.clear();
     v.shrink_to_fit();
     std::size_t items_allocated = v.get_allocator().items_allocated,
-                items_freed = v.get_allocator().items_freed;
-    std::size_t allocations = v.get_allocator().allocations, frees = v.get_allocator().frees;
-    REQUIRE(items_allocated == items_freed);
-    REQUIRE(allocations == frees);
+           items_freed = v.get_allocator().items_freed;
+    std::size_t allocations = v.get_allocator().allocations,
+           frees = v.get_allocator().frees;
+    REQUIRE( items_allocated == items_freed );
+    REQUIRE( allocations == frees );
 }
 
 struct AssignElement {
     using iterator = oneapi::tbb::concurrent_vector<int>::range_type::iterator;
     iterator base;
-    void operator()(const oneapi::tbb::concurrent_vector<int>::range_type& range) const {
+    void operator()( const oneapi::tbb::concurrent_vector<int>::range_type& range ) const {
         for (iterator i = range.begin(); i != range.end(); ++i) {
-            if (*i != 0) { REPORT("ERROR for v[%ld]\n", long(i - base)); }
-            *i = int(i - base);
+            if (*i != 0) {
+                REPORT("ERROR for v[%ld]\n", long(i - base));
+            }
+            *i = int(i-base);
         }
     }
-    AssignElement(iterator base_) : base(base_) {}
+    AssignElement( iterator base_ ) : base(base_) {}
 };
 
 struct CheckElement {
     using iterator = oneapi::tbb::concurrent_vector<int>::const_range_type::iterator;
     iterator base;
-    void operator()(const oneapi::tbb::concurrent_vector<int>::const_range_type& range) const {
+    void operator()( const oneapi::tbb::concurrent_vector<int>::const_range_type& range ) const {
         for (iterator i = range.begin(); i != range.end(); ++i) {
-            if (*i != int(i - base)) { REPORT("ERROR for v[%ld]\n", long(i - base)); }
+            if (*i != int(i-base)) {
+                REPORT("ERROR for v[%ld]\n", long(i-base));
+            }
         }
     }
-    CheckElement(iterator base_) : base(base_) {}
+    CheckElement( iterator base_ ) : base(base_) {}
 };
 
 // Test parallel access by iterators
-void TestParallelFor(std::size_t nthread) {
+void TestParallelFor( std::size_t nthread ) {
     using vector_type = oneapi::tbb::concurrent_vector<int>;
     vector_type v;
     v.resize(N);
@@ -811,13 +790,16 @@ void TestParallelFor(std::size_t nthread) {
     const vector_type& u = v;
     oneapi::tbb::parallel_for(u.range(10000), CheckElement(u.begin()));
     oneapi::tbb::tick_count t2 = oneapi::tbb::tick_count::now();
-    INFO("Time for parallel_for: assign time = " << (t1 - t0).seconds()
-                                                 << " , check time = " << (t2 - t1).seconds());
+    INFO("Time for parallel_for: assign time = " << (t1 - t0).seconds() <<
+        " , check time = " << (t2 - t1).seconds());
     for (int i = 0; std::size_t(i) < v.size(); ++i) {
-        if (v[i] != i) { REPORT("ERROR for v[%ld]\n", i); }
+        if (v[i] != i) {
+            REPORT("ERROR for v[%ld]\n", i);
+        }
     }
 }
 
+
 struct grain_map {
     enum grow_method_enum {
         grow_by_range = 1,
@@ -842,21 +824,20 @@ struct grain_map {
     const std::size_t total_number_of_parts;
 
     grain_map(const range_part* begin, const range_part* end)
-        : distributed(separate(begin, end, &distributed::is_not)),
-          batched(separate(begin, end, &distributed::is_yes)),
-          total_number_of_parts(std::accumulate(begin, end, (std::size_t) 0, &sum_number_of_parts::sum)) {}
+    : distributed(separate(begin,end, &distributed::is_not))
+    , batched(separate(begin,end, &distributed::is_yes))
+    , total_number_of_parts(std::accumulate(begin, end, (std::size_t)0, &sum_number_of_parts::sum))
+    {}
 
 private:
-    struct sum_number_of_parts {
-        static std::size_t sum(std::size_t accumulator, grain_map::range_part const& rp) {
-            return accumulator + rp.number_of_parts;
-        }
+    struct sum_number_of_parts{
+        static std::size_t sum(std::size_t accumulator, grain_map::range_part const& rp){ return accumulator + rp.number_of_parts;}
     };
 
     template <typename functor_t>
-    static std::vector<range_part> separate(const range_part* begin, const range_part* end, functor_t f) {
+    static std::vector<range_part> separate(const range_part* begin, const range_part* end, functor_t f){
         std::vector<range_part> part;
-        part.reserve(std::distance(begin, end));
+        part.reserve(std::distance(begin,end));
         //copy all that false==f(*it)
         std::remove_copy_if(begin, end, std::back_inserter(part), f);
 
@@ -864,78 +845,71 @@ struct grain_map {
     }
 
     struct distributed {
-        static bool is_not(range_part const& rp) { return !rp.distribute; }
-        static bool is_yes(range_part const& rp) { return rp.distribute; }
+        static bool is_not(range_part const& rp){ return !rp.distribute;}
+        static bool is_yes(range_part const& rp){ return rp.distribute;}
     };
 };
 
+
 //! Test concurrent invocations of method concurrent_vector::grow_by
-template <typename MyVector>
+template<typename MyVector>
 class GrowBy {
     MyVector& my_vector;
     const grain_map& my_grain_map;
     std::size_t my_part_weight;
-
 public:
-    void operator()(const oneapi::tbb::blocked_range<std::size_t>& range) const {
+    void operator()( const oneapi::tbb::blocked_range<std::size_t>& range ) const {
         CHECK(range.begin() < range.end());
 
         std::size_t current_adding_index_in_cvector = range.begin();
 
-        for (std::size_t index = 0; index < my_grain_map.batched.size(); ++index) {
+        for (std::size_t index = 0; index < my_grain_map.batched.size(); ++index){
             const grain_map::range_part& batch_part = my_grain_map.batched[index];
             const std::size_t number_of_items_to_add = batch_part.number_of_parts * my_part_weight;
             const std::size_t end = current_adding_index_in_cvector + number_of_items_to_add;
 
-            switch (batch_part.method) {
-                case grain_map::grow_by_range: {
-                    my_vector.grow_by(move_support_tests::FooIterator(current_adding_index_in_cvector),
-                                      move_support_tests::FooIterator(end));
+            switch(batch_part.method){
+            case grain_map::grow_by_range : {
+                    my_vector.grow_by(move_support_tests::FooIterator(current_adding_index_in_cvector), move_support_tests::FooIterator(end));
                 } break;
-                case grain_map::grow_by_default: {
+            case grain_map::grow_by_default : {
                     typename MyVector::iterator const s = my_vector.grow_by(number_of_items_to_add);
                     for (std::size_t k = 0; k < number_of_items_to_add; ++k) {
                         s[k].bar() = current_adding_index_in_cvector + k;
                     }
                 } break;
-                case grain_map::grow_by_init_list: {
+            case grain_map::grow_by_init_list : {
                     move_support_tests::FooIterator curr(current_adding_index_in_cvector);
                     for (std::size_t k = 0; k < number_of_items_to_add; ++k) {
                         if (k + 4 < number_of_items_to_add) {
-                            my_vector.grow_by({*curr++, *curr++, *curr++, *curr++, *curr++});
+                            my_vector.grow_by( { *curr++, *curr++, *curr++, *curr++, *curr++ } );
                             k += 4;
                         } else {
-                            my_vector.grow_by({*curr++});
+                            my_vector.grow_by( { *curr++ } );
                         }
                     }
                     CHECK(curr == move_support_tests::FooIterator(end));
                 } break;
-                default: {
-                    REQUIRE_MESSAGE(false, "using unimplemented method of batch add in ConcurrentGrow test.");
-                } break;
+            default : { REQUIRE_MESSAGE(false, "using unimplemented method of batch add in ConcurrentGrow test.");} break;
             };
 
             current_adding_index_in_cvector = end;
         }
 
         std::vector<std::size_t> items_left_to_add(my_grain_map.distributed.size());
-        for (std::size_t i = 0; i < my_grain_map.distributed.size(); ++i) {
+        for (std::size_t i=0; i < my_grain_map.distributed.size(); ++i) {
             items_left_to_add[i] = my_grain_map.distributed[i].number_of_parts * my_part_weight;
         }
 
-        for (; current_adding_index_in_cvector < range.end(); ++current_adding_index_in_cvector) {
+        for (;current_adding_index_in_cvector < range.end(); ++current_adding_index_in_cvector) {
             std::size_t method_index = current_adding_index_in_cvector % my_grain_map.distributed.size();
 
             if (!items_left_to_add[method_index]) {
-                struct not_zero {
-                    static bool is(std::size_t items_to_add) { return items_to_add != 0; }
+                struct not_zero{
+                    static bool is(std::size_t items_to_add){ return items_to_add != 0;}
                 };
-                method_index = std::distance(
-                        items_left_to_add.begin(),
-                        std::find_if(items_left_to_add.begin(), items_left_to_add.end(), &not_zero::is));
-                REQUIRE_MESSAGE(method_index < my_grain_map.distributed.size(),
-                                "incorrect test setup - wrong expected distribution: left free space but no "
-                                "elements to add?");
+                method_index = std::distance(items_left_to_add.begin(), std::find_if(items_left_to_add.begin(), items_left_to_add.end(), &not_zero::is));
+                REQUIRE_MESSAGE(method_index < my_grain_map.distributed.size(), "incorrect test setup - wrong expected distribution: left free space but no elements to add?");
             };
 
             REQUIRE_MESSAGE(items_left_to_add[method_index], "logic error ?");
@@ -945,57 +919,57 @@ class GrowBy {
             typename MyVector::value_type source;
             source.bar() = current_adding_index_in_cvector;
 
-            switch (distributed_part.method) {
-                case grain_map::grow_by_default: {
+            switch(distributed_part.method){
+            case grain_map::grow_by_default : {
                     (r = my_vector.grow_by(1))->bar() = current_adding_index_in_cvector;
                 } break;
-                case grain_map::grow_by_copy: {
+            case grain_map::grow_by_copy : {
                     r = my_vector.grow_by(1, source);
                 } break;
-                case grain_map::push_back: {
+            case grain_map::push_back : {
                     r = my_vector.push_back(source);
                 } break;
-                case grain_map::push_back_move: {
+            case grain_map::push_back_move : {
                     r = my_vector.push_back(std::move(source));
                 } break;
-                case grain_map::emplace_back: {
+            case grain_map::emplace_back : {
                     r = my_vector.emplace_back(current_adding_index_in_cvector);
                 } break;
 
-                default: {
-                    REQUIRE_MESSAGE(false, "using unimplemented method of batch add in ConcurrentGrow test.");
-                } break;
+            default : { REQUIRE_MESSAGE(false, "using unimplemented method of batch add in ConcurrentGrow test.");} break;
             };
 
             CHECK(static_cast<std::size_t>(r->bar()) == current_adding_index_in_cvector);
+            }
+
         }
-    }
 
-    GrowBy(MyVector& vector, const grain_map& m, std::size_t part_weight)
-        : my_vector(vector), my_grain_map(m), my_part_weight(part_weight) {}
+    GrowBy( MyVector& vector, const grain_map& m, std::size_t part_weight )
+    : my_vector(vector), my_grain_map(m), my_part_weight(part_weight)
+    {}
 };
 
 //! Test concurrent invocations of grow methods
 void TestConcurrentGrowBy() {
 
-    const grain_map::range_part concurrent_grow_single_range_map[] = {
-            //  number_of_parts,         method,             distribute,   expected_element_state
-            {3, grain_map::grow_by_range, false, move_support_tests::Foo::MoveInitialized},
+    const grain_map::range_part concurrent_grow_single_range_map [] = {
+    //  number_of_parts,         method,             distribute,   expected_element_state
+            {3,           grain_map::grow_by_range,     false,   move_support_tests::Foo::MoveInitialized},
 
-            {1, grain_map::grow_by_init_list, false, move_support_tests::Foo::CopyInitialized},
+            {1,           grain_map::grow_by_init_list, false,   move_support_tests::Foo::CopyInitialized},
 
-            {2, grain_map::grow_by_default, false, move_support_tests::Foo::DefaultInitialized},
-            {1, grain_map::grow_by_default, true, move_support_tests::Foo::DefaultInitialized},
-            {1, grain_map::grow_by_copy, true, move_support_tests::Foo::CopyInitialized},
-            {1, grain_map::push_back, true, move_support_tests::Foo::CopyInitialized},
+            {2,           grain_map::grow_by_default,   false,   move_support_tests::Foo::DefaultInitialized},
+            {1,           grain_map::grow_by_default,   true,    move_support_tests::Foo::DefaultInitialized},
+            {1,           grain_map::grow_by_copy,      true,    move_support_tests::Foo::CopyInitialized},
+            {1,           grain_map::push_back,         true,    move_support_tests::Foo::CopyInitialized},
 
-            {1, grain_map::push_back_move, true, move_support_tests::Foo::MoveInitialized},
+            {1,           grain_map::push_back_move,    true,    move_support_tests::Foo::MoveInitialized},
 
-            {1, grain_map::emplace_back, true, move_support_tests::Foo::DirectInitialized},
+            {1,           grain_map::emplace_back,      true,    move_support_tests::Foo::DirectInitialized},
 
     };
 
-    using MyAllocator = StaticCountingAllocator<std::allocator<move_support_tests::Foo>>;
+    using MyAllocator = StaticCountingAllocator<std::allocator<move_support_tests::Foo> >;
     using MyVector = oneapi::tbb::concurrent_vector<move_support_tests::Foo, MyAllocator>;
 
     MyAllocator::init_counters();
@@ -1006,73 +980,58 @@ void TestConcurrentGrowBy() {
 
         static const std::size_t part_weight = desired_grain_size / m.total_number_of_parts;
         static const std::size_t grain_size = part_weight * m.total_number_of_parts;
-        static const std::size_t number_of_grains
-                = 8;//this should be (power of two) in order to get minimal ranges equal to grain_size
+        static const std::size_t number_of_grains = 8; //this should be (power of two) in order to get minimal ranges equal to grain_size
         static const std::size_t range_size = grain_size * number_of_grains;
 
         MyAllocator a;
         MyVector v(a);
-        oneapi::tbb::parallel_for(oneapi::tbb::blocked_range<std::size_t>(0, range_size, grain_size),
-                                  GrowBy<MyVector>(v, m, part_weight), oneapi::tbb::simple_partitioner());
+        oneapi::tbb::parallel_for(oneapi::tbb::blocked_range<std::size_t>(0, range_size, grain_size), GrowBy<MyVector>(v, m, part_weight), oneapi::tbb::simple_partitioner());
 
-        REQUIRE(v.size() == std::size_t(range_size));
+        REQUIRE( v.size() == std::size_t(range_size) );
 
         // Verify that v is a permutation of 0..m
-        size_t inversions = 0, direct_inits = 0, def_inits = 0, copy_inits = 0, move_inits = 0;
+        size_t direct_inits = 0, def_inits = 0, copy_inits = 0, move_inits = 0;
         std::vector<bool> found(range_size, 0);
-        for (std::size_t i = 0; i < range_size; ++i) {
-            if (v[i].state == move_support_tests::Foo::DefaultInitialized) ++def_inits;
-            else if (v[i].state == move_support_tests::Foo::DirectInitialized)
-                ++direct_inits;
-            else if (v[i].state == move_support_tests::Foo::CopyInitialized)
-                ++copy_inits;
-            else if (v[i].state == move_support_tests::Foo::MoveInitialized)
-                ++move_inits;
+        for( std::size_t i=0; i<range_size; ++i ) {
+            if( v[i].state == move_support_tests::Foo::DefaultInitialized ) ++def_inits;
+            else if( v[i].state == move_support_tests::Foo::DirectInitialized ) ++direct_inits;
+            else if( v[i].state == move_support_tests::Foo::CopyInitialized ) ++copy_inits;
+            else if( v[i].state == move_support_tests::Foo::MoveInitialized ) ++move_inits;
             else {
-                REQUIRE_MESSAGE(false, "v[i] seems not initialized");
+                REQUIRE_MESSAGE( false, "v[i] seems not initialized");
             }
             intptr_t index = v[i].bar();
-            REQUIRE(!found[index]);
+            REQUIRE( !found[index] );
             found[index] = true;
-            if (i > 0) inversions += v[i].bar() < v[i - 1].bar();
         }
 
-        std::size_t expected_direct_inits = 0, expected_def_inits = 0, expected_copy_inits = 0,
-                    expected_move_inits = 0;
-        for (std::size_t i = 0; i < utils::array_length(concurrent_grow_single_range_map); ++i) {
-            const grain_map::range_part& rp = concurrent_grow_single_range_map[i];
-            switch (rp.expected_element_state) {
-                case move_support_tests::Foo::DefaultInitialized: {
-                    expected_def_inits += rp.number_of_parts;
-                } break;
-                case move_support_tests::Foo::DirectInitialized: {
-                    expected_direct_inits += rp.number_of_parts;
-                } break;
-                case move_support_tests::Foo::MoveInitialized: {
-                    expected_move_inits += rp.number_of_parts;
-                } break;
-                case move_support_tests::Foo::CopyInitialized: {
-                    expected_copy_inits += rp.number_of_parts;
-                } break;
-                default: {
-                    REQUIRE_MESSAGE(false, "unexpected expected state");
-                } break;
+        std::size_t expected_direct_inits = 0, expected_def_inits = 0, expected_copy_inits = 0, expected_move_inits = 0;
+        for (std::size_t i=0; i < utils::array_length(concurrent_grow_single_range_map); ++i){
+            const grain_map::range_part& rp =concurrent_grow_single_range_map[i];
+            switch (rp.expected_element_state){
+            case move_support_tests::Foo::DefaultInitialized: { expected_def_inits += rp.number_of_parts ; } break;
+            case move_support_tests::Foo::DirectInitialized:  { expected_direct_inits += rp.number_of_parts ;} break;
+            case move_support_tests::Foo::MoveInitialized:    { expected_move_inits += rp.number_of_parts ;} break;
+            case move_support_tests::Foo::CopyInitialized:    { expected_copy_inits += rp.number_of_parts ;} break;
+            default: {REQUIRE_MESSAGE(false, "unexpected expected state");}break;
             };
         }
 
-        expected_def_inits *= part_weight * number_of_grains;
-        expected_move_inits *= part_weight * number_of_grains;
-        expected_copy_inits *= part_weight * number_of_grains;
+        expected_def_inits    *= part_weight * number_of_grains;
+        expected_move_inits   *= part_weight * number_of_grains;
+        expected_copy_inits   *= part_weight * number_of_grains;
         expected_direct_inits *= part_weight * number_of_grains;
 
-        REQUIRE(def_inits == expected_def_inits);
-        REQUIRE(copy_inits == expected_copy_inits);
-        REQUIRE(move_inits == expected_move_inits);
-        REQUIRE(direct_inits == expected_direct_inits);
+        REQUIRE( def_inits == expected_def_inits );
+        REQUIRE( copy_inits == expected_copy_inits );
+        REQUIRE( move_inits == expected_move_inits );
+        REQUIRE( direct_inits == expected_direct_inits );
     }
     //TODO: factor this into separate thing, as it seems to used in big number of tests
-    std::size_t items_allocated = MyAllocator::items_allocated, items_freed = MyAllocator::items_freed;
-    std::size_t allocations = MyAllocator::allocations, frees = MyAllocator::frees;
+    std::size_t items_allocated = MyAllocator::items_allocated,
+           items_freed = MyAllocator::items_freed;
+    std::size_t allocations = MyAllocator::allocations,
+           frees = MyAllocator::frees;
     REQUIRE(items_allocated == items_freed);
     REQUIRE(allocations == frees);
 }
@@ -1081,48 +1040,45 @@ void TestComparison() {
     std::string str[3];
     str[0] = "abc";
     str[1].assign("cba");
-    str[2].assign("abc");// same as 0th
+    str[2].assign("abc"); // same as 0th
     oneapi::tbb::concurrent_vector<char> var[3];
     var[0].assign(str[0].begin(), str[0].end());
     var[1].assign(str[0].rbegin(), str[0].rend());
-    var[2].assign(var[1].rbegin(), var[1].rend());// same as 0th
+    var[2].assign(var[1].rbegin(), var[1].rend()); // same as 0th
     for (int i = 0; i < 3; ++i) {
         for (int j = 0; j < 3; ++j) {
-            REQUIRE((var[i] == var[j]) == (str[i] == str[j]));
-            REQUIRE((var[i] != var[j]) == (str[i] != str[j]));
-            REQUIRE((var[i] < var[j]) == (str[i] < str[j]));
-            REQUIRE((var[i] > var[j]) == (str[i] > str[j]));
-            REQUIRE((var[i] <= var[j]) == (str[i] <= str[j]));
-            REQUIRE((var[i] >= var[j]) == (str[i] >= str[j]));
+            REQUIRE( (var[i] == var[j]) == (str[i] == str[j]) );
+            REQUIRE( (var[i] != var[j]) == (str[i] != str[j]) );
+            REQUIRE( (var[i] < var[j]) == (str[i] < str[j]) );
+            REQUIRE( (var[i] > var[j]) == (str[i] > str[j]) );
+            REQUIRE( (var[i] <= var[j]) == (str[i] <= str[j]) );
+            REQUIRE( (var[i] >= var[j]) == (str[i] >= str[j]) );
         }
     }
 }
 
 #if TBB_USE_EXCEPTIONS
 void test_ex_move_assignment_memory_failure() {
-    using fixture_type = move_support_tests::DefaultStatefulFixtureHelper<c_vector_type,
-                                                                          /*POCMA = */ std::false_type>::type;
-    using arena_allocator_fixture_type
-            = move_support_tests::ArenaAllocatorFixture<move_support_tests::FooWithAssign,
-                                                        /*POCMA = */ std::false_type>;
+    using fixture_type = move_support_tests::DefaultStatefulFixtureHelper<c_vector_type, /*POCMA = */std::false_type>::type;
+    using arena_allocator_fixture_type = move_support_tests::ArenaAllocatorFixture<move_support_tests::FooWithAssign, /*POCMA = */std::false_type>;
     using allocator_type = fixture_type::allocator_type;
     using vector_type = fixture_type::container_type;
 
     fixture_type fixture;
     arena_allocator_fixture_type arena_allocator_fixture(4 * fixture.container_size);
 
-    const std::size_t allocation_limit = fixture.container_size / 4;
+    const std::size_t allocation_limit = fixture.container_size/4;
 
     vector_type victim(arena_allocator_fixture.allocator);
-    victim.reserve(2);// for fragmented assignment
+    victim.reserve(2); // for fragmented assignment
 
     REQUIRE_THROWS_AS(
-            [&]() {
-                move_support_tests::LimitAllocatedItemsInScope<allocator_type> allocator_limit(
-                        allocator_type::items_allocated + allocation_limit);
-                victim = std::move(fixture.source);// fragmented assignment
-            }(),
-            std::bad_alloc);
+        [&]() {
+            move_support_tests::LimitAllocatedItemsInScope<allocator_type> allocator_limit(allocator_type::items_allocated + allocation_limit);
+            victim = std::move(fixture.source); // fragmented assignment
+        }(),
+        std::bad_alloc
+    );
 
     verify_c_vector_size(victim);
     verify_c_vector_capacity_is_below(victim.capacity(), allocation_limit + 2);
@@ -1133,27 +1089,25 @@ void test_ex_move_assignment_memory_failure() {
     verify_assignment_operator_throws_bad_last_alloc(victim);
 }
 
-void test_ex_move_assignment_element_ctor_exception() {
-    using fixture_type
-            = move_support_tests::DefaultStatefulFixtureHelper<c_vector_type, std::false_type>::type;
-    using arena_allocator_fixture_type
-            = move_support_tests::ArenaAllocatorFixture<move_support_tests::FooWithAssign, std::false_type>;
+void test_ex_move_assignment_element_ctor_exception(){
+    using fixture_type = move_support_tests::DefaultStatefulFixtureHelper<c_vector_type, std::false_type>::type;
+    using arena_allocator_fixture_type = move_support_tests::ArenaAllocatorFixture<move_support_tests::FooWithAssign, std::false_type>;
     using vector_type = fixture_type::container_type;
 
     fixture_type fixture;
-    const size_t planned_victim_size = fixture.container_size / 4;
+    const size_t planned_victim_size = fixture.container_size/4;
     arena_allocator_fixture_type arena_allocator_fixture(4 * fixture.container_size);
 
     vector_type victim(arena_allocator_fixture.allocator);
-    victim.reserve(2);// get fragmented assignment
+    victim.reserve(2); // get fragmented assignment
 
     REQUIRE_THROWS_AS(
-            [&]() {
-                move_support_tests::LimitFooCountInScope foo_limit(move_support_tests::foo_count
-                                                                   + planned_victim_size);
-                victim = std::move(fixture.source);// fragmented assignment
-            }(),
-            std::bad_alloc);
+        [&](){
+            move_support_tests::LimitFooCountInScope foo_limit(move_support_tests::foo_count + planned_victim_size);
+            victim = std::move(fixture.source); // fragmented assignment
+        }(),
+        std::bad_alloc
+    );
 
     verify_c_vector_size(victim);
 
@@ -1172,43 +1126,41 @@ void test_ex_move_assignment() {
 
 template <typename Type, typename Allocator>
 class test_grow_by_and_resize {
-    oneapi::tbb::concurrent_vector<Type, Allocator>& my_c;
-
+    oneapi::tbb::concurrent_vector<Type, Allocator> &my_c;
 public:
-    test_grow_by_and_resize(oneapi::tbb::concurrent_vector<Type, Allocator>& c) : my_c(c) {}
+    test_grow_by_and_resize( oneapi::tbb::concurrent_vector<Type, Allocator> &c ) : my_c(c) {}
     void operator()() const {
         const typename oneapi::tbb::concurrent_vector<Type, Allocator>::size_type sz = my_c.size();
-        my_c.grow_by(5);
-        REQUIRE(my_c.size() == sz + 5);
-        my_c.resize(sz);
-        REQUIRE(my_c.size() == sz);
+        my_c.grow_by( 5 );
+        REQUIRE( my_c.size() == sz + 5 );
+        my_c.resize( sz );
+        REQUIRE( my_c.size() == sz );
     }
 };
 
 namespace push_back_exception_safety_helpers {
     //TODO: remove code duplication with emplace_helpers::wrapper_type
-    struct throwing_foo : move_support_tests::Foo {
+    struct throwing_foo:move_support_tests::Foo {
         int value1;
         int value2;
-        explicit throwing_foo(int v1, int v2) : value1(v1), value2(v2) {}
+        explicit throwing_foo(int v1, int v2) : value1 (v1), value2(v2) {}
     };
 
-    template <typename foo_t = throwing_foo>
+    template< typename foo_t = throwing_foo>
     struct fixture {
-        using vector_t = oneapi::tbb::concurrent_vector<foo_t, std::allocator<foo_t>>;
+        using vector_t = oneapi::tbb::concurrent_vector<foo_t, std::allocator<foo_t> >;
         vector_t v;
 
-        void test(void (*p_test)(vector_t&)) {
+        void test( void(*p_test)(vector_t&)){
             utils::suppress_unused_warning(p_test);
-            move_support_tests::track_foo_count<__LINE__> verify_no_foo_leaked_during_exception {};
+            move_support_tests::track_foo_count<__LINE__> verify_no_foo_leaked_during_exception{};
             utils::suppress_unused_warning(verify_no_foo_leaked_during_exception);
-            REQUIRE_MESSAGE(v.empty(), "incorrect test setup?");
+            REQUIRE_MESSAGE(v.empty(),"incorrect test setup?" );
             REQUIRE_THROWS_AS(p_test(v), move_support_tests::FooException);
-            REQUIRE_MESSAGE(is_state<move_support_tests::Foo::ZeroInitialized>(v[0]),
-                            "incorrectly filled item during exception in emplace_back?");
+            REQUIRE_MESSAGE(is_state<move_support_tests::Foo::ZeroInitialized>(v[0]),"incorrectly filled item during exception in emplace_back?");
         }
     };
-}// namespace push_back_exception_safety_helpers
+}
 
 void TestPushBackMoveExceptionSafety() {
     using fixture_t = push_back_exception_safety_helpers::fixture<move_support_tests::Foo>;
@@ -1225,16 +1177,18 @@ void TestPushBackMoveExceptionSafety() {
     t.test(&test::test_move_push_back);
 }
 
-void TestEmplaceBackExceptionSafety() {
+void TestEmplaceBackExceptionSafety(){
     using fixture_t = push_back_exception_safety_helpers::fixture<>;
     fixture_t t;
 
-    move_support_tests::Foo dummy;//make FooCount non zero;
+    move_support_tests::Foo dummy; //make FooCount non zero;
     utils::suppress_unused_warning(dummy);
     move_support_tests::LimitFooCountInScope foo_limit(move_support_tests::foo_count);
 
     struct test {
-        static void test_emplace(fixture_t::vector_t& v) { v.emplace_back(1, 2); }
+        static void test_emplace(fixture_t::vector_t& v) {
+            v.emplace_back(1,2);
+        }
     };
     t.test(&test::test_emplace);
 }
@@ -1242,20 +1196,20 @@ void TestEmplaceBackExceptionSafety() {
 namespace move_semantics_helpers {
     struct move_only_type {
         const int* my_pointer;
-        move_only_type(move_only_type&& other) : my_pointer(other.my_pointer) { other.my_pointer = nullptr; }
-        explicit move_only_type(const int* value) : my_pointer(value) {}
+        move_only_type(move_only_type && other): my_pointer(other.my_pointer){other.my_pointer=nullptr;}
+        explicit move_only_type(const int* value): my_pointer(value) {}
     };
-}// namespace move_semantics_helpers
+}
 
-void TestPushBackMoveOnlyContainer() {
+void TestPushBackMoveOnlyContainer(){
     using namespace move_semantics_helpers;
-    using vector_t = oneapi::tbb::concurrent_vector<move_only_type>;
+    using vector_t = oneapi::tbb::concurrent_vector<move_only_type >;
     vector_t v;
     static const int magic_number = 7;
     move_only_type src(&magic_number);
     v.push_back(std::move(src));
-    REQUIRE_MESSAGE((v[0].my_pointer == &magic_number), "item was incorrectly moved during push_back?");
-    REQUIRE_MESSAGE(src.my_pointer == nullptr, "item was incorrectly moved during push_back?");
+    REQUIRE_MESSAGE((v[0].my_pointer == &magic_number),"item was incorrectly moved during push_back?");
+    REQUIRE_MESSAGE(src.my_pointer == nullptr,"item was incorrectly moved during push_back?");
 }
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
@@ -1270,15 +1224,17 @@ void TestDeductionGuides() {
     TVector v1(v.begin(), v.end());
     static_assert(std::is_same<decltype(v1), TVector<ComplexType>>::value);
 
-    // check TVector(InputIterator, InputIterator, Alocator)
+    // check TVector(InputIterator, InputIterator, Allocator)
     TVector v2(v.begin(), v.end(), std::allocator<ComplexType>());
-    static_assert(std::is_same<decltype(v2), TVector<ComplexType, std::allocator<ComplexType>>>::value);
+    static_assert(std::is_same<decltype(v2),
+       TVector<ComplexType, std::allocator<ComplexType>>>::value);
 
     // check TVector(std::initializer_list<T>)
     TVector v3(l);
-    static_assert(std::is_same<decltype(v3), TVector<ComplexType>>::value);
+    static_assert(std::is_same<decltype(v3),
+        TVector<ComplexType>>::value);
 
-    // check TVector(std::initializer_list, Alocator)
+    // check TVector(std::initializer_list, Allocator)
     TVector v4(l, std::allocator<ComplexType>());
     static_assert(std::is_same<decltype(v4), TVector<ComplexType, std::allocator<ComplexType>>>::value);
 
@@ -1288,9 +1244,7 @@ void TestDeductionGuides() {
 
     // check TVector(TVector&, Allocator)
     TVector v6(v5, oneapi::tbb::cache_aligned_allocator<ComplexType>());
-    static_assert(
-            std::is_same<decltype(v6),
-                         TVector<ComplexType, oneapi::tbb::cache_aligned_allocator<ComplexType>>>::value);
+    static_assert(std::is_same<decltype(v6), TVector<ComplexType, oneapi::tbb::cache_aligned_allocator<ComplexType>>>::value);
 
     // check TVector(TVector&&)
     TVector v7(std::move(v1));
@@ -1298,13 +1252,12 @@ void TestDeductionGuides() {
 
     // check TVector(TVector&&, Allocator)
     TVector v8(std::move(v5), oneapi::tbb::cache_aligned_allocator<ComplexType>());
-    static_assert(
-            std::is_same<decltype(v8),
-                         TVector<ComplexType, oneapi::tbb::cache_aligned_allocator<ComplexType>>>::value);
+    static_assert(std::is_same<decltype(v8), TVector<ComplexType, oneapi::tbb::cache_aligned_allocator<ComplexType>>>::value);
+
 }
 #endif
 
-template <template <typename...> class ContainerType>
+template <template <typename... > class ContainerType>
 void test_member_types() {
     using default_container_type = ContainerType<int>;
 
@@ -1312,6 +1265,7 @@ void test_member_types() {
                                oneapi::tbb::cache_aligned_allocator<int>>::value,
                   "Incorrect default template allocator");
 
+
     using test_allocator_type = oneapi::tbb::cache_aligned_allocator<int>;
     using container_type = ContainerType<int, test_allocator_type>;
 
@@ -1329,11 +1283,9 @@ void test_member_types() {
     static_assert(std::is_same<typename container_type::const_reference, const value_type&>::value,
                   "Incorrect container const_reference member type");
     using allocator_type = typename container_type::allocator_type;
-    static_assert(std::is_same<typename container_type::pointer,
-                               typename std::allocator_traits<allocator_type>::pointer>::value,
+    static_assert(std::is_same<typename container_type::pointer, typename std::allocator_traits<allocator_type>::pointer>::value,
                   "Incorrect container pointer member type");
-    static_assert(std::is_same<typename container_type::const_pointer,
-                               typename std::allocator_traits<allocator_type>::const_pointer>::value,
+    static_assert(std::is_same<typename container_type::const_pointer, typename std::allocator_traits<allocator_type>::const_pointer>::value,
                   "Incorrect container const_pointer member type");
 
     static_assert(utils::is_random_access_iterator<typename container_type::iterator>::value,
@@ -1355,20 +1307,20 @@ template <typename Vector>
 void test_comparisons_basic() {
     using comparisons_testing::testEqualityAndLessComparisons;
     Vector v1, v2;
-    testEqualityAndLessComparisons</*ExpectEqual = */ true, /*ExpectLess = */ false>(v1, v2);
+    testEqualityAndLessComparisons</*ExpectEqual = */true, /*ExpectLess = */false>(v1, v2);
 
     v1.emplace_back(1);
-    testEqualityAndLessComparisons</*ExpectEqual = */ false, /*ExpectLess = */ false>(v1, v2);
+    testEqualityAndLessComparisons</*ExpectEqual = */false, /*ExpectLess = */false>(v1, v2);
 
     v2.emplace_back(1);
-    testEqualityAndLessComparisons</*ExpectEqual = */ true, /*ExpectLess = */ false>(v1, v2);
+    testEqualityAndLessComparisons</*ExpectEqual = */true, /*ExpectLess = */false>(v1, v2);
 
     v2.emplace_back(2);
-    testEqualityAndLessComparisons</*ExpectEqual = */ false, /*ExpectLess = */ true>(v1, v2);
+    testEqualityAndLessComparisons</*ExpectEqual = */false, /*ExpectLess = */true>(v1, v2);
 
     v1.clear();
     v2.clear();
-    testEqualityAndLessComparisons</*ExpectEqual = */ true, /*ExpectLess = */ false>(v1, v2);
+    testEqualityAndLessComparisons</*ExpectEqual = */true, /*ExpectLess = */false>(v1, v2);
 }
 
 template <typename TwoWayComparableVectorType>
@@ -1409,7 +1361,7 @@ void test_three_way_comparable_vector() {
     REQUIRE_MESSAGE(v1 >= v2, "Incorrect operator>= result");
     comparisons_testing::check_three_way_comparison();
 }
-#endif// __TBB_TEST_CPP20_COMPARISONS
+#endif // __TBB_TEST_CPP20_COMPARISONS
 
 void TestVectorComparisons() {
     using integral_vector = oneapi::tbb::concurrent_vector<int>;
@@ -1422,18 +1374,17 @@ void TestVectorComparisons() {
 #if __TBB_TEST_CPP20_COMPARISONS
     using two_way_less_only_vector = oneapi::tbb::concurrent_vector<comparisons_testing::LessComparableOnly>;
     using three_way_only_vector = oneapi::tbb::concurrent_vector<comparisons_testing::ThreeWayComparableOnly>;
-    using three_way_comparable_vector
-            = oneapi::tbb::concurrent_vector<comparisons_testing::ThreeWayComparable>;
+    using three_way_comparable_vector = oneapi::tbb::concurrent_vector<comparisons_testing::ThreeWayComparable>;
 
     test_comparisons_basic<two_way_less_only_vector>();
     test_comparisons_basic<three_way_only_vector>();
     test_comparisons_basic<three_way_comparable_vector>();
     test_three_way_comparable_vector<three_way_comparable_vector>();
-#endif// __TBB_CPP20_COMPARISONS_PRESENT && __TBB_CPP20_CONVEPTS_PRESENT
+#endif // __TBB_CPP20_COMPARISONS_PRESENT && __TBB_CPP20_CONVEPTS_PRESENT
 }
 
 template <bool ExpectEqual, bool ExpectLess, typename Iterator>
-void DoVectorIteratorComparisons(const Iterator& lhs, const Iterator& rhs) {
+void DoVectorIteratorComparisons( const Iterator& lhs, const Iterator& rhs ) {
     // TODO: replace with testEqualityAndLessComparisons after adding <=> operator for concurrent_vector iterator
     using namespace comparisons_testing;
     testEqualityComparisons<ExpectEqual>(lhs, rhs);
@@ -1441,15 +1392,15 @@ void DoVectorIteratorComparisons(const Iterator& lhs, const Iterator& rhs) {
 }
 
 template <typename Iterator, typename VectorType>
-void TestVectorIteratorComparisonsBasic(VectorType& vec) {
+void TestVectorIteratorComparisonsBasic( VectorType& vec ) {
     REQUIRE_MESSAGE(!vec.empty(), "Incorrect test setup");
     Iterator it1, it2;
-    DoVectorIteratorComparisons</*ExpectEqual = */ true, /*ExpectLess = */ false>(it1, it2);
+    DoVectorIteratorComparisons</*ExpectEqual = */true, /*ExpectLess = */false>(it1, it2);
     it1 = vec.begin();
     it2 = vec.begin();
-    DoVectorIteratorComparisons</*ExpectEqual = */ true, /*ExpectLess = */ false>(it1, it2);
+    DoVectorIteratorComparisons</*ExpectEqual = */true, /*ExpectLess = */false>(it1, it2);
     it2 = std::prev(vec.end());
-    DoVectorIteratorComparisons</*ExpectEqual = */ false, /*ExpectLess = */ true>(it1, it2);
+    DoVectorIteratorComparisons</*ExpectEqual = */false, /*ExpectLess = */true>(it1, it2);
 }
 
 void TestVectorIteratorComparisons() {
@@ -1462,46 +1413,64 @@ void TestVectorIteratorComparisons() {
 
 //! Test type matching
 //! \brief \ref interface \ref requirement
-TEST_CASE("test type matching") { test_member_types<oneapi::tbb::concurrent_vector>(); }
+TEST_CASE("test type matching") {
+    test_member_types<oneapi::tbb::concurrent_vector>();
+}
 
 //! Test sequential access to elements
 //! \brief \ref interface \ref requirement
-TEST_CASE("testing sequential for") { TestSequentialFor<move_support_tests::FooWithAssign>(); }
+TEST_CASE("testing sequential for") {
+    TestSequentialFor<move_support_tests::FooWithAssign> ();
+}
 
 //! Test of assign, grow, copying with various sizes
 //! \brief \ref interface \ref requirement
-TEST_CASE("testing resize and copy") { TestResizeAndCopy(); }
+TEST_CASE("testing resize and copy"){
+    TestResizeAndCopy();
+}
 
 //! Test the assignment operator and swap
 //! \brief \ref interface \ref requirement
-TEST_CASE("testing copy assignment") { TestCopyAssignment(); }
+TEST_CASE("testing copy assignment"){
+    TestCopyAssignment();
+}
 
 //! Testing grow_to_at_least operations
 //! \brief \ref interface
-TEST_CASE("testing grow_to_at_least with source parameter") {
+TEST_CASE("testing grow_to_at_least with source parameter"){
     TestGrowToAtLeastWithSourceParameter<oneapi::tbb::concurrent_vector<int>>(12345);
 }
 
 //! Test of capacity, reserve, and shrink_to_fit
 //! \brief \ref interface \ref requirement
-TEST_CASE("testing capacity") { TestCapacity(); }
+TEST_CASE("testing capacity"){
+   TestCapacity();
+}
 
 #if TBB_USE_EXCEPTIONS
 //! Test exceptions
 //! \brief \ref requirement
-TEST_CASE("testing exceptions") { TestExceptions(); }
+TEST_CASE("testing exceptions"){
+    TestExceptions();
+}
 
 //! Test of push_back move exception safety
 //! \brief \ref requirement
-TEST_CASE("testing push_back move exception safety") { TestPushBackMoveExceptionSafety(); }
+TEST_CASE("testing push_back move exception safety"){
+    TestPushBackMoveExceptionSafety();
+}
 
 //! Test of emplace back move exception safety
 //! \brief \ref requirement
-TEST_CASE("testing emplace back exception safety") { TestEmplaceBackExceptionSafety(); }
+TEST_CASE("testing emplace back exception safety"){
+    TestEmplaceBackExceptionSafety();
+}
 
 //! Test exceptions guarantees for assign operator
 //! \brief \ref requirement
-TEST_CASE("testing exception safety guaranteees for assign operator") { test_ex_assign_operator(); }
+TEST_CASE("testing exception safety guaranteees for assign operator"){
+    test_ex_assign_operator();
+}
 
 //! Test exceptions safety guarantees for concurrent_vector move constructor
 //! \brief \ref requirement
@@ -1511,61 +1480,73 @@ TEST_CASE("exception safety guarantees for concurrent_vector move constructor")
 
 //! Test exceptions safety guarantees for concurrent_vector move assignment
 //! \brief \ref requirement
-TEST_CASE("test exception safety on concurrent_vector move assignment") { test_ex_move_assignment(); }
+TEST_CASE("test exception safety on concurrent_vector move assignment") {
+    test_ex_move_assignment();
+}
 #endif
 //! Test push_back in move only container
 //! \brief \ref requirement
-TEST_CASE("testing push_back move only container") { TestPushBackMoveOnlyContainer(); }
+TEST_CASE("testing push_back move only container"){
+    TestPushBackMoveOnlyContainer();
+}
 
 //! Test types for std::iterator_traits in concurrent_vector::iterator
 //! \brief \ref requirement
-TEST_CASE("testing std::iterator_traits for concurrent_vector::iterator") {
-    TestIteratorTraits<oneapi::tbb::concurrent_vector<move_support_tests::Foo>::iterator,
-                       move_support_tests::Foo>();
+TEST_CASE("testing std::iterator_traits for concurrent_vector::iterator"){
+    TestIteratorTraits<oneapi::tbb::concurrent_vector<move_support_tests::Foo>::iterator,move_support_tests::Foo>();
 }
 
 //! Test types for std::iterator_traits in concurrent_vector::const_iterator
 //! \brief \ref requirement
-TEST_CASE("testing std::iterator_traits for concurrent_vector::const_iterator") {
-    TestIteratorTraits<oneapi::tbb::concurrent_vector<move_support_tests::Foo>::const_iterator,
-                       const move_support_tests::Foo>();
+TEST_CASE("testing std::iterator_traits for concurrent_vector::const_iterator"){
+    TestIteratorTraits<oneapi::tbb::concurrent_vector<move_support_tests::Foo>::const_iterator,const move_support_tests::Foo>();
 }
 
 //! Test initializer_list support
 //! \brief \ref interface \ref requirement
-TEST_CASE("testing initializer_list support") { TestInitList(); }
+TEST_CASE("testing initializer_list support"){
+    TestInitList();
+}
 
 //! Test move constructor
 //! \brief \ref interface \ref requirement
-TEST_CASE("testing move constructor") { move_support_tests::test_move_constructor<c_vector_type>(); }
+TEST_CASE("testing move constructor"){
+    move_support_tests::test_move_constructor<c_vector_type>();
+}
 
 //! Test move assign operator
 //! \brief \ref interface \ref requirement
-TEST_CASE("testing move assign operator") { move_support_tests::test_move_assignment<c_vector_type>(); }
+TEST_CASE("testing move assign operator"){
+    move_support_tests::test_move_assignment<c_vector_type>();
+}
 
 //! Test constructor with move iterators
 //! \brief \ref requirement
-TEST_CASE("testing constructor with move iterators") {
+TEST_CASE("testing constructor with move iterators"){
     move_support_tests::test_constructor_with_move_iterators<c_vector_type>();
 }
 
 //! Test assign with move iterators
 //! \brief \ref interface \ref requirement
-TEST_CASE("testing assign with move iterators") {
+TEST_CASE("testing assign with move iterators"){
     move_support_tests::test_assign_with_move_iterators<c_vector_type>();
 }
 
 //! Test grow_by with move iterator
 //! \brief \ref requirement
-TEST_CASE("testing serial grow_by with move iterator") { TestSerialGrowByWithMoveIterators(); }
+TEST_CASE("testing serial grow_by with move iterator"){
+    TestSerialGrowByWithMoveIterators();
+}
 
 //! Test grow_by with move iterator
 //! \brief \ref requirement
-TEST_CASE("testing serial move in shrink_to_fit") { TestSerialMoveInShrinkToFit(); }
+TEST_CASE("testing serial move in shrink_to_fit"){
+    TestSerialMoveInShrinkToFit();
+}
 
 //! Test concurrent grow
 //! \brief \ref requirement
-TEST_CASE("testing concurrency") {
+TEST_CASE("testing concurrency"){
     REQUIRE(!move_support_tests::foo_count);
     for (std::size_t p = 1; p <= 4; ++p) {
         oneapi::tbb::global_control limit(oneapi::tbb::global_control::max_allowed_parallelism, p);
@@ -1579,7 +1560,9 @@ TEST_CASE("testing concurrency") {
 
 //! Test assign operations
 //! \brief \ref interface \ref requirement
-TEST_CASE("testing comparison on assign operations") { TestComparison(); }
+TEST_CASE("testing comparison on assign operations"){
+    TestComparison();
+}
 
 //! Test allocator_traits support in concurrent_vector
 //! \brief \ref requirement
@@ -1590,13 +1573,19 @@ TEST_CASE("test allocator_traits support in concurrent_vector") {
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 //! Test deduction guides
 //! \brief \ref requirement
-TEST_CASE("testing deduction guides") { TestDeductionGuides<oneapi::tbb::concurrent_vector>(); }
+TEST_CASE("testing deduction guides"){
+    TestDeductionGuides<oneapi::tbb::concurrent_vector>();
+}
 #endif
 
 //! Test concurrent_vector comparisons
 //! \brief \ref interface \ref requirement
-TEST_CASE("concurrent_vector comparisons") { TestVectorComparisons(); }
+TEST_CASE("concurrent_vector comparisons") {
+    TestVectorComparisons();
+}
 
 //! Test concurrent_vector iterators comparisons
 //! \brief \ref interface \ref requirement
-TEST_CASE("concurrent_vector iterators comparisons") { TestVectorIteratorComparisons(); }
+TEST_CASE("concurrent_vector iterators comparisons") {
+    TestVectorIteratorComparisons();
+}
diff --git a/external/tbb/test/conformance/conformance_continue_node.cpp b/external/tbb/test/conformance/conformance_continue_node.cpp
index f84af1b5..a7eac7fa 100644
--- a/external/tbb/test/conformance/conformance_continue_node.cpp
+++ b/external/tbb/test/conformance/conformance_continue_node.cpp
@@ -15,7 +15,7 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
 #endif
 
 #define CONFORMANCE_CONTINUE_NODE
@@ -25,8 +25,7 @@
 //! \file conformance_continue_node.cpp
 //! \brief Test for [flow_graph.continue_node] specification
 
-using output_msg = conformance::message</*default_ctor*/ false, /*copy_ctor*/ true,
-                                        /*copy_assign*/ true /*enable for queue_node successor*/>;
+using output_msg = conformance::message</*default_ctor*/false, /*copy_ctor*/true, /*copy_assign*/true/*enable for queue_node successor*/>;
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 
@@ -85,7 +84,7 @@ void test_deduction_guides_common(Body body) {
 
     continue_node c16(follows(b), 5, body, lightweight(), node_priority_t(5));
     static_assert(std::is_same_v<decltype(c16), continue_node<ExpectedType, lightweight>>);
-#endif// __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+#endif // __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 
     continue_node c17(c1);
     static_assert(std::is_same_v<decltype(c17), continue_node<ExpectedType>>);
@@ -96,49 +95,43 @@ void continue_void_body_f(const tbb::flow::continue_msg&) {}
 
 void test_deduction_guides() {
     using tbb::flow::continue_msg;
-    test_deduction_guides_common<int>([](const continue_msg&) -> int { return 1; });
+    test_deduction_guides_common<int>([](const continue_msg&)->int { return 1; } );
     test_deduction_guides_common<continue_msg>([](const continue_msg&) {});
 
-    test_deduction_guides_common<int>([](const continue_msg&) mutable -> int { return 1; });
+    test_deduction_guides_common<int>([](const continue_msg&) mutable ->int { return 1; });
     test_deduction_guides_common<continue_msg>([](const continue_msg&) mutable {});
 
     test_deduction_guides_common<int>(continue_body_f);
     test_deduction_guides_common<continue_msg>(continue_void_body_f);
 }
 
-#endif// __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
+#endif // __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 
 //! Test execution of node body
 //! Test node can do try_put call
 //! \brief \ref interface \ref requirement
 TEST_CASE("continue body") {
-    conformance::test_body_exec<oneapi::tbb::flow::continue_node<output_msg>, oneapi::tbb::flow::continue_msg,
-                                output_msg>();
+    conformance::test_body_exec<oneapi::tbb::flow::continue_node<output_msg>, oneapi::tbb::flow::continue_msg, output_msg>();
 }
 
 //! Test continue_node is a graph_node, receiver<continue_msg>, and sender<Output>
 //! \brief \ref interface
-TEST_CASE("continue_node superclasses") {
-    conformance::test_inheritance<oneapi::tbb::flow::continue_node<int>, oneapi::tbb::flow::continue_msg,
-                                  int>();
-    conformance::test_inheritance<oneapi::tbb::flow::continue_node<void*>, oneapi::tbb::flow::continue_msg,
-                                  void*>();
-    conformance::test_inheritance<oneapi::tbb::flow::continue_node<output_msg>,
-                                  oneapi::tbb::flow::continue_msg, output_msg>();
+TEST_CASE("continue_node superclasses"){
+    conformance::test_inheritance<oneapi::tbb::flow::continue_node<int>, oneapi::tbb::flow::continue_msg, int>();
+    conformance::test_inheritance<oneapi::tbb::flow::continue_node<void*>, oneapi::tbb::flow::continue_msg, void*>();
+    conformance::test_inheritance<oneapi::tbb::flow::continue_node<output_msg>, oneapi::tbb::flow::continue_msg, output_msg>();
 }
 
 //! Test body copying and copy_body logic
 //! Test the body object passed to a node is copied
 //! \brief \ref interface
-TEST_CASE("continue_node and body copying") {
-    conformance::test_copy_body_function<
-            oneapi::tbb::flow::continue_node<int>,
-            conformance::copy_counting_object<int, oneapi::tbb::flow::continue_msg>>();
+TEST_CASE("continue_node and body copying"){
+    conformance::test_copy_body_function<oneapi::tbb::flow::continue_node<int>, conformance::copy_counting_object<int, oneapi::tbb::flow::continue_msg>>();
 }
 
 //! Test deduction guides
 //! \brief \ref interface \ref requirement
-TEST_CASE("Deduction guides") {
+TEST_CASE("Deduction guides"){
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
     test_deduction_guides();
 #endif
@@ -146,22 +139,21 @@ TEST_CASE("Deduction guides") {
 
 //! Test node broadcast messages to successors
 //! \brief \ref requirement
-TEST_CASE("continue_node broadcast") {
+TEST_CASE("continue_node broadcast"){
     conformance::counting_functor<int> fun(conformance::expected);
-    conformance::test_forwarding<oneapi::tbb::flow::continue_node<int>, oneapi::tbb::flow::continue_msg, int>(
-            1, fun);
+    conformance::test_forwarding<oneapi::tbb::flow::continue_node<int>, oneapi::tbb::flow::continue_msg, int>(1, fun);
 }
 
 //! Test node not buffered unsuccessful message, and try_get after rejection should not succeed.
 //! \brief \ref requirement
-TEST_CASE("continue_node buffering") {
+TEST_CASE("continue_node buffering"){
     conformance::dummy_functor<int> fun;
     conformance::test_buffering<oneapi::tbb::flow::continue_node<int>, oneapi::tbb::flow::continue_msg>(fun);
 }
 
 //! Test all node costructors
 //! \brief \ref requirement
-TEST_CASE("continue_node constructors") {
+TEST_CASE("continue_node constructors"){
     using namespace oneapi::tbb::flow;
     graph g;
 
@@ -182,7 +174,7 @@ TEST_CASE("continue_node constructors") {
 //! has a copy of the initial body used by src, and only has a non-zero threshold if src is constructed with a non-zero threshold..
 //! The predecessors and successors of src are not copied.
 //! \brief \ref interface
-TEST_CASE("continue_node copy constructor") {
+TEST_CASE("continue_node copy constructor"){
     using namespace oneapi::tbb::flow;
     graph g;
 
@@ -209,22 +201,19 @@ TEST_CASE("continue_node copy constructor") {
     node_copy.try_put(oneapi::tbb::flow::continue_msg());
     g.wait_for_all();
 
-    CHECK_MESSAGE((conformance::get_values(node2).size() == 0 && conformance::get_values(node3).size() == 0),
-                  "Copied node doesn`t copy successor, but copy number of predecessors");
+    CHECK_MESSAGE((conformance::get_values(node2).size() == 0 && conformance::get_values(node3).size() == 0), "Copied node doesn`t copy successor, but copy number of predecessors");
 
     node_copy.try_put(oneapi::tbb::flow::continue_msg());
     g.wait_for_all();
 
-    CHECK_MESSAGE((conformance::get_values(node2).size() == 0 && conformance::get_values(node3).size() == 1),
-                  "Copied node doesn`t copy successor, but copy number of predecessors");
+    CHECK_MESSAGE((conformance::get_values(node2).size() == 0 && conformance::get_values(node3).size() == 1), "Copied node doesn`t copy successor, but copy number of predecessors");
 
     node1.try_put(oneapi::tbb::flow::continue_msg());
     node1.try_put(oneapi::tbb::flow::continue_msg());
     node0.try_put(oneapi::tbb::flow::continue_msg());
     g.wait_for_all();
 
-    CHECK_MESSAGE((conformance::get_values(node2).size() == 1 && conformance::get_values(node3).size() == 0),
-                  "Copied node doesn`t copy predecessor, but copy number of predecessors");
+    CHECK_MESSAGE((conformance::get_values(node2).size() == 1 && conformance::get_values(node3).size() == 0), "Copied node doesn`t copy predecessor, but copy number of predecessors");
 }
 
 //! Test continue_node wait for their predecessors to complete before executing, but no explicit data is passed across the incoming edges.
@@ -237,7 +226,7 @@ TEST_CASE("continue_node number_of_predecessors") {
     oneapi::tbb::flow::continue_node<oneapi::tbb::flow::continue_msg> node1(g, fun);
     oneapi::tbb::flow::continue_node<oneapi::tbb::flow::continue_msg> node2(g, 1, fun);
     oneapi::tbb::flow::continue_node<oneapi::tbb::flow::continue_msg> node3(g, 1, fun);
-    oneapi::tbb::flow::continue_node<int> node4(g, fun);
+    oneapi::tbb::flow::continue_node<int> node4(g, fun); 
 
     oneapi::tbb::flow::make_edge(node1, node2);
     oneapi::tbb::flow::make_edge(node2, node4);
@@ -255,17 +244,14 @@ TEST_CASE("continue_node number_of_predecessors") {
 
 //! Test nodes for execution with priority in single-threaded configuration
 //! \brief \ref requirement
-TEST_CASE("continue_node priority support") {
-    conformance::test_priority<oneapi::tbb::flow::continue_node<oneapi::tbb::flow::continue_msg, int>,
-                               oneapi::tbb::flow::continue_msg>();
+TEST_CASE("continue_node priority support"){
+    conformance::test_priority<oneapi::tbb::flow::continue_node<oneapi::tbb::flow::continue_msg, int>, oneapi::tbb::flow::continue_msg>();
 }
 
 //! Test node Output class meet the CopyConstructible requirements.
 //! \brief \ref requirement
 TEST_CASE("continue_node Output class") {
-    conformance::test_output_class<oneapi::tbb::flow::continue_node<conformance::copy_counting_object<
-                                           int, oneapi::tbb::flow::continue_msg>>,
-                                   conformance::copy_counting_object<int, oneapi::tbb::flow::continue_msg>>();
+    conformance::test_output_class<oneapi::tbb::flow::continue_node<conformance::copy_counting_object<int, oneapi::tbb::flow::continue_msg>>, conformance::copy_counting_object<int, oneapi::tbb::flow::continue_msg>>();
 }
 
 //! Test body `try_put' statement not wait for the execution of the body to complete
diff --git a/external/tbb/test/conformance/conformance_enumerable_thread_specific.cpp b/external/tbb/test/conformance/conformance_enumerable_thread_specific.cpp
index ea9b54b8..d33cd5d7 100644
--- a/external/tbb/test/conformance/conformance_enumerable_thread_specific.cpp
+++ b/external/tbb/test/conformance/conformance_enumerable_thread_specific.cpp
@@ -16,37 +16,37 @@
 
 #if _MSC_VER
 #if __INTEL_COMPILER
-#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
+    #pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
 #else
-// Workaround for vs2015 and warning name was longer than the compiler limit (4096).
-#pragma warning(disable : 4503)
+    // Workaround for vs2015 and warning name was longer than the compiler limit (4096).
+    #pragma warning (disable: 4503)
 #endif
 #endif
 
-#include "common/checktype.h"
-#include "common/spin_barrier.h"
 #include "common/test.h"
-#include "common/test_comparisons.h"
 #include "common/utils.h"
-#include "common/utils_concurrency_limit.h"
 #include "common/utils_report.h"
+#include "common/utils_concurrency_limit.h"
+#include "common/spin_barrier.h"
+#include "common/checktype.h"
+#include "common/test_comparisons.h"
 
-#include "oneapi/tbb/blocked_range.h"
-#include "oneapi/tbb/cache_aligned_allocator.h"
 #include "oneapi/tbb/detail/_utils.h"
 #include "oneapi/tbb/enumerable_thread_specific.h"
-#include "oneapi/tbb/global_control.h"
 #include "oneapi/tbb/parallel_for.h"
-#include "oneapi/tbb/parallel_invoke.h"
 #include "oneapi/tbb/parallel_reduce.h"
+#include "oneapi/tbb/parallel_invoke.h"
+#include "oneapi/tbb/blocked_range.h"
 #include "oneapi/tbb/tbb_allocator.h"
+#include "oneapi/tbb/global_control.h"
+#include "oneapi/tbb/cache_aligned_allocator.h"
 
-#include <atomic>
-#include <cstdio>
 #include <cstring>
+#include <cstdio>
+#include <vector>
 #include <numeric>
 #include <utility>
-#include <vector>
+#include <atomic>
 
 //! \file conformance_enumerable_thread_specific.cpp
 //! \brief Test for [tls.enumerable_thread_specific tls.flattened2d] specification
@@ -71,55 +71,38 @@ const double EXPECTED_SUM = (REPETITIONS + 1) * N;
 
 //! A minimal class that occupies N bytes.
 /** Defines default and copy constructor, and allows implicit operator&. Hides operator=. */
-template <size_t N = oneapi::tbb::detail::max_nfs_size>
-class minimal : utils::NoAssign {
+template<size_t N = oneapi::tbb::detail::max_nfs_size>
+class minimalNComparable: utils::NoAssign {
 private:
     int my_value;
     bool is_constructed;
-    char pad[N - sizeof(int) - sizeof(bool)];
-
+    char pad[N-sizeof(int) - sizeof(bool)];
 public:
-    minimal() : utils::NoAssign(), my_value(0) {
-        ++construction_counter;
-        is_constructed = true;
-    }
-    minimal(const minimal& m) : utils::NoAssign(), my_value(m.my_value) {
-        ++construction_counter;
-        is_constructed = true;
-    }
-    ~minimal() {
-        ++destruction_counter;
-        CHECK_FAST(is_constructed);
-        is_constructed = false;
-    }
-    void set_value(const int i) {
-        CHECK_FAST(is_constructed);
-        my_value = i;
-    }
-    int value() const {
-        CHECK_FAST(is_constructed);
-        return my_value;
-    }
+    minimalNComparable() : utils::NoAssign(), my_value(0) { ++construction_counter; is_constructed = true; }
+    minimalNComparable( const minimalNComparable &m ) : utils::NoAssign(), my_value(m.my_value) { ++construction_counter; is_constructed = true; }
+    ~minimalNComparable() { ++destruction_counter; CHECK_FAST(is_constructed); is_constructed = false; }
+    void set_value( const int i ) { CHECK_FAST(is_constructed); my_value = i; }
+    int value( ) const { CHECK_FAST(is_constructed); return my_value; }
 
-    bool operator==(const minimal& other) const { return my_value == other.my_value; }
+    bool operator==( const minimalNComparable& other ) const { return my_value == other.my_value; }
 };
 
-static size_t AlignMask = 0;// set to cache-line-size - 1
+static size_t AlignMask = 0;  // set to cache-line-size - 1
 
-template <typename T>
-T& check_alignment(T& t, const char* aname) {
-    if (!oneapi::tbb::detail::is_aligned(&t, AlignMask)) {
+template<typename T>
+T& check_alignment(T& t, const char *aname) {
+    if( !oneapi::tbb::detail::is_aligned(&t, AlignMask)) {
         // TBB_REVAMP_TODO: previously was REPORT_ONCE
-        REPORT("alignment error with %s allocator (%x)\n", aname, (int) size_t(&t) & (AlignMask - 1));
+        REPORT("alignment error with %s allocator (%x)\n", aname, (int)size_t(&t) & (AlignMask-1));
     }
     return t;
 }
 
-template <typename T>
-const T& check_alignment(const T& t, const char* aname) {
-    if (!oneapi::tbb::detail::is_aligned(&t, AlignMask)) {
+template<typename T>
+const T& check_alignment(const T& t, const char *aname) {
+    if( !oneapi::tbb::detail::is_aligned(&t, AlignMask)) {
         // TBB_REVAMP_TODO: previously was REPORT_ONCE
-        REPORT("alignment error with %s allocator (%x)\n", aname, (int) size_t(&t) & (AlignMask - 1));
+        REPORT("alignment error with %s allocator (%x)\n", aname, (int)size_t(&t) & (AlignMask-1));
     }
     return t;
 }
@@ -135,7 +118,9 @@ class Thrower {
 public:
     Thrower() {
 #if TBB_USE_EXCEPTIONS
-        if (++gThrowValue == targetThrowValue) { throw std::bad_alloc(); }
+        if(++gThrowValue == targetThrowValue) {
+            throw std::bad_alloc();
+        }
 #endif
     }
 };
@@ -146,61 +131,50 @@ class Thrower {
 class ThrowingConstructor {
     CheckType<int> m_checktype;
     Thrower m_throwing_field;
-
 public:
     int m_cnt;
-    ThrowingConstructor() : m_checktype(), m_throwing_field() { m_cnt = 0; }
-
-    bool operator==(const ThrowingConstructor& other) const { return m_cnt == other.m_cnt; }
+    ThrowingConstructor() : m_checktype(), m_throwing_field() { m_cnt = 0;}
 
+    bool operator==( const ThrowingConstructor& other ) const { return m_cnt == other.m_cnt; }
 private:
 };
 
 //
-// A helper class that simplifies writing the tests since minimal does not
+// A helper class that simplifies writing the tests since minimalNComparable does not
 // define = or + operators.
 //
 
-template <typename T>
+template< typename T >
 struct test_helper {
-    static inline void init(T& e) { e = static_cast<T>(0); }
-    static inline void sum(T& e, const int addend) { e += static_cast<T>(addend); }
-    static inline void sum(T& e, const double addend) { e += static_cast<T>(addend); }
-    static inline void set(T& e, const int value) { e = static_cast<T>(value); }
-    static inline double get(const T& e) { return static_cast<double>(e); }
+   static inline void init(T &e) { e = static_cast<T>(0); }
+   static inline void sum(T &e, const int addend ) { e += static_cast<T>(addend); }
+   static inline void sum(T &e, const double addend ) { e += static_cast<T>(addend); }
+   static inline void set(T &e, const int value ) { e = static_cast<T>(value); }
+   static inline double get(const T &e ) { return static_cast<double>(e); }
 };
 
-template <size_t N>
-struct test_helper<minimal<N>> {
-    static inline void init(minimal<N>& sum) { sum.set_value(0); }
-    static inline void sum(minimal<N>& sum, const int addend) { sum.set_value(sum.value() + addend); }
-    static inline void sum(minimal<N>& sum, const double addend) {
-        sum.set_value(sum.value() + static_cast<int>(addend));
-    }
-    static inline void sum(minimal<N>& sum, const minimal<N>& addend) {
-        sum.set_value(sum.value() + addend.value());
-    }
-    static inline void set(minimal<N>& v, const int value) { v.set_value(static_cast<int>(value)); }
-    static inline double get(const minimal<N>& sum) { return static_cast<double>(sum.value()); }
+template<size_t N>
+struct test_helper<minimalNComparable<N> > {
+   static inline void init(minimalNComparable<N> &sum) { sum.set_value( 0 ); }
+   static inline void sum(minimalNComparable<N> &sum, const int addend ) { sum.set_value( sum.value() + addend); }
+   static inline void sum(minimalNComparable<N> &sum, const double addend ) { sum.set_value( sum.value() + static_cast<int>(addend)); }
+   static inline void sum(minimalNComparable<N> &sum, const minimalNComparable<N> &addend ) { sum.set_value( sum.value() + addend.value()); }
+   static inline void set(minimalNComparable<N> &v, const int value ) { v.set_value( static_cast<int>(value) ); }
+   static inline double get(const minimalNComparable<N> &sum ) { return static_cast<double>(sum.value()); }
 };
 
-template <>
+template<>
 struct test_helper<ThrowingConstructor> {
-    static inline void init(ThrowingConstructor& sum) { sum.m_cnt = 0; }
-    static inline void sum(ThrowingConstructor& sum, const int addend) { sum.m_cnt += addend; }
-    static inline void sum(ThrowingConstructor& sum, const double addend) {
-        sum.m_cnt += static_cast<int>(addend);
-    }
-    static inline void sum(ThrowingConstructor& sum, const ThrowingConstructor& addend) {
-        sum.m_cnt += addend.m_cnt;
-    }
-    static inline void set(ThrowingConstructor& v, const int value) { v.m_cnt = static_cast<int>(value); }
-    static inline double get(const ThrowingConstructor& sum) { return static_cast<double>(sum.m_cnt); }
+   static inline void init(ThrowingConstructor &sum) { sum.m_cnt = 0; }
+   static inline void sum(ThrowingConstructor &sum, const int addend ) { sum.m_cnt += addend; }
+   static inline void sum(ThrowingConstructor &sum, const double addend ) { sum.m_cnt += static_cast<int>(addend); }
+   static inline void sum(ThrowingConstructor &sum, const ThrowingConstructor &addend ) { sum.m_cnt += addend.m_cnt; }
+   static inline void set(ThrowingConstructor &v, const int value ) { v.m_cnt = static_cast<int>(value); }
+   static inline double get(const ThrowingConstructor &sum ) { return static_cast<double>(sum.m_cnt); }
 };
 
 //! Tag class used to make certain constructors hard to invoke accidentally.
-struct SecretTagType {
-} SecretTag;
+struct SecretTagType {} SecretTag;
 
 //// functors and routines for initialization and combine
 
@@ -209,32 +183,28 @@ static std::atomic<int> FinitCounter;
 
 template <typename T, int Value>
 struct FunctorFinit {
-    FunctorFinit(const FunctorFinit&) { ++FinitCounter; }
-    FunctorFinit(SecretTagType) { ++FinitCounter; }
-    ~FunctorFinit() { --FinitCounter; }
+    FunctorFinit( const FunctorFinit& ) {++FinitCounter;}
+    FunctorFinit( SecretTagType ) {++FinitCounter;}
+    ~FunctorFinit() {--FinitCounter;}
     T operator()() { return Value; }
 };
 
 template <int Value>
-struct FunctorFinit<ThrowingConstructor, Value> {
-    FunctorFinit(const FunctorFinit&) { ++FinitCounter; }
-    FunctorFinit(SecretTagType) { ++FinitCounter; }
-    ~FunctorFinit() { --FinitCounter; }
-    ThrowingConstructor operator()() {
-        ThrowingConstructor temp;
-        temp.m_cnt = Value;
-        return temp;
-    }
+struct FunctorFinit<ThrowingConstructor,Value> {
+    FunctorFinit( const FunctorFinit& ) {++FinitCounter;}
+    FunctorFinit( SecretTagType ) {++FinitCounter;}
+    ~FunctorFinit() {--FinitCounter;}
+    ThrowingConstructor operator()() { ThrowingConstructor temp; temp.m_cnt = Value; return temp; }
 };
 
 template <size_t N, int Value>
-struct FunctorFinit<minimal<N>, Value> {
-    FunctorFinit(const FunctorFinit&) { ++FinitCounter; }
-    FunctorFinit(SecretTagType) { ++FinitCounter; }
-    ~FunctorFinit() { --FinitCounter; }
-    minimal<N> operator()() {
-        minimal<N> result;
-        result.set_value(Value);
+struct FunctorFinit<minimalNComparable<N>,Value> {
+    FunctorFinit( const FunctorFinit& ) {++FinitCounter;}
+    FunctorFinit( SecretTagType ) {++FinitCounter;}
+    ~FunctorFinit() {--FinitCounter;}
+    minimalNComparable<N> operator()() {
+        minimalNComparable<N> result;
+        result.set_value( Value );
         return result;
     }
 };
@@ -243,14 +213,16 @@ struct FunctorFinit<minimal<N>, Value> {
 
 template <typename T>
 struct FunctorAddCombineRef {
-    T operator()(const T& left, const T& right) const { return left + right; }
+    T operator()(const T& left, const T& right) const {
+        return left+right;
+    }
 };
 
 template <size_t N>
-struct FunctorAddCombineRef<minimal<N>> {
-    minimal<N> operator()(const minimal<N>& left, const minimal<N>& right) const {
-        minimal<N> result;
-        result.set_value(left.value() + right.value());
+struct FunctorAddCombineRef<minimalNComparable<N> > {
+    minimalNComparable<N> operator()(const minimalNComparable<N>& left, const minimalNComparable<N>& right) const {
+        minimalNComparable<N> result;
+        result.set_value( left.value() + right.value() );
         return result;
     }
 };
@@ -259,25 +231,25 @@ template <>
 struct FunctorAddCombineRef<ThrowingConstructor> {
     ThrowingConstructor operator()(const ThrowingConstructor& left, const ThrowingConstructor& right) const {
         ThrowingConstructor result;
-        result.m_cnt = (left.m_cnt + right.m_cnt);
+        result.m_cnt = ( left.m_cnt + right.m_cnt );
         return result;
     }
 };
 
 template <typename T>
 struct FunctorAddCombine {
-    T operator()(T left, T right) const { return FunctorAddCombineRef<T>()(left, right); }
+    T operator()(T left, T right ) const {
+        return FunctorAddCombineRef<T>()( left, right );
+    }
 };
 
 template <typename T>
-T FunctionAddByRef(const T& left, const T& right) {
-    return FunctorAddCombineRef<T>()(left, right);
+T FunctionAddByRef( const T &left, const T &right) {
+    return FunctorAddCombineRef<T>()( left, right );
 }
 
 template <typename T>
-T FunctionAdd(T left, T right) {
-    return FunctionAddByRef(left, right);
-}
+T FunctionAdd( T left, T right) { return FunctionAddByRef(left,right); }
 
 template <typename T>
 class Accumulator {
@@ -289,7 +261,6 @@ class Accumulator {
         return *this;
     }
     void operator()(const T& new_bit) { test_helper<T>::sum(my_result, new_bit); }
-
 private:
     T& my_result;
 };
@@ -310,10 +281,9 @@ class ClearingAccumulator {
     static void AssertClean(const T& thread_local_value) {
         T zero;
         test_helper<T>::init(zero);
-        REQUIRE_MESSAGE(test_helper<T>::get(thread_local_value) == test_helper<T>::get(zero),
-                        "combine_each does not allow to modify thread local values?");
+        REQUIRE_MESSAGE(test_helper<T>::get(thread_local_value)==test_helper<T>::get(zero),
+               "combine_each does not allow to modify thread local values?");
     }
-
 private:
     T& my_result;
 };
@@ -324,25 +294,27 @@ class ClearingAccumulator {
 // Tests for tests cases
 //------------------------------------------------------------------------------------------------------
 
-template <typename T, template <class> class Allocator>
-class parallel_scalar_body : utils::NoAssign {
-    typedef oneapi::tbb::enumerable_thread_specific<T, Allocator<T>> ets_type;
-    ets_type& sums;
+template <typename T, template<class> class Allocator>
+class parallel_scalar_body: utils::NoAssign {
+    typedef oneapi::tbb::enumerable_thread_specific<T, Allocator<T> > ets_type;
+    ets_type &sums;
     const char* allocator_name;
 
 public:
-    parallel_scalar_body(ets_type& _sums, const char* alloc_name) : sums(_sums), allocator_name(alloc_name) {}
 
-    void operator()(const oneapi::tbb::blocked_range<int>& r) const {
+    parallel_scalar_body ( ets_type &_sums, const char *alloc_name ) : sums(_sums), allocator_name(alloc_name) { }
+
+    void operator()( const oneapi::tbb::blocked_range<int> &r ) const {
         for (int i = r.begin(); i != r.end(); ++i)
-            test_helper<T>::sum(check_alignment(sums.local(), allocator_name), 1);
+            test_helper<T>::sum( check_alignment(sums.local(),allocator_name), 1 );
     }
+
 };
 
-template <typename T, template <class> class Allocator>
-void run_parallel_scalar_tests_nocombine(const char* /* test_name */, const char* allocator_name) {
+template< typename T, template<class> class Allocator>
+void run_parallel_scalar_tests_nocombine(const char* /* test_name */, const char *allocator_name) {
 
-    typedef oneapi::tbb::enumerable_thread_specific<T, Allocator<T>> ets_type;
+    typedef oneapi::tbb::enumerable_thread_specific<T, Allocator<T> > ets_type;
 
     Checker<T> my_check;
 
@@ -350,16 +322,18 @@ void run_parallel_scalar_tests_nocombine(const char* /* test_name */, const char
     struct fail_on_exception_guard {
         bool dismiss = false;
         ~fail_on_exception_guard() {
-            if (!dismiss) { FAIL("The exception is not expected"); }
+            if (!dismiss) {
+                FAIL("The exception is not expected");
+            }
         }
     } guard;
-    T default_value {};
+    T default_value{};
     guard.dismiss = true;
 
     gThrowValue = 0;
     {
         // We assume that static_sums zero-initialized or has a default constructor that zeros it.
-        ets_type static_sums = ets_type(T());
+        ets_type static_sums = ets_type( T() );
 
         T exemplar;
         test_helper<T>::init(exemplar);
@@ -400,126 +374,121 @@ void run_parallel_scalar_tests_nocombine(const char* /* test_name */, const char
                 static_sums.clear();
 
                 ets_type sums(exemplar);
-                FunctorFinit<T, 0> my_finit(SecretTag);
+                FunctorFinit<T,0> my_finit(SecretTag);
                 ets_type finit_ets(my_finit);
 
-                REQUIRE(sums.empty());
-                oneapi::tbb::parallel_for(oneapi::tbb::blocked_range<int>(0, N * p, RANGE_MIN),
-                                          parallel_scalar_body<T, Allocator>(sums, allocator_name));
-                REQUIRE(!sums.empty());
+                REQUIRE( sums.empty());
+                oneapi::tbb::parallel_for( oneapi::tbb::blocked_range<int>( 0, N*p, RANGE_MIN ), parallel_scalar_body<T,Allocator>( sums, allocator_name ) );
+                REQUIRE( !sums.empty());
 
-                REQUIRE(finit_ets.empty());
-                oneapi::tbb::parallel_for(oneapi::tbb::blocked_range<int>(0, N * p, RANGE_MIN),
-                                          parallel_scalar_body<T, Allocator>(finit_ets, allocator_name));
-                REQUIRE(!finit_ets.empty());
+                REQUIRE( finit_ets.empty());
+                oneapi::tbb::parallel_for( oneapi::tbb::blocked_range<int>( 0, N*p, RANGE_MIN ), parallel_scalar_body<T,Allocator>( finit_ets, allocator_name ) );
+                REQUIRE( !finit_ets.empty());
 
                 REQUIRE(static_sums.empty());
-                oneapi::tbb::parallel_for(oneapi::tbb::blocked_range<int>(0, N * p, RANGE_MIN),
-                                          parallel_scalar_body<T, Allocator>(static_sums, allocator_name));
-                REQUIRE(!static_sums.empty());
+                oneapi::tbb::parallel_for( oneapi::tbb::blocked_range<int>( 0, N*p, RANGE_MIN ), parallel_scalar_body<T,Allocator>( static_sums, allocator_name ) );
+                REQUIRE( !static_sums.empty());
 
                 // use iterator
                 typename ets_type::size_type size = 0;
-                for (typename ets_type::iterator i = sums.begin(); i != sums.end(); ++i) {
-                    ++size;
-                    test_helper<T>::sum(iterator_sum, *i);
+                for ( typename ets_type::iterator i = sums.begin(); i != sums.end(); ++i ) {
+                     ++size;
+                     test_helper<T>::sum(iterator_sum, *i);
                 }
-                REQUIRE(sums.size() == size);
+                REQUIRE( sums.size() == size);
 
                 // use const_iterator
-                for (typename ets_type::const_iterator i = sums.begin(); i != sums.end(); ++i) {
-                    test_helper<T>::sum(const_iterator_sum, *i);
+                for ( typename ets_type::const_iterator i = sums.begin(); i != sums.end(); ++i ) {
+                     test_helper<T>::sum(const_iterator_sum, *i);
                 }
 
                 // use range_type
                 typename ets_type::range_type r = sums.range();
-                for (typename ets_type::range_type::const_iterator i = r.begin(); i != r.end(); ++i) {
-                    test_helper<T>::sum(range_sum, *i);
+                for ( typename ets_type::range_type::const_iterator i = r.begin(); i != r.end(); ++i ) {
+                     test_helper<T>::sum(range_sum, *i);
                 }
 
                 // use const_range_type
                 const ets_type& csums = sums;
                 typename ets_type::const_range_type cr = csums.range();
-                for (typename ets_type::const_range_type::iterator i = cr.begin(); i != cr.end(); ++i) {
-                    test_helper<T>::sum(const_range_sum, *i);
+                for ( typename ets_type::const_range_type::iterator i = cr.begin(); i != cr.end(); ++i ) {
+                     test_helper<T>::sum(const_range_sum, *i);
                 }
 
                 // test copy constructor, with TLS-cached locals
-                typedef typename oneapi::tbb::enumerable_thread_specific<T, Allocator<T>,
-                                                                         oneapi::tbb::ets_key_per_instance>
-                        cached_ets_type;
+                typedef typename oneapi::tbb::enumerable_thread_specific<T, Allocator<T>, oneapi::tbb::ets_key_per_instance> cached_ets_type;
 
                 cached_ets_type cconst(sums);
-                oneapi::tbb::parallel_for(oneapi::tbb::blocked_range<int>(0, N * p, RANGE_MIN),
-                                          [&](const oneapi::tbb::blocked_range<int>&) {
-                                              bool exists = false;
-                                              T& ref = cconst.local(exists);
-                                              CHECK((exists || ref == default_value));
-                                          });
+                oneapi::tbb::parallel_for( oneapi::tbb::blocked_range<int>(0, N*p, RANGE_MIN), [&]( const oneapi::tbb::blocked_range<int>& ) {
+                    bool exists = false;
+                    T& ref = cconst.local(exists);
+                    CHECK( (exists || ref == default_value) );
+                } );
                 cached_ets_type cconst_to_assign1 = cconst;
                 cached_ets_type cconst_to_assign2;
                 cconst_to_assign2 = std::move(cconst_to_assign1);
                 REQUIRE(cconst_to_assign2.size() == cconst.size());
 
-                for (typename cached_ets_type::const_iterator i = cconst.begin(); i != cconst.end(); ++i) {
-                    test_helper<T>::sum(cconst_sum, *i);
+                for ( typename cached_ets_type::const_iterator i = cconst.begin(); i != cconst.end(); ++i ) {
+                     test_helper<T>::sum(cconst_sum, *i);
                 }
 
                 // test assignment
                 ets_type assigned;
                 assigned = sums;
 
-                for (typename ets_type::const_iterator i = assigned.begin(); i != assigned.end(); ++i) {
-                    test_helper<T>::sum(assign_sum, *i);
+                for ( typename ets_type::const_iterator i = assigned.begin(); i != assigned.end(); ++i ) {
+                     test_helper<T>::sum(assign_sum, *i);
                 }
 
                 // test assign to and from cached locals
                 cached_ets_type cassgn;
                 cassgn = sums;
-                for (typename cached_ets_type::const_iterator i = cassgn.begin(); i != cassgn.end(); ++i) {
-                    test_helper<T>::sum(cassgn_sum, *i);
+                for ( typename cached_ets_type::const_iterator i = cassgn.begin(); i != cassgn.end(); ++i ) {
+                     test_helper<T>::sum(cassgn_sum, *i);
                 }
 
                 ets_type non_cassgn;
                 non_cassgn = cassgn;
-                for (typename ets_type::const_iterator i = non_cassgn.begin(); i != non_cassgn.end(); ++i) {
-                    test_helper<T>::sum(non_cassgn_sum, *i);
+                for ( typename ets_type::const_iterator i = non_cassgn.begin(); i != non_cassgn.end(); ++i ) {
+                     test_helper<T>::sum(non_cassgn_sum, *i);
                 }
 
                 // test finit-initialized ets
-                for (typename ets_type::const_iterator i = finit_ets.begin(); i != finit_ets.end(); ++i) {
+                for(typename ets_type::const_iterator i = finit_ets.begin(); i != finit_ets.end(); ++i) {
                     test_helper<T>::sum(finit_ets_sum, *i);
                 }
 
                 // test static ets
-                for (typename ets_type::const_iterator i = static_sums.begin(); i != static_sums.end(); ++i) {
+                for(typename ets_type::const_iterator i = static_sums.begin(); i != static_sums.end(); ++i) {
                     test_helper<T>::sum(static_sum, *i);
                 }
+
             }
 
-            REQUIRE(EXPECTED_SUM * p == test_helper<T>::get(iterator_sum));
-            REQUIRE(EXPECTED_SUM * p == test_helper<T>::get(const_iterator_sum));
-            REQUIRE(EXPECTED_SUM * p == test_helper<T>::get(range_sum));
-            REQUIRE(EXPECTED_SUM * p == test_helper<T>::get(const_range_sum));
-
-            REQUIRE(EXPECTED_SUM * p == test_helper<T>::get(cconst_sum));
-            REQUIRE(EXPECTED_SUM * p == test_helper<T>::get(assign_sum));
-            REQUIRE(EXPECTED_SUM * p == test_helper<T>::get(cassgn_sum));
-            REQUIRE(EXPECTED_SUM * p == test_helper<T>::get(non_cassgn_sum));
-            REQUIRE(EXPECTED_SUM * p == test_helper<T>::get(finit_ets_sum));
-            REQUIRE(EXPECTED_SUM * p == test_helper<T>::get(static_sum));
+            REQUIRE(EXPECTED_SUM*p == test_helper<T>::get(iterator_sum));
+            REQUIRE(EXPECTED_SUM*p == test_helper<T>::get(const_iterator_sum));
+            REQUIRE(EXPECTED_SUM*p == test_helper<T>::get(range_sum));
+            REQUIRE(EXPECTED_SUM*p == test_helper<T>::get(const_range_sum));
+
+            REQUIRE(EXPECTED_SUM*p == test_helper<T>::get(cconst_sum));
+            REQUIRE(EXPECTED_SUM*p == test_helper<T>::get(assign_sum));
+            REQUIRE(EXPECTED_SUM*p == test_helper<T>::get(cassgn_sum));
+            REQUIRE(EXPECTED_SUM*p == test_helper<T>::get(non_cassgn_sum));
+            REQUIRE(EXPECTED_SUM*p == test_helper<T>::get(finit_ets_sum));
+            REQUIRE(EXPECTED_SUM*p == test_helper<T>::get(static_sum));
         }
-    }// Checker block
+    }  // Checker block
 }
 
-template <typename T, template <class> class Allocator>
+template< typename T, template<class> class Allocator>
 void run_parallel_scalar_tests(const char* test_name, const char* allocator_name) {
 
-    typedef oneapi::tbb::enumerable_thread_specific<T, Allocator<T>> ets_type;
+    typedef oneapi::tbb::enumerable_thread_specific<T, Allocator<T> > ets_type;
     bool exception_caught = false;
 
     // We assume that static_sums zero-initialized or has a default constructor that zeros it.
-    ets_type static_sums = ets_type(T());
+    ets_type static_sums = ets_type( T() );
 
     T exemplar;
     test_helper<T>::init(exemplar);
@@ -529,14 +498,15 @@ void run_parallel_scalar_tests(const char* test_name, const char* allocator_name
     // this means once; for the throwing type test it may loop two or three times.  The
     // value of targetThrowValue will determine when and if the test will throw.
     do {
-        targetThrowValue = test_throw_count;// keep testing until we get no exception
+        targetThrowValue = test_throw_count;  // keep testing until we get no exception
         exception_caught = false;
 #if TBB_USE_EXCEPTIONS
         try {
 #endif
-            run_parallel_scalar_tests_nocombine<T, Allocator>(test_name, allocator_name);
+            run_parallel_scalar_tests_nocombine<T,Allocator>(test_name, allocator_name);
 #if TBB_USE_EXCEPTIONS
-        } catch (...) {}
+        }
+        catch(...) {}
 #endif
         for (int p = std::max(MinThread, 2); p <= MaxThread; ++p) {
             oneapi::tbb::global_control gc(oneapi::tbb::global_control::max_allowed_parallelism, p);
@@ -571,13 +541,12 @@ void run_parallel_scalar_tests(const char* test_name, const char* allocator_name
 
                         REQUIRE(sums.empty());
                         oneapi::tbb::parallel_for(oneapi::tbb::blocked_range<int>(0, N * p, RANGE_MIN),
-                                                  parallel_scalar_body<T, Allocator>(sums, allocator_name));
+                            parallel_scalar_body<T, Allocator>(sums, allocator_name));
                         REQUIRE(!sums.empty());
 
                         REQUIRE(static_sums.empty());
-                        oneapi::tbb::parallel_for(
-                                oneapi::tbb::blocked_range<int>(0, N * p, RANGE_MIN),
-                                parallel_scalar_body<T, Allocator>(static_sums, allocator_name));
+                        oneapi::tbb::parallel_for(oneapi::tbb::blocked_range<int>(0, N * p, RANGE_MIN),
+                            parallel_scalar_body<T, Allocator>(static_sums, allocator_name));
                         REQUIRE(!static_sums.empty());
 
                         // Use combine
@@ -608,30 +577,32 @@ void run_parallel_scalar_tests(const char* test_name, const char* allocator_name
                 REQUIRE(EXPECTED_SUM * p == test_helper<T>::get(clearing_accumulator_sum));
             }
 
-        }                      // MinThread .. MaxThread
-        test_throw_count += 10;// keep testing until we don't get an exception
+        }  // MinThread .. MaxThread
+        test_throw_count += 10;  // keep testing until we don't get an exception
     } while (exception_caught && test_throw_count < 200);
     REQUIRE_MESSAGE(!exception_caught, "No non-exception test completed");
 }
 
-template <typename T, template <class> class Allocator>
-class parallel_vector_for_body : utils::NoAssign {
-    typedef std::vector<T, oneapi::tbb::tbb_allocator<T>> container_type;
-    typedef oneapi::tbb::enumerable_thread_specific<container_type, Allocator<container_type>> ets_type;
-    ets_type& locals;
-    const char* allocator_name;
+template <typename T, template<class> class Allocator>
+class parallel_vector_for_body: utils::NoAssign {
+    typedef std::vector<T, oneapi::tbb::tbb_allocator<T> > container_type;
+    typedef oneapi::tbb::enumerable_thread_specific< container_type, Allocator<container_type> > ets_type;
+    ets_type &locals;
+    const char *allocator_name;
 
 public:
-    parallel_vector_for_body(ets_type& _locals, const char* aname) : locals(_locals), allocator_name(aname) {}
 
-    void operator()(const oneapi::tbb::blocked_range<int>& r) const {
+    parallel_vector_for_body ( ets_type &_locals, const char *aname ) : locals(_locals), allocator_name(aname) { }
+
+    void operator()( const oneapi::tbb::blocked_range<int> &r ) const {
         T one;
         test_helper<T>::set(one, 1);
 
         for (int i = r.begin(); i < r.end(); ++i) {
-            check_alignment(locals.local(), allocator_name).push_back(one);
+            check_alignment(locals.local(),allocator_name).push_back( one );
         }
     }
+
 };
 
 template <typename R, typename T>
@@ -639,16 +610,14 @@ struct parallel_vector_reduce_body {
 
     T sum;
     size_t count;
-    typedef std::vector<T, oneapi::tbb::tbb_allocator<T>> container_type;
+    typedef std::vector<T, oneapi::tbb::tbb_allocator<T> > container_type;
 
-    parallel_vector_reduce_body() : count(0) { test_helper<T>::init(sum); }
-    parallel_vector_reduce_body(parallel_vector_reduce_body<R, T>&, oneapi::tbb::split) : count(0) {
-        test_helper<T>::init(sum);
-    }
+    parallel_vector_reduce_body ( ) : count(0) { test_helper<T>::init(sum); }
+    parallel_vector_reduce_body ( parallel_vector_reduce_body<R, T> &, oneapi::tbb::split ) : count(0) {  test_helper<T>::init(sum); }
 
-    void operator()(const R& r) {
+    void operator()( const R &r ) {
         for (typename R::iterator ri = r.begin(); ri != r.end(); ++ri) {
-            const container_type& v = *ri;
+            const container_type &v = *ri;
             ++count;
             for (typename container_type::const_iterator vi = v.begin(); vi != v.end(); ++vi) {
                 test_helper<T>::sum(sum, *vi);
@@ -656,16 +625,17 @@ struct parallel_vector_reduce_body {
         }
     }
 
-    void join(const parallel_vector_reduce_body& b) {
-        test_helper<T>::sum(sum, b.sum);
+    void join( const parallel_vector_reduce_body &b ) {
+        test_helper<T>::sum(sum,b.sum);
         count += b.count;
     }
+
 };
 
-template <typename T, template <class> class Allocator>
-void run_parallel_vector_tests(const char* /* test_name */, const char* allocator_name) {
-    typedef std::vector<T, oneapi::tbb::tbb_allocator<T>> container_type;
-    typedef oneapi::tbb::enumerable_thread_specific<container_type, Allocator<container_type>> ets_type;
+template< typename T, template<class> class Allocator>
+void run_parallel_vector_tests(const char* /* test_name */, const char *allocator_name) {
+    typedef std::vector<T, oneapi::tbb::tbb_allocator<T> > container_type;
+    typedef oneapi::tbb::enumerable_thread_specific< container_type, Allocator<container_type> > ets_type;
 
     for (int p = std::max(MinThread, 2); p <= MaxThread; ++p) {
         oneapi::tbb::global_control gc(oneapi::tbb::global_control::max_allowed_parallelism, p);
@@ -676,30 +646,30 @@ void run_parallel_vector_tests(const char* /* test_name */, const char* allocato
         for (int t = -1; t < REPETITIONS; ++t) {
             ets_type vs;
 
-            REQUIRE(vs.empty());
-            oneapi::tbb::parallel_for(oneapi::tbb::blocked_range<int>(0, N * p, RANGE_MIN),
-                                      parallel_vector_for_body<T, Allocator>(vs, allocator_name));
-            REQUIRE(!vs.empty());
+            REQUIRE( vs.empty() );
+            oneapi::tbb::parallel_for( oneapi::tbb::blocked_range<int> (0, N*p, RANGE_MIN),
+                               parallel_vector_for_body<T,Allocator>( vs, allocator_name ) );
+            REQUIRE( !vs.empty() );
 
             // copy construct
-            ets_type vs2(vs);// this causes an assertion failure, related to allocators...
+            ets_type vs2(vs); // this causes an assertion failure, related to allocators...
 
             // assign
             ets_type vs3;
             vs3 = vs;
 
-            parallel_vector_reduce_body<typename ets_type::const_range_type, T> pvrb;
-            oneapi::tbb::parallel_reduce(vs.range(1), pvrb);
+            parallel_vector_reduce_body< typename ets_type::const_range_type, T > pvrb;
+            oneapi::tbb::parallel_reduce ( vs.range(1), pvrb );
 
             test_helper<T>::sum(sum, pvrb.sum);
 
-            REQUIRE(vs.size() == pvrb.count);
-            REQUIRE(vs2.size() == pvrb.count);
-            REQUIRE(vs3.size() == pvrb.count);
+            REQUIRE( vs.size() == pvrb.count );
+            REQUIRE( vs2.size() == pvrb.count );
+            REQUIRE( vs3.size() == pvrb.count );
 
             oneapi::tbb::flattened2d<ets_type> fvs = flatten2d(vs);
             size_t ccount = fvs.size();
-            REQUIRE(ccount == size_t(N * p));
+            REQUIRE( ccount == size_t(N*p) );
             size_t elem_cnt = 0;
             typename oneapi::tbb::flattened2d<ets_type>::iterator it;
             auto it2(it);
@@ -711,48 +681,46 @@ void run_parallel_vector_tests(const char* /* test_name */, const char* allocato
             REQUIRE(it3 == cit);
             REQUIRE(it3.operator->() == &(*it3));
 
-            for (typename oneapi::tbb::flattened2d<ets_type>::const_iterator i = fvs.begin(); i != fvs.end();
-                 ++i) {
+            for(typename oneapi::tbb::flattened2d<ets_type>::const_iterator i = fvs.begin(); i != fvs.end(); ++i) {
                 ++elem_cnt;
             };
-            REQUIRE(ccount == elem_cnt);
+            REQUIRE( ccount == elem_cnt );
 
             elem_cnt = 0;
-            for (typename oneapi::tbb::flattened2d<ets_type>::iterator i = fvs.begin(); i != fvs.end(); i++) {
+            for(typename oneapi::tbb::flattened2d<ets_type>::iterator i = fvs.begin(); i != fvs.end(); i++) {
                 ++elem_cnt;
             };
-            REQUIRE(ccount == elem_cnt);
+            REQUIRE( ccount == elem_cnt );
 
             // Test the ETS constructor with multiple args
             T minus_one;
             test_helper<T>::set(minus_one, -1);
             // Set ETS to construct "local" vectors pre-occupied with 25 "minus_one"s
             // Cast 25 to size_type to prevent Intel Compiler SFINAE compilation issues with gcc 5.
-            ets_type vvs(typename container_type::size_type(25), minus_one, oneapi::tbb::tbb_allocator<T>());
-            REQUIRE(vvs.empty());
-            oneapi::tbb::parallel_for(oneapi::tbb::blocked_range<int>(0, N * p, RANGE_MIN),
-                                      parallel_vector_for_body<T, Allocator>(vvs, allocator_name));
-            REQUIRE(!vvs.empty());
+            ets_type vvs( typename container_type::size_type(25), minus_one, oneapi::tbb::tbb_allocator<T>() );
+            REQUIRE( vvs.empty() );
+            oneapi::tbb::parallel_for ( oneapi::tbb::blocked_range<int> (0, N*p, RANGE_MIN), parallel_vector_for_body<T,Allocator>( vvs, allocator_name ) );
+            REQUIRE( !vvs.empty() );
 
-            parallel_vector_reduce_body<typename ets_type::const_range_type, T> pvrb2;
-            oneapi::tbb::parallel_reduce(vvs.range(1), pvrb2);
-            REQUIRE(pvrb2.count == vvs.size());
-            REQUIRE(test_helper<T>::get(pvrb2.sum) == N * p - pvrb2.count * 25);
+            parallel_vector_reduce_body< typename ets_type::const_range_type, T > pvrb2;
+            oneapi::tbb::parallel_reduce ( vvs.range(1), pvrb2 );
+            REQUIRE( pvrb2.count == vvs.size() );
+            REQUIRE( test_helper<T>::get(pvrb2.sum) == N*p-pvrb2.count*25 );
 
             oneapi::tbb::flattened2d<ets_type> fvvs = flatten2d(vvs);
             ccount = fvvs.size();
-            REQUIRE(ccount == N * p + pvrb2.count * 25);
+            REQUIRE( ccount == N*p+pvrb2.count*25 );
         }
 
         double result_value = test_helper<T>::get(sum);
-        REQUIRE(EXPECTED_SUM * p == result_value);
+        REQUIRE( EXPECTED_SUM*p == result_value);
     }
 }
 
-template <typename T, template <class> class Allocator>
+template<typename T, template<class> class Allocator>
 void run_cross_type_vector_tests(const char* /* test_name */) {
     const char* allocator_name = "default";
-    typedef std::vector<T, oneapi::tbb::tbb_allocator<T>> container_type;
+    typedef std::vector<T, oneapi::tbb::tbb_allocator<T> > container_type;
 
     for (int p = std::max(MinThread, 2); p <= MaxThread; ++p) {
         oneapi::tbb::global_control gc(oneapi::tbb::global_control::max_allowed_parallelism, p);
@@ -761,18 +729,13 @@ void run_cross_type_vector_tests(const char* /* test_name */) {
         test_helper<T>::init(sum);
 
         for (int t = -1; t < REPETITIONS; ++t) {
-            typedef typename oneapi::tbb::enumerable_thread_specific<
-                    container_type, Allocator<container_type>, oneapi::tbb::ets_no_key>
-                    ets_nokey_type;
-            typedef typename oneapi::tbb::enumerable_thread_specific<
-                    container_type, Allocator<container_type>, oneapi::tbb::ets_key_per_instance>
-                    ets_tlskey_type;
+            typedef typename oneapi::tbb::enumerable_thread_specific< container_type, Allocator<container_type>, oneapi::tbb::ets_no_key > ets_nokey_type;
+            typedef typename oneapi::tbb::enumerable_thread_specific< container_type, Allocator<container_type>, oneapi::tbb::ets_key_per_instance > ets_tlskey_type;
             ets_nokey_type vs;
 
-            REQUIRE(vs.empty());
-            oneapi::tbb::parallel_for(oneapi::tbb::blocked_range<int>(0, N * p, RANGE_MIN),
-                                      parallel_vector_for_body<T, Allocator>(vs, allocator_name));
-            REQUIRE(!vs.empty());
+            REQUIRE( vs.empty());
+            oneapi::tbb::parallel_for ( oneapi::tbb::blocked_range<int> (0, N*p, RANGE_MIN), parallel_vector_for_body<T, Allocator>( vs, allocator_name ) );
+            REQUIRE( !vs.empty());
 
             // copy construct
             ets_tlskey_type vs2(vs);
@@ -781,55 +744,54 @@ void run_cross_type_vector_tests(const char* /* test_name */) {
             ets_nokey_type vs3;
             vs3 = vs2;
 
-            parallel_vector_reduce_body<typename ets_nokey_type::const_range_type, T> pvrb;
-            oneapi::tbb::parallel_reduce(vs3.range(1), pvrb);
+            parallel_vector_reduce_body< typename ets_nokey_type::const_range_type, T > pvrb;
+            oneapi::tbb::parallel_reduce ( vs3.range(1), pvrb );
 
             test_helper<T>::sum(sum, pvrb.sum);
 
-            REQUIRE(vs3.size() == pvrb.count);
+            REQUIRE( vs3.size() == pvrb.count);
 
             oneapi::tbb::flattened2d<ets_nokey_type> fvs = flatten2d(vs3);
             size_t ccount = fvs.size();
             size_t elem_cnt = 0;
-            for (typename oneapi::tbb::flattened2d<ets_nokey_type>::const_iterator i = fvs.begin();
-                 i != fvs.end(); ++i) {
+            for(typename oneapi::tbb::flattened2d<ets_nokey_type>::const_iterator i = fvs.begin(); i != fvs.end(); ++i) {
                 ++elem_cnt;
             };
             REQUIRE(ccount == elem_cnt);
 
             elem_cnt = 0;
-            for (typename oneapi::tbb::flattened2d<ets_nokey_type>::iterator i = fvs.begin(); i != fvs.end();
-                 ++i) {
+            for(typename oneapi::tbb::flattened2d<ets_nokey_type>::iterator i = fvs.begin(); i != fvs.end(); ++i) {
                 ++elem_cnt;
             };
             REQUIRE(ccount == elem_cnt);
 
-            oneapi::tbb::flattened2d<ets_nokey_type> fvs2
-                    = flatten2d(vs3, vs3.begin(), std::next(vs3.begin()));
+            oneapi::tbb::flattened2d<ets_nokey_type> fvs2 = flatten2d(vs3, vs3.begin(), std::next(vs3.begin()));
             REQUIRE(std::distance(fvs2.begin(), fvs2.end()) == vs3.begin()->size());
             const oneapi::tbb::flattened2d<ets_nokey_type>& cfvs2(fvs2);
             REQUIRE(std::distance(cfvs2.begin(), cfvs2.end()) == vs3.begin()->size());
         }
 
         double result_value = test_helper<T>::get(sum);
-        REQUIRE(EXPECTED_SUM * p == result_value);
+        REQUIRE( EXPECTED_SUM*p == result_value);
     }
 }
 
-template <typename T>
+template< typename T >
 void run_serial_scalar_tests(const char* /* test_name */) {
     T sum;
     test_helper<T>::init(sum);
 
     for (int t = -1; t < REPETITIONS; ++t) {
-        for (int i = 0; i < N; ++i) { test_helper<T>::sum(sum, 1); }
+        for (int i = 0; i < N; ++i) {
+            test_helper<T>::sum(sum,1);
+        }
     }
 
     double result_value = test_helper<T>::get(sum);
-    REQUIRE(EXPECTED_SUM == result_value);
+    REQUIRE( EXPECTED_SUM == result_value);
 }
 
-template <typename T>
+template< typename T >
 void run_serial_vector_tests(const char* /* test_name */) {
     T sum;
     test_helper<T>::init(sum);
@@ -837,15 +799,16 @@ void run_serial_vector_tests(const char* /* test_name */) {
     test_helper<T>::set(one, 1);
 
     for (int t = -1; t < REPETITIONS; ++t) {
-        std::vector<T, oneapi::tbb::tbb_allocator<T>> v;
-        for (int i = 0; i < N; ++i) { v.push_back(one); }
-        for (typename std::vector<T, oneapi::tbb::tbb_allocator<T>>::const_iterator i = v.begin();
-             i != v.end(); ++i)
+        std::vector<T, oneapi::tbb::tbb_allocator<T> > v;
+        for (int i = 0; i < N; ++i) {
+            v.push_back( one );
+        }
+        for (typename std::vector<T, oneapi::tbb::tbb_allocator<T> >::const_iterator i = v.begin(); i != v.end(); ++i)
             test_helper<T>::sum(sum, *i);
     }
 
     double result_value = test_helper<T>::get(sum);
-    REQUIRE(EXPECTED_SUM == result_value);
+    REQUIRE( EXPECTED_SUM == result_value);
 }
 
 const size_t line_size = oneapi::tbb::detail::max_nfs_size;
@@ -853,158 +816,154 @@ const size_t line_size = oneapi::tbb::detail::max_nfs_size;
 void run_reference_check() {
     run_serial_scalar_tests<int>("int");
     run_serial_scalar_tests<double>("double");
-    run_serial_scalar_tests<minimal<>>("minimal<>");
+    run_serial_scalar_tests<minimalNComparable<> >("minimalNComparable<>");
     run_serial_vector_tests<int>("std::vector<int, oneapi::tbb::tbb_allocator<int> >");
     run_serial_vector_tests<double>("std::vector<double, oneapi::tbb::tbb_allocator<double> >");
 }
 
-template <template <class> class Allocator>
-void run_parallel_tests(const char* allocator_name) {
-    run_parallel_scalar_tests<int, Allocator>("int", allocator_name);
-    run_parallel_scalar_tests<double, Allocator>("double", allocator_name);
-    run_parallel_scalar_tests_nocombine<minimal<>, Allocator>("minimal<>", allocator_name);
+template<template<class>class Allocator>
+void run_parallel_tests(const char *allocator_name) {
+    run_parallel_scalar_tests<int, Allocator>("int",allocator_name);
+    run_parallel_scalar_tests<double, Allocator>("double",allocator_name);
+    run_parallel_scalar_tests_nocombine<minimalNComparable<>,Allocator>("minimalNComparable<>",allocator_name);
     run_parallel_scalar_tests<ThrowingConstructor, Allocator>("ThrowingConstructor", allocator_name);
-    run_parallel_vector_tests<int, Allocator>("std::vector<int, oneapi::tbb::tbb_allocator<int> >",
-                                              allocator_name);
-    run_parallel_vector_tests<double, Allocator>("std::vector<double, oneapi::tbb::tbb_allocator<double> >",
-                                                 allocator_name);
+    run_parallel_vector_tests<int, Allocator>("std::vector<int, oneapi::tbb::tbb_allocator<int> >",allocator_name);
+    run_parallel_vector_tests<double, Allocator>("std::vector<double, oneapi::tbb::tbb_allocator<double> >",allocator_name);
 }
 
 void run_cross_type_tests() {
     // cross-type scalar tests are part of run_parallel_scalar_tests_nocombine
-    run_cross_type_vector_tests<int, oneapi::tbb::tbb_allocator>(
-            "std::vector<int, oneapi::tbb::tbb_allocator<int> >");
-    run_cross_type_vector_tests<double, oneapi::tbb::tbb_allocator>(
-            "std::vector<double, oneapi::tbb::tbb_allocator<double> >");
+    run_cross_type_vector_tests<int, oneapi::tbb::tbb_allocator>("std::vector<int, oneapi::tbb::tbb_allocator<int> >");
+    run_cross_type_vector_tests<double, oneapi::tbb::tbb_allocator>("std::vector<double, oneapi::tbb::tbb_allocator<double> >");
 }
 
-template <typename T, template <class> class Allocator, typename Init>
-oneapi::tbb::enumerable_thread_specific<T, Allocator<T>> MakeETS(Init init) {
-    return oneapi::tbb::enumerable_thread_specific<T, Allocator<T>>(init);
+template<typename T, template<class> class Allocator, typename Init>
+oneapi::tbb::enumerable_thread_specific<T,Allocator<T> > MakeETS( Init init ) {
+    return oneapi::tbb::enumerable_thread_specific<T,Allocator<T> >(init);
 }
 // In some GCC versions, parameter packs in lambdas might cause compile errors
-template <typename ETS, typename... P>
+template<typename ETS, typename... P>
 struct MakeETS_Functor {
-    ETS operator()(typename std::decay<P>::type&&... params) { return ETS(std::move(params)...); }
+    ETS operator()( typename std::decay<P>::type&&... params ) {
+        return ETS(std::move(params)...);
+    }
 };
-template <typename T, template <class> class Allocator, typename... P>
-oneapi::tbb::enumerable_thread_specific<T, Allocator<T>>
-MakeETS(oneapi::tbb::detail::stored_pack<P...> pack) {
-    typedef oneapi::tbb::enumerable_thread_specific<T, Allocator<T>> result_type;
-    return oneapi::tbb::detail::call_and_return<result_type>(MakeETS_Functor<result_type, P...>(),
-                                                             std::move(pack));
+template<typename T, template<class> class Allocator, typename... P>
+oneapi::tbb::enumerable_thread_specific<T,Allocator<T> > MakeETS( oneapi::tbb::detail::stored_pack<P...> pack ) {
+    typedef oneapi::tbb::enumerable_thread_specific<T,Allocator<T> > result_type;
+    return oneapi::tbb::detail::call_and_return< result_type >(
+        MakeETS_Functor<result_type,P...>(), std::move(pack)
+    );
 }
 
-template <typename T, template <class> class Allocator, typename InitSrc, typename InitDst,
-          typename Validator>
-void ets_copy_assign_test(InitSrc init1, InitDst init2, Validator check, const char* allocator_name) {
-    typedef oneapi::tbb::enumerable_thread_specific<T, Allocator<T>> ets_type;
+template<typename T, template<class> class Allocator, typename InitSrc, typename InitDst, typename Validator>
+void ets_copy_assign_test( InitSrc init1, InitDst init2, Validator check, const char *allocator_name ) {
+    typedef oneapi::tbb::enumerable_thread_specific<T, Allocator<T> > ets_type;
 
     // Create the source instance
     const ets_type& cref_binder = MakeETS<T, Allocator>(init1);
     ets_type& source = const_cast<ets_type&>(cref_binder);
-    check(check_alignment(source.local(), allocator_name));
+    check(check_alignment(source.local(),allocator_name));
 
     // Test copy construction
     bool existed = false;
     ets_type copy(source);
-    check(check_alignment(copy.local(existed), allocator_name));
+    check(check_alignment(copy.local(existed),allocator_name));
     REQUIRE_MESSAGE(existed, "Local data not created by ETS copy constructor");
     copy.clear();
-    check(check_alignment(copy.local(), allocator_name));
+    check(check_alignment(copy.local(),allocator_name));
 
     // Test assignment
     existed = false;
     ets_type assign(init2);
     assign = source;
-    check(check_alignment(assign.local(existed), allocator_name));
+    check(check_alignment(assign.local(existed),allocator_name));
     REQUIRE_MESSAGE(existed, "Local data not created by ETS assignment");
     assign.clear();
-    check(check_alignment(assign.local(), allocator_name));
+    check(check_alignment(assign.local(),allocator_name));
 
     // Create the source instance
     ets_type&& rvref_binder = MakeETS<T, Allocator>(init1);
-    check(check_alignment(rvref_binder.local(), allocator_name));
+    check(check_alignment(rvref_binder.local(),allocator_name));
 
     // Test move construction
     existed = false;
     ets_type moved(rvref_binder);
-    check(check_alignment(moved.local(existed), allocator_name));
+    check(check_alignment(moved.local(existed),allocator_name));
     REQUIRE_MESSAGE(existed, "Local data not created by ETS move constructor");
     moved.clear();
-    check(check_alignment(moved.local(), allocator_name));
+    check(check_alignment(moved.local(),allocator_name));
 
     // Test assignment
     existed = false;
     ets_type move_assign(init2);
     move_assign = std::move(moved);
-    check(check_alignment(move_assign.local(existed), allocator_name));
+    check(check_alignment(move_assign.local(existed),allocator_name));
     REQUIRE_MESSAGE(existed, "Local data not created by ETS move assignment");
     move_assign.clear();
-    check(check_alignment(move_assign.local(), allocator_name));
+    check(check_alignment(move_assign.local(),allocator_name));
 }
 
-template <typename T, int Expected>
+template<typename T, int Expected>
 struct Validator {
-    void operator()(const T& value) { REQUIRE(test_helper<T>::get(value) == Expected); }
-    void operator()(const std::pair<int, T>& value) {
+    void operator()( const T& value ) {
+        REQUIRE(test_helper<T>::get(value) == Expected);
+    }
+    void operator()( const std::pair<int,T>& value ) {
         REQUIRE(value.first > 0);
-        REQUIRE(test_helper<T>::get(value.second) == Expected * value.first);
+        REQUIRE(test_helper<T>::get(value.second) == Expected*value.first);
     }
 };
 
-template <typename T, template <class> class Allocator>
-void run_assign_and_copy_constructor_test(const char* /* test_name */, const char* allocator_name) {
-#define EXPECTED 3142
+template <typename T, template<class> class Allocator>
+void run_assign_and_copy_constructor_test(const char* /* test_name */, const char *allocator_name) {
+    #define EXPECTED 3142
 
     // test with exemplar initializer
     T src_init;
-    test_helper<T>::set(src_init, EXPECTED);
+    test_helper<T>::set(src_init,EXPECTED);
     T other_init;
     test_helper<T>::init(other_init);
-    ets_copy_assign_test<T, Allocator>(src_init, other_init, Validator<T, EXPECTED>(), allocator_name);
+    ets_copy_assign_test<T, Allocator>(src_init, other_init, Validator<T,EXPECTED>(), allocator_name);
 
     // test with function initializer
-    FunctorFinit<T, EXPECTED> src_finit(SecretTag);
-    FunctorFinit<T, 0> other_finit(SecretTag);
-    ets_copy_assign_test<T, Allocator>(src_finit, other_finit, Validator<T, EXPECTED>(), allocator_name);
+    FunctorFinit<T,EXPECTED> src_finit(SecretTag);
+    FunctorFinit<T,0> other_finit(SecretTag);
+    ets_copy_assign_test<T, Allocator>(src_finit, other_finit, Validator<T,EXPECTED>(), allocator_name);
 
     // test with multi-argument "emplace" initializer
     // The arguments are wrapped into oneapi::tbb::internal::stored_pack to avoid variadic templates in ets_copy_assign_test.
-    test_helper<T>::set(src_init, EXPECTED * 17);
-    ets_copy_assign_test<std::pair<int, T>, Allocator>(oneapi::tbb::detail::save_pack(17, src_init),
-                                                       std::make_pair(-1, T()), Validator<T, EXPECTED>(),
-                                                       allocator_name);
-#undef EXPECTED
+    test_helper<T>::set(src_init,EXPECTED*17);
+    ets_copy_assign_test< std::pair<int,T>, Allocator>(oneapi::tbb::detail::save_pack(17,src_init), std::make_pair(-1,T()), Validator<T,EXPECTED>(), allocator_name);
+    #undef EXPECTED
 }
 
-template <template <class> class Allocator>
+template< template<class> class Allocator>
 void run_assignment_and_copy_constructor_tests(const char* allocator_name) {
     run_assign_and_copy_constructor_test<int, Allocator>("int", allocator_name);
     run_assign_and_copy_constructor_test<double, Allocator>("double", allocator_name);
     // Try class sizes that are close to a cache line in size, in order to check padding calculations.
-    run_assign_and_copy_constructor_test<minimal<line_size - 1>, Allocator>("minimal<line_size-1>",
-                                                                            allocator_name);
-    run_assign_and_copy_constructor_test<minimal<line_size>, Allocator>("minimal<line_size>", allocator_name);
-    run_assign_and_copy_constructor_test<minimal<line_size + 1>, Allocator>("minimal<line_size+1>",
-                                                                            allocator_name);
-    REQUIRE(FinitCounter == 0);
+    run_assign_and_copy_constructor_test<minimalNComparable<line_size-1>, Allocator >("minimalNComparable<line_size-1>", allocator_name);
+    run_assign_and_copy_constructor_test<minimalNComparable<line_size>, Allocator >("minimalNComparable<line_size>", allocator_name);
+    run_assign_and_copy_constructor_test<minimalNComparable<line_size+1>, Allocator >("minimalNComparable<line_size+1>", allocator_name);
+    REQUIRE(FinitCounter==0);
 }
 
 // Class with no default constructor
 class HasNoDefaultConstructor {
     HasNoDefaultConstructor();
-
 public:
-    HasNoDefaultConstructor(SecretTagType) {}
+    HasNoDefaultConstructor( SecretTagType ) {}
 };
 // Initialization functor for HasNoDefaultConstructor
 struct HasNoDefaultConstructorFinit {
-    HasNoDefaultConstructor operator()() { return HasNoDefaultConstructor(SecretTag); }
+    HasNoDefaultConstructor operator()() {
+        return HasNoDefaultConstructor(SecretTag);
+    }
 };
 // Combine functor for HasNoDefaultConstructor
 struct HasNoDefaultConstructorCombine {
-    HasNoDefaultConstructor operator()(HasNoDefaultConstructor, HasNoDefaultConstructor) {
+    HasNoDefaultConstructor operator()( HasNoDefaultConstructor, HasNoDefaultConstructor ) {
         return HasNoDefaultConstructor(SecretTag);
     }
 };
@@ -1012,62 +971,56 @@ struct HasNoDefaultConstructorCombine {
 // Class that only has a constructor with multiple parameters and a move constructor
 class HasSpecialAndMoveCtor : utils::NoCopy {
     HasSpecialAndMoveCtor();
-
 public:
-    HasSpecialAndMoveCtor(SecretTagType, size_t = size_t(0), const char* = "") {}
-    HasSpecialAndMoveCtor(HasSpecialAndMoveCtor&&) {}
+    HasSpecialAndMoveCtor( SecretTagType, size_t = size_t(0), const char* = "" ) {}
+    HasSpecialAndMoveCtor( HasSpecialAndMoveCtor&& ) {}
 };
 
 // No-op combine-each functor
-template <typename V>
+template<typename V>
 struct EmptyCombineEach {
-    void operator()(const V&) {}
+    void operator()( const V& ) { }
 };
 
 //! Test situations where only default constructor or copy constructor is required.
-template <template <class> class Allocator>
+template<template<class> class Allocator>
 void TestInstantiation(const char* /* allocator_name */) {
     // Test instantiation is possible when copy constructor is not required.
-    oneapi::tbb::enumerable_thread_specific<utils::NoCopy, Allocator<utils::NoCopy>> ets1;
+    oneapi::tbb::enumerable_thread_specific<utils::NoCopy, Allocator<utils::NoCopy> > ets1;
     ets1.local();
     ets1.combine_each(EmptyCombineEach<utils::NoCopy>());
 
     // Test instantiation when default constructor is not required, because exemplar is provided.
     HasNoDefaultConstructor x(SecretTag);
-    oneapi::tbb::enumerable_thread_specific<HasNoDefaultConstructor, Allocator<HasNoDefaultConstructor>> ets2(
-            x);
+    oneapi::tbb::enumerable_thread_specific<HasNoDefaultConstructor, Allocator<HasNoDefaultConstructor> > ets2(x);
     ets2.local();
     ets2.combine(HasNoDefaultConstructorCombine());
 
     // Test instantiation when default constructor is not required, because init function is provided.
     HasNoDefaultConstructorFinit f;
-    oneapi::tbb::enumerable_thread_specific<HasNoDefaultConstructor, Allocator<HasNoDefaultConstructor>> ets3(
-            f);
+    oneapi::tbb::enumerable_thread_specific<HasNoDefaultConstructor, Allocator<HasNoDefaultConstructor> > ets3(f);
     ets3.local();
     ets3.combine(HasNoDefaultConstructorCombine());
 
     // Test instantiation with multiple arguments
-    oneapi::tbb::enumerable_thread_specific<HasSpecialAndMoveCtor, Allocator<HasSpecialAndMoveCtor>> ets4(
-            SecretTag, 0x42, "meaningless");
+    oneapi::tbb::enumerable_thread_specific<HasSpecialAndMoveCtor, Allocator<HasSpecialAndMoveCtor> > ets4(SecretTag, 0x42, "meaningless");
     ets4.local();
     ets4.combine_each(EmptyCombineEach<HasSpecialAndMoveCtor>());
     // Test instantiation with one argument that should however use the variadic constructor
-    oneapi::tbb::enumerable_thread_specific<HasSpecialAndMoveCtor, Allocator<HasSpecialAndMoveCtor>> ets5(
-            SecretTag);
+    oneapi::tbb::enumerable_thread_specific<HasSpecialAndMoveCtor, Allocator<HasSpecialAndMoveCtor> > ets5(SecretTag);
     ets5.local();
     ets5.combine_each(EmptyCombineEach<HasSpecialAndMoveCtor>());
     // Test that move operations do not impose extra requirements
     // Default allocator is used. If it does not match Allocator, there will be elementwise move
-    oneapi::tbb::enumerable_thread_specific<HasSpecialAndMoveCtor> ets6(std::move(ets4));
+    oneapi::tbb::enumerable_thread_specific<HasSpecialAndMoveCtor> ets6( std::move(ets4) );
     ets6.combine_each(EmptyCombineEach<HasSpecialAndMoveCtor>());
     ets6 = std::move(ets5);
 }
 
 void TestMemberTypes() {
     using default_container_type = oneapi::tbb::enumerable_thread_specific<int>;
-    static_assert(std::is_same<typename default_container_type::allocator_type,
-                               oneapi::tbb::cache_aligned_allocator<int>>::value,
-                  "Incorrect default template allocator");
+    static_assert(std::is_same<typename default_container_type::allocator_type, oneapi::tbb::cache_aligned_allocator<int>>::value,
+            "Incorrect default template allocator");
 
     using test_allocator_type = std::allocator<int>;
     using ets_container_type = oneapi::tbb::enumerable_thread_specific<int, test_allocator_type>;
@@ -1085,11 +1038,9 @@ void TestMemberTypes() {
                   "Incorrect container const_reference member type");
 
     using allocator_type = typename ets_container_type::allocator_type;
-    static_assert(std::is_same<typename ets_container_type::pointer,
-                               typename std::allocator_traits<allocator_type>::pointer>::value,
+    static_assert(std::is_same<typename ets_container_type::pointer, typename std::allocator_traits<allocator_type>::pointer>::value,
                   "Incorrect container pointer member type");
-    static_assert(std::is_same<typename ets_container_type::const_pointer,
-                               typename std::allocator_traits<allocator_type>::const_pointer>::value,
+    static_assert(std::is_same<typename ets_container_type::const_pointer, typename std::allocator_traits<allocator_type>::const_pointer>::value,
                   "Incorrect container const_pointer member type");
 
     static_assert(std::is_unsigned<typename ets_container_type::size_type>::value,
@@ -1109,12 +1060,13 @@ void TestMemberTypes() {
 
 size_t init_tbb_alloc_mask() {
     // TODO: use __TBB_alignof(T) to check for local() results instead of using internal knowledges of ets element padding
-    if (oneapi::tbb::tbb_allocator<int>::allocator_type() == oneapi::tbb::tbb_allocator<int>::standard) {
+    if(oneapi::tbb::tbb_allocator<int>::allocator_type() == oneapi::tbb::tbb_allocator<int>::standard) {
         // scalable allocator is not available.
         return 1;
-    } else {
+    }
+    else {
         // this value is for large objects, but will be correct for small.
-        return 64;// TBB_REVAMP_TODO: enable as estimatedCacheLineSize when tbbmalloc is available;
+        return 64; // TBB_REVAMP_TODO: enable as estimatedCacheLineSize when tbbmalloc is available;
     }
 }
 
@@ -1136,10 +1088,11 @@ void TestETSIterator() {
         ets_type ets;
         const ets_type& cets(ets);
 
-        auto fill_ets_body = [&]() {
+        auto fill_ets_body = [&](){
             ets.local() = 42;
             ++sync_counter;
-            while (sync_counter != expected_ets_size) utils::yield();
+            while(sync_counter != expected_ets_size)
+                utils::yield();
         };
 
         oneapi::tbb::parallel_invoke(fill_ets_body, fill_ets_body);
@@ -1147,14 +1100,22 @@ void TestETSIterator() {
 
         std::size_t counter = 0;
         auto iter = ets.begin();
-        while (iter != ets.end()) { ++counter % 2 == 0 ? ++iter : iter++; }
+        while(iter != ets.end()) {
+            ++counter % 2 == 0 ? ++iter : iter++;
+        }
         REQUIRE(counter == expected_ets_size);
-        while (iter != ets.begin()) { --counter % 2 == 0 ? --iter : iter--; }
+        while(iter != ets.begin()) {
+            --counter % 2 == 0 ? --iter : iter--;
+        }
         REQUIRE(counter == 0);
         auto citer = cets.begin();
-        while (citer != cets.end()) { ++counter % 2 == 0 ? ++citer : citer++; }
+        while(citer != cets.end()) {
+            ++counter % 2 == 0 ? ++citer : citer++;
+        }
         REQUIRE(counter == expected_ets_size);
-        while (citer != cets.begin()) { --counter % 2 == 0 ? --citer : citer--; }
+        while(citer != cets.begin()) {
+            --counter % 2 == 0 ? --citer : citer--;
+        }
         REQUIRE(counter == 0);
         REQUIRE(ets.begin() + expected_ets_size == ets.end());
         REQUIRE(expected_ets_size + ets.begin() == ets.end());
@@ -1188,7 +1149,7 @@ void TestETSIterator() {
 }
 
 template <bool ExpectEqual, bool ExpectLess, typename Iterator>
-void DoETSIteratorComparisons(const Iterator& lhs, const Iterator& rhs) {
+void DoETSIteratorComparisons( const Iterator& lhs, const Iterator& rhs ) {
     // TODO: replace with testEqualityAndLessComparisons after adding <=> operator for ETS iterator
     using namespace comparisons_testing;
     testEqualityComparisons<ExpectEqual>(lhs, rhs);
@@ -1196,15 +1157,15 @@ void DoETSIteratorComparisons(const Iterator& lhs, const Iterator& rhs) {
 }
 
 template <typename Iterator, typename ETS>
-void TestETSIteratorComparisonsBasic(ETS& ets) {
+void TestETSIteratorComparisonsBasic( ETS& ets ) {
     REQUIRE_MESSAGE(!ets.empty(), "Incorrect test setup");
     Iterator it1, it2;
-    DoETSIteratorComparisons</*ExpectEqual = */ true, /*ExpectLess = */ false>(it1, it2);
+    DoETSIteratorComparisons</*ExpectEqual = */true, /*ExpectLess = */false>(it1, it2);
     it1 = ets.begin();
     it2 = ets.begin();
-    DoETSIteratorComparisons</*ExpectEqual = */ true, /*ExpectLess = */ false>(it1, it2);
+    DoETSIteratorComparisons</*ExpectEqual = */true, /*ExpectLess = */false>(it1, it2);
     it2 = std::prev(ets.end());
-    DoETSIteratorComparisons</*ExpectEqual = */ false, /*ExpectLess = */ true>(it1, it2);
+    DoETSIteratorComparisons</*ExpectEqual = */false, /*ExpectLess = */true>(it1, it2);
 }
 
 void TestETSIteratorComparisons() {
@@ -1214,11 +1175,12 @@ void TestETSIteratorComparisons() {
     // Fill the ets
     const std::size_t expected_ets_size = 2;
     std::atomic<std::size_t> sync_counter(0);
-    auto fill_ets_body = [&](int) {
-        ets.local() = 42;
-        ++sync_counter;
-        while (sync_counter != expected_ets_size) std::this_thread::yield();
-    };
+    auto fill_ets_body = [&](int){
+            ets.local() = 42;
+            ++sync_counter;
+            while(sync_counter != expected_ets_size)
+                std::this_thread::yield();
+        };
 
     utils::NativeParallelFor(2, fill_ets_body);
 
@@ -1240,8 +1202,7 @@ TEST_CASE("Instantiation") {
 //! \brief \ref interface \ref requirement
 TEST_CASE("Assignment and copy constructor") {
     AlignMask = cache_allocator_mask;
-    run_assignment_and_copy_constructor_tests<oneapi::tbb::cache_aligned_allocator>(
-            "oneapi::tbb::cache_aligned_allocator");
+    run_assignment_and_copy_constructor_tests<oneapi::tbb::cache_aligned_allocator>("oneapi::tbb::cache_aligned_allocator");
     AlignMask = tbb_allocator_mask;
     run_assignment_and_copy_constructor_tests<oneapi::tbb::tbb_allocator>("oneapi::tbb::tbb_allocator");
 }
@@ -1262,12 +1223,16 @@ TEST_CASE("Basic ETS functionality") {
     });
     CHECK(ets.local() == 42);
 
-    int ref_combined {0};
+    int ref_combined{0};
     std::vector<int> sequence(LOCALS);
     std::iota(sequence.begin(), sequence.end(), 0);
-    for (int i : sequence) { ref_combined += i; }
+    for (int i : sequence) {
+        ref_combined += i;
+    }
     ref_combined += 42;
-    int ets_combined = ets.combine([](int x, int y) { return x + y; });
+    int ets_combined = ets.combine([](int x, int y) {
+        return x + y;
+    });
     CHECK(ref_combined == ets_combined);
 }
 
@@ -1284,10 +1249,16 @@ TEST_CASE("Parallel test") {
 }
 
 //! \brief \ref interface \ref requirement
-TEST_CASE("Member types") { TestMemberTypes(); }
+TEST_CASE("Member types") {
+    TestMemberTypes();
+}
 
 //! \brief \ref interface \ref requirement
-TEST_CASE("enumerable_thread_specific iterator") { TestETSIterator(); }
+TEST_CASE("enumerable_thread_specific iterator") {
+    TestETSIterator();
+}
 
 //! \brief \ref interface \ref requirement
-TEST_CASE("enumerable_thread_specific iterator comparisons") { TestETSIteratorComparisons(); }
+TEST_CASE("enumerable_thread_specific iterator comparisons") {
+    TestETSIteratorComparisons();
+}
diff --git a/external/tbb/test/conformance/conformance_flowgraph.h b/external/tbb/test/conformance/conformance_flowgraph.h
index 4eff6384..46aecfc1 100644
--- a/external/tbb/test/conformance/conformance_flowgraph.h
+++ b/external/tbb/test/conformance/conformance_flowgraph.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2020-2021 Intel Corporation
+    Copyright (c) 2020-2023 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -79,8 +79,9 @@ struct message {
 template<typename V>
 typename std::enable_if<!std::is_default_constructible<V>::value, std::vector<V>>::type get_values( test_push_receiver<V>& rr ) {
     std::vector<V> messages;
-    int val = 0;
-    for(V tmp(0); rr.try_get(tmp); ++val) {
+    V tmp(0);
+
+    while (rr.try_get(tmp)) {
         messages.push_back(tmp);
     }
     return messages;
@@ -89,8 +90,9 @@ typename std::enable_if<!std::is_default_constructible<V>::value, std::vector<V>
 template<typename V>
 typename std::enable_if<std::is_default_constructible<V>::value, std::vector<V>>::type get_values( test_push_receiver<V>& rr ) {
     std::vector<V> messages;
-    int val = 0;
-    for(V tmp; rr.try_get(tmp); ++val) {
+    V tmp;
+
+    while (rr.try_get(tmp)) {
         messages.push_back(tmp);
     }
     return messages;
@@ -624,28 +626,31 @@ void test_copy_ctor_for_buffering_nodes(Args... node_args) {
 
 template<typename Node, typename InputType, typename ...Args>
 void test_priority(Args... node_args) {
-    std::size_t concurrency_limit = 1;
-    oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism, concurrency_limit);
 
-    oneapi::tbb::flow::graph g;
 
+    oneapi::tbb::flow::graph g;
     oneapi::tbb::flow::continue_node<InputType> source(g, dummy_functor<InputType>());
 
     track_first_id_functor<int>::first_id = -1;
     track_first_id_functor<int> low_functor(1);
     track_first_id_functor<int> high_functor(2);
 
+    // Due to args... we cannot create the nodes inside the lambda with old compilers
     Node high(g, node_args..., high_functor, oneapi::tbb::flow::node_priority_t(1));
     Node low(g, node_args..., low_functor);
 
-    make_edge(source, low);
-    make_edge(source, high);
+    tbb::task_arena a(1, 1);
+    a.execute([&] {
+        g.reset(); // attach to this arena
 
-    source.try_put(oneapi::tbb::flow::continue_msg());
+        make_edge(source, low);
+        make_edge(source, high);
+        source.try_put(oneapi::tbb::flow::continue_msg());
 
-    g.wait_for_all();
+        g.wait_for_all();
 
-    CHECK_MESSAGE((track_first_id_functor<int>::first_id == 2), "High priority node should execute first");
+        CHECK_MESSAGE((track_first_id_functor<int>::first_id == 2), "High priority node should execute first");
+    });
 }
 
 template<typename Node>
diff --git a/external/tbb/test/conformance/conformance_function_node.cpp b/external/tbb/test/conformance/conformance_function_node.cpp
index 02433269..332558cf 100644
--- a/external/tbb/test/conformance/conformance_function_node.cpp
+++ b/external/tbb/test/conformance/conformance_function_node.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2020-2021 Intel Corporation
+    Copyright (c) 2020-2023 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -15,13 +15,14 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
 #endif
 
 #include "conformance_flowgraph.h"
+#include "common/test_invoke.h"
 
-using input_msg = conformance::message</*default_ctor*/ true, /*copy_ctor*/ true, /*copy_assign*/ false>;
-using output_msg = conformance::message</*default_ctor*/ false, /*copy_ctor*/ true, /*copy_assign*/ false>;
+using input_msg = conformance::message</*default_ctor*/true, /*copy_ctor*/true, /*copy_assign*/false>;
+using output_msg = conformance::message</*default_ctor*/false, /*copy_ctor*/true, /*copy_assign*/false>;
 
 //! \file conformance_function_node.cpp
 //! \brief Test for [flow_graph.function_node] specification
@@ -62,30 +63,65 @@ void test_deduction_guides_common(Body body) {
 
     function_node f8(follows(f7), unlimited, body, rejecting(), node_priority_t(5));
     static_assert(std::is_same_v<decltype(f8), function_node<int, int, rejecting>>);
-#endif// __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+#endif // __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 
     function_node f9(f1);
     static_assert(std::is_same_v<decltype(f9), function_node<int, int>>);
 }
 
 void test_deduction_guides() {
-    test_deduction_guides_common([](const int&) -> int { return 1; });
-    test_deduction_guides_common([](const int&) mutable -> int { return 1; });
+    test_deduction_guides_common([](const int&)->int { return 1; });
+    test_deduction_guides_common([](const int&) mutable ->int { return 1; });
     test_deduction_guides_common(function_body_f);
 }
 
 #endif
 
+#if __TBB_CPP17_INVOKE_PRESENT
+
+template <typename InputType, typename OutputType1, typename OutputType2,
+          typename Body1, typename Body2>
+void test_fn_invoke_basic(const Body1& body1, const Body2& body2) {
+    using namespace oneapi::tbb::flow;
+
+    graph g;
+
+    function_node<InputType, OutputType1> f1(g, unlimited, body1);
+    function_node<OutputType1, OutputType2> f2(g, unlimited, body2);
+    buffer_node<OutputType2> buf(g);
+
+    make_edge(f1, f2);
+    make_edge(f2, buf);
+
+    f1.try_put(InputType{OutputType1{1}});
+
+    g.wait_for_all();
+
+    std::size_t result = 0;
+    CHECK(buf.try_get(result));
+    CHECK(result == 1);
+    CHECK(!buf.try_get(result));
+}
+
+void test_fn_invoke() {
+    using output_type = test_invoke::SmartID<std::size_t>;
+    using input_type = test_invoke::SmartID<output_type>;
+    // Testing pointer to member function
+    test_fn_invoke_basic<input_type, output_type, std::size_t>(&input_type::get_id, &output_type::get_id);
+    // Testing pointer to member object
+    test_fn_invoke_basic<input_type, output_type, std::size_t>(&input_type::id, &output_type::id);
+}
+#endif // __TBB_CPP17_INVOKE_PRESENT
+
 //! Test calling function body
 //! \brief \ref interface \ref requirement
 TEST_CASE("Test function_node body") {
-    conformance::test_body_exec<oneapi::tbb::flow::function_node<input_msg, output_msg>, input_msg,
-                                output_msg>(oneapi::tbb::flow::unlimited);
+    conformance::test_body_exec<oneapi::tbb::flow::function_node<input_msg, output_msg>, input_msg, output_msg>(oneapi::tbb::flow::unlimited);
 }
 
 //! Test function_node constructors
 //! \brief \ref requirement
-TEST_CASE("function_node constructors") {
+TEST_CASE("function_node constructors"){
     using namespace oneapi::tbb::flow;
     graph g;
 
@@ -95,63 +131,55 @@ TEST_CASE("function_node constructors") {
     function_node<int, int> fn2(g, unlimited, fun, oneapi::tbb::flow::node_priority_t(1));
 
     function_node<int, int, lightweight> lw_node1(g, serial, fun, lightweight());
-    function_node<int, int, lightweight> lw_node2(g, serial, fun, lightweight(),
-                                                  oneapi::tbb::flow::node_priority_t(1));
+    function_node<int, int, lightweight> lw_node2(g, serial, fun, lightweight(), oneapi::tbb::flow::node_priority_t(1));
 }
 
 //! The node that is constructed has a reference to the same graph object as src, has a copy of the initial body used by src, and has the same concurrency threshold as src.
 //! The predecessors and successors of src are not copied.
 //! \brief \ref requirement
-TEST_CASE("function_node copy constructor") {
+TEST_CASE("function_node copy constructor"){
     conformance::test_copy_ctor<oneapi::tbb::flow::function_node<int, int>>();
 }
 
 //! Test node reject the incoming message if the concurrency limit achieved.
 //! \brief \ref interface
-TEST_CASE("function_node with rejecting policy") {
+TEST_CASE("function_node with rejecting policy"){
     conformance::test_rejecting<oneapi::tbb::flow::function_node<int, int, oneapi::tbb::flow::rejecting>>();
 }
 
 //! Test body copying and copy_body logic
 //! Test the body object passed to a node is copied
 //! \brief \ref interface
-TEST_CASE("function_node and body copying") {
-    conformance::test_copy_body_function<oneapi::tbb::flow::function_node<int, int>,
-                                         conformance::copy_counting_object<int>>(
-            oneapi::tbb::flow::unlimited);
+TEST_CASE("function_node and body copying"){
+    conformance::test_copy_body_function<oneapi::tbb::flow::function_node<int, int>, conformance::copy_counting_object<int>>(oneapi::tbb::flow::unlimited);
 }
 
 //! Test function_node is a graph_node, receiver<Input>, and sender<Output>
 //! \brief \ref interface
-TEST_CASE("function_node superclasses") {
+TEST_CASE("function_node superclasses"){
     conformance::test_inheritance<oneapi::tbb::flow::function_node<int, int>, int, int>();
     conformance::test_inheritance<oneapi::tbb::flow::function_node<void*, float>, void*, float>();
-    conformance::test_inheritance<oneapi::tbb::flow::function_node<input_msg, output_msg>, input_msg,
-                                  output_msg>();
+    conformance::test_inheritance<oneapi::tbb::flow::function_node<input_msg, output_msg>, input_msg, output_msg>();
 }
 
 //! Test node not buffered unsuccessful message, and try_get after rejection should not succeed.
 //! \brief \ref requirement
-TEST_CASE("function_node buffering") {
+TEST_CASE("function_node buffering"){
     conformance::dummy_functor<int> fun;
-    conformance::test_buffering<
-            oneapi::tbb::flow::function_node<input_msg, int, oneapi::tbb::flow::rejecting>, input_msg>(
-            oneapi::tbb::flow::unlimited, fun);
-    conformance::test_buffering<oneapi::tbb::flow::function_node<input_msg, int, oneapi::tbb::flow::queueing>,
-                                input_msg>(oneapi::tbb::flow::unlimited, fun);
+    conformance::test_buffering<oneapi::tbb::flow::function_node<input_msg, int, oneapi::tbb::flow::rejecting>, input_msg>(oneapi::tbb::flow::unlimited, fun);
+    conformance::test_buffering<oneapi::tbb::flow::function_node<input_msg, int, oneapi::tbb::flow::queueing>, input_msg>(oneapi::tbb::flow::unlimited, fun);
 }
 
 //! Test node broadcast messages to successors
 //! \brief \ref requirement
-TEST_CASE("function_node broadcast") {
+TEST_CASE("function_node broadcast"){
     conformance::counting_functor<int> fun(conformance::expected);
-    conformance::test_forwarding<oneapi::tbb::flow::function_node<input_msg, int>, input_msg, int>(
-            1, oneapi::tbb::flow::unlimited, fun);
+    conformance::test_forwarding<oneapi::tbb::flow::function_node<input_msg, int>, input_msg, int>(1, oneapi::tbb::flow::unlimited, fun);
 }
 
 //! Test deduction guides
 //! \brief \ref interface \ref requirement
-TEST_CASE("Deduction guides") {
+TEST_CASE("Deduction guides"){
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
     test_deduction_guides();
 #endif
@@ -159,16 +187,15 @@ TEST_CASE("Deduction guides") {
 
 //! Test priorities work in single-threaded configuration
 //! \brief \ref requirement
-TEST_CASE("function_node priority support") {
-    conformance::test_priority<oneapi::tbb::flow::function_node<input_msg, int>, input_msg>(
-            oneapi::tbb::flow::unlimited);
+TEST_CASE("function_node priority support"){
+    conformance::test_priority<oneapi::tbb::flow::function_node<input_msg, int>, input_msg>(oneapi::tbb::flow::unlimited);
 }
 
 //! Test function_node has a user-settable concurrency limit. It can be set to one of predefined values.
 //! The user can also provide a value of type std::size_t to limit concurrency.
 //! Test that not more than limited threads works in parallel.
 //! \brief \ref requirement
-TEST_CASE("concurrency follows set limits") {
+TEST_CASE("concurrency follows set limits"){
     conformance::test_concurrency<oneapi::tbb::flow::function_node<int, int>>();
 }
 
@@ -178,3 +205,11 @@ TEST_CASE("Test function_node Output and Input class") {
     using Body = conformance::copy_counting_object<int>;
     conformance::test_output_input_class<oneapi::tbb::flow::function_node<Body, Body>, Body>();
 }
+
+#if __TBB_CPP17_INVOKE_PRESENT
+//! Test that function_node uses std::invoke to execute the body
+//! \brief \ref interface \ref requirement
+TEST_CASE("Test function_node and std::invoke") {
+    test_fn_invoke();
+}
+#endif
diff --git a/external/tbb/test/conformance/conformance_global_control.cpp b/external/tbb/test/conformance/conformance_global_control.cpp
index a71570ed..250fda90 100644
--- a/external/tbb/test/conformance/conformance_global_control.cpp
+++ b/external/tbb/test/conformance/conformance_global_control.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -13,11 +13,12 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 */
+#include "common/test.h"
 #include "common/concurrency_tracker.h"
 #include "common/spin_barrier.h"
-#include "common/test.h"
 #include "common/utils.h"
 #include "common/utils_concurrency_limit.h"
+#include "common/cpu_usertime.h"
 
 #include "oneapi/tbb/global_control.h"
 #include "oneapi/tbb/parallel_for.h"
@@ -28,19 +29,17 @@
 //! \file conformance_global_control.cpp
 //! \brief Test for [sched.global_control] specification
 
-const std::size_t MB = 1024 * 1024;
+const std::size_t MB = 1024*1024;
 
 void TestStackSizeSimpleControl() {
-    oneapi::tbb::global_control s0(oneapi::tbb::global_control::thread_stack_size, 1 * MB);
+    oneapi::tbb::global_control s0(oneapi::tbb::global_control::thread_stack_size, 1*MB);
 
     {
-        oneapi::tbb::global_control s1(oneapi::tbb::global_control::thread_stack_size, 8 * MB);
+        oneapi::tbb::global_control s1(oneapi::tbb::global_control::thread_stack_size, 8*MB);
 
-        CHECK(8 * MB
-              == oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::thread_stack_size));
+        CHECK(8*MB == oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::thread_stack_size));
     }
-    CHECK(1 * MB
-          == oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::thread_stack_size));
+    CHECK(1*MB == oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::thread_stack_size));
 }
 
 struct StackSizeRun : utils::NoAssign {
@@ -48,15 +47,14 @@ struct StackSizeRun : utils::NoAssign {
     int num_threads;
     utils::SpinBarrier *barr1, *barr2;
 
-    StackSizeRun(int threads, utils::SpinBarrier* b1, utils::SpinBarrier* b2)
-        : num_threads(threads), barr1(b1), barr2(b2) {}
-    void operator()(int id) const {
-        oneapi::tbb::global_control s1(oneapi::tbb::global_control::thread_stack_size, (1 + id) * MB);
+    StackSizeRun(int threads, utils::SpinBarrier *b1, utils::SpinBarrier *b2) :
+        num_threads(threads), barr1(b1), barr2(b2) {}
+    void operator()( int id ) const {
+        oneapi::tbb::global_control s1(oneapi::tbb::global_control::thread_stack_size, (1+id)*MB);
 
         barr1->wait();
 
-        REQUIRE(num_threads * MB
-                == oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::thread_stack_size));
+        REQUIRE(num_threads*MB == oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::thread_stack_size));
         barr2->wait();
     }
 };
@@ -64,54 +62,55 @@ struct StackSizeRun : utils::NoAssign {
 void TestStackSizeThreadsControl() {
     int threads = 4;
     utils::SpinBarrier barr1(threads), barr2(threads);
-    utils::NativeParallelFor(threads, StackSizeRun(threads, &barr1, &barr2));
+    utils::NativeParallelFor( threads, StackSizeRun(threads, &barr1, &barr2) );
 }
 
-void RunWorkersLimited(size_t parallelism, bool wait) {
+void RunWorkersLimited(size_t parallelism)
+{
     oneapi::tbb::global_control s(oneapi::tbb::global_control::max_allowed_parallelism, parallelism);
-    // try both configuration with already sleeping workers and with not yet sleeping
-    if (wait) utils::Sleep(10);
-    const std::size_t expected_threads = (utils::get_platform_max_threads() == 1) ? 1 : parallelism;
+    // TODO: consider better testing approach
+    // Sleep is required because after destruction global_control on the previous iteration,
+    // it recalls the maximum concurrency and excessive worker threads might populate the arena.
+    // So, we need to wait when arena becomes empty but it is unreliable and might sporadically fail.
+    utils::Sleep(100);
+    const std::size_t expected_threads = (utils::get_platform_max_threads()==1)? 1 : parallelism;
     utils::ExactConcurrencyLevel::check(expected_threads);
 }
 
-void TestWorkersConstraints() {
-    const size_t max_parallelism
-            = oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::max_allowed_parallelism);
+void TestWorkersConstraints()
+{
+    const size_t max_parallelism =
+        oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::max_allowed_parallelism);
     if (max_parallelism > 3) {
-        oneapi::tbb::global_control c(oneapi::tbb::global_control::max_allowed_parallelism,
-                                      max_parallelism - 1);
-        CHECK_MESSAGE(max_parallelism - 1
-                              == oneapi::tbb::global_control::active_value(
-                                      oneapi::tbb::global_control::max_allowed_parallelism),
-                      "Allowed parallelism must be decreasable.");
-        oneapi::tbb::global_control c1(oneapi::tbb::global_control::max_allowed_parallelism,
-                                       max_parallelism - 2);
-        CHECK_MESSAGE(max_parallelism - 2
-                              == oneapi::tbb::global_control::active_value(
-                                      oneapi::tbb::global_control::max_allowed_parallelism),
-                      "Allowed parallelism must be decreasable.");
+        oneapi::tbb::global_control c(oneapi::tbb::global_control::max_allowed_parallelism, max_parallelism-1);
+        CHECK_MESSAGE(max_parallelism-1 ==
+               oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::max_allowed_parallelism),
+               "Allowed parallelism must be decreasable.");
+        oneapi::tbb::global_control c1(oneapi::tbb::global_control::max_allowed_parallelism, max_parallelism-2);
+        CHECK_MESSAGE(max_parallelism-2 ==
+               oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::max_allowed_parallelism),
+               "Allowed parallelism must be decreasable.");
     }
     const size_t limit_par = utils::min(max_parallelism, 4U);
     // check that constrains are really met
-    for (int wait = 0; wait < 2; wait++) {
-        for (size_t num = 2; num < limit_par; num++) RunWorkersLimited(num, wait == 1);
-        for (size_t num = limit_par; num > 1; num--) RunWorkersLimited(num, wait == 1);
-    }
+    for (size_t num=2; num<limit_par; num++)
+        RunWorkersLimited(num);
+    for (size_t num=limit_par; num>1; num--)
+        RunWorkersLimited(num);
 }
 
-struct SetUseRun : utils::NoAssign {
-    utils::SpinBarrier& barr;
+struct SetUseRun: utils::NoAssign {
+    utils::SpinBarrier &barr;
 
     SetUseRun(utils::SpinBarrier& b) : barr(b) {}
-    void operator()(int id) const {
+    void operator()( int id ) const {
         if (id == 0) {
-            for (int i = 0; i < 10; i++) {
+            for (int i=0; i<10; i++) {
                 oneapi::tbb::parallel_for(0, 1000, utils::DummyBody(10), oneapi::tbb::simple_partitioner());
                 barr.wait();
             }
         } else {
-            for (int i = 0; i < 10; i++) {
+            for (int i=0; i<10; i++) {
                 oneapi::tbb::global_control c(oneapi::tbb::global_control::max_allowed_parallelism, 8);
                 barr.wait();
             }
@@ -119,35 +118,38 @@ struct SetUseRun : utils::NoAssign {
     }
 };
 
-void TestConcurrentSetUseConcurrency() {
+void TestConcurrentSetUseConcurrency()
+{
     utils::SpinBarrier barr(2);
-    NativeParallelFor(2, SetUseRun(barr));
+    NativeParallelFor( 2, SetUseRun(barr) );
 }
 
 // check number of workers after autoinitialization
-void TestAutoInit() {
-    const size_t max_parallelism
-            = oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::max_allowed_parallelism);
-    const unsigned expected_threads = utils::get_platform_max_threads() == 1 ? 1 : (unsigned) max_parallelism;
+void TestAutoInit()
+{
+    const size_t max_parallelism =
+        oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::max_allowed_parallelism);
+    const unsigned expected_threads = utils::get_platform_max_threads()==1?
+        1 : (unsigned)max_parallelism;
     utils::ExactConcurrencyLevel::check(expected_threads);
-    CHECK_MESSAGE(
-            oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::max_allowed_parallelism)
-                    == max_parallelism,
-            "max_allowed_parallelism must not be changed after auto init");
+    CHECK_MESSAGE(oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::max_allowed_parallelism)
+           == max_parallelism, "max_allowed_parallelism must not be changed after auto init");
     if (max_parallelism > 2) {
         // after autoinit it's possible to decrease workers number
-        oneapi::tbb::global_control s(oneapi::tbb::global_control::max_allowed_parallelism,
-                                      max_parallelism - 1);
-        utils::ExactConcurrencyLevel::check(max_parallelism - 1);
+        oneapi::tbb::global_control s(oneapi::tbb::global_control::max_allowed_parallelism, max_parallelism-1);
+        // TODO: consider better testing approach
+        // Sleep is required because after previous concurrency check, the arena is still populated with workers.
+        // So, we need to wait when arena becomes empty but it is unreliable and might sporadically fail.
+        utils::Sleep(100);
+        utils::ExactConcurrencyLevel::check(max_parallelism-1);
     }
 }
 
 class TestMultipleControlsRun {
-    utils::SpinBarrier& barrier;
-
+    utils::SpinBarrier &barrier;
 public:
     TestMultipleControlsRun(utils::SpinBarrier& b) : barrier(b) {}
-    void operator()(int id) const {
+    void operator()( int id ) const {
         barrier.wait();
         if (id) {
             {
@@ -182,22 +184,21 @@ class TestMultipleControlsRun {
 
 // test that global controls from different thread with overlapping lifetime
 // still keep parallelism under control
-void TestMultipleControls() {
+void TestMultipleControls()
+{
     utils::SpinBarrier barrier(2);
-    utils::NativeParallelFor(2, TestMultipleControlsRun(barrier));
+    utils::NativeParallelFor( 2, TestMultipleControlsRun(barrier) );
 }
 
 #if !(__TBB_WIN8UI_SUPPORT && (_WIN32_WINNT < 0x0A00))
 //! Testing setting stack size
 //! \brief \ref interface \ref requirement
 TEST_CASE("setting stack size") {
-    std::size_t default_ss
-            = oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::thread_stack_size);
+    std::size_t default_ss = oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::thread_stack_size);
     CHECK(default_ss > 0);
     TestStackSizeSimpleControl();
     TestStackSizeThreadsControl();
-    CHECK(default_ss
-          == oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::thread_stack_size));
+    CHECK(default_ss == oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::thread_stack_size));
 }
 #endif
 
@@ -205,15 +206,23 @@ TEST_CASE("setting stack size") {
 //! \brief \ref interface \ref requirement
 TEST_CASE("setting max number of threads") {
     TestWorkersConstraints();
+}
+//! Testing concurrenct setting concurrency
+//! \brief \ref interface \ref requirement
+TEST_CASE("concurrenct setting concurrency") {
     TestConcurrentSetUseConcurrency();
+}
+
+//! Testing auto initialization
+//! \brief \ref interface \ref requirement
+TEST_CASE("auto initialization") {
     TestAutoInit();
 }
 
 //! Test terminate_on_exception default value
 //! \brief \ref interface \ref requirement
 TEST_CASE("terminate_on_exception: default") {
-    std::size_t default_toe
-            = oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::terminate_on_exception);
+    std::size_t default_toe = oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::terminate_on_exception);
     CHECK(default_toe == 0);
 }
 
@@ -223,26 +232,149 @@ TEST_CASE("terminate_on_exception: nested") {
     oneapi::tbb::global_control* c0;
     {
         oneapi::tbb::global_control c1(oneapi::tbb::global_control::terminate_on_exception, 1);
-        CHECK(oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::terminate_on_exception)
-              == 1);
+        CHECK(oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::terminate_on_exception) == 1);
         {
             oneapi::tbb::global_control c2(oneapi::tbb::global_control::terminate_on_exception, 0);
-            CHECK(oneapi::tbb::global_control::active_value(
-                          oneapi::tbb::global_control::terminate_on_exception)
-                  == 1);
+            CHECK(oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::terminate_on_exception) == 1);
         }
-        CHECK(oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::terminate_on_exception)
-              == 1);
+        CHECK(oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::terminate_on_exception) == 1);
         c0 = new oneapi::tbb::global_control(oneapi::tbb::global_control::terminate_on_exception, 0);
     }
-    CHECK(oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::terminate_on_exception)
-          == 0);
+    CHECK(oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::terminate_on_exception) == 0);
     delete c0;
 }
 
+//! Testing setting the same value but different objects
+//! \brief \ref interface \ref error_guessing
+TEST_CASE("setting same value") {
+    const std::size_t value = 2;
+
+    oneapi::tbb::global_control* ctl1 = new oneapi::tbb::global_control(oneapi::tbb::global_control::max_allowed_parallelism, value);
+    oneapi::tbb::global_control* ctl2 = new oneapi::tbb::global_control(oneapi::tbb::global_control::max_allowed_parallelism, value);
+
+    std::size_t active = oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::max_allowed_parallelism);
+    REQUIRE(active == value);
+    delete ctl2;
+
+    active = oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::max_allowed_parallelism);
+    REQUIRE_MESSAGE(active == value, "Active value should not change, because of value duplication");
+    delete ctl1;
+}
+
+//! Testing lifetime control conformance
+//! \brief \ref interface \ref requirement
+TEST_CASE("prolong lifetime simple") {
+    tbb::task_scheduler_handle hdl1{ tbb::attach{} };
+    {
+        tbb::parallel_for(0, 10, utils::DummyBody());
+
+        tbb::task_scheduler_handle hdl2;
+        hdl2 = tbb::task_scheduler_handle{ tbb::attach{} };
+        hdl2.release();
+    }
+    bool ok = tbb::finalize(hdl1, std::nothrow);
+    REQUIRE(ok);
+}
+
+//! Testing handle check for emptiness
+//! \brief \ref interface \ref requirement
+TEST_CASE("null handle check") {
+    tbb::task_scheduler_handle hndl;
+    REQUIRE_FALSE(hndl);
+}
+
+//! Testing handle check for emptiness
+//! \brief \ref interface \ref requirement
+TEST_CASE("null handle check 2") {
+    tbb::task_scheduler_handle hndl{ tbb::attach{} };
+    bool not_empty = (bool)hndl;
+
+    tbb::finalize(hndl, std::nothrow);
+
+    REQUIRE(not_empty);
+    REQUIRE_FALSE(hndl);
+}
+
+//! Testing handle check for emptiness
+//! \brief \ref interface \ref requirement
+TEST_CASE("null handle check 3") {
+    tbb::task_scheduler_handle handle1{ tbb::attach{} };
+    tbb::task_scheduler_handle handle2(std::move(handle1));
+
+    bool handle1_empty = !handle1;
+    bool handle2_not_empty = (bool)handle2;
+
+    tbb::finalize(handle2, std::nothrow);
+
+    REQUIRE(handle1_empty);
+    REQUIRE(handle2_not_empty);
+}
+
+//! Testing  task_scheduler_handle is created on one thread and destroyed on another.
+//! \brief \ref interface \ref requirement
+TEST_CASE("cross thread 1") {
+    // created task_scheduler_handle, parallel_for on another thread - finalize
+    tbb::task_scheduler_handle handle{ tbb::attach{} };
+    utils::NativeParallelFor(1, [&](int) {
+        tbb::parallel_for(0, 10, utils::DummyBody());
+        bool res = tbb::finalize(handle, std::nothrow);
+        REQUIRE(res);
+    });
+}
+
+//! Testing  task_scheduler_handle is created on one thread and destroyed on another.
+//! \brief \ref interface \ref requirement
+TEST_CASE("cross thread 2") {
+    // created task_scheduler_handle, called parallel_for on this thread, killed the thread - and finalize on another thread
+    tbb::task_scheduler_handle handle;
+    utils::NativeParallelFor(1, [&](int) {
+        handle = tbb::task_scheduler_handle{ tbb::attach{} };
+        tbb::parallel_for(0, 10, utils::DummyBody());
+    });
+    bool res = tbb::finalize(handle, std::nothrow);
+    REQUIRE(res);
+}
+
+//! Testing multiple wait
+//! \brief \ref interface \ref requirement
+TEST_CASE("simple prolong lifetime 3") {
+    // Parallel region
+    tbb::parallel_for(0, 10, utils::DummyBody());
+    // Termination
+    tbb::task_scheduler_handle handle = tbb::task_scheduler_handle{ tbb::attach{} };
+    bool res = tbb::finalize(handle, std::nothrow);
+    REQUIRE(res);
+    // New parallel region
+    tbb::parallel_for(0, 10, utils::DummyBody());
+}
+
+//! \brief \ref regression \ref interface \ref requirement
+TEST_CASE("Test worker threads remain inactive in enforced serial execution mode") {
+    auto num_threads = utils::get_platform_max_threads();
+    utils::SpinBarrier barrier{num_threads};
+
+    // Warm-up threads
+    tbb::parallel_for(std::size_t(0), num_threads, [&] (std::size_t) {
+        barrier.wait();
+    });
+
+    tbb::global_control control(tbb::global_control::max_allowed_parallelism, 1);
+
+    std::thread thr([&] {
+        tbb::parallel_for(0, 100000, [&] (int) {
+            utils::doDummyWork(100);
+        });
+    });
+
+    // Workers should sleep because of global_control enforced serial execution of tasks
+    TestCPUUserTime(utils::get_platform_max_threads() - 1);
+
+    thr.join();
+}
+
 // The test cannot work correctly with statically linked runtime.
 // TODO: investigate a failure in debug with MSVC
-#if !_MSC_VER || (defined(_DLL) && !defined(_DEBUG))
+#if (!_MSC_VER || (defined(_DLL) && !defined(_DEBUG))) && !EMSCRIPTEN
 #include <csetjmp>
 
 // Overall, the test case is not safe because the dtors might not be called during long jump.
@@ -265,7 +397,7 @@ TEST_CASE("terminate_on_exception: enabled") {
         });
 #if _MSC_VER
 #pragma warning(push)
-#pragma warning(disable : 4611)// interaction between '_setjmp' and C++ object destruction is non - portable
+#pragma warning(disable:4611) // interaction between '_setjmp' and C++ object destruction is non - portable
 #endif
         SUBCASE("internal exception") {
             if (setjmp(buffer) == 0) {
@@ -278,7 +410,9 @@ TEST_CASE("terminate_on_exception: enabled") {
             if (setjmp(buffer) == 0) {
                 oneapi::tbb::parallel_for(0, 1, [](int) {
                     volatile bool suppress_unreachable_code_warning = true;
-                    if (suppress_unreachable_code_warning) { throw std::exception(); }
+                    if (suppress_unreachable_code_warning) {
+                        throw std::exception();
+                    }
                 });
                 FAIL("Unreachable code");
             }
@@ -290,28 +424,10 @@ TEST_CASE("terminate_on_exception: enabled") {
         std::set_terminate(prev);
         terminate_handler_called = true;
 #if TBB_USE_EXCEPTIONS
-    } catch (...) { FAIL("The exception is not expected"); }
+    } catch (...) {
+        FAIL("The exception is not expected");
+    }
 #endif
     CHECK(terminate_handler_called);
 }
 #endif
-
-//! Testing setting the same value but different objects
-//! \brief \ref interface \ref error_guessing
-TEST_CASE("setting same value") {
-    const std::size_t value = 2;
-
-    oneapi::tbb::global_control* ctl1
-            = new oneapi::tbb::global_control(oneapi::tbb::global_control::max_allowed_parallelism, value);
-    oneapi::tbb::global_control* ctl2
-            = new oneapi::tbb::global_control(oneapi::tbb::global_control::max_allowed_parallelism, value);
-
-    std::size_t active
-            = oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::max_allowed_parallelism);
-    REQUIRE(active == value);
-    delete ctl2;
-
-    active = oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::max_allowed_parallelism);
-    REQUIRE_MESSAGE(active == value, "Active value should not change, because of value duplication");
-    delete ctl1;
-}
diff --git a/external/tbb/test/conformance/conformance_graph.cpp b/external/tbb/test/conformance/conformance_graph.cpp
index 243f99fa..1f73999f 100644
--- a/external/tbb/test/conformance/conformance_graph.cpp
+++ b/external/tbb/test/conformance/conformance_graph.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2020-2021 Intel Corporation
+    Copyright (c) 2020-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
 #endif
 
 #include "conformance_flowgraph.h"
@@ -23,15 +23,12 @@
 //! \file conformance_graph.cpp
 //! \brief Test for [flow_graph.graph] specification
 
-void test_continue_node_rf_reset_protocol() {
+void test_continue_node_rf_reset_protocol(){
     using namespace oneapi::tbb::flow;
     graph g;
 
     std::atomic<bool> flag = {false};
-    continue_node<int> source(g, 2, [&](const continue_msg&) {
-        flag = true;
-        return 1;
-    });
+    continue_node<int> source(g, 2, [&](const continue_msg&){ flag = true; return 1;});
 
     source.try_put(continue_msg());
     g.wait_for_all();
@@ -49,7 +46,7 @@ void test_continue_node_rf_reset_protocol() {
     CHECK_MESSAGE((flag == true), "Should be true");
 }
 
-void test_input_node_rf_reset_protocol() {
+void test_input_node_rf_reset_protocol(){
     oneapi::tbb::flow::graph g;
 
     conformance::copy_counting_object<int> fun;
@@ -68,12 +65,11 @@ void test_input_node_rf_reset_protocol() {
     CHECK_MESSAGE((node.try_get(tmp) == false), "Should be false");
 }
 
-template <typename Node>
-void test_functional_nodes_rf_reset_protocol() {
+template<typename Node>
+void test_functional_nodes_rf_reset_protocol(){
     oneapi::tbb::flow::graph g;
     size_t concurrency_limit = 1;
-    oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism,
-                                        concurrency_limit);
+    oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism, concurrency_limit);
 
     conformance::counting_functor<int> counting_body;
     Node f(g, oneapi::tbb::flow::serial, counting_body);
@@ -87,8 +83,8 @@ void test_functional_nodes_rf_reset_protocol() {
     CHECK_MESSAGE((counting_body.execute_count == 1), "Body should be executed");
 }
 
-template <typename Node, typename... Args>
-void test_buffering_nodes_rf_reset_protocol(Args... node_body) {
+template<typename Node, typename ...Args>
+void test_buffering_nodes_rf_reset_protocol(Args... node_body){
     oneapi::tbb::flow::graph g;
     Node testing_node(g, node_body...);
 
@@ -106,8 +102,8 @@ void test_buffering_nodes_rf_reset_protocol(Args... node_body) {
     g.wait_for_all();
 }
 
-template <typename Node, typename InputType, typename... Args>
-void test_nodes_with_body_rf_reset_bodies(Args... node_args) {
+template<typename Node, typename InputType, typename ...Args>
+void test_nodes_with_body_rf_reset_bodies(Args... node_args){
     oneapi::tbb::flow::graph g;
     conformance::counting_functor<int> counting_body(5);
     Node testing_node(g, node_args..., counting_body);
@@ -124,7 +120,7 @@ void test_nodes_with_body_rf_reset_bodies(Args... node_args) {
     CHECK_MESSAGE((counting_body.execute_count == 1), "Body should be replaced with a copy of the body");
 }
 
-void test_limiter_node_rf_reset_protocol() {
+void test_limiter_node_rf_reset_protocol(){
     oneapi::tbb::flow::graph g;
 
     constexpr int limit = 5;
@@ -133,28 +129,28 @@ void test_limiter_node_rf_reset_protocol() {
 
     oneapi::tbb::flow::make_edge(testing_node, suc_node);
 
-    for (int i = 0; i < limit * 2; ++i) testing_node.try_put(1);
+    for(int i = 0; i < limit * 2; ++i)
+        testing_node.try_put(1);
     g.wait_for_all();
 
-    CHECK_MESSAGE((conformance::get_values(suc_node).size() == limit),
-                  "Descendant of the node needs be receive limited number of messages");
+    CHECK_MESSAGE((conformance::get_values(suc_node).size() == limit), "Descendant of the node needs be receive limited number of messages");
 
     g.reset(oneapi::tbb::flow::rf_reset_protocol);
 
-    for (int i = 0; i < limit * 2; ++i) testing_node.try_put(1);
+    for(int i = 0; i < limit * 2; ++i)
+        testing_node.try_put(1);
     g.wait_for_all();
 
-    CHECK_MESSAGE((conformance::get_values(suc_node).size() == limit),
-                  "Descendant of the node needs be receive limited number of messages");
+    CHECK_MESSAGE((conformance::get_values(suc_node).size() == limit), "Descendant of the node needs be receive limited number of messages");
 }
 
-void test_join_node_rf_reset_protocol() {
+void test_join_node_rf_reset_protocol(){
     oneapi::tbb::flow::graph g;
 
     oneapi::tbb::flow::join_node<std::tuple<int>, oneapi::tbb::flow::queueing> testing_node(g);
 
     oneapi::tbb::flow::input_port<0>(testing_node).try_put(1);
-
+    
     g.wait_for_all();
     g.reset(oneapi::tbb::flow::rf_reset_protocol);
 
@@ -162,6 +158,8 @@ void test_join_node_rf_reset_protocol() {
     CHECK_MESSAGE((!testing_node.try_get(tmp)), "All buffers must be emptied");
 }
 
+// global_control::max_allowed_parallelism functionality is not covered by TCM
+#if !__TBB_TCM_TESTING_ENABLED
 //! Graph reset
 //! \brief \ref requirement
 TEST_CASE("graph reset with rf_reset_protocol") {
@@ -183,6 +181,7 @@ TEST_CASE("graph reset with rf_reset_protocol") {
     test_limiter_node_rf_reset_protocol();
     test_join_node_rf_reset_protocol();
 }
+#endif
 
 //! Graph reset rf_clear_edges
 //! \brief \ref requirement
@@ -196,15 +195,14 @@ TEST_CASE("graph reset with rf_clear_edges") {
 
     //node types
     oneapi::tbb::flow::continue_node<int> ct(g, body());
-    oneapi::tbb::flow::split_node<std::tuple<int>> s(g);
+    oneapi::tbb::flow::split_node< std::tuple<int> > s(g);
     oneapi::tbb::flow::input_node<int> src(g, body());
     oneapi::tbb::flow::function_node<int, int> fxn(g, oneapi::tbb::flow::unlimited, body());
-    oneapi::tbb::flow::multifunction_node<int, std::tuple<int, int>> m_fxn(g, oneapi::tbb::flow::unlimited,
-                                                                           body());
+    oneapi::tbb::flow::multifunction_node<int, std::tuple<int, int> > m_fxn(g, oneapi::tbb::flow::unlimited, body());
     oneapi::tbb::flow::broadcast_node<int> bc(g);
     oneapi::tbb::flow::limiter_node<int> lim(g, 2);
     oneapi::tbb::flow::indexer_node<int> ind(g);
-    oneapi::tbb::flow::join_node<std::tuple<int>, oneapi::tbb::flow::queueing> j(g);
+    oneapi::tbb::flow::join_node< std::tuple< int >, oneapi::tbb::flow::queueing > j(g);
     oneapi::tbb::flow::buffer_node<int> bf(g);
     oneapi::tbb::flow::priority_queue_node<int> pq(g);
     oneapi::tbb::flow::write_once_node<int> wo(g);
@@ -230,7 +228,7 @@ TEST_CASE("graph reset with rf_clear_edges") {
     g.reset(oneapi::tbb::flow::rf_clear_edges);
 
     ct.try_put(oneapi::tbb::flow::continue_msg());
-    s.try_put(std::tuple<int> {1});
+    s.try_put(std::tuple<int>{1});
     src.activate();
     fxn.try_put(1);
     m_fxn.try_put(1);
@@ -246,12 +244,9 @@ TEST_CASE("graph reset with rf_clear_edges") {
 
     g.wait_for_all();
 
-    CHECK_MESSAGE((conformance::get_values(successor).size() == 0),
-                  "Message should not pass when edges doesn't exist");
-    CHECK_MESSAGE((conformance::get_values(successor2).size() == 0),
-                  "Message should not pass when edge doesn't exist");
-    CHECK_MESSAGE((conformance::get_values(successor3).size() == 0),
-                  "Message should not pass when edge doesn't exist");
+    CHECK_MESSAGE((conformance::get_values(successor).size() == 0), "Message should not pass when edges doesn't exist");
+    CHECK_MESSAGE((conformance::get_values(successor2).size() == 0), "Message should not pass when edge doesn't exist");
+    CHECK_MESSAGE((conformance::get_values(successor3).size() == 0), "Message should not pass when edge doesn't exist");
 }
 
 //! Graph reset rf_reset_bodies
@@ -265,7 +260,7 @@ TEST_CASE("graph reset with rf_reset_bodies") {
 
     graph g;
     conformance::counting_functor<int> counting_body(1);
-    input_node<int> testing_node(g, counting_body);
+    input_node<int> testing_node(g,counting_body);
     queue_node<int> q_node(g);
 
     make_edge(testing_node, q_node);
@@ -286,35 +281,37 @@ TEST_CASE("graph reset with rf_reset_bodies") {
 //! \brief \ref requirement
 TEST_CASE("graph cancel") {
     oneapi::tbb::flow::graph g;
-    CHECK_MESSAGE(!g.is_cancelled(), "Freshly created graph should not be cancelled.");
+    CHECK_MESSAGE(!g.is_cancelled(), "Freshly created graph should not be cancelled." );
 
     g.cancel();
-    CHECK_MESSAGE(!g.is_cancelled(), "Cancelled status should appear only after the wait_for_all() call.");
+    CHECK_MESSAGE(!g.is_cancelled(), "Cancelled status should appear only after the wait_for_all() call." );
 
     g.wait_for_all();
-    CHECK_MESSAGE(g.is_cancelled(), "Waiting should allow checking the cancellation status.");
+    CHECK_MESSAGE(g.is_cancelled(), "Waiting should allow checking the cancellation status." );
 
     g.reset();
-    CHECK_MESSAGE(!g.is_cancelled(), "Resetting must reset the cancellation status.");
+    CHECK_MESSAGE(!g.is_cancelled(), "Resetting must reset the cancellation status." );
 
     std::atomic<bool> cancelled(false);
     std::atomic<unsigned> executed(0);
     oneapi::tbb::flow::function_node<int> f(g, oneapi::tbb::flow::serial, [&](int) {
         ++executed;
-        while (!cancelled.load(std::memory_order_relaxed))
+        while( !cancelled.load(std::memory_order_relaxed) )
             std::this_thread::sleep_for(std::chrono::milliseconds(1));
     });
 
     const unsigned N = 10;
-    for (unsigned i = 0; i < N; ++i) f.try_put(0);
+    for( unsigned i = 0; i < N; ++i )
+        f.try_put(0);
 
     std::thread thr([&] {
-        while (!executed) std::this_thread::sleep_for(std::chrono::milliseconds(1));
+        while( !executed )
+            std::this_thread::sleep_for(std::chrono::milliseconds(1));
         g.cancel();
         cancelled.store(true, std::memory_order_relaxed);
     });
     g.wait_for_all();
     thr.join();
-    CHECK_MESSAGE(g.is_cancelled(), "Wait for all should not change the cancellation status.");
-    CHECK_MESSAGE(1 == executed, "Buffered messages should be dropped by the cancelled graph.");
+    CHECK_MESSAGE(g.is_cancelled(), "Wait for all should not change the cancellation status." );
+    CHECK_MESSAGE(1 == executed, "Buffered messages should be dropped by the cancelled graph." );
 }
diff --git a/external/tbb/test/conformance/conformance_indexer_node.cpp b/external/tbb/test/conformance/conformance_indexer_node.cpp
index 2ef7a0fa..1cad744e 100644
--- a/external/tbb/test/conformance/conformance_indexer_node.cpp
+++ b/external/tbb/test/conformance/conformance_indexer_node.cpp
@@ -15,7 +15,7 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
 #endif
 
 #include "conformance_flowgraph.h"
@@ -23,19 +23,19 @@
 //! \file conformance_indexer_node.cpp
 //! \brief Test for [flow_graph.indexer_node] specification
 
-using input_msg = conformance::message</*default_ctor*/ false, /*copy_ctor*/ true, /*copy_assign*/ false>;
+using input_msg = conformance::message</*default_ctor*/false, /*copy_ctor*/true, /*copy_assign*/false>;
 using my_indexer_type = oneapi::tbb::flow::indexer_node<int, float, input_msg>;
 using my_output_type = my_indexer_type::output_type;
 
 //! Test node broadcast messages to successors
 //! \brief \ref requirement
-TEST_CASE("indexer_node broadcasts") {
+TEST_CASE("indexer_node broadcasts"){
     oneapi::tbb::flow::graph g;
 
     my_indexer_type testing_node(g);
-    std::vector<conformance::test_push_receiver<my_output_type> *> receiver_nodes;
+    std::vector<conformance::test_push_receiver<my_output_type>*> receiver_nodes;
 
-    for (std::size_t i = 0; i < 3; ++i) {
+    for(std::size_t i = 0; i < 3; ++i) {
         receiver_nodes.emplace_back(new conformance::test_push_receiver<my_output_type>(g));
         oneapi::tbb::flow::make_edge(testing_node, *receiver_nodes.back());
     }
@@ -45,13 +45,13 @@ TEST_CASE("indexer_node broadcasts") {
     oneapi::tbb::flow::input_port<2>(testing_node).try_put(input_msg(1));
     g.wait_for_all();
 
-    for (auto receiver : receiver_nodes) {
+    for(auto receiver: receiver_nodes) {
         auto values = conformance::get_values(*receiver);
         CHECK_MESSAGE((values.size() == 3), std::string("Descendant of the node must receive 3 messages."));
-        for (auto &value : values) {
-            if (value.is_a<int>()) {
+        for(auto& value : values){
+            if(value.is_a<int>()){
                 CHECK_MESSAGE((value.cast_to<int>() == 6), "Value passed is the actual one received.");
-            } else if (value.is_a<float>()) {
+            } else if(value.is_a<float>()){
                 CHECK_MESSAGE((value.cast_to<float>() == 1.5), "Value passed is the actual one received.");
             } else {
                 CHECK_MESSAGE((value.cast_to<input_msg>() == 1), "Value passed is the actual one received.");
@@ -63,9 +63,8 @@ TEST_CASE("indexer_node broadcasts") {
 
 //! Test inheritance relations
 //! \brief \ref interface
-TEST_CASE("indexer_node superclasses") {
-    CHECK_MESSAGE((std::is_base_of<oneapi::tbb::flow::graph_node, my_indexer_type>::value),
-                  "indexer_node should be derived from graph_node");
+TEST_CASE("indexer_node superclasses"){
+    CHECK_MESSAGE((std::is_base_of<oneapi::tbb::flow::graph_node, my_indexer_type>::value), "indexer_node should be derived from graph_node");
 }
 
 //! Test node not buffered unsuccessful message, and try_get after rejection should not succeed.
@@ -75,7 +74,7 @@ TEST_CASE("indexer_node buffering") {
 
     my_indexer_type testing_node(g);
 
-    oneapi::tbb::flow::limiter_node<my_output_type> rejecter(g, 0);
+    oneapi::tbb::flow::limiter_node<my_output_type> rejecter(g,0);
     oneapi::tbb::flow::make_edge(testing_node, rejecter);
 
     oneapi::tbb::flow::input_port<0>(testing_node).try_put(6);
@@ -91,29 +90,30 @@ TEST_CASE("indexer_node buffering") {
 //! \brief \ref requirement
 TEST_CASE("indexer_node behaviour") {
     oneapi::tbb::flow::graph g;
-    oneapi::tbb::flow::function_node<int, int> f1(g, oneapi::tbb::flow::unlimited,
-                                                  [](const int &i) { return 2 * i; });
-    oneapi::tbb::flow::function_node<float, float> f2(g, oneapi::tbb::flow::unlimited,
-                                                      [](const float &f) { return f / 2; });
-    oneapi::tbb::flow::continue_node<input_msg> c1(
-            g, [](oneapi::tbb::flow::continue_msg) { return input_msg(5); });
+    oneapi::tbb::flow::function_node<int, int> f1( g, oneapi::tbb::flow::unlimited,
+                                [](const int &i) { return 2*i; } );
+    oneapi::tbb::flow::function_node<float, float> f2( g, oneapi::tbb::flow::unlimited,
+                                [](const float &f) { return f/2; } );
+    oneapi::tbb::flow::continue_node<input_msg> c1( g,
+                                [](oneapi::tbb::flow::continue_msg) { return input_msg(5); } );
 
     my_indexer_type testing_node(g);
 
-    oneapi::tbb::flow::function_node<my_output_type> f3(
-            g, oneapi::tbb::flow::unlimited, [](const my_output_type &v) {
+    oneapi::tbb::flow::function_node<my_output_type>
+        f3( g, oneapi::tbb::flow::unlimited,
+            []( const my_output_type &v ) {
                 if (v.tag() == 0) {
-                    CHECK_MESSAGE((v.is_a<int>()), "Expected to int");
-                    CHECK_MESSAGE((oneapi::tbb::flow::cast_to<int>(v) == 6), "Expected to receive 6");
+                    CHECK_MESSAGE((v.is_a<int>()), "Expected to int" );
+                    CHECK_MESSAGE((oneapi::tbb::flow::cast_to<int>(v) == 6), "Expected to receive 6" );
                 } else if (v.tag() == 1) {
-                    CHECK_MESSAGE((v.is_a<float>()), "Expected to float");
-                    CHECK_MESSAGE((oneapi::tbb::flow::cast_to<float>(v) == 1.5), "Expected to receive 1.5");
+                    CHECK_MESSAGE((v.is_a<float>()), "Expected to float" );
+                    CHECK_MESSAGE((oneapi::tbb::flow::cast_to<float>(v) == 1.5), "Expected to receive 1.5" );
                 } else {
-                    CHECK_MESSAGE((v.is_a<input_msg>()), "Expected to float");
-                    CHECK_MESSAGE((oneapi::tbb::flow::cast_to<input_msg>(v) == 5),
-                                  "Expected to receive input_msg(5)");
+                    CHECK_MESSAGE((v.is_a<input_msg>()), "Expected to float" );
+                    CHECK_MESSAGE((oneapi::tbb::flow::cast_to<input_msg>(v) == 5), "Expected to receive input_msg(5)" );
                 }
-            });
+            }
+        );
 
     oneapi::tbb::flow::make_edge(f1, oneapi::tbb::flow::input_port<0>(testing_node));
     oneapi::tbb::flow::make_edge(f2, oneapi::tbb::flow::input_port<1>(testing_node));
@@ -129,9 +129,10 @@ TEST_CASE("indexer_node behaviour") {
 //! The node that is constructed has a reference to the same graph object as src.
 //! The list of predecessors, messages in the input ports, and successors are not copied.
 //! \brief \ref interface
-TEST_CASE("indexer_node copy constructor") {
+TEST_CASE("indexer_node copy constructor"){
     oneapi::tbb::flow::graph g;
-    oneapi::tbb::flow::continue_node<int> node0(g, [](oneapi::tbb::flow::continue_msg) { return 1; });
+    oneapi::tbb::flow::continue_node<int> node0( g,
+                                [](oneapi::tbb::flow::continue_msg) { return 1; } );
 
     my_indexer_type node1(g);
     conformance::test_push_receiver<my_output_type> node2(g);
@@ -147,21 +148,16 @@ TEST_CASE("indexer_node copy constructor") {
     oneapi::tbb::flow::input_port<0>(node_copy).try_put(1);
     g.wait_for_all();
 
-    CHECK_MESSAGE((conformance::get_values(node2).size() == 0 && conformance::get_values(node3).size() == 1),
-                  "Copied node doesn`t copy successor");
+    CHECK_MESSAGE((conformance::get_values(node2).size() == 0 && conformance::get_values(node3).size() == 1), "Copied node doesn`t copy successor");
 
     node0.try_put(oneapi::tbb::flow::continue_msg());
     g.wait_for_all();
 
-    CHECK_MESSAGE((conformance::get_values(node2).size() == 1 && conformance::get_values(node3).size() == 0),
-                  "Copied node doesn`t copy predecessor");
+    CHECK_MESSAGE((conformance::get_values(node2).size() == 1 && conformance::get_values(node3).size() == 0), "Copied node doesn`t copy predecessor");
 }
 
 //! Test indexer_node output_type
 //! \brief \ref interface \ref requirement
 TEST_CASE("indexer_node output_type") {
-    CHECK_MESSAGE(
-            (conformance::check_output_type<my_output_type,
-                                            oneapi::tbb::flow::tagged_msg<size_t, int, float, input_msg>>()),
-            "indexer_node output_type should returns a tagged_msg");
+    CHECK_MESSAGE((conformance::check_output_type<my_output_type, oneapi::tbb::flow::tagged_msg<size_t, int, float, input_msg>>()), "indexer_node output_type should returns a tagged_msg");
 }
diff --git a/external/tbb/test/conformance/conformance_input_node.cpp b/external/tbb/test/conformance/conformance_input_node.cpp
index e71b4489..e641787d 100644
--- a/external/tbb/test/conformance/conformance_input_node.cpp
+++ b/external/tbb/test/conformance/conformance_input_node.cpp
@@ -15,7 +15,7 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
 #endif
 
 #define CONFORMANCE_INPUT_NODE
@@ -66,32 +66,28 @@ void test_deduction_guides() {
     g.wait_for_all();
 }
 
-#endif// __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
+#endif // __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 
-template <typename O>
-void test_inheritance() {
+template<typename O>
+void test_inheritance(){
     using namespace oneapi::tbb::flow;
 
-    CHECK_MESSAGE((std::is_base_of<graph_node, input_node<O>>::value),
-                  "input_node should be derived from graph_node");
-    CHECK_MESSAGE((std::is_base_of<sender<O>, input_node<O>>::value),
-                  "input_node should be derived from sender<Output>");
-    CHECK_MESSAGE((!std::is_base_of<receiver<O>, input_node<O>>::value),
-                  "input_node cannot have predecessors");
+    CHECK_MESSAGE((std::is_base_of<graph_node, input_node<O>>::value), "input_node should be derived from graph_node");
+    CHECK_MESSAGE((std::is_base_of<sender<O>, input_node<O>>::value), "input_node should be derived from sender<Output>");
+    CHECK_MESSAGE((!std::is_base_of<receiver<O>, input_node<O>>::value), "input_node cannot have predecessors");
 }
 
 //! Test the body object passed to a node is copied
 //! \brief \ref interface
-TEST_CASE("input_node and body copying") {
-    conformance::test_copy_body_function<oneapi::tbb::flow::input_node<int>,
-                                         conformance::copy_counting_object<int>>();
+TEST_CASE("input_node and body copying"){
+    conformance::test_copy_body_function<oneapi::tbb::flow::input_node<int>, conformance::copy_counting_object<int>>();
 }
 
 //! The node that is constructed has a reference to the same graph object as src,
 //! has a copy of the initial body used by src.
 //! The successors of src are not copied.
 //! \brief \ref requirement
-TEST_CASE("input_node copy constructor") {
+TEST_CASE("input_node copy constructor"){
     using namespace oneapi::tbb::flow;
     graph g;
 
@@ -105,8 +101,7 @@ TEST_CASE("input_node copy constructor") {
 
     input_node<output_msg> node_copy(node1);
 
-    conformance::copy_counting_object<output_msg> b2
-            = copy_body<conformance::copy_counting_object<output_msg>, input_node<output_msg>>(node_copy);
+    conformance::copy_counting_object<output_msg> b2 = copy_body<conformance::copy_counting_object<output_msg>, input_node<output_msg>>(node_copy);
 
     CHECK_MESSAGE((fun2.copy_count + 1 < b2.copy_count), "constructor should copy bodies");
 
@@ -115,19 +110,17 @@ TEST_CASE("input_node copy constructor") {
     node_copy.activate();
     g.wait_for_all();
 
-    CHECK_MESSAGE((conformance::get_values(node2).size() == 0 && conformance::get_values(node3).size() == 1),
-                  "Copied node doesn`t copy successor");
+    CHECK_MESSAGE((conformance::get_values(node2).size() == 0 && conformance::get_values(node3).size() == 1), "Copied node doesn`t copy successor");
 
     node1.activate();
     g.wait_for_all();
 
-    CHECK_MESSAGE((conformance::get_values(node2).size() == 1 && conformance::get_values(node3).size() == 0),
-                  "Copied node doesn`t copy successor");
+    CHECK_MESSAGE((conformance::get_values(node2).size() == 1 && conformance::get_values(node3).size() == 0), "Copied node doesn`t copy successor");
 }
 
 //! Test inheritance relations
 //! \brief \ref interface
-TEST_CASE("input_node superclasses") {
+TEST_CASE("input_node superclasses"){
     test_inheritance<int>();
     test_inheritance<void*>();
     test_inheritance<output_msg>();
@@ -135,14 +128,14 @@ TEST_CASE("input_node superclasses") {
 
 //! Test input_node forwarding
 //! \brief \ref requirement
-TEST_CASE("input_node forwarding") {
+TEST_CASE("input_node forwarding"){
     conformance::counting_functor<output_msg> fun(conformance::expected);
     conformance::test_forwarding<oneapi::tbb::flow::input_node<output_msg>, void, output_msg>(5, fun);
 }
 
 //! Test input_node buffering
 //! \brief \ref requirement
-TEST_CASE("input_node buffering") {
+TEST_CASE("input_node buffering"){
     conformance::dummy_functor<int> fun;
     conformance::test_buffering<oneapi::tbb::flow::input_node<int>, int>(fun);
 }
@@ -162,15 +155,13 @@ TEST_CASE("input_node body") {
     node1.activate();
     g.wait_for_all();
 
-    CHECK_MESSAGE((conformance::get_values(node2).size() == counting_threshold),
-                  "Descendant of the node needs to be receive N messages");
-    CHECK_MESSAGE((fun.execute_count == counting_threshold + 1),
-                  "Body of the node needs to be executed N + 1 times");
+    CHECK_MESSAGE((conformance::get_values(node2).size() == counting_threshold), "Descendant of the node needs to be receive N messages");
+    CHECK_MESSAGE((fun.execute_count == counting_threshold + 1), "Body of the node needs to be executed N + 1 times");
 }
 
 //! Test deduction guides
 //! \brief \ref interface \ref requirement
-TEST_CASE("Deduction guides") {
+TEST_CASE("Deduction guides"){
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
     test_deduction_guides();
 #endif
@@ -178,10 +169,11 @@ TEST_CASE("Deduction guides") {
 
 //! Test that measured concurrency respects set limits
 //! \brief \ref requirement
-TEST_CASE("concurrency follows set limits") {
+TEST_CASE("concurrency follows set limits"){
     oneapi::tbb::global_control c(oneapi::tbb::global_control::max_allowed_parallelism,
                                   oneapi::tbb::this_task_arena::max_concurrency());
 
+
     utils::ConcurrencyTracker::Reset();
     oneapi::tbb::flow::graph g;
     conformance::concurrency_peak_checker_body counter(1);
@@ -201,30 +193,28 @@ TEST_CASE("Test input_node Output class") {
     conformance::test_output_class<oneapi::tbb::flow::input_node<conformance::copy_counting_object<int>>>();
 }
 
-struct input_node_counter {
+struct input_node_counter{
     static int count;
     int N;
-    input_node_counter(int n) : N(n) {};
-
-    int operator()(oneapi::tbb::flow_control& fc) {
-        ++count;
-        if (count > N) {
-            fc.stop();
-            return N;
-        }
-        return N;
+    input_node_counter(int n) : N(n){};
+    
+    int operator()( oneapi::tbb::flow_control & fc ) {
+       ++count;
+       if(count > N){
+           fc.stop();
+           return N;
+       }
+       return N;
     }
 };
 
-struct function_node_counter {
+struct function_node_counter{
     static int count;
 
-    int operator()(int) {
+    int operator()( int ) {
         ++count;
         utils::doDummyWork(1000000);
-        CHECK_MESSAGE((input_node_counter::count <= function_node_counter::count + 1),
-                      "input_node `try_get()' call testing: a call to body is made only when the internal "
-                      "buffer is empty");
+        CHECK_MESSAGE((input_node_counter::count <= function_node_counter::count + 1), "input_node `try_get()' call testing: a call to body is made only when the internal buffer is empty");
         return 1;
     }
 };
@@ -234,15 +224,13 @@ int function_node_counter::count = 0;
 
 //! Test input_node `try_get()' call testing: a call to body is made only when the internal buffer is empty.
 //! \brief \ref requirement
-TEST_CASE("input_node `try_get()' call testing: a call to body is made only when the internal buffer is "
-          "empty.") {
+TEST_CASE("input_node `try_get()' call testing: a call to body is made only when the internal buffer is empty.") {
     oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism, 1);
     oneapi::tbb::flow::graph g;
     input_node_counter fun1(500);
     function_node_counter fun2;
 
-    oneapi::tbb::flow::function_node<int, int, oneapi::tbb::flow::rejecting> fnode(
-            g, oneapi::tbb::flow::serial, fun2);
+    oneapi::tbb::flow::function_node <int, int, oneapi::tbb::flow::rejecting> fnode(g, oneapi::tbb::flow::serial, fun2);
     oneapi::tbb::flow::input_node<int> testing_node(g, fun1);
 
     make_edge(testing_node, fnode);
diff --git a/external/tbb/test/conformance/conformance_join_node.cpp b/external/tbb/test/conformance/conformance_join_node.cpp
index d79ec3e9..52623471 100644
--- a/external/tbb/test/conformance/conformance_join_node.cpp
+++ b/external/tbb/test/conformance/conformance_join_node.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2020-2021 Intel Corporation
+    Copyright (c) 2020-2023 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -15,21 +15,24 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
 #endif
 
 #include "conformance_flowgraph.h"
+#include "common/test_invoke.h"
 
 //! \file conformance_join_node.cpp
 //! \brief Test for [flow_graph.join_node] specification
 
-using input_msg = conformance::message</*default_ctor*/ true, /*copy_ctor*/ true, /*copy_assign*/ true>;
+using input_msg = conformance::message</*default_ctor*/true, /*copy_ctor*/true, /*copy_assign*/true>;
 using my_input_tuple = std::tuple<int, float, input_msg>;
 
-std::vector<my_input_tuple> get_values(conformance::test_push_receiver<my_input_tuple> &rr) {
+std::vector<my_input_tuple> get_values( conformance::test_push_receiver<my_input_tuple>& rr ) {
     std::vector<my_input_tuple> messages;
-    int val = 0;
-    for (my_input_tuple tmp(0, 0.f, input_msg(0)); rr.try_get(tmp); ++val) { messages.push_back(tmp); }
+    my_input_tuple tmp(0, 0.f, input_msg(0));
+    while(rr.try_get(tmp)) {
+        messages.push_back(tmp);
+    }
     return messages;
 }
 
@@ -66,9 +69,10 @@ void test_deduction_guides() {
 //! The node that is constructed has a reference to the same graph object as src.
 //! The list of predecessors, messages in the input ports, and successors are not copied.
 //! \brief \ref interface
-TEST_CASE("join_node copy constructor") {
+TEST_CASE("join_node copy constructor"){
     oneapi::tbb::flow::graph g;
-    oneapi::tbb::flow::continue_node<int> node0(g, [](oneapi::tbb::flow::continue_msg) { return 1; });
+    oneapi::tbb::flow::continue_node<int> node0( g,
+                                [](oneapi::tbb::flow::continue_msg) { return 1; } );
 
     oneapi::tbb::flow::join_node<std::tuple<int>> node1(g);
     conformance::test_push_receiver<std::tuple<int>> node2(g);
@@ -84,14 +88,12 @@ TEST_CASE("join_node copy constructor") {
     g.wait_for_all();
 
     auto values = conformance::get_values(node3);
-    CHECK_MESSAGE((conformance::get_values(node2).size() == 0 && values.size() == 1),
-                  "Copied node doesn`t copy successor");
+    CHECK_MESSAGE((conformance::get_values(node2).size() == 0 && values.size() == 1), "Copied node doesn`t copy successor");
 
     node0.try_put(oneapi::tbb::flow::continue_msg());
     g.wait_for_all();
 
-    CHECK_MESSAGE((conformance::get_values(node2).size() == 1 && conformance::get_values(node3).size() == 0),
-                  "Copied node doesn`t copy predecessor");
+    CHECK_MESSAGE((conformance::get_values(node2).size() == 1 && conformance::get_values(node3).size() == 0), "Copied node doesn`t copy predecessor");
 
     oneapi::tbb::flow::remove_edge(node1, node2);
     oneapi::tbb::flow::input_port<0>(node1).try_put(1);
@@ -100,46 +102,45 @@ TEST_CASE("join_node copy constructor") {
     oneapi::tbb::flow::make_edge(node_copy2, node3);
     oneapi::tbb::flow::input_port<0>(node_copy2).try_put(2);
     g.wait_for_all();
-    CHECK_MESSAGE((std::get<0>(conformance::get_values(node3)[0]) == 2),
-                  "Copied node doesn`t copy messages in the input ports");
+    CHECK_MESSAGE((std::get<0>(conformance::get_values(node3)[0]) == 2), "Copied node doesn`t copy messages in the input ports");
 }
 
 //! Test inheritance relations
 //! \brief \ref interface
-TEST_CASE("join_node inheritance") {
+TEST_CASE("join_node inheritance"){
     CHECK_MESSAGE((std::is_base_of<oneapi::tbb::flow::graph_node,
-                                   oneapi::tbb::flow::join_node<my_input_tuple>>::value),
-                  "join_node should be derived from graph_node");
+                   oneapi::tbb::flow::join_node<my_input_tuple>>::value),
+                   "join_node should be derived from graph_node");
     CHECK_MESSAGE((std::is_base_of<oneapi::tbb::flow::sender<my_input_tuple>,
-                                   oneapi::tbb::flow::join_node<my_input_tuple>>::value),
-                  "join_node should be derived from sender<input_tuple>");
+                   oneapi::tbb::flow::join_node<my_input_tuple>>::value),
+                   "join_node should be derived from sender<input_tuple>");
 }
 
 //! Test join_node<queueing> behavior and broadcast property
 //! \brief \ref requirement
 TEST_CASE("join_node queueing policy and broadcast property") {
     oneapi::tbb::flow::graph g;
-    oneapi::tbb::flow::function_node<int, int> f1(g, oneapi::tbb::flow::unlimited,
-                                                  [](const int &i) { return i; });
-    oneapi::tbb::flow::function_node<float, float> f2(g, oneapi::tbb::flow::unlimited,
-                                                      [](const float &f) { return f; });
-    oneapi::tbb::flow::continue_node<input_msg> c1(
-            g, [](oneapi::tbb::flow::continue_msg) { return input_msg(1); });
+    oneapi::tbb::flow::function_node<int, int>
+        f1( g, oneapi::tbb::flow::unlimited, [](const int &i) { return i; } );
+    oneapi::tbb::flow::function_node<float, float>
+        f2( g, oneapi::tbb::flow::unlimited, [](const float &f) { return f; } );
+    oneapi::tbb::flow::continue_node<input_msg> c1( g,
+                            [](oneapi::tbb::flow::continue_msg) { return input_msg(1); } );
 
     oneapi::tbb::flow::join_node<my_input_tuple, oneapi::tbb::flow::queueing> testing_node(g);
 
     conformance::test_push_receiver<my_input_tuple> q_node(g);
 
-    std::atomic<int> number {1};
-    oneapi::tbb::flow::function_node<my_input_tuple, my_input_tuple> f3(
-            g, oneapi::tbb::flow::unlimited, [&](const my_input_tuple &t) {
-                CHECK_MESSAGE((std::get<0>(t) == number), "Messages must be in first-in first-out order");
-                CHECK_MESSAGE((std::get<1>(t) == static_cast<float>(number) + 0.5f),
-                              "Messages must be in first-in first-out order");
-                CHECK_MESSAGE((std::get<2>(t) == 1), "Messages must be in first-in first-out order");
+    std::atomic<int> number{1};
+    oneapi::tbb::flow::function_node<my_input_tuple, my_input_tuple>
+        f3( g, oneapi::tbb::flow::unlimited,
+            [&]( const my_input_tuple &t ) {
+                CHECK_MESSAGE((std::get<0>(t) == number), "Messages must be in first-in first-out order" );
+                CHECK_MESSAGE((std::get<1>(t) == static_cast<float>(number) + 0.5f), "Messages must be in first-in first-out order" );
+                CHECK_MESSAGE((std::get<2>(t) == 1), "Messages must be in first-in first-out order" );
                 ++number;
                 return t;
-            });
+            } );
 
     oneapi::tbb::flow::make_edge(f1, oneapi::tbb::flow::input_port<0>(testing_node));
     oneapi::tbb::flow::make_edge(f2, oneapi::tbb::flow::input_port<1>(testing_node));
@@ -150,33 +151,31 @@ TEST_CASE("join_node queueing policy and broadcast property") {
     f1.try_put(1);
     g.wait_for_all();
     CHECK_MESSAGE((get_values(q_node).size() == 0),
-                  "join_node must broadcast when there is at least one message at each input port");
+        "join_node must broadcast when there is at least one message at each input port");
     f1.try_put(2);
     f2.try_put(1.5f);
     g.wait_for_all();
     CHECK_MESSAGE((get_values(q_node).size() == 0),
-                  "join_node must broadcast when there is at least one message at each input port");
+        "join_node must broadcast when there is at least one message at each input port");
     f1.try_put(3);
     f2.try_put(2.5f);
     c1.try_put(oneapi::tbb::flow::continue_msg());
     g.wait_for_all();
     CHECK_MESSAGE((get_values(q_node).size() == 1),
-                  "join_node must broadcast when there is at least one message at each input port");
+        "join_node must broadcast when there is at least one message at each input port");
     f2.try_put(3.5f);
     c1.try_put(oneapi::tbb::flow::continue_msg());
     g.wait_for_all();
-    CHECK_MESSAGE(
-            (get_values(q_node).size() == 1),
-            "If at least one successor accepts the tuple, the head of each input port’s queue is removed");
+    CHECK_MESSAGE((get_values(q_node).size() == 1),
+        "If at least one successor accepts the tuple, the head of each input port’s queue is removed");
     c1.try_put(oneapi::tbb::flow::continue_msg());
     g.wait_for_all();
-    CHECK_MESSAGE(
-            (get_values(q_node).size() == 1),
-            "If at least one successor accepts the tuple, the head of each input port’s queue is removed");
+    CHECK_MESSAGE((get_values(q_node).size() == 1),
+        "If at least one successor accepts the tuple, the head of each input port’s queue is removed");
     c1.try_put(oneapi::tbb::flow::continue_msg());
     g.wait_for_all();
     CHECK_MESSAGE((get_values(q_node).size() == 0),
-                  "join_node must broadcast when there is at least one message at each input port");
+        "join_node must broadcast when there is at least one message at each input port");
 
     oneapi::tbb::flow::remove_edge(testing_node, f3);
 
@@ -198,23 +197,26 @@ TEST_CASE("join_node reserving policy") {
     conformance::test_with_reserving_join_node_class<oneapi::tbb::flow::write_once_node<int>>();
 }
 
-template <typename KeyType>
-struct MyHash {
-    std::size_t hash(const KeyType &k) const { return k * 2000 + 3; }
+template<typename KeyType>
+struct MyHash{
+    std::size_t hash(const KeyType &k) const {
+        return k * 2000 + 3;
+    }
 
-    bool equal(const KeyType &k1, const KeyType &k2) const { return hash(k1) == hash(k2); }
+    bool equal(const KeyType &k1, const KeyType &k2) const{
+        return hash(k1) == hash(k2);
+    }
 };
 
 //! Test join_node<key_matching> behavior
 //! \brief \ref requirement
-TEST_CASE("join_node key_matching policy") {
+TEST_CASE("join_node key_matching policy"){
     oneapi::tbb::flow::graph g;
     auto body1 = [](const oneapi::tbb::flow::continue_msg &) -> int { return 1; };
     auto body2 = [](const float &val) -> int { return static_cast<int>(val); };
 
     oneapi::tbb::flow::join_node<std::tuple<oneapi::tbb::flow::continue_msg, float>,
-                                 oneapi::tbb::flow::key_matching<int, MyHash<int>>>
-            testing_node(g, body1, body2);
+        oneapi::tbb::flow::key_matching<int, MyHash<int>>> testing_node(g, body1, body2);
 
     oneapi::tbb::flow::input_port<0>(testing_node).try_put(oneapi::tbb::flow::continue_msg());
     oneapi::tbb::flow::input_port<1>(testing_node).try_put(1.3f);
@@ -229,16 +231,13 @@ TEST_CASE("join_node key_matching policy") {
 
 //! Test join_node<tag_matching> behavior
 //! \brief \ref requirement
-TEST_CASE("join_node tag_matching policy") {
+TEST_CASE("join_node tag_matching policy"){
     oneapi::tbb::flow::graph g;
     auto body1 = [](const oneapi::tbb::flow::continue_msg &) -> oneapi::tbb::flow::tag_value { return 1; };
-    auto body2 = [](const float &val) -> oneapi::tbb::flow::tag_value {
-        return static_cast<oneapi::tbb::flow::tag_value>(val);
-    };
+    auto body2 = [](const float &val) -> oneapi::tbb::flow::tag_value { return static_cast<oneapi::tbb::flow::tag_value>(val); };
 
     oneapi::tbb::flow::join_node<std::tuple<oneapi::tbb::flow::continue_msg, float>,
-                                 oneapi::tbb::flow::tag_matching>
-            testing_node(g, body1, body2);
+        oneapi::tbb::flow::tag_matching> testing_node(g, body1, body2);
 
     oneapi::tbb::flow::input_port<0>(testing_node).try_put(oneapi::tbb::flow::continue_msg());
     oneapi::tbb::flow::input_port<1>(testing_node).try_put(1.3f);
@@ -252,7 +251,9 @@ TEST_CASE("join_node tag_matching policy") {
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 //! Test deduction guides
 //! \brief \ref requirement
-TEST_CASE("Deduction guides test") { test_deduction_guides(); }
+TEST_CASE("Deduction guides test"){
+    test_deduction_guides();
+}
 #endif
 
 //! Test join_node input_ports() returns a tuple of input ports.
@@ -261,7 +262,56 @@ TEST_CASE("join_node output_ports") {
     oneapi::tbb::flow::graph g;
     oneapi::tbb::flow::join_node<std::tuple<int>> node(g);
 
-    CHECK_MESSAGE((std::is_same<oneapi::tbb::flow::join_node<std::tuple<int>>::input_ports_type &,
-                                decltype(node.input_ports())>::value),
-                  "join_node input_ports should returns a tuple of input ports");
+    CHECK_MESSAGE((std::is_same<oneapi::tbb::flow::join_node<std::tuple<int>>::input_ports_type&,
+        decltype(node.input_ports())>::value), "join_node input_ports should returns a tuple of input ports");
+}
+
+#if __TBB_CPP17_INVOKE_PRESENT
+
+template <typename K, typename Body1, typename Body2>
+void test_invoke_basic(Body1 body1, Body2 body2) {
+    static_assert(std::is_same_v<std::decay_t<K>, std::size_t>, "incorrect test setup");
+    using namespace oneapi::tbb::flow;
+    auto generator = [](std::size_t n) { return test_invoke::SmartID<std::size_t>(n); };
+    graph g;
+
+    function_node<std::size_t, test_invoke::SmartID<std::size_t>> f1(g, unlimited, generator);
+    function_node<std::size_t, test_invoke::SmartID<std::size_t>> f2(g, unlimited, generator);
+
+    using tuple_type = std::tuple<test_invoke::SmartID<std::size_t>, test_invoke::SmartID<std::size_t>>;
+    using join_type = join_node<tuple_type, key_matching<K>>;
+
+
+    join_type j(g, body1, body2);
+
+    buffer_node<tuple_type> buf(g);
+
+    make_edge(f1, input_port<0>(j));
+    make_edge(f2, input_port<1>(j));
+    make_edge(j, buf);
+
+    std::size_t objects_count = 100;
+    for (std::size_t i = 0; i < objects_count; ++i) {
+        f1.try_put(i);
+        f2.try_put(objects_count - i - 1);
+    }
+
+    g.wait_for_all();
+
+    std::size_t buf_size = 0;
+    tuple_type tpl;
+
+    while(buf.try_get(tpl)) {
+        ++buf_size;
+        CHECK(std::get<0>(tpl).id == std::get<1>(tpl).id);
+    }
+    CHECK(buf_size == objects_count);
+}
+
+//! Test that key_matching join_node uses std::invoke to run the body
+//! \brief \ref requirement
+TEST_CASE("key_matching join_node invoke semantics") {
+    test_invoke_basic</*K = */std::size_t>(&test_invoke::SmartID<std::size_t>::get_id, &test_invoke::SmartID<std::size_t>::id);
+    test_invoke_basic</*K = */const std::size_t&>(&test_invoke::SmartID<std::size_t>::get_id_ref, &test_invoke::SmartID<std::size_t>::get_id_ref);
 }
+#endif // __TBB_CPP17_INVOKE_PRESENT
diff --git a/external/tbb/test/conformance/conformance_limiter_node.cpp b/external/tbb/test/conformance/conformance_limiter_node.cpp
index 9e4084cf..5a017ce8 100644
--- a/external/tbb/test/conformance/conformance_limiter_node.cpp
+++ b/external/tbb/test/conformance/conformance_limiter_node.cpp
@@ -15,7 +15,7 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
 #endif
 
 #include "conformance_flowgraph.h"
@@ -23,13 +23,11 @@
 //! \file conformance_limiter_node.cpp
 //! \brief Test for [flow_graph.limiter_node] specification
 
-using input_msg
-        = conformance::message</*default_ctor*/ true, /*copy_ctor*/ true /*enable for queue_node successor*/,
-                               /*copy_assign*/ true /*enable for queue_node successor*/>;
+using input_msg = conformance::message</*default_ctor*/true, /*copy_ctor*/true/*enable for queue_node successor*/, /*copy_assign*/true/*enable for queue_node successor*/>;
 
 //! Test limiter_node limiting
 //! \brief \ref requirement
-TEST_CASE("limiter_node limiting") {
+TEST_CASE("limiter_node limiting"){
     oneapi::tbb::flow::graph g;
 
     constexpr int limit = 5;
@@ -38,23 +36,23 @@ TEST_CASE("limiter_node limiting") {
 
     oneapi::tbb::flow::make_edge(node1, node2);
 
-    for (int i = 0; i < limit * 2; ++i) node1.try_put(input_msg(1));
+    for(int i = 0; i < limit * 2; ++i)
+        node1.try_put(input_msg(1));
     g.wait_for_all();
 
-    CHECK_MESSAGE((conformance::get_values(node2).size() == limit),
-                  "Descendant of the node needs be receive limited number of messages");
+    CHECK_MESSAGE((conformance::get_values(node2).size() == limit), "Descendant of the node needs be receive limited number of messages");
 }
 
 //! Test node broadcast messages to successors
 //! \brief \ref requirement
-TEST_CASE("limiter_node broadcast") {
+TEST_CASE("limiter_node broadcast"){
     conformance::test_forwarding<oneapi::tbb::flow::limiter_node<int>, int>(1, 5);
     conformance::test_forwarding<oneapi::tbb::flow::limiter_node<input_msg>, input_msg>(1, 5);
 }
 
 //! Test node not buffered unsuccessful message, and try_get after rejection should not succeed.
 //! \brief \ref requirement
-TEST_CASE("limiter_node buffering") {
+TEST_CASE("limiter_node buffering"){
     conformance::test_buffering<oneapi::tbb::flow::limiter_node<int>, int>(5);
     conformance::test_buffering<oneapi::tbb::flow::limiter_node<int, int>, int>(5);
 }
@@ -62,7 +60,7 @@ TEST_CASE("limiter_node buffering") {
 //! The node that is constructed has a reference to the same graph object as src, has the same threshold.
 //! The predecessors and successors of src are not copied.
 //! \brief \ref interface
-TEST_CASE("limiter_node copy constructor") {
+TEST_CASE("limiter_node copy constructor"){
     using namespace oneapi::tbb::flow;
     graph g;
 
@@ -81,25 +79,22 @@ TEST_CASE("limiter_node copy constructor") {
     node_copy.try_put(1);
     g.wait_for_all();
 
-    CHECK_MESSAGE((conformance::get_values(node2).size() == 0 && conformance::get_values(node3).size() == 1),
-                  "Copied node doesn`t copy successor");
+    CHECK_MESSAGE((conformance::get_values(node2).size() == 0 && conformance::get_values(node3).size() == 1), "Copied node doesn`t copy successor");
 
     node_copy.try_put(1);
     g.wait_for_all();
 
-    CHECK_MESSAGE((conformance::get_values(node2).size() == 0 && conformance::get_values(node3).size() == 0),
-                  "Copied node copy threshold");
+    CHECK_MESSAGE((conformance::get_values(node2).size() == 0 && conformance::get_values(node3).size() == 0), "Copied node copy threshold");
 
     node0.try_put(1);
     g.wait_for_all();
 
-    CHECK_MESSAGE((conformance::get_values(node2).size() == 1 && conformance::get_values(node3).size() == 0),
-                  "Copied node doesn`t copy predecessor");
+    CHECK_MESSAGE((conformance::get_values(node2).size() == 1 && conformance::get_values(node3).size() == 0), "Copied node doesn`t copy predecessor");
 }
 
 //! Test inheritance relations
 //! \brief \ref interface
-TEST_CASE("limiter_node superclasses") {
+TEST_CASE("limiter_node superclasses"){
     conformance::test_inheritance<oneapi::tbb::flow::limiter_node<int>, int, int>();
     conformance::test_inheritance<oneapi::tbb::flow::limiter_node<float>, float, float>();
     conformance::test_inheritance<oneapi::tbb::flow::limiter_node<input_msg>, input_msg, input_msg>();
@@ -107,65 +102,66 @@ TEST_CASE("limiter_node superclasses") {
 
 //! Test limiter_node decrementer
 //! \brief \ref interface
-TEST_CASE("limiter_node decrementer") {
+TEST_CASE("limiter_node decrementer"){
     const int threshold = 5;
     oneapi::tbb::flow::graph g;
     oneapi::tbb::flow::limiter_node<int, int> limit(g, threshold);
     oneapi::tbb::flow::queue_node<int> queue(g);
     make_edge(limit, queue);
     int m = 0;
-    CHECK_MESSAGE((limit.try_put(m++)), "Newly constructed limiter node does not accept message.");
-    CHECK_MESSAGE(limit.decrementer().try_put(-threshold),// close limiter's gate
-                  "Limiter node decrementer's port does not accept message.");
-    CHECK_MESSAGE((!limit.try_put(m++)), "Closed limiter node's accepts message.");
-    CHECK_MESSAGE(limit.decrementer().try_put(threshold + 5),// open limiter's gate
-                  "Limiter node decrementer's port does not accept message.");
-    for (int i = 0; i < threshold; ++i)
-        CHECK_MESSAGE((limit.try_put(m++)), "Limiter node does not accept message while open.");
-    CHECK_MESSAGE((!limit.try_put(m)), "Limiter node's gate is not closed.");
+    CHECK_MESSAGE(( limit.try_put( m++ )), "Newly constructed limiter node does not accept message." );
+    CHECK_MESSAGE(limit.decrementer().try_put( -threshold ), // close limiter's gate
+                   "Limiter node decrementer's port does not accept message." );
+    CHECK_MESSAGE(( !limit.try_put( m++ )), "Closed limiter node's accepts message." );
+    CHECK_MESSAGE(limit.decrementer().try_put( threshold + 5 ),  // open limiter's gate
+                   "Limiter node decrementer's port does not accept message." );
+    for( int i = 0; i < threshold; ++i )
+        CHECK_MESSAGE(( limit.try_put( m++ )), "Limiter node does not accept message while open." );
+    CHECK_MESSAGE(( !limit.try_put( m )), "Limiter node's gate is not closed." );
     g.wait_for_all();
     int expected[] = {0, 2, 3, 4, 5, 6};
-    int actual = -1;
-    m = 0;
-    while (queue.try_get(actual)) CHECK_MESSAGE(actual == expected[m++], "");
-    CHECK_MESSAGE((sizeof(expected) / sizeof(expected[0]) == m), "Not all messages have been processed.");
+    int actual = -1; m = 0;
+    while( queue.try_get(actual) )
+        CHECK_MESSAGE(actual == expected[m++], "" );
+    CHECK_MESSAGE(( sizeof(expected) / sizeof(expected[0]) == m), "Not all messages have been processed." );
     g.wait_for_all();
 
     const size_t threshold2 = size_t(-1);
     oneapi::tbb::flow::limiter_node<int, long long> limit2(g, threshold2);
     make_edge(limit2, queue);
-    CHECK_MESSAGE((limit2.try_put(1)), "Newly constructed limiter node does not accept message.");
-    long long decrement_value = (long long) (size_t(-1) / 2);
-    CHECK_MESSAGE(limit2.decrementer().try_put(-decrement_value),
-                  "Limiter node decrementer's port does not accept message");
-    CHECK_MESSAGE((limit2.try_put(2)), "Limiter's gate should not be closed yet.");
-    CHECK_MESSAGE(limit2.decrementer().try_put(-decrement_value),
-                  "Limiter node decrementer's port does not accept message");
-    CHECK_MESSAGE((!limit2.try_put(3)), "Overflow happened for internal counter.");
+    CHECK_MESSAGE(( limit2.try_put( 1 )), "Newly constructed limiter node does not accept message." );
+    long long decrement_value = (long long)( size_t(-1)/2 );
+    CHECK_MESSAGE(limit2.decrementer().try_put( -decrement_value ),
+                   "Limiter node decrementer's port does not accept message" );
+    CHECK_MESSAGE(( limit2.try_put( 2 )), "Limiter's gate should not be closed yet." );
+    CHECK_MESSAGE(limit2.decrementer().try_put( -decrement_value ),
+                   "Limiter node decrementer's port does not accept message" );
+    CHECK_MESSAGE(( !limit2.try_put( 3 )), "Overflow happened for internal counter." );
     int expected2[] = {1, 2};
-    actual = -1;
-    m = 0;
-    while (queue.try_get(actual)) CHECK_MESSAGE(actual == expected2[m++], "");
-    CHECK_MESSAGE((sizeof(expected2) / sizeof(expected2[0]) == m), "Not all messages have been processed.");
+    actual = -1; m = 0;
+    while( queue.try_get(actual) )
+        CHECK_MESSAGE(actual == expected2[m++], "" );
+    CHECK_MESSAGE(( sizeof(expected2) / sizeof(expected2[0]) == m), "Not all messages have been processed." );
     g.wait_for_all();
 
     const size_t threshold3 = 10;
     oneapi::tbb::flow::limiter_node<int, long long> limit3(g, threshold3);
     make_edge(limit3, queue);
     long long decrement_value3 = 3;
-    CHECK_MESSAGE(limit3.decrementer().try_put(-decrement_value3),
-                  "Limiter node decrementer's port does not accept message");
+    CHECK_MESSAGE(limit3.decrementer().try_put( -decrement_value3 ),
+                   "Limiter node decrementer's port does not accept message" );
 
     m = 0;
-    while (limit3.try_put(m)) { m++; };
-    CHECK_MESSAGE(m == threshold3 - decrement_value3, "Not all messages have been accepted.");
+    while( limit3.try_put( m ) ){ m++; };
+    CHECK_MESSAGE(m == threshold3 - decrement_value3, "Not all messages have been accepted." );
 
-    actual = -1;
-    m = 0;
-    while (queue.try_get(actual)) { CHECK_MESSAGE(actual == m++, "Not all messages have been processed."); }
+    actual = -1; m = 0;
+    while( queue.try_get(actual) ){
+        CHECK_MESSAGE(actual == m++, "Not all messages have been processed." );
+    }
 
     g.wait_for_all();
-    CHECK_MESSAGE(m == threshold3 - decrement_value3, "Not all messages have been processed.");
+    CHECK_MESSAGE(m == threshold3 - decrement_value3, "Not all messages have been processed." );
 
     const size_t threshold4 = 10;
     oneapi::tbb::flow::limiter_node<int> limit4(g, threshold4);
@@ -173,15 +169,16 @@ TEST_CASE("limiter_node decrementer") {
 
     limit4.try_put(-1);
     CHECK_MESSAGE(limit4.decrementer().try_put(oneapi::tbb::flow::continue_msg()),
-                  "Limiter node decrementer's port does not accept continue_msg");
+                   "Limiter node decrementer's port does not accept continue_msg" );
 
     m = 0;
-    while (limit4.try_put(m)) { m++; };
-    CHECK_MESSAGE(m == threshold4, "Not all messages have been accepted.");
+    while( limit4.try_put( m ) ){ m++; };
+    CHECK_MESSAGE(m == threshold4, "Not all messages have been accepted." );
 
-    actual = -1;
-    m = -1;
-    while (queue.try_get(actual)) { CHECK_MESSAGE(actual == m++, "Not all messages have been processed."); }
+    actual = -1; m = -1;
+    while( queue.try_get(actual) ){
+        CHECK_MESSAGE(actual == m++, "Not all messages have been processed." );
+    }
 
     g.wait_for_all();
 }
diff --git a/external/tbb/test/conformance/conformance_multifunction_node.cpp b/external/tbb/test/conformance/conformance_multifunction_node.cpp
index a489a74b..1ad7b530 100644
--- a/external/tbb/test/conformance/conformance_multifunction_node.cpp
+++ b/external/tbb/test/conformance/conformance_multifunction_node.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2020-2021 Intel Corporation
+    Copyright (c) 2020-2023 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -15,57 +15,54 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
 #endif
 
 #define CONFORMANCE_MULTIFUNCTION_NODE
 
 #include "conformance_flowgraph.h"
+#include "common/test_invoke.h"
 
 //! \file conformance_multifunction_node.cpp
 //! \brief Test for [flow_graph.function_node] specification
 
-using input_msg = conformance::message</*default_ctor*/ true, /*copy_ctor*/ true, /*copy_assign*/ false>;
-using output_msg = conformance::message</*default_ctor*/ false, /*copy_ctor*/ false, /*copy_assign*/ false>;
+using input_msg = conformance::message</*default_ctor*/true, /*copy_ctor*/true, /*copy_assign*/false>;
+using output_msg = conformance::message</*default_ctor*/false, /*copy_ctor*/false, /*copy_assign*/false>;
 
 /*
     Test function_node is a graph_node, receiver<Input>, and sender<Output>
 */
-template <typename I, typename O>
-void test_inheritance() {
+template<typename I, typename O>
+void test_inheritance(){
     using namespace oneapi::tbb::flow;
 
-    CHECK_MESSAGE((std::is_base_of<graph_node, multifunction_node<I, O>>::value),
-                  "multifunction_node should be derived from graph_node");
-    CHECK_MESSAGE((std::is_base_of<receiver<I>, multifunction_node<I, O>>::value),
-                  "multifunction_node should be derived from receiver<Input>");
+    CHECK_MESSAGE((std::is_base_of<graph_node, multifunction_node<I, O>>::value), "multifunction_node should be derived from graph_node");
+    CHECK_MESSAGE((std::is_base_of<receiver<I>, multifunction_node<I, O>>::value), "multifunction_node should be derived from receiver<Input>");
 }
 
 //! Test node reject the incoming message if the concurrency limit achieved.
 //! \brief \ref interface
-TEST_CASE("multifunction_node with rejecting policy") {
-    conformance::test_rejecting<
-            oneapi::tbb::flow::multifunction_node<int, std::tuple<int>, oneapi::tbb::flow::rejecting>>();
+TEST_CASE("multifunction_node with rejecting policy"){
+    conformance::test_rejecting<oneapi::tbb::flow::multifunction_node<int, std::tuple<int>, oneapi::tbb::flow::rejecting>>();
 }
 
 //! Test nodes for execution with priority in single-threaded configuration
 //! \brief \ref interface
-TEST_CASE("multifunction_node priority") {
-    conformance::test_priority<oneapi::tbb::flow::multifunction_node<input_msg, std::tuple<int>>, input_msg>(
-            oneapi::tbb::flow::unlimited);
+TEST_CASE("multifunction_node priority"){
+    conformance::test_priority<oneapi::tbb::flow::multifunction_node<input_msg, std::tuple<int>>, input_msg>(oneapi::tbb::flow::unlimited);
 }
 
 //! Test function_node has a user-settable concurrency limit. It can be set to one of predefined values.
 //! The user can also provide a value of type std::size_t to limit concurrency.
 //! Test that not more than limited threads works in parallel.
 //! \brief \ref interface
-TEST_CASE("multifunction_node concurrency") {
+TEST_CASE("multifunction_node concurrency"){
     conformance::test_concurrency<oneapi::tbb::flow::multifunction_node<int, std::tuple<int>>>();
 }
 
 //! Test all node constructors
 //! \brief \ref interface
-TEST_CASE("multifunction_node constructors") {
+TEST_CASE("multifunction_node constructors"){
     using namespace oneapi::tbb::flow;
     graph g;
 
@@ -75,49 +72,42 @@ TEST_CASE("multifunction_node constructors") {
     multifunction_node<int, std::tuple<int>> fn2(g, unlimited, fun, oneapi::tbb::flow::node_priority_t(1));
 
     multifunction_node<int, std::tuple<int>, lightweight> lw_node1(g, serial, fun, lightweight());
-    multifunction_node<int, std::tuple<int>, lightweight> lw_node2(g, serial, fun, lightweight(),
-                                                                   oneapi::tbb::flow::node_priority_t(1));
+    multifunction_node<int, std::tuple<int>, lightweight> lw_node2(g, serial, fun, lightweight(), oneapi::tbb::flow::node_priority_t(1));
 }
 
 //! The node that is constructed has a reference to the same graph object as src, has a copy of the initial body used by src, and has the same concurrency threshold as src.
 //! The predecessors and successors of src are not copied.
 //! \brief \ref interface
-TEST_CASE("multifunction_node copy constructor") {
+TEST_CASE("multifunction_node copy constructor"){
     conformance::test_copy_ctor<oneapi::tbb::flow::multifunction_node<int, std::tuple<int>>>();
 }
 
 //! Test node not buffered unsuccessful message, and try_get after rejection should not succeed.
 //! \brief \ref requirement
-TEST_CASE("multifunction_node buffering") {
+TEST_CASE("multifunction_node buffering"){
     conformance::dummy_functor<int> fun;
-    conformance::test_buffering<
-            oneapi::tbb::flow::multifunction_node<input_msg, std::tuple<int>, oneapi::tbb::flow::rejecting>,
-            input_msg>(oneapi::tbb::flow::unlimited, fun);
+    conformance::test_buffering<oneapi::tbb::flow::multifunction_node<input_msg, std::tuple<int>,
+    oneapi::tbb::flow::rejecting>, input_msg>(oneapi::tbb::flow::unlimited, fun);
 }
 
 //! Test multifunction_node broadcasting
 //! \brief \ref requirement
-TEST_CASE("multifunction_node broadcast") {
+TEST_CASE("multifunction_node broadcast"){
     conformance::counting_functor<int> fun(conformance::expected);
-    conformance::test_forwarding<oneapi::tbb::flow::multifunction_node<input_msg, std::tuple<int>>, input_msg,
-                                 int>(1, oneapi::tbb::flow::unlimited, fun);
+    conformance::test_forwarding<oneapi::tbb::flow::multifunction_node<input_msg, std::tuple<int>>, input_msg, int>(1, oneapi::tbb::flow::unlimited, fun);
 }
 
 //! Test the body object passed to a node is copied
 //! \brief \ref interface
-TEST_CASE("multifunction_node copy body") {
-    conformance::test_copy_body_function<oneapi::tbb::flow::multifunction_node<int, std::tuple<int>>,
-                                         conformance::copy_counting_object<int>>(
-            oneapi::tbb::flow::unlimited);
+TEST_CASE("multifunction_node copy body"){
+    conformance::test_copy_body_function<oneapi::tbb::flow::multifunction_node<int, std::tuple<int>>, conformance::copy_counting_object<int>>(oneapi::tbb::flow::unlimited);
 }
 
 //! Test execution of node body
 //! Test node can do try_put call
 //! \brief \ref interface \ref requirement
 TEST_CASE("multifunction_node body") {
-    conformance::test_body_exec<oneapi::tbb::flow::multifunction_node<input_msg, std::tuple<output_msg>,
-                                                                      oneapi::tbb::flow::rejecting>,
-                                input_msg, output_msg>(oneapi::tbb::flow::unlimited);
+    conformance::test_body_exec<oneapi::tbb::flow::multifunction_node<input_msg, std::tuple<output_msg>, oneapi::tbb::flow::rejecting>, input_msg, output_msg>(oneapi::tbb::flow::unlimited);
 }
 
 //! Test multifunction_node output_ports() returns a tuple of output ports.
@@ -126,17 +116,15 @@ TEST_CASE("multifunction_node output_ports") {
     using namespace oneapi::tbb::flow;
     graph g;
     conformance::dummy_functor<int> fun;
-    oneapi::tbb::flow::multifunction_node<int, std::tuple<int>> node(g, unlimited, fun);
+    oneapi::tbb::flow::multifunction_node <int, std::tuple<int>> node(g, unlimited, fun);
 
-    CHECK_MESSAGE(
-            (std::is_same<oneapi::tbb::flow::multifunction_node<int, std::tuple<int>>::output_ports_type&,
-                          decltype(node.output_ports())>::value),
-            "multifunction_node output_ports should returns a tuple of output ports");
+    CHECK_MESSAGE((std::is_same<oneapi::tbb::flow::multifunction_node<int, std::tuple<int>>::output_ports_type&,
+        decltype(node.output_ports())>::value), "multifunction_node output_ports should returns a tuple of output ports");
 }
 
 //! Test inheritance relations
 //! \brief \ref interface
-TEST_CASE("multifunction_node superclasses") {
+TEST_CASE("multifunction_node superclasses"){
     test_inheritance<int, std::tuple<int>>();
     test_inheritance<void*, std::tuple<float>>();
     test_inheritance<input_msg, std::tuple<output_msg>>();
@@ -146,6 +134,55 @@ TEST_CASE("multifunction_node superclasses") {
 //! \brief \ref interface \ref requirement
 TEST_CASE("Test function_node Output and Input class") {
     using Body = conformance::copy_counting_object<int>;
-    conformance::test_output_input_class<oneapi::tbb::flow::multifunction_node<Body, std::tuple<Body>>,
-                                         Body>();
+    conformance::test_output_input_class<oneapi::tbb::flow::multifunction_node<Body, std::tuple<Body>>, Body>();
 }
+
+#if __TBB_CPP17_INVOKE_PRESENT
+//! Test that multifunction_node uses std::invoke to execute the body
+//! \brief \ref interface \ref requirement
+TEST_CASE("Test multifunction_node and std::invoke") {
+    using namespace oneapi::tbb::flow;
+
+    using output_type1 = test_invoke::SmartID<std::size_t>;
+    using input_type = test_invoke::SmartID<output_type1>;
+
+    using output_tuple1 = std::tuple<output_type1, output_type1>;
+    using output_tuple2 = std::tuple<std::size_t>;
+
+    using first_mf_node_type = multifunction_node<input_type, output_tuple1>;
+    using second_mf_node_type = multifunction_node<output_type1, output_tuple2>;
+
+    using first_ports_type = typename first_mf_node_type::output_ports_type;
+    using second_ports_type = typename second_mf_node_type::output_ports_type;
+
+    graph g;
+
+    auto first_body = &input_type::template send_id<first_ports_type>;
+    auto second_body = &output_type1::template send_id<second_ports_type>;
+
+    first_mf_node_type mf1(g, unlimited, first_body);
+    second_mf_node_type mf21(g, unlimited, second_body);
+    second_mf_node_type mf22(g, unlimited, second_body);
+
+    buffer_node<std::size_t> buf(g);
+
+    make_edge(output_port<0>(mf1), mf21);
+    make_edge(output_port<1>(mf1), mf22);
+
+    make_edge(output_port<0>(mf21), buf);
+    make_edge(output_port<0>(mf22), buf);
+
+    mf1.try_put(input_type{output_type1{1}});
+
+    g.wait_for_all();
+
+    std::size_t buf_size = 0;
+    std::size_t tmp = 0;
+    while(buf.try_get(tmp)) {
+        ++buf_size;
+        CHECK(tmp == 1);
+    }
+
+    CHECK(buf_size == 2);
+}
+#endif
diff --git a/external/tbb/test/conformance/conformance_mutex.cpp b/external/tbb/test/conformance/conformance_mutex.cpp
index c7e23968..d8a01f1c 100644
--- a/external/tbb/test/conformance/conformance_mutex.cpp
+++ b/external/tbb/test/conformance/conformance_mutex.cpp
@@ -15,22 +15,22 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
 #endif
 
 #include "conformance_mutex.h"
 
+#include "oneapi/tbb/spin_mutex.h"
 #include "oneapi/tbb/mutex.h"
-#include "oneapi/tbb/null_mutex.h"
-#include "oneapi/tbb/null_rw_mutex.h"
+#include "oneapi/tbb/spin_rw_mutex.h"
+#include "oneapi/tbb/rw_mutex.h"
 #include "oneapi/tbb/queuing_mutex.h"
 #include "oneapi/tbb/queuing_rw_mutex.h"
-#include "oneapi/tbb/rw_mutex.h"
-#include "oneapi/tbb/spin_mutex.h"
-#include "oneapi/tbb/spin_rw_mutex.h"
+#include "oneapi/tbb/null_mutex.h"
+#include "oneapi/tbb/null_rw_mutex.h"
 
 //! \file conformance_mutex.cpp
-//! \brief Test for [mutex.spin_mutex mutex.spin_rw_mutex mutex.queuing_mutex mutex.queuing_rw_mutex mutex.speculative_spin_mutex mutex.speculative_spin_rw_mutex mutex.null_mutex mutex.null_rw_mutex] specifications
+//! \brief Test for [mutex.spin_mutex mutex.spin_rw_mutex mutex.queuing_mutex mutex.queuing_rw_mutex mutex.mutex mutex.rw_mutex mutex.speculative_spin_mutex mutex.speculative_spin_rw_mutex mutex.null_mutex mutex.null_rw_mutex] specifications
 
 //! Testing Mutex requirements
 //! \brief \ref interface \ref requirement
@@ -40,6 +40,8 @@ TEST_CASE("Basic Locable requirement test") {
     GeneralTest<oneapi::tbb::spin_rw_mutex>("Spin RW Mutex");
     GeneralTest<oneapi::tbb::queuing_mutex>("Queuing Mutex");
     GeneralTest<oneapi::tbb::queuing_rw_mutex>("Queuing RW Mutex");
+    GeneralTest<oneapi::tbb::mutex>("Adaptive Mutex");
+    GeneralTest<oneapi::tbb::rw_mutex>("Adaptive RW Mutex");
     // TODO: Consider adding Thread Sanitizer (note that accesses inside the transaction
     // considered as races by Thread Sanitizer)
 #if !__TBB_USE_THREAD_SANITIZER
@@ -48,8 +50,7 @@ TEST_CASE("Basic Locable requirement test") {
 #endif
     // NullMutexes
     GeneralTest<oneapi::tbb::null_mutex, utils::AtomicCounter<oneapi::tbb::null_mutex>>("Null Mutex", false);
-    GeneralTest<oneapi::tbb::null_rw_mutex, utils::AtomicCounter<oneapi::tbb::null_rw_mutex>>("Null RW Mutex",
-                                                                                              false);
+    GeneralTest<oneapi::tbb::null_rw_mutex, utils::AtomicCounter<oneapi::tbb::null_rw_mutex>>("Null RW Mutex", false);
     TestNullMutex<oneapi::tbb::null_mutex>("Null Mutex");
     TestNullMutex<oneapi::tbb::null_rw_mutex>("Null RW Mutex");
 }
@@ -61,6 +62,8 @@ TEST_CASE("Lockable requirement test") {
     TestTryAcquire<oneapi::tbb::spin_rw_mutex>("Spin RW Mutex");
     TestTryAcquire<oneapi::tbb::queuing_mutex>("Queuing Mutex");
     TestTryAcquire<oneapi::tbb::queuing_rw_mutex>("Queuing RW Mutex");
+    TestTryAcquire<oneapi::tbb::mutex>("Adaptive Mutex");
+    TestTryAcquire<oneapi::tbb::rw_mutex>("Adaptive RW Mutex");
 #if !__TBB_USE_THREAD_SANITIZER
     TestTryAcquire<oneapi::tbb::speculative_spin_mutex>("Speculative Spin Mutex");
     TestTryAcquire<oneapi::tbb::speculative_spin_rw_mutex>("Speculative Spin RW Mutex");
@@ -74,12 +77,14 @@ TEST_CASE("Shared mutexes (reader/writer) test") {
     // General reader writer capabilities + upgrade/downgrade
     TestReaderWriterLock<oneapi::tbb::spin_rw_mutex>("Spin RW Mutex");
     TestReaderWriterLock<oneapi::tbb::queuing_rw_mutex>("Queuing RW Mutex");
+    TestReaderWriterLock<oneapi::tbb::rw_mutex>("Adaptive RW Mutex");
     TestNullRWMutex<oneapi::tbb::null_rw_mutex>("Null RW Mutex");
     // Single threaded read/write try_acquire operations
     TestTryAcquireReader<oneapi::tbb::spin_rw_mutex>("Spin RW Mutex");
     TestTryAcquireReader<oneapi::tbb::queuing_rw_mutex>("Queuing RW Mutex");
     TestRWStateMultipleChange<oneapi::tbb::spin_rw_mutex>("Spin RW Mutex");
     TestRWStateMultipleChange<oneapi::tbb::queuing_rw_mutex>("Queuing RW Mutex");
+    TestRWStateMultipleChange<oneapi::tbb::rw_mutex>("Adaptive RW Mutex");
     TestTryAcquireReader<oneapi::tbb::null_rw_mutex>("Null RW Mutex");
 #if !__TBB_USE_THREAD_SANITIZER
     TestReaderWriterLock<oneapi::tbb::speculative_spin_rw_mutex>("Speculative Spin RW Mutex");
@@ -92,10 +97,16 @@ TEST_CASE("Shared mutexes (reader/writer) test") {
 //! Compatibility with the standard
 //! \brief \ref interface \ref requirement
 TEST_CASE("ISO interface test") {
-    GeneralTest<TBB_MutexFromISO_Mutex<oneapi::tbb::spin_mutex>>("ISO Spin Mutex");
-    GeneralTest<TBB_MutexFromISO_Mutex<oneapi::tbb::spin_rw_mutex>>("ISO Spin RW Mutex");
-    TestTryAcquire<TBB_MutexFromISO_Mutex<oneapi::tbb::spin_mutex>>("ISO Spin Mutex");
-    TestTryAcquire<TBB_MutexFromISO_Mutex<oneapi::tbb::spin_rw_mutex>>("ISO Spin RW Mutex");
-    TestTryAcquireReader<TBB_MutexFromISO_Mutex<oneapi::tbb::spin_rw_mutex>>("ISO Spin RW Mutex");
-    TestReaderWriterLock<TBB_MutexFromISO_Mutex<oneapi::tbb::spin_rw_mutex>>("ISO Spin RW Mutex");
+    GeneralTest<TBB_MutexFromISO_Mutex<oneapi::tbb::spin_mutex> >("ISO Spin Mutex");
+    GeneralTest<TBB_MutexFromISO_Mutex<oneapi::tbb::spin_rw_mutex> >("ISO Spin RW Mutex");
+    GeneralTest<TBB_MutexFromISO_Mutex<oneapi::tbb::mutex> >("ISO Adaprive Mutex");
+    GeneralTest<TBB_MutexFromISO_Mutex<oneapi::tbb::rw_mutex>>("ISO Adaptive RW Mutex");
+    TestTryAcquire<TBB_MutexFromISO_Mutex<oneapi::tbb::spin_mutex> >("ISO Spin Mutex");
+    TestTryAcquire<TBB_MutexFromISO_Mutex<oneapi::tbb::spin_rw_mutex> >("ISO Spin RW Mutex");
+    TestTryAcquire<TBB_MutexFromISO_Mutex<oneapi::tbb::mutex> >("ISO Adaptive  Mutex");
+    TestTryAcquire<TBB_MutexFromISO_Mutex<oneapi::tbb::rw_mutex>>("ISO Adaptive RW Mutex");
+    TestTryAcquireReader<TBB_MutexFromISO_Mutex<oneapi::tbb::spin_rw_mutex> >("ISO Spin RW Mutex");
+    TestReaderWriterLock<TBB_MutexFromISO_Mutex<oneapi::tbb::spin_rw_mutex> >("ISO Spin RW Mutex");
+    TestTryAcquireReader<TBB_MutexFromISO_Mutex<oneapi::tbb::rw_mutex>>("ISO Adaptive RW Mutex");
+    TestReaderWriterLock<TBB_MutexFromISO_Mutex<oneapi::tbb::rw_mutex>>("ISO Adaptive RW Mutex");
 }
diff --git a/external/tbb/test/conformance/conformance_mutex.h b/external/tbb/test/conformance/conformance_mutex.h
index 660e2bed..9b9bf416 100644
--- a/external/tbb/test/conformance/conformance_mutex.h
+++ b/external/tbb/test/conformance/conformance_mutex.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -236,11 +236,11 @@ class TBB_MutexFromISO_Mutex {
         mutex_type* my_mutex;
         bool m_is_writer;
     public:
-        scoped_lock() : my_mutex(NULL), m_is_writer(false) {}
-        scoped_lock(mutex_type& m) : my_mutex(NULL), m_is_writer(false) {
+        scoped_lock() : my_mutex(nullptr), m_is_writer(false) {}
+        scoped_lock(mutex_type& m) : my_mutex(nullptr), m_is_writer(false) {
             acquire(m);
         }
-        scoped_lock(mutex_type& m, bool is_writer) : my_mutex(NULL) {
+        scoped_lock(mutex_type& m, bool is_writer) : my_mutex(nullptr) {
             acquire(m,is_writer);
         }
         void acquire(mutex_type& m) {
@@ -261,7 +261,7 @@ class TBB_MutexFromISO_Mutex {
         template<typename Q = M>
         typename std::enable_if<!Q::is_rw_mutex>::type release() {
             my_mutex->my_iso_mutex.unlock();
-            my_mutex = NULL;
+            my_mutex = nullptr;
         }
 
         template<typename Q = M>
@@ -270,7 +270,7 @@ class TBB_MutexFromISO_Mutex {
                 my_mutex->my_iso_mutex.unlock();
             else
                 my_mutex->my_iso_mutex.unlock_shared();
-            my_mutex = NULL;
+            my_mutex = nullptr;
         }
 
         // Methods for reader-writer mutex
diff --git a/external/tbb/test/conformance/conformance_overwrite_node.cpp b/external/tbb/test/conformance/conformance_overwrite_node.cpp
index 09a84aa1..0e5d881c 100644
--- a/external/tbb/test/conformance/conformance_overwrite_node.cpp
+++ b/external/tbb/test/conformance/conformance_overwrite_node.cpp
@@ -15,7 +15,7 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
 #endif
 
 #define CONFORMANCE_BUFFERING_NODES
@@ -28,7 +28,7 @@
 
 //! Test overwrite_node behavior
 //! \brief \ref requirement
-TEST_CASE("overwrite_node messages") {
+TEST_CASE("overwrite_node messages"){
     oneapi::tbb::flow::graph g;
 
     oneapi::tbb::flow::overwrite_node<int> testing_node(g);
@@ -49,52 +49,51 @@ TEST_CASE("overwrite_node messages") {
 
 //! Test function_node broadcast
 //! \brief \ref requirement
-TEST_CASE("overwrite_node broadcast") {
+TEST_CASE("overwrite_node broadcast"){
     conformance::test_forwarding<oneapi::tbb::flow::overwrite_node<int>, int>(1);
 }
 
 //! Test function_node buffering
 //! \brief \ref requirement
-TEST_CASE("overwrite_node buffering") {
+TEST_CASE("overwrite_node buffering"){
     conformance::test_buffering<oneapi::tbb::flow::overwrite_node<int>, int>();
 }
 
-//! The node that is constructed has a reference to the same graph object as src,with an invalid internal buffer item.
+//! The node that is constructed has a reference to the same graph object as src,with an invalid internal buffer item. 
 //! The buffered value and list of successors are not copied from src.
 //! \brief \ref requirement
-TEST_CASE("overwrite_node copy constructor") {
+TEST_CASE("overwrite_node copy constructor"){
     conformance::test_copy_ctor_for_buffering_nodes<oneapi::tbb::flow::overwrite_node<int>>();
 }
 
 //! Test inheritance relations
 //! \brief \ref interface
-TEST_CASE("overwrite_node superclasses") {
+TEST_CASE("overwrite_node superclasses"){
     conformance::test_inheritance<oneapi::tbb::flow::overwrite_node<int>, int, int>();
     conformance::test_inheritance<oneapi::tbb::flow::overwrite_node<void*>, void*, void*>();
 }
 
 //! Test overwrite_node node constructor
 //! \brief \ref requirement
-TEST_CASE("overwrite_node constructor") {
+TEST_CASE("overwrite_node constructor"){
     oneapi::tbb::flow::graph g;
     oneapi::tbb::flow::overwrite_node<int> testing_node(g);
 
     int tmp = -1;
     CHECK_MESSAGE((!testing_node.is_valid()), "Constructed node has invalid internal buffer item");
-    CHECK_MESSAGE((!testing_node.try_get(tmp)),
-                  "Gets from the node are non-destructive, but the first `try_get' fails");
+    CHECK_MESSAGE((!testing_node.try_get(tmp)), "Gets from the node are non-destructive, but the first `try_get' fails");
 }
 
 //! Test overwrite_node node `is_valid()` and `clear()`
 //! \brief \ref requirement
-TEST_CASE("overwrite_node methods") {
+TEST_CASE("overwrite_node methods"){
     oneapi::tbb::flow::graph g;
     oneapi::tbb::flow::overwrite_node<int> testing_node(g);
 
     CHECK_MESSAGE((!testing_node.is_valid()), "Constructed node has invalid internal buffer item");
-
+    
     testing_node.try_put(1);
-
+    
     CHECK_MESSAGE((testing_node.is_valid()), "Buffer must be valid after try_put call");
 
     testing_node.clear();
@@ -105,6 +104,6 @@ TEST_CASE("overwrite_node methods") {
 //! The following test shows the possibility to connect the node to a reserving join_node,
 //! avoiding direct calls to the try_get() method from the body of the successor node
 //! \brief \ref requirement
-TEST_CASE("overwrite_node with reserving join_node as successor") {
+TEST_CASE("overwrite_node with reserving join_node as successor"){
     conformance::test_with_reserving_join_node_class<oneapi::tbb::flow::overwrite_node<int>>();
 }
diff --git a/external/tbb/test/conformance/conformance_parallel_for.cpp b/external/tbb/test/conformance/conformance_parallel_for.cpp
index b9ce15ae..463ea526 100644
--- a/external/tbb/test/conformance/conformance_parallel_for.cpp
+++ b/external/tbb/test/conformance/conformance_parallel_for.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
 #include "common/test.h"
 #include "common/utils.h"
 #include "common/utils_report.h"
+#include "common/test_invoke.h"
 
 #include "oneapi/tbb/parallel_for.h"
 #include "oneapi/tbb/tick_count.h"
@@ -41,73 +42,71 @@ const std::size_t PFOR_BUFFER_TEST_SIZE = 1024;
 const std::size_t PFOR_BUFFER_ACTUAL_SIZE = PFOR_BUFFER_TEST_SIZE + 1024;
 size_t pfor_buffer[PFOR_BUFFER_ACTUAL_SIZE];
 
-template <typename T>
-class TestFunctor {
+template<typename T>
+class TestFunctor{
 public:
-    void operator()(T index) const { pfor_buffer[index]++; }
+    void operator ()(T index) const {
+        pfor_buffer[index]++;
+    }
 };
 
 static std::atomic<int> FooBodyCount;
 
 // A range object whose only public members are those required by the Range concept.
-template <size_t Pad>
+template<size_t Pad>
 class FooRange {
     // Start of range
     int start;
 
     // Size of range
     int size;
-    FooRange(int start_, int size_) : start(start_), size(size_) {
+    FooRange( int start_, int size_ ) : start(start_), size(size_) {
         utils::zero_fill<char>(pad, Pad);
-        pad[Pad - 1] = 'x';
+        pad[Pad-1] = 'x';
     }
-    template <typename Flavor_, std::size_t Pad_>
-    friend void Flog();
-    template <size_t Pad_>
-    friend class FooBody;
+    template<typename Flavor_, std::size_t Pad_> friend void Flog( );
+    template<size_t Pad_> friend class FooBody;
     void operator&();
 
     char pad[Pad];
-
 public:
-    bool empty() const { return size == 0; }
-    bool is_divisible() const { return size > 1; }
-    FooRange(FooRange& original, oneapi::tbb::split) : size(original.size / 2) {
+    bool empty() const {return size==0;}
+    bool is_divisible() const {return size>1;}
+    FooRange( FooRange& original, oneapi::tbb::split ) : size(original.size/2) {
         original.size -= size;
-        start = original.start + original.size;
-        CHECK_FAST(original.pad[Pad - 1] == 'x');
-        pad[Pad - 1] = 'x';
+        start = original.start+original.size;
+        CHECK_FAST( original.pad[Pad-1]=='x');
+        pad[Pad-1] = 'x';
     }
 };
 
 // A range object whose only public members are those required by the parallel_for.h body concept.
-template <size_t Pad>
+template<size_t Pad>
 class FooBody {
 public:
     ~FooBody() {
         --FooBodyCount;
-        for (std::size_t i = 0; i < sizeof(*this); ++i) reinterpret_cast<char*>(this)[i] = -1;
+        for( std::size_t i=0; i<sizeof(*this); ++i )
+            reinterpret_cast<char*>(this)[i] = -1;
     }
     // Copy constructor
-    FooBody(const FooBody& other) : array(other.array), state(other.state) {
+    FooBody( const FooBody& other ) : array(other.array), state(other.state) {
         ++FooBodyCount;
         CHECK_FAST(state == LIVE);
     }
-    void operator()(FooRange<Pad>& r) const {
+    void operator()( FooRange<Pad>& r ) const {
         for (int k = r.start; k < r.start + r.size; ++k) {
             CHECK_FAST(array[k].load(std::memory_order_relaxed) == 0);
             array[k].store(1, std::memory_order_relaxed);
         }
     }
-
 private:
     const int LIVE = 0x1234;
     std::atomic<int>* array;
     int state;
     friend class FooRange<Pad>;
-    template <typename Flavor_, std::size_t Pad_>
-    friend void Flog();
-    FooBody(std::atomic<int>* array_) : array(array_), state(LIVE) {}
+    template<typename Flavor_, std::size_t Pad_> friend void Flog( );
+    FooBody( std::atomic<int>* array_ ) : array(array_), state(LIVE) {}
 };
 
 template <typename Flavor, typename Partitioner, typename Range, typename Body>
@@ -115,15 +114,15 @@ struct Invoker;
 
 template <typename Range, typename Body>
 struct Invoker<parallel_tag, empty_partitioner_tag, Range, Body> {
-    void operator()(const Range& r, const Body& body, empty_partitioner_tag&) {
-        oneapi::tbb::parallel_for(r, body);
+    void operator()( const Range& r, const Body& body, empty_partitioner_tag& ) {
+        oneapi::tbb::parallel_for( r, body );
     }
 };
 
 template <typename Partitioner, typename Range, typename Body>
 struct Invoker<parallel_tag, Partitioner, Range, Body> {
-    void operator()(const Range& r, const Body& body, Partitioner& p) {
-        oneapi::tbb::parallel_for(r, body, p);
+    void operator()( const Range& r, const Body& body, Partitioner& p ) {
+        oneapi::tbb::parallel_for( r, body, p );
     }
 };
 
@@ -132,83 +131,80 @@ struct InvokerStep;
 
 template <typename T, typename Body>
 struct InvokerStep<parallel_tag, empty_partitioner_tag, T, Body> {
-    void operator()(const T& first, const T& last, const Body& f, empty_partitioner_tag&) {
-        oneapi::tbb::parallel_for(first, last, f);
+    void operator()( const T& first, const T& last, const Body& f, empty_partitioner_tag& ) {
+        oneapi::tbb::parallel_for( first, last, f );
     }
-    void operator()(const T& first, const T& last, const T& step, const Body& f, empty_partitioner_tag&) {
-        oneapi::tbb::parallel_for(first, last, step, f);
+    void operator()( const T& first, const T& last, const T& step, const Body& f, empty_partitioner_tag& ) {
+        oneapi::tbb::parallel_for( first, last, step, f );
     }
 };
 
 template <typename Partitioner, typename T, typename Body>
 struct InvokerStep<parallel_tag, Partitioner, T, Body> {
-    void operator()(const T& first, const T& last, const Body& f, Partitioner& p) {
-        oneapi::tbb::parallel_for(first, last, f, p);
+    void operator()( const T& first, const T& last, const Body& f, Partitioner& p ) {
+        oneapi::tbb::parallel_for( first, last, f, p );
     }
-    void operator()(const T& first, const T& last, const T& step, const Body& f, Partitioner& p) {
-        oneapi::tbb::parallel_for(first, last, step, f, p);
+    void operator()( const T& first, const T& last, const T& step, const Body& f, Partitioner& p ) {
+        oneapi::tbb::parallel_for( first, last, step, f, p );
     }
 };
 
-template <typename Flavor, std::size_t Pad>
+template<typename Flavor, std::size_t Pad>
 void Flog() {
-    for (int i = 0; i < N; ++i) {
-        for (int mode = 0; mode < 4; ++mode) {
-            FooRange<Pad> r(0, i);
+    for ( int i=0; i<N; ++i ) {
+        for ( int mode = 0; mode < 4; ++mode) {
+            FooRange<Pad> r( 0, i );
             const FooRange<Pad> rc = r;
-            FooBody<Pad> f(Array);
+            FooBody<Pad> f( Array );
             const FooBody<Pad> fc = f;
-            for (int a_i = 0; a_i < N; a_i++) { Array[a_i].store(0, std::memory_order_relaxed); }
+            for (int a_i = 0; a_i < N; a_i++) {
+                Array[a_i].store(0, std::memory_order_relaxed);
+            }
             FooBodyCount = 1;
             switch (mode) {
-                case 0: {
-                    empty_partitioner_tag p;
-                    Invoker<Flavor, empty_partitioner_tag, FooRange<Pad>, FooBody<Pad>> invoke_for;
-                    invoke_for(rc, fc, p);
-                } break;
-                case 1: {
-                    Invoker<Flavor, const oneapi::tbb::simple_partitioner, FooRange<Pad>, FooBody<Pad>>
-                            invoke_for;
-                    invoke_for(rc, fc, oneapi::tbb::simple_partitioner());
-                } break;
-                case 2: {
-                    Invoker<Flavor, const oneapi::tbb::auto_partitioner, FooRange<Pad>, FooBody<Pad>>
-                            invoke_for;
-                    invoke_for(rc, fc, oneapi::tbb::auto_partitioner());
-                } break;
-                case 3: {
-                    static oneapi::tbb::affinity_partitioner affinity;
-                    Invoker<Flavor, oneapi::tbb::affinity_partitioner, FooRange<Pad>, FooBody<Pad>>
-                            invoke_for;
-                    invoke_for(rc, fc, affinity);
-                } break;
+            case 0: {
+                empty_partitioner_tag p;
+                Invoker< Flavor, empty_partitioner_tag, FooRange<Pad>, FooBody<Pad> > invoke_for;
+                invoke_for( rc, fc, p );
+            }
+                break;
+            case 1: {
+                Invoker< Flavor, const oneapi::tbb::simple_partitioner, FooRange<Pad>, FooBody<Pad> > invoke_for;
+                invoke_for( rc, fc, oneapi::tbb::simple_partitioner() );
+            }
+                break;
+            case 2: {
+                Invoker< Flavor, const oneapi::tbb::auto_partitioner, FooRange<Pad>, FooBody<Pad> > invoke_for;
+                invoke_for( rc, fc, oneapi::tbb::auto_partitioner() );
+            }
+                break;
+            case 3: {
+                static oneapi::tbb::affinity_partitioner affinity;
+                Invoker< Flavor, oneapi::tbb::affinity_partitioner, FooRange<Pad>, FooBody<Pad> > invoke_for;
+                invoke_for( rc, fc, affinity );
             }
-            CHECK(std::find_if_not(
-                          Array, Array + i,
-                          [](const std::atomic<int>& v) { return v.load(std::memory_order_relaxed) == 1; })
-                  == Array + i);
-            CHECK(std::find_if_not(
-                          Array + i, Array + N,
-                          [](const std::atomic<int>& v) { return v.load(std::memory_order_relaxed) == 0; })
-                  == Array + N);
+                break;
+            }
+            CHECK(std::find_if_not(Array, Array + i, [](const std::atomic<int>& v) { return v.load(std::memory_order_relaxed) == 1; }) == Array + i);
+            CHECK(std::find_if_not(Array + i, Array + N, [](const std::atomic<int>& v) { return v.load(std::memory_order_relaxed) == 0; }) == Array + N);
             CHECK(FooBodyCount == 1);
         }
     }
 }
 
-#include <stdexcept>// std::invalid_argument
+#include <stdexcept> // std::invalid_argument
 
 template <typename Flavor, typename T, typename Partitioner>
 void TestParallelForWithStepSupportHelper(Partitioner& p) {
     const T pfor_buffer_test_size = static_cast<T>(PFOR_BUFFER_TEST_SIZE);
     const T pfor_buffer_actual_size = static_cast<T>(PFOR_BUFFER_ACTUAL_SIZE);
     // Testing parallel_for with different step values
-    InvokerStep<Flavor, Partitioner, T, TestFunctor<T>> invoke_for;
+    InvokerStep< Flavor, Partitioner, T, TestFunctor<T> > invoke_for;
     for (T begin = 0; begin < pfor_buffer_test_size - 1; begin += pfor_buffer_test_size / 10 + 1) {
         T step;
         for (step = 1; step < pfor_buffer_test_size; step++) {
             std::memset(pfor_buffer, 0, pfor_buffer_actual_size * sizeof(std::size_t));
-            if (step == 1) {
+            if (step == 1){
                 invoke_for(begin, pfor_buffer_test_size, TestFunctor<T>(), p);
             } else {
                 invoke_for(begin, pfor_buffer_test_size, step, TestFunctor<T>(), p);
@@ -222,7 +218,9 @@ void TestParallelForWithStepSupportHelper(Partitioner& p) {
             }
             // Verifying that no extra items were processed and right bound of array wasn't crossed
             for (T i = 0; i < pfor_buffer_actual_size; i++) {
-                if (pfor_buffer[i] != 0) { CHECK_MESSAGE(false, "parallel_for processed an extra element"); }
+                if (pfor_buffer[i] != 0) {
+                    CHECK_MESSAGE(false, "parallel_for processed an extra element");
+                }
             }
         }
     }
@@ -237,37 +235,159 @@ void TestParallelForWithStepSupport() {
     empty_partitioner_tag p;
 
     // Try out all partitioner combinations
-    TestParallelForWithStepSupportHelper<Flavor, T, empty_partitioner_tag>(p);
-    TestParallelForWithStepSupportHelper<Flavor, T, const oneapi::tbb::auto_partitioner>(auto_p);
-    TestParallelForWithStepSupportHelper<Flavor, T, const oneapi::tbb::simple_partitioner>(simple_p);
-    TestParallelForWithStepSupportHelper<Flavor, T, oneapi::tbb::affinity_partitioner>(affinity_p);
-    TestParallelForWithStepSupportHelper<Flavor, T, oneapi::tbb::static_partitioner>(static_p);
+    TestParallelForWithStepSupportHelper< Flavor,T,empty_partitioner_tag >(p);
+    TestParallelForWithStepSupportHelper< Flavor,T,const oneapi::tbb::auto_partitioner >(auto_p);
+    TestParallelForWithStepSupportHelper< Flavor,T,const oneapi::tbb::simple_partitioner >(simple_p);
+    TestParallelForWithStepSupportHelper< Flavor,T,oneapi::tbb::affinity_partitioner >(affinity_p);
+    TestParallelForWithStepSupportHelper< Flavor,T,oneapi::tbb::static_partitioner >(static_p);
 
     // Testing some corner cases
     oneapi::tbb::parallel_for(static_cast<T>(2), static_cast<T>(1), static_cast<T>(1), TestFunctor<T>());
 }
 
+#if __TBB_CPP17_INVOKE_PRESENT
+class SmartIndex {
+public:
+    SmartIndex(std::size_t ri) : real_index(ri), change_vector(nullptr) {}
+    SmartIndex(std::size_t ri, std::vector<std::size_t>& cv)
+        : real_index(ri), change_vector(&cv) {}
+    SmartIndex(const SmartIndex& other) : real_index(other.real_index),
+                                          change_vector(other.change_vector) {}
+    ~SmartIndex() = default;
+
+    SmartIndex& operator=(const SmartIndex& other) {
+        real_index = other.real_index;
+        change_vector = other.change_vector;
+        return *this;
+    }
+
+    bool operator<(const SmartIndex& other) const {
+        return real_index < other.real_index;
+    }
+
+    bool operator<=(const SmartIndex& other) const {
+        return real_index <= other.real_index;
+    }
+
+    SmartIndex operator/(const SmartIndex& other) const {
+        return {real_index / other.real_index, *change_vector};
+    }
+
+    SmartIndex operator*(const SmartIndex& other) const {
+        return {real_index * other.real_index, *change_vector};
+    }
+
+    SmartIndex operator+(const SmartIndex& other) const {
+        return {real_index + other.real_index, *change_vector};
+    }
+
+    SmartIndex& operator+=(const SmartIndex& other) {
+        real_index += other.real_index;
+        return *this;
+    }
+
+    SmartIndex& operator++() { ++real_index; return *this; }
+
+    std::size_t operator-(const SmartIndex& other) const {
+        return real_index - other.real_index;
+    }
+
+    SmartIndex operator+(std::size_t k) {
+        return {real_index + k, *change_vector};
+    }
+
+    void increase() const {
+        CHECK(change_vector);
+        ++(*change_vector)[real_index];
+    }
+private:
+    std::size_t real_index;
+    std::vector<std::size_t>* change_vector;
+};
+
+void test_pfor_body_invoke() {
+    const std::size_t number_of_overloads = 5;
+    const std::size_t iterations = 100000;
+
+    using range_type = test_invoke::SmartRange<std::size_t>;
+    std::vector<std::size_t> change_vector(iterations, 0);
+    range_type range{0, iterations, change_vector};
+
+    oneapi::tbb::parallel_for(range, &range_type::increase);
+    oneapi::tbb::parallel_for(range, &range_type::increase, oneapi::tbb::simple_partitioner());
+    oneapi::tbb::parallel_for(range, &range_type::increase, oneapi::tbb::auto_partitioner());
+    oneapi::tbb::parallel_for(range, &range_type::increase, oneapi::tbb::static_partitioner());
+    oneapi::tbb::affinity_partitioner aff;
+    oneapi::tbb::parallel_for(range, &range_type::increase, aff);
+
+    for (std::size_t item : change_vector) {
+        CHECK(item == number_of_overloads);
+    }
+}
+
+
+void test_pfor_func_invoke() {
+    const std::size_t number_of_overloads = 5;
+    const std::size_t iterations = 100000;
+
+    std::vector<std::size_t> change_vector(iterations, 0);
+    SmartIndex first{0, change_vector};
+    SmartIndex last{iterations, change_vector};
+    SmartIndex stride{2};
+
+    oneapi::tbb::parallel_for(first, last, &SmartIndex::increase);
+    oneapi::tbb::parallel_for(first, last, &SmartIndex::increase, oneapi::tbb::simple_partitioner());
+    oneapi::tbb::parallel_for(first, last, &SmartIndex::increase, oneapi::tbb::auto_partitioner());
+    oneapi::tbb::parallel_for(first, last, &SmartIndex::increase, oneapi::tbb::static_partitioner());
+    oneapi::tbb::affinity_partitioner aff;
+    oneapi::tbb::parallel_for(first, last, &SmartIndex::increase, aff);
+
+    for (std::size_t& item : change_vector) {
+        CHECK(item == number_of_overloads);
+        item = 0;
+    }
+
+    oneapi::tbb::parallel_for(first, last, stride, &SmartIndex::increase);
+    oneapi::tbb::parallel_for(first, last, stride, &SmartIndex::increase, oneapi::tbb::simple_partitioner());
+    oneapi::tbb::parallel_for(first, last, stride, &SmartIndex::increase, oneapi::tbb::auto_partitioner());
+    oneapi::tbb::parallel_for(first, last, stride, &SmartIndex::increase, oneapi::tbb::static_partitioner());
+    oneapi::tbb::parallel_for(first, last, stride, &SmartIndex::increase, aff);
+
+    CHECK(change_vector[0] == number_of_overloads);
+    for (std::size_t i = 1; i < iterations; ++i) {
+        std::size_t expected = change_vector[i - 1] == 0 ? number_of_overloads : 0;
+        CHECK(change_vector[i] == expected);
+    }
+}
+#endif // __TBB_CPP17_INVOKE_PRESENT
+
 //! Test simple parallel_for with different partitioners
 //! \brief \ref interface \ref requirement
 TEST_CASE("Basic parallel_for") {
-    std::atomic<unsigned long> counter {};
+    std::atomic<unsigned long> counter{};
     const std::size_t number_of_partitioners = 5;
     const std::size_t iterations = 100000;
 
-    oneapi::tbb::parallel_for(std::size_t(0), iterations, [&](std::size_t) { counter++; });
+    oneapi::tbb::parallel_for(std::size_t(0), iterations, [&](std::size_t) {
+        counter++;
+    });
 
-    oneapi::tbb::parallel_for(
-            std::size_t(0), iterations, [&](std::size_t) { counter++; }, oneapi::tbb::simple_partitioner());
+    oneapi::tbb::parallel_for(std::size_t(0), iterations, [&](std::size_t) {
+        counter++;
+    }, oneapi::tbb::simple_partitioner());
 
-    oneapi::tbb::parallel_for(
-            std::size_t(0), iterations, [&](std::size_t) { counter++; }, oneapi::tbb::auto_partitioner());
+    oneapi::tbb::parallel_for(std::size_t(0), iterations, [&](std::size_t) {
+        counter++;
+    }, oneapi::tbb::auto_partitioner());
 
-    oneapi::tbb::parallel_for(
-            std::size_t(0), iterations, [&](std::size_t) { counter++; }, oneapi::tbb::static_partitioner());
+    oneapi::tbb::parallel_for(std::size_t(0), iterations, [&](std::size_t) {
+        counter++;
+    }, oneapi::tbb::static_partitioner());
 
     oneapi::tbb::affinity_partitioner aff;
-    oneapi::tbb::parallel_for(
-            std::size_t(0), iterations, [&](std::size_t) { counter++; }, aff);
+    oneapi::tbb::parallel_for(std::size_t(0), iterations, [&](std::size_t) {
+        counter++;
+    }, aff);
 
     CHECK_EQ(counter.load(std::memory_order_relaxed), iterations * number_of_partitioners);
 }
@@ -279,13 +399,15 @@ TEST_CASE("Flog test") {
     Flog<parallel_tag, 10>();
     Flog<parallel_tag, 100>();
     Flog<parallel_tag, 1000>();
+#if !EMSCRIPTEN    
     Flog<parallel_tag, 10000>();
+#endif
 }
 
 //! Testing parallel for with different types and step
 //! \brief \ref interface \ref requirement
-TEST_CASE_TEMPLATE("parallel_for with step support", T, short, unsigned short, int, unsigned int, long,
-                   unsigned long, long long, unsigned long long, std::size_t) {
+TEST_CASE_TEMPLATE("parallel_for with step support", T, short, unsigned short, int, unsigned int,
+                                    long, unsigned long, long long, unsigned long long, std::size_t) {
     // Testing with different integer types
     TestParallelForWithStepSupport<parallel_tag, T>();
 }
@@ -310,3 +432,12 @@ TEST_CASE("Testing parallel_for with partitioners") {
     parallel_for(Range1(true, false), b, oneapi::tbb::static_partitioner());
     parallel_for(Range6(false, true), b, oneapi::tbb::static_partitioner());
 }
+
+#if __TBB_CPP17_INVOKE_PRESENT
+//! Test that parallel_for uses std::invoke to run body and function
+//! \brief \ref interface \ref requirement
+TEST_CASE("parallel_for and std::invoke") {
+    test_pfor_body_invoke();
+    test_pfor_func_invoke();
+}
+#endif
diff --git a/external/tbb/test/conformance/conformance_parallel_for_each.cpp b/external/tbb/test/conformance/conformance_parallel_for_each.cpp
index a520f9de..e36a2803 100644
--- a/external/tbb/test/conformance/conformance_parallel_for_each.cpp
+++ b/external/tbb/test/conformance/conformance_parallel_for_each.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2023 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -22,13 +22,13 @@
 //! Test input access iterator support
 //! \brief \ref requirement \ref interface
 TEST_CASE("Input iterator support") {
-    for (auto concurrency_level : utils::concurrency_range()) {
-        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism,
-                                            concurrency_level);
+    for ( auto concurrency_level : utils::concurrency_range() ) {
+        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism, concurrency_level);
 
-        for (size_t depth = 0; depth <= depths_nubmer; ++depth) {
+        for( size_t depth = 0; depth <= depths_nubmer; ++depth ) {
             g_tasks_expected = 0;
-            for (size_t i = 0; i < depth; ++i) g_tasks_expected += FindNumOfTasks(g_depths[i].value());
+            for ( size_t i=0; i < depth; ++i )
+                g_tasks_expected += FindNumOfTasks(g_depths[i].value());
             TestIterator_Const<utils::InputIterator<value_t>>(depth);
             TestIterator_Move<utils::InputIterator<value_t>>(depth);
 #if __TBB_CPP14_GENERIC_LAMBDAS_PRESENT
@@ -41,14 +41,14 @@ TEST_CASE("Input iterator support") {
 //! Test container based overload
 //! \brief \ref requirement \ref interface
 TEST_CASE("Container based overload - input iterator based container") {
-    container_based_overload_test_case<utils::InputIterator, incremental_functor_const>(/*expected_value*/ 0);
+    container_based_overload_test_case<utils::InputIterator, incremental_functor_const>(/*expected_value*/0);
 }
 
 const size_t elements = 10000;
 const size_t init_sum = 0;
 std::atomic<size_t> element_counter;
 
-template <size_t K>
+template<size_t K>
 struct set_to {
     void operator()(size_t& x) const {
         x = K;
@@ -57,14 +57,13 @@ struct set_to {
 };
 
 #include "common/range_based_for_support.h"
-#include <deque>
 #include <functional>
+#include <deque>
 
-template <typename... Context>
+template<typename... Context>
 void WorkProducingTest(Context&... context) {
-    for (auto concurrency_level : utils::concurrency_range()) {
-        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism,
-                                            concurrency_level);
+    for ( auto concurrency_level : utils::concurrency_range() ) {
+        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism, concurrency_level);
 
         using namespace range_based_for_support_tests;
         std::deque<size_t> v(elements, 0);
@@ -72,28 +71,82 @@ void WorkProducingTest(Context&... context) {
         element_counter = 0;
         oneapi::tbb::parallel_for_each(v.begin(), v.end(), set_to<0>(), context...);
         REQUIRE_MESSAGE((element_counter == v.size() && element_counter == elements),
-                        "not all elements were set");
+            "not all elements were set");
         REQUIRE_MESSAGE(range_based_for_accumulate(v, std::plus<size_t>(), init_sum) == init_sum,
-                        "elements of v not all ones");
+            "elements of v not all ones");
 
         element_counter = 0;
         oneapi::tbb::parallel_for_each(v, set_to<1>(), context...);
         REQUIRE_MESSAGE((element_counter == v.size() && element_counter == elements),
-                        "not all elements were set");
+            "not all elements were set");
         REQUIRE_MESSAGE(range_based_for_accumulate(v, std::plus<size_t>(), init_sum) == v.size(),
-                        "elements of v not all ones");
+            "elements of v not all ones");
 
         element_counter = 0;
-        oneapi::tbb::parallel_for_each(
-                oneapi::tbb::blocked_range<std::deque<size_t>::iterator>(v.begin(), v.end()), set_to<0>(),
-                context...);
+        oneapi::tbb::parallel_for_each(oneapi::tbb::blocked_range<std::deque<size_t>::iterator>(v.begin(), v.end()), set_to<0>(), context...);
         REQUIRE_MESSAGE((element_counter == v.size() && element_counter == elements),
-                        "not all elements were set");
+            "not all elements were set");
         REQUIRE_MESSAGE(range_based_for_accumulate(v, std::plus<size_t>(), init_sum) == init_sum,
-                        "elements of v not all zeros");
+            "elements of v not all zeros");
+    }
+}
+
+#if __TBB_CPP17_INVOKE_PRESENT
+
+class ForEachInvokeItem {
+public:
+    ForEachInvokeItem(std::size_t rv, std::vector<std::size_t>& cv) : real_value(rv), change_vector(cv) {}
+
+    void do_action() const { ++change_vector[real_value]; }
+
+    void do_action_and_feed(oneapi::tbb::feeder<ForEachInvokeItem>& feeder) const {
+        CHECK_MESSAGE(change_vector.size() % 2 == 0, "incorrect test setup");
+        std::size_t shift = change_vector.size() / 2;
+        ++change_vector[real_value];
+        if (real_value < shift) {
+            feeder.add(ForEachInvokeItem(real_value + shift, change_vector));
+        }
+    }
+private:
+    std::size_t real_value;
+    std::vector<std::size_t>& change_vector;
+};
+
+template <template <class T> typename IteratorType>
+void test_pfor_each_invoke_basic() {
+    const std::size_t items_count = 10;
+    std::vector<ForEachInvokeItem> items_to_proceed;
+    std::vector<std::size_t> change_vector(2 * items_count, 0);
+
+    for (std::size_t i = 0; i < items_count; ++i) {
+        items_to_proceed.emplace_back(i, change_vector);
+    }
+
+    using iterator_type = IteratorType<ForEachInvokeItem>;
+
+    // Test without feeder
+    oneapi::tbb::parallel_for_each(iterator_type(items_to_proceed.data()),
+                                   iterator_type(items_to_proceed.data() + items_count),
+                                   &ForEachInvokeItem::do_action);
+
+    for (std::size_t i = 0; i < items_count; ++i) {
+        CHECK(change_vector[i] == 1);
+        CHECK(change_vector[i + items_count] == 0);
+        change_vector[i] = 0; // reset
+    }
+
+    // Test with feeder
+    oneapi::tbb::parallel_for_each(iterator_type(items_to_proceed.data()),
+                                   iterator_type(items_to_proceed.data() + items_count),
+                                   &ForEachInvokeItem::do_action_and_feed);
+
+    for (auto item : change_vector) {
+        CHECK(item == 1);
     }
 }
 
+#endif
+
 //! Test that all elements were produced
 //! \brief \ref requirement \ref stress
 TEST_CASE("Test that all elements in range were produced through body (without task_group_context)") {
@@ -119,3 +172,14 @@ TEST_CASE("Move Semantics | Item: MoveOnly") {
     //  parallel_for_each uses is_copy_constructible to support non-copyable types
     DoTestMoveSemantics<TestMoveSem::MoveOnly>();
 }
+
+#if __TBB_CPP17_INVOKE_PRESENT
+//! Test that parallel_for_each uses std::invoke to run the body
+//! \brief \ref requirement
+TEST_CASE("parallel_for_each and std::invoke") {
+    test_pfor_each_invoke_basic<utils::InputIterator>();
+    test_pfor_each_invoke_basic<utils::ForwardIterator>();
+    test_pfor_each_invoke_basic<utils::RandomIterator>();
+}
+
+#endif
diff --git a/external/tbb/test/conformance/conformance_parallel_invoke.cpp b/external/tbb/test/conformance/conformance_parallel_invoke.cpp
index 3bdbe990..337e554f 100644
--- a/external/tbb/test/conformance/conformance_parallel_invoke.cpp
+++ b/external/tbb/test/conformance/conformance_parallel_invoke.cpp
@@ -15,29 +15,30 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
 #endif
 
-#include "common/cpu_usertime.h"
-#include "common/memory_usage.h"
-#include "common/parallel_invoke_common.h"
+
 #include "common/test.h"
 #include "common/utils.h"
+#include "common/cpu_usertime.h"
 #include "common/utils_concurrency_limit.h"
+#include "common/parallel_invoke_common.h"
+#include "common/memory_usage.h"
 
-#include <atomic>
 #include <cstddef>
 #include <cstdint>
+#include <atomic>
 
 //! \file conformance_parallel_invoke.cpp
 //! \brief Test for [algorithms.parallel_invoke] specification
 
-template <std::size_t TaskCount>
+template<std::size_t TaskCount>
 struct correctness_test_case {
     static std::atomic<std::size_t> data_array[TaskCount];
 
     // invocation functor
-    template <std::size_t Position>
+    template<std::size_t Position>
     struct functor {
 
         functor() = default;
@@ -51,24 +52,23 @@ struct correctness_test_case {
     };
 
     static void run_validate_and_reset(oneapi::tbb::task_group_context* context_ptr) {
-        for (auto& elem : data_array) elem.store(0, std::memory_order_relaxed);
+        for (auto& elem : data_array)
+            elem.store(0, std::memory_order_relaxed);
 
         parallel_invoke_call<TaskCount, functor>::perform(context_ptr);
         for (std::size_t i = 0; i < TaskCount; i++) {
-            REQUIRE_MESSAGE(data_array[i] == 1,
-                            "Some task was executed more than once, or was not executed.");
+            REQUIRE_MESSAGE(data_array[i] == 1, "Some task was executed more than once, or was not executed.");
             data_array[i] = 0;
         }
     }
 };
 
-template <std::size_t TaskCount>
+template<std::size_t TaskCount>
 std::atomic<std::size_t> correctness_test_case<TaskCount>::data_array[TaskCount];
 
 void correctness_test(oneapi::tbb::task_group_context* context_ptr = nullptr) {
-    for (auto concurrency_level : utils::concurrency_range()) {
-        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism,
-                                            concurrency_level);
+    for ( auto concurrency_level : utils::concurrency_range() ) {
+        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism, concurrency_level);
 
         correctness_test_case<2>::run_validate_and_reset(context_ptr);
         correctness_test_case<3>::run_validate_and_reset(context_ptr);
@@ -88,7 +88,9 @@ void correctness_test(oneapi::tbb::task_group_context* context_ptr = nullptr) {
 
 //! Testing correctness with various functors count
 //! \brief \ref requirement \ref interface
-TEST_CASE("Test correctness") { correctness_test(); }
+TEST_CASE("Test correctness") {
+    correctness_test();
+}
 
 //! Testing correctness with various functors count using task_group_context
 //! \brief \ref requirement \ref interface
@@ -103,10 +105,10 @@ TEST_CASE("Test correctness using context") {
 
 #if TBB_USE_EXCEPTIONS
 
-template <std::size_t TaskCount>
+template<std::size_t TaskCount>
 struct exception_handling_test_case {
     // invocation functor
-    template <std::size_t Position>
+    template<std::size_t Position>
     struct functor {
         functor() = default;
         functor(const functor&) = delete;
@@ -114,36 +116,35 @@ struct exception_handling_test_case {
 
         void operator()() const {
             REQUIRE_MESSAGE(Position < TaskCount, "Wrong structure configuration.");
-            if (exception_mask & (1 << Position)) { ThrowTestException(); }
+            if (exception_mask & (1 << Position)) {
+                ThrowTestException();
+            }
         }
     };
 
     static void run_validate_and_reset() {
         // Checks all permutations of the exception handling mask for the current tasks count
-        for (exception_mask = 1; exception_mask < (std::size_t(1) << TaskCount); ++exception_mask) {
+        for( exception_mask = 1; exception_mask < (std::size_t(1) << TaskCount); ++exception_mask ) {
             ResetEhGlobals();
             TRY();
-            parallel_invoke_call<TaskCount, functor>::perform();
+                parallel_invoke_call<TaskCount, functor>::perform();
             CATCH();
             ASSERT_EXCEPTION();
         }
     }
-
 private:
-    static std::uint64_t
-            exception_mask;// each bit represents whether the function should throw exception or not
+    static std::uint64_t exception_mask; // each bit represents whether the function should throw exception or not
 };
 
-template <std::size_t TaskCount>
+template<std::size_t TaskCount>
 std::uint64_t exception_handling_test_case<TaskCount>::exception_mask(0);
 
 //! Testing exception hangling
 //! \brief \ref requirement \ref error_guessing
 TEST_CASE("Test exception hangling") {
-    for (auto concurrency_level : utils::concurrency_range()) {
+    for ( auto concurrency_level : utils::concurrency_range() ) {
         if (concurrency_level < 2) continue;
-        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism,
-                                            concurrency_level);
+        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism, concurrency_level);
 
         exception_handling_test_case<2>::run_validate_and_reset();
         exception_handling_test_case<3>::run_validate_and_reset();
@@ -165,36 +166,37 @@ void function_to_cancel() {
 }
 
 // The function is used to test cancellation
-void simple_test_nothrow() { ++g_CurExecuted; }
+void simple_test_nothrow (){
+    ++g_CurExecuted;
+}
 
 std::size_t g_numFunctions, g_functionToCancel;
 
 struct ParInvokeLauncher {
-    oneapi::tbb::task_group_context& my_ctx;
+    oneapi::tbb::task_group_context &my_ctx;
 
     void operator()() const {
-        void (*func_array[10])(void);
-        for (int i = 0; i <= 9; ++i) func_array[i] = &simple_test_nothrow;
+        void(*func_array[10])(void);
+        for (int i = 0; i <=9; ++i)
+            func_array[i] = &simple_test_nothrow;
         func_array[g_functionToCancel] = &function_to_cancel;
 
         oneapi::tbb::parallel_invoke(func_array[0], func_array[1], func_array[2], func_array[3],
-                                     func_array[4], func_array[5], func_array[6], func_array[7],
-                                     func_array[8], func_array[9], my_ctx);
+            func_array[4], func_array[5], func_array[6], func_array[7], func_array[8], func_array[9], my_ctx);
     }
 
-    ParInvokeLauncher(oneapi::tbb::task_group_context& ctx) : my_ctx(ctx) {}
+    ParInvokeLauncher ( oneapi::tbb::task_group_context& ctx ) : my_ctx(ctx) {}
 };
 
 //! Testing cancellation
 //! \brief \ref requirement \ref error_guessing
 TEST_CASE("Test cancellation") {
-    for (auto concurrency_level : utils::concurrency_range()) {
+    for ( auto concurrency_level : utils::concurrency_range() ) {
         if (concurrency_level < 2) continue;
-        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism,
-                                            concurrency_level);
+        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism, concurrency_level);
 
-        for (int n = 2; n <= 10; ++n) {
-            for (int m = 0; m <= n - 1; ++m) {
+        for ( int n = 2; n <= 10; ++n ) {
+            for ( int m = 0; m <= n - 1; ++m ) {
                 g_numFunctions = n;
                 g_functionToCancel = m;
                 ResetEhGlobals();
diff --git a/external/tbb/test/conformance/conformance_parallel_pipeline.cpp b/external/tbb/test/conformance/conformance_parallel_pipeline.cpp
index dab494de..1e67e17c 100644
--- a/external/tbb/test/conformance/conformance_parallel_pipeline.cpp
+++ b/external/tbb/test/conformance/conformance_parallel_pipeline.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2020-2021 Intel Corporation
+    Copyright (c) 2020-2023 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -14,20 +14,21 @@
     limitations under the License.
 */
 
-#include "common/checktype.h"
-#include "common/spin_barrier.h"
 #include "common/test.h"
 #include "common/utils.h"
+#include "common/checktype.h"
+#include "common/spin_barrier.h"
 #include "common/utils_concurrency_limit.h"
+#include "common/test_invoke.h"
 
-#include "oneapi/tbb/global_control.h"
 #include "oneapi/tbb/parallel_pipeline.h"
+#include "oneapi/tbb/global_control.h"
 #include "oneapi/tbb/task_group.h"
 
 #include <atomic>
-#include <memory>
-#include <string.h>
 #include <thread>
+#include <string.h>
+#include <memory>
 #include <tuple>
 
 //! \file conformance_parallel_pipeline.cpp
@@ -37,13 +38,13 @@ constexpr std::size_t n_tokens = 8;
 
 constexpr int max_counter = 1024;
 
-static std::atomic<int> input_counter {max_counter};
+static std::atomic<int> input_counter{ max_counter };
 
-template <typename U>
+template<typename U>
 class input_filter {
 public:
-    U operator()(oneapi::tbb::flow_control& control) const {
-        if (--input_counter < 0) {
+    U operator()( oneapi::tbb::flow_control& control ) const {
+        if( --input_counter < 0 ) {
             control.stop();
             input_counter = max_counter;
         }
@@ -51,38 +52,38 @@ class input_filter {
     }
 };
 
-template <typename T, typename U>
+template<typename T, typename U>
 class middle_filter {
 public:
     U operator()(T) const {
-        U out {};
+        U out{};
         return out;
     }
 };
 
-template <typename T>
+template<typename T>
 class output_filter {
 public:
-    void operator()(T) const {}
+    void operator()(T ) const {}
 };
 
-static const oneapi::tbb::filter_mode filter_table[]
-        = {oneapi::tbb::filter_mode::parallel, oneapi::tbb::filter_mode::serial_in_order,
-           oneapi::tbb::filter_mode::serial_out_of_order};
+static const oneapi::tbb::filter_mode filter_table[] = { oneapi::tbb::filter_mode::parallel,
+                                                 oneapi::tbb::filter_mode::serial_in_order,
+                                                 oneapi::tbb::filter_mode::serial_out_of_order};
 
-template <typename Body, typename... Cotnext>
+template<typename Body, typename... Cotnext>
 void TestSingleFilter(Body body, Cotnext&... context) {
 
-    for (int i = 0; i < 3; i++) {
+    for(int i =0; i <3; i++)
+    {
         oneapi::tbb::filter_mode mode = filter_table[i];
 
-        oneapi::tbb::filter<void, void> one_filter(mode, body);
-        oneapi::tbb::parallel_pipeline(n_tokens, one_filter, context...);
+        oneapi::tbb::filter<void, void> one_filter( mode, body );
+        oneapi::tbb::parallel_pipeline( n_tokens, one_filter, context...   );
 
-        oneapi::tbb::parallel_pipeline(n_tokens, oneapi::tbb::filter<void, void>(mode, body), context...);
+        oneapi::tbb::parallel_pipeline( n_tokens, oneapi::tbb::filter<void, void>(mode, body), context... );
 
-        oneapi::tbb::parallel_pipeline(n_tokens, oneapi::tbb::make_filter<void, void>(mode, body),
-                                       context...);
+        oneapi::tbb::parallel_pipeline( n_tokens, oneapi::tbb::make_filter<void, void>(mode, body), context...);
     }
 }
 
@@ -93,117 +94,132 @@ void TestSingleFilterFunctor() {
     TestSingleFilter(i_filter);
 
     oneapi::tbb::task_group_context context;
-    TestSingleFilter(i_filter, context);
+    TestSingleFilter(i_filter,  context);
 }
 
+
 void TestSingleFilterLambda() {
 
-    TestSingleFilter([](oneapi::tbb::flow_control& control) {
-        if (input_counter-- == 0) {
-            control.stop();
-            input_counter = max_counter;
-        }
-    });
+
+    TestSingleFilter([]( oneapi::tbb::flow_control& control ) {
+                    if(input_counter-- == 0 ) {
+                        control.stop();
+                        input_counter = max_counter;
+                        }
+                    } );
 
     oneapi::tbb::task_group_context context;
-    TestSingleFilter(
-            [](oneapi::tbb::flow_control& control) {
-                if (input_counter-- == 0) {
-                    control.stop();
-                    input_counter = max_counter;
-                }
-            },
-            context);
+    TestSingleFilter([]( oneapi::tbb::flow_control& control ) {
+                     if(input_counter-- == 0 ) {
+                        control.stop();
+                        input_counter = max_counter;
+                        }
+                    },  context);
 }
 
-template <typename I, typename O>
-void RunPipeline(const oneapi::tbb::filter<I, O>& filter) {
-    bool flag {false};
+template<typename I, typename O>
+void RunPipeline(const oneapi::tbb::filter<I, O> &filter)
+{
+    bool flag{false};
 
     auto f_beg = oneapi::tbb::make_filter<void, I>(oneapi::tbb::filter_mode::serial_out_of_order,
-                                                   [&flag](oneapi::tbb::flow_control& fc) -> I {
-                                                       if (flag) { fc.stop(); }
-                                                       flag = true;
-                                                       return I();
-                                                   });
+                                        [&flag](oneapi::tbb::flow_control& fc) -> I{
+                                            if(flag) {
+                                                fc.stop();
+                                            }
+                                            flag = true;
+                                            return I();
+                                        });
 
-    auto f_end = oneapi::tbb::make_filter<O, void>(oneapi::tbb::filter_mode::serial_in_order, [](O) {});
+    auto f_end = oneapi::tbb::make_filter<O, void>(oneapi::tbb::filter_mode::serial_in_order,
+                                            [](O) {});
 
     oneapi::tbb::parallel_pipeline(n_tokens, f_beg & filter & f_end);
 }
 
-void RunPipeline(const oneapi::tbb::filter<void, void>& filter) {
+void RunPipeline(const oneapi::tbb::filter<void, void> &filter)
+{
     oneapi::tbb::parallel_pipeline(n_tokens, filter);
 }
 
-template <typename Iterator1, typename Iterator2>
-void RootSequence(Iterator1 first, Iterator1 last, Iterator2 res) {
+template<typename Iterator1, typename Iterator2>
+void RootSequence( Iterator1 first, Iterator1 last, Iterator2 res) {
     using ValueType = typename Iterator1::value_type;
-    oneapi::tbb::parallel_pipeline(
-            n_tokens, oneapi::tbb::make_filter<void, ValueType>(
-                              oneapi::tbb::filter_mode::serial_in_order,
-                              [&first, &last](oneapi::tbb::flow_control& fc) -> ValueType {
-                                  if (first < last) {
-                                      ValueType val = *first;
-                                      ++first;
-                                      return val;
-                                  } else {
-                                      fc.stop();
-                                      return ValueType {};
-                                  }
-                              })
-                              & oneapi::tbb::make_filter<ValueType, ValueType>(
-                                      oneapi::tbb::filter_mode::parallel, [](ValueType p) { return p * p; })
-                              & oneapi::tbb::make_filter<ValueType, void>(
-                                      oneapi::tbb::filter_mode::serial_in_order, [&res](ValueType x) {
-                                          *res = x;
-                                          ++res;
-                                      }));
+    oneapi::tbb::parallel_pipeline( n_tokens,
+        oneapi::tbb::make_filter<void,ValueType>(
+            oneapi::tbb::filter_mode::serial_in_order,
+            [&first, &last](oneapi::tbb::flow_control& fc)-> ValueType{
+                if( first<last ) {
+                    ValueType val  = *first;
+                    ++first;
+                    return val;
+                 } else {
+                    fc.stop();
+                    return ValueType{};
+                }
+            }
+        ) &
+        oneapi::tbb::make_filter<ValueType,ValueType>(
+            oneapi::tbb::filter_mode::parallel,
+            [](ValueType p){return p*p;}
+        ) &
+        oneapi::tbb::make_filter<ValueType,void>(
+            oneapi::tbb::filter_mode::serial_in_order,
+            [&res](ValueType x) {
+                *res = x;
+                ++res; }
+        )
+    );
 }
 
 //! Testing pipeline correctness
 //! \brief \ref interface \ref requirement
-TEST_CASE("Testing pipeline correctness") {
+TEST_CASE("Testing pipeline correctness")
+{
     std::vector<double> input(max_counter);
     std::vector<double> output(max_counter);
-    for (std::size_t i = 0; i < max_counter; i++) input[i] = (double) i;
+    for(std::size_t i = 0; i < max_counter; i++)
+        input[i] = (double)i;
 
     RootSequence(input.cbegin(), input.cend(), output.begin());
-    for (int i = 0; i < max_counter; i++) {
-        CHECK_MESSAGE(output[i] == input[i] * input[i], "pipeline result is incorrect");
+    for(int  i = 0; i < max_counter; i++) {
+        CHECK_MESSAGE(output[i] == input[i]*input[i], "pipeline result is incorrect");
     }
 }
 
 //! Testing pipeline with single filter
 //! \brief \ref interface \ref requirement
-TEST_CASE("Testing pipeline with single filter") {
+TEST_CASE("Testing pipeline with single filter")
+{
     TestSingleFilterFunctor();
     TestSingleFilterLambda();
 }
 
 //! Testing single filter with different ways of creation
 //! \brief \ref interface \ref requirement
-TEST_CASE_TEMPLATE("Filter creation testing", T, std::tuple<size_t, int>, std::tuple<int, double>,
-                   std::tuple<unsigned int*, size_t>, std::tuple<unsigned short, unsigned short*>,
-                   std::tuple<double*, unsigned short*>,
-                   std::tuple<std::unique_ptr<int>, std::unique_ptr<int>>) {
+TEST_CASE_TEMPLATE("Filter creation testing", T, std::tuple<size_t, int>,
+                                                 std::tuple<int, double>,
+                                                 std::tuple<unsigned int*, size_t>,
+                                                 std::tuple<unsigned short, unsigned short*>,
+                                                 std::tuple<double*, unsigned short*>,
+                                                 std::tuple<std::unique_ptr<int>, std::unique_ptr<int> >)
+{
     using I = typename std::tuple_element<0, T>::type;
     using O = typename std::tuple_element<1, T>::type;
-    for (int i = 0; i < 3; i++) {
+    for(int i = 0; i < 3; i++)
+    {
         oneapi::tbb::filter_mode mode = filter_table[i];
         oneapi::tbb::filter<I, O> default_filter;
 
-        auto made_filter1 = oneapi::tbb::make_filter<I, O>(mode, [](I) -> O { return O(); });
-        static_assert(std::is_same<oneapi::tbb::filter<I, O>, decltype(made_filter1)>::value,
-                      "make_filter wrong result type");
+        auto made_filter1 = oneapi::tbb::make_filter<I,O>(mode, [](I)->O{return O();});
+        static_assert(std::is_same<oneapi::tbb::filter<I, O>, decltype(made_filter1)>::value, "make_filter wrong result type");
         RunPipeline(made_filter1);
 
-        auto made_filter2 = oneapi::tbb::make_filter(mode, [](I) -> O { return O(); });
-        static_assert(std::is_same<oneapi::tbb::filter<I, O>, decltype(made_filter2)>::value,
-                      "make_filter wrong result type");
+        auto made_filter2 = oneapi::tbb::make_filter(mode, [](I)->O{return O();});
+        static_assert(std::is_same<oneapi::tbb::filter<I, O>, decltype(made_filter2)>::value, "make_filter wrong result type");
         RunPipeline(made_filter2);
 
-        oneapi::tbb::filter<I, O> one_filter(mode, [](I) -> O { return O(); });
+        oneapi::tbb::filter<I, O> one_filter(mode, [](I)->O{return O();});
         RunPipeline(one_filter);
 
         oneapi::tbb::filter<I, O> copy_filter(one_filter);
@@ -217,27 +233,29 @@ TEST_CASE_TEMPLATE("Filter creation testing", T, std::tuple<size_t, int>, std::t
 
 //! Testing filters concatenation
 //! \brief \ref interface \ref requirement
-TEST_CASE_TEMPLATE("Testing filters concatenation", T, std::tuple<size_t, int>, std::tuple<int, double>,
-                   std::tuple<unsigned int*, size_t>, std::tuple<unsigned short, unsigned short*>,
-                   std::tuple<double*, unsigned short*>,
-                   std::tuple<std::unique_ptr<int>, std::unique_ptr<int>>) {
+TEST_CASE_TEMPLATE("Testing filters concatenation", T, std::tuple<size_t, int>,
+                                                       std::tuple<int, double>,
+                                                       std::tuple<unsigned int*, size_t>,
+                                                       std::tuple<unsigned short, unsigned short*>,
+                                                       std::tuple<double*, unsigned short*>,
+                                                       std::tuple<std::unique_ptr<int>, std::unique_ptr<int> >)
+{
     using I = typename std::tuple_element<0, T>::type;
     using O = typename std::tuple_element<1, T>::type;
 
-    for (int fi = 0; fi < 27; fi++) {
-        int i = fi % 3;
-        int j = (fi / 3) % 3;
-        int k = (fi / 9);
-        auto filter_chain = oneapi::tbb::filter<void, I>(filter_table[i], input_filter<I>())
-                            & oneapi::tbb::filter<I, O>(filter_table[j], middle_filter<I, O>())
-                            & oneapi::tbb::filter<O, void>(filter_table[k], output_filter<O>());
+    for(int fi = 0; fi< 27; fi++)
+    {
+        int i = fi%3;
+        int j = (fi/3)%3;
+        int k = (fi/9);
+        auto filter_chain = oneapi::tbb::filter<void, I>(filter_table[i], input_filter<I>()) &
+                            oneapi::tbb::filter<I, O>(filter_table[j], middle_filter<I,O>()) &
+                            oneapi::tbb::filter<O, void>(filter_table[k], output_filter<O>());
         RunPipeline(filter_chain);
 
-        oneapi::tbb::filter<void, I> filter1
-                = oneapi::tbb::filter<void, I>(filter_table[i], input_filter<I>());
-        oneapi::tbb::filter<I, O> filter2 = oneapi::tbb::filter<I, O>(filter_table[j], middle_filter<I, O>());
-        oneapi::tbb::filter<O, void> filter3
-                = oneapi::tbb::filter<O, void>(filter_table[k], output_filter<O>());
+        oneapi::tbb::filter<void, I> filter1 = oneapi::tbb::filter<void, I>(filter_table[i], input_filter<I>());
+        oneapi::tbb::filter<I, O> filter2 = oneapi::tbb::filter<I, O>(filter_table[j], middle_filter<I,O>());
+        oneapi::tbb::filter<O, void> filter3 = oneapi::tbb::filter<O, void>(filter_table[k], output_filter<O>());
 
         auto fitler12 = filter1 & filter2;
         auto fitler23 = filter2 & filter3;
@@ -250,50 +268,58 @@ TEST_CASE_TEMPLATE("Testing filters concatenation", T, std::tuple<size_t, int>,
 }
 
 void doWork() {
-    for (int i = 0; i < 10; ++i) utils::yield();
+    for (int i = 0; i < 10; ++i)
+        utils::yield();
 }
 
 //! Testing filter modes
 //! \brief \ref interface \ref requirement
-TEST_CASE("Testing filter modes") {
-    for (auto concurrency_level : utils::concurrency_range()) {
-        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism,
-                                            concurrency_level);
-
-        short serial_checker {0};
-        oneapi::tbb::filter<void, short> filter1(
-                oneapi::tbb::filter_mode::serial_out_of_order,
-                [&serial_checker](oneapi::tbb::flow_control& fc) {
-                    auto check_value = ++serial_checker;
-                    doWork();
-                    CHECK_MESSAGE(check_value == serial_checker, "a serial filter was executed concurrently");
-                    if (serial_checker >= (short) max_counter) { fc.stop(); }
-                    return check_value;
-                });
-
-        short serial_checker2 {0};
-        oneapi::tbb::filter<short, short> filter2(
-                oneapi::tbb::filter_mode::serial_in_order, [&serial_checker2](int) {
-                    auto check_value = ++serial_checker2;
-                    doWork();
-                    CHECK_MESSAGE(check_value == serial_checker2,
-                                  "a serial filter was executed concurrently");
-                    return check_value;
-                });
+TEST_CASE("Testing filter modes")
+{
+    for ( auto concurrency_level : utils::concurrency_range() )
+    {
+        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism, concurrency_level);
+
+        short serial_checker{0};
+        oneapi::tbb::filter<void,short> filter1(oneapi::tbb::filter_mode::serial_out_of_order,
+                                [&serial_checker](oneapi::tbb::flow_control&fc)
+                                {
+                                    auto check_value = ++serial_checker;
+                                    doWork();
+                                    CHECK_MESSAGE(check_value == serial_checker, "a serial filter was executed concurrently");
+                                    if(serial_checker>=(short)max_counter)
+                                    {
+                                        fc.stop();
+                                    }
+                                    return check_value;
+                                });
+
+        short serial_checker2{ 0 };
+        oneapi::tbb::filter<short, short> filter2(oneapi::tbb::filter_mode::serial_in_order,
+            [&serial_checker2](int)
+            {
+                auto check_value = ++serial_checker2;
+                doWork();
+                CHECK_MESSAGE(check_value == serial_checker2, "a serial filter was executed concurrently");
+                return check_value;
+            });
 
         utils::SpinBarrier spin_barrier(utils::min(concurrency_level, n_tokens), true);
-        oneapi::tbb::filter<short, int> filter3(oneapi::tbb::filter_mode::parallel,
-                                                [&spin_barrier](int value) {
-                                                    spin_barrier.wait();
-                                                    doWork();
-                                                    return value;
-                                                });
-
-        short order_checker {0};
-        oneapi::tbb::filter<int, void> filter4(
-                oneapi::tbb::filter_mode::serial_in_order, [&order_checker](int value) {
-                    CHECK_MESSAGE(++order_checker == value, "the order of message was broken");
-                });
+        oneapi::tbb::filter<short,int> filter3(oneapi::tbb::filter_mode::parallel,
+                                [&spin_barrier](int value)
+                                {
+                                    spin_barrier.wait();
+                                    doWork();
+                                    return value;
+                                });
+
+
+        short order_checker{0};
+        oneapi::tbb::filter<int,void> filter4(oneapi::tbb::filter_mode::serial_in_order,
+                                [&order_checker](int value)
+                                {
+                                    CHECK_MESSAGE(++order_checker == value, "the order of message was broken");
+                                });
 
         oneapi::tbb::parallel_pipeline(n_tokens, filter1 & filter2 & filter3 & filter4);
     }
@@ -301,39 +327,44 @@ TEST_CASE("Testing filter modes") {
 
 //! Testing max tocken number
 //! \brief \ref interface \ref requirement
-TEST_CASE("Testing max token number") {
-    for (unsigned int i = 1; i < n_tokens; i++) {
-        std::atomic<short> active_tokens {0};
-
-        oneapi::tbb::filter<void, int> filter1(
-                oneapi::tbb::filter_mode::parallel, [&active_tokens](oneapi::tbb::flow_control& fc) {
-                    ++active_tokens;
-                    doWork();
-                    CHECK_MESSAGE(active_tokens <= n_tokens, "max number of tokens is exceed");
-                    --active_tokens;
-                    if (--input_counter < 0) {
-                        fc.stop();
-                        input_counter = max_counter;
-                    }
-                    return 0;
-                });
-
-        oneapi::tbb::filter<int, int> filter2(
-                oneapi::tbb::filter_mode::parallel, [&active_tokens](int value) {
-                    ++active_tokens;
-                    doWork();
-                    CHECK_MESSAGE(active_tokens <= n_tokens, "max number of tockens is exceed");
-                    --active_tokens;
-                    return value;
-                });
-
-        oneapi::tbb::filter<int, void> filter3(
-                oneapi::tbb::filter_mode::serial_out_of_order, [&active_tokens](int) {
-                    ++active_tokens;
-                    doWork();
-                    CHECK_MESSAGE(active_tokens <= n_tokens, "max number of tockens is exceed");
-                    --active_tokens;
-                });
+TEST_CASE("Testing max token number")
+{
+    for(unsigned int i = 1; i < n_tokens; i++)
+    {
+        std::atomic<short> active_tokens{0};
+
+        oneapi::tbb::filter<void,int> filter1(oneapi::tbb::filter_mode::parallel,
+                                [&active_tokens](oneapi::tbb::flow_control&fc)
+                                {
+                                    ++active_tokens;
+                                    doWork();
+                                    CHECK_MESSAGE(active_tokens <= n_tokens, "max number of tokens is exceed");
+                                    --active_tokens;
+                                    if (--input_counter < 0) {
+                                        fc.stop();
+                                        input_counter = max_counter;
+                                    }
+                                    return 0;
+                                });
+
+        oneapi::tbb::filter<int,int> filter2(oneapi::tbb::filter_mode::parallel,
+                                [&active_tokens](int value)
+                                {
+                                    ++active_tokens;
+                                    doWork();
+                                    CHECK_MESSAGE(active_tokens <= n_tokens, "max number of tockens is exceed");
+                                    --active_tokens;
+                                    return value;
+                                });
+
+        oneapi::tbb::filter<int,void> filter3(oneapi::tbb::filter_mode::serial_out_of_order,
+                                [&active_tokens](int)
+                                {
+                                    ++active_tokens;
+                                    doWork();
+                                    CHECK_MESSAGE(active_tokens <= n_tokens, "max number of tockens is exceed");
+                                    --active_tokens;
+                                });
 
         oneapi::tbb::parallel_pipeline(i, filter1 & filter2 & filter3);
     }
@@ -341,28 +372,69 @@ TEST_CASE("Testing max token number") {
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 
+template <typename... T> struct print;
+
 //! Testing deduction guides
 //! \brief \ref interface \ref requirement
-TEST_CASE_TEMPLATE("Deduction guides testing", T, int, unsigned int, double) {
+TEST_CASE_TEMPLATE("Deduction guides testing", T, int, unsigned int, double)
+{
     input_filter<T> i_filter;
-    oneapi::tbb::filter fc1(oneapi::tbb::filter_mode::serial_in_order, i_filter);
+
+    oneapi::tbb::filter  fc1(oneapi::tbb::filter_mode::serial_in_order, i_filter);
     static_assert(std::is_same_v<decltype(fc1), oneapi::tbb::filter<void, T>>);
 
-    oneapi::tbb::filter fc2(fc1);
+    oneapi::tbb::filter fc2 (fc1);
     static_assert(std::is_same_v<decltype(fc2), oneapi::tbb::filter<void, T>>);
 
     middle_filter<T, std::size_t> m_filter;
-    oneapi::tbb::filter fc3(oneapi::tbb::filter_mode::serial_in_order, m_filter);
+    oneapi::tbb::filter  fc3(oneapi::tbb::filter_mode::serial_in_order, m_filter);
     static_assert(std::is_same_v<decltype(fc3), oneapi::tbb::filter<T, std::size_t>>);
 
-    oneapi::tbb::filter frv(oneapi::tbb::filter_mode::serial_in_order, [](int &&) -> double { return 0.0; });
-    oneapi::tbb::filter fclv(oneapi::tbb::filter_mode::serial_in_order,
-                             [](const int&) -> double { return 0.0; });
-    oneapi::tbb::filter fc(oneapi::tbb::filter_mode::serial_in_order,
-                           [](const int) -> double { return 0.0; });
+    oneapi::tbb::filter frv(oneapi::tbb::filter_mode::serial_in_order, [](int&&) -> double { return 0.0; });
+    oneapi::tbb::filter fclv(oneapi::tbb::filter_mode::serial_in_order, [](const int&) -> double { return 0.0; });
+    oneapi::tbb::filter fc(oneapi::tbb::filter_mode::serial_in_order, [](const int) -> double { return 0.0; });
 
     static_assert(std::is_same_v<decltype(frv), oneapi::tbb::filter<int, double>>);
     static_assert(std::is_same_v<decltype(fclv), oneapi::tbb::filter<int, double>>);
     static_assert(std::is_same_v<decltype(fc), oneapi::tbb::filter<int, double>>);
 }
-#endif//__TBB_CPP17_DEDUCTION_GUIDES_PRESENT
+#endif  //__TBB_CPP17_DEDUCTION_GUIDES_PRESENT
+
+#if __TBB_CPP17_INVOKE_PRESENT
+
+template <typename MiddleFilterBody, typename LastFilterBody>
+void test_pipeline_invoke_basic(const MiddleFilterBody& middle_body, const LastFilterBody& last_body) {
+    using output_filter_type = test_invoke::SmartID<std::size_t>;
+    using middle_filter_type = test_invoke::SmartID<output_filter_type>;
+
+    const std::size_t input_count = 10;
+    std::size_t signal_point = 0;
+    std::size_t counter = 0;
+
+    auto first_body = [&](oneapi::tbb::flow_control& fc) -> middle_filter_type {
+        if (++counter > input_count) {
+            fc.stop();
+        }
+        return middle_filter_type{output_filter_type{&signal_point}};
+    };
+
+    auto first_filter = oneapi::tbb::make_filter<void, middle_filter_type>(oneapi::tbb::filter_mode::serial_in_order, first_body);
+    auto middle_filter = oneapi::tbb::make_filter<middle_filter_type, output_filter_type>(oneapi::tbb::filter_mode::serial_in_order, middle_body);
+    auto last_filter = oneapi::tbb::make_filter<output_filter_type, void>(oneapi::tbb::filter_mode::serial_in_order, last_body);
+
+    oneapi::tbb::parallel_pipeline(16, first_filter & middle_filter & last_filter);
+
+    CHECK(signal_point == input_count);
+}
+
+//! Test that parallel_pipeline uses std::invoke to run the filter body
+//! \brief \ref requirement
+TEST_CASE("parallel_pipeline and std::invoke") {
+    using output_filter_type = test_invoke::SmartID<std::size_t>;
+    using middle_filter_type = test_invoke::SmartID<output_filter_type>;
+
+    test_pipeline_invoke_basic(&middle_filter_type::get_id, &output_filter_type::operate); // Pointer to non-static function as middle filter
+    test_pipeline_invoke_basic(&middle_filter_type::id, &output_filter_type::operate); // Pointer to non-static member as middle filter
+}
+
+#endif // __TBB_CPP17_INVOKE_PRESENT
diff --git a/external/tbb/test/conformance/conformance_parallel_reduce.cpp b/external/tbb/test/conformance/conformance_parallel_reduce.cpp
index 02e0dcd1..0214bfd9 100644
--- a/external/tbb/test/conformance/conformance_parallel_reduce.cpp
+++ b/external/tbb/test/conformance/conformance_parallel_reduce.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -14,10 +14,12 @@
     limitations under the License.
 */
 
-#include "common/concurrency_tracker.h"
 #include "common/parallel_reduce_common.h"
+#include "common/concurrency_tracker.h"
+#include "common/test_invoke.h"
 
 #include "../tbb/test_partitioner.h"
+#include <list>
 
 //! \file conformance_parallel_reduce.cpp
 //! \brief Test for [algorithms.parallel_reduce algorithms.parallel_deterministic_reduce] specification
@@ -25,8 +27,12 @@
 class RotOp {
 public:
     using Type = int;
-    int operator()(int x, int i) const { return (x << 1) ^ i; }
-    int join(int x, int y) const { return operator()(x, y); }
+    int operator() ( int x, int i ) const {
+        return ( x<<1 ) ^ i;
+    }
+    int join( int x, int y ) const {
+        return operator()( x, y );
+    }
 };
 
 template <class Op>
@@ -35,22 +41,75 @@ struct ReduceBody {
     result_type my_value;
 
     ReduceBody() : my_value() {}
-    ReduceBody(ReduceBody&, oneapi::tbb::split) : my_value() {}
+    ReduceBody( ReduceBody &, oneapi::tbb::split ) : my_value() {}
 
-    void operator()(const oneapi::tbb::blocked_range<int>& r) {
+    void operator() ( const oneapi::tbb::blocked_range<int>& r ) {
         utils::ConcurrencyTracker ct;
-        for (int i = r.begin(); i != r.end(); ++i) {
+        for ( int i = r.begin(); i != r.end(); ++i ) {
             Op op;
             my_value = op(my_value, i);
         }
     }
 
-    void join(const ReduceBody& y) {
+    void join( const ReduceBody& y ) {
         Op op;
         my_value = op.join(my_value, y.my_value);
     }
 };
 
+template <typename T>
+class MoveOnlyWrapper {
+public:
+    MoveOnlyWrapper() = default;
+    MoveOnlyWrapper(const T& obj) : my_obj(obj) {}
+
+    MoveOnlyWrapper(MoveOnlyWrapper&&) = default;
+    MoveOnlyWrapper& operator=(MoveOnlyWrapper&&) = default;
+
+    MoveOnlyWrapper(const MoveOnlyWrapper&) = delete;
+    MoveOnlyWrapper& operator=(const MoveOnlyWrapper&) = delete;
+
+    bool operator==(const MoveOnlyWrapper& other) const { return my_obj == other.my_obj; }
+private:
+    T my_obj;
+}; // class MoveOnlyWrapper
+
+// The container wrapper that is copyable but the copy constructor fails if the source container is non-empty
+// If such an empty container is provided as an identity into parallel reduce algorithm with rvalue-friendly body,
+// it should only call the copy constructor while broadcasting the identity element into the leafs
+// and the identity element is an empty container for the further test
+template <typename T>
+class EmptyCopyList {
+public:
+    EmptyCopyList() = default;
+
+    EmptyCopyList(EmptyCopyList&&) = default;
+    EmptyCopyList& operator=(EmptyCopyList&&) = default;
+
+    EmptyCopyList(const EmptyCopyList& other) {
+        REQUIRE_MESSAGE(other.my_list.empty(), "reduce copied non-identity list");
+    }
+    EmptyCopyList& operator=(const EmptyCopyList& other) {
+        REQUIRE_MESSAGE(other.my_list.empty(), "reduce copied non-identity list");
+        return *this;
+    }
+
+    typename std::list<T>::iterator insert(typename std::list<T>::const_iterator pos, T&& item) {
+        return my_list.insert(pos, std::move(item));
+    }
+
+    void splice(typename std::list<T>::const_iterator pos, EmptyCopyList&& other) {
+        my_list.splice(pos, std::move(other.my_list));
+    }
+
+    typename std::list<T>::const_iterator end() const { return my_list.end(); }
+
+    bool operator==(const EmptyCopyList& other) const { return my_list == other.my_list; }
+
+private:
+    std::list<T> my_list;
+}; // class EmptyCopyList
+
 template <class Partitioner>
 void TestDeterministicReductionFor() {
     const int N = 1000;
@@ -60,38 +119,37 @@ void TestDeterministicReductionFor() {
 
     BodyType benchmark_body;
     deterministic_reduce_invoker(range, benchmark_body, Partitioner());
-    for (int i = 0; i < 100; ++i) {
+    for ( int i=0; i<100; ++i ) {
         BodyType measurement_body;
         deterministic_reduce_invoker(range, measurement_body, Partitioner());
-        REQUIRE_MESSAGE(benchmark_body.my_value == measurement_body.my_value,
-                        "parallel_deterministic_reduce behaves differently from run to run");
-
-        Type lambda_measurement_result = deterministic_reduce_invoker<Type>(
-                range,
-                [](const oneapi::tbb::blocked_range<int>& br, Type value) -> Type {
-                    utils::ConcurrencyTracker ct;
-                    for (int ii = br.begin(); ii != br.end(); ++ii) {
-                        RotOp op;
-                        value = op(value, ii);
-                    }
-                    return value;
-                },
-                [](const Type& v1, const Type& v2) -> Type {
+        REQUIRE_MESSAGE( benchmark_body.my_value == measurement_body.my_value,
+        "parallel_deterministic_reduce behaves differently from run to run" );
+
+        Type lambda_measurement_result = deterministic_reduce_invoker<Type>( range,
+            [](const oneapi::tbb::blocked_range<int>& br, Type value) -> Type {
+                utils::ConcurrencyTracker ct;
+                for ( int ii = br.begin(); ii != br.end(); ++ii ) {
                     RotOp op;
-                    return op.join(v1, v2);
-                },
-                Partitioner());
-        REQUIRE_MESSAGE(benchmark_body.my_value == lambda_measurement_result,
-                        "lambda-based parallel_deterministic_reduce behaves differently from run to run");
+                    value = op(value, ii);
+                }
+                return value;
+            },
+            [](const Type& v1, const Type& v2) -> Type {
+                RotOp op;
+                return op.join(v1,v2);
+            },
+            Partitioner()
+        );
+        REQUIRE_MESSAGE( benchmark_body.my_value == lambda_measurement_result,
+            "lambda-based parallel_deterministic_reduce behaves differently from run to run" );
     }
 }
 
 //! Test that deterministic reduction returns the same result during several measurements
 //! \brief \ref requirement \ref interface
 TEST_CASE("Test deterministic reduce correctness") {
-    for (auto concurrency_level : utils::concurrency_range()) {
-        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism,
-                                            concurrency_level);
+    for ( auto concurrency_level : utils::concurrency_range() ) {
+        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism, concurrency_level);
         TestDeterministicReductionFor<oneapi::tbb::simple_partitioner>();
         TestDeterministicReductionFor<oneapi::tbb::static_partitioner>();
         TestDeterministicReductionFor<utils_default_partitioner>();
@@ -102,9 +160,8 @@ TEST_CASE("Test deterministic reduce correctness") {
 //! \brief \ref requirement \ref interface
 TEST_CASE("Test partitioners interaction with various ranges") {
     using namespace test_partitioner_utils::interaction_with_range_and_partitioner;
-    for (auto concurrency_level : utils::concurrency_range()) {
-        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism,
-                                            concurrency_level);
+    for ( auto concurrency_level : utils::concurrency_range() ) {
+        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism, concurrency_level);
 
         test_partitioner_utils::SimpleReduceBody body;
         oneapi::tbb::affinity_partitioner ap;
@@ -112,26 +169,168 @@ TEST_CASE("Test partitioners interaction with various ranges") {
         parallel_reduce(Range1(/*assert_in_split*/ true, /*assert_in_proportional_split*/ false), body, ap);
         parallel_reduce(Range6(false, true), body, ap);
 
-        parallel_reduce(Range1(/*assert_in_split*/ true, /*assert_in_proportional_split*/ false), body,
-                        oneapi::tbb::static_partitioner());
+        parallel_reduce(Range1(/*assert_in_split*/ true, /*assert_in_proportional_split*/ false), body, oneapi::tbb::static_partitioner());
         parallel_reduce(Range6(false, true), body, oneapi::tbb::static_partitioner());
 
-        parallel_reduce(Range1(/*assert_in_split*/ false, /*assert_in_proportional_split*/ true), body,
-                        oneapi::tbb::simple_partitioner());
+        parallel_reduce(Range1(/*assert_in_split*/ false, /*assert_in_proportional_split*/ true), body, oneapi::tbb::simple_partitioner());
         parallel_reduce(Range6(false, true), body, oneapi::tbb::simple_partitioner());
 
-        parallel_reduce(Range1(/*assert_in_split*/ false, /*assert_in_proportional_split*/ true), body,
-                        oneapi::tbb::auto_partitioner());
+        parallel_reduce(Range1(/*assert_in_split*/ false, /*assert_in_proportional_split*/ true), body, oneapi::tbb::auto_partitioner());
         parallel_reduce(Range6(false, true), body, oneapi::tbb::auto_partitioner());
 
-        parallel_deterministic_reduce(
-                Range1(/*assert_in_split*/ true, /*assert_in_proportional_split*/ false), body,
-                oneapi::tbb::static_partitioner());
+        parallel_deterministic_reduce(Range1(/*assert_in_split*/true, /*assert_in_proportional_split*/ false), body, oneapi::tbb::static_partitioner());
         parallel_deterministic_reduce(Range6(false, true), body, oneapi::tbb::static_partitioner());
 
-        parallel_deterministic_reduce(
-                Range1(/*assert_in_split*/ false, /*assert_in_proportional_split*/ true), body,
-                oneapi::tbb::simple_partitioner());
+        parallel_deterministic_reduce(Range1(/*assert_in_split*/false, /*assert_in_proportional_split*/ true), body, oneapi::tbb::simple_partitioner());
         parallel_deterministic_reduce(Range6(false, true), body, oneapi::tbb::simple_partitioner());
     }
 }
+
+#if __TBB_CPP17_INVOKE_PRESENT
+
+template <typename Body, typename Reduction>
+void test_preduce_invoke_basic(const Body& body, const Reduction& reduction) {
+    const std::size_t iterations = 100000;
+    const std::size_t result = iterations * (iterations - 1) / 2;
+
+    test_invoke::SmartRange<test_invoke::SmartValue> range(0, iterations);
+    test_invoke::SmartValue identity(0);
+
+    CHECK(result == oneapi::tbb::parallel_reduce(range, identity, body, reduction).get());
+    CHECK(result == oneapi::tbb::parallel_reduce(range, identity, body, reduction, oneapi::tbb::simple_partitioner()).get());
+    CHECK(result == oneapi::tbb::parallel_reduce(range, identity, body, reduction, oneapi::tbb::auto_partitioner()).get());
+    CHECK(result == oneapi::tbb::parallel_reduce(range, identity, body, reduction, oneapi::tbb::static_partitioner()).get());
+    oneapi::tbb::affinity_partitioner aff;
+    CHECK(result == oneapi::tbb::parallel_reduce(range, identity, body, reduction, aff).get());
+
+    CHECK(result == oneapi::tbb::parallel_deterministic_reduce(range, identity, body, reduction).get());
+    CHECK(result == oneapi::tbb::parallel_deterministic_reduce(range, identity, body, reduction, oneapi::tbb::simple_partitioner()).get());
+    CHECK(result == oneapi::tbb::parallel_deterministic_reduce(range, identity, body, reduction, oneapi::tbb::static_partitioner()).get());
+}
+
+//! Test that parallel_reduce uses std::invoke to run the body
+//! \brief \ref interface \ref requirement
+TEST_CASE("parallel_[deterministic_]reduce and std::invoke") {
+    auto regular_reduce = [](const test_invoke::SmartRange<test_invoke::SmartValue>& range, const test_invoke::SmartValue& idx) {
+        test_invoke::SmartValue result = idx;
+        for (auto i = range.begin(); i.get() != range.end().get(); ++i) {
+            result = result + i;
+        }
+        return result;
+    };
+    auto regular_join = [](const test_invoke::SmartValue& lhs, const test_invoke::SmartValue& rhs) {
+        return lhs + rhs;
+    };
+
+    test_preduce_invoke_basic(&test_invoke::SmartRange<test_invoke::SmartValue>::reduction, &test_invoke::SmartValue::operator+);
+    test_preduce_invoke_basic(&test_invoke::SmartRange<test_invoke::SmartValue>::reduction, regular_join);
+    test_preduce_invoke_basic(regular_reduce, &test_invoke::SmartValue::operator+);
+}
+
+#endif
+
+template <typename Runner, typename... PartitionerContext>
+void test_vector_of_lists_rvalue_reduce_basic(const Runner& runner, PartitionerContext&&... args) {
+    constexpr std::size_t n_vectors = 10000;
+
+    using inner_type = MoveOnlyWrapper<int>;
+    using list_type = EmptyCopyList<inner_type>;
+    using vector_of_lists_type = std::vector<list_type>;
+
+    vector_of_lists_type vector_of_lists;
+
+    vector_of_lists.reserve(n_vectors);
+    for (std::size_t i = 0; i < n_vectors; ++i) {
+        list_type list;
+
+        list.insert(list.end(), inner_type{1});
+        list.insert(list.end(), inner_type{2});
+        list.insert(list.end(), inner_type{3});
+        list.insert(list.end(), inner_type{4});
+        list.insert(list.end(), inner_type{5});
+        vector_of_lists.emplace_back(std::move(list));
+    }
+
+    oneapi::tbb::blocked_range<std::size_t> range(0, n_vectors, n_vectors * 2);
+
+    auto reduce_body = [&](const decltype(range)& range_obj, list_type&& x) {
+        list_type new_list = std::move(x);
+
+        for (std::size_t index = range_obj.begin(); index != range_obj.end(); ++index) {
+            new_list.splice(new_list.end(), std::move(vector_of_lists[index]));
+        }
+        return new_list;
+    };
+
+    auto join_body = [&](list_type&& x, list_type&& y) {
+        list_type new_list = std::move(x);
+
+        new_list.splice(new_list.end(), std::move(y));
+        return new_list;
+    };
+
+    list_type result = runner(range, list_type{}, reduce_body, join_body, std::forward<PartitionerContext>(args)...);
+
+    list_type expected_result;
+
+    for (std::size_t i = 0; i < n_vectors; ++i) {
+        expected_result.insert(expected_result.end(), inner_type{1});
+        expected_result.insert(expected_result.end(), inner_type{2});
+        expected_result.insert(expected_result.end(), inner_type{3});
+        expected_result.insert(expected_result.end(), inner_type{4});
+        expected_result.insert(expected_result.end(), inner_type{5});
+    }
+
+    REQUIRE_MESSAGE(expected_result == result, "Incorrect reduce result");
+}
+
+struct ReduceRunner {
+    template <typename... Args>
+    auto operator()(Args&&... args) const -> decltype(oneapi::tbb::parallel_reduce(std::forward<Args>(args)...)) {
+        return oneapi::tbb::parallel_reduce(std::forward<Args>(args)...);
+    }
+};
+
+struct DeterministicReduceRunner {
+    template <typename... Args>
+    auto operator()(Args&&... args) const -> decltype(oneapi::tbb::parallel_deterministic_reduce(std::forward<Args>(args)...)) {
+        return oneapi::tbb::parallel_deterministic_reduce(std::forward<Args>(args)...);
+    }
+};
+
+void test_vector_of_lists_rvalue_reduce() {
+    ReduceRunner runner;
+    oneapi::tbb::affinity_partitioner af_partitioner;
+    oneapi::tbb::task_group_context context;
+
+    test_vector_of_lists_rvalue_reduce_basic(runner);
+    test_vector_of_lists_rvalue_reduce_basic(runner, oneapi::tbb::auto_partitioner{});
+    test_vector_of_lists_rvalue_reduce_basic(runner, oneapi::tbb::simple_partitioner{});
+    test_vector_of_lists_rvalue_reduce_basic(runner, oneapi::tbb::static_partitioner{});
+    test_vector_of_lists_rvalue_reduce_basic(runner, af_partitioner);
+
+    test_vector_of_lists_rvalue_reduce_basic(runner, context);
+    test_vector_of_lists_rvalue_reduce_basic(runner, oneapi::tbb::auto_partitioner{}, context);
+    test_vector_of_lists_rvalue_reduce_basic(runner, oneapi::tbb::simple_partitioner{}, context);
+    test_vector_of_lists_rvalue_reduce_basic(runner, oneapi::tbb::static_partitioner{}, context);
+    test_vector_of_lists_rvalue_reduce_basic(runner, af_partitioner, context);
+}
+
+void test_vector_of_lists_rvalue_deterministic_reduce() {
+    DeterministicReduceRunner runner;
+    oneapi::tbb::task_group_context context;
+
+    test_vector_of_lists_rvalue_reduce_basic(runner);
+    test_vector_of_lists_rvalue_reduce_basic(runner, oneapi::tbb::simple_partitioner{});
+    test_vector_of_lists_rvalue_reduce_basic(runner, oneapi::tbb::static_partitioner{});
+
+    test_vector_of_lists_rvalue_reduce_basic(runner, context);
+    test_vector_of_lists_rvalue_reduce_basic(runner, oneapi::tbb::simple_partitioner{}, context);
+    test_vector_of_lists_rvalue_reduce_basic(runner, oneapi::tbb::static_partitioner{}, context);
+}
+
+//! \brief \ref interface \ref requirement
+TEST_CASE("test rvalue optimization") {
+    test_vector_of_lists_rvalue_reduce();
+    test_vector_of_lists_rvalue_deterministic_reduce();
+}
diff --git a/external/tbb/test/conformance/conformance_parallel_scan.cpp b/external/tbb/test/conformance/conformance_parallel_scan.cpp
index 33ae5b55..5876746b 100644
--- a/external/tbb/test/conformance/conformance_parallel_scan.cpp
+++ b/external/tbb/test/conformance/conformance_parallel_scan.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2020-2021 Intel Corporation
+    Copyright (c) 2020-2023 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -15,11 +15,12 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
 #endif
 
 #define DOCTEST_CONFIG_SUPER_FAST_ASSERTS
 #include "common/test.h"
+#include "common/test_invoke.h"
 
 #include "oneapi/tbb/parallel_scan.h"
 
@@ -30,69 +31,69 @@
 
 constexpr std::size_t size = 1000;
 
-template <typename T, typename Op>
+template<typename T, typename Op>
 class Body {
     const T identity;
     T sum;
     std::vector<T>& y;
     const std::vector<T>& z;
-
 public:
-    Body(const std::vector<T>& z_, std::vector<T>& y_, T id) : identity(id), sum(id), y(y_), z(z_) {}
+    Body( const std::vector<T>& z_, std::vector<T>& y_, T id ) : identity(id), sum(id), y(y_), z(z_) {}
     T get_sum() const { return sum; }
 
-    template <typename Tag>
-    void operator()(const oneapi::tbb::blocked_range<std::size_t>& r, Tag) {
+    template<typename Tag>
+    void operator()( const oneapi::tbb::blocked_range<std::size_t>& r, Tag ) {
         T temp = sum;
-        for (std::size_t i = r.begin(); i < r.end(); ++i) {
+        for(std::size_t i=r.begin(); i<r.end(); ++i ) {
             temp = Op()(temp, z[i]);
-            if (Tag::is_final_scan()) y[i] = temp;
+            if( Tag::is_final_scan() )
+                y[i] = temp;
         }
         sum = temp;
     }
-    Body(Body& b, oneapi::tbb::split) : identity(b.identity), sum(b.identity), y(b.y), z(b.z) {}
-    void reverse_join(Body& a) { sum = Op()(a.sum, sum); }
-    void assign(Body& b) { sum = b.sum; }
+    Body( Body& b, oneapi::tbb::split ): identity(b.identity), sum(b.identity), y(b.y), z(b.z) {}
+    void reverse_join( Body& a ) { sum = Op()(a.sum, sum); }
+    void assign( Body& b ) { sum = b.sum; }
 };
 
-class default_partitioner_tag {};
+class default_partitioner_tag{};
 
-template <typename Partitioner>
-struct parallel_scan_wrapper {
-    template <typename... Args>
+template<typename Partitioner>
+struct parallel_scan_wrapper{
+    template<typename... Args>
     void operator()(Args&&... args) {
-        oneapi::tbb::parallel_scan(std::forward<Args>(args)..., Partitioner());
+    oneapi::tbb::parallel_scan(std::forward<Args>(args)..., Partitioner());
     }
 };
 
-template <>
-struct parallel_scan_wrapper<default_partitioner_tag> {
-    template <typename... Args>
+template<>
+struct parallel_scan_wrapper<default_partitioner_tag>{
+    template<typename... Args>
     void operator()(Args&&... args) {
-        oneapi::tbb::parallel_scan(std::forward<Args>(args)...);
+    oneapi::tbb::parallel_scan(std::forward<Args>(args)...);
     }
 };
 
 // Test scan tag
 //! \brief \ref interface
 TEST_CASE("scan tags testing") {
-    CHECK(oneapi::tbb::pre_scan_tag::is_final_scan() == false);
-    CHECK(oneapi::tbb::final_scan_tag::is_final_scan() == true);
-    CHECK((bool) oneapi::tbb::pre_scan_tag() == false);
-    CHECK((bool) oneapi::tbb::final_scan_tag() == true);
+    CHECK(oneapi::tbb::pre_scan_tag::is_final_scan()==false);
+    CHECK(oneapi::tbb::final_scan_tag::is_final_scan()==true);
+    CHECK((bool)oneapi::tbb::pre_scan_tag()==false);
+    CHECK((bool)oneapi::tbb::final_scan_tag()==true);
 }
 
 //! Test parallel prefix sum calculation for body-based interface
 //! \brief \ref requirement \ref interface
-TEST_CASE_TEMPLATE("Test parallel scan with body", Partitioner, default_partitioner_tag,
-                   oneapi::tbb::simple_partitioner, oneapi::tbb::auto_partitioner) {
+TEST_CASE_TEMPLATE("Test parallel scan with body", Partitioner, default_partitioner_tag, oneapi::tbb::simple_partitioner, oneapi::tbb::auto_partitioner) {
     std::vector<int> input(size);
     std::vector<int> output(size);
     std::vector<int> control(size);
 
-    for (size_t i = 0; i < size; ++i) {
+    for(size_t i = 0; i < size; ++i) {
         input[i] = int(i / 2);
-        if (i) control[i] = control[i - 1] + input[i];
+        if(i)
+            control[i] = control[i-1] + input[i];
         else
             control[i] = input[i];
     }
@@ -101,32 +102,72 @@ TEST_CASE_TEMPLATE("Test parallel scan with body", Partitioner, default_partitio
     CHECK((control == output));
 }
 
+
 //! Test parallel prefix sum calculation for scan-based interface
 //! \brief \ref requirement \ref interface
-TEST_CASE_TEMPLATE("Test parallel scan with body", Partitioner, default_partitioner_tag,
-                   oneapi::tbb::simple_partitioner, oneapi::tbb::auto_partitioner) {
+TEST_CASE_TEMPLATE("Test parallel scan with body", Partitioner, default_partitioner_tag, oneapi::tbb::simple_partitioner, oneapi::tbb::auto_partitioner) {
     std::vector<std::size_t> input(size);
     std::vector<std::size_t> output(size);
     std::vector<std::size_t> control(size);
 
-    for (std::size_t i = 0; i < size; ++i) {
+    for (std::size_t i = 0; i<size; ++i) {
         input[i] = i;
-        if (i) control[i] = control[i - 1] + input[i];
+        if (i)
+            control[i] = control[i-1]+input[i];
         else
             control[i] = input[i];
     }
-    parallel_scan_wrapper<Partitioner>()(
-            oneapi::tbb::blocked_range<std::size_t>(0U, size, 1U), std::size_t(0),
-            [&](const oneapi::tbb::blocked_range<std::size_t>& r, std::size_t sum,
-                bool is_final) -> std::size_t {
-                std::size_t temp = sum;
-                for (std::size_t i = r.begin(); i < r.end(); ++i) {
-                    temp = temp + input[i];
-                    if (is_final) output[i] = temp;
-                }
-                return temp;
-            },
-            [](std::size_t a, std::size_t b) -> std::size_t { return a + b; });
+    parallel_scan_wrapper<Partitioner>()(oneapi::tbb::blocked_range<std::size_t>(0U, size, 1U), std::size_t(0),
+        [&](const oneapi::tbb::blocked_range<std::size_t>& r, std::size_t sum, bool is_final) -> std::size_t
+        {
+            std::size_t temp = sum;
+            for (std::size_t i = r.begin(); i<r.end(); ++i) {
+                temp = temp + input[i];
+                if (is_final)
+                    output[i] = temp;
+            }
+            return temp;
+        },
+        [](std::size_t a, std::size_t b) -> std::size_t
+        {
+            return a + b;
+        });
+
+    CHECK((control==output));
+}
 
-    CHECK((control == output));
+#if __TBB_CPP17_INVOKE_PRESENT
+template <typename... Args>
+void test_pscan_invoke(const std::vector<std::size_t>& desired_vector,
+                       std::vector<std::size_t>& result_vector,
+                       Args&&... args) {
+    auto result = oneapi::tbb::parallel_scan(std::forward<Args>(args)...);
+    CHECK(desired_vector == result_vector);
+    CHECK(result.get() == result_vector.back());
+
+    for (std::size_t& item : result_vector) item = 0;
 }
+
+//! Test that parallel_scan uses std::invoke to run the body
+//! \brief \ref requirement
+TEST_CASE("parallel_scan and std::invoke") {
+    const std::size_t iterations = 1000000;
+    std::vector<std::size_t> desired_vector(iterations);
+
+    for (std::size_t i = 1; i < iterations; ++i) {
+        desired_vector[i] = desired_vector[i - 1] + i;
+    }
+
+    std::vector<std::size_t> change_vector(iterations, 0);
+    test_invoke::SmartRange<test_invoke::SmartValue> range(0, iterations, change_vector);
+    test_invoke::SmartValue identity(0);
+
+    auto scan = &test_invoke::SmartRange<test_invoke::SmartValue>::scan;
+    auto combine = &test_invoke::SmartValue::operator+;
+
+    test_pscan_invoke(desired_vector, change_vector, range, identity, scan, combine);
+    test_pscan_invoke(desired_vector, change_vector, range, identity, scan, combine, oneapi::tbb::auto_partitioner());
+    test_pscan_invoke(desired_vector, change_vector, range, identity, scan, combine, oneapi::tbb::simple_partitioner());
+}
+
+#endif // __TBB_CPP17_INVOKE_PRESENT
diff --git a/external/tbb/test/conformance/conformance_parallel_sort.cpp b/external/tbb/test/conformance/conformance_parallel_sort.cpp
index 83c20e0d..923aabfb 100644
--- a/external/tbb/test/conformance/conformance_parallel_sort.cpp
+++ b/external/tbb/test/conformance/conformance_parallel_sort.cpp
@@ -17,8 +17,8 @@
 #include "common/test.h"
 #include "common/utils_concurrency_limit.h"
 
-#include "oneapi/tbb/global_control.h"
 #include "oneapi/tbb/parallel_sort.h"
+#include "oneapi/tbb/global_control.h"
 
 #include <vector>
 
@@ -29,66 +29,63 @@ const int vector_size = 10000;
 
 std::vector<int> get_random_vector() {
     std::vector<int> result(vector_size);
-    for (int i = 0; i < vector_size; ++i) result[i] = rand() % vector_size;
+    for (int i = 0; i < vector_size; ++i)
+        result[i] = rand() % vector_size;
     return result;
 }
 
 //! Iterator based range sorting test (default comparator)
 //! \brief \ref requirement \ref interface
 TEST_CASE("Iterator based range sorting test (default comparator)") {
-    for (auto concurrency_level : utils::concurrency_range()) {
-        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism,
-                                            concurrency_level);
+    for ( auto concurrency_level : utils::concurrency_range() ) {
+        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism, concurrency_level);
 
         auto test_vector = get_random_vector();
         oneapi::tbb::parallel_sort(test_vector.begin(), test_vector.end());
 
-        for (auto it = test_vector.begin(); it != test_vector.end() - 1; ++it)
-            REQUIRE_MESSAGE(*it <= *(it + 1), "Testing data not sorted");
+        for(auto it = test_vector.begin(); it != test_vector.end() - 1; ++it)
+            REQUIRE_MESSAGE(*it <= *(it+1), "Testing data not sorted");
     }
 }
 
 //! Iterator based range sorting test (greater comparator)
 //! \brief \ref requirement \ref interface
-TEST_CASE("Iterator based range sorting test (greater comparator)") {
-    for (auto concurrency_level : utils::concurrency_range()) {
-        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism,
-                                            concurrency_level);
+TEST_CASE ("Iterator based range sorting test (greater comparator)") {
+    for ( auto concurrency_level : utils::concurrency_range() ) {
+        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism, concurrency_level);
 
         auto test_vector = get_random_vector();
         oneapi::tbb::parallel_sort(test_vector.begin(), test_vector.end(), std::greater<int>());
 
-        for (auto it = test_vector.begin(); it != test_vector.end() - 1; ++it)
-            REQUIRE_MESSAGE(*it >= *(it + 1), "Testing data not sorted");
+        for(auto it = test_vector.begin(); it != test_vector.end() - 1; ++it)
+            REQUIRE_MESSAGE(*it >= *(it+1), "Testing data not sorted");
     }
 }
 
 //! Range sorting test (default comparator)
 //! \brief \ref requirement \ref interface
-TEST_CASE("Range sorting test (default comparator)") {
-    for (auto concurrency_level : utils::concurrency_range()) {
-        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism,
-                                            concurrency_level);
+TEST_CASE ("Range sorting test (default comparator)") {
+    for ( auto concurrency_level : utils::concurrency_range() ) {
+        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism, concurrency_level);
 
         auto test_vector = get_random_vector();
         oneapi::tbb::parallel_sort(test_vector);
 
-        for (auto it = test_vector.begin(); it != test_vector.end() - 1; ++it)
-            REQUIRE_MESSAGE(*it <= *(it + 1), "Testing data not sorted");
+        for(auto it = test_vector.begin(); it != test_vector.end() - 1; ++it)
+            REQUIRE_MESSAGE(*it <= *(it+1), "Testing data not sorted");
     }
 }
 
 //! Range sorting test (greater comparator)
 //! \brief \ref requirement \ref interface
-TEST_CASE("Range sorting test (greater comparator)") {
-    for (auto concurrency_level : utils::concurrency_range()) {
-        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism,
-                                            concurrency_level);
+TEST_CASE ("Range sorting test (greater comparator)") {
+    for ( auto concurrency_level : utils::concurrency_range() ) {
+        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism, concurrency_level);
 
         auto test_vector = get_random_vector();
         oneapi::tbb::parallel_sort(test_vector, std::greater<int>());
 
-        for (auto it = test_vector.begin(); it != test_vector.end() - 1; ++it)
-            REQUIRE_MESSAGE(*it >= *(it + 1), "Testing data not sorted");
+        for(auto it = test_vector.begin(); it != test_vector.end() - 1; ++it)
+            REQUIRE_MESSAGE(*it >= *(it+1), "Testing data not sorted");
     }
 }
diff --git a/external/tbb/test/conformance/conformance_priority_queue_node.cpp b/external/tbb/test/conformance/conformance_priority_queue_node.cpp
index 1a05e34c..4e014a2b 100644
--- a/external/tbb/test/conformance/conformance_priority_queue_node.cpp
+++ b/external/tbb/test/conformance/conformance_priority_queue_node.cpp
@@ -15,7 +15,7 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
 #endif
 
 #define CONFORMANCE_BUFFERING_NODES
@@ -28,33 +28,33 @@
 
 //! Test priority_queue_node single_push
 //! \brief \ref requirement
-TEST_CASE("priority_queue_node single_push") {
+TEST_CASE("priority_queue_node single_push"){
     conformance::test_forwarding_single_push<oneapi::tbb::flow::priority_queue_node<int>>();
 }
 
 //! Test function_node buffering
 //! \brief \ref requirement
-TEST_CASE("priority_queue_node buffering") {
+TEST_CASE("priority_queue_node buffering"){
     conformance::test_buffering<oneapi::tbb::flow::priority_queue_node<int>, int>();
 }
 
 //! Constructs an empty priority_queue_node that belongs to the same graph g as src.
 //! Any intermediate state of src, including its links to predecessors and successors, is not copied.
 //! \brief \ref requirement
-TEST_CASE("priority_queue_node copy constructor") {
+TEST_CASE("priority_queue_node copy constructor"){
     conformance::test_copy_ctor_for_buffering_nodes<oneapi::tbb::flow::priority_queue_node<int>>();
 }
 
 //! Test inheritance relations
 //! \brief \ref interface
-TEST_CASE("priority_queue_node superclasses") {
+TEST_CASE("priority_queue_node superclasses"){
     conformance::test_inheritance<oneapi::tbb::flow::priority_queue_node<int>, int, int>();
     conformance::test_inheritance<oneapi::tbb::flow::priority_queue_node<void*>, void*, void*>();
 }
 
 //! Test priority_queue_node node `try_put()` and `try_get()`
 //! \brief \ref requirement
-TEST_CASE("priority_queue_node methods") {
+TEST_CASE("priority_queue_node methods"){
     oneapi::tbb::flow::graph g;
 
     oneapi::tbb::flow::priority_queue_node<int, std::greater<int>> testing_node(g);
diff --git a/external/tbb/test/conformance/conformance_queue_node.cpp b/external/tbb/test/conformance/conformance_queue_node.cpp
index e9d4be45..7d4d4ecd 100644
--- a/external/tbb/test/conformance/conformance_queue_node.cpp
+++ b/external/tbb/test/conformance/conformance_queue_node.cpp
@@ -15,7 +15,7 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
 #endif
 
 #define CONFORMANCE_BUFFERING_NODES
@@ -28,39 +28,40 @@
 
 //! Test queue_node single_push
 //! \brief \ref requirement
-TEST_CASE("queue_node single_push") {
+TEST_CASE("queue_node single_push"){
     conformance::test_forwarding_single_push<oneapi::tbb::flow::queue_node<int>>();
 }
 
 //! Test function_node buffering
 //! \brief \ref requirement
-TEST_CASE("queue_node buffering") { conformance::test_buffering<oneapi::tbb::flow::queue_node<int>, int>(); }
+TEST_CASE("queue_node buffering"){
+    conformance::test_buffering<oneapi::tbb::flow::queue_node<int>, int>();
+}
 
 //! Constructs an empty queue_node that belongs to the same graph g as src.
 //! Any intermediate state of src, including its links to predecessors and successors, is not copied.
 //! \brief \ref requirement
-TEST_CASE("queue_node copy constructor") {
+TEST_CASE("queue_node copy constructor"){
     conformance::test_copy_ctor_for_buffering_nodes<oneapi::tbb::flow::queue_node<int>>();
 }
 
 //! Test inheritance relations
 //! \brief \ref interface
-TEST_CASE("queue_node superclasses") {
+TEST_CASE("queue_node superclasses"){
     conformance::test_inheritance<oneapi::tbb::flow::queue_node<int>, int, int>();
     conformance::test_inheritance<oneapi::tbb::flow::queue_node<void*>, void*, void*>();
 }
 
 //! Test queue_node node `try_put()` and `try_get()`
 //! \brief \ref requirement
-TEST_CASE("queue_node methods") {
+TEST_CASE("queue_node methods"){
     oneapi::tbb::flow::graph g;
     oneapi::tbb::flow::queue_node<int> testing_node(g);
 
     int tmp1 = -1;
     int tmp2 = -1;
 
-    CHECK_MESSAGE((!testing_node.try_get(tmp1) && tmp1 == -1),
-                  "`try_get` must returns false if there is no non-reserved item currently in the node.");
+    CHECK_MESSAGE((!testing_node.try_get(tmp1) && tmp1 == -1), "`try_get` must returns false if there is no non-reserved item currently in the node.");
 
     testing_node.try_put(1);
     testing_node.try_put(2);
diff --git a/external/tbb/test/conformance/conformance_resumable_tasks.cpp b/external/tbb/test/conformance/conformance_resumable_tasks.cpp
index 0f6c914e..70fd878d 100644
--- a/external/tbb/test/conformance/conformance_resumable_tasks.cpp
+++ b/external/tbb/test/conformance/conformance_resumable_tasks.cpp
@@ -54,7 +54,7 @@ TEST_CASE("Parallel test") {
     CHECK(!mLocal);
     mLocal = true;
     constexpr int N = 100;
-    std::atomic<int> suspend {}, resume {};
+    std::atomic<int> suspend{}, resume{};
     oneapi::tbb::task_group tg;
     for (int i = 0; i < N; ++i) {
         tg.run([&tg, &suspend, &resume] {
diff --git a/external/tbb/test/conformance/conformance_sequencer_node.cpp b/external/tbb/test/conformance/conformance_sequencer_node.cpp
index 2c7dca12..a28fa9e5 100644
--- a/external/tbb/test/conformance/conformance_sequencer_node.cpp
+++ b/external/tbb/test/conformance/conformance_sequencer_node.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2020-2021 Intel Corporation
+    Copyright (c) 2020-2023 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -15,16 +15,18 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
 #endif
 
 #define SEQUENCER_NODE
 
 #include "conformance_flowgraph.h"
+#include "common/test_invoke.h"
 
 //! \file conformance_sequencer_node.cpp
 //! \brief Test for [flow_graph.sequencer_node] specification
 
+
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 template <typename Body>
 void test_deduction_guides_common(Body body) {
@@ -47,15 +49,15 @@ void test_deduction_guides_common(Body body) {
 std::size_t sequencer_body_f(const int&) { return 1; }
 
 void test_deduction_guides() {
-    test_deduction_guides_common([](const int&) -> std::size_t { return 1; });
-    test_deduction_guides_common([](const int&) mutable -> std::size_t { return 1; });
+    test_deduction_guides_common([](const int&)->std::size_t { return 1; });
+    test_deduction_guides_common([](const int&) mutable ->std::size_t { return 1; });
     test_deduction_guides_common(sequencer_body_f);
 }
 #endif
 
 //! Test deduction guides
 //! \brief \ref interface \ref requirement
-TEST_CASE("Deduction guides") {
+TEST_CASE("Deduction guides"){
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
     test_deduction_guides();
 #endif
@@ -63,14 +65,14 @@ TEST_CASE("Deduction guides") {
 
 //! Test sequencer_node single_push
 //! \brief \ref requirement
-TEST_CASE("sequencer_node single_push") {
+TEST_CASE("sequencer_node single_push"){
     conformance::sequencer_functor<int> sequencer;
     conformance::test_forwarding_single_push<oneapi::tbb::flow::sequencer_node<int>>(sequencer);
 }
 
 //! Test function_node buffering
 //! \brief \ref requirement
-TEST_CASE("sequencer_node buffering") {
+TEST_CASE("sequencer_node buffering"){
     conformance::sequencer_functor<int> sequencer;
     conformance::test_buffering<oneapi::tbb::flow::sequencer_node<int>, int>(sequencer);
 }
@@ -78,21 +80,21 @@ TEST_CASE("sequencer_node buffering") {
 //! Constructs an empty sequencer_node that belongs to the same graph g as src.
 //! Any intermediate state of src, including its links to predecessors and successors, is not copied.
 //! \brief \ref requirement
-TEST_CASE("sequencer_node copy constructor") {
+TEST_CASE("sequencer_node copy constructor"){
     conformance::sequencer_functor<int> sequencer;
     conformance::test_copy_ctor_for_buffering_nodes<oneapi::tbb::flow::sequencer_node<int>>(sequencer);
 }
 
 //! Test inheritance relations
 //! \brief \ref interface
-TEST_CASE("sequencer_node superclasses") {
+TEST_CASE("sequencer_node superclasses"){
     conformance::test_inheritance<oneapi::tbb::flow::sequencer_node<int>, int, int>();
     conformance::test_inheritance<oneapi::tbb::flow::sequencer_node<void*>, void*, void*>();
 }
 
 //! Test the sequencer_node rejects duplicate sequencer numbers
 //! \brief \ref interface
-TEST_CASE("sequencer_node rejects duplicate") {
+TEST_CASE("sequencer_node rejects duplicate"){
     oneapi::tbb::flow::graph g;
     conformance::sequencer_functor<int> sequencer;
 
@@ -106,7 +108,7 @@ TEST_CASE("sequencer_node rejects duplicate") {
 
 //! Test queue_node node `try_put()` and `try_get()`
 //! \brief \ref requirement
-TEST_CASE("queue_node methods") {
+TEST_CASE("queue_node methods"){
     oneapi::tbb::flow::graph g;
     conformance::sequencer_functor<int> sequencer;
 
@@ -132,23 +134,22 @@ TEST_CASE("queue_node methods") {
 //! The example demonstrates ordering capabilities of the sequencer_node.
 //! While being processed in parallel, the data is passed to the successor node in the exact same order it was read.
 //! \brief \ref requirement
-TEST_CASE("sequencer_node ordering") {
+TEST_CASE("sequencer_node ordering"){
     using namespace oneapi::tbb::flow;
     using message = conformance::sequencer_functor<int>::seq_message;
     graph g;
 
     // Due to parallelism the node can push messages to its successors in any order
-    function_node<message, message> process(g, unlimited, [](message msg) {
+    function_node<message, message> process(g, unlimited, [] (message msg) {
         msg.data++;
         return msg;
     });
 
     sequencer_node<message> ordering(g, conformance::sequencer_functor<int>());
 
-    std::atomic<std::size_t> counter {0};
-    function_node<message> writer(g, tbb::flow::serial, [&](const message& msg) {
-        CHECK_MESSAGE((msg.id == counter++),
-                      "The data is passed to the successor node in the exact same order it was read");
+    std::atomic<std::size_t> counter{0};
+    function_node<message> writer(g, tbb::flow::serial, [&] (const message& msg) {
+        CHECK_MESSAGE((msg.id == counter++), "The data is passed to the successor node in the exact same order it was read");
     });
 
     tbb::flow::make_edge(process, ordering);
@@ -161,3 +162,53 @@ TEST_CASE("sequencer_node ordering") {
 
     g.wait_for_all();
 }
+
+#if __TBB_CPP17_INVOKE_PRESENT
+//! Test that sequencer node uses std::invoke to execute the body
+//! \brief \ref requirement
+TEST_CASE("sequencer_node and std::invoke") {
+    using namespace oneapi::tbb::flow;
+
+    graph g;
+
+    function_node<std::size_t, test_invoke::SmartID<std::size_t>> starter(g, unlimited, [](std::size_t x) { return test_invoke::SmartID(x); });
+    sequencer_node<test_invoke::SmartID<std::size_t>> seq1(g, &test_invoke::SmartID<std::size_t>::get_id); // Member function
+    sequencer_node<test_invoke::SmartID<std::size_t>> seq2(g, &test_invoke::SmartID<std::size_t>::id); // Member object
+
+    std::size_t expected_item = 0;
+
+    function_node<test_invoke::SmartID<std::size_t>, std::size_t> check(g, serial, [&](const test_invoke::SmartID<std::size_t>& x) {
+        CHECK(x.id == expected_item);
+        ++expected_item;
+        return x.id;
+    });
+
+    // Build the first graph
+    make_edge(starter, seq1);
+    make_edge(seq1, check);
+
+    std::size_t objects_count = 10;
+    for (std::size_t i = 0; i < objects_count; ++i) {
+        starter.try_put(objects_count - i - 1);
+    }
+
+    g.wait_for_all();
+
+    CHECK(expected_item == objects_count);
+
+    // Rebuild the graph
+    g.reset(reset_flags::rf_clear_edges);
+    make_edge(starter, seq2);
+    make_edge(seq2, check);
+    expected_item = 0;
+
+    for (std::size_t i = 0; i < objects_count; ++i) {
+        starter.try_put(objects_count - i - 1);
+    }
+
+    g.wait_for_all();
+
+    CHECK(expected_item == objects_count);
+}
+
+#endif // __TBB_CPP17_INVOKE_PRESENT
diff --git a/external/tbb/test/conformance/conformance_split_node.cpp b/external/tbb/test/conformance/conformance_split_node.cpp
index fa2cff53..83bb57f8 100644
--- a/external/tbb/test/conformance/conformance_split_node.cpp
+++ b/external/tbb/test/conformance/conformance_split_node.cpp
@@ -15,7 +15,7 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
 #endif
 
 #include "conformance_flowgraph.h"
@@ -23,8 +23,7 @@
 //! \file conformance_split_node.cpp
 //! \brief Test for [flow_graph.split_node] specification
 
-using input_msg = conformance::message</*default_ctor*/ true, /*copy_ctor*/ true,
-                                       /*copy_assign*/ true /*enable for queue_node successor*/>;
+using input_msg = conformance::message</*default_ctor*/true, /*copy_ctor*/true, /*copy_assign*/true/*enable for queue_node successor*/>;
 using my_input_tuple = std::tuple<int, float, input_msg>;
 using my_split_type = oneapi::tbb::flow::split_node<my_input_tuple>;
 
@@ -35,9 +34,9 @@ TEST_CASE("split_node buffering") {
 
     my_split_type testing_node(g);
 
-    oneapi::tbb::flow::limiter_node<int> rejecter1(g, 0);
-    oneapi::tbb::flow::limiter_node<float> rejecter2(g, 0);
-    oneapi::tbb::flow::limiter_node<input_msg> rejecter3(g, 0);
+    oneapi::tbb::flow::limiter_node<int> rejecter1(g,0);
+    oneapi::tbb::flow::limiter_node<float> rejecter2(g,0);
+    oneapi::tbb::flow::limiter_node<input_msg> rejecter3(g,0);
 
     oneapi::tbb::flow::make_edge(oneapi::tbb::flow::output_port<0>(testing_node), rejecter1);
     oneapi::tbb::flow::make_edge(oneapi::tbb::flow::output_port<1>(testing_node), rejecter2);
@@ -50,17 +49,17 @@ TEST_CASE("split_node buffering") {
     int tmp1 = -1;
     float tmp2 = -1;
     input_msg tmp3(-1);
-    CHECK_MESSAGE((oneapi::tbb::flow::output_port<0>(testing_node).try_get(tmp1) == false && tmp1 == -1),
-                  "Value should be discarded after rejection");
-    CHECK_MESSAGE((oneapi::tbb::flow::output_port<1>(testing_node).try_get(tmp2) == false && tmp2 == -1.f),
-                  "Value should be discarded after rejection");
-    CHECK_MESSAGE((oneapi::tbb::flow::output_port<2>(testing_node).try_get(tmp3) == false && tmp3 == -1),
-                  "Value should be discarded after rejection");
+    CHECK_MESSAGE((oneapi::tbb::flow::output_port<0>(testing_node).try_get(tmp1) == false 
+                    && tmp1 == -1), "Value should be discarded after rejection");
+    CHECK_MESSAGE((oneapi::tbb::flow::output_port<1>(testing_node).try_get(tmp2) == false 
+                    && tmp2 == -1.f), "Value should be discarded after rejection");
+    CHECK_MESSAGE((oneapi::tbb::flow::output_port<2>(testing_node).try_get(tmp3) == false 
+                    && tmp3 == -1), "Value should be discarded after rejection");
 }
 
 //! Test node broadcast messages to successors and splitting them in correct order
 //! \brief \ref requirement
-TEST_CASE("split_node broadcast and splitting") {
+TEST_CASE("split_node broadcast and splitting"){
     using namespace oneapi::tbb::flow;
     oneapi::tbb::flow::graph g;
 
@@ -92,10 +91,10 @@ TEST_CASE("split_node broadcast and splitting") {
 //! The node that is constructed has a reference to the same graph object as src.
 //! The predecessors and successors of src are not copied.
 //! \brief \ref interface
-TEST_CASE("split_node copy constructor") {
+TEST_CASE("split_node copy constructor"){
     oneapi::tbb::flow::graph g;
-    oneapi::tbb::flow::continue_node<std::tuple<int>> node0(
-            g, [](oneapi::tbb::flow::continue_msg) { return std::tuple<int>(1); });
+    oneapi::tbb::flow::continue_node<std::tuple<int>> node0( g,
+                                [](oneapi::tbb::flow::continue_msg) { return std::tuple<int>(1); } );
 
     oneapi::tbb::flow::split_node<std::tuple<int>> node1(g);
     conformance::test_push_receiver<int> node2(g);
@@ -111,23 +110,19 @@ TEST_CASE("split_node copy constructor") {
     node_copy.try_put(std::tuple<int>(1));
     g.wait_for_all();
 
-    CHECK_MESSAGE((conformance::get_values(node2).size() == 0 && conformance::get_values(node3).size() == 1),
-                  "Copied node doesn`t copy successor");
+    CHECK_MESSAGE((conformance::get_values(node2).size() == 0 && conformance::get_values(node3).size() == 1), "Copied node doesn`t copy successor");
 
     node0.try_put(oneapi::tbb::flow::continue_msg());
     g.wait_for_all();
 
-    CHECK_MESSAGE((conformance::get_values(node2).size() == 1 && conformance::get_values(node3).size() == 0),
-                  "Copied node doesn`t copy predecessor");
+    CHECK_MESSAGE((conformance::get_values(node2).size() == 1 && conformance::get_values(node3).size() == 0), "Copied node doesn`t copy predecessor");
 }
 
 //! Test copy constructor
 //! \brief \ref interface
 TEST_CASE("split_node superclasses") {
-    CHECK_MESSAGE((std::is_base_of<oneapi::tbb::flow::graph_node, my_split_type>::value),
-                  "split_node should be derived from graph_node");
-    CHECK_MESSAGE((std::is_base_of<oneapi::tbb::flow::receiver<my_input_tuple>, my_split_type>::value),
-                  "split_node should be derived from receiver<T>");
+    CHECK_MESSAGE((std::is_base_of<oneapi::tbb::flow::graph_node, my_split_type>::value), "split_node should be derived from graph_node");
+    CHECK_MESSAGE((std::is_base_of<oneapi::tbb::flow::receiver<my_input_tuple>, my_split_type>::value), "split_node should be derived from receiver<T>");
 }
 
 //! Test split_node output_ports() returns a tuple of output ports.
@@ -136,6 +131,6 @@ TEST_CASE("split_node output_ports") {
     oneapi::tbb::flow::graph g;
     my_split_type node(g);
 
-    CHECK_MESSAGE((std::is_same<my_split_type::output_ports_type&, decltype(node.output_ports())>::value),
-                  "split_node output_ports should returns a tuple of output ports");
+    CHECK_MESSAGE((std::is_same<my_split_type::output_ports_type&,
+        decltype(node.output_ports())>::value), "split_node output_ports should returns a tuple of output ports");
 }
diff --git a/external/tbb/test/conformance/conformance_task_arena.cpp b/external/tbb/test/conformance/conformance_task_arena.cpp
index 0391aeae..c4b4cef2 100644
--- a/external/tbb/test/conformance/conformance_task_arena.cpp
+++ b/external/tbb/test/conformance/conformance_task_arena.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -17,10 +17,10 @@
 #include "common/test.h"
 #include "common/utils.h"
 
-#include "oneapi/tbb/enumerable_thread_specific.h"
-#include "oneapi/tbb/parallel_for.h"
 #include "oneapi/tbb/task_arena.h"
 #include "oneapi/tbb/task_scheduler_observer.h"
+#include "oneapi/tbb/enumerable_thread_specific.h"
+#include "oneapi/tbb/parallel_for.h"
 
 //! \file conformance_task_arena.cpp
 //! \brief Test for [scheduler.task_arena scheduler.task_scheduler_observer] specification
@@ -29,17 +29,15 @@
 //! Test for uninitilized arena
 //! \brief \ref requirement \ref interface
 TEST_CASE("Test current_thread_index") {
-    REQUIRE_MESSAGE((tbb::this_task_arena::current_thread_index() == tbb::task_arena::not_initialized),
-                    "TBB was initialized state");
+    REQUIRE_MESSAGE((tbb::this_task_arena::current_thread_index() == tbb::task_arena::not_initialized), "TBB was initialized state");
 }
 
 //! Test task arena interfaces
 //! \brief \ref requirement \ref interface
 TEST_CASE("Arena interfaces") {
     //! Initialization interfaces
-    oneapi::tbb::task_arena a(1, 1);
-    a.initialize();
-    std::atomic<bool> done {false};
+    oneapi::tbb::task_arena a(1,1); a.initialize();
+    std::atomic<bool> done{ false };
     //! Enqueue interface
     a.enqueue([&done] {
         CHECK(oneapi::tbb::this_task_arena::max_concurrency() == 2);
@@ -50,10 +48,14 @@ TEST_CASE("Arena interfaces") {
         //! oneapi::tbb::this_task_arena interfaces
         CHECK(oneapi::tbb::this_task_arena::current_thread_index() >= 0);
         //! Attach interface
-        oneapi::tbb::task_arena attached_arena {oneapi::tbb::task_arena::attach()};
+        oneapi::tbb::task_arena attached_arena{oneapi::tbb::task_arena::attach()};
         CHECK(attached_arena.is_active());
+        oneapi::tbb::task_arena attached_arena2{oneapi::tbb::attach()};
+        CHECK(attached_arena2.is_active());
     });
-    while (!done) { utils::yield(); }
+    while (!done) {
+        utils::yield();
+    }
     //! Terminate interface
     a.terminate();
 }
@@ -68,36 +70,44 @@ TEST_CASE("Task isolation") {
         ets.local() = i;
         // Run the second parallel loop in an isolated region to prevent the current thread
         // from taking tasks related to the outer parallel loop.
-        oneapi::tbb::this_task_arena::isolate(
-                [&] { oneapi::tbb::parallel_for(0, N2, utils::DummyBody(10)); });
+        oneapi::tbb::this_task_arena::isolate([&]{
+            oneapi::tbb::parallel_for(0, N2, utils::DummyBody(10));
+        });
         REQUIRE(ets.local() == i);
     });
 }
 
-class conformance_observer : public oneapi::tbb::task_scheduler_observer {
+class conformance_observer: public oneapi::tbb::task_scheduler_observer {
 public:
-    std::atomic<bool> is_entry_called {false};
-    std::atomic<bool> is_exit_called {false};
+    std::atomic<bool> is_entry_called{false};
+    std::atomic<bool> is_exit_called{false};
+
+    conformance_observer( oneapi::tbb::task_arena &a ) : oneapi::tbb::task_scheduler_observer(a) {
+        observe(true); // activate the observer
+    }
 
-    conformance_observer(oneapi::tbb::task_arena &a) : oneapi::tbb::task_scheduler_observer(a) {
-        observe(true);// activate the observer
+    ~conformance_observer() {
+        observe(false);
     }
 
-    void on_scheduler_entry(bool) override { is_entry_called.store(true, std::memory_order_relaxed); }
+    void on_scheduler_entry(bool) override {
+        is_entry_called.store(true, std::memory_order_relaxed);
+    }
 
-    void on_scheduler_exit(bool) override { is_exit_called.store(true, std::memory_order_relaxed); }
+    void on_scheduler_exit(bool) override {
+        is_exit_called.store(true, std::memory_order_relaxed);
+    }
 
     bool is_callbacks_called() {
         return is_entry_called.load(std::memory_order_relaxed)
-               && is_exit_called.load(std::memory_order_relaxed);
+            && is_exit_called.load(std::memory_order_relaxed);
     }
 };
 
 //! Test task arena observer interfaces
 //! \brief \ref requirement \ref interface
 TEST_CASE("Task arena observer") {
-    oneapi::tbb::task_arena a;
-    a.initialize();
+    oneapi::tbb::task_arena a; a.initialize();
     conformance_observer observer(a);
     a.execute([&] {
         oneapi::tbb::parallel_for(0, 100, utils::DummyBody(10), oneapi::tbb::simple_partitioner());
@@ -114,3 +124,110 @@ TEST_CASE("Task arena copy constructor") {
     REQUIRE(arena.max_concurrency() == copy.max_concurrency());
     REQUIRE(arena.is_active() == copy.is_active());
 }
+
+
+//! Basic test for arena::enqueue with task handle
+//! \brief \ref interface \ref requirement
+TEST_CASE("enqueue task_handle") {
+    oneapi::tbb::task_arena arena;
+    oneapi::tbb::task_group tg;
+
+    //This flag is intentionally made non-atomic for Thread Sanitizer
+    //to raise a flag if implementation of task_group is incorrect
+    bool run{false};
+
+    auto task_handle = tg.defer([&]{ run = true; });
+
+    arena.enqueue(std::move(task_handle));
+    tg.wait();
+
+    CHECK(run == true);
+}
+
+//! Basic test for this_task_arena::enqueue with task handle
+//! \brief \ref interface \ref requirement
+TEST_CASE("this_task_arena::enqueue task_handle") {
+    oneapi::tbb::task_arena arena;
+    oneapi::tbb::task_group tg;
+
+    //This flag is intentionally made non-atomic for Thread Sanitizer
+    //to raise a flag if implementation of task_group is incorrect
+    bool run{false};
+
+    arena.execute([&]{
+        auto task_handle = tg.defer([&]{ run = true; });
+
+        oneapi::tbb::this_task_arena::enqueue(std::move(task_handle));
+    });
+
+    tg.wait();
+
+    CHECK(run == true);
+}
+
+//TODO: Add
+//! Basic test for this_task_arena::enqueue with functor
+
+//! Test case for the common use-case of prolonging task_group lifetime
+//! \brief \ref interface \ref requirement
+TEST_CASE("this_task_arena::enqueue prolonging task_group") {
+    oneapi::tbb::task_arena arena;
+    oneapi::tbb::task_group tg;
+
+    //This flag is intentionally made non-atomic for Thread Sanitizer
+    //to raise a flag if implementation of task_group is incorrect
+    bool run{false};
+
+    //block the task_group to wait on it
+    auto task_handle = tg.defer([]{});
+
+    arena.execute([&]{
+        oneapi::tbb::this_task_arena::enqueue([&]{
+            run = true;
+            //release the task_group
+            task_handle = oneapi::tbb::task_handle{};
+        });
+    });
+
+    tg.wait();
+
+    CHECK(run == true);
+}
+
+#if TBB_USE_EXCEPTIONS
+//! Basic test for exceptions in task_arena::enqueue with task_handle
+//! \brief \ref interface \ref requirement
+TEST_CASE("task_arena::enqueue(task_handle) exception propagation"){
+    oneapi::tbb::task_group tg;
+    oneapi::tbb::task_arena arena;
+
+    oneapi::tbb::task_handle h = tg.defer([&]{
+        volatile bool suppress_unreachable_code_warning = true;
+        if (suppress_unreachable_code_warning) {
+            throw std::runtime_error{ "" };
+        }
+    });
+
+    arena.enqueue(std::move(h));
+
+    CHECK_THROWS_AS(tg.wait(), std::runtime_error);
+}
+
+//! Basic test for exceptions in this_task_arena::enqueue with task_handle
+//! \brief \ref interface \ref requirement
+TEST_CASE("this_task_arena::enqueue(task_handle) exception propagation"){
+    oneapi::tbb::task_group tg;
+
+    oneapi::tbb::task_handle h = tg.defer([&]{
+        volatile bool suppress_unreachable_code_warning = true;
+        if (suppress_unreachable_code_warning) {
+            throw std::runtime_error{ "" };
+        }
+    });
+
+    oneapi::tbb::this_task_arena::enqueue(std::move(h));
+
+    CHECK_THROWS_AS(tg.wait(), std::runtime_error);
+}
+
+#endif // TBB_USE_EXCEPTIONS
diff --git a/external/tbb/test/conformance/conformance_task_group.cpp b/external/tbb/test/conformance/conformance_task_group.cpp
new file mode 100644
index 00000000..ef2ac39d
--- /dev/null
+++ b/external/tbb/test/conformance/conformance_task_group.cpp
@@ -0,0 +1,283 @@
+/*
+    Copyright (c) 2021-2022 Intel Corporation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#include "oneapi/tbb/task_group.h"
+#include "oneapi/tbb/task_arena.h"
+#include "common/test.h"
+#include "common/utils.h"
+
+#include "common/spin_barrier.h"
+
+#include <type_traits>
+#include "oneapi/tbb/global_control.h"
+
+
+//! \file conformance_task_group.cpp
+//! \brief Test for [scheduler.task_group] specification
+
+//! Test checks that for lost task handle
+//! \brief \ref requirement
+TEST_CASE("Task handle created but not run"){
+    {
+        oneapi::tbb::task_group tg;
+
+        //This flag is intentionally made non-atomic for Thread Sanitizer
+        //to raise a flag if implementation of task_group is incorrect
+        bool run {false};
+
+        auto h = tg.defer([&]{
+            run = true;
+        });
+        CHECK_MESSAGE(run == false, "delayed task should not be run until run(task_handle) is called");
+    }
+}
+
+//! Basic test for task handle
+//! \brief \ref interface \ref requirement
+TEST_CASE("Task handle run"){
+    oneapi::tbb::task_handle h;
+
+    oneapi::tbb::task_group tg;
+    //This flag is intentionally made non-atomic for Thread Sanitizer
+    //to raise a flag if implementation of task_group is incorrect
+    bool run {false};
+
+    h = tg.defer([&]{
+        run = true;
+    });
+    CHECK_MESSAGE(run == false, "delayed task should not be run until run(task_handle) is called");
+    tg.run(std::move(h));
+    tg.wait();
+    CHECK_MESSAGE(run == true, "Delayed task should be completed when task_group::wait exits");
+
+    CHECK_MESSAGE(h == nullptr, "Delayed task can be executed only once");
+}
+
+//! Basic test for task handle
+//! \brief \ref interface \ref requirement
+TEST_CASE("Task handle run_and_wait"){
+    oneapi::tbb::task_handle h;
+
+    oneapi::tbb::task_group tg;
+    //This flag is intentionally made non-atomic for Thread Sanitizer
+    //to raise a flag if implementation of task_group is incorrect
+    bool run {false};
+
+    h = tg.defer([&]{
+        run = true;
+    });
+    CHECK_MESSAGE(run == false, "delayed task should not be run until run(task_handle) is called");
+    tg.run_and_wait(std::move(h));
+    CHECK_MESSAGE(run == true, "Delayed task should be completed when task_group::wait exits");
+
+    CHECK_MESSAGE(h == nullptr, "Delayed task can be executed only once");
+}
+
+//! Test for empty check
+//! \brief \ref interface
+TEST_CASE("Task handle empty check"){
+    oneapi::tbb::task_group tg;
+
+    oneapi::tbb::task_handle h;
+
+    bool empty = (h == nullptr);
+    CHECK_MESSAGE(empty, "default constructed task_handle should be empty");
+
+    h = tg.defer([]{});
+
+    CHECK_MESSAGE(h != nullptr, "delayed task returned by task_group::delayed should not be empty");
+}
+
+//! Test for comparison operations
+//! \brief \ref interface
+TEST_CASE("Task handle comparison/empty checks"){
+    oneapi::tbb::task_group tg;
+
+    oneapi::tbb::task_handle h;
+
+    bool empty =  ! static_cast<bool>(h);
+    CHECK_MESSAGE(empty, "default constructed task_handle should be empty");
+    CHECK_MESSAGE(h == nullptr, "default constructed task_handle should be empty");
+    CHECK_MESSAGE(nullptr == h, "default constructed task_handle should be empty");
+
+    h = tg.defer([]{});
+
+    CHECK_MESSAGE(h != nullptr, "deferred task returned by task_group::defer() should not be empty");
+    CHECK_MESSAGE(nullptr != h, "deferred task returned by task_group::defer() should not be empty");
+
+}
+
+//! Test for task_handle being non copyable
+//! \brief \ref interface
+TEST_CASE("Task handle being non copyable"){
+    static_assert(
+              (!std::is_copy_constructible<oneapi::tbb::task_handle>::value)
+            &&(!std::is_copy_assignable<oneapi::tbb::task_handle>::value),
+            "oneapi::tbb::task_handle should be non copyable");
+}
+//! Test that task_handle prolongs task_group::wait
+//! \brief \ref requirement
+TEST_CASE("Task handle blocks wait"){
+    //Forbid creation of worker threads to ensure that task described by the task_handle is not run until wait is called
+    oneapi::tbb::global_control s(oneapi::tbb::global_control::max_allowed_parallelism, 1);
+    oneapi::tbb::task_group tg;
+    //explicit task_arena is needed to prevent a deadlock,
+    //as both task_group::run() and task_group::wait() should be called in the same arena
+    //to guarantee execution of the task spawned by run().
+    oneapi::tbb::task_arena arena;
+
+    //This flag is intentionally made non-atomic for Thread Sanitizer
+    //to raise a flag if implementation of task_group is incorrect
+    bool completed  {false};
+    std::atomic<bool> start_wait {false};
+    std::atomic<bool> thread_started{false};
+
+    oneapi::tbb::task_handle h = tg.defer([&]{
+        completed = true;
+    });
+
+    std::thread wait_thread {[&]{
+        CHECK_MESSAGE(completed == false, "Deferred task should not be run until run(task_handle) is called");
+
+        thread_started = true;
+        utils::SpinWaitUntilEq(start_wait, true);
+        arena.execute([&]{
+            tg.wait();
+            CHECK_MESSAGE(completed == true, "Deferred task should be completed when task_group::wait exits");
+        });
+    }};
+
+    utils::SpinWaitUntilEq(thread_started, true);
+    CHECK_MESSAGE(completed == false, "Deferred task should not be run until run(task_handle) is called");
+
+    arena.execute([&]{
+        tg.run(std::move(h));
+    });
+    CHECK_MESSAGE(completed == false, "Deferred task should not be run until run(task_handle) and wait is called");
+    start_wait = true;
+    wait_thread.join();
+}
+
+#if TBB_USE_EXCEPTIONS
+//! The test for exception handling in task_handle
+//! \brief \ref requirement
+TEST_CASE("Task handle exception propagation"){
+    oneapi::tbb::task_group tg;
+
+    oneapi::tbb::task_handle h = tg.defer([&]{
+        volatile bool suppress_unreachable_code_warning = true;
+        if (suppress_unreachable_code_warning) {
+            throw std::runtime_error{ "" };
+        }
+    });
+
+    tg.run(std::move(h));
+
+    CHECK_THROWS_AS(tg.wait(), std::runtime_error);
+}
+#endif // TBB_USE_EXCEPTIONS
+
+//TODO: move to some common place to share with unit tests
+namespace accept_task_group_context {
+
+struct SelfRunner {
+    tbb::task_group& m_tg;
+    std::atomic<unsigned>& count;
+    void operator()() const {
+        unsigned previous_count = count.fetch_sub(1);
+        if (previous_count > 1)
+            m_tg.run( *this );
+    }
+};
+
+template <typename TaskGroup, typename CancelF, typename WaitF>
+void run_cancellation_use_case(CancelF&& cancel, WaitF&& wait) {
+    std::atomic<bool> outer_cancelled{false};
+    std::atomic<unsigned> count{13};
+
+    tbb::task_group_context inner_ctx(tbb::task_group_context::isolated);
+    TaskGroup inner_tg(inner_ctx);
+
+    tbb::task_group outer_tg;
+    auto outer_tg_task = [&] {
+        inner_tg.run([&] {
+            utils::SpinWaitUntilEq(outer_cancelled, true);
+            inner_tg.run( SelfRunner{inner_tg, count} );
+        });
+
+        utils::try_call([&] {
+            std::forward<CancelF>(cancel)(outer_tg);
+        }).on_completion([&] {
+            outer_cancelled = true;
+        });
+    };
+
+    auto check = [&] {
+        tbb::task_group_status outer_status = tbb::task_group_status::not_complete;
+        outer_status = std::forward<WaitF>(wait)(outer_tg);
+        CHECK_MESSAGE(
+            outer_status == tbb::task_group_status::canceled,
+            "Outer task group should have been cancelled."
+        );
+
+        tbb::task_group_status inner_status = inner_tg.wait();
+        CHECK_MESSAGE(
+            inner_status == tbb::task_group_status::complete,
+            "Inner task group should have completed despite the cancellation of the outer one."
+        );
+
+        CHECK_MESSAGE(0 == count, "Some of the inner group tasks were not executed.");
+    };
+
+    outer_tg.run(outer_tg_task);
+    check();
+}
+
+template <typename TaskGroup>
+void test() {
+    run_cancellation_use_case<TaskGroup>(
+        [](tbb::task_group& outer) { outer.cancel(); },
+        [](tbb::task_group& outer) { return outer.wait(); }
+    );
+
+#if TBB_USE_EXCEPTIONS
+    run_cancellation_use_case<TaskGroup>(
+        [](tbb::task_group& /*outer*/) {
+            volatile bool suppress_unreachable_code_warning = true;
+            if (suppress_unreachable_code_warning) {
+                throw int();
+            }
+        },
+        [](tbb::task_group& outer) {
+            try {
+                outer.wait();
+                return tbb::task_group_status::complete;
+            } catch(const int&) {
+                return tbb::task_group_status::canceled;
+            }
+        }
+    );
+#endif
+}
+
+} // namespace accept_task_group_context
+
+//! Respect task_group_context passed from outside
+//! \brief \ref interface \ref requirement
+TEST_CASE("Respect task_group_context passed from outside") {
+    accept_task_group_context::test<tbb::task_group>();
+}
+
diff --git a/external/tbb/test/conformance/conformance_task_group_context.cpp b/external/tbb/test/conformance/conformance_task_group_context.cpp
index 7155798a..49fbc9b9 100644
--- a/external/tbb/test/conformance/conformance_task_group_context.cpp
+++ b/external/tbb/test/conformance/conformance_task_group_context.cpp
@@ -30,14 +30,12 @@ TEST_CASE("Test construction") {
         utils::suppress_unused_warning(ctx);
     }
     {
-        oneapi::tbb::task_group_context ctx {oneapi::tbb::task_group_context::bound};
+        oneapi::tbb::task_group_context ctx{ oneapi::tbb::task_group_context::bound };
         utils::suppress_unused_warning(ctx);
     }
     {
-        oneapi::tbb::task_group_context ctx {oneapi::tbb::task_group_context::isolated,
-                                             oneapi::tbb::task_group_context::default_traits
-                                                     | oneapi::tbb::task_group_context::fp_settings
-                                                     | oneapi::tbb::task_group_context::concurrent_wait};
+        oneapi::tbb::task_group_context ctx{ oneapi::tbb::task_group_context::isolated
+            , oneapi::tbb::task_group_context::default_traits | oneapi::tbb::task_group_context::fp_settings | oneapi::tbb::task_group_context::concurrent_wait };
         utils::suppress_unused_warning(ctx);
     }
 }
@@ -45,8 +43,7 @@ TEST_CASE("Test construction") {
 //! Test methods
 //! \brief \ref interface \ref requirement
 TEST_CASE("Test methods") {
-    oneapi::tbb::task_group_context ctx {oneapi::tbb::task_group_context::bound,
-                                         oneapi::tbb::task_group_context::default_traits};
+    oneapi::tbb::task_group_context ctx{ oneapi::tbb::task_group_context::bound, oneapi::tbb::task_group_context::default_traits };
     ctx.capture_fp_settings();
     CHECK_FALSE(ctx.is_group_execution_cancelled());
     CHECK(ctx.cancel_group_execution());
@@ -55,3 +52,5 @@ TEST_CASE("Test methods") {
     CHECK_FALSE(ctx.is_group_execution_cancelled());
     ctx.traits();
 }
+
+//TODO: add test for task_group_context(task_group_context*)
diff --git a/external/tbb/test/conformance/conformance_tick_count.cpp b/external/tbb/test/conformance/conformance_tick_count.cpp
index 556dd5ec..d9a3028c 100644
--- a/external/tbb/test/conformance/conformance_tick_count.cpp
+++ b/external/tbb/test/conformance/conformance_tick_count.cpp
@@ -17,8 +17,8 @@
 #include "common/test.h"
 #include "common/utils.h"
 
-#include "oneapi/tbb/detail/_template_helpers.h"
 #include "oneapi/tbb/tick_count.h"
+#include "oneapi/tbb/detail/_template_helpers.h"
 #include <type_traits>
 
 //! \file conformance_tick_count.cpp
@@ -45,13 +45,15 @@ TEST_CASE("Subtraction of equal tick_counts") {
 TEST_CASE("Subtraction subsequent timestamp") {
     oneapi::tbb::tick_count tick_f(oneapi::tbb::tick_count::now());
     oneapi::tbb::tick_count tick_s(oneapi::tbb::tick_count::now());
-    while ((tick_s - tick_f).seconds() == 0) { tick_s = oneapi::tbb::tick_count::now(); }
+    while ((tick_s - tick_f).seconds() == 0) {
+        tick_s = oneapi::tbb::tick_count::now();
+    }
     CHECK_GT((tick_s - tick_f).seconds(), 0);
 }
 
 // Wait for given duration.
 // The duration parameter is in units of seconds.
-static void WaitForDuration(double duration) {
+static void WaitForDuration( double duration ) {
     CHECK_GT(duration, 0);
     oneapi::tbb::tick_count start = oneapi::tbb::tick_count::now();
     double sec = 0;
@@ -62,9 +64,9 @@ static void WaitForDuration(double duration) {
 }
 
 // CHECK that two times in seconds are very close.
-void CheckNear(double x, double y) {
-    CHECK_GE(x - y, -1.0E-10);
-    CHECK_GE(1.0E-10, x - y);
+void CheckNear( double x, double y ) {
+    CHECK_GE(x-y, -1.0E-10);
+    CHECK_GE(1.0E-10, x-y);
 }
 
 //! Test arithmetic operators on tick_count::interval_t
@@ -95,6 +97,7 @@ TEST_CASE("Arithmetic operators") {
     CheckNear(sum.seconds(), 0.0);
 }
 
+
 //! Test resolution of oneapi::tbb::tick_count::interval_t
 //! \brief \ref interface \ref requirement
 TEST_CASE("oneapi::tbb::tick_count::interval_t resolution") {
diff --git a/external/tbb/test/conformance/conformance_version.cpp b/external/tbb/test/conformance/conformance_version.cpp
index 5a104102..eaf6d3c0 100644
--- a/external/tbb/test/conformance/conformance_version.cpp
+++ b/external/tbb/test/conformance/conformance_version.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2020-2021 Intel Corporation
+    Copyright (c) 2020-2025 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -25,28 +25,28 @@
 //! Testing the match of compile-time oneTBB specification version
 //! \brief \ref requirement \ref interface
 TEST_CASE("Test specification version") {
-    const char* expected = "1.0";
-    REQUIRE_MESSAGE(std::strcmp(expected, ONETBB_SPEC_VERSION) == 0,
-                    "Expected and actual specification versions do not match.");
+    int expected = 104;
+    REQUIRE_MESSAGE(ONETBB_SPEC_VERSION == expected,
+        "Expected and actual specification versions do not match.");
 }
 
 //! Testing the match of compile-time and runtime interface versions
 //! \brief \ref requirement \ref interface
 TEST_CASE("Test interface version") {
-    REQUIRE_MESSAGE(TBB_runtime_interface_version() == TBB_INTERFACE_VERSION,
-                    "Running with the library of different version than the test was compiled against.");
+    REQUIRE_MESSAGE(TBB_runtime_interface_version()==TBB_INTERFACE_VERSION,
+        "Running with the library of different version than the test was compiled against.");
 }
 
 //! Testing the match of compile-time and runtime version strings
 //! \brief \ref requirement \ref interface
 TEST_CASE("Test version string") {
-    REQUIRE_MESSAGE(std::strcmp(TBB_runtime_version(), TBB_VERSION_STRING) == 0,
-                    "Running with the library of different version than the test was compiled against.");
+    REQUIRE_MESSAGE(std::strcmp( TBB_runtime_version(), TBB_VERSION_STRING )==0,
+        "Running with the library of different version than the test was compiled against.");
 }
 
 //! Testing interface macros
 //! \brief \ref requirement
 TEST_CASE("Test interface version") {
     REQUIRE(TBB_INTERFACE_VERSION / 1000 == TBB_INTERFACE_VERSION_MAJOR);
-    REQUIRE(TBB_INTERFACE_VERSION % 100 / 10 == TBB_INTERFACE_VERSION_MINOR);
+    REQUIRE(TBB_INTERFACE_VERSION % 1000 / 10 == TBB_INTERFACE_VERSION_MINOR);
 }
diff --git a/external/tbb/test/conformance/conformance_write_once_node.cpp b/external/tbb/test/conformance/conformance_write_once_node.cpp
index 53a8cb75..f21b4b0b 100644
--- a/external/tbb/test/conformance/conformance_write_once_node.cpp
+++ b/external/tbb/test/conformance/conformance_write_once_node.cpp
@@ -15,7 +15,7 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
 #endif
 
 #define CONFORMANCE_BUFFERING_NODES
@@ -28,45 +28,44 @@
 
 //! Test function_node broadcast
 //! \brief \ref requirement
-TEST_CASE("write_once_node broadcast") {
+TEST_CASE("write_once_node broadcast"){
     conformance::test_forwarding<oneapi::tbb::flow::write_once_node<int>, int>(1);
 }
 
 //! Test write_once_node buffering
 //! \brief \ref requirement
-TEST_CASE("write_once_node buffering") {
+TEST_CASE("write_once_node buffering"){
     conformance::test_buffering<oneapi::tbb::flow::write_once_node<int>, int>();
 }
 
-//! The node that is constructed has a reference to the same graph object as src,with an invalid internal buffer item.
+//! The node that is constructed has a reference to the same graph object as src,with an invalid internal buffer item. 
 //! The buffered value and list of successors are not copied from src.
 //! \brief \ref requirement
-TEST_CASE("write_once_node copy constructor") {
+TEST_CASE("write_once_node copy constructor"){
     conformance::test_copy_ctor_for_buffering_nodes<oneapi::tbb::flow::write_once_node<int>>();
 }
 
 //! Test inheritance relations
 //! \brief \ref interface
-TEST_CASE("write_once_node superclasses") {
+TEST_CASE("write_once_node superclasses"){
     conformance::test_inheritance<oneapi::tbb::flow::write_once_node<int>, int, int>();
     conformance::test_inheritance<oneapi::tbb::flow::write_once_node<void*>, void*, void*>();
 }
 
 //! Test overwrite_node node constructor
 //! \brief \ref requirement
-TEST_CASE("write_once_node constructor") {
+TEST_CASE("write_once_node constructor"){
     oneapi::tbb::flow::graph g;
     oneapi::tbb::flow::overwrite_node<int> testing_node(g);
 
     int tmp = -1;
     CHECK_MESSAGE((!testing_node.is_valid()), "Constructed node has invalid internal buffer item");
-    CHECK_MESSAGE((!testing_node.try_get(tmp)),
-                  "Gets from the node are non-destructive, but the first `try_get' fails");
+    CHECK_MESSAGE((!testing_node.try_get(tmp)), "Gets from the node are non-destructive, but the first `try_get' fails");
 }
 
 //! Test write_once_node node `is_valid()` and `clear()`
 //! \brief \ref requirement
-TEST_CASE("write_once_node methods") {
+TEST_CASE("write_once_node methods"){
     oneapi::tbb::flow::graph g;
     oneapi::tbb::flow::write_once_node<int> testing_node(g);
 
@@ -84,6 +83,6 @@ TEST_CASE("write_once_node methods") {
 //! The following test shows the possibility to connect the node to a reserving join_node,
 //! avoiding direct calls to the try_get() method from the body of the successor node
 //! \brief \ref requirement
-TEST_CASE("write_once_node with reserving join_node as successor") {
+TEST_CASE("write_once_node with reserving join_node as successor"){
     conformance::test_with_reserving_join_node_class<oneapi::tbb::flow::write_once_node<int>>();
 }
diff --git a/external/tbb/test/tbb/test_adaptive_mutex.cpp b/external/tbb/test/tbb/test_adaptive_mutex.cpp
index c5a6a991..9fceb4c7 100644
--- a/external/tbb/test/tbb/test_adaptive_mutex.cpp
+++ b/external/tbb/test/tbb/test_adaptive_mutex.cpp
@@ -17,7 +17,7 @@
 #define TBB_PREVIEW_MUTEXES 1
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
 #endif
 
 #include "../conformance/conformance_mutex.h"
@@ -30,10 +30,14 @@
 //! \brief Test for [preview] functionality
 
 //! \brief \ref error_guessing
-TEST_CASE("test upgrade/downgrade with rw_mutex") { test_rwm_upgrade_downgrade<tbb::rw_mutex>(); }
+TEST_CASE("test upgrade/downgrade with rw_mutex") {
+    test_rwm_upgrade_downgrade<tbb::rw_mutex>();
+}
 
 //! \brief \ref error_guessing
-TEST_CASE("test mutex with native threads") { test_with_native_threads::test<tbb::mutex>(); }
+TEST_CASE("test mutex with native threads") {
+    test_with_native_threads::test<tbb::mutex>();
+}
 
 //! \brief \ref error_guessing
 TEST_CASE("test rw_mutex with native threads") {
@@ -68,9 +72,9 @@ TEST_CASE("Shared mutexes (reader/writer) test") {
 //! Compatibility with the standard
 //! \brief \ref interface \ref requirement
 TEST_CASE("ISO interface test") {
-    GeneralTest<TBB_MutexFromISO_Mutex<oneapi::tbb::mutex>>("ISO Adaprive Mutex");
+    GeneralTest<TBB_MutexFromISO_Mutex<oneapi::tbb::mutex> >("ISO Adaprive Mutex");
     GeneralTest<TBB_MutexFromISO_Mutex<oneapi::tbb::rw_mutex>>("ISO Adaptive RW Mutex");
-    TestTryAcquire<TBB_MutexFromISO_Mutex<oneapi::tbb::mutex>>("ISO Adaptive  Mutex");
+    TestTryAcquire<TBB_MutexFromISO_Mutex<oneapi::tbb::mutex> >("ISO Adaptive  Mutex");
     TestTryAcquire<TBB_MutexFromISO_Mutex<oneapi::tbb::rw_mutex>>("ISO Adaptive RW Mutex");
     TestTryAcquireReader<TBB_MutexFromISO_Mutex<oneapi::tbb::rw_mutex>>("ISO Adaptive RW Mutex");
     TestReaderWriterLock<TBB_MutexFromISO_Mutex<oneapi::tbb::rw_mutex>>("ISO Adaptive RW Mutex");
diff --git a/external/tbb/test/tbb/test_allocators.cpp b/external/tbb/test/tbb/test_allocators.cpp
index 1288fe7d..a31778db 100644
--- a/external/tbb/test/tbb/test_allocators.cpp
+++ b/external/tbb/test/tbb/test_allocators.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2025 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -14,12 +14,23 @@
     limitations under the License.
 */
 
+#include <tbb/version.h> // For __TBB_GLIBCXX_VERSION and __TBB_CPP20_PRESENT
+
+// Intel LLVM compiler triggers a deprecation warning in the implementation of std::allocator_traits::destroy
+// inside Standard Library while using STL PMR containers since std::polymorphic_allocator::destroy is deprecated since C++20
+#define TEST_LLVM_COMPILER_PMR_DESTROY_DEPRECATED_BROKEN __INTEL_LLVM_COMPILER == 20250000 && __TBB_GLIBCXX_VERSION == 110000 && __TBB_CPP20_PRESENT
+
+#if TEST_LLVM_COMPILER_PMR_DESTROY_DEPRECATED_BROKEN
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
 #include "tbb/cache_aligned_allocator.h"
 #include "tbb/tbb_allocator.h"
 
 // the real body of the test is there:
-#include "common/allocator_stl_test_common.h"
 #include "common/allocator_test_common.h"
+#include "common/allocator_stl_test_common.h"
 
 //! \file test_allocators.cpp
 //! \brief Test for [memory_allocation.cache_aligned_allocator memory_allocation.tbb_allocator memory_allocation.cache_aligned_resource] specifications
@@ -28,11 +39,11 @@
 //! Test that cache_aligned_allocate() throws bad_alloc if cannot allocate memory.
 //! \brief \ref requirement
 TEST_CASE("Test cache_aligned_allocate throws") {
-#if __APPLE__
-    // On macOS*, failure to map memory results in messages to stderr;
-    // suppress them.
-    DisableStderr disableStderr;
-#endif
+    #if __APPLE__
+        // On macOS*, failure to map memory results in messages to stderr;
+        // suppress them.
+        DisableStderr disableStderr;
+    #endif
 
     using namespace tbb::detail::r1;
 
@@ -40,11 +51,11 @@ TEST_CASE("Test cache_aligned_allocate throws") {
     // to not cause warp around in system allocator after adding object header
     // during address2 allocation.
     const size_t itemsize = 1024;
-    const size_t nitems = 1024;
-    void *address1 = NULL;
+    const size_t nitems   = 1024;
+    void *address1 = nullptr;
     try {
         address1 = cache_aligned_allocate(nitems * itemsize);
-    } catch (...) {
+    } catch(...) {
         // intentionally empty
     }
     REQUIRE_MESSAGE(address1, "cache_aligned_allocate unable to obtain 1024*1024 bytes");
@@ -52,8 +63,10 @@ TEST_CASE("Test cache_aligned_allocate throws") {
     bool exception_caught = false;
     try {
         // Try allocating more memory than left in the address space; should cause std::bad_alloc
-        (void) cache_aligned_allocate(~size_t(0) - itemsize * nitems + cache_line_size());
-    } catch (std::bad_alloc &) { exception_caught = true; } catch (...) {
+        (void)cache_aligned_allocate(~size_t(0) - itemsize * nitems + cache_line_size());
+    } catch (std::bad_alloc&) {
+        exception_caught = true;
+    } catch (...) {
         REQUIRE_MESSAGE(false, "Unexpected exception type (std::bad_alloc was expected)");
         exception_caught = true;
     }
@@ -62,9 +75,7 @@ TEST_CASE("Test cache_aligned_allocate throws") {
     try {
         cache_aligned_deallocate(address1);
     } catch (...) {
-        REQUIRE_MESSAGE(
-                false,
-                "cache_aligned_deallocate did not accept the address obtained with cache_aligned_allocate");
+        REQUIRE_MESSAGE(false, "cache_aligned_deallocate did not accept the address obtained with cache_aligned_allocate");
     }
 }
 #endif /* TBB_USE_EXCEPTIONS */
@@ -93,9 +104,13 @@ TEST_CASE("polymorphic_allocator test") {
     tbb::cache_aligned_resource aligned_resource;
     tbb::cache_aligned_resource equal_aligned_resource(std::pmr::get_default_resource());
     REQUIRE_MESSAGE(aligned_resource.is_equal(equal_aligned_resource),
-                    "Underlying upstream resources should be equal.");
+            "Underlying upstream resources should be equal.");
     REQUIRE_MESSAGE(!aligned_resource.is_equal(*std::pmr::null_memory_resource()),
-                    "Cache aligned resource upstream shouldn't be equal to the standard resource.");
+            "Cache aligned resource upstream shouldn't be equal to the standard resource.");
     TestAllocatorWithSTL(std::pmr::polymorphic_allocator<void>(&aligned_resource));
 }
 #endif
+
+#if TEST_LLVM_COMPILER_PMR_DESTROY_DEPRECATED_BROKEN
+#pragma clang diagnostic pop // "-Wdeprecated-declarations"
+#endif
diff --git a/external/tbb/test/tbb/test_arena_constraints.cpp b/external/tbb/test/tbb/test_arena_constraints.cpp
index b3d3a419..846bf0fc 100644
--- a/external/tbb/test/tbb/test_arena_constraints.cpp
+++ b/external/tbb/test/tbb/test_arena_constraints.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2019-2021 Intel Corporation
+    Copyright (c) 2019-2023 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -21,28 +21,13 @@
 
 #include "tbb/parallel_for.h"
 
-#if __TBB_HWLOC_VALID_ENVIRONMENT
-#if __HYBRID_CPUS_TESTING
-//! Testing NUMA topology traversal correctness
-//! \brief \ref interface \ref requirement
-TEST_CASE("Test core types topology traversal correctness") {
-    system_info::initialize();
-    std::vector<index_info> core_types_info = system_info::get_cpu_kinds_info();
-    std::vector<tbb::core_type_id> core_types = tbb::info::core_types();
-
-    REQUIRE_MESSAGE(core_types_info.size() == core_types.size(), "Wrong core types number detected.");
-    for (unsigned i = 0; i < core_types.size(); ++i) {
-        REQUIRE_MESSAGE(core_types[i] == core_types_info[i].index, "Wrong core type index detected.");
-    }
-}
-#endif /*__HYBRID_CPUS_TESTING*/
-
+#if __TBB_HWLOC_VALID_ENVIRONMENT && __HWLOC_CPUBIND_PRESENT
 //! Test affinity and default_concurrency correctness for all available constraints.
 //! \brief \ref error_guessing
 TEST_CASE("Test affinity and default_concurrency correctness for all available constraints.") {
     system_info::initialize();
-    for (const auto& constraints : generate_constraints_variety()) {
-        tbb::task_arena ta {constraints};
+    for (const auto& constraints: generate_constraints_variety()) {
+        tbb::task_arena ta{constraints};
         test_constraints_affinity_and_concurrency(constraints, get_arena_affinity(ta));
     }
 }
@@ -50,18 +35,18 @@ TEST_CASE("Test affinity and default_concurrency correctness for all available c
 bool is_observer_created(const tbb::task_arena::constraints& c) {
     std::vector<tbb::core_type_id> core_types = tbb::info::core_types();
     std::vector<tbb::numa_node_id> numa_nodes = tbb::info::numa_nodes();
-    return (c.numa_id != tbb::task_arena::automatic && numa_nodes.size() > 1)
-           || (c.core_type != tbb::task_arena::automatic && core_types.size() > 1)
-           || c.max_threads_per_core != tbb::task_arena::automatic;
+    return
+        (c.numa_id != tbb::task_arena::automatic && numa_nodes.size() > 1) ||
+        (c.core_type != tbb::task_arena::automatic && core_types.size() > 1) ||
+        c.max_threads_per_core != tbb::task_arena::automatic;
 }
 
-void recursive_arena_binding(constraints_container::iterator current_pos,
-                             constraints_container::iterator end_pos) {
+void recursive_arena_binding(constraints_container::iterator current_pos, constraints_container::iterator end_pos) {
     system_info::affinity_mask affinity_before = system_info::allocate_current_affinity_mask();
 
     if (current_pos != end_pos) {
         auto constraints = *current_pos;
-        tbb::task_arena current_level_arena {constraints};
+        tbb::task_arena current_level_arena{constraints};
 
         if (is_observer_created(constraints)) {
             system_info::affinity_mask affinity = get_arena_affinity(current_level_arena);
@@ -69,12 +54,15 @@ void recursive_arena_binding(constraints_container::iterator current_pos,
         }
 
         current_level_arena.execute(
-                [&current_pos, &end_pos]() { recursive_arena_binding(++current_pos, end_pos); });
+            [&current_pos, &end_pos]() {
+                recursive_arena_binding(++current_pos, end_pos);
+            }
+        );
     }
 
     system_info::affinity_mask affinity_after = system_info::allocate_current_affinity_mask();
     REQUIRE_MESSAGE(hwloc_bitmap_isequal(affinity_before, affinity_after),
-                    "After nested arena execution previous affinity mask was not restored.");
+        "After nested arena execution previous affinity mask was not restored.");
 }
 
 //! Testing binding correctness during passing through nested arenas
@@ -85,12 +73,13 @@ TEST_CASE("Test binding with nested arenas") {
     recursive_arena_binding(constraints_variety.begin(), constraints_variety.end());
 }
 
+
 //! Testing constraints propagation during arenas copy construction
 //! \brief \ref regression
 TEST_CASE("Test constraints propagation during arenas copy construction") {
     system_info::initialize();
-    for (const auto& constraints : generate_constraints_variety()) {
-        tbb::task_arena constructed {constraints};
+    for (const auto& constraints: generate_constraints_variety()) {
+        tbb::task_arena constructed{constraints};
 
         tbb::task_arena copied(constructed);
         system_info::affinity_mask copied_affinity = get_arena_affinity(copied);
@@ -98,7 +87,7 @@ TEST_CASE("Test constraints propagation during arenas copy construction") {
         test_constraints_affinity_and_concurrency(constraints, copied_affinity);
     }
 }
-#endif /*__TBB_HWLOC_VALID_ENVIRONMENT*/
+#endif /*__TBB_HWLOC_VALID_ENVIRONMENT && __HWLOC_CPUBIND_PRESENT */
 
 // The test cannot be stabilized with TBB malloc under Thread Sanitizer
 #if !__TBB_USE_THREAD_SANITIZER
@@ -110,26 +99,30 @@ TEST_CASE("Test memory leaks") {
 
     // To reduce the test session time only one constraints object is used inside this test.
     // This constraints should use all available settings to cover the most part of tbbbind functionality.
-    auto constraints = tbb::task_arena::constraints {}
-                               .set_numa_id(tbb::info::numa_nodes().front())
-                               .set_core_type(tbb::info::core_types().front())
-                               .set_max_threads_per_core(1);
+    auto constraints = tbb::task_arena::constraints{}
+        .set_numa_id(tbb::info::numa_nodes().front())
+        .set_core_type(tbb::info::core_types().front())
+        .set_max_threads_per_core(1);
 
     size_t current_memory_usage = 0, previous_memory_usage = 0, stability_counter = 0;
     bool no_memory_leak = false;
     for (size_t i = 0; i < num_trials; i++) {
         { /* All DTORs must be called before GetMemoryUsage() call*/
-            tbb::task_arena arena {constraints};
-            arena.execute([] {
+            tbb::task_arena arena{constraints};
+            arena.execute([]{
                 utils::SpinBarrier barrier;
                 barrier.initialize(tbb::this_task_arena::max_concurrency());
-                tbb::parallel_for(tbb::blocked_range<size_t>(0, tbb::this_task_arena::max_concurrency()),
-                                  [&barrier](const tbb::blocked_range<size_t>&) { barrier.wait(); });
+                tbb::parallel_for(
+                    tbb::blocked_range<size_t>(0, tbb::this_task_arena::max_concurrency()),
+                    [&barrier](const tbb::blocked_range<size_t>&) {
+                        barrier.wait();
+                    }
+                );
             });
         }
 
         current_memory_usage = utils::GetMemoryUsage();
-        stability_counter = current_memory_usage == previous_memory_usage ? stability_counter + 1 : 0;
+        stability_counter = current_memory_usage==previous_memory_usage ? stability_counter + 1 : 0;
         // If the amount of used memory has not changed during 5% of executions,
         // then we can assume that the check was successful
         if (stability_counter > num_trials / 20) {
@@ -147,43 +140,38 @@ TEST_CASE("Test memory leaks") {
 TEST_CASE("Test arena constraints setters") {
     using constraints = tbb::task_arena::constraints;
     auto constraints_comparison = [](const constraints& c1, const constraints& c2) {
-        REQUIRE_MESSAGE(
-                constraints_equal {}(c1, c2),
-                "Equal constraints settings specified by different interfaces shows different result.");
+        REQUIRE_MESSAGE(constraints_equal{}(c1, c2),
+            "Equal constraints settings specified by different interfaces shows different result.");
     };
 
     // NUMA node ID setter testing
-    for (const auto& numa_index : tbb::info::numa_nodes()) {
-        constraints setter_c = constraints {}.set_numa_id(numa_index);
-        constraints assignment_c {};
-        assignment_c.numa_id = numa_index;
+    for(const auto& numa_index: tbb::info::numa_nodes()) {
+        constraints setter_c = constraints{}.set_numa_id(numa_index);
+        constraints assignment_c{}; assignment_c.numa_id = numa_index;
 
         constraints_comparison(setter_c, assignment_c);
     }
 
     // Core type setter testing
-    for (const auto& core_type_index : tbb::info::core_types()) {
-        constraints setter_c = constraints {}.set_core_type(core_type_index);
-        constraints assignment_c {};
-        assignment_c.core_type = core_type_index;
+    for(const auto& core_type_index: tbb::info::core_types()) {
+        constraints setter_c = constraints{}.set_core_type(core_type_index);
+        constraints assignment_c{}; assignment_c.core_type = core_type_index;
 
         constraints_comparison(setter_c, assignment_c);
     }
 
     // Max concurrency setter testing
     {
-        constraints setter_c = constraints {}.set_max_concurrency(1);
-        constraints assignment_c {};
-        assignment_c.max_concurrency = 1;
+        constraints setter_c = constraints{}.set_max_concurrency(1);
+        constraints assignment_c{}; assignment_c.max_concurrency = 1;
 
         constraints_comparison(setter_c, assignment_c);
     }
 
     // Threads per core setter testing
     {
-        constraints setter_c = constraints {}.set_max_threads_per_core(1);
-        constraints assignment_c {};
-        assignment_c.max_threads_per_core = 1;
+        constraints setter_c = constraints{}.set_max_threads_per_core(1);
+        constraints assignment_c{}; assignment_c.max_threads_per_core = 1;
 
         constraints_comparison(setter_c, assignment_c);
     }
@@ -192,17 +180,15 @@ TEST_CASE("Test arena constraints setters") {
 const int custom_concurrency_value = 42;
 void check_concurrency_level(const tbb::task_arena::constraints& c) {
     REQUIRE_MESSAGE(tbb::info::default_concurrency(c) == custom_concurrency_value,
-                    "Custom arena concurrency was passed to constraints, but was not respected by "
-                    "default_concurrency() call.");
-    REQUIRE_MESSAGE(tbb::task_arena {c}.max_concurrency() == custom_concurrency_value,
-                    "Custom arena concurrency was passed to constraints, but was not respected by "
-                    "default_concurrency() call.");
+        "Custom arena concurrency was passed to constraints, but was not respected by default_concurrency() call.");
+    REQUIRE_MESSAGE(tbb::task_arena{c}.max_concurrency() == custom_concurrency_value,
+        "Custom arena concurrency was passed to constraints, but was not respected by default_concurrency() call.");
 }
 
 //! Testing concurrency getters output for constraints with custom concurrency value
 //! \brief \ref interface \ref error_guessing
 TEST_CASE("Test concurrency getters output for constraints with custom concurrency value") {
-    tbb::task_arena::constraints c {};
+    tbb::task_arena::constraints c{};
     c.set_max_concurrency(custom_concurrency_value);
     check_concurrency_level(c);
 
@@ -219,6 +205,6 @@ TEST_CASE("Test concurrency getters output for constraints with custom concurren
 //! Testing constraints_threads_per_core() reserved entry point
 //! \brief \ref error_guessing
 TEST_CASE("Testing constraints_threads_per_core() reserved entry point") {
-    tbb::task_arena::constraints c {};
+    tbb::task_arena::constraints c{};
     tbb::detail::r1::constraints_threads_per_core(c);
 }
diff --git a/external/tbb/test/tbb/test_arena_priorities.cpp b/external/tbb/test/tbb/test_arena_priorities.cpp
index 5e6ecfa4..ba160df8 100644
--- a/external/tbb/test/tbb/test_arena_priorities.cpp
+++ b/external/tbb/test/tbb/test_arena_priorities.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2020-2021 Intel Corporation
+    Copyright (c) 2020-2023 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -16,16 +16,16 @@
 
 #include "common/test.h"
 
-#include "tbb/global_control.h"
-#include "tbb/task_arena.h"
 #include "tbb/task_group.h"
+#include "tbb/task_arena.h"
+#include "tbb/global_control.h"
 
 #include "common/spin_barrier.h"
 #include "common/utils.h"
 #include "common/utils_concurrency_limit.h"
 
-#include <algorithm>
 #include <cstddef>
+#include <algorithm>
 #include <numeric>
 
 //! \file test_arena_priorities.cpp
@@ -41,301 +41,328 @@ std::atomic<bool> g_work_submitted;
 
 namespace HighPriorityArenasTakeExecutionPrecedence {
 
-    using concurrency_type = int;
-    using arena_info = std::tuple<std::unique_ptr<tbb::task_arena>, concurrency_type,
-                                  tbb::task_arena::priority, std::unique_ptr<tbb::task_group>>;
-
-    enum arena_info_keys { arena_pointer, arena_concurrency, arena_priority, associated_task_group };
-
-    void prepare_logging_data(std::vector<tbb::task_arena::priority>& task_log, unsigned overall_tasks_num) {
-        task_log.clear();
-        task_log.resize(overall_tasks_num);
-        for (auto& record : task_log) record = tbb::task_arena::priority::normal;
+using concurrency_type = int;
+using arena_info =
+    std::tuple<std::unique_ptr<tbb::task_arena>,
+               concurrency_type,
+               tbb::task_arena::priority,
+               std::unique_ptr<tbb::task_group>>;
+
+enum arena_info_keys {
+    arena_pointer, arena_concurrency, arena_priority, associated_task_group
+};
+
+void prepare_logging_data(std::vector<tbb::task_arena::priority>& task_log, unsigned overall_tasks_num) {
+    task_log.clear();
+    task_log.resize(overall_tasks_num);
+    for( auto& record : task_log )
+        record = tbb::task_arena::priority::normal;
+}
+
+template<typename... ArenaArgs>
+tbb::task_arena* do_allocate_and_construct( const ArenaArgs&... arena_args )
+{
+    const int dummy_max_concurrency = 4;
+    const int dummy_reserved_for_masters = 4;
+
+    enum initialization_methods {
+        lazy,
+        explicit_initialize,
+        explicit_initialize_with_different_constructor_parameters,
+        initialization_methods_num
+    };
+    static initialization_methods initialization_method = lazy;
+
+    tbb::task_arena* result_arena = nullptr;
+
+    switch( initialization_method ) {
+
+    case lazy:
+        result_arena = new tbb::task_arena( arena_args... );
+        break;
+
+    case explicit_initialize:
+        result_arena = new tbb::task_arena;
+        result_arena->initialize( arena_args... );
+        break;
+
+    case explicit_initialize_with_different_constructor_parameters:
+    {
+        tbb::task_arena tmp(dummy_max_concurrency, dummy_reserved_for_masters);
+        result_arena = new tbb::task_arena(tmp);
+        result_arena->initialize(arena_args...);
+        break;
     }
 
-    template <typename... ArenaArgs>
-    tbb::task_arena* do_allocate_and_construct(const ArenaArgs&... arena_args) {
-        const int dummy_max_concurrency = 4;
-        const int dummy_reserved_for_masters = 4;
-
-        enum initialization_methods {
-            lazy,
-            explicit_initialize,
-            explicit_initialize_with_different_constructor_parameters,
-            initialization_methods_num
-        };
-        static initialization_methods initialization_method = lazy;
-
-        tbb::task_arena* result_arena = nullptr;
-
-        switch (initialization_method) {
-
-            case lazy:
-                result_arena = new tbb::task_arena(arena_args...);
-                break;
-
-            case explicit_initialize:
-                result_arena = new tbb::task_arena;
-                result_arena->initialize(arena_args...);
-                break;
-
-            case explicit_initialize_with_different_constructor_parameters: {
-                tbb::task_arena tmp(dummy_max_concurrency, dummy_reserved_for_masters);
-                result_arena = new tbb::task_arena(tmp);
-                result_arena->initialize(arena_args...);
-                break;
-            }
-
-            default:
-                REQUIRE_MESSAGE(false, "Not implemented method of initialization.");
-                break;
-        }
-
-        int next_value = (initialization_method + 1) % initialization_methods_num;
-        initialization_method = (initialization_methods) next_value;
-
-        return result_arena;
+    default:
+        REQUIRE_MESSAGE( false, "Not implemented method of initialization." );
+        break;
     }
 
-    template <typename FirstArenaArg>
-    tbb::task_arena* decide_on_arguments(const FirstArenaArg& first_arg, const int reserved_for_masters,
-                                         tbb::task_arena::priority a_priority) {
-        const tbb::task_arena::priority default_priority = tbb::task_arena::priority::normal;
-        static bool pass_default_priority_implicitly = false;
-        if (default_priority == a_priority) {
-            pass_default_priority_implicitly = !pass_default_priority_implicitly;
-            if (pass_default_priority_implicitly)
-                return do_allocate_and_construct(first_arg, reserved_for_masters);
-        }
-        return do_allocate_and_construct(first_arg, reserved_for_masters, a_priority);
+    int next_value = (initialization_method + 1) % initialization_methods_num;
+    initialization_method = (initialization_methods)next_value;
+
+    return result_arena;
+}
+
+template<typename FirstArenaArg>
+tbb::task_arena* decide_on_arguments(
+    const FirstArenaArg& first_arg, const int reserved_for_masters,
+    tbb::task_arena::priority a_priority )
+{
+    const tbb::task_arena::priority default_priority = tbb::task_arena::priority::normal;
+    static bool pass_default_priority_implicitly = false;
+    if( default_priority == a_priority ) {
+        pass_default_priority_implicitly = !pass_default_priority_implicitly;
+        if( pass_default_priority_implicitly )
+            return do_allocate_and_construct( first_arg, reserved_for_masters );
     }
+    return do_allocate_and_construct( first_arg, reserved_for_masters, a_priority );
+}
 
-    tbb::task_arena* allocate_and_construct_arena(int arena_max_concurrency,
-                                                  tbb::task_arena::priority a_priority) {
-        const int reserved_for_masters = 0;
 
-        static bool use_constraints = false;
-        use_constraints = !use_constraints;
+tbb::task_arena* allocate_and_construct_arena(
+    int arena_max_concurrency, tbb::task_arena::priority a_priority )
+{
+    const int reserved_for_masters = 0;
 
-        if (use_constraints) {
-            tbb::task_arena::constraints properties {tbb::task_arena::automatic, arena_max_concurrency};
-            return decide_on_arguments(properties, reserved_for_masters, a_priority);
-        }
+    static bool use_constraints = false;
+    use_constraints = !use_constraints;
 
-        return decide_on_arguments(arena_max_concurrency, reserved_for_masters, a_priority);
+    if( use_constraints ) {
+        tbb::task_arena::constraints properties{tbb::task_arena::automatic, arena_max_concurrency};
+        return decide_on_arguments( properties, reserved_for_masters, a_priority );
     }
 
-    void submit_work(std::vector<arena_info>& arenas, unsigned repeats, utils::SpinBarrier& barrier) {
-        for (auto& item : arenas) {
-            tbb::task_arena& arena = *std::get<arena_pointer>(item).get();
-            concurrency_type concurrency = std::get<arena_concurrency>(item);
-            tbb::task_arena::priority priority_value = std::get<arena_priority>(item);
-            auto& tg = std::get<associated_task_group>(item);
-
-            arena.execute([repeats, &barrier, &tg, priority_value, concurrency]() {
-                for (unsigned i = 0; i < repeats * concurrency; ++i) {
-                    tg->run([&barrier, priority_value]() {
-                        while (!g_work_submitted.load(std::memory_order_acquire)) utils::yield();
-                        g_task_info[g_task_num++] = priority_value;
-                        barrier.wait();
-                    });
+    return decide_on_arguments( arena_max_concurrency, reserved_for_masters, a_priority );
+}
+
+void submit_work( std::vector<arena_info>& arenas, unsigned repeats, utils::SpinBarrier& barrier ) {
+    for( auto& item : arenas ) {
+        tbb::task_arena& arena = *std::get<arena_pointer>(item).get();
+        concurrency_type concurrency = std::get<arena_concurrency>(item);
+        tbb::task_arena::priority priority_value = std::get<arena_priority>(item);
+        auto& tg = std::get<associated_task_group>(item);
+
+        arena.execute(
+            [repeats, &barrier, &tg, priority_value, concurrency]() {
+                for( unsigned i = 0; i < repeats * concurrency; ++i ) {
+                    tg->run(
+                        [&barrier, priority_value](){
+                            while( !g_work_submitted.load(std::memory_order_acquire) )
+                                utils::yield();
+                            g_task_info[g_task_num++] = priority_value;
+                            barrier.wait();
+                        }
+                    );
                 }
-            }// arena work submission functor
-            );
-        }
+            } // arena work submission functor
+        );
     }
+}
+
+void wait_work_completion(
+    std::vector<arena_info>& arenas, std::size_t max_num_threads, unsigned overall_tasks_num )
+{
+    if( max_num_threads > 1 )
+        while( g_task_num < overall_tasks_num )
+            utils::yield();
+
+    for( auto& item : arenas ) {
+        tbb::task_arena& arena = *std::get<arena_pointer>(item).get();
+        auto& tg = std::get<associated_task_group>(item);
+        arena.execute( [&tg]() { tg->wait(); } );
+    }
+    CHECK_MESSAGE(g_task_num == overall_tasks_num, "Not all tasks were executed.");
+}
 
-    void wait_work_completion(std::vector<arena_info>& arenas, std::size_t max_num_threads,
-                              unsigned overall_tasks_num) {
-        if (max_num_threads > 1)
-            while (g_task_num < overall_tasks_num) utils::yield();
+void test() {
 
-        for (auto& item : arenas) {
-            tbb::task_arena& arena = *std::get<arena_pointer>(item).get();
-            auto& tg = std::get<associated_task_group>(item);
-            arena.execute([&tg]() { tg->wait(); });
-        }
-        CHECK_MESSAGE(g_task_num == overall_tasks_num, "Not all tasks were executed.");
-    }
+    const std::size_t max_num_threads = utils::get_platform_max_threads();
 
-    void test() {
+    tbb::global_control control(tbb::global_control::max_allowed_parallelism, max_num_threads + 1);
+    concurrency_type signed_max_num_threads = static_cast<int>(max_num_threads);
+    if (1 == max_num_threads) {
+        // Skipping workerless case
+        return;
+    }
 
-        const std::size_t max_num_threads = utils::get_platform_max_threads();
+    INFO( "max_num_threads = " << max_num_threads );
+    // TODO: iterate over threads to see that the work is going on in low priority arena.
 
-        tbb::global_control control(tbb::global_control::max_allowed_parallelism, max_num_threads + 1);
-        concurrency_type signed_max_num_threads = static_cast<int>(max_num_threads);
-        if (1 == max_num_threads) {
-            // Skipping workerless case
-            return;
-        }
+    const int min_arena_concurrency = 2; // implementation detail
 
-        INFO("max_num_threads = " << max_num_threads);
-        // TODO: iterate over threads to see that the work is going on in low priority arena.
+    tbb::task_arena::priority high   = tbb::task_arena::priority::high;
+    tbb::task_arena::priority normal = tbb::task_arena::priority::normal;
+    tbb::task_arena::priority low    = tbb::task_arena::priority::low;
 
-        const int min_arena_concurrency = 2;// implementation detail
+    // TODO: use vector or std::array of priorities instead of the c-style array.
 
-        tbb::task_arena::priority high = tbb::task_arena::priority::high;
-        tbb::task_arena::priority normal = tbb::task_arena::priority::normal;
-        tbb::task_arena::priority low = tbb::task_arena::priority::low;
+    // TODO: consider extending priorities to have more than three arenas.
 
-        // TODO: use vector or std::array of priorities instead of the c-style array.
+    tbb::task_arena::priority priorities[] = {high, normal, low}; // keep it sorted
+    const unsigned priorities_num = sizeof(priorities) / sizeof(priorities[0]);
+    const unsigned overall_arenas_num = priorities_num;
 
-        // TODO: consider extending priorities to have more than three arenas.
+    std::vector<arena_info> arenas;
 
-        tbb::task_arena::priority priorities[] = {high, normal, low};// keep it sorted
-        const unsigned priorities_num = sizeof(priorities) / sizeof(priorities[0]);
-        const unsigned overall_arenas_num = priorities_num;
+    std::vector<unsigned> progressing_arenas( overall_arenas_num, 0 );
+    std::iota( progressing_arenas.begin(), progressing_arenas.end(), 1 );
 
-        std::vector<arena_info> arenas;
+    for( const auto& progressing_arenas_num : progressing_arenas ) {
 
-        std::vector<unsigned> progressing_arenas(overall_arenas_num, 0);
-        std::iota(progressing_arenas.begin(), progressing_arenas.end(), 1);
+        INFO( "progressing_arenas_num = " << progressing_arenas_num );
 
-        for (const auto& progressing_arenas_num : progressing_arenas) {
+        // TODO: consider populating vector with arenas in separate function.
+        unsigned adjusted_progressing_arenas = progressing_arenas_num;
 
-            INFO("progressing_arenas_num = " << progressing_arenas_num);
+        arenas.clear();
+        g_task_num = 0;
 
-            // TODO: consider populating vector with arenas in separate function.
-            unsigned adjusted_progressing_arenas = progressing_arenas_num;
+        concurrency_type projected_concurrency =
+            (signed_max_num_threads + progressing_arenas_num - 1) / progressing_arenas_num;
+        projected_concurrency = std::max(min_arena_concurrency, projected_concurrency); // implementation detail
+        adjusted_progressing_arenas = signed_max_num_threads / projected_concurrency;
 
-            arenas.clear();
-            g_task_num = 0;
+        int threads_left = signed_max_num_threads;
 
-            concurrency_type projected_concurrency
-                    = (signed_max_num_threads + progressing_arenas_num - 1) / progressing_arenas_num;
-            projected_concurrency
-                    = std::max(min_arena_concurrency, projected_concurrency);// implementation detail
-            adjusted_progressing_arenas = signed_max_num_threads / projected_concurrency;
+        // Instantiate arenas with necessary concurrency so that progressing arenas consume all
+        // available threads.
+        for( unsigned arena_idx = 0; arena_idx < overall_arenas_num; ++arena_idx ) {
+            tbb::task_arena::priority a_priority = priorities[arena_idx];
 
-            int threads_left = signed_max_num_threads;
+            concurrency_type concurrency = projected_concurrency;
+            concurrency_type actual_concurrency = projected_concurrency;
+            if( threads_left < actual_concurrency ||
+                arena_idx == adjusted_progressing_arenas - 1 ) // give all remaining threads to last progressing arena
+            {
+                concurrency = actual_concurrency = threads_left;
+            }
 
-            // Instantiate arenas with necessary concurrency so that progressing arenas consume all
-            // available threads.
-            for (unsigned arena_idx = 0; arena_idx < overall_arenas_num; ++arena_idx) {
-                tbb::task_arena::priority a_priority = priorities[arena_idx];
+            threads_left -= actual_concurrency;
 
-                concurrency_type concurrency = projected_concurrency;
-                concurrency_type actual_concurrency = projected_concurrency;
-                if (threads_left < actual_concurrency
-                    || arena_idx
-                               == adjusted_progressing_arenas
-                                          - 1)// give all remaining threads to last progressing arena
-                {
-                    concurrency = actual_concurrency = threads_left;
-                }
+            if( !actual_concurrency ) {
+                concurrency = tbb::task_arena::automatic;
+                actual_concurrency = signed_max_num_threads;
+            }
+            actual_concurrency = std::max( min_arena_concurrency, actual_concurrency ); // implementation detail
+
+            tbb::task_arena* arena = allocate_and_construct_arena(concurrency, a_priority);
+            arenas.push_back(
+                std::make_tuple(
+                    std::unique_ptr<tbb::task_arena>(arena),
+                    actual_concurrency,
+                    a_priority,
+                    std::unique_ptr<tbb::task_group>(new tbb::task_group)
+                )
+            );
+        }
 
-                threads_left -= actual_concurrency;
+        std::rotate( arenas.begin(), arenas.begin() + progressing_arenas_num - 1, arenas.end() );
 
-                if (!actual_concurrency) {
-                    concurrency = tbb::task_arena::automatic;
-                    actual_concurrency = signed_max_num_threads;
-                }
-                actual_concurrency
-                        = std::max(min_arena_concurrency, actual_concurrency);// implementation detail
+        const unsigned repeats = 10;
 
-                tbb::task_arena* arena = allocate_and_construct_arena(concurrency, a_priority);
-                arenas.push_back(std::make_tuple(std::unique_ptr<tbb::task_arena>(arena), actual_concurrency,
-                                                 a_priority,
-                                                 std::unique_ptr<tbb::task_group>(new tbb::task_group)));
-            }
+        unsigned overall_tasks_num = 0;
+        for( auto& item : arenas )
+            overall_tasks_num += std::get<arena_concurrency>(item) * repeats;
 
-            std::rotate(arenas.begin(), arenas.begin() + progressing_arenas_num - 1, arenas.end());
+        prepare_logging_data( g_task_info, overall_tasks_num );
 
-            const unsigned repeats = 10;
+        g_work_submitted = false;
 
-            unsigned overall_tasks_num = 0;
-            for (auto& item : arenas) overall_tasks_num += std::get<arena_concurrency>(item) * repeats;
+        utils::SpinBarrier barrier{ max_num_threads };
+        submit_work( arenas, repeats, barrier );
 
-            prepare_logging_data(g_task_info, overall_tasks_num);
+        g_work_submitted = true;
 
-            g_work_submitted = false;
+        wait_work_completion( arenas, max_num_threads, overall_tasks_num );
 
-            utils::SpinBarrier barrier {max_num_threads};
-            submit_work(arenas, repeats, barrier);
+        std::map<tbb::task_arena::priority, unsigned> wasted_tasks;
 
-            g_work_submitted = true;
+        tbb::task_arena::priority* end_ptr = priorities + adjusted_progressing_arenas;
 
-            wait_work_completion(arenas, max_num_threads, overall_tasks_num);
+        {
+            // First epoch - check progressing arenas only
+            unsigned overall_progressing_arenas_tasks_num = 0;
+            std::map<tbb::task_arena::priority, unsigned> per_priority_tasks_num;
 
-            std::map<tbb::task_arena::priority, unsigned> wasted_tasks;
+            // Due to indeterministic submission of tasks in the beginning, count tasks priorities up
+            // to additional epoch. Assume threads are rebalanced once the work is submitted.
+            unsigned last_task_idx = std::min((repeats + 1) * unsigned(max_num_threads), overall_tasks_num);
+            for( unsigned i = 0; i < last_task_idx; ++i ) {
+                tbb::task_arena::priority p = g_task_info[i];
+                ++per_priority_tasks_num[p];
 
-            tbb::task_arena::priority* end_ptr = priorities + adjusted_progressing_arenas;
+                overall_progressing_arenas_tasks_num += (int)(
+                    end_ptr != std::find(priorities, end_ptr, p)
+                );
 
-            {
-                // First epoch - check progressing arenas only
-                unsigned overall_progressing_arenas_tasks_num = 0;
-                std::map<tbb::task_arena::priority, unsigned> per_priority_tasks_num;
-
-                // Due to indeterministic submission of tasks in the beginning, count tasks priorities up
-                // to additional epoch. Assume threads are rebalanced once the work is submitted.
-                unsigned last_task_idx
-                        = std::min((repeats + 1) * unsigned(max_num_threads), overall_tasks_num);
-                for (unsigned i = 0; i < last_task_idx; ++i) {
-                    tbb::task_arena::priority p = g_task_info[i];
-                    ++per_priority_tasks_num[p];
-
-                    overall_progressing_arenas_tasks_num
-                            += (int) (end_ptr != std::find(priorities, end_ptr, p));
-
-                    if (i < max_num_threads || i >= repeats * max_num_threads) ++wasted_tasks[p];
-                }
+                if( i < max_num_threads || i >= repeats * max_num_threads )
+                    ++wasted_tasks[p];
+            }
 
-                unsigned expected_overall_progressing_arenas_tasks_num = 0;
-                for (unsigned i = 0; i < adjusted_progressing_arenas; ++i) {
-                    tbb::task_arena::priority p = priorities[i];
-                    concurrency_type concurrency = 0;
-                    for (auto& item : arenas) {
-                        if (std::get<arena_priority>(item) == p) {
-                            concurrency = std::get<arena_concurrency>(item);
-                            break;
-                        }
+            unsigned expected_overall_progressing_arenas_tasks_num = 0;
+            for( unsigned i = 0; i < adjusted_progressing_arenas; ++i ) {
+                tbb::task_arena::priority p = priorities[i];
+                concurrency_type concurrency = 0;
+                for( auto& item : arenas ) {
+                    if( std::get<arena_priority>(item) == p ) {
+                        concurrency = std::get<arena_concurrency>(item);
+                        break;
                     }
-                    unsigned expected_tasks_num = repeats * concurrency;
+                }
+                unsigned expected_tasks_num = repeats * concurrency;
 
-                    CHECK_MESSAGE(expected_tasks_num == per_priority_tasks_num[p],
-                                  "Unexpected number of executed tasks in arena with index "
-                                          << i << " and concurrency = " << concurrency);
+                CHECK_MESSAGE( expected_tasks_num == per_priority_tasks_num[p],
+                               "Unexpected number of executed tasks in arena with index " << i << " and concurrency = " << concurrency ) ;
 
-                    expected_overall_progressing_arenas_tasks_num += expected_tasks_num;
-                }
-                CHECK_MESSAGE(expected_overall_progressing_arenas_tasks_num
-                                      == overall_progressing_arenas_tasks_num,
-                              "Number of tasks for progressing arenas mismatched.");
+                expected_overall_progressing_arenas_tasks_num += expected_tasks_num;
             }
-            {
-                // Other epochs - check remaining arenas
-                std::map<tbb::task_arena::priority, unsigned> per_priority_tasks_num;
+            CHECK_MESSAGE(
+                expected_overall_progressing_arenas_tasks_num == overall_progressing_arenas_tasks_num,
+                "Number of tasks for progressing arenas mismatched."
+            );
+        }
+        {
+            // Other epochs - check remaining arenas
+            std::map<tbb::task_arena::priority, unsigned> per_priority_tasks_num;
 
-                std::size_t lower_priority_start = (repeats + 1) * max_num_threads;
-                for (std::size_t i = lower_priority_start; i < overall_tasks_num; ++i)
-                    ++per_priority_tasks_num[g_task_info[i]];
+            std::size_t lower_priority_start = (repeats + 1) * max_num_threads;
+            for( std::size_t i = lower_priority_start; i < overall_tasks_num; ++i )
+                ++per_priority_tasks_num[ g_task_info[i] ];
 
-                for (auto& e : per_priority_tasks_num) {
-                    auto priority = e.first;
-                    auto tasks_num = e.second;
+            for( auto& e : per_priority_tasks_num ) {
+                auto priority = e.first;
+                auto tasks_num = e.second;
 
-                    auto priorities_it = std::find(end_ptr, priorities + priorities_num, priority);
-                    CHECK_MESSAGE(priorities_it != priorities + priorities_num,
-                                  "Tasks from prioritized arena got deferred.");
+                auto priorities_it = std::find( end_ptr, priorities + priorities_num, priority );
+                CHECK_MESSAGE( priorities_it != priorities + priorities_num,
+                               "Tasks from prioritized arena got deferred." );
 
-                    auto it = std::find_if(arenas.begin(), arenas.end(), [priority](arena_info& info) {
+                auto it = std::find_if(
+                    arenas.begin(), arenas.end(),
+                    [priority](arena_info& info) {
                         return std::get<arena_priority>(info) == priority;
-                    });
-                    auto per_arena_tasks_num = repeats * std::get<arena_concurrency>(*it);
-                    CHECK_MESSAGE(tasks_num == per_arena_tasks_num - wasted_tasks[priority],
-                                  "Incorrect number of tasks from deferred (non-progressing) arenas were "
-                                  "executed.");
-                }
-            }// Other epochs
-        }    // loop over simultaneously progressing arenas
+                    }
+                );
+                auto per_arena_tasks_num = repeats * std::get<arena_concurrency>(*it);
+                CHECK_MESSAGE(
+                    tasks_num == per_arena_tasks_num - wasted_tasks[priority],
+                    "Incorrect number of tasks from deferred (non-progressing) arenas were executed."
+                );
+            }
+        } // Other epochs
+    } // loop over simultaneously progressing arenas
 
-        INFO("Done\n");
-    }
+    INFO( "Done\n" );
+}
 
-}// namespace HighPriorityArenasTakeExecutionPrecedence
+} // namespace HighPriorityArenasTakeExecutionPrecedence
 
-// TODO: nested arena case
 
+// TODO: nested arena case
 //! Test for setting a priority to arena
 //! \brief \ref requirement
-TEST_CASE("Arena priorities") { HighPriorityArenasTakeExecutionPrecedence::test(); }
+TEST_CASE("Arena priorities") {
+    HighPriorityArenasTakeExecutionPrecedence::test();
+}
diff --git a/external/tbb/test/tbb/test_async_node.cpp b/external/tbb/test/tbb/test_async_node.cpp
index dcab720a..edab0c38 100644
--- a/external/tbb/test/tbb/test_async_node.cpp
+++ b/external/tbb/test/tbb/test_async_node.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2023 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -15,33 +15,35 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
 #endif
 
 #include "common/config.h"
 
 #include "tbb/flow_graph.h"
 
-#include "tbb/global_control.h"
 #include "tbb/task.h"
+#include "tbb/global_control.h"
 
-#include "common/concepts_common.h"
-#include "common/graph_utils.h"
-#include "common/spin_barrier.h"
 #include "common/test.h"
-#include "common/test_follows_and_precedes_api.h"
 #include "common/utils.h"
 #include "common/utils_assert.h"
+#include "common/graph_utils.h"
+#include "common/spin_barrier.h"
+#include "common/test_follows_and_precedes_api.h"
+#include "common/concepts_common.h"
 
-#include <mutex>
 #include <string>
 #include <thread>
+#include <mutex>
+
 
 //! \file test_async_node.cpp
 //! \brief Test for [flow_graph.async_node] specification
 
+
 class minimal_type {
-    template <typename T>
+    template<typename T>
     friend struct place_wrapper;
 
     int value;
@@ -49,11 +51,8 @@ class minimal_type {
 public:
     minimal_type() : value(-1) {}
     minimal_type(int v) : value(v) {}
-    minimal_type(const minimal_type& m) : value(m.value) {}
-    minimal_type& operator=(const minimal_type& m) {
-        value = m.value;
-        return *this;
-    }
+    minimal_type(const minimal_type &m) : value(m.value) { }
+    minimal_type &operator=(const minimal_type &m) { value = m.value; return *this; }
 };
 
 template <typename T>
@@ -62,10 +61,12 @@ struct place_wrapper {
     T value;
     std::thread::id thread_id;
 
-    place_wrapper(int v = 0) : value(v), thread_id(std::this_thread::get_id()) {}
+    place_wrapper( int v = 0 ) : value(v), thread_id(std::this_thread::get_id()) {}
 
     template <typename Q>
-    place_wrapper(const place_wrapper<Q>& v) : value(v.value), thread_id(v.thread_id) {}
+    place_wrapper(const place_wrapper<Q>& v)
+        : value(v.value), thread_id(v.thread_id)
+    {}
 
     template <typename Q>
     place_wrapper<Q>& operator=(const place_wrapper<Q>& v) {
@@ -75,21 +76,24 @@ struct place_wrapper {
         }
         return *this;
     }
+
 };
 
-template <typename T1, typename T2>
+template<typename T1, typename T2>
 struct wrapper_helper {
-    static void check(const T1&, const T2&) {}
-    static void copy_value(const T1& in, T2& out) { out = in; }
+    static void check(const T1 &, const T2 &) { }
+    static void copy_value(const T1 &in, T2 &out) { out = in; }
 };
 
-template <typename T1, typename T2>
-struct wrapper_helper<place_wrapper<T1>, place_wrapper<T2>> {
-    static void check(const place_wrapper<T1>& a, const place_wrapper<T2>& b) {
-        CHECK_MESSAGE(((a.thread_id != b.thread_id)), "same thread used to execute adjacent nodes");
-        return;
+template<typename T1, typename T2>
+struct wrapper_helper< place_wrapper<T1>, place_wrapper<T2> > {
+    static void check(const place_wrapper<T1> &a, const place_wrapper<T2> &b) {
+       CHECK_MESSAGE( ( (a.thread_id != b.thread_id)), "same thread used to execute adjacent nodes");
+       return;
+    }
+    static void copy_value(const place_wrapper<T1> &in, place_wrapper<T2> &out) {
+        out.value = in.value;
     }
-    static void copy_value(const place_wrapper<T1>& in, place_wrapper<T2>& out) { out.value = in.value; }
 };
 
 const int NUMBER_OF_MSGS = 10;
@@ -99,28 +103,27 @@ std::atomic<int> async_activity_processed_msg_count;
 std::atomic<int> end_body_exec_count;
 
 // queueing required in test_reset for testing of cancellation
-typedef tbb::flow::async_node<int, int, tbb::flow::queueing> counting_async_node_type;
+typedef tbb::flow::async_node< int, int, tbb::flow::queueing > counting_async_node_type;
 typedef counting_async_node_type::gateway_type counting_gateway_type;
 
 struct counting_async_unlimited_body {
 
-    counting_async_unlimited_body(tbb::task_group_context& graph_tgc) : my_tgc(graph_tgc) {}
+    counting_async_unlimited_body(tbb::task_group_context& graph_tgc) : my_tgc( graph_tgc ) {}
 
-    void operator()(const int& input, counting_gateway_type& gateway) {
+    void operator()( const int &input, counting_gateway_type& gateway) {
         // TODO revamp: reconsider logging for the tests. It is known that frequent calls to
         // doctest's INFO cause issues.
 
         // INFO( "Body execution with input == " << input << "\n");
         ++async_body_exec_count;
-        if (input == -1) {
+        if ( input == -1 ) {
             bool result = my_tgc.cancel_group_execution();
             // INFO( "Canceling graph execution\n" );
-            CHECK_MESSAGE((result == true), "attempted to cancel graph twice");
+            CHECK_MESSAGE( ( result == true), "attempted to cancel graph twice" );
             utils::Sleep(50);
         }
         gateway.try_put(input);
     }
-
 private:
     tbb::task_group_context& my_tgc;
 };
@@ -129,11 +132,12 @@ struct counting_async_serial_body : counting_async_unlimited_body {
     typedef counting_async_unlimited_body base_type;
     int my_async_body_exec_count;
 
-    counting_async_serial_body(tbb::task_group_context& tgc) : base_type(tgc), my_async_body_exec_count(0) {}
+    counting_async_serial_body(tbb::task_group_context& tgc)
+        : base_type(tgc), my_async_body_exec_count( 0 ) { }
 
-    void operator()(const int& input, counting_gateway_type& gateway) {
+    void operator()( const int &input, counting_gateway_type& gateway ) {
         ++my_async_body_exec_count;
-        base_type::operator()(input, gateway);
+        base_type::operator()( input, gateway );
     }
 };
 
@@ -143,141 +147,158 @@ void test_reset() {
 
     tbb::task_group_context graph_ctx;
     tbb::flow::graph g(graph_ctx);
-    counting_async_node_type a(g, tbb::flow::serial, counting_async_serial_body(graph_ctx));
+    counting_async_node_type a(g, tbb::flow::serial, counting_async_serial_body(graph_ctx) );
 
     const int R = 3;
-    std::vector<std::shared_ptr<harness_counting_receiver<int>>> r;
-    for (size_t i = 0; i < R; ++i) { r.push_back(std::make_shared<harness_counting_receiver<int>>(g)); }
+    std::vector< std::shared_ptr<harness_counting_receiver<int>> > r;
+    for (size_t i = 0; i < R; ++i) {
+        r.push_back( std::make_shared<harness_counting_receiver<int>>(g) );
+    }
 
-    for (int i = 0; i < R; ++i) { tbb::flow::make_edge(a, *r[i]); }
+    for (int i = 0; i < R; ++i) {
+        tbb::flow::make_edge(a, *r[i]);
+    }
 
-    INFO("One body execution\n");
+    INFO( "One body execution\n" );
     a.try_put(-1);
-    for (int i = 0; i < N; ++i) { a.try_put(i); }
+    for (int i = 0; i < N; ++i) {
+       a.try_put(i);
+    }
     g.wait_for_all();
     // should be canceled with only 1 item reaching the async_body and the counting receivers
     // and N items left in the node's queue
-    CHECK_MESSAGE((g.is_cancelled() == true), "task group not canceled");
+    CHECK_MESSAGE( ( g.is_cancelled() == true), "task group not canceled" );
 
     counting_async_serial_body b1 = tbb::flow::copy_body<counting_async_serial_body>(a);
-    CHECK_MESSAGE((int(async_body_exec_count) == int(b1.my_async_body_exec_count)),
-                  "body and global body counts are different");
-    CHECK_MESSAGE((int(async_body_exec_count) == 1), "global body execution count not 1");
+    CHECK_MESSAGE( ( int(async_body_exec_count) == int(b1.my_async_body_exec_count)), "body and global body counts are different" );
+    CHECK_MESSAGE( ( int(async_body_exec_count) == 1), "global body execution count not 1"  );
     for (int i = 0; i < R; ++i) {
-        CHECK_MESSAGE((int(r[i]->my_count) == 1), "counting receiver count not 1");
+        CHECK_MESSAGE( ( int(r[i]->my_count) == 1), "counting receiver count not 1" );
     }
 
     // should clear the async_node queue, but retain its local count at 1 and keep all edges
     g.reset(tbb::flow::rf_reset_protocol);
 
-    INFO("N body executions\n");
-    for (int i = 0; i < N; ++i) { a.try_put(i); }
+    INFO( "N body executions\n" );
+    for (int i = 0; i < N; ++i) {
+       a.try_put(i);
+    }
     g.wait_for_all();
-    CHECK_MESSAGE((g.is_cancelled() == false), "task group not canceled");
+    CHECK_MESSAGE( ( g.is_cancelled() == false), "task group not canceled" );
 
     // a total of N+1 items should have passed through the node body
     // the local body count should also be N+1
     // and the counting receivers should all have a count of N+1
     counting_async_serial_body b2 = tbb::flow::copy_body<counting_async_serial_body>(a);
-    CHECK_MESSAGE(int(async_body_exec_count) == int(b2.my_async_body_exec_count),
-                  "local and global body execution counts are different");
-    INFO("async_body_exec_count==" << int(async_body_exec_count) << "\n");
-    CHECK_MESSAGE((int(async_body_exec_count) == N + 1), "global body execution count not N+1");
+    CHECK_MESSAGE( int(async_body_exec_count) == int(b2.my_async_body_exec_count),
+                   "local and global body execution counts are different" );
+    INFO( "async_body_exec_count==" << int(async_body_exec_count) << "\n" );
+    CHECK_MESSAGE( ( int(async_body_exec_count) == N+1), "global body execution count not N+1"  );
     for (int i = 0; i < R; ++i) {
-        CHECK_MESSAGE((int(r[i]->my_count) == N + 1), "counting receiver has not received N+1 items");
+        CHECK_MESSAGE( ( int(r[i]->my_count) == N+1), "counting receiver has not received N+1 items" );
     }
 
-    INFO("N body executions with new bodies\n");
+    INFO( "N body executions with new bodies\n" );
     // should clear the async_node queue and reset its local count to 0, but keep all edges
     g.reset(tbb::flow::rf_reset_bodies);
-    for (int i = 0; i < N; ++i) { a.try_put(i); }
+    for (int i = 0; i < N; ++i) {
+       a.try_put(i);
+    }
     g.wait_for_all();
-    CHECK_MESSAGE((g.is_cancelled() == false), "task group not canceled");
+    CHECK_MESSAGE( ( g.is_cancelled() == false), "task group not canceled" );
 
     // a total of 2N+1 items should have passed through the node body
     // the local body count should be N
     // and the counting receivers should all have a count of 2N+1
     counting_async_serial_body b3 = tbb::flow::copy_body<counting_async_serial_body>(a);
-    CHECK_MESSAGE((int(async_body_exec_count) == 2 * N + 1), "global body execution count not 2N+1");
-    CHECK_MESSAGE((int(b3.my_async_body_exec_count) == N), "local body execution count not N");
+    CHECK_MESSAGE( ( int(async_body_exec_count) == 2*N+1), "global body execution count not 2N+1"  );
+    CHECK_MESSAGE( ( int(b3.my_async_body_exec_count) == N), "local body execution count not N"  );
     for (int i = 0; i < R; ++i) {
-        CHECK_MESSAGE((int(r[i]->my_count) == 2 * N + 1), "counting receiver has not received 2N+1 items");
+        CHECK_MESSAGE( ( int(r[i]->my_count) == 2*N+1), "counting receiver has not received 2N+1 items" );
     }
 
     // should clear the async_node queue and keep its local count at N and remove all edges
-    INFO("N body executions with no edges\n");
+    INFO( "N body executions with no edges\n" );
     g.reset(tbb::flow::rf_clear_edges);
-    for (int i = 0; i < N; ++i) { a.try_put(i); }
+    for (int i = 0; i < N; ++i) {
+       a.try_put(i);
+    }
     g.wait_for_all();
-    CHECK_MESSAGE((g.is_cancelled() == false), "task group not canceled");
+    CHECK_MESSAGE( ( g.is_cancelled() == false), "task group not canceled" );
 
     // a total of 3N+1 items should have passed through the node body
     // the local body count should now be 2*N
     // and the counting receivers should remain at a count of 2N+1
     counting_async_serial_body b4 = tbb::flow::copy_body<counting_async_serial_body>(a);
-    CHECK_MESSAGE((int(async_body_exec_count) == 3 * N + 1), "global body execution count not 3N+1");
-    CHECK_MESSAGE((int(b4.my_async_body_exec_count) == 2 * N), "local body execution count not 2N");
+    CHECK_MESSAGE( ( int(async_body_exec_count) == 3*N+1), "global body execution count not 3N+1"  );
+    CHECK_MESSAGE( ( int(b4.my_async_body_exec_count) == 2*N), "local body execution count not 2N"  );
     for (int i = 0; i < R; ++i) {
-        CHECK_MESSAGE((int(r[i]->my_count) == 2 * N + 1), "counting receiver has not received 2N+1 items");
+        CHECK_MESSAGE( ( int(r[i]->my_count) == 2*N+1), "counting receiver has not received 2N+1 items" );
     }
 
     // put back 1 edge to receiver 0
-    INFO("N body executions with 1 edge\n");
+    INFO( "N body executions with 1 edge\n" );
     tbb::flow::make_edge(a, *r[0]);
-    for (int i = 0; i < N; ++i) { a.try_put(i); }
+    for (int i = 0; i < N; ++i) {
+       a.try_put(i);
+    }
     g.wait_for_all();
-    CHECK_MESSAGE((g.is_cancelled() == false), "task group not canceled");
+    CHECK_MESSAGE( ( g.is_cancelled() == false), "task group not canceled" );
 
     // a total of 4N+1 items should have passed through the node body
     // the local body count should now be 3*N
     // and all of the counting receivers should remain at a count of 2N+1, except r[0] which should be 3N+1
     counting_async_serial_body b5 = tbb::flow::copy_body<counting_async_serial_body>(a);
-    CHECK_MESSAGE((int(async_body_exec_count) == 4 * N + 1), "global body execution count not 4N+1");
-    CHECK_MESSAGE((int(b5.my_async_body_exec_count) == 3 * N), "local body execution count not 3N");
-    CHECK_MESSAGE((int(r[0]->my_count) == 3 * N + 1), "counting receiver has not received 3N+1 items");
+    CHECK_MESSAGE( ( int(async_body_exec_count) == 4*N+1), "global body execution count not 4N+1"  );
+    CHECK_MESSAGE( ( int(b5.my_async_body_exec_count) == 3*N), "local body execution count not 3N"  );
+    CHECK_MESSAGE( ( int(r[0]->my_count) == 3*N+1), "counting receiver has not received 3N+1 items" );
     for (int i = 1; i < R; ++i) {
-        CHECK_MESSAGE((int(r[i]->my_count) == 2 * N + 1), "counting receiver has not received 2N+1 items");
+        CHECK_MESSAGE( ( int(r[i]->my_count) == 2*N+1), "counting receiver has not received 2N+1 items" );
     }
 
     // should clear the async_node queue and keep its local count at N and remove all edges
-    INFO("N body executions with no edges and new body\n");
-    g.reset(static_cast<tbb::flow::reset_flags>(tbb::flow::rf_reset_bodies | tbb::flow::rf_clear_edges));
-    for (int i = 0; i < N; ++i) { a.try_put(i); }
+    INFO( "N body executions with no edges and new body\n" );
+    g.reset(static_cast<tbb::flow::reset_flags>(tbb::flow::rf_reset_bodies|tbb::flow::rf_clear_edges));
+    for (int i = 0; i < N; ++i) {
+       a.try_put(i);
+    }
     g.wait_for_all();
-    CHECK_MESSAGE((g.is_cancelled() == false), "task group not canceled");
+    CHECK_MESSAGE( ( g.is_cancelled() == false), "task group not canceled" );
 
     // a total of 4N+1 items should have passed through the node body
     // the local body count should now be 3*N
     // and all of the counting receivers should remain at a count of 2N+1, except r[0] which should be 3N+1
     counting_async_serial_body b6 = tbb::flow::copy_body<counting_async_serial_body>(a);
-    CHECK_MESSAGE((int(async_body_exec_count) == 5 * N + 1), "global body execution count not 5N+1");
-    CHECK_MESSAGE((int(b6.my_async_body_exec_count) == N), "local body execution count not N");
-    CHECK_MESSAGE((int(r[0]->my_count) == 3 * N + 1), "counting receiver has not received 3N+1 items");
+    CHECK_MESSAGE( ( int(async_body_exec_count) == 5*N+1), "global body execution count not 5N+1"  );
+    CHECK_MESSAGE( ( int(b6.my_async_body_exec_count) == N), "local body execution count not N"  );
+    CHECK_MESSAGE( ( int(r[0]->my_count) == 3*N+1), "counting receiver has not received 3N+1 items" );
     for (int i = 1; i < R; ++i) {
-        CHECK_MESSAGE((int(r[i]->my_count) == 2 * N + 1), "counting receiver has not received 2N+1 items");
+        CHECK_MESSAGE( ( int(r[i]->my_count) == 2*N+1), "counting receiver has not received 2N+1 items" );
     }
 }
 
+
 #include <mutex>
 
 template <typename T>
 class async_activity_queue {
 public:
-    void push(const T& item) {
-        std::lock_guard<mutex_t> lock(m_mutex);
-        m_queue.push(item);
+    void push( const T& item ) {
+        std::lock_guard<mutex_t> lock( m_mutex );
+        m_queue.push( item );
     }
 
-    bool try_pop(T& item) {
-        std::lock_guard<mutex_t> lock(m_mutex);
-        if (m_queue.empty()) return false;
+    bool try_pop( T& item ) {
+        std::lock_guard<mutex_t> lock( m_mutex );
+        if( m_queue.empty() )
+            return false;
         item = m_queue.front();
         m_queue.pop();
         return true;
     }
 
     bool empty() {
-        std::lock_guard<mutex_t> lock(m_mutex);
+        std::lock_guard<mutex_t> lock( m_mutex );
         return m_queue.empty();
     }
 
@@ -287,12 +308,12 @@ class async_activity_queue {
     std::queue<T> m_queue;
 };
 
-template <typename Input, typename Output>
+template< typename Input, typename Output >
 class async_activity : utils::NoAssign {
 public:
     typedef Input input_type;
     typedef Output output_type;
-    typedef tbb::flow::async_node<input_type, output_type> async_node_type;
+    typedef tbb::flow::async_node< input_type, output_type > async_node_type;
     typedef typename async_node_type::gateway_type gateway_type;
 
     struct work_type {
@@ -302,22 +323,25 @@ class async_activity : utils::NoAssign {
 
     class ServiceThreadBody {
     public:
-        ServiceThreadBody(async_activity* activity) : my_activity(activity) {}
+        ServiceThreadBody( async_activity* activity ) : my_activity( activity ) {}
         void operator()() { my_activity->process(); }
-
     private:
         async_activity* my_activity;
     };
 
     async_activity(int expected_items, bool deferred = false, int sleep_time = 50)
-        : my_expected_items(expected_items), my_sleep_time(sleep_time) {
+        : my_expected_items(expected_items), my_sleep_time(sleep_time)
+    {
         is_active = !deferred;
         my_quit = false;
-        std::thread(ServiceThreadBody(this)).swap(my_service_thread);
+        std::thread( ServiceThreadBody( this ) ).swap( my_service_thread );
     }
 
 private:
-    async_activity(const async_activity&) : my_expected_items(UNKNOWN_NUMBER_OF_ITEMS), my_sleep_time(0) {
+
+    async_activity( const async_activity& )
+        : my_expected_items(UNKNOWN_NUMBER_OF_ITEMS), my_sleep_time(0)
+    {
         is_active = true;
     }
 
@@ -327,56 +351,62 @@ class async_activity : utils::NoAssign {
         my_service_thread.join();
     }
 
-    void submit(const input_type& input, gateway_type& gateway) {
+    void submit( const input_type &input, gateway_type& gateway ) {
         work_type work = {input, &gateway};
-        my_work_queue.push(work);
+        my_work_queue.push( work );
     }
 
     void process() {
         do {
             work_type work;
-            if (is_active && my_work_queue.try_pop(work)) {
+            if( is_active && my_work_queue.try_pop( work ) ) {
                 utils::Sleep(my_sleep_time);
                 ++async_activity_processed_msg_count;
                 output_type output;
                 wrapper_helper<output_type, output_type>::copy_value(work.input, output);
                 wrapper_helper<output_type, output_type>::check(work.input, output);
                 work.gateway->try_put(output);
-                if (my_expected_items == UNKNOWN_NUMBER_OF_ITEMS
-                    || int(async_activity_processed_msg_count) == my_expected_items) {
+                if ( my_expected_items == UNKNOWN_NUMBER_OF_ITEMS ||
+                     int(async_activity_processed_msg_count) == my_expected_items ) {
                     work.gateway->release_wait();
                 }
             }
-        } while (my_quit == false || !my_work_queue.empty());
+        } while( my_quit == false || !my_work_queue.empty());
     }
 
-    void stop() { my_quit = true; }
+    void stop() {
+        my_quit = true;
+    }
 
-    void activate() { is_active = true; }
+    void activate() {
+        is_active = true;
+    }
 
     bool should_reserve_each_time() {
-        if (my_expected_items == UNKNOWN_NUMBER_OF_ITEMS) return true;
+        if ( my_expected_items == UNKNOWN_NUMBER_OF_ITEMS )
+            return true;
         else
             return false;
     }
 
 private:
+
     const int my_expected_items;
     const int my_sleep_time;
-    std::atomic<bool> is_active;
+    std::atomic< bool > is_active;
 
     async_activity_queue<work_type> my_work_queue;
 
-    std::atomic<bool> my_quit;
+    std::atomic< bool > my_quit;
 
     std::thread my_service_thread;
 };
 
-template <typename Input, typename Output>
+template<typename Input, typename Output>
 struct basic_test {
     typedef Input input_type;
     typedef Output output_type;
-    typedef tbb::flow::async_node<input_type, output_type> async_node_type;
+    typedef tbb::flow::async_node< input_type, output_type > async_node_type;
     typedef typename async_node_type::gateway_type gateway_type;
 
     basic_test() {}
@@ -386,43 +416,51 @@ struct basic_test {
 
         tbb::flow::graph g;
 
-        tbb::flow::function_node<int, input_type> start_node(g, tbb::flow::unlimited,
-                                                             [](int input) { return input_type(input); });
-        async_node_type offload_node(g, tbb::flow::unlimited,
-                                     [&](const input_type& input, gateway_type& gateway) {
-                                         ++async_body_exec_count;
-                                         if (my_async_activity.should_reserve_each_time())
-                                             gateway.reserve_wait();
-                                         my_async_activity.submit(input, gateway);
-                                     });
-        tbb::flow::function_node<output_type> end_node(
-                g, tbb::flow::unlimited, [&](const output_type& input) {
-                    ++end_body_exec_count;
-                    output_type output;
-                    wrapper_helper<output_type, output_type>::check(input, output);
-                });
+        tbb::flow::function_node< int, input_type > start_node(
+            g, tbb::flow::unlimited, [](int input) { return input_type(input); }
+        );
+        async_node_type offload_node(
+            g, tbb::flow::unlimited,
+            [&] (const input_type &input, gateway_type& gateway) {
+                ++async_body_exec_count;
+                if(my_async_activity.should_reserve_each_time())
+                    gateway.reserve_wait();
+                my_async_activity.submit(input, gateway);
+            }
+        );
+        tbb::flow::function_node< output_type > end_node(
+            g, tbb::flow::unlimited,
+            [&](const output_type& input) {
+                ++end_body_exec_count;
+                output_type output;
+                wrapper_helper<output_type, output_type>::check(input, output);
+            }
+        );
 
-        tbb::flow::make_edge(start_node, offload_node);
-        tbb::flow::make_edge(offload_node, end_node);
+        tbb::flow::make_edge( start_node, offload_node );
+        tbb::flow::make_edge( offload_node, end_node );
 
         async_body_exec_count = 0;
         async_activity_processed_msg_count = 0;
         end_body_exec_count = 0;
 
-        if (async_expected_items != UNKNOWN_NUMBER_OF_ITEMS) { offload_node.gateway().reserve_wait(); }
-        for (int i = 0; i < NUMBER_OF_MSGS; ++i) { start_node.try_put(i); }
+        if (async_expected_items != UNKNOWN_NUMBER_OF_ITEMS) {
+            offload_node.gateway().reserve_wait();
+        }
+        for (int i = 0; i < NUMBER_OF_MSGS; ++i) {
+            start_node.try_put(i);
+        }
         g.wait_for_all();
-        CHECK_MESSAGE((async_body_exec_count == NUMBER_OF_MSGS),
-                      "AsyncBody processed wrong number of signals");
-        CHECK_MESSAGE((async_activity_processed_msg_count == NUMBER_OF_MSGS),
-                      "AsyncActivity processed wrong number of signals");
-        CHECK_MESSAGE((end_body_exec_count == NUMBER_OF_MSGS), "EndBody processed wrong number of signals");
-        INFO("async_body_exec_count == "
-             << int(async_body_exec_count)
-             << " == async_activity_processed_msg_count == " << int(async_activity_processed_msg_count)
-             << " == end_body_exec_count == " << int(end_body_exec_count) << "\n");
+        CHECK_MESSAGE( ( async_body_exec_count == NUMBER_OF_MSGS), "AsyncBody processed wrong number of signals" );
+        CHECK_MESSAGE( ( async_activity_processed_msg_count == NUMBER_OF_MSGS), "AsyncActivity processed wrong number of signals" );
+        CHECK_MESSAGE( ( end_body_exec_count == NUMBER_OF_MSGS), "EndBody processed wrong number of signals");
+        INFO( "async_body_exec_count == " << int(async_body_exec_count) <<
+              " == async_activity_processed_msg_count == " << int(async_activity_processed_msg_count) <<
+              " == end_body_exec_count == " << int(end_body_exec_count) << "\n"
+        );
         return 0;
     }
+
 };
 
 int test_copy_ctor() {
@@ -435,54 +473,57 @@ int test_copy_ctor() {
     harness_counting_receiver<int> r2(g);
 
     tbb::task_group_context graph_ctx;
-    counting_async_node_type a(g, tbb::flow::unlimited, counting_async_unlimited_body(graph_ctx));
+    counting_async_node_type a(g, tbb::flow::unlimited, counting_async_unlimited_body(graph_ctx) );
     counting_async_node_type b(a);
 
-    tbb::flow::make_edge(a, r1);                           // C++11-style of making edges
-    tbb::flow::make_edge(tbb::flow::output_port<0>(b), r2);// usual way of making edges
+    tbb::flow::make_edge(a, r1);                             // C++11-style of making edges
+    tbb::flow::make_edge(tbb::flow::output_port<0>(b), r2);  // usual way of making edges
 
-    for (int i = 0; i < N; ++i) { a.try_put(i); }
+    for (int i = 0; i < N; ++i) {
+       a.try_put(i);
+    }
     g.wait_for_all();
 
-    INFO("async_body_exec_count = " << int(async_body_exec_count) << "\n");
-    INFO("r1.my_count == " << int(r1.my_count) << " and r2.my_count = " << int(r2.my_count) << "\n");
-    CHECK_MESSAGE((int(async_body_exec_count) == NUMBER_OF_MSGS),
-                  "AsyncBody processed wrong number of signals");
-    CHECK_MESSAGE((int(r1.my_count) == N), "counting receiver r1 has not received N items");
-    CHECK_MESSAGE((int(r2.my_count) == 0), "counting receiver r2 has not received 0 items");
+    INFO("async_body_exec_count = " << int(async_body_exec_count) << "\n" );
+    INFO("r1.my_count == " << int(r1.my_count) << " and r2.my_count = " << int(r2.my_count) << "\n" );
+    CHECK_MESSAGE( ( int(async_body_exec_count) == NUMBER_OF_MSGS), "AsyncBody processed wrong number of signals" );
+    CHECK_MESSAGE( ( int(r1.my_count) == N), "counting receiver r1 has not received N items" );
+    CHECK_MESSAGE( ( int(r2.my_count) == 0), "counting receiver r2 has not received 0 items" );
 
-    for (int i = 0; i < N; ++i) { b.try_put(i); }
+    for (int i = 0; i < N; ++i) {
+       b.try_put(i);
+    }
     g.wait_for_all();
 
-    INFO("async_body_exec_count = " << int(async_body_exec_count) << "\n");
-    INFO("r1.my_count == " << int(r1.my_count) << " and r2.my_count = " << int(r2.my_count) << "\n");
-    CHECK_MESSAGE((int(async_body_exec_count) == 2 * NUMBER_OF_MSGS),
-                  "AsyncBody processed wrong number of signals");
-    CHECK_MESSAGE((int(r1.my_count) == N), "counting receiver r1 has not received N items");
-    CHECK_MESSAGE((int(r2.my_count) == N), "counting receiver r2 has not received N items");
+    INFO("async_body_exec_count = " << int(async_body_exec_count) << "\n" );
+    INFO("r1.my_count == " << int(r1.my_count) << " and r2.my_count = " << int(r2.my_count) << "\n" );
+    CHECK_MESSAGE( ( int(async_body_exec_count) == 2*NUMBER_OF_MSGS), "AsyncBody processed wrong number of signals" );
+    CHECK_MESSAGE( ( int(r1.my_count) == N), "counting receiver r1 has not received N items" );
+    CHECK_MESSAGE( ( int(r2.my_count) == N), "counting receiver r2 has not received N items" );
     return 0;
 }
 
 std::atomic<int> main_tid_count;
 
-template <typename Input, typename Output>
+template<typename Input, typename Output>
 struct spin_test {
     typedef Input input_type;
     typedef Output output_type;
-    typedef tbb::flow::async_node<input_type, output_type> async_node_type;
+    typedef tbb::flow::async_node< input_type, output_type > async_node_type;
     typedef typename async_node_type::gateway_type gateway_type;
 
     class end_body_type {
         typedef Output output_type;
         std::thread::id my_main_tid;
-        utils::SpinBarrier* my_barrier;
-
+        utils::SpinBarrier *my_barrier;
     public:
-        end_body_type(std::thread::id t, utils::SpinBarrier& b) : my_main_tid(t), my_barrier(&b) {}
+        end_body_type(std::thread::id t, utils::SpinBarrier &b) : my_main_tid(t), my_barrier(&b) { }
 
-        void operator()(const output_type&) {
+        void operator()( const output_type & ) {
             ++end_body_exec_count;
-            if (std::this_thread::get_id() == my_main_tid) { ++main_tid_count; }
+            if (std::this_thread::get_id() == my_main_tid) {
+               ++main_tid_count;
+            }
             my_barrier->wait();
         }
     };
@@ -495,64 +536,75 @@ struct spin_test {
         utils::SpinBarrier spin_barrier(nthreads);
 
         tbb::flow::graph g;
-        tbb::flow::function_node<int, input_type> start_node(g, tbb::flow::unlimited,
-                                                             [](int input) { return input_type(input); });
-        async_node_type offload_node(g, tbb::flow::unlimited,
-                                     [&](const input_type& input, gateway_type& gateway) {
-                                         ++async_body_exec_count;
-                                         if (my_async_activity.should_reserve_each_time())
-                                             gateway.reserve_wait();
-                                         my_async_activity.submit(input, gateway);
-                                     });
+        tbb::flow::function_node<int, input_type> start_node(
+            g, tbb::flow::unlimited, [](int input) { return input_type(input); }
+        );
+        async_node_type offload_node(
+            g, tbb::flow::unlimited,
+            [&](const input_type &input, gateway_type& gateway) {
+                ++async_body_exec_count;
+                if(my_async_activity.should_reserve_each_time())
+                    gateway.reserve_wait();
+                my_async_activity.submit(input, gateway);
+            }
+        );
         tbb::flow::function_node<output_type> end_node(
-                g, tbb::flow::unlimited, end_body_type(std::this_thread::get_id(), spin_barrier));
+            g, tbb::flow::unlimited, end_body_type(std::this_thread::get_id(), spin_barrier)
+        );
 
-        tbb::flow::make_edge(start_node, offload_node);
-        tbb::flow::make_edge(offload_node, end_node);
+        tbb::flow::make_edge( start_node, offload_node );
+        tbb::flow::make_edge( offload_node, end_node );
 
         async_body_exec_count = 0;
         async_activity_processed_msg_count = 0;
         end_body_exec_count = 0;
         main_tid_count = 0;
 
-        if (async_expected_items != UNKNOWN_NUMBER_OF_ITEMS) { offload_node.gateway().reserve_wait(); }
-        for (int i = 0; i < overall_message_count; ++i) { start_node.try_put(i); }
+        if (async_expected_items != UNKNOWN_NUMBER_OF_ITEMS ) {
+            offload_node.gateway().reserve_wait();
+        }
+        for (int i = 0; i < overall_message_count; ++i) {
+            start_node.try_put(i);
+        }
         g.wait_for_all();
-        CHECK_MESSAGE((async_body_exec_count == overall_message_count),
-                      "AsyncBody processed wrong number of signals");
-        CHECK_MESSAGE((async_activity_processed_msg_count == overall_message_count),
-                      "AsyncActivity processed wrong number of signals");
-        CHECK_MESSAGE((end_body_exec_count == overall_message_count),
-                      "EndBody processed wrong number of signals");
-
-        INFO("Main thread participated in " << main_tid_count << " end_body tasks\n");
-
-        INFO("async_body_exec_count == "
-             << int(async_body_exec_count)
-             << " == async_activity_processed_msg_count == " << int(async_activity_processed_msg_count)
-             << " == end_body_exec_count == " << int(end_body_exec_count) << "\n");
+        CHECK_MESSAGE( (async_body_exec_count == overall_message_count),
+                       "AsyncBody processed wrong number of signals" );
+        CHECK_MESSAGE( (async_activity_processed_msg_count == overall_message_count),
+                       "AsyncActivity processed wrong number of signals" );
+        CHECK_MESSAGE( (end_body_exec_count == overall_message_count),
+                       "EndBody processed wrong number of signals");
+
+        INFO( "Main thread participated in " << main_tid_count << " end_body tasks\n");
+
+        INFO("async_body_exec_count == " << int(async_body_exec_count) <<
+             " == async_activity_processed_msg_count == " << int(async_activity_processed_msg_count) <<
+             " == end_body_exec_count == " << int(end_body_exec_count) << "\n"
+        );
         return 0;
     }
+
 };
 
 void test_for_spin_avoidance() {
     const int nthreads = 4;
     tbb::global_control gc(tbb::global_control::max_allowed_parallelism, nthreads);
     tbb::task_arena a(nthreads);
-    a.execute([&] { spin_test<int, int>::run(nthreads); });
+    a.execute([&] {
+        spin_test<int, int>::run(nthreads);
+    });
 }
 
-template <typename Input, typename Output>
+template< typename Input, typename Output >
 int run_tests() {
     basic_test<Input, Output>::run();
     basic_test<Input, Output>::run(NUMBER_OF_MSGS);
-    basic_test<place_wrapper<Input>, place_wrapper<Output>>::run();
-    basic_test<place_wrapper<Input>, place_wrapper<Output>>::run(NUMBER_OF_MSGS);
+    basic_test<place_wrapper<Input>, place_wrapper<Output> >::run();
+    basic_test<place_wrapper<Input>, place_wrapper<Output> >::run(NUMBER_OF_MSGS);
     return 0;
 }
 
 #include "tbb/parallel_for.h"
-template <typename Input, typename Output>
+template<typename Input, typename Output>
 class enqueueing_on_inner_level {
     typedef Input input_type;
     typedef Output output_type;
@@ -562,22 +614,25 @@ class enqueueing_on_inner_level {
 
     class body_graph_with_async {
     public:
-        body_graph_with_async(utils::SpinBarrier& barrier, async_activity_type& activity)
+        body_graph_with_async( utils::SpinBarrier& barrier, async_activity_type& activity )
             : spin_barrier(&barrier), my_async_activity(&activity) {}
 
         void operator()(int) const {
             tbb::flow::graph g;
-            tbb::flow::function_node<int, input_type> start_node(g, tbb::flow::unlimited,
-                                                                 [](int input) { return input_type(input); });
-            async_node_type offload_node(g, tbb::flow::unlimited,
-                                         [&](const input_type& input, gateway_type& gateway) {
-                                             gateway.reserve_wait();
-                                             my_async_activity->submit(input, gateway);
-                                         });
-            tbb::flow::function_node<output_type> end_node(g, tbb::flow::unlimited, [](output_type) {});
-
-            tbb::flow::make_edge(start_node, offload_node);
-            tbb::flow::make_edge(offload_node, end_node);
+            tbb::flow::function_node< int, input_type > start_node(
+                g, tbb::flow::unlimited, [](int input) { return input_type(input); }
+            );
+            async_node_type offload_node(
+                g, tbb::flow::unlimited,
+                [&](const input_type &input, gateway_type& gateway) {
+                    gateway.reserve_wait();
+                    my_async_activity->submit( input, gateway );
+                }
+            );
+            tbb::flow::function_node< output_type > end_node( g, tbb::flow::unlimited, [](output_type){} );
+
+            tbb::flow::make_edge( start_node, offload_node );
+            tbb::flow::make_edge( offload_node, end_node );
 
             start_node.try_put(1);
 
@@ -594,13 +649,14 @@ class enqueueing_on_inner_level {
     };
 
 public:
-    static int run() {
+    static int run ()
+    {
         const int nthreads = tbb::this_task_arena::max_concurrency();
-        utils::SpinBarrier spin_barrier(nthreads);
+        utils::SpinBarrier spin_barrier( nthreads );
 
-        async_activity_type my_async_activity(UNKNOWN_NUMBER_OF_ITEMS, true);
+        async_activity_type my_async_activity( UNKNOWN_NUMBER_OF_ITEMS, true );
 
-        tbb::parallel_for(0, nthreads, body_graph_with_async(spin_barrier, my_async_activity));
+        tbb::parallel_for( 0, nthreads, body_graph_with_async( spin_barrier, my_async_activity ) );
         return 0;
     }
 };
@@ -613,7 +669,7 @@ int run_test_enqueueing_on_inner_level() {
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 #include <array>
 
-template <typename NodeType>
+template<typename NodeType>
 class AsyncActivity {
 public:
     using gateway_t = typename NodeType::gateway_type;
@@ -623,18 +679,17 @@ class AsyncActivity {
         gateway_t* gateway;
     };
 
-    AsyncActivity(size_t limit)
-        : stop_limit(limit), c(0), thr([this]() {
-              while (!end_of_work()) {
-                  work_type w;
-                  while (my_q.try_pop(w)) {
-                      int res = do_work(w.input);
-                      w.gateway->try_put(res);
-                      w.gateway->release_wait();
-                      ++c;
-                  }
-              }
-          }) {}
+    AsyncActivity(size_t limit) : stop_limit(limit), c(0), thr([this]() {
+        while(!end_of_work()) {
+            work_type w;
+            while( my_q.try_pop(w) ) {
+                int res = do_work(w.input);
+                w.gateway->try_put(res);
+                w.gateway->release_wait();
+                ++c;
+            }
+        }
+    }) {}
 
     void submit(int i, gateway_t* gateway) {
         work_type w = {i, gateway};
@@ -666,25 +721,31 @@ void test_follows() {
 
     AsyncActivity<node_t> async_activity(3);
 
-    std::array<broadcast_node<input_t>, 3> preds
-            = {{broadcast_node<input_t>(g), broadcast_node<input_t>(g), broadcast_node<input_t>(g)}};
+    std::array<broadcast_node<input_t>, 3> preds = {
+      {
+        broadcast_node<input_t>(g),
+        broadcast_node<input_t>(g),
+        broadcast_node<input_t>(g)
+      }
+    };
 
-    node_t node(
-            follows(preds[0], preds[1], preds[2]), unlimited,
-            [&](int input, node_t::gateway_type& gtw) { async_activity.submit(input, &gtw); }, no_priority);
+    node_t node(follows(preds[0], preds[1], preds[2]), unlimited, [&](int input, node_t::gateway_type& gtw) {
+        async_activity.submit(input, &gtw);
+    }, no_priority);
 
     buffer_node<output_t> buf(g);
     make_edge(node, buf);
 
-    for (auto& pred : preds) { pred.try_put(1); }
+    for(auto& pred: preds) {
+        pred.try_put(1);
+    }
 
     g.wait_for_all();
     async_activity.wait_for_all();
 
     output_t storage;
-    CHECK_MESSAGE(
-            (buf.try_get(storage) && buf.try_get(storage) && buf.try_get(storage) && !buf.try_get(storage)),
-            "Not exact edge quantity was made");
+    CHECK_MESSAGE((buf.try_get(storage) && buf.try_get(storage) && buf.try_get(storage) && !buf.try_get(storage)),
+                  "Not exact edge quantity was made");
 }
 
 void test_precedes() {
@@ -698,13 +759,13 @@ void test_precedes() {
 
     AsyncActivity<node_t> async_activity(1);
 
-    std::array<buffer_node<input_t>, 1> successors = {{buffer_node<input_t>(g)}};
+    std::array<buffer_node<input_t>, 1> successors = { {buffer_node<input_t>(g)} };
 
     broadcast_node<input_t> start(g);
 
-    node_t node(
-            precedes(successors[0]), unlimited,
-            [&](int input, node_t::gateway_type& gtw) { async_activity.submit(input, &gtw); }, no_priority);
+    node_t node(precedes(successors[0]), unlimited, [&](int input, node_t::gateway_type& gtw) {
+        async_activity.submit(input, &gtw);
+    }, no_priority);
 
     make_edge(start, node);
 
@@ -713,7 +774,7 @@ void test_precedes() {
     g.wait_for_all();
     async_activity.wait_for_all();
 
-    for (auto& successor : successors) {
+    for(auto& successor : successors) {
         output_t storage;
         CHECK_MESSAGE((successor.try_get(storage) && !successor.try_get(storage)),
                       "Not exact edge quantity was made");
@@ -724,43 +785,57 @@ void test_follows_and_precedes_api() {
     test_follows();
     test_precedes();
 }
-#endif// __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+#endif // __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 
 //! Test async bodies processing
 //! \brief \ref requirement \ref error_guessing
-TEST_CASE("Basic tests") {
+TEST_CASE("Basic tests"){
     tbb::task_arena arena(utils::MaxThread);
-    arena.execute([&]() {
-        run_tests<int, int>();
-        run_tests<minimal_type, minimal_type>();
-        run_tests<int, minimal_type>();
-    });
+    arena.execute(
+        [&]() {
+            run_tests<int, int>();
+            run_tests<minimal_type, minimal_type>();
+            run_tests<int, minimal_type>();
+        }
+    );
 }
 
 //! NativeParallelFor test with various concurrency settings
 //! \brief \ref requirement \ref error_guessing
-TEST_CASE("Lightweight tests") { lightweight_testing::test<tbb::flow::async_node>(NUMBER_OF_MSGS); }
+TEST_CASE("Lightweight tests"){
+    lightweight_testing::test<tbb::flow::async_node>(NUMBER_OF_MSGS);
+}
 
 //! Test reset and cancellation
 //! \brief \ref error_guessing
-TEST_CASE("Reset test") { test_reset(); }
+TEST_CASE("Reset test"){
+    test_reset();
+}
 
 //! Test
 //! \brief \ref requirement \ref error_guessing
-TEST_CASE("Copy constructor test") { test_copy_ctor(); }
+TEST_CASE("Copy constructor test"){
+    test_copy_ctor();
+}
 
 //! Test if main thread spins
 //! \brief \ref stress
-TEST_CASE("Spin avoidance test") { test_for_spin_avoidance(); }
+TEST_CASE("Spin avoidance test"){
+    test_for_spin_avoidance();
+}
 
 //! Test nested enqueuing
 //! \brief \ref error_guessing
-TEST_CASE("Inner enqueuing test") { run_test_enqueueing_on_inner_level(); }
+TEST_CASE("Inner enqueuing test"){
+    run_test_enqueueing_on_inner_level();
+}
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-//! Test deprecated follows and preceedes API
+//! Test deprecated follows and precedes API
 //! \brief \ref error_guessing
-TEST_CASE("Test follows and preceedes API") { test_follows_and_precedes_api(); }
+TEST_CASE("Test follows and precedes API"){
+    test_follows_and_precedes_api();
+}
 #endif
 
 #if __TBB_CPP20_CONCEPTS_PRESENT
@@ -768,26 +843,24 @@ TEST_CASE("Test follows and preceedes API") { test_follows_and_precedes_api(); }
 TEST_CASE("constraints for async_node input") {
     struct InputObject {
         InputObject() = default;
-        InputObject(const InputObject&) = default;
+        InputObject( const InputObject& ) = default;
     };
 
     static_assert(utils::well_formed_instantiation<tbb::flow::async_node, InputObject, int>);
     static_assert(utils::well_formed_instantiation<tbb::flow::async_node, int, int>);
     static_assert(!utils::well_formed_instantiation<tbb::flow::async_node, test_concepts::NonCopyable, int>);
-    static_assert(!utils::well_formed_instantiation<tbb::flow::async_node,
-                                                    test_concepts::NonDefaultInitializable, int>);
+    static_assert(!utils::well_formed_instantiation<tbb::flow::async_node, test_concepts::NonDefaultInitializable, int>);
 }
 
 template <typename Input, typename Output, typename Body>
-concept can_call_async_node_ctor
-        = requires(tbb::flow::graph& graph, std::size_t concurrency, Body body,
-                   tbb::flow::node_priority_t priority, tbb::flow::buffer_node<int>& f) {
+concept can_call_async_node_ctor = requires( tbb::flow::graph& graph, std::size_t concurrency,
+                                             Body body, tbb::flow::node_priority_t priority, tbb::flow::buffer_node<int>& f ) {
     tbb::flow::async_node<Input, Output>(graph, concurrency, body);
     tbb::flow::async_node<Input, Output>(graph, concurrency, body, priority);
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
     tbb::flow::async_node<Input, Output>(tbb::flow::follows(f), concurrency, body);
     tbb::flow::async_node<Input, Output>(tbb::flow::follows(f), concurrency, body, priority);
-#endif// __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+#endif // __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 };
 
 //! \brief \ref error_guessing
@@ -798,14 +871,10 @@ TEST_CASE("constraints for async_node body") {
 
     static_assert(can_call_async_node_ctor<input_type, output_type, Correct<input_type, output_type>>);
     static_assert(!can_call_async_node_ctor<input_type, output_type, NonCopyable<input_type, output_type>>);
-    static_assert(
-            !can_call_async_node_ctor<input_type, output_type, NonDestructible<input_type, output_type>>);
-    static_assert(!can_call_async_node_ctor<input_type, output_type,
-                                            NoOperatorRoundBrackets<input_type, output_type>>);
-    static_assert(!can_call_async_node_ctor<input_type, output_type,
-                                            WrongFirstInputOperatorRoundBrackets<input_type, output_type>>);
-    static_assert(!can_call_async_node_ctor<input_type, output_type,
-                                            WrongSecondInputOperatorRoundBrackets<input_type, output_type>>);
+    static_assert(!can_call_async_node_ctor<input_type, output_type, NonDestructible<input_type, output_type>>);
+    static_assert(!can_call_async_node_ctor<input_type, output_type, NoOperatorRoundBrackets<input_type, output_type>>);
+    static_assert(!can_call_async_node_ctor<input_type, output_type, WrongFirstInputOperatorRoundBrackets<input_type, output_type>>);
+    static_assert(!can_call_async_node_ctor<input_type, output_type, WrongSecondInputOperatorRoundBrackets<input_type, output_type>>);
 }
 
-#endif// __TBB_CPP20_CONCEPTS_PRESENT
+#endif // __TBB_CPP20_CONCEPTS_PRESENT
diff --git a/external/tbb/test/tbb/test_blocked_range.cpp b/external/tbb/test/tbb/test_blocked_range.cpp
index 3f5fa5cf..cd1636e7 100644
--- a/external/tbb/test/tbb/test_blocked_range.cpp
+++ b/external/tbb/test/tbb/test_blocked_range.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2025 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -14,24 +14,23 @@
     limitations under the License.
 */
 
-#include "common/concepts_common.h"
-#include "common/config.h"
-#include "common/range_based_for_support.h"
 #include "common/test.h"
 #include "common/utils.h"
 #include "common/utils_report.h"
+#include "common/range_based_for_support.h"
+#include "common/config.h"
+#include "common/concepts_common.h"
 
 #include "tbb/blocked_range.h"
 #include "tbb/blocked_range2d.h"
 #include "tbb/blocked_range3d.h"
-#define TBB_PREVIEW_BLOCKED_RANGE_ND 1
-#include "tbb/blocked_rangeNd.h"
+#include "tbb/blocked_nd_range.h"
 
 //! \file test_blocked_range.cpp
-//! \brief Test for [algorithms.blocked_range] specification
+//! \brief Test for [algorithms.blocked_range algorithms.blocked_range2d algorithms.blocked_range3d algorithms.blocked_nd_range] specification
 
+#include <utility> //for std::pair
 #include <functional>
-#include <utility>//for std::pair
 #include <vector>
 
 //! Testing blocked_range with range based for
@@ -42,12 +41,13 @@ TEST_CASE("Range based for") {
     const std::size_t sequence_length = 100;
     std::size_t int_array[sequence_length] = {0};
 
-    for (std::size_t i = 0; i < sequence_length; ++i) { int_array[i] = i + 1; }
+    for (std::size_t i = 0; i < sequence_length; ++i) {
+        int_array[i] = i + 1;
+    }
     const tbb::blocked_range<std::size_t*> r(int_array, int_array + sequence_length, 1);
 
     CHECK_MESSAGE(range_based_for_accumulate<std::size_t>(r, std::plus<std::size_t>(), std::size_t(0))
-                          == gauss_summ_of_int_sequence(sequence_length),
-                  "incorrect accumulated value generated via range based for ?");
+            == gauss_summ_of_int_sequence(sequence_length), "incorrect accumulated value generated via range based for ?");
 }
 
 //! Proportional split does not overflow with blocked range
@@ -67,21 +67,19 @@ TEST_CASE("Proportional split overflow") {
     // overflow-free computation
     std::size_t parts = p.left() + p.right();
     std::size_t int_part = size / parts;
-    std::size_t fraction = size - int_part * parts;// fraction < parts
+    std::size_t fraction = size - int_part * parts; // fraction < parts
     std::size_t right_idx = int_part * p.right() + fraction * p.right() / parts + 1;
     std::size_t newRangeBegin = end - right_idx;
 
     // Division in 'right_idx' very likely is inexact also.
     std::size_t tolerance = 1;
-    std::size_t diff
-            = (r2.begin() < newRangeBegin) ? (newRangeBegin - r2.begin()) : (r2.begin() - newRangeBegin);
+    std::size_t diff = (r2.begin() < newRangeBegin) ? (newRangeBegin - r2.begin()) : (r2.begin() - newRangeBegin);
     bool is_split_correct = diff <= tolerance;
-    bool test_passed = (r1.begin() == begin && r1.end() == r2.begin() && is_split_correct && r2.end() == end);
+    bool test_passed = (r1.begin() == begin && r1.end() == r2.begin() && is_split_correct &&
+                        r2.end() == end);
     if (!test_passed) {
         REPORT("Incorrect split of blocked range[%lu, %lu) into r1[%lu, %lu) and r2[%lu, %lu), "
-               "must be r1[%lu, %lu) and r2[%lu, %lu)\n",
-               begin, end, r1.begin(), r1.end(), r2.begin(), r2.end(), begin, newRangeBegin, newRangeBegin,
-               end);
+               "must be r1[%lu, %lu) and r2[%lu, %lu)\n", begin, end, r1.begin(), r1.end(), r2.begin(), r2.end(), begin, newRangeBegin, newRangeBegin, end);
         CHECK(test_passed);
     }
 }
@@ -89,69 +87,55 @@ TEST_CASE("Proportional split overflow") {
 #if __TBB_CPP20_CONCEPTS_PRESENT
 
 template <bool ExpectSatisfies, typename... Types>
-requires(...
-         && (utils::well_formed_instantiation<
-                     tbb::blocked_range, Types> == ExpectSatisfies)) void test_blocked_range_constraint() {}
+    requires (... && (utils::well_formed_instantiation<tbb::blocked_range, Types> == ExpectSatisfies))
+void test_blocked_range_constraint() {}
 
 template <bool ExpectSatisfies, typename... Types>
-requires(...
-         && (utils::well_formed_instantiation<
-                     tbb::blocked_range2d, Types,
-                     Types> == ExpectSatisfies)) void test_blocked_range2d_constraint() {}
+    requires (... && (utils::well_formed_instantiation<tbb::blocked_range2d, Types, Types> == ExpectSatisfies))
+void test_blocked_range2d_constraint() {}
 
 template <typename... Types>
-requires(...
-         && (utils::well_formed_instantiation<
-                     tbb::blocked_range2d, Types,
-                     test_concepts::Dummy> == false)) void test_blocked_range2d_col_invalid_constraint() {}
+    requires (... && (utils::well_formed_instantiation<tbb::blocked_range2d, Types, test_concepts::Dummy> == false))
+void test_blocked_range2d_col_invalid_constraint() {}
 
 template <typename... Types>
-requires(...
-         && (utils::well_formed_instantiation<
-                     tbb::blocked_range2d, test_concepts::Dummy,
-                     Types> == false)) void test_blocked_range2d_row_invalid_constraint() {}
+    requires (... && (utils::well_formed_instantiation<tbb::blocked_range2d, test_concepts::Dummy, Types> == false))
+void test_blocked_range2d_row_invalid_constraint() {}
 
 template <bool ExpectSatisfies, typename... Types>
-requires(...
-         && (utils::well_formed_instantiation<
-                     tbb::blocked_range3d, Types, Types,
-                     Types> == ExpectSatisfies)) void test_blocked_range3d_constraint() {}
+    requires (... && (utils::well_formed_instantiation<tbb::blocked_range3d, Types, Types, Types> == ExpectSatisfies))
+void test_blocked_range3d_constraint() {}
 
 template <typename... Types>
-requires(...
-         && (utils::well_formed_instantiation<
-                     tbb::blocked_range3d, test_concepts::Dummy, Types,
-                     Types> == false)) void test_blocked_range3d_page_invalid_constraint() {}
+    requires (... && (utils::well_formed_instantiation<tbb::blocked_range3d, test_concepts::Dummy, Types, Types> == false))
+void test_blocked_range3d_page_invalid_constraint() {}
 
 template <typename... Types>
-requires(...
-         && (utils::well_formed_instantiation<
-                     tbb::blocked_range3d, Types, test_concepts::Dummy,
-                     Types> == false)) void test_blocked_range3d_row_invalid_constraint() {}
+    requires (... && (utils::well_formed_instantiation<tbb::blocked_range3d, Types, test_concepts::Dummy, Types> == false))
+void test_blocked_range3d_row_invalid_constraint() {}
 
 template <typename... Types>
-requires(...
-         && (utils::well_formed_instantiation<
-                     tbb::blocked_range3d, Types, Types,
-                     test_concepts::Dummy> == false)) void test_blocked_range3d_col_invalid_constraint() {}
+    requires (... && (utils::well_formed_instantiation<tbb::blocked_range3d, Types, Types, test_concepts::Dummy> == false))
+void test_blocked_range3d_col_invalid_constraint() {}
 
 template <typename T>
-concept well_formed_blocked_range_Nd_instantiation_basic = requires {
-    typename tbb::blocked_rangeNd<T, 1>;
+concept well_formed_blocked_nd_range_instantiation_basic = requires {
+    typename tbb::blocked_nd_range<T, 1>;
 };
 
 template <typename... Types>
-concept well_formed_blocked_range_Nd_instantiation
-        = (... && well_formed_blocked_range_Nd_instantiation_basic<Types>);
+concept well_formed_blocked_nd_range_instantiation = ( ... && well_formed_blocked_nd_range_instantiation_basic<Types> );
 
 //! \brief \ref error_guessing
 TEST_CASE("constraints for blocked_range value") {
     using namespace test_concepts::blocked_range_value;
     using const_iterator = typename std::vector<int>::const_iterator;
 
-    test_blocked_range_constraint</*Expected = */ true, Correct, char, int, std::size_t, const_iterator>();
+    test_blocked_range_constraint</*Expected = */true,
+                                  Correct, char, int, std::size_t, const_iterator>();
 
-    test_blocked_range_constraint</*Expected = */ false, NonCopyable, NonCopyAssignable, NonDestructible,
+    test_blocked_range_constraint</*Expected = */false,
+                                  NonCopyable, NonCopyAssignable, NonDestructible,
                                   NoOperatorLess, OperatorLessNonConst, WrongReturnOperatorLess,
                                   NoOperatorMinus, OperatorMinusNonConst, WrongReturnOperatorMinus,
                                   NoOperatorPlus, OperatorPlusNonConst, WrongReturnOperatorPlus>();
@@ -162,9 +146,11 @@ TEST_CASE("constraints for blocked_range2d value") {
     using namespace test_concepts::blocked_range_value;
     using const_iterator = typename std::vector<int>::const_iterator;
 
-    test_blocked_range2d_constraint</*Expected = */ true, Correct, char, int, std::size_t, const_iterator>();
+    test_blocked_range2d_constraint</*Expected = */true,
+                                    Correct, char, int, std::size_t, const_iterator>();
 
-    test_blocked_range2d_constraint</*Expected = */ false, NonCopyable, NonCopyAssignable, NonDestructible,
+    test_blocked_range2d_constraint</*Expected = */false,
+                                    NonCopyable, NonCopyAssignable, NonDestructible,
                                     NoOperatorLess, OperatorLessNonConst, WrongReturnOperatorLess,
                                     NoOperatorMinus, OperatorMinusNonConst, WrongReturnOperatorMinus,
                                     NoOperatorPlus, OperatorPlusNonConst, WrongReturnOperatorPlus>();
@@ -178,9 +164,11 @@ TEST_CASE("constraints for blocked_range3d value") {
     using namespace test_concepts::blocked_range_value;
     using const_iterator = typename std::vector<int>::const_iterator;
 
-    test_blocked_range3d_constraint</*Expected = */ true, Correct, char, int, std::size_t, const_iterator>();
+    test_blocked_range3d_constraint</*Expected = */true,
+                                    Correct, char, int, std::size_t, const_iterator>();
 
-    test_blocked_range3d_constraint</*Expected = */ false, NonCopyable, NonCopyAssignable, NonDestructible,
+    test_blocked_range3d_constraint</*Expected = */false,
+                                    NonCopyable, NonCopyAssignable, NonDestructible,
                                     NoOperatorLess, OperatorLessNonConst, WrongReturnOperatorLess,
                                     NoOperatorMinus, OperatorMinusNonConst, WrongReturnOperatorMinus,
                                     NoOperatorPlus, OperatorPlusNonConst, WrongReturnOperatorPlus>();
@@ -191,17 +179,161 @@ TEST_CASE("constraints for blocked_range3d value") {
 }
 
 //! \brief \ref error_guessing
-TEST_CASE("constraints for blocked_rangeNd value") {
+TEST_CASE("constraints for blocked_nd_range value") {
     using namespace test_concepts::blocked_range_value;
     using const_iterator = typename std::vector<int>::const_iterator;
 
-    static_assert(
-            well_formed_blocked_range_Nd_instantiation<Correct, char, int, std::size_t, const_iterator>);
+    static_assert(well_formed_blocked_nd_range_instantiation<Correct, char, int, std::size_t, const_iterator>);
 
-    static_assert(!well_formed_blocked_range_Nd_instantiation<
-                  NonCopyable, NonCopyAssignable, NonDestructible, NoOperatorLess, OperatorLessNonConst,
-                  WrongReturnOperatorLess, NoOperatorMinus, OperatorMinusNonConst, WrongReturnOperatorMinus,
-                  NoOperatorPlus, OperatorPlusNonConst, WrongReturnOperatorPlus>);
+    static_assert(!well_formed_blocked_nd_range_instantiation<NonCopyable, NonCopyAssignable, NonDestructible,
+                                                              NoOperatorLess, OperatorLessNonConst, WrongReturnOperatorLess,
+                                                              NoOperatorMinus, OperatorMinusNonConst, WrongReturnOperatorMinus,
+                                                              NoOperatorPlus, OperatorPlusNonConst, WrongReturnOperatorPlus>);
 }
 
-#endif// __TBB_CPP20_CONCEPTS_PRESENT
+#endif // __TBB_CPP20_CONCEPTS_PRESENT
+
+#if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT && __TBB_PREVIEW_BLOCKED_ND_RANGE_DEDUCTION_GUIDES
+template <typename T>
+void test_deduction_guides() {
+    using oneapi::tbb::blocked_nd_range;
+    static_assert(std::is_constructible<T, int>::value, "Incorrect test setup");
+    // T as a grainsize in braced-init-list constructions should be used since only
+    // the same type is allowed by the braced-init-list
+    static_assert(std::is_convertible<T, typename blocked_nd_range<T, 1>::size_type>::value,
+                  "Incorrect test setup");
+
+    std::vector<T> v;
+    using iterator = typename decltype(v)::iterator;
+
+    oneapi::tbb::blocked_range<T> dim_range(0, 100);
+
+    blocked_nd_range<T, 2> source_range(dim_range, dim_range);
+
+    {
+        blocked_nd_range range(dim_range, dim_range, dim_range);
+        static_assert(std::is_same_v<decltype(range), blocked_nd_range<T, 3>>);
+    }
+    {
+        blocked_nd_range range({v.begin(), v.end()}, {v.begin(), v.end()});
+        static_assert(std::is_same_v<decltype(range), blocked_nd_range<iterator, 2>>);
+    }
+    {
+        blocked_nd_range range({T{0}, T{100}}, {T{0}, T{100}, T{5}}, {T{0}, T{100}}, {T{0}, T{100}, T{5}});
+        static_assert(std::is_same_v<decltype(range), blocked_nd_range<T, 4>>);
+    }
+    {
+        blocked_nd_range range({T{100}});
+        static_assert(std::is_same_v<decltype(range), blocked_nd_range<T, 1>>);
+    }
+    {
+        T array[1] = {100};
+        blocked_nd_range range(array);
+        static_assert(std::is_same_v<decltype(range), blocked_nd_range<T, 1>>);
+    }
+    {
+        blocked_nd_range range({T{100}}, 5);
+        static_assert(std::is_same_v<decltype(range), blocked_nd_range<T, 1>>);
+    }
+    {
+        T array[1] = {100};
+        blocked_nd_range range(array, 5);
+        static_assert(std::is_same_v<decltype(range), blocked_nd_range<T, 1>>);
+    }
+    {
+        blocked_nd_range range({T{100}, T{200}}, 5);
+        static_assert(std::is_same_v<decltype(range), blocked_nd_range<T, 2>>);
+    }
+    {
+        blocked_nd_range range({T{100}, T{200}});
+        static_assert(std::is_same_v<decltype(range), blocked_nd_range<T, 2>>);
+    }
+    {
+        T array[2] = {100, 200};
+        blocked_nd_range range(array, 5);
+        static_assert(std::is_same_v<decltype(range), blocked_nd_range<T, 2>>);
+    }
+    {
+        blocked_nd_range range({T{100}, T{200}, T{300}}, 5);
+        static_assert(std::is_same_v<decltype(range), blocked_nd_range<T, 3>>);
+    }
+    {
+        blocked_nd_range range({T{100}, T{200}, T{300}});
+        static_assert(std::is_same_v<decltype(range), blocked_nd_range<T, 3>>);
+    }
+    {
+        T array[3] = {100, 200, 300};
+        blocked_nd_range range(array, 5);
+        static_assert(std::is_same_v<decltype(range), blocked_nd_range<T, 3>>);
+    }
+    {
+        blocked_nd_range range({T{100}, T{200}, T{300}, T{400}});
+        static_assert(std::is_same_v<decltype(range), blocked_nd_range<T, 4>>);
+    }
+    {
+        T array[4] = {100, 200, 300, 400};
+        blocked_nd_range range(array);
+        static_assert(std::is_same_v<decltype(range), blocked_nd_range<T, 4>>);
+
+    }
+    {
+        blocked_nd_range range({T{100}, T{200}, T{300}, T{400}}, 5);
+        static_assert(std::is_same_v<decltype(range), blocked_nd_range<T, 4>>);
+    }
+    {
+        T array[4] = {100, 200, 300, 400};
+        blocked_nd_range range(array, 5);
+        static_assert(std::is_same_v<decltype(range), blocked_nd_range<T, 4>>);
+    }
+    {
+        blocked_nd_range range(source_range, oneapi::tbb::split{});
+        static_assert(std::is_same_v<decltype(range), decltype(source_range)>);
+    }
+    {
+        blocked_nd_range range(source_range, oneapi::tbb::proportional_split{1, 3});
+        static_assert(std::is_same_v<decltype(range), decltype(source_range)>);
+    }
+    {
+        blocked_nd_range range(source_range);
+        static_assert(std::is_same_v<decltype(range), decltype(source_range)>);
+    }
+    {
+        blocked_nd_range range(std::move(source_range));
+        static_assert(std::is_same_v<decltype(range), decltype(source_range)>);
+    }
+}
+
+class fancy_value {
+public:
+    fancy_value(std::size_t real_value) : my_real_value(real_value) {}
+    fancy_value(const fancy_value&) = default;
+    ~fancy_value() = default;
+    fancy_value& operator=(const fancy_value&) = default;
+
+    friend bool operator<(const fancy_value& lhs, const fancy_value& rhs) {
+        return lhs.my_real_value < rhs.my_real_value;
+    }
+    friend std::size_t operator-(const fancy_value& lhs, const fancy_value& rhs) {
+        return lhs.my_real_value - rhs.my_real_value;
+    }
+    friend std::size_t operator-(const fancy_value& lhs, std::size_t offset) {
+        return lhs.my_real_value - offset;
+    }
+    friend fancy_value operator+(const fancy_value& lhs, std::size_t offset) {
+        return fancy_value(lhs.my_real_value + offset);
+    }
+
+    operator std::size_t() const {
+        return my_real_value;
+    }
+private:
+    std::size_t my_real_value;
+};
+
+//! Testing blocked_nd_range deduction guides
+//! \brief \ref interface \ref requirement
+TEST_CASE("blocked_nd_range deduction guides") {
+    test_deduction_guides<int>();
+    test_deduction_guides<fancy_value>();
+}
+#endif // __TBB_CPP17_DEDUCTION_GUIDES_PRESENT && __TBB_PREVIEW_BLOCKED_ND_RANGE_DEDUCTION_GUIDES
diff --git a/external/tbb/test/tbb/test_broadcast_node.cpp b/external/tbb/test/tbb/test_broadcast_node.cpp
index ce99611f..662a0833 100644
--- a/external/tbb/test/tbb/test_broadcast_node.cpp
+++ b/external/tbb/test/tbb/test_broadcast_node.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -19,17 +19,19 @@
 #include "tbb/flow_graph.h"
 
 #include "common/test.h"
-#include "common/test_follows_and_precedes_api.h"
 #include "common/utils.h"
+#include "common/test_follows_and_precedes_api.h"
 
 #include <atomic>
 
+
 //! \file test_broadcast_node.cpp
 //! \brief Test for [flow_graph.broadcast_node] specification
 
-#define TBB_INTERNAL_NAMESPACE detail::d1
+
+#define TBB_INTERNAL_NAMESPACE detail::d2
 namespace tbb {
-    using task = TBB_INTERNAL_NAMESPACE::graph_task;
+using task = TBB_INTERNAL_NAMESPACE::graph_task;
 }
 using tbb::TBB_INTERNAL_NAMESPACE::SUCCESSFULLY_ENQUEUED;
 
@@ -38,95 +40,125 @@ const int R = 4;
 
 class int_convertable_type : private utils::NoAssign {
 
-    int my_value;
+   int my_value;
 
 public:
-    int_convertable_type(int v) : my_value(v) {}
-    operator int() const { return my_value; }
+
+   int_convertable_type( int v ) : my_value(v) {}
+   operator int() const { return my_value; }
+
 };
 
-template <typename T>
+
+template< typename T >
 class counting_array_receiver : public tbb::flow::receiver<T> {
 
     std::atomic<size_t> my_counters[N];
     tbb::flow::graph& my_graph;
 
 public:
+
     counting_array_receiver(tbb::flow::graph& g) : my_graph(g) {
-        for (int i = 0; i < N; ++i) my_counters[i] = 0;
+        for (int i = 0; i < N; ++i )
+           my_counters[i] = 0;
     }
 
-    size_t operator[](int i) {
+    size_t operator[]( int i ) {
         size_t v = my_counters[i];
         return v;
     }
 
-    tbb::task* try_put_task(const T& v) override {
-        ++my_counters[(int) v];
-        return const_cast<tbb::task*>(SUCCESSFULLY_ENQUEUED);
+    tbb::task * try_put_task( const T &v ) override {
+        ++my_counters[(int)v];
+        return const_cast<tbb::task *>(SUCCESSFULLY_ENQUEUED);
+    }
+
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+    tbb::task * try_put_task( const T &v, const tbb::detail::d2::message_metainfo& ) override {
+        return try_put_task(v);
     }
+#endif
 
-    tbb::flow::graph& graph_reference() const override { return my_graph; }
+    tbb::flow::graph& graph_reference() const override {
+        return my_graph;
+    }
 };
 
-template <typename T>
+template< typename T >
 void test_serial_broadcasts() {
 
     tbb::flow::graph g;
     tbb::flow::broadcast_node<T> b(g);
 
-    for (int num_receivers = 1; num_receivers < R; ++num_receivers) {
-        std::vector<std::shared_ptr<counting_array_receiver<T>>> receivers;
-        for (int i = 0; i < num_receivers; ++i)
-            receivers.push_back(std::make_shared<counting_array_receiver<T>>(g));
+    for ( int num_receivers = 1; num_receivers < R; ++num_receivers ) {
+        std::vector< std::shared_ptr<counting_array_receiver<T>> > receivers;
+        for( int i = 0; i < num_receivers; ++i )
+            receivers.push_back( std::make_shared<counting_array_receiver<T>>(g) );
 
-        for (int r = 0; r < num_receivers; ++r) { tbb::flow::make_edge(b, *receivers[r]); }
+        for ( int r = 0; r < num_receivers; ++r ) {
+            tbb::flow::make_edge( b, *receivers[r] );
+        }
 
-        for (int n = 0; n < N; ++n) { CHECK_MESSAGE(b.try_put((T) n), ""); }
+        for (int n = 0; n < N; ++n ) {
+            CHECK_MESSAGE( b.try_put( (T)n ), "" );
+        }
 
-        for (int r = 0; r < num_receivers; ++r) {
-            for (int n = 0; n < N; ++n) { CHECK_MESSAGE((*receivers[r])[n] == 1, ""); }
-            tbb::flow::remove_edge(b, *receivers[r]);
+        for ( int r = 0; r < num_receivers; ++r ) {
+            for (int n = 0; n < N; ++n ) {
+                CHECK_MESSAGE( (*receivers[r])[n] == 1, "" );
+            }
+            tbb::flow::remove_edge( b, *receivers[r] );
         }
-        CHECK_MESSAGE(b.try_put((T) 0), "");
-        for (int r = 0; r < num_receivers; ++r) CHECK_MESSAGE((*receivers[0])[0] == 1, "");
+        CHECK_MESSAGE( b.try_put( (T)0 ), "" );
+        for ( int r = 0; r < num_receivers; ++r )
+            CHECK_MESSAGE( (*receivers[0])[0] == 1, "" );
     }
+
 }
 
-template <typename T>
+template< typename T >
 class native_body : private utils::NoAssign {
 
-    tbb::flow::broadcast_node<T>& my_b;
+    tbb::flow::broadcast_node<T> &my_b;
 
 public:
-    native_body(tbb::flow::broadcast_node<T>& b) : my_b(b) {}
+
+    native_body( tbb::flow::broadcast_node<T> &b ) : my_b(b) {}
 
     void operator()(int) const {
-        for (int n = 0; n < N; ++n) { CHECK_MESSAGE(my_b.try_put((T) n), ""); }
+        for (int n = 0; n < N; ++n ) {
+            CHECK_MESSAGE( my_b.try_put( (T)n ), "" );
+        }
     }
+
 };
 
-template <typename T>
+template< typename T >
 void run_parallel_broadcasts(tbb::flow::graph& g, int p, tbb::flow::broadcast_node<T>& b) {
-    for (int num_receivers = 1; num_receivers < R; ++num_receivers) {
-        std::vector<std::shared_ptr<counting_array_receiver<T>>> receivers;
-        for (int i = 0; i < num_receivers; ++i)
-            receivers.push_back(std::make_shared<counting_array_receiver<T>>(g));
+    for ( int num_receivers = 1; num_receivers < R; ++num_receivers ) {
+        std::vector< std::shared_ptr<counting_array_receiver<T>> > receivers;
+        for( int i = 0; i < num_receivers; ++i )
+            receivers.push_back( std::make_shared< counting_array_receiver<T> >(g) );
 
-        for (int r = 0; r < num_receivers; ++r) { tbb::flow::make_edge(b, *receivers[r]); }
+        for ( int r = 0; r < num_receivers; ++r ) {
+            tbb::flow::make_edge( b, *receivers[r] );
+        }
 
-        utils::NativeParallelFor(p, native_body<T>(b));
+        utils::NativeParallelFor( p, native_body<T>( b ) );
 
-        for (int r = 0; r < num_receivers; ++r) {
-            for (int n = 0; n < N; ++n) { CHECK_MESSAGE((int) (*receivers[r])[n] == p, ""); }
-            tbb::flow::remove_edge(b, *receivers[r]);
+        for ( int r = 0; r < num_receivers; ++r ) {
+            for (int n = 0; n < N; ++n ) {
+                CHECK_MESSAGE( (int)(*receivers[r])[n] == p, "" );
+            }
+            tbb::flow::remove_edge( b, *receivers[r] );
         }
-        CHECK_MESSAGE(b.try_put((T) 0), "");
-        for (int r = 0; r < num_receivers; ++r) CHECK_MESSAGE((int) (*receivers[r])[0] == p, "");
+        CHECK_MESSAGE( b.try_put( (T)0 ), "" );
+        for ( int r = 0; r < num_receivers; ++r )
+            CHECK_MESSAGE( (int)(*receivers[r])[0] == p, "" );
     }
 }
 
-template <typename T>
+template< typename T >
 void test_parallel_broadcasts(int p) {
 
     tbb::flow::graph g;
@@ -140,34 +172,42 @@ void test_parallel_broadcasts(int p) {
 
 // broadcast_node does not allow successors to try_get from it (it does not allow
 // the flow edge to switch) so we only need test the forward direction.
-template <typename T>
+template<typename T>
 void test_resets() {
     tbb::flow::graph g;
     tbb::flow::broadcast_node<T> b0(g);
     tbb::flow::broadcast_node<T> b1(g);
     tbb::flow::queue_node<T> q0(g);
-    tbb::flow::make_edge(b0, b1);
-    tbb::flow::make_edge(b1, q0);
+    tbb::flow::make_edge(b0,b1);
+    tbb::flow::make_edge(b1,q0);
     T j;
 
     // test standard reset
-    for (int testNo = 0; testNo < 2; ++testNo) {
-        for (T i = 0; i <= 3; i += 1) { b0.try_put(i); }
+    for(int testNo = 0; testNo < 2; ++testNo) {
+        for(T i= 0; i <= 3; i += 1) {
+            b0.try_put(i);
+        }
         g.wait_for_all();
-        for (T i = 0; i <= 3; i += 1) { CHECK_MESSAGE((q0.try_get(j) && j == i), "Bad value in queue"); }
-        CHECK_MESSAGE((!q0.try_get(j)), "extra value in queue");
+        for(T i= 0; i <= 3; i += 1) {
+            CHECK_MESSAGE( (q0.try_get(j) && j == i), "Bad value in queue");
+        }
+        CHECK_MESSAGE( (!q0.try_get(j)), "extra value in queue");
 
         // reset the graph.  It should work as before.
         if (testNo == 0) g.reset();
     }
 
     g.reset(tbb::flow::rf_clear_edges);
-    for (T i = 0; i <= 3; i += 1) { b0.try_put(i); }
+    for(T i= 0; i <= 3; i += 1) {
+        b0.try_put(i);
+    }
     g.wait_for_all();
-    CHECK_MESSAGE((!q0.try_get(j)), "edge between nodes not removed");
-    for (T i = 0; i <= 3; i += 1) { b1.try_put(i); }
+    CHECK_MESSAGE( (!q0.try_get(j)), "edge between nodes not removed");
+    for(T i= 0; i <= 3; i += 1) {
+        b1.try_put(i);
+    }
     g.wait_for_all();
-    CHECK_MESSAGE((!q0.try_get(j)), "edge between nodes not removed");
+    CHECK_MESSAGE( (!q0.try_get(j)), "edge between nodes not removed");
 }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
@@ -176,12 +216,11 @@ void test_resets() {
 void test_follows_and_precedes_api() {
     using msg_t = tbb::flow::continue_msg;
 
-    std::array<msg_t, 3> messages_for_follows = {{msg_t(), msg_t(), msg_t()}};
+    std::array<msg_t, 3> messages_for_follows= { {msg_t(), msg_t(), msg_t()} };
     std::vector<msg_t> messages_for_precedes = {msg_t()};
 
-    follows_and_precedes_testing::test_follows<msg_t, tbb::flow::broadcast_node<msg_t>>(messages_for_follows);
-    follows_and_precedes_testing::test_precedes<msg_t, tbb::flow::broadcast_node<msg_t>>(
-            messages_for_precedes);
+    follows_and_precedes_testing::test_follows <msg_t, tbb::flow::broadcast_node<msg_t>>(messages_for_follows);
+    follows_and_precedes_testing::test_precedes <msg_t, tbb::flow::broadcast_node<msg_t>>(messages_for_precedes);
 }
 #endif
 
@@ -208,39 +247,210 @@ void test_deduction_guides() {
 }
 #endif
 
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+// Basic idea of the following tests is to check that try_put_and_wait(message) call for broadcast_node
+// processes all of the previous jobs required to process message, the message itself, but does
+// not process the elements submitted later or not required to process the message
+// These tests submit start_work_items using the regular try_put and then submit wait_message
+// with try_put_and_wait. During the completion of the graph, new_work_items would be submitted
+// once the wait_message arrives.
+void test_try_put_and_wait_spawning_and_serial_receiver() {
+    tbb::task_arena arena(1);
+
+    arena.execute([&]{
+        tbb::flow::graph g;
+
+        std::vector<int> start_work_items;
+        std::vector<int> processed_items_unlimited, processed_items_serial;
+        std::vector<int> new_work_items;
+
+        int wait_message = 10;
+
+        for (int i = 0; i < wait_message; ++i) {
+            start_work_items.emplace_back(i);
+            new_work_items.emplace_back(i + 1 + wait_message);
+        }
+
+        tbb::flow::broadcast_node<int> broadcast(g);
+
+        // Broadcast to 2 function_nodes, one with unlimited concurrency and the other serial
+        tbb::flow::function_node<int, int, tbb::flow::queueing> unlimited(g, tbb::flow::unlimited,
+            [&](int input) noexcept {
+                if (input == wait_message) {
+                    for (auto item : new_work_items) {
+                        broadcast.try_put(item);
+                    }
+                }
+                processed_items_unlimited.emplace_back(input);
+                return 0;
+            });
+        tbb::flow::make_edge(broadcast, unlimited);
+
+        tbb::flow::function_node<int, int, tbb::flow::queueing> serial(g, tbb::flow::serial,
+            [&](int input) noexcept {
+                processed_items_serial.emplace_back(input);
+                return 0;
+            });
+        tbb::flow::make_edge(broadcast, serial);
+
+        for (int i = 0; i < wait_message; ++i) {
+            broadcast.try_put(i);
+        }
+
+        broadcast.try_put_and_wait(wait_message);
+
+        size_t unlimited_check_index = 0, serial_check_index = 0;
+
+        // For the unlimited function_node, all of the tasks for start_work_items and wait_message would be spawned
+        // and hence processed by the thread in LIFO order.
+        // The first processed item is expected to be wait_message since it was spawned last
+        CHECK_MESSAGE(processed_items_unlimited.size() == new_work_items.size() + start_work_items.size(),
+                      "Unexpected number of processed items");
+        CHECK_MESSAGE(processed_items_unlimited[unlimited_check_index++] == wait_message, "Unexpected items processing");
+        for (int i = int(new_work_items.size()) - 1; i >= 0; --i) {
+            CHECK_MESSAGE(processed_items_unlimited[unlimited_check_index++] == new_work_items[i], "Unexpected items processing");
+        }
+        for (int i = int(start_work_items.size()) - 1; i >= 1; --i) {
+            CHECK_MESSAGE(processed_items_unlimited[unlimited_check_index++] == start_work_items[i], "Unexpected items processing");
+        }
+
+        // Serial queueing function_node should add all start_work_items except the first one into the queue
+        // and then process them in FIFO order.
+        // wait_message would also be added to the queue, but would be processed later
+        CHECK_MESSAGE(processed_items_serial.size() == start_work_items.size() + 1,
+                      "Unexpected number of processed items");
+        for (auto item : start_work_items) {
+            CHECK_MESSAGE(processed_items_serial[serial_check_index++] == item, "Unexpected items processing");
+        }
+        CHECK_MESSAGE(processed_items_serial[serial_check_index++] == wait_message, "Unexpected items processing");
+
+        g.wait_for_all();
+
+        CHECK_MESSAGE(processed_items_unlimited[unlimited_check_index++] == start_work_items[0], "Unexpected items processing");
+
+        // For serial queueing function_node, the new_work_items are expected to be processed while calling to wait_for_all
+        // They would be queued and processed later in FIFO order
+        for (auto item : new_work_items) {
+            CHECK_MESSAGE(processed_items_serial[serial_check_index++] == item, "Unexpected items processing");
+        }
+        CHECK(serial_check_index == processed_items_serial.size());
+        CHECK(unlimited_check_index == processed_items_unlimited.size());
+    });
+}
+
+void test_try_put_and_wait_spawning_receivers() {
+    tbb::task_arena arena(1);
+
+    arena.execute([&]{
+        tbb::flow::graph g;
+
+        int wait_message = 10;
+        int num_successors = wait_message - 1;
+
+        std::vector<int> start_work_items;
+        std::vector<std::vector<int>> processed_items(num_successors);
+        std::vector<int> new_work_items;
+
+        for (int i = 0; i < wait_message; ++i) {
+            start_work_items.emplace_back(i);
+            new_work_items.emplace_back(i + 1 + wait_message);
+        }
+
+        tbb::flow::broadcast_node<int> broadcast(g);
+
+        std::vector<tbb::flow::function_node<int, int, tbb::flow::queueing>> successors;
+        successors.reserve(num_successors);
+        for (int i = 0; i < num_successors; ++i) {
+            successors.emplace_back(g, tbb::flow::unlimited,
+                [&, i](int input) noexcept {
+                    if (input == wait_message) {
+                        broadcast.try_put(new_work_items[i]);
+                    }
+                    processed_items[i].emplace_back(input);
+                    return 0;
+                });
+            tbb::flow::make_edge(broadcast, successors.back());
+        }
+
+        for (int i = 0; i < wait_message; ++i) {
+            broadcast.try_put(i);
+        }
+
+        broadcast.try_put_and_wait(wait_message);
+
+        for (int i = num_successors - 1; i >= 0; --i) {
+            size_t check_index = 0;
+            for (int j = num_successors - 1; j != i; --j) {
+                CHECK_MESSAGE(processed_items[i][check_index++] == new_work_items[j], "Unexpected items processing");
+            }
+            CHECK_MESSAGE(processed_items[i][check_index++] == wait_message, "Unexpected items processing");
+            for (int j = i; j >= 1; --j) {
+                CHECK_MESSAGE(processed_items[i][check_index++] == new_work_items[j], "Unexpected items processing");
+            }
+        }
+
+        g.wait_for_all();
+
+        for (auto& processed_item : processed_items) {
+            size_t check_index = num_successors;
+            CHECK_MESSAGE(processed_item[check_index++] == new_work_items[0], "Unexpected items processing");
+            for (int i = int(start_work_items.size()) - 1; i >= 0; --i) {
+                CHECK_MESSAGE(processed_item[check_index++] == start_work_items[i], "Unexpected items processing");
+            }
+        }
+    });
+}
+
+void test_try_put_and_wait() {
+    test_try_put_and_wait_spawning_and_serial_receiver();
+    test_try_put_and_wait_spawning_receivers();
+}
+#endif // __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+
 //! Test serial broadcasts
 //! \brief \ref error_guessing
-TEST_CASE("Serial broadcasts") {
-    test_serial_broadcasts<int>();
-    test_serial_broadcasts<float>();
-    test_serial_broadcasts<int_convertable_type>();
+TEST_CASE("Serial broadcasts"){
+   test_serial_broadcasts<int>();
+   test_serial_broadcasts<float>();
+   test_serial_broadcasts<int_convertable_type>();
 }
 
 //! Test parallel broadcasts
 //! \brief \ref error_guessing
-TEST_CASE("Parallel broadcasts") {
-    for (unsigned int p = utils::MinThread; p <= utils::MaxThread; ++p) {
-        test_parallel_broadcasts<int>(p);
-        test_parallel_broadcasts<float>(p);
-        test_parallel_broadcasts<int_convertable_type>(p);
-    }
+TEST_CASE("Parallel broadcasts"){
+    for( unsigned int p=utils::MinThread; p<=utils::MaxThread; ++p ) {
+       test_parallel_broadcasts<int>(p);
+       test_parallel_broadcasts<float>(p);
+       test_parallel_broadcasts<int_convertable_type>(p);
+   }
 }
 
 //! Test reset and cancellation behavior
 //! \brief \ref error_guessing
-TEST_CASE("Resets") {
-    test_resets<int>();
-    test_resets<float>();
+TEST_CASE("Resets"){
+   test_resets<int>();
+   test_resets<float>();
 }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-//! Test deprecated follows and preceedes API
+//! Test deprecated follows and precedes API
 //! \brief \ref error_guessing
-TEST_CASE("Follows and preceedes API") { test_follows_and_precedes_api(); }
+TEST_CASE("Follows and precedes API"){
+    test_follows_and_precedes_api();
+}
 #endif
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 //! Test deduction guides
 //! \brief requirement
-TEST_CASE("Deduction guides") { test_deduction_guides(); }
+TEST_CASE("Deduction guides"){
+    test_deduction_guides();
+}
+#endif
+
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+//! \brief \ref error_guessing
+TEST_CASE("test broadcast_node try_put_and_wait") {
+    test_try_put_and_wait();
+}
 #endif
diff --git a/external/tbb/test/tbb/test_buffer_node.cpp b/external/tbb/test/tbb/test_buffer_node.cpp
index e7521bc3..527005ae 100644
--- a/external/tbb/test/tbb/test_buffer_node.cpp
+++ b/external/tbb/test/tbb/test_buffer_node.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -19,10 +19,12 @@
 #include "tbb/flow_graph.h"
 #include "tbb/global_control.h"
 
-#include "common/graph_utils.h"
 #include "common/test.h"
-#include "common/test_follows_and_precedes_api.h"
 #include "common/utils.h"
+#include "common/graph_utils.h"
+#include "common/test_follows_and_precedes_api.h"
+
+#include "test_buffering_try_put_and_wait.h"
 
 //! \file test_buffer_node.cpp
 //! \brief Test for [flow_graph.buffer_node] specification
@@ -30,103 +32,112 @@
 #define N 1000
 #define C 10
 
-template <typename T>
-void spin_try_get(tbb::flow::buffer_node<T> &b, T &value) {
-    while (b.try_get(value) != true) {}
+template< typename T >
+void spin_try_get( tbb::flow::buffer_node<T> &b, T &value ) {
+    while ( b.try_get(value) != true ) {}
 }
 
-template <typename T>
-void check_item(T *count_value, T &value) {
+template< typename T >
+void check_item( T* count_value, T &value ) {
     count_value[value / N] += value % N;
 }
 
-template <typename T>
+template< typename T >
 struct parallel_puts : utils::NoAssign {
 
     tbb::flow::buffer_node<T> &my_b;
 
-    parallel_puts(tbb::flow::buffer_node<T> &b) : my_b(b) {}
+    parallel_puts( tbb::flow::buffer_node<T> &b ) : my_b(b) {}
 
     void operator()(int i) const {
         for (int j = 0; j < N; ++j) {
-            bool msg = my_b.try_put(T(N * i + j));
-            CHECK_MESSAGE(msg == true, "");
+            bool msg = my_b.try_put( T(N*i + j) );
+            CHECK_MESSAGE( msg == true, "" );
         }
     }
 };
 
-template <typename T>
+template< typename T >
 struct touches {
 
     bool **my_touches;
     int my_num_threads;
 
-    touches(int num_threads) : my_num_threads(num_threads) {
-        my_touches = new bool *[my_num_threads];
-        for (int p = 0; p < my_num_threads; ++p) {
+    touches( int num_threads ) : my_num_threads(num_threads) {
+        my_touches = new bool* [my_num_threads];
+        for ( int p = 0; p < my_num_threads; ++p) {
             my_touches[p] = new bool[N];
-            for (int n = 0; n < N; ++n) my_touches[p][n] = false;
+            for ( int n = 0; n < N; ++n)
+                my_touches[p][n] = false;
         }
     }
 
     ~touches() {
-        for (int p = 0; p < my_num_threads; ++p) { delete[] my_touches[p]; }
-        delete[] my_touches;
+        for ( int p = 0; p < my_num_threads; ++p) {
+            delete [] my_touches[p];
+        }
+        delete [] my_touches;
     }
 
-    bool check(T v) {
-        CHECK_MESSAGE(my_touches[v / N][v % N] == false, "");
-        my_touches[v / N][v % N] = true;
+    bool check( T v ) {
+        CHECK_MESSAGE( my_touches[v/N][v%N] == false, "" );
+        my_touches[v/N][v%N] = true;
         return true;
     }
 
     bool validate_touches() {
-        for (int p = 0; p < my_num_threads; ++p) {
-            for (int n = 0; n < N; ++n) { CHECK_MESSAGE(my_touches[p][n] == true, ""); }
+        for ( int p = 0; p < my_num_threads; ++p) {
+            for ( int n = 0; n < N; ++n) {
+                CHECK_MESSAGE( my_touches[p][n] == true, "" );
+            }
         }
         return true;
     }
 };
 
-template <typename T>
+template< typename T >
 struct parallel_gets : utils::NoAssign {
 
     tbb::flow::buffer_node<T> &my_b;
     touches<T> &my_touches;
 
-    parallel_gets(tbb::flow::buffer_node<T> &b, touches<T> &t) : my_b(b), my_touches(t) {}
+    parallel_gets( tbb::flow::buffer_node<T> &b, touches<T> &t) : my_b(b), my_touches(t) {}
 
     void operator()(int) const {
         for (int j = 0; j < N; ++j) {
             T v;
-            spin_try_get(my_b, v);
-            my_touches.check(v);
+            spin_try_get( my_b, v );
+            my_touches.check( v );
         }
     }
+
 };
 
-template <typename T>
+template< typename T >
 struct parallel_put_get : utils::NoAssign {
 
     tbb::flow::buffer_node<T> &my_b;
     touches<T> &my_touches;
 
-    parallel_put_get(tbb::flow::buffer_node<T> &b, touches<T> &t) : my_b(b), my_touches(t) {}
+    parallel_put_get( tbb::flow::buffer_node<T> &b, touches<T> &t ) : my_b(b), my_touches(t) {}
 
     void operator()(int tid) const {
 
-        for (int i = 0; i < N; i += C) {
-            int j_end = (N < i + C) ? N : i + C;
+        for ( int i = 0; i < N; i+=C ) {
+            int j_end = ( N < i + C ) ? N : i + C;
             // dump about C values into the buffer
-            for (int j = i; j < j_end; ++j) { CHECK_MESSAGE(my_b.try_put(T(N * tid + j)) == true, ""); }
+            for ( int j = i; j < j_end; ++j ) {
+                CHECK_MESSAGE( my_b.try_put( T (N*tid + j ) ) == true, "" );
+            }
             // receiver about C values from the buffer
-            for (int j = i; j < j_end; ++j) {
+            for ( int j = i; j < j_end; ++j ) {
                 T v;
-                spin_try_get(my_b, v);
-                my_touches.check(v);
+                spin_try_get( my_b, v );
+                my_touches.check( v );
             }
         }
     }
+
 };
 
 //
@@ -134,7 +145,7 @@ struct parallel_put_get : utils::NoAssign {
 //
 // Item can be reserved, released, consumed ( single serial receiver )
 //
-template <typename T>
+template< typename T >
 int test_reservation() {
     tbb::flow::graph g;
     T bogus_value(-1);
@@ -147,29 +158,29 @@ int test_reservation() {
     b.try_put(T(3));
 
     T v, vsum;
-    CHECK_MESSAGE(b.try_reserve(v) == true, "");
-    CHECK_MESSAGE(b.try_release() == true, "");
+    CHECK_MESSAGE( b.try_reserve(v) == true, "" );
+    CHECK_MESSAGE( b.try_release() == true, "" );
     v = bogus_value;
     g.wait_for_all();
-    CHECK_MESSAGE(b.try_reserve(v) == true, "");
-    CHECK_MESSAGE(b.try_consume() == true, "");
+    CHECK_MESSAGE( b.try_reserve(v) == true, "" );
+    CHECK_MESSAGE( b.try_consume() == true, "" );
     vsum += v;
     v = bogus_value;
     g.wait_for_all();
 
-    CHECK_MESSAGE(b.try_get(v) == true, "");
+    CHECK_MESSAGE( b.try_get(v) == true, "" );
     vsum += v;
     v = bogus_value;
     g.wait_for_all();
 
-    CHECK_MESSAGE(b.try_reserve(v) == true, "");
-    CHECK_MESSAGE(b.try_release() == true, "");
+    CHECK_MESSAGE( b.try_reserve(v) == true, "" );
+    CHECK_MESSAGE( b.try_release() == true, "" );
     v = bogus_value;
     g.wait_for_all();
-    CHECK_MESSAGE(b.try_reserve(v) == true, "");
-    CHECK_MESSAGE(b.try_consume() == true, "");
+    CHECK_MESSAGE( b.try_reserve(v) == true, "" );
+    CHECK_MESSAGE( b.try_consume() == true, "" );
     vsum += v;
-    CHECK_MESSAGE(vsum == T(6), "");
+    CHECK_MESSAGE( vsum == T(6), "");
     v = bogus_value;
     g.wait_for_all();
 
@@ -184,7 +195,7 @@ int test_reservation() {
 //   * overlapped puts / gets
 //   * all puts finished before any getS
 //
-template <typename T>
+template< typename T >
 int test_parallel(int num_threads) {
     tbb::flow::graph g;
     tbb::flow::buffer_node<T> b(g);
@@ -193,97 +204,97 @@ int test_parallel(int num_threads) {
     T bogus_value(-1);
     T j = bogus_value;
 
-    NativeParallelFor(num_threads, parallel_puts<T>(b));
+    NativeParallelFor( num_threads, parallel_puts<T>(b) );
 
     T *next_value = new T[num_threads];
     for (int tid = 0; tid < num_threads; ++tid) next_value[tid] = T(0);
 
-    for (int i = 0; i < num_threads * N; ++i) {
-        spin_try_get(b, j);
-        check_item(next_value, j);
+    for (int i = 0; i < num_threads * N; ++i ) {
+        spin_try_get( b, j );
+        check_item( next_value, j );
         j = bogus_value;
     }
-    for (int tid = 0; tid < num_threads; ++tid) {
-        CHECK_MESSAGE(next_value[tid] == T((N * (N - 1)) / 2), "");
+    for (int tid = 0; tid < num_threads; ++tid)  {
+        CHECK_MESSAGE( next_value[tid] == T((N*(N-1))/2), "" );
     }
 
     j = bogus_value;
     g.wait_for_all();
-    CHECK_MESSAGE(b.try_get(j) == false, "");
-    CHECK_MESSAGE(j == bogus_value, "");
+    CHECK_MESSAGE( b.try_get( j ) == false, "" );
+    CHECK_MESSAGE( j == bogus_value, "" );
 
-    NativeParallelFor(num_threads, parallel_puts<T>(b));
+    NativeParallelFor( num_threads, parallel_puts<T>(b) );
 
     {
-        touches<T> t(num_threads);
-        NativeParallelFor(num_threads, parallel_gets<T>(b, t));
+        touches< T > t( num_threads );
+        NativeParallelFor( num_threads, parallel_gets<T>(b, t) );
         g.wait_for_all();
-        CHECK_MESSAGE(t.validate_touches(), "");
+        CHECK_MESSAGE( t.validate_touches(), "" );
     }
     j = bogus_value;
-    CHECK_MESSAGE(b.try_get(j) == false, "");
-    CHECK_MESSAGE(j == bogus_value, "");
+    CHECK_MESSAGE( b.try_get( j ) == false, "" );
+    CHECK_MESSAGE( j == bogus_value, "" );
 
     g.wait_for_all();
     {
-        touches<T> t(num_threads);
-        NativeParallelFor(num_threads, parallel_put_get<T>(b, t));
+        touches< T > t( num_threads );
+        NativeParallelFor( num_threads, parallel_put_get<T>(b, t) );
         g.wait_for_all();
-        CHECK_MESSAGE(t.validate_touches(), "");
+        CHECK_MESSAGE( t.validate_touches(), "" );
     }
     j = bogus_value;
-    CHECK_MESSAGE(b.try_get(j) == false, "");
-    CHECK_MESSAGE(j == bogus_value, "");
+    CHECK_MESSAGE( b.try_get( j ) == false, "" );
+    CHECK_MESSAGE( j == bogus_value, "" );
 
-    tbb::flow::make_edge(b, b2);
-    tbb::flow::make_edge(b2, b3);
+    tbb::flow::make_edge( b, b2 );
+    tbb::flow::make_edge( b2, b3 );
 
-    NativeParallelFor(num_threads, parallel_puts<T>(b));
+    NativeParallelFor( num_threads, parallel_puts<T>(b) );
     {
-        touches<T> t(num_threads);
-        NativeParallelFor(num_threads, parallel_gets<T>(b3, t));
+        touches< T > t( num_threads );
+        NativeParallelFor( num_threads, parallel_gets<T>(b3, t) );
         g.wait_for_all();
-        CHECK_MESSAGE(t.validate_touches(), "");
+        CHECK_MESSAGE( t.validate_touches(), "" );
     }
     j = bogus_value;
     g.wait_for_all();
-    CHECK_MESSAGE(b.try_get(j) == false, "");
+    CHECK_MESSAGE( b.try_get( j ) == false, "" );
     g.wait_for_all();
-    CHECK_MESSAGE(b2.try_get(j) == false, "");
+    CHECK_MESSAGE( b2.try_get( j ) == false, "" );
     g.wait_for_all();
-    CHECK_MESSAGE(b3.try_get(j) == false, "");
-    CHECK_MESSAGE(j == bogus_value, "");
+    CHECK_MESSAGE( b3.try_get( j ) == false, "" );
+    CHECK_MESSAGE( j == bogus_value, "" );
 
     // test copy constructor
-    CHECK_MESSAGE(b.remove_successor(b2), "");
+    CHECK_MESSAGE( b.remove_successor( b2 ), "" );
     // fill up b:
-    NativeParallelFor(num_threads, parallel_puts<T>(b));
+    NativeParallelFor( num_threads, parallel_puts<T>(b) );
     // copy b:
     tbb::flow::buffer_node<T> b_copy(b);
 
     // b_copy should be empty
     j = bogus_value;
     g.wait_for_all();
-    CHECK_MESSAGE(b_copy.try_get(j) == false, "");
+    CHECK_MESSAGE( b_copy.try_get( j ) == false, "" );
 
     // hook them together:
-    CHECK_MESSAGE(b.register_successor(b_copy) == true, "");
+    CHECK_MESSAGE( b.register_successor(b_copy) == true, "" );
     // try to get content from b_copy
     {
-        touches<T> t(num_threads);
-        NativeParallelFor(num_threads, parallel_gets<T>(b_copy, t));
+        touches< T > t( num_threads );
+        NativeParallelFor( num_threads, parallel_gets<T>(b_copy, t) );
         g.wait_for_all();
-        CHECK_MESSAGE(t.validate_touches(), "");
+        CHECK_MESSAGE( t.validate_touches(), "" );
     }
     // now both should be empty
     j = bogus_value;
     g.wait_for_all();
-    CHECK_MESSAGE(b.try_get(j) == false, "");
+    CHECK_MESSAGE( b.try_get( j ) == false, "" );
     g.wait_for_all();
-    CHECK_MESSAGE(b_copy.try_get(j) == false, "");
-    CHECK_MESSAGE(j == bogus_value, "");
+    CHECK_MESSAGE( b_copy.try_get( j ) == false, "" );
+    CHECK_MESSAGE( j == bogus_value, "" );
 
-    delete[] next_value;
+    delete [] next_value;
     return 0;
 }
 
@@ -296,11 +307,11 @@ int test_parallel(int num_threads) {
 // Chained buffers ( 2 & 3 ), single sender, items at last buffer in arbitrary order
 //
 
-#define TBB_INTERNAL_NAMESPACE detail::d1
+#define TBB_INTERNAL_NAMESPACE detail::d2
 using tbb::TBB_INTERNAL_NAMESPACE::register_predecessor;
 using tbb::TBB_INTERNAL_NAMESPACE::remove_predecessor;
 
-template <typename T>
+template< typename T >
 int test_serial() {
     tbb::flow::graph g;
     T bogus_value(-1);
@@ -313,98 +324,98 @@ int test_serial() {
     // Rejects attempts to add / remove predecessor
     // Rejects request from empty buffer
     //
-    CHECK_MESSAGE(register_predecessor<T>(b, b2) == false, "");
-    CHECK_MESSAGE(remove_predecessor<T>(b, b2) == false, "");
-    CHECK_MESSAGE(b.try_get(j) == false, "");
-    CHECK_MESSAGE(j == bogus_value, "");
+    CHECK_MESSAGE( register_predecessor<T>( b, b2 ) == false, "" );
+    CHECK_MESSAGE( remove_predecessor<T>( b, b2 ) == false, "" );
+    CHECK_MESSAGE( b.try_get( j ) == false, "" );
+    CHECK_MESSAGE( j == bogus_value, "" );
 
     //
     // Simple puts and gets
     //
 
     for (int i = 0; i < N; ++i) {
-        bool msg = b.try_put(T(i));
-        CHECK_MESSAGE(msg == true, "");
+        bool msg = b.try_put( T(i) );
+        CHECK_MESSAGE( msg == true, "" );
     }
 
     T vsum = T(0);
     for (int i = 0; i < N; ++i) {
         j = bogus_value;
-        spin_try_get(b, j);
+        spin_try_get( b, j );
         vsum += j;
     }
-    CHECK_MESSAGE(vsum == (N * (N - 1)) / 2, "");
+    CHECK_MESSAGE( vsum == (N*(N-1))/2, "");
     j = bogus_value;
     g.wait_for_all();
-    CHECK_MESSAGE(b.try_get(j) == false, "");
-    CHECK_MESSAGE(j == bogus_value, "");
+    CHECK_MESSAGE( b.try_get( j ) == false, "" );
+    CHECK_MESSAGE( j == bogus_value, "" );
 
     tbb::flow::make_edge(b, b2);
 
     vsum = T(0);
     for (int i = 0; i < N; ++i) {
-        bool msg = b.try_put(T(i));
-        CHECK_MESSAGE(msg == true, "");
+        bool msg = b.try_put( T(i) );
+        CHECK_MESSAGE( msg == true, "" );
     }
 
     for (int i = 0; i < N; ++i) {
         j = bogus_value;
-        spin_try_get(b2, j);
+        spin_try_get( b2, j );
         vsum += j;
     }
-    CHECK_MESSAGE(vsum == (N * (N - 1)) / 2, "");
+    CHECK_MESSAGE( vsum == (N*(N-1))/2, "");
     j = bogus_value;
     g.wait_for_all();
-    CHECK_MESSAGE(b.try_get(j) == false, "");
+    CHECK_MESSAGE( b.try_get( j ) == false, "" );
     g.wait_for_all();
-    CHECK_MESSAGE(b2.try_get(j) == false, "");
-    CHECK_MESSAGE(j == bogus_value, "");
+    CHECK_MESSAGE( b2.try_get( j ) == false, "" );
+    CHECK_MESSAGE( j == bogus_value, "" );
 
     tbb::flow::remove_edge(b, b2);
-    CHECK_MESSAGE(b.try_put(1) == true, "");
+    CHECK_MESSAGE( b.try_put( 1 ) == true, "" );
     g.wait_for_all();
-    CHECK_MESSAGE(b2.try_get(j) == false, "");
-    CHECK_MESSAGE(j == bogus_value, "");
+    CHECK_MESSAGE( b2.try_get( j ) == false, "" );
+    CHECK_MESSAGE( j == bogus_value, "" );
     g.wait_for_all();
-    CHECK_MESSAGE(b.try_get(j) == true, "");
-    CHECK_MESSAGE(j == 1, "");
+    CHECK_MESSAGE( b.try_get( j ) == true, "" );
+    CHECK_MESSAGE( j == 1, "" );
 
     tbb::flow::buffer_node<T> b3(g);
-    tbb::flow::make_edge(b, b2);
-    tbb::flow::make_edge(b2, b3);
+    tbb::flow::make_edge( b, b2 );
+    tbb::flow::make_edge( b2, b3 );
 
     vsum = T(0);
     for (int i = 0; i < N; ++i) {
-        bool msg = b.try_put(T(i));
-        CHECK_MESSAGE(msg == true, "");
+        bool msg = b.try_put( T(i) );
+        CHECK_MESSAGE( msg == true, "" );
     }
 
     for (int i = 0; i < N; ++i) {
         j = bogus_value;
-        spin_try_get(b3, j);
+        spin_try_get( b3, j );
         vsum += j;
     }
-    CHECK_MESSAGE(vsum == (N * (N - 1)) / 2, "");
+    CHECK_MESSAGE( vsum == (N*(N-1))/2, "");
     j = bogus_value;
     g.wait_for_all();
-    CHECK_MESSAGE(b.try_get(j) == false, "");
+    CHECK_MESSAGE( b.try_get( j ) == false, "" );
     g.wait_for_all();
-    CHECK_MESSAGE(b2.try_get(j) == false, "");
+    CHECK_MESSAGE( b2.try_get( j ) == false, "" );
     g.wait_for_all();
-    CHECK_MESSAGE(b3.try_get(j) == false, "");
-    CHECK_MESSAGE(j == bogus_value, "");
+    CHECK_MESSAGE( b3.try_get( j ) == false, "" );
+    CHECK_MESSAGE( j == bogus_value, "" );
 
     tbb::flow::remove_edge(b, b2);
-    CHECK_MESSAGE(b.try_put(1) == true, "");
+    CHECK_MESSAGE( b.try_put( 1 ) == true, "" );
     g.wait_for_all();
-    CHECK_MESSAGE(b2.try_get(j) == false, "");
-    CHECK_MESSAGE(j == bogus_value, "");
+    CHECK_MESSAGE( b2.try_get( j ) == false, "" );
+    CHECK_MESSAGE( j == bogus_value, "" );
     g.wait_for_all();
-    CHECK_MESSAGE(b3.try_get(j) == false, "");
-    CHECK_MESSAGE(j == bogus_value, "");
+    CHECK_MESSAGE( b3.try_get( j ) == false, "" );
+    CHECK_MESSAGE( j == bogus_value, "" );
     g.wait_for_all();
-    CHECK_MESSAGE(b.try_get(j) == true, "");
-    CHECK_MESSAGE(j == 1, "");
+    CHECK_MESSAGE( b.try_get( j ) == true, "" );
+    CHECK_MESSAGE( j == 1, "" );
 
     return 0;
 }
@@ -415,7 +426,7 @@ int test_serial() {
 void test_follows_and_precedes_api() {
     using msg_t = tbb::flow::continue_msg;
 
-    std::array<msg_t, 3> messages_for_follows = {{msg_t(), msg_t(), msg_t()}};
+    std::array<msg_t, 3> messages_for_follows = { {msg_t(), msg_t(), msg_t()} };
     std::vector<msg_t> messages_for_precedes = {msg_t(), msg_t(), msg_t()};
 
     follows_and_precedes_testing::test_follows<msg_t, tbb::flow::buffer_node<msg_t>>(messages_for_follows);
@@ -444,36 +455,204 @@ void test_deduction_guides() {
 }
 #endif
 
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+void test_buffer_node_try_put_and_wait() {
+    using namespace test_try_put_and_wait;
+
+    std::vector<int> start_work_items;
+    std::vector<int> new_work_items;
+    int wait_message = 10;
+
+    for (int i = 0; i < wait_message; ++i) {
+        start_work_items.emplace_back(i);
+        new_work_items.emplace_back(i + 1 + wait_message);
+    }
+
+    // Test push
+    // test_buffer_push tests the graph
+    // buffer1 -> function -> buffer2 -> writer
+    //     function is a queueing serial function_node that submits new_work_items once wait_message arrives
+    //     writer is an unlimited function_node that writes an item into the processed_items vector
+    // Test steps
+    //     1. push start_work_items into the buffer1
+    //     2. buffer1.try_put_and_wait(wait_message);
+    //     3. g.wait_for_all()
+    // test_buffer_push returns the index from which the items processed during wait_for_all() starts
+    {
+        std::vector<int> processed_items;
+
+        std::size_t after_start = test_buffer_push<tbb::flow::buffer_node<int>>(start_work_items, wait_message,
+                                                                                new_work_items, processed_items);
+
+        // Expected effect:
+        // During buffer1.try_put_and_wait()
+        //     1. start_work_items would be pushed to buffer1
+        //     2. wait_message would be pushed to buffer1
+        //     3. forward_task on buffer1 would transfer all of the items to the function_node in LIFO order
+        //     4. wait_message would occupy concurrency of function, other items would be pushed to the queue
+        //     5. function would process wait_message and add new_work_items to the buffer1
+        //     6. forward_task for new_work_items would be spawned, wait_message would be buffered in the buffer2
+        //     7. function task for next FIFO item in the queue would be spawned
+        //     8. forward_task for wait_message in buffer2 would be executed without spawning
+        //     9. writer task for wait_message would be executed without spawning and write wait_message to the buffer
+        //     10. try_put_and_wait exits since wait_message is completed
+        // During g.wait_for_all()
+        //     10. forward_task for new_work_items in buffer1 would be spawned and put items in function in LIFO order
+        //     11. function_node would process and push forward items from the queue in FIFO order
+        // Expected items processing - { wait_message, start_work_items LIFO, new_work_items LIFO }
+
+        std::size_t check_index = 0;
+        CHECK_MESSAGE(after_start == 1, "try_put_and_wait should process only the wait_message");
+        CHECK_MESSAGE(processed_items[check_index++] == wait_message, "try_put_and_wait should process only the wait_message");
+
+        for (std::size_t index = start_work_items.size(); index != 0; --index) {
+            CHECK_MESSAGE(processed_items[check_index++] == start_work_items[index - 1],
+                          "wait_for_all should process start_work_items LIFO");
+        }
+        for (std::size_t index = new_work_items.size(); index != 0; --index) {
+            CHECK_MESSAGE(processed_items[check_index++] == new_work_items[index - 1],
+                          "wait_for_all should process new_work_items LIFO");
+        }
+        CHECK(check_index == processed_items.size());
+    } // Test push
+
+    // Test pull
+    // test_buffer_pull tests the graph
+    // buffer -> function
+    //     function is a rejecting serial function_node that submits new_work_items once wait_message arrives
+    //     and writes the processed item into the processed_items
+    // Test steps
+    //     1. push the occupier message to the function
+    //     2. push start_work_items into the buffer
+    //     3. buffer.try_put_and_wait(wait_message)
+    //     4. g.wait_for_all()
+    // test_buffer_pull returns the index from which the items processed during wait_for_all() starts
+
+    {
+        std::vector<int> processed_items;
+        int occupier = 42;
+
+        std::size_t after_start = test_buffer_pull<tbb::flow::buffer_node<int>>(start_work_items, wait_message, occupier,
+                                                                                new_work_items, processed_items);
+
+        // Expected effect
+        // 0. task for occupier processing would be spawned by the function
+        // During buffer.try_put_and_wait()
+        //     1. start_work_items would be pushed to the buffer
+        //     2. wait_message would be pushed to the buffer
+        //     3. forward_task would try to push items to the function, but would fail
+        //        and set the edge to the pull state
+        //     4. occupier would be processed
+        //     5. items would be taken from the buffer by function in LIFO order
+        //     6. wait_message would be taken first and push new_work_items to the buffer
+        // Expected items processing { occupier, wait_message, new_work_items LIFO, start_work_items LIFO }
+
+        std::size_t check_index = 0;
+
+        CHECK_MESSAGE(after_start == 2, "Only wait_message and occupier should be processed by try_put_and_wait");
+        CHECK_MESSAGE(processed_items[check_index++] == occupier, "Unexpected items processing by try_put_and_wait");
+        CHECK_MESSAGE(processed_items[check_index++] == wait_message, "Unexpected items processing by try_put_and_wait");
+
+        for (std::size_t index = new_work_items.size(); index != 0; --index) {
+            CHECK_MESSAGE(processed_items[check_index++] == new_work_items[index - 1],
+                          "wait_for_all should process new_work_items LIFO");
+        }
+        for (std::size_t index = start_work_items.size(); index != 0; --index) {
+            CHECK_MESSAGE(processed_items[check_index++] == start_work_items[index - 1],
+                          "wait_for_all should process start_work_items LIFO");
+        }
+        CHECK(check_index == processed_items.size());
+    }
+
+    // Test reserve
+    {
+        int thresholds[] = { 1, 2 };
+
+        for (int threshold : thresholds) {
+            std::vector<int> processed_items;
+
+            // test_buffer_reserve tests the following graph
+            // buffer -> limiter -> function
+            //  function is a rejecting serial function_node that puts an item to the decrementer port
+            //  of the limiter inside of the body
+
+            std::size_t after_start = test_buffer_reserve<tbb::flow::buffer_node<int>>(threshold,
+                start_work_items, wait_message, new_work_items, processed_items);
+
+            // Expected effect:
+            // 1. start_work_items would be pushed to the buffer
+            // 2. wait_message_would be pushed to the buffer
+            // 3. forward task of the buffer would push wait_message to the limiter node.
+            //    Since the limiter threshold is not reached, it would be directly passed to the function
+            // 4. function would spawn the task for wait_message processing
+            // 5. wait_message would be processed that would add new_work_items to the buffer
+            // 6. decrementer.try_put() would be called and the limiter node would
+            //    process all of the items from the buffer using the try_reserve/try_consume/try_release semantics
+            // Since the reservation always accepts the front element of the buffer
+            // it is expected that the items would be taken from the buffer in FIFO order
+            // instead of LIFO on try_get for buffer_node
+
+            std::size_t check_index = 0;
+
+            CHECK_MESSAGE(after_start == 1, "try_put_and_wait should process only wait_message");
+            CHECK_MESSAGE(processed_items[check_index++] == wait_message, "Unexpected wait_message processing");
+
+            for (auto item : start_work_items) {
+                CHECK_MESSAGE(processed_items[check_index++] == item, "Unexpected start_work_items processing");
+            }
+
+            for (auto item : new_work_items) {
+                CHECK_MESSAGE(processed_items[check_index++] == item, "Unexpected start_work_items processing");
+            }
+
+        }
+    }
+}
+#endif // __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+
 #include <iomanip>
 
 //! Test buffer_node with parallel and serial neighbours
 //! \brief \ref requirement \ref error_guessing
-TEST_CASE("Serial and parallel test") {
+TEST_CASE("Serial and parallel test"){
     for (int p = 2; p <= 4; ++p) {
         tbb::global_control thread_limit(tbb::global_control::max_allowed_parallelism, p);
         tbb::task_arena arena(p);
-        arena.execute([&]() {
-            test_serial<int>();
-            test_parallel<int>(p);
-        });
+        arena.execute(
+            [&]() {
+                test_serial<int>();
+                test_parallel<int>(p);
+            }
+        );
     }
 }
 
 //! Test reset and cancellation behavior
 //! \brief \ref error_guessing
-TEST_CASE("Resets") {
-    test_resets<int, tbb::flow::buffer_node<int>>();
-    test_resets<float, tbb::flow::buffer_node<float>>();
+TEST_CASE("Resets"){
+    test_resets<int,tbb::flow::buffer_node<int> >();
+    test_resets<float,tbb::flow::buffer_node<float> >();
 }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-//! Test deprecated follows and preceedes API
+//! Test deprecated follows and precedes API
 //! \brief \ref error_guessing
-TEST_CASE("Follows and precedes API") { test_follows_and_precedes_api(); }
+TEST_CASE("Follows and precedes API"){
+    test_follows_and_precedes_api();
+}
 #endif
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 //! Test deduction guides
-//! \brief requirement
-TEST_CASE("Deduction guides") { test_deduction_guides(); }
+//! \brief \ref requirement
+TEST_CASE("Deduction guides"){
+    test_deduction_guides();
+}
+#endif
+
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+//! \brief \ref error_guessing
+TEST_CASE("test buffer_node try_put_and_wait") {
+    test_buffer_node_try_put_and_wait();
+}
 #endif
diff --git a/external/tbb/test/tbb/test_buffering_try_put_and_wait.h b/external/tbb/test/tbb/test_buffering_try_put_and_wait.h
new file mode 100644
index 00000000..30052123
--- /dev/null
+++ b/external/tbb/test/tbb/test_buffering_try_put_and_wait.h
@@ -0,0 +1,189 @@
+/*
+    Copyright (c) 2024 Intel Corporation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#ifndef __TBB_test_tbb_buffering_try_put_and_wait_H
+#define __TBB_test_tbb_buffering_try_put_and_wait_H
+
+#include <oneapi/tbb/task_arena.h>
+#include <oneapi/tbb/flow_graph.h>
+
+#include <vector>
+
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+
+namespace test_try_put_and_wait {
+
+template <typename BufferingNode, typename... Args>
+std::size_t test_buffer_push(const std::vector<int>& start_work_items,
+                             int wait_message,
+                             const std::vector<int>& new_work_items,
+                             std::vector<int>& processed_items,
+                             Args... args)
+{
+    std::size_t after_try_put_and_wait_start_index = 0;
+    tbb::task_arena arena(1);
+
+    arena.execute([&] {
+        tbb::flow::graph g;
+
+        using function_node_type = tbb::flow::function_node<int, int>;
+
+        BufferingNode buffer1(g, args...);
+
+        function_node_type function(g, tbb::flow::serial,
+            [&](int input) noexcept {
+                if (input == wait_message) {
+                    for (auto item : new_work_items) {
+                        buffer1.try_put(item);
+                    }
+                }
+                return input;
+            });
+
+        BufferingNode buffer2(g, args...);
+
+        function_node_type writer(g, tbb::flow::unlimited,
+            [&](int input) noexcept {
+                processed_items.emplace_back(input);
+                return 0;
+            });
+
+        tbb::flow::make_edge(buffer1, function);
+        tbb::flow::make_edge(function, buffer2);
+        tbb::flow::make_edge(buffer2, writer);
+
+        for (auto item : start_work_items) {
+            buffer1.try_put(item);
+        }
+
+        buffer1.try_put_and_wait(wait_message);
+
+        after_try_put_and_wait_start_index = processed_items.size();
+
+        g.wait_for_all();
+    });
+
+    return after_try_put_and_wait_start_index;
+}
+
+template <typename BufferingNode, typename... Args>
+std::size_t test_buffer_pull(const std::vector<int>& start_work_items,
+                             int wait_message,
+                             int occupier,
+                             const std::vector<int>& new_work_items,
+                             std::vector<int>& processed_items,
+                             Args... args)
+{
+    tbb::task_arena arena(1);
+    std::size_t after_try_put_and_wait_start_index = 0;
+
+    arena.execute([&] {
+        tbb::flow::graph g;
+
+        using function_node_type = tbb::flow::function_node<int, int, tbb::flow::rejecting>;
+
+        BufferingNode buffer(g, args...);
+
+        function_node_type function(g, tbb::flow::serial,
+            [&](int input) noexcept {
+                if (input == wait_message) {
+                    for (auto item : new_work_items) {
+                        buffer.try_put(item);
+                    }
+                }
+
+                processed_items.emplace_back(input);
+                return 0;
+            });
+
+        // Occupy the concurrency of function_node
+        // This call spawns the task to process the occupier
+        function.try_put(occupier);
+
+        // Make edge between buffer and function after occupying the concurrency
+        // To ensure that forward task of the buffer would be spawned after the occupier task
+        // And the function_node would reject the items from the buffer
+        // and process them later by calling try_get on the buffer
+        tbb::flow::make_edge(buffer, function);
+
+        for (auto item : start_work_items) {
+            buffer.try_put(item);
+        }
+
+        buffer.try_put_and_wait(wait_message);
+
+        after_try_put_and_wait_start_index = processed_items.size();
+
+        g.wait_for_all();
+    });
+
+    return after_try_put_and_wait_start_index;
+}
+
+template <typename BufferingNode, typename... Args>
+std::size_t test_buffer_reserve(std::size_t limiter_threshold,
+                                const std::vector<int>& start_work_items,
+                                int wait_message,
+                                const std::vector<int>& new_work_items,
+                                std::vector<int>& processed_items,
+                                Args... args)
+{
+    tbb::task_arena arena(1);
+    std::size_t after_try_put_and_wait_start_index = 0;
+
+    arena.execute([&] {
+        tbb::flow::graph g;
+
+        BufferingNode buffer(g, args...);
+
+        tbb::flow::limiter_node<int, int> limiter(g, limiter_threshold);
+        tbb::flow::function_node<int, int, tbb::flow::rejecting> function(g, tbb::flow::serial,
+            [&](int input) {
+                if (input == wait_message) {
+                    for (auto item : new_work_items) {
+                        buffer.try_put(item);
+                    }
+                }
+                // Explicitly put to the decrementer instead of making edge
+                // to guarantee that the next task would be spawned and not returned
+                // to the current thread as the next task
+                // Otherwise, all elements would be processed during the try_put_and_wait
+                limiter.decrementer().try_put(1);
+                processed_items.emplace_back(input);
+                return 0;
+            });
+
+        tbb::flow::make_edge(buffer, limiter);
+        tbb::flow::make_edge(limiter, function);
+
+        for (auto item : start_work_items) {
+            buffer.try_put(item);
+        }
+
+        buffer.try_put_and_wait(wait_message);
+
+        after_try_put_and_wait_start_index = processed_items.size();
+
+        g.wait_for_all();
+    });
+
+    return after_try_put_and_wait_start_index;
+}
+
+} // test_try_put_and_wait
+
+#endif // __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+#endif // __TBB_test_tbb_buffering_try_put_and_wait_H
diff --git a/external/tbb/test/tbb/test_collaborative_call_once.cpp b/external/tbb/test/tbb/test_collaborative_call_once.cpp
index 4dc4d905..11a04a10 100644
--- a/external/tbb/test/tbb/test_collaborative_call_once.cpp
+++ b/external/tbb/test/tbb/test_collaborative_call_once.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2021 Intel Corporation
+    Copyright (c) 2022-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -14,16 +14,14 @@
     limitations under the License.
 */
 
-#define TBB_PREVIEW_COLLABORATIVE_CALL_ONCE 1
-
 #if _MSC_VER && !defined(__INTEL_COMPILER)
 // unreachable code
-#pragma warning(push)
-#pragma warning(disable : 4702)
+#pragma warning( push )
+#pragma warning( disable: 4702 )
 #endif
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
 #endif
 
 #include "common/config.h"
@@ -31,8 +29,8 @@
 // Include first to check missed header dependencies
 #include "tbb/collaborative_call_once.h"
 
-#include "common/exception_handling.h"
 #include "common/test.h"
+#include "common/exception_handling.h"
 #include "common/utils_concurrency_limit.h"
 
 #include "tbb/parallel_invoke.h"
@@ -40,23 +38,25 @@
 #include "tbb/task_arena.h"
 
 //! \file test_collaborative_call_once.cpp
-//! \brief Tests for [preview] functionality
+//! \brief Tests for [algorithms.collaborative_call_once] functionality
 
 struct increment_functor {
-    int ct {0};
+    int ct{0};
 
-    void operator()() { ct++; }
+    void operator()() {
+        ct++;
+    }
 };
 
 struct sum_functor {
-    int sum {0};
+    int sum{0};
 
-    template <typename T>
+    template<typename T>
     void operator()(T first_op) {
         sum += first_op;
     }
 
-    template <typename T, typename... Args>
+    template<typename T, typename... Args>
     void operator()(T first_op, Args&&... args) {
         (*this)(first_op);
         (*this)(std::forward<Args>(args)...);
@@ -65,13 +65,14 @@ struct sum_functor {
 
 struct move_only_type {
     const int* my_pointer;
-    move_only_type(move_only_type&& other) : my_pointer(other.my_pointer) { other.my_pointer = nullptr; }
-    explicit move_only_type(const int* value) : my_pointer(value) {}
+    move_only_type(move_only_type && other): my_pointer(other.my_pointer){ other.my_pointer=nullptr; }
+    explicit move_only_type(const int* value): my_pointer(value) {}
 };
 
+
 class call_once_exception : public std::exception {};
 
-template <typename Fn, typename... Args>
+template<typename Fn, typename... Args>
 void call_once_in_for_loop(std::size_t N, Fn&& body, Args&&... args) {
     tbb::collaborative_once_flag flag;
     for (std::size_t i = 0; i < N; ++i) {
@@ -79,13 +80,13 @@ void call_once_in_for_loop(std::size_t N, Fn&& body, Args&&... args) {
     }
 }
 
-template <typename Fn, typename... Args>
+template<typename Fn, typename... Args>
 void call_once_in_parallel_for(std::size_t N, Fn&& body, Args&&... args) {
     tbb::collaborative_once_flag flag;
 #if __TBB_GCC_PARAMETER_PACK_IN_LAMBDAS_BROKEN
     auto stored_pack = tbb::detail::d0::save_pack(std::forward<Args>(args)...);
     auto func = [&] { tbb::detail::d0::call(std::forward<Fn>(body), std::move(stored_pack)); };
-#endif// __TBB_GCC_PARAMETER_PACK_IN_LAMBDAS_BROKEN
+#endif // __TBB_GCC_PARAMETER_PACK_IN_LAMBDAS_BROKEN
 
     tbb::parallel_for(tbb::blocked_range<size_t>(0, N), [&](const tbb::blocked_range<size_t>& range) {
         for (size_t i = range.begin(); i != range.end(); ++i) {
@@ -93,12 +94,12 @@ void call_once_in_parallel_for(std::size_t N, Fn&& body, Args&&... args) {
             tbb::collaborative_call_once(flag, func);
 #else
             tbb::collaborative_call_once(flag, std::forward<Fn>(body), std::forward<Args>(args)...);
-#endif//__TBB_GCC_PARAMETER_PACK_IN_LAMBDAS_BROKEN
+#endif //__TBB_GCC_PARAMETER_PACK_IN_LAMBDAS_BROKEN
         }
     });
 }
 
-template <typename Fn, typename... Args>
+template<typename Fn, typename... Args>
 void call_once_threads(std::size_t N, Fn&& body, Args&&... args) {
     tbb::collaborative_once_flag flag;
     std::vector<std::thread> threads;
@@ -106,18 +107,21 @@ void call_once_threads(std::size_t N, Fn&& body, Args&&... args) {
 #if __TBB_GCC_PARAMETER_PACK_IN_LAMBDAS_BROKEN
     auto stored_pack = tbb::detail::d0::save_pack(std::forward<Args>(args)...);
     auto func = [&] { tbb::detail::d0::call(std::forward<Fn>(body), std::move(stored_pack)); };
-#endif// __TBB_GCC_PARAMETER_PACK_IN_LAMBDAS_BROKEN
+#endif // __TBB_GCC_PARAMETER_PACK_IN_LAMBDAS_BROKEN
 
-    for (std::size_t i = 0; i < N; ++i) {
+    for (std::size_t i = 0; i < N; ++i)
+    {
         threads.push_back(std::thread([&]() {
 #if __TBB_GCC_PARAMETER_PACK_IN_LAMBDAS_BROKEN
             tbb::collaborative_call_once(flag, func);
 #else
             tbb::collaborative_call_once(flag, std::forward<Fn>(body), std::forward<Args>(args)...);
-#endif// __TBB_GCC_PARAMETER_PACK_IN_LAMBDAS_BROKEN
+#endif // __TBB_GCC_PARAMETER_PACK_IN_LAMBDAS_BROKEN
         }));
     }
-    for (auto& thread : threads) { thread.join(); }
+    for (auto& thread : threads) {
+        thread.join();
+    }
 }
 
 //! Test for functor to be called only once
@@ -128,7 +132,7 @@ TEST_CASE("only calls once 1") {
 
         call_once_in_for_loop(1024, f);
 
-        REQUIRE(f.ct == 1);
+        REQUIRE( f.ct == 1);
     }
     {
         increment_functor f;
@@ -152,7 +156,7 @@ TEST_CASE("only calls once 2") {
     {
         sum_functor f;
 
-        call_once_in_for_loop(1024, f, 1, 2, 3, 4);
+        call_once_in_for_loop(1024, f, 1, 2, 3 ,4);
 
         REQUIRE(f.sum == 10);
     }
@@ -176,9 +180,9 @@ TEST_CASE("only calls once 2") {
 //! \brief \ref interface \ref requirement
 TEST_CASE("only calls once - move only argument") {
     const int value = 42;
-    int ready {0};
+    int ready{0};
 
-    auto func = [&ready, &value](move_only_type other) {
+    auto func = [&ready, &value] (move_only_type other) {
         REQUIRE(other.my_pointer == &value);
         ready++;
     };
@@ -202,17 +206,21 @@ TEST_CASE("only calls once - move only argument") {
     }
 }
 
+#if !EMSCRIPTEN
 //! Stress test for functor to be called only once
 //! \brief \ref interface \ref requirement \ref stress
 TEST_CASE("only calls once - stress test") {
 #if TBB_TEST_LOW_WORKLOAD
     constexpr std::size_t N = 32;
-#elif __TBB_x86_32 || __aarch32__ || __ANDROID__
+#elif __TBB_x86_32 || __arm__  || __ANDROID__
     // Some C++ implementations allocate 8MB stacks for std::thread on 32 bit platforms
     // that makes impossible to create more than ~500 threads.
     // Android has been added to decrease testing time.
     constexpr std::size_t N = tbb::detail::d0::max_nfs_size * 2;
-#else
+#elif __TBB_USE_THREAD_SANITIZER
+    // Reduce execution time under Thread Sanitizer
+    constexpr std::size_t N = tbb::detail::d0::max_nfs_size + 64;
+#else 
     constexpr std::size_t N = tbb::detail::d0::max_nfs_size * 4;
 #endif
     {
@@ -225,31 +233,31 @@ TEST_CASE("only calls once - stress test") {
     {
         increment_functor f;
 
-        utils::SpinBarrier barrier {N};
+        utils::SpinBarrier barrier{N};
         tbb::collaborative_once_flag flag;
         utils::NativeParallelFor(N, [&](std::size_t) {
             for (int i = 0; i < 100; ++i) {
                 REQUIRE(f.ct == i);
                 barrier.wait([&] {
                     flag.~collaborative_once_flag();
-                    new (&flag) tbb::collaborative_once_flag {};
+                    new (&flag) tbb::collaborative_once_flag{};
                 });
                 tbb::collaborative_call_once(flag, f);
             }
         });
     }
 }
-
+#endif
 #if TBB_USE_EXCEPTIONS
 
 //! Test for collaborative_call_once exception handling
 //! \brief \ref error_guessing
 TEST_CASE("handles exceptions - state reset") {
-    bool b {false};
+    bool b{ false };
     auto setB = [&b]() { b = true; };
     auto setBAndCancel = [&b]() {
         b = true;
-        throw call_once_exception {};
+        throw call_once_exception{};
     };
 
     tbb::collaborative_once_flag flag;
@@ -265,12 +273,11 @@ TEST_CASE("handles exceptions - state reset") {
     REQUIRE(b);
 
     b = false;
-    tbb::collaborative_call_once(flag, setB);// Now the call_once flag should be set.
+    tbb::collaborative_call_once(flag, setB); // Now the call_once flag should be set.
     REQUIRE(!b);
 
     b = false;
-    REQUIRE_NOTHROW(
-            tbb::collaborative_call_once(flag, setBAndCancel));// Flag still set, so it shouldn't be called.
+    REQUIRE_NOTHROW(tbb::collaborative_call_once(flag, setBAndCancel)); // Flag still set, so it shouldn't be called.
     REQUIRE(!b);
 }
 
@@ -279,23 +286,23 @@ TEST_CASE("handles exceptions - state reset") {
 TEST_CASE("handles exceptions - stress test") {
 #if TBB_TEST_LOW_WORKLOAD
     constexpr std::size_t N = 32;
-#elif __TBB_x86_32 || __aarch32__ || __ANDROID__
+#elif __TBB_x86_32 || __arm__ || __ANDROID__
     // Some C++ implementations allocate 8MB stacks for std::thread on 32 bit platforms
     // that makes impossible to create more than ~500 threads.
     // Android has been added to decrease testing time.
     constexpr std::size_t N = tbb::detail::d0::max_nfs_size * 2;
-#else
+#else 
     constexpr std::size_t N = tbb::detail::d0::max_nfs_size * 4;
 #endif
 
-    int data {0};
-    std::atomic<bool> run_again {true};
+    int data{0};
+    std::atomic<bool> run_again{true};
 
     auto throwing_func = [&] {
         utils::doDummyWork(10000);
         if (data < 100) {
             data++;
-            throw call_once_exception {};
+            throw call_once_exception{};
         }
         run_again = false;
     };
@@ -303,12 +310,14 @@ TEST_CASE("handles exceptions - stress test") {
     tbb::collaborative_once_flag flag;
 
     utils::NativeParallelFor(N, [&](std::size_t) {
-        while (run_again) {
+        while(run_again) {
             try {
                 tbb::collaborative_call_once(flag, throwing_func);
             } catch (const call_once_exception&) {
                 // We expecting only const call_once_exception&
-            } catch (...) { FAIL("Unexpected exception"); }
+            } catch (...) {
+                FAIL("Unexpected exception");
+            }
         }
     });
     REQUIRE(data == 100);
@@ -316,21 +325,25 @@ TEST_CASE("handles exceptions - stress test") {
 
 #endif
 
+#if !EMSCRIPTEN
 //! Test for multiple help from moonlighting threads
 //! \brief \ref interface \ref requirement
 TEST_CASE("multiple help") {
     std::size_t num_threads = utils::get_platform_max_threads();
-    utils::SpinBarrier barrier {num_threads};
+    utils::SpinBarrier barrier{num_threads};
 
     tbb::collaborative_once_flag flag;
 
     tbb::parallel_for<std::size_t>(0, num_threads, [&](std::size_t) {
         barrier.wait();
         tbb::collaborative_call_once(flag, [&] {
-            tbb::parallel_for<std::size_t>(0, num_threads, [&](std::size_t) { barrier.wait(); });
+            tbb::parallel_for<std::size_t>(0, num_threads, [&](std::size_t) {
+                barrier.wait();
+            });
         });
     });
 }
+#endif
 
 //! Test for collaborative work from different arenas
 //! \brief \ref interface \ref requirement
@@ -357,11 +370,14 @@ TEST_CASE("multiple arenas") {
 
     a2.execute([&] {
         utils::ConcurrencyTracker ct;
-        tbb::parallel_for(0, num_threads,
-                          [&](int) { CHECK(utils::ConcurrencyTracker::PeakParallelism() == 1); });
+        tbb::parallel_for(0, num_threads, [&](int) {
+            CHECK(utils::ConcurrencyTracker::PeakParallelism() == 1);
+        });
         tbb::collaborative_call_once(flag, [&] {
             barrier.wait();
-            tbb::parallel_for(0, num_threads, [&](int) { barrier.wait(); });
+            tbb::parallel_for(0, num_threads, [&](int) {
+                barrier.wait();
+            });
         });
         // To sync collaborative_once_flag lifetime
         barrier.wait();
@@ -370,7 +386,9 @@ TEST_CASE("multiple arenas") {
 
 using FibBuffer = std::vector<std::pair<tbb::collaborative_once_flag, std::uint64_t>>;
 std::uint64_t collaborative_recursive_fib(int n, FibBuffer& buffer) {
-    if (n <= 1) { return 1; }
+    if (n <= 1) {
+        return 1;
+    }
     tbb::collaborative_call_once(buffer[n].first, [&]() {
         std::uint64_t a, b;
         tbb::parallel_invoke([&] { a = collaborative_recursive_fib(n - 2, buffer); },
@@ -382,7 +400,7 @@ std::uint64_t collaborative_recursive_fib(int n, FibBuffer& buffer) {
 
 std::uint64_t collaborative_recursive_fib(int n) {
     FibBuffer buffer(n);
-    return collaborative_recursive_fib(n - 1, buffer);
+    return collaborative_recursive_fib(n-1, buffer);
 }
 
 //! Correctness test for Fibonacci example
@@ -397,5 +415,5 @@ TEST_CASE("fibonacci example") {
 }
 
 #if _MSC_VER && !defined(__INTEL_COMPILER)
-#pragma warning(pop)
+#pragma warning( pop )
 #endif
diff --git a/external/tbb/test/tbb/test_composite_node.cpp b/external/tbb/test/tbb/test_composite_node.cpp
index 073d8872..e7524129 100644
--- a/external/tbb/test/tbb/test_composite_node.cpp
+++ b/external/tbb/test/tbb/test_composite_node.cpp
@@ -15,246 +15,230 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
 #endif
 
 #include "common/config.h"
 
 #include "tbb/flow_graph.h"
 
-#include "common/graph_utils.h"
 #include "common/test.h"
 #include "common/utils.h"
+#include "common/graph_utils.h"
 
-#include <cmath>
 #include <tuple>
+#include <cmath>
 #include <vector>
 
+
 //! \file test_composite_node.cpp
 //! \brief Test for [flow_graph.composite_node] specification
 
+
 struct passthru_body {
-    int operator()(int i) { return i; }
+    int operator()( int i ) {
+        return i;
+    }
 };
 
-class my_input_body {
+class my_input_body{
     int start;
     int finish;
     int step;
-
 public:
     my_input_body(int f, int s) : start(1), finish(f), step(s) {}
-    int operator()(tbb::flow_control &fc) {
-        int a = start;
-        if (start <= finish) {
-            a = start;
-            start += step;
-            return a;
-        } else {
-            fc.stop();
-            return int();
-        };
-    }
+    int operator()(tbb::flow_control& fc) {
+       int a = start;
+       if (start <= finish) {
+           a = start;
+           start+=step;
+           return a;
+       }
+       else {
+           fc.stop();
+           return int();
+       };
+   }
 };
 
-struct m_fxn_body {
-    void operator()(int, tbb::flow::multifunction_node<int, std::tuple<int, int>>::output_ports_type) {}
+struct m_fxn_body{
+    void operator()(int, tbb::flow::multifunction_node<int, std::tuple<int,int> >::output_ports_type ) {}
 };
 
 struct ct_body {
-    ct_body() {}
-    void operator()(tbb::flow::continue_msg) {}
+ct_body(){}
+    void operator()(tbb::flow::continue_msg){}
 };
 
 struct seq_body {
-    std::size_t operator()(int i) { return i; }
+std::size_t operator()(int i) { return i; }
 };
 
-template <int N, typename T1, typename T2>
+template<int N, typename T1, typename T2>
 struct compare {
     static void compare_refs(T1 tuple1, T2 tuple2) {
-        CHECK_MESSAGE((&std::get<N>(tuple1) == &std::get<N>(tuple2)), "ports not set correctly");
-        compare<N - 1, T1, T2>::compare_refs(tuple1, tuple2);
+    CHECK_MESSAGE( ( &std::get<N>(tuple1) == &std::get<N>(tuple2)), "ports not set correctly");
+    compare<N-1, T1, T2>::compare_refs(tuple1, tuple2);
     }
 };
 
-template <typename T1, typename T2>
+template<typename T1, typename T2>
 struct compare<1, T1, T2> {
     static void compare_refs(T1 tuple1, T2 tuple2) {
-        CHECK_MESSAGE((&std::get<0>(tuple1) == &std::get<0>(tuple2)), "port 0 not correctly set");
+    CHECK_MESSAGE( (&std::get<0>(tuple1) == &std::get<0>(tuple2)), "port 0 not correctly set");
     }
 };
 
-struct tiny_node : public tbb::flow::composite_node<std::tuple<int>, std::tuple<int>> {
-    tbb::flow::function_node<int, int> f1;
-    tbb::flow::function_node<int, int> f2;
-    typedef tbb::flow::composite_node<std::tuple<int>, std::tuple<int>> base_type;
+struct tiny_node : public tbb::flow::composite_node< std::tuple< int >, std::tuple< int > > {
+    tbb::flow::function_node< int, int > f1;
+    tbb::flow::function_node< int, int > f2;
+    typedef tbb::flow::composite_node< std::tuple< int >, std::tuple< int > > base_type;
 
 public:
-    tiny_node(tbb::flow::graph &g, bool hidden = false)
-        : base_type(g), f1(g, tbb::flow::unlimited, passthru_body()),
-          f2(g, tbb::flow::unlimited, passthru_body()) {
+    tiny_node(tbb::flow::graph &g, bool hidden = false) : base_type(g), f1(g, tbb::flow::unlimited, passthru_body() ), f2(g, tbb::flow::unlimited, passthru_body() ) {
         tbb::flow::make_edge(f1, f2);
 
-        std::tuple<tbb::flow::function_node<int, int> &> input_tuple(f1);
-        std::tuple<tbb::flow::function_node<int, int> &> output_tuple(f2);
+        std::tuple<tbb::flow::function_node< int, int >& > input_tuple(f1);
+        std::tuple<tbb::flow::function_node< int, int >& > output_tuple(f2);
         base_type::set_external_ports(input_tuple, output_tuple);
 
-        if (hidden) base_type::add_nodes(f1, f2);
+        if(hidden)
+            base_type::add_nodes(f1, f2);
         else
             base_type::add_visible_nodes(f1, f2);
+
     }
 };
 
 int test_tiny(bool hidden = false) {
     tbb::flow::graph g;
-    tbb::flow::function_node<int, int> f0(g, tbb::flow::unlimited, passthru_body());
+    tbb::flow::function_node< int, int > f0( g, tbb::flow::unlimited, passthru_body() );
     tiny_node t(g, hidden);
-    CHECK_MESSAGE((&tbb::flow::input_port<0>(t) == &t.f1),
-                  "f1 not bound to input port 0 in composite_node t");
-    CHECK_MESSAGE((&tbb::flow::output_port<0>(t) == &t.f2),
-                  "f2 not bound to output port 0 in composite_node t");
+    CHECK_MESSAGE( (&tbb::flow::input_port<0>(t) == &t.f1), "f1 not bound to input port 0 in composite_node t");
+    CHECK_MESSAGE( (&tbb::flow::output_port<0>(t) == &t.f2), "f2 not bound to output port 0 in composite_node t");
 
     tiny_node t1(g, hidden);
-    CHECK_MESSAGE((&std::get<0>(t1.input_ports()) == &t1.f1),
-                  "f1 not bound to input port 0 in composite_node t1");
-    CHECK_MESSAGE((&std::get<0>(t1.output_ports()) == &t1.f2),
-                  "f2 not bound to output port 0 in composite_node t1");
+    CHECK_MESSAGE( (&std::get<0>(t1.input_ports()) == &t1.f1), "f1 not bound to input port 0 in composite_node t1");
+    CHECK_MESSAGE( (&std::get<0>(t1.output_ports()) == &t1.f2), "f2 not bound to output port 0 in composite_node t1");
 
     test_input_ports_return_ref(t1);
     test_output_ports_return_ref(t1);
 
     tiny_node t2(g, hidden);
-    CHECK_MESSAGE((&tbb::flow::input_port<0>(t2) == &t2.f1),
-                  "f1 not bound to input port 0 in composite_node t2");
-    CHECK_MESSAGE((&tbb::flow::output_port<0>(t2) == &t2.f2),
-                  "f2 not bound to output port 0 in composite_node t2");
-
-    tbb::flow::function_node<int, int> f3(g, tbb::flow::unlimited, passthru_body());
-    tbb::flow::make_edge(f0, t);
-    tbb::flow::make_edge(t, t1);
-    tbb::flow::make_edge(t1, t2);
-    tbb::flow::make_edge(t2, f3);
+    CHECK_MESSAGE( (&tbb::flow::input_port<0>(t2) == &t2.f1), "f1 not bound to input port 0 in composite_node t2");
+    CHECK_MESSAGE( (&tbb::flow::output_port<0>(t2) == &t2.f2), "f2 not bound to output port 0 in composite_node t2");
+
+    tbb::flow::function_node< int, int > f3( g, tbb::flow::unlimited, passthru_body() );
+    tbb::flow::make_edge( f0, t );
+    tbb::flow::make_edge( t, t1 );
+    tbb::flow::make_edge( t1, t2 );
+    tbb::flow::make_edge( t2 , f3 );
     tbb::flow::queue_node<int> q(g);
     tbb::flow::make_edge(f3, q);
     f0.try_put(1);
     g.wait_for_all();
 
-    int i, j = 0;
+    int i, j =0;
     q.try_get(i);
-    CHECK_MESSAGE((i == 1), "item did not go through graph");
+    CHECK_MESSAGE( ( i == 1), "item did not go through graph");
     q.try_get(j);
-    CHECK_MESSAGE((!j), "unexpected item in graph");
+    CHECK_MESSAGE( ( !j), "unexpected item in graph");
     g.wait_for_all();
 
     tbb::flow::remove_edge(f3, q);
     tbb::flow::remove_edge(t2, f3);
     tbb::flow::remove_edge(t1, t2);
 
-    tbb::flow::make_edge(t1, f3);
+    tbb::flow::make_edge( t1 , f3 );
     tbb::flow::make_edge(f3, q);
 
     f0.try_put(2);
     g.wait_for_all();
 
     q.try_get(i);
-    CHECK_MESSAGE((i == 2), "item did not go through graph after removal of edge");
+    CHECK_MESSAGE( ( i == 2), "item did not go through graph after removal of edge");
     q.try_get(j);
-    CHECK_MESSAGE((!j), "unexpected item in graph after removal of edge");
+    CHECK_MESSAGE( ( !j), "unexpected item in graph after removal of edge");
 
     return 0;
 }
 
-class adder_node : public tbb::flow::composite_node<std::tuple<int, int>, std::tuple<int>> {
+class adder_node : public tbb::flow::composite_node< std::tuple< int, int >, std::tuple< int > > {
 public:
-    tbb::flow::join_node<std::tuple<int, int>, tbb::flow::queueing> j;
-    tbb::flow::function_node<std::tuple<int, int>, int> f;
-
+    tbb::flow::join_node< std::tuple< int, int >, tbb::flow::queueing > j;
+    tbb::flow::function_node< std::tuple< int, int >, int > f;
 private:
-    typedef tbb::flow::composite_node<std::tuple<int, int>, std::tuple<int>> base_type;
+    typedef tbb::flow::composite_node< std::tuple< int, int >, std::tuple< int > > base_type;
 
     struct f_body {
-        int operator()(const std::tuple<int, int> &t) { return std::get<0>(t) + std::get<1>(t); }
+        int operator()( const std::tuple< int, int > &t ) {
+            return std::get<0>(t) + std::get<1>(t);
+        }
     };
 
 public:
-    adder_node(tbb::flow::graph &g, bool hidden = false)
-        : base_type(g), j(g), f(g, tbb::flow::unlimited, f_body()) {
-        tbb::flow::make_edge(j, f);
+    adder_node(tbb::flow::graph &g, bool hidden = false) : base_type(g), j(g), f(g, tbb::flow::unlimited, f_body() ) {
+        tbb::flow::make_edge( j, f );
 
-        base_type::set_external_ports(
-                base_type::input_ports_type(tbb::flow::input_port<0>(j), tbb::flow::input_port<1>(j)),
-                base_type::output_ports_type(f));
+        base_type::set_external_ports(base_type::input_ports_type(tbb::flow::input_port<0>(j), tbb::flow::input_port<1>(j)), base_type::output_ports_type(f));
 
-        if (hidden) base_type::add_nodes(j, f);
+        if (hidden)
+            base_type::add_nodes(j, f);
         else
             base_type::add_visible_nodes(j, f);
+
     }
 };
 
-struct square_body {
-    int operator()(int v) { return v * v; }
-};
-struct cube_body {
-    int operator()(int v) { return v * v * v; }
-};
-int adder_sum(int i) { return (int) (pow(3 * pow(i, 3) + pow(i, 2), 2)); }
+struct square_body { int operator()(int v) { return v*v; } };
+struct cube_body { int operator()(int v) { return v*v*v; } };
+int adder_sum(int i) {
+    return (int)(pow(3*pow(i,3) + pow(i, 2),2));
+}
 int test_adder(bool hidden = false) {
     tbb::flow::graph g;
-    tbb::flow::function_node<int, int> s(g, tbb::flow::unlimited, square_body());
-    tbb::flow::function_node<int, int> c(g, tbb::flow::unlimited, cube_body());
-    tbb::flow::function_node<int, int> p(g, tbb::flow::unlimited, passthru_body());
+    tbb::flow::function_node<int,int> s(g, tbb::flow::unlimited, square_body());
+    tbb::flow::function_node<int,int> c(g, tbb::flow::unlimited, cube_body());
+    tbb::flow::function_node<int,int> p(g, tbb::flow::unlimited, passthru_body());
 
     adder_node a0(g, hidden);
-    CHECK_MESSAGE((&tbb::flow::input_port<0>(a0) == &tbb::flow::input_port<0>(a0.j)),
-                  "input_port 0 of j not bound to input port 0 in composite_node a0");
-    CHECK_MESSAGE((&tbb::flow::input_port<1>(a0) == &tbb::flow::input_port<1>(a0.j)),
-                  "input_port 1 of j not bound to input port 1 in composite_node a0");
-    CHECK_MESSAGE((&tbb::flow::output_port<0>(a0) == &a0.f),
-                  "f not bound to output port 0 in composite_node a0");
+    CHECK_MESSAGE( (&tbb::flow::input_port<0>(a0) == &tbb::flow::input_port<0>(a0.j)), "input_port 0 of j not bound to input port 0 in composite_node a0");
+    CHECK_MESSAGE( (&tbb::flow::input_port<1>(a0) == &tbb::flow::input_port<1>(a0.j)), "input_port 1 of j not bound to input port 1 in composite_node a0");
+    CHECK_MESSAGE( (&tbb::flow::output_port<0>(a0) == &a0.f), "f not bound to output port 0 in composite_node a0");
 
     adder_node a1(g, hidden);
-    CHECK_MESSAGE((&std::get<0>(a0.input_ports()) == &tbb::flow::input_port<0>(a0.j)),
-                  "input_port 0 of j not bound to input port 0 in composite_node a1");
-    CHECK_MESSAGE((&std::get<1>(a0.input_ports()) == &tbb::flow::input_port<1>(a0.j)),
-                  "input_port1 of j not bound to input port 1 in composite_node a1");
-    CHECK_MESSAGE((&std::get<0>(a0.output_ports()) == &a0.f),
-                  "f not bound to output port 0 in composite_node a1");
+    CHECK_MESSAGE( (&std::get<0>(a0.input_ports()) == &tbb::flow::input_port<0>(a0.j)), "input_port 0 of j not bound to input port 0 in composite_node a1");
+    CHECK_MESSAGE( (&std::get<1>(a0.input_ports()) == &tbb::flow::input_port<1>(a0.j)), "input_port1 of j not bound to input port 1 in composite_node a1");
+    CHECK_MESSAGE( (&std::get<0>(a0.output_ports()) == &a0.f), "f not bound to output port 0 in composite_node a1");
 
     adder_node a2(g, hidden);
-    CHECK_MESSAGE((&tbb::flow::input_port<0>(a2) == &tbb::flow::input_port<0>(a2.j)),
-                  "input_port 0 of j not bound to input port 0 in composite_node a2");
-    CHECK_MESSAGE((&tbb::flow::input_port<1>(a2) == &tbb::flow::input_port<1>(a2.j)),
-                  "input_port 1 of j not bound to input port 1 in composite_node a2");
-    CHECK_MESSAGE((&tbb::flow::output_port<0>(a2) == &a2.f),
-                  "f not bound to output port 0 in composite_node a2");
+    CHECK_MESSAGE( (&tbb::flow::input_port<0>(a2) == &tbb::flow::input_port<0>(a2.j)), "input_port 0 of j not bound to input port 0 in composite_node a2");
+    CHECK_MESSAGE( (&tbb::flow::input_port<1>(a2) == &tbb::flow::input_port<1>(a2.j)), "input_port 1 of j not bound to input port 1 in composite_node a2");
+    CHECK_MESSAGE( (&tbb::flow::output_port<0>(a2) == &a2.f), "f not bound to output port 0 in composite_node a2");
 
     adder_node a3(g, hidden);
-    CHECK_MESSAGE((&std::get<0>(a3.input_ports()) == &tbb::flow::input_port<0>(a3.j)),
-                  "input_port 0 of j not bound to input port 0 in composite_node a3");
-    CHECK_MESSAGE((&std::get<1>(a3.input_ports()) == &tbb::flow::input_port<1>(a3.j)),
-                  "input_port1 of j not bound to input port 1 in composite_node a3");
-    CHECK_MESSAGE((&std::get<0>(a3.output_ports()) == &a3.f),
-                  "f not bound to output port 0 in composite_node a3");
-
-    tbb::flow::function_node<int, int> s2(g, tbb::flow::unlimited, square_body());
+    CHECK_MESSAGE( (&std::get<0>(a3.input_ports()) == &tbb::flow::input_port<0>(a3.j)), "input_port 0 of j not bound to input port 0 in composite_node a3");
+    CHECK_MESSAGE( (&std::get<1>(a3.input_ports()) == &tbb::flow::input_port<1>(a3.j)), "input_port1 of j not bound to input port 1 in composite_node a3");
+    CHECK_MESSAGE( (&std::get<0>(a3.output_ports()) == &a3.f), "f not bound to output port 0 in composite_node a3");
+
+    tbb::flow::function_node<int,int> s2(g, tbb::flow::unlimited, square_body());
     tbb::flow::queue_node<int> q(g);
 
-    tbb::flow::make_edge(s, tbb::flow::input_port<0>(a0));
-    tbb::flow::make_edge(c, tbb::flow::input_port<1>(a0));
+    tbb::flow::make_edge( s, tbb::flow::input_port<0>(a0) );
+    tbb::flow::make_edge( c, tbb::flow::input_port<1>(a0) );
 
-    tbb::flow::make_edge(c, tbb::flow::input_port<0>(a1));
-    tbb::flow::make_edge(c, tbb::flow::input_port<1>(a1));
+    tbb::flow::make_edge( c, tbb::flow::input_port<0>(a1) );
+    tbb::flow::make_edge( c, tbb::flow::input_port<1>(a1) );
 
-    tbb::flow::make_edge(tbb::flow::output_port<0>(a0), tbb::flow::input_port<0>(a2));
-    tbb::flow::make_edge(tbb::flow::output_port<0>(a1), tbb::flow::input_port<1>(a2));
+    tbb::flow::make_edge( tbb::flow::output_port<0>(a0), tbb::flow::input_port<0>(a2) );
+    tbb::flow::make_edge( tbb::flow::output_port<0>(a1), tbb::flow::input_port<1>(a2) );
 
-    tbb::flow::make_edge(tbb::flow::output_port<0>(a2), s2);
-    tbb::flow::make_edge(s2, q);
+    tbb::flow::make_edge( tbb::flow::output_port<0>(a2), s2 );
+    tbb::flow::make_edge( s2, q );
 
-    int sum_total = 0;
-    int result = 0;
-    for (int i = 1; i < 4; ++i) {
+    int sum_total=0;
+    int result=0;
+    for ( int i = 1; i < 4; ++i ) {
         s.try_put(i);
         c.try_put(i);
         sum_total += adder_sum(i);
@@ -262,36 +246,35 @@ int test_adder(bool hidden = false) {
     }
 
     int j;
-    for (int i = 1; i < 4; ++i) {
+    for ( int i = 1; i < 4; ++i ) {
         q.try_get(j);
         result += j;
     }
     g.wait_for_all();
-    CHECK_MESSAGE((result == sum_total), "the sum from the graph does not match the calculated value");
+    CHECK_MESSAGE( (result == sum_total), "the sum from the graph does not match the calculated value");
 
     tbb::flow::remove_edge(s2, q);
-    tbb::flow::remove_edge(a2, s2);
-    tbb::flow::make_edge(a0, a3);
-    tbb::flow::make_edge(a1, tbb::flow::input_port<1>(a3));
-    tbb::flow::make_edge(a3, s2);
-    tbb::flow::make_edge(s2, q);
-
-    sum_total = 0;
-    result = 0;
-    for (int i = 10; i < 20; ++i) {
+    tbb::flow::remove_edge( a2, s2 );
+    tbb::flow::make_edge( a0, a3 );
+    tbb::flow::make_edge( a1, tbb::flow::input_port<1>(a3) );
+    tbb::flow::make_edge( a3, s2 );
+    tbb::flow::make_edge( s2, q );
+
+    sum_total=0;
+    result=0;
+    for ( int i = 10; i < 20; ++i ) {
         s.try_put(i);
         c.try_put(i);
         sum_total += adder_sum(i);
         g.wait_for_all();
     }
 
-    for (int i = 10; i < 20; ++i) {
+    for ( int i = 10; i < 20; ++i ) {
         q.try_get(j);
         result += j;
     }
     g.wait_for_all();
-    CHECK_MESSAGE((result == sum_total),
-                  "the new sum after the replacement of the nodes does not match the calculated value");
+    CHECK_MESSAGE( (result == sum_total), "the new sum after the replacement of the nodes does not match the calculated value");
 
     return 0;
 }
@@ -310,10 +293,10 @@ int test_adder(bool hidden = false) {
                                      |-------------------------------------------------------------------|
 
 */
-int test_nested_adder(bool hidden = false) {
+int test_nested_adder(bool hidden=false) {
     tbb::flow::graph g;
-    tbb::flow::composite_node<std::tuple<int, int>, std::tuple<int>> outer_node(g);
-    typedef tbb::flow::composite_node<std::tuple<int, int>, std::tuple<int>> base_type;
+    tbb::flow::composite_node<std::tuple<int, int>, std::tuple<int> > outer_node(g);
+    typedef tbb::flow::composite_node<std::tuple<int, int>, std::tuple<int> > base_type;
     tbb::flow::broadcast_node<int> input(g);
     tbb::flow::queue_node<int> output(g);
 
@@ -321,19 +304,14 @@ int test_nested_adder(bool hidden = false) {
     adder_node inner_node2(g, hidden);
     adder_node inner_node3(g, hidden);
 
-    outer_node.set_external_ports(base_type::input_ports_type(tbb::flow::input_port<0>(inner_node1),
-                                                              tbb::flow::input_port<1>(inner_node1)),
-                                  base_type::output_ports_type(tbb::flow::output_port<0>(inner_node3)));
+    outer_node.set_external_ports(base_type::input_ports_type(tbb::flow::input_port<0>(inner_node1), tbb::flow::input_port<1>(inner_node1)), base_type::output_ports_type(tbb::flow::output_port<0>(inner_node3)));
 
-    CHECK_MESSAGE((&tbb::flow::input_port<0>(outer_node) == &tbb::flow::input_port<0>(inner_node1)),
-                  "input port 0 of inner_node1 not bound to input port 0 in outer_node");
-    CHECK_MESSAGE((&tbb::flow::input_port<1>(outer_node) == &tbb::flow::input_port<1>(inner_node1)),
-                  "input port 1 of inner_node1 not bound to input port 1 in outer_node");
-    CHECK_MESSAGE((&tbb::flow::output_port<0>(outer_node) == &tbb::flow::output_port<0>(inner_node3)),
-                  "output port 0 of inner_node3 not bound to output port 0 in outer_node");
+    CHECK_MESSAGE( (&tbb::flow::input_port<0>(outer_node) == &tbb::flow::input_port<0>(inner_node1)), "input port 0 of inner_node1 not bound to input port 0 in outer_node");
+    CHECK_MESSAGE( (&tbb::flow::input_port<1>(outer_node) == &tbb::flow::input_port<1>(inner_node1)), "input port 1 of inner_node1 not bound to input port 1 in outer_node");
+    CHECK_MESSAGE( (&tbb::flow::output_port<0>(outer_node) == &tbb::flow::output_port<0>(inner_node3)), "output port 0 of inner_node3 not bound to output port 0 in outer_node");
 
-    tbb::flow::make_edge(input, tbb::flow::input_port<0>(outer_node) /*inner_node1*/);
-    tbb::flow::make_edge(input, tbb::flow::input_port<1>(outer_node) /*inner_node1*/);
+    tbb::flow::make_edge(input, tbb::flow::input_port<0>(outer_node)/*inner_node1*/);
+    tbb::flow::make_edge(input, tbb::flow::input_port<1>(outer_node)/*inner_node1*/);
 
     tbb::flow::make_edge(inner_node1, tbb::flow::input_port<0>(inner_node2));
     tbb::flow::make_edge(inner_node1, tbb::flow::input_port<1>(inner_node2));
@@ -341,9 +319,10 @@ int test_nested_adder(bool hidden = false) {
     tbb::flow::make_edge(inner_node2, tbb::flow::input_port<0>(inner_node3));
     tbb::flow::make_edge(inner_node2, tbb::flow::input_port<1>(inner_node3));
 
-    tbb::flow::make_edge(outer_node /*inner_node3*/, output);
+    tbb::flow::make_edge(outer_node/*inner_node3*/, output);
 
-    if (hidden) outer_node.add_nodes(inner_node1, inner_node2, inner_node3);
+    if(hidden)
+        outer_node.add_nodes(inner_node1, inner_node2, inner_node3);
     else
         outer_node.add_visible_nodes(inner_node1, inner_node2, inner_node3);
 
@@ -352,56 +331,50 @@ int test_nested_adder(bool hidden = false) {
         input.try_put(i);
         g.wait_for_all();
         output.try_get(out);
-        CHECK_MESSAGE((tbb::flow::output_port<0>(outer_node).try_get(out) == output.try_get(out)),
-                      "output from outer_node does not match output from graph");
-        CHECK_MESSAGE((out == 8 * i), "output from outer_node not correct");
+        CHECK_MESSAGE( (tbb::flow::output_port<0>(outer_node).try_get(out) == output.try_get(out)), "output from outer_node does not match output from graph");
+        CHECK_MESSAGE( (out == 8*i), "output from outer_node not correct");
     }
     g.wait_for_all();
 
     return 0;
 }
 
-template <typename T>
-class prefix_node : public tbb::flow::composite_node<std::tuple<T, T, T, T, T>, std::tuple<T, T, T, T, T>> {
-    typedef std::tuple<T, T, T, T, T> my_tuple_t;
-
+template< typename T >
+class prefix_node : public tbb::flow::composite_node< std::tuple< T, T, T, T, T >, std::tuple< T, T, T, T, T > > {
+    typedef std::tuple< T, T, T, T, T > my_tuple_t;
 public:
-    tbb::flow::join_node<my_tuple_t, tbb::flow::queueing> j;
-    tbb::flow::split_node<my_tuple_t> s;
-
+    tbb::flow::join_node< my_tuple_t, tbb::flow::queueing > j;
+    tbb::flow::split_node< my_tuple_t > s;
 private:
-    tbb::flow::function_node<my_tuple_t, my_tuple_t> f;
-    typedef tbb::flow::composite_node<my_tuple_t, my_tuple_t> base_type;
+    tbb::flow::function_node< my_tuple_t, my_tuple_t > f;
+    typedef tbb::flow::composite_node< my_tuple_t, my_tuple_t > base_type;
 
     struct f_body {
-        my_tuple_t operator()(const my_tuple_t &t) {
-            return my_tuple_t(std::get<0>(t), std::get<0>(t) + std::get<1>(t),
-                              std::get<0>(t) + std::get<1>(t) + std::get<2>(t),
-                              std::get<0>(t) + std::get<1>(t) + std::get<2>(t) + std::get<3>(t),
-                              std::get<0>(t) + std::get<1>(t) + std::get<2>(t) + std::get<3>(t)
-                                      + std::get<4>(t));
+        my_tuple_t operator()( const my_tuple_t &t ) {
+            return my_tuple_t( std::get<0>(t),
+                               std::get<0>(t) + std::get<1>(t),
+                               std::get<0>(t) + std::get<1>(t) + std::get<2>(t),
+                               std::get<0>(t) + std::get<1>(t) + std::get<2>(t) + std::get<3>(t),
+                               std::get<0>(t) + std::get<1>(t) + std::get<2>(t) + std::get<3>(t) + std::get<4>(t) );
         }
     };
 
 public:
-    prefix_node(tbb::flow::graph &g, bool hidden = false)
-        : base_type(g), j(g), s(g), f(g, tbb::flow::serial, f_body()) {
-        tbb::flow::make_edge(j, f);
-        tbb::flow::make_edge(f, s);
+    prefix_node(tbb::flow::graph &g, bool hidden = false ) : base_type(g), j(g), s(g), f(g, tbb::flow::serial, f_body() ) {
+        tbb::flow::make_edge( j, f );
+        tbb::flow::make_edge( f, s );
 
-        typename base_type::input_ports_type input_tuple(
-                tbb::flow::input_port<0>(j), tbb::flow::input_port<1>(j), tbb::flow::input_port<2>(j),
-                tbb::flow::input_port<3>(j), tbb::flow::input_port<4>(j));
+    typename base_type::input_ports_type input_tuple(tbb::flow::input_port<0>(j), tbb::flow::input_port<1>(j), tbb::flow::input_port<2>(j), tbb::flow::input_port<3>(j), tbb::flow::input_port<4>(j));
 
-        typename base_type::output_ports_type output_tuple(
-                tbb::flow::output_port<0>(s), tbb::flow::output_port<1>(s), tbb::flow::output_port<2>(s),
-                tbb::flow::output_port<3>(s), tbb::flow::output_port<4>(s));
+    typename base_type::output_ports_type output_tuple(tbb::flow::output_port<0>(s), tbb::flow::output_port<1>(s), tbb::flow::output_port<2>(s), tbb::flow::output_port<3>(s), tbb::flow::output_port<4>(s));
 
-        base_type::set_external_ports(input_tuple, output_tuple);
+    base_type::set_external_ports(input_tuple, output_tuple);
 
-        if (hidden) base_type::add_nodes(j, s, f);
+        if(hidden)
+            base_type::add_nodes(j,s,f);
         else
-            base_type::add_visible_nodes(j, s, f);
+            base_type::add_visible_nodes(j,s,f);
+
     }
 };
 
@@ -409,48 +382,39 @@ int test_prefix(bool hidden = false) {
     tbb::flow::graph g;
     prefix_node<double> p(g, hidden);
 
-    CHECK_MESSAGE((&std::get<0>(p.input_ports()) == &tbb::flow::input_port<0>(p.j)),
-                  "input port 0 of j is not bound to input port 0 of composite node p");
-    CHECK_MESSAGE((&tbb::flow::input_port<1>(p.j) == &tbb::flow::input_port<1>(p.j)),
-                  "input port 1 of j is not bound to input port 1 of composite node p");
-    CHECK_MESSAGE((&std::get<2>(p.input_ports()) == &tbb::flow::input_port<2>(p.j)),
-                  "input port 2 of j is not bound to input port 2 of composite node p");
-    CHECK_MESSAGE((&tbb::flow::input_port<3>(p.j) == &tbb::flow::input_port<3>(p.j)),
-                  "input port 3 of j is not bound to input port 3 of composite node p");
-    CHECK_MESSAGE((&std::get<4>(p.input_ports()) == &tbb::flow::input_port<4>(p.j)),
-                  "input port 4 of j is not bound to input port 4 of composite node p");
-
-    CHECK_MESSAGE((&std::get<0>(p.output_ports()) == &tbb::flow::output_port<0>(p.s)),
-                  "output port 0 of s is not bound to output port 0 of composite node p");
-    CHECK_MESSAGE((&tbb::flow::output_port<1>(p.s) == &tbb::flow::output_port<1>(p.s)),
-                  "output port 1 of s is not bound to output port 1 of composite node p");
-    CHECK_MESSAGE((&std::get<2>(p.output_ports()) == &tbb::flow::output_port<2>(p.s)),
-                  "output port 2 of s is not bound to output port 2 of composite node p");
-    CHECK_MESSAGE((&tbb::flow::output_port<3>(p.s) == &tbb::flow::output_port<3>(p.s)),
-                  "output port 3 of s is not bound to output port 3 of composite node p");
-    CHECK_MESSAGE((&std::get<4>(p.output_ports()) == &tbb::flow::output_port<4>(p.s)),
-                  "output port 4 of s is not bound to output port 4 of composite node p");
-
-    std::vector<tbb::flow::queue_node<double>> v(5, tbb::flow::queue_node<double>(g));
-    tbb::flow::make_edge(tbb::flow::output_port<0>(p), v[0]);
-    tbb::flow::make_edge(tbb::flow::output_port<1>(p), v[1]);
-    tbb::flow::make_edge(tbb::flow::output_port<2>(p), v[2]);
-    tbb::flow::make_edge(tbb::flow::output_port<3>(p), v[3]);
-    tbb::flow::make_edge(tbb::flow::output_port<4>(p), v[4]);
-
-    for (double offset = 1; offset < 10000; offset *= 10) {
-        tbb::flow::input_port<0>(p).try_put(offset);
-        tbb::flow::input_port<1>(p).try_put(offset + 1);
-        tbb::flow::input_port<2>(p).try_put(offset + 2);
-        tbb::flow::input_port<3>(p).try_put(offset + 3);
-        tbb::flow::input_port<4>(p).try_put(offset + 4);
+    CHECK_MESSAGE( (&std::get<0>(p.input_ports()) == &tbb::flow::input_port<0>(p.j)), "input port 0 of j is not bound to input port 0 of composite node p");
+    CHECK_MESSAGE( (&tbb::flow::input_port<1>(p.j) == &tbb::flow::input_port<1>(p.j)), "input port 1 of j is not bound to input port 1 of composite node p");
+    CHECK_MESSAGE( (&std::get<2>(p.input_ports()) == &tbb::flow::input_port<2>(p.j)), "input port 2 of j is not bound to input port 2 of composite node p");
+    CHECK_MESSAGE( (&tbb::flow::input_port<3>(p.j) == &tbb::flow::input_port<3>(p.j)), "input port 3 of j is not bound to input port 3 of composite node p");
+    CHECK_MESSAGE( (&std::get<4>(p.input_ports()) == &tbb::flow::input_port<4>(p.j)), "input port 4 of j is not bound to input port 4 of composite node p");
+
+
+    CHECK_MESSAGE( (&std::get<0>(p.output_ports()) == &tbb::flow::output_port<0>(p.s)), "output port 0 of s is not bound to output port 0 of composite node p");
+    CHECK_MESSAGE( (&tbb::flow::output_port<1>(p.s) == &tbb::flow::output_port<1>(p.s)), "output port 1 of s is not bound to output port 1 of composite node p");
+    CHECK_MESSAGE( (&std::get<2>(p.output_ports()) == &tbb::flow::output_port<2>(p.s)), "output port 2 of s is not bound to output port 2 of composite node p");
+    CHECK_MESSAGE( (&tbb::flow::output_port<3>(p.s) == &tbb::flow::output_port<3>(p.s)), "output port 3 of s is not bound to output port 3 of composite node p");
+    CHECK_MESSAGE( (&std::get<4>(p.output_ports()) == &tbb::flow::output_port<4>(p.s)), "output port 4 of s is not bound to output port 4 of composite node p");
+
+    std::vector< tbb::flow::queue_node<double> > v( 5, tbb::flow::queue_node<double>(g) );
+    tbb::flow::make_edge( tbb::flow::output_port<0>(p), v[0] );
+    tbb::flow::make_edge( tbb::flow::output_port<1>(p), v[1] );
+    tbb::flow::make_edge( tbb::flow::output_port<2>(p), v[2] );
+    tbb::flow::make_edge( tbb::flow::output_port<3>(p), v[3] );
+    tbb::flow::make_edge( tbb::flow::output_port<4>(p), v[4] );
+
+    for(  double offset = 1; offset < 10000; offset *= 10 ) {
+        tbb::flow::input_port<0>(p).try_put( offset );
+        tbb::flow::input_port<1>(p).try_put( offset + 1 );
+        tbb::flow::input_port<2>(p).try_put( offset + 2 );
+        tbb::flow::input_port<3>(p).try_put( offset + 3 );
+        tbb::flow::input_port<4>(p).try_put( offset + 4 );
     }
     g.wait_for_all();
 
     double x;
-    while (v[0].try_get(x)) {
+    while ( v[0].try_get(x) ) {
         g.wait_for_all();
-        for (int i = 1; i < 5; ++i) {
+        for ( int i = 1; i < 5; ++i ) {
             v[i].try_get(x);
             g.wait_for_all();
         }
@@ -468,10 +432,10 @@ struct input_only_output_only_seq {
 void input_only_output_only_composite(bool hidden) {
     tbb::flow::graph g;
 
-    tbb::flow::composite_node<std::tuple<int>, std::tuple<int>> input_output(g);
+    tbb::flow::composite_node<std::tuple<int>, std::tuple<int> > input_output(g);
 
-    typedef tbb::flow::composite_node<std::tuple<int>, std::tuple<>> input_only_composite;
-    typedef tbb::flow::composite_node<std::tuple<>, std::tuple<int>> output_only_composite;
+    typedef tbb::flow::composite_node<std::tuple<int>, std::tuple<> > input_only_composite;
+    typedef tbb::flow::composite_node<std::tuple<>, std::tuple<int> > output_only_composite;
 
     typedef tbb::flow::input_node<int> src_type;
     typedef tbb::flow::queue_node<int> q_type;
@@ -479,7 +443,7 @@ void input_only_output_only_composite(bool hidden) {
     typedef tbb::flow::sequencer_node<int> sequencer_type;
 
     int num = 0;
-    int finish = 1000;
+    int finish=1000;
     int step = 4;
 
     input_only_composite a_in(g);
@@ -493,17 +457,15 @@ void input_only_output_only_composite(bool hidden) {
     // not a sequential order of messages dispatch
     sequencer_type seq(g, input_only_output_only_seq());
 
-    std::tuple<f_type &> input_tuple(f);
+    std::tuple<f_type& > input_tuple(f);
     a_in.set_external_ports(input_tuple);
-    CHECK_MESSAGE((&std::get<0>(a_in.input_ports()) == &f),
-                  "f not bound to input port 0 in composite_node a_in");
+    CHECK_MESSAGE( (&std::get<0>(a_in.input_ports()) == &f), "f not bound to input port 0 in composite_node a_in");
 
-    std::tuple<src_type &> output_tuple(src);
+    std::tuple<src_type&> output_tuple(src);
     a_out.set_external_ports(output_tuple);
-    CHECK_MESSAGE((&std::get<0>(a_out.output_ports()) == &src),
-                  "src not bound to output port 0 in composite_node a_out");
+    CHECK_MESSAGE( (&std::get<0>(a_out.output_ports()) == &src), "src not bound to output port 0 in composite_node a_out");
 
-    if (hidden) {
+    if(hidden) {
         a_in.add_nodes(f, seq, que);
         a_out.add_nodes(src);
     } else {
@@ -517,44 +479,45 @@ void input_only_output_only_composite(bool hidden) {
     src.activate();
     g.wait_for_all();
 
-    for (int i = 1; i < finish / step; ++i) {
+    for(int i = 1; i<finish/step; ++i) {
         que.try_get(num);
-        CHECK_MESSAGE((num == 4 * i - 3), "number does not match position in sequence");
+        CHECK_MESSAGE( (num == 4*i - 3), "number does not match position in sequence");
     }
     g.wait_for_all();
 }
 
 //! Test single node inside composite nodes
 //! \brief \ref error_guessing
-TEST_CASE("Tiny tests") {
+TEST_CASE("Tiny tests"){
     test_tiny(false);
     test_tiny(true);
 }
 
 //! Test basic adders in composite node
 //! \brief \ref error_guessing
-TEST_CASE("Adder tests") {
+TEST_CASE("Adder tests"){
     test_adder(false);
     test_adder(true);
 }
 
 //! Test nested adders in composite node
 //! \brief \ref error_guessing
-TEST_CASE("Nested adder tests") {
+TEST_CASE("Nested adder tests"){
     test_nested_adder(true);
     test_nested_adder(false);
 }
 
 //! Test returning a subset of inputs
 //! \brief \ref error_guessing
-TEST_CASE("Prefix test") {
+TEST_CASE("Prefix test"){
     test_prefix(false);
     test_prefix(true);
 }
 
 //! Test input-only composite node
 //! \brief \ref error_guessing \ref boundary
-TEST_CASE("Input-only composite") {
+TEST_CASE("Input-only composite"){
     input_only_output_only_composite(true);
     input_only_output_only_composite(false);
 }
+
diff --git a/external/tbb/test/tbb/test_concurrent_hash_map.cpp b/external/tbb/test/tbb/test_concurrent_hash_map.cpp
index e1d53697..fcef8263 100644
--- a/external/tbb/test/tbb/test_concurrent_hash_map.cpp
+++ b/external/tbb/test/tbb/test_concurrent_hash_map.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2023 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -16,82 +16,76 @@
 
 #if _MSC_VER
 #if __INTEL_COMPILER
-#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
+    #pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
 #else
-// Workaround for vs2015 and warning name was longer than the compiler limit (4096).
-#pragma warning(disable : 4503)
+    // Workaround for vs2015 and warning name was longer than the compiler limit (4096).
+    #pragma warning (disable: 4503)
 #endif
 #endif
 
 #define TBB_DEFINE_STD_HASH_SPECIALIZATIONS 1
 #define TBB_PREVIEW_CONCURRENT_HASH_MAP_EXTENSIONS 1
-#include <algorithm>
-#include <common/concepts_common.h>
-#include <common/concurrent_associative_common.h>
-#include <common/containers_common.h>
-#include <common/custom_allocators.h>
-#include <common/range_based_for_support.h>
 #include <common/test.h>
 #include <common/utils.h>
-#include <functional>
-#include <list>
-#include <mutex>
-#include <scoped_allocator>
+#include <common/range_based_for_support.h>
+#include <common/custom_allocators.h>
+#include <common/containers_common.h>
+#include <common/concepts_common.h>
 #include <tbb/concurrent_hash_map.h>
 #include <tbb/parallel_for.h>
+#include <common/concurrent_associative_common.h>
 #include <vector>
+#include <list>
+#include <algorithm>
+#include <functional>
+#include <scoped_allocator>
+#include <mutex>
 
 //! \file test_concurrent_hash_map.cpp
 //! \brief Test for [containers.concurrent_hash_map containers.tbb_hash_compare] specification
 
-void TestRangeBasedFor() {
+void TestRangeBasedFor(){
     using namespace range_based_for_support_tests;
 
     INFO("testing range based for loop compatibility \n");
-    using ch_map = tbb::concurrent_hash_map<int, int>;
+    using ch_map = tbb::concurrent_hash_map<int,int>;
     ch_map a_ch_map;
 
     const int sequence_length = 100;
-    for (int i = 1; i <= sequence_length; ++i) { a_ch_map.insert(ch_map::value_type(i, i)); }
+    for (int i = 1; i <= sequence_length; ++i){
+        a_ch_map.insert(ch_map::value_type(i,i));
+    }
 
-    REQUIRE_MESSAGE((range_based_for_accumulate(a_ch_map, pair_second_summer(), 0)
-                     == gauss_summ_of_int_sequence(sequence_length)),
-                    "incorrect accumulated value generated via range based for ?");
+    REQUIRE_MESSAGE((range_based_for_accumulate(a_ch_map, pair_second_summer(), 0) == gauss_summ_of_int_sequence(sequence_length)),
+        "incorrect accumulated value generated via range based for ?");
 }
 
 // The helper to run a test only when a default construction is present.
-template <bool default_construction_present>
-struct do_default_construction_test {
-    template <typename FuncType>
-    void operator()(FuncType func) const {
-        func();
-    }
+template <bool default_construction_present> struct do_default_construction_test {
+    template<typename FuncType> void operator() ( FuncType func ) const { func(); }
 };
 
-template <>
-struct do_default_construction_test<false> {
-    template <typename FuncType>
-    void operator()(FuncType) const {}
+template <> struct do_default_construction_test<false> {
+    template<typename FuncType> void operator()( FuncType ) const {}
 };
 
 template <typename Table>
 class test_insert_by_key {
     using value_type = typename Table::value_type;
-    Table& my_c;
-    const value_type& my_value;
-
+    Table &my_c;
+    const value_type &my_value;
 public:
-    test_insert_by_key(Table& c, const value_type& value) : my_c(c), my_value(value) {}
+    test_insert_by_key( Table &c, const value_type &value ) : my_c(c), my_value(value) {}
     void operator()() const {
         {
             typename Table::accessor a;
-            CHECK(my_c.insert(a, my_value.first));
+            CHECK(my_c.insert( a, my_value.first ));
             CHECK(utils::IsEqual()(a->first, my_value.first));
             a->second = my_value.second;
         }
         {
             typename Table::const_accessor ca;
-            CHECK(!my_c.insert(ca, my_value.first));
+            CHECK(!my_c.insert( ca, my_value.first ));
             CHECK(utils::IsEqual()(ca->first, my_value.first));
             CHECK(utils::IsEqual()(ca->second, my_value.second));
         }
@@ -101,26 +95,23 @@ class test_insert_by_key {
 template <typename Table, typename Iterator, typename Range = typename Table::range_type>
 class test_range {
     using value_type = typename Table::value_type;
-    Table& my_c;
-    const std::list<value_type>& my_lst;
+    Table &my_c;
+    const std::list<value_type> &my_lst;
     std::vector<detail::atomic_type<bool>>& my_marks;
-
 public:
-    test_range(Table& c, const std::list<value_type>& lst, std::vector<detail::atomic_type<bool>>& marks)
-        : my_c(c), my_lst(lst), my_marks(marks) {
+    test_range( Table &c, const std::list<value_type> &lst, std::vector<detail::atomic_type<bool>> &marks ) : my_c(c), my_lst(lst), my_marks(marks) {
         for (std::size_t i = 0; i < my_marks.size(); ++i) {
             my_marks[i].store(false, std::memory_order_relaxed);
         }
     }
 
-    void operator()(const Range& r) const { do_test_range(r.begin(), r.end()); }
-    void do_test_range(Iterator i, Iterator j) const {
-        for (Iterator it = i; it != j;) {
+    void operator()( const Range &r ) const { do_test_range( r.begin(), r.end() ); }
+    void do_test_range( Iterator i, Iterator j ) const {
+        for ( Iterator it = i; it != j; ) {
             Iterator it_prev = it++;
-            typename std::list<value_type>::const_iterator it2
-                    = std::search(my_lst.begin(), my_lst.end(), it_prev, it, utils::IsEqual());
+            typename std::list<value_type>::const_iterator it2 = std::search( my_lst.begin(), my_lst.end(), it_prev, it, utils::IsEqual() );
             CHECK(it2 != my_lst.end());
-            typename std::list<value_type>::difference_type dist = std::distance(my_lst.begin(), it2);
+            typename std::list<value_type>::difference_type dist = std::distance( my_lst.begin(), it2 );
             CHECK(!my_marks[dist]);
             my_marks[dist].store(true);
         }
@@ -132,78 +123,76 @@ class check_value {
     using const_iterator = typename Table::const_iterator;
     using iterator = typename Table::iterator;
     using size_type = typename Table::size_type;
-    Table& my_c;
-
+    Table &my_c;
 public:
-    check_value(Table& c) : my_c(c) {}
-    void operator()(const typename Table::value_type& value) {
-        const Table& const_c = my_c;
-        CHECK(my_c.count(value.first) == 1);
-        {// tests with a const accessor.
+    check_value( Table &c ) : my_c(c) {}
+    void operator()(const typename Table::value_type &value ) {
+        const Table &const_c = my_c;
+        CHECK(my_c.count( value.first ) == 1);
+        { // tests with a const accessor.
             typename Table::const_accessor ca;
             // find
-            CHECK(my_c.find(ca, value.first));
-            CHECK(!ca.empty());
+            CHECK(my_c.find( ca, value.first ));
+            CHECK(!ca.empty() );
             CHECK(utils::IsEqual()(ca->first, value.first));
             CHECK(utils::IsEqual()(ca->second, value.second));
             // erase
-            CHECK(my_c.erase(ca));
-            CHECK(my_c.count(value.first) == 0);
+            CHECK(my_c.erase( ca ));
+            CHECK(my_c.count( value.first ) == 0);
             // insert (pair)
-            CHECK(my_c.insert(ca, value));
+            CHECK(my_c.insert( ca, value ));
             CHECK(utils::IsEqual()(ca->first, value.first));
             CHECK(utils::IsEqual()(ca->second, value.second));
-        }
-        {// tests with a non-const accessor.
+        } { // tests with a non-const accessor.
             typename Table::accessor a;
             // find
-            CHECK(my_c.find(a, value.first));
-            CHECK(!a.empty());
+            CHECK(my_c.find( a, value.first ));
+            CHECK(!a.empty() );
             CHECK(utils::IsEqual()(a->first, value.first));
             CHECK(utils::IsEqual()(a->second, value.second));
             // erase
-            CHECK(my_c.erase(a));
-            CHECK(my_c.count(value.first) == 0);
+            CHECK(my_c.erase( a ));
+            CHECK(my_c.count( value.first ) == 0);
             // insert
-            CHECK(my_c.insert(a, value));
+            CHECK(my_c.insert( a, value ));
             CHECK(utils::IsEqual()(a->first, value.first));
             CHECK(utils::IsEqual()(a->second, value.second));
         }
         // erase by key
-        CHECK(my_c.erase(value.first));
-        CHECK(my_c.count(value.first) == 0);
-        do_default_construction_test<default_construction_present>()(test_insert_by_key<Table>(my_c, value));
+        CHECK(my_c.erase( value.first ));
+        CHECK(my_c.count( value.first ) == 0);
+        do_default_construction_test<default_construction_present>()(test_insert_by_key<Table>( my_c, value ));
         // insert by value
-        CHECK(my_c.insert(value) != default_construction_present);
+        CHECK(my_c.insert( value ) != default_construction_present);
         // equal_range
-        std::pair<iterator, iterator> r1 = my_c.equal_range(value.first);
+        std::pair<iterator,iterator> r1 = my_c.equal_range( value.first );
         iterator r1_first_prev = r1.first++;
-        CHECK((utils::IsEqual()(*r1_first_prev, value) && utils::IsEqual()(r1.first, r1.second)));
-        std::pair<const_iterator, const_iterator> r2 = const_c.equal_range(value.first);
+        CHECK((utils::IsEqual()( *r1_first_prev, value ) && utils::IsEqual()( r1.first, r1.second )));
+        std::pair<const_iterator,const_iterator> r2 = const_c.equal_range( value.first );
         const_iterator r2_first_prev = r2.first++;
-        CHECK((utils::IsEqual()(*r2_first_prev, value) && utils::IsEqual()(r2.first, r2.second)));
+        CHECK((utils::IsEqual()( *r2_first_prev, value ) && utils::IsEqual()( r2.first, r2.second )));
     }
 };
 
 template <typename Value, typename U = Value>
 struct CompareTables {
     template <typename T>
-    static bool IsEqual(const T& t1, const T& t2) {
+    static bool IsEqual( const T& t1, const T& t2 ) {
         return (t1 == t2) && !(t1 != t2);
     }
 };
 
 template <typename U>
-struct CompareTables<std::pair<const std::weak_ptr<U>, std::weak_ptr<U>>> {
+struct CompareTables< std::pair<const std::weak_ptr<U>, std::weak_ptr<U> > > {
     template <typename T>
-    static bool IsEqual(const T&, const T&) {
+    static bool IsEqual( const T&, const T& ) {
         /* do nothing for std::weak_ptr */
         return true;
     }
 };
 
 template <bool default_construction_present, typename Table>
-void Examine(Table c, const std::list<typename Table::value_type>& lst) {
+void Examine( Table c, const std::list<typename Table::value_type> &lst) {
     using const_table = const Table;
     using const_iterator = typename Table::const_iterator;
     using iterator = typename Table::iterator;
@@ -215,121 +204,122 @@ void Examine(Table c, const std::list<typename Table::value_type>& lst) {
     CHECK(c.max_size() >= c.size());
 
     const check_value<default_construction_present, Table> cv(c);
-    std::for_each(lst.begin(), lst.end(), cv);
+    std::for_each( lst.begin(), lst.end(), cv );
 
-    std::vector<detail::atomic_type<bool>> marks(lst.size());
+    std::vector<detail::atomic_type<bool>> marks( lst.size() );
 
-    test_range<Table, iterator>(c, lst, marks).do_test_range(c.begin(), c.end());
-    CHECK(std::find(marks.begin(), marks.end(), false) == marks.end());
+    test_range<Table,iterator>( c, lst, marks ).do_test_range( c.begin(), c.end() );
+    CHECK(std::find( marks.begin(), marks.end(), false ) == marks.end());
 
-    test_range<const_table, const_iterator>(c, lst, marks).do_test_range(c.begin(), c.end());
-    CHECK(std::find(marks.begin(), marks.end(), false) == marks.end());
+    test_range<const_table,const_iterator>( c, lst, marks ).do_test_range( c.begin(), c.end() );
+    CHECK(std::find( marks.begin(), marks.end(), false ) == marks.end());
 
     using range_type = typename Table::range_type;
-    tbb::parallel_for(c.range(), test_range<Table, typename range_type::iterator, range_type>(c, lst, marks));
-    CHECK(std::find(marks.begin(), marks.end(), false) == marks.end());
+    tbb::parallel_for( c.range(), test_range<Table,typename range_type::iterator,range_type>( c, lst, marks ) );
+    CHECK(std::find( marks.begin(), marks.end(), false ) == marks.end());
 
     const_table const_c = c;
-    CHECK(CompareTables<value_type>::IsEqual(c, const_c));
+    CHECK(CompareTables<value_type>::IsEqual( c, const_c ));
 
-    const size_type new_bucket_count = 2 * c.bucket_count();
-    c.rehash(new_bucket_count);
+    const size_type new_bucket_count = 2*c.bucket_count();
+    c.rehash( new_bucket_count );
     CHECK(c.bucket_count() >= new_bucket_count);
 
     Table c2;
     typename std::list<value_type>::const_iterator begin5 = lst.begin();
-    std::advance(begin5, 5);
-    c2.insert(lst.begin(), begin5);
-    std::for_each(lst.begin(), begin5, check_value<default_construction_present, Table>(c2));
+    std::advance( begin5, 5 );
+    c2.insert( lst.begin(), begin5 );
+    std::for_each( lst.begin(), begin5, check_value<default_construction_present, Table>( c2 ) );
 
-    c2.swap(c);
-    CHECK(CompareTables<value_type>::IsEqual(c2, const_c));
+    c2.swap( c );
+    CHECK(CompareTables<value_type>::IsEqual( c2, const_c ));
     CHECK(c.size() == 5);
-    std::for_each(lst.begin(), lst.end(), check_value<default_construction_present, Table>(c2));
+    std::for_each( lst.begin(), lst.end(), check_value<default_construction_present,Table>(c2) );
 
-    swap(c, c2);
-    CHECK(CompareTables<value_type>::IsEqual(c, const_c));
+    swap( c, c2 );
+    CHECK(CompareTables<value_type>::IsEqual( c, const_c ));
     CHECK(c2.size() == 5);
 
     c2.clear();
-    CHECK(CompareTables<value_type>::IsEqual(c2, Table()));
+    CHECK(CompareTables<value_type>::IsEqual( c2, Table() ));
 
     typename Table::allocator_type a = c.get_allocator();
-    value_type* ptr = a.allocate(1);
+    value_type *ptr = a.allocate(1);
     CHECK(ptr);
-    a.deallocate(ptr, 1);
+    a.deallocate( ptr, 1 );
 }
 
 template <typename T>
 struct debug_hash_compare : public tbb::detail::d1::tbb_hash_compare<T> {};
 
 template <bool default_construction_present, typename Value>
-void TypeTester(const std::list<Value>& lst) {
+void TypeTester( const std::list<Value> &lst ) {
     using first_type = typename Value::first_type;
     using key_type = typename std::remove_const<first_type>::type;
     using second_type = typename Value::second_type;
     using ch_map = tbb::concurrent_hash_map<key_type, second_type>;
-    debug_hash_compare<key_type> compare {};
+    debug_hash_compare<key_type> compare{};
     // Construct an empty hash map.
     ch_map c1;
-    c1.insert(lst.begin(), lst.end());
-    Examine<default_construction_present>(c1, lst);
+    c1.insert( lst.begin(), lst.end() );
+    Examine<default_construction_present>( c1, lst );
 
     // Constructor from initializer_list.
     typename std::list<Value>::const_iterator it = lst.begin();
-    std::initializer_list<Value> il = {*it++, *it++, *it++};
-    ch_map c2(il);
-    c2.insert(it, lst.end());
-    Examine<default_construction_present>(c2, lst);
+    std::initializer_list<Value> il = { *it++, *it++, *it++ };
+    ch_map c2( il );
+    c2.insert( it, lst.end() );
+    Examine<default_construction_present>( c2, lst );
 
     // Constructor from initializer_list and compare object
-    ch_map c3(il, compare);
-    c3.insert(it, lst.end());
-    Examine<default_construction_present>(c3, lst);
+    ch_map c3( il, compare);
+    c3.insert( it, lst.end() );
+    Examine<default_construction_present>( c3, lst );
 
     // Constructor from initializer_list, compare object and allocator
-    ch_map c4(il, compare, typename ch_map::allocator_type());
-    c4.insert(it, lst.end());
-    Examine<default_construction_present>(c4, lst);
+    ch_map c4( il, compare, typename ch_map::allocator_type());
+    c4.insert( it, lst.end());
+    Examine<default_construction_present>( c4, lst );
 
     // Copying constructor.
     ch_map c5(c1);
-    Examine<default_construction_present>(c5, lst);
+    Examine<default_construction_present>( c5, lst );
     // Construct with non-default allocator
-    using ch_map_debug_alloc
-            = tbb::concurrent_hash_map<key_type, second_type, tbb::detail::d1::tbb_hash_compare<key_type>,
-                                       LocalCountingAllocator<std::allocator<Value>>>;
+    using ch_map_debug_alloc = tbb::concurrent_hash_map<key_type, second_type,
+                                                        tbb::detail::d1::tbb_hash_compare<key_type>,
+                                                        LocalCountingAllocator<std::allocator<Value>>>;
     ch_map_debug_alloc c6;
-    c6.insert(lst.begin(), lst.end());
-    Examine<default_construction_present>(c6, lst);
+    c6.insert( lst.begin(), lst.end() );
+    Examine<default_construction_present>( c6, lst );
     // Copying constructor
     ch_map_debug_alloc c7(c6);
-    Examine<default_construction_present>(c7, lst);
+    Examine<default_construction_present>( c7, lst );
     // Construction empty table with n preallocated buckets.
-    ch_map c8(lst.size());
-    c8.insert(lst.begin(), lst.end());
-    Examine<default_construction_present>(c8, lst);
-    ch_map_debug_alloc c9(lst.size());
-    c9.insert(lst.begin(), lst.end());
-    Examine<default_construction_present>(c9, lst);
+    ch_map c8( lst.size() );
+    c8.insert( lst.begin(), lst.end() );
+    Examine<default_construction_present>( c8, lst );
+    ch_map_debug_alloc c9( lst.size() );
+    c9.insert( lst.begin(), lst.end() );
+    Examine<default_construction_present>( c9, lst );
     // Construction with copying iteration range.
-    ch_map c10_1(c1.begin(), c1.end()), c10_2(c1.cbegin(), c1.cend());
-    Examine<default_construction_present>(c10_1, lst);
-    Examine<default_construction_present>(c10_2, lst);
+    ch_map c10_1( c1.begin(), c1.end() ), c10_2(c1.cbegin(), c1.cend());
+    Examine<default_construction_present>( c10_1, lst );
+    Examine<default_construction_present>( c10_2, lst );
     // Construction with copying iteration range and given allocator instance.
     LocalCountingAllocator<std::allocator<Value>> allocator;
-    ch_map_debug_alloc c11(lst.begin(), lst.end(), allocator);
-    Examine<default_construction_present>(c11, lst);
+    ch_map_debug_alloc c11( lst.begin(), lst.end(), allocator );
+    Examine<default_construction_present>( c11, lst );
 
-    using ch_map_debug_hash = tbb::concurrent_hash_map<key_type, second_type, debug_hash_compare<key_type>,
+    using ch_map_debug_hash = tbb::concurrent_hash_map<key_type, second_type,
+                                                       debug_hash_compare<key_type>,
                                                        typename ch_map::allocator_type>;
 
     // Constructor with two iterators and hash_compare
     ch_map_debug_hash c12(c1.begin(), c1.end(), compare);
-    Examine<default_construction_present>(c12, lst);
+    Examine<default_construction_present>( c12, lst );
 
     ch_map_debug_hash c13(c1.begin(), c1.end(), compare, typename ch_map::allocator_type());
-    Examine<default_construction_present>(c13, lst);
+    Examine<default_construction_present>( c13, lst );
 }
 
 void TestSpecificTypes() {
@@ -337,40 +327,42 @@ void TestSpecificTypes() {
 
     using int_int_t = std::pair<const int, int>;
     std::list<int_int_t> arrIntInt;
-    for (int i = 0; i < NUMBER; ++i) arrIntInt.push_back(int_int_t(i, NUMBER - i));
-    TypeTester</*default_construction_present = */ true>(arrIntInt);
+    for ( int i=0; i<NUMBER; ++i ) arrIntInt.push_back( int_int_t(i, NUMBER-i) );
+    TypeTester</*default_construction_present = */true>( arrIntInt );
 
     using ref_int_t = std::pair<const std::reference_wrapper<const int>, int>;
     std::list<ref_int_t> arrRefInt;
-    for (std::list<int_int_t>::iterator it = arrIntInt.begin(); it != arrIntInt.end(); ++it)
-        arrRefInt.push_back(ref_int_t(it->first, it->second));
-    TypeTester</*default_construction_present = */ true>(arrRefInt);
+    for ( std::list<int_int_t>::iterator it = arrIntInt.begin(); it != arrIntInt.end(); ++it )
+        arrRefInt.push_back( ref_int_t( it->first, it->second ) );
+    TypeTester</*default_construction_present = */true>( arrRefInt );
 
-    using int_ref_t = std::pair<const int, std::reference_wrapper<int>>;
+    using int_ref_t = std::pair< const int, std::reference_wrapper<int> >;
     std::list<int_ref_t> arrIntRef;
-    for (std::list<int_int_t>::iterator it = arrIntInt.begin(); it != arrIntInt.end(); ++it)
-        arrIntRef.push_back(int_ref_t(it->first, it->second));
-    TypeTester</*default_construction_present = */ false>(arrIntRef);
+    for ( std::list<int_int_t>::iterator it = arrIntInt.begin(); it != arrIntInt.end(); ++it )
+        arrIntRef.push_back( int_ref_t( it->first, it->second ) );
+    TypeTester</*default_construction_present = */false>( arrIntRef );
 
-    using shr_shr_t = std::pair<const std::shared_ptr<int>, std::shared_ptr<int>>;
+    using shr_shr_t = std::pair< const std::shared_ptr<int>, std::shared_ptr<int> >;
     std::list<shr_shr_t> arrShrShr;
-    for (int i = 0; i < NUMBER; ++i) {
+    for ( int i=0; i<NUMBER; ++i ) {
         const int NUMBER_minus_i = NUMBER - i;
-        arrShrShr.push_back(shr_shr_t(std::make_shared<int>(i), std::make_shared<int>(NUMBER_minus_i)));
+        arrShrShr.push_back( shr_shr_t( std::make_shared<int>(i), std::make_shared<int>(NUMBER_minus_i) ) );
     }
-    TypeTester</*default_construction_present = */ true>(arrShrShr);
+    TypeTester< /*default_construction_present = */true>( arrShrShr );
 
-    using wk_wk_t = std::pair<const std::weak_ptr<int>, std::weak_ptr<int>>;
-    std::list<wk_wk_t> arrWkWk;
-    std::copy(arrShrShr.begin(), arrShrShr.end(), std::back_inserter(arrWkWk));
-    TypeTester</*default_construction_present = */ true>(arrWkWk);
+    using wk_wk_t = std::pair< const std::weak_ptr<int>, std::weak_ptr<int> >;
+    std::list< wk_wk_t > arrWkWk;
+    std::copy( arrShrShr.begin(), arrShrShr.end(), std::back_inserter(arrWkWk) );
+    TypeTester< /*default_construction_present = */true>( arrWkWk );
 
     // Check working with deprecated hashers
     using pair_key_type = std::pair<int, int>;
     using pair_int_t = std::pair<const pair_key_type, int>;
     std::list<pair_int_t> arr_pair_int;
-    for (int i = 0; i < NUMBER; ++i) { arr_pair_int.push_back(pair_int_t(pair_key_type {i, i}, i)); }
-    TypeTester</*default_construction_present = */ true>(arr_pair_int);
+    for (int i = 0; i < NUMBER; ++i) {
+        arr_pair_int.push_back(pair_int_t(pair_key_type{i, i}, i));
+    }
+    TypeTester</*default_construction_present = */true>(arr_pair_int);
 
     using tbb_string_key_type = std::basic_string<char, std::char_traits<char>, tbb::tbb_allocator<char>>;
     using pair_tbb_string_int_t = std::pair<const tbb_string_key_type, int>;
@@ -379,16 +371,16 @@ void TestSpecificTypes() {
         tbb_string_key_type key(i, char(i));
         arr_pair_string_int.push_back(pair_tbb_string_int_t(key, i));
     }
-    TypeTester</*default_construction_present = */ true>(arr_pair_string_int);
+    TypeTester</*default_construction_present = */true>(arr_pair_string_int);
 }
 
 struct custom_hash_compare {
-    template <typename Allocator>
+    template<typename Allocator>
     size_t hash(const AllocatorAwareData<Allocator>& key) const {
         return my_hash_compare.hash(key.value());
     }
 
-    template <typename Allocator>
+    template<typename Allocator>
     bool equal(const AllocatorAwareData<Allocator>& key1, const AllocatorAwareData<Allocator>& key2) const {
         return my_hash_compare.equal(key1.value(), key2.value());
     }
@@ -399,8 +391,7 @@ struct custom_hash_compare {
 
 void TestScopedAllocator() {
     using allocator_data_type = AllocatorAwareData<std::scoped_allocator_adaptor<tbb::tbb_allocator<int>>>;
-    using allocator_type = std::scoped_allocator_adaptor<
-            tbb::tbb_allocator<std::pair<const allocator_data_type, allocator_data_type>>>;
+    using allocator_type = std::scoped_allocator_adaptor<tbb::tbb_allocator<std::pair<const allocator_data_type, allocator_data_type>>>;
     using hash_map_type = tbb::concurrent_hash_map<allocator_data_type, allocator_data_type,
                                                    custom_hash_compare, allocator_type>;
 
@@ -411,7 +402,7 @@ void TestScopedAllocator() {
 
     hash_map_type::value_type v1(key1, data1), v2(key2, data2);
 
-    auto init_list = {v1, v2};
+    auto init_list = { v1, v2 };
 
     allocator_data_type::assert_on_constructions = true;
     map1.emplace(key1, data1);
@@ -459,7 +450,9 @@ void TestInternalFastFind() {
     chmap m;
     int sz = 100;
 
-    for (int i = 0; i != sz; ++i) { m.insert(std::make_pair(i, i * i)); }
+    for (int i = 0; i != sz; ++i) {
+        m.insert(std::make_pair(i, i * i));
+    }
     REQUIRE_MESSAGE(m.size() == 100, "Incorrect concurrent_hash_map size");
 
     for (int i = 0; i != sz; ++i) {
@@ -478,18 +471,14 @@ void TestInternalFastFind() {
 
 struct default_container_traits {
     template <typename container_type, typename iterator_type>
-    static container_type&
-    construct_container(typename std::aligned_storage<sizeof(container_type)>::type& storage,
-                        iterator_type begin, iterator_type end) {
+    static container_type& construct_container(typename std::aligned_storage<sizeof(container_type)>::type& storage, iterator_type begin, iterator_type end){
         container_type* ptr = reinterpret_cast<container_type*>(&storage);
         new (ptr) container_type(begin, end);
         return *ptr;
     }
 
     template <typename container_type, typename iterator_type, typename allocator_type>
-    static container_type&
-    construct_container(typename std::aligned_storage<sizeof(container_type)>::type& storage,
-                        iterator_type begin, iterator_type end, allocator_type const& a) {
+    static container_type& construct_container(typename std::aligned_storage<sizeof(container_type)>::type& storage, iterator_type begin, iterator_type end, allocator_type const& a){
         container_type* ptr = reinterpret_cast<container_type*>(&storage);
         new (ptr) container_type(begin, end, a);
         return *ptr;
@@ -497,12 +486,16 @@ struct default_container_traits {
 };
 
 struct hash_map_traits : default_container_traits {
-    enum { expected_number_of_items_to_allocate_for_steal_move = 0 };
+    enum{ expected_number_of_items_to_allocate_for_steal_move = 0 };
 
-    template <typename T>
+    template<typename T>
     struct hash_compare {
-        bool equal(const T& lhs, const T& rhs) const { return lhs == rhs; }
-        size_t hash(const T& k) const { return my_hash_func(k); }
+        bool equal( const T& lhs, const T& rhs ) const {
+            return lhs==rhs;
+        }
+        size_t hash( const T& k ) const {
+            return my_hash_func(k);
+        }
         std::hash<T> my_hash_func;
     };
 
@@ -512,332 +505,27 @@ struct hash_map_traits : default_container_traits {
     template <typename T>
     using container_value_type = std::pair<const T, T>;
 
-    template <typename element_type, typename allocator_type>
+    template<typename element_type, typename allocator_type>
     struct apply {
-        using type = tbb::concurrent_hash_map<element_type, element_type, hash_compare<element_type>,
-                                              allocator_type>;
+        using type = tbb::concurrent_hash_map<element_type, element_type, hash_compare<element_type>, allocator_type>;
     };
 
     using init_iterator_type = move_support_tests::FooPairIterator;
     template <typename hash_map_type, typename iterator>
-    static bool equal(hash_map_type const& c, iterator begin, iterator end) {
-        bool equal_sizes = (static_cast<size_t>(std::distance(begin, end)) == c.size());
-        if (!equal_sizes) return false;
+    static bool equal(hash_map_type const& c, iterator begin, iterator end){
+        bool equal_sizes = ( static_cast<size_t>(std::distance(begin, end)) == c.size() );
+        if (!equal_sizes)
+            return false;
 
-        for (iterator it = begin; it != end; ++it) {
-            if (c.count((*it).first) == 0) { return false; }
+        for (iterator it = begin; it != end; ++it ){
+            if (c.count( (*it).first) == 0){
+                return false;
+            }
         }
         return true;
     }
 };
 
-template <bool IsConstructible>
-class HeterogeneousKey {
-public:
-    static std::size_t heterogeneous_keys_count;
-
-    int integer_key() const { return my_key; }
-
-    template <bool I = IsConstructible, typename = typename std::enable_if<I>::type>
-    HeterogeneousKey(int key) : my_key(key) {
-        ++heterogeneous_keys_count;
-    }
-
-    HeterogeneousKey(const HeterogeneousKey&) = delete;
-    HeterogeneousKey& operator=(const HeterogeneousKey&) = delete;
-
-    static void reset() { heterogeneous_keys_count = 0; }
-
-    struct construct_flag {};
-
-    HeterogeneousKey(construct_flag, int key) : my_key(key) {}
-
-private:
-    int my_key;
-};// class HeterogeneousKey
-
-template <bool IsConstructible>
-std::size_t HeterogeneousKey<IsConstructible>::heterogeneous_keys_count = 0;
-
-struct HeterogeneousHashCompare {
-    using is_transparent = void;
-
-    template <bool IsConstructible>
-    std::size_t hash(const HeterogeneousKey<IsConstructible>& key) const {
-        return my_hash_object(key.integer_key());
-    }
-
-    std::size_t hash(const int& key) const { return my_hash_object(key); }
-
-    bool equal(const int& key1, const int& key2) const { return key1 == key2; }
-
-    template <bool IsConstructible>
-    bool equal(const int& key1, const HeterogeneousKey<IsConstructible>& key2) const {
-        return key1 == key2.integer_key();
-    }
-
-    template <bool IsConstructible>
-    bool equal(const HeterogeneousKey<IsConstructible>& key1, const int& key2) const {
-        return key1.integer_key() == key2;
-    }
-
-    template <bool IsConstructible>
-    bool equal(const HeterogeneousKey<IsConstructible>& key1,
-               const HeterogeneousKey<IsConstructible>& key2) const {
-        return key1.integer_key() == key2.integer_key();
-    }
-
-    std::hash<int> my_hash_object;
-};// struct HeterogeneousHashCompare
-
-class DefaultConstructibleValue {
-public:
-    DefaultConstructibleValue() : my_i(default_value) {};
-
-    int value() const { return my_i; }
-    static constexpr int default_value = -4242;
-
-private:
-    int my_i;
-};// class DefaultConstructibleValue
-
-constexpr int DefaultConstructibleValue::default_value;
-
-void test_heterogeneous_find() {
-    using key_type = HeterogeneousKey</*IsConstructible = */ false>;
-    using chmap_type = tbb::concurrent_hash_map<key_type, int, HeterogeneousHashCompare>;
-
-    chmap_type chmap;
-    using const_accessor = typename chmap_type::const_accessor;
-    using accessor = typename chmap_type::accessor;
-    const_accessor cacc;
-    accessor acc;
-
-    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 0, "Incorrect test setup");
-
-    key_type key(key_type::construct_flag {}, 1);
-    bool regular_result = chmap.find(cacc, key);
-    bool heterogeneous_result = chmap.find(cacc, int(1));
-
-    REQUIRE(!regular_result);
-    REQUIRE_MESSAGE(regular_result == heterogeneous_result,
-                    "Incorrect heterogeneous find result with const_accessor (no element)");
-    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 0,
-                    "Temporary key object was created during find call with const_accessor (no element)");
-
-    regular_result = chmap.find(acc, key);
-    heterogeneous_result = chmap.find(acc, int(1));
-
-    REQUIRE(!regular_result);
-    REQUIRE_MESSAGE(regular_result == heterogeneous_result,
-                    "Incorrect heterogeneous find result with accessor (no element)");
-    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 0,
-                    "Temporary key object was created during find call with accessor (no element)");
-
-    bool tmp_result = chmap.emplace(cacc, std::piecewise_construct,
-                                    std::forward_as_tuple(key_type::construct_flag {}, 1),
-                                    std::forward_as_tuple(100));
-    REQUIRE(tmp_result);
-
-    regular_result = chmap.find(cacc, key);
-    heterogeneous_result = chmap.find(cacc, int(1));
-
-    REQUIRE(regular_result);
-    REQUIRE_MESSAGE(regular_result == heterogeneous_result,
-                    "Incorrect heterogeneous find result with const_accessor (element exists)");
-    REQUIRE_MESSAGE(cacc->first.integer_key() == 1, "Incorrect accessor returned");
-    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 0,
-                    "Temporary key object was created during find call with const_accessor (element exists)");
-    cacc.release();
-
-    regular_result = chmap.find(acc, key);
-    heterogeneous_result = chmap.find(acc, int(1));
-
-    REQUIRE(regular_result);
-    REQUIRE_MESSAGE(regular_result == heterogeneous_result,
-                    "Incorrect heterogeneous find result with accessor (element exists)");
-    REQUIRE_MESSAGE(acc->first.integer_key() == 1, "Incorrect accessor returned");
-    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 0,
-                    "Temporary key object was created during find call with accessor (element exists)");
-    key_type::reset();
-}
-
-void test_heterogeneous_count() {
-    using key_type = HeterogeneousKey</*IsConstructible = */ false>;
-    using chmap_type = tbb::concurrent_hash_map<key_type, int, HeterogeneousHashCompare>;
-
-    chmap_type chmap;
-
-    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 0, "Incorrect test setup");
-    key_type key(key_type::construct_flag {}, 1);
-
-    typename chmap_type::size_type regular_count = chmap.count(key);
-    typename chmap_type::size_type heterogeneous_count = chmap.count(int(1));
-
-    REQUIRE(regular_count == 0);
-    REQUIRE_MESSAGE(regular_count == heterogeneous_count,
-                    "Incorrect heterogeneous count result (no element)");
-    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 0,
-                    "Temporary key object was created during count call (no element)");
-
-    chmap.emplace(std::piecewise_construct, std::forward_as_tuple(key_type::construct_flag {}, 1),
-                  std::forward_as_tuple(100));
-
-    regular_count = chmap.count(key);
-    heterogeneous_count = chmap.count(int(1));
-
-    REQUIRE(regular_count == 1);
-    REQUIRE_MESSAGE(regular_count == heterogeneous_count,
-                    "Incorrect heterogeneous count result (element exists)");
-    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 0,
-                    "Temporary key object was created during count call (element exists)");
-    key_type::reset();
-}
-
-void test_heterogeneous_equal_range() {
-    using key_type = HeterogeneousKey</*IsConstructible = */ false>;
-    using chmap_type = tbb::concurrent_hash_map<key_type, int, HeterogeneousHashCompare>;
-
-    chmap_type chmap;
-    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 0, "Incorrect test setup");
-
-    using iterator = typename chmap_type::iterator;
-    using const_iterator = typename chmap_type::const_iterator;
-    using result = std::pair<iterator, iterator>;
-    using const_result = std::pair<const_iterator, const_iterator>;
-    key_type key(key_type::construct_flag {}, 1);
-
-    result regular_result = chmap.equal_range(key);
-    result heterogeneous_result = chmap.equal_range(int(1));
-
-    REQUIRE(regular_result.first == chmap.end());
-    REQUIRE(regular_result.second == chmap.end());
-    REQUIRE_MESSAGE(regular_result == heterogeneous_result,
-                    "Incorrect heterogeneous equal_range result (non const, no element)");
-    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 0,
-                    "Temporary key object was created during equal_range call (non const, no element)");
-
-    const chmap_type& cchmap = chmap;
-
-    const_result regular_const_result = cchmap.equal_range(key);
-    const_result heterogeneous_const_result = cchmap.equal_range(int(1));
-
-    REQUIRE(regular_const_result.first == cchmap.end());
-    REQUIRE(regular_const_result.second == cchmap.end());
-    REQUIRE_MESSAGE(regular_const_result == heterogeneous_const_result,
-                    "Incorrect heterogeneous equal_range result (const, no element)");
-    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 0,
-                    "Temporary key object was created during equal_range call (const, no element)");
-
-    chmap.emplace(std::piecewise_construct, std::forward_as_tuple(key_type::construct_flag {}, 1),
-                  std::forward_as_tuple(100));
-
-    regular_result = chmap.equal_range(key);
-    heterogeneous_result = chmap.equal_range(int(1));
-
-    REQUIRE(regular_result.first != chmap.end());
-    REQUIRE(regular_result.first->first.integer_key() == 1);
-    REQUIRE(regular_result.second == chmap.end());
-    REQUIRE_MESSAGE(regular_result == heterogeneous_result,
-                    "Incorrect heterogeneous equal_range result (non const, element exists)");
-    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 0,
-                    "Temporary key object was created during equal_range call (non const, element exists)");
-
-    regular_const_result = cchmap.equal_range(key);
-    heterogeneous_const_result = cchmap.equal_range(int(1));
-    REQUIRE_MESSAGE(regular_const_result == heterogeneous_const_result,
-                    "Incorrect heterogeneous equal_range result (const, element exists)");
-    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 0,
-                    "Temporary key object was created during equal_range call (const, element exists)");
-    key_type::reset();
-}
-
-void test_heterogeneous_insert() {
-    using key_type = HeterogeneousKey</*IsConstructible = */ true>;
-    using chmap_type
-            = tbb::concurrent_hash_map<key_type, DefaultConstructibleValue, HeterogeneousHashCompare>;
-
-    chmap_type chmap;
-    using const_accessor = typename chmap_type::const_accessor;
-    using accessor = typename chmap_type::accessor;
-    const_accessor cacc;
-    accessor acc;
-
-    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 0, "Incorrect test setup");
-
-    bool result = chmap.insert(cacc, int(1));
-
-    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 1, "Only one heterogeneous key should be created");
-    REQUIRE_MESSAGE(result, "Incorrect heterogeneous insert result (const_accessor)");
-    REQUIRE_MESSAGE(cacc->first.integer_key() == 1, "Incorrect accessor");
-    REQUIRE_MESSAGE(cacc->second.value() == DefaultConstructibleValue::default_value,
-                    "Value should be default constructed");
-
-    result = chmap.insert(cacc, int(1));
-
-    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 1, "No extra keys should be created");
-    REQUIRE_MESSAGE(!result, "Incorrect heterogeneous insert result (const_accessor)");
-    REQUIRE_MESSAGE(cacc->first.integer_key() == 1, "Incorrect accessor");
-    REQUIRE_MESSAGE(cacc->second.value() == DefaultConstructibleValue::default_value,
-                    "Value should be default constructed");
-
-    result = chmap.insert(acc, int(2));
-
-    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 2,
-                    "Only one extra heterogeneous key should be created");
-    REQUIRE_MESSAGE(result, "Incorrect heterogeneous insert result (accessor)");
-    REQUIRE_MESSAGE(acc->first.integer_key() == 2, "Incorrect accessor");
-    REQUIRE_MESSAGE(acc->second.value() == DefaultConstructibleValue::default_value,
-                    "Value should be default constructed");
-
-    result = chmap.insert(acc, int(2));
-
-    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 2, "No extra keys should be created");
-    REQUIRE_MESSAGE(!result, "Incorrect heterogeneous insert result (accessor)");
-    REQUIRE_MESSAGE(acc->first.integer_key() == 2, "Incorrect accessor");
-    REQUIRE_MESSAGE(acc->second.value() == DefaultConstructibleValue::default_value,
-                    "Value should be default constructed");
-
-    key_type::reset();
-}
-
-void test_heterogeneous_erase() {
-    using key_type = HeterogeneousKey</*IsConstructible = */ false>;
-    using chmap_type = tbb::concurrent_hash_map<key_type, int, HeterogeneousHashCompare>;
-
-    chmap_type chmap;
-
-    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 0, "Incorrect test setup");
-
-    chmap.emplace(std::piecewise_construct, std::forward_as_tuple(key_type::construct_flag {}, 1),
-                  std::forward_as_tuple(100));
-    chmap.emplace(std::piecewise_construct, std::forward_as_tuple(key_type::construct_flag {}, 2),
-                  std::forward_as_tuple(200));
-
-    typename chmap_type::const_accessor cacc;
-
-    REQUIRE(chmap.find(cacc, int(1)));
-    REQUIRE(chmap.find(cacc, int(2)));
-
-    cacc.release();
-
-    bool result = chmap.erase(int(1));
-    REQUIRE_MESSAGE(result, "Erasure should be successful");
-    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 0, "No extra keys should be created");
-    REQUIRE_MESSAGE(!chmap.find(cacc, int(1)), "Element was not erased");
-
-    result = chmap.erase(int(1));
-    REQUIRE_MESSAGE(!result, "Erasure should fail");
-    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 0, "No extra keys should be created");
-    key_type::reset();
-}
-
-void test_heterogeneous_lookup() {
-    test_heterogeneous_find();
-    test_heterogeneous_count();
-    test_heterogeneous_equal_range();
-}
-
 template <bool SimulateReacquiring>
 class MinimalisticMutex {
 public:
@@ -849,22 +537,24 @@ class MinimalisticMutex {
     public:
         constexpr scoped_lock() noexcept : my_mutex_ptr(nullptr) {}
 
-        scoped_lock(MinimalisticMutex& m, bool = true) : my_mutex_ptr(&m) { my_mutex_ptr->my_mutex.lock(); }
+        scoped_lock( MinimalisticMutex& m, bool = true ) : my_mutex_ptr(&m) {
+            my_mutex_ptr->my_mutex.lock();
+        }
 
-        scoped_lock(const scoped_lock&) = delete;
-        scoped_lock& operator=(const scoped_lock&) = delete;
+        scoped_lock( const scoped_lock& ) = delete;
+        scoped_lock& operator=( const scoped_lock& ) = delete;
 
         ~scoped_lock() {
             if (my_mutex_ptr) release();
         }
 
-        void acquire(MinimalisticMutex& m, bool = true) {
+        void acquire( MinimalisticMutex& m, bool = true ) {
             CHECK(my_mutex_ptr == nullptr);
             my_mutex_ptr = &m;
             my_mutex_ptr->my_mutex.lock();
         }
 
-        bool try_acquire(MinimalisticMutex& m, bool = true) {
+        bool try_acquire( MinimalisticMutex& m, bool = true ) {
             if (m.my_mutex.try_lock()) {
                 my_mutex_ptr = &m;
                 return true;
@@ -880,33 +570,34 @@ class MinimalisticMutex {
 
         bool upgrade_to_writer() const {
             // upgrade_to_writer should return false if the mutex simulates
-            // reaquiring the lock on upgrade operation
+            // reacquiring the lock on upgrade operation
             return !SimulateReacquiring;
         }
 
         bool downgrade_to_reader() const {
             // downgrade_to_reader should return false if the mutex simulates
-            // reaquiring the lock on upgrade operation
+            // reacquiring the lock on upgrade operation
             return !SimulateReacquiring;
         }
 
         bool is_writer() const {
             CHECK(my_mutex_ptr != nullptr);
-            return true;// Always a writer
+            return true; // Always a writer
         }
 
     private:
         MinimalisticMutex* my_mutex_ptr;
-    };// class scoped_lock
+    }; // class scoped_lock
 private:
     std::mutex my_mutex;
-};// class MinimalisticMutex
+}; // class MinimalisticMutex
 
 template <bool SimulateReacquiring>
 void test_with_minimalistic_mutex() {
     using mutex_type = MinimalisticMutex<SimulateReacquiring>;
     using chmap_type = tbb::concurrent_hash_map<int, int, tbb::tbb_hash_compare<int>,
-                                                tbb::tbb_allocator<std::pair<const int, int>>, mutex_type>;
+                                                tbb::tbb_allocator<std::pair<const int, int>>,
+                                                mutex_type>;
 
     chmap_type chmap;
 
@@ -922,10 +613,10 @@ void test_with_minimalistic_mutex() {
         CHECK(result);
     }
 
-    auto thread_body = [&](const tbb::blocked_range<std::size_t>& range) {
+    auto thread_body = [&]( const tbb::blocked_range<std::size_t>& range ) {
         for (std::size_t item = range.begin(); item != range.end(); ++item) {
-            switch (item % 4) {
-                case 0:
+            switch(item % 4) {
+                case 0 :
                     // Insert new elements
                     for (int i = 100; i < 200; ++i) {
                         typename chmap_type::const_accessor acc;
@@ -934,7 +625,7 @@ void test_with_minimalistic_mutex() {
                         CHECK(acc->second == i);
                     }
                     break;
-                case 1:
+                case 1 :
                     // Insert pre-existing elements
                     for (int i = 0; i < 100; ++i) {
                         typename chmap_type::const_accessor acc;
@@ -944,7 +635,7 @@ void test_with_minimalistic_mutex() {
                         CHECK(acc->second == i);
                     }
                     break;
-                case 2:
+                case 2 :
                     // Find pre-existing elements
                     for (int i = 0; i < 100; ++i) {
                         typename chmap_type::const_accessor acc;
@@ -954,13 +645,15 @@ void test_with_minimalistic_mutex() {
                         CHECK(acc->second == i);
                     }
                     break;
-                case 3:
+                case 3 :
                     // Erase pre-existing elements
-                    for (int i = 10000; i < 10005; ++i) { chmap.erase(i); }
-                    break;
+                    for (int i = 10000; i < 10005; ++i) {
+                        chmap.erase(i);
+                    }
+                break;
             }
         }
-    };// thread_body
+    }; // thread_body
 
     tbb::blocked_range<std::size_t> br(0, 1000, 8);
 
@@ -984,29 +677,90 @@ void test_with_minimalistic_mutex() {
 }
 
 void test_mutex_customization() {
-    test_with_minimalistic_mutex</*SimulateReacquiring = */ false>();
-    test_with_minimalistic_mutex</*SimulateReacquiring = */ true>();
+    test_with_minimalistic_mutex</*SimulateReacquiring = */false>();
+    test_with_minimalistic_mutex</*SimulateReacquiring = */true>();
+}
+
+struct SimpleTransparentHashCompare {
+    using is_transparent = void;
+
+    template <typename T>
+    std::size_t hash(const T&) const { return 0; }
+
+    template <typename T, typename U>
+    bool equal(const T& key1, const U& key2) const { return key1 == key2; }
+};
+
+template <typename Accessor>
+struct IsWriterAccessor : public Accessor {
+    using Accessor::is_writer;
+};
+
+template <typename Map, typename Accessor>
+void test_chmap_access_mode(bool expect_write) {
+    static_assert(std::is_same<int, typename Map::key_type>::value, "Incorrect test setup");
+    Map map;
+    Accessor acc;
+
+    // Test homogeneous insert
+    bool result = map.insert(acc, 1);
+    CHECK(result);
+    CHECK_MESSAGE(acc.is_writer() == expect_write, "Incorrect access into the map from homogeneous insert");
+
+    // Test heterogeneous insert
+    result = map.insert(acc, 2L);
+    CHECK(result);
+    CHECK_MESSAGE(acc.is_writer() == expect_write, "Incorrect access into the map from heterogeneous insert");
+
+    // Test lvalue insert
+    typename Map::value_type value{3, 3};
+    result = map.insert(acc, value);
+    CHECK(result);
+    CHECK_MESSAGE(acc.is_writer() == expect_write, "Incorrect access into the map from lvalue insert");
+
+    // Test rvalue insert
+    result = map.insert(acc, typename Map::value_type{4, 4});
+    CHECK(result);
+    CHECK_MESSAGE(acc.is_writer() == expect_write, "Incorrect access into the map from rvalue insert");
+
+    // Test homogeneous find
+    result = map.find(acc, 1);
+    CHECK(result);
+    CHECK_MESSAGE(acc.is_writer() == expect_write, "Incorrect access into the map from homogeneous find");
+
+    // Test heterogeneous find
+    result = map.find(acc, 2L);
+    CHECK(result);
+    CHECK_MESSAGE(acc.is_writer() == expect_write, "Incorrect access into the map from heterogeneous find");
 }
 
 //! Test of insert operation
 //! \brief \ref error_guessing
-TEST_CASE("testing range based for support") { TestRangeBasedFor(); }
+TEST_CASE("testing range based for support"){
+    TestRangeBasedFor();
+}
 
 //! Test concurrent_hash_map with specific key/mapped types
 //! \brief \ref regression \ref error_guessing
-TEST_CASE("testing concurrent_hash_map with specific key/mapped types") { TestSpecificTypes(); }
+TEST_CASE("testing concurrent_hash_map with specific key/mapped types") {
+    TestSpecificTypes();
+}
 
 //! Test work with scoped allocator
 //! \brief \ref regression
-TEST_CASE("testing work with scoped allocator") { TestScopedAllocator(); }
+TEST_CASE("testing work with scoped allocator") {
+    TestScopedAllocator();
+}
 
 //! Test internal fast find for concurrent_hash_map
 //! \brief \ref regression
-TEST_CASE("testing internal fast find for concurrent_hash_map") { TestInternalFastFind(); }
+TEST_CASE("testing internal fast find for concurrent_hash_map") {
+    TestInternalFastFind();
+}
 
 //! Test constructor with move iterators
 //! \brief \ref error_guessing
-TEST_CASE("testing constructor with move iterators") {
+TEST_CASE("testing constructor with move iterators"){
     move_support_tests::test_constructor_with_move_iterators<hash_map_traits>();
 }
 
@@ -1017,70 +771,59 @@ TEST_CASE("Test exception in constructors") {
     using allocator_type = StaticSharedCountingAllocator<std::allocator<std::pair<const int, int>>>;
     using map_type = tbb::concurrent_hash_map<int, int, tbb::tbb_hash_compare<int>, allocator_type>;
 
-    auto init_list = {std::pair<const int, int>(1, 42), std::pair<const int, int>(2, 42),
-                      std::pair<const int, int>(3, 42), std::pair<const int, int>(4, 42),
-                      std::pair<const int, int>(5, 42), std::pair<const int, int>(6, 42)};
+    auto init_list = {std::pair<const int, int>(1, 42), std::pair<const int, int>(2, 42), std::pair<const int, int>(3, 42),
+        std::pair<const int, int>(4, 42), std::pair<const int, int>(5, 42), std::pair<const int, int>(6, 42)};
     map_type map(init_list);
 
     allocator_type::set_limits(1);
-    REQUIRE_THROWS_AS(
-            [&] {
-                map_type map1(map);
-                utils::suppress_unused_warning(map1);
-            }(),
-            const std::bad_alloc);
-
-    REQUIRE_THROWS_AS(
-            [&] {
-                map_type map2(init_list.begin(), init_list.end());
-                utils::suppress_unused_warning(map2);
-            }(),
-            const std::bad_alloc);
+    REQUIRE_THROWS_AS( [&] {
+        map_type map1(map);
+        utils::suppress_unused_warning(map1);
+    }(), const std::bad_alloc);
+
+    REQUIRE_THROWS_AS( [&] {
+        map_type map2(init_list.begin(), init_list.end());
+        utils::suppress_unused_warning(map2);
+    }(), const std::bad_alloc);
 
     tbb::tbb_hash_compare<int> test_hash;
 
-    REQUIRE_THROWS_AS(
-            [&] {
-                map_type map3(init_list.begin(), init_list.end(), test_hash);
-                utils::suppress_unused_warning(map3);
-            }(),
-            const std::bad_alloc);
-
-    REQUIRE_THROWS_AS(
-            [&] {
-                map_type map4(init_list, test_hash);
-                utils::suppress_unused_warning(map4);
-            }(),
-            const std::bad_alloc);
-
-    REQUIRE_THROWS_AS(
-            [&] {
-                map_type map5(init_list);
-                utils::suppress_unused_warning(map5);
-            }(),
-            const std::bad_alloc);
+    REQUIRE_THROWS_AS( [&] {
+        map_type map3(init_list.begin(), init_list.end(), test_hash);
+        utils::suppress_unused_warning(map3);
+    }(), const std::bad_alloc);
+
+    REQUIRE_THROWS_AS( [&] {
+        map_type map4(init_list, test_hash);
+        utils::suppress_unused_warning(map4);
+    }(), const std::bad_alloc);
+
+    REQUIRE_THROWS_AS( [&] {
+        map_type map5(init_list);
+        utils::suppress_unused_warning(map5);
+    }(), const std::bad_alloc);
 
     allocator_type::set_limits(0);
-    map_type big_map {};
-    for (int i = 0; i < 1000; ++i) { big_map.insert(std::pair<const int, int>(i, 42)); }
+    map_type big_map{};
+    for (int i = 0; i < 1000; ++i) {
+        big_map.insert(std::pair<const int, int>(i, 42));
+    }
 
     allocator_type::init_counters();
     allocator_type::set_limits(300);
-    REQUIRE_THROWS_AS(
-            [&] {
-                map_type map6(big_map);
-                utils::suppress_unused_warning(map6);
-            }(),
-            const std::bad_alloc);
+    REQUIRE_THROWS_AS( [&] {
+        map_type map6(big_map);
+        utils::suppress_unused_warning(map6);
+    }(), const std::bad_alloc);
 }
-#endif// TBB_USE_EXCEPTIONS
+#endif // TBB_USE_EXCEPTIONS
 
 //! \brief \ref error_guessing
 TEST_CASE("swap with NotAlwaysEqualAllocator allocators") {
     using allocator_type = NotAlwaysEqualAllocator<std::pair<const int, int>>;
     using map_type = tbb::concurrent_hash_map<int, int, tbb::tbb_hash_compare<int>, allocator_type>;
 
-    map_type map1 {};
+    map_type map1{};
     map_type map2({{42, 42}, {24, 42}});
     map_type map3(map2);
 
@@ -1091,23 +834,25 @@ TEST_CASE("swap with NotAlwaysEqualAllocator allocators") {
 }
 
 //! \brief \ref error_guessing
-TEST_CASE("test concurrent_hash_map heterogeneous lookup") { test_heterogeneous_lookup(); }
-
-//! \brief \ref error_guessing
-TEST_CASE("test concurrent_hash_map heterogeneous insert") { test_heterogeneous_insert(); }
+TEST_CASE("test concurrent_hash_map mutex customization") {
+    test_mutex_customization();
+}
 
-//! \brief \ref error_guessing
-TEST_CASE("test concurrent_hash_map heterogeneous erase") { test_heterogeneous_erase(); }
+// A test for an issue when const_accessor passed to find provides write access into the map after the lookup
+//! \brief \ref regression
+TEST_CASE("test concurrent_hash_map accessors issue") {
+    using map_type = tbb::concurrent_hash_map<int, int, SimpleTransparentHashCompare>;
+    using accessor = IsWriterAccessor<typename map_type::accessor>;
+    using const_accessor = IsWriterAccessor<typename map_type::const_accessor>;
 
-//! \brief \ref error_guessing
-TEST_CASE("test concurrent_hash_map mutex customization") { test_mutex_customization(); }
+    test_chmap_access_mode<map_type, accessor>(/*expect_write = */true);
+    test_chmap_access_mode<map_type, const_accessor>(/*expect_write = */false);
+}
 
 #if __TBB_CPP20_CONCEPTS_PRESENT
 template <bool ExpectSatisfies, typename Key, typename Mapped, typename... HCTypes>
-requires(...
-         && (utils::well_formed_instantiation<
-                     tbb::concurrent_hash_map, Key, Mapped,
-                     HCTypes> == ExpectSatisfies)) void test_chmap_hash_compare_constraints() {}
+    requires (... && (utils::well_formed_instantiation<tbb::concurrent_hash_map, Key, Mapped, HCTypes> == ExpectSatisfies))
+void test_chmap_hash_compare_constraints() {}
 
 //! \brief \ref error_guessing
 TEST_CASE("tbb::concurrent_hash_map hash_compare constraints") {
@@ -1115,22 +860,20 @@ TEST_CASE("tbb::concurrent_hash_map hash_compare constraints") {
     using mapped_type = int;
     using namespace test_concepts::hash_compare;
 
-    test_chmap_hash_compare_constraints</*Expected = */ true, /*key = */ key_type, /*mapped = */ mapped_type,
+    test_chmap_hash_compare_constraints</*Expected = */true, /*key = */key_type, /*mapped = */mapped_type,
                                         Correct<key_type>, tbb::tbb_hash_compare<key_type>>();
 
-    test_chmap_hash_compare_constraints<
-            /*Expected = */ false, /*key = */ key_type, /*mapped = */ mapped_type, NonCopyable<key_type>,
-            NonDestructible<key_type>, NoHash<key_type>, HashNonConst<key_type>, WrongInputHash<key_type>,
-            WrongReturnHash<key_type>, NoEqual<key_type>, EqualNonConst<key_type>,
-            WrongFirstInputEqual<key_type>, WrongSecondInputEqual<key_type>, WrongReturnEqual<key_type>>();
+    test_chmap_hash_compare_constraints</*Expected = */false, /*key = */key_type, /*mapped = */mapped_type,
+                                        NonCopyable<key_type>, NonDestructible<key_type>,
+                                        NoHash<key_type>, HashNonConst<key_type>, WrongInputHash<key_type>, WrongReturnHash<key_type>,
+                                        NoEqual<key_type>, EqualNonConst<key_type>,
+                                        WrongFirstInputEqual<key_type>, WrongSecondInputEqual<key_type>, WrongReturnEqual<key_type>>();
 }
 
 template <bool ExpectSatisfies, typename Key, typename Mapped, typename... RWMutexes>
-requires(...
-         && (utils::well_formed_instantiation<
-                     tbb::concurrent_hash_map, Key, Mapped, tbb::tbb_hash_compare<Key>,
-                     tbb::tbb_allocator<std::pair<const Key, Mapped>>,
-                     RWMutexes> == ExpectSatisfies)) void test_chmap_mutex_constraints() {}
+    requires (... && (utils::well_formed_instantiation<tbb::concurrent_hash_map, Key, Mapped,
+                                                tbb::tbb_hash_compare<Key>, tbb::tbb_allocator<std::pair<const Key, Mapped>>, RWMutexes> == ExpectSatisfies))
+void test_chmap_mutex_constraints() {}
 
 //! \brief \ref error_guessing
 TEST_CASE("tbb::concurrent_hash_map rw_mutex constraints") {
@@ -1138,16 +881,15 @@ TEST_CASE("tbb::concurrent_hash_map rw_mutex constraints") {
     using mapped_type = int;
     using namespace test_concepts::rw_mutex;
 
-    test_chmap_mutex_constraints</*Expected = */ true, key_type, mapped_type, Correct>();
+    test_chmap_mutex_constraints</*Expected = */true, key_type, mapped_type,
+                                 Correct>();
 
-    test_chmap_mutex_constraints<
-            /*Expected = */ false, key_type, mapped_type, NoScopedLock, ScopedLockNoDefaultCtor,
-            ScopedLockNoMutexCtor, ScopedLockNoDtor, ScopedLockNoAcquire, ScopedLockWrongFirstInputAcquire,
-            ScopedLockWrongSecondInputAcquire, ScopedLockNoTryAcquire, ScopedLockWrongFirstInputTryAcquire,
-            ScopedLockWrongSecondInputTryAcquire, ScopedLockWrongReturnTryAcquire, ScopedLockNoRelease,
-            ScopedLockNoUpgrade, ScopedLockWrongReturnUpgrade, ScopedLockNoDowngrade,
-            ScopedLockWrongReturnDowngrade, ScopedLockNoIsWriter, ScopedLockIsWriterNonConst,
-            ScopedLockWrongReturnIsWriter>();
+    test_chmap_mutex_constraints</*Expected = */false, key_type, mapped_type,
+                                 NoScopedLock, ScopedLockNoDefaultCtor, ScopedLockNoMutexCtor,
+                                 ScopedLockNoDtor, ScopedLockNoAcquire, ScopedLockWrongFirstInputAcquire, ScopedLockWrongSecondInputAcquire, ScopedLockNoTryAcquire,
+                                 ScopedLockWrongFirstInputTryAcquire, ScopedLockWrongSecondInputTryAcquire, ScopedLockWrongReturnTryAcquire, ScopedLockNoRelease,
+                                 ScopedLockNoUpgrade, ScopedLockWrongReturnUpgrade, ScopedLockNoDowngrade, ScopedLockWrongReturnDowngrade,
+                                 ScopedLockNoIsWriter, ScopedLockIsWriterNonConst, ScopedLockWrongReturnIsWriter>();
 }
 
 //! \brief \ref error_guessing
@@ -1156,4 +898,4 @@ TEST_CASE("container_range concept for tbb::concurrent_hash_map ranges") {
     static_assert(test_concepts::container_range<tbb::concurrent_hash_map<int, int>::const_range_type>);
 }
 
-#endif// __TBB_CPP20_CONCEPTS_PRESENT
+#endif // __TBB_CPP20_CONCEPTS_PRESENT
diff --git a/external/tbb/test/tbb/test_concurrent_lru_cache.cpp b/external/tbb/test/tbb/test_concurrent_lru_cache.cpp
index 17caf731..00f0c8df 100644
--- a/external/tbb/test/tbb/test_concurrent_lru_cache.cpp
+++ b/external/tbb/test/tbb/test_concurrent_lru_cache.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -17,12 +17,13 @@
 #define TBB_PREVIEW_CONCURRENT_LRU_CACHE 1
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
 #endif
 
 #include "common/test.h"
-#include <common/concurrent_lru_cache_common.h>
+#include "common/utils.h"
 #include <tbb/concurrent_lru_cache.h>
+#include <common/concurrent_lru_cache_common.h>
 
 //! \file test_concurrent_lru_cache.cpp
 //! \brief Test for [preview] functionality
@@ -38,41 +39,49 @@ TEST_CASE("basic test for return value") {
     auto dummy_f = [](int /*key*/) -> int { return 0xDEADBEEF; };
     std::size_t number_of_lru_history_items = 8;
 
-    preset preset_object {dummy_f, number_of_lru_history_items};
+    preset preset_object{dummy_f, number_of_lru_history_items};
     preset::cache_type& cache = preset_object.cache;
 
     int dummy_key = 1;
-    REQUIRE_MESSAGE(dummy_f(dummy_key) == cache[dummy_key].value(),
-                    "cache operator() must return only values obtained from value function");
+    REQUIRE_MESSAGE(
+        dummy_f(dummy_key) == cache[dummy_key].value(),
+        "cache operator() must return only values obtained from value function");
 }
 
 //! \brief \ref error_guessing
 TEST_CASE("basic test for unused objects") {
     using preset = concurrent_lru_cache_presets::preset_instance_count;
-    preset preset_object {};
+    preset preset_object{};
 
-    for (std::size_t i = 0; i < preset_object.number_of_lru_history_items; ++i) preset_object.cache[i];
+    for (std::size_t i = 0; i < preset_object.number_of_lru_history_items; ++i)
+        preset_object.cache[i];
 
-    REQUIRE_MESSAGE(preset_object.source.instances_count() > 1, "cache should store some unused objects");
+    REQUIRE_MESSAGE(
+        preset_object.source.instances_count() > 1,
+        "cache should store some unused objects");
 }
 
 //! \brief \ref error_guessing
 TEST_CASE("basic test for unused object limit") {
     using preset = concurrent_lru_cache_presets::preset_instance_count;
-    preset preset_object {};
+    preset preset_object{};
 
-    for (std::size_t i = 0; i < preset_object.number_of_lru_history_items + 1; ++i) preset_object.cache[i];
+    for (std::size_t i = 0; i < preset_object.number_of_lru_history_items + 1; ++i)
+        preset_object.cache[i];
 
-    REQUIRE_MESSAGE(preset_object.source.instances_count() == preset_object.number_of_lru_history_items + 1,
-                    "cache should respect number of stored unused objects to number passed in constructor");
+    REQUIRE_MESSAGE(
+        preset_object.source.instances_count() == preset_object.number_of_lru_history_items + 1,
+        "cache should respect number of stored unused objects to number passed in constructor");
 }
 
 //! \brief \ref error_guessing
 TEST_CASE("basic test for eviction order") {
     using preset = concurrent_lru_cache_presets::preset_map_instance_count;
-    preset preset_object {};
+    preset preset_object{};
 
-    REQUIRE_MESSAGE(preset_object.number_of_lru_history_items > 2, "incorrect test setup");
+    REQUIRE_MESSAGE(
+        preset_object.number_of_lru_history_items > 2,
+        "incorrect test setup");
 
     preset_object.fill_up_cache(0, preset_object.number_of_lru_history_items);
 
@@ -89,12 +98,12 @@ TEST_CASE("basic test for eviction order") {
 //! \brief \ref error_guessing
 TEST_CASE("basic test for eviction of only unused items") {
     using preset = concurrent_lru_cache_presets::preset_map_instance_count;
-    preset preset_object {};
+    preset preset_object{};
 
     preset::handle_type h = preset_object.cache[0];
 
     //cause eviction
-    preset_object.fill_up_cache(1, preset_object.number_of_lru_history_items + 2);
+    preset_object.fill_up_cache(1, preset_object.number_of_lru_history_items+2);
 
     bool is_correct = preset_object.is_evicted(1) && !preset_object.is_evicted(0);
     REQUIRE_MESSAGE(is_correct, "cache should not evict items in use");
@@ -103,14 +112,42 @@ TEST_CASE("basic test for eviction of only unused items") {
 //! \brief \ref error_guessing
 TEST_CASE("basic test for eviction of only unused items 2") {
     using preset = concurrent_lru_cache_presets::preset_map_instance_count;
-    preset preset_object {};
+    preset preset_object{};
 
     preset::handle_type h = preset_object.cache[0];
-    { preset::handle_type h1 = preset_object.cache[0]; }
+    {
+        preset::handle_type h1 = preset_object.cache[0];
+    }
 
     //cause eviction
-    preset_object.fill_up_cache(1, preset_object.number_of_lru_history_items + 2);
+    preset_object.fill_up_cache(1,preset_object.number_of_lru_history_items+2);
 
     bool is_correct = preset_object.is_evicted(1) && !preset_object.is_evicted(0);
     REQUIRE_MESSAGE(is_correct, "cache should not evict items in use");
 }
+
+//! \brief \ref error_guessing
+TEST_CASE("basic test for handling case when number_of_lru_history_items is zero") {
+    auto foo = [] (int) {
+        return utils::LifeTrackableObject{};
+    };
+    using cache_type =  tbb::concurrent_lru_cache<int, utils::LifeTrackableObject, decltype(foo)>;
+    cache_type cache{foo, 0};
+    
+    for(int i = 0; i < 10; ++i) {
+        // Check that no history is stored when my_history_list_capacity is 0.
+        // In this case, when trying to fill the cache, the items will be deleted if reference was not taken.
+        const utils::LifeTrackableObject* obj_addr = &cache[1].value();
+        REQUIRE_MESSAGE(utils::LifeTrackableObject::is_alive(obj_addr) == false, "when number_of_lru_history_items is zero, element must be erased after use");
+    }
+
+    cache_type::handle h = cache[1];
+    const utils::LifeTrackableObject* obj_addr = &h.value();
+    auto& object_set = utils::LifeTrackableObject::set();
+    for(int i = 0; i < 10; ++i) {
+        // Verify that item will still be alive if there is a handle holding that item.
+        cache[1];
+        REQUIRE_MESSAGE(utils::LifeTrackableObject::is_alive(obj_addr), "the object with the key=1 was destroyed but should not");
+        REQUIRE_MESSAGE(object_set.size() == 1, "no other values should be added");
+    }
+}
diff --git a/external/tbb/test/tbb/test_concurrent_map.cpp b/external/tbb/test/tbb/test_concurrent_map.cpp
index 3cb567db..362dd0b5 100644
--- a/external/tbb/test/tbb/test_concurrent_map.cpp
+++ b/external/tbb/test/tbb/test_concurrent_map.cpp
@@ -16,8 +16,8 @@
 #ifndef NOMINMAX
 #define NOMINMAX
 #endif
-#include "common/concurrent_ordered_common.h"
 #include <tbb/concurrent_map.h>
+#include "common/concurrent_ordered_common.h"
 
 //! \file test_concurrent_map.cpp
 //! \brief Test for [containers.concurrent_map containers.concurrent_multimap] specifications
@@ -32,10 +32,8 @@ using move_support_tests::FooWithAssign;
 
 using map_type = tbb::concurrent_map<int, int, std::less<int>, MyAllocator<int, int>>;
 using multimap_type = tbb::concurrent_multimap<int, int, std::less<int>, MyAllocator<int, int>>;
-using checked_map_type
-        = tbb::concurrent_map<int, CheckType<int>, std::less<int>, MyAllocator<int, CheckType<int>>>;
-using checked_multimap_type
-        = tbb::concurrent_multimap<int, CheckType<int>, std::less<int>, MyAllocator<int, CheckType<int>>>;
+using checked_map_type = tbb::concurrent_map<int, CheckType<int>, std::less<int>, MyAllocator<int, CheckType<int>>>;
+using checked_multimap_type = tbb::concurrent_multimap<int, CheckType<int>, std::less<int>, MyAllocator<int, CheckType<int>>>;
 using greater_map_type = tbb::concurrent_map<int, int, std::greater<int>, MyAllocator<int, int>>;
 using greater_multimap_type = tbb::concurrent_multimap<int, int, std::greater<int>, MyAllocator<int, int>>;
 using checked_state_map_type = tbb::concurrent_map<intptr_t, FooWithAssign, std::less<intptr_t>,
@@ -45,12 +43,16 @@ using checked_state_multimap_type = tbb::concurrent_multimap<intptr_t, FooWithAs
 
 template <>
 struct SpecialTests<map_type> {
-    static void Test() { SpecialMapTests<map_type>(); }
+    static void Test() {
+        SpecialMapTests<map_type>();
+    }
 };
 
 template <>
 struct SpecialTests<multimap_type> {
-    static void Test() { SpecialMultiMapTests<multimap_type>(); }
+    static void Test() {
+        SpecialMultiMapTests<multimap_type>();
+    }
 };
 
 struct COMapTraits : OrderedMoveTraitsBase {
@@ -61,7 +63,7 @@ struct COMapTraits : OrderedMoveTraitsBase {
     using container_value_type = std::pair<const T, T>;
 
     using init_iterator_type = move_support_tests::FooPairIterator;
-};// struct COMapTraits
+}; // struct COMapTraits
 
 struct COMultimapTraits : OrderedMoveTraitsBase {
     template <typename T, typename Allocator>
@@ -71,26 +73,27 @@ struct COMultimapTraits : OrderedMoveTraitsBase {
     using container_value_type = std::pair<const T, T>;
 
     using init_iterator_type = move_support_tests::FooPairIterator;
-};// struct COMultimapTraits
+}; // struct COMultimapTraits
 
 struct OrderedMapTypesTester {
     template <bool DefCtorPresent, typename ValueType>
-    void check(const std::list<ValueType>& lst) {
+    void check( const std::list<ValueType>& lst ) {
         using key_type = typename ValueType::first_type;
         using mapped_type = typename ValueType::second_type;
 
         TypeTester<DefCtorPresent, tbb::concurrent_map<key_type, mapped_type>>(lst);
         TypeTester<DefCtorPresent, tbb::concurrent_multimap<key_type, mapped_type>>(lst);
     }
-};// struct OrderedMapTypesTester
+}; // struct OrderedMapTypesTester
 
 void test_specific_types() {
     test_map_specific_types<OrderedMapTypesTester>();
 
     // Regression test for a problem with excessive requirements of emplace()
-    test_emplace_insert<tbb::concurrent_map<int*, test::unique_ptr<int>>, std::false_type>(new int, new int);
-    test_emplace_insert<tbb::concurrent_multimap<int*, test::unique_ptr<int>>, std::false_type>(new int,
-                                                                                                new int);
+    test_emplace_insert<tbb::concurrent_map<int*, test::unique_ptr<int>>,std::false_type>
+                       (new int, new int);
+    test_emplace_insert<tbb::concurrent_multimap<int*, test::unique_ptr<int>>,std::false_type>
+                       (new int, new int);
 }
 
 // Regression test for an issue in lock free algorithms
@@ -102,22 +105,32 @@ void test_cycles_absense() {
         std::vector<int> v(2);
         int vector_size = int(v.size());
 
-        for (int i = 0; i != vector_size; ++i) { v[i] = i; }
-        size_t num_threads = 4;// Can be changed to 2 for debugging
+        for (int i = 0; i != vector_size; ++i) {
+            v[i] = i;
+        }
+        size_t num_threads = 4; // Can be changed to 2 for debugging
 
         utils::NativeParallelFor(num_threads, [&](size_t) {
-            for (int i = 0; i != vector_size; ++i) { mmap.emplace(i, i); }
+            for (int i = 0; i != vector_size; ++i) {
+                mmap.emplace(i, i);
+            }
         });
 
-        for (int i = 0; i != vector_size; ++i) { REQUIRE(mmap.count(i) == num_threads); }
+        for (int i = 0; i != vector_size; ++i) {
+            REQUIRE(mmap.count(i) == num_threads);
+        }
     }
 }
 
 //! \brief \ref error_guessing
-TEST_CASE("basic test for concurrent_map with greater compare") { test_basic<greater_map_type>(); }
+TEST_CASE("basic test for concurrent_map with greater compare") {
+    test_basic<greater_map_type>();
+}
 
 //! \brief \ref error_guessing
-TEST_CASE("basic test for concurrent_multimap with greater compare") { test_basic<greater_multimap_type>(); }
+TEST_CASE("basic test for concurrent_multimap with greater compare") {
+    test_basic<greater_multimap_type>();
+}
 
 //! \brief \ref resource_usage
 TEST_CASE("basic test for concurrent_map with elements ctor and dtor check") {
@@ -133,12 +146,12 @@ TEST_CASE("basic test for concurrent_multimap with elements ctor and dtor check"
 
 //! \brief \ref resource_usage
 TEST_CASE("basic test for concurrent_map with elements state check") {
-    test_basic<checked_state_map_type, /*CheckState = */ std::true_type>();
+    test_basic<checked_state_map_type, /*CheckState = */std::true_type>();
 }
 
 //! \brief \ref resource_usage
 TEST_CASE("basic test for concurrent_multimap with elements state check") {
-    test_basic<checked_state_multimap_type, /*CheckState = */ std::true_type>();
+    test_basic<checked_state_multimap_type, /*CheckState = */std::true_type>();
 }
 
 //! \brief \ref error_guessing
@@ -184,32 +197,38 @@ TEST_CASE("multithreading support in concurrent_multimap with greater compare an
 }
 
 //! \brief \ref interface \ref error_guessing
-TEST_CASE("range based for support in concurrent_map") { test_range_based_for_support<map_type>(); }
+TEST_CASE("range based for support in concurrent_map") {
+    test_range_based_for_support<map_type>();
+}
 
 //! \brief \ref interface \ref error_guessing
-TEST_CASE("range based for support in concurrent_multimap") { test_range_based_for_support<multimap_type>(); }
+TEST_CASE("range based for support in concurrent_multimap") {
+    test_range_based_for_support<multimap_type>();
+}
 
 //! \brief \ref regression
-TEST_CASE("concurrent_map/multimap with specific key/mapped types") { test_specific_types(); }
+TEST_CASE("concurrent_map/multimap with specific key/mapped types") {
+    test_specific_types();
+}
 
 // TODO: add test with scoped_allocator_adaptor with broken macro
 
 //! \brief \ref regression
-TEST_CASE("broken internal structure for multimap") { test_cycles_absense(); }
+TEST_CASE("broken internal structure for multimap") {
+    test_cycles_absense();
+}
 
 //! \brief \ref error_guessing
 TEST_CASE("concurrent_map::swap with not always equal allocator") {
-    using not_always_equal_alloc_map_type
-            = tbb::concurrent_map<int, int, std::less<int>,
-                                  NotAlwaysEqualAllocator<std::pair<const int, int>>>;
+    using not_always_equal_alloc_map_type = tbb::concurrent_map<int, int, std::less<int>,
+                                                                NotAlwaysEqualAllocator<std::pair<const int, int>>>;
     test_swap_not_always_equal_allocator<not_always_equal_alloc_map_type>();
 }
 
 //! \brief \ref error_guessing
 TEST_CASE("concurrent_multimap::swap with not always equal allocator") {
-    using not_always_equal_alloc_mmap_type
-            = tbb::concurrent_multimap<int, int, std::less<int>,
-                                       NotAlwaysEqualAllocator<std::pair<const int, int>>>;
+    using not_always_equal_alloc_mmap_type = tbb::concurrent_multimap<int, int, std::less<int>,
+                                                                      NotAlwaysEqualAllocator<std::pair<const int, int>>>;
     test_swap_not_always_equal_allocator<not_always_equal_alloc_mmap_type>();
 }
 
@@ -225,7 +244,7 @@ TEST_CASE("concurrent_multimap throwing copy constructor") {
     using exception_mmap_type = tbb::concurrent_multimap<ThrowOnCopy, ThrowOnCopy>;
     test_exception_on_copy_ctor<exception_mmap_type>();
 }
-#endif// TBB_USE_EXCEPTIONS
+#endif // TBB_USE_EXCEPTIONS
 
 #if __TBB_CPP20_CONCEPTS_PRESENT
 //! \brief \ref error_guessing
@@ -237,7 +256,6 @@ TEST_CASE("container_range concept for concurrent_map ranges") {
 //! \brief \ref error_guessing
 TEST_CASE("container_range concept for concurrent_multimap ranges") {
     static_assert(test_concepts::container_range<typename tbb::concurrent_multimap<int, int>::range_type>);
-    static_assert(
-            test_concepts::container_range<typename tbb::concurrent_multimap<int, int>::const_range_type>);
+    static_assert(test_concepts::container_range<typename tbb::concurrent_multimap<int, int>::const_range_type>);
 }
-#endif// __TBB_CPP20_CONCEPTS_PRESENT
+#endif // __TBB_CPP20_CONCEPTS_PRESENT
diff --git a/external/tbb/test/tbb/test_concurrent_monitor.cpp b/external/tbb/test/tbb/test_concurrent_monitor.cpp
index d18a50b2..a9233f8c 100644
--- a/external/tbb/test/tbb/test_concurrent_monitor.cpp
+++ b/external/tbb/test/tbb/test_concurrent_monitor.cpp
@@ -20,21 +20,18 @@
 
 #if _MSC_VER && !defined(__INTEL_COMPILER)
 // structure was padded due to alignment specifier
-#pragma warning(disable : 4324)
+#pragma warning( disable: 4324 )
 #endif
 
-#define TBB_PREVIEW_MUTEXES 1
-#define TBB_PREVIEW_WAITING_FOR_WORKERS 1
-
-#include "common/spin_barrier.h"
 #include "common/test.h"
 #include "common/utils.h"
 #include "common/utils_concurrency_limit.h"
+#include "common/spin_barrier.h"
 
-#include "../../src/tbb/concurrent_monitor.h"
-#include "../../src/tbb/misc.cpp"
 #include "tbb/global_control.h"
 #include "tbb/task_arena.h"
+#include "../../src/tbb/concurrent_monitor.h"
+#include "../../src/tbb/misc.cpp"
 
 //! \file test_concurrent_monitor.cpp
 //! \brief Test for [internal] functionality
@@ -42,12 +39,17 @@
 #if TBB_USE_EXCEPTIONS
 //! \brief \ref error_guessing
 TEST_CASE("Stress test") {
-    enum class notification_types { notify, notify_one, notify_all, notify_number };
+    enum class notification_types {
+        notify,
+        notify_one,
+        notify_all,
+        notify_number
+    };
 
     std::size_t threads_number = utils::get_platform_max_threads();
 
     // Need to prolong lifetime of the exposed concurrent_monitor
-    tbb::task_scheduler_handle handler = tbb::task_scheduler_handle::get();
+    tbb::task_scheduler_handle handler{tbb::attach{}};
 
     utils::SpinBarrier barrier(threads_number);
 
@@ -55,32 +57,38 @@ TEST_CASE("Stress test") {
     {
         tbb::task_arena arena(static_cast<int>(threads_number - 1), 0);
 
+
         std::size_t iter_on_operation = 1000;
         std::size_t operation_number = std::size_t(notification_types::notify_number) * iter_on_operation;
 
         auto thread_func = [&, operation_number] {
             for (std::size_t i = 0; i < operation_number; ++i) {
-                tbb::detail::r1::concurrent_monitor::thread_context context {std::uintptr_t(1)};
+                tbb::detail::r1::concurrent_monitor::thread_context context{std::uintptr_t(1)};
                 test_monitor.prepare_wait(context);
                 barrier.wait();
                 test_monitor.cancel_wait(context);
             }
         };
 
-        for (std::size_t i = 0; i < threads_number - 1; ++i) { arena.enqueue(thread_func); }
+        for (std::size_t i = 0; i < threads_number - 1; ++i) {
+            arena.enqueue(thread_func);
+        }
 
         for (std::size_t i = 0; i < operation_number; ++i) {
             barrier.wait();
             switch (i / iter_on_operation) {
-                case 0: {
-                    test_monitor.notify([](std::uintptr_t) { return true; });
+                case 0:
+                {
+                    test_monitor.notify([] ( std::uintptr_t ) { return true; });
                     break;
                 }
-                case 1: {
+                case 1:
+                {
                     test_monitor.notify_one();
                     break;
                 }
-                case 2: {
+                case 2:
+                {
                     test_monitor.notify_all();
                     break;
                 }
@@ -90,4 +98,4 @@ TEST_CASE("Stress test") {
 
     tbb::finalize(handler);
 }
-#endif// TBB_USE_EXCEPTIONS
+#endif // TBB_USE_EXCEPTIONS
diff --git a/external/tbb/test/tbb/test_concurrent_priority_queue.cpp b/external/tbb/test/tbb/test_concurrent_priority_queue.cpp
index 3fd4665f..53e43e83 100644
--- a/external/tbb/test/tbb/test_concurrent_priority_queue.cpp
+++ b/external/tbb/test/tbb/test_concurrent_priority_queue.cpp
@@ -15,7 +15,7 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
 #endif
 
 #include <common/concurrent_priority_queue_common.h>
@@ -30,20 +30,21 @@ void test_cpq_with_smart_pointers() {
     utils::FastRandom<> rnd(1234);
 
     std::vector<std::shared_ptr<int>> shared_pointers;
-    for (int i = 0; i < NUMBER; ++i) {
+    for (int i = 0; i < NUMBER; ++i ) {
         const int rnd_get = rnd.get();
         shared_pointers.emplace_back(std::make_shared<int>(rnd_get));
     }
     std::vector<std::weak_ptr<int>> weak_pointers;
     std::copy(shared_pointers.begin(), shared_pointers.end(), std::back_inserter(weak_pointers));
 
-    type_tester(shared_pointers, LessForSmartPointers {});
-    type_tester(weak_pointers, LessForSmartPointers {});
+    type_tester(shared_pointers, LessForSmartPointers{});
+    type_tester(weak_pointers, LessForSmartPointers{});
 
     std::vector<int> arrInt;
-    for (int i = 0; i < NUMBER; ++i) arrInt.emplace_back(rnd.get());
+    for (int i = 0; i < NUMBER; ++i)
+        arrInt.emplace_back(rnd.get());
 
-    type_tester_unique_ptr(arrInt);// Test std::unique_ptr
+    type_tester_unique_ptr(arrInt); // Test std::unique_ptr
 }
 
 struct MyDataType {
@@ -51,39 +52,47 @@ struct MyDataType {
     char padding[tbb::detail::max_nfs_size - sizeof(int) % tbb::detail::max_nfs_size];
 
     MyDataType() = default;
-    MyDataType(int val) : priority(std::size_t(val)) {}
+    MyDataType( int val ) : priority(std::size_t(val)) {}
 
-    const MyDataType operator+(const MyDataType& other) const {
+    const MyDataType operator+( const MyDataType& other ) const {
         return MyDataType(int(priority + other.priority));
     }
 
-    bool operator==(const MyDataType& other) const { return this->priority == other.priority; }
-};// struct MyDataType
+    bool operator==(const MyDataType& other) const {
+        return this->priority == other.priority;
+    }
+}; // struct MyDataType
 
 const MyDataType DATA_MIN(INT_MIN);
 const MyDataType DATA_MAX(INT_MAX);
 
 struct MyLess {
-    bool operator()(const MyDataType d1, const MyDataType d2) const { return d1.priority < d2.priority; }
-};// struct MyLess
+    bool operator()( const MyDataType d1, const MyDataType d2 ) const {
+        return d1.priority < d2.priority;
+    }
+}; // struct MyLess
 
-void test_concurrent(std::size_t n) {
+void test_concurrent( std::size_t n ) {
     test_parallel_push_pop<MyLess>(n, DATA_MAX, DATA_MIN);
     test_flogger<MyLess, MyDataType>(n);
 }
 
 void test_multithreading() {
-    for (std::size_t n = utils::MinThread; n != utils::MaxThread; ++n) { test_concurrent(n); }
+    for (std::size_t n = utils::MinThread; n != utils::MaxThread; ++n) {
+        test_concurrent(n);
+    }
 }
 
 struct MyThrowingType : public MyDataType {
     static int throw_flag;
     MyThrowingType() = default;
-    MyThrowingType(const MyThrowingType& src) : MyDataType(src) {
-        if (throw_flag) { TBB_TEST_THROW(42); }
+    MyThrowingType( const MyThrowingType& src ) : MyDataType(src) {
+        if (throw_flag) {
+            TBB_TEST_THROW(42);
+        }
     }
 
-    MyThrowingType& operator=(const MyThrowingType& other) {
+    MyThrowingType& operator=( const MyThrowingType& other ) {
         priority = other.priority;
         return *this;
     }
@@ -96,26 +105,25 @@ using CPQExTestType = tbb::concurrent_priority_queue<MyThrowingType, MyLess>;
 #if TBB_USE_EXCEPTIONS
 void test_exceptions() {
     // TODO: TBB_USE_EXCEPTIONS?
-    const std::size_t TOO_LARGE_SZ
-            = std::vector<MyThrowingType, typename CPQExTestType::allocator_type> {}.max_size() + 1;
+    const std::size_t TOO_LARGE_SZ = std::vector<MyThrowingType, typename CPQExTestType::allocator_type>{}.max_size() + 1;
 
     REQUIRE(TOO_LARGE_SZ < std::numeric_limits<std::size_t>::max());
     MyThrowingType elem;
 
     // Allocation of empty queue should not throw
-    REQUIRE_NOTHROW([] {
+    REQUIRE_NOTHROW([]{
         MyThrowingType::throw_flag = 1;
         CPQExTestType q;
     }());
 
     // Allocation of small queue should not throw for reasonably sized type
-    REQUIRE_NOTHROW([] {
+    REQUIRE_NOTHROW([]{
         MyThrowingType::throw_flag = 1;
         CPQExTestType(42);
     }());
 
     // Allocate a queue with too large initial size
-    REQUIRE_THROWS([&] {
+    REQUIRE_THROWS([&]{
         MyThrowingType::throw_flag = 0;
         CPQExTestType q(TOO_LARGE_SZ);
     }());
@@ -126,29 +134,25 @@ void test_exceptions() {
     elem.priority = 42;
     for (std::size_t i = 0; i < 42; ++i) src_q.push(elem);
 
-    REQUIRE_THROWS_MESSAGE(
-            [&] {
-                MyThrowingType::throw_flag = 1;
-                CPQExTestType q(src_q);
-            }(),
-            "Copy ctor did not throw exception");
+    REQUIRE_THROWS_MESSAGE([&]{
+        MyThrowingType::throw_flag = 1;
+        CPQExTestType q(src_q);
+    }(), "Copy ctor did not throw exception");
 
     // Test assignment
     MyThrowingType::throw_flag = 0;
     CPQExTestType assign_q(24);
 
-    REQUIRE_THROWS_MESSAGE(
-            [&] {
-                MyThrowingType::throw_flag = 1;
-                assign_q = src_q;
-            }(),
-            "Assignment did not throw exception");
+    REQUIRE_THROWS_MESSAGE([&]{
+        MyThrowingType::throw_flag = 1;
+        assign_q = src_q;
+    }(), "Assignment did not throw exception");
     REQUIRE(assign_q.empty());
 
     for (std::size_t i = 0; i < push_selector_variants; ++i) {
         MyThrowingType::throw_flag = 0;
         CPQExTestType pq(3);
-        REQUIRE_NOTHROW([&] {
+        REQUIRE_NOTHROW([&]{
             push_selector(pq, elem, i);
             push_selector(pq, elem, i);
             push_selector(pq, elem, i);
@@ -157,7 +161,7 @@ void test_exceptions() {
         try {
             MyThrowingType::throw_flag = 1;
             push_selector(pq, elem, i);
-        } catch (...) {
+        } catch(...) {
             REQUIRE_MESSAGE(!pq.empty(), "Failed: pq should not be empty");
             REQUIRE_MESSAGE(pq.size() == 3, "Failed: pq should contain only three elements");
             REQUIRE_MESSAGE(pq.try_pop(elem), "Failed: pq is not functional");
@@ -165,7 +169,7 @@ void test_exceptions() {
 
         MyThrowingType::throw_flag = 0;
         CPQExTestType pq2(3);
-        REQUIRE_NOTHROW([&] {
+        REQUIRE_NOTHROW([&]{
             push_selector(pq2, elem, i);
             push_selector(pq2, elem, i);
         }());
@@ -173,7 +177,7 @@ void test_exceptions() {
         try {
             MyThrowingType::throw_flag = 1;
             push_selector(pq2, elem, i);
-        } catch (...) {
+        } catch(...) {
             REQUIRE_MESSAGE(!pq2.empty(), "Failed: pq should not be empty");
             REQUIRE_MESSAGE(pq2.size() == 2, "Failed: pq should contain only two elements");
             REQUIRE_MESSAGE(pq2.try_pop(elem), "Failed: pq is not functional");
@@ -185,10 +189,8 @@ void test_exceptions() {
 void test_scoped_allocator() {
     using allocator_data_type = AllocatorAwareData<std::scoped_allocator_adaptor<std::allocator<int>>>;
     using basic_allocator_type = std::scoped_allocator_adaptor<std::allocator<allocator_data_type>>;
-    using allocator_type
-            = std::allocator_traits<basic_allocator_type>::template rebind_alloc<allocator_data_type>;
-    using container_type = tbb::concurrent_priority_queue<allocator_data_type, std::less<allocator_data_type>,
-                                                          allocator_type>;
+    using allocator_type = std::allocator_traits<basic_allocator_type>::template rebind_alloc<allocator_data_type>;
+    using container_type = tbb::concurrent_priority_queue<allocator_data_type, std::less<allocator_data_type>, allocator_type>;
 
     allocator_type allocator;
     allocator_data_type data1(1, allocator);
@@ -213,7 +215,9 @@ void test_scoped_allocator() {
 
 // Testing concurrent_priority_queue with smart pointers and other special types
 //! \brief \ref error_guessing
-TEST_CASE("concurrent_priority_queue with smart_pointers") { test_cpq_with_smart_pointers(); }
+TEST_CASE("concurrent_priority_queue with smart_pointers") {
+    test_cpq_with_smart_pointers();
+}
 
 //! Testing push-pop operations in concurrent_priority_queue with multithreading and specific value type
 //! \brief \ref error_guessing
@@ -224,8 +228,12 @@ TEST_CASE("multithreading support in concurrent_priority_queue with specific val
 #if TBB_USE_EXCEPTIONS
 //! Testing exceptions support in concurrent_priority_queue
 //! \brief \ref stress \ref error_guessing
-TEST_CASE("exception handling in concurrent_priority_queue") { test_exceptions(); }
+TEST_CASE("exception handling in concurrent_priority_queue") {
+    test_exceptions();
+}
 #endif
 
 //! \brief \ref error_guessing
-TEST_CASE("concurrent_priority_queue with std::scoped_allocator_adaptor") { test_scoped_allocator(); }
+TEST_CASE("concurrent_priority_queue with std::scoped_allocator_adaptor") {
+    test_scoped_allocator();
+}
diff --git a/external/tbb/test/tbb/test_concurrent_queue.cpp b/external/tbb/test/tbb/test_concurrent_queue.cpp
index f587fdab..57f53a95 100644
--- a/external/tbb/test/tbb/test_concurrent_queue.cpp
+++ b/external/tbb/test/tbb/test_concurrent_queue.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2025 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -14,26 +14,27 @@
     limitations under the License.
 */
 
-#include <common/custom_allocators.h>
 #include <common/test.h>
 #include <common/utils.h>
 #include <common/vector_types.h>
+#include <common/custom_allocators.h>
 
 #include <tbb/concurrent_queue.h>
+#include <unordered_set>
 
 //! \file test_concurrent_queue.cpp
 //! \brief Test for [containers.concurrent_queue containers.concurrent_bounded_queue] specification
 
 static constexpr std::size_t MaxThread = 4;
 
-template <typename CQ, typename T>
+template<typename CQ, typename T>
 struct TestQueueElements {
     CQ& queue;
     const std::size_t nthread;
-    TestQueueElements(CQ& q, std::size_t n) : queue(q), nthread(n) {}
-    void operator()(std::size_t k) const {
-        for (std::size_t i = 0; i < 1000; ++i) {
-            if ((i & 0x1) == 0) {
+    TestQueueElements( CQ& q, std::size_t n ) : queue(q), nthread(n) {}
+    void operator()( std::size_t k ) const {
+        for (std::size_t i=0; i < 1000; ++i) {
+            if( (i&0x1)==0 ) {
                 CHECK(T(k) < T(nthread));
                 queue.push(T(k));
             } else {
@@ -47,28 +48,30 @@ struct TestQueueElements {
 };
 
 //! Test concurrent queue with primitive data type
-template <typename CQ, typename T>
+template<typename CQ, typename T>
 void TestPrimitiveTypes(std::size_t nthread, T exemplar) {
     CQ queue;
-    for (std::size_t i = 0; i < 100; ++i) { queue.push(exemplar); }
+    for (std::size_t i = 0; i < 100; ++i) {
+        queue.push(exemplar);
+    }
     utils::NativeParallelFor(nthread, TestQueueElements<CQ, T>(queue, nthread));
 }
 
 void TestQueueWorksWithPrimitiveTypes() {
-    TestPrimitiveTypes<tbb::concurrent_queue<char>, char>(MaxThread, (char) 1);
-    TestPrimitiveTypes<tbb::concurrent_queue<int>, int>(MaxThread, (int) -12);
-    TestPrimitiveTypes<tbb::concurrent_queue<float>, float>(MaxThread, (float) -1.2f);
-    TestPrimitiveTypes<tbb::concurrent_queue<double>, double>(MaxThread, (double) -4.3);
-    TestPrimitiveTypes<tbb::concurrent_bounded_queue<char>, char>(MaxThread, (char) 1);
-    TestPrimitiveTypes<tbb::concurrent_bounded_queue<int>, int>(MaxThread, (int) -12);
-    TestPrimitiveTypes<tbb::concurrent_bounded_queue<float>, float>(MaxThread, (float) -1.2f);
-    TestPrimitiveTypes<tbb::concurrent_bounded_queue<double>, double>(MaxThread, (double) -4.3);
+    TestPrimitiveTypes<tbb::concurrent_queue<char>, char>(MaxThread, (char)1);
+    TestPrimitiveTypes<tbb::concurrent_queue<int>, int>(MaxThread, (int)-12);
+    TestPrimitiveTypes<tbb::concurrent_queue<float>, float>(MaxThread, (float)-1.2f);
+    TestPrimitiveTypes<tbb::concurrent_queue<double>, double>(MaxThread, (double)-4.3);
+    TestPrimitiveTypes<tbb::concurrent_bounded_queue<char>, char>(MaxThread, (char)1);
+    TestPrimitiveTypes<tbb::concurrent_bounded_queue<int>, int>(MaxThread, (int)-12);
+    TestPrimitiveTypes<tbb::concurrent_bounded_queue<float>, float>(MaxThread, (float)-1.2f);
+    TestPrimitiveTypes<tbb::concurrent_bounded_queue<double>, double>(MaxThread, (double)-4.3);
 }
 
 #if HAVE_m128 || HAVE_m256
 //! Test concurrent queue with vector types
 /** Type Queue should be a queue of ClassWithSSE/ClassWithAVX. */
-template <typename ClassWithVectorType, typename Queue>
+template<typename ClassWithVectorType, typename Queue>
 void TestVectorTypes() {
     Queue q1;
     for (int i = 0; i < 100; ++i) {
@@ -81,7 +84,7 @@ void TestVectorTypes() {
     Queue q2 = q1;
     // Check that elements of the copy are correct
     typename Queue::const_iterator ci = q2.unsafe_begin();
-    for (int i = 0; i < 100; ++i) {
+    for (int i=0; i < 100; ++i ) {
         CHECK((ci != q2.unsafe_end()));
         ClassWithVectorType foo = *ci;
         ClassWithVectorType bar(i);
@@ -94,7 +97,7 @@ void TestVectorTypes() {
         bool b = q1.try_pop(tmp);
         CHECK((b == (i < 100)));
         ClassWithVectorType bar(i);
-        CHECK((!b || tmp == bar));
+        CHECK((!b || tmp==bar));
     }
 }
 #endif /* HAVE_m128 || HAVE_m256 */
@@ -102,27 +105,29 @@ void TestVectorTypes() {
 void TestQueueWorksWithSSE() {
 
 #if HAVE_m128
-    TestVectorTypes<ClassWithSSE, tbb::concurrent_queue<ClassWithSSE>>();
-    TestVectorTypes<ClassWithSSE, tbb::concurrent_bounded_queue<ClassWithSSE>>();
+    TestVectorTypes<ClassWithSSE, tbb::concurrent_queue<ClassWithSSE> >();
+    TestVectorTypes<ClassWithSSE, tbb::concurrent_bounded_queue<ClassWithSSE> >();
 #endif /* HAVE_m128 */
 #if HAVE_m256
-    if (have_AVX()) {
-        TestVectorTypes<ClassWithAVX, tbb::concurrent_queue<ClassWithAVX>>();
-        TestVectorTypes<ClassWithAVX, tbb::concurrent_bounded_queue<ClassWithAVX>>();
+    if( have_AVX() ) {
+        TestVectorTypes<ClassWithAVX, tbb::concurrent_queue<ClassWithAVX> >();
+        TestVectorTypes<ClassWithAVX, tbb::concurrent_bounded_queue<ClassWithAVX> >();
     }
 #endif /* HAVE_m256 */
 }
 #if TBB_USE_EXCEPTIONS
-int rnd_elem = -1;
-int global_counter = -1;
+    int rnd_elem = -1;
+    int global_counter = -1;
 
 struct throw_element {
     throw_element() = default;
     throw_element(const throw_element&) {
-        if (global_counter++ == rnd_elem) { throw std::exception {}; }
+        if (global_counter++ == rnd_elem) {
+            throw std::exception{};
+        }
     }
 
-    throw_element& operator=(const throw_element&) = default;
+    throw_element& operator= (const throw_element&) = default;
 };
 
 template <typename Queue>
@@ -132,29 +137,33 @@ void CopyWithThrowElement() {
     Queue source;
 
     constexpr size_t queue_size = 100000;
-    for (std::size_t i = 0; i < queue_size; ++i) { source.emplace(); }
+    for (std::size_t i = 0; i < queue_size; ++i) {
+        source.emplace();
+    }
 
     for (std::size_t i = 0; i < 100; ++i) {
         global_counter = 0;
         rnd_elem = rnd.get() % queue_size;
 
-        REQUIRE_THROWS_AS(
-                [&] {
-                    Queue copy(source);
-                    utils::suppress_unused_warning(copy);
-                }(),
-                std::exception);
+        REQUIRE_THROWS_AS( [&] {
+            Queue copy(source);
+            utils::suppress_unused_warning(copy);
+        }(), std::exception);
     }
 }
-#endif// TBB_USE_EXCEPTIONS
+#endif // TBB_USE_EXCEPTIONS
 
 //! Test work with different fypes
 //! \brief \ref error_guessing
-TEST_CASE("testing work with different fypes") { TestQueueWorksWithPrimitiveTypes(); }
+TEST_CASE("testing work with different fypes") {
+    TestQueueWorksWithPrimitiveTypes();
+}
 
 //! Test work with vector types
 //! \brief \ref error_guessing
-TEST_CASE("testing vector types") { TestQueueWorksWithSSE(); }
+TEST_CASE("testing vector types") {
+    TestQueueWorksWithSSE();
+}
 
 #if TBB_USE_EXCEPTIONS
 //! \brief \ref regression \ref error_guessing
@@ -163,26 +172,24 @@ TEST_CASE("Test exception in allocation") {
     using queue_type = tbb::concurrent_queue<int, allocator_type>;
 
     queue_type src_queue;
-    for (int i = 0; i < 100000; ++i) { src_queue.push(i); }
+    for (int i = 0; i < 100000; ++i) {
+        src_queue.push(i);
+    }
 
     allocator_type::set_limits(1);
 
-    REQUIRE_THROWS_AS(
-            [] {
-                queue_type queue1;
-                queue1.push(1);
-            }(),
-            const std::bad_alloc);
+    REQUIRE_THROWS_AS( [] {
+        queue_type queue1;
+        queue1.push(1);
+    }(), const std::bad_alloc);
 
     for (std::size_t i = 1; i < 1000; ++i) {
         allocator_type::init_counters();
         allocator_type::set_limits(1);
-        REQUIRE_THROWS_AS(
-                [&] {
-                    queue_type queue2(src_queue);
-                    utils::suppress_unused_warning(queue2);
-                }(),
-                const std::bad_alloc);
+        REQUIRE_THROWS_AS( [&] {
+            queue_type queue2(src_queue);
+            utils::suppress_unused_warning(queue2);
+        }(), const std::bad_alloc);
     }
 }
 
@@ -192,4 +199,128 @@ TEST_CASE("Test exception in allocation") {
     CopyWithThrowElement<tbb::concurrent_bounded_queue<throw_element>>();
 }
 
-#endif// TBB_USE_EXCEPTIONS
+#endif // TBB_USE_EXCEPTIONS
+
+struct TrackableItem {
+    static std::unordered_set<TrackableItem*> object_addresses;
+#if TBB_USE_EXCEPTIONS
+    static std::size_t global_count_for_exceptions;
+#endif
+
+    TrackableItem() {
+#if TBB_USE_EXCEPTIONS
+        if (global_count_for_exceptions++ % 3 == 0) throw 1;
+#endif
+        bool res = object_addresses.emplace(this).second;
+        CHECK(res);
+    }
+
+    ~TrackableItem() {
+        auto it = object_addresses.find(this);
+        CHECK(it != object_addresses.end());
+        object_addresses.erase(it);
+        CHECK(object_addresses.count(this) == 0);
+    }
+};
+
+template <typename Container>
+void fill_and_catch(Container& q, std::size_t elements_count) {
+    CHECK(TrackableItem::object_addresses.size() == 0);
+    for (std::size_t i = 0; i < elements_count; ++i) {
+#if TBB_USE_EXCEPTIONS
+        try {
+#endif
+            q.emplace();
+#if TBB_USE_EXCEPTIONS
+        } catch (int exception) {
+            CHECK(exception == 1);
+        }
+#endif
+    }
+#if TBB_USE_EXCEPTIONS
+    CHECK(TrackableItem::object_addresses.size() == 2 * elements_count / 3);
+#else
+    CHECK(TrackableItem::object_addresses.size() == elements_count);
+#endif
+}
+
+std::unordered_set<TrackableItem*> TrackableItem::object_addresses;
+#if TBB_USE_EXCEPTIONS
+std::size_t TrackableItem::global_count_for_exceptions = 0;
+#endif
+
+template <typename Container>
+void test_tracking_dtors_on_clear() {
+    static_assert(std::is_same<typename Container::value_type, TrackableItem>::value, "Incorrect test setup");
+    const std::size_t elements_count = 100000;
+    {
+        Container q;
+        fill_and_catch(q, elements_count);
+
+        q.clear();
+        
+        CHECK(q.empty());
+        CHECK(TrackableItem::object_addresses.empty());
+#if TBB_USE_EXCEPTIONS
+        TrackableItem::global_count_for_exceptions = 0;
+#endif
+    }
+    {
+        {
+            Container q;
+            fill_and_catch(q, elements_count);
+        } // Dtor of q would be called here
+        CHECK(TrackableItem::object_addresses.empty());
+#if TBB_USE_EXCEPTIONS
+        TrackableItem::global_count_for_exceptions = 0;
+#endif
+    }
+}
+
+//! \brief \ref regression \ref error_guessing
+TEST_CASE("Test clear and dtor with TrackableItem") {
+    test_tracking_dtors_on_clear<oneapi::tbb::concurrent_queue<TrackableItem>>();
+    test_tracking_dtors_on_clear<oneapi::tbb::concurrent_bounded_queue<TrackableItem>>();
+}
+
+//! \brief \ref regression 
+TEST_CASE("test capacity on modifying operations") {
+    // Test that concurrent_bounded_queue capacity is preserved on copying, moving and swapping
+    using queue_type = oneapi::tbb::concurrent_bounded_queue<int>;
+    using capacity_type = typename queue_type::size_type;
+
+    queue_type q;
+    capacity_type desired_capacity = 64;
+
+    q.set_capacity(desired_capacity);
+    REQUIRE_MESSAGE(q.capacity() == desired_capacity, "Capacity is not set correctly");
+
+    queue_type q_copy(q);
+    REQUIRE_MESSAGE(q_copy.capacity() == desired_capacity, "Capacity is not preserved on copying");
+
+    queue_type q_move(std::move(q));
+    REQUIRE_MESSAGE(q_move.capacity() == desired_capacity, "Capacity is not preserved on moving");
+
+    queue_type different_capacity_q1;
+    different_capacity_q1.set_capacity(desired_capacity * 2);
+
+    different_capacity_q1 = q_move;
+    REQUIRE_MESSAGE(different_capacity_q1.capacity() == desired_capacity,
+                    "Capacity is not preserved on copy assignment");
+
+    queue_type different_capacity_q2;
+    different_capacity_q2.set_capacity(desired_capacity * 2);
+
+    different_capacity_q2 = std::move(q_move);
+    REQUIRE_MESSAGE(different_capacity_q2.capacity() == desired_capacity,
+                    "Capacity is not preserved on move assignment");
+
+    queue_type different_capacity_q3;
+    different_capacity_q3.set_capacity(desired_capacity * 2);
+
+    different_capacity_q3.swap(different_capacity_q2);
+    REQUIRE_MESSAGE(different_capacity_q3.capacity() == desired_capacity,
+                    "Capacity is not preserved on swap");
+    REQUIRE_MESSAGE(different_capacity_q2.capacity() == desired_capacity * 2,
+                    "Capacity is not preserved on swap");
+}
diff --git a/external/tbb/test/tbb/test_concurrent_queue_whitebox.cpp b/external/tbb/test/tbb/test_concurrent_queue_whitebox.cpp
index 535a5d52..1ba1530e 100644
--- a/external/tbb/test/tbb/test_concurrent_queue_whitebox.cpp
+++ b/external/tbb/test/tbb/test_concurrent_queue_whitebox.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -20,11 +20,9 @@
 
 #if _MSC_VER && !defined(__INTEL_COMPILER)
 // structure was padded due to alignment specifier
-#pragma warning(disable : 4324)
+#pragma warning( disable: 4324 )
 #endif
 
-#define TBB_PREVIEW_MUTEXES 1
-
 #include "common/test.h"
 #include "common/utils.h"
 #define __TBB_TEST_DEFINE_PRIVATE_PUBLIC 1
@@ -43,26 +41,28 @@
 template <typename Q>
 class FloggerBody {
 public:
-    FloggerBody& operator=(const FloggerBody&) = delete;
+    FloggerBody& operator=( const FloggerBody& ) = delete;
 
-    FloggerBody(Q& queue, std::size_t el_num) : q(queue), elem_num(el_num) {}
+    FloggerBody( Q& queue, std::size_t el_num )
+        : q(queue), elem_num(el_num) {}
 
-    void operator()(const int thread_id) const {
+    void operator()( const int thread_id ) const {
         using value_type = typename Q::value_type;
         value_type elem = value_type(thread_id);
         for (std::size_t i = 0; i < elem_num; ++i) {
             q.push(elem);
-            q.try_pop(elem);
+            bool res = q.try_pop(elem);
+            CHECK_FAST(res);
         }
     }
 
 private:
     Q& q;
     std::size_t elem_num;
-};// class FloggerBody
+}; // class FloggerBody
 
 template <typename Q>
-void test_flogger_help(Q& q, std::size_t items_per_page) {
+void test_flogger_help( Q& q, std::size_t items_per_page ) {
     std::size_t nq = q.my_queue_representation->n_queue;
     std::size_t reserved_elem_num = nq * items_per_page - 1;
     std::size_t hack_val = std::numeric_limits<std::size_t>::max() & ~reserved_elem_num;
@@ -70,7 +70,7 @@ void test_flogger_help(Q& q, std::size_t items_per_page) {
     q.my_queue_representation->head_counter = hack_val;
     q.my_queue_representation->tail_counter = hack_val;
 
-    std::size_t k = q.my_queue_representation->tail_counter & -(std::ptrdiff_t) nq;
+    std::size_t k = q.my_queue_representation->tail_counter & -(std::ptrdiff_t)nq;
 
     for (std::size_t i = 0; i < nq; ++i) {
         q.my_queue_representation->array[i].head_counter = k;
@@ -78,27 +78,24 @@ void test_flogger_help(Q& q, std::size_t items_per_page) {
     }
 
     // To induce the overflow occurrence
-    utils::NativeParallelFor(static_cast<typename Q::value_type>(utils::MaxThread),
-                             FloggerBody<Q>(q, reserved_elem_num + 20));
+    utils::NativeParallelFor(static_cast<typename Q::value_type>(utils::MaxThread), FloggerBody<Q>(q, reserved_elem_num + 20));
 
     REQUIRE_MESSAGE(q.empty(), "Failed flogger/empty test");
     REQUIRE_MESSAGE(q.my_queue_representation->head_counter < hack_val, "Failed wraparound test");
 }
 
-template <typename T>
-void test_flogger() {
-    {
-        tbb::concurrent_queue<T> q;
-        test_flogger_help(q, q.my_queue_representation->items_per_page);
-    }
-    {
-        tbb::concurrent_bounded_queue<T> q;
+//! \brief \ref error_guessing
+TEST_CASE("Test CQ Wrapparound") {
+    for (int i = 0; i < 1000; ++i) {
+        tbb::concurrent_queue<int> q;
         test_flogger_help(q, q.my_queue_representation->items_per_page);
     }
 }
 
 //! \brief \ref error_guessing
-TEST_CASE("Test Wrapparound") {
-    test_flogger<int>();
-    // TODO: add test with unsigned char
+TEST_CASE("Test CBQ Wrapparound") {
+    for (int i = 0; i < 1000; ++i) {
+        tbb::concurrent_bounded_queue<int> q;
+        test_flogger_help(q, q.my_queue_representation->items_per_page);
+    }
 }
diff --git a/external/tbb/test/tbb/test_concurrent_set.cpp b/external/tbb/test/tbb/test_concurrent_set.cpp
index 9f4f28cf..8c00708c 100644
--- a/external/tbb/test/tbb/test_concurrent_set.cpp
+++ b/external/tbb/test/tbb/test_concurrent_set.cpp
@@ -17,8 +17,8 @@
 #define NOMINMAX
 #endif
 
-#include "common/concurrent_ordered_common.h"
 #include <tbb/concurrent_set.h>
+#include "common/concurrent_ordered_common.h"
 
 //! \file test_concurrent_set.cpp
 //! \brief Test for [containers.concurrent_set containers.concurrent_multiset] specifications
@@ -33,16 +33,12 @@ using move_support_tests::FooWithAssign;
 
 using set_type = tbb::concurrent_set<int, std::less<int>, MyAllocator<int>>;
 using multiset_type = tbb::concurrent_multiset<int, std::less<int>, MyAllocator<int>>;
-using checked_set_type
-        = tbb::concurrent_set<CheckType<int>, std::less<CheckType<int>>, MyAllocator<CheckType<int>>>;
-using checked_multiset_type
-        = tbb::concurrent_multiset<CheckType<int>, std::less<CheckType<int>>, MyAllocator<CheckType<int>>>;
+using checked_set_type = tbb::concurrent_set<CheckType<int>, std::less<CheckType<int>>, MyAllocator<CheckType<int>>>;
+using checked_multiset_type = tbb::concurrent_multiset<CheckType<int>, std::less<CheckType<int>>, MyAllocator<CheckType<int>>>;
 using greater_set_type = tbb::concurrent_set<int, std::greater<int>, MyAllocator<int>>;
 using greater_multiset_type = tbb::concurrent_multiset<int, std::greater<int>, MyAllocator<int>>;
-using checked_state_set_type
-        = tbb::concurrent_set<FooWithAssign, std::less<FooWithAssign>, MyAllocator<FooWithAssign>>;
-using checked_state_multiset_type
-        = tbb::concurrent_multiset<FooWithAssign, std::less<FooWithAssign>, MyAllocator<FooWithAssign>>;
+using checked_state_set_type = tbb::concurrent_set<FooWithAssign, std::less<FooWithAssign>, MyAllocator<FooWithAssign>>;
+using checked_state_multiset_type = tbb::concurrent_multiset<FooWithAssign, std::less<FooWithAssign>, MyAllocator<FooWithAssign>>;
 
 struct COSetTraits : OrderedMoveTraitsBase {
     template <typename T, typename Allocator>
@@ -52,7 +48,7 @@ struct COSetTraits : OrderedMoveTraitsBase {
     using container_value_type = T;
 
     using init_iterator_type = move_support_tests::FooIterator;
-};// struct COSetTraits
+}; // struct COSetTraits
 
 struct COMultisetTraits : OrderedMoveTraitsBase {
     template <typename T, typename Allocator>
@@ -62,22 +58,24 @@ struct COMultisetTraits : OrderedMoveTraitsBase {
     using container_value_type = T;
 
     using init_iterator_type = move_support_tests::FooIterator;
-};// struct COMultisetTraits
+}; // struct COMultisetTraits
 
 struct OrderedSetTypesTester {
     template <bool DefCtorPresent, typename ValueType>
-    void check(const std::list<ValueType>& lst) {
+    void check( const std::list<ValueType>& lst ) {
         TypeTester<DefCtorPresent, tbb::concurrent_set<ValueType>>(lst);
         TypeTester<DefCtorPresent, tbb::concurrent_multiset<ValueType>>(lst);
     }
-};// struct OrderedMapTypesTester
+}; // struct OrderedMapTypesTester
 
 void test_specific_types() {
     test_set_specific_types<OrderedSetTypesTester>();
 
     // Regression test for a problem with excessive requirements of emplace
-    test_emplace_insert<tbb::concurrent_set<test::unique_ptr<int>>, std::false_type>(new int, new int);
-    test_emplace_insert<tbb::concurrent_multiset<test::unique_ptr<int>>, std::false_type>(new int, new int);
+    test_emplace_insert<tbb::concurrent_set<test::unique_ptr<int>>, std::false_type>
+                       (new int, new int);
+    test_emplace_insert<tbb::concurrent_multiset<test::unique_ptr<int>>, std::false_type>
+                       (new int, new int);
 }
 
 // Regression test for an issue in lock free algorithms
@@ -89,22 +87,32 @@ void test_cycles_absense() {
         std::vector<int> v(2);
         int vector_size = int(v.size());
 
-        for (int i = 0; i != vector_size; ++i) { v[i] = int(i); }
-        size_t num_threads = 4;// Can be changed to 2 for debugging
+        for (int i = 0; i != vector_size; ++i) {
+            v[i] = int(i);
+        }
+        size_t num_threads = 4; // Can be changed to 2 for debugging
 
         utils::NativeParallelFor(num_threads, [&](size_t) {
-            for (int i = 0; i != vector_size; ++i) { mset.emplace(i); }
+            for (int i = 0; i != vector_size; ++i) {
+                mset.emplace(i);
+            }
         });
 
-        for (int i = 0; i != vector_size; ++i) { REQUIRE(mset.count(i) == num_threads); }
+        for (int i = 0; i != vector_size; ++i) {
+            REQUIRE(mset.count(i) == num_threads);
+        }
     }
 }
 
 //! \brief \ref error_guessing
-TEST_CASE("basic test for concurrent_set with greater compare") { test_basic<greater_set_type>(); }
+TEST_CASE("basic test for concurrent_set with greater compare") {
+    test_basic<greater_set_type>();
+}
 
 //! \brief \ref error_guessing
-TEST_CASE("basic test for concurrent_multiset with greater compare") { test_basic<greater_multiset_type>(); }
+TEST_CASE("basic test for concurrent_multiset with greater compare") {
+    test_basic<greater_multiset_type>();
+}
 
 //! \brief \ref resource_usage
 TEST_CASE("basic test for concurrent_set with elements ctor and dtor check") {
@@ -120,12 +128,12 @@ TEST_CASE("basic test for concurrent_multiset with elements ctor and dtor check"
 
 //! \brief \ref resource_usage
 TEST_CASE("basic test for concurrent_set with elements state check") {
-    test_basic<checked_state_set_type, /*CheckState = */ std::true_type>();
+    test_basic<checked_state_set_type, /*CheckState = */std::true_type>();
 }
 
 //! \brief \ref resource_usage
 TEST_CASE("basic test for concurrent_multiset with elements state check") {
-    test_basic<checked_state_multiset_type, /*CheckState = */ std::true_type>();
+    test_basic<checked_state_multiset_type, /*CheckState = */std::true_type>();
 }
 
 //! \brief \ref error_guessing
@@ -171,16 +179,24 @@ TEST_CASE("multithreading support in concurrent_multiset with greater compare an
 }
 
 //! \brief \ref interface \ref error_guessing
-TEST_CASE("range based for support in concurrent_set") { test_range_based_for_support<set_type>(); }
+TEST_CASE("range based for support in concurrent_set") {
+    test_range_based_for_support<set_type>();
+}
 
 //! \brief \ref interface \ref error_guessing
-TEST_CASE("range based for support in concurrent_multiset") { test_range_based_for_support<multiset_type>(); }
+TEST_CASE("range based for support in concurrent_multiset") {
+    test_range_based_for_support<multiset_type>();
+}
 
 //! \brief \ref regression
-TEST_CASE("concurrent set/multiset with specific key types") { test_specific_types(); }
+TEST_CASE("concurrent set/multiset with specific key types") {
+    test_specific_types();
+}
 
 //! \brief \ref error_guessing
-TEST_CASE("concurrent_set with std::scoped_allocator_adaptor") { test_scoped_allocator<COSetTraits>(); }
+TEST_CASE("concurrent_set with std::scoped_allocator_adaptor") {
+    test_scoped_allocator<COSetTraits>();
+}
 
 //! \brief \ref error_guessing
 TEST_CASE("concurrent_multiset with std::scoped_allocator_adaptor") {
@@ -188,19 +204,19 @@ TEST_CASE("concurrent_multiset with std::scoped_allocator_adaptor") {
 }
 
 //! \brief \ref regression
-TEST_CASE("broken internal structure for multiset") { test_cycles_absense(); }
+TEST_CASE("broken internal structure for multiset") {
+    test_cycles_absense();
+}
 
 //! \brief \ref error_guessing
 TEST_CASE("concurrent_set::swap with not always equal allocator") {
-    using not_always_equal_alloc_set_type
-            = tbb::concurrent_set<int, std::less<int>, NotAlwaysEqualAllocator<int>>;
+    using not_always_equal_alloc_set_type = tbb::concurrent_set<int, std::less<int>, NotAlwaysEqualAllocator<int>>;
     test_swap_not_always_equal_allocator<not_always_equal_alloc_set_type>();
 }
 
 //! \brief \ref error_guessing
 TEST_CASE("concurrent_multiset::swap with not always equal allocator") {
-    using not_always_equal_alloc_mset_type
-            = tbb::concurrent_multiset<int, std::less<int>, NotAlwaysEqualAllocator<int>>;
+    using not_always_equal_alloc_mset_type = tbb::concurrent_multiset<int, std::less<int>, NotAlwaysEqualAllocator<int>>;
     test_swap_not_always_equal_allocator<not_always_equal_alloc_mset_type>();
 }
 
@@ -216,7 +232,7 @@ TEST_CASE("concurrent_multiset throwing copy constructor") {
     using exception_mset_type = tbb::concurrent_multiset<ThrowOnCopy>;
     test_exception_on_copy_ctor<exception_mset_type>();
 }
-#endif// TBB_USE_EXCEPTIONS
+#endif // TBB_USE_EXCEPTIONS
 
 #if __TBB_CPP20_CONCEPTS_PRESENT
 //! \brief \ref error_guessing
@@ -230,4 +246,4 @@ TEST_CASE("container range concept for concurrent_multiset ranges") {
     static_assert(test_concepts::container_range<typename tbb::concurrent_multiset<int>::range_type>);
     static_assert(test_concepts::container_range<typename tbb::concurrent_multiset<int>::const_range_type>);
 }
-#endif// __TBB_CPP20_CONCEPTS_PRESENT
+#endif // __TBB_CPP20_CONCEPTS_PRESENT
diff --git a/external/tbb/test/tbb/test_concurrent_unordered_map.cpp b/external/tbb/test/tbb/test_concurrent_unordered_map.cpp
index 397a1976..b676b455 100644
--- a/external/tbb/test/tbb/test_concurrent_unordered_map.cpp
+++ b/external/tbb/test/tbb/test_concurrent_unordered_map.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2023 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -15,12 +15,12 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
 #endif
 
 #define TBB_DEFINE_STD_HASH_SPECIALIZATIONS 1
-#include "common/concurrent_unordered_common.h"
 #include <tbb/concurrent_unordered_map.h>
+#include "common/concurrent_unordered_common.h"
 
 //! \file test_concurrent_unordered_map.cpp
 //! \brief Test for [containers.concurrent_unordered_map containers.concurrent_unordered_multimap] specifications
@@ -33,27 +33,17 @@ using MyAllocator = LocalCountingAllocator<std::allocator<std::pair<const Key, M
 
 using move_support_tests::FooWithAssign;
 
-using map_type
-        = tbb::concurrent_unordered_map<int, int, std::hash<int>, std::equal_to<int>, MyAllocator<int, int>>;
-using multimap_type = tbb::concurrent_unordered_multimap<int, int, std::hash<int>, std::equal_to<int>,
-                                                         MyAllocator<int, int>>;
-using degenerate_map_type = tbb::concurrent_unordered_map<int, int, degenerate_hash<int>, std::equal_to<int>,
-                                                          MyAllocator<int, int>>;
-using degenerate_multimap_type
-        = tbb::concurrent_unordered_multimap<int, int, degenerate_hash<int>, std::equal_to<int>,
-                                             MyAllocator<int, int>>;
-
-using checked_map_type = tbb::concurrent_unordered_map<int, CheckType<int>, std::hash<int>,
-                                                       std::equal_to<int>, MyAllocator<int, CheckType<int>>>;
-using checked_multimap_type
-        = tbb::concurrent_unordered_multimap<int, CheckType<int>, std::hash<int>, std::equal_to<int>,
-                                             MyAllocator<int, CheckType<int>>>;
-using checked_state_map_type
-        = tbb::concurrent_unordered_map<intptr_t, FooWithAssign, std::hash<intptr_t>, std::equal_to<intptr_t>,
-                                        MyAllocator<intptr_t, FooWithAssign>>;
-using checked_state_multimap_type
-        = tbb::concurrent_unordered_multimap<intptr_t, FooWithAssign, std::hash<intptr_t>,
-                                             std::equal_to<intptr_t>, MyAllocator<intptr_t, FooWithAssign>>;
+using map_type = tbb::concurrent_unordered_map<int, int, std::hash<int>, std::equal_to<int>, MyAllocator<int, int>>;
+using multimap_type = tbb::concurrent_unordered_multimap<int, int, std::hash<int>, std::equal_to<int>, MyAllocator<int, int>>;
+using degenerate_map_type = tbb::concurrent_unordered_map<int, int, degenerate_hash<int>, std::equal_to<int>, MyAllocator<int, int>>;
+using degenerate_multimap_type = tbb::concurrent_unordered_multimap<int, int, degenerate_hash<int>, std::equal_to<int>, MyAllocator<int, int>>;
+
+using checked_map_type = tbb::concurrent_unordered_map<int, CheckType<int>, std::hash<int>, std::equal_to<int>, MyAllocator<int, CheckType<int>>>;
+using checked_multimap_type = tbb::concurrent_unordered_multimap<int, CheckType<int>, std::hash<int>, std::equal_to<int>, MyAllocator<int, CheckType<int>>>;
+using checked_state_map_type = tbb::concurrent_unordered_map<intptr_t, FooWithAssign, std::hash<intptr_t>,
+                                                             std::equal_to<intptr_t>, MyAllocator<intptr_t, FooWithAssign>>;
+using checked_state_multimap_type = tbb::concurrent_unordered_multimap<intptr_t, FooWithAssign, std::hash<intptr_t>,
+                                                                       std::equal_to<intptr_t>, MyAllocator<intptr_t, FooWithAssign>>;
 
 struct CumapTraits : UnorderedMoveTraitsBase {
     template <typename T, typename Allocator>
@@ -63,27 +53,30 @@ struct CumapTraits : UnorderedMoveTraitsBase {
     using container_value_type = std::pair<const T, T>;
 
     using init_iterator_type = move_support_tests::FooPairIterator;
-};// struct CumapTraits
+}; // struct CumapTraits
 
 struct CumultimapTraits : UnorderedMoveTraitsBase {
     template <typename T, typename Allocator>
-    using container_type
-            = tbb::concurrent_unordered_multimap<T, T, std::hash<T>, std::equal_to<T>, Allocator>;
+    using container_type = tbb::concurrent_unordered_multimap<T, T, std::hash<T>, std::equal_to<T>, Allocator>;
 
     template <typename T>
     using container_value_type = std::pair<const T, T>;
 
     using init_iterator_type = move_support_tests::FooPairIterator;
-};// struct CumultimapTraits
+}; // struct CumultimapTraits
 
 template <>
 struct SpecialTests<map_type> {
-    static void Test() { SpecialMapTests<map_type>(); }
+    static void Test() {
+        SpecialMapTests<map_type>();
+    }
 };
 
 template <>
 struct SpecialTests<multimap_type> {
-    static void Test() { SpecialMultiMapTests<multimap_type>(); }
+    static void Test() {
+        SpecialMultiMapTests<multimap_type>();
+    }
 };
 
 struct UnorderedMapTypesTester {
@@ -91,24 +84,23 @@ struct UnorderedMapTypesTester {
     using table_type = GeneralTableType<Key, Mapped, std::hash<Key>, utils::IsEqual>;
 
     template <bool DefCtorPresent, typename ValueType>
-    void check(const std::list<ValueType>& lst) {
+    void check( const std::list<ValueType>& lst ) {
         using key_type = typename std::remove_const<typename ValueType::first_type>::type;
         using mapped_type = typename ValueType::second_type;
 
         TypeTester<DefCtorPresent, table_type<tbb::concurrent_unordered_map, key_type, mapped_type>>(lst);
-        TypeTester<DefCtorPresent, table_type<tbb::concurrent_unordered_multimap, key_type, mapped_type>>(
-                lst);
+        TypeTester<DefCtorPresent, table_type<tbb::concurrent_unordered_multimap, key_type, mapped_type>>(lst);
     }
-};// struct UnorderedMapTypesTester
+}; // struct UnorderedMapTypesTester
 
 void test_specific_types() {
     test_map_specific_types<UnorderedMapTypesTester>();
 
     // Regression test for a problem with excessive requirements of emplace()
-    test_emplace_insert<tbb::concurrent_unordered_map<int*, test::unique_ptr<int>>, std::false_type>(new int,
-                                                                                                     new int);
-    test_emplace_insert<tbb::concurrent_unordered_multimap<int*, test::unique_ptr<int>>, std::false_type>(
-            new int, new int);
+    test_emplace_insert<tbb::concurrent_unordered_map<int*, test::unique_ptr<int>>, std::false_type>
+                       (new int, new int);
+    test_emplace_insert<tbb::concurrent_unordered_multimap<int*, test::unique_ptr<int>>, std::false_type>
+                       (new int, new int);
 }
 
 //! \brief \ref stress \ref error_guessing
@@ -135,12 +127,12 @@ TEST_CASE("basic test for concurrent_unordered_multimap with elements ctor and d
 
 //! \brief \ref resource_usage
 TEST_CASE("basic test for concurrent_unordered_map with elements state check") {
-    test_basic<checked_state_map_type, /*CheckState = */ std::true_type>();
+    test_basic<checked_state_map_type, /*CheckState = */std::true_type>();
 }
 
 //! \brief \ref resource_usage
 TEST_CASE("basic test for concurrent_unordered_multimap with elements state check") {
-    test_basic<checked_state_multimap_type, /*CheckState = */ std::true_type>();
+    test_basic<checked_state_multimap_type, /*CheckState = */std::true_type>();
 }
 
 //! \brief \ref stress \ref error_guessing
@@ -186,7 +178,9 @@ TEST_CASE("multithreading support in concurrent_unordered_multimap with elements
 }
 
 //! \brief \ref interface \ref error_guessing
-TEST_CASE("range based for support in concurrent_unordered_map") { test_range_based_for_support<map_type>(); }
+TEST_CASE("range based for support in concurrent_unordered_map") {
+    test_range_based_for_support<map_type>();
+}
 
 //! \brief \ref interface \ref error_guessing
 TEST_CASE("range based for support in concurrent_unordered_multimap") {
@@ -199,21 +193,21 @@ TEST_CASE("merge and concurrent merge in concurrent_unordered_map with degenerat
 }
 
 //! \brief \ref regression
-TEST_CASE("concurrent_unordered map/multimap with specific key/mapped types") { test_specific_types(); }
+TEST_CASE("concurrent_unordered map/multimap with specific key/mapped types") {
+    test_specific_types();
+}
 
 //! \brief \ref error_guessing
 TEST_CASE("concurrent_unordered_map::swap with not always equal allocator") {
-    using not_always_equal_alloc_map_type
-            = tbb::concurrent_unordered_map<int, int, std::hash<int>, std::equal_to<int>,
-                                            NotAlwaysEqualAllocator<std::pair<const int, int>>>;
+    using not_always_equal_alloc_map_type = tbb::concurrent_unordered_map<int, int, std::hash<int>, std::equal_to<int>,
+                                                                          NotAlwaysEqualAllocator<std::pair<const int, int>>>;
     test_swap_not_always_equal_allocator<not_always_equal_alloc_map_type>();
 }
 
 //! \brief \ref error_guessing
 TEST_CASE("concurrent_unordered_multimap::swap with not always equal allocator") {
-    using not_always_equal_alloc_mmap_type
-            = tbb::concurrent_unordered_multimap<int, int, std::hash<int>, std::equal_to<int>,
-                                                 NotAlwaysEqualAllocator<std::pair<const int, int>>>;
+    using not_always_equal_alloc_mmap_type = tbb::concurrent_unordered_multimap<int, int, std::hash<int>, std::equal_to<int>,
+                                                                                NotAlwaysEqualAllocator<std::pair<const int, int>>>;
     test_swap_not_always_equal_allocator<not_always_equal_alloc_mmap_type>();
 }
 
@@ -233,39 +227,40 @@ TEST_CASE("concurrent_unordered_multimap throwing copy constructor") {
 //! \brief \ref error_guessing
 TEST_CASE("concurrent_unordered_map whitebox throwing copy constructor") {
     using allocator_type = StaticSharedCountingAllocator<std::allocator<std::pair<const int, int>>>;
-    using exception_mmap_type
-            = tbb::concurrent_unordered_map<int, int, std::hash<int>, std::equal_to<int>, allocator_type>;
+    using exception_mmap_type = tbb::concurrent_unordered_map<int, int, std::hash<int>, std::equal_to<int>, allocator_type>;
 
     exception_mmap_type map;
-    for (int i = 0; i < 10; ++i) { map.insert(std::pair<const int, int>(i, 42)); }
+    for (int i = 0; i < 10; ++i) {
+        map.insert(std::pair<const int, int>(i, 42));
+    }
 
     allocator_type::set_limits(1);
-    REQUIRE_THROWS_AS(
-            [&] {
-                exception_mmap_type map1(map);
-                utils::suppress_unused_warning(map1);
-            }(),
-            const std::bad_alloc);
+    REQUIRE_THROWS_AS( [&] {
+        exception_mmap_type map1(map);
+        utils::suppress_unused_warning(map1);
+    }(), const std::bad_alloc);
 }
 
-#endif// TBB_USE_EXCEPTIONS
+#endif // TBB_USE_EXCEPTIONS
 
 // TODO: add test_scoped_allocator support with broken macro
 
 #if __TBB_CPP20_CONCEPTS_PRESENT
 //! \brief \ref error_guessing
 TEST_CASE("container_range concept for concurrent_unordered_map ranges") {
-    static_assert(
-            test_concepts::container_range<typename tbb::concurrent_unordered_map<int, int>::range_type>);
-    static_assert(test_concepts::container_range<
-                  typename tbb::concurrent_unordered_map<int, int>::const_range_type>);
+    static_assert(test_concepts::container_range<typename tbb::concurrent_unordered_map<int, int>::range_type>);
+    static_assert(test_concepts::container_range<typename tbb::concurrent_unordered_map<int, int>::const_range_type>);
 }
 
 //! \brief \ref error_guessing
 TEST_CASE("container_range concept for concurrent_unordered_multimap ranges") {
-    static_assert(test_concepts::container_range<
-                  typename tbb::concurrent_unordered_multimap<int, int>::range_type>);
-    static_assert(test_concepts::container_range<
-                  typename tbb::concurrent_unordered_multimap<int, int>::const_range_type>);
+    static_assert(test_concepts::container_range<typename tbb::concurrent_unordered_multimap<int, int>::range_type>);
+    static_assert(test_concepts::container_range<typename tbb::concurrent_unordered_multimap<int, int>::const_range_type>);
+}
+#endif // __TBB_CPP20_CONCEPTS_PRESENT
+
+//! \brief \ref regression
+TEST_CASE("reserve(0) issue regression test") {
+    test_reserve_regression<oneapi::tbb::concurrent_unordered_map<int, int>>();
+    test_reserve_regression<oneapi::tbb::concurrent_unordered_multimap<int, int>>();
 }
-#endif// __TBB_CPP20_CONCEPTS_PRESENT
diff --git a/external/tbb/test/tbb/test_concurrent_unordered_set.cpp b/external/tbb/test/tbb/test_concurrent_unordered_set.cpp
index 6fb923c4..1b5195ba 100644
--- a/external/tbb/test/tbb/test_concurrent_unordered_set.cpp
+++ b/external/tbb/test/tbb/test_concurrent_unordered_set.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2023 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -15,12 +15,12 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
 #endif
 
 #define TBB_DEFINE_STD_HASH_SPECIALIZATIONS 1
-#include "common/concurrent_unordered_common.h"
 #include <tbb/concurrent_unordered_set.h>
+#include "common/concurrent_unordered_common.h"
 
 //! \file test_concurrent_unordered_set.cpp
 //! \brief Test for [containers.concurrent_unordered_set containers.concurrent_unordered_multiset] specifications
@@ -34,25 +34,17 @@ using MyAllocator = LocalCountingAllocator<std::allocator<Value>>;
 using move_support_tests::FooWithAssign;
 
 using set_type = tbb::concurrent_unordered_set<int, std::hash<int>, std::equal_to<int>, MyAllocator<int>>;
-using multiset_type
-        = tbb::concurrent_unordered_multiset<int, std::hash<int>, std::equal_to<int>, MyAllocator<int>>;
-using degenerate_set_type
-        = tbb::concurrent_unordered_set<int, degenerate_hash<int>, std::equal_to<int>, MyAllocator<int>>;
-using degenerate_multiset_type
-        = tbb::concurrent_unordered_multiset<int, degenerate_hash<int>, std::equal_to<int>, MyAllocator<int>>;
-
-using checked_set_type
-        = tbb::concurrent_unordered_set<CheckType<int>, std::hash<CheckType<int>>,
-                                        std::equal_to<CheckType<int>>, MyAllocator<CheckType<int>>>;
-using checked_multiset_type
-        = tbb::concurrent_unordered_multiset<CheckType<int>, std::hash<CheckType<int>>,
-                                             std::equal_to<CheckType<int>>, MyAllocator<CheckType<int>>>;
-using checked_state_set_type
-        = tbb::concurrent_unordered_set<FooWithAssign, std::hash<FooWithAssign>, std::equal_to<FooWithAssign>,
-                                        MyAllocator<FooWithAssign>>;
-using checked_state_multiset_type
-        = tbb::concurrent_unordered_multiset<FooWithAssign, std::hash<FooWithAssign>,
-                                             std::equal_to<FooWithAssign>, MyAllocator<FooWithAssign>>;
+using multiset_type = tbb::concurrent_unordered_multiset<int, std::hash<int>, std::equal_to<int>, MyAllocator<int>>;
+using degenerate_set_type = tbb::concurrent_unordered_set<int, degenerate_hash<int>, std::equal_to<int>, MyAllocator<int>>;
+using degenerate_multiset_type = tbb::concurrent_unordered_multiset<int, degenerate_hash<int>, std::equal_to<int>, MyAllocator<int>>;
+
+using checked_set_type = tbb::concurrent_unordered_set<CheckType<int>, std::hash<CheckType<int>>, std::equal_to<CheckType<int>>, MyAllocator<CheckType<int>>>;
+using checked_multiset_type = tbb::concurrent_unordered_multiset<CheckType<int>, std::hash<CheckType<int>>,
+                                                                 std::equal_to<CheckType<int>>, MyAllocator<CheckType<int>>>;
+using checked_state_set_type = tbb::concurrent_unordered_set<FooWithAssign, std::hash<FooWithAssign>, std::equal_to<FooWithAssign>,
+                                                             MyAllocator<FooWithAssign>>;
+using checked_state_multiset_type = tbb::concurrent_unordered_multiset<FooWithAssign, std::hash<FooWithAssign>, std::equal_to<FooWithAssign>,
+                                                                       MyAllocator<FooWithAssign>>;
 
 struct CusetTraits : UnorderedMoveTraitsBase {
     template <typename T, typename Allocator>
@@ -62,7 +54,7 @@ struct CusetTraits : UnorderedMoveTraitsBase {
     using container_value_type = T;
 
     using init_iterator_type = move_support_tests::FooIterator;
-};// struct CusetTraits
+}; // struct CusetTraits
 
 struct CumultisetTraits : UnorderedMoveTraitsBase {
     template <typename T, typename Allocator>
@@ -72,15 +64,13 @@ struct CumultisetTraits : UnorderedMoveTraitsBase {
     using container_value_type = T;
 
     using init_iterator_type = move_support_tests::FooIterator;
-};// struct CumultisetTraits
+}; // struct CumultisetTraits
 
 struct UnorderedSetTypesTester {
     template <bool DefCtorPresent, typename ValueType>
-    void check(const std::list<ValueType>& lst) {
-        TypeTester<DefCtorPresent,
-                   tbb::concurrent_unordered_set<ValueType, std::hash<ValueType>, utils::IsEqual>>(lst);
-        TypeTester<DefCtorPresent,
-                   tbb::concurrent_unordered_multiset<ValueType, std::hash<ValueType>, utils::IsEqual>>(lst);
+    void check( const std::list<ValueType>& lst ) {
+        TypeTester<DefCtorPresent, tbb::concurrent_unordered_set<ValueType, std::hash<ValueType>, utils::IsEqual>>(lst);
+        TypeTester<DefCtorPresent, tbb::concurrent_unordered_multiset<ValueType, std::hash<ValueType>, utils::IsEqual>>(lst);
     }
 };
 
@@ -88,10 +78,10 @@ void test_specific_types() {
     test_set_specific_types<UnorderedSetTypesTester>();
 
     // Regressiong test for a problem with excessive requirements of emplace()
-    test_emplace_insert<tbb::concurrent_unordered_set<test::unique_ptr<int>>, std::false_type>(new int,
-                                                                                               new int);
-    test_emplace_insert<tbb::concurrent_unordered_multiset<test::unique_ptr<int>>, std::false_type>(new int,
-                                                                                                    new int);
+    test_emplace_insert<tbb::concurrent_unordered_set<test::unique_ptr<int>>,
+                        std::false_type>(new int, new int);
+    test_emplace_insert<tbb::concurrent_unordered_multiset<test::unique_ptr<int>>,
+                        std::false_type>(new int, new int);
 }
 
 //! \brief \ref stress \ref error_guessing
@@ -118,12 +108,12 @@ TEST_CASE("basic test for concurrent_unordered_multiset with elements ctor and d
 
 //! \brief \ref resource_usage
 TEST_CASE("basic test for concurrent_unordered_set with elements state check") {
-    test_basic<checked_state_set_type, /*CheckState = */ std::true_type>();
+    test_basic<checked_state_set_type, /*CheckState = */std::true_type>();
 }
 
 //! \brief \ref resource_usage
 TEST_CASE("basic test for concurrent_unordered_multiset with elements state check") {
-    test_basic<checked_state_multiset_type, /*CheckState = */ std::true_type>();
+    test_basic<checked_state_multiset_type, /*CheckState = */std::true_type>();
 }
 
 //! \brief \ref stress \ref error_guessing
@@ -169,7 +159,9 @@ TEST_CASE("multithreading support in concurrent_unordered_multiset with elements
 }
 
 //! \brief \ref interface \ref error_guessing
-TEST_CASE("range based for support in concurrent_unordered_set") { test_range_based_for_support<set_type>(); }
+TEST_CASE("range based for support in concurrent_unordered_set") {
+    test_range_based_for_support<set_type>();
+}
 
 //! \brief \ref interface \ref error_guessing
 TEST_CASE("range based for support in concurrent_unordered_multiset") {
@@ -182,7 +174,9 @@ TEST_CASE("merge and concurrent merge in concurrent_unordered_set and set with d
 }
 
 //! \brief \ref regression
-TEST_CASE("concurrent_unordered_set/multiset with specific key types") { test_specific_types(); }
+TEST_CASE("concurrent_unordered_set/multiset with specific key types") {
+    test_specific_types();
+}
 
 //! \brief \ref error_guessing
 TEST_CASE("concurrent_unordered_set with std::scoped_allocator_adaptor") {
@@ -196,17 +190,15 @@ TEST_CASE("concurrent_unordered_multiset with std::scoped_allocator_adaptor") {
 
 //! \brief \ref error_guessing
 TEST_CASE("concurrent_unordered_set::swap with not always equal allocator") {
-    using not_always_equal_alloc_set_type
-            = tbb::concurrent_unordered_set<int, std::hash<int>, std::equal_to<int>,
-                                            NotAlwaysEqualAllocator<int>>;
+    using not_always_equal_alloc_set_type = tbb::concurrent_unordered_set<int, std::hash<int>, std::equal_to<int>,
+                                                                          NotAlwaysEqualAllocator<int>>;
     test_swap_not_always_equal_allocator<not_always_equal_alloc_set_type>();
 }
 
 //! \brief \ref error_guessing
 TEST_CASE("concurrent_unordered_multiset::swap with not always equal allocator") {
-    using not_always_equal_alloc_mset_type
-            = tbb::concurrent_unordered_multiset<int, std::hash<int>, std::equal_to<int>,
-                                                 NotAlwaysEqualAllocator<int>>;
+    using not_always_equal_alloc_mset_type = tbb::concurrent_unordered_multiset<int, std::hash<int>, std::equal_to<int>,
+                                                                                NotAlwaysEqualAllocator<int>>;
     test_swap_not_always_equal_allocator<not_always_equal_alloc_mset_type>();
 }
 
@@ -222,21 +214,24 @@ TEST_CASE("concurrent_unordered_multimap throwing copy constructor") {
     using exception_mset_type = tbb::concurrent_unordered_multiset<ThrowOnCopy>;
     test_exception_on_copy_ctor<exception_mset_type>();
 }
-#endif// __TBB_USE_EXCEPTIONS
+#endif // __TBB_USE_EXCEPTIONS
 
 #if __TBB_CPP20_CONCEPTS_PRESENT
 //! \brief \ref error_guessing
 TEST_CASE("container_range concept for concurrent_unordered_set ranges") {
     static_assert(test_concepts::container_range<typename tbb::concurrent_unordered_set<int>::range_type>);
-    static_assert(
-            test_concepts::container_range<typename tbb::concurrent_unordered_set<int>::const_range_type>);
+    static_assert(test_concepts::container_range<typename tbb::concurrent_unordered_set<int>::const_range_type>);
 }
 
 //! \brief \ref error_guessing
 TEST_CASE("container_range concept for concurrent_unordered_multiset ranges") {
-    static_assert(
-            test_concepts::container_range<typename tbb::concurrent_unordered_multiset<int>::range_type>);
-    static_assert(test_concepts::container_range<
-                  typename tbb::concurrent_unordered_multiset<int>::const_range_type>);
+    static_assert(test_concepts::container_range<typename tbb::concurrent_unordered_multiset<int>::range_type>);
+    static_assert(test_concepts::container_range<typename tbb::concurrent_unordered_multiset<int>::const_range_type>);
+}
+#endif // __TBB_CPP20_CONCEPTS_PRESENT
+
+//! \brief \ref regression
+TEST_CASE("reserve(0) issue regression test") {
+    test_reserve_regression<oneapi::tbb::concurrent_unordered_set<int>>();
+    test_reserve_regression<oneapi::tbb::concurrent_unordered_multiset<int>>();
 }
-#endif// __TBB_CPP20_CONCEPTS_PRESENT
diff --git a/external/tbb/test/tbb/test_concurrent_vector.cpp b/external/tbb/test/tbb/test_concurrent_vector.cpp
index 52b34b58..0237102e 100644
--- a/external/tbb/test/tbb/test_concurrent_vector.cpp
+++ b/external/tbb/test/tbb/test_concurrent_vector.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -15,65 +15,66 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
 #endif
 
-#include <algorithm>
-#include <cmath>
-#include <common/concepts_common.h>
-#include <common/container_move_support.h>
-#include <common/range_based_for_support.h>
+#include <common/test.h>
 #include <common/spin_barrier.h>
 #include <common/state_trackable.h>
-#include <common/test.h>
+#include <common/container_move_support.h>
+#include <common/range_based_for_support.h>
 #include <common/utils.h>
 #include <common/utils_concurrency_limit.h>
 #include <common/vector_types.h>
+#include <common/concepts_common.h>
 #include <tbb/concurrent_vector.h>
-#include <tbb/parallel_for.h>
-#include <tbb/parallel_reduce.h>
 #include <tbb/tick_count.h>
+#include <tbb/parallel_reduce.h>
+#include <tbb/parallel_for.h>
+#include <algorithm>
+#include <cmath>
+#include <random>
 
 //! \file test_concurrent_vector.cpp
 //! \brief Test for [containers.concurrent_vector] specification
 
 void TestSort() {
-    for (int n = 0; n < 100; n = n * 3 + 1) {
+    for( int n=0; n<100; n=n*3+1 ) {
         tbb::concurrent_vector<int> array(n);
-        for (int i = 0; i < n; ++i) { array.at(i) = (i * 7) % n; }
-        std::sort(array.begin(), array.end());
-        for (int i = 0; i < n; ++i) { REQUIRE(array[i] == i); }
+        for( int i=0; i<n; ++i ){
+            array.at(i) = (i*7)%n;
+        }
+        std::sort( array.begin(), array.end() );
+        for( int i=0; i<n; ++i ){
+            REQUIRE( array[i]==i );
+        }
     }
 }
 
-void TestRangeBasedFor() {
+void TestRangeBasedFor(){
     using namespace range_based_for_support_tests;
 
     using c_vector = tbb::concurrent_vector<int>;
     c_vector a_c_vector;
 
     const int sequence_length = 10;
-    for (int i = 1; i <= sequence_length; ++i) { a_c_vector.push_back(i); }
+    for (int i = 1; i<= sequence_length; ++i){
+        a_c_vector.push_back(i);
+    }
 
-    REQUIRE_MESSAGE(range_based_for_accumulate(a_c_vector, std::plus<int>(), 0)
-                            == gauss_summ_of_int_sequence(sequence_length),
-                    "incorrect accumulated value generated via range based for ?");
+    REQUIRE_MESSAGE( range_based_for_accumulate(a_c_vector, std::plus<int>(), 0) == gauss_summ_of_int_sequence(sequence_length), "incorrect accumulated value generated via range based for ?");
 }
 
 struct default_container_traits {
     template <typename container_type, typename iterator_type>
-    static container_type&
-    construct_container(typename std::aligned_storage<sizeof(container_type)>::type& storage,
-                        iterator_type begin, iterator_type end) {
+    static container_type& construct_container(typename std::aligned_storage<sizeof(container_type)>::type& storage, iterator_type begin, iterator_type end){
         container_type* ptr = reinterpret_cast<container_type*>(&storage);
         new (ptr) container_type(begin, end);
         return *ptr;
     }
 
     template <typename container_type, typename iterator_type, typename allocator_type>
-    static container_type&
-    construct_container(typename std::aligned_storage<sizeof(container_type)>::type& storage,
-                        iterator_type begin, iterator_type end, allocator_type const& a) {
+    static container_type& construct_container(typename std::aligned_storage<sizeof(container_type)>::type& storage, iterator_type begin, iterator_type end, allocator_type const& a){
         container_type* ptr = reinterpret_cast<container_type*>(&storage);
         new (ptr) container_type(begin, end, a);
         return *ptr;
@@ -88,86 +89,88 @@ struct c_vector_type : default_container_traits {
     using container_value_type = T;
 
     using init_iterator_type = move_support_tests::FooIterator;
-    template <typename element_type, typename allocator_type>
-    struct apply {
-        using type = tbb::concurrent_vector<element_type, allocator_type>;
+    template<typename element_type, typename allocator_type>
+    struct apply{
+        using type = tbb::concurrent_vector<element_type,  allocator_type >;
     };
 
-    enum { expected_number_of_items_to_allocate_for_steal_move = 0 };
+    enum{ expected_number_of_items_to_allocate_for_steal_move = 0 };
 
-    template <typename element_type, typename allocator_type, typename iterator>
-    static bool equal(tbb::concurrent_vector<element_type, allocator_type> const& c, iterator begin,
-                      iterator end) {
-        bool equal_sizes = (size_t) std::distance(begin, end) == c.size();
-        return equal_sizes && std::equal(c.begin(), c.end(), begin);
+    template<typename element_type, typename allocator_type, typename iterator>
+    static bool equal(tbb::concurrent_vector<element_type, allocator_type > const& c, iterator begin, iterator end){
+        bool equal_sizes = (size_t)std::distance(begin, end) == c.size();
+        return  equal_sizes && std::equal(c.begin(), c.end(), begin);
     }
 };
 
-void TestSerialGrowByWithMoveIterators() {
+void TestSerialGrowByWithMoveIterators(){
     using fixture_t = move_support_tests::DefaultStatefulFixtureHelper<c_vector_type>::type;
     using vector_t = fixture_t::container_type;
 
     fixture_t fixture;
 
     vector_t dst(fixture.dst_allocator);
-    dst.grow_by(std::make_move_iterator(fixture.source.begin()),
-                std::make_move_iterator(fixture.source.end()));
+    dst.grow_by(std::make_move_iterator(fixture.source.begin()), std::make_move_iterator(fixture.source.end()));
 
     fixture.verify_content_deep_moved(dst);
 }
 
 #if HAVE_m128 || HAVE_m256
 
-template <typename ClassWithVectorType>
+template<typename ClassWithVectorType>
 void TestVectorTypes() {
     tbb::concurrent_vector<ClassWithVectorType> v;
-    for (int i = 0; i < 100; ++i) {
+    for( int i = 0; i < 100; ++i ) {
         // VC8 does not properly align a temporary value; to work around, use explicit variable
         ClassWithVectorType foo(i);
         v.push_back(foo);
-        for (int j = 0; j < i; ++j) {
+        for( int j=0; j<i; ++j ) {
             ClassWithVectorType bar(j);
-            REQUIRE(v[j] == bar);
+            REQUIRE( v[j]==bar );
         }
     }
 }
 #endif /* HAVE_m128 | HAVE_m256 */
 
+
 static tbb::concurrent_vector<std::size_t> Primes;
 
 class FindPrimes {
-    bool is_prime(std::size_t val) const {
+    bool is_prime( std::size_t val ) const {
         int limit, factor = 3;
-        if (val < 5u) return val == 2;
+        if( val<5u )
+            return val==2;
         else {
-            limit = long(sqrtf(float(val)) + 0.5f);
-            while (factor <= limit && val % factor) ++factor;
-            return factor > limit;
+            limit = long(sqrtf(float(val))+0.5f);
+            while( factor<=limit && val % factor )
+                ++factor;
+            return factor>limit;
         }
     }
-
 public:
-    void operator()(const std::size_t idx) const {
-        if (idx % 2 && is_prime(idx)) { Primes.push_back(idx); }
+    void operator()( const std::size_t idx ) const {
+        if( idx % 2 && is_prime(idx) ) {
+            Primes.push_back( idx );
+        }
     }
 };
 
-double TimeFindPrimes(std::size_t nthread) {
+double TimeFindPrimes( std::size_t nthread ) {
     Primes.clear();
     const std::size_t count = 1048576;
     Primes.reserve(count);// TODO: or compact()?
     tbb::tick_count t0 = tbb::tick_count::now();
     std::size_t block_size = count / nthread;
-    utils::NativeParallelFor(count, block_size, FindPrimes());
+    utils::NativeParallelFor(count, block_size, FindPrimes() );
     tbb::tick_count t1 = tbb::tick_count::now();
-    return (t1 - t0).seconds();
+    return (t1-t0).seconds();
 }
 
 void TestFindPrimes() {
     // Time fully subscribed run.
 
     // TimeFindPrimes( tbb::task_scheduler_init::automatic );
-    double t2 = TimeFindPrimes(utils::get_platform_max_threads());
+    double t2 = TimeFindPrimes( utils::get_platform_max_threads() );
 
     // Time parallel run that is very likely oversubscribed.
 #if TBB_TEST_LOW_WORKLOAD
@@ -181,22 +184,21 @@ void TestFindPrimes() {
     // Theoretically, following test will fail on machine with >X processors.
     // But that situation is not going to come up in the near future,
     // and the generalization to fix the issue is not worth the trouble.
-    WARN_MESSAGE(tx <= 1.3 * t2, "Warning: grow_by is pathetically slow");
+    WARN_MESSAGE( tx <= 1.3*t2, "Warning: grow_by is pathetically slow");
     INFO("t2 == " << t2 << " tx == " << tx << "k == " << tx / t2);
 }
 
 template <typename Type, typename Allocator>
 class test_grow_by_and_resize {
-    tbb::concurrent_vector<Type, Allocator>& my_c;
-
+    tbb::concurrent_vector<Type, Allocator> &my_c;
 public:
-    test_grow_by_and_resize(tbb::concurrent_vector<Type, Allocator>& c) : my_c(c) {}
+    test_grow_by_and_resize( tbb::concurrent_vector<Type, Allocator> &c ) : my_c(c) {}
     void operator()() const {
         const typename tbb::concurrent_vector<Type, Allocator>::size_type sz = my_c.size();
-        my_c.grow_by(5);
-        REQUIRE(my_c.size() == sz + 5);
-        my_c.resize(sz);
-        REQUIRE(my_c.size() == sz);
+        my_c.grow_by( 5 );
+        REQUIRE( my_c.size() == sz + 5 );
+        my_c.resize( sz );
+        REQUIRE( my_c.size() == sz );
     }
 };
 
@@ -253,154 +255,147 @@ void test_scoped_allocator() {
     allocator_data_type::deactivate();
 }
 
-template <bool default_construction_present>
-struct do_default_construction_test {
-    template <typename FuncType>
-    void operator()(FuncType func) const {
-        func();
-    }
+template <bool default_construction_present> struct do_default_construction_test {
+    template<typename FuncType> void operator() ( FuncType func ) const { func(); }
 };
-template <>
-struct do_default_construction_test<false> {
-    template <typename FuncType>
-    void operator()(FuncType) const {}
+template <> struct do_default_construction_test<false> {
+    template<typename FuncType> void operator()( FuncType ) const {}
 };
 
 template <typename Type, typename Allocator>
-void CompareVectors(const tbb::concurrent_vector<Type, Allocator>& c1,
-                    const tbb::concurrent_vector<Type, Allocator>& c2) {
-    REQUIRE((!(c1 == c2) && c1 != c2));
-    REQUIRE((c1 <= c2 && c1 < c2 && c2 >= c1 && c2 > c1));
+void CompareVectors( const tbb::concurrent_vector<Type, Allocator> &c1, const tbb::concurrent_vector<Type, Allocator> &c2 ) {
+    REQUIRE( (!(c1 == c2) && c1 != c2) );
+    REQUIRE( (c1 <= c2 && c1 < c2 && c2 >= c1 && c2 > c1) );
 }
 
 template <typename Type, typename Allocator>
-void CompareVectors(const tbb::concurrent_vector<std::weak_ptr<Type>, Allocator>&,
-                    const tbb::concurrent_vector<std::weak_ptr<Type>, Allocator>&) {
+void CompareVectors( const tbb::concurrent_vector<std::weak_ptr<Type>, Allocator> &, const tbb::concurrent_vector<std::weak_ptr<Type>, Allocator> & ) {
     /* do nothing for std::weak_ptr */
 }
 
 template <bool default_construction_present, typename Type, typename Allocator>
-void Examine(tbb::concurrent_vector<Type, Allocator> c, const std::vector<Type>& vec) {
+void Examine( tbb::concurrent_vector<Type, Allocator> c, const std::vector<Type> &vec ) {
     using vector_t = tbb::concurrent_vector<Type, Allocator>;
     using size_type_t = typename vector_t::size_type;
 
-    REQUIRE(c.size() == vec.size());
-    for (size_type_t i = 0; i < c.size(); ++i) { REQUIRE(utils::IsEqual()(c[i], vec[i])); }
-    do_default_construction_test<default_construction_present>()(test_grow_by_and_resize<Type, Allocator>(c));
-    c.grow_by(size_type_t(5), c[0]);
-    c.grow_to_at_least(c.size() + 5, c.at(0));
+
+    REQUIRE( c.size() == vec.size() );
+    for ( size_type_t i=0; i<c.size(); ++i ) {
+        REQUIRE( utils::IsEqual()(c[i], vec[i]) );
+    }
+    do_default_construction_test<default_construction_present>()(test_grow_by_and_resize<Type,Allocator>(c));
+    c.grow_by( size_type_t(5), c[0] );
+    c.grow_to_at_least( c.size()+5, c.at(0) );
     vector_t c2;
-    c2.reserve(5);
-    std::copy(c.begin(), c.begin() + 5, std::back_inserter(c2));
+    c2.reserve( 5 );
+    std::copy( c.begin(), c.begin() + 5, std::back_inserter( c2 ) );
 
-    c.grow_by(c2.begin(), c2.end());
+    c.grow_by( c2.begin(), c2.end() );
     const vector_t& cvcr = c;
-    REQUIRE(utils::IsEqual()(cvcr.front(), *(c2.rend() - 1)));
-    REQUIRE(utils::IsEqual()(cvcr.back(), *c2.rbegin()));
-    REQUIRE(utils::IsEqual()(*c.cbegin(), *(c.crend() - 1)));
-    REQUIRE(utils::IsEqual()(*(c.cend() - 1), *c.crbegin()));
-    c.swap(c2);
-    REQUIRE(c.size() == 5);
-    CompareVectors(c, c2);
-    c.swap(c2);
+    REQUIRE( utils::IsEqual()(cvcr.front(), *(c2.rend()-1)) );
+    REQUIRE( utils::IsEqual()(cvcr.back(), *c2.rbegin()));
+    REQUIRE( utils::IsEqual()(*c.cbegin(), *(c.crend()-1)) );
+    REQUIRE( utils::IsEqual()(*(c.cend()-1), *c.crbegin()) );
+    c.swap( c2 );
+    REQUIRE( c.size() == 5 );
+    CompareVectors( c, c2 );
+    c.swap( c2 );
     c2.clear();
-    REQUIRE(c2.size() == 0);
+    REQUIRE( c2.size() == 0 );
     c2.shrink_to_fit();
     Allocator a = c.get_allocator();
-    a.deallocate(a.allocate(1), 1);
+    a.deallocate( a.allocate(1), 1 );
 }
 
 template <typename Type>
 class test_default_construction {
-    const std::vector<Type>& my_vec;
-
+    const std::vector<Type> &my_vec;
 public:
-    test_default_construction(const std::vector<Type>& vec) : my_vec(vec) {}
+    test_default_construction( const std::vector<Type> &vec ) : my_vec(vec) {}
     void operator()() const {
         // Construction with initial size specified by argument n.
-        tbb::concurrent_vector<Type> c7(my_vec.size());
-        std::copy(my_vec.begin(), my_vec.end(), c7.begin());
-        Examine</*default_construction_present = */ true>(c7, my_vec);
-        tbb::concurrent_vector<Type, std::allocator<Type>> c8(my_vec.size());
-        std::copy(c7.begin(), c7.end(), c8.begin());
-        Examine</*default_construction_present = */ true>(c8, my_vec);
+        tbb::concurrent_vector<Type> c7( my_vec.size() );
+        std::copy( my_vec.begin(), my_vec.end(), c7.begin() );
+        Examine</*default_construction_present = */true>( c7, my_vec );
+        tbb::concurrent_vector< Type, std::allocator<Type> > c8( my_vec.size() );
+        std::copy( c7.begin(), c7.end(), c8.begin() );
+        Examine</*default_construction_present = */true>( c8, my_vec );
     }
 };
 
 template <bool default_construction_present, typename Type>
-void TypeTester(const std::vector<Type>& vec) {
-    __TBB_ASSERT(vec.size() >= 5, "Array should have at least 5 elements");
+void TypeTester( const std::vector<Type> &vec ) {
+    __TBB_ASSERT( vec.size() >= 5, "Array should have at least 5 elements" );
     // Construct empty vector.
     tbb::concurrent_vector<Type> c1;
-    std::copy(vec.begin(), vec.end(), std::back_inserter(c1));
-    Examine<default_construction_present>(c1, vec);
+    std::copy( vec.begin(), vec.end(), std::back_inserter(c1) );
+    Examine<default_construction_present>( c1, vec );
     // Constructor from initializer_list.
-    tbb::concurrent_vector<Type> c2({vec[0], vec[1], vec[2]});
-    std::copy(vec.begin() + 3, vec.end(), std::back_inserter(c2));
-    Examine<default_construction_present>(c2, vec);
+    tbb::concurrent_vector<Type> c2({vec[0],vec[1],vec[2]});
+    std::copy( vec.begin()+3, vec.end(), std::back_inserter(c2) );
+    Examine<default_construction_present>( c2, vec );
     // Copying constructor.
     tbb::concurrent_vector<Type> c3(c1);
-    Examine<default_construction_present>(c3, vec);
+    Examine<default_construction_present>( c3, vec );
     // Construct with non-default allocator
-    tbb::concurrent_vector<Type, std::allocator<Type>> c4;
-    std::copy(vec.begin(), vec.end(), std::back_inserter(c4));
-    Examine<default_construction_present>(c4, vec);
+    tbb::concurrent_vector< Type, std::allocator<Type> > c4;
+    std::copy( vec.begin(), vec.end(), std::back_inserter(c4) );
+    Examine<default_construction_present>( c4, vec );
     // Construction with initial size specified by argument n.
     do_default_construction_test<default_construction_present>()(test_default_construction<Type>(vec));
     // Construction with initial size specified by argument n, initialization by copying of t, and given allocator instance.
     std::allocator<Type> allocator;
-    tbb::concurrent_vector<Type, std::allocator<Type>> c9(vec.size(), vec[1], allocator);
-    Examine<default_construction_present>(c9, std::vector<Type>(vec.size(), vec[1]));
+    tbb::concurrent_vector< Type, std::allocator<Type> > c9(vec.size(), vec[1], allocator);
+    Examine<default_construction_present>( c9, std::vector<Type>(vec.size(), vec[1]) );
     // Construction with copying iteration range and given allocator instance.
-    tbb::concurrent_vector<Type, std::allocator<Type>> c10(c1.begin(), c1.end(), allocator);
-    Examine<default_construction_present>(c10, vec);
+    tbb::concurrent_vector< Type, std::allocator<Type> > c10(c1.begin(), c1.end(), allocator);
+    Examine<default_construction_present>( c10, vec );
     tbb::concurrent_vector<Type> c11(vec.begin(), vec.end());
-    Examine<default_construction_present>(c11, vec);
+    Examine<default_construction_present>( c11, vec );
 }
 
 void TestTypes() {
     const int NUMBER = 100;
 
     std::vector<int> intArr;
-    for (int i = 0; i < NUMBER; ++i) intArr.push_back(i);
-    TypeTester</*default_construction_present = */ true>(intArr);
+    for ( int i=0; i<NUMBER; ++i ) intArr.push_back(i);
+    TypeTester</*default_construction_present = */true>( intArr );
 
-    std::vector<std::reference_wrapper<int>> refArr;
+    std::vector< std::reference_wrapper<int> > refArr;
     // The constructor of std::reference_wrapper<T> from T& is explicit in some versions of libstdc++.
-    for (int i = 0; i < NUMBER; ++i) refArr.push_back(std::reference_wrapper<int>(intArr[i]));
-    TypeTester</*default_construction_present = */ false>(refArr);
+    for ( int i=0; i<NUMBER; ++i ) refArr.push_back( std::reference_wrapper<int>(intArr[i]) );
+    TypeTester</*default_construction_present = */false>( refArr );
 
     // std::vector< std::atomic<int> > tbbIntArr( NUMBER ); //TODO compilation error
     // for ( int i=0; i<NUMBER; ++i ) tbbIntArr[i] = i;
     // TypeTester</*default_construction_present = */true>( tbbIntArr );
 
-    std::vector<std::shared_ptr<int>> shrPtrArr;
-    for (int i = 0; i < NUMBER; ++i) shrPtrArr.push_back(std::make_shared<int>(i));
-    TypeTester</*default_construction_present = */ true>(shrPtrArr);
+    std::vector< std::shared_ptr<int> > shrPtrArr;
+    for ( int i=0; i<NUMBER; ++i ) shrPtrArr.push_back( std::make_shared<int>(i) );
+    TypeTester</*default_construction_present = */true>( shrPtrArr );
 
-    std::vector<std::weak_ptr<int>> wkPtrArr;
-    std::copy(shrPtrArr.begin(), shrPtrArr.end(), std::back_inserter(wkPtrArr));
-    TypeTester</*default_construction_present = */ true>(wkPtrArr);
+    std::vector< std::weak_ptr<int> > wkPtrArr;
+    std::copy( shrPtrArr.begin(), shrPtrArr.end(), std::back_inserter(wkPtrArr) );
+    TypeTester</*default_construction_present = */true>( wkPtrArr );
 }
 
 template <typename Vector>
-void test_grow_by_empty_range(Vector& v, typename Vector::value_type* range_begin_end) {
+void test_grow_by_empty_range( Vector &v, typename Vector::value_type* range_begin_end ) {
     const Vector v_copy = v;
-    REQUIRE_MESSAGE((v.grow_by(range_begin_end, range_begin_end) == v.end()),
-                    "grow_by(empty_range) returned a wrong iterator.");
-    REQUIRE_MESSAGE(v == v_copy, "grow_by(empty_range) has changed the vector.");
+    REQUIRE_MESSAGE( (v.grow_by( range_begin_end, range_begin_end ) == v.end()), "grow_by(empty_range) returned a wrong iterator." );
+    REQUIRE_MESSAGE( v == v_copy, "grow_by(empty_range) has changed the vector." );
 }
 
-void TestSerialGrowByRange(bool fragmented_vector) {
+void TestSerialGrowByRange( bool fragmented_vector ) {
     tbb::concurrent_vector<int> v;
-    if (fragmented_vector) { v.reserve(1); }
-    int init_range[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
-    REQUIRE_MESSAGE((v.grow_by(init_range, init_range + (utils::array_length(init_range))) == v.begin()),
-                    "grow_by(I,I) returned a wrong iterator.");
-    REQUIRE_MESSAGE(std::equal(v.begin(), v.end(), init_range),
-                    "grow_by(I,I) did not properly copied all elements ?");
-    test_grow_by_empty_range(v, init_range);
-    test_grow_by_empty_range(v, (int*) nullptr);
+    if ( fragmented_vector ) {
+        v.reserve( 1 );
+    }
+    int init_range[] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 };
+    REQUIRE_MESSAGE( (v.grow_by( init_range, init_range + (utils::array_length( init_range )) ) == v.begin()), "grow_by(I,I) returned a wrong iterator." );
+    REQUIRE_MESSAGE( std::equal( v.begin(), v.end(), init_range ), "grow_by(I,I) did not properly copied all elements ?" );
+    test_grow_by_empty_range( v, init_range );
+    test_grow_by_empty_range( v, (int*)nullptr );
 }
 
 template <typename allocator_type>
@@ -410,7 +405,7 @@ void TestConcurrentOperationsWithUnSafeOperations(std::size_t threads_number) {
     vector_type vector;
 
     constexpr std::size_t max_operations = 1000;
-    std::atomic<int> curr_unsafe_thread {-1};
+    std::atomic<int> curr_unsafe_thread{-1};
     // 0 - is safe operations
     // 1 - is shrink_to_fit
     // 2 - is clear + shrink_to_fit
@@ -423,7 +418,7 @@ void TestConcurrentOperationsWithUnSafeOperations(std::size_t threads_number) {
     }
 
     // Array of active threads
-    std::unique_ptr<std::atomic<int>[]> active_threads { new std::atomic<int>[threads_number]() };
+    std::unique_ptr<std::atomic<int>[]> active_threads{ new std::atomic<int>[threads_number]() };
     // If thread still have i < max_operations than in array will be false
     // When some thread finish it operation, set true in active_thread on thread_id position and start executing only safe operations
     // Than wait all threads
@@ -436,7 +431,7 @@ void TestConcurrentOperationsWithUnSafeOperations(std::size_t threads_number) {
     };
 
     // Need double synchronization to correct work
-    std::unique_ptr<std::atomic<int>[]> ready_threads { new std::atomic<int>[threads_number]() };
+    std::unique_ptr<std::atomic<int>[]> ready_threads{ new std::atomic<int>[threads_number]() };
     auto all_ready_leave = [&ready_threads, threads_number] {
         for (std::size_t i = 0; i < threads_number; ++i) {
             if (ready_threads[i].load(std::memory_order_relaxed) == 0) return false;
@@ -446,7 +441,8 @@ void TestConcurrentOperationsWithUnSafeOperations(std::size_t threads_number) {
 
     utils::SpinBarrier barrier(threads_number);
     auto concurrent_func = [&operations, &vector, &curr_unsafe_thread, &barrier, &all_done, &active_threads,
-                            &all_ready_leave, &ready_threads](std::size_t thread_id) {
+                            &all_ready_leave, &ready_threads] (std::size_t thread_id)
+    {
         std::vector<std::size_t> local_operations(operations);
         utils::FastRandom<> rand(thread_id);
         // std::shuffle doesn't work with msvc2017 and FastRandom
@@ -459,28 +455,34 @@ void TestConcurrentOperationsWithUnSafeOperations(std::size_t threads_number) {
         do {
             if (all_done()) ready_threads[thread_id] = 1;
             if (curr_unsafe_thread.load() != -1) {
-                // If lock taken, wait
-                // First wait unblock unsafe thread
-                // Second wait finish unsafe operations
-                barrier.wait();
-                barrier.wait();
+                    // If lock taken, wait
+                    // First wait unblock unsafe thread
+                    // Second wait finish unsafe operations
+                    barrier.wait();
+                    barrier.wait();
             }
             // Is safe operation
             if (active_threads[thread_id] == 1 || local_operations[i] == 0) {
                 // If lock is free, perform various operations
                 std::size_t random_operation = rand.get() % 3;
                 switch (random_operation) {
-                    case 0: {
-                        vector.push_back(1);
-                    } break;
-                    case 1: {
-                        std::size_t grow_size = rand.get() % 100;
-                        vector.grow_by(grow_size, 1);
-                    } break;
-                    case 2: {
-                        std::size_t grow_at_least_size = vector.size() + rand.get() % 100;
-                        vector.grow_to_at_least(grow_at_least_size, 1);
-                    } break;
+                    case 0:
+                        {
+                            vector.push_back(1);
+                        }
+                        break;
+                    case 1:
+                        {
+                            std::size_t grow_size = rand.get() % 100;
+                            vector.grow_by(grow_size, 1);
+                        }
+                        break;
+                    case 2:
+                        {
+                            std::size_t grow_at_least_size = vector.size() + rand.get() % 100;
+                            vector.grow_to_at_least(grow_at_least_size, 1);
+                        }
+                        break;
                 }
             } else {
                 int default_unsafe_thread = -1;
@@ -491,13 +493,17 @@ void TestConcurrentOperationsWithUnSafeOperations(std::size_t threads_number) {
                         case 1:
                             vector.shrink_to_fit();
                             break;
-                        case 2: {
-                            vector.clear();
-                            vector.shrink_to_fit();
-                        } break;
-                        case 3: {
-                            vector.resize(0);
-                        } break;
+                        case 2:
+                            {
+                                vector.clear();
+                                vector.shrink_to_fit();
+                            }
+                            break;
+                        case 3:
+                            {
+                                vector.resize(0);
+                            }
+                            break;
                     }
                     curr_unsafe_thread = -1;
                     barrier.wait();
@@ -516,34 +522,42 @@ void TestConcurrentOperationsWithUnSafeOperations(std::size_t threads_number) {
 
 template <typename RangeType>
 int reduce_vector(RangeType test_range) {
-    return tbb::parallel_reduce(
-            test_range, 0,
-            [](const RangeType& range, int sum) {
-                for (auto it = range.begin(); it != range.end(); ++it) { sum += *it; }
-
-                return sum;
-            },
-            [](const int& lhs, const int& rhs) { return lhs + rhs; });
+    return tbb::parallel_reduce(test_range, 0,
+        [] ( const RangeType& range, int sum ) {
+            for (auto it = range.begin(); it != range.end(); ++it) {
+                sum += *it;
+            }
+
+            return sum;
+        },
+        [] ( const int& lhs, const int& rhs) {
+            return lhs + rhs;
+        }
+    );
 }
 
 //! Test the grow_by on range
 //! \brief \ref interface \ref requirement
-TEST_CASE("testing serial grow_by range") {
-    TestSerialGrowByRange(/*fragmented_vector = */ false);
-    TestSerialGrowByRange(/*fragmented_vector = */ true);
+TEST_CASE("testing serial grow_by range"){
+    TestSerialGrowByRange(/*fragmented_vector = */false);
+    TestSerialGrowByRange(/*fragmented_vector = */true);
 }
 
 //! Test of push_back operation
 //! \brief \ref interface
-TEST_CASE("testing range based for support") { TestRangeBasedFor(); }
+TEST_CASE("testing range based for support"){
+    TestRangeBasedFor();
+}
 
 //! Test of work STL algorithms  with concurrent_vector iterator.
 //! \brief \ref interface
-TEST_CASE("testing sort") { TestSort(); }
+TEST_CASE("testing sort"){
+    TestSort();
+}
 
 //! Test concurrent_vector with vector types
 //! \brief \ref error_guessing
-TEST_CASE("testing concurrent_vector with vector types") {
+TEST_CASE("testing concurrent_vector with vector types"){
 #if HAVE_m128
     TestVectorTypes<ClassWithSSE>();
 #endif
@@ -554,15 +568,21 @@ TEST_CASE("testing concurrent_vector with vector types") {
 
 //! Test concurrent push_back operation
 //! \brief \ref error_guessing
-TEST_CASE("testing find primes") { TestFindPrimes(); }
+TEST_CASE("testing find primes"){
+    TestFindPrimes();
+}
 
 //! Test concurrent_vector with std::scoped_allocator_adaptor
 //! \brief \ref error_guessing
-TEST_CASE("test concurrent_vector with std::scoped_allocator_adaptor") { test_scoped_allocator(); }
+TEST_CASE("test concurrent_vector with std::scoped_allocator_adaptor") {
+    test_scoped_allocator();
+}
 
 //! Test type of vector
 //! \brief \ref requirement
-TEST_CASE("testing types") { TestTypes(); }
+TEST_CASE("testing types"){
+    TestTypes();
+}
 
 //! Test concurrent and unsafe operations
 //! \brief \ref regression \ref error_guessing
@@ -574,9 +594,9 @@ TEST_CASE("Work without hang") {
         allocator_type::init_counters();
         TestConcurrentOperationsWithUnSafeOperations<allocator_type>(threads);
 
-        REQUIRE(allocator_type::allocations == allocator_type::frees);
-        REQUIRE(allocator_type::items_allocated == allocator_type::items_freed);
-        REQUIRE(allocator_type::items_constructed == allocator_type::items_destroyed);
+        REQUIRE( allocator_type::allocations == allocator_type::frees );
+        REQUIRE( allocator_type::items_allocated == allocator_type::items_freed );
+        REQUIRE( allocator_type::items_constructed == allocator_type::items_destroyed );
     }
 }
 
@@ -595,9 +615,11 @@ TEST_CASE("Whitebox test for segment table extension") {
         allocator_type::set_limits(std::size_t(1) << (i + 1));
 
         try {
-            for (std::size_t j = 0; j < std::size_t(1) << i; ++j) { vector.push_back(1); }
+            for (std::size_t j = 0; j < std::size_t(1) << i; ++j) {
+                vector.push_back(1);
+            }
             vector.grow_by(1000);
-        } catch (std::bad_alloc&) {
+        } catch (std::bad_alloc& ) {
             allocator_type::set_limits();
             vector_type copy_of_vector(vector);
             vector_type copy_of_copy(copy_of_vector);
@@ -617,34 +639,28 @@ TEST_CASE("Test exception in constructors") {
 
     allocator_type::set_limits(1);
 
-    REQUIRE_THROWS_AS(
-            [] {
-                vector_type vec1(42, 42.);
-                utils::suppress_unused_warning(vec1);
-            }(),
-            const std::bad_alloc);
-
-    auto list = {42., 42., 42., 42., 42., 42., 42., 42., 42., 42.};
-    REQUIRE_THROWS_AS(
-            [&] {
-                vector_type vec2(list.begin(), list.end());
-                utils::suppress_unused_warning(vec2);
-            }(),
-            const std::bad_alloc);
+    REQUIRE_THROWS_AS( [] {
+        vector_type vec1(42, 42.);
+        utils::suppress_unused_warning(vec1);
+    }(), const std::bad_alloc);
+
+    auto list = { 42., 42., 42., 42., 42., 42., 42., 42., 42., 42. };
+    REQUIRE_THROWS_AS( [&] {
+        vector_type vec2(list.begin(), list.end());
+        utils::suppress_unused_warning(vec2);
+    }(), const std::bad_alloc);
 
     allocator_type::init_counters();
     allocator_type::set_limits(0);
     vector_type src_vec(42, 42.);
     allocator_type::set_limits(1);
 
-    REQUIRE_THROWS_AS(
-            [&] {
-                vector_type vec3(src_vec, allocator_type {});
-                utils::suppress_unused_warning(vec3);
-            }(),
-            const std::bad_alloc);
+    REQUIRE_THROWS_AS( [&] {
+        vector_type vec3(src_vec, allocator_type{});
+        utils::suppress_unused_warning(vec3);
+    }(), const std::bad_alloc);
 }
-#endif// TBB_USE_EXCEPTIONS
+#endif // TBB_USE_EXCEPTIONS
 
 //! \brief \ref regression \ref error_guessing
 TEST_CASE("Reducing concurrent_vector") {
@@ -656,12 +672,13 @@ TEST_CASE("Reducing concurrent_vector") {
     CHECK(reduce_vector(cvec.range()) == final_sum);
 }
 
+
 //! \brief \ref error_guessing
-TEST_CASE("swap with not always equal allocators") {
+TEST_CASE("swap with not always equal allocators"){
     using allocator_type = NotAlwaysEqualAllocator<int>;
     using vector_type = tbb::concurrent_vector<int, allocator_type>;
 
-    vector_type vec1 {};
+    vector_type vec1{};
     vector_type vec2(42, 42);
 
     swap(vec1, vec2);
@@ -676,15 +693,36 @@ TEST_CASE("swap with not always equal allocators") {
 // or fail with the assertion in debug mode.
 //! \brief \ref regression
 TEST_CASE("Testing vector in a highly concurrent environment") {
-    for (std::size_t i = 0; i < 10000; ++i) {
-        tbb::concurrent_vector<int> test_vec;
-
-        tbb::parallel_for(
-                tbb::blocked_range<std::size_t>(0, 10000),
-                [&](const tbb::blocked_range<std::size_t>&) { test_vec.grow_by(1); },
-                tbb::static_partitioner {});
+    std::uniform_int_distribution<> uniform_dist(1, 32); // grow by from 1 to 32 randomly
+    std::mt19937_64 gen(/*seed*/1); // Constructing with seed to have reproducible results
+    constexpr int num_repeats = 10000, num_inserts = 256;
+    std::vector<int> grow_by_vals(num_inserts);
+
+    for (int i = 0; i < num_repeats; ++i) {
+        int expected_size = 0, expected_sum = 0;
+        std::generate(grow_by_vals.begin(), grow_by_vals.end(),
+                      [&gen, &uniform_dist, &expected_size, &expected_sum]() {
+                          const int random_value = uniform_dist(gen);
+                          expected_size += random_value;
+                          expected_sum += random_value * random_value;
+                          return random_value;
+                      });
 
-        REQUIRE(test_vec.size() == utils::get_platform_max_threads());
+        tbb::concurrent_vector<int> test_vec;
+        tbb::parallel_for(0, num_inserts, [&] (int j) {
+            tbb::concurrent_vector<int>::iterator start_it = test_vec.grow_by(grow_by_vals[j]);
+            tbb::concurrent_vector<int>::iterator end_it = start_it + grow_by_vals[j];
+            do {
+                *start_it = grow_by_vals[j];
+            } while (++start_it != end_it);
+        });
+
+        REQUIRE(test_vec.size() == expected_size);
+        int actual_sum = 0;
+        for (int j = 0; j < expected_size; ++j) {
+            actual_sum += test_vec[j];
+        }
+        REQUIRE(expected_sum == actual_sum);
     }
 }
 
@@ -694,4 +732,44 @@ TEST_CASE("container_range concept for concurrent_vector ranges") {
     static_assert(test_concepts::container_range<typename tbb::concurrent_vector<int>::range_type>);
     static_assert(test_concepts::container_range<typename tbb::concurrent_vector<int>::const_range_type>);
 }
-#endif// __TBB_CPP20_CONCEPTS_PRESENT
+#endif // __TBB_CPP20_CONCEPTS_PRESENT
+
+// There was a bug in concurrent_vector that was reproduced when resize marked
+// segment (that owned by my_first_block) as deleted and
+// on segment allocation thread is stuck waiting this segment to be published by other thread that allocated first block.
+//! Testing resize behavior for case when new size lesser than old size.
+//! \brief \ref regression
+TEST_CASE("testing resize on sequantual mode") {
+    tbb::concurrent_vector<int> v;
+
+    v.resize(382);
+    CHECK(v.size() == 382);
+    while (v.size() < 737) {
+        v.emplace_back();
+    }
+    CHECK(v.size() == 737);
+
+    v.resize(27);
+    CHECK(v.size() == 27);
+    while (v.size() < 737) {
+        v.emplace_back();
+    }
+    CHECK(v.size() == 737);
+
+    v.resize(1);
+    CHECK(v.size() == 1);
+    while (v.size() < 40) {
+        v.emplace_back();
+    }
+    CHECK(v.size() == 40);
+
+    v.resize(2222);
+    CHECK(v.size() == 2222);
+    while (v.size() < 4444) {
+        v.emplace_back();
+    }
+    CHECK(v.size() == 4444);
+
+    v.clear();
+    CHECK(v.size() == 0);
+}
diff --git a/external/tbb/test/tbb/test_continue_node.cpp b/external/tbb/test/tbb/test_continue_node.cpp
index 1b4f44ae..1cfea3df 100644
--- a/external/tbb/test/tbb/test_continue_node.cpp
+++ b/external/tbb/test/tbb/test_continue_node.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -18,170 +18,187 @@
 
 #include "tbb/flow_graph.h"
 
-#include "common/concepts_common.h"
-#include "common/graph_utils.h"
 #include "common/test.h"
-#include "common/test_follows_and_precedes_api.h"
 #include "common/utils.h"
+#include "common/graph_utils.h"
+#include "common/test_follows_and_precedes_api.h"
+#include "common/concepts_common.h"
+
 
 //! \file test_continue_node.cpp
 //! \brief Test for [flow_graph.continue_node] specification
 
+
 #define N 1000
 #define MAX_NODES 4
 #define C 8
 
 // A class to use as a fake predecessor of continue_node
-struct fake_continue_sender : public tbb::flow::sender<tbb::flow::continue_msg> {
+struct fake_continue_sender : public tbb::flow::sender<tbb::flow::continue_msg>
+{
     typedef tbb::flow::sender<tbb::flow::continue_msg>::successor_type successor_type;
     // Define implementations of virtual methods that are abstract in the base class
-    bool register_successor(successor_type&) override { return false; }
-    bool remove_successor(successor_type&) override { return false; }
+    bool register_successor( successor_type& ) override { return false; }
+    bool remove_successor( successor_type& )   override { return false; }
 };
 
-template <typename InputType>
+template< typename InputType >
 struct parallel_puts {
 
-    tbb::flow::receiver<InputType>* const my_exe_node;
+    tbb::flow::receiver< InputType > * const my_exe_node;
 
-    parallel_puts(tbb::flow::receiver<InputType>& exe_node) : my_exe_node(&exe_node) {}
+    parallel_puts( tbb::flow::receiver< InputType > &exe_node ) : my_exe_node(&exe_node) {}
     parallel_puts& operator=(const parallel_puts&) = delete;
 
-    void operator()(int) const {
-        for (int i = 0; i < N; ++i) {
+    void operator()( int ) const  {
+        for ( int i = 0; i < N; ++i ) {
             // the nodes will accept all puts
-            CHECK_MESSAGE(my_exe_node->try_put(InputType()) == true, "");
+            CHECK_MESSAGE( my_exe_node->try_put( InputType() ) == true, "" );
         }
     }
+
 };
 
-template <typename OutputType>
-void run_continue_nodes(int p, tbb::flow::graph& g, tbb::flow::continue_node<OutputType>& n) {
+template< typename OutputType >
+void run_continue_nodes( int p, tbb::flow::graph& g, tbb::flow::continue_node< OutputType >& n ) {
     fake_continue_sender fake_sender;
-    for (size_t i = 0; i < N; ++i) { tbb::detail::d1::register_predecessor(n, fake_sender); }
+    for (size_t i = 0; i < N; ++i) {
+        tbb::detail::d2::register_predecessor(n, fake_sender);
+    }
 
-    for (size_t num_receivers = 1; num_receivers <= MAX_NODES; ++num_receivers) {
-        std::vector<std::shared_ptr<harness_counting_receiver<OutputType>>> receivers;
+    for (size_t num_receivers = 1; num_receivers <= MAX_NODES; ++num_receivers ) {
+        std::vector< std::shared_ptr<harness_counting_receiver<OutputType>> > receivers;
         for (size_t i = 0; i < num_receivers; ++i) {
-            receivers.push_back(std::make_shared<harness_counting_receiver<OutputType>>(g));
+            receivers.push_back( std::make_shared<harness_counting_receiver<OutputType>>(g) );
         }
         harness_graph_executor<tbb::flow::continue_msg, OutputType>::execute_count = 0;
 
-        for (size_t r = 0; r < num_receivers; ++r) { tbb::flow::make_edge(n, *receivers[r]); }
+        for (size_t r = 0; r < num_receivers; ++r ) {
+            tbb::flow::make_edge( n, *receivers[r] );
+        }
 
-        utils::NativeParallelFor(p, parallel_puts<tbb::flow::continue_msg>(n));
+        utils::NativeParallelFor( p, parallel_puts<tbb::flow::continue_msg>(n) );
         g.wait_for_all();
 
         // 2) the nodes will receive puts from multiple predecessors simultaneously,
         size_t ec = harness_graph_executor<tbb::flow::continue_msg, OutputType>::execute_count;
-        CHECK_MESSAGE((int) ec == p, "");
-        for (size_t r = 0; r < num_receivers; ++r) {
+        CHECK_MESSAGE( (int)ec == p, "" );
+        for (size_t r = 0; r < num_receivers; ++r ) {
             size_t c = receivers[r]->my_count;
             // 3) the nodes will send to multiple successors.
-            CHECK_MESSAGE((int) c == p, "");
+            CHECK_MESSAGE( (int)c == p, "" );
         }
 
-        for (size_t r = 0; r < num_receivers; ++r) { tbb::flow::remove_edge(n, *receivers[r]); }
+        for (size_t r = 0; r < num_receivers; ++r ) {
+            tbb::flow::remove_edge( n, *receivers[r] );
+        }
     }
 }
 
-template <typename OutputType, typename Body>
-void continue_nodes(Body body) {
-    for (int p = 1; p < 2 * 4 /*MaxThread*/; ++p) {
+template< typename OutputType, typename Body >
+void continue_nodes( Body body ) {
+    for (int p = 1; p < 2*4/*MaxThread*/; ++p) {
         tbb::flow::graph g;
-        tbb::flow::continue_node<OutputType> exe_node(g, body);
-        run_continue_nodes(p, g, exe_node);
+        tbb::flow::continue_node< OutputType > exe_node( g, body );
+        run_continue_nodes( p, g, exe_node);
         exe_node.try_put(tbb::flow::continue_msg());
-        tbb::flow::continue_node<OutputType> exe_node_copy(exe_node);
-        run_continue_nodes(p, g, exe_node_copy);
+        tbb::flow::continue_node< OutputType > exe_node_copy( exe_node );
+        run_continue_nodes( p, g, exe_node_copy);
     }
 }
 
 const size_t Offset = 123;
 std::atomic<size_t> global_execute_count;
 
-template <typename OutputType>
+template< typename OutputType >
 struct inc_functor {
 
     std::atomic<size_t> local_execute_count;
-    inc_functor() { local_execute_count = 0; }
-    inc_functor(const inc_functor& f) { local_execute_count = size_t(f.local_execute_count); }
-    void operator=(const inc_functor& f) { local_execute_count = size_t(f.local_execute_count); }
-
-    OutputType operator()(tbb::flow::continue_msg) {
-        ++global_execute_count;
-        ++local_execute_count;
-        return OutputType();
+    inc_functor( ) { local_execute_count = 0; }
+    inc_functor( const inc_functor &f ) { local_execute_count = size_t(f.local_execute_count); }
+    void operator=(const inc_functor &f) { local_execute_count = size_t(f.local_execute_count); }
+
+    OutputType operator()( tbb::flow::continue_msg ) {
+       ++global_execute_count;
+       ++local_execute_count;
+       return OutputType();
     }
+
 };
 
-template <typename OutputType>
-void continue_nodes_with_copy() {
+template< typename OutputType >
+void continue_nodes_with_copy( ) {
 
-    for (int p = 1; p < 2 * 4 /*MaxThread*/; ++p) {
+    for (int p = 1; p < 2*4/*MaxThread*/; ++p) {
         tbb::flow::graph g;
         inc_functor<OutputType> cf;
         cf.local_execute_count = Offset;
         global_execute_count = Offset;
 
-        tbb::flow::continue_node<OutputType> exe_node(g, cf);
+        tbb::flow::continue_node< OutputType > exe_node( g, cf );
         fake_continue_sender fake_sender;
-        for (size_t i = 0; i < N; ++i) { tbb::detail::d1::register_predecessor(exe_node, fake_sender); }
+        for (size_t i = 0; i < N; ++i) {
+            tbb::detail::d2::register_predecessor(exe_node, fake_sender);
+        }
 
-        for (size_t num_receivers = 1; num_receivers <= MAX_NODES; ++num_receivers) {
-            std::vector<std::shared_ptr<harness_counting_receiver<OutputType>>> receivers;
+        for (size_t num_receivers = 1; num_receivers <= MAX_NODES; ++num_receivers ) {
+            std::vector< std::shared_ptr<harness_counting_receiver<OutputType>> > receivers;
             for (size_t i = 0; i < num_receivers; ++i) {
-                receivers.push_back(std::make_shared<harness_counting_receiver<OutputType>>(g));
+                receivers.push_back( std::make_shared<harness_counting_receiver<OutputType>>(g) );
             }
 
-            for (size_t r = 0; r < num_receivers; ++r) { tbb::flow::make_edge(exe_node, *receivers[r]); }
+            for (size_t r = 0; r < num_receivers; ++r ) {
+                tbb::flow::make_edge( exe_node, *receivers[r] );
+            }
 
-            utils::NativeParallelFor(p, parallel_puts<tbb::flow::continue_msg>(exe_node));
+            utils::NativeParallelFor( p, parallel_puts<tbb::flow::continue_msg>(exe_node) );
             g.wait_for_all();
 
             // 2) the nodes will receive puts from multiple predecessors simultaneously,
-            for (size_t r = 0; r < num_receivers; ++r) {
+            for (size_t r = 0; r < num_receivers; ++r ) {
                 size_t c = receivers[r]->my_count;
                 // 3) the nodes will send to multiple successors.
-                CHECK_MESSAGE((int) c == p, "");
+                CHECK_MESSAGE( (int)c == p, "" );
+            }
+            for (size_t r = 0; r < num_receivers; ++r ) {
+                tbb::flow::remove_edge( exe_node, *receivers[r] );
             }
-            for (size_t r = 0; r < num_receivers; ++r) { tbb::flow::remove_edge(exe_node, *receivers[r]); }
         }
 
         // validate that the local body matches the global execute_count and both are correct
-        inc_functor<OutputType> body_copy = tbb::flow::copy_body<inc_functor<OutputType>>(exe_node);
-        const size_t expected_count = p * MAX_NODES + Offset;
+        inc_functor<OutputType> body_copy = tbb::flow::copy_body< inc_functor<OutputType> >( exe_node );
+        const size_t expected_count = p*MAX_NODES + Offset;
         size_t global_count = global_execute_count;
         size_t inc_count = body_copy.local_execute_count;
-        CHECK_MESSAGE(global_count == expected_count, "");
-        CHECK_MESSAGE(global_count == inc_count, "");
+        CHECK_MESSAGE( global_count == expected_count, "" );
+        CHECK_MESSAGE( global_count == inc_count, "" );
         g.reset(tbb::flow::rf_reset_bodies);
-        body_copy = tbb::flow::copy_body<inc_functor<OutputType>>(exe_node);
+        body_copy = tbb::flow::copy_body< inc_functor<OutputType> >( exe_node );
         inc_count = body_copy.local_execute_count;
-        CHECK_MESSAGE((Offset == inc_count), "reset(rf_reset_bodies) did not reset functor");
+        CHECK_MESSAGE( ( Offset == inc_count), "reset(rf_reset_bodies) did not reset functor" );
+
     }
 }
 
-template <typename OutputType>
+template< typename OutputType >
 void run_continue_nodes() {
-    harness_graph_executor<tbb::flow::continue_msg, OutputType>::max_executors = 0;
-    continue_nodes<OutputType>([](tbb::flow::continue_msg i) -> OutputType {
-        return harness_graph_executor<tbb::flow::continue_msg, OutputType>::func(i);
-    });
-    continue_nodes<OutputType>(&harness_graph_executor<tbb::flow::continue_msg, OutputType>::func);
-    continue_nodes<OutputType>(
-            typename harness_graph_executor<tbb::flow::continue_msg, OutputType>::functor());
+    harness_graph_executor< tbb::flow::continue_msg, OutputType>::max_executors = 0;
+    continue_nodes<OutputType>( []( tbb::flow::continue_msg i ) -> OutputType { return harness_graph_executor<tbb::flow::continue_msg, OutputType>::func(i); } );
+    continue_nodes<OutputType>( &harness_graph_executor<tbb::flow::continue_msg, OutputType>::func );
+    continue_nodes<OutputType>( typename harness_graph_executor<tbb::flow::continue_msg, OutputType>::functor() );
     continue_nodes_with_copy<OutputType>();
 }
 
 //! Tests limited concurrency cases for nodes that accept data messages
 void test_concurrency(int num_threads) {
     tbb::task_arena arena(num_threads);
-    arena.execute([&] {
-        run_continue_nodes<tbb::flow::continue_msg>();
-        run_continue_nodes<int>();
-        run_continue_nodes<utils::NoAssign>();
-    });
+    arena.execute(
+        [&] {
+            run_continue_nodes<tbb::flow::continue_msg>();
+            run_continue_nodes<int>();
+            run_continue_nodes<utils::NoAssign>();
+        }
+    );
 }
 /*
  * Connection of two graphs is not currently supported, but works to some limited extent.
@@ -193,12 +210,12 @@ using namespace tbb::flow;
 
 struct add_to_counter {
     int* counter;
-    add_to_counter(int& var) : counter(&var) {}
-    void operator()(continue_msg) { *counter += 1; }
+    add_to_counter(int& var):counter(&var){}
+    void operator()(continue_msg){*counter+=1;}
 };
 
-void test_two_graphs() {
-    int count = 0;
+void test_two_graphs(){
+    int count=0;
 
     //graph g with broadcast_node and continue_node
     graph g;
@@ -210,42 +227,46 @@ void test_two_graphs() {
     broadcast_node<continue_msg> start_h(h);
 
     //making two edges to first_g from the two graphs
-    make_edge(start_g, first_g);
+    make_edge(start_g,first_g);
     make_edge(start_h, first_g);
 
     //two try_puts from the two graphs
     start_g.try_put(continue_msg());
     start_h.try_put(continue_msg());
     g.wait_for_all();
-    CHECK_MESSAGE((count == 1), "Not all continue messages received");
+    CHECK_MESSAGE( (count==1), "Not all continue messages received");
 
     //two try_puts from the graph that doesn't contain the node
-    count = 0;
+    count=0;
     start_h.try_put(continue_msg());
     start_h.try_put(continue_msg());
     g.wait_for_all();
-    CHECK_MESSAGE((count == 1), "Not all continue messages received -1");
+    CHECK_MESSAGE( (count==1), "Not all continue messages received -1");
 
     //only one try_put
-    count = 0;
+    count=0;
     start_g.try_put(continue_msg());
     g.wait_for_all();
-    CHECK_MESSAGE((count == 0), "Node executed without waiting for all predecessors");
+    CHECK_MESSAGE( (count==0), "Node executed without waiting for all predecessors");
 }
 
 struct lightweight_policy_body {
     const std::thread::id my_thread_id;
     std::atomic<size_t>& my_count;
 
-    lightweight_policy_body(std::atomic<size_t>& count)
-        : my_thread_id(std::this_thread::get_id()), my_count(count) {
+    lightweight_policy_body( std::atomic<size_t>& count )
+        : my_thread_id(std::this_thread::get_id()), my_count(count)
+    {
         my_count = 0;
     }
-    lightweight_policy_body& operator=(const lightweight_policy_body&) = delete;
-    void operator()(tbb::flow::continue_msg) {
+
+    lightweight_policy_body( const lightweight_policy_body& ) = default;
+    lightweight_policy_body& operator=( const lightweight_policy_body& ) = delete;
+
+    void operator()( tbb::flow::continue_msg ) {
         ++my_count;
         std::thread::id body_thread_id = std::this_thread::get_id();
-        CHECK_MESSAGE((body_thread_id == my_thread_id), "Body executed as not lightweight");
+        CHECK_MESSAGE( (body_thread_id == my_thread_id), "Body executed as not lightweight");
     }
 };
 
@@ -253,20 +274,22 @@ void test_lightweight_policy() {
     tbb::flow::graph g;
     std::atomic<size_t> count1;
     std::atomic<size_t> count2;
-    tbb::flow::continue_node<tbb::flow::continue_msg, tbb::flow::lightweight> node1(
-            g, lightweight_policy_body(count1));
-    tbb::flow::continue_node<tbb::flow::continue_msg, tbb::flow::lightweight> node2(
-            g, lightweight_policy_body(count2));
+    tbb::flow::continue_node<tbb::flow::continue_msg, tbb::flow::lightweight>
+        node1(g, lightweight_policy_body(count1));
+    tbb::flow::continue_node<tbb::flow::continue_msg, tbb::flow::lightweight>
+        node2(g, lightweight_policy_body(count2));
 
     tbb::flow::make_edge(node1, node2);
     const size_t n = 10;
-    for (size_t i = 0; i < n; ++i) { node1.try_put(tbb::flow::continue_msg()); }
+    for(size_t i = 0; i < n; ++i) {
+        node1.try_put(tbb::flow::continue_msg());
+    }
     g.wait_for_all();
 
     lightweight_policy_body body1 = tbb::flow::copy_body<lightweight_policy_body>(node1);
     lightweight_policy_body body2 = tbb::flow::copy_body<lightweight_policy_body>(node2);
-    CHECK_MESSAGE((body1.my_count == n), "Body of the first node needs to be executed N times");
-    CHECK_MESSAGE((body2.my_count == n), "Body of the second node needs to be executed N times");
+    CHECK_MESSAGE( (body1.my_count == n), "Body of the first node needs to be executed N times");
+    CHECK_MESSAGE( (body2.my_count == n), "Body of the second node needs to be executed N times");
 }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
@@ -275,23 +298,27 @@ void test_lightweight_policy() {
 void test_follows_and_precedes_api() {
     using msg_t = tbb::flow::continue_msg;
 
-    std::array<msg_t, 3> messages_for_follows = {{msg_t(), msg_t(), msg_t()}};
-    std::vector<msg_t> messages_for_precedes = {msg_t()};
+    std::array<msg_t, 3> messages_for_follows = { { msg_t(), msg_t(), msg_t() } };
+    std::vector<msg_t> messages_for_precedes  = { msg_t() };
 
     auto pass_through = [](const msg_t& msg) { return msg; };
 
-    follows_and_precedes_testing::test_follows<msg_t, tbb::flow::continue_node<msg_t>>(
-            messages_for_follows, pass_through, node_priority_t(0));
+    follows_and_precedes_testing::test_follows
+        <msg_t, tbb::flow::continue_node<msg_t>>
+        (messages_for_follows, pass_through, node_priority_t(0));
 
-    follows_and_precedes_testing::test_precedes<msg_t, tbb::flow::continue_node<msg_t>>(
-            messages_for_precedes, /* number_of_predecessors = */ 0, pass_through, node_priority_t(1));
+    follows_and_precedes_testing::test_precedes
+        <msg_t, tbb::flow::continue_node<msg_t>>
+        (messages_for_precedes, /* number_of_predecessors = */0, pass_through, node_priority_t(1));
 }
-#endif// __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+#endif // __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 
 // TODO: use pass_through from test_function_node instead
-template <typename T>
+template<typename T>
 struct passing_body {
-    T operator()(const T& val) { return val; }
+    T operator()(const T& val) {
+        return val;
+    }
 };
 
 /*
@@ -327,10 +354,182 @@ void test_successor_cache_specialization() {
                   "Wrong number of messages is passed via continue_node");
 }
 
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+void test_try_put_and_wait_default() {
+    tbb::task_arena arena(1);
+
+    arena.execute([&]{
+        tbb::flow::graph g;
+
+        int processed_items = 0;
+
+        tbb::flow::continue_node<tbb::flow::continue_msg>* start_node = nullptr;
+
+        tbb::flow::continue_node<tbb::flow::continue_msg> cont(g,
+            [&](tbb::flow::continue_msg) noexcept {
+                static bool put_ten_msgs = true;
+                if (put_ten_msgs) {
+                    for (std::size_t i = 0; i < 10; ++i) {
+                        start_node->try_put(tbb::flow::continue_msg{});
+                    }
+                    put_ten_msgs = false;
+                }
+            });
+
+        start_node = &cont;
+
+        tbb::flow::continue_node<tbb::flow::continue_msg, tbb::flow::lightweight> writer(g,
+            [&](tbb::flow::continue_msg) noexcept {
+                ++processed_items;
+            });
+
+        tbb::flow::make_edge(cont, writer);
+
+        cont.try_put_and_wait(tbb::flow::continue_msg{});
+
+        // Only 1 item should be processed, with the additional 10 items having been spawned
+        CHECK_MESSAGE(processed_items == 1, "Unexpected items processing");
+
+        g.wait_for_all();
+
+        // The additional 10 items should be processed
+        CHECK_MESSAGE(processed_items == 11, "Unexpected items processing");
+    });
+}
+
+void test_try_put_and_wait_lightweight() {
+    tbb::task_arena arena(1);
+
+    arena.execute([&]{
+        tbb::flow::graph g;
+
+        std::vector<int> start_work_items;
+        std::vector<int> processed_items;
+        std::vector<int> new_work_items;
+
+        int wait_message = 10;
+
+        for (int i = 0; i < wait_message; ++i) {
+            start_work_items.emplace_back(i);
+            new_work_items.emplace_back(i + 1 + wait_message);
+        }
+
+        tbb::flow::continue_node<int, tbb::flow::lightweight>* start_node = nullptr;
+
+        tbb::flow::continue_node<int, tbb::flow::lightweight> cont(g,
+            [&](tbb::flow::continue_msg) noexcept {
+                static int counter = 0;
+                int i = counter++;
+                if (i == wait_message) {
+                    for (auto item : new_work_items) {
+                        (void)item;
+                        start_node->try_put(tbb::flow::continue_msg{});
+                    }
+                }
+                return i;
+            });
+
+        start_node = &cont;
+
+        tbb::flow::function_node<int, int, tbb::flow::lightweight> writer(g, tbb::flow::unlimited,
+            [&](int input) noexcept {
+                processed_items.emplace_back(input);
+                return 0;
+            });
+
+        tbb::flow::make_edge(cont, writer);
+
+        for (auto item : start_work_items) {
+            (void)item;
+            cont.try_put(tbb::flow::continue_msg{});
+        }
+
+        cont.try_put_and_wait(tbb::flow::continue_msg{});
+
+        CHECK_MESSAGE(processed_items.size() == start_work_items.size() + new_work_items.size() + 1,
+                      "Unexpected number of elements processed");
+
+        std::size_t check_index = 0;
+
+        // For lightweight continue_node, start_work_items are expected to be processed first
+        // while putting items into the first node
+        for (auto item : start_work_items) {
+            CHECK_MESSAGE(processed_items[check_index++] == item, "Unexpected items processing");
+        }
+
+        for (auto item : new_work_items) {
+            CHECK_MESSAGE(processed_items[check_index++] == item, "Unexpected items processing");
+        }
+        // wait_message would be processed only after new_work_items
+        CHECK_MESSAGE(processed_items[check_index++] == wait_message, "Unexpected items processing");
+
+        g.wait_for_all();
+
+        CHECK(check_index == processed_items.size());
+    });
+}
+
+void test_metainfo_buffering() {
+    tbb::task_arena arena(1);
+
+    arena.execute([&] {
+        tbb::flow::graph g;
+
+        std::vector<char> call_order;
+
+        tbb::flow::continue_node<tbb::flow::continue_msg>* b_ptr = nullptr;
+
+        tbb::flow::continue_node<tbb::flow::continue_msg> a(g,
+            [&](tbb::flow::continue_msg) noexcept {
+                call_order.push_back('A');
+                static std::once_flag flag; // Send a signal to B only in the first call
+                std::call_once(flag, [&]{ b_ptr->try_put(tbb::flow::continue_msg{}); });
+            });
+
+        tbb::flow::continue_node<tbb::flow::continue_msg> b(g,
+            [&](tbb::flow::continue_msg) noexcept {
+                call_order.push_back('B');
+                a.try_put(tbb::flow::continue_msg{});
+            });
+
+        b_ptr = &b;
+
+        tbb::flow::continue_node<tbb::flow::continue_msg, tbb::flow::lightweight> c(g,
+            [&](tbb::flow::continue_msg) noexcept {
+                call_order.push_back('C');
+            });
+
+        tbb::flow::make_edge(a, c);
+        tbb::flow::make_edge(b, c);
+
+        a.try_put_and_wait(tbb::flow::continue_msg{});
+
+        // Inside the first call of A, we send a signal to B.
+        // Both of them send signals to C. Since C lightweight, it is processed immediately
+        // upon receiving signals from both predecessors. This completes the wait.
+        CHECK(call_order == std::vector<char>{'A', 'B', 'C'});
+
+        g.wait_for_all();
+
+        // B previously sent a signal to A, which has now been processed.
+        // A sends a signal to C, which is not processed because no signal is received from B this time.
+        CHECK(call_order == std::vector<char>{'A', 'B', 'C', 'A'});
+    });
+}
+
+void test_try_put_and_wait() {
+    test_try_put_and_wait_default();
+    test_try_put_and_wait_lightweight();
+    test_metainfo_buffering();
+}
+#endif // __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+
 //! Test concurrent continue_node for correctness
 //! \brief \ref error_guessing
 TEST_CASE("Concurrency testing") {
-    for (unsigned p = utils::MinThread; p <= utils::MaxThread; ++p) { test_concurrency(p); }
+    for( unsigned p=utils::MinThread; p<=utils::MaxThread; ++p ) {
+        test_concurrency(p);
+    }
 }
 
 //! Test concurrent continue_node in separate graphs
@@ -339,17 +538,19 @@ TEST_CASE("Two graphs") { test_two_graphs(); }
 
 //! Test basic behaviour with lightweight body
 //! \brief \ref requirement \ref error_guessing
-TEST_CASE("Lightweight policy") { test_lightweight_policy(); }
+TEST_CASE( "Lightweight policy" ) { test_lightweight_policy(); }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-//! Test deprecated follows and preceedes API
+//! Test deprecated follows and precedes API
 //! \brief \ref error_guessing
-TEST_CASE("Support for follows and precedes API") { test_follows_and_precedes_api(); }
+TEST_CASE( "Support for follows and precedes API" ) { test_follows_and_precedes_api(); }
 #endif
 
 //! Test for successor cache specialization
 //! \brief \ref regression
-TEST_CASE("Regression for successor cache specialization") { test_successor_cache_specialization(); }
+TEST_CASE( "Regression for successor cache specialization" ) {
+    test_successor_cache_specialization();
+}
 
 #if __TBB_CPP20_CONCEPTS_PRESENT
 //! \brief \ref error_guessing
@@ -359,9 +560,9 @@ TEST_CASE("constraints for continue_node input") {
 }
 
 template <typename Input, typename Body>
-concept can_call_continue_node_ctor
-        = requires(tbb::flow::graph& graph, Body body, tbb::flow::buffer_node<int>& f, std::size_t num,
-                   tbb::flow::node_priority_t priority) {
+concept can_call_continue_node_ctor = requires( tbb::flow::graph& graph, Body body,
+                                                tbb::flow::buffer_node<int>& f, std::size_t num,
+                                                tbb::flow::node_priority_t priority  ) {
     tbb::flow::continue_node<Input>(graph, body);
     tbb::flow::continue_node<Input>(graph, body, priority);
     tbb::flow::continue_node<Input>(graph, num, body);
@@ -371,7 +572,7 @@ concept can_call_continue_node_ctor
     tbb::flow::continue_node<Input>(tbb::flow::follows(f), body, priority);
     tbb::flow::continue_node<Input>(tbb::flow::follows(f), num, body);
     tbb::flow::continue_node<Input>(tbb::flow::follows(f), num, body, priority);
-#endif// __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+#endif // __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 };
 
 //! \brief \ref error_guessing
@@ -386,4 +587,11 @@ TEST_CASE("constraints for continue_node body") {
     static_assert(!can_call_continue_node_ctor<output_type, WrongInputOperatorRoundBrackets<output_type>>);
     static_assert(!can_call_continue_node_ctor<output_type, WrongReturnOperatorRoundBrackets<output_type>>);
 }
-#endif// __TBB_CPP20_CONCEPTS_PRESENT
+#endif // __TBB_CPP20_CONCEPTS_PRESENT
+
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+//! \brief \ref error_guessing
+TEST_CASE("test continue_node try_put_and_wait") {
+    test_try_put_and_wait();
+}
+#endif
diff --git a/external/tbb/test/tbb/test_dynamic_link.cpp b/external/tbb/test/tbb/test_dynamic_link.cpp
index 0744342c..3372eb72 100644
--- a/external/tbb/test/tbb/test_dynamic_link.cpp
+++ b/external/tbb/test/tbb/test_dynamic_link.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -23,12 +23,15 @@
 
 #include "common/test.h"
 
-enum FOO_TYPE { FOO_DUMMY, FOO_IMPLEMENTATION };
+enum FOO_TYPE {
+    FOO_DUMMY,
+    FOO_IMPLEMENTATION
+};
 
 #if _WIN32 || _WIN64
 #define TEST_EXPORT
 #else
-#define TEST_EXPORT extern "C"
+#define TEST_EXPORT extern "C" __TBB_EXPORT
 #endif /* _WIN32 || _WIN64 */
 
 // foo "implementations".
@@ -51,23 +54,23 @@ static FOO_TYPE (*foo1_handler)() = &dummy_foo1;
 static FOO_TYPE (*foo2_handler)() = &dummy_foo2;
 
 // Table describing how to link the handlers.
-static const tbb::detail::r1::dynamic_link_descriptor LinkTable[]
-        = {{"foo1", (tbb::detail::r1::pointer_to_handler*) (void*) (&foo1_handler)},
-           {"foo2", (tbb::detail::r1::pointer_to_handler*) (void*) (&foo2_handler)}};
+static const tbb::detail::r1::dynamic_link_descriptor LinkTable[] = {
+    { "foo1", (tbb::detail::r1::pointer_to_handler*)(void*)(&foo1_handler) },
+    { "foo2", (tbb::detail::r1::pointer_to_handler*)(void*)(&foo2_handler) }
+};
 #endif
 
 // The direct include since we want to test internal functionality.
+#include "src/tbb/dynamic_link.cpp"
 #include "common/utils.h"
 #include "common/utils_dynamic_libs.h"
-#include "src/tbb/dynamic_link.cpp"
 
 void test_dynamic_link(const char* lib_name) {
 #if __TBB_DYNAMIC_LOAD_ENABLED
 #if !_WIN32
     // Check if the executable exports its symbols.
-    REQUIRE_MESSAGE((utils::GetAddress(utils::OpenLibrary(nullptr), "foo1")
-                     && utils::GetAddress(utils::OpenLibrary(nullptr), "foo2")),
-                    "The executable doesn't export its symbols. Is the -rdynamic switch set during linking?");
+    REQUIRE_MESSAGE((utils::GetAddress(utils::OpenLibrary(nullptr), "foo1") && utils::GetAddress(utils::OpenLibrary(nullptr), "foo2")),
+            "The executable doesn't export its symbols. Is the -rdynamic switch set during linking?");
 #endif /* !_WIN32 */
     // We want to link (or fail to link) to the symbols available from the
     // executable so it doesn't matter what the library name is specified in
@@ -77,10 +80,9 @@ void test_dynamic_link(const char* lib_name) {
     if (tbb::detail::r1::dynamic_link(lib_name, LinkTable, sizeof(LinkTable) / sizeof(LinkTable[0]))) {
         REQUIRE_MESSAGE((foo1_handler && foo2_handler), "The symbols are corrupted by dynamic_link");
         REQUIRE_MESSAGE((foo1_handler() == FOO_IMPLEMENTATION && foo2_handler() == FOO_IMPLEMENTATION),
-                        "dynamic_link returned the successful code but symbol(s) are wrong");
+                "dynamic_link returned the successful code but symbol(s) are wrong");
     } else {
-        REQUIRE_MESSAGE((foo1_handler == dummy_foo1 && foo2_handler == dummy_foo2),
-                        "The symbols are corrupted by dynamic_link");
+        REQUIRE_MESSAGE((foo1_handler == dummy_foo1 && foo2_handler == dummy_foo2), "The symbols are corrupted by dynamic_link");
     }
 #else
     utils::suppress_unused_warning(lib_name);
@@ -89,8 +91,12 @@ void test_dynamic_link(const char* lib_name) {
 
 //! Testing dynamic_link with non-existing library
 //! \brief \ref error_guessing
-TEST_CASE("Test dynamic_link with non-existing library") { test_dynamic_link("tbb_unrealNAME.so"); }
+TEST_CASE("Test dynamic_link with non-existing library") {
+    test_dynamic_link("tbb_unrealNAME.so");
+}
 
 //! Testing dynamic_link
 //! \brief \ref error_guessing
-TEST_CASE("Test dynamic_link") { test_dynamic_link(""); }
+TEST_CASE("Test dynamic_link") {
+    test_dynamic_link("");
+}
diff --git a/external/tbb/test/tbb/test_eh_algorithms.cpp b/external/tbb/test/tbb/test_eh_algorithms.cpp
index d0c13ba7..7a2b59b4 100644
--- a/external/tbb/test/tbb/test_eh_algorithms.cpp
+++ b/external/tbb/test/tbb/test_eh_algorithms.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -14,37 +14,37 @@
     limitations under the License.
 */
 
+#include "common/test.h"
 #include "common/concurrency_tracker.h"
 #include "common/iterator.h"
-#include "common/test.h"
 #include "common/utils_concurrency_limit.h"
 
-#include <limits.h>// for INT_MAX
+#include <limits.h> // for INT_MAX
 #include <thread>
 #include <vector>
 
-#include "tbb/blocked_range.h"
-#include "tbb/concurrent_unordered_map.h"
-#include "tbb/global_control.h"
 #include "tbb/parallel_for.h"
+#include "tbb/parallel_reduce.h"
 #include "tbb/parallel_for_each.h"
 #include "tbb/parallel_pipeline.h"
-#include "tbb/parallel_reduce.h"
-#include "tbb/task.h"
+#include "tbb/blocked_range.h"
 #include "tbb/task_group.h"
+#include "tbb/concurrent_unordered_map.h"
+#include "tbb/task.h"
+#include "tbb/global_control.h"
 
 //! \file test_eh_algorithms.cpp
 //! \brief Test for [algorithms.parallel_for algorithms.parallel_reduce algorithms.parallel_deterministic_reduce algorithms.parallel_for_each algorithms.parallel_pipeline algorithms.parallel_pipeline.flow_control] specifications
 
-#define FLAT_RANGE 100000
-#define FLAT_GRAIN 100
-#define OUTER_RANGE 100
-#define OUTER_GRAIN 10
-#define INNER_RANGE (FLAT_RANGE / OUTER_RANGE)
-#define INNER_GRAIN (FLAT_GRAIN / OUTER_GRAIN)
+#define FLAT_RANGE  100000
+#define FLAT_GRAIN  100
+#define OUTER_RANGE  100
+#define OUTER_GRAIN  10
+#define INNER_RANGE  (FLAT_RANGE / OUTER_RANGE)
+#define INNER_GRAIN  (FLAT_GRAIN / OUTER_GRAIN)
 
 struct context_specific_counter {
-    tbb::concurrent_unordered_map<tbb::task_group_context*, std::atomic<unsigned>> context_map {};
+    tbb::concurrent_unordered_map<tbb::task_group_context*, std::atomic<unsigned>> context_map{};
 
     void increment() {
         tbb::task_group_context* ctx = tbb::task::current_context();
@@ -52,18 +52,20 @@ struct context_specific_counter {
         context_map[ctx]++;
     }
 
-    void reset() { context_map.clear(); }
+    void reset() {
+        context_map.clear();
+    }
 
     void validate(unsigned expected_count, const char* msg) {
         for (auto it = context_map.begin(); it != context_map.end(); it++) {
-            REQUIRE_MESSAGE(it->second <= expected_count, msg);
+            REQUIRE_MESSAGE( it->second <= expected_count, msg);
         }
     }
 };
 
-std::atomic<intptr_t> g_FedTasksCount {};  // number of tasks added by parallel_for_each feeder
-std::atomic<intptr_t> g_OuterParCalls {};  // number of actual invocations of the outer construct executed.
-context_specific_counter g_TGCCancelled {};// Number of times a task sees its group cancelled at start
+std::atomic<intptr_t> g_FedTasksCount{}; // number of tasks added by parallel_for_each feeder
+std::atomic<intptr_t> g_OuterParCalls{};  // number of actual invocations of the outer construct executed.
+context_specific_counter g_TGCCancelled{};  // Number of times a task sees its group cancelled at start
 
 #include "common/exception_handling.h"
 
@@ -98,8 +100,8 @@ __ Test control variables
       g_ExecutedAtFirstCatch -- value of g_CurExecuted when first catch is made, 0 if none.
   *********************************/
 
-inline void ResetGlobals(bool throwException = true, bool flog = false) {
-    ResetEhGlobals(throwException, flog);
+inline void ResetGlobals (  bool throwException = true, bool flog = false ) {
+    ResetEhGlobals( throwException, flog );
     g_FedTasksCount = 0;
     g_OuterParCalls = 0;
     g_NestedPipelines = false;
@@ -114,79 +116,78 @@ typedef size_t count_type;
 typedef tbb::blocked_range<count_type> range_type;
 
 inline intptr_t CountSubranges(range_type r) {
-    if (!r.is_divisible()) return intptr_t(1);
-    range_type r2(r, tbb::split());
+    if(!r.is_divisible()) return intptr_t(1);
+    range_type r2(r,tbb::split());
     return CountSubranges(r) + CountSubranges(r2);
 }
 
-inline intptr_t NumSubranges(intptr_t length, intptr_t grain) {
-    return CountSubranges(range_type(0, length, grain));
+inline intptr_t NumSubranges ( intptr_t length, intptr_t grain ) {
+    return CountSubranges(range_type(0,length,grain));
 }
 
-template <class Body>
-intptr_t TestNumSubrangesCalculation(intptr_t length, intptr_t grain, intptr_t inner_length,
-                                     intptr_t inner_grain) {
+template<class Body>
+intptr_t TestNumSubrangesCalculation ( intptr_t length, intptr_t grain, intptr_t inner_length, intptr_t inner_grain ) {
     ResetGlobals();
     g_ThrowException = false;
-    intptr_t outerCalls = NumSubranges(length, grain), innerCalls = NumSubranges(inner_length, inner_grain),
+    intptr_t outerCalls = NumSubranges(length, grain),
+             innerCalls = NumSubranges(inner_length, inner_grain),
              maxExecuted = outerCalls * (innerCalls + 1);
-    tbb::parallel_for(range_type(0, length, grain), Body());
-    REQUIRE_MESSAGE(g_CurExecuted == maxExecuted, "Wrong estimation of bodies invocation count");
+    tbb::parallel_for( range_type(0, length, grain), Body() );
+    REQUIRE_MESSAGE (g_CurExecuted == maxExecuted, "Wrong estimation of bodies invocation count");
     return maxExecuted;
 }
 
 class NoThrowParForBody {
 public:
-    void operator()(const range_type& r) const {
-        if (g_Master == std::this_thread::get_id()) g_MasterExecuted = true;
-        else
-            g_NonMasterExecuted = true;
-        if (tbb::is_current_task_group_canceling()) g_TGCCancelled.increment();
+    void operator()( const range_type& r ) const {
+        if(g_Master == std::this_thread::get_id()) g_MasterExecuted = true;
+        else g_NonMasterExecuted = true;
+        if( tbb::is_current_task_group_canceling() ) g_TGCCancelled.increment();
         utils::doDummyWork(r.size());
     }
 };
 
 #if TBB_USE_EXCEPTIONS
 
-void Test0() {
+void Test0 () {
     ResetGlobals();
     tbb::simple_partitioner p;
-    for (size_t i = 0; i < 10; ++i) {
-        tbb::parallel_for(range_type(0, 0, 1), NoThrowParForBody());
-        tbb::parallel_for(range_type(0, 0, 1), NoThrowParForBody(), p);
-        tbb::parallel_for(range_type(0, 128, 8), NoThrowParForBody());
-        tbb::parallel_for(range_type(0, 128, 8), NoThrowParForBody(), p);
+    for( size_t i=0; i<10; ++i ) {
+        tbb::parallel_for( range_type(0, 0, 1), NoThrowParForBody() );
+        tbb::parallel_for( range_type(0, 0, 1), NoThrowParForBody(), p );
+        tbb::parallel_for( range_type(0, 128, 8), NoThrowParForBody() );
+        tbb::parallel_for( range_type(0, 128, 8), NoThrowParForBody(), p );
     }
-}// void Test0 ()
+} // void Test0 ()
 
 //! Template that creates a functor suitable for parallel_reduce from a functor for parallel_for.
-template <typename ParForBody>
+template<typename ParForBody>
 class SimpleParReduceBody {
     ParForBody m_Body;
-
 public:
     void operator=(const SimpleParReduceBody&) = delete;
     SimpleParReduceBody(const SimpleParReduceBody&) = default;
     SimpleParReduceBody() = default;
 
-    void operator()(const range_type& r) const { m_Body(r); }
-    SimpleParReduceBody(SimpleParReduceBody& left, tbb::split) : m_Body(left.m_Body) {}
-    void join(SimpleParReduceBody& /*right*/) {}
-};// SimpleParReduceBody
+    void operator()( const range_type& r ) const { m_Body(r); }
+    SimpleParReduceBody( SimpleParReduceBody& left, tbb::split ) : m_Body(left.m_Body) {}
+    void join( SimpleParReduceBody& /*right*/ ) {}
+}; // SimpleParReduceBody
 
 //! Test parallel_for and parallel_reduce for a given partitioner.
 /** The Body need only be suitable for a parallel_for. */
-template <typename ParForBody, typename Partitioner>
+template<typename ParForBody, typename Partitioner>
 void TestParallelLoopAux() {
     Partitioner partitioner;
-    for (int i = 0; i < 2; ++i) {
+    for( int i=0; i<2; ++i ) {
         ResetGlobals();
         TRY();
-        if (i == 0) tbb::parallel_for(range_type(0, FLAT_RANGE, FLAT_GRAIN), ParForBody(), partitioner);
-        else {
-            SimpleParReduceBody<ParForBody> rb;
-            tbb::parallel_reduce(range_type(0, FLAT_RANGE, FLAT_GRAIN), rb, partitioner);
-        }
+            if( i==0 )
+                tbb::parallel_for( range_type(0, FLAT_RANGE, FLAT_GRAIN), ParForBody(), partitioner );
+            else {
+                SimpleParReduceBody<ParForBody> rb;
+                tbb::parallel_reduce( range_type(0, FLAT_RANGE, FLAT_GRAIN), rb, partitioner );
+            }
         CATCH_AND_ASSERT();
         // two cases: g_SolitaryException and !g_SolitaryException
         //   1) g_SolitaryException: only one thread actually threw.  There is only one context, so the exception
@@ -202,29 +203,27 @@ void TestParallelLoopAux() {
         // If a thread throws in a context, more than one subsequent task body may see the
         // cancelled state (if they are scheduled before the state is propagated.) this is
         // infrequent, but it occurs.  So what was to be an assertion must be a remark.
-        g_TGCCancelled.validate(g_NumThreads, "Too many tasks ran after exception thrown");
-        REQUIRE_MESSAGE(g_CurExecuted <= g_ExecutedAtLastCatch + g_NumThreads,
-                        "Too many tasks survived exception");
-        if (g_SolitaryException) {
+        g_TGCCancelled.validate( g_NumThreads, "Too many tasks ran after exception thrown");
+        REQUIRE_MESSAGE(g_CurExecuted <= g_ExecutedAtLastCatch + g_NumThreads, "Too many tasks survived exception");
+        if ( g_SolitaryException ) {
             REQUIRE_MESSAGE(g_NumExceptionsCaught == 1, "No try_blocks in any body expected in this test");
-            REQUIRE_MESSAGE(
-                    g_NumExceptionsCaught
-                            == (g_ExceptionInMaster ? g_MasterExecutedThrow : g_NonMasterExecutedThrow),
-                    "Not all throws were caught");
+            REQUIRE_MESSAGE(g_NumExceptionsCaught == (g_ExceptionInMaster ? g_MasterExecutedThrow : g_NonMasterExecutedThrow),
+                "Not all throws were caught");
             REQUIRE_MESSAGE(g_ExecutedAtFirstCatch == g_ExecutedAtLastCatch, "Too many exceptions occurred");
-        } else {
+        }
+        else {
             REQUIRE_MESSAGE(g_NumExceptionsCaught >= 1, "No try blocks in any body expected in this test");
         }
     }
-}// TestParallelLoopAux
+}  // TestParallelLoopAux
 
 //! Test with parallel_for and parallel_reduce, over all three kinds of partitioners.
 /** The Body only needs to be suitable for tbb::parallel_for. */
-template <typename Body>
+template<typename Body>
 void TestParallelLoop() {
     // The simple and auto partitioners should be const, but not the affinity partitioner.
-    TestParallelLoopAux<Body, const tbb::simple_partitioner>();
-    TestParallelLoopAux<Body, const tbb::auto_partitioner>();
+    TestParallelLoopAux<Body, const tbb::simple_partitioner  >();
+    TestParallelLoopAux<Body, const tbb::auto_partitioner    >();
 #define __TBB_TEMPORARILY_DISABLED 1
 #if !__TBB_TEMPORARILY_DISABLED
     // TODO: Improve the test so that it tolerates delayed start of tasks with affinity_partitioner
@@ -239,13 +238,12 @@ class SimpleParForBody {
     SimpleParForBody(const SimpleParForBody&) = default;
     SimpleParForBody() = default;
 
-    void operator()(const range_type& r) const {
+    void operator()( const range_type& r ) const {
         utils::ConcurrencyTracker ct;
         ++g_CurExecuted;
-        if (g_Master == std::this_thread::get_id()) g_MasterExecuted = true;
-        else
-            g_NonMasterExecuted = true;
-        if (tbb::is_current_task_group_canceling()) g_TGCCancelled.increment();
+        if(g_Master == std::this_thread::get_id()) g_MasterExecuted = true;
+        else g_NonMasterExecuted = true;
+        if( tbb::is_current_task_group_canceling() ) g_TGCCancelled.increment();
         utils::doDummyWork(r.size());
         WaitUntilConcurrencyPeaks();
         ThrowTestException(1);
@@ -255,17 +253,17 @@ class SimpleParForBody {
 void Test1() {
     // non-nested parallel_for/reduce with throwing body, one context
     TestParallelLoop<SimpleParForBody>();
-}// void Test1 ()
+} // void Test1 ()
 
 class OuterParForBody {
 public:
     void operator=(const OuterParForBody&) = delete;
     OuterParForBody(const OuterParForBody&) = default;
     OuterParForBody() = default;
-    void operator()(const range_type&) const {
+    void operator()( const range_type& ) const {
         utils::ConcurrencyTracker ct;
         ++g_OuterParCalls;
-        tbb::parallel_for(tbb::blocked_range<size_t>(0, INNER_RANGE, INNER_GRAIN), SimpleParForBody());
+        tbb::parallel_for( tbb::blocked_range<size_t>(0, INNER_RANGE, INNER_GRAIN), SimpleParForBody() );
     }
 };
 
@@ -274,15 +272,16 @@ class OuterParForBody {
     exceptions thrown from the inner parallel_for are not handled by the caller
     (outer parallel_for body) in this test, they will cancel all the sibling inner
     algorithms. **/
-void Test2() { TestParallelLoop<OuterParForBody>(); }// void Test2 ()
+void Test2 () {
+    TestParallelLoop<OuterParForBody>();
+} // void Test2 ()
 
 class OuterParForBodyWithIsolatedCtx {
 public:
-    void operator()(const range_type&) const {
+    void operator()( const range_type& ) const {
         tbb::task_group_context ctx(tbb::task_group_context::isolated);
         ++g_OuterParCalls;
-        tbb::parallel_for(tbb::blocked_range<size_t>(0, INNER_RANGE, INNER_GRAIN), SimpleParForBody(),
-                          tbb::simple_partitioner(), ctx);
+        tbb::parallel_for( tbb::blocked_range<size_t>(0, INNER_RANGE, INNER_GRAIN), SimpleParForBody(), tbb::simple_partitioner(), ctx );
     }
 };
 
@@ -292,20 +291,20 @@ class OuterParForBodyWithIsolatedCtx {
     already running because of the isolated contexts. However because the first
     exception cancels the root parallel_for only the first g_NumThreads subranges
     will be processed (which launch inner parallel_fors) **/
-void Test3() {
+void Test3 () {
     ResetGlobals();
     typedef OuterParForBodyWithIsolatedCtx body_type;
-    intptr_t innerCalls = NumSubranges(INNER_RANGE, INNER_GRAIN),
-             // we expect one thread to throw without counting, the rest to run to completion
+    intptr_t  innerCalls = NumSubranges(INNER_RANGE, INNER_GRAIN),
+            // we expect one thread to throw without counting, the rest to run to completion
             // this formula assumes g_numThreads outer pfor ranges will be started, but that is not the
             // case; the SimpleParFor subranges are started up as part of the outer ones, and when
             // the amount of concurrency reaches g_NumThreads no more outer Pfor ranges are started.
             // so we have to count the number of outer Pfors actually started.
             minExecuted = (g_NumThreads - 1) * innerCalls;
     TRY();
-    tbb::parallel_for(range_type(0, OUTER_RANGE, OUTER_GRAIN), body_type());
+        tbb::parallel_for( range_type(0, OUTER_RANGE, OUTER_GRAIN), body_type() );
     CATCH_AND_ASSERT();
-    minExecuted = (g_OuterParCalls - 1) * innerCalls;// see above
+    minExecuted = (g_OuterParCalls - 1) * innerCalls;  // see above
 
     // The first formula above assumes all ranges of the outer parallel for are executed, and one
     // cancels.  In the event, we have a smaller number of ranges that start before the exception
@@ -320,32 +319,27 @@ void Test3() {
     // In either case, once the outer pfor gets the exception it will stop executing further ranges.
 
     // if the only threads executing were not allowed to throw, then not seeing an exception is okay.
-    bool okayNoExceptionsCaught
-            = (g_ExceptionInMaster && !g_MasterExecuted) || (!g_ExceptionInMaster && !g_NonMasterExecuted);
-    if (g_SolitaryException) {
+    bool okayNoExceptionsCaught = (g_ExceptionInMaster && !g_MasterExecuted) || (!g_ExceptionInMaster && !g_NonMasterExecuted);
+    if ( g_SolitaryException ) {
         g_TGCCancelled.validate(g_NumThreads, "Too many tasks survived exception");
-        REQUIRE_MESSAGE(g_CurExecuted > minExecuted, "Too few tasks survived exception");
-        REQUIRE_MESSAGE((g_CurExecuted <= minExecuted + (g_ExecutedAtLastCatch + g_NumThreads)),
-                        "Too many tasks survived exception");
-        REQUIRE_MESSAGE((g_NumExceptionsCaught == 1 || okayNoExceptionsCaught),
-                        "No try_blocks in any body expected in this test");
-    } else {
-        REQUIRE_MESSAGE((g_CurExecuted <= g_ExecutedAtLastCatch + g_NumThreads),
-                        "Too many tasks survived exception");
-        REQUIRE_MESSAGE((g_NumExceptionsCaught >= 1 || okayNoExceptionsCaught),
-                        "No try_blocks in any body expected in this test");
-    }
-}// void Test3 ()
+        REQUIRE_MESSAGE (g_CurExecuted > minExecuted, "Too few tasks survived exception");
+        REQUIRE_MESSAGE ((g_CurExecuted <= minExecuted + (g_ExecutedAtLastCatch + g_NumThreads)), "Too many tasks survived exception");
+        REQUIRE_MESSAGE ((g_NumExceptionsCaught == 1 || okayNoExceptionsCaught), "No try_blocks in any body expected in this test");
+    }
+    else {
+        REQUIRE_MESSAGE ((g_CurExecuted <= g_ExecutedAtLastCatch + g_NumThreads), "Too many tasks survived exception");
+        REQUIRE_MESSAGE ((g_NumExceptionsCaught >= 1 || okayNoExceptionsCaught), "No try_blocks in any body expected in this test");
+    }
+} // void Test3 ()
 
 class OuterParForExceptionSafeBody {
 public:
-    void operator()(const range_type&) const {
+    void operator()( const range_type& ) const {
         tbb::task_group_context ctx(tbb::task_group_context::isolated);
         ++g_OuterParCalls;
         TRY();
-        tbb::parallel_for(tbb::blocked_range<size_t>(0, INNER_RANGE, INNER_GRAIN), SimpleParForBody(),
-                          tbb::simple_partitioner(), ctx);
-        CATCH();// this macro sets g_ExceptionCaught
+            tbb::parallel_for( tbb::blocked_range<size_t>(0, INNER_RANGE, INNER_GRAIN), SimpleParForBody(), tbb::simple_partitioner(), ctx );
+        CATCH();  // this macro sets g_ExceptionCaught
     }
 };
 
@@ -353,79 +347,78 @@ class OuterParForExceptionSafeBody {
 /** Since exception(s) thrown from the inner parallel_for are handled by the caller
     in this test, they do not affect neither other tasks of the the root parallel_for
     nor sibling inner algorithms. **/
-void Test4() {
-    ResetGlobals(true, true);
-    intptr_t innerCalls = NumSubranges(INNER_RANGE, INNER_GRAIN),
-             outerCalls = NumSubranges(OUTER_RANGE, OUTER_GRAIN);
+void Test4 () {
+    ResetGlobals( true, true );
+    intptr_t  innerCalls = NumSubranges(INNER_RANGE, INNER_GRAIN),
+              outerCalls = NumSubranges(OUTER_RANGE, OUTER_GRAIN);
     TRY();
-    tbb::parallel_for(range_type(0, OUTER_RANGE, OUTER_GRAIN), OuterParForExceptionSafeBody());
+        tbb::parallel_for( range_type(0, OUTER_RANGE, OUTER_GRAIN), OuterParForExceptionSafeBody() );
     CATCH();
     // g_SolitaryException  : one inner pfor will throw, the rest will execute to completion.
     //                        so the count should be (outerCalls -1) * innerCalls, if a throw happened.
     // !g_SolitaryException : possible multiple inner pfor throws.  Should be approximately
     //                        (outerCalls - g_NumExceptionsCaught) * innerCalls, give or take a few
-    intptr_t minExecuted = (outerCalls - g_NumExceptionsCaught) * innerCalls;
-    bool okayNoExceptionsCaught
-            = (g_ExceptionInMaster && !g_MasterExecuted) || (!g_ExceptionInMaster && !g_NonMasterExecuted);
-    if (g_SolitaryException) {
+    intptr_t  minExecuted = (outerCalls - g_NumExceptionsCaught) * innerCalls;
+    bool okayNoExceptionsCaught = (g_ExceptionInMaster && !g_MasterExecuted) || (!g_ExceptionInMaster && !g_NonMasterExecuted);
+    if ( g_SolitaryException ) {
         // only one task had exception thrown. That task had at least one execution (the one that threw).
         // There may be an arbitrary number of ranges executed after the throw but before the exception
         // is caught in the scheduler and cancellation is signaled.  (seen 9, 11 and 62 (!) for 8 threads)
-        REQUIRE_MESSAGE((g_NumExceptionsCaught == 1 || okayNoExceptionsCaught), "No exception registered");
-        REQUIRE_MESSAGE(g_CurExecuted >= minExecuted, "Too few tasks executed");
+        REQUIRE_MESSAGE ((g_NumExceptionsCaught == 1 || okayNoExceptionsCaught), "No exception registered");
+        REQUIRE_MESSAGE (g_CurExecuted >= minExecuted, "Too few tasks executed");
         g_TGCCancelled.validate(g_NumThreads, "Too many tasks survived exception");
         // a small number of threads can execute in a throwing sub-pfor, if the task which is
         // to do the solitary throw swaps out after registering its intent to throw but before it
         // actually does so. As a result, the number of extra tasks cannot exceed the number of thread
         // for each nested pfor invication)
-        REQUIRE_MESSAGE(g_CurExecuted <= minExecuted + (g_NumThreads - 1) * g_NumThreads / 2,
-                        "Too many tasks survived exception");
-    } else {
-        REQUIRE_MESSAGE(((g_NumExceptionsCaught >= 1 && g_NumExceptionsCaught <= outerCalls)
-                         || okayNoExceptionsCaught),
-                        "Unexpected actual number of exceptions");
-        REQUIRE_MESSAGE(g_CurExecuted >= minExecuted, "Too few executed tasks reported");
-        REQUIRE_MESSAGE((g_CurExecuted <= g_ExecutedAtLastCatch + g_NumThreads),
-                        "Too many tasks survived multiple exceptions");
-        REQUIRE_MESSAGE(g_CurExecuted <= outerCalls * (1 + g_NumThreads),
-                        "Too many tasks survived exception");
-    }
-}// void Test4 ()
+        REQUIRE_MESSAGE (g_CurExecuted <= minExecuted + (g_ExecutedAtLastCatch + g_NumThreads), "Too many tasks survived exception");
+    }
+    else {
+        REQUIRE_MESSAGE (((g_NumExceptionsCaught >= 1 && g_NumExceptionsCaught <= outerCalls) || okayNoExceptionsCaught), "Unexpected actual number of exceptions");
+        REQUIRE_MESSAGE (g_CurExecuted >= minExecuted, "Too few executed tasks reported");
+        REQUIRE_MESSAGE ((g_CurExecuted <= g_ExecutedAtLastCatch + g_NumThreads), "Too many tasks survived multiple exceptions");
+        REQUIRE_MESSAGE (g_CurExecuted <= outerCalls * (1 + g_NumThreads), "Too many tasks survived exception");
+    }
+} // void Test4 ()
 
 //! Testing parallel_for and parallel_reduce exception handling
 //! \brief \ref error_guessing
 TEST_CASE("parallel_for and parallel_reduce exception handling test #0") {
-    for (auto concurrency_level : utils::concurrency_range()) {
+    for (auto concurrency_level: utils::concurrency_range()) {
         g_NumThreads = static_cast<int>(concurrency_level);
         g_Master = std::this_thread::get_id();
         if (g_NumThreads > 1) {
-            tbb::global_control control(tbb::global_control::max_allowed_parallelism, g_NumThreads);
-            // Execute in all the possible modes
-            for (size_t j = 0; j < 4; ++j) {
-                g_ExceptionInMaster = (j & 1) != 0;
-                g_SolitaryException = (j & 2) != 0;
-
-                Test0();
-            }
+            tbb::task_arena a(g_NumThreads);
+            a.execute([] {
+                // Execute in all the possible modes
+                for (size_t j = 0; j < 4; ++j) {
+                    g_ExceptionInMaster = (j & 1) != 0;
+                    g_SolitaryException = (j & 2) != 0;
+
+                    Test0();
+                }
+            });
         }
     }
 }
-
+#if !EMSCRIPTEN
 //! Testing parallel_for and parallel_reduce exception handling
 //! \brief \ref error_guessing
 TEST_CASE("parallel_for and parallel_reduce exception handling test #1") {
-    for (auto concurrency_level : utils::concurrency_range()) {
+    for (auto concurrency_level: utils::concurrency_range()) {
         g_NumThreads = static_cast<int>(concurrency_level);
         g_Master = std::this_thread::get_id();
         if (g_NumThreads > 1) {
-            tbb::global_control control(tbb::global_control::max_allowed_parallelism, g_NumThreads);
-            // Execute in all the possible modes
-            for (size_t j = 0; j < 4; ++j) {
-                g_ExceptionInMaster = (j & 1) != 0;
-                g_SolitaryException = (j & 2) != 0;
-
-                Test1();
-            }
+            tbb::task_arena a(g_NumThreads);
+            a.execute([] {
+                // Execute in all the possible modes
+                for (size_t j = 0; j < 4; ++j) {
+                    g_ExceptionInMaster = (j & 1) != 0;
+                    g_SolitaryException = (j & 2) != 0;
+
+                    Test1();
+                }
+            });
         }
     }
 }
@@ -433,18 +426,20 @@ TEST_CASE("parallel_for and parallel_reduce exception handling test #1") {
 //! Testing parallel_for and parallel_reduce exception handling
 //! \brief \ref error_guessing
 TEST_CASE("parallel_for and parallel_reduce exception handling test #2") {
-    for (auto concurrency_level : utils::concurrency_range()) {
+    for (auto concurrency_level: utils::concurrency_range()) {
         g_NumThreads = static_cast<int>(concurrency_level);
         g_Master = std::this_thread::get_id();
         if (g_NumThreads > 1) {
-            tbb::global_control control(tbb::global_control::max_allowed_parallelism, g_NumThreads);
-            // Execute in all the possible modes
-            for (size_t j = 0; j < 4; ++j) {
-                g_ExceptionInMaster = (j & 1) != 0;
-                g_SolitaryException = (j & 2) != 0;
-
-                Test2();
-            }
+            tbb::task_arena a(g_NumThreads);
+            a.execute([] {
+                // Execute in all the possible modes
+                for (size_t j = 0; j < 4; ++j) {
+                    g_ExceptionInMaster = (j & 1) != 0;
+                    g_SolitaryException = (j & 2) != 0;
+
+                    Test2();
+                }
+            });
         }
     }
 }
@@ -452,18 +447,20 @@ TEST_CASE("parallel_for and parallel_reduce exception handling test #2") {
 //! Testing parallel_for and parallel_reduce exception handling
 //! \brief \ref error_guessing
 TEST_CASE("parallel_for and parallel_reduce exception handling test #3") {
-    for (auto concurrency_level : utils::concurrency_range()) {
+    for (auto concurrency_level: utils::concurrency_range()) {
         g_NumThreads = static_cast<int>(concurrency_level);
         g_Master = std::this_thread::get_id();
         if (g_NumThreads > 1) {
-            tbb::global_control control(tbb::global_control::max_allowed_parallelism, g_NumThreads);
-            // Execute in all the possible modes
-            for (size_t j = 0; j < 4; ++j) {
-                g_ExceptionInMaster = (j & 1) != 0;
-                g_SolitaryException = (j & 2) != 0;
-
-                Test3();
-            }
+            tbb::task_arena a(g_NumThreads);
+            a.execute([] {
+                // Execute in all the possible modes
+                for (size_t j = 0; j < 4; ++j) {
+                    g_ExceptionInMaster = (j & 1) != 0;
+                    g_SolitaryException = (j & 2) != 0;
+
+                    Test3();
+                }
+            });
         }
     }
 }
@@ -471,52 +468,52 @@ TEST_CASE("parallel_for and parallel_reduce exception handling test #3") {
 //! Testing parallel_for and parallel_reduce exception handling
 //! \brief \ref error_guessing
 TEST_CASE("parallel_for and parallel_reduce exception handling test #4") {
-    for (auto concurrency_level : utils::concurrency_range()) {
+    for (auto concurrency_level: utils::concurrency_range()) {
         g_NumThreads = static_cast<int>(concurrency_level);
         g_Master = std::this_thread::get_id();
         if (g_NumThreads > 1) {
-            tbb::global_control control(tbb::global_control::max_allowed_parallelism, g_NumThreads);
-            // Execute in all the possible modes
-            for (size_t j = 0; j < 4; ++j) {
-                g_ExceptionInMaster = (j & 1) != 0;
-                g_SolitaryException = (j & 2) != 0;
-
-                Test4();
-            }
+            tbb::task_arena a(g_NumThreads);
+            a.execute([] {
+                // Execute in all the possible modes
+                for (size_t j = 0; j < 4; ++j) {
+                    g_ExceptionInMaster = (j & 1) != 0;
+                    g_SolitaryException = (j & 2) != 0;
+
+                    Test4();
+                }
+            });
         }
     }
 }
 
+#endif
 #endif /* TBB_USE_EXCEPTIONS */
-
 class ParForBodyToCancel {
 public:
-    void operator()(const range_type&) const {
+    void operator()( const range_type& ) const {
         ++g_CurExecuted;
         Cancellator::WaitUntilReady();
     }
 };
 
-template <class B>
+template<class B>
 class ParForLauncher {
-    tbb::task_group_context& my_ctx;
-
+    tbb::task_group_context &my_ctx;
 public:
     void operator()() const {
-        tbb::parallel_for(range_type(0, FLAT_RANGE, FLAT_GRAIN), B(), tbb::simple_partitioner(), my_ctx);
+        tbb::parallel_for( range_type(0, FLAT_RANGE, FLAT_GRAIN), B(), tbb::simple_partitioner(), my_ctx );
     }
-    ParForLauncher(tbb::task_group_context& ctx) : my_ctx(ctx) {}
+    ParForLauncher ( tbb::task_group_context& ctx ) : my_ctx(ctx) {}
 };
 
 //! Test for cancelling an algorithm from outside (from a task running in parallel with the algorithm).
-void TestCancelation1() {
-    ResetGlobals(false);
-    RunCancellationTest<ParForLauncher<ParForBodyToCancel>, Cancellator>(NumSubranges(FLAT_RANGE, FLAT_GRAIN)
-                                                                         / 4);
+void TestCancelation1 () {
+    ResetGlobals( false );
+    RunCancellationTest<ParForLauncher<ParForBodyToCancel>, Cancellator>( NumSubranges(FLAT_RANGE, FLAT_GRAIN) / 4 );
 }
 
-class Cancellator2 {
-    tbb::task_group_context& m_GroupToCancel;
+class Cancellator2  {
+    tbb::task_group_context &m_GroupToCancel;
 
 public:
     void operator()() const {
@@ -526,29 +523,28 @@ class Cancellator2 {
         g_ExecutedAtLastCatch = g_CurExecuted.load();
     }
 
-    Cancellator2(tbb::task_group_context& ctx, intptr_t) : m_GroupToCancel(ctx) {}
+    Cancellator2 ( tbb::task_group_context& ctx, intptr_t ) : m_GroupToCancel(ctx) {}
 };
 
 class ParForBodyToCancel2 {
 public:
-    void operator()(const range_type&) const {
+    void operator()( const range_type& ) const {
         ++g_CurExecuted;
         utils::ConcurrencyTracker ct;
         // The test will hang (and be timed out by the test system) if is_cancelled() is broken
-        while (!tbb::is_current_task_group_canceling()) utils::yield();
+        while( !tbb::is_current_task_group_canceling() )
+            utils::yield();
     }
 };
 
 //! Test for cancelling an algorithm from outside (from a task running in parallel with the algorithm).
 /** This version also tests tbb::is_current_task_group_canceling() method. **/
-void TestCancelation2() {
+void TestCancelation2 () {
     ResetGlobals();
     RunCancellationTest<ParForLauncher<ParForBodyToCancel2>, Cancellator2>();
-    REQUIRE_MESSAGE(g_ExecutedAtLastCatch < g_NumThreads,
-                    "Somehow worker tasks started their execution before the cancellator task");
+    REQUIRE_MESSAGE (g_ExecutedAtLastCatch < g_NumThreads, "Somehow worker tasks started their execution before the cancellator task");
     g_TGCCancelled.validate(g_NumThreads, "Too many tasks survived cancellation");
-    REQUIRE_MESSAGE(g_CurExecuted <= g_ExecutedAtLastCatch + g_NumThreads,
-                    "Some tasks were executed after cancellation");
+    REQUIRE_MESSAGE (g_CurExecuted <= g_ExecutedAtLastCatch + g_NumThreads, "Some tasks were executed after cancellation");
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -559,54 +555,63 @@ class Worker {
     static const int max_nesting = 3;
     static const int reduce_range = 1024;
     static const int reduce_grain = 256;
-
 public:
-    int DoWork(int level);
-    int Validate(int start_level) {
-        int expected = 1;// identity for multiplication
-        for (int i = start_level + 1; i < max_nesting; ++i) expected *= reduce_range;
+    int DoWork (int level);
+    int Validate (int start_level) {
+        int expected = 1; // identity for multiplication
+        for(int i=start_level+1; i<max_nesting; ++i)
+             expected *= reduce_range;
         return expected;
     }
 };
 
 class RecursiveParReduceBodyWithSharedWorker {
-    Worker* m_SharedWorker;
+    Worker * m_SharedWorker;
     int m_NestingLevel;
     int m_Result;
-
 public:
-    RecursiveParReduceBodyWithSharedWorker(RecursiveParReduceBodyWithSharedWorker& src, tbb::split)
-        : m_SharedWorker(src.m_SharedWorker), m_NestingLevel(src.m_NestingLevel), m_Result(0) {}
-    RecursiveParReduceBodyWithSharedWorker(Worker* w, int outer)
-        : m_SharedWorker(w), m_NestingLevel(outer), m_Result(0) {}
-
-    void operator()(const tbb::blocked_range<size_t>& r) {
-        if (g_Master == std::this_thread::get_id()) g_MasterExecuted = true;
-        else
-            g_NonMasterExecuted = true;
-        if (tbb::is_current_task_group_canceling()) g_TGCCancelled.increment();
-        for (size_t i = r.begin(); i != r.end(); ++i) { m_Result += m_SharedWorker->DoWork(m_NestingLevel); }
-    }
-    void join(const RecursiveParReduceBodyWithSharedWorker& x) { m_Result += x.m_Result; }
-    int result() { return m_Result; }
+    RecursiveParReduceBodyWithSharedWorker ( RecursiveParReduceBodyWithSharedWorker& src, tbb::split )
+        : m_SharedWorker(src.m_SharedWorker)
+        , m_NestingLevel(src.m_NestingLevel)
+        , m_Result(0)
+    {}
+    RecursiveParReduceBodyWithSharedWorker ( Worker *w, int outer )
+        : m_SharedWorker(w)
+        , m_NestingLevel(outer)
+        , m_Result(0)
+    {}
+
+    void operator() ( const tbb::blocked_range<size_t>& r ) {
+        if(g_Master == std::this_thread::get_id()) g_MasterExecuted = true;
+        else g_NonMasterExecuted = true;
+        if( tbb::is_current_task_group_canceling() ) g_TGCCancelled.increment();
+        for (size_t i = r.begin (); i != r.end (); ++i) {
+            m_Result += m_SharedWorker->DoWork (m_NestingLevel);
+        }
+    }
+    void join (const RecursiveParReduceBodyWithSharedWorker & x) {
+        m_Result += x.m_Result;
+    }
+    int result () { return m_Result; }
 };
 
-int Worker::DoWork(int level) {
+int Worker::DoWork ( int level ) {
     ++level;
-    if (level < max_nesting) {
-        RecursiveParReduceBodyWithSharedWorker rt(this, level);
-        tbb::parallel_reduce(tbb::blocked_range<size_t>(0, reduce_range, reduce_grain), rt);
+    if ( level < max_nesting ) {
+        RecursiveParReduceBodyWithSharedWorker rt (this, level);
+        tbb::parallel_reduce (tbb::blocked_range<size_t>(0, reduce_range, reduce_grain), rt);
         return rt.result();
-    } else
+    }
+    else
         return 1;
 }
 
 //! Regression test for hanging that occurred with the first version of cancellation propagation
-void TestCancelation3() {
+void TestCancelation3 () {
     Worker w;
-    int result = w.DoWork(0);
+    int result   = w.DoWork (0);
     int expected = w.Validate(0);
-    REQUIRE_MESSAGE(result == expected, "Wrong calculation result");
+    REQUIRE_MESSAGE ( result == expected, "Wrong calculation result");
 }
 
 struct StatsCounters {
@@ -625,33 +630,34 @@ class ParReduceBody {
     tbb::task_group_context& tgc;
 
 public:
-    ParReduceBody(StatsCounters& s_, tbb::task_group_context& context, bool e_)
-        : my_stats(&s_), my_exception(e_), tgc(context) {
+    ParReduceBody( StatsCounters& s_, tbb::task_group_context& context, bool e_ ) :
+        my_stats(&s_), my_exception(e_), tgc(context) {
         my_id = my_stats->my_total_created++;
     }
 
-    ParReduceBody(const ParReduceBody& lhs) : tgc(lhs.tgc) {
+    ParReduceBody( const ParReduceBody& lhs ) : tgc(lhs.tgc) {
         my_stats = lhs.my_stats;
         my_id = my_stats->my_total_created++;
     }
 
-    ParReduceBody(ParReduceBody& lhs, tbb::split) : tgc(lhs.tgc) {
+    ParReduceBody( ParReduceBody& lhs, tbb::split ) : tgc(lhs.tgc) {
         my_stats = lhs.my_stats;
         my_id = my_stats->my_total_created++;
     }
 
-    ~ParReduceBody() { ++my_stats->my_total_deleted; }
+    ~ParReduceBody(){ ++my_stats->my_total_deleted; }
 
-    void operator()(const tbb::blocked_range<std::size_t>& /*range*/) const {
+    void operator()( const tbb::blocked_range<std::size_t>& /*range*/ ) const {
         //Do nothing, except for one task (chosen arbitrarily)
-        if (my_id >= 12) {
-            if (my_exception) ThrowTestException(1);
+        if( my_id >= 12 ) {
+            if( my_exception )
+                ThrowTestException(1);
             else
                 tgc.cancel_group_execution();
         }
     }
 
-    void join(ParReduceBody& /*rhs*/) {}
+    void join( ParReduceBody& /*rhs*/ ) {}
 };
 
 void TestCancelation4() {
@@ -662,72 +668,76 @@ void TestCancelation4() {
     {
         tbb::task_group_context tgc1, tgc2;
         ParReduceBody body_for_cancellation(statsObj, tgc1, false), body_for_exception(statsObj, tgc2, true);
-        tbb::parallel_reduce(tbb::blocked_range<std::size_t>(0, 100000000, 100), body_for_cancellation,
-                             tbb::simple_partitioner(), tgc1);
-        tbb::parallel_reduce(tbb::blocked_range<std::size_t>(0, 100000000, 100), body_for_exception,
-                             tbb::simple_partitioner(), tgc2);
+        tbb::parallel_reduce( tbb::blocked_range<std::size_t>(0,100000000,100), body_for_cancellation, tbb::simple_partitioner(), tgc1 );
+        tbb::parallel_reduce( tbb::blocked_range<std::size_t>(0,100000000,100), body_for_exception, tbb::simple_partitioner(), tgc2 );
     }
 #if TBB_USE_EXCEPTIONS
-    catch (...) {
-    }
+    catch(...) {}
 #endif
-    REQUIRE_MESSAGE(statsObj.my_total_created == statsObj.my_total_deleted,
-                    "Not all parallel_reduce body objects created were reclaimed");
+    REQUIRE_MESSAGE ( statsObj.my_total_created==statsObj.my_total_deleted, "Not all parallel_reduce body objects created were reclaimed");
 }
 
 //! Testing parallel_for and parallel_reduce cancellation
 //! \brief \ref error_guessing
 TEST_CASE("parallel_for and parallel_reduce cancellation test #1") {
-    for (auto concurrency_level : utils::concurrency_range()) {
+    for (auto concurrency_level: utils::concurrency_range()) {
         g_NumThreads = static_cast<int>(concurrency_level);
         g_Master = std::this_thread::get_id();
         if (g_NumThreads > 1) {
-            tbb::global_control control(tbb::global_control::max_allowed_parallelism, g_NumThreads);
-            // Execute in all the possible modes
-            for (size_t j = 0; j < 4; ++j) {
-                g_ExceptionInMaster = (j & 1) != 0;
-                g_SolitaryException = (j & 2) != 0;
-
-                TestCancelation1();
-            }
+            tbb::task_arena a(g_NumThreads);
+            a.execute([] {
+                // Execute in all the possible modes
+                for (size_t j = 0; j < 4; ++j) {
+                    g_ExceptionInMaster = (j & 1) != 0;
+                    g_SolitaryException = (j & 2) != 0;
+
+                    TestCancelation1();
+                }
+            });
         }
     }
 }
 
+#if !EMSCRIPTEN
 //! Testing parallel_for and parallel_reduce cancellation
 //! \brief \ref error_guessing
 TEST_CASE("parallel_for and parallel_reduce cancellation test #2") {
-    for (auto concurrency_level : utils::concurrency_range()) {
+    for (auto concurrency_level: utils::concurrency_range()) {
         g_NumThreads = static_cast<int>(concurrency_level);
         g_Master = std::this_thread::get_id();
         if (g_NumThreads > 1) {
-            tbb::global_control control(tbb::global_control::max_allowed_parallelism, g_NumThreads);
-            // Execute in all the possible modes
-            for (size_t j = 0; j < 4; ++j) {
-                g_ExceptionInMaster = (j & 1) != 0;
-                g_SolitaryException = (j & 2) != 0;
-
-                TestCancelation2();
-            }
+            tbb::task_arena a(g_NumThreads);
+            a.execute([] {
+                // Execute in all the possible modes
+                for (size_t j = 0; j < 4; ++j) {
+                    g_ExceptionInMaster = (j & 1) != 0;
+                    g_SolitaryException = (j & 2) != 0;
+
+                    TestCancelation2();
+                }
+            });
         }
     }
 }
+#endif
 
 //! Testing parallel_for and parallel_reduce cancellation
 //! \brief \ref error_guessing
 TEST_CASE("parallel_for and parallel_reduce cancellation test #3") {
-    for (auto concurrency_level : utils::concurrency_range()) {
+    for (auto concurrency_level: utils::concurrency_range()) {
         g_NumThreads = static_cast<int>(concurrency_level);
         g_Master = std::this_thread::get_id();
         if (g_NumThreads > 1) {
-            tbb::global_control control(tbb::global_control::max_allowed_parallelism, g_NumThreads);
-            // Execute in all the possible modes
-            for (size_t j = 0; j < 4; ++j) {
-                g_ExceptionInMaster = (j & 1) != 0;
-                g_SolitaryException = (j & 2) != 0;
-
-                TestCancelation3();
-            }
+            tbb::task_arena a(g_NumThreads);
+            a.execute([] {
+                // Execute in all the possible modes
+                for (size_t j = 0; j < 4; ++j) {
+                    g_ExceptionInMaster = (j & 1) != 0;
+                    g_SolitaryException = (j & 2) != 0;
+
+                    TestCancelation3();
+                }
+            });
         }
     }
 }
@@ -735,18 +745,20 @@ TEST_CASE("parallel_for and parallel_reduce cancellation test #3") {
 //! Testing parallel_for and parallel_reduce cancellation
 //! \brief \ref error_guessing
 TEST_CASE("parallel_for and parallel_reduce cancellation test #4") {
-    for (auto concurrency_level : utils::concurrency_range()) {
+    for (auto concurrency_level: utils::concurrency_range()) {
         g_NumThreads = static_cast<int>(concurrency_level);
         g_Master = std::this_thread::get_id();
         if (g_NumThreads > 1) {
-            tbb::global_control control(tbb::global_control::max_allowed_parallelism, g_NumThreads);
-            // Execute in all the possible modes
-            for (size_t j = 0; j < 4; ++j) {
-                g_ExceptionInMaster = (j & 1) != 0;
-                g_SolitaryException = (j & 2) != 0;
-
-                TestCancelation4();
-            }
+            tbb::task_arena a(g_NumThreads);
+            a.execute([] {
+                // Execute in all the possible modes
+                for (size_t j = 0; j < 4; ++j) {
+                    g_ExceptionInMaster = (j & 1) != 0;
+                    g_SolitaryException = (j & 2) != 0;
+
+                    TestCancelation4();
+                }
+            });
         }
     }
 }
@@ -760,45 +772,54 @@ std::size_t get_iter_range_size() {
     return std::max(50, g_NumThreads * 2);
 }
 
-template <typename Iterator>
+template<typename Iterator>
 struct adaptive_range {
     std::vector<std::size_t> my_array;
 
     adaptive_range(std::size_t size) : my_array(size + 1) {}
     using iterator = Iterator;
 
-    iterator begin() const { return iterator {&my_array.front()}; }
-    iterator begin() { return iterator {&my_array.front()}; }
-    iterator end() const { return iterator {&my_array.back()}; }
-    iterator end() { return iterator {&my_array.back()}; }
+    iterator begin() const {
+        return iterator{&my_array.front()};
+    }
+    iterator begin() {
+        return iterator{&my_array.front()};
+    }
+    iterator end() const {
+        return iterator{&my_array.back()};
+    }
+    iterator end() {
+        return iterator{&my_array.back()};
+    }
 };
 
-void Feed(tbb::feeder<size_t>& feeder, size_t val) {
+void Feed ( tbb::feeder<size_t> &feeder, size_t val ) {
     if (g_FedTasksCount < 50) {
         ++g_FedTasksCount;
         feeder.add(val);
     }
 }
 
-#define RunWithSimpleBody(func, body)                                                                        \
-    func<utils::ForwardIterator<size_t>, body>();                                                            \
+#define RunWithSimpleBody(func, body)       \
+    func<utils::ForwardIterator<size_t>, body>();         \
     func<utils::ForwardIterator<size_t>, body##WithFeeder>()
 
-#define RunWithTemplatedBody(func, body)                                                                     \
-    func<utils::ForwardIterator<size_t>, body<utils::ForwardIterator<size_t>>>();                            \
-    func<utils::ForwardIterator<size_t>, body##WithFeeder<utils::ForwardIterator<size_t>>>()
+#define RunWithTemplatedBody(func, body)     \
+    func<utils::ForwardIterator<size_t>, body<utils::ForwardIterator<size_t> > >();         \
+    func<utils::ForwardIterator<size_t>, body##WithFeeder<utils::ForwardIterator<size_t> > >()
 
 #if TBB_USE_EXCEPTIONS
 
 // Simple functor object with exception
 class SimpleParForEachBody {
 public:
-    void operator()(size_t& value) const {
+    void operator() ( size_t &value ) const {
         ++g_CurExecuted;
-        if (g_Master == std::this_thread::get_id()) g_MasterExecuted = true;
-        else
-            g_NonMasterExecuted = true;
-        if (tbb::is_current_task_group_canceling()) { g_TGCCancelled.increment(); }
+        if(g_Master == std::this_thread::get_id()) g_MasterExecuted = true;
+        else g_NonMasterExecuted = true;
+        if( tbb::is_current_task_group_canceling() ) {
+            g_TGCCancelled.increment();
+        }
         utils::ConcurrencyTracker ct;
         value += 1000;
         WaitUntilConcurrencyPeaks();
@@ -809,7 +830,7 @@ class SimpleParForEachBody {
 // Simple functor object with exception and feeder
 class SimpleParForEachBodyWithFeeder : SimpleParForEachBody {
 public:
-    void operator()(size_t& value, tbb::feeder<size_t>& feeder) const {
+    void operator() ( size_t &value, tbb::feeder<size_t> &feeder ) const {
         Feed(feeder, 0);
         SimpleParForEachBody::operator()(value);
     }
@@ -817,26 +838,24 @@ class SimpleParForEachBodyWithFeeder : SimpleParForEachBody {
 
 // Tests exceptions without nesting
 template <class Iterator, class simple_body>
-void Test1_parallel_for_each() {
+void Test1_parallel_for_each () {
     ResetGlobals();
     auto range = adaptive_range<Iterator>(get_iter_range_size());
     TRY();
-    tbb::parallel_for_each(std::begin(range), std::end(range), simple_body());
+        tbb::parallel_for_each(std::begin(range), std::end(range), simple_body() );
     CATCH_AND_ASSERT();
-    REQUIRE_MESSAGE(g_CurExecuted <= g_ExecutedAtLastCatch + g_NumThreads,
-                    "Too many tasks survived exception");
+    REQUIRE_MESSAGE (g_CurExecuted <= g_ExecutedAtLastCatch + g_NumThreads, "Too many tasks survived exception");
     g_TGCCancelled.validate(g_NumThreads, "Too many tasks survived cancellation");
-    REQUIRE_MESSAGE(g_NumExceptionsCaught == 1, "No try_blocks in any body expected in this test");
-    if (!g_SolitaryException)
-        REQUIRE_MESSAGE(g_CurExecuted <= g_ExecutedAtLastCatch + g_NumThreads,
-                        "Too many tasks survived exception");
+    REQUIRE_MESSAGE (g_NumExceptionsCaught == 1, "No try_blocks in any body expected in this test");
+    if ( !g_SolitaryException )
+        REQUIRE_MESSAGE (g_CurExecuted <= g_ExecutedAtLastCatch + g_NumThreads, "Too many tasks survived exception");
 
-}// void Test1_parallel_for_each ()
+} // void Test1_parallel_for_each ()
 
 template <class Iterator>
 class OuterParForEachBody {
 public:
-    void operator()(size_t& /*value*/) const {
+    void operator()( size_t& /*value*/ ) const {
         ++g_OuterParCalls;
         auto range = adaptive_range<Iterator>(get_iter_range_size());
         tbb::parallel_for_each(std::begin(range), std::end(range), SimpleParForEachBody());
@@ -846,7 +865,7 @@ class OuterParForEachBody {
 template <class Iterator>
 class OuterParForEachBodyWithFeeder : OuterParForEachBody<Iterator> {
 public:
-    void operator()(size_t& value, tbb::feeder<size_t>& feeder) const {
+    void operator()( size_t& value, tbb::feeder<size_t>& feeder ) const {
         Feed(feeder, 0);
         OuterParForEachBody<Iterator>::operator()(value);
     }
@@ -858,25 +877,23 @@ class OuterParForEachBodyWithFeeder : OuterParForEachBody<Iterator> {
     (outer parallel_for_each body) in this test, they will cancel all the sibling inner
     algorithms. **/
 template <class Iterator, class outer_body>
-void Test2_parallel_for_each() {
+void Test2_parallel_for_each () {
     ResetGlobals();
     auto range = adaptive_range<Iterator>(get_iter_range_size());
     TRY();
-    tbb::parallel_for_each(std::begin(range), std::end(range), outer_body());
+        tbb::parallel_for_each(std::begin(range), std::end(range), outer_body() );
     CATCH_AND_ASSERT();
-    REQUIRE_MESSAGE(g_CurExecuted <= g_ExecutedAtLastCatch + g_NumThreads,
-                    "Too many tasks survived exception");
+    REQUIRE_MESSAGE (g_CurExecuted <= g_ExecutedAtLastCatch + g_NumThreads, "Too many tasks survived exception");
     g_TGCCancelled.validate(g_NumThreads, "Too many tasks survived cancellation");
-    REQUIRE_MESSAGE(g_NumExceptionsCaught == 1, "No try_blocks in any body expected in this test");
-    if (!g_SolitaryException)
-        REQUIRE_MESSAGE(g_CurExecuted <= g_ExecutedAtLastCatch + g_NumThreads,
-                        "Too many tasks survived exception");
-}// void Test2_parallel_for_each ()
+    REQUIRE_MESSAGE (g_NumExceptionsCaught == 1, "No try_blocks in any body expected in this test");
+    if ( !g_SolitaryException )
+        REQUIRE_MESSAGE (g_CurExecuted <= g_ExecutedAtLastCatch + g_NumThreads, "Too many tasks survived exception");
+} // void Test2_parallel_for_each ()
 
 template <class Iterator>
 class OuterParForEachBodyWithIsolatedCtx {
 public:
-    void operator()(size_t& /*value*/) const {
+    void operator()( size_t& /*value*/ ) const {
         tbb::task_group_context ctx(tbb::task_group_context::isolated);
         ++g_OuterParCalls;
         auto range = adaptive_range<Iterator>(get_iter_range_size());
@@ -887,7 +904,7 @@ class OuterParForEachBodyWithIsolatedCtx {
 template <class Iterator>
 class OuterParForEachBodyWithIsolatedCtxWithFeeder : OuterParForEachBodyWithIsolatedCtx<Iterator> {
 public:
-    void operator()(size_t& value, tbb::feeder<size_t>& feeder) const {
+    void operator()( size_t& value, tbb::feeder<size_t> &feeder ) const {
         Feed(feeder, 0);
         OuterParForEachBodyWithIsolatedCtx<Iterator>::operator()(value);
     }
@@ -900,40 +917,38 @@ class OuterParForEachBodyWithIsolatedCtxWithFeeder : OuterParForEachBodyWithIsol
     exception cancels the root parallel_for_each, at most the first g_NumThreads subranges
     will be processed (which launch inner parallel_for_eachs) **/
 template <class Iterator, class outer_body>
-void Test3_parallel_for_each() {
+void Test3_parallel_for_each () {
     ResetGlobals();
     auto range = adaptive_range<Iterator>(get_iter_range_size());
     intptr_t innerCalls = get_iter_range_size(),
              // The assumption here is the same as in outer parallel fors.
-            minExecuted = (g_NumThreads - 1) * innerCalls;
+             minExecuted = (g_NumThreads - 1) * innerCalls;
     g_Master = std::this_thread::get_id();
     TRY();
-    tbb::parallel_for_each(std::begin(range), std::end(range), outer_body());
+        tbb::parallel_for_each(std::begin(range), std::end(range), outer_body());
     CATCH_AND_ASSERT();
     // figure actual number of expected executions given the number of outer PDos started.
     minExecuted = (g_OuterParCalls - 1) * innerCalls;
     // one extra thread may run a task that sees cancellation.  Infrequent but possible
     g_TGCCancelled.validate(g_NumThreads, "Too many tasks survived exception");
-    if (g_SolitaryException) {
-        REQUIRE_MESSAGE(g_CurExecuted > minExecuted, "Too few tasks survived exception");
-        REQUIRE_MESSAGE(g_CurExecuted <= minExecuted + (g_ExecutedAtLastCatch + g_NumThreads),
-                        "Too many tasks survived exception");
+    if ( g_SolitaryException ) {
+        REQUIRE_MESSAGE (g_CurExecuted > minExecuted, "Too few tasks survived exception");
+        REQUIRE_MESSAGE (g_CurExecuted <= minExecuted + (g_ExecutedAtLastCatch + g_NumThreads), "Too many tasks survived exception");
     }
-    REQUIRE_MESSAGE(g_NumExceptionsCaught == 1, "No try_blocks in any body expected in this test");
-    if (!g_SolitaryException)
-        REQUIRE_MESSAGE(g_CurExecuted <= g_ExecutedAtLastCatch + g_NumThreads,
-                        "Too many tasks survived exception");
-}// void Test3_parallel_for_each ()
+    REQUIRE_MESSAGE (g_NumExceptionsCaught == 1, "No try_blocks in any body expected in this test");
+    if ( !g_SolitaryException )
+        REQUIRE_MESSAGE (g_CurExecuted <= g_ExecutedAtLastCatch + g_NumThreads, "Too many tasks survived exception");
+} // void Test3_parallel_for_each ()
 
 template <class Iterator>
 class OuterParForEachWithEhBody {
 public:
-    void operator()(size_t& /*value*/) const {
+    void operator()( size_t& /*value*/ ) const {
         tbb::task_group_context ctx(tbb::task_group_context::isolated);
         ++g_OuterParCalls;
         auto range = adaptive_range<Iterator>(get_iter_range_size());
         TRY();
-        tbb::parallel_for_each(std::begin(range), std::end(range), SimpleParForEachBody(), ctx);
+            tbb::parallel_for_each(std::begin(range), std::end(range), SimpleParForEachBody(), ctx);
         CATCH();
     }
 };
@@ -944,7 +959,7 @@ class OuterParForEachWithEhBodyWithFeeder : OuterParForEachWithEhBody<Iterator>
     void operator=(const OuterParForEachWithEhBodyWithFeeder&) = delete;
     OuterParForEachWithEhBodyWithFeeder(const OuterParForEachWithEhBodyWithFeeder&) = default;
     OuterParForEachWithEhBodyWithFeeder() = default;
-    void operator()(size_t& value, tbb::feeder<size_t>& feeder) const {
+    void operator()( size_t &value, tbb::feeder<size_t> &feeder ) const {
         Feed(feeder, 0);
         OuterParForEachWithEhBody<Iterator>::operator()(value);
     }
@@ -955,178 +970,188 @@ class OuterParForEachWithEhBodyWithFeeder : OuterParForEachWithEhBody<Iterator>
     in this test, they do not affect neither other tasks of the the root parallel_for
     nor sibling inner algorithms. **/
 template <class Iterator, class outer_body_with_eh>
-void Test4_parallel_for_each() {
-    ResetGlobals(true, true);
+void Test4_parallel_for_each () {
+    ResetGlobals( true, true );
     auto range = adaptive_range<Iterator>(get_iter_range_size());
     g_Master = std::this_thread::get_id();
     TRY();
-    tbb::parallel_for_each(std::begin(range), std::end(range), outer_body_with_eh());
+        tbb::parallel_for_each(std::begin(range), std::end(range), outer_body_with_eh());
     CATCH();
-    REQUIRE_MESSAGE(!l_ExceptionCaughtAtCurrentLevel,
-                    "All exceptions must have been handled in the parallel_for_each body");
-    intptr_t innerCalls = get_iter_range_size(), outerCalls = get_iter_range_size() + g_FedTasksCount,
-             maxExecuted = outerCalls * innerCalls, minExecuted = 0;
+    REQUIRE_MESSAGE (!l_ExceptionCaughtAtCurrentLevel, "All exceptions must have been handled in the parallel_for_each body");
+    intptr_t innerCalls = get_iter_range_size(),
+             outerCalls = get_iter_range_size() + g_FedTasksCount,
+             maxExecuted = outerCalls * innerCalls,
+             minExecuted = 0;
     g_TGCCancelled.validate(g_NumThreads, "Too many tasks survived exception");
-    if (g_SolitaryException) {
+    if ( g_SolitaryException ) {
         minExecuted = maxExecuted - innerCalls;
-        REQUIRE_MESSAGE(g_NumExceptionsCaught == 1, "No exception registered");
-        REQUIRE_MESSAGE(g_CurExecuted >= minExecuted, "Too few tasks executed");
+        REQUIRE_MESSAGE (g_NumExceptionsCaught == 1, "No exception registered");
+        REQUIRE_MESSAGE (g_CurExecuted >= minExecuted, "Too few tasks executed");
         // This test has the same property as Test4 (parallel_for); the exception can be
         // thrown, but some number of tasks from the outer Pdo can execute after the throw but
         // before the cancellation is signaled (have seen 36).
         DOCTEST_WARN_MESSAGE(g_CurExecuted < maxExecuted, "All tasks survived exception. Oversubscription?");
-    } else {
+    }
+    else {
         minExecuted = g_NumExceptionsCaught;
-        REQUIRE_MESSAGE((g_NumExceptionsCaught > 1 && g_NumExceptionsCaught <= outerCalls),
-                        "Unexpected actual number of exceptions");
-        REQUIRE_MESSAGE(g_CurExecuted >= minExecuted, "Too many executed tasks reported");
-        REQUIRE_MESSAGE(g_CurExecuted < g_ExecutedAtLastCatch + g_NumThreads + outerCalls,
-                        "Too many tasks survived multiple exceptions");
-        REQUIRE_MESSAGE(g_CurExecuted <= outerCalls * (1 + g_NumThreads),
-                        "Too many tasks survived exception");
+        REQUIRE_MESSAGE ((g_NumExceptionsCaught > 1 && g_NumExceptionsCaught <= outerCalls), "Unexpected actual number of exceptions");
+        REQUIRE_MESSAGE (g_CurExecuted >= minExecuted, "Too many executed tasks reported");
+        REQUIRE_MESSAGE (g_CurExecuted < g_ExecutedAtLastCatch + g_NumThreads + outerCalls, "Too many tasks survived multiple exceptions");
+        REQUIRE_MESSAGE (g_CurExecuted <= outerCalls * (1 + g_NumThreads), "Too many tasks survived exception");
     }
-}// void Test4_parallel_for_each ()
+} // void Test4_parallel_for_each ()
 
 // This body throws an exception only if the task was added by feeder
 class ParForEachBodyWithThrowingFeederTasks {
 public:
     //! This form of the function call operator can be used when the body needs to add more work during the processing
-    void operator()(const size_t& value, tbb::feeder<size_t>& feeder) const {
+    void operator() (const size_t &value, tbb::feeder<size_t> &feeder ) const {
         ++g_CurExecuted;
-        if (g_Master == std::this_thread::get_id()) g_MasterExecuted = true;
-        else
-            g_NonMasterExecuted = true;
-        if (tbb::is_current_task_group_canceling()) g_TGCCancelled.increment();
+        if(g_Master == std::this_thread::get_id()) g_MasterExecuted = true;
+        else g_NonMasterExecuted = true;
+        if( tbb::is_current_task_group_canceling() ) g_TGCCancelled.increment();
         Feed(feeder, 1);
-        if (value == 1) ThrowTestException(1);
+        if (value == 1)
+            ThrowTestException(1);
     }
-};// class ParForEachBodyWithThrowingFeederTasks
+}; // class ParForEachBodyWithThrowingFeederTasks
 
 // Test exception in task, which was added by feeder.
 template <class Iterator>
-void Test5_parallel_for_each() {
+void Test5_parallel_for_each () {
     ResetGlobals();
     auto range = adaptive_range<Iterator>(get_iter_range_size());
     g_Master = std::this_thread::get_id();
     TRY();
-    tbb::parallel_for_each(std::begin(range), std::end(range), ParForEachBodyWithThrowingFeederTasks());
+        tbb::parallel_for_each(std::begin(range), std::end(range), ParForEachBodyWithThrowingFeederTasks());
     CATCH();
     if (g_SolitaryException) {
         // Failure occurs when g_ExceptionInMaster is false, but all the 1 values in the range
         // are handled by the external thread.  In this case no throw occurs.
-        REQUIRE_MESSAGE(
-                (l_ExceptionCaughtAtCurrentLevel// we saw an exception
-                 || (!g_ExceptionInMaster
-                     && !g_NonMasterExecutedThrow)// non-external trhead throws but none tried
-                 || (g_ExceptionInMaster
-                     && !g_MasterExecutedThrow))// external thread throws but external thread didn't try
-                ,
-                "At least one exception should occur");
+        REQUIRE_MESSAGE ((l_ExceptionCaughtAtCurrentLevel               // we saw an exception
+                || (!g_ExceptionInMaster && !g_NonMasterExecutedThrow)  // non-external trhead throws but none tried
+                || (g_ExceptionInMaster && !g_MasterExecutedThrow))     // external thread throws but external thread didn't try
+                , "At least one exception should occur");
     }
-}// void Test5_parallel_for_each ()
+} // void Test5_parallel_for_each ()
 
+#if !EMSCRIPTEN
 //! Testing parallel_for_each exception handling
 //! \brief \ref error_guessing
 TEST_CASE("parallel_for_each exception handling test #1") {
-    for (auto concurrency_level : utils::concurrency_range()) {
+    for (auto concurrency_level: utils::concurrency_range()) {
         g_NumThreads = static_cast<int>(concurrency_level);
         g_Master = std::this_thread::get_id();
         if (g_NumThreads > 1) {
-            tbb::global_control control(tbb::global_control::max_allowed_parallelism, g_NumThreads);
-            // Execute in all the possible modes
-            for (size_t j = 0; j < 4; ++j) {
-                g_ExceptionInMaster = (j & 1) != 0;
-                g_SolitaryException = (j & 2) != 0;
-
-                RunWithSimpleBody(Test1_parallel_for_each, SimpleParForEachBody);
-            }
+            tbb::task_arena a(g_NumThreads);
+            a.execute([] {
+                // Execute in all the possible modes
+                for (size_t j = 0; j < 4; ++j) {
+                    g_ExceptionInMaster = (j & 1) != 0;
+                    g_SolitaryException = (j & 2) != 0;
+
+                    RunWithSimpleBody(Test1_parallel_for_each, SimpleParForEachBody);
+                }
+            });
         }
     }
 }
+#endif
 
 //! Testing parallel_for_each exception handling
 //! \brief \ref error_guessing
 TEST_CASE("parallel_for_each exception handling test #2") {
-    for (auto concurrency_level : utils::concurrency_range()) {
+    for (auto concurrency_level: utils::concurrency_range()) {
         g_NumThreads = static_cast<int>(concurrency_level);
         g_Master = std::this_thread::get_id();
         if (g_NumThreads > 1) {
-            tbb::global_control control(tbb::global_control::max_allowed_parallelism, g_NumThreads);
-            // Execute in all the possible modes
-            for (size_t j = 0; j < 4; ++j) {
-                g_ExceptionInMaster = (j & 1) != 0;
-                g_SolitaryException = (j & 2) != 0;
-
-                RunWithTemplatedBody(Test2_parallel_for_each, OuterParForEachBody);
-            }
+            tbb::task_arena a(g_NumThreads);
+            a.execute([] {
+                // Execute in all the possible modes
+                for (size_t j = 0; j < 4; ++j) {
+                    g_ExceptionInMaster = (j & 1) != 0;
+                    g_SolitaryException = (j & 2) != 0;
+
+                    RunWithTemplatedBody(Test2_parallel_for_each, OuterParForEachBody);
+                }
+            });
         }
     }
 }
 
+#if !EMSCRIPTEN
 //! Testing parallel_for_each exception handling
 //! \brief \ref error_guessing
 TEST_CASE("parallel_for_each exception handling test #3") {
-    for (auto concurrency_level : utils::concurrency_range()) {
+    for (auto concurrency_level: utils::concurrency_range()) {
         g_NumThreads = static_cast<int>(concurrency_level);
         g_Master = std::this_thread::get_id();
         if (g_NumThreads > 1) {
-            tbb::global_control control(tbb::global_control::max_allowed_parallelism, g_NumThreads);
-            // Execute in all the possible modes
-            for (size_t j = 0; j < 4; ++j) {
-                g_ExceptionInMaster = (j & 1) != 0;
-                g_SolitaryException = (j & 2) != 0;
-
-                RunWithTemplatedBody(Test3_parallel_for_each, OuterParForEachBodyWithIsolatedCtx);
-            }
+            tbb::task_arena a(g_NumThreads);
+            a.execute([] {
+                // Execute in all the possible modes
+                for (size_t j = 0; j < 4; ++j) {
+                    g_ExceptionInMaster = (j & 1) != 0;
+                    g_SolitaryException = (j & 2) != 0;
+
+                    RunWithTemplatedBody(Test3_parallel_for_each, OuterParForEachBodyWithIsolatedCtx);
+                }
+            });
         }
     }
 }
+#endif
 
 //! Testing parallel_for_each exception handling
 //! \brief \ref error_guessing
 TEST_CASE("parallel_for_each exception handling test #4") {
-    for (auto concurrency_level : utils::concurrency_range()) {
+    for (auto concurrency_level: utils::concurrency_range()) {
         g_NumThreads = static_cast<int>(concurrency_level);
         g_Master = std::this_thread::get_id();
         if (g_NumThreads > 1) {
-            tbb::global_control control(tbb::global_control::max_allowed_parallelism, g_NumThreads);
-            // Execute in all the possible modes
-            for (size_t j = 0; j < 4; ++j) {
-                g_ExceptionInMaster = (j & 1) != 0;
-                g_SolitaryException = (j & 2) != 0;
-
-                RunWithTemplatedBody(Test4_parallel_for_each, OuterParForEachWithEhBody);
-            }
+            tbb::task_arena a(g_NumThreads);
+            a.execute([] {
+                // Execute in all the possible modes
+                for (size_t j = 0; j < 4; ++j) {
+                    g_ExceptionInMaster = (j & 1) != 0;
+                    g_SolitaryException = (j & 2) != 0;
+
+                    RunWithTemplatedBody(Test4_parallel_for_each, OuterParForEachWithEhBody);
+                }
+            });
         }
     }
 }
 
+#if !EMSCRIPTEN
 //! Testing parallel_for_each exception handling
 //! \brief \ref error_guessing
 TEST_CASE("parallel_for_each exception handling test #5") {
-    for (auto concurrency_level : utils::concurrency_range()) {
+    for (auto concurrency_level: utils::concurrency_range()) {
         g_NumThreads = static_cast<int>(concurrency_level);
         g_Master = std::this_thread::get_id();
         if (g_NumThreads > 1) {
-            tbb::global_control control(tbb::global_control::max_allowed_parallelism, g_NumThreads);
-            // Execute in all the possible modes
-            for (size_t j = 0; j < 4; ++j) {
-                g_ExceptionInMaster = (j & 1) != 0;
-                g_SolitaryException = (j & 2) != 0;
-
-                Test5_parallel_for_each<utils::InputIterator<size_t>>();
-                Test5_parallel_for_each<utils::ForwardIterator<size_t>>();
-                Test5_parallel_for_each<utils::RandomIterator<size_t>>();
-            }
+            tbb::task_arena a(g_NumThreads);
+            a.execute([] {
+                // Execute in all the possible modes
+                for (size_t j = 0; j < 4; ++j) {
+                    g_ExceptionInMaster = (j & 1) != 0;
+                    g_SolitaryException = (j & 2) != 0;
+
+                    Test5_parallel_for_each<utils::InputIterator<size_t> >();
+                    Test5_parallel_for_each<utils::ForwardIterator<size_t> >();
+                    Test5_parallel_for_each<utils::RandomIterator<size_t> >();
+                }
+            });
         }
     }
 }
-
+#endif
 #endif /* TBB_USE_EXCEPTIONS */
 
 class ParForEachBodyToCancel {
 public:
-    void operator()(size_t& /*value*/) const {
+    void operator()( size_t& /*value*/ ) const {
         ++g_CurExecuted;
         Cancellator::WaitUntilReady();
     }
@@ -1134,60 +1159,58 @@ class ParForEachBodyToCancel {
 
 class ParForEachBodyToCancelWithFeeder : ParForEachBodyToCancel {
 public:
-    void operator()(size_t& value, tbb::feeder<size_t>& feeder) const {
+    void operator()( size_t& value, tbb::feeder<size_t> &feeder ) const {
         Feed(feeder, 0);
         ParForEachBodyToCancel::operator()(value);
     }
 };
 
-template <class B, class Iterator>
+template<class B, class Iterator>
 class ParForEachWorker {
-    tbb::task_group_context& my_ctx;
-
+    tbb::task_group_context &my_ctx;
 public:
     void operator()() const {
         auto range = adaptive_range<Iterator>(get_iter_range_size());
-        tbb::parallel_for_each(std::begin(range), std::end(range), B(), my_ctx);
+        tbb::parallel_for_each( std::begin(range), std::end(range), B(), my_ctx );
     }
 
-    ParForEachWorker(tbb::task_group_context& ctx) : my_ctx(ctx) {}
+    ParForEachWorker ( tbb::task_group_context& ctx ) : my_ctx(ctx) {}
 };
 
 //! Test for cancelling an algorithm from outside (from a task running in parallel with the algorithm).
 template <class Iterator, class body_to_cancel>
-void TestCancelation1_parallel_for_each() {
-    ResetGlobals(false);
+void TestCancelation1_parallel_for_each () {
+    ResetGlobals( false );
     // Threshold should leave more than max_threads tasks to test the cancellation. Set the threshold to iter_range_size()/4 since iter_range_size >= max_threads*2
     intptr_t threshold = get_iter_range_size() / 4;
-    REQUIRE_MESSAGE(get_iter_range_size() - threshold > g_NumThreads,
-                    "Threshold should leave more than max_threads tasks to test the cancellation.");
+    REQUIRE_MESSAGE(get_iter_range_size() - threshold > g_NumThreads, "Threshold should leave more than max_threads tasks to test the cancellation.");
     tbb::task_group tg;
-    tbb::task_group_context ctx;
+    tbb::task_group_context  ctx;
     Cancellator cancellator(ctx, threshold);
     ParForEachWorker<body_to_cancel, Iterator> worker(ctx);
-    tg.run(cancellator);
+    tg.run( cancellator );
     utils::yield();
-    tg.run(worker);
+    tg.run( worker );
     TRY();
-    tg.wait();
+        tg.wait();
     CATCH_AND_FAIL();
-    REQUIRE_MESSAGE(g_CurExecuted < g_ExecutedAtLastCatch + g_NumThreads,
-                    "Too many tasks were executed after cancellation");
+    REQUIRE_MESSAGE (g_CurExecuted < g_ExecutedAtLastCatch + g_NumThreads, "Too many tasks were executed after cancellation");
 }
 
 class ParForEachBodyToCancel2 {
 public:
-    void operator()(size_t& /*value*/) const {
+    void operator()( size_t& /*value*/ ) const {
         ++g_CurExecuted;
         utils::ConcurrencyTracker ct;
         // The test will hang (and be timed out by the test system) if is_cancelled() is broken
-        while (!tbb::is_current_task_group_canceling()) utils::yield();
+        while( !tbb::is_current_task_group_canceling() )
+            utils::yield();
     }
 };
 
 class ParForEachBodyToCancel2WithFeeder : ParForEachBodyToCancel2 {
 public:
-    void operator()(size_t& value, tbb::feeder<size_t>& feeder) const {
+    void operator()( size_t& value, tbb::feeder<size_t> &feeder ) const {
         Feed(feeder, 0);
         ParForEachBodyToCancel2::operator()(value);
     }
@@ -1196,25 +1219,28 @@ class ParForEachBodyToCancel2WithFeeder : ParForEachBodyToCancel2 {
 //! Test for cancelling an algorithm from outside (from a task running in parallel with the algorithm).
 /** This version also tests tbb::is_current_task_group_canceling() method. **/
 template <class Iterator, class body_to_cancel>
-void TestCancelation2_parallel_for_each() {
+void TestCancelation2_parallel_for_each () {
     ResetGlobals();
     RunCancellationTest<ParForEachWorker<body_to_cancel, Iterator>, Cancellator2>();
 }
 
+#if !EMSCRIPTEN
 //! Testing parallel_for_each cancellation test
 //! \brief \ref error_guessing
 TEST_CASE("parallel_for_each cancellation test #1") {
-    for (auto concurrency_level : utils::concurrency_range()) {
+    for (auto concurrency_level: utils::concurrency_range()) {
         g_NumThreads = static_cast<int>(concurrency_level);
         g_Master = std::this_thread::get_id();
         if (g_NumThreads > 1) {
-            tbb::global_control control(tbb::global_control::max_allowed_parallelism, g_NumThreads);
-            // Execute in all the possible modes
-            for (size_t j = 0; j < 4; ++j) {
-                g_ExceptionInMaster = (j & 1) != 0;
-                g_SolitaryException = (j & 2) != 0;
-                RunWithSimpleBody(TestCancelation1_parallel_for_each, ParForEachBodyToCancel);
-            }
+            tbb::task_arena a(g_NumThreads);
+            a.execute([] {
+                // Execute in all the possible modes
+                for (size_t j = 0; j < 4; ++j) {
+                    g_ExceptionInMaster = (j & 1) != 0;
+                    g_SolitaryException = (j & 2) != 0;
+                    RunWithSimpleBody(TestCancelation1_parallel_for_each, ParForEachBodyToCancel);
+                }
+            });
         }
     }
 }
@@ -1222,21 +1248,24 @@ TEST_CASE("parallel_for_each cancellation test #1") {
 //! Testing parallel_for_each cancellation test
 //! \brief \ref error_guessing
 TEST_CASE("parallel_for_each cancellation test #2") {
-    for (auto concurrency_level : utils::concurrency_range()) {
+    for (auto concurrency_level: utils::concurrency_range()) {
         g_NumThreads = static_cast<int>(concurrency_level);
         g_Master = std::this_thread::get_id();
         if (g_NumThreads > 1) {
-            tbb::global_control control(tbb::global_control::max_allowed_parallelism, g_NumThreads);
-            // Execute in all the possible modes
-            for (size_t j = 0; j < 4; ++j) {
-                g_ExceptionInMaster = (j & 1) != 0;
-                g_SolitaryException = (j & 2) != 0;
-
-                RunWithSimpleBody(TestCancelation2_parallel_for_each, ParForEachBodyToCancel2);
-            }
+            tbb::task_arena a(g_NumThreads);
+            a.execute([] {
+                // Execute in all the possible modes
+                for (size_t j = 0; j < 4; ++j) {
+                    g_ExceptionInMaster = (j & 1) != 0;
+                    g_SolitaryException = (j & 2) != 0;
+
+                    RunWithSimpleBody(TestCancelation2_parallel_for_each, ParForEachBodyToCancel2);
+                }
+            });
         }
     }
 }
+#endif
 
 ////////////////////////////////////////////////////////////////////////////////
 // Tests for tbb::parallel_pipeline
@@ -1246,28 +1275,28 @@ int g_NumTokens = 0;
 // Simple input filter class, it assigns 1 to all array members
 // It stops when it receives item equal to -1
 class InputFilter {
-    mutable std::atomic<size_t> m_Item {};
+    mutable std::atomic<size_t> m_Item{};
     mutable std::vector<size_t> m_Buffer;
-
 public:
     InputFilter() : m_Buffer(get_iter_range_size()) {
         m_Item = 0;
-        for (size_t i = 0; i < get_iter_range_size(); ++i) m_Buffer[i] = 1;
+        for (size_t i = 0; i < get_iter_range_size(); ++i )
+            m_Buffer[i] = 1;
     }
     InputFilter(const InputFilter& other) : m_Item(other.m_Item.load()), m_Buffer(get_iter_range_size()) {
-        for (size_t i = 0; i < get_iter_range_size(); ++i) m_Buffer[i] = other.m_Buffer[i];
+        for (size_t i = 0; i < get_iter_range_size(); ++i )
+            m_Buffer[i] = other.m_Buffer[i];
     }
 
     void* operator()(tbb::flow_control& control) const {
         size_t item = m_Item++;
-        if (g_Master == std::this_thread::get_id()) g_MasterExecuted = true;
-        else
-            g_NonMasterExecuted = true;
-        if (tbb::is_current_task_group_canceling()) g_TGCCancelled.increment();
-        if (item == 1) {
-            ++g_PipelinesStarted;// count on emitting the first item.
+        if(g_Master == std::this_thread::get_id()) g_MasterExecuted = true;
+        else g_NonMasterExecuted = true;
+        if( tbb::is_current_task_group_canceling() ) g_TGCCancelled.increment();
+        if(item == 1) {
+            ++g_PipelinesStarted;   // count on emitting the first item.
         }
-        if (item >= get_iter_range_size()) {
+        if ( item >= get_iter_range_size() ) {
             control.stop();
             return nullptr;
         }
@@ -1276,7 +1305,7 @@ class InputFilter {
     }
 
     size_t* buffer() { return m_Buffer.data(); }
-};// class InputFilter
+}; // class InputFilter
 
 #if TBB_USE_EXCEPTIONS
 
@@ -1285,101 +1314,101 @@ class InputFilter {
 class SimpleFilter {
     bool m_canThrow;
     bool m_serial;
-
 public:
-    SimpleFilter(bool canThrow, bool serial) : m_canThrow(canThrow), m_serial(serial) {}
+    SimpleFilter (bool canThrow, bool serial ) : m_canThrow(canThrow), m_serial(serial) {}
     void* operator()(void* item) const {
         ++g_CurExecuted;
-        if (g_Master == std::this_thread::get_id()) g_MasterExecuted = true;
-        else
-            g_NonMasterExecuted = true;
-        if (tbb::is_current_task_group_canceling()) g_TGCCancelled.increment();
-        if (m_canThrow) {
-            if (!m_serial) {
+        if(g_Master == std::this_thread::get_id()) g_MasterExecuted = true;
+        else g_NonMasterExecuted = true;
+        if( tbb::is_current_task_group_canceling() ) g_TGCCancelled.increment();
+        if ( m_canThrow ) {
+            if ( !m_serial ) {
                 utils::ConcurrencyTracker ct;
-                WaitUntilConcurrencyPeaks(std::min(g_NumTokens, g_NumThreads));
+                WaitUntilConcurrencyPeaks( std::min(g_NumTokens, g_NumThreads) );
             }
             ThrowTestException(1);
         }
         return item;
     }
-};// class SimpleFilter
+}; // class SimpleFilter
 
 // This enumeration represents filters order in pipeline
 struct FilterSet {
     tbb::filter_mode mode1, mode2;
     bool throw1, throw2;
 
-    FilterSet(tbb::filter_mode m1, tbb::filter_mode m2, bool t1, bool t2)
-        : mode1(m1), mode2(m2), throw1(t1), throw2(t2) {}
-};// struct FilterSet
+    FilterSet( tbb::filter_mode m1, tbb::filter_mode m2, bool t1, bool t2 )
+        : mode1(m1), mode2(m2), throw1(t1), throw2(t2)
+    {}
+}; // struct FilterSet
 
-FilterSet serial_parallel(tbb::filter_mode::serial_in_order, tbb::filter_mode::parallel, /*throw1*/ false,
-                          /*throw2*/ true);
+FilterSet serial_parallel( tbb::filter_mode::serial_in_order, tbb::filter_mode::parallel, /*throw1*/false, /*throw2*/true );
 
-template <typename InFilter, typename Filter>
+template<typename InFilter, typename Filter>
 class CustomPipeline {
     InFilter inputFilter;
     Filter filter1;
     Filter filter2;
     FilterSet my_filters;
-
 public:
-    CustomPipeline(const FilterSet& filters)
+    CustomPipeline( const FilterSet& filters )
         : filter1(filters.throw1, filters.mode1 != tbb::filter_mode::parallel),
-          filter2(filters.throw2, filters.mode2 != tbb::filter_mode::parallel), my_filters(filters) {}
+          filter2(filters.throw2, filters.mode2 != tbb::filter_mode::parallel),
+          my_filters(filters)
+    {}
 
-    void run() {
-        tbb::parallel_pipeline(g_NumTokens,
-                               tbb::make_filter<void, void*>(tbb::filter_mode::parallel, inputFilter)
-                                       & tbb::make_filter<void*, void*>(my_filters.mode1, filter1)
-                                       & tbb::make_filter<void*, void>(my_filters.mode2, filter2));
+    void run () {
+        tbb::parallel_pipeline(
+            g_NumTokens,
+            tbb::make_filter<void, void*>(tbb::filter_mode::parallel, inputFilter) &
+            tbb::make_filter<void*, void*>(my_filters.mode1, filter1) &
+            tbb::make_filter<void*, void>(my_filters.mode2, filter2)
+        );
     }
-    void run(tbb::task_group_context& ctx) {
-        tbb::parallel_pipeline(g_NumTokens,
-                               tbb::make_filter<void, void*>(tbb::filter_mode::parallel, inputFilter)
-                                       & tbb::make_filter<void*, void*>(my_filters.mode1, filter1)
-                                       & tbb::make_filter<void*, void>(my_filters.mode2, filter2),
-                               ctx);
+    void run ( tbb::task_group_context& ctx ) {
+        tbb::parallel_pipeline(
+            g_NumTokens,
+            tbb::make_filter<void, void*>(tbb::filter_mode::parallel, inputFilter) &
+            tbb::make_filter<void*, void*>(my_filters.mode1, filter1) &
+            tbb::make_filter<void*, void>(my_filters.mode2, filter2),
+            ctx
+        );
     }
 };
 
 typedef CustomPipeline<InputFilter, SimpleFilter> SimplePipeline;
 
 // Tests exceptions without nesting
-void Test1_pipeline(const FilterSet& filters) {
+void Test1_pipeline ( const FilterSet& filters ) {
     ResetGlobals();
     SimplePipeline testPipeline(filters);
     TRY();
-    testPipeline.run();
-    if (g_CurExecuted == 2 * static_cast<int>(get_iter_range_size())) {
-        // all the items were processed, though an exception was supposed to occur.
-        if (!g_ExceptionInMaster && g_NonMasterExecutedThrow > 0) {
-            // if !g_ExceptionInMaster, the external thread is not allowed to throw.
-            // if g_nonMasterExcutedThrow > 0 then a thread besides the external thread tried to throw.
-            REQUIRE_MESSAGE((filters.mode1 != tbb::filter_mode::parallel
-                             && filters.mode2 != tbb::filter_mode::parallel),
-                            "Unusual count");
+        testPipeline.run();
+        if ( g_CurExecuted == 2 * static_cast<int>(get_iter_range_size()) ) {
+            // all the items were processed, though an exception was supposed to occur.
+            if(!g_ExceptionInMaster && g_NonMasterExecutedThrow > 0) {
+                // if !g_ExceptionInMaster, the external thread is not allowed to throw.
+                // if g_nonMasterExcutedThrow > 0 then a thread besides the external thread tried to throw.
+                REQUIRE_MESSAGE((filters.mode1 != tbb::filter_mode::parallel && filters.mode2 != tbb::filter_mode::parallel),
+                    "Unusual count");
+            }
+            // In case of all serial filters they might be all executed in the thread(s)
+            // where exceptions are not allowed by the common test logic. So we just quit.
+            return;
         }
-        // In case of all serial filters they might be all executed in the thread(s)
-        // where exceptions are not allowed by the common test logic. So we just quit.
-        return;
-    }
     CATCH_AND_ASSERT();
     g_TGCCancelled.validate(g_NumThreads, "Too many tasks survived exception");
-    REQUIRE_MESSAGE(g_CurExecuted <= g_ExecutedAtLastCatch + g_NumThreads,
-                    "Too many tasks survived exception");
-    REQUIRE_MESSAGE(g_NumExceptionsCaught == 1, "No try_blocks in any body expected in this test");
-    if (!g_SolitaryException)
-        REQUIRE_MESSAGE(g_CurExecuted <= g_ExecutedAtLastCatch + g_NumThreads,
-                        "Too many tasks survived exception");
+    REQUIRE_MESSAGE (g_CurExecuted <= g_ExecutedAtLastCatch + g_NumThreads, "Too many tasks survived exception");
+    REQUIRE_MESSAGE (g_NumExceptionsCaught == 1, "No try_blocks in any body expected in this test");
+    if ( !g_SolitaryException )
+        REQUIRE_MESSAGE (g_CurExecuted <= g_ExecutedAtLastCatch + g_NumThreads, "Too many tasks survived exception");
 
-}// void Test1_pipeline ()
+} // void Test1_pipeline ()
 
 // Filter with nesting
 class OuterFilter {
 public:
-    OuterFilter(bool, bool) {}
+    OuterFilter ( bool, bool ) {}
 
     void* operator()(void* item) const {
         ++g_OuterParCalls;
@@ -1387,34 +1416,31 @@ class OuterFilter {
         testPipeline.run();
         return item;
     }
-};// class OuterFilter
+}; // class OuterFilter
 
 //! Uses pipeline containing an inner pipeline with the default context not wrapped by a try-block.
 /** Inner algorithms are spawned inside the new bound context by default. Since
     exceptions thrown from the inner pipeline are not handled by the caller
     (outer pipeline body) in this test, they will cancel all the sibling inner
     algorithms. **/
-void Test2_pipeline(const FilterSet& filters) {
+void Test2_pipeline ( const FilterSet& filters ) {
     ResetGlobals();
     g_NestedPipelines = true;
     CustomPipeline<InputFilter, OuterFilter> testPipeline(filters);
     TRY();
-    testPipeline.run();
+        testPipeline.run();
     CATCH_AND_ASSERT();
-    bool okayNoExceptionCaught = (g_ExceptionInMaster && !g_MasterExecutedThrow)
-                                 || (!g_ExceptionInMaster && !g_NonMasterExecutedThrow);
-    REQUIRE_MESSAGE((g_NumExceptionsCaught == 1 || okayNoExceptionCaught),
-                    "No try_blocks in any body expected in this test");
-    if (!g_SolitaryException) {
-        REQUIRE_MESSAGE(g_CurExecuted <= g_ExecutedAtLastCatch + g_NumThreads,
-                        "Too many tasks survived exception");
+    bool okayNoExceptionCaught = (g_ExceptionInMaster && !g_MasterExecutedThrow) || (!g_ExceptionInMaster && !g_NonMasterExecutedThrow);
+    REQUIRE_MESSAGE ((g_NumExceptionsCaught == 1 || okayNoExceptionCaught), "No try_blocks in any body expected in this test");
+    if ( !g_SolitaryException ) {
+        REQUIRE_MESSAGE (g_CurExecuted <= g_ExecutedAtLastCatch + g_NumThreads, "Too many tasks survived exception");
     }
-}// void Test2_pipeline ()
+} // void Test2_pipeline ()
 
 //! creates isolated inner pipeline and runs it.
 class OuterFilterWithIsolatedCtx {
 public:
-    OuterFilterWithIsolatedCtx(bool, bool) {}
+    OuterFilterWithIsolatedCtx( bool , bool ) {}
 
     void* operator()(void* item) const {
         ++g_OuterParCalls;
@@ -1424,7 +1450,7 @@ class OuterFilterWithIsolatedCtx {
         testPipeline.run(ctx);
         return item;
     }
-};// class OuterFilterWithIsolatedCtx
+}; // class OuterFilterWithIsolatedCtx
 
 //! Uses pipeline invoking an inner pipeline with an isolated context without a try-block.
 /** Even though exceptions thrown from the inner pipeline are not handled
@@ -1432,22 +1458,23 @@ class OuterFilterWithIsolatedCtx {
     already running because of the isolated contexts. However because the first
     exception cancels the root parallel_for_each only the first g_NumThreads subranges
     will be processed (which launch inner pipelines) **/
-void Test3_pipeline(const FilterSet& filters) {
-    for (int nTries = 1; nTries <= 4; ++nTries) {
+void Test3_pipeline ( const FilterSet& filters ) {
+    for( int nTries = 1; nTries <= 4; ++nTries) {
         ResetGlobals();
         g_NestedPipelines = true;
         g_Master = std::this_thread::get_id();
-        intptr_t innerCalls = get_iter_range_size(), minExecuted = (g_NumThreads - 1) * innerCalls;
+        intptr_t innerCalls = get_iter_range_size(),
+                 minExecuted = (g_NumThreads - 1) * innerCalls;
         CustomPipeline<InputFilter, OuterFilterWithIsolatedCtx> testPipeline(filters);
         TRY();
-        testPipeline.run();
+            testPipeline.run();
         CATCH_AND_ASSERT();
 
-        bool okayNoExceptionCaught = (g_ExceptionInMaster && !g_MasterExecuted)
-                                     || (!g_ExceptionInMaster && !g_NonMasterExecuted);
+        bool okayNoExceptionCaught = (g_ExceptionInMaster && !g_MasterExecuted) ||
+            (!g_ExceptionInMaster && !g_NonMasterExecuted);
         // only test assertions if the test threw an exception (or we don't care)
         bool testSucceeded = okayNoExceptionCaught || g_NumExceptionsCaught > 0;
-        if (testSucceeded) {
+        if(testSucceeded) {
             if (g_SolitaryException) {
 
                 // The test is one outer pipeline with two NestedFilters that each start an inner pipeline.
@@ -1468,7 +1495,7 @@ void Test3_pipeline(const FilterSet& filters) {
                 //                   ^ completing pipelines (remembering two will not complete)
                 //                                              ^ one for the inner throwing pipeline
 
-                minExecuted = (2 * get_iter_range_size()) * (g_PipelinesStarted - 2) + 1;
+                minExecuted = (2*get_iter_range_size()) * (g_PipelinesStarted - 2) + 1;
                 // each failing pipeline must execute at least two tasks
                 REQUIRE_MESSAGE(g_CurExecuted >= minExecuted, "Too few tasks survived exception");
                 // no more than g_NumThreads tasks will be executed in a cancelled context.  Otherwise
@@ -1478,108 +1505,119 @@ void Test3_pipeline(const FilterSet& filters) {
                 // if we're only throwing from the external thread, and that thread didn't
                 // participate in the pipelines, then no throw occurred.
             }
-            REQUIRE_MESSAGE((g_NumExceptionsCaught == 1 || okayNoExceptionCaught),
-                            "No try_blocks in any body expected in this test");
-            REQUIRE_MESSAGE(
-                    ((g_CurExecuted <= g_ExecutedAtLastCatch + g_NumThreads) || okayNoExceptionCaught),
-                    "Too many tasks survived exception");
+            REQUIRE_MESSAGE ((g_NumExceptionsCaught == 1 || okayNoExceptionCaught), "No try_blocks in any body expected in this test");
+            REQUIRE_MESSAGE (((g_CurExecuted <= g_ExecutedAtLastCatch + g_NumThreads) || okayNoExceptionCaught), "Too many tasks survived exception");
             return;
         }
     }
 }
 
-class OuterFilterWithEhBody {
+class OuterFilterWithEhBody  {
 public:
-    OuterFilterWithEhBody(bool, bool) {}
+    OuterFilterWithEhBody( bool, bool ){}
 
     void* operator()(void* item) const {
         tbb::task_group_context ctx(tbb::task_group_context::isolated);
         ++g_OuterParCalls;
         SimplePipeline testPipeline(serial_parallel);
         TRY();
-        testPipeline.run(ctx);
+            testPipeline.run(ctx);
         CATCH();
         return item;
     }
-};// class OuterFilterWithEhBody
+}; // class OuterFilterWithEhBody
 
 //! Uses pipeline body invoking an inner pipeline (with isolated context) inside a try-block.
 /** Since exception(s) thrown from the inner pipeline are handled by the caller
     in this test, they do not affect other tasks of the the root pipeline
     nor sibling inner algorithms. **/
-void Test4_pipeline(const FilterSet& filters) {
+void Test4_pipeline ( const FilterSet& filters ) {
 #if __GNUC__ && !__INTEL_COMPILER
-    if (strncmp(__VERSION__, "4.1.0", 5) == 0) {
+    if ( strncmp(__VERSION__, "4.1.0", 5) == 0 ) {
         MESSAGE("Known issue: one of exception handling tests is skipped.");
         return;
     }
 #endif
-    ResetGlobals(true, true);
+    ResetGlobals( true, true );
     // each outer pipeline stage will start get_iter_range_size() inner pipelines.
     // each inner pipeline that doesn't throw will process get_iter_range_size() items.
     // for solitary exception there will be one pipeline that only processes one stage, one item.
     // innerCalls should be 2*get_iter_range_size()
-    intptr_t innerCalls = 2 * get_iter_range_size(), outerCalls = 2 * get_iter_range_size(),
-             maxExecuted = outerCalls * innerCalls;// the number of invocations of the inner pipelines
+    intptr_t innerCalls = 2*get_iter_range_size(),
+             outerCalls = 2*get_iter_range_size(),
+             maxExecuted = outerCalls * innerCalls;  // the number of invocations of the inner pipelines
     CustomPipeline<InputFilter, OuterFilterWithEhBody> testPipeline(filters);
     TRY();
-    testPipeline.run();
+        testPipeline.run();
     CATCH_AND_ASSERT();
-    intptr_t minExecuted = 0;
-    bool okayNoExceptionCaught
-            = (g_ExceptionInMaster && !g_MasterExecuted) || (!g_ExceptionInMaster && !g_NonMasterExecuted);
-    if (g_SolitaryException) {
-        minExecuted = maxExecuted - innerCalls;// one throwing inner pipeline
+    intptr_t  minExecuted = 0;
+    bool okayNoExceptionCaught = (g_ExceptionInMaster && !g_MasterExecuted) ||
+        (!g_ExceptionInMaster && !g_NonMasterExecuted);
+    if ( g_SolitaryException ) {
+        minExecuted = maxExecuted - innerCalls;  // one throwing inner pipeline
         REQUIRE_MESSAGE((g_NumExceptionsCaught == 1 || okayNoExceptionCaught), "No exception registered");
-        g_TGCCancelled.validate(g_NumThreads, "Too many tasks survived exception");// probably will assert.
-    } else {
+        g_TGCCancelled.validate(g_NumThreads, "Too many tasks survived exception");  // probably will assert.
+    }
+    else {
         // we assume throwing pipelines will not count
         minExecuted = (outerCalls - g_NumExceptionsCaught) * innerCalls;
-        REQUIRE_MESSAGE(((g_NumExceptionsCaught >= 1 && g_NumExceptionsCaught <= outerCalls)
-                         || okayNoExceptionCaught),
-                        "Unexpected actual number of exceptions");
-        REQUIRE_MESSAGE(g_CurExecuted >= minExecuted, "Too many executed tasks reported");
+        REQUIRE_MESSAGE(((g_NumExceptionsCaught >= 1 && g_NumExceptionsCaught <= outerCalls) || okayNoExceptionCaught), "Unexpected actual number of exceptions");
+        REQUIRE_MESSAGE (g_CurExecuted >= minExecuted, "Too many executed tasks reported");
         // too many already-scheduled tasks are started after the first exception is
         // thrown.  And g_ExecutedAtLastCatch is updated every time an exception is caught.
         // So with multiple exceptions there are a variable number of tasks that have been
         // discarded because of the signals.
         // each throw is caught, so we will see many cancelled tasks.  g_ExecutedAtLastCatch is
         // updated with each throw, so the value will be the number of tasks executed at the last
-        REQUIRE_MESSAGE(g_CurExecuted <= g_ExecutedAtLastCatch + g_NumThreads,
-                        "Too many tasks survived multiple exceptions");
+        REQUIRE_MESSAGE (g_CurExecuted <= g_ExecutedAtLastCatch + g_NumThreads, "Too many tasks survived multiple exceptions");
     }
-}// void Test4_pipeline ()
+} // void Test4_pipeline ()
 
 //! Tests pipeline function passed with different combination of filters
-template <void testFunc(const FilterSet&)>
+template<void testFunc(const FilterSet&)>
 void TestWithDifferentFiltersAndConcurrency() {
-    for (auto concurrency_level : utils::concurrency_range()) {
+#if __TBB_USE_ADDRESS_SANITIZER
+    // parallel_pipeline allocates tls that sporadically observed as a memory leak with
+    // detached threads. So, use task_scheduler_handle to join threads with finalize
+    tbb::task_scheduler_handle handle{ tbb::attach{} };
+#endif
+    for (auto concurrency_level: utils::concurrency_range()) {
         g_NumThreads = static_cast<int>(concurrency_level);
         g_Master = std::this_thread::get_id();
         if (g_NumThreads > 1) {
 
-            const tbb::filter_mode modes[] = {tbb::filter_mode::parallel, tbb::filter_mode::serial_in_order,
-                                              tbb::filter_mode::serial_out_of_order};
+            const tbb::filter_mode modes[] = {
+                tbb::filter_mode::parallel,
+                tbb::filter_mode::serial_in_order,
+                tbb::filter_mode::serial_out_of_order
+            };
 
-            const int NumFilterTypes = sizeof(modes) / sizeof(modes[0]);
+            const int NumFilterTypes = sizeof(modes)/sizeof(modes[0]);
 
             // Execute in all the possible modes
-            for (size_t j = 0; j < 4; ++j) {
-                tbb::global_control control(tbb::global_control::max_allowed_parallelism, g_NumThreads);
-                g_ExceptionInMaster = (j & 1) != 0;
-                g_SolitaryException = (j & 2) != 0;
-                g_NumTokens = 2 * g_NumThreads;
-
-                for (int i = 0; i < NumFilterTypes; ++i) {
-                    for (int n = 0; n < NumFilterTypes; ++n) {
-                        for (int k = 0; k < 2; ++k) testFunc(FilterSet(modes[i], modes[n], k == 0, k != 0));
+            for ( size_t j = 0; j < 4; ++j ) {
+                tbb::task_arena a(g_NumThreads);
+                a.execute([&] {
+                    g_ExceptionInMaster = (j & 1) != 0;
+                    g_SolitaryException = (j & 2) != 0;
+                    g_NumTokens = 2 * g_NumThreads;
+
+                    for (int i = 0; i < NumFilterTypes; ++i) {
+                        for (int n = 0; n < NumFilterTypes; ++n) {
+                            for (int k = 0; k < 2; ++k)
+                                testFunc(FilterSet(modes[i], modes[n], k == 0, k != 0));
+                        }
                     }
-                }
+                });
             }
         }
     }
+#if __TBB_USE_ADDRESS_SANITIZER
+    tbb::finalize(handle);
+#endif
 }
 
+#if !EMSCRIPTEN
 //! Testing parallel_pipeline exception handling
 //! \brief \ref error_guessing
 TEST_CASE("parallel_pipeline exception handling test #1") {
@@ -1603,10 +1641,10 @@ TEST_CASE("parallel_pipeline exception handling test #3") {
 TEST_CASE("parallel_pipeline exception handling test #4") {
     TestWithDifferentFiltersAndConcurrency<Test4_pipeline>();
 }
-
+#endif
 #endif /* TBB_USE_EXCEPTIONS */
 
-class FilterToCancel {
+class FilterToCancel  {
 public:
     FilterToCancel() {}
     void* operator()(void* item) const {
@@ -1614,42 +1652,40 @@ class FilterToCancel {
         Cancellator::WaitUntilReady();
         return item;
     }
-};// class FilterToCancel
+}; // class FilterToCancel
 
 template <class Filter_to_cancel>
 class PipelineLauncher {
-    tbb::task_group_context& my_ctx;
-
+    tbb::task_group_context &my_ctx;
 public:
-    PipelineLauncher(tbb::task_group_context& ctx) : my_ctx(ctx) {}
+    PipelineLauncher ( tbb::task_group_context& ctx ) : my_ctx(ctx) {}
 
     void operator()() const {
         // Run test when serial filter is the first non-input filter
         InputFilter inputFilter;
         Filter_to_cancel filterToCancel;
         tbb::parallel_pipeline(
-                g_NumTokens,
-                tbb::make_filter<void, void*>(tbb::filter_mode::parallel, inputFilter)
-                        & tbb::make_filter<void*, void>(tbb::filter_mode::parallel, filterToCancel),
-                my_ctx);
+            g_NumTokens,
+            tbb::make_filter<void, void*>(tbb::filter_mode::parallel, inputFilter) &
+            tbb::make_filter<void*, void>(tbb::filter_mode::parallel, filterToCancel),
+            my_ctx
+        );
     }
 };
 
 //! Test for cancelling an algorithm from outside (from a task running in parallel with the algorithm).
-void TestCancelation1_pipeline() {
+void TestCancelation1_pipeline () {
     ResetGlobals();
     g_ThrowException = false;
     // Threshold should leave more than max_threads tasks to test the cancellation. Set the threshold to iter_range_size()/4 since iter_range_size >= max_threads*2
     intptr_t threshold = get_iter_range_size() / 4;
-    REQUIRE_MESSAGE(get_iter_range_size() - threshold > g_NumThreads,
-                    "Threshold should leave more than max_threads tasks to test the cancellation.");
+    REQUIRE_MESSAGE(get_iter_range_size() - threshold > g_NumThreads, "Threshold should leave more than max_threads tasks to test the cancellation.");
     RunCancellationTest<PipelineLauncher<FilterToCancel>, Cancellator>(threshold);
     g_TGCCancelled.validate(g_NumThreads, "Too many tasks survived cancellation");
-    REQUIRE_MESSAGE(g_CurExecuted < g_ExecutedAtLastCatch + g_NumThreads,
-                    "Too many tasks were executed after cancellation");
+    REQUIRE_MESSAGE (g_CurExecuted < g_ExecutedAtLastCatch + g_NumThreads, "Too many tasks were executed after cancellation");
 }
 
-class FilterToCancel2 {
+class FilterToCancel2  {
 public:
     FilterToCancel2() {}
 
@@ -1657,21 +1693,22 @@ class FilterToCancel2 {
         ++g_CurExecuted;
         utils::ConcurrencyTracker ct;
         // The test will hang (and be timed out by the test system) if is_cancelled() is broken
-        while (!tbb::is_current_task_group_canceling()) utils::yield();
+        while( !tbb::is_current_task_group_canceling() )
+            utils::yield();
         return item;
     }
 };
 
 //! Test for cancelling an algorithm from outside (from a task running in parallel with the algorithm).
 /** This version also tests task::is_cancelled() method. **/
-void TestCancelation2_pipeline() {
+void TestCancelation2_pipeline () {
     ResetGlobals();
     RunCancellationTest<PipelineLauncher<FilterToCancel2>, Cancellator2>();
     // g_CurExecuted is always >= g_ExecutedAtLastCatch, because the latter is always a snapshot of the
     // former, and g_CurExecuted is monotonic increasing.  so the comparison should be at least ==.
     // If another filter is started after cancel but before cancellation is propagated, then the
     // number will be larger.
-    REQUIRE_MESSAGE(g_CurExecuted <= g_ExecutedAtLastCatch, "Some tasks were executed after cancellation");
+    REQUIRE_MESSAGE (g_CurExecuted <= g_ExecutedAtLastCatch, "Some tasks were executed after cancellation");
 }
 
 /** If min and max thread numbers specified on the command line are different,
@@ -1681,39 +1718,45 @@ void TestCancelation2_pipeline() {
 //! Testing parallel_pipeline cancellation
 //! \brief \ref error_guessing
 TEST_CASE("parallel_pipeline cancellation test #1") {
-    for (auto concurrency_level : utils::concurrency_range()) {
+    for (auto concurrency_level: utils::concurrency_range()) {
         g_NumThreads = static_cast<int>(concurrency_level);
         g_Master = std::this_thread::get_id();
         if (g_NumThreads > 1) {
-            tbb::global_control control(tbb::global_control::max_allowed_parallelism, g_NumThreads);
-            // Execute in all the possible modes
-            for (size_t j = 0; j < 4; ++j) {
-                g_ExceptionInMaster = (j & 1) != 0;
-                g_SolitaryException = (j & 2) != 0;
-                g_NumTokens = 2 * g_NumThreads;
-
-                TestCancelation1_pipeline();
-            }
+            tbb::task_arena a(g_NumThreads);
+            a.execute([] {
+                // Execute in all the possible modes
+                for (size_t j = 0; j < 4; ++j) {
+                    g_ExceptionInMaster = (j & 1) != 0;
+                    g_SolitaryException = (j & 2) != 0;
+                    g_NumTokens = 2 * g_NumThreads;
+
+                    TestCancelation1_pipeline();
+                }
+            });
         }
     }
 }
 
+#if !EMSCRIPTEN
 //! Testing parallel_pipeline cancellation
 //! \brief \ref error_guessing
 TEST_CASE("parallel_pipeline cancellation test #2") {
-    for (auto concurrency_level : utils::concurrency_range()) {
+    for (auto concurrency_level: utils::concurrency_range()) {
         g_NumThreads = static_cast<int>(concurrency_level);
         g_Master = std::this_thread::get_id();
         if (g_NumThreads > 1) {
-            tbb::global_control control(tbb::global_control::max_allowed_parallelism, g_NumThreads);
-            // Execute in all the possible modes
-            for (size_t j = 0; j < 4; ++j) {
-                g_ExceptionInMaster = (j & 1) != 0;
-                g_SolitaryException = (j & 2) != 0;
-                g_NumTokens = 2 * g_NumThreads;
-
-                TestCancelation2_pipeline();
-            }
+            tbb::task_arena a(g_NumThreads);
+            a.execute([] {
+                // Execute in all the possible modes
+                for (size_t j = 0; j < 4; ++j) {
+                    g_ExceptionInMaster = (j & 1) != 0;
+                    g_SolitaryException = (j & 2) != 0;
+                    g_NumTokens = 2 * g_NumThreads;
+
+                    TestCancelation2_pipeline();
+                }
+            });
         }
     }
 }
+#endif
diff --git a/external/tbb/test/tbb/test_eh_flow_graph.cpp b/external/tbb/test/tbb/test_eh_flow_graph.cpp
index a0c687a5..160efe90 100644
--- a/external/tbb/test/tbb/test_eh_flow_graph.cpp
+++ b/external/tbb/test/tbb/test_eh_flow_graph.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -29,17 +29,17 @@
 
 #if TBB_USE_EXCEPTIONS
 
+#include "common/utils.h"
 #include "common/checktype.h"
 #include "common/concurrency_tracker.h"
-#include "common/utils.h"
 
 #if _MSC_VER
-#pragma warning(disable : 4503)// Suppress "decorated name length exceeded, name was truncated" warning
+    #pragma warning (disable: 4503) // Suppress "decorated name length exceeded, name was truncated" warning
 #endif
 
 #if __TBB_MSVC_UNREACHABLE_CODE_IGNORED
-// Suppress "unreachable code" warning by VC++ 17.0-18.0 (VS 2012 or newer)
-#pragma warning(disable : 4702)
+    // Suppress "unreachable code" warning by VC++ 17.0-18.0 (VS 2012 or newer)
+    #pragma warning (disable: 4702)
 #endif
 
 // global task_scheduler_observer is an imperfect tool to find how many threads are really
@@ -68,31 +68,14 @@ static const size_t unlimited_type = 0;
 static const size_t serial_type = 1;
 static const size_t limited_type = 4;
 
-template <TestNodeTypeEnum T>
-struct TestNodeTypeName;
-template <>
-struct TestNodeTypeName<nonThrowing> {
-    static const char *name() { return "nonThrowing"; }
-};
-template <>
-struct TestNodeTypeName<isThrowing> {
-    static const char *name() { return "isThrowing"; }
-};
+template<TestNodeTypeEnum T> struct TestNodeTypeName;
+template<> struct TestNodeTypeName<nonThrowing> { static const char *name() { return "nonThrowing"; } };
+template<> struct TestNodeTypeName<isThrowing> { static const char *name() { return "isThrowing"; } };
 
-template <size_t Conc>
-struct concurrencyName;
-template <>
-struct concurrencyName<serial_type> {
-    static const char *name() { return "serial"; }
-};
-template <>
-struct concurrencyName<unlimited_type> {
-    static const char *name() { return "unlimited"; }
-};
-template <>
-struct concurrencyName<limited_type> {
-    static const char *name() { return "limited"; }
-};
+template<size_t Conc> struct concurrencyName;
+template<> struct concurrencyName<serial_type>{ static const char *name() { return "serial"; } };
+template<> struct concurrencyName<unlimited_type>{ static const char *name() { return "unlimited"; } };
+template<> struct concurrencyName<limited_type>{ static const char *name() { return "limited"; } };
 
 // Class that provides waiting and throwing behavior.  If we are not throwing, do nothing
 // If serial, we can't wait for concurrency to peak; we may be the bottleneck and will
@@ -100,25 +83,25 @@ struct concurrencyName<limited_type> {
 // arbitrary, and just makes sure there are enough items in the graph to keep it flowing),
 // If parallel or serial and throwing, use utils::ConcurrencyTracker to wait.
 
-template <size_t Conc, TestNodeTypeEnum t = nonThrowing>
+template<size_t Conc, TestNodeTypeEnum t = nonThrowing>
 class WaitThrow;
 
-template <>
-class WaitThrow<serial_type, nonThrowing> {
+template<>
+class WaitThrow<serial_type,nonThrowing> {
 protected:
     void WaitAndThrow(int cnt, const char * /*name*/) {
-        if (cnt > g_NumThreads + 10) {
+        if(cnt > g_NumThreads + 10) {
             utils::ConcurrencyTracker ct;
             WaitUntilConcurrencyPeaks();
         }
     }
 };
 
-template <>
-class WaitThrow<serial_type, isThrowing> {
+template<>
+class WaitThrow<serial_type,isThrowing> {
 protected:
     void WaitAndThrow(int cnt, const char * /*name*/) {
-        if (cnt > g_NumThreads + 10) {
+        if(cnt > g_NumThreads + 10) {
             utils::ConcurrencyTracker ct;
             WaitUntilConcurrencyPeaks();
             ThrowTestException(1);
@@ -132,29 +115,33 @@ class WaitThrow<serial_type, isThrowing> {
 // "absorbers" (because we broadcast to successors.)  for an odd number of threads we
 // need (g_NumThreads - limited + 1) / 2 items (that will give us one extra execution
 // of an "absorber", but we can't change that without changing the behavior of the node.)
-template <>
-class WaitThrow<limited_type, nonThrowing> {
+template<>
+class WaitThrow<limited_type,nonThrowing> {
 protected:
     void WaitAndThrow(int cnt, const char * /*name*/) {
-        if (cnt <= (g_NumThreads - (int) limited_type + 1) / 2) { return; }
+        if(cnt <= (g_NumThreads - (int)limited_type + 1)/2) {
+            return;
+        }
         utils::ConcurrencyTracker ct;
         WaitUntilConcurrencyPeaks();
     }
 };
 
-template <>
-class WaitThrow<limited_type, isThrowing> {
+template<>
+class WaitThrow<limited_type,isThrowing> {
 protected:
     void WaitAndThrow(int cnt, const char * /*name*/) {
         utils::ConcurrencyTracker ct;
-        if (cnt <= (g_NumThreads - (int) limited_type + 1) / 2) { return; }
+        if(cnt <= (g_NumThreads - (int)limited_type + 1)/2) {
+            return;
+        }
         WaitUntilConcurrencyPeaks();
         ThrowTestException(1);
     }
 };
 
-template <>
-class WaitThrow<unlimited_type, nonThrowing> {
+template<>
+class WaitThrow<unlimited_type,nonThrowing> {
 protected:
     void WaitAndThrow(int /*cnt*/, const char * /*name*/) {
         utils::ConcurrencyTracker ct;
@@ -162,8 +149,8 @@ class WaitThrow<unlimited_type, nonThrowing> {
     }
 };
 
-template <>
-class WaitThrow<unlimited_type, isThrowing> {
+template<>
+class WaitThrow<unlimited_type,isThrowing> {
 protected:
     void WaitAndThrow(int /*cnt*/, const char * /*name*/) {
         utils::ConcurrencyTracker ct;
@@ -172,7 +159,8 @@ class WaitThrow<unlimited_type, isThrowing> {
     }
 };
 
-void ResetGlobals(bool throwException = true, bool flog = false) {
+void
+ResetGlobals(bool throwException = true, bool flog = false) {
     nExceptions = 0;
     g_TGCCancelled = 0;
     ResetEhGlobals(throwException, flog);
@@ -184,14 +172,12 @@ class test_input_body : WaitThrow<serial_type, TType> {
     using WaitThrow<serial_type, TType>::WaitAndThrow;
     std::atomic<int> *my_current_val;
     int my_mult;
-
 public:
-    test_input_body(std::atomic<int> &my_cnt, int multiplier = 1)
-        : my_current_val(&my_cnt), my_mult(multiplier) {
+    test_input_body(std::atomic<int> &my_cnt, int multiplier = 1) : my_current_val(&my_cnt), my_mult(multiplier) {
         // INFO("- --------- - - -   constructed " << (size_t)(my_current_val) << "\n");
     }
 
-    OutputType operator()(tbb::flow_control &fc) {
+    OutputType operator()(tbb::flow_control& fc) {
         UPDATE_COUNTS();
         OutputType ret = OutputType(my_mult * ++(*my_current_val));
         // TODO revamp: reconsider logging for the tests.
@@ -200,54 +186,52 @@ class test_input_body : WaitThrow<serial_type, TType> {
         // calls to INFO() macro.
 
         // INFO("xx(" << (size_t)(my_current_val) << ") ret == " << (int)ret << "\n");
-        if (*my_current_val > g_NumItems) {
+        if(*my_current_val > g_NumItems) {
             // INFO(" ------ End of the line!\n");
             *my_current_val = g_NumItems;
             fc.stop();
             return OutputType();
         }
-        WaitAndThrow((int) ret, "test_input_body");
+        WaitAndThrow((int)ret,"test_input_body");
         return ret;
     }
 
-    int count_value() { return (int) *my_current_val; }
+    int count_value() { return (int)*my_current_val; }
 };
 
 template <TestNodeTypeEnum TType>
 class test_input_body<tbb::flow::continue_msg, TType> : WaitThrow<serial_type, TType> {
     using WaitThrow<serial_type, TType>::WaitAndThrow;
     std::atomic<int> *my_current_val;
-
 public:
-    test_input_body(std::atomic<int> &my_cnt) : my_current_val(&my_cnt) {}
+    test_input_body(std::atomic<int> &my_cnt) : my_current_val(&my_cnt) { }
 
-    tbb::flow::continue_msg operator()(tbb::flow_control &fc) {
+    tbb::flow::continue_msg operator()( tbb::flow_control & fc) {
         UPDATE_COUNTS();
         int outint = ++(*my_current_val);
-        if (*my_current_val > g_NumItems) {
+        if(*my_current_val > g_NumItems) {
             *my_current_val = g_NumItems;
             fc.stop();
             return tbb::flow::continue_msg();
         }
-        WaitAndThrow(outint, "test_input_body");
+        WaitAndThrow(outint,"test_input_body");
         return tbb::flow::continue_msg();
     }
 
-    int count_value() { return (int) *my_current_val; }
+    int count_value() { return (int)*my_current_val; }
 };
 
 // -------{function/continue}_node body ------------------
-template <class InputType, class OutputType, TestNodeTypeEnum T, size_t Conc>
-class absorber_body : WaitThrow<Conc, T> {
-    using WaitThrow<Conc, T>::WaitAndThrow;
+template<class InputType, class OutputType, TestNodeTypeEnum T, size_t Conc>
+class absorber_body : WaitThrow<Conc,T> {
+    using WaitThrow<Conc,T>::WaitAndThrow;
     std::atomic<int> *my_count;
-
 public:
-    absorber_body(std::atomic<int> &my_cnt) : my_count(&my_cnt) {}
-    OutputType operator()(const InputType & /*p_in*/) {
+    absorber_body(std::atomic<int> &my_cnt) : my_count(&my_cnt) { }
+    OutputType operator()(const InputType &/*p_in*/) {
         UPDATE_COUNTS();
         int out = ++(*my_count);
-        WaitAndThrow(out, "absorber_body");
+        WaitAndThrow(out,"absorber_body");
         return OutputType();
     }
     int count_value() { return *my_count; }
@@ -256,76 +240,70 @@ class absorber_body : WaitThrow<Conc, T> {
 // -------multifunction_node body ------------------
 
 // helper classes
-template <int N, class PortsType>
+template<int N,class PortsType>
 struct IssueOutput {
-    typedef typename std::tuple_element<N - 1, PortsType>::type::output_type my_type;
+    typedef typename std::tuple_element<N-1,PortsType>::type::output_type my_type;
 
-    static void issue_tuple_element(PortsType &my_ports) {
-        CHECK_MESSAGE((std::get<N - 1>(my_ports).try_put(my_type())), "Error putting to successor");
-        IssueOutput<N - 1, PortsType>::issue_tuple_element(my_ports);
+    static void issue_tuple_element( PortsType &my_ports) {
+        CHECK_MESSAGE( (std::get<N-1>(my_ports).try_put(my_type())), "Error putting to successor");
+        IssueOutput<N-1,PortsType>::issue_tuple_element(my_ports);
     }
 };
 
-template <class PortsType>
-struct IssueOutput<1, PortsType> {
-    typedef typename std::tuple_element<0, PortsType>::type::output_type my_type;
+template<class PortsType>
+struct IssueOutput<1,PortsType> {
+    typedef typename std::tuple_element<0,PortsType>::type::output_type my_type;
 
-    static void issue_tuple_element(PortsType &my_ports) {
-        CHECK_MESSAGE((std::get<0>(my_ports).try_put(my_type())), "Error putting to successor");
+    static void issue_tuple_element( PortsType &my_ports) {
+        CHECK_MESSAGE( (std::get<0>(my_ports).try_put(my_type())), "Error putting to successor");
     }
 };
 
-template <class InputType, class OutputTupleType, TestNodeTypeEnum T, size_t Conc>
-class multifunction_node_body : WaitThrow<Conc, T> {
-    using WaitThrow<Conc, T>::WaitAndThrow;
+template<class InputType, class OutputTupleType, TestNodeTypeEnum T, size_t Conc>
+class multifunction_node_body : WaitThrow<Conc,T> {
+    using WaitThrow<Conc,T>::WaitAndThrow;
     static const int N = std::tuple_size<OutputTupleType>::value;
-    typedef typename tbb::flow::multifunction_node<InputType, OutputTupleType> NodeType;
+    typedef typename tbb::flow::multifunction_node<InputType,OutputTupleType> NodeType;
     typedef typename NodeType::output_ports_type PortsType;
     std::atomic<int> *my_count;
-
 public:
-    multifunction_node_body(std::atomic<int> &my_cnt) : my_count(&my_cnt) {}
-    void operator()(const InputType & /*in*/, PortsType &my_ports) {
+    multifunction_node_body(std::atomic<int> &my_cnt) : my_count(&my_cnt) { }
+    void operator()(const InputType& /*in*/, PortsType &my_ports) {
         UPDATE_COUNTS();
         int out = ++(*my_count);
-        WaitAndThrow(out, "multifunction_node_body");
+        WaitAndThrow(out,"multifunction_node_body");
         // issue an item to each output port.
-        IssueOutput<N, PortsType>::issue_tuple_element(my_ports);
+        IssueOutput<N,PortsType>::issue_tuple_element(my_ports);
     }
 
     int count_value() { return *my_count; }
 };
 
 // --------- body to sort items in sequencer_node
-template <class BufferItemType>
+template<class BufferItemType>
 struct sequencer_body {
     size_t operator()(const BufferItemType &s) {
-        CHECK_MESSAGE((s), "sequencer item out of range (== 0)");
+        CHECK_MESSAGE( (s), "sequencer item out of range (== 0)");
         return size_t(s) - 1;
     }
 };
 
-// --------- body to compare the "priorities" of objects for priority_queue_node  five priority levels 0-4.
-template <class T>
-struct myLess {
-    bool operator()(const T &t1, const T &t2) { return (int(t1) % 5) < (int(t2) % 5); }
-};
-
 // --------- type for < comparison in priority_queue_node.
-template <class ItemType>
+template<class ItemType>
 struct less_body {
-    bool operator()(const ItemType &lhs, const ItemType &rhs) { return (int(lhs) % 3) < (int(rhs) % 3); }
+    bool operator()(const ItemType &lhs, const ItemType &rhs) {
+        return (int(lhs) % 3) < (int(rhs) % 3);
+    }
 };
 
 // --------- tag methods for tag_matching join_node
-template <typename TT>
+template<typename TT>
 class tag_func {
     TT my_mult;
-
 public:
-    tag_func(TT multiplier) : my_mult(multiplier) {}
+    tag_func(TT multiplier) : my_mult(multiplier) { }
     // operator() will return [0 .. Count)
-    tbb::flow::tag_value operator()(TT v) {
+    tbb::flow::tag_value operator()( TT v) {
         tbb::flow::tag_value t = tbb::flow::tag_value(v / my_mult);
         return t;
     }
@@ -334,27 +312,26 @@ class tag_func {
 // --------- Input body for split_node test.
 template <class OutputTuple, TestNodeTypeEnum TType>
 class tuple_test_input_body : WaitThrow<serial_type, TType> {
-    typedef typename std::tuple_element<0, OutputTuple>::type ItemType0;
-    typedef typename std::tuple_element<1, OutputTuple>::type ItemType1;
+    typedef typename std::tuple_element<0,OutputTuple>::type ItemType0;
+    typedef typename std::tuple_element<1,OutputTuple>::type ItemType1;
     using WaitThrow<serial_type, TType>::WaitAndThrow;
     std::atomic<int> *my_current_val;
-
 public:
-    tuple_test_input_body(std::atomic<int> &my_cnt) : my_current_val(&my_cnt) {}
+    tuple_test_input_body(std::atomic<int> &my_cnt) : my_current_val(&my_cnt) { }
 
-    OutputTuple operator()(tbb::flow_control &fc) {
+    OutputTuple operator()(tbb::flow_control& fc) {
         UPDATE_COUNTS();
         int ival = ++(*my_current_val);
-        if (*my_current_val > g_NumItems) {
-            *my_current_val = g_NumItems;// jam the final value; we assert on it later.
+        if(*my_current_val > g_NumItems) {
+            *my_current_val = g_NumItems;  // jam the final value; we assert on it later.
             fc.stop();
             return OutputTuple();
         }
-        WaitAndThrow(ival, "tuple_test_input_body");
-        return OutputTuple(ItemType0(ival), ItemType1(ival));
+        WaitAndThrow(ival,"tuple_test_input_body");
+        return OutputTuple(ItemType0(ival),ItemType1(ival));
     }
 
-    int count_value() { return (int) *my_current_val; }
+    int count_value() { return (int)*my_current_val; }
 };
 
 // ------- end of node bodies
@@ -367,11 +344,11 @@ class tuple_test_input_body : WaitThrow<serial_type, TType> {
 //    After each run the graph is reset(), to test the reset functionality.
 //
 
-template <class ItemType, TestNodeTypeEnum inpThrowType, TestNodeTypeEnum absorbThrowType>
+
+template<class ItemType, TestNodeTypeEnum inpThrowType, TestNodeTypeEnum absorbThrowType>
 void run_one_input_node_test(bool throwException, bool flog) {
-    typedef test_input_body<ItemType, inpThrowType> src_body_type;
-    typedef absorber_body<ItemType, tbb::flow::continue_msg, absorbThrowType, unlimited_type>
-            parallel_absorb_body_type;
+    typedef test_input_body<ItemType,inpThrowType> src_body_type;
+    typedef absorber_body<ItemType, tbb::flow::continue_msg, absorbThrowType, unlimited_type> parallel_absorb_body_type;
     std::atomic<int> input_body_count;
     std::atomic<int> absorber_body_count;
     input_body_count = 0;
@@ -388,67 +365,67 @@ void run_one_input_node_test(bool throwException, bool flog) {
 
     tbb::flow::input_node<ItemType> sn(g, src_body_type(input_body_count));
     parallel_absorb_body_type ab2(absorber_body_count);
-    tbb::flow::function_node<ItemType> parallel_fn(g, tbb::flow::unlimited, ab2);
+    tbb::flow::function_node<ItemType> parallel_fn(g,tbb::flow::unlimited,ab2);
     make_edge(sn, parallel_fn);
-    for (int runcnt = 0; runcnt < 2; ++runcnt) {
-        ResetGlobals(throwException, flog);
-        if (throwException) {
+    for(int runcnt = 0; runcnt < 2; ++runcnt) {
+        ResetGlobals(throwException,flog);
+        if(throwException) {
             TRY();
-            sn.activate();
-            g.wait_for_all();
+                sn.activate();
+                g.wait_for_all();
             CATCH_AND_ASSERT();
-        } else {
+        }
+        else {
             TRY();
-            sn.activate();
-            g.wait_for_all();
+                sn.activate();
+                g.wait_for_all();
             CATCH_AND_FAIL();
         }
 
-        bool okayNoExceptionsCaught = (g_ExceptionInMaster && !g_MasterExecutedThrow)
-                                      || (!g_ExceptionInMaster && !g_NonMasterExecutedThrow)
-                                      || !throwException;
+        bool okayNoExceptionsCaught = (g_ExceptionInMaster && !g_MasterExecutedThrow) || (!g_ExceptionInMaster && !g_NonMasterExecutedThrow) || !throwException;
         int src_cnt = tbb::flow::copy_body<src_body_type>(sn).count_value();
         int sink_cnt = tbb::flow::copy_body<parallel_absorb_body_type>(parallel_fn).count_value();
-        if (throwException) {
-            CHECK_MESSAGE((g.exception_thrown() || okayNoExceptionsCaught),
-                          "Exception flag in flow::graph not set");
-            CHECK_MESSAGE((g.is_cancelled() || okayNoExceptionsCaught), "canceled flag not set");
-            CHECK_MESSAGE((src_cnt <= g_NumItems), "Too many input_node items emitted");
-            CHECK_MESSAGE((sink_cnt <= src_cnt), "Too many input_node items received");
-        } else {
-            CHECK_MESSAGE((!g.exception_thrown()), "Exception flag in flow::graph set but no throw occurred");
-            CHECK_MESSAGE((!g.is_cancelled()), "canceled flag set but no throw occurred");
-            CHECK_MESSAGE((src_cnt == g_NumItems), "Incorrect # input_node items emitted");
-            CHECK_MESSAGE((sink_cnt == src_cnt), "Incorrect # input_node items received");
+        if(throwException) {
+            CHECK_MESSAGE( (g.exception_thrown() || okayNoExceptionsCaught), "Exception flag in flow::graph not set");
+            CHECK_MESSAGE( (g.is_cancelled() || okayNoExceptionsCaught), "canceled flag not set");
+            CHECK_MESSAGE( (src_cnt <= g_NumItems), "Too many input_node items emitted");
+            CHECK_MESSAGE( (sink_cnt <= src_cnt), "Too many input_node items received");
         }
-        g.reset();// resets the body of the input_node and the absorb_nodes.
+        else {
+            CHECK_MESSAGE( (!g.exception_thrown()), "Exception flag in flow::graph set but no throw occurred");
+            CHECK_MESSAGE( (!g.is_cancelled()), "canceled flag set but no throw occurred");
+            CHECK_MESSAGE( (src_cnt == g_NumItems), "Incorrect # input_node items emitted");
+            CHECK_MESSAGE( (sink_cnt == src_cnt), "Incorrect # input_node items received");
+        }
+        g.reset();  // resets the body of the input_node and the absorb_nodes.
         input_body_count = 0;
         absorber_body_count = 0;
-        CHECK_MESSAGE((!g.exception_thrown()), "Reset didn't clear exception_thrown()");
-        CHECK_MESSAGE((!g.is_cancelled()), "Reset didn't clear is_cancelled()");
+        CHECK_MESSAGE( (!g.exception_thrown()), "Reset didn't clear exception_thrown()");
+        CHECK_MESSAGE( (!g.is_cancelled()), "Reset didn't clear is_cancelled()");
         src_cnt = tbb::flow::copy_body<src_body_type>(sn).count_value();
         sink_cnt = tbb::flow::copy_body<parallel_absorb_body_type>(parallel_fn).count_value();
-        CHECK_MESSAGE((src_cnt == 0), "input_node count not reset");
-        CHECK_MESSAGE((sink_cnt == 0), "sink_node count not reset");
+        CHECK_MESSAGE( (src_cnt == 0), "input_node count not reset");
+        CHECK_MESSAGE( (sink_cnt == 0), "sink_node count not reset");
     }
 #if USE_TASK_SCHEDULER_OBSERVER
     o.observe(false);
 #endif
-}// run_one_input_node_test
+}  // run_one_input_node_test
+
 
-template <class ItemType, TestNodeTypeEnum inpThrowType, TestNodeTypeEnum absorbThrowType>
+template<class ItemType, TestNodeTypeEnum inpThrowType, TestNodeTypeEnum absorbThrowType>
 void run_input_node_test() {
-    run_one_input_node_test<ItemType, inpThrowType, absorbThrowType>(false, false);
-    run_one_input_node_test<ItemType, inpThrowType, absorbThrowType>(true, false);
-    run_one_input_node_test<ItemType, inpThrowType, absorbThrowType>(true, true);
-}// run_input_node_test
+    run_one_input_node_test<ItemType,inpThrowType,absorbThrowType>(false,false);
+    run_one_input_node_test<ItemType,inpThrowType,absorbThrowType>(true,false);
+    run_one_input_node_test<ItemType,inpThrowType,absorbThrowType>(true,true);
+}  // run_input_node_test
 
 void test_input_node() {
     INFO("Testing input_node\n");
     CheckType<int>::check_type_counter = 0;
     g_Wakeup_Msg = "input_node(1): Missed wakeup or machine is overloaded?";
     run_input_node_test<CheckType<int>, isThrowing, nonThrowing>();
-    CHECK_MESSAGE((!CheckType<int>::check_type_counter), "Some items leaked in test");
+    CHECK_MESSAGE( (!CheckType<int>::check_type_counter), "Some items leaked in test");
     g_Wakeup_Msg = "input_node(2): Missed wakeup or machine is overloaded?";
     run_input_node_test<int, isThrowing, nonThrowing>();
     g_Wakeup_Msg = "input_node(3): Missed wakeup or machine is overloaded?";
@@ -458,7 +435,7 @@ void test_input_node() {
     g_Wakeup_Msg = "input_node(5): Missed wakeup or machine is overloaded?";
     run_input_node_test<CheckType<int>, isThrowing, isThrowing>();
     g_Wakeup_Msg = g_Orig_Wakeup_Msg;
-    CHECK_MESSAGE((!CheckType<int>::check_type_counter), "Some items leaked in test");
+    CHECK_MESSAGE( (!CheckType<int>::check_type_counter), "Some items leaked in test");
 }
 
 // -------- utilities & types to test function_node and multifunction_node.
@@ -466,31 +443,46 @@ void test_input_node() {
 // need to tell the template which node type I am using so it attaches successors correctly.
 enum NodeFetchType { func_node_type, multifunc_node_type };
 
-template <class NodeType, class ItemType, int indx, NodeFetchType NFT>
+template<class NodeType, class ItemType, int indx, NodeFetchType NFT>
 struct AttachPoint;
 
-template <class NodeType, class ItemType, int indx>
-struct AttachPoint<NodeType, ItemType, indx, multifunc_node_type> {
-    static tbb::flow::sender<ItemType> &GetSender(NodeType &n) { return tbb::flow::output_port<indx>(n); }
+template<class NodeType, class ItemType, int indx>
+struct AttachPoint<NodeType,ItemType,indx,multifunc_node_type> {
+    static tbb::flow::sender<ItemType> &GetSender(NodeType &n) {
+        return tbb::flow::output_port<indx>(n);
+    }
 };
 
-template <class NodeType, class ItemType, int indx>
-struct AttachPoint<NodeType, ItemType, indx, func_node_type> {
-    static tbb::flow::sender<ItemType> &GetSender(NodeType &n) { return n; }
+template<class NodeType, class ItemType, int indx>
+struct AttachPoint<NodeType,ItemType,indx,func_node_type> {
+    static tbb::flow::sender<ItemType> &GetSender(NodeType &n) {
+        return n;
+    }
 };
 
+
 // common template for running function_node, multifunction_node.  continue_node
 // has different firing requirements, so it needs a different graph topology.
-template <class InputNodeType, class InputNodeBodyType0, class InputNodeBodyType1, NodeFetchType NFT,
-          class TestNodeType, class TestNodeBodyType,
-          class TypeToSink0,  // what kind of item are we sending to sink0
-          class TypeToSink1,  // what kind of item are we sending to sink1
-          class SinkNodeType0,// will be same for function;
-          class SinkNodeType1,// may differ for multifunction_node
-          class SinkNodeBodyType0, class SinkNodeBodyType1, size_t Conc>
-void run_one_functype_node_test(bool throwException, bool flog, const char * /*name*/) {
+template<
+    class InputNodeType,
+    class InputNodeBodyType0,
+    class InputNodeBodyType1,
+    NodeFetchType NFT,
+    class TestNodeType,
+    class TestNodeBodyType,
+    class TypeToSink0,          // what kind of item are we sending to sink0
+    class TypeToSink1,          // what kind of item are we sending to sink1
+    class SinkNodeType0,        // will be same for function;
+    class SinkNodeType1,        // may differ for multifunction_node
+    class SinkNodeBodyType0,
+    class SinkNodeBodyType1,
+    size_t Conc
+    >
+void
+run_one_functype_node_test(bool throwException, bool flog, const char * /*name*/) {
 
     std::stringstream ss;
+    std::string ss_str;
     char *saved_msg = const_cast<char *>(g_Wakeup_Msg);
     tbb::flow::graph g;
 
@@ -510,67 +502,60 @@ void run_one_functype_node_test(bool throwException, bool flog, const char * /*n
     InputNodeType input0(g, InputNodeBodyType0(input0_count));
     InputNodeType input1(g, InputNodeBodyType1(input1_count));
     TestNodeType node_to_test(g, Conc, TestNodeBodyType(test_count));
-    SinkNodeType0 sink0(g, tbb::flow::unlimited, SinkNodeBodyType0(sink0_count));
-    SinkNodeType1 sink1(g, tbb::flow::unlimited, SinkNodeBodyType1(sink1_count));
+    SinkNodeType0 sink0(g,tbb::flow::unlimited,SinkNodeBodyType0(sink0_count));
+    SinkNodeType1 sink1(g,tbb::flow::unlimited,SinkNodeBodyType1(sink1_count));
     make_edge(input0, node_to_test);
     make_edge(input1, node_to_test);
     make_edge(AttachPoint<TestNodeType, TypeToSink0, 0, NFT>::GetSender(node_to_test), sink0);
     make_edge(AttachPoint<TestNodeType, TypeToSink1, 1, NFT>::GetSender(node_to_test), sink1);
 
-    for (int iter = 0; iter < 2; ++iter) {// run, reset, run again
+    for(int iter = 0; iter < 2; ++iter) {  // run, reset, run again
         ss.clear();
-        ss << saved_msg << " iter=" << iter << ", threads=" << g_NumThreads
-           << ", throw=" << (throwException ? "T" : "F") << ", flow=" << (flog ? "T" : "F");
-        g_Wakeup_Msg = ss.str().c_str();
-        ResetGlobals(throwException, flog);
-        if (throwException) {
+        ss << saved_msg << " iter=" << iter << ", threads=" << g_NumThreads << ", throw=" << (throwException ? "T" : "F") << ", flow=" << (flog ? "T" : "F");
+        ss_str = ss.str();
+        g_Wakeup_Msg = ss_str.c_str();
+        ResetGlobals(throwException,flog);
+        if(throwException) {
             TRY();
-            input0.activate();
-            input1.activate();
-            g.wait_for_all();
+                input0.activate();
+                input1.activate();
+                g.wait_for_all();
             CATCH_AND_ASSERT();
-        } else {
+        }
+        else {
             TRY();
-            input0.activate();
-            input1.activate();
-            g.wait_for_all();
+                input0.activate();
+                input1.activate();
+                g.wait_for_all();
             CATCH_AND_FAIL();
         }
-        bool okayNoExceptionsCaught = (g_ExceptionInMaster && !g_MasterExecutedThrow)
-                                      || (!g_ExceptionInMaster && !g_NonMasterExecutedThrow)
-                                      || !throwException;
+        bool okayNoExceptionsCaught = (g_ExceptionInMaster && !g_MasterExecutedThrow) || (!g_ExceptionInMaster && !g_NonMasterExecutedThrow) || !throwException;
         int ib0_cnt = tbb::flow::copy_body<InputNodeBodyType0>(input0).count_value();
         int ib1_cnt = tbb::flow::copy_body<InputNodeBodyType1>(input1).count_value();
-        int t_cnt = tbb::flow::copy_body<TestNodeBodyType>(node_to_test).count_value();
+        int t_cnt   = tbb::flow::copy_body<TestNodeBodyType>(node_to_test).count_value();
         int nb0_cnt = tbb::flow::copy_body<SinkNodeBodyType0>(sink0).count_value();
         int nb1_cnt = tbb::flow::copy_body<SinkNodeBodyType1>(sink1).count_value();
-        if (throwException) {
-            CHECK_MESSAGE((g.exception_thrown() || okayNoExceptionsCaught), "Exception not caught by graph");
-            CHECK_MESSAGE((g.is_cancelled() || okayNoExceptionsCaught),
-                          "Cancellation not signalled in graph");
-            CHECK_MESSAGE((ib0_cnt + ib1_cnt <= 2 * g_NumItems), "Too many items sent by inputs");
-            CHECK_MESSAGE((ib0_cnt + ib1_cnt >= t_cnt), "Too many items received by test node");
-            CHECK_MESSAGE((nb0_cnt + nb1_cnt <= t_cnt * 2), "Too many items received by sink nodes");
-        } else {
-            CHECK_MESSAGE((!g.exception_thrown()), "Exception flag in flow::graph set but no throw occurred");
-            CHECK_MESSAGE((!g.is_cancelled()), "canceled flag set but no throw occurred");
-            CHECK_MESSAGE((ib0_cnt + ib1_cnt == 2 * g_NumItems), "Missing invocations of input_nodes");
-            CHECK_MESSAGE((t_cnt == 2 * g_NumItems), "Not all items reached test node");
-            CHECK_MESSAGE((nb0_cnt == 2 * g_NumItems && nb1_cnt == 2 * g_NumItems),
-                          "Missing items in absorbers");
+        if(throwException) {
+            CHECK_MESSAGE( (g.exception_thrown() || okayNoExceptionsCaught), "Exception not caught by graph");
+            CHECK_MESSAGE( (g.is_cancelled() || okayNoExceptionsCaught), "Cancellation not signalled in graph");
+            CHECK_MESSAGE( (ib0_cnt + ib1_cnt <= 2*g_NumItems), "Too many items sent by inputs");
+            CHECK_MESSAGE( (ib0_cnt + ib1_cnt >= t_cnt), "Too many items received by test node");
+            CHECK_MESSAGE( (nb0_cnt + nb1_cnt <= t_cnt*2), "Too many items received by sink nodes");
         }
-        g.reset();// resets the body of the input_nodes, test_node and the absorb_nodes.
+        else {
+            CHECK_MESSAGE( (!g.exception_thrown()), "Exception flag in flow::graph set but no throw occurred");
+            CHECK_MESSAGE( (!g.is_cancelled()), "canceled flag set but no throw occurred");
+            CHECK_MESSAGE( (ib0_cnt + ib1_cnt == 2*g_NumItems), "Missing invocations of input_nodes");
+            CHECK_MESSAGE( (t_cnt == 2*g_NumItems), "Not all items reached test node");
+            CHECK_MESSAGE( (nb0_cnt == 2*g_NumItems && nb1_cnt == 2*g_NumItems), "Missing items in absorbers");
+        }
+        g.reset();  // resets the body of the input_nodes, test_node and the absorb_nodes.
         input0_count = input1_count = sink0_count = sink1_count = test_count = 0;
-        CHECK_MESSAGE((0 == tbb::flow::copy_body<InputNodeBodyType0>(input0).count_value()),
-                      "Reset input 0 failed");
-        CHECK_MESSAGE((0 == tbb::flow::copy_body<InputNodeBodyType1>(input1).count_value()),
-                      "Reset input 1 failed");
-        CHECK_MESSAGE((0 == tbb::flow::copy_body<TestNodeBodyType>(node_to_test).count_value()),
-                      "Reset test_node failed");
-        CHECK_MESSAGE((0 == tbb::flow::copy_body<SinkNodeBodyType0>(sink0).count_value()),
-                      "Reset sink 0 failed");
-        CHECK_MESSAGE((0 == tbb::flow::copy_body<SinkNodeBodyType1>(sink1).count_value()),
-                      "Reset sink 1 failed");
+        CHECK_MESSAGE( (0 == tbb::flow::copy_body<InputNodeBodyType0>(input0).count_value()),"Reset input 0 failed");
+        CHECK_MESSAGE( (0 == tbb::flow::copy_body<InputNodeBodyType1>(input1).count_value()),"Reset input 1 failed");
+        CHECK_MESSAGE( (0 == tbb::flow::copy_body<TestNodeBodyType>(node_to_test).count_value()),"Reset test_node failed");
+        CHECK_MESSAGE( (0 == tbb::flow::copy_body<SinkNodeBodyType0>(sink0).count_value()),"Reset sink 0 failed");
+        CHECK_MESSAGE( (0 == tbb::flow::copy_body<SinkNodeBodyType1>(sink1).count_value()),"Reset sink 1 failed");
 
         g_Wakeup_Msg = saved_msg;
     }
@@ -591,107 +576,92 @@ void run_one_functype_node_test(bool throwException, bool flog, const char * /*n
 //
 //    After each run the graph is reset(), to test the reset functionality.
 //
-template <TestNodeTypeEnum IType1,// does input node 1 throw?
-          TestNodeTypeEnum IType2,// does input node 2 throw?
-          class Item12,           // type of item passed between inputs and test node
-          TestNodeTypeEnum FType, // does function node throw?
-          class Item23,           // type passed from function_node to sink nodes
-          TestNodeTypeEnum NType1,// does sink node 1 throw?
-          TestNodeTypeEnum NType2,// does sink node 1 throw?
-          class NodePolicy,       // rejecting,queueing
-          size_t Conc             // is node concurrent? {serial | limited | unlimited}
-          >
+template<
+    TestNodeTypeEnum IType1,                          // does input node 1 throw?
+    TestNodeTypeEnum IType2,                          // does input node 2 throw?
+    class Item12,                                     // type of item passed between inputs and test node
+    TestNodeTypeEnum FType,                           // does function node throw?
+    class Item23,                                     // type passed from function_node to sink nodes
+    TestNodeTypeEnum NType1,                          // does sink node 1 throw?
+    TestNodeTypeEnum NType2,                          // does sink node 1 throw?
+    class NodePolicy,                                 // rejecting,queueing
+    size_t Conc                                       // is node concurrent? {serial | limited | unlimited}
+>
 void run_function_node_test() {
 
-    typedef test_input_body<Item12, IType1> IBodyType1;
-    typedef test_input_body<Item12, IType2> IBodyType2;
+    typedef test_input_body<Item12,IType1> IBodyType1;
+    typedef test_input_body<Item12,IType2> IBodyType2;
     typedef absorber_body<Item12, Item23, FType, Conc> TestBodyType;
-    typedef absorber_body<Item23, tbb::flow::continue_msg, NType1, unlimited_type> SinkBodyType1;
-    typedef absorber_body<Item23, tbb::flow::continue_msg, NType2, unlimited_type> SinkBodyType2;
+    typedef absorber_body<Item23,tbb::flow::continue_msg, NType1, unlimited_type> SinkBodyType1;
+    typedef absorber_body<Item23,tbb::flow::continue_msg, NType2, unlimited_type> SinkBodyType2;
 
     typedef tbb::flow::input_node<Item12> InputType;
     typedef tbb::flow::function_node<Item12, Item23, NodePolicy> TestType;
-    typedef tbb::flow::function_node<Item23, tbb::flow::continue_msg> SnkType;
+    typedef tbb::flow::function_node<Item23,tbb::flow::continue_msg> SnkType;
 
-    for (int i = 0; i < 4; ++i) {
-        if (i != 2) {// doesn't make sense to flog a non-throwing test
+    for(int i = 0; i < 4; ++i ) {
+        if(i != 2) {  // doesn't make sense to flog a non-throwing test
             bool doThrow = (i & 0x1) != 0;
             bool doFlog = (i & 0x2) != 0;
             run_one_functype_node_test<
-                    /*InputNodeType*/ InputType,
-                    /*InputNodeBodyType0*/ IBodyType1,
-                    /*InputNodeBodyType1*/ IBodyType2,
-                    /* NFT */ func_node_type,
-                    /*TestNodeType*/ TestType,
-                    /*TestNodeBodyType*/ TestBodyType,
-                    /*TypeToSink0 */ Item23,
-                    /*TypeToSink1 */ Item23,
-                    /*SinkNodeType0*/ SnkType,
-                    /*SinkNodeType1*/ SnkType,
-                    /*SinkNodeBodyType1*/ SinkBodyType1,
-                    /*SinkNodeBodyType2*/ SinkBodyType2,
-                    /*Conc*/ Conc>(doThrow, doFlog, "function_node");
+                /*InputNodeType*/       InputType,
+                /*InputNodeBodyType0*/  IBodyType1,
+                /*InputNodeBodyType1*/  IBodyType2,
+                /* NFT */               func_node_type,
+                /*TestNodeType*/        TestType,
+                /*TestNodeBodyType*/    TestBodyType,
+                /*TypeToSink0 */        Item23,
+                /*TypeToSink1 */        Item23,
+                /*SinkNodeType0*/       SnkType,
+                /*SinkNodeType1*/       SnkType,
+                /*SinkNodeBodyType1*/   SinkBodyType1,
+                /*SinkNodeBodyType2*/   SinkBodyType2,
+                /*Conc*/                Conc>
+                    (doThrow,doFlog,"function_node");
         }
     }
-}// run_function_node_test
+}  // run_function_node_test
 
 void test_function_node() {
     INFO("Testing function_node\n");
     // serial rejecting
     g_Wakeup_Msg = "function_node(1a): Missed wakeup or machine is overloaded?";
-    run_function_node_test<isThrowing, nonThrowing, int, nonThrowing, int, nonThrowing, nonThrowing,
-                           tbb::flow::rejecting, serial_type>();
+    run_function_node_test<isThrowing, nonThrowing, int, nonThrowing, int, nonThrowing, nonThrowing, tbb::flow::rejecting, serial_type>();
     g_Wakeup_Msg = "function_node(1b): Missed wakeup or machine is overloaded?";
-    run_function_node_test<nonThrowing, nonThrowing, int, isThrowing, int, nonThrowing, nonThrowing,
-                           tbb::flow::rejecting, serial_type>();
+    run_function_node_test<nonThrowing, nonThrowing, int, isThrowing, int, nonThrowing, nonThrowing, tbb::flow::rejecting, serial_type>();
     g_Wakeup_Msg = "function_node(1c): Missed wakeup or machine is overloaded?";
-    run_function_node_test<nonThrowing, nonThrowing, int, nonThrowing, int, isThrowing, nonThrowing,
-                           tbb::flow::rejecting, serial_type>();
+    run_function_node_test<nonThrowing, nonThrowing, int, nonThrowing, int, isThrowing, nonThrowing, tbb::flow::rejecting, serial_type>();
 
     // serial queueing
     g_Wakeup_Msg = "function_node(2): Missed wakeup or machine is overloaded?";
-    run_function_node_test<isThrowing, nonThrowing, int, nonThrowing, int, nonThrowing, nonThrowing,
-                           tbb::flow::queueing, serial_type>();
-    run_function_node_test<nonThrowing, nonThrowing, int, isThrowing, int, nonThrowing, nonThrowing,
-                           tbb::flow::queueing, serial_type>();
-    run_function_node_test<nonThrowing, nonThrowing, int, nonThrowing, int, isThrowing, nonThrowing,
-                           tbb::flow::queueing, serial_type>();
+    run_function_node_test<isThrowing, nonThrowing, int, nonThrowing, int, nonThrowing, nonThrowing, tbb::flow::queueing, serial_type>();
+    run_function_node_test<nonThrowing, nonThrowing, int, isThrowing, int, nonThrowing, nonThrowing, tbb::flow::queueing, serial_type>();
+    run_function_node_test<nonThrowing, nonThrowing, int, nonThrowing, int, isThrowing, nonThrowing, tbb::flow::queueing, serial_type>();
     CheckType<int>::check_type_counter = 0;
-    run_function_node_test<nonThrowing, nonThrowing, CheckType<int>, nonThrowing, CheckType<int>, isThrowing,
-                           nonThrowing, tbb::flow::queueing, serial_type>();
-    CHECK_MESSAGE((!CheckType<int>::check_type_counter), "Some items leaked in test");
+    run_function_node_test<nonThrowing, nonThrowing, CheckType<int>, nonThrowing, CheckType<int>, isThrowing, nonThrowing, tbb::flow::queueing, serial_type>();
+    CHECK_MESSAGE( (!CheckType<int>::check_type_counter), "Some items leaked in test");
 
     // unlimited parallel rejecting
     g_Wakeup_Msg = "function_node(3): Missed wakeup or machine is overloaded?";
-    run_function_node_test<isThrowing, nonThrowing, int, nonThrowing, int, nonThrowing, nonThrowing,
-                           tbb::flow::rejecting, unlimited_type>();
-    run_function_node_test<nonThrowing, nonThrowing, int, isThrowing, int, nonThrowing, nonThrowing,
-                           tbb::flow::rejecting, unlimited_type>();
-    run_function_node_test<nonThrowing, nonThrowing, int, nonThrowing, int, nonThrowing, isThrowing,
-                           tbb::flow::rejecting, unlimited_type>();
+    run_function_node_test<isThrowing, nonThrowing, int, nonThrowing, int, nonThrowing, nonThrowing, tbb::flow::rejecting, unlimited_type>();
+    run_function_node_test<nonThrowing, nonThrowing, int, isThrowing, int, nonThrowing, nonThrowing, tbb::flow::rejecting, unlimited_type>();
+    run_function_node_test<nonThrowing, nonThrowing, int, nonThrowing, int, nonThrowing, isThrowing, tbb::flow::rejecting, unlimited_type>();
 
     // limited parallel rejecting
     g_Wakeup_Msg = "function_node(4): Missed wakeup or machine is overloaded?";
-    run_function_node_test<isThrowing, nonThrowing, int, nonThrowing, int, nonThrowing, nonThrowing,
-                           tbb::flow::rejecting, limited_type>();
-    run_function_node_test<nonThrowing, nonThrowing, int, isThrowing, int, nonThrowing, nonThrowing,
-                           tbb::flow::rejecting, (size_t) limited_type>();
-    run_function_node_test<nonThrowing, nonThrowing, int, nonThrowing, int, nonThrowing, isThrowing,
-                           tbb::flow::rejecting, (size_t) limited_type>();
+    run_function_node_test<isThrowing, nonThrowing, int, nonThrowing, int, nonThrowing, nonThrowing, tbb::flow::rejecting, limited_type>();
+    run_function_node_test<nonThrowing, nonThrowing, int, isThrowing, int, nonThrowing, nonThrowing, tbb::flow::rejecting, (size_t)limited_type>();
+    run_function_node_test<nonThrowing, nonThrowing, int, nonThrowing, int, nonThrowing, isThrowing, tbb::flow::rejecting, (size_t)limited_type>();
 
     // limited parallel queueing
     g_Wakeup_Msg = "function_node(5): Missed wakeup or machine is overloaded?";
-    run_function_node_test<isThrowing, nonThrowing, int, nonThrowing, int, nonThrowing, nonThrowing,
-                           tbb::flow::queueing, (size_t) limited_type>();
-    run_function_node_test<nonThrowing, nonThrowing, int, isThrowing, int, nonThrowing, nonThrowing,
-                           tbb::flow::queueing, (size_t) limited_type>();
-    run_function_node_test<nonThrowing, nonThrowing, int, nonThrowing, int, nonThrowing, isThrowing,
-                           tbb::flow::queueing, (size_t) limited_type>();
+    run_function_node_test<isThrowing, nonThrowing, int, nonThrowing, int, nonThrowing, nonThrowing, tbb::flow::queueing, (size_t)limited_type>();
+    run_function_node_test<nonThrowing, nonThrowing, int, isThrowing, int, nonThrowing, nonThrowing, tbb::flow::queueing, (size_t)limited_type>();
+    run_function_node_test<nonThrowing, nonThrowing, int, nonThrowing, int, nonThrowing, isThrowing, tbb::flow::queueing, (size_t)limited_type>();
 
     // everyone throwing
     g_Wakeup_Msg = "function_node(6): Missed wakeup or machine is overloaded?";
-    run_function_node_test<isThrowing, isThrowing, int, isThrowing, int, isThrowing, isThrowing,
-                           tbb::flow::rejecting, unlimited_type>();
+    run_function_node_test<isThrowing, isThrowing, int, isThrowing, int, isThrowing, isThrowing, tbb::flow::rejecting, unlimited_type>();
     g_Wakeup_Msg = g_Orig_Wakeup_Msg;
 }
 
@@ -710,114 +680,95 @@ void test_function_node() {
 //    multifunction_node will put an item to each successor for every item
 //    received.
 //
-template <TestNodeTypeEnum IType0,// does input node 1 throw?
-          TestNodeTypeEnum IType1,// does input node 2 thorw?
-          class Item12,           // type of item passed between inputs and test node
-          TestNodeTypeEnum FType, // does multifunction node throw?
-          class ItemTuple,        // tuple of types passed from multifunction_node to sink nodes
-          TestNodeTypeEnum NType1,// does sink node 1 throw?
-          TestNodeTypeEnum NType2,// does sink node 2 throw?
-          class NodePolicy,       // rejecting,queueing
-          size_t Conc             // is node concurrent? {serial | limited | unlimited}
-          >
+template<
+    TestNodeTypeEnum IType0,                          // does input node 1 throw?
+    TestNodeTypeEnum IType1,                          // does input node 2 thorw?
+    class Item12,                                 // type of item passed between inputs and test node
+    TestNodeTypeEnum FType,                           // does multifunction node throw?
+    class ItemTuple,                              // tuple of types passed from multifunction_node to sink nodes
+    TestNodeTypeEnum NType1,                          // does sink node 1 throw?
+    TestNodeTypeEnum NType2,                          // does sink node 2 throw?
+    class  NodePolicy,                            // rejecting,queueing
+    size_t Conc                                   // is node concurrent? {serial | limited | unlimited}
+>
 void run_multifunction_node_test() {
 
-    typedef typename std::tuple_element<0, ItemTuple>::type Item23Type0;
-    typedef typename std::tuple_element<1, ItemTuple>::type Item23Type1;
-    typedef test_input_body<Item12, IType0> IBodyType1;
-    typedef test_input_body<Item12, IType1> IBodyType2;
+    typedef typename std::tuple_element<0,ItemTuple>::type Item23Type0;
+    typedef typename std::tuple_element<1,ItemTuple>::type Item23Type1;
+    typedef test_input_body<Item12,IType0> IBodyType1;
+    typedef test_input_body<Item12,IType1> IBodyType2;
     typedef multifunction_node_body<Item12, ItemTuple, FType, Conc> TestBodyType;
-    typedef absorber_body<Item23Type0, tbb::flow::continue_msg, NType1, unlimited_type> SinkBodyType1;
-    typedef absorber_body<Item23Type1, tbb::flow::continue_msg, NType2, unlimited_type> SinkBodyType2;
+    typedef absorber_body<Item23Type0,tbb::flow::continue_msg, NType1, unlimited_type> SinkBodyType1;
+    typedef absorber_body<Item23Type1,tbb::flow::continue_msg, NType2, unlimited_type> SinkBodyType2;
 
     typedef tbb::flow::input_node<Item12> InputType;
     typedef tbb::flow::multifunction_node<Item12, ItemTuple, NodePolicy> TestType;
-    typedef tbb::flow::function_node<Item23Type0, tbb::flow::continue_msg> SnkType0;
-    typedef tbb::flow::function_node<Item23Type1, tbb::flow::continue_msg> SnkType1;
+    typedef tbb::flow::function_node<Item23Type0,tbb::flow::continue_msg> SnkType0;
+    typedef tbb::flow::function_node<Item23Type1,tbb::flow::continue_msg> SnkType1;
 
-    for (int i = 0; i < 4; ++i) {
-        if (i != 2) {// doesn't make sense to flog a non-throwing test
+    for(int i = 0; i < 4; ++i ) {
+        if(i != 2) {  // doesn't make sense to flog a non-throwing test
             bool doThrow = (i & 0x1) != 0;
             bool doFlog = (i & 0x2) != 0;
-            run_one_functype_node_test<
-                    /*InputNodeType*/ InputType,
-                    /*InputNodeBodyType0*/ IBodyType1,
-                    /*InputNodeBodyType1*/ IBodyType2,
-                    /*NFT*/ multifunc_node_type,
-                    /*TestNodeType*/ TestType,
-                    /*TestNodeBodyType*/ TestBodyType,
-                    /*TypeToSink0*/ Item23Type0,
-                    /*TypeToSink1*/ Item23Type1,
-                    /*SinkNodeType0*/ SnkType0,
-                    /*SinkNodeType1*/ SnkType1,
-                    /*SinkNodeBodyType0*/ SinkBodyType1,
-                    /*SinkNodeBodyType1*/ SinkBodyType2,
-                    /*Conc*/ Conc>(doThrow, doFlog, "multifunction_node");
+    run_one_functype_node_test<
+        /*InputNodeType*/       InputType,
+        /*InputNodeBodyType0*/  IBodyType1,
+        /*InputNodeBodyType1*/  IBodyType2,
+        /*NFT*/                 multifunc_node_type,
+        /*TestNodeType*/        TestType,
+        /*TestNodeBodyType*/    TestBodyType,
+        /*TypeToSink0*/         Item23Type0,
+        /*TypeToSink1*/         Item23Type1,
+        /*SinkNodeType0*/       SnkType0,
+        /*SinkNodeType1*/       SnkType1,
+        /*SinkNodeBodyType0*/   SinkBodyType1,
+        /*SinkNodeBodyType1*/   SinkBodyType2,
+        /*Conc*/                Conc>
+            (doThrow,doFlog,"multifunction_node");
         }
     }
-}// run_multifunction_node_test
+}  // run_multifunction_node_test
 
 void test_multifunction_node() {
     INFO("Testing multifunction_node\n");
-    g_Wakeup_Msg
-            = "multifunction_node(input throws,rejecting,serial): Missed wakeup or machine is overloaded?";
+    g_Wakeup_Msg = "multifunction_node(input throws,rejecting,serial): Missed wakeup or machine is overloaded?";
     // serial rejecting
-    run_multifunction_node_test<isThrowing, nonThrowing, int, nonThrowing, std::tuple<int, float>,
-                                nonThrowing, nonThrowing, tbb::flow::rejecting, serial_type>();
-    g_Wakeup_Msg
-            = "multifunction_node(test throws,rejecting,serial): Missed wakeup or machine is overloaded?";
-    run_multifunction_node_test<nonThrowing, nonThrowing, int, isThrowing, std::tuple<int, int>, nonThrowing,
-                                nonThrowing, tbb::flow::rejecting, serial_type>();
-    g_Wakeup_Msg
-            = "multifunction_node(sink throws,rejecting,serial): Missed wakeup or machine is overloaded?";
-    run_multifunction_node_test<nonThrowing, nonThrowing, int, nonThrowing, std::tuple<int, int>, isThrowing,
-                                nonThrowing, tbb::flow::rejecting, serial_type>();
+    run_multifunction_node_test<isThrowing, nonThrowing, int, nonThrowing, std::tuple<int,float>, nonThrowing, nonThrowing, tbb::flow::rejecting, serial_type>();
+    g_Wakeup_Msg = "multifunction_node(test throws,rejecting,serial): Missed wakeup or machine is overloaded?";
+    run_multifunction_node_test<nonThrowing, nonThrowing, int, isThrowing, std::tuple<int,int>, nonThrowing, nonThrowing, tbb::flow::rejecting, serial_type>();
+    g_Wakeup_Msg = "multifunction_node(sink throws,rejecting,serial): Missed wakeup or machine is overloaded?";
+    run_multifunction_node_test<nonThrowing, nonThrowing, int, nonThrowing, std::tuple<int,int>, isThrowing, nonThrowing, tbb::flow::rejecting, serial_type>();
 
     g_Wakeup_Msg = "multifunction_node(2): Missed wakeup or machine is overloaded?";
     // serial queueing
-    run_multifunction_node_test<isThrowing, nonThrowing, int, nonThrowing, std::tuple<int, int>, nonThrowing,
-                                nonThrowing, tbb::flow::queueing, serial_type>();
-    run_multifunction_node_test<nonThrowing, nonThrowing, int, isThrowing, std::tuple<int, int>, nonThrowing,
-                                nonThrowing, tbb::flow::queueing, serial_type>();
-    run_multifunction_node_test<nonThrowing, nonThrowing, int, nonThrowing, std::tuple<int, int>, isThrowing,
-                                nonThrowing, tbb::flow::queueing, serial_type>();
+    run_multifunction_node_test<isThrowing, nonThrowing, int, nonThrowing, std::tuple<int,int>, nonThrowing, nonThrowing, tbb::flow::queueing, serial_type>();
+    run_multifunction_node_test<nonThrowing, nonThrowing, int, isThrowing, std::tuple<int,int>, nonThrowing, nonThrowing, tbb::flow::queueing, serial_type>();
+    run_multifunction_node_test<nonThrowing, nonThrowing, int, nonThrowing, std::tuple<int,int>, isThrowing, nonThrowing, tbb::flow::queueing, serial_type>();
     CheckType<int>::check_type_counter = 0;
-    run_multifunction_node_test<nonThrowing, nonThrowing, CheckType<int>, nonThrowing,
-                                std::tuple<CheckType<int>, CheckType<int>>, isThrowing, nonThrowing,
-                                tbb::flow::queueing, serial_type>();
-    CHECK_MESSAGE((!CheckType<int>::check_type_counter), "Some items leaked in test");
+    run_multifunction_node_test<nonThrowing, nonThrowing, CheckType<int>, nonThrowing, std::tuple<CheckType<int>, CheckType<int> >, isThrowing, nonThrowing, tbb::flow::queueing, serial_type>();
+    CHECK_MESSAGE( (!CheckType<int>::check_type_counter), "Some items leaked in test");
 
     g_Wakeup_Msg = "multifunction_node(3): Missed wakeup or machine is overloaded?";
     // unlimited parallel rejecting
-    run_multifunction_node_test<isThrowing, nonThrowing, int, nonThrowing, std::tuple<int, int>, nonThrowing,
-                                nonThrowing, tbb::flow::rejecting, unlimited_type>();
-    run_multifunction_node_test<nonThrowing, nonThrowing, int, isThrowing, std::tuple<int, int>, nonThrowing,
-                                nonThrowing, tbb::flow::rejecting, unlimited_type>();
-    run_multifunction_node_test<nonThrowing, nonThrowing, int, nonThrowing, std::tuple<int, int>, nonThrowing,
-                                isThrowing, tbb::flow::rejecting, unlimited_type>();
+    run_multifunction_node_test<isThrowing, nonThrowing, int, nonThrowing, std::tuple<int,int>, nonThrowing, nonThrowing, tbb::flow::rejecting, unlimited_type>();
+    run_multifunction_node_test<nonThrowing, nonThrowing, int, isThrowing, std::tuple<int,int>, nonThrowing, nonThrowing, tbb::flow::rejecting, unlimited_type>();
+    run_multifunction_node_test<nonThrowing, nonThrowing, int, nonThrowing, std::tuple<int,int>, nonThrowing, isThrowing, tbb::flow::rejecting, unlimited_type>();
 
     g_Wakeup_Msg = "multifunction_node(4): Missed wakeup or machine is overloaded?";
     // limited parallel rejecting
-    run_multifunction_node_test<isThrowing, nonThrowing, int, nonThrowing, std::tuple<int, int>, nonThrowing,
-                                nonThrowing, tbb::flow::rejecting, limited_type>();
-    run_multifunction_node_test<nonThrowing, nonThrowing, int, isThrowing, std::tuple<int, int>, nonThrowing,
-                                nonThrowing, tbb::flow::rejecting, (size_t) limited_type>();
-    run_multifunction_node_test<nonThrowing, nonThrowing, int, nonThrowing, std::tuple<int, int>, nonThrowing,
-                                isThrowing, tbb::flow::rejecting, (size_t) limited_type>();
+    run_multifunction_node_test<isThrowing, nonThrowing, int, nonThrowing, std::tuple<int,int>, nonThrowing, nonThrowing, tbb::flow::rejecting, limited_type>();
+    run_multifunction_node_test<nonThrowing, nonThrowing, int, isThrowing, std::tuple<int,int>, nonThrowing, nonThrowing, tbb::flow::rejecting, (size_t)limited_type>();
+    run_multifunction_node_test<nonThrowing, nonThrowing, int, nonThrowing, std::tuple<int,int>, nonThrowing, isThrowing, tbb::flow::rejecting, (size_t)limited_type>();
 
     g_Wakeup_Msg = "multifunction_node(5): Missed wakeup or machine is overloaded?";
     // limited parallel queueing
-    run_multifunction_node_test<isThrowing, nonThrowing, int, nonThrowing, std::tuple<int, int>, nonThrowing,
-                                nonThrowing, tbb::flow::queueing, (size_t) limited_type>();
-    run_multifunction_node_test<nonThrowing, nonThrowing, int, isThrowing, std::tuple<int, int>, nonThrowing,
-                                nonThrowing, tbb::flow::queueing, (size_t) limited_type>();
-    run_multifunction_node_test<nonThrowing, nonThrowing, int, nonThrowing, std::tuple<int, int>, nonThrowing,
-                                isThrowing, tbb::flow::queueing, (size_t) limited_type>();
+    run_multifunction_node_test<isThrowing, nonThrowing, int, nonThrowing, std::tuple<int,int>, nonThrowing, nonThrowing, tbb::flow::queueing, (size_t)limited_type>();
+    run_multifunction_node_test<nonThrowing, nonThrowing, int, isThrowing, std::tuple<int,int>, nonThrowing, nonThrowing, tbb::flow::queueing, (size_t)limited_type>();
+    run_multifunction_node_test<nonThrowing, nonThrowing, int, nonThrowing, std::tuple<int,int>, nonThrowing, isThrowing, tbb::flow::queueing, (size_t)limited_type>();
 
     g_Wakeup_Msg = "multifunction_node(6): Missed wakeup or machine is overloaded?";
     // everyone throwing
-    run_multifunction_node_test<isThrowing, isThrowing, int, isThrowing, std::tuple<int, int>, isThrowing,
-                                isThrowing, tbb::flow::rejecting, unlimited_type>();
+    run_multifunction_node_test<isThrowing, isThrowing, int, isThrowing, std::tuple<int,int>, isThrowing, isThrowing, tbb::flow::rejecting, unlimited_type>();
     g_Wakeup_Msg = g_Orig_Wakeup_Msg;
 }
 
@@ -840,9 +791,9 @@ void test_multifunction_node() {
 // spinning.  So for N threads we pass N-1 continue_messages, then spin wait and then throw if
 // we are allowed to.
 
-template <class InputNodeType, class InputNodeBodyType, class TTestNodeType, class TestNodeBodyType,
-          class SinkNodeType, class SinkNodeBodyType>
-void run_one_continue_node_test(bool throwException, bool flog) {
+template < class InputNodeType, class InputNodeBodyType, class TTestNodeType, class TestNodeBodyType,
+        class SinkNodeType, class SinkNodeBodyType>
+void run_one_continue_node_test (bool throwException, bool flog) {
     tbb::flow::graph g;
 
     std::atomic<int> input_count;
@@ -856,85 +807,84 @@ void run_one_continue_node_test(bool throwException, bool flog) {
     g_Master = std::this_thread::get_id();
     InputNodeType input(g, InputNodeBodyType(input_count));
     TTestNodeType node_to_test(g, TestNodeBodyType(test_count));
-    SinkNodeType sink(g, tbb::flow::unlimited, SinkNodeBodyType(sink_count));
+    SinkNodeType sink(g,tbb::flow::unlimited,SinkNodeBodyType(sink_count));
     tbb::flow::broadcast_node<tbb::flow::continue_msg> b1(g), b2(g), b3(g);
     make_edge(input, b1);
-    make_edge(b1, b2);
-    make_edge(b1, b3);
-    make_edge(b2, node_to_test);
-    make_edge(b3, node_to_test);
+    make_edge(b1,b2);
+    make_edge(b1,b3);
+    make_edge(b2,node_to_test);
+    make_edge(b3,node_to_test);
     make_edge(node_to_test, sink);
-    for (int iter = 0; iter < 2; ++iter) {
-        ResetGlobals(throwException, flog);
-        if (throwException) {
+    for(int iter = 0; iter < 2; ++iter) {
+        ResetGlobals(throwException,flog);
+        if(throwException) {
             TRY();
-            input.activate();
-            g.wait_for_all();
+                input.activate();
+                g.wait_for_all();
             CATCH_AND_ASSERT();
-        } else {
+        }
+        else {
             TRY();
-            input.activate();
-            g.wait_for_all();
+                input.activate();
+                g.wait_for_all();
             CATCH_AND_FAIL();
         }
-        bool okayNoExceptionsCaught = (g_ExceptionInMaster && !g_MasterExecutedThrow)
-                                      || (!g_ExceptionInMaster && !g_NonMasterExecutedThrow)
-                                      || !throwException;
+        bool okayNoExceptionsCaught = (g_ExceptionInMaster && !g_MasterExecutedThrow) || (!g_ExceptionInMaster && !g_NonMasterExecutedThrow) || !throwException;
         int ib_cnt = tbb::flow::copy_body<InputNodeBodyType>(input).count_value();
-        int t_cnt = tbb::flow::copy_body<TestNodeBodyType>(node_to_test).count_value();
+        int t_cnt   = tbb::flow::copy_body<TestNodeBodyType>(node_to_test).count_value();
         int nb_cnt = tbb::flow::copy_body<SinkNodeBodyType>(sink).count_value();
-        if (throwException) {
-            CHECK_MESSAGE((g.exception_thrown() || okayNoExceptionsCaught), "Exception not caught by graph");
-            CHECK_MESSAGE((g.is_cancelled() || okayNoExceptionsCaught),
-                          "Cancellation not signalled in graph");
-            CHECK_MESSAGE((ib_cnt <= g_NumItems), "Too many items sent by inputs");
-            CHECK_MESSAGE((ib_cnt >= t_cnt), "Too many items received by test node");
-            CHECK_MESSAGE((nb_cnt <= t_cnt), "Too many items received by sink nodes");
-        } else {
-            CHECK_MESSAGE((!g.exception_thrown()), "Exception flag in flow::graph set but no throw occurred");
-            CHECK_MESSAGE((!g.is_cancelled()), "canceled flag set but no throw occurred");
-            CHECK_MESSAGE((ib_cnt == g_NumItems), "Missing invocations of input_node");
-            CHECK_MESSAGE((t_cnt == g_NumItems), "Not all items reached test node");
-            CHECK_MESSAGE((nb_cnt == g_NumItems), "Missing items in absorbers");
+        if(throwException) {
+            CHECK_MESSAGE( (g.exception_thrown() || okayNoExceptionsCaught), "Exception not caught by graph");
+            CHECK_MESSAGE( (g.is_cancelled() || okayNoExceptionsCaught), "Cancellation not signalled in graph");
+            CHECK_MESSAGE( (ib_cnt <= g_NumItems), "Too many items sent by inputs");
+            CHECK_MESSAGE( (ib_cnt >= t_cnt), "Too many items received by test node");
+            CHECK_MESSAGE( (nb_cnt <= t_cnt), "Too many items received by sink nodes");
+        }
+        else {
+            CHECK_MESSAGE( (!g.exception_thrown()), "Exception flag in flow::graph set but no throw occurred");
+            CHECK_MESSAGE( (!g.is_cancelled()), "canceled flag set but no throw occurred");
+            CHECK_MESSAGE( (ib_cnt == g_NumItems), "Missing invocations of input_node");
+            CHECK_MESSAGE( (t_cnt == g_NumItems), "Not all items reached test node");
+            CHECK_MESSAGE( (nb_cnt == g_NumItems), "Missing items in absorbers");
         }
-        g.reset();// resets the body of the input_nodes, test_node and the absorb_nodes.
+        g.reset();  // resets the body of the input_nodes, test_node and the absorb_nodes.
         input_count = test_count = sink_count = 0;
-        CHECK_MESSAGE((0 == (int) test_count), "Atomic wasn't reset properly");
-        CHECK_MESSAGE((0 == tbb::flow::copy_body<InputNodeBodyType>(input).count_value()),
-                      "Reset input failed");
-        CHECK_MESSAGE((0 == tbb::flow::copy_body<TestNodeBodyType>(node_to_test).count_value()),
-                      "Reset test_node failed");
-        CHECK_MESSAGE((0 == tbb::flow::copy_body<SinkNodeBodyType>(sink).count_value()), "Reset sink failed");
+        CHECK_MESSAGE( (0 == (int)test_count), "Atomic wasn't reset properly");
+        CHECK_MESSAGE( (0 == tbb::flow::copy_body<InputNodeBodyType>(input).count_value()),"Reset input failed");
+        CHECK_MESSAGE( (0 == tbb::flow::copy_body<TestNodeBodyType>(node_to_test).count_value()),"Reset test_node failed");
+        CHECK_MESSAGE( (0 == tbb::flow::copy_body<SinkNodeBodyType>(sink).count_value()),"Reset sink failed");
     }
 #if USE_TASK_SCHEDULER_OBSERVER
     o.observe(false);
 #endif
 }
 
-template <class ItemType,
-          TestNodeTypeEnum IType,// does input node throw?
-          TestNodeTypeEnum CType,// does continue_node throw?
-          TestNodeTypeEnum AType>// does absorber throw
+template<
+    class ItemType,
+    TestNodeTypeEnum IType,   // does input node throw?
+    TestNodeTypeEnum CType,   // does continue_node throw?
+    TestNodeTypeEnum AType>    // does absorber throw
 void run_continue_node_test() {
-    typedef test_input_body<tbb::flow::continue_msg, IType> IBodyType;
-    typedef absorber_body<tbb::flow::continue_msg, ItemType, CType, unlimited_type> ContBodyType;
-    typedef absorber_body<ItemType, tbb::flow::continue_msg, AType, unlimited_type> SinkBodyType;
+    typedef test_input_body<tbb::flow::continue_msg,IType> IBodyType;
+    typedef absorber_body<tbb::flow::continue_msg,ItemType,CType,unlimited_type> ContBodyType;
+    typedef absorber_body<ItemType,tbb::flow::continue_msg, AType, unlimited_type> SinkBodyType;
 
     typedef tbb::flow::input_node<tbb::flow::continue_msg> InputType;
     typedef tbb::flow::continue_node<ItemType> TestType;
-    typedef tbb::flow::function_node<ItemType, tbb::flow::continue_msg> SnkType;
+    typedef tbb::flow::function_node<ItemType,tbb::flow::continue_msg> SnkType;
 
-    for (int i = 0; i < 4; ++i) {
-        if (i == 2) continue;// don't run (false,true); it doesn't make sense.
+    for(int i = 0; i < 4; ++i ) {
+        if(i == 2) continue;  // don't run (false,true); it doesn't make sense.
         bool doThrow = (i & 0x1) != 0;
         bool doFlog = (i & 0x2) != 0;
         run_one_continue_node_test<
-                /*InputNodeType*/ InputType,
-                /*InputNodeBodyType*/ IBodyType,
-                /*TestNodeType*/ TestType,
-                /*TestNodeBodyType*/ ContBodyType,
-                /*SinkNodeType*/ SnkType,
-                /*SinkNodeBodyType*/ SinkBodyType>(doThrow, doFlog);
+            /*InputNodeType*/       InputType,
+            /*InputNodeBodyType*/   IBodyType,
+            /*TestNodeType*/        TestType,
+            /*TestNodeBodyType*/    ContBodyType,
+            /*SinkNodeType*/        SnkType,
+            /*SinkNodeBodyType*/    SinkBodyType>
+            (doThrow,doFlog);
     }
 }
 
@@ -942,25 +892,29 @@ void run_continue_node_test() {
 void test_continue_node() {
     INFO("Testing continue_node\n");
     g_Wakeup_Msg = "buffer_node(non,is,non): Missed wakeup or machine is overloaded?";
-    run_continue_node_test<int, nonThrowing, isThrowing, nonThrowing>();
+    run_continue_node_test<int,nonThrowing,isThrowing,nonThrowing>();
     g_Wakeup_Msg = "buffer_node(non,non,is): Missed wakeup or machine is overloaded?";
-    run_continue_node_test<int, nonThrowing, nonThrowing, isThrowing>();
+    run_continue_node_test<int,nonThrowing,nonThrowing,isThrowing>();
     g_Wakeup_Msg = "buffer_node(is,non,non): Missed wakeup or machine is overloaded?";
-    run_continue_node_test<int, isThrowing, nonThrowing, nonThrowing>();
+    run_continue_node_test<int,isThrowing,nonThrowing,nonThrowing>();
     g_Wakeup_Msg = "buffer_node(is,is,is): Missed wakeup or machine is overloaded?";
-    run_continue_node_test<int, isThrowing, isThrowing, isThrowing>();
+    run_continue_node_test<int,isThrowing,isThrowing,isThrowing>();
     CheckType<double>::check_type_counter = 0;
-    run_continue_node_test<CheckType<double>, isThrowing, isThrowing, isThrowing>();
-    CHECK_MESSAGE((!CheckType<double>::check_type_counter), "Dropped objects in continue_node test");
+    run_continue_node_test<CheckType<double>,isThrowing,isThrowing,isThrowing>();
+    CHECK_MESSAGE( (!CheckType<double>::check_type_counter), "Dropped objects in continue_node test");
     g_Wakeup_Msg = g_Orig_Wakeup_Msg;
 }
 
 // ---------- buffer_node queue_node overwrite_node --------------
 
-template <class BufferItemType,//
-          class InputNodeType, class InputNodeBodyType, class TestNodeType, class SinkNodeType,
-          class SinkNodeBodyType>
-void run_one_buffer_node_test(bool throwException, bool flog) {
+template<
+    class BufferItemType,       //
+    class InputNodeType,
+    class InputNodeBodyType,
+    class TestNodeType,
+    class SinkNodeType,
+    class SinkNodeBodyType >
+void run_one_buffer_node_test(bool throwException,bool flog) {
     tbb::flow::graph g;
 
     std::atomic<int> input_count;
@@ -973,119 +927,128 @@ void run_one_buffer_node_test(bool throwException, bool flog) {
     g_Master = std::this_thread::get_id();
     InputNodeType input(g, InputNodeBodyType(input_count));
     TestNodeType node_to_test(g);
-    SinkNodeType sink(g, tbb::flow::unlimited, SinkNodeBodyType(sink_count));
-    make_edge(input, node_to_test);
+    SinkNodeType sink(g,tbb::flow::unlimited,SinkNodeBodyType(sink_count));
+    make_edge(input,node_to_test);
     make_edge(node_to_test, sink);
-    for (int iter = 0; iter < 2; ++iter) {
-        ResetGlobals(throwException, flog);
-        if (throwException) {
+    for(int iter = 0; iter < 2; ++iter) {
+        ResetGlobals(throwException,flog);
+        if(throwException) {
             TRY();
-            input.activate();
-            g.wait_for_all();
+                input.activate();
+                g.wait_for_all();
             CATCH_AND_ASSERT();
-        } else {
+        }
+        else {
             TRY();
-            input.activate();
-            g.wait_for_all();
+                input.activate();
+                g.wait_for_all();
             CATCH_AND_FAIL();
         }
-        bool okayNoExceptionsCaught = (g_ExceptionInMaster && !g_MasterExecutedThrow)
-                                      || (!g_ExceptionInMaster && !g_NonMasterExecutedThrow)
-                                      || !throwException;
+        bool okayNoExceptionsCaught = (g_ExceptionInMaster && !g_MasterExecutedThrow) || (!g_ExceptionInMaster && !g_NonMasterExecutedThrow) || !throwException;
         int ib_cnt = tbb::flow::copy_body<InputNodeBodyType>(input).count_value();
         int nb_cnt = tbb::flow::copy_body<SinkNodeBodyType>(sink).count_value();
-        if (throwException) {
-            CHECK_MESSAGE((g.exception_thrown() || okayNoExceptionsCaught), "Exception not caught by graph");
-            CHECK_MESSAGE((g.is_cancelled() || okayNoExceptionsCaught),
-                          "Cancellation not signalled in graph");
-            CHECK_MESSAGE((ib_cnt <= g_NumItems), "Too many items sent by inputs");
-            CHECK_MESSAGE((nb_cnt <= ib_cnt), "Too many items received by sink nodes");
-        } else {
-            CHECK_MESSAGE((!g.exception_thrown()), "Exception flag in flow::graph set but no throw occurred");
-            CHECK_MESSAGE((!g.is_cancelled()), "canceled flag set but no throw occurred");
-            CHECK_MESSAGE((ib_cnt == g_NumItems), "Missing invocations of input_node");
-            CHECK_MESSAGE((nb_cnt == g_NumItems), "Missing items in absorbers");
+        if(throwException) {
+            CHECK_MESSAGE( (g.exception_thrown() || okayNoExceptionsCaught), "Exception not caught by graph");
+            CHECK_MESSAGE( (g.is_cancelled() || okayNoExceptionsCaught), "Cancellation not signalled in graph");
+            CHECK_MESSAGE( (ib_cnt <= g_NumItems), "Too many items sent by inputs");
+            CHECK_MESSAGE( (nb_cnt <= ib_cnt), "Too many items received by sink nodes");
         }
-        if (iter == 0) {
+        else {
+            CHECK_MESSAGE( (!g.exception_thrown()), "Exception flag in flow::graph set but no throw occurred");
+            CHECK_MESSAGE( (!g.is_cancelled()), "canceled flag set but no throw occurred");
+            CHECK_MESSAGE( (ib_cnt == g_NumItems), "Missing invocations of input_node");
+            CHECK_MESSAGE( (nb_cnt == g_NumItems), "Missing items in absorbers");
+        }
+        if(iter == 0) {
             remove_edge(node_to_test, sink);
             node_to_test.try_put(BufferItemType());
             g.wait_for_all();
             g.reset();
             input_count = sink_count = 0;
             BufferItemType tmp;
-            CHECK_MESSAGE((!node_to_test.try_get(tmp)), "node not empty");
+            CHECK_MESSAGE( (!node_to_test.try_get(tmp)), "node not empty");
             make_edge(node_to_test, sink);
             g.wait_for_all();
-        } else {
+        }
+        else {
             g.reset();
             input_count = sink_count = 0;
         }
-        CHECK_MESSAGE((0 == tbb::flow::copy_body<InputNodeBodyType>(input).count_value()),
-                      "Reset input failed");
-        CHECK_MESSAGE((0 == tbb::flow::copy_body<SinkNodeBodyType>(sink).count_value()), "Reset sink failed");
+        CHECK_MESSAGE( (0 == tbb::flow::copy_body<InputNodeBodyType>(input).count_value()),"Reset input failed");
+        CHECK_MESSAGE( (0 == tbb::flow::copy_body<SinkNodeBodyType>(sink).count_value()),"Reset sink failed");
     }
 
 #if USE_TASK_SCHEDULER_OBSERVER
     o.observe(false);
 #endif
 }
-template <class BufferItemType, TestNodeTypeEnum InputThrowType, TestNodeTypeEnum SinkThrowType>
+template<class BufferItemType,
+         TestNodeTypeEnum InputThrowType,
+         TestNodeTypeEnum SinkThrowType>
 void run_buffer_queue_and_overwrite_node_test() {
-    typedef test_input_body<BufferItemType, InputThrowType> InputBodyType;
-    typedef absorber_body<BufferItemType, tbb::flow::continue_msg, SinkThrowType, unlimited_type>
-            SinkBodyType;
+    typedef test_input_body<BufferItemType,InputThrowType> InputBodyType;
+    typedef absorber_body<BufferItemType,tbb::flow::continue_msg,SinkThrowType,unlimited_type> SinkBodyType;
 
     typedef tbb::flow::input_node<BufferItemType> InputType;
     typedef tbb::flow::buffer_node<BufferItemType> BufType;
-    typedef tbb::flow::queue_node<BufferItemType> QueType;
-    typedef tbb::flow::overwrite_node<BufferItemType> OvrType;
-    typedef tbb::flow::function_node<BufferItemType, tbb::flow::continue_msg> SnkType;
+    typedef tbb::flow::queue_node<BufferItemType>  QueType;
+    typedef tbb::flow::overwrite_node<BufferItemType>  OvrType;
+    typedef tbb::flow::function_node<BufferItemType,tbb::flow::continue_msg> SnkType;
 
-    for (int i = 0; i < 4; ++i) {
-        if (i == 2) continue;// no need to test flog w/o throws
+    for(int i = 0; i < 4; ++i) {
+        if(i == 2) continue;  // no need to test flog w/o throws
         bool throwException = (i & 0x1) != 0;
         bool doFlog = (i & 0x2) != 0;
         run_one_buffer_node_test<
-                /* class BufferItemType*/ BufferItemType,
-                /*class InputNodeType*/ InputType,
-                /*class InputNodeBodyType*/ InputBodyType,
-                /*class TestNodeType*/ BufType,
-                /*class SinkNodeType*/ SnkType,
-                /*class SinkNodeBodyType*/ SinkBodyType>(throwException, doFlog);
+            /* class BufferItemType*/     BufferItemType,
+            /*class InputNodeType*/       InputType,
+            /*class InputNodeBodyType*/   InputBodyType,
+            /*class TestNodeType*/        BufType,
+            /*class SinkNodeType*/        SnkType,
+            /*class SinkNodeBodyType*/    SinkBodyType
+            >(throwException, doFlog);
         run_one_buffer_node_test<
-                /* class BufferItemType*/ BufferItemType,
-                /*class InputNodeType*/ InputType,
-                /*class InputNodeBodyType*/ InputBodyType,
-                /*class TestNodeType*/ QueType,
-                /*class SinkNodeType*/ SnkType,
-                /*class SinkNodeBodyType*/ SinkBodyType>(throwException, doFlog);
+            /* class BufferItemType*/     BufferItemType,
+            /*class InputNodeType*/       InputType,
+            /*class InputNodeBodyType*/   InputBodyType,
+            /*class TestNodeType*/        QueType,
+            /*class SinkNodeType*/        SnkType,
+            /*class SinkNodeBodyType*/    SinkBodyType
+            >(throwException, doFlog);
         run_one_buffer_node_test<
-                /* class BufferItemType*/ BufferItemType,
-                /*class InputNodeType*/ InputType,
-                /*class InputNodeBodyType*/ InputBodyType,
-                /*class TestNodeType*/ OvrType,
-                /*class SinkNodeType*/ SnkType,
-                /*class SinkNodeBodyType*/ SinkBodyType>(throwException, doFlog);
+            /* class BufferItemType*/     BufferItemType,
+            /*class InputNodeType*/       InputType,
+            /*class InputNodeBodyType*/   InputBodyType,
+            /*class TestNodeType*/        OvrType,
+            /*class SinkNodeType*/        SnkType,
+            /*class SinkNodeBodyType*/    SinkBodyType
+            >(throwException, doFlog);
     }
 }
 
 void test_buffer_queue_and_overwrite_node() {
     INFO("Testing buffer_node, queue_node and overwrite_node\n");
     g_Wakeup_Msg = "buffer, queue, overwrite(is,non): Missed wakeup or machine is overloaded?";
-    run_buffer_queue_and_overwrite_node_test<int, isThrowing, nonThrowing>();
+    run_buffer_queue_and_overwrite_node_test<int,isThrowing,nonThrowing>();
     g_Wakeup_Msg = "buffer, queue, overwrite(non,is): Missed wakeup or machine is overloaded?";
-    run_buffer_queue_and_overwrite_node_test<int, nonThrowing, isThrowing>();
+    run_buffer_queue_and_overwrite_node_test<int,nonThrowing,isThrowing>();
     g_Wakeup_Msg = "buffer, queue, overwrite(is,is): Missed wakeup or machine is overloaded?";
-    run_buffer_queue_and_overwrite_node_test<int, isThrowing, isThrowing>();
+    run_buffer_queue_and_overwrite_node_test<int,isThrowing,isThrowing>();
     g_Wakeup_Msg = g_Orig_Wakeup_Msg;
 }
 
 // ---------- sequencer_node -------------------------
 
-template <class BufferItemType,//
-          class InputNodeType, class InputNodeBodyType, class TestNodeType, class SeqBodyType,
-          class SinkNodeType, class SinkNodeBodyType>
-void run_one_sequencer_node_test(bool throwException, bool flog) {
+
+template<
+    class BufferItemType,       //
+    class InputNodeType,
+    class InputNodeBodyType,
+    class TestNodeType,
+    class SeqBodyType,
+    class SinkNodeType,
+    class SinkNodeBodyType >
+void run_one_sequencer_node_test(bool throwException,bool flog) {
     tbb::flow::graph g;
 
     std::atomic<int> input_count;
@@ -1097,41 +1060,40 @@ void run_one_sequencer_node_test(bool throwException, bool flog) {
 #endif
     g_Master = std::this_thread::get_id();
     InputNodeType input(g, InputNodeBodyType(input_count));
-    TestNodeType node_to_test(g, SeqBodyType());
-    SinkNodeType sink(g, tbb::flow::unlimited, SinkNodeBodyType(sink_count));
-    make_edge(input, node_to_test);
+    TestNodeType node_to_test(g,SeqBodyType());
+    SinkNodeType sink(g,tbb::flow::unlimited,SinkNodeBodyType(sink_count));
+    make_edge(input,node_to_test);
     make_edge(node_to_test, sink);
-    for (int iter = 0; iter < 2; ++iter) {
-        ResetGlobals(throwException, flog);
-        if (throwException) {
+    for(int iter = 0; iter < 2; ++iter) {
+        ResetGlobals(throwException,flog);
+        if(throwException) {
             TRY();
-            input.activate();
-            g.wait_for_all();
+                input.activate();
+                g.wait_for_all();
             CATCH_AND_ASSERT();
-        } else {
+        }
+        else {
             TRY();
-            input.activate();
-            g.wait_for_all();
+                input.activate();
+                g.wait_for_all();
             CATCH_AND_FAIL();
         }
-        bool okayNoExceptionsCaught = (g_ExceptionInMaster && !g_MasterExecutedThrow)
-                                      || (!g_ExceptionInMaster && !g_NonMasterExecutedThrow)
-                                      || !throwException;
+        bool okayNoExceptionsCaught = (g_ExceptionInMaster && !g_MasterExecutedThrow) || (!g_ExceptionInMaster && !g_NonMasterExecutedThrow) || !throwException;
         int ib_cnt = tbb::flow::copy_body<InputNodeBodyType>(input).count_value();
         int nb_cnt = tbb::flow::copy_body<SinkNodeBodyType>(sink).count_value();
-        if (throwException) {
-            CHECK_MESSAGE((g.exception_thrown() || okayNoExceptionsCaught), "Exception not caught by graph");
-            CHECK_MESSAGE((g.is_cancelled() || okayNoExceptionsCaught),
-                          "Cancellation not signalled in graph");
-            CHECK_MESSAGE((ib_cnt <= g_NumItems), "Too many items sent by inputs");
-            CHECK_MESSAGE((nb_cnt <= ib_cnt), "Too many items received by sink nodes");
-        } else {
-            CHECK_MESSAGE((!g.exception_thrown()), "Exception flag in flow::graph set but no throw occurred");
-            CHECK_MESSAGE((!g.is_cancelled()), "canceled flag set but no throw occurred");
-            CHECK_MESSAGE((ib_cnt == g_NumItems), "Missing invocations of input_node");
-            CHECK_MESSAGE((nb_cnt == g_NumItems), "Missing items in absorbers");
+        if(throwException) {
+            CHECK_MESSAGE( (g.exception_thrown() || okayNoExceptionsCaught), "Exception not caught by graph");
+            CHECK_MESSAGE( (g.is_cancelled() || okayNoExceptionsCaught), "Cancellation not signalled in graph");
+            CHECK_MESSAGE( (ib_cnt <= g_NumItems), "Too many items sent by inputs");
+            CHECK_MESSAGE( (nb_cnt <= ib_cnt), "Too many items received by sink nodes");
+        }
+        else {
+            CHECK_MESSAGE( (!g.exception_thrown()), "Exception flag in flow::graph set but no throw occurred");
+            CHECK_MESSAGE( (!g.is_cancelled()), "canceled flag set but no throw occurred");
+            CHECK_MESSAGE( (ib_cnt == g_NumItems), "Missing invocations of input_node");
+            CHECK_MESSAGE( (nb_cnt == g_NumItems), "Missing items in absorbers");
         }
-        if (iter == 0) {
+        if(iter == 0) {
             remove_edge(node_to_test, sink);
             node_to_test.try_put(BufferItemType(g_NumItems + 1));
             node_to_test.try_put(BufferItemType(1));
@@ -1140,13 +1102,13 @@ void run_one_sequencer_node_test(bool throwException, bool flog) {
             input_count = sink_count = 0;
             make_edge(node_to_test, sink);
             g.wait_for_all();
-        } else {
+        }
+        else {
             g.reset();
             input_count = sink_count = 0;
         }
-        CHECK_MESSAGE((0 == tbb::flow::copy_body<InputNodeBodyType>(input).count_value()),
-                      "Reset input failed");
-        CHECK_MESSAGE((0 == tbb::flow::copy_body<SinkNodeBodyType>(sink).count_value()), "Reset sink failed");
+        CHECK_MESSAGE( (0 == tbb::flow::copy_body<InputNodeBodyType>(input).count_value()),"Reset input failed");
+        CHECK_MESSAGE( (0 == tbb::flow::copy_body<SinkNodeBodyType>(sink).count_value()),"Reset sink failed");
     }
 
 #if USE_TASK_SCHEDULER_OBSERVER
@@ -1154,50 +1116,59 @@ void run_one_sequencer_node_test(bool throwException, bool flog) {
 #endif
 }
 
-template <class BufferItemType, TestNodeTypeEnum InputThrowType, TestNodeTypeEnum SinkThrowType>
+template<class BufferItemType,
+         TestNodeTypeEnum InputThrowType,
+         TestNodeTypeEnum SinkThrowType>
 void run_sequencer_node_test() {
-    typedef test_input_body<BufferItemType, InputThrowType> InputBodyType;
-    typedef absorber_body<BufferItemType, tbb::flow::continue_msg, SinkThrowType, unlimited_type>
-            SinkBodyType;
+    typedef test_input_body<BufferItemType,InputThrowType> InputBodyType;
+    typedef absorber_body<BufferItemType,tbb::flow::continue_msg,SinkThrowType,unlimited_type> SinkBodyType;
     typedef sequencer_body<BufferItemType> SeqBodyType;
 
     typedef tbb::flow::input_node<BufferItemType> InputType;
-    typedef tbb::flow::sequencer_node<BufferItemType> SeqType;
-    typedef tbb::flow::function_node<BufferItemType, tbb::flow::continue_msg> SnkType;
+    typedef tbb::flow::sequencer_node<BufferItemType>  SeqType;
+    typedef tbb::flow::function_node<BufferItemType,tbb::flow::continue_msg> SnkType;
 
-    for (int i = 0; i < 4; ++i) {
-        if (i == 2) continue;// no need to test flog w/o throws
+    for(int i = 0; i < 4; ++i) {
+        if(i == 2) continue;  // no need to test flog w/o throws
         bool throwException = (i & 0x1) != 0;
         bool doFlog = (i & 0x2) != 0;
         run_one_sequencer_node_test<
-                /* class BufferItemType*/ BufferItemType,
-                /*class InputNodeType*/ InputType,
-                /*class InputNodeBodyType*/ InputBodyType,
-                /*class TestNodeType*/ SeqType,
-                /*class SeqBodyType*/ SeqBodyType,
-                /*class SinkNodeType*/ SnkType,
-                /*class SinkNodeBodyType*/ SinkBodyType>(throwException, doFlog);
+            /* class BufferItemType*/     BufferItemType,
+            /*class InputNodeType*/       InputType,
+            /*class InputNodeBodyType*/   InputBodyType,
+            /*class TestNodeType*/        SeqType,
+            /*class SeqBodyType*/         SeqBodyType,
+            /*class SinkNodeType*/        SnkType,
+            /*class SinkNodeBodyType*/    SinkBodyType
+            >(throwException, doFlog);
     }
 }
 
+
+
 void test_sequencer_node() {
     INFO("Testing sequencer_node\n");
     g_Wakeup_Msg = "sequencer_node(is,non): Missed wakeup or machine is overloaded?";
-    run_sequencer_node_test<int, isThrowing, nonThrowing>();
+    run_sequencer_node_test<int, isThrowing,nonThrowing>();
     CheckType<int>::check_type_counter = 0;
     g_Wakeup_Msg = "sequencer_node(non,is): Missed wakeup or machine is overloaded?";
-    run_sequencer_node_test<CheckType<int>, nonThrowing, isThrowing>();
-    CHECK_MESSAGE((!CheckType<int>::check_type_counter), "Dropped objects in sequencer_node test");
+    run_sequencer_node_test<CheckType<int>, nonThrowing,isThrowing>();
+    CHECK_MESSAGE( (!CheckType<int>::check_type_counter), "Dropped objects in sequencer_node test");
     g_Wakeup_Msg = "sequencer_node(is,is): Missed wakeup or machine is overloaded?";
-    run_sequencer_node_test<int, isThrowing, isThrowing>();
+    run_sequencer_node_test<int, isThrowing,isThrowing>();
     g_Wakeup_Msg = g_Orig_Wakeup_Msg;
 }
 
 // ------------ priority_queue_node ------------------
 
-template <class BufferItemType, class InputNodeType, class InputNodeBodyType, class TestNodeType,
-          class SinkNodeType, class SinkNodeBodyType>
-void run_one_priority_queue_node_test(bool throwException, bool flog) {
+template<
+    class BufferItemType,
+    class InputNodeType,
+    class InputNodeBodyType,
+    class TestNodeType,
+    class SinkNodeType,
+    class SinkNodeBodyType >
+void run_one_priority_queue_node_test(bool throwException,bool flog) {
     tbb::flow::graph g;
 
     std::atomic<int> input_count;
@@ -1212,41 +1183,40 @@ void run_one_priority_queue_node_test(bool throwException, bool flog) {
 
     TestNodeType node_to_test(g);
 
-    SinkNodeType sink(g, tbb::flow::unlimited, SinkNodeBodyType(sink_count));
+    SinkNodeType sink(g,tbb::flow::unlimited,SinkNodeBodyType(sink_count));
 
-    make_edge(input, node_to_test);
+    make_edge(input,node_to_test);
     make_edge(node_to_test, sink);
-    for (int iter = 0; iter < 2; ++iter) {
-        ResetGlobals(throwException, flog);
-        if (throwException) {
+    for(int iter = 0; iter < 2; ++iter) {
+        ResetGlobals(throwException,flog);
+        if(throwException) {
             TRY();
-            input.activate();
-            g.wait_for_all();
+                input.activate();
+                g.wait_for_all();
             CATCH_AND_ASSERT();
-        } else {
+        }
+        else {
             TRY();
-            input.activate();
-            g.wait_for_all();
+                input.activate();
+                g.wait_for_all();
             CATCH_AND_FAIL();
         }
-        bool okayNoExceptionsCaught = (g_ExceptionInMaster && !g_MasterExecutedThrow)
-                                      || (!g_ExceptionInMaster && !g_NonMasterExecutedThrow)
-                                      || !throwException;
+        bool okayNoExceptionsCaught = (g_ExceptionInMaster && !g_MasterExecutedThrow) || (!g_ExceptionInMaster && !g_NonMasterExecutedThrow) || !throwException;
         int ib_cnt = tbb::flow::copy_body<InputNodeBodyType>(input).count_value();
         int nb_cnt = tbb::flow::copy_body<SinkNodeBodyType>(sink).count_value();
-        if (throwException) {
-            CHECK_MESSAGE((g.exception_thrown() || okayNoExceptionsCaught), "Exception not caught by graph");
-            CHECK_MESSAGE((g.is_cancelled() || okayNoExceptionsCaught),
-                          "Cancellation not signalled in graph");
-            CHECK_MESSAGE((ib_cnt <= g_NumItems), "Too many items sent by inputs");
-            CHECK_MESSAGE((nb_cnt <= ib_cnt), "Too many items received by sink nodes");
-        } else {
-            CHECK_MESSAGE((!g.exception_thrown()), "Exception flag in flow::graph set but no throw occurred");
-            CHECK_MESSAGE((!g.is_cancelled()), "canceled flag set but no throw occurred");
-            CHECK_MESSAGE((ib_cnt == g_NumItems), "Missing invocations of input_node");
-            CHECK_MESSAGE((nb_cnt == g_NumItems), "Missing items in absorbers");
+        if(throwException) {
+            CHECK_MESSAGE( (g.exception_thrown() || okayNoExceptionsCaught), "Exception not caught by graph");
+            CHECK_MESSAGE( (g.is_cancelled() || okayNoExceptionsCaught), "Cancellation not signalled in graph");
+            CHECK_MESSAGE( (ib_cnt <= g_NumItems), "Too many items sent by inputs");
+            CHECK_MESSAGE( (nb_cnt <= ib_cnt), "Too many items received by sink nodes");
         }
-        if (iter == 0) {
+        else {
+            CHECK_MESSAGE( (!g.exception_thrown()), "Exception flag in flow::graph set but no throw occurred");
+            CHECK_MESSAGE( (!g.is_cancelled()), "canceled flag set but no throw occurred");
+            CHECK_MESSAGE( (ib_cnt == g_NumItems), "Missing invocations of input_node");
+            CHECK_MESSAGE( (nb_cnt == g_NumItems), "Missing items in absorbers");
+        }
+        if(iter == 0) {
             remove_edge(node_to_test, sink);
             node_to_test.try_put(BufferItemType(g_NumItems + 1));
             node_to_test.try_put(BufferItemType(g_NumItems + 2));
@@ -1256,13 +1226,13 @@ void run_one_priority_queue_node_test(bool throwException, bool flog) {
             input_count = sink_count = 0;
             make_edge(node_to_test, sink);
             g.wait_for_all();
-        } else {
+        }
+        else {
             g.reset();
             input_count = sink_count = 0;
         }
-        CHECK_MESSAGE((0 == tbb::flow::copy_body<InputNodeBodyType>(input).count_value()),
-                      "Reset input failed");
-        CHECK_MESSAGE((0 == tbb::flow::copy_body<SinkNodeBodyType>(sink).count_value()), "Reset sink failed");
+        CHECK_MESSAGE( (0 == tbb::flow::copy_body<InputNodeBodyType>(input).count_value()),"Reset input failed");
+        CHECK_MESSAGE( (0 == tbb::flow::copy_body<SinkNodeBodyType>(sink).count_value()),"Reset sink failed");
     }
 
 #if USE_TASK_SCHEDULER_OBSERVER
@@ -1270,74 +1240,82 @@ void run_one_priority_queue_node_test(bool throwException, bool flog) {
 #endif
 }
 
-template <class BufferItemType, TestNodeTypeEnum InputThrowType, TestNodeTypeEnum SinkThrowType>
+template<class BufferItemType,
+         TestNodeTypeEnum InputThrowType,
+         TestNodeTypeEnum SinkThrowType>
 void run_priority_queue_node_test() {
-    typedef test_input_body<BufferItemType, InputThrowType> InputBodyType;
-    typedef absorber_body<BufferItemType, tbb::flow::continue_msg, SinkThrowType, unlimited_type>
-            SinkBodyType;
+    typedef test_input_body<BufferItemType,InputThrowType> InputBodyType;
+    typedef absorber_body<BufferItemType,tbb::flow::continue_msg,SinkThrowType,unlimited_type> SinkBodyType;
     typedef less_body<BufferItemType> LessBodyType;
 
     typedef tbb::flow::input_node<BufferItemType> InputType;
-    typedef tbb::flow::priority_queue_node<BufferItemType, LessBodyType> PrqType;
-    typedef tbb::flow::function_node<BufferItemType, tbb::flow::continue_msg> SnkType;
+    typedef tbb::flow::priority_queue_node<BufferItemType,LessBodyType>  PrqType;
+    typedef tbb::flow::function_node<BufferItemType,tbb::flow::continue_msg> SnkType;
 
-    for (int i = 0; i < 4; ++i) {
-        if (i == 2) continue;// no need to test flog w/o throws
+    for(int i = 0; i < 4; ++i) {
+        if(i == 2) continue;  // no need to test flog w/o throws
         bool throwException = (i & 0x1) != 0;
         bool doFlog = (i & 0x2) != 0;
         run_one_priority_queue_node_test<
-                /* class BufferItemType*/ BufferItemType,
-                /*class InputNodeType*/ InputType,
-                /*class InputNodeBodyType*/ InputBodyType,
-                /*class TestNodeType*/ PrqType,
-                /*class SinkNodeType*/ SnkType,
-                /*class SinkNodeBodyType*/ SinkBodyType>(throwException, doFlog);
+            /* class BufferItemType*/     BufferItemType,
+            /*class InputNodeType*/       InputType,
+            /*class InputNodeBodyType*/   InputBodyType,
+            /*class TestNodeType*/        PrqType,
+            /*class SinkNodeType*/        SnkType,
+            /*class SinkNodeBodyType*/    SinkBodyType
+            >(throwException, doFlog);
     }
 }
 
 void test_priority_queue_node() {
     INFO("Testing priority_queue_node\n");
     g_Wakeup_Msg = "priority_queue_node(is,non): Missed wakeup or machine is overloaded?";
-    run_priority_queue_node_test<int, isThrowing, nonThrowing>();
+    run_priority_queue_node_test<int, isThrowing,nonThrowing>();
     CheckType<int>::check_type_counter = 0;
     g_Wakeup_Msg = "priority_queue_node(non,is): Missed wakeup or machine is overloaded?";
-    run_priority_queue_node_test<CheckType<int>, nonThrowing, isThrowing>();
-    CHECK_MESSAGE((!CheckType<int>::check_type_counter), "Dropped objects in priority_queue_node test");
+    run_priority_queue_node_test<CheckType<int>, nonThrowing,isThrowing>();
+    CHECK_MESSAGE( (!CheckType<int>::check_type_counter), "Dropped objects in priority_queue_node test");
     g_Wakeup_Msg = "priority_queue_node(is,is): Missed wakeup or machine is overloaded?";
-    run_priority_queue_node_test<int, isThrowing, isThrowing>();
+    run_priority_queue_node_test<int, isThrowing,isThrowing>();
     g_Wakeup_Msg = g_Orig_Wakeup_Msg;
 }
 
 // ------------------- join_node ----------------
-template <class JP>
-struct graph_policy_name {
-    static const char *name() { return "unknown"; }
+template<class JP> struct graph_policy_name{
+    static const char* name() {return "unknown"; }
 };
-template <>
-struct graph_policy_name<tbb::flow::queueing> {
-    static const char *name() { return "queueing"; }
+template<> struct graph_policy_name<tbb::flow::queueing>  {
+    static const char* name() {return "queueing"; }
 };
-template <>
-struct graph_policy_name<tbb::flow::reserving> {
-    static const char *name() { return "reserving"; }
+template<> struct graph_policy_name<tbb::flow::reserving> {
+    static const char* name() {return "reserving"; }
 };
-template <>
-struct graph_policy_name<tbb::flow::tag_matching> {
-    static const char *name() { return "tag_matching"; }
+template<> struct graph_policy_name<tbb::flow::tag_matching> {
+    static const char* name() {return "tag_matching"; }
 };
 
-template <class JP, class OutputTuple, class InputType0, class InputBodyType0, class InputType1,
-          class InputBodyType1, class TestJoinType, class SinkType, class SinkBodyType>
+
+template<
+    class JP,
+    class OutputTuple,
+    class InputType0,
+    class InputBodyType0,
+    class InputType1,
+    class InputBodyType1,
+    class TestJoinType,
+    class SinkType,
+    class SinkBodyType
+    >
 struct run_one_join_node_test {
     run_one_join_node_test() {}
-    static void execute_test(bool throwException, bool flog) {
-        typedef typename std::tuple_element<0, OutputTuple>::type ItemType0;
-        typedef typename std::tuple_element<1, OutputTuple>::type ItemType1;
+    static void execute_test(bool throwException,bool flog) {
+        typedef typename std::tuple_element<0,OutputTuple>::type ItemType0;
+        typedef typename std::tuple_element<1,OutputTuple>::type ItemType1;
 
         tbb::flow::graph g;
-        std::atomic<int> input0_count;
-        std::atomic<int> input1_count;
-        std::atomic<int> sink_count;
+        std::atomic<int>input0_count;
+        std::atomic<int>input1_count;
+        std::atomic<int>sink_count;
         input0_count = input1_count = sink_count = 0;
 #if USE_TASK_SCHEDULER_OBSERVER
         eh_test_observer o;
@@ -1347,55 +1325,50 @@ struct run_one_join_node_test {
         InputType0 input0(g, InputBodyType0(input0_count));
         InputType1 input1(g, InputBodyType1(input1_count));
         TestJoinType node_to_test(g);
-        SinkType sink(g, tbb::flow::unlimited, SinkBodyType(sink_count));
-        make_edge(input0, tbb::flow::input_port<0>(node_to_test));
-        make_edge(input1, tbb::flow::input_port<1>(node_to_test));
+        SinkType sink(g,tbb::flow::unlimited,SinkBodyType(sink_count));
+        make_edge(input0,tbb::flow::input_port<0>(node_to_test));
+        make_edge(input1,tbb::flow::input_port<1>(node_to_test));
         make_edge(node_to_test, sink);
-        for (int iter = 0; iter < 2; ++iter) {
-            ResetGlobals(throwException, flog);
-            if (throwException) {
+        for(int iter = 0; iter < 2; ++iter) {
+            ResetGlobals(throwException,flog);
+            if(throwException) {
                 TRY();
-                input0.activate();
-                input1.activate();
-                g.wait_for_all();
+                    input0.activate();
+                    input1.activate();
+                    g.wait_for_all();
                 CATCH_AND_ASSERT();
-            } else {
+            }
+            else {
                 TRY();
-                input0.activate();
-                input1.activate();
-                g.wait_for_all();
+                    input0.activate();
+                    input1.activate();
+                    g.wait_for_all();
                 CATCH_AND_FAIL();
             }
-            bool okayNoExceptionsCaught = (g_ExceptionInMaster && !g_MasterExecutedThrow)
-                                          || (!g_ExceptionInMaster && !g_NonMasterExecutedThrow)
-                                          || !throwException;
+            bool okayNoExceptionsCaught = (g_ExceptionInMaster && !g_MasterExecutedThrow) || (!g_ExceptionInMaster && !g_NonMasterExecutedThrow) || !throwException;
             int ib0_cnt = tbb::flow::copy_body<InputBodyType0>(input0).count_value();
             int ib1_cnt = tbb::flow::copy_body<InputBodyType1>(input1).count_value();
             int nb_cnt = tbb::flow::copy_body<SinkBodyType>(sink).count_value();
-            if (throwException) {
-                CHECK_MESSAGE((g.exception_thrown() || okayNoExceptionsCaught),
-                              "Exception not caught by graph");
-                CHECK_MESSAGE((g.is_cancelled() || okayNoExceptionsCaught),
-                              "Cancellation not signalled in graph");
-                CHECK_MESSAGE((ib0_cnt <= g_NumItems && ib1_cnt <= g_NumItems),
-                              "Too many items sent by inputs");
-                CHECK_MESSAGE((nb_cnt <= ((ib0_cnt < ib1_cnt) ? ib0_cnt : ib1_cnt)),
-                              "Too many items received by sink nodes");
-            } else {
-                CHECK_MESSAGE((!g.exception_thrown()),
-                              "Exception flag in flow::graph set but no throw occurred");
-                CHECK_MESSAGE((!g.is_cancelled()), "canceled flag set but no throw occurred");
-                if (ib0_cnt != g_NumItems) {
-                    //     INFO("throwException == %s\n" << (throwException ? "true" : "false"));
-                    //     INFO("iter == " << iter << "\n");
-                    //     INFO("ib0_cnt == " << ib0_cnt << "\n");
-                    //     INFO("g_NumItems == " << g_NumItems << "\n");
+            if(throwException) {
+                CHECK_MESSAGE( (g.exception_thrown() || okayNoExceptionsCaught), "Exception not caught by graph");
+                CHECK_MESSAGE( (g.is_cancelled() || okayNoExceptionsCaught), "Cancellation not signalled in graph");
+                CHECK_MESSAGE( (ib0_cnt <= g_NumItems && ib1_cnt <= g_NumItems), "Too many items sent by inputs");
+                CHECK_MESSAGE( (nb_cnt <= ((ib0_cnt < ib1_cnt) ? ib0_cnt : ib1_cnt)), "Too many items received by sink nodes");
+            }
+            else {
+                CHECK_MESSAGE( (!g.exception_thrown()), "Exception flag in flow::graph set but no throw occurred");
+                CHECK_MESSAGE( (!g.is_cancelled()), "canceled flag set but no throw occurred");
+                if(ib0_cnt != g_NumItems) {
+                //     INFO("throwException == %s\n" << (throwException ? "true" : "false"));
+                //     INFO("iter == " << iter << "\n");
+                //     INFO("ib0_cnt == " << ib0_cnt << "\n");
+                //     INFO("g_NumItems == " << g_NumItems << "\n");
                 }
-                CHECK_MESSAGE((ib0_cnt == g_NumItems), "Missing invocations of input_node0");// this one
-                CHECK_MESSAGE((ib1_cnt == g_NumItems), "Missing invocations of input_node1");
-                CHECK_MESSAGE((nb_cnt == g_NumItems), "Missing items in absorbers");
+                CHECK_MESSAGE( (ib0_cnt == g_NumItems), "Missing invocations of input_node0");  // this one
+                CHECK_MESSAGE( (ib1_cnt == g_NumItems), "Missing invocations of input_node1");
+                CHECK_MESSAGE( (nb_cnt == g_NumItems), "Missing items in absorbers");
             }
-            if (iter == 0) {
+            if(iter == 0) {
                 remove_edge(node_to_test, sink);
                 tbb::flow::input_port<0>(node_to_test).try_put(ItemType0(g_NumItems + 1));
                 tbb::flow::input_port<1>(node_to_test).try_put(ItemType1(g_NumItems + 2));
@@ -1404,39 +1377,55 @@ struct run_one_join_node_test {
                 input0_count = input1_count = sink_count = 0;
                 make_edge(node_to_test, sink);
                 g.wait_for_all();
-            } else {
+            }
+            else {
                 g.wait_for_all();
                 g.reset();
                 input0_count = input1_count = sink_count = 0;
             }
-            CHECK_MESSAGE((0 == tbb::flow::copy_body<InputBodyType0>(input0).count_value()),
-                          "Reset input failed");
-            CHECK_MESSAGE((0 == tbb::flow::copy_body<InputBodyType1>(input1).count_value()),
-                          "Reset input failed");
+            CHECK_MESSAGE( (0 == tbb::flow::copy_body<InputBodyType0>(input0).count_value()),"Reset input failed");
+            CHECK_MESSAGE( (0 == tbb::flow::copy_body<InputBodyType1>(input1).count_value()),"Reset input failed");
             nb_cnt = tbb::flow::copy_body<SinkBodyType>(sink).count_value();
-            CHECK_MESSAGE((0 == tbb::flow::copy_body<SinkBodyType>(sink).count_value()), "Reset sink failed");
+            CHECK_MESSAGE( (0 == tbb::flow::copy_body<SinkBodyType>(sink).count_value()),"Reset sink failed");
         }
 
 #if USE_TASK_SCHEDULER_OBSERVER
         o.observe(false);
 #endif
     }
-};// run_one_join_node_test
-
-template <class OutputTuple, class InputType0, class InputBodyType0, class InputType1, class InputBodyType1,
-          class TestJoinType, class SinkType, class SinkBodyType>
-struct run_one_join_node_test<tbb::flow::tag_matching, OutputTuple, InputType0, InputBodyType0, InputType1,
-                              InputBodyType1, TestJoinType, SinkType, SinkBodyType> {
+};  // run_one_join_node_test
+
+template<
+    class OutputTuple,
+    class InputType0,
+    class InputBodyType0,
+    class InputType1,
+    class InputBodyType1,
+    class TestJoinType,
+    class SinkType,
+    class SinkBodyType
+    >
+struct run_one_join_node_test<
+        tbb::flow::tag_matching,
+        OutputTuple,
+        InputType0,
+        InputBodyType0,
+        InputType1,
+        InputBodyType1,
+        TestJoinType,
+        SinkType,
+        SinkBodyType
+    > {
     run_one_join_node_test() {}
-    static void execute_test(bool throwException, bool flog) {
-        typedef typename std::tuple_element<0, OutputTuple>::type ItemType0;
-        typedef typename std::tuple_element<1, OutputTuple>::type ItemType1;
+    static void execute_test(bool throwException,bool flog) {
+        typedef typename std::tuple_element<0,OutputTuple>::type ItemType0;
+        typedef typename std::tuple_element<1,OutputTuple>::type ItemType1;
 
         tbb::flow::graph g;
 
-        std::atomic<int> input0_count;
-        std::atomic<int> input1_count;
-        std::atomic<int> sink_count;
+        std::atomic<int>input0_count;
+        std::atomic<int>input1_count;
+        std::atomic<int>sink_count;
         input0_count = input1_count = sink_count = 0;
 #if USE_TASK_SCHEDULER_OBSERVER
         eh_test_observer o;
@@ -1446,119 +1435,127 @@ struct run_one_join_node_test<tbb::flow::tag_matching, OutputTuple, InputType0,
         InputType0 input0(g, InputBodyType0(input0_count, 2));
         InputType1 input1(g, InputBodyType1(input1_count, 3));
         TestJoinType node_to_test(g, tag_func<ItemType0>(ItemType0(2)), tag_func<ItemType1>(ItemType1(3)));
-        SinkType sink(g, tbb::flow::unlimited, SinkBodyType(sink_count));
-        make_edge(input0, tbb::flow::input_port<0>(node_to_test));
-        make_edge(input1, tbb::flow::input_port<1>(node_to_test));
+        SinkType sink(g,tbb::flow::unlimited,SinkBodyType(sink_count));
+        make_edge(input0,tbb::flow::input_port<0>(node_to_test));
+        make_edge(input1,tbb::flow::input_port<1>(node_to_test));
         make_edge(node_to_test, sink);
-        for (int iter = 0; iter < 2; ++iter) {
-            ResetGlobals(throwException, flog);
-            if (throwException) {
+        for(int iter = 0; iter < 2; ++iter) {
+            ResetGlobals(throwException,flog);
+            if(throwException) {
                 TRY();
-                input0.activate();
-                input1.activate();
-                g.wait_for_all();
+                    input0.activate();
+                    input1.activate();
+                    g.wait_for_all();
                 CATCH_AND_ASSERT();
-            } else {
+            }
+            else {
                 TRY();
-                input0.activate();
-                input1.activate();
-                g.wait_for_all();
+                    input0.activate();
+                    input1.activate();
+                    g.wait_for_all();
                 CATCH_AND_FAIL();
             }
-            bool okayNoExceptionsCaught = (g_ExceptionInMaster && !g_MasterExecutedThrow)
-                                          || (!g_ExceptionInMaster && !g_NonMasterExecutedThrow)
-                                          || !throwException;
+            bool okayNoExceptionsCaught = (g_ExceptionInMaster && !g_MasterExecutedThrow) || (!g_ExceptionInMaster && !g_NonMasterExecutedThrow) || !throwException;
             int ib0_cnt = tbb::flow::copy_body<InputBodyType0>(input0).count_value();
             int ib1_cnt = tbb::flow::copy_body<InputBodyType1>(input1).count_value();
             int nb_cnt = tbb::flow::copy_body<SinkBodyType>(sink).count_value();
-            if (throwException) {
-                CHECK_MESSAGE((g.exception_thrown() || okayNoExceptionsCaught),
-                              "Exception not caught by graph");
-                CHECK_MESSAGE((g.is_cancelled() || okayNoExceptionsCaught),
-                              "Cancellation not signalled in graph");
-                CHECK_MESSAGE((ib0_cnt <= g_NumItems && ib1_cnt <= g_NumItems),
-                              "Too many items sent by inputs");
-                CHECK_MESSAGE((nb_cnt <= ((ib0_cnt < ib1_cnt) ? ib0_cnt : ib1_cnt)),
-                              "Too many items received by sink nodes");
-            } else {
-                CHECK_MESSAGE((!g.exception_thrown()),
-                              "Exception flag in flow::graph set but no throw occurred");
-                CHECK_MESSAGE((!g.is_cancelled()), "canceled flag set but no throw occurred");
-                CHECK_MESSAGE((ib0_cnt == g_NumItems), "Missing invocations of input_node0");
-                CHECK_MESSAGE((ib1_cnt == g_NumItems), "Missing invocations of input_node1");
-                CHECK_MESSAGE((nb_cnt == g_NumItems), "Missing items in absorbers");
+            if(throwException) {
+                CHECK_MESSAGE( (g.exception_thrown() || okayNoExceptionsCaught), "Exception not caught by graph");
+                CHECK_MESSAGE( (g.is_cancelled() || okayNoExceptionsCaught), "Cancellation not signalled in graph");
+                CHECK_MESSAGE( (ib0_cnt <= g_NumItems && ib1_cnt <= g_NumItems), "Too many items sent by inputs");
+                CHECK_MESSAGE( (nb_cnt <= ((ib0_cnt < ib1_cnt) ? ib0_cnt : ib1_cnt)), "Too many items received by sink nodes");
             }
-            if (iter == 0) {
+            else {
+                CHECK_MESSAGE( (!g.exception_thrown()), "Exception flag in flow::graph set but no throw occurred");
+                CHECK_MESSAGE( (!g.is_cancelled()), "canceled flag set but no throw occurred");
+                CHECK_MESSAGE( (ib0_cnt == g_NumItems), "Missing invocations of input_node0");
+                CHECK_MESSAGE( (ib1_cnt == g_NumItems), "Missing invocations of input_node1");
+                CHECK_MESSAGE( (nb_cnt == g_NumItems), "Missing items in absorbers");
+            }
+            if(iter == 0) {
                 remove_edge(node_to_test, sink);
                 tbb::flow::input_port<0>(node_to_test).try_put(ItemType0(g_NumItems + 4));
                 tbb::flow::input_port<1>(node_to_test).try_put(ItemType1(g_NumItems + 2));
-                g.wait_for_all();// have to wait for the graph to stop again....
-                g.reset();       // resets the body of the input_nodes, test_node and the absorb_nodes.
+                g.wait_for_all();   // have to wait for the graph to stop again....
+                g.reset();  // resets the body of the input_nodes, test_node and the absorb_nodes.
                 input0_count = input1_count = sink_count = 0;
                 make_edge(node_to_test, sink);
-                g.wait_for_all();// have to wait for the graph to stop again....
-            } else {
+                g.wait_for_all();   // have to wait for the graph to stop again....
+            }
+            else {
                 g.wait_for_all();
                 g.reset();
                 input0_count = input1_count = sink_count = 0;
             }
-            CHECK_MESSAGE((0 == tbb::flow::copy_body<InputBodyType0>(input0).count_value()),
-                          "Reset input failed");
-            CHECK_MESSAGE((0 == tbb::flow::copy_body<InputBodyType1>(input1).count_value()),
-                          "Reset input failed");
+            CHECK_MESSAGE( (0 == tbb::flow::copy_body<InputBodyType0>(input0).count_value()),"Reset input failed");
+            CHECK_MESSAGE( (0 == tbb::flow::copy_body<InputBodyType1>(input1).count_value()),"Reset input failed");
             nb_cnt = tbb::flow::copy_body<SinkBodyType>(sink).count_value();
-            CHECK_MESSAGE((0 == tbb::flow::copy_body<SinkBodyType>(sink).count_value()), "Reset sink failed");
+            CHECK_MESSAGE( (0 == tbb::flow::copy_body<SinkBodyType>(sink).count_value()),"Reset sink failed");
         }
 
 #if USE_TASK_SCHEDULER_OBSERVER
         o.observe(false);
 #endif
     }
-};// run_one_join_node_test<tag_matching>
+};  // run_one_join_node_test<tag_matching>
 
-template <class JP, class OutputTuple, TestNodeTypeEnum InputThrowType, TestNodeTypeEnum SinkThrowType>
+template<class JP, class OutputTuple,
+             TestNodeTypeEnum InputThrowType,
+             TestNodeTypeEnum SinkThrowType>
 void run_join_node_test() {
-    typedef typename std::tuple_element<0, OutputTuple>::type ItemType0;
-    typedef typename std::tuple_element<1, OutputTuple>::type ItemType1;
-    typedef test_input_body<ItemType0, InputThrowType> InputBodyType0;
-    typedef test_input_body<ItemType1, InputThrowType> InputBodyType1;
-    typedef absorber_body<OutputTuple, tbb::flow::continue_msg, SinkThrowType, unlimited_type> SinkBodyType;
+    typedef typename std::tuple_element<0,OutputTuple>::type ItemType0;
+    typedef typename std::tuple_element<1,OutputTuple>::type ItemType1;
+    typedef test_input_body<ItemType0,InputThrowType> InputBodyType0;
+    typedef test_input_body<ItemType1,InputThrowType> InputBodyType1;
+    typedef absorber_body<OutputTuple,tbb::flow::continue_msg,SinkThrowType,unlimited_type> SinkBodyType;
 
     typedef typename tbb::flow::input_node<ItemType0> InputType0;
     typedef typename tbb::flow::input_node<ItemType1> InputType1;
-    typedef typename tbb::flow::join_node<OutputTuple, JP> TestJoinType;
-    typedef typename tbb::flow::function_node<OutputTuple, tbb::flow::continue_msg> SinkType;
+    typedef typename tbb::flow::join_node<OutputTuple,JP> TestJoinType;
+    typedef typename tbb::flow::function_node<OutputTuple,tbb::flow::continue_msg> SinkType;
 
-    for (int i = 0; i < 4; ++i) {
-        if (2 == i) continue;
+    for(int i = 0; i < 4; ++i) {
+        if(2 == i) continue;
         bool throwException = (i & 0x1) != 0;
         bool doFlog = (i & 0x2) != 0;
-        run_one_join_node_test<JP, OutputTuple, InputType0, InputBodyType0, InputType1, InputBodyType1,
-                               TestJoinType, SinkType, SinkBodyType>::execute_test(throwException, doFlog);
+        run_one_join_node_test<
+             JP,
+             OutputTuple,
+             InputType0,
+             InputBodyType0,
+             InputType1,
+             InputBodyType1,
+             TestJoinType,
+             SinkType,
+             SinkBodyType>::execute_test(throwException,doFlog);
     }
 }
 
-template <class JP>
+template<class JP>
 void test_join_node() {
     INFO("Testing join_node<" << graph_policy_name<JP>::name() << ">\n");
     // only doing two-input joins
     g_Wakeup_Msg = "join(is,non): Missed wakeup or machine is overloaded?";
-    run_join_node_test<JP, std::tuple<int, int>, isThrowing, nonThrowing>();
+    run_join_node_test<JP, std::tuple<int,int>,  isThrowing, nonThrowing>();
     CheckType<int>::check_type_counter = 0;
     g_Wakeup_Msg = "join(non,is): Missed wakeup or machine is overloaded?";
-    run_join_node_test<JP, std::tuple<CheckType<int>, int>, nonThrowing, isThrowing>();
-    CHECK_MESSAGE((!CheckType<int>::check_type_counter), "Dropped items in test");
+    run_join_node_test<JP, std::tuple<CheckType<int>,int>, nonThrowing, isThrowing>();
+    CHECK_MESSAGE( (!CheckType<int>::check_type_counter), "Dropped items in test");
     g_Wakeup_Msg = "join(is,is): Missed wakeup or machine is overloaded?";
-    run_join_node_test<JP, std::tuple<int, int>, isThrowing, isThrowing>();
+    run_join_node_test<JP, std::tuple<int,int>,  isThrowing, isThrowing>();
     g_Wakeup_Msg = g_Orig_Wakeup_Msg;
 }
 
 // ------------------- limiter_node -------------
 
-template <class BufferItemType,//
-          class InputNodeType, class InputNodeBodyType, class TestNodeType, class SinkNodeType,
-          class SinkNodeBodyType>
-void run_one_limiter_node_test(bool throwException, bool flog) {
+template<
+    class BufferItemType,       //
+    class InputNodeType,
+    class InputNodeBodyType,
+    class TestNodeType,
+    class SinkNodeType,
+    class SinkNodeBodyType >
+void run_one_limiter_node_test(bool throwException,bool flog) {
     tbb::flow::graph g;
 
     std::atomic<int> input_count;
@@ -1570,43 +1567,42 @@ void run_one_limiter_node_test(bool throwException, bool flog) {
 #endif
     g_Master = std::this_thread::get_id();
     InputNodeType input(g, InputNodeBodyType(input_count));
-    TestNodeType node_to_test(g, g_NumThreads + 1);
-    SinkNodeType sink(g, tbb::flow::unlimited, SinkNodeBodyType(sink_count));
-    make_edge(input, node_to_test);
+    TestNodeType node_to_test(g,g_NumThreads + 1);
+    SinkNodeType sink(g,tbb::flow::unlimited,SinkNodeBodyType(sink_count));
+    make_edge(input,node_to_test);
     make_edge(node_to_test, sink);
-    for (int iter = 0; iter < 2; ++iter) {
-        ResetGlobals(throwException, flog);
-        if (throwException) {
+    for(int iter = 0; iter < 2; ++iter) {
+        ResetGlobals(throwException,flog);
+        if(throwException) {
             TRY();
-            input.activate();
-            g.wait_for_all();
+                input.activate();
+                g.wait_for_all();
             CATCH_AND_ASSERT();
-        } else {
+        }
+        else {
             TRY();
-            input.activate();
-            g.wait_for_all();
+                input.activate();
+                g.wait_for_all();
             CATCH_AND_FAIL();
         }
-        bool okayNoExceptionsCaught = (g_ExceptionInMaster && !g_MasterExecutedThrow)
-                                      || (!g_ExceptionInMaster && !g_NonMasterExecutedThrow)
-                                      || !throwException;
+        bool okayNoExceptionsCaught = (g_ExceptionInMaster && !g_MasterExecutedThrow) || (!g_ExceptionInMaster && !g_NonMasterExecutedThrow) || !throwException;
         int ib_cnt = tbb::flow::copy_body<InputNodeBodyType>(input).count_value();
         int nb_cnt = tbb::flow::copy_body<SinkNodeBodyType>(sink).count_value();
-        if (throwException) {
-            CHECK_MESSAGE((g.exception_thrown() || okayNoExceptionsCaught), "Exception not caught by graph");
-            CHECK_MESSAGE((g.is_cancelled() || okayNoExceptionsCaught),
-                          "Cancellation not signalled in graph");
-            CHECK_MESSAGE((ib_cnt <= g_NumItems), "Too many items sent by inputs");
-            CHECK_MESSAGE((nb_cnt <= ib_cnt), "Too many items received by sink nodes");
-        } else {
-            CHECK_MESSAGE((!g.exception_thrown()), "Exception flag in flow::graph set but no throw occurred");
-            CHECK_MESSAGE((!g.is_cancelled()), "canceled flag set but no throw occurred");
+        if(throwException) {
+            CHECK_MESSAGE( (g.exception_thrown() || okayNoExceptionsCaught), "Exception not caught by graph");
+            CHECK_MESSAGE( (g.is_cancelled() || okayNoExceptionsCaught), "Cancellation not signalled in graph");
+            CHECK_MESSAGE( (ib_cnt <= g_NumItems), "Too many items sent by inputs");
+            CHECK_MESSAGE( (nb_cnt <= ib_cnt), "Too many items received by sink nodes");
+        }
+        else {
+            CHECK_MESSAGE( (!g.exception_thrown()), "Exception flag in flow::graph set but no throw occurred");
+            CHECK_MESSAGE( (!g.is_cancelled()), "canceled flag set but no throw occurred");
             // we stop after limiter's limit, which is g_NumThreads + 1.  The input_node
             // is invoked one extra time, filling its buffer, so its limit is g_NumThreads + 2.
-            CHECK_MESSAGE((ib_cnt == g_NumThreads + 2), "Missing invocations of input_node");
-            CHECK_MESSAGE((nb_cnt == g_NumThreads + 1), "Missing items in absorbers");
+            CHECK_MESSAGE( (ib_cnt == g_NumThreads + 2), "Missing invocations of input_node");
+            CHECK_MESSAGE( (nb_cnt == g_NumThreads + 1), "Missing items in absorbers");
         }
-        if (iter == 0) {
+        if(iter == 0) {
             remove_edge(node_to_test, sink);
             node_to_test.try_put(BufferItemType());
             node_to_test.try_put(BufferItemType());
@@ -1614,16 +1610,16 @@ void run_one_limiter_node_test(bool throwException, bool flog) {
             g.reset();
             input_count = sink_count = 0;
             BufferItemType tmp;
-            CHECK_MESSAGE((!node_to_test.try_get(tmp)), "node not empty");
+            CHECK_MESSAGE( (!node_to_test.try_get(tmp)), "node not empty");
             make_edge(node_to_test, sink);
             g.wait_for_all();
-        } else {
+        }
+        else {
             g.reset();
             input_count = sink_count = 0;
         }
-        CHECK_MESSAGE((0 == tbb::flow::copy_body<InputNodeBodyType>(input).count_value()),
-                      "Reset input failed");
-        CHECK_MESSAGE((0 == tbb::flow::copy_body<SinkNodeBodyType>(sink).count_value()), "Reset sink failed");
+        CHECK_MESSAGE( (0 == tbb::flow::copy_body<InputNodeBodyType>(input).count_value()),"Reset input failed");
+        CHECK_MESSAGE( (0 == tbb::flow::copy_body<SinkNodeBodyType>(sink).count_value()),"Reset sink failed");
     }
 
 #if USE_TASK_SCHEDULER_OBSERVER
@@ -1631,45 +1627,54 @@ void run_one_limiter_node_test(bool throwException, bool flog) {
 #endif
 }
 
-template <class BufferItemType, TestNodeTypeEnum InputThrowType, TestNodeTypeEnum SinkThrowType>
+template<class BufferItemType,
+         TestNodeTypeEnum InputThrowType,
+         TestNodeTypeEnum SinkThrowType>
 void run_limiter_node_test() {
-    typedef test_input_body<BufferItemType, InputThrowType> InputBodyType;
-    typedef absorber_body<BufferItemType, tbb::flow::continue_msg, SinkThrowType, unlimited_type>
-            SinkBodyType;
+    typedef test_input_body<BufferItemType,InputThrowType> InputBodyType;
+    typedef absorber_body<BufferItemType,tbb::flow::continue_msg,SinkThrowType,unlimited_type> SinkBodyType;
 
     typedef tbb::flow::input_node<BufferItemType> InputType;
-    typedef tbb::flow::limiter_node<BufferItemType> LmtType;
-    typedef tbb::flow::function_node<BufferItemType, tbb::flow::continue_msg> SnkType;
+    typedef tbb::flow::limiter_node<BufferItemType>  LmtType;
+    typedef tbb::flow::function_node<BufferItemType,tbb::flow::continue_msg> SnkType;
 
-    for (int i = 0; i < 4; ++i) {
-        if (i == 2) continue;// no need to test flog w/o throws
+    for(int i = 0; i < 4; ++i) {
+        if(i == 2) continue;  // no need to test flog w/o throws
         bool throwException = (i & 0x1) != 0;
         bool doFlog = (i & 0x2) != 0;
         run_one_limiter_node_test<
-                /* class BufferItemType*/ BufferItemType,
-                /*class InputNodeType*/ InputType,
-                /*class InputNodeBodyType*/ InputBodyType,
-                /*class TestNodeType*/ LmtType,
-                /*class SinkNodeType*/ SnkType,
-                /*class SinkNodeBodyType*/ SinkBodyType>(throwException, doFlog);
+            /* class BufferItemType*/     BufferItemType,
+            /*class InputNodeType*/       InputType,
+            /*class InputNodeBodyType*/   InputBodyType,
+            /*class TestNodeType*/        LmtType,
+            /*class SinkNodeType*/        SnkType,
+            /*class SinkNodeBodyType*/    SinkBodyType
+            >(throwException, doFlog);
     }
 }
 
 void test_limiter_node() {
     INFO("Testing limiter_node\n");
     g_Wakeup_Msg = "limiter_node(is,non): Missed wakeup or machine is overloaded?";
-    run_limiter_node_test<int, isThrowing, nonThrowing>();
+    run_limiter_node_test<int,isThrowing,nonThrowing>();
     g_Wakeup_Msg = "limiter_node(non,is): Missed wakeup or machine is overloaded?";
-    run_limiter_node_test<int, nonThrowing, isThrowing>();
+    run_limiter_node_test<int,nonThrowing,isThrowing>();
     g_Wakeup_Msg = "limiter_node(is,is): Missed wakeup or machine is overloaded?";
-    run_limiter_node_test<int, isThrowing, isThrowing>();
+    run_limiter_node_test<int,isThrowing,isThrowing>();
     g_Wakeup_Msg = g_Orig_Wakeup_Msg;
 }
 
 // -------- split_node --------------------
 
-template <class InputTuple, class InputType, class InputBodyType, class TestSplitType, class SinkType0,
-          class SinkBodyType0, class SinkType1, class SinkBodyType1>
+template<
+    class InputTuple,
+    class InputType,
+    class InputBodyType,
+    class TestSplitType,
+    class SinkType0,
+    class SinkBodyType0,
+    class SinkType1,
+    class SinkBodyType1>
 void run_one_split_node_test(bool throwException, bool flog) {
 
     tbb::flow::graph g;
@@ -1686,94 +1691,109 @@ void run_one_split_node_test(bool throwException, bool flog) {
     g_Master = std::this_thread::get_id();
     InputType input(g, InputBodyType(input_count));
     TestSplitType node_to_test(g);
-    SinkType0 sink0(g, tbb::flow::unlimited, SinkBodyType0(sink0_count));
-    SinkType1 sink1(g, tbb::flow::unlimited, SinkBodyType1(sink1_count));
+    SinkType0 sink0(g,tbb::flow::unlimited,SinkBodyType0(sink0_count));
+    SinkType1 sink1(g,tbb::flow::unlimited,SinkBodyType1(sink1_count));
     make_edge(input, node_to_test);
     make_edge(tbb::flow::output_port<0>(node_to_test), sink0);
     make_edge(tbb::flow::output_port<1>(node_to_test), sink1);
 
-    for (int iter = 0; iter < 2; ++iter) {// run, reset, run again
-        ResetGlobals(throwException, flog);
-        if (throwException) {
+    for(int iter = 0; iter < 2; ++iter) {  // run, reset, run again
+        ResetGlobals(throwException,flog);
+        if(throwException) {
             TRY();
-            input.activate();
-            g.wait_for_all();
+                input.activate();
+                g.wait_for_all();
             CATCH_AND_ASSERT();
-        } else {
+        }
+        else {
             TRY();
-            input.activate();
-            g.wait_for_all();
+                input.activate();
+                g.wait_for_all();
             CATCH_AND_FAIL();
         }
-        bool okayNoExceptionsCaught = (g_ExceptionInMaster && !g_MasterExecutedThrow)
-                                      || (!g_ExceptionInMaster && !g_NonMasterExecutedThrow)
-                                      || !throwException;
+        bool okayNoExceptionsCaught = (g_ExceptionInMaster && !g_MasterExecutedThrow) || (!g_ExceptionInMaster && !g_NonMasterExecutedThrow) || !throwException;
         int ib_cnt = tbb::flow::copy_body<InputBodyType>(input).count_value();
         int nb0_cnt = tbb::flow::copy_body<SinkBodyType0>(sink0).count_value();
         int nb1_cnt = tbb::flow::copy_body<SinkBodyType1>(sink1).count_value();
-        if (throwException) {
-            CHECK_MESSAGE((g.exception_thrown() || okayNoExceptionsCaught), "Exception not caught by graph");
-            CHECK_MESSAGE((g.is_cancelled() || okayNoExceptionsCaught),
-                          "Cancellation not signalled in graph");
-            CHECK_MESSAGE((ib_cnt <= 2 * g_NumItems), "Too many items sent by input");
-            CHECK_MESSAGE((nb0_cnt + nb1_cnt <= ib_cnt * 2), "Too many items received by sink nodes");
-        } else {
-            CHECK_MESSAGE((!g.exception_thrown()), "Exception flag in flow::graph set but no throw occurred");
-            CHECK_MESSAGE((!g.is_cancelled()), "canceled flag set but no throw occurred");
-            CHECK_MESSAGE((ib_cnt == g_NumItems), "Missing invocations of input_nodes");
-            CHECK_MESSAGE((nb0_cnt == g_NumItems && nb1_cnt == g_NumItems), "Missing items in absorbers");
+        if(throwException) {
+            CHECK_MESSAGE( (g.exception_thrown() || okayNoExceptionsCaught), "Exception not caught by graph");
+            CHECK_MESSAGE( (g.is_cancelled() || okayNoExceptionsCaught), "Cancellation not signalled in graph");
+            CHECK_MESSAGE( (ib_cnt <= 2*g_NumItems), "Too many items sent by input");
+            CHECK_MESSAGE( (nb0_cnt + nb1_cnt <= ib_cnt*2), "Too many items received by sink nodes");
+        }
+        else {
+            CHECK_MESSAGE( (!g.exception_thrown()), "Exception flag in flow::graph set but no throw occurred");
+            CHECK_MESSAGE( (!g.is_cancelled()), "canceled flag set but no throw occurred");
+            CHECK_MESSAGE( (ib_cnt == g_NumItems), "Missing invocations of input_nodes");
+            CHECK_MESSAGE( (nb0_cnt == g_NumItems && nb1_cnt == g_NumItems), "Missing items in absorbers");
         }
-        g.reset();// resets the body of the input_nodes and the absorb_nodes.
+        g.reset();  // resets the body of the input_nodes and the absorb_nodes.
         input_count = sink0_count = sink1_count = 0;
-        CHECK_MESSAGE((0 == tbb::flow::copy_body<InputBodyType>(input).count_value()), "Reset input failed");
-        CHECK_MESSAGE((0 == tbb::flow::copy_body<SinkBodyType0>(sink0).count_value()), "Reset sink 0 failed");
-        CHECK_MESSAGE((0 == tbb::flow::copy_body<SinkBodyType1>(sink1).count_value()), "Reset sink 1 failed");
+        CHECK_MESSAGE( (0 == tbb::flow::copy_body<InputBodyType>(input).count_value()),"Reset input failed");
+        CHECK_MESSAGE( (0 == tbb::flow::copy_body<SinkBodyType0>(sink0).count_value()),"Reset sink 0 failed");
+        CHECK_MESSAGE( (0 == tbb::flow::copy_body<SinkBodyType1>(sink1).count_value()),"Reset sink 1 failed");
     }
 #if USE_TASK_SCHEDULER_OBSERVER
     o.observe(false);
 #endif
 }
 
-template <class InputTuple, TestNodeTypeEnum InputThrowType, TestNodeTypeEnum SinkThrowType>
+template<class InputTuple,
+             TestNodeTypeEnum InputThrowType,
+             TestNodeTypeEnum SinkThrowType>
 void run_split_node_test() {
-    typedef typename std::tuple_element<0, InputTuple>::type ItemType0;
-    typedef typename std::tuple_element<1, InputTuple>::type ItemType1;
-    typedef tuple_test_input_body<InputTuple, InputThrowType> InputBodyType;
-    typedef absorber_body<ItemType0, tbb::flow::continue_msg, SinkThrowType, unlimited_type> SinkBodyType0;
-    typedef absorber_body<ItemType1, tbb::flow::continue_msg, SinkThrowType, unlimited_type> SinkBodyType1;
+    typedef typename std::tuple_element<0,InputTuple>::type ItemType0;
+    typedef typename std::tuple_element<1,InputTuple>::type ItemType1;
+    typedef tuple_test_input_body<InputTuple,InputThrowType> InputBodyType;
+    typedef absorber_body<ItemType0,tbb::flow::continue_msg,SinkThrowType,unlimited_type> SinkBodyType0;
+    typedef absorber_body<ItemType1,tbb::flow::continue_msg,SinkThrowType,unlimited_type> SinkBodyType1;
 
     typedef typename tbb::flow::input_node<InputTuple> InputType;
     typedef typename tbb::flow::split_node<InputTuple> TestSplitType;
-    typedef typename tbb::flow::function_node<ItemType0, tbb::flow::continue_msg> SinkType0;
-    typedef typename tbb::flow::function_node<ItemType1, tbb::flow::continue_msg> SinkType1;
+    typedef typename tbb::flow::function_node<ItemType0,tbb::flow::continue_msg> SinkType0;
+    typedef typename tbb::flow::function_node<ItemType1,tbb::flow::continue_msg> SinkType1;
 
-    for (int i = 0; i < 4; ++i) {
-        if (2 == i) continue;
+    for(int i = 0; i < 4; ++i) {
+        if(2 == i) continue;
         bool throwException = (i & 0x1) != 0;
         bool doFlog = (i & 0x2) != 0;
-        run_one_split_node_test<InputTuple, InputType, InputBodyType, TestSplitType, SinkType0, SinkBodyType0,
-                                SinkType1, SinkBodyType1>(throwException, doFlog);
+        run_one_split_node_test<
+            InputTuple,
+            InputType,
+            InputBodyType,
+            TestSplitType,
+            SinkType0,
+            SinkBodyType0,
+            SinkType1,
+            SinkBodyType1>
+                (throwException,doFlog);
     }
 }
 
 void test_split_node() {
     INFO("Testing split_node\n");
     g_Wakeup_Msg = "split_node(is,non): Missed wakeup or machine is overloaded?";
-    run_split_node_test<std::tuple<int, int>, isThrowing, nonThrowing>();
+    run_split_node_test<std::tuple<int,int>, isThrowing, nonThrowing>();
     g_Wakeup_Msg = "split_node(non,is): Missed wakeup or machine is overloaded?";
-    run_split_node_test<std::tuple<int, int>, nonThrowing, isThrowing>();
+    run_split_node_test<std::tuple<int,int>, nonThrowing, isThrowing>();
     g_Wakeup_Msg = "split_node(is,is): Missed wakeup or machine is overloaded?";
-    run_split_node_test<std::tuple<int, int>, isThrowing, isThrowing>();
+    run_split_node_test<std::tuple<int,int>, isThrowing,  isThrowing>();
     g_Wakeup_Msg = g_Orig_Wakeup_Msg;
 }
 
 // --------- indexer_node ----------------------
 
-template <class InputTuple, class InputType0, class InputBodyType0, class InputType1, class InputBodyType1,
-          class TestNodeType, class SinkType, class SinkBodyType>
-void run_one_indexer_node_test(bool throwException, bool flog) {
-    typedef typename std::tuple_element<0, InputTuple>::type ItemType0;
-    typedef typename std::tuple_element<1, InputTuple>::type ItemType1;
+template < class InputTuple,
+    class InputType0,
+    class InputBodyType0,
+    class InputType1,
+    class InputBodyType1,
+    class TestNodeType,
+    class SinkType,
+    class SinkBodyType>
+void run_one_indexer_node_test(bool throwException,bool flog) {
+    typedef typename std::tuple_element<0,InputTuple>::type ItemType0;
+    typedef typename std::tuple_element<1,InputTuple>::type ItemType1;
 
     tbb::flow::graph g;
 
@@ -1789,45 +1809,44 @@ void run_one_indexer_node_test(bool throwException, bool flog) {
     InputType0 input0(g, InputBodyType0(input0_count));
     InputType1 input1(g, InputBodyType1(input1_count));
     TestNodeType node_to_test(g);
-    SinkType sink(g, tbb::flow::unlimited, SinkBodyType(sink_count));
-    make_edge(input0, tbb::flow::input_port<0>(node_to_test));
-    make_edge(input1, tbb::flow::input_port<1>(node_to_test));
+    SinkType sink(g,tbb::flow::unlimited,SinkBodyType(sink_count));
+    make_edge(input0,tbb::flow::input_port<0>(node_to_test));
+    make_edge(input1,tbb::flow::input_port<1>(node_to_test));
     make_edge(node_to_test, sink);
-    for (int iter = 0; iter < 2; ++iter) {
-        ResetGlobals(throwException, flog);
-        if (throwException) {
+    for(int iter = 0; iter < 2; ++iter) {
+        ResetGlobals(throwException,flog);
+        if(throwException) {
             TRY();
-            input0.activate();
-            input1.activate();
-            g.wait_for_all();
+                input0.activate();
+                input1.activate();
+                g.wait_for_all();
             CATCH_AND_ASSERT();
-        } else {
+        }
+        else {
             TRY();
-            input0.activate();
-            input1.activate();
-            g.wait_for_all();
+                input0.activate();
+                input1.activate();
+                g.wait_for_all();
             CATCH_AND_FAIL();
         }
-        bool okayNoExceptionsCaught = (g_ExceptionInMaster && !g_MasterExecutedThrow)
-                                      || (!g_ExceptionInMaster && !g_NonMasterExecutedThrow)
-                                      || !throwException;
+        bool okayNoExceptionsCaught = (g_ExceptionInMaster && !g_MasterExecutedThrow) || (!g_ExceptionInMaster && !g_NonMasterExecutedThrow) || !throwException;
         int ib0_cnt = tbb::flow::copy_body<InputBodyType0>(input0).count_value();
         int ib1_cnt = tbb::flow::copy_body<InputBodyType1>(input1).count_value();
         int nb_cnt = tbb::flow::copy_body<SinkBodyType>(sink).count_value();
-        if (throwException) {
-            CHECK_MESSAGE((g.exception_thrown() || okayNoExceptionsCaught), "Exception not caught by graph");
-            CHECK_MESSAGE((g.is_cancelled() || okayNoExceptionsCaught),
-                          "Cancellation not signalled in graph");
-            CHECK_MESSAGE((ib0_cnt <= g_NumItems && ib1_cnt <= g_NumItems), "Too many items sent by inputs");
-            CHECK_MESSAGE((nb_cnt <= ib0_cnt + ib1_cnt), "Too many items received by sink nodes");
-        } else {
-            CHECK_MESSAGE((!g.exception_thrown()), "Exception flag in flow::graph set but no throw occurred");
-            CHECK_MESSAGE((!g.is_cancelled()), "canceled flag set but no throw occurred");
-            CHECK_MESSAGE((ib0_cnt == g_NumItems), "Missing invocations of input_node0");
-            CHECK_MESSAGE((ib1_cnt == g_NumItems), "Missing invocations of input_node1");
-            CHECK_MESSAGE((nb_cnt == 2 * g_NumItems), "Missing items in absorbers");
+        if(throwException) {
+            CHECK_MESSAGE( (g.exception_thrown() || okayNoExceptionsCaught), "Exception not caught by graph");
+            CHECK_MESSAGE( (g.is_cancelled() || okayNoExceptionsCaught), "Cancellation not signalled in graph");
+            CHECK_MESSAGE( (ib0_cnt <= g_NumItems && ib1_cnt <= g_NumItems), "Too many items sent by inputs");
+            CHECK_MESSAGE( (nb_cnt <= ib0_cnt + ib1_cnt), "Too many items received by sink nodes");
+        }
+        else {
+            CHECK_MESSAGE( (!g.exception_thrown()), "Exception flag in flow::graph set but no throw occurred");
+            CHECK_MESSAGE( (!g.is_cancelled()), "canceled flag set but no throw occurred");
+            CHECK_MESSAGE( (ib0_cnt == g_NumItems), "Missing invocations of input_node0");
+            CHECK_MESSAGE( (ib1_cnt == g_NumItems), "Missing invocations of input_node1");
+            CHECK_MESSAGE( (nb_cnt == 2*g_NumItems), "Missing items in absorbers");
         }
-        if (iter == 0) {
+        if(iter == 0) {
             remove_edge(node_to_test, sink);
             tbb::flow::input_port<0>(node_to_test).try_put(ItemType0(g_NumItems + 4));
             tbb::flow::input_port<1>(node_to_test).try_put(ItemType1(g_NumItems + 2));
@@ -1836,17 +1855,16 @@ void run_one_indexer_node_test(bool throwException, bool flog) {
             input0_count = input1_count = sink_count = 0;
             make_edge(node_to_test, sink);
             g.wait_for_all();
-        } else {
+        }
+        else {
             g.wait_for_all();
             g.reset();
             input0_count = input1_count = sink_count = 0;
         }
-        CHECK_MESSAGE((0 == tbb::flow::copy_body<InputBodyType0>(input0).count_value()),
-                      "Reset input failed");
-        CHECK_MESSAGE((0 == tbb::flow::copy_body<InputBodyType1>(input1).count_value()),
-                      "Reset input failed");
+        CHECK_MESSAGE( (0 == tbb::flow::copy_body<InputBodyType0>(input0).count_value()),"Reset input failed");
+        CHECK_MESSAGE( (0 == tbb::flow::copy_body<InputBodyType1>(input1).count_value()),"Reset input failed");
         nb_cnt = tbb::flow::copy_body<SinkBodyType>(sink).count_value();
-        CHECK_MESSAGE((0 == tbb::flow::copy_body<SinkBodyType>(sink).count_value()), "Reset sink failed");
+        CHECK_MESSAGE( (0 == tbb::flow::copy_body<SinkBodyType>(sink).count_value()),"Reset sink failed");
     }
 
 #if USE_TASK_SCHEDULER_OBSERVER
@@ -1854,41 +1872,46 @@ void run_one_indexer_node_test(bool throwException, bool flog) {
 #endif
 }
 
-template <class InputTuple, TestNodeTypeEnum InputThrowType, TestNodeTypeEnum SinkThrowType>
+template<class InputTuple,
+    TestNodeTypeEnum InputThrowType,
+    TestNodeTypeEnum SinkThrowType>
 void run_indexer_node_test() {
-    typedef typename std::tuple_element<0, InputTuple>::type ItemType0;
-    typedef typename std::tuple_element<1, InputTuple>::type ItemType1;
-    typedef test_input_body<ItemType0, InputThrowType> InputBodyType0;
-    typedef test_input_body<ItemType1, InputThrowType> InputBodyType1;
+    typedef typename std::tuple_element<0,InputTuple>::type ItemType0;
+    typedef typename std::tuple_element<1,InputTuple>::type ItemType1;
+    typedef test_input_body<ItemType0,InputThrowType> InputBodyType0;
+    typedef test_input_body<ItemType1,InputThrowType> InputBodyType1;
     typedef typename tbb::flow::indexer_node<ItemType0, ItemType1> TestNodeType;
-    typedef absorber_body<typename TestNodeType::output_type, tbb::flow::continue_msg, SinkThrowType,
-                          unlimited_type>
-            SinkBodyType;
+    typedef absorber_body<typename TestNodeType::output_type,tbb::flow::continue_msg,SinkThrowType,unlimited_type> SinkBodyType;
 
     typedef typename tbb::flow::input_node<ItemType0> InputType0;
     typedef typename tbb::flow::input_node<ItemType1> InputType1;
-    typedef typename tbb::flow::function_node<typename TestNodeType::output_type, tbb::flow::continue_msg>
-            SinkType;
+    typedef typename tbb::flow::function_node<typename TestNodeType::output_type,tbb::flow::continue_msg> SinkType;
 
-    for (int i = 0; i < 4; ++i) {
-        if (2 == i) continue;
+    for(int i = 0; i < 4; ++i) {
+        if(2 == i) continue;
         bool throwException = (i & 0x1) != 0;
         bool doFlog = (i & 0x2) != 0;
-        run_one_indexer_node_test<InputTuple, InputType0, InputBodyType0, InputType1, InputBodyType1,
-                                  TestNodeType, SinkType, SinkBodyType>(throwException, doFlog);
+        run_one_indexer_node_test<
+             InputTuple,
+             InputType0,
+             InputBodyType0,
+             InputType1,
+             InputBodyType1,
+             TestNodeType,
+             SinkType,
+             SinkBodyType>(throwException,doFlog);
     }
 }
 
 void test_indexer_node() {
     INFO("Testing indexer_node\n");
     g_Wakeup_Msg = "indexer_node(is,non): Missed wakeup or machine is overloaded?";
-    run_indexer_node_test<std::tuple<int, int>, isThrowing, nonThrowing>();
+    run_indexer_node_test<std::tuple<int,int>, isThrowing, nonThrowing>();
     g_Wakeup_Msg = "indexer_node(non,is): Missed wakeup or machine is overloaded?";
-    run_indexer_node_test<std::tuple<int, int>, nonThrowing, isThrowing>();
+    run_indexer_node_test<std::tuple<int,int>, nonThrowing, isThrowing>();
     g_Wakeup_Msg = "indexer_node(is,is): Missed wakeup or machine is overloaded?";
-    run_indexer_node_test<std::tuple<int, int>, isThrowing, isThrowing>();
+    run_indexer_node_test<std::tuple<int,int>, isThrowing,  isThrowing>();
     g_Wakeup_Msg = g_Orig_Wakeup_Msg;
-    ;
 }
 
 ///////////////////////////////////////////////
@@ -1897,20 +1920,20 @@ void test_indexer_node() {
 class Foo {
 private:
     // std::vector<int>& m_vec;
-    std::vector<int> *m_vec;
-
+    std::vector<int>* m_vec;
 public:
-    Foo(std::vector<int> &vec) : m_vec(&vec) {}
-    void operator()(tbb::flow::continue_msg) const {
+    Foo(std::vector<int>& vec) : m_vec(&vec) { }
+    void operator() (tbb::flow::continue_msg) const {
         ++nExceptions;
-        (void) m_vec->at(m_vec->size());// Will throw out_of_range exception
-        CHECK_MESSAGE((false), "Exception not thrown by invalid access");
+        (void)m_vec->at(m_vec->size()); // Will throw out_of_range exception
+        CHECK_MESSAGE( (false), "Exception not thrown by invalid access");
     }
 };
 
-// test from user ahelwer: http://software.intel.com/en-us/forums/showthread.php?t=103786
+// test from user ahelwer: https://community.intel.com/t5/Intel-oneAPI-Threading-Building/Exception-in-flow-graph-results-in-graph-wait-for-all-hanging/td-p/789352
 // exception thrown in graph node, not caught in wait_for_all()
-void test_flow_graph_exception0() {
+void
+test_flow_graph_exception0() {
     // Initializes body
     std::vector<int> vec;
     vec.push_back(0);
@@ -1926,75 +1949,85 @@ void test_flow_graph_exception0() {
     tbb::flow::make_edge(start, fooNode);
 
     // Execute graph
-    CHECK_MESSAGE((!g.exception_thrown()), "exception_thrown flag already set");
-    CHECK_MESSAGE((!g.is_cancelled()), "canceled flag already set");
+    CHECK_MESSAGE( (!g.exception_thrown()), "exception_thrown flag already set");
+    CHECK_MESSAGE( (!g.is_cancelled()), "canceled flag already set");
     try {
         start.try_put(tbb::flow::continue_msg());
         g.wait_for_all();
-        CHECK_MESSAGE((false), "Exception not thrown");
-    } catch (std::out_of_range &ex) { INFO("Exception: " << ex.what() << "(expected)\n"); } catch (...) {
+        CHECK_MESSAGE( (false), "Exception not thrown");
+    }
+    catch(std::out_of_range& ex) {
+        INFO("Exception: " << ex.what() << "(expected)\n");
+    }
+    catch(...) {
         INFO("Unknown exception caught (expected)\n");
     }
-    CHECK_MESSAGE((nExceptions > 0), "Exception caught, but no body signaled exception being thrown");
+    CHECK_MESSAGE( (nExceptions > 0), "Exception caught, but no body signaled exception being thrown");
     nExceptions = 0;
-    CHECK_MESSAGE((g.exception_thrown()), "Exception not intercepted");
+    CHECK_MESSAGE( (g.exception_thrown()), "Exception not intercepted");
     // if exception set, cancellation also set.
-    CHECK_MESSAGE((g.is_cancelled()), "Exception cancellation not signaled");
+    CHECK_MESSAGE( (g.is_cancelled()), "Exception cancellation not signaled");
     // in case we got an exception
     try {
-        g.wait_for_all();// context still signalled canceled, my_exception still set.
-    } catch (...) { CHECK_MESSAGE((false), "Second exception thrown but no task executing"); }
-    CHECK_MESSAGE((nExceptions == 0), "body signaled exception being thrown, but no body executed");
-    CHECK_MESSAGE((!g.exception_thrown()), "exception_thrown flag not reset");
-    CHECK_MESSAGE((!g.is_cancelled()), "canceled flag not reset");
+        g.wait_for_all();  // context still signalled canceled, my_exception still set.
+    }
+    catch(...) {
+        CHECK_MESSAGE( (false), "Second exception thrown but no task executing");
+    }
+    CHECK_MESSAGE( (nExceptions == 0), "body signaled exception being thrown, but no body executed");
+    CHECK_MESSAGE( (!g.exception_thrown()), "exception_thrown flag not reset");
+    CHECK_MESSAGE( (!g.is_cancelled()), "canceled flag not reset");
 }
 
 void TestOneThreadNum(int nThread) {
     INFO("Testing " << nThread << "%d threads\n");
-    g_NumItems = ((nThread > NUM_ITEMS) ? nThread * 2 : NUM_ITEMS);
+    g_NumItems = ((nThread > NUM_ITEMS) ? nThread *2 : NUM_ITEMS);
     g_NumThreads = nThread;
     tbb::task_arena arena(nThread);
-    arena.execute([&]() {
-        // whole-graph exception catch and rethrow test
-        test_flow_graph_exception0();
-        for (int i = 0; i < 4; ++i) {
-            g_ExceptionInMaster = (i & 1) != 0;
-            g_SolitaryException = (i & 2) != 0;
-            INFO("g_ExceptionInMaster == " << (g_ExceptionInMaster ? "T" : "F") << ", g_SolitaryException == "
-                                           << (g_SolitaryException ? "T" : "F") << "\n");
-            test_input_node();
-            test_function_node();
-            test_continue_node();// also test broadcast_node
-            test_multifunction_node();
-            // single- and multi-item buffering nodes
-            test_buffer_queue_and_overwrite_node();
-            test_sequencer_node();
-            test_priority_queue_node();
-
-            // join_nodes
-            test_join_node<tbb::flow::queueing>();
-            test_join_node<tbb::flow::reserving>();
-            test_join_node<tbb::flow::tag_matching>();
-
-            test_limiter_node();
-            test_split_node();
-            // graph for write_once_node will be complicated by the fact the node will
-            // not do try_puts after it has been set.  To get parallelism of N we have
-            // to attach N successor nodes to the write_once (or play some similar game).
-            // test_write_once_node();
-            test_indexer_node();
+	arena.execute(
+        [&]() {
+            // whole-graph exception catch and rethrow test
+            test_flow_graph_exception0();
+            for(int i = 0; i < 4; ++i) {
+                g_ExceptionInMaster = (i & 1) != 0;
+                g_SolitaryException = (i & 2) != 0;
+                INFO("g_ExceptionInMaster == " << (g_ExceptionInMaster ? "T":"F")
+                     << ", g_SolitaryException == " << (g_SolitaryException ? "T":"F") << "\n");
+                test_input_node();
+                test_function_node();
+                test_continue_node();  // also test broadcast_node
+                test_multifunction_node();
+                // single- and multi-item buffering nodes
+                test_buffer_queue_and_overwrite_node();
+                test_sequencer_node();
+                test_priority_queue_node();
+
+                // join_nodes
+                test_join_node<tbb::flow::queueing>();
+                test_join_node<tbb::flow::reserving>();
+                test_join_node<tbb::flow::tag_matching>();
+
+                test_limiter_node();
+                test_split_node();
+                // graph for write_once_node will be complicated by the fact the node will
+                // not do try_puts after it has been set.  To get parallelism of N we have
+                // to attach N successor nodes to the write_once (or play some similar game).
+                // test_write_once_node();
+                test_indexer_node();
+            }
         }
-    });
+    );
 }
 
+#if !EMSCRIPTEN
 //! Test exceptions with parallelism
 //! \brief \ref error_guessing
-TEST_CASE("Testing several threads") {
+TEST_CASE("Testing several threads"){
     // reverse order of tests
-    for (unsigned int nThread = utils::MaxThread; nThread >= utils::MinThread; --nThread) {
+    for(unsigned int nThread=utils::MaxThread; nThread >= utils::MinThread; --nThread) {
         tbb::global_control thread_limit(tbb::global_control::max_allowed_parallelism, nThread);
         TestOneThreadNum(nThread);
     }
 }
-
-#endif// TBB_USE_EXCEPTIONS
+#endif
+#endif // TBB_USE_EXCEPTIONS
diff --git a/external/tbb/test/tbb/test_eh_thread.cpp b/external/tbb/test/tbb/test_eh_thread.cpp
index 36f50cdb..dde61b91 100644
--- a/external/tbb/test/tbb/test_eh_thread.cpp
+++ b/external/tbb/test/tbb/test_eh_thread.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2020-2021 Intel Corporation
+    Copyright (c) 2020-2025 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@
 
 #include "common/config.h"
 
-#include "tbb/global_control.h"
 #include "tbb/parallel_for.h"
+#include "tbb/global_control.h"
 
 #include "common/test.h"
 #include "common/utils.h"
@@ -36,48 +36,54 @@
 // TODO: enable limitThreads with sanitizer under docker
 #if TBB_USE_EXCEPTIONS && !_WIN32 && !__ANDROID__
 
-#include <sys/resource.h>
-#include <sys/time.h>
+#include <limits.h>
 #include <sys/types.h>
+#include <sys/time.h>
+#include <sys/resource.h>
 
-void limitThreads(size_t limit) {
+void limitThreads(size_t limit)
+{
     rlimit rlim;
 
     int ret = getrlimit(RLIMIT_NPROC, &rlim);
     CHECK_MESSAGE(0 == ret, "getrlimit has returned an error");
 
-    rlim.rlim_cur = (rlim.rlim_max == (rlim_t) RLIM_INFINITY) ? limit : utils::min(limit, rlim.rlim_max);
+    rlim.rlim_cur = (rlim.rlim_max == (rlim_t)RLIM_INFINITY) ? limit : utils::min(limit, rlim.rlim_max);
 
     ret = setrlimit(RLIMIT_NPROC, &rlim);
     CHECK_MESSAGE(0 == ret, "setrlimit has returned an error");
 }
 
-static bool g_exception_caught = false;
-static std::mutex m;
-static std::condition_variable cv;
-static std::atomic<bool> stop {false};
+size_t getThreadLimit() {
+    rlimit rlim;
+
+    int ret = getrlimit(RLIMIT_NPROC, &rlim);
+    CHECK_MESSAGE(0 == ret, "getrlimit has returned an error");
+    return rlim.rlim_cur;
+}
 
-static void* thread_routine(void*) {
-    std::unique_lock<std::mutex> lock(m);
-    cv.wait(lock, [] { return stop == true; });
-    return 0;
+static void* thread_routine(void*)
+{
+    return nullptr;
 }
 
 class Thread {
-    pthread_t mHandle {};
-    bool mValid {};
-
+    pthread_t mHandle{};
+    bool mValid{};
 public:
     Thread() {
         mValid = false;
         pthread_attr_t attr;
         // Limit the stack size not to consume all virtual memory on 32 bit platforms.
-        if (pthread_attr_init(&attr) == 0 && pthread_attr_setstacksize(&attr, 100 * 1024) == 0) {
+        std::size_t stacksize = utils::max(std::size_t(128*1024), std::size_t(PTHREAD_STACK_MIN));
+        if (pthread_attr_init(&attr) == 0 && pthread_attr_setstacksize(&attr, stacksize) == 0) {
             mValid = pthread_create(&mHandle, &attr, thread_routine, /* arg = */ nullptr) == 0;
         }
     }
     bool isValid() const { return mValid; }
-    void join() { pthread_join(mHandle, nullptr); }
+    void join() {
+        pthread_join(mHandle, nullptr);
+    }
 };
 
 //! Test for exception when too many threads
@@ -88,40 +94,34 @@ TEST_CASE("Too many threads") {
         return;
     }
 
-    // Some systems set really big limit (e.g. >45К) for the number of processes/threads
-    limitThreads(1024);
-
-    std::thread /* isolate test */ ([] {
-        std::vector<Thread> threads;
-        stop = false;
-        auto finalize = [&] {
-            stop = true;
-            cv.notify_all();
-            for (auto& t : threads) { t.join(); }
-        };
-
-        for (int i = 0;; ++i) {
+    // Some systems set really big limit (e.g. >45K) for the number of processes/threads
+    limitThreads(1);
+    if (getThreadLimit() == 1) {
+        for (int attempt = 0; attempt < 5; ++attempt) {
             Thread thread;
-            if (!thread.isValid()) { break; }
-            threads.push_back(thread);
-            if (i == 1024) {
-                WARN_MESSAGE(false, "setrlimit seems having no effect");
-                finalize();
+            if (thread.isValid()) {
+                WARN_MESSAGE(false, "We were able to create a thread. setrlimit seems having no effect");
+                thread.join();
                 return;
             }
         }
-        g_exception_caught = false;
+        bool g_exception_caught = false;
         try {
             // Initialize the library to create worker threads
             tbb::parallel_for(0, 2, [](int) {});
-        } catch (const std::exception& e) {
+        } catch (const std::exception & e) {
             g_exception_caught = true;
             // Do not CHECK to avoid memory allocation (we can be out of memory)
-            if (e.what() == nullptr) { FAIL("Exception does not have description"); }
+            if (e.what()== nullptr) {
+                FAIL("Exception does not have description");
+            }
         }
         // Do not CHECK to avoid memory allocation (we can be out of memory)
-        if (!g_exception_caught) { FAIL("No exception was caught"); }
-        finalize();
-    }).join();
+        if (!g_exception_caught) {
+            FAIL("No exception was thrown on library initialization");
+        }
+    } else {
+        WARN_MESSAGE(false, "setrlimit seems having no effect");
+    }
 }
 #endif
diff --git a/external/tbb/test/tbb/test_enumerable_thread_specific.cpp b/external/tbb/test/tbb/test_enumerable_thread_specific.cpp
index 00cf458c..904c7d5a 100644
--- a/external/tbb/test/tbb/test_enumerable_thread_specific.cpp
+++ b/external/tbb/test/tbb/test_enumerable_thread_specific.cpp
@@ -14,28 +14,28 @@
     limitations under the License.
 */
 
-#include "common/checktype.h"
 #include "common/test.h"
 #include "common/utils.h"
 #include "common/utils_report.h"
+#include "common/checktype.h"
 
 #include "oneapi/tbb/detail/_utils.h"
 
-#include "tbb/blocked_range.h"
-#include "tbb/cache_aligned_allocator.h"
 #include "tbb/enumerable_thread_specific.h"
-#include "tbb/global_control.h"
 #include "tbb/parallel_for.h"
+#include "tbb/blocked_range.h"
 #include "tbb/tbb_allocator.h"
+#include "tbb/global_control.h"
+#include "tbb/cache_aligned_allocator.h"
 
-#include <atomic>
-#include <cstdio>
 #include <cstring>
+#include <cstdio>
+#include <vector>
 #include <deque>
 #include <list>
 #include <map>
 #include <utility>
-#include <vector>
+#include <atomic>
 
 //! \file test_enumerable_thread_specific.cpp
 //! \brief Test for [tls.enumerable_thread_specific] specification
@@ -53,87 +53,77 @@ const int VALID_NUMBER_OF_KEYS = 100;
 
 //! A minimal class that occupies N bytes.
 /** Defines default and copy constructor, and allows implicit operator&. Hides operator=. */
-template <size_t N = tbb::detail::max_nfs_size>
-class minimal : utils::NoAssign {
+template<size_t N = tbb::detail::max_nfs_size>
+class minimalN: utils::NoAssign {
 private:
     int my_value;
     bool is_constructed;
-    char pad[N - sizeof(int) - sizeof(bool)];
-
+    char pad[N-sizeof(int) - sizeof(bool)];
 public:
-    minimal() : utils::NoAssign(), my_value(0) {
-        ++construction_counter;
-        is_constructed = true;
-    }
-    minimal(const minimal& m) : utils::NoAssign(), my_value(m.my_value) {
-        ++construction_counter;
-        is_constructed = true;
-    }
-    ~minimal() {
-        ++destruction_counter;
-        REQUIRE(is_constructed);
-        is_constructed = false;
-    }
-    void set_value(const int i) {
-        REQUIRE(is_constructed);
-        my_value = i;
-    }
-    int value() const {
-        REQUIRE(is_constructed);
-        return my_value;
-    }
+    minimalN() : utils::NoAssign(), my_value(0) { ++construction_counter; is_constructed = true; }
+    minimalN( const minimalN&m ) : utils::NoAssign(), my_value(m.my_value) { ++construction_counter; is_constructed = true; }
+    ~minimalN() { ++destruction_counter; REQUIRE(is_constructed); is_constructed = false; }
+    void set_value( const int i ) { REQUIRE(is_constructed); my_value = i; }
+    int value( ) const { REQUIRE(is_constructed); return my_value; }
 };
 
-static size_t AlignMask = 0;// set to cache-line-size - 1
+static size_t AlignMask = 0;  // set to cache-line-size - 1
 
-template <typename T>
-T& check_alignment(T& t, const char* aname) {
-    if (!tbb::detail::is_aligned(&t, AlignMask)) {
+template<typename T>
+T& check_alignment(T& t, const char *aname) {
+    if( !tbb::detail::is_aligned(&t, AlignMask)) {
         // TBB_REVAMP_TODO: previously was REPORT_ONCE
-        REPORT("alignment error with %s allocator (%x)\n", aname, (int) size_t(&t) & (AlignMask - 1));
+        REPORT("alignment error with %s allocator (%x)\n", aname, (int)size_t(&t) & (AlignMask-1));
     }
     return t;
 }
 
-template <typename T>
-const T& check_alignment(const T& t, const char* aname) {
-    if (!tbb::detail::is_aligned(&t, AlignMask)) {
+template<typename T>
+const T& check_alignment(const T& t, const char *aname) {
+    if( !tbb::detail::is_aligned(&t, AlignMask)) {
         // TBB_REVAMP_TODO: previously was REPORT_ONCE
-        REPORT("alignment error with %s allocator (%x)\n", aname, (int) size_t(&t) & (AlignMask - 1));
+        REPORT("alignment error with %s allocator (%x)\n", aname, (int)size_t(&t) & (AlignMask-1));
     }
     return t;
 }
 
 //
-// A helper class that simplifies writing the tests since minimal does not
+// A helper class that simplifies writing the tests since minimalN does not
 // define = or + operators.
 //
 
 const size_t line_size = tbb::detail::max_nfs_size;
 
-typedef tbb::enumerable_thread_specific<minimal<line_size>> flogged_ets;
+typedef tbb::enumerable_thread_specific<minimalN<line_size> > flogged_ets;
 
 class set_body {
-    flogged_ets* a;
+    flogged_ets *a;
 
 public:
-    set_body(flogged_ets* _a) : a(_a) {}
+    set_body( flogged_ets*_a ) : a(_a) { }
 
-    void operator()() const {
+    void operator() ( ) const {
         for (int i = 0; i < VALID_NUMBER_OF_KEYS; ++i) {
             check_alignment(a[i].local(), "default").set_value(i + 1);
         }
     }
+
 };
 
-void do_std_threads(int max_threads, flogged_ets a[]) {
-    std::vector<std::thread*> threads;
+void do_std_threads( int max_threads, flogged_ets a[] ) {
+    std::vector< std::thread * > threads;
 
-    for (int p = 0; p < max_threads; ++p) { threads.push_back(new std::thread(set_body(a))); }
+    for (int p = 0; p < max_threads; ++p) {
+        threads.push_back( new std::thread ( set_body( a ) ) );
+    }
 
-    for (int p = 0; p < max_threads; ++p) { threads[p]->join(); }
+    for (int p = 0; p < max_threads; ++p) {
+        threads[p]->join();
+    }
 
-    for (int p = 0; p < max_threads; ++p) { delete threads[p]; }
+    for(int p = 0; p < max_threads; ++p) {
+        delete threads[p];
+    }
 }
 
 void flog_key_creation_and_deletion() {
@@ -145,22 +135,22 @@ void flog_key_creation_and_deletion() {
             destruction_counter = 0;
             // causes VALID_NUMBER_OF_KEYS exemplar instances to be constructed
             flogged_ets* a = new flogged_ets[VALID_NUMBER_OF_KEYS];
-            REQUIRE(int(construction_counter) == 0);// no exemplars or actual locals have been constructed
-            REQUIRE(int(destruction_counter) == 0); // and none have been destroyed
+            REQUIRE(int(construction_counter) == 0);   // no exemplars or actual locals have been constructed
+            REQUIRE(int(destruction_counter) == 0);    // and none have been destroyed
             // causes p * VALID_NUMBER_OF_KEYS minimals to be created
             do_std_threads(p, a);
             for (int i = 0; i < VALID_NUMBER_OF_KEYS; ++i) {
                 int pcnt = 0;
-                for (flogged_ets::iterator tli = a[i].begin(); tli != a[i].end(); ++tli) {
-                    REQUIRE((*tli).value() == i + 1);
+                for ( flogged_ets::iterator tli = a[i].begin(); tli != a[i].end(); ++tli ) {
+                    REQUIRE( (*tli).value() == i+1 );
                     ++pcnt;
                 }
-                REQUIRE(pcnt == p);// should be one local per thread.
+                REQUIRE( pcnt == p);  // should be one local per thread.
             }
             delete[] a;
         }
-        REQUIRE(int(construction_counter) == (p) *VALID_NUMBER_OF_KEYS);
-        REQUIRE(int(destruction_counter) == (p) *VALID_NUMBER_OF_KEYS);
+        REQUIRE( int(construction_counter) == (p)*VALID_NUMBER_OF_KEYS );
+        REQUIRE( int(destruction_counter) == (p)*VALID_NUMBER_OF_KEYS );
 
         construction_counter = 0;
         destruction_counter = 0;
@@ -173,17 +163,18 @@ void flog_key_creation_and_deletion() {
             do_std_threads(p, a);
 
             for (int i = 0; i < VALID_NUMBER_OF_KEYS; ++i) {
-                for (flogged_ets::iterator tli = a[i].begin(); tli != a[i].end(); ++tli) {
-                    REQUIRE((*tli).value() == i + 1);
+                for ( flogged_ets::iterator tli = a[i].begin(); tli != a[i].end(); ++tli ) {
+                    REQUIRE( (*tli).value() == i+1 );
                 }
                 a[i].clear();
-                REQUIRE(static_cast<int>(a[i].end() - a[i].begin()) == 0);
+                REQUIRE( static_cast<int>(a[i].end() - a[i].begin()) == 0 );
             }
         }
         delete[] a;
-        REQUIRE(int(construction_counter) == (FLOG_REPETITIONS * p) * VALID_NUMBER_OF_KEYS);
-        REQUIRE(int(destruction_counter) == (FLOG_REPETITIONS * p) * VALID_NUMBER_OF_KEYS);
+        REQUIRE( int(construction_counter) == (FLOG_REPETITIONS*p)*VALID_NUMBER_OF_KEYS );
+        REQUIRE( int(destruction_counter) == (FLOG_REPETITIONS*p)*VALID_NUMBER_OF_KEYS );
     }
+
 }
 
 template <typename inner_container>
@@ -191,148 +182,170 @@ void flog_segmented_interator() {
 
     bool found_error = false;
     typedef typename inner_container::value_type T;
-    typedef std::vector<inner_container> nested_vec;
+    typedef std::vector< inner_container > nested_vec;
     inner_container my_inner_container;
     my_inner_container.clear();
     nested_vec my_vec;
 
     // simple nested vector (neither level empty)
     const int maxval = 10;
-    for (int i = 0; i < maxval; i++) {
+    for(int i=0; i < maxval; i++) {
         my_vec.push_back(my_inner_container);
-        for (int j = 0; j < maxval; j++) { my_vec.at(i).push_back((T)(maxval * i + j)); }
+        for(int j = 0; j < maxval; j++) {
+            my_vec.at(i).push_back((T)(maxval * i + j));
+        }
     }
 
     tbb::detail::d1::segmented_iterator<nested_vec, T> my_si(my_vec);
 
     T ii;
-    for (my_si = my_vec.begin(), ii = 0; my_si != my_vec.end(); ++my_si, ++ii) {
-        if ((*my_si) != ii) { found_error = true; }
+    for(my_si=my_vec.begin(), ii=0; my_si != my_vec.end(); ++my_si, ++ii) {
+        if((*my_si) != ii) {
+            found_error = true;
+        }
     }
 
     // outer level empty
     my_vec.clear();
-    for (my_si = my_vec.begin(); my_si != my_vec.end(); ++my_si) { found_error = true; }
+    for(my_si=my_vec.begin(); my_si != my_vec.end(); ++my_si) {
+        found_error = true;
+    }
 
     // inner levels empty
     my_vec.clear();
-    for (int i = 0; i < maxval; ++i) { my_vec.push_back(my_inner_container); }
-    for (my_si = my_vec.begin(); my_si != my_vec.end(); ++my_si) { found_error = true; }
+    for(int i =0; i < maxval; ++i) {
+        my_vec.push_back(my_inner_container);
+    }
+    for(my_si = my_vec.begin(); my_si != my_vec.end(); ++my_si) {
+        found_error = true;
+    }
 
     // every other inner container is empty
     my_vec.clear();
-    for (int i = 0; i < maxval; ++i) {
+    for(int i=0; i < maxval; ++i) {
         my_vec.push_back(my_inner_container);
-        if (i % 2) {
-            for (int j = 0; j < maxval; ++j) { my_vec.at(i).push_back((T)(maxval * (i / 2) + j)); }
+        if(i%2) {
+            for(int j = 0; j < maxval; ++j) {
+                my_vec.at(i).push_back((T)(maxval * (i/2) + j));
+            }
         }
     }
-    for (my_si = my_vec.begin(), ii = 0; my_si != my_vec.end(); ++my_si, ++ii) {
-        if ((*my_si) != ii) { found_error = true; }
+    for(my_si = my_vec.begin(), ii=0; my_si != my_vec.end(); ++my_si, ++ii) {
+        if((*my_si) != ii) {
+            found_error = true;
+        }
     }
 
     tbb::detail::d1::segmented_iterator<nested_vec, const T> my_csi(my_vec);
-    for (my_csi = my_vec.begin(), ii = 0; my_csi != my_vec.end(); ++my_csi, ++ii) {
-        if ((*my_csi) != ii) { found_error = true; }
+    for(my_csi=my_vec.begin(), ii=0; my_csi != my_vec.end(); ++my_csi, ++ii) {
+        if((*my_csi) != ii) {
+            found_error = true;
+        }
     }
 
     // outer level empty
     my_vec.clear();
-    for (my_csi = my_vec.begin(); my_csi != my_vec.end(); ++my_csi) { found_error = true; }
+    for(my_csi=my_vec.begin(); my_csi != my_vec.end(); ++my_csi) {
+        found_error = true;
+    }
 
     // inner levels empty
     my_vec.clear();
-    for (int i = 0; i < maxval; ++i) { my_vec.push_back(my_inner_container); }
-    for (my_csi = my_vec.begin(); my_csi != my_vec.end(); ++my_csi) { found_error = true; }
+    for(int i =0; i < maxval; ++i) {
+        my_vec.push_back(my_inner_container);
+    }
+    for(my_csi = my_vec.begin(); my_csi != my_vec.end(); ++my_csi) {
+        found_error = true;
+    }
 
     // every other inner container is empty
     my_vec.clear();
-    for (int i = 0; i < maxval; ++i) {
+    for(int i=0; i < maxval; ++i) {
         my_vec.push_back(my_inner_container);
-        if (i % 2) {
-            for (int j = 0; j < maxval; ++j) { my_vec.at(i).push_back((T)(maxval * (i / 2) + j)); }
+        if(i%2) {
+            for(int j = 0; j < maxval; ++j) {
+                my_vec.at(i).push_back((T)(maxval * (i/2) + j));
+            }
         }
     }
-    for (my_csi = my_vec.begin(), ii = 0; my_csi != my_vec.end(); ++my_csi, ++ii) {
-        if ((*my_csi) != ii) { found_error = true; }
+    for(my_csi = my_vec.begin(), ii=0; my_csi != my_vec.end(); ++my_csi, ++ii) {
+        if((*my_csi) != ii) {
+            found_error = true;
+        }
     }
 
-    if (found_error) REPORT("segmented_iterator failed\n");
+
+    if(found_error) REPORT("segmented_iterator failed\n");
 }
 
 template <typename Key, typename Val>
 void flog_segmented_iterator_map() {
-    typedef typename std::map<Key, Val> my_map;
-    typedef std::vector<my_map> nested_vec;
-    my_map my_inner_container;
-    my_inner_container.clear();
-    nested_vec my_vec;
-    my_vec.clear();
-    bool found_error = false;
-
-    // simple nested vector (neither level empty)
-    const int maxval = 4;
-    for (int i = 0; i < maxval; i++) {
-        my_vec.push_back(my_inner_container);
-        for (int j = 0; j < maxval; j++) {
-            my_vec.at(i).insert(std::make_pair<Key, Val>(maxval * i + j, 2 * (maxval * i + j)));
-        }
-    }
-
-    tbb::detail::d1::segmented_iterator<nested_vec, std::pair<const Key, Val>> my_si(my_vec);
-    Key ii;
-    for (my_si = my_vec.begin(), ii = 0; my_si != my_vec.end(); ++my_si, ++ii) {
-        if (((*my_si).first != ii) || ((*my_si).second != 2 * ii)) { found_error = true; }
-    }
-
-    tbb::detail::d1::segmented_iterator<nested_vec, const std::pair<const Key, Val>> my_csi(my_vec);
-    for (my_csi = my_vec.begin(), ii = 0; my_csi != my_vec.end(); ++my_csi, ++ii) {
-        if (((*my_csi).first != ii) || ((*my_csi).second != 2 * ii)) {
-            found_error = true;
-            // INFO( "ii=%d, (*my_csi).first=%d, second=%d\n",ii, int((*my_csi).first), int((*my_csi).second));
-        }
-    }
-    if (found_error) REPORT("segmented_iterator_map failed\n");
+   typedef typename std::map<Key, Val> my_map;
+   typedef std::vector< my_map > nested_vec;
+   my_map my_inner_container;
+   my_inner_container.clear();
+   nested_vec my_vec;
+   my_vec.clear();
+   bool found_error = false;
+
+   // simple nested vector (neither level empty)
+   const int maxval = 4;
+   for(int i=0; i < maxval; i++) {
+       my_vec.push_back(my_inner_container);
+       for(int j = 0; j < maxval; j++) {
+           my_vec.at(i).insert(std::make_pair<Key,Val>(maxval * i + j, 2*(maxval*i + j)));
+       }
+   }
+
+   tbb::detail::d1::segmented_iterator<nested_vec, std::pair<const Key, Val> > my_si(my_vec);
+   Key ii;
+   for(my_si=my_vec.begin(), ii=0; my_si != my_vec.end(); ++my_si, ++ii) {
+       if(((*my_si).first != ii) || ((*my_si).second != 2*ii)) {
+           found_error = true;
+       }
+   }
+
+   tbb::detail::d1::segmented_iterator<nested_vec, const std::pair<const Key, Val> > my_csi(my_vec);
+   for(my_csi=my_vec.begin(), ii=0; my_csi != my_vec.end(); ++my_csi, ++ii) {
+       if(((*my_csi).first != ii) || ((*my_csi).second != 2*ii)) {
+           found_error = true;
+           // INFO( "ii=%d, (*my_csi).first=%d, second=%d\n",ii, int((*my_csi).first), int((*my_csi).second));
+       }
+   }
+   if(found_error) REPORT("segmented_iterator_map failed\n");
 }
 
 void run_segmented_iterator_tests() {
-    // only the following containers can be used with the segmented iterator.
-    flog_segmented_interator<std::vector<int>>();
-    flog_segmented_interator<std::vector<double>>();
-    flog_segmented_interator<std::deque<int>>();
-    flog_segmented_interator<std::deque<double>>();
-    flog_segmented_interator<std::list<int>>();
-    flog_segmented_interator<std::list<double>>();
-
-    flog_segmented_iterator_map<int, int>();
-    flog_segmented_iterator_map<int, double>();
+   // only the following containers can be used with the segmented iterator.
+   flog_segmented_interator<std::vector< int > >();
+   flog_segmented_interator<std::vector< double > >();
+   flog_segmented_interator<std::deque< int > >();
+   flog_segmented_interator<std::deque< double > >();
+   flog_segmented_interator<std::list< int > >();
+   flog_segmented_interator<std::list< double > >();
+
+   flog_segmented_iterator_map<int, int>();
+   flog_segmented_iterator_map<int, double>();
 }
 
-int align_val(void* const p) {
-    size_t tmp = (size_t) p;
+int align_val(void * const p) {
+    size_t tmp = (size_t)p;
     int a = 1;
-    while ((tmp & 0x1) == 0) {
-        a <<= 1;
-        tmp >>= 1;
-    }
+    while((tmp&0x1) == 0) { a <<=1; tmp >>= 1; }
     return a;
 }
 
-bool is_between(void* lowp, void* highp, void* testp) {
-    if ((size_t) lowp < (size_t) testp && (size_t) testp < (size_t) highp) return true;
-    return (size_t) lowp > (size_t) testp && (size_t) testp > (size_t) highp;
+bool is_between(void* lowp, void *highp, void *testp) {
+    if((size_t)lowp < (size_t)testp && (size_t)testp < (size_t)highp) return true;
+    return (size_t)lowp > (size_t)testp && (size_t)testp > (size_t)highp;
 }
 
-template <class U>
-struct alignment_of {
-    typedef struct {
-        char t;
-        U padded;
-    } test_alignment;
+template<class U> struct alignment_of {
+    typedef struct { char t; U    padded; } test_alignment;
     static const size_t value = sizeof(test_alignment) - sizeof(U);
 };
 using tbb::detail::d1::ets_element;
-template <typename T, typename OtherType>
+template<typename T, typename OtherType>
 void allocate_ets_element_on_stack(const char* /* name */) {
     typedef T aligning_element_type;
     const size_t my_align = alignment_of<aligning_element_type>::value;
@@ -344,25 +357,21 @@ void allocate_ets_element_on_stack(const char* /* name */) {
         OtherType cxx;
         ets_element<aligning_element_type> my_struct_element;
     } mystruct1;
-    tbb::detail::suppress_unused_warning(c1, c2);
-    REQUIRE_MESSAGE(tbb::detail::is_aligned(my_stack_element.value(), my_align),
-                    "Error in first stack alignment");
-    REQUIRE_MESSAGE(tbb::detail::is_aligned(my_stack_element2.value(), my_align),
-                    "Error in second stack alignment");
-    REQUIRE_MESSAGE(tbb::detail::is_aligned(mystruct1.my_struct_element.value(), my_align),
-                    "Error in struct element alignment");
+    tbb::detail::suppress_unused_warning(c1,c2);
+    REQUIRE_MESSAGE(tbb::detail::is_aligned(my_stack_element.value(), my_align), "Error in first stack alignment" );
+    REQUIRE_MESSAGE(tbb::detail::is_aligned(my_stack_element2.value(), my_align), "Error in second stack alignment" );
+    REQUIRE_MESSAGE(tbb::detail::is_aligned(mystruct1.my_struct_element.value(), my_align), "Error in struct element alignment" );
 }
 
 class BigType {
 public:
-    BigType() { /* avoid cl warning C4345 about default initialization of POD types */
-    }
+    BigType() { /* avoid cl warning C4345 about default initialization of POD types */ }
     char my_data[12 * 1024 * 1024];
 };
 
-template <template <class> class Allocator>
+template<template<class> class Allocator>
 void TestConstructorWithBigType(const char* allocator_name) {
-    typedef tbb::enumerable_thread_specific<BigType, Allocator<BigType>> CounterBigType;
+    typedef tbb::enumerable_thread_specific<BigType, Allocator<BigType> > CounterBigType;
     // Test default constructor
     CounterBigType MyCounters;
     // Create a local instance.
@@ -370,18 +379,19 @@ void TestConstructorWithBigType(const char* allocator_name) {
     my_local.my_data[0] = 'a';
     // Test copy constructor
     CounterBigType MyCounters2(MyCounters);
-    REQUIRE(check_alignment(MyCounters2.local(), allocator_name).my_data[0] == 'a');
+    REQUIRE(check_alignment(MyCounters2.local(), allocator_name).my_data[0]=='a');
 }
 
 size_t init_tbb_alloc_mask() {
     // TODO: use __TBB_alignof(T) to check for local() results instead of using internal knowledges of ets element padding
-    if (tbb::tbb_allocator<int>::allocator_type() == tbb::tbb_allocator<int>::standard) {
+    if(tbb::tbb_allocator<int>::allocator_type() == tbb::tbb_allocator<int>::standard) {
         // scalable allocator is not available.
         // INFO("tbb::tbb_allocator is not available\n");
         return 1;
-    } else {
+    }
+    else {
         // this value is for large objects, but will be correct for small.
-        return 64;// TBB_REVAMP_TODO: enable as estimatedCacheLineSize when tbbmalloc is available;
+        return 64; // TBB_REVAMP_TODO: enable as estimatedCacheLineSize when tbbmalloc is available;
     }
 }
 
@@ -415,10 +425,11 @@ TEST_CASE("Constructor with big type") {
 //! \brief \ref error_guessing
 TEST_CASE("Allocate ETS on stack") {
     AlignMask = tbb_allocator_mask;
-    allocate_ets_element_on_stack<int, char>("int vs. char");
-    allocate_ets_element_on_stack<int, short>("int vs. short");
-    allocate_ets_element_on_stack<int, char[3]>("int vs. char[3]");
-    allocate_ets_element_on_stack<float, char>("float vs. char");
-    allocate_ets_element_on_stack<float, short>("float vs. short");
-    allocate_ets_element_on_stack<float, char[3]>("float vs. char[3]");
+    allocate_ets_element_on_stack<int,char>("int vs. char");
+    allocate_ets_element_on_stack<int,short>("int vs. short");
+    allocate_ets_element_on_stack<int,char[3]>("int vs. char[3]");
+    allocate_ets_element_on_stack<float,char>("float vs. char");
+    allocate_ets_element_on_stack<float,short>("float vs. short");
+    allocate_ets_element_on_stack<float,char[3]>("float vs. char[3]");
 }
+
diff --git a/external/tbb/test/tbb/test_environment_whitebox.cpp b/external/tbb/test/tbb/test_environment_whitebox.cpp
index 5bf2dd17..9092135d 100644
--- a/external/tbb/test/tbb/test_environment_whitebox.cpp
+++ b/external/tbb/test/tbb/test_environment_whitebox.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -26,10 +26,10 @@
 #include "common/utils_env.h"
 #include "src/tbb/environment.h"
 
+#include <string>
 #include <algorithm>
-#include <climits>
 #include <sstream>
-#include <string>
+#include <climits>
 #include <utility>
 #include <vector>
 
@@ -47,8 +47,9 @@ const std::size_t large_length = 1000000;
 #endif
 
 template <typename T>
-void set_and_get_test_variable(T (*environment_variable_getter)(const char*),
-                               std::pair<std::string, T> test_case) {
+void set_and_get_test_variable( T (*environment_variable_getter)( const char* ),
+                                std::pair<std::string, T> test_case )
+{
     utils::SetEnv(environment_variable_name, test_case.first.c_str());
     T result = environment_variable_getter(environment_variable_name);
     REQUIRE_MESSAGE(result == test_case.second, "Wrong Get<Type>EnvironmentVariable return value");
@@ -59,11 +60,11 @@ utils::FastRandom<> rnd(12345);
 
 struct RandomCharacterGenerator {
     char operator()() {
-        return rnd.get() % 128;// 127 - the last ASCII symbol
+        return rnd.get() % 128; // 127 - the last ASCII symbol
     }
-};// struct RandomCharacterGenerator
+}; // struct RandomCharacterGenerator
 
-bool alternative_env_variable_checker(const char* str, bool) {
+bool alternative_env_variable_checker( const char* str, bool ) {
     bool result = false;
     for (unsigned i = 0; str[i]; ++i) {
         if (str[i] == '1') {
@@ -80,25 +81,28 @@ bool alternative_env_variable_checker(const char* str, bool) {
 
 // Suitable alternative checker for GetLongEnvVariable() was not found
 // So here we use the code from GetLongEnvVariable() realization
-long alternative_env_variable_checker(const char* str, long) {
+long alternative_env_variable_checker( const char* str, long ) {
     char* end;
     errno = 0;
     long result = std::strtol(str, &end, 10);
 
     // We have exceeded the range, value is negative or it is the end of the string
-    if (errno == ERANGE || result < 0 || end == str) { result = -1; }
+    if (errno == ERANGE || result < 0 || end == str) {
+        result = -1;
+    }
 
     for (; *end != '\0'; ++end) {
-        if (!std::isspace(*end)) result = -1;
+        if (!std::isspace(*end))
+            result = -1;
     }
     return result;
 }
 
 template <typename T>
-std::pair<std::string, T> create_random_case(std::size_t length) {
+std::pair<std::string, T> create_random_case( std::size_t length ) {
     REQUIRE_MESSAGE(length != 0, "Requested random string cannot be empty");
     std::string rand_string(length, ' ');
-    std::generate(rand_string.begin(), rand_string.end(), RandomCharacterGenerator {});
+    std::generate(rand_string.begin(), rand_string.end(), RandomCharacterGenerator{});
 
     T expected_result = alternative_env_variable_checker(rand_string.c_str(), T());
 
@@ -106,17 +110,19 @@ std::pair<std::string, T> create_random_case(std::size_t length) {
 }
 
 template <typename T>
-void prepare_random_cases(std::vector<std::pair<std::string, T>>& cases) {
+void prepare_random_cases( std::vector<std::pair<std::string, T>>& cases ) {
     // Random cases
     std::size_t length = 10000;
 
-    for (std::size_t i = 0; i < 10; ++i) { cases.push_back(create_random_case<T>((rnd.get() % length) + 1)); }
+    for (std::size_t i = 0; i < 10; ++i) {
+        cases.push_back(create_random_case<T>((rnd.get() % length) + 1));
+    }
 
     // Random case with large string
     cases.push_back(create_random_case<T>(large_length));
 }
 
-std::vector<std::pair<std::string, bool>> initialize_cases(bool wrong_result) {
+std::vector<std::pair<std::string, bool>> initialize_cases( bool wrong_result ) {
     std::vector<std::pair<std::string, bool>> cases;
     // Valid cases
     cases.push_back(std::make_pair("1", true));
@@ -124,7 +130,7 @@ std::vector<std::pair<std::string, bool>> initialize_cases(bool wrong_result) {
     cases.push_back(std::make_pair("1              ", true));
     cases.push_back(std::make_pair("             1           ", true));
     cases.push_back(std::make_pair("         1", true));
-    cases.push_back(std::make_pair((std::string(large_length, ' ') + '1').c_str(), true));
+    cases.push_back(std::make_pair((std::string(large_length, ' ') + '1'), true));
 
     // Invalid cases
     cases.push_back(std::make_pair("", wrong_result));
@@ -144,39 +150,39 @@ std::vector<std::pair<std::string, bool>> initialize_cases(bool wrong_result) {
     cases.push_back(std::make_pair("2018", wrong_result));
     cases.push_back(std::make_pair("ABC_123", wrong_result));
     cases.push_back(std::make_pair("true", wrong_result));
-    cases.push_back(std::make_pair(std::string(large_length, 'A').c_str(), wrong_result));
+    cases.push_back(std::make_pair(std::string(large_length, 'A'), wrong_result));
 
     prepare_random_cases(cases);
     return cases;
 }
 
-std::vector<std::pair<std::string, long>> initialize_cases(long wrong_result) {
+std::vector<std::pair<std::string, long>> initialize_cases( long wrong_result ) {
     std::vector<std::pair<std::string, long>> cases;
     std::stringstream ss;
     // Valid cases
     for (long i = 0; i < 100; ++i) {
         ss << i;
-        cases.push_back(std::make_pair(ss.str().c_str(), i));
+        cases.push_back(std::make_pair(ss.str(), i));
         ss.str("");
 
         ss << "     " << i << "     ";
-        cases.push_back(std::make_pair(ss.str().c_str(), i));
+        cases.push_back(std::make_pair(ss.str(), i));
         ss.str("");
 
         ss << i << "     ";
-        cases.push_back(std::make_pair(ss.str().c_str(), i));
+        cases.push_back(std::make_pair(ss.str(), i));
         ss.str("");
 
         ss << "     " << i;
-        cases.push_back(std::make_pair(ss.str().c_str(), i));
+        cases.push_back(std::make_pair(ss.str(), i));
         ss.str("");
     }
 
     ss << LONG_MAX;
-    cases.push_back(std::make_pair(ss.str().c_str(), LONG_MAX));
+    cases.push_back(std::make_pair(ss.str(), LONG_MAX));
     ss.str("");
 
-    cases.push_back(std::make_pair((std::string(large_length, ' ') + '1').c_str(), 1L));
+    cases.push_back(std::make_pair((std::string(large_length, ' ') + '1'), 1L));
 
     // Invalid cases
     cases.push_back(std::make_pair("", wrong_result));
@@ -196,11 +202,11 @@ std::vector<std::pair<std::string, long>> initialize_cases(long wrong_result) {
     cases.push_back(std::make_pair("false", wrong_result));
     cases.push_back(std::make_pair("1A", wrong_result));
     cases.push_back(std::make_pair("_123", wrong_result));
-    cases.push_back(std::make_pair(std::string(large_length, 'A').c_str(), wrong_result));
+    cases.push_back(std::make_pair(std::string(large_length, 'A'), wrong_result));
 
     // Prepare string with LONG_MAX + 1 value
     ss << LONG_MAX / 10 << (LONG_MAX % 10 + 1);
-    cases.push_back(std::make_pair(ss.str().c_str(), -1));
+    cases.push_back(std::make_pair(ss.str(), -1));
     ss.str("");
 
     prepare_random_cases(cases);
@@ -208,7 +214,7 @@ std::vector<std::pair<std::string, long>> initialize_cases(long wrong_result) {
 }
 
 template <typename T>
-void test_environment_variable(T (*environment_variables_handler)(const char*), T wrong_result) {
+void test_environment_variable( T (*environment_variables_handler)( const char* ), T wrong_result ) {
     REQUIRE_MESSAGE(environment_variables_handler(environment_variable_name) == wrong_result,
                     "Tested environment variable should not be defined in the beginning");
 
@@ -232,4 +238,4 @@ TEST_CASE("testing GetIntegralEnvironmentVariable") {
     test_environment_variable(tbb::detail::r1::GetIntegralEnvironmentVariable, -1L);
 }
 
-#endif// !__TBB_WIN8UI_SUPPORT
+#endif // !__TBB_WIN8UI_SUPPORT
diff --git a/external/tbb/test/tbb/test_flow_graph.cpp b/external/tbb/test/tbb/test_flow_graph.cpp
index d6951c6f..4ae4c0f1 100644
--- a/external/tbb/test/tbb/test_flow_graph.cpp
+++ b/external/tbb/test/tbb/test_flow_graph.cpp
@@ -15,17 +15,18 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
 #endif
 
 #include "common/config.h"
 
 #include "tbb/flow_graph.h"
 
-#include "common/graph_utils.h"
-#include "common/spin_barrier.h"
 #include "common/test.h"
 #include "common/utils.h"
+#include "common/graph_utils.h"
+#include "common/spin_barrier.h"
+
 
 //! \file test_flow_graph.cpp
 //! \brief Test for [flow_graph.continue_msg flow_graph.graph_node flow_graph.input_port flow_graph.output_port flow_graph.join_node flow_graph.split_node flow_graph.limiter_node flow_graph.write_once_node flow_graph.overwrite_node flow_graph.make_edge flow_graph.graph flow_graph.buffer_node flow_graph.function_node flow_graph.multifunction_node flow_graph.continue_node flow_graph.input_node] specification
@@ -35,10 +36,10 @@ const int W = 4;
 
 struct decrement_wait : utils::NoAssign {
 
-    tbb::flow::graph* const my_graph;
-    bool* const my_done_flag;
+    tbb::flow::graph * const my_graph;
+    bool * const my_done_flag;
 
-    decrement_wait(tbb::flow::graph& h, bool* done_flag) : my_graph(&h), my_done_flag(done_flag) {}
+    decrement_wait( tbb::flow::graph &h, bool *done_flag ) : my_graph(&h), my_done_flag(done_flag) {}
 
     void operator()(int i) const {
         utils::Sleep(10 * i);
@@ -50,18 +51,17 @@ struct decrement_wait : utils::NoAssign {
 
 static void test_wait_count() {
     tbb::flow::graph h;
-    for (int i = 0; i < T; ++i) {
+    for (int i = 0; i < T; ++i ) {
         bool done_flag[W];
-        for (int j = 0; j < W; ++j) {
-            for (int w = 0; w < W; ++w) done_flag[w] = false;
-            for (int w = 0; w < j; ++w) h.reserve_wait();
+        for (int j = 0; j < W; ++j ) {
+            for ( int w = 0; w < W; ++w ) done_flag[w] = false;
+            for ( int w = 0; w < j; ++w ) h.reserve_wait();
 
-            utils::NativeParallelFor(j, decrement_wait(h, done_flag));
+            utils::NativeParallelFor( j, decrement_wait(h, done_flag) );
             h.wait_for_all();
-            for (int w = 0; w < W; ++w) {
-                if (w < j) CHECK_MESSAGE(done_flag[w] == true, "");
-                else
-                    CHECK_MESSAGE(done_flag[w] == false, "");
+            for ( int w = 0; w < W; ++w ) {
+                if ( w < j ) CHECK_MESSAGE( done_flag[w] == true, "" );
+                else CHECK_MESSAGE( done_flag[w] == false, "" );
             }
         }
     }
@@ -70,16 +70,17 @@ static void test_wait_count() {
 // Encapsulate object we want to store in vector (because contained type must have
 // copy constructor and assignment operator
 class my_int_buffer {
-    tbb::flow::buffer_node<int>* b;
+    tbb::flow::buffer_node<int> *b;
     tbb::flow::graph& my_graph;
-
 public:
-    my_int_buffer(tbb::flow::graph& g) : my_graph(g) { b = new tbb::flow::buffer_node<int>(my_graph); }
+    my_int_buffer(tbb::flow::graph &g) : my_graph(g) { b = new tbb::flow::buffer_node<int>(my_graph); }
     my_int_buffer(const my_int_buffer& other) : my_graph(other.my_graph) {
         b = new tbb::flow::buffer_node<int>(my_graph);
     }
     ~my_int_buffer() { delete b; }
-    my_int_buffer& operator=(const my_int_buffer& /*other*/) { return *this; }
+    my_int_buffer& operator=(const my_int_buffer& /*other*/) {
+        return *this;
+    }
 };
 
 // test the graph iterator, delete nodes from graph, test again
@@ -88,53 +89,63 @@ void test_iterator() {
     my_int_buffer a_buffer(g);
     my_int_buffer b_buffer(g);
     my_int_buffer c_buffer(g);
-    my_int_buffer* d_buffer = new my_int_buffer(g);
+    my_int_buffer *d_buffer = new my_int_buffer(g);
     my_int_buffer e_buffer(g);
-    std::vector<my_int_buffer> my_buffer_vector(10, c_buffer);
+    std::vector< my_int_buffer > my_buffer_vector(10, c_buffer);
 
     int count = 0;
-    for (tbb::flow::graph::iterator it = g.begin(); it != g.end(); ++it) { count++; }
-    CHECK_MESSAGE((count == 15), "error in iterator count");
+    for (tbb::flow::graph::iterator it = g.begin(); it != g.end(); ++it) {
+        count++;
+    }
+    CHECK_MESSAGE( (count==15), "error in iterator count");
 
     delete d_buffer;
 
     count = 0;
-    for (tbb::flow::graph::iterator it = g.begin(); it != g.end(); ++it) { count++; }
-    CHECK_MESSAGE((count == 14), "error in iterator count");
+    for (tbb::flow::graph::iterator it = g.begin(); it != g.end(); ++it) {
+        count++;
+    }
+    CHECK_MESSAGE( (count==14), "error in iterator count");
 
     my_buffer_vector.clear();
 
     count = 0;
-    for (tbb::flow::graph::iterator it = g.begin(); it != g.end(); ++it) { count++; }
-    CHECK_MESSAGE((count == 4), "error in iterator count");
+    for (tbb::flow::graph::iterator it = g.begin(); it != g.end(); ++it) {
+        count++;
+    }
+    CHECK_MESSAGE( (count==4), "error in iterator count");
 }
 
 class AddRemoveBody : utils::NoAssign {
     tbb::flow::graph& g;
     int nThreads;
-    utils::SpinBarrier& barrier;
-
+    utils::SpinBarrier &barrier;
 public:
-    AddRemoveBody(int nthr, utils::SpinBarrier& barrier_, tbb::flow::graph& _g)
-        : g(_g), nThreads(nthr), barrier(barrier_) {}
+    AddRemoveBody(int nthr, utils::SpinBarrier &barrier_, tbb::flow::graph& _g) :
+        g(_g), nThreads(nthr), barrier(barrier_)
+    {}
     void operator()(const int /*threadID*/) const {
         my_int_buffer b(g);
         {
             std::vector<my_int_buffer> my_buffer_vector(100, b);
-            barrier.wait();// wait until all nodes are created
+            barrier.wait();  // wait until all nodes are created
             // now test that the proper number of nodes were created
             int count = 0;
-            for (tbb::flow::graph::iterator it = g.begin(); it != g.end(); ++it) { count++; }
-            CHECK_MESSAGE((count == 101 * nThreads), "error in iterator count");
-            barrier.wait();// wait until all threads are done counting
-        }                  // all nodes but for the initial node on this thread are deleted
-        barrier.wait();    // wait until all threads have deleted all nodes in their vectors
+            for (tbb::flow::graph::iterator it = g.begin(); it != g.end(); ++it) {
+                count++;
+            }
+            CHECK_MESSAGE( (count==101*nThreads), "error in iterator count");
+            barrier.wait();  // wait until all threads are done counting
+        } // all nodes but for the initial node on this thread are deleted
+        barrier.wait(); // wait until all threads have deleted all nodes in their vectors
         // now test that all the nodes were deleted except for the initial node
         int count = 0;
-        for (tbb::flow::graph::iterator it = g.begin(); it != g.end(); ++it) { count++; }
-        CHECK_MESSAGE((count == nThreads), "error in iterator count");
-        barrier.wait();// wait until all threads are done counting
-    }                  // initial node gets deleted
+        for (tbb::flow::graph::iterator it = g.begin(); it != g.end(); ++it) {
+            count++;
+        }
+        CHECK_MESSAGE( (count==nThreads), "error in iterator count");
+        barrier.wait();  // wait until all threads are done counting
+    } // initial node gets deleted
 };
 
 void test_parallel(int nThreads) {
@@ -163,7 +174,7 @@ struct run_functor {
     }
 };
 
-template <typename T>
+template < typename T >
 struct function_body {
     tbb::task_arena* midway_arena;
     function_body(tbb::task_arena* a) : midway_arena(a) {}
@@ -173,7 +184,7 @@ struct function_body {
     }
 };
 
-typedef tbb::flow::multifunction_node<int, std::tuple<int>> mf_node;
+typedef tbb::flow::multifunction_node< int, std::tuple< int > > mf_node;
 
 struct multifunction_body {
     tbb::task_arena* midway_arena;
@@ -187,9 +198,11 @@ struct input_body {
     tbb::task_arena* midway_arena;
     int counter;
     input_body(tbb::task_arena* a) : midway_arena(a), counter(0) {}
-    int operator()(tbb::flow_control& fc) {
+    int operator()(tbb::flow_control &fc) {
         check_arena(midway_arena);
-        if (counter++ >= 1) { fc.stop(); }
+        if (counter++ >= 1) {
+            fc.stop();
+        }
         return int();
     }
 };
@@ -203,49 +216,49 @@ struct nodes_test_functor : utils::NoAssign {
 
         // Define test nodes
         // Continue, function, source nodes
-        tbb::flow::continue_node<tbb::flow::continue_msg> c_n(
-                my_graph, function_body<tbb::flow::continue_msg>(midway_arena));
-        tbb::flow::function_node<int> f_n(my_graph, tbb::flow::unlimited, function_body<int>(midway_arena));
-        tbb::flow::input_node<int> s_n(my_graph, input_body(midway_arena));
+        tbb::flow::continue_node< tbb::flow::continue_msg > c_n(my_graph, function_body<tbb::flow::continue_msg>(midway_arena));
+        tbb::flow::function_node< int > f_n(my_graph, tbb::flow::unlimited, function_body<int>(midway_arena));
+        tbb::flow::input_node< int > s_n(my_graph, input_body(midway_arena));
 
         // Multifunction node
         mf_node m_n(my_graph, tbb::flow::unlimited, multifunction_body(midway_arena));
 
         // Join node
-        tbb::flow::function_node<std::tuple<int, int>> join_f_n(
-                my_graph, tbb::flow::unlimited, function_body<std::tuple<int, int>>(midway_arena));
-        tbb::flow::join_node<std::tuple<int, int>> j_n(my_graph);
+        tbb::flow::function_node< std::tuple< int, int > > join_f_n(
+            my_graph, tbb::flow::unlimited, function_body< std::tuple< int, int > >(midway_arena)
+        );
+        tbb::flow::join_node< std::tuple< int, int > > j_n(my_graph);
         make_edge(j_n, join_f_n);
 
         // Split node
-        tbb::flow::function_node<int> split_f_n1 = f_n;
-        tbb::flow::function_node<int> split_f_n2 = f_n;
-        tbb::flow::split_node<std::tuple<int, int>> sp_n(my_graph);
+        tbb::flow::function_node< int > split_f_n1 = f_n;
+        tbb::flow::function_node< int > split_f_n2 = f_n;
+        tbb::flow::split_node< std::tuple< int, int > > sp_n(my_graph);
         make_edge(tbb::flow::output_port<0>(sp_n), split_f_n1);
         make_edge(tbb::flow::output_port<1>(sp_n), split_f_n2);
 
         // Overwrite node
-        tbb::flow::function_node<int> ow_f_n = f_n;
-        tbb::flow::overwrite_node<int> ow_n(my_graph);
+        tbb::flow::function_node< int > ow_f_n = f_n;
+        tbb::flow::overwrite_node< int > ow_n(my_graph);
         make_edge(ow_n, ow_f_n);
 
         // Write once node
-        tbb::flow::function_node<int> w_f_n = f_n;
-        tbb::flow::write_once_node<int> w_n(my_graph);
+        tbb::flow::function_node< int > w_f_n = f_n;
+        tbb::flow::write_once_node< int > w_n(my_graph);
         make_edge(w_n, w_f_n);
 
         // Buffer node
-        tbb::flow::function_node<int> buf_f_n = f_n;
-        tbb::flow::buffer_node<int> buf_n(my_graph);
+        tbb::flow::function_node< int > buf_f_n = f_n;
+        tbb::flow::buffer_node< int > buf_n(my_graph);
         make_edge(w_n, buf_f_n);
 
         // Limiter node
-        tbb::flow::function_node<int> l_f_n = f_n;
-        tbb::flow::limiter_node<int> l_n(my_graph, 1);
+        tbb::flow::function_node< int > l_f_n = f_n;
+        tbb::flow::limiter_node< int > l_n(my_graph, 1);
         make_edge(l_n, l_f_n);
 
         // Execute nodes
-        c_n.try_put(tbb::flow::continue_msg());
+        c_n.try_put( tbb::flow::continue_msg() );
         f_n.try_put(1);
         m_n.try_put(1);
         s_n.activate();
@@ -253,7 +266,7 @@ struct nodes_test_functor : utils::NoAssign {
         tbb::flow::input_port<0>(j_n).try_put(1);
         tbb::flow::input_port<1>(j_n).try_put(1);
 
-        std::tuple<int, int> sp_tuple(1, 1);
+        std::tuple< int, int > sp_tuple(1, 1);
         sp_n.try_put(sp_tuple);
 
         ow_n.try_put(1);
@@ -271,44 +284,61 @@ void test_graph_arena() {
     // external thread won't be able to find them in its own arena.
     // In this case test should hang.
     tbb::task_arena arena(1);
-    arena.execute([&]() {
-        tbb::flow::graph g;
-        tbb::task_arena midway_arena;
-        midway_arena.initialize(2);
-        midway_arena.execute(nodes_test_functor(&midway_arena, g));
-    });
+	arena.execute(
+        [&]() {
+            tbb::flow::graph g;
+            tbb::task_arena midway_arena;
+            midway_arena.initialize(2);
+            midway_arena.execute(nodes_test_functor(&midway_arena, g));
+
+        }
+	);
 }
 
 //! Test wait counts
 //! \brief error_guessing
-TEST_CASE("Test wait_count") {
-    for (unsigned int p = utils::MinThread; p <= utils::MaxThread; ++p) {
+TEST_CASE("Test wait_count"){
+    for(unsigned int p=utils::MinThread; p<=utils::MaxThread; ++p ) {
         tbb::task_arena arena(p);
-        arena.execute([&]() { test_wait_count(); });
-    }
+        arena.execute(
+            [&]() {
+                test_wait_count();
+            }
+        );
+	}
 }
 
 //! Test graph iterators
 //! \brief interface
-TEST_CASE("Test graph::iterator") {
-    for (unsigned int p = utils::MinThread; p <= utils::MaxThread; ++p) {
+TEST_CASE("Test graph::iterator"){
+    for(unsigned int p=utils::MinThread; p<=utils::MaxThread; ++p ) {
         tbb::task_arena arena(p);
-        arena.execute([&]() { test_iterator(); });
-    }
+        arena.execute(
+            [&]() {
+                test_iterator();
+            }
+        );
+	}
 }
 
 //! Test parallel for body
 //! \brief \ref error_guessing
-TEST_CASE("Test parallel") {
-    for (unsigned int p = utils::MinThread; p <= utils::MaxThread; ++p) {
+TEST_CASE("Test parallel"){
+    for(unsigned int p=utils::MinThread; p<=utils::MaxThread; ++p ) {
         tbb::task_arena arena(p);
-        arena.execute([&]() { test_parallel(p); });
-    }
+        arena.execute(
+            [&]() {
+                test_parallel(p);
+            }
+        );
+	}
 }
 
 //! Test separate arena isn't used
 //! \brief \ref error_guessing
-TEST_CASE("Test graph_arena") { test_graph_arena(); }
+TEST_CASE("Test graph_arena"){
+    test_graph_arena();
+}
 
 //! Graph iterator
 //! \brief \ref error_guessing
@@ -316,23 +346,25 @@ TEST_CASE("graph iterator") {
     using namespace tbb::flow;
 
     graph g;
-
+    
     auto past_end = g.end();
     ++past_end;
 
-    continue_node<int> n(g, [](const continue_msg&) { return 1; });
+    continue_node<int> n(g, [](const continue_msg &){return 1;});
 
     size_t item_count = 0;
 
-    for (auto it = g.cbegin(); it != g.cend(); it++) ++item_count;
+    for(auto it = g.cbegin(); it != g.cend(); it++)
+        ++item_count;
     CHECK_MESSAGE((item_count == 1), "Should find 1 item");
 
     item_count = 0;
     auto jt(g.begin());
-    for (; jt != g.end(); jt++) ++item_count;
+    for(; jt != g.end(); jt++)
+        ++item_count;
     CHECK_MESSAGE((item_count == 1), "Should find 1 item");
 
     graph g2;
-    continue_node<int> n2(g, [](const continue_msg&) { return 1; });
+    continue_node<int> n2(g, [](const continue_msg &){return 1;});
     CHECK_MESSAGE((g.begin() != g2.begin()), "Different graphs should have different iterators");
 }
diff --git a/external/tbb/test/tbb/test_flow_graph_priorities.cpp b/external/tbb/test/tbb/test_flow_graph_priorities.cpp
index 0390ca80..483daadb 100644
--- a/external/tbb/test/tbb/test_flow_graph_priorities.cpp
+++ b/external/tbb/test/tbb/test_flow_graph_priorities.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2018-2021 Intel Corporation
+    Copyright (c) 2018-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -15,35 +15,38 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
 #endif
 
 #include "common/config.h"
 
 #include "tbb/flow_graph.h"
-#include "tbb/global_control.h"
 #include "tbb/parallel_for.h"
+#include "tbb/global_control.h"
 #include "tbb/task_arena.h"
 
-#include "common/spin_barrier.h"
 #include "common/test.h"
 #include "common/utils.h"
 #include "common/utils_concurrency_limit.h"
+#include "common/spin_barrier.h"
 
-#include <algorithm>
+#include <vector>
 #include <cstdlib>
-#include <memory>
 #include <random>
-#include <vector>
+#include <algorithm>
+#include <memory>
+
 
 //! \file test_flow_graph_priorities.cpp
 //! \brief Test for [flow_graph.copy_body flow_graph.function_node flow_graph.multifunction_node flow_graph.continue_node flow_graph.async_node] specification
 
+
 using namespace tbb::flow;
 
 struct TaskInfo {
     TaskInfo() : my_priority(-1), my_task_index(-1) {}
-    TaskInfo(int priority, int task_index) : my_priority(priority), my_task_index(task_index) {}
+    TaskInfo( int priority, int task_index )
+        : my_priority(priority), my_task_index(task_index) {}
     int my_priority;
     int my_task_index;
 };
@@ -52,324 +55,326 @@ std::vector<TaskInfo> g_task_info;
 
 std::atomic<unsigned> g_task_num;
 
-void spin_for(double delta) {
+void spin_for( double delta ) {
     tbb::tick_count start = tbb::tick_count::now();
-    while ((tbb::tick_count::now() - start).seconds() < delta)
-        ;
+    while( (tbb::tick_count::now() - start).seconds() < delta ) ;
 }
 
 namespace PriorityNodesTakePrecedence {
 
-    std::atomic<bool> g_work_submitted;
+std::atomic<bool> g_work_submitted;
+
+const unsigned node_num = 100;
+const unsigned start_index = node_num / 3;
+const unsigned end_index = node_num * 2 / 3;
+std::atomic<unsigned> g_priority_task_index;
+
+void body_func( int priority, utils::SpinBarrier& my_barrier ) {
+    while( !g_work_submitted.load(std::memory_order_acquire) )
+        tbb::detail::d0::yield();
+    int current_task_index = g_task_num++;
+    if( priority != no_priority )
+        g_task_info[g_priority_task_index++] = TaskInfo( priority, current_task_index );
+    const bool all_threads_will_come =
+        unsigned(current_task_index) < node_num - (node_num % tbb::this_task_arena::max_concurrency());
+    if( all_threads_will_come )
+        my_barrier.wait();
+}
 
-    const unsigned node_num = 100;
-    const unsigned start_index = node_num / 3;
-    const unsigned end_index = node_num * 2 / 3;
-    std::atomic<unsigned> g_priority_task_index;
+typedef multifunction_node< int, std::tuple<int> > multi_node;
 
-    void body_func(int priority, utils::SpinBarrier& my_barrier) {
-        while (!g_work_submitted.load(std::memory_order_acquire)) tbb::detail::d0::yield();
-        int current_task_index = g_task_num++;
-        if (priority != no_priority)
-            g_task_info[g_priority_task_index++] = TaskInfo(priority, current_task_index);
-        const bool all_threads_will_come = unsigned(current_task_index)
-                                           < node_num - (node_num % tbb::this_task_arena::max_concurrency());
-        if (all_threads_will_come) my_barrier.wait();
+template <typename T>
+struct Body {
+    Body( int priority, utils::SpinBarrier& barrier )
+        : my_priority( priority ), my_barrier( barrier ) {}
+    T operator()( const T& msg ) const {
+        body_func( my_priority, my_barrier );
+        return msg;
     }
+    void operator()( int msg, multi_node::output_ports_type& op ) const {
+        body_func( my_priority, my_barrier );
+        std::get<0>(op).try_put( msg );
+    }
+private:
+    int my_priority;
+    utils::SpinBarrier& my_barrier;
+};
 
-    typedef multifunction_node<int, std::tuple<int>> multi_node;
-
-    template <typename T>
-    struct Body {
-        Body(int priority, utils::SpinBarrier& barrier) : my_priority(priority), my_barrier(barrier) {}
-        T operator()(const T& msg) const {
-            body_func(my_priority, my_barrier);
-            return msg;
-        }
-        void operator()(int msg, multi_node::output_ports_type& op) const {
-            body_func(my_priority, my_barrier);
-            std::get<0>(op).try_put(msg);
-        }
+template<typename NodeType, typename BodyType>
+struct node_creator_t {
+    NodeType* operator()( graph& g, unsigned index, utils::SpinBarrier& barrier ) {
+        if( start_index <= index && index < end_index )
+            return new NodeType( g, unlimited, BodyType(index, barrier), node_priority_t(index) );
+        else
+            return new NodeType( g, unlimited, BodyType(no_priority, barrier) );
+    }
+};
 
-    private:
-        int my_priority;
-        utils::SpinBarrier& my_barrier;
-    };
+template<typename BodyType>
+struct node_creator_t< continue_node<continue_msg>, BodyType > {
+    continue_node<continue_msg>* operator()( graph& g, unsigned index, utils::SpinBarrier& barrier ) {
+        if( start_index <= index && index < end_index )
+            return new continue_node<continue_msg>( g, BodyType(index, barrier), node_priority_t(index) );
+        else
+            return new continue_node<continue_msg>( g, BodyType(no_priority, barrier) );
+    }
+};
 
-    template <typename NodeType, typename BodyType>
-    struct node_creator_t {
-        NodeType* operator()(graph& g, unsigned index, utils::SpinBarrier& barrier) {
-            if (start_index <= index && index < end_index)
-                return new NodeType(g, unlimited, BodyType(index, barrier), node_priority_t(index));
-            else
-                return new NodeType(g, unlimited, BodyType(no_priority, barrier));
-        }
-    };
 
-    template <typename BodyType>
-    struct node_creator_t<continue_node<continue_msg>, BodyType> {
-        continue_node<continue_msg>* operator()(graph& g, unsigned index, utils::SpinBarrier& barrier) {
-            if (start_index <= index && index < end_index)
-                return new continue_node<continue_msg>(g, BodyType(index, barrier), node_priority_t(index));
-            else
-                return new continue_node<continue_msg>(g, BodyType(no_priority, barrier));
-        }
-    };
+struct passthru_body {
+    template<typename T>
+    continue_msg operator()( T ) const { return continue_msg(); }
+};
 
-    struct passthru_body {
-        template <typename T>
-        continue_msg operator()(T) const {
-            return continue_msg();
-        }
-    };
+template<typename NodeType, typename NodeTypeCreator>
+void test_node( NodeTypeCreator node_creator ) {
+    const int num_threads = tbb::this_task_arena::max_concurrency();
+    utils::SpinBarrier barrier( num_threads );
+    graph g;
+    broadcast_node<typename NodeType::input_type> bn(g);
+    function_node<typename NodeType::input_type> tn(g, unlimited, passthru_body());
+    // Using pointers to nodes to avoid errors on compilers, which try to generate assignment
+    // operator for the nodes
+    std::vector< std::unique_ptr<NodeType> > nodes;
+    for( unsigned i = 0; i < node_num; ++i ) {
+        nodes.push_back(std::unique_ptr<NodeType>( node_creator(g, i, barrier) ));
+        make_edge( bn, *nodes.back() );
+        make_edge( *nodes.back(), tn );
+    }
 
-    template <typename NodeType, typename NodeTypeCreator>
-    void test_node(NodeTypeCreator node_creator) {
-        const int num_threads = tbb::this_task_arena::max_concurrency();
-        utils::SpinBarrier barrier(num_threads);
-        graph g;
-        broadcast_node<typename NodeType::input_type> bn(g);
-        function_node<typename NodeType::input_type> tn(g, unlimited, passthru_body());
-        // Using pointers to nodes to avoid errors on compilers, which try to generate assignment
-        // operator for the nodes
-        std::vector<std::unique_ptr<NodeType>> nodes;
-        for (unsigned i = 0; i < node_num; ++i) {
-            nodes.push_back(std::unique_ptr<NodeType>(node_creator(g, i, barrier)));
-            make_edge(bn, *nodes.back());
-            make_edge(*nodes.back(), tn);
-        }
+    const size_t repeats = 10;
+    const size_t priority_nodes_num = end_index - start_index;
+    size_t global_order_failures = 0;
+    for( size_t repeat = 0; repeat < repeats; ++repeat ) {
+        g_work_submitted.store( false, std::memory_order_release );
+        g_task_num = g_priority_task_index = 0;
+        g_task_info.clear(); g_task_info.resize( priority_nodes_num );
+
+        bn.try_put( typename NodeType::input_type{} );
+        // Setting of the flag is based on the knowledge that the calling thread broadcasts the
+        // message to successor nodes. Thus, once the calling thread returns from try_put() call all
+        // necessary tasks are spawned. Thus, this makes this test to be a whitebox test to some
+        // extent.
+        g_work_submitted.store( true, std::memory_order_release );
 
-        const size_t repeats = 10;
-        const size_t priority_nodes_num = end_index - start_index;
-        size_t global_order_failures = 0;
-        for (size_t repeat = 0; repeat < repeats; ++repeat) {
-            g_work_submitted.store(false, std::memory_order_release);
-            g_task_num = g_priority_task_index = 0;
-            g_task_info.clear();
-            g_task_info.resize(priority_nodes_num);
-
-            bn.try_put(typename NodeType::input_type {});
-            // Setting of the flag is based on the knowledge that the calling thread broadcasts the
-            // message to successor nodes. Thus, once the calling thread returns from try_put() call all
-            // necessary tasks are spawned. Thus, this makes this test to be a whitebox test to some
-            // extent.
-            g_work_submitted.store(true, std::memory_order_release);
+        g.wait_for_all();
 
-            g.wait_for_all();
+        CHECK_MESSAGE( (g_priority_task_index == g_task_info.size()), "Incorrect number of tasks with priority." );
+        CHECK_MESSAGE( (priority_nodes_num == g_task_info.size()), "Incorrect number of tasks with priority executed." );
 
-            CHECK_MESSAGE((g_priority_task_index == g_task_info.size()),
-                          "Incorrect number of tasks with priority.");
-            CHECK_MESSAGE((priority_nodes_num == g_task_info.size()),
-                          "Incorrect number of tasks with priority executed.");
-
-            for (unsigned i = 0; i < g_priority_task_index; i += num_threads) {
-                bool found = false;
-                unsigned highest_priority_within_group = end_index - i - 1;
-                for (unsigned j = i; j < i + num_threads; ++j) {
-                    if (g_task_info[j].my_priority == int(highest_priority_within_group)) {
-                        found = true;
-                        break;
-                    }
+        for( unsigned i = 0; i < g_priority_task_index; i += num_threads ) {
+            bool found = false;
+            unsigned highest_priority_within_group = end_index - i - 1;
+            for( unsigned j = i; j < i+num_threads; ++j ) {
+                if( g_task_info[j].my_priority == int(highest_priority_within_group) ) {
+                    found = true;
+                    break;
                 }
-                CHECK_MESSAGE(found, "Highest priority task within a group was not found");
-            }
-            for (unsigned i = 0; i < g_priority_task_index; ++i) {
-                // This check might fail because priorities do not guarantee ordering, i.e. assumption
-                // that all priority nodes should increment the task counter before any subsequent
-                // no-priority node is not correct. In the worst case, a thread that took a priority
-                // node might be preempted and become the last to increment the counter. That's why the
-                // test passing is based on statistics, which could be affected by machine overload
-                // unfortunately.
-                // TODO revamp: reconsider the following check for this test
-                if (g_task_info[i].my_task_index > int(priority_nodes_num + num_threads))
-                    ++global_order_failures;
             }
+            CHECK_MESSAGE( found, "Highest priority task within a group was not found" );
+        }
+        for( unsigned i = 0; i < g_priority_task_index; ++i ) {
+            // This check might fail because priorities do not guarantee ordering, i.e. assumption
+            // that all priority nodes should increment the task counter before any subsequent
+            // no-priority node is not correct. In the worst case, a thread that took a priority
+            // node might be preempted and become the last to increment the counter. That's why the
+            // test passing is based on statistics, which could be affected by machine overload
+            // unfortunately.
+            // TODO revamp: reconsider the following check for this test
+            if( g_task_info[i].my_task_index > int(priority_nodes_num + num_threads) )
+                ++global_order_failures;
         }
-        float failure_ratio = float(global_order_failures) / float(repeats * priority_nodes_num);
-        CHECK_MESSAGE(
-                failure_ratio <= 0.1f,
-                "Nodes with priorities executed in wrong order too frequently over non-prioritized nodes.");
     }
+    float failure_ratio = float(global_order_failures) / float(repeats*priority_nodes_num);
+    CHECK_MESSAGE(
+        failure_ratio <= 0.1f,
+        "Nodes with priorities executed in wrong order too frequently over non-prioritized nodes."
+    );
+}
 
-    template <typename NodeType, typename NodeBody>
-    void call_within_arena(tbb::task_arena& arena) {
-        arena.execute([&]() { test_node<NodeType>(node_creator_t<NodeType, NodeBody>()); });
-    }
+template<typename NodeType, typename NodeBody>
+void call_within_arena( tbb::task_arena& arena ) {
+    arena.execute(
+        [&]() {
+            test_node<NodeType>( node_creator_t<NodeType, NodeBody>() );
+        }
+    );
+}
 
-    void test(int num_threads) {
-        INFO("Testing execution of nodes with priority takes precedence (num_threads=" << num_threads
-                                                                                       << ") - ");
-        tbb::task_arena arena(num_threads);
-        call_within_arena<function_node<int, int>, Body<int>>(arena);
-        call_within_arena<multi_node, Body<int>>(arena);
-        call_within_arena<continue_node<continue_msg>, Body<continue_msg>>(arena);
-    }
+void test( int num_threads ) {
+    INFO( "Testing execution of nodes with priority takes precedence (num_threads=" << num_threads << ") - " );
+    tbb::task_arena arena(num_threads);
+    call_within_arena< function_node<int,int>, Body<int> >( arena );
+    call_within_arena< multi_node, Body<int> >( arena );
+    call_within_arena< continue_node<continue_msg>, Body<continue_msg> >( arena );
+}
 
 } /* namespace PriorityNodesTakePrecedence */
 
 namespace ThreadsEagerReaction {
 
-    // TODO revamp: combine with similar queue from test_async_node
-    template <typename T>
-    class concurrent_queue {
-    public:
-        bool try_pop(T& item) {
-            std::lock_guard<queue_mutex> lock(mutex);
-            if (q.empty()) return false;
-            item = q.front();
-            q.pop();
-            return true;
-        }
+// TODO revamp: combine with similar queue from test_async_node
+template <typename T>
+class concurrent_queue {
+public:
+    bool try_pop(T& item) {
+        std::lock_guard<queue_mutex> lock(mutex);
+        if ( q.empty() )
+            return false;
+        item = q.front();
+        q.pop();
+        return true;
+    }
 
-        void push(const T& item) {
-            std::lock_guard<queue_mutex> lock(mutex);
-            q.push(item);
-        }
+    void push(const T& item) {
+        std::lock_guard<queue_mutex> lock(mutex);
+        q.push(item);
+    }
+private:
+    std::queue<T> q;
+    using queue_mutex = std::mutex;
+    std::mutex mutex;
+};
 
-    private:
-        std::queue<T> q;
-        using queue_mutex = std::mutex;
-        std::mutex mutex;
-    };
+using utils::SpinBarrier;
 
-    using utils::SpinBarrier;
+enum task_type_t { no_task, regular_task, async_task };
 
-    enum task_type_t { no_task, regular_task, async_task };
+struct profile_t {
+    task_type_t task_type;
+    unsigned global_task_id;
+    double elapsed;
+};
 
-    struct profile_t {
-        task_type_t task_type;
-        unsigned global_task_id;
-        double elapsed;
-    };
+std::vector<unsigned> g_async_task_ids;
 
-    std::vector<unsigned> g_async_task_ids;
-
-    typedef unsigned data_type;
-    typedef async_node<data_type, data_type> async_node_type;
-    typedef multifunction_node<data_type, std::tuple<data_type, data_type>> decider_node_type;
-    struct AsyncActivity {
-        typedef async_node_type::gateway_type gateway_type;
-
-        struct work_type {
-            data_type input;
-            gateway_type* gateway;
-        };
-        std::atomic<bool> done;
-        concurrent_queue<work_type> my_queue;
-        std::thread my_service_thread;
-
-        struct ServiceThreadFunc {
-            SpinBarrier& my_barrier;
-            ServiceThreadFunc(SpinBarrier& barrier) : my_barrier(barrier) {}
-            void operator()(AsyncActivity* activity) {
-                while (!activity->done) {
-                    work_type work;
-                    while (activity->my_queue.try_pop(work)) {
-                        g_async_task_ids.push_back(++g_task_num);
-                        work.gateway->try_put(work.input);
-                        work.gateway->release_wait();
-                        my_barrier.wait();
-                    }
-                }
-            }
-        };
-        void stop_and_wait() {
-            done = true;
-            my_service_thread.join();
-        }
+typedef unsigned data_type;
+typedef async_node<data_type, data_type> async_node_type;
+typedef multifunction_node<
+    data_type, std::tuple<data_type, data_type> > decider_node_type;
+struct AsyncActivity {
+    typedef async_node_type::gateway_type gateway_type;
 
-        void submit(data_type input, gateway_type* gateway) {
-            work_type work = {input, gateway};
-            gateway->reserve_wait();
-            my_queue.push(work);
-        }
-        AsyncActivity(SpinBarrier& barrier)
-            : done(false), my_service_thread(ServiceThreadFunc(barrier), this) {}
-    };
+    struct work_type { data_type input; gateway_type* gateway; };
+    std::atomic<bool> done;
+    concurrent_queue<work_type> my_queue;
+    std::thread my_service_thread;
 
-    struct StartBody {
-        bool has_run;
-        data_type operator()(tbb::flow_control& fc) {
-            if (has_run) {
-                fc.stop();
-                return data_type();
+    struct ServiceThreadFunc {
+        SpinBarrier& my_barrier;
+        ServiceThreadFunc(SpinBarrier& barrier) : my_barrier(barrier) {}
+        void operator()(AsyncActivity* activity) {
+            while (!activity->done) {
+                work_type work;
+                while (activity->my_queue.try_pop(work)) {
+                    g_async_task_ids.push_back( ++g_task_num );
+                    work.gateway->try_put(work.input);
+                    work.gateway->release_wait();
+                    my_barrier.wait();
+                }
             }
-            has_run = true;
-            return 1;
         }
-        StartBody() : has_run(false) {}
     };
+    void stop_and_wait() { done = true; my_service_thread.join(); }
 
-    struct ParallelForBody {
-        SpinBarrier& my_barrier;
-        const data_type& my_input;
-        ParallelForBody(SpinBarrier& barrier, const data_type& input)
-            : my_barrier(barrier), my_input(input) {}
-        void operator()(const data_type&) const {
-            my_barrier.wait();
-            ++g_task_num;
-        }
-    };
+    void submit(data_type input, gateway_type* gateway) {
+        work_type work = { input, gateway };
+        gateway->reserve_wait();
+        my_queue.push(work);
+    }
+    AsyncActivity(SpinBarrier& barrier)
+        : done(false), my_service_thread(ServiceThreadFunc(barrier), this) {}
+};
 
-    struct CpuWorkBody {
-        SpinBarrier& my_barrier;
-        const int my_tasks_count;
-        data_type operator()(const data_type& input) {
-            tbb::parallel_for(0, my_tasks_count, ParallelForBody(my_barrier, input),
-                              tbb::simple_partitioner());
-            return input;
+struct StartBody {
+    bool has_run;
+    data_type operator()(tbb::flow_control& fc) {
+        if (has_run){
+            fc.stop();
+            return data_type();
         }
-        CpuWorkBody(SpinBarrier& barrier, int tasks_count)
-            : my_barrier(barrier), my_tasks_count(tasks_count) {}
-    };
+        has_run = true;
+        return 1;
+    }
+    StartBody() : has_run(false) {}
+};
 
-    struct DeciderBody {
-        const data_type my_limit;
-        DeciderBody(const data_type& limit) : my_limit(limit) {}
-        void operator()(data_type input, decider_node_type::output_ports_type& ports) {
-            if (input < my_limit) std::get<0>(ports).try_put(input + 1);
-        }
-    };
+struct ParallelForBody {
+    SpinBarrier& my_barrier;
+    const data_type& my_input;
+    ParallelForBody(SpinBarrier& barrier, const data_type& input)
+        : my_barrier(barrier), my_input(input) {}
+    void operator()(const data_type&) const {
+        my_barrier.wait();
+        ++g_task_num;
+    }
+};
 
-    struct AsyncSubmissionBody {
-        AsyncActivity* my_activity;
-        void operator()(data_type input, async_node_type::gateway_type& gateway) {
-            my_activity->submit(input, &gateway);
-        }
-        AsyncSubmissionBody(AsyncActivity* activity) : my_activity(activity) {}
-    };
+struct CpuWorkBody {
+    SpinBarrier& my_barrier;
+    const int my_tasks_count;
+    data_type operator()(const data_type& input) {
+        tbb::parallel_for(0, my_tasks_count, ParallelForBody(my_barrier, input), tbb::simple_partitioner());
+        return input;
+    }
+    CpuWorkBody(SpinBarrier& barrier, int tasks_count)
+        : my_barrier(barrier), my_tasks_count(tasks_count) {}
+};
 
-    void test(unsigned num_threads) {
-        INFO("Testing threads react eagerly on asynchronous tasks (num_threads=" << num_threads << ") - ");
-        if (num_threads == std::thread::hardware_concurrency()) {
-            // one thread is required for asynchronous compute resource
-            INFO("skipping test since it is designed to work on less number of threads than "
-                 "hardware concurrency allows\n");
-            return;
-        }
-        const unsigned cpu_threads = unsigned(num_threads);
-        const unsigned cpu_tasks_per_thread = 4;
-        const unsigned nested_cpu_tasks = cpu_tasks_per_thread * cpu_threads;
-        const unsigned async_subgraph_reruns = 8;
-        const unsigned cpu_subgraph_reruns = 2;
-
-        SpinBarrier barrier(cpu_threads + /*async thread=*/1);
-        g_task_num = 0;
-        g_async_task_ids.clear();
-        g_async_task_ids.reserve(async_subgraph_reruns);
-
-        tbb::task_arena arena(cpu_threads);
-        arena.execute([&]() {
+struct DeciderBody {
+    const data_type my_limit;
+    DeciderBody( const data_type& limit ) : my_limit( limit ) {}
+    void operator()(data_type input, decider_node_type::output_ports_type& ports) {
+        if (input < my_limit)
+            std::get<0>(ports).try_put(input + 1);
+    }
+};
+
+struct AsyncSubmissionBody {
+    AsyncActivity* my_activity;
+    // It is important that async_node in the test executes without spawning a TBB task, because
+    // it passes the work to asynchronous thread, which unlocks the barrier that is waited
+    // by every execution thread (asynchronous thread and any TBB worker or main thread).
+    // This is why async_node's body marked noexcept.
+    void operator()(data_type input, async_node_type::gateway_type& gateway) noexcept {
+        my_activity->submit(input, &gateway);
+    }
+    AsyncSubmissionBody(AsyncActivity* activity) : my_activity(activity) {}
+};
+
+void test( unsigned num_threads ) {
+    INFO( "Testing threads react eagerly on asynchronous tasks (num_threads=" << num_threads << ") - " );
+    if( num_threads == std::thread::hardware_concurrency() ) {
+        // one thread is required for asynchronous compute resource
+        INFO("skipping test since it is designed to work on less number of threads than "
+             "hardware concurrency allows\n");
+        return;
+    }
+    const unsigned cpu_threads = unsigned(num_threads);
+    const unsigned cpu_tasks_per_thread = 4;
+    const unsigned nested_cpu_tasks = cpu_tasks_per_thread * cpu_threads;
+    const unsigned async_subgraph_reruns = 8;
+    const unsigned cpu_subgraph_reruns = 2;
+
+    SpinBarrier barrier(cpu_threads + /*async thread=*/1);
+    g_task_num = 0;
+    g_async_task_ids.clear();
+    g_async_task_ids.reserve(async_subgraph_reruns);
+
+    tbb::task_arena arena(cpu_threads);
+	arena.execute(
+        [&]() {
             AsyncActivity activity(barrier);
             graph g;
 
             input_node<data_type> starter_node(g, StartBody());
-            function_node<data_type, data_type> cpu_work_node(g, unlimited,
-                                                              CpuWorkBody(barrier, nested_cpu_tasks));
+            function_node<data_type, data_type> cpu_work_node(
+                g, unlimited, CpuWorkBody(barrier, nested_cpu_tasks));
             decider_node_type cpu_restarter_node(g, unlimited, DeciderBody(cpu_subgraph_reruns));
             async_node_type async_node(g, unlimited, AsyncSubmissionBody(&activity));
-            decider_node_type async_restarter_node(g, unlimited, DeciderBody(async_subgraph_reruns),
-                                                   node_priority_t(1));
+            decider_node_type async_restarter_node(
+                g, unlimited, DeciderBody(async_subgraph_reruns), node_priority_t(1)
+            );
 
             make_edge(starter_node, cpu_work_node);
             make_edge(cpu_work_node, cpu_restarter_node);
@@ -384,119 +389,127 @@ namespace ThreadsEagerReaction {
             activity.stop_and_wait();
 
             const size_t async_task_num = size_t(async_subgraph_reruns);
-            CHECK_MESSAGE((g_async_task_ids.size() == async_task_num), "Incorrect number of async tasks.");
+            CHECK_MESSAGE( ( g_async_task_ids.size() == async_task_num), "Incorrect number of async tasks." );
             unsigned max_span = unsigned(2 * cpu_threads + 1);
-            for (size_t idx = 1; idx < async_task_num; ++idx) {
-                CHECK_MESSAGE((g_async_task_ids[idx] - g_async_task_ids[idx - 1] <= max_span),
-                              "Async tasks were not able to interfere with CPU tasks.");
+            for( size_t idx = 1; idx < async_task_num; ++idx ) {
+                CHECK_MESSAGE( (g_async_task_ids[idx] - g_async_task_ids[idx-1] <= max_span),
+                               "Async tasks were not able to interfere with CPU tasks." );
+
             }
-        });
-        INFO("done\n");
-    }
-}// namespace ThreadsEagerReaction
+        }
+    );
+    INFO("done\n");
+}
+} /* ThreadsEagerReaction */
 
 namespace LimitingExecutionToPriorityTask {
 
-    enum work_type_t { NONPRIORITIZED_WORK, PRIORITIZED_WORK };
+enum work_type_t { NONPRIORITIZED_WORK, PRIORITIZED_WORK };
 
-    struct execution_tracker_t {
-        execution_tracker_t() { reset(); }
-        void reset() {
-            prioritized_work_submitter = std::thread::id();
-            prioritized_work_started = false;
-            prioritized_work_finished = false;
-            prioritized_work_interrupted = false;
-        }
-        std::thread::id prioritized_work_submitter;
-        std::atomic<bool> prioritized_work_started;
-        bool prioritized_work_finished;
-        bool prioritized_work_interrupted;
-    } exec_tracker;
-
-    template <work_type_t work_type>
-    void do_node_work(int work_size);
-
-    template <work_type_t>
-    void do_nested_work(const std::thread::id& tid, const tbb::blocked_range<int>& subrange);
-
-    template <work_type_t work_type>
-    struct CommonBody {
-        CommonBody() : my_body_size(0) {}
-        CommonBody(int body_size) : my_body_size(body_size) {}
-        continue_msg operator()(const continue_msg& msg) const {
-            do_node_work<work_type>(my_body_size);
-            return msg;
-        }
-        void operator()(const tbb::blocked_range<int>& subrange) const {
-            do_nested_work<work_type>(/*tid=*/std::this_thread::get_id(), subrange);
-        }
-        int my_body_size;
-    };
+struct execution_tracker_t {
+    execution_tracker_t() { reset(); }
+    void reset() {
+        prioritized_work_submitter = std::thread::id();
+        prioritized_work_started = false;
+        prioritized_work_finished = false;
+        prioritized_work_interrupted = false;
+    }
+    std::thread::id prioritized_work_submitter;
+    std::atomic<bool> prioritized_work_started;
+    bool prioritized_work_finished;
+    bool prioritized_work_interrupted;
+} exec_tracker;
+
+template<work_type_t work_type>
+void do_node_work( int work_size );
+
+template<work_type_t>
+void do_nested_work( const std::thread::id& tid, const tbb::blocked_range<int>& subrange );
+
+template<work_type_t work_type>
+struct CommonBody {
+    CommonBody() : my_body_size( 0 ) { }
+    CommonBody( int body_size ) : my_body_size( body_size ) { }
+    continue_msg operator()( const continue_msg& msg ) const {
+        do_node_work<work_type>(my_body_size);
+        return msg;
+    }
+    void operator()( const tbb::blocked_range<int>& subrange ) const {
+        do_nested_work<work_type>( /*tid=*/std::this_thread::get_id(), subrange );
+    }
+    int my_body_size;
+};
 
-    template <work_type_t work_type>
-    void do_node_work(int work_size) {
-        tbb::parallel_for(tbb::blocked_range<int>(0, work_size), CommonBody<work_type>(),
-                          tbb::simple_partitioner());
-    }
-
-    template <work_type_t>
-    void do_nested_work(const std::thread::id& tid, const tbb::blocked_range<int>& /*subrange*/) {
-        // This is non-prioritized work...
-        if (!exec_tracker.prioritized_work_started || exec_tracker.prioritized_work_submitter != tid) return;
-        // ...being executed by the thread that initially started prioritized one...
-        CHECK_MESSAGE(exec_tracker.prioritized_work_started,
-                      "Prioritized work should have been started by that time.");
-        // ...prioritized work has been started already...
-        if (exec_tracker.prioritized_work_finished) return;
-        // ...but has not been finished yet
-        exec_tracker.prioritized_work_interrupted = true;
-    }
-
-    struct IsolationFunctor {
-        int work_size;
-        IsolationFunctor(int ws) : work_size(ws) {}
-        void operator()() const {
-            tbb::parallel_for(tbb::blocked_range<int>(0, work_size), CommonBody<PRIORITIZED_WORK>(),
-                              tbb::simple_partitioner());
-        }
-    };
+template<work_type_t work_type>
+void do_node_work(int work_size) {
+    tbb::parallel_for( tbb::blocked_range<int>(0, work_size), CommonBody<work_type>(),
+                       tbb::simple_partitioner() );
+}
 
-    template <>
-    void do_node_work<PRIORITIZED_WORK>(int work_size) {
-        exec_tracker.prioritized_work_submitter = std::this_thread::get_id();
-        exec_tracker.prioritized_work_started = true;
-        tbb::this_task_arena::isolate(IsolationFunctor(work_size));
-        exec_tracker.prioritized_work_finished = true;
-    }
-
-    template <>
-    void do_nested_work<PRIORITIZED_WORK>(const std::thread::id& tid,
-                                          const tbb::blocked_range<int>& /*subrange*/) {
-        if (exec_tracker.prioritized_work_started && exec_tracker.prioritized_work_submitter == tid) {
-            CHECK_MESSAGE(!exec_tracker.prioritized_work_interrupted,
-                          "Thread was not fully devoted to processing of prioritized task.");
-        } else {
-            // prolong processing of prioritized work so that the thread that started
-            // prioritized work has higher probability to help with non-prioritized one.
-            spin_for(0.1);
-        }
+template<work_type_t>
+void do_nested_work( const std::thread::id& tid, const tbb::blocked_range<int>& /*subrange*/ ) {
+    // This is non-prioritized work...
+    if( !exec_tracker.prioritized_work_started || exec_tracker.prioritized_work_submitter != tid )
+        return;
+    // ...being executed by the thread that initially started prioritized one...
+    CHECK_MESSAGE( exec_tracker.prioritized_work_started,
+                   "Prioritized work should have been started by that time." );
+    // ...prioritized work has been started already...
+    if( exec_tracker.prioritized_work_finished )
+        return;
+    // ...but has not been finished yet
+    exec_tracker.prioritized_work_interrupted = true;
+}
+
+struct IsolationFunctor {
+    int work_size;
+    IsolationFunctor(int ws) : work_size(ws) {}
+    void operator()() const {
+        tbb::parallel_for( tbb::blocked_range<int>(0, work_size), CommonBody<PRIORITIZED_WORK>(),
+                           tbb::simple_partitioner() );
     }
+};
 
-    // Using pointers to nodes to avoid errors on compilers, which try to generate assignment operator
-    // for the nodes
-    typedef std::vector<std::unique_ptr<continue_node<continue_msg>>> nodes_container_t;
+template<>
+void do_node_work<PRIORITIZED_WORK>(int work_size) {
+    exec_tracker.prioritized_work_submitter = std::this_thread::get_id();
+    exec_tracker.prioritized_work_started = true;
+    tbb::this_task_arena::isolate( IsolationFunctor(work_size) );
+    exec_tracker.prioritized_work_finished = true;
+}
 
-    void create_nodes(nodes_container_t& nodes, graph& g, int num, int body_size) {
-        for (int i = 0; i < num; ++i)
-            nodes.push_back(std::unique_ptr<continue_node<continue_msg>>(
-                    new continue_node<continue_msg>(g, CommonBody<NONPRIORITIZED_WORK>(body_size))));
+template<>
+void do_nested_work<PRIORITIZED_WORK>( const std::thread::id& tid,
+                                       const tbb::blocked_range<int>& /*subrange*/ ) {
+    if( exec_tracker.prioritized_work_started && exec_tracker.prioritized_work_submitter == tid ) {
+        CHECK_MESSAGE( !exec_tracker.prioritized_work_interrupted,
+                       "Thread was not fully devoted to processing of prioritized task." );
+    } else {
+        // prolong processing of prioritized work so that the thread that started
+        // prioritized work has higher probability to help with non-prioritized one.
+        spin_for(0.1);
     }
+}
+
+// Using pointers to nodes to avoid errors on compilers, which try to generate assignment operator
+// for the nodes
+typedef std::vector< std::unique_ptr<continue_node<continue_msg>> > nodes_container_t;
+
+void create_nodes( nodes_container_t& nodes, graph& g, int num, int body_size ) {
+    for( int i = 0; i < num; ++i )
+        nodes.push_back(
+            std::unique_ptr<continue_node<continue_msg>>(
+                new continue_node<continue_msg>( g, CommonBody<NONPRIORITIZED_WORK>( body_size ) )
+            )
+        );
+}
 
-    void test(int num_threads) {
-        INFO("Testing limit execution to priority tasks (num_threads=" << num_threads << ") - ");
+void test( int num_threads ) {
+    INFO( "Testing limit execution to priority tasks (num_threads=" << num_threads << ") - " );
 
-        tbb::task_arena arena(num_threads);
-        arena.execute([&]() {
+    tbb::task_arena arena( num_threads );
+	arena.execute(
+        [&]() {
             const int nodes_num = 100;
             const int priority_node_position_part = 10;
             const int pivot = nodes_num / priority_node_position_part;
@@ -506,238 +519,261 @@ namespace LimitingExecutionToPriorityTask {
 
             graph g;
             nodes_container_t nodes;
-            create_nodes(nodes, g, pivot, large_problem_size);
-            nodes.push_back(std::unique_ptr<continue_node<continue_msg>>(new continue_node<continue_msg>(
-                    g, CommonBody<PRIORITIZED_WORK>(small_problem_size), node_priority_t(1))));
-            create_nodes(nodes, g, nodes_num - pivot - 1, large_problem_size);
+            create_nodes( nodes, g, pivot, large_problem_size );
+            nodes.push_back(
+                std::unique_ptr<continue_node<continue_msg>>(
+                    new continue_node<continue_msg>(
+                        g, CommonBody<PRIORITIZED_WORK>(small_problem_size), node_priority_t(1)
+                    )
+                )
+            );
+            create_nodes( nodes, g, nodes_num - pivot - 1, large_problem_size );
 
             broadcast_node<continue_msg> bn(g);
-            for (int i = 0; i < nodes_num; ++i)
-                if (i % nodes_in_lane == 0) make_edge(bn, *nodes[i]);
+            for( int i = 0; i < nodes_num; ++i )
+                if( i % nodes_in_lane == 0 )
+                    make_edge( bn, *nodes[i] );
                 else
-                    make_edge(*nodes[i - 1], *nodes[i]);
+                    make_edge( *nodes[i-1], *nodes[i] );
             exec_tracker.reset();
-            bn.try_put(continue_msg());
+            bn.try_put( continue_msg() );
             g.wait_for_all();
-        });
+        }
+	);
 
-        INFO("done\n");
-    }
+    INFO( "done\n" );
+}
 
 } /* namespace LimitingExecutionToPriorityTask */
 
 namespace NestedCase {
 
-    using tbb::task_arena;
-
-    struct InnerBody {
-        continue_msg operator()(const continue_msg&) const { return continue_msg(); }
-    };
+using tbb::task_arena;
 
-    struct OuterBody {
-        int my_max_threads;
-        task_arena** my_inner_arena;
-        OuterBody(int max_threads, task_arena** inner_arena)
-            : my_max_threads(max_threads), my_inner_arena(inner_arena) {}
-        // copy constructor to please some old compilers
-        OuterBody(const OuterBody& rhs)
-            : my_max_threads(rhs.my_max_threads), my_inner_arena(rhs.my_inner_arena) {}
-        int operator()(const int&) {
-            graph inner_graph;
-            continue_node<continue_msg> start_node(inner_graph, InnerBody());
-            continue_node<continue_msg> mid_node1(inner_graph, InnerBody(), node_priority_t(5));
-            continue_node<continue_msg> mid_node2(inner_graph, InnerBody());
-            continue_node<continue_msg> end_node(inner_graph, InnerBody(), node_priority_t(15));
-            make_edge(start_node, mid_node1);
-            make_edge(mid_node1, end_node);
-            make_edge(start_node, mid_node2);
-            make_edge(mid_node2, end_node);
-            (*my_inner_arena)->execute([&inner_graph] { inner_graph.reset(); });
-            start_node.try_put(continue_msg());
-            inner_graph.wait_for_all();
-            return 13;
-        }
-    };
+struct InnerBody {
+    continue_msg operator()( const continue_msg& ) const {
+        return continue_msg();
+    }
+};
 
-    void execute_outer_graph(bool same_arena, task_arena& inner_arena, int max_threads, graph& outer_graph,
-                             function_node<int, int>& start_node) {
-        if (same_arena) {
-            start_node.try_put(42);
-            outer_graph.wait_for_all();
-            return;
-        }
+struct OuterBody {
+    int my_max_threads;
+    task_arena** my_inner_arena;
+    OuterBody( int max_threads, task_arena** inner_arena )
+        : my_max_threads(max_threads), my_inner_arena(inner_arena) {}
+    // copy constructor to please some old compilers
+    OuterBody( const OuterBody& rhs )
+        : my_max_threads(rhs.my_max_threads), my_inner_arena(rhs.my_inner_arena) {}
+    int operator()( const int& ) {
+        graph inner_graph;
+        continue_node<continue_msg> start_node(inner_graph, InnerBody());
+        continue_node<continue_msg> mid_node1(inner_graph, InnerBody(), node_priority_t(5));
+        continue_node<continue_msg> mid_node2(inner_graph, InnerBody());
+        continue_node<continue_msg> end_node(inner_graph, InnerBody(), node_priority_t(15));
+        make_edge( start_node, mid_node1 );
+        make_edge( mid_node1, end_node );
+        make_edge( start_node, mid_node2 );
+        make_edge( mid_node2, end_node );
+        (*my_inner_arena)->execute( [&inner_graph]{ inner_graph.reset(); } );
+        start_node.try_put( continue_msg() );
+        inner_graph.wait_for_all();
+        return 13;
+    }
+};
 
-        auto threads_range = utils::concurrency_range(max_threads);
-        for (auto num_threads : threads_range) {
-            inner_arena.initialize(static_cast<int>(num_threads));
-            start_node.try_put(42);
-            outer_graph.wait_for_all();
-            inner_arena.terminate();
-        }
+void execute_outer_graph( bool same_arena, task_arena& inner_arena, int max_threads,
+                          graph& outer_graph, function_node<int,int>& start_node ) {
+    if( same_arena ) {
+        start_node.try_put( 42 );
+        outer_graph.wait_for_all();
+        return;
     }
 
-    void test_in_arena(int max_threads, task_arena& outer_arena, task_arena& inner_arena, graph& outer_graph,
-                       function_node<int, int>& start_node) {
-        bool same_arena = &outer_arena == &inner_arena;
-        auto threads_range = utils::concurrency_range(max_threads);
-        for (auto num_threads : threads_range) {
-            INFO("Testing nested nodes with specified priority in "
-                 << (same_arena ? "same" : "different") << " arenas, num_threads=" << num_threads << ") - ");
-            outer_arena.initialize(static_cast<int>(num_threads));
-            outer_arena.execute([&outer_graph] { outer_graph.reset(); });
-            execute_outer_graph(same_arena, inner_arena, max_threads, outer_graph, start_node);
-            outer_arena.terminate();
-            INFO("done\n");
-        }
+    auto threads_range = utils::concurrency_range(max_threads);
+    for( auto num_threads : threads_range ) {
+        inner_arena.initialize( static_cast<int>(num_threads) );
+        start_node.try_put( 42 );
+        outer_graph.wait_for_all();
+        inner_arena.terminate();
     }
+}
 
-    void test(int max_threads) {
-        task_arena outer_arena;
-        task_arena inner_arena;
-        task_arena* inner_arena_pointer = &outer_arena;// make it same as outer arena in the beginning
+void test_in_arena( int max_threads, task_arena& outer_arena, task_arena& inner_arena,
+                    graph& outer_graph, function_node<int, int>& start_node ) {
+    bool same_arena = &outer_arena == &inner_arena;
+    auto threads_range = utils::concurrency_range(max_threads);
+    for( auto num_threads : threads_range ) {
+        INFO( "Testing nested nodes with specified priority in " << (same_arena? "same" : "different")
+              << " arenas, num_threads=" << num_threads << ") - " );
+        outer_arena.initialize( static_cast<int>(num_threads) );
+        outer_arena.execute( [&outer_graph]{ outer_graph.reset(); } );
+        execute_outer_graph( same_arena, inner_arena, max_threads, outer_graph, start_node );
+        outer_arena.terminate();
+        INFO( "done\n" );
+    }
+}
 
-        graph outer_graph;
-        const unsigned num_outer_nodes = 10;
-        const size_t concurrency = unlimited;
-        std::vector<std::unique_ptr<function_node<int, int>>> outer_nodes;
-        for (unsigned node_index = 0; node_index < num_outer_nodes; ++node_index) {
-            node_priority_t priority = no_priority;
-            if (node_index == num_outer_nodes / 2) priority = 10;
+void test( int max_threads ) {
+    task_arena outer_arena; task_arena inner_arena;
+    task_arena* inner_arena_pointer = &outer_arena; // make it same as outer arena in the beginning
+
+    graph outer_graph;
+    const unsigned num_outer_nodes = 10;
+    const size_t concurrency = unlimited;
+    std::vector< std::unique_ptr<function_node<int,int>> > outer_nodes;
+    for( unsigned node_index = 0; node_index < num_outer_nodes; ++node_index ) {
+        node_priority_t priority = no_priority;
+        if( node_index == num_outer_nodes / 2 )
+            priority = 10;
+
+        outer_nodes.push_back(
+            std::unique_ptr< function_node<int, int> >(
+                new function_node<int,int>(
+                    outer_graph, concurrency, OuterBody(max_threads, &inner_arena_pointer), priority
+                )
+            )
+        );
+    }
 
-            outer_nodes.push_back(std::unique_ptr<function_node<int, int>>(new function_node<int, int>(
-                    outer_graph, concurrency, OuterBody(max_threads, &inner_arena_pointer), priority)));
-        }
+    for( unsigned node_index1 = 0; node_index1 < num_outer_nodes; ++node_index1 )
+        for( unsigned node_index2 = node_index1+1; node_index2 < num_outer_nodes; ++node_index2 )
+            make_edge( *outer_nodes[node_index1], *outer_nodes[node_index2] );
 
-        for (unsigned node_index1 = 0; node_index1 < num_outer_nodes; ++node_index1)
-            for (unsigned node_index2 = node_index1 + 1; node_index2 < num_outer_nodes; ++node_index2)
-                make_edge(*outer_nodes[node_index1], *outer_nodes[node_index2]);
+    test_in_arena( max_threads, outer_arena, outer_arena, outer_graph, *outer_nodes[0] );
 
-        test_in_arena(max_threads, outer_arena, outer_arena, outer_graph, *outer_nodes[0]);
+    inner_arena_pointer = &inner_arena;
 
-        inner_arena_pointer = &inner_arena;
+    test_in_arena( max_threads, outer_arena, inner_arena, outer_graph, *outer_nodes[0] );
+}
+} // namespace NestedCase
 
-        test_in_arena(max_threads, outer_arena, inner_arena, outer_graph, *outer_nodes[0]);
-    }
-}// namespace NestedCase
 
 namespace BypassPrioritizedTask {
 
-    void common_body(int priority) {
-        int current_task_index = g_task_num++;
-        g_task_info.push_back(TaskInfo(priority, current_task_index));
-    }
-
-    struct Body {
-        Body(int priority) : my_priority(priority) {}
-        continue_msg operator()(const continue_msg&) {
-            common_body(my_priority);
-            return continue_msg();
-        }
-        int my_priority;
-    };
-
-    struct InputNodeBody {
-        continue_msg operator()(tbb::flow_control& fc) {
-            static bool is_source_executed = false;
+void common_body( int priority ) {
+    int current_task_index = g_task_num++;
+    g_task_info.push_back( TaskInfo( priority, current_task_index ) );
+}
 
-            if (is_source_executed) {
-                fc.stop();
-                return continue_msg();
-            }
+struct Body {
+    Body( int priority ) : my_priority( priority ) {}
+    continue_msg operator()(const continue_msg&) {
+        common_body( my_priority );
+        return continue_msg();
+    }
+    int my_priority;
+};
 
-            common_body(0);
-            is_source_executed = true;
+struct InputNodeBody {
+    continue_msg operator()( tbb::flow_control& fc ){
+        static bool is_source_executed = false;
 
+        if( is_source_executed ) {
+            fc.stop();
             return continue_msg();
         }
-    };
 
-    template <typename StarterNodeType>
-    StarterNodeType create_starter_node(graph& g) {
-        return continue_node<continue_msg>(g, Body(0));
-    }
-
-    template <>
-    input_node<continue_msg> create_starter_node<input_node<continue_msg>>(graph& g) {
-        return input_node<continue_msg>(g, InputNodeBody());
-    }
+        common_body( 0 );
+        is_source_executed = true;
 
-    template <typename StarterNodeType>
-    void start_graph(StarterNodeType& starter) {
-        starter.try_put(continue_msg());
-    }
-
-    template <>
-    void start_graph<input_node<continue_msg>>(input_node<continue_msg>& starter) {
-        starter.activate();
+        return continue_msg();
     }
+};
 
-    template <typename StarterNodeType>
-    void test_use_case() {
-        g_task_info.clear();
-        g_task_num = 0;
-        graph g;
-        StarterNodeType starter = create_starter_node<StarterNodeType>(g);
-        continue_node<continue_msg> spawn_successor(g, Body(1), node_priority_t(1));
-        continue_node<continue_msg> bypass_successor(g, Body(2), node_priority_t(2));
+template<typename StarterNodeType>
+StarterNodeType create_starter_node(graph& g) {
+    return continue_node<continue_msg>( g, Body(0) );
+}
 
-        make_edge(starter, spawn_successor);
-        make_edge(starter, bypass_successor);
+template<>
+input_node<continue_msg> create_starter_node<input_node<continue_msg>>(graph& g) {
+    return input_node<continue_msg>( g, InputNodeBody() );
+}
 
-        start_graph<StarterNodeType>(starter);
-        g.wait_for_all();
+template<typename StarterNodeType>
+void start_graph( StarterNodeType& starter ) {
+    starter.try_put( continue_msg() );
+}
 
-        CHECK_MESSAGE(g_task_info.size() == 3, "");
-        CHECK_MESSAGE(g_task_info[0].my_task_index == 0, "");
-        CHECK_MESSAGE(g_task_info[1].my_task_index == 1, "");
-        CHECK_MESSAGE(g_task_info[2].my_task_index == 2, "");
+template<>
+void start_graph<input_node<continue_msg>>( input_node<continue_msg>& starter ) {
+    starter.activate();
+}
 
-        CHECK_MESSAGE(g_task_info[0].my_priority == 0, "");
-        CHECK_MESSAGE(g_task_info[1].my_priority == 2,
-                      "Bypassed task with higher priority executed in wrong order.");
-        CHECK_MESSAGE(g_task_info[2].my_priority == 1, "");
-    }
+template<typename StarterNodeType>
+void test_use_case() {
+    g_task_info.clear();
+    g_task_num = 0;
+    graph g;
+    StarterNodeType starter = create_starter_node<StarterNodeType>(g);
+    continue_node<continue_msg> spawn_successor( g, Body(1), node_priority_t(1) );
+    continue_node<continue_msg> bypass_successor( g, Body(2), node_priority_t(2) );
+
+    make_edge( starter, spawn_successor );
+    make_edge( starter, bypass_successor );
+
+    start_graph<StarterNodeType>( starter );
+    g.wait_for_all();
+
+    CHECK_MESSAGE( g_task_info.size() == 3, "" );
+    CHECK_MESSAGE( g_task_info[0].my_task_index == 0, "" );
+    CHECK_MESSAGE( g_task_info[1].my_task_index == 1, "" );
+    CHECK_MESSAGE( g_task_info[2].my_task_index == 2, "" );
+
+    CHECK_MESSAGE( g_task_info[0].my_priority == 0, "" );
+    CHECK_MESSAGE( g_task_info[1].my_priority == 2, "Bypassed task with higher priority executed in wrong order." );
+    CHECK_MESSAGE( g_task_info[2].my_priority == 1, "" );
+}
 
-    //! The test checks that the task from the node with higher priority, which task gets bypassed, is
-    //! executed first than the one spawned with lower priority.
-    void test() {
-        test_use_case<continue_node<continue_msg>>();
-        test_use_case<input_node<continue_msg>>();
-    }
+//! The test checks that the task from the node with higher priority, which task gets bypassed, is
+//! executed first than the one spawned with lower priority.
+void test() {
+    test_use_case<continue_node<continue_msg>>();
+    test_use_case<input_node<continue_msg>>();
+}
 
-}// namespace BypassPrioritizedTask
+} // namespace BypassPrioritizedTask
 
 namespace ManySuccessors {
 
-    struct no_priority_node_body {
-        void operator()(continue_msg) {
-            CHECK_MESSAGE(barrier == 0,
-                          "Non-priority successor has to be executed after all priority successors");
-        }
-        std::atomic<int>& barrier;
-    };
+struct no_priority_node_body {
+    void operator()(continue_msg) {
+        CHECK_MESSAGE(
+            barrier == 0, "Non-priority successor has to be executed after all priority successors"
+        );
+    }
+    std::atomic<int>& barrier;
+};
 
-    struct priority_node_body {
-        void operator()(continue_msg) {
-            --barrier;
-            while (barrier) tbb::detail::d0::yield();
-        }
-        std::atomic<int>& barrier;
-    };
+struct priority_node_body {
+    void operator()(continue_msg) {
+        --barrier;
+        while (barrier)
+            tbb::detail::d0::yield();
+    }
+    std::atomic<int>& barrier;
+};
 
-    void test(int num_threads) {
-        tbb::task_arena arena(num_threads);
-        arena.execute([&]() {
+void test(int num_threads) {
+    tbb::task_arena arena( num_threads );
+    arena.execute(
+        [&]() {
             graph g;
             broadcast_node<continue_msg> bn(g);
-            std::vector<std::unique_ptr<continue_node<continue_msg>>> nodes;
+            std::vector< std::unique_ptr<continue_node<continue_msg>> > nodes;
             std::atomic<int> barrier;
             for (int i = 0; i < 2 * num_threads; ++i)
-                nodes.push_back(std::unique_ptr<continue_node<continue_msg>>(
-                        new continue_node<continue_msg>(g, no_priority_node_body {barrier})));
+                nodes.push_back(
+                    std::unique_ptr<continue_node<continue_msg>>(
+                        new continue_node<continue_msg>(g, no_priority_node_body{ barrier })
+                    )
+                );
             for (int i = 0; i < num_threads; ++i)
-                nodes.push_back(std::unique_ptr<continue_node<continue_msg>>(
-                        new continue_node<continue_msg>(g, priority_node_body {barrier}, /*priority*/ 1)));
+                nodes.push_back(
+                    std::unique_ptr<continue_node<continue_msg>>(
+                        new continue_node<continue_msg>(g, priority_node_body{ barrier }, /*priority*/1)
+                    )
+                );
 
             std::random_device rd;
             std::mt19937 gen(rd());
@@ -745,15 +781,18 @@ namespace ManySuccessors {
             for (int trial = 0; trial < 10; ++trial) {
                 barrier = num_threads;
                 std::shuffle(nodes.begin(), nodes.end(), gen);
-                for (auto& n : nodes) make_edge(bn, *n);
+                for (auto& n : nodes)
+                    make_edge(bn, *n);
                 bn.try_put(continue_msg());
                 g.wait_for_all();
-                for (auto& n : nodes) remove_edge(bn, *n);
+                for (auto& n : nodes)
+                    remove_edge(bn, *n);
             }
-        });
-    }
+        }
+    );
+}
 
-}// namespace ManySuccessors
+} // namespace ManySuccessors
 
 #if TBB_USE_EXCEPTIONS
 namespace Exceptions {
@@ -764,50 +803,61 @@ namespace Exceptions {
         const unsigned num_messages = 50;
         std::vector<unsigned> throwing_msgs;
         std::atomic<unsigned> msg_count(0);
-        continue_node<unsigned> c(
-                g, [&msg_count](continue_msg) { return ++msg_count; }, 2);
-        function_node<unsigned> f(
-                g, unlimited,
-                [&throwing_msgs](unsigned v) {
-                    for (auto i : throwing_msgs) {
-                        if (i == v) throw std::runtime_error("Exception::test");
-                    }
-                },
-                1);
+        continue_node<unsigned> c(g, [&msg_count](continue_msg) {
+            return ++msg_count;
+        }, 2);
+        function_node<unsigned> f(g, unlimited, [&throwing_msgs](unsigned v) {
+            for( auto i : throwing_msgs ) {
+                if( i == v )
+                    throw std::runtime_error("Exception::test");
+            }
+        }, 1);
         make_edge(c, f);
         for (int i = 0; i < 10; ++i) {
             msg_count = 0;
             g.reset();
             throwing_msgs.push_back(std::rand() % num_messages);
             try {
-                for (unsigned j = 0; j < num_messages; ++j) { c.try_put(continue_msg()); }
+                for (unsigned j = 0; j < num_messages; ++j) {
+                    c.try_put(continue_msg());
+                }
                 g.wait_for_all();
                 FAIL("Unreachable code. The exception is expected");
             } catch (std::runtime_error&) {
                 CHECK(g.is_cancelled());
                 CHECK(g.exception_thrown());
-            } catch (...) { FAIL("Unexpected exception"); }
+            } catch (...) {
+                FAIL("Unexpected exception");
+            }
         }
     }
-}// namespace Exceptions
+} // namespace Exceptions
 #endif
 
 //! Test node prioritization
 //! \brief \ref requirement
-TEST_CASE("Priority nodes take precedence") {
-    for (auto p : utils::concurrency_range()) { PriorityNodesTakePrecedence::test(static_cast<int>(p)); }
+TEST_CASE("Priority nodes take precedence"){
+    for( auto p : utils::concurrency_range() ) {
+        PriorityNodesTakePrecedence::test( static_cast<int>(p) );
+    }
 }
 
+#if !EMSCRIPTEN
 //! Test thread eager reaction
 //! \brief \ref error_guessing
-TEST_CASE("Thread eager reaction") {
-    for (auto p : utils::concurrency_range()) { ThreadsEagerReaction::test(static_cast<int>(p)); }
+TEST_CASE("Thread eager reaction"){
+    for( auto p : utils::concurrency_range() ) {
+        ThreadsEagerReaction::test( static_cast<int>(p) );
+    }
 }
+#endif
 
 //! Test prioritization under concurrency limits
 //! \brief \ref error_guessing
 TEST_CASE("Limiting execution to prioritized work") {
-    for (auto p : utils::concurrency_range()) { LimitingExecutionToPriorityTask::test(static_cast<int>(p)); }
+    for( auto p : utils::concurrency_range() ) {
+        LimitingExecutionToPriorityTask::test( static_cast<int>(p) );
+    }
 }
 
 //! Test nested graphs
@@ -815,24 +865,29 @@ TEST_CASE("Limiting execution to prioritized work") {
 TEST_CASE("Nested test case") {
     std::size_t max_threads = utils::get_platform_max_threads();
     // The stepping for the threads is done inside.
-    NestedCase::test(static_cast<int>(max_threads));
+    NestedCase::test( static_cast<int>(max_threads) );
 }
 
 //! Test bypassed task with higher priority
 //! \brief \ref error_guessing
-TEST_CASE("Bypass prioritized task") {
-    tbb::global_control gc(tbb::global_control::max_allowed_parallelism, 1);
+TEST_CASE("Bypass prioritized task"){
+    tbb::global_control gc( tbb::global_control::max_allowed_parallelism, 1 );
     BypassPrioritizedTask::test();
 }
 
 //! Test mixing prioritized and ordinary successors
 //! \brief \ref error_guessing
 TEST_CASE("Many successors") {
-    for (auto p : utils::concurrency_range()) { ManySuccessors::test(static_cast<int>(p)); }
+    for( auto p : utils::concurrency_range() ) {
+        ManySuccessors::test( static_cast<int>(p) );
+    }
 }
 
 #if TBB_USE_EXCEPTIONS
 //! Test for exceptions
 //! \brief \ref error_guessing
-TEST_CASE("Exceptions") { Exceptions::test(); }
+TEST_CASE("Exceptions") {
+    Exceptions::test();
+}
 #endif
+
diff --git a/external/tbb/test/tbb/test_flow_graph_whitebox.cpp b/external/tbb/test/tbb/test_flow_graph_whitebox.cpp
index 4e925e52..88365d89 100644
--- a/external/tbb/test/tbb/test_flow_graph_whitebox.cpp
+++ b/external/tbb/test/tbb/test_flow_graph_whitebox.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -17,11 +17,11 @@
 #include "common/config.h"
 
 #if _MSC_VER
-#pragma warning(disable : 4503)// Suppress "decorated name length exceeded, name was truncated" warning
-#if _MSC_VER == 1700 && !defined(__INTEL_COMPILER)
-// Suppress "unreachable code" warning by VC++ 17.0 (VS 2012)
-#pragma warning(disable : 4702)
-#endif
+    #pragma warning (disable: 4503) // Suppress "decorated name length exceeded, name was truncated" warning
+    #if _MSC_VER==1700 && !defined(__INTEL_COMPILER)
+        // Suppress "unreachable code" warning by VC++ 17.0 (VS 2012)
+        #pragma warning (disable: 4702)
+    #endif
 #endif
 
 // need these to get proper external names for private methods in library.
@@ -36,113 +36,109 @@
 #undef protected
 #undef private
 
-#include "common/graph_utils.h"
-#include "common/spin_barrier.h"
 #include "common/test.h"
 #include "common/utils.h"
+#include "common/spin_barrier.h"
+#include "common/graph_utils.h"
 
-#include <string>// merely prevents LNK2001 error to happen (on ICL+VC9 configurations)
+#include <string> // merely prevents LNK2001 error to happen (on ICL+VC9 configurations)
 
 //! \file test_flow_graph_whitebox.cpp
 //! \brief Test for [flow_graph.broadcast_node flow_graph.priority_queue_node flow_graph.indexer_node flow_graph.sequencer_node flow_graph.remove_edge flow_graph.join_node flow_graph.split_node flow_graph.limiter_node flow_graph.write_once_node flow_graph.overwrite_node flow_graph.make_edge flow_graph.graph flow_graph.buffer_node flow_graph.function_node flow_graph.multifunction_node flow_graph.continue_node flow_graph.input_node] specification
 
-template <typename T>
+template<typename T>
 struct receiverBody {
-    tbb::flow::continue_msg operator()(const T& /*in*/) { return tbb::flow::continue_msg(); }
+    tbb::flow::continue_msg operator()(const T &/*in*/) {
+        return tbb::flow::continue_msg();
+    }
 };
 
 // split_nodes cannot have predecessors
 // they do not reject messages and always forward.
 // they reject edge reversals from successors.
 void TestSplitNode() {
-    typedef tbb::flow::split_node<std::tuple<int>> snode_type;
+    typedef tbb::flow::split_node<std::tuple<int> > snode_type;
     tbb::flow::graph g;
     snode_type snode(g);
-    tbb::flow::function_node<int> rcvr(g, tbb::flow::unlimited, receiverBody<int>());
+    tbb::flow::function_node<int> rcvr(g,tbb::flow::unlimited, receiverBody<int>());
     INFO("Testing split_node\n");
-    CHECK_MESSAGE((tbb::flow::output_port<0>(snode).my_successors.empty()),
-                  "Constructed split_node has successors");
+    CHECK_MESSAGE( (tbb::flow::output_port<0>(snode).my_successors.empty()), "Constructed split_node has successors");
     // tbb::flow::output_port<0>(snode)
     tbb::flow::make_edge(tbb::flow::output_port<0>(snode), rcvr);
-    CHECK_MESSAGE((!(tbb::flow::output_port<0>(snode).my_successors.empty())),
-                  "after make_edge, split_node has no successor.");
+    CHECK_MESSAGE( (!(tbb::flow::output_port<0>(snode).my_successors.empty())), "after make_edge, split_node has no successor.");
     snode.try_put(std::tuple<int>(1));
     g.wait_for_all();
     g.reset();
-    CHECK_MESSAGE((!(tbb::flow::output_port<0>(snode).my_successors.empty())),
-                  "after reset(), split_node has no successor.");
+    CHECK_MESSAGE( (!(tbb::flow::output_port<0>(snode).my_successors.empty())), "after reset(), split_node has no successor.");
     g.reset(tbb::flow::rf_clear_edges);
-    CHECK_MESSAGE((tbb::flow::output_port<0>(snode).my_successors.empty()),
-                  "after reset(rf_clear_edges), split_node has a successor.");
+    CHECK_MESSAGE( (tbb::flow::output_port<0>(snode).my_successors.empty()), "after reset(rf_clear_edges), split_node has a successor.");
 }
 
 // buffering nodes cannot have predecessors
 // they do not reject messages and always save or forward
 // they allow edge reversals from successors
-template <typename B>
-void TestBufferingNode(const char* name) {
+template< typename B >
+void TestBufferingNode(const char * name) {
     tbb::flow::graph g;
     B bnode(g);
-    tbb::flow::function_node<int, int, tbb::flow::rejecting> fnode(g, tbb::flow::serial,
-                                                                   serial_fn_body<int>(serial_fn_state0));
+    tbb::flow::function_node<int,int,tbb::flow::rejecting> fnode(g, tbb::flow::serial, serial_fn_body<int>(serial_fn_state0));
     INFO("Testing " << name << ":");
-    for (int icnt = 0; icnt < 2; icnt++) {
+    for(int icnt = 0; icnt < 2; icnt++) {
         bool reverse_edge = (icnt & 0x2) != 0;
-        serial_fn_state0 = 0;// reset to waiting state.
+        serial_fn_state0 = 0;  // reset to waiting state.
         INFO(" make_edge");
         tbb::flow::make_edge(bnode, fnode);
-        CHECK_MESSAGE((!bnode.my_successors.empty()), "buffering node has no successor after make_edge");
+        CHECK_MESSAGE( (!bnode.my_successors.empty()), "buffering node has no successor after make_edge");
         std::thread t([&] {
             INFO(" try_put");
-            bnode.try_put(1);// will forward to the fnode
+            bnode.try_put(1);  // will forward to the fnode
             g.wait_for_all();
         });
         utils::SpinWaitWhileEq(serial_fn_state0, 0);
-        if (reverse_edge) {
+        if(reverse_edge) {
             INFO(" try_put2");
-            bnode.try_put(2);// should reverse the edge
+            bnode.try_put(2);  // should reverse the edge
             // waiting for the edge to reverse
             utils::SpinWaitWhile([&] { return !bnode.my_successors.empty(); });
-        } else {
-            CHECK_MESSAGE((!bnode.my_successors.empty()),
-                          "buffering node has no successor after forwarding message");
         }
-        serial_fn_state0 = 0;// release the function_node.
-        if (reverse_edge) {
+        else {
+            CHECK_MESSAGE( (!bnode.my_successors.empty()), "buffering node has no successor after forwarding message");
+        }
+        serial_fn_state0 = 0;  // release the function_node.
+        if(reverse_edge) {
             // have to do a second release because the function_node will get the 2nd item
             utils::SpinWaitWhileEq(serial_fn_state0, 0);
-            serial_fn_state0 = 0;// release the function_node.
+            serial_fn_state0 = 0;  // release the function_node.
         }
         t.join();
         INFO(" remove_edge");
         tbb::flow::remove_edge(bnode, fnode);
-        CHECK_MESSAGE((bnode.my_successors.empty()), "buffering node has a successor after remove_edge");
+        CHECK_MESSAGE( (bnode.my_successors.empty()), "buffering node has a successor after remove_edge");
     }
-    tbb::flow::join_node<std::tuple<int, int>, tbb::flow::reserving> jnode(g);
-    tbb::flow::make_edge(bnode, tbb::flow::input_port<0>(jnode));// will spawn a task
+    tbb::flow::join_node<std::tuple<int,int>,tbb::flow::reserving> jnode(g);
+    tbb::flow::make_edge(bnode, tbb::flow::input_port<0>(jnode));  // will spawn a task
     g.wait_for_all();
-    CHECK_MESSAGE((!bnode.my_successors.empty()), "buffering node has no successor after attaching to join");
+    CHECK_MESSAGE( (!bnode.my_successors.empty()), "buffering node has no successor after attaching to join");
     INFO(" reverse");
-    bnode.try_put(1);// the edge should reverse
+    bnode.try_put(1);  // the edge should reverse
     g.wait_for_all();
-    CHECK_MESSAGE((bnode.my_successors.empty()), "buffering node has a successor after reserving");
+    CHECK_MESSAGE( (bnode.my_successors.empty()), "buffering node has a successor after reserving");
     INFO(" reset()");
     g.wait_for_all();
-    g.reset();// should be in forward direction again
-    CHECK_MESSAGE((!bnode.my_successors.empty()), "buffering node has no successor after reset()");
+    g.reset();  // should be in forward direction again
+    CHECK_MESSAGE( (!bnode.my_successors.empty()), "buffering node has no successor after reset()");
     INFO(" remove_edge");
     g.reset(tbb::flow::rf_clear_edges);
-    CHECK_MESSAGE((bnode.my_successors.empty()),
-                  "buffering node has a successor after reset(rf_clear_edges)");
-    tbb::flow::make_edge(bnode, tbb::flow::input_port<0>(jnode));// add edge again
+    CHECK_MESSAGE( (bnode.my_successors.empty()), "buffering node has a successor after reset(rf_clear_edges)");
+    tbb::flow::make_edge(bnode, tbb::flow::input_port<0>(jnode));  // add edge again
     // reverse edge by adding to buffer.
-    bnode.try_put(1);// the edge should reverse
+    bnode.try_put(1);  // the edge should reverse
     g.wait_for_all();
-    CHECK_MESSAGE((bnode.my_successors.empty()), "buffering node has a successor after reserving");
+    CHECK_MESSAGE( (bnode.my_successors.empty()), "buffering node has a successor after reserving");
     INFO(" remove_edge(reversed)");
     g.reset(tbb::flow::rf_clear_edges);
-    CHECK_MESSAGE((bnode.my_successors.empty()), "buffering node has no successor after reset()");
-    CHECK_MESSAGE((tbb::flow::input_port<0>(jnode).my_predecessors.empty()), "predecessor not reset");
+    CHECK_MESSAGE( (bnode.my_successors.empty()), "buffering node has no successor after reset()");
+    CHECK_MESSAGE( (tbb::flow::input_port<0>(jnode).my_predecessors.empty()), "predecessor not reset");
     INFO("  done\n");
     g.wait_for_all();
 }
@@ -159,83 +155,76 @@ void TestContinueNode() {
     tbb::flow::make_edge(fnode0, cnode);
     tbb::flow::make_edge(cnode, fnode1);
     INFO("Testing continue_node:");
-    for (int icnt = 0; icnt < 2; ++icnt) {
-        INFO(" initial" << icnt);
-        CHECK_MESSAGE((cnode.my_predecessor_count == 2), "predecessor addition didn't increment count");
-        CHECK_MESSAGE((!cnode.successors().empty()), "successors empty though we added one");
-        CHECK_MESSAGE((cnode.my_current_count == 0), "state of continue_receiver incorrect");
+    for( int icnt = 0; icnt < 2; ++icnt ) {
+        INFO( " initial" << icnt);
+        CHECK_MESSAGE( (cnode.my_predecessor_count == 2), "predecessor addition didn't increment count");
+        CHECK_MESSAGE( (!cnode.successors().empty()), "successors empty though we added one");
+        CHECK_MESSAGE( (cnode.my_current_count == 0), "state of continue_receiver incorrect");
         serial_continue_state0 = 0;
         serial_fn_state0 = 0;
         serial_fn_state1 = 0;
 
         std::thread t([&] {
-            fnode0.try_put(1);// start the first function node.
-            if (icnt == 0) {  // first time through, let the continue_node fire
+            fnode0.try_put(1);  // start the first function node.
+            if(icnt == 0) {  // first time through, let the continue_node fire
                 INFO(" firing");
-                fnode0.try_put(1);// second message
+                fnode0.try_put(1);  // second message
                 g.wait_for_all();
 
                 // try a try_get()
                 {
                     int i;
-                    CHECK_MESSAGE((!cnode.try_get(i)), "try_get not rejected");
+                    CHECK_MESSAGE( (!cnode.try_get(i)), "try_get not rejected");
                 }
 
                 INFO(" reset");
-                CHECK_MESSAGE((!cnode.my_successors.empty()),
-                              "Empty successors in built graph (before reset)");
-                CHECK_MESSAGE((cnode.my_predecessor_count == 2), "predecessor_count reset (before reset)");
-                g.reset();// should still be the same
-                CHECK_MESSAGE((!cnode.my_successors.empty()),
-                              "Empty successors in built graph (after reset)");
-                CHECK_MESSAGE((cnode.my_predecessor_count == 2), "predecessor_count reset (after reset)");
-            } else {// we're going to see if the rf_clear_edges resets things.
+                CHECK_MESSAGE( (!cnode.my_successors.empty()), "Empty successors in built graph (before reset)");
+                CHECK_MESSAGE( (cnode.my_predecessor_count == 2), "predecessor_count reset (before reset)");
+                g.reset();  // should still be the same
+                CHECK_MESSAGE( (!cnode.my_successors.empty()), "Empty successors in built graph (after reset)" );
+                CHECK_MESSAGE( (cnode.my_predecessor_count == 2), "predecessor_count reset (after reset)");
+            }
+            else {  // we're going to see if the rf_clear_edges resets things.
                 g.wait_for_all();
                 INFO(" reset(rf_clear_edges)");
-                CHECK_MESSAGE((!cnode.my_successors.empty()),
-                              "Empty successors in built graph (before reset)");
-                CHECK_MESSAGE((cnode.my_predecessor_count == 2), "predecessor_count reset (before reset)");
-                g.reset(tbb::flow::rf_clear_edges);// should be in forward direction again
-                CHECK_MESSAGE((cnode.my_current_count == 0),
-                              "state of continue_receiver incorrect after reset(rf_clear_edges)");
-                CHECK_MESSAGE((cnode.my_successors.empty()),
-                              "buffering node has a successor after reset(rf_clear_edges)");
-                CHECK_MESSAGE((cnode.my_predecessor_count == cnode.my_initial_predecessor_count),
-                              "predecessor count not reset");
+                CHECK_MESSAGE( (!cnode.my_successors.empty()), "Empty successors in built graph (before reset)" );
+                CHECK_MESSAGE( (cnode.my_predecessor_count == 2), "predecessor_count reset (before reset)" );
+                g.reset(tbb::flow::rf_clear_edges);  // should be in forward direction again
+                CHECK_MESSAGE( (cnode.my_current_count == 0), "state of continue_receiver incorrect after reset(rf_clear_edges)" );
+                CHECK_MESSAGE( (cnode.my_successors.empty()), "buffering node has a successor after reset(rf_clear_edges)" );
+                CHECK_MESSAGE( (cnode.my_predecessor_count == cnode.my_initial_predecessor_count), "predecessor count not reset" );
             }
         });
 
-        utils::SpinWaitWhileEq(serial_fn_state0,
-                               0);// waiting for the first message to arrive in function_node
+        utils::SpinWaitWhileEq(serial_fn_state0, 0); // waiting for the first message to arrive in function_node
         // Now the body of function_node 0 is executing.
-        serial_fn_state0 = 0;// release the node
+        serial_fn_state0 = 0;  // release the node
         if (icnt == 0) {
             // wait for node to count the message (or for the node body to execute, which would be wrong)
             utils::SpinWaitWhile([&] {
                 tbb::spin_mutex::scoped_lock l(cnode.my_mutex);
                 return serial_continue_state0 == 0 && cnode.my_current_count == 0;
             });
-            CHECK_MESSAGE((serial_continue_state0 == 0), "Improperly released continue_node");
-            CHECK_MESSAGE((cnode.my_current_count == 1), "state of continue_receiver incorrect");
+            CHECK_MESSAGE( (serial_continue_state0 == 0), "Improperly released continue_node");
+            CHECK_MESSAGE( (cnode.my_current_count == 1), "state of continue_receiver incorrect");
 
-            utils::SpinWaitWhileEq(serial_fn_state0,
-                                   0);// waiting for the second message to arrive in function_node
+            utils::SpinWaitWhileEq(serial_fn_state0, 0); // waiting for the second message to arrive in function_node
             // Now the body of function_node 0 is executing.
-            serial_fn_state0 = 0;// release the node
+            serial_fn_state0 = 0;  // release the node
 
-            utils::SpinWaitWhileEq(serial_continue_state0, 0);// waiting for continue_node to start
-            CHECK_MESSAGE((cnode.my_current_count == 0),
-                          " my_current_count not reset before body of continue_node started");
-            serial_continue_state0 = 0;// release the continue_node
+            utils::SpinWaitWhileEq(serial_continue_state0, 0); // waiting for continue_node to start
+            CHECK_MESSAGE( (cnode.my_current_count == 0), " my_current_count not reset before body of continue_node started");
+            serial_continue_state0 = 0;  // release the continue_node
 
-            utils::SpinWaitWhileEq(serial_fn_state1, 0);// wait for the successor function_node to enter body
-            serial_fn_state1 = 0;                       // release successor function_node.
+            utils::SpinWaitWhileEq(serial_fn_state1, 0); // wait for the successor function_node to enter body
+            serial_fn_state1 = 0;  // release successor function_node.
         }
 
         t.join();
     }
 
     INFO(" done\n");
+
 }
 
 // function_node has predecessors and successors
@@ -245,61 +234,59 @@ void TestContinueNode() {
 void TestFunctionNode() {
     tbb::flow::graph g;
     tbb::flow::queue_node<int> qnode0(g);
-    tbb::flow::function_node<int, int, tbb::flow::rejecting> fnode0(g, tbb::flow::serial,
-                                                                    serial_fn_body<int>(serial_fn_state0));
-    tbb::flow::function_node<int, int /*, tbb::flow::queueing*/> fnode1(
-            g, tbb::flow::serial, serial_fn_body<int>(serial_fn_state0));
+    tbb::flow::function_node<int,int,   tbb::flow::rejecting > fnode0(g, tbb::flow::serial, serial_fn_body<int>(serial_fn_state0));
+    tbb::flow::function_node<int,int/*, tbb::flow::queueing*/> fnode1(g, tbb::flow::serial, serial_fn_body<int>(serial_fn_state0));
 
     tbb::flow::queue_node<int> qnode1(g);
 
     tbb::flow::make_edge(fnode0, qnode1);
     tbb::flow::make_edge(qnode0, fnode0);
 
-    serial_fn_state0 = 2;// just let it go
+    serial_fn_state0 = 2;  // just let it go
     qnode0.try_put(1);
     g.wait_for_all();
     int ii;
-    CHECK_MESSAGE((qnode1.try_get(ii) && ii == 1), "output not passed");
+    CHECK_MESSAGE( (qnode1.try_get(ii) && ii == 1), "output not passed" );
     tbb::flow::remove_edge(qnode0, fnode0);
     tbb::flow::remove_edge(fnode0, qnode1);
 
     tbb::flow::make_edge(fnode1, qnode1);
     tbb::flow::make_edge(qnode0, fnode1);
 
-    serial_fn_state0 = 2;// just let it go
+    serial_fn_state0 = 2;  // just let it go
     qnode0.try_put(1);
     g.wait_for_all();
-    CHECK_MESSAGE((qnode1.try_get(ii) && ii == 1), "output not passed");
+    CHECK_MESSAGE( (qnode1.try_get(ii) && ii == 1), "output not passed" );
     tbb::flow::remove_edge(qnode0, fnode1);
     tbb::flow::remove_edge(fnode1, qnode1);
 
     // rejecting
     serial_fn_state0 = 0;
-    std::atomic<bool> rejected {false};
+    std::atomic<bool> rejected{ false };
     std::thread t([&] {
-        g.reset();// attach to the current arena
+        g.reset(); // attach to the current arena
         tbb::flow::make_edge(fnode0, qnode1);
-        tbb::flow::make_edge(qnode0, fnode0);// TODO: invesigate why it always creates a forwarding task
+        tbb::flow::make_edge(qnode0, fnode0); // TODO: invesigate why it always creates a forwarding task
         INFO("Testing rejecting function_node:");
-        CHECK_MESSAGE((!fnode0.my_queue), "node should have no queue");
-        CHECK_MESSAGE((!fnode0.my_successors.empty()), "successor edge not added");
+        CHECK_MESSAGE( (!fnode0.my_queue), "node should have no queue");
+        CHECK_MESSAGE( (!fnode0.my_successors.empty()), "successor edge not added");
         qnode0.try_put(1);
-        qnode0.try_put(2);// rejecting node should reject, reverse.
+        qnode0.try_put(2);   // rejecting node should reject, reverse.
         rejected = true;
         g.wait_for_all();
     });
-    utils::SpinWaitWhileEq(serial_fn_state0, 0);// waiting rejecting node to start
+    utils::SpinWaitWhileEq(serial_fn_state0, 0); // waiting rejecting node to start
     utils::SpinWaitWhileEq(rejected, false);
     // TODO: the assest below is not stable due to the logical race between try_put(1)
     // try_put(2) and wait_for_all.
     // Additionally, empty() cannot be called concurrently due to null_mutex used in implementation
     // CHECK(fnode0.my_predecessors.empty() == false);
-    serial_fn_state0 = 2;// release function_node body.
+    serial_fn_state0 = 2;   // release function_node body.
     t.join();
     INFO(" reset");
-    g.reset();// should reverse the edge from the input to the function node.
-    CHECK_MESSAGE((!qnode0.my_successors.empty()), "empty successors after reset()");
-    CHECK_MESSAGE((fnode0.my_predecessors.empty()), "predecessor not reversed");
+    g.reset();  // should reverse the edge from the input to the function node.
+    CHECK_MESSAGE( (!qnode0.my_successors.empty()), "empty successors after reset()");
+    CHECK_MESSAGE( (fnode0.my_predecessors.empty()), "predecessor not reversed");
     tbb::flow::remove_edge(qnode0, fnode0);
     tbb::flow::remove_edge(fnode0, qnode1);
     INFO("\n");
@@ -307,36 +294,36 @@ void TestFunctionNode() {
     // queueing
     tbb::flow::make_edge(fnode1, qnode1);
     INFO("Testing queueing function_node:");
-    CHECK_MESSAGE((fnode1.my_queue), "node should have no queue");
-    CHECK_MESSAGE((!fnode1.my_successors.empty()), "successor edge not added");
+    CHECK_MESSAGE( (fnode1.my_queue), "node should have no queue");
+    CHECK_MESSAGE( (!fnode1.my_successors.empty()), "successor edge not added");
     INFO(" add_pred");
-    CHECK_MESSAGE((fnode1.register_predecessor(qnode0)), "Cannot register as predecessor");
-    CHECK_MESSAGE((!fnode1.my_predecessors.empty()), "Missing predecessor");
+    CHECK_MESSAGE( (fnode1.register_predecessor(qnode0)), "Cannot register as predecessor");
+    CHECK_MESSAGE( (!fnode1.my_predecessors.empty()), "Missing predecessor");
     INFO(" reset");
     g.wait_for_all();
-    g.reset();// should reverse the edge from the input to the function node.
-    CHECK_MESSAGE((!qnode0.my_successors.empty()), "empty successors after reset()");
-    CHECK_MESSAGE((fnode1.my_predecessors.empty()), "predecessor not reversed");
+    g.reset();  // should reverse the edge from the input to the function node.
+    CHECK_MESSAGE( (!qnode0.my_successors.empty()), "empty successors after reset()");
+    CHECK_MESSAGE( (fnode1.my_predecessors.empty()), "predecessor not reversed");
     tbb::flow::remove_edge(qnode0, fnode1);
     tbb::flow::remove_edge(fnode1, qnode1);
     INFO("\n");
 
-    serial_fn_state0 = 0;// make the function_node wait
+    serial_fn_state0 = 0;  // make the function_node wait
     rejected = false;
     std::thread t2([&] {
-        g.reset();// attach to the current arena
+        g.reset(); // attach to the current arena
 
-        tbb::flow::make_edge(qnode0, fnode0);// TODO: invesigate why it always creates a forwarding task
+        tbb::flow::make_edge(qnode0, fnode0); // TODO: invesigate why it always creates a forwarding task
 
         INFO(" start_func");
         qnode0.try_put(1);
         // now if we put an item to the queues the edges to the function_node will reverse.
         INFO(" put_node(2)");
-        qnode0.try_put(2);// start queue node.
+        qnode0.try_put(2);   // start queue node.
         rejected = true;
         g.wait_for_all();
     });
-    utils::SpinWaitWhileEq(serial_fn_state0, 0);// waiting rejecting node to start
+    utils::SpinWaitWhileEq(serial_fn_state0, 0); // waiting rejecting node to start
     // wait for the edges to reverse
     utils::SpinWaitWhileEq(rejected, false);
     // TODO: the assest below is not stable due to the logical race between try_put(1)
@@ -348,59 +335,63 @@ void TestFunctionNode() {
     serial_fn_state0 = 2;
     t2.join();
     g.reset(tbb::flow::rf_clear_edges);
-    CHECK_MESSAGE((fnode0.my_predecessors.empty() && qnode0.my_successors.empty()),
-                  "function_node edge not removed");
-    CHECK_MESSAGE((fnode0.my_successors.empty()), "successor to fnode not removed");
+    CHECK_MESSAGE( (fnode0.my_predecessors.empty() && qnode0.my_successors.empty()), "function_node edge not removed");
+    CHECK_MESSAGE( (fnode0.my_successors.empty()), "successor to fnode not removed");
     INFO(" done\n");
 }
 
-template <typename TT>
+template<typename TT>
 class tag_func {
     TT my_mult;
-
 public:
-    tag_func(TT multiplier) : my_mult(multiplier) {}
+    tag_func(TT multiplier) : my_mult(multiplier) { }
     // operator() will return [0 .. Count)
-    tbb::flow::tag_value operator()(TT v) {
+    tbb::flow::tag_value operator()( TT v) {
         tbb::flow::tag_value t = tbb::flow::tag_value(v / my_mult);
         return t;
     }
 };
 
-template <typename JNODE_TYPE>
-void TestSimpleSuccessorArc(const char* name) {
+template<typename JNODE_TYPE>
+void
+TestSimpleSuccessorArc(const char *name) {
     tbb::flow::graph g;
     {
         INFO("Join<" << name << "> successor test ");
         tbb::flow::join_node<std::tuple<int>, JNODE_TYPE> qj(g);
-        tbb::flow::broadcast_node<std::tuple<int>> bnode(g);
+        tbb::flow::broadcast_node<std::tuple<int> > bnode(g);
         tbb::flow::make_edge(qj, bnode);
-        CHECK_MESSAGE((!qj.my_successors.empty()), "successor missing after linking");
+        CHECK_MESSAGE( (!qj.my_successors.empty()),"successor missing after linking");
         g.reset();
-        CHECK_MESSAGE((!qj.my_successors.empty()), "successor missing after reset()");
+        CHECK_MESSAGE( (!qj.my_successors.empty()),"successor missing after reset()");
         g.reset(tbb::flow::rf_clear_edges);
-        CHECK_MESSAGE((qj.my_successors.empty()), "successors not removed after reset(rf_clear_edges)");
+        CHECK_MESSAGE( (qj.my_successors.empty()), "successors not removed after reset(rf_clear_edges)");
     }
 }
 
-template <>
-void TestSimpleSuccessorArc<tbb::flow::tag_matching>(const char* name) {
+template<>
+void
+TestSimpleSuccessorArc<tbb::flow::tag_matching>(const char *name) {
     tbb::flow::graph g;
     {
         INFO("Join<" << name << "> successor test ");
-        typedef std::tuple<int, int> my_tuple;
-        tbb::flow::join_node<my_tuple, tbb::flow::tag_matching> qj(g, tag_func<int>(1), tag_func<int>(1));
-        tbb::flow::broadcast_node<my_tuple> bnode(g);
+        typedef std::tuple<int,int> my_tuple;
+        tbb::flow::join_node<my_tuple, tbb::flow::tag_matching> qj(g,
+                                                                   tag_func<int>(1),
+                                                                   tag_func<int>(1)
+        );
+        tbb::flow::broadcast_node<my_tuple > bnode(g);
         tbb::flow::make_edge(qj, bnode);
-        CHECK_MESSAGE((!qj.my_successors.empty()), "successor missing after linking");
+        CHECK_MESSAGE( (!qj.my_successors.empty()),"successor missing after linking");
         g.reset();
-        CHECK_MESSAGE((!qj.my_successors.empty()), "successor missing after reset()");
+        CHECK_MESSAGE( (!qj.my_successors.empty()),"successor missing after reset()");
         g.reset(tbb::flow::rf_clear_edges);
-        CHECK_MESSAGE((qj.my_successors.empty()), "successors not removed after reset(rf_clear_edges)");
+        CHECK_MESSAGE( (qj.my_successors.empty()), "successors not removed after reset(rf_clear_edges)");
     }
 }
 
-void TestJoinNode() {
+void
+TestJoinNode() {
     tbb::flow::graph g;
 
     TestSimpleSuccessorArc<tbb::flow::queueing>("queueing");
@@ -410,44 +401,35 @@ void TestJoinNode() {
     // queueing and tagging join nodes have input queues, so the input ports do not reverse.
     INFO(" reserving preds");
     {
-        tbb::flow::join_node<std::tuple<int, int>, tbb::flow::reserving> rj(g);
+        tbb::flow::join_node<std::tuple<int,int>, tbb::flow::reserving> rj(g);
         tbb::flow::queue_node<int> q0(g);
         tbb::flow::queue_node<int> q1(g);
-        tbb::flow::make_edge(q0, tbb::flow::input_port<0>(rj));
-        tbb::flow::make_edge(q1, tbb::flow::input_port<1>(rj));
+        tbb::flow::make_edge(q0,tbb::flow::input_port<0>(rj));
+        tbb::flow::make_edge(q1,tbb::flow::input_port<1>(rj));
         q0.try_put(1);
-        g.wait_for_all();// quiesce
-        CHECK_MESSAGE((!(tbb::flow::input_port<0>(rj).my_predecessors.empty())),
-                      "reversed port missing predecessor");
-        CHECK_MESSAGE(((tbb::flow::input_port<1>(rj).my_predecessors.empty())), "non-reversed port has pred");
+        g.wait_for_all();  // quiesce
+        CHECK_MESSAGE( (!(tbb::flow::input_port<0>(rj).my_predecessors.empty())),"reversed port missing predecessor");
+        CHECK_MESSAGE( ((tbb::flow::input_port<1>(rj).my_predecessors.empty())),"non-reversed port has pred");
         g.reset();
-        CHECK_MESSAGE(((tbb::flow::input_port<0>(rj).my_predecessors.empty())),
-                      "reversed port has pred after reset()");
-        CHECK_MESSAGE(((tbb::flow::input_port<1>(rj).my_predecessors.empty())),
-                      "non-reversed port has pred after reset()");
+        CHECK_MESSAGE( ((tbb::flow::input_port<0>(rj).my_predecessors.empty())),"reversed port has pred after reset()");
+        CHECK_MESSAGE( ((tbb::flow::input_port<1>(rj).my_predecessors.empty())),"non-reversed port has pred after reset()");
         q1.try_put(2);
-        g.wait_for_all();// quiesce
-        CHECK_MESSAGE((!(tbb::flow::input_port<1>(rj).my_predecessors.empty())),
-                      "reversed port missing predecessor");
-        CHECK_MESSAGE(((tbb::flow::input_port<0>(rj).my_predecessors.empty())), "non-reversed port has pred");
+        g.wait_for_all();  // quiesce
+        CHECK_MESSAGE( (!(tbb::flow::input_port<1>(rj).my_predecessors.empty())),"reversed port missing predecessor");
+        CHECK_MESSAGE( ((tbb::flow::input_port<0>(rj).my_predecessors.empty())),"non-reversed port has pred");
         g.reset();
-        CHECK_MESSAGE(((tbb::flow::input_port<1>(rj).my_predecessors.empty())),
-                      "reversed port has pred after reset()");
-        CHECK_MESSAGE(((tbb::flow::input_port<0>(rj).my_predecessors.empty())),
-                      "non-reversed port has pred after reset()");
+        CHECK_MESSAGE( ((tbb::flow::input_port<1>(rj).my_predecessors.empty())),"reversed port has pred after reset()");
+        CHECK_MESSAGE( ((tbb::flow::input_port<0>(rj).my_predecessors.empty())),"non-reversed port has pred after reset()");
         // should reset predecessors just as regular reset.
         q1.try_put(3);
-        g.wait_for_all();// quiesce
-        CHECK_MESSAGE((!(tbb::flow::input_port<1>(rj).my_predecessors.empty())),
-                      "reversed port missing predecessor");
-        CHECK_MESSAGE(((tbb::flow::input_port<0>(rj).my_predecessors.empty())), "non-reversed port has pred");
+        g.wait_for_all();  // quiesce
+        CHECK_MESSAGE( (!(tbb::flow::input_port<1>(rj).my_predecessors.empty())),"reversed port missing predecessor");
+        CHECK_MESSAGE( ((tbb::flow::input_port<0>(rj).my_predecessors.empty())),"non-reversed port has pred");
         g.reset(tbb::flow::rf_clear_edges);
-        CHECK_MESSAGE(((tbb::flow::input_port<1>(rj).my_predecessors.empty())),
-                      "reversed port has pred after reset()");
-        CHECK_MESSAGE(((tbb::flow::input_port<0>(rj).my_predecessors.empty())),
-                      "non-reversed port has pred after reset()");
-        CHECK_MESSAGE((q0.my_successors.empty()), "edge not removed by reset(rf_clear_edges)");
-        CHECK_MESSAGE((q1.my_successors.empty()), "edge not removed by reset(rf_clear_edges)");
+        CHECK_MESSAGE( ((tbb::flow::input_port<1>(rj).my_predecessors.empty())),"reversed port has pred after reset()");
+        CHECK_MESSAGE( ((tbb::flow::input_port<0>(rj).my_predecessors.empty())),"non-reversed port has pred after reset()");
+        CHECK_MESSAGE( (q0.my_successors.empty()), "edge not removed by reset(rf_clear_edges)");
+        CHECK_MESSAGE( (q1.my_successors.empty()), "edge not removed by reset(rf_clear_edges)");
     }
     INFO(" done\n");
 }
@@ -468,136 +450,141 @@ template <typename DType>
 struct DecrementerHelper {
     template <typename Decrementer>
     static void check(Decrementer&) {}
-    static DType makeDType() { return DType(1); }
+    static DType makeDType() {
+        return DType(1);
+    }
 };
 
 template <>
 struct DecrementerHelper<tbb::flow::continue_msg> {
     template <typename Decrementer>
     static void check(Decrementer& decrementer) {
-        auto& d = static_cast<tbb::detail::d1::continue_receiver&>(decrementer);
+        auto& d = static_cast<tbb::detail::d2::continue_receiver&>(decrementer);
         CHECK_MESSAGE(d.my_predecessor_count == 0, "error in pred count");
         CHECK_MESSAGE(d.my_initial_predecessor_count == 0, "error in initial pred count");
         CHECK_MESSAGE(d.my_current_count == 0, "error in current count");
     }
-    static tbb::flow::continue_msg makeDType() { return tbb::flow::continue_msg(); }
+    static tbb::flow::continue_msg makeDType() {
+        return tbb::flow::continue_msg();
+    }
 };
 
 template <typename DecrementerType>
 void TestLimiterNode() {
-    int out_int {};
+    int out_int{};
     tbb::flow::graph g;
     using dtype = typename limiter_node_type<DecrementerType>::dtype;
-    typename limiter_node_type<DecrementerType>::type ln(g, 1);
+    typename limiter_node_type<DecrementerType>::type ln(g,1);
     INFO("Testing limiter_node: preds and succs");
     DecrementerHelper<dtype>::check(ln.decrementer());
-    CHECK_MESSAGE((ln.my_threshold == 1), "error in my_threshold");
+    CHECK_MESSAGE( (ln.my_threshold == 1), "error in my_threshold");
     tbb::flow::queue_node<int> inq(g);
     tbb::flow::queue_node<int> outq(g);
     tbb::flow::broadcast_node<dtype> bn(g);
 
-    tbb::flow::make_edge(inq, ln);
-    tbb::flow::make_edge(ln, outq);
-    tbb::flow::make_edge(bn, ln.decrementer());
+    tbb::flow::make_edge(inq,ln);
+    tbb::flow::make_edge(ln,outq);
+    tbb::flow::make_edge(bn,ln.decrementer());
 
     g.wait_for_all();
-    CHECK_MESSAGE((!(ln.my_successors.empty())), "successors empty after make_edge");
-    CHECK_MESSAGE((ln.my_predecessors.empty()), "input edge reversed");
+    CHECK_MESSAGE( (!(ln.my_successors.empty())),"successors empty after make_edge");
+    CHECK_MESSAGE( (ln.my_predecessors.empty()), "input edge reversed");
     inq.try_put(1);
     g.wait_for_all();
-    CHECK_MESSAGE((outq.try_get(out_int) && out_int == 1), "limiter_node didn't pass first value");
-    CHECK_MESSAGE((ln.my_predecessors.empty()), "input edge reversed");
+    CHECK_MESSAGE( (outq.try_get(out_int) && out_int == 1), "limiter_node didn't pass first value");
+    CHECK_MESSAGE( (ln.my_predecessors.empty()), "input edge reversed");
     inq.try_put(2);
     g.wait_for_all();
-    CHECK_MESSAGE((!outq.try_get(out_int)), "limiter_node incorrectly passed second input");
-    CHECK_MESSAGE((!ln.my_predecessors.empty()), "input edge to limiter_node not reversed");
+    CHECK_MESSAGE( (!outq.try_get(out_int)), "limiter_node incorrectly passed second input");
+    CHECK_MESSAGE( (!ln.my_predecessors.empty()), "input edge to limiter_node not reversed");
     bn.try_put(DecrementerHelper<dtype>::makeDType());
     g.wait_for_all();
-    CHECK_MESSAGE((outq.try_get(out_int) && out_int == 2), "limiter_node didn't pass second value");
+    CHECK_MESSAGE( (outq.try_get(out_int) && out_int == 2), "limiter_node didn't pass second value");
     g.wait_for_all();
-    CHECK_MESSAGE((!ln.my_predecessors.empty()), "input edge was reversed(after try_get())");
+    CHECK_MESSAGE( (!ln.my_predecessors.empty()), "input edge was reversed(after try_get())");
     g.reset();
-    CHECK_MESSAGE((ln.my_predecessors.empty()), "input edge not reset");
+    CHECK_MESSAGE( (ln.my_predecessors.empty()), "input edge not reset");
     inq.try_put(3);
     g.wait_for_all();
-    CHECK_MESSAGE((outq.try_get(out_int) && out_int == 3), "limiter_node didn't pass third value");
+    CHECK_MESSAGE( (outq.try_get(out_int) && out_int == 3), "limiter_node didn't pass third value");
 
     INFO(" rf_clear_edges");
     // currently the limiter_node will not pass another message
     g.reset(tbb::flow::rf_clear_edges);
     DecrementerHelper<dtype>::check(ln.decrementer());
-    CHECK_MESSAGE((ln.my_threshold == 1), "error in my_threshold");
-    CHECK_MESSAGE((ln.my_predecessors.empty()), "preds not reset(rf_clear_edges)");
-    CHECK_MESSAGE((ln.my_successors.empty()), "preds not reset(rf_clear_edges)");
-    CHECK_MESSAGE((inq.my_successors.empty()), "Arc not removed on reset(rf_clear_edges)");
-    CHECK_MESSAGE((inq.my_successors.empty()), "Arc not removed on reset(rf_clear_edges)");
-    CHECK_MESSAGE((bn.my_successors.empty()), "control edge not removed on reset(rf_clear_edges)");
-    tbb::flow::make_edge(inq, ln);
-    tbb::flow::make_edge(ln, outq);
+    CHECK_MESSAGE( (ln.my_threshold == 1), "error in my_threshold");
+    CHECK_MESSAGE( (ln.my_predecessors.empty()), "preds not reset(rf_clear_edges)");
+    CHECK_MESSAGE( (ln.my_successors.empty()), "preds not reset(rf_clear_edges)");
+    CHECK_MESSAGE( (inq.my_successors.empty()), "Arc not removed on reset(rf_clear_edges)");
+    CHECK_MESSAGE( (inq.my_successors.empty()), "Arc not removed on reset(rf_clear_edges)");
+    CHECK_MESSAGE( (bn.my_successors.empty()), "control edge not removed on reset(rf_clear_edges)");
+    tbb::flow::make_edge(inq,ln);
+    tbb::flow::make_edge(ln,outq);
     inq.try_put(4);
     inq.try_put(5);
     g.wait_for_all();
-    CHECK_MESSAGE((outq.try_get(out_int)), "missing output after reset(rf_clear_edges)");
-    CHECK_MESSAGE((out_int == 4), "input incorrect (4)");
+    CHECK_MESSAGE( (outq.try_get(out_int)),"missing output after reset(rf_clear_edges)");
+    CHECK_MESSAGE( (out_int == 4), "input incorrect (4)");
     bn.try_put(DecrementerHelper<dtype>::makeDType());
     g.wait_for_all();
-    CHECK_MESSAGE((!outq.try_get(out_int)), "second output incorrectly passed (rf_clear_edges)");
+    CHECK_MESSAGE( (!outq.try_get(out_int)),"second output incorrectly passed (rf_clear_edges)");
     INFO(" done\n");
 }
 
-template <typename MF_TYPE>
+template<typename MF_TYPE>
 struct mf_body {
     std::atomic<int>& my_flag;
-    mf_body(std::atomic<int>& flag) : my_flag(flag) {}
+    mf_body(std::atomic<int>& flag) : my_flag(flag) { }
     void operator()(const int& in, typename MF_TYPE::output_ports_type& outports) {
-        if (my_flag == 0) {
+        if(my_flag == 0) {
             my_flag = 1;
 
             utils::SpinWaitWhileEq(my_flag, 1);
         }
 
-        if (in & 0x1) std::get<1>(outports).try_put(in);
+        if (in & 0x1)
+            std::get<1>(outports).try_put(in);
         else
             std::get<0>(outports).try_put(in);
     }
 };
 
-template <typename P, typename T>
+template<typename P, typename T>
 struct test_reversal;
-template <typename T>
+template<typename T>
 struct test_reversal<tbb::flow::queueing, T> {
     test_reversal() { INFO("<queueing>"); }
     // queueing node will not reverse.
     bool operator()(T& node) const { return node.my_predecessors.empty(); }
 };
 
-template <typename T>
+template<typename T>
 struct test_reversal<tbb::flow::rejecting, T> {
     test_reversal() { INFO("<rejecting>"); }
     bool operator()(T& node) const { return !node.my_predecessors.empty(); }
 };
 
-template <typename P>
+template<typename P>
 void TestMultifunctionNode() {
     typedef tbb::flow::multifunction_node<int, std::tuple<int, int>, P> multinode_type;
     INFO("Testing multifunction_node");
-    test_reversal<P, multinode_type> my_test;
+    test_reversal<P,multinode_type> my_test;
     INFO(":");
     tbb::flow::graph g;
     multinode_type mf(g, tbb::flow::serial, mf_body<multinode_type>(serial_fn_state0));
     tbb::flow::queue_node<int> qin(g);
     tbb::flow::queue_node<int> qodd_out(g);
     tbb::flow::queue_node<int> qeven_out(g);
-    tbb::flow::make_edge(qin, mf);
+    tbb::flow::make_edge(qin,mf);
     tbb::flow::make_edge(tbb::flow::output_port<0>(mf), qeven_out);
     tbb::flow::make_edge(tbb::flow::output_port<1>(mf), qodd_out);
     g.wait_for_all();
-    for (int ii = 0; ii < 2; ++ii) {
-        std::atomic<bool> submitted {false};
+    for (int ii = 0; ii < 2 ; ++ii) {
+        std::atomic<bool> submitted{ false };
         serial_fn_state0 = 0;
         /* if(ii == 0) REMARK(" reset preds"); else REMARK(" 2nd");*/
         std::thread t([&] {
-            g.reset();// attach to the current arena
+            g.reset(); // attach to the current arena
             qin.try_put(0);
             qin.try_put(1);
             submitted = true;
@@ -614,60 +601,62 @@ void TestMultifunctionNode() {
         if (!std::is_same<P, tbb::flow::rejecting>::value) {
             CHECK_MESSAGE((my_test(mf)), "fail cancel group test");
         }
-        if (ii == 1) {
+        if( ii == 1) {
             INFO(" rf_clear_edges");
             g.reset(tbb::flow::rf_clear_edges);
-            CHECK_MESSAGE((tbb::flow::output_port<0>(mf).my_successors.empty()),
-                          "output_port<0> not reset (rf_clear_edges)");
-            CHECK_MESSAGE((tbb::flow::output_port<1>(mf).my_successors.empty()),
-                          "output_port<1> not reset (rf_clear_edges)");
-        } else {
+            CHECK_MESSAGE( (tbb::flow::output_port<0>(mf).my_successors.empty()), "output_port<0> not reset (rf_clear_edges)");
+            CHECK_MESSAGE( (tbb::flow::output_port<1>(mf).my_successors.empty()), "output_port<1> not reset (rf_clear_edges)");
+        }
+        else
+        {
             g.reset();
         }
-        CHECK_MESSAGE((mf.my_predecessors.empty()), "edge didn't reset");
-        CHECK_MESSAGE(((ii == 0 && !qin.my_successors.empty()) || (ii == 1 && qin.my_successors.empty())),
-                      "edge didn't reset");
+        CHECK_MESSAGE( (mf.my_predecessors.empty()), "edge didn't reset");
+        CHECK_MESSAGE( ((ii == 0 && !qin.my_successors.empty()) || (ii == 1 && qin.my_successors.empty())), "edge didn't reset");
     }
     INFO(" done\n");
 }
 
 // indexer_node is like a broadcast_node, in that none of its inputs reverse, and it
 // never allows a successor to reverse its edge, so we only need test the successors.
-void TestIndexerNode() {
+void
+TestIndexerNode() {
     tbb::flow::graph g;
-    typedef tbb::flow::indexer_node<int, int> indexernode_type;
+    typedef tbb::flow::indexer_node< int, int > indexernode_type;
     indexernode_type inode(g);
     INFO("Testing indexer_node:");
     tbb::flow::queue_node<indexernode_type::output_type> qout(g);
-    tbb::flow::make_edge(inode, qout);
+    tbb::flow::make_edge(inode,qout);
     g.wait_for_all();
-    CHECK_MESSAGE((!inode.my_successors.empty()), "successor of indexer_node missing");
+    CHECK_MESSAGE( (!inode.my_successors.empty()), "successor of indexer_node missing");
     g.reset();
-    CHECK_MESSAGE((!inode.my_successors.empty()), "successor of indexer_node missing after reset");
+    CHECK_MESSAGE( (!inode.my_successors.empty()), "successor of indexer_node missing after reset");
     g.reset(tbb::flow::rf_clear_edges);
-    CHECK_MESSAGE((inode.my_successors.empty()),
-                  "successor of indexer_node not removed by reset(rf_clear_edges)");
+    CHECK_MESSAGE( (inode.my_successors.empty()), "successor of indexer_node not removed by reset(rf_clear_edges)");
     INFO(" done\n");
 }
 
-template <typename Node>
-void TestScalarNode(const char* name) {
+template<typename Node>
+void
+TestScalarNode(const char *name) {
     tbb::flow::graph g;
     Node on(g);
     tbb::flow::queue_node<int> qout(g);
     INFO("Testing " << name << ":");
-    tbb::flow::make_edge(on, qout);
+    tbb::flow::make_edge(on,qout);
     g.wait_for_all();
-    CHECK_MESSAGE((!on.my_successors.empty()), "edge not added");
+    CHECK_MESSAGE( (!on.my_successors.empty()), "edge not added");
     g.reset();
-    CHECK_MESSAGE((!on.my_successors.empty()), "edge improperly removed");
+    CHECK_MESSAGE( (!on.my_successors.empty()), "edge improperly removed");
     g.reset(tbb::flow::rf_clear_edges);
-    CHECK_MESSAGE((on.my_successors.empty()), "edge not removed by reset(rf_clear_edges)");
+    CHECK_MESSAGE( (on.my_successors.empty()), "edge not removed by reset(rf_clear_edges)");
     INFO(" done\n");
 }
 
 struct seq_body {
-    size_t operator()(const int& in) { return size_t(in / 3); }
+    size_t operator()(const int &in) {
+        return size_t(in / 3);
+    }
 };
 
 // sequencer_node behaves like a queueing node, but requires a different constructor.
@@ -677,41 +666,40 @@ void TestSequencerNode() {
     INFO("Testing sequencer_node:");
     tbb::flow::function_node<int> fnode(g, tbb::flow::serial, serial_fn_body<int>(serial_fn_state0));
     INFO("Testing sequencer_node:");
-    serial_fn_state0 = 0;// reset to waiting state.
+    serial_fn_state0 = 0;  // reset to waiting state.
     INFO(" make_edge");
     tbb::flow::make_edge(bnode, fnode);
-    CHECK_MESSAGE((!bnode.my_successors.empty()), "buffering node has no successor after make_edge");
+    CHECK_MESSAGE( (!bnode.my_successors.empty()), "buffering node has no successor after make_edge" );
     INFO(" try_put");
-    std::thread t([&] {
-        bnode.try_put(0);// will forward to the fnode
+    std::thread t([&]{
+        bnode.try_put(0);  // will forward to the fnode
         g.wait_for_all();
     });
     // wait for the function_node to fire up
     utils::SpinWaitWhileEq(serial_fn_state0, 0);
-    CHECK_MESSAGE((!bnode.my_successors.empty()), "buffering node has no successor after forwarding message");
-    serial_fn_state0 = 0;// release the function node
+    CHECK_MESSAGE( (!bnode.my_successors.empty()), "buffering node has no successor after forwarding message" );
+    serial_fn_state0 = 0;       // release the function node
     t.join();
 
     INFO(" remove_edge");
     tbb::flow::remove_edge(bnode, fnode);
-    CHECK_MESSAGE((bnode.my_successors.empty()), "buffering node has a successor after remove_edge");
-    tbb::flow::join_node<std::tuple<int, int>, tbb::flow::reserving> jnode(g);
-    tbb::flow::make_edge(bnode, tbb::flow::input_port<0>(jnode));// will spawn a task
+    CHECK_MESSAGE( (bnode.my_successors.empty()), "buffering node has a successor after remove_edge");
+    tbb::flow::join_node<std::tuple<int,int>,tbb::flow::reserving> jnode(g);
+    tbb::flow::make_edge(bnode, tbb::flow::input_port<0>(jnode));  // will spawn a task
     g.wait_for_all();
-    CHECK_MESSAGE((!bnode.my_successors.empty()), "buffering node has no successor after attaching to join");
+    CHECK_MESSAGE( (!bnode.my_successors.empty()), "buffering node has no successor after attaching to join");
     INFO(" reverse");
-    bnode.try_put(3);// the edge should reverse
+    bnode.try_put(3);  // the edge should reverse
     g.wait_for_all();
-    CHECK_MESSAGE((bnode.my_successors.empty()), "buffering node has a successor after reserving");
+    CHECK_MESSAGE( (bnode.my_successors.empty()), "buffering node has a successor after reserving");
     INFO(" reset()");
     g.wait_for_all();
-    g.reset();// should be in forward direction again
-    CHECK_MESSAGE((!bnode.my_successors.empty()), "buffering node has no successor after reset()");
+    g.reset();  // should be in forward direction again
+    CHECK_MESSAGE( (!bnode.my_successors.empty()), "buffering node has no successor after reset()");
     INFO(" remove_edge");
-    g.reset(tbb::flow::rf_clear_edges);// should be in forward direction again
-    CHECK_MESSAGE((bnode.my_successors.empty()),
-                  "buffering node has a successor after reset(rf_clear_edges)");
-    CHECK_MESSAGE((fnode.my_predecessors.empty()), "buffering node reversed after reset(rf_clear_edges)");
+    g.reset(tbb::flow::rf_clear_edges);  // should be in forward direction again
+    CHECK_MESSAGE( (bnode.my_successors.empty()), "buffering node has a successor after reset(rf_clear_edges)");
+    CHECK_MESSAGE( (fnode.my_predecessors.empty()), "buffering node reversed after reset(rf_clear_edges)");
     INFO("  done\n");
     g.wait_for_all();
 }
@@ -734,83 +722,98 @@ void TestInputNode() {
     tbb::flow::input_node<int> in(g, snode_body(4));
     INFO("Testing input_node:");
     tbb::flow::queue_node<int> qin(g);
-    tbb::flow::join_node<std::tuple<int, int>, tbb::flow::reserving> jn(g);
-    tbb::flow::queue_node<std::tuple<int, int>> qout(g);
+    tbb::flow::join_node<std::tuple<int,int>, tbb::flow::reserving> jn(g);
+    tbb::flow::queue_node<std::tuple<int,int> > qout(g);
 
     INFO(" make_edges");
     tbb::flow::make_edge(in, tbb::flow::input_port<0>(jn));
     tbb::flow::make_edge(qin, tbb::flow::input_port<1>(jn));
-    tbb::flow::make_edge(jn, qout);
-    CHECK_MESSAGE((!in.my_successors.empty()), "input node has no successor after make_edge");
+    tbb::flow::make_edge(jn,qout);
+    CHECK_MESSAGE( (!in.my_successors.empty()), "input node has no successor after make_edge");
     g.wait_for_all();
     g.reset();
-    CHECK_MESSAGE((!in.my_successors.empty()), "input node has no successor after reset");
+    CHECK_MESSAGE( (!in.my_successors.empty()), "input node has no successor after reset");
     g.wait_for_all();
     g.reset(tbb::flow::rf_clear_edges);
-    CHECK_MESSAGE((in.my_successors.empty()), "input node has successor after reset(rf_clear_edges)");
+    CHECK_MESSAGE( (in.my_successors.empty()), "input node has successor after reset(rf_clear_edges)");
     tbb::flow::make_edge(in, tbb::flow::input_port<0>(jn));
     tbb::flow::make_edge(qin, tbb::flow::input_port<1>(jn));
-    tbb::flow::make_edge(jn, qout);
+    tbb::flow::make_edge(jn,qout);
     g.wait_for_all();
     INFO(" activate");
-    in.activate();// will forward to the fnode
+    in.activate();  // will forward to the fnode
     INFO(" wait1");
     g.wait_for_all();
-    CHECK_MESSAGE((in.my_successors.empty()), "input node has no successor after forwarding message");
+    CHECK_MESSAGE( (in.my_successors.empty()), "input node has no successor after forwarding message");
     g.reset();
-    CHECK_MESSAGE((!in.my_successors.empty()), "input_node has no successors after reset");
-    CHECK_MESSAGE((tbb::flow::input_port<0>(jn).my_predecessors.empty()),
-                  "successor of input_node has pred after reset.");
+    CHECK_MESSAGE( (!in.my_successors.empty()), "input_node has no successors after reset");
+    CHECK_MESSAGE( (tbb::flow::input_port<0>(jn).my_predecessors.empty()), "successor of input_node has pred after reset.");
     INFO(" done\n");
 }
 
 //! Test buffering nodes
 //! \brief \ref error_guessing
-TEST_CASE("Test buffering nodes") {
+TEST_CASE("Test buffering nodes"){
     unsigned int MinThread = utils::MinThread;
-    if (MinThread < 3) MinThread = 3;
+    if(MinThread < 3) MinThread = 3;
     tbb::task_arena arena(MinThread);
-    arena.execute([&]() {
-        // tests presume at least three threads
-        TestBufferingNode<tbb::flow::buffer_node<int>>("buffer_node");
-        TestBufferingNode<tbb::flow::priority_queue_node<int>>("priority_queue_node");
-        TestBufferingNode<tbb::flow::queue_node<int>>("queue_node");
-    });
+	arena.execute(
+        [&]() {
+            // tests presume at least three threads
+            TestBufferingNode< tbb::flow::buffer_node<int> >("buffer_node");
+            TestBufferingNode< tbb::flow::priority_queue_node<int> >("priority_queue_node");
+            TestBufferingNode< tbb::flow::queue_node<int> >("queue_node");
+        }
+	);
 }
 
 //! Test sequencer_node
 //! \brief \ref error_guessing
-TEST_CASE("Test sequencer node") { TestSequencerNode(); }
+TEST_CASE("Test sequencer node"){
+    TestSequencerNode();
+}
 
 TEST_SUITE("Test multifunction node") {
     //! Test multifunction_node with rejecting policy
     //! \brief \ref error_guessing
-    TEST_CASE("with rejecting policy") { TestMultifunctionNode<tbb::flow::rejecting>(); }
+    TEST_CASE("with rejecting policy"){
+        TestMultifunctionNode<tbb::flow::rejecting>();
+    }
 
     //! Test multifunction_node with queueing policy
     //! \brief \ref error_guessing
-    TEST_CASE("with queueing policy") { TestMultifunctionNode<tbb::flow::queueing>(); }
+    TEST_CASE("with queueing policy") {
+        TestMultifunctionNode<tbb::flow::queueing>();
+    }
 }
 
 //! Test input_node
 //! \brief \ref error_guessing
-TEST_CASE("Test input node") { TestInputNode(); }
+TEST_CASE("Test input node"){
+    TestInputNode();
+}
 
 //! Test continue_node
 //! \brief \ref error_guessing
-TEST_CASE("Test continue node") { TestContinueNode(); }
+TEST_CASE("Test continue node"){
+    TestContinueNode();
+}
 
 //! Test function_node
 //! \brief \ref error_guessing
-TEST_CASE("Test function node" * doctest::may_fail()) { TestFunctionNode(); }
+TEST_CASE("Test function node" * doctest::may_fail()){
+    TestFunctionNode();
+}
 
 //! Test join_node
 //! \brief \ref error_guessing
-TEST_CASE("Test join node") { TestJoinNode(); }
+TEST_CASE("Test join node"){
+    TestJoinNode();
+}
 
 //! Test limiter_node
 //! \brief \ref error_guessing
-TEST_CASE("Test limiter node") {
+TEST_CASE("Test limiter node"){
     TestLimiterNode<void>();
     TestLimiterNode<int>();
     TestLimiterNode<tbb::flow::continue_msg>();
@@ -818,29 +821,30 @@ TEST_CASE("Test limiter node") {
 
 //! Test indexer_node
 //! \brief \ref error_guessing
-TEST_CASE("Test indexer node") { TestIndexerNode(); }
+TEST_CASE("Test indexer node"){
+    TestIndexerNode();
+}
 
 //! Test split_node
 //! \brief \ref error_guessing
-TEST_CASE("Test split node") { TestSplitNode(); }
+TEST_CASE("Test split node"){
+    TestSplitNode();
+}
 
 //! Test broadcast, overwrite, write_once nodes
 //! \brief \ref error_guessing
-TEST_CASE("Test scalar node") {
-    TestScalarNode<tbb::flow::broadcast_node<int>>("broadcast_node");
-    TestScalarNode<tbb::flow::overwrite_node<int>>("overwrite_node");
-    TestScalarNode<tbb::flow::write_once_node<int>>("write_once_node");
+TEST_CASE("Test scalar node"){
+    TestScalarNode<tbb::flow::broadcast_node<int> >("broadcast_node");
+    TestScalarNode<tbb::flow::overwrite_node<int> >("overwrite_node");
+    TestScalarNode<tbb::flow::write_once_node<int> >("write_once_node");
 }
 
 //! try_get in inactive graph
 //! \brief \ref error_guessing
-TEST_CASE("try_get in inactive graph") {
+TEST_CASE("try_get in inactive graph"){
     tbb::flow::graph g;
 
-    tbb::flow::input_node<int> src(g, [&](tbb::flow_control& fc) {
-        fc.stop();
-        return 0;
-    });
+    tbb::flow::input_node<int> src(g, [&](tbb::flow_control& fc) { fc.stop(); return 0;});
     deactivate_graph(g);
 
     int tmp = -1;
@@ -853,10 +857,10 @@ TEST_CASE("try_get in inactive graph") {
 
 //! Test make_edge in inactive graph
 //! \brief \ref error_guessing
-TEST_CASE("Test make_edge in inactive graph") {
+TEST_CASE("Test make_edge in inactive graph"){
     tbb::flow::graph g;
 
-    tbb::flow::continue_node<int> c(g, [](const tbb::flow::continue_msg&) { return 1; });
+    tbb::flow::continue_node<int> c(g, [](const tbb::flow::continue_msg&){ return 1; });
 
     tbb::flow::function_node<int, int> f(g, tbb::flow::serial, serial_fn_body<int>(serial_fn_state0));
 
@@ -870,7 +874,7 @@ TEST_CASE("Test make_edge in inactive graph") {
 
 //! Test make_edge from overwrite_node in inactive graph
 //! \brief \ref error_guessing
-TEST_CASE("Test make_edge from overwrite_node in inactive graph") {
+TEST_CASE("Test make_edge from overwrite_node in inactive graph"){
     tbb::flow::graph g;
 
     tbb::flow::queue_node<int> q(g);
@@ -890,7 +894,7 @@ TEST_CASE("Test make_edge from overwrite_node in inactive graph") {
 
 //! Test iterators directly
 //! \brief \ref error_guessing
-TEST_CASE("graph_iterator details") {
+TEST_CASE("graph_iterator details"){
     tbb::flow::graph g;
     const tbb::flow::graph cg;
 
@@ -906,7 +910,7 @@ TEST_CASE("graph_iterator details") {
 
 //! const graph
 //! \brief \ref error_guessing
-TEST_CASE("const graph") {
+TEST_CASE("const graph"){
     using namespace tbb::flow;
 
     const graph g;
@@ -924,7 +928,7 @@ TEST_CASE("Send message to continue_node while graph is inactive") {
 
     graph g;
 
-    continue_node<int> c(g, [](const continue_msg&) { return 1; });
+    continue_node<int> c(g, [](const continue_msg&){ return 1; });
     buffer_node<int> b(g);
 
     make_edge(c, b);
@@ -939,6 +943,7 @@ TEST_CASE("Send message to continue_node while graph is inactive") {
     CHECK_MESSAGE((tmp == -1), "Value should not be altered");
 }
 
+
 //! Bypass of a successor's message in a node with lightweight policy
 //! \brief \ref error_guessing
 TEST_CASE("Bypass of a successor's message in a node with lightweight policy") {
@@ -946,10 +951,10 @@ TEST_CASE("Bypass of a successor's message in a node with lightweight policy") {
 
     graph g;
 
-    auto body = [](const int& v) -> int { return v * 2; };
+    auto body = [](const int&v)->int { return v * 2; };
     function_node<int, int, lightweight> f1(g, unlimited, body);
 
-    auto body2 = [](const int& v) -> int { return v / 2; };
+    auto body2 = [](const int&v)->int {return v / 2;};
     function_node<int, int> f2(g, unlimited, body2);
 
     buffer_node<int> b(g);
diff --git a/external/tbb/test/tbb/test_function_node.cpp b/external/tbb/test/tbb/test_function_node.cpp
index d4bdaa9e..40b76664 100644
--- a/external/tbb/test/tbb/test_function_node.cpp
+++ b/external/tbb/test/tbb/test_function_node.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2025 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -15,24 +15,26 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
 #endif
 
 #include "common/config.h"
 
 #include "tbb/flow_graph.h"
-#include "tbb/global_control.h"
 #include "tbb/spin_rw_mutex.h"
+#include "tbb/global_control.h"
 
-#include "common/concepts_common.h"
-#include "common/graph_utils.h"
 #include "common/test.h"
-#include "common/test_follows_and_precedes_api.h"
 #include "common/utils.h"
+#include "common/graph_utils.h"
+#include "common/test_follows_and_precedes_api.h"
+#include "common/concepts_common.h"
+
 
 //! \file test_function_node.cpp
 //! \brief Test for [flow_graph.function_node] specification
 
+
 #define N 100
 #define MAX_NODES 4
 
@@ -44,96 +46,96 @@
     and 4) all of this happens even if there are multiple predecessors and successors
 */
 
-template <typename IO>
+template<typename IO>
 struct pass_through {
     IO operator()(const IO& i) { return i; }
 };
 
-template <typename InputType, typename OutputType, typename Body>
-void buffered_levels(size_t concurrency, Body body) {
-
-    // Do for lc = 1 to concurrency level
-    for (size_t lc = 1; lc <= concurrency; ++lc) {
-        tbb::flow::graph g;
-
-        // Set the execute_counter back to zero in the harness
-        harness_graph_executor<InputType, OutputType>::execute_count = 0;
-        // Set the number of current executors to zero.
-        harness_graph_executor<InputType, OutputType>::current_executors = 0;
-        // Set the max allowed executors to lc.  There is a check in the functor to make sure this is never exceeded.
-        harness_graph_executor<InputType, OutputType>::max_executors = lc;
-
-        // Create the function_node with the appropriate concurrency level, and use default buffering
-        tbb::flow::function_node<InputType, OutputType> exe_node(g, lc, body);
-        tbb::flow::function_node<InputType, InputType> pass_thru(g, tbb::flow::unlimited,
-                                                                 pass_through<InputType>());
-
-        // Create a vector of identical exe_nodes and pass_thrus
-        std::vector<tbb::flow::function_node<InputType, OutputType>> exe_vec(2, exe_node);
-        std::vector<tbb::flow::function_node<InputType, InputType>> pass_thru_vec(2, pass_thru);
-        // Attach each pass_thru to its corresponding exe_node
-        for (size_t node_idx = 0; node_idx < exe_vec.size(); ++node_idx) {
-            tbb::flow::make_edge(pass_thru_vec[node_idx], exe_vec[node_idx]);
-        }
-
-        // TODO: why the test is executed serially for the node pairs, not concurrently?
-        for (size_t node_idx = 0; node_idx < exe_vec.size(); ++node_idx) {
-            // For num_receivers = 1 to MAX_NODES
-            for (size_t num_receivers = 1; num_receivers <= MAX_NODES; ++num_receivers) {
-                // Create num_receivers counting receivers and connect the exe_vec[node_idx] to them.
-                std::vector<std::shared_ptr<harness_mapped_receiver<OutputType>>> receivers;
-                for (size_t i = 0; i < num_receivers; i++) {
-                    receivers.push_back(std::make_shared<harness_mapped_receiver<OutputType>>(g));
-                }
-
-                for (size_t r = 0; r < num_receivers; ++r) {
-                    tbb::flow::make_edge(exe_vec[node_idx], *receivers[r]);
-                }
-
-                // Do the test with varying numbers of senders
-                std::vector<std::shared_ptr<harness_counting_sender<InputType>>> senders;
-                for (size_t num_senders = 1; num_senders <= MAX_NODES; ++num_senders) {
-                    // Create num_senders senders, set there message limit each to N, and connect them to
-                    // pass_thru_vec[node_idx]
-                    senders.clear();
-                    for (size_t s = 0; s < num_senders; ++s) {
-                        senders.push_back(std::make_shared<harness_counting_sender<InputType>>());
-                        senders.back()->my_limit = N;
-                        senders.back()->register_successor(pass_thru_vec[node_idx]);
-                    }
-
-                    // Initialize the receivers so they know how many senders and messages to check for
-                    for (size_t r = 0; r < num_receivers; ++r) {
-                        receivers[r]->initialize_map(N, num_senders);
-                    }
-
-                    // Do the test
-                    utils::NativeParallelFor((int) num_senders, parallel_put_until_limit<InputType>(senders));
-                    g.wait_for_all();
-
-                    // confirm that each sender was requested from N times
-                    for (size_t s = 0; s < num_senders; ++s) {
-                        size_t n = senders[s]->my_received;
-                        CHECK(n == N);
-                        CHECK(senders[s]->my_receiver.load(std::memory_order_relaxed)
-                              == &pass_thru_vec[node_idx]);
-                    }
-                    // validate the receivers
-                    for (size_t r = 0; r < num_receivers; ++r) { receivers[r]->validate(); }
-                }
-                for (size_t r = 0; r < num_receivers; ++r) {
-                    tbb::flow::remove_edge(exe_vec[node_idx], *receivers[r]);
-                }
-                CHECK(exe_vec[node_idx].try_put(InputType()) == true);
-                g.wait_for_all();
-                for (size_t r = 0; r < num_receivers; ++r) {
-                    // since it's detached, nothing should have changed
-                    receivers[r]->validate();
-                }
-
-            }// for num_receivers
-        }    // for node_idx
-    }        // for concurrency level lc
+template< typename InputType, typename OutputType, typename Body >
+void buffered_levels( size_t concurrency, Body body ) {
+
+   // Do for lc = 1 to concurrency level
+   for ( size_t lc = 1; lc <= concurrency; ++lc ) {
+   tbb::flow::graph g;
+
+   // Set the execute_counter back to zero in the harness
+   harness_graph_executor<InputType, OutputType>::execute_count = 0;
+   // Set the number of current executors to zero.
+   harness_graph_executor<InputType, OutputType>::current_executors = 0;
+   // Set the max allowed executors to lc.  There is a check in the functor to make sure this is never exceeded.
+   harness_graph_executor<InputType, OutputType>::max_executors = lc;
+
+   // Create the function_node with the appropriate concurrency level, and use default buffering
+   tbb::flow::function_node< InputType, OutputType > exe_node( g, lc, body );
+   tbb::flow::function_node<InputType, InputType> pass_thru( g, tbb::flow::unlimited, pass_through<InputType>());
+
+   // Create a vector of identical exe_nodes and pass_thrus
+   std::vector< tbb::flow::function_node< InputType, OutputType > > exe_vec(2, exe_node);
+   std::vector< tbb::flow::function_node< InputType, InputType > > pass_thru_vec(2, pass_thru);
+   // Attach each pass_thru to its corresponding exe_node
+   for (size_t node_idx=0; node_idx<exe_vec.size(); ++node_idx) {
+       tbb::flow::make_edge(pass_thru_vec[node_idx], exe_vec[node_idx]);
+   }
+
+   // TODO: why the test is executed serially for the node pairs, not concurrently?
+   for (size_t node_idx=0; node_idx<exe_vec.size(); ++node_idx) {
+   // For num_receivers = 1 to MAX_NODES
+       for (size_t num_receivers = 1; num_receivers <= MAX_NODES; ++num_receivers ) {
+           // Create num_receivers counting receivers and connect the exe_vec[node_idx] to them.
+           std::vector< std::shared_ptr<harness_mapped_receiver<OutputType>> > receivers;
+           for (size_t i = 0; i < num_receivers; i++) {
+               receivers.push_back( std::make_shared<harness_mapped_receiver<OutputType>>(g) );
+           }
+
+           for (size_t r = 0; r < num_receivers; ++r ) {
+               tbb::flow::make_edge( exe_vec[node_idx], *receivers[r] );
+           }
+
+           // Do the test with varying numbers of senders
+           std::vector< std::shared_ptr<harness_counting_sender<InputType>> > senders;
+           for (size_t num_senders = 1; num_senders <= MAX_NODES; ++num_senders ) {
+               // Create num_senders senders, set there message limit each to N, and connect them to
+               // pass_thru_vec[node_idx]
+               senders.clear();
+               for (size_t s = 0; s < num_senders; ++s ) {
+                   senders.push_back( std::make_shared<harness_counting_sender<InputType>>() );
+                   senders.back()->my_limit = N;
+                   senders.back()->register_successor(pass_thru_vec[node_idx] );
+               }
+
+               // Initialize the receivers so they know how many senders and messages to check for
+               for (size_t r = 0; r < num_receivers; ++r ) {
+                   receivers[r]->initialize_map( N, num_senders );
+               }
+
+               // Do the test
+               utils::NativeParallelFor( (int)num_senders, parallel_put_until_limit<InputType>(senders) );
+               g.wait_for_all();
+
+               // confirm that each sender was requested from N times
+               for (size_t s = 0; s < num_senders; ++s ) {
+                   size_t n = senders[s]->my_received;
+                   CHECK( n == N );
+                   CHECK( senders[s]->my_receiver.load(std::memory_order_relaxed) == &pass_thru_vec[node_idx] );
+               }
+               // validate the receivers
+               for (size_t r = 0; r < num_receivers; ++r ) {
+                   receivers[r]->validate();
+               }
+           }
+           for (size_t r = 0; r < num_receivers; ++r ) {
+               tbb::flow::remove_edge( exe_vec[node_idx], *receivers[r] );
+           }
+           CHECK( exe_vec[node_idx].try_put( InputType() ) == true );
+           g.wait_for_all();
+           for (size_t r = 0; r < num_receivers; ++r ) {
+               // since it's detached, nothing should have changed
+               receivers[r]->validate();
+           }
+
+       } // for num_receivers
+    } // for node_idx
+    } // for concurrency level lc
 }
 
 const size_t Offset = 123;
@@ -142,91 +144,100 @@ std::atomic<size_t> global_execute_count;
 struct inc_functor {
 
     std::atomic<size_t> local_execute_count;
-    inc_functor() { local_execute_count = 0; }
-    inc_functor(const inc_functor& f) { local_execute_count = size_t(f.local_execute_count); }
-    void operator=(const inc_functor& f) { local_execute_count = size_t(f.local_execute_count); }
-
-    int operator()(int i) {
-        ++global_execute_count;
-        ++local_execute_count;
-        return i;
+    inc_functor( ) { local_execute_count = 0; }
+    inc_functor( const inc_functor &f ) { local_execute_count = size_t(f.local_execute_count); }
+    void operator=( const inc_functor &f ) { local_execute_count = size_t(f.local_execute_count); }
+
+    int operator()( int i ) {
+       ++global_execute_count;
+       ++local_execute_count;
+       return i;
     }
+
 };
 
-template <typename InputType, typename OutputType>
-void buffered_levels_with_copy(size_t concurrency) {
+template< typename InputType, typename OutputType >
+void buffered_levels_with_copy( size_t concurrency ) {
 
     // Do for lc = 1 to concurrency level
-    for (size_t lc = 1; lc <= concurrency; ++lc) {
+    for ( size_t lc = 1; lc <= concurrency; ++lc ) {
         tbb::flow::graph g;
 
         inc_functor cf;
         cf.local_execute_count = Offset;
         global_execute_count = Offset;
 
-        tbb::flow::function_node<InputType, OutputType> exe_node(g, lc, cf);
+        tbb::flow::function_node< InputType, OutputType > exe_node( g, lc, cf );
 
-        for (size_t num_receivers = 1; num_receivers <= MAX_NODES; ++num_receivers) {
+        for (size_t num_receivers = 1; num_receivers <= MAX_NODES; ++num_receivers ) {
 
-            std::vector<std::shared_ptr<harness_mapped_receiver<OutputType>>> receivers;
+            std::vector< std::shared_ptr<harness_mapped_receiver<OutputType>> > receivers;
             for (size_t i = 0; i < num_receivers; i++) {
-                receivers.push_back(std::make_shared<harness_mapped_receiver<OutputType>>(g));
+                receivers.push_back( std::make_shared<harness_mapped_receiver<OutputType>>(g) );
             }
 
-            for (size_t r = 0; r < num_receivers; ++r) { tbb::flow::make_edge(exe_node, *receivers[r]); }
+            for (size_t r = 0; r < num_receivers; ++r ) {
+                tbb::flow::make_edge( exe_node, *receivers[r] );
+            }
 
-            std::vector<std::shared_ptr<harness_counting_sender<InputType>>> senders;
-            for (size_t num_senders = 1; num_senders <= MAX_NODES; ++num_senders) {
+            std::vector< std::shared_ptr<harness_counting_sender<InputType>> > senders;
+            for (size_t num_senders = 1; num_senders <= MAX_NODES; ++num_senders ) {
                 senders.clear();
-                for (size_t s = 0; s < num_senders; ++s) {
-                    senders.push_back(std::make_shared<harness_counting_sender<InputType>>());
+                for (size_t s = 0; s < num_senders; ++s ) {
+                    senders.push_back( std::make_shared<harness_counting_sender<InputType>>() );
                     senders.back()->my_limit = N;
-                    tbb::flow::make_edge(*senders.back(), exe_node);
+                    tbb::flow::make_edge( *senders.back(), exe_node );
                 }
 
-                for (size_t r = 0; r < num_receivers; ++r) { receivers[r]->initialize_map(N, num_senders); }
+                for (size_t r = 0; r < num_receivers; ++r ) {
+                    receivers[r]->initialize_map( N, num_senders );
+                }
 
-                utils::NativeParallelFor((int) num_senders, parallel_put_until_limit<InputType>(senders));
+                utils::NativeParallelFor( (int)num_senders, parallel_put_until_limit<InputType>(senders) );
                 g.wait_for_all();
 
-                for (size_t s = 0; s < num_senders; ++s) {
+                for (size_t s = 0; s < num_senders; ++s ) {
                     size_t n = senders[s]->my_received;
-                    CHECK(n == N);
-                    CHECK(senders[s]->my_receiver.load(std::memory_order_relaxed) == &exe_node);
+                    CHECK( n == N );
+                    CHECK( senders[s]->my_receiver.load(std::memory_order_relaxed) == &exe_node );
                 }
-                for (size_t r = 0; r < num_receivers; ++r) { receivers[r]->validate(); }
+                for (size_t r = 0; r < num_receivers; ++r ) {
+                    receivers[r]->validate();
+                }
+            }
+            for (size_t r = 0; r < num_receivers; ++r ) {
+                tbb::flow::remove_edge( exe_node, *receivers[r] );
             }
-            for (size_t r = 0; r < num_receivers; ++r) { tbb::flow::remove_edge(exe_node, *receivers[r]); }
-            CHECK(exe_node.try_put(InputType()) == true);
+            CHECK( exe_node.try_put( InputType() ) == true );
             g.wait_for_all();
-            for (size_t r = 0; r < num_receivers; ++r) { receivers[r]->validate(); }
+            for (size_t r = 0; r < num_receivers; ++r ) {
+                receivers[r]->validate();
+            }
         }
 
         // validate that the local body matches the global execute_count and both are correct
-        inc_functor body_copy = tbb::flow::copy_body<inc_functor>(exe_node);
-        const size_t expected_count = N / 2 * MAX_NODES * MAX_NODES * (MAX_NODES + 1) + MAX_NODES + Offset;
+        inc_functor body_copy = tbb::flow::copy_body<inc_functor>( exe_node );
+        const size_t expected_count = N/2 * MAX_NODES * MAX_NODES * ( MAX_NODES + 1 ) + MAX_NODES + Offset;
         size_t global_count = global_execute_count;
         size_t inc_count = body_copy.local_execute_count;
         CHECK(global_count == expected_count);
-        CHECK(global_count == inc_count);
+        CHECK(global_count == inc_count );
         g.reset(tbb::flow::rf_reset_bodies);
-        body_copy = tbb::flow::copy_body<inc_functor>(exe_node);
+        body_copy = tbb::flow::copy_body<inc_functor>( exe_node );
         inc_count = body_copy.local_execute_count;
-        CHECK_MESSAGE(Offset == inc_count, "reset(rf_reset_bodies) did not reset functor");
+        CHECK_MESSAGE( Offset == inc_count, "reset(rf_reset_bodies) did not reset functor" );
     }
 }
 
-template <typename InputType, typename OutputType>
-void run_buffered_levels(int c) {
-    buffered_levels<InputType, OutputType>(c, [](InputType i) -> OutputType {
-        return harness_graph_executor<InputType, OutputType>::func(i);
-    });
-    buffered_levels<InputType, OutputType>(c, &harness_graph_executor<InputType, OutputType>::func);
-    buffered_levels<InputType, OutputType>(c,
-                                           typename harness_graph_executor<InputType, OutputType>::functor());
-    buffered_levels_with_copy<InputType, OutputType>(c);
+template< typename InputType, typename OutputType >
+void run_buffered_levels( int c ) {
+    buffered_levels<InputType,OutputType>( c, []( InputType i ) -> OutputType { return harness_graph_executor<InputType, OutputType>::func(i); } );
+    buffered_levels<InputType,OutputType>( c, &harness_graph_executor<InputType, OutputType>::func );
+    buffered_levels<InputType,OutputType>( c, typename harness_graph_executor<InputType, OutputType>::functor() );
+    buffered_levels_with_copy<InputType,OutputType>( c );
 }
 
+
 //! Performs test on executable nodes with limited concurrency
 /** These tests check:
     1) that the nodes will accepts puts up to the concurrency limit,
@@ -236,10 +247,10 @@ void run_buffered_levels(int c) {
     There is no checking of the contents of the messages for corruption.
 */
 
-template <typename InputType, typename OutputType, typename Body>
-void concurrency_levels(size_t concurrency, Body body) {
+template< typename InputType, typename OutputType, typename Body >
+void concurrency_levels( size_t concurrency, Body body ) {
 
-    for (size_t lc = 1; lc <= concurrency; ++lc) {
+    for ( size_t lc = 1; lc <= concurrency; ++lc ) {
         tbb::flow::graph g;
 
         // Set the execute_counter back to zero in the harness
@@ -249,96 +260,102 @@ void concurrency_levels(size_t concurrency, Body body) {
         // Set the max allowed executors to lc. There is a check in the functor to make sure this is never exceeded.
         harness_graph_executor<InputType, OutputType>::max_executors = lc;
 
-        typedef tbb::flow::function_node<InputType, OutputType, tbb::flow::rejecting> fnode_type;
-        fnode_type exe_node(g, lc, body);
+        typedef tbb::flow::function_node< InputType, OutputType, tbb::flow::rejecting > fnode_type;
+        fnode_type exe_node( g, lc, body );
 
-        for (size_t num_receivers = 1; num_receivers <= MAX_NODES; ++num_receivers) {
+        for (size_t num_receivers = 1; num_receivers <= MAX_NODES; ++num_receivers ) {
 
-            std::vector<std::shared_ptr<harness_counting_receiver<OutputType>>> receivers;
+            std::vector< std::shared_ptr<harness_counting_receiver<OutputType>> > receivers;
             for (size_t i = 0; i < num_receivers; ++i) {
-                receivers.push_back(std::make_shared<harness_counting_receiver<OutputType>>(g));
+                receivers.push_back( std::make_shared<harness_counting_receiver<OutputType>>(g) );
             }
 
-            for (size_t r = 0; r < num_receivers; ++r) { tbb::flow::make_edge(exe_node, *receivers[r]); }
+            for (size_t r = 0; r < num_receivers; ++r ) {
+                tbb::flow::make_edge( exe_node, *receivers[r] );
+            }
 
-            std::vector<std::shared_ptr<harness_counting_sender<InputType>>> senders;
+            std::vector< std::shared_ptr<harness_counting_sender<InputType>> > senders;
 
-            for (size_t num_senders = 1; num_senders <= MAX_NODES; ++num_senders) {
+            for (size_t num_senders = 1; num_senders <= MAX_NODES; ++num_senders ) {
                 senders.clear();
                 {
                     // Exclusively lock m to prevent exe_node from finishing
                     tbb::spin_rw_mutex::scoped_lock l(
-                            harness_graph_executor<InputType, OutputType>::template mutex_holder<
-                                    tbb::spin_rw_mutex>::mutex);
+                        harness_graph_executor<InputType, OutputType>::template mutex_holder<tbb::spin_rw_mutex>::mutex
+                    );
 
                     // put to lc level, it will accept and then block at m
-                    for (size_t c = 0; c < lc; ++c) { CHECK(exe_node.try_put(InputType()) == true); }
+                    for ( size_t c = 0 ; c < lc ; ++c ) {
+                        CHECK( exe_node.try_put( InputType() ) == true );
+                    }
                     // it only accepts to lc level
-                    CHECK(exe_node.try_put(InputType()) == false);
+                    CHECK( exe_node.try_put( InputType() ) == false );
 
-                    for (size_t s = 0; s < num_senders; ++s) {
-                        senders.push_back(std::make_shared<harness_counting_sender<InputType>>());
+                    for (size_t s = 0; s < num_senders; ++s ) {
+                        senders.push_back( std::make_shared<harness_counting_sender<InputType>>() );
                         // register a sender
                         senders.back()->my_limit = N;
-                        exe_node.register_predecessor(*senders.back());
+                        exe_node.register_predecessor( *senders.back() );
                     }
 
-                }// release lock at end of scope, setting the exe node free to continue
+                } // release lock at end of scope, setting the exe node free to continue
                 // wait for graph to settle down
                 g.wait_for_all();
 
                 // confirm that each sender was requested from N times
-                for (size_t s = 0; s < num_senders; ++s) {
+                for (size_t s = 0; s < num_senders; ++s ) {
                     size_t n = senders[s]->my_received;
-                    CHECK(n == N);
-                    CHECK(senders[s]->my_receiver.load(std::memory_order_relaxed) == &exe_node);
+                    CHECK( n == N );
+                    CHECK( senders[s]->my_receiver.load(std::memory_order_relaxed) == &exe_node );
                 }
                 // confirm that each receivers got N * num_senders + the initial lc puts
-                for (size_t r = 0; r < num_receivers; ++r) {
+                for (size_t r = 0; r < num_receivers; ++r ) {
                     size_t n = receivers[r]->my_count;
-                    CHECK(n == num_senders * N + lc);
+                    CHECK( n == num_senders*N+lc );
                     receivers[r]->my_count = 0;
                 }
             }
-            for (size_t r = 0; r < num_receivers; ++r) { tbb::flow::remove_edge(exe_node, *receivers[r]); }
-            CHECK(exe_node.try_put(InputType()) == true);
+            for (size_t r = 0; r < num_receivers; ++r ) {
+                tbb::flow::remove_edge( exe_node, *receivers[r] );
+            }
+            CHECK( exe_node.try_put( InputType() ) == true );
             g.wait_for_all();
-            for (size_t r = 0; r < num_receivers; ++r) { CHECK(int(receivers[r]->my_count) == 0); }
+            for (size_t r = 0; r < num_receivers; ++r ) {
+                CHECK( int(receivers[r]->my_count) == 0 );
+            }
         }
     }
 }
 
-template <typename InputType, typename OutputType>
-void run_concurrency_levels(int c) {
-    concurrency_levels<InputType, OutputType>(c, [](InputType i) -> OutputType {
-        return harness_graph_executor<InputType, OutputType>::template tfunc<tbb::spin_rw_mutex>(i);
-    });
-    concurrency_levels<InputType, OutputType>(
-            c, &harness_graph_executor<InputType, OutputType>::template tfunc<tbb::spin_rw_mutex>);
-    concurrency_levels<InputType, OutputType>(
-            c,
-            typename harness_graph_executor<InputType, OutputType>::template tfunctor<tbb::spin_rw_mutex>());
+
+template< typename InputType, typename OutputType >
+void run_concurrency_levels( int c ) {
+    concurrency_levels<InputType,OutputType>( c, []( InputType i ) -> OutputType { return harness_graph_executor<InputType, OutputType>::template tfunc<tbb::spin_rw_mutex>(i); } );
+    concurrency_levels<InputType,OutputType>( c, &harness_graph_executor<InputType, OutputType>::template tfunc<tbb::spin_rw_mutex> );
+    concurrency_levels<InputType,OutputType>( c, typename harness_graph_executor<InputType, OutputType>::template tfunctor<tbb::spin_rw_mutex>() );
 }
 
+
 struct empty_no_assign {
-    empty_no_assign() {}
-    empty_no_assign(int) {}
-    operator int() { return 0; }
+   empty_no_assign() {}
+   empty_no_assign( int ) {}
+   operator int() { return 0; }
 };
 
-template <typename InputType>
+template< typename InputType >
 struct parallel_puts : private utils::NoAssign {
 
-    tbb::flow::receiver<InputType>* const my_exe_node;
+    tbb::flow::receiver< InputType > * const my_exe_node;
 
-    parallel_puts(tbb::flow::receiver<InputType>& exe_node) : my_exe_node(&exe_node) {}
+    parallel_puts( tbb::flow::receiver< InputType > &exe_node ) : my_exe_node(&exe_node) {}
 
-    void operator()(int) const {
-        for (int i = 0; i < N; ++i) {
+    void operator()( int ) const  {
+        for ( int i = 0; i < N; ++i ) {
             // the nodes will accept all puts
-            CHECK(my_exe_node->try_put(InputType()) == true);
+            CHECK( my_exe_node->try_put( InputType() ) == true );
         }
     }
+
 };
 
 //! Performs test on executable nodes with unlimited concurrency
@@ -349,49 +366,50 @@ struct parallel_puts : private utils::NoAssign {
     There is no checking of the contents of the messages for corruption.
 */
 
-template <typename InputType, typename OutputType, typename Body>
-void unlimited_concurrency(Body body) {
+template< typename InputType, typename OutputType, typename Body >
+void unlimited_concurrency( Body body ) {
 
-    for (unsigned p = 1; p < 2 * utils::MaxThread; ++p) {
+    for (unsigned p = 1; p < 2*utils::MaxThread; ++p) {
         tbb::flow::graph g;
-        tbb::flow::function_node<InputType, OutputType, tbb::flow::rejecting> exe_node(
-                g, tbb::flow::unlimited, body);
+        tbb::flow::function_node< InputType, OutputType, tbb::flow::rejecting > exe_node( g, tbb::flow::unlimited, body );
 
-        for (size_t num_receivers = 1; num_receivers <= MAX_NODES; ++num_receivers) {
+        for (size_t num_receivers = 1; num_receivers <= MAX_NODES; ++num_receivers ) {
 
-            std::vector<std::shared_ptr<harness_counting_receiver<OutputType>>> receivers;
+            std::vector< std::shared_ptr<harness_counting_receiver<OutputType>> > receivers;
             for (size_t i = 0; i < num_receivers; ++i) {
-                receivers.push_back(std::make_shared<harness_counting_receiver<OutputType>>(g));
+                receivers.push_back( std::make_shared<harness_counting_receiver<OutputType>>(g) );
             }
 
             harness_graph_executor<InputType, OutputType>::execute_count = 0;
 
-            for (size_t r = 0; r < num_receivers; ++r) { tbb::flow::make_edge(exe_node, *receivers[r]); }
+            for (size_t r = 0; r < num_receivers; ++r ) {
+                tbb::flow::make_edge( exe_node, *receivers[r] );
+            }
 
-            utils::NativeParallelFor(p, parallel_puts<InputType>(exe_node));
+            utils::NativeParallelFor( p, parallel_puts<InputType>(exe_node) );
             g.wait_for_all();
 
             // 2) the nodes will receive puts from multiple predecessors simultaneously,
             size_t ec = harness_graph_executor<InputType, OutputType>::execute_count;
-            CHECK(ec == p * N);
-            for (size_t r = 0; r < num_receivers; ++r) {
+            CHECK( ec == p*N );
+            for (size_t r = 0; r < num_receivers; ++r ) {
                 size_t c = receivers[r]->my_count;
                 // 3) the nodes will send to multiple successors.
-                CHECK(c == p * N);
+                CHECK( c == p*N );
+            }
+            for (size_t r = 0; r < num_receivers; ++r ) {
+                tbb::flow::remove_edge( exe_node, *receivers[r] );
+            }
             }
-            for (size_t r = 0; r < num_receivers; ++r) { tbb::flow::remove_edge(exe_node, *receivers[r]); }
         }
     }
-}
 
-template <typename InputType, typename OutputType>
+template< typename InputType, typename OutputType >
 void run_unlimited_concurrency() {
     harness_graph_executor<InputType, OutputType>::max_executors = 0;
-    unlimited_concurrency<InputType, OutputType>(
-            [](InputType i) -> OutputType { return harness_graph_executor<InputType, OutputType>::func(i); });
-    unlimited_concurrency<InputType, OutputType>(&harness_graph_executor<InputType, OutputType>::func);
-    unlimited_concurrency<InputType, OutputType>(
-            typename harness_graph_executor<InputType, OutputType>::functor());
+    unlimited_concurrency<InputType,OutputType>( []( InputType i ) -> OutputType { return harness_graph_executor<InputType, OutputType>::func(i); } );
+    unlimited_concurrency<InputType,OutputType>( &harness_graph_executor<InputType, OutputType>::func );
+    unlimited_concurrency<InputType,OutputType>( typename harness_graph_executor<InputType, OutputType>::functor() );
 }
 
 struct continue_msg_to_int {
@@ -406,30 +424,28 @@ void test_function_node_with_continue_msg_as_input() {
 
     tbb::flow::broadcast_node<tbb::flow::continue_msg> Start(g);
 
-    tbb::flow::function_node<tbb::flow::continue_msg, int, tbb::flow::rejecting> FN1(g, tbb::flow::serial,
-                                                                                     continue_msg_to_int(42));
-    tbb::flow::function_node<tbb::flow::continue_msg, int, tbb::flow::rejecting> FN2(g, tbb::flow::serial,
-                                                                                     continue_msg_to_int(43));
+    tbb::flow::function_node<tbb::flow::continue_msg, int, tbb::flow::rejecting> FN1( g, tbb::flow::serial, continue_msg_to_int(42));
+    tbb::flow::function_node<tbb::flow::continue_msg, int, tbb::flow::rejecting> FN2( g, tbb::flow::serial, continue_msg_to_int(43));
 
-    tbb::flow::make_edge(Start, FN1);
-    tbb::flow::make_edge(Start, FN2);
+    tbb::flow::make_edge( Start, FN1 );
+    tbb::flow::make_edge( Start, FN2 );
 
-    Start.try_put(tbb::flow::continue_msg());
+    Start.try_put( tbb::flow::continue_msg() );
     g.wait_for_all();
 }
 
 //! Tests limited concurrency cases for nodes that accept data messages
 void test_concurrency(int num_threads) {
     tbb::global_control thread_limit(tbb::global_control::max_allowed_parallelism, num_threads);
-    run_concurrency_levels<int, int>(num_threads);
-    run_concurrency_levels<int, tbb::flow::continue_msg>(num_threads);
+    run_concurrency_levels<int,int>(num_threads);
+    run_concurrency_levels<int,tbb::flow::continue_msg>(num_threads);
     run_buffered_levels<int, int>(num_threads);
-    run_unlimited_concurrency<int, int>();
-    run_unlimited_concurrency<int, empty_no_assign>();
-    run_unlimited_concurrency<empty_no_assign, int>();
-    run_unlimited_concurrency<empty_no_assign, empty_no_assign>();
-    run_unlimited_concurrency<int, tbb::flow::continue_msg>();
-    run_unlimited_concurrency<empty_no_assign, tbb::flow::continue_msg>();
+    run_unlimited_concurrency<int,int>();
+    run_unlimited_concurrency<int,empty_no_assign>();
+    run_unlimited_concurrency<empty_no_assign,int>();
+    run_unlimited_concurrency<empty_no_assign,empty_no_assign>();
+    run_unlimited_concurrency<int,tbb::flow::continue_msg>();
+    run_unlimited_concurrency<empty_no_assign,tbb::flow::continue_msg>();
     test_function_node_with_continue_msg_as_input();
 }
 
@@ -439,43 +455,307 @@ void test_concurrency(int num_threads) {
 void test_follows_and_precedes_api() {
     using msg_t = tbb::flow::continue_msg;
 
-    std::array<msg_t, 3> messages_for_follows = {{msg_t(), msg_t(), msg_t()}};
-    std::vector<msg_t> messages_for_precedes = {msg_t()};
+    std::array<msg_t, 3> messages_for_follows = { {msg_t(), msg_t(), msg_t()} };
+    std::vector<msg_t> messages_for_precedes = { msg_t() };
 
     pass_through<msg_t> pass_msg;
 
-    follows_and_precedes_testing::test_follows<msg_t, tbb::flow::function_node<msg_t, msg_t>>(
-            messages_for_follows, tbb::flow::unlimited, pass_msg);
-    follows_and_precedes_testing::test_precedes<msg_t, tbb::flow::function_node<msg_t, msg_t>>(
-            messages_for_precedes, tbb::flow::unlimited, pass_msg, tbb::flow::node_priority_t(1));
+    follows_and_precedes_testing::test_follows
+        <msg_t, tbb::flow::function_node<msg_t, msg_t>>
+        (messages_for_follows, tbb::flow::unlimited, pass_msg);
+    follows_and_precedes_testing::test_precedes
+        <msg_t, tbb::flow::function_node<msg_t, msg_t>>
+        (messages_for_precedes, tbb::flow::unlimited, pass_msg, tbb::flow::node_priority_t(1));
 }
 #endif
 
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+// Basic idea of the following tests is to check that try_put_and_wait(message) call for function_node
+// with one of the policies (lightweight, queueing and rejecting) with different concurrency limits
+// processes all of the previous jobs required to process message, the message itself, but does
+// not process the elements submitted later or not required to process the message
+// These tests submit start_work_items using the regular try_put and then submit wait_message
+// with try_put_and_wait. During the completion of the graph, new_work_items would be submitted
+// once the wait_message arrives.
+void test_try_put_and_wait_lightweight(std::size_t concurrency_limit) {
+    tbb::task_arena arena(1);
+
+    arena.execute([&]{
+        tbb::flow::graph g;
+
+        std::vector<int> start_work_items;
+        std::vector<int> processed_items;
+        std::vector<int> new_work_items;
+
+        int wait_message = 10;
+
+        for (int i = 0; i < wait_message; ++i) {
+            start_work_items.emplace_back(i);
+            new_work_items.emplace_back(i + 1 + wait_message);
+        }
+
+        using function_node_type = tbb::flow::function_node<int, int, tbb::flow::lightweight>;
+        function_node_type* start_node = nullptr;
+
+        function_node_type function(g, concurrency_limit,
+            [&](int input) noexcept {
+                if (input == wait_message) {
+                    for (int item : new_work_items) {
+                        start_node->try_put(item);
+                    }
+                }
+                return input;
+            });
+
+        start_node = &function;
+
+        function_node_type writer(g, concurrency_limit,
+            [&](int input) noexcept {
+                processed_items.emplace_back(input);
+                return 0;
+            });
+
+        tbb::flow::make_edge(function, writer);
+
+        for (int i = 0; i < wait_message; ++i) {
+            function.try_put(i);
+        }
+
+        function.try_put_and_wait(wait_message);
+
+        std::size_t check_index = 0;
+
+        // For lightweight function_node, start_work_items are expected to be processed first
+        // while putting items into the first node.
+        for (auto item : start_work_items) {
+            CHECK_MESSAGE(processed_items[check_index++] == item, "Unexpected items processing");
+        }
+
+        if (concurrency_limit == tbb::flow::serial) {
+            // If the lightweight function_node is serial, it should process the wait_message but add items from new_work_items
+            // into the queue since the concurrency limit is occupied.
+            CHECK_MESSAGE(processed_items.size() == start_work_items.size() + 1, "Unexpected number of elements processed");
+            CHECK_MESSAGE(processed_items[check_index++] == wait_message, "Unexpected items processing");
+        } else {
+            // If the node is unlimited, it should process new_work_items immediately while processing the wait_message
+            // Hence they should be processed before exiting the try_put_and_wait
+            CHECK_MESSAGE(processed_items.size() == start_work_items.size() + new_work_items.size() + 1,
+                          "Unexpected number of elements processed");
+            for (auto item : new_work_items) {
+                CHECK_MESSAGE(processed_items[check_index++] == item, "Unexpected items processing");
+            }
+            // wait_message would be processed only after new_work_items
+            CHECK_MESSAGE(processed_items[check_index++] == wait_message, "Unexpected items processing");
+        }
+
+        g.wait_for_all();
+
+        if (concurrency_limit == tbb::flow::serial) {
+            // For the serial node, processing of new_work_items would be postponed to wait_for_all since they
+            // would be queued and spawned after working with wait_message
+            for (auto item : new_work_items) {
+                CHECK_MESSAGE(processed_items[check_index++] == item, "Unexpected items processing");
+            }
+        }
+        CHECK(check_index == processed_items.size());
+    });
+}
+
+void test_try_put_and_wait_queueing(std::size_t concurrency_limit) {
+    tbb::task_arena arena(1);
+    arena.execute([&]{
+        tbb::flow::graph g;
+
+        std::vector<int> start_work_items;
+        std::vector<int> processed_items;
+        std::vector<int> new_work_items;
+
+        int wait_message = 10;
+
+        for (int i = 0; i < wait_message; ++i) {
+            start_work_items.emplace_back(i);
+            new_work_items.emplace_back(i + 1 + wait_message);
+        }
+
+        using function_node_type = tbb::flow::function_node<int, int, tbb::flow::queueing>;
+        function_node_type* start_node = nullptr;
+
+        function_node_type function(g, concurrency_limit,
+            [&](int input) noexcept {
+                if (input == wait_message) {
+                    for (int item : new_work_items) {
+                        start_node->try_put(item);
+                    }
+                }
+                return input;
+            });
+
+        start_node = &function;
+
+        function_node_type writer(g, concurrency_limit,
+            [&](int input) noexcept {
+                processed_items.emplace_back(input);
+                return 0;
+            });
+
+        tbb::flow::make_edge(function, writer);
+
+        for (int i = 0; i < wait_message; ++i) {
+            function.try_put(i);
+        }
+
+        function.try_put_and_wait(wait_message);
+
+        std::size_t check_index = 0;
+
+        if (concurrency_limit == tbb::flow::serial) {
+            // Serial queueing function_node should add all start_work_items except the first one into the queue
+            // and then process them in FIFO order.
+            // wait_message would also be added to the queue, but would be processed later
+            CHECK_MESSAGE(processed_items.size() == start_work_items.size() + 1, "Unexpected number of elements processed");
+            for (auto item : start_work_items) {
+                CHECK_MESSAGE(processed_items[check_index++] == item, "Unexpected items processing");
+            }
+        } else {
+            CHECK_MESSAGE(processed_items.size() == 1, "Unexpected number of elements processed");
+        }
+
+        // For the unlimited function_node, all of the tasks for start_work_items and wait_message would be spawned
+        // and hence processed by the thread in LIFO order.
+        // The first processed item is expected to be wait_message since it was spawned last
+        CHECK_MESSAGE(processed_items[check_index++] == wait_message, "Unexpected items processing");
+
+        g.wait_for_all();
+
+        if (concurrency_limit == tbb::flow::serial) {
+            // For serial queueing function_node, the new_work_items are expected to be processed while calling to wait_for_all
+            // They would be queued and processed later in FIFO order
+            for (auto item : new_work_items) {
+                CHECK_MESSAGE(processed_items[check_index++] == item, "Unexpected items processing");
+            }
+        } else {
+            // Unlimited function_node would always spawn tasks immediately without adding them into the queue
+            // They would be processed in LIFO order. Hence it is expected that new_work_items would be processed first in reverse order
+            // After them, start_work_items would be processed also in reverse order
+            for (std::size_t i = new_work_items.size(); i != 0; --i) {
+                CHECK_MESSAGE(processed_items[check_index++] == new_work_items[i - 1], "Unexpected items processing");
+            }
+            for (std::size_t i = start_work_items.size(); i != 0; --i) {
+                CHECK_MESSAGE(processed_items[check_index++] == start_work_items[i - 1], "Unexpected items processing");
+            }
+        }
+        CHECK(check_index == processed_items.size());
+    });
+}
+
+void test_try_put_and_wait_rejecting(size_t concurrency_limit) {
+    tbb::task_arena arena(1);
+
+    arena.execute([&]{
+        tbb::flow::graph g;
+
+        std::vector<int> processed_items;
+        std::vector<int> new_work_items;
+
+        int wait_message = 0;
+
+        for (int i = 1; i < wait_message; ++i) {
+            new_work_items.emplace_back(i);
+        }
+
+        using function_node_type = tbb::flow::function_node<int, int, tbb::flow::rejecting>;
+        function_node_type* start_node = nullptr;
+
+        function_node_type function(g, concurrency_limit,
+            [&](int input) noexcept {
+                if (input == wait_message) {
+                    for (int item : new_work_items) {
+                        start_node->try_put(item);
+                    }
+                }
+                return input;
+            });
+
+        start_node = &function;
+
+        function_node_type writer(g, concurrency_limit,
+            [&](int input) noexcept {
+                processed_items.emplace_back(input);
+                return 0;
+            });
+
+        tbb::flow::make_edge(function, writer);
+
+        // If the first action is try_put_and_wait, it will occupy concurrency of the function_node
+        // All submits of new_work_items inside of the body should be rejected
+        bool result = function.try_put_and_wait(wait_message);
+        CHECK_MESSAGE(result, "task should not rejected since the node concurrency is not saturated");
+
+        CHECK_MESSAGE(processed_items.size() == 1, nullptr);
+        CHECK_MESSAGE(processed_items[0] == wait_message, "Unexpected items processing");
+
+        g.wait_for_all();
+
+        CHECK_MESSAGE(processed_items.size() == 1, nullptr);
+
+        processed_items.clear();
+
+        // If the first action is try_put, try_put_and_wait is expected to return false since the concurrency of the
+        // node would be saturated
+        function.try_put(0);
+        result = function.try_put_and_wait(wait_message);
+        CHECK_MESSAGE(!result, "task should be rejected since the node concurrency is saturated");
+        CHECK(processed_items.empty());
+
+        g.wait_for_all();
+
+        CHECK(processed_items.size() == 1);
+        CHECK_MESSAGE(processed_items[0] == 0, "Unexpected items processing");
+    });
+}
+
+void test_try_put_and_wait() {
+    test_try_put_and_wait_lightweight(tbb::flow::serial);
+    test_try_put_and_wait_lightweight(tbb::flow::unlimited);
+
+    test_try_put_and_wait_queueing(tbb::flow::serial);
+    test_try_put_and_wait_queueing(tbb::flow::unlimited);
+
+    test_try_put_and_wait_rejecting(tbb::flow::serial);
+}
+#endif // __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+
 //! Test various node bodies with concurrency
 //! \brief \ref error_guessing
 TEST_CASE("Concurrency test") {
-    for (unsigned int p = utils::MinThread; p <= utils::MaxThread; ++p) { test_concurrency(p); }
+    for(unsigned int p = utils::MinThread; p <= utils::MaxThread; ++p ) {
+        test_concurrency(p);
+    }
 }
 
 //! NativeParallelFor testing with various concurrency settings
 //! \brief \ref error_guessing
-TEST_CASE("Lightweight testing") { lightweight_testing::test<tbb::flow::function_node>(10); }
+TEST_CASE("Lightweight testing"){
+   lightweight_testing::test<tbb::flow::function_node>(10);
+}
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 //! Test follows and precedes API
 //! \brief \ref error_guessing
-TEST_CASE("Flowgraph node set test") { test_follows_and_precedes_api(); }
+TEST_CASE("Flowgraph node set test"){
+     test_follows_and_precedes_api();
+}
 #endif
 
 //! try_release and try_consume test
 //! \brief \ref error_guessing
-TEST_CASE("try_release try_consume") {
+TEST_CASE("try_release try_consume"){
     tbb::flow::graph g;
 
-    tbb::flow::function_node<int, int> fn(g, tbb::flow::unlimited, [](const int& v) { return v; });
+    tbb::flow::function_node<int, int> fn(g, tbb::flow::unlimited, [](const int&v){return v;});
 
-    CHECK_MESSAGE((fn.try_release() == false), "try_release should initially return false on a node");
-    CHECK_MESSAGE((fn.try_consume() == false), "try_consume should initially return false on a node");
+    CHECK_MESSAGE((fn.try_release()==false), "try_release should initially return false on a node");
+    CHECK_MESSAGE((fn.try_consume()==false), "try_consume should initially return false on a node");
 }
 
 #if __TBB_CPP20_CONCEPTS_PRESENT
@@ -483,24 +763,20 @@ TEST_CASE("try_release try_consume") {
 TEST_CASE("constraints for function_node input and output") {
     struct InputObject {
         InputObject() = default;
-        InputObject(const InputObject&) = default;
+        InputObject( const InputObject& ) = default;
     };
     struct OutputObject : test_concepts::Copyable {};
 
     static_assert(utils::well_formed_instantiation<tbb::flow::function_node, InputObject, OutputObject>);
     static_assert(utils::well_formed_instantiation<tbb::flow::function_node, int, int>);
-    static_assert(!utils::well_formed_instantiation<tbb::flow::function_node, test_concepts::NonCopyable,
-                                                    OutputObject>);
-    static_assert(!utils::well_formed_instantiation<tbb::flow::function_node,
-                                                    test_concepts::NonDefaultInitializable, OutputObject>);
-    static_assert(!utils::well_formed_instantiation<tbb::flow::function_node, InputObject,
-                                                    test_concepts::NonCopyable>);
+    static_assert(!utils::well_formed_instantiation<tbb::flow::function_node, test_concepts::NonCopyable, OutputObject>);
+    static_assert(!utils::well_formed_instantiation<tbb::flow::function_node, test_concepts::NonDefaultInitializable, OutputObject>);
+    static_assert(!utils::well_formed_instantiation<tbb::flow::function_node, InputObject, test_concepts::NonCopyable>);
 }
 
 template <typename Input, typename Output, typename Body>
-concept can_call_function_node_ctor
-        = requires(tbb::flow::graph& graph, std::size_t concurrency, Body body,
-                   tbb::flow::node_priority_t priority, tbb::flow::buffer_node<int>& f) {
+concept can_call_function_node_ctor = requires( tbb::flow::graph& graph, std::size_t concurrency, Body body,
+                                                tbb::flow::node_priority_t priority, tbb::flow::buffer_node<int>& f ) {
     tbb::flow::function_node<Input, Output>(graph, concurrency, body);
     tbb::flow::function_node<Input, Output>(graph, concurrency, body, priority);
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
@@ -516,15 +792,39 @@ TEST_CASE("constraints for function_node body") {
     using namespace test_concepts::function_node_body;
 
     static_assert(can_call_function_node_ctor<input_type, output_type, Correct<input_type, output_type>>);
-    static_assert(
-            !can_call_function_node_ctor<input_type, output_type, NonCopyable<input_type, output_type>>);
-    static_assert(
-            !can_call_function_node_ctor<input_type, output_type, NonDestructible<input_type, output_type>>);
-    static_assert(!can_call_function_node_ctor<input_type, output_type,
-                                               NoOperatorRoundBrackets<input_type, output_type>>);
-    static_assert(!can_call_function_node_ctor<input_type, output_type,
-                                               WrongInputRoundBrackets<input_type, output_type>>);
-    static_assert(!can_call_function_node_ctor<input_type, output_type,
-                                               WrongReturnRoundBrackets<input_type, output_type>>);
+    static_assert(!can_call_function_node_ctor<input_type, output_type, NonCopyable<input_type, output_type>>);
+    static_assert(!can_call_function_node_ctor<input_type, output_type, NonDestructible<input_type, output_type>>);
+    static_assert(!can_call_function_node_ctor<input_type, output_type, NoOperatorRoundBrackets<input_type, output_type>>);
+    static_assert(!can_call_function_node_ctor<input_type, output_type, WrongInputRoundBrackets<input_type, output_type>>);
+    static_assert(!can_call_function_node_ctor<input_type, output_type, WrongReturnRoundBrackets<input_type, output_type>>);
+}
+#endif // __TBB_CPP20_CONCEPTS_PRESENT
+
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+//! \brief \ref error_guessing
+TEST_CASE("test function_node try_put_and_wait") {
+    test_try_put_and_wait();
+}
+#endif
+
+// It was an issue when the critical task wrapper was allocated using the small object pool
+// of the task being wrapped. Since the original task creates under the aggregator, there is no
+// guarantee that the thread that requested the task creating is the same as actually created the task
+// Mismatch between memory pool caused internal assertion failure while deallocating the task
+//! \brief \ref regression
+TEST_CASE("test critical tasks memory pool correctness") {
+    using node_type = tbb::flow::function_node<int, tbb::flow::continue_msg>;
+    constexpr int num_iterations = 10000;
+    int num_calls = 0;
+    auto node_body = [&](int) { ++num_calls; };
+
+    tbb::flow::graph g;
+    node_type node(g, tbb::flow::serial, node_body, tbb::flow::node_priority_t{1});
+
+    for (int i = 0; i < num_iterations; ++i) {
+        node.try_put(i);
+    }
+
+    g.wait_for_all();
+    REQUIRE_MESSAGE(num_calls == num_iterations, "Incorrect number of body executions");
 }
-#endif// __TBB_CPP20_CONCEPTS_PRESENT
diff --git a/external/tbb/test/tbb/test_fuzzing.cpp b/external/tbb/test/tbb/test_fuzzing.cpp
new file mode 100644
index 00000000..38cd7f8a
--- /dev/null
+++ b/external/tbb/test/tbb/test_fuzzing.cpp
@@ -0,0 +1,41 @@
+/*
+    Copyright (c) 2023 Intel Corporation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+//! \file test_fuzzing.cpp
+//! \brief Test the [internal] of environment variables
+
+#include <fuzzer/FuzzedDataProvider.h>
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
+  FuzzedDataProvider provider(data, size);
+  for (auto var : {"INTEL_ITTNOTIFY_GROUPS", "INTEL_LIBITTNOTIFY32",
+                   "INTEL_LIBITTNOTIFY64", "KMP_FOR_TCHECK", "KMP_FOR_TPROFILE",
+                   "TBB_ENABLE_SANITIZERS", "TBB_MALLOC_DISABLE_REPLACEMENT",
+                   "TBB_MALLOC_SET_HUGE_SIZE_THRESHOLD",
+                   "TBB_MALLOC_USE_HUGE_PAGES", "TBB_VERSION"}) {
+    std::string val = provider.ConsumeRandomLengthString();
+#if _WIN32
+    _putenv_s(var, val.c_str());
+#else
+    setenv(var, val.c_str(), 1);
+#endif
+  }
+
+  if (std::system(CMD) != 0)
+    __builtin_trap();
+
+  return 0;
+}
diff --git a/external/tbb/test/tbb/test_global_control.cpp b/external/tbb/test/tbb/test_global_control.cpp
index 1690af4f..fddbbaf6 100644
--- a/external/tbb/test/tbb/test_global_control.cpp
+++ b/external/tbb/test/tbb/test_global_control.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -17,40 +17,41 @@
 //! \file test_global_control.cpp
 //! \brief Test for [sched.global_control] specification
 
-#define TBB_PREVIEW_WAITING_FOR_WORKERS 1
-
 #include "common/test.h"
 
-#include "common/spin_barrier.h"
 #include "common/utils.h"
+#include "common/spin_barrier.h"
 #include "common/utils_concurrency_limit.h"
 
 #include "tbb/global_control.h"
 #include "tbb/parallel_for.h"
-#include "tbb/task_arena.h"
 #include "tbb/task_group.h"
+#include "tbb/task_arena.h"
 
 #include <cstring>
 
 struct task_scheduler_handle_guard {
-    tbb::task_scheduler_handle m_handle {};
+    tbb::task_scheduler_handle m_handle{};
 
-    task_scheduler_handle_guard() { m_handle = tbb::task_scheduler_handle::get(); }
+    task_scheduler_handle_guard() {
+        m_handle = tbb::task_scheduler_handle{tbb::attach{}};
+    }
 
-    ~task_scheduler_handle_guard() { tbb::task_scheduler_handle::release(m_handle); }
+    ~task_scheduler_handle_guard() {
+        m_handle.release();
+    }
 
-    tbb::task_scheduler_handle& get() { return m_handle; }
+    tbb::task_scheduler_handle& get() {
+        return m_handle;
+    }
 };
 
 namespace TestBlockingTerminateNS {
 
-    struct EmptyBody {
-        void operator()() const {}
-        void operator()(int) const {}
-    };
-
     struct TestAutoInitBody {
-        void operator()(int) const { tbb::parallel_for(0, 100, EmptyBody()); }
+        void operator()( int ) const {
+            tbb::parallel_for( 0, 100, utils::DummyBody() );
+        }
     };
 
     static std::atomic<int> gSeed;
@@ -58,47 +59,51 @@ namespace TestBlockingTerminateNS {
 
     class TestMultpleWaitBody {
         bool myAutoInit;
-
     public:
-        TestMultpleWaitBody(bool autoInit = false) : myAutoInit(autoInit) {}
-        void operator()(int) const {
+        TestMultpleWaitBody( bool autoInit = false ) : myAutoInit( autoInit ) {}
+        void operator()( int ) const {
             task_scheduler_handle_guard init;
-            if (!myAutoInit) { tbb::parallel_for(0, 10, EmptyBody()); }
-            utils::FastRandom<> rnd(++gSeed);
+            if ( !myAutoInit ) {
+                tbb::parallel_for(0, 10, utils::DummyBody());
+            }
+            utils::FastRandom<> rnd( ++gSeed );
             // In case of auto init sub-tests we skip
             //  - case #4 to avoid recursion
             //  - case #5 because it is explicit initialization
             const int numCases = myAutoInit ? 4 : 6;
-            switch (rnd.get() % numCases) {
-                case 0: {
-                    tbb::task_arena a;
-                    a.enqueue(EmptyBody());
-                    break;
-                }
-                case 1: {
-                    tbb::task_group tg;
-                    EmptyBody eb;
-                    tg.run(eb);
-                    tg.wait();
-                    break;
-                }
-                case 2:
-                    tbb::parallel_for(0, 100, EmptyBody());
-                    break;
-                case 3:
-                    /* do nothing */
-                    break;
-                case 4:
-                    // Create and join several threads with auto initialized scheduler.
-                    utils::NativeParallelFor(rnd.get() % 5 + 1, TestMultpleWaitBody(true));
-                    break;
-                case 5: {
+            switch ( rnd.get() % numCases ) {
+            case 0: {
+                tbb::task_arena a;
+                a.enqueue(utils::DummyBody() );
+                break;
+            }
+            case 1: {
+                tbb::task_group tg;
+                utils::DummyBody eb;
+                tg.run( eb );
+                tg.wait();
+                break;
+            }
+            case 2:
+                tbb::parallel_for( 0, 100, utils::DummyBody() );
+                break;
+            case 3:
+                /* do nothing */
+                break;
+            case 4:
+                // Create and join several threads with auto initialized scheduler.
+                utils::NativeParallelFor( rnd.get() % 5 + 1, TestMultpleWaitBody( true ) );
+                break;
+            case 5:
+                {
                     task_scheduler_handle_guard init2;
-                    bool res = tbb::finalize(init2.get(), std::nothrow);
-                    REQUIRE(!res);
-                } break;
+                    bool res = tbb::finalize( init2.get(), std::nothrow );
+                    REQUIRE( !res );
+                }
+                break;
             }
-            if (!myAutoInit && tbb::finalize(init.get(), std::nothrow)) ++gNumSuccesses;
+            if ( !myAutoInit && tbb::finalize( init.get(), std::nothrow ) )
+                ++gNumSuccesses;
         }
     };
 
@@ -108,29 +113,33 @@ namespace TestBlockingTerminateNS {
         const int numRepeats = 5;
         // Initialize seed with different values on different machines.
         gSeed = tbb::this_task_arena::max_concurrency();
-        for (int repeats = 0; repeats < numRepeats; ++repeats) {
-            for (int threads = minThreads; threads < maxThreads; ++threads) {
+        for ( int repeats = 0; repeats<numRepeats; ++repeats ) {
+            for ( int threads = minThreads; threads<maxThreads; ++threads ) {
                 gNumSuccesses = 0;
-                utils::NativeParallelFor(threads, TestMultpleWaitBody());
-                REQUIRE_MESSAGE(gNumSuccesses > 0, "At least one blocking terminate must return 'true'");
+                utils::NativeParallelFor( threads, TestMultpleWaitBody() );
+                REQUIRE_MESSAGE( gNumSuccesses > 0, "At least one blocking terminate must return 'true'" );
             }
         }
     }
 
 #if TBB_USE_EXCEPTIONS
     template <typename F>
-    void TestException(F& f) {
-        utils::suppress_unused_warning(f);
+    void TestException( F &f ) {
+        utils::suppress_unused_warning( f );
         bool caught = false;
         try {
             f();
-            REQUIRE(false);
-        } catch (const tbb::unsafe_wait& e) {
+            REQUIRE( false );
+        }
+        catch ( const tbb::unsafe_wait& e) {
             const char* msg = e.what();
             REQUIRE((msg && std::strlen(msg) != 0));
             caught = true;
-        } catch (...) { REQUIRE(false); }
-        REQUIRE(caught);
+        }
+        catch ( ... ) {
+            REQUIRE( false );
+        }
+        REQUIRE( caught );
     }
 
     class ExceptionTest1 {
@@ -138,28 +147,26 @@ namespace TestBlockingTerminateNS {
         int myIndex;
 
     public:
-        ExceptionTest1(int index) : myIndex(index) {}
+        ExceptionTest1( int index ) : myIndex( index ) {}
 
         void operator()() {
             task_scheduler_handle_guard tsi2;
-            tbb::parallel_for(0, 2, EmptyBody());// auto-init
+            tbb::parallel_for(0, 2, utils::DummyBody()); // auto-init
             tbb::finalize((myIndex == 0 ? tsi1.get() : tsi2.get()));
-            REQUIRE_MESSAGE(false, "Blocking terminate did not throw the exception");
+            REQUIRE_MESSAGE( false, "Blocking terminate did not throw the exception" );
         }
     };
 
     struct ExceptionTest2 {
         class Body {
             utils::SpinBarrier& myBarrier;
-
         public:
-            Body(utils::SpinBarrier& barrier) : myBarrier(barrier) {}
-            void operator()(int) const {
+            Body( utils::SpinBarrier& barrier ) : myBarrier( barrier ) {}
+            void operator()( int ) const {
                 myBarrier.wait();
                 task_scheduler_handle_guard init;
-                tbb::finalize(init.get());
-                REQUIRE_MESSAGE(false,
-                                "Blocking terminate did not throw the exception inside the parallel region");
+                tbb::finalize( init.get() );
+                REQUIRE_MESSAGE( false, "Blocking terminate did not throw the exception inside the parallel region" );
             }
         };
         void operator()() {
@@ -176,9 +183,9 @@ namespace TestBlockingTerminateNS {
 
     void TestExceptions() {
         ExceptionTest1 Test1(0);
-        TestException(Test1);
+        TestException( Test1 );
         ExceptionTest1 Test2(1);
-        TestException(Test2);
+        TestException( Test2 );
         if (utils::get_platform_max_threads() > 1) {
             // TODO: Fix the arena leak issue on single threaded machine
             // (see https://github.com/oneapi-src/oneTBB/issues/396)
@@ -189,13 +196,15 @@ namespace TestBlockingTerminateNS {
 
 #endif /* TBB_USE_EXCEPTIONS */
 
-}// namespace TestBlockingTerminateNS
+} // namespace TestBlockingTerminateNS
 
 void TestTerminationAndAutoinit(bool autoinit) {
     task_scheduler_handle_guard ctl1;
     task_scheduler_handle_guard ctl2;
 
-    if (autoinit) { tbb::parallel_for(0, 10, TestBlockingTerminateNS::EmptyBody()); }
+    if (autoinit) {
+        tbb::parallel_for(0, 10, utils::DummyBody());
+    }
     bool res1 = tbb::finalize(ctl1.get(), std::nothrow);
     if (autoinit) {
         REQUIRE(!res1);
@@ -209,118 +218,57 @@ void TestTerminationAndAutoinit(bool autoinit) {
 //! Check no reference leak for an external thread
 //! \brief \ref regression \ref error_guessing
 TEST_CASE("test decrease reference") {
-    tbb::task_scheduler_handle handle = tbb::task_scheduler_handle::get();
+    tbb::task_scheduler_handle handle = tbb::task_scheduler_handle{tbb::attach{}};
 
-    std::thread thr([] { tbb::parallel_for(0, 1, [](int) {}); });
+    std::thread thr([] { tbb::parallel_for(0, 1, [](int) {}); } );
     thr.join();
 
     REQUIRE(tbb::finalize(handle, std::nothrow));
 }
 
-//! Testing lifetime control conformance
-//! \brief \ref interface \ref requirement
-TEST_CASE("prolong lifetime simple") {
-    tbb::task_scheduler_handle hdl1 = tbb::task_scheduler_handle::get();
-    {
-        tbb::parallel_for(0, 10, TestBlockingTerminateNS::EmptyBody());
-
-        tbb::task_scheduler_handle hdl2 = tbb::task_scheduler_handle::get();
-        tbb::task_scheduler_handle::release(hdl2);
-    }
-    bool ok = tbb::finalize(hdl1, std::nothrow);
-    REQUIRE(ok);
-}
-
-//! Testing lifetime control conformance
-//! \brief \ref interface \ref requirement
-TEST_CASE("prolong lifetime simple 2") {
+//! Testing lifetime control
+//! \brief \ref error_guessing
+TEST_CASE("prolong lifetime auto init") {
     TestTerminationAndAutoinit(false);
     TestTerminationAndAutoinit(true);
 }
 
-//! Testing handle check for emptiness
-//! \brief \ref interface \ref requirement
-TEST_CASE("null handle check") {
-    tbb::task_scheduler_handle hndl;
-    REQUIRE_FALSE(hndl);
-}
-
-//! Testing handle check for emptiness
-//! \brief \ref interface \ref requirement
-TEST_CASE("null handle check 2") {
-    tbb::task_scheduler_handle hndl = tbb::task_scheduler_handle::get();
-    bool not_empty = (bool) hndl;
-
-    tbb::finalize(hndl, std::nothrow);
-
-    REQUIRE(not_empty);
-    REQUIRE_FALSE(hndl);
-}
-
-//! Testing handle check for emptiness
-//! \brief \ref interface \ref requirement
-TEST_CASE("null handle check 3") {
-    tbb::task_scheduler_handle handle1 = tbb::task_scheduler_handle::get();
-    tbb::task_scheduler_handle handle2(std::move(handle1));
-
-    bool handle1_empty = !handle1;
-    bool handle2_not_empty = (bool) handle2;
-
-    tbb::finalize(handle2, std::nothrow);
-
-    REQUIRE(handle1_empty);
-    REQUIRE(handle2_not_empty);
-}
-
 #if TBB_USE_EXCEPTIONS
 //! Testing lifetime control advanced
-//! \brief \ref interface \ref requirement
+//! \brief \ref error_guessing
 TEST_CASE("prolong lifetime advanced") {
-    // Exceptions test leaves auto-initialized sheduler after,
+    // Exceptions test leaves auto-initialized scheduler after,
     // because all blocking terminate calls are inside the parallel region,
     // thus resulting in false termination result.
-    utils::NativeParallelFor(1, [&](int) { TestBlockingTerminateNS::TestExceptions(); });
+    utils::NativeParallelFor(1,
+        [&](int) { TestBlockingTerminateNS::TestExceptions(); });
 }
 #endif
 
+#if !EMSCRIPTEN
 //! Testing multiple wait
-//! \brief \ref interface \ref requirement
-TEST_CASE("prolong lifetime multiple wait") { TestBlockingTerminateNS::TestMultpleWait(); }
-
-//! Testing  global_control is created on one thread and destroyed on another.
-//! \brief \ref interface \ref requirement
-TEST_CASE("cross thread 1") {
-    // created GC, parallel_for on another thread - finalize
-    tbb::task_scheduler_handle ctl = tbb::task_scheduler_handle::get();
-    utils::NativeParallelFor(1, [&](int) {
-        tbb::parallel_for(0, 10, TestBlockingTerminateNS::EmptyBody());
-        bool res = tbb::finalize(ctl, std::nothrow);
-        REQUIRE(res);
-    });
+//! \brief \ref error_guessing
+TEST_CASE("prolong lifetime multiple wait") {
+    TestBlockingTerminateNS::TestMultpleWait();
 }
+#endif
 
-//! Testing  global_control is created on one thread and destroyed on another.
-//! \brief \ref interface \ref requirement
-TEST_CASE("cross thread 2") {
-    // created GC, called parallel_for on this thread, killed the thread - and finalize on another thread
-    tbb::task_scheduler_handle ctl;
-    utils::NativeParallelFor(1, [&](int) {
-        ctl = tbb::task_scheduler_handle::get();
-        tbb::parallel_for(0, 10, TestBlockingTerminateNS::EmptyBody());
+//! \brief \ref regression
+TEST_CASE("test concurrent task_scheduler_handle destruction") {
+    std::atomic<bool> stop{ false };
+    std::thread thr1([&] {
+        while (!stop) {
+            auto h = tbb::task_scheduler_handle{ tbb::attach{} };
+            tbb::finalize(h, std::nothrow_t{});
+        }
     });
-    bool res = tbb::finalize(ctl, std::nothrow);
-    REQUIRE(res);
-}
 
-//! Testing multiple wait
-//! \brief \ref interface \ref requirement
-TEST_CASE("simple prolong lifetime 3") {
-    // Parallel region
-    tbb::parallel_for(0, 10, TestBlockingTerminateNS::EmptyBody());
-    // Termination
-    tbb::task_scheduler_handle ctl = tbb::task_scheduler_handle::get();
-    bool res = tbb::finalize(ctl, std::nothrow);
-    REQUIRE(res);
-    // New parallel region
-    tbb::parallel_for(0, 10, TestBlockingTerminateNS::EmptyBody());
+    for (int i = 0; i < 1000; ++i) {
+        std::thread thr2([] {
+            tbb::parallel_for(0, 1, [](int) {});
+        });
+        thr2.join();
+    }
+    stop = true;
+    thr1.join();
 }
diff --git a/external/tbb/test/tbb/test_handle_perror.cpp b/external/tbb/test/tbb/test_handle_perror.cpp
index ee396c89..ef869a5f 100644
--- a/external/tbb/test/tbb/test_handle_perror.cpp
+++ b/external/tbb/test/tbb/test_handle_perror.cpp
@@ -23,21 +23,23 @@
 
 #define __TBB_NO_IMPLICIT_LINKAGE 1
 
-#include "../../src/tbb/assert_impl.h"// Out-of-line TBB assertion handling routines are instantiated here.
-#include "../../src/tbb/exception.cpp"
+#include "../../src/tbb/assert_impl.h" // Out-of-line TBB assertion handling routines are instantiated here.
 #include "common/test.h"
 #include "oneapi/tbb/detail/_exception.h"
+#include "../../src/tbb/exception.cpp"
+#include <stdexcept>
 #include <cerrno>
 #include <iostream>
-#include <stdexcept>
 
 namespace tbb {
-    namespace detail {
-        namespace r1 {
-            bool terminate_on_exception() { return false; }
-        }// namespace r1
-    }    // namespace detail
-}// namespace tbb
+namespace detail {
+namespace r1 {
+bool terminate_on_exception() {
+    return false;
+}
+}
+}
+}
 
 #if TBB_USE_EXCEPTIONS
 
@@ -47,7 +49,7 @@ TEST_CASE("test tbb::detail::r1::handle_perror") {
 
     try {
         tbb::detail::r1::handle_perror(EAGAIN, "apple");
-    } catch (std::runtime_error& e) {
+    } catch( std::runtime_error& e ) {
         REQUIRE(std::memcmp(e.what(), "apple: ", 7) == 0);
         REQUIRE_MESSAGE(std::strlen(std::strstr(e.what(), std::strerror(EAGAIN))), "Bad error message");
         caught = true;
@@ -55,4 +57,4 @@ TEST_CASE("test tbb::detail::r1::handle_perror") {
     REQUIRE(caught);
 }
 
-#endif// TBB_USE_EXCEPTIONS
+#endif // TBB_USE_EXCEPTIONS
diff --git a/external/tbb/test/tbb/test_hw_concurrency.cpp b/external/tbb/test/tbb/test_hw_concurrency.cpp
index 7534d3e4..115a8f34 100644
--- a/external/tbb/test/tbb/test_hw_concurrency.cpp
+++ b/external/tbb/test/tbb/test_hw_concurrency.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -22,33 +22,32 @@
 #include "common/utils.h"
 #if !__TBB_TEST_SKIP_AFFINITY
 #include "common/utils_concurrency_limit.h"
-#include "tbb/blocked_range.h"
-#include "tbb/blocked_range2d.h"
-#include "tbb/blocked_range3d.h"
-#include "tbb/cache_aligned_allocator.h"
-#include "tbb/combinable.h"
-#include "tbb/concurrent_hash_map.h"
-#include "tbb/concurrent_map.h"
-#include "tbb/concurrent_priority_queue.h"
+#include "tbb/global_control.h"
+#include "tbb/enumerable_thread_specific.h"
+#include "tbb/task_arena.h"
+#include "tbb/concurrent_vector.h"
 #include "tbb/concurrent_queue.h"
-#include "tbb/concurrent_set.h"
+#include "tbb/concurrent_priority_queue.h"
+#include "tbb/concurrent_hash_map.h"
 #include "tbb/concurrent_unordered_map.h"
 #include "tbb/concurrent_unordered_set.h"
-#include "tbb/concurrent_vector.h"
-#include "tbb/enumerable_thread_specific.h"
-#include "tbb/global_control.h"
+#include "tbb/concurrent_map.h"
+#include "tbb/concurrent_set.h"
+#include "tbb/cache_aligned_allocator.h"
+#include "tbb/scalable_allocator.h"
+#include "tbb/tbb_allocator.h"
 #include "tbb/null_mutex.h"
 #include "tbb/null_rw_mutex.h"
 #include "tbb/queuing_mutex.h"
 #include "tbb/queuing_rw_mutex.h"
-#include "tbb/scalable_allocator.h"
 #include "tbb/spin_mutex.h"
 #include "tbb/spin_rw_mutex.h"
-#include "tbb/task_arena.h"
-#include "tbb/tbb_allocator.h"
 #include "tbb/tick_count.h"
-#define TBB_PREVIEW_BLOCKED_RANGE_ND 1
-#include "tbb/blocked_rangeNd.h"
+#include "tbb/combinable.h"
+#include "tbb/blocked_range.h"
+#include "tbb/blocked_range2d.h"
+#include "tbb/blocked_range3d.h"
+#include "tbb/blocked_nd_range.h"
 
 // Declaration of global objects are needed to check that
 // it does not initialize the task scheduler, and in particular
@@ -87,7 +86,7 @@ tbb::tick_count test_tc;
 tbb::blocked_range<std::size_t> br(0, 1);
 tbb::blocked_range2d<std::size_t> br2d(0, 1, 0, 1);
 tbb::blocked_range3d<std::size_t> br3d(0, 1, 0, 1, 0, 1);
-tbb::blocked_rangeNd<std::size_t, 2> brNd({0, 1}, {0, 1});
+tbb::blocked_nd_range<std::size_t, 2> brNd({0, 1}, {0, 1});
 
 //! \brief \ref error_guessing
 TEST_CASE("Check absence of scheduler initialization") {
@@ -95,10 +94,9 @@ TEST_CASE("Check absence of scheduler initialization") {
 
     if (maxProcs >= 2) {
         int availableProcs = maxProcs / 2;
-        REQUIRE_MESSAGE(utils::limit_number_of_threads(availableProcs) == availableProcs,
-                        "limit_number_of_threads has not set the requested limitation");
+        REQUIRE_MESSAGE(utils::limit_number_of_threads(availableProcs) == availableProcs, "limit_number_of_threads has not set the requested limitation");
         REQUIRE(tbb::this_task_arena::max_concurrency() == availableProcs);
     }
 }
 
-#endif// !__TBB_TEST_SKIP_AFFINITY
+#endif // !__TBB_TEST_SKIP_AFFINITY
diff --git a/external/tbb/test/tbb/test_implicit_linkage_on_windows.cpp b/external/tbb/test/tbb/test_implicit_linkage_on_windows.cpp
index fa4f926e..250259d6 100644
--- a/external/tbb/test/tbb/test_implicit_linkage_on_windows.cpp
+++ b/external/tbb/test/tbb/test_implicit_linkage_on_windows.cpp
@@ -25,6 +25,8 @@
 //! \brief \ref error_guessing \ref interface
 TEST_CASE("Test implicit linkage") {
     // Pulling something from the library so that it is indeed required during the linkage
-    REQUIRE_MESSAGE(TBB_runtime_interface_version() == TBB_INTERFACE_VERSION,
-                    "Running with the library of different version than the test was compiled against.");
+    REQUIRE_MESSAGE(
+        TBB_runtime_interface_version()==TBB_INTERFACE_VERSION,
+        "Running with the library of different version than the test was compiled against."
+    );
 }
diff --git a/external/tbb/test/tbb/test_indexer_node.cpp b/external/tbb/test/tbb/test_indexer_node.cpp
index 4b8962b2..c47a8cad 100644
--- a/external/tbb/test/tbb/test_indexer_node.cpp
+++ b/external/tbb/test/tbb/test_indexer_node.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
 #endif
 
 #include "common/config.h"
@@ -23,78 +23,85 @@
 #include "tbb/flow_graph.h"
 
 #include "common/test.h"
-#include "common/test_follows_and_precedes_api.h"
 #include "common/utils.h"
 #include "common/utils_assert.h"
+#include "common/test_follows_and_precedes_api.h"
+
 
 //! \file test_indexer_node.cpp
 //! \brief Test for [flow_graph.indexer_node] specification
 
+
 #if defined(_MSC_VER) && _MSC_VER < 1600
-#pragma warning(disable : 4503)//disabling the "decorated name length exceeded" warning for VS2008 and earlier
+    #pragma warning (disable : 4503) //disabling the "decorated name length exceeded" warning for VS2008 and earlier
 #endif
 
 const int Count = 150;
 const int MaxPorts = 10;
-const int MaxNInputs = 5;// max # of input_nodes to register for each indexer_node input in parallel test
-bool outputCheck[MaxPorts][Count];// for checking output
-
-void check_outputCheck(int nUsed, int maxCnt) {
-    for (int i = 0; i < nUsed; ++i) {
-        for (int j = 0; j < maxCnt; ++j) { CHECK_MESSAGE(outputCheck[i][j], ""); }
+const int MaxNInputs = 5; // max # of input_nodes to register for each indexer_node input in parallel test
+bool outputCheck[MaxPorts][Count];  // for checking output
+
+void
+check_outputCheck( int nUsed, int maxCnt) {
+    for(int i=0; i < nUsed; ++i) {
+        for( int j = 0; j < maxCnt; ++j) {
+            CHECK_MESSAGE(outputCheck[i][j], "");
+        }
     }
 }
 
-void reset_outputCheck(int nUsed, int maxCnt) {
-    for (int i = 0; i < nUsed; ++i) {
-        for (int j = 0; j < maxCnt; ++j) { outputCheck[i][j] = false; }
+void
+reset_outputCheck( int nUsed, int maxCnt) {
+    for(int i=0; i < nUsed; ++i) {
+        for( int j = 0; j < maxCnt; ++j) {
+            outputCheck[i][j] = false;
+        }
     }
 }
 
 class test_class {
-public:
-    test_class() { my_val = 0; }
-    test_class(int i) { my_val = i; }
-    operator int() { return my_val; }
-
-private:
-    int my_val;
+    public:
+        test_class() { my_val = 0; }
+        test_class(int i) { my_val = i; }
+        operator int() { return my_val; }
+    private:
+        int my_val;
 };
 
-template <typename T>
+template<typename T>
 class name_of {
 public:
-    static const char *name() { return "Unknown"; }
+    static const char* name() { return  "Unknown"; }
 };
-template <>
+template<>
 class name_of<int> {
 public:
-    static const char *name() { return "int"; }
+    static const char* name() { return  "int"; }
 };
-template <>
+template<>
 class name_of<float> {
 public:
-    static const char *name() { return "float"; }
+    static const char* name() { return  "float"; }
 };
-template <>
+template<>
 class name_of<double> {
 public:
-    static const char *name() { return "double"; }
+    static const char* name() { return  "double"; }
 };
-template <>
+template<>
 class name_of<long> {
 public:
-    static const char *name() { return "long"; }
+    static const char* name() { return  "long"; }
 };
-template <>
+template<>
 class name_of<short> {
 public:
-    static const char *name() { return "short"; }
+    static const char* name() { return  "short"; }
 };
-template <>
+template<>
 class name_of<test_class> {
 public:
-    static const char *name() { return "test_class"; }
+    static const char* name() { return  "test_class"; }
 };
 
 // TT must be arithmetic, and shouldn't wrap around for reasonable sizes of Count (which is now 150, and maxPorts is 10,
@@ -104,22 +111,20 @@ class name_of<test_class> {
 // to receive.  If there is only one input node, the series order will be maintained; if more than one,
 // this is not guaranteed.
 // The manual specifies bodies can be assigned, so we can't hide the operator=.
-template <typename TT>
+template<typename TT>
 class my_input_body {
     TT my_mult;
     int my_count;
     int addend;
-
 public:
-    my_input_body(TT multiplier, int init_val, int addto)
-        : my_mult(multiplier), my_count(init_val), addend(addto) {}
-    TT operator()(tbb::flow_control &fc) {
+    my_input_body(TT multiplier, int init_val, int addto) : my_mult(multiplier), my_count(init_val), addend(addto) { }
+    TT operator()( tbb::flow_control& fc) {
         int lc = my_count;
-        TT ret = my_mult * (TT) my_count;
+        TT ret = my_mult * (TT)my_count;
         my_count += addend;
-        if (lc < Count) {
+        if ( lc < Count){
             return ret;
-        } else {
+        }else{
             fc.stop();
             return TT();
         }
@@ -128,7 +133,7 @@ class my_input_body {
 
 // allocator for indexer_node.
 
-template <typename IType>
+template<typename IType>
 class makeIndexer {
 public:
     static IType *create() {
@@ -138,95 +143,96 @@ class makeIndexer {
     static void destroy(IType *p) { delete p; }
 };
 
-template <int ELEM, typename INT>
+template<int ELEM, typename INT>
 struct getval_helper {
 
     typedef typename INT::output_type OT;
-    typedef typename std::tuple_element<ELEM - 1, typename INT::tuple_types>::type stored_type;
+    typedef typename std::tuple_element<ELEM-1, typename INT::tuple_types>::type stored_type;
 
     static int get_integer_val(OT const &o) {
         stored_type res = tbb::flow::cast_to<stored_type>(o);
-        return (int) res;
+        return (int)res;
     }
 };
 
 // holder for input_node pointers for eventual deletion
 
-static void *all_input_nodes[MaxPorts][MaxNInputs];
+static void* all_input_nodes[MaxPorts][MaxNInputs];
 
-template <int ELEM, typename INT>
+template<int ELEM, typename INT>
 class input_node_helper {
 public:
     typedef INT indexer_node_type;
     typedef typename indexer_node_type::output_type TT;
-    typedef typename std::tuple_element<ELEM - 1, typename INT::tuple_types>::type IT;
+    typedef typename std::tuple_element<ELEM-1,typename INT::tuple_types>::type IT;
     typedef typename tbb::flow::input_node<IT> my_input_node_type;
     static void print_remark() {
-        input_node_helper<ELEM - 1, INT>::print_remark();
+        input_node_helper<ELEM-1,INT>::print_remark();
         INFO(", " << name_of<IT>::name());
     }
     static void add_input_nodes(indexer_node_type &my_indexer, tbb::flow::graph &g, int nInputs) {
-        for (int i = 0; i < nInputs; ++i) {
-            my_input_node_type *new_node
-                    = new my_input_node_type(g, my_input_body<IT>((IT)(ELEM + 1), i, nInputs));
-            tbb::flow::make_edge(*new_node, tbb::flow::input_port<ELEM - 1>(my_indexer));
+        for(int i=0; i < nInputs; ++i) {
+            my_input_node_type *new_node = new my_input_node_type(g, my_input_body<IT>((IT)(ELEM+1), i, nInputs));
+            tbb::flow::make_edge(*new_node, tbb::flow::input_port<ELEM-1>(my_indexer));
 
-            all_input_nodes[ELEM - 1][i] = (void *) new_node;
+            all_input_nodes[ELEM-1][i] = (void *)new_node;
             new_node->activate();
         }
 
         // add the next input_node
-        input_node_helper<ELEM - 1, INT>::add_input_nodes(my_indexer, g, nInputs);
+        input_node_helper<ELEM-1, INT>::add_input_nodes(my_indexer, g, nInputs);
     }
     static void check_value(TT &v) {
-        if (v.tag() == ELEM - 1) {
-            int ival = getval_helper<ELEM, INT>::get_integer_val(v);
-            CHECK_MESSAGE(!(ival % (ELEM + 1)), "");
-            ival /= (ELEM + 1);
-            CHECK_MESSAGE(!outputCheck[ELEM - 1][ival], "");
-            outputCheck[ELEM - 1][ival] = true;
-        } else {
-            input_node_helper<ELEM - 1, INT>::check_value(v);
+        if(v.tag() == ELEM-1) {
+            int ival = getval_helper<ELEM,INT>::get_integer_val(v);
+            CHECK_MESSAGE(!(ival%(ELEM+1)), "");
+            ival /= (ELEM+1);
+            CHECK_MESSAGE(!outputCheck[ELEM-1][ival], "");
+            outputCheck[ELEM-1][ival] = true;
+        }
+        else {
+            input_node_helper<ELEM-1,INT>::check_value(v);
         }
     }
 
-    static void remove_input_nodes(indexer_node_type &my_indexer, int nInputs) {
-        for (int i = 0; i < nInputs; ++i) {
-            my_input_node_type *dp = reinterpret_cast<my_input_node_type *>(all_input_nodes[ELEM - 1][i]);
-            tbb::flow::remove_edge(*dp, tbb::flow::input_port<ELEM - 1>(my_indexer));
+    static void remove_input_nodes(indexer_node_type& my_indexer, int nInputs) {
+        for(int i=0; i< nInputs; ++i) {
+            my_input_node_type *dp = reinterpret_cast<my_input_node_type *>(all_input_nodes[ELEM-1][i]);
+            tbb::flow::remove_edge(*dp, tbb::flow::input_port<ELEM-1>(my_indexer));
             delete dp;
         }
-        input_node_helper<ELEM - 1, INT>::remove_input_nodes(my_indexer, nInputs);
+        input_node_helper<ELEM-1, INT>::remove_input_nodes(my_indexer, nInputs);
     }
 };
 
-template <typename INT>
+template<typename INT>
 class input_node_helper<1, INT> {
     typedef INT indexer_node_type;
     typedef typename indexer_node_type::output_type TT;
 
     typedef typename std::tuple_element<0, typename INT::tuple_types>::type IT;
     typedef typename tbb::flow::input_node<IT> my_input_node_type;
-
 public:
-    static void print_remark() { INFO("Parallel test of indexer_node< " << name_of<IT>::name()); }
+    static void print_remark() {
+        INFO("Parallel test of indexer_node< " << name_of<IT>::name());
+    }
     static void add_input_nodes(indexer_node_type &my_indexer, tbb::flow::graph &g, int nInputs) {
-        for (int i = 0; i < nInputs; ++i) {
-            my_input_node_type *new_node = new my_input_node_type(g, my_input_body<IT>((IT) 2, i, nInputs));
+        for(int i=0; i < nInputs; ++i) {
+            my_input_node_type *new_node = new my_input_node_type(g, my_input_body<IT>((IT)2, i, nInputs));
             tbb::flow::make_edge(*new_node, tbb::flow::input_port<0>(my_indexer));
-            all_input_nodes[0][i] = (void *) new_node;
+            all_input_nodes[0][i] = (void *)new_node;
             new_node->activate();
         }
     }
     static void check_value(TT &v) {
-        int ival = getval_helper<1, INT>::get_integer_val(v);
-        CHECK_MESSAGE(!(ival % 2), "");
+        int ival = getval_helper<1,INT>::get_integer_val(v);
+        CHECK_MESSAGE(!(ival%2), "");
         ival /= 2;
         CHECK_MESSAGE(!outputCheck[0][ival], "");
         outputCheck[0][ival] = true;
     }
-    static void remove_input_nodes(indexer_node_type &my_indexer, int nInputs) {
-        for (int i = 0; i < nInputs; ++i) {
+    static void remove_input_nodes(indexer_node_type& my_indexer, int nInputs) {
+        for(int i=0; i < nInputs; ++i) {
             my_input_node_type *dp = reinterpret_cast<my_input_node_type *>(all_input_nodes[0][i]);
             tbb::flow::remove_edge(*dp, tbb::flow::input_port<0>(my_indexer));
             delete dp;
@@ -234,7 +240,7 @@ class input_node_helper<1, INT> {
     }
 };
 
-template <typename IType>
+template<typename IType>
 class parallel_test {
 public:
     typedef typename IType::output_type TType;
@@ -242,14 +248,16 @@ class parallel_test {
     static const int SIZE = std::tuple_size<union_types>::value;
     static void test() {
         TType v;
-        input_node_helper<SIZE, IType>::print_remark();
+        input_node_helper<SIZE,IType>::print_remark();
         INFO(" >\n");
-        for (int i = 0; i < MaxPorts; ++i) {
-            for (int j = 0; j < MaxNInputs; ++j) { all_input_nodes[i][j] = NULL; }
+        for(int i=0; i < MaxPorts; ++i) {
+            for(int j=0; j < MaxNInputs; ++j) {
+                all_input_nodes[i][j] = nullptr;
+            }
         }
-        for (int nInputs = 1; nInputs <= MaxNInputs; ++nInputs) {
+        for(int nInputs = 1; nInputs <= MaxNInputs; ++nInputs) {
             tbb::flow::graph g;
-            IType *my_indexer_ptr = new IType(g);//makeIndexer<IType>::create();
+            IType* my_indexer_ptr = new IType(g); //makeIndexer<IType>::create();
             IType my_indexer = *my_indexer_ptr;
             tbb::flow::queue_node<TType> outq1(g);
             tbb::flow::queue_node<TType> outq2(g);
@@ -263,7 +271,7 @@ class parallel_test {
             makeIndexer<IType>::destroy(my_indexer_ptr);
 
             reset_outputCheck(SIZE, Count);
-            for (int i = 0; i < Count * SIZE; ++i) {
+            for(int i=0; i < Count*SIZE; ++i) {
                 CHECK_MESSAGE(outq1.try_get(v), "");
                 input_node_helper<SIZE, IType>::check_value(v);
             }
@@ -271,9 +279,8 @@ class parallel_test {
             check_outputCheck(SIZE, Count);
             reset_outputCheck(SIZE, Count);
 
-            for (int i = 0; i < Count * SIZE; i++) {
+            for(int i=0; i < Count*SIZE; i++) {
                 CHECK_MESSAGE(outq2.try_get(v), "");
-                ;
                 input_node_helper<SIZE, IType>::check_value(v);
             }
             check_outputCheck(SIZE, Count);
@@ -290,228 +297,277 @@ class parallel_test {
 
 std::vector<int> last_index_seen;
 
-template <int ELEM, typename IType>
+template<int ELEM, typename IType>
 class serial_queue_helper {
 public:
     typedef typename IType::output_type OT;
     typedef typename IType::tuple_types TT;
-    typedef typename std::tuple_element<ELEM - 1, TT>::type IT;
+    typedef typename std::tuple_element<ELEM-1,TT>::type IT;
     static void print_remark() {
-        serial_queue_helper<ELEM - 1, IType>::print_remark();
+        serial_queue_helper<ELEM-1,IType>::print_remark();
         INFO("," << name_of<IT>::name());
     }
     static void fill_one_queue(int maxVal, IType &my_indexer) {
         // fill queue to "left" of me
-        serial_queue_helper<ELEM - 1, IType>::fill_one_queue(maxVal, my_indexer);
-        for (int i = 0; i < maxVal; ++i) {
-            CHECK_MESSAGE(tbb::flow::input_port<ELEM - 1>(my_indexer).try_put((IT)(i * (ELEM + 1))), "");
+        serial_queue_helper<ELEM-1,IType>::fill_one_queue(maxVal,my_indexer);
+        for(int i = 0; i < maxVal; ++i) {
+            CHECK_MESSAGE(tbb::flow::input_port<ELEM-1>(my_indexer).try_put((IT)(i*(ELEM+1))), "");
         }
     }
     static void put_one_queue_val(int myVal, IType &my_indexer) {
         // put this val to my "left".
-        serial_queue_helper<ELEM - 1, IType>::put_one_queue_val(myVal, my_indexer);
-        CHECK_MESSAGE(tbb::flow::input_port<ELEM - 1>(my_indexer).try_put((IT)(myVal * (ELEM + 1))), "");
+        serial_queue_helper<ELEM-1,IType>::put_one_queue_val(myVal, my_indexer);
+        CHECK_MESSAGE(tbb::flow::input_port<ELEM-1>(my_indexer).try_put((IT)(myVal*(ELEM+1))), "");
     }
     static void check_queue_value(OT &v) {
-        if (ELEM - 1 == v.tag()) {
+        if(ELEM - 1 == v.tag()) {
             // this assumes each or node input is queueing.
-            int rval = getval_helper<ELEM, IType>::get_integer_val(v);
-            CHECK_MESSAGE(rval == (last_index_seen[ELEM - 1] + 1) * (ELEM + 1), "");
-            last_index_seen[ELEM - 1] = rval / (ELEM + 1);
-        } else {
-            serial_queue_helper<ELEM - 1, IType>::check_queue_value(v);
+            int rval = getval_helper<ELEM,IType>::get_integer_val(v);
+            CHECK_MESSAGE( rval == (last_index_seen[ELEM-1]+1)*(ELEM+1), "");
+            last_index_seen[ELEM-1] = rval / (ELEM+1);
+        }
+        else {
+            serial_queue_helper<ELEM-1,IType>::check_queue_value(v);
         }
     }
 };
 
-template <typename IType>
+template<typename IType>
 class serial_queue_helper<1, IType> {
 public:
     typedef typename IType::output_type OT;
     typedef typename IType::tuple_types TT;
-    typedef typename std::tuple_element<0, TT>::type IT;
-    static void print_remark() { INFO("Serial test of indexer_node< " << name_of<IT>::name()); }
+    typedef typename std::tuple_element<0,TT>::type IT;
+    static void print_remark() {
+        INFO("Serial test of indexer_node< " << name_of<IT>::name());
+    }
     static void fill_one_queue(int maxVal, IType &my_indexer) {
-        for (int i = 0; i < maxVal; ++i) {
-            CHECK_MESSAGE(tbb::flow::input_port<0>(my_indexer).try_put((IT)(i * 2)), "");
+        for(int i = 0; i < maxVal; ++i) {
+            CHECK_MESSAGE(tbb::flow::input_port<0>(my_indexer).try_put((IT)(i*2)), "");
         }
     }
     static void put_one_queue_val(int myVal, IType &my_indexer) {
-        CHECK_MESSAGE(tbb::flow::input_port<0>(my_indexer).try_put((IT)(myVal * 2)), "");
+        CHECK_MESSAGE(tbb::flow::input_port<0>(my_indexer).try_put((IT)(myVal*2)), "");
     }
     static void check_queue_value(OT &v) {
-        CHECK_MESSAGE(v.tag() == 0, "");// won't get here unless true
-        int rval = getval_helper<1, IType>::get_integer_val(v);
-        CHECK_MESSAGE(rval == (last_index_seen[0] + 1) * 2, "");
+        CHECK_MESSAGE(v.tag() == 0, "");  // won't get here unless true
+        int rval = getval_helper<1,IType>::get_integer_val(v);
+        CHECK_MESSAGE( rval == (last_index_seen[0]+1)*2, "");
         last_index_seen[0] = rval / 2;
     }
 };
 
-template <typename IType, typename TType, int SIZE>
-void test_one_serial(IType &my_indexer, tbb::flow::graph &g) {
+template<typename IType, typename TType, int SIZE>
+void test_one_serial( IType &my_indexer, tbb::flow::graph &g) {
     last_index_seen.clear();
-    for (int ii = 0; ii < SIZE; ++ii) last_index_seen.push_back(-1);
+    for(int ii=0; ii < SIZE; ++ii) last_index_seen.push_back(-1);
 
     typedef TType q3_input_type;
-    tbb::flow::queue_node<q3_input_type> q3(g);
+    tbb::flow::queue_node< q3_input_type >  q3(g);
     q3_input_type v;
 
     tbb::flow::make_edge(my_indexer, q3);
 
     // fill each queue with its value one-at-a-time
-    for (int i = 0; i < Count; ++i) { serial_queue_helper<SIZE, IType>::put_one_queue_val(i, my_indexer); }
+    for (int i = 0; i < Count; ++i ) {
+        serial_queue_helper<SIZE,IType>::put_one_queue_val(i,my_indexer);
+    }
 
     g.wait_for_all();
-    for (int i = 0; i < Count * SIZE; ++i) {
+    for (int i = 0; i < Count * SIZE; ++i ) {
         g.wait_for_all();
-        CHECK_MESSAGE((q3.try_get(v)), "Error in try_get()");
-        { serial_queue_helper<SIZE, IType>::check_queue_value(v); }
+        CHECK_MESSAGE( (q3.try_get( v )), "Error in try_get()");
+        {
+            serial_queue_helper<SIZE,IType>::check_queue_value(v);
+        }
     }
-    CHECK_MESSAGE((!q3.try_get(v)), "extra values in output queue");
-    for (int ii = 0; ii < SIZE; ++ii) last_index_seen[ii] = -1;
+    CHECK_MESSAGE( (!q3.try_get( v )), "extra values in output queue");
+    for(int ii=0; ii < SIZE; ++ii) last_index_seen[ii] = -1;
 
     // fill each queue completely before filling the next.
-    serial_queue_helper<SIZE, IType>::fill_one_queue(Count, my_indexer);
+    serial_queue_helper<SIZE, IType>::fill_one_queue(Count,my_indexer);
 
     g.wait_for_all();
-    for (int i = 0; i < Count * SIZE; ++i) {
+    for (int i = 0; i < Count*SIZE; ++i ) {
         g.wait_for_all();
-        CHECK_MESSAGE((q3.try_get(v)), "Error in try_get()");
-        { serial_queue_helper<SIZE, IType>::check_queue_value(v); }
+        CHECK_MESSAGE( (q3.try_get( v )), "Error in try_get()");
+        {
+            serial_queue_helper<SIZE,IType>::check_queue_value(v);
+        }
     }
-    CHECK_MESSAGE((!q3.try_get(v)), "extra values in output queue");
+    CHECK_MESSAGE( (!q3.try_get( v )), "extra values in output queue");
 }
 
 //
-template <typename NodeType>
-void test_input_ports_return_ref(NodeType &mip_node) {
-    typename NodeType::input_ports_type &input_ports1 = mip_node.input_ports();
-    typename NodeType::input_ports_type &input_ports2 = mip_node.input_ports();
-    CHECK_MESSAGE((&input_ports1 == &input_ports2), "input_ports() should return reference");
+template<typename NodeType>
+void test_input_ports_return_ref(NodeType& mip_node) {
+    typename NodeType::input_ports_type& input_ports1 = mip_node.input_ports();
+    typename NodeType::input_ports_type& input_ports2 = mip_node.input_ports();
+    CHECK_MESSAGE( (&input_ports1 == &input_ports2), "input_ports() should return reference");
 }
 
 // Single predecessor at each port, single accepting successor
 //   * put to buffer before port0, then put to buffer before port1, ...
 //   * fill buffer before port0 then fill buffer before port1, ...
 
-template <typename IType>
+template<typename IType>
 class serial_test {
-    typedef typename IType::output_type TType;// this is the union
+    typedef typename IType::output_type TType;  // this is the union
     typedef typename IType::tuple_types union_types;
     static const int SIZE = std::tuple_size<union_types>::value;
-
 public:
-    static void test() {
-        tbb::flow::graph g;
-        static const int ELEMS = 3;
-        IType *my_indexer = new IType(g);//makeIndexer<IType>::create(g);
+static void test() {
+    tbb::flow::graph g;
+    static const int ELEMS = 3;
+    IType* my_indexer = new IType(g); //makeIndexer<IType>::create(g);
 
-        test_input_ports_return_ref(*my_indexer);
+    test_input_ports_return_ref(*my_indexer);
 
-        serial_queue_helper<SIZE, IType>::print_remark();
-        INFO(" >\n");
+    serial_queue_helper<SIZE, IType>::print_remark(); INFO(" >\n");
 
-        test_one_serial<IType, TType, SIZE>(*my_indexer, g);
+    test_one_serial<IType,TType,SIZE>(*my_indexer, g);
 
-        std::vector<IType> indexer_vector(ELEMS, *my_indexer);
+    std::vector<IType> indexer_vector(ELEMS,*my_indexer);
 
-        makeIndexer<IType>::destroy(my_indexer);
+    makeIndexer<IType>::destroy(my_indexer);
 
-        for (int e = 0; e < ELEMS; ++e) { test_one_serial<IType, TType, SIZE>(indexer_vector[e], g); }
+    for(int e = 0; e < ELEMS; ++e) {
+        test_one_serial<IType,TType,SIZE>(indexer_vector[e], g);
     }
+}
 
-};// serial_test
+}; // serial_test
 
-template <template <typename> class TestType,// serial_test or parallel_test
-          typename T0, typename T1 = void, typename T2 = void, typename T3 = void, typename T4 = void,
-          typename T5 = void, typename T6 = void, typename T7 = void, typename T8 = void,
-          typename T9 = void>// type of the inputs to the indexer_node
+template<
+      template<typename> class TestType,  // serial_test or parallel_test
+      typename T0, typename T1=void, typename T2=void, typename T3=void, typename T4=void,
+      typename T5=void, typename T6=void, typename T7=void, typename T8=void, typename T9=void> // type of the inputs to the indexer_node
 class generate_test {
 public:
-    typedef tbb::flow::indexer_node<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> indexer_node_type;
-    static void do_test() { TestType<indexer_node_type>::test(); }
+    typedef tbb::flow::indexer_node<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>  indexer_node_type;
+    static void do_test() {
+        TestType<indexer_node_type>::test();
+    }
 };
 
 //specializations for indexer node inputs
-template <template <typename> class TestType, typename T0, typename T1, typename T2, typename T3, typename T4,
-          typename T5, typename T6, typename T7, typename T8>
+template<
+      template<typename> class TestType,
+      typename T0, typename T1, typename T2, typename T3, typename T4,
+      typename T5, typename T6, typename T7, typename T8>
 class generate_test<TestType, T0, T1, T2, T3, T4, T5, T6, T7, T8> {
 public:
-    typedef tbb::flow::indexer_node<T0, T1, T2, T3, T4, T5, T6, T7, T8> indexer_node_type;
-    static void do_test() { TestType<indexer_node_type>::test(); }
+    typedef tbb::flow::indexer_node<T0, T1, T2, T3, T4, T5, T6, T7, T8>  indexer_node_type;
+    static void do_test() {
+        TestType<indexer_node_type>::test();
+    }
 };
 
-template <template <typename> class TestType, typename T0, typename T1, typename T2, typename T3, typename T4,
-          typename T5, typename T6, typename T7>
+template<
+      template<typename> class TestType,
+      typename T0, typename T1, typename T2, typename T3, typename T4,
+      typename T5, typename T6, typename T7>
 class generate_test<TestType, T0, T1, T2, T3, T4, T5, T6, T7> {
 public:
-    typedef tbb::flow::indexer_node<T0, T1, T2, T3, T4, T5, T6, T7> indexer_node_type;
-    static void do_test() { TestType<indexer_node_type>::test(); }
+    typedef tbb::flow::indexer_node<T0, T1, T2, T3, T4, T5, T6, T7>  indexer_node_type;
+    static void do_test() {
+        TestType<indexer_node_type>::test();
+    }
 };
 
-template <template <typename> class TestType, typename T0, typename T1, typename T2, typename T3, typename T4,
-          typename T5, typename T6>
+template<
+      template<typename> class TestType,
+      typename T0, typename T1, typename T2, typename T3, typename T4,
+      typename T5, typename T6>
 class generate_test<TestType, T0, T1, T2, T3, T4, T5, T6> {
 public:
-    typedef tbb::flow::indexer_node<T0, T1, T2, T3, T4, T5, T6> indexer_node_type;
-    static void do_test() { TestType<indexer_node_type>::test(); }
+    typedef tbb::flow::indexer_node<T0, T1, T2, T3, T4, T5, T6>  indexer_node_type;
+    static void do_test() {
+        TestType<indexer_node_type>::test();
+    }
 };
 
-template <template <typename> class TestType, typename T0, typename T1, typename T2, typename T3, typename T4,
-          typename T5>
-class generate_test<TestType, T0, T1, T2, T3, T4, T5> {
+template<
+      template<typename> class TestType,
+      typename T0, typename T1, typename T2, typename T3, typename T4,
+      typename T5>
+class generate_test<TestType, T0, T1, T2, T3, T4, T5>  {
 public:
-    typedef tbb::flow::indexer_node<T0, T1, T2, T3, T4, T5> indexer_node_type;
-    static void do_test() { TestType<indexer_node_type>::test(); }
+    typedef tbb::flow::indexer_node<T0, T1, T2, T3, T4, T5>  indexer_node_type;
+    static void do_test() {
+        TestType<indexer_node_type>::test();
+    }
 };
 
-template <template <typename> class TestType, typename T0, typename T1, typename T2, typename T3, typename T4>
-class generate_test<TestType, T0, T1, T2, T3, T4> {
+template<
+      template<typename> class TestType,
+      typename T0, typename T1, typename T2, typename T3, typename T4>
+class generate_test<TestType, T0, T1, T2, T3, T4>  {
 public:
-    typedef tbb::flow::indexer_node<T0, T1, T2, T3, T4> indexer_node_type;
-    static void do_test() { TestType<indexer_node_type>::test(); }
+    typedef tbb::flow::indexer_node<T0, T1, T2, T3, T4>  indexer_node_type;
+    static void do_test() {
+        TestType<indexer_node_type>::test();
+    }
 };
 
-template <template <typename> class TestType, typename T0, typename T1, typename T2, typename T3>
+template<
+      template<typename> class TestType,
+      typename T0, typename T1, typename T2, typename T3>
 class generate_test<TestType, T0, T1, T2, T3> {
 public:
-    typedef tbb::flow::indexer_node<T0, T1, T2, T3> indexer_node_type;
-    static void do_test() { TestType<indexer_node_type>::test(); }
+    typedef tbb::flow::indexer_node<T0, T1, T2, T3>  indexer_node_type;
+    static void do_test() {
+        TestType<indexer_node_type>::test();
+    }
 };
 
-template <template <typename> class TestType, typename T0, typename T1, typename T2>
+template<
+      template<typename> class TestType,
+      typename T0, typename T1, typename T2>
 class generate_test<TestType, T0, T1, T2> {
 public:
-    typedef tbb::flow::indexer_node<T0, T1, T2> indexer_node_type;
-    static void do_test() { TestType<indexer_node_type>::test(); }
+    typedef tbb::flow::indexer_node<T0, T1, T2>  indexer_node_type;
+    static void do_test() {
+        TestType<indexer_node_type>::test();
+    }
 };
 
-template <template <typename> class TestType, typename T0, typename T1>
+template<
+      template<typename> class TestType,
+      typename T0, typename T1>
 class generate_test<TestType, T0, T1> {
 public:
-    typedef tbb::flow::indexer_node<T0, T1> indexer_node_type;
-    static void do_test() { TestType<indexer_node_type>::test(); }
+    typedef tbb::flow::indexer_node<T0, T1>  indexer_node_type;
+    static void do_test() {
+        TestType<indexer_node_type>::test();
+    }
 };
 
-template <template <typename> class TestType, typename T0>
+template<
+      template<typename> class TestType,
+      typename T0>
 class generate_test<TestType, T0> {
 public:
-    typedef tbb::flow::indexer_node<T0> indexer_node_type;
-    static void do_test() { TestType<indexer_node_type>::test(); }
+    typedef tbb::flow::indexer_node<T0>  indexer_node_type;
+    static void do_test() {
+        TestType<indexer_node_type>::test();
+    }
 };
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-template <typename tagged_msg_t, typename input_t>
-bool check_edge(tbb::flow::graph &g, tbb::flow::broadcast_node<input_t> &start,
-                tbb::flow::buffer_node<tagged_msg_t> &buf, input_t input_value) {
+template<typename tagged_msg_t, typename input_t>
+bool check_edge(tbb::flow::graph& g,
+                tbb::flow::broadcast_node<input_t>& start,
+                tbb::flow::buffer_node<tagged_msg_t>& buf,
+                input_t input_value) {
     start.try_put(input_value);
     g.wait_for_all();
 
     tagged_msg_t msg;
     bool is_get_succeeded = buf.try_get(msg);
 
-    CHECK_MESSAGE(((is_get_succeeded)), "There is no item in the buffer");
-    CHECK_MESSAGE(((tbb::flow::cast_to<input_t>(msg) == input_value)), "Wrong item value");
+    CHECK_MESSAGE( ((is_get_succeeded)), "There is no item in the buffer");
+    CHECK_MESSAGE( ((tbb::flow::cast_to<input_t>(msg) == input_value)), "Wrong item value");
     return true;
 }
 
@@ -519,10 +575,8 @@ template <typename... T>
 void sink(T...) {}
 
 template <typename indexer_output_t, typename Type, typename BN, std::size_t... Seq>
-void check_edge(tbb::flow::graph &g, BN &bn, tbb::flow::buffer_node<indexer_output_t> &buf, Type,
-                tbb::detail::index_sequence<Seq...>) {
-    sink(check_edge<indexer_output_t>(g, std::get<Seq>(bn), buf,
-                                      typename std::tuple_element<Seq, Type>::type(Seq))...);
+void check_edge(tbb::flow::graph& g, BN& bn, tbb::flow::buffer_node<indexer_output_t>& buf, Type, tbb::detail::index_sequence<Seq...>) {
+    sink(check_edge<indexer_output_t>(g, std::get<Seq>(bn), buf, typename std::tuple_element<Seq, Type>::type(Seq))...);
 }
 
 template <typename... Args, std::size_t... Seq>
@@ -585,7 +639,7 @@ void test_follows_and_precedes_api() {
     test_follows<float, double, int, double, double, float, long, int, float, long>();
     test_precedes();
 }
-#endif// __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+#endif // __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 void test_deduction_guides() {
@@ -607,50 +661,135 @@ void test_deduction_guides() {
 
 #endif
 
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+void test_try_put_and_wait() {
+    tbb::task_arena arena(1);
+
+    arena.execute([] {
+        tbb::flow::graph g;
+
+        std::vector<int> start_work_items;
+        std::vector<int> processed_items1;
+        std::vector<float> processed_items2;
+        std::vector<int> new_work_items;
+        int wait_message = 10;
+
+        for (int i = 0; i < wait_message; ++i) {
+            start_work_items.emplace_back(i);
+            new_work_items.emplace_back(i + 1 + wait_message);
+        }
+
+        tbb::flow::indexer_node<int, float> indexer(g);
+        using output_type = decltype(indexer)::output_type;
+
+        tbb::flow::function_node<output_type, int> function(g, tbb::flow::serial,
+            [&](output_type tag_msg) noexcept {
+                if (tag_msg.tag() == 0) {
+                    int input = tag_msg.cast_to<int>();
+                    if (input == wait_message) {
+                        for (auto item : new_work_items) {
+                            tbb::flow::input_port<0>(indexer).try_put(item);
+                            tbb::flow::input_port<1>(indexer).try_put(float(item));
+                        }
+                    }
+                    processed_items1.emplace_back(input);
+                } else {
+                    processed_items2.emplace_back(tag_msg.cast_to<float>());
+                }
+                return 0;
+            });
+
+        tbb::flow::make_edge(indexer, function);
+
+        for (auto item : start_work_items) {
+            tbb::flow::input_port<0>(indexer).try_put(item);
+            tbb::flow::input_port<1>(indexer).try_put(float(item));
+        }
+
+        tbb::flow::input_port<0>(indexer).try_put_and_wait(wait_message);
+
+        // Since function is a serial queueing function node, all start_work_items would be stored in a queue
+        // wait_message would be stored at the end of the queue
+        // During the try_put_and_wait call, start_work_items would be processed from the queue in FIFO order
+        // wait_message would be processed last and adds new_work_items into the same queue
+        // It is expected then new_work_items would be processed during wait_for_all() call
+
+        std::size_t check_index1 = 0;
+        std::size_t check_index2 = 0;
+
+        for (auto item : start_work_items) {
+            CHECK_MESSAGE(processed_items1[check_index1++] == item, "Unexpected items processing");
+            CHECK_MESSAGE(processed_items2[check_index2++] == float(item), "Unexpected items processing");
+        }
+
+        // wait_message was submitted only to the first port of indexer_node
+        CHECK_MESSAGE(processed_items1[check_index1++] == wait_message, "Unexpected wait_message processing");
+
+        g.wait_for_all();
+
+        for (auto item : new_work_items) {
+            CHECK_MESSAGE(processed_items1[check_index1++] == item, "Unexpected new_work_items processing");
+            CHECK_MESSAGE(processed_items2[check_index2++] == float(item), "Unexpected new_work_items processing");
+        }
+        CHECK((check_index1 == processed_items1.size() && check_index2 == processed_items2.size()));
+    });
+}
+#endif // __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+
 //! Serial and parallel test on various tuple sizes
 //! \brief \ref error_guessing
 TEST_CASE("Serial and parallel test") {
     INFO("Testing indexer_node, ");
 
-    for (int p = 0; p < 2; ++p) {
-        generate_test<serial_test, float>::do_test();
+   for (int p = 0; p < 2; ++p) {
+       generate_test<serial_test, float>::do_test();
 #if MAX_TUPLE_TEST_SIZE >= 4
-        generate_test<serial_test, float, double, int, short>::do_test();
+       generate_test<serial_test, float, double, int, short>::do_test();
 #endif
 #if MAX_TUPLE_TEST_SIZE >= 6
-        generate_test<serial_test, double, double, int, long, int, short>::do_test();
+       generate_test<serial_test, double, double, int, long, int, short>::do_test();
 #endif
 #if MAX_TUPLE_TEST_SIZE >= 8
-        generate_test<serial_test, float, double, double, double, float, int, float, long>::do_test();
+       generate_test<serial_test, float, double, double, double, float, int, float, long>::do_test();
 #endif
 #if MAX_TUPLE_TEST_SIZE >= 10
-        generate_test<serial_test, float, double, int, double, double, float, long, int, float,
-                      long>::do_test();
+       generate_test<serial_test, float, double, int, double, double, float, long, int, float, long>::do_test();
 #endif
-        generate_test<parallel_test, float, double>::do_test();
+       generate_test<parallel_test, float, double>::do_test();
 #if MAX_TUPLE_TEST_SIZE >= 3
-        generate_test<parallel_test, float, int, long>::do_test();
+       generate_test<parallel_test, float, int, long>::do_test();
 #endif
 #if MAX_TUPLE_TEST_SIZE >= 5
-        generate_test<parallel_test, double, double, int, int, short>::do_test();
+       generate_test<parallel_test, double, double, int, int, short>::do_test();
 #endif
 #if MAX_TUPLE_TEST_SIZE >= 7
-        generate_test<parallel_test, float, int, double, float, long, float, long>::do_test();
+       generate_test<parallel_test, float, int, double, float, long, float, long>::do_test();
 #endif
 #if MAX_TUPLE_TEST_SIZE >= 9
-        generate_test<parallel_test, float, double, int, double, double, long, int, float, long>::do_test();
+       generate_test<parallel_test, float, double, int, double, double, long, int, float, long>::do_test();
 #endif
-    }
+   }
 }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 //! Test follows and precedes API
 //! \brief \ref error_guessing
-TEST_CASE("Follows and precedes API") { test_follows_and_precedes_api(); }
+TEST_CASE("Follows and precedes API") {
+    test_follows_and_precedes_api();
+}
 #endif
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 //! Test deduction guides
 //! \brief \ref requirement
-TEST_CASE("Deduction guides") { test_deduction_guides(); }
+TEST_CASE("Deduction guides") {
+    test_deduction_guides();
+}
+#endif
+
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+//! \brief \ref error_guessing
+TEST_CASE("test indexer_node try_put_and_wait") {
+    test_try_put_and_wait();
+}
 #endif
diff --git a/external/tbb/test/tbb/test_input_node.cpp b/external/tbb/test/tbb/test_input_node.cpp
index 3745a832..94426939 100644
--- a/external/tbb/test/tbb/test_input_node.cpp
+++ b/external/tbb/test/tbb/test_input_node.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -20,130 +20,151 @@
 
 #include "tbb/flow_graph.h"
 
-#include "common/concepts_common.h"
 #include "common/test.h"
 #include "common/utils.h"
 #include "common/utils_assert.h"
+#include "common/concepts_common.h"
+
 
 //! \file test_input_node.cpp
 //! \brief Test for [flow_graph.input_node] specification
 
-using tbb::detail::d1::graph_task;
-using tbb::detail::d1::SUCCESSFULLY_ENQUEUED;
+
+using tbb::detail::d2::graph_task;
+using tbb::detail::d2::SUCCESSFULLY_ENQUEUED;
 
 const int N = 1000;
 
-template <typename T>
+template< typename T >
 class test_push_receiver : public tbb::flow::receiver<T>, utils::NoAssign {
 
     std::atomic<int> my_counters[N];
     tbb::flow::graph& my_graph;
 
 public:
+
     test_push_receiver(tbb::flow::graph& g) : my_graph(g) {
-        for (int i = 0; i < N; ++i) my_counters[i] = 0;
+        for (int i = 0; i < N; ++i )
+            my_counters[i] = 0;
     }
 
-    int get_count(int i) {
+    int get_count( int i ) {
         int v = my_counters[i];
         return v;
     }
 
     typedef typename tbb::flow::receiver<T>::predecessor_type predecessor_type;
 
-    graph_task* try_put_task(const T& v) override {
-        int i = (int) v;
+    graph_task* try_put_task( const T &v ) override {
+        int i = (int)v;
         ++my_counters[i];
         return const_cast<graph_task*>(SUCCESSFULLY_ENQUEUED);
     }
 
-    tbb::flow::graph& graph_reference() const override { return my_graph; }
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+    graph_task* try_put_task( const T& v, const tbb::detail::d2::message_metainfo& ) override {
+        return try_put_task(v);
+    }
+#endif
+
+    tbb::flow::graph& graph_reference() const override {
+        return my_graph;
+    }
 };
 
-template <typename T>
+template< typename T >
 class my_input_body {
 
     unsigned my_count;
-    int* ninvocations;
+    int *ninvocations;
 
 public:
-    my_input_body() : ninvocations(NULL) { my_count = 0; }
-    my_input_body(int& _inv) : ninvocations(&_inv) { my_count = 0; }
 
-    T operator()(tbb::flow_control& fc) {
-        T v = (T) my_count++;
-        if (ninvocations) ++(*ninvocations);
-        if ((int) v < N) {
+    my_input_body() : ninvocations(nullptr) { my_count = 0; }
+    my_input_body(int &_inv) : ninvocations(&_inv)  { my_count = 0; }
+
+    T operator()( tbb::flow_control& fc ) {
+        T v = (T)my_count++;
+        if(ninvocations) ++(*ninvocations);
+        if ( (int)v < N ){
             return v;
-        } else {
+        }else{
             fc.stop();
             return T();
         }
     }
+
 };
 
-template <typename T>
+template< typename T >
 class function_body {
 
-    std::atomic<int>* my_counters;
+    std::atomic<int> *my_counters;
 
 public:
-    function_body(std::atomic<int>* counters) : my_counters(counters) {
-        for (int i = 0; i < N; ++i) my_counters[i] = 0;
+
+    function_body( std::atomic<int> *counters ) : my_counters(counters) {
+        for (int i = 0; i < N; ++i )
+            my_counters[i] = 0;
     }
 
-    bool operator()(T v) {
-        ++my_counters[(int) v];
+    bool operator()( T v ) {
+        ++my_counters[(int)v];
         return true;
     }
+
 };
 
-template <typename T>
+template< typename T >
 void test_single_dest() {
     // push only
     tbb::flow::graph g;
-    tbb::flow::input_node<T> src(g, my_input_body<T>());
+    tbb::flow::input_node<T> src(g, my_input_body<T>() );
     test_push_receiver<T> dest(g);
-    tbb::flow::make_edge(src, dest);
+    tbb::flow::make_edge( src, dest );
     src.activate();
     g.wait_for_all();
-    for (int i = 0; i < N; ++i) { CHECK_MESSAGE(dest.get_count(i) == 1, ""); }
+    for (int i = 0; i < N; ++i ) {
+        CHECK_MESSAGE( dest.get_count(i) == 1, "" );
+    }
 
     // push only
     std::atomic<int> counters3[N];
-    tbb::flow::input_node<T> src3(g, my_input_body<T>());
+    tbb::flow::input_node<T> src3(g, my_input_body<T>() );
     src3.activate();
 
-    function_body<T> b3(counters3);
-    tbb::flow::function_node<T, bool> dest3(g, tbb::flow::unlimited, b3);
-    tbb::flow::make_edge(src3, dest3);
+    function_body<T> b3( counters3 );
+    tbb::flow::function_node<T,bool> dest3(g, tbb::flow::unlimited, b3 );
+    tbb::flow::make_edge( src3, dest3 );
     g.wait_for_all();
-    for (int i = 0; i < N; ++i) {
+    for (int i = 0; i < N; ++i ) {
         int v = counters3[i];
-        CHECK_MESSAGE(v == 1, "");
+        CHECK_MESSAGE( v == 1, "" );
     }
 
     // push & pull
-    tbb::flow::input_node<T> src2(g, my_input_body<T>());
+    tbb::flow::input_node<T> src2(g, my_input_body<T>() );
     src2.activate();
     std::atomic<int> counters2[N];
 
-    function_body<T> b2(counters2);
-    tbb::flow::function_node<T, bool, tbb::flow::rejecting> dest2(g, tbb::flow::serial, b2);
-    tbb::flow::make_edge(src2, dest2);
+    function_body<T> b2( counters2 );
+    tbb::flow::function_node<T,bool,tbb::flow::rejecting> dest2(g, tbb::flow::serial, b2 );
+    tbb::flow::make_edge( src2, dest2 );
     g.wait_for_all();
-    for (int i = 0; i < N; ++i) {
+    for (int i = 0; i < N; ++i ) {
         int v = counters2[i];
-        CHECK_MESSAGE(v == 1, "");
+        CHECK_MESSAGE( v == 1, "" );
     }
 
     // test copy constructor
     tbb::flow::input_node<T> src_copy(src);
     src_copy.activate();
     test_push_receiver<T> dest_c(g);
-    CHECK_MESSAGE(src_copy.register_successor(dest_c), "");
+    CHECK_MESSAGE( src_copy.register_successor(dest_c), "" );
     g.wait_for_all();
-    for (int i = 0; i < N; ++i) { CHECK_MESSAGE(dest_c.get_count(i) == 1, ""); }
+    for (int i = 0; i < N; ++i ) {
+        CHECK_MESSAGE( dest_c.get_count(i) == 1, "" );
+    }
 }
 
 void test_reset() {
@@ -153,37 +174,37 @@ void test_reset() {
     tbb::flow::input_node<int> src3(g, my_input_body<int>());
     src3.activate();
     tbb::flow::input_node<int> src_inactive(g, my_input_body<int>());
-    function_body<int> b3(counters3);
-    tbb::flow::function_node<int, bool> dest3(g, tbb::flow::unlimited, b3);
-    tbb::flow::make_edge(src3, dest3);
+    function_body<int> b3( counters3 );
+    tbb::flow::function_node<int,bool> dest3(g, tbb::flow::unlimited, b3);
+    tbb::flow::make_edge( src3, dest3 );
     //    source_node already in active state.  Let the graph run,
     g.wait_for_all();
     //    check the array for each value.
-    for (int i = 0; i < N; ++i) {
+    for (int i = 0; i < N; ++i ) {
         int v = counters3[i];
-        CHECK_MESSAGE(v == 1, "");
+        CHECK_MESSAGE( v == 1, "" );
         counters3[i] = 0;
     }
 
-    g.reset(tbb::flow::rf_reset_bodies);// <-- re-initializes the counts.
+    g.reset(tbb::flow::rf_reset_bodies);  // <-- re-initializes the counts.
     // and spawns task to run input
     src3.activate();
 
     g.wait_for_all();
     //    check output queue again.  Should be the same contents.
-    for (int i = 0; i < N; ++i) {
+    for (int i = 0; i < N; ++i ) {
         int v = counters3[i];
-        CHECK_MESSAGE(v == 1, "");
+        CHECK_MESSAGE( v == 1, "" );
         counters3[i] = 0;
     }
-    g.reset();// doesn't reset the input_node_body to initial state, but does spawn a task
-              // to run the input_node.
+    g.reset();  // doesn't reset the input_node_body to initial state, but does spawn a task
+                // to run the input_node.
 
     g.wait_for_all();
     // array should be all zero
-    for (int i = 0; i < N; ++i) {
+    for (int i = 0; i < N; ++i ) {
         int v = counters3[i];
-        CHECK_MESSAGE(v == 0, "");
+        CHECK_MESSAGE( v == 0, "" );
     }
 
     remove_edge(src3, dest3);
@@ -191,51 +212,51 @@ void test_reset() {
 
     // src_inactive doesn't run
     g.wait_for_all();
-    for (int i = 0; i < N; ++i) {
+    for (int i = 0; i < N; ++i ) {
         int v = counters3[i];
-        CHECK_MESSAGE(v == 0, "");
+        CHECK_MESSAGE( v == 0, "" );
     }
 
     // run graph
     src_inactive.activate();
     g.wait_for_all();
     // check output
-    for (int i = 0; i < N; ++i) {
+    for (int i = 0; i < N; ++i ) {
         int v = counters3[i];
-        CHECK_MESSAGE(v == 1, "");
+        CHECK_MESSAGE( v == 1, "" );
         counters3[i] = 0;
     }
-    g.reset(tbb::flow::rf_reset_bodies);// <-- reinitializes the counts
+    g.reset(tbb::flow::rf_reset_bodies);  // <-- reinitializes the counts
     // src_inactive doesn't run
     g.wait_for_all();
-    for (int i = 0; i < N; ++i) {
+    for (int i = 0; i < N; ++i ) {
         int v = counters3[i];
-        CHECK_MESSAGE(v == 0, "");
+        CHECK_MESSAGE( v == 0, "" );
     }
 
     // start it up
     src_inactive.activate();
     g.wait_for_all();
-    for (int i = 0; i < N; ++i) {
+    for (int i = 0; i < N; ++i ) {
         int v = counters3[i];
-        CHECK_MESSAGE(v == 1, "");
+        CHECK_MESSAGE( v == 1, "" );
         counters3[i] = 0;
     }
-    g.reset();// doesn't reset the input_node_body to initial state, and doesn't
-              // spawn a task to run the input_node.
+    g.reset();  // doesn't reset the input_node_body to initial state, and doesn't
+                // spawn a task to run the input_node.
 
     g.wait_for_all();
     // array should be all zero
-    for (int i = 0; i < N; ++i) {
+    for (int i = 0; i < N; ++i ) {
         int v = counters3[i];
-        CHECK_MESSAGE(v == 0, "");
+        CHECK_MESSAGE( v == 0, "" );
     }
     src_inactive.activate();
     // input_node_body is already in final state, so input_node will not forward a message.
     g.wait_for_all();
-    for (int i = 0; i < N; ++i) {
+    for (int i = 0; i < N; ++i ) {
         int v = counters3[i];
-        CHECK_MESSAGE(v == 0, "");
+        CHECK_MESSAGE( v == 0, "" );
     }
 }
 
@@ -246,58 +267,67 @@ void test_follows_and_precedes_api() {
 
     graph g;
 
-    std::array<buffer_node<bool>, 3> successors {
-            {buffer_node<bool>(g), buffer_node<bool>(g), buffer_node<bool>(g)}};
+    std::array<buffer_node<bool>, 3> successors {{
+                                                  buffer_node<bool>(g),
+                                                  buffer_node<bool>(g),
+                                                  buffer_node<bool>(g)
+        }};
 
     bool do_try_put = true;
-    input_node<bool> src(precedes(successors[0], successors[1], successors[2]),
-                         [&](tbb::flow_control& fc) -> bool {
-                             if (!do_try_put) fc.stop();
-                             do_try_put = !do_try_put;
-                             return true;
-                         });
+    input_node<bool> src(
+        precedes(successors[0], successors[1], successors[2]),
+        [&](tbb::flow_control& fc) -> bool {
+            if(!do_try_put)
+                fc.stop();
+            do_try_put = !do_try_put;
+            return true;
+        }
+    );
 
     src.activate();
     g.wait_for_all();
 
     bool storage;
-    for (auto& successor : successors) {
+    for(auto& successor: successors) {
         CHECK_MESSAGE((successor.try_get(storage) && !successor.try_get(storage)),
                       "Not exact edge quantity was made");
     }
 }
-#endif// __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+#endif // __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 
 //! Test push, push-pull behavior and copy constructor
 //! \brief \ref error_guessing \ref requirement
-TEST_CASE("Single destination tests") {
-    for (unsigned int p = utils::MinThread; p < utils::MaxThread; ++p) {
+TEST_CASE("Single destination tests"){
+    for ( unsigned int p = utils::MinThread; p < utils::MaxThread; ++p ) {
         tbb::task_arena arena(p);
-        arena.execute([&]() {
-            test_single_dest<int>();
-            test_single_dest<float>();
-        });
-    }
+        arena.execute(
+            [&]() {
+                test_single_dest<int>();
+                test_single_dest<float>();
+            }
+        );
+	}
 }
 
 //! Test reset variants
 //! \brief \ref error_guessing
-TEST_CASE("Reset test") { test_reset(); }
+TEST_CASE("Reset test"){
+    test_reset();
+}
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 //! Test follows and precedes API
 //! \brief \ref error_guessing
-TEST_CASE("Follows and precedes API") { test_follows_and_precedes_api(); }
+TEST_CASE("Follows and precedes API"){
+    test_follows_and_precedes_api();
+}
 #endif
 
 //! Test try_get before activation
 //! \brief \ref error_guessing
-TEST_CASE("try_get before activation") {
+TEST_CASE("try_get before activation"){
     tbb::flow::graph g;
-    tbb::flow::input_node<int> in(g, [&](tbb::flow_control& fc) {
-        fc.stop();
-        return 0;
-    });
+    tbb::flow::input_node<int> in(g, [&](tbb::flow_control& fc) { fc.stop(); return 0;});
 
     int tmp = -1;
     CHECK_MESSAGE((in.try_get(tmp) == false), "try_get before activation should not succeed");
@@ -315,8 +345,7 @@ TEST_CASE("constraints for input_node output") {
 }
 
 template <typename Output, typename Body>
-concept can_call_input_node_ctor
-        = requires(tbb::flow::graph& graph, Body body, tbb::flow::buffer_node<int> f) {
+concept can_call_input_node_ctor = requires( tbb::flow::graph& graph, Body body, tbb::flow::buffer_node<int> f ) {
     tbb::flow::input_node<Output>(graph, body);
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
     tbb::flow::input_node<Output>(tbb::flow::precedes(f), body);
@@ -335,4 +364,4 @@ TEST_CASE("constraints for input_node body") {
     static_assert(!can_call_input_node_ctor<output_type, WrongInputOperatorRoundBrackets<output_type>>);
     static_assert(!can_call_input_node_ctor<output_type, WrongReturnOperatorRoundBrackets<output_type>>);
 }
-#endif// __TBB_CPP20_CONCEPTS_PRESENT
+#endif // __TBB_CPP20_CONCEPTS_PRESENT
diff --git a/external/tbb/test/tbb/test_intrusive_list.cpp b/external/tbb/test/tbb/test_intrusive_list.cpp
index 5ff94920..bfa45d06 100644
--- a/external/tbb/test/tbb/test_intrusive_list.cpp
+++ b/external/tbb/test/tbb/test_intrusive_list.cpp
@@ -17,33 +17,33 @@
 //! \file test_intrusive_list.cpp
 //! \brief Test for [internal] functionality
 
-#include "../../src/tbb/intrusive_list.h"
 #include "common/test.h"
 #include "common/utils.h"
+#include "../../src/tbb/intrusive_list.h"
 
 using tbb::detail::r1::intrusive_list_node;
 
 // Machine word filled with repeated pattern of FC bits
-const uintptr_t NoliMeTangere = ~uintptr_t(0) / 0xFF * 0xFC;
+const uintptr_t NoliMeTangere = ~uintptr_t(0)/0xFF*0xFC;
 
 struct VerificationBase : utils::NoAfterlife {
     uintptr_t m_Canary;
     VerificationBase() : m_Canary(NoliMeTangere) {}
-};// struct VerificationBase
+}; // struct VerificationBase
 
 struct DataItemWithInheritedNodeBase : intrusive_list_node {
     int m_Data;
 
-    DataItemWithInheritedNodeBase(int value) : m_Data(value) {}
+    DataItemWithInheritedNodeBase( int value ) : m_Data(value) {}
 
     int Data() const { return m_Data; }
-};// struct DataItemWithInheritedNodeBase
+}; // struct DataItemWithInheritedNodeBase
 
 struct DataItemWithInheritedNode : VerificationBase, DataItemWithInheritedNodeBase {
     friend class tbb::detail::r1::intrusive_list<DataItemWithInheritedNode>;
 
-    DataItemWithInheritedNode(int value) : DataItemWithInheritedNodeBase(value) {}
-};// struct DataItemWithInheritedNode
+    DataItemWithInheritedNode( int value ) : DataItemWithInheritedNodeBase(value) {}
+}; // struct DataItemWithInheritedNode
 
 struct DataItemWithMemberNodeBase {
     int m_Data;
@@ -51,31 +51,31 @@ struct DataItemWithMemberNodeBase {
     // Cannot be used be member_intrusive_list to form lists of objects derived from DataItemBase
     intrusive_list_node m_BaseNode;
 
-    DataItemWithMemberNodeBase(int value) : m_Data(value) {}
+    DataItemWithMemberNodeBase( int value ) : m_Data(value) {}
 
     int Data() const { return m_Data; }
-};// struct DataItemWithMemberNodeBase
+}; // struct DataItemWithMemberNodeBase
 
 struct DataItemWithMemberNodes : VerificationBase, DataItemWithMemberNodeBase {
     intrusive_list_node m_Node;
 
-    DataItemWithMemberNodes(int value) : DataItemWithMemberNodeBase(value) {}
-};// struct DataItemWithMemberNodes
+    DataItemWithMemberNodes( int value ) : DataItemWithMemberNodeBase(value) {}
+}; // struct DataItemWithMemberNodes
 
 using intrusive_list1 = tbb::detail::r1::intrusive_list<DataItemWithInheritedNode>;
-using intrusive_list2
-        = tbb::detail::r1::memptr_intrusive_list<DataItemWithMemberNodes, DataItemWithMemberNodeBase,
-                                                 &DataItemWithMemberNodeBase::m_BaseNode>;
+using intrusive_list2 = tbb::detail::r1::memptr_intrusive_list<DataItemWithMemberNodes,
+                                                               DataItemWithMemberNodeBase,
+                                                               &DataItemWithMemberNodeBase::m_BaseNode>;
 
-using intrusive_list3
-        = tbb::detail::r1::memptr_intrusive_list<DataItemWithMemberNodes, DataItemWithMemberNodes,
-                                                 &DataItemWithMemberNodes::m_Node>;
+using intrusive_list3 = tbb::detail::r1::memptr_intrusive_list<DataItemWithMemberNodes,
+                                                               DataItemWithMemberNodes,
+                                                               &DataItemWithMemberNodes::m_Node>;
 
 const int NumElements = 256 * 1024;
 
 // Iterates through the list forward and backward checking the validity of values stored by the list nodes
 template <typename List, typename Iterator>
-void check_list_nodes(List& il, int value_step) {
+void check_list_nodes( List& il, int value_step ) {
     REQUIRE_MESSAGE(il.size() == unsigned(NumElements / value_step), "Wrong size of the list");
     REQUIRE_MESSAGE(!il.empty(), "Incorrect result of empty() or the list is corrupted");
 
@@ -85,16 +85,15 @@ void check_list_nodes(List& il, int value_step) {
     Iterator it_default;
     REQUIRE_MESSAGE(it_default != it, "Incorrect default constructed intrusive_list::iterator");
 
-    for (i = value_step - 1; it != il.end(); ++it, i += value_step) {
+    for ( i = value_step - 1; it != il.end(); ++it, i += value_step ) {
         REQUIRE_MESSAGE(it->Data() == i, "Unexpected node value while iterating forward");
         REQUIRE_MESSAGE(it->m_Canary == NoliMeTangere, "Memory corruption");
     }
 
-    REQUIRE_MESSAGE(i == NumElements + value_step - 1,
-                    "Wrong number of list elements while iterating forward");
+    REQUIRE_MESSAGE(i == NumElements + value_step - 1, "Wrong number of list elements while iterating forward");
     it = il.end();
 
-    for (i = NumElements - 1, it--; it != il.end(); --it, i -= value_step) {
+    for ( i = NumElements - 1, it--; it != il.end(); --it, i -= value_step ) {
         REQUIRE_MESSAGE(it->Data() == i, "Unexpected node value while iterating backward");
         REQUIRE_MESSAGE(it->m_Canary == NoliMeTangere, "Memory corruption");
     }
@@ -107,26 +106,28 @@ void test_list_operations() {
 
     List il;
 
-    for (int i = NumElements - 1; i >= 0; --i) { il.push_front(*new Item(i)); }
+    for (int i = NumElements - 1; i >= 0; --i) {
+        il.push_front(*new Item(i));
+    }
     check_list_nodes<const List, typename List::const_iterator>(il, 1);
     iterator it = il.begin();
 
-    for (; it != il.end(); ++it) {
+    for (;it != il.end(); ++it) {
         Item& item = *it;
-        it = il.erase(it);// also advances the iterator
+        it = il.erase(it); // also advances the iterator
         delete &item;
     }
 
     check_list_nodes<List, iterator>(il, 2);
     for (it = il.begin(); it != il.end(); ++it) {
         Item& item = *it;
-        il.remove(*it++);// extra advance here as well
+        il.remove(*it++); // extra advance here as well
         delete &item;
     }
 
     check_list_nodes<List, iterator>(il, 4);
     for (it = il.begin(); it != il.end();) {
-        Item& item = *it++;// the iterator advances only here
+        Item& item = *it++; // the iterator advances only here
         il.remove(item);
         delete &item;
     }
diff --git a/external/tbb/test/tbb/test_join_node.cpp b/external/tbb/test/tbb/test_join_node.cpp
index ad07a8e8..7f1721e0 100644
--- a/external/tbb/test/tbb/test_join_node.cpp
+++ b/external/tbb/test/tbb/test_join_node.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -15,13 +15,14 @@
 */
 
 #ifdef TBB_TEST_LOW_WORKLOAD
-#undef MAX_TUPLE_TEST_SIZE
-#define MAX_TUPLE_TEST_SIZE 3
+    #undef MAX_TUPLE_TEST_SIZE
+    #define MAX_TUPLE_TEST_SIZE 3
 #endif
 
 #include "common/config.h"
 
 #include "test_join_node.h"
+#include "common/test_join_node_multiple_predecessors.h"
 
 //! \file test_join_node.cpp
 //! \brief Test for [flow_graph.join_node] specification
@@ -30,21 +31,21 @@ static std::atomic<int> output_count;
 
 // get the tag from the output tuple and emit it.
 // the first tuple component is tag * 2 cast to the type
-template <typename OutputTupleType>
+template<typename OutputTupleType>
 class recirc_output_func_body {
 public:
     // we only need this to use input_node_helper
     typedef typename tbb::flow::join_node<OutputTupleType, tbb::flow::tag_matching> join_node_type;
     static const int N = std::tuple_size<OutputTupleType>::value;
-    int operator()(const OutputTupleType& v) {
-        int out = int(std::get<0>(v)) / 2;
+    int operator()(const OutputTupleType &v) {
+        int out = int(std::get<0>(v))/2;
         input_node_helper<N, join_node_type>::only_check_value(out, v);
         ++output_count;
         return out;
     }
 };
 
-template <typename JType>
+template<typename JType>
 class tag_recirculation_test {
 public:
     typedef typename JType::output_type TType;
@@ -54,16 +55,16 @@ class tag_recirculation_test {
     static void test() {
         input_node_helper<N, JType>::print_remark("Recirculation test of tag-matching join");
         INFO(" >\n");
-        for (int maxTag = 1; maxTag < 10; maxTag *= 3) {
-            for (int i = 0; i < N; ++i) all_input_nodes[i][0] = NULL;
+        for(int maxTag = 1; maxTag <10; maxTag *= 3) {
+            for(int i = 0; i < N; ++i) all_input_nodes[i][0] = nullptr;
 
             tbb::flow::graph g;
             // this is the tag-matching join we're testing
-            JType* my_join = makeJoin<N, JType, tbb::flow::tag_matching>::create(g);
+            JType * my_join = makeJoin<N, JType, tbb::flow::tag_matching>::create(g);
             // input_node for continue messages
             tbb::flow::input_node<tbb::flow::continue_msg> snode(g, recirc_input_node_body());
             // reserving join that matches recirculating tags with continue messages.
-            input_join_type* my_input_join = makeJoin<2, input_join_type, tbb::flow::reserving>::create(g);
+            input_join_type * my_input_join = makeJoin<2, input_join_type, tbb::flow::reserving>::create(g);
             // tbb::flow::make_edge(snode, tbb::flow::input_port<1>(*my_input_join));
             tbb::flow::make_edge(snode, std::get<1>(my_input_join->input_ports()));
             // queue to hold the tags
@@ -72,14 +73,13 @@ class tag_recirculation_test {
             // add all the function_nodes that are inputs to the tag-matching join
             input_node_helper<N, JType>::add_recirc_func_nodes(*my_join, *my_input_join, g);
             // add the function_node that accepts the output of the join and emits the int tag it was based on
-            tbb::flow::function_node<TType, int> recreate_tag(g, tbb::flow::unlimited,
-                                                              recirc_output_func_body<TType>());
+            tbb::flow::function_node<TType, int> recreate_tag(g, tbb::flow::unlimited, recirc_output_func_body<TType>());
             tbb::flow::make_edge(*my_join, recreate_tag);
             // now the recirculating part (output back to the queue)
             tbb::flow::make_edge(recreate_tag, tag_queue);
 
             // put the tags into the queue
-            for (int t = 1; t <= maxTag; ++t) tag_queue.try_put(t);
+            for(int t = 1; t<=maxTag; ++t) tag_queue.try_put(t);
 
             input_count = Recirc_count;
             output_count = 0;
@@ -90,17 +90,17 @@ class tag_recirculation_test {
             // wait for everything to stop
             g.wait_for_all();
 
-            CHECK_MESSAGE((output_count == Recirc_count), "not all instances were received");
+            CHECK_MESSAGE( (output_count==Recirc_count), "not all instances were received");
 
-            int j {};
+            int j{};
             // grab the tags from the queue, record them
             std::vector<bool> out_tally(maxTag, false);
-            for (int i = 0; i < maxTag; ++i) {
-                CHECK_MESSAGE((tag_queue.try_get(j)), "not enough tags in queue");
-                CHECK_MESSAGE((!out_tally.at(j - 1)), "duplicate tag from queue");
-                out_tally[j - 1] = true;
+            for(int i = 0; i < maxTag; ++i) {
+                CHECK_MESSAGE( (tag_queue.try_get(j)), "not enough tags in queue");
+                CHECK_MESSAGE( (!out_tally.at(j-1)), "duplicate tag from queue");
+                out_tally[j-1] = true;
             }
-            CHECK_MESSAGE((!tag_queue.try_get(j)), "Extra tags in recirculation queue");
+            CHECK_MESSAGE( (!tag_queue.try_get(j)), "Extra tags in recirculation queue");
 
             // deconstruct graph
             input_node_helper<N, JType>::remove_recirc_func_nodes(*my_join, *my_input_join);
@@ -113,154 +113,24 @@ class tag_recirculation_test {
     }
 };
 
-template <typename JType>
+template<typename JType>
 class generate_recirc_test {
 public:
     typedef tbb::flow::join_node<JType, tbb::flow::tag_matching> join_node_type;
-    static void do_test() { tag_recirculation_test<join_node_type>::test(); }
-};
-
-#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-#include <array>
-#include <vector>
-void test_follows_and_precedes_api() {
-    using msg_t = tbb::flow::continue_msg;
-    using JoinOutputType = std::tuple<msg_t, msg_t, msg_t>;
-
-    std::array<msg_t, 3> messages_for_follows = {{msg_t(), msg_t(), msg_t()}};
-    std::vector<msg_t> messages_for_precedes = {msg_t(), msg_t(), msg_t()};
-
-    follows_and_precedes_testing::test_follows<msg_t, tbb::flow::join_node<JoinOutputType>,
-                                               tbb::flow::buffer_node<msg_t>>(messages_for_follows);
-    follows_and_precedes_testing::test_follows<msg_t,
-                                               tbb::flow::join_node<JoinOutputType, tbb::flow::queueing>>(
-            messages_for_follows);
-    follows_and_precedes_testing::test_follows<
-            msg_t, tbb::flow::join_node<JoinOutputType, tbb::flow::reserving>, tbb::flow::buffer_node<msg_t>>(
-            messages_for_follows);
-    auto b = [](msg_t) { return msg_t(); };
-    class hash_compare {
-    public:
-        std::size_t hash(msg_t) const { return 0; }
-        bool equal(msg_t, msg_t) const { return true; }
-    };
-    follows_and_precedes_testing::test_follows<
-            msg_t, tbb::flow::join_node<JoinOutputType, tbb::flow::key_matching<msg_t, hash_compare>>,
-            tbb::flow::buffer_node<msg_t>>(messages_for_follows, b, b, b);
-
-    follows_and_precedes_testing::test_precedes<msg_t, tbb::flow::join_node<JoinOutputType>>(
-            messages_for_precedes);
-    follows_and_precedes_testing::test_precedes<msg_t,
-                                                tbb::flow::join_node<JoinOutputType, tbb::flow::queueing>>(
-            messages_for_precedes);
-    follows_and_precedes_testing::test_precedes<msg_t,
-                                                tbb::flow::join_node<JoinOutputType, tbb::flow::reserving>>(
-            messages_for_precedes);
-    follows_and_precedes_testing::test_precedes<
-            msg_t, tbb::flow::join_node<JoinOutputType, tbb::flow::key_matching<msg_t, hash_compare>>>(
-            messages_for_precedes, b, b, b);
-}
-#endif
-
-namespace multiple_predecessors {
-
-    using namespace tbb::flow;
-
-    using join_node_t = join_node<std::tuple<continue_msg, continue_msg, continue_msg>, reserving>;
-    using queue_node_t = queue_node<std::tuple<continue_msg, continue_msg, continue_msg>>;
-
-    void twist_join_connections(buffer_node<continue_msg>& bn1, buffer_node<continue_msg>& bn2,
-                                buffer_node<continue_msg>& bn3, join_node_t& jn) {
-        // order, in which edges are created/destroyed, is important
-        make_edge(bn1, input_port<0>(jn));
-        make_edge(bn2, input_port<0>(jn));
-        make_edge(bn3, input_port<0>(jn));
-
-        remove_edge(bn3, input_port<0>(jn));
-        make_edge(bn3, input_port<2>(jn));
-
-        remove_edge(bn2, input_port<0>(jn));
-        make_edge(bn2, input_port<1>(jn));
-    }
-
-    std::unique_ptr<join_node_t> connect_join_via_make_edge(graph& g, buffer_node<continue_msg>& bn1,
-                                                            buffer_node<continue_msg>& bn2,
-                                                            buffer_node<continue_msg>& bn3,
-                                                            queue_node_t& qn) {
-        std::unique_ptr<join_node_t> jn(new join_node_t(g));
-        twist_join_connections(bn1, bn2, bn3, *jn);
-        make_edge(*jn, qn);
-        return jn;
-    }
-
-#if TBB_PREVIEW_FLOW_GRAPH_FEATURES
-    std::unique_ptr<join_node_t> connect_join_via_follows(graph&, buffer_node<continue_msg>& bn1,
-                                                          buffer_node<continue_msg>& bn2,
-                                                          buffer_node<continue_msg>& bn3, queue_node_t& qn) {
-        auto bn_set = make_node_set(bn1, bn2, bn3);
-        std::unique_ptr<join_node_t> jn(new join_node_t(follows(bn_set)));
-        make_edge(*jn, qn);
-        return jn;
-    }
-
-    std::unique_ptr<join_node_t> connect_join_via_precedes(graph&, buffer_node<continue_msg>& bn1,
-                                                           buffer_node<continue_msg>& bn2,
-                                                           buffer_node<continue_msg>& bn3, queue_node_t& qn) {
-        auto qn_set = make_node_set(qn);
-        auto qn_copy_set = qn_set;
-        std::unique_ptr<join_node_t> jn(new join_node_t(precedes(qn_copy_set)));
-        twist_join_connections(bn1, bn2, bn3, *jn);
-        return jn;
-    }
-#endif// TBB_PREVIEW_FLOW_GRAPH_FEATURES
-
-    void run_and_check(graph& g, buffer_node<continue_msg>& bn1, buffer_node<continue_msg>& bn2,
-                       buffer_node<continue_msg>& bn3, queue_node_t& qn, bool expected) {
-        std::tuple<continue_msg, continue_msg, continue_msg> msg;
-
-        bn1.try_put(continue_msg());
-        bn2.try_put(continue_msg());
-        bn3.try_put(continue_msg());
-        g.wait_for_all();
-
-        CHECK_MESSAGE((qn.try_get(msg) == expected),
-                      "Unexpected message absence/existence at the end of the graph.");
-    }
-
-    template <typename ConnectJoinNodeFunc>
-    void test(ConnectJoinNodeFunc&& connect_join_node) {
-        graph g;
-        buffer_node<continue_msg> bn1(g);
-        buffer_node<continue_msg> bn2(g);
-        buffer_node<continue_msg> bn3(g);
-        queue_node_t qn(g);
-
-        auto jn = connect_join_node(g, bn1, bn2, bn3, qn);
-
-        run_and_check(g, bn1, bn2, bn3, qn, /*expected=*/true);
-
-        remove_edge(bn3, input_port<2>(*jn));
-        remove_edge(bn2, input_port<1>(*jn));
-        remove_edge(bn1, *jn);//Removes an edge between a sender and port 0 of a multi-input successor.
-        remove_edge(*jn, qn);
-
-        run_and_check(g, bn1, bn2, bn3, qn, /*expected=*/false);
+    static void do_test() {
+        tag_recirculation_test<join_node_type>::test();
     }
-}// namespace multiple_predecessors
-
-#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-//! Test follows and precedes API
-//! \brief \ref error_guessing
-TEST_CASE("Test follows and preceedes API") { test_follows_and_precedes_api(); }
-#endif
+};
 
 //! Test hash buffers behavior
 //! \brief \ref error_guessing
-TEST_CASE("Tagged buffers test") { TestTaggedBuffers(); }
+TEST_CASE("Tagged buffers test"){
+    TestTaggedBuffers();
+}
 
 //! Test with various policies and tuple sizes
 //! \brief \ref error_guessing
-TEST_CASE("Main test") {
+TEST_CASE("Main test"){
     test_main<tbb::flow::queueing>();
     test_main<tbb::flow::reserving>();
     test_main<tbb::flow::tag_matching>();
@@ -268,7 +138,14 @@ TEST_CASE("Main test") {
 
 //! Test with recirculating tags
 //! \brief \ref error_guessing
-TEST_CASE("Recirculation test") { generate_recirc_test<std::tuple<int, float>>::do_test(); }
+TEST_CASE("Recirculation test"){
+    generate_recirc_test<std::tuple<int,float> >::do_test();
+}
+
+// TODO: Look deeper into this test to see if it has the right name
+// and if it actually tests some kind of regression. It is possible
+// that `connect_join_via_follows` and `connect_join_via_precedes`
+// functions are redundant.
 
 //! Test maintaining correct count of ports without input
 //! \brief \ref error_guessing
@@ -276,8 +153,41 @@ TEST_CASE("Test removal of the predecessor while having none") {
     using namespace multiple_predecessors;
 
     test(connect_join_via_make_edge);
-#if TBB_PREVIEW_FLOW_GRAPH_FEATURES
-    test(connect_join_via_follows);
-    test(connect_join_via_precedes);
-#endif
+}
+
+//! \brief \ref error_guessing
+TEST_CASE("Test reservation on the port") {
+    tbb::flow::graph g;
+
+    tbb::flow::buffer_node<int> buffer1(g), buffer2(g);
+    tbb::flow::join_node<std::tuple<int, int>, tbb::flow::reserving> join(g);
+    tbb::flow::buffer_node<std::tuple<int, int>> buffer3(g);
+
+    auto& port0 = tbb::flow::input_port<0>(join);
+    auto& port1 = tbb::flow::input_port<1>(join);
+
+    tbb::flow::make_edge(buffer1, port0);
+    tbb::flow::make_edge(buffer2, port1);
+    tbb::flow::make_edge(join, buffer3);
+
+    int value = -42;
+    bool result = port0.reserve(value);
+    CHECK_MESSAGE(!result, "Incorrect reserve return value");
+
+    result = port1.reserve(value);
+    CHECK_MESSAGE(!result, "Incorrect reserve return value");
+
+    buffer1.try_put(1);
+    g.wait_for_all();
+
+    result = port0.reserve(value);
+    CHECK_MESSAGE(result, "Incorrect reserve return value");
+    CHECK_MESSAGE(value == 1, "Incorrect reserved value");
+    port0.release();
+
+    buffer2.try_put(2);
+    g.wait_for_all();
+
+    result = port1.reserve(value);
+    CHECK_MESSAGE(result, "incorrect reserve return value");
 }
diff --git a/external/tbb/test/tbb/test_join_node.h b/external/tbb/test/tbb/test_join_node.h
index d5afc655..2216310c 100644
--- a/external/tbb/test/tbb/test_join_node.h
+++ b/external/tbb/test/tbb/test_join_node.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -32,7 +32,6 @@
 #include "common/utils.h"
 #include "common/checktype.h"
 #include "common/graph_utils.h"
-#include "common/test_follows_and_precedes_api.h"
 
 #include <type_traits>
 
@@ -222,7 +221,7 @@ void print_my_value(MyKeySecond<K, V> const &i) {
 
 template<>
 void print_my_value(std::string const &i) {
-    INFO("\"" << i.c_str() << "\"" );
+    INFO("\"" << i << "\"" );
 }
 
 //
@@ -246,10 +245,10 @@ struct my_struct_key<K&, V> {
     }
 };
 
-using tbb::detail::d1::type_to_key_function_body;
-using tbb::detail::d1::hash_buffer;
+using tbb::detail::d2::type_to_key_function_body;
+using tbb::detail::d2::type_to_key_function_body_leaf;
+using tbb::detail::d2::hash_buffer;
 using tbb::detail::d1::tbb_hash_compare;
-using tbb::detail::d1::type_to_key_function_body_leaf;
 
 template<class K, class V> struct VtoKFB {
     typedef type_to_key_function_body<V, K> type;
@@ -1173,7 +1172,7 @@ class parallel_test {
         INFO("\n");
         for(int i = 0; i < MaxPorts; ++i) {
             for(int j = 0; j < MaxNInputs; ++j) {
-                all_input_nodes[i][j] = NULL;
+                all_input_nodes[i][j] = nullptr;
             }
         }
         for(int nInputs = 1; nInputs<=MaxNInputs; ++nInputs) {
@@ -1200,7 +1199,7 @@ class parallel_test {
             reset_outputCheck(TUPLE_SIZE, Count);
 
             for(int i = 0; i < Count; i++) {
-                CHECK_MESSAGE(outq2.try_get(v), "");;
+                CHECK_MESSAGE(outq2.try_get(v), "");
                 input_node_helper<TUPLE_SIZE, JType>::check_value(i, v, not_out_of_order);
             }
             check_outputCheck(TUPLE_SIZE, Count);
diff --git a/external/tbb/test/tbb/test_join_node_key_matching.cpp b/external/tbb/test/tbb/test_join_node_key_matching.cpp
index 6bcb3e38..c930f69d 100644
--- a/external/tbb/test/tbb/test_join_node_key_matching.cpp
+++ b/external/tbb/test/tbb/test_join_node_key_matching.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2023 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -29,8 +29,8 @@ void test_deduction_guides() {
     using tuple_type = std::tuple<int, int, double>;
 
     graph g;
-    auto body_int = [](const int&) -> int { return 1; };
-    auto body_double = [](const double&) -> int { return 1; };
+    auto body_int = [](const int&)->int { return 1; };
+    auto body_double = [](const double&)->int { return 1; };
 
     join_node j1(g, body_int, body_int, body_double);
     static_assert(std::is_same_v<decltype(j1), join_node<tuple_type, key_matching<int>>>);
@@ -52,74 +52,35 @@ void test_deduction_guides() {
 }
 #endif
 
-template <typename T1, typename T2>
-using make_tuple = decltype(std::tuple_cat(T1(), std::tuple<T2>()));
-using T1 = std::tuple<MyKeyFirst<std::string, double>>;
-using T2 = make_tuple<T1, MyKeySecond<std::string, int>>;
-using T3 = make_tuple<T2, MyKeyFirst<std::string, int>>;
-using T4 = make_tuple<T3, MyKeyWithBrokenMessageKey<std::string, size_t>>;
-using T5 = make_tuple<T4, MyKeyWithBrokenMessageKey<std::string, int>>;
-using T6 = make_tuple<T5, MyKeySecond<std::string, short>>;
-using T7 = make_tuple<T6, MyKeySecond<std::string, threebyte>>;
-using T8 = make_tuple<T7, MyKeyFirst<std::string, int>>;
-using T9 = make_tuple<T8, MyKeySecond<std::string, threebyte>>;
-using T10 = make_tuple<T9, MyKeyWithBrokenMessageKey<std::string, size_t>>;
-
-#if TBB_TEST_LOW_WORKLOAD && TBB_USE_DEBUG
-// the compiler might generate huge object file in debug (>64M)
-#define TEST_CASE_TEMPLATE_N_ARGS(dec) TEST_CASE_TEMPLATE(dec, T, T2, T5, T8, T10)
-#else
-#define TEST_CASE_TEMPLATE_N_ARGS(dec) TEST_CASE_TEMPLATE(dec, T, T2, T3, T4, T5, T6, T7, T8, T9, T10)
-#endif
-
 //! Test serial key matching on special input types
 //! \brief \ref error_guessing
 TEST_CASE("Serial test on tuples") {
     INFO("key_matching\n");
-    generate_test<serial_test, std::tuple<MyKeyFirst<int, double>, MyKeySecond<int, float>>,
-                  tbb::flow::key_matching<int>>::do_test();
-    generate_test<serial_test, std::tuple<MyKeyFirst<std::string, double>, MyKeySecond<std::string, float>>,
-                  tbb::flow::key_matching<std::string>>::do_test();
-    generate_test<serial_test,
-                  std::tuple<MyKeyFirst<std::string, double>, MyKeySecond<std::string, float>,
-                             MyKeyWithBrokenMessageKey<std::string, int>>,
-                  tbb::flow::key_matching<std::string&>>::do_test();
-}
-
-//! Serial test with different tuple sizes
-//! \brief \ref error_guessing
-TEST_CASE_TEMPLATE_N_ARGS("Serial N tests on tuples") {
-    generate_test<serial_test, T, tbb::flow::key_matching<std::string&>>::do_test();
+    generate_test<serial_test, std::tuple<MyKeyFirst<int, double>, MyKeySecond<int, float> >, tbb::flow::key_matching<int> >::do_test();
+    generate_test<serial_test, std::tuple<MyKeyFirst<std::string, double>, MyKeySecond<std::string, float> >, tbb::flow::key_matching<std::string> >::do_test();
+    generate_test<serial_test, std::tuple<MyKeyFirst<std::string, double>, MyKeySecond<std::string, float>, MyKeyWithBrokenMessageKey<std::string, int> >, tbb::flow::key_matching<std::string&> >::do_test();
 }
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 //! Test deduction guides
 //! \brief \ref requirement
-TEST_CASE("Test deduction guides") { test_deduction_guides(); }
+TEST_CASE("Test deduction guides"){
+    test_deduction_guides();
+}
 #endif
 
 //! Test parallel key matching on special input types
 //! \brief \ref error_guessing
-TEST_CASE("Parallel test on tuples") {
-    generate_test<parallel_test, std::tuple<MyKeyFirst<int, double>, MyKeySecond<int, float>>,
-                  tbb::flow::key_matching<int>>::do_test();
-    generate_test<parallel_test, std::tuple<MyKeyFirst<int, double>, MyKeySecond<int, float>>,
-                  tbb::flow::key_matching<int&>>::do_test();
-    generate_test<parallel_test, std::tuple<MyKeyFirst<std::string, double>, MyKeySecond<std::string, float>>,
-                  tbb::flow::key_matching<std::string&>>::do_test();
-}
-
-//! Parallel test with different tuple sizes
-//! \brief \ref error_guessing
-TEST_CASE_TEMPLATE_N_ARGS("Parallel N tests on tuples") {
-    generate_test<parallel_test, T, tbb::flow::key_matching<std::string&>>::do_test();
+TEST_CASE("Parallel test on tuples"){
+    generate_test<parallel_test, std::tuple<MyKeyFirst<int, double>, MyKeySecond<int, float> >, tbb::flow::key_matching<int> >::do_test();
+    generate_test<parallel_test, std::tuple<MyKeyFirst<int, double>, MyKeySecond<int, float> >, tbb::flow::key_matching<int&> >::do_test();
+    generate_test<parallel_test, std::tuple<MyKeyFirst<std::string, double>, MyKeySecond<std::string, float> >, tbb::flow::key_matching<std::string&> >::do_test();
 }
 
 #if __TBB_CPP20_CONCEPTS_PRESENT
 template <std::size_t Count>
 struct tuple_helper {
-    using type = decltype(std::tuple_cat(std::declval<std::tuple<int>>(),
-                                         std::declval<typename tuple_helper<Count - 1>::type>()));
+    using type = decltype(std::tuple_cat(std::declval<std::tuple<int>>(), std::declval<typename tuple_helper<Count - 1>::type>()));
 };
 
 template <>
@@ -129,30 +90,25 @@ struct tuple_helper<1> {
 
 template <typename... Args>
 concept can_initialize_join_node = requires(tbb::flow::graph& g, Args... args) {
-    tbb::flow::join_node<typename tuple_helper<sizeof...(Args)>::type, tbb::flow::key_matching<int>>(g,
-                                                                                                     args...);
+    tbb::flow::join_node<typename tuple_helper<sizeof...(Args)>::type,
+                         tbb::flow::key_matching<int>>(g, args...);
 };
 
 // Helper for the concepts which checks if key_matching join_node cannot be instantiated if
 // one of its constructor arguments do not satisfy join_node_function_object concept
 // This structure substitutes IncorrectT to the sequence of arguments on IncorrectArgIndex position
 // The remaining arguments in the sequence are CorrectT
-template <std::size_t ArgCount, std::size_t IncorrectArgIndex, typename CorrectT, typename IncorrectT,
-          typename... Args>
+template <std::size_t ArgCount, std::size_t IncorrectArgIndex, typename CorrectT, typename IncorrectT, typename... Args>
 struct multiple_arguments_initialization_helper {
     // Current index is not equal to IncorrectArgIndex - substitute CorrectT at the end of the arguments sequence and continue
-    static constexpr bool value
-            = multiple_arguments_initialization_helper<ArgCount - 1, IncorrectArgIndex - 1, CorrectT,
-                                                       IncorrectT, Args..., CorrectT>::value;
+    static constexpr bool value = multiple_arguments_initialization_helper<ArgCount - 1, IncorrectArgIndex - 1, CorrectT, IncorrectT, Args..., CorrectT>::value;
 };
 
 template <std::size_t ArgCount, typename CorrectT, typename IncorrectT, typename... Args>
 struct multiple_arguments_initialization_helper<ArgCount, 0, CorrectT, IncorrectT, Args...> {
     // Current index is equal to IncorrectArgIndex - substitute IncorrectT at the end of the sequence and continue
     // No more incorrect indices would be added - continue with MAX_TUPLE_TEST_SIZE variable as current incorrect index
-    static constexpr bool value
-            = multiple_arguments_initialization_helper<ArgCount - 1, MAX_TUPLE_TEST_SIZE, CorrectT,
-                                                       IncorrectT, Args..., IncorrectT>::value;
+    static constexpr bool value = multiple_arguments_initialization_helper<ArgCount - 1, MAX_TUPLE_TEST_SIZE, CorrectT, IncorrectT, Args..., IncorrectT>::value;
 };
 
 template <std::size_t IncorrectArgIndex, typename CorrectT, typename IncorrectT, typename... Args>
@@ -166,46 +122,37 @@ struct multiple_arguments_initialization_helper<0, IncorrectArgIndex, CorrectT,
 template <std::size_t ArgCount, std::size_t CurrentIncorrectIndex, typename CorrectT, typename IncorrectT>
 struct incorrect_arg_index_iteration_helper {
     // CurrentIncorrectIndex is not equal to max - check with current and continue
-    static constexpr bool value = multiple_arguments_initialization_helper<ArgCount, CurrentIncorrectIndex,
-                                                                           CorrectT, IncorrectT>::value
-                                  || incorrect_arg_index_iteration_helper<ArgCount, CurrentIncorrectIndex + 1,
-                                                                          CorrectT, IncorrectT>::value;
+    static constexpr bool value = multiple_arguments_initialization_helper<ArgCount, CurrentIncorrectIndex, CorrectT, IncorrectT>::value ||
+                                  incorrect_arg_index_iteration_helper<ArgCount, CurrentIncorrectIndex + 1, CorrectT, IncorrectT>::value;
 };
 
 template <std::size_t ArgCount, std::size_t CurrentIncorrectIndex, typename CorrectT, typename IncorrectT>
-requires(ArgCount == CurrentIncorrectIndex + 1) struct incorrect_arg_index_iteration_helper<
-        ArgCount, CurrentIncorrectIndex, CorrectT, IncorrectT> {
+requires (ArgCount == CurrentIncorrectIndex + 1)
+struct incorrect_arg_index_iteration_helper<ArgCount, CurrentIncorrectIndex, CorrectT, IncorrectT> {
     // CurrentIncorrectIndex is equal to max - check and stop
-    static constexpr bool value = multiple_arguments_initialization_helper<ArgCount, CurrentIncorrectIndex,
-                                                                           CorrectT, IncorrectT>::value;
+    static constexpr bool value = multiple_arguments_initialization_helper<ArgCount, CurrentIncorrectIndex, CorrectT, IncorrectT>::value;
 };
 
 // Helper which iterates over argument count. value is true if initialization (with all possible incorrect indices) is successful for at least one ArgCount
 template <std::size_t CurrentArgCount, typename CorrectT, typename IncorrectT>
 struct arg_count_iteration_helper {
     // CurrentArgCount is not equal to max - check and continue
-    static constexpr bool value
-            = incorrect_arg_index_iteration_helper<CurrentArgCount, /*StartIncorrectIndex = */ 0, CorrectT,
-                                                   IncorrectT>::value
-              || arg_count_iteration_helper<CurrentArgCount + 1, CorrectT, IncorrectT>::value;
+    static constexpr bool value = incorrect_arg_index_iteration_helper<CurrentArgCount, /*StartIncorrectIndex = */0, CorrectT, IncorrectT>::value ||
+                                  arg_count_iteration_helper<CurrentArgCount + 1, CorrectT, IncorrectT>::value;
 };
 
 template <typename CorrectT, typename IncorrectT>
 struct arg_count_iteration_helper<MAX_TUPLE_TEST_SIZE, CorrectT, IncorrectT> {
     // CurrentArgCount is equal to max - check and stop
-    static constexpr bool value
-            = incorrect_arg_index_iteration_helper<MAX_TUPLE_TEST_SIZE, /*StartIncorrectIndex = */ 0,
-                                                   CorrectT, IncorrectT>::value;
+    static constexpr bool value = incorrect_arg_index_iteration_helper<MAX_TUPLE_TEST_SIZE, /*StartIncorrectIndex = */0, CorrectT, IncorrectT>::value;
 };
 
 template <typename CorrectT, typename IncorrectT>
-concept can_initialize_join_node_with_incorrect_argument
-        = arg_count_iteration_helper</*StartArgCount = */ 2, CorrectT, IncorrectT>::value;
+concept can_initialize_join_node_with_incorrect_argument = arg_count_iteration_helper</*StartArgCount = */2, CorrectT, IncorrectT>::value;
 
 template <std::size_t CurrentArgCount, typename CorrectT, typename... Args>
 struct join_node_correct_initialization_helper {
-    static constexpr bool value = join_node_correct_initialization_helper<CurrentArgCount - 1, CorrectT,
-                                                                          Args..., CorrectT>::value;
+    static constexpr bool value = join_node_correct_initialization_helper<CurrentArgCount - 1, CorrectT, Args..., CorrectT>::value;
 };
 
 template <typename CorrectT, typename... Args>
@@ -215,36 +162,26 @@ struct join_node_correct_initialization_helper<0, CorrectT, Args...> {
 
 template <std::size_t CurrentArgCount, typename CorrectT>
 struct arg_count_correct_initialization_helper {
-    static constexpr bool value
-            = join_node_correct_initialization_helper<CurrentArgCount, CorrectT>::value
-              && arg_count_correct_initialization_helper<CurrentArgCount + 1, CorrectT>::value;
+    static constexpr bool value = join_node_correct_initialization_helper<CurrentArgCount, CorrectT>::value &&
+                                  arg_count_correct_initialization_helper<CurrentArgCount + 1, CorrectT>::value;
 };
 
 template <typename CorrectT>
 struct arg_count_correct_initialization_helper<MAX_TUPLE_TEST_SIZE, CorrectT> {
-    static constexpr bool value
-            = join_node_correct_initialization_helper<MAX_TUPLE_TEST_SIZE, CorrectT>::value;
+    static constexpr bool value = join_node_correct_initialization_helper<MAX_TUPLE_TEST_SIZE, CorrectT>::value;
 };
 
 template <typename CorrectT>
-concept can_initialize_join_node_with_correct_argument
-        = arg_count_correct_initialization_helper</*Start = */ 2, CorrectT>::value;
+concept can_initialize_join_node_with_correct_argument = arg_count_correct_initialization_helper</*Start = */2, CorrectT>::value;
 
 //! \brief \ref error_guessing
 TEST_CASE("join_node constraints") {
     using namespace test_concepts::join_node_function_object;
     static_assert(can_initialize_join_node_with_correct_argument<Correct<int, int>>);
-    static_assert(
-            !can_initialize_join_node_with_incorrect_argument<Correct<int, int>, NonCopyable<int, int>>);
-    static_assert(
-            !can_initialize_join_node_with_incorrect_argument<Correct<int, int>, NonDestructible<int, int>>);
-    static_assert(!can_initialize_join_node_with_incorrect_argument<Correct<int, int>,
-                                                                    NoOperatorRoundBrackets<int, int>>);
-    static_assert(
-            !can_initialize_join_node_with_incorrect_argument<Correct<int, int>,
-                                                              WrongInputOperatorRoundBrackets<int, int>>);
-    static_assert(
-            !can_initialize_join_node_with_incorrect_argument<Correct<int, int>,
-                                                              WrongReturnOperatorRoundBrackets<int, int>>);
+    static_assert(!can_initialize_join_node_with_incorrect_argument<Correct<int, int>, NonCopyable<int, int>>);
+    static_assert(!can_initialize_join_node_with_incorrect_argument<Correct<int, int>, NonDestructible<int, int>>);
+    static_assert(!can_initialize_join_node_with_incorrect_argument<Correct<int, int>, NoOperatorRoundBrackets<int, int>>);
+    static_assert(!can_initialize_join_node_with_incorrect_argument<Correct<int, int>, WrongInputOperatorRoundBrackets<int, int>>);
+    static_assert(!can_initialize_join_node_with_incorrect_argument<Correct<int, int>, WrongReturnOperatorRoundBrackets<int, int>>);
 }
-#endif// __TBB_CPP20_CONCEPTS_PRESENT
+#endif // __TBB_CPP20_CONCEPTS_PRESENT
diff --git a/external/tbb/test/tbb/test_join_node_key_matching_n_args.cpp b/external/tbb/test/tbb/test_join_node_key_matching_n_args.cpp
new file mode 100644
index 00000000..7479dba0
--- /dev/null
+++ b/external/tbb/test/tbb/test_join_node_key_matching_n_args.cpp
@@ -0,0 +1,54 @@
+/*
+    Copyright (c) 2005-2023 Intel Corporation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#include "common/config.h"
+
+#include "test_join_node.h"
+
+//! \file test_join_node_key_matching_n_args.cpp
+//! \brief Test for [flow_graph.join_node] specification
+
+template <typename T1, typename T2>
+using make_tuple = decltype(std::tuple_cat(T1(), std::tuple<T2>()));
+using T1 = std::tuple<MyKeyFirst<std::string, double>>;
+using T2 = make_tuple<T1, MyKeySecond<std::string, int>>;
+using T3 = make_tuple<T2, MyKeyFirst<std::string, int>>;
+using T4 = make_tuple<T3, MyKeyWithBrokenMessageKey<std::string, size_t>>;
+using T5 = make_tuple<T4, MyKeyWithBrokenMessageKey<std::string, int>>;
+using T6 = make_tuple<T5, MyKeySecond<std::string, short>>;
+using T7 = make_tuple<T6, MyKeySecond<std::string, threebyte>>;
+using T8 = make_tuple<T7, MyKeyFirst<std::string, int>>;
+using T9 = make_tuple<T8, MyKeySecond<std::string, threebyte>>;
+using T10 = make_tuple<T9, MyKeyWithBrokenMessageKey<std::string, size_t>>;
+
+#if TBB_TEST_LOW_WORKLOAD && TBB_USE_DEBUG
+// the compiler might generate huge object file in debug (>64M)
+#define TEST_CASE_TEMPLATE_N_ARGS(dec) TEST_CASE_TEMPLATE(dec, T, T2, T5, T8, T10)
+#else
+#define TEST_CASE_TEMPLATE_N_ARGS(dec) TEST_CASE_TEMPLATE(dec, T, T2, T3, T4, T5, T6, T7, T8, T9, T10)
+#endif
+
+//! Serial test with different tuple sizes
+//! \brief \ref error_guessing
+TEST_CASE_TEMPLATE_N_ARGS("Serial N tests on tuples") {
+     generate_test<serial_test, T, tbb::flow::key_matching<std::string&>>::do_test();
+}
+
+//! Parallel test with different tuple sizes
+//! \brief \ref error_guessing
+TEST_CASE_TEMPLATE_N_ARGS("Parallel N tests on tuples") {
+    generate_test<parallel_test, T, tbb::flow::key_matching<std::string&>>::do_test();
+}
diff --git a/external/tbb/test/tbb/test_join_node_msg_key_matching.cpp b/external/tbb/test/tbb/test_join_node_msg_key_matching.cpp
index a491d77b..4ad91c65 100644
--- a/external/tbb/test/tbb/test_join_node_msg_key_matching.cpp
+++ b/external/tbb/test/tbb/test_join_node_msg_key_matching.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -24,25 +24,6 @@
 //! \file test_join_node_msg_key_matching.cpp
 //! \brief Test for [preview] functionality
 
-#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-#include <array>
-#include <vector>
-void test_follows_and_precedes_api() {
-    using msg_t = MyMessageKeyWithoutKey<int, int>;
-    using JoinOutputType = std::tuple<msg_t, msg_t, msg_t>;
-
-    std::array<msg_t, 3> messages_for_follows = {{msg_t(), msg_t(), msg_t()}};
-    std::vector<msg_t> messages_for_precedes = {msg_t(), msg_t(), msg_t()};
-
-    follows_and_precedes_testing::test_follows<
-            msg_t, tbb::flow::join_node<JoinOutputType, tbb::flow::key_matching<std::size_t>>,
-            tbb::flow::buffer_node<msg_t>>(messages_for_follows);
-    follows_and_precedes_testing::test_precedes<
-            msg_t, tbb::flow::join_node<JoinOutputType, tbb::flow::key_matching<std::size_t>>>(
-            messages_for_precedes);
-}
-#endif
-
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 struct message_key {
     int my_key;
@@ -62,74 +43,31 @@ void test_deduction_guides() {
     graph g;
     broadcast_node<message_key> bm1(g), bm2(g);
     broadcast_node<tuple_type> bm3(g);
-    join_node<tuple_type, key_matching<int>> j0(g);
+    join_node<tuple_type, key_matching<int> > j0(g);
     join_node j3(j0);
     static_assert(std::is_same_v<decltype(j3), join_node<tuple_type, key_matching<int>>>);
 }
 #endif
 
-template <typename T1, typename T2>
-using make_tuple = decltype(std::tuple_cat(T1(), std::tuple<T2>()));
-using T1 = std::tuple<MyMessageKeyWithoutKeyMethod<std::string, double>>;
-using T2 = make_tuple<T1, MyMessageKeyWithBrokenKey<std::string, int>>;
-using T3 = make_tuple<T2, MyMessageKeyWithoutKey<std::string, int>>;
-using T4 = make_tuple<T3, MyMessageKeyWithoutKeyMethod<std::string, size_t>>;
-using T5 = make_tuple<T4, MyMessageKeyWithBrokenKey<std::string, int>>;
-using T6 = make_tuple<T5, MyMessageKeyWithoutKeyMethod<std::string, short>>;
-using T7 = make_tuple<T6, MyMessageKeyWithoutKeyMethod<std::string, threebyte>>;
-using T8 = make_tuple<T7, MyMessageKeyWithBrokenKey<std::string, int>>;
-using T9 = make_tuple<T8, MyMessageKeyWithoutKeyMethod<std::string, threebyte>>;
-using T10 = make_tuple<T9, MyMessageKeyWithBrokenKey<std::string, size_t>>;
-
-#if TBB_TEST_LOW_WORKLOAD && TBB_USE_DEBUG
-// the compiler might generate huge object file in debug (>64M)
-#define TEST_CASE_TEMPLATE_N_ARGS(dec) TEST_CASE_TEMPLATE(dec, T, T2, T10)
-#else
-#define TEST_CASE_TEMPLATE_N_ARGS(dec) TEST_CASE_TEMPLATE(dec, T, T2, T3, T4, T5, T6, T7, T8, T9, T10)
-#endif
-
-//! Serial test with different tuple sizes
-//! \brief \ref error_guessing
-TEST_CASE_TEMPLATE_N_ARGS("Serial N tests") {
-    generate_test<serial_test, T, message_based_key_matching<std::string&>>::do_test();
-}
-
-//! Parallel test with different tuple sizes
-//! \brief \ref error_guessing
-TEST_CASE_TEMPLATE_N_ARGS("Parallel N tests") {
-    generate_test<parallel_test, T, message_based_key_matching<std::string&>>::do_test();
-}
-
 //! Serial test with matching policies
 //! \brief \ref error_guessing
 TEST_CASE("Serial test") {
-    generate_test<serial_test,
-                  std::tuple<MyMessageKeyWithBrokenKey<int, double>, MyMessageKeyWithoutKey<int, float>>,
-                  message_based_key_matching<int>>::do_test();
-    generate_test<serial_test,
-                  std::tuple<MyMessageKeyWithoutKeyMethod<std::string, double>,
-                             MyMessageKeyWithBrokenKey<std::string, float>>,
-                  message_based_key_matching<std::string>>::do_test();
+    generate_test<serial_test, std::tuple<MyMessageKeyWithBrokenKey<int, double>, MyMessageKeyWithoutKey<int, float> >, message_based_key_matching<int> >::do_test();
+    generate_test<serial_test, std::tuple<MyMessageKeyWithoutKeyMethod<std::string, double>, MyMessageKeyWithBrokenKey<std::string, float> >, message_based_key_matching<std::string> >::do_test();
 }
 
 //! Parallel test with special key types
 //! \brief \ref error_guessing
-TEST_CASE("Parallel test") {
-    generate_test<parallel_test,
-                  std::tuple<MyMessageKeyWithBrokenKey<int, double>, MyMessageKeyWithoutKey<int, float>>,
-                  message_based_key_matching<int>>::do_test();
-    generate_test<
-            parallel_test,
-            std::tuple<MyMessageKeyWithoutKeyMethod<int, double>, MyMessageKeyWithBrokenKey<int, float>>,
-            message_based_key_matching<int&>>::do_test();
-    generate_test<parallel_test,
-                  std::tuple<MyMessageKeyWithoutKey<std::string, double>,
-                             MyMessageKeyWithoutKeyMethod<std::string, float>>,
-                  message_based_key_matching<std::string&>>::do_test();
+TEST_CASE("Parallel test"){
+    generate_test<parallel_test, std::tuple<MyMessageKeyWithBrokenKey<int, double>, MyMessageKeyWithoutKey<int, float> >, message_based_key_matching<int> >::do_test();
+    generate_test<parallel_test, std::tuple<MyMessageKeyWithoutKeyMethod<int, double>, MyMessageKeyWithBrokenKey<int, float> >, message_based_key_matching<int&> >::do_test();
+    generate_test<parallel_test, std::tuple<MyMessageKeyWithoutKey<std::string, double>, MyMessageKeyWithoutKeyMethod<std::string, float> >, message_based_key_matching<std::string&> >::do_test();
 }
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 //! Test deduction guides
 //! \brief \ref requirement
-TEST_CASE("Deduction guides test") { test_deduction_guides(); }
+TEST_CASE("Deduction guides test"){
+    test_deduction_guides();
+}
 #endif
diff --git a/external/tbb/test/tbb/test_join_node_msg_key_matching_n_args.cpp b/external/tbb/test/tbb/test_join_node_msg_key_matching_n_args.cpp
new file mode 100644
index 00000000..05097d8b
--- /dev/null
+++ b/external/tbb/test/tbb/test_join_node_msg_key_matching_n_args.cpp
@@ -0,0 +1,57 @@
+/*
+    Copyright (c) 2022 Intel Corporation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+// Message based key matching is a preview feature
+#define TBB_PREVIEW_FLOW_GRAPH_FEATURES 1
+
+#include "common/config.h"
+
+#include "test_join_node.h"
+
+//! \file test_join_node_msg_key_matching_n_args.cpp
+//! \brief Test for [preview] functionality
+
+template <typename T1, typename T2>
+using make_tuple = decltype(std::tuple_cat(T1(), std::tuple<T2>()));
+using T1 = std::tuple<MyMessageKeyWithoutKeyMethod<std::string, double>>;
+using T2 = make_tuple<T1, MyMessageKeyWithBrokenKey<std::string, int>>;
+using T3 = make_tuple < T2, MyMessageKeyWithoutKey<std::string, int>>;
+using T4 = make_tuple < T3, MyMessageKeyWithoutKeyMethod<std::string, size_t>>;
+using T5 = make_tuple < T4, MyMessageKeyWithBrokenKey<std::string, int>>;
+using T6 = make_tuple < T5, MyMessageKeyWithoutKeyMethod<std::string, short>>;
+using T7 = make_tuple < T6, MyMessageKeyWithoutKeyMethod<std::string, threebyte>>;
+using T8 = make_tuple < T7, MyMessageKeyWithBrokenKey<std::string, int>>;
+using T9 = make_tuple < T8, MyMessageKeyWithoutKeyMethod<std::string, threebyte>>;
+using T10 = make_tuple < T9, MyMessageKeyWithBrokenKey<std::string, size_t>>;
+
+#if TBB_TEST_LOW_WORKLOAD && TBB_USE_DEBUG
+// the compiler might generate huge object file in debug (>64M)
+#define TEST_CASE_TEMPLATE_N_ARGS(dec) TEST_CASE_TEMPLATE(dec, T, T2, T10)
+#else
+#define TEST_CASE_TEMPLATE_N_ARGS(dec) TEST_CASE_TEMPLATE(dec, T, T2, T3, T4, T5, T6, T7, T8, T9, T10)
+#endif
+
+//! Serial test with different tuple sizes
+//! \brief \ref error_guessing
+TEST_CASE_TEMPLATE_N_ARGS("Serial N tests") {
+    generate_test<serial_test, T, message_based_key_matching<std::string&> >::do_test();
+}
+
+//! Parallel test with different tuple sizes
+//! \brief \ref error_guessing
+TEST_CASE_TEMPLATE_N_ARGS("Parallel N tests") {
+    generate_test<parallel_test, T, message_based_key_matching<std::string&> >::do_test();
+}
diff --git a/external/tbb/test/tbb/test_join_node_preview.cpp b/external/tbb/test/tbb/test_join_node_preview.cpp
new file mode 100644
index 00000000..3ee40757
--- /dev/null
+++ b/external/tbb/test/tbb/test_join_node_preview.cpp
@@ -0,0 +1,356 @@
+/*
+    Copyright (c) 2024 Intel Corporation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#define TBB_PREVIEW_FLOW_GRAPH_FEATURES 1
+
+#include "common/config.h"
+
+#include "test_join_node.h"
+#include "common/test_join_node_multiple_predecessors.h"
+#include "common/test_follows_and_precedes_api.h"
+
+#include <array>
+#include <vector>
+
+//! \file test_join_node_preview.cpp
+//! \brief Test for [preview] functionality
+
+void jn_follows_and_precedes() {
+    using msg_t = tbb::flow::continue_msg;
+    using JoinOutputType = std::tuple<msg_t, msg_t, msg_t>;
+
+    std::array<msg_t, 3> messages_for_follows = { {msg_t(), msg_t(), msg_t()} };
+    std::vector<msg_t> messages_for_precedes = {msg_t(), msg_t(), msg_t()};
+
+    follows_and_precedes_testing::test_follows
+        <msg_t, tbb::flow::join_node<JoinOutputType>, tbb::flow::buffer_node<msg_t>>(messages_for_follows);
+    follows_and_precedes_testing::test_follows
+        <msg_t, tbb::flow::join_node<JoinOutputType, tbb::flow::queueing>>(messages_for_follows);
+    follows_and_precedes_testing::test_follows
+        <msg_t, tbb::flow::join_node<JoinOutputType, tbb::flow::reserving>, tbb::flow::buffer_node<msg_t>>(messages_for_follows);
+    auto b = [](msg_t) { return msg_t(); };
+    class hash_compare {
+    public:
+        std::size_t hash(msg_t) const { return 0; }
+        bool equal(msg_t, msg_t) const { return true; }
+    };
+    follows_and_precedes_testing::test_follows
+        <msg_t, tbb::flow::join_node<JoinOutputType, tbb::flow::key_matching<msg_t, hash_compare>>, tbb::flow::buffer_node<msg_t>>
+        (messages_for_follows, b, b, b);
+
+    follows_and_precedes_testing::test_precedes
+        <msg_t, tbb::flow::join_node<JoinOutputType>>(messages_for_precedes);
+    follows_and_precedes_testing::test_precedes
+        <msg_t, tbb::flow::join_node<JoinOutputType, tbb::flow::queueing>>(messages_for_precedes);
+    follows_and_precedes_testing::test_precedes
+        <msg_t, tbb::flow::join_node<JoinOutputType, tbb::flow::reserving>>(messages_for_precedes);
+    follows_and_precedes_testing::test_precedes
+        <msg_t, tbb::flow::join_node<JoinOutputType, tbb::flow::key_matching<msg_t, hash_compare>>>
+        (messages_for_precedes, b, b, b);
+}
+
+void jn_msg_key_matching_follows_and_precedes() {
+    using msg_t = MyMessageKeyWithoutKey<int, int>;
+    using JoinOutputType = std::tuple<msg_t, msg_t, msg_t>;
+
+    std::array<msg_t, 3> messages_for_follows = { {msg_t(), msg_t(), msg_t()} };
+    std::vector<msg_t> messages_for_precedes = { msg_t(), msg_t(), msg_t() };
+
+    follows_and_precedes_testing::test_follows
+        <msg_t, tbb::flow::join_node<JoinOutputType, tbb::flow::key_matching<std::size_t>>, tbb::flow::buffer_node<msg_t>>
+        (messages_for_follows);
+    follows_and_precedes_testing::test_precedes
+        <msg_t, tbb::flow::join_node<JoinOutputType, tbb::flow::key_matching<std::size_t>>>
+        (messages_for_precedes);
+}
+
+void test_follows_and_precedes_api() {
+    jn_follows_and_precedes();
+    jn_msg_key_matching_follows_and_precedes();
+}
+
+void test_try_put_and_wait_queueing() {
+    tbb::task_arena arena(1);
+
+    arena.execute([] {
+        tbb::flow::graph g;
+
+        std::vector<int> start_work_items;
+        std::vector<int> processed_items;
+        std::vector<int> new_work_items;
+        int wait_message = 10;
+
+        for (int i = 0; i < wait_message; ++i) {
+            start_work_items.emplace_back(i);
+            new_work_items.emplace_back(i + 1 + wait_message);
+        }
+
+        using tuple_type = std::tuple<int, int, int>;
+        tbb::flow::join_node<tuple_type, tbb::flow::queueing> join(g);
+
+        tbb::flow::function_node<tuple_type, int, tbb::flow::rejecting> function(g, tbb::flow::serial,
+            [&](tuple_type tuple) noexcept {
+                CHECK(std::get<0>(tuple) == std::get<1>(tuple));
+                CHECK(std::get<1>(tuple) == std::get<2>(tuple));
+
+                auto input = std::get<0>(tuple);
+
+                if (input == wait_message) {
+                    for (auto item : new_work_items) {
+                        tbb::flow::input_port<0>(join).try_put(item);
+                        tbb::flow::input_port<1>(join).try_put(item);
+                        tbb::flow::input_port<2>(join).try_put(item);
+                    }
+                }
+                processed_items.emplace_back(input);
+                return 0;
+            });
+
+        tbb::flow::make_edge(join, function);
+
+        for (auto item : start_work_items) {
+            tbb::flow::input_port<0>(join).try_put(item);
+            tbb::flow::input_port<1>(join).try_put(item);
+            tbb::flow::input_port<2>(join).try_put(item);
+        }
+
+        tbb::flow::input_port<0>(join).try_put(wait_message);
+        tbb::flow::input_port<1>(join).try_put(wait_message);
+        tbb::flow::input_port<2>(join).try_put_and_wait(wait_message);
+
+        // It is expected that the join_node would push the tuple of three copies of first element in start_work_items
+        // And occupy the concurrency of function. Other tuples would be rejected and taken using push-pull protocol
+        // in FIFO order
+        std::size_t check_index = 0;
+
+        for (auto item : start_work_items) {
+            CHECK_MESSAGE(processed_items[check_index++] == item, "Unexpected start_work_items processing");
+        }
+
+        CHECK_MESSAGE(processed_items[check_index++] == wait_message, "Unexpected wait_message processing");
+        CHECK_MESSAGE(check_index == processed_items.size(), "Unexpected number of messages");
+
+        g.wait_for_all();
+
+        for (auto item : new_work_items) {
+            CHECK_MESSAGE(processed_items[check_index++] == item, "Unexpected start_work_items processing");
+        }
+    });
+}
+
+void test_try_put_and_wait_reserving() {
+    tbb::task_arena arena(1);
+
+    arena.execute([]{
+        tbb::flow::graph g;
+
+        std::vector<int> start_work_items;
+        std::vector<int> processed_items;
+        std::vector<int> new_work_items;
+        int wait_message = 10;
+
+        for (int i = 0; i < wait_message; ++i) {
+            start_work_items.emplace_back(i);
+            new_work_items.emplace_back(i + 1 + wait_message);
+        }
+
+        using tuple_type = std::tuple<int, int, int>;
+        tbb::flow::queue_node<int> buffer1(g);
+        tbb::flow::queue_node<int> buffer2(g);
+        tbb::flow::queue_node<int> buffer3(g);
+
+        tbb::flow::join_node<tuple_type, tbb::flow::reserving> join(g);
+
+        tbb::flow::function_node<tuple_type, int, tbb::flow::rejecting> function(g, tbb::flow::serial,
+            [&](tuple_type tuple) noexcept {
+                CHECK(std::get<0>(tuple) == std::get<1>(tuple));
+                CHECK(std::get<1>(tuple) == std::get<2>(tuple));
+
+                auto input = std::get<0>(tuple);
+
+                if (input == wait_message) {
+                    for (auto item : new_work_items) {
+                        buffer1.try_put(item);
+                        buffer2.try_put(item);
+                        buffer3.try_put(item);
+                    }
+                }
+                processed_items.emplace_back(input);
+                return 0;
+            });
+
+        tbb::flow::make_edge(buffer1, tbb::flow::input_port<0>(join));
+        tbb::flow::make_edge(buffer2, tbb::flow::input_port<1>(join));
+        tbb::flow::make_edge(buffer3, tbb::flow::input_port<2>(join));
+        tbb::flow::make_edge(join, function);
+
+        for (auto item : start_work_items) {
+            buffer1.try_put(item);
+            buffer2.try_put(item);
+            buffer3.try_put(item);
+        }
+
+        buffer1.try_put(wait_message);
+        buffer2.try_put(wait_message);
+        buffer3.try_put_and_wait(wait_message);
+
+        // It is expected that the join_node would push the tuple of three copies of first element in start_work_items
+        // And occupy the concurrency of function. Other tuples would be rejected and taken using push-pull protocol
+        // between function and join_node and between join_node and each buffer in FIFO order because queue_node is used
+        std::size_t check_index = 0;
+
+        for (auto item : start_work_items) {
+            CHECK_MESSAGE(processed_items[check_index++] == item, "Unexpected start_work_items processing");
+        }
+
+        CHECK_MESSAGE(processed_items[check_index++] == wait_message, "Unexpected wait_message processing");
+        CHECK_MESSAGE(check_index == processed_items.size(), "Unexpected number of messages");
+
+        g.wait_for_all();
+
+        for (auto item : new_work_items) {
+            CHECK_MESSAGE(processed_items[check_index++] == item, "Unexpected start_work_items processing");
+        }
+    });
+}
+
+struct int_wrapper {
+    int i = 0;
+    int_wrapper() : i(0) {}
+    int_wrapper(int ii) : i(ii) {}
+    int_wrapper& operator=(int ii) {
+        i = ii;
+        return *this;
+    }
+
+    int key() const {
+        return i;
+    }
+
+    friend bool operator==(const int_wrapper& lhs, const int_wrapper& rhs) {
+        return lhs.i == rhs.i;
+    }
+};
+
+template <typename... Body>
+void test_try_put_and_wait_key_matching(Body... body) {
+    // Body of one argument for testing standard key_matching
+    // Body of zero arguments for testing message based key_matching
+    static_assert(sizeof...(Body) == 0 || sizeof...(Body) == 1, "incorrect test setup");
+    tbb::task_arena arena(1);
+
+    arena.execute([=] {
+        tbb::flow::graph g;
+
+        std::vector<int_wrapper> start_work_items;
+        std::vector<int_wrapper> processed_items;
+        std::vector<int_wrapper> new_work_items;
+        int_wrapper wait_message = 10;
+
+        for (int i = 0; i < wait_message.i; ++i) {
+            start_work_items.emplace_back(i);
+            new_work_items.emplace_back(i + 1 + wait_message.i);
+        }
+
+        using tuple_type = std::tuple<int_wrapper, int_wrapper, int_wrapper>;
+        tbb::flow::join_node<tuple_type, tbb::flow::key_matching<int>> join(g, body..., body..., body...);
+
+        tbb::flow::function_node<tuple_type, int, tbb::flow::rejecting> function(g, tbb::flow::serial,
+            [&](tuple_type tuple) noexcept {
+                CHECK(std::get<0>(tuple) == std::get<1>(tuple));
+                CHECK(std::get<1>(tuple) == std::get<2>(tuple));
+
+                auto input = std::get<0>(tuple);
+
+                if (input == wait_message) {
+                    for (auto item : new_work_items) {
+                        tbb::flow::input_port<0>(join).try_put(item);
+                        tbb::flow::input_port<1>(join).try_put(item);
+                        tbb::flow::input_port<2>(join).try_put(item);
+                    }
+                }
+                processed_items.emplace_back(input);
+                return 0;
+            });
+
+        tbb::flow::make_edge(join, function);
+
+        tbb::flow::input_port<0>(join).try_put(wait_message);
+        tbb::flow::input_port<1>(join).try_put(wait_message);
+
+        // For the first port - submit items in reversed order
+        for (std::size_t i = start_work_items.size(); i != 0; --i) {
+            tbb::flow::input_port<0>(join).try_put(start_work_items[i - 1]);
+        }
+
+        // For first two ports - submit items in direct order
+        for (auto item : start_work_items) {
+            tbb::flow::input_port<1>(join).try_put(item);
+            tbb::flow::input_port<2>(join).try_put(item);
+        }
+
+        tbb::flow::input_port<2>(join).try_put_and_wait(wait_message);
+
+        // It is expected that the join_node would push the tuple of three copies of first element in start_work_items
+        // And occupy the concurrency of function. Other tuples would be rejected and taken using push-pull protocol
+        // in order of submission
+        std::size_t check_index = 0;
+
+        for (auto item : start_work_items) {
+            CHECK_MESSAGE(processed_items[check_index++] == item, "Unexpected start_work_items processing");
+        }
+
+        CHECK_MESSAGE(processed_items[check_index++] == wait_message, "Unexpected wait_message processing");
+        CHECK_MESSAGE(check_index == processed_items.size(), "Unexpected number of messages");
+
+        g.wait_for_all();
+
+        for (auto item : new_work_items) {
+            CHECK_MESSAGE(processed_items[check_index++] == item, "Unexpected start_work_items processing");
+        }
+        CHECK_MESSAGE(check_index == processed_items.size(), "Unexpected number of messages");
+    });
+}
+
+//! Test follows and precedes API
+//! \brief \ref error_guessing
+TEST_CASE("Test follows and precedes API"){
+    test_follows_and_precedes_api();
+}
+
+// TODO: Look deeper into this test to see if it has the right name
+// and if it actually tests some kind of regression. It is possible
+// that `connect_join_via_follows` and `connect_join_via_precedes`
+// functions are redundant.
+
+//! Test maintaining correct count of ports without input
+//! \brief \ref error_guessing
+TEST_CASE("Test removal of the predecessor while having none") {
+    using namespace multiple_predecessors;
+
+    test(connect_join_via_follows);
+    test(connect_join_via_precedes);
+}
+
+//! \brief \ref error_guessing
+TEST_CASE("Test join_node try_put_and_wait") {
+    test_try_put_and_wait_queueing();
+    test_try_put_and_wait_reserving();
+    // Test standard key_matching policy
+    test_try_put_and_wait_key_matching([](int_wrapper w) { return w.i; });
+    // Test msg based key_matching policy
+    test_try_put_and_wait_key_matching();
+}
diff --git a/external/tbb/test/tbb/test_limiter_node.cpp b/external/tbb/test/tbb/test_limiter_node.cpp
index 92bd7331..0bf4912f 100644
--- a/external/tbb/test/tbb/test_limiter_node.cpp
+++ b/external/tbb/test/tbb/test_limiter_node.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
 #endif
 
 #include "common/config.h"
@@ -23,37 +23,48 @@
 #include "tbb/flow_graph.h"
 
 #include "common/test.h"
-#include "common/test_follows_and_precedes_api.h"
 #include "common/utils.h"
 #include "common/utils_assert.h"
+#include "common/test_follows_and_precedes_api.h"
+#include "tbb/global_control.h"
 
 #include <atomic>
 
+
 //! \file test_limiter_node.cpp
 //! \brief Test for [flow_graph.limiter_node] specification
 
+
 const int L = 10;
 const int N = 1000;
 
-using tbb::detail::d1::graph_task;
-using tbb::detail::d1::SUCCESSFULLY_ENQUEUED;
+using tbb::detail::d2::SUCCESSFULLY_ENQUEUED;
+using tbb::detail::d2::graph_task;
 
-template <typename T>
+template< typename T >
 struct serial_receiver : public tbb::flow::receiver<T>, utils::NoAssign {
-    T next_value;
-    tbb::flow::graph& my_graph;
+   T next_value;
+   tbb::flow::graph& my_graph;
+
+   serial_receiver(tbb::flow::graph& g) : next_value(T(0)), my_graph(g) {}
 
-    serial_receiver(tbb::flow::graph& g) : next_value(T(0)), my_graph(g) {}
+   graph_task* try_put_task( const T &v ) override {
+       CHECK_MESSAGE( next_value++  == v, "" );
+       return const_cast<graph_task*>(SUCCESSFULLY_ENQUEUED);
+   }
 
-    graph_task* try_put_task(const T& v) override {
-        CHECK_MESSAGE(next_value++ == v, "");
-        return const_cast<graph_task*>(SUCCESSFULLY_ENQUEUED);
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+    graph_task * try_put_task( const T &v, const tbb::detail::d2::message_metainfo& ) override {
+        return try_put_task(v);
     }
+#endif
 
-    tbb::flow::graph& graph_reference() const override { return my_graph; }
+    tbb::flow::graph& graph_reference() const override {
+        return my_graph;
+    }
 };
 
-template <typename T>
+template< typename T >
 struct parallel_receiver : public tbb::flow::receiver<T>, utils::NoAssign {
 
     std::atomic<int> my_count;
@@ -61,87 +72,86 @@ struct parallel_receiver : public tbb::flow::receiver<T>, utils::NoAssign {
 
     parallel_receiver(tbb::flow::graph& g) : my_graph(g) { my_count = 0; }
 
-    graph_task* try_put_task(const T& /*v*/) override {
-        ++my_count;
-        return const_cast<graph_task*>(SUCCESSFULLY_ENQUEUED);
+    graph_task* try_put_task( const T &/*v*/ ) override {
+       ++my_count;
+       return const_cast<graph_task*>(SUCCESSFULLY_ENQUEUED);
     }
 
-    tbb::flow::graph& graph_reference() const override { return my_graph; }
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+    graph_task * try_put_task( const T &v, const tbb::detail::d2::message_metainfo& ) override {
+        return try_put_task(v);
+    }
+#endif
+
+    tbb::flow::graph& graph_reference() const override {
+        return my_graph;
+    }
 };
 
-template <typename T>
+template< typename T >
 struct empty_sender : public tbb::flow::sender<T> {
-    typedef typename tbb::flow::sender<T>::successor_type successor_type;
+        typedef typename tbb::flow::sender<T>::successor_type successor_type;
 
-    bool register_successor(successor_type&) override { return false; }
-    bool remove_successor(successor_type&) override { return false; }
+        bool register_successor( successor_type & ) override { return false; }
+        bool remove_successor( successor_type & ) override { return false; }
 };
 
-template <typename T>
+
+template< typename T >
 struct put_body : utils::NoAssign {
 
-    tbb::flow::limiter_node<T>& my_lim;
-    std::atomic<int>& my_accept_count;
+    tbb::flow::limiter_node<T> &my_lim;
+    std::atomic<int> &my_accept_count;
 
-    put_body(tbb::flow::limiter_node<T>& lim, std::atomic<int>& accept_count)
-        : my_lim(lim), my_accept_count(accept_count) {}
+    put_body( tbb::flow::limiter_node<T> &lim, std::atomic<int> &accept_count ) :
+        my_lim(lim), my_accept_count(accept_count) {}
 
-    void operator()(int) const {
-        for (int i = 0; i < L; ++i) {
-            bool msg = my_lim.try_put(T(i));
-            if (msg == true) ++my_accept_count;
+    void operator()( int ) const {
+        for ( int i = 0; i < L; ++i ) {
+            bool msg = my_lim.try_put( T(i) );
+            if ( msg == true )
+               ++my_accept_count;
         }
     }
 };
 
-template <typename T>
+template< typename T >
 struct put_dec_body : utils::NoAssign {
 
-    tbb::flow::limiter_node<T>& my_lim;
-    std::atomic<int>& my_accept_count;
+    tbb::flow::limiter_node<T> &my_lim;
+    std::atomic<int> &my_accept_count;
 
-    put_dec_body(tbb::flow::limiter_node<T>& lim, std::atomic<int>& accept_count)
-        : my_lim(lim), my_accept_count(accept_count) {}
+    put_dec_body( tbb::flow::limiter_node<T> &lim, std::atomic<int> &accept_count ) :
+        my_lim(lim), my_accept_count(accept_count) {}
 
-    void operator()(int) const {
+    void operator()( int ) const {
         int local_accept_count = 0;
-        while (local_accept_count < N) {
-            bool msg = my_lim.try_put(T(local_accept_count));
-            if (msg == true) {
+        while ( local_accept_count < N ) {
+            bool msg = my_lim.try_put( T(local_accept_count) );
+            if ( msg == true ) {
                 ++local_accept_count;
                 ++my_accept_count;
-                my_lim.decrementer().try_put(tbb::flow::continue_msg());
+                my_lim.decrementer().try_put( tbb::flow::continue_msg() );
             }
         }
     }
-};
 
-template <typename Sender, typename Receiver>
-void make_edge_impl(Sender& sender, Receiver& receiver) {
-#if __GNUC__ < 12 && !TBB_USE_DEBUG
-    // Seemingly, GNU compiler generates incorrect code for the call of limiter.register_successor in release (-03)
-    // The function pointer to make_edge workarounds the issue for unknown reason
-    auto make_edge_ptr = tbb::flow::make_edge<int>;
-    make_edge_ptr(sender, receiver);
-#else
-    tbb::flow::make_edge(sender, receiver);
-#endif
-}
+};
 
-template <typename T>
-void test_puts_with_decrements(int num_threads, tbb::flow::limiter_node<T>& lim, tbb::flow::graph& g) {
+template< typename T >
+void test_puts_with_decrements( int num_threads, tbb::flow::limiter_node< T >& lim , tbb::flow::graph& g) {
     parallel_receiver<T> r(g);
-    empty_sender<tbb::flow::continue_msg> s;
+    empty_sender< tbb::flow::continue_msg > s;
     std::atomic<int> accept_count;
     accept_count = 0;
-    tbb::flow::make_edge(lim, r);
+    tbb::flow::make_edge( lim, r );
     tbb::flow::make_edge(s, lim.decrementer());
 
     // test puts with decrements
-    utils::NativeParallelFor(num_threads, put_dec_body<T>(lim, accept_count));
+    utils::NativeParallelFor( num_threads, put_dec_body<T>(lim, accept_count) );
     int c = accept_count;
-    CHECK_MESSAGE(c == N * num_threads, "");
-    CHECK_MESSAGE(r.my_count == N * num_threads, "");
+    CHECK_MESSAGE( c == N*num_threads, "" );
+    CHECK_MESSAGE( r.my_count == N*num_threads, "" );
 }
 
 //
@@ -151,34 +161,34 @@ void test_puts_with_decrements(int num_threads, tbb::flow::limiter_node<T>& lim,
 // multiple parallel senders that put to decrement at each accept, limiter accepts new messages
 //
 //
-template <typename T>
+template< typename T >
 int test_parallel(int num_threads) {
 
-    // test puts with no decrements
-    for (int i = 0; i < L; ++i) {
-        tbb::flow::graph g;
-        tbb::flow::limiter_node<T> lim(g, i);
-        parallel_receiver<T> r(g);
-        std::atomic<int> accept_count;
-        accept_count = 0;
-        tbb::flow::make_edge(lim, r);
-        // test puts with no decrements
-        utils::NativeParallelFor(num_threads, put_body<T>(lim, accept_count));
-        g.wait_for_all();
-        int c = accept_count;
-        CHECK_MESSAGE(c == i, "");
-    }
-
-    // test puts with decrements
-    for (int i = 1; i < L; ++i) {
-        tbb::flow::graph g;
-        tbb::flow::limiter_node<T> lim(g, i);
-        test_puts_with_decrements(num_threads, lim, g);
-        tbb::flow::limiter_node<T> lim_copy(lim);
-        test_puts_with_decrements(num_threads, lim_copy, g);
-    }
-
-    return 0;
+   // test puts with no decrements
+   for ( int i = 0; i < L; ++i ) {
+       tbb::flow::graph g;
+       tbb::flow::limiter_node< T > lim(g, i);
+       parallel_receiver<T> r(g);
+       std::atomic<int> accept_count;
+       accept_count = 0;
+       tbb::flow::make_edge( lim, r );
+       // test puts with no decrements
+       utils::NativeParallelFor( num_threads, put_body<T>(lim, accept_count) );
+       g.wait_for_all();
+       int c = accept_count;
+       CHECK_MESSAGE( c == i, "" );
+   }
+
+   // test puts with decrements
+   for ( int i = 1; i < L; ++i ) {
+       tbb::flow::graph g;
+       tbb::flow::limiter_node< T > lim(g, i);
+       test_puts_with_decrements(num_threads, lim, g);
+       tbb::flow::limiter_node< T > lim_copy( lim );
+       test_puts_with_decrements(num_threads, lim_copy, g);
+   }
+
+   return 0;
 }
 
 //
@@ -187,48 +197,48 @@ int test_parallel(int num_threads) {
 // limiter only forwards below the limit, single sender / single receiver
 // at reject, a put to decrement, will cause next message to be accepted
 //
-template <typename T>
+template< typename T >
 int test_serial() {
 
-    // test puts with no decrements
-    for (int i = 0; i < L; ++i) {
-        tbb::flow::graph g;
-        tbb::flow::limiter_node<T> lim(g, i);
-        serial_receiver<T> r(g);
-        tbb::flow::make_edge(lim, r);
-        for (int j = 0; j < L; ++j) {
-            bool msg = lim.try_put(T(j));
-            CHECK_MESSAGE(((j < i && msg == true) || (j >= i && msg == false)), "");
-        }
-        g.wait_for_all();
-    }
-
-    // test puts with decrements
-    for (int i = 1; i < L; ++i) {
-        tbb::flow::graph g;
-        tbb::flow::limiter_node<T> lim(g, i);
-        serial_receiver<T> r(g);
-        empty_sender<tbb::flow::continue_msg> s;
-        tbb::flow::make_edge(lim, r);
-        tbb::flow::make_edge(s, lim.decrementer());
-        for (int j = 0; j < N; ++j) {
-            bool msg = lim.try_put(T(j));
-            CHECK_MESSAGE(((j < i && msg == true) || (j >= i && msg == false)), "");
-            if (msg == false) {
-                lim.decrementer().try_put(tbb::flow::continue_msg());
-                msg = lim.try_put(T(j));
-                CHECK_MESSAGE(msg == true, "");
-            }
-        }
-    }
-    return 0;
+   // test puts with no decrements
+   for ( int i = 0; i < L; ++i ) {
+       tbb::flow::graph g;
+       tbb::flow::limiter_node< T > lim(g, i);
+       serial_receiver<T> r(g);
+       tbb::flow::make_edge( lim, r );
+       for ( int j = 0; j < L; ++j ) {
+           bool msg = lim.try_put( T(j) );
+           CHECK_MESSAGE( (( j < i && msg == true ) || ( j >= i && msg == false )), "" );
+       }
+       g.wait_for_all();
+   }
+
+   // test puts with decrements
+   for ( int i = 1; i < L; ++i ) {
+       tbb::flow::graph g;
+       tbb::flow::limiter_node< T > lim(g, i);
+       serial_receiver<T> r(g);
+       empty_sender< tbb::flow::continue_msg > s;
+       tbb::flow::make_edge( lim, r );
+       tbb::flow::make_edge(s, lim.decrementer());
+       for ( int j = 0; j < N; ++j ) {
+           bool msg = lim.try_put( T(j) );
+           CHECK_MESSAGE( (( j < i && msg == true ) || ( j >= i && msg == false )), "" );
+           if ( msg == false ) {
+               lim.decrementer().try_put( tbb::flow::continue_msg() );
+               msg = lim.try_put( T(j) );
+               CHECK_MESSAGE( msg == true, "" );
+           }
+       }
+   }
+   return 0;
 }
 
-// reported bug in limiter (http://software.intel.com/en-us/comment/1752355)
-#define DECREMENT_OUTPUT 1// the port number of the decrement output of the multifunction_node
-#define LIMITER_OUTPUT 0  // port number of the integer output
+// reported bug in limiter (https://community.intel.com/t5/Intel-oneAPI-Threading-Building/multifun-node-try-put-several-messages-to-one-successor-crashes/m-p/922844)
+#define DECREMENT_OUTPUT 1  // the port number of the decrement output of the multifunction_node
+#define LIMITER_OUTPUT 0    // port number of the integer output
 
-typedef tbb::flow::multifunction_node<int, std::tuple<int, tbb::flow::continue_msg>> mfnode_type;
+typedef tbb::flow::multifunction_node<int, std::tuple<int,tbb::flow::continue_msg> > mfnode_type;
 
 std::atomic<size_t> emit_count;
 std::atomic<size_t> emit_sum;
@@ -238,17 +248,19 @@ std::atomic<size_t> receive_sum;
 struct mfnode_body {
     int max_cnt;
     std::atomic<int>* my_cnt;
-    mfnode_body(const int& _max, std::atomic<int>& _my) : max_cnt(_max), my_cnt(&_my) {}
-    void operator()(const int& /*in*/, mfnode_type::output_ports_type& out) {
+    mfnode_body(const int& _max, std::atomic<int> &_my) : max_cnt(_max), my_cnt(&_my)  { }
+    void operator()(const int &/*in*/, mfnode_type::output_ports_type &out) {
         int lcnt = ++(*my_cnt);
-        if (lcnt > max_cnt) { return; }
+        if(lcnt > max_cnt) {
+            return;
+        }
         // put one continue_msg to the decrement of the limiter.
-        if (!std::get<DECREMENT_OUTPUT>(out).try_put(tbb::flow::continue_msg())) {
-            CHECK_MESSAGE((false), "Unexpected rejection of decrement");
+        if(!std::get<DECREMENT_OUTPUT>(out).try_put(tbb::flow::continue_msg())) {
+            CHECK_MESSAGE( (false),"Unexpected rejection of decrement");
         }
         {
             // put messages to the input of the limiter_node until it rejects.
-            while (std::get<LIMITER_OUTPUT>(out).try_put(lcnt)) {
+            while( std::get<LIMITER_OUTPUT>(out).try_put(lcnt) ) {
                 emit_sum += lcnt;
                 ++emit_count;
             }
@@ -257,7 +269,7 @@ struct mfnode_body {
 };
 
 struct fn_body {
-    int operator()(const int& in) {
+    int operator()(const int &in) {
         receive_sum += in;
         ++receive_count;
         return in;
@@ -273,7 +285,8 @@ struct fn_body {
 // |                                                             |
 // +-------------------------------------------------------------+
 //
-void test_multifunction_to_limiter(int _max, int _nparallel) {
+void
+test_multifunction_to_limiter(int _max, int _nparallel) {
     tbb::flow::graph g;
     emit_count = 0;
     emit_sum = 0;
@@ -291,8 +304,8 @@ void test_multifunction_to_limiter(int _max, int _nparallel) {
 
     mf_node.try_put(1);
     g.wait_for_all();
-    CHECK_MESSAGE((emit_count == receive_count), "counts do not match");
-    CHECK_MESSAGE((emit_sum == receive_sum), "sums do not match");
+    CHECK_MESSAGE( (emit_count == receive_count), "counts do not match");
+    CHECK_MESSAGE( (emit_sum == receive_sum), "sums do not match");
 
     // reset, test again
     g.reset();
@@ -301,25 +314,27 @@ void test_multifunction_to_limiter(int _max, int _nparallel) {
     receive_count = 0;
     receive_sum = 0;
     local_cnt = 0;
-    ;
     mf_node.try_put(1);
     g.wait_for_all();
-    CHECK_MESSAGE((emit_count == receive_count), "counts do not match");
-    CHECK_MESSAGE((emit_sum == receive_sum), "sums do not match");
+    CHECK_MESSAGE( (emit_count == receive_count), "counts do not match");
+    CHECK_MESSAGE( (emit_sum == receive_sum), "sums do not match");
 }
 
-void test_continue_msg_reception() {
+
+void
+test_continue_msg_reception() {
     tbb::flow::graph g;
-    tbb::flow::limiter_node<int> ln(g, 2);
-    tbb::flow::queue_node<int> qn(g);
+    tbb::flow::limiter_node<int> ln(g,2);
+    tbb::flow::queue_node<int>   qn(g);
     tbb::flow::make_edge(ln, qn);
     ln.decrementer().try_put(tbb::flow::continue_msg());
     ln.try_put(42);
     g.wait_for_all();
     int outint;
-    CHECK_MESSAGE((qn.try_get(outint) && outint == 42), "initial put to decrement stops node");
+    CHECK_MESSAGE( (qn.try_get(outint) && outint == 42), "initial put to decrement stops node");
 }
 
+
 //
 // This test ascertains that if a message is not successfully put
 // to a successor, the message is not dropped but released.
@@ -333,38 +348,38 @@ void test_reserve_release_messages() {
     queue_node<int> input_queue(g);
     queue_node<int> output_queue(g);
     broadcast_node<int> broad(g);
-    limiter_node<int, int> limit(g, 2);//threshold of 2
+    limiter_node<int, int> limit(g,2); //threshold of 2
 
     //edges
     make_edge(input_queue, limit);
     make_edge(limit, output_queue);
-    make_edge(broad, limit.decrementer());
+    make_edge(broad,limit.decrementer());
 
-    int list[4] = {19, 33, 72, 98};//list to be put to the input queue
+    int list[4] = {19, 33, 72, 98}; //list to be put to the input queue
 
-    input_queue.try_put(list[0]);// succeeds
-    input_queue.try_put(list[1]);// succeeds
-    input_queue.try_put(list[2]);// fails, stored in upstream buffer
+    input_queue.try_put(list[0]); // succeeds
+    input_queue.try_put(list[1]); // succeeds
+    input_queue.try_put(list[2]); // fails, stored in upstream buffer
     g.wait_for_all();
 
-    remove_edge(limit, output_queue);//remove successor
+    remove_edge(limit, output_queue); //remove successor
 
     //sending message to the decrement port of the limiter
-    broad.try_put(1);//failed message retrieved.
+    broad.try_put(1); //failed message retrieved.
     g.wait_for_all();
 
-    make_edge_impl(limit, output_queue);//putting the successor back
+    tbb::flow::make_edge(limit, output_queue); //putting the successor back
 
-    broad.try_put(1);//drop the count
+    broad.try_put(1);  //drop the count
 
-    input_queue.try_put(list[3]);//success
+    input_queue.try_put(list[3]);  //success
     g.wait_for_all();
 
-    int var = 0;
+    int var=0;
 
-    for (int i = 0; i < 4; i++) {
+    for (int i=0; i<4; i++) {
         output_queue.try_get(var);
-        CHECK_MESSAGE((var == list[i]), "some data dropped, input does not match output");
+        CHECK_MESSAGE( (var==list[i]), "some data dropped, input does not match output");
         g.wait_for_all();
     }
 }
@@ -376,78 +391,82 @@ void test_decrementer() {
     tbb::flow::queue_node<int> queue(g);
     make_edge(limit, queue);
     int m = 0;
-    CHECK_MESSAGE((limit.try_put(m++)), "Newly constructed limiter node does not accept message.");
-    CHECK_MESSAGE(limit.decrementer().try_put(-threshold),// close limiter's gate
-                  "Limiter node decrementer's port does not accept message.");
-    CHECK_MESSAGE((!limit.try_put(m++)), "Closed limiter node's accepts message.");
-    CHECK_MESSAGE(limit.decrementer().try_put(threshold + 5),// open limiter's gate
-                  "Limiter node decrementer's port does not accept message.");
-    for (int i = 0; i < threshold; ++i)
-        CHECK_MESSAGE((limit.try_put(m++)), "Limiter node does not accept message while open.");
-    CHECK_MESSAGE((!limit.try_put(m)), "Limiter node's gate is not closed.");
+    CHECK_MESSAGE( ( limit.try_put( m++ )), "Newly constructed limiter node does not accept message." );
+    CHECK_MESSAGE( limit.decrementer().try_put( -threshold ), // close limiter's gate
+                   "Limiter node decrementer's port does not accept message." );
+    CHECK_MESSAGE( ( !limit.try_put( m++ )), "Closed limiter node's accepts message." );
+    CHECK_MESSAGE( limit.decrementer().try_put( threshold + 5 ),  // open limiter's gate
+                   "Limiter node decrementer's port does not accept message." );
+    for( int i = 0; i < threshold; ++i )
+        CHECK_MESSAGE( ( limit.try_put( m++ )), "Limiter node does not accept message while open." );
+    CHECK_MESSAGE( ( !limit.try_put( m )), "Limiter node's gate is not closed." );
     g.wait_for_all();
     int expected[] = {0, 2, 3, 4, 5, 6};
-    int actual = -1;
-    m = 0;
-    while (queue.try_get(actual)) CHECK_MESSAGE(actual == expected[m++], "");
-    CHECK_MESSAGE((sizeof(expected) / sizeof(expected[0]) == m), "Not all messages have been processed.");
+    int actual = -1; m = 0;
+    while( queue.try_get(actual) )
+        CHECK_MESSAGE( actual == expected[m++], "" );
+    CHECK_MESSAGE( ( sizeof(expected) / sizeof(expected[0]) == m), "Not all messages have been processed." );
     g.wait_for_all();
 
     const size_t threshold2 = size_t(-1);
     tbb::flow::limiter_node<int, long long> limit2(g, threshold2);
     make_edge(limit2, queue);
-    CHECK_MESSAGE((limit2.try_put(1)), "Newly constructed limiter node does not accept message.");
-    long long decrement_value = (long long) (size_t(-1) / 2);
-    CHECK_MESSAGE(limit2.decrementer().try_put(-decrement_value),
-                  "Limiter node decrementer's port does not accept message");
-    CHECK_MESSAGE((limit2.try_put(2)), "Limiter's gate should not be closed yet.");
-    CHECK_MESSAGE(limit2.decrementer().try_put(-decrement_value),
-                  "Limiter node decrementer's port does not accept message");
-    CHECK_MESSAGE((!limit2.try_put(3)), "Overflow happened for internal counter.");
+    CHECK_MESSAGE( ( limit2.try_put( 1 )), "Newly constructed limiter node does not accept message." );
+    long long decrement_value = (long long)( size_t(-1)/2 );
+    CHECK_MESSAGE( limit2.decrementer().try_put( -decrement_value ),
+                   "Limiter node decrementer's port does not accept message" );
+    CHECK_MESSAGE( ( limit2.try_put( 2 )), "Limiter's gate should not be closed yet." );
+    CHECK_MESSAGE( limit2.decrementer().try_put( -decrement_value ),
+                   "Limiter node decrementer's port does not accept message" );
+    CHECK_MESSAGE( ( !limit2.try_put( 3 )), "Overflow happened for internal counter." );
     int expected2[] = {1, 2};
-    actual = -1;
-    m = 0;
-    while (queue.try_get(actual)) CHECK_MESSAGE(actual == expected2[m++], "");
-    CHECK_MESSAGE((sizeof(expected2) / sizeof(expected2[0]) == m), "Not all messages have been processed.");
+    actual = -1; m = 0;
+    while( queue.try_get(actual) )
+        CHECK_MESSAGE( actual == expected2[m++], "" );
+    CHECK_MESSAGE( ( sizeof(expected2) / sizeof(expected2[0]) == m), "Not all messages have been processed." );
     g.wait_for_all();
 
     const size_t threshold3 = 10;
     tbb::flow::limiter_node<int, long long> limit3(g, threshold3);
     make_edge(limit3, queue);
     long long decrement_value3 = 3;
-    CHECK_MESSAGE(limit3.decrementer().try_put(-decrement_value3),
-                  "Limiter node decrementer's port does not accept message");
+    CHECK_MESSAGE( limit3.decrementer().try_put( -decrement_value3 ),
+                   "Limiter node decrementer's port does not accept message" );
 
     m = 0;
-    while (limit3.try_put(m)) { m++; };
-    CHECK_MESSAGE(m == threshold3 - decrement_value3, "Not all messages have been accepted.");
+    while( limit3.try_put( m ) ){ m++; };
+    CHECK_MESSAGE( m == threshold3 - decrement_value3, "Not all messages have been accepted." );
 
-    actual = -1;
-    m = 0;
-    while (queue.try_get(actual)) { CHECK_MESSAGE(actual == m++, "Not all messages have been processed."); }
+    actual = -1; m = 0;
+    while( queue.try_get(actual) ){
+        CHECK_MESSAGE( actual == m++, "Not all messages have been processed." );
+    }
 
     g.wait_for_all();
-    CHECK_MESSAGE(m == threshold3 - decrement_value3, "Not all messages have been processed.");
+    CHECK_MESSAGE( m == threshold3 - decrement_value3, "Not all messages have been processed." );
 }
 
 void test_try_put_without_successors() {
     tbb::flow::graph g;
-    int try_put_num {3};
+    int try_put_num{3};
     tbb::flow::buffer_node<int> bn(g);
     tbb::flow::limiter_node<int> ln(g, try_put_num);
 
     tbb::flow::make_edge(bn, ln);
 
     int i = 1;
-    for (; i <= try_put_num; i++) bn.try_put(i);
-
-    std::atomic<int> counter {0};
-    tbb::flow::function_node<int, int> fn(g, tbb::flow::unlimited, [&](int input) {
-        counter += input;
-        return int {};
-    });
+    for (; i <= try_put_num; i++)
+        bn.try_put(i);
+
+    std::atomic<int> counter{0};
+    tbb::flow::function_node<int, int> fn(g, tbb::flow::unlimited,
+        [&](int input) {
+            counter += input;
+            return int{};
+        }
+    );
 
-    make_edge_impl(ln, fn);
+    tbb::flow::make_edge(ln, fn);
 
     g.wait_for_all();
     CHECK((counter == i * try_put_num / 2));
@@ -458,6 +477,7 @@ void test_try_put_without_successors() {
     bn.try_put(try_put_num + 1);
     g.wait_for_all();
     CHECK((counter == i * try_put_num / 2));
+
 }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
@@ -466,13 +486,14 @@ void test_try_put_without_successors() {
 void test_follows_and_precedes_api() {
     using msg_t = tbb::flow::continue_msg;
 
-    std::array<msg_t, 3> messages_for_follows = {{msg_t(), msg_t(), msg_t()}};
+    std::array<msg_t, 3> messages_for_follows= { {msg_t(), msg_t(), msg_t()} };
     std::vector<msg_t> messages_for_precedes = {msg_t()};
 
-    follows_and_precedes_testing::test_follows<msg_t, tbb::flow::limiter_node<msg_t, msg_t>>(
-            messages_for_follows, 1000);
-    follows_and_precedes_testing::test_precedes<msg_t, tbb::flow::limiter_node<msg_t, msg_t>>(
-            messages_for_precedes, 1000);
+    follows_and_precedes_testing::test_follows
+        <msg_t, tbb::flow::limiter_node<msg_t, msg_t>>(messages_for_follows, 1000);
+    follows_and_precedes_testing::test_precedes
+        <msg_t, tbb::flow::limiter_node<msg_t, msg_t>>(messages_for_precedes, 1000);
+
 }
 #endif
 
@@ -497,50 +518,188 @@ void test_deduction_guides() {
 }
 #endif
 
+void test_decrement_while_try_put_task() {
+    constexpr int threshold = 50000;
+
+    tbb::flow::graph graph{};
+    std::atomic<int> processed;
+    tbb::flow::input_node<int> input{ graph, [&](tbb::flow_control & fc) -> int {
+        static int i = {};
+        if (i++ >= threshold) fc.stop();
+        return i;
+    }};
+    tbb::flow::limiter_node<int, int> blockingNode{ graph, 1 };
+    tbb::flow::multifunction_node<int, std::tuple<int>> processing{ graph, tbb::flow::serial,
+        [&](const int & value, typename decltype(processing)::output_ports_type & out) {
+            if (value != threshold)
+                std::get<0>(out).try_put(1);
+            processed.store(value);
+        }};
+
+    tbb::flow::make_edge(input, blockingNode);
+    tbb::flow::make_edge(blockingNode, processing);
+    tbb::flow::make_edge(processing, blockingNode.decrementer());
+
+    input.activate();
+
+    graph.wait_for_all();
+    CHECK_MESSAGE(processed.load() == threshold, "decrementer terminate flow graph work");
+}
+
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+void test_try_put_and_wait() {
+    tbb::task_arena arena(1);
+
+    arena.execute([] {
+        tbb::flow::graph g;
+
+        std::vector<int> start_work_items;
+        std::vector<int> processed_items;
+        std::vector<int> new_work_items;
+        int wait_message = 10;
+
+        for (int i = 0; i < wait_message; ++i) {
+            start_work_items.emplace_back(i);
+            new_work_items.emplace_back(i + 1 + wait_message);
+        }
+
+        std::size_t threshold = start_work_items.size() + 1;
+        CHECK_MESSAGE(new_work_items.size() < threshold, "Incorrect test setup");
+
+        tbb::flow::limiter_node<int> limiter(g, threshold);
+        tbb::flow::function_node<int, tbb::flow::continue_msg> function(g, tbb::flow::serial,
+            [&](int input) {
+                if (input == wait_message) {
+                    for (auto item : new_work_items) {
+                        limiter.try_put(item);
+                    }
+                }
+                processed_items.emplace_back(input);
+            });
+
+        tbb::flow::make_edge(limiter, function);
+        tbb::flow::make_edge(function, limiter.decrementer());
+
+        for (auto item : start_work_items) {
+            limiter.try_put(item);
+        }
+
+        limiter.try_put_and_wait(wait_message);
+
+        // Since function is a serial queueing function_node, all start_work_items would be added to the queue
+        // and processed in FIFO order. wait_message would be added and processed last. Each item in start_work_items
+        // should put an item to a decrementer edge and hence new_work_items should not be missed as well
+
+        std::size_t check_index = 0;
+
+        for (auto item : start_work_items) {
+            CHECK_MESSAGE(processed_items[check_index++] == item, "Unexpected start_work_items processing");
+        }
+        CHECK_MESSAGE(processed_items[check_index++] == wait_message, "Unexpected wait_message processing");
+        CHECK_MESSAGE(check_index == processed_items.size(), "Unexpected number of messages");
+
+        g.wait_for_all();
+
+        for (auto item : new_work_items) {
+            CHECK_MESSAGE(processed_items[check_index++] == item, "Unexpected new_work_items processing");
+        }
+        CHECK(check_index == processed_items.size());
+    });
+}
+#endif
+
 //! Test puts on limiter_node with decrements and varying parallelism levels
 //! \brief \ref error_guessing
 TEST_CASE("Serial and parallel tests") {
     for (unsigned i = 1; i <= 2 * utils::MaxThread; ++i) {
         tbb::task_arena arena(i);
-        arena.execute([i]() {
-            test_serial<int>();
-            test_parallel<int>(i);
-        });
+        arena.execute(
+            [i]() {
+                test_serial<int>();
+                test_parallel<int>(i);
+            }
+        );
     }
 }
 
 //! Test initial put of continue_msg on decrementer port does not stop message flow
 //! \brief \ref error_guessing
-TEST_CASE("Test continue_msg reception") { test_continue_msg_reception(); }
+TEST_CASE("Test continue_msg reception") {
+    test_continue_msg_reception();
+}
+
+//! Test put message on decrementer port does not stop message flow
+//! \brief \ref error_guessing
+TEST_CASE("Test try_put to decrementer while try_put to limiter_node") {
+    test_decrement_while_try_put_task();
+}
 
 //! Test multifunction_node connected to limiter_node
 //! \brief \ref error_guessing
 TEST_CASE("Multifunction connected to limiter") {
-    test_multifunction_to_limiter(30, 3);
-    test_multifunction_to_limiter(300, 13);
-    test_multifunction_to_limiter(3000, 1);
+    test_multifunction_to_limiter(30,3);
+    test_multifunction_to_limiter(300,13);
+    test_multifunction_to_limiter(3000,1);
 }
 
 //! Test message release if successor doesn't accept
 //! \brief \ref requirement
-TEST_CASE("Message is released if successor does not accept") { test_reserve_release_messages(); }
+TEST_CASE("Message is released if successor does not accept") {
+    test_reserve_release_messages();
+}
 
 //! Test decrementer
 //! \brief \ref requirement \ref error_guessing
-TEST_CASE("Decrementer") { test_decrementer(); }
+TEST_CASE("Decrementer") {
+    test_decrementer();
+}
 
 //! Test try_put() without successor
 //! \brief \ref error_guessing
-TEST_CASE("Test try_put() without successors") { test_try_put_without_successors(); }
+TEST_CASE("Test try_put() without successors") {
+    test_try_put_without_successors();
+}
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 //! Test follows and precedes API
 //! \brief \ref error_guessing
-TEST_CASE("Support for follows and precedes API") { test_follows_and_precedes_api(); }
+TEST_CASE( "Support for follows and precedes API" ) {
+    test_follows_and_precedes_api();
+}
 #endif
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 //! Test deduction guides
 //! \brief \ref requirement
-TEST_CASE("Deduction guides") { test_deduction_guides(); }
+TEST_CASE( "Deduction guides" ) {
+    test_deduction_guides();
+}
+#endif
+
+struct TestLargeStruct {
+    char bytes[512]{ 0 };
+};
+
+//! Test correct node deallocation while using small_object_pool.
+//! (see https://github.com/oneapi-src/oneTBB/issues/639)
+//! \brief \ref error_guessing
+TEST_CASE("Test correct node deallocation while using small_object_pool") {
+    tbb::flow::graph graph;
+    tbb::flow::queue_node<TestLargeStruct> input_node( graph );
+    tbb::flow::function_node<TestLargeStruct> func( graph, tbb::flow::serial,
+        [](const TestLargeStruct& input) { return input; } );
+
+    tbb::flow::make_edge( input_node, func );
+    CHECK( input_node.try_put( TestLargeStruct{} ) );
+    graph.wait_for_all();
+
+    tbb::task_scheduler_handle handle{ tbb::attach{} };
+    tbb::finalize( handle, std::nothrow );
+}
+
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+//! \brief \ref error_guessing
+TEST_CASE("test limiter_node try_put_and_wait") {
+    test_try_put_and_wait();
+}
 #endif
diff --git a/external/tbb/test/tbb/test_multifunction_node.cpp b/external/tbb/test/tbb/test_multifunction_node.cpp
index ea09d64b..bfebbbe9 100644
--- a/external/tbb/test/tbb/test_multifunction_node.cpp
+++ b/external/tbb/test/tbb/test_multifunction_node.cpp
@@ -15,7 +15,7 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
 #endif
 
 #include "common/config.h"
@@ -23,15 +23,17 @@
 #include "tbb/flow_graph.h"
 #include "tbb/spin_rw_mutex.h"
 
-#include "common/concepts_common.h"
-#include "common/graph_utils.h"
 #include "common/test.h"
-#include "common/test_follows_and_precedes_api.h"
 #include "common/utils.h"
+#include "common/graph_utils.h"
+#include "common/test_follows_and_precedes_api.h"
+#include "common/concepts_common.h"
+
 
 //! \file test_multifunction_node.cpp
 //! \brief Test for [flow_graph.multifunction_node] specification
 
+
 #if TBB_USE_DEBUG
 #define N 16
 #else
@@ -48,11 +50,11 @@
 */
 
 //! exercise buffered multifunction_node.
-template <typename InputType, typename OutputTuple, typename Body>
-void buffered_levels(size_t concurrency, Body body) {
-    typedef typename std::tuple_element<0, OutputTuple>::type OutputType;
+template< typename InputType, typename OutputTuple, typename Body >
+void buffered_levels( size_t concurrency, Body body ) {
+    typedef typename std::tuple_element<0,OutputTuple>::type OutputType;
     // Do for lc = 1 to concurrency level
-    for (size_t lc = 1; lc <= concurrency; ++lc) {
+    for ( size_t lc = 1; lc <= concurrency; ++lc ) {
         tbb::flow::graph g;
 
         // Set the execute_counter back to zero in the harness
@@ -63,62 +65,62 @@ void buffered_levels(size_t concurrency, Body body) {
         harness_graph_multifunction_executor<InputType, OutputTuple>::max_executors = lc;
 
         // Create the function_node with the appropriate concurrency level, and use default buffering
-        tbb::flow::multifunction_node<InputType, OutputTuple> exe_node(g, lc, body);
+        tbb::flow::multifunction_node< InputType, OutputTuple > exe_node( g, lc, body );
 
         //Create a vector of identical exe_nodes
-        std::vector<tbb::flow::multifunction_node<InputType, OutputTuple>> exe_vec(2, exe_node);
+        std::vector< tbb::flow::multifunction_node< InputType, OutputTuple > > exe_vec(2, exe_node);
 
         // exercise each of the copied nodes
-        for (size_t node_idx = 0; node_idx < exe_vec.size(); ++node_idx) {
-            for (size_t num_receivers = 1; num_receivers <= MAX_NODES; ++num_receivers) {
+        for (size_t node_idx=0; node_idx<exe_vec.size(); ++node_idx) {
+            for (size_t num_receivers = 1; num_receivers <= MAX_NODES; ++num_receivers ) {
                 // Create num_receivers counting receivers and connect the exe_vec[node_idx] to them.
-                std::vector<std::shared_ptr<harness_mapped_receiver<OutputType>>> receivers;
+                std::vector< std::shared_ptr<harness_mapped_receiver<OutputType>> > receivers;
                 for (size_t i = 0; i < num_receivers; i++) {
-                    receivers.push_back(std::make_shared<harness_mapped_receiver<OutputType>>(g));
+                    receivers.push_back( std::make_shared<harness_mapped_receiver<OutputType>>(g) );
                 }
 
-                for (size_t r = 0; r < num_receivers; ++r) {
-                    tbb::flow::make_edge(tbb::flow::output_port<0>(exe_vec[node_idx]), *receivers[r]);
+                for (size_t r = 0; r < num_receivers; ++r ) {
+                    tbb::flow::make_edge( tbb::flow::output_port<0>(exe_vec[node_idx]), *receivers[r] );
                 }
 
                 // Do the test with varying numbers of senders
-                std::vector<std::shared_ptr<harness_counting_sender<InputType>>> senders;
-                for (size_t num_senders = 1; num_senders <= MAX_NODES; ++num_senders) {
+                std::vector< std::shared_ptr<harness_counting_sender<InputType>> > senders;
+                for (size_t num_senders = 1; num_senders <= MAX_NODES; ++num_senders ) {
                     // Create num_senders senders, set their message limit each to N, and connect
                     // them to the exe_vec[node_idx]
                     senders.clear();
-                    for (size_t s = 0; s < num_senders; ++s) {
-                        senders.push_back(std::make_shared<harness_counting_sender<InputType>>());
+                    for (size_t s = 0; s < num_senders; ++s ) {
+                        senders.push_back( std::make_shared<harness_counting_sender<InputType>>() );
                         senders.back()->my_limit = N;
-                        tbb::flow::make_edge(*senders.back(), exe_vec[node_idx]);
+                        tbb::flow::make_edge( *senders.back(), exe_vec[node_idx] );
                     }
 
                     // Initialize the receivers so they know how many senders and messages to check for
-                    for (size_t r = 0; r < num_receivers; ++r) {
-                        receivers[r]->initialize_map(N, num_senders);
+                    for (size_t r = 0; r < num_receivers; ++r ) {
+                        receivers[r]->initialize_map( N, num_senders );
                     }
 
                     // Do the test
-                    utils::NativeParallelFor((int) num_senders, parallel_put_until_limit<InputType>(senders));
+                    utils::NativeParallelFor( (int)num_senders, parallel_put_until_limit<InputType>(senders) );
                     g.wait_for_all();
 
                     // confirm that each sender was requested from N times
-                    for (size_t s = 0; s < num_senders; ++s) {
+                    for (size_t s = 0; s < num_senders; ++s ) {
                         size_t n = senders[s]->my_received;
-                        CHECK_MESSAGE(n == N, "");
-                        CHECK_MESSAGE(senders[s]->my_receiver.load(std::memory_order_relaxed)
-                                              == &exe_vec[node_idx],
-                                      "");
+                        CHECK_MESSAGE( n == N, "" );
+                        CHECK_MESSAGE( senders[s]->my_receiver.load(std::memory_order_relaxed) == &exe_vec[node_idx], "" );
                     }
                     // validate the receivers
-                    for (size_t r = 0; r < num_receivers; ++r) { receivers[r]->validate(); }
+                    for (size_t r = 0; r < num_receivers; ++r ) {
+                        receivers[r]->validate();
+                    }
                 }
-                for (size_t r = 0; r < num_receivers; ++r) {
-                    tbb::flow::remove_edge(tbb::flow::output_port<0>(exe_vec[node_idx]), *receivers[r]);
+                for (size_t r = 0; r < num_receivers; ++r ) {
+                    tbb::flow::remove_edge( tbb::flow::output_port<0>(exe_vec[node_idx]), *receivers[r] );
                 }
-                CHECK_MESSAGE(exe_vec[node_idx].try_put(InputType()) == true, "");
+                CHECK_MESSAGE( exe_vec[node_idx].try_put( InputType() ) == true, "" );
                 g.wait_for_all();
-                for (size_t r = 0; r < num_receivers; ++r) {
+                for (size_t r = 0; r < num_receivers; ++r ) {
                     // since it's detached, nothing should have changed
                     receivers[r]->validate();
                 }
@@ -133,93 +135,96 @@ std::atomic<size_t> global_execute_count;
 struct inc_functor {
 
     std::atomic<size_t> local_execute_count;
-    inc_functor() { local_execute_count = 0; }
-    inc_functor(const inc_functor& f) { local_execute_count = size_t(f.local_execute_count); }
-
-    template <typename output_ports_type>
-    void operator()(int i, output_ports_type& p) {
-        ++global_execute_count;
-        ++local_execute_count;
-        (void) std::get<0>(p).try_put(i);
+    inc_functor( ) { local_execute_count = 0; }
+    inc_functor( const inc_functor &f ) { local_execute_count = size_t(f.local_execute_count); }
+
+    template<typename output_ports_type>
+    void operator()( int i, output_ports_type &p ) {
+       ++global_execute_count;
+       ++local_execute_count;
+       (void)std::get<0>(p).try_put(i);
     }
+
 };
 
-template <typename InputType, typename OutputTuple>
-void buffered_levels_with_copy(size_t concurrency) {
-    typedef typename std::tuple_element<0, OutputTuple>::type OutputType;
+template< typename InputType, typename OutputTuple >
+void buffered_levels_with_copy( size_t concurrency ) {
+    typedef typename std::tuple_element<0,OutputTuple>::type OutputType;
     // Do for lc = 1 to concurrency level
-    for (size_t lc = 1; lc <= concurrency; ++lc) {
+    for ( size_t lc = 1; lc <= concurrency; ++lc ) {
         tbb::flow::graph g;
 
         inc_functor cf;
         cf.local_execute_count = Offset;
         global_execute_count = Offset;
 
-        tbb::flow::multifunction_node<InputType, OutputTuple> exe_node(g, lc, cf);
+        tbb::flow::multifunction_node< InputType, OutputTuple > exe_node( g, lc, cf );
 
-        for (size_t num_receivers = 1; num_receivers <= MAX_NODES; ++num_receivers) {
+        for (size_t num_receivers = 1; num_receivers <= MAX_NODES; ++num_receivers ) {
 
-            std::vector<std::shared_ptr<harness_mapped_receiver<OutputType>>> receivers;
+            std::vector< std::shared_ptr<harness_mapped_receiver<OutputType>> > receivers;
             for (size_t i = 0; i < num_receivers; i++) {
-                receivers.push_back(std::make_shared<harness_mapped_receiver<OutputType>>(g));
+                receivers.push_back( std::make_shared<harness_mapped_receiver<OutputType>>(g) );
             }
 
-            for (size_t r = 0; r < num_receivers; ++r) {
-                tbb::flow::make_edge(tbb::flow::output_port<0>(exe_node), *receivers[r]);
+            for (size_t r = 0; r < num_receivers; ++r ) {
+               tbb::flow::make_edge( tbb::flow::output_port<0>(exe_node), *receivers[r] );
             }
 
-            std::vector<std::shared_ptr<harness_counting_sender<InputType>>> senders;
-            for (size_t num_senders = 1; num_senders <= MAX_NODES; ++num_senders) {
+            std::vector< std::shared_ptr<harness_counting_sender<InputType>> > senders;
+            for (size_t num_senders = 1; num_senders <= MAX_NODES; ++num_senders ) {
                 senders.clear();
-                for (size_t s = 0; s < num_senders; ++s) {
-                    senders.push_back(std::make_shared<harness_counting_sender<InputType>>());
+                for (size_t s = 0; s < num_senders; ++s ) {
+                    senders.push_back( std::make_shared<harness_counting_sender<InputType>>() );
                     senders.back()->my_limit = N;
-                    tbb::flow::make_edge(*senders.back(), exe_node);
+                    tbb::flow::make_edge( *senders.back(), exe_node );
                 }
 
-                for (size_t r = 0; r < num_receivers; ++r) { receivers[r]->initialize_map(N, num_senders); }
+                for (size_t r = 0; r < num_receivers; ++r ) {
+                    receivers[r]->initialize_map( N, num_senders );
+                }
 
-                utils::NativeParallelFor((int) num_senders, parallel_put_until_limit<InputType>(senders));
+                utils::NativeParallelFor( (int)num_senders, parallel_put_until_limit<InputType>(senders) );
                 g.wait_for_all();
 
-                for (size_t s = 0; s < num_senders; ++s) {
+                for (size_t s = 0; s < num_senders; ++s ) {
                     size_t n = senders[s]->my_received;
-                    CHECK_MESSAGE(n == N, "");
-                    CHECK_MESSAGE(senders[s]->my_receiver.load(std::memory_order_relaxed) == &exe_node, "");
+                    CHECK_MESSAGE( n == N, "" );
+                    CHECK_MESSAGE( senders[s]->my_receiver.load(std::memory_order_relaxed) == &exe_node, "" );
+                }
+                for (size_t r = 0; r < num_receivers; ++r ) {
+                    receivers[r]->validate();
                 }
-                for (size_t r = 0; r < num_receivers; ++r) { receivers[r]->validate(); }
             }
-            for (size_t r = 0; r < num_receivers; ++r) {
-                tbb::flow::remove_edge(tbb::flow::output_port<0>(exe_node), *receivers[r]);
+            for (size_t r = 0; r < num_receivers; ++r ) {
+                tbb::flow::remove_edge( tbb::flow::output_port<0>(exe_node), *receivers[r] );
             }
-            CHECK_MESSAGE(exe_node.try_put(InputType()) == true, "");
+            CHECK_MESSAGE( exe_node.try_put( InputType() ) == true, "" );
             g.wait_for_all();
-            for (size_t r = 0; r < num_receivers; ++r) { receivers[r]->validate(); }
+            for (size_t r = 0; r < num_receivers; ++r ) {
+                receivers[r]->validate();
+            }
         }
 
         // validate that the local body matches the global execute_count and both are correct
-        inc_functor body_copy = tbb::flow::copy_body<inc_functor>(exe_node);
-        const size_t expected_count = N / 2 * MAX_NODES * MAX_NODES * (MAX_NODES + 1) + MAX_NODES + Offset;
+        inc_functor body_copy = tbb::flow::copy_body<inc_functor>( exe_node );
+        const size_t expected_count = N/2 * MAX_NODES * MAX_NODES * ( MAX_NODES + 1 ) + MAX_NODES + Offset;
         size_t global_count = global_execute_count;
         size_t inc_count = body_copy.local_execute_count;
-        CHECK_MESSAGE((global_count == expected_count && global_count == inc_count), "");
+        CHECK_MESSAGE( (global_count == expected_count && global_count == inc_count), "" );
     }
 }
 
-template <typename InputType, typename OutputTuple>
-void run_buffered_levels(int c) {
-    typedef typename tbb::flow::multifunction_node<InputType, OutputTuple>::output_ports_type
-            output_ports_type;
-    buffered_levels<InputType, OutputTuple>(c, [](InputType i, output_ports_type& p) {
-        harness_graph_multifunction_executor<InputType, OutputTuple>::func(i, p);
-    });
-    buffered_levels<InputType, OutputTuple>(
-            c, &harness_graph_multifunction_executor<InputType, OutputTuple>::func);
-    buffered_levels<InputType, OutputTuple>(
-            c, typename harness_graph_multifunction_executor<InputType, OutputTuple>::functor());
-    buffered_levels_with_copy<InputType, OutputTuple>(c);
+template< typename InputType, typename OutputTuple >
+void run_buffered_levels( int c ) {
+    typedef typename tbb::flow::multifunction_node<InputType,OutputTuple>::output_ports_type output_ports_type;
+    buffered_levels<InputType,OutputTuple>( c, []( InputType i, output_ports_type &p ) { harness_graph_multifunction_executor<InputType, OutputTuple>::func(i,p); } );
+    buffered_levels<InputType,OutputTuple>( c, &harness_graph_multifunction_executor<InputType, OutputTuple>::func );
+    buffered_levels<InputType,OutputTuple>( c, typename harness_graph_multifunction_executor<InputType, OutputTuple>::functor() );
+    buffered_levels_with_copy<InputType,OutputTuple>( c );
 }
 
+
 //! Performs test on executable nodes with limited concurrency
 /** These tests check:
     1) that the nodes will accepts puts up to the concurrency limit,
@@ -229,10 +234,10 @@ void run_buffered_levels(int c) {
     There is no checking of the contents of the messages for corruption.
 */
 
-template <typename InputType, typename OutputTuple, typename Body>
-void concurrency_levels(size_t concurrency, Body body) {
-    typedef typename std::tuple_element<0, OutputTuple>::type OutputType;
-    for (size_t lc = 1; lc <= concurrency; ++lc) {
+template< typename InputType, typename OutputTuple, typename Body >
+void concurrency_levels( size_t concurrency, Body body ) {
+    typedef typename std::tuple_element<0,OutputTuple>::type OutputType;
+    for ( size_t lc = 1; lc <= concurrency; ++lc ) {
         tbb::flow::graph g;
 
         // Set the execute_counter back to zero in the harness
@@ -242,107 +247,102 @@ void concurrency_levels(size_t concurrency, Body body) {
         // Set the max allowed executors to lc.  There is a check in the functor to make sure this is never exceeded.
         harness_graph_multifunction_executor<InputType, OutputTuple>::max_executors = lc;
 
-        tbb::flow::multifunction_node<InputType, OutputTuple, tbb::flow::rejecting> exe_node(g, lc, body);
 
-        for (size_t num_receivers = 1; num_receivers <= MAX_NODES; ++num_receivers) {
+        tbb::flow::multifunction_node< InputType, OutputTuple, tbb::flow::rejecting > exe_node( g, lc, body );
 
-            std::vector<std::shared_ptr<harness_counting_receiver<OutputType>>> receivers;
+        for (size_t num_receivers = 1; num_receivers <= MAX_NODES; ++num_receivers ) {
+
+            std::vector< std::shared_ptr<harness_counting_receiver<OutputType>> > receivers;
             for (size_t i = 0; i < num_receivers; ++i) {
-                receivers.push_back(std::make_shared<harness_counting_receiver<OutputType>>(g));
+                receivers.push_back( std::make_shared<harness_counting_receiver<OutputType>>(g) );
             }
 
-            for (size_t r = 0; r < num_receivers; ++r) {
-                tbb::flow::make_edge(tbb::flow::output_port<0>(exe_node), *receivers[r]);
+            for (size_t r = 0; r < num_receivers; ++r ) {
+                tbb::flow::make_edge( tbb::flow::output_port<0>(exe_node), *receivers[r] );
             }
 
-            std::vector<std::shared_ptr<harness_counting_sender<InputType>>> senders;
+            std::vector< std::shared_ptr<harness_counting_sender<InputType>> > senders;
 
-            for (size_t num_senders = 1; num_senders <= MAX_NODES; ++num_senders) {
+            for (size_t num_senders = 1; num_senders <= MAX_NODES; ++num_senders ) {
                 {
                     // Exclusively lock m to prevent exe_node from finishing
                     tbb::spin_rw_mutex::scoped_lock l(
-                            harness_graph_multifunction_executor<InputType, OutputTuple>::
-                                    template mutex_holder<tbb::spin_rw_mutex>::mutex);
+                        harness_graph_multifunction_executor< InputType, OutputTuple>::template mutex_holder<tbb::spin_rw_mutex>::mutex
+                    );
 
                     // put to lc level, it will accept and then block at m
-                    for (size_t c = 0; c < lc; ++c) {
-                        CHECK_MESSAGE(exe_node.try_put(InputType()) == true, "");
+                    for ( size_t c = 0 ; c < lc ; ++c ) {
+                        CHECK_MESSAGE( exe_node.try_put( InputType() ) == true, "" );
                     }
                     // it only accepts to lc level
-                    CHECK_MESSAGE(exe_node.try_put(InputType()) == false, "");
+                    CHECK_MESSAGE( exe_node.try_put( InputType() ) == false, "" );
 
                     senders.clear();
-                    for (size_t s = 0; s < num_senders; ++s) {
-                        senders.push_back(std::make_shared<harness_counting_sender<InputType>>());
+                    for (size_t s = 0; s < num_senders; ++s ) {
+                        senders.push_back( std::make_shared<harness_counting_sender<InputType>>() );
                         senders.back()->my_limit = N;
-                        exe_node.register_predecessor(*senders.back());
+                        exe_node.register_predecessor( *senders.back() );
                     }
 
-                }// release lock at end of scope, setting the exe node free to continue
+                } // release lock at end of scope, setting the exe node free to continue
                 // wait for graph to settle down
                 g.wait_for_all();
 
                 // confirm that each sender was requested from N times
-                for (size_t s = 0; s < num_senders; ++s) {
+                for (size_t s = 0; s < num_senders; ++s ) {
                     size_t n = senders[s]->my_received;
-                    CHECK_MESSAGE(n == N, "");
-                    CHECK_MESSAGE(senders[s]->my_receiver.load(std::memory_order_relaxed) == &exe_node, "");
+                    CHECK_MESSAGE( n == N, "" );
+                    CHECK_MESSAGE( senders[s]->my_receiver.load(std::memory_order_relaxed) == &exe_node, "" );
                 }
                 // confirm that each receivers got N * num_senders + the initial lc puts
-                for (size_t r = 0; r < num_receivers; ++r) {
+                for (size_t r = 0; r < num_receivers; ++r ) {
                     size_t n = receivers[r]->my_count;
-                    CHECK_MESSAGE(n == num_senders * N + lc, "");
+                    CHECK_MESSAGE( n == num_senders*N+lc, "" );
                     receivers[r]->my_count = 0;
                 }
             }
-            for (size_t r = 0; r < num_receivers; ++r) {
-                tbb::flow::remove_edge(tbb::flow::output_port<0>(exe_node), *receivers[r]);
+            for (size_t r = 0; r < num_receivers; ++r ) {
+                tbb::flow::remove_edge( tbb::flow::output_port<0>(exe_node), *receivers[r] );
             }
-            CHECK_MESSAGE(exe_node.try_put(InputType()) == true, "");
+            CHECK_MESSAGE( exe_node.try_put( InputType() ) == true, "" );
             g.wait_for_all();
-            for (size_t r = 0; r < num_receivers; ++r) {
-                CHECK_MESSAGE(int(receivers[r]->my_count) == 0, "");
+            for (size_t r = 0; r < num_receivers; ++r ) {
+                CHECK_MESSAGE( int(receivers[r]->my_count) == 0, "" );
             }
         }
     }
 }
 
-template <typename InputType, typename OutputTuple>
-void run_concurrency_levels(int c) {
-    typedef typename tbb::flow::multifunction_node<InputType, OutputTuple>::output_ports_type
-            output_ports_type;
-    concurrency_levels<InputType, OutputTuple>(c, [](InputType i, output_ports_type& p) {
-        harness_graph_multifunction_executor<InputType, OutputTuple>::template tfunc<tbb::spin_rw_mutex>(i,
-                                                                                                         p);
-    });
-    concurrency_levels<InputType, OutputTuple>(
-            c, &harness_graph_multifunction_executor<InputType,
-                                                     OutputTuple>::template tfunc<tbb::spin_rw_mutex>);
-    concurrency_levels<InputType, OutputTuple>(
-            c, typename harness_graph_multifunction_executor<InputType, OutputTuple>::template tfunctor<
-                       tbb::spin_rw_mutex>());
+template< typename InputType, typename OutputTuple >
+void run_concurrency_levels( int c ) {
+    typedef typename tbb::flow::multifunction_node<InputType,OutputTuple>::output_ports_type output_ports_type;
+    concurrency_levels<InputType,OutputTuple>( c, []( InputType i, output_ports_type &p ) { harness_graph_multifunction_executor<InputType, OutputTuple>::template tfunc<tbb::spin_rw_mutex>(i,p); } );
+    concurrency_levels<InputType,OutputTuple>( c, &harness_graph_multifunction_executor<InputType, OutputTuple>::template tfunc<tbb::spin_rw_mutex> );
+    concurrency_levels<InputType,OutputTuple>( c, typename harness_graph_multifunction_executor<InputType, OutputTuple>::template tfunctor<tbb::spin_rw_mutex>() );
 }
 
+
 struct empty_no_assign {
-    empty_no_assign() {}
-    empty_no_assign(int) {}
-    operator int() { return 0; }
-    operator int() const { return 0; }
+   empty_no_assign() {}
+   empty_no_assign( int ) {}
+   operator int() { return 0; }
+   operator int() const { return 0; }
 };
 
-template <typename InputType>
+template< typename InputType >
 struct parallel_puts : private utils::NoAssign {
 
-    tbb::flow::receiver<InputType>* const my_exe_node;
+    tbb::flow::receiver< InputType > * const my_exe_node;
 
-    parallel_puts(tbb::flow::receiver<InputType>& exe_node) : my_exe_node(&exe_node) {}
+    parallel_puts( tbb::flow::receiver< InputType > &exe_node ) : my_exe_node(&exe_node) {}
 
-    void operator()(int) const {
-        for (int i = 0; i < N; ++i) {
+    void operator()( int ) const  {
+        for ( int i = 0; i < N; ++i ) {
             // the nodes will accept all puts
-            CHECK_MESSAGE(my_exe_node->try_put(InputType()) == true, "");
+            CHECK_MESSAGE( my_exe_node->try_put( InputType() ) == true, "" );
         }
     }
+
 };
 
 //! Performs test on executable nodes with unlimited concurrency
@@ -353,130 +353,130 @@ struct parallel_puts : private utils::NoAssign {
     There is no checking of the contents of the messages for corruption.
 */
 
-template <typename InputType, typename OutputTuple, typename Body>
-void unlimited_concurrency(Body body) {
-    typedef typename std::tuple_element<0, OutputTuple>::type OutputType;
+template< typename InputType, typename OutputTuple, typename Body >
+void unlimited_concurrency( Body body ) {
+    typedef typename std::tuple_element<0,OutputTuple>::type OutputType;
 
-    for (unsigned int p = 1; p < 2 * utils::MaxThread; ++p) {
+    for (unsigned int p = 1; p < 2*utils::MaxThread; ++p) {
         tbb::flow::graph g;
-        tbb::flow::multifunction_node<InputType, OutputTuple, tbb::flow::rejecting> exe_node(
-                g, tbb::flow::unlimited, body);
+        tbb::flow::multifunction_node< InputType, OutputTuple, tbb::flow::rejecting > exe_node( g, tbb::flow::unlimited, body );
 
-        for (size_t num_receivers = 1; num_receivers <= MAX_NODES; ++num_receivers) {
-            std::vector<std::shared_ptr<harness_counting_receiver<OutputType>>> receivers;
+        for (size_t num_receivers = 1; num_receivers <= MAX_NODES; ++num_receivers ) {
+            std::vector< std::shared_ptr<harness_counting_receiver<OutputType>> > receivers;
             for (size_t i = 0; i < num_receivers; ++i) {
-                receivers.push_back(std::make_shared<harness_counting_receiver<OutputType>>(g));
+                receivers.push_back( std::make_shared<harness_counting_receiver<OutputType>>(g) );
             }
 
             harness_graph_multifunction_executor<InputType, OutputTuple>::execute_count = 0;
 
-            for (size_t r = 0; r < num_receivers; ++r) {
-                tbb::flow::make_edge(tbb::flow::output_port<0>(exe_node), *receivers[r]);
+            for (size_t r = 0; r < num_receivers; ++r ) {
+                tbb::flow::make_edge( tbb::flow::output_port<0>(exe_node), *receivers[r] );
             }
 
-            utils::NativeParallelFor(p, parallel_puts<InputType>(exe_node));
+            utils::NativeParallelFor( p, parallel_puts<InputType>(exe_node) );
             g.wait_for_all();
 
             // 2) the nodes will receive puts from multiple predecessors simultaneously,
             size_t ec = harness_graph_multifunction_executor<InputType, OutputTuple>::execute_count;
-            CHECK_MESSAGE((unsigned int) ec == p * N, "");
-            for (size_t r = 0; r < num_receivers; ++r) {
+            CHECK_MESSAGE( (unsigned int)ec == p*N, "" );
+            for (size_t r = 0; r < num_receivers; ++r ) {
                 size_t c = receivers[r]->my_count;
                 // 3) the nodes will send to multiple successors.
-                CHECK_MESSAGE((unsigned int) c == p * N, "");
+                CHECK_MESSAGE( (unsigned int)c == p*N, "" );
             }
-            for (size_t r = 0; r < num_receivers; ++r) {
-                tbb::flow::remove_edge(tbb::flow::output_port<0>(exe_node), *receivers[r]);
+            for (size_t r = 0; r < num_receivers; ++r ) {
+                tbb::flow::remove_edge( tbb::flow::output_port<0>(exe_node), *receivers[r] );
             }
         }
     }
 }
 
-template <typename InputType, typename OutputTuple>
+template< typename InputType, typename OutputTuple >
 void run_unlimited_concurrency() {
     harness_graph_multifunction_executor<InputType, OutputTuple>::max_executors = 0;
-    typedef typename tbb::flow::multifunction_node<InputType, OutputTuple>::output_ports_type
-            output_ports_type;
-    unlimited_concurrency<InputType, OutputTuple>([](InputType i, output_ports_type& p) {
-        harness_graph_multifunction_executor<InputType, OutputTuple>::func(i, p);
-    });
-    unlimited_concurrency<InputType, OutputTuple>(
-            &harness_graph_multifunction_executor<InputType, OutputTuple>::func);
-    unlimited_concurrency<InputType, OutputTuple>(
-            typename harness_graph_multifunction_executor<InputType, OutputTuple>::functor());
+    typedef typename tbb::flow::multifunction_node<InputType,OutputTuple>::output_ports_type output_ports_type;
+    unlimited_concurrency<InputType,OutputTuple>( []( InputType i, output_ports_type &p ) { harness_graph_multifunction_executor<InputType, OutputTuple>::func(i,p); } );
+    unlimited_concurrency<InputType,OutputTuple>( &harness_graph_multifunction_executor<InputType, OutputTuple>::func );
+    unlimited_concurrency<InputType,OutputTuple>( typename harness_graph_multifunction_executor<InputType, OutputTuple>::functor() );
 }
 
-template <typename InputType, typename OutputTuple>
+template<typename InputType, typename OutputTuple>
 struct oddEvenBody {
-    typedef typename tbb::flow::multifunction_node<InputType, OutputTuple>::output_ports_type
-            output_ports_type;
-    typedef typename std::tuple_element<0, OutputTuple>::type EvenType;
-    typedef typename std::tuple_element<1, OutputTuple>::type OddType;
-    void operator()(const InputType& i, output_ports_type& p) {
-        if ((int) i % 2) {
-            (void) std::get<1>(p).try_put(OddType(i));
-        } else {
-            (void) std::get<0>(p).try_put(EvenType(i));
+    typedef typename tbb::flow::multifunction_node<InputType,OutputTuple>::output_ports_type output_ports_type;
+    typedef typename std::tuple_element<0,OutputTuple>::type EvenType;
+    typedef typename std::tuple_element<1,OutputTuple>::type OddType;
+    void operator() (const InputType &i, output_ports_type &p) {
+        if((int)i % 2) {
+            (void)std::get<1>(p).try_put(OddType(i));
+        }
+        else {
+            (void)std::get<0>(p).try_put(EvenType(i));
         }
     }
 };
 
-template <typename InputType, typename OutputTuple>
+template<typename InputType, typename OutputTuple >
 void run_multiport_test(int num_threads) {
     typedef typename tbb::flow::multifunction_node<InputType, OutputTuple> mo_node_type;
-    typedef typename std::tuple_element<0, OutputTuple>::type EvenType;
-    typedef typename std::tuple_element<1, OutputTuple>::type OddType;
+    typedef typename std::tuple_element<0,OutputTuple>::type EvenType;
+    typedef typename std::tuple_element<1,OutputTuple>::type OddType;
     tbb::task_arena arena(num_threads);
-    arena.execute([&]() {
-        tbb::flow::graph g;
-        mo_node_type mo_node(g, tbb::flow::unlimited, oddEvenBody<InputType, OutputTuple>());
+    arena.execute(
+        [&] () {
+            tbb::flow::graph g;
+            mo_node_type mo_node(g, tbb::flow::unlimited, oddEvenBody<InputType, OutputTuple>() );
 
-        tbb::flow::queue_node<EvenType> q0(g);
-        tbb::flow::queue_node<OddType> q1(g);
+            tbb::flow::queue_node<EvenType> q0(g);
+            tbb::flow::queue_node<OddType> q1(g);
 
-        tbb::flow::make_edge(tbb::flow::output_port<0>(mo_node), q0);
-        tbb::flow::make_edge(tbb::flow::output_port<1>(mo_node), q1);
+            tbb::flow::make_edge(tbb::flow::output_port<0>(mo_node), q0);
+            tbb::flow::make_edge(tbb::flow::output_port<1>(mo_node), q1);
 
-        for (InputType i = 0; i < N; ++i) { mo_node.try_put(i); }
+            for(InputType i = 0; i < N; ++i) {
+                mo_node.try_put(i);
+            }
 
-        g.wait_for_all();
-        for (int i = 0; i < N / 2; ++i) {
-            EvenType e {};
-            OddType o {};
-            CHECK_MESSAGE(q0.try_get(e), "");
-            CHECK_MESSAGE((int) e % 2 == 0, "");
-            CHECK_MESSAGE(q1.try_get(o), "");
-            CHECK_MESSAGE((int) o % 2 == 1, "");
+            g.wait_for_all();
+            for(int i = 0; i < N/2; ++i) {
+                EvenType e{};
+                OddType o{};
+                CHECK_MESSAGE( q0.try_get(e), "" );
+                CHECK_MESSAGE( (int)e % 2 == 0, "" );
+                CHECK_MESSAGE( q1.try_get(o), "" );
+                CHECK_MESSAGE( (int)o % 2 == 1, "" );
+            }
         }
-    });
+    );
 }
 
 //! Tests limited concurrency cases for nodes that accept data messages
 void test_concurrency(int num_threads) {
     tbb::task_arena arena(num_threads);
-    arena.execute([&]() {
-        run_concurrency_levels<int, std::tuple<int>>(num_threads);
-        run_concurrency_levels<int, std::tuple<tbb::flow::continue_msg>>(num_threads);
-        run_buffered_levels<int, std::tuple<int>>(num_threads);
-        run_unlimited_concurrency<int, std::tuple<int>>();
-        run_unlimited_concurrency<int, std::tuple<empty_no_assign>>();
-        run_unlimited_concurrency<empty_no_assign, std::tuple<int>>();
-        run_unlimited_concurrency<empty_no_assign, std::tuple<empty_no_assign>>();
-        run_unlimited_concurrency<int, std::tuple<tbb::flow::continue_msg>>();
-        run_unlimited_concurrency<empty_no_assign, std::tuple<tbb::flow::continue_msg>>();
-        run_multiport_test<int, std::tuple<int, int>>(num_threads);
-        run_multiport_test<float, std::tuple<int, double>>(num_threads);
-    });
+    arena.execute(
+        [&] () {
+            run_concurrency_levels<int,std::tuple<int> >(num_threads);
+            run_concurrency_levels<int,std::tuple<tbb::flow::continue_msg> >(num_threads);
+            run_buffered_levels<int, std::tuple<int> >(num_threads);
+            run_unlimited_concurrency<int, std::tuple<int> >();
+            run_unlimited_concurrency<int,std::tuple<empty_no_assign> >();
+            run_unlimited_concurrency<empty_no_assign,std::tuple<int> >();
+            run_unlimited_concurrency<empty_no_assign,std::tuple<empty_no_assign> >();
+            run_unlimited_concurrency<int,std::tuple<tbb::flow::continue_msg> >();
+            run_unlimited_concurrency<empty_no_assign,std::tuple<tbb::flow::continue_msg> >();
+            run_multiport_test<int, std::tuple<int, int> >(num_threads);
+            run_multiport_test<float, std::tuple<int, double> >(num_threads);
+        }
+    );
 }
 
-template <typename Policy>
+template<typename Policy>
 void test_ports_return_references() {
     tbb::flow::graph g;
     typedef int InputType;
     typedef std::tuple<int> OutputTuple;
     tbb::flow::multifunction_node<InputType, OutputTuple, Policy> mf_node(
-            g, tbb::flow::unlimited,
-            &harness_graph_multifunction_executor<InputType, OutputTuple>::empty_func);
+        g, tbb::flow::unlimited,
+        &harness_graph_multifunction_executor<InputType, OutputTuple>::empty_func );
     test_output_ports_return_ref(mf_node);
 }
 
@@ -495,59 +495,67 @@ void test_precedes() {
     buffer_node<int> b2(g);
 
     multinode node(precedes(b1, b2), unlimited, [](const int& i, multinode::output_ports_type& op) -> void {
-        if (i % 2) std::get<0>(op).try_put(i);
-        else
-            std::get<1>(op).try_put(i);
-    });
+            if (i % 2)
+                std::get<0>(op).try_put(i);
+            else
+                std::get<1>(op).try_put(i);
+        }
+    );
 
     node.try_put(0);
     node.try_put(1);
     g.wait_for_all();
 
     int storage;
-    CHECK_MESSAGE(
-            (b1.try_get(storage) && !b1.try_get(storage) && b2.try_get(storage) && !b2.try_get(storage)),
+    CHECK_MESSAGE((b1.try_get(storage) && !b1.try_get(storage) && b2.try_get(storage) && !b2.try_get(storage)),
             "Not exact edge quantity was made");
 }
 
 void test_follows_and_precedes_api() {
     using multinode = tbb::flow::multifunction_node<int, std::tuple<int, int, int>>;
 
-    std::array<int, 3> messages_for_follows = {{0, 1, 2}};
+    std::array<int, 3> messages_for_follows = { {0, 1, 2} };
 
-    follows_and_precedes_testing::test_follows<int,
-                                               tbb::flow::multifunction_node<int, std::tuple<int, int, int>>>(
-            messages_for_follows, tbb::flow::unlimited,
-            [](const int& i, multinode::output_ports_type& op) -> void { std::get<0>(op).try_put(i); });
+    follows_and_precedes_testing::test_follows
+        <int, tbb::flow::multifunction_node<int, std::tuple<int, int, int>>>
+        (messages_for_follows, tbb::flow::unlimited, [](const int& i, multinode::output_ports_type& op) -> void {
+            std::get<0>(op).try_put(i);
+        });
 
     test_precedes();
 }
-#endif// __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+#endif // __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 
 //! Test various node bodies with concurrency
 //! \brief \ref error_guessing
-TEST_CASE("Concurrency test") {
-    for (unsigned int p = utils::MinThread; p <= utils::MaxThread; ++p) { test_concurrency(p); }
+TEST_CASE("Concurrency test"){
+    for( unsigned int p=utils::MinThread; p<=utils::MaxThread; ++p ) {
+       test_concurrency(p);
+    }
 }
 
 //! Test return types of ports
 //! \brief \ref error_guessing
-TEST_CASE("Test ports retrurn references") {
+TEST_CASE("Test ports retrurn references"){
     test_ports_return_references<tbb::flow::queueing>();
     test_ports_return_references<tbb::flow::rejecting>();
 }
 
 //! NativeParallelFor testing with various concurrency settings
 //! \brief \ref error_guessing
-TEST_CASE("Lightweight testing") { lightweight_testing::test<tbb::flow::multifunction_node>(10); }
+TEST_CASE("Lightweight testing"){
+    lightweight_testing::test<tbb::flow::multifunction_node>(10);
+}
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 //! Test follows and precedes API
 //! \brief \ref error_guessing
-TEST_CASE("Test follows-precedes API") { test_follows_and_precedes_api(); }
+TEST_CASE("Test follows-precedes API"){
+    test_follows_and_precedes_api();
+}
 //! Test priority constructor with follows and precedes API
 //! \brief \ref error_guessing
-TEST_CASE("Test priority with follows and precedes") {
+TEST_CASE("Test priority with follows and precedes"){
     using namespace tbb::flow;
 
     using multinode = multifunction_node<int, std::tuple<int, int>>;
@@ -557,22 +565,20 @@ TEST_CASE("Test priority with follows and precedes") {
     buffer_node<int> b1(g);
     buffer_node<int> b2(g);
 
-    multinode node(
-            precedes(b1, b2), unlimited,
-            [](const int& i, multinode::output_ports_type& op) -> void {
-                if (i % 2) std::get<0>(op).try_put(i);
-                else
-                    std::get<1>(op).try_put(i);
-            },
-            node_priority_t(0));
+    multinode node(precedes(b1, b2), unlimited, [](const int& i, multinode::output_ports_type& op) -> void {
+            if (i % 2)
+                std::get<0>(op).try_put(i);
+            else
+                std::get<1>(op).try_put(i);
+        }
+        , node_priority_t(0));
 
     node.try_put(0);
     node.try_put(1);
     g.wait_for_all();
 
     int storage;
-    CHECK_MESSAGE(
-            (b1.try_get(storage) && !b1.try_get(storage) && b2.try_get(storage) && !b2.try_get(storage)),
+    CHECK_MESSAGE((b1.try_get(storage) && !b1.try_get(storage) && b2.try_get(storage) && !b2.try_get(storage)),
             "Not exact edge quantity was made");
 }
 
@@ -583,27 +589,24 @@ TEST_CASE("Test priority with follows and precedes") {
 TEST_CASE("constraints for multifunction_node input") {
     struct InputObject {
         InputObject() = default;
-        InputObject(const InputObject&) = default;
+        InputObject( const InputObject& ) = default;
     };
 
     static_assert(utils::well_formed_instantiation<tbb::flow::multifunction_node, InputObject, int>);
     static_assert(utils::well_formed_instantiation<tbb::flow::multifunction_node, int, int>);
-    static_assert(!utils::well_formed_instantiation<tbb::flow::multifunction_node, test_concepts::NonCopyable,
-                                                    int>);
-    static_assert(!utils::well_formed_instantiation<tbb::flow::multifunction_node,
-                                                    test_concepts::NonDefaultInitializable, int>);
+    static_assert(!utils::well_formed_instantiation<tbb::flow::multifunction_node, test_concepts::NonCopyable, int>);
+    static_assert(!utils::well_formed_instantiation<tbb::flow::multifunction_node, test_concepts::NonDefaultInitializable, int>);
 }
 
 template <typename Input, typename Output, typename Body>
-concept can_call_multifunction_node_ctor
-        = requires(tbb::flow::graph& graph, std::size_t concurrency, Body body,
-                   tbb::flow::node_priority_t priority, tbb::flow::buffer_node<int>& f) {
+concept can_call_multifunction_node_ctor = requires( tbb::flow::graph& graph, std::size_t concurrency, Body body,
+                                                     tbb::flow::node_priority_t priority, tbb::flow::buffer_node<int>& f ) {
     tbb::flow::multifunction_node<Input, Output>(graph, concurrency, body);
     tbb::flow::multifunction_node<Input, Output>(graph, concurrency, body, priority);
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
     tbb::flow::multifunction_node<Input, Output>(tbb::flow::follows(f), concurrency, body);
     tbb::flow::multifunction_node<Input, Output>(tbb::flow::follows(f), concurrency, body, priority);
-#endif// __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+#endif // __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 };
 
 //! \brief \ref error_guessing
@@ -612,18 +615,11 @@ TEST_CASE("constraints for multifunction_node body") {
     using output_type = std::tuple<int>;
     using namespace test_concepts::multifunction_node_body;
 
-    static_assert(
-            can_call_multifunction_node_ctor<input_type, output_type, Correct<input_type, output_type>>);
-    static_assert(
-            !can_call_multifunction_node_ctor<input_type, output_type, NonCopyable<input_type, output_type>>);
-    static_assert(!can_call_multifunction_node_ctor<input_type, output_type,
-                                                    NonDestructible<input_type, output_type>>);
-    static_assert(!can_call_multifunction_node_ctor<input_type, output_type,
-                                                    NoOperatorRoundBrackets<input_type, output_type>>);
-    static_assert(
-            !can_call_multifunction_node_ctor<input_type, output_type,
-                                              WrongFirstInputOperatorRoundBrackets<input_type, output_type>>);
-    static_assert(!can_call_multifunction_node_ctor<
-                  input_type, output_type, WrongSecondInputOperatorRoundBrackets<input_type, output_type>>);
+    static_assert(can_call_multifunction_node_ctor<input_type, output_type, Correct<input_type, output_type>>);
+    static_assert(!can_call_multifunction_node_ctor<input_type, output_type, NonCopyable<input_type, output_type>>);
+    static_assert(!can_call_multifunction_node_ctor<input_type, output_type, NonDestructible<input_type, output_type>>);
+    static_assert(!can_call_multifunction_node_ctor<input_type, output_type, NoOperatorRoundBrackets<input_type, output_type>>);
+    static_assert(!can_call_multifunction_node_ctor<input_type, output_type, WrongFirstInputOperatorRoundBrackets<input_type, output_type>>);
+    static_assert(!can_call_multifunction_node_ctor<input_type, output_type, WrongSecondInputOperatorRoundBrackets<input_type, output_type>>);
 }
-#endif// __TBB_CPP20_CONCEPTS_PRESENT
+#endif // __TBB_CPP20_CONCEPTS_PRESENT
diff --git a/external/tbb/test/tbb/test_mutex.cpp b/external/tbb/test/tbb/test_mutex.cpp
index dc4d9797..5b78f173 100644
--- a/external/tbb/test/tbb/test_mutex.cpp
+++ b/external/tbb/test/tbb/test_mutex.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -14,36 +14,37 @@
     limitations under the License.
 */
 
-#define TBB_PREVIEW_MUTEXES 1
 #include "test_mutex.h"
 
+#include <tbb/spin_mutex.h>
 #include "oneapi/tbb/mutex.h"
+#include <tbb/spin_rw_mutex.h>
 #include "oneapi/tbb/rw_mutex.h"
-#include <oneapi/tbb/detail/_machine.h>
-#include <oneapi/tbb/detail/_utils.h>
+#include <tbb/queuing_mutex.h>
+#include <tbb/queuing_rw_mutex.h>
 #include <tbb/null_mutex.h>
 #include <tbb/null_rw_mutex.h>
 #include <tbb/parallel_for.h>
-#include <tbb/queuing_mutex.h>
-#include <tbb/queuing_rw_mutex.h>
-#include <tbb/spin_mutex.h>
-#include <tbb/spin_rw_mutex.h>
+#include <oneapi/tbb/detail/_utils.h>
+#include <oneapi/tbb/detail/_machine.h>
 
 //! \file test_mutex.cpp
-//! \brief Test for [mutex.spin_mutex mutex.spin_rw_mutex mutex.queuing_mutex mutex.queuing_rw_mutexmutex.speculative_spin_mutex mutex.speculative_spin_rw_mutex] specifications
+//! \brief Test for [mutex.spin_mutex mutex.spin_rw_mutex mutex.queuing_mutex mutex.queuing_rw_mutex mutex.mutex mutex.rw_mutex mutex.speculative_spin_mutex mutex.speculative_spin_rw_mutex] specifications
 
 // TODO: Investigate why RTM doesn't work on some macOS.
 // TODO: Consider adding Thread Sanitizer (note that accesses inside the transaction
 // considered as races by Thread Sanitizer)
 #if __TBB_TSX_INTRINSICS_PRESENT && !__APPLE__ && !__TBB_USE_THREAD_SANITIZER
 
-inline static bool IsInsideTx() { return _xtest() != 0; }
+inline static bool IsInsideTx() {
+    return _xtest() != 0;
+}
 
 bool have_TSX() {
     bool result = false;
     const int rtm_ebx_mask = 1 << 11;
 #if _MSC_VER
-    int info[4] = {0, 0, 0, 0};
+    int info[4] = { 0,0,0,0 };
     const int reg_ebx = 1;
     __cpuidex(info, 7, 0);
     result = (info[reg_ebx] & rtm_ebx_mask) != 0;
@@ -52,16 +53,15 @@ bool have_TSX() {
     int32_t reg_eax = 7;
     int32_t reg_ecx = 0;
     __asm__ __volatile__("movl %%ebx, %%esi\n"
-                         "cpuid\n"
-                         "movl %%ebx, %0\n"
-                         "movl %%esi, %%ebx\n"
-                         : "=a"(reg_ebx)
-                         : "0"(reg_eax), "c"(reg_ecx)
-                         : "esi",
+        "cpuid\n"
+        "movl %%ebx, %0\n"
+        "movl %%esi, %%ebx\n"
+        : "=a"(reg_ebx) : "0" (reg_eax), "c" (reg_ecx) : "esi",
 #if __TBB_x86_64
-                           "ebx",
+        "ebx",
 #endif
-                           "edx");
+        "edx"
+    );
     result = (reg_ebx & rtm_ebx_mask) != 0;
 #endif
     return result;
@@ -69,7 +69,7 @@ bool have_TSX() {
 
 //! Function object for use with parallel_for.h to see if a transaction is actually attempted.
 std::atomic<std::size_t> n_transactions_attempted;
-template <typename C>
+template<typename C>
 struct AddOne_CheckTransaction {
 
     AddOne_CheckTransaction& operator=(const AddOne_CheckTransaction&) = delete;
@@ -94,20 +94,19 @@ struct AddOne_CheckTransaction {
 };
 
 /* TestTransaction() checks if a speculative mutex actually uses transactions. */
-template <typename M>
-void TestTransaction(const char* name) {
+template<typename M>
+void TestTransaction(const char* name)
+{
     utils::Counter<M> counter;
     constexpr int n = 550;
 
     n_transactions_attempted = 0;
     for (int i = 0; i < 5 && n_transactions_attempted.load(std::memory_order_relaxed) == 0; ++i) {
         counter.value = 0;
-        tbb::parallel_for(tbb::blocked_range<std::size_t>(0, n, 2),
-                          AddOne_CheckTransaction<utils::Counter<M>>(counter));
+        tbb::parallel_for(tbb::blocked_range<std::size_t>(0, n, 2), AddOne_CheckTransaction<utils::Counter<M>>(counter));
         REQUIRE(counter.value == n);
     }
-    REQUIRE_MESSAGE(n_transactions_attempted.load(std::memory_order_relaxed),
-                    "ERROR for " << name << ": transactions were never attempted");
+    REQUIRE_MESSAGE(n_transactions_attempted.load(std::memory_order_relaxed), "ERROR for " << name << ": transactions were never attempted");
 }
 
 //! \brief \ref error_guessing
@@ -119,24 +118,43 @@ TEST_CASE("Transaction test") {
 }
 #endif /* __TBB_TSX_TESTING_ENABLED_FOR_THIS_COMPILER */
 
+
 //! \brief \ref error_guessing
-TEST_CASE("test upgrade/downgrade with spin_rw_mutex") { test_rwm_upgrade_downgrade<tbb::spin_rw_mutex>(); }
+TEST_CASE("test upgrade/downgrade with spin_rw_mutex") {
+    test_rwm_upgrade_downgrade<tbb::spin_rw_mutex>();
+}
 
 //! \brief \ref error_guessing
 TEST_CASE("test upgrade/downgrade with queueing_rw_mutex") {
     test_rwm_upgrade_downgrade<tbb::queuing_rw_mutex>();
 }
 
+//! \brief \ref error_guessing
+TEST_CASE("test upgrade/downgrade with rw_mutex") {
+    test_rwm_upgrade_downgrade<tbb::rw_mutex>();
+}
+
 //! \brief \ref error_guessing
 TEST_CASE("test upgrade/downgrade with speculative_spin_rw_mutex") {
     test_rwm_upgrade_downgrade<tbb::speculative_spin_rw_mutex>();
 }
 
 //! \brief \ref error_guessing
-TEST_CASE("test spin_mutex with native threads") { test_with_native_threads::test<tbb::spin_mutex>(); }
+TEST_CASE("test spin_mutex with native threads") {
+    test_with_native_threads::test<tbb::spin_mutex>();
+}
+
+#if !EMSCRIPTEN
+//! \brief \ref error_guessing
+TEST_CASE("test queuing_mutex with native threads") {
+    test_with_native_threads::test<tbb::queuing_mutex>();
+}
+#endif
 
 //! \brief \ref error_guessing
-TEST_CASE("test queuing_mutex with native threads") { test_with_native_threads::test<tbb::queuing_mutex>(); }
+TEST_CASE("test mutex with native threads") {
+    test_with_native_threads::test<tbb::mutex>();
+}
 
 //! \brief \ref error_guessing
 TEST_CASE("test spin_rw_mutex with native threads") {
@@ -144,11 +162,19 @@ TEST_CASE("test spin_rw_mutex with native threads") {
     test_with_native_threads::test_rw<tbb::spin_rw_mutex>();
 }
 
+#if !EMSCRIPTEN
 //! \brief \ref error_guessing
 TEST_CASE("test queuing_rw_mutex with native threads") {
     test_with_native_threads::test<tbb::queuing_rw_mutex>();
     test_with_native_threads::test_rw<tbb::queuing_rw_mutex>();
 }
+#endif
+
+//! \brief \ref error_guessing
+TEST_CASE("test rw_mutex with native threads") {
+    test_with_native_threads::test<tbb::rw_mutex>();
+    test_with_native_threads::test_rw<tbb::rw_mutex>();
+}
 
 //! Test scoped_lock::is_writer getter
 //! \brief \ref error_guessing
@@ -169,10 +195,10 @@ concept rw_mutexes = (... && tbb::detail::rw_scoped_lockable<Args>);
 
 //! \brief \ref error_guessing
 TEST_CASE("internal mutex concepts") {
-    static_assert(mutexes<tbb::spin_mutex, tbb::speculative_spin_mutex, tbb::null_mutex, tbb::queuing_mutex,
-                          tbb::spin_rw_mutex, tbb::speculative_spin_rw_mutex, tbb::null_rw_mutex,
-                          tbb::queuing_rw_mutex>);
-    static_assert(rw_mutexes<tbb::spin_rw_mutex, tbb::speculative_spin_rw_mutex, tbb::null_rw_mutex,
-                             tbb::queuing_rw_mutex>);
+    static_assert(mutexes<tbb::spin_mutex, oneapi::tbb::mutex, tbb::speculative_spin_mutex, tbb::null_mutex, tbb::queuing_mutex,
+                          tbb::spin_rw_mutex, oneapi::tbb::rw_mutex, tbb::speculative_spin_rw_mutex, tbb::null_rw_mutex, tbb::queuing_rw_mutex>);
+    static_assert(rw_mutexes<tbb::spin_rw_mutex, oneapi::tbb::rw_mutex, tbb::speculative_spin_rw_mutex,
+                             tbb::null_rw_mutex, tbb::queuing_rw_mutex>);
 }
-#endif// __TBB_CPP20_CONCEPTS_PRESENT
+#endif // __TBB_CPP20_CONCEPTS_PRESENT
+
diff --git a/external/tbb/test/tbb/test_numa_dist.cpp b/external/tbb/test/tbb/test_numa_dist.cpp
new file mode 100644
index 00000000..666e7182
--- /dev/null
+++ b/external/tbb/test/tbb/test_numa_dist.cpp
@@ -0,0 +1,162 @@
+/*
+    Copyright (c) 2005-2022 Intel Corporation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#include "common/test.h"
+
+#if !__TBB_WIN8UI_SUPPORT
+
+#include <stdio.h>
+#include "tbb/parallel_for.h"
+#include "tbb/global_control.h"
+#include "tbb/enumerable_thread_specific.h"
+
+#include "common/config.h"
+#include "common/utils.h"
+#include "common/utils_concurrency_limit.h"
+#include "common/utils_report.h"
+#include "common/vector_types.h"
+#include "common/cpu_usertime.h"
+#include "common/spin_barrier.h"
+#include "common/exception_handling.h"
+#include "common/concepts_common.h"
+#include "test_partitioner.h"
+
+#include <cstddef>
+#include <vector>
+
+//! \file test_numa_dist.cpp
+//! \brief Test for [internal] functionality
+#if _MSC_VER
+#pragma warning (push)
+// Suppress conditional expression is constant
+#pragma warning (disable: 4127)
+#if __TBB_MSVC_UNREACHABLE_CODE_IGNORED
+    // Suppress pointless "unreachable code" warning.
+    #pragma warning (disable: 4702)
+#endif
+#if defined(_Wp64)
+    // Workaround for overzealous compiler warnings in /Wp64 mode
+    #pragma warning (disable: 4267)
+#endif
+#define _SCL_SECURE_NO_WARNINGS
+#endif //#if _MSC_VER
+
+
+struct numa {
+    WORD processorGroupCount;
+    std::vector<DWORD> numaProcessors;
+    DWORD maxProcessors;
+    numa() : processorGroupCount(GetMaximumProcessorGroupCount()), maxProcessors(GetActiveProcessorCount(ALL_PROCESSOR_GROUPS)){   
+        numaProcessors.resize(processorGroupCount);
+       for (WORD i = 0; i < processorGroupCount; i++) {
+            this->numaProcessors[i] = GetActiveProcessorCount((i));
+        }        
+    }
+};
+
+
+int TestNumaDistribution(std::vector<DWORD> &validateProcgrp, int additionalParallelism, bool allThreads){
+    validateProcgrp.resize(GetMaximumProcessorGroupCount());
+    PROCESSOR_NUMBER proc;
+    struct numa nodes;
+    GetThreadIdealProcessorEx(GetCurrentThread(), &proc);
+    int master_thread_proc_grp = proc.Group;
+    int requested_parallelism;
+    if (allThreads) 
+        requested_parallelism = additionalParallelism;
+    else 
+        requested_parallelism = nodes.numaProcessors.at(master_thread_proc_grp) + additionalParallelism;
+    tbb::global_control global_limit(oneapi::tbb::global_control::max_allowed_parallelism, 1024);
+    tbb::enumerable_thread_specific< std::pair<int, int> > tls;
+    tbb::enumerable_thread_specific< double > tls_dummy;
+    tbb::static_partitioner s;
+  
+    utils::SpinBarrier sb(requested_parallelism);
+    oneapi::tbb::task_arena limited(requested_parallelism);
+    limited.execute([&]() {
+
+        tbb::parallel_for(0, requested_parallelism, [&](int)
+            {                    
+                PROCESSOR_NUMBER proc;
+                if (GetThreadIdealProcessorEx(GetCurrentThread(), &proc))
+                {
+                    tls.local() = std::pair<int, int>(proc.Group, proc.Number);
+                    sb.wait();
+                }
+            }, s);
+        for (const auto& it : tls) {
+           validateProcgrp[it.first]++;
+        }
+      });
+    
+
+    return master_thread_proc_grp;
+}
+
+//! Testing Numa Thread Distribution Stability
+//! \brief \ref stress
+TEST_CASE("Numa stability for the same node") {
+    numa example;
+    std::vector<DWORD> validateProcgrp;
+    
+    int numaGrp = TestNumaDistribution(validateProcgrp,0, 0);
+    std::vector<DWORD> result(GetMaximumProcessorGroupCount(), 0);
+    result[numaGrp] = example.numaProcessors[numaGrp];
+    REQUIRE(validateProcgrp == result);
+}
+
+//! Testing Numa Thread Distribution Overflow
+//! \brief \ref stress
+TEST_CASE("Numa overflow") {
+    numa example;
+    std::vector<DWORD> validateProcgrp;
+    
+    int numaGrp = TestNumaDistribution(validateProcgrp, 1, 0);
+    std::vector<DWORD> result(GetMaximumProcessorGroupCount(), 0);
+    if (example.processorGroupCount <= 1) { // for single Numa node
+       result[numaGrp] = example.numaProcessors[numaGrp] + 1;
+    } else {
+       result[numaGrp] = example.numaProcessors[numaGrp];
+       result[(numaGrp+1)% GetMaximumProcessorGroupCount()] = 1;
+    }
+    REQUIRE(validateProcgrp == result);
+}
+
+//! Testing Numa Thread Distribution Maximum
+//! \brief \ref stress
+TEST_CASE("Numa all threads") {
+    numa example;
+    std::vector<DWORD> validateProcgrp;
+    TestNumaDistribution(validateProcgrp, example.maxProcessors, 1);
+    REQUIRE(validateProcgrp == example.numaProcessors);
+}
+
+//! Testing Numa Thread Distribution Doubled Max
+//! \brief \ref stress
+TEST_CASE("Double threads") {
+    numa example;
+    std::vector<DWORD> validateProcgrp;
+    std::vector<DWORD> result(example.numaProcessors.size(), 0);
+    for (size_t i = 0; i < example.numaProcessors.size(); i++) result[i] = 2 * example.numaProcessors[i];
+    TestNumaDistribution(validateProcgrp, example.maxProcessors * 2, 1);
+    REQUIRE(validateProcgrp == result);
+}
+
+#if _MSC_VER
+#pragma warning (pop)
+#endif
+
+#endif // !__TBB_WIN8UI_SUPPORT
diff --git a/external/tbb/test/tbb/test_openmp.cpp b/external/tbb/test/tbb/test_openmp.cpp
index 77b08913..495be1c7 100644
--- a/external/tbb/test/tbb/test_openmp.cpp
+++ b/external/tbb/test/tbb/test_openmp.cpp
@@ -24,8 +24,8 @@
 #include "common/test.h"
 #include "common/utils.h"
 #include "common/utils_env.h"
-#include "tbb/blocked_range.h"
 #include "tbb/global_control.h"
+#include "tbb/blocked_range.h"
 #include "tbb/parallel_for.h"
 #include "tbb/parallel_reduce.h"
 
@@ -34,44 +34,49 @@
 
 using data_type = short;
 
-void SerialConvolve(data_type c[], const data_type a[], int m, const data_type b[], int n) {
+void SerialConvolve( data_type c[], const data_type a[], int m, const data_type b[], int n ) {
     for (int i = 0; i < m + n - 1; ++i) {
         int start = i < n ? 0 : i - n + 1;
         int finish = i < m ? i + 1 : m;
         data_type sum = 0;
-        for (int j = start; j < finish; ++j) sum += a[j] * b[i - j];
+        for (int j = start; j < finish; ++j)
+            sum += a[j] * b[i - j];
         c[i] = sum;
     }
 }
 
 #if _MSC_VER && !defined(__INTEL_COMPILER)
-// Suppress overzealous warning about short+=short
-#pragma warning(push)
-#pragma warning(disable : 4244)
+    // Suppress overzealous warning about short+=short
+    #pragma warning( push )
+    #pragma warning( disable: 4244 )
 #endif
 
-class InnerBody : utils::NoAssign {
+class InnerBody: utils::NoAssign {
     const data_type* my_a;
     const data_type* my_b;
     const int i;
-
 public:
     data_type sum;
-    InnerBody(data_type /*c*/[], const data_type a[], const data_type b[], int ii)
-        : my_a(a), my_b(b), i(ii), sum(0) {}
-    InnerBody(InnerBody& x, tbb::split) : my_a(x.my_a), my_b(x.my_b), i(x.i), sum(0) {}
-    void join(InnerBody& x) { sum += x.sum; }
-    void operator()(const tbb::blocked_range<int>& range) {
-        for (int j = range.begin(); j != range.end(); ++j) sum += my_a[j] * my_b[i - j];
+    InnerBody( data_type /*c*/[], const data_type a[], const data_type b[], int ii ) :
+        my_a(a), my_b(b), i(ii), sum(0)
+    {}
+    InnerBody( InnerBody& x, tbb::split ) :
+        my_a(x.my_a), my_b(x.my_b), i(x.i), sum(0)
+    {
+    }
+    void join( InnerBody& x ) { sum += x.sum; }
+    void operator()( const tbb::blocked_range<int>& range ) {
+        for (int j = range.begin(); j != range.end(); ++j)
+            sum += my_a[j] * my_b[i - j];
     }
 };
 
 #if _MSC_VER && !defined(__INTEL_COMPILER)
-#pragma warning(pop)
+    #pragma warning( pop )
 #endif
 
 //! Test OpenMP loop around TBB loop
-void OpenMP_TBB_Convolve(data_type c[], const data_type a[], int m, const data_type b[], int n, int p) {
+void OpenMP_TBB_Convolve( data_type c[], const data_type a[], int m, const data_type b[], int n, int p ) {
     utils::suppress_unused_warning(p);
 #pragma omp parallel num_threads(p)
     {
@@ -86,37 +91,39 @@ void OpenMP_TBB_Convolve(data_type c[], const data_type a[], int m, const data_t
     }
 }
 
-class OuterBody : utils::NoAssign {
+class OuterBody: utils::NoAssign {
     const data_type* my_a;
     const data_type* my_b;
     data_type* my_c;
     const int m;
     const int n;
 #if __clang__ && !__INTEL_COMPILER
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunused-private-field"
+    #pragma clang diagnostic push
+    #pragma clang diagnostic ignored "-Wunused-private-field"
 #endif
     const int p;
 #if __clang__ && !__INTEL_COMPILER
-#pragma clang diagnostic pop// "-Wunused-private-field"
+    #pragma clang diagnostic pop // "-Wunused-private-field"
 #endif
 public:
-    OuterBody(data_type c[], const data_type a[], int m_, const data_type b[], int n_, int p_)
-        : my_a(a), my_b(b), my_c(c), m(m_), n(n_), p(p_) {}
-    void operator()(const tbb::blocked_range<int>& range) const {
+    OuterBody( data_type c[], const data_type a[], int m_, const data_type b[], int n_, int p_ ) :
+        my_a(a), my_b(b), my_c(c), m(m_), n(n_), p(p_)
+    {}
+    void operator()( const tbb::blocked_range<int>& range ) const {
         for (int i = range.begin(); i != range.end(); ++i) {
             int start = i < n ? 0 : i - n + 1;
             int finish = i < m ? i + 1 : m;
             data_type sum = 0;
-#pragma omp parallel for reduction(+ : sum) num_threads(p)
-            for (int j = start; j < finish; ++j) sum += my_a[j] * my_b[i - j];
+#pragma omp parallel for reduction(+:sum) num_threads(p)
+            for (int j = start; j < finish; ++j)
+                sum += my_a[j] * my_b[i - j];
             my_c[i] = sum;
         }
     }
 };
 
 //! Test TBB loop around OpenMP loop
-void TBB_OpenMP_Convolve(data_type c[], const data_type a[], int m, const data_type b[], int n, int p) {
+void TBB_OpenMP_Convolve( data_type c[], const data_type a[], int m, const data_type b[], int n, int p ) {
     tbb::parallel_for(tbb::blocked_range<int>(0, m + n - 1, 10), OuterBody(c, a, m, b, n, p));
 }
 
@@ -125,22 +132,22 @@ void TestNumThreads() {
     utils::SetEnv("KMP_AFFINITY", "compact");
     // Make an OpenMP call before initializing TBB
     int omp_nthreads = omp_get_max_threads();
-#pragma omp parallel
+    #pragma omp parallel
     {}
     int tbb_nthreads = tbb::this_task_arena::max_concurrency();
     // For the purpose of testing, assume that OpenMP and TBB should utilize the same # of threads.
     // If it's not true on some platforms, the test will need to be adjusted.
     REQUIRE_MESSAGE(tbb_nthreads == omp_nthreads, "Initialization of TBB is possibly affected by OpenMP");
 }
-#endif// __INTEL_COMPILER
+#endif // __INTEL_COMPILER
 
 const int M = 17 * 17;
 const int N = 13 * 13;
 data_type A[M], B[N];
-data_type expected[M + N], actual[M + N];
+data_type expected[M+N], actual[M+N];
 
 template <class Func>
-void RunTest(Func F, int m, int n, int p) {
+void RunTest( Func F, int m, int n, int p) {
     tbb::global_control limit(tbb::global_control::max_allowed_parallelism, p);
     memset(actual, -1, (m + n) * sizeof(data_type));
     F(actual, A, m, B, n, p);
@@ -152,16 +159,16 @@ void RunTest(Func F, int m, int n, int p) {
 //! \brief \ref error_guessing
 TEST_CASE("Testing oneTBB with OpenMP") {
 #if __INTEL_COMPILER
-    TestNumThreads();// Testing initialization-related behavior; must be the first
-#endif               // __INTEL_COMPILER
+    TestNumThreads(); // Testing initialization-related behavior; must be the first
+#endif // __INTEL_COMPILER
     for (int p = static_cast<int>(utils::MinThread); p <= static_cast<int>(utils::MaxThread); ++p) {
         for (int m = 1; m <= M; m *= 17) {
             for (int n = 1; n <= N; n *= 13) {
                 for (int i = 0; i < m; ++i) A[i] = data_type(1 + i / 5);
                 for (int i = 0; i < n; ++i) B[i] = data_type(1 + i / 7);
-                SerialConvolve(expected, A, m, B, n);
-                RunTest(OpenMP_TBB_Convolve, m, n, p);
-                RunTest(TBB_OpenMP_Convolve, m, n, p);
+                SerialConvolve( expected, A, m, B, n );
+                RunTest( OpenMP_TBB_Convolve, m, n, p );
+                RunTest( TBB_OpenMP_Convolve, m, n, p );
             }
         }
     }
diff --git a/external/tbb/test/tbb/test_overwrite_node.cpp b/external/tbb/test/tbb/test_overwrite_node.cpp
index 795f2bb5..3f5ed8fe 100644
--- a/external/tbb/test/tbb/test_overwrite_node.cpp
+++ b/external/tbb/test/tbb/test_overwrite_node.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -18,117 +18,133 @@
 
 #include "tbb/flow_graph.h"
 
-#include "common/graph_utils.h"
 #include "common/test.h"
-#include "common/test_follows_and_precedes_api.h"
 #include "common/utils.h"
 #include "common/utils_assert.h"
+#include "common/graph_utils.h"
+#include "common/test_follows_and_precedes_api.h"
+
+#include "test_buffering_try_put_and_wait.h"
 
 //! \file test_overwrite_node.cpp
 //! \brief Test for [flow_graph.overwrite_node] specification
 
+
 #define N 300
 #define T 4
 #define M 5
 
-template <typename R>
+template< typename R >
 void simple_read_write_tests() {
     tbb::flow::graph g;
     tbb::flow::overwrite_node<R> n(g);
 
-    for (int t = 0; t < T; ++t) {
-        R v0(N + 1);
-        std::vector<std::shared_ptr<harness_counting_receiver<R>>> r;
-        for (size_t i = 0; i < M; ++i) { r.push_back(std::make_shared<harness_counting_receiver<R>>(g)); }
-
-        CHECK_MESSAGE(n.is_valid() == false, "");
-        CHECK_MESSAGE(n.try_get(v0) == false, "");
-        if (t % 2) {
-            CHECK_MESSAGE(n.try_put(static_cast<R>(N)), "");
-            CHECK_MESSAGE(n.is_valid() == true, "");
-            CHECK_MESSAGE(n.try_get(v0) == true, "");
-            CHECK_MESSAGE(v0 == R(N), "");
+    for ( int t = 0; t < T; ++t ) {
+        R v0(N+1);
+        std::vector< std::shared_ptr<harness_counting_receiver<R>> > r;
+        for (size_t i = 0; i < M; ++i) {
+            r.push_back( std::make_shared<harness_counting_receiver<R>>(g) );
+        }
+
+        CHECK_MESSAGE( n.is_valid() == false, "" );
+        CHECK_MESSAGE( n.try_get( v0 ) == false, "" );
+        if ( t % 2 ) {
+            CHECK_MESSAGE( n.try_put( static_cast<R>(N) ), "" );
+            CHECK_MESSAGE( n.is_valid() == true, "" );
+            CHECK_MESSAGE( n.try_get( v0 ) == true, "" );
+            CHECK_MESSAGE( v0 == R(N), "" );
         }
 
-        for (int i = 0; i < M; ++i) { tbb::flow::make_edge(n, *r[i]); }
+        for (int i = 0; i < M; ++i) {
+            tbb::flow::make_edge( n, *r[i] );
+        }
 
-        for (int i = 0; i < N; ++i) {
+        for (int i = 0; i < N; ++i ) {
             R v1(static_cast<R>(i));
-            CHECK_MESSAGE(n.try_put(v1), "");
-            CHECK_MESSAGE(n.is_valid() == true, "");
-            for (int j = 0; j < N; ++j) {
+            CHECK_MESSAGE( n.try_put( v1 ), "" );
+            CHECK_MESSAGE( n.is_valid() == true, "" );
+            for (int j = 0; j < N; ++j ) {
                 R v2(0);
-                CHECK_MESSAGE(n.try_get(v2), "");
-                CHECK_MESSAGE(v1 == v2, "");
+                CHECK_MESSAGE( n.try_get( v2 ), "" );
+                CHECK_MESSAGE( v1 == v2, "" );
             }
         }
         for (int i = 0; i < M; ++i) {
             size_t c = r[i]->my_count;
-            CHECK_MESSAGE(int(c) == N + t % 2, "");
+            CHECK_MESSAGE( int(c) == N+t%2, "" );
         }
-        for (int i = 0; i < M; ++i) { tbb::flow::remove_edge(n, *r[i]); }
-        CHECK_MESSAGE(n.try_put(R(0)), "");
+        for (int i = 0; i < M; ++i) {
+            tbb::flow::remove_edge( n, *r[i] );
+        }
+        CHECK_MESSAGE( n.try_put( R(0) ), "" );
         for (int i = 0; i < M; ++i) {
             size_t c = r[i]->my_count;
-            CHECK_MESSAGE(int(c) == N + t % 2, "");
+            CHECK_MESSAGE( int(c) == N+t%2, "" );
         }
         n.clear();
-        CHECK_MESSAGE(n.is_valid() == false, "");
-        CHECK_MESSAGE(n.try_get(v0) == false, "");
+        CHECK_MESSAGE( n.is_valid() == false, "" );
+        CHECK_MESSAGE( n.try_get( v0 ) == false, "" );
     }
 }
 
-template <typename R>
+template< typename R >
 class native_body : utils::NoAssign {
     tbb::flow::overwrite_node<R> &my_node;
 
 public:
-    native_body(tbb::flow::overwrite_node<R> &n) : my_node(n) {}
 
-    void operator()(int i) const {
+    native_body( tbb::flow::overwrite_node<R> &n ) : my_node(n) {}
+
+    void operator()( int i ) const {
         R v1(static_cast<R>(i));
-        CHECK_MESSAGE(my_node.try_put(v1), "");
-        CHECK_MESSAGE(my_node.is_valid() == true, "");
+        CHECK_MESSAGE( my_node.try_put( v1 ), "" );
+        CHECK_MESSAGE( my_node.is_valid() == true, "" );
     }
 };
 
-template <typename R>
+template< typename R >
 void parallel_read_write_tests() {
     tbb::flow::graph g;
     tbb::flow::overwrite_node<R> n(g);
     //Create a vector of identical nodes
-    std::vector<tbb::flow::overwrite_node<R>> ow_vec(2, n);
+    std::vector< tbb::flow::overwrite_node<R> > ow_vec(2, n);
 
-    for (size_t node_idx = 0; node_idx < ow_vec.size(); ++node_idx) {
-        for (int t = 0; t < T; ++t) {
-            std::vector<std::shared_ptr<harness_counting_receiver<R>>> r;
-            for (size_t i = 0; i < M; ++i) { r.push_back(std::make_shared<harness_counting_receiver<R>>(g)); }
+    for (size_t node_idx=0; node_idx<ow_vec.size(); ++node_idx) {
+        for ( int t = 0; t < T; ++t ) {
+            std::vector< std::shared_ptr<harness_counting_receiver<R>> > r;
+            for (size_t i = 0; i < M; ++i) {
+                r.push_back( std::make_shared<harness_counting_receiver<R>>(g) );
+            }
 
-            for (int i = 0; i < M; ++i) { tbb::flow::make_edge(ow_vec[node_idx], *r[i]); }
+            for (int i = 0; i < M; ++i) {
+                tbb::flow::make_edge( ow_vec[node_idx], *r[i] );
+            }
             R v0;
-            CHECK_MESSAGE(ow_vec[node_idx].is_valid() == false, "");
-            CHECK_MESSAGE(ow_vec[node_idx].try_get(v0) == false, "");
+            CHECK_MESSAGE( ow_vec[node_idx].is_valid() == false, "" );
+            CHECK_MESSAGE( ow_vec[node_idx].try_get( v0 ) == false, "" );
 
 #if TBB_TEST_LOW_WORKLOAD
             const int nthreads = 30;
 #else
             const int nthreads = N;
 #endif
-            utils::NativeParallelFor(nthreads, native_body<R>(ow_vec[node_idx]));
+            utils::NativeParallelFor( nthreads, native_body<R>( ow_vec[node_idx] ) );
 
             for (int i = 0; i < M; ++i) {
                 size_t c = r[i]->my_count;
-                CHECK_MESSAGE(int(c) == nthreads, "");
+                CHECK_MESSAGE( int(c) == nthreads, "" );
+            }
+            for (int i = 0; i < M; ++i) {
+                tbb::flow::remove_edge( ow_vec[node_idx], *r[i] );
             }
-            for (int i = 0; i < M; ++i) { tbb::flow::remove_edge(ow_vec[node_idx], *r[i]); }
-            CHECK_MESSAGE(ow_vec[node_idx].try_put(R(0)), "");
+            CHECK_MESSAGE( ow_vec[node_idx].try_put( R(0) ), "" );
             for (int i = 0; i < M; ++i) {
                 size_t c = r[i]->my_count;
-                CHECK_MESSAGE(int(c) == nthreads, "");
+                CHECK_MESSAGE( int(c) == nthreads, "" );
             }
             ow_vec[node_idx].clear();
-            CHECK_MESSAGE(ow_vec[node_idx].is_valid() == false, "");
-            CHECK_MESSAGE(ow_vec[node_idx].try_get(v0) == false, "");
+            CHECK_MESSAGE( ow_vec[node_idx].is_valid() == false, "" );
+            CHECK_MESSAGE( ow_vec[node_idx].try_get( v0 ) == false, "" );
         }
     }
 }
@@ -139,12 +155,11 @@ void parallel_read_write_tests() {
 void test_follows_and_precedes_api() {
     using msg_t = tbb::flow::continue_msg;
 
-    std::array<msg_t, 3> messages_for_follows = {{msg_t(), msg_t(), msg_t()}};
+    std::array<msg_t, 3> messages_for_follows = { {msg_t(), msg_t(), msg_t()} };
     std::vector<msg_t> messages_for_precedes = {msg_t()};
 
     follows_and_precedes_testing::test_follows<msg_t, tbb::flow::overwrite_node<msg_t>>(messages_for_follows);
-    follows_and_precedes_testing::test_precedes<msg_t, tbb::flow::overwrite_node<msg_t>>(
-            messages_for_precedes);
+    follows_and_precedes_testing::test_precedes<msg_t, tbb::flow::overwrite_node<msg_t>>(messages_for_precedes);
 }
 #endif
 
@@ -169,44 +184,242 @@ void test_deduction_guides() {
 }
 #endif
 
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+void test_overwrite_node_try_put_and_wait() {
+    using namespace test_try_put_and_wait;
+
+    std::vector<int> start_work_items;
+    std::vector<int> new_work_items;
+    int wait_message = 10;
+
+    for (int i = 0; i < wait_message; ++i) {
+        start_work_items.emplace_back(i);
+        new_work_items.emplace_back(i + 1 + wait_message);
+    }
+
+    // Test push
+    {
+        std::vector<int> processed_items;
+
+        // Returns the index from which wait_for_all processing started
+        std::size_t after_start = test_buffer_push<tbb::flow::overwrite_node<int>>(start_work_items, wait_message,
+                                                                                   new_work_items, processed_items);
+
+        // It is expected that try_put_and_wait would process start_work_items (FIFO) and the wait_message
+        // and new_work_items (FIFO) would be processed in wait_for_all
+
+        CHECK_MESSAGE(after_start - 1 == start_work_items.size() + 1,
+                      "incorrect number of items processed by try_put_and_wait");
+        std::size_t check_index = 0;
+        for (auto item : start_work_items) {
+            CHECK_MESSAGE(processed_items[check_index++] == item, "unexpected start_work_items processing");
+        }
+        CHECK_MESSAGE(processed_items[check_index++] == wait_message, "unexpected wait_message processing");
+        for (auto item : new_work_items) {
+            CHECK_MESSAGE(processed_items[check_index++] == item, "unexpected new_work_items processing");
+        }
+    }
+    // Test pull
+    {
+        tbb::task_arena arena(1);
+
+        arena.execute([&] {
+            std::vector<int> processed_items;
+
+            tbb::flow::graph g;
+            tbb::flow::overwrite_node<int> buffer(g);
+            int start_message = 0;
+            int new_message = 1;
+
+            using function_node_type = tbb::flow::function_node<int, int, tbb::flow::rejecting>;
+
+            function_node_type function(g, tbb::flow::serial,
+                [&](int input) {
+                    if (input == wait_message) {
+                        buffer.try_put(new_message);
+                    }
+
+                    // Explicitly clean the buffer to prevent infinite try_get by the function_node
+                    if (input == new_message) {
+                        buffer.clear();
+                    }
+
+                    processed_items.emplace_back(input);
+                    return 0;
+                });
+
+            tbb::flow::make_edge(buffer, function);
+
+            buffer.try_put(start_message); // Occupies concurrency of function
+
+            buffer.try_put_and_wait(wait_message);
+
+            CHECK_MESSAGE(processed_items.size() == 2, "only the start_message and wait_message should be processed");
+            std::size_t check_index = 0;
+            CHECK_MESSAGE(processed_items[check_index++] == start_message, "unexpected start_message processing");
+            CHECK_MESSAGE(processed_items[check_index++] == wait_message, "unexpected wait_message processing");
+
+            g.wait_for_all();
+
+            CHECK_MESSAGE(processed_items[check_index++] == new_message, "unexpected new_message processing");
+            CHECK(check_index == processed_items.size());
+        });
+    }
+    // Test reserve
+    {
+        tbb::task_arena arena(1);
+
+        arena.execute([&] {
+            std::vector<int> processed_items;
+
+            tbb::flow::graph g;
+            tbb::flow::overwrite_node<int> buffer(g);
+            tbb::flow::limiter_node<int, int> limiter(g, 1);
+            int start_message = 0;
+            int new_message = 1;
+
+            using function_node_type = tbb::flow::function_node<int, int, tbb::flow::rejecting>;
+
+            function_node_type function(g, tbb::flow::serial,
+                [&](int input) {
+                    if (input == wait_message) {
+                        buffer.try_put(new_message);
+                    }
+
+                    // Explicitly clean the buffer to prevent infinite try_get by the function_node
+                    if (input == new_message) {
+                        buffer.clear();
+                    }
+
+                    processed_items.emplace_back(input);
+                    limiter.decrementer().try_put(1);
+                    return 0;
+                });
+
+            tbb::flow::make_edge(buffer, limiter);
+            tbb::flow::make_edge(limiter, function);
+
+            buffer.try_put(start_message); // Occupies concurrency of function
+
+            buffer.try_put_and_wait(wait_message);
+
+            CHECK_MESSAGE(processed_items.size() == 2, "only the start_message and wait_message should be processed");
+            std::size_t check_index = 0;
+            CHECK_MESSAGE(processed_items[check_index++] == start_message, "unexpected start_message processing");
+            CHECK_MESSAGE(processed_items[check_index++] == wait_message, "unexpected wait_message processing");
+
+            g.wait_for_all();
+
+            CHECK_MESSAGE(processed_items[check_index++] == new_message, "unexpected new_message processing");
+            CHECK(check_index == processed_items.size());
+        });
+    }
+    // Test explicit clear
+    {
+        tbb::flow::graph g;
+        tbb::flow::overwrite_node<int> buffer(g);
+
+        std::vector<int> processed_items;
+
+        tbb::flow::function_node<int, int> f(g, tbb::flow::serial,
+            [&](int input) {
+                processed_items.emplace_back(input);
+                buffer.clear();
+                return 0;
+            });
+
+        tbb::flow::make_edge(buffer, f);
+
+        buffer.try_put_and_wait(wait_message);
+
+        CHECK_MESSAGE(processed_items.size() == 1, "Incorrect number of processed items");
+        CHECK_MESSAGE(processed_items.back() == wait_message, "unexpected processing");
+
+        g.wait_for_all();
+
+        CHECK(processed_items.size() == 1);
+        CHECK(processed_items.back() == wait_message);
+    }
+}
+#endif
+
 //! Test read-write properties
 //! \brief \ref requirement \ref error_guessing
-TEST_CASE("Read-write") {
+TEST_CASE("Read-write"){
     simple_read_write_tests<int>();
     simple_read_write_tests<float>();
 }
 
 //! Read-write and ParallelFor tests under limited parallelism
 //! \brief \ref error_guessing
-TEST_CASE("Limited parallelism") {
-    for (unsigned int p = utils::MinThread; p <= utils::MaxThread; ++p) {
+TEST_CASE("Limited parallelism"){
+    for( unsigned int p=utils::MinThread; p<=utils::MaxThread; ++p ) {
         tbb::task_arena arena(p);
-        arena.execute([&]() {
-            parallel_read_write_tests<int>();
-            parallel_read_write_tests<float>();
-            test_reserving_nodes<tbb::flow::overwrite_node, size_t>();
-        });
-    }
+        arena.execute(
+            [&]() {
+                parallel_read_write_tests<int>();
+                parallel_read_write_tests<float>();
+                test_reserving_nodes<tbb::flow::overwrite_node, size_t>();
+            }
+        );
+	}
 }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 //! Test follows and precedes API
 //! \brief \ref error_guessing
-TEST_CASE("Follows and precedes API") { test_follows_and_precedes_api(); }
+TEST_CASE("Follows and precedes API"){
+    test_follows_and_precedes_api();
+}
 #endif
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 //! Test decution guides
 //! \brief \ref requirement
-TEST_CASE("Deduction guides") { test_deduction_guides(); }
+TEST_CASE("Deduction guides"){
+    test_deduction_guides();
+}
 #endif
 
 //! Test try_release
 //! \brief \ref error_guessing
-TEST_CASE("try_release") {
+TEST_CASE("try_release"){
     tbb::flow::graph g;
 
     tbb::flow::overwrite_node<int> on(g);
 
-    CHECK_MESSAGE((on.try_release() == true), "try_release should return true");
+    CHECK_MESSAGE ((on.try_release()== true), "try_release should return true");
+}
+
+//! Test for cancel register_predecessor_task
+//! \brief \ref error_guessing
+TEST_CASE("Cancel register_predecessor_task") {
+    tbb::flow::graph g;
+    // Cancel graph context for preventing tasks execution and
+    // calling cancel method of spawned tasks
+    g.cancel();
+
+    // To spawn register_predecessor_task internal buffer of overwrite_node
+    // should be valid and successor should failed during putting an item to it
+    oneapi::tbb::flow::overwrite_node<size_t> node(g);
+    // Reserving join_node always fails during putting an item to it
+    tbb::flow::join_node<std::tuple<size_t>, tbb::flow::reserving> j_node(g);
+
+    // Make internal buffer of overwrite_node valid
+    node.try_put(1);
+    // Making an edge attempts pushing an item to join_node
+    // that immediately fails and tries to reverse an edge into PULL state
+    // by spawning register_predecessor_task, which will be cancelled
+    // during execution
+    tbb::flow::make_edge(node, tbb::flow::input_port<0>(j_node));
+
+    // Wait for cancellation of spawned tasks
+    g.wait_for_all();
+}
+
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+//! \brief \ref error_guessing
+TEST_CASE("test overwrite_node try_put_and_wait") {
+    test_overwrite_node_try_put_and_wait();
 }
+#endif
diff --git a/external/tbb/test/tbb/test_parallel_for.cpp b/external/tbb/test/tbb/test_parallel_for.cpp
index 3a024793..c9548c3b 100644
--- a/external/tbb/test/tbb/test_parallel_for.cpp
+++ b/external/tbb/test/tbb/test_parallel_for.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2025 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -18,15 +18,15 @@
 
 #include "tbb/parallel_for.h"
 
-#include "common/concepts_common.h"
 #include "common/config.h"
-#include "common/cpu_usertime.h"
-#include "common/exception_handling.h"
-#include "common/spin_barrier.h"
 #include "common/utils.h"
 #include "common/utils_concurrency_limit.h"
 #include "common/utils_report.h"
 #include "common/vector_types.h"
+#include "common/cpu_usertime.h"
+#include "common/spin_barrier.h"
+#include "common/exception_handling.h"
+#include "common/concepts_common.h"
 #include "test_partitioner.h"
 
 #include <cstddef>
@@ -36,288 +36,297 @@
 //! \brief Test for [algorithms.parallel_for] specification
 
 #if _MSC_VER
-#pragma warning(push)
+#pragma warning (push)
 // Suppress conditional expression is constant
-#pragma warning(disable : 4127)
+#pragma warning (disable: 4127)
 #if __TBB_MSVC_UNREACHABLE_CODE_IGNORED
-// Suppress pointless "unreachable code" warning.
-#pragma warning(disable : 4702)
+    // Suppress pointless "unreachable code" warning.
+    #pragma warning (disable: 4702)
 #endif
 #if defined(_Wp64)
-// Workaround for overzealous compiler warnings in /Wp64 mode
-#pragma warning(disable : 4267)
+    // Workaround for overzealous compiler warnings in /Wp64 mode
+    #pragma warning (disable: 4267)
 #endif
 #define _SCL_SECURE_NO_WARNINGS
-#endif//#if _MSC_VER
+#endif //#if _MSC_VER
+
 
 #if (HAVE_m128 || HAVE_m256)
-template <typename ClassWithVectorType>
+template<typename ClassWithVectorType>
 struct SSE_Functor {
-    ClassWithVectorType *Src, *Dst;
-    SSE_Functor(ClassWithVectorType* src, ClassWithVectorType* dst) : Src(src), Dst(dst) {}
+    ClassWithVectorType* Src, * Dst;
+    SSE_Functor( ClassWithVectorType* src, ClassWithVectorType* dst ) : Src(src), Dst(dst) {}
 
-    void operator()(tbb::blocked_range<int>& r) const {
-        for (int i = r.begin(); i != r.end(); ++i) Dst[i] = Src[i];
+    void operator()( tbb::blocked_range<int>& r ) const {
+        for( int i=r.begin(); i!=r.end(); ++i )
+            Dst[i] = Src[i];
     }
 };
 
 //! Test that parallel_for works with stack-allocated __m128
-template <typename ClassWithVectorType>
+template<typename ClassWithVectorType>
 void TestVectorTypes() {
     const int aSize = 300;
     ClassWithVectorType Array1[aSize], Array2[aSize];
-    for (int i = 0; i < aSize; ++i) {
+    for( int i=0; i<aSize; ++i ) {
         // VC8 does not properly align a temporary value; to work around, use explicit variable
         ClassWithVectorType foo(i);
         Array1[i] = foo;
     }
-    tbb::parallel_for(tbb::blocked_range<int>(0, aSize), SSE_Functor<ClassWithVectorType>(Array1, Array2));
-    for (int i = 0; i < aSize; ++i) {
+    tbb::parallel_for( tbb::blocked_range<int>(0,aSize), SSE_Functor<ClassWithVectorType>(Array1, Array2) );
+    for( int i=0; i<aSize; ++i ) {
         ClassWithVectorType foo(i);
-        CHECK(Array2[i] == foo);
+        CHECK( Array2[i]==foo ) ;
     }
 }
 #endif /* HAVE_m128 || HAVE_m256 */
 
 struct TestSimplePartitionerStabilityFunctor {
-    std::vector<int>& ranges;
-    TestSimplePartitionerStabilityFunctor(std::vector<int>& theRanges) : ranges(theRanges) {}
-    void operator()(tbb::blocked_range<size_t>& r) const { ranges.at(r.begin()) = 1; }
+  std::vector<int> & ranges;
+  TestSimplePartitionerStabilityFunctor(std::vector<int> & theRanges):ranges(theRanges){}
+  void operator()(tbb::blocked_range<size_t>& r)const{
+      ranges.at(r.begin()) = 1;
+  }
 };
-void TestSimplePartitionerStability() {
-    const std::size_t repeat_count = 10;
-    const std::size_t rangeToSplitSize = 1000000;
-    const std::size_t grainsizeStep = rangeToSplitSize / repeat_count;
+void TestSimplePartitionerStability(){
+    const std::size_t repeat_count= 10;
+    const std::size_t rangeToSplitSize=1000000;
+    const std::size_t grainsizeStep=rangeToSplitSize/repeat_count;
     typedef TestSimplePartitionerStabilityFunctor FunctorType;
 
-    for (std::size_t i = 0, grainsize = grainsizeStep; i < repeat_count; i++, grainsize += grainsizeStep) {
-        std::vector<int> firstSeries(rangeToSplitSize, 0);
-        std::vector<int> secondSeries(rangeToSplitSize, 0);
+    for (std::size_t i=0 , grainsize=grainsizeStep; i<repeat_count;i++, grainsize+=grainsizeStep){
+        std::vector<int> firstSeries(rangeToSplitSize,0);
+        std::vector<int> secondSeries(rangeToSplitSize,0);
 
-        tbb::parallel_for(tbb::blocked_range<size_t>(0, rangeToSplitSize, grainsize),
-                          FunctorType(firstSeries), tbb::simple_partitioner());
-        tbb::parallel_for(tbb::blocked_range<size_t>(0, rangeToSplitSize, grainsize),
-                          FunctorType(secondSeries), tbb::simple_partitioner());
+        tbb::parallel_for(tbb::blocked_range<size_t>(0,rangeToSplitSize,grainsize),FunctorType(firstSeries),tbb::simple_partitioner());
+        tbb::parallel_for(tbb::blocked_range<size_t>(0,rangeToSplitSize,grainsize),FunctorType(secondSeries),tbb::simple_partitioner());
 
-        CHECK_MESSAGE(firstSeries == secondSeries,
-                      "Splitting range with tbb::simple_partitioner must be reproducible; i = " << i);
+        CHECK_MESSAGE(
+            firstSeries == secondSeries,
+            "Splitting range with tbb::simple_partitioner must be reproducible; i = " << i
+        );
     }
 }
 
 namespace various_range_implementations {
 
-    using namespace test_partitioner_utils;
-    using namespace test_partitioner_utils::TestRanges;
+using namespace test_partitioner_utils;
+using namespace test_partitioner_utils::TestRanges;
 
-    // Body ensures that initial work distribution is done uniformly through affinity mechanism and not through work stealing
-    class Body {
-        utils::SpinBarrier& m_sb;
-
-    public:
-        Body(utils::SpinBarrier& sb) : m_sb(sb) {}
-        Body(Body& b, tbb::split) : m_sb(b.m_sb) {}
-
-        template <typename Range>
-        void operator()(Range& r) const {
-            INFO("Executing range [" << r.begin() << ", " << r.end() << "]");
-            m_sb.wait();// waiting for all threads
-        }
-    };
+// Body ensures that initial work distribution is done uniformly through affinity mechanism and not through work stealing
+class Body {
+    utils::SpinBarrier &m_sb;
+public:
+    Body(utils::SpinBarrier& sb) : m_sb(sb) { }
+    Body(Body& b, tbb::split) : m_sb(b.m_sb) { }
 
-    namespace correctness {
+    template <typename Range>
+    void operator()(Range& r) const {
+        INFO("Executing range [" << r.begin() << ", " << r.end() << "]");
+        m_sb.wait(); // waiting for all threads
+    }
+};
 
-        /* Testing only correctness (that is parallel_for does not hang) */
-        template <typename RangeType, bool /* feedback */, bool ensure_non_emptiness>
-        void test() {
-            RangeType range(0, utils::get_platform_max_threads(), NULL, false, ensure_non_emptiness);
-            tbb::affinity_partitioner ap;
-            tbb::parallel_for(range, SimpleBody(), ap);
-        }
+namespace correctness {
 
-    }// namespace correctness
+/* Testing only correctness (that is parallel_for does not hang) */
+template <typename RangeType, bool /* feedback */, bool ensure_non_emptiness>
+void test() {
+    RangeType range( 0, utils::get_platform_max_threads(), nullptr, false, ensure_non_emptiness );
+    tbb::affinity_partitioner ap;
+    tbb::parallel_for( range, SimpleBody(), ap );
+}
 
-    namespace uniform_distribution {
+} // namespace correctness
 
-        /* Body of parallel_for algorithm would hang if non-uniform work distribution happened  */
-        template <typename RangeType, bool feedback, bool ensure_non_emptiness>
-        void test() {
-            static const std::size_t thread_num = utils::get_platform_max_threads();
-            utils::SpinBarrier sb(thread_num);
-            RangeType range(0, thread_num, NULL, feedback, ensure_non_emptiness);
-            const Body sync_body(sb);
-            tbb::affinity_partitioner ap;
-            tbb::parallel_for(range, sync_body, ap);
-            tbb::parallel_for(range, sync_body, tbb::static_partitioner());
-        }
+namespace uniform_distribution {
 
-    }// namespace uniform_distribution
+/* Body of parallel_for algorithm would hang if non-uniform work distribution happened  */
+template <typename RangeType, bool feedback, bool ensure_non_emptiness>
+void test() {
+    static const std::size_t thread_num = utils::get_platform_max_threads();
+    utils::SpinBarrier sb( thread_num );
+    RangeType range(0, thread_num, nullptr, feedback, ensure_non_emptiness);
+    const Body sync_body( sb );
+    tbb::affinity_partitioner ap;
+    tbb::parallel_for( range, sync_body, ap );
+    tbb::parallel_for( range, sync_body, tbb::static_partitioner() );
+}
 
-    void test() {
-        const bool provide_feedback = false;
-        const bool ensure_non_empty_range = true;
+} // namespace uniform_distribution
 
-        // BlockedRange does not take into account feedback and non-emptiness settings but uses the
-        // tbb::blocked_range implementation
-        uniform_distribution::test<BlockedRange, !provide_feedback, !ensure_non_empty_range>();
-        using correctness::test;
+void test() {
+    const bool provide_feedback = false;
+    const bool ensure_non_empty_range = true;
 
-        {
-            test<RoundedDownRange, provide_feedback, ensure_non_empty_range>();
-            test<RoundedDownRange, provide_feedback, !ensure_non_empty_range>();
-        }
+    // BlockedRange does not take into account feedback and non-emptiness settings but uses the
+    // tbb::blocked_range implementation
+    uniform_distribution::test<BlockedRange, !provide_feedback, !ensure_non_empty_range>();
+    using correctness::test;
 
-        {
-            test<RoundedUpRange, provide_feedback, ensure_non_empty_range>();
-            test<RoundedUpRange, provide_feedback, !ensure_non_empty_range>();
-        }
+    {
+        test<RoundedDownRange, provide_feedback, ensure_non_empty_range>();
+        test<RoundedDownRange, provide_feedback, !ensure_non_empty_range>();
+    }
 
-        // Testing that parallel_for algorithm works with such weird ranges
-        correctness::test<Range1_2, /* provide_feedback= */ false, !ensure_non_empty_range>();
-        correctness::test<Range1_999, /* provide_feedback= */ false, !ensure_non_empty_range>();
-        correctness::test<Range999_1, /* provide_feedback= */ false, !ensure_non_empty_range>();
-
-        // The following ranges do not comply with the proportion suggested by partitioner. Therefore
-        // they have to provide the proportion in which they were actually split back to partitioner and
-        // ensure theirs non-emptiness
-        test<Range1_2, provide_feedback, ensure_non_empty_range>();
-        test<Range1_999, provide_feedback, ensure_non_empty_range>();
-        test<Range999_1, provide_feedback, ensure_non_empty_range>();
+    {
+        test<RoundedUpRange, provide_feedback, ensure_non_empty_range>();
+        test<RoundedUpRange, provide_feedback, !ensure_non_empty_range>();
     }
 
-}// namespace various_range_implementations
+    // Testing that parallel_for algorithm works with such weird ranges
+    correctness::test<Range1_2, /* provide_feedback= */ false, !ensure_non_empty_range>();
+    correctness::test<Range1_999, /* provide_feedback= */ false, !ensure_non_empty_range>();
+    correctness::test<Range999_1, /* provide_feedback= */ false, !ensure_non_empty_range>();
+
+    // The following ranges do not comply with the proportion suggested by partitioner. Therefore
+    // they have to provide the proportion in which they were actually split back to partitioner and
+    // ensure theirs non-emptiness
+    test<Range1_2, provide_feedback, ensure_non_empty_range>();
+    test<Range1_999, provide_feedback, ensure_non_empty_range>();
+    test<Range999_1, provide_feedback, ensure_non_empty_range>();
+}
+
+} // namespace various_range_implementations
 
 namespace test_cancellation {
 
-    struct FunctorToCancel {
-        static std::atomic<bool> need_to_wait;
+struct FunctorToCancel {
+    static std::atomic<bool> need_to_wait;
 
-        void operator()(std::size_t) const {
-            ++g_CurExecuted;
-            if (need_to_wait) { need_to_wait = Cancellator::WaitUntilReady(); }
+    void operator()( std::size_t ) const {
+        ++g_CurExecuted;
+        if (need_to_wait) {
+            need_to_wait = Cancellator::WaitUntilReady();
         }
+    }
 
-        void operator()(const tbb::blocked_range<std::size_t>&) const {
-            ++g_CurExecuted;
-            Cancellator::WaitUntilReady();
-        }
+    void operator()( const tbb::blocked_range<std::size_t>& ) const {
+        ++g_CurExecuted;
+        Cancellator::WaitUntilReady();
+    }
 
-        static void reset() { need_to_wait = true; }
-    };// struct FunctorToCancel
+    static void reset() { need_to_wait = true; }
+}; // struct FunctorToCancel
 
-    std::atomic<bool> FunctorToCancel::need_to_wait(true);
+std::atomic<bool> FunctorToCancel::need_to_wait(true);
 
-    static constexpr std::size_t buffer_test_size = 1024;
-    static constexpr std::size_t maxParallelForRunnerMode = 14;
+static constexpr std::size_t buffer_test_size = 1024;
+static constexpr std::size_t maxParallelForRunnerMode = 14;
 
-    template <std::size_t Mode>
-    class ParallelForRunner {
-        tbb::task_group_context& my_ctx;
-        const std::size_t worker_task_step = 1;
+template <std::size_t Mode>
+class ParallelForRunner {
+    tbb::task_group_context& my_ctx;
+    const std::size_t worker_task_step = 1;
 
-        static_assert(Mode >= 0 && Mode <= maxParallelForRunnerMode, "Incorrect mode for ParallelForRunner");
+    static_assert(Mode >= 0 && Mode <= maxParallelForRunnerMode, "Incorrect mode for ParallelForRunner");
 
-        template <typename Partitioner, typename... Args>
-        void run_parallel_for(Args&&... args) const {
-            Partitioner part;
-            tbb::parallel_for(std::forward<Args>(args)..., part, my_ctx);
-        }
+    template <typename Partitioner, typename... Args>
+    void run_parallel_for( Args&&... args ) const {
+        Partitioner part;
+        tbb::parallel_for(std::forward<Args>(args)..., part, my_ctx);
+    }
 
-        template <typename... Args>
-        void run_overload(Args&&... args) const {
-
-            switch (Mode % 5) {
-                case 0: {
-                    tbb::parallel_for(std::forward<Args>(args)..., my_ctx);
-                    break;
-                }
-                case 1: {
-                    run_parallel_for<tbb::simple_partitioner>(std::forward<Args>(args)...);
-                    break;
-                }
-                case 2: {
-                    run_parallel_for<tbb::auto_partitioner>(std::forward<Args>(args)...);
-                    break;
-                }
-                case 3: {
-                    run_parallel_for<tbb::static_partitioner>(std::forward<Args>(args)...);
-                    break;
-                }
-                case 4: {
-                    run_parallel_for<tbb::affinity_partitioner>(std::forward<Args>(args)...);
-                    break;
-                }
-            }
-        }
+    template <typename... Args>
+    void run_overload( Args&&... args ) const {
 
-    public:
-        ParallelForRunner(tbb::task_group_context& ctx) : my_ctx(ctx) {}
-
-        ~ParallelForRunner() { FunctorToCancel::reset(); }
-
-        void operator()() const {
-            if (Mode < 5) {
-                // Overload with blocked range
-                tbb::blocked_range<std::size_t> br(0, buffer_test_size);
-                run_overload(br, FunctorToCancel {});
-            } else if (Mode < 10) {
-                // Overload with two indexes
-                run_overload(std::size_t(0), buffer_test_size, FunctorToCancel {});
-            } else {
-                // Overload with two indexes and step
-                run_overload(std::size_t(0), buffer_test_size, worker_task_step, FunctorToCancel {});
+        switch(Mode % 5) {
+            case 0 : {
+                tbb::parallel_for(std::forward<Args>(args)..., my_ctx);
+                break;
+            }
+            case 1 : {
+                run_parallel_for<tbb::simple_partitioner>(std::forward<Args>(args)...);
+                break;
+            }
+            case 2 : {
+                run_parallel_for<tbb::auto_partitioner>(std::forward<Args>(args)...);
+                break;
+            }
+            case 3 : {
+                run_parallel_for<tbb::static_partitioner>(std::forward<Args>(args)...);
+                break;
+            }
+            case 4 : {
+                run_parallel_for<tbb::affinity_partitioner>(std::forward<Args>(args)...);
+                break;
             }
         }
-    };// class ParallelForRunner
-
-    template <std::size_t Mode>
-    void run_parallel_for_cancellation_test() {
-        // TODO: enable concurrency_range
-        if (utils::get_platform_max_threads() < 2) {
-            // The test requires at least one worker thread to request cancellation
-            return;
-        }
-        ResetEhGlobals();
-        RunCancellationTest<ParallelForRunner<Mode>, Cancellator>();
     }
 
-    template <std::size_t Mode>
-    struct ParallelForTestRunner {
-        static void run() {
-            run_parallel_for_cancellation_test<Mode>();
-            ParallelForTestRunner<Mode + 1>::run();
+public:
+    ParallelForRunner( tbb::task_group_context& ctx )
+        : my_ctx(ctx) {}
+
+    ~ParallelForRunner() { FunctorToCancel::reset(); }
+
+    void operator()() const {
+        if (Mode < 5) {
+            // Overload with blocked range
+            tbb::blocked_range<std::size_t> br(0, buffer_test_size);
+            run_overload(br, FunctorToCancel{});
+        } else if (Mode < 10) {
+            // Overload with two indexes
+            run_overload(std::size_t(0), buffer_test_size, FunctorToCancel{});
+        } else {
+            // Overload with two indexes and step
+            run_overload(std::size_t(0), buffer_test_size, worker_task_step, FunctorToCancel{});
         }
-    };// struct ParallelForTestRunner
+    }
+}; // class ParallelForRunner
+
+template <std::size_t Mode>
+void run_parallel_for_cancellation_test() {
+    // TODO: enable concurrency_range
+    if (utils::get_platform_max_threads() < 2) {
+        // The test requires at least one worker thread to request cancellation
+        return;
+    }
+    ResetEhGlobals();
+    RunCancellationTest<ParallelForRunner<Mode>, Cancellator>();
+}
 
-    template <>
-    struct ParallelForTestRunner<maxParallelForRunnerMode> {
-        static void run() { run_parallel_for_cancellation_test<maxParallelForRunnerMode>(); }
-    };// struct ParallelForTestRunner<maxParallelForRunnerMode>
+template <std::size_t Mode>
+struct ParallelForTestRunner {
+    static void run() {
+        run_parallel_for_cancellation_test<Mode>();
+        ParallelForTestRunner<Mode + 1>::run();
+    }
+}; // struct ParallelForTestRunner
+
+template <>
+struct ParallelForTestRunner<maxParallelForRunnerMode> {
+    static void run() {
+        run_parallel_for_cancellation_test<maxParallelForRunnerMode>();
+    }
+}; // struct ParallelForTestRunner<maxParallelForRunnerMode>
 
-}// namespace test_cancellation
+} // namespace test_cancellation
 
 #if __TBB_CPP20_CONCEPTS_PRESENT
 template <typename... Args>
-concept can_call_parallel_for_basic = requires(Args&&... args) {
+concept can_call_parallel_for_basic = requires( Args&&... args ) {
     tbb::parallel_for(std::forward<Args>(args)...);
 };
 
 template <typename... Args>
-concept can_call_parallel_for_helper = can_call_parallel_for_basic<Args...>&&
-        can_call_parallel_for_basic<Args..., tbb::task_group_context&>;
+concept can_call_parallel_for_helper = can_call_parallel_for_basic<Args...> &&
+                                       can_call_parallel_for_basic<Args..., tbb::task_group_context&>;
 
 template <typename... Args>
-concept can_call_parallel_for_with_partitioner = can_call_parallel_for_helper<Args...>&&
-        can_call_parallel_for_helper<Args..., const tbb::simple_partitioner&>&&
-                can_call_parallel_for_helper<Args..., const tbb::auto_partitioner&>&&
-                        can_call_parallel_for_helper<Args..., const tbb::static_partitioner>&&
-                                can_call_parallel_for_helper<Args..., tbb::affinity_partitioner&>;
+concept can_call_parallel_for_with_partitioner = can_call_parallel_for_helper<Args...> &&
+                                                 can_call_parallel_for_helper<Args..., const tbb::simple_partitioner&> &&
+                                                 can_call_parallel_for_helper<Args..., const tbb::auto_partitioner&> &&
+                                                 can_call_parallel_for_helper<Args..., const tbb::static_partitioner> &&
+                                                 can_call_parallel_for_helper<Args..., tbb::affinity_partitioner&>;
 
 template <typename Range, typename Body>
 concept can_call_range_pfor = can_call_parallel_for_with_partitioner<const Range&, const Body&>;
 
 template <typename Index, typename Function>
-concept can_call_index_pfor = can_call_parallel_for_with_partitioner<Index, Index, const Function&>&&
-        can_call_parallel_for_with_partitioner<Index, Index, Index, const Function&>;
+concept can_call_index_pfor = can_call_parallel_for_with_partitioner<Index, Index, const Function&> &&
+                              can_call_parallel_for_with_partitioner<Index, Index, Index, const Function&>;
+
 
 template <typename Range>
 using CorrectBody = test_concepts::parallel_for_body::Correct<Range>;
@@ -381,15 +390,15 @@ void test_pfor_index_constraints() {
     static_assert(!can_call_index_pfor<WrongInputOperatorPlus, CorrectFunc<WrongInputOperatorPlus>>);
     static_assert(!can_call_index_pfor<WrongReturnOperatorPlus, CorrectFunc<WrongReturnOperatorPlus>>);
 }
-#endif// __TBB_CPP20_CONCEPTS_PRESENT
+#endif // __TBB_CPP20_CONCEPTS_PRESENT
 
 #if TBB_USE_EXCEPTIONS && !__TBB_THROW_ACROSS_MODULE_BOUNDARY_BROKEN && TBB_REVAMP_TODO
 #include "tbb/global_control.h"
 //! Testing exceptions
 //! \brief \ref requirement
 TEST_CASE("Exceptions support") {
-    for (int p = MinThread; p <= MaxThread; ++p) {
-        if (p > 0) {
+    for ( int p = MinThread; p <= MaxThread; ++p ) {
+        if ( p > 0 ) {
             tbb::global_control control(tbb::global_control::max_allowed_parallelism, p);
             TestExceptionsSupport();
         }
@@ -412,29 +421,32 @@ TEST_CASE("Vector types") {
 //! \brief \ref resource_usage
 TEST_CASE("That all workers sleep when no work") {
     const std::size_t N = 100000;
-    std::atomic<int> counter {};
-
-    tbb::parallel_for(
-            std::size_t(0), N,
-            [&](std::size_t) {
-                for (int i = 0; i < 1000; ++i) { ++counter; }
-            },
-            tbb::simple_partitioner());
+    std::atomic<int> counter{};
+
+    tbb::parallel_for(std::size_t(0), N, [&](std::size_t) {
+        for (int i = 0; i < 1000; ++i) {
+            ++counter;
+        }
+    }, tbb::simple_partitioner());
     TestCPUUserTime(utils::get_platform_max_threads());
 }
 
 //! Testing simple partitioner stability
 //! \brief \ref error_guessing
-TEST_CASE("Simple partitioner stability") { TestSimplePartitionerStability(); }
+TEST_CASE("Simple partitioner stability") {
+    TestSimplePartitionerStability();
+}
 
 //! Testing various range implementations
 //! \brief \ref requirement
-TEST_CASE("Various range implementations") { various_range_implementations::test(); }
+TEST_CASE("Various range implementations") {
+    various_range_implementations::test();
+}
 
 //! Testing parallel_for with explicit task_group_context
 //! \brief \ref interface \ref error_guessing
-TEST_CASE("Сancellation test for tbb::parallel_for") {
-    test_cancellation::ParallelForTestRunner</*FirstMode = */ 0>::run();
+TEST_CASE("Cancellation test for tbb::parallel_for") {
+    test_cancellation::ParallelForTestRunner</*FirstMode = */0>::run();
 }
 
 #if __TBB_CPP20_CONCEPTS_PRESENT
@@ -445,8 +457,8 @@ TEST_CASE("parallel_for constraints") {
     test_pfor_func_constraints();
     test_pfor_index_constraints();
 }
-#endif// __TBB_CPP20_CONCEPTS_PRESENT
+#endif // __TBB_CPP20_CONCEPTS_PRESENT
 
 #if _MSC_VER
-#pragma warning(pop)
+#pragma warning (pop)
 #endif
diff --git a/external/tbb/test/tbb/test_parallel_for_each.cpp b/external/tbb/test/tbb/test_parallel_for_each.cpp
index df7e5f43..67a8a048 100644
--- a/external/tbb/test/tbb/test_parallel_for_each.cpp
+++ b/external/tbb/test/tbb/test_parallel_for_each.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2025 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -14,22 +14,122 @@
     limitations under the License.
 */
 
-#include "common/concepts_common.h"
 #include "common/parallel_for_each_common.h"
-#include <iterator>
+#include "common/concepts_common.h"
 #include <vector>
+#include <iterator>
 
 //! \file test_parallel_for_each.cpp
 //! \brief Test for [algorithms.parallel_for_each]
 
+#if __TBB_CPP20_CONCEPTS_PRESENT
+// Fancy iterator type that models the C++20 iterator type
+// that defines the real iterator category using iterator_concept type
+// and iterator_category is always std::input_iterator_type
+// Similar iterators are used by C++20 ranges (e.g. std::ranges::iota_view::iterator)
+// parallel_for_each algorithm should detect such iterators with respect to iterator_concept value
+
+template <typename T, typename Category>
+struct cpp20_iterator {
+    static_assert(std::derived_from<Category, std::forward_iterator_tag>,
+                  "cpp20_iterator should be of at least forward iterator category");
+
+    using iterator_concept = Category;
+    using iterator_category = std::input_iterator_tag;
+    using value_type = T;
+    using difference_type = std::ptrdiff_t;
+
+    cpp20_iterator() = default;
+    explicit cpp20_iterator(T* ptr) : my_ptr(ptr) {}
+
+    T& operator*() const { return *my_ptr; }
+
+    cpp20_iterator& operator++() {
+        ++my_ptr;
+        return *this;
+    }
+
+    cpp20_iterator operator++(int) {
+        auto it = *this;
+        ++*this;
+        return it;
+    }
+
+    cpp20_iterator& operator--()
+        requires std::derived_from<Category, std::bidirectional_iterator_tag>
+    {
+        --my_ptr;
+        return *this;
+    }
+
+    cpp20_iterator operator--(int)
+        requires std::derived_from<Category, std::bidirectional_iterator_tag>
+    {
+        auto it = *this;
+        --*this;
+        return it;
+    }
+
+    cpp20_iterator& operator+=(difference_type n)
+        requires std::derived_from<Category, std::random_access_iterator_tag>
+    {
+        my_ptr += n;
+        return *this;
+    }
+
+    cpp20_iterator& operator-=(difference_type n)
+        requires std::derived_from<Category, std::random_access_iterator_tag>
+    {
+        my_ptr -= n;
+        return *this;
+    }
+
+    T& operator[](difference_type n) const
+        requires std::derived_from<Category, std::random_access_iterator_tag>
+    {
+        return my_ptr[n];
+    }
+
+    friend bool operator==(const cpp20_iterator&, const cpp20_iterator&) = default;
+
+    friend auto operator<=>(const cpp20_iterator&, const cpp20_iterator&)
+        requires std::derived_from<Category, std::random_access_iterator_tag> = default;
+
+    friend cpp20_iterator operator+(cpp20_iterator i, difference_type n)
+        requires std::derived_from<Category, std::random_access_iterator_tag>
+    {
+        return cpp20_iterator(i.my_ptr + n);
+    }
+
+    friend cpp20_iterator operator+(difference_type n, cpp20_iterator i)
+        requires std::derived_from<Category, std::random_access_iterator_tag>
+    {
+        return i + n;
+    }
+
+    friend cpp20_iterator operator-(cpp20_iterator i, difference_type n)
+        requires std::derived_from<Category, std::random_access_iterator_tag>
+    {
+        return cpp20_iterator(i.my_ptr - n);
+    }
+
+    friend difference_type operator-(const cpp20_iterator& x, const cpp20_iterator& y) {
+        return x.my_ptr - y.my_ptr;
+    }
+private:
+    T* my_ptr = nullptr;
+}; // class cpp20_iterator
+#endif // __TBB_CPP20_CONCEPTS_PRESENT
+
 //! Test forward access iterator support
 //! \brief \ref error_guessing \ref interface
 TEST_CASE("Forward iterator support") {
-    for (auto concurrency_level : utils::concurrency_range()) {
+    for ( auto concurrency_level : utils::concurrency_range() ) {
         tbb::global_control control(tbb::global_control::max_allowed_parallelism, concurrency_level);
-        for (size_t depth = 0; depth <= depths_nubmer; ++depth) {
+        for(size_t depth = 0; depth <= depths_nubmer; ++depth) {
             g_tasks_expected = 0;
-            for (size_t i = 0; i < depth; ++i) g_tasks_expected += FindNumOfTasks(g_depths[i].value());
+            for (size_t i=0; i < depth; ++i)
+                g_tasks_expected += FindNumOfTasks(g_depths[i].value());
             TestIterator_Modifiable<utils::ForwardIterator<value_t>>(depth);
         }
     }
@@ -38,11 +138,12 @@ TEST_CASE("Forward iterator support") {
 //! Test random access iterator support
 //! \brief \ref error_guessing \ref interface
 TEST_CASE("Random access iterator support") {
-    for (auto concurrency_level : utils::concurrency_range()) {
+    for ( auto concurrency_level : utils::concurrency_range() ) {
         tbb::global_control control(tbb::global_control::max_allowed_parallelism, concurrency_level);
-        for (size_t depth = 0; depth <= depths_nubmer; ++depth) {
+        for(size_t depth = 0; depth <= depths_nubmer; ++depth) {
             g_tasks_expected = 0;
-            for (size_t i = 0; i < depth; ++i) g_tasks_expected += FindNumOfTasks(g_depths[i].value());
+            for (size_t i=0; i < depth; ++i)
+                g_tasks_expected += FindNumOfTasks(g_depths[i].value());
             TestIterator_Modifiable<value_t*>(depth);
         }
     }
@@ -51,37 +152,40 @@ TEST_CASE("Random access iterator support") {
 //! Test const random access iterator support
 //! \brief \ref error_guessing \ref interface
 TEST_CASE("Const random access iterator support") {
-    for (auto concurrency_level : utils::concurrency_range()) {
+    for ( auto concurrency_level : utils::concurrency_range() ) {
         tbb::global_control control(tbb::global_control::max_allowed_parallelism, concurrency_level);
-        for (size_t depth = 0; depth <= depths_nubmer; ++depth) {
+        for(size_t depth = 0; depth <= depths_nubmer; ++depth) {
             g_tasks_expected = 0;
-            for (size_t i = 0; i < depth; ++i) g_tasks_expected += FindNumOfTasks(g_depths[i].value());
+            for (size_t i=0; i < depth; ++i)
+                g_tasks_expected += FindNumOfTasks(g_depths[i].value());
             TestIterator_Const<utils::ConstRandomIterator<value_t>>(depth);
         }
     }
+
 }
 
 //! Test container based overload
 //! \brief \ref error_guessing \ref interface
 TEST_CASE("Container based overload - forward iterator based container") {
-    container_based_overload_test_case<utils::ForwardIterator>(/*expected_value*/ 1);
+    container_based_overload_test_case<utils::ForwardIterator>(/*expected_value*/1);
 }
 
 //! Test container based overload
 //! \brief \ref error_guessing \ref interface
 TEST_CASE("Container based overload - random access iterator based container") {
-    container_based_overload_test_case<utils::RandomIterator>(/*expected_value*/ 1);
+    container_based_overload_test_case<utils::RandomIterator>(/*expected_value*/1);
 }
 
 // Test for iterators over values convertible to work item type
 //! \brief \ref error_guessing \ref interface
 TEST_CASE("Using with values convertible to work item type") {
-    for (auto concurrency_level : utils::concurrency_range()) {
+    for ( auto concurrency_level : utils::concurrency_range() ) {
         tbb::global_control control(tbb::global_control::max_allowed_parallelism, concurrency_level);
         using Iterator = size_t*;
-        for (size_t depth = 0; depth <= depths_nubmer; ++depth) {
+        for(size_t depth = 0; depth <= depths_nubmer; ++depth) {
             g_tasks_expected = 0;
-            for (size_t i = 0; i < depth; ++i) g_tasks_expected += FindNumOfTasks(g_depths[i].value());
+            for (size_t i=0; i < depth; ++i)
+                g_tasks_expected += FindNumOfTasks(g_depths[i].value());
             // Test for iterators over values convertible to work item type
             TestIterator_Common<Iterator>(depth);
             TestBody<FakeTaskGeneratorBody_RvalueRefVersion, Iterator>(depth);
@@ -97,7 +201,9 @@ TEST_CASE("That all workers sleep when no work") {
     std::vector<std::size_t> vec(N, 0);
 
     tbb::parallel_for_each(vec.begin(), vec.end(), [&](std::size_t& in) {
-        for (int i = 0; i < 1000; ++i) { ++in; }
+        for (int i = 0; i < 1000; ++i) {
+            ++in;
+        }
     });
     TestCPUUserTime(utils::get_platform_max_threads());
 }
@@ -105,44 +211,43 @@ TEST_CASE("That all workers sleep when no work") {
 #if __TBB_CPP20_CONCEPTS_PRESENT
 
 template <typename Iterator, typename Body>
-concept can_call_parallel_for_each_with_iterator
-        = requires(Iterator it, const Body& body, tbb::task_group_context ctx) {
+concept can_call_parallel_for_each_with_iterator = requires( Iterator it, const Body& body, tbb::task_group_context ctx ) {
     tbb::parallel_for_each(it, it, body);
     tbb::parallel_for_each(it, it, body, ctx);
 };
 
 template <typename ContainerBasedSequence, typename Body>
-concept can_call_parallel_for_each_with_cbs
-        = requires(ContainerBasedSequence cbs, const ContainerBasedSequence const_cbs, const Body& body,
-                   tbb::task_group_context ctx) {
+concept can_call_parallel_for_each_with_cbs = requires( ContainerBasedSequence cbs,
+                                                        const ContainerBasedSequence const_cbs,
+                                                        const Body& body, tbb::task_group_context ctx ) {
     tbb::parallel_for_each(cbs, body);
     tbb::parallel_for_each(cbs, body, ctx);
     tbb::parallel_for_each(const_cbs, body);
     tbb::parallel_for_each(const_cbs, body, ctx);
 };
 
+using CorrectCBS = test_concepts::container_based_sequence::Correct;
+
 template <typename Body>
-concept can_call_parallel_for_each
-        = can_call_parallel_for_each_with_iterator<test_concepts::container_based_sequence::iterator, Body>&&
-                can_call_parallel_for_each_with_cbs<test_concepts::container_based_sequence::Correct, Body>;
+concept can_call_parallel_for_each =
+    can_call_parallel_for_each_with_iterator<CorrectCBS::iterator, Body> &&
+    can_call_parallel_for_each_with_cbs<CorrectCBS, Body>;
 
 template <typename Iterator>
 using CorrectBody = test_concepts::parallel_for_each_body::Correct<decltype(*std::declval<Iterator>())>;
 
 void test_pfor_each_iterator_constraints() {
-    using CorrectIterator = typename std::vector<int>::iterator;// random_access_iterator
-    using IncorrectIterator = std::ostream_iterator<int>;       // output_iterator
+    using CorrectIterator = typename std::vector<int>::iterator; // random_access_iterator
+    using IncorrectIterator = std::ostream_iterator<int>; // output_iterator
     static_assert(can_call_parallel_for_each_with_iterator<CorrectIterator, CorrectBody<CorrectIterator>>);
-    static_assert(
-            !can_call_parallel_for_each_with_iterator<IncorrectIterator, CorrectBody<IncorrectIterator>>);
+    static_assert(!can_call_parallel_for_each_with_iterator<IncorrectIterator, CorrectBody<IncorrectIterator>>);
 }
 
 void test_pfor_each_container_based_sequence_constraints() {
     using namespace test_concepts::container_based_sequence;
-    using iterator = test_concepts::container_based_sequence::iterator;
-    static_assert(can_call_parallel_for_each_with_cbs<Correct, CorrectBody<iterator>>);
-    static_assert(!can_call_parallel_for_each_with_cbs<NoBegin, CorrectBody<iterator>>);
-    static_assert(!can_call_parallel_for_each_with_cbs<NoEnd, CorrectBody<iterator>>);
+    static_assert(can_call_parallel_for_each_with_cbs<Correct, CorrectBody<Correct::iterator>>);
+    static_assert(!can_call_parallel_for_each_with_cbs<NoBegin, CorrectBody<NoBegin::iterator>>);
+    static_assert(!can_call_parallel_for_each_with_cbs<NoEnd, CorrectBody<NoEnd::iterator>>);
 }
 
 void test_pfor_each_body_constraints() {
@@ -165,4 +270,62 @@ TEST_CASE("parallel_for_each constraints") {
     test_pfor_each_body_constraints();
 }
 
-#endif// __TBB_CPP20_CONCEPTS_PRESENT
+struct no_copy_move {
+    no_copy_move() = default;
+
+    no_copy_move(const no_copy_move&) = delete;
+    no_copy_move(no_copy_move&&) = delete;
+
+    no_copy_move& operator=(const no_copy_move&) = delete;
+    no_copy_move& operator=(no_copy_move&&) = delete;
+
+    int item = 0;
+};
+
+template <typename Category>
+void test_with_cpp20_iterator() {
+    constexpr std::size_t n = 1'000'000;
+
+    std::vector<no_copy_move> elements(n);
+
+    cpp20_iterator<no_copy_move, Category> begin(elements.data());
+    cpp20_iterator<no_copy_move, Category> end(elements.data() + n);
+
+    oneapi::tbb::parallel_for_each(begin, end, [](no_copy_move& element) {
+        element.item = 42;
+    });
+
+    for (std::size_t index = 0; index < n; ++index) {
+        CHECK(elements[index].item == 42);
+    }
+}
+
+//! \brief \ref error_guessing \ref regression
+TEST_CASE("parallel_for_each with cpp20 iterator") {
+    // Test that parallel_for_each threats ignores iterator_category type
+    // if iterator_concept type is defined for iterator
+
+    // For input iterators parallel_for_each requires element to be
+    // copyable or movable so since cpp20_iterator is at least forward
+    // parallel_for_each should work with cpp20_iterator
+    // on non-copyable and non-movable type
+
+    // test cpp20_iterator implementation
+    using cpp20_forward_iterator = cpp20_iterator<int, std::forward_iterator_tag>;
+    using cpp20_bidirectional_iterator = cpp20_iterator<int, std::bidirectional_iterator_tag>;
+    using cpp20_random_access_iterator = cpp20_iterator<int, std::random_access_iterator_tag>;
+
+    static_assert(std::forward_iterator<cpp20_forward_iterator>);
+    static_assert(!std::bidirectional_iterator<cpp20_forward_iterator>);
+
+    static_assert(std::bidirectional_iterator<cpp20_bidirectional_iterator>);
+    static_assert(!std::random_access_iterator<cpp20_bidirectional_iterator>);
+
+    static_assert(std::random_access_iterator<cpp20_random_access_iterator>);
+
+    test_with_cpp20_iterator<std::forward_iterator_tag>();
+    test_with_cpp20_iterator<std::bidirectional_iterator_tag>();
+    test_with_cpp20_iterator<std::random_access_iterator_tag>();
+}
+
+#endif // __TBB_CPP20_CONCEPTS_PRESENT
diff --git a/external/tbb/test/tbb/test_parallel_invoke.cpp b/external/tbb/test/tbb/test_parallel_invoke.cpp
index f23652a2..6c94e3bc 100644
--- a/external/tbb/test/tbb/test_parallel_invoke.cpp
+++ b/external/tbb/test/tbb/test_parallel_invoke.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2020-2021 Intel Corporation
+    Copyright (c) 2020-2023 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -14,24 +14,26 @@
     limitations under the License.
 */
 
-#include "common/cpu_usertime.h"
-#include "common/memory_usage.h"
-#include "common/parallel_invoke_common.h"
 #include "common/test.h"
 #include "common/utils.h"
+#include "common/cpu_usertime.h"
 #include "common/utils_concurrency_limit.h"
+#include "common/parallel_invoke_common.h"
+#include "common/memory_usage.h"
 
-#include <atomic>
 #include <cstddef>
+#include <atomic>
 
 //! \file test_parallel_invoke.cpp
 //! \brief Test for [algorithms.parallel_invoke]
 
+#if !EMSCRIPTEN
+//! Emscripten requires preloading of the file used to determine memory usage, hence disabled.
 //! Testing parallel_invoke memory usage
 //! \brief \ref resource_usage \ref stress
 TEST_CASE("Test memory leaks") {
     std::size_t number_of_measurements = 500;
-    std::size_t current_memory_usage = 0, max_memory_usage = 0, stability_counter = 0;
+    std::size_t current_memory_usage = 0, max_memory_usage = 0, stability_counter=0;
 
     // Limit concurrency to prevent extra allocations not dependent on algorithm behavior
     auto concurrency_limit = utils::get_platform_max_threads() < 8 ? utils::get_platform_max_threads() : 8;
@@ -40,7 +42,7 @@ TEST_CASE("Test memory leaks") {
     for (std::size_t i = 0; i < number_of_measurements; i++) {
         {
             // ~45000 workload tasks
-            invoke_tree</*LevelTaskCount*/ 6, /*Depth*/ 6, /*WorkSize*/ 10>::generate_and_run();
+            invoke_tree</*LevelTaskCount*/6, /*Depth*/6, /*WorkSize*/10>::generate_and_run();
         }
 
         current_memory_usage = utils::GetMemoryUsage();
@@ -56,8 +58,9 @@ TEST_CASE("Test memory leaks") {
     }
     REQUIRE_MESSAGE(false, "Seems like we get memory leak here.");
 }
+#endif
 
-template <typename Body>
+template<typename Body>
 void test_from_2_to_10_arguments(const Body& body, const std::atomic<std::size_t>& counter) {
     tbb::parallel_invoke(body, body);
     tbb::parallel_invoke(body, body, body);
@@ -70,19 +73,19 @@ void test_from_2_to_10_arguments(const Body& body, const std::atomic<std::size_t
     tbb::parallel_invoke(body, body, body, body, body, body, body, body, body, body);
 
     REQUIRE_MESSAGE(counter == (2 + 10) * 9 / 2,
-                    "Parallel invoke correctness was broken during lambda support test execution.");
+        "Parallel invoke correctness was broken during lambda support test execution.");
 }
 
 //! Testing lambdas support
 //! \brief \ref error_guessing
 TEST_CASE("Test lambda support") {
-    std::atomic<std::size_t> lambda_counter {0};
-    auto body = [&] { lambda_counter++; };
+    std::atomic<std::size_t> lambda_counter{0};
+    auto body = [&]{ lambda_counter++; };
 
     test_from_2_to_10_arguments(body, lambda_counter);
 }
 
-std::atomic<std::size_t> func_counter {0};
+std::atomic<std::size_t> func_counter{0};
 void func() { func_counter++; };
 
 //! Testing function pointers support
@@ -95,6 +98,6 @@ TEST_CASE("Test function pointers support") {
 //! Testing workers going to sleep
 //! \brief \ref error_guessing
 TEST_CASE("Test that all workers sleep when no work") {
-    invoke_tree</*LevelTaskCount*/ 9, /*Depth*/ 6, /*WorkSize*/ 10>::generate_and_run();
+    invoke_tree</*LevelTaskCount*/9, /*Depth*/6, /*WorkSize*/10>::generate_and_run();
     TestCPUUserTime(utils::get_platform_max_threads());
 }
diff --git a/external/tbb/test/tbb/test_parallel_phase.cpp b/external/tbb/test/tbb/test_parallel_phase.cpp
new file mode 100644
index 00000000..d242c5b3
--- /dev/null
+++ b/external/tbb/test/tbb/test_parallel_phase.cpp
@@ -0,0 +1,355 @@
+/*
+    Copyright (c) 2025 Intel Corporation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+//! \file test_parallel_phase.cpp
+//! \brief Test for [preview] functionality
+
+#define TBB_PREVIEW_PARALLEL_PHASE 1
+
+#include <chrono>
+
+#include "common/test.h"
+#include "common/utils.h"
+#include "common/utils_concurrency_limit.h"
+#include "common/spin_barrier.h"
+
+#include "tbb/task_arena.h"
+
+void active_wait_for(std::chrono::microseconds duration) {
+    for (auto t1 = std::chrono::steady_clock::now(), t2 = t1;
+        std::chrono::duration_cast<std::chrono::microseconds>(t2 - t1) < duration;
+        t2 = std::chrono::steady_clock::now())
+    {
+        utils::doDummyWork(100);
+    }
+}
+
+struct dummy_func {
+    void operator()() const {
+    }
+};
+
+template <typename F1 = dummy_func, typename F2 = dummy_func>
+std::size_t measure_median_start_time(tbb::task_arena* ta, const F1& start = F1{}, const F2& end = F2{}) {
+    std::size_t num_threads = ta ? ta->max_concurrency() : tbb::this_task_arena::max_concurrency();
+    std::size_t num_runs = 500;
+    std::vector<std::size_t> longest_start_times;
+    longest_start_times.reserve(num_runs);
+
+    std::vector<std::chrono::steady_clock::time_point> start_times(num_threads);
+    utils::SpinBarrier barrier(num_threads);
+    auto measure_start_time = [&] {
+        start_times[tbb::this_task_arena::current_thread_index()] = std::chrono::steady_clock::now();
+        barrier.wait();
+    };
+
+    auto get_longest_start = [&] (std::chrono::steady_clock::time_point start_time) {
+        std::size_t longest_time = 0;
+        for (auto& time : start_times) {
+            auto diff = std::chrono::duration_cast<std::chrono::microseconds>(time - start_time);
+            longest_time = std::max(longest_time, std::size_t(diff.count()));
+        }
+        return longest_time;
+    };
+
+    auto work = [&] {
+        auto start_time = std::chrono::steady_clock::now();
+        start();
+        for(std::size_t thr = 0; thr < num_threads-1; ++thr) {
+            tbb::this_task_arena::enqueue(measure_start_time);
+        }
+        start_times[tbb::this_task_arena::current_thread_index()] = std::chrono::steady_clock::now();
+        barrier.wait();
+        end();
+        longest_start_times.push_back(get_longest_start(start_time));
+    };
+
+    for (std::size_t i = 1; i < num_runs; ++i) {
+        if (ta) {
+            ta->execute(work);
+        } else {
+            work();
+        }
+        active_wait_for(std::chrono::microseconds(i*2));
+    }
+    return utils::median(longest_start_times.begin(), longest_start_times.end());
+}
+
+template <typename Impl>
+class start_time_collection_base {
+    friend Impl;
+public:
+    start_time_collection_base(tbb::task_arena& ta, std::size_t ntrials) :
+        arena(&ta), num_trials(ntrials), start_times(ntrials) {}
+
+    explicit start_time_collection_base(std::size_t ntrials) :
+        arena(nullptr), num_trials(ntrials), start_times(ntrials) {}
+
+    std::vector<std::size_t> measure() {
+        for (std::size_t i = 0; i < num_trials; ++i) {
+            std::size_t median_start_time = static_cast<Impl*>(this)->measure_impl();
+            start_times[i] = median_start_time;
+        }
+        return start_times;
+    }
+protected:
+    tbb::task_arena* arena;
+    std::size_t num_trials;
+    std::vector<std::size_t> start_times;
+};
+
+class start_time_collection : public start_time_collection_base<start_time_collection> {
+    using base = start_time_collection_base<start_time_collection>;
+    using base::base;
+    friend base;
+
+    std::size_t measure_impl() {
+        return measure_median_start_time(arena);
+    }
+};
+
+class start_time_collection_phase_wrapped
+    : public start_time_collection_base<start_time_collection_phase_wrapped>
+{
+    using base = start_time_collection_base<start_time_collection_phase_wrapped>;
+    using base::base;
+    friend base;
+
+    std::size_t measure_impl() {
+        arena->start_parallel_phase();
+        auto median_start_time = measure_median_start_time(arena);
+        arena->end_parallel_phase(/*with_fast_leave*/true);
+        return median_start_time;
+    }
+};
+
+class start_time_collection_scoped_phase_wrapped
+    : public start_time_collection_base<start_time_collection_scoped_phase_wrapped>
+{
+    using base = start_time_collection_base<start_time_collection_scoped_phase_wrapped>;
+    using base::base;
+    friend base;
+
+    std::size_t measure_impl() {
+        tbb::task_arena::scoped_parallel_phase phase{*arena};
+        auto median_start_time = measure_median_start_time(arena);
+        return median_start_time;
+    }
+};
+
+class start_time_collection_sequenced_phases
+    : public start_time_collection_base<start_time_collection_sequenced_phases>
+{
+    using base = start_time_collection_base<start_time_collection_sequenced_phases>;
+    friend base;
+
+    bool with_fast_leave;
+
+    std::size_t measure_impl() {
+        std::size_t median_start_time;
+        utils::SpinBarrier barrier;
+        auto body = [&] {
+            barrier.wait();
+        };
+        if (arena) {
+            barrier.initialize(arena->max_concurrency());
+            median_start_time = measure_median_start_time(arena,
+                [&] {
+                    std::size_t num_threads = arena->max_concurrency();
+                    arena->start_parallel_phase();
+                    arena->execute([&] {
+                        for(std::size_t thr = 0; thr < num_threads-1; ++thr) {
+                            tbb::this_task_arena::enqueue(body);
+                        }
+                        barrier.wait();
+                    });
+                    arena->end_parallel_phase(with_fast_leave);
+                }
+            );
+        } else {
+            barrier.initialize(tbb::this_task_arena::max_concurrency());
+            median_start_time = measure_median_start_time(arena,
+                [&] {
+                    std::size_t num_threads = tbb::this_task_arena::max_concurrency();
+                    tbb::this_task_arena::start_parallel_phase();
+                    for(std::size_t thr = 0; thr < num_threads-1; ++thr) {
+                        tbb::this_task_arena::enqueue(body);
+                    }
+                    barrier.wait();
+                    tbb::this_task_arena::end_parallel_phase(with_fast_leave); 
+                }
+            );
+        }
+        return median_start_time;
+    }
+
+public:
+    start_time_collection_sequenced_phases(tbb::task_arena& ta, std::size_t ntrials, bool fast_leave = false) :
+        base(ta, ntrials), with_fast_leave(fast_leave)
+    {}
+
+    explicit start_time_collection_sequenced_phases(std::size_t ntrials, bool fast_leave = false) :
+        base(ntrials), with_fast_leave(fast_leave)
+    {}
+};
+
+class start_time_collection_sequenced_scoped_phases
+    : public start_time_collection_base<start_time_collection_sequenced_scoped_phases>
+{
+    using base = start_time_collection_base<start_time_collection_sequenced_scoped_phases>;
+    friend base;
+
+    bool with_fast_leave;
+
+    std::size_t measure_impl() {
+        utils::SpinBarrier barrier{static_cast<std::size_t>(arena->max_concurrency())};
+        auto body = [&] {
+            barrier.wait();
+        };
+        auto median_start_time = measure_median_start_time(arena,
+            [&] {
+                std::size_t num_threads = arena->max_concurrency();
+                {
+                    tbb::task_arena::scoped_parallel_phase phase{*arena, with_fast_leave};
+                    arena->execute([&] {
+                        for(std::size_t thr = 0; thr < num_threads-1; ++thr) {
+                            tbb::this_task_arena::enqueue(body);
+                        }
+                        barrier.wait();
+                    });
+                }
+            }
+        );
+        return median_start_time;
+    }
+
+public:
+    start_time_collection_sequenced_scoped_phases(tbb::task_arena& ta, std::size_t ntrials, bool fast_leave = false) :
+        base(ta, ntrials), with_fast_leave(fast_leave)
+    {}
+
+    explicit start_time_collection_sequenced_scoped_phases(std::size_t ntrials, bool fast_leave = false) :
+        base(ntrials), with_fast_leave(fast_leave)
+    {}
+};
+
+//! \brief \ref interface \ref requirement
+TEST_CASE("Check that workers leave faster with leave_policy::fast") {
+    // Test measures workers start time, so no there is no point to
+    // measure it with workerless arena
+    if (utils::get_platform_max_threads() < 2) {
+        return;
+    }
+    tbb::task_arena ta_automatic_leave {
+        tbb::task_arena::automatic, 1,
+        tbb::task_arena::priority::normal,
+        tbb::task_arena::leave_policy::automatic
+    };
+    tbb::task_arena ta_fast_leave { 
+        tbb::task_arena::automatic, 1,
+        tbb::task_arena::priority::normal,
+        tbb::task_arena::leave_policy::fast
+    };
+    start_time_collection st_collector1{ta_automatic_leave, /*num_trials=*/5};
+    start_time_collection st_collector2{ta_fast_leave, /*num_trials=*/5};
+
+    auto times_automatic = st_collector1.measure();
+    auto times_fast = st_collector2.measure();
+
+    auto median_automatic = utils::median(times_automatic.begin(), times_automatic.end());
+    auto median_fast = utils::median(times_fast.begin(), times_fast.end());
+
+    WARN_MESSAGE(median_automatic < median_fast,
+        "Expected workers to start new work slower with fast leave policy");
+}
+
+//! \brief \ref interface \ref requirement
+TEST_CASE("Parallel Phase retains workers in task_arena") {
+    if (utils::get_platform_max_threads() < 2) {
+        return;
+    }
+    tbb::task_arena ta_fast1 {
+        tbb::task_arena::automatic, 1,
+        tbb::task_arena::priority::normal,
+        tbb::task_arena::leave_policy::fast
+    };
+    tbb::task_arena ta_fast2 { 
+        tbb::task_arena::automatic, 1,
+        tbb::task_arena::priority::normal,
+        tbb::task_arena::leave_policy::fast
+    };
+    start_time_collection_phase_wrapped st_collector1{ta_fast1, /*num_trials=*/5};
+    start_time_collection_scoped_phase_wrapped st_collector_scoped{ta_fast1, /*num_trials=*/5};
+    start_time_collection st_collector2{ta_fast2, /*num_trials=*/5};
+
+    auto times1 = st_collector1.measure();
+    auto times2 = st_collector2.measure();
+    auto times_scoped = st_collector_scoped.measure();
+
+    auto median1 = utils::median(times1.begin(), times1.end());
+    auto median2 = utils::median(times2.begin(), times2.end());
+    auto median_scoped = utils::median(times_scoped.begin(), times_scoped.end());
+
+    WARN_MESSAGE(median1 < median2,
+        "Expected workers start new work faster when using parallel_phase");
+
+    WARN_MESSAGE(median_scoped < median2,
+        "Expected workers start new work faster when using scoped parallel_phase");
+}
+
+//! \brief \ref interface \ref requirement
+TEST_CASE("Test one-time fast leave") {
+    if (utils::get_platform_max_threads() < 2) {
+        return;
+    }
+    tbb::task_arena ta1{};
+    tbb::task_arena ta2{};
+    start_time_collection_sequenced_phases st_collector1{ta1, /*num_trials=*/10};
+    start_time_collection_sequenced_phases st_collector2{ta2, /*num_trials=*/10, /*fast_leave*/true};
+    start_time_collection_sequenced_scoped_phases st_collector_scoped{ta2, /*num_trials=*/10, /*fast_leave*/true};
+
+    auto times1 = st_collector1.measure();
+    auto times2 = st_collector2.measure();
+    auto times_scoped = st_collector_scoped.measure();
+
+    auto median1 = utils::median(times1.begin(), times1.end());
+    auto median2 = utils::median(times2.begin(), times2.end());
+    auto median_scoped = utils::median(times_scoped.begin(), times_scoped.end());
+
+    WARN_MESSAGE(median1 < median2,
+        "Expected one-time fast leave setting to slow workers to start new work");
+
+    WARN_MESSAGE(median1 < median_scoped,
+        "Expected one-time fast leave setting to slow workers to start new work");
+}
+
+//! \brief \ref interface \ref requirement
+TEST_CASE("Test parallel phase with this_task_arena") {
+    if (utils::get_platform_max_threads() < 2) {
+        return;
+    }
+    start_time_collection_sequenced_phases st_collector1{/*num_trials=*/10};
+    start_time_collection_sequenced_phases st_collector2{/*num_trials=*/10, /*fast_leave*/true};
+
+    auto times1 = st_collector1.measure();
+    auto times2 = st_collector2.measure();
+
+    auto median1 = utils::median(times1.begin(), times1.end());
+    auto median2 = utils::median(times2.begin(), times2.end());
+
+    WARN_MESSAGE(median1 < median2,
+        "Expected one-time fast leave setting to slow workers to start new work");
+}
diff --git a/external/tbb/test/tbb/test_parallel_pipeline.cpp b/external/tbb/test/tbb/test_parallel_pipeline.cpp
index 8776a824..e389412e 100644
--- a/external/tbb/test/tbb/test_parallel_pipeline.cpp
+++ b/external/tbb/test/tbb/test_parallel_pipeline.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -16,20 +16,20 @@
 
 // Before including parallel_pipeline.h, set up the variable to count heap allocated
 // filter_node objects, and make it known for the header.
-#include "common/checktype.h"
 #include "common/test.h"
 #include "common/utils.h"
+#include "common/checktype.h"
 
 int filter_node_count = 0;
 #define __TBB_TEST_FILTER_NODE_COUNT filter_node_count
-#include "tbb/global_control.h"
 #include "tbb/parallel_pipeline.h"
+#include "tbb/global_control.h"
 #include "tbb/spin_mutex.h"
 #include "tbb/task_group.h"
 
 #include <atomic>
-#include <memory>// std::unique_ptr
 #include <string.h>
+#include <memory> // std::unique_ptr
 
 //! \file test_parallel_pipeline.cpp
 //! \brief Test for [algorithms.parallel_pipeline algorithms.parallel_pipeline.flow_control] specification
@@ -37,7 +37,7 @@ int filter_node_count = 0;
 const unsigned n_tokens = 8;
 // we can conceivably have two buffers used in the middle filter for every token in flight, so
 // we must allocate two buffers for every token.  Unlikely, but possible.
-const unsigned n_buffers = 2 * n_tokens;
+const unsigned n_buffers = 2*n_tokens;
 const int max_counter = 16;
 
 static std::size_t concurrency = 0;
@@ -49,22 +49,24 @@ static std::atomic<int> pointer_specialized_calls;
 static std::atomic<int> first_pointer_specialized_calls;
 static std::atomic<int> second_pointer_specialized_calls;
 
-static int intbuffer[max_counter];// store results for <int,int> parallel pipeline test
+static int intbuffer[max_counter];  // store results for <int,int> parallel pipeline test
 static bool check_intbuffer;
 
 static void* buffers[n_buffers];
 static std::atomic_flag buf_in_use[n_buffers] = {ATOMIC_FLAG_INIT};
 
-void* fetchNextBuffer() {
-    for (size_t icnt = 0; icnt < n_buffers; ++icnt) {
-        if (!buf_in_use[icnt].test_and_set()) { return buffers[icnt]; }
+void *fetchNextBuffer() {
+    for(size_t icnt = 0; icnt < n_buffers; ++icnt) {
+        if(!buf_in_use[icnt].test_and_set()) {
+            return buffers[icnt];
+        }
     }
-    CHECK_MESSAGE(false, "Ran out of buffers, p:" << concurrency);
-    return 0;
+    CHECK_MESSAGE(false, "Ran out of buffers, p:"<< concurrency);
+    return nullptr;
 }
-void freeBuffer(void* buf) {
-    for (size_t i = 0; i < n_buffers; ++i) {
-        if (buffers[i] == buf) {
+void freeBuffer(void *buf) {
+    for(size_t i=0; i < n_buffers;++i) {
+        if(buffers[i] == buf) {
             buf_in_use[i].clear();
             return;
         }
@@ -72,102 +74,79 @@ void freeBuffer(void* buf) {
     CHECK_MESSAGE(false, "Tried to free a buffer not in our list, p:" << concurrency);
 }
 
-template <typename T>
+template<typename T>
 class free_on_scope_exit {
 public:
-    free_on_scope_exit(T* p) : my_p(p) {}
-    ~free_on_scope_exit() {
-        if (!my_p) return;
-        my_p->~T();
-        freeBuffer(my_p);
-    }
-
+    free_on_scope_exit(T *p) : my_p(p) {}
+    ~free_on_scope_exit() { if(!my_p) return; my_p->~T(); freeBuffer(my_p); }
 private:
-    T* my_p;
+    T *my_p;
 };
 
 // methods for testing CheckType< >, that return okay values for other types.
-template <typename T>
-bool middle_is_ready(T& /*p*/) {
-    return false;
-}
+template<typename T>
+bool middle_is_ready(T &/*p*/) { return false; }
 
-template <typename U>
-bool middle_is_ready(CheckType<U>& p) {
-    return p.is_ready();
-}
+template<typename U>
+bool middle_is_ready(CheckType<U> &p) { return p.is_ready(); }
 
-template <typename T>
-bool output_is_ready(T& /*p*/) {
-    return true;
-}
+template<typename T>
+bool output_is_ready(T &/*p*/) { return true; }
 
-template <typename U>
-bool output_is_ready(CheckType<U>& p) {
-    return p.is_ready();
-}
+template<typename U>
+bool output_is_ready(CheckType<U> &p) { return p.is_ready(); }
 
-template <typename T>
-int middle_my_id(T& /*p*/) {
-    return 0;
-}
+template<typename T>
+int middle_my_id( T &/*p*/) { return 0; }
 
-template <typename U>
-int middle_my_id(CheckType<U>& p) {
-    return p.id();
-}
+template<typename U>
+int middle_my_id(CheckType<U> &p) { return p.id(); }
 
-template <typename T>
-int output_my_id(T& /*p*/) {
-    return 1;
-}
+template<typename T>
+int output_my_id( T &/*p*/) { return 1; }
 
-template <typename U>
-int output_my_id(CheckType<U>& p) {
-    return p.id();
-}
+template<typename U>
+int output_my_id(CheckType<U> &p) { return p.id(); }
 
-template <typename T>
-void my_function(T& p) {
-    p = 0;
-}
+template<typename T>
+void my_function(T &p) { p = 0; }
 
-template <typename U>
-void my_function(CheckType<U>& p) {
-    p.get_ready();
-}
+template<typename U>
+void my_function(CheckType<U> &p) { p.get_ready(); }
 
 // Filters must be copy-constructible, and be const-qualifiable.
-template <typename U>
+template<typename U>
 class input_filter : DestroyedTracker {
 public:
-    U operator()(tbb::flow_control& control) const {
+    U operator()( tbb::flow_control& control ) const {
         CHECK(is_alive());
-        if (--input_counter < 0) {
+        if( --input_counter < 0 ) {
             control.stop();
-        } else// only count successful reads
+        }
+        else  // only count successful reads
             ++non_pointer_specialized_calls;
-        return U();// default constructed
+        return U();  // default constructed
     }
+
 };
 
 // specialization for pointer
-template <typename U>
+template<typename U>
 class input_filter<U*> : DestroyedTracker {
 public:
     U* operator()(tbb::flow_control& control) const {
         CHECK(is_alive());
         int ival = --input_counter;
-        if (ival < 0) {
+        if(ival < 0) {
             control.stop();
             return nullptr;
         }
         ++pointer_specialized_calls;
-        if (ival == max_counter / 2) {
-            return nullptr;// non-stop NULL
+        if(ival == max_counter / 2) {
+            return nullptr;  // non-stop nullptr
         }
-        U* myReturn = new (fetchNextBuffer()) U();
-        if (myReturn) {// may have been passed in a NULL
+        U* myReturn = new(fetchNextBuffer()) U();
+        if (myReturn) {  // may have been passed in a nullptr
             CHECK_MESSAGE(!middle_my_id(*myReturn), "bad id value, p:" << concurrency);
             CHECK_MESSAGE(!middle_is_ready(*myReturn), "Already ready, p:" << concurrency);
         }
@@ -175,40 +154,44 @@ class input_filter<U*> : DestroyedTracker {
     }
 };
 
-template <>
+template<>
 class input_filter<void> : DestroyedTracker {
 public:
-    void operator()(tbb::flow_control& control) const {
+    void operator()( tbb::flow_control& control ) const {
         CHECK(is_alive());
-        if (--input_counter < 0) {
+        if( --input_counter < 0 ) {
             control.stop();
-        } else
+        }
+        else
             ++non_pointer_specialized_calls;
     }
+
 };
 
 // specialization for int that passes back a sequence of integers
-template <>
+template<>
 class input_filter<int> : DestroyedTracker {
 public:
-    int operator()(tbb::flow_control& control) const {
+    int
+    operator()(tbb::flow_control& control ) const {
         CHECK(is_alive());
         int oldval = --input_counter;
-        if (oldval < 0) {
+        if( oldval < 0 ) {
             control.stop();
-        } else
+        }
+        else
             ++non_pointer_specialized_calls;
-        return oldval + 1;
+        return oldval+1;
     }
 };
 
-template <typename T, typename U>
+template<typename T, typename U>
 class middle_filter : DestroyedTracker {
 public:
     U operator()(T t) const {
         CHECK(is_alive());
         CHECK_MESSAGE(!middle_my_id(t), "bad id value, p:" << concurrency);
-        CHECK_MESSAGE(!middle_is_ready(t), "Already ready, p:" << concurrency);
+        CHECK_MESSAGE(!middle_is_ready(t), "Already ready, p:" << concurrency );
         U out;
         my_function(out);
         ++non_pointer_specialized_calls;
@@ -216,15 +199,15 @@ class middle_filter : DestroyedTracker {
     }
 };
 
-template <typename T, typename U>
-class middle_filter<T*, U> : DestroyedTracker {
+template<typename T, typename U>
+class middle_filter<T*,U> : DestroyedTracker {
 public:
     U operator()(T* my_storage) const {
-        free_on_scope_exit<T> my_ptr(my_storage);// free_on_scope_exit marks the buffer available
+        free_on_scope_exit<T> my_ptr(my_storage);  // free_on_scope_exit marks the buffer available
         CHECK(is_alive());
-        if (my_storage) {// may have been passed in a NULL
+        if(my_storage) {  // may have been passed in a nullptr
             CHECK_MESSAGE(!middle_my_id(*my_storage), "bad id value, p:" << concurrency);
-            CHECK_MESSAGE(!middle_is_ready(*my_storage), "Already ready, p:" << concurrency);
+            CHECK_MESSAGE(!middle_is_ready(*my_storage), "Already ready, p:" << concurrency );
         }
         ++first_pointer_specialized_calls;
         U out;
@@ -233,55 +216,55 @@ class middle_filter<T*, U> : DestroyedTracker {
     }
 };
 
-template <typename T, typename U>
-class middle_filter<T, U*> : DestroyedTracker {
+template<typename T, typename U>
+class middle_filter<T,U*> : DestroyedTracker {
 public:
     U* operator()(T my_storage) const {
         CHECK(is_alive());
         CHECK_MESSAGE(!middle_my_id(my_storage), "bad id value, p:" << concurrency);
-        CHECK_MESSAGE(!middle_is_ready(my_storage), "Already ready, p:" << concurrency);
+        CHECK_MESSAGE(!middle_is_ready(my_storage), "Already ready, p:" << concurrency );
         // allocate new space from buffers
-        U* my_return = new (fetchNextBuffer()) U();
+        U* my_return = new(fetchNextBuffer()) U();
         my_function(*my_return);
         ++second_pointer_specialized_calls;
         return my_return;
     }
 };
 
-template <typename T, typename U>
-class middle_filter<T*, U*> : DestroyedTracker {
+template<typename T, typename U>
+class middle_filter<T*,U*> : DestroyedTracker {
 public:
     U* operator()(T* my_storage) const {
-        free_on_scope_exit<T> my_ptr(my_storage);// free_on_scope_exit marks the buffer available
+        free_on_scope_exit<T> my_ptr(my_storage);  // free_on_scope_exit marks the buffer available
         CHECK(is_alive());
-        if (my_storage) {
+        if(my_storage) {
             CHECK_MESSAGE(!middle_my_id(*my_storage), "bad id value, p:" << concurrency);
-            CHECK_MESSAGE(!middle_is_ready(*my_storage), "Already ready, p:" << concurrency);
+            CHECK_MESSAGE(!middle_is_ready(*my_storage), "Already ready, p:" << concurrency );
         }
-        // may have been passed a NULL
+        // may have been passed a nullptr
         ++pointer_specialized_calls;
-        if (!my_storage) return nullptr;
+        if(!my_storage) return nullptr;
         CHECK_MESSAGE(!middle_my_id(*my_storage), "bad id value, p:" << concurrency);
-        CHECK_MESSAGE(!middle_is_ready(*my_storage), "Already ready, p:" << concurrency);
-        U* my_return = new (fetchNextBuffer()) U();
+        CHECK_MESSAGE(!middle_is_ready(*my_storage), "Already ready, p:" << concurrency );
+        U* my_return = new(fetchNextBuffer()) U();
         my_function(*my_return);
         return my_return;
     }
 };
 
 // specialization for int that squares the input and returns that.
-template <>
-class middle_filter<int, int> : DestroyedTracker {
+template<>
+class middle_filter<int,int> : DestroyedTracker {
 public:
     int operator()(int my_input) const {
         CHECK(is_alive());
         ++non_pointer_specialized_calls;
-        return my_input * my_input;
+        return my_input*my_input;
     }
 };
 
 // ---------------------------------
-template <typename T>
+template<typename T>
 class output_filter : DestroyedTracker {
 public:
     void operator()(T c) const {
@@ -294,7 +277,7 @@ class output_filter : DestroyedTracker {
 };
 
 // specialization for int that puts the received value in an array
-template <>
+template<>
 class output_filter<int> : DestroyedTracker {
 public:
     void operator()(int my_input) const {
@@ -305,13 +288,13 @@ class output_filter<int> : DestroyedTracker {
     }
 };
 
-template <typename T>
+template<typename T>
 class output_filter<T*> : DestroyedTracker {
 public:
     void operator()(T* c) const {
         free_on_scope_exit<T> my_ptr(c);
         CHECK(is_alive());
-        if (c) {
+        if(c) {
             CHECK_MESSAGE(output_my_id(*c), "unset id value, p:" << concurrency);
             CHECK_MESSAGE(output_is_ready(*c), "not yet ready, p:" << concurrency);
         }
@@ -337,271 +320,282 @@ void resetCounters() {
     second_pointer_specialized_calls = 0;
     // we have to reset the buffer flags because our input filters return allocated space on end-of-input,
     // (on eof a default-constructed object is returned) and they do not pass through the filter further.
-    for (size_t i = 0; i < n_buffers; ++i) buf_in_use[i].clear();
+    for(size_t i = 0; i < n_buffers; ++i)
+        buf_in_use[i].clear();
 }
 
 void checkCounters(final_assert_type my_t) {
     CHECK_MESSAGE(output_counter == max_counter, "Ran out of buffers, p:" << concurrency);
-    switch (my_t) {
+    switch(my_t) {
         case assert_nonpointer:
-            CHECK_MESSAGE(pointer_specialized_calls + first_pointer_specialized_calls
-                                          + second_pointer_specialized_calls
-                                  == 0,
-                          "non-pointer filters specialized to pointer, p:" << concurrency);
-            CHECK_MESSAGE(non_pointer_specialized_calls == 3 * max_counter,
-                          "bad count for non-pointer filters, p:" << concurrency);
-            if (check_intbuffer) {
-                for (int i = 1; i <= max_counter; ++i) {
-                    int j = i * i;
+            CHECK_MESSAGE(pointer_specialized_calls+first_pointer_specialized_calls+second_pointer_specialized_calls == 0, "non-pointer filters specialized to pointer, p:" << concurrency);
+            CHECK_MESSAGE(non_pointer_specialized_calls == 3*max_counter, "bad count for non-pointer filters, p:" << concurrency);
+            if(check_intbuffer) {
+                for(int i = 1; i <= max_counter; ++i) {
+                    int j = i*i;
                     bool found_val = false;
-                    for (int k = 0; k < max_counter; ++k) {
-                        if (intbuffer[k] == j) {
+                    for(int k = 0; k < max_counter; ++k) {
+                        if(intbuffer[k] == j) {
                             found_val = true;
                             break;
                         }
                     }
-                    CHECK_MESSAGE(found_val, "Missing value in output array, p:" << concurrency);
+                    CHECK_MESSAGE(found_val, "Missing value in output array, p:" << concurrency );
                 }
             }
             break;
-        case assert_firstpointer: {
-            bool check = pointer_specialized_calls == max_counter &&// input filter extra invocation
-                         first_pointer_specialized_calls == max_counter
-                         && non_pointer_specialized_calls == max_counter
-                         && second_pointer_specialized_calls == 0;
-            CHECK_MESSAGE(check, "incorrect specialization for firstpointer, p:" << concurrency);
-        } break;
-        case assert_secondpointer: {
-            bool check = pointer_specialized_calls == max_counter && first_pointer_specialized_calls == 0
-                         && non_pointer_specialized_calls == max_counter &&// input filter
-                         second_pointer_specialized_calls == max_counter;
-            CHECK_MESSAGE(check, "incorrect specialization for firstpointer, p:" << concurrency);
-        } break;
+        case assert_firstpointer:
+            {
+                bool check = pointer_specialized_calls == max_counter &&  // input filter extra invocation
+                    first_pointer_specialized_calls == max_counter &&
+                    non_pointer_specialized_calls == max_counter &&
+                    second_pointer_specialized_calls == 0;
+                CHECK_MESSAGE(check, "incorrect specialization for firstpointer, p:" << concurrency);
+            }
+            break;
+        case assert_secondpointer:
+            {
+                bool check = pointer_specialized_calls == max_counter &&
+                    first_pointer_specialized_calls == 0 &&
+                    non_pointer_specialized_calls == max_counter &&  // input filter
+                    second_pointer_specialized_calls == max_counter;
+                CHECK_MESSAGE(check, "incorrect specialization for firstpointer, p:" << concurrency);
+            }
+            break;
         case assert_allpointer:
-            CHECK_MESSAGE(non_pointer_specialized_calls + first_pointer_specialized_calls
-                                          + second_pointer_specialized_calls
-                                  == 0,
-                          "pointer filters specialized to non-pointer, p:" << concurrency);
-            CHECK_MESSAGE(pointer_specialized_calls == 3 * max_counter,
-                          "bad count for pointer filters, p:" << concurrency);
+            CHECK_MESSAGE(non_pointer_specialized_calls+first_pointer_specialized_calls+second_pointer_specialized_calls == 0, "pointer filters specialized to non-pointer, p:" << concurrency);
+            CHECK_MESSAGE(pointer_specialized_calls == 3*max_counter, "bad count for pointer filters, p:" << concurrency);
             break;
         case no_pointer_counts:
             break;
     }
 }
 
-static const tbb::filter_mode filter_table[] = {tbb::filter_mode::parallel, tbb::filter_mode::serial_in_order,
-                                                tbb::filter_mode::serial_out_of_order};
-const unsigned number_of_filter_types = sizeof(filter_table) / sizeof(filter_table[0]);
+static const tbb::filter_mode filter_table[] = { tbb::filter_mode::parallel, tbb::filter_mode::serial_in_order, tbb::filter_mode::serial_out_of_order};
+const unsigned number_of_filter_types = sizeof(filter_table)/sizeof(filter_table[0]);
 
 using filter_chain = tbb::filter<void, void>;
-using mode_array = tbb::filter_mode;
+using mode_array =tbb::filter_mode;
 
 // The filters are passed by value, which forces a temporary copy to be created.  This is
 // to reproduce the bug where a filter_chain uses refs to filters, which after a call
 // would be references to destructed temporaries.
-template <typename type1, typename type2>
-void fill_chain(filter_chain& my_chain, mode_array* filter_type, input_filter<type1> i_filter,
-                middle_filter<type1, type2> m_filter, output_filter<type2> o_filter) {
-    my_chain = tbb::filter<void, type1>(filter_type[0], i_filter)
-               & tbb::filter<type1, type2>(filter_type[1], m_filter)
-               & tbb::filter<type2, void>(filter_type[2], o_filter);
+template<typename type1, typename type2>
+void fill_chain( filter_chain &my_chain, mode_array *filter_type, input_filter<type1> i_filter,
+         middle_filter<type1, type2> m_filter, output_filter<type2> o_filter ) {
+    my_chain = tbb::filter<void, type1>(filter_type[0], i_filter) &
+        tbb::filter<type1, type2>(filter_type[1], m_filter) &
+        tbb::filter<type2, void>(filter_type[2], o_filter);
 }
 
-template <typename... Context>
+template<typename... Context>
 void run_function_spec(Context&... context) {
     CHECK_MESSAGE(!filter_node_count, "invalid filter_node counter");
     input_filter<void> i_filter;
     // Test pipeline that contains only one filter
-    for (unsigned i = 0; i < number_of_filter_types; i++) {
-        tbb::filter<void, void> one_filter(filter_table[i], i_filter);
-        CHECK_MESSAGE(filter_node_count == 1, "some filter nodes left after previous iteration?");
+    for( unsigned i = 0; i<number_of_filter_types; i++) {
+        tbb::filter<void, void> one_filter( filter_table[i], i_filter );
+        CHECK_MESSAGE(filter_node_count==1, "some filter nodes left after previous iteration?");
         resetCounters();
-        tbb::parallel_pipeline(n_tokens, one_filter, context...);
+        tbb::parallel_pipeline( n_tokens, one_filter, context... );
         // no need to check counters
         std::atomic<int> counter;
         counter = max_counter;
         // Construct filter using lambda-syntax when parallel_pipeline() is being run;
-        tbb::parallel_pipeline(n_tokens,
-                               tbb::filter<void, void>(filter_table[i],
-                                                       [&counter](tbb::flow_control& control) {
-                                                           if (counter-- == 0) control.stop();
-                                                       }),
-                               context...);
+        tbb::parallel_pipeline( n_tokens,
+            tbb::filter<void, void>(filter_table[i], [&counter]( tbb::flow_control& control ) {
+                    if( counter-- == 0 )
+                        control.stop();
+                    }
+            ),
+            context...
+        );
     }
     CHECK_MESSAGE(!filter_node_count, "filter_node objects leaked");
 }
 
-template <typename t1, typename t2, typename... Context>
-void run_filter_set(input_filter<t1>& i_filter, middle_filter<t1, t2>& m_filter, output_filter<t2>& o_filter,
-                    mode_array* filter_type, final_assert_type my_t, Context&... context) {
-    tbb::filter<void, t1> filter1(filter_type[0], i_filter);
-    tbb::filter<t1, t2> filter2(filter_type[1], m_filter);
-    tbb::filter<t2, void> filter3(filter_type[2], o_filter);
-
-    CHECK_MESSAGE(filter_node_count == 3, "some filter nodes left after previous iteration?");
+template<typename t1, typename t2, typename... Context>
+void run_filter_set(
+        input_filter<t1>& i_filter,
+        middle_filter<t1,t2>& m_filter,
+        output_filter<t2>& o_filter,
+        mode_array *filter_type,
+        final_assert_type my_t,
+        Context&... context) {
+    tbb::filter<void, t1> filter1( filter_type[0], i_filter );
+    tbb::filter<t1, t2> filter2( filter_type[1], m_filter );
+    tbb::filter<t2, void> filter3( filter_type[2], o_filter );
+
+    CHECK_MESSAGE(filter_node_count==3, "some filter nodes left after previous iteration?");
     resetCounters();
     // Create filters sequence when parallel_pipeline() is being run
-    tbb::parallel_pipeline(n_tokens, filter1, filter2, filter3, context...);
+    tbb::parallel_pipeline( n_tokens, filter1, filter2, filter3, context...  );
     checkCounters(my_t);
 
     // Create filters sequence partially outside parallel_pipeline() and also when parallel_pipeline() is being run
     tbb::filter<void, t2> filter12;
     filter12 = filter1 & filter2;
-    for (int i = 0; i < 3; i++) {
-        filter12 &= tbb::filter<t2, t2>(filter_type[i], [](t2 x) -> t2 { return x; });
+    for( int i = 0; i<3; i++)
+    {
+        filter12 &= tbb::filter<t2,t2>(filter_type[i], [](t2 x) -> t2 { return x;});
     }
     resetCounters();
-    tbb::parallel_pipeline(n_tokens, filter12, filter3, context...);
+    tbb::parallel_pipeline( n_tokens, filter12, filter3, context...  );
     checkCounters(my_t);
 
     tbb::filter<void, void> filter123 = filter12 & filter3;
     // Run pipeline twice with the same filter sequence
-    for (unsigned i = 0; i < 2; i++) {
+    for( unsigned i = 0; i<2; i++ ) {
         resetCounters();
-        tbb::parallel_pipeline(n_tokens, filter123, context...);
+        tbb::parallel_pipeline( n_tokens, filter123, context...  );
         checkCounters(my_t);
     }
 
     // Now copy-and-move-construct another filter instance, and use it to run pipeline
     {
-        tbb::filter<void, void> copy123(filter123);
+        tbb::filter<void, void> copy123( filter123 );
         resetCounters();
-        tbb::parallel_pipeline(n_tokens, copy123, context...);
+        tbb::parallel_pipeline( n_tokens, copy123, context...  );
         checkCounters(my_t);
-        tbb::filter<void, void> move123(std::move(filter123));
+        tbb::filter<void, void> move123( std::move(filter123) );
         resetCounters();
-        tbb::parallel_pipeline(n_tokens, move123, context...);
+        tbb::parallel_pipeline( n_tokens, move123, context...  );
         checkCounters(my_t);
     }
 
     // Construct filters and create the sequence when parallel_pipeline() is being run
     resetCounters();
-    tbb::parallel_pipeline(n_tokens, tbb::filter<void, t1>(filter_type[0], i_filter),
-                           tbb::filter<t1, t2>(filter_type[1], m_filter),
-                           tbb::filter<t2, void>(filter_type[2], o_filter), context...);
+    tbb::parallel_pipeline( n_tokens,
+               tbb::filter<void, t1>(filter_type[0], i_filter),
+               tbb::filter<t1, t2>(filter_type[1], m_filter),
+               tbb::filter<t2, void>(filter_type[2], o_filter),
+               context...  );
     checkCounters(my_t);
 
     // Construct filters, make a copy, destroy the original filters, and run with the copy
     int cnt = filter_node_count;
     {
-        tbb::filter<void, void>* p123
-                = new tbb::filter<void, void>(tbb::filter<void, t1>(filter_type[0], i_filter)
-                                              & tbb::filter<t1, t2>(filter_type[1], m_filter)
-                                              & tbb::filter<t2, void>(filter_type[2], o_filter));
-        CHECK_MESSAGE(filter_node_count == cnt + 5, "filter node accounting error?");
-        tbb::filter<void, void> copy123(*p123);
+        tbb::filter<void, void>* p123 = new tbb::filter<void,void> (
+               tbb::filter<void, t1>(filter_type[0], i_filter)&
+               tbb::filter<t1, t2>(filter_type[1], m_filter)&
+               tbb::filter<t2, void>(filter_type[2], o_filter) );
+        CHECK_MESSAGE(filter_node_count==cnt+5, "filter node accounting error?");
+        tbb::filter<void, void> copy123( *p123 );
         delete p123;
-        CHECK_MESSAGE(filter_node_count == cnt + 5, "filter nodes deleted prematurely?");
+        CHECK_MESSAGE(filter_node_count==cnt+5, "filter nodes deleted prematurely?");
         resetCounters();
-        tbb::parallel_pipeline(n_tokens, copy123, context...);
+        tbb::parallel_pipeline( n_tokens, copy123, context...  );
         checkCounters(my_t);
     }
 
     // construct a filter with temporaries
     {
         tbb::filter<void, void> my_filter;
-        fill_chain<t1, t2>(my_filter, filter_type, i_filter, m_filter, o_filter);
+        fill_chain<t1,t2>( my_filter, filter_type, i_filter, m_filter, o_filter );
         resetCounters();
-        tbb::parallel_pipeline(n_tokens, my_filter, context...);
+        tbb::parallel_pipeline( n_tokens, my_filter, context...  );
         checkCounters(my_t);
     }
-    CHECK_MESSAGE(filter_node_count == cnt, "scope ended but filter nodes not deleted?");
+    CHECK_MESSAGE(filter_node_count==cnt, "scope ended but filter nodes not deleted?");
 }
 
 template <typename t1, typename t2, typename... Context>
-void run_lambdas_test(mode_array* filter_type, Context&... context) {
+void run_lambdas_test( mode_array *filter_type, Context&... context ) {
     std::atomic<int> counter;
     counter = max_counter;
     // Construct filters using lambda-syntax and create the sequence when parallel_pipeline() is being run;
-    resetCounters();// only need the output_counter reset.
-    tbb::parallel_pipeline(
-            n_tokens,
-            tbb::make_filter<void, t1>(filter_type[0],
-                                       [&counter](tbb::flow_control& control) -> t1 {
-                                           if (--counter < 0) control.stop();
-                                           return t1();
-                                       }),
-            tbb::make_filter<t1, t2>(filter_type[1], [](t1 /*my_storage*/) -> t2 { return t2(); }),
-            tbb::make_filter<t2, void>(filter_type[2], [](t2) -> void { output_counter++; }), context...);
-    checkCounters(no_pointer_counts);// don't have to worry about specializations
+    resetCounters();  // only need the output_counter reset.
+    tbb::parallel_pipeline( n_tokens,
+        tbb::make_filter<void, t1>(filter_type[0], [&counter]( tbb::flow_control& control ) -> t1 {
+                if( --counter < 0 )
+                    control.stop();
+                return t1(); }
+        ),
+        tbb::make_filter<t1, t2>(filter_type[1], []( t1 /*my_storage*/ ) -> t2 {
+                return t2(); }
+        ),
+        tbb::make_filter<t2,void>(filter_type[2], [] ( t2 ) -> void {
+                output_counter++; }
+        ),
+        context...
+    );
+    checkCounters(no_pointer_counts);  // don't have to worry about specializations
     counter = max_counter;
     // pointer filters
     resetCounters();
-    tbb::parallel_pipeline(n_tokens,
-                           tbb::filter<void, t1*>(filter_type[0],
-                                                  [&counter](tbb::flow_control& control) -> t1* {
-                                                      if (--counter < 0) {
-                                                          control.stop();
-                                                          return nullptr;
-                                                      }
-                                                      return new (fetchNextBuffer()) t1();
-                                                  }),
-                           tbb::filter<t1*, t2*>(filter_type[1],
-                                                 [](t1* my_storage) -> t2* {
-                                                     my_storage->~t1();
-                                                     return new (my_storage) t2();
-                                                 }),
-                           tbb::filter<t2*, void>(filter_type[2],
-                                                  [](t2* my_storage) -> void {
-                                                      my_storage->~t2();
-                                                      freeBuffer(my_storage);
-                                                      output_counter++;
-                                                  }),
-                           context...);
+    tbb::parallel_pipeline( n_tokens,
+        tbb::filter<void,t1*>(filter_type[0], [&counter]( tbb::flow_control& control ) -> t1* {
+                if( --counter < 0 ) {
+                    control.stop();
+                    return nullptr;
+                }
+                return new(fetchNextBuffer()) t1(); }
+        ),
+		tbb::filter<t1*, t2*>(filter_type[1], []( t1* my_storage ) -> t2* {
+                my_storage->~t1();
+                return new(my_storage) t2(); }
+        ),
+		tbb::filter<t2*, void>(filter_type[2], [] ( t2* my_storage ) -> void {
+                my_storage->~t2();
+                freeBuffer(my_storage);
+                output_counter++; }
+        ),
+        context...
+    );
     checkCounters(no_pointer_counts);
     // first filter outputs pointer
     counter = max_counter;
     resetCounters();
-    tbb::parallel_pipeline(
-            n_tokens,
-            tbb::make_filter(filter_type[0],
-                             [&counter](tbb::flow_control& control) -> t1* {
-                                 if (--counter < 0) {
-                                     control.stop();
-                                     return nullptr;
-                                 }
-                                 return new (fetchNextBuffer()) t1();
-                             })
-                    & tbb::make_filter(filter_type[1],
-                                       [](t1* my_storage) -> t2 {
-                                           my_storage->~t1();
-                                           freeBuffer(my_storage);
-                                           return t2();
-                                       }),
-            tbb::make_filter(filter_type[2], [](t2 /*my_storage*/) -> void { output_counter++; }),
-            context...);
+    tbb::parallel_pipeline( n_tokens,
+        tbb::make_filter(filter_type[0], [&counter]( tbb::flow_control& control ) -> t1* {
+                if( --counter < 0 ) {
+                    control.stop();
+                    return nullptr;
+                }
+                return new(fetchNextBuffer()) t1(); }
+        )&
+        tbb::make_filter(filter_type[1], []( t1* my_storage ) -> t2 {
+                my_storage->~t1();
+                freeBuffer(my_storage);
+                return t2(); }
+        ),
+        tbb::make_filter(filter_type[2], [] ( t2 /*my_storage*/) -> void {
+                output_counter++; }
+        ),
+        context...
+    );
     checkCounters(no_pointer_counts);
     // second filter outputs pointer
     counter = max_counter;
     resetCounters();
-    tbb::parallel_pipeline(
-            n_tokens,
-            tbb::make_filter(filter_type[0],
-                             [&counter](tbb::flow_control& control) -> t1 {
-                                 if (--counter < 0) { control.stop(); }
-                                 return t1();
-                             }),
-            tbb::filter<t1, t2*>(filter_type[1],
-                                 [](t1 /*my_storage*/) -> t2* { return new (fetchNextBuffer()) t2(); })
-                    & tbb::make_filter<t2*, void>(filter_type[2],
-                                                  [](t2* my_storage) -> void {
-                                                      my_storage->~t2();
-                                                      freeBuffer(my_storage);
-                                                      output_counter++;
-                                                  }),
-            context...);
+    tbb::parallel_pipeline( n_tokens,
+        tbb::make_filter(filter_type[0], [&counter]( tbb::flow_control& control ) -> t1 {
+                if( --counter < 0 ) {
+                    control.stop();
+                }
+                return t1(); }
+        ),
+        tbb::filter<t1, t2*>(filter_type[1], []( t1 /*my_storage*/ ) -> t2* {
+                return new(fetchNextBuffer()) t2(); }
+        )&
+        tbb::make_filter<t2*, void>(filter_type[2], [] ( t2* my_storage) -> void {
+                my_storage->~t2();
+                freeBuffer(my_storage);
+                output_counter++; }
+        ),
+        context...
+    );
     checkCounters(no_pointer_counts);
 }
 
-template <typename type1, typename type2>
-void run_function(const char* l1, const char* l2) {
+template<typename type1, typename type2>
+void run_function(const char *l1, const char *l2) {
     CHECK_MESSAGE(!filter_node_count, "invalid filter_node counter");
 
-    check_intbuffer = (!strcmp(l1, "int") && !strcmp(l2, "int"));
+    check_intbuffer = (!strcmp(l1,"int") && !strcmp(l2,"int"));
 
-    Checker<type1> check1;// check constructions/destructions
-    Checker<type2> check2;// for type1 or type2 === CheckType<T>
+    Checker<type1> check1;  // check constructions/destructions
+    Checker<type2> check2;  // for type1 or type2 === CheckType<T>
 
     const size_t number_of_filters = 3;
 
@@ -617,41 +611,41 @@ void run_function(const char* l1, const char* l2) {
     output_filter<type2*> p_o_filter;
 
     // allocate the buffers for the filters
-    unsigned max_size = (sizeof(type1) > sizeof(type2)) ? sizeof(type1) : sizeof(type2);
-    for (unsigned i = 0; i < (unsigned) n_buffers; ++i) {
+    unsigned max_size = (sizeof(type1) > sizeof(type2) ) ? sizeof(type1) : sizeof(type2);
+    for(unsigned i = 0; i < (unsigned)n_buffers; ++i) {
         buffers[i] = malloc(max_size);
         buf_in_use[i].clear();
     }
 
     unsigned limit = 1;
     // Test pipeline that contains number_of_filters filters
-    for (unsigned i = 0; i < number_of_filters; ++i) limit *= number_of_filter_types;
+    for( unsigned i=0; i<number_of_filters; ++i)
+        limit *= number_of_filter_types;
     // Iterate over possible filter sequences
-    for (unsigned numeral = 0; numeral < limit; ++numeral) {
+    for( unsigned numeral=0; numeral<limit; ++numeral ) {
         unsigned temp = numeral;
         tbb::filter_mode filter_type[number_of_filter_types];
-        for (unsigned i = 0; i < number_of_filters; ++i, temp /= number_of_filter_types)
-            filter_type[i] = filter_table[temp % number_of_filter_types];
+        for( unsigned i=0; i<number_of_filters; ++i, temp/=number_of_filter_types )
+            filter_type[i] = filter_table[temp%number_of_filter_types];
 
         tbb::task_group_context context;
-        run_filter_set<type1, type2>(i_filter, m_filter, o_filter, filter_type, assert_nonpointer);
-        run_filter_set<type1, type2>(i_filter, m_filter, o_filter, filter_type, assert_nonpointer, context);
-        run_filter_set<type1*, type2>(p_i_filter, pr_m_filter, o_filter, filter_type, assert_firstpointer);
-        run_filter_set<type1*, type2>(p_i_filter, pr_m_filter, o_filter, filter_type, assert_firstpointer,
-                                      context);
-        run_filter_set<type1, type2*>(i_filter, rp_m_filter, p_o_filter, filter_type, assert_secondpointer);
-        run_filter_set<type1, type2*>(i_filter, rp_m_filter, p_o_filter, filter_type, assert_secondpointer,
-                                      context);
-        run_filter_set<type1*, type2*>(p_i_filter, pp_m_filter, p_o_filter, filter_type, assert_allpointer);
-        run_filter_set<type1*, type2*>(p_i_filter, pp_m_filter, p_o_filter, filter_type, assert_allpointer,
-                                       context);
-
-        run_lambdas_test<type1, type2>(filter_type);
-        run_lambdas_test<type1, type2>(filter_type, context);
+        run_filter_set<type1,type2>(i_filter, m_filter, o_filter, filter_type, assert_nonpointer);
+        run_filter_set<type1,type2>(i_filter, m_filter, o_filter, filter_type, assert_nonpointer, context);
+        run_filter_set<type1*,type2>(p_i_filter, pr_m_filter, o_filter, filter_type, assert_firstpointer);
+        run_filter_set<type1*,type2>(p_i_filter, pr_m_filter, o_filter, filter_type, assert_firstpointer, context);
+        run_filter_set<type1,type2*>(i_filter, rp_m_filter, p_o_filter, filter_type, assert_secondpointer);
+        run_filter_set<type1,type2*>(i_filter, rp_m_filter, p_o_filter, filter_type, assert_secondpointer, context);
+        run_filter_set<type1*,type2*>(p_i_filter, pp_m_filter, p_o_filter, filter_type, assert_allpointer);
+        run_filter_set<type1*,type2*>(p_i_filter, pp_m_filter, p_o_filter, filter_type, assert_allpointer, context);
+
+        run_lambdas_test<type1,type2>(filter_type);
+        run_lambdas_test<type1,type2>(filter_type, context);
     }
     CHECK_MESSAGE(!filter_node_count, "filter_node objects leaked");
 
-    for (unsigned i = 0; i < (unsigned) n_buffers; ++i) { free(buffers[i]); }
+    for(unsigned i = 0; i < (unsigned)n_buffers; ++i) {
+        free(buffers[i]);
+    }
 }
 
 //! Testing single filter pipeline
@@ -662,17 +656,15 @@ TEST_CASE("Pipeline testing for single filter") {
     run_function_spec(context);
 }
 
-#define RUN_TYPED_TEST_CASE(type1, type2)                                                                    \
-    TEST_CASE("Pipeline testing with " #type1 " and " #type2) {                                              \
-        for (std::size_t concurrency_level : {1, 2, 4, 5, 7, 8}) {                                           \
-            if (concurrency_level                                                                            \
-                > tbb::global_control::active_value(tbb::global_control::max_allowed_parallelism))           \
-                break;                                                                                       \
-            concurrency = concurrency_level;                                                                 \
-            tbb::global_control control(tbb::global_control::max_allowed_parallelism, concurrency_level);    \
-            run_function<type1, type2>(#type1, #type2);                                                      \
-        }                                                                                                    \
-    }
+#define RUN_TYPED_TEST_CASE(type1, type2) TEST_CASE("Pipeline testing with "#type1" and "#type2) { \
+                                                for ( std::size_t concurrency_level : {1, 2, 4, 5, 7, 8} ) { \
+                                                    if ( concurrency_level > tbb::global_control::active_value(tbb::global_control::max_allowed_parallelism) ) \
+                                                        break; \
+                                                    concurrency = concurrency_level; \
+                                                    tbb::global_control control(tbb::global_control::max_allowed_parallelism, concurrency_level); \
+                                                    run_function<type1, type2>(#type1, #type2); \
+                                                } \
+                                            }
 // Run test several times with different types
 RUN_TYPED_TEST_CASE(std::size_t, int)
 RUN_TYPED_TEST_CASE(int, double)
@@ -685,6 +677,6 @@ RUN_TYPED_TEST_CASE(CheckType<unsigned int>, CheckType<unsigned int>)
 RUN_TYPED_TEST_CASE(CheckType<unsigned int>, CheckType<unsigned short>)
 RUN_TYPED_TEST_CASE(CheckType<unsigned short>, CheckType<unsigned short>)
 RUN_TYPED_TEST_CASE(double, CheckType<unsigned short>)
-RUN_TYPED_TEST_CASE(std::unique_ptr<int>, std::unique_ptr<int>)// move-only type
+RUN_TYPED_TEST_CASE(std::unique_ptr<int>, std::unique_ptr<int>) // move-only type
 
 #undef RUN_TYPED_TEST_CASE
diff --git a/external/tbb/test/tbb/test_parallel_reduce.cpp b/external/tbb/test/tbb/test_parallel_reduce.cpp
index 791e1818..e1c08947 100644
--- a/external/tbb/test/tbb/test_parallel_reduce.cpp
+++ b/external/tbb/test/tbb/test_parallel_reduce.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -16,63 +16,66 @@
 
 #include <atomic>
 
-#include "common/concepts_common.h"
+#include "common/parallel_reduce_common.h"
 #include "common/cpu_usertime.h"
 #include "common/exception_handling.h"
-#include "common/parallel_reduce_common.h"
+#include "common/concepts_common.h"
 
 //! \file test_parallel_reduce.cpp
 //! \brief Test for [algorithms.parallel_reduce algorithms.parallel_deterministic_reduce] specification
 
 #if _MSC_VER
-#pragma warning(push)
+#pragma warning (push)
 // Suppress conditional expression is constant
-#pragma warning(disable : 4127)
-#endif//#if _MSC_VER
+#pragma warning (disable: 4127)
+#endif //#if _MSC_VER
 
 using ValueType = uint64_t;
 
 struct Sum {
-    template <typename T>
-    T operator()(const T& v1, const T& v2) const {
+    template<typename T>
+    T operator() ( const T& v1, const T& v2 ) const {
         return v1 + v2;
     }
 };
 
 struct Accumulator {
-    ValueType operator()(const tbb::blocked_range<ValueType*>& r, ValueType value) const {
-        for (ValueType* pv = r.begin(); pv != r.end(); ++pv) value += *pv;
+    ValueType operator() ( const tbb::blocked_range<ValueType*>& r, ValueType value ) const {
+        for ( ValueType* pv = r.begin(); pv != r.end(); ++pv )
+            value += *pv;
         return value;
     }
 };
 
 class ParallelSumTester {
 public:
-    ParallelSumTester(const ParallelSumTester&) = default;
-    void operator=(const ParallelSumTester&) = delete;
+    ParallelSumTester( const ParallelSumTester& ) = default;
+    void operator=( const ParallelSumTester& ) = delete;
 
     ParallelSumTester() : m_range(nullptr, nullptr) {
         m_array = new ValueType[unsigned(count)];
-        for (ValueType i = 0; i < count; ++i) m_array[i] = i + 1;
-        m_range = tbb::blocked_range<ValueType*>(m_array, m_array + count);
+        for ( ValueType i = 0; i < count; ++i )
+            m_array[i] = i + 1;
+        m_range = tbb::blocked_range<ValueType*>( m_array, m_array + count );
     }
     ~ParallelSumTester() { delete[] m_array; }
 
-    template <typename Partitioner>
+    template<typename Partitioner>
     void CheckParallelReduce() {
         Partitioner partitioner;
-        ValueType result1 = reduce_invoker<ValueType>(m_range, Accumulator(), Sum(), partitioner);
-        REQUIRE_MESSAGE(result1 == expected, "Wrong parallel summation result");
-        ValueType result2 = reduce_invoker<ValueType>(
-                m_range,
-                [](const tbb::blocked_range<ValueType*>& r, ValueType value) -> ValueType {
-                    for (const ValueType* pv = r.begin(); pv != r.end(); ++pv) value += *pv;
-                    return value;
-                },
-                Sum(), partitioner);
-        REQUIRE_MESSAGE(result2 == expected, "Wrong parallel summation result");
+        ValueType result1 = reduce_invoker<ValueType>( m_range, Accumulator(), Sum(), partitioner );
+        REQUIRE_MESSAGE( result1 == expected, "Wrong parallel summation result" );
+        ValueType result2 = reduce_invoker<ValueType>( m_range,
+            [](const tbb::blocked_range<ValueType*>& r, ValueType value) -> ValueType {
+                for ( const ValueType* pv = r.begin(); pv != r.end(); ++pv )
+                    value += *pv;
+                return value;
+            },
+            Sum(),
+            partitioner
+        );
+        REQUIRE_MESSAGE( result2 == expected, "Wrong parallel summation result" );
     }
-
 private:
     ValueType* m_array;
     tbb::blocked_range<ValueType*> m_range;
@@ -84,210 +87,214 @@ const ValueType ParallelSumTester::expected = count * (count + 1) / 2;
 
 namespace test_cancellation {
 
-    struct ReduceToCancel {
-        std::size_t operator()(const tbb::blocked_range<std::size_t>&, std::size_t) const {
-            ++g_CurExecuted;
-            Cancellator::WaitUntilReady();
-            return 1;
-        }
-    };// struct ReduceToCancel
+struct ReduceToCancel {
+    std::size_t operator()( const tbb::blocked_range<std::size_t>&, std::size_t ) const {
+        ++g_CurExecuted;
+        Cancellator::WaitUntilReady();
+        return 1;
+    }
+}; // struct ReduceToCancel
 
-    struct JoinToCancel {
-        std::size_t operator()(std::size_t, std::size_t) const {
-            ++g_CurExecuted;
-            Cancellator::WaitUntilReady();
-            return 1;
-        }
-    };// struct Join
-
-    struct ReduceFunctorToCancel {
-        std::size_t result;
-
-        ReduceFunctorToCancel() : result(0) {}
-        ReduceFunctorToCancel(ReduceFunctorToCancel&, tbb::split) : result(0) {}
-
-        void operator()(const tbb::blocked_range<std::size_t>& br) { result = ReduceToCancel {}(br, result); }
-
-        void join(ReduceFunctorToCancel& rhs) { result = JoinToCancel {}(result, rhs.result); }
-    };// struct ReduceFunctorToCancel
-
-    static constexpr std::size_t buffer_test_size = 1024;
-    static constexpr std::size_t maxParallelReduceRunnerMode = 9;
-
-    template <std::size_t Mode>
-    class ParallelReduceRunner {
-        tbb::task_group_context& my_ctx;
-
-        static_assert(Mode >= 0 && Mode <= maxParallelReduceRunnerMode,
-                      "Incorrect mode for ParallelReduceTask");
-
-        template <typename... Args>
-        void run_parallel_reduce(Args&&... args) const {
-            switch (Mode % 5) {
-                case 0: {
-                    tbb::parallel_reduce(std::forward<Args>(args)..., my_ctx);
-                    break;
-                }
-                case 1: {
-                    tbb::parallel_reduce(std::forward<Args>(args)..., tbb::simple_partitioner {}, my_ctx);
-                    break;
-                }
-                case 2: {
-                    tbb::parallel_reduce(std::forward<Args>(args)..., tbb::auto_partitioner {}, my_ctx);
-                    break;
-                }
-                case 3: {
-                    tbb::parallel_reduce(std::forward<Args>(args)..., tbb::static_partitioner {}, my_ctx);
-                    break;
-                }
-                case 4: {
-                    tbb::affinity_partitioner aff;
-                    tbb::parallel_reduce(std::forward<Args>(args)..., aff, my_ctx);
-                    break;
-                }
-            }
-        }
+struct JoinToCancel {
+    std::size_t operator()( std::size_t, std::size_t ) const {
+        ++g_CurExecuted;
+        Cancellator::WaitUntilReady();
+        return 1;
+    }
+}; // struct Join
+
+struct ReduceFunctorToCancel {
+    std::size_t result;
+
+    ReduceFunctorToCancel() : result(0) {}
+    ReduceFunctorToCancel( ReduceFunctorToCancel&, tbb::split ) : result(0) {}
+
+    void operator()( const tbb::blocked_range<std::size_t>& br ) {
+        result = ReduceToCancel{}(br, result);
+    }
+
+    void join( ReduceFunctorToCancel& rhs ) {
+        result = JoinToCancel{}(result, rhs.result);
+    }
+}; // struct ReduceFunctorToCancel
+
+static constexpr std::size_t buffer_test_size = 1024;
+static constexpr std::size_t maxParallelReduceRunnerMode = 9;
 
-    public:
-        ParallelReduceRunner(tbb::task_group_context& ctx) : my_ctx(ctx) {}
+template <std::size_t Mode>
+class ParallelReduceRunner {
+    tbb::task_group_context& my_ctx;
 
-        void operator()() const {
-            tbb::blocked_range<std::size_t> br(0, buffer_test_size);
-            if (Mode < 5) {
-                ReduceFunctorToCancel functor;
-                run_parallel_reduce(br, functor);
-            } else {
-                run_parallel_reduce(br, std::size_t(0), ReduceToCancel {}, JoinToCancel {});
+    static_assert(Mode >= 0 && Mode <= maxParallelReduceRunnerMode, "Incorrect mode for ParallelReduceTask");
+
+    template <typename... Args>
+    void run_parallel_reduce( Args&&... args ) const {
+        switch(Mode % 5) {
+            case 0 : {
+                tbb::parallel_reduce(std::forward<Args>(args)..., my_ctx);
+                break;
             }
-        }
-    };// class ParallelReduceRunner
-
-    static constexpr std::size_t maxParallelDeterministicReduceRunnerMode = 5;
-
-    // TODO: unify with ParallelReduceRunner
-    template <std::size_t Mode>
-    class ParallelDeterministicReduceRunner {
-        tbb::task_group_context& my_ctx;
-
-        static_assert(Mode >= 0 && Mode <= maxParallelDeterministicReduceRunnerMode,
-                      "Incorrect Mode for deterministic_reduce task");
-
-        template <typename... Args>
-        void run_parallel_deterministic_reduce(Args&&... args) const {
-            switch (Mode % 3) {
-                case 0: {
-                    tbb::parallel_deterministic_reduce(std::forward<Args>(args)..., my_ctx);
-                    break;
-                }
-                case 1: {
-                    tbb::parallel_deterministic_reduce(std::forward<Args>(args)...,
-                                                       tbb::simple_partitioner {}, my_ctx);
-                    break;
-                }
-                case 2: {
-                    tbb::parallel_deterministic_reduce(std::forward<Args>(args)...,
-                                                       tbb::static_partitioner {}, my_ctx);
-                    break;
-                }
+            case 1 : {
+                tbb::parallel_reduce(std::forward<Args>(args)..., tbb::simple_partitioner{}, my_ctx);
+                break;
+            }
+            case 2 : {
+                tbb::parallel_reduce(std::forward<Args>(args)..., tbb::auto_partitioner{}, my_ctx);
+                break;
+            }
+            case 3 : {
+                tbb::parallel_reduce(std::forward<Args>(args)..., tbb::static_partitioner{}, my_ctx);
+                break;
+            }
+            case 4 : {
+                tbb::affinity_partitioner aff;
+                tbb::parallel_reduce(std::forward<Args>(args)..., aff, my_ctx);
+                break;
             }
         }
+    }
+
+public:
+    ParallelReduceRunner( tbb::task_group_context& ctx )
+        : my_ctx(ctx) {}
+
+    void operator()() const {
+        tbb::blocked_range<std::size_t> br(0, buffer_test_size);
+        if (Mode < 5) {
+            ReduceFunctorToCancel functor;
+            run_parallel_reduce(br, functor);
+        } else {
+            run_parallel_reduce(br, std::size_t(0), ReduceToCancel{}, JoinToCancel{});
+        }
+    }
+}; // class ParallelReduceRunner
 
-    public:
-        ParallelDeterministicReduceRunner(tbb::task_group_context& ctx) : my_ctx(ctx) {}
+static constexpr std::size_t maxParallelDeterministicReduceRunnerMode = 5;
 
-        void operator()() const {
-            tbb::blocked_range<std::size_t> br(0, buffer_test_size);
-            if (Mode < 3) {
-                ReduceFunctorToCancel functor;
-                run_parallel_deterministic_reduce(br, functor);
-            } else {
-                run_parallel_deterministic_reduce(br, std::size_t(0), ReduceToCancel {}, JoinToCancel {});
+// TODO: unify with ParallelReduceRunner
+template <std::size_t Mode>
+class ParallelDeterministicReduceRunner {
+    tbb::task_group_context& my_ctx;
+
+    static_assert(Mode >= 0 && Mode <= maxParallelDeterministicReduceRunnerMode, "Incorrect Mode for deterministic_reduce task");
+
+    template <typename... Args>
+    void run_parallel_deterministic_reduce( Args&&... args ) const {
+        switch(Mode % 3) {
+            case 0 : {
+                tbb::parallel_deterministic_reduce(std::forward<Args>(args)..., my_ctx);
+                break;
+            }
+            case 1 : {
+                tbb::parallel_deterministic_reduce(std::forward<Args>(args)..., tbb::simple_partitioner{}, my_ctx);
+                break;
+            }
+            case 2 : {
+                tbb::parallel_deterministic_reduce(std::forward<Args>(args)..., tbb::static_partitioner{}, my_ctx);
+                break;
             }
         }
-    };// class ParallelDeterministicReduceRunner
-
-    template <std::size_t Mode>
-    void run_parallel_reduce_cancellation_test() {
-        for (auto concurrency_level : utils::concurrency_range()) {
-            if (concurrency_level < 2) continue;
+    }
 
-            tbb::global_control gc(tbb::global_control::max_allowed_parallelism, concurrency_level);
-            ResetEhGlobals();
-            RunCancellationTest<ParallelReduceRunner<Mode>, Cancellator>();
+public:
+    ParallelDeterministicReduceRunner( tbb::task_group_context& ctx )
+        : my_ctx(ctx) {}
+
+    void operator()() const {
+        tbb::blocked_range<std::size_t> br(0, buffer_test_size);
+        if (Mode < 3) {
+            ReduceFunctorToCancel functor;
+            run_parallel_deterministic_reduce(br, functor);
+        } else {
+            run_parallel_deterministic_reduce(br, std::size_t(0), ReduceToCancel{}, JoinToCancel{});
         }
     }
+}; // class ParallelDeterministicReduceRunner
 
-    template <std::size_t Mode>
-    void run_parallel_deterministic_reduce_cancellation_test() {
-        for (auto concurrency_level : utils::concurrency_range()) {
-            if (concurrency_level < 2) continue;
+template <std::size_t Mode>
+void run_parallel_reduce_cancellation_test() {
+    for ( auto concurrency_level : utils::concurrency_range() ) {
+        if (concurrency_level < 2) continue;
 
-            tbb::global_control gc(tbb::global_control::max_allowed_parallelism, concurrency_level);
-            ResetEhGlobals();
-            RunCancellationTest<ParallelDeterministicReduceRunner<Mode>, Cancellator>();
-        }
+        tbb::global_control gc(tbb::global_control::max_allowed_parallelism, concurrency_level);
+        ResetEhGlobals();
+        RunCancellationTest<ParallelReduceRunner<Mode>, Cancellator>();
     }
+}
 
-    template <std::size_t Mode>
-    struct ParallelReduceTestRunner {
-        static void run() {
-            run_parallel_reduce_cancellation_test<Mode>();
-            ParallelReduceTestRunner<Mode + 1>::run();
-        }
-    };// struct ParallelReduceTestRunner
-
-    template <>
-    struct ParallelReduceTestRunner<maxParallelReduceRunnerMode> {
-        static void run() { run_parallel_reduce_cancellation_test<maxParallelReduceRunnerMode>(); }
-    };// struct ParallelReduceTestRunner<maxParallelReduceRunnerMode>
-
-    template <std::size_t Mode>
-    struct ParallelDeterministicReduceTestRunner {
-        static void run() {
-            run_parallel_deterministic_reduce_cancellation_test<Mode>();
-            ParallelDeterministicReduceTestRunner<Mode + 1>::run();
-        }
-    };// struct ParallelDeterministicReduceTestRunner
+template <std::size_t Mode>
+void run_parallel_deterministic_reduce_cancellation_test() {
+    for ( auto concurrency_level : utils::concurrency_range() ) {
+        if (concurrency_level < 2) continue;
 
-    template <>
-    struct ParallelDeterministicReduceTestRunner<maxParallelDeterministicReduceRunnerMode> {
-        static void run() {
-            run_parallel_deterministic_reduce_cancellation_test<maxParallelDeterministicReduceRunnerMode>();
-        }
-    };// struct ParallelDeterministicReduceTestRunner<maxParallelDeterministicReduceRunnerMode>
+        tbb::global_control gc(tbb::global_control::max_allowed_parallelism, concurrency_level);
+        ResetEhGlobals();
+        RunCancellationTest<ParallelDeterministicReduceRunner<Mode>, Cancellator>();
+    }
+}
 
-}// namespace test_cancellation
+template <std::size_t Mode>
+struct ParallelReduceTestRunner {
+    static void run() {
+        run_parallel_reduce_cancellation_test<Mode>();
+        ParallelReduceTestRunner<Mode + 1>::run();
+    }
+}; // struct ParallelReduceTestRunner
+
+template <>
+struct ParallelReduceTestRunner<maxParallelReduceRunnerMode> {
+    static void run() {
+        run_parallel_reduce_cancellation_test<maxParallelReduceRunnerMode>();
+    }
+}; // struct ParallelReduceTestRunner<maxParallelReduceRunnerMode>
+
+template <std::size_t Mode>
+struct ParallelDeterministicReduceTestRunner {
+    static void run() {
+        run_parallel_deterministic_reduce_cancellation_test<Mode>();
+        ParallelDeterministicReduceTestRunner<Mode + 1>::run();
+    }
+}; // struct ParallelDeterministicReduceTestRunner
+
+template <>
+struct ParallelDeterministicReduceTestRunner<maxParallelDeterministicReduceRunnerMode> {
+    static void run() {
+        run_parallel_deterministic_reduce_cancellation_test<maxParallelDeterministicReduceRunnerMode>();
+    }
+}; // struct ParallelDeterministicReduceTestRunner<maxParallelDeterministicReduceRunnerMode>
+
+} // namespace test_cancellation
 
 #if __TBB_CPP20_CONCEPTS_PRESENT
 template <typename... Args>
-concept can_call_parallel_reduce_basic = requires(Args&&... args) {
+concept can_call_parallel_reduce_basic = requires( Args&&... args ) {
     tbb::parallel_reduce(std::forward<Args>(args)...);
 };
 
 template <typename... Args>
-concept can_call_parallel_deterministic_reduce_basic = requires(Args&&... args) {
+concept can_call_parallel_deterministic_reduce_basic = requires ( Args&&... args ) {
     tbb::parallel_deterministic_reduce(std::forward<Args>(args)...);
 };
 
 template <typename... Args>
-concept can_call_preduce_helper = can_call_parallel_reduce_basic<Args...>&&
-        can_call_parallel_reduce_basic<Args..., tbb::task_group_context&>;
+concept can_call_preduce_helper = can_call_parallel_reduce_basic<Args...> &&
+                                  can_call_parallel_reduce_basic<Args..., tbb::task_group_context&>;
 
 template <typename... Args>
-concept can_call_pdet_reduce_helper = can_call_parallel_deterministic_reduce_basic<Args...>&&
-        can_call_parallel_deterministic_reduce_basic<Args..., tbb::task_group_context&>;
+concept can_call_pdet_reduce_helper = can_call_parallel_deterministic_reduce_basic<Args...> &&
+                                      can_call_parallel_deterministic_reduce_basic<Args..., tbb::task_group_context&>;
 
 template <typename... Args>
-concept can_call_preduce_with_partitioner = can_call_preduce_helper<Args...>&&
-        can_call_preduce_helper<Args..., const tbb::simple_partitioner&>&&
-                can_call_preduce_helper<Args..., const tbb::auto_partitioner&>&&
-                        can_call_preduce_helper<Args..., const tbb::static_partitioner&>&&
-                                can_call_preduce_helper<Args..., tbb::affinity_partitioner&>;
+concept can_call_preduce_with_partitioner = can_call_preduce_helper<Args...> &&
+                                            can_call_preduce_helper<Args..., const tbb::simple_partitioner&> &&
+                                            can_call_preduce_helper<Args..., const tbb::auto_partitioner&> &&
+                                            can_call_preduce_helper<Args..., const tbb::static_partitioner&> &&
+                                            can_call_preduce_helper<Args..., tbb::affinity_partitioner&>;
 
 template <typename... Args>
-concept can_call_pdet_reduce_with_partitioner = can_call_pdet_reduce_helper<Args...>&&
-        can_call_pdet_reduce_helper<Args..., const tbb::simple_partitioner&>&&
-                can_call_pdet_reduce_helper<Args..., const tbb::static_partitioner&>;
+concept can_call_pdet_reduce_with_partitioner = can_call_pdet_reduce_helper<Args...> &&
+                                                can_call_pdet_reduce_helper<Args..., const tbb::simple_partitioner&> &&
+                                                can_call_pdet_reduce_helper<Args..., const tbb::static_partitioner&>;
 
 template <typename Range, typename Body>
 concept can_call_imperative_preduce = can_call_preduce_with_partitioner<const Range&, Body&>;
@@ -296,13 +303,12 @@ template <typename Range, typename Body>
 concept can_call_imperative_pdet_reduce = can_call_pdet_reduce_with_partitioner<const Range&, Body&>;
 
 template <typename Range, typename Value, typename RealBody, typename Reduction>
-concept can_call_functional_preduce
-        = can_call_preduce_with_partitioner<const Range&, const Value&, const RealBody&, const Reduction&>;
+concept can_call_functional_preduce = can_call_preduce_with_partitioner<const Range&, const Value&,
+                                                                        const RealBody&, const Reduction&>;
 
 template <typename Range, typename Value, typename RealBody, typename Reduction>
-concept can_call_functional_pdet_reduce
-        = can_call_pdet_reduce_with_partitioner<const Range&, const Value&, const RealBody&,
-                                                const Reduction&>;
+concept can_call_functional_pdet_reduce = can_call_pdet_reduce_with_partitioner<const Range&, const Value&,
+                                                                                const RealBody&, const Reduction&>;
 
 template <typename Range>
 using CorrectBody = test_concepts::parallel_reduce_body::Correct<Range>;
@@ -328,21 +334,14 @@ void test_preduce_range_constraints() {
 
     static_assert(can_call_functional_preduce<Correct, int, CorrectFunc<Correct>, CorrectReduction>);
     static_assert(!can_call_functional_preduce<NonCopyable, int, CorrectFunc<NonCopyable>, CorrectReduction>);
-    static_assert(!can_call_functional_preduce<NonDestructible, int, CorrectFunc<NonDestructible>,
-                                               CorrectReduction>);
-    static_assert(
-            !can_call_functional_preduce<NonSplittable, int, CorrectFunc<NonSplittable>, CorrectReduction>);
+    static_assert(!can_call_functional_preduce<NonDestructible, int, CorrectFunc<NonDestructible>, CorrectReduction>);
+    static_assert(!can_call_functional_preduce<NonSplittable, int, CorrectFunc<NonSplittable>, CorrectReduction>);
     static_assert(!can_call_functional_preduce<NoEmpty, int, CorrectFunc<NoEmpty>, CorrectReduction>);
-    static_assert(
-            !can_call_functional_preduce<EmptyNonConst, int, CorrectFunc<EmptyNonConst>, CorrectReduction>);
-    static_assert(!can_call_functional_preduce<WrongReturnEmpty, int, CorrectFunc<WrongReturnEmpty>,
-                                               CorrectReduction>);
-    static_assert(
-            !can_call_functional_preduce<NoIsDivisible, int, CorrectFunc<NoIsDivisible>, CorrectReduction>);
-    static_assert(!can_call_functional_preduce<IsDivisibleNonConst, int, CorrectFunc<IsDivisibleNonConst>,
-                                               CorrectReduction>);
-    static_assert(!can_call_functional_preduce<WrongReturnIsDivisible, int,
-                                               CorrectFunc<WrongReturnIsDivisible>, CorrectReduction>);
+    static_assert(!can_call_functional_preduce<EmptyNonConst, int, CorrectFunc<EmptyNonConst>, CorrectReduction>);
+    static_assert(!can_call_functional_preduce<WrongReturnEmpty, int, CorrectFunc<WrongReturnEmpty>, CorrectReduction>);
+    static_assert(!can_call_functional_preduce<NoIsDivisible, int, CorrectFunc<NoIsDivisible>, CorrectReduction>);
+    static_assert(!can_call_functional_preduce<IsDivisibleNonConst, int, CorrectFunc<IsDivisibleNonConst>, CorrectReduction>);
+    static_assert(!can_call_functional_preduce<WrongReturnIsDivisible, int, CorrectFunc<WrongReturnIsDivisible>, CorrectReduction>);
 }
 
 void test_preduce_body_constraints() {
@@ -359,32 +358,21 @@ void test_preduce_body_constraints() {
 void test_preduce_func_constraints() {
     using namespace test_concepts::parallel_reduce_function;
     static_assert(can_call_functional_preduce<CorrectRange, int, Correct<CorrectRange>, CorrectReduction>);
-    static_assert(!can_call_functional_preduce<CorrectRange, int, NoOperatorRoundBrackets<CorrectRange>,
-                                               CorrectReduction>);
-    static_assert(!can_call_functional_preduce<CorrectRange, int, OperatorRoundBracketsNonConst<CorrectRange>,
-                                               CorrectReduction>);
-    static_assert(!can_call_functional_preduce<
-                  CorrectRange, int, WrongFirstInputOperatorRoundBrackets<CorrectRange>, CorrectReduction>);
-    static_assert(!can_call_functional_preduce<
-                  CorrectRange, int, WrongSecondInputOperatorRoundBrackets<CorrectRange>, CorrectReduction>);
-    static_assert(
-            !can_call_functional_preduce<CorrectRange, int, WrongReturnOperatorRoundBrackets<CorrectRange>,
-                                         CorrectReduction>);
+    static_assert(!can_call_functional_preduce<CorrectRange, int, NoOperatorRoundBrackets<CorrectRange>, CorrectReduction>);
+    static_assert(!can_call_functional_preduce<CorrectRange, int, OperatorRoundBracketsNonConst<CorrectRange>, CorrectReduction>);
+    static_assert(!can_call_functional_preduce<CorrectRange, int, WrongFirstInputOperatorRoundBrackets<CorrectRange>, CorrectReduction>);
+    static_assert(!can_call_functional_preduce<CorrectRange, int, WrongSecondInputOperatorRoundBrackets<CorrectRange>, CorrectReduction>);
+    static_assert(!can_call_functional_preduce<CorrectRange, int, WrongReturnOperatorRoundBrackets<CorrectRange>, CorrectReduction>);
 }
 
 void test_preduce_combine_constraints() {
     using namespace test_concepts::parallel_reduce_combine;
     static_assert(can_call_functional_preduce<CorrectRange, int, CorrectFunc<CorrectRange>, Correct<int>>);
-    static_assert(!can_call_functional_preduce<CorrectRange, int, CorrectFunc<CorrectRange>,
-                                               NoOperatorRoundBrackets<int>>);
-    static_assert(!can_call_functional_preduce<CorrectRange, int, CorrectFunc<CorrectRange>,
-                                               OperatorRoundBracketsNonConst<int>>);
-    static_assert(!can_call_functional_preduce<CorrectRange, int, CorrectFunc<CorrectRange>,
-                                               WrongFirstInputOperatorRoundBrackets<int>>);
-    static_assert(!can_call_functional_preduce<CorrectRange, int, CorrectFunc<CorrectRange>,
-                                               WrongSecondInputOperatorRoundBrackets<int>>);
-    static_assert(!can_call_functional_preduce<CorrectRange, int, CorrectFunc<CorrectRange>,
-                                               WrongReturnOperatorRoundBrackets<int>>);
+    static_assert(!can_call_functional_preduce<CorrectRange, int, CorrectFunc<CorrectRange>, NoOperatorRoundBrackets<int>>);
+    static_assert(!can_call_functional_preduce<CorrectRange, int, CorrectFunc<CorrectRange>, OperatorRoundBracketsNonConst<int>>);
+    static_assert(!can_call_functional_preduce<CorrectRange, int, CorrectFunc<CorrectRange>, WrongFirstInputOperatorRoundBrackets<int>>);
+    static_assert(!can_call_functional_preduce<CorrectRange, int, CorrectFunc<CorrectRange>, WrongSecondInputOperatorRoundBrackets<int>>);
+    static_assert(!can_call_functional_preduce<CorrectRange, int, CorrectFunc<CorrectRange>, WrongReturnOperatorRoundBrackets<int>>);
 }
 
 void test_pdet_reduce_range_constraints() {
@@ -398,27 +386,18 @@ void test_pdet_reduce_range_constraints() {
     static_assert(!can_call_imperative_pdet_reduce<WrongReturnEmpty, CorrectBody<WrongReturnEmpty>>);
     static_assert(!can_call_imperative_pdet_reduce<NoIsDivisible, CorrectBody<NoIsDivisible>>);
     static_assert(!can_call_imperative_pdet_reduce<IsDivisibleNonConst, CorrectBody<NoIsDivisible>>);
-    static_assert(
-            !can_call_imperative_pdet_reduce<WrongReturnIsDivisible, CorrectBody<WrongReturnIsDivisible>>);
+    static_assert(!can_call_imperative_pdet_reduce<WrongReturnIsDivisible, CorrectBody<WrongReturnIsDivisible>>);
 
     static_assert(can_call_functional_pdet_reduce<Correct, int, CorrectFunc<Correct>, CorrectReduction>);
-    static_assert(
-            !can_call_functional_pdet_reduce<NonCopyable, int, CorrectFunc<NonCopyable>, CorrectReduction>);
-    static_assert(!can_call_functional_pdet_reduce<NonDestructible, int, CorrectFunc<NonDestructible>,
-                                                   CorrectReduction>);
-    static_assert(!can_call_functional_pdet_reduce<NonSplittable, int, CorrectFunc<NonSplittable>,
-                                                   CorrectReduction>);
+    static_assert(!can_call_functional_pdet_reduce<NonCopyable, int, CorrectFunc<NonCopyable>, CorrectReduction>);
+    static_assert(!can_call_functional_pdet_reduce<NonDestructible, int, CorrectFunc<NonDestructible>, CorrectReduction>);
+    static_assert(!can_call_functional_pdet_reduce<NonSplittable, int, CorrectFunc<NonSplittable>, CorrectReduction>);
     static_assert(!can_call_functional_pdet_reduce<NoEmpty, int, CorrectFunc<NoEmpty>, CorrectReduction>);
-    static_assert(!can_call_functional_pdet_reduce<EmptyNonConst, int, CorrectFunc<EmptyNonConst>,
-                                                   CorrectReduction>);
-    static_assert(!can_call_functional_pdet_reduce<WrongReturnEmpty, int, CorrectFunc<WrongReturnEmpty>,
-                                                   CorrectReduction>);
-    static_assert(!can_call_functional_pdet_reduce<NoIsDivisible, int, CorrectFunc<NoIsDivisible>,
-                                                   CorrectReduction>);
-    static_assert(!can_call_functional_pdet_reduce<IsDivisibleNonConst, int, CorrectFunc<IsDivisibleNonConst>,
-                                                   CorrectReduction>);
-    static_assert(!can_call_functional_pdet_reduce<WrongReturnIsDivisible, int,
-                                                   CorrectFunc<WrongReturnIsDivisible>, CorrectReduction>);
+    static_assert(!can_call_functional_pdet_reduce<EmptyNonConst, int, CorrectFunc<EmptyNonConst>, CorrectReduction>);
+    static_assert(!can_call_functional_pdet_reduce<WrongReturnEmpty, int, CorrectFunc<WrongReturnEmpty>, CorrectReduction>);
+    static_assert(!can_call_functional_pdet_reduce<NoIsDivisible, int, CorrectFunc<NoIsDivisible>, CorrectReduction>);
+    static_assert(!can_call_functional_pdet_reduce<IsDivisibleNonConst, int, CorrectFunc<IsDivisibleNonConst>, CorrectReduction>);
+    static_assert(!can_call_functional_pdet_reduce<WrongReturnIsDivisible, int, CorrectFunc<WrongReturnIsDivisible>, CorrectReduction>);
 }
 
 void test_pdet_reduce_body_constraints() {
@@ -427,45 +406,31 @@ void test_pdet_reduce_body_constraints() {
     static_assert(!can_call_imperative_pdet_reduce<CorrectRange, NonSplittable<CorrectRange>>);
     static_assert(!can_call_imperative_pdet_reduce<CorrectRange, NonDestructible<CorrectRange>>);
     static_assert(!can_call_imperative_pdet_reduce<CorrectRange, NoOperatorRoundBrackets<CorrectRange>>);
-    static_assert(
-            !can_call_imperative_pdet_reduce<CorrectRange, WrongInputOperatorRoundBrackets<CorrectRange>>);
+    static_assert(!can_call_imperative_pdet_reduce<CorrectRange, WrongInputOperatorRoundBrackets<CorrectRange>>);
     static_assert(!can_call_imperative_pdet_reduce<CorrectRange, NoJoin<CorrectRange>>);
     static_assert(!can_call_imperative_pdet_reduce<CorrectRange, WrongInputJoin<CorrectRange>>);
 }
 
 void test_pdet_reduce_func_constraints() {
     using namespace test_concepts::parallel_reduce_function;
-    static_assert(
-            can_call_functional_pdet_reduce<CorrectRange, int, Correct<CorrectRange>, CorrectReduction>);
-    static_assert(!can_call_functional_pdet_reduce<CorrectRange, int, NoOperatorRoundBrackets<CorrectRange>,
-                                                   CorrectReduction>);
-    static_assert(
-            !can_call_functional_pdet_reduce<CorrectRange, int, OperatorRoundBracketsNonConst<CorrectRange>,
-                                             CorrectReduction>);
-    static_assert(!can_call_functional_pdet_reduce<
-                  CorrectRange, int, WrongFirstInputOperatorRoundBrackets<CorrectRange>, CorrectReduction>);
-    static_assert(!can_call_functional_pdet_reduce<
-                  CorrectRange, int, WrongSecondInputOperatorRoundBrackets<CorrectRange>, CorrectReduction>);
-    static_assert(!can_call_functional_pdet_reduce<
-                  CorrectRange, int, WrongReturnOperatorRoundBrackets<CorrectRange>, CorrectReduction>);
+    static_assert(can_call_functional_pdet_reduce<CorrectRange, int, Correct<CorrectRange>, CorrectReduction>);
+    static_assert(!can_call_functional_pdet_reduce<CorrectRange, int, NoOperatorRoundBrackets<CorrectRange>, CorrectReduction>);
+    static_assert(!can_call_functional_pdet_reduce<CorrectRange, int, OperatorRoundBracketsNonConst<CorrectRange>, CorrectReduction>);
+    static_assert(!can_call_functional_pdet_reduce<CorrectRange, int, WrongFirstInputOperatorRoundBrackets<CorrectRange>, CorrectReduction>);
+    static_assert(!can_call_functional_pdet_reduce<CorrectRange, int, WrongSecondInputOperatorRoundBrackets<CorrectRange>, CorrectReduction>);
+    static_assert(!can_call_functional_pdet_reduce<CorrectRange, int, WrongReturnOperatorRoundBrackets<CorrectRange>, CorrectReduction>);
 }
 
 void test_pdet_reduce_combine_constraints() {
     using namespace test_concepts::parallel_reduce_combine;
-    static_assert(
-            can_call_functional_pdet_reduce<CorrectRange, int, CorrectFunc<CorrectRange>, Correct<int>>);
-    static_assert(!can_call_functional_pdet_reduce<CorrectRange, int, CorrectFunc<CorrectRange>,
-                                                   NoOperatorRoundBrackets<int>>);
-    static_assert(!can_call_functional_pdet_reduce<CorrectRange, int, CorrectFunc<CorrectRange>,
-                                                   OperatorRoundBracketsNonConst<int>>);
-    static_assert(!can_call_functional_pdet_reduce<CorrectRange, int, CorrectFunc<CorrectRange>,
-                                                   WrongFirstInputOperatorRoundBrackets<int>>);
-    static_assert(!can_call_functional_pdet_reduce<CorrectRange, int, CorrectFunc<CorrectRange>,
-                                                   WrongSecondInputOperatorRoundBrackets<int>>);
-    static_assert(!can_call_functional_pdet_reduce<CorrectRange, int, CorrectFunc<CorrectRange>,
-                                                   WrongReturnOperatorRoundBrackets<int>>);
+    static_assert(can_call_functional_pdet_reduce<CorrectRange, int, CorrectFunc<CorrectRange>, Correct<int>>);
+    static_assert(!can_call_functional_pdet_reduce<CorrectRange, int, CorrectFunc<CorrectRange>, NoOperatorRoundBrackets<int>>);
+    static_assert(!can_call_functional_pdet_reduce<CorrectRange, int, CorrectFunc<CorrectRange>, OperatorRoundBracketsNonConst<int>>);
+    static_assert(!can_call_functional_pdet_reduce<CorrectRange, int, CorrectFunc<CorrectRange>, WrongFirstInputOperatorRoundBrackets<int>>);
+    static_assert(!can_call_functional_pdet_reduce<CorrectRange, int, CorrectFunc<CorrectRange>, WrongSecondInputOperatorRoundBrackets<int>>);
+    static_assert(!can_call_functional_pdet_reduce<CorrectRange, int, CorrectFunc<CorrectRange>, WrongReturnOperatorRoundBrackets<int>>);
 }
-#endif// __TBB_CPP20_CONCEPTS_PRESENT
+#endif // __TBB_CPP20_CONCEPTS_PRESENT
 
 //! Test parallel summation correctness
 //! \brief \ref stress
@@ -485,50 +450,44 @@ static std::atomic<long> FooBodyCount;
 class MinimalRange {
     size_t begin, end;
     friend class FooBody;
-    explicit MinimalRange(size_t i) : begin(0), end(i) {}
-    template <typename Partitioner_>
-    friend void TestSplitting(std::size_t nthread);
-
+    explicit MinimalRange( size_t i ) : begin(0), end(i) {}
+    template <typename Partitioner_> friend void TestSplitting( std::size_t nthread );
 public:
-    MinimalRange(MinimalRange& r, tbb::split) : end(r.end) { begin = r.end = (r.begin + r.end) / 2; }
-    bool is_divisible() const { return end - begin >= 2; }
-    bool empty() const { return begin == end; }
+    MinimalRange( MinimalRange& r, tbb::split ) : end(r.end) {
+        begin = r.end = (r.begin+r.end)/2;
+    }
+    bool is_divisible() const {return end-begin>=2;}
+    bool empty() const {return begin==end;}
 };
 
 //! Class with public interface that is exactly minimal requirements for Body of a parallel_reduce
 class FooBody {
 private:
-    FooBody(const FooBody&);       // Deny access
-    void operator=(const FooBody&);// Deny access
-    template <typename Partitioner_>
-    friend void TestSplitting(std::size_t nthread);
-    //! Parent that created this body via split operation.  NULL if original body.
+    FooBody( const FooBody& );          // Deny access
+    void operator=( const FooBody& );   // Deny access
+    template <typename Partitioner_> friend void TestSplitting( std::size_t nthread );
+    //! Parent that created this body via split operation.  nullptr if original body.
     FooBody* parent;
     //! Total number of index values processed by body and its children.
     size_t sum;
-    //! Number of join operations done so far on this body and its children.
-    long join_count;
     //! Range that has been processed so far by this body and its children.
     size_t begin, end;
     //! True if body has not yet been processed at least once by operator().
     bool is_new;
     //! 1 if body was created by split; 0 if original body.
     int forked;
-    FooBody() { ++FooBodyCount; }
-
+    FooBody() {++FooBodyCount;}
 public:
     ~FooBody() {
         forked = 0xDEADBEEF;
-        sum = 0xDEADBEEF;
-        join_count = 0xDEADBEEF;
+        sum=0xDEADBEEF;
         --FooBodyCount;
     }
-    FooBody(FooBody& other, tbb::split) {
+    FooBody( FooBody& other, tbb::split ) {
         ++FooBodyCount;
         ++ForkCount;
         sum = 0;
         parent = &other;
-        join_count = 0;
         is_new = true;
         forked = 1;
     }
@@ -536,59 +495,56 @@ class FooBody {
     void init() {
         sum = 0;
         parent = nullptr;
-        join_count = 0;
         is_new = true;
         forked = 0;
         begin = ~size_t(0);
         end = ~size_t(0);
     }
 
-    void join(FooBody& s) {
-        REQUIRE(s.forked == 1);
-        REQUIRE(this != &s);
-        REQUIRE(this == s.parent);
-        REQUIRE(end == s.begin);
+    void join( FooBody& s ) {
+        REQUIRE( s.forked==1 );
+        REQUIRE( this!=&s );
+        REQUIRE( this==s.parent );
+        REQUIRE( end==s.begin );
         end = s.end;
         sum += s.sum;
-        join_count += s.join_count + 1;
         s.forked = 2;
     }
-    void operator()(const MinimalRange& r) {
-        for (size_t k = r.begin; k < r.end; ++k) ++sum;
-        if (is_new) {
+    void operator()( const MinimalRange& r ) {
+        for( size_t k=r.begin; k<r.end; ++k )
+            ++sum;
+        if( is_new ) {
             is_new = false;
             begin = r.begin;
         } else
-            REQUIRE(end == r.begin);
+            REQUIRE( end==r.begin );
         end = r.end;
     }
 };
 
-template <typename Partitioner>
-void TestSplitting(std::size_t nthread) {
+template<typename Partitioner>
+void TestSplitting( std::size_t nthread ) {
     ForkCount = 0;
-    long join_count = 0;
     Partitioner partitioner;
-    for (size_t i = 0; i <= 1000; ++i) {
+    for( size_t i=0; i<=1000; ++i ) {
         FooBody f;
         f.init();
-        REQUIRE_MESSAGE(FooBodyCount == 1, "Wrong initial BodyCount value");
+        REQUIRE_MESSAGE( FooBodyCount==1, "Wrong initial BodyCount value" );
         reduce_invoker(MinimalRange(i), f, partitioner);
 
-        if (nthread == 1) REQUIRE_MESSAGE(ForkCount == 0, "Body was split during 1 thread execution");
+        if (nthread == 1) REQUIRE_MESSAGE(ForkCount==0, "Body was split during 1 thread execution");
 
-        join_count += f.join_count;
-        REQUIRE_MESSAGE(FooBodyCount == 1, "Some copies of FooBody was not removed after reduction");
-        REQUIRE_MESSAGE(f.sum == i, "Incorrect reduction");
-        REQUIRE_MESSAGE(f.begin == (i == 0 ? ~size_t(0) : 0), "Incorrect range borders");
-        REQUIRE_MESSAGE(f.end == (i == 0 ? ~size_t(0) : i), "Incorrect range borders");
+        REQUIRE_MESSAGE( FooBodyCount==1, "Some copies of FooBody was not removed after reduction");
+        REQUIRE_MESSAGE( f.sum==i, "Incorrect reduction" );
+        REQUIRE_MESSAGE( f.begin==(i==0 ? ~size_t(0) : 0), "Incorrect range borders" );
+        REQUIRE_MESSAGE( f.end==(i==0 ? ~size_t(0) : i), "Incorrect range borders" );
     }
 }
 
 //! Test splitting range and body during reduction, test that all workers sleep when no work
 //! \brief \ref resource_usage \ref error_guessing
 TEST_CASE("Test splitting range and body during reduction, test that all workers sleep when no work") {
-    for (auto concurrency_level : utils::concurrency_range()) {
+    for ( auto concurrency_level : utils::concurrency_range() ) {
         tbb::global_control control(tbb::global_control::max_allowed_parallelism, concurrency_level);
 
         TestSplitting<tbb::simple_partitioner>(concurrency_level);
@@ -604,22 +560,20 @@ TEST_CASE("Test splitting range and body during reduction, test that all workers
 
 //! Define overloads of parallel_deterministic_reduce that accept "undesired" types of partitioners
 namespace unsupported {
-    template <typename Range, typename Body>
-    void parallel_deterministic_reduce(const Range&, Body&, const tbb::auto_partitioner&) {}
-    template <typename Range, typename Body>
-    void parallel_deterministic_reduce(const Range&, Body&, tbb::affinity_partitioner&) {}
-
-    template <typename Range, typename Value, typename RealBody, typename Reduction>
-    Value parallel_deterministic_reduce(const Range&, const Value& identity, const RealBody&,
-                                        const Reduction&, const tbb::auto_partitioner&) {
+    template<typename Range, typename Body>
+    void parallel_deterministic_reduce(const Range&, Body&, const tbb::auto_partitioner&) { }
+    template<typename Range, typename Body>
+    void parallel_deterministic_reduce(const Range&, Body&, tbb::affinity_partitioner&) { }
+
+    template<typename Range, typename Value, typename RealBody, typename Reduction>
+    Value parallel_deterministic_reduce(const Range& , const Value& identity, const RealBody& , const Reduction& , const tbb::auto_partitioner&) {
         return identity;
     }
-    template <typename Range, typename Value, typename RealBody, typename Reduction>
-    Value parallel_deterministic_reduce(const Range&, const Value& identity, const RealBody&,
-                                        const Reduction&, tbb::affinity_partitioner&) {
+    template<typename Range, typename Value, typename RealBody, typename Reduction>
+    Value parallel_deterministic_reduce(const Range& , const Value& identity, const RealBody& , const Reduction& , tbb::affinity_partitioner&) {
         return identity;
     }
-}// namespace unsupported
+}
 
 struct Body {
     float value;
@@ -643,23 +597,39 @@ TEST_CASE("Test Unsupported Partitioners") {
     parallel_deterministic_reduce(blocked_range<int>(0, 10), body, ap);
 
     parallel_deterministic_reduce(
-            blocked_range<int>(0, 10), 0, [](const blocked_range<int>&, int init) -> int { return init; },
-            [](int x, int y) -> int { return x + y; }, tbb::auto_partitioner());
+        blocked_range<int>(0, 10),
+        0,
+        [](const blocked_range<int>&, int init)->int {
+            return init;
+        },
+        [](int x, int y)->int {
+            return x + y;
+        },
+        tbb::auto_partitioner()
+    );
     parallel_deterministic_reduce(
-            blocked_range<int>(0, 10), 0, [](const blocked_range<int>&, int init) -> int { return init; },
-            [](int x, int y) -> int { return x + y; }, ap);
+        blocked_range<int>(0, 10),
+        0,
+        [](const blocked_range<int>&, int init)->int {
+            return init;
+        },
+        [](int x, int y)->int {
+            return x + y;
+        },
+        ap
+    );
 }
 
 //! Testing tbb::parallel_reduce with tbb::task_group_context
 //! \brief \ref interface \ref error_guessing
 TEST_CASE("cancellation test for tbb::parallel_reduce") {
-    test_cancellation::ParallelReduceTestRunner</*First mode = */ 0>::run();
+    test_cancellation::ParallelReduceTestRunner</*First mode = */0>::run();
 }
 
 //! Testing tbb::parallel_deterministic_reduce with tbb::task_group_context
 //! \brief \ref interface \ref error_guessing
 TEST_CASE("cancellation test for tbb::parallel_deterministic_reduce") {
-    test_cancellation::ParallelDeterministicReduceTestRunner</*First mode = */ 0>::run();
+    test_cancellation::ParallelDeterministicReduceTestRunner</*First mode = */0>::run();
 }
 
 #if __TBB_CPP20_CONCEPTS_PRESENT
@@ -681,5 +651,5 @@ TEST_CASE("parallel_deterministic_reduce constraints") {
 #endif
 
 #if _MSC_VER
-#pragma warning(pop)
+#pragma warning (pop)
 #endif
diff --git a/external/tbb/test/tbb/test_parallel_scan.cpp b/external/tbb/test/tbb/test_parallel_scan.cpp
index 80c59e81..f21b8912 100644
--- a/external/tbb/test/tbb/test_parallel_scan.cpp
+++ b/external/tbb/test/tbb/test_parallel_scan.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -15,21 +15,21 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
 #endif
 
-#include "common/concepts_common.h"
-#include "common/config.h"
-#include "common/cpu_usertime.h"
 #include "common/test.h"
+#include "common/config.h"
 #include "common/utils_concurrency_limit.h"
+#include "common/cpu_usertime.h"
+#include "common/concepts_common.h"
 
-#include "tbb/blocked_range.h"
 #include "tbb/global_control.h"
 #include "tbb/parallel_scan.h"
+#include "tbb/blocked_range.h"
 #include "tbb/tick_count.h"
-#include <atomic>
 #include <vector>
+#include <atomic>
 
 //! \file test_parallel_scan.cpp
 //! \brief Test for [algorithms.parallel_scan] specification
@@ -39,19 +39,24 @@ using Range = tbb::blocked_range<long>;
 static volatile bool ScanIsRunning = false;
 
 //! Sum of 0..i with wrap around on overflow.
-inline int TriangularSum(int i) { return i & 1 ? ((i >> 1) + 1) * i : (i >> 1) * (i + 1); }
+inline int TriangularSum( int i ) {
+    return i&1 ? ((i>>1)+1)*i : (i>>1)*(i+1);
+}
 
 //! Verify that sum is init plus sum of integers in closed interval [0..finish_index].
 /** line should be the source line of the caller */
-void VerifySum(int init, long finish_index, int sum, int line) {
+void VerifySum( int init, long finish_index, int sum, int line ) {
     int expected = init + TriangularSum(finish_index);
-    CHECK_MESSAGE(expected == sum, "line " << line << ": sum[0.." << finish_index << "] should be = "
-                                           << expected << ", but was computed as " << sum << "\n");
+    CHECK_MESSAGE(expected == sum, "line " << line << ": sum[0.." << finish_index << "] should be = " << expected << ", but was computed as " << sum << "\n");
 }
 
 const int MAXN = 20000;
 
-enum AddendFlag { UNUSED = 0, USED_NONFINAL = 1, USED_FINAL = 2 };
+enum AddendFlag {
+    UNUSED=0,
+    USED_NONFINAL=1,
+    USED_FINAL=2
+};
 
 //! Array recording how each addend was used.
 /** 'unsigned char' instead of AddendFlag for sake of compactness. */
@@ -59,21 +64,29 @@ static unsigned char AddendHistory[MAXN];
 
 std::atomic<long> NumberOfLiveStorage;
 
-template <typename T>
+template<typename T>
 struct Storage {
     T my_total;
     Range my_range;
-    Storage(T init) : my_total(init), my_range(-1, -1, 1) { ++NumberOfLiveStorage; }
-    ~Storage() { --NumberOfLiveStorage; }
-    Storage(const Storage& strg) : my_total(strg.my_total), my_range(strg.my_range) { ++NumberOfLiveStorage; }
-    Storage& operator=(const Storage& strg) {
+    Storage(T init) :
+        my_total(init), my_range(-1, -1, 1) {
+        ++NumberOfLiveStorage;
+    }
+    ~Storage() {
+        --NumberOfLiveStorage;
+    }
+    Storage(const Storage& strg) :
+        my_total(strg.my_total), my_range(strg.my_range) {
+        ++NumberOfLiveStorage;
+    }
+    Storage & operator=(const Storage& strg) {
         my_total = strg.my_total;
         my_range = strg.my_range;
         return *this;
     }
 };
 
-template <typename T>
+template<typename T>
 Storage<T> JoinStorages(const Storage<T>& left, const Storage<T>& right) {
     Storage<T> result = right;
     CHECK(ScanIsRunning);
@@ -84,11 +97,9 @@ Storage<T> JoinStorages(const Storage<T>& left, const Storage<T>& right) {
     return result;
 }
 
-template <typename T>
-void Scan(const Range& r, bool is_final, Storage<T>& storage, std::vector<T>& sum,
-          const std::vector<T>& addend) {
-    CHECK((!is_final || (storage.my_range.begin() == 0 && storage.my_range.end() == r.begin())
-           || (storage.my_range.empty() && r.begin() == 0)));
+template<typename T>
+void Scan(const Range & r, bool is_final, Storage<T> & storage, std::vector<T> & sum, const std::vector<T> & addend) {
+    CHECK((!is_final || (storage.my_range.begin() == 0 && storage.my_range.end() == r.begin()) || (storage.my_range.empty() && r.begin() == 0)));
     for (long i = r.begin(); i < r.end(); ++i) {
         storage.my_total += addend[i];
         if (is_final) {
@@ -96,131 +107,137 @@ void Scan(const Range& r, bool is_final, Storage<T>& storage, std::vector<T>& su
             AddendHistory[i] |= USED_FINAL;
             sum[i] = storage.my_total;
             VerifySum(42, i, int(sum[i]), __LINE__);
-        } else {
+        }
+        else {
             CHECK_MESSAGE(AddendHistory[i] == UNUSED, "addend used too many times");
             AddendHistory[i] |= USED_NONFINAL;
         }
     }
-    if (storage.my_range.empty()) storage.my_range = r;
+    if (storage.my_range.empty())
+        storage.my_range = r;
     else
         storage.my_range = Range(storage.my_range.begin(), r.end(), 1);
 }
 
-template <typename T>
-Storage<T> ScanWithInit(const Range& r, T init, bool is_final, Storage<T>& storage, std::vector<T>& sum,
-                        const std::vector<T>& addend) {
-    if (r.begin() == 0) storage.my_total = init;
+template<typename T>
+Storage<T> ScanWithInit(const Range & r, T init, bool is_final, Storage<T> & storage, std::vector<T> & sum, const std::vector<T> & addend) {
+    if (r.begin() == 0)
+        storage.my_total = init;
     Scan(r, is_final, storage, sum, addend);
     return storage;
 }
 
-template <typename T>
+template<typename T>
 class Accumulator {
-    const std::vector<T>& my_array;
-    std::vector<T>& my_sum;
+    const  std::vector<T> &my_array;
+    std::vector<T> & my_sum;
     Storage<T> storage;
     enum state_type {
-        full,// Accumulator has sufficient information for final scan,
-             // i.e. has seen all iterations to its left.
-             // It's either the original Accumulator provided by the user
-             // or a Accumulator constructed by a splitting constructor *and* subsequently
-             // subjected to a reverse_join with a full accumulator.
+        full,       // Accumulator has sufficient information for final scan,
+                    // i.e. has seen all iterations to its left.
+                    // It's either the original Accumulator provided by the user
+                    // or a Accumulator constructed by a splitting constructor *and* subsequently
+                    // subjected to a reverse_join with a full accumulator.
 
-        partial,// Accumulator has only enough information for pre_scan.
-                // i.e. has not seen all iterations to its left.
-                // It's an Accumulator created by a splitting constructor that
-                // has not yet been subjected to a reverse_join with a full accumulator.
+        partial,    // Accumulator has only enough information for pre_scan.
+                    // i.e. has not seen all iterations to its left.
+                    // It's an Accumulator created by a splitting constructor that
+                    // has not yet been subjected to a reverse_join with a full accumulator.
 
-        summary,// Accumulator has summary of iterations processed, but not necessarily
-                // the information required for a final_scan or pre_scan.
-                // It's the result of "assign".
+        summary,    // Accumulator has summary of iterations processed, but not necessarily
+                    // the information required for a final_scan or pre_scan.
+                    // It's the result of "assign".
 
-        trash// Accumulator with possibly no useful information.
-             // It was the source for "assign".
+        trash       // Accumulator with possibly no useful information.
+                    // It was the source for "assign".
 
     };
     mutable state_type my_state;
-    //! Equals this while object is fully constructed, NULL otherwise.
+    //! Equals this while object is fully constructed, nullptr otherwise.
     /** Used to detect premature destruction and accidental bitwise copy. */
     Accumulator* self;
-    Accumulator& operator=(const Accumulator& other);
-
+    Accumulator& operator= (const Accumulator& other);
 public:
-    Accumulator(T init, const std::vector<T>& array, std::vector<T>& sum)
-        : my_array(array), my_sum(sum), storage(init), my_state(full) {
+    Accumulator( T init, const std::vector<T> & array, std::vector<T> & sum ) :
+        my_array(array), my_sum(sum), storage(init), my_state(full)
+    {
         // Set self as last action of constructor, to indicate that object is fully constructed.
         self = this;
     }
     ~Accumulator() {
         // Clear self as first action of destructor, to indicate that object is not fully constructed.
-        self = 0;
+        self = nullptr;
     }
-    Accumulator(Accumulator& a, tbb::split)
-        : my_array(a.my_array), my_sum(a.my_sum), storage(0), my_state(partial) {
-        if (!(a.my_state == partial)) CHECK(a.my_state == full);
-        if (!(a.my_state == full)) CHECK(a.my_state == partial);
+    Accumulator( Accumulator& a, tbb::split ) :
+        my_array(a.my_array), my_sum(a.my_sum), storage(0), my_state(partial)
+    {
+        if (!(a.my_state == partial))
+            CHECK(a.my_state == full);
+        if (!(a.my_state == full))
+            CHECK(a.my_state == partial);
         CHECK(ScanIsRunning);
         // Set self as last action of constructor, to indicate that object is fully constructed.
         self = this;
     }
-    template <typename Tag>
-    void operator()(const Range& r, Tag /*tag*/) {
-        if (Tag::is_final_scan()) CHECK(my_state == full);
+    template<typename Tag>
+    void operator()( const Range& r, Tag /*tag*/ ) {
+        if(Tag::is_final_scan())
+            CHECK(my_state == full);
         else
             CHECK(my_state == partial);
         Scan(r, Tag::is_final_scan(), storage, my_sum, my_array);
-        CHECK_MESSAGE(self == this, "this Accumulator corrupted or prematurely destroyed");
+        CHECK_MESSAGE(self==this, "this Accumulator corrupted or prematurely destroyed");
     }
-    void reverse_join(const Accumulator& left_body) {
-        const Storage<T>& left = left_body.storage;
-        Storage<T>& right = storage;
+    void reverse_join( const Accumulator& left_body) {
+        const Storage<T> & left = left_body.storage;
+        Storage<T> & right = storage;
         CHECK(my_state == partial);
-        CHECK(((left_body.my_state == full) || (left_body.my_state == partial)));
+        CHECK( ((left_body.my_state == full) || (left_body.my_state==partial)) );
 
         right = JoinStorages(left, right);
 
         CHECK(left_body.self == &left_body);
         my_state = left_body.my_state;
     }
-    void assign(const Accumulator& other) {
+    void assign( const Accumulator& other ) {
         CHECK(other.my_state == full);
         CHECK(my_state == full);
         storage.my_total = other.storage.my_total;
         storage.my_range = other.storage.my_range;
         CHECK(self == this);
-        CHECK_MESSAGE(other.self == &other, "other Accumulator corrupted or prematurely destroyed");
+        CHECK_MESSAGE(other.self==&other, "other Accumulator corrupted or prematurely destroyed");
         my_state = summary;
         other.my_state = trash;
     }
-    T get_total() { return storage.my_total; }
+    T get_total() {
+        return storage.my_total;
+    }
 };
 
-template <typename T, typename Scan, typename ReverseJoin>
-T ParallelScanFunctionalInvoker(const Range& range, T idx, const Scan& scan, const ReverseJoin& reverse_join,
-                                int mode) {
-    switch (mode % 3) {
-        case 0:
-            return tbb::parallel_scan(range, idx, scan, reverse_join);
-            break;
-        case 1:
-            return tbb::parallel_scan(range, idx, scan, reverse_join, tbb::simple_partitioner());
-            break;
-        default:
-            return tbb::parallel_scan(range, idx, scan, reverse_join, tbb::auto_partitioner());
+
+template<typename T, typename Scan, typename ReverseJoin>
+T ParallelScanFunctionalInvoker(const Range& range, T idx, const Scan& scan, const ReverseJoin& reverse_join, int mode) {
+    switch (mode%3) {
+    case 0:
+        return tbb::parallel_scan(range, idx, scan, reverse_join);
+        break;
+    case 1:
+        return tbb::parallel_scan(range, idx, scan, reverse_join, tbb::simple_partitioner());
+        break;
+    default:
+        return tbb::parallel_scan(range, idx, scan, reverse_join, tbb::auto_partitioner());
     }
 }
 
-template <typename T>
+template<typename T>
 class ScanBody {
-    const std::vector<T>& my_addend;
-    std::vector<T>& my_sum;
+    const std::vector<T> &my_addend;
+    std::vector<T> &my_sum;
     const T my_init;
-    ScanBody& operator=(const ScanBody&);
-
+    ScanBody& operator= (const ScanBody&);
 public:
-    ScanBody(T init, const std::vector<T>& addend, std::vector<T>& sum)
-        : my_addend(addend), my_sum(sum), my_init(init) {}
-    template <typename S, typename Tag>
+    ScanBody(T init, const std::vector<T> &addend, std::vector<T> &sum) :my_addend(addend), my_sum(sum), my_init(init) {}
+    template<typename S, typename Tag>
     Storage<S> operator()(const Range& r, Storage<S> storage, Tag) const {
         return ScanWithInit(r, my_init, Tag::is_final_scan(), storage, my_sum, my_addend);
     }
@@ -228,110 +245,113 @@ class ScanBody {
 
 class JoinBody {
 public:
-    template <typename T>
+    template<typename T>
     Storage<T> operator()(const Storage<T>& left, const Storage<T>& right) const {
         return JoinStorages(left, right);
     }
 };
 
 struct ParallelScanTemplateFunctor {
-    template <typename T>
-    T operator()(Range range, T init, const std::vector<T>& addend, std::vector<T>& sum, int mode) {
-        for (long i = 0; i < MAXN; ++i) { AddendHistory[i] = UNUSED; }
+    template<typename T>
+    T operator()(Range range, T init, const std::vector<T> &addend, std::vector<T> &sum, int mode) {
+        for (long i = 0; i<MAXN; ++i) {
+            AddendHistory[i] = UNUSED;
+        }
         ScanIsRunning = true;
         ScanBody<T> sb(init, addend, sum);
         JoinBody jb;
         Storage<T> res = ParallelScanFunctionalInvoker(range, Storage<T>(0), sb, jb, mode);
         ScanIsRunning = false;
-        if (range.empty()) res.my_total = init;
+        if (range.empty())
+            res.my_total = init;
         return res.my_total;
     }
 };
 
 struct ParallelScanLambda {
-    template <typename T>
-    T operator()(Range range, T init, const std::vector<T>& addend, std::vector<T>& sum, int mode) {
-        for (long i = 0; i < MAXN; ++i) { AddendHistory[i] = UNUSED; }
+    template<typename T>
+    T operator()(Range range, T init, const std::vector<T> &addend, std::vector<T> &sum, int mode) {
+        for (long i = 0; i<MAXN; ++i) {
+            AddendHistory[i] = UNUSED;
+        }
         ScanIsRunning = true;
-        Storage<T> res = ParallelScanFunctionalInvoker(
-                range, Storage<T>(0),
-                [&addend, &sum, init](const Range& r, Storage<T> storage, bool is_final_scan /*tag*/)
-                        -> Storage<T> { return ScanWithInit(r, init, is_final_scan, storage, sum, addend); },
-                [](const Storage<T>& left, const Storage<T>& right) -> Storage<T> {
-                    return JoinStorages(left, right);
-                },
-                mode);
+        Storage<T> res = ParallelScanFunctionalInvoker(range, Storage<T>(0),
+            [&addend, &sum, init](const Range& r, Storage<T> storage, bool is_final_scan /*tag*/) -> Storage<T> {
+                return ScanWithInit(r, init, is_final_scan, storage, sum, addend);
+            },
+            [](const Storage<T>& left, const Storage<T>& right) -> Storage<T> {
+                return JoinStorages(left, right);
+            },
+            mode);
         ScanIsRunning = false;
-        if (range.empty()) res.my_total = init;
+        if (range.empty())
+            res.my_total = init;
         return res.my_total;
     }
 };
 
-void TestAccumulator(int mode) {
+void TestAccumulator( int mode ) {
     typedef int T;
     std::vector<T> addend(MAXN);
     std::vector<T> sum(MAXN);
     std::vector<T> control_sum(MAXN);
     T control_total;
-    for (int n = 0; n <= MAXN; n = n <= 128 ? n + 1 : n * 3) {
-        for (int gs : {1, 2, 100, 511, 12345, n / 111, n / 17, n - 1, n}) {
-            if (gs <= 0 || gs > n) continue;
+    for( int n=0; n<=MAXN; n = n <=128? n+1: n*3) {
+        for( int gs : {1, 2, 100, 511, 12345, n/ 111, n/17, n-1, n}) {
+            if(gs<=0 || gs > n)
+                continue;
             control_total = 42;
-            for (long i = 0; i < MAXN; ++i) {
+            for( long i=0; i<MAXN; ++i ) {
                 addend[i] = -1;
                 sum[i] = -2;
                 control_sum[i] = -2;
                 AddendHistory[i] = UNUSED;
             }
-            for (long i = 0; i < n; ++i) {
+            for (long i = 0; i<n; ++i) {
                 addend[i] = i;
                 control_total += addend[i];
                 control_sum[i] = control_total;
             }
 
-            Accumulator<T> acc(42, addend, sum);
+            Accumulator<T> acc( 42, addend, sum);
             ScanIsRunning = true;
 
             switch (mode) {
                 case 0:
-                    tbb::parallel_scan(Range(0, n, gs), acc);
-                    break;
+                    tbb::parallel_scan( Range( 0, n,  gs ), acc );
+                break;
                 case 1:
-                    tbb::parallel_scan(Range(0, n, gs), acc, tbb::simple_partitioner());
-                    break;
+                    tbb::parallel_scan( Range( 0, n, gs ), acc, tbb::simple_partitioner() );
+                break;
                 case 2:
-                    tbb::parallel_scan(Range(0, n, gs), acc, tbb::auto_partitioner());
-                    break;
+                    tbb::parallel_scan( Range( 0, n, gs ), acc, tbb::auto_partitioner() );
+                break;
             }
 
             ScanIsRunning = false;
 
-            long used_once_count = 0;
-            for (long i = 0; i < n; ++i)
-                CHECK_MESSAGE((AddendHistory[i] & USED_FINAL),
-                              "failed to use addend["
-                                      << i << "] "
-                                      << (AddendHistory[i] & USED_NONFINAL ? "(but used nonfinal)\n" : "\n"));
-            for (long i = 0; i < n; ++i) {
-                VerifySum(42, i, sum[i], __LINE__);
-                used_once_count += AddendHistory[i] == USED_FINAL;
+            for( long i=0; i<n; ++i )
+                CHECK_MESSAGE((AddendHistory[i]&USED_FINAL), "failed to use addend[" << i << "] " << (AddendHistory[i] & USED_NONFINAL ? "(but used nonfinal)\n" : "\n"));
+            for( long i=0; i<n; ++i ) {
+                VerifySum( 42, i, sum[i], __LINE__ );
             }
-            if (n) CHECK(acc.get_total() == sum[n - 1]);
+            if( n )
+                CHECK(acc.get_total()==sum[n-1]);
             else
-                CHECK(acc.get_total() == 42);
-            CHECK(control_total == acc.get_total());
-            CHECK(control_sum == sum);
+                CHECK(acc.get_total()==42);
+            CHECK(control_total ==acc.get_total());
+            CHECK(control_sum==sum);
         }
     }
 }
 
-template <typename ParallelScanWrapper>
-void TestInterface(int mode, ParallelScanWrapper parallel_scan_wrapper) {
+template<typename ParallelScanWrapper>
+void TestInterface( int mode, ParallelScanWrapper parallel_scan_wrapper ) {
     using T = int;
     std::vector<T> addend(MAXN);
     std::vector<T> control_sum(MAXN);
     T control_total(42);
-    for (long i = 0; i < MAXN; ++i) {
+    for( long i=0; i<MAXN; ++i ) {
         addend[i] = i;
         control_total += addend[i];
         control_sum[i] = control_total;
@@ -339,29 +359,36 @@ void TestInterface(int mode, ParallelScanWrapper parallel_scan_wrapper) {
     }
 
     std::vector<T> sum(MAXN);
-    for (long i = 0; i < MAXN; ++i) sum[i] = -2;
+    for (long i = 0; i<MAXN; ++i)
+        sum[i] = -2;
     ScanIsRunning = true;
     T total = parallel_scan_wrapper(Range(0, MAXN, 1), 42, addend, sum, mode);
     ScanIsRunning = false;
 
-    CHECK_MESSAGE(control_total == total, "Parallel prefix sum is not equal to serial");
-    CHECK_MESSAGE(control_sum == sum, "Parallel prefix vector is not equal to serial");
+    CHECK_MESSAGE(control_total==total, "Parallel prefix sum is not equal to serial");
+    CHECK_MESSAGE(control_sum==sum, "Parallel prefix vector is not equal to serial");
 }
 
+
 #if __TBB_CPP14_GENERIC_LAMBDAS_PRESENT
 struct ParallelScanGenericLambda {
-    template <typename T>
-    T operator()(Range range, T init, const std::vector<T>& addend, std::vector<T>& sum, int mode) {
-        for (long i = 0; i < MAXN; ++i) { AddendHistory[i] = UNUSED; }
+    template<typename T>
+    T operator()(Range range, T init, const std::vector<T> &addend, std::vector<T> &sum, int mode) {
+        for (long i = 0; i<MAXN; ++i) {
+            AddendHistory[i] = UNUSED;
+        }
         ScanIsRunning = true;
-        Storage<T> res = ParallelScanFunctionalInvoker(
-                range, Storage<T>(0),
-                [&addend, &sum, init](const auto& rng, auto storage, bool is_final_scan) {
-                    return ScanWithInit(rng, init, is_final_scan, storage, sum, addend);
-                },
-                [](const auto& left, const auto& right) { return JoinStorages(left, right); }, mode);
+        Storage<T> res = ParallelScanFunctionalInvoker(range, Storage<T>(0),
+            [&addend, &sum, init](const auto& rng, auto storage, bool is_final_scan) {
+                return ScanWithInit(rng, init, is_final_scan, storage, sum, addend);
+            },
+            [](const auto& left, const auto& right) {
+                return JoinStorages(left, right);
+            },
+            mode);
         ScanIsRunning = false;
-        if (range.empty()) res.my_total = init;
+        if (range.empty())
+            res.my_total = init;
         return res.my_total;
     }
 };
@@ -369,22 +396,19 @@ struct ParallelScanGenericLambda {
 
 #if __TBB_CPP20_CONCEPTS_PRESENT
 template <typename... Args>
-concept can_call_parallel_scan_basic = requires(Args&&... args) {
+concept can_call_parallel_scan_basic = requires( Args&&... args ) {
     tbb::parallel_scan(std::forward<Args>(args)...);
 };
 
 template <typename Range, typename Body>
-concept can_call_imperative_pscan = can_call_parallel_scan_basic<const Range&, Body&>&&
-        can_call_parallel_scan_basic<const Range&, Body&, const tbb::simple_partitioner&>&&
-                can_call_parallel_scan_basic<const Range&, Body&, const tbb::auto_partitioner&>;
+concept can_call_imperative_pscan = can_call_parallel_scan_basic<const Range&, Body&> &&
+                                    can_call_parallel_scan_basic<const Range&, Body&, const tbb::simple_partitioner&> &&
+                                    can_call_parallel_scan_basic<const Range&, Body&, const tbb::auto_partitioner&>;
 
 template <typename Range, typename Value, typename Func, typename Combine>
-concept can_call_functional_pscan
-        = can_call_parallel_scan_basic<const Range&, const Value&, const Func&, const Combine&>&&
-                can_call_parallel_scan_basic<const Range&, const Value&, const Func&, const Combine&,
-                                             const tbb::simple_partitioner&>&&
-                        can_call_parallel_scan_basic<const Range&, const Value&, const Func&, const Combine&,
-                                                     const tbb::auto_partitioner&>;
+concept can_call_functional_pscan = can_call_parallel_scan_basic<const Range&, const Value&, const Func&, const Combine&> &&
+                                    can_call_parallel_scan_basic<const Range&, const Value&, const Func&, const Combine&, const tbb::simple_partitioner&> &&
+                                    can_call_parallel_scan_basic<const Range&, const Value&, const Func&, const Combine&, const tbb::auto_partitioner&>;
 
 using CorrectRange = test_concepts::range::Correct;
 
@@ -411,23 +435,15 @@ void test_pscan_range_constraints() {
     static_assert(!can_call_imperative_pscan<WrongReturnIsDivisible, CorrectBody<WrongReturnIsDivisible>>);
 
     static_assert(can_call_functional_pscan<Correct, int, CorrectFunc<Correct, int>, CorrectCombine<int>>);
-    static_assert(
-            !can_call_functional_pscan<NonCopyable, int, CorrectFunc<NonCopyable, int>, CorrectCombine<int>>);
-    static_assert(!can_call_functional_pscan<NonDestructible, int, CorrectFunc<NonDestructible, int>,
-                                             CorrectCombine<int>>);
-    static_assert(!can_call_functional_pscan<NonSplittable, int, CorrectFunc<NonSplittable, int>,
-                                             CorrectCombine<int>>);
+    static_assert(!can_call_functional_pscan<NonCopyable, int, CorrectFunc<NonCopyable, int>, CorrectCombine<int>>);
+    static_assert(!can_call_functional_pscan<NonDestructible, int, CorrectFunc<NonDestructible, int>, CorrectCombine<int>>);
+    static_assert(!can_call_functional_pscan<NonSplittable, int, CorrectFunc<NonSplittable, int>, CorrectCombine<int>>);
     static_assert(!can_call_functional_pscan<NoEmpty, int, CorrectFunc<NoEmpty, int>, CorrectCombine<int>>);
-    static_assert(!can_call_functional_pscan<EmptyNonConst, int, CorrectFunc<EmptyNonConst, int>,
-                                             CorrectCombine<int>>);
-    static_assert(!can_call_functional_pscan<WrongReturnEmpty, int, CorrectFunc<WrongReturnEmpty, int>,
-                                             CorrectCombine<int>>);
-    static_assert(!can_call_functional_pscan<NoIsDivisible, int, CorrectFunc<NoIsDivisible, int>,
-                                             CorrectCombine<int>>);
-    static_assert(!can_call_functional_pscan<IsDivisibleNonConst, int, CorrectFunc<IsDivisibleNonConst, int>,
-                                             CorrectCombine<int>>);
-    static_assert(!can_call_functional_pscan<WrongReturnIsDivisible, int,
-                                             CorrectFunc<WrongReturnIsDivisible, int>, CorrectCombine<int>>);
+    static_assert(!can_call_functional_pscan<EmptyNonConst, int, CorrectFunc<EmptyNonConst, int>, CorrectCombine<int>>);
+    static_assert(!can_call_functional_pscan<WrongReturnEmpty, int, CorrectFunc<WrongReturnEmpty, int>, CorrectCombine<int>>);
+    static_assert(!can_call_functional_pscan<NoIsDivisible, int, CorrectFunc<NoIsDivisible, int>, CorrectCombine<int>>);
+    static_assert(!can_call_functional_pscan<IsDivisibleNonConst, int, CorrectFunc<IsDivisibleNonConst, int>, CorrectCombine<int>>);
+    static_assert(!can_call_functional_pscan<WrongReturnIsDivisible, int, CorrectFunc<WrongReturnIsDivisible, int>, CorrectCombine<int>>);
 }
 
 void test_pscan_body_constraints() {
@@ -435,15 +451,11 @@ void test_pscan_body_constraints() {
     static_assert(can_call_imperative_pscan<CorrectRange, Correct<CorrectRange>>);
     static_assert(!can_call_imperative_pscan<CorrectRange, NonSplittable<CorrectRange>>);
     static_assert(!can_call_imperative_pscan<CorrectRange, NoPreScanOperatorRoundBrackets<CorrectRange>>);
-    static_assert(!can_call_imperative_pscan<CorrectRange,
-                                             WrongFirstInputPreScanOperatorRoundBrackets<CorrectRange>>);
-    static_assert(!can_call_imperative_pscan<CorrectRange,
-                                             WrongSecondInputPreScanOperatorRoundBrackets<CorrectRange>>);
+    static_assert(!can_call_imperative_pscan<CorrectRange, WrongFirstInputPreScanOperatorRoundBrackets<CorrectRange>>);
+    static_assert(!can_call_imperative_pscan<CorrectRange, WrongSecondInputPreScanOperatorRoundBrackets<CorrectRange>>);
     static_assert(!can_call_imperative_pscan<CorrectRange, NoFinalScanOperatorRoundBrackets<CorrectRange>>);
-    static_assert(!can_call_imperative_pscan<CorrectRange,
-                                             WrongFirstInputFinalScanOperatorRoundBrackets<CorrectRange>>);
-    static_assert(!can_call_imperative_pscan<CorrectRange,
-                                             WrongSecondInputFinalScanOperatorRoundBrackets<CorrectRange>>);
+    static_assert(!can_call_imperative_pscan<CorrectRange, WrongFirstInputFinalScanOperatorRoundBrackets<CorrectRange>>);
+    static_assert(!can_call_imperative_pscan<CorrectRange, WrongSecondInputFinalScanOperatorRoundBrackets<CorrectRange>>);
     static_assert(!can_call_imperative_pscan<CorrectRange, NoReverseJoin<CorrectRange>>);
     static_assert(!can_call_imperative_pscan<CorrectRange, WrongInputReverseJoin<CorrectRange>>);
     static_assert(!can_call_imperative_pscan<CorrectRange, NoAssign<CorrectRange>>);
@@ -452,40 +464,25 @@ void test_pscan_body_constraints() {
 
 void test_pscan_func_constraints() {
     using namespace test_concepts::parallel_scan_function;
-    static_assert(
-            can_call_functional_pscan<CorrectRange, int, Correct<CorrectRange, int>, CorrectCombine<int>>);
-    static_assert(!can_call_functional_pscan<CorrectRange, int, NoOperatorRoundBrackets<CorrectRange, int>,
-                                             CorrectCombine<int>>);
-    static_assert(
-            !can_call_functional_pscan<CorrectRange, int, OperatorRoundBracketsNonConst<CorrectRange, int>,
-                                       CorrectCombine<int>>);
-    static_assert(!can_call_functional_pscan<CorrectRange, int,
-                                             WrongFirstInputOperatorRoundBrackets<CorrectRange, int>,
-                                             CorrectCombine<int>>);
-    static_assert(!can_call_functional_pscan<CorrectRange, int,
-                                             WrongSecondInputOperatorRoundBrackets<CorrectRange, int>,
-                                             CorrectCombine<int>>);
-    static_assert(
-            !can_call_functional_pscan<CorrectRange, int, WrongReturnOperatorRoundBrackets<CorrectRange, int>,
-                                       CorrectCombine<int>>);
+    static_assert(can_call_functional_pscan<CorrectRange, int, Correct<CorrectRange, int>, CorrectCombine<int>>);
+    static_assert(!can_call_functional_pscan<CorrectRange, int, NoOperatorRoundBrackets<CorrectRange, int>, CorrectCombine<int>>);
+    static_assert(!can_call_functional_pscan<CorrectRange, int, OperatorRoundBracketsNonConst<CorrectRange, int>, CorrectCombine<int>>);
+    static_assert(!can_call_functional_pscan<CorrectRange, int, WrongFirstInputOperatorRoundBrackets<CorrectRange, int>, CorrectCombine<int>>);
+    static_assert(!can_call_functional_pscan<CorrectRange, int, WrongSecondInputOperatorRoundBrackets<CorrectRange, int>, CorrectCombine<int>>);
+    static_assert(!can_call_functional_pscan<CorrectRange, int, WrongReturnOperatorRoundBrackets<CorrectRange, int>, CorrectCombine<int>>);
 }
 
 void test_pscan_combine_constraints() {
     using namespace test_concepts::parallel_scan_combine;
     static_assert(can_call_functional_pscan<CorrectRange, int, CorrectFunc<CorrectRange, int>, Correct<int>>);
-    static_assert(!can_call_functional_pscan<CorrectRange, int, CorrectFunc<CorrectRange, int>,
-                                             NoOperatorRoundBrackets<int>>);
-    static_assert(!can_call_functional_pscan<CorrectRange, int, CorrectFunc<CorrectRange, int>,
-                                             OperatorRoundBracketsNonConst<int>>);
-    static_assert(!can_call_functional_pscan<CorrectRange, int, CorrectFunc<CorrectRange, int>,
-                                             WrongFirstInputOperatorRoundBrackets<int>>);
-    static_assert(!can_call_functional_pscan<CorrectRange, int, CorrectFunc<CorrectRange, int>,
-                                             WrongSecondInputOperatorRoundBrackets<int>>);
-    static_assert(!can_call_functional_pscan<CorrectRange, int, CorrectFunc<CorrectRange, int>,
-                                             WrongReturnOperatorRoundBrackets<int>>);
+    static_assert(!can_call_functional_pscan<CorrectRange, int, CorrectFunc<CorrectRange, int>, NoOperatorRoundBrackets<int>>);
+    static_assert(!can_call_functional_pscan<CorrectRange, int, CorrectFunc<CorrectRange, int>, OperatorRoundBracketsNonConst<int>>);
+    static_assert(!can_call_functional_pscan<CorrectRange, int, CorrectFunc<CorrectRange, int>, WrongFirstInputOperatorRoundBrackets<int>>);
+    static_assert(!can_call_functional_pscan<CorrectRange, int, CorrectFunc<CorrectRange, int>, WrongSecondInputOperatorRoundBrackets<int>>);
+    static_assert(!can_call_functional_pscan<CorrectRange, int, CorrectFunc<CorrectRange, int>, WrongReturnOperatorRoundBrackets<int>>);
 }
 
-#endif// __TBB_CPP20_CONCEPTS_PRESENT
+#endif // __TBB_CPP20_CONCEPTS_PRESENT
 
 // Test for parallel_scan with with different partitioners
 //! \brief \ref error_guessing \ref resource_usage
@@ -513,7 +510,7 @@ TEST_CASE("parallel_scan testing with template functor") {
         tbb::global_control control(tbb::global_control::max_allowed_parallelism, concurrency_level);
         for (int mode = 0; mode < 3; mode++) {
             NumberOfLiveStorage = 0;
-            TestInterface(mode, ParallelScanTemplateFunctor());
+            TestInterface(mode,  ParallelScanTemplateFunctor());
             // Test that all workers sleep when no work
             TestCPUUserTime(concurrency_level);
 
@@ -532,7 +529,7 @@ TEST_CASE("parallel_scan testing with lambdas") {
         tbb::global_control control(tbb::global_control::max_allowed_parallelism, concurrency_level);
         for (int mode = 0; mode < 3; mode++) {
             NumberOfLiveStorage = 0;
-            TestInterface(mode, ParallelScanLambda());
+            TestInterface(mode,  ParallelScanLambda());
 
             // Test that all workers sleep when no work
             TestCPUUserTime(concurrency_level);
@@ -553,7 +550,7 @@ TEST_CASE("parallel_scan testing with generic lambdas") {
         tbb::global_control control(tbb::global_control::max_allowed_parallelism, concurrency_level);
         for (int mode = 0; mode < 3; mode++) {
             NumberOfLiveStorage = 0;
-            TestInterface(mode, ParallelScanGenericLambda());
+            TestInterface(mode,  ParallelScanGenericLambda());
             // Test that all workers sleep when no work
             TestCPUUserTime(concurrency_level);
 
@@ -574,4 +571,4 @@ TEST_CASE("parallel_scan constraints") {
     test_pscan_func_constraints();
     test_pscan_combine_constraints();
 }
-#endif// __TBB_CPP20_CONCEPTS_PRESENT
+#endif // __TBB_CPP20_CONCEPTS_PRESENT
diff --git a/external/tbb/test/tbb/test_parallel_sort.cpp b/external/tbb/test/tbb/test_parallel_sort.cpp
index 6b4491d4..595e0dee 100644
--- a/external/tbb/test/tbb/test_parallel_sort.cpp
+++ b/external/tbb/test/tbb/test_parallel_sort.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -14,23 +14,24 @@
     limitations under the License.
 */
 
-#include "common/concepts_common.h"
-#include "common/cpu_usertime.h"
-#include "common/iterator.h"
 #include "common/test.h"
 #include "common/utils_concurrency_limit.h"
+#include "common/cpu_usertime.h"
+#include "common/concepts_common.h"
+#include "common/iterator.h"
 
+#include "tbb/parallel_sort.h"
 #include "tbb/concurrent_vector.h"
 #include "tbb/global_control.h"
-#include "tbb/parallel_sort.h"
 
-#include <cstddef>
-#include <cstdio>
-#include <cstring>
-#include <functional>
 #include <math.h>
-#include <string>
 #include <vector>
+#include <functional>
+#include <string>
+#include <cstring>
+#include <cstddef>
+#include <iterator>
+#include <type_traits>
 
 //! \file test_parallel_sort.cpp
 //! \brief Test for [algorithms.parallel_sort]
@@ -39,34 +40,43 @@
     that parallel_sort uses only the required interface. */
 class Minimal {
     int val;
-
 public:
     void set_val(int i) { val = i; }
-    static bool Less(const Minimal& a, const Minimal& b) { return (a.val < b.val); }
-    static bool AreEqual(Minimal& a, Minimal& b) { return a.val == b.val; }
+    static bool Less (const Minimal &a, const Minimal &b) {
+        return (a.val < b.val);
+    }
+    static bool AreEqual( const Minimal &a, const Minimal &b) {
+       return a.val == b.val;
+    }
 };
 
 //! Defines a comparison function object for Minimal
 class MinimalLessCompare {
 public:
-    bool operator()(const Minimal& a, const Minimal& b) const { return Minimal::Less(a, b); }
+    bool operator() (const Minimal &a, const Minimal &b) const {
+        return Minimal::Less(a,b);
+    }
 };
 
-//! The default validate; but it uses operator== which is not required
-template <typename Range>
-void validate(Range test_range, Range sorted_range, std::size_t size) {
-    for (std::size_t i = 0; i < size; i++) { REQUIRE(test_range[i] == sorted_range[i]); }
+template<typename Value>
+bool compare(const Value& lhs, const Value& rhs) {
+    return lhs == rhs;
 }
 
-//! A validate() specialized to Minimal since it does not define an operator==
-void validate(Minimal* test_range, Minimal* sorted_range, std::size_t size) {
-    for (std::size_t i = 0; i < size; i++) { REQUIRE(Minimal::AreEqual(test_range[i], sorted_range[i])); }
+bool compare(const Minimal& lhs, const Minimal& rhs) {
+    return Minimal::AreEqual(lhs, rhs);
 }
 
-//! A validate() specialized to concurrent_vector<Minimal> since it does not define an operator==
-void validate(tbb::concurrent_vector<Minimal>::iterator test_range,
-              tbb::concurrent_vector<Minimal>::iterator sorted_range, std::size_t size) {
-    for (std::size_t i = 0; i < size; i++) { REQUIRE(Minimal::AreEqual(test_range[i], sorted_range[i])); }
+template<typename Range>
+void validate(Range test_range, Range sorted_range) {
+    using value_type = typename std::iterator_traits<decltype(std::begin(test_range))>::value_type;
+    REQUIRE(
+        std::equal(std::begin(test_range), std::end(test_range), std::begin(sorted_range),
+            [](const value_type& tested, const value_type& reference) {
+                return compare(tested, reference);
+            }
+        )
+    );
 }
 
 //! The default initialization routine.
@@ -86,16 +96,22 @@ void set(Minimal& minimal_ref, ValueType new_value) {
     minimal_ref.set_val(static_cast<int>(new_value));
 }
 
+template <typename KeyType>
+void set(std::string& string_ref, KeyType key) {
+    string_ref = std::to_string(static_cast<float>(key));
+}
+
+
 template <typename RandomAccessIterator, typename Compare>
 bool fill_ranges(RandomAccessIterator test_range_begin, RandomAccessIterator sorted_range_begin,
-                 std::size_t size, const Compare& compare) {
+    std::size_t size, const Compare &compare) {
 
     static char test_case = 0;
     const char num_cases = 3;
 
     if (test_case < num_cases) {
         // switch on the current test case, filling the test_list and sorted_list appropriately
-        switch (test_case) {
+        switch(test_case) {
             case 0:
                 /* use sin to generate the values */
                 for (std::size_t i = 0; i < size; i++) {
@@ -128,140 +144,79 @@ bool fill_ranges(RandomAccessIterator test_range_begin, RandomAccessIterator sor
     return false;
 }
 
-//! The initialization routine specialized to the class string
-/*! strings are created from floats.
-*/
-bool fill_ranges(std::string* iter, std::string* sorted_list, std::size_t size,
-                 const std::less<std::string>& compare) {
-    static char test_case = 0;
-    const char num_cases = 1;
-
-    if (test_case < num_cases) {
-        /* use sin to generate the values */
-        for (std::size_t i = 0; i < size; i++) {
-            char buffer[20];
-// Getting rid of secure warning issued by VC 14 and newer
-#if _MSC_VER && __STDC_SECURE_LIB__ >= 200411
-            sprintf_s(buffer, sizeof(buffer), "%f", float(sin(float(i))));
-#else
-            sprintf(buffer, "%f", float(sin(float(i))));
-#endif
-            sorted_list[i] = iter[i] = std::string(buffer);
-        }
-
-        std::sort(sorted_list, sorted_list + size, compare);
-        test_case++;
-        return true;
-    }
-    test_case = 0;
-    return false;
-}
-
 //! The default test routine.
 /*! Tests all data set sizes from 0 to N, all grainsizes from 0 to G=10, and selects from
     all possible interfaces to parallel_sort depending on whether a scratch space and
     compare have been provided.
 */
-template <typename ValueType, std::size_t Size>
+template<typename ContainerType, std::size_t Size>
 struct parallel_sort_test {
     static void run() {
-        std::less<ValueType> default_comp;
-        ValueType* array = new ValueType[Size];
-        ValueType* sorted_array = new ValueType[Size];
+        std::less<typename ContainerType::value_type> default_comp;
+        ContainerType range(Size);
+        ContainerType sorted_range(Size);
 
-        while (fill_ranges(array, sorted_array, Size, default_comp)) {
-            tbb::parallel_sort(array, array + Size);
-            validate(array, sorted_array, Size);
+        while (fill_ranges(std::begin(range), std::begin(sorted_range), Size, default_comp)) {
+            tbb::parallel_sort(range);
+            validate(range, sorted_range);
         }
-
-        delete[] array;
-        delete[] sorted_array;
     }
 
-    template <typename Comparator>
+    template<typename Comparator>
     static void run(Comparator& comp) {
-        ValueType* array = new ValueType[Size];
-        ValueType* sorted_array = new ValueType[Size];
+        ContainerType range(Size);
+        ContainerType sorted_range(Size);
 
-        while (fill_ranges(array, sorted_array, Size, comp)) {
-            tbb::parallel_sort(array, array + Size, comp);
-            validate(array, sorted_array, Size);
+        while (fill_ranges(std::begin(range), std::begin(sorted_range), Size, comp)) {
+            tbb::parallel_sort(range, comp);
+            validate(range, sorted_range);
         }
-
-        delete[] array;
-        delete[] sorted_array;
     }
 };
 
-template <typename ValueType, std::size_t Size>
-struct parallel_sort_test<tbb::concurrent_vector<ValueType>, Size> {
-    static void run() {
-        std::less<ValueType> default_comp;
-        tbb::concurrent_vector<ValueType> vector(Size);
-        tbb::concurrent_vector<ValueType> sorted_vector(Size);
-
-        while (fill_ranges(std::begin(vector), std::begin(sorted_vector), Size, default_comp)) {
-            tbb::parallel_sort(vector);
-            validate(std::begin(vector), std::begin(sorted_vector), Size);
-        }
-    }
-
-    template <typename Comparator>
-    static void run(Comparator& comp) {
-        tbb::concurrent_vector<ValueType> vector(Size);
-        tbb::concurrent_vector<ValueType> sorted_vector(Size);
-
-        while (fill_ranges(std::begin(vector), std::begin(sorted_vector), Size, comp)) {
-            tbb::parallel_sort(vector, comp);
-            validate(std::begin(vector), std::begin(sorted_vector), Size);
-        }
-    }
-};
-
-template <typename ValueType, typename Comparator>
+template<typename ContainerType, typename Comparator>
 void parallel_sort_test_suite() {
     Comparator comp;
     for (auto concurrency_level : utils::concurrency_range()) {
         tbb::global_control control(tbb::global_control::max_allowed_parallelism, concurrency_level);
-        parallel_sort_test<ValueType, /*Size*/ 0>::run(comp);
-        parallel_sort_test<ValueType, /*Size*/ 1>::run(comp);
-        parallel_sort_test<ValueType, /*Size*/ 10>::run(comp);
-        parallel_sort_test<ValueType, /*Size*/ 9999>::run(comp);
-        parallel_sort_test<ValueType, /*Size*/ 50000>::run(comp);
+        parallel_sort_test<ContainerType, /*Size*/0    >::run(comp);
+        parallel_sort_test<ContainerType, /*Size*/1    >::run(comp);
+        parallel_sort_test<ContainerType, /*Size*/10   >::run(comp);
+        parallel_sort_test<ContainerType, /*Size*/9999 >::run(comp);
+        parallel_sort_test<ContainerType, /*Size*/50000>::run(comp);
     }
 }
 
-template <typename ValueType>
+template<typename ContainerType>
 void parallel_sort_test_suite() {
     for (auto concurrency_level : utils::concurrency_range()) {
         tbb::global_control control(tbb::global_control::max_allowed_parallelism, concurrency_level);
-        parallel_sort_test<ValueType, /*Size*/ 0>::run();
-        parallel_sort_test<ValueType, /*Size*/ 1>::run();
-        parallel_sort_test<ValueType, /*Size*/ 10>::run();
-        parallel_sort_test<ValueType, /*Size*/ 9999>::run();
-        parallel_sort_test<ValueType, /*Size*/ 50000>::run();
+        parallel_sort_test<ContainerType, /*Size*/0    >::run();
+        parallel_sort_test<ContainerType, /*Size*/1    >::run();
+        parallel_sort_test<ContainerType, /*Size*/10   >::run();
+        parallel_sort_test<ContainerType, /*Size*/9999 >::run();
+        parallel_sort_test<ContainerType, /*Size*/50000>::run();
     }
 }
 
 #if __TBB_CPP20_CONCEPTS_PRESENT
 template <typename RandomAccessIterator>
-concept can_call_parallel_sort_with_iterator = requires(RandomAccessIterator it) {
+concept can_call_parallel_sort_with_iterator = requires( RandomAccessIterator it ) {
     tbb::parallel_sort(it, it);
 };
 
 template <typename RandomAccessIterator, typename Compare>
-concept can_call_parallel_sort_with_iterator_and_compare
-        = requires(RandomAccessIterator it, const Compare& compare) {
+concept can_call_parallel_sort_with_iterator_and_compare = requires( RandomAccessIterator it, const Compare& compare ) {
     tbb::parallel_sort(it, it, compare);
 };
 
 template <typename CBS>
-concept can_call_parallel_sort_with_cbs = requires(CBS& cbs) {
+concept can_call_parallel_sort_with_cbs = requires( CBS& cbs ) {
     tbb::parallel_sort(cbs);
 };
 
 template <typename CBS, typename Compare>
-concept can_call_parallel_sort_with_cbs_and_compare = requires(CBS& cbs, const Compare& compare) {
+concept can_call_parallel_sort_with_cbs_and_compare = requires( CBS& cbs, const Compare& compare ) {
     tbb::parallel_sort(cbs, compare);
 };
 
@@ -269,72 +224,102 @@ template <typename T>
 using CorrectCompare = test_concepts::compare::Correct<T>;
 
 void test_psort_iterator_constraints() {
+    using namespace test_concepts::parallel_sort_value;
+
     static_assert(can_call_parallel_sort_with_iterator<utils::RandomIterator<int>>);
     static_assert(can_call_parallel_sort_with_iterator<typename std::vector<int>::iterator>);
     static_assert(!can_call_parallel_sort_with_iterator<utils::ForwardIterator<int>>);
     static_assert(!can_call_parallel_sort_with_iterator<utils::InputIterator<int>>);
-
-    static_assert(can_call_parallel_sort_with_iterator_and_compare<utils::RandomIterator<int>,
-                                                                   CorrectCompare<int>>);
-    static_assert(can_call_parallel_sort_with_iterator_and_compare<typename std::vector<int>::iterator,
-                                                                   CorrectCompare<int>>);
-    static_assert(!can_call_parallel_sort_with_iterator_and_compare<utils::ForwardIterator<int>,
-                                                                    CorrectCompare<int>>);
-    static_assert(!can_call_parallel_sort_with_iterator_and_compare<utils::InputIterator<int>,
-                                                                    CorrectCompare<int>>);
+    static_assert(!can_call_parallel_sort_with_iterator<utils::RandomIterator<NonMovableValue>>);
+    static_assert(!can_call_parallel_sort_with_iterator<utils::RandomIterator<NonMoveAssignableValue>>);
+    static_assert(!can_call_parallel_sort_with_iterator<utils::RandomIterator<NonComparableValue>>);
+    static_assert(!can_call_parallel_sort_with_iterator<test_concepts::ConstantIT<int>>);
+
+    static_assert(can_call_parallel_sort_with_iterator_and_compare<utils::RandomIterator<int>, CorrectCompare<int>>);
+    static_assert(can_call_parallel_sort_with_iterator_and_compare<typename std::vector<int>::iterator, CorrectCompare<int>>);
+    static_assert(!can_call_parallel_sort_with_iterator_and_compare<utils::ForwardIterator<int>, CorrectCompare<int>>);
+    static_assert(!can_call_parallel_sort_with_iterator_and_compare<utils::InputIterator<int>, CorrectCompare<int>>);
+    static_assert(!can_call_parallel_sort_with_iterator_and_compare<utils::RandomIterator<NonMovableValue>, CorrectCompare<NonMovableValue>>);
+    static_assert(!can_call_parallel_sort_with_iterator_and_compare<utils::RandomIterator<NonMoveAssignableValue>, CorrectCompare<NonMoveAssignableValue>>);
+    static_assert(!can_call_parallel_sort_with_iterator_and_compare<test_concepts::ConstantIT<int>, CorrectCompare<const int>>);
 }
 
 void test_psort_compare_constraints() {
     using namespace test_concepts::compare;
-    using CorrectIterator = test_concepts::container_based_sequence::iterator;
+
     using CorrectCBS = test_concepts::container_based_sequence::Correct;
+    using CorrectIterator = CorrectCBS::iterator;
     static_assert(can_call_parallel_sort_with_iterator_and_compare<CorrectIterator, Correct<int>>);
-    static_assert(
-            !can_call_parallel_sort_with_iterator_and_compare<CorrectIterator, NoOperatorRoundBrackets<int>>);
-    static_assert(
-            !can_call_parallel_sort_with_iterator_and_compare<CorrectIterator,
-                                                              WrongFirstInputOperatorRoundBrackets<int>>);
-    static_assert(
-            !can_call_parallel_sort_with_iterator_and_compare<CorrectIterator,
-                                                              WrongSecondInputOperatorRoundBrackets<int>>);
-    static_assert(!can_call_parallel_sort_with_iterator_and_compare<CorrectIterator,
-                                                                    WrongReturnOperatorRoundBrackets<int>>);
+    static_assert(!can_call_parallel_sort_with_iterator_and_compare<CorrectIterator, NoOperatorRoundBrackets<int>>);
+    static_assert(!can_call_parallel_sort_with_iterator_and_compare<CorrectIterator, WrongFirstInputOperatorRoundBrackets<int>>);
+    static_assert(!can_call_parallel_sort_with_iterator_and_compare<CorrectIterator, WrongSecondInputOperatorRoundBrackets<int>>);
+    static_assert(!can_call_parallel_sort_with_iterator_and_compare<CorrectIterator, WrongReturnOperatorRoundBrackets<int>>);
 
     static_assert(can_call_parallel_sort_with_cbs_and_compare<CorrectCBS, Correct<int>>);
     static_assert(!can_call_parallel_sort_with_cbs_and_compare<CorrectCBS, NoOperatorRoundBrackets<int>>);
-    static_assert(!can_call_parallel_sort_with_cbs_and_compare<CorrectCBS,
-                                                               WrongFirstInputOperatorRoundBrackets<int>>);
-    static_assert(!can_call_parallel_sort_with_cbs_and_compare<CorrectCBS,
-                                                               WrongSecondInputOperatorRoundBrackets<int>>);
-    static_assert(
-            !can_call_parallel_sort_with_cbs_and_compare<CorrectCBS, WrongReturnOperatorRoundBrackets<int>>);
+    static_assert(!can_call_parallel_sort_with_cbs_and_compare<CorrectCBS, WrongFirstInputOperatorRoundBrackets<int>>);
+    static_assert(!can_call_parallel_sort_with_cbs_and_compare<CorrectCBS, WrongSecondInputOperatorRoundBrackets<int>>);
+    static_assert(!can_call_parallel_sort_with_cbs_and_compare<CorrectCBS, WrongReturnOperatorRoundBrackets<int>>);
 }
 
 void test_psort_cbs_constraints() {
     using namespace test_concepts::container_based_sequence;
-    using CorrectCompare = test_concepts::compare::Correct<int>;
+    using namespace test_concepts::parallel_sort_value;
+
     static_assert(can_call_parallel_sort_with_cbs<Correct>);
     static_assert(!can_call_parallel_sort_with_cbs<NoBegin>);
     static_assert(!can_call_parallel_sort_with_cbs<NoEnd>);
     static_assert(!can_call_parallel_sort_with_cbs<ForwardIteratorCBS>);
+    static_assert(!can_call_parallel_sort_with_cbs<ConstantCBS>);
+
+    static_assert(can_call_parallel_sort_with_cbs<CustomValueCBS<CorrectValue>>);
+    static_assert(!can_call_parallel_sort_with_cbs<CustomValueCBS<NonMovableValue>>);
+    static_assert(!can_call_parallel_sort_with_cbs<CustomValueCBS<NonMoveAssignableValue>>);
+    static_assert(!can_call_parallel_sort_with_cbs<CustomValueCBS<NonComparableValue>>);\
 
+    using CorrectCompare = test_concepts::compare::Correct<int>;
+    using NonMovableCompare = test_concepts::compare::Correct<NonMovableValue>;
+    using NonMoveAssignableCompare = test_concepts::compare::Correct<NonMoveAssignableValue>;
     static_assert(can_call_parallel_sort_with_cbs_and_compare<Correct, CorrectCompare>);
     static_assert(!can_call_parallel_sort_with_cbs_and_compare<NoBegin, CorrectCompare>);
     static_assert(!can_call_parallel_sort_with_cbs_and_compare<NoEnd, CorrectCompare>);
     static_assert(!can_call_parallel_sort_with_cbs_and_compare<ForwardIteratorCBS, CorrectCompare>);
+    static_assert(!can_call_parallel_sort_with_cbs_and_compare<ConstantCBS, CorrectCompare>);
+    static_assert(!can_call_parallel_sort_with_cbs_and_compare<CustomValueCBS<NonMovableValue>, NonMovableCompare>);
+    static_assert(!can_call_parallel_sort_with_cbs_and_compare<CustomValueCBS<NonMoveAssignableValue>, NonMoveAssignableCompare>);
 }
 
-#endif// __TBB_CPP20_CONCEPTS_PRESENT
+#endif // __TBB_CPP20_CONCEPTS_PRESENT
+
+template<typename T>
+struct minimal_span {
+    minimal_span(T* input_data, std::size_t input_size)
+     : data{input_data}
+     , size{input_size}
+    {}
+
+    T* begin() const {
+        return data;
+    }
+    T* end() const {
+        return data + size;
+    }
+private:
+    T* data;
+    std::size_t size;
+};
 
 //! Minimal array sorting test (less comparator)
 //! \brief \ref error_guessing
 TEST_CASE("Minimal array sorting test (less comparator)") {
-    parallel_sort_test_suite<Minimal, MinimalLessCompare>();
+    parallel_sort_test_suite<std::vector<Minimal>, MinimalLessCompare>();
 }
 
 //! Float array sorting test (default comparator)
 //! \brief \ref error_guessing
-TEST_CASE("Float array sorting test (default comparator)") { parallel_sort_test_suite<float>(); }
+TEST_CASE("Float array sorting test (default comparator)") {
+    parallel_sort_test_suite<std::vector<float>>();
+}
 
 //! tbb::concurrent_vector<float> sorting test (less comparator)
 //! \brief \ref error_guessing
@@ -351,12 +336,14 @@ TEST_CASE("tbb::concurrent_vector<float> sorting test (default comparator)") {
 //! Array of strings sorting test (less comparator)
 //! \brief \ref error_guessing
 TEST_CASE("Array of strings sorting test (less comparator)") {
-    parallel_sort_test_suite<std::string, std::less<std::string>>();
+    parallel_sort_test_suite<std::vector<std::string>, std::less<std::string>>();
 }
 
 //! Array of strings sorting test (default comparator)
 //! \brief \ref error_guessing
-TEST_CASE("Array of strings sorting test (default comparator)") { parallel_sort_test_suite<std::string>(); }
+TEST_CASE("Array of strings sorting test (default comparator)") {
+    parallel_sort_test_suite<std::vector<std::string>>();
+}
 
 //! tbb::concurrent_vector<Minimal> sorting test (less comparator)
 //! \brief \ref error_guessing
@@ -364,29 +351,72 @@ TEST_CASE("tbb::concurrent_vector<Minimal> sorting test (less comparator)") {
     parallel_sort_test_suite<tbb::concurrent_vector<Minimal>, MinimalLessCompare>();
 }
 
-const int vector_size = 10000;
+constexpr std::size_t array_size = 10000;
+
+template<typename SortFunctor>
+void sort_array_test(const SortFunctor& sort_functor) {
+    int test_array[array_size];
+    for (std::size_t i = 0; i < array_size; ++i)
+        test_array[i] = rand() % array_size;
+
+    sort_functor(test_array);
+
+    for (std::size_t i = 0; i < array_size - 1; ++i)
+        REQUIRE_MESSAGE(test_array[i] <= test_array[i + 1], "Testing data not sorted");
+}
 
 //! Array sorting test (default comparator)
 //! \brief \ref error_guessing
 TEST_CASE("Array sorting test (default comparator)") {
-    for (auto concurrency_level : utils::concurrency_range()) {
+    for ( auto concurrency_level : utils::concurrency_range() ) {
         tbb::global_control control(tbb::global_control::max_allowed_parallelism, concurrency_level);
+        sort_array_test([](int (&array)[array_size]) {
+            tbb::parallel_sort(array);
+        });
+    }
+}
 
-        int test_array[vector_size];
-        for (int i = 0; i < vector_size; ++i) test_array[i] = rand() % vector_size;
+//! Test array sorting via rvalue span (default comparator)
+//! \brief \ref error_guessing
+TEST_CASE("Test array sorting via rvalue span (default comparator)") {
+    sort_array_test([](int (&array)[array_size]) {
+        tbb::parallel_sort(minimal_span<int>{array, array_size});
+    });
+}
 
-        tbb::parallel_sort(test_array);
+//! Test array sorting via const span (default comparator)
+//! \brief \ref error_guessing
+TEST_CASE("Test array sorting via const span (default comparator)") {
+    sort_array_test([](int (&array)[array_size]) {
+        const minimal_span<int> span(array, array_size);
+        tbb::parallel_sort(span);
+    });
+}
 
-        for (int i = 0; i < vector_size - 1; ++i)
-            REQUIRE_MESSAGE(test_array[i] <= test_array[i + 1], "Testing data not sorted");
-    }
+//! Test rvalue container with stateful comparator
+//! \brief \ref error_guessing
+TEST_CASE("Test rvalue container with stateful comparator") {
+    // Create sorted range
+    std::vector<std::size_t> test_vector(array_size);
+    for (std::size_t i = 0; i < array_size; ++i)
+        test_vector[i] = i;
+
+    std::atomic<std::size_t> count{0};
+    tbb::parallel_sort(std::move(test_vector), [&](std::size_t lhs, std::size_t rhs) {
+        ++count;
+        return lhs < rhs;
+    });
+
+    // The comparator should be called at least (size - 1) times to check that the array is sorted
+    REQUIRE_MESSAGE(count >= array_size - 1, "Incorrect comparator calls count");
 }
 
 //! Testing workers going to sleep
 //! \brief \ref resource_usage
 TEST_CASE("That all workers sleep when no work") {
-    int test_array[vector_size];
-    for (int i = 0; i < vector_size; ++i) test_array[i] = rand() % vector_size;
+    int test_array[array_size];
+    for (std::size_t i = 0; i < array_size; ++i)
+        test_array[i] = rand() % array_size;
 
     tbb::parallel_sort(test_array);
     TestCPUUserTime(utils::get_platform_max_threads());
@@ -399,4 +429,4 @@ TEST_CASE("parallel_sort constraints") {
     test_psort_compare_constraints();
     test_psort_cbs_constraints();
 }
-#endif// __TBB_CPP20_CONCEPTS_PRESENT
+#endif // __TBB_CPP20_CONCEPTS_PRESENT
diff --git a/external/tbb/test/tbb/test_partitioner.cpp b/external/tbb/test/tbb/test_partitioner.cpp
index d288929c..e0fb98fc 100644
--- a/external/tbb/test/tbb/test_partitioner.cpp
+++ b/external/tbb/test/tbb/test_partitioner.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2021 Intel Corporation
+    Copyright (c) 2021-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -16,118 +16,214 @@
 
 #include "common/test.h"
 
-#include "tbb/global_control.h"
 #include "tbb/parallel_for.h"
 #include "tbb/task_arena.h"
+#include "tbb/task_scheduler_observer.h"
+#include "tbb/global_control.h"
+#include "oneapi/tbb/mutex.h"
 
-#include "common/dummy_body.h"
-#include "common/spin_barrier.h"
 #include "common/utils.h"
 #include "common/utils_concurrency_limit.h"
+#include "common/dummy_body.h"
+#include "common/spin_barrier.h"
 
 #include <cstddef>
 #include <utility>
 #include <vector>
+#include <algorithm> // std::min_element
 
 //! \file test_partitioner.cpp
 //! \brief Test for [internal] functionality
 
 namespace task_affinity_retention {
 
-    template <typename PerBodyFunc>
-    float test(PerBodyFunc&& body) {
-        const std::size_t num_threads = 2 * utils::get_platform_max_threads();
-        tbb::global_control concurrency(tbb::global_control::max_allowed_parallelism, num_threads);
-        tbb::task_arena big_arena(static_cast<int>(num_threads));
-
-        const std::size_t repeats = 100;
-        const std::size_t per_thread_iters = 1000;
-
-        using range = std::pair<std::size_t, std::size_t>;
-        using execution_trace = std::vector<std::vector<range>>;
-
-        execution_trace trace(num_threads);
-        for (auto& v : trace) v.reserve(repeats);
-
-        for (std::size_t repeat = 0; repeat < repeats; ++repeat) {
-            big_arena.execute([&] {
-                tbb::parallel_for(
-                        tbb::blocked_range<std::size_t>(0, per_thread_iters * num_threads),
-                        [&](const tbb::blocked_range<std::size_t>& r) {
-                            int thread_id = tbb::this_task_arena::current_thread_index();
-                            trace[thread_id].emplace_back(r.begin(), r.end());
-
-                            const bool is_uniform_split = r.size() == per_thread_iters;
-                            CHECK_MESSAGE(is_uniform_split,
-                                          "static partitioner split the range incorrectly.");
-
-                            std::this_thread::yield();
-
-                            std::forward<PerBodyFunc>(body)();
-                        },
-                        tbb::static_partitioner());
-            });
-            // TODO:
-            //   - Consider introducing an observer to guarantee the threads left the arena.
+class leaving_observer : public tbb::task_scheduler_observer {
+    std::atomic<int> my_thread_count{};
+public:
+    leaving_observer(tbb::task_arena& a) : tbb::task_scheduler_observer(a) {
+        observe(true);
+    }
+
+    void on_scheduler_entry(bool) override {
+        ++my_thread_count;
+    }
+
+    void on_scheduler_exit(bool) override {
+        --my_thread_count;
+    }
+
+    void wait_leave() {
+        while (my_thread_count.load() != 0) {
+            std::this_thread::yield();
         }
+    }
+};
+
+template <typename PerBodyFunc> float test(PerBodyFunc&& body) {
+    const std::size_t num_threads = 2 * utils::get_platform_max_threads();
+    tbb::global_control concurrency(tbb::global_control::max_allowed_parallelism, num_threads);
+    tbb::task_arena big_arena(static_cast<int>(num_threads));
+    leaving_observer observer(big_arena);
+
+#if __TBB_USE_THREAD_SANITIZER
+    // Reduce execution time under Thread Sanitizer
+    const std::size_t repeats = 50;
+#elif EMSCRIPTEN
+    // Reduce execution time for emscripten
+    const std::size_t repeats = 10;
+#else
+    const std::size_t repeats = 100;
+#endif
+    const std::size_t per_thread_iters = 1000;
+
+    using range = std::pair<std::size_t, std::size_t>;
+    using execution_trace = std::vector< std::vector<range> >;
+
+    execution_trace trace(num_threads);
+    for (auto& v : trace)
+        v.reserve(repeats);
+
+    for (std::size_t repeat = 0; repeat < repeats; ++repeat) {
+        big_arena.execute([&] {
+            tbb::parallel_for(
+                tbb::blocked_range<std::size_t>(0, per_thread_iters * num_threads),
+                [&](const tbb::blocked_range<std::size_t>& r) {
+                    int thread_id = tbb::this_task_arena::current_thread_index();
+                    trace[thread_id].emplace_back(r.begin(), r.end());
+
+                    const bool is_uniform_split = r.size() == per_thread_iters;
+                    CHECK_MESSAGE(is_uniform_split, "static partitioner split the range incorrectly.");
+
+                    std::this_thread::yield();
+
+                    std::forward<PerBodyFunc>(body)();
+                },
+                tbb::static_partitioner()
+            );
+        });
+        // To avoid tasks stealing in the beginning of the parallel algorithm, the test waits for
+        // the threads to leave the arena, so that on the next iteration they have tasks assigned
+        // in their mailboxes and, thus, don't need to search for work to do in other task pools.
+        observer.wait_leave();
+    }
+
+    std::size_t range_shifts = 0;
+    for (std::size_t thread_id = 0; thread_id < num_threads; ++thread_id) {
+        auto trace_size = trace[thread_id].size();
+        if (trace_size > 1) {
+            auto previous_call_range = trace[thread_id][1];
+
+            for (std::size_t invocation = 2; invocation < trace_size; ++invocation) {
+                const auto& current_call_range = trace[thread_id][invocation];
 
-        std::size_t range_shifts = 0;
-        for (std::size_t thread_id = 0; thread_id < num_threads; ++thread_id) {
-            auto trace_size = trace[thread_id].size();
-            if (trace_size > 1) {
-                auto previous_call_range = trace[thread_id][1];
-
-                for (std::size_t invocation = 2; invocation < trace_size; ++invocation) {
-                    const auto& current_call_range = trace[thread_id][invocation];
-
-                    const bool is_range_changed = previous_call_range != current_call_range;
-                    if (is_range_changed) {
-                        previous_call_range = current_call_range;
-                        // count thread changes its execution strategy
-                        ++range_shifts;
-                    }
+                const bool is_range_changed = previous_call_range != current_call_range;
+                if (is_range_changed) {
+                    previous_call_range = current_call_range;
+                    // count thread changes its execution strategy
+                    ++range_shifts;
                 }
             }
+        }
 
 #if TBB_USE_DEBUG
-            WARN_MESSAGE(trace_size <= repeats, "Thread " << thread_id << " executed extra "
-                                                          << trace_size - repeats
-                                                          << " ranges assigned to other threads.");
-            WARN_MESSAGE(trace_size >= repeats, "Thread " << thread_id << " executed " << repeats - trace_size
-                                                          << " fewer ranges than expected.");
+        WARN_MESSAGE(
+            trace_size <= repeats,
+            "Thread " << thread_id << " executed extra " << trace_size - repeats
+            << " ranges assigned to other threads."
+        );
+        WARN_MESSAGE(
+            trace_size >= repeats,
+            "Thread " << thread_id << " executed " << repeats - trace_size
+            << " fewer ranges than expected."
+        );
 #endif
-        }
+    }
 
 #if TBB_USE_DEBUG
-        WARN_MESSAGE(range_shifts == 0, "Threads change subranges " << range_shifts << " times out of "
-                                                                    << num_threads * repeats - num_threads
-                                                                    << " possible.");
+    WARN_MESSAGE(
+        range_shifts == 0,
+        "Threads change subranges " << range_shifts << " times out of "
+        << num_threads * repeats - num_threads << " possible."
+    );
 #endif
 
-        return float(range_shifts) / float(repeats * num_threads);
-    }
+    return float(range_shifts) / float(repeats * num_threads);
+}
 
-    void relaxed_test() {
-        float range_shifts_part = test(/*per body invocation call*/ [] {});
-        const float require_tolerance = 0.5f;
-        // TODO: investigate why switching could happen in more than half of the cases
-        WARN_MESSAGE((0 <= range_shifts_part && range_shifts_part <= require_tolerance),
-                     "Tasks affinitization was not respected in " << range_shifts_part * 100
-                                                                  << "% of the cases.");
-    }
+void relaxed_test() {
+    float range_shifts_part = test(/*per body invocation call*/[]{});
+    const float require_tolerance = 0.5f;
+    // TODO: investigate why switching could happen in more than half of the cases
+    WARN_MESSAGE(
+        (0 <= range_shifts_part && range_shifts_part <= require_tolerance),
+        "Tasks affinitization was not respected in " << range_shifts_part * 100 << "% of the cases."
+    );
+}
 
-    void strict_test() {
-        utils::SpinBarrier barrier(2 * utils::get_platform_max_threads());
-        const float tolerance = 1e-5f;
-        while (test(/*per body invocation call*/ [&barrier] { barrier.wait(); }) > tolerance)
-            ;
-    }
+void strict_test() {
+    utils::SpinBarrier barrier(2 * utils::get_platform_max_threads());
+    const float tolerance = 1e-5f;
+    while (test(/*per body invocation call*/[&barrier] { barrier.wait(); }) > tolerance);
+}
 
-}// namespace task_affinity_retention
+} // namespace task_affinity_retention
 
+// global_control::max_allowed_parallelism functionality is not covered by TCM
+#if !__TBB_TCM_TESTING_ENABLED
 //! Testing affinitized tasks are not stolen
 //! \brief \ref error_guessing
 TEST_CASE("Threads respect task affinity") {
     task_affinity_retention::relaxed_test();
     task_affinity_retention::strict_test();
 }
+#endif
+
+template <typename Range>
+void test_custom_range(int diff_mult) {
+    int num_trials = 100;
+
+    std::vector<std::vector<std::size_t>> results(num_trials);
+    oneapi::tbb::mutex results_mutex;
+
+    for (int i = 0; i < num_trials; ++i) {
+        oneapi::tbb::parallel_for(Range(0, int(100 * utils::get_platform_max_threads()), 1), [&] (const Range& r) {
+            oneapi::tbb::mutex::scoped_lock lock(results_mutex);
+            results[i].push_back(r.size());
+        }, oneapi::tbb::static_partitioner{});
+    }
+
+    for (auto& res : results) {
+        REQUIRE(res.size() == utils::get_platform_max_threads());
+
+        std::size_t min_size = *std::min_element(res.begin(), res.end());
+        for (auto elem : res) {
+            REQUIRE(min_size * diff_mult + 2 >= elem);
+        }
+    }
+}
+
+//! \brief \ref regression
+TEST_CASE("Test partitioned tasks count and size for static_partitioner") {
+    class custom_range : public oneapi::tbb::blocked_range<int> {
+        using base_type = oneapi::tbb::blocked_range<int>;
+    public:
+        custom_range(int l, int r, int g) : base_type(l, r, g) {}
+        custom_range(const custom_range& r) : base_type(r) {}
+
+        custom_range(custom_range& r, tbb::split) : base_type(r, tbb::split()) {}
+    };
+
+    test_custom_range<custom_range>(2);
+
+    class custom_range_with_psplit : public oneapi::tbb::blocked_range<int> {
+        using base_type = oneapi::tbb::blocked_range<int>;
+    public:
+        custom_range_with_psplit(int l, int r, int g) : base_type(l, r, g) {}
+        custom_range_with_psplit(const custom_range_with_psplit& r) : base_type(r) {}
+
+        custom_range_with_psplit(custom_range_with_psplit& r, tbb::split) : base_type(r, tbb::split()) {}
+        custom_range_with_psplit(custom_range_with_psplit& r, tbb::proportional_split& p) : base_type(r, p) {}
+    };
+
+    test_custom_range<custom_range_with_psplit>(1);
+}
diff --git a/external/tbb/test/tbb/test_partitioner.h b/external/tbb/test/tbb/test_partitioner.h
index 073ca17c..93a02a7a 100644
--- a/external/tbb/test/tbb/test_partitioner.h
+++ b/external/tbb/test/tbb/test_partitioner.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -288,7 +288,7 @@ struct TreeNode {
 };
 
 TreeNode* make_node(size_t range_begin, size_t range_end, size_t affinity,
-                    TreeNode* left = NULL, TreeNode* right = NULL) {
+                    TreeNode* left = nullptr, TreeNode* right = nullptr) {
     CHECK_MESSAGE((range_begin <= range_end), "Incorrect range interval");
     return new TreeNode(range_begin, range_end, affinity, left, right);
 }
@@ -298,7 +298,7 @@ TreeNode* make_node(size_t range_begin, size_t range_end, size_t affinity,
 // Note: BinaryTree deletes all TreeNode objects pushed into it in a destruction phase
 class BinaryTree {
 public:
-    BinaryTree() : m_root(NULL) { }
+    BinaryTree() : m_root(nullptr) { }
     ~BinaryTree() {
         if (m_root)
             remove_node_recursively(m_root);
@@ -360,7 +360,7 @@ class BinaryTree {
             return;
         }
 
-        CHECK_MESSAGE(root_node->m_right != nullptr, "Right child is NULL but must be present");
+        CHECK_MESSAGE(root_node->m_right != nullptr, "Right child is nullptr but must be present");
         if (is_subnode(root_node->m_right, node)) {
             push_subnode(root_node->m_right, node);
             return;
@@ -374,11 +374,11 @@ class BinaryTree {
     bool is_look_like_left_sibling(TreeNode *root_node, TreeNode *node) {
         if (root_node->m_range_begin == node->m_range_begin)
             return true;
-        CHECK_MESSAGE(root_node->m_range_end == node->m_range_end, NULL);
+        CHECK_MESSAGE(root_node->m_range_end == node->m_range_end, nullptr);
         return false;
     }
 
-    bool has_left_child(TreeNode *node) { return node->m_left != NULL; }
+    bool has_left_child(TreeNode *node) { return node->m_left != nullptr; }
 
     bool is_subnode(TreeNode *root_node, TreeNode *node) {
         return root_node->m_range_begin <= node->m_range_begin &&
@@ -415,17 +415,17 @@ class BinaryTree {
     }
 
     bool compare_nodes(TreeNode* node1, TreeNode* node2) const {
-        if (node1 == NULL && node2 == NULL) return true;
-        if (node1 == NULL || node2 == NULL) return false;
+        if (node1 == nullptr && node2 == nullptr) return true;
+        if (node1 == nullptr || node2 == nullptr) return false;
         return are_nodes_equal(node1, node2) && compare_nodes(node1->m_left, node2->m_left)
             && compare_nodes(node1->m_right, node2->m_right);
     }
 
     void fill_leafs_impl(TreeNode* node, std::vector<TreeNode*>& leafs) const {
-        if (node->m_left == NULL && node->m_right == NULL)
+        if (node->m_left == nullptr && node->m_right == nullptr)
             leafs.push_back(node);
-        if (node->m_left != NULL) fill_leafs_impl(node->m_left, leafs);
-        if (node->m_right != NULL) fill_leafs_impl(node->m_right, leafs);
+        if (node->m_left != nullptr) fill_leafs_impl(node->m_left, leafs);
+        if (node->m_right != nullptr) fill_leafs_impl(node->m_right, leafs);
     }
 };
 
@@ -481,50 +481,6 @@ class SplitConstructorAssertedRange {
     }
 };
 
-/*
- * Possible use cases are:
- * -------------------------------------------------------------------------------------------------------------
- * Range#  is_splittable_in_proportion   Range proportional ctor      Used partitioner          Result Effect
- * -------------------------------------------------------------------------------------------------------------
- *   1           true                       available                proportional             pMN, r(p), part(p)
- * -------------------------------------------------------------------------------------------------------------
- *   2           false                      available                proportional             p11, r(p), part(p)
- * -------------------------------------------------------------------------------------------------------------
- *   3        not defined                   available                proportional             p11, r(p), part(p)
- * -------------------------------------------------------------------------------------------------------------
- *   4           true                     not available              proportional             pMN, r(s), part(p)  *
- * -------------------------------------------------------------------------------------------------------------
- *   5           false                    not available              proportional             p11, r(s), part(p)
- * -------------------------------------------------------------------------------------------------------------
- *   6        not defined                 not available              proportional             p11, r(s), part(p)
- * -------------------------------------------------------------------------------------------------------------
- *   1           true                       available                   simple                s, r(s), part(s)
- * -------------------------------------------------------------------------------------------------------------
- *   2           false                      available                   simple                s, r(s), part(s)
- * -------------------------------------------------------------------------------------------------------------
- *   3        not defined                   available                   simple                s, r(s), part(s)
- * -------------------------------------------------------------------------------------------------------------
- *   4           true                     not available                 simple                s, r(s), part(s)
- * -------------------------------------------------------------------------------------------------------------
- *   5           false                    not available                 simple                s, r(s), part(s)
- * -------------------------------------------------------------------------------------------------------------
- *   6        not defined                 not available                 simple                s, r(s), part(s)
- * -------------------------------------------------------------------------------------------------------------
- *
- * Legend:
- *   proportional - with proportional splits (e.g. affinity_partitioner)
- *   simple  - without proportional splits (e.g. simple_partitioner, auto_partitioner)
- *   pMN     - proportional_split object with proportion M to N is created. (p11 - proportion 1 to 1)
- *   s       - split object is created
- *   r(p)    - range's proportional split constructor is called
- *   r(s)    - range's ordinary split constructor is called
- *   part(p) - partitioner's proportional split constructor is called
- *   part(s) - partitioner's ordinary split constructor is called
- *      *    - incorrect split behavior is possible (e.g. partitioner divides at an arbitrary ratio while
- *             range divides into halves)
- */
-
-
 // proportional_split ctor defined
 class Range1: public SplitConstructorAssertedRange {
 public:
diff --git a/external/tbb/test/tbb/test_priority_queue_node.cpp b/external/tbb/test/tbb/test_priority_queue_node.cpp
index 73dae7e4..18a60eb9 100644
--- a/external/tbb/test/tbb/test_priority_queue_node.cpp
+++ b/external/tbb/test/tbb/test_priority_queue_node.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -21,75 +21,79 @@
 #include "tbb/flow_graph.h"
 #include "tbb/global_control.h"
 
-#include "common/checktype.h"
-#include "common/graph_utils.h"
 #include "common/test.h"
-#include "common/test_follows_and_precedes_api.h"
 #include "common/utils.h"
 #include "common/utils_assert.h"
+#include "common/checktype.h"
+#include "common/graph_utils.h"
+#include "common/test_follows_and_precedes_api.h"
 
 #include <cstdio>
 
+#include "test_buffering_try_put_and_wait.h"
+
 //! \file test_priority_queue_node.cpp
 //! \brief Test for [flow_graph.priority_queue_node] specification
 
+
 #define N 10
 #define C 10
 
-template <typename T>
-void spin_try_get(tbb::flow::priority_queue_node<T> &q, T &value) {
-    while (q.try_get(value) != true)
-        ;
+template< typename T >
+void spin_try_get( tbb::flow::priority_queue_node<T> &q, T &value ) {
+    while ( q.try_get(value) != true ) ;
 }
 
-template <typename T>
-void check_item(T *next_value, T &value) {
+template< typename T >
+void check_item( T* next_value, T &value ) {
     int tid = value / N;
     int offset = value % N;
-    CHECK_MESSAGE(next_value[tid] == T(offset), "");
+    CHECK_MESSAGE( next_value[tid] == T(offset), "" );
     ++next_value[tid];
 }
 
-template <typename T>
+template< typename T >
 struct parallel_puts : utils::NoAssign {
     tbb::flow::priority_queue_node<T> &my_q;
-    parallel_puts(tbb::flow::priority_queue_node<T> &q) : my_q(q) {}
+    parallel_puts( tbb::flow::priority_queue_node<T> &q ) : my_q(q) {}
     void operator()(int i) const {
         for (int j = 0; j < N; ++j) {
-            bool msg = my_q.try_put(T(N * i + j));
-            CHECK_MESSAGE(msg == true, "");
+            bool msg = my_q.try_put( T(N*i + j) );
+            CHECK_MESSAGE( msg == true, "" );
         }
     }
 };
 
-template <typename T>
+template< typename T >
 struct parallel_gets : utils::NoAssign {
     tbb::flow::priority_queue_node<T> &my_q;
-    parallel_gets(tbb::flow::priority_queue_node<T> &q) : my_q(q) {}
+    parallel_gets( tbb::flow::priority_queue_node<T> &q) : my_q(q) {}
     void operator()(int) const {
         T prev;
-        spin_try_get(my_q, prev);
-        for (int j = 0; j < N - 1; ++j) {
+        spin_try_get( my_q, prev );
+        for (int j = 0; j < N-1; ++j) {
             T v;
-            spin_try_get(my_q, v);
+            spin_try_get( my_q, v );
             CHECK_MESSAGE(v < prev, "");
         }
     }
 };
 
-template <typename T>
+template< typename T >
 struct parallel_put_get : utils::NoAssign {
     tbb::flow::priority_queue_node<T> &my_q;
-    parallel_put_get(tbb::flow::priority_queue_node<T> &q) : my_q(q) {}
+    parallel_put_get( tbb::flow::priority_queue_node<T> &q ) : my_q(q) {}
     void operator()(int tid) const {
-        for (int i = 0; i < N; i += C) {
-            int j_end = (N < i + C) ? N : i + C;
+        for ( int i = 0; i < N; i+=C ) {
+            int j_end = ( N < i + C ) ? N : i + C;
             // dump about C values into the Q
-            for (int j = i; j < j_end; ++j) { CHECK_MESSAGE(my_q.try_put(T(N * tid + j)) == true, ""); }
+            for ( int j = i; j < j_end; ++j ) {
+                CHECK_MESSAGE( my_q.try_put( T (N*tid + j ) ) == true, "" );
+            }
             // receive about C values from the Q
-            for (int j = i; j < j_end; ++j) {
+            for ( int j = i; j < j_end; ++j ) {
                 T v;
-                spin_try_get(my_q, v);
+                spin_try_get( my_q, v );
             }
         }
     }
@@ -100,7 +104,7 @@ struct parallel_put_get : utils::NoAssign {
 //
 // Item can be reserved, released, consumed ( single serial receiver )
 //
-template <typename T>
+template< typename T >
 int test_reservation(int) {
     tbb::flow::graph g;
 
@@ -116,38 +120,38 @@ int test_reservation(int) {
         q.try_put(T(3));
         g.wait_for_all();
 
-        T v = bogus_value, w = bogus_value;
-        CHECK_MESSAGE(q.try_reserve(v) == true, "");
-        CHECK_MESSAGE(v == T(3), "");
-        CHECK_MESSAGE(q.try_release() == true, "");
+        T v=bogus_value, w=bogus_value;
+        CHECK_MESSAGE( q.try_reserve(v) == true, "" );
+        CHECK_MESSAGE( v == T(3), "" );
+        CHECK_MESSAGE( q.try_release() == true, "" );
         v = bogus_value;
         g.wait_for_all();
-        CHECK_MESSAGE(q.try_reserve(v) == true, "");
-        CHECK_MESSAGE(v == T(3), "");
-        CHECK_MESSAGE(q.try_consume() == true, "");
+        CHECK_MESSAGE( q.try_reserve(v) == true, "" );
+        CHECK_MESSAGE( v == T(3), "" );
+        CHECK_MESSAGE( q.try_consume() == true, "" );
         v = bogus_value;
         g.wait_for_all();
 
-        CHECK_MESSAGE(q.try_get(v) == true, "");
-        CHECK_MESSAGE(v == T(2), "");
+        CHECK_MESSAGE( q.try_get(v) == true, "" );
+        CHECK_MESSAGE( v == T(2), "" );
         v = bogus_value;
         g.wait_for_all();
 
-        CHECK_MESSAGE(q.try_reserve(v) == true, "");
-        CHECK_MESSAGE(v == T(1), "");
-        CHECK_MESSAGE(q.try_reserve(w) == false, "");
-        CHECK_MESSAGE(w == bogus_value, "");
-        CHECK_MESSAGE(q.try_get(w) == false, "");
-        CHECK_MESSAGE(w == bogus_value, "");
-        CHECK_MESSAGE(q.try_release() == true, "");
+        CHECK_MESSAGE( q.try_reserve(v) == true, "" );
+        CHECK_MESSAGE( v == T(1), "" );
+        CHECK_MESSAGE( q.try_reserve(w) == false, "" );
+        CHECK_MESSAGE( w == bogus_value, "" );
+        CHECK_MESSAGE( q.try_get(w) == false, "" );
+        CHECK_MESSAGE( w == bogus_value, "" );
+        CHECK_MESSAGE( q.try_release() == true, "" );
         v = bogus_value;
         g.wait_for_all();
-        CHECK_MESSAGE(q.try_reserve(v) == true, "");
-        CHECK_MESSAGE(v == T(1), "");
-        CHECK_MESSAGE(q.try_consume() == true, "");
+        CHECK_MESSAGE( q.try_reserve(v) == true, "" );
+        CHECK_MESSAGE( v == T(1), "" );
+        CHECK_MESSAGE( q.try_consume() == true, "" );
         v = bogus_value;
         g.wait_for_all();
-        CHECK_MESSAGE(q.try_get(v) == false, "");
+        CHECK_MESSAGE( q.try_get(v) == false, "" );
     }
     return 0;
 }
@@ -160,7 +164,7 @@ int test_reservation(int) {
 //   * overlapped puts / gets
 //   * all puts finished before any getS
 //
-template <typename T>
+template< typename T >
 int test_parallel(int num_threads) {
     tbb::flow::graph g;
     tbb::flow::priority_queue_node<T> q(g);
@@ -169,62 +173,62 @@ int test_parallel(int num_threads) {
     T bogus_value(-1);
     T j = bogus_value;
 
-    NativeParallelFor(num_threads, parallel_puts<T>(q));
-    for (int i = num_threads * N - 1; i >= 0; --i) {
-        spin_try_get(q, j);
+    NativeParallelFor( num_threads, parallel_puts<T>(q) );
+    for (int i = num_threads*N -1; i>=0; --i) {
+        spin_try_get( q, j );
         CHECK_MESSAGE(j == i, "");
         j = bogus_value;
     }
     g.wait_for_all();
-    CHECK_MESSAGE(q.try_get(j) == false, "");
-    CHECK_MESSAGE(j == bogus_value, "");
+    CHECK_MESSAGE( q.try_get( j ) == false, "" );
+    CHECK_MESSAGE( j == bogus_value, "" );
 
-    NativeParallelFor(num_threads, parallel_puts<T>(q));
+    NativeParallelFor( num_threads, parallel_puts<T>(q) );
     g.wait_for_all();
-    NativeParallelFor(num_threads, parallel_gets<T>(q));
+    NativeParallelFor( num_threads, parallel_gets<T>(q) );
     g.wait_for_all();
     j = bogus_value;
-    CHECK_MESSAGE(q.try_get(j) == false, "");
-    CHECK_MESSAGE(j == bogus_value, "");
+    CHECK_MESSAGE( q.try_get( j ) == false, "" );
+    CHECK_MESSAGE( j == bogus_value, "" );
 
-    NativeParallelFor(num_threads, parallel_put_get<T>(q));
+    NativeParallelFor( num_threads, parallel_put_get<T>(q) );
     g.wait_for_all();
     j = bogus_value;
-    CHECK_MESSAGE(q.try_get(j) == false, "");
-    CHECK_MESSAGE(j == bogus_value, "");
+    CHECK_MESSAGE( q.try_get( j ) == false, "" );
+    CHECK_MESSAGE( j == bogus_value, "" );
 
-    tbb::flow::make_edge(q, q2);
-    tbb::flow::make_edge(q2, q3);
-    NativeParallelFor(num_threads, parallel_puts<T>(q));
+    tbb::flow::make_edge( q, q2 );
+    tbb::flow::make_edge( q2, q3 );
+    NativeParallelFor( num_threads, parallel_puts<T>(q) );
     g.wait_for_all();
-    NativeParallelFor(num_threads, parallel_gets<T>(q3));
+    NativeParallelFor( num_threads, parallel_gets<T>(q3) );
     g.wait_for_all();
     j = bogus_value;
-    CHECK_MESSAGE(q.try_get(j) == false, "");
-    CHECK_MESSAGE(j == bogus_value, "");
-    CHECK_MESSAGE(q2.try_get(j) == false, "");
-    CHECK_MESSAGE(j == bogus_value, "");
-    CHECK_MESSAGE(q3.try_get(j) == false, "");
-    CHECK_MESSAGE(j == bogus_value, "");
+    CHECK_MESSAGE( q.try_get( j ) == false, "" );
+    CHECK_MESSAGE( j == bogus_value, "" );
+    CHECK_MESSAGE( q2.try_get( j ) == false, "" );
+    CHECK_MESSAGE( j == bogus_value, "" );
+    CHECK_MESSAGE( q3.try_get( j ) == false, "" );
+    CHECK_MESSAGE( j == bogus_value, "" );
 
     // test copy constructor
-    CHECK_MESSAGE(remove_successor(q, q2) == true, "");
-    NativeParallelFor(num_threads, parallel_puts<T>(q));
+    CHECK_MESSAGE( remove_successor(q, q2) == true, "" );
+    NativeParallelFor( num_threads, parallel_puts<T>(q) );
     tbb::flow::priority_queue_node<T> q_copy(q);
     g.wait_for_all();
     j = bogus_value;
-    CHECK_MESSAGE(q_copy.try_get(j) == false, "");
-    CHECK_MESSAGE(register_successor(q, q_copy) == true, "");
-    for (int i = num_threads * N - 1; i >= 0; --i) {
-        spin_try_get(q_copy, j);
+    CHECK_MESSAGE( q_copy.try_get( j ) == false, "" );
+    CHECK_MESSAGE( register_successor(q, q_copy) == true, "" );
+    for (int i = num_threads*N -1; i>=0; --i) {
+        spin_try_get( q_copy, j );
         CHECK_MESSAGE(j == i, "");
         j = bogus_value;
     }
     g.wait_for_all();
-    CHECK_MESSAGE(q.try_get(j) == false, "");
-    CHECK_MESSAGE(j == bogus_value, "");
-    CHECK_MESSAGE(q_copy.try_get(j) == false, "");
-    CHECK_MESSAGE(j == bogus_value, "");
+    CHECK_MESSAGE( q.try_get( j ) == false, "" );
+    CHECK_MESSAGE( j == bogus_value, "" );
+    CHECK_MESSAGE( q_copy.try_get( j ) == false, "" );
+    CHECK_MESSAGE( j == bogus_value, "" );
 
     return 0;
 }
@@ -238,7 +242,7 @@ int test_parallel(int num_threads) {
 // Chained Qs ( 2 & 3 ), single sender, items at last Q in FIFO order
 //
 
-template <typename T>
+template< typename T >
 int test_serial() {
     tbb::flow::graph g;
     T bogus_value(-1);
@@ -251,82 +255,85 @@ int test_serial() {
     // Rejects attempts to add / remove predecessor
     // Rejects request from empty Q
     //
-    CHECK_MESSAGE(register_predecessor(q, q2) == false, "");
-    CHECK_MESSAGE(remove_predecessor(q, q2) == false, "");
-    CHECK_MESSAGE(q.try_get(j) == false, "");
-    CHECK_MESSAGE(j == bogus_value, "");
+    CHECK_MESSAGE( register_predecessor(q, q2) == false, "" );
+    CHECK_MESSAGE( remove_predecessor(q, q2) == false, "" );
+    CHECK_MESSAGE( q.try_get( j ) == false, "" );
+    CHECK_MESSAGE( j == bogus_value, "" );
 
     //
     // Simple puts and gets
     //
 
-    for (int i = 0; i < N; ++i) CHECK_MESSAGE(q.try_put(T(i)), "");
-    for (int i = N - 1; i >= 0; --i) {
+    for (int i = 0; i < N; ++i)
+        CHECK_MESSAGE( q.try_put( T(i) ), "" );
+    for (int i = N-1; i >=0; --i) {
         j = bogus_value;
-        spin_try_get(q, j);
-        CHECK_MESSAGE(i == j, "");
+        spin_try_get( q, j );
+        CHECK_MESSAGE( i == j, "" );
     }
     j = bogus_value;
     g.wait_for_all();
-    CHECK_MESSAGE(q.try_get(j) == false, "");
-    CHECK_MESSAGE(j == bogus_value, "");
+    CHECK_MESSAGE( q.try_get( j ) == false, "" );
+    CHECK_MESSAGE( j == bogus_value, "" );
 
-    tbb::flow::make_edge(q, q2);
+    tbb::flow::make_edge( q, q2 );
 
-    for (int i = 0; i < N; ++i) CHECK_MESSAGE(q.try_put(T(i)), "");
+    for (int i = 0; i < N; ++i)
+        CHECK_MESSAGE( q.try_put( T(i) ), "" );
     g.wait_for_all();
-    for (int i = N - 1; i >= 0; --i) {
+    for (int i = N-1; i >= 0; --i) {
         j = bogus_value;
-        spin_try_get(q2, j);
-        CHECK_MESSAGE(i == j, "");
+        spin_try_get( q2, j );
+        CHECK_MESSAGE( i == j, "" );
     }
     j = bogus_value;
     g.wait_for_all();
-    CHECK_MESSAGE(q.try_get(j) == false, "");
+    CHECK_MESSAGE( q.try_get( j ) == false, "" );
     g.wait_for_all();
-    CHECK_MESSAGE(q2.try_get(j) == false, "");
-    CHECK_MESSAGE(j == bogus_value, "");
+    CHECK_MESSAGE( q2.try_get( j ) == false, "" );
+    CHECK_MESSAGE( j == bogus_value, "" );
 
-    tbb::flow::remove_edge(q, q2);
-    CHECK_MESSAGE(q.try_put(1) == true, "");
+    tbb::flow::remove_edge( q, q2 );
+    CHECK_MESSAGE( q.try_put( 1 ) == true, "" );
     g.wait_for_all();
-    CHECK_MESSAGE(q2.try_get(j) == false, "");
-    CHECK_MESSAGE(j == bogus_value, "");
+    CHECK_MESSAGE( q2.try_get( j ) == false, "" );
+    CHECK_MESSAGE( j == bogus_value, "" );
     g.wait_for_all();
-    CHECK_MESSAGE(q.try_get(j) == true, "");
-    CHECK_MESSAGE(j == 1, "");
+    CHECK_MESSAGE( q.try_get( j ) == true, "" );
+    CHECK_MESSAGE( j == 1, "" );
 
     tbb::flow::priority_queue_node<T> q3(g);
-    tbb::flow::make_edge(q, q2);
-    tbb::flow::make_edge(q2, q3);
+    tbb::flow::make_edge( q, q2 );
+    tbb::flow::make_edge( q2, q3 );
 
-    for (int i = 0; i < N; ++i) CHECK_MESSAGE(q.try_put(T(i)), "");
+    for (int i = 0; i < N; ++i)
+        CHECK_MESSAGE(  q.try_put( T(i) ), "" );
     g.wait_for_all();
-    for (int i = N - 1; i >= 0; --i) {
+    for (int i = N-1; i >= 0; --i) {
         j = bogus_value;
-        spin_try_get(q3, j);
-        CHECK_MESSAGE(i == j, "");
+        spin_try_get( q3, j );
+        CHECK_MESSAGE( i == j, "" );
     }
     j = bogus_value;
     g.wait_for_all();
-    CHECK_MESSAGE(q.try_get(j) == false, "");
+    CHECK_MESSAGE( q.try_get( j ) == false, "" );
     g.wait_for_all();
-    CHECK_MESSAGE(q2.try_get(j) == false, "");
+    CHECK_MESSAGE( q2.try_get( j ) == false, "" );
     g.wait_for_all();
-    CHECK_MESSAGE(q3.try_get(j) == false, "");
-    CHECK_MESSAGE(j == bogus_value, "");
+    CHECK_MESSAGE( q3.try_get( j ) == false, "" );
+    CHECK_MESSAGE( j == bogus_value, "" );
 
-    tbb::flow::remove_edge(q, q2);
-    CHECK_MESSAGE(q.try_put(1) == true, "");
+    tbb::flow::remove_edge( q,  q2 );
+    CHECK_MESSAGE( q.try_put( 1 ) == true, "" );
     g.wait_for_all();
-    CHECK_MESSAGE(q2.try_get(j) == false, "");
-    CHECK_MESSAGE(j == bogus_value, "");
+    CHECK_MESSAGE( q2.try_get( j ) == false, "" );
+    CHECK_MESSAGE( j == bogus_value, "" );
     g.wait_for_all();
-    CHECK_MESSAGE(q3.try_get(j) == false, "");
-    CHECK_MESSAGE(j == bogus_value, "");
+    CHECK_MESSAGE( q3.try_get( j ) == false, "" );
+    CHECK_MESSAGE( j == bogus_value, "" );
     g.wait_for_all();
-    CHECK_MESSAGE(q.try_get(j) == true, "");
-    CHECK_MESSAGE(j == 1, "");
+    CHECK_MESSAGE( q.try_get( j ) == true, "" );
+    CHECK_MESSAGE( j == 1, "" );
 
     return 0;
 }
@@ -335,13 +342,11 @@ int test_serial() {
 #include <array>
 #include <vector>
 void test_follows_and_precedes_api() {
-    std::array<int, 3> messages_for_follows = {{0, 1, 2}};
+    std::array<int, 3> messages_for_follows = { {0, 1, 2} };
     std::vector<int> messages_for_precedes = {0, 1, 2};
 
-    follows_and_precedes_testing::test_follows<int, tbb::flow::priority_queue_node<int>>(
-            messages_for_follows);
-    follows_and_precedes_testing::test_precedes<int, tbb::flow::priority_queue_node<int>>(
-            messages_for_precedes);
+    follows_and_precedes_testing::test_follows <int, tbb::flow::priority_queue_node<int>>(messages_for_follows);
+    follows_and_precedes_testing::test_precedes <int, tbb::flow::priority_queue_node<int>>(messages_for_precedes);
 }
 #endif
 
@@ -374,37 +379,210 @@ void test_deduction_guides() {
 }
 #endif
 
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+void test_pqueue_node_try_put_and_wait() {
+    using namespace test_try_put_and_wait;
+
+    std::vector<int> start_work_items;
+    std::vector<int> new_work_items;
+    int wait_message = -10;
+
+    for (int i = 0; i < 10; ++i) {
+        start_work_items.emplace_back(i);
+        new_work_items.emplace_back(i + 1 + wait_message);
+    }
+
+    // Test push
+    // test_buffer_push tests the graph
+    // buffer1 -> function -> buffer2 -> writer
+    //     function is a queueing serial function_node that submits new_work_items once wait_message arrives
+    //     writer is an unlimited function_node that writes an item into the processed_items vector
+    // Test steps
+    //     1. push start_work_items into the buffer1
+    //     2. buffer1.try_put_and_wait(wait_message);
+    //     3. g.wait_for_all()
+    // test_buffer_push returns the index from which the items processed during wait_for_all() starts
+    {
+        std::vector<int> processed_items;
+
+        std::size_t after_start = test_buffer_push<tbb::flow::priority_queue_node<int>>(start_work_items, wait_message,
+                                                                                        new_work_items, processed_items);
+
+        // Expected effect:
+        // During buffer1.try_put_and_wait()
+        //     1. start_work_items would be pushed to buffer1
+        //     2. wait_message would be pushed to buffer1
+        //     3. forward_task on buffer1 would transfer start_work_items into the function_node in LIFO order
+        //     4. wait_message would be transferred last because of lowest priority
+        //     5. the first item would occupy concurrency of function, other items would be pushed to the queue
+        //     6. function would process start_work_items and push them to the buffer2
+        //     7. wait_message would be processed last and add new_work_items to buffer1
+        //     8. forward_task on buffer2 would transfer start_work_items in FIFO order and the wait_message to the writer
+        //     9.  try_put_and_wait exits since wait_message is completed
+        // During g.wait_for_all()
+        //     10. forward_task for new_work_items in buffer1 would be spawned and put items in function in LIFO order
+        // Expected items processing - { start_work_items LIFO, wait_message, new_work_items LIFO }
+
+        std::size_t check_index = 0;
+        CHECK_MESSAGE(after_start == start_work_items.size() + 1,
+                      "try_put_and_wait should process start_work_items and the wait_message");
+        for (std::size_t i = start_work_items.size(); i != 0; --i) {
+            CHECK_MESSAGE(processed_items[check_index++] == start_work_items[i - 1],
+                          "try_put_and_wait should process start_work_items in LIFO order");
+        }
+        CHECK_MESSAGE(processed_items[check_index++] == wait_message,
+                      "try_put_and_wait should process wait_message after start_work_items");
+
+        for (std::size_t i = new_work_items.size(); i != 0; --i) {
+            CHECK_MESSAGE(processed_items[check_index++] == new_work_items[i - 1],
+                          "wait_for_all should process new_work_items in LIFO order");
+        }
+        CHECK(check_index == processed_items.size());
+    } // Test push
+
+    // Test pull
+    // test_buffer_pull tests the graph
+    // buffer -> function
+    //     function is a rejecting serial function_node that submits new_work_items once wait_message arrives
+    //     and writes the processed item into the processed_items
+    // Test steps
+    //     1. push the occupier message to the function
+    //     2. push start_work_items into the buffer
+    //     3. buffer.try_put_and_wait(wait_message)
+    //     4. g.wait_for_all()
+    // test_buffer_pull returns the index from which the items processed during wait_for_all() starts
+
+    {
+        std::vector<int> processed_items;
+        int occupier = 42;
+
+        std::size_t after_start = test_buffer_pull<tbb::flow::priority_queue_node<int>>(start_work_items, wait_message, occupier,
+                                                                                        new_work_items, processed_items);
+
+        // Expected effect
+        // 0. task for occupier processing would be spawned by the function
+        // During buffer.try_put_and_wait()
+        //     1. start_work_items would be pushed to the buffer
+        //     2. wait_message would be pushed to the buffer
+        //     3. forward_task would try to push items to the function, but would fail
+        //        and set the edge to the pull state
+        //     4. occupier would be processed
+        //     5. items would be taken from the buffer by function in the priority (LIFO)  order
+        //     6. wait_message would be taken last due to lowest priority
+        //     7. new_work_items would be pushed to the buffer while processing wait_message
+        // During wait_for_all()
+        //     8. new_work_items would be taken from the buffer in the priority (LIFO) order
+        // Expected items processing { occupier, start_work_items LIFO, wait_message, new_work_items LIFO }
+
+        std::size_t check_index = 0;
+        CHECK_MESSAGE(after_start == start_work_items.size() + 2,
+                      "try_put_and_wait should process start_work_items, occupier and the wait_message");
+        CHECK_MESSAGE(processed_items[check_index++] == occupier, "try_put_and_wait should process the occupier");
+        for (std::size_t i = start_work_items.size(); i != 0; --i) {
+            CHECK_MESSAGE(processed_items[check_index++] == start_work_items[i - 1],
+                          "try_put_and_wait should process start_work_items in LIFO order");
+        }
+        CHECK_MESSAGE(processed_items[check_index++] == wait_message,
+                      "try_put_and_wait should process wait_message after start_work_items");
+
+        for (std::size_t i = new_work_items.size(); i != 0; --i) {
+            CHECK_MESSAGE(processed_items[check_index++] == new_work_items[i - 1],
+                          "wait_for_all should process new_work_items in LIFO order");
+        }
+        CHECK(check_index == processed_items.size());
+    }
+
+    // Test reserve
+    {
+        int thresholds[] = { 1, 2 };
+
+        for (int threshold : thresholds) {
+            std::vector<int> processed_items;
+
+            // test_buffer_reserve tests the following graph
+            // buffer -> limiter -> function
+            //  function is a rejecting serial function_node that puts an item to the decrementer port
+            //  of the limiter inside of the body
+
+            std::size_t after_start = test_buffer_reserve<tbb::flow::priority_queue_node<int>>(threshold,
+                start_work_items, wait_message, new_work_items, processed_items);
+
+            // Expected effect:
+            // 1. start_work_items would be pushed to the buffer
+            // 2. wait_message_would be pushed to the buffer
+            // 3. forward task of the buffer would push the first message to the limiter node.
+            //    Since the limiter threshold is not reached, it would be directly passed to the function
+            // 4. function would spawn the task for the first message processing
+            // 5. the first would be processed
+            // 6. decrementer.try_put() would be called and the limiter node would
+            //    process all of the items from the buffer using the try_reserve/try_consume/try_release semantics
+            //    in the priority (greatest first) order
+            // 7. When the wait_message would be taken from the queue, the try_put_and_wait would exit
+
+            std::size_t check_index = 0;
+
+            CHECK_MESSAGE(after_start == start_work_items.size() + 1,
+                          "try_put_and_wait should start_work_items and wait_message");
+            for (std::size_t index = start_work_items.size(); index != 0; --index) {
+                CHECK_MESSAGE(processed_items[check_index++] == start_work_items[index - 1],
+                              "Unexpected start_work_items processing");
+            }
+
+            CHECK_MESSAGE(processed_items[check_index++] == wait_message, "Unexpected wait_message processing");
+
+            for (std::size_t index = new_work_items.size(); index != 0; --index) {
+                CHECK_MESSAGE(processed_items[check_index++] == new_work_items[index - 1],
+                              "Unexpected new_work_items processing");
+            }
+        }
+    }
+}
+#endif // __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+
 //! Test serial, parallel behavior and reservation under parallelism
 //! \brief \ref requirement \ref error_guessing
-TEST_CASE("Serial, parallel and reservation tests") {
+TEST_CASE("Serial, parallel and reservation tests"){
     for (int p = 2; p <= 4; ++p) {
         tbb::global_control thread_limit(tbb::global_control::max_allowed_parallelism, p);
         tbb::task_arena arena(p);
-        arena.execute([&]() {
-            test_serial<int>();
-            test_reservation<int>(p);
-            test_reservation<CheckType<int>>(p);
-            test_parallel<int>(p);
-        });
-    }
+        arena.execute(
+            [&]() {
+                test_serial<int>();
+                test_reservation<int>(p);
+                test_reservation<CheckType<int> >(p);
+                test_parallel<int>(p);
+            }
+        );
+	}
 }
 
 //! Test reset and cancellation
 //! \brief \ref error_guessing
-TEST_CASE("Reset tests") {
+TEST_CASE("Reset tests"){
     INFO("Testing resets\n");
-    test_resets<int, tbb::flow::priority_queue_node<int>>();
-    test_resets<float, tbb::flow::priority_queue_node<float>>();
+    test_resets<int,tbb::flow::priority_queue_node<int> >();
+    test_resets<float,tbb::flow::priority_queue_node<float> >();
 }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 //! Test follows and precedes API
 //! \brief \ref error_guessing
-TEST_CASE("Test follows and precedes API") { test_follows_and_precedes_api(); }
+TEST_CASE("Test follows and precedes API"){
+    test_follows_and_precedes_api();
+}
 #endif
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 //! Test decution guides
 //! \brief \ref requirement
-TEST_CASE("Test deduction guides") { test_deduction_guides(); }
+TEST_CASE("Test deduction guides"){
+    test_deduction_guides();
+}
+#endif
+
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+//! \brief \ref error_guessing
+TEST_CASE("test priority_queue_node try_put_and_wait") {
+    test_pqueue_node_try_put_and_wait();
+}
 #endif
diff --git a/external/tbb/test/tbb/test_profiling.cpp b/external/tbb/test/tbb/test_profiling.cpp
index 0394ce3c..7f14d6a8 100644
--- a/external/tbb/test/tbb/test_profiling.cpp
+++ b/external/tbb/test/tbb/test_profiling.cpp
@@ -15,47 +15,52 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
 #endif
 
 #define DOCTEST_CONFIG_SUPER_FAST_ASSERTS
 #include "common/test.h"
 
-#include "tbb/queuing_mutex.h"
-#include "tbb/queuing_rw_mutex.h"
 #include "tbb/spin_mutex.h"
 #include "tbb/spin_rw_mutex.h"
+#include "tbb/queuing_mutex.h"
+#include "tbb/queuing_rw_mutex.h"
 
 //! \file test_profiling.cpp
 //! \brief Test for [internal] functionality
 
 //! Test for mutexes set_name
 //! \brief \ref interface
-TEST_CASE_TEMPLATE("Mutexes set_name", Mutex, tbb::spin_mutex, tbb::spin_rw_mutex,
-                   tbb::speculative_spin_mutex, tbb::speculative_spin_rw_mutex, tbb::queuing_mutex,
-                   tbb::queuing_rw_mutex) {
+TEST_CASE_TEMPLATE("Mutexes set_name", Mutex, tbb::spin_mutex,
+                                              tbb::spin_rw_mutex,
+                                              tbb::speculative_spin_mutex,
+                                              tbb::speculative_spin_rw_mutex,
+                                              tbb::queuing_mutex,
+                                              tbb::queuing_rw_mutex) {
     Mutex mutex;
     tbb::profiling::set_name(mutex, "mutex");
 }
 
-#if (_WIN32 || _WIN64)
+
+#if (_WIN32||_WIN64)
 //! Test for mutexes set_name with wchar
 //! \brief \ref interface
-TEST_CASE_TEMPLATE("Mutexes set_name wchar", Mutex, tbb::spin_mutex, tbb::spin_rw_mutex,
-                   tbb::speculative_spin_mutex, tbb::speculative_spin_rw_mutex, tbb::queuing_mutex,
-                   tbb::queuing_rw_mutex) {
+TEST_CASE_TEMPLATE("Mutexes set_name wchar", Mutex, tbb::spin_mutex,
+                                              tbb::spin_rw_mutex,
+                                              tbb::speculative_spin_mutex,
+                                              tbb::speculative_spin_rw_mutex,
+                                              tbb::queuing_mutex,
+                                              tbb::queuing_rw_mutex) {
     Mutex mutex;
     tbb::profiling::set_name(mutex, L"mutex");
 }
-#endif//WIN
+#endif //WIN
 
 #include "tbb/flow_graph.h"
 
 struct Body {
-    template <typename... Args>
-    int operator()(Args...) {
-        return 0;
-    }
+    template<typename... Args>
+    int operator()(Args...) { return 0; }
 };
 
 //! Test for flow graph set_name
@@ -65,8 +70,9 @@ TEST_CASE("Flow Graph set_name") {
     tbb::profiling::set_name(g, "graph");
 }
 
-struct async_body {
-    template <typename T>
+struct async_body
+{
+    template<typename T>
     void operator()(int, T&) {};
 };
 
@@ -74,7 +80,7 @@ struct async_body {
 //! \brief \ref interface
 TEST_CASE("async_node set_name") {
     tbb::flow::graph g;
-    tbb::flow::async_node<int, int> node(g, 1, async_body {});
+    tbb::flow::async_node<int, int> node(g, 1, async_body{});
     tbb::profiling::set_name(node, "async_node");
 }
 
@@ -106,8 +112,11 @@ TEST_CASE("composite_node set_name") {
 //! \brief \ref interface
 TEST_CASE("continue_node set_name") {
     tbb::flow::graph g;
-    tbb::flow::continue_node<tbb::flow::continue_msg> node(
-            g, [](const tbb::flow::continue_msg& val) -> const tbb::flow::continue_msg& { return val; });
+    tbb::flow::continue_node<tbb::flow::continue_msg> node(g,
+        [](const tbb::flow::continue_msg& val) -> const tbb::flow::continue_msg&
+        {
+            return val;
+        });
     tbb::profiling::set_name(node, "continue_node");
 }
 
@@ -115,7 +124,7 @@ TEST_CASE("continue_node set_name") {
 //! \brief \ref interface
 TEST_CASE("function_node set_name") {
     tbb::flow::graph g;
-    tbb::flow::function_node<int, int> node(g, 1, [](const int& val) -> int { return val; });
+    tbb::flow::function_node<int, int> node(g, 1, [](const int& val) -> int {return val; });
     tbb::profiling::set_name(node, "function_node");
 }
 
@@ -149,7 +158,7 @@ TEST_CASE("indexer_node set_name") {
 //! \brief \ref interface
 TEST_CASE("input_node set_name") {
     tbb::flow::graph g;
-    tbb::flow::input_node<int> node(g, [](tbb::flow_control&) -> int { return 0; });
+    tbb::flow::input_node<int> node(g, [](tbb::flow_control& ) -> int { return 0;});
     tbb::profiling::set_name(node, "input_node");
 }
 
@@ -169,8 +178,9 @@ TEST_CASE("limiter_node set_name") {
     tbb::profiling::set_name(node, "limiter_node");
 }
 
-struct mf_body {
-    template <typename T>
+struct mf_body
+{
+    template<typename T>
     void operator()(int, T&) {};
 };
 
@@ -178,7 +188,7 @@ struct mf_body {
 //! \brief \ref interface
 TEST_CASE("multifunction_node set_name") {
     tbb::flow::graph g;
-    tbb::flow::multifunction_node<int, std::tuple<int>> node(g, 1, mf_body {});
+    tbb::flow::multifunction_node<int, std::tuple<int>> node(g, 1, mf_body{});
     tbb::profiling::set_name(node, "multifunction_node");
 }
 
@@ -214,7 +224,7 @@ struct seq_inspector {
 //! \brief \ref interface
 TEST_CASE("sequencer_node set_name") {
     tbb::flow::graph g;
-    tbb::flow::sequencer_node<int> node(g, seq_inspector {});
+    tbb::flow::sequencer_node<int> node(g, seq_inspector{});
     tbb::profiling::set_name(node, "sequencer_node");
 }
 
diff --git a/external/tbb/test/tbb/test_queue_node.cpp b/external/tbb/test/tbb/test_queue_node.cpp
index fd03358d..546b47ed 100644
--- a/external/tbb/test/tbb/test_queue_node.cpp
+++ b/external/tbb/test/tbb/test_queue_node.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -21,93 +21,101 @@
 #include "tbb/flow_graph.h"
 #include "tbb/global_control.h"
 
-#include "common/checktype.h"
-#include "common/graph_utils.h"
 #include "common/test.h"
-#include "common/test_follows_and_precedes_api.h"
 #include "common/utils.h"
 #include "common/utils_assert.h"
+#include "common/checktype.h"
+#include "common/graph_utils.h"
+#include "common/test_follows_and_precedes_api.h"
 
 #include <cstdio>
 
+#include "test_buffering_try_put_and_wait.h"
+
 //! \file test_queue_node.cpp
 //! \brief Test for [flow_graph.queue_node] specification
 
+
 #define N 1000
 #define C 10
 
-template <typename T>
-void spin_try_get(tbb::flow::queue_node<T> &q, T &value) {
+template< typename T >
+void spin_try_get( tbb::flow::queue_node<T> &q, T &value ) {
     int count = 0;
-    while (q.try_get(value) != true) {
-        if (count < 1000000) { ++count; }
+    while ( q.try_get(value) != true ) {
+        if (count < 1000000) {
+            ++count;
+        }
         if (count == 1000000) {
             // Perhaps, we observe the missed wakeup. Enqueue a task to wake up threads.
-            tbb::task_arena a(tbb::task_arena::attach {});
-            a.enqueue([] {});
+            tbb::task_arena a(tbb::task_arena::attach{});
+            a.enqueue([]{});
             ++count;
         }
     }
 }
 
-template <typename T>
-void check_item(T *next_value, T &value) {
+template< typename T >
+void check_item( T* next_value, T &value ) {
     int tid = value / N;
     int offset = value % N;
-    CHECK_MESSAGE(next_value[tid] == T(offset), "");
+    CHECK_MESSAGE( next_value[tid] == T(offset), "" );
     ++next_value[tid];
 }
 
-template <typename T>
+template< typename T >
 struct parallel_puts : utils::NoAssign {
 
     tbb::flow::queue_node<T> &my_q;
 
-    parallel_puts(tbb::flow::queue_node<T> &q) : my_q(q) {}
+    parallel_puts( tbb::flow::queue_node<T> &q ) : my_q(q) {}
 
     void operator()(int i) const {
         for (int j = 0; j < N; ++j) {
-            bool msg = my_q.try_put(T(N * i + j));
-            CHECK_MESSAGE(msg == true, "");
+            bool msg = my_q.try_put( T(N*i + j) );
+            CHECK_MESSAGE( msg == true, "" );
         }
     }
+
 };
 
-template <typename T>
+template< typename T >
 struct touches {
 
     bool **my_touches;
     T **my_last_touch;
     int my_num_threads;
 
-    touches(int num_threads) : my_num_threads(num_threads) {
-        my_last_touch = new T *[my_num_threads];
-        my_touches = new bool *[my_num_threads];
-        for (int p = 0; p < my_num_threads; ++p) {
+    touches( int num_threads ) : my_num_threads(num_threads) {
+        my_last_touch = new T* [my_num_threads];
+        my_touches = new bool* [my_num_threads];
+        for ( int p = 0; p < my_num_threads; ++p) {
             my_last_touch[p] = new T[my_num_threads];
-            for (int p2 = 0; p2 < my_num_threads; ++p2) my_last_touch[p][p2] = -1;
+            for ( int p2 = 0; p2 < my_num_threads; ++p2)
+                my_last_touch[p][p2] = -1;
 
-            my_touches[p] = new bool[N * my_num_threads];
-            for (int n = 0; n < N * my_num_threads; ++n) my_touches[p][n] = false;
+            my_touches[p] = new bool[N*my_num_threads];
+            for ( int n = 0; n < N*my_num_threads; ++n)
+                my_touches[p][n] = false;
         }
     }
 
     ~touches() {
-        for (int p = 0; p < my_num_threads; ++p) {
-            delete[] my_touches[p];
-            delete[] my_last_touch[p];
+        for ( int p = 0; p < my_num_threads; ++p) {
+            delete [] my_touches[p];
+            delete [] my_last_touch[p];
         }
-        delete[] my_touches;
-        delete[] my_last_touch;
+        delete [] my_touches;
+        delete [] my_last_touch;
     }
 
-    bool check(int tid, T v) {
+    bool check( int tid, T v ) {
         int v_tid = v / N;
-        if (my_touches[tid][v] != false) {
+        if ( my_touches[tid][v] != false ) {
             printf("Error: value seen twice by local thread\n");
             return false;
         }
-        if (v <= my_last_touch[tid][v_tid]) {
+        if ( v <= my_last_touch[tid][v_tid] ) {
             printf("Error: value seen in wrong order by local thread\n");
             return false;
         }
@@ -117,65 +125,72 @@ struct touches {
     }
 
     bool validate_touches() {
-        bool *all_touches = new bool[N * my_num_threads];
-        for (int n = 0; n < N * my_num_threads; ++n) all_touches[n] = false;
-
-        for (int p = 0; p < my_num_threads; ++p) {
-            for (int n = 0; n < N * my_num_threads; ++n) {
-                if (my_touches[p][n] == true) {
-                    CHECK_MESSAGE((all_touches[n] == false), "value see by more than one thread\n");
+        bool *all_touches = new bool[N*my_num_threads];
+        for ( int n = 0; n < N*my_num_threads; ++n)
+            all_touches[n] = false;
+
+        for ( int p = 0; p < my_num_threads; ++p) {
+            for ( int n = 0; n < N*my_num_threads; ++n) {
+                if ( my_touches[p][n] == true ) {
+                    CHECK_MESSAGE( ( all_touches[n] == false), "value see by more than one thread\n" );
                     all_touches[n] = true;
                 }
             }
         }
-        for (int n = 0; n < N * my_num_threads; ++n) {
-            if (!all_touches[n]) printf("No touch at %d, my_num_threads = %d\n", n, my_num_threads);
+        for ( int n = 0; n < N*my_num_threads; ++n) {
+            if ( !all_touches[n] )
+                printf("No touch at %d, my_num_threads = %d\n", n, my_num_threads);
             //CHECK_MESSAGE( ( all_touches[n] == true), "value not seen by any thread\n" );
         }
-        delete[] all_touches;
+        delete [] all_touches;
         return true;
     }
+
 };
 
-template <typename T>
+template< typename T >
 struct parallel_gets : utils::NoAssign {
 
     tbb::flow::queue_node<T> &my_q;
     touches<T> &my_touches;
 
-    parallel_gets(tbb::flow::queue_node<T> &q, touches<T> &t) : my_q(q), my_touches(t) {}
+    parallel_gets( tbb::flow::queue_node<T> &q, touches<T> &t) : my_q(q), my_touches(t) {}
 
     void operator()(int tid) const {
         for (int j = 0; j < N; ++j) {
             T v;
-            spin_try_get(my_q, v);
-            my_touches.check(tid, v);
+            spin_try_get( my_q, v );
+            my_touches.check( tid, v );
         }
     }
+
 };
 
-template <typename T>
+template< typename T >
 struct parallel_put_get : utils::NoAssign {
 
     tbb::flow::queue_node<T> &my_q;
     touches<T> &my_touches;
 
-    parallel_put_get(tbb::flow::queue_node<T> &q, touches<T> &t) : my_q(q), my_touches(t) {}
+    parallel_put_get( tbb::flow::queue_node<T> &q, touches<T> &t ) : my_q(q), my_touches(t) {}
 
     void operator()(int tid) const {
 
-        for (int i = 0; i < N; i += C) {
-            int j_end = (N < i + C) ? N : i + C;
+        for ( int i = 0; i < N; i+=C ) {
+            int j_end = ( N < i + C ) ? N : i + C;
             // dump about C values into the Q
-            for (int j = i; j < j_end; ++j) { CHECK_MESSAGE(my_q.try_put(T(N * tid + j)) == true, ""); }
+            for ( int j = i; j < j_end; ++j ) {
+                CHECK_MESSAGE( my_q.try_put( T (N*tid + j ) ) == true, "" );
+            }
             // receiver about C values from the Q
-            for (int j = i; j < j_end; ++j) {
+            for ( int j = i; j < j_end; ++j ) {
                 T v;
-                spin_try_get(my_q, v);
-                my_touches.check(tid, v);
+                spin_try_get( my_q, v );
+                my_touches.check( tid, v );
             }
         }
     }
+
 };
 
 //
@@ -183,7 +198,7 @@ struct parallel_put_get : utils::NoAssign {
 //
 // Item can be reserved, released, consumed ( single serial receiver )
 //
-template <typename T>
+template< typename T >
 int test_reservation() {
     tbb::flow::graph g;
     T bogus_value(-1);
@@ -196,30 +211,30 @@ int test_reservation() {
     q.try_put(T(3));
 
     T v;
-    CHECK_MESSAGE(q.reserve_item(v) == true, "");
-    CHECK_MESSAGE(v == T(1), "");
-    CHECK_MESSAGE(q.release_reservation() == true, "");
+    CHECK_MESSAGE( q.reserve_item(v) == true, "" );
+    CHECK_MESSAGE( v == T(1), "" );
+    CHECK_MESSAGE( q.release_reservation() == true, "" );
     v = bogus_value;
     g.wait_for_all();
-    CHECK_MESSAGE(q.reserve_item(v) == true, "");
-    CHECK_MESSAGE(v == T(1), "");
-    CHECK_MESSAGE(q.consume_reservation() == true, "");
+    CHECK_MESSAGE( q.reserve_item(v) == true, "" );
+    CHECK_MESSAGE( v == T(1), "" );
+    CHECK_MESSAGE( q.consume_reservation() == true, "" );
     v = bogus_value;
     g.wait_for_all();
 
-    CHECK_MESSAGE(q.try_get(v) == true, "");
-    CHECK_MESSAGE(v == T(2), "");
+    CHECK_MESSAGE( q.try_get(v) == true, "" );
+    CHECK_MESSAGE( v == T(2), "" );
     v = bogus_value;
     g.wait_for_all();
 
-    CHECK_MESSAGE(q.reserve_item(v) == true, "");
-    CHECK_MESSAGE(v == T(3), "");
-    CHECK_MESSAGE(q.release_reservation() == true, "");
+    CHECK_MESSAGE( q.reserve_item(v) == true, "" );
+    CHECK_MESSAGE( v == T(3), "" );
+    CHECK_MESSAGE( q.release_reservation() == true, "" );
     v = bogus_value;
     g.wait_for_all();
-    CHECK_MESSAGE(q.reserve_item(v) == true, "");
-    CHECK_MESSAGE(v == T(3), "");
-    CHECK_MESSAGE(q.consume_reservation() == true, "");
+    CHECK_MESSAGE( q.reserve_item(v) == true, "" );
+    CHECK_MESSAGE( v == T(3), "" );
+    CHECK_MESSAGE( q.consume_reservation() == true, "" );
     v = bogus_value;
     g.wait_for_all();
 
@@ -234,95 +249,97 @@ int test_reservation() {
 //   * overlapped puts / gets
 //   * all puts finished before any getS
 //
-template <typename T>
+template< typename T >
 int test_parallel(int num_threads) {
     tbb::flow::graph g;
     tbb::flow::queue_node<T> q(g);
     tbb::flow::queue_node<T> q2(g);
     tbb::flow::queue_node<T> q3(g);
     {
-        Checker<T> my_check;
+        Checker< T > my_check;
         T bogus_value(-1);
         T j = bogus_value;
-        utils::NativeParallelFor(num_threads, parallel_puts<T>(q));
+        utils::NativeParallelFor( num_threads, parallel_puts<T>(q) );
 
         T *next_value = new T[num_threads];
         for (int tid = 0; tid < num_threads; ++tid) next_value[tid] = T(0);
 
-        for (int i = 0; i < num_threads * N; ++i) {
-            spin_try_get(q, j);
-            check_item(next_value, j);
+        for (int i = 0; i < num_threads * N; ++i ) {
+            spin_try_get( q, j );
+            check_item( next_value, j );
             j = bogus_value;
         }
-        for (int tid = 0; tid < num_threads; ++tid) { CHECK_MESSAGE(next_value[tid] == T(N), ""); }
+        for (int tid = 0; tid < num_threads; ++tid)  {
+            CHECK_MESSAGE( next_value[tid] == T(N), "" );
+        }
         delete[] next_value;
 
         j = bogus_value;
         g.wait_for_all();
-        CHECK_MESSAGE(q.try_get(j) == false, "");
-        CHECK_MESSAGE(j == bogus_value, "");
+        CHECK_MESSAGE( q.try_get( j ) == false, "" );
+        CHECK_MESSAGE( j == bogus_value, "" );
 
-        utils::NativeParallelFor(num_threads, parallel_puts<T>(q));
+        utils::NativeParallelFor( num_threads, parallel_puts<T>(q) );
 
         {
-            touches<T> t(num_threads);
-            utils::NativeParallelFor(num_threads, parallel_gets<T>(q, t));
+            touches< T > t( num_threads );
+            utils::NativeParallelFor( num_threads, parallel_gets<T>(q, t) );
             g.wait_for_all();
-            CHECK_MESSAGE(t.validate_touches(), "");
+            CHECK_MESSAGE( t.validate_touches(), "" );
         }
         j = bogus_value;
-        CHECK_MESSAGE(q.try_get(j) == false, "");
-        CHECK_MESSAGE(j == bogus_value, "");
+        CHECK_MESSAGE( q.try_get( j ) == false, "" );
+        CHECK_MESSAGE( j == bogus_value, "" );
 
         g.wait_for_all();
         {
-            touches<T> t2(num_threads);
-            utils::NativeParallelFor(num_threads, parallel_put_get<T>(q, t2));
+            touches< T > t2( num_threads );
+            utils::NativeParallelFor( num_threads, parallel_put_get<T>(q, t2) );
             g.wait_for_all();
-            CHECK_MESSAGE(t2.validate_touches(), "");
+            CHECK_MESSAGE( t2.validate_touches(), "" );
         }
         j = bogus_value;
-        CHECK_MESSAGE(q.try_get(j) == false, "");
-        CHECK_MESSAGE(j == bogus_value, "");
+        CHECK_MESSAGE( q.try_get( j ) == false, "" );
+        CHECK_MESSAGE( j == bogus_value, "" );
 
-        tbb::flow::make_edge(q, q2);
-        tbb::flow::make_edge(q2, q3);
+        tbb::flow::make_edge( q, q2 );
+        tbb::flow::make_edge( q2, q3 );
 
-        utils::NativeParallelFor(num_threads, parallel_puts<T>(q));
+        utils::NativeParallelFor( num_threads, parallel_puts<T>(q) );
         {
-            touches<T> t3(num_threads);
-            utils::NativeParallelFor(num_threads, parallel_gets<T>(q3, t3));
+            touches< T > t3( num_threads );
+            utils::NativeParallelFor( num_threads, parallel_gets<T>(q3, t3) );
             g.wait_for_all();
-            CHECK_MESSAGE(t3.validate_touches(), "");
+            CHECK_MESSAGE( t3.validate_touches(), "" );
         }
         j = bogus_value;
         g.wait_for_all();
-        CHECK_MESSAGE(q.try_get(j) == false, "");
+        CHECK_MESSAGE( q.try_get( j ) == false, "" );
         g.wait_for_all();
-        CHECK_MESSAGE(q2.try_get(j) == false, "");
+        CHECK_MESSAGE( q2.try_get( j ) == false, "" );
         g.wait_for_all();
-        CHECK_MESSAGE(q3.try_get(j) == false, "");
-        CHECK_MESSAGE(j == bogus_value, "");
+        CHECK_MESSAGE( q3.try_get( j ) == false, "" );
+        CHECK_MESSAGE( j == bogus_value, "" );
 
         // test copy constructor
-        CHECK_MESSAGE(remove_successor(q, q2), "");
-        utils::NativeParallelFor(num_threads, parallel_puts<T>(q));
+        CHECK_MESSAGE( remove_successor( q, q2 ), "" );
+        utils::NativeParallelFor( num_threads, parallel_puts<T>(q) );
         tbb::flow::queue_node<T> q_copy(q);
         j = bogus_value;
         g.wait_for_all();
-        CHECK_MESSAGE(q_copy.try_get(j) == false, "");
-        CHECK_MESSAGE(register_successor(q, q_copy) == true, "");
+        CHECK_MESSAGE( q_copy.try_get( j ) == false, "" );
+        CHECK_MESSAGE( register_successor( q, q_copy ) == true, "" );
         {
-            touches<T> t(num_threads);
-            utils::NativeParallelFor(num_threads, parallel_gets<T>(q_copy, t));
+            touches< T > t( num_threads );
+            utils::NativeParallelFor( num_threads, parallel_gets<T>(q_copy, t) );
             g.wait_for_all();
-            CHECK_MESSAGE(t.validate_touches(), "");
+            CHECK_MESSAGE( t.validate_touches(), "" );
         }
         j = bogus_value;
-        CHECK_MESSAGE(q.try_get(j) == false, "");
-        CHECK_MESSAGE(j == bogus_value, "");
-        CHECK_MESSAGE(q_copy.try_get(j) == false, "");
-        CHECK_MESSAGE(j == bogus_value, "");
+        CHECK_MESSAGE( q.try_get( j ) == false, "" );
+        CHECK_MESSAGE( j == bogus_value, "" );
+        CHECK_MESSAGE( q_copy.try_get( j ) == false, "" );
+        CHECK_MESSAGE( j == bogus_value, "" );
     }
 
     return 0;
@@ -337,14 +354,14 @@ int test_parallel(int num_threads) {
 // Chained Qs ( 2 & 3 ), single sender, items at last Q in FIFO order
 //
 
-template <typename T>
+template< typename T >
 int test_serial() {
     tbb::flow::graph g;
     tbb::flow::queue_node<T> q(g);
     tbb::flow::queue_node<T> q2(g);
-    {// destroy the graph after manipulating it, and see if all the items in the buffers
+    {   // destroy the graph after manipulating it, and see if all the items in the buffers
         // have been destroyed before the graph
-        Checker<T> my_check;// if CheckType< U > count constructions and destructions
+        Checker<T> my_check;  // if CheckType< U > count constructions and destructions
         T bogus_value(-1);
         T j = bogus_value;
 
@@ -352,92 +369,94 @@ int test_serial() {
         // Rejects attempts to add / remove predecessor
         // Rejects request from empty Q
         //
-        CHECK_MESSAGE(register_predecessor(q, q2) == false, "");
-        CHECK_MESSAGE(remove_predecessor(q, q2) == false, "");
-        CHECK_MESSAGE(q.try_get(j) == false, "");
-        CHECK_MESSAGE(j == bogus_value, "");
+        CHECK_MESSAGE( register_predecessor( q, q2 ) == false, "" );
+        CHECK_MESSAGE( remove_predecessor( q, q2 ) == false, "" );
+        CHECK_MESSAGE( q.try_get( j ) == false, "" );
+        CHECK_MESSAGE( j == bogus_value, "" );
 
         //
         // Simple puts and gets
         //
 
         for (int i = 0; i < N; ++i) {
-            bool msg = q.try_put(T(i));
-            CHECK_MESSAGE(msg == true, "");
+            bool msg = q.try_put( T(i) );
+            CHECK_MESSAGE( msg == true, "" );
         }
 
+
         for (int i = 0; i < N; ++i) {
             j = bogus_value;
-            spin_try_get(q, j);
-            CHECK_MESSAGE(i == j, "");
+            spin_try_get( q, j );
+            CHECK_MESSAGE( i == j, "" );
         }
         j = bogus_value;
         g.wait_for_all();
-        CHECK_MESSAGE(q.try_get(j) == false, "");
-        CHECK_MESSAGE(j == bogus_value, "");
+        CHECK_MESSAGE( q.try_get( j ) == false, "" );
+        CHECK_MESSAGE( j == bogus_value, "" );
 
-        tbb::flow::make_edge(q, q2);
+        tbb::flow::make_edge( q, q2 );
 
         for (int i = 0; i < N; ++i) {
-            bool msg = q.try_put(T(i));
-            CHECK_MESSAGE(msg == true, "");
+            bool msg = q.try_put( T(i) );
+            CHECK_MESSAGE( msg == true, "" );
         }
 
+
         for (int i = 0; i < N; ++i) {
             j = bogus_value;
-            spin_try_get(q2, j);
-            CHECK_MESSAGE(i == j, "");
+            spin_try_get( q2, j );
+            CHECK_MESSAGE( i == j, "" );
         }
         j = bogus_value;
         g.wait_for_all();
-        CHECK_MESSAGE(q.try_get(j) == false, "");
+        CHECK_MESSAGE( q.try_get( j ) == false, "" );
         g.wait_for_all();
-        CHECK_MESSAGE(q2.try_get(j) == false, "");
-        CHECK_MESSAGE(j == bogus_value, "");
+        CHECK_MESSAGE( q2.try_get( j ) == false, "" );
+        CHECK_MESSAGE( j == bogus_value, "" );
 
-        tbb::flow::remove_edge(q, q2);
-        CHECK_MESSAGE(q.try_put(1) == true, "");
+        tbb::flow::remove_edge( q, q2 );
+        CHECK_MESSAGE( q.try_put( 1 ) == true, "" );
         g.wait_for_all();
-        CHECK_MESSAGE(q2.try_get(j) == false, "");
-        CHECK_MESSAGE(j == bogus_value, "");
+        CHECK_MESSAGE( q2.try_get( j ) == false, "" );
+        CHECK_MESSAGE( j == bogus_value, "" );
         g.wait_for_all();
-        CHECK_MESSAGE(q.try_get(j) == true, "");
-        CHECK_MESSAGE(j == 1, "");
+        CHECK_MESSAGE( q.try_get( j ) == true, "" );
+        CHECK_MESSAGE( j == 1, "" );
 
         tbb::flow::queue_node<T> q3(g);
-        tbb::flow::make_edge(q, q2);
-        tbb::flow::make_edge(q2, q3);
+        tbb::flow::make_edge( q, q2 );
+        tbb::flow::make_edge( q2, q3 );
 
         for (int i = 0; i < N; ++i) {
-            bool msg = q.try_put(T(i));
-            CHECK_MESSAGE(msg == true, "");
+            bool msg = q.try_put( T(i) );
+            CHECK_MESSAGE( msg == true, "" );
         }
 
         for (int i = 0; i < N; ++i) {
             j = bogus_value;
-            spin_try_get(q3, j);
-            CHECK_MESSAGE(i == j, "");
+            spin_try_get( q3, j );
+            CHECK_MESSAGE( i == j, "" );
         }
         j = bogus_value;
         g.wait_for_all();
-        CHECK_MESSAGE(q.try_get(j) == false, "");
+        CHECK_MESSAGE( q.try_get( j ) == false, "" );
         g.wait_for_all();
-        CHECK_MESSAGE(q2.try_get(j) == false, "");
+        CHECK_MESSAGE( q2.try_get( j ) == false, "" );
         g.wait_for_all();
-        CHECK_MESSAGE(q3.try_get(j) == false, "");
-        CHECK_MESSAGE(j == bogus_value, "");
+        CHECK_MESSAGE( q3.try_get( j ) == false, "" );
+        CHECK_MESSAGE( j == bogus_value, "" );
 
-        tbb::flow::remove_edge(q, q2);
-        CHECK_MESSAGE(q.try_put(1) == true, "");
+        tbb::flow::remove_edge( q,  q2 );
+        CHECK_MESSAGE( q.try_put( 1 ) == true, "" );
         g.wait_for_all();
-        CHECK_MESSAGE(q2.try_get(j) == false, "");
-        CHECK_MESSAGE(j == bogus_value, "");
+        CHECK_MESSAGE( q2.try_get( j ) == false, "" );
+        CHECK_MESSAGE( j == bogus_value, "" );
         g.wait_for_all();
-        CHECK_MESSAGE(q3.try_get(j) == false, "");
-        CHECK_MESSAGE(j == bogus_value, "");
+        CHECK_MESSAGE( q3.try_get( j ) == false, "" );
+        CHECK_MESSAGE( j == bogus_value, "" );
         g.wait_for_all();
-        CHECK_MESSAGE(q.try_get(j) == true, "");
-        CHECK_MESSAGE(j == 1, "");
+        CHECK_MESSAGE( q.try_get( j ) == true, "" );
+        CHECK_MESSAGE( j == 1, "" );
     }
 
     return 0;
@@ -447,11 +466,11 @@ int test_serial() {
 #include <array>
 #include <vector>
 void test_follows_and_precedes_api() {
-    std::array<int, 3> messages_for_follows = {{0, 1, 2}};
+    std::array<int, 3> messages_for_follows = { {0, 1, 2} };
     std::vector<int> messages_for_precedes = {0, 1, 2};
 
-    follows_and_precedes_testing::test_follows<int, tbb::flow::queue_node<int>>(messages_for_follows);
-    follows_and_precedes_testing::test_precedes<int, tbb::flow::queue_node<int>>(messages_for_precedes);
+    follows_and_precedes_testing::test_follows <int, tbb::flow::queue_node<int>>(messages_for_follows);
+    follows_and_precedes_testing::test_precedes <int, tbb::flow::queue_node<int>>(messages_for_precedes);
 }
 #endif
 
@@ -476,55 +495,217 @@ void test_deduction_guides() {
 }
 #endif
 
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+void test_queue_node_try_put_and_wait() {
+    using namespace test_try_put_and_wait;
+
+    std::vector<int> start_work_items;
+    std::vector<int> new_work_items;
+    int wait_message = 10;
+
+    for (int i = 0; i < wait_message; ++i) {
+        start_work_items.emplace_back(i);
+        new_work_items.emplace_back(i + 1 + wait_message);
+    }
+
+    // Test push
+    // test_buffer_push tests the graph
+    // buffer1 -> function -> buffer2 -> writer
+    //     function is a queueing serial function_node that submits new_work_items once wait_message arrives
+    //     writer is an unlimited function_node that writes an item into the processed_items vector
+    // Test steps
+    //     1. push start_work_items into the buffer1
+    //     2. buffer1.try_put_and_wait(wait_message);
+    //     3. g.wait_for_all()
+    // test_buffer_push returns the index from which the items processed during wait_for_all() starts
+    {
+        std::vector<int> processed_items;
+
+        std::size_t after_start = test_buffer_push<tbb::flow::queue_node<int>>(start_work_items, wait_message,
+                                                                               new_work_items, processed_items);
+
+        // Expected effect:
+        // During buffer1.try_put_and_wait()
+        //     1. start_work_items would be pushed to buffer1
+        //     2. wait_message would be pushed to buffer1
+        //     3. forward_task on buffer1 would transfer all of the items to the function_node in FIFO order
+        //     4. the first item would occupy concurrency of function, other items would be pushed to the queue
+        //     5. function would process start_work_items and push them to the buffer2
+        //     6. wait_message would be processed last and add new_work_items to buffer1
+        //     7. forward_task on buffer2 would transfer start_work_items in FIFO order and the wait_message to the writer
+        //     8.  try_put_and_wait exits since wait_message is completed
+        // During g.wait_for_all()
+        //     10. forward_task for new_work_items in buffer1 would be spawned and put items in function in FIFO order
+        //     11. function_node would process and push forward items from the queue in FIFO order
+        // Expected items processing - { start_work_items FIFO, wait_message, new_work_items FIFO }
+
+        std::size_t check_index = 0;
+        CHECK_MESSAGE(after_start == start_work_items.size() + 1,
+                      "try_put_and_wait should process start_work_items and the wait_message");
+        for (auto item : start_work_items) {
+            CHECK_MESSAGE(processed_items[check_index++] == item,
+                          "try_put_and_wait should process start_work_items FIFO");
+        }
+
+        CHECK_MESSAGE(processed_items[check_index++] == wait_message,
+                      "try_put_and_wait should process wait_message after start_work_items");
+
+        for (auto item : new_work_items) {
+            CHECK_MESSAGE(processed_items[check_index++] == item,
+                          "wait_for_all should process new_work_items FIFO");
+        }
+        CHECK(check_index == processed_items.size());
+    } // Test push
+
+    // Test pull
+    // test_buffer_pull tests the graph
+    // buffer -> function
+    //     function is a rejecting serial function_node that submits new_work_items once wait_message arrives
+    //     and writes the processed item into the processed_items
+    // Test steps
+    //     1. push the occupier message to the function
+    //     2. push start_work_items into the buffer
+    //     3. buffer.try_put_and_wait(wait_message)
+    //     4. g.wait_for_all()
+    // test_buffer_pull returns the index from which the items processed during wait_for_all() starts
+
+    {
+        std::vector<int> processed_items;
+        int occupier = 42;
+
+        std::size_t after_start = test_buffer_pull<tbb::flow::queue_node<int>>(start_work_items, wait_message, occupier,
+                                                                               new_work_items, processed_items);
+
+        // Expected effect
+        // 0. task for occupier processing would be spawned by the function
+        // During buffer.try_put_and_wait()
+        //     1. start_work_items would be pushed to the buffer
+        //     2. wait_message would be pushed to the buffer
+        //     3. forward_task would try to push items to the function, but would fail
+        //        and set the edge to the pull state
+        //     4. occupier would be processed
+        //     5. items would be taken from the buffer by function in FIFO order
+        //     6. wait_message would be taken last and push new_work_items to the buffer
+        // During wait_for_all()
+        //     7. new_work_items would be taken from the buffer in FIFO order
+        // Expected items processing { occupier, start_work_items FIFO, wait_message, new_work_items FIFO }
+
+        std::size_t check_index = 0;
+
+        CHECK_MESSAGE(after_start == start_work_items.size() + 2,
+                      "start_work_items, occupier and wait_message should be processed by try_put_and_wait");
+        CHECK_MESSAGE(processed_items[check_index++] == occupier, "Unexpected items processing by try_put_and_wait");
+        for (auto item : start_work_items) {
+            CHECK_MESSAGE(processed_items[check_index++] == item,
+                          "try_put_and_wait should process start_work_items FIFO");
+        }
+        CHECK_MESSAGE(processed_items[check_index++] == wait_message, "Unexpected items processing by try_put_and_wait");
+
+        for (auto item : new_work_items) {
+            CHECK_MESSAGE(processed_items[check_index++] == item,
+                          "try_put_and_wait should process new_work_items FIFO");
+        }
+        CHECK(check_index == processed_items.size());
+    }
+
+    // Test reserve
+    {
+        int thresholds[] = { 1, 2 };
+
+        for (int threshold : thresholds) {
+            std::vector<int> processed_items;
+
+            // test_buffer_reserve tests the following graph
+            // buffer -> limiter -> function
+            //  function is a rejecting serial function_node that puts an item to the decrementer port
+            //  of the limiter inside of the body
+
+            std::size_t after_start = test_buffer_reserve<tbb::flow::queue_node<int>>(threshold,
+                start_work_items, wait_message, new_work_items, processed_items);
+
+            // Expected effect:
+            // 1. start_work_items would be pushed to the buffer
+            // 2. wait_message_would be pushed to the buffer
+            // 3. forward task of the buffer would push the first message to the limiter node.
+            //    Since the limiter threshold is not reached, it would be directly passed to the function
+            // 4. function would spawn the task for the first message processing
+            // 5. the first would be processed
+            // 6. decrementer.try_put() would be called and the limiter node would
+            //    process all of the items from the buffer using the try_reserve/try_consume/try_release semantics
+            // 7. When the wait_message would be taken from the queue, the try_put_and_wait would exit
+
+            std::size_t check_index = 0;
+
+            CHECK_MESSAGE(after_start == start_work_items.size() + 1,
+                          "try_put_and_wait should start_work_items and wait_message");
+            for (auto item : start_work_items) {
+                CHECK_MESSAGE(processed_items[check_index++] == item, "Unexpected start_work_items processing");
+            }
+            CHECK_MESSAGE(processed_items[check_index++] == wait_message, "Unexpected wait_message processing");
+
+            for (auto item : new_work_items) {
+                CHECK_MESSAGE(processed_items[check_index++] == item, "Unexpected start_work_items processing");
+            }
+        }
+    }
+}
+#endif // __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+
 //! Test serial, parallel behavior and reservation under parallelism
 //! \brief \ref requirement \ref error_guessing
-TEST_CASE("Parallel, serial test") {
+TEST_CASE("Parallel, serial test"){
     for (int p = 2; p <= 4; ++p) {
         tbb::global_control thread_limit(tbb::global_control::max_allowed_parallelism, p);
         tbb::task_arena arena(p);
-        arena.execute([&]() {
-            test_serial<int>();
-            test_serial<CheckType<int>>();
-            test_parallel<int>(p);
-            test_parallel<CheckType<int>>(p);
-        });
-    }
+        arena.execute(
+            [&]() {
+                test_serial<int>();
+                test_serial<CheckType<int> >();
+                test_parallel<int>(p);
+                test_parallel<CheckType<int> >(p);
+            }
+        );
+	}
 }
 
 //! Test reset and cancellation
 //! \brief \ref error_guessing
-TEST_CASE("Resets test") {
+TEST_CASE("Resets test"){
     INFO("Testing resets\n");
-    test_resets<int, tbb::flow::queue_node<int>>();
-    test_resets<float, tbb::flow::queue_node<float>>();
+    test_resets<int, tbb::flow::queue_node<int> >();
+    test_resets<float, tbb::flow::queue_node<float> >();
 }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 //! Test follows and precedes API
 //! \brief \ref error_guessing
-TEST_CASE("Test follows and precedes API") { test_follows_and_precedes_api(); }
+TEST_CASE("Test follows and precedes API"){
+    test_follows_and_precedes_api();
+}
 #endif
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 //! Test decution guides
 //! \brief \ref requirement
-TEST_CASE("Deduction guides") { test_deduction_guides(); }
+TEST_CASE("Deduction guides"){
+    test_deduction_guides();
+}
 #endif
 
 //! Test operations on a reserved queue_node
 //! \brief \ref error_guessing
-TEST_CASE("queue_node with reservation") {
+TEST_CASE("queue_node with reservation"){
     tbb::flow::graph g;
 
     tbb::flow::queue_node<int> q(g);
 
     bool res = q.try_put(42);
-    CHECK_MESSAGE(res, "queue_node must accept input.");
+    CHECK_MESSAGE( res, "queue_node must accept input." );
 
     int val = 1;
     res = q.try_reserve(val);
-    CHECK_MESSAGE(res, "queue_node must reserve as it has an item.");
-    CHECK_MESSAGE((val == 42), "queue_node must reserve once passed item.");
+    CHECK_MESSAGE( res, "queue_node must reserve as it has an item." );
+    CHECK_MESSAGE( (val == 42), "queue_node must reserve once passed item." );
 
     int out_arg = -1;
     CHECK_MESSAGE((q.try_reserve(out_arg) == false), "Reserving a reserved node should fail.");
@@ -535,3 +716,10 @@ TEST_CASE("queue_node with reservation") {
     CHECK_MESSAGE((out_arg == -1), "Getting from reserved node should not update its argument.");
     g.wait_for_all();
 }
+
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+//! \brief \ref error_guessing
+TEST_CASE("test queue_node try_put_and_wait") {
+    test_queue_node_try_put_and_wait();
+}
+#endif
diff --git a/external/tbb/test/tbb/test_resumable_tasks.cpp b/external/tbb/test/tbb/test_resumable_tasks.cpp
index 7519a5f2..0cba9772 100644
--- a/external/tbb/test/tbb/test_resumable_tasks.cpp
+++ b/external/tbb/test/tbb/test_resumable_tasks.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -25,15 +25,15 @@
 #if __TBB_RESUMABLE_TASKS
 
 #include "tbb/global_control.h"
-#include "tbb/parallel_for.h"
 #include "tbb/task_arena.h"
-#include "tbb/task_group.h"
+#include "tbb/parallel_for.h"
 #include "tbb/task_scheduler_observer.h"
+#include "tbb/task_group.h"
 
 #include <algorithm>
-#include <condition_variable>
-#include <queue>
 #include <thread>
+#include <queue>
+#include <condition_variable>
 
 const int N = 10;
 
@@ -41,14 +41,16 @@ const int N = 10;
 class AsyncActivity {
 public:
     AsyncActivity(int num_) : m_numAsyncThreads(num_) {
-        for (int i = 0; i < m_numAsyncThreads; ++i) {
-            m_asyncThreads.push_back(new std::thread(AsyncActivity::asyncLoop, this));
+        for (int i = 0; i < m_numAsyncThreads ; ++i) {
+            m_asyncThreads.push_back( new std::thread(AsyncActivity::asyncLoop, this) );
         }
     }
     ~AsyncActivity() {
         {
             std::lock_guard<std::mutex> lock(m_mutex);
-            for (int i = 0; i < m_numAsyncThreads; ++i) { m_tagQueue.push(nullptr); }
+            for (int i = 0; i < m_numAsyncThreads; ++i) {
+                m_tagQueue.push(nullptr);
+            }
             m_condvar.notify_all();
         }
         for (int i = 0; i < m_numAsyncThreads; ++i) {
@@ -69,11 +71,13 @@ class AsyncActivity {
         for (;;) {
             {
                 std::unique_lock<std::mutex> lock(async->m_mutex);
-                async->m_condvar.wait(lock, [async] { return !async->m_tagQueue.empty(); });
+                async->m_condvar.wait(lock, [async] {return !async->m_tagQueue.empty(); });
                 tag = async->m_tagQueue.front();
                 async->m_tagQueue.pop();
             }
-            if (!tag) { break; }
+            if (!tag) {
+                break;
+            }
             tbb::task::resume(tag);
         };
     }
@@ -86,11 +90,16 @@ class AsyncActivity {
 };
 
 struct SuspendBody {
-    SuspendBody(AsyncActivity& a_) : m_asyncActivity(a_) {}
-    void operator()(tbb::task::suspend_point tag) { m_asyncActivity.submit(tag); }
+    SuspendBody(AsyncActivity& a_, std::thread::id id) :
+        m_asyncActivity(a_), thread_id(id) {}
+    void operator()(tbb::task::suspend_point tag) {
+        CHECK(thread_id == std::this_thread::get_id());
+        m_asyncActivity.submit(tag);
+    }
 
 private:
     AsyncActivity& m_asyncActivity;
+    std::thread::id thread_id;
 };
 
 class InnermostArenaBody {
@@ -99,19 +108,21 @@ class InnermostArenaBody {
 
     void operator()() {
         InnermostOuterParFor inner_outer_body(m_asyncActivity);
-        tbb::parallel_for(0, N, inner_outer_body);
+        tbb::parallel_for(0, N, inner_outer_body );
     }
 
 private:
     struct InnermostInnerParFor {
         InnermostInnerParFor(AsyncActivity& a_) : m_asyncActivity(a_) {}
-        void operator()(int) const { tbb::task::suspend(SuspendBody(m_asyncActivity)); }
+        void operator()(int) const {
+            tbb::task::suspend(SuspendBody(m_asyncActivity, std::this_thread::get_id()));
+        }
         AsyncActivity& m_asyncActivity;
     };
     struct InnermostOuterParFor {
         InnermostOuterParFor(AsyncActivity& a_) : m_asyncActivity(a_) {}
         void operator()(int) const {
-            tbb::task::suspend(SuspendBody(m_asyncActivity));
+            tbb::task::suspend(SuspendBody(m_asyncActivity, std::this_thread::get_id()));
             InnermostInnerParFor inner_inner_body(m_asyncActivity);
             tbb::parallel_for(0, N, inner_inner_body);
         }
@@ -124,18 +135,19 @@ class InnermostArenaBody {
 
 class OutermostArenaBody {
 public:
-    OutermostArenaBody(AsyncActivity& a_, tbb::task_arena& o_, tbb::task_arena& i_, tbb::task_arena& id_,
-                       tbb::enumerable_thread_specific<int>& ets)
-        : m_asyncActivity(a_), m_outermostArena(o_), m_innermostArena(i_), m_innermostArenaDefault(id_),
-          m_local(ets) {}
+    OutermostArenaBody(AsyncActivity& a_, tbb::task_arena& o_, tbb::task_arena& i_
+            , tbb::task_arena& id_, tbb::enumerable_thread_specific<int>& ets) :
+        m_asyncActivity(a_), m_outermostArena(o_), m_innermostArena(i_), m_innermostArenaDefault(id_), m_local(ets) {}
 
-    void operator()() { tbb::parallel_for(0, 32, *this); }
+    void operator()() {
+        tbb::parallel_for(0, 32, *this);
+    }
 
     void operator()(int i) const {
-        tbb::task::suspend(SuspendBody(m_asyncActivity));
+        tbb::task::suspend([&] (tbb::task::suspend_point sp) { m_asyncActivity.submit(sp); });
 
-        tbb::task_arena& nested_arena
-                = (i % 3 == 0) ? m_outermostArena : (i % 3 == 1 ? m_innermostArena : m_innermostArenaDefault);
+        tbb::task_arena& nested_arena = (i % 3 == 0) ?
+            m_outermostArena : (i % 3 == 1 ? m_innermostArena : m_innermostArenaDefault);
 
         if (i % 3 != 0) {
             // We can only guarantee recall coorectness for "not-same" nested arenas entry
@@ -144,8 +156,7 @@ class OutermostArenaBody {
         InnermostArenaBody innermost_arena_body(m_asyncActivity);
         nested_arena.execute(innermost_arena_body);
         if (i % 3 != 0) {
-            CHECK_MESSAGE(i == m_local.local(),
-                          "Original thread wasn't recalled for innermost nested arena.");
+            CHECK_MESSAGE(i == m_local.local(), "Original thread wasn't recalled for innermost nested arena.");
         }
     }
 
@@ -161,7 +172,7 @@ void TestNestedArena() {
     AsyncActivity asyncActivity(4);
 
     tbb::task_arena outermost_arena;
-    tbb::task_arena innermost_arena(2, 2);
+    tbb::task_arena innermost_arena(2,2);
     tbb::task_arena innermost_arena_default;
 
     outermost_arena.initialize();
@@ -170,8 +181,7 @@ void TestNestedArena() {
 
     tbb::enumerable_thread_specific<int> ets;
 
-    OutermostArenaBody outer_arena_body(asyncActivity, outermost_arena, innermost_arena,
-                                        innermost_arena_default, ets);
+    OutermostArenaBody outer_arena_body(asyncActivity, outermost_arena, innermost_arena, innermost_arena_default, ets);
     outermost_arena.execute(outer_arena_body);
 }
 
@@ -179,14 +189,16 @@ void TestNestedArena() {
 class EpochAsyncActivity {
 public:
     EpochAsyncActivity(int num_, std::atomic<int>& e_) : m_numAsyncThreads(num_), m_globalEpoch(e_) {
-        for (int i = 0; i < m_numAsyncThreads; ++i) {
-            m_asyncThreads.push_back(new std::thread(EpochAsyncActivity::asyncLoop, this));
+        for (int i = 0; i < m_numAsyncThreads ; ++i) {
+            m_asyncThreads.push_back( new std::thread(EpochAsyncActivity::asyncLoop, this) );
         }
     }
     ~EpochAsyncActivity() {
         {
             std::lock_guard<std::mutex> lock(m_mutex);
-            for (int i = 0; i < m_numAsyncThreads; ++i) { m_tagQueue.push(nullptr); }
+            for (int i = 0; i < m_numAsyncThreads; ++i) {
+                m_tagQueue.push(nullptr);
+            }
             m_condvar.notify_all();
         }
         for (int i = 0; i < m_numAsyncThreads; ++i) {
@@ -207,11 +219,13 @@ class EpochAsyncActivity {
         for (;;) {
             {
                 std::unique_lock<std::mutex> lock(async->m_mutex);
-                async->m_condvar.wait(lock, [async] { return !async->m_tagQueue.empty(); });
+                async->m_condvar.wait(lock, [async] {return !async->m_tagQueue.empty(); });
                 tag = async->m_tagQueue.front();
                 async->m_tagQueue.pop();
             }
-            if (!tag) { break; }
+            if (!tag) {
+                break;
+            }
             // Track the global epoch
             async->m_globalEpoch++;
             tbb::task::resume(tag);
@@ -227,8 +241,8 @@ class EpochAsyncActivity {
 };
 
 struct EpochSuspendBody {
-    EpochSuspendBody(EpochAsyncActivity& a_, std::atomic<int>& e_, int& le_)
-        : m_asyncActivity(a_), m_globalEpoch(e_), m_localEpoch(le_) {}
+    EpochSuspendBody(EpochAsyncActivity& a_, std::atomic<int>& e_, int& le_) :
+        m_asyncActivity(a_), m_globalEpoch(e_), m_localEpoch(le_) {}
 
     void operator()(tbb::task::suspend_point ctx) {
         m_localEpoch = m_globalEpoch;
@@ -249,8 +263,7 @@ void TestSuspendResume() {
     constexpr int iter_size = 50000;
 #endif
 
-    std::atomic<int> global_epoch;
-    global_epoch = 0;
+    std::atomic<int> global_epoch; global_epoch = 0;
     EpochAsyncActivity async(4, global_epoch);
 
     tbb::enumerable_thread_specific<int, tbb::cache_aligned_allocator<int>, tbb::ets_suspend_aware> ets_fiber;
@@ -281,7 +294,7 @@ void TestSuspendResume() {
         ++outer_par_iters;
     });
     CHECK(outer_par_iters == N);
-    CHECK(inner_par_iters == N * N * iter_size);
+    CHECK(inner_par_iters == N*N*iter_size);
 }
 
 // During cleanup external thread's local task pool may
@@ -301,10 +314,10 @@ void TestCleanupMaster() {
         iter_executed = 0;
 
         utils::NativeParallelFor(N, [&asyncActivity, &tg, &iter_spawned, &iter_executed](int j) {
-            for (int k = 0; k < j * 10 + 1; ++k) {
+            for (int k = 0; k < j*10 + 1; ++k) {
                 tg.run([&asyncActivity, j, &iter_executed] {
                     utils::doDummyWork(j * 10);
-                    tbb::task::suspend(SuspendBody(asyncActivity));
+                    tbb::task::suspend(SuspendBody(asyncActivity, std::this_thread::get_id()));
                     iter_executed++;
                 });
                 iter_spawned++;
@@ -318,12 +331,11 @@ void TestCleanupMaster() {
 class ParForSuspendBody {
     AsyncActivity& asyncActivity;
     int m_numIters;
-
 public:
     ParForSuspendBody(AsyncActivity& a_, int iters) : asyncActivity(a_), m_numIters(iters) {}
     void operator()(int) const {
         utils::doDummyWork(m_numIters);
-        tbb::task::suspend(SuspendBody(asyncActivity));
+        tbb::task::suspend(SuspendBody(asyncActivity, std::this_thread::get_id()));
     }
 };
 
@@ -332,23 +344,26 @@ void TestNativeThread() {
 
     tbb::task_arena arena;
     tbb::task_group tg;
-    std::atomic<int> iter {};
+    std::atomic<int> iter{};
     utils::NativeParallelFor(arena.max_concurrency() / 2, [&arena, &tg, &asyncActivity, &iter](int) {
         for (int i = 0; i < 10; i++) {
             arena.execute([&tg, &asyncActivity, &iter]() {
-                tg.run([&asyncActivity]() { tbb::task::suspend(SuspendBody(asyncActivity)); });
+                tg.run([&asyncActivity]() {
+                    tbb::task::suspend(SuspendBody(asyncActivity, std::this_thread::get_id()));
+                });
                 iter++;
             });
         }
     });
 
     CHECK(iter == (arena.max_concurrency() / 2 * 10));
-    arena.execute([&tg]() { tg.wait(); });
+    arena.execute([&tg](){
+        tg.wait();
+    });
 }
 
 class ObserverTracker : public tbb::task_scheduler_observer {
     static thread_local bool is_in_arena;
-
 public:
     std::atomic<int> counter;
 
@@ -376,12 +391,13 @@ void TestObservers() {
     ObserverTracker tracker(arena);
     do {
         arena.execute([] {
-            tbb::parallel_for(
-                    0, 10,
-                    [](int) {
-                        tbb::task::suspend([](tbb::task::suspend_point tag) { tbb::task::resume(tag); });
-                    },
-                    tbb::simple_partitioner());
+            tbb::parallel_for(0, 10, [](int) {
+                auto thread_id = std::this_thread::get_id();
+                tbb::task::suspend([thread_id](tbb::task::suspend_point tag) {
+                    CHECK(thread_id == std::this_thread::get_id());
+                    tbb::task::resume(tag);
+                });
+            }, tbb::simple_partitioner());
         });
     } while (tracker.counter < 100);
     tracker.observe(false);
@@ -391,12 +407,11 @@ class TestCaseGuard {
     static thread_local bool m_local;
     tbb::global_control m_threadLimit;
     tbb::global_control m_stackLimit;
-
 public:
     TestCaseGuard()
-        : m_threadLimit(tbb::global_control::max_allowed_parallelism,
-                        std::max(tbb::this_task_arena::max_concurrency(), 16)),
-          m_stackLimit(tbb::global_control::thread_stack_size, 128 * 1024) {
+        : m_threadLimit(tbb::global_control::max_allowed_parallelism, std::max(tbb::this_task_arena::max_concurrency(), 16))
+        , m_stackLimit(tbb::global_control::thread_stack_size, 128*1024)
+    {
         CHECK(m_local == false);
         m_local = true;
     }
@@ -408,6 +423,7 @@ class TestCaseGuard {
 
 thread_local bool TestCaseGuard::m_local = false;
 
+#if !EMSCRIPTEN
 //! Nested test for suspend and resume
 //! \brief \ref error_guessing
 TEST_CASE("Nested test for suspend and resume") {
@@ -421,16 +437,25 @@ TEST_CASE("Nested arena") {
     TestCaseGuard guard;
     TestNestedArena();
 }
+#endif
 
 //! Test with external threads
 //! \brief \ref error_guessing
-TEST_CASE("External threads") { TestNativeThread(); }
+TEST_CASE("External threads") {
+    TestNativeThread();
+}
 
+#if !EMSCRIPTEN
 //! Stress test with external threads
 //! \brief \ref stress
-TEST_CASE("Stress test with external threads") { TestCleanupMaster(); }
+TEST_CASE("Stress test with external threads") {
+    TestCleanupMaster();
+}
+#endif
 
 //! Test with an arena observer
 //! \brief \ref error_guessing
-TEST_CASE("Arena observer") { TestObservers(); }
+TEST_CASE("Arena observer") {
+    TestObservers();
+}
 #endif /* __TBB_RESUMABLE_TASKS */
diff --git a/external/tbb/test/tbb/test_scheduler_mix.cpp b/external/tbb/test/tbb/test_scheduler_mix.cpp
index 3b7586e1..8d8e0e37 100644
--- a/external/tbb/test/tbb/test_scheduler_mix.cpp
+++ b/external/tbb/test/tbb/test_scheduler_mix.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2021 Intel Corporation
+    Copyright (c) 2021-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -14,33 +14,30 @@
     limitations under the License.
 */
 
-#define TBB_PREVIEW_MUTEXES 1
-#define TBB_PREVIEW_WAITING_FOR_WORKERS 1
-#define TBB_PREVIEW_TASK_GROUP_EXTENSIONS 1
-
 #include "common/config.h"
 
+#include <oneapi/tbb/task_arena.h>
 #include <oneapi/tbb/concurrent_vector.h>
-#include <oneapi/tbb/parallel_for.h>
 #include <oneapi/tbb/rw_mutex.h>
-#include <oneapi/tbb/task_arena.h>
 #include <oneapi/tbb/task_group.h>
+#include <oneapi/tbb/parallel_for.h>
 
 #include <oneapi/tbb/global_control.h>
 
-#include "common/spin_barrier.h"
 #include "common/test.h"
 #include "common/utils.h"
 #include "common/utils_concurrency_limit.h"
+#include "common/spin_barrier.h"
 
+#include <stdlib.h> // C11/POSIX aligned_alloc
 #include <random>
-#include <stdlib.h>// C11/POSIX aligned_alloc
+
 
 //! \file test_scheduler_mix.cpp
 //! \brief Test for [scheduler.task_arena scheduler.task_scheduler_observer] specification
 
 const std::uint64_t maxNumActions = 1 * 100 * 1000;
-static std::atomic<std::uint64_t> globalNumActions {};
+static std::atomic<std::uint64_t> globalNumActions{};
 
 //using Random = utils::FastRandom<>;
 class Random {
@@ -51,14 +48,17 @@ class Random {
 
         State() : gen(rd()), dist(0, std::numeric_limits<unsigned short>::max()) {}
 
-        int get() { return dist(gen); }
+        int get() {
+            return dist(gen);
+        }
     };
     static thread_local State* mState;
     tbb::concurrent_vector<State*> mStateList;
-
 public:
     ~Random() {
-        for (auto s : mStateList) { delete s; }
+        for (auto s : mStateList) {
+            delete s;
+        }
     }
 
     int get() {
@@ -73,11 +73,12 @@ class Random {
 
 thread_local Random::State* Random::mState = nullptr;
 
+
 void* aligned_malloc(std::size_t alignment, std::size_t size) {
 #if _WIN32
     return _aligned_malloc(size, alignment);
 #elif __unix__ || __APPLE__
-    void* ptr {};
+    void* ptr{};
     int res = posix_memalign(&ptr, alignment, size);
     CHECK(res == 0);
     return ptr;
@@ -97,16 +98,20 @@ void aligned_free(void* ptr) {
 template <typename T, std::size_t Alignment>
 class PtrRWMutex {
     static const std::size_t maxThreads = (Alignment >> 1) - 1;
-    static const std::uintptr_t READER_MASK = maxThreads;      // 7F..
-    static const std::uintptr_t LOCKED = Alignment - 1;        // FF..
-    static const std::uintptr_t LOCKED_MASK = LOCKED;          // FF..
-    static const std::uintptr_t LOCK_PENDING = READER_MASK + 1;// 80..
+    static const std::uintptr_t READER_MASK = maxThreads;       // 7F..
+    static const std::uintptr_t LOCKED = Alignment - 1;         // FF..
+    static const std::uintptr_t LOCKED_MASK = LOCKED;           // FF..
+    static const std::uintptr_t LOCK_PENDING = READER_MASK + 1; // 80..
 
     std::atomic<std::uintptr_t> mState;
 
-    T* pointer() { return reinterpret_cast<T*>(state() & ~LOCKED_MASK); }
+    T* pointer() {
+        return reinterpret_cast<T*>(state() & ~LOCKED_MASK);
+    }
 
-    std::uintptr_t state() { return mState.load(std::memory_order_relaxed); }
+    std::uintptr_t state() {
+        return mState.load(std::memory_order_relaxed);
+    }
 
 public:
     class ScopedLock {
@@ -119,7 +124,9 @@ class PtrRWMutex {
         }
         //! Release lock (if lock is held).
         ~ScopedLock() {
-            if (mMutex) { release(); }
+            if (mMutex) {
+                release();
+            }
         }
         //! No Copy
         ScopedLock(const ScopedLock&) = delete;
@@ -159,14 +166,14 @@ class PtrRWMutex {
 
             if (mIsWriter) {
                 m->unlock();
-            } else {
+            }
+            else {
                 m->unlockShared();
             }
         }
-
     protected:
-        PtrRWMutex* mMutex {};
-        bool mIsWriter {};
+        PtrRWMutex* mMutex{};
+        bool mIsWriter{};
     };
 
     bool trySet(T* ptr) {
@@ -174,7 +181,9 @@ class PtrRWMutex {
         CHECK_FAST((p & (Alignment - 1)) == 0);
         if (!state()) {
             std::uintptr_t expected = 0;
-            if (mState.compare_exchange_strong(expected, p)) { return true; }
+            if (mState.compare_exchange_strong(expected, p)) {
+                return true;
+            }
         }
         return false;
     }
@@ -186,20 +195,28 @@ class PtrRWMutex {
 
     bool tryLock() {
         auto v = state();
-        if (v == 0) { return false; }
+        if (v == 0) {
+            return false;
+        }
         CHECK_FAST((v & LOCKED_MASK) == LOCKED || (v & READER_MASK) < maxThreads);
         if ((v & READER_MASK) == 0) {
-            if (mState.compare_exchange_strong(v, v | LOCKED)) { return true; }
+            if (mState.compare_exchange_strong(v, v | LOCKED)) {
+                return true;
+            }
         }
         return false;
     }
 
     bool tryLockShared() {
         auto v = state();
-        if (v == 0) { return false; }
+        if (v == 0) {
+            return false;
+        }
         CHECK_FAST((v & LOCKED_MASK) == LOCKED || (v & READER_MASK) < maxThreads);
         if ((v & LOCKED_MASK) != LOCKED && (v & LOCK_PENDING) == 0) {
-            if (mState.compare_exchange_strong(v, v + 1)) { return true; }
+            if (mState.compare_exchange_strong(v, v + 1)) {
+                return true;
+            }
         }
         return false;
     }
@@ -207,7 +224,9 @@ class PtrRWMutex {
     void lock() {
         auto v = state();
         mState.compare_exchange_strong(v, v | LOCK_PENDING);
-        while (!tryLock()) { utils::yield(); }
+        while (!tryLock()) {
+            utils::yield();
+        }
     }
 
     void unlock() {
@@ -223,9 +242,13 @@ class PtrRWMutex {
         mState -= 1;
     }
 
-    operator bool() const { return pointer() != 0; }
+    operator bool() const {
+        return pointer() != 0;
+    }
 
-    T* get() { return pointer(); }
+    T* get() {
+        return pointer();
+    }
 };
 
 class Statistics {
@@ -244,7 +267,6 @@ class Statistics {
     };
 
     static const char* const mStatNames[numActions];
-
 private:
     struct StatType {
         StatType() : mCounters() {}
@@ -262,18 +284,23 @@ class Statistics {
         }
         return *s;
     }
-
 public:
     ~Statistics() {
-        for (auto s : mStatsList) { delete s; }
+        for (auto s : mStatsList) {
+            delete s;
+        }
     }
 
-    void notify(ACTION a) { ++get().mCounters[a]; }
+    void notify(ACTION a) {
+        ++get().mCounters[a];
+    }
 
     void report() {
         StatType summary;
         for (auto& s : mStatsList) {
-            for (int i = 0; i < numActions; ++i) { summary.mCounters[i] += s->mCounters[i]; }
+            for (int i = 0; i < numActions; ++i) {
+                summary.mCounters[i] += s->mCounters[i];
+            }
         }
         std::cout << std::endl << "Statistics:" << std::endl;
         std::cout << "Total actions: " << globalNumActions << std::endl;
@@ -283,10 +310,12 @@ class Statistics {
     }
 };
 
-const char* const Statistics::mStatNames[Statistics::numActions]
-        = {"Arena create",         "Arena destroy",         "Arena acquire",
-           "Skipped arena create", "Skipped arena destroy", "Skipped arena acquire",
-           "Parallel algorithm",   "Arena enqueue",         "Arena execute"};
+
+const char* const Statistics::mStatNames[Statistics::numActions] = {
+    "Arena create", "Arena destroy", "Arena acquire",
+    "Skipped arena create", "Skipped arena destroy", "Skipped arena acquire",
+    "Parallel algorithm", "Arena enqueue", "Arena execute"
+};
 thread_local Statistics::StatType* Statistics::mStats;
 
 static Statistics gStats;
@@ -307,29 +336,41 @@ class LifetimeTracker {
             }
         }
 
-        Guard(Guard&& ing) : mObj(ing.mObj) { ing.mObj = nullptr; }
+        Guard(Guard&& ing) : mObj(ing.mObj) {
+            ing.mObj = nullptr;
+        }
 
         ~Guard() {
-            if (mObj != nullptr) { mObj->mReferences.fetch_sub(REFERENCE_FLAG); }
+            if (mObj != nullptr) {
+                mObj->mReferences.fetch_sub(REFERENCE_FLAG);
+            }
         }
 
-        bool continue_execution() { return mObj != nullptr; }
+        bool continue_execution() {
+            return mObj != nullptr;
+        }
 
     private:
-        LifetimeTracker* mObj {nullptr};
+        LifetimeTracker* mObj{nullptr};
     };
 
-    Guard makeGuard() { return Guard(this); }
+    Guard makeGuard() {
+        return Guard(this);
+    }
 
-    void signalShutdown() { mReferences.fetch_add(SHUTDOWN_FLAG); }
+    void signalShutdown() {
+        mReferences.fetch_add(SHUTDOWN_FLAG);
+    }
 
-    void waitCompletion() { utils::SpinWaitUntilEq(mReferences, SHUTDOWN_FLAG); }
+    void waitCompletion() {
+        utils::SpinWaitUntilEq(mReferences, SHUTDOWN_FLAG);
+    }
 
 private:
     friend class Guard;
     static constexpr std::uintptr_t SHUTDOWN_FLAG = 1;
     static constexpr std::uintptr_t REFERENCE_FLAG = 1 << 1;
-    std::atomic<std::uintptr_t> mReferences {};
+    std::atomic<std::uintptr_t> mReferences{};
 };
 
 class ArenaTable {
@@ -341,19 +382,21 @@ class ArenaTable {
     std::array<ArenaPtrRWMutex, maxArenas> mArenaTable;
 
     struct ThreadState {
-        bool lockedArenas[maxArenas] {};
+        bool lockedArenas[maxArenas]{};
         int arenaIdxStack[maxArenas];
-        int level {};
+        int level{};
     };
 
-    LifetimeTracker mLifetimeTracker {};
+    LifetimeTracker mLifetimeTracker{};
     static thread_local ThreadState mThreadState;
 
     template <typename F>
-    auto find_arena(std::size_t start, F f) -> decltype(f(std::declval<ArenaPtrRWMutex&>(), std::size_t {})) {
+    auto find_arena(std::size_t start, F f) -> decltype(f(std::declval<ArenaPtrRWMutex&>(), std::size_t{})) {
         for (std::size_t idx = start, i = 0; i < maxArenas; ++i, idx = (idx + 1) % maxArenas) {
             auto res = f(mArenaTable[idx], idx);
-            if (res) { return res; }
+            if (res) {
+                return res;
+            }
         }
         return {};
     }
@@ -366,18 +409,18 @@ class ArenaTable {
         if (guard.continue_execution()) {
             int num_threads = rnd.get() % utils::get_platform_max_threads() + 1;
             unsigned int num_reserved = rnd.get() % num_threads;
-            tbb::task_arena::priority priorities[]
-                    = {tbb::task_arena::priority::low, tbb::task_arena::priority::normal,
-                       tbb::task_arena::priority::high};
+            tbb::task_arena::priority priorities[] = { tbb::task_arena::priority::low , tbb::task_arena::priority::normal, tbb::task_arena::priority::high };
             tbb::task_arena::priority priority = priorities[rnd.get() % 3];
 
-            tbb::task_arena* a = new (aligned_malloc(arenaAligment, arenaAligment))
-                    tbb::task_arena {num_threads, num_reserved, priority};
+            tbb::task_arena* a = new (aligned_malloc(arenaAligment, arenaAligment)) tbb::task_arena{ num_threads , num_reserved , priority };
 
             if (!find_arena(rnd.get() % maxArenas, [a](ArenaPtrRWMutex& arena, std::size_t) -> bool {
-                    if (arena.trySet(a)) { return true; }
+                    if (arena.trySet(a)) {
+                        return true;
+                    }
                     return false;
-                })) {
+                }))
+            {
                 gStats.notify(Statistics::skippedArenaCreate);
                 a->~task_arena();
                 aligned_free(a);
@@ -401,7 +444,8 @@ class ArenaTable {
                         }
                     }
                     return false;
-                })) {
+                }))
+            {
                 gStats.notify(Statistics::skippedArenaDestroy);
             }
         }
@@ -412,7 +456,7 @@ class ArenaTable {
         mLifetimeTracker.waitCompletion();
         find_arena(0, [](ArenaPtrRWMutex& arena, std::size_t) {
             if (arena.get()) {
-                ScopedLock lock {arena, true};
+                ScopedLock lock{ arena, true };
                 auto a = arena.get();
                 lock.clear();
                 a->~task_arena();
@@ -425,26 +469,27 @@ class ArenaTable {
     std::pair<tbb::task_arena*, std::size_t> acquire(Random& rnd, ScopedLock& lock) {
         auto guard = mLifetimeTracker.makeGuard();
 
-        tbb::task_arena* a {nullptr};
-        std::size_t resIdx {};
+        tbb::task_arena* a{nullptr};
+        std::size_t resIdx{};
         if (guard.continue_execution()) {
             auto& ts = mThreadState;
-            a = find_arena(
-                    rnd.get() % maxArenas,
-                    [&ts, &lock, &resIdx](ArenaPtrRWMutex& arena, std::size_t idx) -> tbb::task_arena* {
-                        if (!ts.lockedArenas[idx]) {
-                            if (lock.tryAcquire(arena, false)) {
-                                ts.lockedArenas[idx] = true;
-                                ts.arenaIdxStack[ts.level++] = int(idx);
-                                resIdx = idx;
-                                return arena.get();
-                            }
+            a = find_arena(rnd.get() % maxArenas,
+                [&ts, &lock, &resIdx](ArenaPtrRWMutex& arena, std::size_t idx) -> tbb::task_arena* {
+                    if (!ts.lockedArenas[idx]) {
+                        if (lock.tryAcquire(arena, false)) {
+                            ts.lockedArenas[idx] = true;
+                            ts.arenaIdxStack[ts.level++] = int(idx);
+                            resIdx = idx;
+                            return arena.get();
                         }
-                        return nullptr;
-                    });
-            if (!a) { gStats.notify(Statistics::skippedArenaAcquire); }
+                    }
+                    return nullptr;
+                });
+            if (!a) {
+                gStats.notify(Statistics::skippedArenaAcquire);
+            }
         }
-        return {a, resIdx};
+        return { a, resIdx };
     }
 
     void release(ScopedLock& lock) {
@@ -477,57 +522,74 @@ enum ACTIONS {
     num_actions
 };
 
-void global_actor();
+void global_actor(size_t arenaAfterStealing);
 
 template <ACTIONS action>
 struct actor;
 
 template <>
 struct actor<arena_create> {
-    static void do_it(Random& r) { arenaTable.create(r); }
+    static void do_it(Random& r) {
+        arenaTable.create(r);
+    }
 };
 
 template <>
 struct actor<arena_destroy> {
-    static void do_it(Random& r) { arenaTable.destroy(r); }
+    static void do_it(Random& r) {
+        arenaTable.destroy(r);
+    }
 };
 
 template <>
 struct actor<arena_action> {
-    static void do_it(Random& r) {
+    static void do_it(Random& r, size_t arenaAfterStealing) {
         static thread_local std::size_t arenaLevel = 0;
+
+        // treat arenas index as priority: we own some resource already,
+        // so may pretend only to low-priority resource
+        arenaLevel = std::max(arenaLevel, arenaAfterStealing);
+
         ArenaTable::ScopedLock lock;
         auto entry = arenaTable.acquire(r, lock);
         if (entry.first) {
-            enum arena_actions { arena_execute, arena_enqueue, num_arena_actions };
+            enum arena_actions {
+                arena_execute,
+                arena_enqueue,
+                num_arena_actions
+            };
             auto process = r.get() % 2;
             auto body = [process] {
                 if (process) {
-                    tbb::detail::d1::wait_context wctx {1};
+                    tbb::detail::d1::wait_context wctx{ 1 };
                     tbb::task_group_context ctx;
                     tbb::this_task_arena::enqueue([&wctx] { wctx.release(); });
                     tbb::detail::d1::wait(wctx, ctx);
                 } else {
-                    global_actor();
+                    global_actor(0);
                 }
             };
-            switch (r.get() % (16 * num_arena_actions)) {
-                case arena_execute:
-                    if (entry.second > arenaLevel) {
-                        gStats.notify(Statistics::ArenaExecute);
-                        auto oldArenaLevel = arenaLevel;
-                        arenaLevel = entry.second;
-                        entry.first->execute(body);
-                        arenaLevel = oldArenaLevel;
-                        break;
-                    }
-                    utils_fallthrough;
-                case arena_enqueue:
-                    utils_fallthrough;
-                default:
-                    gStats.notify(Statistics::ArenaEnqueue);
-                    entry.first->enqueue([] { global_actor(); });
+            switch (r.get() % (16*num_arena_actions)) {
+            case arena_execute:
+                // to prevent deadlock, potentially blocking operation
+                // may be called only for arenas with larger index
+                if (entry.second > arenaLevel) {
+                    gStats.notify(Statistics::ArenaExecute);
+                    auto oldArenaLevel = arenaLevel;
+                    arenaLevel = entry.second;
+                    entry.first->execute(body);
+                    arenaLevel = oldArenaLevel;
                     break;
+                }
+                utils_fallthrough;
+            case arena_enqueue:
+                utils_fallthrough;
+            default:
+                gStats.notify(Statistics::ArenaEnqueue);
+                // after stealing by a worker, the task will run in arena
+                // with index entry.second
+                entry.first->enqueue([ entry ] { global_actor(entry.second); });
+                break;
             }
             arenaTable.release(lock);
         }
@@ -537,54 +599,47 @@ struct actor<arena_action> {
 template <>
 struct actor<parallel_algorithm> {
     static void do_it(Random& rnd) {
-        enum PARTITIONERS { simpl_part, auto_part, aff_part, static_part, num_parts };
+        enum PARTITIONERS {
+            simpl_part,
+            auto_part,
+            aff_part,
+            static_part,
+            num_parts
+        };
         int sz = rnd.get() % 10000;
         auto doGlbAction = rnd.get() % 1000 == 42;
         auto body = [doGlbAction, sz](int i) {
-            if (i == sz / 2 && doGlbAction) { global_actor(); }
+            if (i == sz / 2 && doGlbAction) {
+                global_actor(0);
+            }
         };
 
         switch (rnd.get() % num_parts) {
-            case simpl_part:
-                tbb::parallel_for(0, sz, body, tbb::simple_partitioner {});
-                break;
-            case auto_part:
-                tbb::parallel_for(0, sz, body, tbb::auto_partitioner {});
-                break;
-            case aff_part: {
-                tbb::affinity_partitioner aff;
-                tbb::parallel_for(0, sz, body, aff);
-                break;
-            }
-            case static_part:
-                tbb::parallel_for(0, sz, body, tbb::static_partitioner {});
-                break;
+        case simpl_part:
+            tbb::parallel_for(0, sz, body, tbb::simple_partitioner{}); break;
+        case auto_part:
+            tbb::parallel_for(0, sz, body, tbb::auto_partitioner{}); break;
+        case aff_part:
+        {
+            tbb::affinity_partitioner aff;
+            tbb::parallel_for(0, sz, body, aff); break;
+        }
+        case static_part:
+            tbb::parallel_for(0, sz, body, tbb::static_partitioner{}); break;
         }
     }
 };
 
-void global_actor() {
-    static thread_local std::uint64_t localNumActions {};
+void global_actor(size_t arenaAfterStealing) {
+    static thread_local std::uint64_t localNumActions{};
 
     while (globalNumActions < maxNumActions) {
         auto& rnd = threadRandom;
         switch (rnd.get() % num_actions) {
-            case arena_create:
-                gStats.notify(Statistics::ArenaCreate);
-                actor<arena_create>::do_it(rnd);
-                break;
-            case arena_destroy:
-                gStats.notify(Statistics::ArenaDestroy);
-                actor<arena_destroy>::do_it(rnd);
-                break;
-            case arena_action:
-                gStats.notify(Statistics::ArenaAcquire);
-                actor<arena_action>::do_it(rnd);
-                break;
-            case parallel_algorithm:
-                gStats.notify(Statistics::ParallelAlgorithm);
-                actor<parallel_algorithm>::do_it(rnd);
-                break;
+        case arena_create:  gStats.notify(Statistics::ArenaCreate); actor<arena_create>::do_it(rnd);  break;
+        case arena_destroy: gStats.notify(Statistics::ArenaDestroy); actor<arena_destroy>::do_it(rnd); break;
+        case arena_action:  gStats.notify(Statistics::ArenaAcquire); actor<arena_action>::do_it(rnd, arenaAfterStealing);  break;
+        case parallel_algorithm: gStats.notify(Statistics::ParallelAlgorithm); actor<parallel_algorithm>::do_it(rnd);  break;
         }
 
         if (++localNumActions == 100) {
@@ -604,18 +659,18 @@ void global_actor() {
 TEST_CASE("Stress test with mixing functionality") {
     // TODO add thread recreation
     // TODO: Enable statistics
-    // tbb::task_scheduler_handle handle = tbb::task_scheduler_handle::get();
+    tbb::task_scheduler_handle handle{ tbb::attach{} };
 
     const std::size_t numExtraThreads = 16;
-    utils::SpinBarrier startBarrier {numExtraThreads};
+    utils::SpinBarrier startBarrier{numExtraThreads};
     utils::NativeParallelFor(numExtraThreads, [&startBarrier](std::size_t) {
         startBarrier.wait();
-        global_actor();
+        global_actor(0);
     });
 
     arenaTable.shutdown();
 
-    // tbb::finalize(handle, std::nothrow_t{});
+    tbb::finalize(handle);
 
     // gStats.report();
 }
diff --git a/external/tbb/test/tbb/test_semaphore.cpp b/external/tbb/test/tbb/test_semaphore.cpp
index 77035d00..a00cab09 100644
--- a/external/tbb/test/tbb/test_semaphore.cpp
+++ b/external/tbb/test/tbb/test_semaphore.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -22,12 +22,12 @@
 #endif
 
 // Test for counting semaphore
-#include "../../src/tbb/semaphore.h"
-#include "common/spin_barrier.h"
 #include "common/test.h"
 #include "common/utils.h"
+#include "common/spin_barrier.h"
 #include "tbb/blocked_range.h"
 #include "tbb/tick_count.h"
+#include "../../src/tbb/semaphore.h"
 #include <atomic>
 #include <vector>
 
@@ -45,16 +45,18 @@ class Body : utils::NoAssign {
     std::vector<int>& ourCounts;
     std::vector<double>& tottime;
 
-    static constexpr int tickCounts = 1;// millisecond
+    static constexpr int tickCounts = 1; // millisecond
     static constexpr int innerWait = 5; // millisecond
 public:
-    Body(int nThread, int nIter, semaphore& sem, std::vector<int>& our_counts, std::vector<double>& tot_time)
-        : nIters(nIter), mySem(sem), ourCounts(our_counts), tottime(tot_time) {
+    Body( int nThread, int nIter, semaphore& sem,
+          std::vector<int>& our_counts, std::vector<double>& tot_time )
+        : nIters(nIter), mySem(sem), ourCounts(our_counts), tottime(tot_time)
+    {
         sBarrier.initialize(nThread);
         pCount = 0;
     }
 
-    void operator()(const int tid) const {
+    void operator()( const int tid ) const {
         sBarrier.wait();
 
         for (int i = 0; i < nIters; ++i) {
@@ -65,16 +67,18 @@ class Body : utils::NoAssign {
             tottime[tid] += (t1 - t0).seconds();
 
             int curval = ++pCount;
-            if (curval > ourCounts[tid]) { ourCounts[tid] = curval; }
+            if (curval > ourCounts[tid]) {
+                ourCounts[tid] = curval;
+            }
             utils::Sleep(innerWait);
             --pCount;
             REQUIRE(int(pCount) >= 0);
             mySem.V();
         }
     }
-};// class Body
+}; // class Body
 
-void test_semaphore(int sem_init_cnt, int extra_threads) {
+void test_semaphore( int sem_init_cnt, int extra_threads ) {
     semaphore my_sem(sem_init_cnt);
     int n_threads = sem_init_cnt + extra_threads;
 
@@ -86,16 +90,12 @@ void test_semaphore(int sem_init_cnt, int extra_threads) {
 
     pCount = 0;
     utils::NativeParallelFor(n_threads, body);
-
-    if (extra_threads == 0) {
-        double allPWaits = 0;
-        for (auto item : tot_times) { allPWaits += item; }
-        allPWaits /= static_cast<double>(n_threads * n_iters);
-    }
     REQUIRE_MESSAGE(!pCount, "not all threads decremented pCount");
 
     int max_count = -1;
-    for (auto item : max_vals) { max_count = utils::max(max_count, item); }
+    for (auto item : max_vals) {
+        max_count = utils::max(max_count, item);
+    }
     REQUIRE_MESSAGE(max_count <= sem_init_cnt, "Too many threads in semaphore-protected increment");
 }
 
@@ -111,7 +111,7 @@ struct Counter {
     std::atomic<long> value;
     S my_sem;
     Counter() : value(0) {}
-};// struct Counter
+}; // struct Counter
 
 // Function object for use with parallel_for.h
 template <typename C>
@@ -119,7 +119,7 @@ struct AddOne : utils::NoAssign {
     C& my_counter;
 
     // Increments counter once for each iteration in the iteration space
-    void operator()(int) const {
+    void operator()( int ) const {
         for (std::size_t i = 0; i < N_TIMES; ++i) {
             my_counter.my_sem.P();
             ++my_counter.value;
@@ -127,10 +127,12 @@ struct AddOne : utils::NoAssign {
         }
     }
 
-    AddOne(C& c) : my_counter(c) { my_counter.my_sem.V(); }
-};// struct AddOne
+    AddOne( C& c ) : my_counter(c) {
+        my_counter.my_sem.V();
+    }
+}; // struct AddOne
 
-void test_binary_semaphore(int n_threads) {
+void test_binary_semaphore( int n_threads ) {
     Counter<tbb::detail::r1::binary_semaphore> counter;
     AddOne<decltype(counter)> AddOneBody(counter);
     utils::NativeParallelFor(n_threads, AddOneBody);
@@ -144,7 +146,7 @@ enum FilterType { imaProducer, imaConsumer };
 class FilterBase : utils::NoAssign {
 protected:
     FilterType ima;
-    unsigned totTokens;// total number of tokens to be emitted, only used by producer
+    unsigned totTokens; // total number of tokens to be emitted, only used by producer
     std::atomic<unsigned>& myTokens;
     std::atomic<unsigned>& otherTokens;
 
@@ -155,44 +157,54 @@ class FilterBase : utils::NoAssign {
     unsigned* myBuffer;
     unsigned* nextBuffer;
     unsigned curToken;
-
 public:
-    FilterBase(FilterType filter, unsigned tot_tokens, std::atomic<unsigned>& my_tokens,
-               std::atomic<unsigned>& other_tokens, unsigned my_wait, semaphore& m_sem, semaphore& n_sem,
-               unsigned* buf, unsigned* n_buf)
-        : ima(filter), totTokens(tot_tokens), myTokens(my_tokens), otherTokens(other_tokens), myWait(my_wait),
-          my_sem(m_sem), next_sem(n_sem), myBuffer(buf), nextBuffer(n_buf) {
+    FilterBase( FilterType filter,
+                unsigned tot_tokens,
+                std::atomic<unsigned>& my_tokens,
+                std::atomic<unsigned>& other_tokens,
+                unsigned my_wait,
+                semaphore& m_sem,
+                semaphore& n_sem,
+                unsigned* buf,
+                unsigned* n_buf )
+        : ima(filter), totTokens(tot_tokens), myTokens(my_tokens),
+          otherTokens(other_tokens), myWait(my_wait), my_sem(m_sem),
+          next_sem(n_sem), myBuffer(buf), nextBuffer(n_buf)
+    {
         curToken = 0;
     }
 
-    void Produce(const int);
-    void Consume(const int);
-    void operator()(const int tid) {
+    void Produce( const int );
+    void Consume( const int );
+    void operator()( const int tid ) {
         if (ima == imaConsumer) {
             Consume(tid);
         } else {
             Produce(tid);
         }
     }
-};// class FilterBase
+}; // class FilterBase
 
 class ProduceConsumeBody {
     FilterBase** my_filters;
-
 public:
-    ProduceConsumeBody(FilterBase** filters) : my_filters(filters) {}
+    ProduceConsumeBody( FilterBase** filters ) : my_filters(filters) {}
 
-    void operator()(const int tid) const { my_filters[tid]->operator()(tid); }
-};// class ProduceConsumeBody
+    void operator()( const int tid ) const {
+        my_filters[tid]->operator()(tid);
+    }
+}; // class ProduceConsumeBody
 
-// send a bunch of non-null "tokens" to consumer, then a NULL
-void FilterBase::Produce(const int) {
-    nextBuffer[0] = 0;// just in case we provide no tokens
+// send a bunch of non-null "tokens" to consumer, then a nullptr
+void FilterBase::Produce( const int ) {
+    nextBuffer[0] = 0; // just in case we provide no tokens
     sBarrier.wait();
-    while (totTokens) {
-        while (!myTokens) { my_sem.P(); }
+    while(totTokens) {
+        while(!myTokens) {
+            my_sem.P();
+        }
         // we have a slot available
-        --myTokens;// moving this down reduces spurious wakeups
+        --myTokens; // moving this down reduces spurious wakeups
         --totTokens;
         if (totTokens) {
             nextBuffer[curToken & (MAX_TOKENS - 1)] = curToken * 3 + 1;
@@ -203,16 +215,20 @@ void FilterBase::Produce(const int) {
 
         utils::Sleep(myWait);
         unsigned temp = ++otherTokens;
-        if (temp == 1) { next_sem.V(); }
+        if (temp == 1) {
+            next_sem.V();
+        }
     }
-    next_sem.V();// final wakeup
+    next_sem.V(); // final wakeup
 }
 
-void FilterBase::Consume(const int) {
+void FilterBase::Consume( const int ) {
     unsigned myToken;
     sBarrier.wait();
     do {
-        while (!myTokens) { my_sem.P(); }
+        while( !myTokens ) {
+            my_sem.P();
+        }
         // we have a slot available
         --myTokens;
         myToken = myBuffer[curToken & (MAX_TOKENS - 1)];
@@ -221,9 +237,11 @@ void FilterBase::Consume(const int) {
             ++curToken;
             utils::Sleep(myWait);
             unsigned temp = ++otherTokens;
-            if (temp == 1) { next_sem.V(); }
+            if (temp == 1) {
+                next_sem.V();
+            }
         }
-    } while (myToken);
+    } while(myToken);
     // end of processing
     REQUIRE_MESSAGE(curToken + 1 == totTokens, "Didn't receive enough tokens");
 }
@@ -232,21 +250,19 @@ void FilterBase::Consume(const int) {
 // nTokens are total number of tokens through the pipe
 // pWait is the wait time for the producer
 // cWait is the wait time for the consumer
-void test_producer_consumer(unsigned totTokens, unsigned nTokens, unsigned pWait, unsigned cWait) {
+void test_producer_consumer( unsigned totTokens, unsigned nTokens, unsigned pWait, unsigned cWait ) {
     semaphore p_sem;
     semaphore c_sem;
     std::atomic<unsigned> p_tokens;
     std::atomic<unsigned> c_tokens(0);
 
     unsigned c_buffer[MAX_TOKENS];
-    FilterBase* my_filters[2];// one producer, one concumer
+    FilterBase* my_filters[2]; // one producer, one concumer
 
     REQUIRE_MESSAGE(nTokens <= MAX_TOKENS, "Not enough slots for tokens");
 
-    my_filters[0] = new FilterBase(imaProducer, totTokens, p_tokens, c_tokens, pWait, c_sem, p_sem, nullptr,
-                                   &(c_buffer[0]));
-    my_filters[1] = new FilterBase(imaConsumer, totTokens, c_tokens, p_tokens, cWait, p_sem, c_sem, c_buffer,
-                                   nullptr);
+    my_filters[0] = new FilterBase(imaProducer, totTokens, p_tokens, c_tokens, pWait, c_sem, p_sem, nullptr, &(c_buffer[0]));
+    my_filters[1] = new FilterBase(imaConsumer, totTokens, c_tokens, p_tokens, cWait, p_sem, c_sem, c_buffer, nullptr);
 
     p_tokens = nTokens;
     ProduceConsumeBody body(my_filters);
@@ -257,7 +273,9 @@ void test_producer_consumer(unsigned totTokens, unsigned nTokens, unsigned pWait
 }
 
 //! \brief \ref error_guessing
-TEST_CASE("test binary semaphore") { test_binary_semaphore(utils::MaxThread); }
+TEST_CASE("test binary semaphore") {
+    test_binary_semaphore(utils::MaxThread);
+}
 
 //! \brief \ref error_guessing
 TEST_CASE("test semaphore") {
diff --git a/external/tbb/test/tbb/test_sequencer_node.cpp b/external/tbb/test/tbb/test_sequencer_node.cpp
index f42ac8eb..1e6494d6 100644
--- a/external/tbb/test/tbb/test_sequencer_node.cpp
+++ b/external/tbb/test/tbb/test_sequencer_node.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -19,83 +19,89 @@
 #include "tbb/flow_graph.h"
 #include "tbb/global_control.h"
 
-#include "common/concepts_common.h"
 #include "common/test.h"
-#include "common/test_follows_and_precedes_api.h"
 #include "common/utils.h"
 #include "common/utils_assert.h"
+#include "common/test_follows_and_precedes_api.h"
+#include "common/concepts_common.h"
 
-#include <atomic>
 #include <cstdio>
+#include <atomic>
+
+#include "test_buffering_try_put_and_wait.h"
 
 //! \file test_sequencer_node.cpp
 //! \brief Test for [flow_graph.sequencer_node] specification
 
+
 #define N 1000
 #define C 10
 
-template <typename T>
+template< typename T >
 struct seq_inspector {
     size_t operator()(const T &v) const { return size_t(v); }
 };
 
-template <typename T>
-bool wait_try_get(tbb::flow::graph &g, tbb::flow::sequencer_node<T> &q, T &value) {
+template< typename T >
+bool wait_try_get( tbb::flow::graph &g, tbb::flow::sequencer_node<T> &q, T &value ) {
     g.wait_for_all();
     return q.try_get(value);
 }
 
-template <typename T>
-void spin_try_get(tbb::flow::queue_node<T> &q, T &value) {
-    while (q.try_get(value) != true)
-        ;
+template< typename T >
+void spin_try_get( tbb::flow::queue_node<T> &q, T &value ) {
+    while ( q.try_get(value) != true ) ;
 }
 
-template <typename T>
+template< typename T >
 struct parallel_puts : utils::NoAssign {
 
     tbb::flow::sequencer_node<T> &my_q;
     int my_num_threads;
 
-    parallel_puts(tbb::flow::sequencer_node<T> &q, int num_threads) : my_q(q), my_num_threads(num_threads) {}
+    parallel_puts( tbb::flow::sequencer_node<T> &q, int num_threads ) : my_q(q), my_num_threads(num_threads) {}
 
     void operator()(int tid) const {
-        for (int j = tid; j < N; j += my_num_threads) {
-            bool msg = my_q.try_put(T(j));
-            CHECK_MESSAGE(msg == true, "");
+        for (int j = tid; j < N; j+=my_num_threads) {
+            bool msg = my_q.try_put( T(j) );
+            CHECK_MESSAGE( msg == true, "" );
         }
     }
+
 };
 
-template <typename T>
+template< typename T >
 struct touches {
 
     bool **my_touches;
     T *my_last_touch;
     int my_num_threads;
 
-    touches(int num_threads) : my_num_threads(num_threads) {
+    touches( int num_threads ) : my_num_threads(num_threads) {
         my_last_touch = new T[my_num_threads];
-        my_touches = new bool *[my_num_threads];
-        for (int p = 0; p < my_num_threads; ++p) {
+        my_touches = new bool* [my_num_threads];
+        for ( int p = 0; p < my_num_threads; ++p) {
             my_last_touch[p] = T(-1);
             my_touches[p] = new bool[N];
-            for (int n = 0; n < N; ++n) my_touches[p][n] = false;
+            for ( int n = 0; n < N; ++n)
+                my_touches[p][n] = false;
         }
     }
 
     ~touches() {
-        for (int p = 0; p < my_num_threads; ++p) { delete[] my_touches[p]; }
-        delete[] my_touches;
-        delete[] my_last_touch;
+        for ( int p = 0; p < my_num_threads; ++p) {
+            delete [] my_touches[p];
+        }
+        delete [] my_touches;
+        delete [] my_last_touch;
     }
 
-    bool check(int tid, T v) {
-        if (my_touches[tid][v] != false) {
+    bool check( int tid, T v ) {
+        if ( my_touches[tid][v] != false ) {
             printf("Error: value seen twice by local thread\n");
             return false;
         }
-        if (v <= my_last_touch[tid]) {
+        if ( v <= my_last_touch[tid] ) {
             printf("Error: value seen in wrong order by local thread\n");
             return false;
         }
@@ -106,74 +112,77 @@ struct touches {
 
     bool validate_touches() {
         bool *all_touches = new bool[N];
-        for (int n = 0; n < N; ++n) all_touches[n] = false;
+        for ( int n = 0; n < N; ++n)
+            all_touches[n] = false;
 
-        for (int p = 0; p < my_num_threads; ++p) {
-            for (int n = 0; n < N; ++n) {
-                if (my_touches[p][n] == true) {
-                    CHECK_MESSAGE((all_touches[n] == false), "value see by more than one thread\n");
+        for ( int p = 0; p < my_num_threads; ++p) {
+            for ( int n = 0; n < N; ++n) {
+                if ( my_touches[p][n] == true ) {
+                    CHECK_MESSAGE( ( all_touches[n] == false), "value see by more than one thread\n" );
                     all_touches[n] = true;
                 }
             }
         }
-        for (int n = 0; n < N; ++n) {
-            if (!all_touches[n]) printf("No touch at %d, my_num_threads = %d\n", n, my_num_threads);
+        for ( int n = 0; n < N; ++n) {
+            if ( !all_touches[n] )
+                printf("No touch at %d, my_num_threads = %d\n", n, my_num_threads);
             //CHECK_MESSAGE( ( all_touches[n] == true), "value not seen by any thread\n" );
         }
-        delete[] all_touches;
+        delete [] all_touches;
         return true;
     }
+
 };
 
-template <typename T>
+template< typename T >
 struct parallel_gets : utils::NoAssign {
 
     tbb::flow::sequencer_node<T> &my_q;
     int my_num_threads;
     touches<T> &my_touches;
 
-    parallel_gets(tbb::flow::sequencer_node<T> &q, int num_threads, touches<T> &t)
-        : my_q(q), my_num_threads(num_threads), my_touches(t) {}
+    parallel_gets( tbb::flow::sequencer_node<T> &q, int num_threads, touches<T> &t ) : my_q(q), my_num_threads(num_threads), my_touches(t) {}
 
     void operator()(int tid) const {
-        for (int j = tid; j < N; j += my_num_threads) {
+        for (int j = tid; j < N; j+=my_num_threads) {
             T v;
-            spin_try_get(my_q, v);
-            my_touches.check(tid, v);
+            spin_try_get( my_q, v );
+            my_touches.check( tid, v );
         }
     }
+
 };
 
-template <typename T>
+template< typename T >
 struct parallel_put_get : utils::NoAssign {
 
     tbb::flow::sequencer_node<T> &my_s1;
     tbb::flow::sequencer_node<T> &my_s2;
     int my_num_threads;
-    std::atomic<int> &my_counter;
+    std::atomic< int > &my_counter;
     touches<T> &my_touches;
 
-    parallel_put_get(tbb::flow::sequencer_node<T> &s1, tbb::flow::sequencer_node<T> &s2, int num_threads,
-                     std::atomic<int> &counter, touches<T> &t)
-        : my_s1(s1), my_s2(s2), my_num_threads(num_threads), my_counter(counter), my_touches(t) {}
+    parallel_put_get( tbb::flow::sequencer_node<T> &s1, tbb::flow::sequencer_node<T> &s2, int num_threads,
+                      std::atomic<int> &counter, touches<T> &t ) : my_s1(s1), my_s2(s2), my_num_threads(num_threads), my_counter(counter), my_touches(t) {}
 
     void operator()(int tid) const {
         int i_start = 0;
 
-        while ((i_start = my_counter.fetch_add(C)) < N) {
-            int i_end = (N < i_start + C) ? N : i_start + C;
+        while ( (i_start = my_counter.fetch_add(C)) < N ) {
+            int i_end = ( N < i_start + C ) ? N : i_start + C;
             for (int i = i_start; i < i_end; ++i) {
-                bool msg = my_s1.try_put(T(i));
-                CHECK_MESSAGE(msg == true, "");
+                bool msg = my_s1.try_put( T(i) );
+                CHECK_MESSAGE( msg == true, "" );
             }
 
             for (int i = i_start; i < i_end; ++i) {
                 T v;
-                spin_try_get(my_s2, v);
-                my_touches.check(tid, v);
+                spin_try_get( my_s2, v );
+                my_touches.check( tid, v );
             }
         }
     }
+
 };
 
 //
@@ -183,62 +192,63 @@ struct parallel_put_get : utils::NoAssign {
 // chained sequencers, multiple parallel senders, multiple receivers, properly sequenced (relative to receiver) at output
 //
 
-template <typename T>
+template< typename T >
 int test_parallel(int num_threads) {
     tbb::flow::graph g;
 
     tbb::flow::sequencer_node<T> s(g, seq_inspector<T>());
-    utils::NativeParallelFor(num_threads, parallel_puts<T>(s, num_threads));
+    utils::NativeParallelFor( num_threads, parallel_puts<T>(s, num_threads) );
     {
-        touches<T> t(num_threads);
-        utils::NativeParallelFor(num_threads, parallel_gets<T>(s, num_threads, t));
+        touches<T> t( num_threads );
+        utils::NativeParallelFor( num_threads, parallel_gets<T>(s, num_threads, t) );
         g.wait_for_all();
-        CHECK_MESSAGE(t.validate_touches(), "");
+        CHECK_MESSAGE( t.validate_touches(), "" );
     }
     T bogus_value(-1);
     T j = bogus_value;
-    CHECK_MESSAGE(s.try_get(j) == false, "");
-    CHECK_MESSAGE(j == bogus_value, "");
+    CHECK_MESSAGE( s.try_get( j ) == false, "" );
+    CHECK_MESSAGE( j == bogus_value, "" );
     g.wait_for_all();
 
     tbb::flow::sequencer_node<T> s1(g, seq_inspector<T>());
     tbb::flow::sequencer_node<T> s2(g, seq_inspector<T>());
     tbb::flow::sequencer_node<T> s3(g, seq_inspector<T>());
-    tbb::flow::make_edge(s1, s2);
-    tbb::flow::make_edge(s2, s3);
+    tbb::flow::make_edge( s1, s2 );
+    tbb::flow::make_edge( s2, s3 );
 
     {
-        touches<T> t(num_threads);
+        touches<T> t( num_threads );
         std::atomic<int> counter;
         counter = 0;
-        utils::NativeParallelFor(num_threads, parallel_put_get<T>(s1, s3, num_threads, counter, t));
+        utils::NativeParallelFor( num_threads, parallel_put_get<T>(s1, s3, num_threads, counter, t) );
         g.wait_for_all();
         t.validate_touches();
     }
     g.wait_for_all();
-    CHECK_MESSAGE(s1.try_get(j) == false, "");
+    CHECK_MESSAGE( s1.try_get( j ) == false, "" );
     g.wait_for_all();
-    CHECK_MESSAGE(s2.try_get(j) == false, "");
+    CHECK_MESSAGE( s2.try_get( j ) == false, "" );
     g.wait_for_all();
-    CHECK_MESSAGE(s3.try_get(j) == false, "");
-    CHECK_MESSAGE(j == bogus_value, "");
+    CHECK_MESSAGE( s3.try_get( j ) == false, "" );
+    CHECK_MESSAGE( j == bogus_value, "" );
 
     // test copy constructor
     tbb::flow::sequencer_node<T> s_copy(s);
-    utils::NativeParallelFor(num_threads, parallel_puts<T>(s_copy, num_threads));
+    utils::NativeParallelFor( num_threads, parallel_puts<T>(s_copy, num_threads) );
     for (int i = 0; i < N; ++i) {
         j = bogus_value;
-        spin_try_get(s_copy, j);
-        CHECK_MESSAGE(i == j, "");
+        spin_try_get( s_copy, j );
+        CHECK_MESSAGE( i == j, "" );
     }
     j = bogus_value;
     g.wait_for_all();
-    CHECK_MESSAGE(s_copy.try_get(j) == false, "");
-    CHECK_MESSAGE(j == bogus_value, "");
+    CHECK_MESSAGE( s_copy.try_get( j ) == false, "" );
+    CHECK_MESSAGE( j == bogus_value, "" );
 
     return 0;
 }
 
+
 //
 // Tests
 //
@@ -249,7 +259,7 @@ int test_parallel(int num_threads) {
 // Chained sequencers (3), in-order and reverse-order tests, properly sequenced at output
 //
 
-template <typename T>
+template< typename T >
 int test_serial() {
     tbb::flow::graph g;
     T bogus_value(-1);
@@ -262,50 +272,51 @@ int test_serial() {
     // Rejects attempts to add / remove predecessor
     // Rejects request from empty Q
     //
-    CHECK_MESSAGE(register_predecessor(s, s2) == false, "");
-    CHECK_MESSAGE(remove_predecessor(s, s2) == false, "");
-    CHECK_MESSAGE(s.try_get(j) == false, "");
-    CHECK_MESSAGE(j == bogus_value, "");
+    CHECK_MESSAGE( register_predecessor( s, s2 ) == false, "" );
+    CHECK_MESSAGE( remove_predecessor( s, s2 ) == false, "" );
+    CHECK_MESSAGE( s.try_get( j ) == false, "" );
+    CHECK_MESSAGE( j == bogus_value, "" );
 
     //
     // In-order simple puts and gets
     //
 
     for (int i = 0; i < N; ++i) {
-        bool msg = s.try_put(T(i));
-        CHECK_MESSAGE(msg == true, "");
-        CHECK_MESSAGE(!s.try_put(T(i)), "");// second attempt to put should reject
+        bool msg = s.try_put( T(i) );
+        CHECK_MESSAGE( msg == true, "" );
+        CHECK_MESSAGE(!s.try_put( T(i) ), "");  // second attempt to put should reject
     }
 
+
     for (int i = 0; i < N; ++i) {
         j = bogus_value;
-        CHECK_MESSAGE(wait_try_get(g, s, j) == true, "");
-        CHECK_MESSAGE(i == j, "");
-        CHECK_MESSAGE(!s.try_put(T(i)), "");// after retrieving value, subsequent put should fail
+        CHECK_MESSAGE(wait_try_get( g, s, j ) == true, "");
+        CHECK_MESSAGE( i == j, "" );
+        CHECK_MESSAGE(!s.try_put( T(i) ),"" );  // after retrieving value, subsequent put should fail
     }
     j = bogus_value;
     g.wait_for_all();
-    CHECK_MESSAGE(s.try_get(j) == false, "");
-    CHECK_MESSAGE(j == bogus_value, "");
+    CHECK_MESSAGE( s.try_get( j ) == false, "" );
+    CHECK_MESSAGE( j == bogus_value, "" );
 
     //
     // Reverse-order simple puts and gets
     //
 
-    for (int i = N - 1; i >= 0; --i) {
-        bool msg = s2.try_put(T(i));
-        CHECK_MESSAGE(msg == true, "");
+    for (int i = N-1; i >= 0; --i) {
+        bool msg = s2.try_put( T(i) );
+        CHECK_MESSAGE( msg == true, "" );
     }
 
     for (int i = 0; i < N; ++i) {
         j = bogus_value;
-        CHECK_MESSAGE(wait_try_get(g, s2, j) == true, "");
-        CHECK_MESSAGE(i == j, "");
+        CHECK_MESSAGE(wait_try_get( g, s2, j ) == true, "");
+        CHECK_MESSAGE( i == j, "" );
     }
     j = bogus_value;
     g.wait_for_all();
-    CHECK_MESSAGE(s2.try_get(j) == false, "");
-    CHECK_MESSAGE(j == bogus_value, "");
+    CHECK_MESSAGE( s2.try_get( j ) == false, "" );
+    CHECK_MESSAGE( j == bogus_value, "" );
 
     //
     // Chained in-order simple puts and gets
@@ -314,34 +325,34 @@ int test_serial() {
     tbb::flow::sequencer_node<T> s3(g, seq_inspector<T>());
     tbb::flow::sequencer_node<T> s4(g, seq_inspector<T>());
     tbb::flow::sequencer_node<T> s5(g, seq_inspector<T>());
-    tbb::flow::make_edge(s3, s4);
-    tbb::flow::make_edge(s4, s5);
+    tbb::flow::make_edge( s3, s4 );
+    tbb::flow::make_edge( s4, s5 );
 
     for (int i = 0; i < N; ++i) {
-        bool msg = s3.try_put(T(i));
-        CHECK_MESSAGE(msg == true, "");
+        bool msg = s3.try_put( T(i) );
+        CHECK_MESSAGE( msg == true, "" );
     }
 
     for (int i = 0; i < N; ++i) {
         j = bogus_value;
-        CHECK_MESSAGE(wait_try_get(g, s5, j) == true, "");
-        CHECK_MESSAGE(i == j, "");
+        CHECK_MESSAGE(wait_try_get( g, s5, j ) == true, "");
+        CHECK_MESSAGE( i == j, "" );
     }
     j = bogus_value;
-    CHECK_MESSAGE(wait_try_get(g, s3, j) == false, "");
-    CHECK_MESSAGE(wait_try_get(g, s4, j) == false, "");
-    CHECK_MESSAGE(wait_try_get(g, s5, j) == false, "");
-    CHECK_MESSAGE(j == bogus_value, "");
+    CHECK_MESSAGE( wait_try_get( g, s3, j ) == false, "" );
+    CHECK_MESSAGE( wait_try_get( g, s4, j ) == false, "" );
+    CHECK_MESSAGE( wait_try_get( g, s5, j ) == false, "" );
+    CHECK_MESSAGE( j == bogus_value, "" );
 
     g.wait_for_all();
-    tbb::flow::remove_edge(s3, s4);
-    CHECK_MESSAGE(s3.try_put(N) == true, "");
-    CHECK_MESSAGE(wait_try_get(g, s4, j) == false, "");
-    CHECK_MESSAGE(j == bogus_value, "");
-    CHECK_MESSAGE(wait_try_get(g, s5, j) == false, "");
-    CHECK_MESSAGE(j == bogus_value, "");
-    CHECK_MESSAGE(wait_try_get(g, s3, j) == true, "");
-    CHECK_MESSAGE(j == N, "");
+    tbb::flow::remove_edge( s3, s4 );
+    CHECK_MESSAGE( s3.try_put( N ) == true, "" );
+    CHECK_MESSAGE( wait_try_get( g, s4, j ) == false, "" );
+    CHECK_MESSAGE( j == bogus_value, "" );
+    CHECK_MESSAGE( wait_try_get( g, s5, j ) == false, "" );
+    CHECK_MESSAGE( j == bogus_value, "" );
+    CHECK_MESSAGE( wait_try_get( g, s3, j ) == true, "" );
+    CHECK_MESSAGE( j == N, "" );
 
     //
     // Chained reverse-order simple puts and gets
@@ -350,34 +361,34 @@ int test_serial() {
     tbb::flow::sequencer_node<T> s6(g, seq_inspector<T>());
     tbb::flow::sequencer_node<T> s7(g, seq_inspector<T>());
     tbb::flow::sequencer_node<T> s8(g, seq_inspector<T>());
-    tbb::flow::make_edge(s6, s7);
-    tbb::flow::make_edge(s7, s8);
+    tbb::flow::make_edge( s6, s7 );
+    tbb::flow::make_edge( s7, s8 );
 
-    for (int i = N - 1; i >= 0; --i) {
-        bool msg = s6.try_put(T(i));
-        CHECK_MESSAGE(msg == true, "");
+    for (int i = N-1; i >= 0; --i) {
+        bool msg = s6.try_put( T(i) );
+        CHECK_MESSAGE( msg == true, "" );
     }
 
     for (int i = 0; i < N; ++i) {
         j = bogus_value;
-        CHECK_MESSAGE(wait_try_get(g, s8, j) == true, "");
-        CHECK_MESSAGE(i == j, "");
+        CHECK_MESSAGE( wait_try_get( g, s8, j ) == true, "" );
+        CHECK_MESSAGE( i == j, "" );
     }
     j = bogus_value;
-    CHECK_MESSAGE(wait_try_get(g, s6, j) == false, "");
-    CHECK_MESSAGE(wait_try_get(g, s7, j) == false, "");
-    CHECK_MESSAGE(wait_try_get(g, s8, j) == false, "");
-    CHECK_MESSAGE(j == bogus_value, "");
+    CHECK_MESSAGE( wait_try_get( g, s6, j ) == false, "" );
+    CHECK_MESSAGE( wait_try_get( g, s7, j ) == false, "" );
+    CHECK_MESSAGE( wait_try_get( g, s8, j ) == false, "" );
+    CHECK_MESSAGE( j == bogus_value, "" );
 
     g.wait_for_all();
-    tbb::flow::remove_edge(s6, s7);
-    CHECK_MESSAGE(s6.try_put(N) == true, "");
-    CHECK_MESSAGE(wait_try_get(g, s7, j) == false, "");
-    CHECK_MESSAGE(j == bogus_value, "");
-    CHECK_MESSAGE(wait_try_get(g, s8, j) == false, "");
-    CHECK_MESSAGE(j == bogus_value, "");
-    CHECK_MESSAGE(wait_try_get(g, s6, j) == true, "");
-    CHECK_MESSAGE(j == N, "");
+    tbb::flow::remove_edge( s6, s7 );
+    CHECK_MESSAGE( s6.try_put( N ) == true, "" );
+    CHECK_MESSAGE( wait_try_get( g, s7, j ) == false, "" );
+    CHECK_MESSAGE( j == bogus_value, "" );
+    CHECK_MESSAGE( wait_try_get( g, s8, j ) == false, "" );
+    CHECK_MESSAGE( j == bogus_value, "" );
+    CHECK_MESSAGE( wait_try_get( g, s6, j ) == true, "" );
+    CHECK_MESSAGE( j == N, "" );
 
     return 0;
 }
@@ -386,14 +397,16 @@ int test_serial() {
 #include <array>
 #include <vector>
 void test_follows_and_precedes_api() {
-    std::array<int, 3> messages_for_follows = {{0, 1, 2}};
+    std::array<int, 3> messages_for_follows = { {0, 1, 2} };
     std::vector<int> messages_for_precedes = {0, 1, 2};
 
-    follows_and_precedes_testing::test_follows<int, tbb::flow::sequencer_node<int>>(
-            messages_for_follows, [](const int &i) -> std::size_t { return i; });
+    follows_and_precedes_testing::test_follows
+        <int, tbb::flow::sequencer_node<int>>
+        (messages_for_follows, [](const int& i) -> std::size_t { return i; });
 
-    follows_and_precedes_testing::test_precedes<int, tbb::flow::sequencer_node<int>>(
-            messages_for_precedes, [](const int &i) -> std::size_t { return i; });
+    follows_and_precedes_testing::test_precedes
+        <int, tbb::flow::sequencer_node<int>>
+        (messages_for_precedes, [](const int& i) -> std::size_t { return i; });
 }
 #endif
 
@@ -416,38 +429,207 @@ void test_deduction_guides_common(Body body) {
     static_assert(std::is_same_v<decltype(s3), sequencer_node<int>>);
 }
 
-std::size_t sequencer_body_f(const int &) { return 1; }
+std::size_t sequencer_body_f(const int&) { return 1; }
 
 void test_deduction_guides() {
-    test_deduction_guides_common([](const int &) -> std::size_t { return 1; });
-    test_deduction_guides_common([](const int &) mutable -> std::size_t { return 1; });
+    test_deduction_guides_common([](const int&)->std::size_t { return 1; });
+    test_deduction_guides_common([](const int&) mutable ->std::size_t { return 1; });
     test_deduction_guides_common(sequencer_body_f);
 }
 #endif
 
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+void test_seq_node_try_put_and_wait() {
+    using namespace test_try_put_and_wait;
+
+    std::vector<int> start_work_items;
+    std::vector<int> new_work_items;
+    int wait_message = 10;
+
+    for (int i = 0; i < wait_message; ++i) {
+        start_work_items.emplace_back(i);
+        new_work_items.emplace_back(i + 1 + wait_message);
+    }
+
+    auto simple_sequencer = [](int item) { return item; };
+
+    // Test push
+    // test_buffer_push tests the graph
+    // buffer1 -> function -> buffer2 -> writer
+    //     function is a queueing serial function_node that submits new_work_items once wait_message arrives
+    //     writer is an unlimited function_node that writes an item into the processed_items vector
+    // Test steps
+    //     1. push start_work_items into the buffer1
+    //     2. buffer1.try_put_and_wait(wait_message);
+    //     3. g.wait_for_all()
+    // test_buffer_push returns the index from which the items processed during wait_for_all() starts
+    {
+        std::vector<int> processed_items;
+
+        std::size_t after_start = test_buffer_push<tbb::flow::sequencer_node<int>>(start_work_items, wait_message,
+                                                                                   new_work_items, processed_items,
+                                                                                   simple_sequencer);
+
+        // Expected effect:
+        // During buffer1.try_put_and_wait()
+        //     1. start_work_items would be pushed to buffer1
+        //     2. wait_message would be pushed to buffer1
+        //     3. forward_task on buffer1 would transfer all of the items to the function_node in sequencer order (FIFO)
+        //     4. the first item would occupy concurrency of function, other items would be pushed to the queue
+        //     5. function would process start_work_items and push them to the buffer2
+        //     6. wait_message would be processed last and add new_work_items to buffer1
+        //     7. forward_task on buffer2 would transfer start_work_items in sequencer (FIFO) order and the wait_message to the writer
+        //     8.  try_put_and_wait exits since wait_message is completed
+        // During g.wait_for_all()
+        //     10. forward_task for new_work_items in buffer1 would be spawned and put items in function in FIFO order
+        //     11. function_node would process and push forward items from the queue in FIFO order
+        // Expected items processing - { start_work_items FIFO, wait_message, new_work_items FIFO }
+
+        std::size_t check_index = 0;
+        CHECK_MESSAGE(after_start == start_work_items.size() + 1,
+                      "try_put_and_wait should process start_work_items and the wait_message");
+        for (auto item : start_work_items) {
+            CHECK_MESSAGE(processed_items[check_index++] == item,
+                          "try_put_and_wait should process start_work_items FIFO");
+        }
+
+        CHECK_MESSAGE(processed_items[check_index++] == wait_message,
+                      "try_put_and_wait should process wait_message after start_work_items");
+
+        for (auto item : new_work_items) {
+            CHECK_MESSAGE(processed_items[check_index++] == item,
+                          "wait_for_all should process new_work_items FIFO");
+        }
+        CHECK(check_index == processed_items.size());
+    } // Test push
+
+    // Test pull
+    // test_buffer_pull tests the graph
+    // buffer -> function
+    //     function is a rejecting serial function_node that submits new_work_items once wait_message arrives
+    //     and writes the processed item into the processed_items
+    // Test steps
+    //     1. push the occupier message to the function
+    //     2. push start_work_items into the buffer
+    //     3. buffer.try_put_and_wait(wait_message)
+    //     4. g.wait_for_all()
+    // test_buffer_pull returns the index from which the items processed during wait_for_all() starts
+
+    {
+        std::vector<int> processed_items;
+        int occupier = 42;
+
+        std::size_t after_start = test_buffer_pull<tbb::flow::sequencer_node<int>>(start_work_items, wait_message, occupier,
+                                                                                   new_work_items, processed_items,
+                                                                                   simple_sequencer);
+
+        // Expected effect
+        // 0. task for occupier processing would be spawned by the function
+        // During buffer.try_put_and_wait()
+        //     1. start_work_items would be pushed to the buffer
+        //     2. wait_message would be pushed to the buffer
+        //     3. forward_task would try to push items to the function, but would fail
+        //        and set the edge to the pull state
+        //     4. occupier would be processed
+        //     5. items would be taken from the buffer by function in FIFO order
+        //     6. wait_message would be taken last and push new_work_items to the buffer
+        // During wait_for_all()
+        //     7. new_work_items would be taken from the buffer in FIFO order
+        // Expected items processing { occupier, start_work_items FIFO, wait_message, new_work_items FIFO }
+
+        std::size_t check_index = 0;
+
+        CHECK_MESSAGE(after_start == start_work_items.size() + 2,
+                      "start_work_items, occupier and wait_message should be processed by try_put_and_wait");
+        CHECK_MESSAGE(processed_items[check_index++] == occupier, "Unexpected items processing by try_put_and_wait");
+        for (auto item : start_work_items) {
+            CHECK_MESSAGE(processed_items[check_index++] == item,
+                          "try_put_and_wait should process start_work_items FIFO");
+        }
+        CHECK_MESSAGE(processed_items[check_index++] == wait_message, "Unexpected items processing by try_put_and_wait");
+
+        for (auto item : new_work_items) {
+            CHECK_MESSAGE(processed_items[check_index++] == item,
+                          "try_put_and_wait should process new_work_items FIFO");
+        }
+        CHECK(check_index == processed_items.size());
+    }
+
+    // Test reserve
+    {
+        int thresholds[] = { 1, 2 };
+
+        for (int threshold : thresholds) {
+            std::vector<int> processed_items;
+
+            // test_buffer_reserve tests the following graph
+            // buffer -> limiter -> function
+            //  function is a rejecting serial function_node that puts an item to the decrementer port
+            //  of the limiter inside of the body
+
+            std::size_t after_start = test_buffer_reserve<tbb::flow::sequencer_node<int>>(threshold,
+                start_work_items, wait_message, new_work_items, processed_items, simple_sequencer);
+
+            // Expected effect:
+            // 1. start_work_items would be pushed to the buffer
+            // 2. wait_message_would be pushed to the buffer
+            // 3. forward task of the buffer would push the first message to the limiter node.
+            //    Since the limiter threshold is not reached, it would be directly passed to the function
+            // 4. function would spawn the task for the first message processing
+            // 5. the first would be processed
+            // 6. decrementer.try_put() would be called and the limiter node would
+            //    process all of the items from the buffer using the try_reserve/try_consume/try_release semantics
+            // 7. When the wait_message would be taken from the buffer, the try_put_and_wait would exit
+
+            std::size_t check_index = 0;
+
+            CHECK_MESSAGE(after_start == start_work_items.size() + 1,
+                      "start_work_items, occupier and wait_message should be processed by try_put_and_wait");
+            for (auto item : start_work_items) {
+                CHECK_MESSAGE(processed_items[check_index++] == item,
+                            "try_put_and_wait should process start_work_items FIFO");
+            }
+            CHECK_MESSAGE(processed_items[check_index++] == wait_message, "Unexpected items processing by try_put_and_wait");
+
+            for (auto item : new_work_items) {
+                CHECK_MESSAGE(processed_items[check_index++] == item,
+                            "try_put_and_wait should process new_work_items FIFO");
+            }
+            CHECK(check_index == processed_items.size());
+        }
+    }
+}
+#endif // __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+
 //! Test sequencer with various request orders and parallelism levels
 //! \brief \ref requirement \ref error_guessing
-TEST_CASE("Serial and parallel test") {
+TEST_CASE("Serial and parallel test"){
     for (int p = 2; p <= 4; ++p) {
         tbb::global_control thread_limit(tbb::global_control::max_allowed_parallelism, p);
         tbb::task_arena arena(p);
-        arena.execute([&]() {
-            test_serial<int>();
-            test_parallel<int>(p);
-        });
-    }
+        arena.execute(
+            [&]() {
+                test_serial<int>();
+                test_parallel<int>(p);
+            }
+        );
+	}
 }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 //! Test decution guides
 //! \brief \ref requirement
-TEST_CASE("Test follows and precedes API") { test_follows_and_precedes_api(); }
+TEST_CASE("Test follows and precedes API"){
+    test_follows_and_precedes_api();
+}
 #endif
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 //! Test decution guides
 //! \brief \ref requirement
-TEST_CASE("Test deduction guides") { test_deduction_guides(); }
+TEST_CASE("Test deduction guides"){
+    test_deduction_guides();
+}
 #endif
 
 #if __TBB_CPP20_CONCEPTS_PRESENT
@@ -458,13 +640,12 @@ TEST_CASE("constraints for sequencer_node object") {
     static_assert(utils::well_formed_instantiation<tbb::flow::sequencer_node, Object>);
     static_assert(utils::well_formed_instantiation<tbb::flow::sequencer_node, int>);
     static_assert(!utils::well_formed_instantiation<tbb::flow::sequencer_node, test_concepts::NonCopyable>);
-    static_assert(
-            !utils::well_formed_instantiation<tbb::flow::sequencer_node, test_concepts::NonCopyAssignable>);
+    static_assert(!utils::well_formed_instantiation<tbb::flow::sequencer_node, test_concepts::NonCopyAssignable>);
 }
 
 template <typename T, typename Sequencer>
-concept can_call_sequencer_node_ctor
-        = requires(tbb::flow::graph &graph, Sequencer seq, tbb::flow::buffer_node<int> &f) {
+concept can_call_sequencer_node_ctor = requires( tbb::flow::graph& graph, Sequencer seq,
+                                                 tbb::flow::buffer_node<int>& f ) {
     tbb::flow::sequencer_node<T>(graph, seq);
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
     tbb::flow::sequencer_node<T>(tbb::flow::follows(f), seq);
@@ -483,4 +664,11 @@ TEST_CASE("constraints for sequencer_node sequencer") {
     static_assert(!can_call_sequencer_node_ctor<type, WrongInputOperatorRoundBrackets<type>>);
     static_assert(!can_call_sequencer_node_ctor<type, WrongReturnOperatorRoundBrackets<type>>);
 }
-#endif// __TBB_CPP20_CONCEPTS_PRESENT
+#endif // __TBB_CPP20_CONCEPTS_PRESENT
+
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+//! \brief \ref error_guessing
+TEST_CASE("test sequencer_node try_put_and_wait") {
+    test_seq_node_try_put_and_wait();
+}
+#endif
diff --git a/external/tbb/test/tbb/test_split_node.cpp b/external/tbb/test/tbb/test_split_node.cpp
index 106dbabc..1e03be0d 100644
--- a/external/tbb/test/tbb/test_split_node.cpp
+++ b/external/tbb/test/tbb/test_split_node.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -18,16 +18,18 @@
 
 #include "tbb/flow_graph.h"
 
-#include "common/graph_utils.h"
 #include "common/test.h"
 #include "common/utils.h"
 #include "common/utils_assert.h"
+#include "common/graph_utils.h"
+
 
 //! \file test_split_node.cpp
 //! \brief Test for [flow_graph.split_node] specification
 
+
 #if defined(_MSC_VER) && _MSC_VER < 1600
-#pragma warning(disable : 4503)//disabling the "decorated name length exceeded" warning for VS2008 and earlier
+    #pragma warning (disable : 4503) //disabling the "decorated name length exceeded" warning for VS2008 and earlier
 #endif
 
 //
@@ -36,39 +38,39 @@
 
 const int Count = 300;
 const int MaxPorts = 10;
-const int MaxNInputs = 5;// max # of input_nodes to register for each split_node input in parallel test
+const int MaxNInputs = 5; // max # of input_nodes to register for each split_node input in parallel test
 
-std::vector<bool> flags;// for checking output
+std::vector<bool> flags;   // for checking output
 
-template <typename T>
+template<typename T>
 class name_of {
 public:
-    static const char *name() { return "Unknown"; }
+    static const char* name() { return  "Unknown"; }
 };
-template <>
+template<>
 class name_of<int> {
 public:
-    static const char *name() { return "int"; }
+    static const char* name() { return  "int"; }
 };
-template <>
+template<>
 class name_of<float> {
 public:
-    static const char *name() { return "float"; }
+    static const char* name() { return  "float"; }
 };
-template <>
+template<>
 class name_of<double> {
 public:
-    static const char *name() { return "double"; }
+    static const char* name() { return  "double"; }
 };
-template <>
+template<>
 class name_of<long> {
 public:
-    static const char *name() { return "long"; }
+    static const char* name() { return  "long"; }
 };
-template <>
+template<>
 class name_of<short> {
 public:
-    static const char *name() { return "short"; }
+    static const char* name() { return  "short"; }
 };
 
 // T must be arithmetic, and shouldn't wrap around for reasonable sizes of Count (which is now 150, and maxPorts is 10,
@@ -78,36 +80,35 @@ class name_of<short> {
 // to receive.  If there is only one input node, the series order will be maintained; if more than one,
 // this is not guaranteed.
 
-template <int N>
+template<int N>
 struct tuple_helper {
-    template <typename TupleType>
-    static void set_element(TupleType &t, int i) {
-        std::get<N - 1>(t) = (typename std::tuple_element<N - 1, TupleType>::type)(i * (N + 1));
-        tuple_helper<N - 1>::set_element(t, i);
+    template<typename TupleType>
+    static void set_element( TupleType &t, int i) {
+        std::get<N-1>(t) = (typename std::tuple_element<N-1,TupleType>::type)(i * (N+1));
+        tuple_helper<N-1>::set_element(t, i);
     }
 };
 
-template <>
+template<>
 struct tuple_helper<1> {
-    template <typename TupleType>
+    template<typename TupleType>
     static void set_element(TupleType &t, int i) {
-        std::get<0>(t) = (typename std::tuple_element<0, TupleType>::type)(i * 2);
+        std::get<0>(t) = (typename std::tuple_element<0,TupleType>::type)(i * 2);
     }
 };
 
 // if we start N input_bodys they will all have the addend N, and my_count should be initialized to 0 .. N-1.
 // the output tuples should have all the sequence, but the order will in general vary.
-template <typename TupleType>
+template<typename TupleType>
 class my_input_body {
     typedef TupleType TT;
     static const int N = std::tuple_size<TT>::value;
     int my_count;
     int addend;
-
 public:
-    my_input_body(int init_val, int addto) : my_count(init_val), addend(addto) {}
-    TT operator()(tbb::flow_control &fc) {
-        if (my_count >= Count) {
+    my_input_body(int init_val, int addto) : my_count(init_val), addend(addto) { }
+    TT operator()( tbb::flow_control &fc) {
+        if(my_count >= Count){
             fc.stop();
             return TT();
         }
@@ -120,10 +121,10 @@ class my_input_body {
 
 // allocator for split_node.
 
-template <int N, typename SType>
+template<int N, typename SType>
 class makeSplit {
 public:
-    static SType *create(tbb::flow::graph &g) {
+    static SType *create(tbb::flow::graph& g) {
         SType *temp = new SType(g);
         return temp;
     }
@@ -132,86 +133,90 @@ class makeSplit {
 
 // holder for sink_node pointers for eventual deletion
 
-static void *all_sink_nodes[MaxPorts];
+static void* all_sink_nodes[MaxPorts];
+
 
-template <int ELEM, typename SType>
+template<int ELEM, typename SType>
 class sink_node_helper {
 public:
     typedef typename SType::input_type TT;
-    typedef typename std::tuple_element<ELEM - 1, TT>::type IT;
+    typedef typename std::tuple_element<ELEM-1,TT>::type IT;
     typedef typename tbb::flow::queue_node<IT> my_sink_node_type;
     static void print_parallel_remark() {
-        sink_node_helper<ELEM - 1, SType>::print_parallel_remark();
+        sink_node_helper<ELEM-1,SType>::print_parallel_remark();
         INFO(", " << name_of<IT>::name());
     }
     static void print_serial_remark() {
-        sink_node_helper<ELEM - 1, SType>::print_serial_remark();
+        sink_node_helper<ELEM-1,SType>::print_serial_remark();
         INFO(", " << name_of<IT>::name());
     }
     static void add_sink_nodes(SType &my_split, tbb::flow::graph &g) {
         my_sink_node_type *new_node = new my_sink_node_type(g);
-        tbb::flow::make_edge(tbb::flow::output_port<ELEM - 1>(my_split), *new_node);
-        all_sink_nodes[ELEM - 1] = (void *) new_node;
-        sink_node_helper<ELEM - 1, SType>::add_sink_nodes(my_split, g);
+        tbb::flow::make_edge( tbb::flow::output_port<ELEM-1>(my_split) , *new_node);
+        all_sink_nodes[ELEM-1] = (void *)new_node;
+        sink_node_helper<ELEM-1, SType>::add_sink_nodes(my_split, g);
     }
 
     static void check_sink_values() {
-        my_sink_node_type *dp = reinterpret_cast<my_sink_node_type *>(all_sink_nodes[ELEM - 1]);
-        for (int i = 0; i < Count; ++i) {
-            IT v {};
+        my_sink_node_type *dp = reinterpret_cast<my_sink_node_type *>(all_sink_nodes[ELEM-1]);
+        for(int i = 0; i < Count; ++i) {
+            IT v{};
             CHECK_MESSAGE(dp->try_get(v), "");
-            flags[((int) v) / (ELEM + 1)] = true;
+            flags[((int)v) / (ELEM+1)] = true;
         }
-        for (int i = 0; i < Count; ++i) {
+        for(int i = 0; i < Count; ++i) {
             CHECK_MESSAGE(flags[i], "");
-            flags[i] = false;// reset for next test
+            flags[i] = false;  // reset for next test
         }
-        sink_node_helper<ELEM - 1, SType>::check_sink_values();
+        sink_node_helper<ELEM-1,SType>::check_sink_values();
     }
-    static void remove_sink_nodes(SType &my_split) {
-        my_sink_node_type *dp = reinterpret_cast<my_sink_node_type *>(all_sink_nodes[ELEM - 1]);
-        tbb::flow::remove_edge(tbb::flow::output_port<ELEM - 1>(my_split), *dp);
+    static void remove_sink_nodes(SType& my_split) {
+        my_sink_node_type *dp = reinterpret_cast<my_sink_node_type *>(all_sink_nodes[ELEM-1]);
+        tbb::flow::remove_edge( tbb::flow::output_port<ELEM-1>(my_split) , *dp);
         delete dp;
-        sink_node_helper<ELEM - 1, SType>::remove_sink_nodes(my_split);
+        sink_node_helper<ELEM-1, SType>::remove_sink_nodes(my_split);
     }
 };
 
-template <typename SType>
+template<typename SType>
 class sink_node_helper<1, SType> {
     typedef typename SType::input_type TT;
-    typedef typename std::tuple_element<0, TT>::type IT;
+    typedef typename std::tuple_element<0,TT>::type IT;
     typedef typename tbb::flow::queue_node<IT> my_sink_node_type;
-
 public:
-    static void print_parallel_remark() { INFO("Parallel test of split_node< " << name_of<IT>::name()); }
-    static void print_serial_remark() { INFO("Serial test of split_node< " << name_of<IT>::name()); }
+    static void print_parallel_remark() {
+        INFO("Parallel test of split_node< " << name_of<IT>::name());
+    }
+    static void print_serial_remark() {
+        INFO("Serial test of split_node< " << name_of<IT>::name());
+    }
     static void add_sink_nodes(SType &my_split, tbb::flow::graph &g) {
         my_sink_node_type *new_node = new my_sink_node_type(g);
-        tbb::flow::make_edge(tbb::flow::output_port<0>(my_split), *new_node);
-        all_sink_nodes[0] = (void *) new_node;
+        tbb::flow::make_edge( tbb::flow::output_port<0>(my_split) , *new_node);
+        all_sink_nodes[0] = (void *)new_node;
     }
     static void check_sink_values() {
         my_sink_node_type *dp = reinterpret_cast<my_sink_node_type *>(all_sink_nodes[0]);
-        for (int i = 0; i < Count; ++i) {
-            IT v {};
+        for(int i = 0; i < Count; ++i) {
+            IT v{};
             CHECK_MESSAGE(dp->try_get(v), "");
-            flags[((int) v) / 2] = true;
+            flags[((int)v) / 2] = true;
         }
-        for (int i = 0; i < Count; ++i) {
+        for(int i = 0; i < Count; ++i) {
             CHECK_MESSAGE(flags[i], "");
-            flags[i] = false;// reset for next test
+            flags[i] = false;  // reset for next test
         }
     }
-    static void remove_sink_nodes(SType &my_split) {
+    static void remove_sink_nodes(SType& my_split) {
         my_sink_node_type *dp = reinterpret_cast<my_sink_node_type *>(all_sink_nodes[0]);
-        tbb::flow::remove_edge(tbb::flow::output_port<0>(my_split), *dp);
+        tbb::flow::remove_edge( tbb::flow::output_port<0>(my_split) , *dp);
         delete dp;
     }
 };
 
 // parallel_test: create input_nodes that feed tuples into the split node
 //    and queue_nodes that receive the output.
-template <typename SType>
+template<typename SType>
 class parallel_test {
 public:
     typedef typename SType::input_type TType;
@@ -219,23 +224,25 @@ class parallel_test {
     static const int N = std::tuple_size<TType>::value;
 
     static void test() {
-        input_type *all_input_nodes[MaxNInputs];
-        sink_node_helper<N, SType>::print_parallel_remark();
+        input_type* all_input_nodes[MaxNInputs];
+        sink_node_helper<N,SType>::print_parallel_remark();
         INFO(" >\n");
-        for (int i = 0; i < MaxPorts; ++i) { all_sink_nodes[i] = NULL; }
+        for(int i=0; i < MaxPorts; ++i) {
+            all_sink_nodes[i] = nullptr;
+        }
         // try test for # inputs 1 .. MaxNInputs
-        for (int nInputs = 1; nInputs <= MaxNInputs; ++nInputs) {
+        for(int nInputs = 1; nInputs <= MaxNInputs; ++nInputs) {
             tbb::flow::graph g;
-            SType *my_split = makeSplit<N, SType>::create(g);
+            SType* my_split = makeSplit<N,SType>::create(g);
 
             // add sinks first so when inputs start spitting out values they are there to catch them
             sink_node_helper<N, SType>::add_sink_nodes((*my_split), g);
 
             // now create nInputs input_nodes, each spitting out i, i+nInputs, i+2*nInputs ...
             // each element of the tuple is i*(n+1), where n is the tuple element index (1-N)
-            for (int i = 0; i < nInputs; ++i) {
+            for(int i = 0; i < nInputs; ++i) {
                 // create input node
-                input_type *s = new input_type(g, my_input_body<TType>(i, nInputs));
+                input_type *s = new input_type(g, my_input_body<TType>(i, nInputs) );
                 tbb::flow::make_edge(*s, *my_split);
                 all_input_nodes[i] = s;
                 s->activate();
@@ -248,8 +255,10 @@ class parallel_test {
             sink_node_helper<N, SType>::check_sink_values();
 
             sink_node_helper<N, SType>::remove_sink_nodes(*my_split);
-            for (int i = 0; i < nInputs; ++i) { delete all_input_nodes[i]; }
-            makeSplit<N, SType>::destroy(my_split);
+            for(int i = 0; i < nInputs; ++i) {
+                delete all_input_nodes[i];
+            }
+            makeSplit<N,SType>::destroy(my_split);
         }
     }
 };
@@ -257,19 +266,19 @@ class parallel_test {
 //
 // Single predecessor, single accepting successor at each port
 
-template <typename SType>
-void test_one_serial(SType &my_split, tbb::flow::graph &g) {
+template<typename SType>
+void test_one_serial( SType &my_split, tbb::flow::graph &g) {
     typedef typename SType::input_type TType;
     static const int TUPLE_SIZE = std::tuple_size<TType>::value;
-    sink_node_helper<TUPLE_SIZE, SType>::add_sink_nodes(my_split, g);
+    sink_node_helper<TUPLE_SIZE, SType>::add_sink_nodes(my_split,g);
     typedef TType q3_input_type;
-    tbb::flow::queue_node<q3_input_type> q3(g);
+    tbb::flow::queue_node< q3_input_type >  q3(g);
 
-    tbb::flow::make_edge(q3, my_split);
+    tbb::flow::make_edge( q3, my_split );
 
     // fill the  queue with its value one-at-a-time
     flags.clear();
-    for (int i = 0; i < Count; ++i) {
+    for (int i = 0; i < Count; ++i ) {
         TType v;
         tuple_helper<TUPLE_SIZE>::set_element(v, i);
         CHECK_MESSAGE(my_split.try_put(v), "");
@@ -278,9 +287,10 @@ void test_one_serial(SType &my_split, tbb::flow::graph &g) {
 
     g.wait_for_all();
 
-    sink_node_helper<TUPLE_SIZE, SType>::check_sink_values();
+    sink_node_helper<TUPLE_SIZE,SType>::check_sink_values();
 
     sink_node_helper<TUPLE_SIZE, SType>::remove_sink_nodes(my_split);
+
 }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
@@ -290,25 +300,16 @@ void test_follows_and_precedes_api() {
 
     graph g;
 
-    function_node<msg_t, msg_t> f1(g, unlimited, [](msg_t msg) { return msg; });
+    function_node<msg_t, msg_t> f1(g, unlimited, [](msg_t msg) { return msg; } );
     auto f2(f1);
     auto f3(f1);
 
     std::atomic<int> body_calls;
     body_calls = 0;
 
-    function_node<int, int> f4(g, unlimited, [&](int val) {
-        ++body_calls;
-        return val;
-    });
-    function_node<float, float> f5(g, unlimited, [&](float val) {
-        ++body_calls;
-        return val;
-    });
-    function_node<double, double> f6(g, unlimited, [&](double val) {
-        ++body_calls;
-        return val;
-    });
+    function_node<int, int> f4(g, unlimited, [&](int val) { ++body_calls; return val; } );
+    function_node<float, float> f5(g, unlimited, [&](float val) { ++body_calls; return val; } );
+    function_node<double, double> f6(g, unlimited, [&](double val) { ++body_calls; return val; } );
 
     split_node<msg_t> following_node(follows(f1, f2, f3));
     make_edge(output_port<0>(following_node), f4);
@@ -328,45 +329,47 @@ void test_follows_and_precedes_api() {
     g.wait_for_all();
 
     // <number of try puts> * <number of splits by a input node> * <number of input nodes>
-    CHECK_MESSAGE(((body_calls == 3 * 3 * 2)), "Not exact edge quantity was made");
+    CHECK_MESSAGE( ((body_calls == 3*3*2)), "Not exact edge quantity was made");
 }
-#endif// __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+#endif // __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 
-template <typename SType>
+template<typename SType>
 class serial_test {
     typedef typename SType::input_type TType;
     static const int TUPLE_SIZE = std::tuple_size<TType>::value;
     static const int ELEMS = 3;
-
 public:
-    static void test() {
-        tbb::flow::graph g;
-        flags.reserve(Count);
-        SType *my_split = makeSplit<TUPLE_SIZE, SType>::create(g);
-        sink_node_helper<TUPLE_SIZE, SType>::print_serial_remark();
-        INFO(" >\n");
+static void test() {
+    tbb::flow::graph g;
+    flags.reserve(Count);
+    SType* my_split = makeSplit<TUPLE_SIZE,SType>::create(g);
+    sink_node_helper<TUPLE_SIZE, SType>::print_serial_remark(); INFO(" >\n");
 
-        test_output_ports_return_ref(*my_split);
+    test_output_ports_return_ref(*my_split);
 
-        test_one_serial<SType>(*my_split, g);
-        // build the vector with copy construction from the used split node.
-        std::vector<SType> split_vector(ELEMS, *my_split);
-        // destroy the tired old split_node in case we're accidentally reusing pieces of it.
-        makeSplit<TUPLE_SIZE, SType>::destroy(my_split);
+    test_one_serial<SType>(*my_split, g);
+    // build the vector with copy construction from the used split node.
+    std::vector<SType>split_vector(ELEMS, *my_split);
+    // destroy the tired old split_node in case we're accidentally reusing pieces of it.
+    makeSplit<TUPLE_SIZE,SType>::destroy(my_split);
 
-        for (int e = 0; e < ELEMS; ++e) {// exercise each of the vector elements
-            test_one_serial<SType>(split_vector[e], g);
-        }
+
+    for(int e = 0; e < ELEMS; ++e) {  // exercise each of the vector elements
+        test_one_serial<SType>(split_vector[e], g);
     }
+}
 
-};// serial_test
+}; // serial_test
 
-template <template <typename> class TestType,// serial_test or parallel_test
-          typename TupleType>                // type of the input of the split
+template<
+      template<typename> class TestType,  // serial_test or parallel_test
+      typename TupleType >                               // type of the input of the split
 struct generate_test {
     typedef tbb::flow::split_node<TupleType> split_node_type;
-    static void do_test() { TestType<split_node_type>::test(); }
-};// generate_test
+    static void do_test() {
+        TestType<split_node_type>::test();
+    }
+}; // generate_test
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 
@@ -394,38 +397,112 @@ void test_deduction_guides() {
 
 #endif
 
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+void test_try_put_and_wait() {
+    tbb::task_arena arena(1);
+
+    arena.execute([] {
+        tbb::flow::graph g;
+
+        std::vector<int> start_work_items;
+        std::vector<int> processed_items1;
+        std::vector<int> processed_items2;
+        std::vector<int> new_work_items;
+        int wait_message = 10;
+
+        for (int i = 0; i < wait_message; ++i) {
+            start_work_items.emplace_back(i);
+            new_work_items.emplace_back(i + 1 + wait_message);
+        }
+
+        using tuple_type = std::tuple<int, int>;
+        tbb::flow::split_node<tuple_type> split(g);
+
+        tbb::flow::function_node<int, int> function1(g, tbb::flow::unlimited,
+            [&](int input) noexcept {
+                if (input == wait_message) {
+                    for (int item : new_work_items) {
+                        split.try_put(tuple_type{item, item});
+                    }
+                }
+                processed_items1.emplace_back(input);
+                return 0;
+            });
+
+        tbb::flow::function_node<int, int> function2(g, tbb::flow::unlimited,
+            [&](int input) noexcept {
+                processed_items2.emplace_back(input);
+                return 0;
+            });
+
+        tbb::flow::make_edge(tbb::flow::output_port<0>(split), function1);
+        tbb::flow::make_edge(tbb::flow::output_port<1>(split), function2);
+
+        for (int i = 0; i < wait_message; ++i) {
+            split.try_put(tuple_type{i, i});
+        }
+
+        split.try_put_and_wait(tuple_type{wait_message, wait_message});
+
+        std::size_t check_index1 = 0;
+        std::size_t check_index2 = 0;
+
+        // Since split node broadcasts items to successors from last to first, start_work_items tasks and wait_message would be spawned
+        // in the following order {f2 - 1} - {f1 - 1} {f2 - 2} {f1 - 2} ... {f2 - 10}{f1 - 10}
+        // and processed in reversed order
+        // Hence {f1 - wait_message} task would be processed first and it would spawn tasks for new_work_items in the same order
+        // Since new_work_items tasks would processed first and {f2 - 10} would be still in queue
+        // it is expected that during the try_put_and_wait {f1 - 10} would be processed first, then new_work_items would be processed
+        // and only when {f2 - 10} would be taken and executed, try_put_and_wait would be exitted
+        // All of the other tasks for start_work_items would be processed during wait_for_all()
+        CHECK_MESSAGE(processed_items1[check_index1++] == wait_message, "Unexpected items processing");
+
+        for (std::size_t i = new_work_items.size(); i != 0; --i) {
+            CHECK_MESSAGE(processed_items1[check_index1++] == new_work_items[i - 1], "Unexpected items processing");
+            CHECK_MESSAGE(processed_items2[check_index2++] == new_work_items[i - 1], "Unexpected items processing");
+        }
+
+        CHECK_MESSAGE(processed_items2[check_index2++] == wait_message, "Unexpected items processing");
+
+        g.wait_for_all();
+
+        for (std::size_t i = start_work_items.size(); i != 0; --i) {
+            CHECK_MESSAGE(processed_items1[check_index1++] == start_work_items[i - 1], "Unexpected items processing");
+            CHECK_MESSAGE(processed_items2[check_index2++] == start_work_items[i - 1], "Unexpected items processing");
+        }
+    });
+}
+#endif // __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+
 //! Test output ports and message passing with different input tuples
 //! \brief \ref requirement \ref error_guessing
-TEST_CASE("Tuple tests") {
+TEST_CASE("Tuple tests"){
     for (int p = 0; p < 2; ++p) {
-        generate_test<serial_test, std::tuple<float, double>>::do_test();
+        generate_test<serial_test, std::tuple<float, double> >::do_test();
 #if MAX_TUPLE_TEST_SIZE >= 4
-        generate_test<serial_test, std::tuple<float, double, int, long>>::do_test();
+        generate_test<serial_test, std::tuple<float, double, int, long> >::do_test();
 #endif
 #if MAX_TUPLE_TEST_SIZE >= 6
-        generate_test<serial_test, std::tuple<double, double, int, long, int, short>>::do_test();
+        generate_test<serial_test, std::tuple<double, double, int, long, int, short> >::do_test();
 #endif
 #if MAX_TUPLE_TEST_SIZE >= 8
-        generate_test<serial_test,
-                      std::tuple<float, double, double, double, float, int, float, long>>::do_test();
+        generate_test<serial_test, std::tuple<float, double, double, double, float, int, float, long> >::do_test();
 #endif
 #if MAX_TUPLE_TEST_SIZE >= 10
-        generate_test<serial_test, std::tuple<float, double, int, double, double, float, long, int, float,
-                                              long>>::do_test();
+        generate_test<serial_test, std::tuple<float, double, int, double, double, float, long, int, float, long> >::do_test();
 #endif
-        generate_test<parallel_test, std::tuple<float, double>>::do_test();
+        generate_test<parallel_test, std::tuple<float, double> >::do_test();
 #if MAX_TUPLE_TEST_SIZE >= 3
-        generate_test<parallel_test, std::tuple<float, int, long>>::do_test();
+        generate_test<parallel_test, std::tuple<float, int, long> >::do_test();
 #endif
 #if MAX_TUPLE_TEST_SIZE >= 5
-        generate_test<parallel_test, std::tuple<double, double, int, int, short>>::do_test();
+        generate_test<parallel_test, std::tuple<double, double, int, int, short> >::do_test();
 #endif
 #if MAX_TUPLE_TEST_SIZE >= 7
-        generate_test<parallel_test, std::tuple<float, int, double, float, long, float, long>>::do_test();
+        generate_test<parallel_test, std::tuple<float, int, double, float, long, float, long> >::do_test();
 #endif
 #if MAX_TUPLE_TEST_SIZE >= 9
-        generate_test<parallel_test,
-                      std::tuple<float, double, int, double, double, long, int, float, long>>::do_test();
+        generate_test<parallel_test, std::tuple<float, double, int, double, double, long, int, float, long> >::do_test();
 #endif
     }
 }
@@ -433,11 +510,22 @@ TEST_CASE("Tuple tests") {
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 //! Test decution guides
 //! \brief \ref requirement
-TEST_CASE("Test follows and precedes API") { test_follows_and_precedes_api(); }
+TEST_CASE("Test follows and precedes API"){
+    test_follows_and_precedes_api();
+}
 #endif
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 //! Test decution guides
 //! \brief \ref requirement
-TEST_CASE("Deduction guides") { test_deduction_guides(); }
+TEST_CASE("Deduction guides"){
+    test_deduction_guides();
+}
+#endif
+
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+//! \brief \ref error_guessing
+TEST_CASE("test split_node try_put_and_wait") {
+    test_try_put_and_wait();
+}
 #endif
diff --git a/external/tbb/test/tbb/test_tagged_msg.cpp b/external/tbb/test/tbb/test_tagged_msg.cpp
index edbbcb77..520ecda9 100644
--- a/external/tbb/test/tbb/test_tagged_msg.cpp
+++ b/external/tbb/test/tbb/test_tagged_msg.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -14,23 +14,26 @@
     limitations under the License.
 */
 
-#define _VARIADIC_MAX 10// Visual Studio 2012
+
+#define _VARIADIC_MAX 10   // Visual Studio 2012
 #include "common/config.h"
 
 #include "tbb/flow_graph.h"
 
-#include "common/checktype.h"
 #include "common/test.h"
+#include "common/checktype.h"
 
-#include <atomic>
 #include <cstdio>
-#include <stdexcept>
+#include <atomic>
 #include <tuple>
+#include <stdexcept>
 #include <vector>
 
+
 //! \file test_tagged_msg.cpp
 //! \brief Test for [flow_graph.tagged_msg] specification
 
+
 // given a tuple, return the type of the element that has the maximum alignment requirement.
 // Given a tuple and that type, return the number of elements of the object with the max
 // alignment requirement that is at least as big as the largest object in the tuple.
@@ -47,13 +50,11 @@ typedef CheckType<int> counted_array_type[12];
 typedef std::vector<double> d_vector;
 typedef std::vector<int> i_vector;
 typedef i_vector i_vector_array[2];
-typedef tbb::flow::tagged_msg<size_t, int, char, double, odd_array_type, odder_array, d_vector,
-                              CheckType<int>, counted_array_type, i_vector_array>
-        tagged_msg_type;
+typedef tbb::flow::tagged_msg<size_t, int, char, double, odd_array_type, odder_array, d_vector, CheckType<int>, counted_array_type, i_vector_array> tagged_msg_type;
 
 // test base of tagged_msg
 void TestWrapper() {
-    using tbb::detail::d1::Wrapper;
+    using tbb::detail::d2::Wrapper;
     Wrapper<int> wi(42);
     Wrapper<int> wic(23);
 
@@ -62,24 +63,23 @@ void TestWrapper() {
     // pointer-type creation
     int point_to_me = 23;
     Wrapper<int_ptr> wip(&point_to_me);
-    CHECK_MESSAGE((*(wip.value()) == 23), "Error in wip value");
+    CHECK_MESSAGE( (*(wip.value()) == 23), "Error in wip value");
 
     odd_array_type ww;
-    for (int ii = 0; ii < 15; ++ii) { ww[ii] = char('0' + ii); }
-    ww[14] = 0;
+    for(int ii = 0; ii < 15; ++ii) { ww[ii] = char('0' + ii); } ww[14] = 0;
 
     Wrapper<odd_array_type> ci(ww);
-    CHECK_MESSAGE((!strncmp(ci.value(), ww, 14)), "odd_array_type ci not properly-constructed");
+    CHECK_MESSAGE( (!strncmp(ci.value(), ww, 14)), "odd_array_type ci not properly-constructed" );
 
     Wrapper<odd_array_type> ci2(ci);
 
-    CHECK_MESSAGE((!strncmp(ci2.value(), ww, 14)), "odd_array_type ci2 not properly-constructed");
+    CHECK_MESSAGE( (!strncmp(ci2.value(), ww, 14)), "odd_array_type ci2 not properly-constructed" );
 
     d_vector di;
     di.clear();
     di.push_back(2.0);
     Wrapper<d_vector> dvec(di);
-    CHECK_MESSAGE((dvec.value()[0] == 2.0), "incorrect value in vector");
+    CHECK_MESSAGE( (dvec.value()[0] == 2.0), "incorrect value in vector");
 
     // test array of non-PODs.
     i_vector_array oia;
@@ -88,173 +88,184 @@ void TestWrapper() {
     oia[0].push_back(3);
     oia[1].push_back(2);
     Wrapper<i_vector_array> ia(oia);
-    CHECK_MESSAGE(((ia.value()[1])[0] == 2), "integer vector array element[1] misbehaved");
-    CHECK_MESSAGE(((ia.value()[0])[0] == 3), "integer vector array element[0] misbehaved");
+    CHECK_MESSAGE( ((ia.value()[1])[0] == 2), "integer vector array element[1] misbehaved");
+    CHECK_MESSAGE( ((ia.value()[0])[0] == 3), "integer vector array element[0] misbehaved");
     Wrapper<i_vector_array> iac(ia);
-    CHECK_MESSAGE(((iac.value()[1])[0] == 2), "integer vector array element[1] misbehaved");
-    CHECK_MESSAGE(((iac.value()[0])[0] == 3), "integer vector array element[0] misbehaved");
+    CHECK_MESSAGE( ((iac.value()[1])[0] == 2), "integer vector array element[1] misbehaved");
+    CHECK_MESSAGE( ((iac.value()[0])[0] == 3), "integer vector array element[0] misbehaved");
 
     // counted_array
     counted_array_type cat_orig;
-    for (int i = 0; i < 12; ++i) cat_orig[i] = i + 1;
+    for(int i = 0; i < 12; ++i) cat_orig[i] = i + 1;
     Wrapper<counted_array_type> cat(cat_orig);
-    for (int j = 0; j < 12; ++j) CHECK_MESSAGE((1 + j == cat.value()[j]), "Error in cat array");
+    for(int j = 0; j < 12; ++j)
+        CHECK_MESSAGE( (1 + j == cat.value()[j]), "Error in cat array");
 
     int i = wi.value();
-    CHECK_MESSAGE((i == 42), "Assignment to i failed");
-    CHECK_MESSAGE((wi.value() == 42), "Assignment to wi failed");
+    CHECK_MESSAGE( (i == 42), "Assignment to i failed");
+    CHECK_MESSAGE( (wi.value() == 42), "Assignment to wi failed");
     double d = wi.value();
-    CHECK_MESSAGE((d == 42), "Implicit cast in assign to double failed");
+    CHECK_MESSAGE( (d == 42), "Implicit cast in assign to double failed");
     int_ptr ip = wip.value();
-    CHECK_MESSAGE((ip == &(point_to_me)), "Error in assignment of pointer");
+    CHECK_MESSAGE( (ip == &(point_to_me)), "Error in assignment of pointer");
 }
 
 void RunTests() {
     tagged_msg_type def;
-    tagged_msg_type i(1, 3);
+    tagged_msg_type i(1,3);
     CheckType<int>::check_type_counter = 0;
     int z;
-#if TBB_USE_EXCEPTIONS
+    #if TBB_USE_EXCEPTIONS
     try {
-        z = cast_to<int>(def);// disallowed (non-array returning int)
-        CHECK_MESSAGE((false), "should not allow cast to int of non-array");
-    } catch (...) { INFO("cast of non-array to int disallowed (okay)\n"); }
-#endif
+        z = cast_to<int>(def); // disallowed (non-array returning int)
+        CHECK_MESSAGE( (false), "should not allow cast to int of non-array");
+    }
+    catch(...) {
+        INFO("cast of non-array to int disallowed (okay)\n");
+    }
+    #endif
     z = cast_to<int>(i);
-    CHECK_MESSAGE((is_a<int>(i)), "wrong type for i ( == int)");
-    CHECK_MESSAGE((!(is_a<double>(i))), "Wrong type for i ( != double)");
+    CHECK_MESSAGE( (is_a<int>(i)), "wrong type for i ( == int)");
+    CHECK_MESSAGE( (!(is_a<double>(i))), "Wrong type for i ( != double)");
     z = 5;
     z = cast_to<int>(i);
 
     const int &ref_i(cast_to<int>(i));
-    CHECK_MESSAGE((ref_i == 3), "ref_i got wrong value");
-    tagged_msg_type j(2, 4);
+    CHECK_MESSAGE( (ref_i == 3), "ref_i got wrong value");
+    tagged_msg_type j(2,4);
     i = j;
-    CHECK_MESSAGE((ref_i == 4), "assign to i did not affect ref_i");
+    CHECK_MESSAGE( (ref_i == 4), "assign to i did not affect ref_i");
 
-    CHECK_MESSAGE((z == 3), "Error retrieving value from i");
+    CHECK_MESSAGE( ( z == 3), "Error retrieving value from i");
 
     //updating and retrieving tags
-    CHECK_MESSAGE((j.tag() == 2), "Error retrieving tag for j");
+    CHECK_MESSAGE( (j.tag() == 2), "Error retrieving tag for j");
     j.set_tag(10);
-    CHECK_MESSAGE((j.tag() == 10), "Error updating tag for j");
+    CHECK_MESSAGE( (j.tag() == 10), "Error updating tag for j");
 
     tbb::flow::tagged_msg<char, int, char, double> k('a', 4);
     k.set_tag('b');
-    CHECK_MESSAGE((k.tag() == 'b'), "Error updating char tag");
+    CHECK_MESSAGE( (k.tag() == 'b'), "Error updating char tag");
 
     tagged_msg_type double_tagged_msg(3, 8.0);
-    CHECK_MESSAGE((is_a<double>(double_tagged_msg)), "Wrong type for double_tagged_msg (== double)");
-    CHECK_MESSAGE((!is_a<char>(double_tagged_msg)), "Wrong type for double_tagged_msg (!= char)");
-    CHECK_MESSAGE((!is_a<int>(double_tagged_msg)), "Wrong type for double_tagged_msg (!= int)");
+    CHECK_MESSAGE( (is_a<double>(double_tagged_msg)), "Wrong type for double_tagged_msg (== double)");
+    CHECK_MESSAGE( (!is_a<char>(double_tagged_msg)), "Wrong type for double_tagged_msg (!= char)");
+    CHECK_MESSAGE( (!is_a<int>(double_tagged_msg)), "Wrong type for double_tagged_msg (!= int)");
     tagged_msg_type copytype(double_tagged_msg);
-    CHECK_MESSAGE((is_a<double>(copytype)), "Wrong type for double_tagged_msg (== double)");
-    CHECK_MESSAGE((!is_a<char>(copytype)), "Wrong type for double_tagged_msg (!= char)");
-    CHECK_MESSAGE((!is_a<int>(copytype)), "Wrong type for double_tagged_msg (!= int)");
+    CHECK_MESSAGE( (is_a<double>(copytype)), "Wrong type for double_tagged_msg (== double)");
+    CHECK_MESSAGE( (!is_a<char>(copytype)), "Wrong type for double_tagged_msg (!= char)");
+    CHECK_MESSAGE( (!is_a<int>(copytype)), "Wrong type for double_tagged_msg (!= int)");
     tagged_msg_type default_tagged_msg;
-    CHECK_MESSAGE((!(is_a<double>(default_tagged_msg))), "wrong type for default ( != double)");
-    CHECK_MESSAGE((!(is_a<int>(default_tagged_msg))), "wrong type for default ( != int)");
-    CHECK_MESSAGE((!(is_a<bool>(default_tagged_msg))), "wrong type for default ( != bool)");
+    CHECK_MESSAGE( (!(is_a<double>(default_tagged_msg))), "wrong type for default ( != double)");
+    CHECK_MESSAGE( (!(is_a<int>(default_tagged_msg))), "wrong type for default ( != int)");
+    CHECK_MESSAGE( (!(is_a<bool>(default_tagged_msg))), "wrong type for default ( != bool)");
     CheckType<int> c;
-    CHECK_MESSAGE((CheckType<int>::check_type_counter == 1), "Incorrect number of CheckType<int>s created");
+    CHECK_MESSAGE( (CheckType<int>::check_type_counter == 1), "Incorrect number of CheckType<int>s created");
     tagged_msg_type cnt_type(4, c);
-    CHECK_MESSAGE((CheckType<int>::check_type_counter == 2), "Incorrect number of CheckType<int>s created");
-    CHECK_MESSAGE((is_a<CheckType<int>>(cnt_type)), "Incorrect type for cnt_type");
+    CHECK_MESSAGE( (CheckType<int>::check_type_counter == 2), "Incorrect number of CheckType<int>s created");
+    CHECK_MESSAGE( (is_a<CheckType<int> >(cnt_type)), "Incorrect type for cnt_type");
     cnt_type = default_tagged_msg;
-    CHECK_MESSAGE((CheckType<int>::check_type_counter == 1),
-                  "Incorrect number of CheckType<int>s after reassignment");
-    CHECK_MESSAGE((cnt_type.is_default_constructed()), "Assigned CheckType<int>s is not default-constructed");
+    CHECK_MESSAGE( (CheckType<int>::check_type_counter == 1), "Incorrect number of CheckType<int>s after reassignment");
+    CHECK_MESSAGE( (cnt_type.is_default_constructed()), "Assigned CheckType<int>s is not default-constructed");
     // having problem with init on gcc 3.4.6 (fxeolin16)  constructor for elements of array not called
     // for this version.
     // counted_array_type counted_array;
-    CheckType<int> counted_array[12];// this is okay
-    CHECK_MESSAGE((CheckType<int>::check_type_counter == 13),
-                  "Incorrect number of CheckType<int>s after counted_array construction");
+    CheckType<int> counted_array[12];  // this is okay
+    CHECK_MESSAGE( (CheckType<int>::check_type_counter == 13), "Incorrect number of CheckType<int>s after counted_array construction");
     tagged_msg_type counted_array_tagged_msg(5, counted_array);
     // the is_a<>() should return exact type matches.
-    CHECK_MESSAGE((!is_a<CheckType<int> *>(counted_array_tagged_msg)),
-                  "Test of is_a for counted_array_tagged_msg fails");
-#if TBB_USE_EXCEPTIONS
+    CHECK_MESSAGE( (!is_a<CheckType<int> *>(counted_array_tagged_msg)), "Test of is_a for counted_array_tagged_msg fails");
+    #if TBB_USE_EXCEPTIONS
     try {
         int *iip = cast_to<int *>(counted_array_tagged_msg);
-        CHECK_MESSAGE((false), "did not throw on invalid cast");
-        *iip = 2;// avoids "iip set but not used" warning
-    } catch (std::runtime_error &re) { INFO("attempt to cast to invalid type caught " << re.what() << "\n"); }
-    CHECK_MESSAGE((is_a<counted_array_type>(counted_array_tagged_msg)), "testing");
+        CHECK_MESSAGE( (false), "did not throw on invalid cast");
+        *iip = 2;  // avoids "iip set but not used" warning
+    }
+    catch(std::runtime_error &re) {
+        INFO("attempt to cast to invalid type caught " << re.what() << "\n");
+    }
+    CHECK_MESSAGE( (is_a<counted_array_type>(counted_array_tagged_msg)), "testing");
     const CheckType<int> *ctip = cast_to<counted_array_type>(counted_array_tagged_msg);
 
-    CHECK_MESSAGE(((int) (*ctip) == 0), "ctip incorrect");
+    CHECK_MESSAGE( ((int)(*ctip) == 0), "ctip incorrect");
 
-    CHECK_MESSAGE((CheckType<int>::check_type_counter == 25),
-                  "Incorrect number of CheckType<int>s after counted_array_tagged_msg construction");
+    CHECK_MESSAGE( (CheckType<int>::check_type_counter == 25), "Incorrect number of CheckType<int>s after counted_array_tagged_msg construction");
     counted_array_tagged_msg = default_tagged_msg;
-    CHECK_MESSAGE((CheckType<int>::check_type_counter == 13),
-                  "Incorrect number of CheckType<int>s after counted_array_tagged_msg destruction");
-    CHECK_MESSAGE((counted_array_tagged_msg.is_default_constructed()),
-                  "Assigned counted_array_type is not default-constructed");
+    CHECK_MESSAGE( (CheckType<int>::check_type_counter == 13), "Incorrect number of CheckType<int>s after counted_array_tagged_msg destruction");
+    CHECK_MESSAGE( (counted_array_tagged_msg.is_default_constructed()), "Assigned counted_array_type is not default-constructed");
 
     default_tagged_msg = double_tagged_msg;
     const double my_dval = cast_to<double>(default_tagged_msg);
-    CHECK_MESSAGE((my_dval == 8.0), "did not retrieve correct value from assigned default_tagged_msg");
+    CHECK_MESSAGE( (my_dval == 8.0), "did not retrieve correct value from assigned default_tagged_msg");
 
     {
         odd_array_type my_b;
-        for (size_t ii = 0; ii < 14; ++ii) { my_b[ii] = (char) ('0' + ii); }
+        for(size_t ii=0; ii < 14;++ii) {
+            my_b[ii] = (char)('0' + ii);
+        }
         my_b[14] = 0;
         {
             tagged_msg_type odd_array_tagged_msg(6, my_b);
             const char *my_copy = cast_to<odd_array_type>(odd_array_tagged_msg);
-            CHECK_MESSAGE((!strncmp(my_b, my_copy, 14)), "copied char array not correct value");
+            CHECK_MESSAGE( (!strncmp(my_b, my_copy, 14)), "copied char array not correct value");
             default_tagged_msg = odd_array_tagged_msg;
             try {
                 const char *my_copy2 = cast_to<odd_array_type>(default_tagged_msg);
-                CHECK_MESSAGE((!strncmp(my_b, my_copy2, 14)),
-                              "char array from default tagged_msg assign not correct value");
-            } catch (...) { CHECK_MESSAGE((false), "Bad cast"); }
+                CHECK_MESSAGE( (!strncmp(my_b, my_copy2, 14)), "char array from default tagged_msg assign not correct value");
+            }
+            catch(...) {
+                CHECK_MESSAGE( (false), "Bad cast");
+            }
         }
     }
 
-    CHECK_MESSAGE((!is_a<double>(i)), "bad type for i");
+    CHECK_MESSAGE( (!is_a<double>(i)), "bad type for i");
     try {
         double y = cast_to<double>(i);
         // use '&' to force eval of RHS (fixes "initialized but not referenced" vs2012 warnings)
-        CHECK_MESSAGE((false & (0 != y)), "Error: cast to type in tuple did not get exception");
-    } catch (std::runtime_error &bc) {
-        CHECK_MESSAGE((0 == strcmp(bc.what(), "Illegal tagged_msg cast")), "Incorrect std:runtime_error");
-    } catch (...) { CHECK_MESSAGE((false & cast_to<int>(i)), "Error: improper exception thrown"); }
+        CHECK_MESSAGE( (false & (0 != y)), "Error: cast to type in tuple did not get exception");
+    }
+    catch(std::runtime_error &bc) {
+        CHECK_MESSAGE( (0 == strcmp(bc.what(), "Illegal tagged_msg cast")), "Incorrect std:runtime_error");
+    }
+    catch(...) {
+        CHECK_MESSAGE( (false & cast_to<int>(i)), "Error: improper exception thrown");
+    }
 
     try {
         int *ip = cast_to<int *>(i);
-        CHECK_MESSAGE((false & (NULL != ip)), "Error: non-array cast to pointer type.");
-    } catch (std::runtime_error &bc) {
-        CHECK_MESSAGE((0 == strcmp(bc.what(), "Illegal tagged_msg cast")), "Incorrect std:runtime_error");
-    } catch (...) {
-        CHECK_MESSAGE((false), "did not get runtime_error exception in casting non-array to pointer");
+        CHECK_MESSAGE( (false & (nullptr!=ip)), "Error: non-array cast to pointer type.");
+    }
+    catch(std::runtime_error &bc) {
+        CHECK_MESSAGE( (0 == strcmp(bc.what(), "Illegal tagged_msg cast")), "Incorrect std:runtime_error");
+    }
+    catch(...) {
+        CHECK_MESSAGE( (false), "did not get runtime_error exception in casting non-array to pointer");
     }
 
     try {
         bool b = cast_to<bool>(i);
-        CHECK_MESSAGE((false & b), "Error: cast against type did not get exception");
-    } catch (std::runtime_error &bc) {
-        CHECK_MESSAGE((0 == strcmp(bc.what(), "Illegal tagged_msg cast")), "Incorrect std:runtime_error");
-    } catch (...) {
-        CHECK_MESSAGE((false), "did not get runtime_error exception casting to disparate types");
+        CHECK_MESSAGE( (false & b), "Error: cast against type did not get exception");
+    }
+    catch(std::runtime_error &bc) {
+        CHECK_MESSAGE( (0 == strcmp(bc.what(), "Illegal tagged_msg cast")), "Incorrect std:runtime_error");
+    }
+    catch(...) {
+        CHECK_MESSAGE( (false), "did not get runtime_error exception casting to disparate types");
     }
-#endif//TBB_USE_EXCEPTIONS
+    #endif //TBB_USE_EXCEPTIONS
 }
 
 //! Test tagged_msg for specific types
 //! \brief \ref error_guessing
 TEST_CASE("Test base of tagged_msg") {
     TestWrapper();
-    CHECK_MESSAGE((CheckType<int>::check_type_counter == 0),
-                  "After TestWrapper return not all CheckType<int>s were destroyed");
+    CHECK_MESSAGE( (CheckType<int>::check_type_counter == 0), "After TestWrapper return not all CheckType<int>s were destroyed");
 }
 
 //! Test tagged_msg functions and exceptional behavior
 //! \brief \ref requirement \ref error_guessing
 TEST_CASE("Test tagged_msg") {
     RunTests();
-    CHECK_MESSAGE((CheckType<int>::check_type_counter == 0),
-                  "After RunTests return not all CheckType<int>s were destroyed");
+    CHECK_MESSAGE( (CheckType<int>::check_type_counter == 0), "After RunTests return not all CheckType<int>s were destroyed");
 }
diff --git a/external/tbb/test/tbb/test_task.cpp b/external/tbb/test/tbb/test_task.cpp
index 464f834b..6c2060a6 100644
--- a/external/tbb/test/tbb/test_task.cpp
+++ b/external/tbb/test/tbb/test_task.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -14,22 +14,23 @@
     limitations under the License.
 */
 
-#include "common/cpu_usertime.h"
-#include "common/dummy_body.h"
-#include "common/spin_barrier.h"
 #include "common/test.h"
 #include "common/utils.h"
+#include "common/dummy_body.h"
+#include "common/spin_barrier.h"
 #include "common/utils_concurrency_limit.h"
+#include "common/cpu_usertime.h"
 
-#include "tbb/cache_aligned_allocator.h"
-#include "tbb/concurrent_vector.h"
-#include "tbb/global_control.h"
-#include "tbb/parallel_for.h"
 #include "tbb/task.h"
 #include "tbb/task_group.h"
+#include "tbb/parallel_for.h"
+#include "tbb/cache_aligned_allocator.h"
+#include "tbb/global_control.h"
+#include "tbb/concurrent_vector.h"
 
 #include <atomic>
 #include <thread>
+#include <deque>
 
 //! \file test_task.cpp
 //! \brief Test for [internal] functionality
@@ -39,25 +40,25 @@ struct EmptyBody {
 
 #if _MSC_VER && !defined(__INTEL_COMPILER)
 // unreachable code
-#pragma warning(push)
-#pragma warning(disable : 4702)
+#pragma warning( push )
+#pragma warning( disable: 4702 )
 #endif
 
 template <typename Body = EmptyBody>
 class CountingTask : public tbb::detail::d1::task {
 public:
-    CountingTask(Body body, tbb::detail::d1::wait_context& wait) : my_body(body), my_wait(wait) {}
+    CountingTask( Body body, tbb::detail::d1::wait_context& wait ) : my_body(body), my_wait(wait) {}
 
-    CountingTask(tbb::detail::d1::wait_context& wait) : my_wait(wait) {}
+    CountingTask( tbb::detail::d1::wait_context& wait ) : my_wait(wait) {}
 
-    task* execute(tbb::detail::d1::execution_data&) override {
+    task* execute( tbb::detail::d1::execution_data& ) override {
         ++my_execute_counter;
         my_body();
         my_wait.release();
         return nullptr;
     }
 
-    task* cancel(tbb::detail::d1::execution_data&) override {
+    task* cancel( tbb::detail::d1::execution_data& ) override {
         ++my_cancel_counter;
         my_wait.release();
         return nullptr;
@@ -77,11 +78,12 @@ class CountingTask : public tbb::detail::d1::task {
 
     static std::atomic<std::size_t> my_execute_counter;
     static std::atomic<std::size_t> my_cancel_counter;
-};// struct CountingTask
+}; // struct CountingTask
+
 
 #if _MSC_VER && !defined(__INTEL_COMPILER)
-#pragma warning(pop)
-#endif// warning 4702 is back
+#pragma warning( pop )
+#endif // warning 4702 is back
 
 template <typename Body>
 std::atomic<std::size_t> CountingTask<Body>::my_execute_counter(0);
@@ -90,28 +92,33 @@ template <typename Body>
 std::atomic<std::size_t> CountingTask<Body>::my_cancel_counter(0);
 
 #if TBB_USE_EXCEPTIONS
-void test_cancellation_on_exception(bool reset_ctx) {
+void test_cancellation_on_exception( bool reset_ctx ) {
     tbb::detail::d1::wait_context wait(1);
     tbb::task_group_context test_context;
-    auto throw_body = [] { throw 1; };
+    auto throw_body = [] {
+        throw 1;
+    };
     CountingTask<decltype(throw_body)> task(throw_body, wait);
 
     constexpr std::size_t iter_counter = 1000;
     for (std::size_t i = 0; i < iter_counter; ++i) {
         try {
             tbb::detail::d1::execute_and_wait(task, test_context, wait, test_context);
-        } catch (int ex) { REQUIRE(ex == 1); }
-        if (reset_ctx) { test_context.reset(); }
+        } catch(int ex) {
+            REQUIRE(ex == 1);
+        }
+        if (reset_ctx) {
+            test_context.reset();
+        }
         wait.reserve(1);
     }
     wait.release(1);
 
     REQUIRE_MESSAGE(task.execute_counter() == (reset_ctx ? iter_counter : 1), "Some task was not executed");
-    REQUIRE_MESSAGE(task.cancel_counter() == iter_counter,
-                    "Some task was not canceled after the exception occurs");
+    REQUIRE_MESSAGE(task.cancel_counter() == iter_counter, "Some task was not canceled after the exception occurs");
     task.reset();
 }
-#endif// TBB_USE_EXCEPTIONS
+#endif // TBB_USE_EXCEPTIONS
 
 //! \brief \ref error_guessing
 TEST_CASE("External threads sleep") {
@@ -144,8 +151,7 @@ TEST_CASE("Test that task was executed p times") {
 
     wait.release(1);
 
-    REQUIRE_MESSAGE(CountingTask<>::execute_counter() == iter_counter,
-                    "The task was not executed necessary times");
+    REQUIRE_MESSAGE(CountingTask<>::execute_counter() == iter_counter, "The task was not executed necessary times");
     REQUIRE_MESSAGE(CountingTask<>::cancel_counter() == 0, "Some instance of the task was canceled");
     CountingTask<>::reset();
 }
@@ -153,24 +159,25 @@ TEST_CASE("Test that task was executed p times") {
 #if TBB_USE_EXCEPTIONS
 //! \brief \ref error_guessing
 TEST_CASE("Test cancellation on exception") {
-    test_cancellation_on_exception(/*reset_ctx = */ true);
-    test_cancellation_on_exception(/*reset_ctx = */ false);
+    test_cancellation_on_exception(/*reset_ctx = */true);
+    test_cancellation_on_exception(/*reset_ctx = */false);
 }
-#endif// TBB_USE_EXCEPTIONS
+#endif // TBB_USE_EXCEPTIONS
 
 //! \brief \ref error_guessing
 TEST_CASE("Simple test parallelism usage") {
     std::uint32_t threads_num = static_cast<std::uint32_t>(utils::get_platform_max_threads());
     utils::SpinBarrier barrier(threads_num);
 
-    auto barrier_wait = [&barrier] { barrier.wait(); };
+    auto barrier_wait = [&barrier] {
+        barrier.wait();
+    };
 
     tbb::detail::d1::wait_context wait(threads_num);
     tbb::detail::d1::task_group_context test_context;
     using task_type = CountingTask<decltype(barrier_wait)>;
 
-    std::vector<task_type, tbb::cache_aligned_allocator<task_type>> vector_test_task(
-            threads_num, task_type(barrier_wait, wait));
+    std::vector<task_type, tbb::cache_aligned_allocator<task_type>> vector_test_task(threads_num, task_type(barrier_wait, wait));
 
     constexpr std::size_t iter_counter = 100;
     for (std::size_t i = 0; i < iter_counter; ++i) {
@@ -192,23 +199,27 @@ TEST_CASE("Test parallelism usage with parallel_for") {
     std::uint32_t task_threads_num = static_cast<std::uint32_t>(utils::get_platform_max_threads());
     utils::SpinBarrier barrier(task_threads_num);
 
-    auto barrier_wait = [&barrier] { barrier.wait(); };
+    auto barrier_wait = [&barrier] {
+        barrier.wait();
+    };
 
     std::size_t pfor_iter_count = 10000;
     std::atomic<std::size_t> pfor_counter(0);
 
     auto parallel_for_func = [&pfor_counter, pfor_iter_count] {
         tbb::parallel_for(tbb::blocked_range<std::size_t>(0, pfor_iter_count),
-                          [&pfor_counter](tbb::blocked_range<std::size_t>& range) {
-                              for (auto it = range.begin(); it != range.end(); ++it) { ++pfor_counter; }
-                          });
+                          [&pfor_counter] (tbb::blocked_range<std::size_t>& range) {
+                              for (auto it = range.begin(); it != range.end(); ++it) {
+                                  ++pfor_counter;
+                              }
+                           }
+        );
     };
 
     tbb::detail::d1::wait_context wait(task_threads_num);
     tbb::detail::d1::task_group_context test_context;
     using task_type = CountingTask<decltype(barrier_wait)>;
-    std::vector<task_type, tbb::cache_aligned_allocator<task_type>> vector_test_task(
-            task_threads_num, task_type(barrier_wait, wait));
+    std::vector<task_type, tbb::cache_aligned_allocator<task_type>> vector_test_task(task_threads_num, task_type(barrier_wait, wait));
 
     constexpr std::size_t iter_count = 10;
     constexpr std::size_t pfor_threads_num = 4;
@@ -219,23 +230,25 @@ TEST_CASE("Test parallelism usage with parallel_for") {
             tbb::detail::d1::spawn(vector_test_task[j], test_context);
         }
 
-        for (std::size_t k = 0; k < pfor_threads_num; ++k) { pfor_threads.emplace_back(parallel_for_func); }
+        for (std::size_t k = 0; k < pfor_threads_num; ++k) {
+            pfor_threads.emplace_back(parallel_for_func);
+        }
 
         tbb::detail::d1::wait(wait, test_context);
 
         for (auto& thread : pfor_threads) {
-            if (thread.joinable()) { thread.join(); }
+            if (thread.joinable()) {
+                thread.join();
+            }
         }
 
         wait.reserve(task_threads_num);
     }
     wait.release(task_threads_num);
 
-    REQUIRE_MESSAGE(task_type::execute_counter() == task_threads_num * iter_count,
-                    "Some task was not executed");
+    REQUIRE_MESSAGE(task_type::execute_counter() == task_threads_num * iter_count, "Some task was not executed");
     REQUIRE_MESSAGE(task_type::cancel_counter() == 0, "Some task was canceled");
-    REQUIRE_MESSAGE(pfor_counter == iter_count * pfor_threads_num * pfor_iter_count,
-                    "Some parallel_for thread was not finished");
+    REQUIRE_MESSAGE(pfor_counter == iter_count * pfor_threads_num * pfor_iter_count, "Some parallel_for thread was not finished");
     task_type::reset();
 }
 
@@ -244,15 +257,16 @@ TEST_CASE("Test parallelism usage with spawn tasks in different threads") {
     std::uint32_t threads_num = static_cast<std::uint32_t>(utils::get_platform_max_threads());
     utils::SpinBarrier barrier(threads_num);
 
-    auto barrier_wait = [&barrier] { barrier.wait(); };
+    auto barrier_wait = [&barrier] {
+        barrier.wait();
+    };
 
     tbb::detail::d1::wait_context wait(threads_num);
     tbb::detail::d1::task_group_context test_context;
     using task_type = CountingTask<decltype(barrier_wait)>;
-    std::vector<task_type, tbb::cache_aligned_allocator<task_type>> vector_test_task(
-            threads_num, task_type(barrier_wait, wait));
+    std::vector<task_type, tbb::cache_aligned_allocator<task_type>> vector_test_task(threads_num, task_type(barrier_wait, wait));
 
-    auto thread_func = [&vector_test_task, &test_context](std::size_t idx) {
+    auto thread_func = [&vector_test_task, &test_context] ( std::size_t idx ) {
         tbb::detail::d1::spawn(vector_test_task[idx], test_context);
     };
 
@@ -260,14 +274,17 @@ TEST_CASE("Test parallelism usage with spawn tasks in different threads") {
     for (std::size_t i = 0; i < iter_count; ++i) {
         std::vector<std::thread> threads;
 
-        for (std::size_t k = 0; k < threads_num - 1; ++k) { threads.emplace_back(thread_func, k); }
+        for (std::size_t k = 0; k < threads_num - 1; ++k) {
+            threads.emplace_back(thread_func, k);
+        }
 
         for (auto& thread : threads) {
-            if (thread.joinable()) { thread.join(); }
+            if (thread.joinable()) {
+                thread.join();
+            }
         }
 
-        tbb::detail::d1::execute_and_wait(vector_test_task[threads_num - 1], test_context, wait,
-                                          test_context);
+        tbb::detail::d1::execute_and_wait(vector_test_task[threads_num - 1], test_context, wait, test_context);
         wait.reserve(threads_num);
     }
     wait.release(threads_num);
@@ -285,7 +302,7 @@ class SpawningTaskBody {
 public:
     using task_pool_type = std::vector<SpawningTask, tbb::cache_aligned_allocator<SpawningTask>>;
 
-    SpawningTaskBody(task_pool_type& task_pool, tbb::task_group_context& test_ctx)
+    SpawningTaskBody( task_pool_type& task_pool, tbb::task_group_context& test_ctx )
         : my_task_pool(task_pool), my_test_ctx(test_ctx) {}
 
     void operator()() const {
@@ -293,18 +310,16 @@ class SpawningTaskBody {
         std::size_t start_idx = my_current_task.fetch_add(delta);
 
         if (start_idx < my_task_pool.size()) {
-            for (std::size_t idx = start_idx; idx != std::min(my_task_pool.size(), start_idx + delta);
-                 ++idx) {
+            for (std::size_t idx = start_idx; idx != std::min(my_task_pool.size(), start_idx + delta); ++idx) {
                 tbb::detail::d1::spawn(my_task_pool[idx], my_test_ctx);
             }
         }
     }
-
 private:
     task_pool_type& my_task_pool;
     tbb::task_group_context& my_test_ctx;
     static std::atomic<std::size_t> my_current_task;
-};// class SpawningTaskBody
+}; // class SpawningTaskBody
 
 std::atomic<std::size_t> SpawningTaskBody::my_current_task(0);
 
@@ -317,14 +332,15 @@ TEST_CASE("Actively adding tasks") {
 
     SpawningTaskBody::task_pool_type task_pool;
 
-    SpawningTaskBody task_body {task_pool, test_context};
-    for (std::size_t i = 0; i < task_number; ++i) { task_pool.emplace_back(task_body, wait); }
+    SpawningTaskBody task_body{task_pool, test_context};
+    for (std::size_t i = 0; i < task_number; ++i) {
+        task_pool.emplace_back(task_body, wait);
+    }
 
     SpawningTask first_task(task_body, wait);
     tbb::detail::d1::execute_and_wait(first_task, test_context, wait, test_context);
 
-    REQUIRE_MESSAGE(SpawningTask::execute_counter() == task_number + 1,
-                    "Some tasks were not executed");// Is it right?
+    REQUIRE_MESSAGE(SpawningTask::execute_counter() == task_number + 1, "Some tasks were not executed"); // Is it right?
     REQUIRE_MESSAGE(SpawningTask::cancel_counter() == 0, "Some tasks were canceled");
 }
 
@@ -332,17 +348,20 @@ TEST_CASE("Actively adding tasks") {
 struct suspended_task : public tbb::detail::d1::task {
 
     suspended_task(tbb::task::suspend_point tag, tbb::detail::d1::wait_context& wait)
-        : my_suspend_tag(tag), my_wait(wait) {}
+        : my_suspend_tag(tag), my_wait(wait)
+    {}
 
     task* execute(tbb::detail::d1::execution_data&) override {
-        tbb::parallel_for(
-                tbb::blocked_range<std::size_t>(0, 100000),
-                [](const tbb::blocked_range<std::size_t>& range) {
-                    // Make some heavy work
-                    std::atomic<int> sum {};
-                    for (auto it = range.begin(); it != range.end(); ++it) { ++sum; }
-                },
-                tbb::static_partitioner {});
+        tbb::parallel_for(tbb::blocked_range<std::size_t>(0, 100000),
+            [] (const tbb::blocked_range<std::size_t>& range) {
+                // Make some heavy work
+                std::atomic<int> sum{};
+                for (auto it = range.begin(); it != range.end(); ++it) {
+                    ++sum;
+                }
+            },
+            tbb::static_partitioner{}
+        );
 
         my_wait.release();
         tbb::task::resume(my_suspend_tag);
@@ -360,33 +379,37 @@ struct suspended_task : public tbb::detail::d1::task {
 
 //! \brief \ref error_guessing
 TEST_CASE("Isolation + resumable tasks") {
-    std::atomic<int> suspend_flag {};
+    std::atomic<int> suspend_flag{};
     tbb::task_group_context test_context;
 
-    std::atomic<int> suspend_count {};
-    std::atomic<int> resume_count {};
-
-    tbb::parallel_for(
-            tbb::blocked_range<std::size_t>(0, 100000),
-            [&suspend_flag, &test_context, &suspend_count,
-             &resume_count](const tbb::blocked_range<std::size_t>& range) {
-                int ticket = 0;
-                for (auto it = range.begin(); it != range.end(); ++it) { ticket = suspend_flag++; }
-
-                if (ticket % 5 == 0) {
-                    std::vector<suspended_task, tbb::cache_aligned_allocator<suspended_task>> test_task;
-                    tbb::detail::d1::wait_context wait(1);
-                    ++suspend_count;
-                    tbb::this_task_arena::isolate([&wait, &test_context, &test_task] {
-                        tbb::task::suspend([&wait, &test_context, &test_task](tbb::task::suspend_point tag) {
-                            test_task.emplace_back(tag, wait);
-                            tbb::detail::d1::spawn(test_task[0], test_context);
-                        });
+    std::atomic<int> suspend_count{};
+    std::atomic<int> resume_count{};
+
+    tbb::parallel_for(tbb::blocked_range<std::size_t>(0, 100000),
+        [&suspend_flag, &test_context, &suspend_count, &resume_count] (const tbb::blocked_range<std::size_t>& range) {
+            int ticket = 0;
+            for (auto it = range.begin(); it != range.end(); ++it) {
+                ticket = suspend_flag++;
+            }
+
+            if (ticket % 5 == 0) {
+                std::vector<suspended_task, tbb::cache_aligned_allocator<suspended_task>> test_task;
+                tbb::detail::d1::wait_context wait(1);
+                ++suspend_count;
+                tbb::this_task_arena::isolate([&wait, &test_context, &test_task] {
+                    auto thread_id = std::this_thread::get_id();
+                    tbb::task::suspend([&wait, &test_context, &test_task, thread_id] (tbb::task::suspend_point tag) {
+                        CHECK(thread_id == std::this_thread::get_id());
+                        test_task.emplace_back(tag, wait);
+                        tbb::detail::d1::spawn(test_task[0], test_context);
                     });
-                    tbb::detail::d1::wait(wait, test_context);
-                    ++resume_count;
-                }
-            });
+                    }
+                );
+                tbb::detail::d1::wait(wait, test_context);
+                ++resume_count;
+            }
+        }
+    );
 
     CHECK(suspend_count == resume_count);
 }
@@ -394,15 +417,18 @@ TEST_CASE("Isolation + resumable tasks") {
 struct bypass_task : public tbb::detail::d1::task {
     using task_pool_type = std::vector<bypass_task, tbb::cache_aligned_allocator<bypass_task>>;
 
-    bypass_task(tbb::detail::d1::wait_context& wait, task_pool_type& task_pool, std::atomic<int>& resume_flag,
-                tbb::task::suspend_point& suspend_tag)
-        : my_wait(wait), my_task_pool(task_pool), my_resume_flag(resume_flag), my_suspend_tag(suspend_tag) {}
+    bypass_task(tbb::detail::d1::wait_context& wait, task_pool_type& task_pool,
+                std::atomic<int>& resume_flag, tbb::task::suspend_point& suspend_tag)
+        : my_wait(wait), my_task_pool(task_pool), my_resume_flag(resume_flag), my_suspend_tag(suspend_tag)
+    {}
 
     task* execute(tbb::detail::d1::execution_data&) override {
         utils::doDummyWork(10000);
 
         int expected = 1;
-        if (my_resume_flag.compare_exchange_strong(expected, 2)) { tbb::task::resume(my_suspend_tag); }
+        if (my_resume_flag.compare_exchange_strong(expected, 2)) {
+            tbb::task::resume(my_suspend_tag);
+        }
 
         std::size_t ticket = my_current_task++;
         task* next = ticket < my_task_pool.size() ? &my_task_pool[ticket] : nullptr;
@@ -412,7 +438,9 @@ struct bypass_task : public tbb::detail::d1::task {
             // So, wait for the suspend before leaving.
             utils::SpinWaitWhileEq(my_resume_flag, 0);
             expected = 1;
-            if (my_resume_flag.compare_exchange_strong(expected, 2)) { tbb::task::resume(my_suspend_tag); }
+            if (my_resume_flag.compare_exchange_strong(expected, 2)) {
+                tbb::task::resume(my_suspend_tag);
+            }
         }
 
         my_wait.release();
@@ -443,7 +471,7 @@ TEST_CASE("Bypass suspended by resume") {
 
     test_tls = 1;
 
-    std::atomic<int> resume_flag {0};
+    std::atomic<int> resume_flag{0};
     tbb::task::suspend_point test_suspend_tag;
 
     std::vector<bypass_task, tbb::cache_aligned_allocator<bypass_task>> test_task_pool;
@@ -454,11 +482,15 @@ TEST_CASE("Bypass suspended by resume") {
 
     for (std::size_t i = 0; i < utils::get_platform_max_threads(); ++i) {
         std::size_t ticket = bypass_task::my_current_task++;
-        if (ticket < test_task_pool.size()) { tbb::detail::d1::spawn(test_task_pool[ticket], test_context); }
+        if (ticket < test_task_pool.size()) {
+            tbb::detail::d1::spawn(test_task_pool[ticket], test_context);
+        }
     }
 
     auto suspend_func = [&resume_flag, &test_suspend_tag] {
-        tbb::task::suspend([&resume_flag, &test_suspend_tag](tbb::task::suspend_point tag) {
+        auto thread_id = std::this_thread::get_id();
+        tbb::task::suspend([&resume_flag, &test_suspend_tag, thread_id] (tbb::task::suspend_point tag) {
+            CHECK(thread_id == std::this_thread::get_id());
             test_suspend_tag = tag;
             resume_flag = 1;
         });
@@ -476,7 +508,7 @@ TEST_CASE("Critical tasks + resume") {
     std::uint32_t task_number = 500 * static_cast<std::uint32_t>(utils::get_platform_max_threads());
 
     tbb::task_group_context test_context;
-    tbb::detail::d1::wait_context wait {0};
+    tbb::detail::d1::wait_context wait{ 0 };
 
     // The test expects at least one thread in test_arena
     int num_threads_in_test_arena = std::max(2, int(utils::get_platform_max_threads()));
@@ -485,7 +517,7 @@ TEST_CASE("Critical tasks + resume") {
 
     test_arena.initialize();
 
-    std::atomic<bool> resume_flag {}, resumed {};
+    std::atomic<bool> resume_flag{}, resumed{};
     tbb::task::suspend_point test_suspend_tag;
 
     auto task_body = [&resume_flag, &resumed, &test_suspend_tag] {
@@ -501,7 +533,9 @@ TEST_CASE("Critical tasks + resume") {
     using task_type = CountingTask<decltype(task_body)>;
     std::vector<task_type, tbb::cache_aligned_allocator<task_type>> test_tasks;
 
-    for (std::size_t i = 0; i < task_number; ++i) { test_tasks.emplace_back(task_body, wait); }
+    for (std::size_t i = 0; i < task_number; ++i) {
+        test_tasks.emplace_back(task_body, wait);
+    }
 
     wait.reserve(task_number / 2);
     for (std::size_t i = 0; i < task_number / 2; ++i) {
@@ -509,7 +543,9 @@ TEST_CASE("Critical tasks + resume") {
     }
 
     auto suspend_func = [&resume_flag, &test_suspend_tag] {
-        tbb::task::suspend([&resume_flag, &test_suspend_tag](tbb::task::suspend_point tag) {
+        auto thread_id = std::this_thread::get_id();
+        tbb::task::suspend([&resume_flag, &test_suspend_tag, thread_id] (tbb::task::suspend_point tag) {
+            CHECK(thread_id == std::this_thread::get_id());
             test_suspend_tag = tag;
             resume_flag.store(true, std::memory_order_release);
         });
@@ -521,22 +557,23 @@ TEST_CASE("Critical tasks + resume") {
     submit(suspend_task, test_arena, test_context, true);
 
     test_arena.execute([&wait, &test_tasks, &test_arena, &test_context, &resumed, task_number] {
-        tbb::this_task_arena::isolate(
-                [&wait, &test_tasks, &test_arena, &test_context, &resumed, task_number] {
-                    do {
-                        wait.reserve(task_number / 2);
-                        tbb::parallel_for(tbb::blocked_range<std::size_t>(task_number / 2, task_number),
-                                          [&test_tasks, &test_arena,
-                                           &test_context](tbb::blocked_range<std::size_t>& range) {
-                                              for (std::size_t i = range.begin(); i != range.end(); ++i) {
-                                                  submit(test_tasks[i], test_arena, test_context, true);
-                                              }
-                                          });
-                    } while (!resumed);
-                });
+        tbb::this_task_arena::isolate([&wait, &test_tasks, &test_arena, &test_context, &resumed, task_number] {
+            do {
+                wait.reserve(task_number / 2);
+                tbb::parallel_for(tbb::blocked_range<std::size_t>(task_number / 2, task_number),
+                    [&test_tasks, &test_arena, &test_context] (tbb::blocked_range<std::size_t>& range) {
+                        for (std::size_t i = range.begin(); i != range.end(); ++i) {
+                            submit(test_tasks[i], test_arena, test_context, true);
+                        }
+                    }
+                );
+            } while (!resumed);
+        });
     });
 
-    test_arena.execute([&wait, &test_context] { tbb::detail::d1::wait(wait, test_context); });
+    test_arena.execute([&wait, &test_context] {
+        tbb::detail::d1::wait(wait, test_context);
+    });
 }
 
 //! \brief \ref error_guessing
@@ -551,8 +588,9 @@ TEST_CASE("Stress testing") {
     test_arena.initialize();
 
     auto task_body = [] {
-        tbb::parallel_for(tbb::blocked_range<std::size_t>(0, 1000),
-                          [](tbb::blocked_range<std::size_t>&) { utils::doDummyWork(100); });
+        tbb::parallel_for(tbb::blocked_range<std::size_t>(0, 1000), [] (tbb::blocked_range<std::size_t>&) {
+            utils::doDummyWork(100);
+        });
     };
     using task_type = CountingTask<decltype(task_body)>;
 
@@ -560,27 +598,31 @@ TEST_CASE("Stress testing") {
 
     std::vector<task_type, tbb::cache_aligned_allocator<task_type>> test_tasks;
 
-    for (std::size_t j = 0; j < task_number; ++j) { test_tasks.emplace_back(task_body, wait); }
+    for (std::size_t j = 0; j < task_number; ++j) {
+        test_tasks.emplace_back(task_body, wait);
+    }
 
-    test_arena.execute(
-            [&test_tasks, &task_body, &wait, &test_context, &test_arena, iter_counter, task_number] {
-                for (std::size_t i = 0; i < iter_counter; ++i) {
+    test_arena.execute([&test_tasks, &task_body, &wait, &test_context, &test_arena, iter_counter, task_number] {
+        for (std::size_t i = 0; i < iter_counter; ++i) {
 
-                    for (std::size_t j = 0; j < task_number; ++j) { test_arena.enqueue(task_body); }
+            for (std::size_t j = 0; j < task_number; ++j) {
+                test_arena.enqueue(task_body);
+            }
 
-                    for (std::size_t j = 0; j < task_number / 2; ++j) {
-                        tbb::detail::d1::spawn(test_tasks[j], test_context);
-                    }
+            for (std::size_t j = 0; j < task_number / 2; ++j) {
+                tbb::detail::d1::spawn(test_tasks[j], test_context);
+            }
 
-                    for (std::size_t j = task_number / 2; j < task_number; ++j) {
-                        submit(test_tasks[j], test_arena, test_context, true);
-                    }
+            for (std::size_t j = task_number / 2; j < task_number; ++j) {
+                submit(test_tasks[j], test_arena, test_context, true);
+            }
+
+            tbb::detail::d1::wait(wait, test_context);
+            wait.reserve(task_number);
+        }
+        wait.release(task_number);
+    });
 
-                    tbb::detail::d1::wait(wait, test_context);
-                    wait.reserve(task_number);
-                }
-                wait.release(task_number);
-            });
 
     REQUIRE_MESSAGE(task_type::execute_counter() == task_number * iter_counter, "Some task was not executed");
     REQUIRE_MESSAGE(task_type::cancel_counter() == 0, "Some task was canceled");
@@ -596,23 +638,28 @@ TEST_CASE("All workers sleep") {
     utils::SpinBarrier barrier(thread_number);
     auto resumble_task = [&] {
         barrier.wait();
-        tbb::task::suspend([&](tbb::task::suspend_point sp) {
+        auto thread_id = std::this_thread::get_id();
+        tbb::task::suspend([&] (tbb::task::suspend_point sp) {
+            CHECK(thread_id == std::this_thread::get_id());
             suspend_points.push_back(sp);
             barrier.wait();
         });
     };
 
-    for (std::size_t i = 0; i < thread_number - 1; ++i) { test_gr.run(resumble_task); }
+    for (std::size_t i = 0; i < thread_number - 1; ++i) {
+        test_gr.run(resumble_task);
+    }
 
     barrier.wait();
     barrier.wait();
     TestCPUUserTime(thread_number);
 
-    for (auto sp : suspend_points) tbb::task::resume(sp);
+    for (auto sp : suspend_points)
+        tbb::task::resume(sp);
     test_gr.wait();
 }
 
-#endif// __TBB_RESUMABLE_TASKS
+#endif // __TBB_RESUMABLE_TASKS
 
 //! \brief \ref error_guessing
 TEST_CASE("Enqueue with exception") {
@@ -621,26 +668,32 @@ TEST_CASE("Enqueue with exception") {
     tbb::task_group_context test_context;
     tbb::detail::d1::wait_context wait(task_number);
 
-    tbb::task_arena test_arena {int(std::thread::hardware_concurrency() + 1)};
+    tbb::task_arena test_arena{int(std::thread::hardware_concurrency() + 1)};
 
     test_arena.initialize();
 
-    auto task_body = [] { utils::doDummyWork(100); };
+    auto task_body = [] {
+        utils::doDummyWork(100);
+    };
 
-    std::atomic<bool> end_flag {false};
-    auto check_body = [&end_flag] { end_flag.store(true, std::memory_order_relaxed); };
+    std::atomic<bool> end_flag{false};
+    auto check_body = [&end_flag] {
+        end_flag.store(true, std::memory_order_relaxed);
+    };
 
     using task_type = CountingTask<decltype(task_body)>;
     std::vector<task_type, tbb::cache_aligned_allocator<task_type>> test_tasks;
 
-    for (std::size_t j = 0; j < task_number; ++j) { test_tasks.emplace_back(task_body, wait); }
+    for (std::size_t j = 0; j < task_number; ++j) {
+        test_tasks.emplace_back(task_body, wait);
+    }
 
     {
         tbb::global_control gc(tbb::global_control::max_allowed_parallelism, 1);
         test_arena.enqueue(task_body);
         // Initialize implicit arena
-        tbb::parallel_for(0, 1, [](int) {});
-        tbb::task_arena test_arena2(tbb::task_arena::attach {});
+        tbb::parallel_for(0, 1, [] (int) {});
+        tbb::task_arena test_arena2(tbb::task_arena::attach{});
         test_arena2.enqueue(task_body);
     }
 
@@ -649,8 +702,7 @@ TEST_CASE("Enqueue with exception") {
         tbb::global_control gc(tbb::global_control::max_allowed_parallelism, 1);
         test_arena.enqueue(check_body);
 
-        while (!end_flag.load(std::memory_order_relaxed))
-            ;
+        while (!end_flag.load(std::memory_order_relaxed)) ;
 
         utils::Sleep(1);
         end_flag.store(false, std::memory_order_relaxed);
@@ -666,6 +718,7 @@ TEST_CASE("Enqueue with exception") {
     }
     wait.release(task_number);
 
+
     REQUIRE_MESSAGE(task_type::execute_counter() == task_number * iter_count, "Some task was not executed");
     REQUIRE_MESSAGE(task_type::cancel_counter() == 0, "Some task was canceled");
 }
@@ -673,16 +726,19 @@ TEST_CASE("Enqueue with exception") {
 struct resubmitting_task : public tbb::detail::d1::task {
     tbb::task_arena& my_arena;
     tbb::task_group_context& my_ctx;
-    std::atomic<int> counter {100000};
+    std::atomic<int> counter{100000};
 
-    resubmitting_task(tbb::task_arena& arena, tbb::task_group_context& ctx) : my_arena(arena), my_ctx(ctx) {}
+    resubmitting_task(tbb::task_arena& arena, tbb::task_group_context& ctx) : my_arena(arena), my_ctx(ctx)
+    {}
 
-    tbb::detail::d1::task* execute(tbb::detail::d1::execution_data&) override {
-        if (counter-- > 0) { submit(*this, my_arena, my_ctx, true); }
+    tbb::detail::d1::task* execute(tbb::detail::d1::execution_data& ) override {
+        if (counter-- > 0) {
+            submit(*this, my_arena, my_ctx, true);
+        }
         return nullptr;
     }
 
-    tbb::detail::d1::task* cancel(tbb::detail::d1::execution_data&) override {
+    tbb::detail::d1::task* cancel( tbb::detail::d1::execution_data& ) override {
         FAIL("The function should never be called.");
         return nullptr;
     }
@@ -700,22 +756,25 @@ TEST_CASE("Test with priority inversion") {
     utils::pinning_observer obsr(test_arena);
     CHECK_MESSAGE(obsr.is_observing(), "Arena observer has not been activated");
 
-    std::uint32_t critical_task_counter = 1000 * thread_number;
-    std::atomic<std::size_t> task_counter {0};
+    std::uint32_t  critical_task_counter = 1000 * thread_number;
+    std::atomic<std::size_t> task_counter{0};
 
     tbb::task_group_context test_context;
     tbb::detail::d1::wait_context wait(critical_task_counter);
 
-    auto critical_work = [&] { utils::doDummyWork(10); };
+    auto critical_work = [&] {
+        utils::doDummyWork(10);
+    };
 
     using suspend_task_type = CountingTask<decltype(critical_work)>;
     suspend_task_type critical_task(critical_work, wait);
 
     auto high_priority_thread_func = [&] {
         // Increase external threads priority
-        utils::increase_thread_priority();
+        utils::increased_priority_guard guard{};
+        utils::suppress_unused_warning(guard);
         // pin external threads
-        test_arena.execute([] {});
+        test_arena.execute([]{});
         while (task_counter++ < critical_task_counter) {
             submit(critical_task, test_arena, test_context, true);
             std::this_thread::sleep_for(std::chrono::milliseconds(1));
@@ -727,7 +786,7 @@ TEST_CASE("Test with priority inversion") {
     // take first core on execute
     utils::SpinBarrier barrier(thread_number + 1);
     test_arena.execute([&] {
-        tbb::parallel_for(std::uint32_t(0), thread_number + 1, [&](std::uint32_t&) {
+        tbb::parallel_for(std::uint32_t(0), thread_number + 1, [&] (std::uint32_t) {
             barrier.wait();
             submit(worker_task, test_arena, test_context, true);
         });
@@ -738,7 +797,8 @@ TEST_CASE("Test with priority inversion") {
         high_priority_threads.emplace_back(high_priority_thread_func);
     }
 
-    utils::increase_thread_priority();
+    utils::increased_priority_guard guard{};
+    utils::suppress_unused_warning(guard);
     while (task_counter++ < critical_task_counter) {
         submit(critical_task, test_arena, test_context, true);
         std::this_thread::sleep_for(std::chrono::milliseconds(1));
@@ -746,15 +806,16 @@ TEST_CASE("Test with priority inversion") {
 
     tbb::detail::d1::wait(wait, test_context);
 
-    for (std::size_t i = 0; i < thread_number - 1; ++i) { high_priority_threads[i].join(); }
-    obsr.observe(false);
+    for (std::size_t i = 0; i < thread_number - 1; ++i) {
+        high_priority_threads[i].join();
+    }
 }
 
 // Explicit test for raii_guard move ctor because of copy elision optimization
 // TODO: consider better test file for the test case
 //! \brief \ref interface
 TEST_CASE("raii_guard move ctor") {
-    int count {0};
+    int count{0};
     auto func = [&count] {
         count++;
         CHECK(count == 1);
@@ -763,3 +824,81 @@ TEST_CASE("raii_guard move ctor") {
     tbb::detail::d0::raii_guard<decltype(func)> guard1(func);
     tbb::detail::d0::raii_guard<decltype(func)> guard2(std::move(guard1));
 }
+
+//! \brief \ref error_guessing
+TEST_CASE("Check correct arena destruction with enqueue") {
+    for (int i = 0; i < 100; ++i) {
+        tbb::task_scheduler_handle handle{ tbb::attach{} };
+        {
+            tbb::task_arena a(2, 0);
+
+            a.enqueue([] {
+                tbb::parallel_for(0, 100, [] (int) { std::this_thread::sleep_for(std::chrono::nanoseconds(10)); });
+            });
+            std::this_thread::sleep_for(std::chrono::microseconds(1));
+        }
+        tbb::finalize(handle, std::nothrow_t{});
+    }
+}
+
+//! \brief \ref regression
+TEST_CASE("Try to force Leaked proxy observers warning") {
+    int num_threads = std::thread::hardware_concurrency() * 2;
+    tbb::global_control gc(tbb::global_control::max_allowed_parallelism, num_threads);
+    tbb::task_arena arena(num_threads, 0);
+    std::deque<tbb::task_scheduler_observer> observers;
+    for (int i = 0; i < 1000; ++i) {
+        observers.emplace_back(arena);
+    }
+
+    for (auto& observer : observers) {
+        observer.observe(true);
+    }
+
+    arena.enqueue([] {
+        tbb::parallel_for(0, 100000, [] (int) {
+            utils::doDummyWork(1000);
+        });
+    });
+}
+
+//! \brief \ref error_guessing
+TEST_CASE("Force thread limit on per-thread reference_vertex") {
+    int num_threads = std::thread::hardware_concurrency();
+    int num_groups = 1000;
+
+    // Force thread limit on per-thread reference_vertex
+    std::vector<tbb::task_group> groups(num_groups);
+    tbb::parallel_for(0, num_threads, [&] (int) {
+        std::vector<tbb::task_group> local_groups(num_groups);
+        for (int i = 0; i < num_groups; ++i) {
+            groups[i].run([] {});
+            local_groups[i].run([] {});
+            local_groups[i].wait();
+        }
+    }, tbb::static_partitioner{});
+
+    // Enforce extra reference on each task_group
+    std::deque<tbb::task_handle> handles{};
+    for (int i = 0; i < num_groups; ++i) {
+        handles.emplace_back(groups[i].defer([] {}));
+    }
+
+    // Check correctness of the execution
+    tbb::task_group group;
+
+    std::atomic<int> final_sum{};
+    for (int i = 0; i < num_groups; ++i) {
+        group.run([&] { ++final_sum; });
+    }
+    group.wait();
+    REQUIRE_MESSAGE(final_sum == num_groups, "Some tasks were not executed");
+
+    for (int i = 0; i < num_groups; ++i) {
+        groups[i].run(std::move(handles[i]));
+    }
+
+    for (int i = 0; i < num_groups; ++i) {
+        groups[i].wait();
+    }
+}
diff --git a/external/tbb/test/tbb/test_task_arena.cpp b/external/tbb/test/tbb/test_task_arena.cpp
index fdfecfef..6bd93d4c 100644
--- a/external/tbb/test/tbb/test_task_arena.cpp
+++ b/external/tbb/test/tbb/test_task_arena.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -18,22 +18,24 @@
 
 #define __TBB_EXTRA_DEBUG 1
 #include "common/concurrency_tracker.h"
+#include "common/cpu_usertime.h"
 #include "common/spin_barrier.h"
 #include "common/utils.h"
-#include "common/utils_concurrency_limit.h"
 #include "common/utils_report.h"
+#include "common/utils_concurrency_limit.h"
 
-#include "tbb/concurrent_set.h"
+#include "tbb/task_arena.h"
+#include "tbb/task_scheduler_observer.h"
 #include "tbb/enumerable_thread_specific.h"
-#include "tbb/global_control.h"
 #include "tbb/parallel_for.h"
+#include "tbb/global_control.h"
+#include "tbb/concurrent_set.h"
 #include "tbb/spin_mutex.h"
 #include "tbb/spin_rw_mutex.h"
-#include "tbb/task_arena.h"
 #include "tbb/task_group.h"
-#include "tbb/task_scheduler_observer.h"
 
 #include <atomic>
+#include <condition_variable>
 #include <cstdio>
 #include <cstdlib>
 #include <stdexcept>
@@ -48,15 +50,15 @@
 //--------------------------------------------------//
 // Test that task_arena::initialize and task_arena::terminate work when doing nothing else.
 /* maxthread is treated as the biggest possible concurrency level. */
-void InitializeAndTerminate(int maxthread) {
-    for (int i = 0; i < 200; ++i) {
-        switch (i & 3) {
+void InitializeAndTerminate( int maxthread ) {
+    for( int i=0; i<200; ++i ) {
+        switch( i&3 ) {
             // Arena is created inactive, initialization is always explicit. Lazy initialization is covered by other test functions.
             // Explicit initialization can either keep the original values or change those.
             // Arena termination can be explicit or implicit (in the destructor).
             // TODO: extend with concurrency level checks if such a method is added.
             default: {
-                tbb::task_arena arena(std::rand() % maxthread + 1);
+                tbb::task_arena arena( std::rand() % maxthread + 1 );
                 CHECK_MESSAGE(!arena.is_active(), "arena should not be active until initialized");
                 arena.initialize();
                 CHECK(arena.is_active());
@@ -65,14 +67,14 @@ void InitializeAndTerminate(int maxthread) {
                 break;
             }
             case 0: {
-                tbb::task_arena arena(1);
+                tbb::task_arena arena( 1 );
                 CHECK_MESSAGE(!arena.is_active(), "arena should not be active until initialized");
-                arena.initialize(std::rand() % maxthread + 1);// change the parameters
+                arena.initialize( std::rand() % maxthread + 1 ); // change the parameters
                 CHECK(arena.is_active());
                 break;
             }
             case 1: {
-                tbb::task_arena arena(tbb::task_arena::automatic);
+                tbb::task_arena arena( tbb::task_arena::automatic );
                 CHECK(!arena.is_active());
                 arena.initialize();
                 CHECK(arena.is_active());
@@ -81,7 +83,7 @@ void InitializeAndTerminate(int maxthread) {
             case 2: {
                 tbb::task_arena arena;
                 CHECK_MESSAGE(!arena.is_active(), "arena should not be active until initialized");
-                arena.initialize(std::rand() % maxthread + 1);
+                arena.initialize( std::rand() % maxthread + 1 );
                 CHECK(arena.is_active());
                 arena.terminate();
                 CHECK_MESSAGE(!arena.is_active(), "arena should not be active; it was terminated");
@@ -106,55 +108,60 @@ void ResetTLS() {
 }
 
 class ArenaObserver : public tbb::task_scheduler_observer {
-    int myId;              // unique observer/arena id within a test
-    int myMaxConcurrency;  // concurrency of the associated arena
-    int myNumReservedSlots;// reserved slots in the associated arena
-    void on_scheduler_entry(bool is_worker) override {
+    int myId;               // unique observer/arena id within a test
+    int myMaxConcurrency;   // concurrency of the associated arena
+    int myNumReservedSlots; // reserved slots in the associated arena
+    void on_scheduler_entry( bool is_worker ) override {
         int current_index = tbb::this_task_arena::current_thread_index();
         CHECK(current_index < (myMaxConcurrency > 1 ? myMaxConcurrency : 2));
-        if (is_worker) { CHECK(current_index >= myNumReservedSlots); }
+        if (is_worker) {
+            CHECK(current_index >= myNumReservedSlots);
+        }
         CHECK_MESSAGE(!old_id.local(), "double call to on_scheduler_entry");
         old_id.local() = local_id.local();
         CHECK_MESSAGE(old_id.local() != myId, "double entry to the same arena");
         local_id.local() = myId;
         slot_id.local() = current_index;
     }
-    void on_scheduler_exit(bool /*is_worker*/) override {
+    void on_scheduler_exit( bool /*is_worker*/ ) override {
         CHECK_MESSAGE(local_id.local() == myId, "nesting of arenas is broken");
         CHECK(slot_id.local() == tbb::this_task_arena::current_thread_index());
         slot_id.local() = -2;
         local_id.local() = old_id.local();
         old_id.local() = 0;
     }
-
 public:
-    ArenaObserver(tbb::task_arena& a, int maxConcurrency, int numReservedSlots, int id)
-        : tbb::task_scheduler_observer(a), myId(id), myMaxConcurrency(maxConcurrency),
-          myNumReservedSlots(numReservedSlots) {
+    ArenaObserver(tbb::task_arena &a, int maxConcurrency, int numReservedSlots, int id)
+        : tbb::task_scheduler_observer(a)
+        , myId(id)
+        , myMaxConcurrency(maxConcurrency)
+        , myNumReservedSlots(numReservedSlots) {
         CHECK(myId);
         observe(true);
     }
-    ~ArenaObserver() { CHECK_MESSAGE(!old_id.local(), "inconsistent observer state"); }
+    ~ArenaObserver () {
+        observe(false);
+        CHECK_MESSAGE(!old_id.local(), "inconsistent observer state");
+    }
 };
 
-struct IndexTrackingBody {// Must be used together with ArenaObserver
-    void operator()(const Range&) const {
+struct IndexTrackingBody { // Must be used together with ArenaObserver
+    void operator() ( const Range& ) const {
         CHECK(slot_id.local() == tbb::this_task_arena::current_thread_index());
         utils::doDummyWork(50000);
     }
 };
 
 struct AsynchronousWork {
-    utils::SpinBarrier& my_barrier;
+    utils::SpinBarrier &my_barrier;
     bool my_is_blocking;
-    AsynchronousWork(utils::SpinBarrier& a_barrier, bool blocking = true)
-        : my_barrier(a_barrier), my_is_blocking(blocking) {}
+    AsynchronousWork(utils::SpinBarrier &a_barrier, bool blocking = true)
+    : my_barrier(a_barrier), my_is_blocking(blocking) {}
     void operator()() const {
         CHECK_MESSAGE(local_id.local() != 0, "not in explicit arena");
-        tbb::parallel_for(Range(0, 500), IndexTrackingBody(), tbb::simple_partitioner());
-        if (my_is_blocking) my_barrier.wait();// must be asynchronous to an external thread
-        else
-            my_barrier.signalNoWait();
+        tbb::parallel_for(Range(0,500), IndexTrackingBody(), tbb::simple_partitioner());
+        if(my_is_blocking) my_barrier.wait(); // must be asynchronous to an external thread
+        else my_barrier.signalNoWait();
     }
 };
 
@@ -167,16 +174,21 @@ void TestConcurrentArenasFunc(int idx) {
     // check that arena observer can be activated before local observer
     struct LocalObserver : public tbb::task_scheduler_observer {
         LocalObserver() : tbb::task_scheduler_observer() { observe(true); }
-        LocalObserver(tbb::task_arena& a) : tbb::task_scheduler_observer(a) { observe(true); }
+        LocalObserver(tbb::task_arena& a) : tbb::task_scheduler_observer(a) {
+            observe(true);
+        }
+        ~LocalObserver() {
+            observe(false);
+        }
     };
 
     tbb::task_arena a1;
-    a1.initialize(1, 0);
-    ArenaObserver o1(a1, 1, 0, idx * 2 + 1);// the last argument is a "unique" observer/arena id for the test
+    a1.initialize(1,0);
+    ArenaObserver o1(a1, 1, 0, idx*2+1); // the last argument is a "unique" observer/arena id for the test
     CHECK_MESSAGE(o1.is_observing(), "Arena observer has not been activated");
 
-    tbb::task_arena a2(2, 1);
-    ArenaObserver o2(a2, 2, 1, idx * 2 + 2);
+    tbb::task_arena a2(2,1);
+    ArenaObserver o2(a2, 2, 1, idx*2+2);
     CHECK_MESSAGE(o2.is_observing(), "Arena observer has not been activated");
 
     LocalObserver lo1;
@@ -189,13 +201,15 @@ void TestConcurrentArenasFunc(int idx) {
     utils::SpinBarrier barrier(2);
     AsynchronousWork work(barrier);
 
-    a1.enqueue(work);// put async work
+    a1.enqueue(work); // put async work
     barrier.wait();
 
-    a2.enqueue(work);// another work
+    a2.enqueue(work); // another work
     a2.execute(work);
 
-    a3.execute([] { utils::doDummyWork(100); });
+    a3.execute([] {
+        utils::doDummyWork(100);
+    });
 
     a1.debug_wait_until_empty();
     a2.debug_wait_until_empty();
@@ -204,16 +218,15 @@ void TestConcurrentArenasFunc(int idx) {
 void TestConcurrentArenas(int p) {
     // TODO REVAMP fix with global control
     ResetTLS();
-    utils::NativeParallelFor(p, &TestConcurrentArenasFunc);
+    utils::NativeParallelFor( p, &TestConcurrentArenasFunc );
 }
 //--------------------------------------------------//
 // Test multiple application threads working with a single arena at the same time.
 class MultipleMastersPart1 : utils::NoAssign {
-    tbb::task_arena& my_a;
+    tbb::task_arena &my_a;
     utils::SpinBarrier &my_b1, &my_b2;
-
 public:
-    MultipleMastersPart1(tbb::task_arena& a, utils::SpinBarrier& b1, utils::SpinBarrier& b2)
+    MultipleMastersPart1( tbb::task_arena &a, utils::SpinBarrier &b1, utils::SpinBarrier &b2)
         : my_a(a), my_b1(b1), my_b2(b2) {}
     void operator()(int) const {
         my_a.execute(AsynchronousWork(my_b2, /*blocking=*/false));
@@ -224,17 +237,18 @@ class MultipleMastersPart1 : utils::NoAssign {
 };
 
 class MultipleMastersPart2 : utils::NoAssign {
-    tbb::task_arena& my_a;
-    utils::SpinBarrier& my_b;
-
+    tbb::task_arena &my_a;
+    utils::SpinBarrier &my_b;
 public:
-    MultipleMastersPart2(tbb::task_arena& a, utils::SpinBarrier& b) : my_a(a), my_b(b) {}
-    void operator()(int) const { my_a.execute(AsynchronousWork(my_b, /*blocking=*/false)); }
+    MultipleMastersPart2( tbb::task_arena &a, utils::SpinBarrier &b) : my_a(a), my_b(b) {}
+    void operator()(int) const {
+        my_a.execute(AsynchronousWork(my_b, /*blocking=*/false));
+    }
 };
 
 class MultipleMastersPart3 : utils::NoAssign {
-    tbb::task_arena& my_a;
-    utils::SpinBarrier& my_b;
+    tbb::task_arena &my_a;
+    utils::SpinBarrier &my_b;
     using wait_context = tbb::detail::d1::wait_context;
 
     struct Runner : NoAssign {
@@ -256,11 +270,12 @@ class MultipleMastersPart3 : utils::NoAssign {
     };
 
 public:
-    MultipleMastersPart3(tbb::task_arena& a, utils::SpinBarrier& b) : my_a(a), my_b(b) {}
+    MultipleMastersPart3(tbb::task_arena &a, utils::SpinBarrier &b)
+        : my_a(a), my_b(b) {}
     void operator()(int) const {
         wait_context wait(0);
-        my_b.wait();// increases chances for task_arena initialization contention
-        for (int i = 0; i < 100; ++i) {
+        my_b.wait(); // increases chances for task_arena initialization contention
+        for( int i=0; i<100; ++i) {
             wait.reserve();
             my_a.enqueue(Runner(wait));
             my_a.execute(Waiter(wait));
@@ -272,117 +287,116 @@ class MultipleMastersPart3 : utils::NoAssign {
 void TestMultipleMasters(int p) {
     {
         ResetTLS();
-        tbb::task_arena a(1, 0);
+        tbb::task_arena a(1,0);
         a.initialize();
         ArenaObserver o(a, 1, 0, 1);
-        utils::SpinBarrier barrier1(p),
-                barrier2(2 * p + 1);// each of p threads will submit two tasks signaling the barrier
-        NativeParallelFor(p, MultipleMastersPart1(a, barrier1, barrier2));
+        utils::SpinBarrier barrier1(p), barrier2(2*p+1); // each of p threads will submit two tasks signaling the barrier
+        NativeParallelFor( p, MultipleMastersPart1(a, barrier1, barrier2) );
         barrier2.wait();
         a.debug_wait_until_empty();
-    }
-    {
+    } {
         ResetTLS();
-        tbb::task_arena a(2, 1);
+        tbb::task_arena a(2,1);
         ArenaObserver o(a, 2, 1, 2);
-        utils::SpinBarrier barrier(p + 2);
-        a.enqueue(AsynchronousWork(barrier,
-                                   /*blocking=*/true));// occupy the worker, a regression test for bug 1981
+        utils::SpinBarrier barrier(p+2);
+        a.enqueue(AsynchronousWork(barrier, /*blocking=*/true)); // occupy the worker, a regression test for bug 1981
         // TODO: buggy test. A worker threads need time to occupy the slot to prevent an external thread from taking an enqueue task.
         utils::Sleep(10);
-        NativeParallelFor(p, MultipleMastersPart2(a, barrier));
+        NativeParallelFor( p, MultipleMastersPart2(a, barrier) );
         barrier.wait();
         a.debug_wait_until_empty();
-    }
-    {
+    } {
         // Regression test for the bug 1981 part 2 (task_arena::execute() with wait_for_all for an enqueued task)
-        tbb::task_arena a(p, 1);
-        utils::SpinBarrier barrier(p
-                                   + 1);// for external threads to avoid endless waiting at least in some runs
+        tbb::task_arena a(p,1);
+        utils::SpinBarrier barrier(p+1); // for external threads to avoid endless waiting at least in some runs
         // "Oversubscribe" the arena by 1 external thread
-        NativeParallelFor(p + 1, MultipleMastersPart3(a, barrier));
+        NativeParallelFor( p+1, MultipleMastersPart3(a, barrier) );
         a.debug_wait_until_empty();
     }
 }
 
 //--------------------------------------------------//
 // TODO: explain what TestArenaEntryConsistency does
-#include "common/fp_control.h"
-#include "oneapi/tbb/detail/_exception.h"
 #include <sstream>
 #include <stdexcept>
+#include "oneapi/tbb/detail/_exception.h"
+#include "common/fp_control.h"
 
 struct TestArenaEntryBody : FPModeContext {
-    std::atomic<int>& my_stage;// each execute increases it
+    std::atomic<int> &my_stage; // each execute increases it
     std::stringstream my_id;
     bool is_caught, is_expected;
     enum { arenaFPMode = 1 };
 
-    TestArenaEntryBody(std::atomic<int>& s, int idx, int i)// init thread-specific instance
-        : FPModeContext(idx + i), my_stage(s), is_caught(false)
+    TestArenaEntryBody(std::atomic<int> &s, int idx, int i)  // init thread-specific instance
+    :   FPModeContext(idx+i)
+    ,   my_stage(s)
+    ,   is_caught(false)
 #if TBB_USE_EXCEPTIONS
-          ,
-          is_expected((idx & (1 << i)) != 0)
+    ,   is_expected( (idx&(1<<i)) != 0 )
 #else
-          ,
-          is_expected(false)
+    , is_expected(false)
 #endif
     {
         my_id << idx << ':' << i << '@';
     }
-    void operator()() {// inside task_arena::execute()
+    void operator()() { // inside task_arena::execute()
         // synchronize with other stages
         int stage = my_stage++;
         int slot = tbb::this_task_arena::current_thread_index();
         CHECK(slot >= 0);
         CHECK(slot <= 1);
         // wait until the third stage is delegated and then starts on slot 0
-        while (my_stage < 2 + slot) utils::yield();
+        while(my_stage < 2+slot) utils::yield();
         // deduct its entry type and put it into id, it helps to find source of a problem
-        my_id << (stage < 3 ? (tbb::this_task_arena::current_thread_index()
-                                       ? "delegated_to_worker"
-                                       : stage < 2 ? "direct" : "delegated_to_master")
-                            : stage == 3 ? "nested_same_ctx" : "nested_alien_ctx");
+        my_id << (stage < 3 ? (tbb::this_task_arena::current_thread_index()?
+                              "delegated_to_worker" : stage < 2? "direct" : "delegated_to_master")
+                            : stage == 3? "nested_same_ctx" : "nested_alien_ctx");
         AssertFPMode(arenaFPMode);
-        if (is_expected) { TBB_TEST_THROW(std::logic_error(my_id.str())); }
+        if (is_expected) {
+            TBB_TEST_THROW(std::logic_error(my_id.str()));
+        }
         // no code can be put here since exceptions can be thrown
     }
-    void on_exception(const char* e) {// outside arena, in catch block
+    void on_exception(const char *e) { // outside arena, in catch block
         is_caught = true;
         CHECK(my_id.str() == e);
         assertFPMode();
     }
-    void after_execute() {// outside arena and catch block
+    void after_execute() { // outside arena and catch block
         CHECK(is_caught == is_expected);
         assertFPMode();
     }
 };
 
 class ForEachArenaEntryBody : utils::NoAssign {
-    tbb::task_arena& my_a;     // expected task_arena(2,1)
-    std::atomic<int>& my_stage;// each execute increases it
+    tbb::task_arena &my_a; // expected task_arena(2,1)
+    std::atomic<int> &my_stage; // each execute increases it
     int my_idx;
 
 public:
-    ForEachArenaEntryBody(tbb::task_arena& a, std::atomic<int>& c) : my_a(a), my_stage(c), my_idx(0) {}
+    ForEachArenaEntryBody(tbb::task_arena &a, std::atomic<int> &c)
+    : my_a(a), my_stage(c), my_idx(0) {}
 
     void test(int idx) {
         my_idx = idx;
         my_stage = 0;
-        NativeParallelFor(3, *this);// test cross-arena calls
+        NativeParallelFor(3, *this); // test cross-arena calls
         CHECK(my_stage == 3);
-        my_a.execute(*this);// test nested calls
+        my_a.execute(*this); // test nested calls
         CHECK(my_stage == 5);
     }
 
     // task_arena functor for nested tests
     void operator()() const {
-        test_arena_entry(3);           // in current task group context
-        tbb::parallel_for(4, 5, *this);// in different context
+        test_arena_entry(3); // in current task group context
+        tbb::parallel_for(4, 5, *this); // in different context
     }
 
     // NativeParallelFor & parallel_for functor
-    void operator()(int i) const { test_arena_entry(i); }
+    void operator()(int i) const {
+        test_arena_entry(i);
+    }
 
 private:
     void test_arena_entry(int i) const {
@@ -392,9 +406,9 @@ class ForEachArenaEntryBody : utils::NoAssign {
 #if TBB_USE_EXCEPTIONS
         try {
             my_a.execute(scoped_functor);
-        } catch (std::logic_error& e) { scoped_functor.on_exception(e.what()); } catch (...) {
-            CHECK_MESSAGE(false, "Unexpected exception type");
-        }
+        } catch(std::logic_error &e) {
+            scoped_functor.on_exception(e.what());
+        } catch(...) { CHECK_MESSAGE(false, "Unexpected exception type"); }
 #else
         my_a.execute(scoped_functor);
 #endif
@@ -408,93 +422,87 @@ void TestArenaEntryConsistency() {
     ForEachArenaEntryBody body(a, c);
 
     FPModeContext fp_scope(TestArenaEntryBody::arenaFPMode);
-    a.initialize();// capture FP settings to arena
+    a.initialize(); // capture FP settings to arena
     fp_scope.setNextFPMode();
 
-    for (int i = 0; i < 100; i++)// not less than 32 = 2^5 of entry types
+    for (int i = 0; i < 100; i++) // not less than 32 = 2^5 of entry types
         body.test(i);
 }
 //--------------------------------------------------
 // Test that the requested degree of concurrency for task_arena is achieved in various conditions
 class TestArenaConcurrencyBody : utils::NoAssign {
-    tbb::task_arena& my_a;
+    tbb::task_arena &my_a;
     int my_max_concurrency;
     int my_reserved_slots;
-    utils::SpinBarrier* my_barrier;
-    utils::SpinBarrier* my_worker_barrier;
-
+    utils::SpinBarrier *my_barrier;
+    utils::SpinBarrier *my_worker_barrier;
 public:
-    TestArenaConcurrencyBody(tbb::task_arena& a, int max_concurrency, int reserved_slots,
-                             utils::SpinBarrier* b = NULL, utils::SpinBarrier* wb = NULL)
-        : my_a(a), my_max_concurrency(max_concurrency), my_reserved_slots(reserved_slots), my_barrier(b),
-          my_worker_barrier(wb) {}
+    TestArenaConcurrencyBody( tbb::task_arena &a, int max_concurrency, int reserved_slots, utils::SpinBarrier *b = nullptr, utils::SpinBarrier *wb = nullptr )
+    : my_a(a), my_max_concurrency(max_concurrency), my_reserved_slots(reserved_slots), my_barrier(b), my_worker_barrier(wb) {}
     // NativeParallelFor's functor
-    void operator()(int) const {
-        CHECK_MESSAGE(local_id.local() == 0, "TLS was not cleaned?");
+    void operator()( int ) const {
+        CHECK_MESSAGE( local_id.local() == 0, "TLS was not cleaned?" );
         local_id.local() = 1;
-        my_a.execute(*this);
+        my_a.execute( *this );
     }
     // Arena's functor
     void operator()() const {
         int idx = tbb::this_task_arena::current_thread_index();
-        CHECK(idx < (my_max_concurrency > 1 ? my_max_concurrency : 2));
-        CHECK(my_a.max_concurrency() == tbb::this_task_arena::max_concurrency());
+        REQUIRE( idx < (my_max_concurrency > 1 ? my_max_concurrency : 2) );
+        REQUIRE( my_a.max_concurrency() == tbb::this_task_arena::max_concurrency() );
         int max_arena_concurrency = tbb::this_task_arena::max_concurrency();
-        CHECK(max_arena_concurrency == my_max_concurrency);
-        if (my_worker_barrier) {
-            if (local_id.local() == 1) {
+        REQUIRE( max_arena_concurrency == my_max_concurrency );
+        if ( my_worker_barrier ) {
+            if ( local_id.local() == 1 ) {
                 // External thread in a reserved slot
-                CHECK_MESSAGE(idx < my_reserved_slots,
-                              "External threads are supposed to use only reserved slots in this test");
+                CHECK_MESSAGE( idx < my_reserved_slots, "External threads are supposed to use only reserved slots in this test" );
             } else {
                 // Worker thread
-                CHECK(idx >= my_reserved_slots);
+                CHECK( idx >= my_reserved_slots );
                 my_worker_barrier->wait();
             }
-        } else if (my_barrier)
-            CHECK_MESSAGE(local_id.local() == 1, "Workers are not supposed to enter the arena in this test");
-        if (my_barrier) my_barrier->wait();
-        else
-            utils::Sleep(1);
+        } else if ( my_barrier )
+            CHECK_MESSAGE( local_id.local() == 1, "Workers are not supposed to enter the arena in this test" );
+        if ( my_barrier ) my_barrier->wait();
+        else utils::Sleep( 1 );
     }
 };
 
-void TestArenaConcurrency(int p, int reserved = 0, int step = 1) {
+void TestArenaConcurrency( int p, int reserved = 0, int step = 1) {
     for (; reserved <= p; reserved += step) {
-        tbb::task_arena a(p, reserved);
+        tbb::task_arena a( p, reserved );
         if (p - reserved < tbb::this_task_arena::max_concurrency()) {
             // Check concurrency with worker & reserved external threads.
             ResetTLS();
-            utils::SpinBarrier b(p);
-            utils::SpinBarrier wb(p - reserved);
-            TestArenaConcurrencyBody test(a, p, reserved, &b, &wb);
-            for (int i = reserved; i < p; ++i)// requests p-reserved worker threads
-                a.enqueue(test);
-            if (reserved == 1) test(0);// calls execute()
+            utils::SpinBarrier b( p );
+            utils::SpinBarrier wb( p-reserved );
+            TestArenaConcurrencyBody test( a, p, reserved, &b, &wb );
+            for ( int i = reserved; i < p; ++i ) // requests p-reserved worker threads
+                a.enqueue( test );
+            if ( reserved==1 )
+                test( 0 ); // calls execute()
             else
-                utils::NativeParallelFor(reserved, test);
+                utils::NativeParallelFor( reserved, test );
             a.debug_wait_until_empty();
-        }
-        {// Check if multiple external threads alone can achieve maximum concurrency.
+        } { // Check if multiple external threads alone can achieve maximum concurrency.
             ResetTLS();
-            utils::SpinBarrier b(p);
-            utils::NativeParallelFor(p, TestArenaConcurrencyBody(a, p, reserved, &b));
+            utils::SpinBarrier b( p );
+            utils::NativeParallelFor( p, TestArenaConcurrencyBody( a, p, reserved, &b ) );
             a.debug_wait_until_empty();
-        }
-        {// Check oversubscription by external threads.
+        } { // Check oversubscription by external threads.
 #if !_WIN32 || !_WIN64
             // Some C++ implementations allocate 8MB stacks for std::thread on 32 bit platforms
             // that makes impossible to create more than ~500 threads.
-            if (!(sizeof(std::size_t) == 4 && p > 200))
+            if ( !(sizeof(std::size_t) == 4 && p > 200) )
 #endif
 #if TBB_TEST_LOW_WORKLOAD
-                if (p <= 16)
+            if ( p <= 16 )
 #endif
-                {
-                    ResetTLS();
-                    utils::NativeParallelFor(2 * p, TestArenaConcurrencyBody(a, p, reserved));
-                    a.debug_wait_until_empty();
-                }
+            {
+                ResetTLS();
+                utils::NativeParallelFor(2 * p, TestArenaConcurrencyBody(a, p, reserved));
+                a.debug_wait_until_empty();
+            }
         }
     }
 }
@@ -506,8 +514,13 @@ struct TestMandatoryConcurrencyObserver : public tbb::task_scheduler_observer {
         : tbb::task_scheduler_observer(a), m_barrier(barrier) {
         observe(true);
     }
+    ~TestMandatoryConcurrencyObserver() {
+        observe(false);
+    }
     void on_scheduler_exit(bool worker) override {
-        if (worker) { m_barrier.wait(); }
+        if (worker) {
+            m_barrier.wait();
+        }
     }
 };
 
@@ -519,7 +532,7 @@ void TestMandatoryConcurrency() {
         TestMandatoryConcurrencyObserver observer(a, exit_barrier);
         for (int j = 0; j < 5; ++j) {
             utils::ExactConcurrencyLevel::check(1);
-            std::atomic<int> num_tasks {0}, curr_tasks {0};
+            std::atomic<int> num_tasks{ 0 }, curr_tasks{ 0 };
             utils::SpinBarrier barrier(n_threads);
             utils::NativeParallelFor(n_threads, [&](int) {
                 for (int i = 0; i < 5; ++i) {
@@ -537,9 +550,10 @@ void TestMandatoryConcurrency() {
                     barrier.wait();
                 }
             });
-            do { exit_barrier.wait(); } while (num_tasks < n_threads * 5);
+            do {
+                exit_barrier.wait();
+            } while (num_tasks < n_threads * 5);
         }
-        observer.observe(false);
     });
 }
 
@@ -560,8 +574,10 @@ void TestConcurrentFunctionality(int min_thread_num = 1, int max_thread_num = 3)
 struct TaskArenaValidator {
     int my_slot_at_construction;
     const tbb::task_arena& my_arena;
-    TaskArenaValidator(const tbb::task_arena& other)
-        : my_slot_at_construction(tbb::this_task_arena::current_thread_index()), my_arena(other) {}
+    TaskArenaValidator( const tbb::task_arena& other )
+        : my_slot_at_construction(tbb::this_task_arena::current_thread_index())
+        , my_arena(other)
+    {}
     // Inspect the internal state
     int concurrency() { return my_arena.debug_max_concurrency(); }
     int reserved_for_masters() { return my_arena.debug_reserved_slots(); }
@@ -569,23 +585,23 @@ struct TaskArenaValidator {
     // This method should be called in task_arena::execute() for a captured arena
     // by the same thread that created the validator.
     void operator()() {
-        CHECK_MESSAGE(tbb::this_task_arena::current_thread_index() == my_slot_at_construction,
-                      "Current thread index has changed since the validator construction");
+        CHECK_MESSAGE( tbb::this_task_arena::current_thread_index()==my_slot_at_construction,
+                "Current thread index has changed since the validator construction" );
     }
 };
 
-void ValidateAttachedArena(tbb::task_arena& arena, bool expect_activated, int expect_concurrency,
-                           int expect_masters) {
-    CHECK_MESSAGE(arena.is_active() == expect_activated, "Unexpected activation state");
-    if (arena.is_active()) {
-        TaskArenaValidator validator(arena);
-        CHECK_MESSAGE(validator.concurrency() == expect_concurrency, "Unexpected arena size");
-        CHECK_MESSAGE(validator.reserved_for_masters() == expect_masters, "Unexpected # of reserved slots");
-        if (tbb::this_task_arena::current_thread_index() != tbb::task_arena::not_initialized) {
+void ValidateAttachedArena( tbb::task_arena& arena, bool expect_activated,
+                            int expect_concurrency, int expect_masters ) {
+    CHECK_MESSAGE( arena.is_active()==expect_activated, "Unexpected activation state" );
+    if( arena.is_active() ) {
+        TaskArenaValidator validator( arena );
+        CHECK_MESSAGE( validator.concurrency()==expect_concurrency, "Unexpected arena size" );
+        CHECK_MESSAGE( validator.reserved_for_masters()==expect_masters, "Unexpected # of reserved slots" );
+        if ( tbb::this_task_arena::current_thread_index() != tbb::task_arena::not_initialized ) {
             CHECK(tbb::this_task_arena::current_thread_index() >= 0);
             // for threads already in arena, check that the thread index remains the same
-            arena.execute(validator);
-        } else {// not_initialized
+            arena.execute( validator );
+        } else { // not_initialized
             // Test the deprecated method
             CHECK(tbb::this_task_arena::current_thread_index() == -1);
         }
@@ -596,55 +612,60 @@ void ValidateAttachedArena(tbb::task_arena& arena, bool expect_activated, int ex
 }
 
 struct TestAttachBody : utils::NoAssign {
-    static thread_local int my_idx;// safe to modify and use within the NativeParallelFor functor
+    static thread_local int my_idx; // safe to modify and use within the NativeParallelFor functor
     const int maxthread;
-    TestAttachBody(int max_thr) : maxthread(max_thr) {}
+    TestAttachBody( int max_thr ) : maxthread(max_thr) {}
 
     // The functor body for NativeParallelFor
-    void operator()(int idx) const {
+    void operator()( int idx ) const {
         my_idx = idx;
 
         int default_threads = tbb::this_task_arena::max_concurrency();
 
-        tbb::task_arena arena {tbb::task_arena::attach()};
-        ValidateAttachedArena(arena, false, -1, -1);// Nothing yet to attach to
+        tbb::task_arena arena{tbb::task_arena::attach()};
+        ValidateAttachedArena( arena, false, -1, -1 ); // Nothing yet to attach to
 
         arena.terminate();
-        ValidateAttachedArena(arena, false, -1, -1);
+        ValidateAttachedArena( arena, false, -1, -1 );
 
         // attach to an auto-initialized arena
         tbb::parallel_for(0, 1, [](int) {});
 
-        tbb::task_arena arena2 {tbb::task_arena::attach()};
-        ValidateAttachedArena(arena2, true, default_threads, 1);
+        tbb::task_arena arena2{tbb::task_arena::attach()};
+        ValidateAttachedArena( arena2, true, default_threads, 1 );
+
+        tbb::task_arena arena3;
+        arena3.initialize(tbb::attach());
+        ValidateAttachedArena( arena3, true, default_threads, 1 );
+
 
         // attach to another task_arena
-        arena.initialize(maxthread, std::min(maxthread, idx));
-        arena.execute(*this);
+        arena.initialize( maxthread, std::min(maxthread,idx) );
+        arena.execute( *this );
     }
 
     // The functor body for task_arena::execute above
     void operator()() const {
-        tbb::task_arena arena2 {tbb::task_arena::attach()};
-        ValidateAttachedArena(arena2, true, maxthread, std::min(maxthread, my_idx));
+        tbb::task_arena arena2{tbb::task_arena::attach()};
+        ValidateAttachedArena( arena2, true, maxthread, std::min(maxthread,my_idx) );
     }
 
     // The functor body for tbb::parallel_for
-    void operator()(const Range& r) const {
-        for (int i = r.begin(); i < r.end(); ++i) {
-            tbb::task_arena arena2 {tbb::task_arena::attach()};
-            ValidateAttachedArena(arena2, true, tbb::this_task_arena::max_concurrency(), 1);
+    void operator()( const Range& r ) const {
+        for( int i = r.begin(); i<r.end(); ++i ) {
+            tbb::task_arena arena2{tbb::task_arena::attach()};
+            ValidateAttachedArena( arena2, true, tbb::this_task_arena::max_concurrency(), 1 );
         }
     }
 };
 
 thread_local int TestAttachBody::my_idx;
 
-void TestAttach(int maxthread) {
+void TestAttach( int maxthread ) {
     // Externally concurrent, but no concurrency within a thread
-    utils::NativeParallelFor(std::max(maxthread, 4), TestAttachBody(maxthread));
+    utils::NativeParallelFor( std::max(maxthread,4), TestAttachBody( maxthread ) );
     // Concurrent within the current arena; may also serve as a stress test
-    tbb::parallel_for(Range(0, 10000 * maxthread), TestAttachBody(maxthread));
+    tbb::parallel_for( Range(0,10000*maxthread), TestAttachBody( maxthread ) );
 }
 
 //--------------------------------------------------//
@@ -652,21 +673,20 @@ void TestAttach(int maxthread) {
 // Test that task_arena::enqueue does not tolerate a non-const functor.
 // TODO: can it be reworked as SFINAE-based compile-time check?
 struct TestFunctor {
-    void operator()() { CHECK_MESSAGE(false, "Non-const operator called"); }
-    void operator()() const { /* library requires this overload only */
-    }
+    void operator()() { CHECK_MESSAGE( false, "Non-const operator called" ); }
+    void operator()() const { /* library requires this overload only */ }
 };
 
 void TestConstantFunctorRequirement() {
     tbb::task_arena a;
     TestFunctor tf;
-    a.enqueue(tf);
+    a.enqueue( tf );
 }
 
 //--------------------------------------------------//
 
-#include "tbb/parallel_invoke.h"
 #include "tbb/parallel_reduce.h"
+#include "tbb/parallel_invoke.h"
 
 // Test this_task_arena::isolate
 namespace TestIsolatedExecuteNS {
@@ -676,26 +696,25 @@ namespace TestIsolatedExecuteNS {
         NestedParFor() {}
         void operator()() const {
             NestedPartitioner p;
-            tbb::parallel_for(0, 10, utils::DummyBody(10), p);
+            tbb::parallel_for( 0, 10, utils::DummyBody( 10 ), p );
         }
     };
 
     template <typename NestedPartitioner>
     class ParForBody : utils::NoAssign {
         bool myOuterIsolation;
-        tbb::enumerable_thread_specific<int>& myEts;
-        std::atomic<bool>& myIsStolen;
-
+        tbb::enumerable_thread_specific<int> &myEts;
+        std::atomic<bool> &myIsStolen;
     public:
-        ParForBody(bool outer_isolation, tbb::enumerable_thread_specific<int>& ets,
-                   std::atomic<bool>& is_stolen)
-            : myOuterIsolation(outer_isolation), myEts(ets), myIsStolen(is_stolen) {}
-        void operator()(int) const {
-            int& e = myEts.local();
-            if (e++ > 0) myIsStolen = true;
-            if (myOuterIsolation) NestedParFor<NestedPartitioner>()();
+        ParForBody( bool outer_isolation, tbb::enumerable_thread_specific<int> &ets, std::atomic<bool> &is_stolen )
+            : myOuterIsolation( outer_isolation ), myEts( ets ), myIsStolen( is_stolen ) {}
+        void operator()( int ) const {
+            int &e = myEts.local();
+            if ( e++ > 0 ) myIsStolen = true;
+            if ( myOuterIsolation )
+                NestedParFor<NestedPartitioner>()();
             else
-                tbb::this_task_arena::isolate(NestedParFor<NestedPartitioner>());
+                tbb::this_task_arena::isolate( NestedParFor<NestedPartitioner>() );
             --e;
         }
     };
@@ -703,52 +722,48 @@ namespace TestIsolatedExecuteNS {
     template <typename OuterPartitioner, typename NestedPartitioner>
     class OuterParFor : utils::NoAssign {
         bool myOuterIsolation;
-        std::atomic<bool>& myIsStolen;
-
+        std::atomic<bool> &myIsStolen;
     public:
-        OuterParFor(bool outer_isolation, std::atomic<bool>& is_stolen)
-            : myOuterIsolation(outer_isolation), myIsStolen(is_stolen) {}
+        OuterParFor( bool outer_isolation, std::atomic<bool> &is_stolen ) : myOuterIsolation( outer_isolation ), myIsStolen( is_stolen ) {}
         void operator()() const {
-            tbb::enumerable_thread_specific<int> ets(0);
+            tbb::enumerable_thread_specific<int> ets( 0 );
             OuterPartitioner p;
-            tbb::parallel_for(0, 1000, ParForBody<NestedPartitioner>(myOuterIsolation, ets, myIsStolen), p);
+            tbb::parallel_for( 0, 1000, ParForBody<NestedPartitioner>( myOuterIsolation, ets, myIsStolen ), p );
         }
     };
 
     template <typename OuterPartitioner, typename NestedPartitioner>
-    void TwoLoopsTest(bool outer_isolation) {
+    void TwoLoopsTest( bool outer_isolation ) {
         std::atomic<bool> is_stolen;
         is_stolen = false;
         const int max_repeats = 100;
-        if (outer_isolation) {
-            for (int i = 0; i <= max_repeats; ++i) {
-                tbb::this_task_arena::isolate(
-                        OuterParFor<OuterPartitioner, NestedPartitioner>(outer_isolation, is_stolen));
-                if (is_stolen) break;
+        if ( outer_isolation ) {
+            for ( int i = 0; i <= max_repeats; ++i ) {
+                tbb::this_task_arena::isolate( OuterParFor<OuterPartitioner, NestedPartitioner>( outer_isolation, is_stolen ) );
+                if ( is_stolen ) break;
             }
             // TODO: was ASSERT_WARNING
             if (!is_stolen) {
                 REPORT("Warning: isolate() should not block stealing on nested levels without isolation\n");
             }
         } else {
-            for (int i = 0; i <= max_repeats; ++i) {
-                OuterParFor<OuterPartitioner, NestedPartitioner>(outer_isolation, is_stolen)();
+            for ( int i = 0; i <= max_repeats; ++i ) {
+                OuterParFor<OuterPartitioner, NestedPartitioner>( outer_isolation, is_stolen )();
             }
-            REQUIRE_MESSAGE(!is_stolen,
-                            "isolate() on nested levels should prevent stealing from outer leves");
+            REQUIRE_MESSAGE( !is_stolen, "isolate() on nested levels should prevent stealing from outer levels" );
         }
     }
 
-    void TwoLoopsTest(bool outer_isolation) {
-        TwoLoopsTest<tbb::simple_partitioner, tbb::simple_partitioner>(outer_isolation);
-        TwoLoopsTest<tbb::simple_partitioner, tbb::affinity_partitioner>(outer_isolation);
-        TwoLoopsTest<tbb::affinity_partitioner, tbb::simple_partitioner>(outer_isolation);
-        TwoLoopsTest<tbb::affinity_partitioner, tbb::affinity_partitioner>(outer_isolation);
+    void TwoLoopsTest( bool outer_isolation ) {
+        TwoLoopsTest<tbb::simple_partitioner, tbb::simple_partitioner>( outer_isolation );
+        TwoLoopsTest<tbb::simple_partitioner, tbb::affinity_partitioner>( outer_isolation );
+        TwoLoopsTest<tbb::affinity_partitioner, tbb::simple_partitioner>( outer_isolation );
+        TwoLoopsTest<tbb::affinity_partitioner, tbb::affinity_partitioner>( outer_isolation );
     }
 
     void TwoLoopsTest() {
-        TwoLoopsTest(true);
-        TwoLoopsTest(false);
+        TwoLoopsTest( true );
+        TwoLoopsTest( false );
     }
     //--------------------------------------------------//
     class HeavyMixTestBody : utils::NoAssign {
@@ -757,91 +772,90 @@ namespace TestIsolatedExecuteNS {
         int myNestedLevel;
 
         template <typename Partitioner, typename Body>
-        static void RunTwoBodies(utils::FastRandom<>& rnd, const Body& body, Partitioner& p,
-                                 tbb::task_group_context* ctx = NULL) {
-            if (rnd.get() % 2) {
-                if (ctx) tbb::parallel_for(0, 2, body, p, *ctx);
+        static void RunTwoBodies( utils::FastRandom<>& rnd, const Body &body, Partitioner& p, tbb::task_group_context* ctx = nullptr ) {
+            if ( rnd.get() % 2 ) {
+                if  (ctx )
+                    tbb::parallel_for( 0, 2, body, p, *ctx );
                 else
-                    tbb::parallel_for(0, 2, body, p);
+                    tbb::parallel_for( 0, 2, body, p );
             } else {
-                tbb::parallel_invoke(body, body);
+                tbb::parallel_invoke( body, body );
             }
         }
 
         template <typename Partitioner>
         class IsolatedBody : utils::NoAssign {
-            const HeavyMixTestBody& myHeavyMixTestBody;
-            Partitioner& myPartitioner;
-
+            const HeavyMixTestBody &myHeavyMixTestBody;
+            Partitioner &myPartitioner;
         public:
-            IsolatedBody(const HeavyMixTestBody& body, Partitioner& partitioner)
-                : myHeavyMixTestBody(body), myPartitioner(partitioner) {}
+            IsolatedBody( const HeavyMixTestBody &body, Partitioner &partitioner )
+                : myHeavyMixTestBody( body ), myPartitioner( partitioner ) {}
             void operator()() const {
-                RunTwoBodies(myHeavyMixTestBody.myRandom.local(),
-                             HeavyMixTestBody(myHeavyMixTestBody.myRandom, myHeavyMixTestBody.myIsolatedLevel,
-                                              myHeavyMixTestBody.myNestedLevel + 1),
-                             myPartitioner);
+                RunTwoBodies( myHeavyMixTestBody.myRandom.local(),
+                    HeavyMixTestBody( myHeavyMixTestBody.myRandom, myHeavyMixTestBody.myIsolatedLevel,
+                        myHeavyMixTestBody.myNestedLevel + 1 ),
+                    myPartitioner );
             }
         };
 
         template <typename Partitioner>
-        void RunNextLevel(utils::FastRandom<>& rnd, int& isolated_level) const {
+        void RunNextLevel( utils::FastRandom<>& rnd, int &isolated_level ) const {
             Partitioner p;
-            switch (rnd.get() % 2) {
+            switch ( rnd.get() % 2 ) {
                 case 0: {
                     // No features
                     tbb::task_group_context ctx;
-                    RunTwoBodies(rnd, HeavyMixTestBody(myRandom, myIsolatedLevel, myNestedLevel + 1), p,
-                                 &ctx);
+                    RunTwoBodies( rnd, HeavyMixTestBody(myRandom, myIsolatedLevel, myNestedLevel + 1), p, &ctx );
                     break;
                 }
                 case 1: {
                     // Isolation
                     int previous_isolation = isolated_level;
                     isolated_level = myNestedLevel;
-                    tbb::this_task_arena::isolate(IsolatedBody<Partitioner>(*this, p));
+                    tbb::this_task_arena::isolate( IsolatedBody<Partitioner>( *this, p ) );
                     isolated_level = previous_isolation;
                     break;
                 }
             }
         }
-
     public:
-        HeavyMixTestBody(tbb::enumerable_thread_specific<utils::FastRandom<>>& random,
-                         tbb::enumerable_thread_specific<int>& isolated_level, int nested_level)
-            : myRandom(random), myIsolatedLevel(isolated_level), myNestedLevel(nested_level) {}
+        HeavyMixTestBody( tbb::enumerable_thread_specific<utils::FastRandom<>>& random,
+            tbb::enumerable_thread_specific<int>& isolated_level, int nested_level )
+            : myRandom( random ), myIsolatedLevel( isolated_level )
+            , myNestedLevel( nested_level ) {}
         void operator()() const {
-            int& isolated_level = myIsolatedLevel.local();
-            CHECK_FAST_MESSAGE(myNestedLevel > isolated_level,
-                               "The outer-level task should not be stolen on isolated level");
-            if (myNestedLevel == 20) return;
+            int &isolated_level = myIsolatedLevel.local();
+            CHECK_FAST_MESSAGE( myNestedLevel > isolated_level, "The outer-level task should not be stolen on isolated level" );
+            if ( myNestedLevel == 20 )
+                return;
             utils::FastRandom<>& rnd = myRandom.local();
-            if (rnd.get() % 2 == 1) {
-                RunNextLevel<tbb::auto_partitioner>(rnd, isolated_level);
+            if ( rnd.get() % 2 == 1 ) {
+                RunNextLevel<tbb::auto_partitioner>( rnd, isolated_level );
             } else {
-                RunNextLevel<tbb::affinity_partitioner>(rnd, isolated_level);
+                RunNextLevel<tbb::affinity_partitioner>( rnd, isolated_level );
             }
         }
-        void operator()(int) const { this->operator()(); }
+        void operator()(int) const {
+            this->operator()();
+        }
     };
 
     struct RandomInitializer {
         utils::FastRandom<> operator()() {
-            return utils::FastRandom<>(tbb::this_task_arena::current_thread_index());
+            return utils::FastRandom<>( tbb::this_task_arena::current_thread_index() );
         }
     };
 
     void HeavyMixTest() {
-        std::size_t num_threads
-                = tbb::this_task_arena::max_concurrency() < 3 ? 3 : tbb::this_task_arena::max_concurrency();
+        std::size_t num_threads = tbb::this_task_arena::max_concurrency() < 3 ? 3 : tbb::this_task_arena::max_concurrency();
         tbb::global_control ctl(tbb::global_control::max_allowed_parallelism, num_threads);
 
         RandomInitializer init_random;
-        tbb::enumerable_thread_specific<utils::FastRandom<>> random(init_random);
-        tbb::enumerable_thread_specific<int> isolated_level(0);
-        for (int i = 0; i < 5; ++i) {
-            HeavyMixTestBody b(random, isolated_level, 1);
-            b(0);
+        tbb::enumerable_thread_specific<utils::FastRandom<>> random( init_random );
+        tbb::enumerable_thread_specific<int> isolated_level( 0 );
+        for ( int i = 0; i < 5; ++i ) {
+            HeavyMixTestBody b( random, isolated_level, 1 );
+            b( 0 );
         }
     }
 
@@ -863,19 +877,22 @@ namespace TestIsolatedExecuteNS {
     struct ExceptionTestBody : utils::NoAssign {
         tbb::enumerable_thread_specific<int>& myEts;
         std::atomic<bool>& myIsStolen;
-        ExceptionTestBody(tbb::enumerable_thread_specific<int>& ets, std::atomic<bool>& is_stolen)
-            : myEts(ets), myIsStolen(is_stolen) {}
-        void operator()(int i) const {
+        ExceptionTestBody( tbb::enumerable_thread_specific<int>& ets, std::atomic<bool>& is_stolen )
+            : myEts( ets ), myIsStolen( is_stolen ) {}
+        void operator()( int i ) const {
             try {
-                tbb::this_task_arena::isolate(IsolatedBodyThrowsException());
-                REQUIRE_MESSAGE(false, "The exception has been lost");
-            } catch (MyException) {
-            } catch (...) { REQUIRE_MESSAGE(false, "Unexpected exception"); }
+                tbb::this_task_arena::isolate( IsolatedBodyThrowsException() );
+                REQUIRE_MESSAGE( false, "The exception has been lost" );
+            }
+            catch ( MyException ) {}
+            catch ( ... ) {
+                REQUIRE_MESSAGE( false, "Unexpected exception" );
+            }
             // Check that nested algorithms can steal outer-level tasks
-            int& e = myEts.local();
-            if (e++ > 0) myIsStolen = true;
+            int &e = myEts.local();
+            if ( e++ > 0 ) myIsStolen = true;
             // work imbalance increases chances for stealing
-            tbb::parallel_for(0, 10 + i, utils::DummyBody(100));
+            tbb::parallel_for( 0, 10+i, utils::DummyBody( 100 ) );
             --e;
         }
     };
@@ -886,17 +903,19 @@ namespace TestIsolatedExecuteNS {
         tbb::enumerable_thread_specific<int> ets;
         std::atomic<bool> is_stolen;
         is_stolen = false;
-        for (;;) {
-            tbb::parallel_for(0, 1000, ExceptionTestBody(ets, is_stolen));
-            if (is_stolen) break;
+        for ( ;; ) {
+            tbb::parallel_for( 0, 1000, ExceptionTestBody( ets, is_stolen ) );
+            if ( is_stolen ) break;
         }
-        REQUIRE_MESSAGE(is_stolen, "isolate should not affect non-isolated work");
+        REQUIRE_MESSAGE( is_stolen, "isolate should not affect non-isolated work" );
 #endif /* TBB_USE_EXCEPTIONS */
     }
 
     struct NonConstBody {
         unsigned int state;
-        void operator()() { state ^= ~0u; }
+        void operator()() {
+            state ^= ~0u;
+        }
     };
 
     void TestNonConstBody() {
@@ -918,8 +937,7 @@ namespace TestIsolatedExecuteNS {
         tbb::task_arena& arena;
         static const int N = 100;
 
-        TestEnqueueTask(tbb::enumerable_thread_specific<bool>& exe, std::atomic<int>& c, wait_context& w,
-                        tbb::task_arena& a)
+        TestEnqueueTask(tbb::enumerable_thread_specific<bool>& exe, std::atomic<int>& c, wait_context& w, tbb::task_arena& a)
             : executed(exe), completed(c), waiter(w), arena(a) {}
 
         tbb::detail::d1::task* execute(tbb::detail::d1::execution_data&) override {
@@ -940,12 +958,10 @@ namespace TestIsolatedExecuteNS {
         tbb::enumerable_thread_specific<bool>& executed;
         std::atomic<int>& completed;
         tbb::task_arena& arena;
-
     public:
         static const int N = 100;
 
-        TestEnqueueIsolateBody(tbb::enumerable_thread_specific<bool>& exe, std::atomic<int>& c,
-                               tbb::task_arena& a)
+        TestEnqueueIsolateBody(tbb::enumerable_thread_specific<bool>& exe, std::atomic<int>& c, tbb::task_arena& a)
             : executed(exe), completed(c), arena(a) {}
         void operator()() {
             tbb::task_group_context ctx;
@@ -959,14 +975,16 @@ namespace TestIsolatedExecuteNS {
     void TestEnqueue() {
         tbb::enumerable_thread_specific<bool> executed(false);
         std::atomic<int> completed;
-        tbb::task_arena arena {tbb::task_arena::attach()};
+        tbb::task_arena arena{tbb::task_arena::attach()};
 
         // Check that the main thread can process enqueued tasks.
         completed = 0;
         TestEnqueueIsolateBody b1(executed, completed, arena);
         b1();
 
-        if (!executed.local()) { REPORT("Warning: No one enqueued task has executed by the main thread.\n"); }
+        if (!executed.local()) {
+            REPORT("Warning: No one enqueued task has executed by the main thread.\n");
+        }
 
         executed.local() = false;
         completed = 0;
@@ -990,14 +1008,14 @@ namespace TestIsolatedExecuteNS {
         tbb::detail::d1::wait(waiter, ctx);
         // while (completed < TestEnqueueTask::N + N) utils::yield();
     }
-}// namespace TestIsolatedExecuteNS
+}
 
 void TestIsolatedExecute() {
     // At least 3 threads (owner + 2 thieves) are required to reproduce a situation when the owner steals outer
     // level task on a nested level. If we have only one thief then it will execute outer level tasks first and
     // the owner will not have a possibility to steal outer level tasks.
     int platform_max_thread = tbb::this_task_arena::max_concurrency();
-    int num_threads = utils::min(platform_max_thread, 3);
+    int num_threads = utils::min( platform_max_thread, 3 );
     {
         // Too many threads require too many work to reproduce the stealing from outer level.
         tbb::global_control ctl(tbb::global_control::max_allowed_parallelism, utils::max(num_threads, 7));
@@ -1014,27 +1032,26 @@ void TestIsolatedExecute() {
 //-----------------------------------------------------------------------------------------//
 
 class TestDelegatedSpawnWaitBody : utils::NoAssign {
-    tbb::task_arena& my_a;
+    tbb::task_arena &my_a;
     utils::SpinBarrier &my_b1, &my_b2;
-
 public:
-    TestDelegatedSpawnWaitBody(tbb::task_arena& a, utils::SpinBarrier& b1, utils::SpinBarrier& b2)
+    TestDelegatedSpawnWaitBody( tbb::task_arena &a, utils::SpinBarrier &b1, utils::SpinBarrier &b2)
         : my_a(a), my_b1(b1), my_b2(b2) {}
     // NativeParallelFor's functor
     void operator()(int idx) const {
-        if (idx == 0) {// thread 0 works in the arena, thread 1 waits for it (to prevent test hang)
+        if ( idx==0 ) { // thread 0 works in the arena, thread 1 waits for it (to prevent test hang)
             for (int i = 0; i < 2; ++i) {
-                my_a.enqueue([this] { my_b1.wait(); });// tasks to sync with workers
+                my_a.enqueue([this] { my_b1.wait(); }); // tasks to sync with workers
             }
             tbb::task_group tg;
-            my_b1.wait();// sync with the workers
-            for (int i = 0; i < 100000; ++i) {
+            my_b1.wait(); // sync with the workers
+            for( int i=0; i<100000; ++i) {
                 my_a.execute([&tg] { tg.run([] {}); });
             }
-            my_a.execute([&tg] { tg.wait(); });
+            my_a.execute([&tg] {tg.wait(); });
         }
 
-        my_b2.wait();// sync both threads
+        my_b2.wait(); // sync both threads
     }
 };
 
@@ -1044,10 +1061,10 @@ void TestDelegatedSpawnWait() {
         return;
     }
     // Regression test for a bug with missed wakeup notification from a delegated task
-    tbb::task_arena a(2, 0);
+    tbb::task_arena a(2,0);
     a.initialize();
     utils::SpinBarrier barrier1(3), barrier2(2);
-    utils::NativeParallelFor(2, TestDelegatedSpawnWaitBody(a, barrier1, barrier2));
+    utils::NativeParallelFor( 2, TestDelegatedSpawnWaitBody(a, barrier1, barrier2) );
     a.debug_wait_until_empty();
 }
 
@@ -1055,20 +1072,20 @@ void TestDelegatedSpawnWait() {
 
 class TestMultipleWaitsArenaWait : utils::NoAssign {
     using wait_context = tbb::detail::d1::wait_context;
-
 public:
-    TestMultipleWaitsArenaWait(int idx, int bunch_size, int num_tasks, std::vector<wait_context*>& waiters,
-                               std::atomic<int>& processed, tbb::task_group_context& tgc)
-        : my_idx(idx), my_bunch_size(bunch_size), my_num_tasks(num_tasks), my_waiters(waiters),
-          my_processed(processed), my_context(tgc) {}
+    TestMultipleWaitsArenaWait( int idx, int bunch_size, int num_tasks, std::vector<wait_context*>& waiters, std::atomic<int>& processed, tbb::task_group_context& tgc )
+        : my_idx( idx ), my_bunch_size( bunch_size ), my_num_tasks(num_tasks), my_waiters( waiters ), my_processed( processed ), my_context(tgc) {}
     void operator()() const {
         ++my_processed;
         // Wait for all tasks
-        if (my_idx < my_num_tasks) { tbb::detail::d1::wait(*my_waiters[my_idx], my_context); }
+        if ( my_idx < my_num_tasks ) {
+            tbb::detail::d1::wait(*my_waiters[my_idx], my_context);
+        }
         // Signal waiting tasks
-        if (my_idx >= my_bunch_size) { my_waiters[my_idx - my_bunch_size]->release(); }
+        if ( my_idx >= my_bunch_size ) {
+            my_waiters[my_idx-my_bunch_size]->release();
+        }
     }
-
 private:
     int my_idx;
     int my_bunch_size;
@@ -1080,19 +1097,13 @@ class TestMultipleWaitsArenaWait : utils::NoAssign {
 
 class TestMultipleWaitsThreadBody : utils::NoAssign {
     using wait_context = tbb::detail::d1::wait_context;
-
 public:
-    TestMultipleWaitsThreadBody(int bunch_size, int num_tasks, tbb::task_arena& a,
-                                std::vector<wait_context*>& waiters, std::atomic<int>& processed,
-                                tbb::task_group_context& tgc)
-        : my_bunch_size(bunch_size), my_num_tasks(num_tasks), my_arena(a), my_waiters(waiters),
-          my_processed(processed), my_context(tgc) {}
-    void operator()(int idx) const {
-        my_arena.execute(TestMultipleWaitsArenaWait(idx, my_bunch_size, my_num_tasks, my_waiters,
-                                                    my_processed, my_context));
+    TestMultipleWaitsThreadBody( int bunch_size, int num_tasks, tbb::task_arena& a, std::vector<wait_context*>& waiters, std::atomic<int>& processed, tbb::task_group_context& tgc )
+        : my_bunch_size( bunch_size ), my_num_tasks( num_tasks ), my_arena( a ), my_waiters( waiters ), my_processed( processed ), my_context(tgc) {}
+    void operator()( int idx ) const {
+        my_arena.execute( TestMultipleWaitsArenaWait( idx, my_bunch_size, my_num_tasks, my_waiters, my_processed, my_context ) );
         --my_processed;
     }
-
 private:
     int my_bunch_size;
     int my_num_tasks;
@@ -1102,34 +1113,31 @@ class TestMultipleWaitsThreadBody : utils::NoAssign {
     tbb::task_group_context& my_context;
 };
 
-void TestMultipleWaits(int num_threads, int num_bunches, int bunch_size) {
-    tbb::task_arena a(num_threads);
-    const int num_tasks = (num_bunches - 1) * bunch_size;
+void TestMultipleWaits( int num_threads, int num_bunches, int bunch_size ) {
+    tbb::task_arena a( num_threads );
+    const int num_tasks = (num_bunches-1)*bunch_size;
 
     tbb::task_group_context tgc;
     std::vector<tbb::detail::d1::wait_context*> waiters(num_tasks);
     for (auto& w : waiters) w = new tbb::detail::d1::wait_context(0);
 
     std::atomic<int> processed(0);
-    for (int repeats = 0; repeats < 10; ++repeats) {
+    for ( int repeats = 0; repeats<10; ++repeats ) {
         int idx = 0;
-        for (int bunch = 0; bunch < num_bunches - 1; ++bunch) {
-            // Sync with the previous bunch of waiters to prevent "false" nested dependicies (when a nested task waits for an outer task).
-            while (processed < bunch * bunch_size) utils::yield();
+        for ( int bunch = 0; bunch < num_bunches-1; ++bunch ) {
+            // Sync with the previous bunch of waiters to prevent "false" nested dependencies (when a nested task waits for an outer task).
+            while ( processed < bunch*bunch_size ) utils::yield();
             // Run the bunch of threads/waiters that depend on the next bunch of threads/waiters.
-            for (int i = 0; i < bunch_size; ++i) {
+            for ( int i = 0; i<bunch_size; ++i ) {
                 waiters[idx]->reserve();
-                std::thread(TestMultipleWaitsThreadBody(bunch_size, num_tasks, a, waiters, processed, tgc),
-                            idx++)
-                        .detach();
+                std::thread( TestMultipleWaitsThreadBody( bunch_size, num_tasks, a, waiters, processed, tgc ), idx++ ).detach();
             }
         }
         // No sync because the threads of the last bunch do not call wait_for_all.
         // Run the last bunch of threads.
-        for (int i = 0; i < bunch_size; ++i)
-            std::thread(TestMultipleWaitsThreadBody(bunch_size, num_tasks, a, waiters, processed, tgc), idx++)
-                    .detach();
-        while (processed) utils::yield();
+        for ( int i = 0; i<bunch_size; ++i )
+            std::thread( TestMultipleWaitsThreadBody( bunch_size, num_tasks, a, waiters, processed, tgc ), idx++ ).detach();
+        while ( processed ) utils::yield();
     }
     for (auto w : waiters) delete w;
 }
@@ -1137,17 +1145,17 @@ void TestMultipleWaits(int num_threads, int num_bunches, int bunch_size) {
 void TestMultipleWaits() {
     // Limit the number of threads to prevent heavy oversubscription.
 #if TBB_TEST_LOW_WORKLOAD
-    const int max_threads = std::min(4, tbb::this_task_arena::max_concurrency());
+    const int max_threads = std::min( 4, tbb::this_task_arena::max_concurrency() );
 #else
-    const int max_threads = std::min(16, tbb::this_task_arena::max_concurrency());
+    const int max_threads = std::min( 16, tbb::this_task_arena::max_concurrency() );
 #endif
 
     utils::FastRandom<> rnd(1234);
-    for (int threads = 1; threads <= max_threads; threads += utils::max(threads / 2, 1)) {
-        for (int i = 0; i < 3; ++i) {
-            const int num_bunches = 3 + rnd.get() % 3;
-            const int bunch_size = max_threads + rnd.get() % max_threads;
-            TestMultipleWaits(threads, num_bunches, bunch_size);
+    for ( int threads = 1; threads <= max_threads; threads += utils::max( threads/2, 1 ) ) {
+        for ( int i = 0; i<3; ++i ) {
+            const int num_bunches = 3 + rnd.get()%3;
+            const int bunch_size = max_threads + rnd.get()%max_threads;
+            TestMultipleWaits( threads, num_bunches, bunch_size );
         }
     }
 }
@@ -1156,7 +1164,7 @@ void TestMultipleWaits() {
 
 void TestSmallStackSize() {
     tbb::global_control gc(tbb::global_control::thread_stack_size,
-                           tbb::global_control::active_value(tbb::global_control::thread_stack_size) / 2);
+            tbb::global_control::active_value(tbb::global_control::thread_stack_size) / 2 );
     // The test produces the warning (not a error) if fails. So the test is run many times
     // to make the log annoying (to force to consider it as an error).
     for (int i = 0; i < 100; ++i) {
@@ -1179,7 +1187,7 @@ namespace TestMoveSemanticsNS {
 
     struct MovePreferableFunctor : utils::Movable, TestFunctor {
         MovePreferableFunctor() : utils::Movable() {};
-        MovePreferableFunctor(MovePreferableFunctor&& other) : utils::Movable(std::move(other)) {};
+        MovePreferableFunctor(MovePreferableFunctor&& other) : utils::Movable( std::move(other) ) {};
         MovePreferableFunctor(const MovePreferableFunctor& other) : utils::Movable(other) {};
     };
 
@@ -1194,19 +1202,21 @@ namespace TestMoveSemanticsNS {
         tbb::task_arena ta;
         MovePreferableFunctor mpf;
         // execute() doesn't have any copies or moves of arguments inside the impl
-        ta.execute(NoMoveNoCopyFunctor());
+        ta.execute( NoMoveNoCopyFunctor() );
 
-        ta.enqueue(MoveOnlyFunctor());
-        ta.enqueue(mpf);
+        ta.enqueue( MoveOnlyFunctor() );
+        ta.enqueue( mpf );
         REQUIRE_MESSAGE(mpf.alive, "object was moved when was passed by lval");
         mpf.Reset();
-        ta.enqueue(std::move(mpf));
+        ta.enqueue( std::move(mpf) );
         REQUIRE_MESSAGE(!mpf.alive, "object was copied when was passed by rval");
         mpf.Reset();
     }
-}// namespace TestMoveSemanticsNS
+}
 
-void TestMoveSemantics() { TestMoveSemanticsNS::TestFunctors(); }
+void TestMoveSemantics() {
+    TestMoveSemanticsNS::TestFunctors();
+}
 
 //--------------------------------------------------//
 
@@ -1219,7 +1229,6 @@ namespace TestReturnValueNS {
     class ReturnType : public StateTrackable<> {
         static const int SIZE = 42;
         std::vector<int> data;
-
     public:
         ReturnType(noDefaultTag) : StateTrackable<>(0) {}
         // Define copy constructor to test that it is never called
@@ -1227,11 +1236,13 @@ namespace TestReturnValueNS {
         ReturnType(ReturnType&& r) : StateTrackable<>(std::move(r)), data(std::move(r.data)) {}
 
         void fill() {
-            for (int i = 0; i < SIZE; ++i) data.push_back(i);
+            for (int i = 0; i < SIZE; ++i)
+                data.push_back(i);
         }
         void check() {
             REQUIRE(data.size() == unsigned(SIZE));
-            for (int i = 0; i < SIZE; ++i) REQUIRE(data[i] == i);
+            for (int i = 0; i < SIZE; ++i)
+                REQUIRE(data[i] == i);
             StateTrackableCounters::counters_type& cnts = StateTrackableCounters::counters;
             REQUIRE(cnts[StateTrackableBase::DefaultInitialized] == 0);
             REQUIRE(cnts[StateTrackableBase::DirectInitialized] == 1);
@@ -1242,10 +1253,10 @@ namespace TestReturnValueNS {
             // function return, store to an internal storage, acquire internal storage.
             // For compilation, without copy elision, this number may be grown up to 7.
             REQUIRE((copied == 0 && moved <= 7));
-            WARN_MESSAGE(
-                    moved <= 3,
-                    "Warning: The number of copies/moves should not exceed 3 if copy elision takes a place."
-                    "Take an attention to this warning only if copy elision is enabled.");
+            WARN_MESSAGE(moved <= 3,
+                "Warning: The number of copies/moves should not exceed 3 if copy elision takes a place."
+                "Take an attention to this warning only if copy elision is enabled."
+            );
         }
     };
 
@@ -1262,7 +1273,9 @@ namespace TestReturnValueNS {
 
     template <typename R>
     struct Functor {
-        R operator()() const { return function<R>(); }
+        R operator()() const {
+            return function<R>();
+        }
     };
 
     tbb::task_arena& arena() {
@@ -1271,29 +1284,29 @@ namespace TestReturnValueNS {
     }
 
     template <typename F>
-    void TestExecute(F& f) {
+    void TestExecute(F &f) {
         StateTrackableCounters::reset();
-        ReturnType r {arena().execute(f)};
+        ReturnType r{arena().execute(f)};
         r.check();
     }
 
     template <typename F>
-    void TestExecute(const F& f) {
+    void TestExecute(const F &f) {
         StateTrackableCounters::reset();
-        ReturnType r {arena().execute(f)};
+        ReturnType r{arena().execute(f)};
         r.check();
     }
     template <typename F>
-    void TestIsolate(F& f) {
+    void TestIsolate(F &f) {
         StateTrackableCounters::reset();
-        ReturnType r {tbb::this_task_arena::isolate(f)};
+        ReturnType r{tbb::this_task_arena::isolate(f)};
         r.check();
     }
 
     template <typename F>
-    void TestIsolate(const F& f) {
+    void TestIsolate(const F &f) {
         StateTrackableCounters::reset();
-        ReturnType r {tbb::this_task_arena::isolate(f)};
+        ReturnType r{tbb::this_task_arena::isolate(f)};
         r.check();
     }
 
@@ -1314,49 +1327,61 @@ namespace TestReturnValueNS {
         tbb::this_task_arena::isolate(f2);
         tbb::this_task_arena::isolate(function<void>);
     }
-}// namespace TestReturnValueNS
+}
 
-void TestReturnValue() { TestReturnValueNS::Test(); }
+void TestReturnValue() {
+    TestReturnValueNS::Test();
+}
 
 //--------------------------------------------------//
 
 // MyObserver checks if threads join to the same arena
-struct MyObserver : public tbb::task_scheduler_observer {
+struct MyObserver: public tbb::task_scheduler_observer {
     tbb::enumerable_thread_specific<tbb::task_arena*>& my_tls;
     tbb::task_arena& my_arena;
     std::atomic<int>& my_failure_counter;
     std::atomic<int>& my_counter;
     utils::SpinBarrier& m_barrier;
 
-    MyObserver(tbb::task_arena& a, tbb::enumerable_thread_specific<tbb::task_arena*>& tls,
-               std::atomic<int>& failure_counter, std::atomic<int>& counter, utils::SpinBarrier& barrier)
-        : tbb::task_scheduler_observer(a), my_tls(tls), my_arena(a), my_failure_counter(failure_counter),
-          my_counter(counter), m_barrier(barrier) {
+    MyObserver(tbb::task_arena& a,
+        tbb::enumerable_thread_specific<tbb::task_arena*>& tls,
+        std::atomic<int>& failure_counter,
+        std::atomic<int>& counter,
+        utils::SpinBarrier& barrier)
+        : tbb::task_scheduler_observer(a), my_tls(tls), my_arena(a),
+        my_failure_counter(failure_counter), my_counter(counter), m_barrier(barrier) {
         observe(true);
     }
+    ~MyObserver(){
+        observe(false);
+    }
     void on_scheduler_entry(bool worker) override {
         if (worker) {
             ++my_counter;
             tbb::task_arena*& cur_arena = my_tls.local();
-            if (cur_arena != 0 && cur_arena != &my_arena) { ++my_failure_counter; }
+            if (cur_arena != nullptr && cur_arena != &my_arena) {
+                ++my_failure_counter;
+            }
             cur_arena = &my_arena;
             m_barrier.wait();
         }
     }
     void on_scheduler_exit(bool worker) override {
         if (worker) {
-            m_barrier.wait();// before wakeup
-            m_barrier.wait();// after wakeup
+            m_barrier.wait(); // before wakeup
+            m_barrier.wait(); // after wakeup
         }
     }
 };
 
 void TestArenaWorkersMigrationWithNumThreads(int n_threads = 0) {
-    if (n_threads == 0) { n_threads = tbb::this_task_arena::max_concurrency(); }
+    if (n_threads == 0) {
+        n_threads = tbb::this_task_arena::max_concurrency();
+    }
 
     const int max_n_arenas = 8;
     int n_arenas = 2;
-    if (n_threads > 16) {
+    if(n_threads > 16) {
         n_arenas = max_n_arenas;
     } else if (n_threads > 8) {
         n_arenas = 4;
@@ -1364,14 +1389,16 @@ void TestArenaWorkersMigrationWithNumThreads(int n_threads = 0) {
 
     int n_workers = n_threads - 1;
     n_workers = n_arenas * (n_workers / n_arenas);
-    if (n_workers == 0) { return; }
+    if (n_workers == 0) {
+        return;
+    }
 
     n_threads = n_workers + 1;
     tbb::global_control control(tbb::global_control::max_allowed_parallelism, n_threads);
 
     const int n_repetitions = 20;
     const int n_outer_repetitions = 100;
-    std::multiset<float> failure_ratio;// for median calculating
+    std::multiset<float> failure_ratio; // for median calculating
     utils::SpinBarrier barrier(n_threads);
     utils::SpinBarrier worker_barrier(n_workers);
     MyObserver* observer[max_n_arenas];
@@ -1381,7 +1408,7 @@ void TestArenaWorkersMigrationWithNumThreads(int n_threads = 0) {
     tbb::enumerable_thread_specific<tbb::task_arena*> tls;
 
     for (int i = 0; i < n_arenas; ++i) {
-        arenas[i].initialize(n_workers / n_arenas + 1);// +1 for master
+        arenas[i].initialize(n_workers / n_arenas + 1); // +1 for master
         observer[i] = new MyObserver(arenas[i], tls, failure_counter, counter, barrier);
     }
 
@@ -1391,19 +1418,17 @@ void TestArenaWorkersMigrationWithNumThreads(int n_threads = 0) {
         counter = 0;
 
         // Main code
-        auto wakeup = [&arenas] {
-            for (auto& a : arenas) a.enqueue([] {});
-        };
+        auto wakeup = [&arenas] { for (auto& a : arenas) a.enqueue([]{}); };
         wakeup();
         for (int j = 0; j < n_repetitions; ++j) {
-            barrier.wait();// entry
-            barrier.wait();// exit1
+            barrier.wait(); // entry
+            barrier.wait(); // exit1
             wakeup();
-            barrier.wait();// exit2
+            barrier.wait(); // exit2
         }
-        barrier.wait();// entry
-        barrier.wait();// exit1
-        barrier.wait();// exit2
+        barrier.wait(); // entry
+        barrier.wait(); // exit1
+        barrier.wait(); // exit2
 
         failure_ratio.insert(float(failure_counter) / counter);
         tls.clear();
@@ -1411,10 +1436,13 @@ void TestArenaWorkersMigrationWithNumThreads(int n_threads = 0) {
         if (ii > 1) {
             std::multiset<float>::iterator it = failure_ratio.begin();
             std::advance(it, failure_ratio.size() / 2);
-            if (*it < 0.02) break;
+            if (*it < 0.02)
+                break;
         }
     }
-    for (int i = 0; i < n_arenas; ++i) { delete observer[i]; }
+    for (int i = 0; i < n_arenas; ++i) {
+        delete observer[i];
+    }
     // check if median is so big
     std::multiset<float>::iterator it = failure_ratio.begin();
     std::advance(it, failure_ratio.size() / 2);
@@ -1427,7 +1455,9 @@ void TestArenaWorkersMigrationWithNumThreads(int n_threads = 0) {
 
 void TestArenaWorkersMigration() {
     TestArenaWorkersMigrationWithNumThreads(4);
-    if (tbb::this_task_arena::max_concurrency() != 4) { TestArenaWorkersMigrationWithNumThreads(); }
+    if (tbb::this_task_arena::max_concurrency() != 4) {
+        TestArenaWorkersMigrationWithNumThreads();
+    }
 }
 
 //--------------------------------------------------//
@@ -1437,29 +1467,21 @@ void TestDefaultCreatedWorkersAmount() {
         REQUIRE_MESSAGE(idx == 0, "more than 1 thread is going to reset TLS");
         utils::SpinBarrier barrier(threads);
         ResetTLS();
-        for (auto blocked : {false, true}) {
+        for (auto blocked : { false, true }) {
             for (int trail = 0; trail < (blocked ? 10 : 10000); ++trail) {
-                tbb::parallel_for(
-                        0, threads,
-                        [threads, blocked, &barrier](int) {
-                            CHECK_FAST_MESSAGE(threads == tbb::this_task_arena::max_concurrency(),
-                                               "concurrency level is not equal specified threadnum");
-                            CHECK_FAST_MESSAGE(tbb::this_task_arena::current_thread_index()
-                                                       < tbb::this_task_arena::max_concurrency(),
-                                               "amount of created threads is more than specified by default");
-                            local_id.local() = 1;
-                            if (blocked) {
-                                // If there is more threads than expected, 'sleep' gives a chance to join unexpected threads.
-                                utils::Sleep(1);
-                                barrier.wait();
-                            }
-                        },
-                        tbb::simple_partitioner());
-                REQUIRE_MESSAGE(local_id.size() <= size_t(threads),
-                                "amount of created threads is not equal to default num");
+                tbb::parallel_for(0, threads, [threads, blocked, &barrier](int) {
+                    CHECK_FAST_MESSAGE(threads == tbb::this_task_arena::max_concurrency(), "concurrency level is not equal specified threadnum");
+                    CHECK_FAST_MESSAGE(tbb::this_task_arena::current_thread_index() < tbb::this_task_arena::max_concurrency(), "amount of created threads is more than specified by default");
+                    local_id.local() = 1;
+                    if (blocked) {
+                        // If there is more threads than expected, 'sleep' gives a chance to join unexpected threads.
+                        utils::Sleep(1);
+                        barrier.wait();
+                    }
+                }, tbb::simple_partitioner());
+                REQUIRE_MESSAGE(local_id.size() <= size_t(threads), "amount of created threads is not equal to default num");
                 if (blocked) {
-                    REQUIRE_MESSAGE(local_id.size() == size_t(threads),
-                                    "amount of created threads is not equal to default num");
+                    REQUIRE_MESSAGE(local_id.size() == size_t(threads), "amount of created threads is not equal to default num");
                 }
             }
         }
@@ -1471,7 +1493,7 @@ void TestAbilityToCreateWorkers(int thread_num) {
     // Checks only some part of reserved-external threads amount:
     // 0 and 1 reserved threads are important cases but it is also needed
     // to collect some statistic data with other amount and to not consume
-    // whole test sesion time checking each amount
+    // whole test session time checking each amount
     TestArenaConcurrency(thread_num - 1, 0, int(thread_num / 2.72));
     TestArenaConcurrency(thread_num, 1, int(thread_num / 3.14));
 }
@@ -1492,17 +1514,21 @@ void ExceptionInExecute() {
     int arena_concurrency = static_cast<int>(thread_number) / 2;
     tbb::task_arena test_arena(arena_concurrency, arena_concurrency);
 
-    std::atomic<int> canceled_task {};
+    std::atomic<int> canceled_task{};
 
-    auto parallel_func = [&test_arena, &canceled_task](std::size_t) {
+    auto parallel_func = [&test_arena, &canceled_task] (std::size_t) {
         for (std::size_t i = 0; i < 1000; ++i) {
             try {
                 test_arena.execute([] {
                     volatile bool suppress_unreachable_code_warning = true;
-                    if (suppress_unreachable_code_warning) { throw - 1; }
+                    if (suppress_unreachable_code_warning) {
+                        throw -1;
+                    }
                 });
                 FAIL("An exception should have thrown.");
-            } catch (int) { ++canceled_task; } catch (...) {
+            } catch (int) {
+                ++canceled_task;
+            } catch (...) {
                 FAIL("Wrong type of exception.");
             }
         }
@@ -1512,45 +1538,57 @@ void ExceptionInExecute() {
     CHECK(canceled_task == thread_number * 1000);
 }
 
-#endif// TBB_USE_EXCEPTIONS
+#endif // TBB_USE_EXCEPTIONS
 
 class simple_observer : public tbb::task_scheduler_observer {
     static std::atomic<int> idx_counter;
     int my_idx;
-    int myMaxConcurrency;  // concurrency of the associated arena
-    int myNumReservedSlots;// reserved slots in the associated arena
-    void on_scheduler_entry(bool is_worker) override {
+    int myMaxConcurrency;   // concurrency of the associated arena
+    int myNumReservedSlots; // reserved slots in the associated arena
+    void on_scheduler_entry( bool is_worker ) override {
         int current_index = tbb::this_task_arena::current_thread_index();
         CHECK(current_index < (myMaxConcurrency > 1 ? myMaxConcurrency : 2));
-        if (is_worker) { CHECK(current_index >= myNumReservedSlots); }
+        if (is_worker) {
+            CHECK(current_index >= myNumReservedSlots);
+        }
     }
-    void on_scheduler_exit(bool /*is_worker*/) override {}
-
+    void on_scheduler_exit( bool /*is_worker*/ ) override
+    {}
 public:
-    simple_observer(tbb::task_arena& a, int maxConcurrency, int numReservedSlots)
-        : tbb::task_scheduler_observer(a), my_idx(idx_counter++), myMaxConcurrency(maxConcurrency),
-          myNumReservedSlots(numReservedSlots) {
+    simple_observer(tbb::task_arena &a, int maxConcurrency, int numReservedSlots)
+        : tbb::task_scheduler_observer(a), my_idx(idx_counter++)
+        , myMaxConcurrency(maxConcurrency)
+        , myNumReservedSlots(numReservedSlots) {
         observe(true);
     }
 
+    ~simple_observer(){
+        observe(false);
+    }
+
     friend bool operator<(const simple_observer& lhs, const simple_observer& rhs) {
         return lhs.my_idx < rhs.my_idx;
     }
 };
 
-std::atomic<int> simple_observer::idx_counter {};
+std::atomic<int> simple_observer::idx_counter{};
 
 struct arena_handler {
-    enum arena_status { alive, deleting, deleted };
+    enum arena_status {
+        alive,
+        deleting,
+        deleted
+    };
 
     tbb::task_arena* arena;
 
-    std::atomic<arena_status> status {alive};
-    tbb::spin_rw_mutex arena_in_use {};
+    std::atomic<arena_status> status{alive};
+    tbb::spin_rw_mutex arena_in_use{};
 
     tbb::concurrent_set<simple_observer> observers;
 
-    arena_handler(tbb::task_arena* ptr) : arena(ptr) {}
+    arena_handler(tbb::task_arena* ptr) : arena(ptr)
+    {}
 
     friend bool operator<(const arena_handler& lhs, const arena_handler& rhs) {
         return lhs.arena < rhs.arena;
@@ -1574,14 +1612,14 @@ void StressTestMixFunctionality() {
     utils::FastRandom<> operation_rnd(42);
     tbb::spin_mutex random_operation_guard;
 
-    auto get_random_operation = [&operation_rnd, &random_operation_guard, operations_number]() {
+    auto get_random_operation = [&operation_rnd, &random_operation_guard, operations_number] () {
         tbb::spin_mutex::scoped_lock lock(random_operation_guard);
         return static_cast<operation_type>(operation_rnd.get() % operations_number);
     };
 
     utils::FastRandom<> arena_rnd(42);
     tbb::spin_mutex random_arena_guard;
-    auto get_random_arena = [&arena_rnd, &random_arena_guard]() {
+    auto get_random_arena = [&arena_rnd, &random_arena_guard] () {
         tbb::spin_mutex::scoped_lock lock(random_arena_guard);
         return arena_rnd.get();
     };
@@ -1592,14 +1630,15 @@ void StressTestMixFunctionality() {
 
     utils::SpinBarrier thread_barrier(thread_number);
     std::size_t max_operations = 20000;
-    std::atomic<std::size_t> curr_operation {};
+    std::atomic<std::size_t> curr_operation{};
 
     auto find_arena = [&arenas_pool](tbb::spin_rw_mutex::scoped_lock& lock) -> decltype(arenas_pool.begin()) {
         for (auto curr_arena = arenas_pool.begin(); curr_arena != arenas_pool.end(); ++curr_arena) {
             if (lock.try_acquire(curr_arena->arena_in_use, /*writer*/ false)) {
                 if (curr_arena->status == arena_handler::alive) {
                     return curr_arena;
-                } else {
+                }
+                else {
                     lock.release();
                 }
             }
@@ -1607,21 +1646,22 @@ void StressTestMixFunctionality() {
         return arenas_pool.end();
     };
 
-    auto thread_func = [&]() {
+    auto thread_func = [&] () {
         arenas_pool.emplace(new tbb::task_arena());
         thread_barrier.wait();
         while (curr_operation++ < max_operations) {
             switch (get_random_operation()) {
-                case create_arena: {
+                case create_arena :
+                {
                     arenas_pool.emplace(new tbb::task_arena());
                     break;
                 }
-                case delete_arena: {
+                case delete_arena :
+                {
                     auto curr_arena = arenas_pool.begin();
                     for (; curr_arena != arenas_pool.end(); ++curr_arena) {
                         arena_handler::arena_status curr_status = arena_handler::alive;
-                        if (curr_arena->status.compare_exchange_strong(curr_status,
-                                                                       arena_handler::deleting)) {
+                        if (curr_arena->status.compare_exchange_strong(curr_status, arena_handler::deleting)) {
                             break;
                         }
                     }
@@ -1635,8 +1675,9 @@ void StressTestMixFunctionality() {
 
                     break;
                 }
-                case attach_observer: {
-                    tbb::spin_rw_mutex::scoped_lock lock {};
+                case attach_observer :
+                {
+                    tbb::spin_rw_mutex::scoped_lock lock{};
 
                     auto curr_arena = find_arena(lock);
                     if (curr_arena != arenas_pool.end()) {
@@ -1644,7 +1685,8 @@ void StressTestMixFunctionality() {
                     }
                     break;
                 }
-                case detach_observer: {
+                case detach_observer:
+                {
                     auto arena_number = get_random_arena() % arenas_pool.size();
                     auto curr_arena = arenas_pool.begin();
                     std::advance(curr_arena, arena_number);
@@ -1658,22 +1700,24 @@ void StressTestMixFunctionality() {
 
                     break;
                 }
-                case arena_execute: {
-                    tbb::spin_rw_mutex::scoped_lock lock {};
+                case arena_execute:
+                {
+                    tbb::spin_rw_mutex::scoped_lock lock{};
                     auto curr_arena = find_arena(lock);
 
                     if (curr_arena != arenas_pool.end()) {
                         curr_arena->arena->execute([]() {
                             tbb::affinity_partitioner aff;
-                            tbb::parallel_for(0, 10000, utils::DummyBody(10), tbb::auto_partitioner {});
+                            tbb::parallel_for(0, 10000, utils::DummyBody(10), tbb::auto_partitioner{});
                             tbb::parallel_for(0, 10000, utils::DummyBody(10), aff);
                         });
                     }
 
                     break;
                 }
-                case enqueue_task: {
-                    tbb::spin_rw_mutex::scoped_lock lock {};
+                case enqueue_task:
+                {
+                    tbb::spin_rw_mutex::scoped_lock lock{};
                     auto curr_arena = find_arena(lock);
 
                     if (curr_arena != arenas_pool.end()) {
@@ -1682,13 +1726,15 @@ void StressTestMixFunctionality() {
 
                     break;
                 }
-                case last_operation_marker:
-                    break;
+                case last_operation_marker :
+                break;
             }
         }
     };
 
-    for (std::size_t i = 0; i < thread_number - 1; ++i) { thread_pool.emplace_back(thread_func); }
+    for (std::size_t i = 0; i < thread_number - 1; ++i) {
+        thread_pool.emplace_back(thread_func);
+    }
 
     thread_func();
 
@@ -1702,17 +1748,16 @@ void StressTestMixFunctionality() {
 }
 
 struct enqueue_test_helper {
-    enqueue_test_helper(tbb::task_arena& arena, tbb::enumerable_thread_specific<bool>& ets,
-                        std::atomic<std::size_t>& task_counter)
-        : my_arena(arena), my_ets(ets), my_task_counter(task_counter) {}
+    enqueue_test_helper(tbb::task_arena& arena, tbb::enumerable_thread_specific<bool>& ets , std::atomic<std::size_t>& task_counter)
+        : my_arena(arena), my_ets(ets), my_task_counter(task_counter)
+    {}
 
-    enqueue_test_helper(const enqueue_test_helper& ef)
-        : my_arena(ef.my_arena), my_ets(ef.my_ets), my_task_counter(ef.my_task_counter) {}
+    enqueue_test_helper(const enqueue_test_helper& ef) : my_arena(ef.my_arena), my_ets(ef.my_ets), my_task_counter(ef.my_task_counter)
+    {}
 
-    void operator()() const {
+    void operator() () const {
         CHECK(my_ets.local());
-        if (my_task_counter++ < 100000)
-            my_arena.enqueue(enqueue_test_helper(my_arena, my_ets, my_task_counter));
+        if (my_task_counter++ < 100000) my_arena.enqueue(enqueue_test_helper(my_arena, my_ets, my_task_counter));
         utils::yield();
     }
 
@@ -1721,87 +1766,161 @@ struct enqueue_test_helper {
     std::atomic<std::size_t>& my_task_counter;
 };
 
+void test_threads_sleep(int concurrency, int reserved_slots, int num_external_threads) {
+    tbb::task_arena a(concurrency, reserved_slots);
+    std::mutex m;
+    std::condition_variable cond_var;
+    bool completed{ false };
+    utils::SpinBarrier barrier( concurrency - reserved_slots + 1 );
+
+    auto body = [&] {
+        std::unique_lock<std::mutex> lock(m);
+        cond_var.wait(lock, [&] { return completed == true; });
+    };
+
+    for (int i = 0; i < concurrency - reserved_slots; ++i) {
+        a.enqueue([&] {
+            body();
+            barrier.signalNoWait();
+        });
+    }
+    std::vector<std::thread> threads;
+    for (int i = 0; i < num_external_threads; ++i) {
+        threads.emplace_back([&]() { a.execute(body); });
+    }
+    TestCPUUserTime(concurrency);
+
+    {
+        std::lock_guard<std::mutex> lock(m);
+        completed = true;
+        cond_var.notify_all();
+    }
+    for (auto& t : threads) {
+        t.join();
+    }
+    barrier.wait();
+}
+
+void test_threads_sleep(int concurrency, int reserved_slots) {
+    test_threads_sleep(concurrency, reserved_slots, reserved_slots);
+    test_threads_sleep(concurrency, reserved_slots, 2 * concurrency);
+}
+
 //--------------------------------------------------//
 
 // This test requires TBB in an uninitialized state
 //! \brief \ref requirement
 TEST_CASE("task_arena initialize soft limit ignoring affinity mask") {
-    REQUIRE_MESSAGE((tbb::this_task_arena::current_thread_index() == tbb::task_arena::not_initialized),
-                    "TBB was initialized state");
+    REQUIRE_MESSAGE((tbb::this_task_arena::current_thread_index() == tbb::task_arena::not_initialized), "TBB was initialized state");
     tbb::enumerable_thread_specific<int> ets;
 
     tbb::task_arena arena(int(utils::get_platform_max_threads() * 2));
     arena.execute([&ets] {
-        tbb::parallel_for(0, 10000000, [&ets](int) {
+        tbb::parallel_for(0, 10000000, [&ets](int){
             ets.local() = 1;
             utils::doDummyWork(100);
         });
     });
 
-    CHECK(ets.combine(std::plus<int> {}) <= int(utils::get_platform_max_threads()));
+    CHECK(ets.combine(std::plus<int>{}) <= int(utils::get_platform_max_threads()));
 }
 
 //! Test for task arena in concurrent cases
 //! \brief \ref requirement
-TEST_CASE("Test for concurrent functionality") { TestConcurrentFunctionality(); }
+TEST_CASE("Test for concurrent functionality") {
+    TestConcurrentFunctionality();
+}
 
+#if !EMSCRIPTEN
+//! For emscripten, FPU control state has not been set correctly
 //! Test for arena entry consistency
 //! \brief \ref requirement \ref error_guessing
-TEST_CASE("Test for task arena entry consistency") { TestArenaEntryConsistency(); }
+TEST_CASE("Test for task arena entry consistency") {
+    TestArenaEntryConsistency();
+}
+#endif
 
 //! Test for task arena attach functionality
 //! \brief \ref requirement \ref interface
-TEST_CASE("Test for the attach functionality") { TestAttach(4); }
+TEST_CASE("Test for the attach functionality") {
+    TestAttach(4);
+}
 
 //! Test for constant functor requirements
 //! \brief \ref requirement \ref interface
-TEST_CASE("Test for constant functor requirement") { TestConstantFunctorRequirement(); }
+TEST_CASE("Test for constant functor requirement") {
+    TestConstantFunctorRequirement();
+}
 
 //! Test for move semantics support
 //! \brief \ref requirement \ref interface
-TEST_CASE("Move semantics support") { TestMoveSemantics(); }
+TEST_CASE("Move semantics support") {
+    TestMoveSemantics();
+}
 
 //! Test for different return value types
 //! \brief \ref requirement \ref interface
-TEST_CASE("Return value test") { TestReturnValue(); }
+TEST_CASE("Return value test") {
+    TestReturnValue();
+}
 
 //! Test for delegated task spawn in case of unsuccessful slot attach
 //! \brief \ref error_guessing
-TEST_CASE("Delegated spawn wait") { TestDelegatedSpawnWait(); }
+TEST_CASE("Delegated spawn wait") {
+    TestDelegatedSpawnWait();
+}
 
+#if !EMSCRIPTEN
+//! For emscripten, FPU control state has not been set correctly
 //! Test task arena isolation functionality
 //! \brief \ref requirement \ref interface
 TEST_CASE("Isolated execute") {
     // Isolation tests cases is valid only for more then 2 threads
-    if (tbb::this_task_arena::max_concurrency() > 2) { TestIsolatedExecute(); }
+    if (tbb::this_task_arena::max_concurrency() > 2) {
+        TestIsolatedExecute();
+    }
 }
+#endif
 
 //! Test for TBB Workers creation limits
 //! \brief \ref requirement
-TEST_CASE("Default workers limit") { TestDefaultWorkersLimit(); }
+TEST_CASE("Default workers limit") {
+    TestDefaultWorkersLimit();
+}
 
 //! Test for workers migration between arenas
 //! \brief \ref error_guessing \ref stress
-TEST_CASE("Arena workers migration") { TestArenaWorkersMigration(); }
+TEST_CASE("Arena workers migration") {
+    TestArenaWorkersMigration();
+}
 
+#if !EMSCRIPTEN
+//! For emscripten, FPU control state has not been set correctly
 //! Test for multiple waits, threads should not block each other
 //! \brief \ref requirement
-TEST_CASE("Multiple waits") { TestMultipleWaits(); }
+TEST_CASE("Multiple waits") {
+    TestMultipleWaits();
+}
+#endif
 
 //! Test for small stack size settings and arena initialization
 //! \brief \ref error_guessing
-TEST_CASE("Small stack size") { TestSmallStackSize(); }
+TEST_CASE("Small stack size") {
+    TestSmallStackSize();
+}
 
 #if TBB_USE_EXCEPTIONS
 //! \brief \ref requirement \ref stress
-TEST_CASE("Test for exceptions during execute.") { ExceptionInExecute(); }
+TEST_CASE("Test for exceptions during execute.") {
+    ExceptionInExecute();
+}
 
 //! \brief \ref error_guessing
 TEST_CASE("Exception thrown during tbb::task_arena::execute call") {
     struct throwing_obj {
         throwing_obj() {
             volatile bool flag = true;
-            if (flag) throw std::exception {};
+            if (flag) throw std::exception{};
         }
         throwing_obj(const throwing_obj&) = default;
         ~throwing_obj() { FAIL("An destructor was called."); }
@@ -1809,11 +1928,21 @@ TEST_CASE("Exception thrown during tbb::task_arena::execute call") {
 
     tbb::task_arena arena;
 
-    REQUIRE_THROWS_AS([&] { arena.execute([] { return throwing_obj {}; }); }(), std::exception);
+    REQUIRE_THROWS_AS( [&] {
+        arena.execute([] {
+            return throwing_obj{};
+        });
+    }(), std::exception );
 }
-#endif// TBB_USE_EXCEPTIONS
+#endif // TBB_USE_EXCEPTIONS
+
 //! \brief \ref stress
-TEST_CASE("Stress test with mixing functionality") { StressTestMixFunctionality(); }
+TEST_CASE("Stress test with mixing functionality") {
+    StressTestMixFunctionality();
+}
+
+// global_control::max_allowed_parallelism functionality is not covered by TCM
+#if !__TBB_TCM_TESTING_ENABLED
 //! \brief \ref stress
 TEST_CASE("Workers oversubscription") {
     std::size_t num_threads = utils::get_platform_max_threads();
@@ -1824,15 +1953,17 @@ TEST_CASE("Workers oversubscription") {
     utils::SpinBarrier barrier(num_threads * 2);
 
     arena.execute([&] {
-        tbb::parallel_for(std::size_t(0), num_threads * 2, [&](const std::size_t&) {
-            ets.local() = true;
-            barrier.wait();
-        });
+        tbb::parallel_for(std::size_t(0), num_threads * 2,
+            [&] (const std::size_t&) {
+                ets.local() = true;
+                barrier.wait();
+            }
+        );
     });
 
     utils::yield();
 
-    std::atomic<std::size_t> task_counter {0};
+    std::atomic<std::size_t> task_counter{0};
     for (std::size_t i = 0; i < num_threads / 4 + 1; ++i) {
         arena.enqueue(enqueue_test_helper(arena, ets, task_counter));
     }
@@ -1840,135 +1971,67 @@ TEST_CASE("Workers oversubscription") {
     while (task_counter < 100000) utils::yield();
 
     arena.execute([&] {
-        tbb::parallel_for(std::size_t(0), num_threads * 2, [&](const std::size_t&) {
-            CHECK(ets.local());
-            barrier.wait();
-        });
-    });
-}
-
-#if __TBB_PREVIEW_TASK_GROUP_EXTENSIONS
-//! Basic test for arena::enqueue with task handle
-//! \brief \ref interface \ref requirement
-TEST_CASE("enqueue task_handle") {
-    tbb::task_arena arena;
-    tbb::task_group tg;
-
-    std::atomic<bool> run {false};
-
-    auto task_handle = tg.defer([&] { run = true; });
-
-    arena.enqueue(std::move(task_handle));
-    tg.wait();
-
-    CHECK(run == true);
-}
-
-//! Basic test for this_task_arena::enqueue with task handle
-//! \brief \ref interface \ref requirement
-TEST_CASE("this_task_arena::enqueue task_handle") {
-    tbb::task_arena arena;
-    tbb::task_group tg;
-
-    std::atomic<bool> run {false};
-
-    arena.execute([&] {
-        auto task_handle = tg.defer([&] { run = true; });
-
-        tbb::this_task_arena::enqueue(std::move(task_handle));
-    });
-
-    tg.wait();
-
-    CHECK(run == true);
-}
-
-//! Basic test for this_task_arena::enqueue with functor
-//! \brief \ref interface \ref requirement
-TEST_CASE("this_task_arena::enqueue function") {
-    tbb::task_arena arena;
-    tbb::task_group tg;
-
-    std::atomic<bool> run {false};
-    //block the task_group to wait on it
-    auto task_handle = tg.defer([] {});
-
-    arena.execute([&] {
-        tbb::this_task_arena::enqueue([&] {
-            run = true;
-            //release the task_group
-            task_handle = tbb::task_handle {};
-        });
+        tbb::parallel_for(std::size_t(0), num_threads * 2,
+            [&] (const std::size_t&) {
+                CHECK(ets.local());
+                barrier.wait();
+            }
+        );
     });
-
-    tg.wait();
-
-    CHECK(run == true);
 }
+#endif
 
 #if TBB_USE_EXCEPTIONS
-//! Basic test for exceptions in task_arena::enqueue with task_handle
-//! \brief \ref interface \ref requirement
-TEST_CASE("task_arena::enqueue(task_handle) exception propagation") {
-    tbb::task_group tg;
-    tbb::task_arena arena;
-
-    tbb::task_handle h = tg.defer([&] {
-        volatile bool suppress_unreachable_code_warning = true;
-        if (suppress_unreachable_code_warning) { throw std::runtime_error {""}; }
-    });
-
-    arena.enqueue(std::move(h));
-
-    CHECK_THROWS_AS(tg.wait(), std::runtime_error);
-}
-
-//! Basic test for exceptions in this_task_arena::enqueue with task_handle
-//! \brief \ref interface \ref requirement
-TEST_CASE("this_task_arena::enqueue(task_handle) exception propagation") {
-    tbb::task_group tg;
-
-    tbb::task_handle h = tg.defer([&] {
-        volatile bool suppress_unreachable_code_warning = true;
-        if (suppress_unreachable_code_warning) { throw std::runtime_error {""}; }
-    });
-
-    tbb::this_task_arena::enqueue(std::move(h));
-
-    CHECK_THROWS_AS(tg.wait(), std::runtime_error);
-}
-
 //! The test for error in scheduling empty task_handle
 //! \brief \ref requirement
-TEST_CASE("Empty task_handle cannot be scheduled") {
+TEST_CASE("Empty task_handle cannot be scheduled"
+        * doctest::should_fail()    //Test needs to revised as implementation uses assertions instead of exceptions
+        * doctest::skip()           //skip the test for now, to not pollute the test log
+){
     tbb::task_arena ta;
 
-    CHECK_THROWS_WITH_AS(ta.enqueue(tbb::task_handle {}), "Attempt to schedule empty task_handle",
-                         std::runtime_error);
-    CHECK_THROWS_WITH_AS(tbb::this_task_arena::enqueue(tbb::task_handle {}),
-                         "Attempt to schedule empty task_handle", std::runtime_error);
+    CHECK_THROWS_WITH_AS(ta.enqueue(tbb::task_handle{}),                    "Attempt to schedule empty task_handle", std::runtime_error);
+    CHECK_THROWS_WITH_AS(tbb::this_task_arena::enqueue(tbb::task_handle{}), "Attempt to schedule empty task_handle", std::runtime_error);
 }
-#endif// TBB_USE_EXCEPTIONS
+#endif
+
+#if !EMSCRIPTEN
+//! For emscripten, FPU control state has not been set correctly
+//! \brief \ref error_guessing
+TEST_CASE("Test threads sleep") {
+    for (auto concurrency_level : utils::concurrency_range()) {
+        int conc = int(concurrency_level);
+        test_threads_sleep(conc, 0);
+        test_threads_sleep(conc, 1);
+        test_threads_sleep(conc, conc/2);
+        test_threads_sleep(conc, conc);
+    }
+}
+#endif
+
+#if __TBB_PREVIEW_TASK_GROUP_EXTENSIONS
 
 //! Basic test for is_inside_task in task_group
 //! \brief \ref interface \ref requirement
-TEST_CASE("is_inside_task in task_group") {
-    CHECK(false == tbb::is_inside_task());
+TEST_CASE("is_inside_task in task_group"){
+    CHECK( false == tbb::is_inside_task());
 
     tbb::task_group tg;
-    tg.run_and_wait([&] { CHECK(true == tbb::is_inside_task()); });
+    tg.run_and_wait([&]{
+        CHECK( true == tbb::is_inside_task());
+    });
 }
 
 //! Basic test for is_inside_task in arena::execute
 //! \brief \ref interface \ref requirement
-TEST_CASE("is_inside_task in arena::execute") {
-    CHECK(false == tbb::is_inside_task());
+TEST_CASE("is_inside_task in arena::execute"){
+    CHECK( false == tbb::is_inside_task());
 
     tbb::task_arena arena;
 
-    arena.execute([&] {
+    arena.execute([&]{
         // The execute method is processed outside of any task
-        CHECK(false == tbb::is_inside_task());
+        CHECK( false == tbb::is_inside_task());
     });
 }
 
@@ -1986,4 +2049,22 @@ TEST_CASE("is_inside_task in arena::execute") {
         });
     });
 }
-#endif//__TBB_PREVIEW_TASK_GROUP_EXTENSIONS
+#endif //__TBB_PREVIEW_TASK_GROUP_EXTENSIONS
+
+//! \brief \ref interface \ref requirement \ref regression
+TEST_CASE("worker threads occupy slots in correct range") {
+    std::vector<tbb::task_arena> arenas(42);
+    for (auto& arena : arenas) {
+        arena.initialize(1, 0);
+    }
+
+    std::atomic<int> counter{0};
+    for (auto& arena : arenas) {
+        arena.enqueue([&] {
+            CHECK(tbb::this_task_arena::current_thread_index() == 0);
+            ++counter;
+        });
+    }
+
+    while (counter < 42) { utils::yield(); }
+}
diff --git a/external/tbb/test/tbb/test_task_group.cpp b/external/tbb/test/tbb/test_task_group.cpp
index 48e8cb63..5ad8355a 100644
--- a/external/tbb/test/tbb/test_task_group.cpp
+++ b/external/tbb/test/tbb/test_task_group.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -14,11 +14,6 @@
     limitations under the License.
 */
 
-#if __TBB_CPF_BUILD
-#define TBB_PREVIEW_ISOLATED_TASK_GROUP 1
-#define TBB_PREVIEW_TASK_GROUP_EXTENSIONS 1
-#endif
-
 #include "common/test.h"
 #include "common/utils.h"
 #include "oneapi/tbb/detail/_config.h"
@@ -45,26 +40,32 @@ unsigned MaxThread = 4;
 
 #include "common/spin_barrier.h"
 
-enum SharingMode { VagabondGroup = 1, ParallelWait = 2 };
+enum SharingMode {
+    VagabondGroup = 1,
+    ParallelWait = 2
+};
 
-template <typename task_group_type>
+template<typename task_group_type>
 class SharedGroupBodyImpl : utils::NoCopy, utils::NoAfterlife {
-    static const std::uintptr_t c_numTasks0 = 4096, c_numTasks1 = 1024;
+    static const std::uintptr_t c_numTasks0 = 4096,
+                        c_numTasks1 = 1024;
 
     const std::uintptr_t m_numThreads;
     const std::uintptr_t m_sharingMode;
 
-    task_group_type* m_taskGroup;
-    atomic_t m_tasksSpawned, m_threadsReady;
+    task_group_type *m_taskGroup;
+    atomic_t m_tasksSpawned,
+             m_threadsReady;
     utils::SpinBarrier m_barrier;
 
     static atomic_t s_tasksExecuted;
 
     struct TaskFunctor {
-        SharedGroupBodyImpl* m_pOwner;
-        void operator()() const {
-            if (m_pOwner->m_sharingMode & ParallelWait) {
-                while (utils::ConcurrencyTracker::PeakParallelism() < m_pOwner->m_numThreads) utils::yield();
+        SharedGroupBodyImpl *m_pOwner;
+        void operator () () const {
+            if ( m_pOwner->m_sharingMode & ParallelWait ) {
+                while ( utils::ConcurrencyTracker::PeakParallelism() < m_pOwner->m_numThreads )
+                    utils::yield();
             }
             ++s_tasksExecuted;
         }
@@ -72,46 +73,52 @@ class SharedGroupBodyImpl : utils::NoCopy, utils::NoAfterlife {
 
     TaskFunctor m_taskFunctor;
 
-    void Spawn(std::uintptr_t numTasks) {
-        for (std::uintptr_t i = 0; i < numTasks; ++i) {
+    void Spawn ( std::uintptr_t numTasks ) {
+        for ( std::uintptr_t i = 0; i < numTasks; ++i ) {
             ++m_tasksSpawned;
             utils::ConcurrencyTracker ct;
-            m_taskGroup->run(m_taskFunctor);
+            m_taskGroup->run( m_taskFunctor );
         }
         ++m_threadsReady;
     }
 
-    void DeleteTaskGroup() {
+    void DeleteTaskGroup () {
         delete m_taskGroup;
-        m_taskGroup = NULL;
+        m_taskGroup = nullptr;
     }
 
-    void Wait() {
-        while (m_threadsReady != m_numThreads) utils::yield();
+    void Wait () {
+        while ( m_threadsReady != m_numThreads )
+            utils::yield();
         const std::uintptr_t numSpawned = c_numTasks0 + c_numTasks1 * (m_numThreads - 1);
-        CHECK_MESSAGE(m_tasksSpawned == numSpawned, "Wrong number of spawned tasks. The test is broken");
-        INFO("Max spawning parallelism is " << utils::ConcurrencyTracker::PeakParallelism() << "out of "
-                                            << g_MaxConcurrency);
-        if (m_sharingMode & ParallelWait) {
-            m_barrier.wait(&utils::ConcurrencyTracker::Reset);
+        CHECK_MESSAGE( m_tasksSpawned == numSpawned, "Wrong number of spawned tasks. The test is broken" );
+        INFO("Max spawning parallelism is " << utils::ConcurrencyTracker::PeakParallelism() << "out of " << g_MaxConcurrency);
+        if ( m_sharingMode & ParallelWait ) {
+            m_barrier.wait( &utils::ConcurrencyTracker::Reset );
             {
                 utils::ConcurrencyTracker ct;
                 m_taskGroup->wait();
             }
-            if (utils::ConcurrencyTracker::PeakParallelism() == 1)
-                WARN("Warning: No parallel waiting detected in TestParallelWait");
+            if ( utils::ConcurrencyTracker::PeakParallelism() == 1 ) {
+                const char* msg = "Warning: No parallel waiting detected in TestParallelWait";
+                WARN( msg );
+            }
             m_barrier.wait();
-        } else
+        }
+        else
             m_taskGroup->wait();
-        CHECK_MESSAGE(m_tasksSpawned == numSpawned,
-                      "No tasks should be spawned after wait starts. The test is broken");
-        CHECK_MESSAGE(s_tasksExecuted == numSpawned, "Not all spawned tasks were executed");
+        CHECK_MESSAGE( m_tasksSpawned == numSpawned, "No tasks should be spawned after wait starts. The test is broken" );
+        CHECK_MESSAGE( s_tasksExecuted == numSpawned, "Not all spawned tasks were executed" );
     }
 
 public:
-    SharedGroupBodyImpl(std::uintptr_t numThreads, std::uintptr_t sharingMode = 0)
-        : m_numThreads(numThreads), m_sharingMode(sharingMode), m_taskGroup(NULL), m_barrier(numThreads) {
-        CHECK_MESSAGE(m_numThreads > 1, "SharedGroupBody tests require concurrency");
+    SharedGroupBodyImpl ( std::uintptr_t numThreads, std::uintptr_t sharingMode = 0 )
+        : m_numThreads(numThreads)
+        , m_sharingMode(sharingMode)
+        , m_taskGroup(nullptr)
+        , m_barrier(numThreads)
+    {
+        CHECK_MESSAGE( m_numThreads > 1, "SharedGroupBody tests require concurrency" );
         if ((m_sharingMode & VagabondGroup) && m_numThreads != 2) {
             CHECK_MESSAGE(false, "In vagabond mode SharedGroupBody must be used with 2 threads only");
         }
@@ -122,25 +129,29 @@ class SharedGroupBodyImpl : utils::NoCopy, utils::NoAfterlife {
         m_taskFunctor.m_pOwner = this;
     }
 
-    void Run(std::uintptr_t idx) {
+    void Run ( std::uintptr_t idx ) {
         AssertLive();
-        if (idx == 0) {
+        if ( idx == 0 ) {
             if (m_taskGroup || m_tasksSpawned) {
                 CHECK_MESSAGE(false, "SharedGroupBody must be reset before reuse");
             }
             m_taskGroup = new task_group_type;
-            Spawn(c_numTasks0);
+            Spawn( c_numTasks0 );
             Wait();
-            if (m_sharingMode & VagabondGroup) m_barrier.wait();
+            if ( m_sharingMode & VagabondGroup )
+                m_barrier.wait();
             else
                 DeleteTaskGroup();
-        } else {
-            while (m_tasksSpawned == 0) utils::yield();
-            CHECK_MESSAGE(m_taskGroup, "Task group is not initialized");
-            Spawn(c_numTasks1);
-            if (m_sharingMode & ParallelWait) Wait();
-            if (m_sharingMode & VagabondGroup) {
-                CHECK_MESSAGE(idx == 1, "In vagabond mode SharedGroupBody must be used with 2 threads only");
+        }
+        else {
+            while ( m_tasksSpawned == 0 )
+                utils::yield();
+            CHECK_MESSAGE ( m_taskGroup, "Task group is not initialized");
+            Spawn (c_numTasks1);
+            if ( m_sharingMode & ParallelWait )
+                Wait();
+            if ( m_sharingMode & VagabondGroup ) {
+                CHECK_MESSAGE ( idx == 1, "In vagabond mode SharedGroupBody must be used with 2 threads only" );
                 m_barrier.wait();
                 DeleteTaskGroup();
             }
@@ -149,39 +160,44 @@ class SharedGroupBodyImpl : utils::NoCopy, utils::NoAfterlife {
     }
 };
 
-template <typename task_group_type>
+template<typename task_group_type>
 atomic_t SharedGroupBodyImpl<task_group_type>::s_tasksExecuted;
 
-template <typename task_group_type>
-class SharedGroupBody : utils::NoAssign, utils::NoAfterlife {
+template<typename task_group_type>
+class  SharedGroupBody : utils::NoAssign, utils::NoAfterlife {
     bool m_bOwner;
-    SharedGroupBodyImpl<task_group_type>* m_pImpl;
-
+    SharedGroupBodyImpl<task_group_type> *m_pImpl;
 public:
-    SharedGroupBody(std::uintptr_t numThreads, std::uintptr_t sharingMode = 0)
-        : utils::NoAssign(), utils::NoAfterlife(), m_bOwner(true),
-          m_pImpl(new SharedGroupBodyImpl<task_group_type>(numThreads, sharingMode)) {}
-    SharedGroupBody(const SharedGroupBody& src)
-        : utils::NoAssign(), utils::NoAfterlife(), m_bOwner(false), m_pImpl(src.m_pImpl) {}
-    ~SharedGroupBody() {
-        if (m_bOwner) delete m_pImpl;
+    SharedGroupBody ( std::uintptr_t numThreads, std::uintptr_t sharingMode = 0 )
+        : utils::NoAssign()
+        , utils::NoAfterlife()
+        , m_bOwner(true)
+        , m_pImpl( new SharedGroupBodyImpl<task_group_type>(numThreads, sharingMode) )
+    {}
+    SharedGroupBody ( const SharedGroupBody& src )
+        : utils::NoAssign()
+        , utils::NoAfterlife()
+        , m_bOwner(false)
+        , m_pImpl(src.m_pImpl)
+    {}
+    ~SharedGroupBody () {
+        if ( m_bOwner )
+            delete m_pImpl;
     }
-    void operator()(std::uintptr_t idx) const {
+    void operator() ( std::uintptr_t idx ) const {
         // Wrap the functior into additional task group to enforce bounding.
         task_group_type tg;
         tg.run_and_wait([&] { m_pImpl->Run(idx); });
     }
 };
 
-template <typename task_group_type>
+template<typename task_group_type>
 class RunAndWaitSyncronizationTestBody : utils::NoAssign {
     utils::SpinBarrier& m_barrier;
     std::atomic<bool>& m_completed;
     task_group_type& m_tg;
-
 public:
-    RunAndWaitSyncronizationTestBody(utils::SpinBarrier& barrier, std::atomic<bool>& completed,
-                                     task_group_type& tg)
+    RunAndWaitSyncronizationTestBody(utils::SpinBarrier& barrier, std::atomic<bool>& completed, task_group_type& tg)
         : m_barrier(barrier), m_completed(completed), m_tg(tg) {}
 
     void operator()() const {
@@ -196,38 +212,37 @@ class RunAndWaitSyncronizationTestBody : utils::NoAssign {
         } else {
             m_barrier.wait();
             m_tg.wait();
-            CHECK_MESSAGE(m_completed,
-                          "A concurrent waiter has left the wait method earlier than work has finished");
+            CHECK_MESSAGE(m_completed, "A concurrent waiter has left the wait method earlier than work has finished");
         }
     }
 };
 
-template <typename task_group_type>
-void TestParallelSpawn() {
-    NativeParallelFor(g_MaxConcurrency, SharedGroupBody<task_group_type>(g_MaxConcurrency));
+template<typename task_group_type>
+void TestParallelSpawn () {
+    NativeParallelFor( g_MaxConcurrency, SharedGroupBody<task_group_type>(g_MaxConcurrency) );
 }
 
-template <typename task_group_type>
-void TestParallelWait() {
-    NativeParallelFor(g_MaxConcurrency, SharedGroupBody<task_group_type>(g_MaxConcurrency, ParallelWait));
+template<typename task_group_type>
+void TestParallelWait () {
+    NativeParallelFor( g_MaxConcurrency, SharedGroupBody<task_group_type>(g_MaxConcurrency, ParallelWait) );
 
     utils::SpinBarrier barrier(g_MaxConcurrency);
     std::atomic<bool> completed;
     completed = false;
     task_group_type tg;
     RunAndWaitSyncronizationTestBody<task_group_type> b(barrier, completed, tg);
-    NativeParallelFor(g_MaxConcurrency, b);
+    NativeParallelFor( g_MaxConcurrency, b );
 }
 
 // Tests non-stack-bound task group (the group that is allocated by one thread and destroyed by the other)
-template <typename task_group_type>
-void TestVagabondGroup() {
-    NativeParallelFor(2, SharedGroupBody<task_group_type>(2, VagabondGroup));
+template<typename task_group_type>
+void TestVagabondGroup () {
+    NativeParallelFor( 2, SharedGroupBody<task_group_type>(2, VagabondGroup) );
 }
 
 #include "common/memory_usage.h"
 
-template <typename task_group_type>
+template<typename task_group_type>
 void TestThreadSafety() {
     auto tests = [] {
         for (int trail = 0; trail < 10; ++trail) {
@@ -245,7 +260,9 @@ void TestThreadSafety() {
     for (;;) {
         tests();
         std::size_t current = utils::GetMemoryUsage();
-        if (current <= initial) { return; }
+        if (current <= initial) {
+            return;
+        }
         initial = current;
     }
 }
@@ -258,28 +275,28 @@ const std::uintptr_t F = 6765;
 
 atomic_t g_Sum;
 
-#define FIB_TEST_PROLOGUE()                                                                                  \
-    const unsigned numRepeats = g_MaxConcurrency * 4;                                                        \
+#define FIB_TEST_PROLOGUE() \
+    const unsigned numRepeats = g_MaxConcurrency * 4;    \
     utils::ConcurrencyTracker::Reset()
 
-#define FIB_TEST_EPILOGUE(sum)                                                                               \
-    CHECK(utils::ConcurrencyTracker::PeakParallelism() <= g_MaxConcurrency);                                 \
-    CHECK(sum == numRepeats * F);
+#define FIB_TEST_EPILOGUE(sum) \
+    CHECK(utils::ConcurrencyTracker::PeakParallelism() <= g_MaxConcurrency); \
+    CHECK( sum == numRepeats * F );
+
 
 // Fibonacci tasks specified as functors
-template <class task_group_type>
+template<class task_group_type>
 class FibTaskBase : utils::NoAssign, utils::NoAfterlife {
 protected:
     std::uintptr_t* m_pRes;
     mutable std::uintptr_t m_Num;
     virtual void impl() const = 0;
-
 public:
-    FibTaskBase(std::uintptr_t* y, std::uintptr_t n) : m_pRes(y), m_Num(n) {}
+    FibTaskBase( std::uintptr_t* y, std::uintptr_t n ) : m_pRes(y), m_Num(n) {}
     void operator()() const {
         utils::ConcurrencyTracker ct;
         AssertLive();
-        if (m_Num < 2) {
+        if( m_Num < 2 ) {
             *m_pRes = m_Num;
         } else {
             impl();
@@ -288,115 +305,109 @@ class FibTaskBase : utils::NoAssign, utils::NoAfterlife {
     virtual ~FibTaskBase() {}
 };
 
-template <class task_group_type>
+template<class task_group_type>
 class FibTaskAsymmetricTreeWithFunctor : public FibTaskBase<task_group_type> {
 public:
-    FibTaskAsymmetricTreeWithFunctor(std::uintptr_t* y, std::uintptr_t n)
-        : FibTaskBase<task_group_type>(y, n) {}
+    FibTaskAsymmetricTreeWithFunctor( std::uintptr_t* y, std::uintptr_t n ) : FibTaskBase<task_group_type>(y, n) {}
     virtual void impl() const override {
         std::uintptr_t x = ~0u;
         task_group_type tg;
-        tg.run(FibTaskAsymmetricTreeWithFunctor(&x, this->m_Num - 1));
-        this->m_Num -= 2;
-        tg.run_and_wait(*this);
+        tg.run( FibTaskAsymmetricTreeWithFunctor(&x, this->m_Num-1) );
+        this->m_Num -= 2; tg.run_and_wait( *this );
         *(this->m_pRes) += x;
     }
 };
 
-template <class task_group_type>
+template<class task_group_type>
 class FibTaskSymmetricTreeWithFunctor : public FibTaskBase<task_group_type> {
 public:
-    FibTaskSymmetricTreeWithFunctor(std::uintptr_t* y, std::uintptr_t n)
-        : FibTaskBase<task_group_type>(y, n) {}
+    FibTaskSymmetricTreeWithFunctor( std::uintptr_t* y, std::uintptr_t n ) : FibTaskBase<task_group_type>(y, n) {}
     virtual void impl() const override {
-        std::uintptr_t x = ~0u, y = ~0u;
+        std::uintptr_t x = ~0u,
+               y = ~0u;
         task_group_type tg;
-        tg.run(FibTaskSymmetricTreeWithFunctor(&x, this->m_Num - 1));
-        tg.run(FibTaskSymmetricTreeWithFunctor(&y, this->m_Num - 2));
+        tg.run( FibTaskSymmetricTreeWithFunctor(&x, this->m_Num-1) );
+        tg.run( FibTaskSymmetricTreeWithFunctor(&y, this->m_Num-2) );
         tg.wait();
         *(this->m_pRes) = x + y;
     }
 };
 
 // Helper functions
-template <class fib_task>
+template<class fib_task>
 std::uintptr_t RunFibTask(std::uintptr_t n) {
     std::uintptr_t res = ~0u;
     fib_task(&res, n)();
     return res;
 }
 
-template <typename fib_task>
+template<typename fib_task>
 void RunFibTest() {
     FIB_TEST_PROLOGUE();
     std::uintptr_t sum = 0;
-    for (unsigned i = 0; i < numRepeats; ++i) sum += RunFibTask<fib_task>(N);
+    for( unsigned i = 0; i < numRepeats; ++i )
+        sum += RunFibTask<fib_task>(N);
     FIB_TEST_EPILOGUE(sum);
 }
 
-template <typename fib_task>
+template<typename fib_task>
 void FibFunctionNoArgs() {
     g_Sum += RunFibTask<fib_task>(N);
 }
 
-template <typename task_group_type>
+template<typename task_group_type>
 void TestFibWithLambdas() {
     FIB_TEST_PROLOGUE();
     atomic_t sum;
     sum = 0;
     task_group_type tg;
-    for (unsigned i = 0; i < numRepeats; ++i)
-        tg.run([&]() { sum += RunFibTask<FibTaskSymmetricTreeWithFunctor<task_group_type>>(N); });
+    for( unsigned i = 0; i < numRepeats; ++i )
+        tg.run( [&](){sum += RunFibTask<FibTaskSymmetricTreeWithFunctor<task_group_type> >(N);} );
     tg.wait();
     FIB_TEST_EPILOGUE(sum);
 }
 
-template <typename task_group_type>
+template<typename task_group_type>
 void TestFibWithFunctor() {
-    RunFibTest<FibTaskAsymmetricTreeWithFunctor<task_group_type>>();
-    RunFibTest<FibTaskSymmetricTreeWithFunctor<task_group_type>>();
+    RunFibTest<FibTaskAsymmetricTreeWithFunctor<task_group_type> >();
+    RunFibTest< FibTaskSymmetricTreeWithFunctor<task_group_type> >();
 }
 
-template <typename task_group_type>
+template<typename task_group_type>
 void TestFibWithFunctionPtr() {
     FIB_TEST_PROLOGUE();
     g_Sum = 0;
     task_group_type tg;
-    for (unsigned i = 0; i < numRepeats; ++i)
-        tg.run(&FibFunctionNoArgs<FibTaskSymmetricTreeWithFunctor<task_group_type>>);
+    for( unsigned i = 0; i < numRepeats; ++i )
+        tg.run( &FibFunctionNoArgs<FibTaskSymmetricTreeWithFunctor<task_group_type> > );
     tg.wait();
     FIB_TEST_EPILOGUE(g_Sum);
 }
 
-template <typename task_group_type>
+template<typename task_group_type>
 void RunFibonacciTests() {
     TestFibWithLambdas<task_group_type>();
     TestFibWithFunctor<task_group_type>();
     TestFibWithFunctionPtr<task_group_type>();
 }
 
-class test_exception : public std::exception {
+class test_exception : public std::exception
+{
     const char* m_strDescription;
-
 public:
-    test_exception(const char* descr) : m_strDescription(descr) {}
+    test_exception ( const char* descr ) : m_strDescription(descr) {}
 
-    const char* what() const throw() override { return m_strDescription; }
+    const char* what() const noexcept override { return m_strDescription; }
 };
 
-#if TBB_USE_CAPTURED_EXCEPTION
-#include "tbb/tbb_exception.h"
-typedef tbb::captured_exception TestException;
-#else
-typedef test_exception TestException;
-#endif
+using TestException = test_exception;
 
 #include <string.h>
 
-#define NUM_CHORES 512
-#define NUM_GROUPS 64
-#define SKIP_CHORES (NUM_CHORES / 4)
-#define SKIP_GROUPS (NUM_GROUPS / 4)
+#define NUM_CHORES      512
+#define NUM_GROUPS      64
+#define SKIP_CHORES     (NUM_CHORES/4)
+#define SKIP_GROUPS     (NUM_GROUPS/4)
 #define EXCEPTION_DESCR1 "Test exception 1"
 #define EXCEPTION_DESCR2 "Test exception 2"
 
@@ -407,24 +418,26 @@ bool g_Rethrow;
 bool g_Throw;
 
 class ThrowingTask : utils::NoAssign, utils::NoAfterlife {
-    atomic_t& m_TaskCount;
-
+    atomic_t &m_TaskCount;
 public:
-    ThrowingTask(atomic_t& counter) : m_TaskCount(counter) {}
-    void operator()() const {
+    ThrowingTask( atomic_t& counter ) : m_TaskCount(counter) {}
+    void operator() () const {
         utils::ConcurrencyTracker ct;
         AssertLive();
-        if (g_Throw) {
-            if (++m_TaskCount == SKIP_CHORES) TBB_TEST_THROW(test_exception(EXCEPTION_DESCR1));
+        if ( g_Throw ) {
+            if ( ++m_TaskCount == SKIP_CHORES )
+                TBB_TEST_THROW(test_exception(EXCEPTION_DESCR1));
             utils::yield();
-        } else {
+        }
+        else {
             ++g_TaskCount;
-            while (!tbb::is_current_task_group_canceling()) utils::yield();
+            while( !tbb::is_current_task_group_canceling() )
+                utils::yield();
         }
     }
 };
 
-inline void ResetGlobals(bool bThrow, bool bRethrow) {
+inline void ResetGlobals ( bool bThrow, bool bRethrow ) {
     g_Throw = bThrow;
     g_Rethrow = bRethrow;
     g_ExceptionCount = 0;
@@ -432,17 +445,15 @@ inline void ResetGlobals(bool bThrow, bool bRethrow) {
     utils::ConcurrencyTracker::Reset();
 }
 
-template <typename task_group_type>
-void LaunchChildrenWithFunctor() {
+template<typename task_group_type>
+void LaunchChildrenWithFunctor () {
     atomic_t count;
     count = 0;
     task_group_type g;
     for (unsigned i = 0; i < NUM_CHORES; ++i) {
-#if __TBB_PREVIEW_TASK_GROUP_EXTENSIONS
         if (i % 2 == 1) {
             g.run(g.defer(ThrowingTask(count)));
         } else
-#endif
         {
             g.run(ThrowingTask(count));
         }
@@ -452,89 +463,87 @@ void LaunchChildrenWithFunctor() {
     bool exceptionCaught = false;
     try {
         status = g.wait();
-    } catch (TestException& e) {
-        CHECK_MESSAGE(e.what(), "Empty what() string");
-        CHECK_MESSAGE(strcmp(e.what(), EXCEPTION_DESCR1) == 0, "Unknown exception");
+    } catch ( TestException& e ) {
+        CHECK_MESSAGE( e.what(), "Empty what() string" );
+        CHECK_MESSAGE( strcmp(e.what(), EXCEPTION_DESCR1) == 0, "Unknown exception" );
         exceptionCaught = true;
         ++g_ExceptionCount;
-    } catch (...) { CHECK_MESSAGE(false, "Unknown exception"); }
+    } catch( ... ) { CHECK_MESSAGE( false, "Unknown exception" ); }
     if (g_Throw && !exceptionCaught && status != tbb::canceled) {
         CHECK_MESSAGE(false, "No exception in the child task group");
     }
-    if (g_Rethrow && g_ExceptionCount > SKIP_GROUPS) { throw test_exception(EXCEPTION_DESCR2); }
+    if ( g_Rethrow && g_ExceptionCount > SKIP_GROUPS ) {
+        throw test_exception(EXCEPTION_DESCR2);
+    }
 #else
     g.wait();
 #endif
 }
 
 // Tests for cancellation and exception handling behavior
-template <typename task_group_type>
-void TestManualCancellationWithFunctor() {
-    ResetGlobals(false, false);
+template<typename task_group_type>
+void TestManualCancellationWithFunctor () {
+    ResetGlobals( false, false );
     task_group_type tg;
     for (unsigned i = 0; i < NUM_GROUPS; ++i) {
         // TBB version does not require taking function address
-#if __TBB_PREVIEW_TASK_GROUP_EXTENSIONS
         if (i % 2 == 0) {
             auto h = tg.defer(&LaunchChildrenWithFunctor<task_group_type>);
             tg.run(std::move(h));
         } else
-#endif
         {
             tg.run(&LaunchChildrenWithFunctor<task_group_type>);
         }
     }
-    CHECK_MESSAGE(!tbb::is_current_task_group_canceling(), "Unexpected cancellation");
-    while (g_MaxConcurrency > 1 && g_TaskCount == 0) utils::yield();
+    CHECK_MESSAGE ( !tbb::is_current_task_group_canceling(), "Unexpected cancellation" );
+    while ( g_MaxConcurrency > 1 && g_TaskCount == 0 )
+        utils::yield();
     tg.cancel();
     g_ExecutedAtCancellation = int(g_TaskCount);
     tbb::task_group_status status = tg.wait();
-    CHECK_MESSAGE(status == tbb::canceled, "Task group reported invalid status.");
-    CHECK_MESSAGE(g_TaskCount <= NUM_GROUPS * NUM_CHORES, "Too many tasks reported. The test is broken");
-    CHECK_MESSAGE(g_TaskCount < NUM_GROUPS * NUM_CHORES,
-                  "No tasks were cancelled. Cancellation model changed?");
-    CHECK_MESSAGE(g_TaskCount <= g_ExecutedAtCancellation + utils::ConcurrencyTracker::PeakParallelism(),
-                  "Too many tasks survived cancellation");
+    CHECK_MESSAGE( status == tbb::canceled, "Task group reported invalid status." );
+    CHECK_MESSAGE( g_TaskCount <= NUM_GROUPS * NUM_CHORES, "Too many tasks reported. The test is broken" );
+    CHECK_MESSAGE( g_TaskCount < NUM_GROUPS * NUM_CHORES, "No tasks were cancelled. Cancellation model changed?" );
+    CHECK_MESSAGE( g_TaskCount <= g_ExecutedAtCancellation + utils::ConcurrencyTracker::PeakParallelism(), "Too many tasks survived cancellation" );
 }
 
 #if TBB_USE_EXCEPTIONS
-template <typename task_group_type>
-void TestExceptionHandling1() {
-    ResetGlobals(true, false);
+template<typename task_group_type>
+void TestExceptionHandling1 () {
+    ResetGlobals( true, false );
     task_group_type tg;
-    for (unsigned i = 0; i < NUM_GROUPS; ++i)
+    for( unsigned i = 0; i < NUM_GROUPS; ++i )
         // TBB version does not require taking function address
-        tg.run(&LaunchChildrenWithFunctor<task_group_type>);
+        tg.run( &LaunchChildrenWithFunctor<task_group_type> );
     try {
         tg.wait();
-    } catch (...) { CHECK_MESSAGE(false, "Unexpected exception"); }
-    CHECK_MESSAGE(g_ExceptionCount <= NUM_GROUPS,
-                  "Too many exceptions from the child groups. The test is broken");
-    CHECK_MESSAGE(g_ExceptionCount == NUM_GROUPS, "Not all child groups threw the exception");
+    } catch ( ... ) {
+        CHECK_MESSAGE( false, "Unexpected exception" );
+    }
+    CHECK_MESSAGE( g_ExceptionCount <= NUM_GROUPS, "Too many exceptions from the child groups. The test is broken" );
+    CHECK_MESSAGE( g_ExceptionCount == NUM_GROUPS, "Not all child groups threw the exception" );
 }
 
-template <typename task_group_type>
-void TestExceptionHandling2() {
-    ResetGlobals(true, true);
+template<typename task_group_type>
+void TestExceptionHandling2 () {
+    ResetGlobals( true, true );
     task_group_type tg;
     bool exceptionCaught = false;
-    for (unsigned i = 0; i < NUM_GROUPS; ++i) {
+    for( unsigned i = 0; i < NUM_GROUPS; ++i ) {
         // TBB version does not require taking function address
-        tg.run(&LaunchChildrenWithFunctor<task_group_type>);
+        tg.run( &LaunchChildrenWithFunctor<task_group_type> );
     }
     try {
         tg.wait();
-    } catch (TestException& e) {
-        CHECK_MESSAGE(e.what(), "Empty what() string");
-        CHECK_MESSAGE(strcmp(e.what(), EXCEPTION_DESCR2) == 0, "Unknown exception");
+    } catch ( TestException& e ) {
+        CHECK_MESSAGE( e.what(), "Empty what() string" );
+        CHECK_MESSAGE( strcmp(e.what(), EXCEPTION_DESCR2) == 0, "Unknown exception" );
         exceptionCaught = true;
-    } catch (...) { CHECK_MESSAGE(false, "Unknown exception"); }
-    CHECK_MESSAGE(exceptionCaught, "No exception thrown from the root task group");
-    CHECK_MESSAGE(g_ExceptionCount >= SKIP_GROUPS,
-                  "Too few exceptions from the child groups. The test is broken");
-    CHECK_MESSAGE(g_ExceptionCount <= NUM_GROUPS - SKIP_GROUPS,
-                  "Too many exceptions from the child groups. The test is broken");
-    CHECK_MESSAGE(g_ExceptionCount < NUM_GROUPS - SKIP_GROUPS, "None of the child groups was cancelled");
+    } catch( ... ) { CHECK_MESSAGE( false, "Unknown exception" ); }
+    CHECK_MESSAGE( exceptionCaught, "No exception thrown from the root task group" );
+    CHECK_MESSAGE( g_ExceptionCount >= SKIP_GROUPS, "Too few exceptions from the child groups. The test is broken" );
+    CHECK_MESSAGE( g_ExceptionCount <= NUM_GROUPS - SKIP_GROUPS, "Too many exceptions from the child groups. The test is broken" );
+    CHECK_MESSAGE( g_ExceptionCount < NUM_GROUPS - SKIP_GROUPS, "None of the child groups was cancelled" );
 }
 
 template <typename task_group_type>
@@ -543,58 +552,69 @@ void TestExceptionHandling3() {
     try {
         tg.run_and_wait([]() {
             volatile bool suppress_unreachable_code_warning = true;
-            if (suppress_unreachable_code_warning) { throw 1; }
+            if (suppress_unreachable_code_warning) {
+                throw 1;
+            }
         });
-    } catch (int error) { CHECK(error == 1); } catch (...) {
-        CHECK_MESSAGE(false, "Unexpected exception");
+    } catch (int error) {
+        CHECK(error == 1);
+    } catch ( ... ) {
+        CHECK_MESSAGE( false, "Unexpected exception" );
     }
 }
 
-template <typename task_group_type>
+template<typename task_group_type>
 class LaunchChildrenDriver {
 public:
     void Launch(task_group_type& tg) {
         ResetGlobals(false, false);
-        for (unsigned i = 0; i < NUM_GROUPS; ++i) { tg.run(LaunchChildrenWithFunctor<task_group_type>); }
+        for (unsigned i = 0; i < NUM_GROUPS; ++i) {
+            tg.run(LaunchChildrenWithFunctor<task_group_type>);
+        }
         CHECK_MESSAGE(!tbb::is_current_task_group_canceling(), "Unexpected cancellation");
-        while (g_MaxConcurrency > 1 && g_TaskCount == 0) utils::yield();
+        while (g_MaxConcurrency > 1 && g_TaskCount == 0)
+            utils::yield();
     }
 
     void Finish() {
         CHECK_MESSAGE(g_TaskCount <= NUM_GROUPS * NUM_CHORES, "Too many tasks reported. The test is broken");
-        CHECK_MESSAGE(g_TaskCount < NUM_GROUPS * NUM_CHORES,
-                      "No tasks were cancelled. Cancellation model changed?");
-        CHECK_MESSAGE(g_TaskCount <= g_ExecutedAtCancellation + g_MaxConcurrency,
-                      "Too many tasks survived cancellation");
+        CHECK_MESSAGE(g_TaskCount < NUM_GROUPS * NUM_CHORES, "No tasks were cancelled. Cancellation model changed?");
+        CHECK_MESSAGE(g_TaskCount <= g_ExecutedAtCancellation + g_MaxConcurrency, "Too many tasks survived cancellation");
     }
-};// LaunchChildrenWithTaskHandleDriver
+}; // LaunchChildrenWithTaskHandleDriver
 
-template <typename task_group_type, bool Throw>
-void TestMissingWait() {
-    bool exception_occurred = false, unexpected_exception = false;
+template<typename task_group_type, bool Throw>
+void TestMissingWait () {
+    bool exception_occurred = false,
+         unexpected_exception = false;
     LaunchChildrenDriver<task_group_type> driver;
     try {
         task_group_type tg;
-        driver.Launch(tg);
+        driver.Launch( tg );
         volatile bool suppress_unreachable_code_warning = Throw;
         if (suppress_unreachable_code_warning) {
-            throw int();// Initiate stack unwinding
+            throw int(); // Initiate stack unwinding
         }
-    } catch (const tbb::missing_wait& e) {
-        CHECK_MESSAGE(e.what(), "Error message is absent");
+    }
+    catch ( const tbb::missing_wait& e ) {
+        CHECK_MESSAGE( e.what(), "Error message is absent" );
         exception_occurred = true;
         unexpected_exception = Throw;
-    } catch (int) {
+    }
+    catch ( int ) {
         exception_occurred = true;
         unexpected_exception = !Throw;
-    } catch (...) { exception_occurred = unexpected_exception = true; }
-    CHECK(exception_occurred);
-    CHECK(!unexpected_exception);
+    }
+    catch ( ... ) {
+        exception_occurred = unexpected_exception = true;
+    }
+    CHECK( exception_occurred );
+    CHECK( !unexpected_exception );
     driver.Finish();
 }
 #endif
 
-template <typename task_group_type>
+template<typename task_group_type>
 void RunCancellationAndExceptionHandlingTests() {
     TestManualCancellationWithFunctor<task_group_type>();
 #if TBB_USE_EXCEPTIONS
@@ -606,21 +626,19 @@ void RunCancellationAndExceptionHandlingTests() {
 #endif
 }
 
-void EmptyFunction() {}
+void EmptyFunction () {}
 
 struct TestFunctor {
-    void operator()() { CHECK_MESSAGE(false, "Non-const operator called"); }
-    void operator()() const { /* library requires this overload only */
-    }
+    void operator()() { CHECK_MESSAGE( false, "Non-const operator called" ); }
+    void operator()() const { /* library requires this overload only */ }
 };
 
-template <typename task_group_type>
+template<typename task_group_type>
 void TestConstantFunctorRequirement() {
     task_group_type g;
     TestFunctor tf;
-    g.run(tf);
-    g.wait();
-    g.run_and_wait(tf);
+    g.run( tf ); g.wait();
+    g.run_and_wait( tf );
 }
 
 //------------------------------------------------------------------------
@@ -647,29 +665,29 @@ namespace TestMoveSemanticsNS {
         NoMoveNoCopyFunctor(NoMoveNoCopyFunctor&&);
     };
 
-    template <typename task_group_type>
+     template<typename task_group_type>
     void TestBareFunctors() {
         task_group_type tg;
         MovePreferableFunctor mpf;
         // run_and_wait() doesn't have any copies or moves of arguments inside the impl
-        tg.run_and_wait(NoMoveNoCopyFunctor());
+        tg.run_and_wait( NoMoveNoCopyFunctor() );
 
-        tg.run(MoveOnlyFunctor());
+        tg.run( MoveOnlyFunctor() );
         tg.wait();
 
-        tg.run(mpf);
+        tg.run( mpf );
         tg.wait();
         CHECK_MESSAGE(mpf.alive, "object was moved when was passed by lval");
         mpf.Reset();
 
-        tg.run(std::move(mpf));
+        tg.run( std::move(mpf) );
         tg.wait();
         CHECK_MESSAGE(!mpf.alive, "object was copied when was passed by rval");
         mpf.Reset();
     }
-}// namespace TestMoveSemanticsNS
+}
 
-template <typename task_group_type>
+template<typename task_group_type>
 void TestMoveSemantics() {
     TestMoveSemanticsNS::TestBareFunctors<task_group_type>();
 }
@@ -682,25 +700,27 @@ namespace TestIsolationNS {
     public:
         DummyFunctor() {}
         void operator()() const {
-            for (volatile int j = 0; j < 10; ++j) {}
+            for ( volatile int j = 0; j < 10; ++j ) {}
         }
     };
 
-    template <typename task_group_type>
+    template<typename task_group_type>
     class ParForBody {
         task_group_type& m_tg;
         std::atomic<bool>& m_preserved;
         tbb::enumerable_thread_specific<int>& m_ets;
-
     public:
-        ParForBody(task_group_type& tg, std::atomic<bool>& preserved,
-                   tbb::enumerable_thread_specific<int>& ets)
-            : m_tg(tg), m_preserved(preserved), m_ets(ets) {}
+        ParForBody(
+            task_group_type& tg,
+            std::atomic<bool>& preserved,
+            tbb::enumerable_thread_specific<int>& ets
+        ) : m_tg(tg), m_preserved(preserved), m_ets(ets) {}
 
         void operator()(int) const {
             if (++m_ets.local() > 1) m_preserved = false;
 
-            for (int i = 0; i < 1000; ++i) m_tg.run(DummyFunctor());
+            for (int i = 0; i < 1000; ++i)
+                m_tg.run(DummyFunctor());
             m_tg.wait();
             m_tg.run_and_wait(DummyFunctor());
 
@@ -708,7 +728,7 @@ namespace TestIsolationNS {
         }
     };
 
-    template <typename task_group_type>
+    template<typename task_group_type>
     void CheckIsolation(bool isolation_is_expected) {
         task_group_type tg;
         std::atomic<bool> isolation_is_preserved;
@@ -717,8 +737,10 @@ namespace TestIsolationNS {
 
         tbb::parallel_for(0, 100, ParForBody<task_group_type>(tg, isolation_is_preserved, ets));
 
-        ASSERT(isolation_is_expected == isolation_is_preserved,
-               "Actual and expected isolation-related behaviours are different");
+        ASSERT(
+            isolation_is_expected == isolation_is_preserved,
+            "Actual and expected isolation-related behaviours are different"
+        );
     }
 
     // Should be called only when > 1 thread is used, because otherwise isolation is guaranteed to take place
@@ -726,14 +748,15 @@ namespace TestIsolationNS {
         CheckIsolation<tbb::task_group>(false);
         CheckIsolation<tbb::isolated_task_group>(true);
     }
-}// namespace TestIsolationNS
+}
 #endif
 
 #if __TBB_USE_ADDRESS_SANITIZER
 //! Test for thread safety for the task_group
 //! \brief \ref error_guessing \ref resource_usage
 TEST_CASE("Memory leaks test is not applicable under ASAN\n" * doctest::skip(true)) {}
-#else
+#elif !EMSCRIPTEN
+//! Emscripten requires preloading of the file used to determine memory usage, hence disabled.
 //! Test for thread safety for the task_group
 //! \brief \ref error_guessing \ref resource_usage
 TEST_CASE("Thread safety test for the task group") {
@@ -741,8 +764,10 @@ TEST_CASE("Thread safety test for the task group") {
         // The test requires more than one thread to check thread safety
         return;
     }
-    for (unsigned p = MinThread; p <= MaxThread; ++p) {
-        if (p < 2) { continue; }
+    for (unsigned p=MinThread; p <= MaxThread; ++p) {
+        if (p < 2) {
+            continue;
+        }
         tbb::global_control limit(tbb::global_control::max_allowed_parallelism, p);
         g_MaxConcurrency = p;
         TestThreadSafety<tbb::task_group>();
@@ -753,10 +778,13 @@ TEST_CASE("Thread safety test for the task group") {
 //! Fibonacci test for task group
 //! \brief \ref interface \ref requirement
 TEST_CASE("Fibonacci test for the task group") {
-    for (unsigned p = MinThread; p <= MaxThread; ++p) {
+    for (unsigned p=MinThread; p <= MaxThread; ++p) {
         tbb::global_control limit(tbb::global_control::max_allowed_parallelism, p);
+        tbb::task_arena a(p);
         g_MaxConcurrency = p;
-        RunFibonacciTests<tbb::task_group>();
+        a.execute([] {
+            RunFibonacciTests<tbb::task_group>();
+        });
     }
 }
 
@@ -767,14 +795,16 @@ TEST_CASE("Cancellation and exception test for the task group") {
         tbb::global_control limit(tbb::global_control::max_allowed_parallelism, p);
         tbb::task_arena a(p);
         g_MaxConcurrency = p;
-        a.execute([] { RunCancellationAndExceptionHandlingTests<tbb::task_group>(); });
+        a.execute([] {
+            RunCancellationAndExceptionHandlingTests<tbb::task_group>();
+        });
     }
 }
 
 //! Constant functor test for the task group
 //! \brief \ref interface \ref negative
 TEST_CASE("Constant functor test for the task group") {
-    for (unsigned p = MinThread; p <= MaxThread; ++p) {
+    for (unsigned p=MinThread; p <= MaxThread; ++p) {
         tbb::global_control limit(tbb::global_control::max_allowed_parallelism, p);
         g_MaxConcurrency = p;
         TestConstantFunctorRequirement<tbb::task_group>();
@@ -784,7 +814,7 @@ TEST_CASE("Constant functor test for the task group") {
 //! Move semantics test for the task group
 //! \brief \ref interface \ref requirement
 TEST_CASE("Move semantics test for the task group") {
-    for (unsigned p = MinThread; p <= MaxThread; ++p) {
+    for (unsigned p=MinThread; p <= MaxThread; ++p) {
         tbb::global_control limit(tbb::global_control::max_allowed_parallelism, p);
         g_MaxConcurrency = p;
         TestMoveSemantics<tbb::task_group>();
@@ -797,7 +827,7 @@ TEST_CASE("Move semantics test for the task group") {
 //! Test for thread safety for the isolated_task_group
 //! \brief \ref error_guessing
 TEST_CASE("Memory leaks test is not applicable under ASAN\n" * doctest::skip(true)) {}
-#else
+#elif !EMSCRIPTEN
 //! Test for thread safety for the isolated_task_group
 //! \brief \ref error_guessing
 TEST_CASE("Thread safety test for the isolated task group") {
@@ -805,11 +835,16 @@ TEST_CASE("Thread safety test for the isolated task group") {
         // The test requires more than one thread to check thread safety
         return;
     }
-    for (unsigned p = MinThread; p <= MaxThread; ++p) {
-        if (p < 2) { continue; }
+    for (unsigned p=MinThread; p <= MaxThread; ++p) {
+        if (p < 2) {
+            continue;
+        }
         tbb::global_control limit(tbb::global_control::max_allowed_parallelism, p);
         g_MaxConcurrency = p;
-        TestThreadSafety<tbb::isolated_task_group>();
+        tbb::task_arena a(p);
+        a.execute([] {
+            TestThreadSafety<tbb::isolated_task_group>();
+        });
     }
 }
 #endif
@@ -817,49 +852,62 @@ TEST_CASE("Thread safety test for the isolated task group") {
 //! Cancellation and exception test for the isolated task group
 //! \brief \ref interface \ref requirement
 TEST_CASE("Fibonacci test for the isolated task group") {
-    for (unsigned p = MinThread; p <= MaxThread; ++p) {
+    for (unsigned p=MinThread; p <= MaxThread; ++p) {
         tbb::global_control limit(tbb::global_control::max_allowed_parallelism, p);
         g_MaxConcurrency = p;
-        RunFibonacciTests<tbb::isolated_task_group>();
+        tbb::task_arena a(p);
+        a.execute([] {
+            RunFibonacciTests<tbb::isolated_task_group>();
+        });
     }
 }
 
 //! Cancellation and exception test for the isolated task group
 //! \brief \ref interface \ref requirement
 TEST_CASE("Cancellation and exception test for the isolated task group") {
-    for (unsigned p = MinThread; p <= MaxThread; ++p) {
+    for (unsigned p=MinThread; p <= MaxThread; ++p) {
         tbb::global_control limit(tbb::global_control::max_allowed_parallelism, p);
         g_MaxConcurrency = p;
-        RunCancellationAndExceptionHandlingTests<tbb::isolated_task_group>();
+        tbb::task_arena a(p);
+        a.execute([] {
+            RunCancellationAndExceptionHandlingTests<tbb::isolated_task_group>();
+        });
     }
 }
 
 //! Constant functor test for the isolated task group.
 //! \brief \ref interface \ref negative
 TEST_CASE("Constant functor test for the isolated task group") {
-    for (unsigned p = MinThread; p <= MaxThread; ++p) {
+    for (unsigned p=MinThread; p <= MaxThread; ++p) {
         tbb::global_control limit(tbb::global_control::max_allowed_parallelism, p);
         g_MaxConcurrency = p;
-        TestConstantFunctorRequirement<tbb::isolated_task_group>();
+        tbb::task_arena a(p);
+        a.execute([] {
+            TestConstantFunctorRequirement<tbb::isolated_task_group>();
+        });
     }
 }
 
 //! Move semantics test for the isolated task group.
 //! \brief \ref interface \ref requirement
 TEST_CASE("Move semantics test for the isolated task group") {
-    for (unsigned p = MinThread; p <= MaxThread; ++p) {
+    for (unsigned p=MinThread; p <= MaxThread; ++p) {
         tbb::global_control limit(tbb::global_control::max_allowed_parallelism, p);
         g_MaxConcurrency = p;
-        TestMoveSemantics<tbb::isolated_task_group>();
+        tbb::task_arena a(p);
+        a.execute([] {
+            TestMoveSemantics<tbb::isolated_task_group>();
+        });
     }
 }
+
+//TODO: add test void isolated_task_group::run(d2::task_handle&& h) and isolated_task_group::::run_and_wait(d2::task_handle&& h)
 #endif /* TBB_PREVIEW_ISOLATED_TASK_GROUP */
 
-void run_deep_stealing(tbb::task_group& tg1, tbb::task_group& tg2, int num_tasks,
-                       std::atomic<int>& tasks_executed) {
+void run_deep_stealing(tbb::task_group& tg1, tbb::task_group& tg2, int num_tasks, std::atomic<int>& tasks_executed) {
     for (int i = 0; i < num_tasks; ++i) {
         tg2.run([&tg1, &tasks_executed] {
-            volatile char consume_stack[1000] {};
+            volatile char consume_stack[1000]{};
             ++tasks_executed;
             tg1.wait();
             utils::suppress_unused_warning(consume_stack);
@@ -871,12 +919,14 @@ void run_deep_stealing(tbb::task_group& tg1, tbb::task_group& tg2, int num_tasks
 //! Test for stack overflow avoidance mechanism.
 //! \brief \ref requirement
 TEST_CASE("Test for stack overflow avoidance mechanism") {
-    if (tbb::this_task_arena::max_concurrency() < 2) { return; }
+    if (tbb::this_task_arena::max_concurrency() < 2) {
+        return;
+    }
 
     tbb::global_control thread_limit(tbb::global_control::max_allowed_parallelism, 2);
     tbb::task_group tg1;
     tbb::task_group tg2;
-    std::atomic<int> tasks_executed {};
+    std::atomic<int> tasks_executed{};
     tg1.run_and_wait([&tg1, &tg2, &tasks_executed] {
         run_deep_stealing(tg1, tg2, 10000, tasks_executed);
         while (tasks_executed < 100) {
@@ -892,56 +942,64 @@ TEST_CASE("Test for stack overflow avoidance mechanism") {
 //! Test for stack overflow avoidance mechanism.
 //! \brief \ref error_guessing
 TEST_CASE("Test for stack overflow avoidance mechanism within arena") {
-    if (tbb::this_task_arena::max_concurrency() < 2) { return; }
-
-    tbb::global_control thread_limit(tbb::global_control::max_allowed_parallelism, 2);
-    tbb::task_group tg1;
-    tbb::task_group tg2;
-    std::atomic<int> tasks_executed {};
-
-    // Determine nested task execution limit.
-    int second_thread_executed {};
-    tg1.run_and_wait([&tg1, &tg2, &tasks_executed, &second_thread_executed] {
-        run_deep_stealing(tg1, tg2, 10000, tasks_executed);
-        do {
-            second_thread_executed = tasks_executed;
-            utils::Sleep(10);
-        } while (second_thread_executed < 100 || second_thread_executed != tasks_executed);
-        CHECK(tasks_executed < 10000);
-    });
-    tg2.wait();
-    CHECK(tasks_executed == 10000);
+    if (tbb::this_task_arena::max_concurrency() < 2) {
+        return;
+    }
 
-    tasks_executed = 0;
-    tbb::task_arena a(2, 2);
-    tg1.run_and_wait([&a, &tg1, &tg2, &tasks_executed, second_thread_executed] {
-        run_deep_stealing(tg1, tg2, second_thread_executed - 1, tasks_executed);
-        while (tasks_executed < second_thread_executed - 1) {
-            // Wait until the second thread near the limit.
-            utils::yield();
-        }
-        tg2.run([&a, &tg1, &tasks_executed] {
-            a.execute([&tg1, &tasks_executed] {
-                volatile char consume_stack[1000] {};
-                ++tasks_executed;
-                tg1.wait();
-                utils::suppress_unused_warning(consume_stack);
+    tbb::task_arena a1(2, 1);
+    a1.execute([] {
+        tbb::task_group tg1;
+        tbb::task_group tg2;
+        std::atomic<int> tasks_executed{};
+
+        // Determine nested task execution limit.
+        int second_thread_executed{};
+        tg1.run_and_wait([&tg1, &tg2, &tasks_executed, &second_thread_executed] {
+            run_deep_stealing(tg1, tg2, 10000, tasks_executed);
+            do {
+                second_thread_executed = tasks_executed;
+                utils::Sleep(10);
+            } while (second_thread_executed < 100 || second_thread_executed != tasks_executed);
+            CHECK(tasks_executed < 10000);
+        });
+        tg2.wait();
+        CHECK(tasks_executed == 10000);
+
+        tasks_executed = 0;
+        tbb::task_arena a2(2, 2);
+        tg1.run_and_wait([&a2, &tg1, &tg2, &tasks_executed, second_thread_executed] {
+            run_deep_stealing(tg1, tg2, second_thread_executed - 1, tasks_executed);
+            while (tasks_executed < second_thread_executed - 1) {
+                // Wait until the second thread near the limit.
+                utils::yield();
+            }
+            tg2.run([&a2, &tg1, &tasks_executed] {
+                a2.execute([&tg1, &tasks_executed] {
+                    volatile char consume_stack[1000]{};
+                    ++tasks_executed;
+                    tg1.wait();
+                    utils::suppress_unused_warning(consume_stack);
+                });
+            });
+            while (tasks_executed < second_thread_executed) {
+                // Wait until the second joins the arena.
+                utils::yield();
+            }
+            a2.execute([&tg1, &tg2, &tasks_executed] {
+                run_deep_stealing(tg1, tg2, 10000, tasks_executed);
             });
+            int currently_executed{};
+            do {
+                currently_executed = tasks_executed;
+                utils::Sleep(10);
+            } while (currently_executed != tasks_executed);
+            CHECK(tasks_executed < 10000 + second_thread_executed);
         });
-        while (tasks_executed < second_thread_executed) {
-            // Wait until the second joins the arena.
-            utils::yield();
-        }
-        a.execute([&tg1, &tg2, &tasks_executed] { run_deep_stealing(tg1, tg2, 10000, tasks_executed); });
-        int currently_executed {};
-        do {
-            currently_executed = tasks_executed;
-            utils::Sleep(10);
-        } while (currently_executed != tasks_executed);
-        CHECK(tasks_executed < 10000 + second_thread_executed);
+        a2.execute([&tg2] {
+            tg2.wait();
+        });
+        CHECK(tasks_executed == 10000 + second_thread_executed);
     });
-    a.execute([&tg2] { tg2.wait(); });
-    CHECK(tasks_executed == 10000 + second_thread_executed);
 }
 
 //! Test checks that we can submit work to task_group asynchronously with waiting.
@@ -952,12 +1010,11 @@ TEST_CASE("Async task group") {
         // The test requires at least 2 worker threads
         return;
     }
-    tbb::task_arena a(2 * num_threads, num_threads);
+    tbb::task_arena a(2*num_threads, num_threads);
     utils::SpinBarrier barrier(num_threads + 2);
     tbb::task_group tg[2];
-    std::atomic<bool> finished[2] {};
-    finished[0] = false;
-    finished[1] = false;
+    std::atomic<bool> finished[2]{};
+    finished[0] = false; finished[1] = false;
     for (int i = 0; i < 2; ++i) {
         a.enqueue([i, &tg, &finished, &barrier] {
             barrier.wait();
@@ -971,12 +1028,12 @@ TEST_CASE("Async task group") {
     utils::NativeParallelFor(num_threads, [&](int idx) {
         barrier.wait();
         a.execute([idx, &tg, &finished] {
-            std::size_t counter {};
-            while (!finished[idx % 2]) {
-                tg[idx % 2].wait();
+            std::size_t counter{};
+            while (!finished[idx%2]) {
+                tg[idx%2].wait();
                 if (counter++ % 16 == 0) utils::yield();
             }
-            tg[idx % 2].wait();
+            tg[idx%2].wait();
         });
     });
 }
@@ -986,7 +1043,8 @@ struct SelfRunner {
     std::atomic<unsigned>& count;
     void operator()() const {
         unsigned previous_count = count.fetch_sub(1);
-        if (previous_count > 1) m_tg.run(*this);
+        if (previous_count > 1)
+            m_tg.run( *this );
     }
 };
 
@@ -994,205 +1052,112 @@ struct SelfRunner {
 //! \brief \ref error_guessing
 TEST_CASE("Run self using same task_group instance") {
     const unsigned num = 10;
-    std::atomic<unsigned> count {num};
+    std::atomic<unsigned> count{num};
     tbb::task_group tg;
-    SelfRunner uf {tg, count};
-    tg.run(uf);
+    SelfRunner uf{tg, count};
+    tg.run( uf );
     tg.wait();
-    CHECK_MESSAGE(count == 0,
-                  "Not all tasks were spawned from inside the functor running within task_group.");
+    CHECK_MESSAGE(
+        count == 0,
+        "Not all tasks were spawned from inside the functor running within task_group."
+    );
 }
 
-#if TBB_PREVIEW_TASK_GROUP_EXTENSIONS
-
+//TODO: move to some common place to share with conformance tests
 namespace accept_task_group_context {
 
-    template <typename TaskGroup, typename CancelF, typename WaitF>
-    void run_cancellation_use_case(CancelF&& cancel, WaitF&& wait) {
-        std::atomic<bool> outer_cancelled {false};
-        std::atomic<unsigned> count {13};
-
-        tbb::task_group_context inner_ctx(tbb::task_group_context::isolated);
-        TaskGroup inner_tg(inner_ctx);
+template <typename TaskGroup, typename CancelF, typename WaitF>
+void run_cancellation_use_case(CancelF&& cancel, WaitF&& wait) {
+    std::atomic<bool> outer_cancelled{false};
+    std::atomic<unsigned> count{13};
 
-        tbb::task_group outer_tg;
-        auto outer_tg_task = [&] {
-            inner_tg.run([&] {
-                utils::SpinWaitUntilEq(outer_cancelled, true);
-                inner_tg.run(SelfRunner {inner_tg, count});
-            });
+    tbb::task_group_context inner_ctx(tbb::task_group_context::isolated);
+    TaskGroup inner_tg(inner_ctx);
 
-            utils::try_call([&] { std::forward<CancelF>(cancel)(outer_tg); }).on_completion([&] {
-                outer_cancelled = true;
-            });
-        };
-
-        auto check = [&] {
-            tbb::task_group_status outer_status = tbb::task_group_status::not_complete;
-            outer_status = std::forward<WaitF>(wait)(outer_tg);
-            CHECK_MESSAGE(outer_status == tbb::task_group_status::canceled,
-                          "Outer task group should have been cancelled.");
+    tbb::task_group outer_tg;
+    auto outer_tg_task = [&] {
+        inner_tg.run([&] {
+            utils::SpinWaitUntilEq(outer_cancelled, true);
+            inner_tg.run( SelfRunner{inner_tg, count} );
+        });
 
-            tbb::task_group_status inner_status = inner_tg.wait();
-            CHECK_MESSAGE(
-                    inner_status == tbb::task_group_status::complete,
-                    "Inner task group should have completed despite the cancellation of the outer one.");
+        utils::try_call([&] {
+            std::forward<CancelF>(cancel)(outer_tg);
+        }).on_completion([&] {
+            outer_cancelled = true;
+        });
+    };
 
-            CHECK_MESSAGE(0 == count, "Some of the inner group tasks were not executed.");
-        };
+    auto check = [&] {
+        tbb::task_group_status outer_status = tbb::task_group_status::not_complete;
+        outer_status = std::forward<WaitF>(wait)(outer_tg);
+        CHECK_MESSAGE(
+            outer_status == tbb::task_group_status::canceled,
+            "Outer task group should have been cancelled."
+        );
+
+        tbb::task_group_status inner_status = inner_tg.wait();
+        CHECK_MESSAGE(
+            inner_status == tbb::task_group_status::complete,
+            "Inner task group should have completed despite the cancellation of the outer one."
+        );
+
+        CHECK_MESSAGE(0 == count, "Some of the inner group tasks were not executed.");
+    };
 
-        outer_tg.run(outer_tg_task);
-        check();
-    }
+    outer_tg.run(outer_tg_task);
+    check();
+}
 
-    template <typename TaskGroup>
-    void test() {
-        run_cancellation_use_case<TaskGroup>([](tbb::task_group& outer) { outer.cancel(); },
-                                             [](tbb::task_group& outer) { return outer.wait(); });
+template <typename TaskGroup>
+void test() {
+    run_cancellation_use_case<TaskGroup>(
+        [](tbb::task_group& outer) { outer.cancel(); },
+        [](tbb::task_group& outer) { return outer.wait(); }
+    );
 
 #if TBB_USE_EXCEPTIONS
-        run_cancellation_use_case<TaskGroup>(
-                [](tbb::task_group& /*outer*/) {
-                    volatile bool suppress_unreachable_code_warning = true;
-                    if (suppress_unreachable_code_warning) { throw int(); }
-                },
-                [](tbb::task_group& outer) {
-                    try {
-                        outer.wait();
-                        return tbb::task_group_status::complete;
-                    } catch (const int&) { return tbb::task_group_status::canceled; }
-                });
+    run_cancellation_use_case<TaskGroup>(
+        [](tbb::task_group& /*outer*/) {
+            volatile bool suppress_unreachable_code_warning = true;
+            if (suppress_unreachable_code_warning) {
+                throw int();
+            }
+        },
+        [](tbb::task_group& outer) {
+            try {
+                outer.wait();
+                return tbb::task_group_status::complete;
+            } catch(const int&) {
+                return tbb::task_group_status::canceled;
+            }
+        }
+    );
 #endif
-    }
+}
 
-}// namespace accept_task_group_context
+} // namespace accept_task_group_context
 
 //! Respect task_group_context passed from outside
 //! \brief \ref interface \ref requirement
 TEST_CASE("Respect task_group_context passed from outside") {
-    accept_task_group_context::test<tbb::task_group>();
 #if TBB_PREVIEW_ISOLATED_TASK_GROUP
     accept_task_group_context::test<tbb::isolated_task_group>();
 #endif
 }
-#endif// TBB_PREVIEW_TASK_GROUP_EXTENSIONS
 
 #if __TBB_PREVIEW_TASK_GROUP_EXTENSIONS
-//! Test checks that for lost task handle
-//! \brief \ref requirement
-TEST_CASE("Task handle created but not run") {
-    {
-        tbb::task_group tg;
-
-        std::atomic<bool> run {false};
-
-        auto h = tg.defer([&] { run = true; });
-        CHECK_MESSAGE(run == false, "delayed task should not be run until run(task_handle) is called");
-    }
-}
-
-//! Basic test for task handle
-//! \brief \ref interface \ref requirement
-TEST_CASE("Task handle run") {
-    tbb::task_handle h;
-
-    tbb::task_group tg;
-    std::atomic<bool> run {false};
-
-    h = tg.defer([&] { run = true; });
-    CHECK_MESSAGE(run == false, "delayed task should not be run until run(task_handle) is called");
-    tg.run(std::move(h));
-    tg.wait();
-    CHECK_MESSAGE(run == true, "Delayed task should be completed when task_group::wait exits");
-
-    CHECK_MESSAGE(h == nullptr, "Delayed task can be executed only once");
-}
-
-//! Basic test for task handle
-//! \brief \ref interface \ref requirement
-TEST_CASE("Task handle run_and_wait") {
-    tbb::task_handle h;
-
-    tbb::task_group tg;
-    bool run {false};
-
-    h = tg.defer([&] { run = true; });
-    CHECK_MESSAGE(run == false, "delayed task should not be run until run(task_handle) is called");
-    tg.run_and_wait(std::move(h));
-    CHECK_MESSAGE(run == true, "Delayed task should be completed when task_group::wait exits");
-
-    CHECK_MESSAGE(h == nullptr, "Delayed task can be executed only once");
-}
-//! Test for empty check
-//! \brief \ref interface
-TEST_CASE("Task handle empty check") {
-    tbb::task_group tg;
-
-    tbb::task_handle h;
-
-    bool empty = (h == nullptr);
-    CHECK_MESSAGE(empty, "default constructed task_handle should be empty");
-
-    h = tg.defer([] {});
-
-    CHECK_MESSAGE(h != nullptr, "delayed task returned by task_group::delayed should not be empty");
-}
-
-//! Test for comparison operations
-//! \brief \ref interface
-TEST_CASE("Task handle comparison/empty checks") {
-    tbb::task_group tg;
-
-    tbb::task_handle h;
-
-    bool empty = !static_cast<bool>(h);
-    CHECK_MESSAGE(empty, "default constructed task_handle should be empty");
-    CHECK_MESSAGE(h == nullptr, "default constructed task_handle should be empty");
-    CHECK_MESSAGE(nullptr == h, "default constructed task_handle should be empty");
-
-    h = tg.defer([] {});
-
-    CHECK_MESSAGE(h != nullptr, "deferred task returned by task_group::defer() should not be empty");
-    CHECK_MESSAGE(nullptr != h, "deferred task returned by task_group::defer() should not be empty");
-}
-
-//! Test that task_handle prolongs task_group::wait
-//! \brief \ref requirement
-TEST_CASE("Task handle blocks wait") {
-    tbb::task_group tg;
-
-    std::atomic<bool> completed {false};
-    std::atomic<bool> start_wait {false};
-    std::atomic<bool> thread_started {false};
-
-    tbb::task_handle h = tg.defer([&] { completed = true; });
-
-    std::thread wait_thread {[&] {
-        CHECK_MESSAGE(completed == false, "Deferred task should not be run until run(task_handle) is called");
-
-        thread_started = true;
-        utils::SpinWaitUntilEq(start_wait, true);
-        tg.wait();
-        CHECK_MESSAGE(completed == true, "Deferred task should be completed when task_group::wait exits");
-    }};
-
-    utils::SpinWaitUntilEq(thread_started, true);
-    CHECK_MESSAGE(completed == false, "Deferred task should not be run until run(task_handle) is called");
-
-    tg.run(std::move(h));
-    //TODO: more accurate test (with fixed number of threads (1 ?) to guarantee correctness of following assert)
-    //CHECK_MESSAGE(completed == false, "Deferred task should not be run until run(task_handle) and wait is called");
-    start_wait = true;
-    wait_thread.join();
-}
-
 //! The test for task_handle inside other task waiting with run
 //! \brief \ref requirement
-TEST_CASE("Task handle for scheduler bypass") {
+TEST_CASE("Task handle for scheduler bypass"){
     tbb::task_group tg;
     std::atomic<bool> run {false};
 
-    tg.run([&] { return tg.defer([&] { run = true; }); });
+    tg.run([&]{
+        return tg.defer([&]{
+            run = true;
+        });
+    });
 
     tg.wait();
     CHECK_MESSAGE(run == true, "task handle returned by user lambda (bypassed) should be run");
@@ -1200,67 +1165,60 @@ TEST_CASE("Task handle for scheduler bypass") {
 
 //! The test for task_handle inside other task waiting with run_and_wait
 //! \brief \ref requirement
-TEST_CASE("Task handle for scheduler bypass via run_and_wait") {
+TEST_CASE("Task handle for scheduler bypass via run_and_wait"){
     tbb::task_group tg;
     std::atomic<bool> run {false};
 
-    tg.run_and_wait([&] { return tg.defer([&] { run = true; }); });
+    tg.run_and_wait([&]{
+        return tg.defer([&]{
+            run = true;
+        });
+    });
 
     CHECK_MESSAGE(run == true, "task handle returned by user lambda (bypassed) should be run");
 }
+#endif //__TBB_PREVIEW_TASK_GROUP_EXTENSIONS
 
 #if TBB_USE_EXCEPTIONS
-//! The test for exception handling in task_handle
-//! \brief \ref requirement
-TEST_CASE("Task handle exception propagation") {
-    tbb::task_group tg;
-
-    tbb::task_handle h = tg.defer([&] {
-        volatile bool suppress_unreachable_code_warning = true;
-        if (suppress_unreachable_code_warning) { throw std::runtime_error {""}; }
-    });
-
-    tg.run(std::move(h));
-
-    CHECK_THROWS_AS(tg.wait(), std::runtime_error);
-}
+//As these tests are against behavior marked by spec as undefined, they can not be put into conformance tests
 
 //! The test for error in scheduling empty task_handle
 //! \brief \ref requirement
-TEST_CASE("Empty task_handle cannot be scheduled") {
+TEST_CASE("Empty task_handle cannot be scheduled"
+        * doctest::should_fail()    //Test needs to revised as implementation uses assertions instead of exceptions
+        * doctest::skip()           //skip the test for now, to not pollute the test log
+){
     tbb::task_group tg;
 
-    CHECK_THROWS_WITH_AS(tg.run(tbb::task_handle {}), "Attempt to schedule empty task_handle",
-                         std::runtime_error);
+    CHECK_THROWS_WITH_AS(tg.run(tbb::task_handle{}), "Attempt to schedule empty task_handle", std::runtime_error);
 }
 
 //! The test for error in task_handle being scheduled into task_group different from one it was created from
 //! \brief \ref requirement
-TEST_CASE("task_handle cannot be scheduled into different task_group") {
+TEST_CASE("task_handle cannot be scheduled into different task_group"
+        * doctest::should_fail()    //Test needs to revised as implementation uses assertions instead of exceptions
+        * doctest::skip()           //skip the test for now, to not pollute the test log
+){
     tbb::task_group tg;
     tbb::task_group tg1;
 
-    CHECK_THROWS_WITH_AS(tg1.run(tg.defer([] {})),
-                         "Attempt to schedule task_handle into different task_group", std::runtime_error);
+    CHECK_THROWS_WITH_AS(tg1.run(tg.defer([]{})), "Attempt to schedule task_handle into different task_group", std::runtime_error);
 }
 
 //! The test for error in task_handle being scheduled into task_group different from one it was created from
 //! \brief \ref requirement
-TEST_CASE(
-        "task_handle cannot be scheduled into other task_group of the same context"
-        * doctest::
-                should_fail()//Implementation is no there yet, as it is not clear that is the expected behavior
-        * doctest::skip()    //skip the test for now, to not pollute the test log
-) {
+TEST_CASE("task_handle cannot be scheduled into other task_group of the same context"
+        * doctest::should_fail()    //Implementation is no there yet, as it is not clear that is the expected behavior
+        * doctest::skip()           //skip the test for now, to not pollute the test log
+)
+{
     tbb::task_group_context ctx;
 
     tbb::task_group tg(ctx);
     tbb::task_group tg1(ctx);
 
-    CHECK_NOTHROW(tg.run(tg.defer([] {})));
-    CHECK_THROWS_WITH_AS(tg1.run(tg.defer([] {})),
-                         "Attempt to schedule task_handle into different task_group", std::runtime_error);
+    CHECK_NOTHROW(tg.run(tg.defer([]{})));
+    CHECK_THROWS_WITH_AS(tg1.run(tg.defer([]{})), "Attempt to schedule task_handle into different task_group", std::runtime_error);
 }
 
-#endif// TBB_USE_EXCEPTIONS
-#endif//__TBB_PREVIEW_TASK_GROUP_EXTENSIONS
+#endif // TBB_USE_EXCEPTIONS
diff --git a/external/tbb/test/tbb/test_tbb_fork.cpp b/external/tbb/test/tbb/test_tbb_fork.cpp
index 290c0cd6..95ab3d9c 100644
--- a/external/tbb/test/tbb/test_tbb_fork.cpp
+++ b/external/tbb/test/tbb/test_tbb_fork.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -17,11 +17,9 @@
 //! \file test_tbb_fork.cpp
 //! \brief Test for [sched.global_control] specification
 
-#define TBB_PREVIEW_WAITING_FOR_WORKERS 1
-
+#include "tbb/global_control.h"
 #include "tbb/blocked_range.h"
 #include "tbb/cache_aligned_allocator.h"
-#include "tbb/global_control.h"
 #include "tbb/parallel_for.h"
 
 static const int MinThread = 1;
@@ -34,20 +32,22 @@ static const int MaxThread = 4;
 #include "common/utils.h"
 #include "common/utils_assert.h"
 
-#if _WIN32 || _WIN64
+#if _WIN32||_WIN64
 #include "tbb/concurrent_hash_map.h"
 
-HANDLE getCurrentThreadHandle() {
+HANDLE getCurrentThreadHandle()
+{
     HANDLE hProc = GetCurrentProcess(), hThr = INVALID_HANDLE_VALUE;
 #if TBB_USE_ASSERT
     BOOL res =
 #endif
-            DuplicateHandle(hProc, GetCurrentThread(), hProc, &hThr, 0, FALSE, DUPLICATE_SAME_ACCESS);
-    __TBB_ASSERT(res, "Retrieving current thread handle failed");
+    DuplicateHandle( hProc, GetCurrentThread(), hProc, &hThr, 0, FALSE, DUPLICATE_SAME_ACCESS );
+    __TBB_ASSERT( res, "Retrieving current thread handle failed" );
     return hThr;
 }
 
-bool threadTerminated(HANDLE h) {
+bool threadTerminated(HANDLE h)
+{
     DWORD ret = WaitForSingleObjectEx(h, 0, FALSE);
     return WAIT_OBJECT_0 == ret;
 }
@@ -63,29 +63,31 @@ static TidTableType tidTable;
 #else
 
 #if __sun || __SUNPRO_CC
-#define _POSIX_PTHREAD_SEMANTICS 1// to get standard-conforming sigwait(2)
+#define _POSIX_PTHREAD_SEMANTICS 1 // to get standard-conforming sigwait(2)
 #endif
-#include <sched.h>
 #include <signal.h>
 #include <sys/types.h>
-#include <sys/wait.h>
 #include <unistd.h>
+#include <sys/wait.h>
+#include <sched.h>
 
 #include "tbb/tick_count.h"
 
-void SigHandler(int) {}
+void SigHandler(int) { }
 
-#endif// _WIN32||_WIN64
+#endif // _WIN32||_WIN64
 
 class AllocTask {
 public:
-    void operator()(const tbb::blocked_range<int> &r) const {
-#if _WIN32 || _WIN64
+    void operator() (const tbb::blocked_range<int> &r) const {
+#if _WIN32||_WIN64
         HANDLE h = getCurrentThreadHandle();
         DWORD tid = GetCurrentThreadId();
         {
             TidTableType::accessor acc;
-            if (tidTable.insert(acc, tid)) { acc->second.h = h; }
+            if (tidTable.insert(acc, tid)) {
+                acc->second.h = h;
+            }
         }
 #endif
         for (int y = r.begin(); y != r.end(); ++y) {
@@ -96,31 +98,33 @@ class AllocTask {
     AllocTask() {}
 };
 
-void CallParallelFor() {
-    tbb::parallel_for(tbb::blocked_range<int>(0, 10000, 1), AllocTask(), tbb::simple_partitioner());
+void CallParallelFor()
+{
+    tbb::parallel_for(tbb::blocked_range<int>(0, 10000, 1), AllocTask(),
+                      tbb::simple_partitioner());
 }
 
 /* Regression test against data race between termination of workers
    and setting blocking termination mode in main thread. */
 class RunWorkersBody : utils::NoAssign {
     bool wait_workers;
-
 public:
     RunWorkersBody(bool waitWorkers) : wait_workers(waitWorkers) {}
     void operator()(const int /*threadID*/) const {
-        tbb::task_scheduler_handle tsi = tbb::task_scheduler_handle::get();
+        tbb::task_scheduler_handle tsi{tbb::attach{}};
         CallParallelFor();
         if (wait_workers) {
             bool ok = tbb::finalize(tsi, std::nothrow);
-            ASSERT(ok, NULL);
+            ASSERT(ok, nullptr);
         } else {
-            tbb::task_scheduler_handle::release(tsi);
+            tsi.release();
         }
     }
 };
 
-void TestBlockNonblock() {
-    for (int i = 0; i < 100; i++) {
+void TestBlockNonblock()
+{
+    for (int i=0; i<100; i++) {
         utils::NativeParallelFor(4, RunWorkersBody(/*wait_workers=*/false));
         RunWorkersBody(/*wait_workers=*/true)(0);
     }
@@ -132,23 +136,24 @@ class RunInNativeThread : utils::NoAssign {
 public:
     RunInNativeThread(bool blocking_) : blocking(blocking_) {}
     void operator()(const int /*threadID*/) const {
-        tbb::task_scheduler_handle tsi = tbb::task_scheduler_handle::get();
+        tbb::task_scheduler_handle tsi = tbb::task_scheduler_handle{tbb::attach{}};
         CallParallelFor();
         if (blocking) {
             bool ok = tbb::finalize(tsi, std::nothrow);
             ASSERT(!ok, "Nested blocking terminate must fail.");
         } else {
-            tbb::task_scheduler_handle::release(tsi);
+            tsi.release();
         }
     }
 };
 
-void TestTasksInThread() {
-    tbb::task_scheduler_handle sch = tbb::task_scheduler_handle::get();
+void TestTasksInThread()
+{
+    tbb::task_scheduler_handle sch{tbb::attach{}};
     CallParallelFor();
     utils::NativeParallelFor(2, RunInNativeThread(/*blocking=*/false));
     bool ok = tbb::finalize(sch, std::nothrow);
-    ASSERT(ok, NULL);
+    ASSERT(ok, nullptr);
 }
 
 #if TBB_REVAMP_TODO
@@ -157,73 +162,78 @@ void TestTasksInThread() {
 
 // check for memory leak during TBB task scheduler init/terminate life cycle
 // TODO: move to test_task_scheduler_init after workers waiting productization
-void TestSchedulerMemLeaks() {
+void TestSchedulerMemLeaks()
+{
     const int ITERS = 10;
     int it;
 
-    for (it = 0; it < ITERS; it++) {
+    for (it=0; it<ITERS; it++) {
         size_t memBefore = utils::GetMemoryUsage();
 #if _MSC_VER && _DEBUG
         // _CrtMemCheckpoint() and _CrtMemDifference are non-empty only in _DEBUG
         _CrtMemState stateBefore, stateAfter, diffState;
         _CrtMemCheckpoint(&stateBefore);
 #endif
-        for (int i = 0; i < 100; i++) {
-            tbb::task_arena arena(1, 1);
-            arena.initialize();// right approach?
+        for (int i=0; i<100; i++) {
+            tbb::task_arena arena(1, 1); arena.initialize(); // right approach?
             // tbb::task_scheduler_init sch(1);
             tbb::task_scheduler_handle sch = tbb::task_scheduler_handle::get();
-            for (int k = 0; k < 10; k++) {
+            for (int k=0; k<10; k++) {
                 // tbb::empty_task *t = new( tbb::task::allocate_root() ) tbb::empty_task();
                 // tbb::task::enqueue(*t);
-                arena.enqueue([&] {});
+                arena.enqueue([&]{});
             }
             bool ok = tbb::finalize(sch, std::nothrow);
-            ASSERT(ok, NULL);
+            ASSERT(ok, nullptr);
         }
 #if _MSC_VER && _DEBUG
         _CrtMemCheckpoint(&stateAfter);
         int ret = _CrtMemDifference(&diffState, &stateBefore, &stateAfter);
         ASSERT(!ret, "It must be no memory leaks at this point.");
 #endif
-        if (utils::GetMemoryUsage() <= memBefore) break;
+        if (utils::GetMemoryUsage() <= memBefore)
+            break;
     }
     ASSERT(it < ITERS, "Memory consumption has not stabilized. Memory Leak?");
 }
 
-#endif// TBB_REVAMP_TODO
+#endif // TBB_REVAMP_TODO
 
-void TestNestingTSI() {
+void TestNestingTSI()
+{
     // nesting with and without blocking is possible
-    for (int i = 0; i < 2; i++) {
-        tbb::task_scheduler_handle schBlock = tbb::task_scheduler_handle::get();
+    for (int i=0; i<2; i++) {
+        tbb::task_scheduler_handle schBlock = tbb::task_scheduler_handle{tbb::attach{}};
         CallParallelFor();
-        tbb::task_scheduler_handle schBlock1 = tbb::task_scheduler_handle::get();
+        tbb::task_scheduler_handle schBlock1;
+        schBlock1 = tbb::task_scheduler_handle{tbb::attach{}};
         CallParallelFor();
         if (i) {
-            tbb::task_scheduler_handle::release(schBlock1);
+            schBlock1.release();
         } else {
             bool ok = tbb::finalize(schBlock1, std::nothrow);
             ASSERT(!ok, "Nested blocking terminate must fail.");
         }
         bool ok = tbb::finalize(schBlock, std::nothrow);
-        ASSERT(ok, NULL);
+        ASSERT(ok, nullptr);
     }
     {
-        tbb::task_scheduler_handle schBlock = tbb::task_scheduler_handle::get();
+        tbb::task_scheduler_handle schBlock{tbb::attach{}};
         utils::NativeParallelFor(1, RunInNativeThread(/*blocking=*/true));
         bool ok = tbb::finalize(schBlock, std::nothrow);
-        ASSERT(ok, NULL);
+        ASSERT(ok, nullptr);
     }
 }
 
-void TestAutoInit() {
-    CallParallelFor();// autoinit
+void TestAutoInit()
+{
+    CallParallelFor(); // autoinit
     // creation of blocking scheduler is possible, but one is not block
     utils::NativeParallelFor(1, RunInNativeThread(/*blocking=*/true));
 }
 
-int main() {
+int main()
+{
     TestNestingTSI();
     TestBlockNonblock();
     TestTasksInThread();
@@ -233,7 +243,7 @@ int main() {
 #endif
 
     bool child = false;
-#if _WIN32 || _WIN64
+#if _WIN32||_WIN64
     DWORD masterTid = GetCurrentThreadId();
 #else
     struct sigaction sa;
@@ -242,35 +252,42 @@ int main() {
     sigemptyset(&sa.sa_mask);
     sa.sa_flags = 0;
     sa.sa_handler = SigHandler;
-    if (sigaction(SIGCHLD, &sa, NULL)) ASSERT(0, "sigaction failed");
-    if (sigaction(SIGALRM, &sa, NULL)) ASSERT(0, "sigaction failed");
+    if (sigaction(SIGCHLD, &sa, nullptr))
+        ASSERT(0, "sigaction failed");
+    if (sigaction(SIGALRM, &sa, nullptr))
+        ASSERT(0, "sigaction failed");
     // block SIGCHLD and SIGALRM, the mask is inherited by worker threads
     sigemptyset(&sig_set);
     sigaddset(&sig_set, SIGCHLD);
     sigaddset(&sig_set, SIGALRM);
-    if (pthread_sigmask(SIG_BLOCK, &sig_set, NULL)) ASSERT(0, "pthread_sigmask failed");
+    if (pthread_sigmask(SIG_BLOCK, &sig_set, nullptr))
+        ASSERT(0, "pthread_sigmask failed");
 #endif
     utils::suppress_unused_warning(child);
-    for (int threads = MinThread; threads <= MaxThread; threads += MinThread) {
-        for (int i = 0; i < 20; i++) {
+    for (int threads=MinThread; threads<=MaxThread; threads+=MinThread) {
+        for (int i=0; i<20; i++) {
             tbb::global_control ctl(tbb::global_control::max_allowed_parallelism, threads);
             {
-                tbb::task_scheduler_handle sch = tbb::task_scheduler_handle::get();
-                bool ok = tbb::finalize(sch, std::nothrow);
-                ASSERT(ok, NULL);
+                tbb::task_scheduler_handle sch{tbb::attach{}};
+                bool ok = tbb::finalize( sch, std::nothrow );
+                ASSERT(ok, nullptr);
             }
-            tbb::task_scheduler_handle sch = tbb::task_scheduler_handle::get();
+            tbb::task_scheduler_handle sch{tbb::attach{}};
             CallParallelFor();
-            bool ok = tbb::finalize(sch, std::nothrow);
-            ASSERT(ok, NULL);
-#if _WIN32 || _WIN64
+            bool ok = tbb::finalize( sch, std::nothrow );
+            ASSERT(ok, nullptr);
+#if _WIN32||_WIN64
             // check that there is no alive threads after terminate()
-            for (TidTableType::const_iterator it = tidTable.begin(); it != tidTable.end(); ++it) {
-                if (masterTid != it->first) { ASSERT(threadTerminated(it->second.h), NULL); }
+            for (TidTableType::const_iterator it = tidTable.begin();
+                it != tidTable.end(); ++it) {
+                if (masterTid != it->first) {
+                    ASSERT(threadTerminated(it->second.h), nullptr);
+                }
             }
             tidTable.clear();
 #else // _WIN32||_WIN64
-            if (child) exit(0);
+            if (child)
+                exit(0);
             else {
                 pid_t pid = fork();
                 if (!pid) {
@@ -281,14 +298,15 @@ int main() {
                     pid_t w_ret = 0;
                     // wait for SIGCHLD up to timeout
                     alarm(30);
-                    if (0 != sigwait(&sig_set, &sig)) ASSERT(0, "sigwait failed");
+                    if (0 != sigwait(&sig_set, &sig))
+                        ASSERT(0, "sigwait failed");
                     alarm(0);
-                    w_ret = waitpid(pid, NULL, WNOHANG);
-                    ASSERT(w_ret >= 0, "waitpid failed");
+                    w_ret = waitpid(pid, nullptr, WNOHANG);
+                    ASSERT(w_ret>=0, "waitpid failed");
                     if (!w_ret) {
-                        ASSERT(!kill(pid, SIGKILL), NULL);
-                        w_ret = waitpid(pid, NULL, 0);
-                        ASSERT(w_ret != -1, "waitpid failed");
+                        ASSERT(!kill(pid, SIGKILL), nullptr);
+                        w_ret = waitpid(pid, nullptr, 0);
+                        ASSERT(w_ret!=-1, "waitpid failed");
 
                         ASSERT(0, "Hang after fork");
                     }
@@ -297,14 +315,16 @@ int main() {
                     for (;;) {
                         sigemptyset(&p_mask);
                         sigpending(&p_mask);
-                        if (sigismember(&p_mask, SIGALRM) || sigismember(&p_mask, SIGCHLD)) {
-                            if (0 != sigwait(&p_mask, &sig)) ASSERT(0, "sigwait failed");
+                        if (sigismember(&p_mask, SIGALRM)
+                            || sigismember(&p_mask, SIGCHLD)) {
+                            if (0 != sigwait(&p_mask, &sig))
+                                ASSERT(0, "sigwait failed");
                         } else
                             break;
                     }
                 }
             }
-#endif// _WIN32||_WIN64
+#endif // _WIN32||_WIN64
         }
     }
     // auto initialization at this point
diff --git a/external/tbb/test/tbb/test_tbb_header.cpp b/external/tbb/test/tbb/test_tbb_header.cpp
index 047f6b0e..122af5ec 100644
--- a/external/tbb/test/tbb/test_tbb_header.cpp
+++ b/external/tbb/test/tbb/test_tbb_header.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -25,47 +25,48 @@
 **/
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
 #endif
 
 #ifndef NOMINMAX
 #define NOMINMAX
-#endif// NOMINMAX
+#endif // NOMINMAX
 
 #define __TBB_NO_IMPLICIT_LINKAGE 1
 
+
 #if __TBB_TEST_SECONDARY
-// Test _DEBUG macro custom definitions.
-#if TBB_USE_DEBUG
-#ifdef _DEBUG
-#undef _DEBUG
-#endif /* _DEBUG */
-// Check that empty value successfully enables the debug mode.
-#define _DEBUG
-static bool isDebugExpected = true;
+    // Test _DEBUG macro custom definitions.
+    #if TBB_USE_DEBUG
+        #ifdef _DEBUG
+            #undef _DEBUG
+        #endif /* _DEBUG */
+        // Check that empty value successfully enables the debug mode.
+        #define _DEBUG
+        static bool isDebugExpected = true;
+    #else
+        // Check that zero value does not enable the debug mode.
+        #define _DEBUG 0x0
+        static bool isDebugExpected = false;
+    #endif /* TBB_USE_DEBUG */
+    #define DO_TEST_DEBUG_MACRO 1
 #else
-// Check that zero value does not enable the debug mode.
-#define _DEBUG 0x0
-static bool isDebugExpected = false;
-#endif /* TBB_USE_DEBUG */
-#define DO_TEST_DEBUG_MACRO 1
-#else
-// Test default definitions of _DEBUG.
-#if _DEBUG
-static bool isDebugExpected = true;
-#define DO_TEST_DEBUG_MACRO 1
-#elif _MSC_VER
-// for MSVC, _DEBUG not defined indicates a release mode.
-static bool isDebugExpected = false;
-#define DO_TEST_DEBUG_MACRO 1
-#endif /* _DEBUG */
+    // Test default definitions of _DEBUG.
+    #if _DEBUG
+        static bool isDebugExpected = true;
+        #define DO_TEST_DEBUG_MACRO 1
+    #elif _MSC_VER
+        // for MSVC, _DEBUG not defined indicates a release mode.
+        static bool isDebugExpected = false;
+        #define DO_TEST_DEBUG_MACRO 1
+    #endif /* _DEBUG */
 #endif /* __TBB_TEST_SECONDARY */
 
 #if DO_TEST_DEBUG_MACRO
 // Reset TBB_USE_DEBUG defined in makefiles.
 #undef TBB_USE_DEBUG
-#endif                                    /* DO_TEST_DEBUG_MACRO */
-#define __TBB_CONFIG_PREPROC_ONLY _MSC_VER// For MSVC, prevent including standard headers in tbb_config.h
+#endif /* DO_TEST_DEBUG_MACRO */
+#define __TBB_CONFIG_PREPROC_ONLY _MSC_VER // For MSVC, prevent including standard headers in tbb_config.h
 #include "common/config.h"
 
 #include "oneapi/tbb/detail/_config.h"
@@ -84,50 +85,45 @@ static bool isDebugExpected = false;
 
 static volatile size_t g_sink;
 
-#define TestTypeDefinitionPresence(Type) g_sink = sizeof(tbb::Type);
-#define TestTypeDefinitionPresence2(TypeStart, TypeEnd) g_sink = sizeof(tbb::TypeStart, TypeEnd);
-#define TestTypeDefinitionPresence3(TypeStart, TypeMid, TypeEnd)                                             \
-    g_sink = sizeof(tbb::TypeStart, TypeMid, TypeEnd);
-#define TestFuncDefinitionPresence(Fn, Args, ReturnType)                                                     \
-    {                                                                                                        \
-        ReturnType(*pfn) Args = &tbb::Fn;                                                                    \
-        (void) pfn;                                                                                          \
-    }
+#define TestTypeDefinitionPresence( Type ) g_sink = sizeof(tbb::Type);
+#define TestTypeDefinitionPresence2(TypeStart, TypeEnd) g_sink = sizeof(tbb::TypeStart,TypeEnd);
+#define TestTypeDefinitionPresence3(TypeStart, TypeMid, TypeEnd) g_sink = sizeof(tbb::TypeStart,TypeMid,TypeEnd);
+#define TestFuncDefinitionPresence(Fn, Args, ReturnType) { ReturnType (*pfn)Args = &tbb::Fn; (void)pfn; }
 
 struct Body {
-    void operator()() const {}
+    void operator() () const {}
 };
 struct Body1 {
-    void operator()(int) const {}
+    void operator() ( int ) const {}
 };
-struct Body1a {// feeder body for parallel_do
-    void operator()(int, tbb::feeder<int>&) const {}
+struct Body1a { // feeder body for parallel_do
+    void operator() ( int, tbb::feeder<int>& ) const {}
 };
-struct Body1b {// binary operator for reduction
-    int operator()(const int, const int) const { return 0; }
+struct Body1b { // binary operator for reduction
+    int operator() ( const int, const int ) const { return 0; }
 };
-struct Body1bc {// binary operator for comparison
-    bool operator()(const int, const int) const { return false; }
+struct Body1bc { // binary operator for comparison
+    bool operator() (const int, const int) const { return false; }
 };
 struct Body2 {
-    Body2() {}
-    Body2(const Body2&, tbb::split) {}
-    void operator()(const tbb::blocked_range<int>&) const {}
-    void join(const Body2&) {}
+    Body2 () {}
+    Body2 ( const Body2&, tbb::split ) {}
+    void operator() ( const tbb::blocked_range<int>& ) const {}
+    void join( const Body2& ) {}
 };
-struct Body2a {// for lambda-friendly parallel_reduce
-    int operator()(const tbb::blocked_range<int>&, const int) const { return 0; }
+struct Body2a { // for lambda-friendly parallel_reduce
+    int operator() ( const tbb::blocked_range<int>&, const int ) const { return 0; }
 };
-struct Body3 {// for parallel_scan
-    Body3() {}
-    Body3(const Body3&, tbb::split) {}
-    void operator()(const tbb::blocked_range2d<int>&, tbb::pre_scan_tag) const {}
-    void operator()(const tbb::blocked_range2d<int>&, tbb::final_scan_tag) const {}
-    void reverse_join(Body3&) {}
-    void assign(const Body3&) {}
+struct Body3 { // for parallel_scan
+    Body3 () {}
+    Body3 ( const Body3&, tbb::split ) {}
+    void operator() ( const tbb::blocked_range2d<int>&, tbb::pre_scan_tag ) const {}
+    void operator() ( const tbb::blocked_range2d<int>&, tbb::final_scan_tag ) const {}
+    void reverse_join( Body3& ) {}
+    void assign( const Body3& ) {}
 };
-struct Body3a {// for lambda-friednly parallel_scan
-    int operator()(const tbb::blocked_range<int>&, const int, bool) const { return 0; }
+struct Body3a { // for lambda-friednly parallel_scan
+    int operator() ( const tbb::blocked_range<int>&, const int, bool ) const { return 0; }
 };
 struct Msg {};
 
@@ -136,170 +132,157 @@ struct Msg {};
 #include <stdexcept>
 
 template <typename E>
-void TestExceptionClassExports(const E& exc, tbb::detail::exception_id eid) {
-    CHECK(eid < tbb::detail::exception_id::last_entry);
+void TestExceptionClassExports ( const E& exc, tbb::detail::exception_id eid ) {
+    CHECK( eid < tbb::detail::exception_id::last_entry );
 #if TBB_USE_EXCEPTIONS
-    for (int i = 0; i < 2; ++i) {
+    for ( int i = 0; i < 2; ++i ) {
         try {
-            if (i == 0) throw exc;
+            if ( i == 0 )
+                throw exc;
             else
-                tbb::detail::throw_exception(eid);
-        } catch (E& e) { CHECK_MESSAGE(e.what(), "Missing what() string"); } catch (...) {
-            CHECK_MESSAGE(false, "Unrecognized exception. Likely RTTI related exports are missing");
+                tbb::detail::throw_exception( eid );
+        }
+        catch ( E& e ) {
+            CHECK_MESSAGE( e.what(), "Missing what() string" );
+        }
+        catch ( ... ) {
+            CHECK_MESSAGE( false, "Unrecognized exception. Likely RTTI related exports are missing" );
         }
     }
-#else  /* TBB_USE_EXCEPTIONS */
-    (void) exc;
+#else /* TBB_USE_EXCEPTIONS */
+    (void)exc;
 #endif /* TBB_USE_EXCEPTIONS */
 }
 
-static void TestExceptionClassesExports() {
-    TestExceptionClassExports(std::bad_alloc(), tbb::detail::exception_id::bad_alloc);
-    TestExceptionClassExports(tbb::bad_last_alloc(), tbb::detail::exception_id::bad_last_alloc);
-    TestExceptionClassExports(std::invalid_argument("test"), tbb::detail::exception_id::nonpositive_step);
-    TestExceptionClassExports(std::out_of_range("test"), tbb::detail::exception_id::out_of_range);
-    TestExceptionClassExports(tbb::missing_wait(), tbb::detail::exception_id::missing_wait);
-    TestExceptionClassExports(std::out_of_range("test"), tbb::detail::exception_id::invalid_load_factor);
-    TestExceptionClassExports(std::length_error("test"), tbb::detail::exception_id::reservation_length_error);
-    TestExceptionClassExports(std::out_of_range("test"), tbb::detail::exception_id::invalid_key);
-    TestExceptionClassExports(tbb::user_abort(), tbb::detail::exception_id::user_abort);
-    TestExceptionClassExports(std::runtime_error("test"), tbb::detail::exception_id::bad_tagged_msg_cast);
+static void TestExceptionClassesExports () {
+    TestExceptionClassExports( std::bad_alloc(), tbb::detail::exception_id::bad_alloc );
+    TestExceptionClassExports( tbb::bad_last_alloc(), tbb::detail::exception_id::bad_last_alloc );
+    TestExceptionClassExports( std::invalid_argument("test"), tbb::detail::exception_id::nonpositive_step );
+    TestExceptionClassExports( std::out_of_range("test"), tbb::detail::exception_id::out_of_range );
+    TestExceptionClassExports( tbb::missing_wait(), tbb::detail::exception_id::missing_wait );
+    TestExceptionClassExports( std::out_of_range("test"), tbb::detail::exception_id::invalid_load_factor );
+    TestExceptionClassExports( std::length_error("test"), tbb::detail::exception_id::reservation_length_error );
+    TestExceptionClassExports( std::out_of_range("test"), tbb::detail::exception_id::invalid_key );
+    TestExceptionClassExports( tbb::user_abort(), tbb::detail::exception_id::user_abort );
+    TestExceptionClassExports( std::runtime_error("test"), tbb::detail::exception_id::bad_tagged_msg_cast );
+    TestExceptionClassExports( tbb::unsafe_wait("test"), tbb::detail::exception_id::unsafe_wait );
 }
 
 #if __TBB_CPF_BUILD
 // These names are only tested in "preview" configuration
 // When a feature becomes fully supported, its names should be moved to the main test
 static void TestPreviewNames() {
-    TestTypeDefinitionPresence2(blocked_rangeNd<int, 4>);
-    TestTypeDefinitionPresence2(concurrent_lru_cache<int, int>);
-    TestTypeDefinitionPresence(isolated_task_group);
-    TestTypeDefinitionPresence(collaborative_once_flag);
-    TestFuncDefinitionPresence(collaborative_call_once, (tbb::collaborative_once_flag&, const Body&), void);
+    TestTypeDefinitionPresence2( concurrent_lru_cache<int, int> );
+    TestTypeDefinitionPresence( isolated_task_group );
 }
 #endif
 
 static void DefinitionPresence() {
-    TestTypeDefinitionPresence(cache_aligned_allocator<int>);
-    TestTypeDefinitionPresence(tbb_hash_compare<int>);
-    TestTypeDefinitionPresence2(concurrent_hash_map<int, int>);
-    TestTypeDefinitionPresence2(concurrent_unordered_map<int, int>);
-    TestTypeDefinitionPresence2(concurrent_unordered_multimap<int, int>);
-    TestTypeDefinitionPresence(concurrent_unordered_set<int>);
-    TestTypeDefinitionPresence(concurrent_unordered_multiset<int>);
-    TestTypeDefinitionPresence2(concurrent_map<int, int>);
-    TestTypeDefinitionPresence2(concurrent_multimap<int, int>);
-    TestTypeDefinitionPresence(concurrent_set<int>);
-    TestTypeDefinitionPresence(concurrent_multiset<int>);
-    TestTypeDefinitionPresence(concurrent_bounded_queue<int>);
-    TestTypeDefinitionPresence(concurrent_queue<int>);
-    TestTypeDefinitionPresence(concurrent_priority_queue<int>);
-    TestTypeDefinitionPresence(concurrent_vector<int>);
-    TestTypeDefinitionPresence(combinable<int>);
-    TestTypeDefinitionPresence(enumerable_thread_specific<int>);
+    TestTypeDefinitionPresence( cache_aligned_allocator<int> );
+    TestTypeDefinitionPresence( tbb_hash_compare<int> );
+    TestTypeDefinitionPresence2( concurrent_hash_map<int, int> );
+    TestTypeDefinitionPresence2( concurrent_unordered_map<int, int> );
+    TestTypeDefinitionPresence2( concurrent_unordered_multimap<int, int> );
+    TestTypeDefinitionPresence( concurrent_unordered_set<int> );
+    TestTypeDefinitionPresence( concurrent_unordered_multiset<int> );
+    TestTypeDefinitionPresence2( concurrent_map<int, int> );
+    TestTypeDefinitionPresence2( concurrent_multimap<int, int> );
+    TestTypeDefinitionPresence( concurrent_set<int> );
+    TestTypeDefinitionPresence( concurrent_multiset<int> );
+    TestTypeDefinitionPresence( concurrent_bounded_queue<int> );
+    TestTypeDefinitionPresence( concurrent_queue<int> );
+    TestTypeDefinitionPresence( concurrent_priority_queue<int> );
+    TestTypeDefinitionPresence( concurrent_vector<int> );
+    TestTypeDefinitionPresence( combinable<int> );
+    TestTypeDefinitionPresence( enumerable_thread_specific<int> );
     /* Flow graph names */
-    TestTypeDefinitionPresence(flow::graph);
-    TestTypeDefinitionPresence(flow::continue_msg);
-    TestTypeDefinitionPresence2(flow::tagged_msg<int, int>);
-    TestFuncDefinitionPresence(flow::make_edge, (tbb::flow::sender<Msg>&, tbb::flow::receiver<Msg>&), void);
-    TestFuncDefinitionPresence(flow::remove_edge, (tbb::flow::sender<Msg>&, tbb::flow::receiver<Msg>&), void);
+    TestTypeDefinitionPresence( flow::graph );
+    TestTypeDefinitionPresence( flow::continue_msg );
+    TestTypeDefinitionPresence2(flow::tagged_msg<int, int> );
+    TestFuncDefinitionPresence( flow::make_edge, (tbb::flow::sender<Msg>&, tbb::flow::receiver<Msg>&), void );
+    TestFuncDefinitionPresence( flow::remove_edge, (tbb::flow::sender<Msg>&, tbb::flow::receiver<Msg>&), void );
     typedef std::tuple<int, int> intpair;
-    TestTypeDefinitionPresence(flow::input_node<int>);
-    TestTypeDefinitionPresence3(flow::function_node<int, int, tbb::flow::rejecting>);
-    TestTypeDefinitionPresence3(flow::multifunction_node<int, intpair, tbb::flow::queueing>);
-    TestTypeDefinitionPresence3(flow::async_node<int, int, tbb::flow::queueing_lightweight>);
-    TestTypeDefinitionPresence2(flow::continue_node<int, tbb::flow::lightweight>);
-    TestTypeDefinitionPresence2(flow::join_node<intpair, tbb::flow::reserving>);
-    TestTypeDefinitionPresence2(flow::join_node<intpair, tbb::flow::key_matching<int>>);
-    TestTypeDefinitionPresence(flow::split_node<intpair>);
-    TestTypeDefinitionPresence(flow::overwrite_node<int>);
-    TestTypeDefinitionPresence(flow::write_once_node<int>);
-    TestTypeDefinitionPresence(flow::broadcast_node<int>);
-    TestTypeDefinitionPresence(flow::buffer_node<int>);
-    TestTypeDefinitionPresence(flow::queue_node<int>);
-    TestTypeDefinitionPresence(flow::sequencer_node<int>);
-    TestTypeDefinitionPresence(flow::priority_queue_node<int>);
-    TestTypeDefinitionPresence(flow::limiter_node<int>);
-    TestTypeDefinitionPresence2(flow::indexer_node<int, int>);
-    TestTypeDefinitionPresence2(flow::composite_node<std::tuple<int>, std::tuple<int>>);
+    TestTypeDefinitionPresence( flow::input_node<int> );
+    TestTypeDefinitionPresence3(flow::function_node<int, int, tbb::flow::rejecting> );
+    TestTypeDefinitionPresence3(flow::multifunction_node<int, intpair, tbb::flow::queueing> );
+    TestTypeDefinitionPresence3(flow::async_node<int, int, tbb::flow::queueing_lightweight> );
+    TestTypeDefinitionPresence2(flow::continue_node<int, tbb::flow::lightweight> );
+    TestTypeDefinitionPresence2(flow::join_node<intpair, tbb::flow::reserving> );
+    TestTypeDefinitionPresence2(flow::join_node<intpair, tbb::flow::key_matching<int> > );
+    TestTypeDefinitionPresence( flow::split_node<intpair> );
+    TestTypeDefinitionPresence( flow::overwrite_node<int> );
+    TestTypeDefinitionPresence( flow::write_once_node<int> );
+    TestTypeDefinitionPresence( flow::broadcast_node<int> );
+    TestTypeDefinitionPresence( flow::buffer_node<int> );
+    TestTypeDefinitionPresence( flow::queue_node<int> );
+    TestTypeDefinitionPresence( flow::sequencer_node<int> );
+    TestTypeDefinitionPresence( flow::priority_queue_node<int> );
+    TestTypeDefinitionPresence( flow::limiter_node<int> );
+    TestTypeDefinitionPresence2(flow::indexer_node<int, int> );
+    TestTypeDefinitionPresence2(flow::composite_node<std::tuple<int>, std::tuple<int> > );
     /* Mutex names */
-    TestTypeDefinitionPresence(null_mutex);
-    TestTypeDefinitionPresence(null_rw_mutex);
-    TestTypeDefinitionPresence(queuing_mutex);
-    TestTypeDefinitionPresence(queuing_rw_mutex);
-    TestTypeDefinitionPresence(spin_mutex);
-    TestTypeDefinitionPresence(spin_rw_mutex);
-    TestTypeDefinitionPresence(speculative_spin_mutex);
-    TestTypeDefinitionPresence(speculative_spin_rw_mutex);
-    TestTypeDefinitionPresence(task_group_context);
-    TestTypeDefinitionPresence(task_group);
+    TestTypeDefinitionPresence( null_mutex );
+    TestTypeDefinitionPresence( null_rw_mutex );
+    TestTypeDefinitionPresence( queuing_mutex );
+    TestTypeDefinitionPresence( queuing_rw_mutex );
+    TestTypeDefinitionPresence( spin_mutex );
+    TestTypeDefinitionPresence( spin_rw_mutex );
+    TestTypeDefinitionPresence( mutex );
+    TestTypeDefinitionPresence( rw_mutex );
+    TestTypeDefinitionPresence( speculative_spin_mutex );
+    TestTypeDefinitionPresence( speculative_spin_rw_mutex );
+    TestTypeDefinitionPresence( task_group_context );
+    TestTypeDefinitionPresence( task_group );
     /* Algorithm related names */
-    TestTypeDefinitionPresence(blocked_range<int>);
-    TestTypeDefinitionPresence(blocked_range2d<int>);
-    TestTypeDefinitionPresence(blocked_range3d<int>);
-    TestFuncDefinitionPresence(parallel_invoke, (const Body&, const Body&, const Body&), void);
-    TestFuncDefinitionPresence(parallel_for_each, (int*, int*, const Body1&), void);
-    TestFuncDefinitionPresence(parallel_for, (int, int, int, const Body1&), void);
-    TestFuncDefinitionPresence(parallel_for,
-                               (const tbb::blocked_range<int>&, const Body2&, const tbb::simple_partitioner&),
-                               void);
-    TestFuncDefinitionPresence(
-            parallel_reduce, (const tbb::blocked_range<int>&, const int&, const Body2a&, const Body1b&), int);
-    TestFuncDefinitionPresence(parallel_reduce,
-                               (const tbb::blocked_range<int>&, Body2&, tbb::affinity_partitioner&), void);
-    TestFuncDefinitionPresence(parallel_deterministic_reduce,
-                               (const tbb::blocked_range<int>&, const int&, const Body2a&, const Body1b&),
-                               int);
-    TestFuncDefinitionPresence(parallel_deterministic_reduce,
-                               (const tbb::blocked_range<int>&, Body2&, const tbb::static_partitioner&),
-                               void);
-    TestFuncDefinitionPresence(
-            parallel_scan, (const tbb::blocked_range2d<int>&, Body3&, const tbb::auto_partitioner&), void);
-    TestFuncDefinitionPresence(
-            parallel_scan, (const tbb::blocked_range<int>&, const int&, const Body3a&, const Body1b&), int);
+    TestTypeDefinitionPresence( blocked_range<int> );
+    TestTypeDefinitionPresence( blocked_range2d<int> );
+    TestTypeDefinitionPresence( blocked_range3d<int> );
+    TestTypeDefinitionPresence2( blocked_nd_range<int,4> );
+    TestTypeDefinitionPresence( collaborative_once_flag );
+    TestFuncDefinitionPresence( collaborative_call_once, (tbb::collaborative_once_flag&, const Body&), void );
+    TestFuncDefinitionPresence( parallel_invoke, (const Body&, const Body&, const Body&), void );
+    TestFuncDefinitionPresence( parallel_for_each, (int*, int*, const Body1&), void );
+    TestFuncDefinitionPresence( parallel_for, (int, int, int, const Body1&), void );
+    TestFuncDefinitionPresence( parallel_for, (const tbb::blocked_range<int>&, const Body2&, const tbb::simple_partitioner&), void );
+    TestFuncDefinitionPresence( parallel_reduce, (const tbb::blocked_range<int>&, const int&, const Body2a&, const Body1b&), int );
+    TestFuncDefinitionPresence( parallel_reduce, (const tbb::blocked_range<int>&, Body2&, tbb::affinity_partitioner&), void );
+    TestFuncDefinitionPresence( parallel_deterministic_reduce, (const tbb::blocked_range<int>&, const int&, const Body2a&, const Body1b&), int );
+    TestFuncDefinitionPresence( parallel_deterministic_reduce, (const tbb::blocked_range<int>&, Body2&, const tbb::static_partitioner&), void );
+    TestFuncDefinitionPresence( parallel_scan, (const tbb::blocked_range2d<int>&, Body3&, const tbb::auto_partitioner&), void );
+    TestFuncDefinitionPresence( parallel_scan, (const tbb::blocked_range<int>&, const int&, const Body3a&, const Body1b&), int );
     typedef int intarray[10];
 
-    TestFuncDefinitionPresence(parallel_sort, (int*, int*), void);
-    TestFuncDefinitionPresence(parallel_sort, (intarray&, const Body1bc&), void);
-    TestFuncDefinitionPresence(parallel_pipeline, (size_t, const tbb::filter<void, void>&), void);
-    TestFuncDefinitionPresence(parallel_invoke, (const Body&, const Body&, tbb::task_group_context&), void);
-    TestFuncDefinitionPresence(parallel_for_each, (const intarray&, const Body1a&, tbb::task_group_context&),
-                               void);
-    TestFuncDefinitionPresence(
-            parallel_for, (int, int, const Body1&, const tbb::auto_partitioner&, tbb::task_group_context&),
-            void);
-    TestFuncDefinitionPresence(parallel_for, (int, int, const Body1&, tbb::task_group_context&), void);
-    TestFuncDefinitionPresence(
-            parallel_reduce,
-            (const tbb::blocked_range<int>&, Body2&, const tbb::auto_partitioner&, tbb::task_group_context&),
-            void);
-    TestFuncDefinitionPresence(parallel_reduce,
-                               (const tbb::blocked_range<int>&, Body2&, tbb::task_group_context&), void);
-    TestFuncDefinitionPresence(parallel_deterministic_reduce,
-                               (const tbb::blocked_range<int>&, Body2&, const tbb::simple_partitioner&,
-                                tbb::task_group_context&),
-                               void);
-    TestFuncDefinitionPresence(parallel_deterministic_reduce,
-                               (const tbb::blocked_range<int>&, Body2&, tbb::task_group_context&), void);
-    TestTypeDefinitionPresence(proportional_split);
+    TestFuncDefinitionPresence( parallel_sort, (int*, int*), void );
+    TestFuncDefinitionPresence( parallel_sort, (intarray&, const Body1bc&), void );
+    TestFuncDefinitionPresence( parallel_pipeline, (size_t, const tbb::filter<void,void>&), void );
+    TestFuncDefinitionPresence( parallel_invoke, (const Body&, const Body&, tbb::task_group_context&), void );
+    TestFuncDefinitionPresence( parallel_for_each, (const intarray&, const Body1a&, tbb::task_group_context&), void );
+    TestFuncDefinitionPresence( parallel_for, (int, int, const Body1&, const tbb::auto_partitioner&, tbb::task_group_context&), void );
+    TestFuncDefinitionPresence( parallel_for, (int, int, const Body1&, tbb::task_group_context&), void );
+    TestFuncDefinitionPresence( parallel_reduce, (const tbb::blocked_range<int>&, Body2&, const tbb::auto_partitioner&, tbb::task_group_context&), void );
+    TestFuncDefinitionPresence( parallel_reduce, (const tbb::blocked_range<int>&, Body2&, tbb::task_group_context&), void );
+    TestFuncDefinitionPresence( parallel_deterministic_reduce, (const tbb::blocked_range<int>&, Body2&, const tbb::simple_partitioner&, tbb::task_group_context&), void );
+    TestFuncDefinitionPresence( parallel_deterministic_reduce, (const tbb::blocked_range<int>&, Body2&, tbb::task_group_context&), void );
+    TestTypeDefinitionPresence( proportional_split );
 
-    TestTypeDefinitionPresence(task_arena);
-    TestFuncDefinitionPresence(this_task_arena::current_thread_index, (), int);
-    TestFuncDefinitionPresence(this_task_arena::max_concurrency, (), int);
-    TestFuncDefinitionPresence(info::numa_nodes, (), std::vector<tbb::numa_node_id>);
-    TestFuncDefinitionPresence(info::default_concurrency, (tbb::numa_node_id), int);
-    TestTypeDefinitionPresence(task_scheduler_observer);
-    TestTypeDefinitionPresence(tbb_allocator<int>);
-    TestTypeDefinitionPresence(tick_count);
-    TestTypeDefinitionPresence(global_control);
+    TestTypeDefinitionPresence( task_arena );
+    TestFuncDefinitionPresence( this_task_arena::current_thread_index, (), int );
+    TestFuncDefinitionPresence( this_task_arena::max_concurrency, (), int );
+    TestFuncDefinitionPresence( info::numa_nodes, (), std::vector<tbb::numa_node_id> );
+    TestFuncDefinitionPresence( info::default_concurrency, (tbb::numa_node_id), int );
+    TestTypeDefinitionPresence( task_scheduler_observer );
+    TestTypeDefinitionPresence( tbb_allocator<int> );
+    TestTypeDefinitionPresence( tick_count );
+    TestTypeDefinitionPresence( global_control );
 
 #if __TBB_CPF_BUILD
     TestPreviewNames();
 #endif
 #ifdef DO_TEST_DEBUG_MACRO
 #if TBB_USE_DEBUG
-    CHECK_MESSAGE(isDebugExpected, "Debug mode is observed while release mode is expected.");
+    CHECK_MESSAGE( isDebugExpected, "Debug mode is observed while release mode is expected." );
 #else
-    CHECK_MESSAGE(!isDebugExpected, "Release mode is observed while debug mode is expected.");
+    CHECK_MESSAGE( !isDebugExpected, "Release mode is observed while debug mode is expected." );
 #endif /* TBB_USE_DEBUG */
 #endif /* DO_TEST_DEBUG_MACRO */
     TestExceptionClassesExports();
@@ -309,14 +292,20 @@ static void DefinitionPresence() {
 /* This mode is used to produce a secondary object file that is linked with
    the main one in order to detect "multiple definition" linker error.
 */
-void Secondary() { DefinitionPresence(); }
+void Secondary() {
+    DefinitionPresence();
+}
 #else
 //! Test for deifinition presence
 //! \brief \ref interface
-TEST_CASE("Test for deifinition presence") { DefinitionPresence(); }
+TEST_CASE("Test for deifinition presence") {
+    DefinitionPresence();
+}
 
 void Secondary();
 //! Test for "multiple definition" linker error
 //! \brief \ref error_guessing
-TEST_CASE("Test for multiple definition linker error") { Secondary(); }
+TEST_CASE("Test for multiple definition linker error") {
+    Secondary();
+}
 #endif
diff --git a/external/tbb/test/tbb/test_tbb_header_secondary.cpp b/external/tbb/test/tbb/test_tbb_header_secondary.cpp
index 52d69a78..e65245ab 100644
--- a/external/tbb/test/tbb/test_tbb_header_secondary.cpp
+++ b/external/tbb/test/tbb/test_tbb_header_secondary.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2020-2021 Intel Corporation
+    Copyright (c) 2020-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -18,19 +18,22 @@
 //! \brief Test for [all] specification
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
 #endif
 
 #ifndef NOMINMAX
 #define NOMINMAX
-#endif// NOMINMAX
+#endif // NOMINMAX
+
+#if _MSC_VER && TBB_USE_DEBUG
+// Check that there is no conflict with _CRTDBG_MAP_ALLOC
+#define _CRTDBG_MAP_ALLOC
+#include "crtdbg.h"
+#endif
 
 #include <exception>
 
-#define CHECK(x)                                                                                             \
-    do {                                                                                                     \
-        if (!(x)) { std::terminate(); }                                                                      \
-    } while (false)
+#define CHECK(x) do { if (!(x)) { std::terminate(); } } while (false)
 #define CHECK_MESSAGE(x, y) CHECK(x);
 
 #define __TBB_TEST_SECONDARY 1
diff --git a/external/tbb/test/tbb/test_tick_count.cpp b/external/tbb/test/tbb/test_tick_count.cpp
index 8fd19c00..3bf2bfe8 100644
--- a/external/tbb/test/tbb/test_tick_count.cpp
+++ b/external/tbb/test/tbb/test_tick_count.cpp
@@ -14,10 +14,10 @@
     limitations under the License.
 */
 
-#include "common/spin_barrier.h"
 #include "common/test.h"
 #include "common/utils.h"
 #include "common/utils_concurrency_limit.h"
+#include "common/spin_barrier.h"
 
 #include <tbb/tick_count.h>
 #include <thread>
@@ -50,14 +50,18 @@ TEST_CASE("Test for subtracting calls to tick_count from different threads") {
     utils::SpinBarrier thread_barrier(num_of_threads);
     tbb::tick_count start_time;
 
-    auto diff_func = [&thread_barrier, &start_time](std::size_t) {
+    auto diff_func = [&thread_barrier, &start_time] (std::size_t ) {
         thread_barrier.wait([&start_time] { start_time = tbb::tick_count::now(); });
 
         tbb::tick_count end_time(tbb::tick_count::now());
-        while ((end_time - start_time).seconds() == 0) { end_time = tbb::tick_count::now(); }
+        while ((end_time - start_time).seconds() == 0) {
+            end_time = tbb::tick_count::now();
+        }
 
         CHECK_GT((end_time - start_time).seconds(), 0);
     };
 
-    for (std::size_t i = 0; i < 10; ++i) { utils::NativeParallelFor(num_of_threads, diff_func); }
+    for (std::size_t i = 0; i < 10; ++i) {
+        utils::NativeParallelFor(num_of_threads, diff_func);
+    }
 }
diff --git a/external/tbb/test/tbb/test_write_once_node.cpp b/external/tbb/test/tbb/test_write_once_node.cpp
index 3822f956..6fb716ba 100644
--- a/external/tbb/test/tbb/test_write_once_node.cpp
+++ b/external/tbb/test/tbb/test_write_once_node.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -14,140 +14,160 @@
     limitations under the License.
 */
 
+
 #include "common/config.h"
 
 #include "tbb/flow_graph.h"
 
-#include "common/graph_utils.h"
 #include "common/test.h"
-#include "common/test_follows_and_precedes_api.h"
 #include "common/utils.h"
 #include "common/utils_assert.h"
+#include "common/graph_utils.h"
+#include "common/test_follows_and_precedes_api.h"
 
 #define N 300
 #define T 4
 #define M 4
 
+
 //! \file test_write_once_node.cpp
 //! \brief Test for [flow_graph.write_once_node] specification
 
-template <typename R>
+
+template< typename R >
 void simple_read_write_tests() {
     tbb::flow::graph g;
     tbb::flow::write_once_node<R> n(g);
 
-    for (int t = 0; t < T; ++t) {
+    for ( int t = 0; t < T; ++t ) {
         R v0(0);
-        std::vector<std::shared_ptr<harness_counting_receiver<R>>> r;
-        for (size_t i = 0; i < M; ++i) { r.push_back(std::make_shared<harness_counting_receiver<R>>(g)); }
+        std::vector< std::shared_ptr<harness_counting_receiver<R>> > r;
+        for (size_t i = 0; i < M; ++i) {
+            r.push_back( std::make_shared<harness_counting_receiver<R>>(g) );
+        }
+
 
-        CHECK_MESSAGE(n.is_valid() == false, "");
-        CHECK_MESSAGE(n.try_get(v0) == false, "");
+        CHECK_MESSAGE( n.is_valid() == false, "" );
+        CHECK_MESSAGE( n.try_get( v0 ) == false, "" );
 
-        if (t % 2) {
-            CHECK_MESSAGE(n.try_put(static_cast<R>(N + 1)), "");
-            CHECK_MESSAGE(n.is_valid() == true, "");
-            CHECK_MESSAGE(n.try_get(v0) == true, "");
-            CHECK_MESSAGE(v0 == R(N + 1), "");
+        if ( t % 2 ) {
+            CHECK_MESSAGE( n.try_put( static_cast<R>(N+1) ), "" );
+            CHECK_MESSAGE( n.is_valid() == true, "" );
+            CHECK_MESSAGE( n.try_get( v0 ) == true, "" );
+            CHECK_MESSAGE( v0 == R(N+1), "" );
         }
 
-        for (int i = 0; i < M; ++i) { tbb::flow::make_edge(n, *r[i]); }
+        for (int i = 0; i < M; ++i) {
+            tbb::flow::make_edge( n, *r[i] );
+        }
 
-        if (t % 2) {
+        if ( t%2 ) {
             for (int i = 0; i < M; ++i) {
                 size_t c = r[i]->my_count;
-                CHECK_MESSAGE(int(c) == 1, "");
+                CHECK_MESSAGE( int(c) == 1, "" );
             }
         }
 
-        for (int i = 1; i <= N; ++i) {
+        for (int i = 1; i <= N; ++i ) {
             R v1(static_cast<R>(i));
 
-            bool result = n.try_put(v1);
-            if (!(t % 2) && i == 1) CHECK_MESSAGE(result == true, "");
+            bool result = n.try_put( v1 );
+            if ( !(t%2) && i == 1 )
+                CHECK_MESSAGE( result == true, "" );
             else
-                CHECK_MESSAGE(result == false, "");
+                CHECK_MESSAGE( result == false, "" );
 
-            CHECK_MESSAGE(n.is_valid() == true, "");
+            CHECK_MESSAGE( n.is_valid() == true, "" );
 
-            for (int j = 0; j < N; ++j) {
+            for (int j = 0; j < N; ++j ) {
                 R v2(0);
-                CHECK_MESSAGE(n.try_get(v2), "");
-                if (t % 2) CHECK_MESSAGE(R(N + 1) == v2, "");
+                CHECK_MESSAGE( n.try_get( v2 ), "" );
+                if ( t%2 )
+                    CHECK_MESSAGE( R(N+1) == v2, "" );
                 else
-                    CHECK_MESSAGE(R(1) == v2, "");
+                    CHECK_MESSAGE( R(1) == v2, "" );
             }
         }
         for (int i = 0; i < M; ++i) {
             size_t c = r[i]->my_count;
-            CHECK_MESSAGE(int(c) == 1, "");
+            CHECK_MESSAGE( int(c) == 1, "" );
+        }
+        for (int i = 0; i < M; ++i) {
+            tbb::flow::remove_edge( n, *r[i] );
         }
-        for (int i = 0; i < M; ++i) { tbb::flow::remove_edge(n, *r[i]); }
-        CHECK_MESSAGE(n.try_put(R(0)) == false, "");
+        CHECK_MESSAGE( n.try_put( R(0) ) == false, "" );
         for (int i = 0; i < M; ++i) {
             size_t c = r[i]->my_count;
-            CHECK_MESSAGE(int(c) == 1, "");
+            CHECK_MESSAGE( int(c) == 1, "" );
         }
         n.clear();
-        CHECK_MESSAGE(n.is_valid() == false, "");
-        CHECK_MESSAGE(n.try_get(v0) == false, "");
+        CHECK_MESSAGE( n.is_valid() == false, "" );
+        CHECK_MESSAGE( n.try_get( v0 ) == false, "" );
     }
 }
 
-template <typename R>
+template< typename R >
 class native_body : utils::NoAssign {
     tbb::flow::write_once_node<R> &my_node;
 
 public:
-    native_body(tbb::flow::write_once_node<R> &n) : my_node(n) {}
 
-    void operator()(int i) const {
+    native_body( tbb::flow::write_once_node<R> &n ) : my_node(n) {}
+
+    void operator()( int i ) const {
         R v1(static_cast<R>(i));
-        CHECK_MESSAGE(my_node.try_put(v1) == false, "");
-        CHECK_MESSAGE(my_node.is_valid() == true, "");
-        CHECK_MESSAGE(my_node.try_get(v1) == true, "");
-        CHECK_MESSAGE(v1 == R(-1), "");
+        CHECK_MESSAGE( my_node.try_put( v1 ) == false, "" );
+        CHECK_MESSAGE( my_node.is_valid() == true, "" );
+        CHECK_MESSAGE( my_node.try_get( v1 ) == true, "" );
+        CHECK_MESSAGE( v1 == R(-1), "" );
     }
 };
 
-template <typename R>
+template< typename R >
 void parallel_read_write_tests() {
     tbb::flow::graph g;
     tbb::flow::write_once_node<R> n(g);
     //Create a vector of identical nodes
-    std::vector<tbb::flow::write_once_node<R>> wo_vec(2, n);
+    std::vector< tbb::flow::write_once_node<R> > wo_vec(2, n);
+
+    for (size_t node_idx=0; node_idx<wo_vec.size(); ++node_idx) {
+        for ( int t = 0; t < T; ++t ) {
+            std::vector< std::shared_ptr<harness_counting_receiver<R>> > r;
+            for (size_t i = 0; i < M; ++i) {
+                r.push_back( std::make_shared<harness_counting_receiver<R>>(g) );
+            }
 
-    for (size_t node_idx = 0; node_idx < wo_vec.size(); ++node_idx) {
-        for (int t = 0; t < T; ++t) {
-            std::vector<std::shared_ptr<harness_counting_receiver<R>>> r;
-            for (size_t i = 0; i < M; ++i) { r.push_back(std::make_shared<harness_counting_receiver<R>>(g)); }
 
-            for (int i = 0; i < M; ++i) { tbb::flow::make_edge(wo_vec[node_idx], *r[i]); }
+            for (int i = 0; i < M; ++i) {
+                tbb::flow::make_edge( wo_vec[node_idx], *r[i] );
+            }
             R v0;
-            CHECK_MESSAGE(wo_vec[node_idx].is_valid() == false, "");
-            CHECK_MESSAGE(wo_vec[node_idx].try_get(v0) == false, "");
+            CHECK_MESSAGE( wo_vec[node_idx].is_valid() == false, "" );
+            CHECK_MESSAGE( wo_vec[node_idx].try_get( v0 ) == false, "" );
 
-            CHECK_MESSAGE(wo_vec[node_idx].try_put(R(-1)), "");
+            CHECK_MESSAGE( wo_vec[node_idx].try_put( R(-1) ), "" );
 #if TBB_TEST_LOW_WORKLOAD
             const int nthreads = 30;
 #else
             const int nthreads = N;
 #endif
-            utils::NativeParallelFor(nthreads, native_body<R>(wo_vec[node_idx]));
+            utils::NativeParallelFor( nthreads, native_body<R>( wo_vec[node_idx] ) );
 
             for (int i = 0; i < M; ++i) {
                 size_t c = r[i]->my_count;
-                CHECK_MESSAGE(int(c) == 1, "");
+                CHECK_MESSAGE( int(c) == 1, "" );
             }
-            for (int i = 0; i < M; ++i) { tbb::flow::remove_edge(wo_vec[node_idx], *r[i]); }
-            CHECK_MESSAGE(wo_vec[node_idx].try_put(R(0)) == false, "");
+            for (int i = 0; i < M; ++i) {
+                tbb::flow::remove_edge( wo_vec[node_idx], *r[i] );
+            }
+            CHECK_MESSAGE( wo_vec[node_idx].try_put( R(0) ) == false, "" );
             for (int i = 0; i < M; ++i) {
                 size_t c = r[i]->my_count;
-                CHECK_MESSAGE(int(c) == 1, "");
+                CHECK_MESSAGE( int(c) == 1, "" );
             }
             wo_vec[node_idx].clear();
-            CHECK_MESSAGE(wo_vec[node_idx].is_valid() == false, "");
-            CHECK_MESSAGE(wo_vec[node_idx].try_get(v0) == false, "");
+            CHECK_MESSAGE( wo_vec[node_idx].is_valid() == false, "" );
+            CHECK_MESSAGE( wo_vec[node_idx].try_get( v0 ) == false, "" );
         }
     }
 }
@@ -158,15 +178,13 @@ void parallel_read_write_tests() {
 void test_follows_and_precedes_api() {
     using msg_t = tbb::flow::continue_msg;
 
-    std::array<msg_t, 3> messages_for_follows = {msg_t(), msg_t(), msg_t()};
+    std::array<msg_t, 3> messages_for_follows= {msg_t(), msg_t(), msg_t()};
     std::vector<msg_t> messages_for_precedes = {msg_t()};
 
-    follows_and_precedes_testing::test_follows<msg_t, tbb::flow::write_once_node<msg_t>>(
-            messages_for_follows);
-    follows_and_precedes_testing::test_precedes<msg_t, tbb::flow::write_once_node<msg_t>>(
-            messages_for_precedes);
+    follows_and_precedes_testing::test_follows<msg_t, tbb::flow::write_once_node<msg_t>>(messages_for_follows);
+    follows_and_precedes_testing::test_precedes<msg_t, tbb::flow::write_once_node<msg_t>>(messages_for_precedes);
 }
-#endif// __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+#endif // __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 void test_deduction_guides() {
@@ -189,34 +207,176 @@ void test_deduction_guides() {
 }
 #endif
 
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+void test_try_put_and_wait() {
+    int wait_message = 0;
+    int occupy_concurrency_message = 1;
+    int new_message = 2;
+
+    // Test push
+    {
+        tbb::task_arena arena(1);
+
+        std::vector<int> processed_items;
+
+        arena.execute([&] {
+            tbb::flow::graph g;
+
+            tbb::flow::write_once_node<int> wo_buffer(g);
+            tbb::flow::function_node<int, int> function(g, tbb::flow::serial,
+                [&](int input) {
+                    if (input == wait_message) {
+                        wo_buffer.clear();
+                        wo_buffer.try_put(new_message);
+                    }
+                    processed_items.emplace_back(input);
+                    return 0;
+                });
+
+            tbb::flow::make_edge(wo_buffer, function);
+
+            wo_buffer.try_put_and_wait(wait_message);
+
+            std::size_t check_index = 0;
+            CHECK_MESSAGE(processed_items.size() == 1, "Only the wait_message should be processed");
+            CHECK_MESSAGE(processed_items[check_index++] == wait_message, "Only the wait_message should be processed");
+
+            g.wait_for_all();
+
+            CHECK_MESSAGE(processed_items[check_index++] == new_message,
+                          "only the new_message should be processed in wait_for_all");
+            CHECK(check_index == processed_items.size());
+        });
+    }
+    // Test pull
+    {
+        std::vector<int> processed_items;
+        tbb::task_arena arena(1);
+
+        arena.execute([&] {
+            tbb::flow::graph g;
+
+            tbb::flow::write_once_node<int> wo_buffer(g);
+            tbb::flow::function_node<int, int, tbb::flow::rejecting> function(g, tbb::flow::serial,
+                [&](int input) {
+                    if (input == new_message || input == wait_message) {
+                        wo_buffer.clear();
+                    }
+
+                    if (input == wait_message) {
+                        wo_buffer.try_put(new_message);
+                    }
+                    processed_items.emplace_back(input);
+                    return 0;
+                });
+
+            tbb::flow::make_edge(wo_buffer, function);
+
+            function.try_put(occupy_concurrency_message);
+            wo_buffer.try_put_and_wait(wait_message);
+
+            std::size_t check_index = 0;
+            CHECK_MESSAGE(processed_items.size() == 2, "unexpected message processing for try_put_and_wait");
+            CHECK_MESSAGE(processed_items[check_index++] == occupy_concurrency_message,
+                          "occupy_concurrency_message should be processed first");
+            CHECK_MESSAGE(processed_items[check_index++] == wait_message,
+                          "wait_message was not processed");
+
+            g.wait_for_all();
+
+            CHECK_MESSAGE(processed_items[check_index++] == new_message,
+                          "only the new_message should be processed in wait_for_all");
+            CHECK(check_index == processed_items.size());
+        });
+    }
+    // Test reserve
+    {
+        std::vector<int> processed_items;
+        tbb::task_arena arena(1);
+
+        arena.execute([&] {
+            tbb::flow::graph g;
+
+            tbb::flow::write_once_node<int> wo_buffer(g);
+            tbb::flow::limiter_node<int, int> limiter(g, 1);
+            tbb::flow::function_node<int, int, tbb::flow::rejecting> function(g, tbb::flow::serial,
+                [&](int input) {
+                    if (input == new_message || input == wait_message) {
+                        wo_buffer.clear();
+                    }
+
+                    if (input == wait_message) {
+                        wo_buffer.try_put(new_message);
+                    }
+                    processed_items.emplace_back(input);
+                    limiter.decrementer().try_put(1);
+                    return 0;
+                });
+
+            tbb::flow::make_edge(wo_buffer, limiter);
+            tbb::flow::make_edge(limiter, function);
+
+            limiter.try_put(occupy_concurrency_message);
+            wo_buffer.try_put_and_wait(wait_message);
+
+            std::size_t check_index = 0;
+            CHECK_MESSAGE(processed_items.size() == 2, "unexpected message processing for try_put_and_wait");
+            CHECK_MESSAGE(processed_items[check_index++] == occupy_concurrency_message,
+                          "occupy_concurrency_message should be processed first");
+            CHECK_MESSAGE(processed_items[check_index++] == wait_message,
+                          "wait_message was not processed");
+
+            g.wait_for_all();
+
+            CHECK_MESSAGE(processed_items[check_index++] == new_message,
+                          "only the new_message should be processed in wait_for_all");
+            CHECK(check_index == processed_items.size());
+        });
+    }
+}
+#endif
+
 //! Test read-write properties
 //! \brief \ref requirement \ref error_guessing
-TEST_CASE("Read-write tests") {
+TEST_CASE("Read-write tests"){
     simple_read_write_tests<int>();
     simple_read_write_tests<float>();
 }
 
 //! Test read-write properties under parallelism
 //! \brief \ref requirement \ref error_guessing \ref stress
-TEST_CASE("Parallel read-write tests") {
-    for (unsigned int p = utils::MinThread; p <= utils::MaxThread; ++p) {
+TEST_CASE("Parallel read-write tests"){
+    for( unsigned int p=utils::MinThread; p<=utils::MaxThread; ++p ) {
         tbb::task_arena arena(p);
-        arena.execute([&]() {
-            parallel_read_write_tests<int>();
-            parallel_read_write_tests<float>();
-            test_reserving_nodes<tbb::flow::write_once_node, size_t>();
-        });
-    }
+        arena.execute(
+            [&]() {
+                parallel_read_write_tests<int>();
+                parallel_read_write_tests<float>();
+                test_reserving_nodes<tbb::flow::write_once_node, size_t>();
+            }
+        );
+	}
 }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 //! Test deprecated follows and precedes API
 //! \brief \ref error_guessing
-TEST_CASE("Test follows and precedes API") { test_follows_and_precedes_api(); }
+TEST_CASE("Test follows and precedes API"){
+    test_follows_and_precedes_api();
+}
 #endif
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 //! Test deduction guides
 //! \brief \ref requirement
-TEST_CASE("Deduction guides") { test_deduction_guides(); }
+TEST_CASE("Deduction guides"){
+    test_deduction_guides();
+}
+#endif
+
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+//! \brief \ref error_guessing
+TEST_CASE("test write_once_node try_put_and_wait") {
+    test_try_put_and_wait();
+}
 #endif
diff --git a/external/tbb/test/tbbmalloc/test_malloc_atexit.cpp b/external/tbb/test/tbbmalloc/test_malloc_atexit.cpp
index 8b7e76a2..19ccc4d6 100644
--- a/external/tbb/test/tbbmalloc/test_malloc_atexit.cpp
+++ b/external/tbb/test/tbbmalloc/test_malloc_atexit.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -31,17 +31,19 @@
 // __TBB_malloc_safer_msize() returns 0 for unknown objects,
 // thus we can detect ownership
 #if _USRDLL
-#if _WIN32 || _WIN64
+#if _WIN32||_WIN64
 extern __declspec(dllexport)
+#else
+__TBB_EXPORT
 #endif
-        bool dll_isMallocOverloaded()
+bool dll_isMallocOverloaded()
 #else
 bool exe_isMallocOverloaded()
 #endif
 {
     const size_t reqSz = 8;
     void *o = malloc(reqSz);
-    bool ret = __TBB_malloc_safer_msize(o, NULL) >= reqSz;
+    bool ret = __TBB_malloc_safer_msize(o, nullptr) >= reqSz;
     free(o);
     return ret;
 }
@@ -66,13 +68,19 @@ void __libc_free(void *ptr);
 void *__libc_realloc(void *ptr, size_t size);
 
 // check that such kind of free/realloc overload works correctly
-void free(void *ptr) { __libc_free(ptr); }
+void free(void *ptr)
+{
+    __libc_free(ptr);
+}
 
-void *realloc(void *ptr, size_t size) { return __libc_realloc(ptr, size); }
-}// extern "C"
-#endif// __unix__ && !__ANDROID__
+void *realloc(void *ptr, size_t size)
+{
+    return __libc_realloc(ptr, size);
+}
+} // extern "C"
+#endif // __unix__ && !__ANDROID__
 
-#endif// MALLOC_UNIXLIKE_OVERLOAD_ENABLED || MALLOC_ZONE_OVERLOAD_ENABLED
+#endif // MALLOC_UNIXLIKE_OVERLOAD_ENABLED || MALLOC_ZONE_OVERLOAD_ENABLED
 
 // Even when the test is skipped, dll source must not be empty to generate .lib to link with.
 
@@ -83,7 +91,8 @@ void dummyFunction() {}
 #if (MALLOC_UNIXLIKE_OVERLOAD_ENABLED || MALLOC_ZONE_OVERLOAD_ENABLED) && !__ANDROID__
 typedef void *(malloc_type)(size_t);
 
-static void SigSegv(int) {
+static void SigSegv(int)
+{
     REPORT("Known issue: SIGSEGV during work with memory allocated by replaced allocator.\n"
            "skip\n");
     exit(0);
@@ -91,49 +100,53 @@ static void SigSegv(int) {
 
 // TODO: Using of SIGSEGV can be eliminated via parsing /proc/self/maps
 // and series of system malloc calls.
-void TestReplacedAllocFunc() {
+void TestReplacedAllocFunc()
+{
     struct sigaction sa, sa_default;
-    malloc_type *orig_malloc = (malloc_type *) dlsym(RTLD_NEXT, "malloc");
+    malloc_type *orig_malloc = (malloc_type*)dlsym(RTLD_NEXT, "malloc");
     void *p = (*orig_malloc)(16);
 
     // protect potentially unsafe actions
     sigemptyset(&sa.sa_mask);
     sa.sa_flags = 0;
     sa.sa_handler = SigSegv;
-    if (sigaction(SIGSEGV, &sa, &sa_default)) ASSERT(0, "sigaction failed");
+    if (sigaction(SIGSEGV, &sa, &sa_default))
+        ASSERT(0, "sigaction failed");
 
-    ASSERT(malloc_usable_size(p) >= 16, NULL);
+    ASSERT(malloc_usable_size(p) >= 16, nullptr);
     free(p);
     // no more unsafe actions, restore SIGSEGV
-    if (sigaction(SIGSEGV, &sa_default, NULL)) ASSERT(0, "sigaction failed");
+    if (sigaction(SIGSEGV, &sa_default, nullptr))
+        ASSERT(0, "sigaction failed");
 }
 #else
-void TestReplacedAllocFunc() {}
+void TestReplacedAllocFunc() { }
 #endif
 
 class Foo {
 public:
     Foo() {
         // add a lot of exit handlers to cause memory allocation
-        for (int i = 0; i < 1024; i++) atexit(dummyFunction);
+        for (int i=0; i<1024; i++)
+            atexit(dummyFunction);
         TestReplacedAllocFunc();
     }
 };
 
 static Foo f;
-#endif// !defined(_PGO_INSTRUMENT) && !__TBB_USE_ADDRESS_SANITIZER
+#endif // !defined(_PGO_INSTRUMENT) && !__TBB_USE_ADDRESS_SANITIZER
 
 int main() {}
 
-#else// _USRDLL
+#else // _USRDLL
 #include "common/test.h"
 
-#if _WIN32 || _WIN64
+#if _WIN32||_WIN64
 #include "tbb/tbbmalloc_proxy.h"
 
 extern __declspec(dllimport)
 #endif
-        bool dll_isMallocOverloaded();
+bool dll_isMallocOverloaded();
 
 #ifdef _PGO_INSTRUMENT
 //! \brief \ref error_guessing
@@ -146,11 +159,11 @@ TEST_CASE("Known issue: test_malloc_atexit is not applicable under ASAN\n" * doc
 #if !HARNESS_SKIP_TEST
 //! \brief \ref error_guessing
 TEST_CASE("test malloc atexit") {
-    REQUIRE_MESSAGE(dll_isMallocOverloaded(), "malloc was not replaced");
-    REQUIRE_MESSAGE(exe_isMallocOverloaded(), "malloc was not replaced");
+    REQUIRE_MESSAGE( dll_isMallocOverloaded(), "malloc was not replaced" );
+    REQUIRE_MESSAGE( exe_isMallocOverloaded(), "malloc was not replaced" );
 }
-#endif// HARNESS_SKIP_TEST
+#endif // HARNESS_SKIP_TEST
 
-#endif// _PGO_INSTRUMENT
+#endif // _PGO_INSTRUMENT
 
-#endif// _USRDLL
+#endif // _USRDLL
diff --git a/external/tbb/test/tbbmalloc/test_malloc_compliance.cpp b/external/tbb/test/tbbmalloc/test_malloc_compliance.cpp
index 267fc9b2..1a85ed58 100644
--- a/external/tbb/test/tbbmalloc/test_malloc_compliance.cpp
+++ b/external/tbb/test/tbbmalloc/test_malloc_compliance.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2023 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -19,17 +19,21 @@
 
 #define __TBB_NO_IMPLICIT_LINKAGE 1
 
-#define __STDC_LIMIT_MACROS 1// to get SIZE_MAX from stdint.h
+#define __STDC_LIMIT_MACROS 1 // to get SIZE_MAX from stdint.h
 
 #include "common/test.h"
 
-#include "common/memory_usage.h"
-#include "common/spin_barrier.h"
 #include "common/utils.h"
 #include "common/utils_report.h"
+#include "common/spin_barrier.h"
+#include "common/memory_usage.h"
 
 #include "oneapi/tbb/detail/_config.h"
 
+// There is no RLIMIT_AS on OpenBSD.
+// Therefore, the tests for memory limit is unreasonable.
+#if !__OpenBSD__
+
 #define __TBB_NO_IMPLICIT_LINKAGE 1
 #include "tbb/scalable_allocator.h"
 
@@ -42,21 +46,22 @@
  **/
 #undef _WIN32_WINNT
 #define _WIN32_WINNT 0x0501
-#include <stdio.h>
 #include <windows.h>
+#include <stdio.h>
 
 #if _MSC_VER && defined(_MT) && defined(_DLL)
-#pragma comment(lib, "version.lib")// to use GetFileVersionInfo*
+    #pragma comment(lib, "version.lib")  // to use GetFileVersionInfo*
 #endif
 
-void limitMem(size_t limit) {
-    static HANDLE hJob = NULL;
+void limitMem( size_t limit )
+{
+    static HANDLE hJob = nullptr;
     JOBOBJECT_EXTENDED_LIMIT_INFORMATION jobInfo;
 
     jobInfo.BasicLimitInformation.LimitFlags = JOB_OBJECT_LIMIT_PROCESS_MEMORY;
-    jobInfo.ProcessMemoryLimit = limit ? limit * MByte : 2 * MByte * 1024;
-    if (NULL == hJob) {
-        if (NULL == (hJob = CreateJobObject(NULL, NULL))) {
+    jobInfo.ProcessMemoryLimit = limit? limit*MByte : 2*MByte*1024;
+    if (nullptr == hJob) {
+        if (nullptr == (hJob = CreateJobObject(nullptr, nullptr))) {
             REPORT("Can't assign create job object: %ld\n", GetLastError());
             exit(1);
         }
@@ -65,61 +70,62 @@ void limitMem(size_t limit) {
             exit(1);
         }
     }
-    if (0 == SetInformationJobObject(hJob, JobObjectExtendedLimitInformation, &jobInfo, sizeof(jobInfo))) {
+    if (0 == SetInformationJobObject(hJob, JobObjectExtendedLimitInformation,
+                                     &jobInfo, sizeof(jobInfo))) {
         REPORT("Can't set limits: %ld\n", GetLastError());
         exit(1);
     }
 }
 // Do not test errno with static VC runtime
-#else// _WIN32 || _WIN64
-#include <errno.h>
-#include <stdint.h>// SIZE_MAX
-#include <stdio.h>
-#include <stdlib.h>
+#else // _WIN32 || _WIN64
 #include <sys/resource.h>
-#include <sys/types.h>// uint64_t on FreeBSD, needed for rlim_t
+#include <stdlib.h>
+#include <stdio.h>
+#include <errno.h>
+#include <sys/types.h>  // uint64_t on FreeBSD, needed for rlim_t
+#include <stdint.h>     // SIZE_MAX
 
-void limitMem(size_t limit) {
+void limitMem( size_t limit )
+{
     rlimit rlim;
-    int ret = getrlimit(RLIMIT_AS, &rlim);
+    int ret = getrlimit(RLIMIT_AS,&rlim);
     if (0 != ret) {
         REPORT("getrlimit() returned an error: errno %d\n", errno);
         exit(1);
     }
-    if (rlim.rlim_max == (rlim_t) RLIM_INFINITY) rlim.rlim_cur = (limit > 0) ? limit * MByte : rlim.rlim_max;
-    else
-        rlim.rlim_cur
-                = (limit > 0 && static_cast<rlim_t>(limit) < rlim.rlim_max) ? limit * MByte : rlim.rlim_max;
-    ret = setrlimit(RLIMIT_AS, &rlim);
+    if (rlim.rlim_max==(rlim_t)RLIM_INFINITY)
+        rlim.rlim_cur = (limit > 0) ? limit*MByte : rlim.rlim_max;
+    else rlim.rlim_cur = (limit > 0 && static_cast<rlim_t>(limit)<rlim.rlim_max) ? limit*MByte : rlim.rlim_max;
+    ret = setrlimit(RLIMIT_AS,&rlim);
     if (0 != ret) {
         REPORT("Can't set limits: errno %d\n", errno);
         exit(1);
     }
 }
-#endif                // _WIN32 || _WIN64
+#endif  // _WIN32 || _WIN64
 
 bool __tbb_test_errno = false;
 
-#define ASSERT_ERRNO(cond, msg) REQUIRE_MESSAGE((!__tbb_test_errno || (cond)), msg)
+#define ASSERT_ERRNO(cond, msg)  REQUIRE_MESSAGE( (!__tbb_test_errno || (cond)), msg )
 #define CHECK_ERRNO(cond) (__tbb_test_errno && (cond))
 
 static const int MinThread = 1;
 static const int MaxThread = 4;
 static bool Verbose = false;
 
-#include <errno.h>
-#include <limits.h>// for CHAR_BIT
 #include <time.h>
+#include <errno.h>
+#include <limits.h> // for CHAR_BIT
 
 #if __unix__
-#include <stdint.h>// uintptr_t
+#include <stdint.h> // uintptr_t
 #endif
 #if _WIN32 || _WIN64
-#include <malloc.h>// _aligned_(malloc|free|realloc)
+#include <malloc.h> // _aligned_(malloc|free|realloc)
 #if __MINGW64__
 // Workaround a bug in MinGW64 headers with _aligned_(malloc|free) not declared by default
 extern "C" void __cdecl __declspec(dllimport) _aligned_free(void *);
-extern "C" void *__cdecl __declspec(dllimport) _aligned_malloc(size_t, size_t);
+extern "C" void *__cdecl __declspec(dllimport) _aligned_malloc(size_t,size_t);
 #endif
 #endif
 
@@ -129,42 +135,42 @@ const int COUNT_ELEM = 25000;
 const size_t MAX_SIZE = 1000;
 const int COUNTEXPERIMENT = 10000;
 
-const char strError[] = "failed";
-const char strOk[] = "done";
+const char strError[]="failed";
+const char strOk[]="done";
 
 typedef unsigned int UINT;
 typedef unsigned char UCHAR;
 typedef unsigned long DWORD;
 typedef unsigned char BYTE;
 
-typedef void *TestMalloc(size_t size);
-typedef void *TestCalloc(size_t num, size_t size);
-typedef void *TestRealloc(void *memblock, size_t size);
-typedef void TestFree(void *memblock);
-typedef int TestPosixMemalign(void **memptr, size_t alignment, size_t size);
-typedef void *TestAlignedMalloc(size_t size, size_t alignment);
-typedef void *TestAlignedRealloc(void *memblock, size_t size, size_t alignment);
-typedef void TestAlignedFree(void *memblock);
+typedef void* TestMalloc(size_t size);
+typedef void* TestCalloc(size_t num, size_t size);
+typedef void* TestRealloc(void* memblock, size_t size);
+typedef void  TestFree(void* memblock);
+typedef int   TestPosixMemalign(void **memptr, size_t alignment, size_t size);
+typedef void* TestAlignedMalloc(size_t size, size_t alignment);
+typedef void* TestAlignedRealloc(void* memblock, size_t size, size_t alignment);
+typedef void  TestAlignedFree(void* memblock);
 
 // pointers to tested functions
-TestMalloc *Rmalloc;
-TestCalloc *Rcalloc;
-TestRealloc *Rrealloc;
-TestFree *Tfree;
-TestPosixMemalign *Rposix_memalign;
-TestAlignedMalloc *Raligned_malloc;
-TestAlignedRealloc *Raligned_realloc;
-TestAlignedFree *Taligned_free;
+TestMalloc*  Rmalloc;
+TestCalloc*  Rcalloc;
+TestRealloc* Rrealloc;
+TestFree*    Tfree;
+TestPosixMemalign*  Rposix_memalign;
+TestAlignedMalloc*  Raligned_malloc;
+TestAlignedRealloc* Raligned_realloc;
+TestAlignedFree* Taligned_free;
 
 // call functions via pointer and check result's alignment
-void *Tmalloc(size_t size);
-void *Tcalloc(size_t num, size_t size);
-void *Trealloc(void *memblock, size_t size);
-int Tposix_memalign(void **memptr, size_t alignment, size_t size);
-void *Taligned_malloc(size_t size, size_t alignment);
-void *Taligned_realloc(void *memblock, size_t size, size_t alignment);
+void* Tmalloc(size_t size);
+void* Tcalloc(size_t num, size_t size);
+void* Trealloc(void* memblock, size_t size);
+int   Tposix_memalign(void **memptr, size_t alignment, size_t size);
+void* Taligned_malloc(size_t size, size_t alignment);
+void* Taligned_realloc(void* memblock, size_t size, size_t alignment);
 
-std::atomic<bool> error_occurred {false};
+std::atomic<bool> error_occurred{ false };
 
 #if __APPLE__
 // Tests that use the variables are skipped on macOS*
@@ -176,30 +182,33 @@ static bool perProcessLimits = true;
 
 const size_t POWERS_OF_2 = 20;
 
-struct MemStruct {
-    void *Pointer;
+struct MemStruct
+{
+    void* Pointer;
     UINT Size;
 
-    MemStruct() : Pointer(NULL), Size(0) {}
-    MemStruct(void *ptr, UINT sz) : Pointer(ptr), Size(sz) {}
+    MemStruct() : Pointer(nullptr), Size(0) {}
+    MemStruct(void* ptr, UINT sz) : Pointer(ptr), Size(sz) {}
 };
 
-class CMemTest : utils::NoAssign {
+class CMemTest: utils::NoAssign
+{
     bool FullLog;
     utils::SpinBarrier *limitBarrier;
     static bool firstTime;
 
 public:
-    CMemTest(utils::SpinBarrier *barrier, bool isVerbose = false) : limitBarrier(barrier) {
-        srand((UINT) time(NULL));
-        FullLog = isVerbose;
-    }
-    void NULLReturn(UINT MinSize, UINT MaxSize, int total_threads);// NULL pointer + check errno
-    void UniquePointer();                                          // unique pointer - check with padding
-    void AddrArifm();// unique pointer - check with pointer arithmetic
+    CMemTest(utils::SpinBarrier *barrier, bool isVerbose=false) : limitBarrier(barrier)
+        {
+            srand((UINT)time(nullptr));
+            FullLog=isVerbose;
+        }
+    void NULLReturn(UINT MinSize, UINT MaxSize, int total_threads); // nullptr pointer + check errno
+    void UniquePointer(); // unique pointer - check with padding
+    void AddrArifm(); // unique pointer - check with pointer arithmetic
     bool ShouldReportError();
-    void Free_NULL();  //
-    void Zerofilling();// check if arrays are zero-filled
+    void Free_NULL(); //
+    void Zerofilling(); // check if arrays are zero-filled
     void TestAlignedParameters();
     void RunAllTests(int total_threads);
     ~CMemTest() {}
@@ -207,355 +216,407 @@ class CMemTest : utils::NoAssign {
 
 class Limit {
     size_t limit;
-
 public:
     Limit(size_t a_limit) : limit(a_limit) {}
-    void operator()() const { limitMem(limit); }
+    void operator() () const {
+        limitMem(limit);
+    }
 };
 
 int argC;
-char **argV;
+char** argV;
 
-struct RoundRobin : utils::NoAssign {
+struct RoundRobin: utils::NoAssign {
     const long number_of_threads;
     mutable CMemTest test;
 
-    RoundRobin(long p, utils::SpinBarrier *limitBarrier, bool verbose)
-        : number_of_threads(p), test(limitBarrier, verbose) {}
-    void operator()(int /*id*/) const { test.RunAllTests(number_of_threads); }
+    RoundRobin( long p, utils::SpinBarrier *limitBarrier, bool verbose ) :
+        number_of_threads(p), test(limitBarrier, verbose) {}
+    void operator()( int /*id*/ ) const
+        {
+            test.RunAllTests(number_of_threads);
+        }
 };
 
 bool CMemTest::firstTime = true;
 
-inline size_t choose_random_alignment() { return sizeof(void *) << (rand() % POWERS_OF_2); }
+inline size_t choose_random_alignment() {
+    return sizeof(void*)<<(rand() % POWERS_OF_2);
+}
 
 #if TBB_REVAMP_TODO
 // TODO: enable this test mode
-static void setSystemAllocs() {
-    Rmalloc = malloc;
-    Rrealloc = realloc;
-    Rcalloc = calloc;
-    Tfree = free;
+static void setSystemAllocs()
+{
+    Rmalloc=malloc;
+    Rrealloc=realloc;
+    Rcalloc=calloc;
+    Tfree=free;
 #if _WIN32 || _WIN64
-    Raligned_malloc = _aligned_malloc;
-    Raligned_realloc = _aligned_realloc;
-    Taligned_free = _aligned_free;
-    Rposix_memalign = 0;
-#elif __APPLE__ || __sun || __ANDROID__
-    // macOS, Solaris*, and Android* don't have posix_memalign
-    Raligned_malloc = 0;
-    Raligned_realloc = 0;
-    Taligned_free = 0;
-    Rposix_memalign = 0;
+    Raligned_malloc=_aligned_malloc;
+    Raligned_realloc=_aligned_realloc;
+    Taligned_free=_aligned_free;
+    Rposix_memalign=0;
+#elif  __APPLE__ || __sun || __ANDROID__
+// macOS, Solaris*, and Android* don't have posix_memalign
+    Raligned_malloc=0;
+    Raligned_realloc=0;
+    Taligned_free=0;
+    Rposix_memalign=0;
 #else
-    Raligned_malloc = 0;
-    Raligned_realloc = 0;
-    Taligned_free = 0;
-    Rposix_memalign = posix_memalign;
+    Raligned_malloc=0;
+    Raligned_realloc=0;
+    Taligned_free=0;
+    Rposix_memalign=posix_memalign;
 #endif
 }
 #endif
 
 // check that realloc works as free and as malloc
-void ReallocParam() {
+void ReallocParam()
+{
     const int ITERS = 1000;
     int i;
     void *bufs[ITERS];
 
-    bufs[0] = Trealloc(NULL, 30 * MByte);
+    bufs[0] = Trealloc(nullptr, 30*MByte);
     REQUIRE_MESSAGE(bufs[0], "Can't get memory to start the test.");
 
-    for (i = 1; i < ITERS; i++) {
-        bufs[i] = Trealloc(NULL, 30 * MByte);
-        if (NULL == bufs[i]) break;
+    for (i=1; i<ITERS; i++)
+    {
+        bufs[i] = Trealloc(nullptr, 30*MByte);
+        if (nullptr == bufs[i])
+            break;
     }
-    REQUIRE_MESSAGE(i < ITERS, "Limits should be decreased for the test to work.");
+    REQUIRE_MESSAGE(i<ITERS, "Limits should be decreased for the test to work.");
 
     Trealloc(bufs[0], 0);
     /* There is a race for the free space between different threads at
        this point. So, have to run the test sequentially.
     */
-    bufs[0] = Trealloc(NULL, 30 * MByte);
+    bufs[0] = Trealloc(nullptr, 30*MByte);
     REQUIRE(bufs[0]);
 
-    for (int j = 0; j < i; j++) Trealloc(bufs[j], 0);
+    for (int j=0; j<i; j++)
+        Trealloc(bufs[j], 0);
 }
 
-void CheckArgumentsOverflow() {
+void CheckArgumentsOverflow()
+{
     void *p;
-    const size_t params[] = {SIZE_MAX, SIZE_MAX - 16};
+    const size_t params[] = {SIZE_MAX, SIZE_MAX-16};
 
-    for (unsigned i = 0; i < utils::array_length(params); i++) {
+    for (unsigned i=0; i<utils::array_length(params); i++) {
         p = Tmalloc(params[i]);
         REQUIRE(!p);
-        ASSERT_ERRNO(errno == ENOMEM, NULL);
-        p = Trealloc(NULL, params[i]);
+        ASSERT_ERRNO(errno==ENOMEM, nullptr);
+        p = Trealloc(nullptr, params[i]);
         REQUIRE(!p);
-        ASSERT_ERRNO(errno == ENOMEM, NULL);
+        ASSERT_ERRNO(errno==ENOMEM, nullptr);
         p = Tcalloc(1, params[i]);
         REQUIRE(!p);
-        ASSERT_ERRNO(errno == ENOMEM, NULL);
+        ASSERT_ERRNO(errno==ENOMEM, nullptr);
         p = Tcalloc(params[i], 1);
         REQUIRE(!p);
-        ASSERT_ERRNO(errno == ENOMEM, NULL);
+        ASSERT_ERRNO(errno==ENOMEM, nullptr);
     }
-    const size_t max_alignment = size_t(1) << (sizeof(size_t) * CHAR_BIT - 1);
+    const size_t max_alignment = size_t(1) << (sizeof(size_t)*CHAR_BIT - 1);
     if (Rposix_memalign) {
         int ret = Rposix_memalign(&p, max_alignment, ~max_alignment);
         REQUIRE(ret == ENOMEM);
-        for (unsigned i = 0; i < utils::array_length(params); i++) {
+        for (unsigned i=0; i<utils::array_length(params); i++) {
             ret = Rposix_memalign(&p, max_alignment, params[i]);
             REQUIRE(ret == ENOMEM);
-            ret = Rposix_memalign(&p, sizeof(void *), params[i]);
+            ret = Rposix_memalign(&p, sizeof(void*), params[i]);
             REQUIRE(ret == ENOMEM);
         }
     }
     if (Raligned_malloc) {
         p = Raligned_malloc(~max_alignment, max_alignment);
         REQUIRE(!p);
-        for (unsigned i = 0; i < utils::array_length(params); i++) {
+        for (unsigned i=0; i<utils::array_length(params); i++) {
             p = Raligned_malloc(params[i], max_alignment);
             REQUIRE(!p);
-            ASSERT_ERRNO(errno == ENOMEM, NULL);
-            p = Raligned_malloc(params[i], sizeof(void *));
+            ASSERT_ERRNO(errno==ENOMEM, nullptr);
+            p = Raligned_malloc(params[i], sizeof(void*));
             REQUIRE(!p);
-            ASSERT_ERRNO(errno == ENOMEM, NULL);
+            ASSERT_ERRNO(errno==ENOMEM, nullptr);
         }
     }
 
-    p = Tcalloc(SIZE_MAX / 2 - 16, SIZE_MAX / 2 - 16);
+    p = Tcalloc(SIZE_MAX/2-16, SIZE_MAX/2-16);
     REQUIRE(!p);
-    ASSERT_ERRNO(errno == ENOMEM, NULL);
-    p = Tcalloc(SIZE_MAX / 2, SIZE_MAX / 2);
+    ASSERT_ERRNO(errno==ENOMEM, nullptr);
+    p = Tcalloc(SIZE_MAX/2, SIZE_MAX/2);
     REQUIRE(!p);
-    ASSERT_ERRNO(errno == ENOMEM, NULL);
+    ASSERT_ERRNO(errno==ENOMEM, nullptr);
 }
 
-void InvariantDataRealloc(bool aligned, size_t maxAllocSize, bool checkData) {
+void InvariantDataRealloc(bool aligned, size_t maxAllocSize, bool checkData)
+{
     utils::FastRandom<> fastRandom(1);
     size_t size = 0, start = 0;
-    char *ptr = NULL,
-         // external thread to create copies and compare ralloc result against it
-            *base = (char *) Tmalloc(2 * maxAllocSize);
+    char *ptr = nullptr,
+        // external thread to create copies and compare ralloc result against it
+        *base = (char*)Tmalloc(2*maxAllocSize);
 
     REQUIRE(base);
-    REQUIRE_MESSAGE(!(2 * maxAllocSize % sizeof(unsigned short)),
-                    "The loop below expects that 2*maxAllocSize contains sizeof(unsigned short)");
-    for (size_t k = 0; k < 2 * maxAllocSize; k += sizeof(unsigned short))
-        *(unsigned short *) (base + k) = fastRandom.get();
+    REQUIRE_MESSAGE(!(2*maxAllocSize%sizeof(unsigned short)),
+           "The loop below expects that 2*maxAllocSize contains sizeof(unsigned short)");
+    for (size_t k = 0; k<2*maxAllocSize; k+=sizeof(unsigned short))
+        *(unsigned short*)(base+k) = fastRandom.get();
 
-    for (int i = 0; i < 100; i++) {
+    for (int i=0; i<100; i++) {
         // don't want sizeNew==0 here
-        const size_t sizeNew = fastRandom.get() % (maxAllocSize - 1) + 1;
-        char *ptrNew = aligned ? (char *) Taligned_realloc(ptr, sizeNew, choose_random_alignment())
-                               : (char *) Trealloc(ptr, sizeNew);
+        const size_t sizeNew = fastRandom.get() % (maxAllocSize-1) + 1;
+        char *ptrNew = aligned?
+            (char*)Taligned_realloc(ptr, sizeNew, choose_random_alignment())
+            : (char*)Trealloc(ptr, sizeNew);
         REQUIRE(ptrNew);
         // check that old data not changed
         if (checkData)
-            REQUIRE_MESSAGE(!memcmp(ptrNew, base + start, utils::min(size, sizeNew)), "broken data");
+            REQUIRE_MESSAGE(!memcmp(ptrNew, base+start, utils::min(size, sizeNew)), "broken data");
 
         // prepare fresh data, copying them from random position in external
         size = sizeNew;
         ptr = ptrNew;
         if (checkData) {
             start = fastRandom.get() % maxAllocSize;
-            memcpy(ptr, base + start, size);
+            memcpy(ptr, base+start, size);
         }
     }
-    if (aligned) Taligned_realloc(ptr, 0, choose_random_alignment());
+    if (aligned)
+        Taligned_realloc(ptr, 0, choose_random_alignment());
     else
         Trealloc(ptr, 0);
     Tfree(base);
 }
 
-void CheckReallocLeak() {
+void CheckReallocLeak()
+{
     int i;
     const int ITER_TO_STABILITY = 10;
     // do bootstrap
-    for (int k = 0; k < 3; k++) InvariantDataRealloc(/*aligned=*/false, 128 * MByte, /*checkData=*/false);
+    for (int k=0; k<3; k++)
+        InvariantDataRealloc(/*aligned=*/false, 128*MByte, /*checkData=*/false);
     size_t prev = utils::GetMemoryUsage(utils::peakUsage);
     // expect realloc to not increase peak memory consumption after ITER_TO_STABILITY-1 iterations
-    for (i = 0; i < ITER_TO_STABILITY; i++) {
-        for (int k = 0; k < 3; k++) InvariantDataRealloc(/*aligned=*/false, 128 * MByte, /*checkData=*/false);
+    for (i=0; i<ITER_TO_STABILITY; i++) {
+        for (int k=0; k<3; k++)
+            InvariantDataRealloc(/*aligned=*/false, 128*MByte, /*checkData=*/false);
         size_t curr = utils::GetMemoryUsage(utils::peakUsage);
-        if (prev == curr) break;
+        if (prev == curr)
+            break;
         prev = curr;
     }
     REQUIRE_MESSAGE(i < ITER_TO_STABILITY, "Can't stabilize memory consumption.");
 }
 
 // if non-zero byte found, returns bad value address plus 1
-size_t NonZero(void *ptr, size_t size) {
+size_t NonZero(void *ptr, size_t size)
+{
     size_t words = size / sizeof(intptr_t);
     size_t tailSz = size % sizeof(intptr_t);
-    intptr_t *buf = (intptr_t *) ptr;
-    char *bufTail = (char *) (buf + words);
+    intptr_t *buf =(intptr_t*)ptr;
+    char *bufTail =(char*)(buf+words);
 
-    for (size_t i = 0; i < words; i++)
+    for (size_t i=0; i<words; i++)
         if (buf[i]) {
-            for (unsigned b = 0; b < sizeof(intptr_t); b++)
-                if (((char *) (buf + i))[b]) return sizeof(intptr_t) * i + b + 1;
+            for (unsigned b=0; b<sizeof(intptr_t); b++)
+                if (((char*)(buf+i))[b])
+                    return sizeof(intptr_t)*i + b + 1;
+        }
+    for (size_t i=0; i<tailSz; i++)
+        if (bufTail[i]) {
+            return words*sizeof(intptr_t)+i+1;
         }
-    for (size_t i = 0; i < tailSz; i++)
-        if (bufTail[i]) { return words * sizeof(intptr_t) + i + 1; }
     return 0;
 }
 
-struct TestStruct {
-    DWORD field1 : 2;
-    DWORD field2 : 6;
+struct TestStruct
+{
+    DWORD field1:2;
+    DWORD field2:6;
     double field3;
     UCHAR field4[100];
-    TestStruct *field5;
+    TestStruct* field5;
     std::vector<int> field7;
     double field8;
 };
 
-void *Tmalloc(size_t size) {
+void* Tmalloc(size_t size)
+{
     // For compatibility, on 64-bit systems malloc should align to 16 bytes
-    size_t alignment = (sizeof(intptr_t) > 4 && size > 8) ? 16 : 8;
+    size_t alignment = (sizeof(intptr_t)>4 && size>8) ? 16 : 8;
     void *ret = Rmalloc(size);
-    if (0 != ret)
-        CHECK_FAST_MESSAGE(0 == ((uintptr_t) ret & (alignment - 1)),
-                           "allocation result should be properly aligned");
+    if (nullptr != ret)
+        CHECK_FAST_MESSAGE(0==((uintptr_t)ret & (alignment-1)),
+               "allocation result should be properly aligned");
     return ret;
 }
-void *Tcalloc(size_t num, size_t size) {
+void* Tcalloc(size_t num, size_t size)
+{
     // For compatibility, on 64-bit systems calloc should align to 16 bytes
-    size_t alignment = (sizeof(intptr_t) > 4 && num && size > 8) ? 16 : 8;
+    size_t alignment = (sizeof(intptr_t)>4 && num && size>8) ? 16 : 8;
     void *ret = Rcalloc(num, size);
-    if (0 != ret)
-        CHECK_FAST_MESSAGE(0 == ((uintptr_t) ret & (alignment - 1)),
-                           "allocation result should be properly aligned");
+    if (nullptr != ret)
+        CHECK_FAST_MESSAGE(0==((uintptr_t)ret & (alignment-1)),
+               "allocation result should be properly aligned");
     return ret;
 }
-void *Trealloc(void *memblock, size_t size) {
+void* Trealloc(void* memblock, size_t size)
+{
     // For compatibility, on 64-bit systems realloc should align to 16 bytes
-    size_t alignment = (sizeof(intptr_t) > 4 && size > 8) ? 16 : 8;
+    size_t alignment = (sizeof(intptr_t)>4 && size>8) ? 16 : 8;
     void *ret = Rrealloc(memblock, size);
-    if (0 != ret)
-        CHECK_FAST_MESSAGE(0 == ((uintptr_t) ret & (alignment - 1)),
-                           "allocation result should be properly aligned");
+    if (nullptr != ret)
+        CHECK_FAST_MESSAGE(0==((uintptr_t)ret & (alignment-1)),
+               "allocation result should be properly aligned");
     return ret;
 }
-int Tposix_memalign(void **memptr, size_t alignment, size_t size) {
+int Tposix_memalign(void **memptr, size_t alignment, size_t size)
+{
     int ret = Rposix_memalign(memptr, alignment, size);
     if (0 == ret)
-        CHECK_FAST_MESSAGE(0 == ((uintptr_t) *memptr & (alignment - 1)),
-                           "allocation result should be aligned");
+        CHECK_FAST_MESSAGE(0==((uintptr_t)*memptr & (alignment-1)),
+               "allocation result should be aligned");
     return ret;
 }
-void *Taligned_malloc(size_t size, size_t alignment) {
+void* Taligned_malloc(size_t size, size_t alignment)
+{
     void *ret = Raligned_malloc(size, alignment);
-    if (0 != ret)
-        CHECK_FAST_MESSAGE(0 == ((uintptr_t) ret & (alignment - 1)), "allocation result should be aligned");
+    if (nullptr != ret)
+        CHECK_FAST_MESSAGE(0==((uintptr_t)ret & (alignment-1)),
+               "allocation result should be aligned");
     return ret;
 }
-void *Taligned_realloc(void *memblock, size_t size, size_t alignment) {
+void* Taligned_realloc(void* memblock, size_t size, size_t alignment)
+{
     void *ret = Raligned_realloc(memblock, size, alignment);
-    if (0 != ret)
-        CHECK_FAST_MESSAGE(0 == ((uintptr_t) ret & (alignment - 1)), "allocation result should be aligned");
+    if (nullptr != ret)
+        CHECK_FAST_MESSAGE(0==((uintptr_t)ret & (alignment-1)),
+               "allocation result should be aligned");
     return ret;
 }
 
 struct PtrSize {
-    void *ptr;
+    void  *ptr;
     size_t size;
 };
 
-static int cmpAddrs(const void *p1, const void *p2) {
-    const PtrSize *a = (const PtrSize *) p1;
-    const PtrSize *b = (const PtrSize *) p2;
+static int cmpAddrs(const void *p1, const void *p2)
+{
+    const PtrSize *a = (const PtrSize *)p1;
+    const PtrSize *b = (const PtrSize *)p2;
 
-    return a->ptr < b->ptr ? -1 : (a->ptr == b->ptr ? 0 : 1);
+    return a->ptr < b->ptr ? -1 : ( a->ptr == b->ptr ? 0 : 1);
 }
 
-void CMemTest::AddrArifm() {
-    PtrSize *arr = (PtrSize *) Tmalloc(COUNT_ELEM * sizeof(PtrSize));
+void CMemTest::AddrArifm()
+{
+    PtrSize *arr = (PtrSize*)Tmalloc(COUNT_ELEM*sizeof(PtrSize));
 
     if (FullLog) REPORT("\nUnique pointer using Address arithmetic\n");
     if (FullLog) REPORT("malloc....");
     REQUIRE(arr);
-    for (int i = 0; i < COUNT_ELEM; i++) {
-        arr[i].size = rand() % MAX_SIZE;
-        arr[i].ptr = Tmalloc(arr[i].size);
+    for (int i=0; i<COUNT_ELEM; i++)
+    {
+        arr[i].size=rand()%MAX_SIZE;
+        arr[i].ptr=Tmalloc(arr[i].size);
     }
     qsort(arr, COUNT_ELEM, sizeof(PtrSize), cmpAddrs);
 
-    for (int i = 0; i < COUNT_ELEM - 1; i++) {
-        if (NULL != arr[i].ptr && NULL != arr[i + 1].ptr)
-            REQUIRE_MESSAGE((uintptr_t) arr[i].ptr + arr[i].size <= (uintptr_t) arr[i + 1].ptr,
-                            "intersection detected");
+    for (int i=0; i<COUNT_ELEM-1; i++)
+    {
+        if (nullptr!=arr[i].ptr && nullptr!=arr[i+1].ptr)
+            REQUIRE_MESSAGE((uintptr_t)arr[i].ptr+arr[i].size <= (uintptr_t)arr[i+1].ptr,
+                   "intersection detected");
     }
     //----------------------------------------------------------------
     if (FullLog) REPORT("realloc....");
-    for (int i = 0; i < COUNT_ELEM; i++) {
-        size_t count = arr[i].size * 2;
-        void *tmpAddr = Trealloc(arr[i].ptr, count);
-        if (NULL != tmpAddr) {
+    for (int i=0; i<COUNT_ELEM; i++)
+    {
+        size_t count=arr[i].size*2;
+        void *tmpAddr=Trealloc(arr[i].ptr,count);
+        if (nullptr!=tmpAddr) {
             arr[i].ptr = tmpAddr;
             arr[i].size = count;
-        } else if (count == 0) {// because realloc(..., 0) works as free
-            arr[i].ptr = NULL;
+        } else if (count==0) { // because realloc(..., 0) works as free
+            arr[i].ptr = nullptr;
             arr[i].size = 0;
         }
     }
     qsort(arr, COUNT_ELEM, sizeof(PtrSize), cmpAddrs);
 
-    for (int i = 0; i < COUNT_ELEM - 1; i++) {
-        if (NULL != arr[i].ptr && NULL != arr[i + 1].ptr)
-            REQUIRE_MESSAGE((uintptr_t) arr[i].ptr + arr[i].size <= (uintptr_t) arr[i + 1].ptr,
-                            "intersection detected");
+    for (int i=0; i<COUNT_ELEM-1; i++)
+    {
+        if (nullptr!=arr[i].ptr && nullptr!=arr[i+1].ptr)
+            REQUIRE_MESSAGE((uintptr_t)arr[i].ptr+arr[i].size <= (uintptr_t)arr[i+1].ptr,
+                   "intersection detected");
+    }
+    for (int i=0; i<COUNT_ELEM; i++)
+    {
+        Tfree(arr[i].ptr);
     }
-    for (int i = 0; i < COUNT_ELEM; i++) { Tfree(arr[i].ptr); }
     //-------------------------------------------
     if (FullLog) REPORT("calloc....");
-    for (int i = 0; i < COUNT_ELEM; i++) {
-        arr[i].size = rand() % MAX_SIZE;
-        arr[i].ptr = Tcalloc(arr[i].size, 1);
+    for (int i=0; i<COUNT_ELEM; i++)
+    {
+        arr[i].size=rand()%MAX_SIZE;
+        arr[i].ptr=Tcalloc(arr[i].size,1);
     }
     qsort(arr, COUNT_ELEM, sizeof(PtrSize), cmpAddrs);
 
-    for (int i = 0; i < COUNT_ELEM - 1; i++) {
-        if (NULL != arr[i].ptr && NULL != arr[i + 1].ptr)
-            REQUIRE_MESSAGE((uintptr_t) arr[i].ptr + arr[i].size <= (uintptr_t) arr[i + 1].ptr,
-                            "intersection detected");
+    for (int i=0; i<COUNT_ELEM-1; i++)
+    {
+        if (nullptr!=arr[i].ptr && nullptr!=arr[i+1].ptr)
+            REQUIRE_MESSAGE((uintptr_t)arr[i].ptr+arr[i].size <= (uintptr_t)arr[i+1].ptr,
+                   "intersection detected");
+    }
+    for (int i=0; i<COUNT_ELEM; i++)
+    {
+        Tfree(arr[i].ptr);
     }
-    for (int i = 0; i < COUNT_ELEM; i++) { Tfree(arr[i].ptr); }
     Tfree(arr);
 }
 
-void CMemTest::Zerofilling() {
-    TestStruct *TSMas;
+void CMemTest::Zerofilling()
+{
+    TestStruct* TSMas;
     size_t CountElement;
-    static std::atomic<int> CountErrors {0};
+    static std::atomic<int> CountErrors{0};
     if (FullLog) REPORT("\nzeroings elements of array....");
     //test struct
-    for (int i = 0; i < COUNTEXPERIMENT; i++) {
-        CountElement = rand() % MAX_SIZE;
-        TSMas = (TestStruct *) Tcalloc(CountElement, sizeof(TestStruct));
-        if (NULL == TSMas) continue;
-        for (size_t j = 0; j < CountElement; j++) {
-            if (NonZero(TSMas + j, sizeof(TestStruct))) {
+    for (int i=0; i<COUNTEXPERIMENT; i++)
+    {
+        CountElement=rand()%MAX_SIZE;
+        TSMas=(TestStruct*)Tcalloc(CountElement,sizeof(TestStruct));
+        if (nullptr == TSMas)
+            continue;
+        for (size_t j=0; j<CountElement; j++)
+        {
+            if (NonZero(TSMas+j, sizeof(TestStruct)))
+            {
                 CountErrors++;
                 if (ShouldReportError()) REPORT("detect nonzero element at TestStruct\n");
             }
         }
         Tfree(TSMas);
     }
-    if (CountErrors) REPORT("%s\n", strError);
-    else if (FullLog)
-        REPORT("%s\n", strOk);
+    if (CountErrors) REPORT("%s\n",strError);
+    else if (FullLog) REPORT("%s\n",strOk);
     if (CountErrors) error_occurred = true;
 }
 
 #if !__APPLE__
 
-void myMemset(void *ptr, int c, size_t n) {
-#if __unix__ && __i386__
-    // memset in Fedora 13 not always correctly sets memory to required values.
-    char *p = (char *) ptr;
-    for (size_t i = 0; i < n; i++) p[i] = c;
+void myMemset(void *ptr, int c, size_t n)
+{
+#if  __unix__ &&  __i386__
+// memset in Fedora 13 not always correctly sets memory to required values.
+    char *p = (char*)ptr;
+    for (size_t i=0; i<n; i++)
+        p[i] = c;
 #else
     memset(ptr, c, n);
 #endif
@@ -564,352 +625,385 @@ void myMemset(void *ptr, int c, size_t n) {
 // This test requires more than TOTAL_MB_ALLOC MB of RAM.
 #if __ANDROID__
 // Android requires lower limit due to lack of virtual memory.
-#define TOTAL_MB_ALLOC 200
+#define TOTAL_MB_ALLOC	200
 #else
-#define TOTAL_MB_ALLOC 800
+#define TOTAL_MB_ALLOC  800
 #endif
-void CMemTest::NULLReturn(UINT MinSize, UINT MaxSize, int total_threads) {
+void CMemTest::NULLReturn(UINT MinSize, UINT MaxSize, int total_threads)
+{
     const int MB_PER_THREAD = TOTAL_MB_ALLOC / total_threads;
-    // find size to guarantee getting NULL for 1024 B allocations
-    const int MAXNUM_1024 = (MB_PER_THREAD + (MB_PER_THREAD >> 2)) * 1024;
+    // find size to guarantee getting nullptr for 1024 B allocations
+    const int MAXNUM_1024 = (MB_PER_THREAD + (MB_PER_THREAD>>2)) * 1024;
 
     std::vector<MemStruct> PointerList;
     void *tmp;
-    static std::atomic<int> CountErrors {0};
+    static std::atomic<int> CountErrors{0};
     int CountNULL, num_1024;
     if (FullLog) REPORT("\nNULL return & check errno:\n");
     UINT Size;
     Limit limit_total(TOTAL_MB_ALLOC), no_limit(0);
-    void **buf_1024 = (void **) Tmalloc(MAXNUM_1024 * sizeof(void *));
+    void **buf_1024 = (void**)Tmalloc(MAXNUM_1024*sizeof(void*));
 
     REQUIRE(buf_1024);
     /* We must have space for pointers when memory limit is hit.
        Reserve enough for the worst case, taking into account race for
        limited space between threads.
     */
-    PointerList.reserve(TOTAL_MB_ALLOC * MByte / MinSize);
+    PointerList.reserve(TOTAL_MB_ALLOC*MByte/MinSize);
 
     /* There is a bug in the specific version of GLIBC (2.5-12) shipped
        with RHEL5 that leads to erroneous working of the test
        on Intel(R) 64 and Itanium(R) architecture when setrlimit-related part is enabled.
        Switching to GLIBC 2.5-18 from RHEL5.1 resolved the issue.
      */
-    if (perProcessLimits) limitBarrier->wait(limit_total);
+    if (perProcessLimits)
+        limitBarrier->wait(limit_total);
     else
         limitMem(MB_PER_THREAD);
 
-    /* regression test against the bug in allocator when it dereference NULL
+    /* regression test against the bug in allocator when it dereference nullptr
        while lack of memory
     */
-    for (num_1024 = 0; num_1024 < MAXNUM_1024; num_1024++) {
+    for (num_1024=0; num_1024<MAXNUM_1024; num_1024++) {
         buf_1024[num_1024] = Tcalloc(1024, 1);
-        if (!buf_1024[num_1024]) {
-            ASSERT_ERRNO(errno == ENOMEM, NULL);
+        if (! buf_1024[num_1024]) {
+            ASSERT_ERRNO(errno == ENOMEM, nullptr);
             break;
         }
     }
-    for (int i = 0; i < num_1024; i++) Tfree(buf_1024[i]);
+    for (int i=0; i<num_1024; i++)
+        Tfree(buf_1024[i]);
     Tfree(buf_1024);
 
     do {
-        Size = rand() % (MaxSize - MinSize) + MinSize;
-        tmp = Tmalloc(Size);
-        if (tmp != NULL) {
+        Size=rand()%(MaxSize-MinSize)+MinSize;
+        tmp=Tmalloc(Size);
+        if (tmp != nullptr)
+        {
             myMemset(tmp, 0, Size);
             PointerList.push_back(MemStruct(tmp, Size));
         }
-    } while (tmp != NULL);
-    ASSERT_ERRNO(errno == ENOMEM, NULL);
+    } while(tmp != nullptr);
+    ASSERT_ERRNO(errno == ENOMEM, nullptr);
     if (FullLog) REPORT("\n");
 
     // preparation complete, now running tests
     // malloc
     if (FullLog) REPORT("malloc....");
     CountNULL = 0;
-    while (CountNULL == 0)
-        for (int j = 0; j < COUNT_TESTS; j++) {
-            Size = rand() % (MaxSize - MinSize) + MinSize;
-            errno = ENOMEM + j + 1;
-            tmp = Tmalloc(Size);
-            if (tmp == NULL) {
+    while (CountNULL==0)
+        for (int j=0; j<COUNT_TESTS; j++)
+        {
+            Size=rand()%(MaxSize-MinSize)+MinSize;
+            errno = ENOMEM+j+1;
+            tmp=Tmalloc(Size);
+            if (tmp == nullptr)
+            {
                 CountNULL++;
-                if (CHECK_ERRNO(errno != ENOMEM)) {
+                if ( CHECK_ERRNO(errno != ENOMEM) ) {
                     CountErrors++;
-                    if (ShouldReportError()) REPORT("NULL returned, error: errno (%d) != ENOMEM\n", errno);
+                    if (ShouldReportError()) REPORT("nullptr returned, error: errno (%d) != ENOMEM\n", errno);
                 }
-            } else {
-                // Technically, if malloc returns a non-NULL pointer, it is allowed to set errno anyway.
+            }
+            else
+            {
+                // Technically, if malloc returns a non-null pointer, it is allowed to set errno anyway.
                 // However, on most systems it does not set errno.
                 bool known_issue = false;
 #if __unix__ || __ANDROID__
-                if (CHECK_ERRNO(errno == ENOMEM)) known_issue = true;
+                if( CHECK_ERRNO(errno==ENOMEM) ) known_issue = true;
 #endif /* __unix__ */
-                if (CHECK_ERRNO(errno != ENOMEM + j + 1) && !known_issue) {
+                if ( CHECK_ERRNO(errno != ENOMEM+j+1) && !known_issue) {
                     CountErrors++;
-                    if (ShouldReportError())
-                        REPORT("error: errno changed to %d though valid pointer was returned\n", errno);
+                    if (ShouldReportError()) REPORT("error: errno changed to %d though valid pointer was returned\n", errno);
                 }
                 myMemset(tmp, 0, Size);
                 PointerList.push_back(MemStruct(tmp, Size));
             }
         }
     if (FullLog) REPORT("end malloc\n");
-    if (CountErrors) REPORT("%s\n", strError);
-    else if (FullLog)
-        REPORT("%s\n", strOk);
+    if (CountErrors) REPORT("%s\n",strError);
+    else if (FullLog) REPORT("%s\n",strOk);
     if (CountErrors) error_occurred = true;
 
     //calloc
     if (FullLog) REPORT("calloc....");
     CountNULL = 0;
-    while (CountNULL == 0)
-        for (int j = 0; j < COUNT_TESTS; j++) {
-            Size = rand() % (MaxSize - MinSize) + MinSize;
-            errno = ENOMEM + j + 1;
-            tmp = Tcalloc(COUNT_ELEM_CALLOC, Size);
-            if (tmp == NULL) {
+    while (CountNULL==0)
+        for (int j=0; j<COUNT_TESTS; j++)
+        {
+            Size=rand()%(MaxSize-MinSize)+MinSize;
+            errno = ENOMEM+j+1;
+            tmp=Tcalloc(COUNT_ELEM_CALLOC,Size);
+            if (tmp == nullptr)
+            {
                 CountNULL++;
-                if (CHECK_ERRNO(errno != ENOMEM)) {
+                if ( CHECK_ERRNO(errno != ENOMEM) ){
                     CountErrors++;
-                    if (ShouldReportError()) REPORT("NULL returned, error: errno(%d) != ENOMEM\n", errno);
+                    if (ShouldReportError()) REPORT("nullptr returned, error: errno(%d) != ENOMEM\n", errno);
                 }
-            } else {
-                // Technically, if calloc returns a non-NULL pointer, it is allowed to set errno anyway.
+            }
+            else
+            {
+                // Technically, if calloc returns a non-null pointer, it is allowed to set errno anyway.
                 // However, on most systems it does not set errno.
                 bool known_issue = false;
 #if __unix__
-                if (CHECK_ERRNO(errno == ENOMEM)) known_issue = true;
+                if( CHECK_ERRNO(errno==ENOMEM) ) known_issue = true;
 #endif /* __unix__ */
-                if (CHECK_ERRNO(errno != ENOMEM + j + 1) && !known_issue) {
+                if ( CHECK_ERRNO(errno != ENOMEM+j+1) && !known_issue ) {
                     CountErrors++;
-                    if (ShouldReportError())
-                        REPORT("error: errno changed to %d though valid pointer was returned\n", errno);
+                    if (ShouldReportError()) REPORT("error: errno changed to %d though valid pointer was returned\n", errno);
                 }
                 PointerList.push_back(MemStruct(tmp, Size));
             }
         }
     if (FullLog) REPORT("end calloc\n");
-    if (CountErrors) REPORT("%s\n", strError);
-    else if (FullLog)
-        REPORT("%s\n", strOk);
+    if (CountErrors) REPORT("%s\n",strError);
+    else if (FullLog) REPORT("%s\n",strOk);
     if (CountErrors) error_occurred = true;
     if (FullLog) REPORT("realloc....");
     CountNULL = 0;
     if (PointerList.size() > 0)
-        while (CountNULL == 0)
-            for (size_t i = 0; i < (size_t) COUNT_TESTS && i < PointerList.size(); i++) {
+        while (CountNULL==0)
+            for (size_t i=0; i<(size_t)COUNT_TESTS && i<PointerList.size(); i++)
+            {
                 errno = 0;
-                tmp = Trealloc(PointerList[i].Pointer, PointerList[i].Size * 2);
-                if (tmp != NULL)// same or another place
+                tmp=Trealloc(PointerList[i].Pointer,PointerList[i].Size*2);
+                if (tmp != nullptr) // same or another place
                 {
                     bool known_issue = false;
 #if __unix__
-                    if (errno == ENOMEM) known_issue = true;
+                    if( errno==ENOMEM ) known_issue = true;
 #endif /* __unix__ */
                     if (errno != 0 && !known_issue) {
                         CountErrors++;
                         if (ShouldReportError()) REPORT("valid pointer returned, error: errno not kept\n");
                     }
                     // newly allocated area have to be zeroed
-                    myMemset((char *) tmp + PointerList[i].Size, 0, PointerList[i].Size);
+                    myMemset((char*)tmp + PointerList[i].Size, 0, PointerList[i].Size);
                     PointerList[i].Pointer = tmp;
                     PointerList[i].Size *= 2;
                 } else {
                     CountNULL++;
-                    if (CHECK_ERRNO(errno != ENOMEM)) {
+                    if ( CHECK_ERRNO(errno != ENOMEM) )
+                    {
                         CountErrors++;
-                        if (ShouldReportError()) REPORT("NULL returned, error: errno(%d) != ENOMEM\n", errno);
+                        if (ShouldReportError()) REPORT("nullptr returned, error: errno(%d) != ENOMEM\n", errno);
                     }
                     // check data integrity
                     if (NonZero(PointerList[i].Pointer, PointerList[i].Size)) {
                         CountErrors++;
-                        if (ShouldReportError()) REPORT("NULL returned, error: data changed\n");
+                        if (ShouldReportError()) REPORT("nullptr returned, error: data changed\n");
                     }
                 }
             }
     if (FullLog) REPORT("realloc end\n");
-    if (CountErrors) REPORT("%s\n", strError);
-    else if (FullLog)
-        REPORT("%s\n", strOk);
+    if (CountErrors) REPORT("%s\n",strError);
+    else if (FullLog) REPORT("%s\n",strOk);
     if (CountErrors) error_occurred = true;
-    for (UINT i = 0; i < PointerList.size(); i++) { Tfree(PointerList[i].Pointer); }
+    for (UINT i=0; i<PointerList.size(); i++)
+    {
+        Tfree(PointerList[i].Pointer);
+    }
 
-    if (perProcessLimits) limitBarrier->wait(no_limit);
+    if (perProcessLimits)
+        limitBarrier->wait(no_limit);
     else
         limitMem(0);
 }
 #endif /* #if !__APPLE__ */
 
-void CMemTest::UniquePointer() {
-    static std::atomic<int> CountErrors {0};
-    int **MasPointer = (int **) Tmalloc(sizeof(int *) * COUNT_ELEM);
-    size_t *MasCountElem = (size_t *) Tmalloc(sizeof(size_t) * COUNT_ELEM);
+void CMemTest::UniquePointer()
+{
+    static std::atomic<int> CountErrors{0};
+    int **MasPointer = (int **)Tmalloc(sizeof(int*)*COUNT_ELEM);
+    size_t *MasCountElem = (size_t*)Tmalloc(sizeof(size_t)*COUNT_ELEM);
     if (FullLog) REPORT("\nUnique pointer using 0\n");
     REQUIRE((MasCountElem && MasPointer));
     //
     //-------------------------------------------------------
     //malloc
-    for (int i = 0; i < COUNT_ELEM; i++) {
-        MasCountElem[i] = rand() % MAX_SIZE;
-        MasPointer[i] = (int *) Tmalloc(MasCountElem[i] * sizeof(int));
-        if (NULL == MasPointer[i]) MasCountElem[i] = 0;
-        memset(MasPointer[i], 0, sizeof(int) * MasCountElem[i]);
+    for (int i=0; i<COUNT_ELEM; i++)
+    {
+        MasCountElem[i]=rand()%MAX_SIZE;
+        MasPointer[i]=(int*)Tmalloc(MasCountElem[i]*sizeof(int));
+        if (nullptr == MasPointer[i])
+            MasCountElem[i]=0;
+        memset(MasPointer[i], 0, sizeof(int)*MasCountElem[i]);
     }
     if (FullLog) REPORT("malloc....");
-    for (UINT i = 0; i < COUNT_ELEM - 1; i++) {
-        if (size_t badOff = NonZero(MasPointer[i], sizeof(int) * MasCountElem[i])) {
+    for (UINT i=0; i<COUNT_ELEM-1; i++)
+    {
+        if (size_t badOff = NonZero(MasPointer[i], sizeof(int)*MasCountElem[i])) {
             CountErrors++;
             if (ShouldReportError())
-                REPORT("error, detect non-zero at %p\n", (char *) MasPointer[i] + badOff - 1);
+                REPORT("error, detect non-zero at %p\n", (char*)MasPointer[i]+badOff-1);
         }
-        memset(MasPointer[i], 1, sizeof(int) * MasCountElem[i]);
+        memset(MasPointer[i], 1, sizeof(int)*MasCountElem[i]);
     }
-    if (CountErrors) REPORT("%s\n", strError);
-    else if (FullLog)
-        REPORT("%s\n", strOk);
+    if (CountErrors) REPORT("%s\n",strError);
+    else if (FullLog) REPORT("%s\n",strOk);
     if (CountErrors) error_occurred = true;
     //----------------------------------------------------------
     //calloc
-    for (int i = 0; i < COUNT_ELEM; i++) Tfree(MasPointer[i]);
-    for (long i = 0; i < COUNT_ELEM; i++) {
-        MasPointer[i] = (int *) Tcalloc(MasCountElem[i] * sizeof(int), 2);
-        if (NULL == MasPointer[i]) MasCountElem[i] = 0;
+    for (int i=0; i<COUNT_ELEM; i++)
+        Tfree(MasPointer[i]);
+    for (long i=0; i<COUNT_ELEM; i++)
+    {
+        MasPointer[i]=(int*)Tcalloc(MasCountElem[i]*sizeof(int),2);
+        if (nullptr == MasPointer[i])
+            MasCountElem[i]=0;
     }
     if (FullLog) REPORT("calloc....");
-    for (int i = 0; i < COUNT_ELEM - 1; i++) {
-        if (size_t badOff = NonZero(MasPointer[i], sizeof(int) * MasCountElem[i])) {
+    for (int i=0; i<COUNT_ELEM-1; i++)
+    {
+        if (size_t badOff = NonZero(MasPointer[i], sizeof(int)*MasCountElem[i])) {
             CountErrors++;
             if (ShouldReportError())
-                REPORT("error, detect non-zero at %p\n", (char *) MasPointer[i] + badOff - 1);
+                REPORT("error, detect non-zero at %p\n", (char*)MasPointer[i]+badOff-1);
         }
-        memset(MasPointer[i], 1, sizeof(int) * MasCountElem[i]);
+        memset(MasPointer[i], 1, sizeof(int)*MasCountElem[i]);
     }
-    if (CountErrors) REPORT("%s\n", strError);
-    else if (FullLog)
-        REPORT("%s\n", strOk);
+    if (CountErrors) REPORT("%s\n",strError);
+    else if (FullLog) REPORT("%s\n",strOk);
     if (CountErrors) error_occurred = true;
     //---------------------------------------------------------
     //realloc
-    for (int i = 0; i < COUNT_ELEM; i++) {
-        MasCountElem[i] *= 2;
-        *(MasPointer + i) = (int *) Trealloc(*(MasPointer + i), MasCountElem[i] * sizeof(int));
-        if (NULL == MasPointer[i]) MasCountElem[i] = 0;
-        memset(MasPointer[i], 0, sizeof(int) * MasCountElem[i]);
+    for (int i=0; i<COUNT_ELEM; i++)
+    {
+        MasCountElem[i]*=2;
+        *(MasPointer+i)=
+            (int*)Trealloc(*(MasPointer+i),MasCountElem[i]*sizeof(int));
+        if (nullptr == MasPointer[i])
+            MasCountElem[i]=0;
+        memset(MasPointer[i], 0, sizeof(int)*MasCountElem[i]);
     }
     if (FullLog) REPORT("realloc....");
-    for (int i = 0; i < COUNT_ELEM - 1; i++) {
-        if (NonZero(MasPointer[i], sizeof(int) * MasCountElem[i])) CountErrors++;
-        memset(MasPointer[i], 1, sizeof(int) * MasCountElem[i]);
+    for (int i=0; i<COUNT_ELEM-1; i++)
+    {
+        if (NonZero(MasPointer[i], sizeof(int)*MasCountElem[i]))
+            CountErrors++;
+        memset(MasPointer[i], 1, sizeof(int)*MasCountElem[i]);
     }
-    if (CountErrors) REPORT("%s\n", strError);
-    else if (FullLog)
-        REPORT("%s\n", strOk);
+    if (CountErrors) REPORT("%s\n",strError);
+    else if (FullLog) REPORT("%s\n",strOk);
     if (CountErrors) error_occurred = true;
-    for (int i = 0; i < COUNT_ELEM; i++) Tfree(MasPointer[i]);
+    for (int i=0; i<COUNT_ELEM; i++)
+        Tfree(MasPointer[i]);
     Tfree(MasCountElem);
     Tfree(MasPointer);
 }
 
-bool CMemTest::ShouldReportError() {
-    if (FullLog) return true;
-    else if (firstTime) {
-        firstTime = false;
+bool CMemTest::ShouldReportError()
+{
+    if (FullLog)
         return true;
-    } else
-        return false;
+    else
+        if (firstTime) {
+            firstTime = false;
+            return true;
+        } else
+            return false;
 }
 
-void CMemTest::Free_NULL() {
-    static std::atomic<int> CountErrors {0};
-    if (FullLog) REPORT("\ncall free with parameter NULL....");
+void CMemTest::Free_NULL()
+{
+    static std::atomic<int> CountErrors{0};
+    if (FullLog) REPORT("\ncall free with parameter nullptr....");
     errno = 0;
-    for (int i = 0; i < COUNTEXPERIMENT; i++) {
-        Tfree(NULL);
-        if (CHECK_ERRNO(errno)) {
+    for (int i=0; i<COUNTEXPERIMENT; i++)
+    {
+        Tfree(nullptr);
+        if (CHECK_ERRNO(errno))
+        {
             CountErrors++;
-            if (ShouldReportError()) REPORT("error is found by a call free with parameter NULL\n");
+            if (ShouldReportError()) REPORT("error is found by a call free with parameter nullptr\n");
         }
     }
-    if (CountErrors) REPORT("%s\n", strError);
-    else if (FullLog)
-        REPORT("%s\n", strOk);
+    if (CountErrors) REPORT("%s\n",strError);
+    else if (FullLog) REPORT("%s\n",strOk);
     if (CountErrors) error_occurred = true;
 }
 
-void CMemTest::TestAlignedParameters() {
+void CMemTest::TestAlignedParameters()
+{
     void *memptr;
     int ret;
 
     if (Rposix_memalign) {
         // alignment isn't power of 2
-        for (int bad_align = 3; bad_align < 16; bad_align++)
-            if (bad_align & (bad_align - 1)) {
-                ret = Tposix_memalign(NULL, bad_align, 100);
-                REQUIRE(EINVAL == ret);
+        for (int bad_align=3; bad_align<16; bad_align++)
+            if (bad_align&(bad_align-1)) {
+                ret = Tposix_memalign(nullptr, bad_align, 100);
+                REQUIRE(EINVAL==ret);
             }
 
         memptr = &ret;
-        ret = Tposix_memalign(&memptr, 5 * sizeof(void *), 100);
-        REQUIRE_MESSAGE(memptr == &ret, "memptr should not be changed after unsuccessful call");
-        REQUIRE(EINVAL == ret);
+        ret = Tposix_memalign(&memptr, 5*sizeof(void*), 100);
+        REQUIRE_MESSAGE(memptr == &ret,
+               "memptr should not be changed after unsuccessful call");
+        REQUIRE(EINVAL==ret);
 
         // alignment is power of 2, but not a multiple of sizeof(void *),
         // we expect that sizeof(void*) > 2
-        ret = Tposix_memalign(NULL, 2, 100);
-        REQUIRE(EINVAL == ret);
+        ret = Tposix_memalign(nullptr, 2, 100);
+        REQUIRE(EINVAL==ret);
     }
     if (Raligned_malloc) {
         // alignment isn't power of 2
-        for (int bad_align = 3; bad_align < 16; bad_align++)
-            if (bad_align & (bad_align - 1)) {
+        for (int bad_align=3; bad_align<16; bad_align++)
+            if (bad_align&(bad_align-1)) {
                 memptr = Taligned_malloc(100, bad_align);
                 REQUIRE(memptr == nullptr);
-                ASSERT_ERRNO(EINVAL == errno, NULL);
+                ASSERT_ERRNO(EINVAL==errno, nullptr);
             }
 
         // size is zero
         memptr = Taligned_malloc(0, 16);
-        REQUIRE_MESSAGE(memptr == nullptr, "size is zero, so must return NULL");
-        ASSERT_ERRNO(EINVAL == errno, NULL);
+        REQUIRE_MESSAGE(memptr == nullptr, "size is zero, so must return nullptr");
+        ASSERT_ERRNO(EINVAL==errno, nullptr);
     }
     if (Taligned_free) {
-        // NULL pointer is OK to free
+        // nullptr pointer is OK to free
         errno = 0;
-        Taligned_free(NULL);
+        Taligned_free(nullptr);
         /* As there is no return value for free, strictly speaking we can't
            check errno here. But checked implementations obey the assertion.
         */
-        ASSERT_ERRNO(0 == errno, NULL);
+        ASSERT_ERRNO(0==errno, nullptr);
     }
     if (Raligned_realloc) {
-        for (int i = 1; i < 20; i++) {
+        for (int i=1; i<20; i++) {
             // checks that calls work correctly in presence of non-zero errno
             errno = i;
-            void *ptr = Taligned_malloc(i * 10, 128);
+            void *ptr = Taligned_malloc(i*10, 128);
             REQUIRE(ptr != nullptr);
-            ASSERT_ERRNO(0 != errno, NULL);
-            // if size is zero and pointer is not NULL, works like free
+            ASSERT_ERRNO(0!=errno, nullptr);
+            // if size is zero and pointer is not nullptr, works like free
             memptr = Taligned_realloc(ptr, 0, 64);
             REQUIRE(memptr == nullptr);
-            ASSERT_ERRNO(0 != errno, NULL);
+            ASSERT_ERRNO(0!=errno, nullptr);
         }
         // alignment isn't power of 2
-        for (int bad_align = 3; bad_align < 16; bad_align++)
-            if (bad_align & (bad_align - 1)) {
+        for (int bad_align=3; bad_align<16; bad_align++)
+            if (bad_align&(bad_align-1)) {
                 void *ptr = &bad_align;
                 memptr = Taligned_realloc(&ptr, 100, bad_align);
                 REQUIRE(memptr == nullptr);
-                REQUIRE(&bad_align == ptr);
-                ASSERT_ERRNO(EINVAL == errno, NULL);
+                REQUIRE(&bad_align==ptr);
+                ASSERT_ERRNO(EINVAL==errno, nullptr);
             }
     }
 }
 
-void CMemTest::RunAllTests(int total_threads) {
+void CMemTest::RunAllTests(int total_threads)
+{
     Zerofilling();
     Free_NULL();
-    InvariantDataRealloc(/*aligned=*/false, 8 * MByte, /*checkData=*/true);
-    if (Raligned_realloc) InvariantDataRealloc(/*aligned=*/true, 8 * MByte, /*checkData=*/true);
+    InvariantDataRealloc(/*aligned=*/false, 8*MByte, /*checkData=*/true);
+    if (Raligned_realloc)
+        InvariantDataRealloc(/*aligned=*/true, 8*MByte, /*checkData=*/true);
     TestAlignedParameters();
     UniquePointer();
     AddrArifm();
@@ -917,7 +1011,7 @@ void CMemTest::RunAllTests(int total_threads) {
     REPORT("Known issue: some tests are skipped on macOS\n");
 #else
     // TODO: enable
-    NULLReturn(1 * MByte, 100 * MByte, total_threads);
+    NULLReturn(1*MByte,100*MByte,total_threads);
 #endif
     if (FullLog) REPORT("Tests for %d threads ended\n", total_threads);
 }
@@ -926,14 +1020,14 @@ void CMemTest::RunAllTests(int total_threads) {
 #if !__TBB_WIN8UI_SUPPORT
 
 TEST_CASE("MAIN TEST") {
-    Rmalloc = scalable_malloc;
-    Rrealloc = scalable_realloc;
-    Rcalloc = scalable_calloc;
-    Tfree = scalable_free;
-    Rposix_memalign = scalable_posix_memalign;
-    Raligned_malloc = scalable_aligned_malloc;
-    Raligned_realloc = scalable_aligned_realloc;
-    Taligned_free = scalable_aligned_free;
+    Rmalloc=scalable_malloc;
+    Rrealloc=scalable_realloc;
+    Rcalloc=scalable_calloc;
+    Tfree=scalable_free;
+    Rposix_memalign=scalable_posix_memalign;
+    Raligned_malloc=scalable_aligned_malloc;
+    Raligned_realloc=scalable_aligned_realloc;
+    Taligned_free=scalable_aligned_free;
 
     // Check if we were called to test standard behavior
     // TODO: enable this mode
@@ -943,12 +1037,13 @@ TEST_CASE("MAIN TEST") {
        "NPTL threads do not share resource limits (fixed in kernel 2.6.10)".
        Use per-threads limits for affected systems.
      */
-    if (utils::LinuxKernelVersion() < 2 * 1000000 + 6 * 1000 + 10) perProcessLimits = false;
+    if ( utils::LinuxKernelVersion() < 2*1000000 + 6*1000 + 10)
+        perProcessLimits = false;
 #endif
-        //-------------------------------------
+    //-------------------------------------
 #if __APPLE__ || __TBB_USE_SANITIZERS
-        /* Skip due to lack of memory limit enforcing under macOS. */
-        //Skip this test under ASAN , as OOM condition breaks the ASAN as well
+    /* Skip due to lack of memory limit enforcing under macOS. */
+    //Skip this test under ASAN , as OOM condition breaks the ASAN as well
 #else
     limitMem(200);
     ReallocParam();
@@ -958,44 +1053,46 @@ TEST_CASE("MAIN TEST") {
 //for linux and dynamic runtime errno is used to check allocator functions
 //check if library compiled with /MD(d) and we can use errno
 #if _MSC_VER
-#if defined(_MT) && defined(_DLL)//check errno if test itself compiled with /MD(d) only
-    char *version_info_block = NULL;
+#if defined(_MT) && defined(_DLL) //check errno if test itself compiled with /MD(d) only
+    char*  version_info_block = nullptr;
     int version_info_block_size;
-    LPVOID comments_block = NULL;
+    LPVOID comments_block = nullptr;
     UINT comments_block_size;
 #ifdef _DEBUG
 #define __TBBMALLOCDLL "tbbmalloc_debug.dll"
-#else//_DEBUG
+#else  //_DEBUG
 #define __TBBMALLOCDLL "tbbmalloc.dll"
-#endif//_DEBUG
-    version_info_block_size = GetFileVersionInfoSize(__TBBMALLOCDLL, (LPDWORD) &version_info_block_size);
-    if (version_info_block_size && ((version_info_block = (char *) malloc(version_info_block_size)) != NULL)
-        && GetFileVersionInfo(__TBBMALLOCDLL, NULL, version_info_block_size, version_info_block)
-        && VerQueryValue(version_info_block, "\\StringFileInfo\\000004b0\\Comments", &comments_block,
-                         &comments_block_size)
-        && strstr((char *) comments_block, "/MD")) {
-        __tbb_test_errno = true;
-    }
-    if (version_info_block) free(version_info_block);
-#endif// defined(_MT) && defined(_DLL)
-#else // _MSC_VER
+#endif //_DEBUG
+    version_info_block_size = GetFileVersionInfoSize( __TBBMALLOCDLL, (LPDWORD)&version_info_block_size );
+    if( version_info_block_size
+        && ((version_info_block = (char*)malloc(version_info_block_size)) != nullptr)
+        && GetFileVersionInfo(  __TBBMALLOCDLL, NULL, version_info_block_size, version_info_block )
+        && VerQueryValue( version_info_block, "\\StringFileInfo\\000004b0\\Comments", &comments_block, &comments_block_size )
+        && strstr( (char*)comments_block, "/MD" )
+        ){
+            __tbb_test_errno = true;
+     }
+     if( version_info_block ) free( version_info_block );
+#endif // defined(_MT) && defined(_DLL)
+#else  // _MSC_VER
     __tbb_test_errno = true;
-#endif// _MSC_VER
+#endif // _MSC_VER
 
     CheckArgumentsOverflow();
     CheckReallocLeak();
-    for (int p = MaxThread; p >= MinThread; --p) {
-        for (int limit = 0; limit < 2; limit++) {
-            int ret = scalable_allocation_mode(TBBMALLOC_SET_SOFT_HEAP_LIMIT, 16 * 1024 * limit);
-            REQUIRE(ret == TBBMALLOC_OK);
+    for( int p=MaxThread; p>=MinThread; --p ) {
+        for (int limit=0; limit<2; limit++) {
+            int ret = scalable_allocation_mode(TBBMALLOC_SET_SOFT_HEAP_LIMIT, 16*1024*limit);
+            REQUIRE(ret==TBBMALLOC_OK);
             utils::SpinBarrier *barrier = new utils::SpinBarrier(p);
-            utils::NativeParallelFor(p, RoundRobin(p, barrier, Verbose));
+            utils::NativeParallelFor( p, RoundRobin(p, barrier, Verbose) );
             delete barrier;
         }
     }
     int ret = scalable_allocation_mode(TBBMALLOC_SET_SOFT_HEAP_LIMIT, 0);
-    REQUIRE(ret == TBBMALLOC_OK);
+    REQUIRE(ret==TBBMALLOC_OK);
     REQUIRE(!error_occurred);
 }
 
 #endif /* __TBB_WIN8UI_SUPPORT	 */
+#endif /* Enable test */
diff --git a/external/tbb/test/tbbmalloc/test_malloc_init_shutdown.cpp b/external/tbb/test/tbbmalloc/test_malloc_init_shutdown.cpp
index 619bcf05..d205cb7a 100644
--- a/external/tbb/test/tbbmalloc/test_malloc_init_shutdown.cpp
+++ b/external/tbb/test/tbbmalloc/test_malloc_init_shutdown.cpp
@@ -16,9 +16,9 @@
 
 #define __TBB_NO_IMPLICIT_LINKAGE 1
 
-#include "common/spin_barrier.h"
 #include "common/test.h"
 #include "common/utils.h"
+#include "common/spin_barrier.h"
 #include "oneapi/tbb/detail/_utils.h"
 #include "tbb/scalable_allocator.h"
 #include <thread>
@@ -34,25 +34,26 @@ static constexpr std::size_t MaxThread = 4;
 // Windows dynamic loader lock and allocator initialization/termination lock
 // were taken in different order.
 
+
+
 class TestFunc1 {
     utils::SpinBarrier* my_barr;
-
 public:
-    TestFunc1(utils::SpinBarrier& barr) : my_barr(&barr) {}
-    void operator()(bool do_malloc) const {
+    TestFunc1 (utils::SpinBarrier& barr) : my_barr(&barr) {}
+    void operator() (bool do_malloc) const {
         my_barr->wait();
         if (do_malloc) scalable_malloc(10);
         ++FinishedTasks;
     }
 };
 
-void Test1() {
+void Test1 () {
     std::size_t NTasks = utils::min(MaxTasks, utils::max(std::size_t(2), MaxThread));
     utils::SpinBarrier barr(NTasks);
     TestFunc1 tf(barr);
     FinishedTasks = 0;
 
-    utils::NativeParallelFor(NTasks, [&](std::size_t thread_idx) {
+    utils::NativeParallelFor(NTasks, [&] (std::size_t thread_idx) {
         tf(thread_idx % 2 == 0);
         while (FinishedTasks != NTasks) utils::yield();
     });
@@ -66,10 +67,9 @@ std::atomic<void*> gPtr(nullptr);
 
 class TestFunc2a {
     utils::SpinBarrier* my_barr;
-
 public:
-    TestFunc2a(utils::SpinBarrier& barr) : my_barr(&barr) {}
-    void operator()(std::size_t) const {
+    TestFunc2a (utils::SpinBarrier& barr) : my_barr(&barr) {}
+    void operator() (std::size_t) const {
         gPtr = scalable_malloc(8);
         my_barr->wait();
         ++FinishedTasks;
@@ -79,11 +79,10 @@ class TestFunc2a {
 class TestFunc2b {
     utils::SpinBarrier* my_barr;
     std::thread& my_ward;
-
 public:
-    TestFunc2b(utils::SpinBarrier& barr, std::thread& t) : my_barr(&barr), my_ward(t) {}
-    void operator()(std::size_t) const {
-        utils::SpinWaitWhileEq(gPtr, (void*) nullptr);
+    TestFunc2b (utils::SpinBarrier& barr, std::thread& t) : my_barr(&barr), my_ward(t) {}
+    void operator() (std::size_t) const {
+        utils::SpinWaitWhileEq(gPtr, (void*)nullptr);
         scalable_free(gPtr);
         my_barr->wait();
         my_ward.join();
@@ -101,12 +100,12 @@ void Test2() {
 
     while (FinishedTasks != 2) utils::yield();
 
-    t2b.join();// t2a is monitored by t2b
+    t2b.join(); // t2a is monitored by t2b
 
     if (t2a.joinable()) t2a.join();
 }
 
-#if _WIN32 || _WIN64
+#if _WIN32||_WIN64
 
 void TestKeyDtor() {}
 
@@ -126,24 +125,24 @@ extern "C" void threadDtor(void*) {
     scalable_free(scalable_malloc(8));
 }
 
-inline bool intersectingObjects(const void* p1, const void* p2, size_t n) {
-    return p1 > p2 ? ((uintptr_t) p1 - (uintptr_t) p2) < n : ((uintptr_t) p2 - (uintptr_t) p1) < n;
+inline bool intersectingObjects(const void *p1, const void *p2, size_t n)
+{
+    return p1>p2 ? ((uintptr_t)p1-(uintptr_t)p2)<n : ((uintptr_t)p2-(uintptr_t)p1)<n;
 }
 
-struct TestThread : utils::NoAssign {
-    TestThread(int) {}
+struct TestThread: utils::NoAssign {
+    TestThread(int ) {}
 
-    void operator()(std::size_t /*id*/) const {
+    void operator()( std::size_t /*id*/ ) const {
         pthread_key_t key;
 
         currSmall = scalable_malloc(8);
-        REQUIRE_MESSAGE((!prevSmall || currSmall == prevSmall), "Possible memory leak");
-        currLarge = scalable_malloc(32 * 1024);
+        REQUIRE_MESSAGE((!prevSmall || currSmall==prevSmall), "Possible memory leak");
+        currLarge = scalable_malloc(32*1024);
         // intersectingObjects takes into account object shuffle
-        REQUIRE_MESSAGE((!prevLarge || intersectingObjects(currLarge, prevLarge, 32 * 1024)),
-                        "Possible memory leak");
-        pthread_key_create(&key, &threadDtor);
-        pthread_setspecific(key, (const void*) this);
+        REQUIRE_MESSAGE((!prevLarge || intersectingObjects(currLarge, prevLarge, 32*1024)), "Possible memory leak");
+        pthread_key_create( &key, &threadDtor );
+        pthread_setspecific(key, (const void*)this);
     }
 };
 
@@ -151,20 +150,26 @@ struct TestThread : utils::NoAssign {
 void TestKeyDtor() {
     // Allocate region for large objects to prevent whole region release
     // on scalable_free(currLarge) call, which result in wrong assert inside intersectingObjects check
-    void* preventLargeRelease = scalable_malloc(32 * 1024);
-    for (int i = 0; i < 4; i++) utils::NativeParallelFor(1, TestThread(1));
+    void* preventLargeRelease = scalable_malloc(32*1024);
+    for (int i=0; i<4; i++)
+        utils::NativeParallelFor( 1, TestThread(1) );
     scalable_free(preventLargeRelease);
 }
 
-#endif// _WIN32||_WIN64
+#endif // _WIN32||_WIN64
+
 
 //! \brief \ref error_guessing
 TEST_CASE("test1") {
-    Test1();// requires malloc initialization so should be first
+    Test1(); // requires malloc initialization so should be first
 }
 
 //! \brief \ref error_guessing
-TEST_CASE("test2") { Test2(); }
+TEST_CASE("test2") {
+    Test2();
+}
 
 //! \brief \ref error_guessing
-TEST_CASE("test key dtor") { TestKeyDtor(); }
+TEST_CASE("test key dtor") {
+    TestKeyDtor();
+}
diff --git a/external/tbb/test/tbbmalloc/test_malloc_lib_unload.cpp b/external/tbb/test/tbbmalloc/test_malloc_lib_unload.cpp
index 277927ad..441a221d 100644
--- a/external/tbb/test/tbbmalloc/test_malloc_lib_unload.cpp
+++ b/external/tbb/test/tbbmalloc/test_malloc_lib_unload.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -14,121 +14,145 @@
     limitations under the License.
 */
 
+
 #define __TBB_NO_IMPLICIT_LINKAGE 1
 
 #if _USRDLL
 #include "common/utils_assert.h"
-#include <stdlib.h>// for NULL
 
 const char *globalCallMsg = "A TBB allocator function call is resolved into wrong implementation.";
 
-#if _WIN32 || _WIN64
+#if _WIN32||_WIN64
+    #define TEST_EXPORT __declspec(dllexport)
+#else
+    #define TEST_EXPORT __TBB_EXPORT
+#endif
+
 // must be defined in DLL for linker to not drop the dependency on the DLL.
 extern "C" {
-extern __declspec(dllexport) void *scalable_malloc(size_t);
-extern __declspec(dllexport) void scalable_free(void *);
-extern __declspec(dllexport) void safer_scalable_free(void *, void (*)(void *));
-extern __declspec(dllexport) void *scalable_realloc(void *, size_t);
-extern __declspec(dllexport) void *safer_scalable_realloc(void *, size_t, void *);
-extern __declspec(dllexport) void *scalable_calloc(size_t, size_t);
-extern __declspec(dllexport) int scalable_posix_memalign(void **, size_t, size_t);
-extern __declspec(dllexport) void *scalable_aligned_malloc(size_t, size_t);
-extern __declspec(dllexport) void *scalable_aligned_realloc(void *, size_t, size_t);
-extern __declspec(dllexport) void *safer_scalable_aligned_realloc(void *, size_t, size_t, void *);
-extern __declspec(dllexport) void scalable_aligned_free(void *);
-extern __declspec(dllexport) size_t scalable_msize(void *);
-extern __declspec(dllexport) size_t safer_scalable_msize(void *, size_t (*)(void *));
-extern __declspec(dllexport) int anchor();
+    extern TEST_EXPORT void *scalable_malloc(size_t);
+    extern TEST_EXPORT void scalable_free (void *);
+    extern TEST_EXPORT void safer_scalable_free (void *, void (*)(void*));
+    extern TEST_EXPORT void *scalable_realloc(void *, size_t);
+    extern TEST_EXPORT void *safer_scalable_realloc(void *, size_t, void *);
+    extern TEST_EXPORT void *scalable_calloc(size_t, size_t);
+    extern TEST_EXPORT int scalable_posix_memalign(void **, size_t, size_t);
+    extern TEST_EXPORT void *scalable_aligned_malloc(size_t, size_t);
+    extern TEST_EXPORT void *scalable_aligned_realloc(void *, size_t, size_t);
+    extern TEST_EXPORT void *safer_scalable_aligned_realloc(void *, size_t, size_t, void *);
+    extern TEST_EXPORT void scalable_aligned_free(void *);
+    extern TEST_EXPORT size_t scalable_msize(void *);
+    extern TEST_EXPORT size_t safer_scalable_msize (void *, size_t (*)(void*));
+    extern TEST_EXPORT int anchor();
 }
-#endif
 
-extern "C" int anchor() { return 42; }
+extern "C" int anchor() {
+    return 42;
+}
 
 // Those functions must not be called instead of presented in dynamic library.
-extern "C" void *scalable_malloc(size_t) {
+extern "C" void *scalable_malloc(size_t)
+{
     ASSERT(0, globalCallMsg);
-    return NULL;
+    return nullptr;
 }
-extern "C" void scalable_free(void *) { ASSERT(0, globalCallMsg); }
-extern "C" void safer_scalable_free(void *, void (*)(void *)) { ASSERT(0, globalCallMsg); }
-extern "C" void *scalable_realloc(void *, size_t) {
+extern "C" void scalable_free (void *)
+{
     ASSERT(0, globalCallMsg);
-    return NULL;
 }
-extern "C" void *safer_scalable_realloc(void *, size_t, void *) {
+extern "C" void safer_scalable_free (void *, void (*)(void*))
+{
     ASSERT(0, globalCallMsg);
-    return NULL;
 }
-extern "C" void *scalable_calloc(size_t, size_t) {
+extern "C" void *scalable_realloc(void *, size_t)
+{
     ASSERT(0, globalCallMsg);
-    return NULL;
+    return nullptr;
 }
-extern "C" int scalable_posix_memalign(void **, size_t, size_t) {
+extern "C" void *safer_scalable_realloc(void *, size_t, void *)
+{
+    ASSERT(0, globalCallMsg);
+    return nullptr;
+}
+extern "C" void *scalable_calloc(size_t, size_t)
+{
+    ASSERT(0, globalCallMsg);
+    return nullptr;
+}
+extern "C" int scalable_posix_memalign(void **, size_t, size_t)
+{
     ASSERT(0, globalCallMsg);
     return 0;
 }
-extern "C" void *scalable_aligned_malloc(size_t, size_t) {
+extern "C" void *scalable_aligned_malloc(size_t, size_t)
+{
+    ASSERT(0, globalCallMsg);
+    return nullptr;
+}
+extern "C" void *scalable_aligned_realloc(void *, size_t, size_t)
+{
     ASSERT(0, globalCallMsg);
-    return NULL;
+    return nullptr;
 }
-extern "C" void *scalable_aligned_realloc(void *, size_t, size_t) {
+extern "C" void *safer_scalable_aligned_realloc(void *, size_t, size_t, void *)
+{
     ASSERT(0, globalCallMsg);
-    return NULL;
+    return nullptr;
 }
-extern "C" void *safer_scalable_aligned_realloc(void *, size_t, size_t, void *) {
+extern "C" void scalable_aligned_free(void *)
+{
     ASSERT(0, globalCallMsg);
-    return NULL;
 }
-extern "C" void scalable_aligned_free(void *) { ASSERT(0, globalCallMsg); }
-extern "C" size_t scalable_msize(void *) {
+extern "C" size_t scalable_msize(void *)
+{
     ASSERT(0, globalCallMsg);
     return 0;
 }
-extern "C" size_t safer_scalable_msize(void *, size_t (*)(void *)) {
+extern "C" size_t safer_scalable_msize (void *, size_t (*)(void*))
+{
     ASSERT(0, globalCallMsg);
     return 0;
 }
 
 int main() {}
 
-#else// _USRDLL
+#else  // _USRDLL
 
 #include "common/config.h"
 // harness_defs.h must be included before tbb_stddef.h to overcome exception-dependent
 // system headers that come from tbb_stddef.h
-#if __TBB_WIN8UI_SUPPORT || __TBB_MIC_OFFLOAD || (__GNUC__ && __GNUC__ < 10 && __TBB_USE_SANITIZERS)         \
-        || __TBB_SOURCE_DIRECTLY_INCLUDED
+#if __TBB_WIN8UI_SUPPORT || __TBB_MIC_OFFLOAD || (__GNUC__ && __GNUC__ < 10 && __TBB_USE_SANITIZERS) || __TBB_SOURCE_DIRECTLY_INCLUDED
 // The test does not work if dynamic load is unavailable.
 // For MIC offload, it fails because liboffload brings libiomp which observes and uses the fake scalable_* calls.
 // For sanitizers, it fails because RUNPATH is lost: https://github.com/google/sanitizers/issues/1219
 #else
-#include "common/memory_usage.h"
 #include "common/test.h"
-#include "common/utils_assert.h"
+#include "common/memory_usage.h"
 #include "common/utils_dynamic_libs.h"
+#include "common/utils_assert.h"
 #include "common/utils_report.h"
-#include <cstring>// memset
+#include <cstring> // memset
 
 extern "C" {
-#if _WIN32 || _WIN64
-extern __declspec(dllimport)
+#if _WIN32||_WIN64
+    extern __declspec(dllimport)
 #endif
-        void* scalable_malloc(size_t);
+    void *scalable_malloc(size_t);
 
-#if _WIN32 || _WIN64
-extern __declspec(dllimport)
+#if _WIN32||_WIN64
+    extern __declspec(dllimport)
 #endif
-        int anchor();
+    int anchor();
 }
 
 struct Run {
-    void operator()(std::size_t /*id*/) const {
+    void operator()( std::size_t /*id*/ ) const {
 
         void* (*malloc_ptr)(std::size_t);
         void (*free_ptr)(void*);
 
         void* (*aligned_malloc_ptr)(size_t size, size_t alignment);
-        void (*aligned_free_ptr)(void*);
+        void  (*aligned_free_ptr)(void*);
 
         const char* actual_name;
         utils::LIBRARY_HANDLE lib = utils::OpenLibrary(actual_name = MALLOCLIB_NAME1);
@@ -142,21 +166,23 @@ struct Run {
         utils::GetAddress(lib, "scalable_aligned_malloc", aligned_malloc_ptr);
         utils::GetAddress(lib, "scalable_aligned_free", aligned_free_ptr);
 
-        for (size_t sz = 1024; sz <= 10 * 1024; sz *= 10) {
-            void* p1 = aligned_malloc_ptr(sz, 16);
+        for (size_t sz = 1024; sz <= 10*1024 ; sz*=10) {
+            void *p1 = aligned_malloc_ptr(sz, 16);
             std::memset(p1, 0, sz);
             aligned_free_ptr(p1);
         }
 
-        void* p = malloc_ptr(100);
+        void *p = malloc_ptr(100);
         std::memset(p, 1, 100);
         free_ptr(p);
 
         utils::CloseLibrary(lib);
 #if _WIN32 || _WIN64
-        ASSERT(GetModuleHandle(actual_name), "allocator library must not be unloaded");
+        ASSERT(GetModuleHandle(actual_name),
+               "allocator library must not be unloaded");
 #else
-        ASSERT(dlsym(RTLD_DEFAULT, "scalable_malloc"), "allocator library must not be unloaded");
+        ASSERT(dlsym(RTLD_DEFAULT, "scalable_malloc"),
+               "allocator library must not be unloaded");
 #endif
     }
 };
@@ -166,7 +192,7 @@ TEST_CASE("test unload lib") {
     CHECK(anchor() == 42);
 
     // warm-up run
-    utils::NativeParallelFor(1, Run());
+    utils::NativeParallelFor( 1, Run() );
 
     // It seems Thread Sanitizer remembers some history information about destroyed threads,
     // so memory consumption cannot be stabilized
@@ -179,20 +205,22 @@ TEST_CASE("test unload lib") {
         std::size_t memory_in_use = utils::GetMemoryUsage();
         std::size_t memory_check = utils::GetMemoryUsage();
         REQUIRE_MESSAGE(memory_in_use == memory_check,
-                        "Memory consumption should not increase after 1st GetMemoryUsage() call");
+            "Memory consumption should not increase after 1st GetMemoryUsage() call");
     }
 
     {
         // expect that memory consumption stabilized after several runs
         for (;;) {
             std::size_t memory_in_use = utils::GetMemoryUsage();
-            for (int j = 0; j < 10; j++) utils::NativeParallelFor(1, Run());
+            for (int j=0; j<10; j++)
+                utils::NativeParallelFor( 1, Run() );
             memory_leak = utils::GetMemoryUsage() - memory_in_use;
-            if (memory_leak == 0) return;
+            if (memory_leak == 0)
+                return;
         }
     }
 }
 
 #endif /* Unsupported configurations */
 
-#endif// _USRDLL
+#endif // _USRDLL
diff --git a/external/tbb/test/tbbmalloc/test_malloc_new_handler.cpp b/external/tbb/test/tbbmalloc/test_malloc_new_handler.cpp
index 3ff88724..d3c0db16 100644
--- a/external/tbb/test/tbbmalloc/test_malloc_new_handler.cpp
+++ b/external/tbb/test/tbbmalloc/test_malloc_new_handler.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -28,10 +28,10 @@
 #if !HARNESS_SKIP_TEST && TBB_USE_EXCEPTIONS && !__TBB_USE_ADDRESS_SANITIZER
 
 #if _MSC_VER
-#pragma warning(push)
+#pragma warning (push)
 // Forcing value to bool 'true' or 'false' (occurred inside tls.h)
-#pragma warning(disable : 4800)
-#endif//#if _MSC_VER
+#pragma warning (disable: 4800)
+#endif //#if _MSC_VER
 
 thread_local bool new_handler_called = false;
 void customNewHandler() {
@@ -46,7 +46,9 @@ bool allocateWithException(size_t big_mem) {
         // Allocate big array (should throw exception)
         char* volatile big_array = new char[big_mem];
         // If succeeded, double the size (unless it overflows) and recursively retry
-        if (big_mem * 2 > big_mem) { exception_caught = allocateWithException(big_mem * 2); }
+        if (big_mem * 2 > big_mem) {
+            exception_caught = allocateWithException(big_mem * 2);
+        }
         delete[] big_array;
     } catch (const std::bad_alloc&) {
         bool is_called = new_handler_called;
@@ -76,11 +78,11 @@ TEST_CASE("New handler callback") {
     // Run the test
     utils::NativeParallelFor(8, AllocLoopBody());
     // Undo custom handler
-    std::set_new_handler(0);
+    std::set_new_handler(nullptr);
 }
 
 #if _MSC_VER
-#pragma warning(pop)
+#pragma warning (pop)
 #endif
 
-#endif// !HARNESS_SKIP_TEST && TBB_USE_EXCEPTIONS
+#endif // !HARNESS_SKIP_TEST && TBB_USE_EXCEPTIONS
diff --git a/external/tbb/test/tbbmalloc/test_malloc_overload.cpp b/external/tbb/test/tbbmalloc/test_malloc_overload.cpp
index d4b85786..7f8c3489 100644
--- a/external/tbb/test/tbbmalloc/test_malloc_overload.cpp
+++ b/external/tbb/test/tbbmalloc/test_malloc_overload.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2023 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -27,14 +27,14 @@
 /* ICC 10.1 and 11.0 generates code that uses std::_Raise_handler,
    but it's only defined in libcpmt(d), which the test doesn't linked with.
  */
-#undef _HAS_EXCEPTIONS
+#undef  _HAS_EXCEPTIONS
 #define _HAS_EXCEPTIONS _CPPUNWIND
 #endif
 // to use strdup w/o warnings
 #define _CRT_NONSTDC_NO_DEPRECATE 1
-#endif// _WIN32 || _WIN64
+#endif // _WIN32 || _WIN64
 
-#define _ISOC11_SOURCE 1// to get C11 declarations for GLIBC
+#define _ISOC11_SOURCE 1 // to get C11 declarations for GLIBC
 
 #include "common/allocator_overload.h"
 
@@ -48,38 +48,38 @@
 #if !HARNESS_SKIP_TEST && !__TBB_USE_ADDRESS_SANITIZER
 
 #if __ANDROID__
-#include <android/api-level.h>// for __ANDROID_API__
+  #include <android/api-level.h> // for __ANDROID_API__
 #endif
 
 #define __TBB_POSIX_MEMALIGN_PRESENT (__unix__ && !__ANDROID__) || __APPLE__
 #define __TBB_PVALLOC_PRESENT __unix__ && !__ANDROID__
 #if __GLIBC__
-// aligned_alloc available since GLIBC 2.16
-#define __TBB_ALIGNED_ALLOC_PRESENT __GLIBC_PREREQ(2, 16)
-#endif// __GLIBC__                                                                                         \
-        // later Android doesn't have valloc or dlmalloc_usable_size
-#define __TBB_VALLOC_PRESENT (__unix__ && __ANDROID_API__ < 21) || __APPLE__
-#define __TBB_DLMALLOC_USABLE_SIZE_PRESENT __ANDROID__ &&__ANDROID_API__ < 21
+  // aligned_alloc available since GLIBC 2.16
+  #define __TBB_ALIGNED_ALLOC_PRESENT __GLIBC_PREREQ(2, 16)
+#endif // __GLIBC__
+ // later Android doesn't have valloc or dlmalloc_usable_size
+#define __TBB_VALLOC_PRESENT (__unix__ && __ANDROID_API__<21) || __APPLE__
+#define __TBB_DLMALLOC_USABLE_SIZE_PRESENT  __ANDROID__ && __ANDROID_API__<21
 
 #include "common/utils.h"
+#include "common/utils_report.h"
 #include "common/utils_assert.h"
 #include "common/utils_env.h"
-#include "common/utils_report.h"
 
 #include <stdlib.h>
 #include <string.h>
 #if !__APPLE__
 #include <malloc.h>
 #endif
-#include <new>
 #include <stdio.h>
+#include <new>
 #if MALLOC_UNIXLIKE_OVERLOAD_ENABLED || MALLOC_ZONE_OVERLOAD_ENABLED
+#include <unistd.h> // for sysconf
 #include <dlfcn.h>
-#include <unistd.h>// for sysconf
 #endif
 
 #if __unix__
-#include <stdint.h>// for uintptr_t
+#include <stdint.h> // for uintptr_t
 
 extern "C" {
 void *__libc_malloc(size_t size);
@@ -123,24 +123,24 @@ typedef unsigned __int64 uint64_t;
 */
 using namespace std;
 #endif
+#include <string>
 #include <set>
 #include <sstream>
-#include <string>
 #endif
 
 #include "oneapi/tbb/detail/_utils.h"  // tbb::detail::is_aligned
-#include "src/tbbmalloc/shared_utils.h"// alignDown, alignUp, estimatedCacheLineSize
+#include "src/tbbmalloc/shared_utils.h"  // alignDown, alignUp, estimatedCacheLineSize
 
 /* start of code replicated from src/tbbmalloc */
 
-class BackRefIdx {// composite index to backreference array
+class BackRefIdx { // composite index to backreference array
 private:
-    uint16_t main;        // index in BackRefMain
-    uint16_t largeObj : 1;// is this object "large"?
-    uint16_t offset : 15; // offset from beginning of BackRefBlock
+    uint16_t main;      // index in BackRefMain
+    uint16_t largeObj:1;  // is this object "large"?
+    uint16_t offset  :15; // offset from beginning of BackRefBlock
 public:
-    BackRefIdx() : main((uint16_t) -1) {}
-    bool isInvalid() { return main == (uint16_t) -1; }
+    BackRefIdx() : main((uint16_t)-1) {}
+    bool isInvalid() { return main == (uint16_t)-1; }
     bool isLargeObject() const { return largeObj; }
     uint16_t getMain() const { return main; }
     uint16_t getOffset() const { return offset; }
@@ -153,20 +153,20 @@ class MemoryPool;
 class ExtMemoryPool;
 
 struct BlockI {
-    intptr_t blockState[2];
+    intptr_t     blockState[2];
 };
 
 struct LargeMemoryBlock : public BlockI {
-    MemoryPool *pool;      // owner pool
-    LargeMemoryBlock *next,// ptrs in list of cached blocks
-            *prev,
-            *gPrev,// in pool's global list
-            *gNext;
-    uintptr_t age;       // age of block while in cache
-    size_t objectSize;   // the size requested by a client
-    size_t unalignedSize;// the size requested from getMemory
-    bool fromMapMemory;
-    BackRefIdx backRefIdx;// cached here, used copy is in LargeObjectHdr
+    MemoryPool       *pool;          // owner pool
+    LargeMemoryBlock *next,          // ptrs in list of cached blocks
+                     *prev,
+                     *gPrev,         // in pool's global list
+                     *gNext;
+    uintptr_t         age;           // age of block while in cache
+    size_t            objectSize;    // the size requested by a client
+    size_t            unalignedSize; // the size requested from getMemory
+    bool              fromMapMemory;
+    BackRefIdx        backRefIdx;    // cached here, used copy is in LargeObjectHdr
     void registerInPool(ExtMemoryPool *extMemPool);
     void unregisterFromPool(ExtMemoryPool *extMemPool);
 };
@@ -176,23 +176,23 @@ struct LargeObjectHdr {
     /* Have to duplicate it here from CachedObjectHdr,
        as backreference must be checked without further pointer dereference.
        Points to LargeObjectHdr. */
-    BackRefIdx backRefIdx;
+    BackRefIdx       backRefIdx;
 };
 
 /*
  * Objects of size minLargeObjectSize and larger are considered large objects.
  */
-const uintptr_t blockSize = 16 * 1024;
+const uintptr_t blockSize = 16*1024;
 const uint32_t fittingAlignment = rml::internal::estimatedCacheLineSize;
-#define SET_FITTING_SIZE(N)                                                                                  \
-    ((blockSize - 2 * rml::internal::estimatedCacheLineSize) / N) & ~(fittingAlignment - 1)
-const uint32_t fittingSize5 = SET_FITTING_SIZE(2);// 8128/8064
+#define SET_FITTING_SIZE(N) ( (blockSize-2*rml::internal::estimatedCacheLineSize)/N ) & ~(fittingAlignment-1)
+const uint32_t fittingSize5 = SET_FITTING_SIZE(2); // 8128/8064
 #undef SET_FITTING_SIZE
 const uint32_t minLargeObjectSize = fittingSize5 + 1;
 
 /* end of code replicated from src/tbbmalloc */
 
-static void scalableMallocCheckSize(void *object, size_t size) {
+static void scalableMallocCheckSize(void *object, size_t size)
+{
 #if __clang__
     // This prevents Clang from throwing out the calls to new & delete in CheckNewDeleteOverload().
     static void *v = object;
@@ -200,71 +200,76 @@ static void scalableMallocCheckSize(void *object, size_t size) {
 #endif
     REQUIRE(object);
     if (size >= minLargeObjectSize) {
-        LargeMemoryBlock *lmb = ((LargeObjectHdr *) object - 1)->memoryBlock;
-        REQUIRE((uintptr_t(lmb) < uintptr_t(((LargeObjectHdr *) object - 1)) && lmb->objectSize >= size));
+        LargeMemoryBlock *lmb = ((LargeObjectHdr*)object-1)->memoryBlock;
+        REQUIRE((uintptr_t(lmb)<uintptr_t(((LargeObjectHdr*)object-1)) && lmb->objectSize >= size));
     }
 #if MALLOC_UNIXLIKE_OVERLOAD_ENABLED || MALLOC_ZONE_OVERLOAD_ENABLED
     REQUIRE(malloc_usable_size(object) >= size);
 #elif MALLOC_WINDOWS_OVERLOAD_ENABLED
     // Check that _msize works correctly
     REQUIRE(_msize(object) >= size);
-    REQUIRE((size < 8 || _aligned_msize(object, 8, 0) >= size));
+    REQUIRE((size < 8 || _aligned_msize(object,8,0) >= size));
 #endif
 }
 
 void CheckStdFuncOverload(void *(*malloc_p)(size_t), void *(*calloc_p)(size_t, size_t),
-                          void *(*realloc_p)(void *, size_t), void (*free_p)(void *)) {
+                          void *(*realloc_p)(void *, size_t), void (*free_p)(void *))
+{
     void *ptr = malloc_p(minLargeObjectSize);
     scalableMallocCheckSize(ptr, minLargeObjectSize);
     free(ptr);
 
     ptr = calloc_p(minLargeObjectSize, 2);
-    scalableMallocCheckSize(ptr, 2 * minLargeObjectSize);
-    void *ptr1 = realloc_p(ptr, 10 * minLargeObjectSize);
-    scalableMallocCheckSize(ptr1, 10 * minLargeObjectSize);
+    scalableMallocCheckSize(ptr, 2*minLargeObjectSize);
+    void *ptr1 = realloc_p(ptr, 10*minLargeObjectSize);
+    scalableMallocCheckSize(ptr1, 10*minLargeObjectSize);
     free_p(ptr1);
 }
 
 #if MALLOC_UNIXLIKE_OVERLOAD_ENABLED || MALLOC_ZONE_OVERLOAD_ENABLED
 
-void CheckMemalignFuncOverload(void *(*memalign_p)(size_t, size_t), void (*free_p)(void *)) {
-    void *ptr = memalign_p(128, 4 * minLargeObjectSize);
-    scalableMallocCheckSize(ptr, 4 * minLargeObjectSize);
+void CheckMemalignFuncOverload(void *(*memalign_p)(size_t, size_t),
+                               void (*free_p)(void*))
+{
+    void *ptr = memalign_p(128, 4*minLargeObjectSize);
+    scalableMallocCheckSize(ptr, 4*minLargeObjectSize);
     REQUIRE(tbb::detail::is_aligned(ptr, 128));
     free_p(ptr);
 }
 
-void CheckVallocFuncOverload(void *(*valloc_p)(size_t), void (*free_p)(void *)) {
+void CheckVallocFuncOverload(void *(*valloc_p)(size_t), void (*free_p)(void*))
+{
     void *ptr = valloc_p(minLargeObjectSize);
     scalableMallocCheckSize(ptr, minLargeObjectSize);
     REQUIRE(tbb::detail::is_aligned(ptr, sysconf(_SC_PAGESIZE)));
     free_p(ptr);
 }
 
-void CheckPvalloc(void *(*pvalloc_p)(size_t), void (*free_p)(void *)) {
+void CheckPvalloc(void *(*pvalloc_p)(size_t), void (*free_p)(void*))
+{
     const long memoryPageSize = sysconf(_SC_PAGESIZE);
     // request large object with not power-of-2 size
-    const size_t largeSz = alignUp(minLargeObjectSize, 16 * 1024) + 1;
+    const size_t largeSz = alignUp(minLargeObjectSize, 16*1024) + 1;
 
-    for (size_t sz = 0; sz <= largeSz; sz += largeSz) {
+    for (size_t sz = 0; sz<=largeSz; sz+=largeSz) {
         void *ptr = pvalloc_p(sz);
-        scalableMallocCheckSize(ptr, sz ? alignUp(sz, memoryPageSize) : memoryPageSize);
+        scalableMallocCheckSize(ptr, sz? alignUp(sz, memoryPageSize) : memoryPageSize);
         REQUIRE(tbb::detail::is_aligned(ptr, memoryPageSize));
         free_p(ptr);
     }
 }
 
-#endif// MALLOC_UNIXLIKE_OVERLOAD_ENABLED || MALLOC_ZONE_OVERLOAD_ENABLED
+#endif // MALLOC_UNIXLIKE_OVERLOAD_ENABLED || MALLOC_ZONE_OVERLOAD_ENABLED
 
 // regression test: on macOS scalable_free() treated small aligned object,
 // placed in large block, as small block
 void CheckFreeAligned() {
-    size_t sz[] = {8, 4 * 1024, 16 * 1024, 0};
-    size_t align[] = {8, 4 * 1024, 16 * 1024, 0};
+    size_t sz[] = {8, 4*1024, 16*1024, 0};
+    size_t align[] = {8, 4*1024, 16*1024, 0};
 
-    for (int s = 0; sz[s]; s++)
-        for (int a = 0; align[a]; a++) {
-            void *ptr = NULL;
+    for (int s=0; sz[s]; s++)
+        for (int a=0; align[a]; a++) {
+            void *ptr = nullptr;
 #if __TBB_POSIX_MEMALIGN_PRESENT
             int ret = posix_memalign(&ptr, align[a], sz[s]);
             REQUIRE(!ret);
@@ -279,8 +284,8 @@ void CheckFreeAligned() {
 #if __ANDROID__
 // Workaround for an issue with strdup somehow bypassing our malloc replacement on Android.
 char *strdup(const char *str) {
-    REPORT("Known issue: malloc replacement does not work for strdup on Android.\n");
-    size_t len = strlen(str) + 1;
+    REPORT( "Known issue: malloc replacement does not work for strdup on Android.\n" );
+    size_t len = strlen(str)+1;
     void *new_str = malloc(len);
     return new_str ? reinterpret_cast<char *>(memcpy(new_str, str, len)) : 0;
 }
@@ -297,11 +302,10 @@ void TestZoneOverload() {
     vm_address_t *zones;
     unsigned zones_num;
 
-    kern_return_t ret = malloc_get_all_zones(mach_task_self(), NULL, &zones, &zones_num);
-    REQUIRE((!ret && zones_num > 1));
-    malloc_zone_t *sys_zone = (malloc_zone_t *) zones[1];
-    REQUIRE_MESSAGE(strcmp("tbbmalloc", malloc_get_zone_name(sys_zone)),
-                    "zone 1 expected to be not tbbmalloc");
+    kern_return_t ret = malloc_get_all_zones(mach_task_self(), nullptr, &zones, &zones_num);
+    REQUIRE((!ret && zones_num>1));
+    malloc_zone_t *sys_zone = (malloc_zone_t*)zones[1];
+    REQUIRE_MESSAGE(strcmp("tbbmalloc", malloc_get_zone_name(sys_zone)), "zone 1 expected to be not tbbmalloc");
     void *p = malloc_zone_malloc(sys_zone, 16);
     free(p);
 }
@@ -312,7 +316,9 @@ void TestZoneOverload() {
 #if _WIN32
 // regression test: certain MSVC runtime functions use "public" allocation functions
 // but internal free routines, causing crashes if tbbmalloc_proxy does not intercept the latter.
-void TestRuntimeRoutines() { system("rem should be a safe command to call"); }
+void TestRuntimeRoutines() {
+    system("rem should be a safe command to call");
+}
 #else
 #define TestRuntimeRoutines()
 #endif
@@ -329,24 +335,25 @@ void CheckNewDeleteOverload() {
     delete s1;
 
     s2 = new BigStruct[10];
-    scalableMallocCheckSize(s2, 10 * sizeof(BigStruct));
-    delete[] s2;
+    scalableMallocCheckSize(s2, 10*sizeof(BigStruct));
+    delete []s2;
 
-    s3 = new (std::nothrow) BigStruct;
+    s3 = new(std::nothrow) BigStruct;
     scalableMallocCheckSize(s3, sizeof(BigStruct));
     delete s3;
 
-    s4 = new (std::nothrow) BigStruct[2];
-    scalableMallocCheckSize(s4, 2 * sizeof(BigStruct));
-    delete[] s4;
+    s4 = new(std::nothrow) BigStruct[2];
+    scalableMallocCheckSize(s4, 2*sizeof(BigStruct));
+    delete []s4;
 
     s5 = new BigStruct;
     scalableMallocCheckSize(s5, sizeof(BigStruct));
     operator delete(s5, std::nothrow);
 
     s6 = new BigStruct[5];
-    scalableMallocCheckSize(s6, 5 * sizeof(BigStruct));
+    scalableMallocCheckSize(s6, 5*sizeof(BigStruct));
     operator delete[](s6, std::nothrow);
+
 }
 
 #if MALLOC_WINDOWS_OVERLOAD_ENABLED
@@ -361,49 +368,46 @@ void FuncReplacementInfoCheck() {
     functions.insert("_aligned_msize");
 
     int status_check = 0;
-    for (char **log_string = func_replacement_log; *log_string != 0; log_string++) {
+    for (char** log_string = func_replacement_log; *log_string != 0; log_string++) {
         std::stringstream s(*log_string);
         std::string status, function_name;
         s >> status >> function_name;
 
-        if (status.find("Fail:") != status.npos) { status_check = -1; }
+        if (status.find("Fail:") != status.npos) {
+            status_check = -1;
+        }
 
         functions.erase(function_name);
     }
 
-    REQUIRE_MESSAGE(
-            functions.empty(),
-            "Changed opcodes log must contain all required functions with \"Success\" changed status");
-    REQUIRE_MESSAGE(func_replacement_status == status_check,
-                    "replacement_opcodes_log() function return wrong status");
+    REQUIRE_MESSAGE(functions.empty(), "Changed opcodes log must contain all required functions with \"Success\" changed status");
+    REQUIRE_MESSAGE(func_replacement_status == status_check, "replacement_opcodes_log() function return wrong status");
 
-    func_replacement_status = TBB_malloc_replacement_log(NULL);
-    REQUIRE_MESSAGE(func_replacement_status == status_check,
-                    "replacement_opcodes_log() function return wrong status");
+    func_replacement_status = TBB_malloc_replacement_log(nullptr);
+    REQUIRE_MESSAGE(func_replacement_status == status_check, "replacement_opcodes_log() function return wrong status");
 
     // TODO: was ASSERT_WARNING
     if (func_replacement_status != 0) {
         REPORT("Some standard allocation functions was not replaced to tbb_malloc functions.\n");
     }
 }
-#endif// MALLOC_WINDOWS_OVERLOAD_ENABLED
+#endif // MALLOC_WINDOWS_OVERLOAD_ENABLED
 
 //! Testing tbbmalloc_proxy overload capabilities
 //! \brief \ref error_guessing
 TEST_CASE("Main set of tests") {
 #if __unix__
-    REQUIRE(mallopt(0, 0));// add dummy mallopt call for coverage
-#endif                     // __unix__
+    REQUIRE(mallopt(0, 0)); // add dummy mallopt call for coverage
+#endif // __unix__
 
-    void *ptr = NULL;
-    utils::suppress_unused_warning(ptr);// for android
+    void *ptr = nullptr;
+    utils::suppress_unused_warning(ptr); // for android
 
 #if MALLOC_UNIXLIKE_OVERLOAD_ENABLED || MALLOC_ZONE_OVERLOAD_ENABLED
-    REQUIRE_MESSAGE(dlsym(RTLD_DEFAULT, "scalable_malloc"),
-                    "Lost dependency on malloc_proxy or LD_PRELOAD was not set?");
+    REQUIRE_MESSAGE(dlsym(RTLD_DEFAULT, "scalable_malloc"), "Lost dependency on malloc_proxy or LD_PRELOAD was not set?");
 #endif
 
-    /* On Windows, memory block size returned by _msize() is sometimes used
+/* On Windows, memory block size returned by _msize() is sometimes used
    to calculate the size for an extended block. Substituting _msize,
    scalable_msize initially returned 0 for regions not allocated by the scalable
    allocator, which led to incorrect memory reallocation and subsequent crashes.
@@ -412,23 +416,23 @@ TEST_CASE("Main set of tests") {
     REQUIRE_MESSAGE(getenv("PATH"), "We assume that PATH is set everywhere.");
     char *pathCopy = strdup(getenv("PATH"));
 #if __ANDROID__
-    REQUIRE_MESSAGE(strcmp(pathCopy, getenv("PATH")) == 0, "strdup workaround does not work as expected.");
+    REQUIRE_MESSAGE(strcmp(pathCopy,getenv("PATH")) == 0, "strdup workaround does not work as expected.");
 #endif
     const char *newEnvName = "__TBBMALLOC_OVERLOAD_REGRESSION_TEST_FOR_REALLOC_AND_MSIZE";
     REQUIRE_MESSAGE(!getenv(newEnvName), "Environment variable should not be used before.");
-    int r = utils::SetEnv(newEnvName, "1");
+    int r = utils::SetEnv(newEnvName,"1");
     REQUIRE(!r);
     char *path = getenv("PATH");
-    REQUIRE_MESSAGE((path && 0 == strcmp(path, pathCopy)), "Environment was changed erroneously.");
+    REQUIRE_MESSAGE((path && 0==strcmp(path, pathCopy)), "Environment was changed erroneously.");
     free(pathCopy);
 
     CheckStdFuncOverload(malloc, calloc, realloc, free);
 #if MALLOC_UNIXLIKE_OVERLOAD_ENABLED || MALLOC_ZONE_OVERLOAD_ENABLED
 
 #if __TBB_POSIX_MEMALIGN_PRESENT
-    int ret = posix_memalign(&ptr, 1024, 3 * minLargeObjectSize);
+    int ret = posix_memalign(&ptr, 1024, 3*minLargeObjectSize);
     REQUIRE(0 == ret);
-    scalableMallocCheckSize(ptr, 3 * minLargeObjectSize);
+    scalableMallocCheckSize(ptr, 3*minLargeObjectSize);
     REQUIRE(tbb::detail::is_aligned(ptr, 1024));
     free(ptr);
 #endif
@@ -445,15 +449,25 @@ TEST_CASE("Main set of tests") {
     CheckMemalignFuncOverload(aligned_alloc, free);
 #endif
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#if __INTEL_COMPILER
+   #pragma warning(push)
+   #pragma warning(disable: 1478)
+#elif __GNUC__
+   #pragma GCC diagnostic push
+   #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
     struct mallinfo info = mallinfo();
-#pragma GCC diagnostic pop
+#if __INTEL_COMPILER
+    #pragma warning(pop)
+#elif __GNUC__
+    #pragma GCC diagnostic pop
+#endif
     // right now mallinfo initialized by zero
-    REQUIRE((!info.arena && !info.ordblks && !info.smblks && !info.hblks && !info.hblkhd && !info.usmblks
-             && !info.fsmblks && !info.uordblks && !info.fordblks && !info.keepcost));
+    REQUIRE((!info.arena && !info.ordblks && !info.smblks && !info.hblks
+           && !info.hblkhd && !info.usmblks && !info.fsmblks
+           && !info.uordblks && !info.fordblks && !info.keepcost));
 
-#if !__ANDROID__
+ #if !__ANDROID__
     // These non-standard functions are exported by GLIBC, and might be used
     // in conjunction with standard malloc/free. Test that we overload them as well.
     // Bionic doesn't have them.
@@ -461,23 +475,23 @@ TEST_CASE("Main set of tests") {
     CheckMemalignFuncOverload(__libc_memalign, __libc_free);
     CheckVallocFuncOverload(__libc_valloc, __libc_free);
     CheckPvalloc(__libc_pvalloc, __libc_free);
-#endif
-#endif// __unix__
+ #endif
+#endif // __unix__
 
-#else// MALLOC_WINDOWS_OVERLOAD_ENABLED
+#else // MALLOC_WINDOWS_OVERLOAD_ENABLED
 
     ptr = _aligned_malloc(minLargeObjectSize, 16);
     scalableMallocCheckSize(ptr, minLargeObjectSize);
     REQUIRE(tbb::detail::is_aligned(ptr, 16));
 
     // Testing of workaround for vs "is power of 2 pow N" bug that accepts zeros
-    void *ptr1 = _aligned_malloc(minLargeObjectSize, 0);
+    void* ptr1 = _aligned_malloc(minLargeObjectSize, 0);
     scalableMallocCheckSize(ptr, minLargeObjectSize);
-    REQUIRE(tbb::detail::is_aligned(ptr, sizeof(void *)));
+    REQUIRE(tbb::detail::is_aligned(ptr, sizeof(void*)));
     _aligned_free(ptr1);
 
-    ptr1 = _aligned_realloc(ptr, minLargeObjectSize * 10, 16);
-    scalableMallocCheckSize(ptr1, minLargeObjectSize * 10);
+    ptr1 = _aligned_realloc(ptr, minLargeObjectSize*10, 16);
+    scalableMallocCheckSize(ptr1, minLargeObjectSize*10);
     REQUIRE(tbb::detail::is_aligned(ptr, 16));
     _aligned_free(ptr1);
 
@@ -505,9 +519,11 @@ TEST_CASE("Address range tracker regression test") {
     utils::NativeParallelFor(numThreads, [](int) {
         void *ptr = nullptr;
         for (int i = 0; i < 1000; ++i) {
-            for (int j = 0; j < 100; ++j) { ptr = realloc(ptr, 1024 * 1024 + 4096 * j); }
+            for (int j = 0; j < 100; ++j) {
+                ptr = realloc(ptr, 1024*1024 + 4096*j);
+            }
         }
         free(ptr);
     });
 }
-#endif// !HARNESS_SKIP_TEST
+#endif // !HARNESS_SKIP_TEST
diff --git a/external/tbb/test/tbbmalloc/test_malloc_overload_disable.cpp b/external/tbb/test/tbbmalloc/test_malloc_overload_disable.cpp
index bebd1d47..98cb6b73 100644
--- a/external/tbb/test/tbbmalloc/test_malloc_overload_disable.cpp
+++ b/external/tbb/test/tbbmalloc/test_malloc_overload_disable.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2018-2021 Intel Corporation
+    Copyright (c) 2018-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -23,8 +23,8 @@
 #include "common/test.h"
 
 #include "common/allocator_overload.h"
-#include "common/utils_env.h"
 #include "common/utils_report.h"
+#include "common/utils_env.h"
 
 // Disabling malloc proxy via env variable is available only on Windows for now
 #if MALLOC_WINDOWS_OVERLOAD_ENABLED
@@ -36,29 +36,32 @@
 #include "src/tbb/environment.h"
 
 const size_t SmallObjectSize = 16;
-const size_t LargeObjectSize = 2 * 8 * 1024;
-const size_t HugeObjectSize = 2 * 1024 * 1024;
+const size_t LargeObjectSize = 2*8*1024;
+const size_t HugeObjectSize = 2*1024*1024;
 
-void CheckWindowsProxyDisablingViaMemSize(size_t ObjectSize) {
+void CheckWindowsProxyDisablingViaMemSize( size_t ObjectSize ) {
     void* ptr = malloc(ObjectSize);
     /*
      * If msize returns 0 - tbbmalloc doesn't contain this object in it`s memory
      * Also msize check that proxy lib is linked
      */
-    REQUIRE_MESSAGE(!__TBB_malloc_safer_msize(ptr, NULL), "Malloc replacement is not deactivated");
+    REQUIRE_MESSAGE(!__TBB_malloc_safer_msize(ptr,nullptr), "Malloc replacement is not deactivated");
     free(ptr);
 }
 
 TEST_CASE("Disabling malloc overload") {
-    if (!tbb::detail::r1::GetBoolEnvironmentVariable("TBB_MALLOC_DISABLE_REPLACEMENT")) {
-        utils::SetEnv("TBB_MALLOC_DISABLE_REPLACEMENT", "1");
+    if (!tbb::detail::r1::GetBoolEnvironmentVariable("TBB_MALLOC_DISABLE_REPLACEMENT"))
+    {
+        utils::SetEnv("TBB_MALLOC_DISABLE_REPLACEMENT","1");
         if ((system(TEST_SYSTEM_COMMAND)) != 0) {
             REPORT("Test error: unable to run the command: %s", TEST_SYSTEM_COMMAND);
             exit(-1);
         }
         // We must execute exit(0) to avoid duplicate "Done" printing.
         exit(0);
-    } else {
+    }
+    else
+    {
         // Check SMALL objects replacement disable
         CheckWindowsProxyDisablingViaMemSize(SmallObjectSize);
         // Check LARGE objects replacement disable
@@ -67,4 +70,4 @@ TEST_CASE("Disabling malloc overload") {
         CheckWindowsProxyDisablingViaMemSize(HugeObjectSize);
     }
 }
-#endif// MALLOC_WINDOWS_OVERLOAD_ENABLED
+#endif // MALLOC_WINDOWS_OVERLOAD_ENABLED
diff --git a/external/tbb/test/tbbmalloc/test_malloc_pools.cpp b/external/tbb/test/tbbmalloc/test_malloc_pools.cpp
index 3f19dbbf..f73c28ec 100644
--- a/external/tbb/test/tbbmalloc/test_malloc_pools.cpp
+++ b/external/tbb/test/tbbmalloc/test_malloc_pools.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -23,50 +23,56 @@
 
 #define HARNESS_TBBMALLOC_THREAD_SHUTDOWN 1
 
-#include "common/spin_barrier.h"
-#include "common/tls_limit.h"
 #include "common/utils.h"
 #include "common/utils_assert.h"
+#include "common/spin_barrier.h"
+#include "common/tls_limit.h"
 
 #include "tbb/scalable_allocator.h"
 
 #include <atomic>
 
-template <typename T>
-static inline T alignUp(T arg, uintptr_t alignment) {
-    return T(((uintptr_t) arg + (alignment - 1)) & ~(alignment - 1));
+template<typename T>
+static inline T alignUp  (T arg, uintptr_t alignment) {
+    return T(((uintptr_t)arg+(alignment-1)) & ~(alignment-1));
 }
 
-struct PoolSpace : utils::NoCopy {
+struct PoolSpace: utils::NoCopy {
     size_t pos;
-    int regions;
+    int    regions;
     size_t bufSize;
-    char *space;
+    char  *space;
 
-    static const size_t BUF_SIZE = 8 * 1024 * 1024;
+    static const size_t BUF_SIZE = 8*1024*1024;
 
-    PoolSpace(size_t bufSz = BUF_SIZE) : pos(0), regions(0), bufSize(bufSz), space(new char[bufSize]) {
+    PoolSpace(size_t bufSz = BUF_SIZE) :
+        pos(0), regions(0),
+        bufSize(bufSz), space(new char[bufSize]) {
         memset(space, 0, bufSize);
     }
-    ~PoolSpace() { delete[] space; }
+    ~PoolSpace() {
+        delete []space;
+    }
 };
 
 static PoolSpace *poolSpace;
 
 struct MallocPoolHeader {
-    void *rawPtr;
+    void  *rawPtr;
     size_t userSize;
 };
 
 static std::atomic<int> liveRegions;
 
-static void *getMallocMem(intptr_t /*pool_id*/, size_t &bytes) {
-    void *rawPtr = malloc(bytes + sizeof(MallocPoolHeader) + 1);
-    if (!rawPtr) return NULL;
+static void *getMallocMem(intptr_t /*pool_id*/, size_t &bytes)
+{
+    void *rawPtr = malloc(bytes+sizeof(MallocPoolHeader)+1);
+    if (!rawPtr)
+        return nullptr;
     // +1 to check working with unaligned space
-    void *ret = (void *) ((uintptr_t) rawPtr + sizeof(MallocPoolHeader) + 1);
+    void *ret = (void *)((uintptr_t)rawPtr+sizeof(MallocPoolHeader)+1);
 
-    MallocPoolHeader *hdr = (MallocPoolHeader *) ret - 1;
+    MallocPoolHeader *hdr = (MallocPoolHeader*)ret-1;
     hdr->rawPtr = rawPtr;
     hdr->userSize = bytes;
 
@@ -75,8 +81,9 @@ static void *getMallocMem(intptr_t /*pool_id*/, size_t &bytes) {
     return ret;
 }
 
-static int putMallocMem(intptr_t /*pool_id*/, void *ptr, size_t bytes) {
-    MallocPoolHeader *hdr = (MallocPoolHeader *) ptr - 1;
+static int putMallocMem(intptr_t /*pool_id*/, void *ptr, size_t bytes)
+{
+    MallocPoolHeader *hdr = (MallocPoolHeader*)ptr-1;
     ASSERT(bytes == hdr->userSize, "Invalid size in pool callback.");
     free(hdr->rawPtr);
 
@@ -85,35 +92,37 @@ static int putMallocMem(intptr_t /*pool_id*/, void *ptr, size_t bytes) {
     return 0;
 }
 
-void TestPoolReset() {
+void TestPoolReset()
+{
     rml::MemPoolPolicy pol(getMallocMem, putMallocMem);
     rml::MemoryPool *pool;
 
     pool_create_v1(0, &pol, &pool);
-    for (int i = 0; i < 100; i++) {
+    for (int i=0; i<100; i++) {
         REQUIRE(pool_malloc(pool, 8));
-        REQUIRE(pool_malloc(pool, 50 * 1024));
+        REQUIRE(pool_malloc(pool, 50*1024));
     }
     int regionsBeforeReset = liveRegions.load(std::memory_order_acquire);
     bool ok = pool_reset(pool);
     REQUIRE(ok);
-    for (int i = 0; i < 100; i++) {
+    for (int i=0; i<100; i++) {
         REQUIRE(pool_malloc(pool, 8));
-        REQUIRE(pool_malloc(pool, 50 * 1024));
+        REQUIRE(pool_malloc(pool, 50*1024));
     }
     REQUIRE_MESSAGE(regionsBeforeReset == liveRegions.load(std::memory_order_relaxed),
-                    "Expected no new regions allocation.");
+           "Expected no new regions allocation.");
     ok = pool_destroy(pool);
     REQUIRE(ok);
     REQUIRE_MESSAGE(!liveRegions.load(std::memory_order_relaxed), "Expected all regions were released.");
 }
 
-class SharedPoolRun : utils::NoAssign {
-    static long threadNum;
-    static utils::SpinBarrier startB, mallocDone;
-    static rml::MemoryPool *pool;
-    static void **crossThread, **afterTerm;
-
+class SharedPoolRun: utils::NoAssign {
+    static long                 threadNum;
+    static utils::SpinBarrier startB,
+                                mallocDone;
+    static rml::MemoryPool     *pool;
+    static void               **crossThread,
+                              **afterTerm;
 public:
     static const int OBJ_CNT = 100;
 
@@ -126,67 +135,75 @@ class SharedPoolRun : utils::NoAssign {
         mallocDone.initialize(threadNum);
     }
 
-    void operator()(int id) const {
+    void operator()( int id ) const {
         const int ITERS = 1000;
         void *local[ITERS];
 
         startB.wait();
-        for (int i = id * OBJ_CNT; i < (id + 1) * OBJ_CNT; i++) {
-            afterTerm[i] = pool_malloc(pool, i % 2 ? 8 * 1024 : 9 * 1024);
-            memset(afterTerm[i], i, i % 2 ? 8 * 1024 : 9 * 1024);
-            crossThread[i] = pool_malloc(pool, i % 2 ? 9 * 1024 : 8 * 1024);
-            memset(crossThread[i], i, i % 2 ? 9 * 1024 : 8 * 1024);
+        for (int i=id*OBJ_CNT; i<(id+1)*OBJ_CNT; i++) {
+            afterTerm[i] = pool_malloc(pool, i%2? 8*1024 : 9*1024);
+            memset(afterTerm[i], i, i%2? 8*1024 : 9*1024);
+            crossThread[i] = pool_malloc(pool, i%2? 9*1024 : 8*1024);
+            memset(crossThread[i], i, i%2? 9*1024 : 8*1024);
         }
 
-        for (int i = 1; i < ITERS; i += 2) {
-            local[i - 1] = pool_malloc(pool, 6 * 1024);
-            memset(local[i - 1], i, 6 * 1024);
-            local[i] = pool_malloc(pool, 16 * 1024);
-            memset(local[i], i, 16 * 1024);
+        for (int i=1; i<ITERS; i+=2) {
+            local[i-1] = pool_malloc(pool, 6*1024);
+            memset(local[i-1], i, 6*1024);
+            local[i] = pool_malloc(pool, 16*1024);
+            memset(local[i], i, 16*1024);
         }
         mallocDone.wait();
-        int myVictim = threadNum - id - 1;
-        for (int i = myVictim * OBJ_CNT; i < (myVictim + 1) * OBJ_CNT; i++) pool_free(pool, crossThread[i]);
-        for (int i = 0; i < ITERS; i++) pool_free(pool, local[i]);
+        int myVictim = threadNum-id-1;
+        for (int i=myVictim*OBJ_CNT; i<(myVictim+1)*OBJ_CNT; i++)
+            pool_free(pool, crossThread[i]);
+        for (int i=0; i<ITERS; i++)
+            pool_free(pool, local[i]);
     }
 };
 
-long SharedPoolRun::threadNum;
-utils::SpinBarrier SharedPoolRun::startB, SharedPoolRun::mallocDone;
-rml::MemoryPool *SharedPoolRun::pool;
-void **SharedPoolRun::crossThread, **SharedPoolRun::afterTerm;
+long                 SharedPoolRun::threadNum;
+utils::SpinBarrier SharedPoolRun::startB,
+                     SharedPoolRun::mallocDone;
+rml::MemoryPool     *SharedPoolRun::pool;
+void               **SharedPoolRun::crossThread,
+                   **SharedPoolRun::afterTerm;
 
 // single pool shared by different threads
-void TestSharedPool() {
+void TestSharedPool()
+{
     rml::MemPoolPolicy pol(getMallocMem, putMallocMem);
     rml::MemoryPool *pool;
 
     pool_create_v1(0, &pol, &pool);
-    void **crossThread = new void *[utils::MaxThread * SharedPoolRun::OBJ_CNT];
-    void **afterTerm = new void *[utils::MaxThread * SharedPoolRun::OBJ_CNT];
+    void **crossThread = new void*[utils::MaxThread * SharedPoolRun::OBJ_CNT];
+    void **afterTerm = new void*[utils::MaxThread * SharedPoolRun::OBJ_CNT];
 
-    for (int p = utils::MinThread; p <= utils::MaxThread; p++) {
+    for (int p=utils::MinThread; p<=utils::MaxThread; p++) {
         SharedPoolRun::init(p, pool, crossThread, afterTerm);
         SharedPoolRun thr;
 
-        void *hugeObj = pool_malloc(pool, 10 * 1024 * 1024);
+        void *hugeObj = pool_malloc(pool, 10*1024*1024);
         REQUIRE(hugeObj);
 
-        utils::NativeParallelFor(p, thr);
+        utils::NativeParallelFor( p, thr );
 
         pool_free(pool, hugeObj);
-        for (int i = 0; i < p * SharedPoolRun::OBJ_CNT; i++) pool_free(pool, afterTerm[i]);
+        for (int i=0; i<p*SharedPoolRun::OBJ_CNT; i++)
+            pool_free(pool, afterTerm[i]);
     }
-    delete[] afterTerm;
-    delete[] crossThread;
+    delete []afterTerm;
+    delete []crossThread;
 
     bool ok = pool_destroy(pool);
     REQUIRE(ok);
     REQUIRE_MESSAGE(!liveRegions.load(std::memory_order_relaxed), "Expected all regions were released.");
 }
 
-void *CrossThreadGetMem(intptr_t pool_id, size_t &bytes) {
-    if (poolSpace[pool_id].pos + bytes > poolSpace[pool_id].bufSize) return NULL;
+void *CrossThreadGetMem(intptr_t pool_id, size_t &bytes)
+{
+    if (poolSpace[pool_id].pos + bytes > poolSpace[pool_id].bufSize)
+        return nullptr;
 
     void *ret = poolSpace[pool_id].space + poolSpace[pool_id].pos;
     poolSpace[pool_id].pos += bytes;
@@ -195,59 +212,59 @@ void *CrossThreadGetMem(intptr_t pool_id, size_t &bytes) {
     return ret;
 }
 
-int CrossThreadPutMem(intptr_t pool_id, void * /*raw_ptr*/, size_t /*raw_bytes*/) {
+int CrossThreadPutMem(intptr_t pool_id, void* /*raw_ptr*/, size_t /*raw_bytes*/)
+{
     poolSpace[pool_id].regions--;
     return 0;
 }
 
-class CrossThreadRun : utils::NoAssign {
+class CrossThreadRun: utils::NoAssign {
     static long number_of_threads;
     static utils::SpinBarrier barrier;
     static rml::MemoryPool **pool;
     static char **obj;
-
 public:
     static void initBarrier(unsigned thrds) { barrier.initialize(thrds); }
     static void init(long num) {
         number_of_threads = num;
-        pool = new rml::MemoryPool *[number_of_threads];
+        pool = new rml::MemoryPool*[number_of_threads];
         poolSpace = new PoolSpace[number_of_threads];
-        obj = new char *[number_of_threads];
+        obj = new char*[number_of_threads];
     }
     static void destroy() {
-        for (long i = 0; i < number_of_threads; i++)
+        for (long i=0; i<number_of_threads; i++)
             REQUIRE_MESSAGE(!poolSpace[i].regions, "Memory leak detected");
-        delete[] pool;
-        delete[] poolSpace;
-        delete[] obj;
+        delete []pool;
+        delete []poolSpace;
+        delete []obj;
     }
     CrossThreadRun() {}
-    void operator()(int id) const {
+    void operator()( int id ) const {
         rml::MemPoolPolicy pol(CrossThreadGetMem, CrossThreadPutMem);
-        const int objLen = 10 * id;
+        const int objLen = 10*id;
 
         pool_create_v1(id, &pol, &pool[id]);
-        obj[id] = (char *) pool_malloc(pool[id], objLen);
+        obj[id] = (char*)pool_malloc(pool[id], objLen);
         REQUIRE(obj[id]);
         memset(obj[id], id, objLen);
 
         {
-            const size_t lrgSz = 2 * 16 * 1024;
+            const size_t lrgSz = 2*16*1024;
             void *ptrLarge = pool_malloc(pool[id], lrgSz);
             REQUIRE(ptrLarge);
             memset(ptrLarge, 1, lrgSz);
             // consume all small objects
-            while (pool_malloc(pool[id], 5 * 1024))
-                ;
+            while (pool_malloc(pool[id], 5 * 1024));
             // releasing of large object will not give a chance to allocate more
             // since only fixed pool can look at other bins aligned/notAligned
             pool_free(pool[id], ptrLarge);
-            CHECK(!pool_malloc(pool[id], 5 * 1024));
+            CHECK(!pool_malloc(pool[id], 5*1024));
         }
 
         barrier.wait();
-        int myPool = number_of_threads - id - 1;
-        for (int i = 0; i < 10 * myPool; i++) REQUIRE(myPool == obj[myPool][i]);
+        int myPool = number_of_threads-id-1;
+        for (int i=0; i<10*myPool; i++)
+            REQUIRE(myPool==obj[myPool][i]);
         pool_free(pool[myPool], obj[myPool]);
         bool ok = pool_destroy(pool[myPool]);
         REQUIRE(ok);
@@ -260,19 +277,22 @@ rml::MemoryPool **CrossThreadRun::pool;
 char **CrossThreadRun::obj;
 
 // pools created, used and destroyed by different threads
-void TestCrossThreadPools() {
-    for (int p = utils::MinThread; p <= utils::MaxThread; p++) {
+void TestCrossThreadPools()
+{
+    for (int p=utils::MinThread; p<=utils::MaxThread; p++) {
         CrossThreadRun::initBarrier(p);
         CrossThreadRun::init(p);
-        utils::NativeParallelFor(p, CrossThreadRun());
-        for (int i = 0; i < p; i++) REQUIRE_MESSAGE(!poolSpace[i].regions, "Region leak detected");
+        utils::NativeParallelFor( p, CrossThreadRun() );
+        for (int i=0; i<p; i++)
+            REQUIRE_MESSAGE(!poolSpace[i].regions, "Region leak detected");
         CrossThreadRun::destroy();
     }
 }
 
 // buffer is too small to pool be created, but must not leak resources
-void TestTooSmallBuffer() {
-    poolSpace = new PoolSpace(8 * 1024);
+void TestTooSmallBuffer()
+{
+    poolSpace = new PoolSpace(8*1024);
 
     rml::MemPoolPolicy pol(CrossThreadGetMem, CrossThreadPutMem);
     rml::MemoryPool *pool;
@@ -287,42 +307,46 @@ void TestTooSmallBuffer() {
 class FixedPoolHeadBase : utils::NoAssign {
     size_t size;
     std::atomic<bool> used;
-    char *data;
-
+    char* data;
 public:
-    FixedPoolHeadBase(size_t s) : size(s), used(false) { data = new char[size]; }
+    FixedPoolHeadBase(size_t s) : size(s), used(false) {
+        data = new char[size];
+    }
     void *useData(size_t &bytes) {
         bool wasUsed = used.exchange(true);
         REQUIRE_MESSAGE(!wasUsed, "The buffer must not be used twice.");
         bytes = size;
         return data;
     }
-    ~FixedPoolHeadBase() { delete[] data; }
+    ~FixedPoolHeadBase() {
+        delete []data;
+    }
 };
 
-template <size_t SIZE>
+template<size_t SIZE>
 class FixedPoolHead : FixedPoolHeadBase {
 public:
-    FixedPoolHead() : FixedPoolHeadBase(SIZE) {}
+    FixedPoolHead() : FixedPoolHeadBase(SIZE) { }
 };
 
-static void *fixedBufGetMem(intptr_t pool_id, size_t &bytes) {
-    return ((FixedPoolHeadBase *) pool_id)->useData(bytes);
+static void *fixedBufGetMem(intptr_t pool_id, size_t &bytes)
+{
+    return ((FixedPoolHeadBase*)pool_id)->useData(bytes);
 }
 
-class FixedPoolUse : utils::NoAssign {
+class FixedPoolUse: utils::NoAssign {
     static utils::SpinBarrier startB;
     rml::MemoryPool *pool;
     size_t reqSize;
     int iters;
-
 public:
-    FixedPoolUse(unsigned threads, rml::MemoryPool *p, size_t sz, int it) : pool(p), reqSize(sz), iters(it) {
+    FixedPoolUse(unsigned threads, rml::MemoryPool *p, size_t sz, int it) :
+        pool(p), reqSize(sz), iters(it) {
         startB.initialize(threads);
     }
-    void operator()(int /*id*/) const {
+    void operator()( int /*id*/ ) const {
         startB.wait();
-        for (int i = 0; i < iters; i++) {
+        for (int i=0; i<iters; i++) {
             void *o = pool_malloc(pool, reqSize);
             ASSERT(o, "Invalid object");
             pool_free(pool, o);
@@ -332,35 +356,36 @@ class FixedPoolUse : utils::NoAssign {
 
 utils::SpinBarrier FixedPoolUse::startB;
 
-class FixedPoolNomem : utils::NoAssign {
+class FixedPoolNomem: utils::NoAssign {
     utils::SpinBarrier *startB;
     rml::MemoryPool *pool;
-
 public:
-    FixedPoolNomem(utils::SpinBarrier *b, rml::MemoryPool *p) : startB(b), pool(p) {}
+    FixedPoolNomem(utils::SpinBarrier *b, rml::MemoryPool *p) :
+        startB(b), pool(p) {}
     void operator()(int id) const {
         startB->wait();
-        void *o = pool_malloc(pool, id % 2 ? 64 : 128 * 1024);
+        void *o = pool_malloc(pool, id%2? 64 : 128*1024);
         ASSERT(!o, "All memory must be consumed.");
     }
 };
 
-class FixedPoolSomeMem : utils::NoAssign {
+class FixedPoolSomeMem: utils::NoAssign {
     utils::SpinBarrier *barrier;
     rml::MemoryPool *pool;
-
 public:
-    FixedPoolSomeMem(utils::SpinBarrier *b, rml::MemoryPool *p) : barrier(b), pool(p) {}
+    FixedPoolSomeMem(utils::SpinBarrier *b, rml::MemoryPool *p) :
+        barrier(b), pool(p) {}
     void operator()(int id) const {
         barrier->wait();
-        utils::Sleep(2 * id);
-        void *o = pool_malloc(pool, id % 2 ? 64 : 128 * 1024);
+        utils::Sleep(2*id);
+        void *o = pool_malloc(pool, id%2? 64 : 128*1024);
         barrier->wait();
         pool_free(pool, o);
     }
 };
 
-bool haveEnoughSpace(rml::MemoryPool *pool, size_t sz) {
+bool haveEnoughSpace(rml::MemoryPool *pool, size_t sz)
+{
     if (void *p = pool_malloc(pool, sz)) {
         pool_free(pool, p);
         return true;
@@ -368,36 +393,38 @@ bool haveEnoughSpace(rml::MemoryPool *pool, size_t sz) {
     return false;
 }
 
-void TestFixedBufferPool() {
+void TestFixedBufferPool()
+{
     const int ITERS = 7;
-    const size_t MAX_OBJECT = 7 * 1024 * 1024;
+    const size_t MAX_OBJECT = 7*1024*1024;
     void *ptrs[ITERS];
-    rml::MemPoolPolicy pol(fixedBufGetMem, NULL, 0, /*fixedSizePool=*/true,
+    rml::MemPoolPolicy pol(fixedBufGetMem, nullptr, 0, /*fixedSizePool=*/true,
                            /*keepMemTillDestroy=*/false);
     rml::MemoryPool *pool;
     {
-        FixedPoolHead<MAX_OBJECT + 1024 * 1024> head;
+        FixedPoolHead<MAX_OBJECT + 1024*1024> head;
 
-        pool_create_v1((intptr_t) &head, &pol, &pool);
+        pool_create_v1((intptr_t)&head, &pol, &pool);
         {
-            utils::NativeParallelFor(1, FixedPoolUse(1, pool, MAX_OBJECT, 2));
+            utils::NativeParallelFor( 1, FixedPoolUse(1, pool, MAX_OBJECT, 2) );
 
-            for (int i = 0; i < ITERS; i++) {
-                ptrs[i] = pool_malloc(pool, MAX_OBJECT / ITERS);
+            for (int i=0; i<ITERS; i++) {
+                ptrs[i] = pool_malloc(pool, MAX_OBJECT/ITERS);
                 REQUIRE(ptrs[i]);
             }
-            for (int i = 0; i < ITERS; i++) pool_free(pool, ptrs[i]);
+            for (int i=0; i<ITERS; i++)
+                pool_free(pool, ptrs[i]);
 
-            utils::NativeParallelFor(1, FixedPoolUse(1, pool, MAX_OBJECT, 1));
+            utils::NativeParallelFor( 1, FixedPoolUse(1, pool, MAX_OBJECT, 1) );
         }
         // each thread asks for an MAX_OBJECT/p/2 object,
         // /2 is to cover fragmentation
-        for (int p = utils::MinThread; p <= utils::MaxThread; p++) {
-            utils::NativeParallelFor(p, FixedPoolUse(p, pool, MAX_OBJECT / p / 2, 10000));
+        for (int p=utils::MinThread; p<=utils::MaxThread; p++) {
+            utils::NativeParallelFor( p, FixedPoolUse(p, pool, MAX_OBJECT/p/2, 10000) );
         }
         {
             const int p = 128;
-            utils::NativeParallelFor(p, FixedPoolUse(p, pool, MAX_OBJECT / p / 2, 1));
+            utils::NativeParallelFor( p, FixedPoolUse(p, pool, MAX_OBJECT/p/2, 1) );
         }
         {
             size_t maxSz;
@@ -408,28 +435,29 @@ void TestFixedBufferPool() {
             // as the pool might be fragmented by BootStrapBlocks consumed during
             // FixedPoolRun.
             size_t l, r;
-            REQUIRE(haveEnoughSpace(pool, MAX_OBJECT / 2));
-            for (l = MAX_OBJECT / 2, r = MAX_OBJECT + 1024 * 1024; l < r - 1;) {
-                size_t mid = (l + r) / 2;
-                if (haveEnoughSpace(pool, mid)) l = mid;
+            REQUIRE(haveEnoughSpace(pool, MAX_OBJECT/2));
+            for (l = MAX_OBJECT/2, r = MAX_OBJECT + 1024*1024; l < r-1; ) {
+                size_t mid = (l+r)/2;
+                if (haveEnoughSpace(pool, mid))
+                    l = mid;
                 else
                     r = mid;
             }
             maxSz = l;
-            REQUIRE_MESSAGE(!haveEnoughSpace(pool, maxSz + 1), "Expect to find boundary value.");
+            REQUIRE_MESSAGE(!haveEnoughSpace(pool, maxSz+1), "Expect to find boundary value.");
             // consume all available memory
             void *largeObj = pool_malloc(pool, maxSz);
             REQUIRE(largeObj);
             void *o = pool_malloc(pool, 64);
-            if (o)// pool fragmented, skip FixedPoolNomem
+            if (o) // pool fragmented, skip FixedPoolNomem
                 pool_free(pool, o);
             else
-                utils::NativeParallelFor(p, FixedPoolNomem(&barrier, pool));
+                utils::NativeParallelFor( p, FixedPoolNomem(&barrier, pool) );
             pool_free(pool, largeObj);
             // keep some space unoccupied
-            largeObj = pool_malloc(pool, maxSz - 512 * 1024);
+            largeObj = pool_malloc(pool, maxSz-512*1024);
             REQUIRE(largeObj);
-            utils::NativeParallelFor(p, FixedPoolSomeMem(&barrier, pool));
+            utils::NativeParallelFor( p, FixedPoolSomeMem(&barrier, pool) );
             pool_free(pool, largeObj);
         }
         bool ok = pool_destroy(pool);
@@ -437,10 +465,10 @@ void TestFixedBufferPool() {
     }
     // check that fresh untouched pool can successfully fulfil requests from 128 threads
     {
-        FixedPoolHead<MAX_OBJECT + 1024 * 1024> head;
-        pool_create_v1((intptr_t) &head, &pol, &pool);
-        int p = 128;
-        utils::NativeParallelFor(p, FixedPoolUse(p, pool, MAX_OBJECT / p / 2, 1));
+        FixedPoolHead<MAX_OBJECT + 1024*1024> head;
+        pool_create_v1((intptr_t)&head, &pol, &pool);
+        int p=128;
+        utils::NativeParallelFor( p, FixedPoolUse(p, pool, MAX_OBJECT/p/2, 1) );
         bool ok = pool_destroy(pool);
         REQUIRE(ok);
     }
@@ -448,27 +476,30 @@ void TestFixedBufferPool() {
 
 static size_t currGranularity;
 
-static void *getGranMem(intptr_t /*pool_id*/, size_t &bytes) {
-    REQUIRE_MESSAGE(!(bytes % currGranularity), "Region size mismatch granularity.");
+static void *getGranMem(intptr_t /*pool_id*/, size_t &bytes)
+{
+    REQUIRE_MESSAGE(!(bytes%currGranularity), "Region size mismatch granularity.");
     return malloc(bytes);
 }
 
-static int putGranMem(intptr_t /*pool_id*/, void *ptr, size_t bytes) {
-    REQUIRE_MESSAGE(!(bytes % currGranularity), "Region size mismatch granularity.");
+static int putGranMem(intptr_t /*pool_id*/, void *ptr, size_t bytes)
+{
+    REQUIRE_MESSAGE(!(bytes%currGranularity), "Region size mismatch granularity.");
     free(ptr);
     return 0;
 }
 
-void TestPoolGranularity() {
+void TestPoolGranularity()
+{
     rml::MemPoolPolicy pol(getGranMem, putGranMem);
-    const size_t grans[] = {4 * 1024, 2 * 1024 * 1024, 6 * 1024 * 1024, 10 * 1024 * 1024};
+    const size_t grans[] = {4*1024, 2*1024*1024, 6*1024*1024, 10*1024*1024};
 
-    for (unsigned i = 0; i < sizeof(grans) / sizeof(grans[0]); i++) {
+    for (unsigned i=0; i<sizeof(grans)/sizeof(grans[0]); i++) {
         pol.granularity = currGranularity = grans[i];
         rml::MemoryPool *pool;
 
         pool_create_v1(0, &pol, &pool);
-        for (int sz = 500 * 1024; sz < 16 * 1024 * 1024; sz += 101 * 1024) {
+        for (int sz=500*1024; sz<16*1024*1024; sz+=101*1024) {
             void *p = pool_malloc(pool, sz);
             REQUIRE_MESSAGE(p, "Can't allocate memory in pool.");
             pool_free(pool, p);
@@ -480,49 +511,57 @@ void TestPoolGranularity() {
 
 static size_t putMemAll, getMemAll, getMemSuccessful;
 
-static void *getMemMalloc(intptr_t /*pool_id*/, size_t &bytes) {
+static void *getMemMalloc(intptr_t /*pool_id*/, size_t &bytes)
+{
     getMemAll++;
     void *p = malloc(bytes);
-    if (p) getMemSuccessful++;
+    if (p)
+        getMemSuccessful++;
     return p;
 }
 
-static int putMemFree(intptr_t /*pool_id*/, void *ptr, size_t /*bytes*/) {
+static int putMemFree(intptr_t /*pool_id*/, void *ptr, size_t /*bytes*/)
+{
     putMemAll++;
     free(ptr);
     return 0;
 }
 
-void TestPoolKeepTillDestroy() {
-    const int ITERS = 50 * 1024;
-    void *ptrs[2 * ITERS + 1];
+void TestPoolKeepTillDestroy()
+{
+    const int ITERS = 50*1024;
+    void *ptrs[2*ITERS+1];
     rml::MemPoolPolicy pol(getMemMalloc, putMemFree);
     rml::MemoryPool *pool;
 
     // 1st create default pool that returns memory back to callback,
     // then use keepMemTillDestroy policy
-    for (int keep = 0; keep < 2; keep++) {
+    for (int keep=0; keep<2; keep++) {
         getMemAll = putMemAll = 0;
-        if (keep) pol.keepAllMemory = 1;
+        if (keep)
+            pol.keepAllMemory = 1;
         pool_create_v1(0, &pol, &pool);
-        for (int i = 0; i < 2 * ITERS; i += 2) {
-            ptrs[i] = pool_malloc(pool, 7 * 1024);
-            ptrs[i + 1] = pool_malloc(pool, 10 * 1024);
+        for (int i=0; i<2*ITERS; i+=2) {
+            ptrs[i] = pool_malloc(pool, 7*1024);
+            ptrs[i+1] = pool_malloc(pool, 10*1024);
         }
-        ptrs[2 * ITERS] = pool_malloc(pool, 8 * 1024 * 1024);
+        ptrs[2*ITERS] = pool_malloc(pool, 8*1024*1024);
         REQUIRE(!putMemAll);
-        for (int i = 0; i < 2 * ITERS; i++) pool_free(pool, ptrs[i]);
-        pool_free(pool, ptrs[2 * ITERS]);
+        for (int i=0; i<2*ITERS; i++)
+            pool_free(pool, ptrs[i]);
+        pool_free(pool, ptrs[2*ITERS]);
         size_t totalPutMemCalls = putMemAll;
-        if (keep) REQUIRE(!putMemAll);
+        if (keep)
+            REQUIRE(!putMemAll);
         else {
             REQUIRE(putMemAll);
             putMemAll = 0;
         }
         size_t getCallsBefore = getMemAll;
-        void *p = pool_malloc(pool, 8 * 1024 * 1024);
+        void *p = pool_malloc(pool, 8*1024*1024);
         REQUIRE(p);
-        if (keep) REQUIRE_MESSAGE(getCallsBefore == getMemAll, "Must not lead to new getMem call");
+        if (keep)
+            REQUIRE_MESSAGE(getCallsBefore == getMemAll, "Must not lead to new getMem call");
         size_t putCallsBefore = putMemAll;
         bool ok = pool_reset(pool);
         REQUIRE(ok);
@@ -533,43 +572,47 @@ void TestPoolKeepTillDestroy() {
         totalPutMemCalls += putMemAll;
         REQUIRE_MESSAGE(getMemAll == totalPutMemCalls, "Memory leak detected.");
     }
+
 }
 
-static bool memEqual(char *buf, size_t size, int val) {
+static bool memEqual(char *buf, size_t size, int val)
+{
     bool memEq = true;
-    for (size_t k = 0; k < size; k++)
-        if (buf[k] != val) memEq = false;
+    for (size_t k=0; k<size; k++)
+        if (buf[k] != val)
+             memEq = false;
     return memEq;
 }
 
-void TestEntries() {
+void TestEntries()
+{
     const int SZ = 4;
     const int ALGN = 4;
-    size_t size[SZ] = {8, 8000, 9000, 100 * 1024};
-    size_t algn[ALGN] = {8, 64, 4 * 1024, 8 * 1024 * 1024};
+    size_t size[SZ] = {8, 8000, 9000, 100*1024};
+    size_t algn[ALGN] = {8, 64, 4*1024, 8*1024*1024};
 
     rml::MemPoolPolicy pol(getGranMem, putGranMem);
-    currGranularity = 1;// not check granularity in the test
+    currGranularity = 1; // not check granularity in the test
     rml::MemoryPool *pool;
 
     pool_create_v1(0, &pol, &pool);
-    for (int i = 0; i < SZ; i++)
-        for (int j = 0; j < ALGN; j++) {
-            char *p = (char *) pool_aligned_malloc(pool, size[i], algn[j]);
-            REQUIRE((p && 0 == ((uintptr_t) p & (algn[j] - 1))));
+    for (int i=0; i<SZ; i++)
+        for (int j=0; j<ALGN; j++) {
+            char *p = (char*)pool_aligned_malloc(pool, size[i], algn[j]);
+            REQUIRE((p && 0==((uintptr_t)p & (algn[j]-1))));
             memset(p, j, size[i]);
 
             size_t curr_algn = algn[rand() % ALGN];
             size_t curr_sz = size[rand() % SZ];
-            char *p1 = (char *) pool_aligned_realloc(pool, p, curr_sz, curr_algn);
-            REQUIRE((p1 && 0 == ((uintptr_t) p1 & (curr_algn - 1))));
+            char *p1 = (char*)pool_aligned_realloc(pool, p, curr_sz, curr_algn);
+            REQUIRE((p1 && 0==((uintptr_t)p1 & (curr_algn-1))));
             REQUIRE(memEqual(p1, utils::min(size[i], curr_sz), j));
 
-            memset(p1, j + 1, curr_sz);
+            memset(p1, j+1, curr_sz);
             size_t curr_sz1 = size[rand() % SZ];
-            char *p2 = (char *) pool_realloc(pool, p1, curr_sz1);
+            char *p2 = (char*)pool_realloc(pool, p1, curr_sz1);
             REQUIRE(p2);
-            REQUIRE(memEqual(p2, utils::min(curr_sz1, curr_sz), j + 1));
+            REQUIRE(memEqual(p2, utils::min(curr_sz1, curr_sz), j+1));
 
             pool_free(pool, p2);
         }
@@ -577,13 +620,14 @@ void TestEntries() {
     bool ok = pool_destroy(pool);
     REQUIRE(ok);
 
-    bool fail = rml::pool_destroy(NULL);
+    bool fail = rml::pool_destroy(nullptr);
     REQUIRE(!fail);
-    fail = rml::pool_reset(NULL);
+    fail = rml::pool_reset(nullptr);
     REQUIRE(!fail);
 }
 
-rml::MemoryPool *CreateUsablePool(size_t size) {
+rml::MemoryPool *CreateUsablePool(size_t size)
+{
     rml::MemoryPool *pool;
     rml::MemPoolPolicy okPolicy(getMemMalloc, putMemFree);
 
@@ -591,26 +635,26 @@ rml::MemoryPool *CreateUsablePool(size_t size) {
     rml::MemPoolError res = pool_create_v1(0, &okPolicy, &pool);
     if (res != rml::POOL_OK) {
         REQUIRE_MESSAGE((!getMemAll && !putMemAll), "No callbacks after fail.");
-        return NULL;
+        return nullptr;
     }
     void *o = pool_malloc(pool, size);
     if (!getMemSuccessful) {
         // no memory from callback, valid reason to leave
         REQUIRE_MESSAGE(!o, "The pool must be unusable.");
-        return NULL;
+        return nullptr;
     }
     REQUIRE_MESSAGE(o, "Created pool must be useful.");
     REQUIRE_MESSAGE((getMemSuccessful == 1 || getMemSuccessful == 5 || getMemAll > getMemSuccessful),
-                    "Multiple requests are allowed when unsuccessful request occurred or cannot search in "
-                    "bootstrap memory. ");
+           "Multiple requests are allowed when unsuccessful request occurred or cannot search in bootstrap memory. ");
     REQUIRE(!putMemAll);
     pool_free(pool, o);
 
     return pool;
 }
 
-void CheckPoolLeaks(size_t poolsAlwaysAvailable) {
-    const size_t MAX_POOLS = 16 * 1000;
+void CheckPoolLeaks(size_t poolsAlwaysAvailable)
+{
+    const size_t MAX_POOLS = 16*1000;
     const int ITERS = 20, CREATED_STABLE = 3;
     rml::MemoryPool *pools[MAX_POOLS];
     size_t created, maxCreated = MAX_POOLS;
@@ -618,15 +662,16 @@ void CheckPoolLeaks(size_t poolsAlwaysAvailable) {
 
     // expecting that for ITERS runs, max number of pools that can be created
     // can be stabilized and still stable CREATED_STABLE times
-    for (int j = 0; j < ITERS && maxNotChangedCnt < CREATED_STABLE; j++) {
-        for (created = 0; created < maxCreated; created++) {
+    for (int j=0; j<ITERS && maxNotChangedCnt<CREATED_STABLE; j++) {
+        for (created=0; created<maxCreated; created++) {
             rml::MemoryPool *p = CreateUsablePool(1024);
-            if (!p) break;
+            if (!p)
+                break;
             pools[created] = p;
         }
-        REQUIRE_MESSAGE(created >= poolsAlwaysAvailable,
-                        "Expect that the reasonable number of pools can be always created.");
-        for (size_t i = 0; i < created; i++) {
+        REQUIRE_MESSAGE(created>=poolsAlwaysAvailable,
+               "Expect that the reasonable number of pools can be always created.");
+        for (size_t i=0; i<created; i++) {
             bool ok = pool_destroy(pools[i]);
             REQUIRE(ok);
         }
@@ -639,20 +684,22 @@ void CheckPoolLeaks(size_t poolsAlwaysAvailable) {
     REQUIRE_MESSAGE(maxNotChangedCnt == CREATED_STABLE, "The number of created pools must be stabilized.");
 }
 
-void TestPoolCreation() {
+void TestPoolCreation()
+{
     putMemAll = getMemAll = getMemSuccessful = 0;
 
-    rml::MemPoolPolicy nullPolicy(NULL, putMemFree), emptyFreePolicy(getMemMalloc, NULL),
-            okPolicy(getMemMalloc, putMemFree);
+    rml::MemPoolPolicy nullPolicy(nullptr, putMemFree),
+        emptyFreePolicy(getMemMalloc, nullptr),
+        okPolicy(getMemMalloc, putMemFree);
     rml::MemoryPool *pool;
 
     rml::MemPoolError res = pool_create_v1(0, &nullPolicy, &pool);
-    REQUIRE_MESSAGE(res == rml::INVALID_POLICY, "pool with empty pAlloc can't be created");
+    REQUIRE_MESSAGE(res==rml::INVALID_POLICY, "pool with empty pAlloc can't be created");
     res = pool_create_v1(0, &emptyFreePolicy, &pool);
-    REQUIRE_MESSAGE(res == rml::INVALID_POLICY, "pool with empty pFree can't be created");
+    REQUIRE_MESSAGE(res==rml::INVALID_POLICY, "pool with empty pFree can't be created");
     REQUIRE_MESSAGE((!putMemAll && !getMemAll), "no callback calls are expected");
     res = pool_create_v1(0, &okPolicy, &pool);
-    REQUIRE(res == rml::POOL_OK);
+    REQUIRE(res==rml::POOL_OK);
     bool ok = pool_destroy(pool);
     REQUIRE(ok);
     REQUIRE_MESSAGE(putMemAll == getMemSuccessful, "no leaks after pool_destroy");
@@ -669,70 +716,73 @@ struct AllocatedObject {
     rml::MemoryPool *pool;
 };
 
-const size_t BUF_SIZE = 1024 * 1024;
+const size_t BUF_SIZE = 1024*1024;
 
 class PoolIdentityCheck : utils::NoAssign {
-    rml::MemoryPool **const pools;
-    AllocatedObject **const objs;
-
+    rml::MemoryPool** const pools;
+    AllocatedObject** const objs;
 public:
-    PoolIdentityCheck(rml::MemoryPool **p, AllocatedObject **o) : pools(p), objs(o) {}
+    PoolIdentityCheck(rml::MemoryPool** p, AllocatedObject** o) : pools(p), objs(o) {}
     void operator()(int id) const {
-        objs[id] = (AllocatedObject *) pool_malloc(pools[id], BUF_SIZE / 2);
+        objs[id] = (AllocatedObject*)pool_malloc(pools[id], BUF_SIZE/2);
         REQUIRE(objs[id]);
         rml::MemoryPool *act_pool = rml::pool_identify(objs[id]);
         REQUIRE(act_pool == pools[id]);
 
-        for (size_t total = 0; total < 2 * BUF_SIZE; total += 256) {
-            AllocatedObject *o = (AllocatedObject *) pool_malloc(pools[id], 256);
+        for (size_t total=0; total<2*BUF_SIZE; total+=256) {
+            AllocatedObject *o = (AllocatedObject*)pool_malloc(pools[id], 256);
             REQUIRE(o);
             act_pool = rml::pool_identify(o);
             REQUIRE(act_pool == pools[id]);
             pool_free(act_pool, o);
         }
-        if (id & 1) {// make every second returned object "small"
+        if( id&1 ) { // make every second returned object "small"
             pool_free(act_pool, objs[id]);
-            objs[id] = (AllocatedObject *) pool_malloc(pools[id], 16);
+            objs[id] = (AllocatedObject*)pool_malloc(pools[id], 16);
             REQUIRE(objs[id]);
         }
         objs[id]->pool = act_pool;
     }
 };
 
-void TestPoolDetection() {
+void TestPoolDetection()
+{
     const int POOLS = 4;
-    rml::MemPoolPolicy pol(fixedBufGetMem, NULL, 0, /*fixedSizePool=*/true,
+    rml::MemPoolPolicy pol(fixedBufGetMem, nullptr, 0, /*fixedSizePool=*/true,
                            /*keepMemTillDestroy=*/false);
     rml::MemoryPool *pools[POOLS];
-    FixedPoolHead<BUF_SIZE * POOLS> head[POOLS];
+    FixedPoolHead<BUF_SIZE*POOLS> head[POOLS];
     AllocatedObject *objs[POOLS];
 
-    for (int i = 0; i < POOLS; i++) pool_create_v1((intptr_t)(head + i), &pol, &pools[i]);
+    for (int i=0; i<POOLS; i++)
+        pool_create_v1((intptr_t)(head+i), &pol, &pools[i]);
     // if object somehow released to different pools, subsequent allocation
     // from affected pools became impossible
-    for (int k = 0; k < 10; k++) {
+    for (int k=0; k<10; k++) {
         PoolIdentityCheck check(pools, objs);
-        if (k & 1) utils::NativeParallelFor(POOLS, check);
+        if( k&1 )
+            utils::NativeParallelFor( POOLS, check);
         else
-            for (int i = 0; i < POOLS; i++) check(i);
+            for (int i=0; i<POOLS; i++) check(i);
 
-        for (int i = 0; i < POOLS; i++) {
+        for (int i=0; i<POOLS; i++) {
             rml::MemoryPool *p = rml::pool_identify(objs[i]);
             REQUIRE(p == objs[i]->pool);
             pool_free(p, objs[i]);
         }
     }
-    for (int i = 0; i < POOLS; i++) {
+    for (int i=0; i<POOLS; i++) {
         bool ok = pool_destroy(pools[i]);
         REQUIRE(ok);
     }
 }
 
-void TestLazyBootstrap() {
+void TestLazyBootstrap()
+{
     rml::MemPoolPolicy pol(getMemMalloc, putMemFree);
-    const size_t sizes[] = {8, 9 * 1024, 0};
+    const size_t sizes[] = {8, 9*1024, 0};
 
-    for (int i = 0; sizes[i]; i++) {
+    for (int i=0; sizes[i]; i++) {
         rml::MemoryPool *pool = CreateUsablePool(sizes[i]);
         bool ok = pool_destroy(pool);
         REQUIRE(ok);
@@ -740,21 +790,19 @@ void TestLazyBootstrap() {
     }
 }
 
-class NoLeakOnDestroyRun : utils::NoAssign {
-    rml::MemoryPool *pool;
+class NoLeakOnDestroyRun: utils::NoAssign {
+    rml::MemoryPool      *pool;
     utils::SpinBarrier *barrier;
-
 public:
     NoLeakOnDestroyRun(rml::MemoryPool *p, utils::SpinBarrier *b) : pool(p), barrier(b) {}
     void operator()(int id) const {
-        void *p = pool_malloc(pool, id % 2 ? 8 : 9000);
+        void *p = pool_malloc(pool, id%2? 8 : 9000);
         REQUIRE((p && liveRegions.load(std::memory_order_relaxed)));
         barrier->wait();
         if (!id) {
             bool ok = pool_destroy(pool);
             REQUIRE(ok);
-            REQUIRE_MESSAGE(!liveRegions.load(std::memory_order_relaxed),
-                            "Expected all regions were released.");
+            REQUIRE_MESSAGE(!liveRegions.load(std::memory_order_relaxed), "Expected all regions were released.");
         }
         // other threads must wait till pool destruction,
         // to not call thread destruction cleanup before this
@@ -762,9 +810,10 @@ class NoLeakOnDestroyRun : utils::NoAssign {
     }
 };
 
-void TestNoLeakOnDestroy() {
+void TestNoLeakOnDestroy()
+{
     liveRegions.store(0, std::memory_order_release);
-    for (int p = utils::MinThread; p <= utils::MaxThread; p++) {
+    for (int p=utils::MinThread; p<=utils::MaxThread; p++) {
         rml::MemPoolPolicy pol(getMallocMem, putMallocMem);
         utils::SpinBarrier barrier(p);
         rml::MemoryPool *pool;
@@ -774,8 +823,9 @@ void TestNoLeakOnDestroy() {
     }
 }
 
-static int putMallocMemError(intptr_t /*pool_id*/, void *ptr, size_t bytes) {
-    MallocPoolHeader *hdr = (MallocPoolHeader *) ptr - 1;
+static int putMallocMemError(intptr_t /*pool_id*/, void *ptr, size_t bytes)
+{
+    MallocPoolHeader *hdr = (MallocPoolHeader*)ptr-1;
     REQUIRE_MESSAGE(bytes == hdr->userSize, "Invalid size in pool callback.");
     free(hdr->rawPtr);
 
@@ -784,15 +834,16 @@ static int putMallocMemError(intptr_t /*pool_id*/, void *ptr, size_t bytes) {
     return -1;
 }
 
-void TestDestroyFailed() {
+void TestDestroyFailed()
+{
     rml::MemPoolPolicy pol(getMallocMem, putMallocMemError);
     rml::MemoryPool *pool;
     pool_create_v1(0, &pol, &pool);
     void *ptr = pool_malloc(pool, 16);
     REQUIRE(ptr);
     bool fail = pool_destroy(pool);
-    REQUIRE_MESSAGE(fail == false, "putMemPolicyError callback returns error, "
-                                   "expect pool_destroy() failure");
+    REQUIRE_MESSAGE(fail==false, "putMemPolicyError callback returns error, "
+           "expect pool_destroy() failure");
 }
 
 void TestPoolMSize() {
@@ -800,18 +851,18 @@ void TestPoolMSize() {
 
     const int SZ = 10;
     // Original allocation requests, random numbers from small to large
-    size_t requestedSz[SZ] = {8, 16, 500, 1000, 2000, 4000, 8000, 1024 * 1024, 4242 + 4242, 8484 + 8484};
+    size_t requestedSz[SZ] = {8, 16, 500, 1000, 2000, 4000, 8000, 1024*1024, 4242+4242, 8484+8484};
 
     // Unlike large objects, small objects do not store its original size along with the object itself
     // On Power architecture TLS bins are divided differently.
     size_t allocatedSz[SZ] =
 #if __powerpc64__ || __ppc64__ || __bgp__
-            {8, 16, 512, 1024, 2688, 5376, 8064, 1024 * 1024, 4242 + 4242, 8484 + 8484};
+        {8, 16, 512, 1024, 2688, 5376, 8064, 1024*1024, 4242+4242, 8484+8484};
 #else
-            {8, 16, 512, 1024, 2688, 4032, 8128, 1024 * 1024, 4242 + 4242, 8484 + 8484};
+        {8, 16, 512, 1024, 2688, 4032, 8128, 1024*1024, 4242+4242, 8484+8484};
 #endif
     for (int i = 0; i < SZ; i++) {
-        void *obj = pool_malloc(pool, requestedSz[i]);
+        void* obj = pool_malloc(pool, requestedSz[i]);
         size_t objSize = pool_msize(pool, obj);
         REQUIRE_MESSAGE(objSize == allocatedSz[i], "pool_msize returned the wrong value");
         pool_free(pool, obj);
@@ -821,41 +872,69 @@ void TestPoolMSize() {
 }
 
 //! \brief \ref error_guessing
-TEST_CASE("Too small buffer") { TestTooSmallBuffer(); }
+TEST_CASE("Too small buffer") {
+    TestTooSmallBuffer();
+}
 
 //! \brief \ref error_guessing
-TEST_CASE("Pool reset") { TestPoolReset(); }
-TEST_CASE("Shared pool") { TestSharedPool(); }
+TEST_CASE("Pool reset") {
+    TestPoolReset();
+}
+TEST_CASE("Shared pool") {
+    TestSharedPool();
+}
 
 //! \brief \ref error_guessing
-TEST_CASE("Cross thread pools") { TestCrossThreadPools(); }
+TEST_CASE("Cross thread pools") {
+    TestCrossThreadPools();
+}
 
 //! \brief \ref interface
-TEST_CASE("Fixed buffer pool") { TestFixedBufferPool(); }
+TEST_CASE("Fixed buffer pool") {
+    TestFixedBufferPool();
+}
 
 //! \brief \ref interface
-TEST_CASE("Pool granularity") { TestPoolGranularity(); }
+TEST_CASE("Pool granularity") {
+    TestPoolGranularity();
+}
 
 //! \brief \ref error_guessing
-TEST_CASE("Keep pool till destroy") { TestPoolKeepTillDestroy(); }
+TEST_CASE("Keep pool till destroy") {
+    TestPoolKeepTillDestroy();
+}
 
 //! \brief \ref error_guessing
-TEST_CASE("Entries") { TestEntries(); }
+TEST_CASE("Entries") {
+    TestEntries();
+}
 
 //! \brief \ref interface
-TEST_CASE("Pool creation") { TestPoolCreation(); }
+TEST_CASE("Pool creation") {
+    TestPoolCreation();
+}
 
 //! \brief \ref error_guessing
-TEST_CASE("Pool detection") { TestPoolDetection(); }
+TEST_CASE("Pool detection") {
+    TestPoolDetection();
+}
 
 //! \brief \ref error_guessing
-TEST_CASE("Lazy bootstrap") { TestLazyBootstrap(); }
+TEST_CASE("Lazy bootstrap") {
+    TestLazyBootstrap();
+}
 
 //! \brief \ref error_guessing
-TEST_CASE("No leak on destroy") { TestNoLeakOnDestroy(); }
+TEST_CASE("No leak on destroy") {
+    TestNoLeakOnDestroy();
+}
 
 //! \brief \ref error_guessing
-TEST_CASE("Destroy failed") { TestDestroyFailed(); }
+TEST_CASE("Destroy failed") {
+    TestDestroyFailed();
+}
 
 //! \brief \ref interface
-TEST_CASE("Pool msize") { TestPoolMSize(); }
+TEST_CASE("Pool msize") {
+    TestPoolMSize();
+}
diff --git a/external/tbb/test/tbbmalloc/test_malloc_regression.cpp b/external/tbb/test/tbbmalloc/test_malloc_regression.cpp
index 50e01d8d..532f85e4 100644
--- a/external/tbb/test/tbbmalloc/test_malloc_regression.cpp
+++ b/external/tbb/test/tbbmalloc/test_malloc_regression.cpp
@@ -16,10 +16,10 @@
 
 #define __TBB_NO_IMPLICIT_LINKAGE 1
 
-#include "common/memory_usage.h"
 #include "common/test.h"
 #include "common/utils.h"
 #include "common/utils_report.h"
+#include "common/memory_usage.h"
 #include "oneapi/tbb/detail/_utils.h"
 #include "tbb/scalable_allocator.h"
 #include "thread"
@@ -29,12 +29,13 @@ class minimalAllocFree {
 public:
     void operator()(int size) const {
         tbb::scalable_allocator<char> a;
-        char* str = a.allocate(size);
-        a.deallocate(str, size);
+        char* str = a.allocate( size );
+        a.deallocate( str, size );
     }
 };
 
-template <typename Body, typename Arg>
+
+template<typename Body, typename Arg>
 void RunThread(const Body& body, const Arg& arg) {
     std::thread job(body, arg);
     job.join();
@@ -50,17 +51,18 @@ bool TestBootstrapLeak() {
        should be reserved for the test body. 62 blocks left, each can serve 15 objects of 1024 bytes.
     */
     const int alloc_size = 1024;
-    const int take_out_count = 15 * 62;
+    const int take_out_count = 15*62;
 
     tbb::scalable_allocator<char> a;
     char* array[take_out_count];
-    for (int i = 0; i < take_out_count; ++i) array[i] = a.allocate(alloc_size);
+    for( int i=0; i<take_out_count; ++i )
+        array[i] = a.allocate( alloc_size );
 
-    RunThread(minimalAllocFree(), alloc_size);// for threading library to take some memory
+    RunThread( minimalAllocFree(), alloc_size ); // for threading library to take some memory
     size_t memory_in_use = utils::GetMemoryUsage();
     // Wait for memory usage data to "stabilize". The test number (1000) has nothing underneath.
-    for (int i = 0; i < 1000; i++) {
-        if (utils::GetMemoryUsage() != memory_in_use) {
+    for( int i=0; i<1000; i++) {
+        if( utils::GetMemoryUsage()!=memory_in_use ) {
             memory_in_use = utils::GetMemoryUsage();
             i = -1;
         }
@@ -71,18 +73,21 @@ bool TestBootstrapLeak() {
     const int num_thread_runs = 200;
     for (;;) {
         memory_in_use = utils::GetMemoryUsage();
-        for (int i = 0; i < num_thread_runs; ++i) RunThread(minimalAllocFree(), alloc_size);
+        for( int i=0; i<num_thread_runs; ++i )
+            RunThread( minimalAllocFree(), alloc_size );
 
         memory_leak = utils::GetMemoryUsage() - memory_in_use;
-        if (!memory_leak) break;
+        if (!memory_leak)
+            break;
     }
-    if (memory_leak > 0) {// possibly too strong?
-        REPORT("Error: memory leak of up to %ld bytes\n", static_cast<long>(memory_leak));
+    if( memory_leak>0 ) { // possibly too strong?
+        REPORT( "Error: memory leak of up to %ld bytes\n", static_cast<long>(memory_leak));
     }
 
-    for (int i = 0; i < take_out_count; ++i) a.deallocate(array[i], alloc_size);
+    for( int i=0; i<take_out_count; ++i )
+        a.deallocate( array[i], alloc_size );
 
-    return memory_leak <= 0;
+    return memory_leak<=0;
 }
 
 /*--------------------------------------------------------------------*/
@@ -91,19 +96,18 @@ bool TestBootstrapLeak() {
 bool TestReallocMsize(size_t startSz) {
     bool passed = true;
 
-    char* buf = (char*) scalable_malloc(startSz);
+    char *buf = (char*)scalable_malloc(startSz);
     REQUIRE_MESSAGE(buf, "");
     size_t realSz = scalable_msize(buf);
-    REQUIRE_MESSAGE(realSz >= startSz, "scalable_msize must be not less then allocated size");
-    memset(buf, 'a', realSz - 1);
-    buf[realSz - 1] = 0;
-    char* buf1 = (char*) scalable_realloc(buf, 2 * realSz);
+    REQUIRE_MESSAGE(realSz>=startSz, "scalable_msize must be not less then allocated size");
+    memset(buf, 'a', realSz-1);
+    buf[realSz-1] = 0;
+    char *buf1 = (char*)scalable_realloc(buf, 2*realSz);
     REQUIRE_MESSAGE(buf1, "");
-    REQUIRE_MESSAGE((scalable_msize(buf1) >= 2 * realSz),
-                    "scalable_msize must be not less then allocated size");
-    buf1[2 * realSz - 1] = 0;
-    if (strspn(buf1, "a") < realSz - 1) {
-        REPORT("Error: data broken for %d Bytes object.\n", startSz);
+    REQUIRE_MESSAGE((scalable_msize(buf1)>=2*realSz), "scalable_msize must be not less then allocated size");
+    buf1[2*realSz-1] = 0;
+    if ( strspn(buf1, "a") < realSz-1 ) {
+        REPORT( "Error: data broken for %d Bytes object.\n", startSz);
         passed = false;
     }
     scalable_free(buf1);
@@ -113,43 +117,44 @@ bool TestReallocMsize(size_t startSz) {
 
 // regression test against incorrect work of msize/realloc
 // for aligned objects
-void TestAlignedMsize() {
+void TestAlignedMsize()
+{
     const int NUM = 4;
-    char* p[NUM];
+    char *p[NUM];
     size_t objSizes[NUM];
-    size_t allocSz[] = {4, 8, 512, 2 * 1024, 4 * 1024, 8 * 1024, 16 * 1024, 0};
-    size_t align[] = {8, 512, 2 * 1024, 4 * 1024, 8 * 1024, 16 * 1024, 0};
+    size_t allocSz[] = {4, 8, 512, 2*1024, 4*1024, 8*1024, 16*1024, 0};
+    size_t align[] = {8, 512, 2*1024, 4*1024, 8*1024, 16*1024, 0};
 
-    for (int a = 0; align[a]; a++)
-        for (int s = 0; allocSz[s]; s++) {
-            for (int i = 0; i < NUM; i++) {
-                p[i] = (char*) scalable_aligned_malloc(allocSz[s], align[a]);
+    for (int a=0; align[a]; a++)
+        for (int s=0; allocSz[s]; s++) {
+            for (int i=0; i<NUM; i++) {
+                p[i] = (char*)scalable_aligned_malloc(allocSz[s], align[a]);
                 CHECK_FAST(tbb::detail::is_aligned(p[i], align[a]));
             }
 
-            for (int i = 0; i < NUM; i++) {
+            for (int i=0; i<NUM; i++) {
                 objSizes[i] = scalable_msize(p[i]);
-                CHECK_FAST_MESSAGE(objSizes[i] >= allocSz[s],
-                                   "allocated size must be not less than requested");
+                CHECK_FAST_MESSAGE(objSizes[i] >= allocSz[s], "allocated size must be not less than requested");
                 memset(p[i], i, objSizes[i]);
             }
-            for (int i = 0; i < NUM; i++) {
-                for (unsigned j = 0; j < objSizes[i]; j++)
-                    CHECK_FAST_MESSAGE((((char*) p[i])[j] == i), "Error: data broken");
+            for (int i=0; i<NUM; i++) {
+                for (unsigned j=0; j<objSizes[i]; j++)
+                    CHECK_FAST_MESSAGE((((char*)p[i])[j] == i), "Error: data broken");
             }
 
-            for (int i = 0; i < NUM; i++) {
-                p[i] = (char*) scalable_aligned_realloc(p[i], 2 * allocSz[s], align[a]);
+            for (int i=0; i<NUM; i++) {
+                p[i] = (char*)scalable_aligned_realloc(p[i], 2*allocSz[s], align[a]);
                 CHECK(tbb::detail::is_aligned(p[i], align[a]));
-                memset((char*) p[i] + allocSz[s], i + 1, allocSz[s]);
+                memset((char*)p[i]+allocSz[s], i+1, allocSz[s]);
             }
-            for (int i = 0; i < NUM; i++) {
-                for (unsigned j = 0; j < allocSz[s]; j++)
-                    CHECK_FAST_MESSAGE((((char*) p[i])[j] == i), "Error: data broken");
-                for (size_t j = allocSz[s]; j < 2 * allocSz[s]; j++)
-                    CHECK_FAST_MESSAGE((((char*) p[i])[j] == i + 1), "Error: data broken");
+            for (int i=0; i<NUM; i++) {
+                for (unsigned j=0; j<allocSz[s]; j++)
+                    CHECK_FAST_MESSAGE((((char*)p[i])[j] == i), "Error: data broken");
+                for (size_t j=allocSz[s]; j<2*allocSz[s]; j++)
+                    CHECK_FAST_MESSAGE((((char*)p[i])[j] == i+1), "Error: data broken");
             }
-            for (int i = 0; i < NUM; i++) scalable_free(p[i]);
+            for (int i=0; i<NUM; i++)
+                scalable_free(p[i]);
         }
 }
 
@@ -160,23 +165,29 @@ TEST_CASE("Memory leaks test is not applicable under ASAN\n" * doctest::skip(tru
 //! \brief \ref error_guessing
 TEST_CASE("testing leaks") {
     // Check whether memory usage data can be obtained; if not, skip test_bootstrap_leak.
-    if (utils::GetMemoryUsage()) { REQUIRE_MESSAGE(TestBootstrapLeak(), "Test failed"); }
+    if (utils::GetMemoryUsage()) {
+        REQUIRE_MESSAGE(TestBootstrapLeak(), "Test failed");
+    }
 }
-#endif// __TBB_USE_ADDRESS_SANITIZER
+#endif // __TBB_USE_ADDRESS_SANITIZER
 
 //! \brief \ref error_guessing
 TEST_CASE("testing realloc mem size") {
     bool passed = true;
     // TestReallocMsize runs for each power of 2 and each Fibonacci number below 64K
-    for (size_t a = 1, b = 1, sum = 1; sum <= 64 * 1024;) {
+    for (size_t a=1, b=1, sum=1; sum<=64*1024; ) {
         passed &= TestReallocMsize(sum);
         a = b;
         b = sum;
-        sum = a + b;
+        sum = a+b;
+    }
+    for (size_t a=2; a<=64*1024; a*=2) {
+        passed &= TestReallocMsize(a);
     }
-    for (size_t a = 2; a <= 64 * 1024; a *= 2) { passed &= TestReallocMsize(a); }
-    REQUIRE_MESSAGE(passed, "Test failed");
+    REQUIRE_MESSAGE( passed, "Test failed" );
 }
 
 //! \brief \ref error_guessing
-TEST_CASE("testing memory align") { TestAlignedMsize(); }
+TEST_CASE("testing memory align") {
+    TestAlignedMsize();
+}
diff --git a/external/tbb/test/tbbmalloc/test_malloc_shutdown_hang.cpp b/external/tbb/test/tbbmalloc/test_malloc_shutdown_hang.cpp
index 4f94e501..8b46afa6 100644
--- a/external/tbb/test/tbbmalloc/test_malloc_shutdown_hang.cpp
+++ b/external/tbb/test/tbbmalloc/test_malloc_shutdown_hang.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -21,13 +21,16 @@
 #include "common/utils_report.h"
 
 #include "tbb/global_control.h"
-#include "tbb/scalable_allocator.h"
 #include "tbb/task_arena.h"
+#include "tbb/scalable_allocator.h"
+
 
 // Lets slow down the main thread on exit
 static constexpr int MAX_DELAY = 5;
 struct GlobalObject {
-    ~GlobalObject() { utils::Sleep(rand() % MAX_DELAY); }
+    ~GlobalObject() {
+        utils::Sleep(rand( ) % MAX_DELAY);
+    }
 } go;
 
 void allocatorRandomThrashing() {
@@ -35,14 +38,16 @@ void allocatorRandomThrashing() {
     const int MAX_ITER = 10000;
     const int MAX_ALLOC = 10 * 1024 * 1024;
 
-    void* arr[ARRAY_SIZE] = {0};
+    void *arr[ARRAY_SIZE] = {nullptr};
     for (int i = 0; i < rand() % MAX_ITER; ++i) {
         // Random allocation size for random arrays
-        for (int j = 0; j < rand() % ARRAY_SIZE; ++j) { arr[j] = scalable_malloc(rand() % MAX_ALLOC); }
+        for (int j = 0; j < rand() % ARRAY_SIZE; ++j) {
+            arr[j] = scalable_malloc(rand() % MAX_ALLOC);
+        }
         // Deallocate everything
         for (int j = 0; j < ARRAY_SIZE; ++j) {
             scalable_free(arr[j]);
-            arr[j] = NULL;
+            arr[j] = nullptr;
         }
     }
 }
@@ -50,24 +55,28 @@ void allocatorRandomThrashing() {
 void hangOnExitReproducer() {
     const int P = tbb::global_control::max_allowed_parallelism;
     tbb::task_arena test_arena;
-    for (int i = 0; i < P - 1; i++) { test_arena.enqueue(allocatorRandomThrashing); }
+    for (int i = 0; i < P-1; i++) {
+        test_arena.enqueue(allocatorRandomThrashing);
+    }
 }
 
 #if (_WIN32 || _WIN64) && !__TBB_WIN8UI_SUPPORT
-#include <process.h>// _spawnl
-void processSpawn(const char* self) { _spawnl(_P_WAIT, self, self, "1", NULL); }
+#include <process.h> // _spawnl
+void processSpawn(const char* self) {
+    _spawnl(_P_WAIT, self, self, "1", nullptr);
+}
 #elif __unix__ || __APPLE__
-#include <sys/wait.h>// waitpid
-#include <unistd.h>  // fork/exec
+#include <unistd.h> // fork/exec
+#include <sys/wait.h> // waitpid
 void processSpawn(const char* self) {
     pid_t pid = fork();
     if (pid == -1) {
         REPORT("ERROR: fork failed.\n");
-    } else if (pid == 0) {// child
-        execl(self, self, "1", NULL);
+    } else if (pid == 0) { // child
+        execl(self, self, "1", nullptr);
         REPORT("ERROR: exec never returns\n");
         exit(1);
-    } else {// parent
+    } else { // parent
         int status;
         waitpid(pid, &status, 0);
     }
@@ -81,30 +90,34 @@ void processSpawn(const char* /*self*/) {
 #endif
 
 #if _MSC_VER && !__INTEL_COMPILER
-#pragma warning(push)
-#pragma warning(disable : 4702) /* Unreachable code */
+#pragma warning (push)
+#pragma warning (disable: 4702)  /* Unreachable code */
 #endif
 
 //! \brief \ref error_guessing
 TEST_CASE("testing shutdown hang") {
     hangOnExitReproducer();
-    CHECK(true);// just to notify that test has assertions
+    CHECK(true); // just to notify that test has assertions
 }
 
-DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(4007)// 'function' : must be 'attribute' - see issue #182
+DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(4007) // 'function' : must be 'attribute' - see issue #182
 DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(4447)
 int main(int argc, char* argv[]) {
     // Executed from child processes
-    if (argc == 2 && strcmp(argv[1], "1") == 0) { return doctest::Context(argc, argv).run(); }
+    if (argc == 2 && strcmp(argv[1],"1") == 0) {
+        return doctest::Context(argc, argv).run();
+    }
 
     // The number of executions is a tradeoff
     // between execution time and NBTS statistics
     const int EXEC_TIMES = 100;
     const char* self = argv[0];
-    for (int i = 0; i < EXEC_TIMES; i++) { processSpawn(self); }
+    for (int i = 0; i < EXEC_TIMES; i++) {
+        processSpawn(self);
+    }
 
 #if _MSC_VER && !__INTEL_COMPILER
-#pragma warning(pop)
+#pragma warning (pop)
 #endif
 }
 DOCTEST_MSVC_SUPPRESS_WARNING_POP
diff --git a/external/tbb/test/tbbmalloc/test_malloc_used_by_lib.cpp b/external/tbb/test/tbbmalloc/test_malloc_used_by_lib.cpp
index f194ce52..dccddd7e 100644
--- a/external/tbb/test/tbbmalloc/test_malloc_used_by_lib.cpp
+++ b/external/tbb/test/tbbmalloc/test_malloc_used_by_lib.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -18,55 +18,63 @@
 
 #if _USRDLL
 
+#include <stdlib.h>
 #include "common/config.h"
 #include "common/utils_assert.h"
 #include "tbb/scalable_allocator.h"
-#include <stdlib.h>
 
-#if _WIN32 || _WIN64
 extern "C" {
-extern __declspec(dllexport) void callDll();
-}
+#if _WIN32||_WIN64
+    extern __declspec(dllexport) void callDll();
+#else
+    extern __TBB_EXPORT void callDll();
 #endif
+}
 
-extern "C" void callDll() {
+extern "C" void callDll()
+{
     static const int NUM = 20;
     void *ptrs[NUM];
 
-    for (int i = 0; i < NUM; i++) {
-        ptrs[i] = scalable_malloc(i * 1024);
-        ASSERT(ptrs[i], NULL);
+    for (int i=0; i<NUM; i++) {
+        ptrs[i] = scalable_malloc(i*1024);
+        ASSERT(ptrs[i], nullptr);
     }
-    for (int i = 0; i < NUM; i++) scalable_free(ptrs[i]);
+    for (int i=0; i<NUM; i++)
+        scalable_free(ptrs[i]);
 }
 
 int main() {}
 
-#else// _USRDLL
+
+#else // _USRDLL
 #include "common/config.h"
 // FIXME: fix the test to support Windows* 8 Store Apps mode.
 // For sanitizers, it fails because RUNPATH is lost: https://github.com/google/sanitizers/issues/1219
-#if !__TBB_WIN8UI_SUPPORT && !(__GNUC__ && __GNUC__ < 10 && __TBB_USE_SANITIZERS)                            \
-        && __TBB_DYNAMIC_LOAD_ENABLED
+#if !__TBB_WIN8UI_SUPPORT && !(__GNUC__ && __GNUC__ < 10 && __TBB_USE_SANITIZERS) && __TBB_DYNAMIC_LOAD_ENABLED
 
 #define __TBB_NO_IMPLICIT_LINKAGE 1
-#include "common/memory_usage.h"
-#include "common/spin_barrier.h"
 #include "common/test.h"
 #include "common/utils.h"
 #include "common/utils_dynamic_libs.h"
 #include "common/utils_report.h"
+#include "common/memory_usage.h"
+#include "common/spin_barrier.h"
+
 
 class UseDll {
     utils::FunctionAddress run;
-
 public:
-    UseDll(utils::FunctionAddress runPtr) : run(runPtr) {}
-    void operator()(std::size_t /*id*/) const { (*run)(); }
+    UseDll(utils::FunctionAddress runPtr) : run(runPtr) { }
+    void operator()( std::size_t /*id*/ ) const {
+        (*run)();
+    }
 };
 
-void LoadThreadsUnload() {
-    utils::LIBRARY_HANDLE lib = utils::OpenLibrary(TEST_LIBRARY_NAME("_test_malloc_used_by_lib"));
+void LoadThreadsUnload()
+{
+    utils::LIBRARY_HANDLE lib =
+        utils::OpenLibrary(TEST_LIBRARY_NAME("_test_malloc_used_by_lib"));
     ASSERT(lib, "Can't load " TEST_LIBRARY_NAME("_test_malloc_used_by_lib"));
     utils::NativeParallelFor(std::size_t(4), UseDll(utils::GetAddress(lib, "callDll")));
     utils::CloseLibrary(lib);
@@ -75,7 +83,9 @@ void LoadThreadsUnload() {
 struct UnloadCallback {
     utils::LIBRARY_HANDLE lib;
 
-    void operator()() const { utils::CloseLibrary(lib); }
+    void operator() () const {
+        utils::CloseLibrary(lib);
+    }
 };
 
 struct RunWithLoad {
@@ -85,7 +95,8 @@ struct RunWithLoad {
 
     void operator()(std::size_t id) const {
         if (!id) {
-            utils::LIBRARY_HANDLE lib = utils::OpenLibrary(TEST_LIBRARY_NAME("_test_malloc_used_by_lib"));
+            utils::LIBRARY_HANDLE lib =
+                utils::OpenLibrary(TEST_LIBRARY_NAME("_test_malloc_used_by_lib"));
             ASSERT(lib, "Can't load " TEST_LIBRARY_NAME("_test_malloc_used_by_lib"));
             runPtr = utils::GetAddress(lib, "callDll");
             unloadCallback.lib = lib;
@@ -96,7 +107,7 @@ struct RunWithLoad {
     }
 };
 
-utils::SpinBarrier RunWithLoad::startBarr {}, RunWithLoad::endBarr {};
+utils::SpinBarrier RunWithLoad::startBarr{}, RunWithLoad::endBarr{};
 UnloadCallback RunWithLoad::unloadCallback;
 utils::FunctionAddress RunWithLoad::runPtr;
 
@@ -105,7 +116,7 @@ void ThreadsLoadUnload() {
 
     RunWithLoad::startBarr.initialize(threads);
     RunWithLoad::endBarr.initialize(threads);
-    RunWithLoad body {};
+    RunWithLoad body{};
     utils::NativeParallelFor(threads, body);
 }
 
@@ -127,12 +138,12 @@ TEST_CASE("use test as lib") {
                 ThreadsLoadUnload();
             }
             memory_leak = utils::GetMemoryUsage() - memory_in_use;
-            if (memory_leak == 0)// possibly too strong?
+            if (memory_leak == 0)  // possibly too strong?
                 break;
         }
-        if (i == ITERS) {
+        if(i==ITERS) {
             // not stabilized, could be leak
-            REPORT("Error: memory leak of up to %ld bytes\n", static_cast<long>(memory_leak));
+            REPORT( "Error: memory leak of up to %ld bytes\n", static_cast<long>(memory_leak));
             WARN(false);
         }
     }
diff --git a/external/tbb/test/tbbmalloc/test_malloc_whitebox.cpp b/external/tbb/test/tbbmalloc/test_malloc_whitebox.cpp
index 70053024..9de151e0 100644
--- a/external/tbb/test/tbbmalloc/test_malloc_whitebox.cpp
+++ b/external/tbb/test/tbbmalloc/test_malloc_whitebox.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2024 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -36,24 +36,23 @@
 
 #include "common/test.h"
 
-#include "common/spin_barrier.h"
 #include "common/utils.h"
 #include "common/utils_assert.h"
 #include "common/utils_env.h"
+#include "common/spin_barrier.h"
 
 #include "oneapi/tbb/detail/_machine.h"
 
-#define __TBB_MALLOC_WHITEBOX_TEST 1// to get access to allocator internals
+#define __TBB_MALLOC_WHITEBOX_TEST 1 // to get access to allocator internals
 // help trigger rare race condition
-#define WhiteboxTestingYield()                                                                               \
-    (tbb::detail::yield(), tbb::detail::yield(), tbb::detail::yield(), tbb::detail::yield())
+#define WhiteboxTestingYield() (tbb::detail::yield(), tbb::detail::yield(), tbb::detail::yield(), tbb::detail::yield())
 
 #if __INTEL_COMPILER && __TBB_MIC_OFFLOAD
 // 2571 is variable has not been declared with compatible "target" attribute
 // 3218 is class/struct may fail when offloaded because this field is misaligned
 //         or contains data that is misaligned
-#pragma warning(push)
-#pragma warning(disable : 2571 3218)
+    #pragma warning(push)
+    #pragma warning(disable:2571 3218)
 #endif
 #define protected public
 #define private public
@@ -61,15 +60,15 @@
 #undef protected
 #undef private
 #if __INTEL_COMPILER && __TBB_MIC_OFFLOAD
-#pragma warning(pop)
+    #pragma warning(pop)
 #endif
 #include "../../src/tbbmalloc/backend.cpp"
 #include "../../src/tbbmalloc/backref.cpp"
 
 namespace tbbmalloc_whitebox {
-    std::atomic<size_t> locGetProcessed {};
-    std::atomic<size_t> locPutProcessed {};
-}// namespace tbbmalloc_whitebox
+    std::atomic<size_t> locGetProcessed{};
+    std::atomic<size_t> locPutProcessed{};
+}
 #include "../../src/tbbmalloc/large_objects.cpp"
 #include "../../src/tbbmalloc/tbbmalloc.cpp"
 
@@ -81,60 +80,64 @@ class AllocInfo {
     int *p;
     int val;
     int size;
-
 public:
-    AllocInfo() : p(NULL), val(0), size(0) {}
-    explicit AllocInfo(int sz) : p((int *) scalable_malloc(sz * sizeof(int))), val(rand()), size(sz) {
+    AllocInfo() : p(nullptr), val(0), size(0) {}
+    explicit AllocInfo(int sz) : p((int*)scalable_malloc(sz*sizeof(int))),
+                                   val(rand()), size(sz) {
         REQUIRE(p);
-        for (int k = 0; k < size; k++) p[k] = val;
+        for (int k=0; k<size; k++)
+            p[k] = val;
     }
     void check() const {
-        for (int k = 0; k < size; k++) ASSERT(p[k] == val, NULL);
+        for (int k=0; k<size; k++)
+            ASSERT(p[k] == val, nullptr);
+    }
+    void clear() {
+        scalable_free(p);
     }
-    void clear() { scalable_free(p); }
 };
 
 // Test struct to call ProcessShutdown after all tests
 struct ShutdownTest {
     ~ShutdownTest() {
-#if _WIN32 || _WIN64
+    #if _WIN32 || _WIN64
         __TBB_mallocProcessShutdownNotification(true);
-#else
+    #else
         __TBB_mallocProcessShutdownNotification(false);
-#endif
+    #endif
     }
 };
 
 static ShutdownTest shutdownTest;
 
-class SimpleBarrier : utils::NoAssign {
+class SimpleBarrier: utils::NoAssign {
 protected:
     static utils::SpinBarrier barrier;
-
 public:
     static void initBarrier(unsigned thrds) { barrier.initialize(thrds); }
 };
 
 utils::SpinBarrier SimpleBarrier::barrier;
 
-class TestLargeObjCache : public SimpleBarrier {
+class TestLargeObjCache: public SimpleBarrier {
 public:
     static int largeMemSizes[LARGE_MEM_SIZES_NUM];
 
-    TestLargeObjCache() {}
+    TestLargeObjCache( ) {}
 
-    void operator()(int /*mynum*/) const {
+    void operator()( int /*mynum*/ ) const {
         AllocInfo allocs[LARGE_MEM_SIZES_NUM];
 
         // push to maximal cache limit
-        for (int i = 0; i < 2; i++) {
-            const int sizes[] = {MByte / sizeof(int),
-                                 (MByte - 2 * LargeObjectCache::LargeBSProps::CacheStep) / sizeof(int)};
-            for (int q = 0; q < 2; q++) {
+        for (int i=0; i<2; i++) {
+            const int sizes[] = { MByte/sizeof(int),
+                                  (MByte-2*LargeObjectCache::LargeBSProps::CacheStep)/sizeof(int) };
+            for (int q=0; q<2; q++) {
                 size_t curr = 0;
-                for (int j = 0; j < LARGE_MEM_SIZES_NUM; j++, curr++) new (allocs + curr) AllocInfo(sizes[q]);
+                for (int j=0; j<LARGE_MEM_SIZES_NUM; j++, curr++)
+                    new (allocs+curr) AllocInfo(sizes[q]);
 
-                for (size_t j = 0; j < curr; j++) {
+                for (size_t j=0; j<curr; j++) {
                     allocs[j].check();
                     allocs[j].clear();
                 }
@@ -144,16 +147,17 @@ class TestLargeObjCache : public SimpleBarrier {
         barrier.wait();
 
         // check caching correctness
-        for (int i = 0; i < 1000; i++) {
+        for (int i=0; i<1000; i++) {
             size_t curr = 0;
-            for (int j = 0; j < LARGE_MEM_SIZES_NUM - 1; j++, curr++)
-                new (allocs + curr) AllocInfo(largeMemSizes[j]);
+            for (int j=0; j<LARGE_MEM_SIZES_NUM-1; j++, curr++)
+                new (allocs+curr) AllocInfo(largeMemSizes[j]);
 
-            new (allocs + curr) AllocInfo(
-                    (int) (4 * minLargeObjectSize + 2 * minLargeObjectSize * (1. * rand() / RAND_MAX)));
+            new (allocs+curr)
+                AllocInfo((int)(4*minLargeObjectSize +
+                                2*minLargeObjectSize*(1.*rand()/RAND_MAX)));
             curr++;
 
-            for (size_t j = 0; j < curr; j++) {
+            for (size_t j=0; j<curr; j++) {
                 allocs[j].check();
                 allocs[j].clear();
             }
@@ -163,26 +167,26 @@ class TestLargeObjCache : public SimpleBarrier {
 
 int TestLargeObjCache::largeMemSizes[LARGE_MEM_SIZES_NUM];
 
-void TestLargeObjectCache() {
-    for (int i = 0; i < LARGE_MEM_SIZES_NUM; i++)
-        TestLargeObjCache::largeMemSizes[i]
-                = (int) (minLargeObjectSize + 2 * minLargeObjectSize * (1. * rand() / RAND_MAX));
+void TestLargeObjectCache()
+{
+    for (int i=0; i<LARGE_MEM_SIZES_NUM; i++)
+        TestLargeObjCache::largeMemSizes[i] =
+            (int)(minLargeObjectSize + 2*minLargeObjectSize*(1.*rand()/RAND_MAX));
 
-    for (int p = MaxThread; p >= MinThread; --p) {
-        TestLargeObjCache::initBarrier(p);
-        utils::NativeParallelFor(p, TestLargeObjCache());
+    for( int p=MaxThread; p>=MinThread; --p ) {
+        TestLargeObjCache::initBarrier( p );
+        utils::NativeParallelFor( p, TestLargeObjCache() );
     }
 }
 
 #if MALLOC_CHECK_RECURSION
 
-class TestStartupAlloc : public SimpleBarrier {
+class TestStartupAlloc: public SimpleBarrier {
     struct TestBlock {
         void *ptr;
         size_t sz;
     };
     static const int ITERS = 100;
-
 public:
     TestStartupAlloc() {}
     void operator()(int) const {
@@ -190,28 +194,30 @@ class TestStartupAlloc : public SimpleBarrier {
 
         barrier.wait();
 
-        for (int i = 0; i < ITERS; i++) {
+        for (int i=0; i<ITERS; i++) {
             blocks1[i].sz = rand() % minLargeObjectSize;
             blocks1[i].ptr = StartupBlock::allocate(blocks1[i].sz);
-            REQUIRE((blocks1[i].ptr && StartupBlock::msize(blocks1[i].ptr) >= blocks1[i].sz
-                     && 0 == (uintptr_t) blocks1[i].ptr % sizeof(void *)));
+            REQUIRE((blocks1[i].ptr && StartupBlock::msize(blocks1[i].ptr)>=blocks1[i].sz
+                   && 0==(uintptr_t)blocks1[i].ptr % sizeof(void*)));
             memset(blocks1[i].ptr, i, blocks1[i].sz);
         }
-        for (int i = 0; i < ITERS; i++) {
+        for (int i=0; i<ITERS; i++) {
             blocks2[i].sz = rand() % minLargeObjectSize;
             blocks2[i].ptr = StartupBlock::allocate(blocks2[i].sz);
-            REQUIRE((blocks2[i].ptr && StartupBlock::msize(blocks2[i].ptr) >= blocks2[i].sz
-                     && 0 == (uintptr_t) blocks2[i].ptr % sizeof(void *)));
+            REQUIRE((blocks2[i].ptr && StartupBlock::msize(blocks2[i].ptr)>=blocks2[i].sz
+                   && 0==(uintptr_t)blocks2[i].ptr % sizeof(void*)));
             memset(blocks2[i].ptr, i, blocks2[i].sz);
 
-            for (size_t j = 0; j < blocks1[i].sz; j++) REQUIRE(*((char *) blocks1[i].ptr + j) == i);
-            Block *block = (Block *) alignDown(blocks1[i].ptr, slabSize);
-            ((StartupBlock *) block)->free(blocks1[i].ptr);
+            for (size_t j=0; j<blocks1[i].sz; j++)
+                REQUIRE(*((char*)blocks1[i].ptr+j) == i);
+            Block *block = (Block *)alignDown(blocks1[i].ptr, slabSize);
+            ((StartupBlock *)block)->free(blocks1[i].ptr);
         }
-        for (int i = ITERS - 1; i >= 0; i--) {
-            for (size_t j = 0; j < blocks2[i].sz; j++) REQUIRE(*((char *) blocks2[i].ptr + j) == i);
-            Block *block = (Block *) alignDown(blocks2[i].ptr, slabSize);
-            ((StartupBlock *) block)->free(blocks2[i].ptr);
+        for (int i=ITERS-1; i>=0; i--) {
+            for (size_t j=0; j<blocks2[i].sz; j++)
+                REQUIRE(*((char*)blocks2[i].ptr+j) == i);
+            Block *block = (Block *)alignDown(blocks2[i].ptr, slabSize);
+            ((StartupBlock *)block)->free(blocks2[i].ptr);
         }
     }
 };
@@ -220,14 +226,13 @@ class TestStartupAlloc : public SimpleBarrier {
 
 #include <deque>
 
-template <int ITERS>
-class BackRefWork : utils::NoAssign {
+template<int ITERS>
+class BackRefWork: utils::NoAssign {
     struct TestBlock {
         BackRefIdx idx;
-        char data;
+        char       data;
         TestBlock(BackRefIdx idx_) : idx(idx_) {}
     };
-
 public:
     BackRefWork() {}
     void operator()(int) const {
@@ -236,57 +241,59 @@ class BackRefWork : utils::NoAssign {
         std::deque<TestBlock> blocks;
 
         // for ITERS==0 consume all available backrefs
-        for (cnt = 0; !ITERS || cnt < ITERS; cnt++) {
+        for (cnt=0; !ITERS || cnt<ITERS; cnt++) {
             BackRefIdx idx = BackRefIdx::newBackRef(/*largeObj=*/false);
-            if (idx.isInvalid()) break;
+            if (idx.isInvalid())
+                break;
             blocks.push_back(TestBlock(idx));
             setBackRef(blocks.back().idx, &blocks.back().data);
         }
-        for (size_t i = 0; i < cnt; i++) REQUIRE((Block *) &blocks[i].data == getBackRef(blocks[i].idx));
-        for (size_t i = cnt; i > 0; i--) removeBackRef(blocks[i - 1].idx);
+        for (size_t i=0; i<cnt; i++)
+            REQUIRE((Block*)&blocks[i].data == getBackRef(blocks[i].idx));
+        for (size_t i=cnt; i>0; i--)
+            removeBackRef(blocks[i-1].idx);
     }
 };
 
-class LocalCachesHit : utils::NoAssign {
+class LocalCachesHit: utils::NoAssign {
     // set ITERS to trigger possible leak of backreferences
     // during cleanup on cache overflow and on thread termination
-    static const int ITERS = 2 * (FreeBlockPool::POOL_HIGH_MARK + LocalLOC::LOC_HIGH_MARK);
-
+    static const int ITERS = 2*(FreeBlockPool::POOL_HIGH_MARK +
+                                LocalLOC::LOC_HIGH_MARK);
 public:
     LocalCachesHit() {}
     void operator()(int) const {
         void *objsSmall[ITERS], *objsLarge[ITERS];
 
-        for (int i = 0; i < ITERS; i++) {
-            objsSmall[i] = scalable_malloc(minLargeObjectSize - 1);
+        for (int i=0; i<ITERS; i++) {
+            objsSmall[i] = scalable_malloc(minLargeObjectSize-1);
             objsLarge[i] = scalable_malloc(minLargeObjectSize);
         }
-        for (int i = 0; i < ITERS; i++) {
+        for (int i=0; i<ITERS; i++) {
             scalable_free(objsSmall[i]);
             scalable_free(objsLarge[i]);
         }
     }
 };
 
-static size_t allocatedBackRefCount() {
+static size_t allocatedBackRefCount()
+{
     size_t cnt = 0;
-    for (int i = 0;
-         i <= backRefMain.load(std::memory_order_relaxed)->lastUsed.load(std::memory_order_relaxed); i++)
+    for (int i=0; i<=backRefMain.load(std::memory_order_relaxed)->lastUsed.load(std::memory_order_relaxed); i++)
         cnt += backRefMain.load(std::memory_order_relaxed)->backRefBl[i]->allocatedCount;
     return cnt;
 }
 
-class TestInvalidBackrefs : public SimpleBarrier {
+class TestInvalidBackrefs: public SimpleBarrier {
 #if __ANDROID__
     // Android requires lower iters due to lack of virtual memory.
-    static const int BACKREF_GROWTH_ITERS = 50 * 1024;
+    static const int BACKREF_GROWTH_ITERS = 50*1024;
 #else
-    static const int BACKREF_GROWTH_ITERS = 200 * 1024;
+    static const int BACKREF_GROWTH_ITERS = 200*1024;
 #endif
 
     static std::atomic<bool> backrefGrowthDone;
     static void *ptrs[BACKREF_GROWTH_ITERS];
-
 public:
     TestInvalidBackrefs() {}
     void operator()(int id) const {
@@ -295,13 +302,16 @@ class TestInvalidBackrefs : public SimpleBarrier {
             backrefGrowthDone = false;
             barrier.wait();
 
-            for (int i = 0; i < BACKREF_GROWTH_ITERS; i++) ptrs[i] = scalable_malloc(minLargeObjectSize);
+            for (int i=0; i<BACKREF_GROWTH_ITERS; i++)
+                ptrs[i] = scalable_malloc(minLargeObjectSize);
             backrefGrowthDone = true;
-            for (int i = 0; i < BACKREF_GROWTH_ITERS; i++) scalable_free(ptrs[i]);
+            for (int i=0; i<BACKREF_GROWTH_ITERS; i++)
+                scalable_free(ptrs[i]);
         } else {
-            void *p2 = scalable_malloc(minLargeObjectSize - 1);
-            char *p1 = (char *) scalable_malloc(minLargeObjectSize - 1);
-            LargeObjectHdr *hdr = (LargeObjectHdr *) (p1 + minLargeObjectSize - 1 - sizeof(LargeObjectHdr));
+            void *p2 = scalable_malloc(minLargeObjectSize-1);
+            char *p1 = (char*)scalable_malloc(minLargeObjectSize-1);
+            LargeObjectHdr *hdr =
+                (LargeObjectHdr*)(p1+minLargeObjectSize-1 - sizeof(LargeObjectHdr));
             hdr->backRefIdx.main = 7;
             hdr->backRefIdx.largeObj = 1;
             hdr->backRefIdx.offset = 2000;
@@ -311,7 +321,7 @@ class TestInvalidBackrefs : public SimpleBarrier {
             int yield_count = 0;
             while (!backrefGrowthDone) {
                 scalable_free(p2);
-                p2 = scalable_malloc(minLargeObjectSize - 1);
+                p2 = scalable_malloc(minLargeObjectSize-1);
                 if (yield_count++ == 100) {
                     yield_count = 0;
                     std::this_thread::yield();
@@ -330,27 +340,24 @@ void TestBackRef() {
     size_t beforeNumBackRef, afterNumBackRef;
 
     beforeNumBackRef = allocatedBackRefCount();
-    for (int p = MaxThread; p >= MinThread; --p)
-        utils::NativeParallelFor(p, BackRefWork<2 * BR_MAX_CNT + 2>());
+    for( int p=MaxThread; p>=MinThread; --p )
+        utils::NativeParallelFor( p, BackRefWork<2*BR_MAX_CNT+2>() );
     afterNumBackRef = allocatedBackRefCount();
-    REQUIRE_MESSAGE(beforeNumBackRef == afterNumBackRef, "backreference leak detected");
+    REQUIRE_MESSAGE(beforeNumBackRef==afterNumBackRef, "backreference leak detected");
     // lastUsed marks peak resource consumption. As we allocate below the mark,
     // it must not move up, otherwise there is a resource leak.
     int sustLastUsed = backRefMain.load(std::memory_order_relaxed)->lastUsed.load(std::memory_order_relaxed);
-    utils::NativeParallelFor(1, BackRefWork<2 * BR_MAX_CNT + 2>());
-    REQUIRE_MESSAGE(
-            sustLastUsed
-                    == backRefMain.load(std::memory_order_relaxed)->lastUsed.load(std::memory_order_relaxed),
-            "backreference leak detected");
+    utils::NativeParallelFor( 1, BackRefWork<2*BR_MAX_CNT+2>() );
+    REQUIRE_MESSAGE(sustLastUsed == backRefMain.load(std::memory_order_relaxed)->lastUsed.load(std::memory_order_relaxed), "backreference leak detected");
     // check leak of back references while per-thread caches are in use
     // warm up needed to cover bootStrapMalloc call
-    utils::NativeParallelFor(1, LocalCachesHit());
+    utils::NativeParallelFor( 1, LocalCachesHit() );
     beforeNumBackRef = allocatedBackRefCount();
-    utils::NativeParallelFor(2, LocalCachesHit());
-    int res = scalable_allocation_command(TBBMALLOC_CLEAN_ALL_BUFFERS, NULL);
+    utils::NativeParallelFor( 2, LocalCachesHit() );
+    int res = scalable_allocation_command(TBBMALLOC_CLEAN_ALL_BUFFERS, nullptr);
     REQUIRE(res == TBBMALLOC_OK);
     afterNumBackRef = allocatedBackRefCount();
-    REQUIRE_MESSAGE(beforeNumBackRef >= afterNumBackRef, "backreference leak detected");
+    REQUIRE_MESSAGE(beforeNumBackRef>=afterNumBackRef, "backreference leak detected");
 
     // This is a regression test against race condition between backreference
     // extension and checking invalid BackRefIdx.
@@ -358,18 +365,21 @@ void TestBackRef() {
     // large objects, so there is a chance to prepend small object with
     // seems valid BackRefIdx for large objects, and thus trigger the bug.
     TestInvalidBackrefs::initBarrier(MaxThread);
-    utils::NativeParallelFor(MaxThread, TestInvalidBackrefs());
+    utils::NativeParallelFor( MaxThread, TestInvalidBackrefs() );
     // Consume all available backrefs and check they work correctly.
     // For now test 32-bit machines only, because for 64-bit memory consumption is too high.
-    if (sizeof(uintptr_t) == 4) utils::NativeParallelFor(MaxThread, BackRefWork<0>());
+    if (sizeof(uintptr_t) == 4)
+        utils::NativeParallelFor( MaxThread, BackRefWork<0>() );
 }
 
-void *getMem(intptr_t /*pool_id*/, size_t &bytes) {
-    const size_t BUF_SIZE = 8 * 1024 * 1024;
+void *getMem(intptr_t /*pool_id*/, size_t &bytes)
+{
+    const size_t BUF_SIZE = 8*1024*1024;
     static char space[BUF_SIZE];
     static size_t pos;
 
-    if (pos + bytes > BUF_SIZE) return NULL;
+    if (pos + bytes > BUF_SIZE)
+        return nullptr;
 
     void *ret = space + pos;
     pos += bytes;
@@ -377,40 +387,44 @@ void *getMem(intptr_t /*pool_id*/, size_t &bytes) {
     return ret;
 }
 
-int putMem(intptr_t /*pool_id*/, void * /*raw_ptr*/, size_t /*raw_bytes*/) { return 0; }
+int putMem(intptr_t /*pool_id*/, void* /*raw_ptr*/, size_t /*raw_bytes*/)
+{
+    return 0;
+}
 
 struct MallocPoolHeader {
-    void *rawPtr;
+    void  *rawPtr;
     size_t userSize;
 };
 
-void *getMallocMem(intptr_t /*pool_id*/, size_t &bytes) {
-    void *rawPtr = malloc(bytes + sizeof(MallocPoolHeader));
-    void *ret = (void *) ((uintptr_t) rawPtr + sizeof(MallocPoolHeader));
+void *getMallocMem(intptr_t /*pool_id*/, size_t &bytes)
+{
+    void *rawPtr = malloc(bytes+sizeof(MallocPoolHeader));
+    void *ret = (void *)((uintptr_t)rawPtr+sizeof(MallocPoolHeader));
 
-    MallocPoolHeader *hdr = (MallocPoolHeader *) ret - 1;
+    MallocPoolHeader *hdr = (MallocPoolHeader*)ret-1;
     hdr->rawPtr = rawPtr;
     hdr->userSize = bytes;
 
     return ret;
 }
 
-int putMallocMem(intptr_t /*pool_id*/, void *ptr, size_t bytes) {
-    MallocPoolHeader *hdr = (MallocPoolHeader *) ptr - 1;
+int putMallocMem(intptr_t /*pool_id*/, void *ptr, size_t bytes)
+{
+    MallocPoolHeader *hdr = (MallocPoolHeader*)ptr-1;
     ASSERT(bytes == hdr->userSize, "Invalid size in pool callback.");
     free(hdr->rawPtr);
 
     return 0;
 }
 
-class StressLOCacheWork : utils::NoAssign {
+class StressLOCacheWork: utils::NoAssign {
     rml::MemoryPool *my_mallocPool;
-
 public:
     StressLOCacheWork(rml::MemoryPool *mallocPool) : my_mallocPool(mallocPool) {}
     void operator()(int) const {
-        for (size_t sz = minLargeObjectSize; sz < 1 * 1024 * 1024;
-             sz += LargeObjectCache::LargeBSProps::CacheStep) {
+        for (size_t sz=minLargeObjectSize; sz<1*1024*1024;
+             sz+=LargeObjectCache::LargeBSProps::CacheStep) {
             void *ptr = pool_malloc(my_mallocPool, sz);
             REQUIRE_MESSAGE(ptr, "Memory was not allocated");
             memset(ptr, sz, sz);
@@ -430,7 +444,7 @@ void TestPools() {
     pool_destroy(pool1);
     pool_destroy(pool2);
 
-    scalable_allocation_command(TBBMALLOC_CLEAN_ALL_BUFFERS, NULL);
+    scalable_allocation_command(TBBMALLOC_CLEAN_ALL_BUFFERS, nullptr);
     beforeNumBackRef = allocatedBackRefCount();
     rml::MemoryPool *fixedPool;
 
@@ -441,30 +455,31 @@ void TestPools() {
     rml::MemoryPool *mallocPool;
 
     pool_create_v1(0, &pol, &mallocPool);
-    /* check that large object cache (LOC) returns correct size for cached objects
+/* check that large object cache (LOC) returns correct size for cached objects
    passBackendSz Byte objects are cached in LOC, but bypassed the backend, so
    memory requested directly from allocation callback.
    nextPassBackendSz Byte objects must fit to another LOC bin,
-   so that their allocation/realeasing leads to cache cleanup.
+   so that their allocation/releasing leads to cache cleanup.
    All this is expecting to lead to releasing of passBackendSz Byte object
    from LOC during LOC cleanup, and putMallocMem checks that returned size
    is correct.
 */
-    const size_t passBackendSz = Backend::maxBinned_HugePage + 1, anotherLOCBinSz = minLargeObjectSize + 1;
-    for (int i = 0; i < 10; i++) {// run long enough to be cached
+    const size_t passBackendSz = Backend::maxBinned_HugePage+1,
+        anotherLOCBinSz = minLargeObjectSize+1;
+    for (int i=0; i<10; i++) { // run long enough to be cached
         void *p = pool_malloc(mallocPool, passBackendSz);
         REQUIRE_MESSAGE(p, "Memory was not allocated");
         pool_free(mallocPool, p);
     }
     // run long enough to passBackendSz allocation was cleaned from cache
     // and returned back to putMallocMem for size checking
-    for (int i = 0; i < 1000; i++) {
+    for (int i=0; i<1000; i++) {
         void *p = pool_malloc(mallocPool, anotherLOCBinSz);
         REQUIRE_MESSAGE(p, "Memory was not allocated");
         pool_free(mallocPool, p);
     }
 
-    void *smallObj = pool_malloc(fixedPool, 10);
+    void *smallObj =  pool_malloc(fixedPool, 10);
     REQUIRE_MESSAGE(smallObj, "Memory was not allocated");
     memset(smallObj, 1, 10);
     void *ptr = pool_malloc(fixedPool, 1024);
@@ -476,44 +491,46 @@ void TestPools() {
     ptr = pool_malloc(fixedPool, minLargeObjectSize);
     REQUIRE_MESSAGE(ptr, "Memory was not allocated");
     memset(ptr, minLargeObjectSize, minLargeObjectSize);
-    pool_malloc(fixedPool, 10 * minLargeObjectSize);// no leak for unsuccessful allocations
+    pool_malloc(fixedPool, 10*minLargeObjectSize); // no leak for unsuccessful allocations
     pool_free(fixedPool, smallObj);
     pool_free(fixedPool, largeObj);
 
     // provoke large object cache cleanup and hope no leaks occurs
-    for (int p = MaxThread; p >= MinThread; --p) utils::NativeParallelFor(p, StressLOCacheWork(mallocPool));
+    for( int p=MaxThread; p>=MinThread; --p )
+        utils::NativeParallelFor( p, StressLOCacheWork(mallocPool) );
     pool_destroy(mallocPool);
     pool_destroy(fixedPool);
 
-    scalable_allocation_command(TBBMALLOC_CLEAN_ALL_BUFFERS, NULL);
+    scalable_allocation_command(TBBMALLOC_CLEAN_ALL_BUFFERS, nullptr);
     afterNumBackRef = allocatedBackRefCount();
-    REQUIRE_MESSAGE(beforeNumBackRef == afterNumBackRef, "backreference leak detected");
+    REQUIRE_MESSAGE(beforeNumBackRef==afterNumBackRef, "backreference leak detected");
 
     {
         // test usedSize/cachedSize and LOC bitmask correctness
         void *p[5];
         pool_create_v1(0, &pol, &mallocPool);
-        const LargeObjectCache *loc = &((rml::internal::MemoryPool *) mallocPool)->extMemPool.loc;
+        const LargeObjectCache *loc = &((rml::internal::MemoryPool*)mallocPool)->extMemPool.loc;
         const int LargeCacheStep = LargeObjectCache::LargeBSProps::CacheStep;
-        p[3] = pool_malloc(mallocPool, minLargeObjectSize + 2 * LargeCacheStep);
-        for (int i = 0; i < 10; i++) {
+        p[3] = pool_malloc(mallocPool, minLargeObjectSize+2*LargeCacheStep);
+        for (int i=0; i<10; i++) {
             p[0] = pool_malloc(mallocPool, minLargeObjectSize);
-            p[1] = pool_malloc(mallocPool, minLargeObjectSize + LargeCacheStep);
+            p[1] = pool_malloc(mallocPool, minLargeObjectSize+LargeCacheStep);
             pool_free(mallocPool, p[0]);
             pool_free(mallocPool, p[1]);
         }
         REQUIRE(loc->getUsedSize());
         pool_free(mallocPool, p[3]);
-        REQUIRE(loc->getLOCSize() < 3 * (minLargeObjectSize + LargeCacheStep));
-        const size_t maxLocalLOCSize = LocalLOCImpl<3, 30>::getMaxSize();
+        REQUIRE(loc->getLOCSize() < 3*(minLargeObjectSize+LargeCacheStep));
+        const size_t maxLocalLOCSize = LocalLOCImpl<3,30>::getMaxSize();
         REQUIRE(loc->getUsedSize() <= maxLocalLOCSize);
-        for (int i = 0; i < 3; i++) p[i] = pool_malloc(mallocPool, minLargeObjectSize + i * LargeCacheStep);
+        for (int i=0; i<3; i++)
+            p[i] = pool_malloc(mallocPool, minLargeObjectSize+i*LargeCacheStep);
         size_t currUser = loc->getUsedSize();
-        REQUIRE((!loc->getLOCSize() && currUser >= 3 * (minLargeObjectSize + LargeCacheStep)));
-        p[4] = pool_malloc(mallocPool, minLargeObjectSize + 3 * LargeCacheStep);
-        REQUIRE(loc->getUsedSize() - currUser >= minLargeObjectSize + 3 * LargeCacheStep);
+        REQUIRE((!loc->getLOCSize() && currUser >= 3*(minLargeObjectSize+LargeCacheStep)));
+        p[4] = pool_malloc(mallocPool, minLargeObjectSize+3*LargeCacheStep);
+        REQUIRE(loc->getUsedSize() - currUser >= minLargeObjectSize+3*LargeCacheStep);
         pool_free(mallocPool, p[4]);
-        REQUIRE(loc->getUsedSize() <= currUser + maxLocalLOCSize);
+        REQUIRE(loc->getUsedSize() <= currUser+maxLocalLOCSize);
         pool_reset(mallocPool);
         REQUIRE((!loc->getLOCSize() && !loc->getUsedSize()));
         pool_destroy(mallocPool);
@@ -523,16 +540,16 @@ void TestPools() {
     {
         LocalLOCImpl<2, 20> lLOC;
         pool_create_v1(0, &pol, &mallocPool);
-        rml::internal::ExtMemoryPool *mPool = &((rml::internal::MemoryPool *) mallocPool)->extMemPool;
-        const LargeObjectCache *loc = &((rml::internal::MemoryPool *) mallocPool)->extMemPool.loc;
+        rml::internal::ExtMemoryPool *mPool = &((rml::internal::MemoryPool*)mallocPool)->extMemPool;
+        const LargeObjectCache *loc = &((rml::internal::MemoryPool*)mallocPool)->extMemPool.loc;
         const int LargeCacheStep = LargeObjectCache::LargeBSProps::CacheStep;
-        for (int i = 0; i < 22; i++) {
-            void *o = pool_malloc(mallocPool, minLargeObjectSize + i * LargeCacheStep);
-            bool ret = lLOC.put(((LargeObjectHdr *) o - 1)->memoryBlock, mPool);
+        for (int i=0; i<22; i++) {
+            void *o = pool_malloc(mallocPool, minLargeObjectSize+i*LargeCacheStep);
+            bool ret = lLOC.put(((LargeObjectHdr*)o - 1)->memoryBlock, mPool);
             REQUIRE(ret);
 
-            o = pool_malloc(mallocPool, minLargeObjectSize + i * LargeCacheStep);
-            ret = lLOC.put(((LargeObjectHdr *) o - 1)->memoryBlock, mPool);
+            o = pool_malloc(mallocPool, minLargeObjectSize+i*LargeCacheStep);
+            ret = lLOC.put(((LargeObjectHdr*)o - 1)->memoryBlock, mPool);
             REQUIRE(ret);
         }
         lLOC.externalCleanup(mPool);
@@ -543,114 +560,114 @@ void TestPools() {
 }
 
 void TestObjectRecognition() {
-    size_t headersSize = sizeof(LargeMemoryBlock) + sizeof(LargeObjectHdr);
-    unsigned falseObjectSize = 113;// unsigned is the type expected by getObjectSize
+    size_t headersSize = sizeof(LargeMemoryBlock)+sizeof(LargeObjectHdr);
+    unsigned falseObjectSize = 113; // unsigned is the type expected by getObjectSize
     size_t obtainedSize;
 
-    REQUIRE_MESSAGE(sizeof(BackRefIdx) == sizeof(uintptr_t), "Unexpected size of BackRefIdx");
-    REQUIRE_MESSAGE(getObjectSize(falseObjectSize) != falseObjectSize,
-                    "Error in test: bad choice for false object size");
+    REQUIRE_MESSAGE(sizeof(BackRefIdx)==sizeof(uintptr_t), "Unexpected size of BackRefIdx");
+    REQUIRE_MESSAGE(getObjectSize(falseObjectSize)!=falseObjectSize, "Error in test: bad choice for false object size");
 
-    void *mem = scalable_malloc(2 * slabSize);
+    void* mem = scalable_malloc(2*slabSize);
     REQUIRE_MESSAGE(mem, "Memory was not allocated");
-    Block *falseBlock = (Block *) alignUp((uintptr_t) mem, slabSize);
+    Block* falseBlock = (Block*)alignUp((uintptr_t)mem, slabSize);
     falseBlock->objectSize = falseObjectSize;
-    char *falseSO = (char *) falseBlock + falseObjectSize * 7;
-    REQUIRE_MESSAGE(alignDown(falseSO, slabSize) == (void *) falseBlock,
-                    "Error in test: false object offset is too big");
+    char* falseSO = (char*)falseBlock + falseObjectSize*7;
+    REQUIRE_MESSAGE(alignDown(falseSO, slabSize)==(void*)falseBlock, "Error in test: false object offset is too big");
 
-    void *bufferLOH = scalable_malloc(2 * slabSize + headersSize);
+    void* bufferLOH = scalable_malloc(2*slabSize + headersSize);
     REQUIRE_MESSAGE(bufferLOH, "Memory was not allocated");
-    LargeObjectHdr *falseLO = (LargeObjectHdr *) alignUp((uintptr_t) bufferLOH + headersSize, slabSize);
-    LargeObjectHdr *headerLO = (LargeObjectHdr *) falseLO - 1;
-    headerLO->memoryBlock = (LargeMemoryBlock *) bufferLOH;
-    headerLO->memoryBlock->unalignedSize = 2 * slabSize + headersSize;
+    LargeObjectHdr* falseLO =
+        (LargeObjectHdr*)alignUp((uintptr_t)bufferLOH + headersSize, slabSize);
+    LargeObjectHdr* headerLO = (LargeObjectHdr*)falseLO-1;
+    headerLO->memoryBlock = (LargeMemoryBlock*)bufferLOH;
+    headerLO->memoryBlock->unalignedSize = 2*slabSize + headersSize;
     headerLO->memoryBlock->objectSize = slabSize + headersSize;
     headerLO->backRefIdx = BackRefIdx::newBackRef(/*largeObj=*/true);
     setBackRef(headerLO->backRefIdx, headerLO);
     REQUIRE_MESSAGE(scalable_msize(falseLO) == slabSize + headersSize,
-                    "Error in test: LOH falsification failed");
+           "Error in test: LOH falsification failed");
     removeBackRef(headerLO->backRefIdx);
 
-    const int NUM_OF_IDX = BR_MAX_CNT + 2;
+    const int NUM_OF_IDX = BR_MAX_CNT+2;
     BackRefIdx idxs[NUM_OF_IDX];
-    for (int cnt = 0; cnt < 2; cnt++) {
-        for (int main = -10; main < 10; main++) {
-            falseBlock->backRefIdx.main = (uint16_t) main;
-            headerLO->backRefIdx.main = (uint16_t) main;
+    for (int cnt=0; cnt<2; cnt++) {
+        for (int main = -10; main<10; main++) {
+            falseBlock->backRefIdx.main = (uint16_t)main;
+            headerLO->backRefIdx.main = (uint16_t)main;
 
-            for (int bl = -10; bl < BR_MAX_CNT + 10; bl++) {
-                falseBlock->backRefIdx.offset = (uint16_t) bl;
-                headerLO->backRefIdx.offset = (uint16_t) bl;
+            for (int bl = -10; bl<BR_MAX_CNT+10; bl++) {
+                falseBlock->backRefIdx.offset = (uint16_t)bl;
+                headerLO->backRefIdx.offset = (uint16_t)bl;
 
-                for (int largeObj = 0; largeObj < 2; largeObj++) {
+                for (int largeObj = 0; largeObj<2; largeObj++) {
                     falseBlock->backRefIdx.largeObj = largeObj;
                     headerLO->backRefIdx.largeObj = largeObj;
 
-                    obtainedSize = __TBB_malloc_safer_msize(falseSO, NULL);
-                    REQUIRE_MESSAGE(obtainedSize == 0, "Incorrect pointer accepted");
-                    obtainedSize = __TBB_malloc_safer_msize(falseLO, NULL);
-                    REQUIRE_MESSAGE(obtainedSize == 0, "Incorrect pointer accepted");
+                    obtainedSize = __TBB_malloc_safer_msize(falseSO, nullptr);
+                    REQUIRE_MESSAGE(obtainedSize==0, "Incorrect pointer accepted");
+                    obtainedSize = __TBB_malloc_safer_msize(falseLO, nullptr);
+                    REQUIRE_MESSAGE(obtainedSize==0, "Incorrect pointer accepted");
                 }
             }
         }
         if (cnt == 1) {
-            for (int i = 0; i < NUM_OF_IDX; i++) removeBackRef(idxs[i]);
+            for (int i=0; i<NUM_OF_IDX; i++)
+                removeBackRef(idxs[i]);
             break;
         }
-        for (int i = 0; i < NUM_OF_IDX; i++) {
+        for (int i=0; i<NUM_OF_IDX; i++) {
             idxs[i] = BackRefIdx::newBackRef(/*largeObj=*/false);
-            setBackRef(idxs[i], NULL);
+            setBackRef(idxs[i], nullptr);
         }
     }
-    char *smallPtr = (char *) scalable_malloc(falseObjectSize);
-    obtainedSize = __TBB_malloc_safer_msize(smallPtr, NULL);
-    REQUIRE_MESSAGE(obtainedSize == getObjectSize(falseObjectSize), "Correct pointer not accepted?");
+    char *smallPtr = (char*)scalable_malloc(falseObjectSize);
+    obtainedSize = __TBB_malloc_safer_msize(smallPtr, nullptr);
+    REQUIRE_MESSAGE(obtainedSize==getObjectSize(falseObjectSize), "Correct pointer not accepted?");
     scalable_free(smallPtr);
 
-    obtainedSize = __TBB_malloc_safer_msize(mem, NULL);
-    REQUIRE_MESSAGE(obtainedSize >= 2 * slabSize, "Correct pointer not accepted?");
+    obtainedSize = __TBB_malloc_safer_msize(mem, nullptr);
+    REQUIRE_MESSAGE(obtainedSize>=2*slabSize, "Correct pointer not accepted?");
     scalable_free(mem);
     scalable_free(bufferLOH);
 }
 
-class TestBackendWork : public SimpleBarrier {
+class TestBackendWork: public SimpleBarrier {
     struct TestBlock {
-        intptr_t data;
+        intptr_t   data;
         BackRefIdx idx;
     };
     static const int ITERS = 20;
 
     rml::internal::Backend *backend;
-
 public:
     TestBackendWork(rml::internal::Backend *bknd) : backend(bknd) {}
     void operator()(int) const {
         barrier.wait();
 
-        for (int i = 0; i < ITERS; i++) {
+        for (int i=0; i<ITERS; i++) {
             BlockI *slabBlock = backend->getSlabBlock(1);
             REQUIRE_MESSAGE(slabBlock, "Memory was not allocated");
-            uintptr_t prevBlock = (uintptr_t) slabBlock;
+            uintptr_t prevBlock = (uintptr_t)slabBlock;
             backend->putSlabBlock(slabBlock);
 
-            LargeMemoryBlock *largeBlock = backend->getLargeBlock(16 * 1024);
+            LargeMemoryBlock *largeBlock = backend->getLargeBlock(16*1024);
             REQUIRE_MESSAGE(largeBlock, "Memory was not allocated");
-            REQUIRE_MESSAGE((uintptr_t) largeBlock != prevBlock,
-                            "Large block cannot be reused from slab memory, only in fixed_pool case.");
+            REQUIRE_MESSAGE((uintptr_t)largeBlock != prevBlock,
+                    "Large block cannot be reused from slab memory, only in fixed_pool case.");
             backend->putLargeBlock(largeBlock);
         }
     }
 };
 
-void TestBackend() {
+void TestBackend()
+{
     rml::MemPoolPolicy pol(getMallocMem, putMallocMem);
     rml::MemoryPool *mPool;
     pool_create_v1(0, &pol, &mPool);
-    rml::internal::ExtMemoryPool *ePool = &((rml::internal::MemoryPool *) mPool)->extMemPool;
+    rml::internal::ExtMemoryPool *ePool = &((rml::internal::MemoryPool*)mPool)->extMemPool;
     rml::internal::Backend *backend = &ePool->backend;
 
-    for (int p = MaxThread; p >= MinThread; --p) {
+    for( int p=MaxThread; p>=MinThread; --p ) {
         // regression test against an race condition in backend synchronization,
         // triggered only when WhiteboxTestingYield() call yields
 #if TBB_USE_DEBUG
@@ -660,7 +677,7 @@ void TestBackend() {
 #endif
         for (int i = 0; i < num_iters; i++) {
             TestBackendWork::initBarrier(p);
-            utils::NativeParallelFor(p, TestBackendWork(backend));
+            utils::NativeParallelFor( p, TestBackendWork(backend) );
         }
     }
 
@@ -670,21 +687,21 @@ void TestBackend() {
 
     // Checks if the backend increases and decreases the amount of allocated memory when memory is allocated.
     const size_t memSize0 = backend->getTotalMemSize();
-    LargeMemoryBlock *lmb = backend->getLargeBlock(4 * MByte);
-    REQUIRE(lmb);
+    LargeMemoryBlock *lmb = backend->getLargeBlock(4*MByte);
+    REQUIRE( lmb );
 
     const size_t memSize1 = backend->getTotalMemSize();
-    REQUIRE_MESSAGE((intptr_t)(memSize1 - memSize0) >= 4 * MByte,
-                    "The backend has not increased the amount of using memory.");
+    REQUIRE_MESSAGE( (intptr_t)(memSize1-memSize0) >= 4*MByte, "The backend has not increased the amount of using memory." );
 
     backend->putLargeBlock(lmb);
     const size_t memSize2 = backend->getTotalMemSize();
-    REQUIRE_MESSAGE(memSize2 == memSize0, "The backend has not decreased the amount of using memory.");
+    REQUIRE_MESSAGE( memSize2 == memSize0, "The backend has not decreased the amount of using memory." );
 
     pool_destroy(mPool);
 }
 
-void TestBitMask() {
+void TestBitMask()
+{
     BitMaskMin<256> mask;
 
     mask.reset();
@@ -709,29 +726,31 @@ void TestBitMask() {
     REQUIRE(mask.getMinTrue(201) == -1);
 }
 
-size_t getMemSize() { return defaultMemPool->extMemPool.backend.getTotalMemSize(); }
+size_t getMemSize()
+{
+    return defaultMemPool->extMemPool.backend.getTotalMemSize();
+}
 
 class CheckNotCached {
     static size_t memSize;
-
 public:
-    void operator()() const {
+    void operator() () const {
         int res = scalable_allocation_mode(TBBMALLOC_SET_SOFT_HEAP_LIMIT, 1);
         REQUIRE(res == TBBMALLOC_OK);
-        if (memSize == (size_t) -1) {
+        if (memSize==(size_t)-1) {
             memSize = getMemSize();
         } else {
             REQUIRE(getMemSize() == memSize);
-            memSize = (size_t) -1;
+            memSize=(size_t)-1;
         }
     }
 };
 
-size_t CheckNotCached::memSize = (size_t) -1;
+size_t CheckNotCached::memSize = (size_t)-1;
 
-class RunTestHeapLimit : public SimpleBarrier {
+class RunTestHeapLimit: public SimpleBarrier {
 public:
-    void operator()(int /*mynum*/) const {
+    void operator()( int /*mynum*/ ) const {
         // Provoke bootstrap heap initialization before recording memory size.
         // NOTE: The initialization should be processed only with a "large"
         // object. Since the "small" object allocation lead to blocking of a
@@ -739,37 +758,39 @@ class RunTestHeapLimit : public SimpleBarrier {
         // foreign thread.
         scalable_free(scalable_malloc(minLargeObjectSize));
         barrier.wait(CheckNotCached());
-        for (size_t n = minLargeObjectSize; n < 5 * 1024 * 1024; n += 128 * 1024)
+        for (size_t n = minLargeObjectSize; n < 5*1024*1024; n += 128*1024)
             scalable_free(scalable_malloc(n));
         barrier.wait(CheckNotCached());
     }
 };
 
-void TestHeapLimit() {
-    if (!isMallocInitialized()) doInitialization();
+void TestHeapLimit()
+{
+    if(!isMallocInitialized()) doInitialization();
     // tiny limit to stop caching
     int res = scalable_allocation_mode(TBBMALLOC_SET_SOFT_HEAP_LIMIT, 1);
     REQUIRE(res == TBBMALLOC_OK);
-    // Provoke bootstrap heap initialization before recording memory size.
+     // Provoke bootstrap heap initialization before recording memory size.
     scalable_free(scalable_malloc(8));
     size_t n, sizeBefore = getMemSize();
 
     // Try to provoke call to OS for memory to check that
     // requests are not fulfilled from caches.
     // Single call is not enough here because of backend fragmentation.
-    for (n = minLargeObjectSize; n < 10 * 1024 * 1024; n += 16 * 1024) {
+    for (n = minLargeObjectSize; n < 10*1024*1024; n += 16*1024) {
         void *p = scalable_malloc(n);
         bool leave = (sizeBefore != getMemSize());
         scalable_free(p);
-        if (leave) break;
+        if (leave)
+            break;
         REQUIRE_MESSAGE(sizeBefore == getMemSize(), "No caching expected");
     }
-    REQUIRE_MESSAGE(n < 10 * 1024 * 1024, "scalable_malloc doesn't provoke OS request for memory, "
-                                          "is some internal cache still used?");
+    REQUIRE_MESSAGE(n < 10*1024*1024, "scalable_malloc doesn't provoke OS request for memory, "
+           "is some internal cache still used?");
 
-    for (int p = MaxThread; p >= MinThread; --p) {
-        RunTestHeapLimit::initBarrier(p);
-        utils::NativeParallelFor(p, RunTestHeapLimit());
+    for( int p=MaxThread; p>=MinThread; --p ) {
+        RunTestHeapLimit::initBarrier( p );
+        utils::NativeParallelFor( p, RunTestHeapLimit() );
     }
     // it's try to match limit as well as set limit, so call here
     res = scalable_allocation_mode(TBBMALLOC_SET_SOFT_HEAP_LIMIT, 1);
@@ -781,9 +802,10 @@ void TestHeapLimit() {
     REQUIRE(res == TBBMALLOC_OK);
 }
 
-void checkNoHugePages() {
+void checkNoHugePages()
+{
     REQUIRE_MESSAGE(!hugePages.isEnabled, "scalable_allocation_mode "
-                                          "must have priority over environment variable");
+           "must have priority over environment variable");
 }
 
 /*---------------------------------------------------------------------------*/
@@ -794,20 +816,20 @@ void checkNoHugePages() {
 // Global cleanup should process orphaned slabs and the queue of postponed coalescing
 // requests, otherwise it will not be able to unmap all unused memory.
 
-const int num_allocs = 10 * 1024;
+const int num_allocs = 10*1024;
 void *ptrs[num_allocs];
 std::atomic<int> alloc_counter;
 static thread_local bool free_was_called = false;
 
 inline void multiThreadAlloc(size_t alloc_size) {
-    for (int i = alloc_counter++; i < num_allocs; i = alloc_counter++) {
-        ptrs[i] = scalable_malloc(alloc_size);
-        REQUIRE_MESSAGE(ptrs[i] != nullptr, "scalable_malloc returned zero.");
+    for( int i = alloc_counter++; i < num_allocs; i = alloc_counter++ ) {
+       ptrs[i] = scalable_malloc( alloc_size );
+       REQUIRE_MESSAGE( ptrs[i] != nullptr, "scalable_malloc returned zero." );
     }
 }
 inline void crossThreadDealloc() {
     free_was_called = false;
-    for (int i = --alloc_counter; i >= 0; i = --alloc_counter) {
+    for( int i = --alloc_counter; i >= 0; i = --alloc_counter ) {
         if (i < num_allocs) {
             scalable_free(ptrs[i]);
             free_was_called = true;
@@ -815,9 +837,9 @@ inline void crossThreadDealloc() {
     }
 }
 
-template <int AllocSize>
+template<int AllocSize>
 struct TestCleanAllBuffersBody : public SimpleBarrier {
-    void operator()(int) const {
+    void operator() ( int ) const {
         barrier.wait();
         multiThreadAlloc(AllocSize);
         barrier.wait();
@@ -825,11 +847,11 @@ struct TestCleanAllBuffersBody : public SimpleBarrier {
     }
 };
 
-template <int AllocSize>
+template<int AllocSize>
 void TestCleanAllBuffers() {
     const int num_threads = 8;
     // Clean up if something was allocated before the test
-    scalable_allocation_command(TBBMALLOC_CLEAN_ALL_BUFFERS, 0);
+    scalable_allocation_command(TBBMALLOC_CLEAN_ALL_BUFFERS,nullptr);
 
     size_t memory_in_use_before = getMemSize();
     alloc_counter = 0;
@@ -837,30 +859,29 @@ void TestCleanAllBuffers() {
 
     utils::NativeParallelFor(num_threads, TestCleanAllBuffersBody<AllocSize>());
     // TODO: reproduce the bug conditions more reliably
-    if (defaultMemPool->extMemPool.backend.coalescQ.blocksToFree.load(std::memory_order_relaxed) == NULL) {
-        INFO("Warning: The queue of postponed coalescing requests is empty. ");
-        INFO("Unable to create the condition for bug reproduction.\n");
+    if ( defaultMemPool->extMemPool.backend.coalescQ.blocksToFree.load(std::memory_order_relaxed) == nullptr ) {
+        INFO( "Warning: The queue of postponed coalescing requests is empty. ");
+        INFO( "Unable to create the condition for bug reproduction.\n" );
     }
-    int result = scalable_allocation_command(TBBMALLOC_CLEAN_ALL_BUFFERS, 0);
-    REQUIRE_MESSAGE(result == TBBMALLOC_OK, "The cleanup request has not cleaned anything.");
+    int result = scalable_allocation_command(TBBMALLOC_CLEAN_ALL_BUFFERS,nullptr);
+    REQUIRE_MESSAGE( result == TBBMALLOC_OK, "The cleanup request has not cleaned anything." );
     size_t memory_in_use_after = getMemSize();
 
     size_t memory_leak = memory_in_use_after - memory_in_use_before;
-    INFO("memory_in_use_before = " << memory_in_use_before
-                                   << ", memory_in_use_after = " << memory_in_use_after << "\n");
-    REQUIRE_MESSAGE(memory_leak == 0, "Cleanup was unable to release all allocated memory.");
+    INFO( "memory_in_use_before = " <<  memory_in_use_before << ", memory_in_use_after = " << memory_in_use_after << "\n" );
+    REQUIRE_MESSAGE( memory_leak == 0, "Cleanup was unable to release all allocated memory." );
 }
 
 //! Force cross thread deallocation of small objects to create a set of privatizable slab blocks.
 //! TBBMALLOC_CLEAN_THREAD_BUFFERS command have to privatize all the block.
 struct TestCleanThreadBuffersBody : public SimpleBarrier {
-    void operator()(int) const {
+    void operator() ( int ) const {
         barrier.wait();
-        multiThreadAlloc(2 * 1024);
+        multiThreadAlloc(2*1024);
         barrier.wait();
         crossThreadDealloc();
         barrier.wait();
-        int result = scalable_allocation_command(TBBMALLOC_CLEAN_THREAD_BUFFERS, 0);
+        int result = scalable_allocation_command(TBBMALLOC_CLEAN_THREAD_BUFFERS,nullptr);
         if (result != TBBMALLOC_OK && free_was_called) {
             REPORT("Warning: clean-up request for this particular thread has not cleaned anything.");
         }
@@ -871,10 +892,8 @@ struct TestCleanThreadBuffersBody : public SimpleBarrier {
             for (int i = 0; i < numBlockBinLimit; i++) {
                 REQUIRE_MESSAGE(!(tlsCurr->bin[i].activeBlk), "Some bin was not cleaned.");
             }
-            REQUIRE_MESSAGE(!(tlsCurr->lloc.head.load(std::memory_order_relaxed)),
-                            "Local LOC was not cleaned.");
-            REQUIRE_MESSAGE(!(tlsCurr->freeSlabBlocks.head.load(std::memory_order_relaxed)),
-                            "Free Block pool was not cleaned.");
+            REQUIRE_MESSAGE(!(tlsCurr->lloc.head.load(std::memory_order_relaxed)), "Local LOC was not cleaned.");
+            REQUIRE_MESSAGE(!(tlsCurr->freeSlabBlocks.head.load(std::memory_order_relaxed)), "Free Block pool was not cleaned.");
         }
     }
 };
@@ -882,7 +901,7 @@ struct TestCleanThreadBuffersBody : public SimpleBarrier {
 void TestCleanThreadBuffers() {
     const int num_threads = 8;
     // Clean up if something was allocated before the test
-    scalable_allocation_command(TBBMALLOC_CLEAN_ALL_BUFFERS, 0);
+    scalable_allocation_command(TBBMALLOC_CLEAN_ALL_BUFFERS,nullptr);
 
     alloc_counter = 0;
     TestCleanThreadBuffersBody::initBarrier(num_threads);
@@ -891,19 +910,19 @@ void TestCleanThreadBuffers() {
 
 /*---------------------------------------------------------------------------*/
 /*------------------------- Large Object Cache tests ------------------------*/
-#if _MSC_VER == 1600 || _MSC_VER == 1500
-// ignore C4275: non dll-interface class 'stdext::exception' used as
-// base for dll-interface class 'std::bad_cast'
-#pragma warning(disable : 4275)
+#if _MSC_VER==1600 || _MSC_VER==1500
+    // ignore C4275: non dll-interface class 'stdext::exception' used as
+    // base for dll-interface class 'std::bad_cast'
+    #pragma warning (disable: 4275)
 #endif
-#include <list>
 #include <vector>
+#include <list>
 
 // default constructor of CacheBin
-template <typename Props>
+template<typename Props>
 rml::internal::LargeObjectCacheImpl<Props>::CacheBin::CacheBin() {}
 
-template <typename Props>
+template<typename Props>
 class CacheBinModel {
 
     typedef typename rml::internal::LargeObjectCacheImpl<Props>::CacheBin CacheBinType;
@@ -919,11 +938,9 @@ class CacheBinModel {
     std::list<uintptr_t> objects;
 
     void doCleanup() {
-        if (cacheBinModel.cachedSize.load(std::memory_order_relaxed)
-            > Props::TooLargeFactor * cacheBinModel.usedSize.load(std::memory_order_relaxed))
-            tooLargeLOC++;
-        else
-            tooLargeLOC = 0;
+        if ( cacheBinModel.cachedSize.load(std::memory_order_relaxed) >
+            Props::TooLargeFactor*cacheBinModel.usedSize.load(std::memory_order_relaxed)) tooLargeLOC++;
+        else tooLargeLOC = 0;
 
         intptr_t threshold = cacheBinModel.ageThreshold.load(std::memory_order_relaxed);
         if (tooLargeLOC > 3 && threshold) {
@@ -933,8 +950,7 @@ class CacheBinModel {
 
         uintptr_t currTime = cacheCurrTime;
         while (!objects.empty() && (intptr_t)(currTime - objects.front()) > threshold) {
-            cacheBinModel.cachedSize.store(cacheBinModel.cachedSize.load(std::memory_order_relaxed) - size,
-                                           std::memory_order_relaxed);
+            cacheBinModel.cachedSize.store(cacheBinModel.cachedSize.load(std::memory_order_relaxed) - size, std::memory_order_relaxed);
             cacheBinModel.lastCleanedAge = objects.front();
             objects.pop_front();
         }
@@ -944,37 +960,28 @@ class CacheBinModel {
 
 public:
     CacheBinModel(CacheBinType &_cacheBin, size_t allocSize) : cacheBin(_cacheBin), size(allocSize) {
-        cacheBinModel.oldest.store(cacheBin.oldest.load(std::memory_order_relaxed),
-                                   std::memory_order_relaxed);
+        cacheBinModel.oldest.store(cacheBin.oldest.load(std::memory_order_relaxed), std::memory_order_relaxed);
         cacheBinModel.lastCleanedAge = cacheBin.lastCleanedAge;
-        cacheBinModel.ageThreshold.store(cacheBin.ageThreshold.load(std::memory_order_relaxed),
-                                         std::memory_order_relaxed);
-        cacheBinModel.usedSize.store(cacheBin.usedSize.load(std::memory_order_relaxed),
-                                     std::memory_order_relaxed);
-        cacheBinModel.cachedSize.store(cacheBin.cachedSize.load(std::memory_order_relaxed),
-                                       std::memory_order_relaxed);
-        cacheBinModel.meanHitRange.store(cacheBin.meanHitRange.load(std::memory_order_relaxed),
-                                         std::memory_order_relaxed);
+        cacheBinModel.ageThreshold.store(cacheBin.ageThreshold.load(std::memory_order_relaxed), std::memory_order_relaxed);
+        cacheBinModel.usedSize.store(cacheBin.usedSize.load(std::memory_order_relaxed), std::memory_order_relaxed);
+        cacheBinModel.cachedSize.store(cacheBin.cachedSize.load(std::memory_order_relaxed), std::memory_order_relaxed);
+        cacheBinModel.meanHitRange.store(cacheBin.meanHitRange.load(std::memory_order_relaxed), std::memory_order_relaxed);
         cacheBinModel.lastGet = cacheBin.lastGet;
     }
     void get() {
         uintptr_t currTime = ++cacheCurrTime;
 
-        if (objects.empty()) {
+        if ( objects.empty() ) {
             const uintptr_t sinceLastGet = currTime - cacheBinModel.lastGet;
             intptr_t threshold = cacheBinModel.ageThreshold.load(std::memory_order_relaxed);
-            if ((threshold && sinceLastGet > Props::LongWaitFactor * threshold)
-                || (cacheBinModel.lastCleanedAge
-                    && sinceLastGet > Props::LongWaitFactor
-                                              * (cacheBinModel.lastCleanedAge - cacheBinModel.lastGet))) {
+            if ((threshold && sinceLastGet > Props::LongWaitFactor * threshold) ||
+                (cacheBinModel.lastCleanedAge && sinceLastGet > Props::LongWaitFactor * (cacheBinModel.lastCleanedAge - cacheBinModel.lastGet))) {
                 cacheBinModel.lastCleanedAge = 0;
                 cacheBinModel.ageThreshold.store(0, std::memory_order_relaxed);
             }
 
             if (cacheBinModel.lastCleanedAge)
-                cacheBinModel.ageThreshold.store(Props::OnMissFactor
-                                                         * (currTime - cacheBinModel.lastCleanedAge),
-                                                 std::memory_order_relaxed);
+                cacheBinModel.ageThreshold.store(Props::OnMissFactor * (currTime - cacheBinModel.lastCleanedAge), std::memory_order_relaxed);
         } else {
             uintptr_t obj_age = objects.back();
             objects.pop_back();
@@ -985,56 +992,48 @@ class CacheBinModel {
             mean = mean ? (mean + hitRange) / 2 : hitRange;
             cacheBinModel.meanHitRange.store(mean, std::memory_order_relaxed);
 
-            cacheBinModel.cachedSize.store(cacheBinModel.cachedSize.load(std::memory_order_relaxed) - size,
-                                           std::memory_order_relaxed);
+            cacheBinModel.cachedSize.store(cacheBinModel.cachedSize.load(std::memory_order_relaxed) - size, std::memory_order_relaxed);
         }
 
-        cacheBinModel.usedSize.store(cacheBinModel.usedSize.load(std::memory_order_relaxed) + size,
-                                     std::memory_order_relaxed);
+        cacheBinModel.usedSize.store(cacheBinModel.usedSize.load(std::memory_order_relaxed) + size, std::memory_order_relaxed);
         cacheBinModel.lastGet = currTime;
 
-        if (currTime % rml::internal::cacheCleanupFreq == 0) doCleanup();
+        if ( currTime % rml::internal::cacheCleanupFreq == 0 ) doCleanup();
     }
 
-    void putList(int num) {
+    void putList( int num ) {
         uintptr_t currTime = cacheCurrTime;
         cacheCurrTime += num;
 
-        cacheBinModel.usedSize.store(cacheBinModel.usedSize.load(std::memory_order_relaxed) - num * size,
-                                     std::memory_order_relaxed);
+        cacheBinModel.usedSize.store(cacheBinModel.usedSize.load(std::memory_order_relaxed) - num * size, std::memory_order_relaxed);
 
         bool cleanUpNeeded = false;
-        if (!cacheBinModel.lastCleanedAge) {
+        if ( !cacheBinModel.lastCleanedAge ) {
             cacheBinModel.lastCleanedAge = ++currTime;
             cleanUpNeeded |= currTime % rml::internal::cacheCleanupFreq == 0;
             num--;
         }
 
-        for (int i = 1; i <= num; ++i) {
-            currTime += 1;
+        for ( int i=1; i<=num; ++i ) {
+            currTime+=1;
             cleanUpNeeded |= currTime % rml::internal::cacheCleanupFreq == 0;
-            if (objects.empty()) cacheBinModel.oldest.store(currTime, std::memory_order_relaxed);
+            if (objects.empty())
+                cacheBinModel.oldest.store(currTime, std::memory_order_relaxed);
             objects.push_back(currTime);
         }
 
-        cacheBinModel.cachedSize.store(cacheBinModel.cachedSize.load(std::memory_order_relaxed) + num * size,
-                                       std::memory_order_relaxed);
+        cacheBinModel.cachedSize.store(cacheBinModel.cachedSize.load(std::memory_order_relaxed) + num * size, std::memory_order_relaxed);
 
-        if (cleanUpNeeded) doCleanup();
+        if ( cleanUpNeeded ) doCleanup();
     }
 
     void check() {
-        CHECK_FAST(cacheBinModel.oldest.load(std::memory_order_relaxed)
-                   == cacheBin.oldest.load(std::memory_order_relaxed));
+        CHECK_FAST(cacheBinModel.oldest.load(std::memory_order_relaxed) == cacheBin.oldest.load(std::memory_order_relaxed));
         CHECK_FAST(cacheBinModel.lastCleanedAge == cacheBin.lastCleanedAge);
-        CHECK_FAST(cacheBinModel.ageThreshold.load(std::memory_order_relaxed)
-                   == cacheBin.ageThreshold.load(std::memory_order_relaxed));
-        CHECK_FAST(cacheBinModel.usedSize.load(std::memory_order_relaxed)
-                   == cacheBin.usedSize.load(std::memory_order_relaxed));
-        CHECK_FAST(cacheBinModel.cachedSize.load(std::memory_order_relaxed)
-                   == cacheBin.cachedSize.load(std::memory_order_relaxed));
-        CHECK_FAST(cacheBinModel.meanHitRange.load(std::memory_order_relaxed)
-                   == cacheBin.meanHitRange.load(std::memory_order_relaxed));
+        CHECK_FAST(cacheBinModel.ageThreshold.load(std::memory_order_relaxed) == cacheBin.ageThreshold.load(std::memory_order_relaxed));
+        CHECK_FAST(cacheBinModel.usedSize.load(std::memory_order_relaxed) == cacheBin.usedSize.load(std::memory_order_relaxed));
+        CHECK_FAST(cacheBinModel.cachedSize.load(std::memory_order_relaxed) == cacheBin.cachedSize.load(std::memory_order_relaxed));
+        CHECK_FAST(cacheBinModel.meanHitRange.load(std::memory_order_relaxed) == cacheBin.meanHitRange.load(std::memory_order_relaxed));
         CHECK_FAST(cacheBinModel.lastGet == cacheBin.lastGet);
     }
 
@@ -1042,10 +1041,8 @@ class CacheBinModel {
     static intptr_t tooLargeLOC;
 };
 
-template <typename Props>
-uintptr_t CacheBinModel<Props>::cacheCurrTime;
-template <typename Props>
-intptr_t CacheBinModel<Props>::tooLargeLOC;
+template<typename Props> uintptr_t CacheBinModel<Props>::cacheCurrTime;
+template<typename Props> intptr_t CacheBinModel<Props>::tooLargeLOC;
 
 template <typename Scenario>
 void LOCModelTester() {
@@ -1053,25 +1050,19 @@ void LOCModelTester() {
     defaultMemPool->extMemPool.loc.reset();
 
     const size_t size = 16 * 1024;
-    const size_t headersSize
-            = sizeof(rml::internal::LargeMemoryBlock) + sizeof(rml::internal::LargeObjectHdr);
-    const size_t allocationSize
-            = LargeObjectCache::alignToBin(size + headersSize + rml::internal::largeObjectAlignment);
-    const int binIdx = defaultMemPool->extMemPool.loc.largeCache.sizeToIdx(allocationSize);
-
-    CacheBinModel<rml::internal::LargeObjectCache::LargeCacheTypeProps>::cacheCurrTime
-            = defaultMemPool->extMemPool.loc.cacheCurrTime;
-    CacheBinModel<rml::internal::LargeObjectCache::LargeCacheTypeProps>::tooLargeLOC
-            = defaultMemPool->extMemPool.loc.largeCache.tooLargeLOC;
-    CacheBinModel<rml::internal::LargeObjectCache::LargeCacheTypeProps> cacheBinModel(
-            defaultMemPool->extMemPool.loc.largeCache.bin[binIdx], allocationSize);
+    const size_t headersSize = sizeof(rml::internal::LargeMemoryBlock)+sizeof(rml::internal::LargeObjectHdr);
+    const size_t allocationSize = LargeObjectCache::alignToBin(size+headersSize+rml::internal::largeObjectAlignment);
+    const int binIdx = defaultMemPool->extMemPool.loc.largeCache.sizeToIdx( allocationSize );
+
+    CacheBinModel<rml::internal::LargeObjectCache::LargeCacheTypeProps>::cacheCurrTime = defaultMemPool->extMemPool.loc.cacheCurrTime;
+    CacheBinModel<rml::internal::LargeObjectCache::LargeCacheTypeProps>::tooLargeLOC = defaultMemPool->extMemPool.loc.largeCache.tooLargeLOC;
+    CacheBinModel<rml::internal::LargeObjectCache::LargeCacheTypeProps> cacheBinModel(defaultMemPool->extMemPool.loc.largeCache.bin[binIdx], allocationSize);
 
     Scenario scen;
-    for (rml::internal::LargeMemoryBlock *lmb = scen.next(); (intptr_t) lmb != (intptr_t) -1;
-         lmb = scen.next()) {
-        if (lmb) {
-            int num = 1;
-            for (rml::internal::LargeMemoryBlock *curr = lmb; curr->next; curr = curr->next) num += 1;
+    for (rml::internal::LargeMemoryBlock *lmb = scen.next(); (intptr_t)lmb != (intptr_t)-1; lmb = scen.next()) {
+        if ( lmb ) {
+            int num=1;
+            for (rml::internal::LargeMemoryBlock *curr = lmb; curr->next; curr=curr->next) num+=1;
             defaultMemPool->extMemPool.freeLargeObject(lmb);
             cacheBinModel.putList(num);
         } else {
@@ -1085,49 +1076,51 @@ void LOCModelTester() {
 
 class TestBootstrap {
     bool allocating;
-    std::vector<rml::internal::LargeMemoryBlock *> lmbArray;
-
+    std::vector<rml::internal::LargeMemoryBlock*> lmbArray;
 public:
     TestBootstrap() : allocating(true) {}
 
-    rml::internal::LargeMemoryBlock *next() {
-        if (allocating) return NULL;
-        if (!lmbArray.empty()) {
+    rml::internal::LargeMemoryBlock* next() {
+        if ( allocating )
+            return nullptr;
+        if ( !lmbArray.empty() ) {
             rml::internal::LargeMemoryBlock *ret = lmbArray.back();
             lmbArray.pop_back();
             return ret;
         }
-        return (rml::internal::LargeMemoryBlock *) -1;
+        return (rml::internal::LargeMemoryBlock*)-1;
     }
 
-    void saveLmb(rml::internal::LargeMemoryBlock *lmb) {
-        lmb->next = NULL;
+    void saveLmb( rml::internal::LargeMemoryBlock *lmb ) {
+        lmb->next = nullptr;
         lmbArray.push_back(lmb);
-        if (lmbArray.size() == 1000) allocating = false;
+        if ( lmbArray.size() == 1000 ) allocating = false;
     }
 };
 
 class TestRandom {
-    std::vector<rml::internal::LargeMemoryBlock *> lmbArray;
+    std::vector<rml::internal::LargeMemoryBlock*> lmbArray;
     int numOps;
-
 public:
-    TestRandom() : numOps(100000) { srand(1234); }
+    TestRandom() : numOps(100000) {
+        srand(1234);
+    }
 
-    rml::internal::LargeMemoryBlock *next() {
-        if (numOps--) {
-            if (lmbArray.empty() || rand() / (RAND_MAX >> 1) == 0) return NULL;
-            size_t ind = rand() % lmbArray.size();
-            if (ind != lmbArray.size() - 1) std::swap(lmbArray[ind], lmbArray[lmbArray.size() - 1]);
+    rml::internal::LargeMemoryBlock* next() {
+        if ( numOps-- ) {
+            if ( lmbArray.empty() || rand() / (RAND_MAX>>1) == 0 )
+                return nullptr;
+            size_t ind = rand()%lmbArray.size();
+            if ( ind != lmbArray.size()-1 ) std::swap(lmbArray[ind],lmbArray[lmbArray.size()-1]);
             rml::internal::LargeMemoryBlock *lmb = lmbArray.back();
             lmbArray.pop_back();
             return lmb;
         }
-        return (rml::internal::LargeMemoryBlock *) -1;
+        return (rml::internal::LargeMemoryBlock*)-1;
     }
 
-    void saveLmb(rml::internal::LargeMemoryBlock *lmb) {
-        lmb->next = NULL;
+    void saveLmb( rml::internal::LargeMemoryBlock *lmb ) {
+        lmb->next = nullptr;
         lmbArray.push_back(lmb);
     }
 };
@@ -1137,70 +1130,69 @@ class TestCollapsingMallocFree : public SimpleBarrier {
     static const int NUM_ALLOCS = 100000;
     const int num_threads;
 
-    TestCollapsingMallocFree(int _num_threads) : num_threads(_num_threads) { initBarrier(num_threads); }
+    TestCollapsingMallocFree( int _num_threads ) : num_threads(_num_threads) {
+        initBarrier( num_threads );
+    }
 
-    void operator()(int) const {
+    void operator() ( int ) const {
         const size_t size = 16 * 1024;
-        const size_t headersSize
-                = sizeof(rml::internal::LargeMemoryBlock) + sizeof(rml::internal::LargeObjectHdr);
-        const size_t allocationSize
-                = LargeObjectCache::alignToBin(size + headersSize + rml::internal::largeObjectAlignment);
+        const size_t headersSize = sizeof(rml::internal::LargeMemoryBlock)+sizeof(rml::internal::LargeObjectHdr);
+        const size_t allocationSize = LargeObjectCache::alignToBin(size+headersSize+rml::internal::largeObjectAlignment);
 
         barrier.wait();
-        for (int i = 0; i < NUM_ALLOCS; ++i) {
+        for ( int i=0; i<NUM_ALLOCS; ++i ) {
             defaultMemPool->extMemPool.freeLargeObject(
-                    defaultMemPool->extMemPool.mallocLargeObject(defaultMemPool, allocationSize));
+                defaultMemPool->extMemPool.mallocLargeObject(defaultMemPool, allocationSize) );
         }
     }
 
     void check() {
-        REQUIRE(tbbmalloc_whitebox::locGetProcessed == tbbmalloc_whitebox::locPutProcessed);
-        REQUIRE_MESSAGE(tbbmalloc_whitebox::locGetProcessed < num_threads * NUM_ALLOCS,
-                        "No one Malloc/Free pair was collapsed.");
+        REQUIRE( tbbmalloc_whitebox::locGetProcessed == tbbmalloc_whitebox::locPutProcessed);
+        REQUIRE_MESSAGE( tbbmalloc_whitebox::locGetProcessed < num_threads*NUM_ALLOCS, "No one Malloc/Free pair was collapsed." );
     }
 };
 
 class TestCollapsingBootstrap : public SimpleBarrier {
     class CheckNumAllocs {
         const int num_threads;
-
     public:
-        CheckNumAllocs(int _num_threads) : num_threads(_num_threads) {}
+        CheckNumAllocs( int _num_threads ) : num_threads(_num_threads) {}
         void operator()() const {
-            REQUIRE(tbbmalloc_whitebox::locGetProcessed == num_threads * NUM_ALLOCS);
-            REQUIRE(tbbmalloc_whitebox::locPutProcessed == 0);
+            REQUIRE( tbbmalloc_whitebox::locGetProcessed == num_threads*NUM_ALLOCS );
+            REQUIRE( tbbmalloc_whitebox::locPutProcessed == 0 );
         }
     };
-
 public:
     static const int NUM_ALLOCS = 1000;
     const int num_threads;
 
-    TestCollapsingBootstrap(int _num_threads) : num_threads(_num_threads) { initBarrier(num_threads); }
+    TestCollapsingBootstrap( int _num_threads ) : num_threads(_num_threads) {
+        initBarrier( num_threads );
+    }
 
-    void operator()(int) const {
+    void operator() ( int ) const {
         const size_t size = 16 * 1024;
-        size_t headersSize = sizeof(rml::internal::LargeMemoryBlock) + sizeof(rml::internal::LargeObjectHdr);
-        size_t allocationSize
-                = LargeObjectCache::alignToBin(size + headersSize + rml::internal::largeObjectAlignment);
+        size_t headersSize = sizeof(rml::internal::LargeMemoryBlock)+sizeof(rml::internal::LargeObjectHdr);
+        size_t allocationSize = LargeObjectCache::alignToBin(size+headersSize+rml::internal::largeObjectAlignment);
 
         barrier.wait();
         rml::internal::LargeMemoryBlock *lmbArray[NUM_ALLOCS];
-        for (int i = 0; i < NUM_ALLOCS; ++i)
+        for ( int i=0; i<NUM_ALLOCS; ++i )
             lmbArray[i] = defaultMemPool->extMemPool.mallocLargeObject(defaultMemPool, allocationSize);
 
         barrier.wait(CheckNumAllocs(num_threads));
-        for (int i = 0; i < NUM_ALLOCS; ++i) defaultMemPool->extMemPool.freeLargeObject(lmbArray[i]);
+        for ( int i=0; i<NUM_ALLOCS; ++i )
+            defaultMemPool->extMemPool.freeLargeObject( lmbArray[i] );
     }
 
     void check() {
-        REQUIRE(tbbmalloc_whitebox::locGetProcessed == tbbmalloc_whitebox::locPutProcessed);
-        REQUIRE(tbbmalloc_whitebox::locGetProcessed == num_threads * NUM_ALLOCS);
+        REQUIRE( tbbmalloc_whitebox::locGetProcessed == tbbmalloc_whitebox::locPutProcessed );
+        REQUIRE( tbbmalloc_whitebox::locGetProcessed == num_threads*NUM_ALLOCS );
     }
 };
 
 template <typename Scenario>
-void LOCCollapsingTester(int num_threads) {
+void LOCCollapsingTester( int num_threads ) {
     tbbmalloc_whitebox::locGetProcessed = 0;
     tbbmalloc_whitebox::locPutProcessed = 0;
     defaultMemPool->extMemPool.loc.cleanAll();
@@ -1217,35 +1209,37 @@ void TestLOC() {
     LOCModelTester<TestRandom>();
 
     const int num_threads = 16;
-    LOCCollapsingTester<TestCollapsingBootstrap>(num_threads);
-    if (num_threads > 1) {
-        INFO("num_threads = " << num_threads);
-        LOCCollapsingTester<TestCollapsingMallocFree>(num_threads);
+    LOCCollapsingTester<TestCollapsingBootstrap>( num_threads );
+    if ( num_threads > 1 ) {
+        INFO( "num_threads = " << num_threads );
+        LOCCollapsingTester<TestCollapsingMallocFree>( num_threads );
     } else {
-        REPORT("Warning: concurrency is too low for TestMallocFreeCollapsing ( num_threads = %d )\n",
-               num_threads);
+        REPORT( "Warning: concurrency is too low for TestMallocFreeCollapsing ( num_threads = %d )\n", num_threads );
     }
 }
 /*---------------------------------------------------------------------------*/
 
-void *findCacheLine(void *p) { return (void *) alignDown((uintptr_t) p, estimatedCacheLineSize); }
+void *findCacheLine(void *p) {
+    return (void*)alignDown((uintptr_t)p, estimatedCacheLineSize);
+}
 
 // test that internals of Block are at expected cache lines
 void TestSlabAlignment() {
     const size_t min_sz = 8;
-    const int space = 2 * 16 * 1024;// fill at least 2 slabs
-    void *pointers[space / min_sz]; // the worst case is min_sz byte object
+    const int space = 2*16*1024; // fill at least 2 slabs
+    void *pointers[space / min_sz];  // the worst case is min_sz byte object
 
     for (size_t sz = min_sz; sz <= 64; sz *= 2) {
-        for (size_t i = 0; i < space / sz; i++) {
+        for (size_t i = 0; i < space/sz; i++) {
             pointers[i] = scalable_malloc(sz);
-            Block *block = (Block *) alignDown(pointers[i], slabSize);
+            Block *block = (Block *)alignDown(pointers[i], slabSize);
             REQUIRE_MESSAGE(findCacheLine(&block->isFull) != findCacheLine(pointers[i]),
-                            "A user object must not share a cache line with slab control structures.");
+                          "A user object must not share a cache line with slab control structures.");
             REQUIRE_MESSAGE(findCacheLine(&block->next) != findCacheLine(&block->nextPrivatizable),
-                            "GlobalBlockFields and LocalBlockFields must be on different cache lines.");
+                          "GlobalBlockFields and LocalBlockFields must be on different cache lines.");
         }
-        for (size_t i = 0; i < space / sz; i++) scalable_free(pointers[i]);
+        for (size_t i = 0; i < space/sz; i++)
+            scalable_free(pointers[i]);
     }
 }
 
@@ -1263,14 +1257,18 @@ void TestTHP() {
     scalable_allocation_mode(USE_HUGE_PAGES, 1);
     REQUIRE_MESSAGE(hugePages.isEnabled, "Huge pages should be enabled via scalable_allocation_mode");
 
+#if defined __loongarch64
+    const int HUGE_PAGE_SIZE = 32 * 1024 * 1024;
+#else
     const int HUGE_PAGE_SIZE = 2 * 1024 * 1024;
+#endif
 
     // allocCount transparent huge pages should be allocated
     const int allocCount = 10;
 
     // Allocate huge page aligned memory regions to track system
     // counters for transparent huge pages
-    void *allocPtrs[allocCount];
+    void*  allocPtrs[allocCount];
 
     // Wait for the system to update process memory info files after other tests
     utils::Sleep(4000);
@@ -1288,13 +1286,13 @@ void TestTHP() {
 
         REQUIRE_MESSAGE(allocPtrs[i], "Allocation not succeeded.");
         REQUIRE_MESSAGE(allocSize == HUGE_PAGE_SIZE,
-                        "Allocation size have to be aligned on Huge Page size internally.");
+            "Allocation size have to be aligned on Huge Page size internally.");
 
         // First touch policy - no real pages allocated by OS without accessing the region
         memset(allocPtrs[i], 1, allocSize);
 
         REQUIRE_MESSAGE(isAligned(allocPtrs[i], HUGE_PAGE_SIZE),
-                        "The pointer returned by scalable_malloc is not aligned on huge page size.");
+            "The pointer returned by scalable_malloc is not aligned on huge page size.");
     }
 
     // Wait for the system to update process memory info files after allocations
@@ -1306,33 +1304,31 @@ void TestTHP() {
     size_t newSystemTHPCount = utils::getSystemTHPCount();
     size_t newSystemTHPAllocatedSize = utils::getSystemTHPAllocatedSize();
     if ((newSystemTHPCount - currentSystemTHPCount) < allocCount
-        && (newSystemTHPAllocatedSize - currentSystemTHPAllocatedSize) / (2 * 1024) < allocCount) {
-        REPORT("Warning: the system didn't allocate needed amount of THPs.\n");
+            && (newSystemTHPAllocatedSize - currentSystemTHPAllocatedSize) / (2 * 1024) < allocCount) {
+        REPORT( "Warning: the system didn't allocate needed amount of THPs.\n" );
     }
 
     // Test memory unmap
     for (int i = 0; i < allocCount; i++) {
         REQUIRE_MESSAGE(backend->freeRawMem(allocPtrs[i], HUGE_PAGE_SIZE),
-                        "Something went wrong during raw memory free");
+                "Something went wrong during raw memory free");
     }
 }
-#endif// __unix__
+#endif // __unix__
 
 inline size_t getStabilizedMemUsage() {
     for (int i = 0; i < 3; i++) utils::GetMemoryUsage();
     return utils::GetMemoryUsage();
 }
 
-inline void *reallocAndRetrieve(void *origPtr, size_t reallocSize, size_t &origBlockSize,
-                                size_t &reallocBlockSize) {
-    rml::internal::LargeMemoryBlock *origLmb = ((rml::internal::LargeObjectHdr *) origPtr - 1)->memoryBlock;
+inline void* reallocAndRetrieve(void* origPtr, size_t reallocSize, size_t& origBlockSize, size_t& reallocBlockSize) {
+    rml::internal::LargeMemoryBlock* origLmb = ((rml::internal::LargeObjectHdr *)origPtr - 1)->memoryBlock;
     origBlockSize = origLmb->unalignedSize;
 
-    void *reallocPtr = rml::internal::reallocAligned(defaultMemPool, origPtr, reallocSize, 0);
+    void* reallocPtr = rml::internal::reallocAligned(defaultMemPool, origPtr, reallocSize, 0);
 
     // Retrieved reallocated block information
-    rml::internal::LargeMemoryBlock *reallocLmb
-            = ((rml::internal::LargeObjectHdr *) reallocPtr - 1)->memoryBlock;
+    rml::internal::LargeMemoryBlock* reallocLmb = ((rml::internal::LargeObjectHdr *)reallocPtr - 1)->memoryBlock;
     reallocBlockSize = reallocLmb->unalignedSize;
 
     return reallocPtr;
@@ -1345,8 +1341,8 @@ void TestReallocDecreasing() {
 
     size_t startSize = 100 * 1024 * 1024;
     size_t maxBinnedSize = defaultMemPool->extMemPool.backend.getMaxBinnedSize();
-    void *origPtr = scalable_malloc(startSize);
-    void *reallocPtr = NULL;
+    void*  origPtr = scalable_malloc(startSize);
+    void*  reallocPtr = nullptr;
 
     // Realloc on 1MB less size
     size_t origBlockSize = 42;
@@ -1356,8 +1352,8 @@ void TestReallocDecreasing() {
     REQUIRE_MESSAGE(reallocPtr == origPtr, "Original pointer shouldn't change");
 
     // Repeated decreasing reallocation while max cache bin size reached
-    size_t reallocSize = (startSize / 2) - 1000;// exact realloc
-    while (reallocSize > maxBinnedSize) {
+    size_t reallocSize = (startSize / 2) - 1000; // exact realloc
+    while(reallocSize > maxBinnedSize) {
 
         // Prevent huge/large objects caching
         defaultMemPool->extMemPool.loc.cleanAll();
@@ -1370,7 +1366,7 @@ void TestReallocDecreasing() {
 
         reallocPtr = reallocAndRetrieve(origPtr, reallocSize, origBlockSize, reallocBlockSize);
 
-        REQUIRE_MESSAGE(origBlockSize > reallocBlockSize, "Reallocated block size should descrease.");
+        REQUIRE_MESSAGE(origBlockSize > reallocBlockSize, "Reallocated block size should decrease.");
 
         size_t sysMemUsageAfter = getStabilizedMemUsage();
         size_t totalMemSizeAfter = defaultMemPool->extMemPool.backend.getTotalMemSize();
@@ -1381,7 +1377,7 @@ void TestReallocDecreasing() {
         }
 
         origPtr = reallocPtr;
-        reallocSize = (reallocSize / 2) - 1000;// exact realloc
+        reallocSize = (reallocSize / 2) - 1000; // exact realloc
     }
     scalable_free(reallocPtr);
 
@@ -1393,14 +1389,18 @@ void TestReallocDecreasing() {
 #include "../../src/tbbmalloc_proxy/function_replacement.cpp"
 #include <string>
 namespace FunctionReplacement {
-    FunctionInfo funcInfo = {"funcname", "dllname"};
+    FunctionInfo funcInfo = { "funcname","dllname" };
     char **func_replacement_log;
     int status;
 
     void LogCleanup() {
         // Free all allocated memory
-        for (unsigned i = 0; i < Log::record_number; i++) { HeapFree(GetProcessHeap(), 0, Log::records[i]); }
-        for (unsigned i = 0; i < Log::RECORDS_COUNT + 1; i++) { Log::records[i] = NULL; }
+        for (unsigned i = 0; i < Log::record_number; i++){
+            HeapFree(GetProcessHeap(), 0, Log::records[i]);
+        }
+        for (unsigned i = 0; i < Log::RECORDS_COUNT + 1; i++){
+            Log::records[i] = nullptr;
+        }
         Log::replacement_status = true;
         Log::record_number = 0;
     }
@@ -1413,7 +1413,8 @@ namespace FunctionReplacement {
     }
 
     void TestLogOverload() {
-        for (int i = 0; i < 1000; i++) Log::record(funcInfo, "opcode string", true);
+        for (int i = 0; i < 1000; i++)
+            Log::record(funcInfo, "opcode string", true);
 
         status = TBB_malloc_replacement_log(&func_replacement_log);
         // Find last record
@@ -1425,7 +1426,7 @@ namespace FunctionReplacement {
 
         // Change status
         Log::record(funcInfo, "opcode string", false);
-        status = TBB_malloc_replacement_log(NULL);
+        status = TBB_malloc_replacement_log(nullptr);
         REQUIRE_MESSAGE(status == -1, "Status is true, but we have false search case");
 
         LogCleanup();
@@ -1433,8 +1434,8 @@ namespace FunctionReplacement {
 
     void TestFalseSearchCase() {
         Log::record(funcInfo, "opcode string", false);
-        std::string expected_line = "Fail: " + std::string(funcInfo.funcName) + " ("
-                                    + std::string(funcInfo.dllName) + "), byte pattern: <opcode string>";
+        std::string expected_line = "Fail: "+ std::string(funcInfo.funcName) + " (" +
+                         std::string(funcInfo.dllName) + "), byte pattern: <opcode string>";
 
         status = TBB_malloc_replacement_log(&func_replacement_log);
 
@@ -1443,10 +1444,10 @@ namespace FunctionReplacement {
         LogCleanup();
     }
 
-    void TestWrongFunctionInDll() {
+    void TestWrongFunctionInDll(){
         HMODULE ucrtbase_handle = GetModuleHandle("ucrtbase.dll");
         if (ucrtbase_handle) {
-            IsPrologueKnown("ucrtbase.dll", "fake_function", NULL, ucrtbase_handle);
+            IsPrologueKnown("ucrtbase.dll", "fake_function", nullptr, ucrtbase_handle);
             std::string expected_line = "Fail: fake_function (ucrtbase.dll), byte pattern: <unknown>";
 
             status = TBB_malloc_replacement_log(&func_replacement_log);
@@ -1458,7 +1459,7 @@ namespace FunctionReplacement {
             INFO("Cannot found ucrtbase.dll on system, test skipped!\n");
         }
     }
-}// namespace FunctionReplacement
+}
 
 void TesFunctionReplacementLog() {
     using namespace FunctionReplacement;
@@ -1471,20 +1472,19 @@ void TesFunctionReplacementLog() {
 
 #endif /*!__TBB_WIN8UI_SUPPORT && defined(_WIN32)*/
 
-#include <cmath>// pow function
+#include <cmath> // pow function
 
 // Huge objects cache: Size = MinSize * (2 ^ (Index / StepFactor) formula gives value for the bin size,
 // but it is not matched with our sizeToIdx approximation algorithm, where step sizes between major
 // (power of 2) sizes are equal. Used internally for the test. Static cast to avoid warnings.
 inline size_t hocIdxToSizeFormula(int idx) {
-    return static_cast<size_t>(
-            float(rml::internal::LargeObjectCache::maxLargeSize)
-            * pow(2, float(idx) / float(rml::internal::LargeObjectCache::HugeBSProps::StepFactor)));
+    return static_cast<size_t>(float(rml::internal::LargeObjectCache::maxLargeSize) *
+        pow(2, float(idx) / float(rml::internal::LargeObjectCache::HugeBSProps::StepFactor)));
 }
 // Large objects cache arithmetic progression
 inline size_t locIdxToSizeFormula(int idx) {
-    return rml::internal::LargeObjectCache::LargeBSProps::MinSize
-           + (idx * rml::internal::LargeObjectCache::LargeBSProps::CacheStep);
+    return rml::internal::LargeObjectCache::LargeBSProps::MinSize +
+        (idx * rml::internal::LargeObjectCache::LargeBSProps::CacheStep);
 }
 
 template <typename CacheType>
@@ -1495,7 +1495,7 @@ void TestLOCacheBinsConverterImpl(int idx, size_t checkingSize) {
     REQUIRE_MESSAGE(calcIdx == idx, "Index from size calculated not correctly");
 }
 
-void TestLOCacheBinsConverter() {
+void TestLOCacheBinsConverter(){
     typedef rml::internal::LargeObjectCache::LargeCacheType LargeCacheType;
     typedef rml::internal::LargeObjectCache::HugeCacheType HugeCacheType;
 
@@ -1511,7 +1511,7 @@ void TestLOCacheBinsConverter() {
 }
 
 struct HOThresholdTester {
-    LargeObjectCache *loc;
+    LargeObjectCache* loc;
     size_t hugeSize;
 
     static const size_t sieveSize = LargeObjectCache::defaultMaxHugeSize;
@@ -1520,10 +1520,14 @@ struct HOThresholdTester {
     static const int MIN_BIN_IDX = 21;
     static const int MAX_BIN_IDX = 27;
 
-    enum CleanupType { NO_CLEANUP, REGULAR_CLEANUP, HARD_CLEANUP };
+    enum CleanupType {
+        NO_CLEANUP,
+        REGULAR_CLEANUP,
+        HARD_CLEANUP
+    };
 
     void populateCache() {
-        LargeMemoryBlock *loArray[MAX_BIN_IDX - MIN_BIN_IDX];
+        LargeMemoryBlock* loArray[MAX_BIN_IDX - MIN_BIN_IDX];
         // To avoid backend::softCacheCleanup consequences (cleanup by isLOCToolarge),
         // firstly allocate all objects and then cache them at once.
         // Morevover, just because first cache item will still be dropped from cache because of the lack of history,
@@ -1536,7 +1540,9 @@ struct HOThresholdTester {
             loc->put(loArray[localIdx]);
             loArray[localIdx] = defaultMemPool->extMemPool.mallocLargeObject(defaultMemPool, allocationSize);
         }
-        for (int idx = MIN_BIN_IDX; idx < MAX_BIN_IDX; ++idx) { loc->put(loArray[idx - MIN_BIN_IDX]); }
+        for (int idx = MIN_BIN_IDX; idx < MAX_BIN_IDX; ++idx) {
+            loc->put(loArray[idx - MIN_BIN_IDX]);
+        }
     }
     void clean(bool all) {
         if (all) {
@@ -1555,12 +1561,10 @@ struct HOThresholdTester {
             // Cache object below sieve threshold and above huge object threshold should be cached
             // (other should be sieved). Unless all cache is dropped. Regular cleanup drops object only below sieve size.
             if (type == NO_CLEANUP && sizeInCacheRange(objectSize)) {
-                REQUIRE_MESSAGE(objectInCacheBin(idx, objectSize),
-                                "Object was released from cache, it shouldn't.");
+                REQUIRE_MESSAGE(objectInCacheBin(idx, objectSize), "Object was released from cache, it shouldn't.");
             } else if (type == REGULAR_CLEANUP && (objectSize >= hugeSize)) {
-                REQUIRE_MESSAGE(objectInCacheBin(idx, objectSize),
-                                "Object was released from cache, it shouldn't.");
-            } else {// HARD_CLEANUP
+                REQUIRE_MESSAGE(objectInCacheBin(idx, objectSize), "Object was released from cache, it shouldn't.");
+            } else { // HARD_CLEANUP
                 REQUIRE_MESSAGE(cacheBinEmpty(idx), "Object is still cached.");
             }
         }
@@ -1568,14 +1572,15 @@ struct HOThresholdTester {
 
 private:
     bool cacheBinEmpty(int idx) {
-        return (loc->hugeCache.bin[idx].cachedSize.load(std::memory_order_relaxed) == 0
-                && loc->hugeCache.bin[idx].get() == NULL);
+        return (loc->hugeCache.bin[idx].cachedSize.load(std::memory_order_relaxed) == 0 && loc->hugeCache.bin[idx].get() == nullptr);
     }
     bool objectInCacheBin(int idx, size_t size) {
-        return (loc->hugeCache.bin[idx].cachedSize.load(std::memory_order_relaxed) != 0
-                && loc->hugeCache.bin[idx].cachedSize.load(std::memory_order_relaxed) % size == 0);
+        return (loc->hugeCache.bin[idx].cachedSize.load(std::memory_order_relaxed) != 0 &&
+            loc->hugeCache.bin[idx].cachedSize.load(std::memory_order_relaxed) % size == 0);
+    }
+    bool sizeInCacheRange(size_t size) {
+        return size <= sieveSize || size >= hugeSize;
     }
-    bool sizeInCacheRange(size_t size) { return size <= sieveSize || size >= hugeSize; }
     size_t alignedSizeFromIdx(int idx) {
         return rml::internal::LargeObjectCache::alignToBin(hocIdxToSizeFormula(idx));
     }
@@ -1583,19 +1588,19 @@ struct HOThresholdTester {
 
 // TBBMALLOC_SET_HUGE_OBJECT_THRESHOLD value should be set before the test,
 // through scalable API or env variable
-void TestHugeSizeThresholdImpl(LargeObjectCache *loc, size_t hugeSize, bool fullTesting) {
+void TestHugeSizeThresholdImpl(LargeObjectCache* loc, size_t hugeSize, bool fullTesting) {
     HOThresholdTester test = {loc, hugeSize};
     test.populateCache();
     // Check the default sieve value
     test.check(HOThresholdTester::NO_CLEANUP);
 
-    if (fullTesting) {
+    if(fullTesting) {
         // Check that objects above threshold stay in cache after regular cleanup
-        test.clean(/*all*/ false);
+        test.clean(/*all*/false);
         test.check(HOThresholdTester::REGULAR_CLEANUP);
     }
     // Check that all objects dropped from cache after hard cleanup (ignore huge obects threshold)
-    test.clean(/*all*/ true);
+    test.clean(/*all*/true);
     test.check(HOThresholdTester::HARD_CLEANUP);
     // Restore previous settings
     loc->setHugeSizeThreshold(LargeObjectCache::maxHugeSize);
@@ -1607,8 +1612,8 @@ void TestHugeSizeThresholdImpl(LargeObjectCache *loc, size_t hugeSize, bool full
  */
 void TestHugeSizeThreshold() {
     // Clean up if something was allocated before the test and reset cache state
-    scalable_allocation_command(TBBMALLOC_CLEAN_ALL_BUFFERS, 0);
-    LargeObjectCache *loc = &defaultMemPool->extMemPool.loc;
+    scalable_allocation_command(TBBMALLOC_CLEAN_ALL_BUFFERS, nullptr);
+    LargeObjectCache* loc = &defaultMemPool->extMemPool.loc;
     // Restore default settings just in case
     loc->setHugeSizeThreshold(LargeObjectCache::maxHugeSize);
     loc->reset();
@@ -1619,7 +1624,7 @@ void TestHugeSizeThreshold() {
     // All objects with sizes after threshold will be released only after the hard cleanup.
 #if !__TBB_WIN8UI_SUPPORT
     // Unit testing for environment variable
-    utils::SetEnv("TBB_MALLOC_SET_HUGE_SIZE_THRESHOLD", "67108864");
+    utils::SetEnv("TBB_MALLOC_SET_HUGE_SIZE_THRESHOLD","67108864");
     // Large object cache reads threshold environment during initialization.
     // Reset the value before the test.
     loc->hugeSizeThreshold = 0;
@@ -1631,30 +1636,36 @@ void TestHugeSizeThreshold() {
     // Unit testing for scalable_allocation_command
     scalable_allocation_mode(TBBMALLOC_SET_HUGE_SIZE_THRESHOLD, 56 * MByte);
     TestHugeSizeThresholdImpl(loc, 56 * MByte, true);
+    // Verify that objects whose sizes align to maxHugeSize are not cached.
+    size_t sz = LargeObjectCache::maxHugeSize;
+    size_t aligned_sz = LargeObjectCache::alignToBin(sz);
+    REQUIRE_MESSAGE(sz == aligned_sz, "maxHugeSize should be aligned.");
+    REQUIRE_MESSAGE(!loc->sizeInCacheRange(sz), "Upper bound sized object shouldn't be cached.");
+    REQUIRE_MESSAGE(loc->get(sz) == nullptr, "Upper bound sized object shouldn't be cached.");
 }
 
 //! \brief \ref error_guessing
 TEST_CASE("Main test case") {
     scalable_allocation_mode(USE_HUGE_PAGES, 0);
 #if !__TBB_WIN8UI_SUPPORT
-    utils::SetEnv("TBB_MALLOC_USE_HUGE_PAGES", "yes");
+    utils::SetEnv("TBB_MALLOC_USE_HUGE_PAGES","yes");
 #endif
     checkNoHugePages();
     // backreference requires that initialization was done
-    if (!isMallocInitialized()) doInitialization();
+    if(!isMallocInitialized()) doInitialization();
     checkNoHugePages();
     // to succeed, leak detection must be the 1st memory-intensive test
     TestBackRef();
-    TestCleanAllBuffers<4 * 1024>();
-    TestCleanAllBuffers<16 * 1024>();
+    TestCleanAllBuffers<4*1024>();
+    TestCleanAllBuffers<16*1024>();
     TestCleanThreadBuffers();
     TestPools();
     TestBackend();
 
 #if MALLOC_CHECK_RECURSION
-    for (int p = MaxThread; p >= MinThread; --p) {
-        TestStartupAlloc::initBarrier(p);
-        utils::NativeParallelFor(p, TestStartupAlloc());
+    for( int p=MaxThread; p>=MinThread; --p ) {
+        TestStartupAlloc::initBarrier( p );
+        utils::NativeParallelFor( p, TestStartupAlloc() );
         REQUIRE_MESSAGE(!firstStartupBlock, "Startup heap memory leak detected");
     }
 #endif
@@ -1698,5 +1709,7 @@ TEST_CASE("Transparent huge pages") {
 
 #if !__TBB_WIN8UI_SUPPORT && defined(_WIN32)
 //! \brief \ref error_guessing
-TEST_CASE("Function replacement log") { TesFunctionReplacementLog(); }
+TEST_CASE("Function replacement log") {
+    TesFunctionReplacementLog();
+}
 #endif
diff --git a/external/tbb/test/tbbmalloc/test_scalable_allocator.cpp b/external/tbb/test/tbbmalloc/test_scalable_allocator.cpp
index 3b6fd1ee..f53e1c2e 100644
--- a/external/tbb/test/tbbmalloc/test_scalable_allocator.cpp
+++ b/external/tbb/test/tbbmalloc/test_scalable_allocator.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2022 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -14,6 +14,7 @@
     limitations under the License.
 */
 
+
 //! \file test_scalable_allocator.cpp
 //! \brief Test for [memory_allocation.scalable_allocator] functionality
 
@@ -25,21 +26,22 @@
 #define _CRT_SECURE_NO_WARNINGS
 #endif
 
-#define __TBB_EXTRA_DEBUG 1// enables additional checks
+#define __TBB_EXTRA_DEBUG 1 // enables additional checks
 #define TBB_PREVIEW_MEMORY_POOL 1
 #define HARNESS_TBBMALLOC_THREAD_SHUTDOWN 1
 
-#include "common/custom_allocators.h"
 #include "common/test.h"
 #include "common/utils.h"
 #include "common/utils_assert.h"
+#include "common/custom_allocators.h"
+
 
 #include "tbb/memory_pool.h"
 #include "tbb/scalable_allocator.h"
 
 // The actual body of the tests
-#include "common/allocator_stl_test_common.h"
 #include "common/allocator_test_common.h"
+#include "common/allocator_stl_test_common.h"
 
 // #include "harness_allocator.h"
 
@@ -48,7 +50,7 @@
 #endif /* _MSC_VER */
 
 typedef StaticCountingAllocator<tbb::memory_pool_allocator<char>> cnt_alloc_t;
-typedef LocalCountingAllocator<std::allocator<char>> cnt_provider_t;
+typedef LocalCountingAllocator<std::allocator<char> > cnt_provider_t;
 
 class MinimalAllocator : cnt_provider_t {
 public:
@@ -56,16 +58,16 @@ class MinimalAllocator : cnt_provider_t {
     MinimalAllocator() {
         // REMARK("%p::ctor\n", this);
     }
-    MinimalAllocator(const MinimalAllocator &s) : cnt_provider_t(s) {
+    MinimalAllocator(const MinimalAllocator&s) : cnt_provider_t(s) {
         // REMARK("%p::ctor(%p)\n", this, &s);
     }
     ~MinimalAllocator() {
         /* REMARK("%p::dtor: alloc=%u/%u free=%u/%u\n", this, unsigned(items_allocated),unsigned(allocations),
             unsigned(items_freed), unsigned(frees) ); */
-        REQUIRE((allocations == frees && items_allocated == items_freed));
-        if (allocations) {// non-temporal copy
+        REQUIRE((allocations==frees && items_allocated==items_freed));
+        if( allocations ) { // non-temporal copy
             // TODO: describe consumption requirements
-            REQUIRE(items_allocated > cnt_alloc_t::items_allocated);
+            REQUIRE(items_allocated>cnt_alloc_t::items_allocated);
         }
     }
     void *allocate(size_t sz) {
@@ -74,7 +76,7 @@ class MinimalAllocator : cnt_provider_t {
         return p;
     }
     void deallocate(void *p, size_t sz) {
-        REQUIRE(allocations > frees);
+        REQUIRE(allocations>frees);
         // REMARK("%p::deallocate(%p, %u)\n", this, p, unsigned(sz));
         cnt_provider_t::deallocate(std::allocator_traits<cnt_provider_t>::pointer(p), sz);
     }
@@ -83,83 +85,90 @@ class MinimalAllocator : cnt_provider_t {
 class NullAllocator {
 public:
     typedef char value_type;
-    NullAllocator() {}
-    NullAllocator(const NullAllocator &) {}
-    ~NullAllocator() {}
-    void *allocate(size_t) { return NULL; }
+    NullAllocator() { }
+    NullAllocator(const NullAllocator&) { }
+    ~NullAllocator() { }
+    void *allocate(size_t) { return nullptr; }
     void deallocate(void *, size_t) { REQUIRE(false); }
 };
 
-void TestZeroSpaceMemoryPool() {
+void TestZeroSpaceMemoryPool()
+{
     tbb::memory_pool<NullAllocator> pool;
-    bool allocated = pool.malloc(16) || pool.malloc(9 * 1024);
+    bool allocated = pool.malloc(16) || pool.malloc(9*1024);
     REQUIRE_MESSAGE(!allocated, "Allocator with no memory must not allocate anything.");
 }
 
 #if !TBB_USE_EXCEPTIONS
 struct FixedPool {
-    void *buf;
+    void  *buf;
     size_t size;
-    bool used;
+    bool   used;
     FixedPool(void *a_buf, size_t a_size) : buf(a_buf), size(a_size), used(false) {}
 };
 
-static void *fixedBufGetMem(intptr_t pool_id, size_t &bytes) {
-    if (((FixedPool *) pool_id)->used) return NULL;
+static void *fixedBufGetMem(intptr_t pool_id, size_t &bytes)
+{
+    if (((FixedPool*)pool_id)->used)
+        return nullptr;
 
-    ((FixedPool *) pool_id)->used = true;
-    bytes = ((FixedPool *) pool_id)->size;
-    return bytes ? ((FixedPool *) pool_id)->buf : NULL;
+    ((FixedPool*)pool_id)->used = true;
+    bytes = ((FixedPool*)pool_id)->size;
+    return bytes? ((FixedPool*)pool_id)->buf : nullptr;
 }
 #endif
 
 /* test that pools in small space are either usable or not created
    (i.e., exception raised) */
-void TestSmallFixedSizePool() {
+void TestSmallFixedSizePool()
+{
     char *buf;
     bool allocated = false;
 
-    for (size_t sz = 0; sz < 64 * 1024; sz = sz ? 3 * sz : 3) {
-        buf = (char *) malloc(sz);
+    for (size_t sz = 0; sz < 64*1024; sz = sz? 3*sz : 3) {
+        buf = (char*)malloc(sz);
 #if TBB_USE_EXCEPTIONS
         try {
             tbb::fixed_pool pool(buf, sz);
-            /* Check that pool is usable, i.e. such an allocation exists,
+/* Check that pool is usable, i.e. such an allocation exists,
    that can be fulfilled from the pool. 16B allocation fits in 16KB slabs,
    so it requires at least 16KB. Requirement of 9KB allocation is more modest.
 */
-            allocated = pool.malloc(16) || pool.malloc(9 * 1024);
-        } catch (std::invalid_argument &) {
+            allocated = pool.malloc( 16 ) || pool.malloc( 9*1024 );
+        } catch (std::invalid_argument&) {
             REQUIRE_MESSAGE(!sz, "expect std::invalid_argument for zero-sized pool only");
-        } catch (...) { REQUIRE_MESSAGE(false, "wrong exception type;"); }
+        } catch (...) {
+            REQUIRE_MESSAGE(false, "wrong exception type;");
+        }
 #else
-        /* Do not test high-level pool interface because pool ctor emit exception
+/* Do not test high-level pool interface because pool ctor emit exception
    on creation failure. Instead test same functionality via low-level interface.
    TODO: add support for configuration with disabled exceptions to pools.
 */
-        rml::MemPoolPolicy pol(fixedBufGetMem, NULL, 0, /*fixedSizePool=*/true,
+        rml::MemPoolPolicy pol(fixedBufGetMem, nullptr, 0, /*fixedSizePool=*/true,
                                /*keepMemTillDestroy=*/false);
         rml::MemoryPool *pool;
         FixedPool fixedPool(buf, sz);
 
-        rml::MemPoolError ret = pool_create_v1((intptr_t) &fixedPool, &pol, &pool);
+        rml::MemPoolError ret = pool_create_v1((intptr_t)&fixedPool, &pol, &pool);
 
         if (ret == rml::POOL_OK) {
-            allocated = pool_malloc(pool, 16) || pool_malloc(pool, 9 * 1024);
+            allocated = pool_malloc(pool, 16) || pool_malloc(pool, 9*1024);
             pool_destroy(pool);
         } else
-            REQUIRE_MESSAGE(ret == rml::NO_MEMORY,
-                            "Expected that pool either valid or have no memory to be created");
+            REQUIRE_MESSAGE(ret == rml::NO_MEMORY, "Expected that pool either valid or have no memory to be created");
 #endif
         free(buf);
     }
     REQUIRE_MESSAGE(allocated, "Maximal buf size should be enough to create working fixed_pool");
 #if TBB_USE_EXCEPTIONS
     try {
-        tbb::fixed_pool pool(NULL, 10 * 1024 * 1024);
+        tbb::fixed_pool pool(nullptr, 10*1024*1024);
         REQUIRE_MESSAGE(false, "Useless allocator with no memory must not be created");
-    } catch (std::invalid_argument &) {
-    } catch (...) { REQUIRE_MESSAGE(false, "wrong exception type; expected invalid_argument"); }
+    } catch (std::invalid_argument&) {
+    } catch (...) {
+        REQUIRE_MESSAGE(false, "wrong exception type; expected invalid_argument");
+    }
 #endif
 }
 
@@ -169,51 +178,49 @@ TEST_CASE("Allocator concept") {
 #if _MSC_VER && !__TBBMALLOC_NO_IMPLICIT_LINKAGE && !__TBB_WIN8UI_SUPPORT
 #ifdef _DEBUG
     REQUIRE_MESSAGE((!GetModuleHandle("tbbmalloc.dll") && GetModuleHandle("tbbmalloc_debug.dll")),
-                    "test linked with wrong (non-debug) tbbmalloc library");
+        "test linked with wrong (non-debug) tbbmalloc library");
 #else
     REQUIRE_MESSAGE((!GetModuleHandle("tbbmalloc_debug.dll") && GetModuleHandle("tbbmalloc.dll")),
-                    "test linked with wrong (debug) tbbmalloc library");
-#endif// _DEBUG
-#endif// _MSC_VER && !__TBBMALLOC_NO_IMPLICIT_LINKAGE
+        "test linked with wrong (debug) tbbmalloc library");
+#endif // _DEBUG
+#endif // _MSC_VER && !__TBBMALLOC_NO_IMPLICIT_LINKAGE
     // allocate/deallocate
     TestAllocator<tbb::scalable_allocator<void>>(Concept);
     {
         tbb::memory_pool<tbb::scalable_allocator<int>> pool;
         TestAllocator(Concept, tbb::memory_pool_allocator<void>(pool));
-    }
-    {
-            // tbb::memory_pool<MinimalAllocator> pool;
-            // cnt_alloc_t alloc( tbb::memory_pool_allocator<char>(pool) ); // double parentheses to avoid function declaration
-            // TestAllocator(Concept, alloc);
-    } {
-        static char buf[1024 * 1024 * 4];
+    }{
+        // tbb::memory_pool<MinimalAllocator> pool;
+        // cnt_alloc_t alloc( tbb::memory_pool_allocator<char>(pool) ); // double parentheses to avoid function declaration
+        // TestAllocator(Concept, alloc);
+    }{
+        static char buf[1024*1024*4];
         tbb::fixed_pool pool(buf, sizeof(buf));
         const char *text = "this is a test";// 15 bytes
-        char *p1 = (char *) pool.malloc(16);
+        char *p1 = (char*)pool.malloc( 16 );
         REQUIRE(p1);
         strcpy(p1, text);
-        char *p2 = (char *) pool.realloc(p1, 15);
-        REQUIRE_MESSAGE((p2 && !strcmp(p2, text)), "realloc broke memory");
+        char *p2 = (char*)pool.realloc( p1, 15 );
+        REQUIRE_MESSAGE( (p2 && !strcmp(p2, text)), "realloc broke memory" );
 
-        TestAllocator(Concept, tbb::memory_pool_allocator<void>(pool));
+        TestAllocator(Concept, tbb::memory_pool_allocator<void>(pool) );
 
         // try allocate almost entire buf keeping some reasonable space for internals
-        char *p3 = (char *) pool.realloc(p2, sizeof(buf) - 128 * 1024);
-        REQUIRE_MESSAGE(p3, "defragmentation failed");
-        REQUIRE_MESSAGE(!strcmp(p3, text), "realloc broke memory");
-        for (size_t sz = 10; sz < sizeof(buf); sz *= 2) {
-            REQUIRE(pool.malloc(sz));
+        char *p3 = (char*)pool.realloc( p2, sizeof(buf)-128*1024 );
+        REQUIRE_MESSAGE( p3, "defragmentation failed" );
+        REQUIRE_MESSAGE( !strcmp(p3, text), "realloc broke memory" );
+        for( size_t sz = 10; sz < sizeof(buf); sz *= 2) {
+            REQUIRE( pool.malloc( sz ) );
             pool.recycle();
         }
 
-        TestAllocator(Concept, tbb::memory_pool_allocator<void>(pool));
-    }
-    {
+        TestAllocator(Concept, tbb::memory_pool_allocator<void>(pool) );
+    }{
         // Two nested level allocators case with fixed pool allocator as an underlying layer
         // serving allocRawMem requests for the top level scalable allocator
-        typedef tbb::memory_pool<tbb::memory_pool_allocator<char, tbb::fixed_pool>> NestedPool;
+        typedef tbb::memory_pool<tbb::memory_pool_allocator<char, tbb::fixed_pool> > NestedPool;
 
-        static char buffer[8 * 1024 * 1024];
+        static char buffer[8*1024*1024];
         tbb::fixed_pool fixedPool(buffer, sizeof(buffer));
         // Underlying fixed pool allocator
         tbb::memory_pool_allocator<char, tbb::fixed_pool> fixedPoolAllocator(fixedPool);
@@ -241,41 +248,50 @@ TEST_CASE("Allocator concept") {
 #if TBB_USE_EXCEPTIONS
 //! Testing exception guarantees
 //! \brief \ref requirement
-TEST_CASE("Exceptions") { TestAllocator<tbb::scalable_allocator<void>>(Exceptions); }
+TEST_CASE("Exceptions") {
+    TestAllocator<tbb::scalable_allocator<void>>(Exceptions);
+}
 #endif /* TBB_USE_EXCEPTIONS */
 
 //! Testing allocators thread safety (should not introduce data races)
 //! \brief \ref requirements
-TEST_CASE("Thread safety") { TestAllocator<tbb::scalable_allocator<void>>(ThreadSafety); }
+TEST_CASE("Thread safety") {
+    TestAllocator<tbb::scalable_allocator<void>>(ThreadSafety);
+}
 
 //! Test that pools in small space are either usable or not created (i.e., exception raised)
 //! \brief \ref error_guessing
-TEST_CASE("Small fixed pool") { TestSmallFixedSizePool(); }
+TEST_CASE("Small fixed pool") {
+    TestSmallFixedSizePool();
+}
 
 //! Test that allocator with no memory must not allocate anything.
 //! \brief \ref error_guessing
-TEST_CASE("Zero space pool") { TestZeroSpaceMemoryPool(); }
+TEST_CASE("Zero space pool") {
+    TestZeroSpaceMemoryPool();
+}
 
 #if TBB_ALLOCATOR_TRAITS_BROKEN
 //! Testing allocator traits is broken
 //! \brief \ref error_guessing
 TEST_CASE("Broken allocator concept") {
     TestAllocator<tbb::scalable_allocator<void>>(Broken);
-
-    tbb::memory_pool<tbb::scalable_allocator<int>> mpool;
+    
+    tbb::memory_pool<tbb::scalable_allocator<int>> mpool; 
     TestAllocator<tbb::memory_pool_allocator<void>>(Broken, tbb::memory_pool_allocator<void>(mpool));
 }
 #endif
 
+
 //! Testing allocators compatibility with STL containers
 //! \brief \ref interface
 TEST_CASE("Integration with STL containers") {
-    TestAllocatorWithSTL<tbb::scalable_allocator<void>>();
-    tbb::memory_pool<tbb::scalable_allocator<int>> mpool;
-    TestAllocatorWithSTL(tbb::memory_pool_allocator<void>(mpool));
-    static char buf[1024 * 1024 * 4];
+    TestAllocatorWithSTL<tbb::scalable_allocator<void> >();
+    tbb::memory_pool<tbb::scalable_allocator<int> > mpool;
+    TestAllocatorWithSTL(tbb::memory_pool_allocator<void>(mpool) );
+    static char buf[1024*1024*4];
     tbb::fixed_pool fpool(buf, sizeof(buf));
-    TestAllocatorWithSTL(tbb::memory_pool_allocator<void>(fpool));
+    TestAllocatorWithSTL(tbb::memory_pool_allocator<void>(fpool) );
 }
 
 #if __TBB_CPP17_MEMORY_RESOURCE_PRESENT
@@ -283,12 +299,12 @@ TEST_CASE("Integration with STL containers") {
 //! \brief \ref interface
 TEST_CASE("polymorphic_allocator test") {
     REQUIRE_MESSAGE(!tbb::scalable_memory_resource()->is_equal(*std::pmr::get_default_resource()),
-                    "Scalable resource shouldn't be equal to standard resource.");
+            "Scalable resource shouldn't be equal to standard resource." );
     REQUIRE_MESSAGE(tbb::scalable_memory_resource()->is_equal(*tbb::scalable_memory_resource()),
-                    "Memory that was allocated by one scalable resource should be deallocated by any other "
-                    "instance.");
+            "Memory that was allocated by one scalable resource should be deallocated by any other instance.");
 
     typedef std::pmr::polymorphic_allocator<void> pmr_alloc_t;
     TestAllocatorWithSTL(pmr_alloc_t(tbb::scalable_memory_resource()));
 }
 #endif
+
diff --git a/external/tbb/third-party-programs.txt b/external/tbb/third-party-programs.txt
index 40d6ce3b..c088429c 100644
--- a/external/tbb/third-party-programs.txt
+++ b/external/tbb/third-party-programs.txt
@@ -1,58 +1,55 @@
 oneAPI Threading Building Blocks (oneTBB) Third Party Programs File
 
-This file contains the list of third party software ("third party programs")
-contained in the Intel software and their required notices and/or license terms.
-This third party software, even if included with the distribution of the Intel
-software, may be governed by separate license terms, including without limitation,
-third party license terms, other Intel software license terms, and open source
-software license terms. These separate license terms govern your use of the third
-party programs as set forth in the "third-party-programs.txt" or other similarlynamed text file.
+This file is the "third-party-programs.txt" file specified  in  the  associated Intel end user license
+agreement for the Intel software you are licensing.
 
 The third party programs and their corresponding required notices and/or license
 terms are listed below.
 _______________________________________________________________________________________________________
 
-1.  Intel(R) Instrumentation and Tracing Technology (ITT)
-    Copyright (c) 2019 Intel Corporation. All rights reserved.
+1.  Instrumentation and Tracing Technology (ITT) Notify User API:
+    Copyright (c) 2005-2023 Intel Corporation. All rights reserved.
 
-    Redistribution and use in source and binary forms, with or without modification, 
-    are permitted provided that the following conditions are met:
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
 
     1. Redistributions of source code must retain the above copyright
        notice, this list of conditions and the following disclaimer.
     2. Redistributions in binary form must reproduce the above copyright
-       notice, this list of conditions and the following disclaimer in the
-       documentation and/or other materials provided with the distribution.
-    3. Neither the name of the copyright holder nor the names of its contributors may be
-       used to endorse or promote products derived from this software
-       without specific prior written permission.
-    
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-    ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-    OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-    SUCH DAMAGE.
+       notice, this list of conditions and the following disclaimer in 
+       the documentation and/or other materials provided with the 
+       distribution.
+    3. Neither the name of the copyright holder nor the names of its
+       contributors may be used to endorse or promote products derived
+       from this software without specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+    "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+    A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+    HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+    SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+    LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 _______________________________________________________________________________________________________
 
-2.  ActiveState Thread pool with same API as (multi)  processing.Pool (Python recipe):
-    Copyright (c) 2008,2016 david decotigny (this file)
-    Copyright (c) 2006-2008, R Oudkerk (multiprocessing.Pool)
+2.  Portable Hardware Locality (hwloc):
 
-    Portable Hardware Locality (hwloc) 
-    Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana University Research and Technology Corporation.  All rights reserved.
-    Copyright (c) 2004-2005 The University of Tennessee and The University of Tennessee Research Foundation.  All rights reserved.
-    Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, University of Stuttgart.  All rights reserved.
+    Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana University Research and
+                            Technology Corporation.  All rights reserved.
+    Copyright (c) 2004-2005 The University of Tennessee and The University of Tennessee Research
+                            Foundation. All rights reserved.
+    Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, University of Stuttgart.
+                            All rights reserved.
     Copyright (c) 2004-2005 The Regents of the University of California. All rights reserved.
     Copyright (c) 2009      CNRS
     Copyright (c) 2009-2016 Inria.  All rights reserved.
-    Copyright (c) 2009-2015 Universit� Bordeaux
+    Copyright (c) 2009-2015 Université Bordeaux
     Copyright (c) 2009-2015 Cisco Systems, Inc.  All rights reserved.
     Copyright (c) 2009-2012 Oracle and/or its affiliates.  All rights reserved.
     Copyright (c) 2010      IBM
@@ -60,35 +57,32 @@ ________________________________________________________________________________
     Copyright (c) 2012      Aleksej Saushev, The NetBSD Foundation
     Copyright (c) 2012      Blue Brain Project, EPFL. All rights reserved.
     Copyright (c) 2013-2014 University of Wisconsin-La Crosse. All rights reserved.
-    Copyright (c) 2015      Research Organization for Information Science and Technology (RIST). All rights reserved.
+    Copyright (c) 2015      Research Organization for Information Science and Technology (RIST).
+                            All rights reserved.
     Copyright (c) 2015-2016 Intel, Inc.  All rights reserved.
-
-    BSD 3-clause "New" or "Revised" License
+    See COPYING in top-level directory.
 
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions
     are met:
-
     1. Redistributions of source code must retain the above copyright
        notice, this list of conditions and the following disclaimer.
     2. Redistributions in binary form must reproduce the above copyright
        notice, this list of conditions and the following disclaimer in the
        documentation and/or other materials provided with the distribution.
-    3. Neither the name of author nor the names of any contributors may be
-       used to endorse or promote products derived from this software
-       without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS "AS IS" AND
-    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-    OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-    SUCH DAMAGE.
+    3. The name of the author may not be used to endorse or promote products
+       derived from this software without specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+    IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+    OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+    IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+    INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+    NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+    THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 _______________________________________________________________________________________________________
 
 3.  gperftools: Copyright (c) 2011, Google Inc.
@@ -126,268 +120,60 @@ ________________________________________________________________________________
 
 4.  Mateusz Kwiatkowski Workaround for bug 62258 in libstdc++
 
-    GPL 3.0 with GCC Runtime Library Exception 3.1
-
-	GNU GENERAL PUBLIC LICENSE
-
-	Version 3, 29 June 2007
-
-	Copyright (c) 2007 Free Software Foundation, Inc. <https://fsf.org/>
-
-	Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
-
-	Preamble
-	The GNU General Public License is a free, copyleft license for software and other kinds of works.
-
-	The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users. We, the Free Software Foundation, use the GNU General Public License for most of our software; it applies also to any other work released this way by its authors. You can apply it to your programs, too.
-
-	When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things.
-
-	To protect your rights, we need to prevent others from denying you these rights or asking you to surrender the rights. Therefore, you have certain responsibilities if you distribute copies of the software, or if you modify it: responsibilities to respect the freedom of others.
-
-	For example, if you distribute copies of such a program, whether gratis or for a fee, you must pass on to the recipients the same freedoms that you received. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.
-
-	Developers that use the GNU GPL protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License giving you legal permission to copy, distribute and/or modify it.
-
-	For the developers' and authors' protection, the GPL clearly explains that there is no warranty for this free software. For both users' and authors' sake, the GPL requires that modified versions be marked as changed, so that their problems will not be attributed erroneously to authors of previous versions.
-
-	Some devices are designed to deny users access to install or run modified versions of the software inside them, although the manufacturer can do so. This is fundamentally incompatible with the aim of protecting users' freedom to change the software. The systematic pattern of such abuse occurs in the area of products for individuals to use, which is precisely where it is most unacceptable. Therefore, we have designed this version of the GPL to prohibit the practice for those products. If such problems arise substantially in other domains, we stand ready to extend this provision to those domains in future versions of the GPL, as needed to protect the freedom of users.
-
-	Finally, every program is threatened constantly by software patents. States should not allow patents to restrict development and use of software on general-purpose computers, but in those that do, we wish to avoid the special danger that patents applied to a free program could make it effectively proprietary. To prevent this, the GPL assures that patents cannot be used to render the program non-free.
-
-	The precise terms and conditions for copying, distribution and modification follow.
-
-	TERMS AND CONDITIONS
-	0. Definitions.
-	"This License" refers to version 3 of the GNU General Public License.
-
-	"Copyright" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks.
-
-	"The Program" refers to any copyrightable work licensed under this License. Each licensee is addressed as "you". "Licensees" and "recipients" may be individuals or organizations.
-
-	To "modify" a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a "modified version" of the earlier work or a work "based on" the earlier work.
-
-	A "covered work" means either the unmodified Program or a work based on the Program.
-
-	To "propagate" a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well.
-
-	To "convey" a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying.
-
-	An interactive user interface displays "Appropriate Legal Notices" to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion.
-
-	1. Source Code.
-	The "source code" for a work means the preferred form of the work for making modifications to it. "Object code" means any non-source form of a work.
-
-	A "Standard Interface" means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language.
-
-	The "System Libraries" of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A "Major Component", in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it.
-
-	The "Corresponding Source" for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work.
-
-	The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source.
-
-	The Corresponding Source for a work in source code form is that same work.
-
-	2. Basic Permissions.
-	All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law.
-
-	You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you.
-
-	Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary.
-
-	3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-	No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures.
-
-	When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures.
-
-	4. Conveying Verbatim Copies.
-	You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program.
-
-	You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee.
-
-	5. Conveying Modified Source Versions.
-	You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions:
-
-	a) The work must carry prominent notices stating that you modified it, and giving a relevant date.
-	b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to "keep intact all notices".
-	c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it.
-	d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so.
-	A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an "aggregate" if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate.
-
-	6. Conveying Non-Source Forms.
-	You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways:
-
-	a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange.
-	b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge.
-	c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b.
-	d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements.
-	e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d.
-	A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work.
-
-	A "User Product" is either (1) a "consumer product", which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, "normally used" refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product.
-
-	"Installation Information" for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made.
-
-	If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM).
-
-	The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network.
-
-	Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying.
-
-	7. Additional Terms.
-	"Additional permissions" are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions.
-
-	When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission.
-
-	Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms:
-
-	a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or
-	b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or
-	c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or
-	d) Limiting the use for publicity purposes of names of licensors or authors of the material; or
-	e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or
-	f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors.
-	All other non-permissive additional terms are considered "further restrictions" within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying.
-
-	If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms.
-
-	Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way.
-
-	8. Termination.
-	You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11).
-
-	However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation.
-
-	Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice.
-
-	Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10.
-
-	9. Acceptance Not Required for Having Copies.
-	You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so.
-
-	10. Automatic Licensing of Downstream Recipients.
-	Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License.
-
-	An "entity transaction" is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts.
-
-	You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it.
-
-	11. Patents.
-	A "contributor" is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's "contributor version".
-
-	A contributor's "essential patent claims" are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, "control" includes the right to grant patent sublicenses in a manner consistent with the requirements of this License.
-
-	Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version.
-
-	In the following three paragraphs, a "patent license" is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To "grant" such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party.
-
-	If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. "Knowingly relying" means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid.
-
-	If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it.
-
-	A patent license is "discriminatory" if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007.
-
-	Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law.
-
-	12. No Surrender of Others' Freedom.
-	If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program.
-
-	13. Use with the GNU Affero General Public License.
-	Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such.
-
-	14. Revised Versions of this License.
-	The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
-
-	Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License "or any later version" applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation.
-
-	If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program.
-
-	Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version.
-
-	15. Disclaimer of Warranty.
-	THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-	16. Limitation of Liability.
-	IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-	17. Interpretation of Sections 15 and 16.
-	If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee.
-
-	END OF TERMS AND CONDITIONS
-
-	How to Apply These Terms to Your New Programs
-	If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms.
-
-	To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found.
-
-		<one line to give the program's name and a brief idea of what it does.>
-		Copyright (C) <year>  <name of author>
-
-		This program is free software: you can redistribute it and/or modify
-		it under the terms of the GNU General Public License as published by
-		the Free Software Foundation, either version 3 of the License, or
-		(at your option) any later version.
-
-		This program is distributed in the hope that it will be useful,
-		but WITHOUT ANY WARRANTY; without even the implied warranty of
-		MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-		GNU General Public License for more details.
-
-		You should have received a copy of the GNU General Public License
-		along with this program.  If not, see <https://www.gnu.org/licenses/>.
-	Also add information on how to contact you by electronic and paper mail.
-
-	If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode:
-
-		<program>  Copyright (C) <year>  <name of author>
-		This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-		This is free software, and you are welcome to redistribute it
-		under certain conditions; type `show c' for details.
-	The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, your program's commands might be different; for a GUI interface, you would use an "about box".
-
-	You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see <https://www.gnu.org/licenses/>.
-
-	The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read <https://www.gnu.org/licenses/why-not-lgpl.html>.
-
-
-	GCC RUNTIME LIBRARY EXCEPTION
-
-	Version 3.1, 31 March 2009
-
-	Copyright (c) 2009 Free Software Foundation, Inc. <https://fsf.org/>
-
-	Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
-
-	This GCC Runtime Library Exception ("Exception") is an additional permission under section 7 of the GNU General Public License, version 3 ("GPLv3"). It applies to a given file (the "Runtime Library") that bears a notice placed by the copyright holder of the file stating that the file is governed by GPLv3 along with this Exception.
-
-	When you use GCC to compile a program, GCC may combine portions of certain GCC header files and runtime libraries with the compiled program. The purpose of this Exception is to allow compilation of non-GPL (including proprietary) programs to use, in this way, the header files and runtime libraries covered by this Exception.
-
-	0. Definitions.
-	A file is an "Independent Module" if it either requires the Runtime Library for execution after a Compilation Process, or makes use of an interface provided by the Runtime Library, but is not otherwise based on the Runtime Library.
-
-	"GCC" means a version of the GNU Compiler Collection, with or without modifications, governed by version 3 (or a specified later version) of the GNU General Public License (GPL) with the option of using any subsequent versions published by the FSF.
-
-	"GPL-compatible Software" is software whose conditions of propagation, modification and use would permit combination with GCC in accord with the license of GCC.
-
-	"Target Code" refers to output from any compiler for a real or virtual target processor architecture, in executable form or suitable for input to an assembler, loader, linker and/or execution phase. Notwithstanding that, Target Code does not include data in any format that is used as a compiler intermediate representation, or used for producing a compiler intermediate representation.
-
-	The "Compilation Process" transforms code entirely represented in non-intermediate languages designed for human-written code, and/or in Java Virtual Machine byte code, into Target Code. Thus, for example, use of source code generators and preprocessors need not be considered part of the Compilation Process, since the Compilation Process can be understood as starting with the output of the generators or preprocessors.
-
-	A Compilation Process is "Eligible" if it is done using GCC, alone or with other GPL-compatible software, or if it is done without using any work based on GCC. For example, using non-GPL-compatible Software to optimize any GCC intermediate representations would not qualify as an Eligible Compilation Process.
-
-	1. Grant of Additional Permission.
-	You have permission to propagate a work of Target Code formed by combining the Runtime Library with Independent Modules, even if such propagation would otherwise violate the terms of GPLv3, provided that all Target Code was generated by Eligible Compilation Processes. You may then convey such a combination under terms of your choice, consistent with the licensing of the Independent Modules.
+    ********************************************************************************
+    * Author: Mateusz Kwiatkowski <m.kwiatkowski@avsystem.com>                     *
+    *                                                                              *
+    * I hereby renounce all copyright to this file and my rights resulting from    *
+    * it, to the broadest extent permitted by law. It may be treated as public     *
+    * domain.                                                                      *
+    *                                                                              *
+    * However, as this file interfaces with GCC internal ABI, it may be subject to *
+    * the terms and conditions of the GNU General Public License. Please consult   *
+    * the GCC licensing terms and/or a lawyer for details.                         *
+    *                                                                              *
+    * Note that libstdc++ licensing terms grant additional permissions described   *
+    * in the GCC Runtime Library Exception, version 3.1, as published by the       *
+    * Free Software Foundation.                                                    *
+    *******************************************************************************/
+_______________________________________________________________________________________________________
 
-	2. No Weakening of GCC Copyleft.
-	The availability of this Exception does not imply any general presumption that third-party software is unaffected by the copyleft requirements of the license of GCC.
+5. ActiveState Thread pool with same API as (multi) processing. Pool (Python recipe)
+
+    #
+    # Copyright (c) 2008,2016 david decotigny (this file)
+    # Copyright (c) 2006-2008, R Oudkerk (multiprocessing.Pool)
+    # All rights reserved.
+    #
+    # Redistribution and use in source and binary forms, with or without
+    # modification, are permitted provided that the following conditions
+    # are met:
+    #
+    # 1. Redistributions of source code must retain the above copyright
+    #    notice, this list of conditions and the following disclaimer.
+    # 2. Redistributions in binary form must reproduce the above copyright
+    #    notice, this list of conditions and the following disclaimer in the
+    #    documentation and/or other materials provided with the distribution.
+    # 3. Neither the name of author nor the names of any contributors may be
+    #    used to endorse or promote products derived from this software
+    #    without specific prior written permission.
+    #
+    # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS "AS IS" AND
+    # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+    # ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+    # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+    # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+    # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+    # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+    # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+    # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+    # SUCH DAMAGE.
 
 _______________________________________________________________________________________________________
 
-5.  Doctest
-
-    Copyright (c) 2016-2019 Viktor Kirilov
+6. doctest
 
-    The MIT License (MIT)
+    Copyright (c) 2016-2023 Viktor Kirilov
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"), to deal
@@ -406,6 +192,7 @@ ________________________________________________________________________________
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
+
 _______________________________________________________________________________________________________
 
-*Other names and brands may be claimed as the property of others.
+*Other names and brands may be claimed as the property of others.
\ No newline at end of file

From f2deeb4757acba0e8a38c0c7eea855ec3ff92d32 Mon Sep 17 00:00:00 2001
From: Luohao Wang <luohaothu@live.com>
Date: Sun, 8 Jun 2025 17:48:42 +0800
Subject: [PATCH 19/31] [Ext] Patch TBB for linkage requirement

---
 cmake/TBBConfig.cmake                         |   40 +-
 .../include/oneapi/tbb/concurrent_hash_map.h  | 3188 ++++----
 .../oneapi/tbb/detail/_flow_graph_impl.h      | 1031 ++-
 .../tbb/detail/_flow_graph_trace_impl.h       |  104 +-
 .../tbb/include/oneapi/tbb/detail/_machine.h  |   12 +-
 .../tbb/include/oneapi/tbb/detail/_task.h     |    4 +-
 .../tbb/include/oneapi/tbb/detail/_utils.h    |    4 +-
 external/tbb/include/oneapi/tbb/flow_graph.h  | 6853 +++++++++--------
 external/tbb/include/oneapi/tbb/partitioner.h | 1237 +--
 external/tbb/include/oneapi/tbb/task_group.h  |    2 -
 10 files changed, 6273 insertions(+), 6202 deletions(-)

diff --git a/cmake/TBBConfig.cmake b/cmake/TBBConfig.cmake
index baeab705..22c0aeb9 100644
--- a/cmake/TBBConfig.cmake
+++ b/cmake/TBBConfig.cmake
@@ -16,25 +16,31 @@
 
 macro(CONFIG_AND_INSTALL_TBB)
     file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tbb-build)
-    execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}"
-            -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-            -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DTBB_TEST=OFF -DTBB_STRICT=OFF
-            -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} ${CMAKE_CURRENT_LIST_DIR}/../external/tbb
-            RESULT_VARIABLE result
-            WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tbb-build)
-    if (result)
+    execute_process(COMMAND ${CMAKE_COMMAND}
+        -G "${CMAKE_GENERATOR}"
+        -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+        -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+        -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
+        -DTBB_TEST=OFF
+        -DTBB_STRICT=OFF
+        -DCMAKE_CXX_STANDARD=17
+        -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+        ${CMAKE_CURRENT_LIST_DIR}/../external/tbb
+        RESULT_VARIABLE result
+        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tbb-build)
+    if(result)
         message(FATAL_ERROR "CMake step for TBB failed: ${result}")
-    endif ()
+    endif()
     execute_process(COMMAND ${CMAKE_COMMAND} --build . -j
-            RESULT_VARIABLE result
-            WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tbb-build)
-    if (result)
+        RESULT_VARIABLE result
+        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tbb-build)
+    if(result)
         message(FATAL_ERROR "Build step for TBB failed: ${result}")
-    endif ()
+    endif()
     execute_process(COMMAND ${CMAKE_COMMAND} --install .
-            RESULT_VARIABLE result
-            WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tbb-build)
-    if (result)
+        RESULT_VARIABLE result
+        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tbb-build)
+    if(result)
         message(FATAL_ERROR "Install step for TBB failed: ${result}")
-    endif ()
-endmacro()
\ No newline at end of file
+    endif()
+endmacro()
diff --git a/external/tbb/include/oneapi/tbb/concurrent_hash_map.h b/external/tbb/include/oneapi/tbb/concurrent_hash_map.h
index 0c52b725..9a8e46f3 100644
--- a/external/tbb/include/oneapi/tbb/concurrent_hash_map.h
+++ b/external/tbb/include/oneapi/tbb/concurrent_hash_map.h
@@ -17,1652 +17,1700 @@
 #ifndef __TBB_concurrent_hash_map_H
 #define __TBB_concurrent_hash_map_H
 
-#include "detail/_namespace_injection.h"
-#include "detail/_utils.h"
-#include "detail/_assert.h"
 #include "detail/_allocator_traits.h"
+#include "detail/_assert.h"
 #include "detail/_containers_helpers.h"
-#include "detail/_template_helpers.h"
 #include "detail/_hash_compare.h"
+#include "detail/_namespace_injection.h"
 #include "detail/_range_common.h"
-#include "tbb_allocator.h"
+#include "detail/_template_helpers.h"
+#include "detail/_utils.h"
 #include "spin_rw_mutex.h"
+#include "tbb_allocator.h"
 
 #include <atomic>
+#include <cstring>// Need std::memset
 #include <initializer_list>
-#include <tuple>
 #include <iterator>
-#include <utility>      // Need std::pair
-#include <cstring>      // Need std::memset
+#include <tuple>
+#include <utility>// Need std::pair
 
 namespace tbb {
-namespace detail {
-namespace d2 {
+    namespace detail {
+        namespace d2 {
 
 #if __TBB_PREVIEW_CONCURRENT_HASH_MAP_EXTENSIONS && __TBB_CPP20_CONCEPTS_PRESENT
-template <typename Mutex>
-concept ch_map_rw_scoped_lockable = rw_scoped_lockable<Mutex> &&
-	requires(const typename Mutex::scoped_lock& sl) {
-		{ sl.is_writer() } -> std::convertible_to<bool>;
-};
+            template <typename Mutex>
+            concept ch_map_rw_scoped_lockable
+                    = rw_scoped_lockable<Mutex> && requires(const typename Mutex::scoped_lock& sl) {
+                          { sl.is_writer() } -> std::convertible_to<bool>;
+                      };
 #endif
 
-template <typename MutexType>
-struct hash_map_node_base : no_copy {
-    using mutex_type = MutexType;
-    // Scoped lock type for mutex
-    using scoped_type = typename MutexType::scoped_lock;
-    // Next node in chain
-    hash_map_node_base* next;
-    mutex_type mutex;
-};
-
-// Incompleteness flag value
-static void* const rehash_req_flag = reinterpret_cast<void*>(std::size_t(3));
-// Rehashed empty bucket flag
-static void* const empty_rehashed_flag = reinterpret_cast<void*>(std::size_t(0));
-
-template <typename MutexType>
-bool rehash_required( hash_map_node_base<MutexType>* node_ptr ) {
-    return reinterpret_cast<void*>(node_ptr) == rehash_req_flag;
-}
+            template <typename MutexType>
+            struct hash_map_node_base : no_copy {
+                using mutex_type = MutexType;
+                // Scoped lock type for mutex
+                using scoped_type = typename MutexType::scoped_lock;
+                // Next node in chain
+                hash_map_node_base* next;
+                mutex_type mutex;
+            };
+
+            // Incompleteness flag value
+            inline void* const rehash_req_flag = reinterpret_cast<void*>(std::size_t(3));
+            // Rehashed empty bucket flag
+            inline void* const empty_rehashed_flag = reinterpret_cast<void*>(std::size_t(0));
+
+            template <typename MutexType>
+            bool rehash_required(hash_map_node_base<MutexType>* node_ptr) {
+                return reinterpret_cast<void*>(node_ptr) == rehash_req_flag;
+            }
 
 #if TBB_USE_ASSERT
-template <typename MutexType>
-bool empty_rehashed( hash_map_node_base<MutexType>* node_ptr ) {
-    return reinterpret_cast<void*>(node_ptr) == empty_rehashed_flag;
-}
+            template <typename MutexType>
+            bool empty_rehashed(hash_map_node_base<MutexType>* node_ptr) {
+                return reinterpret_cast<void*>(node_ptr) == empty_rehashed_flag;
+            }
 #endif
 
-// base class of concurrent_hash_map
-
-template <typename Allocator, typename MutexType>
-class hash_map_base {
-public:
-    using size_type = std::size_t;
-    using hashcode_type = std::size_t;
-    using segment_index_type = std::size_t;
-    using node_base = hash_map_node_base<MutexType>;
-
-    struct bucket : no_copy {
-        using mutex_type = MutexType;
-        using scoped_type = typename mutex_type::scoped_lock;
-
-        bucket() : node_list(nullptr) {}
-        bucket( node_base* ptr ) : node_list(ptr) {}
-
-        mutex_type mutex;
-        std::atomic<node_base*> node_list;
-    };
-
-    using allocator_type = Allocator;
-    using allocator_traits_type = tbb::detail::allocator_traits<allocator_type>;
-    using bucket_allocator_type = typename allocator_traits_type::template rebind_alloc<bucket>;
-    using bucket_allocator_traits = tbb::detail::allocator_traits<bucket_allocator_type>;
-
-    // Count of segments in the first block
-    static constexpr size_type embedded_block = 1;
-    // Count of segments in the first block
-    static constexpr size_type embedded_buckets = 1 << embedded_block;
-    // Count of segments in the first block
-    static constexpr size_type first_block = 8; //including embedded_block. perfect with bucket size 16, so the allocations are power of 4096
-    // Size of a pointer / table size
-    static constexpr size_type pointers_per_table = sizeof(segment_index_type) * 8; // one segment per bit
-
-    using segment_ptr_type = bucket*;
-    using atomic_segment_type = std::atomic<segment_ptr_type>;
-    using segments_table_type = atomic_segment_type[pointers_per_table];
-
-    hash_map_base( const allocator_type& alloc ) : my_allocator(alloc), my_mask(embedded_buckets - 1), my_size(0) {
-        for (size_type i = 0; i != embedded_buckets; ++i) {
-            my_embedded_segment[i].node_list.store(nullptr, std::memory_order_relaxed);
-        }
-
-        for (size_type segment_index = 0; segment_index < pointers_per_table; ++segment_index) {
-            auto argument = segment_index < embedded_block ? my_embedded_segment + segment_base(segment_index) : nullptr;
-            my_table[segment_index].store(argument, std::memory_order_relaxed);
-        }
-
-        __TBB_ASSERT( embedded_block <= first_block, "The first block number must include embedded blocks");
-    }
-
-    // segment index of given index in the array
-    static segment_index_type segment_index_of( size_type index ) {
-        return segment_index_type(tbb::detail::log2( index|1 ));
-    }
-
-    // the first array index of given segment
-    static segment_index_type segment_base( segment_index_type k ) {
-        return (segment_index_type(1) << k & ~segment_index_type(1));
-    }
-
-    // segment size except for k == 0
-    static size_type segment_size( segment_index_type k ) {
-        return size_type(1) << k; // fake value for k==0
-    }
-
-    // true if ptr is valid pointer
-    static bool is_valid( void* ptr ) {
-        return reinterpret_cast<uintptr_t>(ptr) > uintptr_t(63);
-    }
-
-    template <typename... Args>
-    void init_buckets_impl( segment_ptr_type ptr, size_type sz, const Args&... args ) {
-        for (size_type i = 0; i < sz; ++i) {
-            bucket_allocator_traits::construct(my_allocator, ptr + i, args...);
-        }
-    }
-
-    // Initialize buckets
-    void init_buckets( segment_ptr_type ptr, size_type sz, bool is_initial ) {
-        if (is_initial) {
-            init_buckets_impl(ptr, sz);
-        } else {
-            init_buckets_impl(ptr, sz, reinterpret_cast<node_base*>(rehash_req_flag));
-        }
-    }
-
-    // Add node n to bucket b
-    static void add_to_bucket( bucket* b, node_base* n ) {
-        __TBB_ASSERT(!rehash_required(b->node_list.load(std::memory_order_relaxed)), nullptr);
-        n->next = b->node_list.load(std::memory_order_relaxed);
-        b->node_list.store(n, std::memory_order_relaxed); // its under lock and flag is set
-    }
-
-    const bucket_allocator_type& get_allocator() const {
-        return my_allocator;
-    }
-
-    bucket_allocator_type& get_allocator() {
-        return my_allocator;
-    }
-
-    // Enable segment
-    void enable_segment( segment_index_type k, bool is_initial = false ) {
-        __TBB_ASSERT( k, "Zero segment must be embedded" );
-        size_type sz;
-        __TBB_ASSERT( !is_valid(my_table[k].load(std::memory_order_relaxed)), "Wrong concurrent assignment");
-        if (k >= first_block) {
-            sz = segment_size(k);
-            segment_ptr_type ptr = nullptr;
-            try_call( [&] {
-                ptr = bucket_allocator_traits::allocate(my_allocator, sz);
-            } ).on_exception( [&] {
-                my_table[k].store(nullptr, std::memory_order_relaxed);
-            });
-
-            __TBB_ASSERT(ptr, nullptr);
-            init_buckets(ptr, sz, is_initial);
-            my_table[k].store(ptr, std::memory_order_release);
-            sz <<= 1;// double it to get entire capacity of the container
-        } else { // the first block
-            __TBB_ASSERT( k == embedded_block, "Wrong segment index" );
-            sz = segment_size(first_block);
-            segment_ptr_type ptr = nullptr;
-            try_call( [&] {
-                ptr = bucket_allocator_traits::allocate(my_allocator, sz - embedded_buckets);
-            } ).on_exception( [&] {
-                my_table[k].store(nullptr, std::memory_order_relaxed);
-            });
-
-            __TBB_ASSERT(ptr, nullptr);
-            init_buckets(ptr, sz - embedded_buckets, is_initial);
-            ptr -= segment_base(embedded_block);
-            for(segment_index_type i = embedded_block; i < first_block; i++) // calc the offsets
-                my_table[i].store(ptr + segment_base(i), std::memory_order_release);
-        }
-        my_mask.store(sz-1, std::memory_order_release);
-    }
-
-    void delete_segment( segment_index_type s ) {
-        segment_ptr_type buckets_ptr = my_table[s].load(std::memory_order_relaxed);
-        size_type sz = segment_size( s ? s : 1 );
-
-        size_type deallocate_size = 0;
-
-        if (s >= first_block) { // the first segment or the next
-            deallocate_size = sz;
-        } else if (s == embedded_block && embedded_block != first_block) {
-            deallocate_size = segment_size(first_block) - embedded_buckets;
-        }
-
-        for (size_type i = 0; i < deallocate_size; ++i) {
-            bucket_allocator_traits::destroy(my_allocator, buckets_ptr + i);
-        }
-        if (deallocate_size != 0) {
-            bucket_allocator_traits::deallocate(my_allocator, buckets_ptr, deallocate_size);
-        }
-
-        if (s >= embedded_block) my_table[s].store(nullptr, std::memory_order_relaxed);
-    }
-
-    // Get bucket by (masked) hashcode
-    bucket *get_bucket( hashcode_type h ) const noexcept {
-        segment_index_type s = segment_index_of( h );
-        h -= segment_base(s);
-        segment_ptr_type seg = my_table[s].load(std::memory_order_acquire);
-        __TBB_ASSERT( is_valid(seg), "hashcode must be cut by valid mask for allocated segments" );
-        return &seg[h];
-    }
-
-    // detail serial rehashing helper
-    void mark_rehashed_levels( hashcode_type h ) noexcept {
-        segment_index_type s = segment_index_of( h );
-        while (segment_ptr_type seg = my_table[++s].load(std::memory_order_relaxed))
-            if (rehash_required(seg[h].node_list.load(std::memory_order_relaxed))) {
-                seg[h].node_list.store(reinterpret_cast<node_base*>(empty_rehashed_flag), std::memory_order_relaxed);
-                mark_rehashed_levels( h + ((hashcode_type)1<<s) ); // optimized segment_base(s)
-            }
-    }
-
-    // Check for mask race
-    // Splitting into two functions should help inlining
-    inline bool check_mask_race( const hashcode_type h, hashcode_type &m ) const {
-        hashcode_type m_now, m_old = m;
-        m_now = my_mask.load(std::memory_order_acquire);
-        if (m_old != m_now) {
-            return check_rehashing_collision(h, m_old, m = m_now);
-        }
-        return false;
-    }
-
-    // Process mask race, check for rehashing collision
-    bool check_rehashing_collision( const hashcode_type h, hashcode_type m_old, hashcode_type m ) const {
-        __TBB_ASSERT(m_old != m, nullptr); // TODO?: m arg could be optimized out by passing h = h&m
-        if( (h & m_old) != (h & m) ) { // mask changed for this hashcode, rare event
-            // condition above proves that 'h' has some other bits set beside 'm_old'
-            // find next applicable mask after m_old    //TODO: look at bsl instruction
-            for( ++m_old; !(h & m_old); m_old <<= 1 ) // at maximum few rounds depending on the first block size
-                ;
-            m_old = (m_old<<1) - 1; // get full mask from a bit
-            __TBB_ASSERT((m_old&(m_old+1))==0 && m_old <= m, nullptr);
-            // check whether it is rehashing/ed
-            if (!rehash_required(get_bucket(h & m_old)->node_list.load(std::memory_order_acquire))) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    // Insert a node and check for load factor. @return segment index to enable.
-    segment_index_type insert_new_node( bucket *b, node_base *n, hashcode_type mask ) {
-        size_type sz = ++my_size; // prefix form is to enforce allocation after the first item inserted
-        add_to_bucket( b, n );
-        // check load factor
-        if( sz >= mask ) { // TODO: add custom load_factor
-            segment_index_type new_seg = tbb::detail::log2( mask+1 ); //optimized segment_index_of
-            __TBB_ASSERT( is_valid(my_table[new_seg-1].load(std::memory_order_relaxed)), "new allocations must not publish new mask until segment has allocated");
-            static const segment_ptr_type is_allocating = segment_ptr_type(2);
-            segment_ptr_type disabled = nullptr;
-            if (!(my_table[new_seg].load(std::memory_order_acquire))
-                && my_table[new_seg].compare_exchange_strong(disabled, is_allocating))
-                return new_seg; // The value must be processed
-        }
-        return 0;
-    }
-
-    // Prepare enough segments for number of buckets
-    void reserve(size_type buckets) {
-        if( !buckets-- ) return;
-        bool is_initial = !my_size.load(std::memory_order_relaxed);
-        for (size_type m = my_mask.load(std::memory_order_relaxed); buckets > m;
-            m = my_mask.load(std::memory_order_relaxed))
-        {
-            enable_segment( segment_index_of( m+1 ), is_initial );
-        }
-    }
-
-    // Swap hash_map_bases
-    void internal_swap_content(hash_map_base &table) {
-        using std::swap;
-        swap_atomics_relaxed(my_mask, table.my_mask);
-        swap_atomics_relaxed(my_size, table.my_size);
-
-        for(size_type i = 0; i < embedded_buckets; i++) {
-            auto temp = my_embedded_segment[i].node_list.load(std::memory_order_relaxed);
-            my_embedded_segment[i].node_list.store(table.my_embedded_segment[i].node_list.load(std::memory_order_relaxed),
-                std::memory_order_relaxed);
-            table.my_embedded_segment[i].node_list.store(temp, std::memory_order_relaxed);
-        }
-        for(size_type i = embedded_block; i < pointers_per_table; i++) {
-            auto temp = my_table[i].load(std::memory_order_relaxed);
-            my_table[i].store(table.my_table[i].load(std::memory_order_relaxed),
-                std::memory_order_relaxed);
-            table.my_table[i].store(temp, std::memory_order_relaxed);
-        }
-    }
-
-    void internal_move(hash_map_base&& other) {
-        my_mask.store(other.my_mask.load(std::memory_order_relaxed), std::memory_order_relaxed);
-        other.my_mask.store(embedded_buckets - 1, std::memory_order_relaxed);
-
-        my_size.store(other.my_size.load(std::memory_order_relaxed), std::memory_order_relaxed);
-        other.my_size.store(0, std::memory_order_relaxed);
-
-        for (size_type i = 0; i < embedded_buckets; ++i) {
-            my_embedded_segment[i].node_list.store(other.my_embedded_segment[i].node_list, std::memory_order_relaxed);
-            other.my_embedded_segment[i].node_list.store(nullptr, std::memory_order_relaxed);
-        }
-
-        for (size_type i = embedded_block; i < pointers_per_table; ++i) {
-            my_table[i].store(other.my_table[i].load(std::memory_order_relaxed),
-                std::memory_order_relaxed);
-            other.my_table[i].store(nullptr, std::memory_order_relaxed);
-        }
-    }
-
-protected:
-    bucket_allocator_type my_allocator;
-    // Hash mask = sum of allocated segment sizes - 1
-    std::atomic<hashcode_type> my_mask;
-    // Size of container in stored items
-    std::atomic<size_type> my_size; // It must be in separate cache line from my_mask due to performance effects
-    // Zero segment
-    bucket my_embedded_segment[embedded_buckets];
-    // Segment pointers table. Also prevents false sharing between my_mask and my_size
-    segments_table_type my_table;
-};
-
-template <typename Iterator>
-class hash_map_range;
-
-// Meets requirements of a forward iterator for STL
-// Value is either the T or const T type of the container.
-template <typename Container, typename Value>
-class hash_map_iterator {
-    using map_type = Container;
-    using node = typename Container::node;
-    using map_base = typename Container::base_type;
-    using node_base = typename map_base::node_base;
-    using bucket = typename map_base::bucket;
-public:
-    using value_type = Value;
-    using size_type = typename Container::size_type;
-    using difference_type = typename Container::difference_type;
-    using pointer = value_type*;
-    using reference = value_type&;
-    using iterator_category = std::forward_iterator_tag;
-
-    // Construct undefined iterator
-    hash_map_iterator(): my_map(), my_index(), my_bucket(), my_node() {}
-    hash_map_iterator( const hash_map_iterator<Container, typename Container::value_type>& other ) :
-        my_map(other.my_map),
-        my_index(other.my_index),
-        my_bucket(other.my_bucket),
-        my_node(other.my_node)
-    {}
-
-    hash_map_iterator& operator=( const hash_map_iterator<Container, typename Container::value_type>& other ) {
-        my_map = other.my_map;
-        my_index = other.my_index;
-        my_bucket = other.my_bucket;
-        my_node = other.my_node;
-        return *this;
-    }
-
-    Value& operator*() const {
-        __TBB_ASSERT( map_base::is_valid(my_node), "iterator uninitialized or at end of container?" );
-        return my_node->value();
-    }
-
-    Value* operator->() const {return &operator*();}
-
-    hash_map_iterator& operator++() {
-        my_node = static_cast<node*>( my_node->next );
-        if( !my_node ) advance_to_next_bucket();
-        return *this;
-    }
-
-    // Post increment
-    hash_map_iterator operator++(int) {
-        hash_map_iterator old(*this);
-        operator++();
-        return old;
-    }
-private:
-    template <typename C, typename T, typename U>
-    friend bool operator==( const hash_map_iterator<C,T>& i, const hash_map_iterator<C,U>& j );
-
-    template <typename C, typename T, typename U>
-    friend bool operator!=( const hash_map_iterator<C,T>& i, const hash_map_iterator<C,U>& j );
-
-    template <typename C, typename T, typename U>
-    friend ptrdiff_t operator-( const hash_map_iterator<C,T>& i, const hash_map_iterator<C,U>& j );
-
-    template <typename C, typename U>
-    friend class hash_map_iterator;
-
-    template <typename I>
-    friend class hash_map_range;
-
-    void advance_to_next_bucket() { // TODO?: refactor to iterator_base class
-        size_t k = my_index+1;
-        __TBB_ASSERT( my_bucket, "advancing an invalid iterator?");
-        while (k <= my_map->my_mask.load(std::memory_order_relaxed)) {
-            // Following test uses 2's-complement wizardry
-            if( k&(k-2) ) // not the beginning of a segment
-                ++my_bucket;
-            else my_bucket = my_map->get_bucket( k );
-            node_base *n = my_bucket->node_list.load(std::memory_order_relaxed);
-            if( map_base::is_valid(n) ) {
-                my_node = static_cast<node*>(n);
-                my_index = k;
-                return;
-            }
-            ++k;
-        }
-        my_bucket = nullptr; my_node = nullptr; my_index = k; // the end
-    }
+            // base class of concurrent_hash_map
+
+            template <typename Allocator, typename MutexType>
+            class hash_map_base {
+            public:
+                using size_type = std::size_t;
+                using hashcode_type = std::size_t;
+                using segment_index_type = std::size_t;
+                using node_base = hash_map_node_base<MutexType>;
+
+                struct bucket : no_copy {
+                    using mutex_type = MutexType;
+                    using scoped_type = typename mutex_type::scoped_lock;
+
+                    bucket() : node_list(nullptr) {}
+                    bucket(node_base* ptr) : node_list(ptr) {}
+
+                    mutex_type mutex;
+                    std::atomic<node_base*> node_list;
+                };
+
+                using allocator_type = Allocator;
+                using allocator_traits_type = tbb::detail::allocator_traits<allocator_type>;
+                using bucket_allocator_type = typename allocator_traits_type::template rebind_alloc<bucket>;
+                using bucket_allocator_traits = tbb::detail::allocator_traits<bucket_allocator_type>;
+
+                // Count of segments in the first block
+                static constexpr size_type embedded_block = 1;
+                // Count of segments in the first block
+                static constexpr size_type embedded_buckets = 1 << embedded_block;
+                // Count of segments in the first block
+                static constexpr size_type first_block
+                        = 8;//including embedded_block. perfect with bucket size 16, so the allocations are power of 4096
+                // Size of a pointer / table size
+                static constexpr size_type pointers_per_table
+                        = sizeof(segment_index_type) * 8;// one segment per bit
+
+                using segment_ptr_type = bucket*;
+                using atomic_segment_type = std::atomic<segment_ptr_type>;
+                using segments_table_type = atomic_segment_type[pointers_per_table];
+
+                hash_map_base(const allocator_type& alloc)
+                    : my_allocator(alloc), my_mask(embedded_buckets - 1), my_size(0) {
+                    for (size_type i = 0; i != embedded_buckets; ++i) {
+                        my_embedded_segment[i].node_list.store(nullptr, std::memory_order_relaxed);
+                    }
+
+                    for (size_type segment_index = 0; segment_index < pointers_per_table; ++segment_index) {
+                        auto argument = segment_index < embedded_block
+                                                ? my_embedded_segment + segment_base(segment_index)
+                                                : nullptr;
+                        my_table[segment_index].store(argument, std::memory_order_relaxed);
+                    }
+
+                    __TBB_ASSERT(embedded_block <= first_block,
+                                 "The first block number must include embedded blocks");
+                }
+
+                // segment index of given index in the array
+                static segment_index_type segment_index_of(size_type index) {
+                    return segment_index_type(tbb::detail::log2(index | 1));
+                }
+
+                // the first array index of given segment
+                static segment_index_type segment_base(segment_index_type k) {
+                    return (segment_index_type(1) << k & ~segment_index_type(1));
+                }
+
+                // segment size except for k == 0
+                static size_type segment_size(segment_index_type k) {
+                    return size_type(1) << k;// fake value for k==0
+                }
+
+                // true if ptr is valid pointer
+                static bool is_valid(void* ptr) { return reinterpret_cast<uintptr_t>(ptr) > uintptr_t(63); }
+
+                template <typename... Args>
+                void init_buckets_impl(segment_ptr_type ptr, size_type sz, const Args&... args) {
+                    for (size_type i = 0; i < sz; ++i) {
+                        bucket_allocator_traits::construct(my_allocator, ptr + i, args...);
+                    }
+                }
+
+                // Initialize buckets
+                void init_buckets(segment_ptr_type ptr, size_type sz, bool is_initial) {
+                    if (is_initial) {
+                        init_buckets_impl(ptr, sz);
+                    } else {
+                        init_buckets_impl(ptr, sz, reinterpret_cast<node_base*>(rehash_req_flag));
+                    }
+                }
+
+                // Add node n to bucket b
+                static void add_to_bucket(bucket* b, node_base* n) {
+                    __TBB_ASSERT(!rehash_required(b->node_list.load(std::memory_order_relaxed)), nullptr);
+                    n->next = b->node_list.load(std::memory_order_relaxed);
+                    b->node_list.store(n, std::memory_order_relaxed);// its under lock and flag is set
+                }
+
+                const bucket_allocator_type& get_allocator() const { return my_allocator; }
+
+                bucket_allocator_type& get_allocator() { return my_allocator; }
+
+                // Enable segment
+                void enable_segment(segment_index_type k, bool is_initial = false) {
+                    __TBB_ASSERT(k, "Zero segment must be embedded");
+                    size_type sz;
+                    __TBB_ASSERT(!is_valid(my_table[k].load(std::memory_order_relaxed)),
+                                 "Wrong concurrent assignment");
+                    if (k >= first_block) {
+                        sz = segment_size(k);
+                        segment_ptr_type ptr = nullptr;
+                        try_call([&] {
+                            ptr = bucket_allocator_traits::allocate(my_allocator, sz);
+                        }).on_exception([&] { my_table[k].store(nullptr, std::memory_order_relaxed); });
+
+                        __TBB_ASSERT(ptr, nullptr);
+                        init_buckets(ptr, sz, is_initial);
+                        my_table[k].store(ptr, std::memory_order_release);
+                        sz <<= 1;// double it to get entire capacity of the container
+                    } else {     // the first block
+                        __TBB_ASSERT(k == embedded_block, "Wrong segment index");
+                        sz = segment_size(first_block);
+                        segment_ptr_type ptr = nullptr;
+                        try_call([&] {
+                            ptr = bucket_allocator_traits::allocate(my_allocator, sz - embedded_buckets);
+                        }).on_exception([&] { my_table[k].store(nullptr, std::memory_order_relaxed); });
+
+                        __TBB_ASSERT(ptr, nullptr);
+                        init_buckets(ptr, sz - embedded_buckets, is_initial);
+                        ptr -= segment_base(embedded_block);
+                        for (segment_index_type i = embedded_block; i < first_block; i++)// calc the offsets
+                            my_table[i].store(ptr + segment_base(i), std::memory_order_release);
+                    }
+                    my_mask.store(sz - 1, std::memory_order_release);
+                }
+
+                void delete_segment(segment_index_type s) {
+                    segment_ptr_type buckets_ptr = my_table[s].load(std::memory_order_relaxed);
+                    size_type sz = segment_size(s ? s : 1);
+
+                    size_type deallocate_size = 0;
+
+                    if (s >= first_block) {// the first segment or the next
+                        deallocate_size = sz;
+                    } else if (s == embedded_block && embedded_block != first_block) {
+                        deallocate_size = segment_size(first_block) - embedded_buckets;
+                    }
+
+                    for (size_type i = 0; i < deallocate_size; ++i) {
+                        bucket_allocator_traits::destroy(my_allocator, buckets_ptr + i);
+                    }
+                    if (deallocate_size != 0) {
+                        bucket_allocator_traits::deallocate(my_allocator, buckets_ptr, deallocate_size);
+                    }
+
+                    if (s >= embedded_block) my_table[s].store(nullptr, std::memory_order_relaxed);
+                }
+
+                // Get bucket by (masked) hashcode
+                bucket* get_bucket(hashcode_type h) const noexcept {
+                    segment_index_type s = segment_index_of(h);
+                    h -= segment_base(s);
+                    segment_ptr_type seg = my_table[s].load(std::memory_order_acquire);
+                    __TBB_ASSERT(is_valid(seg), "hashcode must be cut by valid mask for allocated segments");
+                    return &seg[h];
+                }
+
+                // detail serial rehashing helper
+                void mark_rehashed_levels(hashcode_type h) noexcept {
+                    segment_index_type s = segment_index_of(h);
+                    while (segment_ptr_type seg = my_table[++s].load(std::memory_order_relaxed))
+                        if (rehash_required(seg[h].node_list.load(std::memory_order_relaxed))) {
+                            seg[h].node_list.store(reinterpret_cast<node_base*>(empty_rehashed_flag),
+                                                   std::memory_order_relaxed);
+                            mark_rehashed_levels(h + ((hashcode_type) 1 << s));// optimized segment_base(s)
+                        }
+                }
+
+                // Check for mask race
+                // Splitting into two functions should help inlining
+                inline bool check_mask_race(const hashcode_type h, hashcode_type& m) const {
+                    hashcode_type m_now, m_old = m;
+                    m_now = my_mask.load(std::memory_order_acquire);
+                    if (m_old != m_now) { return check_rehashing_collision(h, m_old, m = m_now); }
+                    return false;
+                }
+
+                // Process mask race, check for rehashing collision
+                bool check_rehashing_collision(const hashcode_type h, hashcode_type m_old,
+                                               hashcode_type m) const {
+                    __TBB_ASSERT(m_old != m,
+                                 nullptr);       // TODO?: m arg could be optimized out by passing h = h&m
+                    if ((h & m_old) != (h & m)) {// mask changed for this hashcode, rare event
+                        // condition above proves that 'h' has some other bits set beside 'm_old'
+                        // find next applicable mask after m_old    //TODO: look at bsl instruction
+                        for (++m_old; !(h & m_old);
+                             m_old <<= 1)// at maximum few rounds depending on the first block size
+                            ;
+                        m_old = (m_old << 1) - 1;// get full mask from a bit
+                        __TBB_ASSERT((m_old & (m_old + 1)) == 0 && m_old <= m, nullptr);
+                        // check whether it is rehashing/ed
+                        if (!rehash_required(
+                                    get_bucket(h & m_old)->node_list.load(std::memory_order_acquire))) {
+                            return true;
+                        }
+                    }
+                    return false;
+                }
+
+                // Insert a node and check for load factor. @return segment index to enable.
+                segment_index_type insert_new_node(bucket* b, node_base* n, hashcode_type mask) {
+                    size_type sz
+                            = ++my_size;// prefix form is to enforce allocation after the first item inserted
+                    add_to_bucket(b, n);
+                    // check load factor
+                    if (sz >= mask) {// TODO: add custom load_factor
+                        segment_index_type new_seg = tbb::detail::log2(mask + 1);//optimized segment_index_of
+                        __TBB_ASSERT(is_valid(my_table[new_seg - 1].load(std::memory_order_relaxed)),
+                                     "new allocations must not publish new mask until segment has allocated");
+                        static const segment_ptr_type is_allocating = segment_ptr_type(2);
+                        segment_ptr_type disabled = nullptr;
+                        if (!(my_table[new_seg].load(std::memory_order_acquire))
+                            && my_table[new_seg].compare_exchange_strong(disabled, is_allocating))
+                            return new_seg;// The value must be processed
+                    }
+                    return 0;
+                }
+
+                // Prepare enough segments for number of buckets
+                void reserve(size_type buckets) {
+                    if (!buckets--) return;
+                    bool is_initial = !my_size.load(std::memory_order_relaxed);
+                    for (size_type m = my_mask.load(std::memory_order_relaxed); buckets > m;
+                         m = my_mask.load(std::memory_order_relaxed)) {
+                        enable_segment(segment_index_of(m + 1), is_initial);
+                    }
+                }
+
+                // Swap hash_map_bases
+                void internal_swap_content(hash_map_base& table) {
+                    using std::swap;
+                    swap_atomics_relaxed(my_mask, table.my_mask);
+                    swap_atomics_relaxed(my_size, table.my_size);
+
+                    for (size_type i = 0; i < embedded_buckets; i++) {
+                        auto temp = my_embedded_segment[i].node_list.load(std::memory_order_relaxed);
+                        my_embedded_segment[i].node_list.store(
+                                table.my_embedded_segment[i].node_list.load(std::memory_order_relaxed),
+                                std::memory_order_relaxed);
+                        table.my_embedded_segment[i].node_list.store(temp, std::memory_order_relaxed);
+                    }
+                    for (size_type i = embedded_block; i < pointers_per_table; i++) {
+                        auto temp = my_table[i].load(std::memory_order_relaxed);
+                        my_table[i].store(table.my_table[i].load(std::memory_order_relaxed),
+                                          std::memory_order_relaxed);
+                        table.my_table[i].store(temp, std::memory_order_relaxed);
+                    }
+                }
+
+                void internal_move(hash_map_base&& other) {
+                    my_mask.store(other.my_mask.load(std::memory_order_relaxed), std::memory_order_relaxed);
+                    other.my_mask.store(embedded_buckets - 1, std::memory_order_relaxed);
+
+                    my_size.store(other.my_size.load(std::memory_order_relaxed), std::memory_order_relaxed);
+                    other.my_size.store(0, std::memory_order_relaxed);
+
+                    for (size_type i = 0; i < embedded_buckets; ++i) {
+                        my_embedded_segment[i].node_list.store(other.my_embedded_segment[i].node_list,
+                                                               std::memory_order_relaxed);
+                        other.my_embedded_segment[i].node_list.store(nullptr, std::memory_order_relaxed);
+                    }
+
+                    for (size_type i = embedded_block; i < pointers_per_table; ++i) {
+                        my_table[i].store(other.my_table[i].load(std::memory_order_relaxed),
+                                          std::memory_order_relaxed);
+                        other.my_table[i].store(nullptr, std::memory_order_relaxed);
+                    }
+                }
+
+            protected:
+                bucket_allocator_type my_allocator;
+                // Hash mask = sum of allocated segment sizes - 1
+                std::atomic<hashcode_type> my_mask;
+                // Size of container in stored items
+                std::atomic<size_type>
+                        my_size;// It must be in separate cache line from my_mask due to performance effects
+                // Zero segment
+                bucket my_embedded_segment[embedded_buckets];
+                // Segment pointers table. Also prevents false sharing between my_mask and my_size
+                segments_table_type my_table;
+            };
+
+            template <typename Iterator>
+            class hash_map_range;
+
+            // Meets requirements of a forward iterator for STL
+            // Value is either the T or const T type of the container.
+            template <typename Container, typename Value>
+            class hash_map_iterator {
+                using map_type = Container;
+                using node = typename Container::node;
+                using map_base = typename Container::base_type;
+                using node_base = typename map_base::node_base;
+                using bucket = typename map_base::bucket;
+
+            public:
+                using value_type = Value;
+                using size_type = typename Container::size_type;
+                using difference_type = typename Container::difference_type;
+                using pointer = value_type*;
+                using reference = value_type&;
+                using iterator_category = std::forward_iterator_tag;
+
+                // Construct undefined iterator
+                hash_map_iterator() : my_map(), my_index(), my_bucket(), my_node() {}
+                hash_map_iterator(const hash_map_iterator<Container, typename Container::value_type>& other)
+                    : my_map(other.my_map), my_index(other.my_index), my_bucket(other.my_bucket),
+                      my_node(other.my_node) {}
+
+                hash_map_iterator&
+                operator=(const hash_map_iterator<Container, typename Container::value_type>& other) {
+                    my_map = other.my_map;
+                    my_index = other.my_index;
+                    my_bucket = other.my_bucket;
+                    my_node = other.my_node;
+                    return *this;
+                }
 
-    template <typename Key, typename T, typename HashCompare, typename A
+                Value& operator*() const {
+                    __TBB_ASSERT(map_base::is_valid(my_node),
+                                 "iterator uninitialized or at end of container?");
+                    return my_node->value();
+                }
+
+                Value* operator->() const { return &operator*(); }
+
+                hash_map_iterator& operator++() {
+                    my_node = static_cast<node*>(my_node->next);
+                    if (!my_node) advance_to_next_bucket();
+                    return *this;
+                }
+
+                // Post increment
+                hash_map_iterator operator++(int) {
+                    hash_map_iterator old(*this);
+                    operator++();
+                    return old;
+                }
+
+            private:
+                template <typename C, typename T, typename U>
+                friend bool operator==(const hash_map_iterator<C, T>& i, const hash_map_iterator<C, U>& j);
+
+                template <typename C, typename T, typename U>
+                friend bool operator!=(const hash_map_iterator<C, T>& i, const hash_map_iterator<C, U>& j);
+
+                template <typename C, typename T, typename U>
+                friend ptrdiff_t operator-(const hash_map_iterator<C, T>& i,
+                                           const hash_map_iterator<C, U>& j);
+
+                template <typename C, typename U>
+                friend class hash_map_iterator;
+
+                template <typename I>
+                friend class hash_map_range;
+
+                void advance_to_next_bucket() {// TODO?: refactor to iterator_base class
+                    size_t k = my_index + 1;
+                    __TBB_ASSERT(my_bucket, "advancing an invalid iterator?");
+                    while (k <= my_map->my_mask.load(std::memory_order_relaxed)) {
+                        // Following test uses 2's-complement wizardry
+                        if (k & (k - 2))// not the beginning of a segment
+                            ++my_bucket;
+                        else
+                            my_bucket = my_map->get_bucket(k);
+                        node_base* n = my_bucket->node_list.load(std::memory_order_relaxed);
+                        if (map_base::is_valid(n)) {
+                            my_node = static_cast<node*>(n);
+                            my_index = k;
+                            return;
+                        }
+                        ++k;
+                    }
+                    my_bucket = nullptr;
+                    my_node = nullptr;
+                    my_index = k;// the end
+                }
+
+                template <typename Key, typename T, typename HashCompare, typename A
 #if __TBB_PREVIEW_CONCURRENT_HASH_MAP_EXTENSIONS
-            , typename M
-             >
-        __TBB_requires(tbb::detail::hash_compare<HashCompare, Key> &&
-                       ch_map_rw_scoped_lockable<M>)
+                          ,
+                          typename M>
+                __TBB_requires(tbb::detail::hash_compare<HashCompare, Key>&& ch_map_rw_scoped_lockable<M>)
 #else
-             >
-        __TBB_requires(tbb::detail::hash_compare<HashCompare, Key>)
+                          >
+                __TBB_requires(tbb::detail::hash_compare<HashCompare, Key>)
 #endif
-    friend class concurrent_hash_map;
-
-    hash_map_iterator( const Container &map, std::size_t index, const bucket *b, node_base *n ) :
-        my_map(&map), my_index(index), my_bucket(b), my_node(nullptr)
-    {
-        // Cannot directly initialize to n, because it could be an invalid node pointer (e.g., when
-        // setting a midpoint for a 1-element range). If it is, try one from a subsequent bucket.
-        if( map_base::is_valid(n) )
-            my_node = static_cast<node*>(n);
-        else if( b )
-            advance_to_next_bucket();
-    }
-
-    // concurrent_hash_map over which we are iterating.
-    const Container *my_map;
-    // Index in hash table for current item
-    size_t my_index;
-    // Pointer to bucket
-    const bucket* my_bucket;
-    // Pointer to node that has current item
-    node* my_node;
-};
-
-template <typename Container, typename T, typename U>
-bool operator==( const hash_map_iterator<Container,T>& i, const hash_map_iterator<Container,U>& j ) {
-    return i.my_node == j.my_node && i.my_map == j.my_map;
-}
-
-template <typename Container, typename T, typename U>
-bool operator!=( const hash_map_iterator<Container,T>& i, const hash_map_iterator<Container,U>& j ) {
-    return i.my_node != j.my_node || i.my_map != j.my_map;
-}
-
-// Range class used with concurrent_hash_map
-template <typename Iterator>
-class hash_map_range {
-    using map_type = typename Iterator::map_type;
-public:
-    // Type for size of a range
-    using size_type = std::size_t;
-    using value_type = typename Iterator::value_type;
-    using reference = typename Iterator::reference;
-    using difference_type = typename Iterator::difference_type;
-    using iterator = Iterator;
-
-    // True if range is empty.
-    bool empty() const { return my_begin == my_end; }
-
-    // True if range can be partitioned into two subranges.
-    bool is_divisible() const {
-        return my_midpoint != my_end;
-    }
-
-    // Split range.
-    hash_map_range( hash_map_range& r, split ) :
-        my_end(r.my_end),
-        my_grainsize(r.my_grainsize)
-    {
-        r.my_end = my_begin = r.my_midpoint;
-        __TBB_ASSERT( !empty(), "Splitting despite the range is not divisible" );
-        __TBB_ASSERT( !r.empty(), "Splitting despite the range is not divisible" );
-        set_midpoint();
-        r.set_midpoint();
-    }
-
-    // Init range with container and grainsize specified
-    hash_map_range( const map_type &map, size_type grainsize_ = 1 ) :
-        my_begin( Iterator( map, 0, map.my_embedded_segment, map.my_embedded_segment->node_list.load(std::memory_order_relaxed) ) ),
-        my_end( Iterator( map, map.my_mask.load(std::memory_order_relaxed) + 1, nullptr, nullptr ) ),
-        my_grainsize( grainsize_ )
-    {
-        __TBB_ASSERT( grainsize_>0, "grainsize must be positive" );
-        set_midpoint();
-    }
-
-    Iterator begin() const { return my_begin; }
-    Iterator end() const { return my_end; }
-    // The grain size for this range.
-    size_type grainsize() const { return my_grainsize; }
-
-private:
-    Iterator my_begin;
-    Iterator my_end;
-    mutable Iterator my_midpoint;
-    size_t my_grainsize;
-    // Set my_midpoint to point approximately half way between my_begin and my_end.
-    void set_midpoint() const;
-    template <typename U> friend class hash_map_range;
-};
-
-template <typename Iterator>
-void hash_map_range<Iterator>::set_midpoint() const {
-    // Split by groups of nodes
-    size_t m = my_end.my_index-my_begin.my_index;
-    if( m > my_grainsize ) {
-        m = my_begin.my_index + m/2u;
-        auto b = my_begin.my_map->get_bucket(m);
-        my_midpoint = Iterator(*my_begin.my_map,m,b,b->node_list.load(std::memory_order_relaxed));
-    } else {
-        my_midpoint = my_end;
-    }
-    __TBB_ASSERT( my_begin.my_index <= my_midpoint.my_index,
-        "my_begin is after my_midpoint" );
-    __TBB_ASSERT( my_midpoint.my_index <= my_end.my_index,
-        "my_midpoint is after my_end" );
-    __TBB_ASSERT( my_begin != my_midpoint || my_begin == my_end,
-        "[my_begin, my_midpoint) range should not be empty" );
-}
-
-template <typename Key, typename T,
-          typename HashCompare = d1::tbb_hash_compare<Key>,
-          typename Allocator = tbb_allocator<std::pair<const Key, T>>
+                        friend class concurrent_hash_map;
+
+                hash_map_iterator(const Container& map, std::size_t index, const bucket* b, node_base* n)
+                    : my_map(&map), my_index(index), my_bucket(b), my_node(nullptr) {
+                    // Cannot directly initialize to n, because it could be an invalid node pointer (e.g., when
+                    // setting a midpoint for a 1-element range). If it is, try one from a subsequent bucket.
+                    if (map_base::is_valid(n)) my_node = static_cast<node*>(n);
+                    else if (b)
+                        advance_to_next_bucket();
+                }
+
+                // concurrent_hash_map over which we are iterating.
+                const Container* my_map;
+                // Index in hash table for current item
+                size_t my_index;
+                // Pointer to bucket
+                const bucket* my_bucket;
+                // Pointer to node that has current item
+                node* my_node;
+            };
+
+            template <typename Container, typename T, typename U>
+            bool operator==(const hash_map_iterator<Container, T>& i,
+                            const hash_map_iterator<Container, U>& j) {
+                return i.my_node == j.my_node && i.my_map == j.my_map;
+            }
+
+            template <typename Container, typename T, typename U>
+            bool operator!=(const hash_map_iterator<Container, T>& i,
+                            const hash_map_iterator<Container, U>& j) {
+                return i.my_node != j.my_node || i.my_map != j.my_map;
+            }
+
+            // Range class used with concurrent_hash_map
+            template <typename Iterator>
+            class hash_map_range {
+                using map_type = typename Iterator::map_type;
+
+            public:
+                // Type for size of a range
+                using size_type = std::size_t;
+                using value_type = typename Iterator::value_type;
+                using reference = typename Iterator::reference;
+                using difference_type = typename Iterator::difference_type;
+                using iterator = Iterator;
+
+                // True if range is empty.
+                bool empty() const { return my_begin == my_end; }
+
+                // True if range can be partitioned into two subranges.
+                bool is_divisible() const { return my_midpoint != my_end; }
+
+                // Split range.
+                hash_map_range(hash_map_range& r, split) : my_end(r.my_end), my_grainsize(r.my_grainsize) {
+                    r.my_end = my_begin = r.my_midpoint;
+                    __TBB_ASSERT(!empty(), "Splitting despite the range is not divisible");
+                    __TBB_ASSERT(!r.empty(), "Splitting despite the range is not divisible");
+                    set_midpoint();
+                    r.set_midpoint();
+                }
+
+                // Init range with container and grainsize specified
+                hash_map_range(const map_type& map, size_type grainsize_ = 1)
+                    : my_begin(Iterator(map, 0, map.my_embedded_segment,
+                                        map.my_embedded_segment->node_list.load(std::memory_order_relaxed))),
+                      my_end(Iterator(map, map.my_mask.load(std::memory_order_relaxed) + 1, nullptr,
+                                      nullptr)),
+                      my_grainsize(grainsize_) {
+                    __TBB_ASSERT(grainsize_ > 0, "grainsize must be positive");
+                    set_midpoint();
+                }
+
+                Iterator begin() const { return my_begin; }
+                Iterator end() const { return my_end; }
+                // The grain size for this range.
+                size_type grainsize() const { return my_grainsize; }
+
+            private:
+                Iterator my_begin;
+                Iterator my_end;
+                mutable Iterator my_midpoint;
+                size_t my_grainsize;
+                // Set my_midpoint to point approximately half way between my_begin and my_end.
+                void set_midpoint() const;
+                template <typename U>
+                friend class hash_map_range;
+            };
+
+            template <typename Iterator>
+            void hash_map_range<Iterator>::set_midpoint() const {
+                // Split by groups of nodes
+                size_t m = my_end.my_index - my_begin.my_index;
+                if (m > my_grainsize) {
+                    m = my_begin.my_index + m / 2u;
+                    auto b = my_begin.my_map->get_bucket(m);
+                    my_midpoint
+                            = Iterator(*my_begin.my_map, m, b, b->node_list.load(std::memory_order_relaxed));
+                } else {
+                    my_midpoint = my_end;
+                }
+                __TBB_ASSERT(my_begin.my_index <= my_midpoint.my_index, "my_begin is after my_midpoint");
+                __TBB_ASSERT(my_midpoint.my_index <= my_end.my_index, "my_midpoint is after my_end");
+                __TBB_ASSERT(my_begin != my_midpoint || my_begin == my_end,
+                             "[my_begin, my_midpoint) range should not be empty");
+            }
+
+            template <typename Key, typename T, typename HashCompare = d1::tbb_hash_compare<Key>,
+                      typename Allocator = tbb_allocator<std::pair<const Key, T>>
 #if __TBB_PREVIEW_CONCURRENT_HASH_MAP_EXTENSIONS
-        , typename MutexType = spin_rw_mutex
-         >
-    __TBB_requires(tbb::detail::hash_compare<HashCompare, Key> &&
-                   ch_map_rw_scoped_lockable<MutexType>)
+                      ,
+                      typename MutexType = spin_rw_mutex>
+            __TBB_requires(tbb::detail::hash_compare<HashCompare, Key>&& ch_map_rw_scoped_lockable<MutexType>)
 #else
-         >
-    __TBB_requires(tbb::detail::hash_compare<HashCompare, Key>)
+                      >
+            __TBB_requires(tbb::detail::hash_compare<HashCompare, Key>)
 #endif
-class concurrent_hash_map
+                    class concurrent_hash_map
 #if __TBB_PREVIEW_CONCURRENT_HASH_MAP_EXTENSIONS
-    : protected hash_map_base<Allocator, MutexType>
+                : protected hash_map_base<Allocator, MutexType>
 #else
-    : protected hash_map_base<Allocator, spin_rw_mutex>
+                : protected hash_map_base<Allocator, spin_rw_mutex>
 #endif
-{
-    template <typename Container, typename Value>
-    friend class hash_map_iterator;
+            {
+                template <typename Container, typename Value>
+                friend class hash_map_iterator;
 
-    template <typename I>
-    friend class hash_map_range;
-    using allocator_traits_type = tbb::detail::allocator_traits<Allocator>;
+                template <typename I>
+                friend class hash_map_range;
+                using allocator_traits_type = tbb::detail::allocator_traits<Allocator>;
 
 #if __TBB_PREVIEW_CONCURRENT_HASH_MAP_EXTENSIONS
-    using base_type = hash_map_base<Allocator, MutexType>;
+                using base_type = hash_map_base<Allocator, MutexType>;
 #else
-    using base_type = hash_map_base<Allocator, spin_rw_mutex>;
+                using base_type = hash_map_base<Allocator, spin_rw_mutex>;
 #endif
-public:
-    using key_type = Key;
-    using mapped_type = T;
-    // type_identity is needed to disable implicit deduction guides for std::initializer_list constructors
-    // and copy/move constructor with explicit allocator argument
-    using allocator_type = tbb::detail::type_identity_t<Allocator>;
-    using hash_compare_type = tbb::detail::type_identity_t<HashCompare>;
-    using value_type = std::pair<const Key, T>;
-    using size_type = typename base_type::size_type;
-    using difference_type = std::ptrdiff_t;
+            public:
+                using key_type = Key;
+                using mapped_type = T;
+                // type_identity is needed to disable implicit deduction guides for std::initializer_list constructors
+                // and copy/move constructor with explicit allocator argument
+                using allocator_type = tbb::detail::type_identity_t<Allocator>;
+                using hash_compare_type = tbb::detail::type_identity_t<HashCompare>;
+                using value_type = std::pair<const Key, T>;
+                using size_type = typename base_type::size_type;
+                using difference_type = std::ptrdiff_t;
 #if __TBB_PREVIEW_CONCURRENT_HASH_MAP_EXTENSIONS
-    using mutex_type = MutexType;
+                using mutex_type = MutexType;
 #endif
-    using pointer = typename allocator_traits_type::pointer;
-    using const_pointer = typename allocator_traits_type::const_pointer;
-
-    using reference = value_type&;
-    using const_reference = const value_type&;
-    using iterator = hash_map_iterator<concurrent_hash_map, value_type>;
-    using const_iterator = hash_map_iterator<concurrent_hash_map, const value_type>;
-    using range_type = hash_map_range<iterator>;
-    using const_range_type = hash_map_range<const_iterator>;
-
-protected:
-    static_assert(std::is_same<value_type, typename Allocator::value_type>::value,
-        "value_type of the container must be the same as its allocator's");
-
-    friend class const_accessor;
-    class node;
-    using segment_index_type = typename base_type::segment_index_type;
-    using segment_ptr_type = typename base_type::segment_ptr_type;
-    using node_base = typename base_type::node_base;
-    using bucket = typename base_type::bucket;
-    using hashcode_type = typename base_type::hashcode_type;
-    using bucket_allocator_type = typename base_type::bucket_allocator_type;
-    using node_allocator_type = typename base_type::allocator_traits_type::template rebind_alloc<node>;
-    using node_allocator_traits = tbb::detail::allocator_traits<node_allocator_type>;
-    hash_compare_type my_hash_compare;
-
-    class node : public node_base {
-    public:
-        node() {}
-        ~node() {}
-        pointer storage() { return &my_value; }
-        value_type& value() { return *storage(); }
-    private:
-        union {
-            value_type my_value;
-        };
-    };
-
-    void delete_node( node_base *n ) {
-        node_allocator_type node_allocator(this->get_allocator());
-        node_allocator_traits::destroy(node_allocator, static_cast<node*>(n)->storage());
-        node_allocator_traits::destroy(node_allocator, static_cast<node*>(n));
-        node_allocator_traits::deallocate(node_allocator, static_cast<node*>(n), 1);
-    }
-
-    template <typename... Args>
-    static node* create_node(bucket_allocator_type& allocator, Args&&... args) {
-        node_allocator_type node_allocator(allocator);
-        node* node_ptr = node_allocator_traits::allocate(node_allocator, 1);
-        auto guard = make_raii_guard([&] {
-            node_allocator_traits::destroy(node_allocator, node_ptr);
-            node_allocator_traits::deallocate(node_allocator, node_ptr, 1);
-        });
-
-        node_allocator_traits::construct(node_allocator, node_ptr);
-        node_allocator_traits::construct(node_allocator, node_ptr->storage(), std::forward<Args>(args)...);
-        guard.dismiss();
-        return node_ptr;
-    }
-
-    static node* allocate_node_copy_construct(bucket_allocator_type& allocator, const Key &key, const T * t){
-        return create_node(allocator, key, *t);
-    }
-
-    static node* allocate_node_move_construct(bucket_allocator_type& allocator, const Key &key, const T * t){
-        return create_node(allocator, key, std::move(*const_cast<T*>(t)));
-    }
-
-    template <typename K = Key>
-    static node* allocate_node_default_construct(bucket_allocator_type& allocator, const K &key, const T * ){
-        // Emplace construct an empty T object inside the pair
-        return create_node(allocator, std::piecewise_construct,
-                           std::forward_as_tuple(key), std::forward_as_tuple());
-    }
-
-    static node* do_not_allocate_node(bucket_allocator_type& , const Key &, const T * ){
-        __TBB_ASSERT(false,"this dummy function should not be called");
-        return nullptr;
-    }
-
-    template <typename K>
-    node *search_bucket( const K &key, bucket *b ) const {
-        node *n = static_cast<node*>( b->node_list.load(std::memory_order_relaxed) );
-        while (this->is_valid(n) && !my_hash_compare.equal(key, n->value().first))
-            n = static_cast<node*>( n->next );
-        __TBB_ASSERT(!rehash_required(n), "Search can be executed only for rehashed bucket");
-        return n;
-    }
-
-    // bucket accessor is to find, rehash, acquire a lock, and access a bucket
-    class bucket_accessor : public bucket::scoped_type {
-        bucket *my_b;
-    public:
-        bucket_accessor( concurrent_hash_map *base, const hashcode_type h, bool writer = false ) { acquire( base, h, writer ); }
-        // find a bucket by masked hashcode, optionally rehash, and acquire the lock
-        inline void acquire( concurrent_hash_map *base, const hashcode_type h, bool writer = false ) {
-            my_b = base->get_bucket( h );
-            // TODO: actually, notification is unnecessary here, just hiding double-check
-            if (rehash_required(my_b->node_list.load(std::memory_order_acquire))
-                && bucket::scoped_type::try_acquire( my_b->mutex, /*write=*/true ) )
-            {
-                if (rehash_required(my_b->node_list.load(std::memory_order_relaxed))) base->rehash_bucket(my_b, h); // recursive rehashing
-            }
-            else bucket::scoped_type::acquire( my_b->mutex, writer );
-            __TBB_ASSERT(!rehash_required(my_b->node_list.load(std::memory_order_relaxed)), nullptr);
-        }
-
-        // get bucket pointer
-        bucket *operator() () { return my_b; }
-    };
-
-    // TODO refactor to hash_base
-    void rehash_bucket( bucket *b_new, const hashcode_type hash ) {
-        __TBB_ASSERT( hash > 1, "The lowermost buckets can't be rehashed" );
-        b_new->node_list.store(reinterpret_cast<node_base*>(empty_rehashed_flag), std::memory_order_release); // mark rehashed
-        hashcode_type mask = (hashcode_type(1) << tbb::detail::log2(hash)) - 1; // get parent mask from the topmost bit
-        bucket_accessor b_old( this, hash & mask );
-
-        mask = (mask<<1) | 1; // get full mask for new bucket
-        __TBB_ASSERT( (mask&(mask+1))==0 && (hash & mask) == hash, nullptr );
-    restart:
-        node_base* prev = nullptr;
-        node_base* curr = b_old()->node_list.load(std::memory_order_acquire);
-        while (this->is_valid(curr)) {
-            hashcode_type curr_node_hash = my_hash_compare.hash(static_cast<node*>(curr)->value().first);
-
-            if ((curr_node_hash & mask) == hash) {
-                if (!b_old.is_writer()) {
-                    if (!b_old.upgrade_to_writer()) {
-                        goto restart; // node ptr can be invalid due to concurrent erase
-                    }
+                using pointer = typename allocator_traits_type::pointer;
+                using const_pointer = typename allocator_traits_type::const_pointer;
+
+                using reference = value_type&;
+                using const_reference = const value_type&;
+                using iterator = hash_map_iterator<concurrent_hash_map, value_type>;
+                using const_iterator = hash_map_iterator<concurrent_hash_map, const value_type>;
+                using range_type = hash_map_range<iterator>;
+                using const_range_type = hash_map_range<const_iterator>;
+
+            protected:
+                static_assert(std::is_same<value_type, typename Allocator::value_type>::value,
+                              "value_type of the container must be the same as its allocator's");
+
+                friend class const_accessor;
+                class node;
+                using segment_index_type = typename base_type::segment_index_type;
+                using segment_ptr_type = typename base_type::segment_ptr_type;
+                using node_base = typename base_type::node_base;
+                using bucket = typename base_type::bucket;
+                using hashcode_type = typename base_type::hashcode_type;
+                using bucket_allocator_type = typename base_type::bucket_allocator_type;
+                using node_allocator_type =
+                        typename base_type::allocator_traits_type::template rebind_alloc<node>;
+                using node_allocator_traits = tbb::detail::allocator_traits<node_allocator_type>;
+                hash_compare_type my_hash_compare;
+
+                class node : public node_base {
+                public:
+                    node() {}
+                    ~node() {}
+                    pointer storage() { return &my_value; }
+                    value_type& value() { return *storage(); }
+
+                private:
+                    union {
+                        value_type my_value;
+                    };
+                };
+
+                void delete_node(node_base* n) {
+                    node_allocator_type node_allocator(this->get_allocator());
+                    node_allocator_traits::destroy(node_allocator, static_cast<node*>(n)->storage());
+                    node_allocator_traits::destroy(node_allocator, static_cast<node*>(n));
+                    node_allocator_traits::deallocate(node_allocator, static_cast<node*>(n), 1);
                 }
-                node_base* next = curr->next;
-                // exclude from b_old
-                if (prev == nullptr) {
-                    b_old()->node_list.store(curr->next, std::memory_order_relaxed);
-                } else {
-                    prev->next = curr->next;
+
+                template <typename... Args>
+                static node* create_node(bucket_allocator_type& allocator, Args&&... args) {
+                    node_allocator_type node_allocator(allocator);
+                    node* node_ptr = node_allocator_traits::allocate(node_allocator, 1);
+                    auto guard = make_raii_guard([&] {
+                        node_allocator_traits::destroy(node_allocator, node_ptr);
+                        node_allocator_traits::deallocate(node_allocator, node_ptr, 1);
+                    });
+
+                    node_allocator_traits::construct(node_allocator, node_ptr);
+                    node_allocator_traits::construct(node_allocator, node_ptr->storage(),
+                                                     std::forward<Args>(args)...);
+                    guard.dismiss();
+                    return node_ptr;
                 }
-                this->add_to_bucket(b_new, curr);
-                curr = next;
-            } else {
-                prev = curr;
-                curr = curr->next;
-            }
-        }
-    }
 
-    template <typename U>
-    using hash_compare_is_transparent = dependent_bool<comp_is_transparent<hash_compare_type>, U>;
+                static node* allocate_node_copy_construct(bucket_allocator_type& allocator, const Key& key,
+                                                          const T* t) {
+                    return create_node(allocator, key, *t);
+                }
+
+                static node* allocate_node_move_construct(bucket_allocator_type& allocator, const Key& key,
+                                                          const T* t) {
+                    return create_node(allocator, key, std::move(*const_cast<T*>(t)));
+                }
+
+                template <typename K = Key>
+                static node* allocate_node_default_construct(bucket_allocator_type& allocator, const K& key,
+                                                             const T*) {
+                    // Emplace construct an empty T object inside the pair
+                    return create_node(allocator, std::piecewise_construct, std::forward_as_tuple(key),
+                                       std::forward_as_tuple());
+                }
 
-public:
+                static node* do_not_allocate_node(bucket_allocator_type&, const Key&, const T*) {
+                    __TBB_ASSERT(false, "this dummy function should not be called");
+                    return nullptr;
+                }
+
+                template <typename K>
+                node* search_bucket(const K& key, bucket* b) const {
+                    node* n = static_cast<node*>(b->node_list.load(std::memory_order_relaxed));
+                    while (this->is_valid(n) && !my_hash_compare.equal(key, n->value().first))
+                        n = static_cast<node*>(n->next);
+                    __TBB_ASSERT(!rehash_required(n), "Search can be executed only for rehashed bucket");
+                    return n;
+                }
 
-    class accessor;
-    // Combines data access, locking, and garbage collection.
-    class const_accessor : private node::scoped_type /*which derived from no_copy*/ {
+                // bucket accessor is to find, rehash, acquire a lock, and access a bucket
+                class bucket_accessor : public bucket::scoped_type {
+                    bucket* my_b;
+
+                public:
+                    bucket_accessor(concurrent_hash_map* base, const hashcode_type h, bool writer = false) {
+                        acquire(base, h, writer);
+                    }
+                    // find a bucket by masked hashcode, optionally rehash, and acquire the lock
+                    inline void acquire(concurrent_hash_map* base, const hashcode_type h,
+                                        bool writer = false) {
+                        my_b = base->get_bucket(h);
+                        // TODO: actually, notification is unnecessary here, just hiding double-check
+                        if (rehash_required(my_b->node_list.load(std::memory_order_acquire))
+                            && bucket::scoped_type::try_acquire(my_b->mutex, /*write=*/true)) {
+                            if (rehash_required(my_b->node_list.load(std::memory_order_relaxed)))
+                                base->rehash_bucket(my_b, h);// recursive rehashing
+                        } else
+                            bucket::scoped_type::acquire(my_b->mutex, writer);
+                        __TBB_ASSERT(!rehash_required(my_b->node_list.load(std::memory_order_relaxed)),
+                                     nullptr);
+                    }
+
+                    // get bucket pointer
+                    bucket* operator()() { return my_b; }
+                };
+
+                // TODO refactor to hash_base
+                void rehash_bucket(bucket* b_new, const hashcode_type hash) {
+                    __TBB_ASSERT(hash > 1, "The lowermost buckets can't be rehashed");
+                    b_new->node_list.store(reinterpret_cast<node_base*>(empty_rehashed_flag),
+                                           std::memory_order_release);// mark rehashed
+                    hashcode_type mask = (hashcode_type(1) << tbb::detail::log2(hash))
+                                         - 1;// get parent mask from the topmost bit
+                    bucket_accessor b_old(this, hash & mask);
+
+                    mask = (mask << 1) | 1;// get full mask for new bucket
+                    __TBB_ASSERT((mask & (mask + 1)) == 0 && (hash & mask) == hash, nullptr);
+                restart:
+                    node_base* prev = nullptr;
+                    node_base* curr = b_old()->node_list.load(std::memory_order_acquire);
+                    while (this->is_valid(curr)) {
+                        hashcode_type curr_node_hash
+                                = my_hash_compare.hash(static_cast<node*>(curr)->value().first);
+
+                        if ((curr_node_hash & mask) == hash) {
+                            if (!b_old.is_writer()) {
+                                if (!b_old.upgrade_to_writer()) {
+                                    goto restart;// node ptr can be invalid due to concurrent erase
+                                }
+                            }
+                            node_base* next = curr->next;
+                            // exclude from b_old
+                            if (prev == nullptr) {
+                                b_old()->node_list.store(curr->next, std::memory_order_relaxed);
+                            } else {
+                                prev->next = curr->next;
+                            }
+                            this->add_to_bucket(b_new, curr);
+                            curr = next;
+                        } else {
+                            prev = curr;
+                            curr = curr->next;
+                        }
+                    }
+                }
+
+                template <typename U>
+                using hash_compare_is_transparent = dependent_bool<comp_is_transparent<hash_compare_type>, U>;
+
+            public:
+                class accessor;
+                // Combines data access, locking, and garbage collection.
+                class const_accessor : private node::scoped_type /*which derived from no_copy*/ {
 #if __TBB_PREVIEW_CONCURRENT_HASH_MAP_EXTENSIONS
-        friend class concurrent_hash_map<Key,T,HashCompare,Allocator,MutexType>;
+                    friend class concurrent_hash_map<Key, T, HashCompare, Allocator, MutexType>;
 #else
-        friend class concurrent_hash_map<Key,T,HashCompare,Allocator>;
+                    friend class concurrent_hash_map<Key, T, HashCompare, Allocator>;
 #endif
-        friend class accessor;
-    public:
-        // Type of value
-        using value_type = const typename concurrent_hash_map::value_type;
-
-        // True if result is empty.
-        bool empty() const { return !my_node; }
-
-        // Set to null
-        void release() {
-            if( my_node ) {
-                node::scoped_type::release();
-                my_node = nullptr;
-            }
-        }
-
-        // Return reference to associated value in hash table.
-        const_reference operator*() const {
-            __TBB_ASSERT( my_node, "attempt to dereference empty accessor" );
-            return my_node->value();
-        }
-
-        // Return pointer to associated value in hash table.
-        const_pointer operator->() const {
-            return &operator*();
-        }
-
-        // Create empty result
-        const_accessor() : my_node(nullptr), my_hash() {}
-
-        // Destroy result after releasing the underlying reference.
-        ~const_accessor() {
-            my_node = nullptr; // scoped lock's release() is called in its destructor
-        }
-    protected:
-        bool is_writer() { return node::scoped_type::is_writer(); }
-        node *my_node;
-        hashcode_type my_hash;
-    };
-
-    // Allows write access to elements and combines data access, locking, and garbage collection.
-    class accessor: public const_accessor {
-    public:
-        // Type of value
-        using value_type = typename concurrent_hash_map::value_type;
-
-        // Return reference to associated value in hash table.
-        reference operator*() const {
-            __TBB_ASSERT( this->my_node, "attempt to dereference empty accessor" );
-            return this->my_node->value();
-        }
-
-        // Return pointer to associated value in hash table.
-        pointer operator->() const {
-            return &operator*();
-        }
-    };
-
-    explicit concurrent_hash_map( const hash_compare_type& compare, const allocator_type& a = allocator_type() )
-        : base_type(a)
-        , my_hash_compare(compare)
-    {}
-
-    concurrent_hash_map() : concurrent_hash_map(hash_compare_type()) {}
-
-    explicit concurrent_hash_map( const allocator_type& a )
-        : concurrent_hash_map(hash_compare_type(), a)
-    {}
-
-    // Construct empty table with n preallocated buckets. This number serves also as initial concurrency level.
-    concurrent_hash_map( size_type n, const allocator_type &a = allocator_type() )
-        : concurrent_hash_map(a)
-    {
-        this->reserve(n);
-    }
-
-    concurrent_hash_map( size_type n, const hash_compare_type& compare, const allocator_type& a = allocator_type() )
-        : concurrent_hash_map(compare, a)
-    {
-        this->reserve(n);
-    }
-
-    // Copy constructor
-    concurrent_hash_map( const concurrent_hash_map &table )
-        : concurrent_hash_map(node_allocator_traits::select_on_container_copy_construction(table.get_allocator()))
-    {
-        try_call( [&] {
-            internal_copy(table);
-        }).on_exception( [&] {
-            this->clear();
-        });
-    }
-
-    concurrent_hash_map( const concurrent_hash_map &table, const allocator_type &a)
-        : concurrent_hash_map(a)
-    {
-        try_call( [&] {
-            internal_copy(table);
-        }).on_exception( [&] {
-            this->clear();
-        });
-    }
-
-    // Move constructor
-    concurrent_hash_map( concurrent_hash_map &&table )
-        : concurrent_hash_map(std::move(table.get_allocator()))
-    {
-        this->internal_move(std::move(table));
-    }
-
-    // Move constructor
-    concurrent_hash_map( concurrent_hash_map &&table, const allocator_type &a )
-        : concurrent_hash_map(a)
-    {
-        using is_equal_type = typename node_allocator_traits::is_always_equal;
-        internal_move_construct_with_allocator(std::move(table), a, is_equal_type());
-    }
-
-    // Construction with copying iteration range and given allocator instance
-    template <typename I>
-    concurrent_hash_map( I first, I last, const allocator_type &a = allocator_type() )
-        : concurrent_hash_map(a)
-    {
-        try_call( [&] {
-            internal_copy(first, last, std::distance(first, last));
-        }).on_exception( [&] {
-            this->clear();
-        });
-    }
-
-    template <typename I>
-    concurrent_hash_map( I first, I last, const hash_compare_type& compare, const allocator_type& a = allocator_type() )
-        : concurrent_hash_map(compare, a)
-    {
-        try_call( [&] {
-            internal_copy(first, last, std::distance(first, last));
-        }).on_exception( [&] {
-            this->clear();
-        });
-    }
-
-    concurrent_hash_map( std::initializer_list<value_type> il, const hash_compare_type& compare = hash_compare_type(), const allocator_type& a = allocator_type() )
-        : concurrent_hash_map(compare, a)
-    {
-        try_call( [&] {
-            internal_copy(il.begin(), il.end(), il.size());
-        }).on_exception( [&] {
-            this->clear();
-        });
-    }
-
-    concurrent_hash_map( std::initializer_list<value_type> il, const allocator_type& a )
-        : concurrent_hash_map(il, hash_compare_type(), a) {}
-
-    // Assignment
-    concurrent_hash_map& operator=( const concurrent_hash_map &table ) {
-        if( this != &table ) {
-            clear();
-            copy_assign_allocators(this->my_allocator, table.my_allocator);
-            internal_copy(table);
-        }
-        return *this;
-    }
-
-    // Move Assignment
-    concurrent_hash_map& operator=( concurrent_hash_map &&table ) {
-        if( this != &table ) {
-            using pocma_type = typename node_allocator_traits::propagate_on_container_move_assignment;
-            using is_equal_type = typename node_allocator_traits::is_always_equal;
-            move_assign_allocators(this->my_allocator, table.my_allocator);
-            internal_move_assign(std::move(table), tbb::detail::disjunction<is_equal_type, pocma_type>());
-        }
-        return *this;
-    }
-
-    // Assignment
-    concurrent_hash_map& operator=( std::initializer_list<value_type> il ) {
-        clear();
-        internal_copy(il.begin(), il.end(), il.size());
-        return *this;
-    }
-
-    // Rehashes and optionally resizes the whole table.
-    /** Useful to optimize performance before or after concurrent operations.
+                    friend class accessor;
+
+                public:
+                    // Type of value
+                    using value_type = const typename concurrent_hash_map::value_type;
+
+                    // True if result is empty.
+                    bool empty() const { return !my_node; }
+
+                    // Set to null
+                    void release() {
+                        if (my_node) {
+                            node::scoped_type::release();
+                            my_node = nullptr;
+                        }
+                    }
+
+                    // Return reference to associated value in hash table.
+                    const_reference operator*() const {
+                        __TBB_ASSERT(my_node, "attempt to dereference empty accessor");
+                        return my_node->value();
+                    }
+
+                    // Return pointer to associated value in hash table.
+                    const_pointer operator->() const { return &operator*(); }
+
+                    // Create empty result
+                    const_accessor() : my_node(nullptr), my_hash() {}
+
+                    // Destroy result after releasing the underlying reference.
+                    ~const_accessor() {
+                        my_node = nullptr;// scoped lock's release() is called in its destructor
+                    }
+
+                protected:
+                    bool is_writer() { return node::scoped_type::is_writer(); }
+                    node* my_node;
+                    hashcode_type my_hash;
+                };
+
+                // Allows write access to elements and combines data access, locking, and garbage collection.
+                class accessor : public const_accessor {
+                public:
+                    // Type of value
+                    using value_type = typename concurrent_hash_map::value_type;
+
+                    // Return reference to associated value in hash table.
+                    reference operator*() const {
+                        __TBB_ASSERT(this->my_node, "attempt to dereference empty accessor");
+                        return this->my_node->value();
+                    }
+
+                    // Return pointer to associated value in hash table.
+                    pointer operator->() const { return &operator*(); }
+                };
+
+                explicit concurrent_hash_map(const hash_compare_type& compare,
+                                             const allocator_type& a = allocator_type())
+                    : base_type(a), my_hash_compare(compare) {}
+
+                concurrent_hash_map() : concurrent_hash_map(hash_compare_type()) {}
+
+                explicit concurrent_hash_map(const allocator_type& a)
+                    : concurrent_hash_map(hash_compare_type(), a) {}
+
+                // Construct empty table with n preallocated buckets. This number serves also as initial concurrency level.
+                concurrent_hash_map(size_type n, const allocator_type& a = allocator_type())
+                    : concurrent_hash_map(a) {
+                    this->reserve(n);
+                }
+
+                concurrent_hash_map(size_type n, const hash_compare_type& compare,
+                                    const allocator_type& a = allocator_type())
+                    : concurrent_hash_map(compare, a) {
+                    this->reserve(n);
+                }
+
+                // Copy constructor
+                concurrent_hash_map(const concurrent_hash_map& table)
+                    : concurrent_hash_map(node_allocator_traits::select_on_container_copy_construction(
+                              table.get_allocator())) {
+                    try_call([&] { internal_copy(table); }).on_exception([&] { this->clear(); });
+                }
+
+                concurrent_hash_map(const concurrent_hash_map& table, const allocator_type& a)
+                    : concurrent_hash_map(a) {
+                    try_call([&] { internal_copy(table); }).on_exception([&] { this->clear(); });
+                }
+
+                // Move constructor
+                concurrent_hash_map(concurrent_hash_map&& table)
+                    : concurrent_hash_map(std::move(table.get_allocator())) {
+                    this->internal_move(std::move(table));
+                }
+
+                // Move constructor
+                concurrent_hash_map(concurrent_hash_map&& table, const allocator_type& a)
+                    : concurrent_hash_map(a) {
+                    using is_equal_type = typename node_allocator_traits::is_always_equal;
+                    internal_move_construct_with_allocator(std::move(table), a, is_equal_type());
+                }
+
+                // Construction with copying iteration range and given allocator instance
+                template <typename I>
+                concurrent_hash_map(I first, I last, const allocator_type& a = allocator_type())
+                    : concurrent_hash_map(a) {
+                    try_call([&] {
+                        internal_copy(first, last, std::distance(first, last));
+                    }).on_exception([&] { this->clear(); });
+                }
+
+                template <typename I>
+                concurrent_hash_map(I first, I last, const hash_compare_type& compare,
+                                    const allocator_type& a = allocator_type())
+                    : concurrent_hash_map(compare, a) {
+                    try_call([&] {
+                        internal_copy(first, last, std::distance(first, last));
+                    }).on_exception([&] { this->clear(); });
+                }
+
+                concurrent_hash_map(std::initializer_list<value_type> il,
+                                    const hash_compare_type& compare = hash_compare_type(),
+                                    const allocator_type& a = allocator_type())
+                    : concurrent_hash_map(compare, a) {
+                    try_call([&] { internal_copy(il.begin(), il.end(), il.size()); }).on_exception([&] {
+                        this->clear();
+                    });
+                }
+
+                concurrent_hash_map(std::initializer_list<value_type> il, const allocator_type& a)
+                    : concurrent_hash_map(il, hash_compare_type(), a) {}
+
+                // Assignment
+                concurrent_hash_map& operator=(const concurrent_hash_map& table) {
+                    if (this != &table) {
+                        clear();
+                        copy_assign_allocators(this->my_allocator, table.my_allocator);
+                        internal_copy(table);
+                    }
+                    return *this;
+                }
+
+                // Move Assignment
+                concurrent_hash_map& operator=(concurrent_hash_map&& table) {
+                    if (this != &table) {
+                        using pocma_type =
+                                typename node_allocator_traits::propagate_on_container_move_assignment;
+                        using is_equal_type = typename node_allocator_traits::is_always_equal;
+                        move_assign_allocators(this->my_allocator, table.my_allocator);
+                        internal_move_assign(std::move(table),
+                                             tbb::detail::disjunction<is_equal_type, pocma_type>());
+                    }
+                    return *this;
+                }
+
+                // Assignment
+                concurrent_hash_map& operator=(std::initializer_list<value_type> il) {
+                    clear();
+                    internal_copy(il.begin(), il.end(), il.size());
+                    return *this;
+                }
+
+                // Rehashes and optionally resizes the whole table.
+                /** Useful to optimize performance before or after concurrent operations.
         Also enables using of find() and count() concurrent methods in serial context. */
-    void rehash(size_type sz = 0) {
-        this->reserve(sz); // TODO: add reduction of number of buckets as well
-        hashcode_type mask = this->my_mask.load(std::memory_order_relaxed);
-        hashcode_type b = (mask+1)>>1; // size or first index of the last segment
-        __TBB_ASSERT((b&(b-1))==0, nullptr); // zero or power of 2
-        bucket *bp = this->get_bucket( b ); // only the last segment should be scanned for rehashing
-        for(; b <= mask; b++, bp++ ) {
-            node_base *n = bp->node_list.load(std::memory_order_relaxed);
-            __TBB_ASSERT( this->is_valid(n) || empty_rehashed(n) || rehash_required(n), "Broken internal structure" );
-            __TBB_ASSERT( *reinterpret_cast<intptr_t*>(&bp->mutex) == 0, "concurrent or unexpectedly terminated operation during rehash() execution" );
-            if (rehash_required(n)) { // rehash bucket, conditional because rehashing of a previous bucket may affect this one
-                hashcode_type h = b; bucket *b_old = bp;
-                do {
-                    __TBB_ASSERT( h > 1, "The lowermost buckets can't be rehashed" );
-                    hashcode_type m = ( hashcode_type(1) << tbb::detail::log2( h ) ) - 1; // get parent mask from the topmost bit
-                    b_old = this->get_bucket( h &= m );
-                } while( rehash_required(b_old->node_list.load(std::memory_order_relaxed)) );
-                // now h - is index of the root rehashed bucket b_old
-                this->mark_rehashed_levels( h ); // mark all non-rehashed children recursively across all segments
-                node_base* prev = nullptr;
-                node_base* curr = b_old->node_list.load(std::memory_order_relaxed);
-                while (this->is_valid(curr)) {
-                    hashcode_type curr_node_hash = my_hash_compare.hash(static_cast<node*>(curr)->value().first);
-
-                    if ((curr_node_hash & mask) != h) { // should be rehashed
-                        node_base* next = curr->next;
-                        // exclude from b_old
+                void rehash(size_type sz = 0) {
+                    this->reserve(sz);// TODO: add reduction of number of buckets as well
+                    hashcode_type mask = this->my_mask.load(std::memory_order_relaxed);
+                    hashcode_type b = (mask + 1) >> 1;        // size or first index of the last segment
+                    __TBB_ASSERT((b & (b - 1)) == 0, nullptr);// zero or power of 2
+                    bucket* bp = this->get_bucket(b);// only the last segment should be scanned for rehashing
+                    for (; b <= mask; b++, bp++) {
+                        node_base* n = bp->node_list.load(std::memory_order_relaxed);
+                        __TBB_ASSERT(this->is_valid(n) || empty_rehashed(n) || rehash_required(n),
+                                     "Broken internal structure");
+                        __TBB_ASSERT(
+                                *reinterpret_cast<intptr_t*>(&bp->mutex) == 0,
+                                "concurrent or unexpectedly terminated operation during rehash() execution");
+                        if (rehash_required(
+                                    n)) {// rehash bucket, conditional because rehashing of a previous bucket may affect this one
+                            hashcode_type h = b;
+                            bucket* b_old = bp;
+                            do {
+                                __TBB_ASSERT(h > 1, "The lowermost buckets can't be rehashed");
+                                hashcode_type m = (hashcode_type(1) << tbb::detail::log2(h))
+                                                  - 1;// get parent mask from the topmost bit
+                                b_old = this->get_bucket(h &= m);
+                            } while (rehash_required(b_old->node_list.load(std::memory_order_relaxed)));
+                            // now h - is index of the root rehashed bucket b_old
+                            this->mark_rehashed_levels(
+                                    h);// mark all non-rehashed children recursively across all segments
+                            node_base* prev = nullptr;
+                            node_base* curr = b_old->node_list.load(std::memory_order_relaxed);
+                            while (this->is_valid(curr)) {
+                                hashcode_type curr_node_hash
+                                        = my_hash_compare.hash(static_cast<node*>(curr)->value().first);
+
+                                if ((curr_node_hash & mask) != h) {// should be rehashed
+                                    node_base* next = curr->next;
+                                    // exclude from b_old
+                                    if (prev == nullptr) {
+                                        b_old->node_list.store(curr->next, std::memory_order_relaxed);
+                                    } else {
+                                        prev->next = curr->next;
+                                    }
+                                    bucket* b_new = this->get_bucket(curr_node_hash & mask);
+                                    __TBB_ASSERT(
+                                            !rehash_required(
+                                                    b_new->node_list.load(std::memory_order_relaxed)),
+                                            "hash() function changed for key in table or internal error");
+                                    this->add_to_bucket(b_new, curr);
+                                    curr = next;
+                                } else {
+                                    prev = curr;
+                                    curr = curr->next;
+                                }
+                            }
+                        }
+                    }
+                }
+
+                // Clear table
+                void clear() {
+                    hashcode_type m = this->my_mask.load(std::memory_order_relaxed);
+                    __TBB_ASSERT((m & (m + 1)) == 0, "data structure is invalid");
+                    this->my_size.store(0, std::memory_order_relaxed);
+                    segment_index_type s = this->segment_index_of(m);
+                    __TBB_ASSERT(s + 1 == this->pointers_per_table
+                                         || !this->my_table[s + 1].load(std::memory_order_relaxed),
+                                 "wrong mask or concurrent grow");
+                    do {
+                        __TBB_ASSERT(this->is_valid(this->my_table[s].load(std::memory_order_relaxed)),
+                                     "wrong mask or concurrent grow");
+                        segment_ptr_type buckets_ptr = this->my_table[s].load(std::memory_order_relaxed);
+                        size_type sz = this->segment_size(s ? s : 1);
+                        for (segment_index_type i = 0; i < sz; i++)
+                            for (node_base* n = buckets_ptr[i].node_list.load(std::memory_order_relaxed);
+                                 this->is_valid(n);
+                                 n = buckets_ptr[i].node_list.load(std::memory_order_relaxed)) {
+                                buckets_ptr[i].node_list.store(n->next, std::memory_order_relaxed);
+                                delete_node(n);
+                            }
+                        this->delete_segment(s);
+                    } while (s-- > 0);
+                    this->my_mask.store(this->embedded_buckets - 1, std::memory_order_relaxed);
+                }
+
+                // Clear table and destroy it.
+                ~concurrent_hash_map() { clear(); }
+
+                //------------------------------------------------------------------------
+                // Parallel algorithm support
+                //------------------------------------------------------------------------
+                range_type range(size_type grainsize = 1) { return range_type(*this, grainsize); }
+                const_range_type range(size_type grainsize = 1) const {
+                    return const_range_type(*this, grainsize);
+                }
+
+                //------------------------------------------------------------------------
+                // STL support - not thread-safe methods
+                //------------------------------------------------------------------------
+                iterator begin() {
+                    return iterator(*this, 0, this->my_embedded_segment,
+                                    this->my_embedded_segment->node_list.load(std::memory_order_relaxed));
+                }
+                const_iterator begin() const {
+                    return const_iterator(
+                            *this, 0, this->my_embedded_segment,
+                            this->my_embedded_segment->node_list.load(std::memory_order_relaxed));
+                }
+                const_iterator cbegin() const {
+                    return const_iterator(
+                            *this, 0, this->my_embedded_segment,
+                            this->my_embedded_segment->node_list.load(std::memory_order_relaxed));
+                }
+                iterator end() { return iterator(*this, 0, nullptr, nullptr); }
+                const_iterator end() const { return const_iterator(*this, 0, nullptr, nullptr); }
+                const_iterator cend() const { return const_iterator(*this, 0, nullptr, nullptr); }
+                std::pair<iterator, iterator> equal_range(const Key& key) {
+                    return internal_equal_range(key, end());
+                }
+                std::pair<const_iterator, const_iterator> equal_range(const Key& key) const {
+                    return internal_equal_range(key, end());
+                }
+
+                template <typename K>
+                typename std::enable_if<hash_compare_is_transparent<K>::value,
+                                        std::pair<iterator, iterator>>::type
+                equal_range(const K& key) {
+                    return internal_equal_range(key, end());
+                }
+
+                template <typename K>
+                typename std::enable_if<hash_compare_is_transparent<K>::value,
+                                        std::pair<const_iterator, const_iterator>>::type
+                equal_range(const K& key) const {
+                    return internal_equal_range(key, end());
+                }
+
+                // Number of items in table.
+                size_type size() const { return this->my_size.load(std::memory_order_acquire); }
+
+                // True if size()==0.
+                __TBB_nodiscard bool empty() const { return size() == 0; }
+
+                // Upper bound on size.
+                size_type max_size() const {
+                    return allocator_traits_type::max_size(base_type::get_allocator());
+                }
+
+                // Returns the current number of buckets
+                size_type bucket_count() const { return this->my_mask.load(std::memory_order_relaxed) + 1; }
+
+                // return allocator object
+                allocator_type get_allocator() const { return base_type::get_allocator(); }
+
+                // swap two instances. Iterators are invalidated
+                void swap(concurrent_hash_map& table) {
+                    using pocs_type = typename node_allocator_traits::propagate_on_container_swap;
+                    using is_equal_type = typename node_allocator_traits::is_always_equal;
+                    swap_allocators(this->my_allocator, table.my_allocator);
+                    internal_swap(table, tbb::detail::disjunction<pocs_type, is_equal_type>());
+                }
+
+                //------------------------------------------------------------------------
+                // concurrent map operations
+                //------------------------------------------------------------------------
+
+                // Return count of items (0 or 1)
+                size_type count(const Key& key) const {
+                    return const_cast<concurrent_hash_map*>(this)->lookup</*insert*/ false>(
+                            key, nullptr, nullptr, /*write=*/false, &do_not_allocate_node);
+                }
+
+                template <typename K>
+                typename std::enable_if<hash_compare_is_transparent<K>::value, size_type>::type
+                count(const K& key) const {
+                    return const_cast<concurrent_hash_map*>(this)->lookup</*insert*/ false>(
+                            key, nullptr, nullptr, /*write=*/false, &do_not_allocate_node);
+                }
+
+                // Find item and acquire a read lock on the item.
+                /** Return true if item is found, false otherwise. */
+                bool find(const_accessor& result, const Key& key) const {
+                    result.release();
+                    return const_cast<concurrent_hash_map*>(this)->lookup</*insert*/ false>(
+                            key, nullptr, &result, /*write=*/false, &do_not_allocate_node);
+                }
+
+                // Find item and acquire a write lock on the item.
+                /** Return true if item is found, false otherwise. */
+                bool find(accessor& result, const Key& key) {
+                    result.release();
+                    return lookup</*insert*/ false>(key, nullptr, &result, /*write=*/true,
+                                                    &do_not_allocate_node);
+                }
+
+                template <typename K>
+                typename std::enable_if<hash_compare_is_transparent<K>::value, bool>::type
+                find(const_accessor& result, const K& key) {
+                    result.release();
+                    return lookup</*insert*/ false>(key, nullptr, &result, /*write=*/false,
+                                                    &do_not_allocate_node);
+                }
+
+                template <typename K>
+                typename std::enable_if<hash_compare_is_transparent<K>::value, bool>::type
+                find(accessor& result, const K& key) {
+                    result.release();
+                    return lookup</*insert*/ false>(key, nullptr, &result, /*write=*/true,
+                                                    &do_not_allocate_node);
+                }
+
+                // Insert item (if not already present) and acquire a read lock on the item.
+                /** Returns true if item is new. */
+                bool insert(const_accessor& result, const Key& key) {
+                    result.release();
+                    return lookup</*insert*/ true>(key, nullptr, &result, /*write=*/false,
+                                                   &allocate_node_default_construct<>);
+                }
+
+                // Insert item (if not already present) and acquire a write lock on the item.
+                /** Returns true if item is new. */
+                bool insert(accessor& result, const Key& key) {
+                    result.release();
+                    return lookup</*insert*/ true>(key, nullptr, &result, /*write=*/true,
+                                                   &allocate_node_default_construct<>);
+                }
+
+                template <typename K>
+                typename std::enable_if<hash_compare_is_transparent<K>::value
+                                                && std::is_constructible<key_type, const K&>::value,
+                                        bool>::type
+                insert(const_accessor& result, const K& key) {
+                    result.release();
+                    return lookup</*insert*/ true>(key, nullptr, &result, /*write=*/false,
+                                                   &allocate_node_default_construct<K>);
+                }
+
+                template <typename K>
+                typename std::enable_if<hash_compare_is_transparent<K>::value
+                                                && std::is_constructible<key_type, const K&>::value,
+                                        bool>::type
+                insert(accessor& result, const K& key) {
+                    result.release();
+                    return lookup</*insert*/ true>(key, nullptr, &result, /*write=*/true,
+                                                   &allocate_node_default_construct<K>);
+                }
+
+                // Insert item by copying if there is no such key present already and acquire a read lock on the item.
+                /** Returns true if item is new. */
+                bool insert(const_accessor& result, const value_type& value) {
+                    result.release();
+                    return lookup</*insert*/ true>(value.first, &value.second, &result, /*write=*/false,
+                                                   &allocate_node_copy_construct);
+                }
+
+                // Insert item by copying if there is no such key present already and acquire a write lock on the item.
+                /** Returns true if item is new. */
+                bool insert(accessor& result, const value_type& value) {
+                    result.release();
+                    return lookup</*insert*/ true>(value.first, &value.second, &result, /*write=*/true,
+                                                   &allocate_node_copy_construct);
+                }
+
+                // Insert item by copying if there is no such key present already
+                /** Returns true if item is inserted. */
+                bool insert(const value_type& value) {
+                    return lookup</*insert*/ true>(value.first, &value.second, nullptr, /*write=*/false,
+                                                   &allocate_node_copy_construct);
+                }
+
+                // Insert item by copying if there is no such key present already and acquire a read lock on the item.
+                /** Returns true if item is new. */
+                bool insert(const_accessor& result, value_type&& value) {
+                    return generic_move_insert(result, std::move(value));
+                }
+
+                // Insert item by copying if there is no such key present already and acquire a write lock on the item.
+                /** Returns true if item is new. */
+                bool insert(accessor& result, value_type&& value) {
+                    return generic_move_insert(result, std::move(value));
+                }
+
+                // Insert item by copying if there is no such key present already
+                /** Returns true if item is inserted. */
+                bool insert(value_type&& value) {
+                    return generic_move_insert(accessor_not_used(), std::move(value));
+                }
+
+                // Insert item by copying if there is no such key present already and acquire a read lock on the item.
+                /** Returns true if item is new. */
+                template <typename... Args>
+                bool emplace(const_accessor& result, Args&&... args) {
+                    return generic_emplace(result, std::forward<Args>(args)...);
+                }
+
+                // Insert item by copying if there is no such key present already and acquire a write lock on the item.
+                /** Returns true if item is new. */
+                template <typename... Args>
+                bool emplace(accessor& result, Args&&... args) {
+                    return generic_emplace(result, std::forward<Args>(args)...);
+                }
+
+                // Insert item by copying if there is no such key present already
+                /** Returns true if item is inserted. */
+                template <typename... Args>
+                bool emplace(Args&&... args) {
+                    return generic_emplace(accessor_not_used(), std::forward<Args>(args)...);
+                }
+
+                // Insert range [first, last)
+                template <typename I>
+                void insert(I first, I last) {
+                    for (; first != last; ++first) insert(*first);
+                }
+
+                // Insert initializer list
+                void insert(std::initializer_list<value_type> il) { insert(il.begin(), il.end()); }
+
+                // Erase item.
+                /** Return true if item was erased by particularly this call. */
+                bool erase(const Key& key) { return internal_erase(key); }
+
+                template <typename K>
+                typename std::enable_if<hash_compare_is_transparent<K>::value, bool>::type
+                erase(const K& key) {
+                    return internal_erase(key);
+                }
+
+                // Erase item by const_accessor.
+                /** Return true if item was erased by particularly this call. */
+                bool erase(const_accessor& item_accessor) { return exclude(item_accessor); }
+
+                // Erase item by accessor.
+                /** Return true if item was erased by particularly this call. */
+                bool erase(accessor& item_accessor) { return exclude(item_accessor); }
+
+            protected:
+                template <typename K, typename AllocateNodeType>
+                node* allocate_node_helper(const K& key, const T* t, AllocateNodeType allocate_node,
+                                           std::true_type) {
+                    return allocate_node(base_type::get_allocator(), key, t);
+                }
+
+                template <typename K, typename AllocateNodeType>
+                node* allocate_node_helper(const K&, const T*, AllocateNodeType, std::false_type) {
+                    __TBB_ASSERT(false, "allocate_node_helper with std::false_type should never been called");
+                    return nullptr;
+                }
+
+                // Insert or find item and optionally acquire a lock on the item.
+                template <bool OpInsert, typename K, typename AllocateNodeType>
+                bool lookup(const K& key, const T* t, const_accessor* result, bool write,
+                            AllocateNodeType allocate_node, node* tmp_n = nullptr) {
+                    __TBB_ASSERT(!result || !result->my_node, nullptr);
+                    bool return_value;
+                    hashcode_type const h = my_hash_compare.hash(key);
+                    hashcode_type m = this->my_mask.load(std::memory_order_acquire);
+                    segment_index_type grow_segment = 0;
+                    node* n;
+                restart: {//lock scope
+                    __TBB_ASSERT((m & (m + 1)) == 0, "data structure is invalid");
+                    return_value = false;
+                    // get bucket
+                    bucket_accessor b(this, h & m);
+                    // find a node
+                    n = search_bucket(key, b());
+                    if (OpInsert) {
+                        // [opt] insert a key
+                        if (!n) {
+                            if (!tmp_n) {
+                                tmp_n = allocate_node_helper(key, t, allocate_node,
+                                                             std::integral_constant<bool, OpInsert> {});
+                            }
+                            while (!b.is_writer() && !b.upgrade_to_writer()) {// TODO: improved insertion
+                                // Rerun search list, in case another thread inserted the intem during the upgrade
+                                n = search_bucket(key, b());
+                                if (this->is_valid(n)) {// unfortunately, it did
+                                    if (!b.downgrade_to_reader()) {
+                                        // If the lock was downgraded with reacquiring the mutex
+                                        // Rerun search list in case another thread removed the item during the downgrade
+                                        n = search_bucket(key, b());
+                                        if (!this->is_valid(n)) {
+                                            // Unfortunately, it did
+                                            // We need to try upgrading to writer again
+                                            continue;
+                                        }
+                                    }
+                                    goto exists;
+                                }
+                            }
+
+                            if (this->check_mask_race(h, m)) goto restart;// b.release() is done in ~b().
+                            // insert and set flag to grow the container
+                            grow_segment = this->insert_new_node(b(), n = tmp_n, m);
+                            tmp_n = nullptr;
+                            return_value = true;
+                        }
+                    } else {// find or count
+                        if (!n) {
+                            if (this->check_mask_race(h, m))
+                                goto restart;// b.release() is done in ~b(). TODO: replace by continue
+                            return false;
+                        }
+                        return_value = true;
+                    }
+                exists:
+                    if (!result) goto check_growth;
+                    // TODO: the following seems as generic/regular operation
+                    // acquire the item
+                    if (!result->try_acquire(n->mutex, write)) {
+                        for (tbb::detail::atomic_backoff backoff(true);;) {
+                            if (result->try_acquire(n->mutex, write)) break;
+                            if (!backoff.bounded_pause()) {
+                                // the wait takes really long, restart the operation
+                                b.release();
+                                __TBB_ASSERT(!OpInsert || !return_value,
+                                             "Can't acquire new item in locked bucket?");
+                                yield();
+                                m = this->my_mask.load(std::memory_order_acquire);
+                                goto restart;
+                            }
+                        }
+                    }
+                }//lock scope
+                    result->my_node = n;
+                    result->my_hash = h;
+                check_growth:
+                    // [opt] grow the container
+                    if (grow_segment) { this->enable_segment(grow_segment); }
+                    if (tmp_n)// if OpInsert only
+                        delete_node(tmp_n);
+                    return return_value;
+                }
+
+                struct accessor_not_used {
+                    void release() {}
+                };
+                friend const_accessor* accessor_location(accessor_not_used const&) { return nullptr; }
+                friend const_accessor* accessor_location(const_accessor& a) { return &a; }
+
+                friend bool is_write_access_needed(accessor const&) { return true; }
+                friend bool is_write_access_needed(const_accessor const&) { return false; }
+                friend bool is_write_access_needed(accessor_not_used const&) { return false; }
+
+                template <typename Accessor>
+                bool generic_move_insert(Accessor&& result, value_type&& value) {
+                    result.release();
+                    return lookup</*insert*/ true>(value.first, &value.second, accessor_location(result),
+                                                   is_write_access_needed(result),
+                                                   &allocate_node_move_construct);
+                }
+
+                template <typename Accessor, typename... Args>
+                bool generic_emplace(Accessor&& result, Args&&... args) {
+                    result.release();
+                    node* node_ptr = create_node(base_type::get_allocator(), std::forward<Args>(args)...);
+                    return lookup</*insert*/ true>(node_ptr->value().first, nullptr,
+                                                   accessor_location(result), is_write_access_needed(result),
+                                                   &do_not_allocate_node, node_ptr);
+                }
+
+                // delete item by accessor
+                bool exclude(const_accessor& item_accessor) {
+                    __TBB_ASSERT(item_accessor.my_node, nullptr);
+                    node_base* const exclude_node = item_accessor.my_node;
+                    hashcode_type const hash = item_accessor.my_hash;
+                    hashcode_type mask = this->my_mask.load(std::memory_order_acquire);
+                    do {
+                        // get bucket
+                        bucket_accessor b(this, hash & mask, /*writer=*/true);
+                        node_base* prev = nullptr;
+                        node_base* curr = b()->node_list.load(std::memory_order_relaxed);
+
+                        while (curr && curr != exclude_node) {
+                            prev = curr;
+                            curr = curr->next;
+                        }
+
+                        if (curr == nullptr) {// someone else was first
+                            if (this->check_mask_race(hash, mask)) continue;
+                            item_accessor.release();
+                            return false;
+                        }
+                        __TBB_ASSERT(curr == exclude_node, nullptr);
+                        // remove from container
                         if (prev == nullptr) {
-                            b_old->node_list.store(curr->next, std::memory_order_relaxed);
+                            b()->node_list.store(curr->next, std::memory_order_relaxed);
                         } else {
                             prev->next = curr->next;
                         }
-                        bucket *b_new = this->get_bucket(curr_node_hash & mask);
-                        __TBB_ASSERT(!rehash_required(b_new->node_list.load(std::memory_order_relaxed)), "hash() function changed for key in table or internal error");
-                        this->add_to_bucket(b_new, curr);
-                        curr = next;
+
+                        this->my_size--;
+                        break;
+                    } while (true);
+                    if (!item_accessor.is_writer()) {     // need to get exclusive lock
+                        item_accessor.upgrade_to_writer();// return value means nothing here
+                    }
+
+                    item_accessor.release();
+                    delete_node(exclude_node);// Only one thread can delete it
+                    return true;
+                }
+
+                template <typename K>
+                bool internal_erase(const K& key) {
+                    node_base* erase_node;
+                    hashcode_type const hash = my_hash_compare.hash(key);
+                    hashcode_type mask = this->my_mask.load(std::memory_order_acquire);
+                restart: {//lock scope
+                    // get bucket
+                    bucket_accessor b(this, hash & mask);
+                search:
+                    node_base* prev = nullptr;
+                    erase_node = b()->node_list.load(std::memory_order_relaxed);
+                    while (this->is_valid(erase_node)
+                           && !my_hash_compare.equal(key, static_cast<node*>(erase_node)->value().first)) {
+                        prev = erase_node;
+                        erase_node = erase_node->next;
+                    }
+
+                    if (erase_node == nullptr) {// not found, but mask could be changed
+                        if (this->check_mask_race(hash, mask)) goto restart;
+                        return false;
+                    } else if (!b.is_writer() && !b.upgrade_to_writer()) {
+                        if (this->check_mask_race(hash, mask))// contended upgrade, check mask
+                            goto restart;
+                        goto search;
+                    }
+
+                    // remove from container
+                    if (prev == nullptr) {
+                        b()->node_list.store(erase_node->next, std::memory_order_relaxed);
                     } else {
-                        prev = curr;
-                        curr = curr->next;
+                        prev->next = erase_node->next;
                     }
+                    this->my_size--;
                 }
-            }
-        }
-    }
-
-    // Clear table
-    void clear() {
-        hashcode_type m = this->my_mask.load(std::memory_order_relaxed);
-        __TBB_ASSERT((m&(m+1))==0, "data structure is invalid");
-        this->my_size.store(0, std::memory_order_relaxed);
-        segment_index_type s = this->segment_index_of( m );
-        __TBB_ASSERT( s+1 == this->pointers_per_table || !this->my_table[s+1].load(std::memory_order_relaxed), "wrong mask or concurrent grow" );
-        do {
-            __TBB_ASSERT(this->is_valid(this->my_table[s].load(std::memory_order_relaxed)), "wrong mask or concurrent grow" );
-            segment_ptr_type buckets_ptr = this->my_table[s].load(std::memory_order_relaxed);
-            size_type sz = this->segment_size( s ? s : 1 );
-            for( segment_index_type i = 0; i < sz; i++ )
-                for( node_base *n = buckets_ptr[i].node_list.load(std::memory_order_relaxed);
-                    this->is_valid(n); n = buckets_ptr[i].node_list.load(std::memory_order_relaxed) )
-                {
-                    buckets_ptr[i].node_list.store(n->next, std::memory_order_relaxed);
-                    delete_node( n );
-                }
-            this->delete_segment(s);
-        } while(s-- > 0);
-        this->my_mask.store(this->embedded_buckets - 1, std::memory_order_relaxed);
-    }
-
-    // Clear table and destroy it.
-    ~concurrent_hash_map() { clear(); }
-
-    //------------------------------------------------------------------------
-    // Parallel algorithm support
-    //------------------------------------------------------------------------
-    range_type range( size_type grainsize=1 ) {
-        return range_type( *this, grainsize );
-    }
-    const_range_type range( size_type grainsize=1 ) const {
-        return const_range_type( *this, grainsize );
-    }
-
-    //------------------------------------------------------------------------
-    // STL support - not thread-safe methods
-    //------------------------------------------------------------------------
-    iterator begin() { return iterator( *this, 0, this->my_embedded_segment, this->my_embedded_segment->node_list.load(std::memory_order_relaxed) ); }
-    const_iterator begin() const { return const_iterator( *this, 0, this->my_embedded_segment, this->my_embedded_segment->node_list.load(std::memory_order_relaxed) ); }
-    const_iterator cbegin() const { return const_iterator( *this, 0, this->my_embedded_segment, this->my_embedded_segment->node_list.load(std::memory_order_relaxed) ); }
-    iterator end() { return iterator( *this, 0, nullptr, nullptr ); }
-    const_iterator end() const { return const_iterator( *this, 0, nullptr, nullptr ); }
-    const_iterator cend() const { return const_iterator( *this, 0, nullptr, nullptr ); }
-    std::pair<iterator, iterator> equal_range( const Key& key ) { return internal_equal_range( key, end() ); }
-    std::pair<const_iterator, const_iterator> equal_range( const Key& key ) const { return internal_equal_range( key, end() ); }
-
-    template <typename K>
-    typename std::enable_if<hash_compare_is_transparent<K>::value,
-                            std::pair<iterator, iterator>>::type equal_range( const K& key ) {
-        return internal_equal_range(key, end());
-    }
-
-    template <typename K>
-    typename std::enable_if<hash_compare_is_transparent<K>::value,
-                            std::pair<const_iterator, const_iterator>>::type equal_range( const K& key ) const {
-        return internal_equal_range(key, end());
-    }
-
-    // Number of items in table.
-    size_type size() const { return this->my_size.load(std::memory_order_acquire); }
-
-    // True if size()==0.
-    __TBB_nodiscard bool empty() const { return size() == 0; }
-
-    // Upper bound on size.
-    size_type max_size() const {
-        return allocator_traits_type::max_size(base_type::get_allocator());
-    }
-
-    // Returns the current number of buckets
-    size_type bucket_count() const { return this->my_mask.load(std::memory_order_relaxed) + 1; }
-
-    // return allocator object
-    allocator_type get_allocator() const { return base_type::get_allocator(); }
-
-    // swap two instances. Iterators are invalidated
-    void swap(concurrent_hash_map& table) {
-        using pocs_type = typename node_allocator_traits::propagate_on_container_swap;
-        using is_equal_type = typename node_allocator_traits::is_always_equal;
-        swap_allocators(this->my_allocator, table.my_allocator);
-        internal_swap(table, tbb::detail::disjunction<pocs_type, is_equal_type>());
-    }
-
-    //------------------------------------------------------------------------
-    // concurrent map operations
-    //------------------------------------------------------------------------
-
-    // Return count of items (0 or 1)
-    size_type count( const Key &key ) const {
-        return const_cast<concurrent_hash_map*>(this)->lookup</*insert*/false>(key, nullptr, nullptr, /*write=*/false, &do_not_allocate_node);
-    }
-
-    template <typename K>
-    typename std::enable_if<hash_compare_is_transparent<K>::value,
-                            size_type>::type count( const K& key ) const {
-        return const_cast<concurrent_hash_map*>(this)->lookup</*insert*/false>(key, nullptr, nullptr, /*write=*/false, &do_not_allocate_node);
-    }
-
-    // Find item and acquire a read lock on the item.
-    /** Return true if item is found, false otherwise. */
-    bool find( const_accessor &result, const Key &key ) const {
-        result.release();
-        return const_cast<concurrent_hash_map*>(this)->lookup</*insert*/false>(key, nullptr, &result, /*write=*/false, &do_not_allocate_node );
-    }
-
-    // Find item and acquire a write lock on the item.
-    /** Return true if item is found, false otherwise. */
-    bool find( accessor &result, const Key &key ) {
-        result.release();
-        return lookup</*insert*/false>(key, nullptr, &result, /*write=*/true, &do_not_allocate_node);
-    }
-
-    template <typename K>
-    typename std::enable_if<hash_compare_is_transparent<K>::value,
-                            bool>::type find( const_accessor& result, const K& key ) {
-        result.release();
-        return lookup</*insert*/false>(key, nullptr, &result, /*write=*/false, &do_not_allocate_node);
-    }
-
-    template <typename K>
-    typename std::enable_if<hash_compare_is_transparent<K>::value,
-                            bool>::type find( accessor& result, const K& key ) {
-        result.release();
-        return lookup</*insert*/false>(key, nullptr, &result, /*write=*/true, &do_not_allocate_node);
-    }
-
-    // Insert item (if not already present) and acquire a read lock on the item.
-    /** Returns true if item is new. */
-    bool insert( const_accessor &result, const Key &key ) {
-        result.release();
-        return lookup</*insert*/true>(key, nullptr, &result, /*write=*/false, &allocate_node_default_construct<>);
-    }
-
-    // Insert item (if not already present) and acquire a write lock on the item.
-    /** Returns true if item is new. */
-    bool insert( accessor &result, const Key &key ) {
-        result.release();
-        return lookup</*insert*/true>(key, nullptr, &result, /*write=*/true, &allocate_node_default_construct<>);
-    }
-
-    template <typename K>
-    typename std::enable_if<hash_compare_is_transparent<K>::value &&
-                            std::is_constructible<key_type, const K&>::value,
-                            bool>::type insert( const_accessor& result, const K& key ) {
-        result.release();
-        return lookup</*insert*/true>(key, nullptr, &result, /*write=*/false, &allocate_node_default_construct<K>);
-    }
-
-    template <typename K>
-    typename std::enable_if<hash_compare_is_transparent<K>::value &&
-                            std::is_constructible<key_type, const K&>::value,
-                            bool>::type insert( accessor& result, const K& key ) {
-        result.release();
-        return lookup</*insert*/true>(key, nullptr, &result, /*write=*/true, &allocate_node_default_construct<K>);
-    }
-
-    // Insert item by copying if there is no such key present already and acquire a read lock on the item.
-    /** Returns true if item is new. */
-    bool insert( const_accessor &result, const value_type &value ) {
-        result.release();
-        return lookup</*insert*/true>(value.first, &value.second, &result, /*write=*/false, &allocate_node_copy_construct);
-    }
-
-    // Insert item by copying if there is no such key present already and acquire a write lock on the item.
-    /** Returns true if item is new. */
-    bool insert( accessor &result, const value_type &value ) {
-        result.release();
-        return lookup</*insert*/true>(value.first, &value.second, &result, /*write=*/true, &allocate_node_copy_construct);
-    }
-
-    // Insert item by copying if there is no such key present already
-    /** Returns true if item is inserted. */
-    bool insert( const value_type &value ) {
-        return lookup</*insert*/true>(value.first, &value.second, nullptr, /*write=*/false, &allocate_node_copy_construct);
-    }
-
-    // Insert item by copying if there is no such key present already and acquire a read lock on the item.
-    /** Returns true if item is new. */
-    bool insert( const_accessor &result, value_type && value ) {
-        return generic_move_insert(result, std::move(value));
-    }
-
-    // Insert item by copying if there is no such key present already and acquire a write lock on the item.
-    /** Returns true if item is new. */
-    bool insert( accessor &result, value_type && value ) {
-        return generic_move_insert(result, std::move(value));
-    }
-
-    // Insert item by copying if there is no such key present already
-    /** Returns true if item is inserted. */
-    bool insert( value_type && value ) {
-        return generic_move_insert(accessor_not_used(), std::move(value));
-    }
-
-    // Insert item by copying if there is no such key present already and acquire a read lock on the item.
-    /** Returns true if item is new. */
-    template <typename... Args>
-    bool emplace( const_accessor &result, Args&&... args ) {
-        return generic_emplace(result, std::forward<Args>(args)...);
-    }
-
-    // Insert item by copying if there is no such key present already and acquire a write lock on the item.
-    /** Returns true if item is new. */
-    template <typename... Args>
-    bool emplace( accessor &result, Args&&... args ) {
-        return generic_emplace(result, std::forward<Args>(args)...);
-    }
-
-    // Insert item by copying if there is no such key present already
-    /** Returns true if item is inserted. */
-    template <typename... Args>
-    bool emplace( Args&&... args ) {
-        return generic_emplace(accessor_not_used(), std::forward<Args>(args)...);
-    }
-
-    // Insert range [first, last)
-    template <typename I>
-    void insert( I first, I last ) {
-        for ( ; first != last; ++first )
-            insert( *first );
-    }
-
-    // Insert initializer list
-    void insert( std::initializer_list<value_type> il ) {
-        insert( il.begin(), il.end() );
-    }
-
-    // Erase item.
-    /** Return true if item was erased by particularly this call. */
-    bool erase( const Key &key ) {
-        return internal_erase(key);
-    }
-
-    template <typename K>
-    typename std::enable_if<hash_compare_is_transparent<K>::value,
-                            bool>::type erase( const K& key ) {
-        return internal_erase(key);
-    }
-
-    // Erase item by const_accessor.
-    /** Return true if item was erased by particularly this call. */
-    bool erase( const_accessor& item_accessor ) {
-        return exclude( item_accessor );
-    }
-
-    // Erase item by accessor.
-    /** Return true if item was erased by particularly this call. */
-    bool erase( accessor& item_accessor ) {
-        return exclude( item_accessor );
-    }
-
-protected:
-    template <typename K, typename AllocateNodeType>
-    node* allocate_node_helper( const K& key, const T* t, AllocateNodeType allocate_node, std::true_type ) {
-        return allocate_node(base_type::get_allocator(), key, t);
-    }
-
-    template <typename K, typename AllocateNodeType>
-    node* allocate_node_helper( const K&, const T*, AllocateNodeType, std::false_type ) {
-        __TBB_ASSERT(false, "allocate_node_helper with std::false_type should never been called");
-        return nullptr;
-    }
-
-    // Insert or find item and optionally acquire a lock on the item.
-    template <bool OpInsert, typename K, typename AllocateNodeType>
-    bool lookup( const K &key, const T *t, const_accessor *result, bool write, AllocateNodeType allocate_node, node *tmp_n  = nullptr)
-    {
-        __TBB_ASSERT( !result || !result->my_node, nullptr );
-        bool return_value;
-        hashcode_type const h = my_hash_compare.hash( key );
-        hashcode_type m = this->my_mask.load(std::memory_order_acquire);
-        segment_index_type grow_segment = 0;
-        node *n;
-        restart:
-        {//lock scope
-            __TBB_ASSERT((m&(m+1))==0, "data structure is invalid");
-            return_value = false;
-            // get bucket
-            bucket_accessor b( this, h & m );
-            // find a node
-            n = search_bucket( key, b() );
-            if( OpInsert ) {
-                // [opt] insert a key
-                if( !n ) {
-                    if( !tmp_n ) {
-                        tmp_n = allocate_node_helper(key, t, allocate_node, std::integral_constant<bool, OpInsert>{});
+                    { typename node::scoped_type item_locker(erase_node->mutex, /*write=*/true); }
+                    // note: there should be no threads pretending to acquire this mutex again, do not try to upgrade const_accessor!
+                    delete_node(erase_node);// Only one thread can delete it due to write lock on the bucket
+                    return true;
+                }
+
+                // Returns an iterator for an item defined by the key, or for the next item after it (if upper==true)
+                template <typename K, typename I>
+                std::pair<I, I> internal_equal_range(const K& key, I end_) const {
+                    hashcode_type h = my_hash_compare.hash(key);
+                    hashcode_type m = this->my_mask.load(std::memory_order_relaxed);
+                    __TBB_ASSERT((m & (m + 1)) == 0, "data structure is invalid");
+                    h &= m;
+                    bucket* b = this->get_bucket(h);
+                    while (rehash_required(b->node_list.load(std::memory_order_relaxed))) {
+                        m = (hashcode_type(1) << tbb::detail::log2(h))
+                            - 1;// get parent mask from the topmost bit
+                        b = this->get_bucket(h &= m);
                     }
-                    while ( !b.is_writer() && !b.upgrade_to_writer() ) { // TODO: improved insertion
-                        // Rerun search list, in case another thread inserted the intem during the upgrade
-                        n = search_bucket(key, b());
-                        if (this->is_valid(n)) { // unfortunately, it did
-                            if (!b.downgrade_to_reader()) {
-                                // If the lock was downgraded with reacquiring the mutex
-                                // Rerun search list in case another thread removed the item during the downgrade
-                                n = search_bucket(key, b());
-                                if (!this->is_valid(n)) {
-                                    // Unfortunately, it did
-                                    // We need to try upgrading to writer again
-                                    continue;
-                                }
+                    node* n = search_bucket(key, b);
+                    if (!n) return std::make_pair(end_, end_);
+                    iterator lower(*this, h, b, n), upper(lower);
+                    return std::make_pair(lower, ++upper);
+                }
+
+                // Copy "source" to *this, where *this must start out empty.
+                void internal_copy(const concurrent_hash_map& source) {
+                    hashcode_type mask = source.my_mask.load(std::memory_order_relaxed);
+                    if (this->my_mask.load(std::memory_order_relaxed) == mask) {      // optimized version
+                        this->reserve(source.my_size.load(std::memory_order_relaxed));// TODO: load_factor?
+                        bucket *dst = nullptr, *src = nullptr;
+                        bool rehashing_required = false;
+                        for (hashcode_type k = 0; k <= mask; k++) {
+                            if (k & (k - 2)) ++dst, src++;// not the beginning of a segment
+                            else {
+                                dst = this->get_bucket(k);
+                                src = source.get_bucket(k);
                             }
-                            goto exists;
+                            __TBB_ASSERT(!rehash_required(dst->node_list.load(std::memory_order_relaxed)),
+                                         "Invalid bucket in destination table");
+                            node* n = static_cast<node*>(src->node_list.load(std::memory_order_relaxed));
+                            if (rehash_required(n)) {// source is not rehashed, items are in previous buckets
+                                rehashing_required = true;
+                                dst->node_list.store(reinterpret_cast<node_base*>(rehash_req_flag),
+                                                     std::memory_order_relaxed);
+                            } else
+                                for (; n; n = static_cast<node*>(n->next)) {
+                                    node* node_ptr = create_node(base_type::get_allocator(), n->value().first,
+                                                                 n->value().second);
+                                    this->add_to_bucket(dst, node_ptr);
+                                    this->my_size.fetch_add(1, std::memory_order_relaxed);
+                                }
                         }
+                        if (rehashing_required) rehash();
+                    } else
+                        internal_copy(source.begin(), source.end(),
+                                      source.my_size.load(std::memory_order_relaxed));
+                }
+
+                template <typename I>
+                void internal_copy(I first, I last, size_type reserve_size) {
+                    this->reserve(reserve_size);// TODO: load_factor?
+                    hashcode_type m = this->my_mask.load(std::memory_order_relaxed);
+                    for (; first != last; ++first) {
+                        hashcode_type h = my_hash_compare.hash((*first).first);
+                        bucket* b = this->get_bucket(h & m);
+                        __TBB_ASSERT(!rehash_required(b->node_list.load(std::memory_order_relaxed)),
+                                     "Invalid bucket in destination table");
+                        node* node_ptr
+                                = create_node(base_type::get_allocator(), (*first).first, (*first).second);
+                        this->add_to_bucket(b, node_ptr);
+                        ++this->my_size;// TODO: replace by non-atomic op
                     }
+                }
 
-                    if( this->check_mask_race(h, m) )
-                        goto restart; // b.release() is done in ~b().
-                    // insert and set flag to grow the container
-                    grow_segment = this->insert_new_node( b(), n = tmp_n, m );
-                    tmp_n = nullptr;
-                    return_value = true;
-                }
-            } else { // find or count
-                if( !n ) {
-                    if( this->check_mask_race( h, m ) )
-                        goto restart; // b.release() is done in ~b(). TODO: replace by continue
-                    return false;
+                void internal_move_construct_with_allocator(concurrent_hash_map&& other,
+                                                            const allocator_type&,
+                                                            /*is_always_equal=*/std::true_type) {
+                    this->internal_move(std::move(other));
                 }
-                return_value = true;
-            }
-        exists:
-            if( !result ) goto check_growth;
-            // TODO: the following seems as generic/regular operation
-            // acquire the item
-            if( !result->try_acquire( n->mutex, write ) ) {
-                for( tbb::detail::atomic_backoff backoff(true);; ) {
-                    if( result->try_acquire( n->mutex, write ) ) break;
-                    if( !backoff.bounded_pause() ) {
-                        // the wait takes really long, restart the operation
-                        b.release();
-                        __TBB_ASSERT( !OpInsert || !return_value, "Can't acquire new item in locked bucket?" );
-                        yield();
-                        m = this->my_mask.load(std::memory_order_acquire);
-                        goto restart;
+
+                void internal_move_construct_with_allocator(concurrent_hash_map&& other,
+                                                            const allocator_type& a,
+                                                            /*is_always_equal=*/std::false_type) {
+                    if (a == other.get_allocator()) {
+                        this->internal_move(std::move(other));
+                    } else {
+                        try_call([&] {
+                            internal_copy(std::make_move_iterator(other.begin()),
+                                          std::make_move_iterator(other.end()), other.size());
+                        }).on_exception([&] { this->clear(); });
                     }
                 }
-            }
-        }//lock scope
-        result->my_node = n;
-        result->my_hash = h;
-    check_growth:
-        // [opt] grow the container
-        if( grow_segment ) {
-            this->enable_segment( grow_segment );
-        }
-        if( tmp_n ) // if OpInsert only
-            delete_node( tmp_n );
-        return return_value;
-    }
-
-    struct accessor_not_used { void release(){}};
-    friend const_accessor* accessor_location( accessor_not_used const& ){ return nullptr;}
-    friend const_accessor* accessor_location( const_accessor & a )      { return &a;}
-
-    friend bool is_write_access_needed( accessor const& )           { return true;}
-    friend bool is_write_access_needed( const_accessor const& )     { return false;}
-    friend bool is_write_access_needed( accessor_not_used const& )  { return false;}
-
-    template <typename Accessor>
-    bool generic_move_insert( Accessor && result, value_type && value ) {
-        result.release();
-        return lookup</*insert*/true>(value.first, &value.second, accessor_location(result), is_write_access_needed(result), &allocate_node_move_construct);
-    }
-
-    template <typename Accessor, typename... Args>
-    bool generic_emplace( Accessor && result, Args &&... args ) {
-        result.release();
-        node * node_ptr = create_node(base_type::get_allocator(), std::forward<Args>(args)...);
-        return lookup</*insert*/true>(node_ptr->value().first, nullptr, accessor_location(result), is_write_access_needed(result), &do_not_allocate_node, node_ptr);
-    }
-
-    // delete item by accessor
-    bool exclude( const_accessor &item_accessor ) {
-        __TBB_ASSERT( item_accessor.my_node, nullptr );
-        node_base *const exclude_node = item_accessor.my_node;
-        hashcode_type const hash = item_accessor.my_hash;
-        hashcode_type mask = this->my_mask.load(std::memory_order_acquire);
-        do {
-            // get bucket
-            bucket_accessor b( this, hash & mask, /*writer=*/true );
-            node_base* prev = nullptr;
-            node_base* curr = b()->node_list.load(std::memory_order_relaxed);
-
-            while (curr && curr != exclude_node) {
-                prev = curr;
-                curr = curr->next;
-            }
 
-            if (curr == nullptr) { // someone else was first
-                if (this->check_mask_race(hash, mask))
-                    continue;
-                item_accessor.release();
-                return false;
-            }
-            __TBB_ASSERT( curr == exclude_node, nullptr );
-            // remove from container
-            if (prev == nullptr) {
-                b()->node_list.store(curr->next, std::memory_order_relaxed);
-            } else {
-                prev->next = curr->next;
-            }
+                void internal_move_assign(concurrent_hash_map&& other,
+                                          /*is_always_equal || POCMA = */ std::true_type) {
+                    this->internal_move(std::move(other));
+                }
 
-            this->my_size--;
-            break;
-        } while(true);
-        if (!item_accessor.is_writer()) { // need to get exclusive lock
-            item_accessor.upgrade_to_writer(); // return value means nothing here
-        }
-
-        item_accessor.release();
-        delete_node(exclude_node); // Only one thread can delete it
-        return true;
-    }
-
-    template <typename K>
-    bool internal_erase( const K& key ) {
-        node_base *erase_node;
-        hashcode_type const hash = my_hash_compare.hash(key);
-        hashcode_type mask = this->my_mask.load(std::memory_order_acquire);
-    restart:
-        {//lock scope
-            // get bucket
-            bucket_accessor b( this, hash & mask );
-        search:
-            node_base* prev = nullptr;
-            erase_node = b()->node_list.load(std::memory_order_relaxed);
-            while (this->is_valid(erase_node) && !my_hash_compare.equal(key, static_cast<node*>(erase_node)->value().first ) ) {
-                prev = erase_node;
-                erase_node = erase_node->next;
-            }
+                void internal_move_assign(concurrent_hash_map&& other, /*is_always_equal=*/std::false_type) {
+                    if (this->my_allocator == other.my_allocator) {
+                        this->internal_move(std::move(other));
+                    } else {
+                        //do per element move
+                        internal_copy(std::make_move_iterator(other.begin()),
+                                      std::make_move_iterator(other.end()), other.size());
+                    }
+                }
 
-            if (erase_node == nullptr) { // not found, but mask could be changed
-                if (this->check_mask_race(hash, mask))
-                    goto restart;
-                return false;
-            } else if (!b.is_writer() && !b.upgrade_to_writer()) {
-                if (this->check_mask_race(hash, mask)) // contended upgrade, check mask
-                    goto restart;
-                goto search;
-            }
+                void internal_swap(concurrent_hash_map& other,
+                                   /*is_always_equal || POCS = */ std::true_type) {
+                    this->internal_swap_content(other);
+                }
 
-            // remove from container
-            if (prev == nullptr) {
-                b()->node_list.store(erase_node->next, std::memory_order_relaxed);
-            } else {
-                prev->next = erase_node->next;
-            }
-            this->my_size--;
-        }
-        {
-            typename node::scoped_type item_locker( erase_node->mutex, /*write=*/true );
-        }
-        // note: there should be no threads pretending to acquire this mutex again, do not try to upgrade const_accessor!
-        delete_node(erase_node); // Only one thread can delete it due to write lock on the bucket
-        return true;
-    }
-
-    // Returns an iterator for an item defined by the key, or for the next item after it (if upper==true)
-    template <typename K, typename I>
-    std::pair<I, I> internal_equal_range( const K& key, I end_ ) const {
-        hashcode_type h = my_hash_compare.hash( key );
-        hashcode_type m = this->my_mask.load(std::memory_order_relaxed);
-        __TBB_ASSERT((m&(m+1))==0, "data structure is invalid");
-        h &= m;
-        bucket *b = this->get_bucket( h );
-        while (rehash_required(b->node_list.load(std::memory_order_relaxed))) {
-            m = ( hashcode_type(1) << tbb::detail::log2( h ) ) - 1; // get parent mask from the topmost bit
-            b = this->get_bucket( h &= m );
-        }
-        node *n = search_bucket( key, b );
-        if( !n )
-            return std::make_pair(end_, end_);
-        iterator lower(*this, h, b, n), upper(lower);
-        return std::make_pair(lower, ++upper);
-    }
-
-    // Copy "source" to *this, where *this must start out empty.
-    void internal_copy( const concurrent_hash_map& source ) {
-        hashcode_type mask = source.my_mask.load(std::memory_order_relaxed);
-        if( this->my_mask.load(std::memory_order_relaxed) == mask ) { // optimized version
-            this->reserve(source.my_size.load(std::memory_order_relaxed)); // TODO: load_factor?
-            bucket *dst = nullptr, *src = nullptr;
-            bool rehashing_required = false;
-            for( hashcode_type k = 0; k <= mask; k++ ) {
-                if( k & (k-2) ) ++dst,src++; // not the beginning of a segment
-                else { dst = this->get_bucket( k ); src = source.get_bucket( k ); }
-                __TBB_ASSERT(!rehash_required(dst->node_list.load(std::memory_order_relaxed)), "Invalid bucket in destination table");
-                node *n = static_cast<node*>( src->node_list.load(std::memory_order_relaxed) );
-                if (rehash_required(n)) { // source is not rehashed, items are in previous buckets
-                    rehashing_required = true;
-                    dst->node_list.store(reinterpret_cast<node_base*>(rehash_req_flag), std::memory_order_relaxed);
-                } else for(; n; n = static_cast<node*>( n->next ) ) {
-                    node* node_ptr = create_node(base_type::get_allocator(), n->value().first, n->value().second);
-                    this->add_to_bucket( dst, node_ptr);
-                    this->my_size.fetch_add(1, std::memory_order_relaxed);
+                void internal_swap(concurrent_hash_map& other,
+                                   /*is_always_equal || POCS = */ std::false_type) {
+                    __TBB_ASSERT(this->my_allocator == other.my_allocator, nullptr);
+                    this->internal_swap_content(other);
                 }
-            }
-            if( rehashing_required ) rehash();
-        } else internal_copy(source.begin(), source.end(), source.my_size.load(std::memory_order_relaxed));
-    }
-
-    template <typename I>
-    void internal_copy( I first, I last, size_type reserve_size ) {
-        this->reserve(reserve_size); // TODO: load_factor?
-        hashcode_type m = this->my_mask.load(std::memory_order_relaxed);
-        for(; first != last; ++first) {
-            hashcode_type h = my_hash_compare.hash( (*first).first );
-            bucket *b = this->get_bucket( h & m );
-            __TBB_ASSERT(!rehash_required(b->node_list.load(std::memory_order_relaxed)), "Invalid bucket in destination table");
-            node* node_ptr = create_node(base_type::get_allocator(), (*first).first, (*first).second);
-            this->add_to_bucket( b, node_ptr );
-            ++this->my_size; // TODO: replace by non-atomic op
-        }
-    }
-
-    void internal_move_construct_with_allocator( concurrent_hash_map&& other, const allocator_type&,
-                                                /*is_always_equal=*/std::true_type )
-    {
-        this->internal_move(std::move(other));
-    }
-
-    void internal_move_construct_with_allocator( concurrent_hash_map&& other, const allocator_type& a,
-                                                /*is_always_equal=*/std::false_type )
-    {
-        if (a == other.get_allocator()){
-            this->internal_move(std::move(other));
-        } else {
-            try_call( [&] {
-                internal_copy(std::make_move_iterator(other.begin()), std::make_move_iterator(other.end()),
-                    other.size());
-            }).on_exception( [&] {
-                this->clear();
-            });
-        }
-    }
-
-    void internal_move_assign( concurrent_hash_map&& other,
-        /*is_always_equal || POCMA = */std::true_type)
-    {
-        this->internal_move(std::move(other));
-    }
-
-    void internal_move_assign(concurrent_hash_map&& other, /*is_always_equal=*/ std::false_type) {
-        if (this->my_allocator == other.my_allocator) {
-            this->internal_move(std::move(other));
-        } else {
-            //do per element move
-            internal_copy(std::make_move_iterator(other.begin()), std::make_move_iterator(other.end()),
-                other.size());
-        }
-    }
-
-    void internal_swap(concurrent_hash_map& other, /*is_always_equal || POCS = */ std::true_type) {
-        this->internal_swap_content(other);
-    }
-
-    void internal_swap(concurrent_hash_map& other, /*is_always_equal || POCS = */ std::false_type) {
-        __TBB_ASSERT(this->my_allocator == other.my_allocator, nullptr);
-        this->internal_swap_content(other);
-    }
-
-    // Fast find when no concurrent erasure is used. For internal use inside TBB only!
-    /** Return pointer to item with given key, or nullptr if no such item exists.
+
+                // Fast find when no concurrent erasure is used. For internal use inside TBB only!
+                /** Return pointer to item with given key, or nullptr if no such item exists.
         Must not be called concurrently with erasure operations. */
-    const_pointer internal_fast_find( const Key& key ) const {
-        hashcode_type h = my_hash_compare.hash( key );
-        hashcode_type m = this->my_mask.load(std::memory_order_acquire);
-        node *n;
-    restart:
-        __TBB_ASSERT((m&(m+1))==0, "data structure is invalid");
-        bucket *b = this->get_bucket( h & m );
-        // TODO: actually, notification is unnecessary here, just hiding double-check
-        if (rehash_required(b->node_list.load(std::memory_order_acquire)))
-        {
-            typename bucket::scoped_type lock;
-            if( lock.try_acquire( b->mutex, /*write=*/true ) ) {
-                if (rehash_required(b->node_list.load(std::memory_order_relaxed)))
-                    const_cast<concurrent_hash_map*>(this)->rehash_bucket( b, h & m ); //recursive rehashing
-            }
-            else lock.acquire( b->mutex, /*write=*/false );
-            __TBB_ASSERT(!rehash_required(b->node_list.load(std::memory_order_relaxed)), nullptr);
-        }
-        n = search_bucket( key, b );
-        if( n )
-            return n->storage();
-        else if( this->check_mask_race( h, m ) )
-            goto restart;
-        return nullptr;
-    }
-};
+                const_pointer internal_fast_find(const Key& key) const {
+                    hashcode_type h = my_hash_compare.hash(key);
+                    hashcode_type m = this->my_mask.load(std::memory_order_acquire);
+                    node* n;
+                restart:
+                    __TBB_ASSERT((m & (m + 1)) == 0, "data structure is invalid");
+                    bucket* b = this->get_bucket(h & m);
+                    // TODO: actually, notification is unnecessary here, just hiding double-check
+                    if (rehash_required(b->node_list.load(std::memory_order_acquire))) {
+                        typename bucket::scoped_type lock;
+                        if (lock.try_acquire(b->mutex, /*write=*/true)) {
+                            if (rehash_required(b->node_list.load(std::memory_order_relaxed)))
+                                const_cast<concurrent_hash_map*>(this)->rehash_bucket(
+                                        b, h & m);//recursive rehashing
+                        } else
+                            lock.acquire(b->mutex, /*write=*/false);
+                        __TBB_ASSERT(!rehash_required(b->node_list.load(std::memory_order_relaxed)), nullptr);
+                    }
+                    n = search_bucket(key, b);
+                    if (n) return n->storage();
+                    else if (this->check_mask_race(h, m))
+                        goto restart;
+                    return nullptr;
+                }
+            };
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
-template <typename It,
-          typename HashCompare = d1::tbb_hash_compare<iterator_key_t<It>>,
-          typename Alloc = tbb_allocator<iterator_alloc_pair_t<It>>,
-          typename = std::enable_if_t<is_input_iterator_v<It>>,
-          typename = std::enable_if_t<is_allocator_v<Alloc>>,
-          typename = std::enable_if_t<!is_allocator_v<HashCompare>>>
-concurrent_hash_map( It, It, HashCompare = HashCompare(), Alloc = Alloc() )
--> concurrent_hash_map<iterator_key_t<It>, iterator_mapped_t<It>, HashCompare, Alloc>;
-
-template <typename It, typename Alloc,
-          typename = std::enable_if_t<is_input_iterator_v<It>>,
-          typename = std::enable_if_t<is_allocator_v<Alloc>>>
-concurrent_hash_map( It, It, Alloc )
--> concurrent_hash_map<iterator_key_t<It>, iterator_mapped_t<It>, d1::tbb_hash_compare<iterator_key_t<It>>, Alloc>;
-
-template <typename Key, typename T,
-          typename HashCompare = d1::tbb_hash_compare<std::remove_const_t<Key>>,
-          typename Alloc = tbb_allocator<std::pair<const Key, T>>,
-          typename = std::enable_if_t<is_allocator_v<Alloc>>,
-          typename = std::enable_if_t<!is_allocator_v<HashCompare>>>
-concurrent_hash_map( std::initializer_list<std::pair<Key, T>>, HashCompare = HashCompare(), Alloc = Alloc() )
--> concurrent_hash_map<std::remove_const_t<Key>, T, HashCompare, Alloc>;
-
-template <typename Key, typename T, typename Alloc,
-          typename = std::enable_if_t<is_allocator_v<Alloc>>>
-concurrent_hash_map( std::initializer_list<std::pair<Key, T>>, Alloc )
--> concurrent_hash_map<std::remove_const_t<Key>, T, d1::tbb_hash_compare<std::remove_const_t<Key>>, Alloc>;
+            template <typename It, typename HashCompare = d1::tbb_hash_compare<iterator_key_t<It>>,
+                      typename Alloc = tbb_allocator<iterator_alloc_pair_t<It>>,
+                      typename = std::enable_if_t<is_input_iterator_v<It>>,
+                      typename = std::enable_if_t<is_allocator_v<Alloc>>,
+                      typename = std::enable_if_t<!is_allocator_v<HashCompare>>>
+            concurrent_hash_map(It, It, HashCompare = HashCompare(), Alloc = Alloc())
+                    -> concurrent_hash_map<iterator_key_t<It>, iterator_mapped_t<It>, HashCompare, Alloc>;
+
+            template <typename It, typename Alloc, typename = std::enable_if_t<is_input_iterator_v<It>>,
+                      typename = std::enable_if_t<is_allocator_v<Alloc>>>
+            concurrent_hash_map(It, It, Alloc)
+                    -> concurrent_hash_map<iterator_key_t<It>, iterator_mapped_t<It>,
+                                           d1::tbb_hash_compare<iterator_key_t<It>>, Alloc>;
+
+            template <typename Key, typename T,
+                      typename HashCompare = d1::tbb_hash_compare<std::remove_const_t<Key>>,
+                      typename Alloc = tbb_allocator<std::pair<const Key, T>>,
+                      typename = std::enable_if_t<is_allocator_v<Alloc>>,
+                      typename = std::enable_if_t<!is_allocator_v<HashCompare>>>
+            concurrent_hash_map(std::initializer_list<std::pair<Key, T>>, HashCompare = HashCompare(),
+                                Alloc = Alloc())
+                    -> concurrent_hash_map<std::remove_const_t<Key>, T, HashCompare, Alloc>;
+
+            template <typename Key, typename T, typename Alloc,
+                      typename = std::enable_if_t<is_allocator_v<Alloc>>>
+            concurrent_hash_map(std::initializer_list<std::pair<Key, T>>, Alloc)
+                    -> concurrent_hash_map<std::remove_const_t<Key>, T,
+                                           d1::tbb_hash_compare<std::remove_const_t<Key>>, Alloc>;
 
 #endif /* __TBB_CPP17_DEDUCTION_GUIDES_PRESENT */
 
-template <typename Key, typename T, typename HashCompare, typename A1, typename A2>
-inline bool operator==(const concurrent_hash_map<Key, T, HashCompare, A1> &a, const concurrent_hash_map<Key, T, HashCompare, A2> &b) {
-    if(a.size() != b.size()) return false;
-    typename concurrent_hash_map<Key, T, HashCompare, A1>::const_iterator i(a.begin()), i_end(a.end());
-    typename concurrent_hash_map<Key, T, HashCompare, A2>::const_iterator j, j_end(b.end());
-    for(; i != i_end; ++i) {
-        j = b.equal_range(i->first).first;
-        if( j == j_end || !(i->second == j->second) ) return false;
-    }
-    return true;
-}
+            template <typename Key, typename T, typename HashCompare, typename A1, typename A2>
+            inline bool operator==(const concurrent_hash_map<Key, T, HashCompare, A1>& a,
+                                   const concurrent_hash_map<Key, T, HashCompare, A2>& b) {
+                if (a.size() != b.size()) return false;
+                typename concurrent_hash_map<Key, T, HashCompare, A1>::const_iterator i(a.begin()),
+                        i_end(a.end());
+                typename concurrent_hash_map<Key, T, HashCompare, A2>::const_iterator j, j_end(b.end());
+                for (; i != i_end; ++i) {
+                    j = b.equal_range(i->first).first;
+                    if (j == j_end || !(i->second == j->second)) return false;
+                }
+                return true;
+            }
 
 #if !__TBB_CPP20_COMPARISONS_PRESENT
-template <typename Key, typename T, typename HashCompare, typename A1, typename A2>
-inline bool operator!=(const concurrent_hash_map<Key, T, HashCompare, A1> &a, const concurrent_hash_map<Key, T, HashCompare, A2> &b)
-{    return !(a == b); }
-#endif // !__TBB_CPP20_COMPARISONS_PRESENT
+            template <typename Key, typename T, typename HashCompare, typename A1, typename A2>
+            inline bool operator!=(const concurrent_hash_map<Key, T, HashCompare, A1>& a,
+                                   const concurrent_hash_map<Key, T, HashCompare, A2>& b) {
+                return !(a == b);
+            }
+#endif// !__TBB_CPP20_COMPARISONS_PRESENT
 
-template <typename Key, typename T, typename HashCompare, typename A>
-inline void swap(concurrent_hash_map<Key, T, HashCompare, A> &a, concurrent_hash_map<Key, T, HashCompare, A> &b)
-{    a.swap( b ); }
+            template <typename Key, typename T, typename HashCompare, typename A>
+            inline void swap(concurrent_hash_map<Key, T, HashCompare, A>& a,
+                             concurrent_hash_map<Key, T, HashCompare, A>& b) {
+                a.swap(b);
+            }
 
-} // namespace d2
-} // namespace detail
+        }// namespace d2
+    }// namespace detail
 
-inline namespace v1 {
-    using detail::split;
-    using detail::d2::concurrent_hash_map;
-    using detail::d1::tbb_hash_compare;
-} // namespace v1
+    inline namespace v1 {
+        using detail::split;
+        using detail::d1::tbb_hash_compare;
+        using detail::d2::concurrent_hash_map;
+    }// namespace v1
 
-} // namespace tbb
+}// namespace tbb
 
 #endif /* __TBB_concurrent_hash_map_H */
diff --git a/external/tbb/include/oneapi/tbb/detail/_flow_graph_impl.h b/external/tbb/include/oneapi/tbb/detail/_flow_graph_impl.h
index a5408adf..56592b92 100644
--- a/external/tbb/include/oneapi/tbb/detail/_flow_graph_impl.h
+++ b/external/tbb/include/oneapi/tbb/detail/_flow_graph_impl.h
@@ -18,556 +18,545 @@
 #define __TBB_flow_graph_impl_H
 
 // #include "../config.h"
-#include "_task.h"
-#include "../task_group.h"
-#include "../task_arena.h"
 #include "../flow_graph_abstractions.h"
+#include "../task_arena.h"
+#include "../task_group.h"
+#include "_task.h"
 
 #include "../concurrent_priority_queue.h"
 
 #include <list>
 
 namespace tbb {
-namespace detail {
-
-namespace d2 {
-
-class graph_task;
-static graph_task* const SUCCESSFULLY_ENQUEUED = (graph_task*)-1;
-typedef unsigned int node_priority_t;
-static const node_priority_t no_priority = node_priority_t(0);
-
-class graph;
-class graph_node;
-
-template <typename GraphContainerType, typename GraphNodeType>
-class graph_iterator {
-    friend class graph;
-    friend class graph_node;
-public:
-    typedef size_t size_type;
-    typedef GraphNodeType value_type;
-    typedef GraphNodeType* pointer;
-    typedef GraphNodeType& reference;
-    typedef const GraphNodeType& const_reference;
-    typedef std::forward_iterator_tag iterator_category;
-
-    //! Copy constructor
-    graph_iterator(const graph_iterator& other) :
-        my_graph(other.my_graph), current_node(other.current_node)
-    {}
-
-    //! Assignment
-    graph_iterator& operator=(const graph_iterator& other) {
-        if (this != &other) {
-            my_graph = other.my_graph;
-            current_node = other.current_node;
-        }
-        return *this;
-    }
-
-    //! Dereference
-    reference operator*() const;
-
-    //! Dereference
-    pointer operator->() const;
-
-    //! Equality
-    bool operator==(const graph_iterator& other) const {
-        return ((my_graph == other.my_graph) && (current_node == other.current_node));
-    }
+    namespace detail {
+
+        namespace d2 {
+
+            class graph_task;
+            inline graph_task* const SUCCESSFULLY_ENQUEUED = (graph_task*) -1;
+            typedef unsigned int node_priority_t;
+            inline const node_priority_t no_priority = node_priority_t(0);
+
+            class graph;
+            class graph_node;
+
+            template <typename GraphContainerType, typename GraphNodeType>
+            class graph_iterator {
+                friend class graph;
+                friend class graph_node;
+
+            public:
+                typedef size_t size_type;
+                typedef GraphNodeType value_type;
+                typedef GraphNodeType* pointer;
+                typedef GraphNodeType& reference;
+                typedef const GraphNodeType& const_reference;
+                typedef std::forward_iterator_tag iterator_category;
+
+                //! Copy constructor
+                graph_iterator(const graph_iterator& other)
+                    : my_graph(other.my_graph), current_node(other.current_node) {}
+
+                //! Assignment
+                graph_iterator& operator=(const graph_iterator& other) {
+                    if (this != &other) {
+                        my_graph = other.my_graph;
+                        current_node = other.current_node;
+                    }
+                    return *this;
+                }
+
+                //! Dereference
+                reference operator*() const;
+
+                //! Dereference
+                pointer operator->() const;
+
+                //! Equality
+                bool operator==(const graph_iterator& other) const {
+                    return ((my_graph == other.my_graph) && (current_node == other.current_node));
+                }
 
 #if !__TBB_CPP20_COMPARISONS_PRESENT
-    //! Inequality
-    bool operator!=(const graph_iterator& other) const { return !(operator==(other)); }
+                //! Inequality
+                bool operator!=(const graph_iterator& other) const { return !(operator==(other)); }
 #endif
 
-    //! Pre-increment
-    graph_iterator& operator++() {
-        internal_forward();
-        return *this;
-    }
-
-    //! Post-increment
-    graph_iterator operator++(int) {
-        graph_iterator result = *this;
-        operator++();
-        return result;
-    }
-
-private:
-    // the graph over which we are iterating
-    GraphContainerType *my_graph;
-    // pointer into my_graph's my_nodes list
-    pointer current_node;
-
-    //! Private initializing constructor for begin() and end() iterators
-    graph_iterator(GraphContainerType *g, bool begin);
-    void internal_forward();
-};  // class graph_iterator
-
-// flags to modify the behavior of the graph reset().  Can be combined.
-enum reset_flags {
-    rf_reset_protocol = 0,
-    rf_reset_bodies = 1 << 0,  // delete the current node body, reset to a copy of the initial node body.
-    rf_clear_edges = 1 << 1   // delete edges
-};
-
-void activate_graph(graph& g);
-void deactivate_graph(graph& g);
-bool is_graph_active(graph& g);
-graph_task* prioritize_task(graph& g, graph_task& arena_task);
-void spawn_in_graph_arena(graph& g, graph_task& arena_task);
-void enqueue_in_graph_arena(graph &g, graph_task& arena_task);
-
-class graph;
-
-//! Base class for tasks generated by graph nodes.
-class graph_task : public d1::task {
-public:
-    graph_task(graph& g, d1::small_object_allocator& allocator,
-               node_priority_t node_priority = no_priority);
-
-    graph& my_graph; // graph instance the task belongs to
-    // TODO revamp: rename to my_priority
-    node_priority_t priority;
-    template <typename DerivedType>
-    void destruct_and_deallocate(const d1::execution_data& ed);
-protected:
-    template <typename DerivedType>
-    void finalize(const d1::execution_data& ed);
-private:
-    // To organize task_list
-    graph_task* my_next{ nullptr };
-    d1::small_object_allocator my_allocator;
-    d1::wait_tree_vertex_interface* my_reference_vertex;
-    // TODO revamp: elaborate internal interfaces to avoid friends declarations
-    friend class graph_task_list;
-    friend graph_task* prioritize_task(graph& g, graph_task& gt);
-};
-
-inline bool is_this_thread_in_graph_arena(graph& g);
+                //! Pre-increment
+                graph_iterator& operator++() {
+                    internal_forward();
+                    return *this;
+                }
+
+                //! Post-increment
+                graph_iterator operator++(int) {
+                    graph_iterator result = *this;
+                    operator++();
+                    return result;
+                }
+
+            private:
+                // the graph over which we are iterating
+                GraphContainerType* my_graph;
+                // pointer into my_graph's my_nodes list
+                pointer current_node;
+
+                //! Private initializing constructor for begin() and end() iterators
+                graph_iterator(GraphContainerType* g, bool begin);
+                void internal_forward();
+            };// class graph_iterator
+
+            // flags to modify the behavior of the graph reset().  Can be combined.
+            enum reset_flags {
+                rf_reset_protocol = 0,
+                rf_reset_bodies
+                = 1 << 0,// delete the current node body, reset to a copy of the initial node body.
+                rf_clear_edges = 1 << 1// delete edges
+            };
+
+            void activate_graph(graph& g);
+            void deactivate_graph(graph& g);
+            bool is_graph_active(graph& g);
+            graph_task* prioritize_task(graph& g, graph_task& arena_task);
+            void spawn_in_graph_arena(graph& g, graph_task& arena_task);
+            void enqueue_in_graph_arena(graph& g, graph_task& arena_task);
+
+            class graph;
+
+            //! Base class for tasks generated by graph nodes.
+            class graph_task : public d1::task {
+            public:
+                graph_task(graph& g, d1::small_object_allocator& allocator,
+                           node_priority_t node_priority = no_priority);
+
+                graph& my_graph;// graph instance the task belongs to
+                // TODO revamp: rename to my_priority
+                node_priority_t priority;
+                template <typename DerivedType>
+                void destruct_and_deallocate(const d1::execution_data& ed);
+
+            protected:
+                template <typename DerivedType>
+                void finalize(const d1::execution_data& ed);
+
+            private:
+                // To organize task_list
+                graph_task* my_next {nullptr};
+                d1::small_object_allocator my_allocator;
+                d1::wait_tree_vertex_interface* my_reference_vertex;
+                // TODO revamp: elaborate internal interfaces to avoid friends declarations
+                friend class graph_task_list;
+                friend graph_task* prioritize_task(graph& g, graph_task& gt);
+            };
+
+            inline bool is_this_thread_in_graph_arena(graph& g);
 
 #if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
-class trackable_messages_graph_task : public graph_task {
-public:
-    trackable_messages_graph_task(graph& g, d1::small_object_allocator& allocator,
-                                  node_priority_t node_priority,
-                                  const std::forward_list<d1::wait_context_vertex*>& msg_waiters)
-        : graph_task(g, allocator, node_priority)
-        , my_msg_wait_context_vertices(msg_waiters)
-    {
-        auto last_iterator = my_msg_reference_vertices.cbefore_begin();
-
-        for (auto& msg_waiter : my_msg_wait_context_vertices) {
-            // If the task is created by the thread outside the graph arena, the lifetime of the thread reference vertex
-            // may be shorter that the lifetime of the task, so thread reference vertex approach cannot be used
-            // and the task should be associated with the msg wait context itself
-            d1::wait_tree_vertex_interface* ref_vertex = is_this_thread_in_graph_arena(g) ?
-                                                         r1::get_thread_reference_vertex(msg_waiter) :
-                                                         msg_waiter;
-            last_iterator = my_msg_reference_vertices.emplace_after(last_iterator,
-                                                                    ref_vertex);
-            ref_vertex->reserve(1);
-        }
-    }
-
-    trackable_messages_graph_task(graph& g, d1::small_object_allocator& allocator,
-                                  node_priority_t node_priority,
-                                  std::forward_list<d1::wait_context_vertex*>&& msg_waiters)
-        : graph_task(g, allocator, node_priority)
-        , my_msg_wait_context_vertices(std::move(msg_waiters))
-    {
-    }
-
-    const std::forward_list<d1::wait_context_vertex*> get_msg_wait_context_vertices() const {
-        return my_msg_wait_context_vertices;
-    }
-
-protected:
-    template <typename DerivedType>
-    void finalize(const d1::execution_data& ed) {
-        auto wait_context_vertices = std::move(my_msg_wait_context_vertices);
-        auto msg_reference_vertices = std::move(my_msg_reference_vertices);
-        graph_task::finalize<DerivedType>(ed);
-
-        // If there is no thread reference vertices associated with the task
-        // then this task was created by transferring the ownership from other metainfo
-        // instance (e.g. while taking from the buffer)
-        if (msg_reference_vertices.empty()) {
-            for (auto& msg_waiter : wait_context_vertices) {
-                msg_waiter->release(1);
-            }
-        } else {
-            for (auto& msg_waiter : msg_reference_vertices) {
-                msg_waiter->release(1);
-            }
-        }
-    }
-private:
-    // Each task that holds information about single message wait_contexts should hold two lists
-    // The first one is wait_contexts associated with the message itself. They are needed
-    // to be able to broadcast the list of wait_contexts to the node successors while executing the task.
-    // The second list is a list of reference vertices for each wait_context_vertex in the first list
-    // to support the distributed reference counting schema
-    std::forward_list<d1::wait_context_vertex*> my_msg_wait_context_vertices;
-    std::forward_list<d1::wait_tree_vertex_interface*> my_msg_reference_vertices;
-}; // class trackable_messages_graph_task
-#endif // __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
-
-struct graph_task_comparator {
-    bool operator()(const graph_task* left, const graph_task* right) {
-        return left->priority < right->priority;
-    }
-};
-
-typedef tbb::concurrent_priority_queue<graph_task*, graph_task_comparator> graph_task_priority_queue_t;
-
-class priority_task_selector : public d1::task {
-public:
-    priority_task_selector(graph_task_priority_queue_t& priority_queue, d1::small_object_allocator& allocator)
-        : my_priority_queue(priority_queue), my_allocator(allocator), my_task() {}
-    task* execute(d1::execution_data& ed) override {
-        next_task();
-        __TBB_ASSERT(my_task, nullptr);
-        task* t_next = my_task->execute(ed);
-        my_allocator.delete_object(this, ed);
-        return t_next;
-    }
-    task* cancel(d1::execution_data& ed) override {
-        if (!my_task) {
-            next_task();
-        }
-        __TBB_ASSERT(my_task, nullptr);
-        task* t_next = my_task->cancel(ed);
-        my_allocator.delete_object(this, ed);
-        return t_next;
-    }
-private:
-    void next_task() {
-        // TODO revamp: hold functors in priority queue instead of real tasks
-        bool result = my_priority_queue.try_pop(my_task);
-        __TBB_ASSERT_EX(result, "Number of critical tasks for scheduler and tasks"
-            " in graph's priority queue mismatched");
-        __TBB_ASSERT(my_task && my_task != SUCCESSFULLY_ENQUEUED,
-            "Incorrect task submitted to graph priority queue");
-        __TBB_ASSERT(my_task->priority != no_priority,
-            "Tasks from graph's priority queue must have priority");
-    }
-
-    graph_task_priority_queue_t& my_priority_queue;
-    d1::small_object_allocator my_allocator;
-    graph_task* my_task;
-};
-
-template <typename Receiver, typename Body> class run_and_put_task;
-template <typename Body> class run_task;
-
-//********************************************************************************
-// graph tasks helpers
-//********************************************************************************
-
-//! The list of graph tasks
-class graph_task_list : no_copy {
-private:
-    graph_task* my_first;
-    graph_task** my_next_ptr;
-public:
-    //! Construct empty list
-    graph_task_list() : my_first(nullptr), my_next_ptr(&my_first) {}
-
-    //! True if list is empty; false otherwise.
-    bool empty() const { return !my_first; }
-
-    //! Push task onto back of list.
-    void push_back(graph_task& task) {
-        task.my_next = nullptr;
-        *my_next_ptr = &task;
-        my_next_ptr = &task.my_next;
-    }
-
-    //! Pop the front task from the list.
-    graph_task& pop_front() {
-        __TBB_ASSERT(!empty(), "attempt to pop item from empty task_list");
-        graph_task* result = my_first;
-        my_first = result->my_next;
-        if (!my_first) {
-            my_next_ptr = &my_first;
-        }
-        return *result;
-    }
-};
-
-//! The graph class
-/** This class serves as a handle to the graph */
-class graph : no_copy, public graph_proxy {
-    friend class graph_node;
-
-    void prepare_task_arena(bool reinit = false) {
-        if (reinit) {
-            __TBB_ASSERT(my_task_arena, "task arena is nullptr");
-            my_task_arena->terminate();
-            my_task_arena->initialize(task_arena::attach());
-        }
-        else {
-            __TBB_ASSERT(my_task_arena == nullptr, "task arena is not nullptr");
-            my_task_arena = new task_arena(task_arena::attach());
-        }
-        if (!my_task_arena->is_active()) // failed to attach
-            my_task_arena->initialize(); // create a new, default-initialized arena
-        __TBB_ASSERT(my_task_arena->is_active(), "task arena is not active");
-    }
-
-public:
-    //! Constructs a graph with isolated task_group_context
-    graph();
-
-    //! Constructs a graph with use_this_context as context
-    explicit graph(task_group_context& use_this_context);
-
-    //! Destroys the graph.
-    /** Calls wait_for_all, then destroys the root task and context. */
-    ~graph();
-
-    //! Used to register that an external entity may still interact with the graph.
-    /** The graph will not return from wait_for_all until a matching number of release_wait calls is
+            class trackable_messages_graph_task : public graph_task {
+            public:
+                trackable_messages_graph_task(graph& g, d1::small_object_allocator& allocator,
+                                              node_priority_t node_priority,
+                                              const std::forward_list<d1::wait_context_vertex*>& msg_waiters)
+                    : graph_task(g, allocator, node_priority), my_msg_wait_context_vertices(msg_waiters) {
+                    auto last_iterator = my_msg_reference_vertices.cbefore_begin();
+
+                    for (auto& msg_waiter : my_msg_wait_context_vertices) {
+                        // If the task is created by the thread outside the graph arena, the lifetime of the thread reference vertex
+                        // may be shorter that the lifetime of the task, so thread reference vertex approach cannot be used
+                        // and the task should be associated with the msg wait context itself
+                        d1::wait_tree_vertex_interface* ref_vertex
+                                = is_this_thread_in_graph_arena(g)
+                                          ? r1::get_thread_reference_vertex(msg_waiter)
+                                          : msg_waiter;
+                        last_iterator = my_msg_reference_vertices.emplace_after(last_iterator, ref_vertex);
+                        ref_vertex->reserve(1);
+                    }
+                }
+
+                trackable_messages_graph_task(graph& g, d1::small_object_allocator& allocator,
+                                              node_priority_t node_priority,
+                                              std::forward_list<d1::wait_context_vertex*>&& msg_waiters)
+                    : graph_task(g, allocator, node_priority),
+                      my_msg_wait_context_vertices(std::move(msg_waiters)) {}
+
+                const std::forward_list<d1::wait_context_vertex*> get_msg_wait_context_vertices() const {
+                    return my_msg_wait_context_vertices;
+                }
+
+            protected:
+                template <typename DerivedType>
+                void finalize(const d1::execution_data& ed) {
+                    auto wait_context_vertices = std::move(my_msg_wait_context_vertices);
+                    auto msg_reference_vertices = std::move(my_msg_reference_vertices);
+                    graph_task::finalize<DerivedType>(ed);
+
+                    // If there is no thread reference vertices associated with the task
+                    // then this task was created by transferring the ownership from other metainfo
+                    // instance (e.g. while taking from the buffer)
+                    if (msg_reference_vertices.empty()) {
+                        for (auto& msg_waiter : wait_context_vertices) { msg_waiter->release(1); }
+                    } else {
+                        for (auto& msg_waiter : msg_reference_vertices) { msg_waiter->release(1); }
+                    }
+                }
+
+            private:
+                // Each task that holds information about single message wait_contexts should hold two lists
+                // The first one is wait_contexts associated with the message itself. They are needed
+                // to be able to broadcast the list of wait_contexts to the node successors while executing the task.
+                // The second list is a list of reference vertices for each wait_context_vertex in the first list
+                // to support the distributed reference counting schema
+                std::forward_list<d1::wait_context_vertex*> my_msg_wait_context_vertices;
+                std::forward_list<d1::wait_tree_vertex_interface*> my_msg_reference_vertices;
+            };// class trackable_messages_graph_task
+#endif// __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+
+            struct graph_task_comparator {
+                bool operator()(const graph_task* left, const graph_task* right) {
+                    return left->priority < right->priority;
+                }
+            };
+
+            typedef tbb::concurrent_priority_queue<graph_task*, graph_task_comparator>
+                    graph_task_priority_queue_t;
+
+            class priority_task_selector : public d1::task {
+            public:
+                priority_task_selector(graph_task_priority_queue_t& priority_queue,
+                                       d1::small_object_allocator& allocator)
+                    : my_priority_queue(priority_queue), my_allocator(allocator), my_task() {}
+                task* execute(d1::execution_data& ed) override {
+                    next_task();
+                    __TBB_ASSERT(my_task, nullptr);
+                    task* t_next = my_task->execute(ed);
+                    my_allocator.delete_object(this, ed);
+                    return t_next;
+                }
+                task* cancel(d1::execution_data& ed) override {
+                    if (!my_task) { next_task(); }
+                    __TBB_ASSERT(my_task, nullptr);
+                    task* t_next = my_task->cancel(ed);
+                    my_allocator.delete_object(this, ed);
+                    return t_next;
+                }
+
+            private:
+                void next_task() {
+                    // TODO revamp: hold functors in priority queue instead of real tasks
+                    bool result = my_priority_queue.try_pop(my_task);
+                    __TBB_ASSERT_EX(result, "Number of critical tasks for scheduler and tasks"
+                                            " in graph's priority queue mismatched");
+                    __TBB_ASSERT(my_task && my_task != SUCCESSFULLY_ENQUEUED,
+                                 "Incorrect task submitted to graph priority queue");
+                    __TBB_ASSERT(my_task->priority != no_priority,
+                                 "Tasks from graph's priority queue must have priority");
+                }
+
+                graph_task_priority_queue_t& my_priority_queue;
+                d1::small_object_allocator my_allocator;
+                graph_task* my_task;
+            };
+
+            template <typename Receiver, typename Body>
+            class run_and_put_task;
+            template <typename Body>
+            class run_task;
+
+            //********************************************************************************
+            // graph tasks helpers
+            //********************************************************************************
+
+            //! The list of graph tasks
+            class graph_task_list : no_copy {
+            private:
+                graph_task* my_first;
+                graph_task** my_next_ptr;
+
+            public:
+                //! Construct empty list
+                graph_task_list() : my_first(nullptr), my_next_ptr(&my_first) {}
+
+                //! True if list is empty; false otherwise.
+                bool empty() const { return !my_first; }
+
+                //! Push task onto back of list.
+                void push_back(graph_task& task) {
+                    task.my_next = nullptr;
+                    *my_next_ptr = &task;
+                    my_next_ptr = &task.my_next;
+                }
+
+                //! Pop the front task from the list.
+                graph_task& pop_front() {
+                    __TBB_ASSERT(!empty(), "attempt to pop item from empty task_list");
+                    graph_task* result = my_first;
+                    my_first = result->my_next;
+                    if (!my_first) { my_next_ptr = &my_first; }
+                    return *result;
+                }
+            };
+
+            //! The graph class
+            /** This class serves as a handle to the graph */
+            class graph : no_copy, public graph_proxy {
+                friend class graph_node;
+
+                void prepare_task_arena(bool reinit = false) {
+                    if (reinit) {
+                        __TBB_ASSERT(my_task_arena, "task arena is nullptr");
+                        my_task_arena->terminate();
+                        my_task_arena->initialize(task_arena::attach());
+                    } else {
+                        __TBB_ASSERT(my_task_arena == nullptr, "task arena is not nullptr");
+                        my_task_arena = new task_arena(task_arena::attach());
+                    }
+                    if (!my_task_arena->is_active())// failed to attach
+                        my_task_arena->initialize();// create a new, default-initialized arena
+                    __TBB_ASSERT(my_task_arena->is_active(), "task arena is not active");
+                }
+
+            public:
+                //! Constructs a graph with isolated task_group_context
+                graph();
+
+                //! Constructs a graph with use_this_context as context
+                explicit graph(task_group_context& use_this_context);
+
+                //! Destroys the graph.
+                /** Calls wait_for_all, then destroys the root task and context. */
+                ~graph();
+
+                //! Used to register that an external entity may still interact with the graph.
+                /** The graph will not return from wait_for_all until a matching number of release_wait calls is
     made. */
-    void reserve_wait() override;
+                void reserve_wait() override;
 
-    //! Deregisters an external entity that may have interacted with the graph.
-    /** The graph will not return from wait_for_all until all the number of reserve_wait calls
+                //! Deregisters an external entity that may have interacted with the graph.
+                /** The graph will not return from wait_for_all until all the number of reserve_wait calls
     matches the number of release_wait calls. */
-    void release_wait() override;
-
-    //! Wait until graph is idle and the number of release_wait calls equals to the number of
-    //! reserve_wait calls.
-    /** The waiting thread will go off and steal work while it is blocked in the wait_for_all. */
-    void wait_for_all() {
-        cancelled = false;
-        caught_exception = false;
-        try_call([this] {
-            my_task_arena->execute([this] {
-                d1::wait(my_wait_context_vertex.get_context(), *my_context);
-            });
-            cancelled = my_context->is_group_execution_cancelled();
-        }).on_exception([this] {
-            my_context->reset();
-            caught_exception = true;
-            cancelled = true;
-        });
-        // TODO: the "if" condition below is just a work-around to support the concurrent wait
-        // mode. The cancellation and exception mechanisms are still broken in this mode.
-        // Consider using task group not to re-implement the same functionality.
-        if (!(my_context->traits() & task_group_context::concurrent_wait)) {
-            my_context->reset();  // consistent with behavior in catch()
-        }
-    }
-
-    // TODO revamp: consider adding getter for task_group_context.
-
-    // ITERATORS
-    template<typename C, typename N>
-    friend class graph_iterator;
-
-    // Graph iterator typedefs
-    typedef graph_iterator<graph, graph_node> iterator;
-    typedef graph_iterator<const graph, const graph_node> const_iterator;
-
-    // Graph iterator constructors
-    //! start iterator
-    iterator begin();
-    //! end iterator
-    iterator end();
-    //! start const iterator
-    const_iterator begin() const;
-    //! end const iterator
-    const_iterator end() const;
-    //! start const iterator
-    const_iterator cbegin() const;
-    //! end const iterator
-    const_iterator cend() const;
-
-    // thread-unsafe state reset.
-    void reset(reset_flags f = rf_reset_protocol);
-
-    //! cancels execution of the associated task_group_context
-    void cancel();
-
-    //! return status of graph execution
-    bool is_cancelled() { return cancelled; }
-    bool exception_thrown() { return caught_exception; }
-
-private:
-    d1::wait_context_vertex my_wait_context_vertex;
-    task_group_context *my_context;
-    bool own_context;
-    bool cancelled;
-    bool caught_exception;
-    bool my_is_active;
-
-    graph_node *my_nodes, *my_nodes_last;
-
-    tbb::spin_mutex nodelist_mutex;
-    void register_node(graph_node *n);
-    void remove_node(graph_node *n);
-
-    task_arena* my_task_arena;
-
-    graph_task_priority_queue_t my_priority_queue;
-
-    d1::wait_context_vertex& get_wait_context_vertex() { return my_wait_context_vertex; }
-
-    friend void activate_graph(graph& g);
-    friend void deactivate_graph(graph& g);
-    friend bool is_graph_active(graph& g);
-    friend bool is_this_thread_in_graph_arena(graph& g);
-    friend graph_task* prioritize_task(graph& g, graph_task& arena_task);
-    friend void spawn_in_graph_arena(graph& g, graph_task& arena_task);
-    friend void enqueue_in_graph_arena(graph &g, graph_task& arena_task);
-
-    friend class d1::task_arena_base;
-    friend class graph_task;
-
-    template <typename T>
-    friend class receiver;
-};  // class graph
-
-template<typename DerivedType>
-inline void graph_task::destruct_and_deallocate(const d1::execution_data& ed) {
-    auto allocator = my_allocator;
-    // TODO: investigate if direct call of derived destructor gives any benefits.
-    this->~graph_task();
-    allocator.deallocate(static_cast<DerivedType*>(this), ed);
-}
-
-template<typename DerivedType>
-inline void graph_task::finalize(const d1::execution_data& ed) {
-    d1::wait_tree_vertex_interface* reference_vertex = my_reference_vertex;
-    destruct_and_deallocate<DerivedType>(ed);
-    reference_vertex->release();
-}
-
-inline graph_task::graph_task(graph& g, d1::small_object_allocator& allocator,
-                              node_priority_t node_priority)
-    : my_graph(g)
-    , priority(node_priority)
-    , my_allocator(allocator)
-{
-    // If the task is created by the thread outside the graph arena, the lifetime of the thread reference vertex
-    // may be shorter that the lifetime of the task, so thread reference vertex approach cannot be used
-    // and the task should be associated with the graph wait context itself
-    // TODO: consider how reference counting can be improved for such a use case. Most common example is the async_node
-    d1::wait_context_vertex* graph_wait_context_vertex = &my_graph.get_wait_context_vertex();
-    my_reference_vertex = is_this_thread_in_graph_arena(g) ? r1::get_thread_reference_vertex(graph_wait_context_vertex)
-                                                           : graph_wait_context_vertex;
-    __TBB_ASSERT(my_reference_vertex, nullptr);
-    my_reference_vertex->reserve();
-}
-
-//********************************************************************************
-// end of graph tasks helpers
-//********************************************************************************
+                void release_wait() override;
+
+                //! Wait until graph is idle and the number of release_wait calls equals to the number of
+                //! reserve_wait calls.
+                /** The waiting thread will go off and steal work while it is blocked in the wait_for_all. */
+                void wait_for_all() {
+                    cancelled = false;
+                    caught_exception = false;
+                    try_call([this] {
+                        my_task_arena->execute(
+                                [this] { d1::wait(my_wait_context_vertex.get_context(), *my_context); });
+                        cancelled = my_context->is_group_execution_cancelled();
+                    }).on_exception([this] {
+                        my_context->reset();
+                        caught_exception = true;
+                        cancelled = true;
+                    });
+                    // TODO: the "if" condition below is just a work-around to support the concurrent wait
+                    // mode. The cancellation and exception mechanisms are still broken in this mode.
+                    // Consider using task group not to re-implement the same functionality.
+                    if (!(my_context->traits() & task_group_context::concurrent_wait)) {
+                        my_context->reset();// consistent with behavior in catch()
+                    }
+                }
+
+                // TODO revamp: consider adding getter for task_group_context.
+
+                // ITERATORS
+                template <typename C, typename N>
+                friend class graph_iterator;
+
+                // Graph iterator typedefs
+                typedef graph_iterator<graph, graph_node> iterator;
+                typedef graph_iterator<const graph, const graph_node> const_iterator;
+
+                // Graph iterator constructors
+                //! start iterator
+                iterator begin();
+                //! end iterator
+                iterator end();
+                //! start const iterator
+                const_iterator begin() const;
+                //! end const iterator
+                const_iterator end() const;
+                //! start const iterator
+                const_iterator cbegin() const;
+                //! end const iterator
+                const_iterator cend() const;
+
+                // thread-unsafe state reset.
+                void reset(reset_flags f = rf_reset_protocol);
+
+                //! cancels execution of the associated task_group_context
+                void cancel();
+
+                //! return status of graph execution
+                bool is_cancelled() { return cancelled; }
+                bool exception_thrown() { return caught_exception; }
+
+            private:
+                d1::wait_context_vertex my_wait_context_vertex;
+                task_group_context* my_context;
+                bool own_context;
+                bool cancelled;
+                bool caught_exception;
+                bool my_is_active;
+
+                graph_node *my_nodes, *my_nodes_last;
+
+                tbb::spin_mutex nodelist_mutex;
+                void register_node(graph_node* n);
+                void remove_node(graph_node* n);
+
+                task_arena* my_task_arena;
+
+                graph_task_priority_queue_t my_priority_queue;
+
+                d1::wait_context_vertex& get_wait_context_vertex() { return my_wait_context_vertex; }
+
+                friend void activate_graph(graph& g);
+                friend void deactivate_graph(graph& g);
+                friend bool is_graph_active(graph& g);
+                friend bool is_this_thread_in_graph_arena(graph& g);
+                friend graph_task* prioritize_task(graph& g, graph_task& arena_task);
+                friend void spawn_in_graph_arena(graph& g, graph_task& arena_task);
+                friend void enqueue_in_graph_arena(graph& g, graph_task& arena_task);
+
+                friend class d1::task_arena_base;
+                friend class graph_task;
+
+                template <typename T>
+                friend class receiver;
+            };// class graph
+
+            template <typename DerivedType>
+            inline void graph_task::destruct_and_deallocate(const d1::execution_data& ed) {
+                auto allocator = my_allocator;
+                // TODO: investigate if direct call of derived destructor gives any benefits.
+                this->~graph_task();
+                allocator.deallocate(static_cast<DerivedType*>(this), ed);
+            }
 
+            template <typename DerivedType>
+            inline void graph_task::finalize(const d1::execution_data& ed) {
+                d1::wait_tree_vertex_interface* reference_vertex = my_reference_vertex;
+                destruct_and_deallocate<DerivedType>(ed);
+                reference_vertex->release();
+            }
+
+            inline graph_task::graph_task(graph& g, d1::small_object_allocator& allocator,
+                                          node_priority_t node_priority)
+                : my_graph(g), priority(node_priority), my_allocator(allocator) {
+                // If the task is created by the thread outside the graph arena, the lifetime of the thread reference vertex
+                // may be shorter that the lifetime of the task, so thread reference vertex approach cannot be used
+                // and the task should be associated with the graph wait context itself
+                // TODO: consider how reference counting can be improved for such a use case. Most common example is the async_node
+                d1::wait_context_vertex* graph_wait_context_vertex = &my_graph.get_wait_context_vertex();
+                my_reference_vertex = is_this_thread_in_graph_arena(g)
+                                              ? r1::get_thread_reference_vertex(graph_wait_context_vertex)
+                                              : graph_wait_context_vertex;
+                __TBB_ASSERT(my_reference_vertex, nullptr);
+                my_reference_vertex->reserve();
+            }
+
+            //********************************************************************************
+            // end of graph tasks helpers
+            //********************************************************************************
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-class get_graph_helper;
+            class get_graph_helper;
 #endif
 
-//! The base of all graph nodes.
-class graph_node : no_copy {
-    friend class graph;
-    template<typename C, typename N>
-    friend class graph_iterator;
+            //! The base of all graph nodes.
+            class graph_node : no_copy {
+                friend class graph;
+                template <typename C, typename N>
+                friend class graph_iterator;
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-    friend class get_graph_helper;
+                friend class get_graph_helper;
 #endif
 
-protected:
-    graph& my_graph;
-    graph& graph_reference() const {
-        // TODO revamp: propagate graph_reference() method to all the reference places.
-        return my_graph;
-    }
-    graph_node* next = nullptr;
-    graph_node* prev = nullptr;
-public:
-    explicit graph_node(graph& g);
-
-    virtual ~graph_node();
-
-protected:
-    // performs the reset on an individual node.
-    virtual void reset_node(reset_flags f = rf_reset_protocol) = 0;
-};  // class graph_node
-
-inline void activate_graph(graph& g) {
-    g.my_is_active = true;
-}
-
-inline void deactivate_graph(graph& g) {
-    g.my_is_active = false;
-}
-
-inline bool is_graph_active(graph& g) {
-    return g.my_is_active;
-}
-
-inline bool is_this_thread_in_graph_arena(graph& g) {
-    __TBB_ASSERT(g.my_task_arena && g.my_task_arena->is_active(), nullptr);
-    return r1::execution_slot(*g.my_task_arena) != d1::slot_id(-1);
-}
-
-inline graph_task* prioritize_task(graph& g, graph_task& gt) {
-    if( no_priority == gt.priority )
-        return &gt;
-
-    //! Non-preemptive priority pattern. The original task is submitted as a work item to the
-    //! priority queue, and a new critical task is created to take and execute a work item with
-    //! the highest known priority. The reference counting responsibility is transferred to
-    //! the new task.
-    // A newly created small_object_allocator should be used to allocate the priority_task_selector
-    // instead of the allocator, associated with gt since gt can be allocated by another thread
-    d1::small_object_allocator allocator;
-    d1::task* critical_task = allocator.new_object<priority_task_selector>(g.my_priority_queue, allocator);
-    __TBB_ASSERT( critical_task, "bad_alloc?" );
-    g.my_priority_queue.push(&gt);
-    using tbb::detail::d1::submit;
-    submit( *critical_task, *g.my_task_arena, *g.my_context, /*as_critical=*/true );
-    return nullptr;
-}
-
-//! Spawns a task inside graph arena
-inline void spawn_in_graph_arena(graph& g, graph_task& arena_task) {
-    if (is_graph_active(g)) {
-        d1::task* gt = prioritize_task(g, arena_task);
-        if( !gt )
-            return;
-
-        __TBB_ASSERT(g.my_task_arena && g.my_task_arena->is_active(), nullptr);
-        submit( *gt, *g.my_task_arena, *g.my_context
+            protected:
+                graph& my_graph;
+                graph& graph_reference() const {
+                    // TODO revamp: propagate graph_reference() method to all the reference places.
+                    return my_graph;
+                }
+                graph_node* next = nullptr;
+                graph_node* prev = nullptr;
+
+            public:
+                explicit graph_node(graph& g);
+
+                virtual ~graph_node();
+
+            protected:
+                // performs the reset on an individual node.
+                virtual void reset_node(reset_flags f = rf_reset_protocol) = 0;
+            };// class graph_node
+
+            inline void activate_graph(graph& g) { g.my_is_active = true; }
+
+            inline void deactivate_graph(graph& g) { g.my_is_active = false; }
+
+            inline bool is_graph_active(graph& g) { return g.my_is_active; }
+
+            inline bool is_this_thread_in_graph_arena(graph& g) {
+                __TBB_ASSERT(g.my_task_arena && g.my_task_arena->is_active(), nullptr);
+                return r1::execution_slot(*g.my_task_arena) != d1::slot_id(-1);
+            }
+
+            inline graph_task* prioritize_task(graph& g, graph_task& gt) {
+                if (no_priority == gt.priority) return &gt;
+
+                //! Non-preemptive priority pattern. The original task is submitted as a work item to the
+                //! priority queue, and a new critical task is created to take and execute a work item with
+                //! the highest known priority. The reference counting responsibility is transferred to
+                //! the new task.
+                // A newly created small_object_allocator should be used to allocate the priority_task_selector
+                // instead of the allocator, associated with gt since gt can be allocated by another thread
+                d1::small_object_allocator allocator;
+                d1::task* critical_task
+                        = allocator.new_object<priority_task_selector>(g.my_priority_queue, allocator);
+                __TBB_ASSERT(critical_task, "bad_alloc?");
+                g.my_priority_queue.push(&gt);
+                using tbb::detail::d1::submit;
+                submit(*critical_task, *g.my_task_arena, *g.my_context, /*as_critical=*/true);
+                return nullptr;
+            }
+
+            //! Spawns a task inside graph arena
+            inline void spawn_in_graph_arena(graph& g, graph_task& arena_task) {
+                if (is_graph_active(g)) {
+                    d1::task* gt = prioritize_task(g, arena_task);
+                    if (!gt) return;
+
+                    __TBB_ASSERT(g.my_task_arena && g.my_task_arena->is_active(), nullptr);
+                    submit(*gt, *g.my_task_arena, *g.my_context
 #if __TBB_PREVIEW_CRITICAL_TASKS
-                , /*as_critical=*/false
+                           ,
+                           /*as_critical=*/false
 #endif
-        );
-    }
-}
+                    );
+                }
+            }
 
-// TODO revamp: unify *_in_graph_arena functions
+            // TODO revamp: unify *_in_graph_arena functions
 
-//! Enqueues a task inside graph arena
-inline void enqueue_in_graph_arena(graph &g, graph_task& arena_task) {
-    if (is_graph_active(g)) {
-        __TBB_ASSERT( g.my_task_arena && g.my_task_arena->is_active(), "Is graph's arena initialized and active?" );
+            //! Enqueues a task inside graph arena
+            inline void enqueue_in_graph_arena(graph& g, graph_task& arena_task) {
+                if (is_graph_active(g)) {
+                    __TBB_ASSERT(g.my_task_arena && g.my_task_arena->is_active(),
+                                 "Is graph's arena initialized and active?");
 
-        // TODO revamp: decide on the approach that does not postpone critical task
-        if( d1::task* gt = prioritize_task(g, arena_task) )
-            submit( *gt, *g.my_task_arena, *g.my_context, /*as_critical=*/false);
-    }
-}
+                    // TODO revamp: decide on the approach that does not postpone critical task
+                    if (d1::task* gt = prioritize_task(g, arena_task))
+                        submit(*gt, *g.my_task_arena, *g.my_context, /*as_critical=*/false);
+                }
+            }
 
-} // namespace d2
-} // namespace detail
-} // namespace tbb
+        }// namespace d2
+    }// namespace detail
+}// namespace tbb
 
-#endif // __TBB_flow_graph_impl_H
+#endif// __TBB_flow_graph_impl_H
diff --git a/external/tbb/include/oneapi/tbb/detail/_flow_graph_trace_impl.h b/external/tbb/include/oneapi/tbb/detail/_flow_graph_trace_impl.h
index 74ebf084..67500c76 100644
--- a/external/tbb/include/oneapi/tbb/detail/_flow_graph_trace_impl.h
+++ b/external/tbb/include/oneapi/tbb/detail/_flow_graph_trace_impl.h
@@ -42,14 +42,14 @@ template< typename T > class receiver;
         #define CODEPTR() nullptr
     #endif /* __TBB_FLOW_TRACE_CODEPTR */
 
-static inline void fgt_alias_port(void *node, void *p, bool visible) {
+inline void fgt_alias_port(void *node, void *p, bool visible) {
     if(visible)
         itt_relation_add( d1::ITT_DOMAIN_FLOW, node, FLOW_NODE, __itt_relation_is_parent_of, p, FLOW_NODE );
     else
         itt_relation_add( d1::ITT_DOMAIN_FLOW, p, FLOW_NODE, __itt_relation_is_child_of, node, FLOW_NODE );
 }
 
-static inline void fgt_composite ( void* codeptr, void *node, void *graph ) {
+inline void fgt_composite ( void* codeptr, void *node, void *graph ) {
     itt_make_task_group( d1::ITT_DOMAIN_FLOW, node, FLOW_NODE, graph, FLOW_GRAPH, FLOW_COMPOSITE_NODE );
     suppress_unused_warning( codeptr );
 #if __TBB_FLOW_TRACE_CODEPTR
@@ -59,12 +59,12 @@ static inline void fgt_composite ( void* codeptr, void *node, void *graph ) {
 #endif
 }
 
-static inline void fgt_internal_alias_input_port( void *node, void *p, string_resource_index name_index ) {
+inline void fgt_internal_alias_input_port( void *node, void *p, string_resource_index name_index ) {
     itt_make_task_group( d1::ITT_DOMAIN_FLOW, p, FLOW_INPUT_PORT, node, FLOW_NODE, name_index );
     itt_relation_add( d1::ITT_DOMAIN_FLOW, node, FLOW_NODE, __itt_relation_is_parent_of, p, FLOW_INPUT_PORT );
 }
 
-static inline void fgt_internal_alias_output_port( void *node, void *p, string_resource_index name_index ) {
+inline void fgt_internal_alias_output_port( void *node, void *p, string_resource_index name_index ) {
     itt_make_task_group( d1::ITT_DOMAIN_FLOW, p, FLOW_OUTPUT_PORT, node, FLOW_NODE, name_index );
     itt_relation_add( d1::ITT_DOMAIN_FLOW, node, FLOW_NODE, __itt_relation_is_parent_of, p, FLOW_OUTPUT_PORT );
 }
@@ -108,11 +108,11 @@ struct fgt_internal_output_alias_helper<PortsTuple, 0> {
     }
 };
 
-static inline void fgt_internal_create_input_port( void *node, void *p, string_resource_index name_index ) {
+inline void fgt_internal_create_input_port( void *node, void *p, string_resource_index name_index ) {
     itt_make_task_group( d1::ITT_DOMAIN_FLOW, p, FLOW_INPUT_PORT, node, FLOW_NODE, name_index );
 }
 
-static inline void fgt_internal_create_output_port( void* codeptr, void *node, void *p, string_resource_index name_index ) {
+inline void fgt_internal_create_output_port( void* codeptr, void *node, void *p, string_resource_index name_index ) {
     itt_make_task_group(d1::ITT_DOMAIN_FLOW, p, FLOW_OUTPUT_PORT, node, FLOW_NODE, name_index);
     suppress_unused_warning( codeptr );
 #if __TBB_FLOW_TRACE_CODEPTR
@@ -177,29 +177,29 @@ void fgt_multiinput_multioutput_node_desc( const NodeType *node, const char *des
 }
 
 template< typename NodeType >
-static inline void fgt_node_desc( const NodeType *node, const char *desc ) {
+inline void fgt_node_desc( const NodeType *node, const char *desc ) {
     void *addr =  (void *)( static_cast< sender< typename NodeType::output_type > * >(const_cast< NodeType *>(node)) );
     itt_metadata_str_add( d1::ITT_DOMAIN_FLOW, addr, FLOW_NODE, FLOW_OBJECT_NAME, desc );
 }
 
-static inline void fgt_graph_desc( const void *g, const char *desc ) {
+inline void fgt_graph_desc( const void *g, const char *desc ) {
     void *addr = const_cast< void *>(g);
     itt_metadata_str_add( d1::ITT_DOMAIN_FLOW, addr, FLOW_GRAPH, FLOW_OBJECT_NAME, desc );
 }
 
-static inline void fgt_body( void *node, void *body ) {
+inline void fgt_body( void *node, void *body ) {
     itt_relation_add( d1::ITT_DOMAIN_FLOW, body, FLOW_BODY, __itt_relation_is_child_of, node, FLOW_NODE );
 }
 
 template< int N, typename PortsTuple >
-static inline void fgt_multioutput_node(void* codeptr, string_resource_index t, void *g, void *input_port, PortsTuple &ports ) {
+inline void fgt_multioutput_node(void* codeptr, string_resource_index t, void *g, void *input_port, PortsTuple &ports ) {
     itt_make_task_group( d1::ITT_DOMAIN_FLOW, input_port, FLOW_NODE, g, FLOW_GRAPH, t );
     fgt_internal_create_input_port( input_port, input_port, FLOW_INPUT_PORT_0 );
     fgt_internal_output_helper<PortsTuple, N>::register_port(codeptr, input_port, ports );
 }
 
 template< int N, typename PortsTuple >
-static inline void fgt_multioutput_node_with_body( void* codeptr, string_resource_index t, void *g, void *input_port, PortsTuple &ports, void *body ) {
+inline void fgt_multioutput_node_with_body( void* codeptr, string_resource_index t, void *g, void *input_port, PortsTuple &ports, void *body ) {
     itt_make_task_group( d1::ITT_DOMAIN_FLOW, input_port, FLOW_NODE, g, FLOW_GRAPH, t );
     fgt_internal_create_input_port( input_port, input_port, FLOW_INPUT_PORT_0 );
     fgt_internal_output_helper<PortsTuple, N>::register_port( codeptr, input_port, ports );
@@ -207,13 +207,13 @@ static inline void fgt_multioutput_node_with_body( void* codeptr, string_resourc
 }
 
 template< int N, typename PortsTuple >
-static inline void fgt_multiinput_node( void* codeptr, string_resource_index t, void *g, PortsTuple &ports, void *output_port) {
+inline void fgt_multiinput_node( void* codeptr, string_resource_index t, void *g, PortsTuple &ports, void *output_port) {
     itt_make_task_group( d1::ITT_DOMAIN_FLOW, output_port, FLOW_NODE, g, FLOW_GRAPH, t );
     fgt_internal_create_output_port( codeptr, output_port, output_port, FLOW_OUTPUT_PORT_0 );
     fgt_internal_input_helper<PortsTuple, N>::register_port( output_port, ports );
 }
 
-static inline void fgt_multiinput_multioutput_node( void* codeptr, string_resource_index t, void *n, void *g ) {
+inline void fgt_multiinput_multioutput_node( void* codeptr, string_resource_index t, void *n, void *g ) {
     itt_make_task_group( d1::ITT_DOMAIN_FLOW, n, FLOW_NODE, g, FLOW_GRAPH, t );
     suppress_unused_warning( codeptr );
 #if __TBB_FLOW_TRACE_CODEPTR
@@ -223,7 +223,7 @@ static inline void fgt_multiinput_multioutput_node( void* codeptr, string_resour
 #endif
 }
 
-static inline void fgt_node( void* codeptr, string_resource_index t, void *g, void *output_port ) {
+inline void fgt_node( void* codeptr, string_resource_index t, void *g, void *output_port ) {
     itt_make_task_group( d1::ITT_DOMAIN_FLOW, output_port, FLOW_NODE, g, FLOW_GRAPH, t );
     fgt_internal_create_output_port( codeptr, output_port, output_port, FLOW_OUTPUT_PORT_0 );
 }
@@ -234,63 +234,63 @@ static void fgt_node_with_body( void* codeptr, string_resource_index t, void *g,
     fgt_body( output_port, body );
 }
 
-static inline void fgt_node( void* codeptr, string_resource_index t, void *g, void *input_port, void *output_port ) {
+inline void fgt_node( void* codeptr, string_resource_index t, void *g, void *input_port, void *output_port ) {
     fgt_node( codeptr, t, g, output_port );
     fgt_internal_create_input_port( output_port, input_port, FLOW_INPUT_PORT_0 );
 }
 
-static inline void  fgt_node_with_body( void* codeptr, string_resource_index t, void *g, void *input_port, void *output_port, void *body ) {
+inline void  fgt_node_with_body( void* codeptr, string_resource_index t, void *g, void *input_port, void *output_port, void *body ) {
     fgt_node_with_body( codeptr, t, g, output_port, body );
     fgt_internal_create_input_port( output_port, input_port, FLOW_INPUT_PORT_0 );
 }
 
 
-static inline void  fgt_node( void* codeptr, string_resource_index t, void *g, void *input_port, void *decrement_port, void *output_port ) {
+inline void  fgt_node( void* codeptr, string_resource_index t, void *g, void *input_port, void *decrement_port, void *output_port ) {
     fgt_node( codeptr, t, g, input_port, output_port );
     fgt_internal_create_input_port( output_port, decrement_port, FLOW_INPUT_PORT_1 );
 }
 
-static inline void fgt_make_edge( void *output_port, void *input_port ) {
+inline void fgt_make_edge( void *output_port, void *input_port ) {
     itt_relation_add( d1::ITT_DOMAIN_FLOW, output_port, FLOW_OUTPUT_PORT, __itt_relation_is_predecessor_to, input_port, FLOW_INPUT_PORT);
 }
 
-static inline void fgt_remove_edge( void *output_port, void *input_port ) {
+inline void fgt_remove_edge( void *output_port, void *input_port ) {
     itt_relation_add( d1::ITT_DOMAIN_FLOW, output_port, FLOW_OUTPUT_PORT, __itt_relation_is_sibling_of, input_port, FLOW_INPUT_PORT);
 }
 
-static inline void fgt_graph( void *g ) {
+inline void fgt_graph( void *g ) {
     itt_make_task_group( d1::ITT_DOMAIN_FLOW, g, FLOW_GRAPH, nullptr, FLOW_NULL, FLOW_GRAPH );
 }
 
-static inline void fgt_begin_body( void *body ) {
+inline void fgt_begin_body( void *body ) {
     itt_task_begin( d1::ITT_DOMAIN_FLOW, body, FLOW_BODY, nullptr, FLOW_NULL, FLOW_BODY );
 }
 
-static inline void fgt_end_body( void * ) {
+inline void fgt_end_body( void * ) {
     itt_task_end( d1::ITT_DOMAIN_FLOW );
 }
 
-static inline void fgt_async_try_put_begin( void *node, void *port ) {
+inline void fgt_async_try_put_begin( void *node, void *port ) {
     itt_task_begin( d1::ITT_DOMAIN_FLOW, port, FLOW_OUTPUT_PORT, node, FLOW_NODE, FLOW_OUTPUT_PORT );
 }
 
-static inline void fgt_async_try_put_end( void *, void * ) {
+inline void fgt_async_try_put_end( void *, void * ) {
     itt_task_end( d1::ITT_DOMAIN_FLOW );
 }
 
-static inline void fgt_async_reserve( void *node, void *graph ) {
+inline void fgt_async_reserve( void *node, void *graph ) {
     itt_region_begin( d1::ITT_DOMAIN_FLOW, node, FLOW_NODE, graph, FLOW_GRAPH, FLOW_NULL );
 }
 
-static inline void fgt_async_commit( void *node, void * /*graph*/) {
+inline void fgt_async_commit( void *node, void * /*graph*/) {
     itt_region_end( d1::ITT_DOMAIN_FLOW, node, FLOW_NODE );
 }
 
-static inline void fgt_reserve_wait( void *graph ) {
+inline void fgt_reserve_wait( void *graph ) {
     itt_region_begin( d1::ITT_DOMAIN_FLOW, graph, FLOW_GRAPH, nullptr, FLOW_NULL, FLOW_NULL );
 }
 
-static inline void fgt_release_wait( void *graph ) {
+inline void fgt_release_wait( void *graph ) {
     itt_region_end( d1::ITT_DOMAIN_FLOW, graph, FLOW_GRAPH );
 }
 
@@ -298,49 +298,49 @@ static inline void fgt_release_wait( void *graph ) {
 
 #define CODEPTR() nullptr
 
-static inline void fgt_alias_port(void * /*node*/, void * /*p*/, bool /*visible*/ ) { }
+inline void fgt_alias_port(void * /*node*/, void * /*p*/, bool /*visible*/ ) { }
 
-static inline void fgt_composite ( void* /*codeptr*/, void * /*node*/, void * /*graph*/ ) { }
+inline void fgt_composite ( void* /*codeptr*/, void * /*node*/, void * /*graph*/ ) { }
 
-static inline void fgt_graph( void * /*g*/ ) { }
+inline void fgt_graph( void * /*g*/ ) { }
 
 template< typename NodeType >
-static inline void fgt_multioutput_node_desc( const NodeType * /*node*/, const char * /*desc*/ ) { }
+inline void fgt_multioutput_node_desc( const NodeType * /*node*/, const char * /*desc*/ ) { }
 
 template< typename NodeType >
-static inline void fgt_node_desc( const NodeType * /*node*/, const char * /*desc*/ ) { }
+inline void fgt_node_desc( const NodeType * /*node*/, const char * /*desc*/ ) { }
 
-static inline void fgt_graph_desc( const void * /*g*/, const char * /*desc*/ ) { }
+inline void fgt_graph_desc( const void * /*g*/, const char * /*desc*/ ) { }
 
 template< int N, typename PortsTuple >
-static inline void fgt_multioutput_node( void* /*codeptr*/, string_resource_index /*t*/, void * /*g*/, void * /*input_port*/, PortsTuple & /*ports*/ ) { }
+inline void fgt_multioutput_node( void* /*codeptr*/, string_resource_index /*t*/, void * /*g*/, void * /*input_port*/, PortsTuple & /*ports*/ ) { }
 
 template< int N, typename PortsTuple >
-static inline void fgt_multioutput_node_with_body( void* /*codeptr*/, string_resource_index /*t*/, void * /*g*/, void * /*input_port*/, PortsTuple & /*ports*/, void * /*body*/ ) { }
+inline void fgt_multioutput_node_with_body( void* /*codeptr*/, string_resource_index /*t*/, void * /*g*/, void * /*input_port*/, PortsTuple & /*ports*/, void * /*body*/ ) { }
 
 template< int N, typename PortsTuple >
-static inline void fgt_multiinput_node( void* /*codeptr*/, string_resource_index /*t*/, void * /*g*/, PortsTuple & /*ports*/, void * /*output_port*/ ) { }
+inline void fgt_multiinput_node( void* /*codeptr*/, string_resource_index /*t*/, void * /*g*/, PortsTuple & /*ports*/, void * /*output_port*/ ) { }
 
-static inline void fgt_multiinput_multioutput_node( void* /*codeptr*/, string_resource_index /*t*/, void * /*node*/, void * /*graph*/ ) { }
+inline void fgt_multiinput_multioutput_node( void* /*codeptr*/, string_resource_index /*t*/, void * /*node*/, void * /*graph*/ ) { }
 
-static inline void fgt_node( void* /*codeptr*/, string_resource_index /*t*/, void * /*g*/, void * /*input_port*/, void * /*output_port*/ ) { }
-static inline void  fgt_node( void* /*codeptr*/, string_resource_index /*t*/, void * /*g*/, void * /*input_port*/, void * /*decrement_port*/, void * /*output_port*/ ) { }
+inline void fgt_node( void* /*codeptr*/, string_resource_index /*t*/, void * /*g*/, void * /*input_port*/, void * /*output_port*/ ) { }
+inline void  fgt_node( void* /*codeptr*/, string_resource_index /*t*/, void * /*g*/, void * /*input_port*/, void * /*decrement_port*/, void * /*output_port*/ ) { }
 
-static inline void fgt_node_with_body( void* /*codeptr*/, string_resource_index /*t*/, void * /*g*/, void * /*output_port*/, void * /*body*/ ) { }
-static inline void fgt_node_with_body( void* /*codeptr*/, string_resource_index /*t*/, void * /*g*/, void * /*input_port*/, void * /*output_port*/, void * /*body*/ ) { }
+inline void fgt_node_with_body( void* /*codeptr*/, string_resource_index /*t*/, void * /*g*/, void * /*output_port*/, void * /*body*/ ) { }
+inline void fgt_node_with_body( void* /*codeptr*/, string_resource_index /*t*/, void * /*g*/, void * /*input_port*/, void * /*output_port*/, void * /*body*/ ) { }
 
-static inline void fgt_make_edge( void * /*output_port*/, void * /*input_port*/ ) { }
-static inline void fgt_remove_edge( void * /*output_port*/, void * /*input_port*/ ) { }
+inline void fgt_make_edge( void * /*output_port*/, void * /*input_port*/ ) { }
+inline void fgt_remove_edge( void * /*output_port*/, void * /*input_port*/ ) { }
 
-static inline void fgt_begin_body( void * /*body*/ ) { }
-static inline void fgt_end_body( void *  /*body*/) { }
+inline void fgt_begin_body( void * /*body*/ ) { }
+inline void fgt_end_body( void *  /*body*/) { }
 
-static inline void fgt_async_try_put_begin( void * /*node*/, void * /*port*/ ) { }
-static inline void fgt_async_try_put_end( void * /*node*/ , void * /*port*/ ) { }
-static inline void fgt_async_reserve( void * /*node*/, void * /*graph*/ ) { }
-static inline void fgt_async_commit( void * /*node*/, void * /*graph*/ ) { }
-static inline void fgt_reserve_wait( void * /*graph*/ ) { }
-static inline void fgt_release_wait( void * /*graph*/ ) { }
+inline void fgt_async_try_put_begin( void * /*node*/, void * /*port*/ ) { }
+inline void fgt_async_try_put_end( void * /*node*/ , void * /*port*/ ) { }
+inline void fgt_async_reserve( void * /*node*/, void * /*graph*/ ) { }
+inline void fgt_async_commit( void * /*node*/, void * /*graph*/ ) { }
+inline void fgt_reserve_wait( void * /*graph*/ ) { }
+inline void fgt_release_wait( void * /*graph*/ ) { }
 
 template< typename NodeType >
 void fgt_multiinput_multioutput_node_desc( const NodeType * /*node*/, const char * /*desc*/ ) { }
diff --git a/external/tbb/include/oneapi/tbb/detail/_machine.h b/external/tbb/include/oneapi/tbb/detail/_machine.h
index ca481380..fadc6cf7 100644
--- a/external/tbb/include/oneapi/tbb/detail/_machine.h
+++ b/external/tbb/include/oneapi/tbb/detail/_machine.h
@@ -62,13 +62,13 @@ inline namespace d0 {
 //--------------------------------------------------------------------------------------------------
 
 #if __TBB_GLIBCXX_THIS_THREAD_YIELD_BROKEN
-static inline void yield() {
+inline void yield() {
     int err = sched_yield();
     __TBB_ASSERT_EX(err == 0, "sched_yield has failed");
 }
 #elif __TBBMALLOC_BUILD && _WIN32
 // Use Windows API for yield in tbbmalloc to avoid dependency on C++ runtime with some implementations.
-static inline void yield() {
+inline void yield() {
     SwitchToThread();
 }
 #else
@@ -79,7 +79,7 @@ using std::this_thread::yield;
 // atomic_fence_seq_cst implementation
 //--------------------------------------------------------------------------------------------------
 
-static inline void atomic_fence_seq_cst() {
+inline void atomic_fence_seq_cst() {
 #if (__TBB_x86_64 || __TBB_x86_32) && defined(__GNUC__) && __GNUC__ < 11
     unsigned char dummy = 0u;
     __asm__ __volatile__ ("lock; notb %0" : "+m" (dummy) :: "memory");
@@ -92,7 +92,7 @@ static inline void atomic_fence_seq_cst() {
 // Pause implementation
 //--------------------------------------------------------------------------------------------------
 
-static inline void machine_pause(int32_t delay) {
+inline void machine_pause(int32_t delay) {
 #if __TBB_x86_64 || __TBB_x86_32
     while (delay-- > 0) { _mm_pause(); }
 #elif __ARM_ARCH_7A__ || __aarch64__
@@ -117,7 +117,7 @@ namespace gnu_builtins {
 #elif defined(_MSC_VER)
 #pragma intrinsic(__TBB_W(_BitScanReverse))
 namespace msvc_intrinsics {
-    static inline uintptr_t bit_scan_reverse(uintptr_t i) {
+    inline uintptr_t bit_scan_reverse(uintptr_t i) {
         unsigned long j;
         __TBB_W(_BitScanReverse)( &j, i );
         return j;
@@ -131,7 +131,7 @@ constexpr std::uintptr_t number_of_bits() {
 }
 
 // logarithm is the index of the most significant non-zero bit
-static inline uintptr_t machine_log2(uintptr_t x) {
+inline uintptr_t machine_log2(uintptr_t x) {
 #if defined(__GNUC__) || defined(__clang__)
     // If P is a power of 2 and x<P, then (P-1)-x == (P-1) XOR x
     return (number_of_bits<decltype(x)>() - 1) ^ gnu_builtins::clz(x);
diff --git a/external/tbb/include/oneapi/tbb/detail/_task.h b/external/tbb/include/oneapi/tbb/detail/_task.h
index 400f9cd4..e7e19ad0 100644
--- a/external/tbb/include/oneapi/tbb/detail/_task.h
+++ b/external/tbb/include/oneapi/tbb/detail/_task.h
@@ -36,8 +36,8 @@ namespace detail {
 
 namespace d1 {
 using slot_id = unsigned short;
-constexpr slot_id no_slot = slot_id(~0);
-constexpr slot_id any_slot = slot_id(~1);
+constexpr inline slot_id no_slot = slot_id(~0);
+constexpr inline slot_id any_slot = slot_id(~1);
 
 class task;
 class wait_context;
diff --git a/external/tbb/include/oneapi/tbb/detail/_utils.h b/external/tbb/include/oneapi/tbb/detail/_utils.h
index 1f480702..959e491c 100644
--- a/external/tbb/include/oneapi/tbb/detail/_utils.h
+++ b/external/tbb/include/oneapi/tbb/detail/_utils.h
@@ -37,8 +37,8 @@ template<typename... T> void suppress_unused_warning(T&&...) {}
 /** It should be used only in situations where having a compile-time upper
   bound is more useful than a run-time exact answer.
   @ingroup memory_allocation */
-constexpr size_t max_nfs_size = 128;
-constexpr std::size_t max_nfs_size_exp = 7;
+constexpr inline size_t max_nfs_size = 128;
+constexpr inline std::size_t max_nfs_size_exp = 7;
 static_assert(1 << max_nfs_size_exp == max_nfs_size, "max_nfs_size_exp must be a log2(max_nfs_size)");
 
 //! Class that implements exponential backoff.
diff --git a/external/tbb/include/oneapi/tbb/flow_graph.h b/external/tbb/include/oneapi/tbb/flow_graph.h
index 3ace331c..056e9f8a 100644
--- a/external/tbb/include/oneapi/tbb/flow_graph.h
+++ b/external/tbb/include/oneapi/tbb/flow_graph.h
@@ -21,39 +21,39 @@
 #include <memory>
 #include <type_traits>
 
+#include "cache_aligned_allocator.h"
+#include "detail/_aggregator.h"
+#include "detail/_allocator_traits.h"
 #include "detail/_config.h"
+#include "detail/_exception.h"
 #include "detail/_namespace_injection.h"
-#include "spin_mutex.h"
-#include "null_mutex.h"
-#include "spin_rw_mutex.h"
-#include "null_rw_mutex.h"
 #include "detail/_pipeline_filters.h"
-#include "detail/_task.h"
 #include "detail/_small_object_pool.h"
-#include "cache_aligned_allocator.h"
-#include "detail/_exception.h"
+#include "detail/_task.h"
 #include "detail/_template_helpers.h"
-#include "detail/_aggregator.h"
-#include "detail/_allocator_traits.h"
 #include "detail/_utils.h"
+#include "null_mutex.h"
+#include "null_rw_mutex.h"
 #include "profiling.h"
+#include "spin_mutex.h"
+#include "spin_rw_mutex.h"
 #include "task_arena.h"
 
-#if TBB_USE_PROFILING_TOOLS && ( __unix__ || __APPLE__ )
-   #if __INTEL_COMPILER
-       // Disabled warning "routine is both inline and noinline"
-       #pragma warning (push)
-       #pragma warning( disable: 2196 )
-   #endif
-   #define __TBB_NOINLINE_SYM __attribute__((noinline))
+#if TBB_USE_PROFILING_TOOLS && (__unix__ || __APPLE__)
+#if __INTEL_COMPILER
+// Disabled warning "routine is both inline and noinline"
+#pragma warning(push)
+#pragma warning(disable : 2196)
+#endif
+#define __TBB_NOINLINE_SYM __attribute__((noinline))
 #else
-   #define __TBB_NOINLINE_SYM
+#define __TBB_NOINLINE_SYM
 #endif
 
-#include <tuple>
-#include <list>
 #include <forward_list>
+#include <list>
 #include <queue>
+#include <tuple>
 #if __TBB_CPP20_CONCEPTS_PRESENT
 #include <concepts>
 #endif
@@ -69,3650 +69,3665 @@
 */
 
 namespace tbb {
-namespace detail {
+    namespace detail {
 
-namespace d2 {
+        namespace d2 {
 
-//! An enumeration the provides the two most common concurrency levels: unlimited and serial
-enum concurrency { unlimited = 0, serial = 1 };
+            //! An enumeration the provides the two most common concurrency levels: unlimited and serial
+            enum concurrency { unlimited = 0, serial = 1 };
 
-//! A generic null type
-struct null_type {};
+            //! A generic null type
+            struct null_type {};
 
-//! An empty class used for messages that mean "I'm done"
-class continue_msg {};
+            //! An empty class used for messages that mean "I'm done"
+            class continue_msg {};
 
-} // namespace d2
+        }// namespace d2
 
 #if __TBB_CPP20_CONCEPTS_PRESENT
-inline namespace d0 {
-
-template <typename ReturnType, typename OutputType>
-concept node_body_return_type = std::same_as<OutputType, tbb::detail::d2::continue_msg> ||
-                                std::convertible_to<OutputType, ReturnType>;
-
-// TODO: consider using std::invocable here
-template <typename Body, typename Output>
-concept continue_node_body = std::copy_constructible<Body> &&
-                             requires( Body& body, const tbb::detail::d2::continue_msg& v ) {
-                                 { body(v) } -> node_body_return_type<Output>;
-                             };
-
-template <typename Body, typename Input, typename Output>
-concept function_node_body = std::copy_constructible<Body> &&
-                             std::invocable<Body&, const Input&> &&
-                             node_body_return_type<std::invoke_result_t<Body&, const Input&>, Output>;
-
-template <typename FunctionObject, typename Input, typename Key>
-concept join_node_function_object = std::copy_constructible<FunctionObject> &&
-                                    std::invocable<FunctionObject&, const Input&> &&
-                                    std::convertible_to<std::invoke_result_t<FunctionObject&, const Input&>, Key>;
-
-template <typename Body, typename Output>
-concept input_node_body = std::copy_constructible<Body> &&
-                          requires( Body& body, tbb::detail::d1::flow_control& fc ) {
-                              { body(fc) } -> adaptive_same_as<Output>;
-                          };
-
-template <typename Body, typename Input, typename OutputPortsType>
-concept multifunction_node_body = std::copy_constructible<Body> &&
-                                  std::invocable<Body&, const Input&, OutputPortsType&>;
-
-template <typename Sequencer, typename Value>
-concept sequencer = std::copy_constructible<Sequencer> &&
-                    std::invocable<Sequencer&, const Value&> &&
-                    std::convertible_to<std::invoke_result_t<Sequencer&, const Value&>, std::size_t>;
-
-template <typename Body, typename Input, typename GatewayType>
-concept async_node_body = std::copy_constructible<Body> &&
-                          std::invocable<Body&, const Input&, GatewayType&>;
-
-} // inline namespace d0
-#endif // __TBB_CPP20_CONCEPTS_PRESENT
-
-namespace d2 {
-
-//! Forward declaration section
-template< typename T > class sender;
-template< typename T > class receiver;
-class continue_receiver;
-
-template< typename T, typename U > class limiter_node;  // needed for resetting decrementer
-
-template<typename T, typename M> class successor_cache;
-template<typename T, typename M> class broadcast_cache;
-template<typename T, typename M> class round_robin_cache;
-template<typename T, typename M> class predecessor_cache;
-template<typename T, typename M> class reservable_predecessor_cache;
+        inline namespace d0 {
+
+            template <typename ReturnType, typename OutputType>
+            concept node_body_return_type = std::same_as<OutputType, tbb::detail::d2::continue_msg>
+                                            || std::convertible_to<OutputType, ReturnType>;
+
+            // TODO: consider using std::invocable here
+            template <typename Body, typename Output>
+            concept continue_node_body = std::copy_constructible<Body>
+                                         && requires(Body& body, const tbb::detail::d2::continue_msg& v) {
+                                                { body(v) } -> node_body_return_type<Output>;
+                                            };
+
+            template <typename Body, typename Input, typename Output>
+            concept function_node_body
+                    = std::copy_constructible<Body> && std::invocable<Body&, const Input&>
+                      && node_body_return_type<std::invoke_result_t<Body&, const Input&>, Output>;
+
+            template <typename FunctionObject, typename Input, typename Key>
+            concept join_node_function_object
+                    = std::copy_constructible<FunctionObject> && std::invocable<FunctionObject&, const Input&>
+                      && std::convertible_to<std::invoke_result_t<FunctionObject&, const Input&>, Key>;
+
+            template <typename Body, typename Output>
+            concept input_node_body = std::copy_constructible<Body>
+                                      && requires(Body& body, tbb::detail::d1::flow_control& fc) {
+                                             { body(fc) } -> adaptive_same_as<Output>;
+                                         };
+
+            template <typename Body, typename Input, typename OutputPortsType>
+            concept multifunction_node_body
+                    = std::copy_constructible<Body> && std::invocable<Body&, const Input&, OutputPortsType&>;
+
+            template <typename Sequencer, typename Value>
+            concept sequencer
+                    = std::copy_constructible<Sequencer> && std::invocable<Sequencer&, const Value&>
+                      && std::convertible_to<std::invoke_result_t<Sequencer&, const Value&>, std::size_t>;
+
+            template <typename Body, typename Input, typename GatewayType>
+            concept async_node_body
+                    = std::copy_constructible<Body> && std::invocable<Body&, const Input&, GatewayType&>;
+
+        }// namespace d0
+#endif// __TBB_CPP20_CONCEPTS_PRESENT
+
+        namespace d2 {
+
+            //! Forward declaration section
+            template <typename T>
+            class sender;
+            template <typename T>
+            class receiver;
+            class continue_receiver;
+
+            template <typename T, typename U>
+            class limiter_node;// needed for resetting decrementer
+
+            template <typename T, typename M>
+            class successor_cache;
+            template <typename T, typename M>
+            class broadcast_cache;
+            template <typename T, typename M>
+            class round_robin_cache;
+            template <typename T, typename M>
+            class predecessor_cache;
+            template <typename T, typename M>
+            class reservable_predecessor_cache;
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-namespace order {
-struct following;
-struct preceding;
-}
-template<typename Order, typename... Args> struct node_set;
+            namespace order {
+                struct following;
+                struct preceding;
+            }// namespace order
+            template <typename Order, typename... Args>
+            struct node_set;
 #endif
 
-
-} // namespace d2
-} // namespace detail
-} // namespace tbb
+        }// namespace d2
+    }// namespace detail
+}// namespace tbb
 
 //! The graph class
 #include "detail/_flow_graph_impl.h"
 
 namespace tbb {
-namespace detail {
-namespace d2 {
-
-static inline std::pair<graph_task*, graph_task*> order_tasks(graph_task* first, graph_task* second) {
-    if (second->priority > first->priority)
-        return std::make_pair(second, first);
-    return std::make_pair(first, second);
-}
-
-// submit task if necessary. Returns the non-enqueued task if there is one.
-static inline graph_task* combine_tasks(graph& g, graph_task* left, graph_task* right) {
-    // if no RHS task, don't change left.
-    if (right == nullptr) return left;
-    // right != nullptr
-    if (left == nullptr) return right;
-    if (left == SUCCESSFULLY_ENQUEUED) return right;
-    // left contains a task
-    if (right != SUCCESSFULLY_ENQUEUED) {
-        // both are valid tasks
-        auto tasks_pair = order_tasks(left, right);
-        spawn_in_graph_arena(g, *tasks_pair.first);
-        return tasks_pair.second;
-    }
-    return left;
-}
+    namespace detail {
+        namespace d2 {
+
+            inline std::pair<graph_task*, graph_task*> order_tasks(graph_task* first, graph_task* second) {
+                if (second->priority > first->priority) return std::make_pair(second, first);
+                return std::make_pair(first, second);
+            }
+
+            // submit task if necessary. Returns the non-enqueued task if there is one.
+            inline graph_task* combine_tasks(graph& g, graph_task* left, graph_task* right) {
+                // if no RHS task, don't change left.
+                if (right == nullptr) return left;
+                // right != nullptr
+                if (left == nullptr) return right;
+                if (left == SUCCESSFULLY_ENQUEUED) return right;
+                // left contains a task
+                if (right != SUCCESSFULLY_ENQUEUED) {
+                    // both are valid tasks
+                    auto tasks_pair = order_tasks(left, right);
+                    spawn_in_graph_arena(g, *tasks_pair.first);
+                    return tasks_pair.second;
+                }
+                return left;
+            }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
-class message_metainfo {
-public:
-    using waiters_type = std::forward_list<d1::wait_context_vertex*>;
+            class message_metainfo {
+            public:
+                using waiters_type = std::forward_list<d1::wait_context_vertex*>;
+
+                message_metainfo() = default;
 
-    message_metainfo() = default;
+                message_metainfo(const waiters_type& waiters) : my_waiters(waiters) {}
+                message_metainfo(waiters_type&& waiters) : my_waiters(std::move(waiters)) {}
 
-    message_metainfo(const waiters_type& waiters) : my_waiters(waiters) {}
-    message_metainfo(waiters_type&& waiters) : my_waiters(std::move(waiters)) {}
+                const waiters_type& waiters() const& { return my_waiters; }
+                waiters_type&& waiters() && { return std::move(my_waiters); }
 
-    const waiters_type& waiters() const & { return my_waiters; }
-    waiters_type&& waiters() && { return std::move(my_waiters); }
+                bool empty() const { return my_waiters.empty(); }
 
-    bool empty() const { return my_waiters.empty(); }
+                void merge(const message_metainfo& other) {
+                    // TODO: should we avoid duplications on merging
+                    my_waiters.insert_after(my_waiters.before_begin(), other.waiters().begin(),
+                                            other.waiters().end());
+                }
 
-    void merge(const message_metainfo& other) {
-        // TODO: should we avoid duplications on merging
-        my_waiters.insert_after(my_waiters.before_begin(),
-                                other.waiters().begin(),
-                                other.waiters().end());
-    }
-private:
-    waiters_type my_waiters;
-}; // class message_metainfo
+            private:
+                waiters_type my_waiters;
+            };// class message_metainfo
 
 #define __TBB_FLOW_GRAPH_METAINFO_ARG(metainfo) , metainfo
 
 #else
 #define __TBB_FLOW_GRAPH_METAINFO_ARG(metainfo)
-#endif // __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+#endif// __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
 
-//! Pure virtual template class that defines a sender of messages of type T
-template< typename T >
-class sender {
-public:
-    virtual ~sender() {}
+            //! Pure virtual template class that defines a sender of messages of type T
+            template <typename T>
+            class sender {
+            public:
+                virtual ~sender() {}
 
-    //! Request an item from the sender
-    virtual bool try_get( T & ) { return false; }
+                //! Request an item from the sender
+                virtual bool try_get(T&) { return false; }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
-    virtual bool try_get( T &, message_metainfo& ) { return false; }
+                virtual bool try_get(T&, message_metainfo&) { return false; }
 #endif
 
-    //! Reserves an item in the sender
-    virtual bool try_reserve( T & ) { return false; }
+                //! Reserves an item in the sender
+                virtual bool try_reserve(T&) { return false; }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
-    virtual bool try_reserve( T &, message_metainfo& ) { return false; }
+                virtual bool try_reserve(T&, message_metainfo&) { return false; }
 #endif
 
-    //! Releases the reserved item
-    virtual bool try_release( ) { return false; }
+                //! Releases the reserved item
+                virtual bool try_release() { return false; }
 
-    //! Consumes the reserved item
-    virtual bool try_consume( ) { return false; }
+                //! Consumes the reserved item
+                virtual bool try_consume() { return false; }
 
-protected:
-    //! The output type of this sender
-    typedef T output_type;
+            protected:
+                //! The output type of this sender
+                typedef T output_type;
 
-    //! The successor type for this node
-    typedef receiver<T> successor_type;
+                //! The successor type for this node
+                typedef receiver<T> successor_type;
 
-    //! Add a new successor to this node
-    virtual bool register_successor( successor_type &r ) = 0;
+                //! Add a new successor to this node
+                virtual bool register_successor(successor_type& r) = 0;
 
-    //! Removes a successor from this node
-    virtual bool remove_successor( successor_type &r ) = 0;
+                //! Removes a successor from this node
+                virtual bool remove_successor(successor_type& r) = 0;
 
-    template<typename C>
-    friend bool register_successor(sender<C>& s, receiver<C>& r);
+                template <typename C>
+                friend bool register_successor(sender<C>& s, receiver<C>& r);
 
-    template<typename C>
-    friend bool remove_successor  (sender<C>& s, receiver<C>& r);
-};  // class sender<T>
+                template <typename C>
+                friend bool remove_successor(sender<C>& s, receiver<C>& r);
+            };// class sender<T>
 
-template<typename C>
-bool register_successor(sender<C>& s, receiver<C>& r) {
-    return s.register_successor(r);
-}
+            template <typename C>
+            bool register_successor(sender<C>& s, receiver<C>& r) {
+                return s.register_successor(r);
+            }
 
-template<typename C>
-bool remove_successor(sender<C>& s, receiver<C>& r) {
-    return s.remove_successor(r);
-}
+            template <typename C>
+            bool remove_successor(sender<C>& s, receiver<C>& r) {
+                return s.remove_successor(r);
+            }
 
-//! Pure virtual template class that defines a receiver of messages of type T
-template< typename T >
-class receiver {
-private:
-    template <typename... TryPutTaskArgs>
-    bool internal_try_put(const T& t, TryPutTaskArgs&&... args) {
-        graph_task* res = try_put_task(t, std::forward<TryPutTaskArgs>(args)...);
-        if (!res) return false;
-        if (res != SUCCESSFULLY_ENQUEUED) spawn_in_graph_arena(graph_reference(), *res);
-        return true;
-    }
+            //! Pure virtual template class that defines a receiver of messages of type T
+            template <typename T>
+            class receiver {
+            private:
+                template <typename... TryPutTaskArgs>
+                bool internal_try_put(const T& t, TryPutTaskArgs&&... args) {
+                    graph_task* res = try_put_task(t, std::forward<TryPutTaskArgs>(args)...);
+                    if (!res) return false;
+                    if (res != SUCCESSFULLY_ENQUEUED) spawn_in_graph_arena(graph_reference(), *res);
+                    return true;
+                }
 
-public:
-    //! Destructor
-    virtual ~receiver() {}
+            public:
+                //! Destructor
+                virtual ~receiver() {}
 
-    //! Put an item to the receiver
-    bool try_put( const T& t ) {
-        return internal_try_put(t);
-    }
+                //! Put an item to the receiver
+                bool try_put(const T& t) { return internal_try_put(t); }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
-    //! Put an item to the receiver and wait for completion
-    bool try_put_and_wait( const T& t ) {
-        // Since try_put_and_wait is a blocking call, it is safe to create wait_context on stack
-        d1::wait_context_vertex msg_wait_vertex{};
-
-        bool res = internal_try_put(t, message_metainfo{message_metainfo::waiters_type{&msg_wait_vertex}});
-        if (res) {
-            __TBB_ASSERT(graph_reference().my_context != nullptr, "No wait_context associated with the Flow Graph");
-            d1::wait(msg_wait_vertex.get_context(), *graph_reference().my_context);
-        }
-        return res;
-    }
-#endif
-
-    //! put item to successor; return task to run the successor if possible.
-protected:
-    //! The input type of this receiver
-    typedef T input_type;
-
-    //! The predecessor type for this node
-    typedef sender<T> predecessor_type;
-
-    template< typename R, typename B > friend class run_and_put_task;
-    template< typename X, typename Y > friend class broadcast_cache;
-    template< typename X, typename Y > friend class round_robin_cache;
-    virtual graph_task *try_put_task(const T& t) = 0;
+                //! Put an item to the receiver and wait for completion
+                bool try_put_and_wait(const T& t) {
+                    // Since try_put_and_wait is a blocking call, it is safe to create wait_context on stack
+                    d1::wait_context_vertex msg_wait_vertex {};
+
+                    bool res = internal_try_put(
+                            t, message_metainfo {message_metainfo::waiters_type {&msg_wait_vertex}});
+                    if (res) {
+                        __TBB_ASSERT(graph_reference().my_context != nullptr,
+                                     "No wait_context associated with the Flow Graph");
+                        d1::wait(msg_wait_vertex.get_context(), *graph_reference().my_context);
+                    }
+                    return res;
+                }
+#endif
+
+                //! put item to successor; return task to run the successor if possible.
+            protected:
+                //! The input type of this receiver
+                typedef T input_type;
+
+                //! The predecessor type for this node
+                typedef sender<T> predecessor_type;
+
+                template <typename R, typename B>
+                friend class run_and_put_task;
+                template <typename X, typename Y>
+                friend class broadcast_cache;
+                template <typename X, typename Y>
+                friend class round_robin_cache;
+                virtual graph_task* try_put_task(const T& t) = 0;
 #if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
-    virtual graph_task *try_put_task(const T& t, const message_metainfo&) = 0;
-#endif
-    virtual graph& graph_reference() const = 0;
-
-    template<typename TT, typename M> friend class successor_cache;
-    virtual bool is_continue_receiver() { return false; }
-
-    // TODO revamp: reconsider the inheritance and move node priority out of receiver
-    virtual node_priority_t priority() const { return no_priority; }
-
-    //! Add a predecessor to the node
-    virtual bool register_predecessor( predecessor_type & ) { return false; }
-
-    //! Remove a predecessor from the node
-    virtual bool remove_predecessor( predecessor_type & ) { return false; }
-
-    template <typename C>
-    friend bool register_predecessor(receiver<C>& r, sender<C>& s);
-    template <typename C>
-    friend bool remove_predecessor  (receiver<C>& r, sender<C>& s);
-}; // class receiver<T>
-
-template <typename C>
-bool register_predecessor(receiver<C>& r, sender<C>& s) {
-    return r.register_predecessor(s);
-}
-
-template <typename C>
-bool remove_predecessor(receiver<C>& r, sender<C>& s) {
-    return r.remove_predecessor(s);
-}
-
-//! Base class for receivers of completion messages
-/** These receivers automatically reset, but cannot be explicitly waited on */
-class continue_receiver : public receiver< continue_msg > {
-protected:
-
-    //! Constructor
-    explicit continue_receiver( int number_of_predecessors, node_priority_t a_priority ) {
-        my_predecessor_count = my_initial_predecessor_count = number_of_predecessors;
-        my_current_count = 0;
-        my_priority = a_priority;
-    }
-
-    //! Copy constructor
-    continue_receiver( const continue_receiver& src ) : receiver<continue_msg>() {
-        my_predecessor_count = my_initial_predecessor_count = src.my_initial_predecessor_count;
-        my_current_count = 0;
-        my_priority = src.my_priority;
-    }
-
-    //! Increments the trigger threshold
-    bool register_predecessor( predecessor_type & ) override {
-        spin_mutex::scoped_lock l(my_mutex);
-        ++my_predecessor_count;
-        return true;
-    }
-
-    //! Decrements the trigger threshold
-    /** Does not check to see if the removal of the predecessor now makes the current count
+                virtual graph_task* try_put_task(const T& t, const message_metainfo&) = 0;
+#endif
+                virtual graph& graph_reference() const = 0;
+
+                template <typename TT, typename M>
+                friend class successor_cache;
+                virtual bool is_continue_receiver() { return false; }
+
+                // TODO revamp: reconsider the inheritance and move node priority out of receiver
+                virtual node_priority_t priority() const { return no_priority; }
+
+                //! Add a predecessor to the node
+                virtual bool register_predecessor(predecessor_type&) { return false; }
+
+                //! Remove a predecessor from the node
+                virtual bool remove_predecessor(predecessor_type&) { return false; }
+
+                template <typename C>
+                friend bool register_predecessor(receiver<C>& r, sender<C>& s);
+                template <typename C>
+                friend bool remove_predecessor(receiver<C>& r, sender<C>& s);
+            };// class receiver<T>
+
+            template <typename C>
+            bool register_predecessor(receiver<C>& r, sender<C>& s) {
+                return r.register_predecessor(s);
+            }
+
+            template <typename C>
+            bool remove_predecessor(receiver<C>& r, sender<C>& s) {
+                return r.remove_predecessor(s);
+            }
+
+            //! Base class for receivers of completion messages
+            /** These receivers automatically reset, but cannot be explicitly waited on */
+            class continue_receiver : public receiver<continue_msg> {
+            protected:
+                //! Constructor
+                explicit continue_receiver(int number_of_predecessors, node_priority_t a_priority) {
+                    my_predecessor_count = my_initial_predecessor_count = number_of_predecessors;
+                    my_current_count = 0;
+                    my_priority = a_priority;
+                }
+
+                //! Copy constructor
+                continue_receiver(const continue_receiver& src) : receiver<continue_msg>() {
+                    my_predecessor_count = my_initial_predecessor_count = src.my_initial_predecessor_count;
+                    my_current_count = 0;
+                    my_priority = src.my_priority;
+                }
+
+                //! Increments the trigger threshold
+                bool register_predecessor(predecessor_type&) override {
+                    spin_mutex::scoped_lock l(my_mutex);
+                    ++my_predecessor_count;
+                    return true;
+                }
+
+                //! Decrements the trigger threshold
+                /** Does not check to see if the removal of the predecessor now makes the current count
         exceed the new threshold.  So removing a predecessor while the graph is active can cause
         unexpected results. */
-    bool remove_predecessor( predecessor_type & ) override {
-        spin_mutex::scoped_lock l(my_mutex);
-        --my_predecessor_count;
-        return true;
-    }
+                bool remove_predecessor(predecessor_type&) override {
+                    spin_mutex::scoped_lock l(my_mutex);
+                    --my_predecessor_count;
+                    return true;
+                }
 
-    //! The input type
-    typedef continue_msg input_type;
+                //! The input type
+                typedef continue_msg input_type;
 
-    //! The predecessor type for this node
-    typedef receiver<input_type>::predecessor_type predecessor_type;
+                //! The predecessor type for this node
+                typedef receiver<input_type>::predecessor_type predecessor_type;
 
-    template< typename R, typename B > friend class run_and_put_task;
-    template<typename X, typename Y> friend class broadcast_cache;
-    template<typename X, typename Y> friend class round_robin_cache;
+                template <typename R, typename B>
+                friend class run_and_put_task;
+                template <typename X, typename Y>
+                friend class broadcast_cache;
+                template <typename X, typename Y>
+                friend class round_robin_cache;
 
-private:
-    // execute body is supposed to be too small to create a task for.
-    graph_task* try_put_task_impl( const input_type& __TBB_FLOW_GRAPH_METAINFO_ARG(const message_metainfo& metainfo) ) {
+            private:
+                // execute body is supposed to be too small to create a task for.
+                graph_task* try_put_task_impl(
+                        const input_type& __TBB_FLOW_GRAPH_METAINFO_ARG(const message_metainfo& metainfo)) {
 #if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
-        message_metainfo predecessor_metainfo;
+                    message_metainfo predecessor_metainfo;
 #endif
-        {
-            spin_mutex::scoped_lock l(my_mutex);
+                    {
+                        spin_mutex::scoped_lock l(my_mutex);
 #if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
-            // Prolong the wait and store the metainfo until receiving signals from all the predecessors
-            for (auto waiter : metainfo.waiters()) {
-                waiter->reserve(1);
-            }
-            my_current_metainfo.merge(metainfo);
+                        // Prolong the wait and store the metainfo until receiving signals from all the predecessors
+                        for (auto waiter : metainfo.waiters()) { waiter->reserve(1); }
+                        my_current_metainfo.merge(metainfo);
 #endif
-            if ( ++my_current_count < my_predecessor_count )
-                return SUCCESSFULLY_ENQUEUED;
-            else {
-                my_current_count = 0;
+                        if (++my_current_count < my_predecessor_count) return SUCCESSFULLY_ENQUEUED;
+                        else {
+                            my_current_count = 0;
 #if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
-                predecessor_metainfo = my_current_metainfo;
-                my_current_metainfo = message_metainfo{};
+                            predecessor_metainfo = my_current_metainfo;
+                            my_current_metainfo = message_metainfo {};
 #endif
-            }
-        }
+                        }
+                    }
 #if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
-        graph_task* res = execute(predecessor_metainfo);
-        for (auto waiter : predecessor_metainfo.waiters()) {
-            waiter->release(1);
-        }
+                    graph_task* res = execute(predecessor_metainfo);
+                    for (auto waiter : predecessor_metainfo.waiters()) { waiter->release(1); }
 #else
-        graph_task* res = execute();
+                    graph_task *res = execute();
 #endif
-        return res? res : SUCCESSFULLY_ENQUEUED;
-    }
+                    return res ? res : SUCCESSFULLY_ENQUEUED;
+                }
 
-protected:
-    graph_task* try_put_task( const input_type& input ) override {
-        return try_put_task_impl(input __TBB_FLOW_GRAPH_METAINFO_ARG(message_metainfo{}));
-    }
+            protected:
+                graph_task* try_put_task(const input_type& input) override {
+                    return try_put_task_impl(input __TBB_FLOW_GRAPH_METAINFO_ARG(message_metainfo {}));
+                }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
-    graph_task* try_put_task( const input_type& input, const message_metainfo& metainfo ) override {
-        return try_put_task_impl(input, metainfo);
-    }
+                graph_task* try_put_task(const input_type& input, const message_metainfo& metainfo) override {
+                    return try_put_task_impl(input, metainfo);
+                }
 #endif
 
-    spin_mutex my_mutex;
-    int my_predecessor_count;
-    int my_current_count;
-    int my_initial_predecessor_count;
+                spin_mutex my_mutex;
+                int my_predecessor_count;
+                int my_current_count;
+                int my_initial_predecessor_count;
 #if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
-    message_metainfo my_current_metainfo;
-#endif
-    node_priority_t my_priority;
-    // the friend declaration in the base class did not eliminate the "protected class"
-    // error in gcc 4.1.2
-    template<typename U, typename V> friend class limiter_node;
-
-    virtual void reset_receiver( reset_flags f ) {
-        my_current_count = 0;
-        if (f & rf_clear_edges) {
-            my_predecessor_count = my_initial_predecessor_count;
-        }
-    }
-
-    //! Does whatever should happen when the threshold is reached
-    /** This should be very fast or else spawn a task.  This is
+                message_metainfo my_current_metainfo;
+#endif
+                node_priority_t my_priority;
+                // the friend declaration in the base class did not eliminate the "protected class"
+                // error in gcc 4.1.2
+                template <typename U, typename V>
+                friend class limiter_node;
+
+                virtual void reset_receiver(reset_flags f) {
+                    my_current_count = 0;
+                    if (f & rf_clear_edges) { my_predecessor_count = my_initial_predecessor_count; }
+                }
+
+                //! Does whatever should happen when the threshold is reached
+                /** This should be very fast or else spawn a task.  This is
         called while the sender is blocked in the try_put(). */
 #if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
-    virtual graph_task* execute(const message_metainfo& metainfo) = 0;
+                virtual graph_task* execute(const message_metainfo& metainfo) = 0;
 #else
-    virtual graph_task* execute() = 0;
+                virtual graph_task *execute() = 0;
 #endif
-    template<typename TT, typename M> friend class successor_cache;
-    bool is_continue_receiver() override { return true; }
+                template <typename TT, typename M>
+                friend class successor_cache;
+                bool is_continue_receiver() override { return true; }
 
-    node_priority_t priority() const override { return my_priority; }
-}; // class continue_receiver
+                node_priority_t priority() const override { return my_priority; }
+            };// class continue_receiver
 
 #if __TBB_PREVIEW_MESSAGE_BASED_KEY_MATCHING
-    template <typename K, typename T>
-    K key_from_message( const T &t ) {
-        return t.key();
-    }
+            template <typename K, typename T>
+            K key_from_message(const T& t) {
+                return t.key();
+            }
 #endif /* __TBB_PREVIEW_MESSAGE_BASED_KEY_MATCHING */
 
-} // d1
-} // detail
-} // tbb
+        }// namespace d2
+    }// namespace detail
+}// namespace tbb
 
 #include "detail/_flow_graph_trace_impl.h"
 #include "detail/_hash_compare.h"
 
 namespace tbb {
-namespace detail {
-namespace d2 {
+    namespace detail {
+        namespace d2 {
 
 #include "detail/_flow_graph_body_impl.h"
 #include "detail/_flow_graph_cache_impl.h"
 #include "detail/_flow_graph_types_impl.h"
 
-using namespace graph_policy_namespace;
-
-template <typename C, typename N>
-graph_iterator<C,N>::graph_iterator(C *g, bool begin) : my_graph(g), current_node(nullptr)
-{
-    if (begin) current_node = my_graph->my_nodes;
-    //else it is an end iterator by default
-}
-
-template <typename C, typename N>
-typename graph_iterator<C,N>::reference graph_iterator<C,N>::operator*() const {
-    __TBB_ASSERT(current_node, "graph_iterator at end");
-    return *operator->();
-}
-
-template <typename C, typename N>
-typename graph_iterator<C,N>::pointer graph_iterator<C,N>::operator->() const {
-    return current_node;
-}
-
-template <typename C, typename N>
-void graph_iterator<C,N>::internal_forward() {
-    if (current_node) current_node = current_node->next;
-}
-
-//! Constructs a graph with isolated task_group_context
-inline graph::graph() : my_wait_context_vertex(0), my_nodes(nullptr), my_nodes_last(nullptr), my_task_arena(nullptr) {
-    prepare_task_arena();
-    own_context = true;
-    cancelled = false;
-    caught_exception = false;
-    my_context = new (r1::cache_aligned_allocate(sizeof(task_group_context))) task_group_context(FLOW_TASKS);
-    fgt_graph(this);
-    my_is_active = true;
-}
-
-inline graph::graph(task_group_context& use_this_context) :
-    my_wait_context_vertex(0), my_context(&use_this_context), my_nodes(nullptr), my_nodes_last(nullptr), my_task_arena(nullptr) {
-    prepare_task_arena();
-    own_context = false;
-    cancelled = false;
-    caught_exception = false;
-    fgt_graph(this);
-    my_is_active = true;
-}
-
-inline graph::~graph() {
-    wait_for_all();
-    if (own_context) {
-        my_context->~task_group_context();
-        r1::cache_aligned_deallocate(my_context);
-    }
-    delete my_task_arena;
-}
-
-inline void graph::reserve_wait() {
-    my_wait_context_vertex.reserve();
-    fgt_reserve_wait(this);
-}
-
-inline void graph::release_wait() {
-    fgt_release_wait(this);
-    my_wait_context_vertex.release();
-}
-
-inline void graph::register_node(graph_node *n) {
-    n->next = nullptr;
-    {
-        spin_mutex::scoped_lock lock(nodelist_mutex);
-        n->prev = my_nodes_last;
-        if (my_nodes_last) my_nodes_last->next = n;
-        my_nodes_last = n;
-        if (!my_nodes) my_nodes = n;
-    }
-}
-
-inline void graph::remove_node(graph_node *n) {
-    {
-        spin_mutex::scoped_lock lock(nodelist_mutex);
-        __TBB_ASSERT(my_nodes && my_nodes_last, "graph::remove_node: Error: no registered nodes");
-        if (n->prev) n->prev->next = n->next;
-        if (n->next) n->next->prev = n->prev;
-        if (my_nodes_last == n) my_nodes_last = n->prev;
-        if (my_nodes == n) my_nodes = n->next;
-    }
-    n->prev = n->next = nullptr;
-}
-
-inline void graph::reset( reset_flags f ) {
-    // reset context
-    deactivate_graph(*this);
-
-    my_context->reset();
-    cancelled = false;
-    caught_exception = false;
-    // reset all the nodes comprising the graph
-    for(iterator ii = begin(); ii != end(); ++ii) {
-        graph_node *my_p = &(*ii);
-        my_p->reset_node(f);
-    }
-    // Reattach the arena. Might be useful to run the graph in a particular task_arena
-    // while not limiting graph lifetime to a single task_arena::execute() call.
-    prepare_task_arena( /*reinit=*/true );
-    activate_graph(*this);
-}
-
-inline void graph::cancel() {
-    my_context->cancel_group_execution();
-}
-
-inline graph::iterator graph::begin() { return iterator(this, true); }
-
-inline graph::iterator graph::end() { return iterator(this, false); }
-
-inline graph::const_iterator graph::begin() const { return const_iterator(this, true); }
-
-inline graph::const_iterator graph::end() const { return const_iterator(this, false); }
-
-inline graph::const_iterator graph::cbegin() const { return const_iterator(this, true); }
-
-inline graph::const_iterator graph::cend() const { return const_iterator(this, false); }
-
-inline graph_node::graph_node(graph& g) : my_graph(g) {
-    my_graph.register_node(this);
-}
-
-inline graph_node::~graph_node() {
-    my_graph.remove_node(this);
-}
+            using namespace graph_policy_namespace;
 
-#include "detail/_flow_graph_node_impl.h"
+            template <typename C, typename N>
+            graph_iterator<C, N>::graph_iterator(C* g, bool begin) : my_graph(g), current_node(nullptr) {
+                if (begin) current_node = my_graph->my_nodes;
+                //else it is an end iterator by default
+            }
 
+            template <typename C, typename N>
+            typename graph_iterator<C, N>::reference graph_iterator<C, N>::operator*() const {
+                __TBB_ASSERT(current_node, "graph_iterator at end");
+                return *operator->();
+            }
 
-//! An executable node that acts as a source, i.e. it has no predecessors
+            template <typename C, typename N>
+            typename graph_iterator<C, N>::pointer graph_iterator<C, N>::operator->() const {
+                return current_node;
+            }
 
-template < typename Output >
-    __TBB_requires(std::copyable<Output>)
-class input_node : public graph_node, public sender< Output > {
-public:
-    //! The type of the output message, which is complete
-    typedef Output output_type;
+            template <typename C, typename N>
+            void graph_iterator<C, N>::internal_forward() {
+                if (current_node) current_node = current_node->next;
+            }
 
-    //! The type of successors of this node
-    typedef typename sender<output_type>::successor_type successor_type;
+            //! Constructs a graph with isolated task_group_context
+            inline graph::graph()
+                : my_wait_context_vertex(0), my_nodes(nullptr), my_nodes_last(nullptr),
+                  my_task_arena(nullptr) {
+                prepare_task_arena();
+                own_context = true;
+                cancelled = false;
+                caught_exception = false;
+                my_context = new (r1::cache_aligned_allocate(sizeof(task_group_context)))
+                        task_group_context(FLOW_TASKS);
+                fgt_graph(this);
+                my_is_active = true;
+            }
 
-    // Input node has no input type
-    typedef null_type input_type;
+            inline graph::graph(task_group_context& use_this_context)
+                : my_wait_context_vertex(0), my_context(&use_this_context), my_nodes(nullptr),
+                  my_nodes_last(nullptr), my_task_arena(nullptr) {
+                prepare_task_arena();
+                own_context = false;
+                cancelled = false;
+                caught_exception = false;
+                fgt_graph(this);
+                my_is_active = true;
+            }
 
-    //! Constructor for a node with a successor
-    template< typename Body >
-        __TBB_requires(input_node_body<Body, Output>)
-     __TBB_NOINLINE_SYM input_node( graph &g, Body body )
-         : graph_node(g), my_active(false)
-         , my_body( new input_body_leaf< output_type, Body>(body) )
-         , my_init_body( new input_body_leaf< output_type, Body>(body) )
-         , my_successors(this), my_reserved(false), my_has_cached_item(false)
-    {
-        fgt_node_with_body(CODEPTR(), FLOW_INPUT_NODE, &this->my_graph,
-                           static_cast<sender<output_type> *>(this), this->my_body);
-    }
+            inline graph::~graph() {
+                wait_for_all();
+                if (own_context) {
+                    my_context->~task_group_context();
+                    r1::cache_aligned_deallocate(my_context);
+                }
+                delete my_task_arena;
+            }
 
-#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-    template <typename Body, typename... Successors>
-        __TBB_requires(input_node_body<Body, Output>)
-    input_node( const node_set<order::preceding, Successors...>& successors, Body body )
-        : input_node(successors.graph_reference(), body)
-    {
-        make_edges(*this, successors);
-    }
-#endif
-
-    //! Copy constructor
-    __TBB_NOINLINE_SYM input_node( const input_node& src )
-        : graph_node(src.my_graph), sender<Output>()
-        , my_active(false)
-        , my_body(src.my_init_body->clone()), my_init_body(src.my_init_body->clone())
-        , my_successors(this), my_reserved(false), my_has_cached_item(false)
-    {
-        fgt_node_with_body(CODEPTR(), FLOW_INPUT_NODE, &this->my_graph,
-                           static_cast<sender<output_type> *>(this), this->my_body);
-    }
-
-    //! The destructor
-    ~input_node() { delete my_body; delete my_init_body; }
-
-    //! Add a new successor to this node
-    bool register_successor( successor_type &r ) override {
-        spin_mutex::scoped_lock lock(my_mutex);
-        my_successors.register_successor(r);
-        if ( my_active )
-            spawn_put();
-        return true;
-    }
-
-    //! Removes a successor from this node
-    bool remove_successor( successor_type &r ) override {
-        spin_mutex::scoped_lock lock(my_mutex);
-        my_successors.remove_successor(r);
-        return true;
-    }
-
-    //! Request an item from the node
-    bool try_get( output_type &v ) override {
-        spin_mutex::scoped_lock lock(my_mutex);
-        if ( my_reserved )
-            return false;
-
-        if ( my_has_cached_item ) {
-            v = my_cached_item;
-            my_has_cached_item = false;
-            return true;
-        }
-        // we've been asked to provide an item, but we have none.  enqueue a task to
-        // provide one.
-        if ( my_active )
-            spawn_put();
-        return false;
-    }
-
-    //! Reserves an item.
-    bool try_reserve( output_type &v ) override {
-        spin_mutex::scoped_lock lock(my_mutex);
-        if ( my_reserved ) {
-            return false;
-        }
-
-        if ( my_has_cached_item ) {
-            v = my_cached_item;
-            my_reserved = true;
-            return true;
-        } else {
-            return false;
-        }
-    }
+            inline void graph::reserve_wait() {
+                my_wait_context_vertex.reserve();
+                fgt_reserve_wait(this);
+            }
 
-#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
-private:
-    bool try_reserve( output_type& v, message_metainfo& ) override {
-        return try_reserve(v);
-    }
-
-    bool try_get( output_type& v, message_metainfo& ) override {
-        return try_get(v);
-    }
-public:
-#endif
-
-    //! Release a reserved item.
-    /** true = item has been released and so remains in sender, dest must request or reserve future items */
-    bool try_release( ) override {
-        spin_mutex::scoped_lock lock(my_mutex);
-        __TBB_ASSERT( my_reserved && my_has_cached_item, "releasing non-existent reservation" );
-        my_reserved = false;
-        if(!my_successors.empty())
-            spawn_put();
-        return true;
-    }
-
-    //! Consumes a reserved item
-    bool try_consume( ) override {
-        spin_mutex::scoped_lock lock(my_mutex);
-        __TBB_ASSERT( my_reserved && my_has_cached_item, "consuming non-existent reservation" );
-        my_reserved = false;
-        my_has_cached_item = false;
-        if ( !my_successors.empty() ) {
-            spawn_put();
-        }
-        return true;
-    }
-
-    //! Activates a node that was created in the inactive state
-    void activate() {
-        spin_mutex::scoped_lock lock(my_mutex);
-        my_active = true;
-        if (!my_successors.empty())
-            spawn_put();
-    }
-
-    template<typename Body>
-    Body copy_function_object() {
-        input_body<output_type> &body_ref = *this->my_body;
-        return dynamic_cast< input_body_leaf<output_type, Body> & >(body_ref).get_body();
-    }
-
-protected:
-
-    //! resets the input_node to its initial state
-    void reset_node( reset_flags f) override {
-        my_active = false;
-        my_reserved = false;
-        my_has_cached_item = false;
-
-        if(f & rf_clear_edges) my_successors.clear();
-        if(f & rf_reset_bodies) {
-            input_body<output_type> *tmp = my_init_body->clone();
-            delete my_body;
-            my_body = tmp;
-        }
-    }
-
-private:
-    spin_mutex my_mutex;
-    bool my_active;
-    input_body<output_type> *my_body;
-    input_body<output_type> *my_init_body;
-    broadcast_cache< output_type > my_successors;
-    bool my_reserved;
-    bool my_has_cached_item;
-    output_type my_cached_item;
-
-    // used by apply_body_bypass, can invoke body of node.
-    bool try_reserve_apply_body(output_type &v) {
-        spin_mutex::scoped_lock lock(my_mutex);
-        if ( my_reserved ) {
-            return false;
-        }
-        if ( !my_has_cached_item ) {
-            d1::flow_control control;
-
-            fgt_begin_body( my_body );
-
-            my_cached_item = (*my_body)(control);
-            my_has_cached_item = !control.is_pipeline_stopped;
-
-            fgt_end_body( my_body );
-        }
-        if ( my_has_cached_item ) {
-            v = my_cached_item;
-            my_reserved = true;
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    graph_task* create_put_task() {
-        d1::small_object_allocator allocator{};
-        typedef input_node_task_bypass< input_node<output_type> > task_type;
-        graph_task* t = allocator.new_object<task_type>(my_graph, allocator, *this);
-        return t;
-    }
-
-    //! Spawns a task that applies the body
-    void spawn_put( ) {
-        if(is_graph_active(this->my_graph)) {
-            spawn_in_graph_arena(this->my_graph, *create_put_task());
-        }
-    }
-
-    friend class input_node_task_bypass< input_node<output_type> >;
-    //! Applies the body.  Returning SUCCESSFULLY_ENQUEUED okay; forward_task_bypass will handle it.
-    graph_task* apply_body_bypass( ) {
-        output_type v;
-        if ( !try_reserve_apply_body(v) )
-            return nullptr;
-
-        graph_task *last_task = my_successors.try_put_task(v);
-        if ( last_task )
-            try_consume();
-        else
-            try_release();
-        return last_task;
-    }
-};  // class input_node
-
-//! Implements a function node that supports Input -> Output
-template<typename Input, typename Output = continue_msg, typename Policy = queueing>
-    __TBB_requires(std::default_initializable<Input> &&
-                   std::copy_constructible<Input> &&
-                   std::copy_constructible<Output>)
-class function_node
-    : public graph_node
-    , public function_input< Input, Output, Policy, cache_aligned_allocator<Input> >
-    , public function_output<Output>
-{
-    typedef cache_aligned_allocator<Input> internals_allocator;
-
-public:
-    typedef Input input_type;
-    typedef Output output_type;
-    typedef function_input<input_type,output_type,Policy,internals_allocator> input_impl_type;
-    typedef function_input_queue<input_type, internals_allocator> input_queue_type;
-    typedef function_output<output_type> fOutput_type;
-    typedef typename input_impl_type::predecessor_type predecessor_type;
-    typedef typename fOutput_type::successor_type successor_type;
-
-    using input_impl_type::my_predecessors;
-
-    //! Constructor
-    // input_queue_type is allocated here, but destroyed in the function_input_base.
-    // TODO: pass the graph_buffer_policy to the function_input_base so it can all
-    // be done in one place.  This would be an interface-breaking change.
-    template< typename Body >
-        __TBB_requires(function_node_body<Body, Input, Output>)
-     __TBB_NOINLINE_SYM function_node( graph &g, size_t concurrency,
-                   Body body, Policy = Policy(), node_priority_t a_priority = no_priority )
-        : graph_node(g), input_impl_type(g, concurrency, body, a_priority),
-          fOutput_type(g) {
-        fgt_node_with_body( CODEPTR(), FLOW_FUNCTION_NODE, &this->my_graph,
-                static_cast<receiver<input_type> *>(this), static_cast<sender<output_type> *>(this), this->my_body );
-    }
-
-    template <typename Body>
-        __TBB_requires(function_node_body<Body, Input, Output>)
-    function_node( graph& g, size_t concurrency, Body body, node_priority_t a_priority )
-        : function_node(g, concurrency, body, Policy(), a_priority) {}
+            inline void graph::release_wait() {
+                fgt_release_wait(this);
+                my_wait_context_vertex.release();
+            }
 
-#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-    template <typename Body, typename... Args>
-        __TBB_requires(function_node_body<Body, Input, Output>)
-    function_node( const node_set<Args...>& nodes, size_t concurrency, Body body,
-                   Policy p = Policy(), node_priority_t a_priority = no_priority )
-        : function_node(nodes.graph_reference(), concurrency, body, p, a_priority) {
-        make_edges_in_order(nodes, *this);
-    }
-
-    template <typename Body, typename... Args>
-        __TBB_requires(function_node_body<Body, Input, Output>)
-    function_node( const node_set<Args...>& nodes, size_t concurrency, Body body, node_priority_t a_priority )
-        : function_node(nodes, concurrency, body, Policy(), a_priority) {}
-#endif // __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-
-    //! Copy constructor
-    __TBB_NOINLINE_SYM function_node( const function_node& src ) :
-        graph_node(src.my_graph),
-        input_impl_type(src),
-        fOutput_type(src.my_graph) {
-        fgt_node_with_body( CODEPTR(), FLOW_FUNCTION_NODE, &this->my_graph,
-                static_cast<receiver<input_type> *>(this), static_cast<sender<output_type> *>(this), this->my_body );
-    }
-
-protected:
-    template< typename R, typename B > friend class run_and_put_task;
-    template<typename X, typename Y> friend class broadcast_cache;
-    template<typename X, typename Y> friend class round_robin_cache;
-    using input_impl_type::try_put_task;
-
-    broadcast_cache<output_type> &successors () override { return fOutput_type::my_successors; }
-
-    void reset_node(reset_flags f) override {
-        input_impl_type::reset_function_input(f);
-        // TODO: use clear() instead.
-        if(f & rf_clear_edges) {
-            successors().clear();
-            my_predecessors.clear();
-        }
-        __TBB_ASSERT(!(f & rf_clear_edges) || successors().empty(), "function_node successors not empty");
-        __TBB_ASSERT(this->my_predecessors.empty(), "function_node predecessors not empty");
-    }
-
-};  // class function_node
-
-//! implements a function node that supports Input -> (set of outputs)
-// Output is a tuple of output types.
-template<typename Input, typename Output, typename Policy = queueing>
-    __TBB_requires(std::default_initializable<Input> &&
-                   std::copy_constructible<Input>)
-class multifunction_node :
-    public graph_node,
-    public multifunction_input
-    <
-        Input,
-        typename wrap_tuple_elements<
-            std::tuple_size<Output>::value,  // #elements in tuple
-            multifunction_output,  // wrap this around each element
-            Output // the tuple providing the types
-        >::type,
-        Policy,
-        cache_aligned_allocator<Input>
-    >
-{
-    typedef cache_aligned_allocator<Input> internals_allocator;
-
-protected:
-    static const int N = std::tuple_size<Output>::value;
-public:
-    typedef Input input_type;
-    typedef null_type output_type;
-    typedef typename wrap_tuple_elements<N,multifunction_output, Output>::type output_ports_type;
-    typedef multifunction_input<
-        input_type, output_ports_type, Policy, internals_allocator> input_impl_type;
-    typedef function_input_queue<input_type, internals_allocator> input_queue_type;
-private:
-    using input_impl_type::my_predecessors;
-public:
-    template<typename Body>
-        __TBB_requires(multifunction_node_body<Body, Input, output_ports_type>)
-    __TBB_NOINLINE_SYM multifunction_node(
-        graph &g, size_t concurrency,
-        Body body, Policy = Policy(), node_priority_t a_priority = no_priority
-    ) : graph_node(g), input_impl_type(g, concurrency, body, a_priority) {
-        fgt_multioutput_node_with_body<N>(
-            CODEPTR(), FLOW_MULTIFUNCTION_NODE,
-            &this->my_graph, static_cast<receiver<input_type> *>(this),
-            this->output_ports(), this->my_body
-        );
-    }
-
-    template <typename Body>
-        __TBB_requires(multifunction_node_body<Body, Input, output_ports_type>)
-    __TBB_NOINLINE_SYM multifunction_node(graph& g, size_t concurrency, Body body, node_priority_t a_priority)
-        : multifunction_node(g, concurrency, body, Policy(), a_priority) {}
+            inline void graph::register_node(graph_node* n) {
+                n->next = nullptr;
+                {
+                    spin_mutex::scoped_lock lock(nodelist_mutex);
+                    n->prev = my_nodes_last;
+                    if (my_nodes_last) my_nodes_last->next = n;
+                    my_nodes_last = n;
+                    if (!my_nodes) my_nodes = n;
+                }
+            }
 
-#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-    template <typename Body, typename... Args>
-        __TBB_requires(multifunction_node_body<Body, Input, output_ports_type>)
-    __TBB_NOINLINE_SYM multifunction_node(const node_set<Args...>& nodes, size_t concurrency, Body body,
-                       Policy p = Policy(), node_priority_t a_priority = no_priority)
-        : multifunction_node(nodes.graph_reference(), concurrency, body, p, a_priority) {
-        make_edges_in_order(nodes, *this);
-    }
-
-    template <typename Body, typename... Args>
-        __TBB_requires(multifunction_node_body<Body, Input, output_ports_type>)
-    __TBB_NOINLINE_SYM multifunction_node(const node_set<Args...>& nodes, size_t concurrency, Body body, node_priority_t a_priority)
-        : multifunction_node(nodes, concurrency, body, Policy(), a_priority) {}
-#endif // __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-
-    __TBB_NOINLINE_SYM multifunction_node( const multifunction_node &other) :
-        graph_node(other.my_graph), input_impl_type(other) {
-        fgt_multioutput_node_with_body<N>( CODEPTR(), FLOW_MULTIFUNCTION_NODE,
-                &this->my_graph, static_cast<receiver<input_type> *>(this),
-                this->output_ports(), this->my_body );
-    }
-
-    // all the guts are in multifunction_input...
-protected:
-    void reset_node(reset_flags f) override { input_impl_type::reset(f); }
-};  // multifunction_node
-
-//! split_node: accepts a tuple as input, forwards each element of the tuple to its
-//  successors.  The node has unlimited concurrency, so it does not reject inputs.
-template<typename TupleType>
-class split_node : public graph_node, public receiver<TupleType> {
-    static const int N = std::tuple_size<TupleType>::value;
-    typedef receiver<TupleType> base_type;
-public:
-    typedef TupleType input_type;
-    typedef typename wrap_tuple_elements<
-            N,  // #elements in tuple
-            multifunction_output,  // wrap this around each element
-            TupleType // the tuple providing the types
-        >::type  output_ports_type;
-
-    __TBB_NOINLINE_SYM explicit split_node(graph &g)
-        : graph_node(g),
-          my_output_ports(init_output_ports<output_ports_type>::call(g, my_output_ports))
-    {
-        fgt_multioutput_node<N>(CODEPTR(), FLOW_SPLIT_NODE, &this->my_graph,
-            static_cast<receiver<input_type> *>(this), this->output_ports());
-    }
+            inline void graph::remove_node(graph_node* n) {
+                {
+                    spin_mutex::scoped_lock lock(nodelist_mutex);
+                    __TBB_ASSERT(my_nodes && my_nodes_last, "graph::remove_node: Error: no registered nodes");
+                    if (n->prev) n->prev->next = n->next;
+                    if (n->next) n->next->prev = n->prev;
+                    if (my_nodes_last == n) my_nodes_last = n->prev;
+                    if (my_nodes == n) my_nodes = n->next;
+                }
+                n->prev = n->next = nullptr;
+            }
 
-#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-    template <typename... Args>
-    __TBB_NOINLINE_SYM split_node(const node_set<Args...>& nodes) : split_node(nodes.graph_reference()) {
-        make_edges_in_order(nodes, *this);
-    }
-#endif
-
-    __TBB_NOINLINE_SYM split_node(const split_node& other)
-        : graph_node(other.my_graph), base_type(other),
-          my_output_ports(init_output_ports<output_ports_type>::call(other.my_graph, my_output_ports))
-    {
-        fgt_multioutput_node<N>(CODEPTR(), FLOW_SPLIT_NODE, &this->my_graph,
-            static_cast<receiver<input_type> *>(this), this->output_ports());
-    }
-
-    output_ports_type &output_ports() { return my_output_ports; }
-
-protected:
-    graph_task *try_put_task(const TupleType& t) override {
-        // Sending split messages in parallel is not justified, as overheads would prevail.
-        // Also, we do not have successors here. So we just tell the task returned here is successful.
-        return emit_element<N>::emit_this(this->my_graph, t, output_ports());
-    }
-#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
-    graph_task* try_put_task(const TupleType& t, const message_metainfo& metainfo) override {
-        // Sending split messages in parallel is not justified, as overheads would prevail.
-        // Also, we do not have successors here. So we just tell the task returned here is successful.
-        return emit_element<N>::emit_this(this->my_graph, t, output_ports(), metainfo);
-    }
-#endif
-
-    void reset_node(reset_flags f) override {
-        if (f & rf_clear_edges)
-            clear_element<N>::clear_this(my_output_ports);
-
-        __TBB_ASSERT(!(f & rf_clear_edges) || clear_element<N>::this_empty(my_output_ports), "split_node reset failed");
-    }
-    graph& graph_reference() const override {
-        return my_graph;
-    }
-
-private:
-    output_ports_type my_output_ports;
-};
-
-//! Implements an executable node that supports continue_msg -> Output
-template <typename Output, typename Policy = Policy<void> >
-    __TBB_requires(std::copy_constructible<Output>)
-class continue_node : public graph_node, public continue_input<Output, Policy>,
-                      public function_output<Output> {
-public:
-    typedef continue_msg input_type;
-    typedef Output output_type;
-    typedef continue_input<Output, Policy> input_impl_type;
-    typedef function_output<output_type> fOutput_type;
-    typedef typename input_impl_type::predecessor_type predecessor_type;
-    typedef typename fOutput_type::successor_type successor_type;
-
-    //! Constructor for executable node with continue_msg -> Output
-    template <typename Body >
-        __TBB_requires(continue_node_body<Body, Output>)
-    __TBB_NOINLINE_SYM continue_node(
-        graph &g,
-        Body body, Policy = Policy(), node_priority_t a_priority = no_priority
-    ) : graph_node(g), input_impl_type( g, body, a_priority ),
-        fOutput_type(g) {
-        fgt_node_with_body( CODEPTR(), FLOW_CONTINUE_NODE, &this->my_graph,
-
-                                           static_cast<receiver<input_type> *>(this),
-                                           static_cast<sender<output_type> *>(this), this->my_body );
-    }
-
-    template <typename Body>
-        __TBB_requires(continue_node_body<Body, Output>)
-    continue_node( graph& g, Body body, node_priority_t a_priority )
-        : continue_node(g, body, Policy(), a_priority) {}
+            inline void graph::reset(reset_flags f) {
+                // reset context
+                deactivate_graph(*this);
+
+                my_context->reset();
+                cancelled = false;
+                caught_exception = false;
+                // reset all the nodes comprising the graph
+                for (iterator ii = begin(); ii != end(); ++ii) {
+                    graph_node* my_p = &(*ii);
+                    my_p->reset_node(f);
+                }
+                // Reattach the arena. Might be useful to run the graph in a particular task_arena
+                // while not limiting graph lifetime to a single task_arena::execute() call.
+                prepare_task_arena(/*reinit=*/true);
+                activate_graph(*this);
+            }
 
-#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-    template <typename Body, typename... Args>
-        __TBB_requires(continue_node_body<Body, Output>)
-    continue_node( const node_set<Args...>& nodes, Body body,
-                   Policy p = Policy(), node_priority_t a_priority = no_priority )
-        : continue_node(nodes.graph_reference(), body, p, a_priority ) {
-        make_edges_in_order(nodes, *this);
-    }
-    template <typename Body, typename... Args>
-        __TBB_requires(continue_node_body<Body, Output>)
-    continue_node( const node_set<Args...>& nodes, Body body, node_priority_t a_priority)
-        : continue_node(nodes, body, Policy(), a_priority) {}
-#endif // __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-
-    //! Constructor for executable node with continue_msg -> Output
-    template <typename Body >
-        __TBB_requires(continue_node_body<Body, Output>)
-    __TBB_NOINLINE_SYM continue_node(
-        graph &g, int number_of_predecessors,
-        Body body, Policy = Policy(), node_priority_t a_priority = no_priority
-    ) : graph_node(g)
-      , input_impl_type(g, number_of_predecessors, body, a_priority),
-        fOutput_type(g) {
-        fgt_node_with_body( CODEPTR(), FLOW_CONTINUE_NODE, &this->my_graph,
-                                           static_cast<receiver<input_type> *>(this),
-                                           static_cast<sender<output_type> *>(this), this->my_body );
-    }
-
-    template <typename Body>
-        __TBB_requires(continue_node_body<Body, Output>)
-    continue_node( graph& g, int number_of_predecessors, Body body, node_priority_t a_priority)
-        : continue_node(g, number_of_predecessors, body, Policy(), a_priority) {}
+            inline void graph::cancel() { my_context->cancel_group_execution(); }
 
-#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-    template <typename Body, typename... Args>
-        __TBB_requires(continue_node_body<Body, Output>)
-    continue_node( const node_set<Args...>& nodes, int number_of_predecessors,
-                   Body body, Policy p = Policy(), node_priority_t a_priority = no_priority )
-        : continue_node(nodes.graph_reference(), number_of_predecessors, body, p, a_priority) {
-        make_edges_in_order(nodes, *this);
-    }
-
-    template <typename Body, typename... Args>
-        __TBB_requires(continue_node_body<Body, Output>)
-    continue_node( const node_set<Args...>& nodes, int number_of_predecessors,
-                   Body body, node_priority_t a_priority )
-        : continue_node(nodes, number_of_predecessors, body, Policy(), a_priority) {}
-#endif
-
-    //! Copy constructor
-    __TBB_NOINLINE_SYM continue_node( const continue_node& src ) :
-        graph_node(src.my_graph), input_impl_type(src),
-        function_output<Output>(src.my_graph) {
-        fgt_node_with_body( CODEPTR(), FLOW_CONTINUE_NODE, &this->my_graph,
-                                           static_cast<receiver<input_type> *>(this),
-                                           static_cast<sender<output_type> *>(this), this->my_body );
-    }
-
-protected:
-    template< typename R, typename B > friend class run_and_put_task;
-    template<typename X, typename Y> friend class broadcast_cache;
-    template<typename X, typename Y> friend class round_robin_cache;
-    using input_impl_type::try_put_task;
-    broadcast_cache<output_type> &successors () override { return fOutput_type::my_successors; }
-
-    void reset_node(reset_flags f) override {
-        input_impl_type::reset_receiver(f);
-        if(f & rf_clear_edges)successors().clear();
-        __TBB_ASSERT(!(f & rf_clear_edges) || successors().empty(), "continue_node not reset");
-    }
-};  // continue_node
-
-//! Forwards messages of type T to all successors
-template <typename T>
-class broadcast_node : public graph_node, public receiver<T>, public sender<T> {
-public:
-    typedef T input_type;
-    typedef T output_type;
-    typedef typename receiver<input_type>::predecessor_type predecessor_type;
-    typedef typename sender<output_type>::successor_type successor_type;
-private:
-    broadcast_cache<input_type> my_successors;
-public:
-
-    __TBB_NOINLINE_SYM explicit broadcast_node(graph& g) : graph_node(g), my_successors(this) {
-        fgt_node( CODEPTR(), FLOW_BROADCAST_NODE, &this->my_graph,
-                  static_cast<receiver<input_type> *>(this), static_cast<sender<output_type> *>(this) );
-    }
+            inline graph::iterator graph::begin() { return iterator(this, true); }
 
-#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-    template <typename... Args>
-    broadcast_node(const node_set<Args...>& nodes) : broadcast_node(nodes.graph_reference()) {
-        make_edges_in_order(nodes, *this);
-    }
-#endif
-
-    // Copy constructor
-    __TBB_NOINLINE_SYM broadcast_node( const broadcast_node& src ) : broadcast_node(src.my_graph) {}
-
-    //! Adds a successor
-    bool register_successor( successor_type &r ) override {
-        my_successors.register_successor( r );
-        return true;
-    }
-
-    //! Removes s as a successor
-    bool remove_successor( successor_type &r ) override {
-        my_successors.remove_successor( r );
-        return true;
-    }
-
-private:
-    graph_task* try_put_task_impl(const T& t __TBB_FLOW_GRAPH_METAINFO_ARG(const message_metainfo& metainfo)) {
-        graph_task* new_task = my_successors.try_put_task(t __TBB_FLOW_GRAPH_METAINFO_ARG(metainfo));
-        if (!new_task) new_task = SUCCESSFULLY_ENQUEUED;
-        return new_task;
-    }
-
-protected:
-    template< typename R, typename B > friend class run_and_put_task;
-    template<typename X, typename Y> friend class broadcast_cache;
-    template<typename X, typename Y> friend class round_robin_cache;
-    //! build a task to run the successor if possible.  Default is old behavior.
-    graph_task* try_put_task(const T& t) override {
-        return try_put_task_impl(t __TBB_FLOW_GRAPH_METAINFO_ARG(message_metainfo{}));
-    }
+            inline graph::iterator graph::end() { return iterator(this, false); }
 
-#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
-    graph_task* try_put_task(const T& t, const message_metainfo& metainfo) override {
-        return try_put_task_impl(t, metainfo);
-    }
-#endif
-
-    graph& graph_reference() const override {
-        return my_graph;
-    }
-
-    void reset_node(reset_flags f) override {
-        if (f&rf_clear_edges) {
-           my_successors.clear();
-        }
-        __TBB_ASSERT(!(f & rf_clear_edges) || my_successors.empty(), "Error resetting broadcast_node");
-    }
-};  // broadcast_node
-
-//! Forwards messages in arbitrary order
-template <typename T>
-class buffer_node
-    : public graph_node
-    , public reservable_item_buffer< T, cache_aligned_allocator<T> >
-    , public receiver<T>, public sender<T>
-{
-    typedef cache_aligned_allocator<T> internals_allocator;
-
-public:
-    typedef T input_type;
-    typedef T output_type;
-    typedef typename receiver<input_type>::predecessor_type predecessor_type;
-    typedef typename sender<output_type>::successor_type successor_type;
-    typedef buffer_node<T> class_type;
-
-protected:
-    typedef size_t size_type;
-    round_robin_cache< T, null_rw_mutex > my_successors;
-
-    friend class forward_task_bypass< class_type >;
-
-    enum op_type {reg_succ, rem_succ, req_item, res_item, rel_res, con_res, put_item, try_fwd_task
-    };
-
-    // implements the aggregator_operation concept
-    class buffer_operation : public d1::aggregated_operation< buffer_operation > {
-    public:
-        char type;
-        T* elem;
-        graph_task* ltask;
-        successor_type *r;
-#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
-        message_metainfo* metainfo{ nullptr };
-#endif
+            inline graph::const_iterator graph::begin() const { return const_iterator(this, true); }
 
-        buffer_operation(const T& e, op_type t) : type(char(t))
-                                                  , elem(const_cast<T*>(&e)) , ltask(nullptr)
-                                                  , r(nullptr)
-        {}
+            inline graph::const_iterator graph::end() const { return const_iterator(this, false); }
 
-#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
-        buffer_operation(const T& e, op_type t, const message_metainfo& info)
-            : type(char(t)), elem(const_cast<T*>(&e)), ltask(nullptr), r(nullptr)
-            , metainfo(const_cast<message_metainfo*>(&info))
-        {}
-
-        buffer_operation(op_type t, message_metainfo& info)
-            : type(char(t)), elem(nullptr), ltask(nullptr), r(nullptr), metainfo(&info) {}
-#endif
-        buffer_operation(op_type t) : type(char(t)), elem(nullptr), ltask(nullptr), r(nullptr) {}
-    };
-
-    bool forwarder_busy;
-    typedef d1::aggregating_functor<class_type, buffer_operation> handler_type;
-    friend class d1::aggregating_functor<class_type, buffer_operation>;
-    d1::aggregator< handler_type, buffer_operation> my_aggregator;
-
-    virtual void handle_operations(buffer_operation *op_list) {
-        handle_operations_impl(op_list, this);
-    }
-
-    template<typename derived_type>
-    void handle_operations_impl(buffer_operation *op_list, derived_type* derived) {
-        __TBB_ASSERT(static_cast<class_type*>(derived) == this, "'this' is not a base class for derived");
-
-        buffer_operation *tmp = nullptr;
-        bool try_forwarding = false;
-        while (op_list) {
-            tmp = op_list;
-            op_list = op_list->next;
-            switch (tmp->type) {
-            case reg_succ: internal_reg_succ(tmp); try_forwarding = true; break;
-            case rem_succ: internal_rem_succ(tmp); break;
-            case req_item: internal_pop(tmp); break;
-            case res_item: internal_reserve(tmp); break;
-            case rel_res:  internal_release(tmp); try_forwarding = true; break;
-            case con_res:  internal_consume(tmp); try_forwarding = true; break;
-            case put_item: try_forwarding = internal_push(tmp); break;
-            case try_fwd_task: internal_forward_task(tmp); break;
-            }
-        }
-
-        derived->order();
-
-        if (try_forwarding && !forwarder_busy) {
-            if(is_graph_active(this->my_graph)) {
-                forwarder_busy = true;
-                typedef forward_task_bypass<class_type> task_type;
-                d1::small_object_allocator allocator{};
-                graph_task* new_task = allocator.new_object<task_type>(graph_reference(), allocator, *this);
-                // tmp should point to the last item handled by the aggregator.  This is the operation
-                // the handling thread enqueued.  So modifying that record will be okay.
-                // TODO revamp: check that the issue is still present
-                // workaround for icc bug  (at least 12.0 and 13.0)
-                // error: function "tbb::flow::interfaceX::combine_tasks" cannot be called with the given argument list
-                //        argument types are: (graph, graph_task *, graph_task *)
-                graph_task *z = tmp->ltask;
-                graph &g = this->my_graph;
-                tmp->ltask = combine_tasks(g, z, new_task);  // in case the op generated a task
-            }
-        }
-    }  // handle_operations
-
-    inline graph_task *grab_forwarding_task( buffer_operation &op_data) {
-        return op_data.ltask;
-    }
-
-    inline bool enqueue_forwarding_task(buffer_operation &op_data) {
-        graph_task *ft = grab_forwarding_task(op_data);
-        if(ft) {
-            spawn_in_graph_arena(graph_reference(), *ft);
-            return true;
-        }
-        return false;
-    }
-
-    //! This is executed by an enqueued task, the "forwarder"
-    virtual graph_task *forward_task() {
-        buffer_operation op_data(try_fwd_task);
-        graph_task *last_task = nullptr;
-        do {
-            op_data.status = WAIT;
-            op_data.ltask = nullptr;
-            my_aggregator.execute(&op_data);
-
-            // workaround for icc bug
-            graph_task *xtask = op_data.ltask;
-            graph& g = this->my_graph;
-            last_task = combine_tasks(g, last_task, xtask);
-        } while (op_data.status ==SUCCEEDED);
-        return last_task;
-    }
-
-    //! Register successor
-    virtual void internal_reg_succ(buffer_operation *op) {
-        __TBB_ASSERT(op->r, nullptr);
-        my_successors.register_successor(*(op->r));
-        op->status.store(SUCCEEDED, std::memory_order_release);
-    }
-
-    //! Remove successor
-    virtual void internal_rem_succ(buffer_operation *op) {
-        __TBB_ASSERT(op->r, nullptr);
-        my_successors.remove_successor(*(op->r));
-        op->status.store(SUCCEEDED, std::memory_order_release);
-    }
-
-private:
-    void order() {}
-
-    bool is_item_valid() {
-        return this->my_item_valid(this->my_tail - 1);
-    }
-
-    void try_put_and_add_task(graph_task*& last_task) {
-        graph_task* new_task = my_successors.try_put_task(this->back()
-                                                          __TBB_FLOW_GRAPH_METAINFO_ARG(this->back_metainfo()));
-        if (new_task) {
-            // workaround for icc bug
-            graph& g = this->my_graph;
-            last_task = combine_tasks(g, last_task, new_task);
-            this->destroy_back();
-        }
-    }
-
-protected:
-    //! Tries to forward valid items to successors
-    virtual void internal_forward_task(buffer_operation *op) {
-        internal_forward_task_impl(op, this);
-    }
-
-    template<typename derived_type>
-    void internal_forward_task_impl(buffer_operation *op, derived_type* derived) {
-        __TBB_ASSERT(static_cast<class_type*>(derived) == this, "'this' is not a base class for derived");
-
-        if (this->my_reserved || !derived->is_item_valid()) {
-            op->status.store(FAILED, std::memory_order_release);
-            this->forwarder_busy = false;
-            return;
-        }
-        // Try forwarding, giving each successor a chance
-        graph_task* last_task = nullptr;
-        size_type counter = my_successors.size();
-        for (; counter > 0 && derived->is_item_valid(); --counter)
-            derived->try_put_and_add_task(last_task);
-
-        op->ltask = last_task;  // return task
-        if (last_task && !counter) {
-            op->status.store(SUCCEEDED, std::memory_order_release);
-        }
-        else {
-            op->status.store(FAILED, std::memory_order_release);
-            forwarder_busy = false;
-        }
-    }
-
-    virtual bool internal_push(buffer_operation *op) {
-        __TBB_ASSERT(op->elem, nullptr);
-#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
-        __TBB_ASSERT(op->metainfo, nullptr);
-        this->push_back(*(op->elem), (*op->metainfo));
-#else
-        this->push_back(*(op->elem));
-#endif
-        op->status.store(SUCCEEDED, std::memory_order_release);
-        return true;
-    }
+            inline graph::const_iterator graph::cbegin() const { return const_iterator(this, true); }
 
-    virtual void internal_pop(buffer_operation *op) {
-        __TBB_ASSERT(op->elem, nullptr);
-#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
-        bool pop_result = op->metainfo ? this->pop_back(*(op->elem), *(op->metainfo))
-                                       : this->pop_back(*(op->elem));
-#else
-        bool pop_result = this->pop_back(*(op->elem));
-#endif
-        if (pop_result) {
-            op->status.store(SUCCEEDED, std::memory_order_release);
-        }
-        else {
-            op->status.store(FAILED, std::memory_order_release);
-        }
-    }
-
-    virtual void internal_reserve(buffer_operation *op) {
-        __TBB_ASSERT(op->elem, nullptr);
-#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
-        bool reserve_result = op->metainfo ? this->reserve_front(*(op->elem), *(op->metainfo))
-                                           : this->reserve_front(*(op->elem));
-#else
-        bool reserve_result = this->reserve_front(*(op->elem));
-#endif
-        if (reserve_result) {
-            op->status.store(SUCCEEDED, std::memory_order_release);
-        }
-        else {
-            op->status.store(FAILED, std::memory_order_release);
-        }
-    }
-
-    virtual void internal_consume(buffer_operation *op) {
-        this->consume_front();
-        op->status.store(SUCCEEDED, std::memory_order_release);
-    }
-
-    virtual void internal_release(buffer_operation *op) {
-        this->release_front();
-        op->status.store(SUCCEEDED, std::memory_order_release);
-    }
-
-public:
-    //! Constructor
-    __TBB_NOINLINE_SYM explicit buffer_node( graph &g )
-        : graph_node(g), reservable_item_buffer<T, internals_allocator>(), receiver<T>(),
-          sender<T>(), my_successors(this), forwarder_busy(false)
-    {
-        my_aggregator.initialize_handler(handler_type(this));
-        fgt_node( CODEPTR(), FLOW_BUFFER_NODE, &this->my_graph,
-                                 static_cast<receiver<input_type> *>(this), static_cast<sender<output_type> *>(this) );
-    }
+            inline graph::const_iterator graph::cend() const { return const_iterator(this, false); }
 
-#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-    template <typename... Args>
-    buffer_node(const node_set<Args...>& nodes) : buffer_node(nodes.graph_reference()) {
-        make_edges_in_order(nodes, *this);
-    }
-#endif
-
-    //! Copy constructor
-    __TBB_NOINLINE_SYM buffer_node( const buffer_node& src ) : buffer_node(src.my_graph) {}
-
-    //
-    // message sender implementation
-    //
-
-    //! Adds a new successor.
-    /** Adds successor r to the list of successors; may forward tasks.  */
-    bool register_successor( successor_type &r ) override {
-        buffer_operation op_data(reg_succ);
-        op_data.r = &r;
-        my_aggregator.execute(&op_data);
-        (void)enqueue_forwarding_task(op_data);
-        return true;
-    }
-
-    //! Removes a successor.
-    /** Removes successor r from the list of successors.
-        It also calls r.remove_predecessor(*this) to remove this node as a predecessor. */
-    bool remove_successor( successor_type &r ) override {
-        // TODO revamp: investigate why full qualification is necessary here
-        tbb::detail::d2::remove_predecessor(r, *this);
-        buffer_operation op_data(rem_succ);
-        op_data.r = &r;
-        my_aggregator.execute(&op_data);
-        // even though this operation does not cause a forward, if we are the handler, and
-        // a forward is scheduled, we may be the first to reach this point after the aggregator,
-        // and so should check for the task.
-        (void)enqueue_forwarding_task(op_data);
-        return true;
-    }
-
-    //! Request an item from the buffer_node
-    /**  true = v contains the returned item<BR>
-         false = no item has been returned */
-    bool try_get( T &v ) override {
-        buffer_operation op_data(req_item);
-        op_data.elem = &v;
-        my_aggregator.execute(&op_data);
-        (void)enqueue_forwarding_task(op_data);
-        return (op_data.status==SUCCEEDED);
-    }
+            inline graph_node::graph_node(graph& g) : my_graph(g) { my_graph.register_node(this); }
 
-#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
-    bool try_get( T &v, message_metainfo& metainfo ) override {
-        buffer_operation op_data(req_item, metainfo);
-        op_data.elem = &v;
-        my_aggregator.execute(&op_data);
-        (void)enqueue_forwarding_task(op_data);
-        return (op_data.status==SUCCEEDED);
-    }
-#endif
+            inline graph_node::~graph_node() { my_graph.remove_node(this); }
 
-    //! Reserves an item.
-    /**  false = no item can be reserved<BR>
-         true = an item is reserved */
-    bool try_reserve( T &v ) override {
-        buffer_operation op_data(res_item);
-        op_data.elem = &v;
-        my_aggregator.execute(&op_data);
-        (void)enqueue_forwarding_task(op_data);
-        return (op_data.status==SUCCEEDED);
-    }
+#include "detail/_flow_graph_node_impl.h"
 
-#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
-    bool try_reserve( output_type& v, message_metainfo& metainfo ) override {
-        buffer_operation op_data(res_item, metainfo);
-        op_data.elem = &v;
-        my_aggregator.execute(&op_data);
-        (void)enqueue_forwarding_task(op_data);
-        return op_data.status==SUCCEEDED;
-    }
-#endif
-
-    //! Release a reserved item.
-    /**  true = item has been released and so remains in sender */
-    bool try_release() override {
-        buffer_operation op_data(rel_res);
-        my_aggregator.execute(&op_data);
-        (void)enqueue_forwarding_task(op_data);
-        return true;
-    }
-
-    //! Consumes a reserved item.
-    /** true = item is removed from sender and reservation removed */
-    bool try_consume() override {
-        buffer_operation op_data(con_res);
-        my_aggregator.execute(&op_data);
-        (void)enqueue_forwarding_task(op_data);
-        return true;
-    }
-
-private:
-    graph_task* try_put_task_impl(const T& t __TBB_FLOW_GRAPH_METAINFO_ARG(const message_metainfo& metainfo)) {
-        buffer_operation op_data(t, put_item __TBB_FLOW_GRAPH_METAINFO_ARG(metainfo));
-        my_aggregator.execute(&op_data);
-        graph_task *ft = grab_forwarding_task(op_data);
-        // sequencer_nodes can return failure (if an item has been previously inserted)
-        // We have to spawn the returned task if our own operation fails.
-
-        if(ft && op_data.status ==FAILED) {
-            // we haven't succeeded queueing the item, but for some reason the
-            // call returned a task (if another request resulted in a successful
-            // forward this could happen.)  Queue the task and reset the pointer.
-            spawn_in_graph_arena(graph_reference(), *ft); ft = nullptr;
-        }
-        else if(!ft && op_data.status ==SUCCEEDED) {
-            ft = SUCCESSFULLY_ENQUEUED;
-        }
-        return ft;
-    }
-
-protected:
-
-    template< typename R, typename B > friend class run_and_put_task;
-    template<typename X, typename Y> friend class broadcast_cache;
-    template<typename X, typename Y> friend class round_robin_cache;
-    //! receive an item, return a task *if possible
-    graph_task *try_put_task(const T &t) override {
-        return try_put_task_impl(t __TBB_FLOW_GRAPH_METAINFO_ARG(message_metainfo{}));
-    }
+            //! An executable node that acts as a source, i.e. it has no predecessors
+
+            template <typename Output>
+            __TBB_requires(std::copyable<Output>) class input_node : public graph_node,
+                                                                     public sender<Output> {
+            public:
+                //! The type of the output message, which is complete
+                typedef Output output_type;
+
+                //! The type of successors of this node
+                typedef typename sender<output_type>::successor_type successor_type;
+
+                // Input node has no input type
+                typedef null_type input_type;
+
+                //! Constructor for a node with a successor
+                template <typename Body>
+                __TBB_requires(input_node_body<Body, Output>) __TBB_NOINLINE_SYM
+                        input_node(graph& g, Body body)
+                    : graph_node(g), my_active(false), my_body(new input_body_leaf<output_type, Body>(body)),
+                      my_init_body(new input_body_leaf<output_type, Body>(body)), my_successors(this),
+                      my_reserved(false), my_has_cached_item(false) {
+                    fgt_node_with_body(CODEPTR(), FLOW_INPUT_NODE, &this->my_graph,
+                                       static_cast<sender<output_type>*>(this), this->my_body);
+                }
 
-#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
-    graph_task* try_put_task(const T& t, const message_metainfo& metainfo) override {
-        return try_put_task_impl(t, metainfo);
-    }
-#endif
-
-    graph& graph_reference() const override {
-        return my_graph;
-    }
-
-protected:
-    void reset_node( reset_flags f) override {
-        reservable_item_buffer<T, internals_allocator>::reset();
-        // TODO: just clear structures
-        if (f&rf_clear_edges) {
-            my_successors.clear();
-        }
-        forwarder_busy = false;
-    }
-};  // buffer_node
-
-//! Forwards messages in FIFO order
-template <typename T>
-class queue_node : public buffer_node<T> {
-protected:
-    typedef buffer_node<T> base_type;
-    typedef typename base_type::size_type size_type;
-    typedef typename base_type::buffer_operation queue_operation;
-    typedef queue_node class_type;
-
-private:
-    template<typename> friend class buffer_node;
-
-    bool is_item_valid() {
-        return this->my_item_valid(this->my_head);
-    }
-
-    void try_put_and_add_task(graph_task*& last_task) {
-        graph_task* new_task = this->my_successors.try_put_task(this->front()
-                                                                __TBB_FLOW_GRAPH_METAINFO_ARG(this->front_metainfo()));
-
-        if (new_task) {
-            // workaround for icc bug
-            graph& graph_ref = this->graph_reference();
-            last_task = combine_tasks(graph_ref, last_task, new_task);
-            this->destroy_front();
-        }
-    }
-
-protected:
-    void internal_forward_task(queue_operation *op) override {
-        this->internal_forward_task_impl(op, this);
-    }
-
-    void internal_pop(queue_operation *op) override {
-        if ( this->my_reserved || !this->my_item_valid(this->my_head)){
-            op->status.store(FAILED, std::memory_order_release);
-        }
-        else {
-#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
-            if (op->metainfo) {
-                this->pop_front(*(op->elem), *(op->metainfo));
-            } else
-#endif
-            {
-                this->pop_front(*(op->elem));
-            }
-            op->status.store(SUCCEEDED, std::memory_order_release);
-        }
-    }
-    void internal_reserve(queue_operation *op) override {
-        if (this->my_reserved || !this->my_item_valid(this->my_head)) {
-            op->status.store(FAILED, std::memory_order_release);
-        }
-        else {
-#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
-            if (op->metainfo) {
-                this->reserve_front(*(op->elem), *(op->metainfo));
-            }
-            else
+#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+                template <typename Body, typename... Successors>
+                __TBB_requires(input_node_body<Body, Output>)
+                        input_node(const node_set<order::preceding, Successors...>& successors, Body body)
+                    : input_node(successors.graph_reference(), body) {
+                    make_edges(*this, successors);
+                }
 #endif
-            {
-                this->reserve_front(*(op->elem));
-            }
-            op->status.store(SUCCEEDED, std::memory_order_release);
-        }
-    }
-    void internal_consume(queue_operation *op) override {
-        this->consume_front();
-        op->status.store(SUCCEEDED, std::memory_order_release);
-    }
-
-public:
-    typedef T input_type;
-    typedef T output_type;
-    typedef typename receiver<input_type>::predecessor_type predecessor_type;
-    typedef typename sender<output_type>::successor_type successor_type;
-
-    //! Constructor
-    __TBB_NOINLINE_SYM explicit queue_node( graph &g ) : base_type(g) {
-        fgt_node( CODEPTR(), FLOW_QUEUE_NODE, &(this->my_graph),
-                                 static_cast<receiver<input_type> *>(this),
-                                 static_cast<sender<output_type> *>(this) );
-    }
 
-#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-    template <typename... Args>
-    queue_node( const node_set<Args...>& nodes) : queue_node(nodes.graph_reference()) {
-        make_edges_in_order(nodes, *this);
-    }
-#endif
-
-    //! Copy constructor
-    __TBB_NOINLINE_SYM queue_node( const queue_node& src) : base_type(src) {
-        fgt_node( CODEPTR(), FLOW_QUEUE_NODE, &(this->my_graph),
-                                 static_cast<receiver<input_type> *>(this),
-                                 static_cast<sender<output_type> *>(this) );
-    }
-
-
-protected:
-    void reset_node( reset_flags f) override {
-        base_type::reset_node(f);
-    }
-};  // queue_node
-
-//! Forwards messages in sequence order
-template <typename T>
-    __TBB_requires(std::copyable<T>)
-class sequencer_node : public queue_node<T> {
-    function_body< T, size_t > *my_sequencer;
-    // my_sequencer should be a benign function and must be callable
-    // from a parallel context.  Does this mean it needn't be reset?
-public:
-    typedef T input_type;
-    typedef T output_type;
-    typedef typename receiver<input_type>::predecessor_type predecessor_type;
-    typedef typename sender<output_type>::successor_type successor_type;
-
-    //! Constructor
-    template< typename Sequencer >
-        __TBB_requires(sequencer<Sequencer, T>)
-    __TBB_NOINLINE_SYM sequencer_node( graph &g, const Sequencer& s ) : queue_node<T>(g),
-        my_sequencer(new function_body_leaf< T, size_t, Sequencer>(s) ) {
-        fgt_node( CODEPTR(), FLOW_SEQUENCER_NODE, &(this->my_graph),
-                                 static_cast<receiver<input_type> *>(this),
-                                 static_cast<sender<output_type> *>(this) );
-    }
+                //! Copy constructor
+                __TBB_NOINLINE_SYM input_node(const input_node& src)
+                    : graph_node(src.my_graph), sender<Output>(), my_active(false),
+                      my_body(src.my_init_body -> clone()), my_init_body(src.my_init_body->clone()),
+                      my_successors(this), my_reserved(false), my_has_cached_item(false) {
+                    fgt_node_with_body(CODEPTR(), FLOW_INPUT_NODE, &this->my_graph,
+                                       static_cast<sender<output_type>*>(this), this->my_body);
+                }
 
-#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-    template <typename Sequencer, typename... Args>
-        __TBB_requires(sequencer<Sequencer, T>)
-    sequencer_node( const node_set<Args...>& nodes, const Sequencer& s)
-        : sequencer_node(nodes.graph_reference(), s) {
-        make_edges_in_order(nodes, *this);
-    }
-#endif
-
-    //! Copy constructor
-    __TBB_NOINLINE_SYM sequencer_node( const sequencer_node& src ) : queue_node<T>(src),
-        my_sequencer( src.my_sequencer->clone() ) {
-        fgt_node( CODEPTR(), FLOW_SEQUENCER_NODE, &(this->my_graph),
-                                 static_cast<receiver<input_type> *>(this),
-                                 static_cast<sender<output_type> *>(this) );
-    }
-
-    //! Destructor
-    ~sequencer_node() { delete my_sequencer; }
-
-protected:
-    typedef typename buffer_node<T>::size_type size_type;
-    typedef typename buffer_node<T>::buffer_operation sequencer_operation;
-
-private:
-    bool internal_push(sequencer_operation *op) override {
-        size_type tag = (*my_sequencer)(*(op->elem));
-#if !TBB_DEPRECATED_SEQUENCER_DUPLICATES
-        if (tag < this->my_head) {
-            // have already emitted a message with this tag
-            op->status.store(FAILED, std::memory_order_release);
-            return false;
-        }
-#endif
-        // cannot modify this->my_tail now; the buffer would be inconsistent.
-        size_t new_tail = (tag+1 > this->my_tail) ? tag+1 : this->my_tail;
+                //! The destructor
+                ~input_node() {
+                    delete my_body;
+                    delete my_init_body;
+                }
 
-        if (this->size(new_tail) > this->capacity()) {
-            this->grow_my_array(this->size(new_tail));
-        }
-        this->my_tail = new_tail;
+                //! Add a new successor to this node
+                bool register_successor(successor_type& r) override {
+                    spin_mutex::scoped_lock lock(my_mutex);
+                    my_successors.register_successor(r);
+                    if (my_active) spawn_put();
+                    return true;
+                }
 
-#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
-        __TBB_ASSERT(op->metainfo, nullptr);
-        bool place_item_result = this->place_item(tag, *(op->elem), *(op->metainfo));
-        const op_stat res = place_item_result ? SUCCEEDED : FAILED;
-#else
-        const op_stat res = this->place_item(tag, *(op->elem)) ? SUCCEEDED : FAILED;
-#endif
-        op->status.store(res, std::memory_order_release);
-        return res ==SUCCEEDED;
-    }
-};  // sequencer_node
-
-//! Forwards messages in priority order
-template<typename T, typename Compare = std::less<T>>
-class priority_queue_node : public buffer_node<T> {
-public:
-    typedef T input_type;
-    typedef T output_type;
-    typedef buffer_node<T> base_type;
-    typedef priority_queue_node class_type;
-    typedef typename receiver<input_type>::predecessor_type predecessor_type;
-    typedef typename sender<output_type>::successor_type successor_type;
-
-    //! Constructor
-    __TBB_NOINLINE_SYM explicit priority_queue_node( graph &g, const Compare& comp = Compare() )
-        : buffer_node<T>(g), compare(comp), mark(0) {
-        fgt_node( CODEPTR(), FLOW_PRIORITY_QUEUE_NODE, &(this->my_graph),
-                                 static_cast<receiver<input_type> *>(this),
-                                 static_cast<sender<output_type> *>(this) );
-    }
+                //! Removes a successor from this node
+                bool remove_successor(successor_type& r) override {
+                    spin_mutex::scoped_lock lock(my_mutex);
+                    my_successors.remove_successor(r);
+                    return true;
+                }
 
-#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-    template <typename... Args>
-    priority_queue_node(const node_set<Args...>& nodes, const Compare& comp = Compare())
-        : priority_queue_node(nodes.graph_reference(), comp) {
-        make_edges_in_order(nodes, *this);
-    }
-#endif
-
-    //! Copy constructor
-    __TBB_NOINLINE_SYM priority_queue_node( const priority_queue_node &src )
-        : buffer_node<T>(src), mark(0)
-    {
-        fgt_node( CODEPTR(), FLOW_PRIORITY_QUEUE_NODE, &(this->my_graph),
-                                 static_cast<receiver<input_type> *>(this),
-                                 static_cast<sender<output_type> *>(this) );
-    }
-
-protected:
-
-    void reset_node( reset_flags f) override {
-        mark = 0;
-        base_type::reset_node(f);
-    }
-
-    typedef typename buffer_node<T>::size_type size_type;
-    typedef typename buffer_node<T>::item_type item_type;
-    typedef typename buffer_node<T>::buffer_operation prio_operation;
-
-    //! Tries to forward valid items to successors
-    void internal_forward_task(prio_operation *op) override {
-        this->internal_forward_task_impl(op, this);
-    }
-
-    void handle_operations(prio_operation *op_list) override {
-        this->handle_operations_impl(op_list, this);
-    }
-
-    bool internal_push(prio_operation *op) override {
-#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
-        __TBB_ASSERT(op->metainfo, nullptr);
-        prio_push(*(op->elem), *(op->metainfo));
-#else
-        prio_push(*(op->elem));
-#endif
-        op->status.store(SUCCEEDED, std::memory_order_release);
-        return true;
-    }
+                //! Request an item from the node
+                bool try_get(output_type& v) override {
+                    spin_mutex::scoped_lock lock(my_mutex);
+                    if (my_reserved) return false;
 
-    void internal_pop(prio_operation *op) override {
-        // if empty or already reserved, don't pop
-        if ( this->my_reserved == true || this->my_tail == 0 ) {
-            op->status.store(FAILED, std::memory_order_release);
-            return;
-        }
+                    if (my_has_cached_item) {
+                        v = my_cached_item;
+                        my_has_cached_item = false;
+                        return true;
+                    }
+                    // we've been asked to provide an item, but we have none.  enqueue a task to
+                    // provide one.
+                    if (my_active) spawn_put();
+                    return false;
+                }
+
+                //! Reserves an item.
+                bool try_reserve(output_type& v) override {
+                    spin_mutex::scoped_lock lock(my_mutex);
+                    if (my_reserved) { return false; }
+
+                    if (my_has_cached_item) {
+                        v = my_cached_item;
+                        my_reserved = true;
+                        return true;
+                    } else {
+                        return false;
+                    }
+                }
 
-        *(op->elem) = prio();
-#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
-        if (op->metainfo) {
-            *(op->metainfo) = std::move(prio_metainfo());
-        }
-#endif
-        op->status.store(SUCCEEDED, std::memory_order_release);
-        prio_pop();
-
-    }
-
-    // pops the highest-priority item, saves copy
-    void internal_reserve(prio_operation *op) override {
-        if (this->my_reserved == true || this->my_tail == 0) {
-            op->status.store(FAILED, std::memory_order_release);
-            return;
-        }
-        this->my_reserved = true;
-        *(op->elem) = prio();
-#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
-        if (op->metainfo) {
-            *(op->metainfo) = std::move(prio_metainfo());
-            reserved_metainfo = *(op->metainfo);
-        }
-#endif
-        reserved_item = *(op->elem);
-        op->status.store(SUCCEEDED, std::memory_order_release);
-        prio_pop();
-    }
-
-    void internal_consume(prio_operation *op) override {
-        op->status.store(SUCCEEDED, std::memory_order_release);
-        this->my_reserved = false;
-        reserved_item = input_type();
 #if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
-        for (auto waiter : reserved_metainfo.waiters()) {
-            waiter->release(1);
-        }
+            private:
+                bool try_reserve(output_type& v, message_metainfo&) override { return try_reserve(v); }
+
+                bool try_get(output_type& v, message_metainfo&) override { return try_get(v); }
 
-        reserved_metainfo = message_metainfo{};
+            public:
 #endif
-    }
 
-    void internal_release(prio_operation *op) override {
-        op->status.store(SUCCEEDED, std::memory_order_release);
-        prio_push(reserved_item __TBB_FLOW_GRAPH_METAINFO_ARG(reserved_metainfo));
-        this->my_reserved = false;
-        reserved_item = input_type();
-#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
-        for (auto waiter : reserved_metainfo.waiters()) {
-            waiter->release(1);
-        }
-
-        reserved_metainfo = message_metainfo{};
-#endif
-    }
-
-private:
-    template<typename> friend class buffer_node;
-
-    void order() {
-        if (mark < this->my_tail) heapify();
-        __TBB_ASSERT(mark == this->my_tail, "mark unequal after heapify");
-    }
-
-    bool is_item_valid() {
-        return this->my_tail > 0;
-    }
-
-    void try_put_and_add_task(graph_task*& last_task) {
-        graph_task* new_task = this->my_successors.try_put_task(this->prio()
-                                                                __TBB_FLOW_GRAPH_METAINFO_ARG(this->prio_metainfo()));
-        if (new_task) {
-            // workaround for icc bug
-            graph& graph_ref = this->graph_reference();
-            last_task = combine_tasks(graph_ref, last_task, new_task);
-            prio_pop();
-        }
-    }
-
-private:
-    Compare compare;
-    size_type mark;
-
-    input_type reserved_item;
-#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
-    message_metainfo reserved_metainfo;
-#endif
-
-    // in case a reheap has not been done after a push, check if the mark item is higher than the 0'th item
-    bool prio_use_tail() {
-        __TBB_ASSERT(mark <= this->my_tail, "mark outside bounds before test");
-        return mark < this->my_tail && compare(this->get_my_item(0), this->get_my_item(this->my_tail - 1));
-    }
-
-    // prio_push: checks that the item will fit, expand array if necessary, put at end
-    void prio_push(const T &src __TBB_FLOW_GRAPH_METAINFO_ARG(const message_metainfo& metainfo)) {
-        if ( this->my_tail >= this->my_array_size )
-            this->grow_my_array( this->my_tail + 1 );
-        (void) this->place_item(this->my_tail, src __TBB_FLOW_GRAPH_METAINFO_ARG(metainfo));
-        ++(this->my_tail);
-        __TBB_ASSERT(mark < this->my_tail, "mark outside bounds after push");
-    }
-
-    // prio_pop: deletes highest priority item from the array, and if it is item
-    // 0, move last item to 0 and reheap.  If end of array, just destroy and decrement tail
-    // and mark.  Assumes the array has already been tested for emptiness; no failure.
-    void prio_pop()  {
-        if (prio_use_tail()) {
-            // there are newly pushed elements; last one higher than top
-            // copy the data
-            this->destroy_item(this->my_tail-1);
-            --(this->my_tail);
-            __TBB_ASSERT(mark <= this->my_tail, "mark outside bounds after pop");
-            return;
-        }
-        this->destroy_item(0);
-        if(this->my_tail > 1) {
-            // push the last element down heap
-            __TBB_ASSERT(this->my_item_valid(this->my_tail - 1), nullptr);
-            this->move_item(0,this->my_tail - 1);
-        }
-        --(this->my_tail);
-        if(mark > this->my_tail) --mark;
-        if (this->my_tail > 1) // don't reheap for heap of size 1
-            reheap();
-        __TBB_ASSERT(mark <= this->my_tail, "mark outside bounds after pop");
-    }
-
-    const T& prio() {
-        return this->get_my_item(prio_use_tail() ? this->my_tail-1 : 0);
-    }
+                //! Release a reserved item.
+                /** true = item has been released and so remains in sender, dest must request or reserve future items */
+                bool try_release() override {
+                    spin_mutex::scoped_lock lock(my_mutex);
+                    __TBB_ASSERT(my_reserved && my_has_cached_item, "releasing non-existent reservation");
+                    my_reserved = false;
+                    if (!my_successors.empty()) spawn_put();
+                    return true;
+                }
 
-#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
-    message_metainfo& prio_metainfo() {
-        return this->get_my_metainfo(prio_use_tail() ? this->my_tail-1 : 0);
-    }
-#endif
-
-    // turn array into heap
-    void heapify() {
-        if(this->my_tail == 0) {
-            mark = 0;
-            return;
-        }
-        if (!mark) mark = 1;
-        for (; mark<this->my_tail; ++mark) { // for each unheaped element
-            size_type cur_pos = mark;
-            input_type to_place;
-#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
-            message_metainfo metainfo;
-#endif
-            this->fetch_item(mark, to_place __TBB_FLOW_GRAPH_METAINFO_ARG(metainfo));
-            do { // push to_place up the heap
-                size_type parent = (cur_pos-1)>>1;
-                if (!compare(this->get_my_item(parent), to_place))
-                    break;
-                this->move_item(cur_pos, parent);
-                cur_pos = parent;
-            } while( cur_pos );
-            this->place_item(cur_pos, to_place __TBB_FLOW_GRAPH_METAINFO_ARG(std::move(metainfo)));
-        }
-    }
-
-    // otherwise heapified array with new root element; rearrange to heap
-    void reheap() {
-        size_type cur_pos=0, child=1;
-        while (child < mark) {
-            size_type target = child;
-            if (child+1<mark &&
-                compare(this->get_my_item(child),
-                        this->get_my_item(child+1)))
-                ++target;
-            // target now has the higher priority child
-            if (compare(this->get_my_item(target),
-                        this->get_my_item(cur_pos)))
-                break;
-            // swap
-            this->swap_items(cur_pos, target);
-            cur_pos = target;
-            child = (cur_pos<<1)+1;
-        }
-    }
-};  // priority_queue_node
-
-//! Forwards messages only if the threshold has not been reached
-/** This node forwards items until its threshold is reached.
-    It contains no buffering.  If the downstream node rejects, the
-    message is dropped. */
-template< typename T, typename DecrementType=continue_msg >
-class limiter_node : public graph_node, public receiver< T >, public sender< T > {
-public:
-    typedef T input_type;
-    typedef T output_type;
-    typedef typename receiver<input_type>::predecessor_type predecessor_type;
-    typedef typename sender<output_type>::successor_type successor_type;
-    //TODO: There is a lack of predefined types for its controlling "decrementer" port. It should be fixed later.
-
-private:
-    size_t my_threshold;
-    size_t my_count; // number of successful puts
-    size_t my_tries; // number of active put attempts
-    size_t my_future_decrement; // number of active decrement
-    reservable_predecessor_cache< T, spin_mutex > my_predecessors;
-    spin_mutex my_mutex;
-    broadcast_cache< T > my_successors;
-
-    //! The internal receiver< DecrementType > that adjusts the count
-    threshold_regulator< limiter_node<T, DecrementType>, DecrementType > decrement;
-
-    graph_task* decrement_counter( long long delta ) {
-        if ( delta > 0 && size_t(delta) > my_threshold ) {
-            delta = my_threshold;
-        }
-
-        {
-            spin_mutex::scoped_lock lock(my_mutex);
-            if ( delta > 0 && size_t(delta) > my_count ) {
-                if( my_tries > 0 ) {
-                    my_future_decrement += (size_t(delta) - my_count);
-                }
-                my_count = 0;
-            }
-            else if ( delta < 0 && size_t(-delta) > my_threshold - my_count ) {
-                my_count = my_threshold;
-            }
-            else {
-                my_count -= size_t(delta); // absolute value of delta is sufficiently small
-            }
-            __TBB_ASSERT(my_count <= my_threshold, "counter values are truncated to be inside the [0, threshold] interval");
-        }
-        return forward_task();
-    }
-
-    // Let threshold_regulator call decrement_counter()
-    friend class threshold_regulator< limiter_node<T, DecrementType>, DecrementType >;
-
-    friend class forward_task_bypass< limiter_node<T,DecrementType> >;
-
-    bool check_conditions() {  // always called under lock
-        return ( my_count + my_tries < my_threshold && !my_predecessors.empty() && !my_successors.empty() );
-    }
-
-    // only returns a valid task pointer or nullptr, never SUCCESSFULLY_ENQUEUED
-    graph_task* forward_task() {
-        input_type v;
-        graph_task* rval = nullptr;
-        bool reserved = false;
-
-        {
-            spin_mutex::scoped_lock lock(my_mutex);
-            if ( check_conditions() )
-                ++my_tries;
-            else
-                return nullptr;
-        }
-
-        //SUCCESS
-        // if we can reserve and can put, we consume the reservation
-        // we increment the count and decrement the tries
-#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
-        message_metainfo metainfo;
-#endif
-        if ( (my_predecessors.try_reserve(v __TBB_FLOW_GRAPH_METAINFO_ARG(metainfo))) == true ) {
-            reserved = true;
-            if ( (rval = my_successors.try_put_task(v __TBB_FLOW_GRAPH_METAINFO_ARG(metainfo))) != nullptr ) {
-                {
+                //! Consumes a reserved item
+                bool try_consume() override {
                     spin_mutex::scoped_lock lock(my_mutex);
-                    ++my_count;
-                    if ( my_future_decrement ) {
-                        if ( my_count > my_future_decrement ) {
-                            my_count -= my_future_decrement;
-                            my_future_decrement = 0;
-                        }
-                        else {
-                            my_future_decrement -= my_count;
-                            my_count = 0;
-                        }
+                    __TBB_ASSERT(my_reserved && my_has_cached_item, "consuming non-existent reservation");
+                    my_reserved = false;
+                    my_has_cached_item = false;
+                    if (!my_successors.empty()) { spawn_put(); }
+                    return true;
+                }
+
+                //! Activates a node that was created in the inactive state
+                void activate() {
+                    spin_mutex::scoped_lock lock(my_mutex);
+                    my_active = true;
+                    if (!my_successors.empty()) spawn_put();
+                }
+
+                template <typename Body>
+                Body copy_function_object() {
+                    input_body<output_type>& body_ref = *this->my_body;
+                    return dynamic_cast<input_body_leaf<output_type, Body>&>(body_ref).get_body();
+                }
+
+            protected:
+                //! resets the input_node to its initial state
+                void reset_node(reset_flags f) override {
+                    my_active = false;
+                    my_reserved = false;
+                    my_has_cached_item = false;
+
+                    if (f & rf_clear_edges) my_successors.clear();
+                    if (f & rf_reset_bodies) {
+                        input_body<output_type>* tmp = my_init_body->clone();
+                        delete my_body;
+                        my_body = tmp;
                     }
-                    --my_tries;
-                    my_predecessors.try_consume();
-                    if ( check_conditions() ) {
-                        if ( is_graph_active(this->my_graph) ) {
-                            typedef forward_task_bypass<limiter_node<T, DecrementType>> task_type;
-                            d1::small_object_allocator allocator{};
-                            graph_task* rtask = allocator.new_object<task_type>( my_graph, allocator, *this );
-                            spawn_in_graph_arena(graph_reference(), *rtask);
-                        }
+                }
+
+            private:
+                spin_mutex my_mutex;
+                bool my_active;
+                input_body<output_type>* my_body;
+                input_body<output_type>* my_init_body;
+                broadcast_cache<output_type> my_successors;
+                bool my_reserved;
+                bool my_has_cached_item;
+                output_type my_cached_item;
+
+                // used by apply_body_bypass, can invoke body of node.
+                bool try_reserve_apply_body(output_type& v) {
+                    spin_mutex::scoped_lock lock(my_mutex);
+                    if (my_reserved) { return false; }
+                    if (!my_has_cached_item) {
+                        d1::flow_control control;
+
+                        fgt_begin_body(my_body);
+
+                        my_cached_item = (*my_body)(control);
+                        my_has_cached_item = !control.is_pipeline_stopped;
+
+                        fgt_end_body(my_body);
+                    }
+                    if (my_has_cached_item) {
+                        v = my_cached_item;
+                        my_reserved = true;
+                        return true;
+                    } else {
+                        return false;
                     }
                 }
-                return rval;
-            }
-        }
-        //FAILURE
-        //if we can't reserve, we decrement the tries
-        //if we can reserve but can't put, we decrement the tries and release the reservation
-        {
-            spin_mutex::scoped_lock lock(my_mutex);
-            --my_tries;
-            if (reserved) my_predecessors.try_release();
-            if ( check_conditions() ) {
-                if ( is_graph_active(this->my_graph) ) {
-                    d1::small_object_allocator allocator{};
-                    typedef forward_task_bypass<limiter_node<T, DecrementType>> task_type;
+
+                graph_task* create_put_task() {
+                    d1::small_object_allocator allocator {};
+                    typedef input_node_task_bypass<input_node<output_type>> task_type;
                     graph_task* t = allocator.new_object<task_type>(my_graph, allocator, *this);
-                    __TBB_ASSERT(!rval, "Have two tasks to handle");
                     return t;
                 }
-            }
-            return rval;
-        }
-    }
-
-    void initialize() {
-        fgt_node(
-            CODEPTR(), FLOW_LIMITER_NODE, &this->my_graph,
-            static_cast<receiver<input_type> *>(this), static_cast<receiver<DecrementType> *>(&decrement),
-            static_cast<sender<output_type> *>(this)
-        );
-    }
-
-public:
-    //! Constructor
-    limiter_node(graph &g, size_t threshold)
-        : graph_node(g), my_threshold(threshold), my_count(0), my_tries(0), my_future_decrement(0),
-        my_predecessors(this), my_successors(this), decrement(this)
-    {
-        initialize();
-    }
 
-#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-    template <typename... Args>
-    limiter_node(const node_set<Args...>& nodes, size_t threshold)
-        : limiter_node(nodes.graph_reference(), threshold) {
-        make_edges_in_order(nodes, *this);
-    }
-#endif
-
-    //! Copy constructor
-    limiter_node( const limiter_node& src ) : limiter_node(src.my_graph, src.my_threshold) {}
-
-    //! The interface for accessing internal receiver< DecrementType > that adjusts the count
-    receiver<DecrementType>& decrementer() { return decrement; }
-
-    //! Replace the current successor with this new successor
-    bool register_successor( successor_type &r ) override {
-        spin_mutex::scoped_lock lock(my_mutex);
-        bool was_empty = my_successors.empty();
-        my_successors.register_successor(r);
-        //spawn a forward task if this is the only successor
-        if ( was_empty && !my_predecessors.empty() && my_count + my_tries < my_threshold ) {
-            if ( is_graph_active(this->my_graph) ) {
-                d1::small_object_allocator allocator{};
-                typedef forward_task_bypass<limiter_node<T, DecrementType>> task_type;
-                graph_task* t = allocator.new_object<task_type>(my_graph, allocator, *this);
-                spawn_in_graph_arena(graph_reference(), *t);
-            }
-        }
-        return true;
-    }
-
-    //! Removes a successor from this node
-    /** r.remove_predecessor(*this) is also called. */
-    bool remove_successor( successor_type &r ) override {
-        // TODO revamp: investigate why qualification is needed for remove_predecessor() call
-        tbb::detail::d2::remove_predecessor(r, *this);
-        my_successors.remove_successor(r);
-        return true;
-    }
-
-    //! Adds src to the list of cached predecessors.
-    bool register_predecessor( predecessor_type &src ) override {
-        spin_mutex::scoped_lock lock(my_mutex);
-        my_predecessors.add( src );
-        if ( my_count + my_tries < my_threshold && !my_successors.empty() && is_graph_active(this->my_graph) ) {
-            d1::small_object_allocator allocator{};
-            typedef forward_task_bypass<limiter_node<T, DecrementType>> task_type;
-            graph_task* t = allocator.new_object<task_type>(my_graph, allocator, *this);
-            spawn_in_graph_arena(graph_reference(), *t);
-        }
-        return true;
-    }
-
-    //! Removes src from the list of cached predecessors.
-    bool remove_predecessor( predecessor_type &src ) override {
-        my_predecessors.remove( src );
-        return true;
-    }
-
-protected:
-
-    template< typename R, typename B > friend class run_and_put_task;
-    template<typename X, typename Y> friend class broadcast_cache;
-    template<typename X, typename Y> friend class round_robin_cache;
-
-private:
-    //! Puts an item to this receiver
-    graph_task* try_put_task_impl( const T &t __TBB_FLOW_GRAPH_METAINFO_ARG(const message_metainfo& metainfo) ) {
-        {
-            spin_mutex::scoped_lock lock(my_mutex);
-            if ( my_count + my_tries >= my_threshold )
-                return nullptr;
-            else
-                ++my_tries;
-        }
-
-        graph_task* rtask = my_successors.try_put_task(t __TBB_FLOW_GRAPH_METAINFO_ARG(metainfo));
-        if ( !rtask ) {  // try_put_task failed.
-            spin_mutex::scoped_lock lock(my_mutex);
-            --my_tries;
-            if (check_conditions() && is_graph_active(this->my_graph)) {
-                d1::small_object_allocator allocator{};
-                typedef forward_task_bypass<limiter_node<T, DecrementType>> task_type;
-                rtask = allocator.new_object<task_type>(my_graph, allocator, *this);
-            }
-        }
-        else {
-            spin_mutex::scoped_lock lock(my_mutex);
-            ++my_count;
-            if ( my_future_decrement ) {
-                if ( my_count > my_future_decrement ) {
-                    my_count -= my_future_decrement;
-                    my_future_decrement = 0;
-                }
-                else {
-                    my_future_decrement -= my_count;
-                    my_count = 0;
+                //! Spawns a task that applies the body
+                void spawn_put() {
+                    if (is_graph_active(this->my_graph)) {
+                        spawn_in_graph_arena(this->my_graph, *create_put_task());
+                    }
                 }
-            }
-            --my_tries;
-        }
-        return rtask;
-    }
-
-protected:
-    graph_task* try_put_task(const T& t) override {
-        return try_put_task_impl(t __TBB_FLOW_GRAPH_METAINFO_ARG(message_metainfo{}));
-    }
-#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
-    graph_task* try_put_task(const T& t, const message_metainfo& metainfo) override {
-        return try_put_task_impl(t, metainfo);
-    }
-#endif
-
-    graph& graph_reference() const override { return my_graph; }
-
-    void reset_node( reset_flags f ) override {
-        my_count = 0;
-        if ( f & rf_clear_edges ) {
-            my_predecessors.clear();
-            my_successors.clear();
-        }
-        else {
-            my_predecessors.reset();
-        }
-        decrement.reset_receiver(f);
-    }
-};  // limiter_node
 
-#include "detail/_flow_graph_join_impl.h"
+                friend class input_node_task_bypass<input_node<output_type>>;
+                //! Applies the body.  Returning SUCCESSFULLY_ENQUEUED okay; forward_task_bypass will handle it.
+                graph_task* apply_body_bypass() {
+                    output_type v;
+                    if (!try_reserve_apply_body(v)) return nullptr;
+
+                    graph_task* last_task = my_successors.try_put_task(v);
+                    if (last_task) try_consume();
+                    else
+                        try_release();
+                    return last_task;
+                }
+            };// class input_node
+
+            //! Implements a function node that supports Input -> Output
+            template <typename Input, typename Output = continue_msg, typename Policy = queueing>
+            __TBB_requires(std::default_initializable<Input>&& std::copy_constructible<Input>&&
+                                   std::copy_constructible<Output>) class function_node
+                : public graph_node,
+                  public function_input<Input, Output, Policy, cache_aligned_allocator<Input>>,
+                  public function_output<Output> {
+                typedef cache_aligned_allocator<Input> internals_allocator;
+
+            public:
+                typedef Input input_type;
+                typedef Output output_type;
+                typedef function_input<input_type, output_type, Policy, internals_allocator> input_impl_type;
+                typedef function_input_queue<input_type, internals_allocator> input_queue_type;
+                typedef function_output<output_type> fOutput_type;
+                typedef typename input_impl_type::predecessor_type predecessor_type;
+                typedef typename fOutput_type::successor_type successor_type;
+
+                using input_impl_type::my_predecessors;
+
+                //! Constructor
+                // input_queue_type is allocated here, but destroyed in the function_input_base.
+                // TODO: pass the graph_buffer_policy to the function_input_base so it can all
+                // be done in one place.  This would be an interface-breaking change.
+                template <typename Body>
+                __TBB_requires(function_node_body<Body, Input, Output>) __TBB_NOINLINE_SYM
+                        function_node(graph& g, size_t concurrency, Body body, Policy = Policy(),
+                                      node_priority_t a_priority = no_priority)
+                    : graph_node(g), input_impl_type(g, concurrency, body, a_priority), fOutput_type(g) {
+                    fgt_node_with_body(CODEPTR(), FLOW_FUNCTION_NODE, &this->my_graph,
+                                       static_cast<receiver<input_type>*>(this),
+                                       static_cast<sender<output_type>*>(this), this->my_body);
+                }
 
-template<typename OutputTuple, typename JP=queueing> class join_node;
-
-template<typename OutputTuple>
-class join_node<OutputTuple,reserving>: public unfolded_join_node<std::tuple_size<OutputTuple>::value, reserving_port, OutputTuple, reserving> {
-private:
-    static const int N = std::tuple_size<OutputTuple>::value;
-    typedef unfolded_join_node<N, reserving_port, OutputTuple, reserving> unfolded_type;
-public:
-    typedef OutputTuple output_type;
-    typedef typename unfolded_type::input_ports_type input_ports_type;
-     __TBB_NOINLINE_SYM explicit join_node(graph &g) : unfolded_type(g) {
-        fgt_multiinput_node<N>( CODEPTR(), FLOW_JOIN_NODE_RESERVING, &this->my_graph,
-                                            this->input_ports(), static_cast< sender< output_type > *>(this) );
-    }
+                template <typename Body>
+                __TBB_requires(function_node_body<Body, Input, Output>)
+                        function_node(graph& g, size_t concurrency, Body body, node_priority_t a_priority)
+                    : function_node(g, concurrency, body, Policy(), a_priority) {}
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-    template <typename... Args>
-    __TBB_NOINLINE_SYM join_node(const node_set<Args...>& nodes, reserving = reserving()) : join_node(nodes.graph_reference()) {
-        make_edges_in_order(nodes, *this);
-    }
-#endif
-
-    __TBB_NOINLINE_SYM join_node(const join_node &other) : unfolded_type(other) {
-        fgt_multiinput_node<N>( CODEPTR(), FLOW_JOIN_NODE_RESERVING, &this->my_graph,
-                                            this->input_ports(), static_cast< sender< output_type > *>(this) );
-    }
-
-};
-
-template<typename OutputTuple>
-class join_node<OutputTuple,queueing>: public unfolded_join_node<std::tuple_size<OutputTuple>::value, queueing_port, OutputTuple, queueing> {
-private:
-    static const int N = std::tuple_size<OutputTuple>::value;
-    typedef unfolded_join_node<N, queueing_port, OutputTuple, queueing> unfolded_type;
-public:
-    typedef OutputTuple output_type;
-    typedef typename unfolded_type::input_ports_type input_ports_type;
-     __TBB_NOINLINE_SYM explicit join_node(graph &g) : unfolded_type(g) {
-        fgt_multiinput_node<N>( CODEPTR(), FLOW_JOIN_NODE_QUEUEING, &this->my_graph,
-                                            this->input_ports(), static_cast< sender< output_type > *>(this) );
-    }
+                template <typename Body, typename... Args>
+                __TBB_requires(function_node_body<Body, Input, Output>)
+                        function_node(const node_set<Args...>& nodes, size_t concurrency, Body body,
+                                      Policy p = Policy(), node_priority_t a_priority = no_priority)
+                    : function_node(nodes.graph_reference(), concurrency, body, p, a_priority) {
+                    make_edges_in_order(nodes, *this);
+                }
 
-#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-    template <typename... Args>
-    __TBB_NOINLINE_SYM join_node(const node_set<Args...>& nodes, queueing = queueing()) : join_node(nodes.graph_reference()) {
-        make_edges_in_order(nodes, *this);
-    }
-#endif
+                template <typename Body, typename... Args>
+                __TBB_requires(function_node_body<Body, Input, Output>)
+                        function_node(const node_set<Args...>& nodes, size_t concurrency, Body body,
+                                      node_priority_t a_priority)
+                    : function_node(nodes, concurrency, body, Policy(), a_priority) {}
+#endif// __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+
+                //! Copy constructor
+                __TBB_NOINLINE_SYM function_node(const function_node& src)
+                    : graph_node(src.my_graph), input_impl_type(src), fOutput_type(src.my_graph) {
+                    fgt_node_with_body(CODEPTR(), FLOW_FUNCTION_NODE, &this->my_graph,
+                                       static_cast<receiver<input_type>*>(this),
+                                       static_cast<sender<output_type>*>(this), this->my_body);
+                }
 
-    __TBB_NOINLINE_SYM join_node(const join_node &other) : unfolded_type(other) {
-        fgt_multiinput_node<N>( CODEPTR(), FLOW_JOIN_NODE_QUEUEING, &this->my_graph,
-                                            this->input_ports(), static_cast< sender< output_type > *>(this) );
-    }
+            protected:
+                template <typename R, typename B>
+                friend class run_and_put_task;
+                template <typename X, typename Y>
+                friend class broadcast_cache;
+                template <typename X, typename Y>
+                friend class round_robin_cache;
+                using input_impl_type::try_put_task;
+
+                broadcast_cache<output_type>& successors() override { return fOutput_type::my_successors; }
+
+                void reset_node(reset_flags f) override {
+                    input_impl_type::reset_function_input(f);
+                    // TODO: use clear() instead.
+                    if (f & rf_clear_edges) {
+                        successors().clear();
+                        my_predecessors.clear();
+                    }
+                    __TBB_ASSERT(!(f & rf_clear_edges) || successors().empty(),
+                                 "function_node successors not empty");
+                    __TBB_ASSERT(this->my_predecessors.empty(), "function_node predecessors not empty");
+                }
 
-};
+            };// class function_node
+
+            //! implements a function node that supports Input -> (set of outputs)
+            // Output is a tuple of output types.
+            template <typename Input, typename Output, typename Policy = queueing>
+            __TBB_requires(std::default_initializable<Input>&&
+                                   std::copy_constructible<Input>) class multifunction_node
+                : public graph_node,
+                  public multifunction_input<
+                          Input,
+                          typename wrap_tuple_elements<std::tuple_size<Output>::value,// #elements in tuple
+                                                       multifunction_output,// wrap this around each element
+                                                       Output               // the tuple providing the types
+                                                       >::type,
+                          Policy, cache_aligned_allocator<Input>> {
+                typedef cache_aligned_allocator<Input> internals_allocator;
+
+            protected:
+                static const int N = std::tuple_size<Output>::value;
+
+            public:
+                typedef Input input_type;
+                typedef null_type output_type;
+                typedef typename wrap_tuple_elements<N, multifunction_output, Output>::type output_ports_type;
+                typedef multifunction_input<input_type, output_ports_type, Policy, internals_allocator>
+                        input_impl_type;
+                typedef function_input_queue<input_type, internals_allocator> input_queue_type;
+
+            private:
+                using input_impl_type::my_predecessors;
+
+            public:
+                template <typename Body>
+                __TBB_requires(multifunction_node_body<Body, Input, output_ports_type>) __TBB_NOINLINE_SYM
+                        multifunction_node(graph& g, size_t concurrency, Body body, Policy = Policy(),
+                                           node_priority_t a_priority = no_priority)
+                    : graph_node(g), input_impl_type(g, concurrency, body, a_priority) {
+                    fgt_multioutput_node_with_body<N>(CODEPTR(), FLOW_MULTIFUNCTION_NODE, &this->my_graph,
+                                                      static_cast<receiver<input_type>*>(this),
+                                                      this->output_ports(), this->my_body);
+                }
 
-#if __TBB_CPP20_CONCEPTS_PRESENT
-// Helper function which is well-formed only if all of the elements in OutputTuple
-// satisfies join_node_function_object<body[i], tuple[i], K>
-template <typename OutputTuple, typename K,
-          typename... Functions, std::size_t... Idx>
-void join_node_function_objects_helper( std::index_sequence<Idx...> )
-    requires (std::tuple_size_v<OutputTuple> == sizeof...(Functions)) &&
-             (... && join_node_function_object<Functions, std::tuple_element_t<Idx, OutputTuple>, K>);
-
-template <typename OutputTuple, typename K, typename... Functions>
-concept join_node_functions = requires {
-    join_node_function_objects_helper<OutputTuple, K, Functions...>(std::make_index_sequence<sizeof...(Functions)>{});
-};
-
-#endif
-
-// template for key_matching join_node
-// tag_matching join_node is a specialization of key_matching, and is source-compatible.
-template<typename OutputTuple, typename K, typename KHash>
-class join_node<OutputTuple, key_matching<K, KHash> > : public unfolded_join_node<std::tuple_size<OutputTuple>::value,
-      key_matching_port, OutputTuple, key_matching<K,KHash> > {
-private:
-    static const int N = std::tuple_size<OutputTuple>::value;
-    typedef unfolded_join_node<N, key_matching_port, OutputTuple, key_matching<K,KHash> > unfolded_type;
-public:
-    typedef OutputTuple output_type;
-    typedef typename unfolded_type::input_ports_type input_ports_type;
+                template <typename Body>
+                __TBB_requires(multifunction_node_body<Body, Input, output_ports_type>) __TBB_NOINLINE_SYM
+                        multifunction_node(graph& g, size_t concurrency, Body body,
+                                           node_priority_t a_priority)
+                    : multifunction_node(g, concurrency, body, Policy(), a_priority) {}
 
-#if __TBB_PREVIEW_MESSAGE_BASED_KEY_MATCHING
-    join_node(graph &g) : unfolded_type(g) {}
-#endif  /* __TBB_PREVIEW_MESSAGE_BASED_KEY_MATCHING */
-
-    template<typename __TBB_B0, typename __TBB_B1>
-        __TBB_requires(join_node_functions<OutputTuple, K, __TBB_B0, __TBB_B1>)
-     __TBB_NOINLINE_SYM join_node(graph &g, __TBB_B0 b0, __TBB_B1 b1) : unfolded_type(g, b0, b1) {
-        fgt_multiinput_node<N>( CODEPTR(), FLOW_JOIN_NODE_TAG_MATCHING, &this->my_graph,
-                                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
-    }
-    template<typename __TBB_B0, typename __TBB_B1, typename __TBB_B2>
-        __TBB_requires(join_node_functions<OutputTuple, K, __TBB_B0, __TBB_B1, __TBB_B2>)
-     __TBB_NOINLINE_SYM join_node(graph &g, __TBB_B0 b0, __TBB_B1 b1, __TBB_B2 b2) : unfolded_type(g, b0, b1, b2) {
-        fgt_multiinput_node<N>( CODEPTR(), FLOW_JOIN_NODE_TAG_MATCHING, &this->my_graph,
-                                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
-    }
-    template<typename __TBB_B0, typename __TBB_B1, typename __TBB_B2, typename __TBB_B3>
-        __TBB_requires(join_node_functions<OutputTuple, K, __TBB_B0, __TBB_B1, __TBB_B2, __TBB_B3>)
-     __TBB_NOINLINE_SYM join_node(graph &g, __TBB_B0 b0, __TBB_B1 b1, __TBB_B2 b2, __TBB_B3 b3) : unfolded_type(g, b0, b1, b2, b3) {
-        fgt_multiinput_node<N>( CODEPTR(), FLOW_JOIN_NODE_TAG_MATCHING, &this->my_graph,
-                                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
-    }
-    template<typename __TBB_B0, typename __TBB_B1, typename __TBB_B2, typename __TBB_B3, typename __TBB_B4>
-        __TBB_requires(join_node_functions<OutputTuple, K, __TBB_B0, __TBB_B1, __TBB_B2, __TBB_B3, __TBB_B4>)
-     __TBB_NOINLINE_SYM join_node(graph &g, __TBB_B0 b0, __TBB_B1 b1, __TBB_B2 b2, __TBB_B3 b3, __TBB_B4 b4) :
-            unfolded_type(g, b0, b1, b2, b3, b4) {
-        fgt_multiinput_node<N>( CODEPTR(), FLOW_JOIN_NODE_TAG_MATCHING, &this->my_graph,
-                                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
-    }
-#if __TBB_VARIADIC_MAX >= 6
-    template<typename __TBB_B0, typename __TBB_B1, typename __TBB_B2, typename __TBB_B3, typename __TBB_B4,
-        typename __TBB_B5>
-        __TBB_requires(join_node_functions<OutputTuple, K, __TBB_B0, __TBB_B1, __TBB_B2, __TBB_B3, __TBB_B4, __TBB_B5>)
-     __TBB_NOINLINE_SYM join_node(graph &g, __TBB_B0 b0, __TBB_B1 b1, __TBB_B2 b2, __TBB_B3 b3, __TBB_B4 b4, __TBB_B5 b5) :
-            unfolded_type(g, b0, b1, b2, b3, b4, b5) {
-        fgt_multiinput_node<N>( CODEPTR(), FLOW_JOIN_NODE_TAG_MATCHING, &this->my_graph,
-                                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
-    }
-#endif
-#if __TBB_VARIADIC_MAX >= 7
-    template<typename __TBB_B0, typename __TBB_B1, typename __TBB_B2, typename __TBB_B3, typename __TBB_B4,
-        typename __TBB_B5, typename __TBB_B6>
-        __TBB_requires(join_node_functions<OutputTuple, K, __TBB_B0, __TBB_B1, __TBB_B2, __TBB_B3, __TBB_B4, __TBB_B5, __TBB_B6>)
-     __TBB_NOINLINE_SYM join_node(graph &g, __TBB_B0 b0, __TBB_B1 b1, __TBB_B2 b2, __TBB_B3 b3, __TBB_B4 b4, __TBB_B5 b5, __TBB_B6 b6) :
-            unfolded_type(g, b0, b1, b2, b3, b4, b5, b6) {
-        fgt_multiinput_node<N>( CODEPTR(), FLOW_JOIN_NODE_TAG_MATCHING, &this->my_graph,
-                                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
-    }
-#endif
-#if __TBB_VARIADIC_MAX >= 8
-    template<typename __TBB_B0, typename __TBB_B1, typename __TBB_B2, typename __TBB_B3, typename __TBB_B4,
-        typename __TBB_B5, typename __TBB_B6, typename __TBB_B7>
-        __TBB_requires(join_node_functions<OutputTuple, K, __TBB_B0, __TBB_B1, __TBB_B2, __TBB_B3, __TBB_B4, __TBB_B5, __TBB_B6, __TBB_B7>)
-     __TBB_NOINLINE_SYM join_node(graph &g, __TBB_B0 b0, __TBB_B1 b1, __TBB_B2 b2, __TBB_B3 b3, __TBB_B4 b4, __TBB_B5 b5, __TBB_B6 b6,
-            __TBB_B7 b7) : unfolded_type(g, b0, b1, b2, b3, b4, b5, b6, b7) {
-        fgt_multiinput_node<N>( CODEPTR(), FLOW_JOIN_NODE_TAG_MATCHING, &this->my_graph,
-                                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
-    }
-#endif
-#if __TBB_VARIADIC_MAX >= 9
-    template<typename __TBB_B0, typename __TBB_B1, typename __TBB_B2, typename __TBB_B3, typename __TBB_B4,
-        typename __TBB_B5, typename __TBB_B6, typename __TBB_B7, typename __TBB_B8>
-        __TBB_requires(join_node_functions<OutputTuple, K, __TBB_B0, __TBB_B1, __TBB_B2, __TBB_B3, __TBB_B4, __TBB_B5, __TBB_B6, __TBB_B7, __TBB_B8>)
-     __TBB_NOINLINE_SYM join_node(graph &g, __TBB_B0 b0, __TBB_B1 b1, __TBB_B2 b2, __TBB_B3 b3, __TBB_B4 b4, __TBB_B5 b5, __TBB_B6 b6,
-            __TBB_B7 b7, __TBB_B8 b8) : unfolded_type(g, b0, b1, b2, b3, b4, b5, b6, b7, b8) {
-        fgt_multiinput_node<N>( CODEPTR(), FLOW_JOIN_NODE_TAG_MATCHING, &this->my_graph,
-                                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
-    }
-#endif
-#if __TBB_VARIADIC_MAX >= 10
-    template<typename __TBB_B0, typename __TBB_B1, typename __TBB_B2, typename __TBB_B3, typename __TBB_B4,
-        typename __TBB_B5, typename __TBB_B6, typename __TBB_B7, typename __TBB_B8, typename __TBB_B9>
-        __TBB_requires(join_node_functions<OutputTuple, K, __TBB_B0, __TBB_B1, __TBB_B2, __TBB_B3, __TBB_B4, __TBB_B5, __TBB_B6, __TBB_B7, __TBB_B8, __TBB_B9>)
-     __TBB_NOINLINE_SYM join_node(graph &g, __TBB_B0 b0, __TBB_B1 b1, __TBB_B2 b2, __TBB_B3 b3, __TBB_B4 b4, __TBB_B5 b5, __TBB_B6 b6,
-            __TBB_B7 b7, __TBB_B8 b8, __TBB_B9 b9) : unfolded_type(g, b0, b1, b2, b3, b4, b5, b6, b7, b8, b9) {
-        fgt_multiinput_node<N>( CODEPTR(), FLOW_JOIN_NODE_TAG_MATCHING, &this->my_graph,
-                                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
-    }
-#endif
+#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+                template <typename Body, typename... Args>
+                __TBB_requires(multifunction_node_body<Body, Input, output_ports_type>) __TBB_NOINLINE_SYM
+                        multifunction_node(const node_set<Args...>& nodes, size_t concurrency, Body body,
+                                           Policy p = Policy(), node_priority_t a_priority = no_priority)
+                    : multifunction_node(nodes.graph_reference(), concurrency, body, p, a_priority) {
+                    make_edges_in_order(nodes, *this);
+                }
+
+                template <typename Body, typename... Args>
+                __TBB_requires(multifunction_node_body<Body, Input, output_ports_type>) __TBB_NOINLINE_SYM
+                        multifunction_node(const node_set<Args...>& nodes, size_t concurrency, Body body,
+                                           node_priority_t a_priority)
+                    : multifunction_node(nodes, concurrency, body, Policy(), a_priority) {}
+#endif// __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+
+                __TBB_NOINLINE_SYM multifunction_node(const multifunction_node& other)
+                    : graph_node(other.my_graph), input_impl_type(other) {
+                    fgt_multioutput_node_with_body<N>(CODEPTR(), FLOW_MULTIFUNCTION_NODE, &this->my_graph,
+                                                      static_cast<receiver<input_type>*>(this),
+                                                      this->output_ports(), this->my_body);
+                }
+
+                // all the guts are in multifunction_input...
+            protected:
+                void reset_node(reset_flags f) override { input_impl_type::reset(f); }
+            };// multifunction_node
+
+            //! split_node: accepts a tuple as input, forwards each element of the tuple to its
+            //  successors.  The node has unlimited concurrency, so it does not reject inputs.
+            template <typename TupleType>
+            class split_node : public graph_node, public receiver<TupleType> {
+                static const int N = std::tuple_size<TupleType>::value;
+                typedef receiver<TupleType> base_type;
+
+            public:
+                typedef TupleType input_type;
+                typedef typename wrap_tuple_elements<N,                   // #elements in tuple
+                                                     multifunction_output,// wrap this around each element
+                                                     TupleType            // the tuple providing the types
+                                                     >::type output_ports_type;
+
+                __TBB_NOINLINE_SYM explicit split_node(graph& g)
+                    : graph_node(g),
+                      my_output_ports(init_output_ports<output_ports_type>::call(g, my_output_ports)) {
+                    fgt_multioutput_node<N>(CODEPTR(), FLOW_SPLIT_NODE, &this->my_graph,
+                                            static_cast<receiver<input_type>*>(this), this->output_ports());
+                }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-    template <
-#if (__clang_major__ == 3 && __clang_minor__ == 4)
-        // clang 3.4 misdeduces 'Args...' for 'node_set' while it can cope with template template parameter.
-        template<typename...> class node_set,
+                template <typename... Args>
+                __TBB_NOINLINE_SYM split_node(const node_set<Args...>& nodes)
+                    : split_node(nodes.graph_reference()) {
+                    make_edges_in_order(nodes, *this);
+                }
 #endif
-        typename... Args, typename... Bodies
-    >
-    __TBB_requires((sizeof...(Bodies) == 0) || join_node_functions<OutputTuple, K, Bodies...>)
-    __TBB_NOINLINE_SYM join_node(const node_set<Args...>& nodes, Bodies... bodies)
-        : join_node(nodes.graph_reference(), bodies...) {
-        make_edges_in_order(nodes, *this);
-    }
-#endif // __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 
-    __TBB_NOINLINE_SYM join_node(const join_node &other) : unfolded_type(other) {
-        fgt_multiinput_node<N>( CODEPTR(), FLOW_JOIN_NODE_TAG_MATCHING, &this->my_graph,
-                                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
-    }
+                __TBB_NOINLINE_SYM split_node(const split_node& other)
+                    : graph_node(other.my_graph), base_type(other),
+                      my_output_ports(
+                              init_output_ports<output_ports_type>::call(other.my_graph, my_output_ports)) {
+                    fgt_multioutput_node<N>(CODEPTR(), FLOW_SPLIT_NODE, &this->my_graph,
+                                            static_cast<receiver<input_type>*>(this), this->output_ports());
+                }
 
-};
+                output_ports_type& output_ports() { return my_output_ports; }
 
-// indexer node
-#include "detail/_flow_graph_indexer_impl.h"
+            protected:
+                graph_task* try_put_task(const TupleType& t) override {
+                    // Sending split messages in parallel is not justified, as overheads would prevail.
+                    // Also, we do not have successors here. So we just tell the task returned here is successful.
+                    return emit_element<N>::emit_this(this->my_graph, t, output_ports());
+                }
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+                graph_task* try_put_task(const TupleType& t, const message_metainfo& metainfo) override {
+                    // Sending split messages in parallel is not justified, as overheads would prevail.
+                    // Also, we do not have successors here. So we just tell the task returned here is successful.
+                    return emit_element<N>::emit_this(this->my_graph, t, output_ports(), metainfo);
+                }
+#endif
 
-// TODO: Implement interface with variadic template or tuple
-template<typename T0, typename T1=null_type, typename T2=null_type, typename T3=null_type,
-                      typename T4=null_type, typename T5=null_type, typename T6=null_type,
-                      typename T7=null_type, typename T8=null_type, typename T9=null_type> class indexer_node;
-
-//indexer node specializations
-template<typename T0>
-class indexer_node<T0> : public unfolded_indexer_node<std::tuple<T0> > {
-private:
-    static const int N = 1;
-public:
-    typedef std::tuple<T0> InputTuple;
-    typedef tagged_msg<size_t, T0> output_type;
-    typedef unfolded_indexer_node<InputTuple> unfolded_type;
-    __TBB_NOINLINE_SYM indexer_node(graph& g) : unfolded_type(g) {
-        fgt_multiinput_node<N>( CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph,
-                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
-    }
+                void reset_node(reset_flags f) override {
+                    if (f & rf_clear_edges) clear_element<N>::clear_this(my_output_ports);
 
-#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-    template <typename... Args>
-    indexer_node(const node_set<Args...>& nodes) : indexer_node(nodes.graph_reference()) {
-        make_edges_in_order(nodes, *this);
-    }
-#endif
-
-    // Copy constructor
-    __TBB_NOINLINE_SYM indexer_node( const indexer_node& other ) : unfolded_type(other) {
-        fgt_multiinput_node<N>( CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph,
-                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
-    }
-};
-
-template<typename T0, typename T1>
-class indexer_node<T0, T1> : public unfolded_indexer_node<std::tuple<T0, T1> > {
-private:
-    static const int N = 2;
-public:
-    typedef std::tuple<T0, T1> InputTuple;
-    typedef tagged_msg<size_t, T0, T1> output_type;
-    typedef unfolded_indexer_node<InputTuple> unfolded_type;
-    __TBB_NOINLINE_SYM indexer_node(graph& g) : unfolded_type(g) {
-        fgt_multiinput_node<N>( CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph,
-                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
-    }
+                    __TBB_ASSERT(!(f & rf_clear_edges) || clear_element<N>::this_empty(my_output_ports),
+                                 "split_node reset failed");
+                }
+                graph& graph_reference() const override { return my_graph; }
+
+            private:
+                output_ports_type my_output_ports;
+            };
+
+            //! Implements an executable node that supports continue_msg -> Output
+            template <typename Output, typename Policy = Policy<void>>
+            __TBB_requires(std::copy_constructible<Output>) class continue_node
+                : public graph_node,
+                  public continue_input<Output, Policy>,
+                  public function_output<Output> {
+            public:
+                typedef continue_msg input_type;
+                typedef Output output_type;
+                typedef continue_input<Output, Policy> input_impl_type;
+                typedef function_output<output_type> fOutput_type;
+                typedef typename input_impl_type::predecessor_type predecessor_type;
+                typedef typename fOutput_type::successor_type successor_type;
+
+                //! Constructor for executable node with continue_msg -> Output
+                template <typename Body>
+                __TBB_requires(continue_node_body<Body, Output>) __TBB_NOINLINE_SYM
+                        continue_node(graph& g, Body body, Policy = Policy(),
+                                      node_priority_t a_priority = no_priority)
+                    : graph_node(g), input_impl_type(g, body, a_priority), fOutput_type(g) {
+                    fgt_node_with_body(CODEPTR(), FLOW_CONTINUE_NODE, &this->my_graph,
+
+                                       static_cast<receiver<input_type>*>(this),
+                                       static_cast<sender<output_type>*>(this), this->my_body);
+                }
 
-#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-    template <typename... Args>
-    indexer_node(const node_set<Args...>& nodes) : indexer_node(nodes.graph_reference()) {
-        make_edges_in_order(nodes, *this);
-    }
-#endif
-
-    // Copy constructor
-    __TBB_NOINLINE_SYM indexer_node( const indexer_node& other ) : unfolded_type(other) {
-        fgt_multiinput_node<N>( CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph,
-                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
-    }
-
-};
-
-template<typename T0, typename T1, typename T2>
-class indexer_node<T0, T1, T2> : public unfolded_indexer_node<std::tuple<T0, T1, T2> > {
-private:
-    static const int N = 3;
-public:
-    typedef std::tuple<T0, T1, T2> InputTuple;
-    typedef tagged_msg<size_t, T0, T1, T2> output_type;
-    typedef unfolded_indexer_node<InputTuple> unfolded_type;
-    __TBB_NOINLINE_SYM indexer_node(graph& g) : unfolded_type(g) {
-        fgt_multiinput_node<N>( CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph,
-                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
-    }
+                template <typename Body>
+                __TBB_requires(continue_node_body<Body, Output>)
+                        continue_node(graph& g, Body body, node_priority_t a_priority)
+                    : continue_node(g, body, Policy(), a_priority) {}
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-    template <typename... Args>
-    indexer_node(const node_set<Args...>& nodes) : indexer_node(nodes.graph_reference()) {
-        make_edges_in_order(nodes, *this);
-    }
-#endif
-
-    // Copy constructor
-    __TBB_NOINLINE_SYM indexer_node( const indexer_node& other ) : unfolded_type(other) {
-        fgt_multiinput_node<N>( CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph,
-                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
-    }
-
-};
-
-template<typename T0, typename T1, typename T2, typename T3>
-class indexer_node<T0, T1, T2, T3> : public unfolded_indexer_node<std::tuple<T0, T1, T2, T3> > {
-private:
-    static const int N = 4;
-public:
-    typedef std::tuple<T0, T1, T2, T3> InputTuple;
-    typedef tagged_msg<size_t, T0, T1, T2, T3> output_type;
-    typedef unfolded_indexer_node<InputTuple> unfolded_type;
-    __TBB_NOINLINE_SYM indexer_node(graph& g) : unfolded_type(g) {
-        fgt_multiinput_node<N>( CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph,
-                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
-    }
+                template <typename Body, typename... Args>
+                __TBB_requires(continue_node_body<Body, Output>)
+                        continue_node(const node_set<Args...>& nodes, Body body, Policy p = Policy(),
+                                      node_priority_t a_priority = no_priority)
+                    : continue_node(nodes.graph_reference(), body, p, a_priority) {
+                    make_edges_in_order(nodes, *this);
+                }
+                template <typename Body, typename... Args>
+                __TBB_requires(continue_node_body<Body, Output>)
+                        continue_node(const node_set<Args...>& nodes, Body body, node_priority_t a_priority)
+                    : continue_node(nodes, body, Policy(), a_priority) {}
+#endif// __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+
+                //! Constructor for executable node with continue_msg -> Output
+                template <typename Body>
+                __TBB_requires(continue_node_body<Body, Output>) __TBB_NOINLINE_SYM
+                        continue_node(graph& g, int number_of_predecessors, Body body, Policy = Policy(),
+                                      node_priority_t a_priority = no_priority)
+                    : graph_node(g), input_impl_type(g, number_of_predecessors, body, a_priority),
+                      fOutput_type(g) {
+                    fgt_node_with_body(CODEPTR(), FLOW_CONTINUE_NODE, &this->my_graph,
+                                       static_cast<receiver<input_type>*>(this),
+                                       static_cast<sender<output_type>*>(this), this->my_body);
+                }
 
-#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-    template <typename... Args>
-    indexer_node(const node_set<Args...>& nodes) : indexer_node(nodes.graph_reference()) {
-        make_edges_in_order(nodes, *this);
-    }
-#endif
-
-    // Copy constructor
-    __TBB_NOINLINE_SYM indexer_node( const indexer_node& other ) : unfolded_type(other) {
-        fgt_multiinput_node<N>( CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph,
-                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
-    }
-
-};
-
-template<typename T0, typename T1, typename T2, typename T3, typename T4>
-class indexer_node<T0, T1, T2, T3, T4> : public unfolded_indexer_node<std::tuple<T0, T1, T2, T3, T4> > {
-private:
-    static const int N = 5;
-public:
-    typedef std::tuple<T0, T1, T2, T3, T4> InputTuple;
-    typedef tagged_msg<size_t, T0, T1, T2, T3, T4> output_type;
-    typedef unfolded_indexer_node<InputTuple> unfolded_type;
-    __TBB_NOINLINE_SYM indexer_node(graph& g) : unfolded_type(g) {
-        fgt_multiinput_node<N>( CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph,
-                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
-    }
+                template <typename Body>
+                __TBB_requires(continue_node_body<Body, Output>)
+                        continue_node(graph& g, int number_of_predecessors, Body body,
+                                      node_priority_t a_priority)
+                    : continue_node(g, number_of_predecessors, body, Policy(), a_priority) {}
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-    template <typename... Args>
-    indexer_node(const node_set<Args...>& nodes) : indexer_node(nodes.graph_reference()) {
-        make_edges_in_order(nodes, *this);
-    }
-#endif
+                template <typename Body, typename... Args>
+                __TBB_requires(continue_node_body<Body, Output>)
+                        continue_node(const node_set<Args...>& nodes, int number_of_predecessors, Body body,
+                                      Policy p = Policy(), node_priority_t a_priority = no_priority)
+                    : continue_node(nodes.graph_reference(), number_of_predecessors, body, p, a_priority) {
+                    make_edges_in_order(nodes, *this);
+                }
 
-    // Copy constructor
-    __TBB_NOINLINE_SYM indexer_node( const indexer_node& other ) : unfolded_type(other) {
-        fgt_multiinput_node<N>( CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph,
-                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
-    }
+                template <typename Body, typename... Args>
+                __TBB_requires(continue_node_body<Body, Output>)
+                        continue_node(const node_set<Args...>& nodes, int number_of_predecessors, Body body,
+                                      node_priority_t a_priority)
+                    : continue_node(nodes, number_of_predecessors, body, Policy(), a_priority) {}
+#endif
 
-};
+                //! Copy constructor
+                __TBB_NOINLINE_SYM continue_node(const continue_node& src)
+                    : graph_node(src.my_graph), input_impl_type(src), function_output<Output>(src.my_graph) {
+                    fgt_node_with_body(CODEPTR(), FLOW_CONTINUE_NODE, &this->my_graph,
+                                       static_cast<receiver<input_type>*>(this),
+                                       static_cast<sender<output_type>*>(this), this->my_body);
+                }
 
-#if __TBB_VARIADIC_MAX >= 6
-template<typename T0, typename T1, typename T2, typename T3, typename T4, typename T5>
-class indexer_node<T0, T1, T2, T3, T4, T5> : public unfolded_indexer_node<std::tuple<T0, T1, T2, T3, T4, T5> > {
-private:
-    static const int N = 6;
-public:
-    typedef std::tuple<T0, T1, T2, T3, T4, T5> InputTuple;
-    typedef tagged_msg<size_t, T0, T1, T2, T3, T4, T5> output_type;
-    typedef unfolded_indexer_node<InputTuple> unfolded_type;
-    __TBB_NOINLINE_SYM indexer_node(graph& g) : unfolded_type(g) {
-        fgt_multiinput_node<N>( CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph,
-                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
-    }
+            protected:
+                template <typename R, typename B>
+                friend class run_and_put_task;
+                template <typename X, typename Y>
+                friend class broadcast_cache;
+                template <typename X, typename Y>
+                friend class round_robin_cache;
+                using input_impl_type::try_put_task;
+                broadcast_cache<output_type>& successors() override { return fOutput_type::my_successors; }
+
+                void reset_node(reset_flags f) override {
+                    input_impl_type::reset_receiver(f);
+                    if (f & rf_clear_edges) successors().clear();
+                    __TBB_ASSERT(!(f & rf_clear_edges) || successors().empty(), "continue_node not reset");
+                }
+            };// continue_node
+
+            //! Forwards messages of type T to all successors
+            template <typename T>
+            class broadcast_node : public graph_node, public receiver<T>, public sender<T> {
+            public:
+                typedef T input_type;
+                typedef T output_type;
+                typedef typename receiver<input_type>::predecessor_type predecessor_type;
+                typedef typename sender<output_type>::successor_type successor_type;
+
+            private:
+                broadcast_cache<input_type> my_successors;
+
+            public:
+                __TBB_NOINLINE_SYM explicit broadcast_node(graph& g) : graph_node(g), my_successors(this) {
+                    fgt_node(CODEPTR(), FLOW_BROADCAST_NODE, &this->my_graph,
+                             static_cast<receiver<input_type>*>(this),
+                             static_cast<sender<output_type>*>(this));
+                }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-    template <typename... Args>
-    indexer_node(const node_set<Args...>& nodes) : indexer_node(nodes.graph_reference()) {
-        make_edges_in_order(nodes, *this);
-    }
+                template <typename... Args>
+                broadcast_node(const node_set<Args...>& nodes) : broadcast_node(nodes.graph_reference()) {
+                    make_edges_in_order(nodes, *this);
+                }
 #endif
 
-    // Copy constructor
-    __TBB_NOINLINE_SYM indexer_node( const indexer_node& other ) : unfolded_type(other) {
-        fgt_multiinput_node<N>( CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph,
-                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
-    }
+                // Copy constructor
+                __TBB_NOINLINE_SYM broadcast_node(const broadcast_node& src) : broadcast_node(src.my_graph) {}
 
-};
-#endif //variadic max 6
+                //! Adds a successor
+                bool register_successor(successor_type& r) override {
+                    my_successors.register_successor(r);
+                    return true;
+                }
 
-#if __TBB_VARIADIC_MAX >= 7
-template<typename T0, typename T1, typename T2, typename T3, typename T4, typename T5,
-         typename T6>
-class indexer_node<T0, T1, T2, T3, T4, T5, T6> : public unfolded_indexer_node<std::tuple<T0, T1, T2, T3, T4, T5, T6> > {
-private:
-    static const int N = 7;
-public:
-    typedef std::tuple<T0, T1, T2, T3, T4, T5, T6> InputTuple;
-    typedef tagged_msg<size_t, T0, T1, T2, T3, T4, T5, T6> output_type;
-    typedef unfolded_indexer_node<InputTuple> unfolded_type;
-    __TBB_NOINLINE_SYM indexer_node(graph& g) : unfolded_type(g) {
-        fgt_multiinput_node<N>( CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph,
-                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
-    }
+                //! Removes s as a successor
+                bool remove_successor(successor_type& r) override {
+                    my_successors.remove_successor(r);
+                    return true;
+                }
 
-#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-    template <typename... Args>
-    indexer_node(const node_set<Args...>& nodes) : indexer_node(nodes.graph_reference()) {
-        make_edges_in_order(nodes, *this);
-    }
+            private:
+                graph_task* try_put_task_impl(
+                        const T& t __TBB_FLOW_GRAPH_METAINFO_ARG(const message_metainfo& metainfo)) {
+                    graph_task* new_task
+                            = my_successors.try_put_task(t __TBB_FLOW_GRAPH_METAINFO_ARG(metainfo));
+                    if (!new_task) new_task = SUCCESSFULLY_ENQUEUED;
+                    return new_task;
+                }
+
+            protected:
+                template <typename R, typename B>
+                friend class run_and_put_task;
+                template <typename X, typename Y>
+                friend class broadcast_cache;
+                template <typename X, typename Y>
+                friend class round_robin_cache;
+                //! build a task to run the successor if possible.  Default is old behavior.
+                graph_task* try_put_task(const T& t) override {
+                    return try_put_task_impl(t __TBB_FLOW_GRAPH_METAINFO_ARG(message_metainfo {}));
+                }
+
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+                graph_task* try_put_task(const T& t, const message_metainfo& metainfo) override {
+                    return try_put_task_impl(t, metainfo);
+                }
+#endif
+
+                graph& graph_reference() const override { return my_graph; }
+
+                void reset_node(reset_flags f) override {
+                    if (f & rf_clear_edges) { my_successors.clear(); }
+                    __TBB_ASSERT(!(f & rf_clear_edges) || my_successors.empty(),
+                                 "Error resetting broadcast_node");
+                }
+            };// broadcast_node
+
+            //! Forwards messages in arbitrary order
+            template <typename T>
+            class buffer_node : public graph_node,
+                                public reservable_item_buffer<T, cache_aligned_allocator<T>>,
+                                public receiver<T>,
+                                public sender<T> {
+                typedef cache_aligned_allocator<T> internals_allocator;
+
+            public:
+                typedef T input_type;
+                typedef T output_type;
+                typedef typename receiver<input_type>::predecessor_type predecessor_type;
+                typedef typename sender<output_type>::successor_type successor_type;
+                typedef buffer_node<T> class_type;
+
+            protected:
+                typedef size_t size_type;
+                round_robin_cache<T, null_rw_mutex> my_successors;
+
+                friend class forward_task_bypass<class_type>;
+
+                enum op_type {
+                    reg_succ,
+                    rem_succ,
+                    req_item,
+                    res_item,
+                    rel_res,
+                    con_res,
+                    put_item,
+                    try_fwd_task
+                };
+
+                // implements the aggregator_operation concept
+                class buffer_operation : public d1::aggregated_operation<buffer_operation> {
+                public:
+                    char type;
+                    T* elem;
+                    graph_task* ltask;
+                    successor_type* r;
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+                    message_metainfo* metainfo {nullptr};
+#endif
+
+                    buffer_operation(const T& e, op_type t)
+                        : type(char(t)), elem(const_cast<T*>(&e)), ltask(nullptr), r(nullptr) {}
+
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+                    buffer_operation(const T& e, op_type t, const message_metainfo& info)
+                        : type(char(t)), elem(const_cast<T*>(&e)), ltask(nullptr), r(nullptr),
+                          metainfo(const_cast<message_metainfo*>(&info)) {}
+
+                    buffer_operation(op_type t, message_metainfo& info)
+                        : type(char(t)), elem(nullptr), ltask(nullptr), r(nullptr), metainfo(&info) {}
+#endif
+                    buffer_operation(op_type t) : type(char(t)), elem(nullptr), ltask(nullptr), r(nullptr) {}
+                };
+
+                bool forwarder_busy;
+                typedef d1::aggregating_functor<class_type, buffer_operation> handler_type;
+                friend class d1::aggregating_functor<class_type, buffer_operation>;
+                d1::aggregator<handler_type, buffer_operation> my_aggregator;
+
+                virtual void handle_operations(buffer_operation* op_list) {
+                    handle_operations_impl(op_list, this);
+                }
+
+                template <typename derived_type>
+                void handle_operations_impl(buffer_operation* op_list, derived_type* derived) {
+                    __TBB_ASSERT(static_cast<class_type*>(derived) == this,
+                                 "'this' is not a base class for derived");
+
+                    buffer_operation* tmp = nullptr;
+                    bool try_forwarding = false;
+                    while (op_list) {
+                        tmp = op_list;
+                        op_list = op_list->next;
+                        switch (tmp->type) {
+                            case reg_succ:
+                                internal_reg_succ(tmp);
+                                try_forwarding = true;
+                                break;
+                            case rem_succ:
+                                internal_rem_succ(tmp);
+                                break;
+                            case req_item:
+                                internal_pop(tmp);
+                                break;
+                            case res_item:
+                                internal_reserve(tmp);
+                                break;
+                            case rel_res:
+                                internal_release(tmp);
+                                try_forwarding = true;
+                                break;
+                            case con_res:
+                                internal_consume(tmp);
+                                try_forwarding = true;
+                                break;
+                            case put_item:
+                                try_forwarding = internal_push(tmp);
+                                break;
+                            case try_fwd_task:
+                                internal_forward_task(tmp);
+                                break;
+                        }
+                    }
+
+                    derived->order();
+
+                    if (try_forwarding && !forwarder_busy) {
+                        if (is_graph_active(this->my_graph)) {
+                            forwarder_busy = true;
+                            typedef forward_task_bypass<class_type> task_type;
+                            d1::small_object_allocator allocator {};
+                            graph_task* new_task
+                                    = allocator.new_object<task_type>(graph_reference(), allocator, *this);
+                            // tmp should point to the last item handled by the aggregator.  This is the operation
+                            // the handling thread enqueued.  So modifying that record will be okay.
+                            // TODO revamp: check that the issue is still present
+                            // workaround for icc bug  (at least 12.0 and 13.0)
+                            // error: function "tbb::flow::interfaceX::combine_tasks" cannot be called with the given argument list
+                            //        argument types are: (graph, graph_task *, graph_task *)
+                            graph_task* z = tmp->ltask;
+                            graph& g = this->my_graph;
+                            tmp->ltask = combine_tasks(g, z, new_task);// in case the op generated a task
+                        }
+                    }
+                }// handle_operations
+
+                inline graph_task* grab_forwarding_task(buffer_operation& op_data) { return op_data.ltask; }
+
+                inline bool enqueue_forwarding_task(buffer_operation& op_data) {
+                    graph_task* ft = grab_forwarding_task(op_data);
+                    if (ft) {
+                        spawn_in_graph_arena(graph_reference(), *ft);
+                        return true;
+                    }
+                    return false;
+                }
+
+                //! This is executed by an enqueued task, the "forwarder"
+                virtual graph_task* forward_task() {
+                    buffer_operation op_data(try_fwd_task);
+                    graph_task* last_task = nullptr;
+                    do {
+                        op_data.status = WAIT;
+                        op_data.ltask = nullptr;
+                        my_aggregator.execute(&op_data);
+
+                        // workaround for icc bug
+                        graph_task* xtask = op_data.ltask;
+                        graph& g = this->my_graph;
+                        last_task = combine_tasks(g, last_task, xtask);
+                    } while (op_data.status == SUCCEEDED);
+                    return last_task;
+                }
+
+                //! Register successor
+                virtual void internal_reg_succ(buffer_operation* op) {
+                    __TBB_ASSERT(op->r, nullptr);
+                    my_successors.register_successor(*(op->r));
+                    op->status.store(SUCCEEDED, std::memory_order_release);
+                }
+
+                //! Remove successor
+                virtual void internal_rem_succ(buffer_operation* op) {
+                    __TBB_ASSERT(op->r, nullptr);
+                    my_successors.remove_successor(*(op->r));
+                    op->status.store(SUCCEEDED, std::memory_order_release);
+                }
+
+            private:
+                void order() {}
+
+                bool is_item_valid() { return this->my_item_valid(this->my_tail - 1); }
+
+                void try_put_and_add_task(graph_task*& last_task) {
+                    graph_task* new_task = my_successors.try_put_task(
+                            this->back() __TBB_FLOW_GRAPH_METAINFO_ARG(this->back_metainfo()));
+                    if (new_task) {
+                        // workaround for icc bug
+                        graph& g = this->my_graph;
+                        last_task = combine_tasks(g, last_task, new_task);
+                        this->destroy_back();
+                    }
+                }
+
+            protected:
+                //! Tries to forward valid items to successors
+                virtual void internal_forward_task(buffer_operation* op) {
+                    internal_forward_task_impl(op, this);
+                }
+
+                template <typename derived_type>
+                void internal_forward_task_impl(buffer_operation* op, derived_type* derived) {
+                    __TBB_ASSERT(static_cast<class_type*>(derived) == this,
+                                 "'this' is not a base class for derived");
+
+                    if (this->my_reserved || !derived->is_item_valid()) {
+                        op->status.store(FAILED, std::memory_order_release);
+                        this->forwarder_busy = false;
+                        return;
+                    }
+                    // Try forwarding, giving each successor a chance
+                    graph_task* last_task = nullptr;
+                    size_type counter = my_successors.size();
+                    for (; counter > 0 && derived->is_item_valid(); --counter)
+                        derived->try_put_and_add_task(last_task);
+
+                    op->ltask = last_task;// return task
+                    if (last_task && !counter) {
+                        op->status.store(SUCCEEDED, std::memory_order_release);
+                    } else {
+                        op->status.store(FAILED, std::memory_order_release);
+                        forwarder_busy = false;
+                    }
+                }
+
+                virtual bool internal_push(buffer_operation* op) {
+                    __TBB_ASSERT(op->elem, nullptr);
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+                    __TBB_ASSERT(op->metainfo, nullptr);
+                    this->push_back(*(op->elem), (*op->metainfo));
+#else
+                    this->push_back(*(op->elem));
+#endif
+                    op->status.store(SUCCEEDED, std::memory_order_release);
+                    return true;
+                }
+
+                virtual void internal_pop(buffer_operation* op) {
+                    __TBB_ASSERT(op->elem, nullptr);
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+                    bool pop_result = op->metainfo ? this->pop_back(*(op->elem), *(op->metainfo))
+                                                   : this->pop_back(*(op->elem));
+#else
+                    bool pop_result = this->pop_back(*(op->elem));
+#endif
+                    if (pop_result) {
+                        op->status.store(SUCCEEDED, std::memory_order_release);
+                    } else {
+                        op->status.store(FAILED, std::memory_order_release);
+                    }
+                }
+
+                virtual void internal_reserve(buffer_operation* op) {
+                    __TBB_ASSERT(op->elem, nullptr);
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+                    bool reserve_result = op->metainfo ? this->reserve_front(*(op->elem), *(op->metainfo))
+                                                       : this->reserve_front(*(op->elem));
+#else
+                    bool reserve_result = this->reserve_front(*(op->elem));
+#endif
+                    if (reserve_result) {
+                        op->status.store(SUCCEEDED, std::memory_order_release);
+                    } else {
+                        op->status.store(FAILED, std::memory_order_release);
+                    }
+                }
+
+                virtual void internal_consume(buffer_operation* op) {
+                    this->consume_front();
+                    op->status.store(SUCCEEDED, std::memory_order_release);
+                }
+
+                virtual void internal_release(buffer_operation* op) {
+                    this->release_front();
+                    op->status.store(SUCCEEDED, std::memory_order_release);
+                }
+
+            public:
+                //! Constructor
+                __TBB_NOINLINE_SYM explicit buffer_node(graph& g)
+                    : graph_node(g), reservable_item_buffer<T, internals_allocator>(), receiver<T>(),
+                      sender<T>(), my_successors(this), forwarder_busy(false) {
+                    my_aggregator.initialize_handler(handler_type(this));
+                    fgt_node(CODEPTR(), FLOW_BUFFER_NODE, &this->my_graph,
+                             static_cast<receiver<input_type>*>(this),
+                             static_cast<sender<output_type>*>(this));
+                }
+
+#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+                template <typename... Args>
+                buffer_node(const node_set<Args...>& nodes) : buffer_node(nodes.graph_reference()) {
+                    make_edges_in_order(nodes, *this);
+                }
+#endif
+
+                //! Copy constructor
+                __TBB_NOINLINE_SYM buffer_node(const buffer_node& src) : buffer_node(src.my_graph) {}
+
+                //
+                // message sender implementation
+                //
+
+                //! Adds a new successor.
+                /** Adds successor r to the list of successors; may forward tasks.  */
+                bool register_successor(successor_type& r) override {
+                    buffer_operation op_data(reg_succ);
+                    op_data.r = &r;
+                    my_aggregator.execute(&op_data);
+                    (void) enqueue_forwarding_task(op_data);
+                    return true;
+                }
+
+                //! Removes a successor.
+                /** Removes successor r from the list of successors.
+        It also calls r.remove_predecessor(*this) to remove this node as a predecessor. */
+                bool remove_successor(successor_type& r) override {
+                    // TODO revamp: investigate why full qualification is necessary here
+                    tbb::detail::d2::remove_predecessor(r, *this);
+                    buffer_operation op_data(rem_succ);
+                    op_data.r = &r;
+                    my_aggregator.execute(&op_data);
+                    // even though this operation does not cause a forward, if we are the handler, and
+                    // a forward is scheduled, we may be the first to reach this point after the aggregator,
+                    // and so should check for the task.
+                    (void) enqueue_forwarding_task(op_data);
+                    return true;
+                }
+
+                //! Request an item from the buffer_node
+                /**  true = v contains the returned item<BR>
+         false = no item has been returned */
+                bool try_get(T& v) override {
+                    buffer_operation op_data(req_item);
+                    op_data.elem = &v;
+                    my_aggregator.execute(&op_data);
+                    (void) enqueue_forwarding_task(op_data);
+                    return (op_data.status == SUCCEEDED);
+                }
+
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+                bool try_get(T& v, message_metainfo& metainfo) override {
+                    buffer_operation op_data(req_item, metainfo);
+                    op_data.elem = &v;
+                    my_aggregator.execute(&op_data);
+                    (void) enqueue_forwarding_task(op_data);
+                    return (op_data.status == SUCCEEDED);
+                }
+#endif
+
+                //! Reserves an item.
+                /**  false = no item can be reserved<BR>
+         true = an item is reserved */
+                bool try_reserve(T& v) override {
+                    buffer_operation op_data(res_item);
+                    op_data.elem = &v;
+                    my_aggregator.execute(&op_data);
+                    (void) enqueue_forwarding_task(op_data);
+                    return (op_data.status == SUCCEEDED);
+                }
+
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+                bool try_reserve(output_type& v, message_metainfo& metainfo) override {
+                    buffer_operation op_data(res_item, metainfo);
+                    op_data.elem = &v;
+                    my_aggregator.execute(&op_data);
+                    (void) enqueue_forwarding_task(op_data);
+                    return op_data.status == SUCCEEDED;
+                }
+#endif
+
+                //! Release a reserved item.
+                /**  true = item has been released and so remains in sender */
+                bool try_release() override {
+                    buffer_operation op_data(rel_res);
+                    my_aggregator.execute(&op_data);
+                    (void) enqueue_forwarding_task(op_data);
+                    return true;
+                }
+
+                //! Consumes a reserved item.
+                /** true = item is removed from sender and reservation removed */
+                bool try_consume() override {
+                    buffer_operation op_data(con_res);
+                    my_aggregator.execute(&op_data);
+                    (void) enqueue_forwarding_task(op_data);
+                    return true;
+                }
+
+            private:
+                graph_task* try_put_task_impl(
+                        const T& t __TBB_FLOW_GRAPH_METAINFO_ARG(const message_metainfo& metainfo)) {
+                    buffer_operation op_data(t, put_item __TBB_FLOW_GRAPH_METAINFO_ARG(metainfo));
+                    my_aggregator.execute(&op_data);
+                    graph_task* ft = grab_forwarding_task(op_data);
+                    // sequencer_nodes can return failure (if an item has been previously inserted)
+                    // We have to spawn the returned task if our own operation fails.
+
+                    if (ft && op_data.status == FAILED) {
+                        // we haven't succeeded queueing the item, but for some reason the
+                        // call returned a task (if another request resulted in a successful
+                        // forward this could happen.)  Queue the task and reset the pointer.
+                        spawn_in_graph_arena(graph_reference(), *ft);
+                        ft = nullptr;
+                    } else if (!ft && op_data.status == SUCCEEDED) {
+                        ft = SUCCESSFULLY_ENQUEUED;
+                    }
+                    return ft;
+                }
+
+            protected:
+                template <typename R, typename B>
+                friend class run_and_put_task;
+                template <typename X, typename Y>
+                friend class broadcast_cache;
+                template <typename X, typename Y>
+                friend class round_robin_cache;
+                //! receive an item, return a task *if possible
+                graph_task* try_put_task(const T& t) override {
+                    return try_put_task_impl(t __TBB_FLOW_GRAPH_METAINFO_ARG(message_metainfo {}));
+                }
+
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+                graph_task* try_put_task(const T& t, const message_metainfo& metainfo) override {
+                    return try_put_task_impl(t, metainfo);
+                }
+#endif
+
+                graph& graph_reference() const override { return my_graph; }
+
+            protected:
+                void reset_node(reset_flags f) override {
+                    reservable_item_buffer<T, internals_allocator>::reset();
+                    // TODO: just clear structures
+                    if (f & rf_clear_edges) { my_successors.clear(); }
+                    forwarder_busy = false;
+                }
+            };// buffer_node
+
+            //! Forwards messages in FIFO order
+            template <typename T>
+            class queue_node : public buffer_node<T> {
+            protected:
+                typedef buffer_node<T> base_type;
+                typedef typename base_type::size_type size_type;
+                typedef typename base_type::buffer_operation queue_operation;
+                typedef queue_node class_type;
+
+            private:
+                template <typename>
+                friend class buffer_node;
+
+                bool is_item_valid() { return this->my_item_valid(this->my_head); }
+
+                void try_put_and_add_task(graph_task*& last_task) {
+                    graph_task* new_task = this->my_successors.try_put_task(
+                            this->front() __TBB_FLOW_GRAPH_METAINFO_ARG(this->front_metainfo()));
+
+                    if (new_task) {
+                        // workaround for icc bug
+                        graph& graph_ref = this->graph_reference();
+                        last_task = combine_tasks(graph_ref, last_task, new_task);
+                        this->destroy_front();
+                    }
+                }
+
+            protected:
+                void internal_forward_task(queue_operation* op) override {
+                    this->internal_forward_task_impl(op, this);
+                }
+
+                void internal_pop(queue_operation* op) override {
+                    if (this->my_reserved || !this->my_item_valid(this->my_head)) {
+                        op->status.store(FAILED, std::memory_order_release);
+                    } else {
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+                        if (op->metainfo) {
+                            this->pop_front(*(op->elem), *(op->metainfo));
+                        } else
+#endif
+                        {
+                            this->pop_front(*(op->elem));
+                        }
+                        op->status.store(SUCCEEDED, std::memory_order_release);
+                    }
+                }
+                void internal_reserve(queue_operation* op) override {
+                    if (this->my_reserved || !this->my_item_valid(this->my_head)) {
+                        op->status.store(FAILED, std::memory_order_release);
+                    } else {
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+                        if (op->metainfo) {
+                            this->reserve_front(*(op->elem), *(op->metainfo));
+                        } else
+#endif
+                        {
+                            this->reserve_front(*(op->elem));
+                        }
+                        op->status.store(SUCCEEDED, std::memory_order_release);
+                    }
+                }
+                void internal_consume(queue_operation* op) override {
+                    this->consume_front();
+                    op->status.store(SUCCEEDED, std::memory_order_release);
+                }
+
+            public:
+                typedef T input_type;
+                typedef T output_type;
+                typedef typename receiver<input_type>::predecessor_type predecessor_type;
+                typedef typename sender<output_type>::successor_type successor_type;
+
+                //! Constructor
+                __TBB_NOINLINE_SYM explicit queue_node(graph& g) : base_type(g) {
+                    fgt_node(CODEPTR(), FLOW_QUEUE_NODE, &(this->my_graph),
+                             static_cast<receiver<input_type>*>(this),
+                             static_cast<sender<output_type>*>(this));
+                }
+
+#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+                template <typename... Args>
+                queue_node(const node_set<Args...>& nodes) : queue_node(nodes.graph_reference()) {
+                    make_edges_in_order(nodes, *this);
+                }
+#endif
+
+                //! Copy constructor
+                __TBB_NOINLINE_SYM queue_node(const queue_node& src) : base_type(src) {
+                    fgt_node(CODEPTR(), FLOW_QUEUE_NODE, &(this->my_graph),
+                             static_cast<receiver<input_type>*>(this),
+                             static_cast<sender<output_type>*>(this));
+                }
+
+            protected:
+                void reset_node(reset_flags f) override { base_type::reset_node(f); }
+            };// queue_node
+
+            //! Forwards messages in sequence order
+            template <typename T>
+            __TBB_requires(std::copyable<T>) class sequencer_node : public queue_node<T> {
+                function_body<T, size_t>* my_sequencer;
+                // my_sequencer should be a benign function and must be callable
+                // from a parallel context.  Does this mean it needn't be reset?
+            public:
+                typedef T input_type;
+                typedef T output_type;
+                typedef typename receiver<input_type>::predecessor_type predecessor_type;
+                typedef typename sender<output_type>::successor_type successor_type;
+
+                //! Constructor
+                template <typename Sequencer>
+                __TBB_requires(sequencer<Sequencer, T>) __TBB_NOINLINE_SYM
+                        sequencer_node(graph& g, const Sequencer& s)
+                    : queue_node<T>(g), my_sequencer(new function_body_leaf<T, size_t, Sequencer>(s)) {
+                    fgt_node(CODEPTR(), FLOW_SEQUENCER_NODE, &(this->my_graph),
+                             static_cast<receiver<input_type>*>(this),
+                             static_cast<sender<output_type>*>(this));
+                }
+
+#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+                template <typename Sequencer, typename... Args>
+                __TBB_requires(sequencer<Sequencer, T>)
+                        sequencer_node(const node_set<Args...>& nodes, const Sequencer& s)
+                    : sequencer_node(nodes.graph_reference(), s) {
+                    make_edges_in_order(nodes, *this);
+                }
+#endif
+
+                //! Copy constructor
+                __TBB_NOINLINE_SYM sequencer_node(const sequencer_node& src)
+                    : queue_node<T>(src), my_sequencer(src.my_sequencer -> clone()) {
+                    fgt_node(CODEPTR(), FLOW_SEQUENCER_NODE, &(this->my_graph),
+                             static_cast<receiver<input_type>*>(this),
+                             static_cast<sender<output_type>*>(this));
+                }
+
+                //! Destructor
+                ~sequencer_node() { delete my_sequencer; }
+
+            protected:
+                typedef typename buffer_node<T>::size_type size_type;
+                typedef typename buffer_node<T>::buffer_operation sequencer_operation;
+
+            private:
+                bool internal_push(sequencer_operation* op) override {
+                    size_type tag = (*my_sequencer)(*(op->elem));
+#if !TBB_DEPRECATED_SEQUENCER_DUPLICATES
+                    if (tag < this->my_head) {
+                        // have already emitted a message with this tag
+                        op->status.store(FAILED, std::memory_order_release);
+                        return false;
+                    }
+#endif
+                    // cannot modify this->my_tail now; the buffer would be inconsistent.
+                    size_t new_tail = (tag + 1 > this->my_tail) ? tag + 1 : this->my_tail;
+
+                    if (this->size(new_tail) > this->capacity()) {
+                        this->grow_my_array(this->size(new_tail));
+                    }
+                    this->my_tail = new_tail;
+
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+                    __TBB_ASSERT(op->metainfo, nullptr);
+                    bool place_item_result = this->place_item(tag, *(op->elem), *(op->metainfo));
+                    const op_stat res = place_item_result ? SUCCEEDED : FAILED;
+#else
+                    const op_stat res = this->place_item(tag, *(op->elem)) ? SUCCEEDED : FAILED;
+#endif
+                    op->status.store(res, std::memory_order_release);
+                    return res == SUCCEEDED;
+                }
+            };// sequencer_node
+
+            //! Forwards messages in priority order
+            template <typename T, typename Compare = std::less<T>>
+            class priority_queue_node : public buffer_node<T> {
+            public:
+                typedef T input_type;
+                typedef T output_type;
+                typedef buffer_node<T> base_type;
+                typedef priority_queue_node class_type;
+                typedef typename receiver<input_type>::predecessor_type predecessor_type;
+                typedef typename sender<output_type>::successor_type successor_type;
+
+                //! Constructor
+                __TBB_NOINLINE_SYM explicit priority_queue_node(graph& g, const Compare& comp = Compare())
+                    : buffer_node<T>(g), compare(comp), mark(0) {
+                    fgt_node(CODEPTR(), FLOW_PRIORITY_QUEUE_NODE, &(this->my_graph),
+                             static_cast<receiver<input_type>*>(this),
+                             static_cast<sender<output_type>*>(this));
+                }
+
+#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+                template <typename... Args>
+                priority_queue_node(const node_set<Args...>& nodes, const Compare& comp = Compare())
+                    : priority_queue_node(nodes.graph_reference(), comp) {
+                    make_edges_in_order(nodes, *this);
+                }
+#endif
+
+                //! Copy constructor
+                __TBB_NOINLINE_SYM priority_queue_node(const priority_queue_node& src)
+                    : buffer_node<T>(src), mark(0) {
+                    fgt_node(CODEPTR(), FLOW_PRIORITY_QUEUE_NODE, &(this->my_graph),
+                             static_cast<receiver<input_type>*>(this),
+                             static_cast<sender<output_type>*>(this));
+                }
+
+            protected:
+                void reset_node(reset_flags f) override {
+                    mark = 0;
+                    base_type::reset_node(f);
+                }
+
+                typedef typename buffer_node<T>::size_type size_type;
+                typedef typename buffer_node<T>::item_type item_type;
+                typedef typename buffer_node<T>::buffer_operation prio_operation;
+
+                //! Tries to forward valid items to successors
+                void internal_forward_task(prio_operation* op) override {
+                    this->internal_forward_task_impl(op, this);
+                }
+
+                void handle_operations(prio_operation* op_list) override {
+                    this->handle_operations_impl(op_list, this);
+                }
+
+                bool internal_push(prio_operation* op) override {
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+                    __TBB_ASSERT(op->metainfo, nullptr);
+                    prio_push(*(op->elem), *(op->metainfo));
+#else
+                    prio_push(*(op->elem));
+#endif
+                    op->status.store(SUCCEEDED, std::memory_order_release);
+                    return true;
+                }
+
+                void internal_pop(prio_operation* op) override {
+                    // if empty or already reserved, don't pop
+                    if (this->my_reserved == true || this->my_tail == 0) {
+                        op->status.store(FAILED, std::memory_order_release);
+                        return;
+                    }
+
+                    *(op->elem) = prio();
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+                    if (op->metainfo) { *(op->metainfo) = std::move(prio_metainfo()); }
+#endif
+                    op->status.store(SUCCEEDED, std::memory_order_release);
+                    prio_pop();
+                }
+
+                // pops the highest-priority item, saves copy
+                void internal_reserve(prio_operation* op) override {
+                    if (this->my_reserved == true || this->my_tail == 0) {
+                        op->status.store(FAILED, std::memory_order_release);
+                        return;
+                    }
+                    this->my_reserved = true;
+                    *(op->elem) = prio();
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+                    if (op->metainfo) {
+                        *(op->metainfo) = std::move(prio_metainfo());
+                        reserved_metainfo = *(op->metainfo);
+                    }
+#endif
+                    reserved_item = *(op->elem);
+                    op->status.store(SUCCEEDED, std::memory_order_release);
+                    prio_pop();
+                }
+
+                void internal_consume(prio_operation* op) override {
+                    op->status.store(SUCCEEDED, std::memory_order_release);
+                    this->my_reserved = false;
+                    reserved_item = input_type();
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+                    for (auto waiter : reserved_metainfo.waiters()) { waiter->release(1); }
+
+                    reserved_metainfo = message_metainfo {};
+#endif
+                }
+
+                void internal_release(prio_operation* op) override {
+                    op->status.store(SUCCEEDED, std::memory_order_release);
+                    prio_push(reserved_item __TBB_FLOW_GRAPH_METAINFO_ARG(reserved_metainfo));
+                    this->my_reserved = false;
+                    reserved_item = input_type();
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+                    for (auto waiter : reserved_metainfo.waiters()) { waiter->release(1); }
+
+                    reserved_metainfo = message_metainfo {};
+#endif
+                }
+
+            private:
+                template <typename>
+                friend class buffer_node;
+
+                void order() {
+                    if (mark < this->my_tail) heapify();
+                    __TBB_ASSERT(mark == this->my_tail, "mark unequal after heapify");
+                }
+
+                bool is_item_valid() { return this->my_tail > 0; }
+
+                void try_put_and_add_task(graph_task*& last_task) {
+                    graph_task* new_task = this->my_successors.try_put_task(
+                            this->prio() __TBB_FLOW_GRAPH_METAINFO_ARG(this->prio_metainfo()));
+                    if (new_task) {
+                        // workaround for icc bug
+                        graph& graph_ref = this->graph_reference();
+                        last_task = combine_tasks(graph_ref, last_task, new_task);
+                        prio_pop();
+                    }
+                }
+
+            private:
+                Compare compare;
+                size_type mark;
+
+                input_type reserved_item;
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+                message_metainfo reserved_metainfo;
+#endif
+
+                // in case a reheap has not been done after a push, check if the mark item is higher than the 0'th item
+                bool prio_use_tail() {
+                    __TBB_ASSERT(mark <= this->my_tail, "mark outside bounds before test");
+                    return mark < this->my_tail
+                           && compare(this->get_my_item(0), this->get_my_item(this->my_tail - 1));
+                }
+
+                // prio_push: checks that the item will fit, expand array if necessary, put at end
+                void prio_push(const T& src __TBB_FLOW_GRAPH_METAINFO_ARG(const message_metainfo& metainfo)) {
+                    if (this->my_tail >= this->my_array_size) this->grow_my_array(this->my_tail + 1);
+                    (void) this->place_item(this->my_tail, src __TBB_FLOW_GRAPH_METAINFO_ARG(metainfo));
+                    ++(this->my_tail);
+                    __TBB_ASSERT(mark < this->my_tail, "mark outside bounds after push");
+                }
+
+                // prio_pop: deletes highest priority item from the array, and if it is item
+                // 0, move last item to 0 and reheap.  If end of array, just destroy and decrement tail
+                // and mark.  Assumes the array has already been tested for emptiness; no failure.
+                void prio_pop() {
+                    if (prio_use_tail()) {
+                        // there are newly pushed elements; last one higher than top
+                        // copy the data
+                        this->destroy_item(this->my_tail - 1);
+                        --(this->my_tail);
+                        __TBB_ASSERT(mark <= this->my_tail, "mark outside bounds after pop");
+                        return;
+                    }
+                    this->destroy_item(0);
+                    if (this->my_tail > 1) {
+                        // push the last element down heap
+                        __TBB_ASSERT(this->my_item_valid(this->my_tail - 1), nullptr);
+                        this->move_item(0, this->my_tail - 1);
+                    }
+                    --(this->my_tail);
+                    if (mark > this->my_tail) --mark;
+                    if (this->my_tail > 1)// don't reheap for heap of size 1
+                        reheap();
+                    __TBB_ASSERT(mark <= this->my_tail, "mark outside bounds after pop");
+                }
+
+                const T& prio() { return this->get_my_item(prio_use_tail() ? this->my_tail - 1 : 0); }
+
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+                message_metainfo& prio_metainfo() {
+                    return this->get_my_metainfo(prio_use_tail() ? this->my_tail - 1 : 0);
+                }
+#endif
+
+                // turn array into heap
+                void heapify() {
+                    if (this->my_tail == 0) {
+                        mark = 0;
+                        return;
+                    }
+                    if (!mark) mark = 1;
+                    for (; mark < this->my_tail; ++mark) {// for each unheaped element
+                        size_type cur_pos = mark;
+                        input_type to_place;
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+                        message_metainfo metainfo;
+#endif
+                        this->fetch_item(mark, to_place __TBB_FLOW_GRAPH_METAINFO_ARG(metainfo));
+                        do {// push to_place up the heap
+                            size_type parent = (cur_pos - 1) >> 1;
+                            if (!compare(this->get_my_item(parent), to_place)) break;
+                            this->move_item(cur_pos, parent);
+                            cur_pos = parent;
+                        } while (cur_pos);
+                        this->place_item(cur_pos,
+                                         to_place __TBB_FLOW_GRAPH_METAINFO_ARG(std::move(metainfo)));
+                    }
+                }
+
+                // otherwise heapified array with new root element; rearrange to heap
+                void reheap() {
+                    size_type cur_pos = 0, child = 1;
+                    while (child < mark) {
+                        size_type target = child;
+                        if (child + 1 < mark
+                            && compare(this->get_my_item(child), this->get_my_item(child + 1)))
+                            ++target;
+                        // target now has the higher priority child
+                        if (compare(this->get_my_item(target), this->get_my_item(cur_pos))) break;
+                        // swap
+                        this->swap_items(cur_pos, target);
+                        cur_pos = target;
+                        child = (cur_pos << 1) + 1;
+                    }
+                }
+            };// priority_queue_node
+
+            //! Forwards messages only if the threshold has not been reached
+            /** This node forwards items until its threshold is reached.
+    It contains no buffering.  If the downstream node rejects, the
+    message is dropped. */
+            template <typename T, typename DecrementType = continue_msg>
+            class limiter_node : public graph_node, public receiver<T>, public sender<T> {
+            public:
+                typedef T input_type;
+                typedef T output_type;
+                typedef typename receiver<input_type>::predecessor_type predecessor_type;
+                typedef typename sender<output_type>::successor_type successor_type;
+                //TODO: There is a lack of predefined types for its controlling "decrementer" port. It should be fixed later.
+
+            private:
+                size_t my_threshold;
+                size_t my_count;           // number of successful puts
+                size_t my_tries;           // number of active put attempts
+                size_t my_future_decrement;// number of active decrement
+                reservable_predecessor_cache<T, spin_mutex> my_predecessors;
+                spin_mutex my_mutex;
+                broadcast_cache<T> my_successors;
+
+                //! The internal receiver< DecrementType > that adjusts the count
+                threshold_regulator<limiter_node<T, DecrementType>, DecrementType> decrement;
+
+                graph_task* decrement_counter(long long delta) {
+                    if (delta > 0 && size_t(delta) > my_threshold) { delta = my_threshold; }
+
+                    {
+                        spin_mutex::scoped_lock lock(my_mutex);
+                        if (delta > 0 && size_t(delta) > my_count) {
+                            if (my_tries > 0) { my_future_decrement += (size_t(delta) - my_count); }
+                            my_count = 0;
+                        } else if (delta < 0 && size_t(-delta) > my_threshold - my_count) {
+                            my_count = my_threshold;
+                        } else {
+                            my_count -= size_t(delta);// absolute value of delta is sufficiently small
+                        }
+                        __TBB_ASSERT(my_count <= my_threshold,
+                                     "counter values are truncated to be inside the [0, threshold] interval");
+                    }
+                    return forward_task();
+                }
+
+                // Let threshold_regulator call decrement_counter()
+                friend class threshold_regulator<limiter_node<T, DecrementType>, DecrementType>;
+
+                friend class forward_task_bypass<limiter_node<T, DecrementType>>;
+
+                bool check_conditions() {// always called under lock
+                    return (my_count + my_tries < my_threshold && !my_predecessors.empty()
+                            && !my_successors.empty());
+                }
+
+                // only returns a valid task pointer or nullptr, never SUCCESSFULLY_ENQUEUED
+                graph_task* forward_task() {
+                    input_type v;
+                    graph_task* rval = nullptr;
+                    bool reserved = false;
+
+                    {
+                        spin_mutex::scoped_lock lock(my_mutex);
+                        if (check_conditions()) ++my_tries;
+                        else
+                            return nullptr;
+                    }
+
+                    //SUCCESS
+                    // if we can reserve and can put, we consume the reservation
+                    // we increment the count and decrement the tries
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+                    message_metainfo metainfo;
+#endif
+                    if ((my_predecessors.try_reserve(v __TBB_FLOW_GRAPH_METAINFO_ARG(metainfo))) == true) {
+                        reserved = true;
+                        if ((rval = my_successors.try_put_task(v __TBB_FLOW_GRAPH_METAINFO_ARG(metainfo)))
+                            != nullptr) {
+                            {
+                                spin_mutex::scoped_lock lock(my_mutex);
+                                ++my_count;
+                                if (my_future_decrement) {
+                                    if (my_count > my_future_decrement) {
+                                        my_count -= my_future_decrement;
+                                        my_future_decrement = 0;
+                                    } else {
+                                        my_future_decrement -= my_count;
+                                        my_count = 0;
+                                    }
+                                }
+                                --my_tries;
+                                my_predecessors.try_consume();
+                                if (check_conditions()) {
+                                    if (is_graph_active(this->my_graph)) {
+                                        typedef forward_task_bypass<limiter_node<T, DecrementType>> task_type;
+                                        d1::small_object_allocator allocator {};
+                                        graph_task* rtask
+                                                = allocator.new_object<task_type>(my_graph, allocator, *this);
+                                        spawn_in_graph_arena(graph_reference(), *rtask);
+                                    }
+                                }
+                            }
+                            return rval;
+                        }
+                    }
+                    //FAILURE
+                    //if we can't reserve, we decrement the tries
+                    //if we can reserve but can't put, we decrement the tries and release the reservation
+                    {
+                        spin_mutex::scoped_lock lock(my_mutex);
+                        --my_tries;
+                        if (reserved) my_predecessors.try_release();
+                        if (check_conditions()) {
+                            if (is_graph_active(this->my_graph)) {
+                                d1::small_object_allocator allocator {};
+                                typedef forward_task_bypass<limiter_node<T, DecrementType>> task_type;
+                                graph_task* t = allocator.new_object<task_type>(my_graph, allocator, *this);
+                                __TBB_ASSERT(!rval, "Have two tasks to handle");
+                                return t;
+                            }
+                        }
+                        return rval;
+                    }
+                }
+
+                void initialize() {
+                    fgt_node(CODEPTR(), FLOW_LIMITER_NODE, &this->my_graph,
+                             static_cast<receiver<input_type>*>(this),
+                             static_cast<receiver<DecrementType>*>(&decrement),
+                             static_cast<sender<output_type>*>(this));
+                }
+
+            public:
+                //! Constructor
+                limiter_node(graph& g, size_t threshold)
+                    : graph_node(g), my_threshold(threshold), my_count(0), my_tries(0),
+                      my_future_decrement(0), my_predecessors(this), my_successors(this), decrement(this) {
+                    initialize();
+                }
+
+#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+                template <typename... Args>
+                limiter_node(const node_set<Args...>& nodes, size_t threshold)
+                    : limiter_node(nodes.graph_reference(), threshold) {
+                    make_edges_in_order(nodes, *this);
+                }
+#endif
+
+                //! Copy constructor
+                limiter_node(const limiter_node& src) : limiter_node(src.my_graph, src.my_threshold) {}
+
+                //! The interface for accessing internal receiver< DecrementType > that adjusts the count
+                receiver<DecrementType>& decrementer() { return decrement; }
+
+                //! Replace the current successor with this new successor
+                bool register_successor(successor_type& r) override {
+                    spin_mutex::scoped_lock lock(my_mutex);
+                    bool was_empty = my_successors.empty();
+                    my_successors.register_successor(r);
+                    //spawn a forward task if this is the only successor
+                    if (was_empty && !my_predecessors.empty() && my_count + my_tries < my_threshold) {
+                        if (is_graph_active(this->my_graph)) {
+                            d1::small_object_allocator allocator {};
+                            typedef forward_task_bypass<limiter_node<T, DecrementType>> task_type;
+                            graph_task* t = allocator.new_object<task_type>(my_graph, allocator, *this);
+                            spawn_in_graph_arena(graph_reference(), *t);
+                        }
+                    }
+                    return true;
+                }
+
+                //! Removes a successor from this node
+                /** r.remove_predecessor(*this) is also called. */
+                bool remove_successor(successor_type& r) override {
+                    // TODO revamp: investigate why qualification is needed for remove_predecessor() call
+                    tbb::detail::d2::remove_predecessor(r, *this);
+                    my_successors.remove_successor(r);
+                    return true;
+                }
+
+                //! Adds src to the list of cached predecessors.
+                bool register_predecessor(predecessor_type& src) override {
+                    spin_mutex::scoped_lock lock(my_mutex);
+                    my_predecessors.add(src);
+                    if (my_count + my_tries < my_threshold && !my_successors.empty()
+                        && is_graph_active(this->my_graph)) {
+                        d1::small_object_allocator allocator {};
+                        typedef forward_task_bypass<limiter_node<T, DecrementType>> task_type;
+                        graph_task* t = allocator.new_object<task_type>(my_graph, allocator, *this);
+                        spawn_in_graph_arena(graph_reference(), *t);
+                    }
+                    return true;
+                }
+
+                //! Removes src from the list of cached predecessors.
+                bool remove_predecessor(predecessor_type& src) override {
+                    my_predecessors.remove(src);
+                    return true;
+                }
+
+            protected:
+                template <typename R, typename B>
+                friend class run_and_put_task;
+                template <typename X, typename Y>
+                friend class broadcast_cache;
+                template <typename X, typename Y>
+                friend class round_robin_cache;
+
+            private:
+                //! Puts an item to this receiver
+                graph_task* try_put_task_impl(
+                        const T& t __TBB_FLOW_GRAPH_METAINFO_ARG(const message_metainfo& metainfo)) {
+                    {
+                        spin_mutex::scoped_lock lock(my_mutex);
+                        if (my_count + my_tries >= my_threshold) return nullptr;
+                        else
+                            ++my_tries;
+                    }
+
+                    graph_task* rtask = my_successors.try_put_task(t __TBB_FLOW_GRAPH_METAINFO_ARG(metainfo));
+                    if (!rtask) {// try_put_task failed.
+                        spin_mutex::scoped_lock lock(my_mutex);
+                        --my_tries;
+                        if (check_conditions() && is_graph_active(this->my_graph)) {
+                            d1::small_object_allocator allocator {};
+                            typedef forward_task_bypass<limiter_node<T, DecrementType>> task_type;
+                            rtask = allocator.new_object<task_type>(my_graph, allocator, *this);
+                        }
+                    } else {
+                        spin_mutex::scoped_lock lock(my_mutex);
+                        ++my_count;
+                        if (my_future_decrement) {
+                            if (my_count > my_future_decrement) {
+                                my_count -= my_future_decrement;
+                                my_future_decrement = 0;
+                            } else {
+                                my_future_decrement -= my_count;
+                                my_count = 0;
+                            }
+                        }
+                        --my_tries;
+                    }
+                    return rtask;
+                }
+
+            protected:
+                graph_task* try_put_task(const T& t) override {
+                    return try_put_task_impl(t __TBB_FLOW_GRAPH_METAINFO_ARG(message_metainfo {}));
+                }
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+                graph_task* try_put_task(const T& t, const message_metainfo& metainfo) override {
+                    return try_put_task_impl(t, metainfo);
+                }
+#endif
+
+                graph& graph_reference() const override { return my_graph; }
+
+                void reset_node(reset_flags f) override {
+                    my_count = 0;
+                    if (f & rf_clear_edges) {
+                        my_predecessors.clear();
+                        my_successors.clear();
+                    } else {
+                        my_predecessors.reset();
+                    }
+                    decrement.reset_receiver(f);
+                }
+            };// limiter_node
+
+#include "detail/_flow_graph_join_impl.h"
+
+            template <typename OutputTuple, typename JP = queueing>
+            class join_node;
+
+            template <typename OutputTuple>
+            class join_node<OutputTuple, reserving>
+                : public unfolded_join_node<std::tuple_size<OutputTuple>::value, reserving_port, OutputTuple,
+                                            reserving> {
+            private:
+                static const int N = std::tuple_size<OutputTuple>::value;
+                typedef unfolded_join_node<N, reserving_port, OutputTuple, reserving> unfolded_type;
+
+            public:
+                typedef OutputTuple output_type;
+                typedef typename unfolded_type::input_ports_type input_ports_type;
+                __TBB_NOINLINE_SYM explicit join_node(graph& g) : unfolded_type(g) {
+                    fgt_multiinput_node<N>(CODEPTR(), FLOW_JOIN_NODE_RESERVING, &this->my_graph,
+                                           this->input_ports(), static_cast<sender<output_type>*>(this));
+                }
+
+#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+                template <typename... Args>
+                __TBB_NOINLINE_SYM join_node(const node_set<Args...>& nodes, reserving = reserving())
+                    : join_node(nodes.graph_reference()) {
+                    make_edges_in_order(nodes, *this);
+                }
+#endif
+
+                __TBB_NOINLINE_SYM join_node(const join_node& other) : unfolded_type(other) {
+                    fgt_multiinput_node<N>(CODEPTR(), FLOW_JOIN_NODE_RESERVING, &this->my_graph,
+                                           this->input_ports(), static_cast<sender<output_type>*>(this));
+                }
+            };
+
+            template <typename OutputTuple>
+            class join_node<OutputTuple, queueing>
+                : public unfolded_join_node<std::tuple_size<OutputTuple>::value, queueing_port, OutputTuple,
+                                            queueing> {
+            private:
+                static const int N = std::tuple_size<OutputTuple>::value;
+                typedef unfolded_join_node<N, queueing_port, OutputTuple, queueing> unfolded_type;
+
+            public:
+                typedef OutputTuple output_type;
+                typedef typename unfolded_type::input_ports_type input_ports_type;
+                __TBB_NOINLINE_SYM explicit join_node(graph& g) : unfolded_type(g) {
+                    fgt_multiinput_node<N>(CODEPTR(), FLOW_JOIN_NODE_QUEUEING, &this->my_graph,
+                                           this->input_ports(), static_cast<sender<output_type>*>(this));
+                }
+
+#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+                template <typename... Args>
+                __TBB_NOINLINE_SYM join_node(const node_set<Args...>& nodes, queueing = queueing())
+                    : join_node(nodes.graph_reference()) {
+                    make_edges_in_order(nodes, *this);
+                }
+#endif
+
+                __TBB_NOINLINE_SYM join_node(const join_node& other) : unfolded_type(other) {
+                    fgt_multiinput_node<N>(CODEPTR(), FLOW_JOIN_NODE_QUEUEING, &this->my_graph,
+                                           this->input_ports(), static_cast<sender<output_type>*>(this));
+                }
+            };
+
+#if __TBB_CPP20_CONCEPTS_PRESENT
+            // Helper function which is well-formed only if all of the elements in OutputTuple
+            // satisfies join_node_function_object<body[i], tuple[i], K>
+            template <typename OutputTuple, typename K, typename... Functions, std::size_t... Idx>
+            void join_node_function_objects_helper(std::index_sequence<Idx...>)
+                requires(std::tuple_size_v<OutputTuple> == sizeof...(Functions))
+                        && (...
+                            && join_node_function_object<Functions, std::tuple_element_t<Idx, OutputTuple>,
+                                                         K>);
+
+            template <typename OutputTuple, typename K, typename... Functions>
+            concept join_node_functions = requires {
+                join_node_function_objects_helper<OutputTuple, K, Functions...>(
+                        std::make_index_sequence<sizeof...(Functions)> {});
+            };
+
+#endif
+
+            // template for key_matching join_node
+            // tag_matching join_node is a specialization of key_matching, and is source-compatible.
+            template <typename OutputTuple, typename K, typename KHash>
+            class join_node<OutputTuple, key_matching<K, KHash>>
+                : public unfolded_join_node<std::tuple_size<OutputTuple>::value, key_matching_port,
+                                            OutputTuple, key_matching<K, KHash>> {
+            private:
+                static const int N = std::tuple_size<OutputTuple>::value;
+                typedef unfolded_join_node<N, key_matching_port, OutputTuple, key_matching<K, KHash>>
+                        unfolded_type;
+
+            public:
+                typedef OutputTuple output_type;
+                typedef typename unfolded_type::input_ports_type input_ports_type;
+
+#if __TBB_PREVIEW_MESSAGE_BASED_KEY_MATCHING
+                join_node(graph& g) : unfolded_type(g) {}
+#endif /* __TBB_PREVIEW_MESSAGE_BASED_KEY_MATCHING */
+
+                template <typename __TBB_B0, typename __TBB_B1>
+                __TBB_requires(join_node_functions<OutputTuple, K, __TBB_B0, __TBB_B1>) __TBB_NOINLINE_SYM
+                        join_node(graph& g, __TBB_B0 b0, __TBB_B1 b1)
+                    : unfolded_type(g, b0, b1) {
+                    fgt_multiinput_node<N>(CODEPTR(), FLOW_JOIN_NODE_TAG_MATCHING, &this->my_graph,
+                                           this->input_ports(), static_cast<sender<output_type>*>(this));
+                }
+                template <typename __TBB_B0, typename __TBB_B1, typename __TBB_B2>
+                __TBB_requires(join_node_functions<OutputTuple, K, __TBB_B0, __TBB_B1, __TBB_B2>)
+                        __TBB_NOINLINE_SYM join_node(graph& g, __TBB_B0 b0, __TBB_B1 b1, __TBB_B2 b2)
+                    : unfolded_type(g, b0, b1, b2) {
+                    fgt_multiinput_node<N>(CODEPTR(), FLOW_JOIN_NODE_TAG_MATCHING, &this->my_graph,
+                                           this->input_ports(), static_cast<sender<output_type>*>(this));
+                }
+                template <typename __TBB_B0, typename __TBB_B1, typename __TBB_B2, typename __TBB_B3>
+                __TBB_requires(join_node_functions<OutputTuple, K, __TBB_B0, __TBB_B1, __TBB_B2, __TBB_B3>)
+                        __TBB_NOINLINE_SYM
+                        join_node(graph& g, __TBB_B0 b0, __TBB_B1 b1, __TBB_B2 b2, __TBB_B3 b3)
+                    : unfolded_type(g, b0, b1, b2, b3) {
+                    fgt_multiinput_node<N>(CODEPTR(), FLOW_JOIN_NODE_TAG_MATCHING, &this->my_graph,
+                                           this->input_ports(), static_cast<sender<output_type>*>(this));
+                }
+                template <typename __TBB_B0, typename __TBB_B1, typename __TBB_B2, typename __TBB_B3,
+                          typename __TBB_B4>
+                __TBB_requires(
+                        join_node_functions<OutputTuple, K, __TBB_B0, __TBB_B1, __TBB_B2, __TBB_B3, __TBB_B4>)
+                        __TBB_NOINLINE_SYM
+                        join_node(graph& g, __TBB_B0 b0, __TBB_B1 b1, __TBB_B2 b2, __TBB_B3 b3, __TBB_B4 b4)
+                    : unfolded_type(g, b0, b1, b2, b3, b4) {
+                    fgt_multiinput_node<N>(CODEPTR(), FLOW_JOIN_NODE_TAG_MATCHING, &this->my_graph,
+                                           this->input_ports(), static_cast<sender<output_type>*>(this));
+                }
+#if __TBB_VARIADIC_MAX >= 6
+                template <typename __TBB_B0, typename __TBB_B1, typename __TBB_B2, typename __TBB_B3,
+                          typename __TBB_B4, typename __TBB_B5>
+                __TBB_requires(join_node_functions<OutputTuple, K, __TBB_B0, __TBB_B1, __TBB_B2, __TBB_B3,
+                                                   __TBB_B4, __TBB_B5>) __TBB_NOINLINE_SYM
+                        join_node(graph& g, __TBB_B0 b0, __TBB_B1 b1, __TBB_B2 b2, __TBB_B3 b3, __TBB_B4 b4,
+                                  __TBB_B5 b5)
+                    : unfolded_type(g, b0, b1, b2, b3, b4, b5) {
+                    fgt_multiinput_node<N>(CODEPTR(), FLOW_JOIN_NODE_TAG_MATCHING, &this->my_graph,
+                                           this->input_ports(), static_cast<sender<output_type>*>(this));
+                }
+#endif
+#if __TBB_VARIADIC_MAX >= 7
+                template <typename __TBB_B0, typename __TBB_B1, typename __TBB_B2, typename __TBB_B3,
+                          typename __TBB_B4, typename __TBB_B5, typename __TBB_B6>
+                __TBB_requires(join_node_functions<OutputTuple, K, __TBB_B0, __TBB_B1, __TBB_B2, __TBB_B3,
+                                                   __TBB_B4, __TBB_B5, __TBB_B6>) __TBB_NOINLINE_SYM
+                        join_node(graph& g, __TBB_B0 b0, __TBB_B1 b1, __TBB_B2 b2, __TBB_B3 b3, __TBB_B4 b4,
+                                  __TBB_B5 b5, __TBB_B6 b6)
+                    : unfolded_type(g, b0, b1, b2, b3, b4, b5, b6) {
+                    fgt_multiinput_node<N>(CODEPTR(), FLOW_JOIN_NODE_TAG_MATCHING, &this->my_graph,
+                                           this->input_ports(), static_cast<sender<output_type>*>(this));
+                }
+#endif
+#if __TBB_VARIADIC_MAX >= 8
+                template <typename __TBB_B0, typename __TBB_B1, typename __TBB_B2, typename __TBB_B3,
+                          typename __TBB_B4, typename __TBB_B5, typename __TBB_B6, typename __TBB_B7>
+                __TBB_requires(join_node_functions<OutputTuple, K, __TBB_B0, __TBB_B1, __TBB_B2, __TBB_B3,
+                                                   __TBB_B4, __TBB_B5, __TBB_B6, __TBB_B7>) __TBB_NOINLINE_SYM
+                        join_node(graph& g, __TBB_B0 b0, __TBB_B1 b1, __TBB_B2 b2, __TBB_B3 b3, __TBB_B4 b4,
+                                  __TBB_B5 b5, __TBB_B6 b6, __TBB_B7 b7)
+                    : unfolded_type(g, b0, b1, b2, b3, b4, b5, b6, b7) {
+                    fgt_multiinput_node<N>(CODEPTR(), FLOW_JOIN_NODE_TAG_MATCHING, &this->my_graph,
+                                           this->input_ports(), static_cast<sender<output_type>*>(this));
+                }
+#endif
+#if __TBB_VARIADIC_MAX >= 9
+                template <typename __TBB_B0, typename __TBB_B1, typename __TBB_B2, typename __TBB_B3,
+                          typename __TBB_B4, typename __TBB_B5, typename __TBB_B6, typename __TBB_B7,
+                          typename __TBB_B8>
+                __TBB_requires(join_node_functions<OutputTuple, K, __TBB_B0, __TBB_B1, __TBB_B2, __TBB_B3,
+                                                   __TBB_B4, __TBB_B5, __TBB_B6, __TBB_B7, __TBB_B8>)
+                        __TBB_NOINLINE_SYM
+                        join_node(graph& g, __TBB_B0 b0, __TBB_B1 b1, __TBB_B2 b2, __TBB_B3 b3, __TBB_B4 b4,
+                                  __TBB_B5 b5, __TBB_B6 b6, __TBB_B7 b7, __TBB_B8 b8)
+                    : unfolded_type(g, b0, b1, b2, b3, b4, b5, b6, b7, b8) {
+                    fgt_multiinput_node<N>(CODEPTR(), FLOW_JOIN_NODE_TAG_MATCHING, &this->my_graph,
+                                           this->input_ports(), static_cast<sender<output_type>*>(this));
+                }
 #endif
+#if __TBB_VARIADIC_MAX >= 10
+                template <typename __TBB_B0, typename __TBB_B1, typename __TBB_B2, typename __TBB_B3,
+                          typename __TBB_B4, typename __TBB_B5, typename __TBB_B6, typename __TBB_B7,
+                          typename __TBB_B8, typename __TBB_B9>
+                __TBB_requires(
+                        join_node_functions<OutputTuple, K, __TBB_B0, __TBB_B1, __TBB_B2, __TBB_B3, __TBB_B4,
+                                            __TBB_B5, __TBB_B6, __TBB_B7, __TBB_B8, __TBB_B9>)
+                        __TBB_NOINLINE_SYM
+                        join_node(graph& g, __TBB_B0 b0, __TBB_B1 b1, __TBB_B2 b2, __TBB_B3 b3, __TBB_B4 b4,
+                                  __TBB_B5 b5, __TBB_B6 b6, __TBB_B7 b7, __TBB_B8 b8, __TBB_B9 b9)
+                    : unfolded_type(g, b0, b1, b2, b3, b4, b5, b6, b7, b8, b9) {
+                    fgt_multiinput_node<N>(CODEPTR(), FLOW_JOIN_NODE_TAG_MATCHING, &this->my_graph,
+                                           this->input_ports(), static_cast<sender<output_type>*>(this));
+                }
+#endif
+
+#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+                template <
+#if (__clang_major__ == 3 && __clang_minor__ == 4)
+                        // clang 3.4 misdeduces 'Args...' for 'node_set' while it can cope with template template parameter.
+                        template <typename...> class node_set,
+#endif
+                        typename... Args, typename... Bodies>
+                __TBB_requires((sizeof...(Bodies) == 0)
+                               || join_node_functions<OutputTuple, K, Bodies...>) __TBB_NOINLINE_SYM
+                        join_node(const node_set<Args...>& nodes, Bodies... bodies)
+                    : join_node(nodes.graph_reference(), bodies...) {
+                    make_edges_in_order(nodes, *this);
+                }
+#endif// __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 
-    // Copy constructor
-    __TBB_NOINLINE_SYM indexer_node( const indexer_node& other ) : unfolded_type(other) {
-        fgt_multiinput_node<N>( CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph,
-                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
-    }
+                __TBB_NOINLINE_SYM join_node(const join_node& other) : unfolded_type(other) {
+                    fgt_multiinput_node<N>(CODEPTR(), FLOW_JOIN_NODE_TAG_MATCHING, &this->my_graph,
+                                           this->input_ports(), static_cast<sender<output_type>*>(this));
+                }
+            };
 
-};
-#endif //variadic max 7
+// indexer node
+#include "detail/_flow_graph_indexer_impl.h"
 
-#if __TBB_VARIADIC_MAX >= 8
-template<typename T0, typename T1, typename T2, typename T3, typename T4, typename T5,
-         typename T6, typename T7>
-class indexer_node<T0, T1, T2, T3, T4, T5, T6, T7> : public unfolded_indexer_node<std::tuple<T0, T1, T2, T3, T4, T5, T6, T7> > {
-private:
-    static const int N = 8;
-public:
-    typedef std::tuple<T0, T1, T2, T3, T4, T5, T6, T7> InputTuple;
-    typedef tagged_msg<size_t, T0, T1, T2, T3, T4, T5, T6, T7> output_type;
-    typedef unfolded_indexer_node<InputTuple> unfolded_type;
-    indexer_node(graph& g) : unfolded_type(g) {
-        fgt_multiinput_node<N>( CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph,
-                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
-    }
+            // TODO: Implement interface with variadic template or tuple
+            template <typename T0, typename T1 = null_type, typename T2 = null_type, typename T3 = null_type,
+                      typename T4 = null_type, typename T5 = null_type, typename T6 = null_type,
+                      typename T7 = null_type, typename T8 = null_type, typename T9 = null_type>
+            class indexer_node;
+
+            //indexer node specializations
+            template <typename T0>
+            class indexer_node<T0> : public unfolded_indexer_node<std::tuple<T0>> {
+            private:
+                static const int N = 1;
+
+            public:
+                typedef std::tuple<T0> InputTuple;
+                typedef tagged_msg<size_t, T0> output_type;
+                typedef unfolded_indexer_node<InputTuple> unfolded_type;
+                __TBB_NOINLINE_SYM indexer_node(graph& g) : unfolded_type(g) {
+                    fgt_multiinput_node<N>(CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph, this->input_ports(),
+                                           static_cast<sender<output_type>*>(this));
+                }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-    template <typename... Args>
-    indexer_node(const node_set<Args...>& nodes) : indexer_node(nodes.graph_reference()) {
-        make_edges_in_order(nodes, *this);
-    }
+                template <typename... Args>
+                indexer_node(const node_set<Args...>& nodes) : indexer_node(nodes.graph_reference()) {
+                    make_edges_in_order(nodes, *this);
+                }
 #endif
 
-    // Copy constructor
-    indexer_node( const indexer_node& other ) : unfolded_type(other) {
-        fgt_multiinput_node<N>( CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph,
-                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
-    }
+                // Copy constructor
+                __TBB_NOINLINE_SYM indexer_node(const indexer_node& other) : unfolded_type(other) {
+                    fgt_multiinput_node<N>(CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph, this->input_ports(),
+                                           static_cast<sender<output_type>*>(this));
+                }
+            };
+
+            template <typename T0, typename T1>
+            class indexer_node<T0, T1> : public unfolded_indexer_node<std::tuple<T0, T1>> {
+            private:
+                static const int N = 2;
+
+            public:
+                typedef std::tuple<T0, T1> InputTuple;
+                typedef tagged_msg<size_t, T0, T1> output_type;
+                typedef unfolded_indexer_node<InputTuple> unfolded_type;
+                __TBB_NOINLINE_SYM indexer_node(graph& g) : unfolded_type(g) {
+                    fgt_multiinput_node<N>(CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph, this->input_ports(),
+                                           static_cast<sender<output_type>*>(this));
+                }
 
-};
-#endif //variadic max 8
+#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+                template <typename... Args>
+                indexer_node(const node_set<Args...>& nodes) : indexer_node(nodes.graph_reference()) {
+                    make_edges_in_order(nodes, *this);
+                }
+#endif
 
-#if __TBB_VARIADIC_MAX >= 9
-template<typename T0, typename T1, typename T2, typename T3, typename T4, typename T5,
-         typename T6, typename T7, typename T8>
-class indexer_node<T0, T1, T2, T3, T4, T5, T6, T7, T8> : public unfolded_indexer_node<std::tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8> > {
-private:
-    static const int N = 9;
-public:
-    typedef std::tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8> InputTuple;
-    typedef tagged_msg<size_t, T0, T1, T2, T3, T4, T5, T6, T7, T8> output_type;
-    typedef unfolded_indexer_node<InputTuple> unfolded_type;
-    __TBB_NOINLINE_SYM indexer_node(graph& g) : unfolded_type(g) {
-        fgt_multiinput_node<N>( CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph,
-                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
-    }
+                // Copy constructor
+                __TBB_NOINLINE_SYM indexer_node(const indexer_node& other) : unfolded_type(other) {
+                    fgt_multiinput_node<N>(CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph, this->input_ports(),
+                                           static_cast<sender<output_type>*>(this));
+                }
+            };
+
+            template <typename T0, typename T1, typename T2>
+            class indexer_node<T0, T1, T2> : public unfolded_indexer_node<std::tuple<T0, T1, T2>> {
+            private:
+                static const int N = 3;
+
+            public:
+                typedef std::tuple<T0, T1, T2> InputTuple;
+                typedef tagged_msg<size_t, T0, T1, T2> output_type;
+                typedef unfolded_indexer_node<InputTuple> unfolded_type;
+                __TBB_NOINLINE_SYM indexer_node(graph& g) : unfolded_type(g) {
+                    fgt_multiinput_node<N>(CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph, this->input_ports(),
+                                           static_cast<sender<output_type>*>(this));
+                }
+
+#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+                template <typename... Args>
+                indexer_node(const node_set<Args...>& nodes) : indexer_node(nodes.graph_reference()) {
+                    make_edges_in_order(nodes, *this);
+                }
+#endif
+
+                // Copy constructor
+                __TBB_NOINLINE_SYM indexer_node(const indexer_node& other) : unfolded_type(other) {
+                    fgt_multiinput_node<N>(CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph, this->input_ports(),
+                                           static_cast<sender<output_type>*>(this));
+                }
+            };
+
+            template <typename T0, typename T1, typename T2, typename T3>
+            class indexer_node<T0, T1, T2, T3> : public unfolded_indexer_node<std::tuple<T0, T1, T2, T3>> {
+            private:
+                static const int N = 4;
+
+            public:
+                typedef std::tuple<T0, T1, T2, T3> InputTuple;
+                typedef tagged_msg<size_t, T0, T1, T2, T3> output_type;
+                typedef unfolded_indexer_node<InputTuple> unfolded_type;
+                __TBB_NOINLINE_SYM indexer_node(graph& g) : unfolded_type(g) {
+                    fgt_multiinput_node<N>(CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph, this->input_ports(),
+                                           static_cast<sender<output_type>*>(this));
+                }
+
+#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+                template <typename... Args>
+                indexer_node(const node_set<Args...>& nodes) : indexer_node(nodes.graph_reference()) {
+                    make_edges_in_order(nodes, *this);
+                }
+#endif
+
+                // Copy constructor
+                __TBB_NOINLINE_SYM indexer_node(const indexer_node& other) : unfolded_type(other) {
+                    fgt_multiinput_node<N>(CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph, this->input_ports(),
+                                           static_cast<sender<output_type>*>(this));
+                }
+            };
+
+            template <typename T0, typename T1, typename T2, typename T3, typename T4>
+            class indexer_node<T0, T1, T2, T3, T4>
+                : public unfolded_indexer_node<std::tuple<T0, T1, T2, T3, T4>> {
+            private:
+                static const int N = 5;
+
+            public:
+                typedef std::tuple<T0, T1, T2, T3, T4> InputTuple;
+                typedef tagged_msg<size_t, T0, T1, T2, T3, T4> output_type;
+                typedef unfolded_indexer_node<InputTuple> unfolded_type;
+                __TBB_NOINLINE_SYM indexer_node(graph& g) : unfolded_type(g) {
+                    fgt_multiinput_node<N>(CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph, this->input_ports(),
+                                           static_cast<sender<output_type>*>(this));
+                }
+
+#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+                template <typename... Args>
+                indexer_node(const node_set<Args...>& nodes) : indexer_node(nodes.graph_reference()) {
+                    make_edges_in_order(nodes, *this);
+                }
+#endif
+
+                // Copy constructor
+                __TBB_NOINLINE_SYM indexer_node(const indexer_node& other) : unfolded_type(other) {
+                    fgt_multiinput_node<N>(CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph, this->input_ports(),
+                                           static_cast<sender<output_type>*>(this));
+                }
+            };
+
+#if __TBB_VARIADIC_MAX >= 6
+            template <typename T0, typename T1, typename T2, typename T3, typename T4, typename T5>
+            class indexer_node<T0, T1, T2, T3, T4, T5>
+                : public unfolded_indexer_node<std::tuple<T0, T1, T2, T3, T4, T5>> {
+            private:
+                static const int N = 6;
+
+            public:
+                typedef std::tuple<T0, T1, T2, T3, T4, T5> InputTuple;
+                typedef tagged_msg<size_t, T0, T1, T2, T3, T4, T5> output_type;
+                typedef unfolded_indexer_node<InputTuple> unfolded_type;
+                __TBB_NOINLINE_SYM indexer_node(graph& g) : unfolded_type(g) {
+                    fgt_multiinput_node<N>(CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph, this->input_ports(),
+                                           static_cast<sender<output_type>*>(this));
+                }
+
+#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+                template <typename... Args>
+                indexer_node(const node_set<Args...>& nodes) : indexer_node(nodes.graph_reference()) {
+                    make_edges_in_order(nodes, *this);
+                }
+#endif
+
+                // Copy constructor
+                __TBB_NOINLINE_SYM indexer_node(const indexer_node& other) : unfolded_type(other) {
+                    fgt_multiinput_node<N>(CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph, this->input_ports(),
+                                           static_cast<sender<output_type>*>(this));
+                }
+            };
+#endif//variadic max 6
+
+#if __TBB_VARIADIC_MAX >= 7
+            template <typename T0, typename T1, typename T2, typename T3, typename T4, typename T5,
+                      typename T6>
+            class indexer_node<T0, T1, T2, T3, T4, T5, T6>
+                : public unfolded_indexer_node<std::tuple<T0, T1, T2, T3, T4, T5, T6>> {
+            private:
+                static const int N = 7;
+
+            public:
+                typedef std::tuple<T0, T1, T2, T3, T4, T5, T6> InputTuple;
+                typedef tagged_msg<size_t, T0, T1, T2, T3, T4, T5, T6> output_type;
+                typedef unfolded_indexer_node<InputTuple> unfolded_type;
+                __TBB_NOINLINE_SYM indexer_node(graph& g) : unfolded_type(g) {
+                    fgt_multiinput_node<N>(CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph, this->input_ports(),
+                                           static_cast<sender<output_type>*>(this));
+                }
+
+#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+                template <typename... Args>
+                indexer_node(const node_set<Args...>& nodes) : indexer_node(nodes.graph_reference()) {
+                    make_edges_in_order(nodes, *this);
+                }
+#endif
+
+                // Copy constructor
+                __TBB_NOINLINE_SYM indexer_node(const indexer_node& other) : unfolded_type(other) {
+                    fgt_multiinput_node<N>(CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph, this->input_ports(),
+                                           static_cast<sender<output_type>*>(this));
+                }
+            };
+#endif//variadic max 7
+
+#if __TBB_VARIADIC_MAX >= 8
+            template <typename T0, typename T1, typename T2, typename T3, typename T4, typename T5,
+                      typename T6, typename T7>
+            class indexer_node<T0, T1, T2, T3, T4, T5, T6, T7>
+                : public unfolded_indexer_node<std::tuple<T0, T1, T2, T3, T4, T5, T6, T7>> {
+            private:
+                static const int N = 8;
+
+            public:
+                typedef std::tuple<T0, T1, T2, T3, T4, T5, T6, T7> InputTuple;
+                typedef tagged_msg<size_t, T0, T1, T2, T3, T4, T5, T6, T7> output_type;
+                typedef unfolded_indexer_node<InputTuple> unfolded_type;
+                indexer_node(graph& g) : unfolded_type(g) {
+                    fgt_multiinput_node<N>(CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph, this->input_ports(),
+                                           static_cast<sender<output_type>*>(this));
+                }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-    template <typename... Args>
-    indexer_node(const node_set<Args...>& nodes) : indexer_node(nodes.graph_reference()) {
-        make_edges_in_order(nodes, *this);
-    }
+                template <typename... Args>
+                indexer_node(const node_set<Args...>& nodes) : indexer_node(nodes.graph_reference()) {
+                    make_edges_in_order(nodes, *this);
+                }
 #endif
 
-    // Copy constructor
-    __TBB_NOINLINE_SYM indexer_node( const indexer_node& other ) : unfolded_type(other) {
-        fgt_multiinput_node<N>( CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph,
-                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
-    }
+                // Copy constructor
+                indexer_node(const indexer_node& other) : unfolded_type(other) {
+                    fgt_multiinput_node<N>(CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph, this->input_ports(),
+                                           static_cast<sender<output_type>*>(this));
+                }
+            };
+#endif//variadic max 8
+
+#if __TBB_VARIADIC_MAX >= 9
+            template <typename T0, typename T1, typename T2, typename T3, typename T4, typename T5,
+                      typename T6, typename T7, typename T8>
+            class indexer_node<T0, T1, T2, T3, T4, T5, T6, T7, T8>
+                : public unfolded_indexer_node<std::tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8>> {
+            private:
+                static const int N = 9;
+
+            public:
+                typedef std::tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8> InputTuple;
+                typedef tagged_msg<size_t, T0, T1, T2, T3, T4, T5, T6, T7, T8> output_type;
+                typedef unfolded_indexer_node<InputTuple> unfolded_type;
+                __TBB_NOINLINE_SYM indexer_node(graph& g) : unfolded_type(g) {
+                    fgt_multiinput_node<N>(CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph, this->input_ports(),
+                                           static_cast<sender<output_type>*>(this));
+                }
+
+#if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+                template <typename... Args>
+                indexer_node(const node_set<Args...>& nodes) : indexer_node(nodes.graph_reference()) {
+                    make_edges_in_order(nodes, *this);
+                }
+#endif
 
-};
-#endif //variadic max 9
+                // Copy constructor
+                __TBB_NOINLINE_SYM indexer_node(const indexer_node& other) : unfolded_type(other) {
+                    fgt_multiinput_node<N>(CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph, this->input_ports(),
+                                           static_cast<sender<output_type>*>(this));
+                }
+            };
+#endif//variadic max 9
 
 #if __TBB_VARIADIC_MAX >= 10
-template<typename T0, typename T1, typename T2, typename T3, typename T4, typename T5,
-         typename T6, typename T7, typename T8, typename T9>
-class indexer_node/*default*/ : public unfolded_indexer_node<std::tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> > {
-private:
-    static const int N = 10;
-public:
-    typedef std::tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> InputTuple;
-    typedef tagged_msg<size_t, T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> output_type;
-    typedef unfolded_indexer_node<InputTuple> unfolded_type;
-    __TBB_NOINLINE_SYM indexer_node(graph& g) : unfolded_type(g) {
-        fgt_multiinput_node<N>( CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph,
-                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
-    }
+            template <typename T0, typename T1, typename T2, typename T3, typename T4, typename T5,
+                      typename T6, typename T7, typename T8, typename T9>
+            class indexer_node /*default*/ : public unfolded_indexer_node<
+                                                     std::tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>> {
+            private:
+                static const int N = 10;
+
+            public:
+                typedef std::tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> InputTuple;
+                typedef tagged_msg<size_t, T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> output_type;
+                typedef unfolded_indexer_node<InputTuple> unfolded_type;
+                __TBB_NOINLINE_SYM indexer_node(graph& g) : unfolded_type(g) {
+                    fgt_multiinput_node<N>(CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph, this->input_ports(),
+                                           static_cast<sender<output_type>*>(this));
+                }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-    template <typename... Args>
-    indexer_node(const node_set<Args...>& nodes) : indexer_node(nodes.graph_reference()) {
-        make_edges_in_order(nodes, *this);
-    }
-#endif
-
-    // Copy constructor
-    __TBB_NOINLINE_SYM indexer_node( const indexer_node& other ) : unfolded_type(other) {
-        fgt_multiinput_node<N>( CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph,
-                                           this->input_ports(), static_cast< sender< output_type > *>(this) );
-    }
-
-};
-#endif //variadic max 10
-
-template< typename T >
-inline void internal_make_edge( sender<T> &p, receiver<T> &s ) {
-    register_successor(p, s);
-    fgt_make_edge( &p, &s );
-}
-
-//! Makes an edge between a single predecessor and a single successor
-template< typename T >
-inline void make_edge( sender<T> &p, receiver<T> &s ) {
-    internal_make_edge( p, s );
-}
-
-//Makes an edge from port 0 of a multi-output predecessor to port 0 of a multi-input successor.
-template< typename T, typename V,
-          typename = typename T::output_ports_type, typename = typename V::input_ports_type >
-inline void make_edge( T& output, V& input) {
-    make_edge(std::get<0>(output.output_ports()), std::get<0>(input.input_ports()));
-}
-
-//Makes an edge from port 0 of a multi-output predecessor to a receiver.
-template< typename T, typename R,
-          typename = typename T::output_ports_type >
-inline void make_edge( T& output, receiver<R>& input) {
-     make_edge(std::get<0>(output.output_ports()), input);
-}
-
-//Makes an edge from a sender to port 0 of a multi-input successor.
-template< typename S,  typename V,
-          typename = typename V::input_ports_type >
-inline void make_edge( sender<S>& output, V& input) {
-     make_edge(output, std::get<0>(input.input_ports()));
-}
-
-template< typename T >
-inline void internal_remove_edge( sender<T> &p, receiver<T> &s ) {
-    remove_successor( p, s );
-    fgt_remove_edge( &p, &s );
-}
-
-//! Removes an edge between a single predecessor and a single successor
-template< typename T >
-inline void remove_edge( sender<T> &p, receiver<T> &s ) {
-    internal_remove_edge( p, s );
-}
-
-//Removes an edge between port 0 of a multi-output predecessor and port 0 of a multi-input successor.
-template< typename T, typename V,
-          typename = typename T::output_ports_type, typename = typename V::input_ports_type >
-inline void remove_edge( T& output, V& input) {
-    remove_edge(std::get<0>(output.output_ports()), std::get<0>(input.input_ports()));
-}
-
-//Removes an edge between port 0 of a multi-output predecessor and a receiver.
-template< typename T, typename R,
-          typename = typename T::output_ports_type >
-inline void remove_edge( T& output, receiver<R>& input) {
-     remove_edge(std::get<0>(output.output_ports()), input);
-}
-//Removes an edge between a sender and port 0 of a multi-input successor.
-template< typename S,  typename V,
-          typename = typename V::input_ports_type >
-inline void remove_edge( sender<S>& output, V& input) {
-     remove_edge(output, std::get<0>(input.input_ports()));
-}
-
-//! Returns a copy of the body from a function or continue node
-template< typename Body, typename Node >
-Body copy_body( Node &n ) {
-    return n.template copy_function_object<Body>();
-}
-
-//composite_node
-template< typename InputTuple, typename OutputTuple > class composite_node;
-
-template< typename... InputTypes, typename... OutputTypes>
-class composite_node <std::tuple<InputTypes...>, std::tuple<OutputTypes...> > : public graph_node {
-
-public:
-    typedef std::tuple< receiver<InputTypes>&... > input_ports_type;
-    typedef std::tuple< sender<OutputTypes>&... > output_ports_type;
-
-private:
-    std::unique_ptr<input_ports_type> my_input_ports;
-    std::unique_ptr<output_ports_type> my_output_ports;
-
-    static const size_t NUM_INPUTS = sizeof...(InputTypes);
-    static const size_t NUM_OUTPUTS = sizeof...(OutputTypes);
-
-protected:
-    void reset_node(reset_flags) override {}
-
-public:
-    composite_node( graph &g ) : graph_node(g) {
-        fgt_multiinput_multioutput_node( CODEPTR(), FLOW_COMPOSITE_NODE, this, &this->my_graph );
-    }
-
-    template<typename T1, typename T2>
-    void set_external_ports(T1&& input_ports_tuple, T2&& output_ports_tuple) {
-        static_assert(NUM_INPUTS == std::tuple_size<input_ports_type>::value, "number of arguments does not match number of input ports");
-        static_assert(NUM_OUTPUTS == std::tuple_size<output_ports_type>::value, "number of arguments does not match number of output ports");
-
-        fgt_internal_input_alias_helper<T1, NUM_INPUTS>::alias_port( this, input_ports_tuple);
-        fgt_internal_output_alias_helper<T2, NUM_OUTPUTS>::alias_port( this, output_ports_tuple);
-
-        my_input_ports.reset( new input_ports_type(std::forward<T1>(input_ports_tuple)) );
-        my_output_ports.reset( new output_ports_type(std::forward<T2>(output_ports_tuple)) );
-    }
-
-    template< typename... NodeTypes >
-    void add_visible_nodes(const NodeTypes&... n) { add_nodes_impl(this, true, n...); }
-
-    template< typename... NodeTypes >
-    void add_nodes(const NodeTypes&... n) { add_nodes_impl(this, false, n...); }
-
-
-    input_ports_type& input_ports() {
-         __TBB_ASSERT(my_input_ports, "input ports not set, call set_external_ports to set input ports");
-         return *my_input_ports;
-    }
-
-    output_ports_type& output_ports() {
-         __TBB_ASSERT(my_output_ports, "output ports not set, call set_external_ports to set output ports");
-         return *my_output_ports;
-    }
-};  // class composite_node
-
-//composite_node with only input ports
-template< typename... InputTypes>
-class composite_node <std::tuple<InputTypes...>, std::tuple<> > : public graph_node {
-public:
-    typedef std::tuple< receiver<InputTypes>&... > input_ports_type;
+                template <typename... Args>
+                indexer_node(const node_set<Args...>& nodes) : indexer_node(nodes.graph_reference()) {
+                    make_edges_in_order(nodes, *this);
+                }
+#endif
+
+                // Copy constructor
+                __TBB_NOINLINE_SYM indexer_node(const indexer_node& other) : unfolded_type(other) {
+                    fgt_multiinput_node<N>(CODEPTR(), FLOW_INDEXER_NODE, &this->my_graph, this->input_ports(),
+                                           static_cast<sender<output_type>*>(this));
+                }
+            };
+#endif//variadic max 10
+
+            template <typename T>
+            inline void internal_make_edge(sender<T>& p, receiver<T>& s) {
+                register_successor(p, s);
+                fgt_make_edge(&p, &s);
+            }
+
+            //! Makes an edge between a single predecessor and a single successor
+            template <typename T>
+            inline void make_edge(sender<T>& p, receiver<T>& s) {
+                internal_make_edge(p, s);
+            }
+
+            //Makes an edge from port 0 of a multi-output predecessor to port 0 of a multi-input successor.
+            template <typename T, typename V, typename = typename T::output_ports_type,
+                      typename = typename V::input_ports_type>
+            inline void make_edge(T& output, V& input) {
+                make_edge(std::get<0>(output.output_ports()), std::get<0>(input.input_ports()));
+            }
+
+            //Makes an edge from port 0 of a multi-output predecessor to a receiver.
+            template <typename T, typename R, typename = typename T::output_ports_type>
+            inline void make_edge(T& output, receiver<R>& input) {
+                make_edge(std::get<0>(output.output_ports()), input);
+            }
+
+            //Makes an edge from a sender to port 0 of a multi-input successor.
+            template <typename S, typename V, typename = typename V::input_ports_type>
+            inline void make_edge(sender<S>& output, V& input) {
+                make_edge(output, std::get<0>(input.input_ports()));
+            }
+
+            template <typename T>
+            inline void internal_remove_edge(sender<T>& p, receiver<T>& s) {
+                remove_successor(p, s);
+                fgt_remove_edge(&p, &s);
+            }
+
+            //! Removes an edge between a single predecessor and a single successor
+            template <typename T>
+            inline void remove_edge(sender<T>& p, receiver<T>& s) {
+                internal_remove_edge(p, s);
+            }
+
+            //Removes an edge between port 0 of a multi-output predecessor and port 0 of a multi-input successor.
+            template <typename T, typename V, typename = typename T::output_ports_type,
+                      typename = typename V::input_ports_type>
+            inline void remove_edge(T& output, V& input) {
+                remove_edge(std::get<0>(output.output_ports()), std::get<0>(input.input_ports()));
+            }
+
+            //Removes an edge between port 0 of a multi-output predecessor and a receiver.
+            template <typename T, typename R, typename = typename T::output_ports_type>
+            inline void remove_edge(T& output, receiver<R>& input) {
+                remove_edge(std::get<0>(output.output_ports()), input);
+            }
+            //Removes an edge between a sender and port 0 of a multi-input successor.
+            template <typename S, typename V, typename = typename V::input_ports_type>
+            inline void remove_edge(sender<S>& output, V& input) {
+                remove_edge(output, std::get<0>(input.input_ports()));
+            }
+
+            //! Returns a copy of the body from a function or continue node
+            template <typename Body, typename Node>
+            Body copy_body(Node& n) {
+                return n.template copy_function_object<Body>();
+            }
+
+            //composite_node
+            template <typename InputTuple, typename OutputTuple>
+            class composite_node;
+
+            template <typename... InputTypes, typename... OutputTypes>
+            class composite_node<std::tuple<InputTypes...>, std::tuple<OutputTypes...>> : public graph_node {
+
+            public:
+                typedef std::tuple<receiver<InputTypes>&...> input_ports_type;
+                typedef std::tuple<sender<OutputTypes>&...> output_ports_type;
+
+            private:
+                std::unique_ptr<input_ports_type> my_input_ports;
+                std::unique_ptr<output_ports_type> my_output_ports;
+
+                static const size_t NUM_INPUTS = sizeof...(InputTypes);
+                static const size_t NUM_OUTPUTS = sizeof...(OutputTypes);
+
+            protected:
+                void reset_node(reset_flags) override {}
+
+            public:
+                composite_node(graph& g) : graph_node(g) {
+                    fgt_multiinput_multioutput_node(CODEPTR(), FLOW_COMPOSITE_NODE, this, &this->my_graph);
+                }
+
+                template <typename T1, typename T2>
+                void set_external_ports(T1&& input_ports_tuple, T2&& output_ports_tuple) {
+                    static_assert(NUM_INPUTS == std::tuple_size<input_ports_type>::value,
+                                  "number of arguments does not match number of input ports");
+                    static_assert(NUM_OUTPUTS == std::tuple_size<output_ports_type>::value,
+                                  "number of arguments does not match number of output ports");
+
+                    fgt_internal_input_alias_helper<T1, NUM_INPUTS>::alias_port(this, input_ports_tuple);
+                    fgt_internal_output_alias_helper<T2, NUM_OUTPUTS>::alias_port(this, output_ports_tuple);
+
+                    my_input_ports.reset(new input_ports_type(std::forward<T1>(input_ports_tuple)));
+                    my_output_ports.reset(new output_ports_type(std::forward<T2>(output_ports_tuple)));
+                }
+
+                template <typename... NodeTypes>
+                void add_visible_nodes(const NodeTypes&... n) {
+                    add_nodes_impl(this, true, n...);
+                }
+
+                template <typename... NodeTypes>
+                void add_nodes(const NodeTypes&... n) {
+                    add_nodes_impl(this, false, n...);
+                }
+
+                input_ports_type& input_ports() {
+                    __TBB_ASSERT(my_input_ports,
+                                 "input ports not set, call set_external_ports to set input ports");
+                    return *my_input_ports;
+                }
+
+                output_ports_type& output_ports() {
+                    __TBB_ASSERT(my_output_ports,
+                                 "output ports not set, call set_external_ports to set output ports");
+                    return *my_output_ports;
+                }
+            };// class composite_node
+
+            //composite_node with only input ports
+            template <typename... InputTypes>
+            class composite_node<std::tuple<InputTypes...>, std::tuple<>> : public graph_node {
+            public:
+                typedef std::tuple<receiver<InputTypes>&...> input_ports_type;
+
+            private:
+                std::unique_ptr<input_ports_type> my_input_ports;
+                static const size_t NUM_INPUTS = sizeof...(InputTypes);
+
+            protected:
+                void reset_node(reset_flags) override {}
+
+            public:
+                composite_node(graph& g) : graph_node(g) { fgt_composite(CODEPTR(), this, &g); }
+
+                template <typename T>
+                void set_external_ports(T&& input_ports_tuple) {
+                    static_assert(NUM_INPUTS == std::tuple_size<input_ports_type>::value,
+                                  "number of arguments does not match number of input ports");
+
+                    fgt_internal_input_alias_helper<T, NUM_INPUTS>::alias_port(this, input_ports_tuple);
 
-private:
-    std::unique_ptr<input_ports_type> my_input_ports;
-    static const size_t NUM_INPUTS = sizeof...(InputTypes);
+                    my_input_ports.reset(new input_ports_type(std::forward<T>(input_ports_tuple)));
+                }
+
+                template <typename... NodeTypes>
+                void add_visible_nodes(const NodeTypes&... n) {
+                    add_nodes_impl(this, true, n...);
+                }
+
+                template <typename... NodeTypes>
+                void add_nodes(const NodeTypes&... n) {
+                    add_nodes_impl(this, false, n...);
+                }
+
+                input_ports_type& input_ports() {
+                    __TBB_ASSERT(my_input_ports,
+                                 "input ports not set, call set_external_ports to set input ports");
+                    return *my_input_ports;
+                }
+
+            };// class composite_node
+
+            //composite_nodes with only output_ports
+            template <typename... OutputTypes>
+            class composite_node<std::tuple<>, std::tuple<OutputTypes...>> : public graph_node {
+            public:
+                typedef std::tuple<sender<OutputTypes>&...> output_ports_type;
+
+            private:
+                std::unique_ptr<output_ports_type> my_output_ports;
+                static const size_t NUM_OUTPUTS = sizeof...(OutputTypes);
+
+            protected:
+                void reset_node(reset_flags) override {}
+
+            public:
+                __TBB_NOINLINE_SYM composite_node(graph& g) : graph_node(g) {
+                    fgt_composite(CODEPTR(), this, &g);
+                }
+
+                template <typename T>
+                void set_external_ports(T&& output_ports_tuple) {
+                    static_assert(NUM_OUTPUTS == std::tuple_size<output_ports_type>::value,
+                                  "number of arguments does not match number of output ports");
+
+                    fgt_internal_output_alias_helper<T, NUM_OUTPUTS>::alias_port(this, output_ports_tuple);
+
+                    my_output_ports.reset(new output_ports_type(std::forward<T>(output_ports_tuple)));
+                }
+
+                template <typename... NodeTypes>
+                void add_visible_nodes(const NodeTypes&... n) {
+                    add_nodes_impl(this, true, n...);
+                }
+
+                template <typename... NodeTypes>
+                void add_nodes(const NodeTypes&... n) {
+                    add_nodes_impl(this, false, n...);
+                }
+
+                output_ports_type& output_ports() {
+                    __TBB_ASSERT(my_output_ports,
+                                 "output ports not set, call set_external_ports to set output ports");
+                    return *my_output_ports;
+                }
+
+            };// class composite_node
 
-protected:
-    void reset_node(reset_flags) override {}
+            template <typename Gateway>
+            class async_body_base : no_assign {
+            public:
+                typedef Gateway gateway_type;
 
-public:
-    composite_node( graph &g ) : graph_node(g) {
-        fgt_composite( CODEPTR(), this, &g );
-    }
+                async_body_base(gateway_type* gateway) : my_gateway(gateway) {}
+                void set_gateway(gateway_type* gateway) { my_gateway = gateway; }
 
-   template<typename T>
-   void set_external_ports(T&& input_ports_tuple) {
-       static_assert(NUM_INPUTS == std::tuple_size<input_ports_type>::value, "number of arguments does not match number of input ports");
+            protected:
+                gateway_type* my_gateway;
+            };
 
-       fgt_internal_input_alias_helper<T, NUM_INPUTS>::alias_port( this, input_ports_tuple);
+            template <typename Input, typename Ports, typename Gateway, typename Body>
+            class async_body : public async_body_base<Gateway> {
+            private:
+                Body my_body;
 
-       my_input_ports.reset( new input_ports_type(std::forward<T>(input_ports_tuple)) );
-   }
+            public:
+                typedef async_body_base<Gateway> base_type;
+                typedef Gateway gateway_type;
 
-    template< typename... NodeTypes >
-    void add_visible_nodes(const NodeTypes&... n) { add_nodes_impl(this, true, n...); }
+                async_body(const Body& body, gateway_type* gateway) : base_type(gateway), my_body(body) {}
 
-    template< typename... NodeTypes >
-    void add_nodes( const NodeTypes&... n) { add_nodes_impl(this, false, n...); }
+                void operator()(const Input& v, Ports&) noexcept(
+                        noexcept(tbb::detail::invoke(my_body, v, std::declval<gateway_type&>()))) {
+                    tbb::detail::invoke(my_body, v, *this->my_gateway);
+                }
 
+                Body get_body() { return my_body; }
+            };
+
+            //! Implements async node
+            template <typename Input, typename Output, typename Policy = queueing_lightweight>
+            __TBB_requires(
+                    std::default_initializable<Input>&& std::copy_constructible<Input>) class async_node
+                : public multifunction_node<Input, std::tuple<Output>, Policy>,
+                  public sender<Output> {
+                typedef multifunction_node<Input, std::tuple<Output>, Policy> base_type;
+                typedef multifunction_input<Input, typename base_type::output_ports_type, Policy,
+                                            cache_aligned_allocator<Input>>
+                        mfn_input_type;
+
+            public:
+                typedef Input input_type;
+                typedef Output output_type;
+                typedef receiver<input_type> receiver_type;
+                typedef receiver<output_type> successor_type;
+                typedef sender<input_type> predecessor_type;
+                typedef receiver_gateway<output_type> gateway_type;
+                typedef async_body_base<gateway_type> async_body_base_type;
+                typedef typename base_type::output_ports_type output_ports_type;
+
+            private:
+                class receiver_gateway_impl : public receiver_gateway<Output> {
+                public:
+                    receiver_gateway_impl(async_node* node) : my_node(node) {}
+                    void reserve_wait() override {
+                        fgt_async_reserve(static_cast<typename async_node::receiver_type*>(my_node),
+                                          &my_node->my_graph);
+                        my_node->my_graph.reserve_wait();
+                    }
 
-    input_ports_type& input_ports() {
-         __TBB_ASSERT(my_input_ports, "input ports not set, call set_external_ports to set input ports");
-         return *my_input_ports;
-    }
+                    void release_wait() override {
+                        async_node* n = my_node;
+                        graph* g = &n->my_graph;
+                        g->release_wait();
+                        fgt_async_commit(static_cast<typename async_node::receiver_type*>(n), g);
+                    }
 
-};  // class composite_node
+                    //! Implements gateway_type::try_put for an external activity to submit a message to FG
+                    bool try_put(const Output& i) override { return my_node->try_put_impl(i); }
+
+                private:
+                    async_node* my_node;
+                } my_gateway;
+
+                //The substitute of 'this' for member construction, to prevent compiler warnings
+                async_node* self() { return this; }
+
+                //! Implements gateway_type::try_put for an external activity to submit a message to FG
+                bool try_put_impl(const Output& i) {
+                    multifunction_output<Output>& port_0 = output_port<0>(*this);
+                    broadcast_cache<output_type>& port_successors = port_0.successors();
+                    fgt_async_try_put_begin(this, &port_0);
+                    // TODO revamp: change to std::list<graph_task*>
+                    graph_task_list tasks;
+                    bool is_at_least_one_put_successful
+                            = port_successors.gather_successful_try_puts(i, tasks);
+                    __TBB_ASSERT(is_at_least_one_put_successful || tasks.empty(),
+                                 "Return status is inconsistent with the method operation.");
+
+                    while (!tasks.empty()) { enqueue_in_graph_arena(this->my_graph, tasks.pop_front()); }
+                    fgt_async_try_put_end(this, &port_0);
+                    return is_at_least_one_put_successful;
+                }
 
-//composite_nodes with only output_ports
-template<typename... OutputTypes>
-class composite_node <std::tuple<>, std::tuple<OutputTypes...> > : public graph_node {
-public:
-    typedef std::tuple< sender<OutputTypes>&... > output_ports_type;
+            public:
+                template <typename Body>
+                __TBB_requires(async_node_body<Body, input_type, gateway_type>) __TBB_NOINLINE_SYM
+                        async_node(graph& g, size_t concurrency, Body body, Policy = Policy(),
+                                   node_priority_t a_priority = no_priority)
+                    : base_type(g, concurrency,
+                                async_body<Input, typename base_type::output_ports_type, gateway_type, Body>(
+                                        body, &my_gateway),
+                                a_priority),
+                      my_gateway(self()) {
+                    fgt_multioutput_node_with_body<1>(CODEPTR(), FLOW_ASYNC_NODE, &this->my_graph,
+                                                      static_cast<receiver<input_type>*>(this),
+                                                      this->output_ports(), this->my_body);
+                }
 
-private:
-    std::unique_ptr<output_ports_type> my_output_ports;
-    static const size_t NUM_OUTPUTS = sizeof...(OutputTypes);
-
-protected:
-    void reset_node(reset_flags) override {}
-
-public:
-    __TBB_NOINLINE_SYM composite_node( graph &g ) : graph_node(g) {
-        fgt_composite( CODEPTR(), this, &g );
-    }
-
-   template<typename T>
-   void set_external_ports(T&& output_ports_tuple) {
-       static_assert(NUM_OUTPUTS == std::tuple_size<output_ports_type>::value, "number of arguments does not match number of output ports");
-
-       fgt_internal_output_alias_helper<T, NUM_OUTPUTS>::alias_port( this, output_ports_tuple);
-
-       my_output_ports.reset( new output_ports_type(std::forward<T>(output_ports_tuple)) );
-   }
-
-    template<typename... NodeTypes >
-    void add_visible_nodes(const NodeTypes&... n) { add_nodes_impl(this, true, n...); }
-
-    template<typename... NodeTypes >
-    void add_nodes(const NodeTypes&... n) { add_nodes_impl(this, false, n...); }
-
-
-    output_ports_type& output_ports() {
-         __TBB_ASSERT(my_output_ports, "output ports not set, call set_external_ports to set output ports");
-         return *my_output_ports;
-    }
-
-};  // class composite_node
-
-template<typename Gateway>
-class async_body_base: no_assign {
-public:
-    typedef Gateway gateway_type;
-
-    async_body_base(gateway_type *gateway): my_gateway(gateway) { }
-    void set_gateway(gateway_type *gateway) {
-        my_gateway = gateway;
-    }
-
-protected:
-    gateway_type *my_gateway;
-};
-
-template<typename Input, typename Ports, typename Gateway, typename Body>
-class async_body: public async_body_base<Gateway> {
-private:
-    Body my_body;
-
-public:
-    typedef async_body_base<Gateway> base_type;
-    typedef Gateway gateway_type;
-
-    async_body(const Body &body, gateway_type *gateway)
-        : base_type(gateway), my_body(body) { }
-
-    void operator()( const Input &v, Ports & ) noexcept(noexcept(tbb::detail::invoke(my_body, v, std::declval<gateway_type&>()))) {
-        tbb::detail::invoke(my_body, v, *this->my_gateway);
-    }
-
-    Body get_body() { return my_body; }
-};
-
-//! Implements async node
-template < typename Input, typename Output,
-           typename Policy = queueing_lightweight >
-    __TBB_requires(std::default_initializable<Input> && std::copy_constructible<Input>)
-class async_node
-    : public multifunction_node< Input, std::tuple< Output >, Policy >, public sender< Output >
-{
-    typedef multifunction_node< Input, std::tuple< Output >, Policy > base_type;
-    typedef multifunction_input<
-        Input, typename base_type::output_ports_type, Policy, cache_aligned_allocator<Input>> mfn_input_type;
-
-public:
-    typedef Input input_type;
-    typedef Output output_type;
-    typedef receiver<input_type> receiver_type;
-    typedef receiver<output_type> successor_type;
-    typedef sender<input_type> predecessor_type;
-    typedef receiver_gateway<output_type> gateway_type;
-    typedef async_body_base<gateway_type> async_body_base_type;
-    typedef typename base_type::output_ports_type output_ports_type;
-
-private:
-    class receiver_gateway_impl: public receiver_gateway<Output> {
-    public:
-        receiver_gateway_impl(async_node* node): my_node(node) {}
-        void reserve_wait() override {
-            fgt_async_reserve(static_cast<typename async_node::receiver_type *>(my_node), &my_node->my_graph);
-            my_node->my_graph.reserve_wait();
-        }
-
-        void release_wait() override {
-            async_node* n = my_node;
-            graph* g = &n->my_graph;
-            g->release_wait();
-            fgt_async_commit(static_cast<typename async_node::receiver_type *>(n), g);
-        }
-
-        //! Implements gateway_type::try_put for an external activity to submit a message to FG
-        bool try_put(const Output &i) override {
-            return my_node->try_put_impl(i);
-        }
-
-    private:
-        async_node* my_node;
-    } my_gateway;
-
-    //The substitute of 'this' for member construction, to prevent compiler warnings
-    async_node* self() { return this; }
-
-    //! Implements gateway_type::try_put for an external activity to submit a message to FG
-    bool try_put_impl(const Output &i) {
-        multifunction_output<Output> &port_0 = output_port<0>(*this);
-        broadcast_cache<output_type>& port_successors = port_0.successors();
-        fgt_async_try_put_begin(this, &port_0);
-        // TODO revamp: change to std::list<graph_task*>
-        graph_task_list tasks;
-        bool is_at_least_one_put_successful = port_successors.gather_successful_try_puts(i, tasks);
-        __TBB_ASSERT( is_at_least_one_put_successful || tasks.empty(),
-                      "Return status is inconsistent with the method operation." );
-
-        while( !tasks.empty() ) {
-            enqueue_in_graph_arena(this->my_graph, tasks.pop_front());
-        }
-        fgt_async_try_put_end(this, &port_0);
-        return is_at_least_one_put_successful;
-    }
-
-public:
-    template<typename Body>
-        __TBB_requires(async_node_body<Body, input_type, gateway_type>)
-    __TBB_NOINLINE_SYM async_node(
-        graph &g, size_t concurrency,
-        Body body, Policy = Policy(), node_priority_t a_priority = no_priority
-    ) : base_type(
-        g, concurrency,
-        async_body<Input, typename base_type::output_ports_type, gateway_type, Body>
-        (body, &my_gateway), a_priority ), my_gateway(self()) {
-        fgt_multioutput_node_with_body<1>(
-            CODEPTR(), FLOW_ASYNC_NODE,
-            &this->my_graph, static_cast<receiver<input_type> *>(this),
-            this->output_ports(), this->my_body
-        );
-    }
-
-    template <typename Body>
-        __TBB_requires(async_node_body<Body, input_type, gateway_type>)
-    __TBB_NOINLINE_SYM async_node(graph& g, size_t concurrency, Body body, node_priority_t a_priority)
-        : async_node(g, concurrency, body, Policy(), a_priority) {}
+                template <typename Body>
+                __TBB_requires(async_node_body<Body, input_type, gateway_type>) __TBB_NOINLINE_SYM
+                        async_node(graph& g, size_t concurrency, Body body, node_priority_t a_priority)
+                    : async_node(g, concurrency, body, Policy(), a_priority) {}
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-    template <typename Body, typename... Args>
-        __TBB_requires(async_node_body<Body, input_type, gateway_type>)
-    __TBB_NOINLINE_SYM async_node(
-        const node_set<Args...>& nodes, size_t concurrency, Body body,
-        Policy = Policy(), node_priority_t a_priority = no_priority )
-        : async_node(nodes.graph_reference(), concurrency, body, a_priority) {
-        make_edges_in_order(nodes, *this);
-    }
-
-    template <typename Body, typename... Args>
-        __TBB_requires(async_node_body<Body, input_type, gateway_type>)
-    __TBB_NOINLINE_SYM async_node(const node_set<Args...>& nodes, size_t concurrency, Body body, node_priority_t a_priority)
-        : async_node(nodes, concurrency, body, Policy(), a_priority) {}
-#endif // __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-
-    __TBB_NOINLINE_SYM async_node( const async_node &other ) : base_type(other), sender<Output>(), my_gateway(self()) {
-        static_cast<async_body_base_type*>(this->my_body->get_body_ptr())->set_gateway(&my_gateway);
-        static_cast<async_body_base_type*>(this->my_init_body->get_body_ptr())->set_gateway(&my_gateway);
-
-        fgt_multioutput_node_with_body<1>( CODEPTR(), FLOW_ASYNC_NODE,
-                &this->my_graph, static_cast<receiver<input_type> *>(this),
-                this->output_ports(), this->my_body );
-    }
-
-    gateway_type& gateway() {
-        return my_gateway;
-    }
-
-    // Define sender< Output >
-
-    //! Add a new successor to this node
-    bool register_successor(successor_type&) override {
-        __TBB_ASSERT(false, "Successors must be registered only via ports");
-        return false;
-    }
-
-    //! Removes a successor from this node
-    bool remove_successor(successor_type&) override {
-        __TBB_ASSERT(false, "Successors must be removed only via ports");
-        return false;
-    }
-
-    template<typename Body>
-    Body copy_function_object() {
-        typedef multifunction_body<input_type, typename base_type::output_ports_type> mfn_body_type;
-        typedef async_body<Input, typename base_type::output_ports_type, gateway_type, Body> async_body_type;
-        mfn_body_type &body_ref = *this->my_body;
-        async_body_type ab = *static_cast<async_body_type*>(dynamic_cast< multifunction_body_leaf<input_type, typename base_type::output_ports_type, async_body_type> & >(body_ref).get_body_ptr());
-        return ab.get_body();
-    }
-
-protected:
-
-    void reset_node( reset_flags f) override {
-       base_type::reset_node(f);
-    }
-};
+                template <typename Body, typename... Args>
+                __TBB_requires(async_node_body<Body, input_type, gateway_type>) __TBB_NOINLINE_SYM
+                        async_node(const node_set<Args...>& nodes, size_t concurrency, Body body,
+                                   Policy = Policy(), node_priority_t a_priority = no_priority)
+                    : async_node(nodes.graph_reference(), concurrency, body, a_priority) {
+                    make_edges_in_order(nodes, *this);
+                }
+
+                template <typename Body, typename... Args>
+                __TBB_requires(async_node_body<Body, input_type, gateway_type>) __TBB_NOINLINE_SYM
+                        async_node(const node_set<Args...>& nodes, size_t concurrency, Body body,
+                                   node_priority_t a_priority)
+                    : async_node(nodes, concurrency, body, Policy(), a_priority) {}
+#endif// __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+
+                __TBB_NOINLINE_SYM async_node(const async_node& other)
+                    : base_type(other), sender<Output>(), my_gateway(self()) {
+                    static_cast<async_body_base_type*>(this->my_body->get_body_ptr())
+                            ->set_gateway(&my_gateway);
+                    static_cast<async_body_base_type*>(this->my_init_body->get_body_ptr())
+                            ->set_gateway(&my_gateway);
+
+                    fgt_multioutput_node_with_body<1>(CODEPTR(), FLOW_ASYNC_NODE, &this->my_graph,
+                                                      static_cast<receiver<input_type>*>(this),
+                                                      this->output_ports(), this->my_body);
+                }
+
+                gateway_type& gateway() { return my_gateway; }
+
+                // Define sender< Output >
+
+                //! Add a new successor to this node
+                bool register_successor(successor_type&) override {
+                    __TBB_ASSERT(false, "Successors must be registered only via ports");
+                    return false;
+                }
+
+                //! Removes a successor from this node
+                bool remove_successor(successor_type&) override {
+                    __TBB_ASSERT(false, "Successors must be removed only via ports");
+                    return false;
+                }
+
+                template <typename Body>
+                Body copy_function_object() {
+                    typedef multifunction_body<input_type, typename base_type::output_ports_type>
+                            mfn_body_type;
+                    typedef async_body<Input, typename base_type::output_ports_type, gateway_type, Body>
+                            async_body_type;
+                    mfn_body_type& body_ref = *this->my_body;
+                    async_body_type ab = *static_cast<async_body_type*>(
+                            dynamic_cast<multifunction_body_leaf<
+                                    input_type, typename base_type::output_ports_type, async_body_type>&>(
+                                    body_ref)
+                                    .get_body_ptr());
+                    return ab.get_body();
+                }
+
+            protected:
+                void reset_node(reset_flags f) override { base_type::reset_node(f); }
+            };
 
 #include "detail/_flow_graph_node_set_impl.h"
 
-template< typename T >
-class overwrite_node : public graph_node, public receiver<T>, public sender<T> {
-public:
-    typedef T input_type;
-    typedef T output_type;
-    typedef typename receiver<input_type>::predecessor_type predecessor_type;
-    typedef typename sender<output_type>::successor_type successor_type;
-
-    __TBB_NOINLINE_SYM explicit overwrite_node(graph &g)
-        : graph_node(g), my_successors(this), my_buffer_is_valid(false)
-    {
-        fgt_node( CODEPTR(), FLOW_OVERWRITE_NODE, &this->my_graph,
-                  static_cast<receiver<input_type> *>(this), static_cast<sender<output_type> *>(this) );
-    }
+            template <typename T>
+            class overwrite_node : public graph_node, public receiver<T>, public sender<T> {
+            public:
+                typedef T input_type;
+                typedef T output_type;
+                typedef typename receiver<input_type>::predecessor_type predecessor_type;
+                typedef typename sender<output_type>::successor_type successor_type;
+
+                __TBB_NOINLINE_SYM explicit overwrite_node(graph& g)
+                    : graph_node(g), my_successors(this), my_buffer_is_valid(false) {
+                    fgt_node(CODEPTR(), FLOW_OVERWRITE_NODE, &this->my_graph,
+                             static_cast<receiver<input_type>*>(this),
+                             static_cast<sender<output_type>*>(this));
+                }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-    template <typename... Args>
-    overwrite_node(const node_set<Args...>& nodes) : overwrite_node(nodes.graph_reference()) {
-        make_edges_in_order(nodes, *this);
-    }
-#endif
-
-    //! Copy constructor; doesn't take anything from src; default won't work
-    __TBB_NOINLINE_SYM overwrite_node( const overwrite_node& src ) : overwrite_node(src.my_graph) {}
-
-    ~overwrite_node() {}
-
-    bool register_successor( successor_type &s ) override {
-        spin_mutex::scoped_lock l( my_mutex );
-        if (my_buffer_is_valid && is_graph_active( my_graph )) {
-            // We have a valid value that must be forwarded immediately.
-            bool ret = s.try_put( my_buffer );
-            if ( ret ) {
-                // We add the successor that accepted our put
-                my_successors.register_successor( s );
-            } else {
-                // In case of reservation a race between the moment of reservation and register_successor can appear,
-                // because failed reserve does not mean that register_successor is not ready to put a message immediately.
-                // We have some sort of infinite loop: reserving node tries to set pull state for the edge,
-                // but overwrite_node tries to return push state back. That is why we have to break this loop with task creation.
-                d1::small_object_allocator allocator{};
-                typedef register_predecessor_task task_type;
-                graph_task* t = allocator.new_object<task_type>(graph_reference(), allocator, *this, s);
-                spawn_in_graph_arena( my_graph, *t );
-            }
-        } else {
-            // No valid value yet, just add as successor
-            my_successors.register_successor( s );
-        }
-        return true;
-    }
-
-    bool remove_successor( successor_type &s ) override {
-        spin_mutex::scoped_lock l( my_mutex );
-        my_successors.remove_successor(s);
-        return true;
-    }
-
-    bool try_get( input_type &v ) override {
-        spin_mutex::scoped_lock l( my_mutex );
-        if ( my_buffer_is_valid ) {
-            v = my_buffer;
-            return true;
-        }
-        return false;
-    }
+                template <typename... Args>
+                overwrite_node(const node_set<Args...>& nodes) : overwrite_node(nodes.graph_reference()) {
+                    make_edges_in_order(nodes, *this);
+                }
+#endif
+
+                //! Copy constructor; doesn't take anything from src; default won't work
+                __TBB_NOINLINE_SYM overwrite_node(const overwrite_node& src) : overwrite_node(src.my_graph) {}
+
+                ~overwrite_node() {}
+
+                bool register_successor(successor_type& s) override {
+                    spin_mutex::scoped_lock l(my_mutex);
+                    if (my_buffer_is_valid && is_graph_active(my_graph)) {
+                        // We have a valid value that must be forwarded immediately.
+                        bool ret = s.try_put(my_buffer);
+                        if (ret) {
+                            // We add the successor that accepted our put
+                            my_successors.register_successor(s);
+                        } else {
+                            // In case of reservation a race between the moment of reservation and register_successor can appear,
+                            // because failed reserve does not mean that register_successor is not ready to put a message immediately.
+                            // We have some sort of infinite loop: reserving node tries to set pull state for the edge,
+                            // but overwrite_node tries to return push state back. That is why we have to break this loop with task creation.
+                            d1::small_object_allocator allocator {};
+                            typedef register_predecessor_task task_type;
+                            graph_task* t
+                                    = allocator.new_object<task_type>(graph_reference(), allocator, *this, s);
+                            spawn_in_graph_arena(my_graph, *t);
+                        }
+                    } else {
+                        // No valid value yet, just add as successor
+                        my_successors.register_successor(s);
+                    }
+                    return true;
+                }
+
+                bool remove_successor(successor_type& s) override {
+                    spin_mutex::scoped_lock l(my_mutex);
+                    my_successors.remove_successor(s);
+                    return true;
+                }
+
+                bool try_get(input_type& v) override {
+                    spin_mutex::scoped_lock l(my_mutex);
+                    if (my_buffer_is_valid) {
+                        v = my_buffer;
+                        return true;
+                    }
+                    return false;
+                }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
-    bool try_get( input_type &v, message_metainfo& metainfo ) override {
-        spin_mutex::scoped_lock l( my_mutex );
-        if (my_buffer_is_valid) {
-            v = my_buffer;
-            metainfo = my_buffered_metainfo;
-
-            // Since the successor of the node will use move semantics while wrapping the metainfo
-            // that is designed to transfer the ownership of the value from single-push buffer to the task
-            // It is required to reserve one more reference here because the value keeps in the buffer
-            // and the ownership is not transferred
-            for (auto msg_waiter : metainfo.waiters()) {
-                msg_waiter->reserve(1);
-            }
-            return true;
-        }
-        return false;
-    }
+                bool try_get(input_type& v, message_metainfo& metainfo) override {
+                    spin_mutex::scoped_lock l(my_mutex);
+                    if (my_buffer_is_valid) {
+                        v = my_buffer;
+                        metainfo = my_buffered_metainfo;
+
+                        // Since the successor of the node will use move semantics while wrapping the metainfo
+                        // that is designed to transfer the ownership of the value from single-push buffer to the task
+                        // It is required to reserve one more reference here because the value keeps in the buffer
+                        // and the ownership is not transferred
+                        for (auto msg_waiter : metainfo.waiters()) { msg_waiter->reserve(1); }
+                        return true;
+                    }
+                    return false;
+                }
 #endif
 
-    //! Reserves an item
-    bool try_reserve( T &v ) override {
-        return try_get(v);
-    }
+                //! Reserves an item
+                bool try_reserve(T& v) override { return try_get(v); }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
-private:
-    bool try_reserve(T& v, message_metainfo& metainfo) override {
-        spin_mutex::scoped_lock l( my_mutex );
-        if (my_buffer_is_valid) {
-            v = my_buffer;
-            metainfo = my_buffered_metainfo;
-            return true;
-        }
-        return false;
-    }
-public:
-#endif
-
-    //! Releases the reserved item
-    bool try_release() override { return true; }
-
-    //! Consumes the reserved item
-    bool try_consume() override { return true; }
-
-    bool is_valid() {
-       spin_mutex::scoped_lock l( my_mutex );
-       return my_buffer_is_valid;
-    }
-
-    void clear() {
-       spin_mutex::scoped_lock l( my_mutex );
-       my_buffer_is_valid = false;
-#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
-       for (auto msg_waiter : my_buffered_metainfo.waiters()) {
-           msg_waiter->release(1);
-       }
-       my_buffered_metainfo = message_metainfo{};
+            private:
+                bool try_reserve(T& v, message_metainfo& metainfo) override {
+                    spin_mutex::scoped_lock l(my_mutex);
+                    if (my_buffer_is_valid) {
+                        v = my_buffer;
+                        metainfo = my_buffered_metainfo;
+                        return true;
+                    }
+                    return false;
+                }
+
+            public:
 #endif
-    }
 
-protected:
+                //! Releases the reserved item
+                bool try_release() override { return true; }
+
+                //! Consumes the reserved item
+                bool try_consume() override { return true; }
+
+                bool is_valid() {
+                    spin_mutex::scoped_lock l(my_mutex);
+                    return my_buffer_is_valid;
+                }
+
+                void clear() {
+                    spin_mutex::scoped_lock l(my_mutex);
+                    my_buffer_is_valid = false;
+#if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+                    for (auto msg_waiter : my_buffered_metainfo.waiters()) { msg_waiter->release(1); }
+                    my_buffered_metainfo = message_metainfo {};
+#endif
+                }
 
-    template< typename R, typename B > friend class run_and_put_task;
-    template<typename X, typename Y> friend class broadcast_cache;
-    template<typename X, typename Y> friend class round_robin_cache;
-    graph_task* try_put_task( const input_type &v ) override {
-        spin_mutex::scoped_lock l( my_mutex );
-        return try_put_task_impl(v __TBB_FLOW_GRAPH_METAINFO_ARG(message_metainfo{}));
-    }
+            protected:
+                template <typename R, typename B>
+                friend class run_and_put_task;
+                template <typename X, typename Y>
+                friend class broadcast_cache;
+                template <typename X, typename Y>
+                friend class round_robin_cache;
+                graph_task* try_put_task(const input_type& v) override {
+                    spin_mutex::scoped_lock l(my_mutex);
+                    return try_put_task_impl(v __TBB_FLOW_GRAPH_METAINFO_ARG(message_metainfo {}));
+                }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
-    graph_task* try_put_task(const input_type& v, const message_metainfo& metainfo) override {
-        spin_mutex::scoped_lock l( my_mutex );
-        return try_put_task_impl(v, metainfo);
-    }
+                graph_task* try_put_task(const input_type& v, const message_metainfo& metainfo) override {
+                    spin_mutex::scoped_lock l(my_mutex);
+                    return try_put_task_impl(v, metainfo);
+                }
 #endif
 
-    graph_task * try_put_task_impl(const input_type &v __TBB_FLOW_GRAPH_METAINFO_ARG(const message_metainfo& metainfo)) {
-        my_buffer = v;
-        my_buffer_is_valid = true;
+                graph_task* try_put_task_impl(
+                        const input_type& v __TBB_FLOW_GRAPH_METAINFO_ARG(const message_metainfo& metainfo)) {
+                    my_buffer = v;
+                    my_buffer_is_valid = true;
 #if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
-        // Since the new item is pushed to the buffer - reserving the waiters
-        for (auto msg_waiter : metainfo.waiters()) {
-            msg_waiter->reserve(1);
-        }
-
-        // Since the item is taken out from the buffer - releasing the stored waiters
-        for (auto msg_waiter : my_buffered_metainfo.waiters()) {
-            msg_waiter->release(1);
-        }
-
-        my_buffered_metainfo = metainfo;
-#endif
-        graph_task* rtask = my_successors.try_put_task(v __TBB_FLOW_GRAPH_METAINFO_ARG(my_buffered_metainfo) );
-        if (!rtask) rtask = SUCCESSFULLY_ENQUEUED;
-        return rtask;
-    }
-
-    graph& graph_reference() const override {
-        return my_graph;
-    }
-
-    //! Breaks an infinite loop between the node reservation and register_successor call
-    struct register_predecessor_task : public graph_task {
-        register_predecessor_task(
-            graph& g, d1::small_object_allocator& allocator, predecessor_type& owner, successor_type& succ)
-            : graph_task(g, allocator), o(owner), s(succ) {};
-
-        d1::task* execute(d1::execution_data& ed) override {
-            // TODO revamp: investigate why qualification is needed for register_successor() call
-            using tbb::detail::d2::register_predecessor;
-            using tbb::detail::d2::register_successor;
-            if ( !register_predecessor(s, o) ) {
-                register_successor(o, s);
-            }
-            finalize<register_predecessor_task>(ed);
-            return nullptr;
-        }
-
-        d1::task* cancel(d1::execution_data& ed) override {
-            finalize<register_predecessor_task>(ed);
-            return nullptr;
-        }
-
-        predecessor_type& o;
-        successor_type& s;
-    };
-
-    spin_mutex my_mutex;
-    broadcast_cache< input_type, null_rw_mutex > my_successors;
-    input_type my_buffer;
+                    // Since the new item is pushed to the buffer - reserving the waiters
+                    for (auto msg_waiter : metainfo.waiters()) { msg_waiter->reserve(1); }
+
+                    // Since the item is taken out from the buffer - releasing the stored waiters
+                    for (auto msg_waiter : my_buffered_metainfo.waiters()) { msg_waiter->release(1); }
+
+                    my_buffered_metainfo = metainfo;
+#endif
+                    graph_task* rtask = my_successors.try_put_task(
+                            v __TBB_FLOW_GRAPH_METAINFO_ARG(my_buffered_metainfo));
+                    if (!rtask) rtask = SUCCESSFULLY_ENQUEUED;
+                    return rtask;
+                }
+
+                graph& graph_reference() const override { return my_graph; }
+
+                //! Breaks an infinite loop between the node reservation and register_successor call
+                struct register_predecessor_task : public graph_task {
+                    register_predecessor_task(graph& g, d1::small_object_allocator& allocator,
+                                              predecessor_type& owner, successor_type& succ)
+                        : graph_task(g, allocator), o(owner), s(succ) {};
+
+                    d1::task* execute(d1::execution_data& ed) override {
+                        // TODO revamp: investigate why qualification is needed for register_successor() call
+                        using tbb::detail::d2::register_predecessor;
+                        using tbb::detail::d2::register_successor;
+                        if (!register_predecessor(s, o)) { register_successor(o, s); }
+                        finalize<register_predecessor_task>(ed);
+                        return nullptr;
+                    }
+
+                    d1::task* cancel(d1::execution_data& ed) override {
+                        finalize<register_predecessor_task>(ed);
+                        return nullptr;
+                    }
+
+                    predecessor_type& o;
+                    successor_type& s;
+                };
+
+                spin_mutex my_mutex;
+                broadcast_cache<input_type, null_rw_mutex> my_successors;
+                input_type my_buffer;
 #if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
-    message_metainfo my_buffered_metainfo;
-#endif
-    bool my_buffer_is_valid;
-
-    void reset_node( reset_flags f) override {
-        my_buffer_is_valid = false;
-       if (f&rf_clear_edges) {
-           my_successors.clear();
-       }
-    }
-};  // overwrite_node
-
-template< typename T >
-class write_once_node : public overwrite_node<T> {
-public:
-    typedef T input_type;
-    typedef T output_type;
-    typedef overwrite_node<T> base_type;
-    typedef typename receiver<input_type>::predecessor_type predecessor_type;
-    typedef typename sender<output_type>::successor_type successor_type;
-
-    //! Constructor
-    __TBB_NOINLINE_SYM explicit write_once_node(graph& g) : base_type(g) {
-        fgt_node( CODEPTR(), FLOW_WRITE_ONCE_NODE, &(this->my_graph),
-                                 static_cast<receiver<input_type> *>(this),
-                                 static_cast<sender<output_type> *>(this) );
-    }
+                message_metainfo my_buffered_metainfo;
+#endif
+                bool my_buffer_is_valid;
+
+                void reset_node(reset_flags f) override {
+                    my_buffer_is_valid = false;
+                    if (f & rf_clear_edges) { my_successors.clear(); }
+                }
+            };// overwrite_node
+
+            template <typename T>
+            class write_once_node : public overwrite_node<T> {
+            public:
+                typedef T input_type;
+                typedef T output_type;
+                typedef overwrite_node<T> base_type;
+                typedef typename receiver<input_type>::predecessor_type predecessor_type;
+                typedef typename sender<output_type>::successor_type successor_type;
+
+                //! Constructor
+                __TBB_NOINLINE_SYM explicit write_once_node(graph& g) : base_type(g) {
+                    fgt_node(CODEPTR(), FLOW_WRITE_ONCE_NODE, &(this->my_graph),
+                             static_cast<receiver<input_type>*>(this),
+                             static_cast<sender<output_type>*>(this));
+                }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-    template <typename... Args>
-    write_once_node(const node_set<Args...>& nodes) : write_once_node(nodes.graph_reference()) {
-        make_edges_in_order(nodes, *this);
-    }
-#endif
-
-    //! Copy constructor: call base class copy constructor
-    __TBB_NOINLINE_SYM write_once_node( const write_once_node& src ) : base_type(src) {
-        fgt_node( CODEPTR(), FLOW_WRITE_ONCE_NODE, &(this->my_graph),
-                                 static_cast<receiver<input_type> *>(this),
-                                 static_cast<sender<output_type> *>(this) );
-    }
-
-protected:
-    template< typename R, typename B > friend class run_and_put_task;
-    template<typename X, typename Y> friend class broadcast_cache;
-    template<typename X, typename Y> friend class round_robin_cache;
-    graph_task *try_put_task( const T &v ) override {
-        spin_mutex::scoped_lock l( this->my_mutex );
-        return this->my_buffer_is_valid ? nullptr : this->try_put_task_impl(v __TBB_FLOW_GRAPH_METAINFO_ARG(message_metainfo{}));
-    }
+                template <typename... Args>
+                write_once_node(const node_set<Args...>& nodes) : write_once_node(nodes.graph_reference()) {
+                    make_edges_in_order(nodes, *this);
+                }
+#endif
+
+                //! Copy constructor: call base class copy constructor
+                __TBB_NOINLINE_SYM write_once_node(const write_once_node& src) : base_type(src) {
+                    fgt_node(CODEPTR(), FLOW_WRITE_ONCE_NODE, &(this->my_graph),
+                             static_cast<receiver<input_type>*>(this),
+                             static_cast<sender<output_type>*>(this));
+                }
+
+            protected:
+                template <typename R, typename B>
+                friend class run_and_put_task;
+                template <typename X, typename Y>
+                friend class broadcast_cache;
+                template <typename X, typename Y>
+                friend class round_robin_cache;
+                graph_task* try_put_task(const T& v) override {
+                    spin_mutex::scoped_lock l(this->my_mutex);
+                    return this->my_buffer_is_valid ? nullptr
+                                                    : this->try_put_task_impl(v __TBB_FLOW_GRAPH_METAINFO_ARG(
+                                                              message_metainfo {}));
+                }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
-    graph_task* try_put_task(const T& v, const message_metainfo& metainfo) override {
-        spin_mutex::scoped_lock l( this->my_mutex );
-        return this->my_buffer_is_valid ? nullptr : this->try_put_task_impl(v, metainfo);
-    }
-#endif
-}; // write_once_node
-
-inline void set_name(const graph& g, const char *name) {
-    fgt_graph_desc(&g, name);
-}
-
-template <typename Output>
-inline void set_name(const input_node<Output>& node, const char *name) {
-    fgt_node_desc(&node, name);
-}
-
-template <typename Input, typename Output, typename Policy>
-inline void set_name(const function_node<Input, Output, Policy>& node, const char *name) {
-    fgt_node_desc(&node, name);
-}
-
-template <typename Output, typename Policy>
-inline void set_name(const continue_node<Output,Policy>& node, const char *name) {
-    fgt_node_desc(&node, name);
-}
-
-template <typename T>
-inline void set_name(const broadcast_node<T>& node, const char *name) {
-    fgt_node_desc(&node, name);
-}
-
-template <typename T>
-inline void set_name(const buffer_node<T>& node, const char *name) {
-    fgt_node_desc(&node, name);
-}
-
-template <typename T>
-inline void set_name(const queue_node<T>& node, const char *name) {
-    fgt_node_desc(&node, name);
-}
-
-template <typename T>
-inline void set_name(const sequencer_node<T>& node, const char *name) {
-    fgt_node_desc(&node, name);
-}
-
-template <typename T, typename Compare>
-inline void set_name(const priority_queue_node<T, Compare>& node, const char *name) {
-    fgt_node_desc(&node, name);
-}
-
-template <typename T, typename DecrementType>
-inline void set_name(const limiter_node<T, DecrementType>& node, const char *name) {
-    fgt_node_desc(&node, name);
-}
-
-template <typename OutputTuple, typename JP>
-inline void set_name(const join_node<OutputTuple, JP>& node, const char *name) {
-    fgt_node_desc(&node, name);
-}
-
-template <typename... Types>
-inline void set_name(const indexer_node<Types...>& node, const char *name) {
-    fgt_node_desc(&node, name);
-}
-
-template <typename T>
-inline void set_name(const overwrite_node<T>& node, const char *name) {
-    fgt_node_desc(&node, name);
-}
-
-template <typename T>
-inline void set_name(const write_once_node<T>& node, const char *name) {
-    fgt_node_desc(&node, name);
-}
-
-template<typename Input, typename Output, typename Policy>
-inline void set_name(const multifunction_node<Input, Output, Policy>& node, const char *name) {
-    fgt_multioutput_node_desc(&node, name);
-}
-
-template<typename TupleType>
-inline void set_name(const split_node<TupleType>& node, const char *name) {
-    fgt_multioutput_node_desc(&node, name);
-}
-
-template< typename InputTuple, typename OutputTuple >
-inline void set_name(const composite_node<InputTuple, OutputTuple>& node, const char *name) {
-    fgt_multiinput_multioutput_node_desc(&node, name);
-}
-
-template<typename Input, typename Output, typename Policy>
-inline void set_name(const async_node<Input, Output, Policy>& node, const char *name)
-{
-    fgt_multioutput_node_desc(&node, name);
-}
-} // d2
-} // detail
-} // tbb
+                graph_task* try_put_task(const T& v, const message_metainfo& metainfo) override {
+                    spin_mutex::scoped_lock l(this->my_mutex);
+                    return this->my_buffer_is_valid ? nullptr : this->try_put_task_impl(v, metainfo);
+                }
+#endif
+            };// write_once_node
+
+            inline void set_name(const graph& g, const char* name) { fgt_graph_desc(&g, name); }
+
+            template <typename Output>
+            inline void set_name(const input_node<Output>& node, const char* name) {
+                fgt_node_desc(&node, name);
+            }
 
+            template <typename Input, typename Output, typename Policy>
+            inline void set_name(const function_node<Input, Output, Policy>& node, const char* name) {
+                fgt_node_desc(&node, name);
+            }
+
+            template <typename Output, typename Policy>
+            inline void set_name(const continue_node<Output, Policy>& node, const char* name) {
+                fgt_node_desc(&node, name);
+            }
+
+            template <typename T>
+            inline void set_name(const broadcast_node<T>& node, const char* name) {
+                fgt_node_desc(&node, name);
+            }
+
+            template <typename T>
+            inline void set_name(const buffer_node<T>& node, const char* name) {
+                fgt_node_desc(&node, name);
+            }
+
+            template <typename T>
+            inline void set_name(const queue_node<T>& node, const char* name) {
+                fgt_node_desc(&node, name);
+            }
+
+            template <typename T>
+            inline void set_name(const sequencer_node<T>& node, const char* name) {
+                fgt_node_desc(&node, name);
+            }
+
+            template <typename T, typename Compare>
+            inline void set_name(const priority_queue_node<T, Compare>& node, const char* name) {
+                fgt_node_desc(&node, name);
+            }
+
+            template <typename T, typename DecrementType>
+            inline void set_name(const limiter_node<T, DecrementType>& node, const char* name) {
+                fgt_node_desc(&node, name);
+            }
+
+            template <typename OutputTuple, typename JP>
+            inline void set_name(const join_node<OutputTuple, JP>& node, const char* name) {
+                fgt_node_desc(&node, name);
+            }
+
+            template <typename... Types>
+            inline void set_name(const indexer_node<Types...>& node, const char* name) {
+                fgt_node_desc(&node, name);
+            }
+
+            template <typename T>
+            inline void set_name(const overwrite_node<T>& node, const char* name) {
+                fgt_node_desc(&node, name);
+            }
+
+            template <typename T>
+            inline void set_name(const write_once_node<T>& node, const char* name) {
+                fgt_node_desc(&node, name);
+            }
+
+            template <typename Input, typename Output, typename Policy>
+            inline void set_name(const multifunction_node<Input, Output, Policy>& node, const char* name) {
+                fgt_multioutput_node_desc(&node, name);
+            }
+
+            template <typename TupleType>
+            inline void set_name(const split_node<TupleType>& node, const char* name) {
+                fgt_multioutput_node_desc(&node, name);
+            }
+
+            template <typename InputTuple, typename OutputTuple>
+            inline void set_name(const composite_node<InputTuple, OutputTuple>& node, const char* name) {
+                fgt_multiinput_multioutput_node_desc(&node, name);
+            }
+
+            template <typename Input, typename Output, typename Policy>
+            inline void set_name(const async_node<Input, Output, Policy>& node, const char* name) {
+                fgt_multioutput_node_desc(&node, name);
+            }
+        }// namespace d2
+    }// namespace detail
+}// namespace tbb
 
 // Include deduction guides for node classes
 #include "detail/_flow_graph_nodes_deduction.h"
 
 namespace tbb {
-namespace flow {
-inline namespace v1 {
-    using detail::d2::receiver;
-    using detail::d2::sender;
-
-    using detail::d2::serial;
-    using detail::d2::unlimited;
-
-    using detail::d2::reset_flags;
-    using detail::d2::rf_reset_protocol;
-    using detail::d2::rf_reset_bodies;
-    using detail::d2::rf_clear_edges;
-
-    using detail::d2::graph;
-    using detail::d2::graph_node;
-    using detail::d2::continue_msg;
-
-    using detail::d2::input_node;
-    using detail::d2::function_node;
-    using detail::d2::multifunction_node;
-    using detail::d2::split_node;
-    using detail::d2::output_port;
-    using detail::d2::indexer_node;
-    using detail::d2::tagged_msg;
-    using detail::d2::cast_to;
-    using detail::d2::is_a;
-    using detail::d2::continue_node;
-    using detail::d2::overwrite_node;
-    using detail::d2::write_once_node;
-    using detail::d2::broadcast_node;
-    using detail::d2::buffer_node;
-    using detail::d2::queue_node;
-    using detail::d2::sequencer_node;
-    using detail::d2::priority_queue_node;
-    using detail::d2::limiter_node;
-    using namespace detail::d2::graph_policy_namespace;
-    using detail::d2::join_node;
-    using detail::d2::input_port;
-    using detail::d2::copy_body;
-    using detail::d2::make_edge;
-    using detail::d2::remove_edge;
-    using detail::d2::tag_value;
-    using detail::d2::composite_node;
-    using detail::d2::async_node;
-    using detail::d2::node_priority_t;
-    using detail::d2::no_priority;
+    namespace flow {
+        inline namespace v1 {
+            using detail::d2::receiver;
+            using detail::d2::sender;
+
+            using detail::d2::serial;
+            using detail::d2::unlimited;
+
+            using detail::d2::reset_flags;
+            using detail::d2::rf_clear_edges;
+            using detail::d2::rf_reset_bodies;
+            using detail::d2::rf_reset_protocol;
+
+            using detail::d2::continue_msg;
+            using detail::d2::graph;
+            using detail::d2::graph_node;
+
+            using detail::d2::broadcast_node;
+            using detail::d2::buffer_node;
+            using detail::d2::cast_to;
+            using detail::d2::continue_node;
+            using detail::d2::function_node;
+            using detail::d2::indexer_node;
+            using detail::d2::input_node;
+            using detail::d2::is_a;
+            using detail::d2::limiter_node;
+            using detail::d2::multifunction_node;
+            using detail::d2::output_port;
+            using detail::d2::overwrite_node;
+            using detail::d2::priority_queue_node;
+            using detail::d2::queue_node;
+            using detail::d2::sequencer_node;
+            using detail::d2::split_node;
+            using detail::d2::tagged_msg;
+            using detail::d2::write_once_node;
+            using namespace detail::d2::graph_policy_namespace;
+            using detail::d2::async_node;
+            using detail::d2::composite_node;
+            using detail::d2::copy_body;
+            using detail::d2::input_port;
+            using detail::d2::join_node;
+            using detail::d2::make_edge;
+            using detail::d2::no_priority;
+            using detail::d2::node_priority_t;
+            using detail::d2::remove_edge;
+            using detail::d2::tag_value;
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-    using detail::d2::follows;
-    using detail::d2::precedes;
-    using detail::d2::make_node_set;
-    using detail::d2::make_edges;
+            using detail::d2::follows;
+            using detail::d2::make_edges;
+            using detail::d2::make_node_set;
+            using detail::d2::precedes;
 #endif
 
-} // v1
-} // flow
+        }// namespace v1
+    }// namespace flow
 
     using detail::d1::flow_control;
 
-namespace profiling {
-    using detail::d2::set_name;
-} // profiling
-
-} // tbb
+    namespace profiling {
+        using detail::d2::set_name;
+    }// namespace profiling
 
+}// namespace tbb
 
-#if TBB_USE_PROFILING_TOOLS  && ( __unix__ || __APPLE__ )
-   // We don't do pragma pop here, since it still gives warning on the USER side
-   #undef __TBB_NOINLINE_SYM
+#if TBB_USE_PROFILING_TOOLS && (__unix__ || __APPLE__)
+// We don't do pragma pop here, since it still gives warning on the USER side
+#undef __TBB_NOINLINE_SYM
 #endif
 
-#endif // __TBB_flow_graph_H
+#endif// __TBB_flow_graph_H
diff --git a/external/tbb/include/oneapi/tbb/partitioner.h b/external/tbb/include/oneapi/tbb/partitioner.h
index f09786c0..67fa53c9 100644
--- a/external/tbb/include/oneapi/tbb/partitioner.h
+++ b/external/tbb/include/oneapi/tbb/partitioner.h
@@ -34,645 +34,660 @@
 #define __TBB_DEMAND_DEPTH_ADD 1
 #endif
 
+#include "detail/_aligned_space.h"
 #include "detail/_config.h"
 #include "detail/_namespace_injection.h"
-#include "detail/_aligned_space.h"
-#include "detail/_utils.h"
-#include "detail/_template_helpers.h"
 #include "detail/_range_common.h"
-#include "detail/_task.h"
 #include "detail/_small_object_pool.h"
+#include "detail/_task.h"
+#include "detail/_template_helpers.h"
+#include "detail/_utils.h"
 
 #include "cache_aligned_allocator.h"
-#include "task_group.h" // task_group_context
 #include "task_arena.h"
+#include "task_group.h"// task_group_context
 
 #include <algorithm>
 #include <atomic>
 #include <type_traits>
 
 #if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
-    // Workaround for overzealous compiler warnings
-    #pragma warning (push)
-    #pragma warning (disable: 4244)
+// Workaround for overzealous compiler warnings
+#pragma warning(push)
+#pragma warning(disable : 4244)
 #endif
 
 namespace tbb {
-namespace detail {
-
-namespace d1 {
-class auto_partitioner;
-class simple_partitioner;
-class static_partitioner;
-class affinity_partitioner;
-class affinity_partition_type;
-class affinity_partitioner_base;
-
-inline std::size_t get_initial_auto_partitioner_divisor() {
-    const std::size_t factor = 4;
-    return factor * static_cast<std::size_t>(max_concurrency());
-}
-
-//! Defines entry point for affinity partitioner into oneTBB run-time library.
-class affinity_partitioner_base: no_copy {
-    friend class affinity_partitioner;
-    friend class affinity_partition_type;
-    //! Array that remembers affinities of tree positions to affinity_id.
-    /** nullptr if my_size==0. */
-    slot_id* my_array;
-    //! Number of elements in my_array.
-    std::size_t my_size;
-    //! Zeros the fields.
-    affinity_partitioner_base() : my_array(nullptr), my_size(0) {}
-    //! Deallocates my_array.
-    ~affinity_partitioner_base() { resize(0); }
-    //! Resize my_array.
-    /** Retains values if resulting size is the same. */
-    void resize(unsigned factor) {
-        // Check factor to avoid asking for number of workers while there might be no arena.
-        unsigned max_threads_in_arena = static_cast<unsigned>(max_concurrency());
-        std::size_t new_size = factor ? factor * max_threads_in_arena : 0;
-        if (new_size != my_size) {
-            if (my_array) {
-                r1::cache_aligned_deallocate(my_array);
-                // Following two assignments must be done here for sake of exception safety.
-                my_array = nullptr;
-                my_size = 0;
-            }
-            if (new_size) {
-                my_array = static_cast<slot_id*>(r1::cache_aligned_allocate(new_size * sizeof(slot_id)));
-                std::fill_n(my_array, new_size, no_slot);
-                my_size = new_size;
+    namespace detail {
+
+        namespace d1 {
+            class auto_partitioner;
+            class simple_partitioner;
+            class static_partitioner;
+            class affinity_partitioner;
+            class affinity_partition_type;
+            class affinity_partitioner_base;
+
+            inline std::size_t get_initial_auto_partitioner_divisor() {
+                const std::size_t factor = 4;
+                return factor * static_cast<std::size_t>(max_concurrency());
             }
-        }
-    }
-};
-
-template<typename Range, typename Body, typename Partitioner> struct start_for;
-template<typename Range, typename Body, typename Partitioner> struct start_scan;
-template<typename Range, typename Body, typename Partitioner> struct start_reduce;
-template<typename Range, typename Body, typename Partitioner> struct start_deterministic_reduce;
-
-struct node {
-    node* my_parent{};
-    std::atomic<int> m_ref_count{};
-
-    node() = default;
-    node(node* parent, int ref_count) :
-        my_parent{parent}, m_ref_count{ref_count} {
-        __TBB_ASSERT(ref_count > 0, "The ref count must be positive");
-    }
-};
-
-struct wait_node : node {
-    wait_node() : node{ nullptr, 1 } {}
-    wait_context m_wait{1};
-};
-
-//! Join task node that contains shared flag for stealing feedback
-struct tree_node : public node {
-    small_object_allocator m_allocator;
-    std::atomic<bool> m_child_stolen{false};
-
-    tree_node(node* parent, int ref_count, small_object_allocator& alloc)
-        : node{parent, ref_count}
-        , m_allocator{alloc} {}
-
-    void join(task_group_context*) {/*dummy, required only for reduction algorithms*/};
-
-    template <typename Task>
-    static void mark_task_stolen(Task &t) {
-        std::atomic<bool> &flag = static_cast<tree_node*>(t.my_parent)->m_child_stolen;
+
+            //! Defines entry point for affinity partitioner into oneTBB run-time library.
+            class affinity_partitioner_base : no_copy {
+                friend class affinity_partitioner;
+                friend class affinity_partition_type;
+                //! Array that remembers affinities of tree positions to affinity_id.
+                /** nullptr if my_size==0. */
+                slot_id* my_array;
+                //! Number of elements in my_array.
+                std::size_t my_size;
+                //! Zeros the fields.
+                affinity_partitioner_base() : my_array(nullptr), my_size(0) {}
+                //! Deallocates my_array.
+                ~affinity_partitioner_base() { resize(0); }
+                //! Resize my_array.
+                /** Retains values if resulting size is the same. */
+                void resize(unsigned factor) {
+                    // Check factor to avoid asking for number of workers while there might be no arena.
+                    unsigned max_threads_in_arena = static_cast<unsigned>(max_concurrency());
+                    std::size_t new_size = factor ? factor * max_threads_in_arena : 0;
+                    if (new_size != my_size) {
+                        if (my_array) {
+                            r1::cache_aligned_deallocate(my_array);
+                            // Following two assignments must be done here for sake of exception safety.
+                            my_array = nullptr;
+                            my_size = 0;
+                        }
+                        if (new_size) {
+                            my_array = static_cast<slot_id*>(
+                                    r1::cache_aligned_allocate(new_size * sizeof(slot_id)));
+                            std::fill_n(my_array, new_size, no_slot);
+                            my_size = new_size;
+                        }
+                    }
+                }
+            };
+
+            template <typename Range, typename Body, typename Partitioner>
+            struct start_for;
+            template <typename Range, typename Body, typename Partitioner>
+            struct start_scan;
+            template <typename Range, typename Body, typename Partitioner>
+            struct start_reduce;
+            template <typename Range, typename Body, typename Partitioner>
+            struct start_deterministic_reduce;
+
+            struct node {
+                node* my_parent {};
+                std::atomic<int> m_ref_count {};
+
+                node() = default;
+                node(node* parent, int ref_count) : my_parent {parent}, m_ref_count {ref_count} {
+                    __TBB_ASSERT(ref_count > 0, "The ref count must be positive");
+                }
+            };
+
+            struct wait_node : node {
+                wait_node() : node {nullptr, 1} {}
+                wait_context m_wait {1};
+            };
+
+            //! Join task node that contains shared flag for stealing feedback
+            struct tree_node : public node {
+                small_object_allocator m_allocator;
+                std::atomic<bool> m_child_stolen {false};
+
+                tree_node(node* parent, int ref_count, small_object_allocator& alloc)
+                    : node {parent, ref_count}, m_allocator {alloc} {}
+
+                void join(task_group_context*) { /*dummy, required only for reduction algorithms*/ };
+
+                template <typename Task>
+                static void mark_task_stolen(Task& t) {
+                    std::atomic<bool>& flag = static_cast<tree_node*>(t.my_parent)->m_child_stolen;
 #if TBB_USE_PROFILING_TOOLS
-        // Threading tools respect lock prefix but report false-positive data-race via plain store
-        flag.exchange(true);
+                    // Threading tools respect lock prefix but report false-positive data-race via plain store
+                    flag.exchange(true);
 #else
-        flag.store(true, std::memory_order_relaxed);
-#endif // TBB_USE_PROFILING_TOOLS
-    }
-    template <typename Task>
-    static bool is_peer_stolen(Task &t) {
-        return static_cast<tree_node*>(t.my_parent)->m_child_stolen.load(std::memory_order_relaxed);
-    }
-};
-
-// Context used to check cancellation state during reduction join process
-template<typename TreeNodeType>
-void fold_tree(node* n, const execution_data& ed) {
-    for (;;) {
-        __TBB_ASSERT(n, nullptr);
-        __TBB_ASSERT(n->m_ref_count.load(std::memory_order_relaxed) > 0, "The refcount must be positive.");
-        call_itt_task_notify(releasing, n);
-        if (--n->m_ref_count > 0) {
-            return;
-        }
-        node* parent = n->my_parent;
-        if (!parent) {
-            break;
-        };
-
-        call_itt_task_notify(acquired, n);
-        TreeNodeType* self = static_cast<TreeNodeType*>(n);
-        self->join(ed.context);
-        self->m_allocator.delete_object(self, ed);
-        n = parent;
-    }
-    // Finish parallel for execution when the root (last node) is reached
-    static_cast<wait_node*>(n)->m_wait.release();
-}
-
-//! Depth is a relative depth of recursive division inside a range pool. Relative depth allows
-//! infinite absolute depth of the recursion for heavily unbalanced workloads with range represented
-//! by a number that cannot fit into machine word.
-typedef unsigned char depth_t;
-
-//! Range pool stores ranges of type T in a circular buffer with MaxCapacity
-template <typename T, depth_t MaxCapacity>
-class range_vector {
-    depth_t my_head;
-    depth_t my_tail;
-    depth_t my_size;
-    depth_t my_depth[MaxCapacity]; // relative depths of stored ranges
-    tbb::detail::aligned_space<T, MaxCapacity> my_pool;
-
-public:
-    //! initialize via first range in pool
-    range_vector(const T& elem) : my_head(0), my_tail(0), my_size(1) {
-        my_depth[0] = 0;
-        new( static_cast<void *>(my_pool.begin()) ) T(elem);//TODO: std::move?
-    }
-    ~range_vector() {
-        while( !empty() ) pop_back();
-    }
-    bool empty() const { return my_size == 0; }
-    depth_t size() const { return my_size; }
-    //! Populates range pool via ranges up to max depth or while divisible
-    //! max_depth starts from 0, e.g. value 2 makes 3 ranges in the pool up to two 1/4 pieces
-    void split_to_fill(depth_t max_depth) {
-        while( my_size < MaxCapacity && is_divisible(max_depth) ) {
-            depth_t prev = my_head;
-            my_head = (my_head + 1) % MaxCapacity;
-            new(my_pool.begin()+my_head) T(my_pool.begin()[prev]); // copy TODO: std::move?
-            my_pool.begin()[prev].~T(); // instead of assignment
-            new(my_pool.begin()+prev) T(my_pool.begin()[my_head], detail::split()); // do 'inverse' split
-            my_depth[my_head] = ++my_depth[prev];
-            my_size++;
-        }
-    }
-    void pop_back() {
-        __TBB_ASSERT(my_size > 0, "range_vector::pop_back() with empty size");
-        my_pool.begin()[my_head].~T();
-        my_size--;
-        my_head = (my_head + MaxCapacity - 1) % MaxCapacity;
-    }
-    void pop_front() {
-        __TBB_ASSERT(my_size > 0, "range_vector::pop_front() with empty size");
-        my_pool.begin()[my_tail].~T();
-        my_size--;
-        my_tail = (my_tail + 1) % MaxCapacity;
-    }
-    T& back() {
-        __TBB_ASSERT(my_size > 0, "range_vector::back() with empty size");
-        return my_pool.begin()[my_head];
-    }
-    T& front() {
-        __TBB_ASSERT(my_size > 0, "range_vector::front() with empty size");
-        return my_pool.begin()[my_tail];
-    }
-    //! similarly to front(), returns depth of the first range in the pool
-    depth_t front_depth() {
-        __TBB_ASSERT(my_size > 0, "range_vector::front_depth() with empty size");
-        return my_depth[my_tail];
-    }
-    depth_t back_depth() {
-        __TBB_ASSERT(my_size > 0, "range_vector::back_depth() with empty size");
-        return my_depth[my_head];
-    }
-    bool is_divisible(depth_t max_depth) {
-        return back_depth() < max_depth && back().is_divisible();
-    }
-};
-
-//! Provides default methods for partition objects and common algorithm blocks.
-template <typename Partition>
-struct partition_type_base {
-    typedef detail::split split_type;
-    // decision makers
-    void note_affinity( slot_id ) {}
-    template <typename Task>
-    bool check_being_stolen(Task&, const execution_data&) { return false; } // part of old should_execute_range()
-    template <typename Range> split_type get_split() { return split(); }
-    Partition& self() { return *static_cast<Partition*>(this); } // CRTP helper
-
-    template<typename StartType, typename Range>
-    void work_balance(StartType &start, Range &range, const execution_data&) {
-        start.run_body( range ); // static partitioner goes here
-    }
-
-    template<typename StartType, typename Range>
-    void execute(StartType &start, Range &range, execution_data& ed) {
-        // The algorithm in a few words ([]-denotes calls to decision methods of partitioner):
-        // [If this task is stolen, adjust depth and divisions if necessary, set flag].
-        // If range is divisible {
-        //    Spread the work while [initial divisions left];
-        //    Create trap task [if necessary];
-        // }
-        // If not divisible or [max depth is reached], execute, else do the range pool part
-        if ( range.is_divisible() ) {
-            if ( self().is_divisible() ) {
-                do { // split until is divisible
-                    typename Partition::split_type split_obj = self().template get_split<Range>();
-                    start.offer_work( split_obj, ed );
-                } while ( range.is_divisible() && self().is_divisible() );
-            }
-        }
-        self().work_balance(start, range, ed);
-    }
-};
-
-//! Provides default splitting strategy for partition objects.
-template <typename Partition>
-struct adaptive_mode : partition_type_base<Partition> {
-    typedef Partition my_partition;
-    std::size_t my_divisor;
-    // For affinity_partitioner, my_divisor indicates the number of affinity array indices the task reserves.
-    // A task which has only one index must produce the right split without reserved index in order to avoid
-    // it to be overwritten in note_affinity() of the created (right) task.
-    // I.e. a task created deeper than the affinity array can remember must not save its affinity (LIFO order)
-    static const unsigned factor = 1;
-    adaptive_mode() : my_divisor(get_initial_auto_partitioner_divisor() / 4 * my_partition::factor) {}
-    adaptive_mode(adaptive_mode &src, split) : my_divisor(do_split(src, split())) {}
-    adaptive_mode(adaptive_mode&, const proportional_split&) : my_divisor(0)
-    {
-        // left blank as my_divisor gets overridden in the successors' constructors
-    }
-    /*! Override do_split methods in order to specify splitting strategy */
-    std::size_t do_split(adaptive_mode &src, split) {
-        return src.my_divisor /= 2u;
-    }
-};
-
-
-//! Provides proportional splitting strategy for partition objects
-template <typename Partition>
-struct proportional_mode : adaptive_mode<Partition> {
-    typedef Partition my_partition;
-    using partition_type_base<Partition>::self; // CRTP helper to get access to derived classes
-
-    proportional_mode() : adaptive_mode<Partition>() {}
-    proportional_mode(proportional_mode &src, split) : adaptive_mode<Partition>(src, split()) {}
-    proportional_mode(proportional_mode &src, const proportional_split& split_obj)
-        : adaptive_mode<Partition>(src, split_obj)
-    {
-        self().my_divisor = do_split(src, split_obj);
-    }
-    std::size_t do_split(proportional_mode &src, const proportional_split& split_obj) {
-        std::size_t portion = split_obj.right() * my_partition::factor;
-        portion = (portion + my_partition::factor/2) & (0ul - my_partition::factor);
-        src.my_divisor -= portion;
-        return portion;
-    }
-    bool is_divisible() { // part of old should_execute_range()
-        return self().my_divisor > my_partition::factor;
-    }
-    template <typename Range>
-    proportional_split get_split() {
-        // Create the proportion from partitioner internal resources (threads) that would be used:
-        // - into proportional_mode constructor to split the partitioner
-        // - if Range supports the proportional_split constructor it would use proposed proportion,
-        //   otherwise, the tbb::proportional_split object will be implicitly (for Range implementer)
-        //   casted to tbb::split
-
-        std::size_t n = self().my_divisor / my_partition::factor;
-        std::size_t right = n / 2;
-        std::size_t left  = n - right;
-        return proportional_split(left, right);
-    }
-};
-
-static std::size_t get_initial_partition_head() {
-    int current_index = tbb::this_task_arena::current_thread_index();
-    if (current_index == tbb::task_arena::not_initialized)
-        current_index = 0;
-    return size_t(current_index);
-}
-
-//! Provides default linear indexing of partitioner's sequence
-template <typename Partition>
-struct linear_affinity_mode : proportional_mode<Partition> {
-    std::size_t my_head;
-    std::size_t my_max_affinity;
-    using proportional_mode<Partition>::self;
-    linear_affinity_mode() : proportional_mode<Partition>(), my_head(get_initial_partition_head()),
-                             my_max_affinity(self().my_divisor) {}
-    linear_affinity_mode(linear_affinity_mode &src, split) : proportional_mode<Partition>(src, split())
-        , my_head((src.my_head + src.my_divisor) % src.my_max_affinity), my_max_affinity(src.my_max_affinity) {}
-    linear_affinity_mode(linear_affinity_mode &src, const proportional_split& split_obj) : proportional_mode<Partition>(src, split_obj)
-        , my_head((src.my_head + src.my_divisor) % src.my_max_affinity), my_max_affinity(src.my_max_affinity) {}
-    void spawn_task(task& t, task_group_context& ctx) {
-        if (self().my_divisor) {
-            spawn(t, ctx, slot_id(my_head));
-        } else {
-            spawn(t, ctx);
-        }
-    }
-};
-
-static bool is_stolen_task(const execution_data& ed) {
-    return execution_slot(ed) != original_slot(ed);
-}
-
-/*! Determine work-balance phase implementing splitting & stealing actions */
-template<class Mode>
-struct dynamic_grainsize_mode : Mode {
-    using Mode::self;
-    enum {
-        begin = 0,
-        run,
-        pass
-    } my_delay;
-    depth_t my_max_depth;
-    static const unsigned range_pool_size = __TBB_RANGE_POOL_CAPACITY;
-    dynamic_grainsize_mode(): Mode()
-        , my_delay(begin)
-        , my_max_depth(__TBB_INIT_DEPTH) {}
-    dynamic_grainsize_mode(dynamic_grainsize_mode& p, split)
-        : Mode(p, split())
-        , my_delay(pass)
-        , my_max_depth(p.my_max_depth) {}
-    dynamic_grainsize_mode(dynamic_grainsize_mode& p, const proportional_split& split_obj)
-        : Mode(p, split_obj)
-        , my_delay(begin)
-        , my_max_depth(p.my_max_depth) {}
-    template <typename Task>
-    bool check_being_stolen(Task &t, const execution_data& ed) { // part of old should_execute_range()
-        if( !(self().my_divisor / Mode::my_partition::factor) ) { // if not from the top P tasks of binary tree
-            self().my_divisor = 1; // TODO: replace by on-stack flag (partition_state's member)?
-            if( is_stolen_task(ed) && t.my_parent->m_ref_count >= 2 ) { // runs concurrently with the left task
-#if __TBB_USE_OPTIONAL_RTTI
-                // RTTI is available, check whether the cast is valid
-                // TODO: TBB_REVAMP_TODO __TBB_ASSERT(dynamic_cast<tree_node*>(t.m_parent), 0);
-                // correctness of the cast relies on avoiding the root task for which:
-                // - initial value of my_divisor != 0 (protected by separate assertion)
-                // - is_stolen_task() always returns false for the root task.
-#endif
-                tree_node::mark_task_stolen(t);
-                if( !my_max_depth ) my_max_depth++;
-                my_max_depth += __TBB_DEMAND_DEPTH_ADD;
-                return true;
+                    flag.store(true, std::memory_order_relaxed);
+#endif// TBB_USE_PROFILING_TOOLS
+                }
+                template <typename Task>
+                static bool is_peer_stolen(Task& t) {
+                    return static_cast<tree_node*>(t.my_parent)
+                            ->m_child_stolen.load(std::memory_order_relaxed);
+                }
+            };
+
+            // Context used to check cancellation state during reduction join process
+            template <typename TreeNodeType>
+            void fold_tree(node* n, const execution_data& ed) {
+                for (;;) {
+                    __TBB_ASSERT(n, nullptr);
+                    __TBB_ASSERT(n->m_ref_count.load(std::memory_order_relaxed) > 0,
+                                 "The refcount must be positive.");
+                    call_itt_task_notify(releasing, n);
+                    if (--n->m_ref_count > 0) { return; }
+                    node* parent = n->my_parent;
+                    if (!parent) { break; };
+
+                    call_itt_task_notify(acquired, n);
+                    TreeNodeType* self = static_cast<TreeNodeType*>(n);
+                    self->join(ed.context);
+                    self->m_allocator.delete_object(self, ed);
+                    n = parent;
+                }
+                // Finish parallel for execution when the root (last node) is reached
+                static_cast<wait_node*>(n)->m_wait.release();
             }
-        }
-        return false;
-    }
-    depth_t max_depth() { return my_max_depth; }
-    void align_depth(depth_t base) {
-        __TBB_ASSERT(base <= my_max_depth, nullptr);
-        my_max_depth -= base;
-    }
-    template<typename StartType, typename Range>
-    void work_balance(StartType &start, Range &range, execution_data& ed) {
-        if( !range.is_divisible() || !self().max_depth() ) {
-            start.run_body( range );
-        }
-        else { // do range pool
-            range_vector<Range, range_pool_size> range_pool(range);
-            do {
-                range_pool.split_to_fill(self().max_depth()); // fill range pool
-                if( self().check_for_demand( start ) ) {
-                    if( range_pool.size() > 1 ) {
-                        start.offer_work( range_pool.front(), range_pool.front_depth(), ed );
-                        range_pool.pop_front();
-                        continue;
+
+            //! Depth is a relative depth of recursive division inside a range pool. Relative depth allows
+            //! infinite absolute depth of the recursion for heavily unbalanced workloads with range represented
+            //! by a number that cannot fit into machine word.
+            typedef unsigned char depth_t;
+
+            //! Range pool stores ranges of type T in a circular buffer with MaxCapacity
+            template <typename T, depth_t MaxCapacity>
+            class range_vector {
+                depth_t my_head;
+                depth_t my_tail;
+                depth_t my_size;
+                depth_t my_depth[MaxCapacity];// relative depths of stored ranges
+                tbb::detail::aligned_space<T, MaxCapacity> my_pool;
+
+            public:
+                //! initialize via first range in pool
+                range_vector(const T& elem) : my_head(0), my_tail(0), my_size(1) {
+                    my_depth[0] = 0;
+                    new (static_cast<void*>(my_pool.begin())) T(elem);//TODO: std::move?
+                }
+                ~range_vector() {
+                    while (!empty()) pop_back();
+                }
+                bool empty() const { return my_size == 0; }
+                depth_t size() const { return my_size; }
+                //! Populates range pool via ranges up to max depth or while divisible
+                //! max_depth starts from 0, e.g. value 2 makes 3 ranges in the pool up to two 1/4 pieces
+                void split_to_fill(depth_t max_depth) {
+                    while (my_size < MaxCapacity && is_divisible(max_depth)) {
+                        depth_t prev = my_head;
+                        my_head = (my_head + 1) % MaxCapacity;
+                        new (my_pool.begin() + my_head) T(my_pool.begin()[prev]);// copy TODO: std::move?
+                        my_pool.begin()[prev].~T();                              // instead of assignment
+                        new (my_pool.begin() + prev)
+                                T(my_pool.begin()[my_head], detail::split());// do 'inverse' split
+                        my_depth[my_head] = ++my_depth[prev];
+                        my_size++;
                     }
-                    if( range_pool.is_divisible(self().max_depth()) ) // was not enough depth to fork a task
-                        continue; // note: next split_to_fill() should split range at least once
-                }
-                start.run_body( range_pool.back() );
-                range_pool.pop_back();
-            } while( !range_pool.empty() && !ed.context->is_group_execution_cancelled() );
-        }
-    }
-    template <typename Task>
-    bool check_for_demand(Task& t) {
-        if ( pass == my_delay ) {
-            if ( self().my_divisor > 1 ) // produce affinitized tasks while they have slot in array
-                return true; // do not do my_max_depth++ here, but be sure range_pool is splittable once more
-            else if ( self().my_divisor && my_max_depth ) { // make balancing task
-                self().my_divisor = 0; // once for each task; depth will be decreased in align_depth()
-                return true;
-            }
-            else if ( tree_node::is_peer_stolen(t) ) {
-                my_max_depth += __TBB_DEMAND_DEPTH_ADD;
-                return true;
+                }
+                void pop_back() {
+                    __TBB_ASSERT(my_size > 0, "range_vector::pop_back() with empty size");
+                    my_pool.begin()[my_head].~T();
+                    my_size--;
+                    my_head = (my_head + MaxCapacity - 1) % MaxCapacity;
+                }
+                void pop_front() {
+                    __TBB_ASSERT(my_size > 0, "range_vector::pop_front() with empty size");
+                    my_pool.begin()[my_tail].~T();
+                    my_size--;
+                    my_tail = (my_tail + 1) % MaxCapacity;
+                }
+                T& back() {
+                    __TBB_ASSERT(my_size > 0, "range_vector::back() with empty size");
+                    return my_pool.begin()[my_head];
+                }
+                T& front() {
+                    __TBB_ASSERT(my_size > 0, "range_vector::front() with empty size");
+                    return my_pool.begin()[my_tail];
+                }
+                //! similarly to front(), returns depth of the first range in the pool
+                depth_t front_depth() {
+                    __TBB_ASSERT(my_size > 0, "range_vector::front_depth() with empty size");
+                    return my_depth[my_tail];
+                }
+                depth_t back_depth() {
+                    __TBB_ASSERT(my_size > 0, "range_vector::back_depth() with empty size");
+                    return my_depth[my_head];
+                }
+                bool is_divisible(depth_t max_depth) {
+                    return back_depth() < max_depth && back().is_divisible();
+                }
+            };
+
+            //! Provides default methods for partition objects and common algorithm blocks.
+            template <typename Partition>
+            struct partition_type_base {
+                typedef detail::split split_type;
+                // decision makers
+                void note_affinity(slot_id) {}
+                template <typename Task>
+                bool check_being_stolen(Task&, const execution_data&) {
+                    return false;
+                }// part of old should_execute_range()
+                template <typename Range>
+                split_type get_split() {
+                    return split();
+                }
+                Partition& self() { return *static_cast<Partition*>(this); }// CRTP helper
+
+                template <typename StartType, typename Range>
+                void work_balance(StartType& start, Range& range, const execution_data&) {
+                    start.run_body(range);// static partitioner goes here
+                }
+
+                template <typename StartType, typename Range>
+                void execute(StartType& start, Range& range, execution_data& ed) {
+                    // The algorithm in a few words ([]-denotes calls to decision methods of partitioner):
+                    // [If this task is stolen, adjust depth and divisions if necessary, set flag].
+                    // If range is divisible {
+                    //    Spread the work while [initial divisions left];
+                    //    Create trap task [if necessary];
+                    // }
+                    // If not divisible or [max depth is reached], execute, else do the range pool part
+                    if (range.is_divisible()) {
+                        if (self().is_divisible()) {
+                            do {// split until is divisible
+                                typename Partition::split_type split_obj = self().template get_split<Range>();
+                                start.offer_work(split_obj, ed);
+                            } while (range.is_divisible() && self().is_divisible());
+                        }
+                    }
+                    self().work_balance(start, range, ed);
+                }
+            };
+
+            //! Provides default splitting strategy for partition objects.
+            template <typename Partition>
+            struct adaptive_mode : partition_type_base<Partition> {
+                typedef Partition my_partition;
+                std::size_t my_divisor;
+                // For affinity_partitioner, my_divisor indicates the number of affinity array indices the task reserves.
+                // A task which has only one index must produce the right split without reserved index in order to avoid
+                // it to be overwritten in note_affinity() of the created (right) task.
+                // I.e. a task created deeper than the affinity array can remember must not save its affinity (LIFO order)
+                static const unsigned factor = 1;
+                adaptive_mode()
+                    : my_divisor(get_initial_auto_partitioner_divisor() / 4 * my_partition::factor) {}
+                adaptive_mode(adaptive_mode& src, split) : my_divisor(do_split(src, split())) {}
+                adaptive_mode(adaptive_mode&, const proportional_split&) : my_divisor(0) {
+                    // left blank as my_divisor gets overridden in the successors' constructors
+                }
+                /*! Override do_split methods in order to specify splitting strategy */
+                std::size_t do_split(adaptive_mode& src, split) { return src.my_divisor /= 2u; }
+            };
+
+            //! Provides proportional splitting strategy for partition objects
+            template <typename Partition>
+            struct proportional_mode : adaptive_mode<Partition> {
+                typedef Partition my_partition;
+                using partition_type_base<Partition>::self;// CRTP helper to get access to derived classes
+
+                proportional_mode() : adaptive_mode<Partition>() {}
+                proportional_mode(proportional_mode& src, split) : adaptive_mode<Partition>(src, split()) {}
+                proportional_mode(proportional_mode& src, const proportional_split& split_obj)
+                    : adaptive_mode<Partition>(src, split_obj) {
+                    self().my_divisor = do_split(src, split_obj);
+                }
+                std::size_t do_split(proportional_mode& src, const proportional_split& split_obj) {
+                    std::size_t portion = split_obj.right() * my_partition::factor;
+                    portion = (portion + my_partition::factor / 2) & (0ul - my_partition::factor);
+                    src.my_divisor -= portion;
+                    return portion;
+                }
+                bool is_divisible() {// part of old should_execute_range()
+                    return self().my_divisor > my_partition::factor;
+                }
+                template <typename Range>
+                proportional_split get_split() {
+                    // Create the proportion from partitioner internal resources (threads) that would be used:
+                    // - into proportional_mode constructor to split the partitioner
+                    // - if Range supports the proportional_split constructor it would use proposed proportion,
+                    //   otherwise, the tbb::proportional_split object will be implicitly (for Range implementer)
+                    //   casted to tbb::split
+
+                    std::size_t n = self().my_divisor / my_partition::factor;
+                    std::size_t right = n / 2;
+                    std::size_t left = n - right;
+                    return proportional_split(left, right);
+                }
+            };
+
+            inline std::size_t get_initial_partition_head() {
+                int current_index = tbb::this_task_arena::current_thread_index();
+                if (current_index == tbb::task_arena::not_initialized) current_index = 0;
+                return size_t(current_index);
             }
-        } else if( begin == my_delay ) {
-            my_delay = pass;
-        }
-        return false;
-    }
-};
-
-class auto_partition_type: public dynamic_grainsize_mode<adaptive_mode<auto_partition_type> > {
-public:
-    auto_partition_type( const auto_partitioner& ) {
-        my_divisor *= __TBB_INITIAL_CHUNKS;
-    }
-    auto_partition_type( auto_partition_type& src, split)
-        : dynamic_grainsize_mode<adaptive_mode<auto_partition_type> >(src, split()) {}
-    bool is_divisible() { // part of old should_execute_range()
-        if( my_divisor > 1 ) return true;
-        if( my_divisor && my_max_depth ) { // can split the task. TODO: on-stack flag instead
-            // keep same fragmentation while splitting for the local task pool
-            my_max_depth--;
-            my_divisor = 0; // decrease max_depth once per task
-            return true;
-        } else return false;
-    }
-    template <typename Task>
-    bool check_for_demand(Task& t) {
-        if (tree_node::is_peer_stolen(t)) {
-            my_max_depth += __TBB_DEMAND_DEPTH_ADD;
-            return true;
-        } else return false;
-    }
-    void spawn_task(task& t, task_group_context& ctx) {
-        spawn(t, ctx);
-    }
-};
-
-class simple_partition_type: public partition_type_base<simple_partition_type> {
-public:
-    simple_partition_type( const simple_partitioner& ) {}
-    simple_partition_type( const simple_partition_type&, split ) {}
-    //! simplified algorithm
-    template<typename StartType, typename Range>
-    void execute(StartType &start, Range &range, execution_data& ed) {
-        split_type split_obj = split(); // start.offer_work accepts split_type as reference
-        while( range.is_divisible() )
-            start.offer_work( split_obj, ed );
-        start.run_body( range );
-    }
-    void spawn_task(task& t, task_group_context& ctx) {
-        spawn(t, ctx);
-    }
-};
-
-class static_partition_type : public linear_affinity_mode<static_partition_type> {
-public:
-    typedef detail::proportional_split split_type;
-    static_partition_type( const static_partitioner& ) {}
-    static_partition_type( static_partition_type& p, const proportional_split& split_obj )
-        : linear_affinity_mode<static_partition_type>(p, split_obj) {}
-};
-
-class affinity_partition_type : public dynamic_grainsize_mode<linear_affinity_mode<affinity_partition_type> > {
-    static const unsigned factor_power = 4; // TODO: get a unified formula based on number of computing units
-    slot_id* my_array;
-public:
-    static const unsigned factor = 1 << factor_power; // number of slots in affinity array per task
-    typedef detail::proportional_split split_type;
-    affinity_partition_type( affinity_partitioner_base& ap ) {
-        __TBB_ASSERT( (factor&(factor-1))==0, "factor must be power of two" );
-        ap.resize(factor);
-        my_array = ap.my_array;
-        my_max_depth = factor_power + 1;
-        __TBB_ASSERT( my_max_depth < __TBB_RANGE_POOL_CAPACITY, nullptr );
-    }
-    affinity_partition_type(affinity_partition_type& p, split)
-        : dynamic_grainsize_mode<linear_affinity_mode<affinity_partition_type> >(p, split())
-        , my_array(p.my_array) {}
-    affinity_partition_type(affinity_partition_type& p, const proportional_split& split_obj)
-        : dynamic_grainsize_mode<linear_affinity_mode<affinity_partition_type> >(p, split_obj)
-        , my_array(p.my_array) {}
-    void note_affinity(slot_id id) {
-        if( my_divisor )
-            my_array[my_head] = id;
-    }
-    void spawn_task(task& t, task_group_context& ctx) {
-        if (my_divisor) {
-            if (!my_array[my_head]) {
-                // TODO: consider new ideas with my_array for both affinity and static partitioner's, then code reuse
-                spawn(t, ctx, slot_id(my_head / factor));
-            } else {
-                spawn(t, ctx, my_array[my_head]);
+
+            //! Provides default linear indexing of partitioner's sequence
+            template <typename Partition>
+            struct linear_affinity_mode : proportional_mode<Partition> {
+                std::size_t my_head;
+                std::size_t my_max_affinity;
+                using proportional_mode<Partition>::self;
+                linear_affinity_mode()
+                    : proportional_mode<Partition>(), my_head(get_initial_partition_head()),
+                      my_max_affinity(self().my_divisor) {}
+                linear_affinity_mode(linear_affinity_mode& src, split)
+                    : proportional_mode<Partition>(src, split()),
+                      my_head((src.my_head + src.my_divisor) % src.my_max_affinity),
+                      my_max_affinity(src.my_max_affinity) {}
+                linear_affinity_mode(linear_affinity_mode& src, const proportional_split& split_obj)
+                    : proportional_mode<Partition>(src, split_obj),
+                      my_head((src.my_head + src.my_divisor) % src.my_max_affinity),
+                      my_max_affinity(src.my_max_affinity) {}
+                void spawn_task(task& t, task_group_context& ctx) {
+                    if (self().my_divisor) {
+                        spawn(t, ctx, slot_id(my_head));
+                    } else {
+                        spawn(t, ctx);
+                    }
+                }
+            };
+
+            inline bool is_stolen_task(const execution_data& ed) {
+                return execution_slot(ed) != original_slot(ed);
             }
-        } else {
-            spawn(t, ctx);
-        }
-    }
-};
-
-//! A simple partitioner
-/** Divides the range until the range is not divisible.
+
+            /*! Determine work-balance phase implementing splitting & stealing actions */
+            template <class Mode>
+            struct dynamic_grainsize_mode : Mode {
+                using Mode::self;
+                enum { begin = 0, run, pass } my_delay;
+                depth_t my_max_depth;
+                static const unsigned range_pool_size = __TBB_RANGE_POOL_CAPACITY;
+                dynamic_grainsize_mode() : Mode(), my_delay(begin), my_max_depth(__TBB_INIT_DEPTH) {}
+                dynamic_grainsize_mode(dynamic_grainsize_mode& p, split)
+                    : Mode(p, split()), my_delay(pass), my_max_depth(p.my_max_depth) {}
+                dynamic_grainsize_mode(dynamic_grainsize_mode& p, const proportional_split& split_obj)
+                    : Mode(p, split_obj), my_delay(begin), my_max_depth(p.my_max_depth) {}
+                template <typename Task>
+                bool check_being_stolen(Task& t,
+                                        const execution_data& ed) {// part of old should_execute_range()
+                    if (!(self().my_divisor
+                          / Mode::my_partition::factor)) {// if not from the top P tasks of binary tree
+                        self().my_divisor = 1;// TODO: replace by on-stack flag (partition_state's member)?
+                        if (is_stolen_task(ed)
+                            && t.my_parent->m_ref_count >= 2) {// runs concurrently with the left task
+#if __TBB_USE_OPTIONAL_RTTI
+                            // RTTI is available, check whether the cast is valid
+                            // TODO: TBB_REVAMP_TODO __TBB_ASSERT(dynamic_cast<tree_node*>(t.m_parent), 0);
+                            // correctness of the cast relies on avoiding the root task for which:
+                            // - initial value of my_divisor != 0 (protected by separate assertion)
+                            // - is_stolen_task() always returns false for the root task.
+#endif
+                            tree_node::mark_task_stolen(t);
+                            if (!my_max_depth) my_max_depth++;
+                            my_max_depth += __TBB_DEMAND_DEPTH_ADD;
+                            return true;
+                        }
+                    }
+                    return false;
+                }
+                depth_t max_depth() { return my_max_depth; }
+                void align_depth(depth_t base) {
+                    __TBB_ASSERT(base <= my_max_depth, nullptr);
+                    my_max_depth -= base;
+                }
+                template <typename StartType, typename Range>
+                void work_balance(StartType& start, Range& range, execution_data& ed) {
+                    if (!range.is_divisible() || !self().max_depth()) {
+                        start.run_body(range);
+                    } else {// do range pool
+                        range_vector<Range, range_pool_size> range_pool(range);
+                        do {
+                            range_pool.split_to_fill(self().max_depth());// fill range pool
+                            if (self().check_for_demand(start)) {
+                                if (range_pool.size() > 1) {
+                                    start.offer_work(range_pool.front(), range_pool.front_depth(), ed);
+                                    range_pool.pop_front();
+                                    continue;
+                                }
+                                if (range_pool.is_divisible(
+                                            self().max_depth()))// was not enough depth to fork a task
+                                    continue;// note: next split_to_fill() should split range at least once
+                            }
+                            start.run_body(range_pool.back());
+                            range_pool.pop_back();
+                        } while (!range_pool.empty() && !ed.context->is_group_execution_cancelled());
+                    }
+                }
+                template <typename Task>
+                bool check_for_demand(Task& t) {
+                    if (pass == my_delay) {
+                        if (self().my_divisor > 1)// produce affinitized tasks while they have slot in array
+                            return true;// do not do my_max_depth++ here, but be sure range_pool is splittable once more
+                        else if (self().my_divisor && my_max_depth) {// make balancing task
+                            self().my_divisor
+                                    = 0;// once for each task; depth will be decreased in align_depth()
+                            return true;
+                        } else if (tree_node::is_peer_stolen(t)) {
+                            my_max_depth += __TBB_DEMAND_DEPTH_ADD;
+                            return true;
+                        }
+                    } else if (begin == my_delay) {
+                        my_delay = pass;
+                    }
+                    return false;
+                }
+            };
+
+            class auto_partition_type : public dynamic_grainsize_mode<adaptive_mode<auto_partition_type>> {
+            public:
+                auto_partition_type(const auto_partitioner&) { my_divisor *= __TBB_INITIAL_CHUNKS; }
+                auto_partition_type(auto_partition_type& src, split)
+                    : dynamic_grainsize_mode<adaptive_mode<auto_partition_type>>(src, split()) {}
+                bool is_divisible() {// part of old should_execute_range()
+                    if (my_divisor > 1) return true;
+                    if (my_divisor && my_max_depth) {// can split the task. TODO: on-stack flag instead
+                        // keep same fragmentation while splitting for the local task pool
+                        my_max_depth--;
+                        my_divisor = 0;// decrease max_depth once per task
+                        return true;
+                    } else
+                        return false;
+                }
+                template <typename Task>
+                bool check_for_demand(Task& t) {
+                    if (tree_node::is_peer_stolen(t)) {
+                        my_max_depth += __TBB_DEMAND_DEPTH_ADD;
+                        return true;
+                    } else
+                        return false;
+                }
+                void spawn_task(task& t, task_group_context& ctx) { spawn(t, ctx); }
+            };
+
+            class simple_partition_type : public partition_type_base<simple_partition_type> {
+            public:
+                simple_partition_type(const simple_partitioner&) {}
+                simple_partition_type(const simple_partition_type&, split) {}
+                //! simplified algorithm
+                template <typename StartType, typename Range>
+                void execute(StartType& start, Range& range, execution_data& ed) {
+                    split_type split_obj = split();// start.offer_work accepts split_type as reference
+                    while (range.is_divisible()) start.offer_work(split_obj, ed);
+                    start.run_body(range);
+                }
+                void spawn_task(task& t, task_group_context& ctx) { spawn(t, ctx); }
+            };
+
+            class static_partition_type : public linear_affinity_mode<static_partition_type> {
+            public:
+                typedef detail::proportional_split split_type;
+                static_partition_type(const static_partitioner&) {}
+                static_partition_type(static_partition_type& p, const proportional_split& split_obj)
+                    : linear_affinity_mode<static_partition_type>(p, split_obj) {}
+            };
+
+            class affinity_partition_type
+                : public dynamic_grainsize_mode<linear_affinity_mode<affinity_partition_type>> {
+                static const unsigned factor_power
+                        = 4;// TODO: get a unified formula based on number of computing units
+                slot_id* my_array;
+
+            public:
+                static const unsigned factor = 1 << factor_power;// number of slots in affinity array per task
+                typedef detail::proportional_split split_type;
+                affinity_partition_type(affinity_partitioner_base& ap) {
+                    __TBB_ASSERT((factor & (factor - 1)) == 0, "factor must be power of two");
+                    ap.resize(factor);
+                    my_array = ap.my_array;
+                    my_max_depth = factor_power + 1;
+                    __TBB_ASSERT(my_max_depth < __TBB_RANGE_POOL_CAPACITY, nullptr);
+                }
+                affinity_partition_type(affinity_partition_type& p, split)
+                    : dynamic_grainsize_mode<linear_affinity_mode<affinity_partition_type>>(p, split()),
+                      my_array(p.my_array) {}
+                affinity_partition_type(affinity_partition_type& p, const proportional_split& split_obj)
+                    : dynamic_grainsize_mode<linear_affinity_mode<affinity_partition_type>>(p, split_obj),
+                      my_array(p.my_array) {}
+                void note_affinity(slot_id id) {
+                    if (my_divisor) my_array[my_head] = id;
+                }
+                void spawn_task(task& t, task_group_context& ctx) {
+                    if (my_divisor) {
+                        if (!my_array[my_head]) {
+                            // TODO: consider new ideas with my_array for both affinity and static partitioner's, then code reuse
+                            spawn(t, ctx, slot_id(my_head / factor));
+                        } else {
+                            spawn(t, ctx, my_array[my_head]);
+                        }
+                    } else {
+                        spawn(t, ctx);
+                    }
+                }
+            };
+
+            //! A simple partitioner
+            /** Divides the range until the range is not divisible.
     @ingroup algorithms */
-class simple_partitioner {
-public:
-    simple_partitioner() {}
-private:
-    template<typename Range, typename Body, typename Partitioner> friend struct start_for;
-    template<typename Range, typename Body, typename Partitioner> friend struct start_reduce;
-    template<typename Range, typename Body, typename Partitioner> friend struct start_deterministic_reduce;
-    template<typename Range, typename Body, typename Partitioner> friend struct start_scan;
-    // new implementation just extends existing interface
-    typedef simple_partition_type task_partition_type;
-    // TODO: consider to make split_type public
-    typedef simple_partition_type::split_type split_type;
-
-    // for parallel_scan only
-    class partition_type {
-    public:
-        bool should_execute_range(const execution_data& ) {return false;}
-        partition_type( const simple_partitioner& ) {}
-        partition_type( const partition_type&, split ) {}
-    };
-};
-
-//! An auto partitioner
-/** The range is initial divided into several large chunks.
+            class simple_partitioner {
+            public:
+                simple_partitioner() {}
+
+            private:
+                template <typename Range, typename Body, typename Partitioner>
+                friend struct start_for;
+                template <typename Range, typename Body, typename Partitioner>
+                friend struct start_reduce;
+                template <typename Range, typename Body, typename Partitioner>
+                friend struct start_deterministic_reduce;
+                template <typename Range, typename Body, typename Partitioner>
+                friend struct start_scan;
+                // new implementation just extends existing interface
+                typedef simple_partition_type task_partition_type;
+                // TODO: consider to make split_type public
+                typedef simple_partition_type::split_type split_type;
+
+                // for parallel_scan only
+                class partition_type {
+                public:
+                    bool should_execute_range(const execution_data&) { return false; }
+                    partition_type(const simple_partitioner&) {}
+                    partition_type(const partition_type&, split) {}
+                };
+            };
+
+            //! An auto partitioner
+            /** The range is initial divided into several large chunks.
     Chunks are further subdivided into smaller pieces if demand detected and they are divisible.
     @ingroup algorithms */
-class auto_partitioner {
-public:
-    auto_partitioner() {}
-
-private:
-    template<typename Range, typename Body, typename Partitioner> friend struct start_for;
-    template<typename Range, typename Body, typename Partitioner> friend struct start_reduce;
-    template<typename Range, typename Body, typename Partitioner> friend struct start_deterministic_reduce;
-    template<typename Range, typename Body, typename Partitioner> friend struct start_scan;
-    // new implementation just extends existing interface
-    typedef auto_partition_type task_partition_type;
-    // TODO: consider to make split_type public
-    typedef auto_partition_type::split_type split_type;
-
-    //! Backward-compatible partition for auto and affinity partition objects.
-    class partition_type {
-        size_t num_chunks;
-        static const size_t VICTIM_CHUNKS = 4;
-        public:
-        bool should_execute_range(const execution_data& ed) {
-            if( num_chunks<VICTIM_CHUNKS && is_stolen_task(ed) )
-                num_chunks = VICTIM_CHUNKS;
-            return num_chunks==1;
-        }
-        partition_type( const auto_partitioner& )
-            : num_chunks(get_initial_auto_partitioner_divisor()*__TBB_INITIAL_CHUNKS/4) {}
-        partition_type( partition_type& pt, split ) {
-            num_chunks = pt.num_chunks = (pt.num_chunks+1u) / 2u;
-        }
-    };
-};
-
-//! A static partitioner
-class static_partitioner {
-public:
-    static_partitioner() {}
-private:
-    template<typename Range, typename Body, typename Partitioner> friend struct start_for;
-    template<typename Range, typename Body, typename Partitioner> friend struct start_reduce;
-    template<typename Range, typename Body, typename Partitioner> friend struct start_deterministic_reduce;
-    template<typename Range, typename Body, typename Partitioner> friend struct start_scan;
-    // new implementation just extends existing interface
-    typedef static_partition_type task_partition_type;
-    // TODO: consider to make split_type public
-    typedef static_partition_type::split_type split_type;
-};
-
-//! An affinity partitioner
-class affinity_partitioner : affinity_partitioner_base {
-public:
-    affinity_partitioner() {}
-
-private:
-    template<typename Range, typename Body, typename Partitioner> friend struct start_for;
-    template<typename Range, typename Body, typename Partitioner> friend struct start_reduce;
-    template<typename Range, typename Body, typename Partitioner> friend struct start_deterministic_reduce;
-    template<typename Range, typename Body, typename Partitioner> friend struct start_scan;
-    // new implementation just extends existing interface
-    typedef affinity_partition_type task_partition_type;
-    // TODO: consider to make split_type public
-    typedef affinity_partition_type::split_type split_type;
-};
-
-} // namespace d1
-} // namespace detail
-
-inline namespace v1 {
-// Partitioners
-using detail::d1::auto_partitioner;
-using detail::d1::simple_partitioner;
-using detail::d1::static_partitioner;
-using detail::d1::affinity_partitioner;
-// Split types
-using detail::split;
-using detail::proportional_split;
-} // namespace v1
-
-} // namespace tbb
+            class auto_partitioner {
+            public:
+                auto_partitioner() {}
+
+            private:
+                template <typename Range, typename Body, typename Partitioner>
+                friend struct start_for;
+                template <typename Range, typename Body, typename Partitioner>
+                friend struct start_reduce;
+                template <typename Range, typename Body, typename Partitioner>
+                friend struct start_deterministic_reduce;
+                template <typename Range, typename Body, typename Partitioner>
+                friend struct start_scan;
+                // new implementation just extends existing interface
+                typedef auto_partition_type task_partition_type;
+                // TODO: consider to make split_type public
+                typedef auto_partition_type::split_type split_type;
+
+                //! Backward-compatible partition for auto and affinity partition objects.
+                class partition_type {
+                    size_t num_chunks;
+                    static const size_t VICTIM_CHUNKS = 4;
+
+                public:
+                    bool should_execute_range(const execution_data& ed) {
+                        if (num_chunks < VICTIM_CHUNKS && is_stolen_task(ed)) num_chunks = VICTIM_CHUNKS;
+                        return num_chunks == 1;
+                    }
+                    partition_type(const auto_partitioner&)
+                        : num_chunks(get_initial_auto_partitioner_divisor() * __TBB_INITIAL_CHUNKS / 4) {}
+                    partition_type(partition_type& pt, split) {
+                        num_chunks = pt.num_chunks = (pt.num_chunks + 1u) / 2u;
+                    }
+                };
+            };
+
+            //! A static partitioner
+            class static_partitioner {
+            public:
+                static_partitioner() {}
+
+            private:
+                template <typename Range, typename Body, typename Partitioner>
+                friend struct start_for;
+                template <typename Range, typename Body, typename Partitioner>
+                friend struct start_reduce;
+                template <typename Range, typename Body, typename Partitioner>
+                friend struct start_deterministic_reduce;
+                template <typename Range, typename Body, typename Partitioner>
+                friend struct start_scan;
+                // new implementation just extends existing interface
+                typedef static_partition_type task_partition_type;
+                // TODO: consider to make split_type public
+                typedef static_partition_type::split_type split_type;
+            };
+
+            //! An affinity partitioner
+            class affinity_partitioner : affinity_partitioner_base {
+            public:
+                affinity_partitioner() {}
+
+            private:
+                template <typename Range, typename Body, typename Partitioner>
+                friend struct start_for;
+                template <typename Range, typename Body, typename Partitioner>
+                friend struct start_reduce;
+                template <typename Range, typename Body, typename Partitioner>
+                friend struct start_deterministic_reduce;
+                template <typename Range, typename Body, typename Partitioner>
+                friend struct start_scan;
+                // new implementation just extends existing interface
+                typedef affinity_partition_type task_partition_type;
+                // TODO: consider to make split_type public
+                typedef affinity_partition_type::split_type split_type;
+            };
+
+        }// namespace d1
+    }// namespace detail
+
+    inline namespace v1 {
+        // Partitioners
+        using detail::d1::affinity_partitioner;
+        using detail::d1::auto_partitioner;
+        using detail::d1::simple_partitioner;
+        using detail::d1::static_partitioner;
+        // Split types
+        using detail::proportional_split;
+        using detail::split;
+    }// namespace v1
+
+}// namespace tbb
 
 #if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
-    #pragma warning (pop)
-#endif // warning 4244 is back
+#pragma warning(pop)
+#endif// warning 4244 is back
 
 #undef __TBB_INITIAL_CHUNKS
 #undef __TBB_RANGE_POOL_CAPACITY
diff --git a/external/tbb/include/oneapi/tbb/task_group.h b/external/tbb/include/oneapi/tbb/task_group.h
index c0811c85..fd4cdd03 100644
--- a/external/tbb/include/oneapi/tbb/task_group.h
+++ b/external/tbb/include/oneapi/tbb/task_group.h
@@ -73,10 +73,8 @@ struct task_group_context_impl;
 
 namespace d2 {
 
-namespace {
 template<typename F>
 d1::task* task_ptr_or_nullptr(F&& f);
-}
 
 template<typename F>
 class function_task : public task_handle_task  {

From 974d0b1c1dd86b8b987f54f75fb230e44abced69 Mon Sep 17 00:00:00 2001
From: Luohao Wang <luohaothu@live.com>
Date: Sun, 8 Jun 2025 18:06:08 +0800
Subject: [PATCH 20/31] [Core] Fix compilation

---
 cmake/Version.hpp.in                    |  2 +-
 include/Core                            |  1 -
 src/CMakeLists.txt                      |  2 +-
 src/Core/Environment.hpp                | 24 ++++++++++-----------
 src/Core/Operator/BinOpDefMacros.hpp.in | 28 ++++++++++++-------------
 src/Core/Operator/UniOpDefMacros.hpp.in |  4 ++--
 src/opflow.cppm                         | 23 +++++++++++++-------
 7 files changed, 46 insertions(+), 38 deletions(-)

diff --git a/cmake/Version.hpp.in b/cmake/Version.hpp.in
index 41ec56a2..b9442866 100644
--- a/cmake/Version.hpp.in
+++ b/cmake/Version.hpp.in
@@ -3,5 +3,5 @@
 #endif
 
 namespace OpFlow::internal {
-    inline constexpr static auto OPFLOW_VERSION_STRING = std::string_view {"@OPFLOW_VERSION_STRING@"};
+    inline constexpr auto OPFLOW_VERSION_STRING = std::string_view {"@OPFLOW_VERSION_STRING@"};
 }
\ No newline at end of file
diff --git a/include/Core b/include/Core
index c1dedb5f..1dd87163 100644
--- a/include/Core
+++ b/include/Core
@@ -50,7 +50,6 @@
 #include "Core/Field/Analytical/AnalyticalFieldExpr.hpp"
 #include "Core/Field/FieldExpr.hpp"
 #include "Core/Field/FieldExprTrait.hpp"
-#include "Core/Field/FieldMacros.hpp"
 #include "Core/Field/MeshBased/MeshBasedFieldExpr.hpp"
 #include "Core/Field/MeshBased/MeshBasedFieldExprTrait.hpp"
 #include "Core/Field/MeshBased/SemiStructured/CartAMRField.hpp"
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 636f3d4d..9c0a6ccd 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -34,7 +34,7 @@ if(OPFLOW_ENABLE_MODULE)
         ${CMAKE_SOURCE_DIR}/include
         ${CMAKE_SOURCE_DIR}/src
         FILES ${OPFLOW_HEADERS})
-    target_compile_features(opflow PUBLIC cxx_std_23)
+    target_compile_features(opflow PUBLIC cxx_std_26)
     install(TARGETS opflow
         EXPORT opflow-targets
         FILE_SET CXX_MODULES DESTINATION ${CMAKE_INSTALL_LIBDIR}/cxx/opflow
diff --git a/src/Core/Environment.hpp b/src/Core/Environment.hpp
index 9280cd26..252fc9d2 100644
--- a/src/Core/Environment.hpp
+++ b/src/Core/Environment.hpp
@@ -26,13 +26,13 @@
 #include "Core/Parallel/ParallelPlan.hpp"
 
 namespace OpFlow {
-    void static inline InitEnvironment(int* argc, char*** argv) {
+    void inline InitEnvironment(int* argc, char*** argv) {
 #ifdef OPFLOW_WITH_MPI
         MPI_Init(argc, argv);
 #endif
     }
 
-    void static inline FinalizeEnvironment() {
+    void inline FinalizeEnvironment() {
 #ifdef OPFLOW_WITH_MPI
         MPI_Finalize();
 #endif
@@ -48,15 +48,15 @@ namespace OpFlow {
         inline ParallelPlan GLOBAL_PARALLELPLAN;
     }// namespace internal
 
-    inline static auto& getGlobalParallelInfo() { return internal::GLOBAL_PARALLELINFO; }
+    inline auto& getGlobalParallelInfo() { return internal::GLOBAL_PARALLELINFO; }
 
-    inline static auto& getGlobalParallelPlan() { return internal::GLOBAL_PARALLELPLAN; }
+    inline auto& getGlobalParallelPlan() { return internal::GLOBAL_PARALLELPLAN; }
 
-    inline static void setGlobalParallelInfo(const ParallelInfo& info) {
+    inline void setGlobalParallelInfo(const ParallelInfo& info) {
         internal::GLOBAL_PARALLELINFO = info;
     }
 
-    inline static void setGlobalParallelPlan(const ParallelPlan& plan) {
+    inline void setGlobalParallelPlan(const ParallelPlan& plan) {
         internal::GLOBAL_PARALLELPLAN = plan;
 #ifdef OPFLOW_WITH_OPENMP
         omp_set_num_threads(plan.shared_memory_workers_count);
@@ -64,9 +64,9 @@ namespace OpFlow {
     }
 
 #if defined(OPFLOW_WITH_MPI) && defined(OPFLOW_DISTRIBUTE_MODEL_MPI)
-    inline static int getWorkerId(MPI_Comm comm = MPI_COMM_WORLD) {
+    inline int getWorkerId(MPI_Comm comm = MPI_COMM_WORLD) {
 #else
-    inline static int getWorkerId() {
+    inline int getWorkerId() {
 #endif
 #if defined(OPFLOW_WITH_MPI) && defined(OPFLOW_DISTRIBUTE_MODEL_MPI)
         int rank;
@@ -78,9 +78,9 @@ namespace OpFlow {
     }
 
 #if defined(OPFLOW_WITH_MPI) && defined(OPFLOW_DISTRIBUTE_MODEL_MPI)
-    inline static int getWorkerCount(MPI_Comm comm = MPI_COMM_WORLD) {
+    inline int getWorkerCount(MPI_Comm comm = MPI_COMM_WORLD) {
 #else
-    inline static int getWorkerCount() {
+    inline int getWorkerCount() {
 #endif
 #if defined(OPFLOW_WITH_MPI) && defined(OPFLOW_DISTRIBUTE_MODEL_MPI)
         int size;
@@ -91,10 +91,10 @@ namespace OpFlow {
 #endif
     }
 
-    inline static void printVersion() {
+    inline void printVersion() {
         std::cout << "OpFlow version: " << internal::OPFLOW_VERSION_STRING << std::endl;
     }
 
-    inline static auto getVersionStr() { return std::string {internal::OPFLOW_VERSION_STRING}; }
+    inline auto getVersionStr() { return std::string {internal::OPFLOW_VERSION_STRING}; }
 }// namespace OpFlow
 #endif//OPFLOW_ENVIRONMENT_HPP
diff --git a/src/Core/Operator/BinOpDefMacros.hpp.in b/src/Core/Operator/BinOpDefMacros.hpp.in
index fc500a5c..c59e138d 100644
--- a/src/Core/Operator/BinOpDefMacros.hpp.in
+++ b/src/Core/Operator/BinOpDefMacros.hpp.in
@@ -24,14 +24,14 @@
                           || (SemiStructuredFieldExprType<T1> && SemiStructuredFieldExprType<T2>) )          \
                 if (expr.arg1.loc != expr.arg2.loc) {                                                        \
                     OP_ERROR("Operand {} and {}'s loc not same.", expr.arg1.name, expr.arg2.name);           \
-                    std::string loc1 = fmt::format(                                                          \
+                    std::string loc1 = std::format(                                                          \
                             "{{ {}", expr.arg1.loc[0] == LocOnMesh::Corner ? "Corner" : "Center");           \
-                    std::string loc2 = fmt::format(                                                          \
+                    std::string loc2 = std::format(                                                          \
                             "{{ {}", expr.arg2.loc[0] == LocOnMesh::Corner ? "Corner" : "Center");           \
                     for (auto i = 1; i < internal::FieldExprTrait<T1>::dim; ++i) {                           \
-                        loc1 += fmt::format(", {}",                                                          \
+                        loc1 += std::format(", {}",                                                          \
                                             expr.arg1.loc[i] == LocOnMesh::Corner ? "Corner" : "Center");    \
-                        loc2 += fmt::format(", {}",                                                          \
+                        loc2 += std::format(", {}",                                                          \
                                             expr.arg2.loc[i] == LocOnMesh::Corner ? "Corner" : "Center");    \
                     }                                                                                        \
                     loc1 += " }";                                                                            \
@@ -41,7 +41,7 @@
                     OP_ABORT;                                                                                \
                 }                                                                                            \
             expr.initPropsFrom(expr.arg1);                                                                   \
-            expr.name = fmt::format("{} {} {}", expr.arg1.name, #op, expr.arg2.name);                        \
+            expr.name = std::format("{} {} {}", expr.arg1.name, #op, expr.arg2.name);                        \
             if constexpr (StructuredFieldExprType<T1> && StructuredFieldExprType<T2>) {                      \
                 expr.accessibleRange                                                                         \
                         = DS::commonRange(expr.arg1.accessibleRange, expr.arg2.accessibleRange);             \
@@ -60,7 +60,7 @@
         template <typename T1, FieldExprType T2>                                                             \
         static void prepare(const Expression<Name##Op, ScalarExpr<T1>, T2>& expr) {                          \
             expr.initPropsFrom(expr.arg2);                                                                   \
-            expr.name = fmt::format("{} {} {}", expr.arg1.val, #op, expr.arg2.name);                         \
+            expr.name = std::format("{} {} {}", expr.arg1.val, #op, expr.arg2.name);                         \
             if constexpr (StructuredFieldExprType<Expression<Name##Op, ScalarExpr<T1>, T2>>)                 \
                 expr.assignableRange.setEmpty();                                                             \
             else if constexpr (SemiStructuredFieldExprType<Expression<Name##Op, ScalarExpr<T1>, T2>>) {      \
@@ -72,7 +72,7 @@
         template <FieldExprType T1, typename T2>                                                             \
         static void prepare(const Expression<Name##Op, T1, ScalarExpr<T2>>& expr) {                          \
             expr.initPropsFrom(expr.arg1);                                                                   \
-            expr.name = fmt::format("{} {} {}", expr.arg1.name, #op, expr.arg2.val);                         \
+            expr.name = std::format("{} {} {}", expr.arg1.name, #op, expr.arg2.val);                         \
             if constexpr (StructuredFieldExprType<Expression<Name##Op, T1, ScalarExpr<T2>>>)                 \
                 expr.assignableRange.setEmpty();                                                             \
             else if constexpr (SemiStructuredFieldExprType<Expression<Name##Op, T1, ScalarExpr<T2>>>) {      \
@@ -199,14 +199,14 @@
                             T1> && StructuredFieldExprType<T2> || SemiStructuredFieldExprType<T1> && SemiStructuredFieldExprType<T2>) \
                 if (expr.arg1.loc != expr.arg2.loc) {                                                                                 \
                     OP_ERROR("Operand {} and {}'s loc not same.", expr.arg1.name, expr.arg2.name);                                    \
-                    std::string loc1 = fmt::format(                                                                                   \
+                    std::string loc1 = std::format(                                                                                   \
                             "{{ {}", expr.arg1.loc[0] == LocOnMesh::Corner ? "Corner" : "Center");                                    \
-                    std::string loc2 = fmt::format(                                                                                   \
+                    std::string loc2 = std::format(                                                                                   \
                             "{{ {}", expr.arg2.loc[0] == LocOnMesh::Corner ? "Corner" : "Center");                                    \
                     for (auto i = 1; i < internal::FieldExprTrait<T1>::dim; ++i) {                                                    \
-                        loc1 += fmt::format(", {}",                                                                                   \
+                        loc1 += std::format(", {}",                                                                                   \
                                             expr.arg1.loc[i] == LocOnMesh::Corner ? "Corner" : "Center");                             \
-                        loc2 += fmt::format(", {}",                                                                                   \
+                        loc2 += std::format(", {}",                                                                                   \
                                             expr.arg2.loc[i] == LocOnMesh::Corner ? "Corner" : "Center");                             \
                     }                                                                                                                 \
                     loc1 += " }";                                                                                                     \
@@ -216,7 +216,7 @@
                     OP_ABORT;                                                                                                         \
                 }                                                                                                                     \
             expr.initPropsFrom(expr.arg1);                                                                                            \
-            expr.name = fmt::format("{}({}, {})", #func, expr.arg1.name, expr.arg2.name);                                             \
+            expr.name = std::format("{}({}, {})", #func, expr.arg1.name, expr.arg2.name);                                             \
             if constexpr (StructuredFieldExprType<T1> && StructuredFieldExprType<T2>) {                                               \
                 expr.accessibleRange                                                                                                  \
                         = DS::commonRange(expr.arg1.accessibleRange, expr.arg2.accessibleRange);                                      \
@@ -235,7 +235,7 @@
         template <typename T1, FieldExprType T2>                                                                                      \
         static void prepare(const Expression<Name##Op, ScalarExpr<T1>, T2>& expr) {                                                   \
             expr.initPropsFrom(expr.arg2);                                                                                            \
-            expr.name = fmt::format("{}({}, {})", #func, expr.arg1.val, expr.arg2.name);                                              \
+            expr.name = std::format("{}({}, {})", #func, expr.arg1.val, expr.arg2.name);                                              \
             if constexpr (StructuredFieldExprType<Expression<Name##Op, ScalarExpr<T1>, T2>>)                                          \
                 expr.assignableRange.setEmpty();                                                                                      \
             else if constexpr (SemiStructuredFieldExprType<Expression<Name##Op, ScalarExpr<T1>, T2>>) {                               \
@@ -247,7 +247,7 @@
         template <FieldExprType T1, typename T2>                                                                                      \
         static void prepare(const Expression<Name##Op, T1, ScalarExpr<T2>>& expr) {                                                   \
             expr.initPropsFrom(expr.arg1);                                                                                            \
-            expr.name = fmt::format("{}({}, {})", #func, expr.arg1.name, expr.arg2.val);                                              \
+            expr.name = std::format("{}({}, {})", #func, expr.arg1.name, expr.arg2.val);                                              \
             if constexpr (StructuredFieldExprType<Expression<Name##Op, T1, ScalarExpr<T2>>>)                                          \
                 expr.assignableRange.setEmpty();                                                                                      \
             else if constexpr (SemiStructuredFieldExprType<Expression<Name##Op, T1, ScalarExpr<T2>>>) {                               \
diff --git a/src/Core/Operator/UniOpDefMacros.hpp.in b/src/Core/Operator/UniOpDefMacros.hpp.in
index f9531bc5..a18d6526 100644
--- a/src/Core/Operator/UniOpDefMacros.hpp.in
+++ b/src/Core/Operator/UniOpDefMacros.hpp.in
@@ -19,7 +19,7 @@
         template <FieldExprType T1>                                                                          \
         static void prepare(const Expression<Name##Op, T1>& expr) {                                          \
             expr.initPropsFrom(expr.arg1);                                                                   \
-            expr.name = fmt::format("{} {}", #op, expr.arg1.name);                                           \
+            expr.name = std::format("{} {}", #op, expr.arg1.name);                                           \
             if constexpr (StructuredFieldExprType<T1>) {                                                     \
                 expr.assignableRange.setEmpty();                                                             \
             } else if constexpr (SemiStructuredFieldExprType<T1>) {                                          \
@@ -70,7 +70,7 @@
         template <FieldExprType T1>                                                                          \
         static void prepare(const Expression<Name##Op, T1>& expr) {                                          \
             expr.initPropsFrom(expr.arg1);                                                                   \
-            expr.name = fmt::format("{}({})", #func, expr.arg1.name);                                        \
+            expr.name = std::format("{}({})", #func, expr.arg1.name);                                        \
             if constexpr (StructuredFieldExprType<T1>) {                                                     \
                 expr.assignableRange.setEmpty();                                                             \
             } else if constexpr (SemiStructuredFieldExprType<T1>) {                                          \
diff --git a/src/opflow.cppm b/src/opflow.cppm
index 291cd812..3e32e091 100644
--- a/src/opflow.cppm
+++ b/src/opflow.cppm
@@ -1,14 +1,23 @@
 module;
-/*
+
+#define AMGCL_NO_BOOST
+#include <HYPRE.h>
+#include <HYPRE_sstruct_ls.h>
+#include <HYPRE_sstruct_mv.h>
+#include <TECIO.h>
+#include <amgcl/adapter/zero_copy.hpp>
+#include <amgcl/profiler.hpp>
+#include <bits/stdc++.h>
+#include <oneapi/tbb.h>
 #include <oneapi/tbb/detail/_range_common.h>
+#include <spdlog/spdlog.h>
+#ifdef OPFLOW_WITH_MPI
+#include <amgcl/mpi/distributed_matrix.hpp>
+#include <amgcl/mpi/make_solver.hpp>
+#endif
 
 export module opflow;
 
 #define OPFLOW_INSIDE_MODULE
 
-#include "OpFlow"
-*/
-
-#include <iostream>
-
-export module AAA;
+#include "OpFlow"
\ No newline at end of file

From 7ea6c51ffb113a48198141ca833188ae478073a6 Mon Sep 17 00:00:00 2001
From: Luohao Wang <luohaothu@live.com>
Date: Sun, 8 Jun 2025 18:09:54 +0800
Subject: [PATCH 21/31] [Core] Replace usage of bits header

---
 src/opflow.cppm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/opflow.cppm b/src/opflow.cppm
index 3e32e091..446251b4 100644
--- a/src/opflow.cppm
+++ b/src/opflow.cppm
@@ -7,7 +7,6 @@ module;
 #include <TECIO.h>
 #include <amgcl/adapter/zero_copy.hpp>
 #include <amgcl/profiler.hpp>
-#include <bits/stdc++.h>
 #include <oneapi/tbb.h>
 #include <oneapi/tbb/detail/_range_common.h>
 #include <spdlog/spdlog.h>
@@ -16,6 +15,11 @@ module;
 #include <amgcl/mpi/make_solver.hpp>
 #endif
 
+#include <cstdarg>
+#include <any>
+#include <filesystem>
+#include <fstream>
+
 export module opflow;
 
 #define OPFLOW_INSIDE_MODULE

From fd4bd56a63d6d21b2419bbe317bbc85150154dd0 Mon Sep 17 00:00:00 2001
From: Luohao Wang <luohaothu@live.com>
Date: Sun, 8 Jun 2025 23:30:59 +0800
Subject: [PATCH 22/31] [Ext] Patch AMGCL for module

---
 external/amgcl/amgcl/backend/builtin.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/external/amgcl/amgcl/backend/builtin.hpp b/external/amgcl/amgcl/backend/builtin.hpp
index de3b58d2..1b3492c2 100644
--- a/external/amgcl/amgcl/backend/builtin.hpp
+++ b/external/amgcl/amgcl/backend/builtin.hpp
@@ -718,7 +718,7 @@ namespace amgcl {
         // Use Power method when power_iters > 0.
         // When scale = true, scale the matrix by its inverse diagonal.
         template <bool scale, class Matrix>
-        static typename math::scalar_of<typename backend::value_type<Matrix>::type>::type
+        typename math::scalar_of<typename backend::value_type<Matrix>::type>::type
         spectral_radius(const Matrix &A, int power_iters = 0) {
             AMGCL_TIC("spectral radius");
             typedef typename backend::value_type<Matrix>::type value_type;

From 05fe9968aded5a9df2d56946b0e879ee0bdb3e81 Mon Sep 17 00:00:00 2001
From: Luohao Wang <luohaothu@live.com>
Date: Sun, 8 Jun 2025 23:34:00 +0800
Subject: [PATCH 23/31] [Core] Add adapter module for AMGCL

---
 src/CMakeLists.txt |  7 ++--
 src/amgcl.cppm     | 81 ++++++++++++++++++++++++++++++++++++++++++++++
 src/opflow.cppm    | 10 ++----
 3 files changed, 88 insertions(+), 10 deletions(-)
 create mode 100644 src/amgcl.cppm

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9c0a6ccd..f2b555c5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,7 +1,7 @@
 # ----------------------------------------------------------------------------
 # CMakeLists.txt for the opflow library
 # ----------------------------------------------------------------------------
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 4.0.2 FATAL_ERROR)
 
 file(GLOB_RECURSE OPFLOW_HEADERS
     ${CMAKE_SOURCE_DIR}/src/*.hpp)
@@ -23,11 +23,12 @@ if(OPFLOW_ENABLE_MODULE)
     # ----------------------------------------------------------------------------
     add_library(opflow)
 
-    target_compile_definitions(opflow INTERFACE OPFLOW_USE_MODULE)
+    target_compile_definitions(opflow PUBLIC OPFLOW_USE_MODULE)
     set_property(TARGET opflow PROPERTY CXX_SCAN_FOR_MODULES ON)
     target_sources(opflow
         PUBLIC FILE_SET CXX_MODULES
-        FILES ${CMAKE_SOURCE_DIR}/src/opflow.cppm)
+        FILES ${CMAKE_SOURCE_DIR}/src/opflow.cppm
+        ${CMAKE_SOURCE_DIR}/src/amgcl.cppm)
     target_sources(opflow
         PUBLIC FILE_SET HEADERS
         BASE_DIRS
diff --git a/src/amgcl.cppm b/src/amgcl.cppm
new file mode 100644
index 00000000..6fc9eb89
--- /dev/null
+++ b/src/amgcl.cppm
@@ -0,0 +1,81 @@
+module;
+
+#define AMGCL_NO_BOOST
+
+#include <amgcl/adapter/zero_copy.hpp>
+#include <amgcl/profiler.hpp>
+#include <amgcl/make_solver.hpp>
+#include <amgcl/amg.hpp>
+#include <amgcl/coarsening/smoothed_aggregation.hpp>
+#include <amgcl/make_solver.hpp>
+#include <amgcl/relaxation/spai0.hpp>
+#include <amgcl/solver/bicgstab.hpp>
+#include <amgcl/solver/bicgstabl.hpp>
+#include <amgcl/solver/cg.hpp>
+#include <amgcl/solver/fgmres.hpp>
+#include <amgcl/solver/gmres.hpp>
+#include <amgcl/solver/preonly.hpp>
+#include <amgcl/solver/skyline_lu.hpp>
+
+#include <amgcl/adapter/zero_copy.hpp>
+#include <amgcl/io/binary.hpp>
+#include <amgcl/profiler.hpp>
+
+#ifdef OPFLOW_WITH_MPI
+#include <amgcl/mpi/distributed_matrix.hpp>
+#include <amgcl/mpi/make_solver.hpp>
+#include <amgcl/mpi/amg.hpp>
+#include <amgcl/mpi/coarsening/smoothed_aggregation.hpp>
+#include <amgcl/mpi/distributed_matrix.hpp>
+#include <amgcl/mpi/make_solver.hpp>
+#include <amgcl/mpi/relaxation/spai0.hpp>
+#include <amgcl/mpi/solver/bicgstab.hpp>
+#include <amgcl/mpi/solver/bicgstabl.hpp>
+#include <amgcl/mpi/solver/cg.hpp>
+#include <amgcl/mpi/solver/fgmres.hpp>
+#include <amgcl/mpi/solver/gmres.hpp>
+#include <amgcl/mpi/solver/preonly.hpp>
+#include <mpi.h>
+#endif
+
+#if defined(AMGCL_HAVE_PARMETIS)
+#include <amgcl/mpi/partition/parmetis.hpp>
+#elif defined(AMGCL_HAVE_SCOTCH)
+#include <amgcl/mpi/partition/ptscotch.hpp>
+#endif
+
+export module ext.amgcl;
+
+export namespace amgcl {
+    namespace adapter {
+        using amgcl::adapter::zero_copy;
+    }
+    using amgcl::profiler;
+    namespace backend {
+        using amgcl::backend::builtin;
+        using amgcl::backend::sort_rows;
+        using amgcl::backend::rows;
+        using amgcl::backend::cols;
+        using amgcl::backend::transpose;
+        using amgcl::backend::nonzeros;
+        using amgcl::backend::product;
+        using amgcl::backend::diagonal;
+    }
+    using amgcl::make_solver;
+    using amgcl::amg;
+    namespace coarsening {
+        using amgcl::coarsening::smoothed_aggregation;
+    }
+    namespace relaxation {
+        using amgcl::relaxation::spai0;
+    }
+    namespace solver {
+        using amgcl::solver::bicgstab;
+        using amgcl::solver::bicgstabl;
+        using amgcl::solver::cg;
+        using amgcl::solver::fgmres;
+        using amgcl::solver::gmres;
+        using amgcl::solver::preonly;
+        using amgcl::solver::skyline_lu;
+    }
+}
\ No newline at end of file
diff --git a/src/opflow.cppm b/src/opflow.cppm
index 446251b4..4bea44b3 100644
--- a/src/opflow.cppm
+++ b/src/opflow.cppm
@@ -1,26 +1,22 @@
 module;
 
-#define AMGCL_NO_BOOST
 #include <HYPRE.h>
 #include <HYPRE_sstruct_ls.h>
 #include <HYPRE_sstruct_mv.h>
 #include <TECIO.h>
-#include <amgcl/adapter/zero_copy.hpp>
-#include <amgcl/profiler.hpp>
 #include <oneapi/tbb.h>
 #include <oneapi/tbb/detail/_range_common.h>
 #include <spdlog/spdlog.h>
-#ifdef OPFLOW_WITH_MPI
-#include <amgcl/mpi/distributed_matrix.hpp>
-#include <amgcl/mpi/make_solver.hpp>
-#endif
 
 #include <cstdarg>
 #include <any>
 #include <filesystem>
 #include <fstream>
+#include <print>
+#include <iostream>
 
 export module opflow;
+export import ext.amgcl;
 
 #define OPFLOW_INSIDE_MODULE
 

From d2ca80980f2f45b0f0b7a234b4f7c2310b2e220c Mon Sep 17 00:00:00 2001
From: Luohao Wang <luohaothu@live.com>
Date: Sun, 8 Jun 2025 23:34:38 +0800
Subject: [PATCH 24/31] [CI] Remove unused tests

---
 test/CMakeLists.txt      |  3 +--
 test/Misc/CMakeLists.txt | 19 -----------------
 test/Misc/FmtlibTest.cpp | 23 --------------------
 test/Misc/SpdlogTest.cpp | 46 ----------------------------------------
 4 files changed, 1 insertion(+), 90 deletions(-)
 delete mode 100644 test/Misc/CMakeLists.txt
 delete mode 100644 test/Misc/FmtlibTest.cpp
 delete mode 100644 test/Misc/SpdlogTest.cpp

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 3da9b8e5..6fee506e 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -10,7 +10,7 @@
 #
 # ----------------------------------------------------------------------------
 
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 4.0.2 FATAL_ERROR)
 project(OpFlow_Tests)
 
 if (NOT TARGET opflow)
@@ -145,7 +145,6 @@ endif ()
 
 add_subdirectory(Core)
 add_subdirectory(DataStructures)
-add_subdirectory(Misc)
 add_subdirectory(Utils)
 
 # Add global tests target
diff --git a/test/Misc/CMakeLists.txt b/test/Misc/CMakeLists.txt
deleted file mode 100644
index 2d000a32..00000000
--- a/test/Misc/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-# ----------------------------------------------------------------------------
-#
-# Copyright (c) 2019 - 2023 by the OpFlow developers
-#
-# This file is part of OpFlow.
-# 
-# OpFlow is free software and is distributed under the MPL v2.0 license. 
-# The full text of the license can be found in the file LICENSE at the top
-# level directory of OpFlow.
-#
-# ----------------------------------------------------------------------------
-
-project(OpFlow_Misc_Tests)
-
-add_gmock(FmtlibTest ${CMAKE_CURRENT_SOURCE_DIR}/FmtlibTest.cpp)
-target_link_libraries(FmtlibTest opflow::opflow)
-
-add_gmock(SpdlogTest ${CMAKE_CURRENT_SOURCE_DIR}/SpdlogTest.cpp)
-target_link_libraries(SpdlogTest opflow::opflow)
\ No newline at end of file
diff --git a/test/Misc/FmtlibTest.cpp b/test/Misc/FmtlibTest.cpp
deleted file mode 100644
index cc51f143..00000000
--- a/test/Misc/FmtlibTest.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-// ----------------------------------------------------------------------------
-//
-// Copyright (c) 2019 - 2023 by the OpFlow developers
-//
-// This file is part of OpFlow.
-//
-// OpFlow is free software and is distributed under the MPL v2.0 license.
-// The full text of the license can be found in the file LICENSE at the top
-// level directory of OpFlow.
-//
-// ----------------------------------------------------------------------------
-
-#define FMT_HEADER_ONLY
-#include <fmt/core.h>
-#include <gmock/gmock.h>
-
-using namespace testing;
-
-// Test to ensure fmt lib is linked correctly
-TEST(FMTTest, FMTTest) {
-    fmt::print("Hello {}\n", "world");
-    ASSERT_TRUE(true);
-}
\ No newline at end of file
diff --git a/test/Misc/SpdlogTest.cpp b/test/Misc/SpdlogTest.cpp
deleted file mode 100644
index da031d46..00000000
--- a/test/Misc/SpdlogTest.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-// ----------------------------------------------------------------------------
-//
-// Copyright (c) 2019 - 2023 by the OpFlow developers
-//
-// This file is part of OpFlow.
-//
-// OpFlow is free software and is distributed under the MPL v2.0 license.
-// The full text of the license can be found in the file LICENSE at the top
-// level directory of OpFlow.
-//
-// ----------------------------------------------------------------------------
-
-#include <gmock/gmock.h>
-#include <spdlog/sinks/basic_file_sink.h>
-#include <spdlog/spdlog.h>
-
-using namespace testing;
-
-// Test to ensure spdlog lib is linked correctly
-TEST(spdlog_test, spdlog_test) {
-    spdlog::info("Welcome to spdlog!");
-    spdlog::error("Some error message with arg: {}", 1);
-
-    spdlog::warn("Easy padding in numbers like {:08d}", 12);
-    spdlog::critical("Support for int: {0:d};  hex: {0:x};  oct: {0:o}; bin: {0:b}", 42);
-    spdlog::info("Support for floats {:03.2f}", 1.23456);
-    spdlog::info("Positional args are {1} {0}..", "too", "supported");
-    spdlog::info("{:<30}", "left aligned");
-
-    spdlog::set_level(spdlog::level::debug);// Set global log level to debug
-    spdlog::debug("This message should be displayed..");
-
-    // change log pattern
-    spdlog::set_pattern("[%H:%M:%S %z] [%n] [%^---%L---%$] [thread %t] %v");
-
-    // Compile time log levels
-    // define SPDLOG_ACTIVE_LEVEL to desired level
-    SPDLOG_TRACE("Some trace message with param {}", 42);
-    SPDLOG_DEBUG("Some debug message");
-
-    // Set the default logger to file logger
-    auto file_logger = spdlog::basic_logger_mt("basic_logger", "logs/basic.txt");
-    spdlog::set_default_logger(file_logger);
-
-    ASSERT_TRUE(true);
-}
\ No newline at end of file

From bee9a7360b632ed9ac761fa7b3614198297a667c Mon Sep 17 00:00:00 2001
From: Luohao Wang <luohaothu@live.com>
Date: Sun, 8 Jun 2025 23:35:27 +0800
Subject: [PATCH 25/31] [CI] Use std::format

---
 test/Core/Loops/RangeForTest.cpp | 10 +++++-----
 test/Utils/HDF5StreamMPITest.cpp | 14 +++++++-------
 test/Utils/HDF5StreamTest.cpp    |  4 ++--
 test/Utils/IOGroupTest.cpp       |  2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/test/Core/Loops/RangeForTest.cpp b/test/Core/Loops/RangeForTest.cpp
index 075e8ca0..4032079c 100644
--- a/test/Core/Loops/RangeForTest.cpp
+++ b/test/Core/Loops/RangeForTest.cpp
@@ -41,8 +41,8 @@ class RangedIndexTest : public Test {
         t.dim;
     }
     [[nodiscard]] auto serialize(const T& idx) const {
-        auto ret = fmt::format("({}", idx[0]);
-        for (auto i = 1; i < idx.dim; ++i) { ret += fmt::format(", {}", idx[i]); }
+        auto ret = std::format("({}", idx[0]);
+        for (auto i = 1; i < idx.dim; ++i) { ret += std::format(", {}", idx[i]); }
         ret += ")";
         return ret;
     }
@@ -64,7 +64,7 @@ TEST_F(RangedIndexTest, MoveToNext) {
     for (auto linear = 0; linear < total; ++linear, ++index) {
         auto target = fromLinear(linear);
         if (debug)
-            std::cout << fmt::format("Lin. = {:>3d}, Target = {}, Current = {}", linear, serialize(target),
+            std::cout << std::format("Lin. = {:>3d}, Target = {}, Current = {}", linear, serialize(target),
                                      serialize(index))
                       << std::endl;
         for (auto i = 0; i < index.dim; ++i) { ASSERT_EQ(target[i], index[i]); }
@@ -76,7 +76,7 @@ TEST_F(RangedIndexTest, GetLast) {
     auto target = fromLinear(total - 1);
     auto last = index.last();
     if (debug)
-        std::cout << fmt::format("Lin. = {:>3d}, Target = {}, Current = {}", total - 1, serialize(target),
+        std::cout << std::format("Lin. = {:>3d}, Target = {}, Current = {}", total - 1, serialize(target),
                                  serialize(last))
                   << std::endl;
     for (auto i = 0; i < index.dim; ++i) { ASSERT_EQ(target[i], last[i]); }
@@ -88,7 +88,7 @@ TEST_F(RangedIndexTest, MoveToPre) {
     for (auto linear = total - 1; linear >= 0; --linear, --index) {
         auto target = fromLinear(linear);
         if (debug)
-            std::cout << fmt::format("Lin. = {:>3d}, Target = {}, Current = {}", linear, serialize(target),
+            std::cout << std::format("Lin. = {:>3d}, Target = {}, Current = {}", linear, serialize(target),
                                      serialize(index))
                       << std::endl;
         for (auto i = 0; i < index.dim; ++i) { ASSERT_EQ(target[i], index[i]); }
diff --git a/test/Utils/HDF5StreamMPITest.cpp b/test/Utils/HDF5StreamMPITest.cpp
index fa62d328..c41ed36f 100644
--- a/test/Utils/HDF5StreamMPITest.cpp
+++ b/test/Utils/HDF5StreamMPITest.cpp
@@ -47,7 +47,7 @@ class H5RWMPITest : public virtual ::testing::Test {
 
 TEST_F(H5RWMPITest, WriteToFile) {
     u = 1.;
-    std::string filename = fmt::format("./u.wrf.mpi{}.h5", getWorkerCount());
+    std::string filename = std::format("./u.wrf.mpi{}.h5", getWorkerCount());
     Utils::H5Stream stream(filename);
     stream << u;
     ASSERT_TRUE(true);
@@ -55,11 +55,11 @@ TEST_F(H5RWMPITest, WriteToFile) {
 
 TEST_F(H5RWMPITest, SeparateFile) {
     u = 1.;
-    Utils::H5Stream stream(fmt::format("./u.sf.mpi{}.h5", getWorkerCount()));
+    Utils::H5Stream stream(std::format("./u.sf.mpi{}.h5", getWorkerCount()));
     stream.dumpToSeparateFile();
     stream << Utils::TimeStamp(1e-4) << u << Utils::TimeStamp(1000.) << u;
-    ASSERT_TRUE(std::filesystem::exists(fmt::format("./u.sf.mpi{}_{:.6f}.h5", getWorkerCount(), 1e-4))
-                && std::filesystem::exists(fmt::format("./u.sf.mpi{}_{:.6f}.h5", getWorkerCount(), 1000.)));
+    ASSERT_TRUE(std::filesystem::exists(std::format("./u.sf.mpi{}_{:.6f}.h5", getWorkerCount(), 1e-4))
+                && std::filesystem::exists(std::format("./u.sf.mpi{}_{:.6f}.h5", getWorkerCount(), 1000.)));
 }
 
 TEST_F(H5RWMPITest, ReadAfterWrite) {
@@ -67,7 +67,7 @@ TEST_F(H5RWMPITest, ReadAfterWrite) {
     // Therefore, we need to close the stream before reading.
     if (DS::inRange(u.getLocalWritableRange(), DS::MDIndex<2> {2, 2})) u[DS::MDIndex<2>(2, 2)] = 2.;
     u.updatePadding();
-    std::string filename = fmt::format("./u.raw.mpi{}.h5", getWorkerCount());
+    std::string filename = std::format("./u.raw.mpi{}.h5", getWorkerCount());
 
     {
         Utils::H5Stream stream(filename);
@@ -85,7 +85,7 @@ TEST_F(H5RWMPITest, ReadAfterWrite) {
 }
 
 TEST_F(H5RWMPITest, ReadAtTime) {
-    std::string filename = fmt::format("./u.rat.mpi{}.h5", getWorkerCount());
+    std::string filename = std::format("./u.rat.mpi{}.h5", getWorkerCount());
 
     {
         Utils::H5Stream stream(filename);
@@ -111,7 +111,7 @@ TEST_F(H5RWMPITest, ReadAfterWriteInEqualDim) {
     auto map = DS::MDRangeMapper<2> {u.accessibleRange};
     rangeFor(u.getLocalWritableRange(), [&](auto&& i) { u[i] = map(i); });
     u.updatePadding();
-    std::string filename = fmt::format("./u.ieq.mpi{}.h5", getWorkerCount());
+    std::string filename = std::format("./u.ieq.mpi{}.h5", getWorkerCount());
 
     Utils::H5Stream stream(filename);
     stream << u;
diff --git a/test/Utils/HDF5StreamTest.cpp b/test/Utils/HDF5StreamTest.cpp
index ac3a2313..ba9f508d 100644
--- a/test/Utils/HDF5StreamTest.cpp
+++ b/test/Utils/HDF5StreamTest.cpp
@@ -54,8 +54,8 @@ TEST_F(H5RWTest, SeparateFile) {
     Utils::H5Stream stream("./u.sf.h5");
     stream.dumpToSeparateFile();
     stream << Utils::TimeStamp(1e-4) << u << Utils::TimeStamp(1000.) << u;
-    ASSERT_TRUE(std::filesystem::exists(fmt::format("./u.sf_{:.6f}.h5", 1e-4))
-                && std::filesystem::exists(fmt::format("./u.sf_{:.6f}.h5", 1000.)));
+    ASSERT_TRUE(std::filesystem::exists(std::format("./u.sf_{:.6f}.h5", 1e-4))
+                && std::filesystem::exists(std::format("./u.sf_{:.6f}.h5", 1000.)));
 }
 
 TEST_F(H5RWTest, ReadAfterWrite) {
diff --git a/test/Utils/IOGroupTest.cpp b/test/Utils/IOGroupTest.cpp
index f94a37b1..ba4981ce 100644
--- a/test/Utils/IOGroupTest.cpp
+++ b/test/Utils/IOGroupTest.cpp
@@ -57,7 +57,7 @@ TEST(IOGroupTest, SeparateFile) {
     u = 1;
     group.dump(Utils::TimeStamp(1.));
     u = 0;
-    Utils::H5Stream readstream(fmt::format("./u_{:.6f}.h5", 0.), StreamIn);
+    Utils::H5Stream readstream(std::format("./u_{:.6f}.h5", 0.), StreamIn);
     readstream >> u;
 
     ASSERT_EQ((u[DS::MDIndex<2> {0, 0}]), 2);

From b72b86ec6c0152dfb22826e83a1fc48c9385f498 Mon Sep 17 00:00:00 2001
From: Luohao Wang <luohaothu@live.com>
Date: Sun, 8 Jun 2025 23:35:59 +0800
Subject: [PATCH 26/31] [Core] Make first test with module work

---
 src/Core/Environment.hpp           | 6 +++---
 src/Core/Equation/AMGCLBackend.hpp | 2 +-
 src/Core/Solvers/IJ/IJSolver.hpp   | 2 +-
 test/Core/Equation/AMGCLTest.cpp   | 2 +-
 test/test_main.cpp                 | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Core/Environment.hpp b/src/Core/Environment.hpp
index 252fc9d2..53747624 100644
--- a/src/Core/Environment.hpp
+++ b/src/Core/Environment.hpp
@@ -17,7 +17,7 @@
 #ifdef OPFLOW_WITH_MPI
 #include <mpi.h>
 #endif
-#include <iostream>
+#include <print>
 #include <omp.h>
 #endif
 #include "Version.hpp"// generated by CMake
@@ -25,7 +25,7 @@
 #include "Core/Parallel/ParallelInfo.hpp"
 #include "Core/Parallel/ParallelPlan.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     void inline InitEnvironment(int* argc, char*** argv) {
 #ifdef OPFLOW_WITH_MPI
         MPI_Init(argc, argv);
@@ -92,7 +92,7 @@ namespace OpFlow {
     }
 
     inline void printVersion() {
-        std::cout << "OpFlow version: " << internal::OPFLOW_VERSION_STRING << std::endl;
+        std::print("OpFlow version: {}\n", internal::OPFLOW_VERSION_STRING);
     }
 
     inline auto getVersionStr() { return std::string {internal::OPFLOW_VERSION_STRING}; }
diff --git a/src/Core/Equation/AMGCLBackend.hpp b/src/Core/Equation/AMGCLBackend.hpp
index 1e6c995c..d2f4214b 100644
--- a/src/Core/Equation/AMGCLBackend.hpp
+++ b/src/Core/Equation/AMGCLBackend.hpp
@@ -27,7 +27,7 @@
 #endif
 #include "EqnSolveHandler.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <typename Solver, typename D>
     struct AMGCLBackend {
         constexpr static bool _enable_mpi = !requires { typename Solver::col_type; };
diff --git a/src/Core/Solvers/IJ/IJSolver.hpp b/src/Core/Solvers/IJ/IJSolver.hpp
index 39004ddc..f0eea80c 100644
--- a/src/Core/Solvers/IJ/IJSolver.hpp
+++ b/src/Core/Solvers/IJ/IJSolver.hpp
@@ -70,7 +70,7 @@
 #endif
 #endif
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <typename Solver>
     struct IJSolverParams {
         typename Solver::params p;
diff --git a/test/Core/Equation/AMGCLTest.cpp b/test/Core/Equation/AMGCLTest.cpp
index 48ffdb4c..38b86a20 100644
--- a/test/Core/Equation/AMGCLTest.cpp
+++ b/test/Core/Equation/AMGCLTest.cpp
@@ -12,8 +12,8 @@
 //
 //
 
-#include <OpFlow>
 #include <gmock/gmock.h>
+import opflow;
 
 using namespace OpFlow;
 using namespace testing;
diff --git a/test/test_main.cpp b/test/test_main.cpp
index 72a7bb50..51b012d0 100644
--- a/test/test_main.cpp
+++ b/test/test_main.cpp
@@ -10,8 +10,8 @@
 //
 //  ----------------------------------------------------------------------------
 
-#include <OpFlow>
 #include <gmock/gmock.h>
+import opflow;
 
 int main(int argc, char** argv) {
     // Filter out Google Test arguments

From 8c3edfe23ab1d6fa35c79714b5c2793d2b9cfa1e Mon Sep 17 00:00:00 2001
From: Luohao Wang <luohaothu@live.com>
Date: Mon, 9 Jun 2025 00:44:30 +0800
Subject: [PATCH 27/31] [Ext] Fix debug build

---
 external/tbb/include/oneapi/tbb/detail/_flow_graph_trace_impl.h | 2 +-
 external/tbb/include/oneapi/tbb/detail/_utils.h                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/external/tbb/include/oneapi/tbb/detail/_flow_graph_trace_impl.h b/external/tbb/include/oneapi/tbb/detail/_flow_graph_trace_impl.h
index 67500c76..23ee13ae 100644
--- a/external/tbb/include/oneapi/tbb/detail/_flow_graph_trace_impl.h
+++ b/external/tbb/include/oneapi/tbb/detail/_flow_graph_trace_impl.h
@@ -228,7 +228,7 @@ inline void fgt_node( void* codeptr, string_resource_index t, void *g, void *out
     fgt_internal_create_output_port( codeptr, output_port, output_port, FLOW_OUTPUT_PORT_0 );
 }
 
-static void fgt_node_with_body( void* codeptr, string_resource_index t, void *g, void *output_port, void *body ) {
+inline void fgt_node_with_body( void* codeptr, string_resource_index t, void *g, void *output_port, void *body ) {
     itt_make_task_group( d1::ITT_DOMAIN_FLOW, output_port, FLOW_NODE, g, FLOW_GRAPH, t );
     fgt_internal_create_output_port(codeptr, output_port, output_port, FLOW_OUTPUT_PORT_0 );
     fgt_body( output_port, body );
diff --git a/external/tbb/include/oneapi/tbb/detail/_utils.h b/external/tbb/include/oneapi/tbb/detail/_utils.h
index 959e491c..d77d9567 100644
--- a/external/tbb/include/oneapi/tbb/detail/_utils.h
+++ b/external/tbb/include/oneapi/tbb/detail/_utils.h
@@ -188,7 +188,7 @@ constexpr bool is_aligned(T* pointer, std::uintptr_t alignment) {
 }
 
 #if TBB_USE_ASSERT
-static void* const poisoned_ptr = reinterpret_cast<void*>(-1);
+inline void* const poisoned_ptr = reinterpret_cast<void*>(-1);
 
 //! Set p to invalid pointer value.
 template<typename T>

From 77d2af529172ff0b02f9d02cf19d2f8017c2ef20 Mon Sep 17 00:00:00 2001
From: Luohao Wang <luohaothu@live.com>
Date: Mon, 9 Jun 2025 00:48:07 +0800
Subject: [PATCH 28/31] [Core] All tests compile

---
 src/Core/AMR/AMRGen.hpp                               |  2 +-
 src/Core/BC/BCBase.hpp                                |  4 ++--
 src/Core/BC/DircBC.hpp                                |  2 +-
 src/Core/BC/InternalBC.hpp                            |  2 +-
 src/Core/BC/LogicalBC.hpp                             |  2 +-
 src/Core/BC/NeumBC.hpp                                |  2 +-
 src/Core/BC/ProxyBC.hpp                               |  2 +-
 src/Core/BasicDataTypes.hpp                           |  2 +-
 src/Core/Constants.hpp                                |  2 +-
 src/Core/Equation/AMGCLEqnSolveHandler.hpp            |  2 +-
 src/Core/Equation/CSRMatrixGenerator.hpp              |  2 +-
 src/Core/Equation/EqnSolveHandler.hpp                 |  2 +-
 src/Core/Equation/Equation.hpp                        |  2 +-
 src/Core/Equation/EquationHolder.hpp                  |  2 +-
 src/Core/Equation/HYPREEqnSolveHandler.hpp            |  2 +-
 src/Core/Equation/StencilHolder.hpp                   |  2 +-
 src/Core/Equation/UnifiedSolve.hpp                    |  2 +-
 src/Core/Expr/Expr.hpp                                |  2 +-
 src/Core/Expr/ExprTrait.hpp                           |  2 +-
 src/Core/Expr/Expression.hpp                          |  2 +-
 src/Core/Expr/ScalarExpr.hpp                          |  2 +-
 src/Core/Expr/ScalarExprTrait.hpp                     |  2 +-
 src/Core/Field/Analytical/AnalyticalFieldExpr.hpp     |  2 +-
 src/Core/Field/FieldExpr.hpp                          |  2 +-
 src/Core/Field/FieldExprTrait.hpp                     |  2 +-
 src/Core/Field/MeshBased/MeshBasedFieldExpr.hpp       |  2 +-
 src/Core/Field/MeshBased/MeshBasedFieldExprTrait.hpp  |  2 +-
 .../Field/MeshBased/SemiStructured/CartAMRField.hpp   |  2 +-
 .../MeshBased/SemiStructured/CartAMRFieldExpr.hpp     |  2 +-
 .../SemiStructured/CartAMRFieldExprTrait.hpp          |  2 +-
 .../MeshBased/SemiStructured/CartAMRFieldTrait.hpp    |  2 +-
 .../SemiStructured/SemiStructuredFieldExpr.hpp        |  2 +-
 .../SemiStructured/SemiStructuredFieldExprTrait.hpp   |  2 +-
 src/Core/Field/MeshBased/StencilField.hpp             |  2 +-
 src/Core/Field/MeshBased/StencilFieldTrait.hpp        |  2 +-
 .../Field/MeshBased/Structured/CartesianField.hpp     |  2 +-
 .../Field/MeshBased/Structured/CartesianFieldExpr.hpp |  2 +-
 .../MeshBased/Structured/CartesianFieldExprTrait.hpp  |  2 +-
 .../MeshBased/Structured/CartesianFieldTrait.hpp      |  2 +-
 .../MeshBased/Structured/StructuredFieldExpr.hpp      |  2 +-
 .../MeshBased/Structured/StructuredFieldExprTrait.hpp |  2 +-
 .../MeshBased/UnStructured/UnStructMBFieldExpr.hpp    |  2 +-
 src/Core/Field/ParticleBased/ParticleFieldExpr.hpp    |  2 +-
 src/Core/Interfaces/MDIndexable.hpp                   |  2 +-
 src/Core/Interfaces/Serializable.hpp                  |  2 +-
 src/Core/Interfaces/Stringifiable.hpp                 |  2 +-
 src/Core/Loops/FieldAssigner.hpp                      |  2 +-
 src/Core/Loops/RangeFor.hpp                           |  2 +-
 src/Core/Loops/StructFor.hpp                          |  2 +-
 src/Core/Loops/StructReduce.hpp                       |  2 +-
 src/Core/Macros.hpp                                   |  4 ++--
 src/Core/Mesh/MeshBase.hpp                            |  2 +-
 src/Core/Mesh/MeshTrait.hpp                           |  2 +-
 src/Core/Mesh/SemiStructured/CartesianAMRMesh.hpp     |  2 +-
 src/Core/Mesh/SemiStructured/CartesianAMRMeshBase.hpp |  2 +-
 .../Mesh/SemiStructured/CartesianAMRMeshTrait.hpp     |  2 +-
 src/Core/Mesh/SemiStructured/CartesianAMRMeshView.hpp |  2 +-
 .../Mesh/SemiStructured/CartesianAMRMeshViewTrait.hpp |  2 +-
 src/Core/Mesh/SemiStructured/SemiStructuredMesh.hpp   |  2 +-
 .../Mesh/SemiStructured/SemiStructuredMeshTrait.hpp   |  2 +-
 src/Core/Mesh/Structured/CartesianMesh.hpp            |  2 +-
 src/Core/Mesh/Structured/CartesianMeshBase.hpp        |  2 +-
 src/Core/Mesh/Structured/CartesianMeshTrait.hpp       |  2 +-
 src/Core/Mesh/Structured/CartesianMeshView.hpp        |  2 +-
 src/Core/Mesh/Structured/CartesianMeshViewTrait.hpp   |  2 +-
 src/Core/Mesh/Structured/StructuredMeshBase.hpp       |  2 +-
 src/Core/Mesh/Structured/StructuredMeshTrait.hpp      |  2 +-
 src/Core/Meta.hpp                                     |  2 +-
 src/Core/Operator/Arithmetic/AMDS.hpp                 |  2 +-
 src/Core/Operator/Arithmetic/MinMax.hpp               |  2 +-
 src/Core/Operator/Conditional.hpp                     |  2 +-
 src/Core/Operator/Convolution/Convolution.hpp         |  2 +-
 .../FDMOperators/D1FirstOrderBiasedDownwind.hpp       |  2 +-
 .../FDMOperators/D1FirstOrderBiasedUpwind.hpp         |  2 +-
 .../Operator/FDMOperators/D1FirstOrderCentered.hpp    |  2 +-
 src/Core/Operator/FDMOperators/D1WENO53Downwind.hpp   |  2 +-
 src/Core/Operator/FDMOperators/D1WENO53Upwind.hpp     |  2 +-
 .../Operator/FDMOperators/D2SecondOrderCentered.hpp   |  2 +-
 src/Core/Operator/FDMOperators/DiffsInterface.hpp     |  2 +-
 src/Core/Operator/IdentityOp.hpp                      |  2 +-
 src/Core/Operator/Interpolator/D1FluxLimiter.hpp      |  2 +-
 .../Interpolator/D1FluxLimiterBasedIntpOp.hpp         |  2 +-
 src/Core/Operator/Interpolator/D1Linear.hpp           |  2 +-
 src/Core/Operator/Interpolator/FluxLimiterKernels.hpp |  2 +-
 src/Core/Operator/Interpolator/IntpInterface.hpp      |  2 +-
 src/Core/Operator/Logical/Boolean.hpp                 |  2 +-
 src/Core/Operator/Logical/Classify.hpp                |  2 +-
 src/Core/Operator/Logical/Compare.hpp                 |  2 +-
 src/Core/Operator/Operator.hpp                        |  2 +-
 src/Core/Operator/PerElemOpAdaptor.hpp                |  2 +-
 src/Core/Parallel/AbstractSplitStrategy.hpp           |  2 +-
 src/Core/Parallel/EvenSplitStrategy.hpp               |  2 +-
 src/Core/Parallel/ManualSplitStrategy.hpp             |  2 +-
 src/Core/Parallel/ParallelInfo.hpp                    |  4 ++--
 src/Core/Parallel/ParallelPlan.hpp                    |  4 ++--
 src/Core/Parallel/ParallelType.hpp                    |  2 +-
 src/Core/Parallel/ParticleGuidedSplitStrategy.hpp     |  2 +-
 src/Core/Solvers/SemiStruct/SemiStructSolver.hpp      |  2 +-
 src/Core/Solvers/SemiStruct/SemiStructSolverFAC.hpp   |  2 +-
 src/Core/Solvers/SemiStruct/SemiStructSolverNone.hpp  |  2 +-
 src/Core/Solvers/Struct/StructSolver.hpp              |  2 +-
 src/Core/Solvers/Struct/StructSolverBiCGSTAB.hpp      |  2 +-
 src/Core/Solvers/Struct/StructSolverCycRed.hpp        |  2 +-
 src/Core/Solvers/Struct/StructSolverFGMRES.hpp        |  2 +-
 src/Core/Solvers/Struct/StructSolverGMRES.hpp         |  2 +-
 src/Core/Solvers/Struct/StructSolverJacobi.hpp        |  2 +-
 src/Core/Solvers/Struct/StructSolverLGMRES.hpp        |  2 +-
 src/Core/Solvers/Struct/StructSolverNone.hpp          |  2 +-
 src/Core/Solvers/Struct/StructSolverPCG.hpp           |  2 +-
 src/Core/Solvers/Struct/StructSolverPFMG.hpp          |  2 +-
 src/Core/Solvers/Struct/StructSolverPrecond.hpp       |  2 +-
 src/Core/Solvers/Struct/StructSolverSMG.hpp           |  2 +-
 src/DataStructures/Arrays/Arrays.hpp                  |  2 +-
 src/DataStructures/Arrays/CoordVector.hpp             |  2 +-
 src/DataStructures/Arrays/OffsetVector.hpp            |  2 +-
 src/DataStructures/Arrays/Tensor/FixedSizeTensor.hpp  |  2 +-
 src/DataStructures/Arrays/Tensor/PlainTensor.hpp      |  2 +-
 src/DataStructures/Arrays/Tensor/TensorBase.hpp       |  2 +-
 src/DataStructures/Arrays/Tensor/TensorTrait.hpp      |  2 +-
 src/DataStructures/Geometry/2DGeometry.hpp            |  2 +-
 src/DataStructures/Geometry/3DGeometry.hpp            |  2 +-
 src/DataStructures/Geometry/BasicElements.hpp         |  2 +-
 src/DataStructures/Geometry/KdTree.hpp                |  2 +-
 src/DataStructures/Index/ColoredIndex.hpp             |  2 +-
 src/DataStructures/Index/LevelMDIndex.hpp             |  2 +-
 src/DataStructures/Index/LevelRangedIndex.hpp         |  2 +-
 .../Index/LinearMapper/BlockedMDRangeMapper.hpp       |  2 +-
 .../LinearMapper/ColoredBlockedMDRangeMapper.hpp      |  2 +-
 .../Index/LinearMapper/ColoredMDRangeMapper.hpp       |  2 +-
 .../LinearMapper/GeneralBlockedMDRangeMapper.hpp      |  2 +-
 .../Index/LinearMapper/LevelMDRangeMapper.hpp         |  2 +-
 .../Index/LinearMapper/MDRangeMapper.hpp              |  2 +-
 src/DataStructures/Index/MDIndex.hpp                  |  2 +-
 src/DataStructures/Index/RangedIndex.hpp              |  2 +-
 src/DataStructures/Matrix/COOMatrix.hpp               |  2 +-
 src/DataStructures/Matrix/CSRMatrix.hpp               |  2 +-
 src/DataStructures/Pair.hpp                           |  2 +-
 src/DataStructures/Range/LevelRanges.hpp              |  2 +-
 src/DataStructures/Range/Ranges.hpp                   |  2 +-
 src/DataStructures/StencilPad.hpp                     |  2 +-
 src/Math/Function/Integral.hpp                        |  2 +-
 src/Math/Function/Numeric.hpp                         |  2 +-
 src/Math/Interpolator/Interpolator.hpp                |  2 +-
 src/Utils/Allocator/AlignedAllocator.hpp              |  2 +-
 src/Utils/Allocator/AllocatorTrait.hpp                |  2 +-
 src/Utils/Allocator/StaticAllocator.hpp               |  2 +-
 src/Utils/Allocator/VirtualMemAllocator.hpp           |  2 +-
 src/Utils/ConstexprString.hpp                         |  2 +-
 src/Utils/NamedFunctor.hpp                            |  2 +-
 src/Utils/RandomStringGenerator.hpp                   |  2 +-
 src/Utils/Serializer/EnumTypes.hpp                    |  2 +-
 src/Utils/Serializer/STDContainers.hpp                |  2 +-
 src/Utils/StackTracer.hpp                             |  2 +-
 src/Utils/Writers/FieldStream.hpp                     |  2 +-
 src/Utils/Writers/FieldWriter.hpp                     |  2 +-
 src/Utils/Writers/HDF5Stream.hpp                      |  2 +-
 src/Utils/Writers/IOGroup.hpp                         |  2 +-
 src/Utils/Writers/RawBinaryStream.hpp                 |  4 ++--
 src/Utils/Writers/StreamTrait.hpp                     |  2 +-
 src/Utils/Writers/Streams.hpp                         |  2 +-
 src/Utils/Writers/TecplotASCIIStream.hpp              |  2 +-
 src/Utils/Writers/TecplotBinaryStream.hpp             |  2 +-
 src/Utils/Writers/TecplotSZPLTStream.hpp              |  2 +-
 src/Utils/Writers/VTKAMRStream.hpp                    |  2 +-
 test/CMakeLists.txt                                   |  4 ++++
 test/Core/BC/DircBCTest.cpp                           |  2 +-
 test/Core/BC/NeumBCTest.cpp                           |  2 +-
 test/Core/BC/PeriodicBCTest.cpp                       |  2 +-
 test/Core/Equation/AMGCLMPITest.cpp                   | 11 ++++++-----
 test/Core/Equation/CSRMatrixGeneratorMPITest.cpp      |  2 +-
 test/Core/Equation/CSRMatrixGeneratorTest.cpp         |  5 +++--
 test/Core/Equation/DircEqnTest.cpp                    |  7 ++++---
 test/Core/Equation/EqnHolderTest.cpp                  |  7 ++++---
 test/Core/Equation/EqnSetMPITest.cpp                  |  9 +++++----
 test/Core/Equation/EqnSetTest.cpp                     | 10 +++++-----
 test/Core/Equation/NeumEqnTest.cpp                    |  7 ++++---
 test/Core/Equation/PeriodicEqnTest.cpp                |  7 ++++---
 test/Core/Field/CartesianFieldMPITest.cpp             |  7 ++++---
 test/Core/Field/CartesianFieldTest.cpp                |  5 +++--
 test/Core/Loops/RangeForTest.cpp                      |  2 +-
 test/Core/Loops/RangeReduceTest.cpp                   |  2 +-
 test/Core/Mesh/CartesianMeshTest.cpp                  |  8 ++------
 test/Core/MetaTest.cpp                                | 10 +++++-----
 test/Core/Operator/ConditionalTest.cpp                |  2 +-
 test/Core/Operator/ConvolutionTest.cpp                |  2 +-
 test/Core/Operator/InterpolatorTest.cpp               |  5 +++--
 test/Core/Parallel/EvenSplitStrategyTest.cpp          |  2 +-
 test/Core/Parallel/MPITest.cpp                        |  5 +++--
 .../Core/Parallel/ParticleGuidedSplitStrategyTest.cpp |  9 +++++----
 test/DataStructures/Arrays/PlainTensorTest.cpp        |  3 +--
 .../DataStructures/Index/BlockedMDRangeMapperTest.cpp |  2 +-
 .../Index/ColoredBlockedMDRangeMapperTest.cpp         |  2 +-
 test/DataStructures/Index/MDIndexTest.cpp             |  2 +-
 test/DataStructures/StencilPadTest.cpp                |  2 +-
 test/Utils/HDF5StreamMPITest.cpp                      |  7 ++++---
 test/Utils/HDF5StreamTest.cpp                         |  2 +-
 test/Utils/IOGroupTest.cpp                            |  2 +-
 test/Utils/TecplotStreamMPITest.cpp                   |  2 +-
 test/Utils/TecplotStreamTest.cpp                      |  2 +-
 test/test_main_mpi.cpp                                |  2 +-
 200 files changed, 256 insertions(+), 244 deletions(-)

diff --git a/src/Core/AMR/AMRGen.hpp b/src/Core/AMR/AMRGen.hpp
index 45835d58..1918ff74 100644
--- a/src/Core/AMR/AMRGen.hpp
+++ b/src/Core/AMR/AMRGen.hpp
@@ -27,7 +27,7 @@
 #include <vtkXMLPolyDataWriter.h>
 #endif
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     inline auto int_pow(int a, int n) {
         auto ret = 1;
         for (auto i = 0; i < n; ++i) ret *= a;
diff --git a/src/Core/BC/BCBase.hpp b/src/Core/BC/BCBase.hpp
index 8663b411..7b0fca8e 100644
--- a/src/Core/BC/BCBase.hpp
+++ b/src/Core/BC/BCBase.hpp
@@ -20,10 +20,10 @@
 #include <memory>
 #endif
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     enum class BCType { Undefined, Dirc, Neum, Periodic, Internal, Symm, ASymm };
 
-    inline static auto isLogicalBC(BCType type) {
+    inline auto isLogicalBC(BCType type) {
         return type == BCType::Periodic || type == BCType::Internal || type == BCType::Symm
                || type == BCType::ASymm;
     }
diff --git a/src/Core/BC/DircBC.hpp b/src/Core/BC/DircBC.hpp
index e18c9ee3..55f6ad1a 100644
--- a/src/Core/BC/DircBC.hpp
+++ b/src/Core/BC/DircBC.hpp
@@ -19,7 +19,7 @@
 #include "Core/Field/MeshBased/Structured/StructuredFieldExprTrait.hpp"
 #include "Core/Loops/RangeFor.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <FieldExprType F>
     struct DircBCBase : virtual public BCBase<F> {
     protected:
diff --git a/src/Core/BC/InternalBC.hpp b/src/Core/BC/InternalBC.hpp
index 50ef90a1..165342ab 100644
--- a/src/Core/BC/InternalBC.hpp
+++ b/src/Core/BC/InternalBC.hpp
@@ -19,7 +19,7 @@
 #include <mpi.h>
 #endif
 
-namespace OpFlow::Core::BC {
+OPFLOW_MODULE_EXPORT namespace OpFlow::Core::BC {
     template <typename F>
     struct InternalBC : virtual public BCBase<F> {
     protected:
diff --git a/src/Core/BC/LogicalBC.hpp b/src/Core/BC/LogicalBC.hpp
index 12e0b7d6..a0c7edba 100644
--- a/src/Core/BC/LogicalBC.hpp
+++ b/src/Core/BC/LogicalBC.hpp
@@ -17,7 +17,7 @@
 #include "Core/Field/MeshBased/Structured/StructuredFieldExprTrait.hpp"
 #include "DataStructures/Range/Ranges.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <FieldExprType F>
     struct LogicalBCBase : virtual public BCBase<F> {
     public:
diff --git a/src/Core/BC/NeumBC.hpp b/src/Core/BC/NeumBC.hpp
index c6d510ac..76e93d36 100644
--- a/src/Core/BC/NeumBC.hpp
+++ b/src/Core/BC/NeumBC.hpp
@@ -18,7 +18,7 @@
 #include "Core/Field/MeshBased/MeshBasedFieldExprTrait.hpp"
 #include "Core/Field/MeshBased/Structured/StructuredFieldExprTrait.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <FieldExprType F>
     struct NeumBCBase : virtual public BCBase<F> {
     protected:
diff --git a/src/Core/BC/ProxyBC.hpp b/src/Core/BC/ProxyBC.hpp
index 4c6f0789..54d98e67 100644
--- a/src/Core/BC/ProxyBC.hpp
+++ b/src/Core/BC/ProxyBC.hpp
@@ -17,7 +17,7 @@
 #include "Core/BC/DircBC.hpp"
 #include "Core/BC/NeumBC.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
 
     template <FieldExprType From, FieldExprType To>
     requires std::constructible_from<typename internal::FieldExprTrait<To>::elem_type,
diff --git a/src/Core/BasicDataTypes.hpp b/src/Core/BasicDataTypes.hpp
index 15158bbe..06491e7d 100644
--- a/src/Core/BasicDataTypes.hpp
+++ b/src/Core/BasicDataTypes.hpp
@@ -18,7 +18,7 @@
 #include <exception>
 #endif
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
 
     using Index = int;
     using Rank = long long;
diff --git a/src/Core/Constants.hpp b/src/Core/Constants.hpp
index e3787926..bc76f059 100644
--- a/src/Core/Constants.hpp
+++ b/src/Core/Constants.hpp
@@ -13,7 +13,7 @@
 #ifndef OPFLOW_CONSTANTS_HPP
 #define OPFLOW_CONSTANTS_HPP
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     using ConstantI = unsigned int;
 
     // Access Flags
diff --git a/src/Core/Equation/AMGCLEqnSolveHandler.hpp b/src/Core/Equation/AMGCLEqnSolveHandler.hpp
index 833da6e5..8c962a16 100644
--- a/src/Core/Equation/AMGCLEqnSolveHandler.hpp
+++ b/src/Core/Equation/AMGCLEqnSolveHandler.hpp
@@ -44,7 +44,7 @@
 
 #include "Core/Solvers/IJ/IJSolver.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
 
     template <typename F, typename T, typename M, typename S>
     struct AMGCLEqnSolveHandler;
diff --git a/src/Core/Equation/CSRMatrixGenerator.hpp b/src/Core/Equation/CSRMatrixGenerator.hpp
index 58c2caeb..e7bb5592 100644
--- a/src/Core/Equation/CSRMatrixGenerator.hpp
+++ b/src/Core/Equation/CSRMatrixGenerator.hpp
@@ -21,7 +21,7 @@
 #include <vector>
 #endif
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     struct CSRMatrixGenerator {
         template <typename S, typename M>
         static auto generate(S& s, M&& mapper, const std::vector<bool>& pin_flags) {
diff --git a/src/Core/Equation/EqnSolveHandler.hpp b/src/Core/Equation/EqnSolveHandler.hpp
index bcfc8dc2..fc5d4314 100644
--- a/src/Core/Equation/EqnSolveHandler.hpp
+++ b/src/Core/Equation/EqnSolveHandler.hpp
@@ -13,7 +13,7 @@
 #ifndef OPFLOW_EQNSOLVEHANDLER_HPP
 #define OPFLOW_EQNSOLVEHANDLER_HPP
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     struct EqnSolveState {
         int niter = 0;
         double relerr = 0, abserr = 0;
diff --git a/src/Core/Equation/Equation.hpp b/src/Core/Equation/Equation.hpp
index 239f585f..8fb18de3 100644
--- a/src/Core/Equation/Equation.hpp
+++ b/src/Core/Equation/Equation.hpp
@@ -23,7 +23,7 @@
 #include <tuple>
 #endif
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <ExprType Lhs, ExprType Rhs>
     struct Equation {
         using LhsType = Lhs;
diff --git a/src/Core/Equation/EquationHolder.hpp b/src/Core/Equation/EquationHolder.hpp
index 54a8da3c..ae42382d 100644
--- a/src/Core/Equation/EquationHolder.hpp
+++ b/src/Core/Equation/EquationHolder.hpp
@@ -24,7 +24,7 @@
 #include <vector>
 #endif
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <typename E, typename T>
     struct EqnHolder;
 
diff --git a/src/Core/Equation/HYPREEqnSolveHandler.hpp b/src/Core/Equation/HYPREEqnSolveHandler.hpp
index 01f5aaf1..fb0b7be1 100644
--- a/src/Core/Equation/HYPREEqnSolveHandler.hpp
+++ b/src/Core/Equation/HYPREEqnSolveHandler.hpp
@@ -37,7 +37,7 @@
 #include <HYPRE_sstruct_mv.h>
 #endif
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <typename F, typename T, typename S>
     struct HYPREEqnSolveHandler;
 
diff --git a/src/Core/Equation/StencilHolder.hpp b/src/Core/Equation/StencilHolder.hpp
index 40d0633c..6e012659 100644
--- a/src/Core/Equation/StencilHolder.hpp
+++ b/src/Core/Equation/StencilHolder.hpp
@@ -17,7 +17,7 @@
 #include "Core/Macros.hpp"
 #include "DataStructures/StencilPad.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <typename... E>
     struct StencilHolder;
 
diff --git a/src/Core/Equation/UnifiedSolve.hpp b/src/Core/Equation/UnifiedSolve.hpp
index e00f0f0b..0260a180 100644
--- a/src/Core/Equation/UnifiedSolve.hpp
+++ b/src/Core/Equation/UnifiedSolve.hpp
@@ -32,7 +32,7 @@
 #include "Core/Solvers/Struct/StructSolverPrecond.hpp"
 #include "Core/Solvers/Struct/StructSolverSMG.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <StructSolverType type = StructSolverType::GMRES,
               StructSolverType pType = StructSolverType::None, typename F, StructuredFieldExprType T>
     auto Solve(const F& func, T&& target, StructSolverParams<type> params = StructSolverParams<type> {},
diff --git a/src/Core/Expr/Expr.hpp b/src/Core/Expr/Expr.hpp
index fcbff706..ef979ee2 100644
--- a/src/Core/Expr/Expr.hpp
+++ b/src/Core/Expr/Expr.hpp
@@ -21,7 +21,7 @@
 #include <string>
 #endif
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
 
     template <typename Derived, bool rw, bool dir>
     struct Expr;
diff --git a/src/Core/Expr/ExprTrait.hpp b/src/Core/Expr/ExprTrait.hpp
index b69c38a9..32ed887d 100644
--- a/src/Core/Expr/ExprTrait.hpp
+++ b/src/Core/Expr/ExprTrait.hpp
@@ -19,7 +19,7 @@
 #include <type_traits>
 #endif
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     namespace internal {
         /// Trait class for an expr type
         /// \tparam T The expr type
diff --git a/src/Core/Expr/Expression.hpp b/src/Core/Expr/Expression.hpp
index 037d56d6..a2c03c84 100644
--- a/src/Core/Expr/Expression.hpp
+++ b/src/Core/Expr/Expression.hpp
@@ -20,7 +20,7 @@
 #include "Core/Expr/ExprTrait.hpp"
 #include "Core/Operator/Operator.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <typename Op, ExprType... Args>
     struct Expression;
 
diff --git a/src/Core/Expr/ScalarExpr.hpp b/src/Core/Expr/ScalarExpr.hpp
index 0103d0a9..61299f03 100644
--- a/src/Core/Expr/ScalarExpr.hpp
+++ b/src/Core/Expr/ScalarExpr.hpp
@@ -20,7 +20,7 @@
 #include <type_traits>
 #endif
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <typename T>
     struct ScalarExpr : Expr<ScalarExpr<T>> {
         T val;
diff --git a/src/Core/Expr/ScalarExprTrait.hpp b/src/Core/Expr/ScalarExprTrait.hpp
index df9b0aef..4c2c3f08 100644
--- a/src/Core/Expr/ScalarExprTrait.hpp
+++ b/src/Core/Expr/ScalarExprTrait.hpp
@@ -15,7 +15,7 @@
 
 #include "Core/Expr/ExprTrait.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <typename T>
     struct ScalarExpr;
 
diff --git a/src/Core/Field/Analytical/AnalyticalFieldExpr.hpp b/src/Core/Field/Analytical/AnalyticalFieldExpr.hpp
index a1dd2fc2..974089cf 100644
--- a/src/Core/Field/Analytical/AnalyticalFieldExpr.hpp
+++ b/src/Core/Field/Analytical/AnalyticalFieldExpr.hpp
@@ -15,7 +15,7 @@
 
 #include "Core/Field/FieldExpr.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <typename Derived>
     struct AnalyticalFieldExpr : FieldExpr<Derived> {};
 }// namespace OpFlow
diff --git a/src/Core/Field/FieldExpr.hpp b/src/Core/Field/FieldExpr.hpp
index da139f1d..f1e2d79c 100644
--- a/src/Core/Field/FieldExpr.hpp
+++ b/src/Core/Field/FieldExpr.hpp
@@ -19,7 +19,7 @@
 #include "Core/Field/FieldExprTrait.hpp"
 #include "Core/Meta.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
 
     template <typename Derived>
     struct FieldExpr;
diff --git a/src/Core/Field/FieldExprTrait.hpp b/src/Core/Field/FieldExprTrait.hpp
index 16e5373e..e45cb250 100644
--- a/src/Core/Field/FieldExprTrait.hpp
+++ b/src/Core/Field/FieldExprTrait.hpp
@@ -17,7 +17,7 @@
 #include "Core/Macros.hpp"
 #include "Core/Meta.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <typename Derived>
     struct FieldExpr;
 
diff --git a/src/Core/Field/MeshBased/MeshBasedFieldExpr.hpp b/src/Core/Field/MeshBased/MeshBasedFieldExpr.hpp
index 6c6b40bc..f4b8d862 100644
--- a/src/Core/Field/MeshBased/MeshBasedFieldExpr.hpp
+++ b/src/Core/Field/MeshBased/MeshBasedFieldExpr.hpp
@@ -19,7 +19,7 @@
 #include "Core/Macros.hpp"
 #include "MeshBasedFieldExprTrait.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <typename Derived>
     struct MeshBasedFieldExpr : FieldExpr<Derived> {
         using MeshType = typename internal::MeshBasedFieldExprTrait<Derived>::mesh_type;
diff --git a/src/Core/Field/MeshBased/MeshBasedFieldExprTrait.hpp b/src/Core/Field/MeshBased/MeshBasedFieldExprTrait.hpp
index 8fd1c114..d6623428 100644
--- a/src/Core/Field/MeshBased/MeshBasedFieldExprTrait.hpp
+++ b/src/Core/Field/MeshBased/MeshBasedFieldExprTrait.hpp
@@ -17,7 +17,7 @@
 #include "Core/Macros.hpp"
 #include "Core/Meta.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <typename Derived>
     struct MeshBasedFieldExpr;
 
diff --git a/src/Core/Field/MeshBased/SemiStructured/CartAMRField.hpp b/src/Core/Field/MeshBased/SemiStructured/CartAMRField.hpp
index 00251e6a..82843581 100644
--- a/src/Core/Field/MeshBased/SemiStructured/CartAMRField.hpp
+++ b/src/Core/Field/MeshBased/SemiStructured/CartAMRField.hpp
@@ -25,7 +25,7 @@
 #include "Core/Meta.hpp"
 #include "DataStructures/Arrays/Tensor/PlainTensor.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
 
     /// The Cartesian AMR field type
     /// \warning This is a special impl version. It relies on the sparse storage trait of the data container
diff --git a/src/Core/Field/MeshBased/SemiStructured/CartAMRFieldExpr.hpp b/src/Core/Field/MeshBased/SemiStructured/CartAMRFieldExpr.hpp
index af3a87c4..c789d6bc 100644
--- a/src/Core/Field/MeshBased/SemiStructured/CartAMRFieldExpr.hpp
+++ b/src/Core/Field/MeshBased/SemiStructured/CartAMRFieldExpr.hpp
@@ -20,7 +20,7 @@
 #include <vector>
 #endif
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
 
     template <typename Derived>
     struct CartAMRFieldExpr : SemiStructuredFieldExpr<Derived> {
diff --git a/src/Core/Field/MeshBased/SemiStructured/CartAMRFieldExprTrait.hpp b/src/Core/Field/MeshBased/SemiStructured/CartAMRFieldExprTrait.hpp
index 4d940d04..593f6396 100644
--- a/src/Core/Field/MeshBased/SemiStructured/CartAMRFieldExprTrait.hpp
+++ b/src/Core/Field/MeshBased/SemiStructured/CartAMRFieldExprTrait.hpp
@@ -17,7 +17,7 @@
 #include "Core/Meta.hpp"
 #include "SemiStructuredFieldExprTrait.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <typename Derived>
     struct CartAMRFieldExpr;
 
diff --git a/src/Core/Field/MeshBased/SemiStructured/CartAMRFieldTrait.hpp b/src/Core/Field/MeshBased/SemiStructured/CartAMRFieldTrait.hpp
index 81690f04..5a21b2dd 100644
--- a/src/Core/Field/MeshBased/SemiStructured/CartAMRFieldTrait.hpp
+++ b/src/Core/Field/MeshBased/SemiStructured/CartAMRFieldTrait.hpp
@@ -19,7 +19,7 @@
 #include "DataStructures/Index/LevelMDIndex.hpp"
 #include "DataStructures/Range/LevelRanges.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <typename D, typename M, typename C>
     struct CartAMRField;
 
diff --git a/src/Core/Field/MeshBased/SemiStructured/SemiStructuredFieldExpr.hpp b/src/Core/Field/MeshBased/SemiStructured/SemiStructuredFieldExpr.hpp
index 5fc6d154..a6eafb01 100644
--- a/src/Core/Field/MeshBased/SemiStructured/SemiStructuredFieldExpr.hpp
+++ b/src/Core/Field/MeshBased/SemiStructured/SemiStructuredFieldExpr.hpp
@@ -20,7 +20,7 @@
 #include <array>
 #endif
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
 
     template <typename Derived>
     struct SemiStructuredFieldExpr : MeshBasedFieldExpr<Derived> {
diff --git a/src/Core/Field/MeshBased/SemiStructured/SemiStructuredFieldExprTrait.hpp b/src/Core/Field/MeshBased/SemiStructured/SemiStructuredFieldExprTrait.hpp
index 763af1de..053d8832 100644
--- a/src/Core/Field/MeshBased/SemiStructured/SemiStructuredFieldExprTrait.hpp
+++ b/src/Core/Field/MeshBased/SemiStructured/SemiStructuredFieldExprTrait.hpp
@@ -17,7 +17,7 @@
 #include "Core/Macros.hpp"
 #include "Core/Meta.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <typename Derived>
     struct SemiStructuredFieldExpr;
 
diff --git a/src/Core/Field/MeshBased/StencilField.hpp b/src/Core/Field/MeshBased/StencilField.hpp
index de7fd735..7b81b390 100644
--- a/src/Core/Field/MeshBased/StencilField.hpp
+++ b/src/Core/Field/MeshBased/StencilField.hpp
@@ -25,7 +25,7 @@
 #include "DataStructures/StencilPad.hpp"
 #include "Math/Interpolator/Interpolator.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
 
     template <StructuredFieldExprType T, template <typename...> typename map_impl>
     struct StencilField<T, map_impl>
diff --git a/src/Core/Field/MeshBased/StencilFieldTrait.hpp b/src/Core/Field/MeshBased/StencilFieldTrait.hpp
index bd6c43e8..81d27cae 100644
--- a/src/Core/Field/MeshBased/StencilFieldTrait.hpp
+++ b/src/Core/Field/MeshBased/StencilFieldTrait.hpp
@@ -19,7 +19,7 @@
 #include "DataStructures/Index/ColoredIndex.hpp"
 #include "DataStructures/StencilPad.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <typename T, template <typename...> typename map_impl = DS::fake_map_default>
     struct StencilField;
 
diff --git a/src/Core/Field/MeshBased/Structured/CartesianField.hpp b/src/Core/Field/MeshBased/Structured/CartesianField.hpp
index 14e2ffe8..0e5ca16d 100644
--- a/src/Core/Field/MeshBased/Structured/CartesianField.hpp
+++ b/src/Core/Field/MeshBased/Structured/CartesianField.hpp
@@ -33,7 +33,7 @@
 #include <memory>
 #endif
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <typename D, typename M, typename C = DS::PlainTensor<D, internal::MeshTrait<M>::dim>>
     struct CartesianField : CartesianFieldExpr<CartesianField<D, M, C>> {
         using index_type = typename internal::CartesianFieldExprTrait<CartesianField>::index_type;
diff --git a/src/Core/Field/MeshBased/Structured/CartesianFieldExpr.hpp b/src/Core/Field/MeshBased/Structured/CartesianFieldExpr.hpp
index f8360a2d..c7a8b21d 100644
--- a/src/Core/Field/MeshBased/Structured/CartesianFieldExpr.hpp
+++ b/src/Core/Field/MeshBased/Structured/CartesianFieldExpr.hpp
@@ -16,7 +16,7 @@
 #include "CartesianFieldExprTrait.hpp"
 #include "StructuredFieldExpr.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
 
     template <typename Derived>
     struct CartesianFieldExpr : StructuredFieldExpr<Derived> {
diff --git a/src/Core/Field/MeshBased/Structured/CartesianFieldExprTrait.hpp b/src/Core/Field/MeshBased/Structured/CartesianFieldExprTrait.hpp
index 25ba734f..b7d03c25 100644
--- a/src/Core/Field/MeshBased/Structured/CartesianFieldExprTrait.hpp
+++ b/src/Core/Field/MeshBased/Structured/CartesianFieldExprTrait.hpp
@@ -17,7 +17,7 @@
 #include "Core/Macros.hpp"
 #include "Core/Meta.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <typename Derived>
     struct CartesianFieldExpr;
 
diff --git a/src/Core/Field/MeshBased/Structured/CartesianFieldTrait.hpp b/src/Core/Field/MeshBased/Structured/CartesianFieldTrait.hpp
index 5509fc6c..dcb8b76e 100644
--- a/src/Core/Field/MeshBased/Structured/CartesianFieldTrait.hpp
+++ b/src/Core/Field/MeshBased/Structured/CartesianFieldTrait.hpp
@@ -18,7 +18,7 @@
 #include "DataStructures/Arrays/Tensor/PlainTensor.hpp"
 #include "DataStructures/Index/MDIndex.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <typename D, typename M, typename C>
     struct CartesianField;
 
diff --git a/src/Core/Field/MeshBased/Structured/StructuredFieldExpr.hpp b/src/Core/Field/MeshBased/Structured/StructuredFieldExpr.hpp
index b92fc129..c6b85392 100644
--- a/src/Core/Field/MeshBased/Structured/StructuredFieldExpr.hpp
+++ b/src/Core/Field/MeshBased/Structured/StructuredFieldExpr.hpp
@@ -23,7 +23,7 @@
 #include <vector>
 #endif
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     namespace internal {
         template <typename R>
         struct NeighborInfo {
diff --git a/src/Core/Field/MeshBased/Structured/StructuredFieldExprTrait.hpp b/src/Core/Field/MeshBased/Structured/StructuredFieldExprTrait.hpp
index 304753e8..4b1f060e 100644
--- a/src/Core/Field/MeshBased/Structured/StructuredFieldExprTrait.hpp
+++ b/src/Core/Field/MeshBased/Structured/StructuredFieldExprTrait.hpp
@@ -17,7 +17,7 @@
 #include "Core/Macros.hpp"
 #include "Core/Meta.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <typename Derived>
     struct StructuredFieldExpr;
 
diff --git a/src/Core/Field/MeshBased/UnStructured/UnStructMBFieldExpr.hpp b/src/Core/Field/MeshBased/UnStructured/UnStructMBFieldExpr.hpp
index 276335ec..d89aaea7 100644
--- a/src/Core/Field/MeshBased/UnStructured/UnStructMBFieldExpr.hpp
+++ b/src/Core/Field/MeshBased/UnStructured/UnStructMBFieldExpr.hpp
@@ -15,7 +15,7 @@
 
 #include "Core/Field/MeshBased/MeshBasedFieldExpr.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <typename Derived>
     struct UnStructMBFieldExpr : MeshBasedFieldExpr<Derived> {};
 }// namespace OpFlow
diff --git a/src/Core/Field/ParticleBased/ParticleFieldExpr.hpp b/src/Core/Field/ParticleBased/ParticleFieldExpr.hpp
index ee643157..19257f40 100644
--- a/src/Core/Field/ParticleBased/ParticleFieldExpr.hpp
+++ b/src/Core/Field/ParticleBased/ParticleFieldExpr.hpp
@@ -15,7 +15,7 @@
 
 #include "Core/Field/FieldExpr.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <typename Derived>
     struct ParticleFieldExpr : FieldExpr<Derived> {};
 }// namespace OpFlow
diff --git a/src/Core/Interfaces/MDIndexable.hpp b/src/Core/Interfaces/MDIndexable.hpp
index 3f6c0282..36913e61 100644
--- a/src/Core/Interfaces/MDIndexable.hpp
+++ b/src/Core/Interfaces/MDIndexable.hpp
@@ -22,7 +22,7 @@
 #include <vector>
 #endif
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
 
     template <typename Derived, typename rw, typename direct_acc>
     struct ArrayIndexableObj;
diff --git a/src/Core/Interfaces/Serializable.hpp b/src/Core/Interfaces/Serializable.hpp
index d997fe51..182384c5 100644
--- a/src/Core/Interfaces/Serializable.hpp
+++ b/src/Core/Interfaces/Serializable.hpp
@@ -17,7 +17,7 @@
 #include <vector>
 #endif
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
 
     struct SerializableObj {
     public:
diff --git a/src/Core/Interfaces/Stringifiable.hpp b/src/Core/Interfaces/Stringifiable.hpp
index 749564ab..2526a45a 100644
--- a/src/Core/Interfaces/Stringifiable.hpp
+++ b/src/Core/Interfaces/Stringifiable.hpp
@@ -21,7 +21,7 @@
 #include <string>
 #endif
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
 
     struct StringifiableObj {
     public:
diff --git a/src/Core/Loops/FieldAssigner.hpp b/src/Core/Loops/FieldAssigner.hpp
index 275e37a1..75dcb73e 100644
--- a/src/Core/Loops/FieldAssigner.hpp
+++ b/src/Core/Loops/FieldAssigner.hpp
@@ -21,7 +21,7 @@
 #include "RangeFor.hpp"
 #include "StructFor.hpp"
 
-namespace OpFlow::internal {
+OPFLOW_MODULE_EXPORT namespace OpFlow::internal {
     struct FieldAssigner {
         template <BasicArithOp Op = BasicArithOp::Eq>
         static auto& assign(auto&& src, auto&& dst) {
diff --git a/src/Core/Loops/RangeFor.hpp b/src/Core/Loops/RangeFor.hpp
index 97076654..2aaa8d40 100644
--- a/src/Core/Loops/RangeFor.hpp
+++ b/src/Core/Loops/RangeFor.hpp
@@ -29,7 +29,7 @@
 #include <oneapi/tbb/detail/_range_common.h>
 #endif
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     /// \brief Serial version of range for
     /// \tparam dim Range dim
     /// \tparam F Functor type
diff --git a/src/Core/Loops/StructFor.hpp b/src/Core/Loops/StructFor.hpp
index 3130dc9a..5223f7ff 100644
--- a/src/Core/Loops/StructFor.hpp
+++ b/src/Core/Loops/StructFor.hpp
@@ -19,7 +19,7 @@
 #include "Core/Meta.hpp"
 #include "RangeFor.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <FieldExprType E, typename Func>
     requires std::invocable<Func, DS::MDIndex<internal::FieldExprTrait<E>::dim>> auto structFor(E& expr,
                                                                                                 Func&& func) {
diff --git a/src/Core/Loops/StructReduce.hpp b/src/Core/Loops/StructReduce.hpp
index fe39fcd9..de9038b8 100644
--- a/src/Core/Loops/StructReduce.hpp
+++ b/src/Core/Loops/StructReduce.hpp
@@ -22,7 +22,7 @@
 #include <omp.h>
 #endif
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <FieldExprType E, typename Func, typename ReOp>
     auto structReduce(E& expr, ReOp&& op, Func&& func) {
         return structReduce(expr, expr.props.accessibleRange, std::forward<ReOp>(op),
diff --git a/src/Core/Macros.hpp b/src/Core/Macros.hpp
index b65b2c6d..0848d10b 100644
--- a/src/Core/Macros.hpp
+++ b/src/Core/Macros.hpp
@@ -62,7 +62,7 @@
 #ifndef OPFLOW_INSIDE_MODULE
 #include <mpi.h>
 #endif
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     inline static int getWorkerId(MPI_Comm comm);
 }
 #define SPD_AUGMENTED_LOG(X, ...)                                                                            \
@@ -118,7 +118,7 @@ namespace OpFlow {
 #if !defined(NDEBUG) && defined(OPFLOW_ENABLE_STACK_TRACE)
 #include "Utils/StackTracer.hpp"
 // global stack tracer
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     inline static Utils::StackTracer stackTracer;
 }
 
diff --git a/src/Core/Mesh/MeshBase.hpp b/src/Core/Mesh/MeshBase.hpp
index 40c59f2a..1641e09f 100644
--- a/src/Core/Mesh/MeshBase.hpp
+++ b/src/Core/Mesh/MeshBase.hpp
@@ -16,7 +16,7 @@
 #include "Core/Macros.hpp"
 #include "Core/Mesh/MeshTrait.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
 
     template <typename Derived>
     struct MeshBase {
diff --git a/src/Core/Mesh/MeshTrait.hpp b/src/Core/Mesh/MeshTrait.hpp
index 6a855a34..9f9cea8a 100644
--- a/src/Core/Mesh/MeshTrait.hpp
+++ b/src/Core/Mesh/MeshTrait.hpp
@@ -18,7 +18,7 @@
 #include <type_traits>
 #endif
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <typename Derived>
     struct MeshBase;
 
diff --git a/src/Core/Mesh/SemiStructured/CartesianAMRMesh.hpp b/src/Core/Mesh/SemiStructured/CartesianAMRMesh.hpp
index c43d0171..d6b0a19b 100644
--- a/src/Core/Mesh/SemiStructured/CartesianAMRMesh.hpp
+++ b/src/Core/Mesh/SemiStructured/CartesianAMRMesh.hpp
@@ -35,7 +35,7 @@
 #endif
 #endif
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <typename Dim>
     struct CartesianAMRMesh : CartesianAMRMeshBase<CartesianAMRMesh<Dim>> {
         static constexpr Size dim = Dim::value;
diff --git a/src/Core/Mesh/SemiStructured/CartesianAMRMeshBase.hpp b/src/Core/Mesh/SemiStructured/CartesianAMRMeshBase.hpp
index 898847ea..ce15b52f 100644
--- a/src/Core/Mesh/SemiStructured/CartesianAMRMeshBase.hpp
+++ b/src/Core/Mesh/SemiStructured/CartesianAMRMeshBase.hpp
@@ -16,7 +16,7 @@
 #include "Core/Mesh/SemiStructured/SemiStructuredMesh.hpp"
 #include "Core/Mesh/SemiStructured/SemiStructuredMeshTrait.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <typename Derived>
     struct CartesianAMRMeshBase : SemiStructuredMesh<Derived> {
         auto x(int d, const auto& i) const { return this->derived().x(d, i); }
diff --git a/src/Core/Mesh/SemiStructured/CartesianAMRMeshTrait.hpp b/src/Core/Mesh/SemiStructured/CartesianAMRMeshTrait.hpp
index 7c3eef50..d3367cf3 100644
--- a/src/Core/Mesh/SemiStructured/CartesianAMRMeshTrait.hpp
+++ b/src/Core/Mesh/SemiStructured/CartesianAMRMeshTrait.hpp
@@ -17,7 +17,7 @@
 #include "Core/Mesh/MeshTrait.hpp"
 #include "Core/Mesh/SemiStructured/SemiStructuredMeshTrait.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <typename Derived>
     struct CartesianAMRMeshBase;
 
diff --git a/src/Core/Mesh/SemiStructured/CartesianAMRMeshView.hpp b/src/Core/Mesh/SemiStructured/CartesianAMRMeshView.hpp
index 4e9d9484..4e4ed1cb 100644
--- a/src/Core/Mesh/SemiStructured/CartesianAMRMeshView.hpp
+++ b/src/Core/Mesh/SemiStructured/CartesianAMRMeshView.hpp
@@ -20,7 +20,7 @@
 #include <memory>
 #endif
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <typename T>
         requires CartesianAMRMeshType<T> && Meta::isTemplateInstance<CartesianAMRMesh, T>::value
     struct CartesianAMRMeshView : CartesianAMRMeshBase<CartesianAMRMeshView<T>> {
diff --git a/src/Core/Mesh/SemiStructured/CartesianAMRMeshViewTrait.hpp b/src/Core/Mesh/SemiStructured/CartesianAMRMeshViewTrait.hpp
index 9ba2b7f6..607bd5fe 100644
--- a/src/Core/Mesh/SemiStructured/CartesianAMRMeshViewTrait.hpp
+++ b/src/Core/Mesh/SemiStructured/CartesianAMRMeshViewTrait.hpp
@@ -15,7 +15,7 @@
 
 #include "Core/Mesh/SemiStructured/SemiStructuredMeshTrait.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <typename T>
     requires CartesianAMRMeshType<T>&&
             Meta::isTemplateInstance<CartesianAMRMesh, T>::value struct CartesianAMRMeshView;
diff --git a/src/Core/Mesh/SemiStructured/SemiStructuredMesh.hpp b/src/Core/Mesh/SemiStructured/SemiStructuredMesh.hpp
index 568045ae..ba582b91 100644
--- a/src/Core/Mesh/SemiStructured/SemiStructuredMesh.hpp
+++ b/src/Core/Mesh/SemiStructured/SemiStructuredMesh.hpp
@@ -15,7 +15,7 @@
 
 #include "Core/Mesh/MeshBase.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <typename Derived>
     struct SemiStructuredMesh : MeshBase<Derived> {};
 }// namespace OpFlow
diff --git a/src/Core/Mesh/SemiStructured/SemiStructuredMeshTrait.hpp b/src/Core/Mesh/SemiStructured/SemiStructuredMeshTrait.hpp
index be956090..3f77acfb 100644
--- a/src/Core/Mesh/SemiStructured/SemiStructuredMeshTrait.hpp
+++ b/src/Core/Mesh/SemiStructured/SemiStructuredMeshTrait.hpp
@@ -15,7 +15,7 @@
 
 #include "Core/Mesh/MeshTrait.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <typename Derived>
     struct SemiStructuredMesh;
 
diff --git a/src/Core/Mesh/Structured/CartesianMesh.hpp b/src/Core/Mesh/Structured/CartesianMesh.hpp
index 01be5b03..daf4c167 100644
--- a/src/Core/Mesh/Structured/CartesianMesh.hpp
+++ b/src/Core/Mesh/Structured/CartesianMesh.hpp
@@ -29,7 +29,7 @@
 #include <cstdarg>
 #endif
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     enum class MeshExtMode { Undefined, Symm, Periodic, Uniform };
 
     template <typename Dim>
diff --git a/src/Core/Mesh/Structured/CartesianMeshBase.hpp b/src/Core/Mesh/Structured/CartesianMeshBase.hpp
index 9c0f9fb6..0eb15174 100644
--- a/src/Core/Mesh/Structured/CartesianMeshBase.hpp
+++ b/src/Core/Mesh/Structured/CartesianMeshBase.hpp
@@ -21,7 +21,7 @@
 #include <array>
 #endif
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <typename Dim>
     struct CartesianMesh;// pre-declare here for later use
 
diff --git a/src/Core/Mesh/Structured/CartesianMeshTrait.hpp b/src/Core/Mesh/Structured/CartesianMeshTrait.hpp
index 06343395..3536a530 100644
--- a/src/Core/Mesh/Structured/CartesianMeshTrait.hpp
+++ b/src/Core/Mesh/Structured/CartesianMeshTrait.hpp
@@ -15,7 +15,7 @@
 
 #include "Core/Mesh/Structured/StructuredMeshTrait.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <typename Derived>
     struct CartesianMeshBase;
 
diff --git a/src/Core/Mesh/Structured/CartesianMeshView.hpp b/src/Core/Mesh/Structured/CartesianMeshView.hpp
index 889c535c..e5ebff5d 100644
--- a/src/Core/Mesh/Structured/CartesianMeshView.hpp
+++ b/src/Core/Mesh/Structured/CartesianMeshView.hpp
@@ -19,7 +19,7 @@
 #include <memory>
 #endif
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <typename T>
         requires CartesianMeshType<T> && Meta::isTemplateInstance<CartesianMesh, T>::value
     struct CartesianMeshView : CartesianMeshBase<CartesianMeshView<T>> {
diff --git a/src/Core/Mesh/Structured/CartesianMeshViewTrait.hpp b/src/Core/Mesh/Structured/CartesianMeshViewTrait.hpp
index aa16719b..7d616134 100644
--- a/src/Core/Mesh/Structured/CartesianMeshViewTrait.hpp
+++ b/src/Core/Mesh/Structured/CartesianMeshViewTrait.hpp
@@ -15,7 +15,7 @@
 
 #include "Core/Mesh/Structured/StructuredMeshTrait.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <typename T>
     requires CartesianMeshType<T>&&
             Meta::isTemplateInstance<CartesianMesh, T>::value struct CartesianMeshView;
diff --git a/src/Core/Mesh/Structured/StructuredMeshBase.hpp b/src/Core/Mesh/Structured/StructuredMeshBase.hpp
index c7104daa..21dfdfda 100644
--- a/src/Core/Mesh/Structured/StructuredMeshBase.hpp
+++ b/src/Core/Mesh/Structured/StructuredMeshBase.hpp
@@ -16,7 +16,7 @@
 #include "Core/Macros.hpp"
 #include "Core/Mesh/MeshBase.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <typename Derived>
     struct StructuredMeshBase : MeshBase<Derived> {};
 
diff --git a/src/Core/Mesh/Structured/StructuredMeshTrait.hpp b/src/Core/Mesh/Structured/StructuredMeshTrait.hpp
index 0521e9bb..be73a288 100644
--- a/src/Core/Mesh/Structured/StructuredMeshTrait.hpp
+++ b/src/Core/Mesh/Structured/StructuredMeshTrait.hpp
@@ -19,7 +19,7 @@
 #include <type_traits>
 #endif
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <typename Derived>
     struct StructuredMeshBase;
 
diff --git a/src/Core/Meta.hpp b/src/Core/Meta.hpp
index cce2de0c..1158083b 100644
--- a/src/Core/Meta.hpp
+++ b/src/Core/Meta.hpp
@@ -22,7 +22,7 @@
 #include <utility>
 #endif
 
-namespace OpFlow::Meta {
+OPFLOW_MODULE_EXPORT namespace OpFlow::Meta {
 
     template <int k>
     struct int_ : std::integral_constant<int, k> {};
diff --git a/src/Core/Operator/Arithmetic/AMDS.hpp b/src/Core/Operator/Arithmetic/AMDS.hpp
index df40c3cf..dfeda638 100644
--- a/src/Core/Operator/Arithmetic/AMDS.hpp
+++ b/src/Core/Operator/Arithmetic/AMDS.hpp
@@ -29,7 +29,7 @@
 #include <utility>
 #endif
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
 
     DEFINE_BINOP(Add, +)
     DEFINE_BINOP(Mul, *)
diff --git a/src/Core/Operator/Arithmetic/MinMax.hpp b/src/Core/Operator/Arithmetic/MinMax.hpp
index 64be5f63..34154f23 100644
--- a/src/Core/Operator/Arithmetic/MinMax.hpp
+++ b/src/Core/Operator/Arithmetic/MinMax.hpp
@@ -27,7 +27,7 @@
 #include <utility>
 #endif
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
 
     namespace internal {
         template <typename T, typename U>
diff --git a/src/Core/Operator/Conditional.hpp b/src/Core/Operator/Conditional.hpp
index 2efd0686..3f17be6f 100644
--- a/src/Core/Operator/Conditional.hpp
+++ b/src/Core/Operator/Conditional.hpp
@@ -19,7 +19,7 @@
 #include "Core/Meta.hpp"
 #include "Core/Operator/Operator.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     struct CondOp {
         template <ExprType C, ExprType T1, ExprType T2>
         OPFLOW_STRONG_INLINE static auto couldSafeEval(const C& c, const T1& t1, const T2& t2, auto&& i) {
diff --git a/src/Core/Operator/Convolution/Convolution.hpp b/src/Core/Operator/Convolution/Convolution.hpp
index 85b204b2..8c8dee73 100644
--- a/src/Core/Operator/Convolution/Convolution.hpp
+++ b/src/Core/Operator/Convolution/Convolution.hpp
@@ -19,7 +19,7 @@
 #include "Core/Meta.hpp"
 #include "DataStructures/Arrays/Tensor/FixedSizeTensor.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <std::integral auto... ns>
     struct Convolution {
         constexpr static int d = sizeof...(ns);
diff --git a/src/Core/Operator/FDMOperators/D1FirstOrderBiasedDownwind.hpp b/src/Core/Operator/FDMOperators/D1FirstOrderBiasedDownwind.hpp
index 93af56e6..1fb2b2ef 100644
--- a/src/Core/Operator/FDMOperators/D1FirstOrderBiasedDownwind.hpp
+++ b/src/Core/Operator/FDMOperators/D1FirstOrderBiasedDownwind.hpp
@@ -17,7 +17,7 @@
 #include "Core/Field/MeshBased/Structured/CartesianFieldExprTrait.hpp"
 #include "DataStructures/Range/Ranges.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <std::size_t d>
     struct D1FirstOrderBiasedDownwind {
         constexpr static auto bc_width = 1;
diff --git a/src/Core/Operator/FDMOperators/D1FirstOrderBiasedUpwind.hpp b/src/Core/Operator/FDMOperators/D1FirstOrderBiasedUpwind.hpp
index 6a3a766a..3df32bd8 100644
--- a/src/Core/Operator/FDMOperators/D1FirstOrderBiasedUpwind.hpp
+++ b/src/Core/Operator/FDMOperators/D1FirstOrderBiasedUpwind.hpp
@@ -18,7 +18,7 @@
 #include "Core/Macros.hpp"
 #include "DataStructures/Range/Ranges.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <std::size_t d>
     struct D1FirstOrderBiasedUpwind {
         constexpr static auto bc_width = 1;
diff --git a/src/Core/Operator/FDMOperators/D1FirstOrderCentered.hpp b/src/Core/Operator/FDMOperators/D1FirstOrderCentered.hpp
index ac1cd04e..afe6aadc 100644
--- a/src/Core/Operator/FDMOperators/D1FirstOrderCentered.hpp
+++ b/src/Core/Operator/FDMOperators/D1FirstOrderCentered.hpp
@@ -16,7 +16,7 @@
 #include "Core/Field/MeshBased/Structured/CartesianFieldExprTrait.hpp"
 #include "DataStructures/Range/Ranges.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <std::size_t d>
     struct D1FirstOrderCentered {
         constexpr static auto bc_width = 1;
diff --git a/src/Core/Operator/FDMOperators/D1WENO53Downwind.hpp b/src/Core/Operator/FDMOperators/D1WENO53Downwind.hpp
index 90d0c6cf..4546dade 100644
--- a/src/Core/Operator/FDMOperators/D1WENO53Downwind.hpp
+++ b/src/Core/Operator/FDMOperators/D1WENO53Downwind.hpp
@@ -20,7 +20,7 @@
 #include "DataStructures/Range/Ranges.hpp"
 #include "Math/Function/Numeric.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <std ::size_t d>
     struct D1WENO53Downwind {
         constexpr static auto bc_width = 3;
diff --git a/src/Core/Operator/FDMOperators/D1WENO53Upwind.hpp b/src/Core/Operator/FDMOperators/D1WENO53Upwind.hpp
index 14031624..d3df6276 100644
--- a/src/Core/Operator/FDMOperators/D1WENO53Upwind.hpp
+++ b/src/Core/Operator/FDMOperators/D1WENO53Upwind.hpp
@@ -20,7 +20,7 @@
 #include "DataStructures/Range/Ranges.hpp"
 #include "Math/Function/Numeric.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <std ::size_t d>
     struct D1WENO53Upwind {
         constexpr static auto bc_width = 3;
diff --git a/src/Core/Operator/FDMOperators/D2SecondOrderCentered.hpp b/src/Core/Operator/FDMOperators/D2SecondOrderCentered.hpp
index b0677075..cc5430d2 100644
--- a/src/Core/Operator/FDMOperators/D2SecondOrderCentered.hpp
+++ b/src/Core/Operator/FDMOperators/D2SecondOrderCentered.hpp
@@ -18,7 +18,7 @@
 #include "Core/Macros.hpp"
 #include "DataStructures/Range/Ranges.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <std::size_t d>
     struct D2SecondOrderCentered {
         constexpr static auto bc_width = 1;
diff --git a/src/Core/Operator/FDMOperators/DiffsInterface.hpp b/src/Core/Operator/FDMOperators/DiffsInterface.hpp
index 5cfd216b..d822fab0 100644
--- a/src/Core/Operator/FDMOperators/DiffsInterface.hpp
+++ b/src/Core/Operator/FDMOperators/DiffsInterface.hpp
@@ -16,7 +16,7 @@
 #include "Core/Expr/Expression.hpp"
 #include "Core/Meta.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
 
 #define UNARY_OP_FUNC_DEF(func_name)                                                                         \
     template <typename Kernel>                                                                               \
diff --git a/src/Core/Operator/IdentityOp.hpp b/src/Core/Operator/IdentityOp.hpp
index b5314ecc..8dbe9f4b 100644
--- a/src/Core/Operator/IdentityOp.hpp
+++ b/src/Core/Operator/IdentityOp.hpp
@@ -18,7 +18,7 @@
 #include "Core/Field/FieldExprTrait.hpp"
 #include "Core/Meta.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     /// \brief Identity op
     /// Used in the context of composed op as a fallback option
     struct IdentityOp {
diff --git a/src/Core/Operator/Interpolator/D1FluxLimiter.hpp b/src/Core/Operator/Interpolator/D1FluxLimiter.hpp
index 6d722b31..3b58ed8a 100644
--- a/src/Core/Operator/Interpolator/D1FluxLimiter.hpp
+++ b/src/Core/Operator/Interpolator/D1FluxLimiter.hpp
@@ -20,7 +20,7 @@
 #include "IntpInterface.hpp"
 #include "Math/Interpolator/Interpolator.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <typename K>
     concept FluxLimiterKernel = requires(double r) {
         { K::eval(r) } -> std::same_as<double>;
diff --git a/src/Core/Operator/Interpolator/D1FluxLimiterBasedIntpOp.hpp b/src/Core/Operator/Interpolator/D1FluxLimiterBasedIntpOp.hpp
index 53bd0179..269c4475 100644
--- a/src/Core/Operator/Interpolator/D1FluxLimiterBasedIntpOp.hpp
+++ b/src/Core/Operator/Interpolator/D1FluxLimiterBasedIntpOp.hpp
@@ -16,7 +16,7 @@
 #include "Core/Operator/Interpolator/D1FluxLimiter.hpp"
 #include "Core/Operator/Interpolator/FluxLimiterKernels.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     // This file contains handy alias for commonly used flux limiter based interpolators.
 
     // QUICK scheme
diff --git a/src/Core/Operator/Interpolator/D1Linear.hpp b/src/Core/Operator/Interpolator/D1Linear.hpp
index e7ba66ce..2288b060 100644
--- a/src/Core/Operator/Interpolator/D1Linear.hpp
+++ b/src/Core/Operator/Interpolator/D1Linear.hpp
@@ -18,7 +18,7 @@
 #include "Core/Operator/Interpolator/IntpInterface.hpp"
 #include "Math/Interpolator/Interpolator.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <std::size_t d, IntpDirection dir>
     struct D1Linear {
         constexpr static auto bc_width = 1;
diff --git a/src/Core/Operator/Interpolator/FluxLimiterKernels.hpp b/src/Core/Operator/Interpolator/FluxLimiterKernels.hpp
index 09614a28..2e612563 100644
--- a/src/Core/Operator/Interpolator/FluxLimiterKernels.hpp
+++ b/src/Core/Operator/Interpolator/FluxLimiterKernels.hpp
@@ -19,7 +19,7 @@
 #include <ratio>
 #endif
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     enum class KappaScheme {
         CDS,  // Central difference, kappa = 1
         QUICK,// Quadratic-upwind interpolation, kappa = 1/2
diff --git a/src/Core/Operator/Interpolator/IntpInterface.hpp b/src/Core/Operator/Interpolator/IntpInterface.hpp
index 4cd6d413..f771bdb2 100644
--- a/src/Core/Operator/Interpolator/IntpInterface.hpp
+++ b/src/Core/Operator/Interpolator/IntpInterface.hpp
@@ -16,7 +16,7 @@
 #include "Core/Expr/Expression.hpp"
 #include "Core/Meta.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     enum class IntpDirection { Cor2Cen, Cen2Cor };
 
     // default linear kernel
diff --git a/src/Core/Operator/Logical/Boolean.hpp b/src/Core/Operator/Logical/Boolean.hpp
index 753b5f1a..3fa25e86 100644
--- a/src/Core/Operator/Logical/Boolean.hpp
+++ b/src/Core/Operator/Logical/Boolean.hpp
@@ -20,7 +20,7 @@
 #include "Core/Operator/Operator.hpp"
 #include "Core/Operator/UniOpDefMacros.hpp.in"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     DEFINE_BINOP(And, &&)
     DEFINE_BINOP(Or, ||)
     DEFINE_UNIOP(Not, !)
diff --git a/src/Core/Operator/Logical/Classify.hpp b/src/Core/Operator/Logical/Classify.hpp
index 6e7f6da1..d524e889 100644
--- a/src/Core/Operator/Logical/Classify.hpp
+++ b/src/Core/Operator/Logical/Classify.hpp
@@ -29,7 +29,7 @@
 #ifndef OPFLOW_CLASSIFY_HPP
 #define OPFLOW_CLASSIFY_HPP
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     DEFINE_UNIFUNC(FPclassify, std::fpclassify, fpclassify)
     DEFINE_UNIFUNC(Isfinite, std::isfinite, isfinite)
     DEFINE_UNIFUNC(Isinf, std::isinf, isinf)
diff --git a/src/Core/Operator/Logical/Compare.hpp b/src/Core/Operator/Logical/Compare.hpp
index 076c45de..fe5d93cd 100644
--- a/src/Core/Operator/Logical/Compare.hpp
+++ b/src/Core/Operator/Logical/Compare.hpp
@@ -23,7 +23,7 @@
 #include <cmath>
 #endif
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     DEFINE_BINOP(GreaterThan, >)
     DEFINE_BINOP(GreaterThanOrEqual, >=)
     DEFINE_BINOP(LessThan, <)
diff --git a/src/Core/Operator/Operator.hpp b/src/Core/Operator/Operator.hpp
index fb9e2957..72809685 100644
--- a/src/Core/Operator/Operator.hpp
+++ b/src/Core/Operator/Operator.hpp
@@ -15,7 +15,7 @@
 
 #include "Core/Meta.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <typename Op>
     struct ArgChecker;
 
diff --git a/src/Core/Operator/PerElemOpAdaptor.hpp b/src/Core/Operator/PerElemOpAdaptor.hpp
index ebc0a2f6..20b1aa9c 100644
--- a/src/Core/Operator/PerElemOpAdaptor.hpp
+++ b/src/Core/Operator/PerElemOpAdaptor.hpp
@@ -20,7 +20,7 @@
 #include "Utils/ConstexprString.hpp"
 #include "Utils/NamedFunctor.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <Utils::NamedFunctorType auto Functor>
     struct UniOpAdaptor {
         constexpr static auto bc_width = 0;
diff --git a/src/Core/Parallel/AbstractSplitStrategy.hpp b/src/Core/Parallel/AbstractSplitStrategy.hpp
index dc31c98d..ecd7b735 100644
--- a/src/Core/Parallel/AbstractSplitStrategy.hpp
+++ b/src/Core/Parallel/AbstractSplitStrategy.hpp
@@ -20,7 +20,7 @@
 #include <vector>
 #endif
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <FieldExprType F>
     struct AbstractSplitStrategy {
         [[nodiscard]] virtual std::string strategyName() const = 0;
diff --git a/src/Core/Parallel/EvenSplitStrategy.hpp b/src/Core/Parallel/EvenSplitStrategy.hpp
index 27588ff3..9a219a9f 100644
--- a/src/Core/Parallel/EvenSplitStrategy.hpp
+++ b/src/Core/Parallel/EvenSplitStrategy.hpp
@@ -29,7 +29,7 @@
 #endif
 #endif
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <FieldExprType F>
     struct EvenSplitStrategy : AbstractSplitStrategy<F> {
         [[nodiscard]] std::string strategyName() const override { return "Even split"; }
diff --git a/src/Core/Parallel/ManualSplitStrategy.hpp b/src/Core/Parallel/ManualSplitStrategy.hpp
index 4a6209e7..4fad7f66 100644
--- a/src/Core/Parallel/ManualSplitStrategy.hpp
+++ b/src/Core/Parallel/ManualSplitStrategy.hpp
@@ -26,7 +26,7 @@
 #include <vector>
 #endif
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     /// \brief Manually specified split ranges strategy
     /// (usually used for debug or adapt to external parallel strategies)
     /// \tparam F FieldType
diff --git a/src/Core/Parallel/ParallelInfo.hpp b/src/Core/Parallel/ParallelInfo.hpp
index 2fdb7001..4f69449e 100644
--- a/src/Core/Parallel/ParallelInfo.hpp
+++ b/src/Core/Parallel/ParallelInfo.hpp
@@ -28,7 +28,7 @@
 #include <oneapi/tbb.h>
 #endif
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     struct NodeInfo {
         DistributeMemType type;
         int node_count;
@@ -48,7 +48,7 @@ namespace OpFlow {
         DeviceInfo deviceInfo {};
     };
 
-    static inline auto makeParallelInfo() {
+    inline auto makeParallelInfo() {
         ParallelInfo ret;
 #if defined(OPFLOW_WITH_MPI) && defined(OPFLOW_DISTRIBUTE_MODEL_MPI)
         ret.parallelType |= ParallelIdentifier::DistributeMem;
diff --git a/src/Core/Parallel/ParallelPlan.hpp b/src/Core/Parallel/ParallelPlan.hpp
index 4c86abdb..a4bba135 100644
--- a/src/Core/Parallel/ParallelPlan.hpp
+++ b/src/Core/Parallel/ParallelPlan.hpp
@@ -16,7 +16,7 @@
 #include "Core/Field/FieldExprTrait.hpp"
 #include "Core/Parallel/ParallelInfo.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     struct ParallelPlan {
         ParallelInfo info;
         int distributed_workers_count = 1;
@@ -35,7 +35,7 @@ namespace OpFlow {
         [[nodiscard]] bool deviceMode() const { return heterogeneous_workers_count > 0; }
     };
 
-    constexpr static inline ParallelPlan makeParallelPlan(ParallelInfo info, ParallelType pbit) {
+    constexpr inline ParallelPlan makeParallelPlan(ParallelInfo info, ParallelType pbit) {
         bool dist_bit = pbit & ParallelIdentifier::DistributeMem,
              sm_bit = pbit & ParallelIdentifier::SharedMem,
              device_bit = pbit & ParallelIdentifier::Heterogeneous;
diff --git a/src/Core/Parallel/ParallelType.hpp b/src/Core/Parallel/ParallelType.hpp
index c632cf54..8e5a080b 100644
--- a/src/Core/Parallel/ParallelType.hpp
+++ b/src/Core/Parallel/ParallelType.hpp
@@ -13,7 +13,7 @@
 #ifndef OPFLOW_PARALLELTYPE_HPP
 #define OPFLOW_PARALLELTYPE_HPP
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     using ParallelType = unsigned int;
     struct ParallelIdentifier {
         constexpr unsigned int static None = 0;
diff --git a/src/Core/Parallel/ParticleGuidedSplitStrategy.hpp b/src/Core/Parallel/ParticleGuidedSplitStrategy.hpp
index 549795aa..d120a1f6 100644
--- a/src/Core/Parallel/ParticleGuidedSplitStrategy.hpp
+++ b/src/Core/Parallel/ParticleGuidedSplitStrategy.hpp
@@ -27,7 +27,7 @@
 #include <vector>
 #endif
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <int d>
     struct Particle {
         std::array<double, d> x;
diff --git a/src/Core/Solvers/SemiStruct/SemiStructSolver.hpp b/src/Core/Solvers/SemiStruct/SemiStructSolver.hpp
index 42417b84..b3efe930 100644
--- a/src/Core/Solvers/SemiStruct/SemiStructSolver.hpp
+++ b/src/Core/Solvers/SemiStruct/SemiStructSolver.hpp
@@ -22,7 +22,7 @@
 #include <optional>
 #endif
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     enum class SemiStructSolverType {
         None,// only for un-preconditioned cases
         Jacobi,
diff --git a/src/Core/Solvers/SemiStruct/SemiStructSolverFAC.hpp b/src/Core/Solvers/SemiStruct/SemiStructSolverFAC.hpp
index 63ceee39..4c54bdf1 100644
--- a/src/Core/Solvers/SemiStruct/SemiStructSolverFAC.hpp
+++ b/src/Core/Solvers/SemiStruct/SemiStructSolverFAC.hpp
@@ -15,7 +15,7 @@
 
 #include "SemiStructSolver.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <>
     struct SemiStructSolverParams<SemiStructSolverType::FAC> : SemiStructSolverParamsBase {
         std::optional<int> logging;
diff --git a/src/Core/Solvers/SemiStruct/SemiStructSolverNone.hpp b/src/Core/Solvers/SemiStruct/SemiStructSolverNone.hpp
index 81d83090..8c5e5038 100644
--- a/src/Core/Solvers/SemiStruct/SemiStructSolverNone.hpp
+++ b/src/Core/Solvers/SemiStruct/SemiStructSolverNone.hpp
@@ -15,7 +15,7 @@
 
 #include "SemiStructSolver.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
 
     // note: the None solver type is only created for unification of the upper level solver API
     // where None indicates un-preconditioned solver. Any use of these types otherwise is illegal.
diff --git a/src/Core/Solvers/Struct/StructSolver.hpp b/src/Core/Solvers/Struct/StructSolver.hpp
index ed01f628..67fe580e 100644
--- a/src/Core/Solvers/Struct/StructSolver.hpp
+++ b/src/Core/Solvers/Struct/StructSolver.hpp
@@ -18,7 +18,7 @@
 #include <optional>
 #endif
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
 
     enum class StructSolverType {
         None, /* None only for un-preconditioned cases */
diff --git a/src/Core/Solvers/Struct/StructSolverBiCGSTAB.hpp b/src/Core/Solvers/Struct/StructSolverBiCGSTAB.hpp
index 853830fa..8df6cb91 100644
--- a/src/Core/Solvers/Struct/StructSolverBiCGSTAB.hpp
+++ b/src/Core/Solvers/Struct/StructSolverBiCGSTAB.hpp
@@ -15,7 +15,7 @@
 
 #include "StructSolver.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <>
     struct StructSolverParams<StructSolverType::BICGSTAB> : StructSolverParamsBase {
         std::optional<Real> absTol;
diff --git a/src/Core/Solvers/Struct/StructSolverCycRed.hpp b/src/Core/Solvers/Struct/StructSolverCycRed.hpp
index 3083b31d..c14e6247 100644
--- a/src/Core/Solvers/Struct/StructSolverCycRed.hpp
+++ b/src/Core/Solvers/Struct/StructSolverCycRed.hpp
@@ -15,7 +15,7 @@
 
 #include "StructSolver.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <>
     struct StructSolverParams<StructSolverType::CYCRED> {
         std::optional<int> tDim;
diff --git a/src/Core/Solvers/Struct/StructSolverFGMRES.hpp b/src/Core/Solvers/Struct/StructSolverFGMRES.hpp
index 164d81c8..00583b73 100644
--- a/src/Core/Solvers/Struct/StructSolverFGMRES.hpp
+++ b/src/Core/Solvers/Struct/StructSolverFGMRES.hpp
@@ -15,7 +15,7 @@
 
 #include "StructSolver.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <>
     struct StructSolverParams<StructSolverType::FGMRES> : StructSolverParamsBase {
         std::optional<Real> absTol;
diff --git a/src/Core/Solvers/Struct/StructSolverGMRES.hpp b/src/Core/Solvers/Struct/StructSolverGMRES.hpp
index be5abe66..7da1ad4b 100644
--- a/src/Core/Solvers/Struct/StructSolverGMRES.hpp
+++ b/src/Core/Solvers/Struct/StructSolverGMRES.hpp
@@ -15,7 +15,7 @@
 
 #include "StructSolver.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <>
     struct StructSolverParams<StructSolverType::GMRES> : StructSolverParamsBase {
         std::optional<Real> absTol;
diff --git a/src/Core/Solvers/Struct/StructSolverJacobi.hpp b/src/Core/Solvers/Struct/StructSolverJacobi.hpp
index fd1b816b..9a5df866 100644
--- a/src/Core/Solvers/Struct/StructSolverJacobi.hpp
+++ b/src/Core/Solvers/Struct/StructSolverJacobi.hpp
@@ -15,7 +15,7 @@
 
 #include "StructSolver.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <>
     struct StructSolverParams<StructSolverType::Jacobi> : StructSolverParamsBase {
         std::optional<bool> useZeroGuess;
diff --git a/src/Core/Solvers/Struct/StructSolverLGMRES.hpp b/src/Core/Solvers/Struct/StructSolverLGMRES.hpp
index 0e902e03..8c09868b 100644
--- a/src/Core/Solvers/Struct/StructSolverLGMRES.hpp
+++ b/src/Core/Solvers/Struct/StructSolverLGMRES.hpp
@@ -15,7 +15,7 @@
 
 #include "StructSolver.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <>
     struct StructSolverParams<StructSolverType::LGMRES> : StructSolverParamsBase {
         std::optional<Real> absTol;
diff --git a/src/Core/Solvers/Struct/StructSolverNone.hpp b/src/Core/Solvers/Struct/StructSolverNone.hpp
index aa7b53bb..6194dbdb 100644
--- a/src/Core/Solvers/Struct/StructSolverNone.hpp
+++ b/src/Core/Solvers/Struct/StructSolverNone.hpp
@@ -15,7 +15,7 @@
 
 #include "StructSolver.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
 
     // note: the None solver type is only created for unification of the upper level solver API
     // where None indicates un-preconditioned solver. Any use of these types otherwise is illegal.
diff --git a/src/Core/Solvers/Struct/StructSolverPCG.hpp b/src/Core/Solvers/Struct/StructSolverPCG.hpp
index 77decc7e..9926ffcd 100644
--- a/src/Core/Solvers/Struct/StructSolverPCG.hpp
+++ b/src/Core/Solvers/Struct/StructSolverPCG.hpp
@@ -15,7 +15,7 @@
 
 #include "StructSolver.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <>
     struct StructSolverParams<StructSolverType::PCG> : StructSolverParamsBase {
         std::optional<Real> absTol;
diff --git a/src/Core/Solvers/Struct/StructSolverPFMG.hpp b/src/Core/Solvers/Struct/StructSolverPFMG.hpp
index 63602f9b..444fb513 100644
--- a/src/Core/Solvers/Struct/StructSolverPFMG.hpp
+++ b/src/Core/Solvers/Struct/StructSolverPFMG.hpp
@@ -19,7 +19,7 @@
 
 #include "StructSolver.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <>
     struct StructSolverParams<StructSolverType::PFMG> : StructSolverParamsBase {
         std::optional<int> maxLevels {}, relChange {};
diff --git a/src/Core/Solvers/Struct/StructSolverPrecond.hpp b/src/Core/Solvers/Struct/StructSolverPrecond.hpp
index 21df6074..1f068961 100644
--- a/src/Core/Solvers/Struct/StructSolverPrecond.hpp
+++ b/src/Core/Solvers/Struct/StructSolverPrecond.hpp
@@ -15,7 +15,7 @@
 
 #include "StructSolver.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <StructSolverType Type, StructSolverType PrecondType>
     struct PrecondStructSolver {
         constexpr auto static type = Type;
diff --git a/src/Core/Solvers/Struct/StructSolverSMG.hpp b/src/Core/Solvers/Struct/StructSolverSMG.hpp
index 9f2a3a93..2d39bea3 100644
--- a/src/Core/Solvers/Struct/StructSolverSMG.hpp
+++ b/src/Core/Solvers/Struct/StructSolverSMG.hpp
@@ -15,7 +15,7 @@
 
 #include "StructSolver.hpp"
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <>
     struct StructSolverParams<StructSolverType::SMG> : StructSolverParamsBase {
         std::optional<int> memUse;
diff --git a/src/DataStructures/Arrays/Arrays.hpp b/src/DataStructures/Arrays/Arrays.hpp
index bf36fccd..ed690a38 100644
--- a/src/DataStructures/Arrays/Arrays.hpp
+++ b/src/DataStructures/Arrays/Arrays.hpp
@@ -23,7 +23,7 @@
 #include <utility>
 #endif
 
-namespace OpFlow::DS {
+OPFLOW_MODULE_EXPORT namespace OpFlow::DS {
     // General array
     template <typename dType, int k>
     using DenseTensor = PlainTensor<dType, k>;
diff --git a/src/DataStructures/Arrays/CoordVector.hpp b/src/DataStructures/Arrays/CoordVector.hpp
index b43619a9..61cd8be0 100644
--- a/src/DataStructures/Arrays/CoordVector.hpp
+++ b/src/DataStructures/Arrays/CoordVector.hpp
@@ -19,7 +19,7 @@
 #include <cmath>
 #endif
 
-namespace OpFlow::DS {
+OPFLOW_MODULE_EXPORT namespace OpFlow::DS {
     template <Meta::Numerical T>
     struct CoordVector : OffsetVector<T> {
     public:
diff --git a/src/DataStructures/Arrays/OffsetVector.hpp b/src/DataStructures/Arrays/OffsetVector.hpp
index f39fba5d..494bbdc4 100644
--- a/src/DataStructures/Arrays/OffsetVector.hpp
+++ b/src/DataStructures/Arrays/OffsetVector.hpp
@@ -20,7 +20,7 @@
 #include <vector>
 #endif
 
-namespace OpFlow::DS {
+OPFLOW_MODULE_EXPORT namespace OpFlow::DS {
     template <typename T>
     struct OffsetVector {
     protected:
diff --git a/src/DataStructures/Arrays/Tensor/FixedSizeTensor.hpp b/src/DataStructures/Arrays/Tensor/FixedSizeTensor.hpp
index d6c5d295..125b8e8c 100644
--- a/src/DataStructures/Arrays/Tensor/FixedSizeTensor.hpp
+++ b/src/DataStructures/Arrays/Tensor/FixedSizeTensor.hpp
@@ -20,7 +20,7 @@
 #include <array>
 #endif
 
-namespace OpFlow::DS {
+OPFLOW_MODULE_EXPORT namespace OpFlow::DS {
     namespace internal {
         template <std::size_t N>
         constexpr int accumulate_product(std::array<int, N> arr) {
diff --git a/src/DataStructures/Arrays/Tensor/PlainTensor.hpp b/src/DataStructures/Arrays/Tensor/PlainTensor.hpp
index a10efc5a..f4344c2a 100644
--- a/src/DataStructures/Arrays/Tensor/PlainTensor.hpp
+++ b/src/DataStructures/Arrays/Tensor/PlainTensor.hpp
@@ -27,7 +27,7 @@
 #include <memory>
 #endif
 
-namespace OpFlow::DS {
+OPFLOW_MODULE_EXPORT namespace OpFlow::DS {
     template <typename ScalarType, int d, typename Allocator>
         requires Utils::StaticAllocatorType<ScalarType, Allocator>
     struct PlainTensor;
diff --git a/src/DataStructures/Arrays/Tensor/TensorBase.hpp b/src/DataStructures/Arrays/Tensor/TensorBase.hpp
index 6538ffa9..a0a9e623 100644
--- a/src/DataStructures/Arrays/Tensor/TensorBase.hpp
+++ b/src/DataStructures/Arrays/Tensor/TensorBase.hpp
@@ -15,7 +15,7 @@
 
 #include "TensorTrait.hpp"
 
-namespace OpFlow::DS {
+OPFLOW_MODULE_EXPORT namespace OpFlow::DS {
     template <typename Derived>
     struct Tensor {
         using scalar_type = typename internal::TensorTrait<Derived>::scalar_type;
diff --git a/src/DataStructures/Arrays/Tensor/TensorTrait.hpp b/src/DataStructures/Arrays/Tensor/TensorTrait.hpp
index 6d25bc71..3688f098 100644
--- a/src/DataStructures/Arrays/Tensor/TensorTrait.hpp
+++ b/src/DataStructures/Arrays/Tensor/TensorTrait.hpp
@@ -17,7 +17,7 @@
 #include <type_traits>
 #endif
 
-namespace OpFlow::DS {
+OPFLOW_MODULE_EXPORT namespace OpFlow::DS {
     template <typename Derived>
     struct Tensor;
 
diff --git a/src/DataStructures/Geometry/2DGeometry.hpp b/src/DataStructures/Geometry/2DGeometry.hpp
index 9d6c96ba..788aa8ff 100644
--- a/src/DataStructures/Geometry/2DGeometry.hpp
+++ b/src/DataStructures/Geometry/2DGeometry.hpp
@@ -24,7 +24,7 @@
 #include <vector>
 #endif
 
-namespace OpFlow::DS {
+OPFLOW_MODULE_EXPORT namespace OpFlow::DS {
 
     struct PiecewiseLinearGeometry2D {
         std::vector<Real> nodes;
diff --git a/src/DataStructures/Geometry/3DGeometry.hpp b/src/DataStructures/Geometry/3DGeometry.hpp
index 54004463..95ce569b 100644
--- a/src/DataStructures/Geometry/3DGeometry.hpp
+++ b/src/DataStructures/Geometry/3DGeometry.hpp
@@ -18,7 +18,7 @@
 #include <vector>
 #endif
 
-namespace OpFlow::DS {
+OPFLOW_MODULE_EXPORT namespace OpFlow::DS {
 
     struct STLGeometry3D {
         using Edge = Index[2];
diff --git a/src/DataStructures/Geometry/BasicElements.hpp b/src/DataStructures/Geometry/BasicElements.hpp
index 912588ba..a0d9fd78 100644
--- a/src/DataStructures/Geometry/BasicElements.hpp
+++ b/src/DataStructures/Geometry/BasicElements.hpp
@@ -22,7 +22,7 @@
 #include <vector>
 #endif
 
-namespace OpFlow::DS {
+OPFLOW_MODULE_EXPORT namespace OpFlow::DS {
 
     template <Meta::Numerical T, std::size_t d>
     struct Point {
diff --git a/src/DataStructures/Geometry/KdTree.hpp b/src/DataStructures/Geometry/KdTree.hpp
index 321d4f4a..94f8ed97 100644
--- a/src/DataStructures/Geometry/KdTree.hpp
+++ b/src/DataStructures/Geometry/KdTree.hpp
@@ -15,7 +15,7 @@
 
 #include "DataStructures/Geometry/BasicElements.hpp"
 
-namespace OpFlow::DS {
+OPFLOW_MODULE_EXPORT namespace OpFlow::DS {
     template <typename PointType, typename BoxType>
     struct KdTree {
         constexpr static auto dim = PointType::dim;
diff --git a/src/DataStructures/Index/ColoredIndex.hpp b/src/DataStructures/Index/ColoredIndex.hpp
index 015a6407..799090f3 100644
--- a/src/DataStructures/Index/ColoredIndex.hpp
+++ b/src/DataStructures/Index/ColoredIndex.hpp
@@ -21,7 +21,7 @@
 #include <string>
 #endif
 
-namespace OpFlow::DS {
+OPFLOW_MODULE_EXPORT namespace OpFlow::DS {
     template <typename T>
     struct ColoredIndex;
 
diff --git a/src/DataStructures/Index/LevelMDIndex.hpp b/src/DataStructures/Index/LevelMDIndex.hpp
index f8d12133..9816acef 100644
--- a/src/DataStructures/Index/LevelMDIndex.hpp
+++ b/src/DataStructures/Index/LevelMDIndex.hpp
@@ -21,7 +21,7 @@
 #include <array>
 #endif
 
-namespace OpFlow::DS {
+OPFLOW_MODULE_EXPORT namespace OpFlow::DS {
     template <std::size_t d>
     struct LevelMDIndex : public StringifiableObj {
         std::array<int, d> idx;
diff --git a/src/DataStructures/Index/LevelRangedIndex.hpp b/src/DataStructures/Index/LevelRangedIndex.hpp
index 7222797d..901c9560 100644
--- a/src/DataStructures/Index/LevelRangedIndex.hpp
+++ b/src/DataStructures/Index/LevelRangedIndex.hpp
@@ -17,7 +17,7 @@
 #include "DataStructures/Range/LevelRanges.hpp"
 #include "LevelMDIndex.hpp"
 
-namespace OpFlow::DS {
+OPFLOW_MODULE_EXPORT namespace OpFlow::DS {
     template <std::size_t dim>
     struct LevelRangedIndex : public LevelMDIndex<dim> {
         DS::Range<dim> range;
diff --git a/src/DataStructures/Index/LinearMapper/BlockedMDRangeMapper.hpp b/src/DataStructures/Index/LinearMapper/BlockedMDRangeMapper.hpp
index 05bce071..066d1c90 100644
--- a/src/DataStructures/Index/LinearMapper/BlockedMDRangeMapper.hpp
+++ b/src/DataStructures/Index/LinearMapper/BlockedMDRangeMapper.hpp
@@ -20,7 +20,7 @@
 #include <vector>
 #endif
 
-namespace OpFlow::DS {
+OPFLOW_MODULE_EXPORT namespace OpFlow::DS {
     /**
      * \brief Axis aligned split multi-dimensional range mapper
      * \note We assume here the input _ranges are generated by splitting a range by several orthogonal planes.
diff --git a/src/DataStructures/Index/LinearMapper/ColoredBlockedMDRangeMapper.hpp b/src/DataStructures/Index/LinearMapper/ColoredBlockedMDRangeMapper.hpp
index f52439c6..b269ef21 100644
--- a/src/DataStructures/Index/LinearMapper/ColoredBlockedMDRangeMapper.hpp
+++ b/src/DataStructures/Index/LinearMapper/ColoredBlockedMDRangeMapper.hpp
@@ -16,7 +16,7 @@
 #include "BlockedMDRangeMapper.hpp"
 #include "DataStructures/Index/ColoredIndex.hpp"
 
-namespace OpFlow::DS {
+OPFLOW_MODULE_EXPORT namespace OpFlow::DS {
     /// @brief A mapper that maps a colored MDIndex to a linear index.
     /// @tparam dim The dimension of the MDIndex.
     /// @note The color lies in the outer-most dimension, i.e., the index picks the BlockedMDRangeMapper
diff --git a/src/DataStructures/Index/LinearMapper/ColoredMDRangeMapper.hpp b/src/DataStructures/Index/LinearMapper/ColoredMDRangeMapper.hpp
index 0fea13a9..1bc0ca9e 100644
--- a/src/DataStructures/Index/LinearMapper/ColoredMDRangeMapper.hpp
+++ b/src/DataStructures/Index/LinearMapper/ColoredMDRangeMapper.hpp
@@ -15,7 +15,7 @@
 
 #include "MDRangeMapper.hpp"
 
-namespace OpFlow::DS {
+OPFLOW_MODULE_EXPORT namespace OpFlow::DS {
     template <std::size_t dim>
     struct ColoredMDRangeMapper {
         ColoredMDRangeMapper() = default;
diff --git a/src/DataStructures/Index/LinearMapper/GeneralBlockedMDRangeMapper.hpp b/src/DataStructures/Index/LinearMapper/GeneralBlockedMDRangeMapper.hpp
index e714f238..f0e8a7cc 100644
--- a/src/DataStructures/Index/LinearMapper/GeneralBlockedMDRangeMapper.hpp
+++ b/src/DataStructures/Index/LinearMapper/GeneralBlockedMDRangeMapper.hpp
@@ -20,7 +20,7 @@
 #include <vector>
 #endif
 
-namespace OpFlow::DS {
+OPFLOW_MODULE_EXPORT namespace OpFlow::DS {
     /**
      * \brief Axis aligned split multi-dimensional range mapper
      * @tparam d Dimension
diff --git a/src/DataStructures/Index/LinearMapper/LevelMDRangeMapper.hpp b/src/DataStructures/Index/LinearMapper/LevelMDRangeMapper.hpp
index b2031747..c826629f 100644
--- a/src/DataStructures/Index/LinearMapper/LevelMDRangeMapper.hpp
+++ b/src/DataStructures/Index/LinearMapper/LevelMDRangeMapper.hpp
@@ -19,7 +19,7 @@
 #include <vector>
 #endif
 
-namespace OpFlow::DS {
+OPFLOW_MODULE_EXPORT namespace OpFlow::DS {
     template <std::size_t d>
     struct LevelMDRangeMapper {
         LevelMDRangeMapper() = default;
diff --git a/src/DataStructures/Index/LinearMapper/MDRangeMapper.hpp b/src/DataStructures/Index/LinearMapper/MDRangeMapper.hpp
index 8f421620..13b5032e 100644
--- a/src/DataStructures/Index/LinearMapper/MDRangeMapper.hpp
+++ b/src/DataStructures/Index/LinearMapper/MDRangeMapper.hpp
@@ -16,7 +16,7 @@
 #include "DataStructures/Index/MDIndex.hpp"
 #include "DataStructures/Range/Ranges.hpp"
 
-namespace OpFlow::DS {
+OPFLOW_MODULE_EXPORT namespace OpFlow::DS {
     template <std::size_t d>
     struct MDRangeMapper {
         MDRangeMapper() = default;
diff --git a/src/DataStructures/Index/MDIndex.hpp b/src/DataStructures/Index/MDIndex.hpp
index 28b7fb4d..077f89bf 100644
--- a/src/DataStructures/Index/MDIndex.hpp
+++ b/src/DataStructures/Index/MDIndex.hpp
@@ -27,7 +27,7 @@
 #include <vector>
 #endif
 
-namespace OpFlow::DS {
+OPFLOW_MODULE_EXPORT namespace OpFlow::DS {
 
     template <std::size_t d>
     struct MDIndex : public StringifiableObj {
diff --git a/src/DataStructures/Index/RangedIndex.hpp b/src/DataStructures/Index/RangedIndex.hpp
index ea42434b..12afb758 100644
--- a/src/DataStructures/Index/RangedIndex.hpp
+++ b/src/DataStructures/Index/RangedIndex.hpp
@@ -17,7 +17,7 @@
 #include "DataStructures/Range/Ranges.hpp"
 #include "MDIndex.hpp"
 
-namespace OpFlow::DS {
+OPFLOW_MODULE_EXPORT namespace OpFlow::DS {
 
     template <std::size_t dim>
     struct RangedIndex : public MDIndex<dim> {
diff --git a/src/DataStructures/Matrix/COOMatrix.hpp b/src/DataStructures/Matrix/COOMatrix.hpp
index 6dfa0ad3..c2347a1d 100644
--- a/src/DataStructures/Matrix/COOMatrix.hpp
+++ b/src/DataStructures/Matrix/COOMatrix.hpp
@@ -13,7 +13,7 @@
 #ifndef OPFLOW_COOMATRIX_HPP
 #define OPFLOW_COOMATRIX_HPP
 
-namespace OpFlow::DS {
+OPFLOW_MODULE_EXPORT namespace OpFlow::DS {
     struct COOMatrix {};
 }// namespace OpFlow::DS
 
diff --git a/src/DataStructures/Matrix/CSRMatrix.hpp b/src/DataStructures/Matrix/CSRMatrix.hpp
index 0598aba6..e932a3a8 100644
--- a/src/DataStructures/Matrix/CSRMatrix.hpp
+++ b/src/DataStructures/Matrix/CSRMatrix.hpp
@@ -20,7 +20,7 @@
 #include <oneapi/tbb/parallel_for.h>
 #endif
 
-namespace OpFlow::DS {
+OPFLOW_MODULE_EXPORT namespace OpFlow::DS {
     struct CSRMatrix {
         CSRMatrix() : row(1), col(0), rhs(0), val(0) { row[0] = 0; }
         CSRMatrix(int n_row, int nnz_per_row) { resize(n_row, nnz_per_row); }
diff --git a/src/DataStructures/Pair.hpp b/src/DataStructures/Pair.hpp
index bd555426..8703871d 100644
--- a/src/DataStructures/Pair.hpp
+++ b/src/DataStructures/Pair.hpp
@@ -13,7 +13,7 @@
 #ifndef OPFLOW_PAIR_HPP
 #define OPFLOW_PAIR_HPP
 
-namespace OpFlow::DS {
+OPFLOW_MODULE_EXPORT namespace OpFlow::DS {
     template <typename T>
     struct Pair {
         T start, end;
diff --git a/src/DataStructures/Range/LevelRanges.hpp b/src/DataStructures/Range/LevelRanges.hpp
index 12c6f693..99c622d7 100644
--- a/src/DataStructures/Range/LevelRanges.hpp
+++ b/src/DataStructures/Range/LevelRanges.hpp
@@ -21,7 +21,7 @@
 #include <concepts>
 #endif
 
-namespace OpFlow::DS {
+OPFLOW_MODULE_EXPORT namespace OpFlow::DS {
     template <std::size_t dim>
     struct LevelRangedIndex;
 
diff --git a/src/DataStructures/Range/Ranges.hpp b/src/DataStructures/Range/Ranges.hpp
index 84df48ba..2eafdc38 100644
--- a/src/DataStructures/Range/Ranges.hpp
+++ b/src/DataStructures/Range/Ranges.hpp
@@ -26,7 +26,7 @@
 #include <vector>
 #endif
 
-namespace OpFlow::DS {
+OPFLOW_MODULE_EXPORT namespace OpFlow::DS {
     template <std::size_t dim>
     struct RangedIndex;
 
diff --git a/src/DataStructures/StencilPad.hpp b/src/DataStructures/StencilPad.hpp
index fdf2a99f..57ee92a1 100644
--- a/src/DataStructures/StencilPad.hpp
+++ b/src/DataStructures/StencilPad.hpp
@@ -22,7 +22,7 @@
 #include <unordered_map>
 #endif
 
-namespace OpFlow::DS {
+OPFLOW_MODULE_EXPORT namespace OpFlow::DS {
     template <std::size_t max_size, typename K, typename V>
     struct fake_map {
     private:
diff --git a/src/Math/Function/Integral.hpp b/src/Math/Function/Integral.hpp
index 05fbd988..17dac89a 100644
--- a/src/Math/Function/Integral.hpp
+++ b/src/Math/Function/Integral.hpp
@@ -13,7 +13,7 @@
 #ifndef OPFLOW_INTEGRAL_HPP
 #define OPFLOW_INTEGRAL_HPP
 
-namespace OpFlow::Math {
+OPFLOW_MODULE_EXPORT namespace OpFlow::Math {
 
     inline constexpr int round_to_range(int i, int start, int end) {
         int off = i - start;
diff --git a/src/Math/Function/Numeric.hpp b/src/Math/Function/Numeric.hpp
index d98e9f9d..ff554fb2 100644
--- a/src/Math/Function/Numeric.hpp
+++ b/src/Math/Function/Numeric.hpp
@@ -21,7 +21,7 @@
 #include <type_traits>
 #endif
 
-namespace OpFlow::Math {
+OPFLOW_MODULE_EXPORT namespace OpFlow::Math {
 
     template <typename T>
     inline constexpr int signum(T x, std::false_type is_signed) {
diff --git a/src/Math/Interpolator/Interpolator.hpp b/src/Math/Interpolator/Interpolator.hpp
index 54271b65..3d82f1c2 100644
--- a/src/Math/Interpolator/Interpolator.hpp
+++ b/src/Math/Interpolator/Interpolator.hpp
@@ -15,7 +15,7 @@
 
 #include "Core/Macros.hpp"
 
-namespace OpFlow::Math {
+OPFLOW_MODULE_EXPORT namespace OpFlow::Math {
 
     struct Interpolator1D {
         OPFLOW_STRONG_INLINE static auto intp(double x1, auto y1, double x2, auto y2) {
diff --git a/src/Utils/Allocator/AlignedAllocator.hpp b/src/Utils/Allocator/AlignedAllocator.hpp
index 1b46b8ec..2a89d0f8 100644
--- a/src/Utils/Allocator/AlignedAllocator.hpp
+++ b/src/Utils/Allocator/AlignedAllocator.hpp
@@ -19,7 +19,7 @@
 #include <cstdlib>
 #endif
 
-namespace OpFlow::Utils {
+OPFLOW_MODULE_EXPORT namespace OpFlow::Utils {
     template <typename T, std::size_t align = 64>
     struct AlignedAllocator {
         static auto allocate(std::size_t size) {
diff --git a/src/Utils/Allocator/AllocatorTrait.hpp b/src/Utils/Allocator/AllocatorTrait.hpp
index 3fbcdf8c..70295c0e 100644
--- a/src/Utils/Allocator/AllocatorTrait.hpp
+++ b/src/Utils/Allocator/AllocatorTrait.hpp
@@ -13,7 +13,7 @@
 #ifndef OPFLOW_ALLOCATORTRAIT_HPP
 #define OPFLOW_ALLOCATORTRAIT_HPP
 
-namespace OpFlow::Utils {
+OPFLOW_MODULE_EXPORT namespace OpFlow::Utils {
     namespace internal {
         template <typename T>
         struct AllocatorTrait;
diff --git a/src/Utils/Allocator/StaticAllocator.hpp b/src/Utils/Allocator/StaticAllocator.hpp
index b9702940..9c3d455d 100644
--- a/src/Utils/Allocator/StaticAllocator.hpp
+++ b/src/Utils/Allocator/StaticAllocator.hpp
@@ -19,7 +19,7 @@
 #include <utility>
 #endif
 
-namespace OpFlow::Utils {
+OPFLOW_MODULE_EXPORT namespace OpFlow::Utils {
     template <typename D, typename T>
     concept StaticAllocatorType = requires(std::size_t s) {
         { T::allocate(s) } -> std::same_as<D*>;
diff --git a/src/Utils/Allocator/VirtualMemAllocator.hpp b/src/Utils/Allocator/VirtualMemAllocator.hpp
index b698be5e..f47d342d 100644
--- a/src/Utils/Allocator/VirtualMemAllocator.hpp
+++ b/src/Utils/Allocator/VirtualMemAllocator.hpp
@@ -19,7 +19,7 @@
 #endif
 #endif
 
-namespace OpFlow::Utils {
+OPFLOW_MODULE_EXPORT namespace OpFlow::Utils {
 #ifdef OPFLOW_HAS_MMAN_H
     template <typename T>
     struct VirtualMemAllocator {
diff --git a/src/Utils/ConstexprString.hpp b/src/Utils/ConstexprString.hpp
index a5799d79..46af35e2 100644
--- a/src/Utils/ConstexprString.hpp
+++ b/src/Utils/ConstexprString.hpp
@@ -18,7 +18,7 @@
 #include <string>
 #endif
 
-namespace OpFlow::Utils {
+OPFLOW_MODULE_EXPORT namespace OpFlow::Utils {
     template <std::size_t N>
     struct CXprString {
         constexpr CXprString() = default;
diff --git a/src/Utils/NamedFunctor.hpp b/src/Utils/NamedFunctor.hpp
index ea608ba5..279e9a66 100644
--- a/src/Utils/NamedFunctor.hpp
+++ b/src/Utils/NamedFunctor.hpp
@@ -19,7 +19,7 @@
 #include <concepts>
 #endif
 
-namespace OpFlow::Utils {
+OPFLOW_MODULE_EXPORT namespace OpFlow::Utils {
     template <auto Functor, auto Name, typename... Args>
     // Invokable check. Omit Args to mute this check
         requires((sizeof...(Args) == 0) || std::invocable<Meta::RealType<decltype(Functor)>, Args...>)
diff --git a/src/Utils/RandomStringGenerator.hpp b/src/Utils/RandomStringGenerator.hpp
index eac3383b..c7d27f1f 100644
--- a/src/Utils/RandomStringGenerator.hpp
+++ b/src/Utils/RandomStringGenerator.hpp
@@ -22,7 +22,7 @@
 #include <string>
 #endif
 
-namespace OpFlow::Utils {
+OPFLOW_MODULE_EXPORT namespace OpFlow::Utils {
     // copied from https://stackoverflow.com/a/444614
     template <typename T = std::mt19937>
     inline auto random_generator() -> T {
diff --git a/src/Utils/Serializer/EnumTypes.hpp b/src/Utils/Serializer/EnumTypes.hpp
index 1fa13063..d3bc3106 100644
--- a/src/Utils/Serializer/EnumTypes.hpp
+++ b/src/Utils/Serializer/EnumTypes.hpp
@@ -20,7 +20,7 @@
 #include <string>
 #endif
 
-namespace OpFlow {
+OPFLOW_MODULE_EXPORT namespace OpFlow {
 
     inline std::ostream& operator<<(std::ostream& o, const BCType& type) {
         switch (type) {
diff --git a/src/Utils/Serializer/STDContainers.hpp b/src/Utils/Serializer/STDContainers.hpp
index ec6dd06d..a8e0861c 100644
--- a/src/Utils/Serializer/STDContainers.hpp
+++ b/src/Utils/Serializer/STDContainers.hpp
@@ -19,7 +19,7 @@
 #include <string>
 #endif
 
-namespace OpFlow::Utils::Serializer {
+OPFLOW_MODULE_EXPORT namespace OpFlow::Utils::Serializer {
     template <typename T>
         requires Meta::BracketIndexable<T> && requires(T t) {
             { t.empty() } -> std::same_as<bool>;
diff --git a/src/Utils/StackTracer.hpp b/src/Utils/StackTracer.hpp
index 254040c8..178af322 100644
--- a/src/Utils/StackTracer.hpp
+++ b/src/Utils/StackTracer.hpp
@@ -19,7 +19,7 @@
 #ifndef OPFLOW_STACKTRACER_HPP
 #define OPFLOW_STACKTRACER_HPP
 
-namespace OpFlow::Utils {
+OPFLOW_MODULE_EXPORT namespace OpFlow::Utils {
     struct StackTracer {
         std::vector<std::string> msg;
 
diff --git a/src/Utils/Writers/FieldStream.hpp b/src/Utils/Writers/FieldStream.hpp
index b2e5eb81..14df9457 100644
--- a/src/Utils/Writers/FieldStream.hpp
+++ b/src/Utils/Writers/FieldStream.hpp
@@ -15,7 +15,7 @@
 
 #include "Utils/Writers/Streams.hpp"
 
-namespace OpFlow::Utils {
+OPFLOW_MODULE_EXPORT namespace OpFlow::Utils {
     template <typename Derived>
     struct FieldStream : Stream<Derived> {
         void fixedMesh() { this->derived().fixedMeshImpl(); }
diff --git a/src/Utils/Writers/FieldWriter.hpp b/src/Utils/Writers/FieldWriter.hpp
index b1f19ea9..94403edf 100644
--- a/src/Utils/Writers/FieldWriter.hpp
+++ b/src/Utils/Writers/FieldWriter.hpp
@@ -24,7 +24,7 @@
 #include <string>
 #endif
 
-namespace OpFlow::Utils::Writer {
+OPFLOW_MODULE_EXPORT namespace OpFlow::Utils::Writer {
     template <typename FieldType>
     class FieldWriter : public virtual IO::WriterBase {
     public:
diff --git a/src/Utils/Writers/HDF5Stream.hpp b/src/Utils/Writers/HDF5Stream.hpp
index 82e24daf..f57e1675 100644
--- a/src/Utils/Writers/HDF5Stream.hpp
+++ b/src/Utils/Writers/HDF5Stream.hpp
@@ -30,7 +30,7 @@
 #endif
 #endif
 
-namespace OpFlow::Utils {
+OPFLOW_MODULE_EXPORT namespace OpFlow::Utils {
     struct H5Stream;
 
     namespace internal {
diff --git a/src/Utils/Writers/IOGroup.hpp b/src/Utils/Writers/IOGroup.hpp
index e0265576..92a81489 100644
--- a/src/Utils/Writers/IOGroup.hpp
+++ b/src/Utils/Writers/IOGroup.hpp
@@ -19,7 +19,7 @@
 #include <tuple>
 #endif
 
-namespace OpFlow::Utils {
+OPFLOW_MODULE_EXPORT namespace OpFlow::Utils {
     struct IOGroupInterface {
         virtual ~IOGroupInterface() = default;
         virtual void dump(const TimeStamp& t) = 0;
diff --git a/src/Utils/Writers/RawBinaryStream.hpp b/src/Utils/Writers/RawBinaryStream.hpp
index 3ac061d6..88def76d 100644
--- a/src/Utils/Writers/RawBinaryStream.hpp
+++ b/src/Utils/Writers/RawBinaryStream.hpp
@@ -24,7 +24,7 @@
 #include <string>
 #endif
 
-namespace OpFlow::Utils {
+OPFLOW_MODULE_EXPORT namespace OpFlow::Utils {
     struct RawBinaryOStream;
     struct RawBinaryIStream;
 
@@ -77,7 +77,7 @@ namespace OpFlow::Utils {
     };
 }// namespace OpFlow::Utils
 
-namespace OpFlow::Utils {
+OPFLOW_MODULE_EXPORT namespace OpFlow::Utils {
     /// \brief Stream operator for CartesianField
     /// \note
     /// The structure of CartesianField raw file:
diff --git a/src/Utils/Writers/StreamTrait.hpp b/src/Utils/Writers/StreamTrait.hpp
index b52109ea..3b7a4d0e 100644
--- a/src/Utils/Writers/StreamTrait.hpp
+++ b/src/Utils/Writers/StreamTrait.hpp
@@ -18,7 +18,7 @@
 #include <type_traits>
 #endif
 
-namespace OpFlow::Utils {
+OPFLOW_MODULE_EXPORT namespace OpFlow::Utils {
     namespace internal {
         template <typename T>
         struct StreamTrait;
diff --git a/src/Utils/Writers/Streams.hpp b/src/Utils/Writers/Streams.hpp
index 44f111b2..c7a28ff7 100644
--- a/src/Utils/Writers/Streams.hpp
+++ b/src/Utils/Writers/Streams.hpp
@@ -26,7 +26,7 @@
 #include <utility>
 #endif
 
-namespace OpFlow::Utils {
+OPFLOW_MODULE_EXPORT namespace OpFlow::Utils {
 
     struct TimeStamp {
         double time {};
diff --git a/src/Utils/Writers/TecplotASCIIStream.hpp b/src/Utils/Writers/TecplotASCIIStream.hpp
index 99ec5b45..a889fea6 100644
--- a/src/Utils/Writers/TecplotASCIIStream.hpp
+++ b/src/Utils/Writers/TecplotASCIIStream.hpp
@@ -22,7 +22,7 @@
 #include <string>
 #endif
 
-namespace OpFlow::Utils {
+OPFLOW_MODULE_EXPORT namespace OpFlow::Utils {
     struct TecplotASCIIStream;
 
     namespace internal {
diff --git a/src/Utils/Writers/TecplotBinaryStream.hpp b/src/Utils/Writers/TecplotBinaryStream.hpp
index 3297fd78..cd02a3c8 100644
--- a/src/Utils/Writers/TecplotBinaryStream.hpp
+++ b/src/Utils/Writers/TecplotBinaryStream.hpp
@@ -23,7 +23,7 @@
 #include <utility>
 #endif
 
-namespace OpFlow::Utils {
+OPFLOW_MODULE_EXPORT namespace OpFlow::Utils {
     struct TecplotBinaryStream;
 
     namespace internal {
diff --git a/src/Utils/Writers/TecplotSZPLTStream.hpp b/src/Utils/Writers/TecplotSZPLTStream.hpp
index 0322ab05..71cddaf5 100644
--- a/src/Utils/Writers/TecplotSZPLTStream.hpp
+++ b/src/Utils/Writers/TecplotSZPLTStream.hpp
@@ -23,7 +23,7 @@
 #include <utility>
 #endif
 
-namespace OpFlow::Utils {
+OPFLOW_MODULE_EXPORT namespace OpFlow::Utils {
     struct TecplotSZPLTStream;
 
     namespace internal {
diff --git a/src/Utils/Writers/VTKAMRStream.hpp b/src/Utils/Writers/VTKAMRStream.hpp
index 93b031e2..90919c12 100644
--- a/src/Utils/Writers/VTKAMRStream.hpp
+++ b/src/Utils/Writers/VTKAMRStream.hpp
@@ -48,7 +48,7 @@
 #endif
 #endif
 
-namespace OpFlow::Utils {
+OPFLOW_MODULE_EXPORT namespace OpFlow::Utils {
     struct VTKAMRStream;
 
     namespace internal {
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 6fee506e..947a6b5d 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -17,6 +17,10 @@ if (NOT TARGET opflow)
     find_package(opflow REQUIRED)
 endif ()
 
+set(CMAKE_CXX_FLAGS_DEBUG "-Og -g")
+set(CMAKE_CXX_FLAGS_RELEASE "-O2")
+set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
+
 if (OPFLOW_ENABLE_COVERAGE)
     include(${CMAKE_CURRENT_LIST_DIR}/../cmake/CodeCoverage.cmake)
 else ()
diff --git a/test/Core/BC/DircBCTest.cpp b/test/Core/BC/DircBCTest.cpp
index 7441cb56..d1bb72c5 100644
--- a/test/Core/BC/DircBCTest.cpp
+++ b/test/Core/BC/DircBCTest.cpp
@@ -10,9 +10,9 @@
 //
 //  ----------------------------------------------------------------------------
 
-#include <OpFlow>
 #include <gmock/gmock.h>
 
+import opflow;
 using namespace OpFlow;
 
 class DircBCTest : public testing::Test {
diff --git a/test/Core/BC/NeumBCTest.cpp b/test/Core/BC/NeumBCTest.cpp
index 9602730b..41780439 100644
--- a/test/Core/BC/NeumBCTest.cpp
+++ b/test/Core/BC/NeumBCTest.cpp
@@ -10,8 +10,8 @@
 //
 //  ----------------------------------------------------------------------------
 
-#include <OpFlow>
 #include <gmock/gmock.h>
+import opflow;
 
 using namespace OpFlow;
 
diff --git a/test/Core/BC/PeriodicBCTest.cpp b/test/Core/BC/PeriodicBCTest.cpp
index ce6d914b..87c8cdf3 100644
--- a/test/Core/BC/PeriodicBCTest.cpp
+++ b/test/Core/BC/PeriodicBCTest.cpp
@@ -10,8 +10,8 @@
 //
 //  ----------------------------------------------------------------------------
 
-#include <OpFlow>
 #include <gmock/gmock.h>
+import opflow;
 
 using namespace OpFlow;
 
diff --git a/test/Core/Equation/AMGCLMPITest.cpp b/test/Core/Equation/AMGCLMPITest.cpp
index ffe31ab5..dfea50ed 100644
--- a/test/Core/Equation/AMGCLMPITest.cpp
+++ b/test/Core/Equation/AMGCLMPITest.cpp
@@ -10,8 +10,9 @@
 //
 //  ----------------------------------------------------------------------------
 
-#include <OpFlow>
 #include <gmock/gmock.h>
+#include <print>
+import opflow;
 
 using namespace OpFlow;
 
@@ -72,11 +73,11 @@ class AMGCLMPITest : public testing::Test {
             auto p_ref = p_true.evalAt(i);
             auto rel_res = std::abs(c_res) / std::abs(p_ref);
             if (std::isnan(c_res)) {
-                OP_ERROR("Check fail: res = nan @ {}", i);
+                std::print(std::cerr,"Check fail: res = nan @ {}", i);
                 ret = false;
             }
             if (rel_res > rel) {
-                OP_ERROR("Check fail: res = {} / {} @ {}", c_res, rel_res, i);
+                std::print(std::cerr,"Check fail: res = {} / {} @ {}", c_res, rel_res, i);
                 ret = false;
             }
         });
@@ -195,11 +196,11 @@ class AMGCLManualSplitMPITest : public virtual testing::Test {
             auto p_ref = p_true.evalAt(i);
             auto rel_res = std::abs(c_res) / std::abs(p_ref);
             if (std::isnan(c_res)) {
-                OP_ERROR("Check fail: res = nan @ {}", i);
+                std::print(std::cerr,"Check fail: res = nan @ {}", i);
                 ret = false;
             }
             if (rel_res > rel) {
-                OP_ERROR("Check fail: res = {} / {} @ {}", c_res, rel_res, i);
+                std::print(std::cerr,"Check fail: res = {} / {} @ {}", c_res, rel_res, i);
                 ret = false;
             }
         });
diff --git a/test/Core/Equation/CSRMatrixGeneratorMPITest.cpp b/test/Core/Equation/CSRMatrixGeneratorMPITest.cpp
index 85f76d89..448609b2 100644
--- a/test/Core/Equation/CSRMatrixGeneratorMPITest.cpp
+++ b/test/Core/Equation/CSRMatrixGeneratorMPITest.cpp
@@ -10,8 +10,8 @@
 //
 //  ----------------------------------------------------------------------------
 
-#include <OpFlow>
 #include <gmock/gmock.h>
+import opflow;
 
 using namespace OpFlow;
 using namespace testing;
diff --git a/test/Core/Equation/CSRMatrixGeneratorTest.cpp b/test/Core/Equation/CSRMatrixGeneratorTest.cpp
index 456e77fb..94b9ee15 100644
--- a/test/Core/Equation/CSRMatrixGeneratorTest.cpp
+++ b/test/Core/Equation/CSRMatrixGeneratorTest.cpp
@@ -11,8 +11,9 @@
 //  ----------------------------------------------------------------------------
 
 //#define OPFLOW_ENABLE_STACK_TRACE 1
-#include <OpFlow>
 #include <gmock/gmock.h>
+#include <print>
+import opflow;
 
 using namespace OpFlow;
 using namespace testing;
@@ -150,7 +151,7 @@ TEST_F(CSRMatrixGeneratorTest, SimplePoisson_Periodic) {
                              -1, 4,  -1, -1, -1, 4,  -1, -1, -1, -1, -1, 4,  -1, -1, -1, -1, 4,  -1, 1},
             rhs {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0};
 
-    OP_INFO("{}", mat.toString());
+    std::print("{}", mat.toString());
 
     for (int i = 0; i < ptr.size(); ++i) { ASSERT_EQ(ptr[i], mat.row[i]); }
     for (int i = 0; i < col.size(); ++i) { ASSERT_EQ(col[i], mat.col[i]); }
diff --git a/test/Core/Equation/DircEqnTest.cpp b/test/Core/Equation/DircEqnTest.cpp
index bf1c9eb1..31f71850 100644
--- a/test/Core/Equation/DircEqnTest.cpp
+++ b/test/Core/Equation/DircEqnTest.cpp
@@ -10,8 +10,9 @@
 //
 // ----------------------------------------------------------------------------
 
-#include <OpFlow>
 #include <gmock/gmock.h>
+#include <print>
+import opflow;
 
 using namespace OpFlow;
 using namespace testing;
@@ -82,11 +83,11 @@ class DircEqnTest : public Test {
             auto p_ref = p_true.evalAt(i);
             auto rel_res = std::abs(c_res) / std::abs(p_ref);
             if (std::isnan(c_res)) {
-                OP_ERROR("Check fail: res = nan @ {}", i);
+                std::print(std::cerr,"Check fail: res = nan @ {}", i);
                 ret = false;
             }
             if (rel_res > rel) {
-                OP_ERROR("Check fail: res = {} / {} @ {}", c_res, rel_res, i);
+                std::print(std::cerr,"Check fail: res = {} / {} @ {}", c_res, rel_res, i);
                 ret = false;
             }
         });
diff --git a/test/Core/Equation/EqnHolderTest.cpp b/test/Core/Equation/EqnHolderTest.cpp
index 81605ae2..40c4d4c3 100644
--- a/test/Core/Equation/EqnHolderTest.cpp
+++ b/test/Core/Equation/EqnHolderTest.cpp
@@ -10,8 +10,9 @@
 //
 //  ----------------------------------------------------------------------------
 
-#include <OpFlow>
 #include <gmock/gmock.h>
+#include <print>
+import opflow;
 
 using namespace OpFlow;
 using namespace testing;
@@ -82,11 +83,11 @@ class EqnHolderTest : public Test {
             auto p_ref = p_true.evalAt(i);
             auto rel_res = std::abs(c_res) / std::abs(p_ref);
             if (std::isnan(c_res)) {
-                OP_ERROR("Check fail: res = nan @ {}", i);
+                std::print(std::cerr,"Check fail: res = nan @ {}", i);
                 ret = false;
             }
             if (rel_res > rel) {
-                OP_ERROR("Check fail: res = {} / {} @ {}", c_res, rel_res, i);
+                std::print(std::cerr,"Check fail: res = {} / {} @ {}", c_res, rel_res, i);
                 ret = false;
             }
         });
diff --git a/test/Core/Equation/EqnSetMPITest.cpp b/test/Core/Equation/EqnSetMPITest.cpp
index ad1dddd1..0690042b 100644
--- a/test/Core/Equation/EqnSetMPITest.cpp
+++ b/test/Core/Equation/EqnSetMPITest.cpp
@@ -10,9 +10,10 @@
 //
 //  ----------------------------------------------------------------------------
 
-#include <OpFlow>
 #include <cmath>
 #include <gmock/gmock.h>
+#include <print>
+import opflow;
 
 using namespace OpFlow;
 using namespace testing;
@@ -100,7 +101,7 @@ TEST_F(EqnSetMPITest, SimplePoisson_2Eqn) {
 
     rangeFor_s(p.getLocalWritableRange(), [&](auto&& k) {
         if (std::isnan(p[k]) || std::isnan(p_true[k])) {
-            OP_INFO("p[{}] = {}, p2[{}] = {}, p_true[{}] = {}", k, p[k], k, p2[k], k, p_true[k]);
+            std::print("p[{}] = {}, p2[{}] = {}, p_true[{}] = {}", k, p[k], k, p2[k], k, p_true[k]);
         }
         ASSERT_NEAR(p[k], p_true[k], std::abs(1e-10 * p_true[k]));
         ASSERT_NEAR(p2[k], p[k], std::abs(1e-10 * p[k]));
@@ -156,7 +157,7 @@ TEST_F(EqnSetMPITest, SimplePoisson_Neum_2Eqn) {
 
     rangeFor_s(p.getLocalWritableRange(), [&](auto&& k) {
         if (std::isnan(p[k]) || std::isnan(p_true[k])) {
-            OP_INFO("p[{}] = {}, p2[{}] = {}, p_true[{}] = {}", k, p[k], k, p2[k], k, p_true[k]);
+            std::print("p[{}] = {}, p2[{}] = {}, p_true[{}] = {}", k, p[k], k, p2[k], k, p_true[k]);
         }
 
         ASSERT_NEAR(p[k], p_true[k], std::abs(1e-10 * p_true[k]));
@@ -247,7 +248,7 @@ TEST_F(EqnSetMPITest, SimplePoisson_10Eqn) {
 
     rangeFor_s(p.getLocalWritableRange(), [&](auto&& k) {
         if (std::isnan(p[k]) || std::isnan(p_true[k])) {
-            OP_INFO("p[{}] = {}, p2[{}] = {}, p_true[{}] = {}", k, p[k], k, p2[k], k, p_true[k]);
+            std::print("p[{}] = {}, p2[{}] = {}, p_true[{}] = {}", k, p[k], k, p2[k], k, p_true[k]);
         }
         ASSERT_NEAR(p[k], p_true[k], std::abs(1e-10 * p_true[k]));
         ASSERT_NEAR(p2[k], p[k], std::abs(1e-10 * p[k]));
diff --git a/test/Core/Equation/EqnSetTest.cpp b/test/Core/Equation/EqnSetTest.cpp
index 8703176e..cf13fe39 100644
--- a/test/Core/Equation/EqnSetTest.cpp
+++ b/test/Core/Equation/EqnSetTest.cpp
@@ -10,9 +10,9 @@
 //
 //  ----------------------------------------------------------------------------
 
-#include <OpFlow>
-#include <cmath>
 #include <gmock/gmock.h>
+#include <print>
+import opflow;
 
 using namespace OpFlow;
 using namespace testing;
@@ -100,7 +100,7 @@ TEST_F(EqnSetTest, SimplePoisson_2Eqn) {
 
     rangeFor_s(p.assignableRange, [&](auto&& k) {
         if (std::isnan(p[k]) || std::isnan(p_true[k])) {
-            OP_INFO("p[{}] = {}, p2[{}] = {}, p_true[{}] = {}", k, p[k], k, p2[k], k, p_true[k]);
+            std::print("p[{}] = {}, p2[{}] = {}, p_true[{}] = {}", k, p[k], k, p2[k], k, p_true[k]);
         }
         ASSERT_NEAR(p[k], p_true[k], std::abs(1e-10 * p_true[k]));
         ASSERT_NEAR(p2[k], p[k], std::abs(1e-10 * p[k]));
@@ -156,7 +156,7 @@ TEST_F(EqnSetTest, SimplePoisson_Neum_2Eqn) {
 
     rangeFor_s(p.assignableRange, [&](auto&& k) {
         if (std::isnan(p[k]) || std::isnan(p_true[k])) {
-            OP_INFO("p[{}] = {}, p2[{}] = {}, p_true[{}] = {}", k, p[k], k, p2[k], k, p_true[k]);
+            std::print("p[{}] = {}, p2[{}] = {}, p_true[{}] = {}", k, p[k], k, p2[k], k, p_true[k]);
         }
 
         ASSERT_NEAR(p[k], p_true[k], std::abs(1e-10 * p_true[k]));
@@ -245,7 +245,7 @@ TEST_F(EqnSetTest, SimplePoisson_10Eqn) {
 
     rangeFor_s(p.assignableRange, [&](auto&& k) {
         if (std::isnan(p[k]) || std::isnan(p_true[k])) {
-            OP_INFO("p[{}] = {}, p2[{}] = {}, p_true[{}] = {}", k, p[k], k, p2[k], k, p_true[k]);
+            std::print("p[{}] = {}, p2[{}] = {}, p_true[{}] = {}", k, p[k], k, p2[k], k, p_true[k]);
         }
         ASSERT_NEAR(p[k], p_true[k], std::abs(1e-10 * p_true[k]));
         ASSERT_NEAR(p2[k], p[k], std::abs(1e-10 * p[k]));
diff --git a/test/Core/Equation/NeumEqnTest.cpp b/test/Core/Equation/NeumEqnTest.cpp
index 37358bd8..28ecf41a 100644
--- a/test/Core/Equation/NeumEqnTest.cpp
+++ b/test/Core/Equation/NeumEqnTest.cpp
@@ -10,8 +10,9 @@
 //
 //  ----------------------------------------------------------------------------
 
-#include <OpFlow>
 #include <gmock/gmock.h>
+#include <print>
+import opflow;
 
 using namespace OpFlow;
 using namespace testing;
@@ -84,11 +85,11 @@ class NeumEqnTest : public Test {
             auto p_ref = p_true.evalAt(i);
             auto rel_res = std::abs(c_res) / std::abs(p_ref);
             if (std::isnan(c_res)) {
-                OP_ERROR("Check fail: res = nan @ {}", i);
+                std::print(std::cerr,"Check fail: res = nan @ {}", i);
                 ret = false;
             }
             if (rel_res > rel) {
-                OP_ERROR("Check fail: res = {} / {} @ {}", c_res, rel_res, i);
+                std::print(std::cerr,"Check fail: res = {} / {} @ {}", c_res, rel_res, i);
                 ret = false;
             }
         });
diff --git a/test/Core/Equation/PeriodicEqnTest.cpp b/test/Core/Equation/PeriodicEqnTest.cpp
index 5042f586..8baa01b6 100644
--- a/test/Core/Equation/PeriodicEqnTest.cpp
+++ b/test/Core/Equation/PeriodicEqnTest.cpp
@@ -10,8 +10,9 @@
 //
 //  ----------------------------------------------------------------------------
 
-#include <OpFlow>
 #include <gmock/gmock.h>
+#include <print>
+import opflow;
 
 using namespace OpFlow;
 using namespace testing;
@@ -80,11 +81,11 @@ class PeriodicEqnTest : public Test {
             auto p_ref = p_true.evalAt(i);
             auto rel_res = std::abs(c_res) / std::abs(p_ref);
             if (std::isnan(c_res)) {
-                OP_ERROR("Check fail: res = nan @ {}", i);
+                std::print(std::cerr,"Check fail: res = nan @ {}", i);
                 ret = false;
             }
             if (rel_res > rel) {
-                OP_ERROR("Check fail: res = {} / {} @ {}", c_res, rel_res, i);
+                std::print(std::cerr,"Check fail: res = {} / {} @ {}", c_res, rel_res, i);
                 ret = false;
             }
         });
diff --git a/test/Core/Field/CartesianFieldMPITest.cpp b/test/Core/Field/CartesianFieldMPITest.cpp
index 288b505a..99f906f0 100644
--- a/test/Core/Field/CartesianFieldMPITest.cpp
+++ b/test/Core/Field/CartesianFieldMPITest.cpp
@@ -10,9 +10,10 @@
 //
 //  ----------------------------------------------------------------------------
 
-#include <OpFlow>
 #include <gmock/gmock.h>
 #include <tuple>
+#include <print>
+import opflow;
 
 using namespace OpFlow;
 
@@ -128,7 +129,7 @@ TEST_F(CartesianFieldMPITest, PeriodicValueCheck) {
     u.updatePadding();
     u_local.updatePadding();
     rangeFor_s(u.getLocalReadableRange(), [&](auto&& i) {
-        if (u[i] != u_local[i]) OP_INFO("Not equal at {} {} != {}", i, u[i], u_local[i]);
+        if (u[i] != u_local[i]) std::print("Not equal at {} {} != {}", i, u[i], u_local[i]);
         ASSERT_EQ(u[i], u_local[i]);
     });
 }
@@ -159,7 +160,7 @@ TEST_F(CartesianFieldMPITest, Serializable_PeriodicValueCheck) {
     rangeFor_s(u.getLocalWritableRange(), [&](auto&& i) { u[i] = Int {mapper(i)}; });
     u.updatePadding();
     rangeFor_s(u.getLocalReadableRange(), [&](auto&& i) {
-        if (u[i].i != mapper(i)) OP_INFO("Not equal at {} {} != {}", i, u[i].i, mapper(i));
+        if (u[i].i != mapper(i)) std::print("Not equal at {} {} != {}", i, u[i].i, mapper(i));
         ASSERT_EQ(u[i].i, mapper(i));
     });
 }
diff --git a/test/Core/Field/CartesianFieldTest.cpp b/test/Core/Field/CartesianFieldTest.cpp
index bd1d0b93..8873e041 100644
--- a/test/Core/Field/CartesianFieldTest.cpp
+++ b/test/Core/Field/CartesianFieldTest.cpp
@@ -10,8 +10,9 @@
 //
 //  ----------------------------------------------------------------------------
 
-#include <OpFlow>
 #include <gmock/gmock.h>
+#include <print>
+import opflow;
 
 using namespace OpFlow;
 
@@ -170,7 +171,7 @@ TEST_F(CartesianFieldTest, CenterPeriodicValueCheck) {
     rangeFor_s(u.getLocalWritableRange(), [&](auto&& i) { u[i] = i[1] * 10 + i[0]; });
     u.updatePadding();
     rangeFor_s(u.getLocalReadableRange(), [&](auto&& i) {
-        if (u[i] != (i[1] + 10) % 10 * 10 + (i[0] + 10) % 10) OP_ERROR("Not equal at {}", i);
+        if (u[i] != (i[1] + 10) % 10 * 10 + (i[0] + 10) % 10) std::print(std::cerr,"Not equal at {}", i);
         ASSERT_DOUBLE_EQ(u[i], (i[1] + 10) % 10 * 10 + (i[0] + 10) % 10);
     });
 }
\ No newline at end of file
diff --git a/test/Core/Loops/RangeForTest.cpp b/test/Core/Loops/RangeForTest.cpp
index 4032079c..e223785f 100644
--- a/test/Core/Loops/RangeForTest.cpp
+++ b/test/Core/Loops/RangeForTest.cpp
@@ -10,9 +10,9 @@
 //
 // ----------------------------------------------------------------------------
 
-#include <OpFlow>
 #include <gmock/gmock.h>
 #include <iostream>
+import opflow;
 
 using namespace OpFlow;
 using namespace testing;
diff --git a/test/Core/Loops/RangeReduceTest.cpp b/test/Core/Loops/RangeReduceTest.cpp
index 102eb8a8..962a5d43 100644
--- a/test/Core/Loops/RangeReduceTest.cpp
+++ b/test/Core/Loops/RangeReduceTest.cpp
@@ -10,9 +10,9 @@
 //
 // ----------------------------------------------------------------------------
 
-#include <OpFlow>
 #include <gmock/gmock.h>
 #include <vector>
+import opflow;
 
 using namespace OpFlow;
 using namespace testing;
diff --git a/test/Core/Mesh/CartesianMeshTest.cpp b/test/Core/Mesh/CartesianMeshTest.cpp
index 1b1a345f..f8ac56d7 100644
--- a/test/Core/Mesh/CartesianMeshTest.cpp
+++ b/test/Core/Mesh/CartesianMeshTest.cpp
@@ -10,15 +10,11 @@
 //
 // ----------------------------------------------------------------------------
 
-#include "Core/Mesh/Structured/CartesianMesh.hpp"
-#include "Core/BasicDataTypes.hpp"
-#include "Core/Mesh/Structured/CartesianMeshTrait.hpp"
-#include "Core/Mesh/Structured/CartesianMeshView.hpp"
-#include "Core/Mesh/Structured/CartesianMeshViewTrait.hpp"
-#include <fmt/format.h>
 #include <gmock/gmock.h>
 #include <iostream>
 
+import opflow;
+
 using namespace OpFlow;
 using namespace OpFlow::Meta;
 
diff --git a/test/Core/MetaTest.cpp b/test/Core/MetaTest.cpp
index 8ecb03d3..2f7ca618 100644
--- a/test/Core/MetaTest.cpp
+++ b/test/Core/MetaTest.cpp
@@ -10,9 +10,9 @@
 //
 // ----------------------------------------------------------------------------
 
-#include <OpFlow>
 #include <gmock/gmock.h>
 
+import opflow;
 using namespace OpFlow;
 
 TEST(MetaTest, StaticFor) {
@@ -39,10 +39,10 @@ TEST(MetaTest, StaticForStep2) {
 
 TEST(MetaTest, TupleSplit) {
     struct A {
-        A() { OP_INFO("A ctor"); }
-        A(const A&) { OP_INFO("A C-ctor"); }
-        A(A&&) { OP_INFO("A M-ctor"); }
-        ~A() { OP_INFO("~A()"); }
+        A() { }
+        A(const A&) { }
+        A(A&&) { }
+        ~A() { }
     };
     A a;
     auto t = std::forward_as_tuple(a, A(), a);
diff --git a/test/Core/Operator/ConditionalTest.cpp b/test/Core/Operator/ConditionalTest.cpp
index c056a6bf..6c15bfa9 100644
--- a/test/Core/Operator/ConditionalTest.cpp
+++ b/test/Core/Operator/ConditionalTest.cpp
@@ -10,8 +10,8 @@
 //
 //  ----------------------------------------------------------------------------
 
-#include <OpFlow>
 #include <gmock/gmock.h>
+import opflow;
 
 using namespace OpFlow;
 using namespace testing;
diff --git a/test/Core/Operator/ConvolutionTest.cpp b/test/Core/Operator/ConvolutionTest.cpp
index f7e3043d..6c726995 100644
--- a/test/Core/Operator/ConvolutionTest.cpp
+++ b/test/Core/Operator/ConvolutionTest.cpp
@@ -10,8 +10,8 @@
 //
 //  ----------------------------------------------------------------------------
 
-#include <OpFlow>
 #include <gmock/gmock.h>
+import opflow;
 
 using namespace OpFlow;
 using namespace testing;
diff --git a/test/Core/Operator/InterpolatorTest.cpp b/test/Core/Operator/InterpolatorTest.cpp
index eb3bfb19..fd8d703b 100644
--- a/test/Core/Operator/InterpolatorTest.cpp
+++ b/test/Core/Operator/InterpolatorTest.cpp
@@ -10,8 +10,9 @@
 //
 // ----------------------------------------------------------------------------
 
-#include <OpFlow>
 #include <gmock/gmock.h>
+#include <print>
+import opflow;
 
 using namespace OpFlow;
 using namespace testing;
@@ -162,7 +163,7 @@ TEST_F(Intp1DFluxLimiterCornerToCenterTest, ValueCheck) {
     auto t = d1IntpCornerToCenter<0, D1QUICK>(-v, u);
     t.prepare();
     rangeFor_s(t.accessibleRange, [&](auto&& i) {
-        OP_INFO("t = {}, v = {}, i = {}", t[i], v[i], i);
+        std::print("t = {}, v = {}, i = {}", t[i], v[i], i);
         ASSERT_NEAR(t[i], v[i], 1e-10);
     });
 }
\ No newline at end of file
diff --git a/test/Core/Parallel/EvenSplitStrategyTest.cpp b/test/Core/Parallel/EvenSplitStrategyTest.cpp
index d9f061f1..9c176cf0 100644
--- a/test/Core/Parallel/EvenSplitStrategyTest.cpp
+++ b/test/Core/Parallel/EvenSplitStrategyTest.cpp
@@ -12,8 +12,8 @@
 //
 //
 
-#include <OpFlow>
 #include <gmock/gmock.h>
+import opflow;
 
 using namespace OpFlow;
 using namespace testing;
diff --git a/test/Core/Parallel/MPITest.cpp b/test/Core/Parallel/MPITest.cpp
index ea03dc30..08b98212 100644
--- a/test/Core/Parallel/MPITest.cpp
+++ b/test/Core/Parallel/MPITest.cpp
@@ -1,8 +1,9 @@
-#include <OpFlow>
 #include <gmock/gmock.h>
+#include <print>
+import opflow;
 
 TEST(MPITest, RankTest) {
     auto rank = OpFlow::getWorkerId();
-    OP_INFO("My ID = {}", rank);
+    std::print("My ID = {}", rank);
     ASSERT_TRUE(true);
 }
\ No newline at end of file
diff --git a/test/Core/Parallel/ParticleGuidedSplitStrategyTest.cpp b/test/Core/Parallel/ParticleGuidedSplitStrategyTest.cpp
index 07a4fb90..12282265 100644
--- a/test/Core/Parallel/ParticleGuidedSplitStrategyTest.cpp
+++ b/test/Core/Parallel/ParticleGuidedSplitStrategyTest.cpp
@@ -10,8 +10,9 @@
 //
 //  ----------------------------------------------------------------------------
 
-#include <OpFlow>
 #include <gmock/gmock.h>
+#include <print>
+import opflow;
 
 using namespace OpFlow;
 using namespace testing;
@@ -65,7 +66,7 @@ TEST_F(ParticleGuidedSplitStrategyTest, DivisibleDimWithParticle) {
     strategy.setParticleLoad(100);
     // input nodal range, return centered range
     auto map = strategy.getSplitMap(range, plan);
-    for (auto& m : map) OP_INFO("{}", m.toString());
+    for (auto& m : map) std::print("{}", m.toString());
     ASSERT_TRUE((map[0] == DS::Range<2> {std::array {15, 13}}));
     ASSERT_TRUE((map[2] == DS::Range<2> {std::array {15, 0}, std::array {32, 16}}));
     ASSERT_TRUE((map[1] == DS::Range<2> {std::array {0, 13}, std::array {15, 32}}));
@@ -105,7 +106,7 @@ TEST_F(ParticleGuidedSplitStrategyTest, UnDivisibleDim) {
     strategy.setRefMesh(mesh);
     // input nodal range, return centered range
     auto map = strategy.getSplitMap(range, plan);
-    for (auto& m : map) OP_INFO("{}", m.toString());
+    for (auto& m : map) std::print("{}", m.toString());
     ASSERT_TRUE((map[0] == DS::Range<2> {std::array {17, 17}}));
     ASSERT_TRUE((map[2] == DS::Range<2> {std::array {17, 0}, std::array {33, 17}}));
     ASSERT_TRUE((map[1] == DS::Range<2> {std::array {0, 17}, std::array {17, 33}}));
@@ -165,7 +166,7 @@ TEST_F(ParticleGuidedSplitStrategyTest, WithOffset) {
     strategy.setRefMesh(mesh);
     // input nodal range, return centered range
     auto map = strategy.getSplitMap(range, plan);
-    for (auto& m : map) OP_INFO("{}", m.toString());
+    for (auto& m : map) std::print("{}", m.toString());
     ASSERT_TRUE((map[0] == DS::Range<2> {std::array {3, 3}, std::array {19, 19}}));
     ASSERT_TRUE((map[2] == DS::Range<2> {std::array {19, 3}, std::array {35, 19}}));
     ASSERT_TRUE((map[1] == DS::Range<2> {std::array {3, 19}, std::array {19, 35}}));
diff --git a/test/DataStructures/Arrays/PlainTensorTest.cpp b/test/DataStructures/Arrays/PlainTensorTest.cpp
index c72edfe8..c0b2ad7d 100644
--- a/test/DataStructures/Arrays/PlainTensorTest.cpp
+++ b/test/DataStructures/Arrays/PlainTensorTest.cpp
@@ -10,9 +10,8 @@
 //
 // ----------------------------------------------------------------------------
 
-#include "DataStructures/Arrays/Tensor/PlainTensor.hpp"
-#include "DataStructures/Index/MDIndex.hpp"
 #include <gmock/gmock.h>
+import opflow;
 
 using namespace OpFlow;
 using namespace OpFlow::DS;
diff --git a/test/DataStructures/Index/BlockedMDRangeMapperTest.cpp b/test/DataStructures/Index/BlockedMDRangeMapperTest.cpp
index 72b7a8e7..b4cea23e 100644
--- a/test/DataStructures/Index/BlockedMDRangeMapperTest.cpp
+++ b/test/DataStructures/Index/BlockedMDRangeMapperTest.cpp
@@ -10,8 +10,8 @@
 //
 //  ----------------------------------------------------------------------------
 
-#include <OpFlow>
 #include <gmock/gmock.h>
+import opflow;
 
 using namespace OpFlow;
 using namespace testing;
diff --git a/test/DataStructures/Index/ColoredBlockedMDRangeMapperTest.cpp b/test/DataStructures/Index/ColoredBlockedMDRangeMapperTest.cpp
index f5a35d4b..b1beff7d 100644
--- a/test/DataStructures/Index/ColoredBlockedMDRangeMapperTest.cpp
+++ b/test/DataStructures/Index/ColoredBlockedMDRangeMapperTest.cpp
@@ -10,8 +10,8 @@
 //
 //  ----------------------------------------------------------------------------
 
-#include <OpFlow>
 #include <gmock/gmock.h>
+import opflow;
 
 using namespace OpFlow;
 using namespace testing;
diff --git a/test/DataStructures/Index/MDIndexTest.cpp b/test/DataStructures/Index/MDIndexTest.cpp
index 67470fe8..a6d6cfef 100644
--- a/test/DataStructures/Index/MDIndexTest.cpp
+++ b/test/DataStructures/Index/MDIndexTest.cpp
@@ -10,8 +10,8 @@
 //
 // ----------------------------------------------------------------------------
 
-#include "DataStructures/Index/MDIndex.hpp"
 #include <gmock/gmock.h>
+import opflow;
 
 using namespace OpFlow;
 
diff --git a/test/DataStructures/StencilPadTest.cpp b/test/DataStructures/StencilPadTest.cpp
index b618dc05..cdfe0b2e 100644
--- a/test/DataStructures/StencilPadTest.cpp
+++ b/test/DataStructures/StencilPadTest.cpp
@@ -10,8 +10,8 @@
 //
 // ----------------------------------------------------------------------------
 
-#include <OpFlow>
 #include <gmock/gmock.h>
+import opflow;
 
 using namespace OpFlow;
 using namespace testing;
diff --git a/test/Utils/HDF5StreamMPITest.cpp b/test/Utils/HDF5StreamMPITest.cpp
index c41ed36f..d7e65678 100644
--- a/test/Utils/HDF5StreamMPITest.cpp
+++ b/test/Utils/HDF5StreamMPITest.cpp
@@ -10,8 +10,9 @@
 //
 //  ----------------------------------------------------------------------------
 
-#include <OpFlow>
 #include <gmock/gmock.h>
+#include <print>
+import opflow;
 
 using namespace OpFlow;
 
@@ -79,7 +80,7 @@ TEST_F(H5RWMPITest, ReadAfterWrite) {
     Utils::H5Stream istream(filename, StreamIn);
     istream >> v;
     rangeFor_s(u.getLocalReadableRange(), [&](auto i) {
-        if (u[i] != v[i]) OP_ERROR("NOT EQUAL AT {}", i);
+        if (u[i] != v[i]) std::print(std::cerr,"NOT EQUAL AT {}", i);
         ASSERT_EQ(u[i], v[i]);
     });
 }
@@ -137,7 +138,7 @@ TEST_F(H5RWMPITest, GeneralSplitWite) {
     Utils::H5Stream stream("./u.general.split.h5");
     stream << Utils::TimeStamp(0) << u;
     u.resplitWithStrategy(s.get());
-    OP_INFO("local range = {}", u.localRange.toString());
+    std::print("local range = {}", u.localRange.toString());
     stream << Utils::TimeStamp(1.) << u;
     u.initBy([](auto&& x) { return getWorkerId(); });
     stream << Utils::TimeStamp(2) << u;
diff --git a/test/Utils/HDF5StreamTest.cpp b/test/Utils/HDF5StreamTest.cpp
index ba9f508d..12228e12 100644
--- a/test/Utils/HDF5StreamTest.cpp
+++ b/test/Utils/HDF5StreamTest.cpp
@@ -10,8 +10,8 @@
 //
 //  ----------------------------------------------------------------------------
 
-#include <OpFlow>
 #include <gmock/gmock.h>
+import opflow;
 
 using namespace OpFlow;
 
diff --git a/test/Utils/IOGroupTest.cpp b/test/Utils/IOGroupTest.cpp
index ba4981ce..0063d017 100644
--- a/test/Utils/IOGroupTest.cpp
+++ b/test/Utils/IOGroupTest.cpp
@@ -10,8 +10,8 @@
 //
 //  ----------------------------------------------------------------------------
 
-#include <OpFlow>
 #include <gmock/gmock.h>
+import opflow;
 
 using namespace OpFlow;
 
diff --git a/test/Utils/TecplotStreamMPITest.cpp b/test/Utils/TecplotStreamMPITest.cpp
index 0647b49e..22c931f4 100644
--- a/test/Utils/TecplotStreamMPITest.cpp
+++ b/test/Utils/TecplotStreamMPITest.cpp
@@ -10,8 +10,8 @@
 //
 //  ----------------------------------------------------------------------------
 
-#include <OpFlow>
 #include <gmock/gmock.h>
+import opflow;
 
 class TecIOMPITest : public virtual testing::Test {
 protected:
diff --git a/test/Utils/TecplotStreamTest.cpp b/test/Utils/TecplotStreamTest.cpp
index 157f694d..17be151a 100644
--- a/test/Utils/TecplotStreamTest.cpp
+++ b/test/Utils/TecplotStreamTest.cpp
@@ -10,8 +10,8 @@
 //
 //  ----------------------------------------------------------------------------
 
-#include <OpFlow>
 #include <gmock/gmock.h>
+import opflow;
 
 TEST(TecIOTest, BinaryTest) {
     using namespace OpFlow;
diff --git a/test/test_main_mpi.cpp b/test/test_main_mpi.cpp
index 14eb6d28..d430daf8 100644
--- a/test/test_main_mpi.cpp
+++ b/test/test_main_mpi.cpp
@@ -11,8 +11,8 @@
 //  ----------------------------------------------------------------------------
 
 #include "gtest-mpi-listener.hpp"
-#include <OpFlow>
 #include <gmock/gmock.h>
+import opflow;
 
 int main(int argc, char** argv) {
     // Filter out Google Test arguments

From 9237ced3040b76d5e6aaa2c4a3d44d2ae867dfc0 Mon Sep 17 00:00:00 2001
From: Luohao Wang <luohaothu@live.com>
Date: Tue, 10 Jun 2025 00:26:15 +0800
Subject: [PATCH 29/31] [Core] Pass all test

---
 src/Core/Interfaces/Stringifiable.hpp   |  1 +
 src/DataStructures/Matrix/CSRMatrix.hpp | 22 +++++++++++++++-------
 test/Core/CMakeLists.txt                |  3 +++
 test/DataStructures/CMakeLists.txt      |  6 ++++--
 4 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/Core/Interfaces/Stringifiable.hpp b/src/Core/Interfaces/Stringifiable.hpp
index 2526a45a..1114fce5 100644
--- a/src/Core/Interfaces/Stringifiable.hpp
+++ b/src/Core/Interfaces/Stringifiable.hpp
@@ -36,6 +36,7 @@ OPFLOW_MODULE_EXPORT namespace OpFlow {
     concept Stringifiable = std::is_base_of_v<StringifiableObj, T>;
 }// namespace OpFlow
 
+OPFLOW_MODULE_EXPORT
 template <typename T>
     requires std::derived_from<T, OpFlow::StringifiableObj>
 struct std::formatter<T> : std::formatter<std::string> {
diff --git a/src/DataStructures/Matrix/CSRMatrix.hpp b/src/DataStructures/Matrix/CSRMatrix.hpp
index e932a3a8..f219dcb5 100644
--- a/src/DataStructures/Matrix/CSRMatrix.hpp
+++ b/src/DataStructures/Matrix/CSRMatrix.hpp
@@ -108,19 +108,27 @@ OPFLOW_MODULE_EXPORT namespace OpFlow::DS {
                 max_val_width = std::max(max_val_width, (int) std::formatted_size("{}", v));
             }
             max_val_width = std::min(max_val_width, 10);
+            max_val_width = std::max(max_val_width, 6);
             for (int irow = 0; irow < row.size() - 1; ++irow) {
-                ret += std::format("row {:>{}}: [{:>{}}, {:> {}.4E}] ", irow, max_rank_width, col[row[irow]],
-                                   max_col_width, val[row[irow]], max_val_width);
+                // fixme: gcc 15.1.0 formatting with floating point is not working properly
+                // ret += std::format("row {:>{}}: [{:>{}}, {:>{}.4E}] ", irow, max_rank_width, col[row[irow]],
+                //                    max_col_width, val[row[irow]], max_val_width);
+                ret += std::format("row {:>{}}: [{:>{}}, {:>}] ", irow, max_rank_width, col[row[irow]],
+                                   max_col_width, val[row[irow]]);
                 for (int icol = row[irow] + 1; icol < row[irow + 1]; ++icol) {
-                    ret += std::format("[{:>{}}, {:> {}.4E}] ", col[icol], max_col_width, val[icol],
-                                       max_val_width);
+                    // ret += std::format("[{:>{}}, {:> {}.4E}] ", col[icol], max_col_width, val[icol],
+                    //                    max_val_width);
+                    ret += std::format("[{:>{}}, {:>}] ", col[icol], max_col_width, val[icol]);
                 }
                 for (int icol = row[irow + 1]; icol < row[irow] + max_nnz_per_row; ++icol) {
-                    ret += std::string(std::formatted_size("[{:>{}}, {:> {}.4E}] ", 0, max_col_width, 1.0,
-                                                           max_val_width),
+                    // ret += std::string(std::formatted_size("[{:>{}}, {:> {}.4E}] ", 0, max_col_width, 1.0,
+                    //                                        max_val_width),
+                    //                    ' ');
+                    ret += std::string(std::formatted_size("[{:>{}}, {:>}] ", 0, max_col_width, 1.0, max_val_width),
                                        ' ');
                 }
-                ret += std::format("rhs: {:> {}.4E}\n", rhs[irow], max_val_width);
+                // ret += std::format("rhs: {:> {}.4E}\n", rhs[irow], max_val_width);
+                ret += std::format("rhs: {:>}\n", rhs[irow]);
             }
             return ret;
         }
diff --git a/test/Core/CMakeLists.txt b/test/Core/CMakeLists.txt
index 51a1546f..54ce041f 100644
--- a/test/Core/CMakeLists.txt
+++ b/test/Core/CMakeLists.txt
@@ -37,8 +37,11 @@ add_gmock(RangeForTest ${CMAKE_CURRENT_LIST_DIR}/Loops/RangeForTest.cpp)
 add_gmock(RangeReduceTest ${CMAKE_CURRENT_LIST_DIR}/Loops/RangeReduceTest.cpp)
 
 # Parallel
+if (NOT OPFLOW_ENABLE_MODULE)
+# fixme: this test depends on the macro OPFLOW_TEST_ENVIRONMENT
 add_gmock(EvenSplitStrategyTest ${CMAKE_CURRENT_LIST_DIR}/Parallel/EvenSplitStrategyTest.cpp)
 add_gmock(ParticleGuidedSplitStrategyTest ${CMAKE_CURRENT_LIST_DIR}/Parallel/ParticleGuidedSplitStrategyTest.cpp)
+endif()
 add_gmock_mpi(MPITest 16 ${CMAKE_CURRENT_LIST_DIR}/Parallel/MPITest.cpp)
 
 # Equation
diff --git a/test/DataStructures/CMakeLists.txt b/test/DataStructures/CMakeLists.txt
index 84e71381..755b62c2 100644
--- a/test/DataStructures/CMakeLists.txt
+++ b/test/DataStructures/CMakeLists.txt
@@ -22,5 +22,7 @@ add_gmock(MDIndexTest ${CMAKE_CURRENT_SOURCE_DIR}/Index/MDIndexTest.cpp)
 add_gmock(StencilPadTest ${CMAKE_CURRENT_LIST_DIR}/StencilPadTest.cpp)
 
 # Mappers
-add_gmock(BlockedMDRangeMapperTest ${CMAKE_CURRENT_LIST_DIR}/Index/BlockedMDRangeMapperTest.cpp)
-add_gmock(ColoredBlockedMDRangeMapperTest ${CMAKE_CURRENT_LIST_DIR}/Index/ColoredBlockedMDRangeMapperTest.cpp)
\ No newline at end of file
+if(NOT OPFLOW_ENABLE_MODULE)
+    add_gmock(BlockedMDRangeMapperTest ${CMAKE_CURRENT_LIST_DIR}/Index/BlockedMDRangeMapperTest.cpp)
+    add_gmock(ColoredBlockedMDRangeMapperTest ${CMAKE_CURRENT_LIST_DIR}/Index/ColoredBlockedMDRangeMapperTest.cpp)
+endif()

From 9296146f479676a04853a69df05a1c8890a84e8b Mon Sep 17 00:00:00 2001
From: Luohao Wang <luohaothu@live.com>
Date: Tue, 10 Jun 2025 22:35:28 +0800
Subject: [PATCH 30/31] [CI] Add dockerfile for testing

---
 .github/workflows/docker-build.yml | 39 ++++++++++++++++++++++
 scripts/Dockerfile                 | 53 ++++++++++++++++++++++++++++++
 2 files changed, 92 insertions(+)
 create mode 100644 .github/workflows/docker-build.yml
 create mode 100644 scripts/Dockerfile

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
new file mode 100644
index 00000000..d64e620c
--- /dev/null
+++ b/.github/workflows/docker-build.yml
@@ -0,0 +1,39 @@
+name: Build and Push GCC Docker image
+
+on:
+  schedule:
+    # 每天 UTC 0点运行（对应北京时间 8点）
+    - cron: '0 0 * * *'
+  workflow_dispatch:  # 允许手动触发
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+    
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+      
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v3
+      
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+      
+    - name: Login to Docker Hub
+      uses: docker/login-action@v3
+      with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
+        
+    - name: Build and push
+      uses: docker/build-push-action@v5
+      with:
+        context: ./scripts
+        file: ./scripts/Dockerfile
+        push: true
+        tags: |
+          luohaothu/gcc-trunk:latest
+          luohaothu/gcc-trunk:${{ github.run_number }}
+        cache-from: type=registry,ref=luohaothu/gcc-trunk:latest
+        cache-to: type=inline
\ No newline at end of file
diff --git a/scripts/Dockerfile b/scripts/Dockerfile
new file mode 100644
index 00000000..33996639
--- /dev/null
+++ b/scripts/Dockerfile
@@ -0,0 +1,53 @@
+# 使用 Ubuntu 24.04 作为基础镜像
+FROM ubuntu:24.04
+
+# 设置非交互式安装
+ENV DEBIAN_FRONTEND=noninteractive
+
+# 安装编译 GCC 所需的依赖
+RUN apt-get update && apt-get install -y \
+    wget \
+    git \
+    make \
+    flex \
+    bison \
+    build-essential \
+    libgmp-dev \
+    libmpc-dev \
+    libmpfr-dev \
+    texinfo \
+    zlib1g-dev \
+    libisl-dev \
+    && rm -rf /var/lib/apt/lists/*
+
+# 设置工作目录
+WORKDIR /gcc-build
+
+# 克隆 GCC 源码
+RUN git clone --depth 1 git://gcc.gnu.org/git/gcc.git gcc-source
+
+# 创建编译目录
+RUN mkdir gcc-build
+
+# 设置编译参数并开始编译安装
+WORKDIR /gcc-build/gcc-build
+RUN ../gcc-source/configure \
+    --disable-multilib \
+    --enable-languages=c,c++,fortran \
+    --prefix=/usr/local \
+    && make -j$(nproc) \
+    && make install
+
+# 设置环境变量
+ENV PATH="/usr/local/bin:${PATH}"
+ENV LD_LIBRARY_PATH="/usr/local/lib64:${LD_LIBRARY_PATH}"
+
+# 验证安装
+RUN gcc --version && g++ --version && gfortran --version
+
+# 清理编译文件以减小镜像大小
+WORKDIR /
+RUN rm -rf /gcc-build
+
+# 设置默认工作目录
+WORKDIR /workspace
\ No newline at end of file

From c3e7a622bfe3363951e62c08f5509238f7034274 Mon Sep 17 00:00:00 2001
From: OpFlow-Guardian <guardian@opflow.git>
Date: Tue, 10 Jun 2025 14:36:55 +0000
Subject: [PATCH 31/31] [CI] Code auto formatted

---
 CMakeLists.txt                                |    2 +-
 external/hypre/src/seq_mv/seq_mv.hpp          |   56 +-
 .../hypre/src/struct_mv/_hypre_struct_mv.hpp  | 1891 +++----
 .../hypre/src/utilities/_hypre_onedpl.hpp     |  342 +-
 .../hypre/src/utilities/_hypre_utilities.hpp  | 3763 ++++++-------
 .../blocked_nd_range_ctad_example.cpp         |    4 +-
 .../examples/custom_mutex_chmap_example.cpp   |   25 +-
 ..._expressing_graphs_preview_api_example.cpp |   17 +-
 ..._expressing_graphs_regular_api_example.cpp |    4 +-
 .../examples/make_edges_function_example.cpp  |    4 +-
 .../malloc_replacement_log_example.cpp        |    6 +-
 .../memory_pool_allocator_example.cpp         |    2 +-
 .../examples/parallel_phase_example.cpp       |   25 +-
 ...parallel_sort_ranges_extension_example.cpp |    6 +-
 .../main/reference/examples/rvalue_reduce.cpp |   34 +-
 .../examples/try_put_and_wait_example.cpp     |   12 +-
 .../examples/blocked_nd_range_example.cpp     |   55 +-
 .../examples/flow_graph_examples.cpp          |   34 +-
 .../parallel_for_lambda_example_1.cpp         |   11 +-
 .../parallel_for_lambda_example_2.cpp         |    4 +-
 .../examples/parallel_for_os_example.cpp      |   14 +-
 .../snippets/blocked_nd_range_example.cpp     |   18 +-
 .../snippets/flow_graph_examples.cpp          |   34 +-
 external/tbb/python/rml/ipc_server.cpp        | 1833 ++++---
 external/tbb/python/rml/ipc_utils.cpp         |  202 +-
 external/tbb/src/tbb/address_waiter.cpp       |  162 +-
 external/tbb/src/tbb/allocator.cpp            |  365 +-
 external/tbb/src/tbb/arena.cpp                | 1734 +++---
 external/tbb/src/tbb/arena_slot.cpp           |  376 +-
 .../tbb/src/tbb/concurrent_bounded_queue.cpp  |  130 +-
 external/tbb/src/tbb/dynamic_link.cpp         |  695 ++-
 external/tbb/src/tbb/exception.cpp            |  249 +-
 external/tbb/src/tbb/global_control.cpp       |  476 +-
 external/tbb/src/tbb/governor.cpp             |  925 ++--
 external/tbb/src/tbb/itt_notify.cpp           |   56 +-
 external/tbb/src/tbb/main.cpp                 |  236 +-
 external/tbb/src/tbb/market.cpp               |  232 +-
 external/tbb/src/tbb/misc.cpp                 |  177 +-
 external/tbb/src/tbb/misc_ex.cpp              |  612 +--
 external/tbb/src/tbb/observer_proxy.cpp       |  525 +-
 external/tbb/src/tbb/parallel_pipeline.cpp    |  847 ++-
 external/tbb/src/tbb/private_server.cpp       |  678 +--
 external/tbb/src/tbb/profiling.cpp            |  436 +-
 external/tbb/src/tbb/queuing_rw_mutex.cpp     | 1173 +++--
 external/tbb/src/tbb/rml_tbb.cpp              |  122 +-
 external/tbb/src/tbb/rtm_mutex.cpp            |  174 +-
 external/tbb/src/tbb/rtm_rw_mutex.cpp         |  483 +-
 external/tbb/src/tbb/semaphore.cpp            |  127 +-
 external/tbb/src/tbb/small_object_pool.cpp    |  257 +-
 external/tbb/src/tbb/task.cpp                 |  425 +-
 external/tbb/src/tbb/task_dispatcher.cpp      |  428 +-
 external/tbb/src/tbb/task_group_context.cpp   |  548 +-
 external/tbb/src/tbb/tcm_adaptor.cpp          |  519 +-
 external/tbb/src/tbb/thread_dispatcher.cpp    |  404 +-
 .../tbb/src/tbb/thread_request_serializer.cpp |  247 +-
 external/tbb/src/tbb/threading_control.cpp    |  787 +--
 external/tbb/src/tbb/version.cpp              |    4 +-
 external/tbb/src/tbbbind/tbb_bind.cpp         |  999 ++--
 external/tbb/src/tbbmalloc/backend.cpp        | 2691 +++++-----
 external/tbb/src/tbbmalloc/backref.cpp        |  640 +--
 external/tbb/src/tbbmalloc/frontend.cpp       | 4647 ++++++++---------
 external/tbb/src/tbbmalloc/large_objects.cpp  | 1870 ++++---
 external/tbb/src/tbbmalloc/tbbmalloc.cpp      |  105 +-
 .../tbbmalloc_proxy/function_replacement.cpp  |  303 +-
 external/tbb/src/tbbmalloc_proxy/proxy.cpp    |  589 +--
 .../conformance/conformance_allocators.cpp    |   13 +-
 .../conformance_arena_constraints.cpp         |   27 +-
 .../conformance/conformance_async_node.cpp    |   78 +-
 .../conformance_blocked_nd_range.cpp          |  149 +-
 .../conformance/conformance_blocked_range.cpp |   93 +-
 .../conformance_blocked_range2d.cpp           |  147 +-
 .../conformance_blocked_range3d.cpp           |  217 +-
 .../conformance_blocked_rangeNd.cpp           |  131 +-
 .../conformance_broadcast_node.cpp            |   20 +-
 .../conformance/conformance_buffer_node.cpp   |   18 +-
 .../conformance_collaborative_call_once.cpp   |   64 +-
 .../conformance/conformance_combinable.cpp    |  232 +-
 .../conformance_composite_node.cpp            |   93 +-
 .../conformance_concurrent_hash_map.cpp       | 1089 ++--
 .../conformance_concurrent_lru_cache.cpp      |   36 +-
 .../conformance_concurrent_map.cpp            |  103 +-
 .../conformance_concurrent_priority_queue.cpp |  244 +-
 .../conformance_concurrent_queue.cpp          |  963 ++--
 .../conformance_concurrent_set.cpp            |   73 +-
 .../conformance_concurrent_unordered_map.cpp  |  133 +-
 .../conformance_concurrent_unordered_set.cpp  |  124 +-
 .../conformance_concurrent_vector.cpp         | 1263 ++---
 .../conformance/conformance_continue_node.cpp |   66 +-
 ...conformance_enumerable_thread_specific.cpp |  762 +--
 .../conformance/conformance_function_node.cpp |   71 +-
 .../conformance_global_control.cpp            |  196 +-
 .../test/conformance/conformance_graph.cpp    |   84 +-
 .../conformance/conformance_indexer_node.cpp  |   74 +-
 .../conformance/conformance_input_node.cpp    |   84 +-
 .../conformance/conformance_join_node.cpp     |  128 +-
 .../conformance/conformance_limiter_node.cpp  |  113 +-
 .../conformance_multifunction_node.cpp        |   76 +-
 .../test/conformance/conformance_mutex.cpp    |   31 +-
 .../conformance_overwrite_node.cpp            |   27 +-
 .../conformance/conformance_parallel_for.cpp  |  236 +-
 .../conformance_parallel_for_each.cpp         |   54 +-
 .../conformance_parallel_invoke.cpp           |   80 +-
 .../conformance_parallel_pipeline.cpp         |  426 +-
 .../conformance_parallel_reduce.cpp           |  171 +-
 .../conformance/conformance_parallel_scan.cpp |  111 +-
 .../conformance/conformance_parallel_sort.cpp |   47 +-
 .../conformance_priority_queue_node.cpp       |   12 +-
 .../conformance/conformance_queue_node.cpp    |   17 +-
 .../conformance_resumable_tasks.cpp           |    2 +-
 .../conformance_sequencer_node.cpp            |   64 +-
 .../conformance/conformance_split_node.cpp    |   47 +-
 .../conformance/conformance_task_arena.cpp    |   91 +-
 .../conformance/conformance_task_group.cpp    |  212 +-
 .../conformance_task_group_context.cpp        |   11 +-
 .../conformance/conformance_tick_count.cpp    |   15 +-
 .../test/conformance/conformance_version.cpp  |   10 +-
 .../conformance_write_once_node.cpp           |   21 +-
 external/tbb/test/tbb/test_adaptive_mutex.cpp |   14 +-
 external/tbb/test/tbb/test_allocators.cpp     |   37 +-
 .../tbb/test/tbb/test_arena_constraints.cpp   |   91 +-
 .../tbb/test/tbb/test_arena_priorities.cpp    |  500 +-
 external/tbb/test/tbb/test_async_node.cpp     |  593 +--
 external/tbb/test/tbb/test_blocked_range.cpp  |  141 +-
 external/tbb/test/tbb/test_broadcast_node.cpp |  268 +-
 external/tbb/test/tbb/test_buffer_node.cpp    |  335 +-
 .../test/tbb/test_collaborative_call_once.cpp |  108 +-
 external/tbb/test/tbb/test_composite_node.cpp |  439 +-
 .../tbb/test/tbb/test_concurrent_hash_map.cpp |  560 +-
 .../test/tbb/test_concurrent_lru_cache.cpp    |   68 +-
 external/tbb/test/tbb/test_concurrent_map.cpp |   90 +-
 .../tbb/test/tbb/test_concurrent_monitor.cpp  |   37 +-
 .../tbb/test_concurrent_priority_queue.cpp    |   98 +-
 .../tbb/test/tbb/test_concurrent_queue.cpp    |  120 +-
 .../tbb/test_concurrent_queue_whitebox.cpp    |   18 +-
 external/tbb/test/tbb/test_concurrent_set.cpp |   84 +-
 .../tbb/test_concurrent_unordered_map.cpp     |  121 +-
 .../tbb/test_concurrent_unordered_set.cpp     |   89 +-
 .../tbb/test/tbb/test_concurrent_vector.cpp   |  482 +-
 external/tbb/test/tbb/test_continue_node.cpp  |  358 +-
 external/tbb/test/tbb/test_dynamic_link.cpp   |   32 +-
 external/tbb/test/tbb/test_eh_algorithms.cpp  |  918 ++--
 external/tbb/test/tbb/test_eh_flow_graph.cpp  | 1869 ++++---
 external/tbb/test/tbb/test_eh_thread.cpp      |   37 +-
 .../tbb/test_enumerable_thread_specific.cpp   |  339 +-
 .../test/tbb/test_environment_whitebox.cpp    |   42 +-
 external/tbb/test/tbb/test_flow_graph.cpp     |  210 +-
 .../test/tbb/test_flow_graph_priorities.cpp   | 1219 +++--
 .../tbb/test/tbb/test_flow_graph_whitebox.cpp |  613 ++-
 external/tbb/test/tbb/test_function_node.cpp  |  631 ++-
 external/tbb/test/tbb/test_fuzzing.cpp        |   24 +-
 external/tbb/test/tbb/test_global_control.cpp |  163 +-
 external/tbb/test/tbb/test_handle_perror.cpp  |   24 +-
 external/tbb/test/tbb/test_hw_concurrency.cpp |   37 +-
 .../tbb/test_implicit_linkage_on_windows.cpp  |    6 +-
 external/tbb/test/tbb/test_indexer_node.cpp   |  511 +-
 external/tbb/test/tbb/test_input_node.cpp     |  211 +-
 external/tbb/test/tbb/test_intrusive_list.cpp |   55 +-
 external/tbb/test/tbb/test_join_node.cpp      |   57 +-
 .../test/tbb/test_join_node_key_matching.cpp  |  107 +-
 .../test_join_node_key_matching_n_args.cpp    |    2 +-
 .../tbb/test_join_node_msg_key_matching.cpp   |   31 +-
 ...test_join_node_msg_key_matching_n_args.cpp |   20 +-
 .../tbb/test/tbb/test_join_node_preview.cpp   |  162 +-
 external/tbb/test/tbb/test_limiter_node.cpp   |  496 +-
 .../tbb/test/tbb/test_multifunction_node.cpp  |  518 +-
 external/tbb/test/tbb/test_mutex.cpp          |   75 +-
 external/tbb/test/tbb/test_numa_dist.cpp      |   96 +-
 external/tbb/test/tbb/test_openmp.cpp         |   77 +-
 external/tbb/test/tbb/test_overwrite_node.cpp |  230 +-
 external/tbb/test/tbb/test_parallel_for.cpp   |  444 +-
 .../tbb/test/tbb/test_parallel_for_each.cpp   |  120 +-
 .../tbb/test/tbb/test_parallel_invoke.cpp     |   24 +-
 external/tbb/test/tbb/test_parallel_phase.cpp |  227 +-
 .../tbb/test/tbb/test_parallel_pipeline.cpp   |  588 ++-
 .../tbb/test/tbb/test_parallel_reduce.cpp     |  642 +--
 external/tbb/test/tbb/test_parallel_scan.cpp  |  411 +-
 external/tbb/test/tbb/test_parallel_sort.cpp  |  194 +-
 external/tbb/test/tbb/test_partitioner.cpp    |  227 +-
 .../tbb/test/tbb/test_priority_queue_node.cpp |  319 +-
 external/tbb/test/tbb/test_profiling.cpp      |   62 +-
 external/tbb/test/tbb/test_queue_node.cpp     |  410 +-
 .../tbb/test/tbb/test_resumable_tasks.cpp     |  121 +-
 external/tbb/test/tbb/test_scheduler_mix.cpp  |  318 +-
 external/tbb/test/tbb/test_semaphore.cpp      |  120 +-
 external/tbb/test/tbb/test_sequencer_node.cpp |  357 +-
 external/tbb/test/tbb/test_split_node.cpp     |  324 +-
 external/tbb/test/tbb/test_tagged_msg.cpp     |  203 +-
 external/tbb/test/tbb/test_task.cpp           |  438 +-
 external/tbb/test/tbb/test_task_arena.cpp     | 1100 ++--
 external/tbb/test/tbb/test_task_group.cpp     |  747 ++-
 external/tbb/test/tbb/test_tbb_fork.cpp       |  141 +-
 external/tbb/test/tbb/test_tbb_header.cpp     |  380 +-
 .../test/tbb/test_tbb_header_secondary.cpp    |    9 +-
 external/tbb/test/tbb/test_tick_count.cpp     |   12 +-
 .../tbb/test/tbb/test_write_once_node.cpp     |  240 +-
 .../tbb/test/tbbmalloc/test_malloc_atexit.cpp |   57 +-
 .../test/tbbmalloc/test_malloc_compliance.cpp |  868 ++-
 .../tbbmalloc/test_malloc_init_shutdown.cpp   |   69 +-
 .../test/tbbmalloc/test_malloc_lib_unload.cpp |  139 +-
 .../tbbmalloc/test_malloc_new_handler.cpp     |   14 +-
 .../test/tbbmalloc/test_malloc_overload.cpp   |  231 +-
 .../test_malloc_overload_disable.cpp          |   21 +-
 .../tbb/test/tbbmalloc/test_malloc_pools.cpp  |  563 +-
 .../test/tbbmalloc/test_malloc_regression.cpp |  121 +-
 .../tbbmalloc/test_malloc_shutdown_hang.cpp   |   49 +-
 .../tbbmalloc/test_malloc_used_by_lib.cpp     |   59 +-
 .../test/tbbmalloc/test_malloc_whitebox.cpp   |  865 ++-
 .../tbbmalloc/test_scalable_allocator.cpp     |  166 +-
 scripts/update_copyright.sh                   |    2 +-
 src/Core/AMR/AMRGen.hpp                       |    2 +-
 src/Core/BC/BCBase.hpp                        |    2 +-
 src/Core/BC/DircBC.hpp                        |    8 +-
 src/Core/BC/InternalBC.hpp                    |    2 +-
 src/Core/BC/LogicalBC.hpp                     |    2 +-
 src/Core/BC/NeumBC.hpp                        |    8 +-
 src/Core/BC/ProxyBC.hpp                       |    2 +-
 src/Core/BasicDataTypes.hpp                   |    2 +-
 src/Core/Constants.hpp                        |    2 +-
 src/Core/Environment.hpp                      |   12 +-
 src/Core/Equation/AMGCLBackend.hpp            |    2 +-
 src/Core/Equation/AMGCLEqnSolveHandler.hpp    |   12 +-
 src/Core/Equation/CSRMatrixGenerator.hpp      |    2 +-
 src/Core/Equation/EqnSolveHandler.hpp         |    2 +-
 src/Core/Equation/Equation.hpp                |    2 +-
 src/Core/Equation/EquationHolder.hpp          |   10 +-
 src/Core/Equation/HYPREEqnSolveHandler.hpp    |    4 +-
 src/Core/Equation/StencilHolder.hpp           |    4 +-
 src/Core/Equation/UnifiedSolve.hpp            |    4 +-
 src/Core/Expr/Expr.hpp                        |   68 +-
 src/Core/Expr/ExprTrait.hpp                   |    2 +-
 src/Core/Expr/Expression.hpp                  |    4 +-
 src/Core/Expr/ScalarExpr.hpp                  |    5 +-
 src/Core/Expr/ScalarExprTrait.hpp             |    2 +-
 .../Field/Analytical/AnalyticalFieldExpr.hpp  |    2 +-
 src/Core/Field/FieldExpr.hpp                  |    2 +-
 src/Core/Field/FieldExprTrait.hpp             |    2 +-
 .../Field/MeshBased/MeshBasedFieldExpr.hpp    |    2 +-
 .../MeshBased/MeshBasedFieldExprTrait.hpp     |    2 +-
 .../MeshBased/SemiStructured/CartAMRField.hpp |    2 +-
 .../SemiStructured/CartAMRFieldExpr.hpp       |    2 +-
 .../SemiStructured/CartAMRFieldExprTrait.hpp  |    2 +-
 .../SemiStructured/CartAMRFieldTrait.hpp      |    2 +-
 .../SemiStructuredFieldExpr.hpp               |    2 +-
 .../SemiStructuredFieldExprTrait.hpp          |    2 +-
 src/Core/Field/MeshBased/StencilField.hpp     |   27 +-
 .../Field/MeshBased/StencilFieldTrait.hpp     |    2 +-
 .../MeshBased/Structured/CartesianField.hpp   |   30 +-
 .../Structured/CartesianFieldExpr.hpp         |    2 +-
 .../Structured/CartesianFieldExprTrait.hpp    |    2 +-
 .../Structured/CartesianFieldTrait.hpp        |    2 +-
 .../Structured/StructuredFieldExpr.hpp        |    2 +-
 .../Structured/StructuredFieldExprTrait.hpp   |    2 +-
 .../UnStructured/UnStructMBFieldExpr.hpp      |    2 +-
 .../Field/ParticleBased/ParticleFieldExpr.hpp |    2 +-
 src/Core/Interfaces/MDIndexable.hpp           |    2 +-
 src/Core/Interfaces/Serializable.hpp          |    9 +-
 src/Core/Interfaces/Stringifiable.hpp         |    6 +-
 src/Core/Loops/FieldAssigner.hpp              |    2 +-
 src/Core/Loops/RangeFor.hpp                   |    6 +-
 src/Core/Loops/StructFor.hpp                  |   16 +-
 src/Core/Loops/StructReduce.hpp               |    6 +-
 src/Core/Macros.hpp                           |   30 +-
 src/Core/Mesh/MeshBase.hpp                    |    2 +-
 src/Core/Mesh/MeshTrait.hpp                   |    2 +-
 .../Mesh/SemiStructured/CartesianAMRMesh.hpp  |    2 +-
 .../SemiStructured/CartesianAMRMeshBase.hpp   |    2 +-
 .../SemiStructured/CartesianAMRMeshTrait.hpp  |    2 +-
 .../SemiStructured/CartesianAMRMeshView.hpp   |    7 +-
 .../CartesianAMRMeshViewTrait.hpp             |    2 +-
 .../SemiStructured/SemiStructuredMesh.hpp     |    2 +-
 .../SemiStructuredMeshTrait.hpp               |    2 +-
 src/Core/Mesh/Structured/CartesianMesh.hpp    |    6 +-
 .../Mesh/Structured/CartesianMeshBase.hpp     |    2 +-
 .../Mesh/Structured/CartesianMeshTrait.hpp    |    2 +-
 .../Mesh/Structured/CartesianMeshView.hpp     |    6 +-
 .../Structured/CartesianMeshViewTrait.hpp     |    2 +-
 .../Mesh/Structured/StructuredMeshBase.hpp    |    2 +-
 .../Mesh/Structured/StructuredMeshTrait.hpp   |    2 +-
 src/Core/Meta.hpp                             |   42 +-
 src/Core/Operator/Arithmetic/AMDS.hpp         |    2 +-
 src/Core/Operator/Arithmetic/MinMax.hpp       |    2 +-
 src/Core/Operator/Conditional.hpp             |    8 +-
 src/Core/Operator/Convolution/Convolution.hpp |   25 +-
 .../D1FirstOrderBiasedDownwind.hpp            |    2 +-
 .../FDMOperators/D1FirstOrderBiasedUpwind.hpp |    2 +-
 .../FDMOperators/D1FirstOrderCentered.hpp     |    2 +-
 .../FDMOperators/D1WENO53Downwind.hpp         |    2 +-
 .../Operator/FDMOperators/D1WENO53Upwind.hpp  |    2 +-
 .../FDMOperators/D2SecondOrderCentered.hpp    |    2 +-
 .../Operator/FDMOperators/DiffsInterface.hpp  |    2 +-
 src/Core/Operator/IdentityOp.hpp              |    5 +-
 .../Operator/Interpolator/D1FluxLimiter.hpp   |   19 +-
 .../Interpolator/D1FluxLimiterBasedIntpOp.hpp |    2 +-
 src/Core/Operator/Interpolator/D1Linear.hpp   |    2 +-
 .../Interpolator/FluxLimiterKernels.hpp       |    2 +-
 .../Operator/Interpolator/IntpInterface.hpp   |    2 +-
 src/Core/Operator/Logical/Boolean.hpp         |    2 +-
 src/Core/Operator/Logical/Classify.hpp        |    2 +-
 src/Core/Operator/Logical/Compare.hpp         |    2 +-
 src/Core/Operator/Operator.hpp                |    2 +-
 src/Core/Operator/PerElemOpAdaptor.hpp        |    2 +-
 src/Core/Parallel/AbstractSplitStrategy.hpp   |    2 +-
 src/Core/Parallel/EvenSplitStrategy.hpp       |    2 +-
 src/Core/Parallel/ManualSplitStrategy.hpp     |    2 +-
 src/Core/Parallel/ParallelInfo.hpp            |    2 +-
 src/Core/Parallel/ParallelPlan.hpp            |    2 +-
 src/Core/Parallel/ParallelType.hpp            |    2 +-
 .../Parallel/ParticleGuidedSplitStrategy.hpp  |    2 +-
 src/Core/Solvers/IJ/IJSolver.hpp              |    2 +-
 .../Solvers/SemiStruct/SemiStructSolver.hpp   |    2 +-
 .../SemiStruct/SemiStructSolverFAC.hpp        |    2 +-
 .../SemiStruct/SemiStructSolverNone.hpp       |    2 +-
 src/Core/Solvers/Struct/StructSolver.hpp      |    2 +-
 .../Solvers/Struct/StructSolverBiCGSTAB.hpp   |    2 +-
 .../Solvers/Struct/StructSolverCycRed.hpp     |    2 +-
 .../Solvers/Struct/StructSolverFGMRES.hpp     |    2 +-
 src/Core/Solvers/Struct/StructSolverGMRES.hpp |    2 +-
 .../Solvers/Struct/StructSolverJacobi.hpp     |    2 +-
 .../Solvers/Struct/StructSolverLGMRES.hpp     |    2 +-
 src/Core/Solvers/Struct/StructSolverNone.hpp  |    2 +-
 src/Core/Solvers/Struct/StructSolverPCG.hpp   |    2 +-
 src/Core/Solvers/Struct/StructSolverPFMG.hpp  |    2 +-
 .../Solvers/Struct/StructSolverPrecond.hpp    |    2 +-
 src/Core/Solvers/Struct/StructSolverSMG.hpp   |    2 +-
 src/DataStructures/Arrays/Arrays.hpp          |    2 +-
 src/DataStructures/Arrays/CoordVector.hpp     |    2 +-
 src/DataStructures/Arrays/OffsetVector.hpp    |    2 +-
 .../Arrays/Tensor/FixedSizeTensor.hpp         |   15 +-
 .../Arrays/Tensor/PlainTensor.hpp             |   23 +-
 .../Arrays/Tensor/TensorBase.hpp              |    2 +-
 .../Arrays/Tensor/TensorTrait.hpp             |    2 +-
 src/DataStructures/Geometry/2DGeometry.hpp    |    2 +-
 src/DataStructures/Geometry/3DGeometry.hpp    |    2 +-
 src/DataStructures/Geometry/BasicElements.hpp |    5 +-
 src/DataStructures/Geometry/KdTree.hpp        |    2 +-
 src/DataStructures/Index/ColoredIndex.hpp     |   14 +-
 src/DataStructures/Index/LevelMDIndex.hpp     |    2 +-
 src/DataStructures/Index/LevelRangedIndex.hpp |    2 +-
 .../LinearMapper/BlockedMDRangeMapper.hpp     |    2 +-
 .../ColoredBlockedMDRangeMapper.hpp           |    2 +-
 .../LinearMapper/ColoredMDRangeMapper.hpp     |    2 +-
 .../GeneralBlockedMDRangeMapper.hpp           |    2 +-
 .../Index/LinearMapper/LevelMDRangeMapper.hpp |    2 +-
 .../Index/LinearMapper/MDRangeMapper.hpp      |    2 +-
 src/DataStructures/Index/MDIndex.hpp          |   10 +-
 src/DataStructures/Index/RangedIndex.hpp      |    2 +-
 src/DataStructures/Matrix/COOMatrix.hpp       |    2 +-
 src/DataStructures/Matrix/CSRMatrix.hpp       |    7 +-
 src/DataStructures/Pair.hpp                   |    2 +-
 src/DataStructures/Range/LevelRanges.hpp      |    2 +-
 src/DataStructures/Range/Ranges.hpp           |    7 +-
 src/DataStructures/StencilPad.hpp             |    2 +-
 src/Math/Function/Integral.hpp                |    2 +-
 src/Math/Function/Numeric.hpp                 |    6 +-
 src/Math/Interpolator/Interpolator.hpp        |    2 +-
 src/Utils/Allocator/AlignedAllocator.hpp      |    2 +-
 src/Utils/Allocator/AllocatorTrait.hpp        |    2 +-
 src/Utils/Allocator/StaticAllocator.hpp       |    5 +-
 src/Utils/Allocator/VirtualMemAllocator.hpp   |    2 +-
 src/Utils/ConstexprString.hpp                 |    7 +-
 src/Utils/NamedFunctor.hpp                    |   11 +-
 src/Utils/RandomStringGenerator.hpp           |    6 +-
 src/Utils/Serializer/EnumTypes.hpp            |    2 +-
 src/Utils/Serializer/STDContainers.hpp        |   14 +-
 src/Utils/StackTracer.hpp                     |    2 +-
 src/Utils/Writers/FieldStream.hpp             |    2 +-
 src/Utils/Writers/FieldWriter.hpp             |    2 +-
 src/Utils/Writers/HDF5Stream.hpp              |    2 +-
 src/Utils/Writers/IOGroup.hpp                 |    5 +-
 src/Utils/Writers/RawBinaryStream.hpp         |    2 +-
 src/Utils/Writers/StreamTrait.hpp             |    2 +-
 src/Utils/Writers/Streams.hpp                 |    6 +-
 src/Utils/Writers/TecplotASCIIStream.hpp      |    2 +-
 src/Utils/Writers/TecplotBinaryStream.hpp     |    2 +-
 src/Utils/Writers/TecplotSZPLTStream.hpp      |    2 +-
 src/Utils/Writers/VTKAMRStream.hpp            |    2 +-
 test/CMakeLists.txt                           |    2 +-
 test/Core/BC/DircBCTest.cpp                   |    2 +-
 test/Core/BC/NeumBCTest.cpp                   |    2 +-
 test/Core/BC/PeriodicBCTest.cpp               |    2 +-
 test/Core/CMakeLists.txt                      |    2 +-
 test/Core/Equation/AMGCLMPITest.cpp           |   10 +-
 test/Core/Equation/AMGCLTest.cpp              |    2 +-
 .../Equation/CSRMatrixGeneratorMPITest.cpp    |    2 +-
 test/Core/Equation/CSRMatrixGeneratorTest.cpp |    2 +-
 test/Core/Equation/DircEqnTest.cpp            |    6 +-
 test/Core/Equation/EqnHolderTest.cpp          |    6 +-
 test/Core/Equation/EqnSetMPITest.cpp          |    2 +-
 test/Core/Equation/EqnSetTest.cpp             |    2 +-
 test/Core/Equation/NeumEqnTest.cpp            |    6 +-
 test/Core/Equation/PeriodicEqnTest.cpp        |    6 +-
 test/Core/Field/CartesianFieldMPITest.cpp     |    4 +-
 test/Core/Field/CartesianFieldTest.cpp        |    4 +-
 test/Core/Loops/RangeForTest.cpp              |    2 +-
 test/Core/Loops/RangeReduceTest.cpp           |    2 +-
 test/Core/Mesh/CartesianMeshTest.cpp          |    2 +-
 test/Core/MetaTest.cpp                        |   10 +-
 test/Core/Operator/ConditionalTest.cpp        |    2 +-
 test/Core/Operator/ConvolutionTest.cpp        |    2 +-
 test/Core/Operator/InterpolatorTest.cpp       |    2 +-
 test/Core/Parallel/EvenSplitStrategyTest.cpp  |    2 +-
 .../ParticleGuidedSplitStrategyTest.cpp       |    2 +-
 .../DataStructures/Arrays/PlainTensorTest.cpp |    2 +-
 test/DataStructures/CMakeLists.txt            |    2 +-
 .../Index/BlockedMDRangeMapperTest.cpp        |    2 +-
 .../Index/ColoredBlockedMDRangeMapperTest.cpp |    2 +-
 test/DataStructures/Index/MDIndexTest.cpp     |    2 +-
 test/DataStructures/StencilPadTest.cpp        |    2 +-
 test/Utils/CMakeLists.txt                     |    2 +-
 test/Utils/Cpp20CompatibilityTest.cpp         |    2 +-
 test/Utils/HDF5StreamMPITest.cpp              |    4 +-
 test/Utils/HDF5StreamTest.cpp                 |    2 +-
 test/Utils/IOGroupTest.cpp                    |    2 +-
 test/Utils/TecplotStreamMPITest.cpp           |    2 +-
 test/Utils/TecplotStreamTest.cpp              |    2 +-
 test/test_main.cpp                            |    2 +-
 test/test_main_mpi.cpp                        |    2 +-
 417 files changed, 33454 insertions(+), 35809 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c394e8ed..31ea2476 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 # ----------------------------------------------------------------------------
 #
-# Copyright (c) 2019 - 2023 by the OpFlow developers
+# Copyright (c) 2019 - 2025 by the OpFlow developers
 #
 # This file is part of OpFlow.
 #
diff --git a/external/hypre/src/seq_mv/seq_mv.hpp b/external/hypre/src/seq_mv/seq_mv.hpp
index 273e9650..7eb9f68f 100644
--- a/external/hypre/src/seq_mv/seq_mv.hpp
+++ b/external/hypre/src/seq_mv/seq_mv.hpp
@@ -15,57 +15,61 @@ extern "C" {
 #if CUSPARSE_VERSION >= CUSPARSE_NEWAPI_VERSION
 cusparseSpMatDescr_t hypre_CSRMatrixToCusparseSpMat(const hypre_CSRMatrix *A, HYPRE_Int offset);
 
-cusparseSpMatDescr_t hypre_CSRMatrixToCusparseSpMat_core( HYPRE_Int n, HYPRE_Int m,
-                                                          HYPRE_Int offset, HYPRE_Int nnz, HYPRE_Int *i, HYPRE_Int *j, HYPRE_Complex *data);
+cusparseSpMatDescr_t hypre_CSRMatrixToCusparseSpMat_core(HYPRE_Int n, HYPRE_Int m, HYPRE_Int offset,
+                                                         HYPRE_Int nnz, HYPRE_Int *i, HYPRE_Int *j,
+                                                         HYPRE_Complex *data);
 
 cusparseDnVecDescr_t hypre_VectorToCusparseDnVec_core(HYPRE_Complex *x_data, HYPRE_Int n);
 
 cusparseDnVecDescr_t hypre_VectorToCusparseDnVec(const hypre_Vector *x, HYPRE_Int offset,
                                                  HYPRE_Int size_override);
 
-cusparseDnMatDescr_t hypre_VectorToCusparseDnMat_core(HYPRE_Complex *x_data, HYPRE_Int nrow,
-                                                      HYPRE_Int ncol, HYPRE_Int order);
+cusparseDnMatDescr_t hypre_VectorToCusparseDnMat_core(HYPRE_Complex *x_data, HYPRE_Int nrow, HYPRE_Int ncol,
+                                                      HYPRE_Int order);
 
 cusparseDnMatDescr_t hypre_VectorToCusparseDnMat(const hypre_Vector *x);
 #endif
 
 HYPRE_Int hypreDevice_CSRSpGemmCusparseOldAPI(HYPRE_Int m, HYPRE_Int k, HYPRE_Int n,
-                                              cusparseMatDescr_t descr_A, HYPRE_Int nnzA, HYPRE_Int *d_ia, HYPRE_Int *d_ja, HYPRE_Complex *d_a,
-                                              cusparseMatDescr_t descr_B, HYPRE_Int nnzB, HYPRE_Int *d_ib, HYPRE_Int *d_jb, HYPRE_Complex *d_b,
-                                              cusparseMatDescr_t descr_C, HYPRE_Int *nnzC_out, HYPRE_Int **d_ic_out, HYPRE_Int **d_jc_out,
+                                              cusparseMatDescr_t descr_A, HYPRE_Int nnzA, HYPRE_Int *d_ia,
+                                              HYPRE_Int *d_ja, HYPRE_Complex *d_a, cusparseMatDescr_t descr_B,
+                                              HYPRE_Int nnzB, HYPRE_Int *d_ib, HYPRE_Int *d_jb,
+                                              HYPRE_Complex *d_b, cusparseMatDescr_t descr_C,
+                                              HYPRE_Int *nnzC_out, HYPRE_Int **d_ic_out, HYPRE_Int **d_jc_out,
                                               HYPRE_Complex **d_c_out);
 
-HYPRE_Int hypreDevice_CSRSpGemmCusparse(HYPRE_Int m, HYPRE_Int k, HYPRE_Int n,
-                                        cusparseMatDescr_t descr_A, HYPRE_Int nnzA, HYPRE_Int *d_ia, HYPRE_Int *d_ja, HYPRE_Complex *d_a,
-                                        cusparseMatDescr_t descr_B, HYPRE_Int nnzB, HYPRE_Int *d_ib, HYPRE_Int *d_jb, HYPRE_Complex *d_b,
-                                        cusparseMatDescr_t descr_C, HYPRE_Int *nnzC_out, HYPRE_Int **d_ic_out, HYPRE_Int **d_jc_out,
+HYPRE_Int hypreDevice_CSRSpGemmCusparse(HYPRE_Int m, HYPRE_Int k, HYPRE_Int n, cusparseMatDescr_t descr_A,
+                                        HYPRE_Int nnzA, HYPRE_Int *d_ia, HYPRE_Int *d_ja, HYPRE_Complex *d_a,
+                                        cusparseMatDescr_t descr_B, HYPRE_Int nnzB, HYPRE_Int *d_ib,
+                                        HYPRE_Int *d_jb, HYPRE_Complex *d_b, cusparseMatDescr_t descr_C,
+                                        HYPRE_Int *nnzC_out, HYPRE_Int **d_ic_out, HYPRE_Int **d_jc_out,
                                         HYPRE_Complex **d_c_out);
 
-HYPRE_Int hypre_SortCSRCusparse( HYPRE_Int n, HYPRE_Int m, HYPRE_Int nnzA,
-                                 cusparseMatDescr_t descrA,
-                                 const HYPRE_Int *d_ia, HYPRE_Int *d_ja_sorted, HYPRE_Complex *d_a_sorted );
+HYPRE_Int hypre_SortCSRCusparse(HYPRE_Int n, HYPRE_Int m, HYPRE_Int nnzA, cusparseMatDescr_t descrA,
+                                const HYPRE_Int *d_ia, HYPRE_Int *d_ja_sorted, HYPRE_Complex *d_a_sorted);
 #endif
 
 #if defined(HYPRE_USING_ROCSPARSE)
-HYPRE_Int hypreDevice_CSRSpGemmRocsparse(HYPRE_Int m, HYPRE_Int k, HYPRE_Int n,
-                                         rocsparse_mat_descr descrA, HYPRE_Int nnzA, HYPRE_Int *d_ia, HYPRE_Int *d_ja, HYPRE_Complex *d_a,
-                                         rocsparse_mat_descr descrB, HYPRE_Int nnzB, HYPRE_Int *d_ib, HYPRE_Int *d_jb, HYPRE_Complex *d_b,
-                                         rocsparse_mat_descr descrC, rocsparse_mat_info infoC, HYPRE_Int *nnzC_out, HYPRE_Int **d_ic_out,
+HYPRE_Int hypreDevice_CSRSpGemmRocsparse(HYPRE_Int m, HYPRE_Int k, HYPRE_Int n, rocsparse_mat_descr descrA,
+                                         HYPRE_Int nnzA, HYPRE_Int *d_ia, HYPRE_Int *d_ja, HYPRE_Complex *d_a,
+                                         rocsparse_mat_descr descrB, HYPRE_Int nnzB, HYPRE_Int *d_ib,
+                                         HYPRE_Int *d_jb, HYPRE_Complex *d_b, rocsparse_mat_descr descrC,
+                                         rocsparse_mat_info infoC, HYPRE_Int *nnzC_out, HYPRE_Int **d_ic_out,
                                          HYPRE_Int **d_jc_out, HYPRE_Complex **d_c_out);
 
-HYPRE_Int hypre_SortCSRRocsparse( HYPRE_Int n, HYPRE_Int m, HYPRE_Int nnzA,
-                                  rocsparse_mat_descr descrA,
-                                  const HYPRE_Int *d_ia, HYPRE_Int *d_ja_sorted, HYPRE_Complex *d_a_sorted );
+HYPRE_Int hypre_SortCSRRocsparse(HYPRE_Int n, HYPRE_Int m, HYPRE_Int nnzA, rocsparse_mat_descr descrA,
+                                 const HYPRE_Int *d_ia, HYPRE_Int *d_ja_sorted, HYPRE_Complex *d_a_sorted);
 #endif
 
 #if defined(HYPRE_USING_ONEMKLSPARSE)
 HYPRE_Int hypreDevice_CSRSpGemmOnemklsparse(HYPRE_Int m, HYPRE_Int k, HYPRE_Int n,
-                                            oneapi::mkl::sparse::matrix_handle_t handle_A,
-                                            HYPRE_Int nnzA, HYPRE_Int *d_ia, HYPRE_Int *d_ja, HYPRE_Complex *d_a,
-                                            oneapi::mkl::sparse::matrix_handle_t handle_B,
-                                            HYPRE_Int nnzB, HYPRE_Int *d_ib, HYPRE_Int *d_jb, HYPRE_Complex *d_b,
+                                            oneapi::mkl::sparse::matrix_handle_t handle_A, HYPRE_Int nnzA,
+                                            HYPRE_Int *d_ia, HYPRE_Int *d_ja, HYPRE_Complex *d_a,
+                                            oneapi::mkl::sparse::matrix_handle_t handle_B, HYPRE_Int nnzB,
+                                            HYPRE_Int *d_ib, HYPRE_Int *d_jb, HYPRE_Complex *d_b,
                                             oneapi::mkl::sparse::matrix_handle_t handle_C,
-                                            HYPRE_Int *nnzC_out, HYPRE_Int **d_ic_out, HYPRE_Int **d_jc_out, HYPRE_Complex **d_c_out);
+                                            HYPRE_Int *nnzC_out, HYPRE_Int **d_ic_out, HYPRE_Int **d_jc_out,
+                                            HYPRE_Complex **d_c_out);
 #endif
 
 #ifdef __cplusplus
diff --git a/external/hypre/src/struct_mv/_hypre_struct_mv.hpp b/external/hypre/src/struct_mv/_hypre_struct_mv.hpp
index 839ae009..672c45e3 100644
--- a/external/hypre/src/struct_mv/_hypre_struct_mv.hpp
+++ b/external/hypre/src/struct_mv/_hypre_struct_mv.hpp
@@ -1,7 +1,6 @@
 
 /*** DO NOT EDIT THIS FILE DIRECTLY (use 'headers' to generate) ***/
 
-
 #ifndef hypre_STRUCT_MV_HPP
 #define hypre_STRUCT_MV_HPP
 
@@ -33,33 +32,30 @@ extern "C++" {
 #if defined(HYPRE_USING_RAJA)
 
 #ifdef __cplusplus
-extern "C++"
-{
+extern "C++" {
 #endif
 
 #include <RAJA/RAJA.hpp>
-   using namespace RAJA;
+using namespace RAJA;
 
 #ifdef __cplusplus
 }
 #endif
 
-typedef struct hypre_Boxloop_struct
-{
-   HYPRE_Int lsize0, lsize1, lsize2;
-   HYPRE_Int strides0, strides1, strides2;
-   HYPRE_Int bstart0, bstart1, bstart2;
-   HYPRE_Int bsize0, bsize1, bsize2;
+typedef struct hypre_Boxloop_struct {
+    HYPRE_Int lsize0, lsize1, lsize2;
+    HYPRE_Int strides0, strides1, strides2;
+    HYPRE_Int bstart0, bstart1, bstart2;
+    HYPRE_Int bsize0, bsize1, bsize2;
 } hypre_Boxloop;
 
-
 #if defined(HYPRE_USING_CUDA) /* RAJA with CUDA, running on device */
 
-#define BLOCKSIZE                HYPRE_1D_BLOCK_SIZE
-#define hypre_RAJA_DEVICE        RAJA_DEVICE
-#define hypre_raja_exec_policy   cuda_exec<BLOCKSIZE>
+#define BLOCKSIZE HYPRE_1D_BLOCK_SIZE
+#define hypre_RAJA_DEVICE RAJA_DEVICE
+#define hypre_raja_exec_policy cuda_exec<BLOCKSIZE>
 /* #define hypre_raja_reduce_policy cuda_reduce_atomic<BLOCKSIZE> */
-#define hypre_raja_reduce_policy cuda_reduce //<BLOCKSIZE>
+#define hypre_raja_reduce_policy cuda_reduce//<BLOCKSIZE>
 #define hypre_fence()
 /*
 #define hypre_fence() \
@@ -73,146 +69,126 @@ hypre_CheckErrorDevice(cudaDeviceSynchronize());
 #elif defined(HYPRE_USING_DEVICE_OPENMP) /* RAJA with OpenMP (>4.5), running on device */
 
 #define hypre_RAJA_DEVICE
-#define hypre_raja_exec_policy   omp_target_parallel_for_exec<BLOCKSIZE>
+#define hypre_raja_exec_policy omp_target_parallel_for_exec<BLOCKSIZE>
 #define hypre_raja_reduce_policy omp_target_reduce
 #define hypre_fence()
 
 #elif defined(HYPRE_USING_OPENMP) /* RAJA with OpenMP, running on host (CPU) */
 
 #define hypre_RAJA_DEVICE
-#define hypre_raja_exec_policy   omp_for_exec
+#define hypre_raja_exec_policy omp_for_exec
 #define hypre_raja_reduce_policy omp_reduce
 #define hypre_fence()
 
 #else /* RAJA, running on host (CPU) */
 
 #define hypre_RAJA_DEVICE
-#define hypre_raja_exec_policy   seq_exec
+#define hypre_raja_exec_policy seq_exec
 #define hypre_raja_reduce_policy seq_reduce
 #define hypre_fence()
 
 #endif /* #if defined(HYPRE_USING_CUDA) */
 
+#define zypre_BoxLoopIncK(k, box, hypre__i)                                                                  \
+    HYPRE_Int hypre_boxD##k = 1;                                                                             \
+    HYPRE_Int hypre__i = 0;                                                                                  \
+    hypre__i += (hypre_IndexD(local_idx, 0) * box.strides0 + box.bstart0) * hypre_boxD##k;                   \
+    hypre_boxD##k *= hypre_max(0, box.bsize0 + 1);                                                           \
+    hypre__i += (hypre_IndexD(local_idx, 1) * box.strides1 + box.bstart1) * hypre_boxD##k;                   \
+    hypre_boxD##k *= hypre_max(0, box.bsize1 + 1);                                                           \
+    hypre__i += (hypre_IndexD(local_idx, 2) * box.strides2 + box.bstart2) * hypre_boxD##k;                   \
+    hypre_boxD##k *= hypre_max(0, box.bsize2 + 1);
+
+#define zypre_newBoxLoopInit(ndim, loop_size)                                                                \
+    HYPRE_Int hypre__tot = 1;                                                                                \
+    for (HYPRE_Int d = 0; d < ndim; d++) hypre__tot *= loop_size[d];
+
+#define zypre_newBoxLoopDeclare(box)                                                                         \
+    hypre_Index local_idx;                                                                                   \
+    HYPRE_Int idx_local = idx;                                                                               \
+    hypre_IndexD(local_idx, 0) = idx_local % box.lsize0;                                                     \
+    idx_local = idx_local / box.lsize0;                                                                      \
+    hypre_IndexD(local_idx, 1) = idx_local % box.lsize1;                                                     \
+    idx_local = idx_local / box.lsize1;                                                                      \
+    hypre_IndexD(local_idx, 2) = idx_local % box.lsize2;
+
+#define zypre_BoxLoopDataDeclareK(k, ndim, loop_size, dbox, start, stride)                                   \
+    hypre_Boxloop databox##k;                                                                                \
+    databox##k.lsize0 = loop_size[0];                                                                        \
+    databox##k.strides0 = stride[0];                                                                         \
+    databox##k.bstart0 = start[0] - dbox->imin[0];                                                           \
+    databox##k.bsize0 = dbox->imax[0] - dbox->imin[0];                                                       \
+    if (ndim > 1) {                                                                                          \
+        databox##k.lsize1 = loop_size[1];                                                                    \
+        databox##k.strides1 = stride[1];                                                                     \
+        databox##k.bstart1 = start[1] - dbox->imin[1];                                                       \
+        databox##k.bsize1 = dbox->imax[1] - dbox->imin[1];                                                   \
+    } else {                                                                                                 \
+        databox##k.lsize1 = 1;                                                                               \
+        databox##k.strides1 = 0;                                                                             \
+        databox##k.bstart1 = 0;                                                                              \
+        databox##k.bsize1 = 0;                                                                               \
+    }                                                                                                        \
+    if (ndim == 3) {                                                                                         \
+        databox##k.lsize2 = loop_size[2];                                                                    \
+        databox##k.strides2 = stride[2];                                                                     \
+        databox##k.bstart2 = start[2] - dbox->imin[2];                                                       \
+        databox##k.bsize2 = dbox->imax[2] - dbox->imin[2];                                                   \
+    } else {                                                                                                 \
+        databox##k.lsize2 = 1;                                                                               \
+        databox##k.strides2 = 0;                                                                             \
+        databox##k.bstart2 = 0;                                                                              \
+        databox##k.bsize2 = 0;                                                                               \
+    }
 
-
-
-#define zypre_BoxLoopIncK(k,box,hypre__i)                                               \
-   HYPRE_Int hypre_boxD##k = 1;                                                         \
-   HYPRE_Int hypre__i = 0;                                                              \
-   hypre__i += (hypre_IndexD(local_idx, 0)*box.strides0 + box.bstart0) * hypre_boxD##k; \
-   hypre_boxD##k *= hypre_max(0, box.bsize0 + 1);                                       \
-   hypre__i += (hypre_IndexD(local_idx, 1)*box.strides1 + box.bstart1) * hypre_boxD##k; \
-   hypre_boxD##k *= hypre_max(0, box.bsize1 + 1);                                       \
-   hypre__i += (hypre_IndexD(local_idx, 2)*box.strides2 + box.bstart2) * hypre_boxD##k; \
-   hypre_boxD##k *= hypre_max(0, box.bsize2 + 1);                                       \
-
-
-#define zypre_newBoxLoopInit(ndim,loop_size)                                \
-  HYPRE_Int hypre__tot = 1;                                                 \
-  for (HYPRE_Int d = 0;d < ndim;d ++)                                       \
-      hypre__tot *= loop_size[d];
-
-
-#define zypre_newBoxLoopDeclare(box)                                    \
-  hypre_Index local_idx;                                                \
-  HYPRE_Int idx_local = idx;                                            \
-  hypre_IndexD(local_idx, 0)  = idx_local % box.lsize0;                 \
-  idx_local = idx_local / box.lsize0;                                   \
-  hypre_IndexD(local_idx, 1)  = idx_local % box.lsize1;                 \
-  idx_local = idx_local / box.lsize1;                                   \
-  hypre_IndexD(local_idx, 2)  = idx_local % box.lsize2;
-
-#define zypre_BoxLoopDataDeclareK(k,ndim,loop_size,dbox,start,stride)   \
-   hypre_Boxloop databox##k;                                            \
-   databox##k.lsize0 = loop_size[0];                                    \
-   databox##k.strides0 = stride[0];                                     \
-   databox##k.bstart0  = start[0] - dbox->imin[0];                      \
-   databox##k.bsize0   = dbox->imax[0]-dbox->imin[0];                   \
-   if (ndim > 1)                                                        \
-   {                                                                    \
-      databox##k.lsize1 = loop_size[1];                                 \
-      databox##k.strides1 = stride[1];                                  \
-      databox##k.bstart1  = start[1] - dbox->imin[1];                   \
-      databox##k.bsize1   = dbox->imax[1]-dbox->imin[1];                \
-   }                                                                    \
-   else                                                                 \
-   {                                                                    \
-      databox##k.lsize1 = 1;                                            \
-      databox##k.strides1 = 0;                                          \
-      databox##k.bstart1  = 0;                                          \
-      databox##k.bsize1   = 0;                                          \
-   }                                                                    \
-   if (ndim == 3)                                                       \
-   {                                                                    \
-      databox##k.lsize2 = loop_size[2];                                 \
-      databox##k.strides2 = stride[2];                                  \
-      databox##k.bstart2  = start[2] - dbox->imin[2];                   \
-      databox##k.bsize2   = dbox->imax[2]-dbox->imin[2];                \
-   }                                                                    \
-   else                                                                 \
-   {                                                                    \
-      databox##k.lsize2 = 1;                                            \
-      databox##k.strides2 = 0;                                          \
-      databox##k.bstart2  = 0;                                          \
-      databox##k.bsize2   = 0;                                          \
-   }
-
-#define zypre_newBoxLoop0Begin(ndim, loop_size)                                                   \
-{                                                                                                 \
-   zypre_newBoxLoopInit(ndim,loop_size);                                                          \
+#define zypre_newBoxLoop0Begin(ndim, loop_size)                                                              \
+    {                                                                                                        \
+        zypre_newBoxLoopInit(ndim, loop_size);                                                               \
    forall< hypre_raja_exec_policy >(RangeSegment(0, hypre__tot), [=] hypre_RAJA_DEVICE (HYPRE_Int idx) \
    {
 
+#define zypre_newBoxLoop0End()                                                                               \
+    });                                                                                                  \
+    hypre_fence();                                                                                           \
+    }
 
-#define zypre_newBoxLoop0End()    \
-        });                       \
-        hypre_fence();            \
-}
-
-#define zypre_newBoxLoop1Begin(ndim, loop_size,                                                    \
-                               dbox1, start1, stride1, i1)                                         \
-{                                                                                                  \
-    zypre_newBoxLoopInit(ndim,loop_size);                                                          \
-    zypre_BoxLoopDataDeclareK(1,ndim,loop_size,dbox1,start1,stride1);                              \
+#define zypre_newBoxLoop1Begin(ndim, loop_size, dbox1, start1, stride1, i1)                                  \
+    {                                                                                                        \
+        zypre_newBoxLoopInit(ndim, loop_size);                                                               \
+        zypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                               \
     forall< hypre_raja_exec_policy >(RangeSegment(0, hypre__tot), [=] hypre_RAJA_DEVICE (HYPRE_Int idx) \
     {                                                                                              \
        zypre_newBoxLoopDeclare(databox1);                                                          \
        zypre_BoxLoopIncK(1,databox1,i1);
 
+#define zypre_newBoxLoop1End(i1)                                                                             \
+    });                                                                                                      \
+    hypre_fence();                                                                                           \
+    }
 
-#define zypre_newBoxLoop1End(i1) \
-    });                          \
-    hypre_fence();               \
-}
-
-#define zypre_newBoxLoop2Begin(ndim, loop_size,                                                  \
-                               dbox1, start1, stride1, i1,                                       \
-                               dbox2, start2, stride2, i2)                                       \
-{                                                                                                \
-  zypre_newBoxLoopInit(ndim,loop_size);                                                          \
-  zypre_BoxLoopDataDeclareK(1,ndim,loop_size,dbox1,start1,stride1);                              \
-  zypre_BoxLoopDataDeclareK(2,ndim,loop_size,dbox2,start2,stride2);                              \
+#define zypre_newBoxLoop2Begin(ndim, loop_size, dbox1, start1, stride1, i1, dbox2, start2, stride2, i2)      \
+    {                                                                                                        \
+        zypre_newBoxLoopInit(ndim, loop_size);                                                               \
+        zypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                               \
+        zypre_BoxLoopDataDeclareK(2, ndim, loop_size, dbox2, start2, stride2);                               \
   forall< hypre_raja_exec_policy >(RangeSegment(0, hypre__tot), [=] hypre_RAJA_DEVICE (HYPRE_Int idx) \
   {                                                                                              \
      zypre_newBoxLoopDeclare(databox1);                                                          \
      zypre_BoxLoopIncK(1,databox1,i1);                                                           \
      zypre_BoxLoopIncK(2,databox2,i2);
 
+#define zypre_newBoxLoop2End(i1, i2)                                                                         \
+    });                                                                                                        \
+    hypre_fence();                                                                                           \
+    }
 
-#define zypre_newBoxLoop2End(i1, i2) \
-  });                                \
-  hypre_fence();                     \
-}
-
-#define zypre_newBoxLoop3Begin(ndim, loop_size,                                                   \
-                               dbox1, start1, stride1, i1,                                        \
-                               dbox2, start2, stride2, i2,                                        \
-                               dbox3, start3, stride3, i3)                                        \
-{                                                                                                 \
-   zypre_newBoxLoopInit(ndim,loop_size);                                                          \
-   zypre_BoxLoopDataDeclareK(1,ndim,loop_size,dbox1,start1,stride1);                              \
-   zypre_BoxLoopDataDeclareK(2,ndim,loop_size,dbox2,start2,stride2);                              \
-   zypre_BoxLoopDataDeclareK(3,ndim,loop_size,dbox3,start3,stride3);                              \
+#define zypre_newBoxLoop3Begin(ndim, loop_size, dbox1, start1, stride1, i1, dbox2, start2, stride2, i2,      \
+                               dbox3, start3, stride3, i3)                                                   \
+    {                                                                                                        \
+        zypre_newBoxLoopInit(ndim, loop_size);                                                               \
+        zypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                               \
+        zypre_BoxLoopDataDeclareK(2, ndim, loop_size, dbox2, start2, stride2);                               \
+        zypre_BoxLoopDataDeclareK(3, ndim, loop_size, dbox3, start3, stride3);                               \
    forall< hypre_raja_exec_policy >(RangeSegment(0, hypre__tot), [=] hypre_RAJA_DEVICE (HYPRE_Int idx) \
    {                                                                                              \
       zypre_newBoxLoopDeclare(databox1);                                                          \
@@ -220,22 +196,19 @@ hypre_CheckErrorDevice(cudaDeviceSynchronize());
       zypre_BoxLoopIncK(2,databox2,i2);                                                           \
       zypre_BoxLoopIncK(3,databox3,i3);
 
-#define zypre_newBoxLoop3End(i1, i2, i3)                                      \
-    });                                                                       \
-    hypre_fence();                                                            \
-}
+#define zypre_newBoxLoop3End(i1, i2, i3)                                                                     \
+    });                                                                                                      \
+    hypre_fence();                                                                                           \
+    }
 
-#define zypre_newBoxLoop4Begin(ndim, loop_size,                                                   \
-                               dbox1, start1, stride1, i1,                                        \
-                               dbox2, start2, stride2, i2,                                        \
-                               dbox3, start3, stride3, i3,                                        \
-                               dbox4, start4, stride4, i4)                                        \
-{                                                                                                 \
-   zypre_newBoxLoopInit(ndim,loop_size);                                                          \
-   zypre_BoxLoopDataDeclareK(1,ndim,loop_size,dbox1,start1,stride1);                              \
-   zypre_BoxLoopDataDeclareK(2,ndim,loop_size,dbox2,start2,stride2);                              \
-   zypre_BoxLoopDataDeclareK(3,ndim,loop_size,dbox3,start3,stride3);                              \
-   zypre_BoxLoopDataDeclareK(4,ndim,loop_size,dbox4,start4,stride4);                              \
+#define zypre_newBoxLoop4Begin(ndim, loop_size, dbox1, start1, stride1, i1, dbox2, start2, stride2, i2,      \
+                               dbox3, start3, stride3, i3, dbox4, start4, stride4, i4)                       \
+    {                                                                                                        \
+        zypre_newBoxLoopInit(ndim, loop_size);                                                               \
+        zypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                               \
+        zypre_BoxLoopDataDeclareK(2, ndim, loop_size, dbox2, start2, stride2);                               \
+        zypre_BoxLoopDataDeclareK(3, ndim, loop_size, dbox3, start3, stride3);                               \
+        zypre_BoxLoopDataDeclareK(4, ndim, loop_size, dbox4, start4, stride4);                               \
    forall< hypre_raja_exec_policy >(RangeSegment(0, hypre__tot), [=] hypre_RAJA_DEVICE (HYPRE_Int idx) \
    {                                                                                              \
       zypre_newBoxLoopDeclare(databox1);                                                          \
@@ -244,108 +217,97 @@ hypre_CheckErrorDevice(cudaDeviceSynchronize());
       zypre_BoxLoopIncK(3,databox3,i3);                                                           \
       zypre_BoxLoopIncK(4,databox4,i4);
 
-#define zypre_newBoxLoop4End(i1, i2, i3, i4)                                  \
-   });                                                                        \
-   hypre_fence();                                                             \
-}
+#define zypre_newBoxLoop4End(i1, i2, i3, i4)                                                                 \
+    });                                                                                                       \
+    hypre_fence();                                                                                           \
+    }
+
+#define zypre_BasicBoxLoopDataDeclareK(k, ndim, loop_size, stride)                                           \
+    hypre_Boxloop databox##k;                                                                                \
+    databox##k.lsize0 = loop_size[0];                                                                        \
+    databox##k.strides0 = stride[0];                                                                         \
+    databox##k.bstart0 = 0;                                                                                  \
+    databox##k.bsize0 = 0;                                                                                   \
+    if (ndim > 1) {                                                                                          \
+        databox##k.lsize1 = loop_size[1];                                                                    \
+        databox##k.strides1 = stride[1];                                                                     \
+        databox##k.bstart1 = 0;                                                                              \
+        databox##k.bsize1 = 0;                                                                               \
+    } else {                                                                                                 \
+        databox##k.lsize1 = 1;                                                                               \
+        databox##k.strides1 = 0;                                                                             \
+        databox##k.bstart1 = 0;                                                                              \
+        databox##k.bsize1 = 0;                                                                               \
+    }                                                                                                        \
+    if (ndim == 3) {                                                                                         \
+        databox##k.lsize2 = loop_size[2];                                                                    \
+        databox##k.strides2 = stride[2];                                                                     \
+        databox##k.bstart2 = 0;                                                                              \
+        databox##k.bsize2 = 0;                                                                               \
+    } else {                                                                                                 \
+        databox##k.lsize2 = 1;                                                                               \
+        databox##k.strides2 = 0;                                                                             \
+        databox##k.bstart2 = 0;                                                                              \
+        databox##k.bsize2 = 0;                                                                               \
+    }
 
-#define zypre_BasicBoxLoopDataDeclareK(k,ndim,loop_size,stride)               \
-   hypre_Boxloop databox##k;                                                  \
-   databox##k.lsize0   = loop_size[0];                                        \
-   databox##k.strides0 = stride[0];                                           \
-   databox##k.bstart0  = 0;                                                   \
-   databox##k.bsize0   = 0;                                                   \
-   if (ndim > 1)                                                              \
-   {                                                                          \
-      databox##k.lsize1   = loop_size[1];                                     \
-      databox##k.strides1 = stride[1];                                        \
-      databox##k.bstart1  = 0;                                                \
-      databox##k.bsize1   = 0;                                                \
-   }                                                                          \
-   else                                                                       \
-   {                                                                          \
-      databox##k.lsize1   = 1;                                                \
-      databox##k.strides1 = 0;                                                \
-      databox##k.bstart1  = 0;                                                \
-      databox##k.bsize1   = 0;                                                \
-   }                                                                          \
-   if (ndim == 3)                                                             \
-   {                                                                          \
-      databox##k.lsize2   = loop_size[2];                                     \
-      databox##k.strides2 = stride[2];                                        \
-      databox##k.bstart2  = 0;                                                \
-      databox##k.bsize2   = 0;                                                \
-   }                                                                          \
-   else                                                                       \
-   {                                                                          \
-      databox##k.lsize2   = 1;                                                \
-      databox##k.strides2 = 0;                                                \
-      databox##k.bstart2  = 0;                                                \
-      databox##k.bsize2   = 0;                                                \
-   }
-
-#define zypre_newBasicBoxLoop2Begin(ndim, loop_size,                                               \
-                                    stride1, i1,                                                   \
-                                    stride2, i2)                                                   \
-{                                                                                                  \
-    zypre_newBoxLoopInit(ndim,loop_size);                                                          \
-    zypre_BasicBoxLoopDataDeclareK(1,ndim,loop_size,stride1);                                      \
-    zypre_BasicBoxLoopDataDeclareK(2,ndim,loop_size,stride2);                                      \
+#define zypre_newBasicBoxLoop2Begin(ndim, loop_size, stride1, i1, stride2, i2)                               \
+    {                                                                                                        \
+        zypre_newBoxLoopInit(ndim, loop_size);                                                               \
+        zypre_BasicBoxLoopDataDeclareK(1, ndim, loop_size, stride1);                                         \
+        zypre_BasicBoxLoopDataDeclareK(2, ndim, loop_size, stride2);                                         \
     forall< hypre_raja_exec_policy >(RangeSegment(0, hypre__tot), [=] hypre_RAJA_DEVICE (HYPRE_Int idx) \
     {                                                                                              \
        zypre_newBoxLoopDeclare(databox1);                                                          \
        zypre_BoxLoopIncK(1,databox1,i1);                                                           \
-       zypre_BoxLoopIncK(2,databox2,i2);                                                           \
+       zypre_BoxLoopIncK(2,databox2,i2);
 
-#define hypre_LoopBegin(size,idx)                                                           \
-{                                                                                           \
+#define hypre_LoopBegin(size, idx)                                                                           \
+    {                                                                                                        \
    forall< hypre_raja_exec_policy >(RangeSegment(0, size), [=] hypre_RAJA_DEVICE (HYPRE_Int idx) \
    {
 
-#define hypre_LoopEnd()                                                        \
-   });                                                                         \
-   hypre_fence();                                                              \
-}
+#define hypre_LoopEnd()                                                                                      \
+    });                                                                                                       \
+    hypre_fence();                                                                                           \
+    }
 
-#define hypre_BoxLoopGetIndex(index)                                           \
-  index[0] = hypre_IndexD(local_idx, 0);                                       \
-  index[1] = hypre_IndexD(local_idx, 1);                                       \
-  index[2] = hypre_IndexD(local_idx, 2);
-
-#define hypre_BoxLoopBlock()       0
-#define hypre_BoxLoop0Begin      zypre_newBoxLoop0Begin
-#define hypre_BoxLoop0For        zypre_newBoxLoop0For
-#define hypre_BoxLoop0End        zypre_newBoxLoop0End
-#define hypre_BoxLoop1Begin      zypre_newBoxLoop1Begin
-#define hypre_BoxLoop1For        zypre_newBoxLoop1For
-#define hypre_BoxLoop1End        zypre_newBoxLoop1End
-#define hypre_BoxLoop2Begin      zypre_newBoxLoop2Begin
-#define hypre_BoxLoop2For        zypre_newBoxLoop2For
-#define hypre_BoxLoop2End        zypre_newBoxLoop2End
-#define hypre_BoxLoop3Begin      zypre_newBoxLoop3Begin
-#define hypre_BoxLoop3For        zypre_newBoxLoop3For
-#define hypre_BoxLoop3End        zypre_newBoxLoop3End
-#define hypre_BoxLoop4Begin      zypre_newBoxLoop4Begin
-#define hypre_BoxLoop4For        zypre_newBoxLoop4For
-#define hypre_BoxLoop4End        zypre_newBoxLoop4End
-#define hypre_newBoxLoopInit     zypre_newBoxLoopInit
+#define hypre_BoxLoopGetIndex(index)                                                                         \
+    index[0] = hypre_IndexD(local_idx, 0);                                                                   \
+    index[1] = hypre_IndexD(local_idx, 1);                                                                   \
+    index[2] = hypre_IndexD(local_idx, 2);
+
+#define hypre_BoxLoopBlock() 0
+#define hypre_BoxLoop0Begin zypre_newBoxLoop0Begin
+#define hypre_BoxLoop0For zypre_newBoxLoop0For
+#define hypre_BoxLoop0End zypre_newBoxLoop0End
+#define hypre_BoxLoop1Begin zypre_newBoxLoop1Begin
+#define hypre_BoxLoop1For zypre_newBoxLoop1For
+#define hypre_BoxLoop1End zypre_newBoxLoop1End
+#define hypre_BoxLoop2Begin zypre_newBoxLoop2Begin
+#define hypre_BoxLoop2For zypre_newBoxLoop2For
+#define hypre_BoxLoop2End zypre_newBoxLoop2End
+#define hypre_BoxLoop3Begin zypre_newBoxLoop3Begin
+#define hypre_BoxLoop3For zypre_newBoxLoop3For
+#define hypre_BoxLoop3End zypre_newBoxLoop3End
+#define hypre_BoxLoop4Begin zypre_newBoxLoop4Begin
+#define hypre_BoxLoop4For zypre_newBoxLoop4For
+#define hypre_BoxLoop4End zypre_newBoxLoop4End
+#define hypre_newBoxLoopInit zypre_newBoxLoopInit
 
 #define hypre_BasicBoxLoop2Begin zypre_newBasicBoxLoop2Begin
 
 /* Reduction */
-#define hypre_BoxLoop1ReductionBegin(ndim, loop_size, dbox1, start1, stride1, i1, reducesum) \
-        hypre_BoxLoop1Begin(ndim, loop_size, dbox1, start1, stride1, i1)
+#define hypre_BoxLoop1ReductionBegin(ndim, loop_size, dbox1, start1, stride1, i1, reducesum)                 \
+    hypre_BoxLoop1Begin(ndim, loop_size, dbox1, start1, stride1, i1)
 
-#define hypre_BoxLoop1ReductionEnd(i1, reducesum) \
-        hypre_BoxLoop1End(i1)
+#define hypre_BoxLoop1ReductionEnd(i1, reducesum) hypre_BoxLoop1End(i1)
 
-#define hypre_BoxLoop2ReductionBegin(ndim, loop_size, dbox1, start1, stride1, i1, \
-                                                      dbox2, start2, stride2, i2, reducesum) \
-        hypre_BoxLoop2Begin(ndim, loop_size, dbox1, start1, stride1, i1, \
-                                             dbox2, start2, stride2, i2)
+#define hypre_BoxLoop2ReductionBegin(ndim, loop_size, dbox1, start1, stride1, i1, dbox2, start2, stride2,    \
+                                     i2, reducesum)                                                          \
+    hypre_BoxLoop2Begin(ndim, loop_size, dbox1, start1, stride1, i1, dbox2, start2, stride2, i2)
 
-#define hypre_BoxLoop2ReductionEnd(i1, i2, reducesum) \
-        hypre_BoxLoop2End(i1, i2)
+#define hypre_BoxLoop2ReductionEnd(i1, i2, reducesum) hypre_BoxLoop2End(i1, i2)
 
 #endif
 
@@ -374,30 +336,27 @@ hypre_CheckErrorDevice(cudaDeviceSynchronize());
 #if defined(HYPRE_USING_KOKKOS)
 
 #ifdef __cplusplus
-extern "C++"
-{
+extern "C++" {
 #endif
 
 #include <Kokkos_Core.hpp>
-   using namespace Kokkos;
+using namespace Kokkos;
 
 #ifdef __cplusplus
 }
 #endif
 
-#if defined( KOKKOS_HAVE_MPI )
+#if defined(KOKKOS_HAVE_MPI)
 #include <mpi.h>
 #endif
 
-typedef struct hypre_Boxloop_struct
-{
-   HYPRE_Int lsize0, lsize1, lsize2;
-   HYPRE_Int strides0, strides1, strides2;
-   HYPRE_Int bstart0, bstart1, bstart2;
-   HYPRE_Int bsize0, bsize1, bsize2;
+typedef struct hypre_Boxloop_struct {
+    HYPRE_Int lsize0, lsize1, lsize2;
+    HYPRE_Int strides0, strides1, strides2;
+    HYPRE_Int bstart0, bstart1, bstart2;
+    HYPRE_Int bsize0, bsize1, bsize2;
 } hypre_Boxloop;
 
-
 #define hypre_fence()
 /*
 #define hypre_fence()                                \
@@ -408,125 +367,106 @@ typedef struct hypre_Boxloop_struct
    hypre_CheckErrorDevice(cudaDeviceSynchronize());
 */
 
+#define hypre_newBoxLoopInit(ndim, loop_size)                                                                \
+    HYPRE_Int hypre__tot = 1;                                                                                \
+    for (HYPRE_Int d = 0; d < ndim; d++) hypre__tot *= loop_size[d];
+
+#define hypre_BoxLoopIncK(k, box, hypre__i)                                                                  \
+    HYPRE_Int hypre_boxD##k = 1;                                                                             \
+    HYPRE_Int hypre__i = 0;                                                                                  \
+    hypre__i += (hypre_IndexD(local_idx, 0) * box.strides0 + box.bstart0) * hypre_boxD##k;                   \
+    hypre_boxD##k *= hypre_max(0, box.bsize0 + 1);                                                           \
+    hypre__i += (hypre_IndexD(local_idx, 1) * box.strides1 + box.bstart1) * hypre_boxD##k;                   \
+    hypre_boxD##k *= hypre_max(0, box.bsize1 + 1);                                                           \
+    hypre__i += (hypre_IndexD(local_idx, 2) * box.strides2 + box.bstart2) * hypre_boxD##k;                   \
+    hypre_boxD##k *= hypre_max(0, box.bsize2 + 1);
+
+#define hypre_newBoxLoopDeclare(box)                                                                         \
+    hypre_Index local_idx;                                                                                   \
+    HYPRE_Int idx_local = idx;                                                                               \
+    hypre_IndexD(local_idx, 0) = idx_local % box.lsize0;                                                     \
+    idx_local = idx_local / box.lsize0;                                                                      \
+    hypre_IndexD(local_idx, 1) = idx_local % box.lsize1;                                                     \
+    idx_local = idx_local / box.lsize1;                                                                      \
+    hypre_IndexD(local_idx, 2) = idx_local % box.lsize2;
+
+#define hypre_BoxLoopDataDeclareK(k, ndim, loop_size, dbox, start, stride)                                   \
+    hypre_Boxloop databox##k;                                                                                \
+    databox##k.lsize0 = loop_size[0];                                                                        \
+    databox##k.strides0 = stride[0];                                                                         \
+    databox##k.bstart0 = start[0] - dbox->imin[0];                                                           \
+    databox##k.bsize0 = dbox->imax[0] - dbox->imin[0];                                                       \
+    if (ndim > 1) {                                                                                          \
+        databox##k.lsize1 = loop_size[1];                                                                    \
+        databox##k.strides1 = stride[1];                                                                     \
+        databox##k.bstart1 = start[1] - dbox->imin[1];                                                       \
+        databox##k.bsize1 = dbox->imax[1] - dbox->imin[1];                                                   \
+    } else {                                                                                                 \
+        databox##k.lsize1 = 1;                                                                               \
+        databox##k.strides1 = 0;                                                                             \
+        databox##k.bstart1 = 0;                                                                              \
+        databox##k.bsize1 = 0;                                                                               \
+    }                                                                                                        \
+    if (ndim == 3) {                                                                                         \
+        databox##k.lsize2 = loop_size[2];                                                                    \
+        databox##k.strides2 = stride[2];                                                                     \
+        databox##k.bstart2 = start[2] - dbox->imin[2];                                                       \
+        databox##k.bsize2 = dbox->imax[2] - dbox->imin[2];                                                   \
+    } else {                                                                                                 \
+        databox##k.lsize2 = 1;                                                                               \
+        databox##k.strides2 = 0;                                                                             \
+        databox##k.bstart2 = 0;                                                                              \
+        databox##k.bsize2 = 0;                                                                               \
+    }
 
-#define hypre_newBoxLoopInit(ndim,loop_size)                                \
-   HYPRE_Int hypre__tot = 1;                                                \
-   for (HYPRE_Int d = 0;d < ndim;d ++)                                      \
-      hypre__tot *= loop_size[d];
-
-
-#define hypre_BoxLoopIncK(k,box,hypre__i)                                                \
-   HYPRE_Int hypre_boxD##k = 1;                                                          \
-   HYPRE_Int hypre__i = 0;                                                               \
-   hypre__i += (hypre_IndexD(local_idx, 0)*box.strides0 + box.bstart0) * hypre_boxD##k;  \
-   hypre_boxD##k *= hypre_max(0, box.bsize0 + 1);                                        \
-   hypre__i += (hypre_IndexD(local_idx, 1)*box.strides1 + box.bstart1) * hypre_boxD##k;  \
-   hypre_boxD##k *= hypre_max(0, box.bsize1 + 1);                                        \
-   hypre__i += (hypre_IndexD(local_idx, 2)*box.strides2 + box.bstart2) * hypre_boxD##k;  \
-   hypre_boxD##k *= hypre_max(0, box.bsize2 + 1);                                        \
-
-#define hypre_newBoxLoopDeclare(box)                                        \
-  hypre_Index local_idx;                                                    \
-  HYPRE_Int idx_local = idx;                                                \
-  hypre_IndexD(local_idx, 0)  = idx_local % box.lsize0;                     \
-  idx_local = idx_local / box.lsize0;                                       \
-  hypre_IndexD(local_idx, 1)  = idx_local % box.lsize1;                     \
-  idx_local = idx_local / box.lsize1;                                       \
-  hypre_IndexD(local_idx, 2)  = idx_local % box.lsize2;
-
-#define hypre_BoxLoopDataDeclareK(k,ndim,loop_size,dbox,start,stride)       \
-   hypre_Boxloop databox##k;                                                \
-   databox##k.lsize0 = loop_size[0];                                        \
-   databox##k.strides0 = stride[0];                                         \
-   databox##k.bstart0  = start[0] - dbox->imin[0];                          \
-   databox##k.bsize0   = dbox->imax[0]-dbox->imin[0];                       \
-   if (ndim > 1)                                                            \
-   {                                                                        \
-      databox##k.lsize1 = loop_size[1];                                     \
-      databox##k.strides1 = stride[1];                                      \
-      databox##k.bstart1  = start[1] - dbox->imin[1];                       \
-      databox##k.bsize1   = dbox->imax[1]-dbox->imin[1];                    \
-   }                                                                        \
-   else                                                                     \
-   {                                                                        \
-      databox##k.lsize1 = 1;                                                \
-      databox##k.strides1 = 0;                                              \
-      databox##k.bstart1  = 0;                                              \
-      databox##k.bsize1   = 0;                                              \
-   }                                                                        \
-   if (ndim == 3)                                                           \
-   {                                                                        \
-      databox##k.lsize2 = loop_size[2];                                     \
-      databox##k.strides2 = stride[2];                                      \
-      databox##k.bstart2  = start[2] - dbox->imin[2];                       \
-      databox##k.bsize2   = dbox->imax[2]-dbox->imin[2];                    \
-   }                                                                        \
-   else                                                                     \
-   {                                                                        \
-      databox##k.lsize2 = 1;                                                \
-      databox##k.strides2 = 0;                                              \
-      databox##k.bstart2  = 0;                                              \
-      databox##k.bsize2   = 0;                                              \
-   }
-
-#define hypre_newBoxLoop0Begin(ndim, loop_size)                         \
-{                                                                       \
-   hypre_newBoxLoopInit(ndim,loop_size);                                \
+#define hypre_newBoxLoop0Begin(ndim, loop_size)                                                              \
+    {                                                                                                        \
+        hypre_newBoxLoopInit(ndim, loop_size);                                                               \
    Kokkos::parallel_for (hypre__tot, KOKKOS_LAMBDA (HYPRE_Int idx)      \
    {
 
+#define hypre_newBoxLoop0End(i1)                                                                             \
+    });                                                                                                       \
+    hypre_fence();                                                                                           \
+    }
 
-#define hypre_newBoxLoop0End(i1)                                        \
-   });                                                                  \
-   hypre_fence();                                                       \
-}
-
-
-#define hypre_newBoxLoop1Begin(ndim, loop_size,                         \
-                               dbox1, start1, stride1, i1)              \
-{                                                                       \
-   hypre_newBoxLoopInit(ndim,loop_size)                                 \
-   hypre_BoxLoopDataDeclareK(1,ndim,loop_size,dbox1,start1,stride1);    \
+#define hypre_newBoxLoop1Begin(ndim, loop_size, dbox1, start1, stride1, i1)                                  \
+    {                                                                                                        \
+        hypre_newBoxLoopInit(ndim, loop_size)                                                                \
+                hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                       \
    Kokkos::parallel_for (hypre__tot, KOKKOS_LAMBDA (HYPRE_Int idx)      \
    {                                                                    \
       hypre_newBoxLoopDeclare(databox1);                                \
       hypre_BoxLoopIncK(1,databox1,i1);
 
+#define hypre_newBoxLoop1End(i1)                                                                             \
+    });                                                                                                       \
+    hypre_fence();                                                                                           \
+    }
 
-#define hypre_newBoxLoop1End(i1)                                        \
-   });                                                                  \
-     hypre_fence();                                                     \
- }
-
-
-#define hypre_newBoxLoop2Begin(ndim, loop_size,                         \
-                               dbox1, start1, stride1, i1,              \
-                               dbox2, start2, stride2, i2)              \
-{                                                                       \
-   hypre_newBoxLoopInit(ndim,loop_size);                                \
-   hypre_BoxLoopDataDeclareK(1,ndim,loop_size,dbox1,start1,stride1);    \
-   hypre_BoxLoopDataDeclareK(2,ndim,loop_size,dbox2,start2,stride2);    \
+#define hypre_newBoxLoop2Begin(ndim, loop_size, dbox1, start1, stride1, i1, dbox2, start2, stride2, i2)      \
+    {                                                                                                        \
+        hypre_newBoxLoopInit(ndim, loop_size);                                                               \
+        hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                               \
+        hypre_BoxLoopDataDeclareK(2, ndim, loop_size, dbox2, start2, stride2);                               \
    Kokkos::parallel_for (hypre__tot, KOKKOS_LAMBDA (HYPRE_Int idx)      \
    {                                                                    \
       hypre_newBoxLoopDeclare(databox1)                                 \
       hypre_BoxLoopIncK(1,databox1,i1);                                 \
       hypre_BoxLoopIncK(2,databox2,i2);
 
-#define hypre_newBoxLoop2End(i1, i2)                                    \
-   });                                                                  \
-   hypre_fence();                                                       \
-}
-
+#define hypre_newBoxLoop2End(i1, i2)                                                                         \
+    });                                                                                                       \
+    hypre_fence();                                                                                           \
+    }
 
-#define hypre_newBoxLoop3Begin(ndim, loop_size,                         \
-                               dbox1, start1, stride1, i1,              \
-                               dbox2, start2, stride2, i2,              \
-                               dbox3, start3, stride3, i3)              \
-{                                                                       \
-   hypre_newBoxLoopInit(ndim,loop_size);                                \
-   hypre_BoxLoopDataDeclareK(1,ndim,loop_size,dbox1,start1,stride1);    \
-   hypre_BoxLoopDataDeclareK(2,ndim,loop_size,dbox2,start2,stride2);    \
-   hypre_BoxLoopDataDeclareK(3,ndim,loop_size,dbox3,start3,stride3);    \
+#define hypre_newBoxLoop3Begin(ndim, loop_size, dbox1, start1, stride1, i1, dbox2, start2, stride2, i2,      \
+                               dbox3, start3, stride3, i3)                                                   \
+    {                                                                                                        \
+        hypre_newBoxLoopInit(ndim, loop_size);                                                               \
+        hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                               \
+        hypre_BoxLoopDataDeclareK(2, ndim, loop_size, dbox2, start2, stride2);                               \
+        hypre_BoxLoopDataDeclareK(3, ndim, loop_size, dbox3, start3, stride3);                               \
    Kokkos::parallel_for (hypre__tot, KOKKOS_LAMBDA (HYPRE_Int idx)      \
    {                                                                    \
       hypre_newBoxLoopDeclare(databox1);                                \
@@ -534,22 +474,19 @@ typedef struct hypre_Boxloop_struct
       hypre_BoxLoopIncK(2,databox2,i2);                                 \
       hypre_BoxLoopIncK(3,databox3,i3);
 
-#define hypre_newBoxLoop3End(i1, i2, i3)                                \
-   });                                                                  \
-   hypre_fence();                                                       \
-}
+#define hypre_newBoxLoop3End(i1, i2, i3)                                                                     \
+    });                                                                                                       \
+    hypre_fence();                                                                                           \
+    }
 
-#define hypre_newBoxLoop4Begin(ndim, loop_size,                         \
-                               dbox1, start1, stride1, i1,              \
-                               dbox2, start2, stride2, i2,              \
-                               dbox3, start3, stride3, i3,              \
-                               dbox4, start4, stride4, i4)              \
-{                                                                       \
-   hypre_newBoxLoopInit(ndim,loop_size);                                \
-   hypre_BoxLoopDataDeclareK(1,ndim,loop_size,dbox1,start1,stride1);    \
-   hypre_BoxLoopDataDeclareK(2,ndim,loop_size,dbox2,start2,stride2);    \
-   hypre_BoxLoopDataDeclareK(3,ndim,loop_size,dbox3,start3,stride3);    \
-   hypre_BoxLoopDataDeclareK(4,ndim,loop_size,dbox4,start4,stride4);    \
+#define hypre_newBoxLoop4Begin(ndim, loop_size, dbox1, start1, stride1, i1, dbox2, start2, stride2, i2,      \
+                               dbox3, start3, stride3, i3, dbox4, start4, stride4, i4)                       \
+    {                                                                                                        \
+        hypre_newBoxLoopInit(ndim, loop_size);                                                               \
+        hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                               \
+        hypre_BoxLoopDataDeclareK(2, ndim, loop_size, dbox2, start2, stride2);                               \
+        hypre_BoxLoopDataDeclareK(3, ndim, loop_size, dbox3, start3, stride3);                               \
+        hypre_BoxLoopDataDeclareK(4, ndim, loop_size, dbox4, start4, stride4);                               \
    Kokkos::parallel_for (hypre__tot, KOKKOS_LAMBDA (HYPRE_Int idx)      \
    {                                                                    \
       hypre_newBoxLoopDeclare(databox1);                                \
@@ -558,114 +495,99 @@ typedef struct hypre_Boxloop_struct
       hypre_BoxLoopIncK(3,databox3,i3);                                 \
       hypre_BoxLoopIncK(4,databox4,i4);
 
+#define hypre_newBoxLoop4End(i1, i2, i3, i4)                                                                 \
+    });                                                                                                       \
+    hypre_fence();                                                                                           \
+    }
 
-#define hypre_newBoxLoop4End(i1, i2, i3, i4)                            \
-   });                                                                  \
-   hypre_fence();                                                       \
-}
+#define hypre_BasicBoxLoopDataDeclareK(k, ndim, loop_size, stride)                                           \
+    hypre_Boxloop databox##k;                                                                                \
+    databox##k.lsize0 = loop_size[0];                                                                        \
+    databox##k.strides0 = stride[0];                                                                         \
+    databox##k.bstart0 = 0;                                                                                  \
+    databox##k.bsize0 = 0;                                                                                   \
+    if (ndim > 1) {                                                                                          \
+        databox##k.lsize1 = loop_size[1];                                                                    \
+        databox##k.strides1 = stride[1];                                                                     \
+        databox##k.bstart1 = 0;                                                                              \
+        databox##k.bsize1 = 0;                                                                               \
+    } else {                                                                                                 \
+        databox##k.lsize1 = 1;                                                                               \
+        databox##k.strides1 = 0;                                                                             \
+        databox##k.bstart1 = 0;                                                                              \
+        databox##k.bsize1 = 0;                                                                               \
+    }                                                                                                        \
+    if (ndim == 3) {                                                                                         \
+        databox##k.lsize2 = loop_size[2];                                                                    \
+        databox##k.strides2 = stride[2];                                                                     \
+        databox##k.bstart2 = 0;                                                                              \
+        databox##k.bsize2 = 0;                                                                               \
+    } else {                                                                                                 \
+        databox##k.lsize2 = 1;                                                                               \
+        databox##k.strides2 = 0;                                                                             \
+        databox##k.bstart2 = 0;                                                                              \
+        databox##k.bsize2 = 0;                                                                               \
+    }
 
-#define hypre_BasicBoxLoopDataDeclareK(k,ndim,loop_size,stride)         \
-        hypre_Boxloop databox##k;                                       \
-        databox##k.lsize0 = loop_size[0];                               \
-        databox##k.strides0 = stride[0];                                \
-        databox##k.bstart0  = 0;                                        \
-        databox##k.bsize0   = 0;                                        \
-        if (ndim > 1)                                                   \
-        {                                                               \
-            databox##k.lsize1 = loop_size[1];                           \
-            databox##k.strides1 = stride[1];                            \
-            databox##k.bstart1  = 0;                                    \
-            databox##k.bsize1   = 0;                                    \
-        }                                                               \
-        else                                                            \
-        {                                                               \
-                databox##k.lsize1 = 1;                                  \
-                databox##k.strides1 = 0;                                \
-                databox##k.bstart1  = 0;                                \
-                databox##k.bsize1   = 0;                                \
-        }                                                               \
-        if (ndim == 3)                                                  \
-        {                                                               \
-            databox##k.lsize2 = loop_size[2];                           \
-            databox##k.strides2 = stride[2];                            \
-            databox##k.bstart2  = 0;                                    \
-            databox##k.bsize2   = 0;                                    \
-        }                                                               \
-        else                                                            \
-        {                                                               \
-            databox##k.lsize2 = 1;                                      \
-            databox##k.strides2 = 0;                                    \
-            databox##k.bstart2  = 0;                                    \
-            databox##k.bsize2   = 0;                                    \
-        }
-
-#define hypre_newBasicBoxLoop2Begin(ndim, loop_size,                    \
-                                    stride1, i1,                        \
-                                    stride2, i2)                        \
-{                                                                       \
-   hypre_newBoxLoopInit(ndim,loop_size);                                \
-   hypre_BasicBoxLoopDataDeclareK(1,ndim,loop_size,stride1);            \
-   hypre_BasicBoxLoopDataDeclareK(2,ndim,loop_size,stride2);            \
+#define hypre_newBasicBoxLoop2Begin(ndim, loop_size, stride1, i1, stride2, i2)                               \
+    {                                                                                                        \
+        hypre_newBoxLoopInit(ndim, loop_size);                                                               \
+        hypre_BasicBoxLoopDataDeclareK(1, ndim, loop_size, stride1);                                         \
+        hypre_BasicBoxLoopDataDeclareK(2, ndim, loop_size, stride2);                                         \
    Kokkos::parallel_for (hypre__tot, KOKKOS_LAMBDA (HYPRE_Int idx)      \
    {                                                                    \
       hypre_newBoxLoopDeclare(databox1);                                \
       hypre_BoxLoopIncK(1,databox1,i1);                                 \
-      hypre_BoxLoopIncK(2,databox2,i2);                                 \
+      hypre_BoxLoopIncK(2,databox2,i2);
 
-#define hypre_BoxLoop1ReductionBegin(ndim, loop_size,                   \
-                                     dbox1, start1, stride1, i1,        \
-                                     HYPRE_BOX_REDUCTION)               \
- {                                                                      \
-     HYPRE_Real __hypre_sum_tmp = HYPRE_BOX_REDUCTION;                  \
-     HYPRE_BOX_REDUCTION = 0.0;                                         \
-     hypre_newBoxLoopInit(ndim,loop_size);                              \
-     hypre_BoxLoopDataDeclareK(1,ndim,loop_size,dbox1,start1,stride1);  \
+#define hypre_BoxLoop1ReductionBegin(ndim, loop_size, dbox1, start1, stride1, i1, HYPRE_BOX_REDUCTION)       \
+    {                                                                                                        \
+        HYPRE_Real __hypre_sum_tmp = HYPRE_BOX_REDUCTION;                                                    \
+        HYPRE_BOX_REDUCTION = 0.0;                                                                           \
+        hypre_newBoxLoopInit(ndim, loop_size);                                                               \
+        hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                               \
      Kokkos::parallel_reduce (hypre__tot, KOKKOS_LAMBDA (HYPRE_Int idx, \
                               HYPRE_Real &HYPRE_BOX_REDUCTION)          \
      {                                                                  \
         hypre_newBoxLoopDeclare(databox1);                              \
-        hypre_BoxLoopIncK(1,databox1,i1);                               \
-
-
-
-#define hypre_BoxLoop1ReductionEnd(i1, HYPRE_BOX_REDUCTION)            \
-     }, HYPRE_BOX_REDUCTION);                                           \
-     hypre_fence();                                                     \
-     HYPRE_BOX_REDUCTION += __hypre_sum_tmp;                            \
- }
-
-#define hypre_BoxLoop2ReductionBegin(ndim, loop_size,                  \
-                                      dbox1, start1, stride1, i1,       \
-                                      dbox2, start2, stride2, i2,       \
-                                      HYPRE_BOX_REDUCTION)              \
- {                                                                      \
-     HYPRE_Real __hypre_sum_tmp = HYPRE_BOX_REDUCTION;                  \
-     HYPRE_BOX_REDUCTION = 0.0;                                         \
-     hypre_newBoxLoopInit(ndim,loop_size);                              \
-     hypre_BoxLoopDataDeclareK(1,ndim,loop_size,dbox1,start1,stride1);  \
-     hypre_BoxLoopDataDeclareK(2,ndim,loop_size,dbox2,start2,stride2);  \
+        hypre_BoxLoopIncK(1,databox1,i1);
+
+#define hypre_BoxLoop1ReductionEnd(i1, HYPRE_BOX_REDUCTION)                                                  \
+    }, HYPRE_BOX_REDUCTION);                                                                                \
+    hypre_fence();                                                                                           \
+    HYPRE_BOX_REDUCTION += __hypre_sum_tmp;                                                                  \
+    }
+
+#define hypre_BoxLoop2ReductionBegin(ndim, loop_size, dbox1, start1, stride1, i1, dbox2, start2, stride2,    \
+                                     i2, HYPRE_BOX_REDUCTION)                                                \
+    {                                                                                                        \
+        HYPRE_Real __hypre_sum_tmp = HYPRE_BOX_REDUCTION;                                                    \
+        HYPRE_BOX_REDUCTION = 0.0;                                                                           \
+        hypre_newBoxLoopInit(ndim, loop_size);                                                               \
+        hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                               \
+        hypre_BoxLoopDataDeclareK(2, ndim, loop_size, dbox2, start2, stride2);                               \
      Kokkos::parallel_reduce (hypre__tot, KOKKOS_LAMBDA (HYPRE_Int idx, \
                               HYPRE_Real &HYPRE_BOX_REDUCTION)          \
      {                                                                  \
          hypre_newBoxLoopDeclare(databox1);                             \
          hypre_BoxLoopIncK(1,databox1,i1);                              \
-         hypre_BoxLoopIncK(2,databox2,i2);                              \
+         hypre_BoxLoopIncK(2,databox2,i2);
 
-#define hypre_BoxLoop2ReductionEnd(i1, i2, HYPRE_BOX_REDUCTION)        \
-     }, HYPRE_BOX_REDUCTION);                                           \
-     hypre_fence();                                                     \
-     HYPRE_BOX_REDUCTION += __hypre_sum_tmp;                            \
- }
+#define hypre_BoxLoop2ReductionEnd(i1, i2, HYPRE_BOX_REDUCTION)                                              \
+    }, HYPRE_BOX_REDUCTION);                                                                                \
+    hypre_fence();                                                                                           \
+    HYPRE_BOX_REDUCTION += __hypre_sum_tmp;                                                                  \
+    }
 
-#define hypre_LoopBegin(size,idx)                                       \
-{                                                                       \
+#define hypre_LoopBegin(size, idx)                                                                           \
+    {                                                                                                        \
    Kokkos::parallel_for(size, KOKKOS_LAMBDA (HYPRE_Int idx)             \
    {
 
-#define hypre_LoopEnd()                                                 \
-   });                                                                  \
-   hypre_fence();                                                       \
-}
+#define hypre_LoopEnd()                                                                                      \
+    });                                                                                                       \
+    hypre_fence();                                                                                           \
+    }
 
 /*
 extern "C++"
@@ -704,27 +626,27 @@ struct ColumnSums
 }
 */
 
-#define hypre_BoxLoopGetIndex(index)     \
-  index[0] = hypre_IndexD(local_idx, 0); \
-  index[1] = hypre_IndexD(local_idx, 1); \
-  index[2] = hypre_IndexD(local_idx, 2);
-
-#define hypre_BoxLoopBlock()       0
-#define hypre_BoxLoop0Begin      hypre_newBoxLoop0Begin
-#define hypre_BoxLoop0For        hypre_newBoxLoop0For
-#define hypre_BoxLoop0End        hypre_newBoxLoop0End
-#define hypre_BoxLoop1Begin      hypre_newBoxLoop1Begin
-#define hypre_BoxLoop1For        hypre_newBoxLoop1For
-#define hypre_BoxLoop1End        hypre_newBoxLoop1End
-#define hypre_BoxLoop2Begin      hypre_newBoxLoop2Begin
-#define hypre_BoxLoop2For        hypre_newBoxLoop2For
-#define hypre_BoxLoop2End        hypre_newBoxLoop2End
-#define hypre_BoxLoop3Begin      hypre_newBoxLoop3Begin
-#define hypre_BoxLoop3For        hypre_newBoxLoop3For
-#define hypre_BoxLoop3End        hypre_newBoxLoop3End
-#define hypre_BoxLoop4Begin      hypre_newBoxLoop4Begin
-#define hypre_BoxLoop4For        hypre_newBoxLoop4For
-#define hypre_BoxLoop4End        hypre_newBoxLoop4End
+#define hypre_BoxLoopGetIndex(index)                                                                         \
+    index[0] = hypre_IndexD(local_idx, 0);                                                                   \
+    index[1] = hypre_IndexD(local_idx, 1);                                                                   \
+    index[2] = hypre_IndexD(local_idx, 2);
+
+#define hypre_BoxLoopBlock() 0
+#define hypre_BoxLoop0Begin hypre_newBoxLoop0Begin
+#define hypre_BoxLoop0For hypre_newBoxLoop0For
+#define hypre_BoxLoop0End hypre_newBoxLoop0End
+#define hypre_BoxLoop1Begin hypre_newBoxLoop1Begin
+#define hypre_BoxLoop1For hypre_newBoxLoop1For
+#define hypre_BoxLoop1End hypre_newBoxLoop1End
+#define hypre_BoxLoop2Begin hypre_newBoxLoop2Begin
+#define hypre_BoxLoop2For hypre_newBoxLoop2For
+#define hypre_BoxLoop2End hypre_newBoxLoop2End
+#define hypre_BoxLoop3Begin hypre_newBoxLoop3Begin
+#define hypre_BoxLoop3For hypre_newBoxLoop3For
+#define hypre_BoxLoop3End hypre_newBoxLoop3End
+#define hypre_BoxLoop4Begin hypre_newBoxLoop4Begin
+#define hypre_BoxLoop4For hypre_newBoxLoop4For
+#define hypre_BoxLoop4End hypre_newBoxLoop4End
 
 #define hypre_BasicBoxLoop2Begin hypre_newBasicBoxLoop2Begin
 
@@ -752,299 +674,245 @@ struct ColumnSums
 #ifndef HYPRE_BOXLOOP_CUDA_HEADER
 #define HYPRE_BOXLOOP_CUDA_HEADER
 
-#if (defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)) && !defined(HYPRE_USING_RAJA) && !defined(HYPRE_USING_KOKKOS)
+#if (defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)) && !defined(HYPRE_USING_RAJA)                    \
+        && !defined(HYPRE_USING_KOKKOS)
 
-#define HYPRE_LAMBDA [=] __host__  __device__
+#define HYPRE_LAMBDA [=] __host__ __device__
 
 /* TODO: RL: support 4-D */
-typedef struct hypre_Boxloop_struct
-{
-   HYPRE_Int lsize0, lsize1, lsize2;
-   HYPRE_Int strides0, strides1, strides2;
-   HYPRE_Int bstart0, bstart1, bstart2;
-   HYPRE_Int bsize0, bsize1, bsize2;
+typedef struct hypre_Boxloop_struct {
+    HYPRE_Int lsize0, lsize1, lsize2;
+    HYPRE_Int strides0, strides1, strides2;
+    HYPRE_Int bstart0, bstart1, bstart2;
+    HYPRE_Int bsize0, bsize1, bsize2;
 } hypre_Boxloop;
 
 #ifdef __cplusplus
-extern "C++"
-{
+extern "C++" {
 #endif
 
-   /* -------------------------
+/* -------------------------
     *     parfor-loop
     * ------------------------*/
 
-   template <typename LOOP_BODY>
-   __global__ void
-   forall_kernel( hypre_DeviceItem & item,
-                  LOOP_BODY loop_body,
-                  HYPRE_Int length )
-   {
-      const HYPRE_Int idx = hypre_gpu_get_grid_thread_id<1, 1>(item);
-      /* const HYPRE_Int number_threads = hypre_gpu_get_grid_num_threads<1,1>(item); */
+template <typename LOOP_BODY>
+__global__ void forall_kernel(hypre_DeviceItem &item, LOOP_BODY loop_body, HYPRE_Int length) {
+    const HYPRE_Int idx = hypre_gpu_get_grid_thread_id<1, 1>(item);
+    /* const HYPRE_Int number_threads = hypre_gpu_get_grid_num_threads<1,1>(item); */
 
-      if (idx < length)
-      {
-         loop_body(idx);
-      }
-   }
-
-   template<typename LOOP_BODY>
-   void
-   BoxLoopforall( HYPRE_Int length,
-                  LOOP_BODY loop_body )
-   {
-      const HYPRE_MemoryLocation memory_location = hypre_HandleMemoryLocation(hypre_handle());
-      const HYPRE_ExecutionPolicy exec_policy = hypre_GetExecPolicy1(memory_location);
+    if (idx < length) { loop_body(idx); }
+}
 
-      if (exec_policy == HYPRE_EXEC_HOST)
-      {
+template <typename LOOP_BODY>
+void BoxLoopforall(HYPRE_Int length, LOOP_BODY loop_body) {
+    const HYPRE_MemoryLocation memory_location = hypre_HandleMemoryLocation(hypre_handle());
+    const HYPRE_ExecutionPolicy exec_policy = hypre_GetExecPolicy1(memory_location);
+
+    if (exec_policy == HYPRE_EXEC_HOST) {
 #ifdef HYPRE_USING_OPENMP
-         #pragma omp parallel for HYPRE_SMP_SCHEDULE
+#pragma omp parallel for HYPRE_SMP_SCHEDULE
 #endif
-         for (HYPRE_Int idx = 0; idx < length; idx++)
-         {
-            loop_body(idx);
-         }
-      }
-      else if (exec_policy == HYPRE_EXEC_DEVICE)
-      {
-         const dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
-         const dim3 gDim = hypre_GetDefaultDeviceGridDimension(length, "thread", bDim);
+        for (HYPRE_Int idx = 0; idx < length; idx++) { loop_body(idx); }
+    } else if (exec_policy == HYPRE_EXEC_DEVICE) {
+        const dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+        const dim3 gDim = hypre_GetDefaultDeviceGridDimension(length, "thread", bDim);
 
-         HYPRE_GPU_LAUNCH( forall_kernel, gDim, bDim, loop_body, length );
-      }
-   }
+        HYPRE_GPU_LAUNCH(forall_kernel, gDim, bDim, loop_body, length);
+    }
+}
 
-   /* ------------------------------
+/* ------------------------------
     *     parforreduction-loop
     * -----------------------------*/
 
-   template <typename LOOP_BODY, typename REDUCER>
-   __global__ void
-   reductionforall_kernel( hypre_DeviceItem & item,
-                           HYPRE_Int length,
-                           REDUCER   reducer,
-                           LOOP_BODY loop_body )
-   {
-      const HYPRE_Int thread_id = hypre_gpu_get_grid_thread_id<1, 1>(item);
-      const HYPRE_Int n_threads = hypre_gpu_get_grid_num_threads<1, 1>(item);
+template <typename LOOP_BODY, typename REDUCER>
+__global__ void reductionforall_kernel(hypre_DeviceItem &item, HYPRE_Int length, REDUCER reducer,
+                                       LOOP_BODY loop_body) {
+    const HYPRE_Int thread_id = hypre_gpu_get_grid_thread_id<1, 1>(item);
+    const HYPRE_Int n_threads = hypre_gpu_get_grid_num_threads<1, 1>(item);
 
-      for (HYPRE_Int idx = thread_id; idx < length; idx += n_threads)
-      {
-         loop_body(idx, reducer);
-      }
-
-      /* reduction in block-level and the save the results in reducer */
-      reducer.BlockReduce();
-   }
-
-   template<typename LOOP_BODY, typename REDUCER>
-   void
-   ReductionBoxLoopforall( HYPRE_Int  length,
-                           REDUCER   & reducer,
-                           LOOP_BODY  loop_body )
-   {
-      if (length <= 0)
-      {
-         return;
-      }
+    for (HYPRE_Int idx = thread_id; idx < length; idx += n_threads) { loop_body(idx, reducer); }
+
+    /* reduction in block-level and the save the results in reducer */
+    reducer.BlockReduce();
+}
 
-      const HYPRE_MemoryLocation memory_location = hypre_HandleMemoryLocation(hypre_handle());
-      const HYPRE_ExecutionPolicy exec_policy = hypre_GetExecPolicy1(memory_location);
+template <typename LOOP_BODY, typename REDUCER>
+void ReductionBoxLoopforall(HYPRE_Int length, REDUCER &reducer, LOOP_BODY loop_body) {
+    if (length <= 0) { return; }
 
-      if (exec_policy == HYPRE_EXEC_HOST)
-      {
-         for (HYPRE_Int idx = 0; idx < length; idx++)
-         {
-            loop_body(idx, reducer);
-         }
-      }
-      else if (exec_policy == HYPRE_EXEC_DEVICE)
-      {
-         /* Assume gDim cannot exceed HYPRE_MAX_NTHREADS_BLOCK (the max size for the 2nd reduction)
+    const HYPRE_MemoryLocation memory_location = hypre_HandleMemoryLocation(hypre_handle());
+    const HYPRE_ExecutionPolicy exec_policy = hypre_GetExecPolicy1(memory_location);
+
+    if (exec_policy == HYPRE_EXEC_HOST) {
+        for (HYPRE_Int idx = 0; idx < length; idx++) { loop_body(idx, reducer); }
+    } else if (exec_policy == HYPRE_EXEC_DEVICE) {
+        /* Assume gDim cannot exceed HYPRE_MAX_NTHREADS_BLOCK (the max size for the 2nd reduction)
           * and bDim <= WARP * WARP (because we use 1 warp fro the block-level reduction) */
-         const dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
-         dim3 gDim = hypre_GetDefaultDeviceGridDimension(length, "thread", bDim);
-         gDim.x = hypre_min(gDim.x, HYPRE_MAX_NTHREADS_BLOCK);
+        const dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+        dim3 gDim = hypre_GetDefaultDeviceGridDimension(length, "thread", bDim);
+        gDim.x = hypre_min(gDim.x, HYPRE_MAX_NTHREADS_BLOCK);
 
-         reducer.nblocks = gDim.x;
+        reducer.nblocks = gDim.x;
 
-         reducer.Allocate2ndPhaseBuffer();
+        reducer.Allocate2ndPhaseBuffer();
 
-         /*
+        /*
          hypre_printf("length= %d, blocksize = %d, gridsize = %d\n", length, bDim.x, gDim.x);
          */
 
-         HYPRE_GPU_LAUNCH( reductionforall_kernel, gDim, bDim, length, reducer, loop_body );
-      }
-   }
+        HYPRE_GPU_LAUNCH(reductionforall_kernel, gDim, bDim, length, reducer, loop_body);
+    }
+}
 
 #ifdef __cplusplus
 }
 #endif
 
 /* Get 1-D length of the loop, in hypre__tot */
-#define hypre_newBoxLoopInit(ndim, loop_size)              \
-   HYPRE_Int hypre__tot = 1;                               \
-   for (HYPRE_Int hypre_d = 0; hypre_d < ndim; hypre_d ++) \
-   {                                                       \
-      hypre__tot *= loop_size[hypre_d];                    \
-   }
+#define hypre_newBoxLoopInit(ndim, loop_size)                                                                \
+    HYPRE_Int hypre__tot = 1;                                                                                \
+    for (HYPRE_Int hypre_d = 0; hypre_d < ndim; hypre_d++) { hypre__tot *= loop_size[hypre_d]; }
 
 /* Initialize struct for box-k */
-#define hypre_BoxLoopDataDeclareK(k, ndim, loop_size, dbox, start, stride) \
-   hypre_Boxloop databox##k;                                               \
-   /* dim 0 */                                                             \
-   databox##k.lsize0   = loop_size[0];                                     \
-   databox##k.strides0 = stride[0];                                        \
-   databox##k.bstart0  = start[0] - dbox->imin[0];                         \
-   databox##k.bsize0   = dbox->imax[0] - dbox->imin[0];                    \
-   /* dim 1 */                                                             \
-   if (ndim > 1)                                                           \
-   {                                                                       \
-      databox##k.lsize1   = loop_size[1];                                  \
-      databox##k.strides1 = stride[1];                                     \
-      databox##k.bstart1  = start[1] - dbox->imin[1];                      \
-      databox##k.bsize1   = dbox->imax[1] - dbox->imin[1];                 \
-   }                                                                       \
-   else                                                                    \
-   {                                                                       \
-      databox##k.lsize1   = 1;                                             \
-      databox##k.strides1 = 0;                                             \
-      databox##k.bstart1  = 0;                                             \
-      databox##k.bsize1   = 0;                                             \
-   }                                                                       \
-   /* dim 2 */                                                             \
-   if (ndim == 3)                                                          \
-   {                                                                       \
-      databox##k.lsize2   = loop_size[2];                                  \
-      databox##k.strides2 = stride[2];                                     \
-      databox##k.bstart2  = start[2] - dbox->imin[2];                      \
-      databox##k.bsize2   = dbox->imax[2] - dbox->imin[2];                 \
-   }                                                                       \
-   else                                                                    \
-   {                                                                       \
-      databox##k.lsize2   = 1;                                             \
-      databox##k.strides2 = 0;                                             \
-      databox##k.bstart2  = 0;                                             \
-      databox##k.bsize2   = 0;                                             \
-   }
-
-#define hypre_BasicBoxLoopDataDeclareK(k,ndim,loop_size,stride) \
-hypre_Boxloop databox##k;                                       \
-databox##k.lsize0   = loop_size[0];                             \
-databox##k.strides0 = stride[0];                                \
-databox##k.bstart0  = 0;                                        \
-databox##k.bsize0   = 0;                                        \
-if (ndim > 1)                                                   \
-{                                                               \
-   databox##k.lsize1   = loop_size[1];                          \
-   databox##k.strides1 = stride[1];                             \
-   databox##k.bstart1  = 0;                                     \
-   databox##k.bsize1   = 0;                                     \
-}                                                               \
-else                                                            \
-{                                                               \
-   databox##k.lsize1   = 1;                                     \
-   databox##k.strides1 = 0;                                     \
-   databox##k.bstart1  = 0;                                     \
-   databox##k.bsize1   = 0;                                     \
-}                                                               \
-if (ndim == 3)                                                  \
-{                                                               \
-   databox##k.lsize2   = loop_size[2];                          \
-   databox##k.strides2 = stride[2];                             \
-   databox##k.bstart2  = 0;                                     \
-   databox##k.bsize2   = 0;                                     \
-}                                                               \
-else                                                            \
-{                                                               \
-    databox##k.lsize2   = 1;                                    \
-    databox##k.strides2 = 0;                                    \
-    databox##k.bstart2  = 0;                                    \
-    databox##k.bsize2   = 0;                                    \
-}
+#define hypre_BoxLoopDataDeclareK(k, ndim, loop_size, dbox, start, stride)                                   \
+    hypre_Boxloop databox##k;                                                                                \
+    /* dim 0 */                                                                                              \
+    databox##k.lsize0 = loop_size[0];                                                                        \
+    databox##k.strides0 = stride[0];                                                                         \
+    databox##k.bstart0 = start[0] - dbox->imin[0];                                                           \
+    databox##k.bsize0 = dbox->imax[0] - dbox->imin[0];                                                       \
+    /* dim 1 */                                                                                              \
+    if (ndim > 1) {                                                                                          \
+        databox##k.lsize1 = loop_size[1];                                                                    \
+        databox##k.strides1 = stride[1];                                                                     \
+        databox##k.bstart1 = start[1] - dbox->imin[1];                                                       \
+        databox##k.bsize1 = dbox->imax[1] - dbox->imin[1];                                                   \
+    } else {                                                                                                 \
+        databox##k.lsize1 = 1;                                                                               \
+        databox##k.strides1 = 0;                                                                             \
+        databox##k.bstart1 = 0;                                                                              \
+        databox##k.bsize1 = 0;                                                                               \
+    }                                                                                                        \
+    /* dim 2 */                                                                                              \
+    if (ndim == 3) {                                                                                         \
+        databox##k.lsize2 = loop_size[2];                                                                    \
+        databox##k.strides2 = stride[2];                                                                     \
+        databox##k.bstart2 = start[2] - dbox->imin[2];                                                       \
+        databox##k.bsize2 = dbox->imax[2] - dbox->imin[2];                                                   \
+    } else {                                                                                                 \
+        databox##k.lsize2 = 1;                                                                               \
+        databox##k.strides2 = 0;                                                                             \
+        databox##k.bstart2 = 0;                                                                              \
+        databox##k.bsize2 = 0;                                                                               \
+    }
+
+#define hypre_BasicBoxLoopDataDeclareK(k, ndim, loop_size, stride)                                           \
+    hypre_Boxloop databox##k;                                                                                \
+    databox##k.lsize0 = loop_size[0];                                                                        \
+    databox##k.strides0 = stride[0];                                                                         \
+    databox##k.bstart0 = 0;                                                                                  \
+    databox##k.bsize0 = 0;                                                                                   \
+    if (ndim > 1) {                                                                                          \
+        databox##k.lsize1 = loop_size[1];                                                                    \
+        databox##k.strides1 = stride[1];                                                                     \
+        databox##k.bstart1 = 0;                                                                              \
+        databox##k.bsize1 = 0;                                                                               \
+    } else {                                                                                                 \
+        databox##k.lsize1 = 1;                                                                               \
+        databox##k.strides1 = 0;                                                                             \
+        databox##k.bstart1 = 0;                                                                              \
+        databox##k.bsize1 = 0;                                                                               \
+    }                                                                                                        \
+    if (ndim == 3) {                                                                                         \
+        databox##k.lsize2 = loop_size[2];                                                                    \
+        databox##k.strides2 = stride[2];                                                                     \
+        databox##k.bstart2 = 0;                                                                              \
+        databox##k.bsize2 = 0;                                                                               \
+    } else {                                                                                                 \
+        databox##k.lsize2 = 1;                                                                               \
+        databox##k.strides2 = 0;                                                                             \
+        databox##k.bstart2 = 0;                                                                              \
+        databox##k.bsize2 = 0;                                                                               \
+    }
 
 /* RL: TODO loop_size out of box struct, bsize +1 */
 /* Given input 1-D 'idx' in box, get 3-D 'local_idx' in loop_size */
-#define hypre_newBoxLoopDeclare(box)                     \
-   hypre_Index local_idx;                                \
-   HYPRE_Int idx_local = idx;                            \
-   hypre_IndexD(local_idx, 0)  = idx_local % box.lsize0; \
-   idx_local = idx_local / box.lsize0;                   \
-   hypre_IndexD(local_idx, 1)  = idx_local % box.lsize1; \
-   idx_local = idx_local / box.lsize1;                   \
-   hypre_IndexD(local_idx, 2)  = idx_local % box.lsize2; \
+#define hypre_newBoxLoopDeclare(box)                                                                         \
+    hypre_Index local_idx;                                                                                   \
+    HYPRE_Int idx_local = idx;                                                                               \
+    hypre_IndexD(local_idx, 0) = idx_local % box.lsize0;                                                     \
+    idx_local = idx_local / box.lsize0;                                                                      \
+    hypre_IndexD(local_idx, 1) = idx_local % box.lsize1;                                                     \
+    idx_local = idx_local / box.lsize1;                                                                      \
+    hypre_IndexD(local_idx, 2) = idx_local % box.lsize2;
 
 /* Given input 3-D 'local_idx', get 1-D 'hypre__i' in 'box' */
-#define hypre_BoxLoopIncK(k, box, hypre__i)                                               \
-   HYPRE_Int hypre_boxD##k = 1;                                                           \
-   HYPRE_Int hypre__i = 0;                                                                \
-   hypre__i += (hypre_IndexD(local_idx, 0) * box.strides0 + box.bstart0) * hypre_boxD##k; \
-   hypre_boxD##k *= hypre_max(0, box.bsize0 + 1);                                         \
-   hypre__i += (hypre_IndexD(local_idx, 1) * box.strides1 + box.bstart1) * hypre_boxD##k; \
-   hypre_boxD##k *= hypre_max(0, box.bsize1 + 1);                                         \
-   hypre__i += (hypre_IndexD(local_idx, 2) * box.strides2 + box.bstart2) * hypre_boxD##k; \
-   hypre_boxD##k *= hypre_max(0, box.bsize2 + 1);
+#define hypre_BoxLoopIncK(k, box, hypre__i)                                                                  \
+    HYPRE_Int hypre_boxD##k = 1;                                                                             \
+    HYPRE_Int hypre__i = 0;                                                                                  \
+    hypre__i += (hypre_IndexD(local_idx, 0) * box.strides0 + box.bstart0) * hypre_boxD##k;                   \
+    hypre_boxD##k *= hypre_max(0, box.bsize0 + 1);                                                           \
+    hypre__i += (hypre_IndexD(local_idx, 1) * box.strides1 + box.bstart1) * hypre_boxD##k;                   \
+    hypre_boxD##k *= hypre_max(0, box.bsize1 + 1);                                                           \
+    hypre__i += (hypre_IndexD(local_idx, 2) * box.strides2 + box.bstart2) * hypre_boxD##k;                   \
+    hypre_boxD##k *= hypre_max(0, box.bsize2 + 1);
 
 /* get 3-D local_idx into 'index' */
-#define hypre_BoxLoopGetIndexCUDA(index)                                                              \
-   index[0] = hypre_IndexD(local_idx, 0);                                                             \
-   index[1] = hypre_IndexD(local_idx, 1);                                                             \
-   index[2] = hypre_IndexD(local_idx, 2);
+#define hypre_BoxLoopGetIndexCUDA(index)                                                                     \
+    index[0] = hypre_IndexD(local_idx, 0);                                                                   \
+    index[1] = hypre_IndexD(local_idx, 1);                                                                   \
+    index[2] = hypre_IndexD(local_idx, 2);
 
 /* BoxLoop 0 */
-#define hypre_BoxLoop0BeginCUDA(ndim, loop_size)                                                      \
-{                                                                                                     \
-   hypre_newBoxLoopInit(ndim, loop_size);                                                             \
+#define hypre_BoxLoop0BeginCUDA(ndim, loop_size)                                                             \
+    {                                                                                                        \
+        hypre_newBoxLoopInit(ndim, loop_size);                                                               \
    BoxLoopforall(hypre__tot, HYPRE_LAMBDA (HYPRE_Int idx)                                             \
    {
 
-#define hypre_BoxLoop0EndCUDA()                                                                       \
-   });                                                                                                \
-}
+#define hypre_BoxLoop0EndCUDA()                                                                              \
+    });                                                                                                       \
+    }
 
 /* BoxLoop 1 */
-#define hypre_BoxLoop1BeginCUDA(ndim, loop_size, dbox1, start1, stride1, i1)                          \
-{                                                                                                     \
-   hypre_newBoxLoopInit(ndim, loop_size);                                                             \
-   hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                             \
+#define hypre_BoxLoop1BeginCUDA(ndim, loop_size, dbox1, start1, stride1, i1)                                 \
+    {                                                                                                        \
+        hypre_newBoxLoopInit(ndim, loop_size);                                                               \
+        hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                               \
    BoxLoopforall(hypre__tot, HYPRE_LAMBDA (HYPRE_Int idx)                                             \
    {                                                                                                  \
       hypre_newBoxLoopDeclare(databox1);                                                              \
       hypre_BoxLoopIncK(1, databox1, i1);
 
-#define hypre_BoxLoop1EndCUDA(i1)                                                                     \
-   });                                                                                                \
-}
+#define hypre_BoxLoop1EndCUDA(i1)                                                                            \
+    });                                                                                                       \
+    }
 
 /* BoxLoop 2 */
-#define hypre_BoxLoop2BeginCUDA(ndim, loop_size, dbox1, start1, stride1, i1,                          \
-                                                 dbox2, start2, stride2, i2)                          \
-{                                                                                                     \
-   hypre_newBoxLoopInit(ndim, loop_size);                                                             \
-   hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                             \
-   hypre_BoxLoopDataDeclareK(2, ndim, loop_size, dbox2, start2, stride2);                             \
+#define hypre_BoxLoop2BeginCUDA(ndim, loop_size, dbox1, start1, stride1, i1, dbox2, start2, stride2, i2)     \
+    {                                                                                                        \
+        hypre_newBoxLoopInit(ndim, loop_size);                                                               \
+        hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                               \
+        hypre_BoxLoopDataDeclareK(2, ndim, loop_size, dbox2, start2, stride2);                               \
    BoxLoopforall(hypre__tot, HYPRE_LAMBDA (HYPRE_Int idx)                                             \
    {                                                                                                  \
       hypre_newBoxLoopDeclare(databox1);                                                              \
       hypre_BoxLoopIncK(1, databox1, i1);                                                             \
       hypre_BoxLoopIncK(2, databox2, i2);
 
-#define hypre_BoxLoop2EndCUDA(i1, i2)                                                                 \
-   });                                                                                                \
-}
+#define hypre_BoxLoop2EndCUDA(i1, i2)                                                                        \
+    });                                                                                                       \
+    }
 
 /* BoxLoop 3 */
-#define hypre_BoxLoop3BeginCUDA(ndim, loop_size, dbox1, start1, stride1, i1,                          \
-                                                 dbox2, start2, stride2, i2,                          \
-                                                 dbox3, start3, stride3, i3)                          \
-{                                                                                                     \
-   hypre_newBoxLoopInit(ndim, loop_size);                                                             \
-   hypre_BoxLoopDataDeclareK(1, ndim,loop_size, dbox1, start1, stride1);                              \
-   hypre_BoxLoopDataDeclareK(2, ndim,loop_size, dbox2, start2, stride2);                              \
-   hypre_BoxLoopDataDeclareK(3, ndim,loop_size, dbox3, start3, stride3);                              \
+#define hypre_BoxLoop3BeginCUDA(ndim, loop_size, dbox1, start1, stride1, i1, dbox2, start2, stride2, i2,     \
+                                dbox3, start3, stride3, i3)                                                  \
+    {                                                                                                        \
+        hypre_newBoxLoopInit(ndim, loop_size);                                                               \
+        hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                               \
+        hypre_BoxLoopDataDeclareK(2, ndim, loop_size, dbox2, start2, stride2);                               \
+        hypre_BoxLoopDataDeclareK(3, ndim, loop_size, dbox3, start3, stride3);                               \
    BoxLoopforall(hypre__tot, HYPRE_LAMBDA (HYPRE_Int idx)                                             \
    {                                                                                                  \
       hypre_newBoxLoopDeclare(databox1);                                                              \
@@ -1052,21 +920,19 @@ else                                                            \
       hypre_BoxLoopIncK(2, databox2, i2);                                                             \
       hypre_BoxLoopIncK(3, databox3, i3);
 
-#define hypre_BoxLoop3EndCUDA(i1, i2, i3)                                                             \
-   });                                                                                                \
-}
+#define hypre_BoxLoop3EndCUDA(i1, i2, i3)                                                                    \
+    });                                                                                                       \
+    }
 
 /* BoxLoop 4 */
-#define hypre_BoxLoop4BeginCUDA(ndim, loop_size, dbox1, start1, stride1, i1,                          \
-                                                 dbox2, start2, stride2, i2,                          \
-                                                 dbox3, start3, stride3, i3,                          \
-                                                 dbox4, start4, stride4, i4)                          \
-{                                                                                                     \
-   hypre_newBoxLoopInit(ndim, loop_size);                                                             \
-   hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                             \
-   hypre_BoxLoopDataDeclareK(2, ndim, loop_size, dbox2, start2, stride2);                             \
-   hypre_BoxLoopDataDeclareK(3, ndim, loop_size, dbox3, start3, stride3);                             \
-   hypre_BoxLoopDataDeclareK(4, ndim, loop_size, dbox4, start4, stride4);                             \
+#define hypre_BoxLoop4BeginCUDA(ndim, loop_size, dbox1, start1, stride1, i1, dbox2, start2, stride2, i2,     \
+                                dbox3, start3, stride3, i3, dbox4, start4, stride4, i4)                      \
+    {                                                                                                        \
+        hypre_newBoxLoopInit(ndim, loop_size);                                                               \
+        hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                               \
+        hypre_BoxLoopDataDeclareK(2, ndim, loop_size, dbox2, start2, stride2);                               \
+        hypre_BoxLoopDataDeclareK(3, ndim, loop_size, dbox3, start3, stride3);                               \
+        hypre_BoxLoopDataDeclareK(4, ndim, loop_size, dbox4, start4, stride4);                               \
    BoxLoopforall(hypre__tot, HYPRE_LAMBDA (HYPRE_Int idx)                                             \
    {                                                                                                  \
       hypre_newBoxLoopDeclare(databox1);                                                              \
@@ -1075,118 +941,117 @@ else                                                            \
       hypre_BoxLoopIncK(3, databox3, i3);                                                             \
       hypre_BoxLoopIncK(4, databox4, i4);
 
-#define hypre_BoxLoop4EndCUDA(i1, i2, i3, i4)                                                         \
-   });                                                                                                \
-}
+#define hypre_BoxLoop4EndCUDA(i1, i2, i3, i4)                                                                \
+    });                                                                                                       \
+    }
 
 /* Basic BoxLoops have no boxes */
 /* BoxLoop 1 */
-#define hypre_BasicBoxLoop1BeginCUDA(ndim, loop_size, stride1, i1)                                    \
-{                                                                                                     \
-   hypre_newBoxLoopInit(ndim, loop_size);                                                             \
-   hypre_BasicBoxLoopDataDeclareK(1, ndim, loop_size, stride1);                                       \
+#define hypre_BasicBoxLoop1BeginCUDA(ndim, loop_size, stride1, i1)                                           \
+    {                                                                                                        \
+        hypre_newBoxLoopInit(ndim, loop_size);                                                               \
+        hypre_BasicBoxLoopDataDeclareK(1, ndim, loop_size, stride1);                                         \
    BoxLoopforall(hypre__tot, HYPRE_LAMBDA (HYPRE_Int idx)                                             \
    {                                                                                                  \
       hypre_newBoxLoopDeclare(databox1);                                                              \
       hypre_BoxLoopIncK(1, databox1, i1);
 
 /* BoxLoop 2 */
-#define hypre_BasicBoxLoop2BeginCUDA(ndim, loop_size, stride1, i1, stride2, i2)                       \
-{                                                                                                     \
-   hypre_newBoxLoopInit(ndim, loop_size);                                                             \
-   hypre_BasicBoxLoopDataDeclareK(1, ndim, loop_size, stride1);                                       \
-   hypre_BasicBoxLoopDataDeclareK(2, ndim, loop_size, stride2);                                       \
+#define hypre_BasicBoxLoop2BeginCUDA(ndim, loop_size, stride1, i1, stride2, i2)                              \
+    {                                                                                                        \
+        hypre_newBoxLoopInit(ndim, loop_size);                                                               \
+        hypre_BasicBoxLoopDataDeclareK(1, ndim, loop_size, stride1);                                         \
+        hypre_BasicBoxLoopDataDeclareK(2, ndim, loop_size, stride2);                                         \
    BoxLoopforall(hypre__tot, HYPRE_LAMBDA (HYPRE_Int idx)                                             \
    {                                                                                                  \
       hypre_newBoxLoopDeclare(databox1);                                                              \
       hypre_BoxLoopIncK(1, databox1, i1);                                                             \
-      hypre_BoxLoopIncK(2, databox2, i2);                                                             \
+      hypre_BoxLoopIncK(2, databox2, i2);
 
 /* Parallel for-loop */
-#define hypre_LoopBeginCUDA(size, idx)                                                                \
-{                                                                                                     \
+#define hypre_LoopBeginCUDA(size, idx)                                                                       \
+    {                                                                                                        \
    BoxLoopforall(size, HYPRE_LAMBDA (HYPRE_Int idx)                                                   \
    {
 
-#define hypre_LoopEndCUDA()                                                                           \
-   });                                                                                                \
-}
+#define hypre_LoopEndCUDA()                                                                                  \
+    });                                                                                                       \
+    }
 
 /* Reduction BoxLoop1 */
-#define hypre_BoxLoop1ReductionBeginCUDA(ndim, loop_size, dbox1, start1, stride1, i1, reducesum)                 \
-{                                                                                                                \
-   hypre_newBoxLoopInit(ndim, loop_size);                                                                        \
-   hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                                        \
+#define hypre_BoxLoop1ReductionBeginCUDA(ndim, loop_size, dbox1, start1, stride1, i1, reducesum)              \
+    {                                                                                                         \
+        hypre_newBoxLoopInit(ndim, loop_size);                                                                \
+        hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                                \
    ReductionBoxLoopforall(hypre__tot, reducesum, HYPRE_LAMBDA (HYPRE_Int idx, decltype(reducesum) &reducesum)    \
    {                                                                                                             \
       hypre_newBoxLoopDeclare(databox1);                                                                         \
       hypre_BoxLoopIncK(1, databox1, i1);
 
-#define hypre_BoxLoop1ReductionEndCUDA(i1, reducesum)                                                            \
-   });                                                                                                           \
-}
+#define hypre_BoxLoop1ReductionEndCUDA(i1, reducesum)                                                        \
+    });                                                                                                       \
+    }
 
 /* Reduction BoxLoop2 */
-#define hypre_BoxLoop2ReductionBeginCUDA(ndim, loop_size, dbox1, start1, stride1, i1,                            \
-                                                          dbox2, start2, stride2, i2, reducesum)                 \
-{                                                                                                                \
-   hypre_newBoxLoopInit(ndim, loop_size);                                                                        \
-   hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                                        \
-   hypre_BoxLoopDataDeclareK(2, ndim, loop_size, dbox2, start2, stride2);                                        \
+#define hypre_BoxLoop2ReductionBeginCUDA(ndim, loop_size, dbox1, start1, stride1, i1, dbox2, start2,          \
+                                         stride2, i2, reducesum)                                              \
+    {                                                                                                         \
+        hypre_newBoxLoopInit(ndim, loop_size);                                                                \
+        hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                                \
+        hypre_BoxLoopDataDeclareK(2, ndim, loop_size, dbox2, start2, stride2);                                \
    ReductionBoxLoopforall(hypre__tot, reducesum, HYPRE_LAMBDA (HYPRE_Int idx, decltype(reducesum) &reducesum)    \
    {                                                                                                             \
       hypre_newBoxLoopDeclare(databox1);                                                                         \
       hypre_BoxLoopIncK(1, databox1, i1);                                                                        \
       hypre_BoxLoopIncK(2, databox2, i2);
 
-#define hypre_BoxLoop2ReductionEndCUDA(i1, i2, reducesum)                                                        \
-   });                                                                                                           \
-}
+#define hypre_BoxLoop2ReductionEndCUDA(i1, i2, reducesum)                                                    \
+    });                                                                                                       \
+    }
 
 /* Renamings */
-#define hypre_BoxLoopGetIndexDevice          hypre_BoxLoopGetIndexCUDA
-#define hypre_BoxLoopBlockDevice()           0
-#define hypre_BoxLoop0BeginDevice            hypre_BoxLoop0BeginCUDA
-#define hypre_BoxLoop0EndDevice              hypre_BoxLoop0EndCUDA
-#define hypre_BoxLoop1BeginDevice            hypre_BoxLoop1BeginCUDA
-#define hypre_BoxLoop1EndDevice              hypre_BoxLoop1EndCUDA
-#define hypre_BoxLoop2BeginDevice            hypre_BoxLoop2BeginCUDA
-#define hypre_BoxLoop2EndDevice              hypre_BoxLoop2EndCUDA
-#define hypre_BoxLoop3BeginDevice            hypre_BoxLoop3BeginCUDA
-#define hypre_BoxLoop3EndDevice              hypre_BoxLoop3EndCUDA
-#define hypre_BoxLoop4BeginDevice            hypre_BoxLoop4BeginCUDA
-#define hypre_BoxLoop4EndDevice              hypre_BoxLoop4EndCUDA
-#define hypre_BasicBoxLoop1BeginDevice       hypre_BasicBoxLoop1BeginCUDA
-#define hypre_BasicBoxLoop2BeginDevice       hypre_BasicBoxLoop2BeginCUDA
-#define hypre_LoopBeginDevice                hypre_LoopBeginCUDA
-#define hypre_LoopEndDevice                  hypre_LoopEndCUDA
-#define hypre_BoxLoop1ReductionBeginDevice   hypre_BoxLoop1ReductionBeginCUDA
-#define hypre_BoxLoop1ReductionEndDevice     hypre_BoxLoop1ReductionEndCUDA
-#define hypre_BoxLoop2ReductionBeginDevice   hypre_BoxLoop2ReductionBeginCUDA
-#define hypre_BoxLoop2ReductionEndDevice     hypre_BoxLoop2ReductionEndCUDA
-
+#define hypre_BoxLoopGetIndexDevice hypre_BoxLoopGetIndexCUDA
+#define hypre_BoxLoopBlockDevice() 0
+#define hypre_BoxLoop0BeginDevice hypre_BoxLoop0BeginCUDA
+#define hypre_BoxLoop0EndDevice hypre_BoxLoop0EndCUDA
+#define hypre_BoxLoop1BeginDevice hypre_BoxLoop1BeginCUDA
+#define hypre_BoxLoop1EndDevice hypre_BoxLoop1EndCUDA
+#define hypre_BoxLoop2BeginDevice hypre_BoxLoop2BeginCUDA
+#define hypre_BoxLoop2EndDevice hypre_BoxLoop2EndCUDA
+#define hypre_BoxLoop3BeginDevice hypre_BoxLoop3BeginCUDA
+#define hypre_BoxLoop3EndDevice hypre_BoxLoop3EndCUDA
+#define hypre_BoxLoop4BeginDevice hypre_BoxLoop4BeginCUDA
+#define hypre_BoxLoop4EndDevice hypre_BoxLoop4EndCUDA
+#define hypre_BasicBoxLoop1BeginDevice hypre_BasicBoxLoop1BeginCUDA
+#define hypre_BasicBoxLoop2BeginDevice hypre_BasicBoxLoop2BeginCUDA
+#define hypre_LoopBeginDevice hypre_LoopBeginCUDA
+#define hypre_LoopEndDevice hypre_LoopEndCUDA
+#define hypre_BoxLoop1ReductionBeginDevice hypre_BoxLoop1ReductionBeginCUDA
+#define hypre_BoxLoop1ReductionEndDevice hypre_BoxLoop1ReductionEndCUDA
+#define hypre_BoxLoop2ReductionBeginDevice hypre_BoxLoop2ReductionBeginCUDA
+#define hypre_BoxLoop2ReductionEndDevice hypre_BoxLoop2ReductionEndCUDA
 
 //TODO TEMP FIX
-#define hypre_BoxLoopGetIndex          hypre_BoxLoopGetIndexDevice
-#define hypre_BoxLoopBlock()           0
-#define hypre_BoxLoop0Begin            hypre_BoxLoop0BeginDevice
-#define hypre_BoxLoop0End              hypre_BoxLoop0EndDevice
-#define hypre_BoxLoop1Begin            hypre_BoxLoop1BeginDevice
-#define hypre_BoxLoop1End              hypre_BoxLoop1EndDevice
-#define hypre_BoxLoop2Begin            hypre_BoxLoop2BeginDevice
-#define hypre_BoxLoop2End              hypre_BoxLoop2EndDevice
-#define hypre_BoxLoop3Begin            hypre_BoxLoop3BeginDevice
-#define hypre_BoxLoop3End              hypre_BoxLoop3EndDevice
-#define hypre_BoxLoop4Begin            hypre_BoxLoop4BeginDevice
-#define hypre_BoxLoop4End              hypre_BoxLoop4EndDevice
-#define hypre_BasicBoxLoop1Begin       hypre_BasicBoxLoop1BeginDevice
-#define hypre_BasicBoxLoop2Begin       hypre_BasicBoxLoop2BeginDevice
-#define hypre_LoopBegin                hypre_LoopBeginDevice
-#define hypre_LoopEnd                  hypre_LoopEndDevice
-#define hypre_BoxLoop1ReductionBegin   hypre_BoxLoop1ReductionBeginDevice
-#define hypre_BoxLoop1ReductionEnd     hypre_BoxLoop1ReductionEndDevice
-#define hypre_BoxLoop2ReductionBegin   hypre_BoxLoop2ReductionBeginDevice
-#define hypre_BoxLoop2ReductionEnd     hypre_BoxLoop2ReductionEndDevice
+#define hypre_BoxLoopGetIndex hypre_BoxLoopGetIndexDevice
+#define hypre_BoxLoopBlock() 0
+#define hypre_BoxLoop0Begin hypre_BoxLoop0BeginDevice
+#define hypre_BoxLoop0End hypre_BoxLoop0EndDevice
+#define hypre_BoxLoop1Begin hypre_BoxLoop1BeginDevice
+#define hypre_BoxLoop1End hypre_BoxLoop1EndDevice
+#define hypre_BoxLoop2Begin hypre_BoxLoop2BeginDevice
+#define hypre_BoxLoop2End hypre_BoxLoop2EndDevice
+#define hypre_BoxLoop3Begin hypre_BoxLoop3BeginDevice
+#define hypre_BoxLoop3End hypre_BoxLoop3EndDevice
+#define hypre_BoxLoop4Begin hypre_BoxLoop4BeginDevice
+#define hypre_BoxLoop4End hypre_BoxLoop4EndDevice
+#define hypre_BasicBoxLoop1Begin hypre_BasicBoxLoop1BeginDevice
+#define hypre_BasicBoxLoop2Begin hypre_BasicBoxLoop2BeginDevice
+#define hypre_LoopBegin hypre_LoopBeginDevice
+#define hypre_LoopEnd hypre_LoopEndDevice
+#define hypre_BoxLoop1ReductionBegin hypre_BoxLoop1ReductionBeginDevice
+#define hypre_BoxLoop1ReductionEnd hypre_BoxLoop1ReductionEndDevice
+#define hypre_BoxLoop2ReductionBegin hypre_BoxLoop2ReductionBeginDevice
+#define hypre_BoxLoop2ReductionEnd hypre_BoxLoop2ReductionEndDevice
 
 #endif
 
@@ -1214,203 +1079,172 @@ else                                                            \
 
 #if defined(HYPRE_USING_SYCL) && !defined(HYPRE_USING_RAJA) && !defined(HYPRE_USING_KOKKOS)
 
-typedef struct hypre_Boxloop_struct
-{
-   HYPRE_Int lsize0, lsize1, lsize2;
-   HYPRE_Int strides0, strides1, strides2;
-   HYPRE_Int bstart0, bstart1, bstart2;
-   HYPRE_Int bsize0, bsize1, bsize2;
+typedef struct hypre_Boxloop_struct {
+    HYPRE_Int lsize0, lsize1, lsize2;
+    HYPRE_Int strides0, strides1, strides2;
+    HYPRE_Int bstart0, bstart1, bstart2;
+    HYPRE_Int bsize0, bsize1, bsize2;
 } hypre_Boxloop;
 
-
 #ifdef __cplusplus
-extern "C++"
-{
+extern "C++" {
 #endif
 
-   /*********************************************************************
+/*********************************************************************
     * wrapper functions calling sycl parallel_for
     * WM: todo - add runtime switch between CPU/GPU execution
     *********************************************************************/
 
-   template<typename LOOP_BODY>
-   void
-   BoxLoopforall( HYPRE_Int length,
-                  LOOP_BODY loop_body)
-   {
-      if (length <= 0)
-      {
-         return;
-      }
-      dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
-      dim3 gDim = hypre_GetDefaultDeviceGridDimension(length, "thread", bDim);
-
-      hypre_HandleComputeStream(hypre_handle())->submit([&] (sycl::handler & cgh)
-      {
-         cgh.parallel_for(sycl::nd_range<3>(gDim * bDim, bDim), loop_body);
-      }).wait_and_throw();
-   }
-
-   template<typename LOOP_BODY>
-   void
-   ReductionBoxLoopforall( LOOP_BODY  loop_body,
-                           HYPRE_Int length,
-                           HYPRE_Real * shared_sum_var )
-   {
-      if (length <= 0)
-      {
-         return;
-      }
-      dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
-      dim3 gDim = hypre_GetDefaultDeviceGridDimension(length, "thread", bDim);
+template <typename LOOP_BODY>
+void BoxLoopforall(HYPRE_Int length, LOOP_BODY loop_body) {
+    if (length <= 0) { return; }
+    dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+    dim3 gDim = hypre_GetDefaultDeviceGridDimension(length, "thread", bDim);
+
+    hypre_HandleComputeStream(hypre_handle())
+            ->submit([&](sycl::handler &cgh) {
+                cgh.parallel_for(sycl::nd_range<3>(gDim * bDim, bDim), loop_body);
+            })
+            .wait_and_throw();
+}
 
-      hypre_HandleComputeStream(hypre_handle())->submit([&] (sycl::handler & cgh)
-      {
-         cgh.parallel_for(sycl::nd_range<3>(gDim * bDim, bDim), sycl::reduction(shared_sum_var,
-                                                                                std::plus<>()), loop_body);
-      }).wait_and_throw();
-   }
+template <typename LOOP_BODY>
+void ReductionBoxLoopforall(LOOP_BODY loop_body, HYPRE_Int length, HYPRE_Real *shared_sum_var) {
+    if (length <= 0) { return; }
+    dim3 bDim = hypre_GetDefaultDeviceBlockDimension();
+    dim3 gDim = hypre_GetDefaultDeviceGridDimension(length, "thread", bDim);
+
+    hypre_HandleComputeStream(hypre_handle())
+            ->submit([&](sycl::handler &cgh) {
+                cgh.parallel_for(sycl::nd_range<3>(gDim * bDim, bDim),
+                                 sycl::reduction(shared_sum_var, std::plus<>()), loop_body);
+            })
+            .wait_and_throw();
+}
 
 #ifdef __cplusplus
 }
 #endif
 
-
 /*********************************************************************
  * Init/Declare/IncK etc.
  *********************************************************************/
 
 /* Get 1-D length of the loop, in hypre__tot */
-#define hypre_newBoxLoopInit(ndim, loop_size)              \
-   HYPRE_Int hypre__tot = 1;                               \
-   for (HYPRE_Int hypre_d = 0; hypre_d < ndim; hypre_d ++) \
-   {                                                       \
-      hypre__tot *= loop_size[hypre_d];                    \
-   }
+#define hypre_newBoxLoopInit(ndim, loop_size)                                                                \
+    HYPRE_Int hypre__tot = 1;                                                                                \
+    for (HYPRE_Int hypre_d = 0; hypre_d < ndim; hypre_d++) { hypre__tot *= loop_size[hypre_d]; }
 
 /* Initialize struct for box-k */
-#define hypre_BoxLoopDataDeclareK(k, ndim, loop_size, dbox, start, stride) \
-   hypre_Boxloop databox##k;                                               \
-   databox##k.lsize0   = loop_size[0];                                     \
-   databox##k.strides0 = stride[0];                                        \
-   databox##k.bstart0  = start[0] - dbox->imin[0];                         \
-   databox##k.bsize0   = dbox->imax[0] - dbox->imin[0];                    \
-   if (ndim > 1)                                                           \
-   {                                                                       \
-      databox##k.lsize1   = loop_size[1];                                  \
-      databox##k.strides1 = stride[1];                                     \
-      databox##k.bstart1  = start[1] - dbox->imin[1];                      \
-      databox##k.bsize1   = dbox->imax[1] - dbox->imin[1];                 \
-   }                                                                       \
-   else                                                                    \
-   {                                                                       \
-      databox##k.lsize1   = 1;                                             \
-      databox##k.strides1 = 0;                                             \
-      databox##k.bstart1  = 0;                                             \
-      databox##k.bsize1   = 0;                                             \
-   }                                                                       \
-   if (ndim == 3)                                                          \
-   {                                                                       \
-      databox##k.lsize2   = loop_size[2];                                  \
-      databox##k.strides2 = stride[2];                                     \
-      databox##k.bstart2  = start[2] - dbox->imin[2];                      \
-      databox##k.bsize2   = dbox->imax[2] - dbox->imin[2];                 \
-   }                                                                       \
-   else                                                                    \
-   {                                                                       \
-      databox##k.lsize2   = 1;                                             \
-      databox##k.strides2 = 0;                                             \
-      databox##k.bstart2  = 0;                                             \
-      databox##k.bsize2   = 0;                                             \
-   }
-
-#define hypre_BasicBoxLoopDataDeclareK(k,ndim,loop_size,stride) \
-hypre_Boxloop databox##k;                                       \
-databox##k.lsize0   = loop_size[0];                             \
-databox##k.strides0 = stride[0];                                \
-databox##k.bstart0  = 0;                                        \
-databox##k.bsize0   = 0;                                        \
-if (ndim > 1)                                                   \
-{                                                               \
-   databox##k.lsize1   = loop_size[1];                          \
-   databox##k.strides1 = stride[1];                             \
-   databox##k.bstart1  = 0;                                     \
-   databox##k.bsize1   = 0;                                     \
-}                                                               \
-else                                                            \
-{                                                               \
-   databox##k.lsize1   = 1;                                     \
-   databox##k.strides1 = 0;                                     \
-   databox##k.bstart1  = 0;                                     \
-   databox##k.bsize1   = 0;                                     \
-}                                                               \
-if (ndim == 3)                                                  \
-{                                                               \
-   databox##k.lsize2   = loop_size[2];                          \
-   databox##k.strides2 = stride[2];                             \
-   databox##k.bstart2  = 0;                                     \
-   databox##k.bsize2   = 0;                                     \
-}                                                               \
-else                                                            \
-{                                                               \
-    databox##k.lsize2   = 1;                                    \
-    databox##k.strides2 = 0;                                    \
-    databox##k.bstart2  = 0;                                    \
-    databox##k.bsize2   = 0;                                    \
-}
+#define hypre_BoxLoopDataDeclareK(k, ndim, loop_size, dbox, start, stride)                                   \
+    hypre_Boxloop databox##k;                                                                                \
+    databox##k.lsize0 = loop_size[0];                                                                        \
+    databox##k.strides0 = stride[0];                                                                         \
+    databox##k.bstart0 = start[0] - dbox->imin[0];                                                           \
+    databox##k.bsize0 = dbox->imax[0] - dbox->imin[0];                                                       \
+    if (ndim > 1) {                                                                                          \
+        databox##k.lsize1 = loop_size[1];                                                                    \
+        databox##k.strides1 = stride[1];                                                                     \
+        databox##k.bstart1 = start[1] - dbox->imin[1];                                                       \
+        databox##k.bsize1 = dbox->imax[1] - dbox->imin[1];                                                   \
+    } else {                                                                                                 \
+        databox##k.lsize1 = 1;                                                                               \
+        databox##k.strides1 = 0;                                                                             \
+        databox##k.bstart1 = 0;                                                                              \
+        databox##k.bsize1 = 0;                                                                               \
+    }                                                                                                        \
+    if (ndim == 3) {                                                                                         \
+        databox##k.lsize2 = loop_size[2];                                                                    \
+        databox##k.strides2 = stride[2];                                                                     \
+        databox##k.bstart2 = start[2] - dbox->imin[2];                                                       \
+        databox##k.bsize2 = dbox->imax[2] - dbox->imin[2];                                                   \
+    } else {                                                                                                 \
+        databox##k.lsize2 = 1;                                                                               \
+        databox##k.strides2 = 0;                                                                             \
+        databox##k.bstart2 = 0;                                                                              \
+        databox##k.bsize2 = 0;                                                                               \
+    }
+
+#define hypre_BasicBoxLoopDataDeclareK(k, ndim, loop_size, stride)                                           \
+    hypre_Boxloop databox##k;                                                                                \
+    databox##k.lsize0 = loop_size[0];                                                                        \
+    databox##k.strides0 = stride[0];                                                                         \
+    databox##k.bstart0 = 0;                                                                                  \
+    databox##k.bsize0 = 0;                                                                                   \
+    if (ndim > 1) {                                                                                          \
+        databox##k.lsize1 = loop_size[1];                                                                    \
+        databox##k.strides1 = stride[1];                                                                     \
+        databox##k.bstart1 = 0;                                                                              \
+        databox##k.bsize1 = 0;                                                                               \
+    } else {                                                                                                 \
+        databox##k.lsize1 = 1;                                                                               \
+        databox##k.strides1 = 0;                                                                             \
+        databox##k.bstart1 = 0;                                                                              \
+        databox##k.bsize1 = 0;                                                                               \
+    }                                                                                                        \
+    if (ndim == 3) {                                                                                         \
+        databox##k.lsize2 = loop_size[2];                                                                    \
+        databox##k.strides2 = stride[2];                                                                     \
+        databox##k.bstart2 = 0;                                                                              \
+        databox##k.bsize2 = 0;                                                                               \
+    } else {                                                                                                 \
+        databox##k.lsize2 = 1;                                                                               \
+        databox##k.strides2 = 0;                                                                             \
+        databox##k.bstart2 = 0;                                                                              \
+        databox##k.bsize2 = 0;                                                                               \
+    }
 
 /* Given input 1-D 'idx' in box, get 3-D 'local_idx' in loop_size */
-#define hypre_newBoxLoopDeclare(box)                     \
-   hypre_Index local_idx;                                \
-   HYPRE_Int idx_local = idx;                            \
-   hypre_IndexD(local_idx, 0)  = idx_local % box.lsize0; \
-   idx_local = idx_local / box.lsize0;                   \
-   hypre_IndexD(local_idx, 1)  = idx_local % box.lsize1; \
-   idx_local = idx_local / box.lsize1;                   \
-   hypre_IndexD(local_idx, 2)  = idx_local % box.lsize2; \
+#define hypre_newBoxLoopDeclare(box)                                                                         \
+    hypre_Index local_idx;                                                                                   \
+    HYPRE_Int idx_local = idx;                                                                               \
+    hypre_IndexD(local_idx, 0) = idx_local % box.lsize0;                                                     \
+    idx_local = idx_local / box.lsize0;                                                                      \
+    hypre_IndexD(local_idx, 1) = idx_local % box.lsize1;                                                     \
+    idx_local = idx_local / box.lsize1;                                                                      \
+    hypre_IndexD(local_idx, 2) = idx_local % box.lsize2;
 
 /* Given input 3-D 'local_idx', get 1-D 'hypre__i' in 'box' */
-#define hypre_BoxLoopIncK(k, box, hypre__i)                                               \
-   HYPRE_Int hypre_boxD##k = 1;                                                           \
-   HYPRE_Int hypre__i = 0;                                                                \
-   hypre__i += (hypre_IndexD(local_idx, 0) * box.strides0 + box.bstart0) * hypre_boxD##k; \
-   hypre_boxD##k *= hypre_max(0, box.bsize0 + 1);                                         \
-   hypre__i += (hypre_IndexD(local_idx, 1) * box.strides1 + box.bstart1) * hypre_boxD##k; \
-   hypre_boxD##k *= hypre_max(0, box.bsize1 + 1);                                         \
-   hypre__i += (hypre_IndexD(local_idx, 2) * box.strides2 + box.bstart2) * hypre_boxD##k; \
-   hypre_boxD##k *= hypre_max(0, box.bsize2 + 1);
+#define hypre_BoxLoopIncK(k, box, hypre__i)                                                                  \
+    HYPRE_Int hypre_boxD##k = 1;                                                                             \
+    HYPRE_Int hypre__i = 0;                                                                                  \
+    hypre__i += (hypre_IndexD(local_idx, 0) * box.strides0 + box.bstart0) * hypre_boxD##k;                   \
+    hypre_boxD##k *= hypre_max(0, box.bsize0 + 1);                                                           \
+    hypre__i += (hypre_IndexD(local_idx, 1) * box.strides1 + box.bstart1) * hypre_boxD##k;                   \
+    hypre_boxD##k *= hypre_max(0, box.bsize1 + 1);                                                           \
+    hypre__i += (hypre_IndexD(local_idx, 2) * box.strides2 + box.bstart2) * hypre_boxD##k;                   \
+    hypre_boxD##k *= hypre_max(0, box.bsize2 + 1);
 
 /* get 3-D local_idx into 'index' */
-#define hypre_BoxLoopGetIndex(index)      \
-   index[0] = hypre_IndexD(local_idx, 0); \
-   index[1] = hypre_IndexD(local_idx, 1); \
-   index[2] = hypre_IndexD(local_idx, 2);
-
+#define hypre_BoxLoopGetIndex(index)                                                                         \
+    index[0] = hypre_IndexD(local_idx, 0);                                                                   \
+    index[1] = hypre_IndexD(local_idx, 1);                                                                   \
+    index[2] = hypre_IndexD(local_idx, 2);
 
 /*********************************************************************
  * Boxloops
  *********************************************************************/
 
 /* BoxLoop 0 */
-#define hypre_newBoxLoop0Begin(ndim, loop_size)                                                       \
-{                                                                                                     \
-   hypre_newBoxLoopInit(ndim, loop_size);                                                             \
+#define hypre_newBoxLoop0Begin(ndim, loop_size)                                                              \
+    {                                                                                                        \
+        hypre_newBoxLoopInit(ndim, loop_size);                                                               \
    BoxLoopforall(hypre__tot, [=] (sycl::nd_item<3> item)                                              \
    {                                                                                                  \
       HYPRE_Int idx = (HYPRE_Int) item.get_global_linear_id();                                        \
       if (idx < hypre__tot)                                                                           \
-      {                                                                                               \
+      {
 
-#define hypre_newBoxLoop0End()                                                                        \
-      }                                                                                               \
-   });                                                                                                \
-}
+#define hypre_newBoxLoop0End()                                                                               \
+    }                                                                                                        \
+    });                                                                                                       \
+    }
 
 /* BoxLoop 1 */
-#define hypre_newBoxLoop1Begin(ndim, loop_size, dbox1, start1, stride1, i1)                           \
-{                                                                                                     \
-   hypre_newBoxLoopInit(ndim, loop_size);                                                             \
-   hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                             \
+#define hypre_newBoxLoop1Begin(ndim, loop_size, dbox1, start1, stride1, i1)                                  \
+    {                                                                                                        \
+        hypre_newBoxLoopInit(ndim, loop_size);                                                               \
+        hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                               \
    BoxLoopforall(hypre__tot, [=] (sycl::nd_item<3> item)                                              \
    {                                                                                                  \
       HYPRE_Int idx = (HYPRE_Int) item.get_global_linear_id();                                        \
@@ -1419,18 +1253,17 @@ else                                                            \
          hypre_newBoxLoopDeclare(databox1);                                                           \
          hypre_BoxLoopIncK(1, databox1, i1);
 
-#define hypre_newBoxLoop1End(i1)                                                                      \
-      }                                                                                               \
-   });                                                                                                \
-}
+#define hypre_newBoxLoop1End(i1)                                                                             \
+    }                                                                                                        \
+    });                                                                                                       \
+    }
 
 /* BoxLoop 2 */
-#define hypre_newBoxLoop2Begin(ndim, loop_size, dbox1, start1, stride1, i1,                           \
-                                                dbox2, start2, stride2, i2)                           \
-{                                                                                                     \
-   hypre_newBoxLoopInit(ndim, loop_size);                                                             \
-   hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                             \
-   hypre_BoxLoopDataDeclareK(2, ndim, loop_size, dbox2, start2, stride2);                             \
+#define hypre_newBoxLoop2Begin(ndim, loop_size, dbox1, start1, stride1, i1, dbox2, start2, stride2, i2)      \
+    {                                                                                                        \
+        hypre_newBoxLoopInit(ndim, loop_size);                                                               \
+        hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                               \
+        hypre_BoxLoopDataDeclareK(2, ndim, loop_size, dbox2, start2, stride2);                               \
    BoxLoopforall(hypre__tot, [=] (sycl::nd_item<3> item)                                              \
    {                                                                                                  \
       HYPRE_Int idx = (HYPRE_Int) item.get_global_linear_id();                                        \
@@ -1440,20 +1273,19 @@ else                                                            \
          hypre_BoxLoopIncK(1, databox1, i1);                                                          \
          hypre_BoxLoopIncK(2, databox2, i2);
 
-#define hypre_newBoxLoop2End(i1, i2)                                                                  \
-      }                                                                                               \
-   });                                                                                                \
-}
+#define hypre_newBoxLoop2End(i1, i2)                                                                         \
+    }                                                                                                        \
+    });                                                                                                       \
+    }
 
 /* BoxLoop 3 */
-#define hypre_newBoxLoop3Begin(ndim, loop_size, dbox1, start1, stride1, i1,                           \
-                                                dbox2, start2, stride2, i2,                           \
-                                                dbox3, start3, stride3, i3)                           \
-{                                                                                                     \
-   hypre_newBoxLoopInit(ndim, loop_size);                                                             \
-   hypre_BoxLoopDataDeclareK(1, ndim,loop_size, dbox1, start1, stride1);                              \
-   hypre_BoxLoopDataDeclareK(2, ndim,loop_size, dbox2, start2, stride2);                              \
-   hypre_BoxLoopDataDeclareK(3, ndim,loop_size, dbox3, start3, stride3);                              \
+#define hypre_newBoxLoop3Begin(ndim, loop_size, dbox1, start1, stride1, i1, dbox2, start2, stride2, i2,      \
+                               dbox3, start3, stride3, i3)                                                   \
+    {                                                                                                        \
+        hypre_newBoxLoopInit(ndim, loop_size);                                                               \
+        hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                               \
+        hypre_BoxLoopDataDeclareK(2, ndim, loop_size, dbox2, start2, stride2);                               \
+        hypre_BoxLoopDataDeclareK(3, ndim, loop_size, dbox3, start3, stride3);                               \
    BoxLoopforall(hypre__tot, [=] (sycl::nd_item<3> item)                                              \
    {                                                                                                  \
       HYPRE_Int idx = (HYPRE_Int) item.get_global_linear_id();                                        \
@@ -1464,22 +1296,20 @@ else                                                            \
          hypre_BoxLoopIncK(2, databox2, i2);                                                          \
          hypre_BoxLoopIncK(3, databox3, i3);
 
-#define hypre_newBoxLoop3End(i1, i2, i3)                                                              \
-      }                                                                                               \
-   });                                                                                                \
-}
+#define hypre_newBoxLoop3End(i1, i2, i3)                                                                     \
+    }                                                                                                        \
+    });                                                                                                       \
+    }
 
 /* BoxLoop 4 */
-#define hypre_newBoxLoop4Begin(ndim, loop_size, dbox1, start1, stride1, i1,                           \
-                                                dbox2, start2, stride2, i2,                           \
-                                                dbox3, start3, stride3, i3,                           \
-                                                dbox4, start4, stride4, i4)                           \
-{                                                                                                     \
-   hypre_newBoxLoopInit(ndim, loop_size);                                                             \
-   hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                             \
-   hypre_BoxLoopDataDeclareK(2, ndim, loop_size, dbox2, start2, stride2);                             \
-   hypre_BoxLoopDataDeclareK(3, ndim, loop_size, dbox3, start3, stride3);                             \
-   hypre_BoxLoopDataDeclareK(4, ndim, loop_size, dbox4, start4, stride4);                             \
+#define hypre_newBoxLoop4Begin(ndim, loop_size, dbox1, start1, stride1, i1, dbox2, start2, stride2, i2,      \
+                               dbox3, start3, stride3, i3, dbox4, start4, stride4, i4)                       \
+    {                                                                                                        \
+        hypre_newBoxLoopInit(ndim, loop_size);                                                               \
+        hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                               \
+        hypre_BoxLoopDataDeclareK(2, ndim, loop_size, dbox2, start2, stride2);                               \
+        hypre_BoxLoopDataDeclareK(3, ndim, loop_size, dbox3, start3, stride3);                               \
+        hypre_BoxLoopDataDeclareK(4, ndim, loop_size, dbox4, start4, stride4);                               \
    BoxLoopforall(hypre__tot, [=] (sycl::nd_item<3> item)                                              \
    {                                                                                                  \
       HYPRE_Int idx = (HYPRE_Int) item.get_global_linear_id();                                        \
@@ -1491,18 +1321,17 @@ else                                                            \
          hypre_BoxLoopIncK(3, databox3, i3);                                                          \
          hypre_BoxLoopIncK(4, databox4, i4);
 
-#define hypre_newBoxLoop4End(i1, i2, i3, i4)                                                          \
-      }                                                                                               \
-   });                                                                                                \
-}
-
+#define hypre_newBoxLoop4End(i1, i2, i3, i4)                                                                 \
+    }                                                                                                        \
+    });                                                                                                       \
+    }
 
 /* Basic BoxLoops have no boxes */
 /* BoxLoop 1 */
-#define hypre_newBasicBoxLoop1Begin(ndim, loop_size, stride1, i1)                                     \
-{                                                                                                     \
-   hypre_newBoxLoopInit(ndim, loop_size);                                                             \
-   hypre_BasicBoxLoopDataDeclareK(1, ndim, loop_size, stride1);                                       \
+#define hypre_newBasicBoxLoop1Begin(ndim, loop_size, stride1, i1)                                            \
+    {                                                                                                        \
+        hypre_newBoxLoopInit(ndim, loop_size);                                                               \
+        hypre_BasicBoxLoopDataDeclareK(1, ndim, loop_size, stride1);                                         \
    BoxLoopforall(hypre__tot, [=] (sycl::nd_item<3> item)                                              \
    {                                                                                                  \
       HYPRE_Int idx = (HYPRE_Int) item.get_global_linear_id();                                        \
@@ -1512,11 +1341,11 @@ else                                                            \
          hypre_BoxLoopIncK(1, databox1, i1);
 
 /* BoxLoop 2 */
-#define hypre_newBasicBoxLoop2Begin(ndim, loop_size, stride1, i1, stride2, i2)                        \
-{                                                                                                     \
-   hypre_newBoxLoopInit(ndim, loop_size);                                                             \
-   hypre_BasicBoxLoopDataDeclareK(1, ndim, loop_size, stride1);                                       \
-   hypre_BasicBoxLoopDataDeclareK(2, ndim, loop_size, stride2);                                       \
+#define hypre_newBasicBoxLoop2Begin(ndim, loop_size, stride1, i1, stride2, i2)                               \
+    {                                                                                                        \
+        hypre_newBoxLoopInit(ndim, loop_size);                                                               \
+        hypre_BasicBoxLoopDataDeclareK(1, ndim, loop_size, stride1);                                         \
+        hypre_BasicBoxLoopDataDeclareK(2, ndim, loop_size, stride2);                                         \
    BoxLoopforall(hypre__tot, [=] (sycl::nd_item<3> item)                                              \
    {                                                                                                  \
       HYPRE_Int idx = (HYPRE_Int) item.get_global_linear_id();                                        \
@@ -1526,14 +1355,13 @@ else                                                            \
          hypre_BoxLoopIncK(1, databox1, i1);                                                          \
          hypre_BoxLoopIncK(2, databox2, i2);
 
-
 /* Reduction BoxLoop1 */
-#define hypre_newBoxLoop1ReductionBegin(ndim, loop_size, dbox1, start1, stride1, i1, sum_var)         \
-{                                                                                                     \
-   hypre_newBoxLoopInit(ndim, loop_size);                                                             \
-   hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                             \
-   HYPRE_Real *shared_sum_var = hypre_CTAlloc(HYPRE_Real, 1, HYPRE_MEMORY_DEVICE);                    \
-   hypre_TMemcpy(shared_sum_var, &sum_var, HYPRE_Real, 1, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);    \
+#define hypre_newBoxLoop1ReductionBegin(ndim, loop_size, dbox1, start1, stride1, i1, sum_var)                \
+    {                                                                                                        \
+        hypre_newBoxLoopInit(ndim, loop_size);                                                               \
+        hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                               \
+        HYPRE_Real *shared_sum_var = hypre_CTAlloc(HYPRE_Real, 1, HYPRE_MEMORY_DEVICE);                      \
+        hypre_TMemcpy(shared_sum_var, &sum_var, HYPRE_Real, 1, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);      \
    ReductionBoxLoopforall( [=,hypre_unused_var=sum_var] (sycl::nd_item<3> item, auto &sum_var)        \
    {                                                                                                  \
       HYPRE_Int idx = (HYPRE_Int) item.get_global_linear_id();                                        \
@@ -1542,22 +1370,22 @@ else                                                            \
          hypre_newBoxLoopDeclare(databox1);                                                           \
          hypre_BoxLoopIncK(1, databox1, i1);
 
-#define hypre_newBoxLoop1ReductionEnd(i1, sum_var)                                                    \
-      }                                                                                               \
-   }, hypre__tot, shared_sum_var);                                                                    \
-   hypre_TMemcpy(&sum_var, shared_sum_var, HYPRE_Real, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);    \
-   hypre_TFree(shared_sum_var, HYPRE_MEMORY_DEVICE);                                                  \
-}
+#define hypre_newBoxLoop1ReductionEnd(i1, sum_var)                                                           \
+    }                                                                                                        \
+    }, hypre__tot, shared_sum_var);                                                                           \
+    hypre_TMemcpy(&sum_var, shared_sum_var, HYPRE_Real, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);          \
+    hypre_TFree(shared_sum_var, HYPRE_MEMORY_DEVICE);                                                        \
+    }
 
 /* Reduction BoxLoop2 */
-#define hypre_newBoxLoop2ReductionBegin(ndim, loop_size, dbox1, start1, stride1, i1,                  \
-                                                      dbox2, start2, stride2, i2, sum_var)            \
-{                                                                                                     \
-   hypre_newBoxLoopInit(ndim, loop_size);                                                             \
-   hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                             \
-   hypre_BoxLoopDataDeclareK(2, ndim, loop_size, dbox2, start2, stride2);                             \
-   HYPRE_Real *shared_sum_var = hypre_CTAlloc(HYPRE_Real, 1, HYPRE_MEMORY_DEVICE);                    \
-   hypre_TMemcpy(shared_sum_var, &sum_var, HYPRE_Real, 1, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);    \
+#define hypre_newBoxLoop2ReductionBegin(ndim, loop_size, dbox1, start1, stride1, i1, dbox2, start2, stride2, \
+                                        i2, sum_var)                                                         \
+    {                                                                                                        \
+        hypre_newBoxLoopInit(ndim, loop_size);                                                               \
+        hypre_BoxLoopDataDeclareK(1, ndim, loop_size, dbox1, start1, stride1);                               \
+        hypre_BoxLoopDataDeclareK(2, ndim, loop_size, dbox2, start2, stride2);                               \
+        HYPRE_Real *shared_sum_var = hypre_CTAlloc(HYPRE_Real, 1, HYPRE_MEMORY_DEVICE);                      \
+        hypre_TMemcpy(shared_sum_var, &sum_var, HYPRE_Real, 1, HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_HOST);      \
    ReductionBoxLoopforall( [=,hypre_unused_var=sum_var] (sycl::nd_item<3> item, auto &sum_var)        \
    {                                                                                                  \
       HYPRE_Int idx = (HYPRE_Int) item.get_global_linear_id();                                        \
@@ -1567,72 +1395,67 @@ else                                                            \
          hypre_BoxLoopIncK(1, databox1, i1);                                                          \
          hypre_BoxLoopIncK(2, databox2, i2);
 
-#define hypre_newBoxLoop2ReductionEnd(i1, i2, sum_var)                                                \
-      }                                                                                               \
-   }, hypre__tot, shared_sum_var);                                                                    \
-   hypre_TMemcpy(&sum_var, shared_sum_var, HYPRE_Real, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);    \
-   hypre_TFree(shared_sum_var, HYPRE_MEMORY_DEVICE);                                                  \
-}
+#define hypre_newBoxLoop2ReductionEnd(i1, i2, sum_var)                                                       \
+    }                                                                                                        \
+    }, hypre__tot, shared_sum_var);                                                                           \
+    hypre_TMemcpy(&sum_var, shared_sum_var, HYPRE_Real, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);          \
+    hypre_TFree(shared_sum_var, HYPRE_MEMORY_DEVICE);                                                        \
+    }
 
 /* Plain parallel_for loop */
-#define hypre_LoopBegin(size, idx)                                                                    \
-{                                                                                                     \
-   HYPRE_Int hypre__tot = size;                                                                       \
+#define hypre_LoopBegin(size, idx)                                                                           \
+    {                                                                                                        \
+        HYPRE_Int hypre__tot = size;                                                                         \
    BoxLoopforall(hypre__tot, [=] (sycl::nd_item<3> item)                                              \
    {                                                                                                  \
       HYPRE_Int idx = (HYPRE_Int) item.get_global_linear_id();                                        \
       if (idx < hypre__tot)                                                                           \
-      {                                                                                               \
-
-#define hypre_LoopEnd()                                                                               \
-      }                                                                                               \
-   });                                                                                                \
-}
+      {
 
+#define hypre_LoopEnd()                                                                                      \
+    }                                                                                                        \
+    });                                                                                                       \
+    }
 
 /*********************************************************************
  * renamings
  *********************************************************************/
 
-#define hypre_BoxLoopBlock()       0
+#define hypre_BoxLoopBlock() 0
 
-#define hypre_BoxLoop0Begin      hypre_newBoxLoop0Begin
-#define hypre_BoxLoop0End        hypre_newBoxLoop0End
-#define hypre_BoxLoop1Begin      hypre_newBoxLoop1Begin
-#define hypre_BoxLoop1End        hypre_newBoxLoop1End
-#define hypre_BoxLoop2Begin      hypre_newBoxLoop2Begin
-#define hypre_BoxLoop2End        hypre_newBoxLoop2End
-#define hypre_BoxLoop3Begin      hypre_newBoxLoop3Begin
-#define hypre_BoxLoop3End        hypre_newBoxLoop3End
-#define hypre_BoxLoop4Begin      hypre_newBoxLoop4Begin
-#define hypre_BoxLoop4End        hypre_newBoxLoop4End
+#define hypre_BoxLoop0Begin hypre_newBoxLoop0Begin
+#define hypre_BoxLoop0End hypre_newBoxLoop0End
+#define hypre_BoxLoop1Begin hypre_newBoxLoop1Begin
+#define hypre_BoxLoop1End hypre_newBoxLoop1End
+#define hypre_BoxLoop2Begin hypre_newBoxLoop2Begin
+#define hypre_BoxLoop2End hypre_newBoxLoop2End
+#define hypre_BoxLoop3Begin hypre_newBoxLoop3Begin
+#define hypre_BoxLoop3End hypre_newBoxLoop3End
+#define hypre_BoxLoop4Begin hypre_newBoxLoop4Begin
+#define hypre_BoxLoop4End hypre_newBoxLoop4End
 
 #define hypre_BasicBoxLoop1Begin hypre_newBasicBoxLoop1Begin
 #define hypre_BasicBoxLoop2Begin hypre_newBasicBoxLoop2Begin
 
 /* Reduction */
-#define hypre_BoxLoop1ReductionBegin(ndim, loop_size, dbox1, start1, stride1, i1, reducesum) \
-        hypre_newBoxLoop1ReductionBegin(ndim, loop_size, dbox1, start1, stride1, i1, reducesum)
+#define hypre_BoxLoop1ReductionBegin(ndim, loop_size, dbox1, start1, stride1, i1, reducesum)                 \
+    hypre_newBoxLoop1ReductionBegin(ndim, loop_size, dbox1, start1, stride1, i1, reducesum)
 
-#define hypre_BoxLoop1ReductionEnd(i1, reducesum) \
-        hypre_newBoxLoop1ReductionEnd(i1, reducesum)
+#define hypre_BoxLoop1ReductionEnd(i1, reducesum) hypre_newBoxLoop1ReductionEnd(i1, reducesum)
 
-#define hypre_BoxLoop2ReductionBegin(ndim, loop_size, dbox1, start1, stride1, i1, \
-                                                      dbox2, start2, stride2, i2, reducesum) \
-        hypre_newBoxLoop2ReductionBegin(ndim, loop_size, dbox1, start1, stride1, i1, \
-                                                         dbox2, start2, stride2, i2, reducesum)
+#define hypre_BoxLoop2ReductionBegin(ndim, loop_size, dbox1, start1, stride1, i1, dbox2, start2, stride2,    \
+                                     i2, reducesum)                                                          \
+    hypre_newBoxLoop2ReductionBegin(ndim, loop_size, dbox1, start1, stride1, i1, dbox2, start2, stride2, i2, \
+                                    reducesum)
 
-#define hypre_BoxLoop2ReductionEnd(i1, i2, reducesum) \
-        hypre_newBoxLoop2ReductionEnd(i1, i2, reducesum)
+#define hypre_BoxLoop2ReductionEnd(i1, i2, reducesum) hypre_newBoxLoop2ReductionEnd(i1, i2, reducesum)
 
 #endif
 
 #endif /* #ifndef HYPRE_BOXLOOP_SYCL_HEADER */
 
-
 #ifdef __cplusplus
 }
 #endif
 
 #endif
-
diff --git a/external/hypre/src/utilities/_hypre_onedpl.hpp b/external/hypre/src/utilities/_hypre_onedpl.hpp
index a0e8f36c..e28249e1 100644
--- a/external/hypre/src/utilities/_hypre_onedpl.hpp
+++ b/external/hypre/src/utilities/_hypre_onedpl.hpp
@@ -18,265 +18,213 @@
 /* WM: this is a workaround for a bug in oneDPL reduce by segment */
 #define ONEDPL_WORKAROUND_FOR_IGPU_64BIT_REDUCTION 1
 
-#include <oneapi/dpl/execution>
-#include <oneapi/dpl/algorithm>
-#include <oneapi/dpl/numeric>
-#include <oneapi/dpl/iterator>
-#include <oneapi/dpl/functional>
 #include "_hypre_utilities.h"
 #include "_hypre_utilities.hpp"
+#include <oneapi/dpl/algorithm>
+#include <oneapi/dpl/execution>
+#include <oneapi/dpl/functional>
+#include <oneapi/dpl/iterator>
+#include <oneapi/dpl/numeric>
 
 /* WM: dpct below currently needed for constant iterators */
 #include <dpct/dpl_extras/iterators.h>
 
 //[pred, op](Ref1 a, Ref2 s) { return pred(s) ? op(a) : a; });
 template <typename T, typename Predicate, typename Operator>
-struct hypreSycl_transform_if_unary_zip_mask_fun
-{
-   hypreSycl_transform_if_unary_zip_mask_fun(Predicate _pred, Operator _op) : pred(_pred), op(_op) {}
-   template <typename _T>
-   void operator()(_T&& t) const
-   {
-      using std::get;
-      if (pred(get<1>(t)))
-      {
-         get<2>(t) = op(get<0>(t));
-      }
-   }
+struct hypreSycl_transform_if_unary_zip_mask_fun {
+    hypreSycl_transform_if_unary_zip_mask_fun(Predicate _pred, Operator _op) : pred(_pred), op(_op) {}
+    template <typename _T>
+    void operator()(_T &&t) const {
+        using std::get;
+        if (pred(get<1>(t))) { get<2>(t) = op(get<0>(t)); }
+    }
 
 private:
-   Predicate pred;
-   Operator op;
+    Predicate pred;
+    Operator op;
 };
 
-template <class Iter1, class Iter2, class Iter3,
-          class UnaryOperation, class Pred>
-Iter3 hypreSycl_transform_if(Iter1 first, Iter1 last, Iter2 mask,
-                             Iter3 result, UnaryOperation unary_op, Pred pred)
-{
-   static_assert(
-      std::is_same<typename std::iterator_traits<Iter1>::iterator_category,
-      std::random_access_iterator_tag>::value &&
-      std::is_same<typename std::iterator_traits<Iter2>::iterator_category,
-      std::random_access_iterator_tag>::value &&
-      std::is_same<typename std::iterator_traits<Iter3>::iterator_category,
-      std::random_access_iterator_tag>::value,
-      "Iterators passed to algorithms must be random-access iterators.");
-   using T = typename std::iterator_traits<Iter1>::value_type;
-   const auto n = std::distance(first, last);
-   auto begin_for_each = oneapi::dpl::make_zip_iterator(first, mask, result);
-   HYPRE_ONEDPL_CALL( std::for_each,
-                      begin_for_each, begin_for_each + n,
-                      hypreSycl_transform_if_unary_zip_mask_fun<T, Pred, UnaryOperation>(pred, unary_op) );
-   return result + n;
+template <class Iter1, class Iter2, class Iter3, class UnaryOperation, class Pred>
+Iter3 hypreSycl_transform_if(Iter1 first, Iter1 last, Iter2 mask, Iter3 result, UnaryOperation unary_op,
+                             Pred pred) {
+    static_assert(std::is_same<typename std::iterator_traits<Iter1>::iterator_category,
+                               std::random_access_iterator_tag>::value
+                          && std::is_same<typename std::iterator_traits<Iter2>::iterator_category,
+                                          std::random_access_iterator_tag>::value
+                          && std::is_same<typename std::iterator_traits<Iter3>::iterator_category,
+                                          std::random_access_iterator_tag>::value,
+                  "Iterators passed to algorithms must be random-access iterators.");
+    using T = typename std::iterator_traits<Iter1>::value_type;
+    const auto n = std::distance(first, last);
+    auto begin_for_each = oneapi::dpl::make_zip_iterator(first, mask, result);
+    HYPRE_ONEDPL_CALL(std::for_each, begin_for_each, begin_for_each + n,
+                      hypreSycl_transform_if_unary_zip_mask_fun<T, Pred, UnaryOperation>(pred, unary_op));
+    return result + n;
 }
 
 // Functor evaluates second element of tied sequence with predicate.
 // Used by: copy_if
-template <typename Predicate> struct hypreSycl_predicate_key_fun
-{
-   hypreSycl_predicate_key_fun(Predicate _pred) : pred(_pred) {}
+template <typename Predicate>
+struct hypreSycl_predicate_key_fun {
+    hypreSycl_predicate_key_fun(Predicate _pred) : pred(_pred) {}
 
-   template <typename _T1> bool operator()(_T1 &&a) const
-   {
-      return pred(std::get<1>(a));
-   }
+    template <typename _T1>
+    bool operator()(_T1 &&a) const {
+        return pred(std::get<1>(a));
+    }
 
 private:
-   Predicate pred;
+    Predicate pred;
 };
 
 // Need custom version of copy_if when predicate operates on a mask
 // instead of the data being copied (natively suppored in thrust, but
 // not supported in oneDPL)
 template <typename Iter1, typename Iter2, typename Iter3, typename Pred>
-Iter3 hypreSycl_copy_if(Iter1 first, Iter1 last, Iter2 mask,
-                        Iter3 result, Pred pred)
-{
-   static_assert(
-      std::is_same<typename std::iterator_traits<Iter1>::iterator_category,
-      std::random_access_iterator_tag>::value &&
-      std::is_same<typename std::iterator_traits<Iter2>::iterator_category,
-      std::random_access_iterator_tag>::value &&
-      std::is_same<typename std::iterator_traits<Iter3>::iterator_category,
-      std::random_access_iterator_tag>::value,
-      "Iterators passed to algorithms must be random-access iterators.");
-   auto ret_val = HYPRE_ONEDPL_CALL( std::copy_if,
-                                     oneapi::dpl::make_zip_iterator(first, mask),
+Iter3 hypreSycl_copy_if(Iter1 first, Iter1 last, Iter2 mask, Iter3 result, Pred pred) {
+    static_assert(std::is_same<typename std::iterator_traits<Iter1>::iterator_category,
+                               std::random_access_iterator_tag>::value
+                          && std::is_same<typename std::iterator_traits<Iter2>::iterator_category,
+                                          std::random_access_iterator_tag>::value
+                          && std::is_same<typename std::iterator_traits<Iter3>::iterator_category,
+                                          std::random_access_iterator_tag>::value,
+                  "Iterators passed to algorithms must be random-access iterators.");
+    auto ret_val = HYPRE_ONEDPL_CALL(std::copy_if, oneapi::dpl::make_zip_iterator(first, mask),
                                      oneapi::dpl::make_zip_iterator(last, mask + std::distance(first, last)),
                                      oneapi::dpl::make_zip_iterator(result, oneapi::dpl::discard_iterator()),
                                      hypreSycl_predicate_key_fun<Pred>(pred));
-   return std::get<0>(ret_val.base());
+    return std::get<0>(ret_val.base());
 }
 
 // Similar to above, need mask version of remove_if
 // NOTE: We copy the mask below because this implementation also
 // remove elements from the mask in addition to the input.
 template <typename Iter1, typename Iter2, typename Pred>
-Iter1 hypreSycl_remove_if(Iter1 first, Iter1 last, Iter2 mask, Pred pred)
-{
-   static_assert(
-      std::is_same<typename std::iterator_traits<Iter1>::iterator_category,
-      std::random_access_iterator_tag>::value &&
-      std::is_same<typename std::iterator_traits<Iter2>::iterator_category,
-      std::random_access_iterator_tag>::value,
-      "Iterators passed to algorithms must be random-access iterators.");
-   using ValueType = typename std::iterator_traits<Iter2>::value_type;
-   Iter2 mask_cpy = hypre_CTAlloc(ValueType, std::distance(first, last), HYPRE_MEMORY_DEVICE);
-   hypre_TMemcpy(mask_cpy, mask, ValueType, std::distance(first, last), HYPRE_MEMORY_DEVICE, HYPRE_MEMORY_DEVICE);
-   auto ret_val = HYPRE_ONEDPL_CALL( std::remove_if,
-                                     oneapi::dpl::make_zip_iterator(first, mask_cpy),
-                                     oneapi::dpl::make_zip_iterator(last, mask_cpy + std::distance(first, last)),
-                                     hypreSycl_predicate_key_fun<Pred>(pred));
-   hypre_TFree(mask_cpy, HYPRE_MEMORY_DEVICE);
-   return std::get<0>(ret_val.base());
+Iter1 hypreSycl_remove_if(Iter1 first, Iter1 last, Iter2 mask, Pred pred) {
+    static_assert(std::is_same<typename std::iterator_traits<Iter1>::iterator_category,
+                               std::random_access_iterator_tag>::value
+                          && std::is_same<typename std::iterator_traits<Iter2>::iterator_category,
+                                          std::random_access_iterator_tag>::value,
+                  "Iterators passed to algorithms must be random-access iterators.");
+    using ValueType = typename std::iterator_traits<Iter2>::value_type;
+    Iter2 mask_cpy = hypre_CTAlloc(ValueType, std::distance(first, last), HYPRE_MEMORY_DEVICE);
+    hypre_TMemcpy(mask_cpy, mask, ValueType, std::distance(first, last), HYPRE_MEMORY_DEVICE,
+                  HYPRE_MEMORY_DEVICE);
+    auto ret_val
+            = HYPRE_ONEDPL_CALL(std::remove_if, oneapi::dpl::make_zip_iterator(first, mask_cpy),
+                                oneapi::dpl::make_zip_iterator(last, mask_cpy + std::distance(first, last)),
+                                hypreSycl_predicate_key_fun<Pred>(pred));
+    hypre_TFree(mask_cpy, HYPRE_MEMORY_DEVICE);
+    return std::get<0>(ret_val.base());
 }
 
 // Similar to above, need mask version of remove_copy_if
 template <typename Iter1, typename Iter2, typename Iter3, typename Pred>
-Iter3 hypreSycl_remove_copy_if(Iter1 first, Iter1 last, Iter2 mask, Iter3 result, Pred pred)
-{
-   static_assert(
-      std::is_same<typename std::iterator_traits<Iter1>::iterator_category,
-      std::random_access_iterator_tag>::value &&
-      std::is_same<typename std::iterator_traits<Iter2>::iterator_category,
-      std::random_access_iterator_tag>::value,
-      "Iterators passed to algorithms must be random-access iterators.");
-   auto ret_val = HYPRE_ONEDPL_CALL( std::remove_copy_if,
-                                     oneapi::dpl::make_zip_iterator(first, mask),
+Iter3 hypreSycl_remove_copy_if(Iter1 first, Iter1 last, Iter2 mask, Iter3 result, Pred pred) {
+    static_assert(std::is_same<typename std::iterator_traits<Iter1>::iterator_category,
+                               std::random_access_iterator_tag>::value
+                          && std::is_same<typename std::iterator_traits<Iter2>::iterator_category,
+                                          std::random_access_iterator_tag>::value,
+                  "Iterators passed to algorithms must be random-access iterators.");
+    auto ret_val = HYPRE_ONEDPL_CALL(std::remove_copy_if, oneapi::dpl::make_zip_iterator(first, mask),
                                      oneapi::dpl::make_zip_iterator(last, mask + std::distance(first, last)),
                                      oneapi::dpl::make_zip_iterator(result, oneapi::dpl::discard_iterator()),
                                      hypreSycl_predicate_key_fun<Pred>(pred));
-   return std::get<0>(ret_val.base());
+    return std::get<0>(ret_val.base());
 }
 
 // Equivalent of thrust::scatter_if
-template <typename InputIter1, typename InputIter2,
-          typename InputIter3, typename OutputIter, typename Predicate>
-void hypreSycl_scatter_if(InputIter1 first, InputIter1 last,
-                          InputIter2 map, InputIter3 mask, OutputIter result,
-                          Predicate pred)
-{
-   static_assert(
-      std::is_same<typename std::iterator_traits<InputIter1>::iterator_category,
-      std::random_access_iterator_tag>::value &&
-      std::is_same <
-      typename std::iterator_traits<InputIter2>::iterator_category,
-      std::random_access_iterator_tag >::value &&
-      std::is_same <
-      typename std::iterator_traits<InputIter3>::iterator_category,
-      std::random_access_iterator_tag >::value &&
-      std::is_same <
-      typename std::iterator_traits<OutputIter>::iterator_category,
-      std::random_access_iterator_tag >::value,
-      "Iterators passed to algorithms must be random-access iterators.");
-   hypreSycl_transform_if(first, last, mask,
-                          oneapi::dpl::make_permutation_iterator(result, map),
-   [ = ](auto &&v) { return v; }, [ = ](auto &&m) { return pred(m); });
+template <typename InputIter1, typename InputIter2, typename InputIter3, typename OutputIter,
+          typename Predicate>
+void hypreSycl_scatter_if(InputIter1 first, InputIter1 last, InputIter2 map, InputIter3 mask,
+                          OutputIter result, Predicate pred) {
+    static_assert(std::is_same<typename std::iterator_traits<InputIter1>::iterator_category,
+                               std::random_access_iterator_tag>::value
+                          && std::is_same<typename std::iterator_traits<InputIter2>::iterator_category,
+                                          std::random_access_iterator_tag>::value
+                          && std::is_same<typename std::iterator_traits<InputIter3>::iterator_category,
+                                          std::random_access_iterator_tag>::value
+                          && std::is_same<typename std::iterator_traits<OutputIter>::iterator_category,
+                                          std::random_access_iterator_tag>::value,
+                  "Iterators passed to algorithms must be random-access iterators.");
+    hypreSycl_transform_if(
+            first, last, mask, oneapi::dpl::make_permutation_iterator(result, map),
+            [=](auto &&v) { return v; }, [=](auto &&m) { return pred(m); });
 }
 
 // Equivalent of thrust::scatter
-template <typename InputIter1, typename InputIter2,
-          typename OutputIter>
-void hypreSycl_scatter(InputIter1 first, InputIter1 last,
-                             InputIter2 map, OutputIter result)
-{
-   static_assert(
-      std::is_same<typename std::iterator_traits<InputIter1>::iterator_category,
-      std::random_access_iterator_tag>::value &&
-      std::is_same <
-      typename std::iterator_traits<InputIter2>::iterator_category,
-      std::random_access_iterator_tag >::value &&
-      std::is_same <
-      typename std::iterator_traits<OutputIter>::iterator_category,
-      std::random_access_iterator_tag >::value,
-      "Iterators passed to algorithms must be random-access iterators.");
-   auto perm_result =
-      oneapi::dpl::make_permutation_iterator(result, map);
-   HYPRE_ONEDPL_CALL( oneapi::dpl::copy, first, last, perm_result);
+template <typename InputIter1, typename InputIter2, typename OutputIter>
+void hypreSycl_scatter(InputIter1 first, InputIter1 last, InputIter2 map, OutputIter result) {
+    static_assert(std::is_same<typename std::iterator_traits<InputIter1>::iterator_category,
+                               std::random_access_iterator_tag>::value
+                          && std::is_same<typename std::iterator_traits<InputIter2>::iterator_category,
+                                          std::random_access_iterator_tag>::value
+                          && std::is_same<typename std::iterator_traits<OutputIter>::iterator_category,
+                                          std::random_access_iterator_tag>::value,
+                  "Iterators passed to algorithms must be random-access iterators.");
+    auto perm_result = oneapi::dpl::make_permutation_iterator(result, map);
+    HYPRE_ONEDPL_CALL(oneapi::dpl::copy, first, last, perm_result);
 }
 
 // Equivalent of thrust::gather_if
-template <typename InputIter1, typename InputIter2,
-          typename InputIter3, typename OutputIter, typename Predicate>
-void hypreSycl_gather_if(InputIter1 map_first, InputIter1 map_last,
-                          InputIter2 mask, InputIter3 input_first, OutputIter result,
-                          Predicate pred)
-{
-   static_assert(
-      std::is_same<typename std::iterator_traits<InputIter1>::iterator_category,
-      std::random_access_iterator_tag>::value &&
-      std::is_same <
-      typename std::iterator_traits<InputIter2>::iterator_category,
-      std::random_access_iterator_tag >::value &&
-      std::is_same <
-      typename std::iterator_traits<InputIter3>::iterator_category,
-      std::random_access_iterator_tag >::value &&
-      std::is_same <
-      typename std::iterator_traits<OutputIter>::iterator_category,
-      std::random_access_iterator_tag >::value,
-      "Iterators passed to algorithms must be random-access iterators.");
-   auto perm_begin =
-      oneapi::dpl::make_permutation_iterator(input_first, map_first);
-   const auto n = std::distance(map_first, map_last);
-   hypreSycl_copy_if(perm_begin, perm_begin + n, mask, result,
-   [ = ](auto &&m) { return pred(m); } );
+template <typename InputIter1, typename InputIter2, typename InputIter3, typename OutputIter,
+          typename Predicate>
+void hypreSycl_gather_if(InputIter1 map_first, InputIter1 map_last, InputIter2 mask, InputIter3 input_first,
+                         OutputIter result, Predicate pred) {
+    static_assert(std::is_same<typename std::iterator_traits<InputIter1>::iterator_category,
+                               std::random_access_iterator_tag>::value
+                          && std::is_same<typename std::iterator_traits<InputIter2>::iterator_category,
+                                          std::random_access_iterator_tag>::value
+                          && std::is_same<typename std::iterator_traits<InputIter3>::iterator_category,
+                                          std::random_access_iterator_tag>::value
+                          && std::is_same<typename std::iterator_traits<OutputIter>::iterator_category,
+                                          std::random_access_iterator_tag>::value,
+                  "Iterators passed to algorithms must be random-access iterators.");
+    auto perm_begin = oneapi::dpl::make_permutation_iterator(input_first, map_first);
+    const auto n = std::distance(map_first, map_last);
+    hypreSycl_copy_if(perm_begin, perm_begin + n, mask, result, [=](auto &&m) { return pred(m); });
 }
 
 // Equivalent of thrust::gather
-template <typename InputIter1, typename InputIter2,
-          typename OutputIter>
-OutputIter hypreSycl_gather(InputIter1 map_first, InputIter1 map_last,
-                            InputIter2 input_first, OutputIter result)
-{
-   static_assert(
-      std::is_same<typename std::iterator_traits<InputIter1>::iterator_category,
-      std::random_access_iterator_tag>::value &&
-      std::is_same <
-      typename std::iterator_traits<InputIter2>::iterator_category,
-      std::random_access_iterator_tag >::value &&
-      std::is_same <
-      typename std::iterator_traits<OutputIter>::iterator_category,
-      std::random_access_iterator_tag >::value,
-      "Iterators passed to algorithms must be random-access iterators.");
-   auto perm_begin =
-      oneapi::dpl::make_permutation_iterator(input_first, map_first);
-   const auto n = std::distance(map_first, map_last);
-   return HYPRE_ONEDPL_CALL( oneapi::dpl::copy, perm_begin, perm_begin + n, result);
+template <typename InputIter1, typename InputIter2, typename OutputIter>
+OutputIter hypreSycl_gather(InputIter1 map_first, InputIter1 map_last, InputIter2 input_first,
+                            OutputIter result) {
+    static_assert(std::is_same<typename std::iterator_traits<InputIter1>::iterator_category,
+                               std::random_access_iterator_tag>::value
+                          && std::is_same<typename std::iterator_traits<InputIter2>::iterator_category,
+                                          std::random_access_iterator_tag>::value
+                          && std::is_same<typename std::iterator_traits<OutputIter>::iterator_category,
+                                          std::random_access_iterator_tag>::value,
+                  "Iterators passed to algorithms must be random-access iterators.");
+    auto perm_begin = oneapi::dpl::make_permutation_iterator(input_first, map_first);
+    const auto n = std::distance(map_first, map_last);
+    return HYPRE_ONEDPL_CALL(oneapi::dpl::copy, perm_begin, perm_begin + n, result);
 }
 
 // Equivalent of thrust::sequence (with step=1)
 template <class Iter, class T>
-void hypreSycl_sequence(Iter first, Iter last, T init = 0)
-{
-   static_assert(
-      std::is_same<typename std::iterator_traits<Iter>::iterator_category,
-      std::random_access_iterator_tag>::value,
-      "Iterators passed to algorithms must be random-access iterators.");
-   using DiffType = typename std::iterator_traits<Iter>::difference_type;
-   HYPRE_ONEDPL_CALL( std::transform,
-                      oneapi::dpl::counting_iterator<DiffType>(init),
-                      oneapi::dpl::counting_iterator<DiffType>(init + std::distance(first, last)),
-                      first,
+void hypreSycl_sequence(Iter first, Iter last, T init = 0) {
+    static_assert(std::is_same<typename std::iterator_traits<Iter>::iterator_category,
+                               std::random_access_iterator_tag>::value,
+                  "Iterators passed to algorithms must be random-access iterators.");
+    using DiffType = typename std::iterator_traits<Iter>::difference_type;
+    HYPRE_ONEDPL_CALL(std::transform, oneapi::dpl::counting_iterator<DiffType>(init),
+                      oneapi::dpl::counting_iterator<DiffType>(init + std::distance(first, last)), first,
                       [](auto i) { return i; });
 }
 
 // Equivalent of thrust::stable_sort_by_key
 template <class Iter1, class Iter2>
-void hypreSycl_stable_sort_by_key(Iter1 keys_first, Iter1 keys_last, Iter2 values_first)
-{
-   static_assert(
-      std::is_same<typename std::iterator_traits<Iter1>::iterator_category,
-      std::random_access_iterator_tag>::value &&
-      std::is_same<typename std::iterator_traits<Iter2>::iterator_category,
-      std::random_access_iterator_tag>::value,
-      "Iterators passed to algorithms must be random-access iterators.");
-   const auto n = std::distance(keys_first, keys_last);
-   auto zipped_begin = oneapi::dpl::make_zip_iterator(keys_first, values_first);
-   HYPRE_ONEDPL_CALL( std::stable_sort,
-                      zipped_begin,
-                      zipped_begin + n,
-   [](auto lhs, auto rhs) { return std::get<0>(lhs) < std::get<0>(rhs); } );
+void hypreSycl_stable_sort_by_key(Iter1 keys_first, Iter1 keys_last, Iter2 values_first) {
+    static_assert(std::is_same<typename std::iterator_traits<Iter1>::iterator_category,
+                               std::random_access_iterator_tag>::value
+                          && std::is_same<typename std::iterator_traits<Iter2>::iterator_category,
+                                          std::random_access_iterator_tag>::value,
+                  "Iterators passed to algorithms must be random-access iterators.");
+    const auto n = std::distance(keys_first, keys_last);
+    auto zipped_begin = oneapi::dpl::make_zip_iterator(keys_first, values_first);
+    HYPRE_ONEDPL_CALL(std::stable_sort, zipped_begin, zipped_begin + n,
+                      [](auto lhs, auto rhs) { return std::get<0>(lhs) < std::get<0>(rhs); });
 }
 
 #endif
diff --git a/external/hypre/src/utilities/_hypre_utilities.hpp b/external/hypre/src/utilities/_hypre_utilities.hpp
index 43df71f6..a671c7bc 100644
--- a/external/hypre/src/utilities/_hypre_utilities.hpp
+++ b/external/hypre/src/utilities/_hypre_utilities.hpp
@@ -4,7 +4,6 @@
 #ifndef hypre_UTILITIES_HPP
 #define hypre_UTILITIES_HPP
 
-
 #ifdef __cplusplus
 extern "C++" {
 #endif
@@ -28,21 +27,16 @@ extern "C++" {
  * This assumes that the input array "a" is zeros everywhere
  *--------------------------------------------------------------------------*/
 
-struct hypreFunctor_DenseMatrixIdentity
-{
-   HYPRE_Int   n_;
-   HYPRE_Real *a_;
-
-   hypreFunctor_DenseMatrixIdentity(HYPRE_Int n, HYPRE_Real *a)
-   {
-      n_ = n;
-      a_ = a;
-   }
-
-   __host__ __device__ void operator()(HYPRE_Int i)
-   {
-      a_[i * n_ + i] = 1.0;
-   }
+struct hypreFunctor_DenseMatrixIdentity {
+    HYPRE_Int n_;
+    HYPRE_Real *a_;
+
+    hypreFunctor_DenseMatrixIdentity(HYPRE_Int n, HYPRE_Real *a) {
+        n_ = n;
+        a_ = a;
+    }
+
+    __host__ __device__ void operator()(HYPRE_Int i) { a_[i * n_ + i] = 1.0; }
 };
 
 /*--------------------------------------------------------------------------
@@ -57,17 +51,13 @@ struct hypreFunctor_DenseMatrixIdentity
  *--------------------------------------------------------------------------*/
 
 template <typename T>
-struct hypreFunctor_ArrayStridedAccess
-{
-   HYPRE_Int  s_;
-   T         *a_;
+struct hypreFunctor_ArrayStridedAccess {
+    HYPRE_Int s_;
+    T *a_;
 
-   hypreFunctor_ArrayStridedAccess(HYPRE_Int s, T *a) : s_(s), a_(a) {}
+    hypreFunctor_ArrayStridedAccess(HYPRE_Int s, T *a) : s_(s), a_(a) {}
 
-   __host__ __device__ T operator()(HYPRE_Int i)
-   {
-      return a_[i * s_];
-   }
+    __host__ __device__ T operator()(HYPRE_Int i) { return a_[i * s_]; }
 };
 
 /*--------------------------------------------------------------------------
@@ -79,32 +69,24 @@ struct hypreFunctor_ArrayStridedAccess
  *--------------------------------------------------------------------------*/
 
 template <typename T>
-struct hypreFunctor_IndexStrided
-{
-   T s_;
+struct hypreFunctor_IndexStrided {
+    T s_;
 
-   hypreFunctor_IndexStrided(T s) : s_(s) {}
+    hypreFunctor_IndexStrided(T s) : s_(s) {}
 
-   __host__ __device__ T operator()(const T i) const
-   {
-      return i * s_;
-   }
+    __host__ __device__ T operator()(const T i) const { return i * s_; }
 };
 
 /*--------------------------------------------------------------------------
  * hypreFunctor_IndexCycle
  *--------------------------------------------------------------------------*/
 
-struct hypreFunctor_IndexCycle
-{
-   HYPRE_Int cycle_length;
+struct hypreFunctor_IndexCycle {
+    HYPRE_Int cycle_length;
 
-   hypreFunctor_IndexCycle(HYPRE_Int _cycle_length) : cycle_length(_cycle_length) {}
+    hypreFunctor_IndexCycle(HYPRE_Int _cycle_length) : cycle_length(_cycle_length) {}
 
-   __host__ __device__ HYPRE_Int operator()(HYPRE_Int i) const
-   {
-      return i % cycle_length;
-   }
+    __host__ __device__ HYPRE_Int operator()(HYPRE_Int i) const { return i % cycle_length; }
 };
 
 #endif /* if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP) */
@@ -138,16 +120,12 @@ struct hypreFunctor_IndexCycle
  * is part of the strided subset.
  *--------------------------------------------------------------------------*/
 
-struct hyprePred_StridedAccess
-{
-   HYPRE_Int  s_;
+struct hyprePred_StridedAccess {
+    HYPRE_Int s_;
 
-   hyprePred_StridedAccess(HYPRE_Int s) : s_(s) {}
+    hyprePred_StridedAccess(HYPRE_Int s) : s_(s) {}
 
-   __host__ __device__ HYPRE_Int operator()(const HYPRE_Int i) const
-   {
-      return (!(i % s_));
-   }
+    __host__ __device__ HYPRE_Int operator()(const HYPRE_Int i) const { return (!(i % s_)); }
 };
 
 #endif /* if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP) */
@@ -165,30 +143,23 @@ struct hyprePred_StridedAccess
 #if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
 
 /* C++ style memory allocator for the device using the abstract memory model */
-struct hypre_device_allocator
-{
-   typedef char value_type;
-
-   hypre_device_allocator()
-   {
-      // constructor
-   }
-
-   ~hypre_device_allocator()
-   {
-      // destructor
-   }
-
-   char *allocate(std::ptrdiff_t num_bytes)
-   {
-      return hypre_TAlloc(char, num_bytes, HYPRE_MEMORY_DEVICE);
-   }
-
-   void deallocate(char *ptr, size_t n)
-   {
-      HYPRE_UNUSED_VAR(n);
-      hypre_TFree(ptr, HYPRE_MEMORY_DEVICE);
-   }
+struct hypre_device_allocator {
+    typedef char value_type;
+
+    hypre_device_allocator() {
+        // constructor
+    }
+
+    ~hypre_device_allocator() {
+        // destructor
+    }
+
+    char *allocate(std::ptrdiff_t num_bytes) { return hypre_TAlloc(char, num_bytes, HYPRE_MEMORY_DEVICE); }
+
+    void deallocate(char *ptr, size_t n) {
+        HYPRE_UNUSED_VAR(n);
+        hypre_TFree(ptr, HYPRE_MEMORY_DEVICE);
+    }
 };
 
 #endif /* #if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP) */
@@ -208,12 +179,12 @@ struct hypre_device_allocator
 
 /* Data types depending on GPU architecture */
 #if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_SYCL)
-typedef hypre_uint          hypre_mask;
-#define hypre_mask_one      1U
+typedef hypre_uint hypre_mask;
+#define hypre_mask_one 1U
 
 #elif defined(HYPRE_USING_HIP)
-typedef hypre_ulonglongint  hypre_mask;
-#define hypre_mask_one      1ULL
+typedef hypre_ulonglongint hypre_mask;
+#define hypre_mask_one 1ULL
 
 #endif
 
@@ -222,10 +193,10 @@ typedef hypre_ulonglongint  hypre_mask;
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #if defined(HYPRE_USING_CUDA)
-using hypre_DeviceItem = void*;
+using hypre_DeviceItem = void *;
 #include <cuda.h>
-#include <cuda_runtime.h>
 #include <cuda_profiler_api.h>
+#include <cuda_runtime.h>
 
 #if defined(HYPRE_USING_CURAND)
 #include <curand.h>
@@ -263,7 +234,7 @@ using hypre_DeviceItem = void*;
 
 #ifndef CUSPARSE_VERSION
 #if defined(CUSPARSE_VER_MAJOR) && defined(CUSPARSE_VER_MINOR) && defined(CUSPARSE_VER_PATCH)
-#define CUSPARSE_VERSION (CUSPARSE_VER_MAJOR * 1000 + CUSPARSE_VER_MINOR *  100 + CUSPARSE_VER_PATCH)
+#define CUSPARSE_VERSION (CUSPARSE_VER_MAJOR * 1000 + CUSPARSE_VER_MINOR * 100 + CUSPARSE_VER_PATCH)
 #else
 #define CUSPARSE_VERSION CUDA_VERSION
 #endif
@@ -276,23 +247,23 @@ using hypre_DeviceItem = void*;
 
 #define CUSPARSE_SPSV_VERSION 11600
 #if CUSPARSE_VERSION >= CUSPARSE_SPSV_VERSION
-#define hypre_cusparseSpSVDescr         cusparseSpSVDescr_t
-#define hypre_cusparseSpSV_createDescr  cusparseSpSV_createDescr
+#define hypre_cusparseSpSVDescr cusparseSpSVDescr_t
+#define hypre_cusparseSpSV_createDescr cusparseSpSV_createDescr
 #define hypre_cusparseSpSV_destroyDescr cusparseSpSV_destroyDescr
 #else
-#define hypre_cusparseSpSVDescr         csrsv2Info_t
-#define hypre_cusparseSpSV_createDescr  cusparseCreateCsrsv2Info
+#define hypre_cusparseSpSVDescr csrsv2Info_t
+#define hypre_cusparseSpSV_createDescr cusparseCreateCsrsv2Info
 #define hypre_cusparseSpSV_destroyDescr cusparseDestroyCsrsv2Info
 #endif
 
 #define CUSPARSE_SPSM_VERSION 11600
 #if CUSPARSE_VERSION >= CUSPARSE_SPSM_VERSION
-#define hypre_cusparseSpSMDescr         cusparseSpSMDescr_t
-#define hypre_cusparseSpSM_createDescr  cusparseSpSM_createDescr
+#define hypre_cusparseSpSMDescr cusparseSpSMDescr_t
+#define hypre_cusparseSpSM_createDescr cusparseSpSM_createDescr
 #define hypre_cusparseSpSM_destroyDescr cusparseSpSM_destroyDescr
 #else
-#define hypre_cusparseSpSMDescr         csrsm2Info_t
-#define hypre_cusparseSpSM_createDescr  cusparseCreateCsrsm2Info
+#define hypre_cusparseSpSMDescr csrsm2Info_t
+#define hypre_cusparseSpSM_createDescr cusparseCreateCsrsm2Info
 #define hypre_cusparseSpSM_destroyDescr cusparseDestroyCsrsm2Info
 #endif
 
@@ -319,7 +290,7 @@ using hypre_DeviceItem = void*;
 
 #if defined(HYPRE_USING_HIP)
 
-using hypre_DeviceItem = void*;
+using hypre_DeviceItem = void *;
 #include <hip/hip_runtime.h>
 
 #if defined(HYPRE_USING_ROCBLAS)
@@ -329,7 +300,8 @@ using hypre_DeviceItem = void*;
 #if defined(HYPRE_USING_ROCSPARSE)
 #include <rocsparse/rocsparse.h>
 #if !defined(ROCSPARSE_VERSION)
-#define ROCSPARSE_VERSION (ROCSPARSE_VERSION_MAJOR * 100000 + ROCSPARSE_VERSION_MINOR * 100 + ROCSPARSE_VERSION_PATCH)
+#define ROCSPARSE_VERSION                                                                                    \
+    (ROCSPARSE_VERSION_MAJOR * 100000 + ROCSPARSE_VERSION_MINOR * 100 + ROCSPARSE_VERSION_PATCH)
 #endif
 #endif
 
@@ -355,26 +327,26 @@ using hypre_DeviceItem = void*;
 #elif defined(HYPRE_USING_HIP)
 #include <thrust/system/hip/execution_policy.h>
 #endif
+#include <thrust/adjacent_difference.h>
+#include <thrust/binary_search.h>
 #include <thrust/count.h>
 #include <thrust/device_ptr.h>
-#include <thrust/unique.h>
-#include <thrust/sort.h>
-#include <thrust/binary_search.h>
-#include <thrust/iterator/constant_iterator.h>
-#include <thrust/iterator/counting_iterator.h>
-#include <thrust/iterator/zip_iterator.h>
-#include <thrust/transform.h>
+#include <thrust/fill.h>
+#include <thrust/for_each.h>
 #include <thrust/functional.h>
 #include <thrust/gather.h>
-#include <thrust/scan.h>
-#include <thrust/fill.h>
-#include <thrust/adjacent_difference.h>
 #include <thrust/inner_product.h>
+#include <thrust/iterator/constant_iterator.h>
+#include <thrust/iterator/counting_iterator.h>
+#include <thrust/iterator/zip_iterator.h>
 #include <thrust/logical.h>
+#include <thrust/remove.h>
 #include <thrust/replace.h>
+#include <thrust/scan.h>
 #include <thrust/sequence.h>
-#include <thrust/for_each.h>
-#include <thrust/remove.h>
+#include <thrust/sort.h>
+#include <thrust/transform.h>
+#include <thrust/unique.h>
 #include <thrust/version.h>
 
 /* VPM: this is needed to support cuda 10. not_fn is the correct replacement going forward. */
@@ -394,8 +366,8 @@ using namespace thrust::placeholders;
 
 #if defined(HYPRE_USING_SYCL)
 
-#include <sycl/sycl.hpp>
 #include <dpct/dpct.hpp>
+#include <sycl/sycl.hpp>
 #if defined(HYPRE_USING_ONEMKLSPARSE)
 #include <oneapi/mkl/spblas.hpp>
 #endif
@@ -426,18 +398,18 @@ using hypre_DeviceItem = sycl::nd_item<3>;
 
 // HYPRE_WARP_BITSHIFT is just log2 of HYPRE_WARP_SIZE
 #if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_SYCL)
-#define HYPRE_WARP_SIZE       32
-#define HYPRE_WARP_BITSHIFT   5
-#define HYPRE_WARP_FULL_MASK  0xFFFFFFFF
+#define HYPRE_WARP_SIZE 32
+#define HYPRE_WARP_BITSHIFT 5
+#define HYPRE_WARP_FULL_MASK 0xFFFFFFFF
 #elif defined(HYPRE_USING_HIP)
-#define HYPRE_WARP_SIZE       64
-#define HYPRE_WARP_BITSHIFT   6
-#define HYPRE_WARP_FULL_MASK  0xFFFFFFFFFFFFFFF
+#define HYPRE_WARP_SIZE 64
+#define HYPRE_WARP_BITSHIFT 6
+#define HYPRE_WARP_FULL_MASK 0xFFFFFFFFFFFFFFF
 #endif
 
-#define HYPRE_MAX_NUM_WARPS   (64 * 64 * 32)
-#define HYPRE_FLT_LARGE       1e30
-#define HYPRE_1D_BLOCK_SIZE   512
+#define HYPRE_MAX_NUM_WARPS (64 * 64 * 32)
+#define HYPRE_FLT_LARGE 1e30
+#define HYPRE_1D_BLOCK_SIZE 512
 #define HYPRE_MAX_NUM_STREAMS 10
 #define HYPRE_SPGEMM_MAX_NBIN 10
 
@@ -447,142 +419,149 @@ using hypre_DeviceItem = sycl::nd_item<3>;
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #if defined(HYPRE_DEBUG)
-#define GPU_LAUNCH_SYNC { hypre_SyncComputeStream(); hypre_GetDeviceLastError(); }
+#define GPU_LAUNCH_SYNC                                                                                      \
+    {                                                                                                        \
+        hypre_SyncComputeStream();                                                                           \
+        hypre_GetDeviceLastError();                                                                          \
+    }
 #else
 #define GPU_LAUNCH_SYNC
 #endif
 
 /* cuda/hip version */
 #if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-#define HYPRE_GPU_LAUNCH2(kernel_name, gridsize, blocksize, shmem_size, ...)                                                        \
-{                                                                                                                                   \
-   if ( gridsize.x  == 0 || gridsize.y  == 0 || gridsize.z  == 0 ||                                                                 \
-        blocksize.x == 0 || blocksize.y == 0 || blocksize.z == 0 )                                                                  \
-   {                                                                                                                                \
-      /* printf("Warning %s %d: Zero CUDA grid/block (%d %d %d) (%d %d %d)\n",                                                      \
+#define HYPRE_GPU_LAUNCH2(kernel_name, gridsize, blocksize, shmem_size, ...)                                                                \
+    {                                                                                                                                       \
+        if (gridsize.x == 0 || gridsize.y == 0 || gridsize.z == 0 || blocksize.x == 0 || blocksize.y == 0                                   \
+            || blocksize.z == 0) {                                                                                                          \
+            /* printf("Warning %s %d: Zero CUDA grid/block (%d %d %d) (%d %d %d)\n",                                                      \
                  __FILE__, __LINE__,                                                                                                \
-                 gridsize.x, gridsize.y, gridsize.z, blocksize.x, blocksize.y, blocksize.z); */                                     \
-   }                                                                                                                                \
-   else                                                                                                                             \
-   {                                                                                                                                \
-      hypre_DeviceItem item = NULL;                                                                                                 \
-      (kernel_name) <<< (gridsize), (blocksize), shmem_size, hypre_HandleComputeStream(hypre_handle()) >>> (item, __VA_ARGS__);     \
-      GPU_LAUNCH_SYNC;                                                                                                              \
-   }                                                                                                                                \
-}
+                 gridsize.x, gridsize.y, gridsize.z, blocksize.x, blocksize.y, blocksize.z); */ \
+        } else {                                                                                                                            \
+            hypre_DeviceItem item = NULL;                                                                                                   \
+            (kernel_name)<<<(gridsize), (blocksize), shmem_size,                                                                            \
+                            hypre_HandleComputeStream(hypre_handle())>>>(item, __VA_ARGS__);                                                \
+            GPU_LAUNCH_SYNC;                                                                                                                \
+        }                                                                                                                                   \
+    }
 
-#define HYPRE_GPU_LAUNCH(kernel_name, gridsize, blocksize, ...) HYPRE_GPU_LAUNCH2(kernel_name, gridsize, blocksize, 0, __VA_ARGS__)
+#define HYPRE_GPU_LAUNCH(kernel_name, gridsize, blocksize, ...)                                              \
+    HYPRE_GPU_LAUNCH2(kernel_name, gridsize, blocksize, 0, __VA_ARGS__)
 #endif /* defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP) */
 
 /* sycl version */
 #if defined(HYPRE_USING_SYCL)
 
-#define HYPRE_GPU_LAUNCH(kernel_name, gridsize, blocksize, ...)                              \
-{                                                                                            \
-   if ( gridsize[2] == 0 || blocksize[2] == 0 )                                              \
-   {                                                                                         \
-     /* hypre_printf("Warning %s %d: Zero SYCL 1D launch parameters grid/block (%d) (%d)\n", \
+#define HYPRE_GPU_LAUNCH(kernel_name, gridsize, blocksize, ...)                                              \
+    {                                                                                                        \
+        if (gridsize[2] == 0 || blocksize[2] == 0) {                                                         \
+            /* hypre_printf("Warning %s %d: Zero SYCL 1D launch parameters grid/block (%d) (%d)\n", \
                   __FILE__, __LINE__,                                                        \
-                  gridsize[0], blocksize[0]); */                                             \
-   }                                                                                         \
-   else                                                                                      \
-   {                                                                                         \
-      hypre_HandleComputeStream(hypre_handle())->submit([&] (sycl::handler& cgh) {           \
-         cgh.parallel_for(sycl::nd_range<3>(gridsize*blocksize, blocksize),                  \
-            [=] (hypre_DeviceItem item) [[intel::reqd_sub_group_size(HYPRE_WARP_SIZE)]]      \
-               { (kernel_name)(item, __VA_ARGS__);                                           \
-         });                                                                                 \
-      }).wait_and_throw();                                                                   \
-   }                                                                                         \
-}
-
-#define HYPRE_CPU_LAUNCH(kernel_name, gridsize, blocksize, ...)                              \
-{                                                                                            \
-   if ( gridsize[2] == 0 || blocksize[2] == 0 )                                              \
-   {                                                                                         \
-     /* hypre_printf("Warning %s %d: Zero SYCL 1D launch parameters grid/block (%d) (%d)\n", \
+                  gridsize[0], blocksize[0]); */        \
+        } else {                                                                                             \
+            hypre_HandleComputeStream(hypre_handle())                                                        \
+                    ->submit([&](sycl::handler &cgh) {                                                       \
+                        cgh.parallel_for(                                                                    \
+                                sycl::nd_range<3>(gridsize * blocksize, blocksize),                          \
+                                [=](hypre_DeviceItem item) [[intel::reqd_sub_group_size(HYPRE_WARP_SIZE)]] { \
+                                    (kernel_name)(item, __VA_ARGS__);                                        \
+                                });                                                                          \
+                    })                                                                                       \
+                    .wait_and_throw();                                                                       \
+        }                                                                                                    \
+    }
+
+#define HYPRE_CPU_LAUNCH(kernel_name, gridsize, blocksize, ...)                                              \
+    {                                                                                                        \
+        if (gridsize[2] == 0 || blocksize[2] == 0) {                                                         \
+            /* hypre_printf("Warning %s %d: Zero SYCL 1D launch parameters grid/block (%d) (%d)\n", \
                   __FILE__, __LINE__,                                                        \
-                  gridsize[0], blocksize[0]); */                                             \
-   }                                                                                         \
-   else                                                                                      \
-   {                                                                                         \
-      HPYRE_Int compute_stream = hypre_HandleComputeStreamNum(hypre_handle());               \
-      hypre_HandleComputeStreamNum(hypre_handle) = HYPRE_MAX_NUM_STREAMS - 1;                \
-      hypre_HandleComputeStream(hypre_handle())->submit([&] (sycl::handler& cgh) {           \
-         cgh.parallel_for(sycl::nd_range<3>(gridsize*blocksize, blocksize),                  \
-            [=] (hypre_DeviceItem item) [[intel::reqd_sub_group_size(HYPRE_WARP_SIZE)]]      \
-               { (kernel_name)(item, __VA_ARGS__);                                           \
-         });                                                                                 \
-      }).wait_and_throw();                                                                   \
-      hypre_HandleComputeStreamNum(hypre_handle) = compute_stream;                           \
-   }                                                                                         \
-}
-
-#define HYPRE_GPU_LAUNCH2(kernel_name, gridsize, blocksize, shmem_size, ...)                 \
-{                                                                                            \
-   if ( gridsize[2] == 0 || blocksize[2] == 0 )                                              \
-   {                                                                                         \
-     /* hypre_printf("Warning %s %d: Zero SYCL 1D launch parameters grid/block (%d) (%d)\n", \
+                  gridsize[0], blocksize[0]); */        \
+        } else {                                                                                             \
+            HPYRE_Int compute_stream = hypre_HandleComputeStreamNum(hypre_handle());                         \
+            hypre_HandleComputeStreamNum(hypre_handle) = HYPRE_MAX_NUM_STREAMS - 1;                          \
+            hypre_HandleComputeStream(hypre_handle())                                                        \
+                    ->submit([&](sycl::handler &cgh) {                                                       \
+                        cgh.parallel_for(                                                                    \
+                                sycl::nd_range<3>(gridsize * blocksize, blocksize),                          \
+                                [=](hypre_DeviceItem item) [[intel::reqd_sub_group_size(HYPRE_WARP_SIZE)]] { \
+                                    (kernel_name)(item, __VA_ARGS__);                                        \
+                                });                                                                          \
+                    })                                                                                       \
+                    .wait_and_throw();                                                                       \
+            hypre_HandleComputeStreamNum(hypre_handle) = compute_stream;                                     \
+        }                                                                                                    \
+    }
+
+#define HYPRE_GPU_LAUNCH2(kernel_name, gridsize, blocksize, shmem_size, ...)                                 \
+    {                                                                                                        \
+        if (gridsize[2] == 0 || blocksize[2] == 0) {                                                         \
+            /* hypre_printf("Warning %s %d: Zero SYCL 1D launch parameters grid/block (%d) (%d)\n", \
                   __FILE__, __LINE__,                                                        \
-                  gridsize[0], blocksize[0]); */                                             \
-   }                                                                                         \
-   else                                                                                      \
-   {                                                                                         \
-      hypre_HandleComputeStream(hypre_handle())->submit([&] (sycl::handler& cgh) {           \
-         sycl::range<1> shmem_range(shmem_size);                                             \
-         sycl::local_accessor<char, 1> shmem_accessor(shmem_range, cgh);                     \
-         cgh.parallel_for(sycl::nd_range<3>(gridsize*blocksize, blocksize),                  \
-            [=] (hypre_DeviceItem item) [[intel::reqd_sub_group_size(HYPRE_WARP_SIZE)]]      \
-               { (kernel_name)(item,                                                         \
-                  shmem_accessor.get_multi_ptr<sycl::access::decorated::yes>(), __VA_ARGS__);\
-         });                                                                                 \
-      }).wait_and_throw();                                                                   \
-   }                                                                                         \
-}
-
-#define HYPRE_GPU_DEBUG_LAUNCH(kernel_name, gridsize, blocksize, ...)                        \
-{                                                                                            \
-   if ( gridsize[2] == 0 || blocksize[2] == 0 )                                              \
-   {                                                                                         \
-     /* hypre_printf("Warning %s %d: Zero SYCL 1D launch parameters grid/block (%d) (%d)\n", \
+                  gridsize[0], blocksize[0]); */        \
+        } else {                                                                                             \
+            hypre_HandleComputeStream(hypre_handle())                                                        \
+                    ->submit([&](sycl::handler &cgh) {                                                       \
+                        sycl::range<1> shmem_range(shmem_size);                                              \
+                        sycl::local_accessor<char, 1> shmem_accessor(shmem_range, cgh);                      \
+                        cgh.parallel_for(                                                                    \
+                                sycl::nd_range<3>(gridsize * blocksize, blocksize),                          \
+                                [=](hypre_DeviceItem item) [[intel::reqd_sub_group_size(HYPRE_WARP_SIZE)]] { \
+                                    (kernel_name)(                                                           \
+                                            item,                                                            \
+                                            shmem_accessor.get_multi_ptr<sycl::access::decorated::yes>(),    \
+                                            __VA_ARGS__);                                                    \
+                                });                                                                          \
+                    })                                                                                       \
+                    .wait_and_throw();                                                                       \
+        }                                                                                                    \
+    }
+
+#define HYPRE_GPU_DEBUG_LAUNCH(kernel_name, gridsize, blocksize, ...)                                        \
+    {                                                                                                        \
+        if (gridsize[2] == 0 || blocksize[2] == 0) {                                                         \
+            /* hypre_printf("Warning %s %d: Zero SYCL 1D launch parameters grid/block (%d) (%d)\n", \
                   __FILE__, __LINE__,                                                        \
-                  gridsize[0], blocksize[0]); */                                             \
-   }                                                                                         \
-   else                                                                                      \
-   {                                                                                         \
-      hypre_HandleComputeStream(hypre_handle())->submit([&] (sycl::handler& cgh) {           \
-         auto debug_stream = sycl::stream(4096, 1024, cgh);                                  \
-         cgh.parallel_for(sycl::nd_range<3>(gridsize*blocksize, blocksize),                  \
-            [=] (hypre_DeviceItem item) [[intel::reqd_sub_group_size(HYPRE_WARP_SIZE)]]      \
-               { (kernel_name)(item, debug_stream, __VA_ARGS__);                             \
-         });                                                                                 \
-      }).wait_and_throw();                                                                   \
-   }                                                                                         \
-}
-
-#define HYPRE_GPU_DEBUG_LAUNCH2(kernel_name, gridsize, blocksize, shmem_size, ...)           \
-{                                                                                            \
-   if ( gridsize[2] == 0 || blocksize[2] == 0 )                                              \
-   {                                                                                         \
-     /* hypre_printf("Warning %s %d: Zero SYCL 1D launch parameters grid/block (%d) (%d)\n", \
+                  gridsize[0], blocksize[0]); */        \
+        } else {                                                                                             \
+            hypre_HandleComputeStream(hypre_handle())                                                        \
+                    ->submit([&](sycl::handler &cgh) {                                                       \
+                        auto debug_stream = sycl::stream(4096, 1024, cgh);                                   \
+                        cgh.parallel_for(                                                                    \
+                                sycl::nd_range<3>(gridsize * blocksize, blocksize),                          \
+                                [=](hypre_DeviceItem item) [[intel::reqd_sub_group_size(HYPRE_WARP_SIZE)]] { \
+                                    (kernel_name)(item, debug_stream, __VA_ARGS__);                          \
+                                });                                                                          \
+                    })                                                                                       \
+                    .wait_and_throw();                                                                       \
+        }                                                                                                    \
+    }
+
+#define HYPRE_GPU_DEBUG_LAUNCH2(kernel_name, gridsize, blocksize, shmem_size, ...)                           \
+    {                                                                                                        \
+        if (gridsize[2] == 0 || blocksize[2] == 0) {                                                         \
+            /* hypre_printf("Warning %s %d: Zero SYCL 1D launch parameters grid/block (%d) (%d)\n", \
                   __FILE__, __LINE__,                                                        \
-                  gridsize[0], blocksize[0]); */                                             \
-   }                                                                                         \
-   else                                                                                      \
-   {                                                                                         \
-      hypre_HandleComputeStream(hypre_handle())->submit([&] (sycl::handler& cgh) {           \
-         auto debug_stream = sycl::stream(4096, 1024, cgh);                                  \
-         sycl::range<1> shmem_range(shmem_size);                                             \
-         sycl::accessor<char, 1, sycl::access_mode::read_write,                              \
-            sycl::target::local> shmem_accessor(shmem_range, cgh);                           \
-         cgh.parallel_for(sycl::nd_range<3>(gridsize*blocksize, blocksize),                  \
-            [=] (hypre_DeviceItem item) [[intel::reqd_sub_group_size(HYPRE_WARP_SIZE)]]      \
-               { (kernel_name)(item, debug_stream,                                           \
-                  shmem_accessor.get_multi_ptr<sycl::access::decorated::yes>(), __VA_ARGS__);\
-         });                                                                                 \
-      }).wait_and_throw();                                                                   \
-   }                                                                                         \
-}
+                  gridsize[0], blocksize[0]); */        \
+        } else {                                                                                             \
+            hypre_HandleComputeStream(hypre_handle())                                                        \
+                    ->submit([&](sycl::handler &cgh) {                                                       \
+                        auto debug_stream = sycl::stream(4096, 1024, cgh);                                   \
+                        sycl::range<1> shmem_range(shmem_size);                                              \
+                        sycl::accessor<char, 1, sycl::access_mode::read_write, sycl::target::local>          \
+                                shmem_accessor(shmem_range, cgh);                                            \
+                        cgh.parallel_for(                                                                    \
+                                sycl::nd_range<3>(gridsize * blocksize, blocksize),                          \
+                                [=](hypre_DeviceItem item) [[intel::reqd_sub_group_size(HYPRE_WARP_SIZE)]] { \
+                                    (kernel_name)(                                                           \
+                                            item, debug_stream,                                              \
+                                            shmem_accessor.get_multi_ptr<sycl::access::decorated::yes>(),    \
+                                            __VA_ARGS__);                                                    \
+                                });                                                                          \
+                    })                                                                                       \
+                    .wait_and_throw();                                                                       \
+        }                                                                                                    \
+    }
 #endif /* defined(HYPRE_USING_SYCL) */
 
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -590,41 +569,37 @@ using hypre_DeviceItem = sycl::nd_item<3>;
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #if defined(HYPRE_USING_CUDA)
-#define HYPRE_CUDA_CALL(call) do {                                                           \
-   cudaError_t err = call;                                                                   \
-   if (cudaSuccess != err) {                                                                 \
-      printf("CUDA ERROR (code = %d, %s) at %s:%d\n", err, cudaGetErrorString(err),          \
-                   __FILE__, __LINE__);                                                      \
-      hypre_assert(0);                                                                       \
-   } } while(0)
+#define HYPRE_CUDA_CALL(call)                                                                                \
+    do {                                                                                                     \
+        cudaError_t err = call;                                                                              \
+        if (cudaSuccess != err) {                                                                            \
+            printf("CUDA ERROR (code = %d, %s) at %s:%d\n", err, cudaGetErrorString(err), __FILE__,          \
+                   __LINE__);                                                                                \
+            hypre_assert(0);                                                                                 \
+        }                                                                                                    \
+    } while (0)
 
 #elif defined(HYPRE_USING_HIP)
-#define HYPRE_HIP_CALL(call) do {                                                            \
-   hipError_t err = call;                                                                    \
-   if (hipSuccess != err) {                                                                  \
-      printf("HIP ERROR (code = %d, %s) at %s:%d\n", err, hipGetErrorString(err),            \
-                   __FILE__, __LINE__);                                                      \
-      hypre_assert(0);                                                                       \
-   } } while(0)
+#define HYPRE_HIP_CALL(call)                                                                                 \
+    do {                                                                                                     \
+        hipError_t err = call;                                                                               \
+        if (hipSuccess != err) {                                                                             \
+            printf("HIP ERROR (code = %d, %s) at %s:%d\n", err, hipGetErrorString(err), __FILE__, __LINE__); \
+            hypre_assert(0);                                                                                 \
+        }                                                                                                    \
+    } while (0)
 
 #elif defined(HYPRE_USING_SYCL)
-#define HYPRE_SYCL_CALL(call)                                                                \
-   try                                                                                       \
-   {                                                                                         \
-      call;                                                                                  \
-   }                                                                                         \
-   catch (sycl::exception const &ex)                                                         \
-   {                                                                                         \
-      hypre_printf("SYCL ERROR (code = %s) at %s:%d\n", ex.what(),                           \
-                     __FILE__, __LINE__);                                                    \
-      assert(0);                                                                             \
-   }                                                                                         \
-   catch(std::runtime_error const& ex)                                                       \
-   {                                                                                         \
-      hypre_printf("STD ERROR (code = %s) at %s:%d\n", ex.what(),                            \
-                   __FILE__, __LINE__);                                                      \
-      assert(0);                                                                             \
-   }
+#define HYPRE_SYCL_CALL(call)                                                                                \
+    try {                                                                                                    \
+        call;                                                                                                \
+    } catch (sycl::exception const &ex) {                                                                    \
+        hypre_printf("SYCL ERROR (code = %s) at %s:%d\n", ex.what(), __FILE__, __LINE__);                    \
+        assert(0);                                                                                           \
+    } catch (std::runtime_error const &ex) {                                                                 \
+        hypre_printf("STD ERROR (code = %s) at %s:%d\n", ex.what(), __FILE__, __LINE__);                     \
+        assert(0);                                                                                           \
+    }
 #endif
 
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -637,50 +612,50 @@ using hypre_DeviceItem = sycl::nd_item<3>;
 #elif defined(HYPRE_SINGLE) /* Single */
 #if defined(HYPRE_USING_CUDA)
 /* cuBLAS */
-#define hypre_cublas_scal                      cublasSscal
-#define hypre_cublas_axpy                      cublasSaxpy
-#define hypre_cublas_dot                       cublasSdot
-#define hypre_cublas_gemv                      cublasSgemv
-#define hypre_cublas_getrfBatched              cublasSgetrfBatched
-#define hypre_cublas_getriBatched              cublasSgetriBatched
+#define hypre_cublas_scal cublasSscal
+#define hypre_cublas_axpy cublasSaxpy
+#define hypre_cublas_dot cublasSdot
+#define hypre_cublas_gemv cublasSgemv
+#define hypre_cublas_getrfBatched cublasSgetrfBatched
+#define hypre_cublas_getriBatched cublasSgetriBatched
 
 /* cuSPARSE */
-#define hypre_cusparse_csru2csr_bufferSizeExt  cusparseScsru2csr_bufferSizeExt
-#define hypre_cusparse_csru2csr                cusparseScsru2csr
-#define hypre_cusparse_csrsv2_bufferSize       cusparseScsrsv2_bufferSize
-#define hypre_cusparse_csrsv2_analysis         cusparseScsrsv2_analysis
-#define hypre_cusparse_csrsv2_solve            cusparseScsrsv2_solve
-#define hypre_cusparse_csrmv                   cusparseScsrmv
-#define hypre_cusparse_csrgemm                 cusparseScsrgemm
-#define hypre_cusparse_csr2csc                 cusparseScsr2csc
-#define hypre_cusparse_csrilu02_bufferSize     cusparseScsrilu02_bufferSize
-#define hypre_cusparse_csrilu02_analysis       cusparseScsrilu02_analysis
-#define hypre_cusparse_csrilu02                cusparseScsrilu02
-#define hypre_cusparse_csrsm2_bufferSizeExt    cusparseScsrsm2_bufferSizeExt
-#define hypre_cusparse_csrsm2_analysis         cusparseScsrsm2_analysis
-#define hypre_cusparse_csrsm2_solve            cusparseScsrsm2_solve
+#define hypre_cusparse_csru2csr_bufferSizeExt cusparseScsru2csr_bufferSizeExt
+#define hypre_cusparse_csru2csr cusparseScsru2csr
+#define hypre_cusparse_csrsv2_bufferSize cusparseScsrsv2_bufferSize
+#define hypre_cusparse_csrsv2_analysis cusparseScsrsv2_analysis
+#define hypre_cusparse_csrsv2_solve cusparseScsrsv2_solve
+#define hypre_cusparse_csrmv cusparseScsrmv
+#define hypre_cusparse_csrgemm cusparseScsrgemm
+#define hypre_cusparse_csr2csc cusparseScsr2csc
+#define hypre_cusparse_csrilu02_bufferSize cusparseScsrilu02_bufferSize
+#define hypre_cusparse_csrilu02_analysis cusparseScsrilu02_analysis
+#define hypre_cusparse_csrilu02 cusparseScsrilu02
+#define hypre_cusparse_csrsm2_bufferSizeExt cusparseScsrsm2_bufferSizeExt
+#define hypre_cusparse_csrsm2_analysis cusparseScsrsm2_analysis
+#define hypre_cusparse_csrsm2_solve cusparseScsrsm2_solve
 
 /* cuSOLVER */
-#define hypre_cusolver_dngetrf                 cusolverDnSgetrf
-#define hypre_cusolver_dngetrf_bs              cusolverDnSgetrf_bufferSize
-#define hypre_cusolver_dngetrs                 cusolverDnSgetrs
+#define hypre_cusolver_dngetrf cusolverDnSgetrf
+#define hypre_cusolver_dngetrf_bs cusolverDnSgetrf_bufferSize
+#define hypre_cusolver_dngetrs cusolverDnSgetrs
 
 #elif defined(HYPRE_USING_HIP)
 /* rocSPARSE */
-#define hypre_rocsparse_csrsv_buffer_size      rocsparse_scsrsv_buffer_size
-#define hypre_rocsparse_csrsv_analysis         rocsparse_scsrsv_analysis
-#define hypre_rocsparse_csrsv_solve            rocsparse_scsrsv_solve
-#define hypre_rocsparse_gthr                   rocsparse_sgthr
-#define hypre_rocsparse_csrmv_analysis         rocsparse_scsrmv_analysis
-#define hypre_rocsparse_csrmv                  rocsparse_scsrmv
-#define hypre_rocsparse_csrgemm_buffer_size    rocsparse_scsrgemm_buffer_size
-#define hypre_rocsparse_csrgemm                rocsparse_scsrgemm
-#define hypre_rocsparse_csr2csc                rocsparse_scsr2csc
-#define hypre_rocsparse_csrilu0_buffer_size    rocsparse_scsrilu0_buffer_size
-#define hypre_rocsparse_csrilu0_analysis       rocsparse_scsrilu0_analysis
-#define hypre_rocsparse_csrilu0                rocsparse_scsrilu0
-#define hypre_rocsparse_csritilu0_compute      rocsparse_scsritilu0_compute
-#define hypre_rocsparse_csritilu0_history      rocsparse_scsritilu0_history
+#define hypre_rocsparse_csrsv_buffer_size rocsparse_scsrsv_buffer_size
+#define hypre_rocsparse_csrsv_analysis rocsparse_scsrsv_analysis
+#define hypre_rocsparse_csrsv_solve rocsparse_scsrsv_solve
+#define hypre_rocsparse_gthr rocsparse_sgthr
+#define hypre_rocsparse_csrmv_analysis rocsparse_scsrmv_analysis
+#define hypre_rocsparse_csrmv rocsparse_scsrmv
+#define hypre_rocsparse_csrgemm_buffer_size rocsparse_scsrgemm_buffer_size
+#define hypre_rocsparse_csrgemm rocsparse_scsrgemm
+#define hypre_rocsparse_csr2csc rocsparse_scsr2csc
+#define hypre_rocsparse_csrilu0_buffer_size rocsparse_scsrilu0_buffer_size
+#define hypre_rocsparse_csrilu0_analysis rocsparse_scsrilu0_analysis
+#define hypre_rocsparse_csrilu0 rocsparse_scsrilu0
+#define hypre_rocsparse_csritilu0_compute rocsparse_scsritilu0_compute
+#define hypre_rocsparse_csritilu0_history rocsparse_scsritilu0_history
 
 /* rocSOLVER */
 
@@ -696,50 +671,50 @@ using hypre_DeviceItem = sycl::nd_item<3>;
 #else /* Double */
 #if defined(HYPRE_USING_CUDA)
 /* cuBLAS */
-#define hypre_cublas_scal                      cublasDscal
-#define hypre_cublas_axpy                      cublasDaxpy
-#define hypre_cublas_dot                       cublasDdot
-#define hypre_cublas_gemv                      cublasDgemv
-#define hypre_cublas_getrfBatched              cublasDgetrfBatched
-#define hypre_cublas_getriBatched              cublasDgetriBatched
+#define hypre_cublas_scal cublasDscal
+#define hypre_cublas_axpy cublasDaxpy
+#define hypre_cublas_dot cublasDdot
+#define hypre_cublas_gemv cublasDgemv
+#define hypre_cublas_getrfBatched cublasDgetrfBatched
+#define hypre_cublas_getriBatched cublasDgetriBatched
 
 /* cuSPARSE */
-#define hypre_cusparse_csru2csr_bufferSizeExt  cusparseDcsru2csr_bufferSizeExt
-#define hypre_cusparse_csru2csr                cusparseDcsru2csr
-#define hypre_cusparse_csrsv2_bufferSize       cusparseDcsrsv2_bufferSize
-#define hypre_cusparse_csrsv2_analysis         cusparseDcsrsv2_analysis
-#define hypre_cusparse_csrsv2_solve            cusparseDcsrsv2_solve
-#define hypre_cusparse_csrmv                   cusparseDcsrmv
-#define hypre_cusparse_csrgemm                 cusparseDcsrgemm
-#define hypre_cusparse_csr2csc                 cusparseDcsr2csc
-#define hypre_cusparse_csrilu02_bufferSize     cusparseDcsrilu02_bufferSize
-#define hypre_cusparse_csrilu02_analysis       cusparseDcsrilu02_analysis
-#define hypre_cusparse_csrilu02                cusparseDcsrilu02
-#define hypre_cusparse_csrsm2_bufferSizeExt    cusparseDcsrsm2_bufferSizeExt
-#define hypre_cusparse_csrsm2_analysis         cusparseDcsrsm2_analysis
-#define hypre_cusparse_csrsm2_solve            cusparseDcsrsm2_solve
+#define hypre_cusparse_csru2csr_bufferSizeExt cusparseDcsru2csr_bufferSizeExt
+#define hypre_cusparse_csru2csr cusparseDcsru2csr
+#define hypre_cusparse_csrsv2_bufferSize cusparseDcsrsv2_bufferSize
+#define hypre_cusparse_csrsv2_analysis cusparseDcsrsv2_analysis
+#define hypre_cusparse_csrsv2_solve cusparseDcsrsv2_solve
+#define hypre_cusparse_csrmv cusparseDcsrmv
+#define hypre_cusparse_csrgemm cusparseDcsrgemm
+#define hypre_cusparse_csr2csc cusparseDcsr2csc
+#define hypre_cusparse_csrilu02_bufferSize cusparseDcsrilu02_bufferSize
+#define hypre_cusparse_csrilu02_analysis cusparseDcsrilu02_analysis
+#define hypre_cusparse_csrilu02 cusparseDcsrilu02
+#define hypre_cusparse_csrsm2_bufferSizeExt cusparseDcsrsm2_bufferSizeExt
+#define hypre_cusparse_csrsm2_analysis cusparseDcsrsm2_analysis
+#define hypre_cusparse_csrsm2_solve cusparseDcsrsm2_solve
 
 /* cuSOLVER */
-#define hypre_cusolver_dngetrf                 cusolverDnDgetrf
-#define hypre_cusolver_dngetrf_bs              cusolverDnDgetrf_bufferSize
-#define hypre_cusolver_dngetrs                 cusolverDnDgetrs
+#define hypre_cusolver_dngetrf cusolverDnDgetrf
+#define hypre_cusolver_dngetrf_bs cusolverDnDgetrf_bufferSize
+#define hypre_cusolver_dngetrs cusolverDnDgetrs
 
 #elif defined(HYPRE_USING_HIP)
 /* rocSPARSE */
-#define hypre_rocsparse_csrsv_buffer_size      rocsparse_dcsrsv_buffer_size
-#define hypre_rocsparse_csrsv_analysis         rocsparse_dcsrsv_analysis
-#define hypre_rocsparse_csrsv_solve            rocsparse_dcsrsv_solve
-#define hypre_rocsparse_gthr                   rocsparse_dgthr
-#define hypre_rocsparse_csrmv_analysis         rocsparse_dcsrmv_analysis
-#define hypre_rocsparse_csrmv                  rocsparse_dcsrmv
-#define hypre_rocsparse_csrgemm_buffer_size    rocsparse_dcsrgemm_buffer_size
-#define hypre_rocsparse_csrgemm                rocsparse_dcsrgemm
-#define hypre_rocsparse_csr2csc                rocsparse_dcsr2csc
-#define hypre_rocsparse_csrilu0_buffer_size    rocsparse_dcsrilu0_buffer_size
-#define hypre_rocsparse_csrilu0_analysis       rocsparse_dcsrilu0_analysis
-#define hypre_rocsparse_csrilu0                rocsparse_dcsrilu0
-#define hypre_rocsparse_csritilu0_compute      rocsparse_dcsritilu0_compute
-#define hypre_rocsparse_csritilu0_history      rocsparse_dcsritilu0_history
+#define hypre_rocsparse_csrsv_buffer_size rocsparse_dcsrsv_buffer_size
+#define hypre_rocsparse_csrsv_analysis rocsparse_dcsrsv_analysis
+#define hypre_rocsparse_csrsv_solve rocsparse_dcsrsv_solve
+#define hypre_rocsparse_gthr rocsparse_dgthr
+#define hypre_rocsparse_csrmv_analysis rocsparse_dcsrmv_analysis
+#define hypre_rocsparse_csrmv rocsparse_dcsrmv
+#define hypre_rocsparse_csrgemm_buffer_size rocsparse_dcsrgemm_buffer_size
+#define hypre_rocsparse_csrgemm rocsparse_dcsrgemm
+#define hypre_rocsparse_csr2csc rocsparse_dcsr2csc
+#define hypre_rocsparse_csrilu0_buffer_size rocsparse_dcsrilu0_buffer_size
+#define hypre_rocsparse_csrilu0_analysis rocsparse_dcsrilu0_analysis
+#define hypre_rocsparse_csrilu0 rocsparse_dcsrilu0
+#define hypre_rocsparse_csritilu0_compute rocsparse_dcsritilu0_compute
+#define hypre_rocsparse_csritilu0_history rocsparse_dcsritilu0_history
 
 /* rocSOLVER */
 
@@ -750,88 +725,107 @@ using hypre_DeviceItem = sycl::nd_item<3>;
 #endif /* #if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)*/
 #endif /* #if defined(HYPRE_COMPLEX) || defined(HYPRE_SINGLE) || defined(HYPRE_LONG_DOUBLE) */
 
-#define HYPRE_CUBLAS_CALL(call) do {                                                         \
-   cublasStatus_t err = call;                                                                \
-   if (CUBLAS_STATUS_SUCCESS != err) {                                                       \
-      printf("CUBLAS ERROR (code = %d, %d) at %s:%d\n",                                      \
-            err, err == CUBLAS_STATUS_EXECUTION_FAILED, __FILE__, __LINE__);                 \
-      hypre_assert(0); exit(1);                                                              \
-   } } while(0)
-
-#define HYPRE_ROCBLAS_CALL(call) do {                                                        \
-   rocblas_status err = call;                                                                \
-   if (rocblas_status_success != err) {                                                      \
-      printf("rocBLAS ERROR (code = %d, %s) at %s:%d\n",                                     \
-             err, rocblas_status_to_string(err), __FILE__, __LINE__);                        \
-      hypre_assert(0); exit(1);                                                              \
-   } } while(0)
+#define HYPRE_CUBLAS_CALL(call)                                                                              \
+    do {                                                                                                     \
+        cublasStatus_t err = call;                                                                           \
+        if (CUBLAS_STATUS_SUCCESS != err) {                                                                  \
+            printf("CUBLAS ERROR (code = %d, %d) at %s:%d\n", err, err == CUBLAS_STATUS_EXECUTION_FAILED,    \
+                   __FILE__, __LINE__);                                                                      \
+            hypre_assert(0);                                                                                 \
+            exit(1);                                                                                         \
+        }                                                                                                    \
+    } while (0)
+
+#define HYPRE_ROCBLAS_CALL(call)                                                                             \
+    do {                                                                                                     \
+        rocblas_status err = call;                                                                           \
+        if (rocblas_status_success != err) {                                                                 \
+            printf("rocBLAS ERROR (code = %d, %s) at %s:%d\n", err, rocblas_status_to_string(err), __FILE__, \
+                   __LINE__);                                                                                \
+            hypre_assert(0);                                                                                 \
+            exit(1);                                                                                         \
+        }                                                                                                    \
+    } while (0)
 
 #if CUSPARSE_VERSION >= 10300
-#define HYPRE_CUSPARSE_CALL(call) do {                                                       \
-   cusparseStatus_t err = call;                                                              \
-   if (CUSPARSE_STATUS_SUCCESS != err) {                                                     \
-      printf("CUSPARSE ERROR (code = %d, %s) at %s:%d\n",                                    \
-            err, cusparseGetErrorString(err), __FILE__, __LINE__);                           \
-      hypre_assert(0); exit(1);                                                              \
-   } } while(0)
+#define HYPRE_CUSPARSE_CALL(call)                                                                            \
+    do {                                                                                                     \
+        cusparseStatus_t err = call;                                                                         \
+        if (CUSPARSE_STATUS_SUCCESS != err) {                                                                \
+            printf("CUSPARSE ERROR (code = %d, %s) at %s:%d\n", err, cusparseGetErrorString(err), __FILE__,  \
+                   __LINE__);                                                                                \
+            hypre_assert(0);                                                                                 \
+            exit(1);                                                                                         \
+        }                                                                                                    \
+    } while (0)
 #else
-#define HYPRE_CUSPARSE_CALL(call) do {                                                       \
-   cusparseStatus_t err = call;                                                              \
-   if (CUSPARSE_STATUS_SUCCESS != err) {                                                     \
-      printf("CUSPARSE ERROR (code = %d) at %s:%d\n",                                        \
-            err, __FILE__, __LINE__);                                                        \
-      hypre_assert(0); exit(1);                                                              \
-   } } while(0)
-#endif
-
-#define HYPRE_ROCSPARSE_CALL(call) do {                                                      \
-   rocsparse_status err = call;                                                              \
-   if (rocsparse_status_success != err) {                                                    \
-      printf("rocSPARSE ERROR (code = %d) at %s:%d\n",                                       \
-            err, __FILE__, __LINE__);                                                        \
-      assert(0); exit(1);                                                                    \
-   } } while(0)
-
-#define HYPRE_CUSOLVER_CALL(call) do {                                                       \
-   cusolverStatus_t err = call;                                                              \
-   if (CUSOLVER_STATUS_SUCCESS != err) {                                                     \
-      printf("cuSOLVER ERROR (code = %d) at %s:%d\n",                                        \
-            err, __FILE__, __LINE__);                                                        \
-      hypre_assert(0);                                                                       \
-   } } while(0)
-
-#define HYPRE_ROCSOLVER_CALL(call) do {                                                      \
-   rocblas_status err = call;                                                                \
-   if (rocblas_status_success != err) {                                                      \
-      printf("rocSOLVER ERROR (code = %d, %s) at %s:%d\n",                                   \
-             err, rocblas_status_to_string(err), __FILE__, __LINE__);                        \
-   } } while(0)
-
-#define HYPRE_CURAND_CALL(call) do {                                                         \
-   curandStatus_t err = call;                                                                \
-   if (CURAND_STATUS_SUCCESS != err) {                                                       \
-      printf("CURAND ERROR (code = %d) at %s:%d\n", err, __FILE__, __LINE__);                \
-      hypre_assert(0); exit(1);                                                              \
-   } } while(0)
-
-#define HYPRE_ROCRAND_CALL(call) do {                                                        \
-   rocrand_status err = call;                                                                \
-   if (ROCRAND_STATUS_SUCCESS != err) {                                                      \
-      printf("ROCRAND ERROR (code = %d) at %s:%d\n", err, __FILE__, __LINE__);               \
-      hypre_assert(0); exit(1);                                                              \
-   } } while(0)
-
-#define HYPRE_ONEMKL_CALL(call)                                                              \
-   try                                                                                       \
-   {                                                                                         \
-      call;                                                                                  \
-   }                                                                                         \
-   catch (oneapi::mkl::exception const &ex)                                                  \
-   {                                                                                         \
-      hypre_printf("ONEMKL ERROR (code = %s) at %s:%d\n", ex.what(),                         \
-                   __FILE__, __LINE__);                                                      \
-      assert(0); exit(1);                                                                    \
-   }
+#define HYPRE_CUSPARSE_CALL(call)                                                                            \
+    do {                                                                                                     \
+        cusparseStatus_t err = call;                                                                         \
+        if (CUSPARSE_STATUS_SUCCESS != err) {                                                                \
+            printf("CUSPARSE ERROR (code = %d) at %s:%d\n", err, __FILE__, __LINE__);                        \
+            hypre_assert(0);                                                                                 \
+            exit(1);                                                                                         \
+        }                                                                                                    \
+    } while (0)
+#endif
+
+#define HYPRE_ROCSPARSE_CALL(call)                                                                           \
+    do {                                                                                                     \
+        rocsparse_status err = call;                                                                         \
+        if (rocsparse_status_success != err) {                                                               \
+            printf("rocSPARSE ERROR (code = %d) at %s:%d\n", err, __FILE__, __LINE__);                       \
+            assert(0);                                                                                       \
+            exit(1);                                                                                         \
+        }                                                                                                    \
+    } while (0)
+
+#define HYPRE_CUSOLVER_CALL(call)                                                                            \
+    do {                                                                                                     \
+        cusolverStatus_t err = call;                                                                         \
+        if (CUSOLVER_STATUS_SUCCESS != err) {                                                                \
+            printf("cuSOLVER ERROR (code = %d) at %s:%d\n", err, __FILE__, __LINE__);                        \
+            hypre_assert(0);                                                                                 \
+        }                                                                                                    \
+    } while (0)
+
+#define HYPRE_ROCSOLVER_CALL(call)                                                                           \
+    do {                                                                                                     \
+        rocblas_status err = call;                                                                           \
+        if (rocblas_status_success != err) {                                                                 \
+            printf("rocSOLVER ERROR (code = %d, %s) at %s:%d\n", err, rocblas_status_to_string(err),         \
+                   __FILE__, __LINE__);                                                                      \
+        }                                                                                                    \
+    } while (0)
+
+#define HYPRE_CURAND_CALL(call)                                                                              \
+    do {                                                                                                     \
+        curandStatus_t err = call;                                                                           \
+        if (CURAND_STATUS_SUCCESS != err) {                                                                  \
+            printf("CURAND ERROR (code = %d) at %s:%d\n", err, __FILE__, __LINE__);                          \
+            hypre_assert(0);                                                                                 \
+            exit(1);                                                                                         \
+        }                                                                                                    \
+    } while (0)
+
+#define HYPRE_ROCRAND_CALL(call)                                                                             \
+    do {                                                                                                     \
+        rocrand_status err = call;                                                                           \
+        if (ROCRAND_STATUS_SUCCESS != err) {                                                                 \
+            printf("ROCRAND ERROR (code = %d) at %s:%d\n", err, __FILE__, __LINE__);                         \
+            hypre_assert(0);                                                                                 \
+            exit(1);                                                                                         \
+        }                                                                                                    \
+    } while (0)
+
+#define HYPRE_ONEMKL_CALL(call)                                                                              \
+    try {                                                                                                    \
+        call;                                                                                                \
+    } catch (oneapi::mkl::exception const &ex) {                                                             \
+        hypre_printf("ONEMKL ERROR (code = %s) at %s:%d\n", ex.what(), __FILE__, __LINE__);                  \
+        assert(0);                                                                                           \
+        exit(1);                                                                                             \
+    }
 
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  *      macros for wrapping thrust/oneDPL calls for error reporting
@@ -841,21 +835,26 @@ using hypre_DeviceItem = sycl::nd_item<3>;
  * The following one works OK for now */
 
 #if defined(HYPRE_USING_CUDA)
-#define HYPRE_THRUST_CALL(func_name, ...) \
-   thrust::func_name(HYPRE_THRUST_EXECUTION(hypre_HandleDeviceAllocator(hypre_handle())).on(hypre_HandleComputeStream(hypre_handle())), __VA_ARGS__);
+#define HYPRE_THRUST_CALL(func_name, ...)                                                                    \
+    thrust::func_name(HYPRE_THRUST_EXECUTION(hypre_HandleDeviceAllocator(hypre_handle()))                    \
+                              .on(hypre_HandleComputeStream(hypre_handle())),                                \
+                      __VA_ARGS__);
 #elif defined(HYPRE_USING_HIP)
-#define HYPRE_THRUST_CALL(func_name, ...) \
-   thrust::func_name(thrust::hip::par(hypre_HandleDeviceAllocator(hypre_handle())).on(hypre_HandleComputeStream(hypre_handle())), __VA_ARGS__);
+#define HYPRE_THRUST_CALL(func_name, ...)                                                                    \
+    thrust::func_name(thrust::hip::par(hypre_HandleDeviceAllocator(hypre_handle()))                          \
+                              .on(hypre_HandleComputeStream(hypre_handle())),                                \
+                      __VA_ARGS__);
 
 #elif defined(HYPRE_USING_SYCL)
 
-#define HYPRE_ONEDPL_CALL(func_name, ...)                                                    \
-  func_name(oneapi::dpl::execution::make_device_policy(                                      \
-           *hypre_HandleComputeStream(hypre_handle())), __VA_ARGS__);
+#define HYPRE_ONEDPL_CALL(func_name, ...)                                                                    \
+    func_name(oneapi::dpl::execution::make_device_policy(*hypre_HandleComputeStream(hypre_handle())),        \
+              __VA_ARGS__);
 
-#define HYPRE_ONEDPL_CPU_CALL(func_name, ...)                                                \
-   func_name(oneapi::dpl::execution::make_device_policy(                                     \
-             *hypre_DeviceDataStream(hypre_HandleDeviceData(hypre_handle()), HYPRE_MAX_NUM_STREAMS - 1)), __VA_ARGS__);
+#define HYPRE_ONEDPL_CPU_CALL(func_name, ...)                                                                \
+    func_name(oneapi::dpl::execution::make_device_policy(*hypre_DeviceDataStream(                            \
+                      hypre_HandleDeviceData(hypre_handle()), HYPRE_MAX_NUM_STREAMS - 1)),                   \
+              __VA_ARGS__);
 
 #endif
 
@@ -869,225 +868,222 @@ typedef struct hypre_cub_CachingDeviceAllocator hypre_cub_CachingDeviceAllocator
 #if defined(HYPRE_USING_CUSOLVER)
 typedef cusolverDnHandle_t vendorSolverHandle_t;
 #elif defined(HYPRE_USING_ROCSOLVER)
-typedef rocblas_handle     vendorSolverHandle_t;
+typedef rocblas_handle vendorSolverHandle_t;
 #endif
 
-struct hypre_DeviceData
-{
+struct hypre_DeviceData {
 #if defined(HYPRE_USING_CURAND)
-   curandGenerator_t                 curand_generator;
+    curandGenerator_t curand_generator;
 #endif
 
 #if defined(HYPRE_USING_ROCRAND)
-   rocrand_generator                 curand_generator;
+    rocrand_generator curand_generator;
 #endif
 
 #if defined(HYPRE_USING_CUBLAS)
-   cublasHandle_t                    cublas_handle;
+    cublasHandle_t cublas_handle;
 #endif
 
 #if defined(HYPRE_USING_CUSPARSE)
-   cusparseHandle_t                  cusparse_handle;
+    cusparseHandle_t cusparse_handle;
 #endif
 
 #if defined(HYPRE_USING_ROCSPARSE)
-   rocsparse_handle                  cusparse_handle;
+    rocsparse_handle cusparse_handle;
 #endif
 
 #if defined(HYPRE_USING_CUSOLVER) || defined(HYPRE_USING_ROCSOLVER)
-   vendorSolverHandle_t              vendor_solver_handle;
+    vendorSolverHandle_t vendor_solver_handle;
 #endif
 
-   /* TODO (VPM): Change to HYPRE_USING_GPU_STREAMS*/
+    /* TODO (VPM): Change to HYPRE_USING_GPU_STREAMS*/
 #if defined(HYPRE_USING_CUDA_STREAMS)
 #if defined(HYPRE_USING_CUDA)
-   cudaStream_t                      streams[HYPRE_MAX_NUM_STREAMS];
+    cudaStream_t streams[HYPRE_MAX_NUM_STREAMS];
 #elif defined(HYPRE_USING_HIP)
-   hipStream_t                       streams[HYPRE_MAX_NUM_STREAMS];
+    hipStream_t streams[HYPRE_MAX_NUM_STREAMS];
 #elif defined(HYPRE_USING_SYCL)
-   sycl::queue*                      streams[HYPRE_MAX_NUM_STREAMS] = {NULL};
+    sycl::queue *streams[HYPRE_MAX_NUM_STREAMS] = {NULL};
 #endif
 #endif
 
 #if defined(HYPRE_USING_DEVICE_POOL)
-   hypre_uint                        cub_bin_growth;
-   hypre_uint                        cub_min_bin;
-   hypre_uint                        cub_max_bin;
-   size_t                            cub_max_cached_bytes;
-   hypre_cub_CachingDeviceAllocator *cub_dev_allocator;
-   hypre_cub_CachingDeviceAllocator *cub_uvm_allocator;
+    hypre_uint cub_bin_growth;
+    hypre_uint cub_min_bin;
+    hypre_uint cub_max_bin;
+    size_t cub_max_cached_bytes;
+    hypre_cub_CachingDeviceAllocator *cub_dev_allocator;
+    hypre_cub_CachingDeviceAllocator *cub_uvm_allocator;
 #endif
 
 #if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
-   hypre_device_allocator            device_allocator;
+    hypre_device_allocator device_allocator;
 #endif
 #if defined(HYPRE_USING_SYCL)
-   sycl::device                     *device;
-   HYPRE_Int                         device_max_work_group_size;
+    sycl::device *device;
+    HYPRE_Int device_max_work_group_size;
 #else
-   HYPRE_Int                         device;
+    HYPRE_Int device;
 #endif
-   hypre_int                         device_max_shmem_per_block[3];
-   /* by default, hypre puts GPU computations in this stream
+    hypre_int device_max_shmem_per_block[3];
+    /* by default, hypre puts GPU computations in this stream
     * Do not be confused with the default (null) stream */
-   HYPRE_Int                         compute_stream_num;
-   /* work space for hypre's device reducer */
-   void                             *reduce_buffer;
-   /* device spgemm options */
-   HYPRE_Int                         spgemm_algorithm;
-   HYPRE_Int                         spgemm_binned;
-   HYPRE_Int                         spgemm_num_bin;
-   /* the highest bins for symbl [0] and numer [1]
+    HYPRE_Int compute_stream_num;
+    /* work space for hypre's device reducer */
+    void *reduce_buffer;
+    /* device spgemm options */
+    HYPRE_Int spgemm_algorithm;
+    HYPRE_Int spgemm_binned;
+    HYPRE_Int spgemm_num_bin;
+    /* the highest bins for symbl [0] and numer [1]
     * which are not necessary to be `spgemm_num_bin' due to shmem limit on GPUs */
-   HYPRE_Int                         spgemm_highest_bin[2];
-   /* for bin i: ([0][i], [2][i]) = (max #block to launch, block dimension) for symbl
+    HYPRE_Int spgemm_highest_bin[2];
+    /* for bin i: ([0][i], [2][i]) = (max #block to launch, block dimension) for symbl
     *            ([1][i], [3][i]) = (max #block to launch, block dimension) for numer */
-   HYPRE_Int                         spgemm_block_num_dim[4][HYPRE_SPGEMM_MAX_NBIN + 1];
-   HYPRE_Int                         spgemm_rownnz_estimate_method;
-   HYPRE_Int                         spgemm_rownnz_estimate_nsamples;
-   float                             spgemm_rownnz_estimate_mult_factor;
-   /* cusparse */
-   HYPRE_Int                         spmv_use_vendor;
-   HYPRE_Int                         sptrans_use_vendor;
-   HYPRE_Int                         spgemm_use_vendor;
-   /* PMIS RNG */
-   HYPRE_Int                         use_gpu_rand;
+    HYPRE_Int spgemm_block_num_dim[4][HYPRE_SPGEMM_MAX_NBIN + 1];
+    HYPRE_Int spgemm_rownnz_estimate_method;
+    HYPRE_Int spgemm_rownnz_estimate_nsamples;
+    float spgemm_rownnz_estimate_mult_factor;
+    /* cusparse */
+    HYPRE_Int spmv_use_vendor;
+    HYPRE_Int sptrans_use_vendor;
+    HYPRE_Int spgemm_use_vendor;
+    /* PMIS RNG */
+    HYPRE_Int use_gpu_rand;
 };
 
-#define hypre_DeviceDataCubBinGrowth(data)                   ((data) -> cub_bin_growth)
-#define hypre_DeviceDataCubMinBin(data)                      ((data) -> cub_min_bin)
-#define hypre_DeviceDataCubMaxBin(data)                      ((data) -> cub_max_bin)
-#define hypre_DeviceDataCubMaxCachedBytes(data)              ((data) -> cub_max_cached_bytes)
-#define hypre_DeviceDataCubDevAllocator(data)                ((data) -> cub_dev_allocator)
-#define hypre_DeviceDataCubUvmAllocator(data)                ((data) -> cub_uvm_allocator)
-#define hypre_DeviceDataDevice(data)                         ((data) -> device)
-#define hypre_DeviceDataDeviceMaxWorkGroupSize(data)         ((data) -> device_max_work_group_size)
-#define hypre_DeviceDataDeviceMaxShmemPerBlock(data)         ((data) -> device_max_shmem_per_block)
-#define hypre_DeviceDataDeviceMaxShmemPerBlockInited(data)  (((data) -> device_max_shmem_per_block)[2])
-#define hypre_DeviceDataComputeStreamNum(data)               ((data) -> compute_stream_num)
-#define hypre_DeviceDataReduceBuffer(data)                   ((data) -> reduce_buffer)
-#define hypre_DeviceDataSpgemmUseVendor(data)                ((data) -> spgemm_use_vendor)
-#define hypre_DeviceDataSpMVUseVendor(data)                  ((data) -> spmv_use_vendor)
-#define hypre_DeviceDataSpTransUseVendor(data)               ((data) -> sptrans_use_vendor)
-#define hypre_DeviceDataSpgemmAlgorithm(data)                ((data) -> spgemm_algorithm)
-#define hypre_DeviceDataSpgemmBinned(data)                   ((data) -> spgemm_binned)
-#define hypre_DeviceDataSpgemmNumBin(data)                   ((data) -> spgemm_num_bin)
-#define hypre_DeviceDataSpgemmHighestBin(data)               ((data) -> spgemm_highest_bin)
-#define hypre_DeviceDataSpgemmBlockNumDim(data)              ((data) -> spgemm_block_num_dim)
-#define hypre_DeviceDataSpgemmRownnzEstimateMethod(data)     ((data) -> spgemm_rownnz_estimate_method)
-#define hypre_DeviceDataSpgemmRownnzEstimateNsamples(data)   ((data) -> spgemm_rownnz_estimate_nsamples)
-#define hypre_DeviceDataSpgemmRownnzEstimateMultFactor(data) ((data) -> spgemm_rownnz_estimate_mult_factor)
-#define hypre_DeviceDataDeviceAllocator(data)                ((data) -> device_allocator)
-#define hypre_DeviceDataUseGpuRand(data)                     ((data) -> use_gpu_rand)
-
-hypre_DeviceData*     hypre_DeviceDataCreate();
-void                  hypre_DeviceDataDestroy(hypre_DeviceData* data);
+#define hypre_DeviceDataCubBinGrowth(data) ((data)->cub_bin_growth)
+#define hypre_DeviceDataCubMinBin(data) ((data)->cub_min_bin)
+#define hypre_DeviceDataCubMaxBin(data) ((data)->cub_max_bin)
+#define hypre_DeviceDataCubMaxCachedBytes(data) ((data)->cub_max_cached_bytes)
+#define hypre_DeviceDataCubDevAllocator(data) ((data)->cub_dev_allocator)
+#define hypre_DeviceDataCubUvmAllocator(data) ((data)->cub_uvm_allocator)
+#define hypre_DeviceDataDevice(data) ((data)->device)
+#define hypre_DeviceDataDeviceMaxWorkGroupSize(data) ((data)->device_max_work_group_size)
+#define hypre_DeviceDataDeviceMaxShmemPerBlock(data) ((data)->device_max_shmem_per_block)
+#define hypre_DeviceDataDeviceMaxShmemPerBlockInited(data) (((data)->device_max_shmem_per_block)[2])
+#define hypre_DeviceDataComputeStreamNum(data) ((data)->compute_stream_num)
+#define hypre_DeviceDataReduceBuffer(data) ((data)->reduce_buffer)
+#define hypre_DeviceDataSpgemmUseVendor(data) ((data)->spgemm_use_vendor)
+#define hypre_DeviceDataSpMVUseVendor(data) ((data)->spmv_use_vendor)
+#define hypre_DeviceDataSpTransUseVendor(data) ((data)->sptrans_use_vendor)
+#define hypre_DeviceDataSpgemmAlgorithm(data) ((data)->spgemm_algorithm)
+#define hypre_DeviceDataSpgemmBinned(data) ((data)->spgemm_binned)
+#define hypre_DeviceDataSpgemmNumBin(data) ((data)->spgemm_num_bin)
+#define hypre_DeviceDataSpgemmHighestBin(data) ((data)->spgemm_highest_bin)
+#define hypre_DeviceDataSpgemmBlockNumDim(data) ((data)->spgemm_block_num_dim)
+#define hypre_DeviceDataSpgemmRownnzEstimateMethod(data) ((data)->spgemm_rownnz_estimate_method)
+#define hypre_DeviceDataSpgemmRownnzEstimateNsamples(data) ((data)->spgemm_rownnz_estimate_nsamples)
+#define hypre_DeviceDataSpgemmRownnzEstimateMultFactor(data) ((data)->spgemm_rownnz_estimate_mult_factor)
+#define hypre_DeviceDataDeviceAllocator(data) ((data)->device_allocator)
+#define hypre_DeviceDataUseGpuRand(data) ((data)->use_gpu_rand)
+
+hypre_DeviceData *hypre_DeviceDataCreate();
+void hypre_DeviceDataDestroy(hypre_DeviceData *data);
 
 #if defined(HYPRE_USING_CURAND)
-curandGenerator_t     hypre_DeviceDataCurandGenerator(hypre_DeviceData *data);
+curandGenerator_t hypre_DeviceDataCurandGenerator(hypre_DeviceData *data);
 #endif
 
 #if defined(HYPRE_USING_ROCRAND)
-rocrand_generator     hypre_DeviceDataCurandGenerator(hypre_DeviceData *data);
+rocrand_generator hypre_DeviceDataCurandGenerator(hypre_DeviceData *data);
 #endif
 
 #if defined(HYPRE_USING_CUBLAS)
-cublasHandle_t        hypre_DeviceDataCublasHandle(hypre_DeviceData *data);
+cublasHandle_t hypre_DeviceDataCublasHandle(hypre_DeviceData *data);
 #endif
 
 #if defined(HYPRE_USING_CUSPARSE)
-cusparseHandle_t      hypre_DeviceDataCusparseHandle(hypre_DeviceData *data);
+cusparseHandle_t hypre_DeviceDataCusparseHandle(hypre_DeviceData *data);
 #endif
 
 #if defined(HYPRE_USING_ROCSPARSE)
-rocsparse_handle      hypre_DeviceDataCusparseHandle(hypre_DeviceData *data);
+rocsparse_handle hypre_DeviceDataCusparseHandle(hypre_DeviceData *data);
 #endif
 
 #if defined(HYPRE_USING_CUSOLVER) || defined(HYPRE_USING_ROCSOLVER)
-vendorSolverHandle_t  hypre_DeviceDataVendorSolverHandle(hypre_DeviceData *data);
+vendorSolverHandle_t hypre_DeviceDataVendorSolverHandle(hypre_DeviceData *data);
 #endif
 
 /* TODO (VPM): Create a deviceStream_t to encapsulate all stream types below */
 #if defined(HYPRE_USING_CUDA)
-cudaStream_t          hypre_DeviceDataStream(hypre_DeviceData *data, HYPRE_Int i);
-cudaStream_t          hypre_DeviceDataComputeStream(hypre_DeviceData *data);
+cudaStream_t hypre_DeviceDataStream(hypre_DeviceData *data, HYPRE_Int i);
+cudaStream_t hypre_DeviceDataComputeStream(hypre_DeviceData *data);
 #elif defined(HYPRE_USING_HIP)
-hipStream_t           hypre_DeviceDataStream(hypre_DeviceData *data, HYPRE_Int i);
-hipStream_t           hypre_DeviceDataComputeStream(hypre_DeviceData *data);
+hipStream_t hypre_DeviceDataStream(hypre_DeviceData *data, HYPRE_Int i);
+hipStream_t hypre_DeviceDataComputeStream(hypre_DeviceData *data);
 #elif defined(HYPRE_USING_SYCL)
-sycl::queue*          hypre_DeviceDataStream(hypre_DeviceData *data, HYPRE_Int i);
-sycl::queue*          hypre_DeviceDataComputeStream(hypre_DeviceData *data);
+sycl::queue *hypre_DeviceDataStream(hypre_DeviceData *data, HYPRE_Int i);
+sycl::queue *hypre_DeviceDataComputeStream(hypre_DeviceData *data);
 #endif
 
 /* Data structure and accessor routines for Sparse Triangular Matrices */
-struct hypre_CsrsvData
-{
+struct hypre_CsrsvData {
 #if defined(HYPRE_USING_CUSPARSE)
-   hypre_cusparseSpSVDescr   info_L;
-   hypre_cusparseSpSVDescr   info_U;
-   cusparseSolvePolicy_t     analysis_policy;
-   cusparseSolvePolicy_t     solve_policy;
+    hypre_cusparseSpSVDescr info_L;
+    hypre_cusparseSpSVDescr info_U;
+    cusparseSolvePolicy_t analysis_policy;
+    cusparseSolvePolicy_t solve_policy;
 #elif defined(HYPRE_USING_ROCSPARSE)
-   rocsparse_mat_info        info_L;
-   rocsparse_mat_info        info_U;
-   rocsparse_analysis_policy analysis_policy;
-   rocsparse_solve_policy    solve_policy;
+    rocsparse_mat_info info_L;
+    rocsparse_mat_info info_U;
+    rocsparse_analysis_policy analysis_policy;
+    rocsparse_solve_policy solve_policy;
 #endif
 
 #if defined(HYPRE_USING_CUSPARSE) && (CUSPARSE_VERSION >= CUSPARSE_SPSV_VERSION)
-   size_t                    buffer_size_L;
-   size_t                    buffer_size_U;
-   char                     *buffer_L;
-   char                     *buffer_U;
+    size_t buffer_size_L;
+    size_t buffer_size_U;
+    char *buffer_L;
+    char *buffer_U;
 #else
-   hypre_int                 buffer_size;
-   char                     *buffer;
+    hypre_int buffer_size;
+    char *buffer;
 #endif
 
-   /* Temporary array to save matrix values with modified diagonal */
-   HYPRE_Complex            *mat_data;
+    /* Temporary array to save matrix values with modified diagonal */
+    HYPRE_Complex *mat_data;
 
-   /* Flags for checking whether the analysis phase has been executed or not */
-   HYPRE_Int                 analyzed_L;
-   HYPRE_Int                 analyzed_U;
+    /* Flags for checking whether the analysis phase has been executed or not */
+    HYPRE_Int analyzed_L;
+    HYPRE_Int analyzed_U;
 };
 
-#define hypre_CsrsvDataInfoL(data)          ((data) -> info_L)
-#define hypre_CsrsvDataInfoU(data)          ((data) -> info_U)
-#define hypre_CsrsvDataAnalyzedL(data)      ((data) -> analyzed_L)
-#define hypre_CsrsvDataAnalyzedU(data)      ((data) -> analyzed_U)
-#define hypre_CsrsvDataSolvePolicy(data)    ((data) -> solve_policy)
-#define hypre_CsrsvDataAnalysisPolicy(data) ((data) -> analysis_policy)
+#define hypre_CsrsvDataInfoL(data) ((data)->info_L)
+#define hypre_CsrsvDataInfoU(data) ((data)->info_U)
+#define hypre_CsrsvDataAnalyzedL(data) ((data)->analyzed_L)
+#define hypre_CsrsvDataAnalyzedU(data) ((data)->analyzed_U)
+#define hypre_CsrsvDataSolvePolicy(data) ((data)->solve_policy)
+#define hypre_CsrsvDataAnalysisPolicy(data) ((data)->analysis_policy)
 #if defined(HYPRE_USING_CUSPARSE) && (CUSPARSE_VERSION >= CUSPARSE_SPSV_VERSION)
-#define hypre_CsrsvDataBufferSizeL(data)    ((data) -> buffer_size_L)
-#define hypre_CsrsvDataBufferSizeU(data)    ((data) -> buffer_size_U)
-#define hypre_CsrsvDataBufferL(data)        ((data) -> buffer_L)
-#define hypre_CsrsvDataBufferU(data)        ((data) -> buffer_U)
+#define hypre_CsrsvDataBufferSizeL(data) ((data)->buffer_size_L)
+#define hypre_CsrsvDataBufferSizeU(data) ((data)->buffer_size_U)
+#define hypre_CsrsvDataBufferL(data) ((data)->buffer_L)
+#define hypre_CsrsvDataBufferU(data) ((data)->buffer_U)
 #else
-#define hypre_CsrsvDataBufferSize(data)     ((data) -> buffer_size)
-#define hypre_CsrsvDataBuffer(data)         ((data) -> buffer)
+#define hypre_CsrsvDataBufferSize(data) ((data)->buffer_size)
+#define hypre_CsrsvDataBuffer(data) ((data)->buffer)
 #endif
-#define hypre_CsrsvDataMatData(data)        ((data) -> mat_data)
+#define hypre_CsrsvDataMatData(data) ((data)->mat_data)
 
-struct hypre_GpuMatData
-{
+struct hypre_GpuMatData {
 #if defined(HYPRE_USING_CUSPARSE)
-   cusparseMatDescr_t                   mat_descr;
-   char                                *spmv_buffer;
+    cusparseMatDescr_t mat_descr;
+    char *spmv_buffer;
 
 #elif defined(HYPRE_USING_ROCSPARSE)
-   rocsparse_mat_descr                  mat_descr;
-   rocsparse_mat_info                   mat_info;
+    rocsparse_mat_descr mat_descr;
+    rocsparse_mat_info mat_info;
 
 #elif defined(HYPRE_USING_ONEMKLSPARSE)
-   oneapi::mkl::sparse::matrix_handle_t mat_handle;
+    oneapi::mkl::sparse::matrix_handle_t mat_handle;
 #endif
 };
 
-#define hypre_GpuMatDataMatDescr(data)    ((data) -> mat_descr)
-#define hypre_GpuMatDataMatInfo(data)     ((data) -> mat_info)
-#define hypre_GpuMatDataMatHandle(data)   ((data) -> mat_handle)
-#define hypre_GpuMatDataSpMVBuffer(data)  ((data) -> spmv_buffer)
+#define hypre_GpuMatDataMatDescr(data) ((data)->mat_descr)
+#define hypre_GpuMatDataMatInfo(data) ((data)->mat_info)
+#define hypre_GpuMatDataMatHandle(data) ((data)->mat_handle)
+#define hypre_GpuMatDataSpMVBuffer(data) ((data)->spmv_buffer)
 
 #endif /* if defined(HYPRE_USING_GPU) */
 
@@ -1097,49 +1093,37 @@ struct hypre_GpuMatData
 
 #if defined(HYPRE_USING_GPU)
 template <typename T>
-static __device__ __forceinline__
-T read_only_load( const T *ptr )
-{
+static __device__ __forceinline__ T read_only_load(const T *ptr) {
 #if defined(__CUDA_ARCH__) && __CUDA_ARCH__ >= 350
-   return __ldg( ptr );
+    return __ldg(ptr);
 #else
-   return *ptr;
+    return *ptr;
 #endif
 }
 
-static __device__ __forceinline__
-hypre_int next_power_of_2(hypre_int n)
-{
-   if (n <= 0)
-   {
-      return 0;
-   }
+static __device__ __forceinline__ hypre_int next_power_of_2(hypre_int n) {
+    if (n <= 0) { return 0; }
 
-   /* if n is power of 2, return itself */
-   if ( (n & (n - 1)) == 0 )
-   {
-      return n;
-   }
+    /* if n is power of 2, return itself */
+    if ((n & (n - 1)) == 0) { return n; }
 
-   n |= (n >>  1);
-   n |= (n >>  2);
-   n |= (n >>  4);
-   n |= (n >>  8);
-   n |= (n >> 16);
-   n ^= (n >>  1);
-   n  = (n <<  1);
+    n |= (n >> 1);
+    n |= (n >> 2);
+    n |= (n >> 4);
+    n |= (n >> 8);
+    n |= (n >> 16);
+    n ^= (n >> 1);
+    n = (n << 1);
 
-   return n;
+    return n;
 }
 
 /* Flip n-th bit of bitmask (0 becomes 1. 1 becomes 0) */
-static __device__ __forceinline__
-hypre_mask hypre_mask_flip_at(hypre_mask bitmask, hypre_int n)
-{
-   return bitmask ^ (hypre_mask_one << n);
+static __device__ __forceinline__ hypre_mask hypre_mask_flip_at(hypre_mask bitmask, hypre_int n) {
+    return bitmask ^ (hypre_mask_one << n);
 }
 
-#endif // defined(HYPRE_USING_GPU)
+#endif// defined(HYPRE_USING_GPU)
 
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  *      cuda/hip functions
@@ -1149,155 +1133,121 @@ hypre_mask hypre_mask_flip_at(hypre_mask bitmask, hypre_int n)
 
 /* return the number of threads in block */
 template <hypre_int dim>
-static __device__ __forceinline__
-hypre_int hypre_gpu_get_num_threads(hypre_DeviceItem &item)
-{
-   switch (dim)
-   {
-      case 1:
-         return (blockDim.x);
-      case 2:
-         return (blockDim.x * blockDim.y);
-      case 3:
-         return (blockDim.x * blockDim.y * blockDim.z);
-   }
+static __device__ __forceinline__ hypre_int hypre_gpu_get_num_threads(hypre_DeviceItem &item) {
+    switch (dim) {
+        case 1:
+            return (blockDim.x);
+        case 2:
+            return (blockDim.x * blockDim.y);
+        case 3:
+            return (blockDim.x * blockDim.y * blockDim.z);
+    }
 
-   return -1;
+    return -1;
 }
 
 /* return the flattened thread id in block */
 template <hypre_int dim>
-static __device__ __forceinline__
-hypre_int hypre_gpu_get_thread_id(hypre_DeviceItem &item)
-{
-   switch (dim)
-   {
-      case 1:
-         return (threadIdx.x);
-      case 2:
-         return (threadIdx.y * blockDim.x + threadIdx.x);
-      case 3:
-         return (threadIdx.z * blockDim.x * blockDim.y + threadIdx.y * blockDim.x +
-                 threadIdx.x);
-   }
+static __device__ __forceinline__ hypre_int hypre_gpu_get_thread_id(hypre_DeviceItem &item) {
+    switch (dim) {
+        case 1:
+            return (threadIdx.x);
+        case 2:
+            return (threadIdx.y * blockDim.x + threadIdx.x);
+        case 3:
+            return (threadIdx.z * blockDim.x * blockDim.y + threadIdx.y * blockDim.x + threadIdx.x);
+    }
 
-   return -1;
+    return -1;
 }
 
 /* return the number of warps in block */
 template <hypre_int dim>
-static __device__ __forceinline__
-hypre_int hypre_gpu_get_num_warps(hypre_DeviceItem &item)
-{
-   return hypre_gpu_get_num_threads<dim>(item) >> HYPRE_WARP_BITSHIFT;
+static __device__ __forceinline__ hypre_int hypre_gpu_get_num_warps(hypre_DeviceItem &item) {
+    return hypre_gpu_get_num_threads<dim>(item) >> HYPRE_WARP_BITSHIFT;
 }
 
 /* return the warp id in block */
 template <hypre_int dim>
-static __device__ __forceinline__
-hypre_int hypre_gpu_get_warp_id(hypre_DeviceItem &item)
-{
-   return hypre_gpu_get_thread_id<dim>(item) >> HYPRE_WARP_BITSHIFT;
+static __device__ __forceinline__ hypre_int hypre_gpu_get_warp_id(hypre_DeviceItem &item) {
+    return hypre_gpu_get_thread_id<dim>(item) >> HYPRE_WARP_BITSHIFT;
 }
 
 /* return the thread lane id in warp */
 template <hypre_int dim>
-static __device__ __forceinline__
-hypre_int hypre_gpu_get_lane_id(hypre_DeviceItem &item)
-{
-   return hypre_gpu_get_thread_id<dim>(item) & (HYPRE_WARP_SIZE - 1);
+static __device__ __forceinline__ hypre_int hypre_gpu_get_lane_id(hypre_DeviceItem &item) {
+    return hypre_gpu_get_thread_id<dim>(item) & (HYPRE_WARP_SIZE - 1);
 }
 
 /* return the num of blocks in grid */
 template <hypre_int dim>
-static __device__ __forceinline__
-hypre_int hypre_gpu_get_num_blocks()
-{
-   switch (dim)
-   {
-      case 1:
-         return (gridDim.x);
-      case 2:
-         return (gridDim.x * gridDim.y);
-      case 3:
-         return (gridDim.x * gridDim.y * gridDim.z);
-   }
+static __device__ __forceinline__ hypre_int hypre_gpu_get_num_blocks() {
+    switch (dim) {
+        case 1:
+            return (gridDim.x);
+        case 2:
+            return (gridDim.x * gridDim.y);
+        case 3:
+            return (gridDim.x * gridDim.y * gridDim.z);
+    }
 
-   return -1;
+    return -1;
 }
 
 /* return the flattened block id in grid */
 template <hypre_int dim>
-static __device__ __forceinline__
-hypre_int hypre_gpu_get_block_id(hypre_DeviceItem &item)
-{
-   switch (dim)
-   {
-      case 1:
-         return (blockIdx.x);
-      case 2:
-         return (blockIdx.y * gridDim.x + blockIdx.x);
-      case 3:
-         return (blockIdx.z * gridDim.x * gridDim.y + blockIdx.y * gridDim.x +
-                 blockIdx.x);
-   }
+static __device__ __forceinline__ hypre_int hypre_gpu_get_block_id(hypre_DeviceItem &item) {
+    switch (dim) {
+        case 1:
+            return (blockIdx.x);
+        case 2:
+            return (blockIdx.y * gridDim.x + blockIdx.x);
+        case 3:
+            return (blockIdx.z * gridDim.x * gridDim.y + blockIdx.y * gridDim.x + blockIdx.x);
+    }
 
-   return -1;
+    return -1;
 }
 
 /* return the number of threads in grid */
 template <hypre_int bdim, hypre_int gdim>
-static __device__ __forceinline__
-hypre_int hypre_gpu_get_grid_num_threads(hypre_DeviceItem &item)
-{
-   return hypre_gpu_get_num_blocks<gdim>() * hypre_gpu_get_num_threads<bdim>(item);
+static __device__ __forceinline__ hypre_int hypre_gpu_get_grid_num_threads(hypre_DeviceItem &item) {
+    return hypre_gpu_get_num_blocks<gdim>() * hypre_gpu_get_num_threads<bdim>(item);
 }
 
 /* return the flattened thread id in grid */
 template <hypre_int bdim, hypre_int gdim>
-static __device__ __forceinline__
-hypre_int hypre_gpu_get_grid_thread_id(hypre_DeviceItem &item)
-{
-   return hypre_gpu_get_block_id<gdim>(item) * hypre_gpu_get_num_threads<bdim>(item) +
-          hypre_gpu_get_thread_id<bdim>(item);
+static __device__ __forceinline__ hypre_int hypre_gpu_get_grid_thread_id(hypre_DeviceItem &item) {
+    return hypre_gpu_get_block_id<gdim>(item) * hypre_gpu_get_num_threads<bdim>(item)
+           + hypre_gpu_get_thread_id<bdim>(item);
 }
 
 /* return the number of warps in grid */
 template <hypre_int bdim, hypre_int gdim>
-static __device__ __forceinline__
-hypre_int hypre_gpu_get_grid_num_warps(hypre_DeviceItem &item)
-{
-   return hypre_gpu_get_num_blocks<gdim>() * hypre_gpu_get_num_warps<bdim>(item);
+static __device__ __forceinline__ hypre_int hypre_gpu_get_grid_num_warps(hypre_DeviceItem &item) {
+    return hypre_gpu_get_num_blocks<gdim>() * hypre_gpu_get_num_warps<bdim>(item);
 }
 
 /* return the flattened warp id in grid */
 template <hypre_int bdim, hypre_int gdim>
-static __device__ __forceinline__
-hypre_int hypre_gpu_get_grid_warp_id(hypre_DeviceItem &item)
-{
-   return hypre_gpu_get_block_id<gdim>(item) * hypre_gpu_get_num_warps<bdim>(item) +
-          hypre_gpu_get_warp_id<bdim>(item);
+static __device__ __forceinline__ hypre_int hypre_gpu_get_grid_warp_id(hypre_DeviceItem &item) {
+    return hypre_gpu_get_block_id<gdim>(item) * hypre_gpu_get_num_warps<bdim>(item)
+           + hypre_gpu_get_warp_id<bdim>(item);
 }
 
 #if defined(__CUDA_ARCH__) && __CUDA_ARCH__ < 600
-static __device__ __forceinline__
-hypre_double atomicAdd(hypre_double* address, hypre_double val)
-{
-   hypre_ulonglongint* address_as_ull = (hypre_ulonglongint*) address;
-   hypre_ulonglongint old = *address_as_ull, assumed;
+static __device__ __forceinline__ hypre_double atomicAdd(hypre_double *address, hypre_double val) {
+    hypre_ulonglongint *address_as_ull = (hypre_ulonglongint *) address;
+    hypre_ulonglongint old = *address_as_ull, assumed;
 
-   do
-   {
-      assumed = old;
-      old = atomicCAS(address_as_ull, assumed,
-                      __double_as_longlong(val +
-                                           __longlong_as_double(assumed)));
+    do {
+        assumed = old;
+        old = atomicCAS(address_as_ull, assumed, __double_as_longlong(val + __longlong_as_double(assumed)));
 
-      // Note: uses integer comparison to avoid hang in case of NaN (since NaN != NaN)
-   }
-   while (assumed != old);
+        // Note: uses integer comparison to avoid hang in case of NaN (since NaN != NaN)
+    } while (assumed != old);
 
-   return __longlong_as_double(old);
+    return __longlong_as_double(old);
 }
 #endif
 
@@ -1305,445 +1255,339 @@ hypre_double atomicAdd(hypre_double* address, hypre_double val)
 #if defined(HYPRE_USING_HIP) || (CUDA_VERSION < 9000)
 
 template <typename T>
-static __device__ __forceinline__
-T __shfl_sync(hypre_mask mask, T val, hypre_int src_line, hypre_int width = HYPRE_WARP_SIZE)
-{
-   return __shfl(val, src_line, width);
+static __device__ __forceinline__ T __shfl_sync(hypre_mask mask, T val, hypre_int src_line,
+                                                hypre_int width = HYPRE_WARP_SIZE) {
+    return __shfl(val, src_line, width);
 }
 
 template <typename T>
-static __device__ __forceinline__
-T __shfl_up_sync(hypre_mask mask, T val, hypre_uint delta, hypre_int width = HYPRE_WARP_SIZE)
-{
-   return __shfl_up(val, delta, width);
+static __device__ __forceinline__ T __shfl_up_sync(hypre_mask mask, T val, hypre_uint delta,
+                                                   hypre_int width = HYPRE_WARP_SIZE) {
+    return __shfl_up(val, delta, width);
 }
 
 template <typename T>
-static __device__ __forceinline__
-T __shfl_down_sync(hypre_mask mask, T val, hypre_uint delta, hypre_int width = HYPRE_WARP_SIZE)
-{
-   return __shfl_down(val, delta, width);
+static __device__ __forceinline__ T __shfl_down_sync(hypre_mask mask, T val, hypre_uint delta,
+                                                     hypre_int width = HYPRE_WARP_SIZE) {
+    return __shfl_down(val, delta, width);
 }
 
 template <typename T>
-static __device__ __forceinline__
-T __shfl_xor_sync(hypre_mask mask, T val, hypre_int lanemask, hypre_int width = HYPRE_WARP_SIZE)
-{
-   return __shfl_xor(val, lanemask, width);
+static __device__ __forceinline__ T __shfl_xor_sync(hypre_mask mask, T val, hypre_int lanemask,
+                                                    hypre_int width = HYPRE_WARP_SIZE) {
+    return __shfl_xor(val, lanemask, width);
 }
 
-static __device__ __forceinline__
-void __syncwarp()
-{
-}
+static __device__ __forceinline__ void __syncwarp() {}
 
-#endif // #if defined(HYPRE_USING_HIP) || (CUDA_VERSION < 9000)
+#endif// #if defined(HYPRE_USING_HIP) || (CUDA_VERSION < 9000)
 
-static __device__ __forceinline__
-hypre_mask hypre_ballot_sync(hypre_DeviceItem &item, hypre_mask mask, hypre_int predicate)
-{
+static __device__ __forceinline__ hypre_mask hypre_ballot_sync(hypre_DeviceItem &item, hypre_mask mask,
+                                                               hypre_int predicate) {
 #if defined(HYPRE_USING_CUDA)
-   return __ballot_sync(mask, predicate);
+    return __ballot_sync(mask, predicate);
 #else
-   return __ballot(predicate);
+    return __ballot(predicate);
 #endif
 }
 
-static __device__ __forceinline__
-HYPRE_Int hypre_popc(hypre_mask mask)
-{
+static __device__ __forceinline__ HYPRE_Int hypre_popc(hypre_mask mask) {
 #if defined(HYPRE_USING_CUDA)
-   return (HYPRE_Int) __popc(mask);
+    return (HYPRE_Int) __popc(mask);
 #else
-   return (HYPRE_Int) __popcll(mask);
+    return (HYPRE_Int) __popcll(mask);
 #endif
 }
 
-static __device__ __forceinline__
-HYPRE_Int hypre_ffs(hypre_mask mask)
-{
+static __device__ __forceinline__ HYPRE_Int hypre_ffs(hypre_mask mask) {
 #if defined(HYPRE_USING_CUDA)
-   return (HYPRE_Int) __ffs(mask);
+    return (HYPRE_Int) __ffs(mask);
 #else
-   return (HYPRE_Int) __ffsll(mask);
+    return (HYPRE_Int) __ffsll(mask);
 #endif
 }
 
 #if defined(HYPRE_USING_HIP)
-static __device__ __forceinline__
-hypre_int __any_sync(unsigned mask, hypre_int predicate)
-{
-   return __any(predicate);
+static __device__ __forceinline__ hypre_int __any_sync(unsigned mask, hypre_int predicate) {
+    return __any(predicate);
 }
 #endif
 
 /* sync the thread block */
-static __device__ __forceinline__
-void block_sync(hypre_DeviceItem &item)
-{
-   __syncthreads();
-}
+static __device__ __forceinline__ void block_sync(hypre_DeviceItem &item) { __syncthreads(); }
 
 /* sync the warp */
-static __device__ __forceinline__
-void warp_sync(hypre_DeviceItem &item)
-{
-   __syncwarp();
-}
+static __device__ __forceinline__ void warp_sync(hypre_DeviceItem &item) { __syncwarp(); }
 
 /* exclusive prefix scan */
 template <typename T>
-static __device__ __forceinline__
-T warp_prefix_sum(hypre_DeviceItem &item, hypre_int lane_id, T in, T &all_sum)
-{
+static __device__ __forceinline__ T warp_prefix_sum(hypre_DeviceItem &item, hypre_int lane_id, T in,
+                                                    T &all_sum) {
 #pragma unroll
-   for (hypre_int d = 2; d <= HYPRE_WARP_SIZE; d <<= 1)
-   {
-      T t = __shfl_up_sync(HYPRE_WARP_FULL_MASK, in, d >> 1);
-      if ( (lane_id & (d - 1)) == (d - 1) )
-      {
-         in += t;
-      }
-   }
-
-   all_sum = __shfl_sync(HYPRE_WARP_FULL_MASK, in, HYPRE_WARP_SIZE - 1);
-
-   if (lane_id == HYPRE_WARP_SIZE - 1)
-   {
-      in = 0;
-   }
+    for (hypre_int d = 2; d <= HYPRE_WARP_SIZE; d <<= 1) {
+        T t = __shfl_up_sync(HYPRE_WARP_FULL_MASK, in, d >> 1);
+        if ((lane_id & (d - 1)) == (d - 1)) { in += t; }
+    }
+
+    all_sum = __shfl_sync(HYPRE_WARP_FULL_MASK, in, HYPRE_WARP_SIZE - 1);
+
+    if (lane_id == HYPRE_WARP_SIZE - 1) { in = 0; }
 
 #pragma unroll
-   for (hypre_int d = HYPRE_WARP_SIZE >> 1; d > 0; d >>= 1)
-   {
-      T t = __shfl_xor_sync(HYPRE_WARP_FULL_MASK, in, d);
-
-      if ( (lane_id & (d - 1)) == (d - 1))
-      {
-         if ( (lane_id & ((d << 1) - 1)) == ((d << 1) - 1) )
-         {
-            in += t;
-         }
-         else
-         {
-            in = t;
-         }
-      }
-   }
-   return in;
-}
-
-static __device__ __forceinline__
-hypre_int warp_any_sync(hypre_DeviceItem &item, hypre_mask mask, hypre_int predicate)
-{
-   return __any_sync(mask, predicate);
+    for (hypre_int d = HYPRE_WARP_SIZE >> 1; d > 0; d >>= 1) {
+        T t = __shfl_xor_sync(HYPRE_WARP_FULL_MASK, in, d);
+
+        if ((lane_id & (d - 1)) == (d - 1)) {
+            if ((lane_id & ((d << 1) - 1)) == ((d << 1) - 1)) {
+                in += t;
+            } else {
+                in = t;
+            }
+        }
+    }
+    return in;
+}
+
+static __device__ __forceinline__ hypre_int warp_any_sync(hypre_DeviceItem &item, hypre_mask mask,
+                                                          hypre_int predicate) {
+    return __any_sync(mask, predicate);
 }
 
 template <typename T>
-static __device__ __forceinline__
-T warp_shuffle_sync(hypre_DeviceItem &item, hypre_mask mask, T val, hypre_int src_line,
-                    hypre_int width = HYPRE_WARP_SIZE)
-{
-   return __shfl_sync(mask, val, src_line, width);
+static __device__ __forceinline__ T warp_shuffle_sync(hypre_DeviceItem &item, hypre_mask mask, T val,
+                                                      hypre_int src_line, hypre_int width = HYPRE_WARP_SIZE) {
+    return __shfl_sync(mask, val, src_line, width);
 }
 
 template <typename T>
-static __device__ __forceinline__
-T warp_shuffle_up_sync(hypre_DeviceItem &item, hypre_mask mask, T val, hypre_uint delta,
-                       hypre_int width = HYPRE_WARP_SIZE)
-{
-   return __shfl_up_sync(mask, val, delta, width);
+static __device__ __forceinline__ T warp_shuffle_up_sync(hypre_DeviceItem &item, hypre_mask mask, T val,
+                                                         hypre_uint delta,
+                                                         hypre_int width = HYPRE_WARP_SIZE) {
+    return __shfl_up_sync(mask, val, delta, width);
 }
 
 template <typename T>
-static __device__ __forceinline__
-T warp_shuffle_down_sync(hypre_DeviceItem &item, hypre_mask mask, T val, hypre_uint delta,
-                         hypre_int width = HYPRE_WARP_SIZE)
-{
-   return __shfl_down_sync(mask, val, delta, width);
+static __device__ __forceinline__ T warp_shuffle_down_sync(hypre_DeviceItem &item, hypre_mask mask, T val,
+                                                           hypre_uint delta,
+                                                           hypre_int width = HYPRE_WARP_SIZE) {
+    return __shfl_down_sync(mask, val, delta, width);
 }
 
 template <typename T>
-static __device__ __forceinline__
-T warp_shuffle_xor_sync(hypre_DeviceItem &item, hypre_mask mask, T val, hypre_int lane_mask,
-                        hypre_int width = HYPRE_WARP_SIZE)
-{
-   return __shfl_xor_sync(mask, val, lane_mask, width);
+static __device__ __forceinline__ T warp_shuffle_xor_sync(hypre_DeviceItem &item, hypre_mask mask, T val,
+                                                          hypre_int lane_mask,
+                                                          hypre_int width = HYPRE_WARP_SIZE) {
+    return __shfl_xor_sync(mask, val, lane_mask, width);
 }
 
 template <typename T>
-static __device__ __forceinline__
-T warp_reduce_sum(hypre_DeviceItem &item, T in)
-{
+static __device__ __forceinline__ T warp_reduce_sum(hypre_DeviceItem &item, T in) {
 #pragma unroll
-   for (hypre_int d = HYPRE_WARP_SIZE >> 1; d > 0; d >>= 1)
-   {
-      in += __shfl_down_sync(HYPRE_WARP_FULL_MASK, in, d);
-   }
-   return in;
+    for (hypre_int d = HYPRE_WARP_SIZE >> 1; d > 0; d >>= 1) {
+        in += __shfl_down_sync(HYPRE_WARP_FULL_MASK, in, d);
+    }
+    return in;
 }
 
 template <typename T>
-static __device__ __forceinline__
-T warp_allreduce_sum(hypre_DeviceItem &item, T in)
-{
+static __device__ __forceinline__ T warp_allreduce_sum(hypre_DeviceItem &item, T in) {
 #pragma unroll
-   for (hypre_int d = HYPRE_WARP_SIZE >> 1; d > 0; d >>= 1)
-   {
-      in += __shfl_xor_sync(HYPRE_WARP_FULL_MASK, in, d);
-   }
-   return in;
+    for (hypre_int d = HYPRE_WARP_SIZE >> 1; d > 0; d >>= 1) {
+        in += __shfl_xor_sync(HYPRE_WARP_FULL_MASK, in, d);
+    }
+    return in;
 }
 
 template <typename T>
-static __device__ __forceinline__
-T warp_reduce_max(hypre_DeviceItem &item, T in)
-{
+static __device__ __forceinline__ T warp_reduce_max(hypre_DeviceItem &item, T in) {
 #pragma unroll
-   for (hypre_int d = HYPRE_WARP_SIZE >> 1; d > 0; d >>= 1)
-   {
-      in = max(in, __shfl_down_sync(HYPRE_WARP_FULL_MASK, in, d));
-   }
-   return in;
+    for (hypre_int d = HYPRE_WARP_SIZE >> 1; d > 0; d >>= 1) {
+        in = max(in, __shfl_down_sync(HYPRE_WARP_FULL_MASK, in, d));
+    }
+    return in;
 }
 
 template <typename T>
-static __device__ __forceinline__
-T warp_allreduce_max(hypre_DeviceItem &item, T in)
-{
+static __device__ __forceinline__ T warp_allreduce_max(hypre_DeviceItem &item, T in) {
 #pragma unroll
-   for (hypre_int d = HYPRE_WARP_SIZE >> 1; d > 0; d >>= 1)
-   {
-      in = max(in, __shfl_xor_sync(HYPRE_WARP_FULL_MASK, in, d));
-   }
-   return in;
+    for (hypre_int d = HYPRE_WARP_SIZE >> 1; d > 0; d >>= 1) {
+        in = max(in, __shfl_xor_sync(HYPRE_WARP_FULL_MASK, in, d));
+    }
+    return in;
 }
 
 template <typename T>
-static __device__ __forceinline__
-T warp_reduce_min(hypre_DeviceItem &item, T in)
-{
+static __device__ __forceinline__ T warp_reduce_min(hypre_DeviceItem &item, T in) {
 #pragma unroll
-   for (hypre_int d = HYPRE_WARP_SIZE >> 1; d > 0; d >>= 1)
-   {
-      in = min(in, __shfl_down_sync(HYPRE_WARP_FULL_MASK, in, d));
-   }
-   return in;
+    for (hypre_int d = HYPRE_WARP_SIZE >> 1; d > 0; d >>= 1) {
+        in = min(in, __shfl_down_sync(HYPRE_WARP_FULL_MASK, in, d));
+    }
+    return in;
 }
 
 template <typename T>
-static __device__ __forceinline__
-T warp_allreduce_min(hypre_DeviceItem &item, T in)
-{
+static __device__ __forceinline__ T warp_allreduce_min(hypre_DeviceItem &item, T in) {
 #pragma unroll
-   for (hypre_int d = HYPRE_WARP_SIZE >> 1; d > 0; d >>= 1)
-   {
-      in = min(in, __shfl_xor_sync(HYPRE_WARP_FULL_MASK, in, d));
-   }
-   return in;
+    for (hypre_int d = HYPRE_WARP_SIZE >> 1; d > 0; d >>= 1) {
+        in = min(in, __shfl_xor_sync(HYPRE_WARP_FULL_MASK, in, d));
+    }
+    return in;
 }
 
-template<typename T1, typename T2>
+template <typename T1, typename T2>
 #if (defined(THRUST_VERSION) && THRUST_VERSION < THRUST_VERSION_NOTFN)
 struct type_cast : public thrust::unary_function<T1, T2>
 #else
 struct type_cast
 #endif
 {
-   __host__ __device__ T2 operator()(const T1 &x) const
-   {
-      return (T2) x;
-   }
+    __host__ __device__ T2 operator()(const T1 &x) const { return (T2) x; }
 };
 
-template<typename T>
+template <typename T>
 #if (defined(THRUST_VERSION) && THRUST_VERSION < THRUST_VERSION_NOTFN)
 struct absolute_value : public thrust::unary_function<T, T>
 #else
 struct absolute_value
 #endif
 {
-   __host__ __device__ T operator()(const T &x) const
-   {
-      return x < T(0) ? -x : x;
-   }
+    __host__ __device__ T operator()(const T &x) const { return x < T(0) ? -x : x; }
 };
 
-template<typename T1, typename T2>
-struct TupleComp2
-{
-   typedef thrust::tuple<T1, T2> Tuple;
-
-   __host__ __device__ bool operator()(const Tuple& t1, const Tuple& t2)
-   {
-      if (thrust::get<0>(t1) < thrust::get<0>(t2))
-      {
-         return true;
-      }
-      if (thrust::get<0>(t1) > thrust::get<0>(t2))
-      {
-         return false;
-      }
-      return hypre_abs(thrust::get<1>(t1)) > hypre_abs(thrust::get<1>(t2));
-   }
+template <typename T1, typename T2>
+struct TupleComp2 {
+    typedef thrust::tuple<T1, T2> Tuple;
+
+    __host__ __device__ bool operator()(const Tuple &t1, const Tuple &t2) {
+        if (thrust::get<0>(t1) < thrust::get<0>(t2)) { return true; }
+        if (thrust::get<0>(t1) > thrust::get<0>(t2)) { return false; }
+        return hypre_abs(thrust::get<1>(t1)) > hypre_abs(thrust::get<1>(t2));
+    }
 };
 
-template<typename T1, typename T2>
-struct TupleComp3
-{
-   typedef thrust::tuple<T1, T2> Tuple;
-
-   __host__ __device__ bool operator()(const Tuple& t1, const Tuple& t2)
-   {
-      if (thrust::get<0>(t1) < thrust::get<0>(t2))
-      {
-         return true;
-      }
-      if (thrust::get<0>(t1) > thrust::get<0>(t2))
-      {
-         return false;
-      }
-      if (thrust::get<0>(t2) == thrust::get<1>(t2))
-      {
-         return false;
-      }
-      return thrust::get<0>(t1) == thrust::get<1>(t1) || thrust::get<1>(t1) < thrust::get<1>(t2);
-   }
+template <typename T1, typename T2>
+struct TupleComp3 {
+    typedef thrust::tuple<T1, T2> Tuple;
+
+    __host__ __device__ bool operator()(const Tuple &t1, const Tuple &t2) {
+        if (thrust::get<0>(t1) < thrust::get<0>(t2)) { return true; }
+        if (thrust::get<0>(t1) > thrust::get<0>(t2)) { return false; }
+        if (thrust::get<0>(t2) == thrust::get<1>(t2)) { return false; }
+        return thrust::get<0>(t1) == thrust::get<1>(t1) || thrust::get<1>(t1) < thrust::get<1>(t2);
+    }
 };
 
-template<typename T>
+template <typename T>
 #if (defined(THRUST_VERSION) && THRUST_VERSION < THRUST_VERSION_NOTFN)
 struct is_negative : public thrust::unary_function<T, bool>
 #else
 struct is_negative
 #endif
 {
-   __host__ __device__ bool operator()(const T &x)
-   {
-      return (x < 0);
-   }
+    __host__ __device__ bool operator()(const T &x) { return (x < 0); }
 };
 
-template<typename T>
+template <typename T>
 #if (defined(THRUST_VERSION) && THRUST_VERSION < THRUST_VERSION_NOTFN)
 struct is_positive : public thrust::unary_function<T, bool>
 #else
 struct is_positive
 #endif
 {
-   __host__ __device__ bool operator()(const T &x)
-   {
-      return (x > 0);
-   }
+    __host__ __device__ bool operator()(const T &x) { return (x > 0); }
 };
 
-template<typename T>
+template <typename T>
 #if (defined(THRUST_VERSION) && THRUST_VERSION < THRUST_VERSION_NOTFN)
 struct is_nonnegative : public thrust::unary_function<T, bool>
 #else
 struct is_nonnegative
 #endif
 {
-   __host__ __device__ bool operator()(const T &x)
-   {
-      return (x >= 0);
-   }
+    __host__ __device__ bool operator()(const T &x) { return (x >= 0); }
 };
 
-template<typename T>
+template <typename T>
 #if (defined(THRUST_VERSION) && THRUST_VERSION < THRUST_VERSION_NOTFN)
 struct in_range : public thrust::unary_function<T, bool>
 #else
 struct in_range
 #endif
 {
-   T low, up;
+    T low, up;
 
-   in_range(T low_, T up_) { low = low_; up = up_; }
+    in_range(T low_, T up_) {
+        low = low_;
+        up = up_;
+    }
 
-   __host__ __device__ bool operator()(const T &x)
-   {
-      return (x >= low && x <= up);
-   }
+    __host__ __device__ bool operator()(const T &x) { return (x >= low && x <= up); }
 };
 
-template<typename T>
+template <typename T>
 #if (defined(THRUST_VERSION) && THRUST_VERSION < THRUST_VERSION_NOTFN)
 struct out_of_range : public thrust::unary_function<T, bool>
 #else
 struct out_of_range
 #endif
 {
-   T low, up;
+    T low, up;
 
-   out_of_range(T low_, T up_) { low = low_; up = up_; }
+    out_of_range(T low_, T up_) {
+        low = low_;
+        up = up_;
+    }
 
-   __host__ __device__ bool operator()(const T &x)
-   {
-      return (x < low || x > up);
-   }
+    __host__ __device__ bool operator()(const T &x) { return (x < low || x > up); }
 };
 
-template<typename T>
+template <typename T>
 #if (defined(THRUST_VERSION) && THRUST_VERSION < THRUST_VERSION_NOTFN)
 struct less_than : public thrust::unary_function<T, bool>
 #else
 struct less_than
 #endif
 {
-   T val;
+    T val;
 
-   less_than(T val_) { val = val_; }
+    less_than(T val_) { val = val_; }
 
-   __host__ __device__ bool operator()(const T &x)
-   {
-      return (x < val);
-   }
+    __host__ __device__ bool operator()(const T &x) { return (x < val); }
 };
 
-template<typename T>
+template <typename T>
 #if (defined(THRUST_VERSION) && THRUST_VERSION < THRUST_VERSION_NOTFN)
 struct modulo : public thrust::unary_function<T, T>
 #else
 struct modulo
 #endif
 {
-   T val;
+    T val;
 
-   modulo(T val_) { val = val_; }
+    modulo(T val_) { val = val_; }
 
-   __host__ __device__ T operator()(const T &x)
-   {
-      return (x % val);
-   }
+    __host__ __device__ T operator()(const T &x) { return (x % val); }
 };
 
-template<typename T>
+template <typename T>
 #if (defined(THRUST_VERSION) && THRUST_VERSION < THRUST_VERSION_NOTFN)
 struct equal : public thrust::unary_function<T, bool>
 #else
 struct equal
 #endif
 {
-   T val;
+    T val;
 
-   equal(T val_) { val = val_; }
+    equal(T val_) { val = val_; }
 
-   __host__ __device__ bool operator()(const T &x)
-   {
-      return (x == val);
-   }
+    __host__ __device__ bool operator()(const T &x) { return (x == val); }
 };
 
-struct print_functor
-{
-   __host__ __device__ void operator()(HYPRE_Real val)
-   {
-      printf("%f\n", val);
-   }
+struct print_functor {
+    __host__ __device__ void operator()(HYPRE_Real val) { printf("%f\n", val); }
 };
 
-#endif // defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#endif// defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
 
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  *      sycl functions
@@ -1753,439 +1597,341 @@ struct print_functor
 
 /* return the number of threads in block */
 template <hypre_int dim>
-static __device__ __forceinline__
-hypre_int hypre_gpu_get_num_threads(hypre_DeviceItem &item)
-{
-   return static_cast<hypre_int>(item.get_local_range().size());
+static __device__ __forceinline__ hypre_int hypre_gpu_get_num_threads(hypre_DeviceItem &item) {
+    return static_cast<hypre_int>(item.get_local_range().size());
 }
 
 /* return the flattened thread id in block */
 template <hypre_int dim>
-static __device__ __forceinline__
-hypre_int hypre_gpu_get_thread_id(hypre_DeviceItem &item)
-{
-   return static_cast<hypre_int>(item.get_local_linear_id());
+static __device__ __forceinline__ hypre_int hypre_gpu_get_thread_id(hypre_DeviceItem &item) {
+    return static_cast<hypre_int>(item.get_local_linear_id());
 }
 
 /* return the number of warps in block */
 template <hypre_int dim>
-static __device__ __forceinline__
-hypre_int hypre_gpu_get_num_warps(hypre_DeviceItem &item)
-{
-   return hypre_gpu_get_num_threads<dim>(item) >> HYPRE_WARP_BITSHIFT;
+static __device__ __forceinline__ hypre_int hypre_gpu_get_num_warps(hypre_DeviceItem &item) {
+    return hypre_gpu_get_num_threads<dim>(item) >> HYPRE_WARP_BITSHIFT;
 }
 
 /* return the warp id in block */
 template <hypre_int dim>
-static __device__ __forceinline__
-hypre_int hypre_gpu_get_warp_id(hypre_DeviceItem &item)
-{
-   return hypre_gpu_get_thread_id<dim>(item) >> HYPRE_WARP_BITSHIFT;
+static __device__ __forceinline__ hypre_int hypre_gpu_get_warp_id(hypre_DeviceItem &item) {
+    return hypre_gpu_get_thread_id<dim>(item) >> HYPRE_WARP_BITSHIFT;
 }
 
 /* return the thread lane id in warp */
 template <hypre_int dim>
-static __device__ __forceinline__
-hypre_int hypre_gpu_get_lane_id(hypre_DeviceItem &item)
-{
-   return static_cast<hypre_int>(item.get_sub_group().get_local_linear_id());
+static __device__ __forceinline__ hypre_int hypre_gpu_get_lane_id(hypre_DeviceItem &item) {
+    return static_cast<hypre_int>(item.get_sub_group().get_local_linear_id());
 }
 
 /* return the num of blocks in grid */
 template <hypre_int dim>
-static __device__ __forceinline__
-hypre_int hypre_gpu_get_num_blocks(hypre_DeviceItem &item)
-{
-   return static_cast<hypre_int>(item.get_group_range().size());
+static __device__ __forceinline__ hypre_int hypre_gpu_get_num_blocks(hypre_DeviceItem &item) {
+    return static_cast<hypre_int>(item.get_group_range().size());
 }
 
 /* return the flattened block id in grid */
 template <hypre_int dim>
-static __device__ __forceinline__
-hypre_int hypre_gpu_get_block_id(hypre_DeviceItem &item)
-{
-   return item.get_group_linear_id();
+static __device__ __forceinline__ hypre_int hypre_gpu_get_block_id(hypre_DeviceItem &item) {
+    return item.get_group_linear_id();
 }
 
 /* return the number of threads in grid */
 template <hypre_int bdim, hypre_int gdim>
-static __device__ __forceinline__
-hypre_int hypre_gpu_get_grid_num_threads(hypre_DeviceItem &item)
-{
-   return hypre_gpu_get_num_blocks<gdim>(item) * hypre_gpu_get_num_threads<bdim>(item);
+static __device__ __forceinline__ hypre_int hypre_gpu_get_grid_num_threads(hypre_DeviceItem &item) {
+    return hypre_gpu_get_num_blocks<gdim>(item) * hypre_gpu_get_num_threads<bdim>(item);
 }
 
 /* return the flattened thread id in grid */
 template <hypre_int bdim, hypre_int gdim>
-static __device__ __forceinline__
-hypre_int hypre_gpu_get_grid_thread_id(hypre_DeviceItem &item)
-{
-   return hypre_gpu_get_block_id<gdim>(item) * hypre_gpu_get_num_threads<bdim>(item) +
-          hypre_gpu_get_thread_id<bdim>(item);
+static __device__ __forceinline__ hypre_int hypre_gpu_get_grid_thread_id(hypre_DeviceItem &item) {
+    return hypre_gpu_get_block_id<gdim>(item) * hypre_gpu_get_num_threads<bdim>(item)
+           + hypre_gpu_get_thread_id<bdim>(item);
 }
 
 /* return the number of warps in grid */
 template <hypre_int bdim, hypre_int gdim>
-static __device__ __forceinline__
-hypre_int hypre_gpu_get_grid_num_warps(hypre_DeviceItem &item)
-{
-   return hypre_gpu_get_num_blocks<gdim>(item) * hypre_gpu_get_num_warps<bdim>(item);
+static __device__ __forceinline__ hypre_int hypre_gpu_get_grid_num_warps(hypre_DeviceItem &item) {
+    return hypre_gpu_get_num_blocks<gdim>(item) * hypre_gpu_get_num_warps<bdim>(item);
 }
 
 /* return the flattened warp id in nd_range */
 template <hypre_int bdim, hypre_int gdim>
-static __device__ __forceinline__
-hypre_int hypre_gpu_get_grid_warp_id(hypre_DeviceItem &item)
-{
-   return hypre_gpu_get_block_id<gdim>(item) * hypre_gpu_get_num_warps<bdim>(item) +
-          hypre_gpu_get_warp_id<bdim>(item);
+static __device__ __forceinline__ hypre_int hypre_gpu_get_grid_warp_id(hypre_DeviceItem &item) {
+    return hypre_gpu_get_block_id<gdim>(item) * hypre_gpu_get_num_warps<bdim>(item)
+           + hypre_gpu_get_warp_id<bdim>(item);
 }
 
 /* sync the thread block */
-static __device__ __forceinline__
-void block_sync(hypre_DeviceItem &item)
-{
-   sycl::group_barrier(item.get_group());
+static __device__ __forceinline__ void block_sync(hypre_DeviceItem &item) {
+    sycl::group_barrier(item.get_group());
 }
 
 /* sync the warp */
-static __device__ __forceinline__
-void warp_sync(hypre_DeviceItem &item)
-{
-   sycl::group_barrier(item.get_sub_group());
+static __device__ __forceinline__ void warp_sync(hypre_DeviceItem &item) {
+    sycl::group_barrier(item.get_sub_group());
 }
 
 /* exclusive prefix scan */
 template <typename T>
-static __device__ __forceinline__
-T warp_prefix_sum(hypre_DeviceItem &item, hypre_int lane_id, T in, T &all_sum)
-{
+static __device__ __forceinline__ T warp_prefix_sum(hypre_DeviceItem &item, hypre_int lane_id, T in,
+                                                    T &all_sum) {
 #pragma unroll
-   for (hypre_int d = 2; d <= HYPRE_WARP_SIZE; d <<= 1)
-   {
-      T t = sycl::shift_group_right(item.get_sub_group(), in, d >> 1);
-      if ( (lane_id & (d - 1)) == (d - 1) )
-      {
-         in += t;
-      }
-   }
-
-   all_sum = sycl::group_broadcast(item.get_sub_group(), in, HYPRE_WARP_SIZE - 1);
-
-   if (lane_id == HYPRE_WARP_SIZE - 1)
-   {
-      in = 0;
-   }
+    for (hypre_int d = 2; d <= HYPRE_WARP_SIZE; d <<= 1) {
+        T t = sycl::shift_group_right(item.get_sub_group(), in, d >> 1);
+        if ((lane_id & (d - 1)) == (d - 1)) { in += t; }
+    }
+
+    all_sum = sycl::group_broadcast(item.get_sub_group(), in, HYPRE_WARP_SIZE - 1);
+
+    if (lane_id == HYPRE_WARP_SIZE - 1) { in = 0; }
 
 #pragma unroll
-   for (hypre_int d = HYPRE_WARP_SIZE >> 1; d > 0; d >>= 1)
-   {
-      T t = sycl::permute_group_by_xor(item.get_sub_group(), in, d);
-
-      if ( (lane_id & (d - 1)) == (d - 1))
-      {
-         if ( (lane_id & ((d << 1) - 1)) == ((d << 1) - 1) )
-         {
-            in += t;
-         }
-         else
-         {
-            in = t;
-         }
-      }
-   }
-   return in;
-}
-
-static __device__ __forceinline__
-hypre_mask hypre_ballot_sync(hypre_DeviceItem &item, hypre_mask mask, hypre_int predicate)
-{
-   return sycl::reduce_over_group(
-             item.get_sub_group(),
-             (mask & (0x1 << item.get_sub_group().get_local_linear_id())) &&
-             predicate ? (0x1 << item.get_sub_group().get_local_linear_id()) : 0,
-             sycl::ext::oneapi::plus<>());
+    for (hypre_int d = HYPRE_WARP_SIZE >> 1; d > 0; d >>= 1) {
+        T t = sycl::permute_group_by_xor(item.get_sub_group(), in, d);
+
+        if ((lane_id & (d - 1)) == (d - 1)) {
+            if ((lane_id & ((d << 1) - 1)) == ((d << 1) - 1)) {
+                in += t;
+            } else {
+                in = t;
+            }
+        }
+    }
+    return in;
 }
 
-static __device__ __forceinline__
-HYPRE_Int hypre_popc(hypre_mask mask)
-{
-   return (HYPRE_Int) sycl::popcount(mask);
+static __device__ __forceinline__ hypre_mask hypre_ballot_sync(hypre_DeviceItem &item, hypre_mask mask,
+                                                               hypre_int predicate) {
+    return sycl::reduce_over_group(item.get_sub_group(),
+                                   (mask & (0x1 << item.get_sub_group().get_local_linear_id())) && predicate
+                                           ? (0x1 << item.get_sub_group().get_local_linear_id())
+                                           : 0,
+                                   sycl::ext::oneapi::plus<>());
 }
 
-static __device__ __forceinline__
-HYPRE_Int hypre_ffs(hypre_mask mask)
-{
-   return (HYPRE_Int)dpct::ffs<HYPRE_Int>(mask);
+static __device__ __forceinline__ HYPRE_Int hypre_popc(hypre_mask mask) {
+    return (HYPRE_Int) sycl::popcount(mask);
 }
 
-static __device__ __forceinline__
-hypre_int warp_any_sync(hypre_DeviceItem &item, hypre_mask mask, hypre_int predicate)
-{
-   return sycl::any_of_group(item.get_sub_group(), predicate);
+static __device__ __forceinline__ HYPRE_Int hypre_ffs(hypre_mask mask) {
+    return (HYPRE_Int) dpct::ffs<HYPRE_Int>(mask);
+}
+
+static __device__ __forceinline__ hypre_int warp_any_sync(hypre_DeviceItem &item, hypre_mask mask,
+                                                          hypre_int predicate) {
+    return sycl::any_of_group(item.get_sub_group(), predicate);
 }
 
 template <typename T>
-static __device__ __forceinline__
-T warp_shuffle_sync(hypre_DeviceItem &item, hypre_mask mask, T val, hypre_int src_line)
-{
-   return sycl::group_broadcast(item.get_sub_group(), val, src_line);
+static __device__ __forceinline__ T warp_shuffle_sync(hypre_DeviceItem &item, hypre_mask mask, T val,
+                                                      hypre_int src_line) {
+    return sycl::group_broadcast(item.get_sub_group(), val, src_line);
 }
 
 template <typename T>
-static __device__ __forceinline__
-T warp_shuffle_sync(hypre_DeviceItem &item, hypre_mask mask, T val, hypre_int src_line,
-                    hypre_int width)
-{
-   hypre_int lane_id = hypre_gpu_get_lane_id<1>(item);
-   hypre_int group_start = (lane_id / width) * width;
-   hypre_int src_in_warp = group_start + (src_line % width);
-   return sycl::select_from_group(item.get_sub_group(), val, src_in_warp);
+static __device__ __forceinline__ T warp_shuffle_sync(hypre_DeviceItem &item, hypre_mask mask, T val,
+                                                      hypre_int src_line, hypre_int width) {
+    hypre_int lane_id = hypre_gpu_get_lane_id<1>(item);
+    hypre_int group_start = (lane_id / width) * width;
+    hypre_int src_in_warp = group_start + (src_line % width);
+    return sycl::select_from_group(item.get_sub_group(), val, src_in_warp);
 }
 
 template <typename T>
-static __device__ __forceinline__
-T warp_shuffle_up_sync(hypre_DeviceItem &item, hypre_mask mask, T val, hypre_uint delta)
-{
-   return sycl::shift_group_right(item.get_sub_group(), val, delta);
+static __device__ __forceinline__ T warp_shuffle_up_sync(hypre_DeviceItem &item, hypre_mask mask, T val,
+                                                         hypre_uint delta) {
+    return sycl::shift_group_right(item.get_sub_group(), val, delta);
 }
 
 template <typename T>
-static __device__ __forceinline__
-T warp_shuffle_up_sync(hypre_DeviceItem &item, hypre_mask mask, T val, hypre_uint delta,
-                       hypre_int width)
-{
-   hypre_int lane_id = hypre_gpu_get_lane_id<1>(item);
-   hypre_int group_start = (lane_id / width) * width;
-   hypre_int src_in_warp = lane_id - delta >= group_start ? lane_id - delta : lane_id;
-   return sycl::select_from_group(item.get_sub_group(), val, src_in_warp);
+static __device__ __forceinline__ T warp_shuffle_up_sync(hypre_DeviceItem &item, hypre_mask mask, T val,
+                                                         hypre_uint delta, hypre_int width) {
+    hypre_int lane_id = hypre_gpu_get_lane_id<1>(item);
+    hypre_int group_start = (lane_id / width) * width;
+    hypre_int src_in_warp = lane_id - delta >= group_start ? lane_id - delta : lane_id;
+    return sycl::select_from_group(item.get_sub_group(), val, src_in_warp);
 }
 
 template <typename T>
-static __device__ __forceinline__
-T warp_shuffle_down_sync(hypre_DeviceItem &item, hypre_mask mask, T val, hypre_uint delta)
-{
-   return sycl::shift_group_left(item.get_sub_group(), val, delta);
+static __device__ __forceinline__ T warp_shuffle_down_sync(hypre_DeviceItem &item, hypre_mask mask, T val,
+                                                           hypre_uint delta) {
+    return sycl::shift_group_left(item.get_sub_group(), val, delta);
 }
 
 template <typename T>
-static __device__ __forceinline__
-T warp_shuffle_down_sync(hypre_DeviceItem &item, hypre_mask mask, T val, hypre_uint delta,
-                         hypre_int width)
-{
-   hypre_int lane_id = hypre_gpu_get_lane_id<1>(item);
-   hypre_int group_end = ((lane_id / width) + 1) * width - 1;
-   hypre_int src_in_warp = lane_id + delta <= group_end ? lane_id + delta : lane_id;
-   return sycl::select_from_group(item.get_sub_group(), val, src_in_warp);
+static __device__ __forceinline__ T warp_shuffle_down_sync(hypre_DeviceItem &item, hypre_mask mask, T val,
+                                                           hypre_uint delta, hypre_int width) {
+    hypre_int lane_id = hypre_gpu_get_lane_id<1>(item);
+    hypre_int group_end = ((lane_id / width) + 1) * width - 1;
+    hypre_int src_in_warp = lane_id + delta <= group_end ? lane_id + delta : lane_id;
+    return sycl::select_from_group(item.get_sub_group(), val, src_in_warp);
 }
 
 template <typename T>
-static __device__ __forceinline__
-T warp_shuffle_xor_sync(hypre_DeviceItem &item, hypre_mask mask, T val, hypre_int lane_mask)
-{
-   return sycl::permute_group_by_xor(item.get_sub_group(), val, lane_mask);
+static __device__ __forceinline__ T warp_shuffle_xor_sync(hypre_DeviceItem &item, hypre_mask mask, T val,
+                                                          hypre_int lane_mask) {
+    return sycl::permute_group_by_xor(item.get_sub_group(), val, lane_mask);
 }
 
 template <typename T>
-static __device__ __forceinline__
-T warp_shuffle_xor_sync(hypre_DeviceItem &item, hypre_mask mask, T val, hypre_int lane_mask,
-                        hypre_int width)
-{
-   hypre_int lane_id = hypre_gpu_get_lane_id<1>(item);
-   hypre_int group_end = ((lane_id / width) + 1) * width - 1;
-   hypre_int src_in_warp = lane_id ^ lane_mask;
-   src_in_warp = src_in_warp > group_end ? lane_id : src_in_warp;
-   return sycl::select_from_group(item.get_sub_group(), val, src_in_warp);
+static __device__ __forceinline__ T warp_shuffle_xor_sync(hypre_DeviceItem &item, hypre_mask mask, T val,
+                                                          hypre_int lane_mask, hypre_int width) {
+    hypre_int lane_id = hypre_gpu_get_lane_id<1>(item);
+    hypre_int group_end = ((lane_id / width) + 1) * width - 1;
+    hypre_int src_in_warp = lane_id ^ lane_mask;
+    src_in_warp = src_in_warp > group_end ? lane_id : src_in_warp;
+    return sycl::select_from_group(item.get_sub_group(), val, src_in_warp);
 }
 
 template <typename T>
-static __forceinline__
-T warp_reduce_sum(hypre_DeviceItem &item, T in)
-{
-   for (hypre_int d = HYPRE_WARP_SIZE >> 1; d > 0; d >>= 1)
-   {
-      in += sycl::shift_group_left(item.get_sub_group(), in, d);
-   }
-   return in;
+static __forceinline__ T warp_reduce_sum(hypre_DeviceItem &item, T in) {
+    for (hypre_int d = HYPRE_WARP_SIZE >> 1; d > 0; d >>= 1) {
+        in += sycl::shift_group_left(item.get_sub_group(), in, d);
+    }
+    return in;
 }
 
 template <typename T>
-static __forceinline__
-T warp_allreduce_sum(hypre_DeviceItem &item, T in)
-{
-   for (hypre_int d = HYPRE_WARP_SIZE >> 1; d > 0; d >>= 1)
-   {
-      in += sycl::permute_group_by_xor(item.get_sub_group(), in, d);
-   }
-   return in;
+static __forceinline__ T warp_allreduce_sum(hypre_DeviceItem &item, T in) {
+    for (hypre_int d = HYPRE_WARP_SIZE >> 1; d > 0; d >>= 1) {
+        in += sycl::permute_group_by_xor(item.get_sub_group(), in, d);
+    }
+    return in;
 }
 
 template <typename T>
-static __forceinline__
-T warp_reduce_max(hypre_DeviceItem &item, T in)
-{
-   for (hypre_int d = HYPRE_WARP_SIZE >> 1; d > 0; d >>= 1)
-   {
-      in = std::max(in, sycl::shift_group_left(item.get_sub_group(), in, d));
-   }
-   return in;
+static __forceinline__ T warp_reduce_max(hypre_DeviceItem &item, T in) {
+    for (hypre_int d = HYPRE_WARP_SIZE >> 1; d > 0; d >>= 1) {
+        in = std::max(in, sycl::shift_group_left(item.get_sub_group(), in, d));
+    }
+    return in;
 }
 
 template <typename T>
-static __forceinline__
-T warp_allreduce_max(hypre_DeviceItem &item, T in)
-{
-   for (hypre_int d = HYPRE_WARP_SIZE >> 1; d > 0; d >>= 1)
-   {
-      in = std::max(in, sycl::permute_group_by_xor(item.get_sub_group(), in, d));
-   }
-   return in;
+static __forceinline__ T warp_allreduce_max(hypre_DeviceItem &item, T in) {
+    for (hypre_int d = HYPRE_WARP_SIZE >> 1; d > 0; d >>= 1) {
+        in = std::max(in, sycl::permute_group_by_xor(item.get_sub_group(), in, d));
+    }
+    return in;
 }
 
 template <typename T>
-static __forceinline__
-T warp_reduce_min(hypre_DeviceItem &item, T in)
-{
-   for (hypre_int d = HYPRE_WARP_SIZE >> 1; d > 0; d >>= 1)
-   {
-      in = std::min(in, sycl::shift_group_left(item.get_sub_group(), in, d));
-   }
-   return in;
+static __forceinline__ T warp_reduce_min(hypre_DeviceItem &item, T in) {
+    for (hypre_int d = HYPRE_WARP_SIZE >> 1; d > 0; d >>= 1) {
+        in = std::min(in, sycl::shift_group_left(item.get_sub_group(), in, d));
+    }
+    return in;
 }
 
 template <typename T>
-static __forceinline__
-T warp_allreduce_min(hypre_DeviceItem &item, T in)
-{
-   for (hypre_int d = HYPRE_WARP_SIZE >> 1; d > 0; d >>= 1)
-   {
-      in = std::min(in, sycl::permute_group_by_xor(item.get_sub_group(), in, d));
-   }
-   return in;
+static __forceinline__ T warp_allreduce_min(hypre_DeviceItem &item, T in) {
+    for (hypre_int d = HYPRE_WARP_SIZE >> 1; d > 0; d >>= 1) {
+        in = std::min(in, sycl::permute_group_by_xor(item.get_sub_group(), in, d));
+    }
+    return in;
 }
 
-template<typename T>
-struct is_negative
-{
-   is_negative() {}
+template <typename T>
+struct is_negative {
+    is_negative() {}
 
-   constexpr bool operator()(const T &x = T()) const { return (x < 0); }
+    constexpr bool operator()(const T &x = T()) const { return (x < 0); }
 };
 
-template<typename T>
-struct is_positive
-{
-   is_positive() {}
+template <typename T>
+struct is_positive {
+    is_positive() {}
 
-   constexpr bool operator()(const T &x = T()) const { return (x > 0); }
+    constexpr bool operator()(const T &x = T()) const { return (x > 0); }
 };
 
-template<typename T>
-struct is_nonnegative
-{
-   is_nonnegative() {}
+template <typename T>
+struct is_nonnegative {
+    is_nonnegative() {}
 
-   constexpr bool operator()(const T &x = T()) const { return (x >= 0); }
+    constexpr bool operator()(const T &x = T()) const { return (x >= 0); }
 };
 
-template<typename T>
-struct in_range
-{
-   T low, high;
-   in_range(T low_ = T(), T high_ = T()) { low = low_; high = high_; }
+template <typename T>
+struct in_range {
+    T low, high;
+    in_range(T low_ = T(), T high_ = T()) {
+        low = low_;
+        high = high_;
+    }
 
-   constexpr bool operator()(const T &x) const { return (x >= low && x <= high); }
+    constexpr bool operator()(const T &x) const { return (x >= low && x <= high); }
 };
 
-template<typename T>
-struct out_of_range
-{
-   T low, high;
-   out_of_range(T low_ = T(), T high_ = T()) { low = low_; high = high_; }
+template <typename T>
+struct out_of_range {
+    T low, high;
+    out_of_range(T low_ = T(), T high_ = T()) {
+        low = low_;
+        high = high_;
+    }
 
-   constexpr bool operator()(const T &x) const { return (x < low || x > high); }
+    constexpr bool operator()(const T &x) const { return (x < low || x > high); }
 };
 
-template<typename T>
-struct less_than
-{
-   T val;
-   less_than(T val_ = T()) { val = val_; }
+template <typename T>
+struct less_than {
+    T val;
+    less_than(T val_ = T()) { val = val_; }
 
-   constexpr bool operator()(const T &x) const { return (x < val); }
+    constexpr bool operator()(const T &x) const { return (x < val); }
 };
 
-template<typename T>
-struct modulo
-{
-   T val;
-   modulo(T val_ = T()) { val = val_; }
+template <typename T>
+struct modulo {
+    T val;
+    modulo(T val_ = T()) { val = val_; }
 
-   constexpr T operator()(const T &x) const { return (x % val); }
+    constexpr T operator()(const T &x) const { return (x % val); }
 };
 
-template<typename T>
-struct equal
-{
-   T val;
-   equal(T val_ = T()) { val = val_; }
+template <typename T>
+struct equal {
+    T val;
+    equal(T val_ = T()) { val = val_; }
 
-   constexpr bool operator()(const T &x) const { return (x == val); }
+    constexpr bool operator()(const T &x) const { return (x == val); }
 };
 
-template<typename T1, typename T2>
-struct type_cast
-{
-   constexpr T2 operator()(const T1 &x = T1()) const { return (T2) x; }
+template <typename T1, typename T2>
+struct type_cast {
+    constexpr T2 operator()(const T1 &x = T1()) const { return (T2) x; }
 };
 
-template<typename T>
-struct absolute_value
-{
-   constexpr T operator()(const T &x) const { return x < T(0) ? -x : x; }
+template <typename T>
+struct absolute_value {
+    constexpr T operator()(const T &x) const { return x < T(0) ? -x : x; }
 };
 
-template<typename... T>
-struct TupleComp2
-{
-   typedef std::tuple<T...> Tuple;
-   bool operator()(const Tuple& t1, const Tuple& t2)
-   {
-      if (std::get<0>(t1) < std::get<0>(t2))
-      {
-         return true;
-      }
-      if (std::get<0>(t1) > std::get<0>(t2))
-      {
-         return false;
-      }
-      return hypre_abs(std::get<1>(t1)) > hypre_abs(std::get<1>(t2));
-   }
+template <typename... T>
+struct TupleComp2 {
+    typedef std::tuple<T...> Tuple;
+    bool operator()(const Tuple &t1, const Tuple &t2) {
+        if (std::get<0>(t1) < std::get<0>(t2)) { return true; }
+        if (std::get<0>(t1) > std::get<0>(t2)) { return false; }
+        return hypre_abs(std::get<1>(t1)) > hypre_abs(std::get<1>(t2));
+    }
 };
 
-template<typename... T>
-struct TupleComp3
-{
-   typedef std::tuple<T...> Tuple;
-   bool operator()(const Tuple& t1, const Tuple& t2)
-   {
-      if (std::get<0>(t1) < std::get<0>(t2))
-      {
-         return true;
-      }
-      if (std::get<0>(t1) > std::get<0>(t2))
-      {
-         return false;
-      }
-      if (std::get<0>(t2) == std::get<1>(t2))
-      {
-         return false;
-      }
-      return std::get<0>(t1) == std::get<1>(t1) || std::get<1>(t1) < std::get<1>(t2);
-   }
+template <typename... T>
+struct TupleComp3 {
+    typedef std::tuple<T...> Tuple;
+    bool operator()(const Tuple &t1, const Tuple &t2) {
+        if (std::get<0>(t1) < std::get<0>(t2)) { return true; }
+        if (std::get<0>(t1) > std::get<0>(t2)) { return false; }
+        if (std::get<0>(t2) == std::get<1>(t2)) { return false; }
+        return std::get<0>(t1) == std::get<1>(t1) || std::get<1>(t1) < std::get<1>(t2);
+    }
 };
 
-#endif // #if defined(HYPRE_USING_SYCL)
+#endif// #if defined(HYPRE_USING_SYCL)
 
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  *      end of functions defined here
@@ -2195,34 +1941,31 @@ struct TupleComp3
 #if defined(HYPRE_USING_GPU)
 dim3 hypre_GetDefaultDeviceBlockDimension();
 
-dim3 hypre_GetDefaultDeviceGridDimension( HYPRE_Int n, const char *granularity, dim3 bDim );
+dim3 hypre_GetDefaultDeviceGridDimension(HYPRE_Int n, const char *granularity, dim3 bDim);
 
 dim3 hypre_dim3(HYPRE_Int x);
 dim3 hypre_dim3(HYPRE_Int x, HYPRE_Int y);
 dim3 hypre_dim3(HYPRE_Int x, HYPRE_Int y, HYPRE_Int z);
 
 template <typename T1, typename T2, typename T3>
-HYPRE_Int hypreDevice_StableSortByTupleKey(HYPRE_Int N, T1 *keys1, T2 *keys2,
-                                           T3 *vals, HYPRE_Int opt);
+HYPRE_Int hypreDevice_StableSortByTupleKey(HYPRE_Int N, T1 *keys1, T2 *keys2, T3 *vals, HYPRE_Int opt);
 
 template <typename T1, typename T2, typename T3, typename T4>
-HYPRE_Int hypreDevice_StableSortTupleByTupleKey(HYPRE_Int N, T1 *keys1, T2 *keys2,
-                                                T3 *vals1, T4 *vals2, HYPRE_Int opt);
+HYPRE_Int hypreDevice_StableSortTupleByTupleKey(HYPRE_Int N, T1 *keys1, T2 *keys2, T3 *vals1, T4 *vals2,
+                                                HYPRE_Int opt);
 
 template <typename T1, typename T2, typename T3>
-HYPRE_Int hypreDevice_ReduceByTupleKey(HYPRE_Int N, T1 *keys1_in, T2 *keys2_in,
-                                       T3 *vals_in, T1 *keys1_out, T2 *keys2_out,
-                                       T3 *vals_out);
+HYPRE_Int hypreDevice_ReduceByTupleKey(HYPRE_Int N, T1 *keys1_in, T2 *keys2_in, T3 *vals_in, T1 *keys1_out,
+                                       T2 *keys2_out, T3 *vals_out);
 
 template <typename T>
 HYPRE_Int hypreDevice_ScatterConstant(T *x, HYPRE_Int n, HYPRE_Int *map, T v);
 
-HYPRE_Int hypreDevice_GenScatterAdd(HYPRE_Real *x, HYPRE_Int ny, HYPRE_Int *map,
-                                    HYPRE_Real *y, char *work);
+HYPRE_Int hypreDevice_GenScatterAdd(HYPRE_Real *x, HYPRE_Int ny, HYPRE_Int *map, HYPRE_Real *y, char *work);
 
 template <typename T>
-HYPRE_Int hypreDevice_CsrRowPtrsToIndicesWithRowNum(HYPRE_Int nrows, HYPRE_Int nnz,
-                                                    HYPRE_Int *d_row_ptr, T *d_row_num, T *d_row_ind);
+HYPRE_Int hypreDevice_CsrRowPtrsToIndicesWithRowNum(HYPRE_Int nrows, HYPRE_Int nnz, HYPRE_Int *d_row_ptr,
+                                                    T *d_row_num, T *d_row_ind);
 
 #endif
 
@@ -2238,13 +1981,14 @@ cudaError_t hypre_CachingFreeDevice(void *ptr);
 cudaError_t hypre_CachingFreeManaged(void *ptr);
 #endif
 
-hypre_cub_CachingDeviceAllocator * hypre_DeviceDataCubCachingAllocatorCreate(hypre_uint bin_growth,
-                                                                             hypre_uint min_bin, hypre_uint max_bin, size_t max_cached_bytes, bool skip_cleanup, bool debug,
-                                                                             bool use_managed_memory);
+hypre_cub_CachingDeviceAllocator *
+hypre_DeviceDataCubCachingAllocatorCreate(hypre_uint bin_growth, hypre_uint min_bin, hypre_uint max_bin,
+                                          size_t max_cached_bytes, bool skip_cleanup, bool debug,
+                                          bool use_managed_memory);
 
 void hypre_DeviceDataCubCachingAllocatorDestroy(hypre_DeviceData *data);
 
-#endif // #if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
+#endif// #if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
 
 #if defined(HYPRE_USING_CUSPARSE)
 
@@ -2254,7 +1998,7 @@ cudaDataType hypre_HYPREComplexToCudaDataType();
 cusparseIndexType_t hypre_HYPREIntToCusparseIndexType();
 #endif
 
-#endif // #if defined(HYPRE_USING_CUSPARSE)
+#endif// #if defined(HYPRE_USING_CUSPARSE)
 
 #endif /* #ifndef HYPRE_CUDA_UTILS_H */
 /******************************************************************************
@@ -2272,285 +2016,207 @@ cusparseIndexType_t hypre_HYPREIntToCusparseIndexType();
 #if defined(HYPRE_USING_CUDA) || defined(HYPRE_USING_HIP)
 #if !defined(HYPRE_USING_RAJA) && !defined(HYPRE_USING_KOKKOS)
 
-template<typename T> void OneBlockReduce(T *d_arr, HYPRE_Int N, T *h_out);
+template <typename T>
+void OneBlockReduce(T *d_arr, HYPRE_Int N, T *h_out);
 
-struct HYPRE_double4
-{
-   HYPRE_Real x, y, z, w;
-
-   __host__ __device__
-   HYPRE_double4() {}
-
-   __host__ __device__
-   HYPRE_double4(HYPRE_Real x1, HYPRE_Real x2, HYPRE_Real x3, HYPRE_Real x4)
-   {
-      x = x1;
-      y = x2;
-      z = x3;
-      w = x4;
-   }
-
-   __host__ __device__
-   void operator=(HYPRE_Real val)
-   {
-      x = y = z = w = val;
-   }
-
-   __host__ __device__
-   void operator+=(HYPRE_double4 rhs)
-   {
-      x += rhs.x;
-      y += rhs.y;
-      z += rhs.z;
-      w += rhs.w;
-   }
+struct HYPRE_double4 {
+    HYPRE_Real x, y, z, w;
+
+    __host__ __device__ HYPRE_double4() {}
+
+    __host__ __device__ HYPRE_double4(HYPRE_Real x1, HYPRE_Real x2, HYPRE_Real x3, HYPRE_Real x4) {
+        x = x1;
+        y = x2;
+        z = x3;
+        w = x4;
+    }
+
+    __host__ __device__ void operator=(HYPRE_Real val) { x = y = z = w = val; }
 
+    __host__ __device__ void operator+=(HYPRE_double4 rhs) {
+        x += rhs.x;
+        y += rhs.y;
+        z += rhs.z;
+        w += rhs.w;
+    }
 };
 
-struct HYPRE_double6
-{
-   HYPRE_Real x, y, z, w, u, v;
-
-   __host__ __device__
-   HYPRE_double6() {}
-
-   __host__ __device__
-   HYPRE_double6(HYPRE_Real x1, HYPRE_Real x2, HYPRE_Real x3, HYPRE_Real x4,
-                 HYPRE_Real x5, HYPRE_Real x6)
-   {
-      x = x1;
-      y = x2;
-      z = x3;
-      w = x4;
-      u = x5;
-      v = x6;
-   }
-
-   __host__ __device__
-   void operator=(HYPRE_Real val)
-   {
-      x = y = z = w = u = v = val;
-   }
-
-   __host__ __device__
-   void operator+=(HYPRE_double6 rhs)
-   {
-      x += rhs.x;
-      y += rhs.y;
-      z += rhs.z;
-      w += rhs.w;
-      u += rhs.u;
-      v += rhs.v;
-   }
+struct HYPRE_double6 {
+    HYPRE_Real x, y, z, w, u, v;
+
+    __host__ __device__ HYPRE_double6() {}
+
+    __host__ __device__ HYPRE_double6(HYPRE_Real x1, HYPRE_Real x2, HYPRE_Real x3, HYPRE_Real x4,
+                                      HYPRE_Real x5, HYPRE_Real x6) {
+        x = x1;
+        y = x2;
+        z = x3;
+        w = x4;
+        u = x5;
+        v = x6;
+    }
+
+    __host__ __device__ void operator=(HYPRE_Real val) { x = y = z = w = u = v = val; }
 
+    __host__ __device__ void operator+=(HYPRE_double6 rhs) {
+        x += rhs.x;
+        y += rhs.y;
+        z += rhs.z;
+        w += rhs.w;
+        u += rhs.u;
+        v += rhs.v;
+    }
 };
 
 /* reduction within a warp */
-__inline__ __host__ __device__
-HYPRE_Real warpReduceSum(HYPRE_Real val)
-{
+__inline__ __host__ __device__ HYPRE_Real warpReduceSum(HYPRE_Real val) {
 #if defined(__CUDA_ARCH__) || defined(__HIP_DEVICE_COMPILE__)
-   for (HYPRE_Int offset = warpSize / 2; offset > 0; offset /= 2)
-   {
-      val += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val, offset);
-   }
+    for (HYPRE_Int offset = warpSize / 2; offset > 0; offset /= 2) {
+        val += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val, offset);
+    }
 #endif
-   return val;
+    return val;
 }
 
-__inline__ __host__ __device__
-HYPRE_double4 warpReduceSum(HYPRE_double4 val)
-{
+__inline__ __host__ __device__ HYPRE_double4 warpReduceSum(HYPRE_double4 val) {
 #if defined(__CUDA_ARCH__) || defined(__HIP_DEVICE_COMPILE__)
-   for (HYPRE_Int offset = warpSize / 2; offset > 0; offset /= 2)
-   {
-      val.x += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.x, offset);
-      val.y += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.y, offset);
-      val.z += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.z, offset);
-      val.w += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.w, offset);
-   }
+    for (HYPRE_Int offset = warpSize / 2; offset > 0; offset /= 2) {
+        val.x += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.x, offset);
+        val.y += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.y, offset);
+        val.z += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.z, offset);
+        val.w += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.w, offset);
+    }
 #endif
-   return val;
+    return val;
 }
 
-__inline__ __host__ __device__
-HYPRE_double6 warpReduceSum(HYPRE_double6 val)
-{
+__inline__ __host__ __device__ HYPRE_double6 warpReduceSum(HYPRE_double6 val) {
 #if defined(__CUDA_ARCH__) || defined(__HIP_DEVICE_COMPILE__)
-   for (HYPRE_Int offset = warpSize / 2; offset > 0; offset /= 2)
-   {
-      val.x += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.x, offset);
-      val.y += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.y, offset);
-      val.z += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.z, offset);
-      val.w += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.w, offset);
-      val.u += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.u, offset);
-      val.v += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.v, offset);
-   }
+    for (HYPRE_Int offset = warpSize / 2; offset > 0; offset /= 2) {
+        val.x += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.x, offset);
+        val.y += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.y, offset);
+        val.z += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.z, offset);
+        val.w += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.w, offset);
+        val.u += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.u, offset);
+        val.v += __shfl_down_sync(HYPRE_WARP_FULL_MASK, val.v, offset);
+    }
 #endif
-   return val;
+    return val;
 }
 
 /* reduction within a block */
 template <typename T>
-__inline__ __host__ __device__
-T blockReduceSum(T val)
-{
+__inline__ __host__ __device__ T blockReduceSum(T val) {
 #if defined(__CUDA_ARCH__) || defined(__HIP_DEVICE_COMPILE__)
-   // Shared mem for HYPRE_WARP_SIZE partial sums
-   __shared__ T shared[HYPRE_WARP_SIZE];
+    // Shared mem for HYPRE_WARP_SIZE partial sums
+    __shared__ T shared[HYPRE_WARP_SIZE];
 
-   HYPRE_Int lane = threadIdx.x & (warpSize - 1);
-   HYPRE_Int wid  = threadIdx.x >> HYPRE_WARP_BITSHIFT;
+    HYPRE_Int lane = threadIdx.x & (warpSize - 1);
+    HYPRE_Int wid = threadIdx.x >> HYPRE_WARP_BITSHIFT;
 
-   // Each warp performs partial reduction
-   val = warpReduceSum(val);
+    // Each warp performs partial reduction
+    val = warpReduceSum(val);
 
-   // Write reduced value to shared memory
-   if (lane == 0)
-   {
-      shared[wid] = val;
-   }
+    // Write reduced value to shared memory
+    if (lane == 0) { shared[wid] = val; }
 
-   // Wait for all partial reductions
-   __syncthreads();
+    // Wait for all partial reductions
+    __syncthreads();
 
-   // read from shared memory only if that warp existed
-   if (threadIdx.x < (blockDim.x >> HYPRE_WARP_BITSHIFT))
-   {
-      val = shared[lane];
-   }
-   else
-   {
-      val = 0.0;
-   }
+    // read from shared memory only if that warp existed
+    if (threadIdx.x < (blockDim.x >> HYPRE_WARP_BITSHIFT)) {
+        val = shared[lane];
+    } else {
+        val = 0.0;
+    }
 
-   // Final reduce within first warp
-   if (wid == 0)
-   {
-      val = warpReduceSum(val);
-   }
+    // Final reduce within first warp
+    if (wid == 0) { val = warpReduceSum(val); }
 
 #endif
-   return val;
+    return val;
 }
 
-template<typename T>
-__global__ void
-OneBlockReduceKernel(hypre_DeviceItem &item,
-                     T                *arr,
-                     HYPRE_Int         N)
-{
-   T sum;
+template <typename T>
+__global__ void OneBlockReduceKernel(hypre_DeviceItem &item, T *arr, HYPRE_Int N) {
+    T sum;
 
-   sum = 0.0;
+    sum = 0.0;
 
-   if (threadIdx.x < N)
-   {
-      sum = arr[threadIdx.x];
-   }
+    if (threadIdx.x < N) { sum = arr[threadIdx.x]; }
 
-   sum = blockReduceSum(sum);
+    sum = blockReduceSum(sum);
 
-   if (threadIdx.x == 0)
-   {
-      arr[0] = sum;
-   }
+    if (threadIdx.x == 0) { arr[0] = sum; }
 }
 
 /* Reducer class */
 template <typename T>
-struct ReduceSum
-{
-   using value_type = T;
+struct ReduceSum {
+    using value_type = T;
 
-   T init;                    /* initial value passed in */
-   mutable T __thread_sum;    /* place to hold local sum of a thread,
+    T init;                 /* initial value passed in */
+    mutable T __thread_sum; /* place to hold local sum of a thread,
                                  and partial sum of a block */
-   T *d_buf;                  /* place to store partial sum within blocks
+    T *d_buf;               /* place to store partial sum within blocks
                                  in the 1st round, used in the 2nd round */
-   HYPRE_Int nblocks;         /* number of blocks used in the 1st round */
+    HYPRE_Int nblocks;      /* number of blocks used in the 1st round */
 
-   /* constructor
+    /* constructor
     * val is the initial value (added to the reduced sum) */
-   __host__
-   ReduceSum(T val)
-   {
-      init = val;
-      __thread_sum = 0.0;
-      nblocks = -1;
-   }
-
-   /* copy constructor */
-   __host__ __device__
-   ReduceSum(const ReduceSum<T>& other)
-   {
-      *this = other;
-   }
-
-   __host__ void
-   Allocate2ndPhaseBuffer()
-   {
-      if (hypre_HandleReduceBuffer(hypre_handle()) == NULL)
-      {
-         /* allocate for the max size for reducing double6 type */
-         hypre_HandleReduceBuffer(hypre_handle()) =
-            hypre_TAlloc(HYPRE_double6, HYPRE_MAX_NTHREADS_BLOCK, HYPRE_MEMORY_DEVICE);
-      }
-
-      d_buf = (T*) hypre_HandleReduceBuffer(hypre_handle());
-   }
-
-   /* reduction within blocks */
-   __host__ __device__
-   void BlockReduce() const
-   {
+    __host__ ReduceSum(T val) {
+        init = val;
+        __thread_sum = 0.0;
+        nblocks = -1;
+    }
+
+    /* copy constructor */
+    __host__ __device__ ReduceSum(const ReduceSum<T> &other) { *this = other; }
+
+    __host__ void Allocate2ndPhaseBuffer() {
+        if (hypre_HandleReduceBuffer(hypre_handle()) == NULL) {
+            /* allocate for the max size for reducing double6 type */
+            hypre_HandleReduceBuffer(hypre_handle())
+                    = hypre_TAlloc(HYPRE_double6, HYPRE_MAX_NTHREADS_BLOCK, HYPRE_MEMORY_DEVICE);
+        }
+
+        d_buf = (T *) hypre_HandleReduceBuffer(hypre_handle());
+    }
+
+    /* reduction within blocks */
+    __host__ __device__ void BlockReduce() const {
 #if defined(__CUDA_ARCH__) || defined(__HIP_DEVICE_COMPILE__)
-      __thread_sum = blockReduceSum(__thread_sum);
-      if (threadIdx.x == 0)
-      {
-         d_buf[blockIdx.x] = __thread_sum;
-      }
-#endif
-   }
-
-   __host__ __device__
-   void operator+=(T val) const
-   {
-      __thread_sum += val;
-   }
-
-   /* invoke the 2nd reduction at the time want the sum from the reducer */
-   __host__
-   operator T()
-   {
-      T val;
-
-      const HYPRE_MemoryLocation memory_location = hypre_HandleMemoryLocation(hypre_handle());
-      const HYPRE_ExecutionPolicy exec_policy = hypre_GetExecPolicy1(memory_location);
-
-      if (exec_policy == HYPRE_EXEC_HOST)
-      {
-         val = __thread_sum;
-         val += init;
-      }
-      else
-      {
-         /* 2nd reduction with only *one* block */
-         hypre_assert(nblocks >= 0 && nblocks <= HYPRE_MAX_NTHREADS_BLOCK);
-         const dim3 gDim(1), bDim(HYPRE_MAX_NTHREADS_BLOCK);
-         HYPRE_GPU_LAUNCH( OneBlockReduceKernel, gDim, bDim, d_buf, nblocks );
-         hypre_TMemcpy(&val, d_buf, T, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
-         val += init;
-      }
-
-      return val;
-   }
-
-   /* destructor */
-   __host__ __device__
-   ~ReduceSum<T>()
-   {
-   }
+        __thread_sum = blockReduceSum(__thread_sum);
+        if (threadIdx.x == 0) { d_buf[blockIdx.x] = __thread_sum; }
+#endif
+    }
+
+    __host__ __device__ void operator+=(T val) const { __thread_sum += val; }
+
+    /* invoke the 2nd reduction at the time want the sum from the reducer */
+    __host__ operator T() {
+        T val;
+
+        const HYPRE_MemoryLocation memory_location = hypre_HandleMemoryLocation(hypre_handle());
+        const HYPRE_ExecutionPolicy exec_policy = hypre_GetExecPolicy1(memory_location);
+
+        if (exec_policy == HYPRE_EXEC_HOST) {
+            val = __thread_sum;
+            val += init;
+        } else {
+            /* 2nd reduction with only *one* block */
+            hypre_assert(nblocks >= 0 && nblocks <= HYPRE_MAX_NTHREADS_BLOCK);
+            const dim3 gDim(1), bDim(HYPRE_MAX_NTHREADS_BLOCK);
+            HYPRE_GPU_LAUNCH(OneBlockReduceKernel, gDim, bDim, d_buf, nblocks);
+            hypre_TMemcpy(&val, d_buf, T, 1, HYPRE_MEMORY_HOST, HYPRE_MEMORY_DEVICE);
+            val += init;
+        }
+
+        return val;
+    }
+
+    /* destructor */
+    __host__ __device__ ~ReduceSum<T>() {}
 };
 
 #endif /* #if !defined(HYPRE_USING_RAJA) && !defined(HYPRE_USING_KOKKOS) */
@@ -2594,27 +2260,27 @@ struct ReduceSum
 
 #if defined(HYPRE_USING_CUDA) && defined(HYPRE_USING_DEVICE_POOL)
 
-#include <set>
 #include <map>
+#include <set>
 
 #if (__cplusplus > 199711L) || (defined(_MSC_VER) && _MSC_VER >= 1800)
-    #include <mutex>
+#include <mutex>
 #else
-    #if defined(_WIN32) || defined(_WIN64)
-        #include <intrin.h>
+#if defined(_WIN32) || defined(_WIN64)
+#include <intrin.h>
 
-        #define WIN32_LEAN_AND_MEAN
-        #define NOMINMAX
-        #include <windows.h>
-        #undef WIN32_LEAN_AND_MEAN
-        #undef NOMINMAX
+#define WIN32_LEAN_AND_MEAN
+#define NOMINMAX
+#include <windows.h>
+#undef WIN32_LEAN_AND_MEAN
+#undef NOMINMAX
 
-        /**
+/**
          * Compiler read/write barrier
          */
-        #pragma intrinsic(_ReadWriteBarrier)
+#pragma intrinsic(_ReadWriteBarrier)
 
-    #endif
+#endif
 #endif
 
 /**
@@ -2622,98 +2288,78 @@ struct ReduceSum
  *   - Wraps std::mutex when compiled with C++11 or newer (supported on all platforms)
  *   - Uses GNU/Windows spinlock mechanisms for pre C++11 (supported on x86/x64 when compiled with cl.exe or g++)
  */
-struct hypre_cub_Mutex
-{
+struct hypre_cub_Mutex {
 #if (__cplusplus > 199711L) || (defined(_MSC_VER) && _MSC_VER >= 1800)
 
     std::mutex mtx;
 
-    void Lock()
-    {
-        mtx.lock();
-    }
+    void Lock() { mtx.lock(); }
 
-    void Unlock()
-    {
-        mtx.unlock();
-    }
+    void Unlock() { mtx.unlock(); }
 
-    void TryLock()
-    {
-        mtx.try_lock();
-    }
+    void TryLock() { mtx.try_lock(); }
 
-#else       //__cplusplus > 199711L
+#else//__cplusplus > 199711L
 
-    #if defined(_MSC_VER)
+#if defined(_MSC_VER)
 
-        // Microsoft VC++
-        typedef hypre_longint Spinlock;
+    // Microsoft VC++
+    typedef hypre_longint Spinlock;
 
-    #else
+#else
 
-        // GNU g++
-        typedef hypre_int Spinlock;
+    // GNU g++
+    typedef hypre_int Spinlock;
 
-        /**
+    /**
          * Compiler read/write barrier
          */
-        __forceinline__ void _ReadWriteBarrier()
-        {
-            __sync_synchronize();
-        }
+    __forceinline__ void _ReadWriteBarrier() { __sync_synchronize(); }
 
-        /**
+    /**
          * Atomic exchange
          */
-        __forceinline__ hypre_longint _InterlockedExchange(volatile hypre_int * const Target, const hypre_int Value)
-        {
-            // NOTE: __sync_lock_test_and_set would be an acquire barrier, so we force a full barrier
-            _ReadWriteBarrier();
-            return __sync_lock_test_and_set(Target, Value);
-        }
+    __forceinline__ hypre_longint _InterlockedExchange(volatile hypre_int *const Target,
+                                                       const hypre_int Value) {
+        // NOTE: __sync_lock_test_and_set would be an acquire barrier, so we force a full barrier
+        _ReadWriteBarrier();
+        return __sync_lock_test_and_set(Target, Value);
+    }
 
-        /**
+    /**
          * Pause instruction to prevent excess processor bus usage
          */
-        __forceinline__ void YieldProcessor()
-        {
-        }
+    __forceinline__ void YieldProcessor() {}
 
-    #endif  // defined(_MSC_VER)
+#endif// defined(_MSC_VER)
 
-        /// Lock member
-        volatile Spinlock lock;
+    /// Lock member
+    volatile Spinlock lock;
 
-        /**
+    /**
          * Constructor
          */
-        hypre_cub_Mutex() : lock(0) {}
+    hypre_cub_Mutex() : lock(0) {}
 
-        /**
+    /**
          * Return when the specified spinlock has been acquired
          */
-        __forceinline__ void Lock()
-        {
-            while (1)
-            {
-                if (!_InterlockedExchange(&lock, 1)) return;
-                while (lock) YieldProcessor();
-            }
+    __forceinline__ void Lock() {
+        while (1) {
+            if (!_InterlockedExchange(&lock, 1)) return;
+            while (lock) YieldProcessor();
         }
+    }
 
-
-        /**
+    /**
          * Release the specified spinlock
          */
-        __forceinline__ void Unlock()
-        {
-            _ReadWriteBarrier();
-            lock = 0;
-        }
-
-#endif      // __cplusplus > 199711L
+    __forceinline__ void Unlock() {
+        _ReadWriteBarrier();
+        lock = 0;
+    }
 
+#endif// __cplusplus > 199711L
 };
 
 #include <math.h>
@@ -2761,204 +2407,169 @@ struct hypre_cub_Mutex
  * and sets a maximum of 6,291,455 cached bytes per device
  *
  */
-struct hypre_cub_CachingDeviceAllocator
-{
-   typedef char value_type;
+struct hypre_cub_CachingDeviceAllocator {
+    typedef char value_type;
 
-   //---------------------------------------------------------------------
-   // Constants
-   //---------------------------------------------------------------------
+    //---------------------------------------------------------------------
+    // Constants
+    //---------------------------------------------------------------------
 
-   /// Out-of-bounds bin
-   static const hypre_uint INVALID_BIN = (hypre_uint) -1;
+    /// Out-of-bounds bin
+    static const hypre_uint INVALID_BIN = (hypre_uint) -1;
 
-   /// Invalid size
-   static const size_t INVALID_SIZE = (size_t) -1;
+    /// Invalid size
+    static const size_t INVALID_SIZE = (size_t) -1;
 
-   /// Invalid device ordinal
-   static const hypre_int INVALID_DEVICE_ORDINAL = -1;
+    /// Invalid device ordinal
+    static const hypre_int INVALID_DEVICE_ORDINAL = -1;
 
-   //---------------------------------------------------------------------
-   // Type definitions and helper types
-   //---------------------------------------------------------------------
+    //---------------------------------------------------------------------
+    // Type definitions and helper types
+    //---------------------------------------------------------------------
 
-   /**
+    /**
     * Descriptor for device memory allocations
     */
-   struct BlockDescriptor
-   {
-      void*           d_ptr;              // Device pointer
-      size_t          bytes;              // Size of allocation in bytes
-      hypre_uint      bin;                // Bin enumeration
-      hypre_int       device;             // device ordinal
-      cudaStream_t    associated_stream;  // Associated associated_stream
-      cudaEvent_t     ready_event;        // Signal when associated stream has run to the point at which this block was freed
-
-      // Constructor (suitable for searching maps for a specific block, given its pointer and device)
-      BlockDescriptor(void *d_ptr, hypre_int device) :
-         d_ptr(d_ptr),
-         bytes(0),
-         bin(INVALID_BIN),
-         device(device),
-         associated_stream(0),
-         ready_event(0)
-      {}
-
-      // Constructor (suitable for searching maps for a range of suitable blocks, given a device)
-      BlockDescriptor(hypre_int device) :
-         d_ptr(NULL),
-         bytes(0),
-         bin(INVALID_BIN),
-         device(device),
-         associated_stream(0),
-         ready_event(0)
-      {}
-
-      // Comparison functor for comparing device pointers
-      static bool PtrCompare(const BlockDescriptor &a, const BlockDescriptor &b)
-      {
-         if (a.device == b.device)
-            return (a.d_ptr < b.d_ptr);
-         else
-            return (a.device < b.device);
-      }
-
-      // Comparison functor for comparing allocation sizes
-      static bool SizeCompare(const BlockDescriptor &a, const BlockDescriptor &b)
-      {
-         if (a.device == b.device)
-            return (a.bytes < b.bytes);
-         else
-            return (a.device < b.device);
-      }
-   };
-
-   /// BlockDescriptor comparator function interface
-   typedef bool (*Compare)(const BlockDescriptor &, const BlockDescriptor &);
-
-   class TotalBytes {
-      public:
-         size_t free;
-         size_t live;
-         TotalBytes() { free = live = 0; }
-   };
-
-   /// Set type for cached blocks (ordered by size)
-   typedef std::multiset<BlockDescriptor, Compare> CachedBlocks;
-
-   /// Set type for live blocks (ordered by ptr)
-   typedef std::multiset<BlockDescriptor, Compare> BusyBlocks;
-
-   /// Map type of device ordinals to the number of cached bytes cached by each device
-   typedef std::map<hypre_int, TotalBytes> GpuCachedBytes;
-
-
-   //---------------------------------------------------------------------
-   // Utility functions
-   //---------------------------------------------------------------------
-
-   /**
+    struct BlockDescriptor {
+        void *d_ptr;                   // Device pointer
+        size_t bytes;                  // Size of allocation in bytes
+        hypre_uint bin;                // Bin enumeration
+        hypre_int device;              // device ordinal
+        cudaStream_t associated_stream;// Associated associated_stream
+        cudaEvent_t
+                ready_event;// Signal when associated stream has run to the point at which this block was freed
+
+        // Constructor (suitable for searching maps for a specific block, given its pointer and device)
+        BlockDescriptor(void *d_ptr, hypre_int device)
+            : d_ptr(d_ptr), bytes(0), bin(INVALID_BIN), device(device), associated_stream(0), ready_event(0) {
+        }
+
+        // Constructor (suitable for searching maps for a range of suitable blocks, given a device)
+        BlockDescriptor(hypre_int device)
+            : d_ptr(NULL), bytes(0), bin(INVALID_BIN), device(device), associated_stream(0), ready_event(0) {}
+
+        // Comparison functor for comparing device pointers
+        static bool PtrCompare(const BlockDescriptor &a, const BlockDescriptor &b) {
+            if (a.device == b.device) return (a.d_ptr < b.d_ptr);
+            else
+                return (a.device < b.device);
+        }
+
+        // Comparison functor for comparing allocation sizes
+        static bool SizeCompare(const BlockDescriptor &a, const BlockDescriptor &b) {
+            if (a.device == b.device) return (a.bytes < b.bytes);
+            else
+                return (a.device < b.device);
+        }
+    };
+
+    /// BlockDescriptor comparator function interface
+    typedef bool (*Compare)(const BlockDescriptor &, const BlockDescriptor &);
+
+    class TotalBytes {
+    public:
+        size_t free;
+        size_t live;
+        TotalBytes() { free = live = 0; }
+    };
+
+    /// Set type for cached blocks (ordered by size)
+    typedef std::multiset<BlockDescriptor, Compare> CachedBlocks;
+
+    /// Set type for live blocks (ordered by ptr)
+    typedef std::multiset<BlockDescriptor, Compare> BusyBlocks;
+
+    /// Map type of device ordinals to the number of cached bytes cached by each device
+    typedef std::map<hypre_int, TotalBytes> GpuCachedBytes;
+
+    //---------------------------------------------------------------------
+    // Utility functions
+    //---------------------------------------------------------------------
+
+    /**
     * Integer pow function for unsigned base and exponent
     */
-   static hypre_uint IntPow(
-         hypre_uint base,
-         hypre_uint exp)
-   {
-      hypre_uint retval = 1;
-      while (exp > 0)
-      {
-         if (exp & 1) {
-            retval = retval * base;        // multiply the result by the current base
-         }
-         base = base * base;                // square the base
-         exp = exp >> 1;                    // divide the exponent in half
-      }
-      return retval;
-   }
-
-
-   /**
+    static hypre_uint IntPow(hypre_uint base, hypre_uint exp) {
+        hypre_uint retval = 1;
+        while (exp > 0) {
+            if (exp & 1) {
+                retval = retval * base;// multiply the result by the current base
+            }
+            base = base * base;// square the base
+            exp = exp >> 1;    // divide the exponent in half
+        }
+        return retval;
+    }
+
+    /**
     * Round up to the nearest power-of
     */
-   void NearestPowerOf(
-         hypre_uint      &power,
-         size_t          &rounded_bytes,
-         hypre_uint       base,
-         size_t           value)
-   {
-      power = 0;
-      rounded_bytes = 1;
-
-      if (value * base < value)
-      {
-         // Overflow
-         power = sizeof(size_t) * 8;
-         rounded_bytes = size_t(0) - 1;
-         return;
-      }
-
-      while (rounded_bytes < value)
-      {
-         rounded_bytes *= base;
-         power++;
-      }
-   }
-
-
-   //---------------------------------------------------------------------
-   // Fields
-   //---------------------------------------------------------------------
-
-   hypre_cub_Mutex mutex;              /// Mutex for thread-safety
-
-   hypre_uint      bin_growth;         /// Geometric growth factor for bin-sizes
-   hypre_uint      min_bin;            /// Minimum bin enumeration
-   hypre_uint      max_bin;            /// Maximum bin enumeration
-
-   size_t          min_bin_bytes;      /// Minimum bin size
-   size_t          max_bin_bytes;      /// Maximum bin size
-   size_t          max_cached_bytes;   /// Maximum aggregate cached bytes per device
-
-   const bool      skip_cleanup;       /// Whether or not to skip a call to FreeAllCached() when destructor is called.  (The CUDA runtime may have already shut down for statically declared allocators)
-   bool            debug;              /// Whether or not to print (de)allocation events to stdout
-
-   GpuCachedBytes  cached_bytes;       /// Map of device ordinal to aggregate cached bytes on that device
-   CachedBlocks    cached_blocks;      /// Set of cached device allocations available for reuse
-   BusyBlocks      live_blocks;        /// Set of live device allocations currently in use
-
-   bool            use_managed_memory; /// Whether to use managed memory or device memory
-
-   //---------------------------------------------------------------------
-   // Methods
-   //---------------------------------------------------------------------
-
-   /**
+    void NearestPowerOf(hypre_uint &power, size_t &rounded_bytes, hypre_uint base, size_t value) {
+        power = 0;
+        rounded_bytes = 1;
+
+        if (value * base < value) {
+            // Overflow
+            power = sizeof(size_t) * 8;
+            rounded_bytes = size_t(0) - 1;
+            return;
+        }
+
+        while (rounded_bytes < value) {
+            rounded_bytes *= base;
+            power++;
+        }
+    }
+
+    //---------------------------------------------------------------------
+    // Fields
+    //---------------------------------------------------------------------
+
+    hypre_cub_Mutex mutex;/// Mutex for thread-safety
+
+    hypre_uint bin_growth;/// Geometric growth factor for bin-sizes
+    hypre_uint min_bin;   /// Minimum bin enumeration
+    hypre_uint max_bin;   /// Maximum bin enumeration
+
+    size_t min_bin_bytes;   /// Minimum bin size
+    size_t max_bin_bytes;   /// Maximum bin size
+    size_t max_cached_bytes;/// Maximum aggregate cached bytes per device
+
+    const bool
+            skip_cleanup;/// Whether or not to skip a call to FreeAllCached() when destructor is called.  (The CUDA runtime may have already shut down for statically declared allocators)
+    bool debug;          /// Whether or not to print (de)allocation events to stdout
+
+    GpuCachedBytes cached_bytes;/// Map of device ordinal to aggregate cached bytes on that device
+    CachedBlocks cached_blocks; /// Set of cached device allocations available for reuse
+    BusyBlocks live_blocks;     /// Set of live device allocations currently in use
+
+    bool use_managed_memory;/// Whether to use managed memory or device memory
+
+    //---------------------------------------------------------------------
+    // Methods
+    //---------------------------------------------------------------------
+
+    /**
     * \brief Constructor.
     */
-   hypre_cub_CachingDeviceAllocator(
-         hypre_uint      bin_growth,                             ///< Geometric growth factor for bin-sizes
-         hypre_uint      min_bin             = 1,                ///< Minimum bin (default is bin_growth ^ 1)
-         hypre_uint      max_bin             = INVALID_BIN,      ///< Maximum bin (default is no max bin)
-         size_t          max_cached_bytes    = INVALID_SIZE,     ///< Maximum aggregate cached bytes per device (default is no limit)
-         bool            skip_cleanup        = false,            ///< Whether or not to skip a call to \p FreeAllCached() when the destructor is called (default is to deallocate)
-         bool            debug               = false,            ///< Whether or not to print (de)allocation events to stdout (default is no stderr output)
-         bool            use_managed_memory  = false)            ///< Whether to use managed memory or device memory
-      :
-         bin_growth(bin_growth),
-         min_bin(min_bin),
-         max_bin(max_bin),
-         min_bin_bytes(IntPow(bin_growth, min_bin)),
-         max_bin_bytes(IntPow(bin_growth, max_bin)),
-         max_cached_bytes(max_cached_bytes),
-         skip_cleanup(skip_cleanup),
-         debug(debug),
-         use_managed_memory(use_managed_memory),
-         cached_blocks(BlockDescriptor::SizeCompare),
-         live_blocks(BlockDescriptor::PtrCompare)
-   {}
-
-
-   /**
+    hypre_cub_CachingDeviceAllocator(
+            hypre_uint bin_growth,           ///< Geometric growth factor for bin-sizes
+            hypre_uint min_bin = 1,          ///< Minimum bin (default is bin_growth ^ 1)
+            hypre_uint max_bin = INVALID_BIN,///< Maximum bin (default is no max bin)
+            size_t max_cached_bytes
+            = INVALID_SIZE,///< Maximum aggregate cached bytes per device (default is no limit)
+            bool skip_cleanup
+            = false,///< Whether or not to skip a call to \p FreeAllCached() when the destructor is called (default is to deallocate)
+            bool debug
+            = false,///< Whether or not to print (de)allocation events to stdout (default is no stderr output)
+            bool use_managed_memory = false)///< Whether to use managed memory or device memory
+        : bin_growth(bin_growth), min_bin(min_bin), max_bin(max_bin),
+          min_bin_bytes(IntPow(bin_growth, min_bin)), max_bin_bytes(IntPow(bin_growth, max_bin)),
+          max_cached_bytes(max_cached_bytes), skip_cleanup(skip_cleanup), debug(debug),
+          use_managed_memory(use_managed_memory), cached_blocks(BlockDescriptor::SizeCompare),
+          live_blocks(BlockDescriptor::PtrCompare) {}
+
+    /**
     * \brief Default constructor.
     *
     * Configured with:
@@ -2971,435 +2582,391 @@ struct hypre_cub_CachingDeviceAllocator
     * which delineates five bin-sizes: 512B, 4KB, 32KB, 256KB, and 2MB and
     * sets a maximum of 6,291,455 cached bytes per device
     */
-   hypre_cub_CachingDeviceAllocator(
-         bool skip_cleanup = false,
-         bool debug = false,
-         bool use_managed_memory = false)
-      :
-         bin_growth(8),
-         min_bin(3),
-         max_bin(7),
-         min_bin_bytes(IntPow(bin_growth, min_bin)),
-         max_bin_bytes(IntPow(bin_growth, max_bin)),
-         max_cached_bytes((max_bin_bytes * 3) - 1),
-         skip_cleanup(skip_cleanup),
-         debug(debug),
-         use_managed_memory(use_managed_memory),
-         cached_blocks(BlockDescriptor::SizeCompare),
-         live_blocks(BlockDescriptor::PtrCompare)
-   {}
-
-
-   /**
+    hypre_cub_CachingDeviceAllocator(bool skip_cleanup = false, bool debug = false,
+                                     bool use_managed_memory = false)
+        : bin_growth(8), min_bin(3), max_bin(7), min_bin_bytes(IntPow(bin_growth, min_bin)),
+          max_bin_bytes(IntPow(bin_growth, max_bin)), max_cached_bytes((max_bin_bytes * 3) - 1),
+          skip_cleanup(skip_cleanup), debug(debug), use_managed_memory(use_managed_memory),
+          cached_blocks(BlockDescriptor::SizeCompare), live_blocks(BlockDescriptor::PtrCompare) {}
+
+    /**
     * \brief Sets the limit on the number bytes this allocator is allowed to cache per device.
     *
     * Changing the ceiling of cached bytes does not cause any allocations (in-use or
     * cached-in-reserve) to be freed.  See \p FreeAllCached().
     */
-   cudaError_t SetMaxCachedBytes(
-         size_t max_cached_bytes)
-   {
-      // Lock
-      mutex.Lock();
+    cudaError_t SetMaxCachedBytes(size_t max_cached_bytes) {
+        // Lock
+        mutex.Lock();
 
-      if (debug) printf("Changing max_cached_bytes (%zu -> %zu)\n", this->max_cached_bytes, max_cached_bytes);
+        if (debug)
+            printf("Changing max_cached_bytes (%zu -> %zu)\n", this->max_cached_bytes, max_cached_bytes);
 
-      this->max_cached_bytes = max_cached_bytes;
+        this->max_cached_bytes = max_cached_bytes;
 
-      // Unlock
-      mutex.Unlock();
-
-      return cudaSuccess;
-   }
+        // Unlock
+        mutex.Unlock();
 
+        return cudaSuccess;
+    }
 
-   /**
+    /**
     * \brief Provides a suitable allocation of device memory for the given size on the specified device.
     *
     * Once freed, the allocation becomes available immediately for reuse within the \p active_stream
     * with which it was associated with during allocation, and it becomes available for reuse within other
     * streams when all prior work submitted to \p active_stream has completed.
     */
-   cudaError_t DeviceAllocate(
-         hypre_int       device,             ///< [in] Device on which to place the allocation
-         void            **d_ptr,            ///< [out] Reference to pointer to the allocation
-         size_t          bytes,              ///< [in] Minimum number of bytes for the allocation
-         cudaStream_t    active_stream = 0)  ///< [in] The stream to be associated with this allocation
-   {
-      *d_ptr                          = NULL;
-      hypre_int entrypoint_device     = INVALID_DEVICE_ORDINAL;
-      cudaError_t error               = cudaSuccess;
-
-      if (device == INVALID_DEVICE_ORDINAL)
-      {
-         if ((error = cudaGetDevice(&entrypoint_device))) return error;
-         device = entrypoint_device;
-      }
-
-      // Create a block descriptor for the requested allocation
-      bool found = false;
-      BlockDescriptor search_key(device);
-      search_key.associated_stream = active_stream;
-      NearestPowerOf(search_key.bin, search_key.bytes, bin_growth, bytes);
-
-      if (search_key.bin > max_bin)
-      {
-         // Bin is greater than our maximum bin: allocate the request
-         // exactly and give out-of-bounds bin.  It will not be cached
-         // for reuse when returned.
-         search_key.bin      = INVALID_BIN;
-         search_key.bytes    = bytes;
-      }
-      else
-      {
-         // Search for a suitable cached allocation: lock
-         mutex.Lock();
-
-         if (search_key.bin < min_bin)
-         {
-            // Bin is less than minimum bin: round up
-            search_key.bin      = min_bin;
-            search_key.bytes    = min_bin_bytes;
-         }
-
-         // Iterate through the range of cached blocks on the same device in the same bin
-         CachedBlocks::iterator block_itr = cached_blocks.lower_bound(search_key);
-         while ((block_itr != cached_blocks.end())
-               && (block_itr->device == device)
-               && (block_itr->bin == search_key.bin))
-         {
-            // To prevent races with reusing blocks returned by the host but still
-            // in use by the device, only consider cached blocks that are
-            // either (from the active stream) or (from an idle stream)
-            if ((active_stream == block_itr->associated_stream) ||
-                  (cudaEventQuery(block_itr->ready_event) != cudaErrorNotReady))
-            {
-               // Reuse existing cache block.  Insert into live blocks.
-               found = true;
-               search_key = *block_itr;
-               search_key.associated_stream = active_stream;
-               live_blocks.insert(search_key);
-
-               // Remove from free blocks
-               cached_bytes[device].free -= search_key.bytes;
-               cached_bytes[device].live += search_key.bytes;
-
-               if (debug) printf("\tDevice %d reused cached block at %p (%zu bytes) for stream %p (previously associated with stream %p).\n",
-                     device, search_key.d_ptr, search_key.bytes, search_key.associated_stream, block_itr->associated_stream);
-
-               cached_blocks.erase(block_itr);
-
-               break;
-            }
-            block_itr++;
-         }
-
-         // Done searching: unlock
-         mutex.Unlock();
-      }
-
-      // Allocate the block if necessary
-      if (!found)
-      {
-         // Set runtime's current device to specified device (entrypoint may not be set)
-         if (device != entrypoint_device)
-         {
+    cudaError_t DeviceAllocate(hypre_int device,///< [in] Device on which to place the allocation
+                               void **d_ptr,    ///< [out] Reference to pointer to the allocation
+                               size_t bytes,    ///< [in] Minimum number of bytes for the allocation
+                               cudaStream_t active_stream
+                               = 0)///< [in] The stream to be associated with this allocation
+    {
+        *d_ptr = NULL;
+        hypre_int entrypoint_device = INVALID_DEVICE_ORDINAL;
+        cudaError_t error = cudaSuccess;
+
+        if (device == INVALID_DEVICE_ORDINAL) {
             if ((error = cudaGetDevice(&entrypoint_device))) return error;
-            if ((error = cudaSetDevice(device))) return error;
-         }
-
-         // Attempt to allocate
-
-         if (use_managed_memory)
-         {
-            error = cudaMallocManaged(&search_key.d_ptr, search_key.bytes);
-         }
-         else
-         {
-            error = cudaMalloc(&search_key.d_ptr, search_key.bytes);
-         }
-         if ((error) == cudaErrorMemoryAllocation)
-         {
-            // The allocation attempt failed: free all cached blocks on device and retry
-            if (debug) printf("\tDevice %d failed to allocate %zu bytes for stream %p, retrying after freeing cached allocations",
-                  device, search_key.bytes, search_key.associated_stream);
-
-            error = cudaSuccess;    // Reset the error we will return
-            cudaGetLastError();     // Reset CUDART's error
-
-            // Lock
-            mutex.Lock();
+            device = entrypoint_device;
+        }
 
-            // Iterate the range of free blocks on the same device
-            BlockDescriptor free_key(device);
-            CachedBlocks::iterator block_itr = cached_blocks.lower_bound(free_key);
+        // Create a block descriptor for the requested allocation
+        bool found = false;
+        BlockDescriptor search_key(device);
+        search_key.associated_stream = active_stream;
+        NearestPowerOf(search_key.bin, search_key.bytes, bin_growth, bytes);
+
+        if (search_key.bin > max_bin) {
+            // Bin is greater than our maximum bin: allocate the request
+            // exactly and give out-of-bounds bin.  It will not be cached
+            // for reuse when returned.
+            search_key.bin = INVALID_BIN;
+            search_key.bytes = bytes;
+        } else {
+            // Search for a suitable cached allocation: lock
+            mutex.Lock();
 
-            while ((block_itr != cached_blocks.end()) && (block_itr->device == device))
-            {
-               // No need to worry about synchronization with the device: cudaFree is
-               // blocking and will synchronize across all kernels executing
-               // on the current device
+            if (search_key.bin < min_bin) {
+                // Bin is less than minimum bin: round up
+                search_key.bin = min_bin;
+                search_key.bytes = min_bin_bytes;
+            }
 
-               // Free device memory and destroy stream event.
-               if ((error = cudaFree(block_itr->d_ptr))) break;
-               if ((error = cudaEventDestroy(block_itr->ready_event))) break;
+            // Iterate through the range of cached blocks on the same device in the same bin
+            CachedBlocks::iterator block_itr = cached_blocks.lower_bound(search_key);
+            while ((block_itr != cached_blocks.end()) && (block_itr->device == device)
+                   && (block_itr->bin == search_key.bin)) {
+                // To prevent races with reusing blocks returned by the host but still
+                // in use by the device, only consider cached blocks that are
+                // either (from the active stream) or (from an idle stream)
+                if ((active_stream == block_itr->associated_stream)
+                    || (cudaEventQuery(block_itr->ready_event) != cudaErrorNotReady)) {
+                    // Reuse existing cache block.  Insert into live blocks.
+                    found = true;
+                    search_key = *block_itr;
+                    search_key.associated_stream = active_stream;
+                    live_blocks.insert(search_key);
+
+                    // Remove from free blocks
+                    cached_bytes[device].free -= search_key.bytes;
+                    cached_bytes[device].live += search_key.bytes;
+
+                    if (debug)
+                        printf("\tDevice %d reused cached block at %p (%zu bytes) for stream %p (previously "
+                               "associated with stream %p).\n",
+                               device, search_key.d_ptr, search_key.bytes, search_key.associated_stream,
+                               block_itr->associated_stream);
+
+                    cached_blocks.erase(block_itr);
+
+                    break;
+                }
+                block_itr++;
+            }
 
-               // Reduce balance and erase entry
-               cached_bytes[device].free -= block_itr->bytes;
+            // Done searching: unlock
+            mutex.Unlock();
+        }
 
-               if (debug) printf("\tDevice %d freed %zu bytes.\n\t\t  %zu available blocks cached (%zu bytes), %zu live blocks (%zu bytes) outstanding.\n",
-                     device, block_itr->bytes, cached_blocks.size(), cached_bytes[device].free, live_blocks.size(), cached_bytes[device].live);
+        // Allocate the block if necessary
+        if (!found) {
+            // Set runtime's current device to specified device (entrypoint may not be set)
+            if (device != entrypoint_device) {
+                if ((error = cudaGetDevice(&entrypoint_device))) return error;
+                if ((error = cudaSetDevice(device))) return error;
+            }
 
-               cached_blocks.erase(block_itr);
+            // Attempt to allocate
 
-               block_itr++;
+            if (use_managed_memory) {
+                error = cudaMallocManaged(&search_key.d_ptr, search_key.bytes);
+            } else {
+                error = cudaMalloc(&search_key.d_ptr, search_key.bytes);
             }
+            if ((error) == cudaErrorMemoryAllocation) {
+                // The allocation attempt failed: free all cached blocks on device and retry
+                if (debug)
+                    printf("\tDevice %d failed to allocate %zu bytes for stream %p, retrying after freeing "
+                           "cached allocations",
+                           device, search_key.bytes, search_key.associated_stream);
 
-            // Unlock
-            mutex.Unlock();
+                error = cudaSuccess;// Reset the error we will return
+                cudaGetLastError(); // Reset CUDART's error
 
-            // Return under error
-            if (error) return error;
+                // Lock
+                mutex.Lock();
 
-            // Try to allocate again
+                // Iterate the range of free blocks on the same device
+                BlockDescriptor free_key(device);
+                CachedBlocks::iterator block_itr = cached_blocks.lower_bound(free_key);
 
-            if (use_managed_memory)
-            {
-               error = cudaMallocManaged(&search_key.d_ptr, search_key.bytes);
-            }
-            else
-            {
-               error = cudaMalloc(&search_key.d_ptr, search_key.bytes);
-            }
-            if ((error)) return error;
-         }
+                while ((block_itr != cached_blocks.end()) && (block_itr->device == device)) {
+                    // No need to worry about synchronization with the device: cudaFree is
+                    // blocking and will synchronize across all kernels executing
+                    // on the current device
 
-         // Create ready event
-         if ((error = cudaEventCreateWithFlags(&search_key.ready_event, cudaEventDisableTiming)))
-            return error;
+                    // Free device memory and destroy stream event.
+                    if ((error = cudaFree(block_itr->d_ptr))) break;
+                    if ((error = cudaEventDestroy(block_itr->ready_event))) break;
 
-         // Insert into live blocks
-         mutex.Lock();
-         live_blocks.insert(search_key);
-         cached_bytes[device].live += search_key.bytes;
-         mutex.Unlock();
+                    // Reduce balance and erase entry
+                    cached_bytes[device].free -= block_itr->bytes;
 
-         if (debug) printf("\tDevice %d allocated new device block at %p (%zu bytes associated with stream %p).\n",
-               device, search_key.d_ptr, search_key.bytes, search_key.associated_stream);
+                    if (debug)
+                        printf("\tDevice %d freed %zu bytes.\n\t\t  %zu available blocks cached (%zu bytes), "
+                               "%zu live blocks (%zu bytes) outstanding.\n",
+                               device, block_itr->bytes, cached_blocks.size(), cached_bytes[device].free,
+                               live_blocks.size(), cached_bytes[device].live);
 
-         // Attempt to revert back to previous device if necessary
-         if ((entrypoint_device != INVALID_DEVICE_ORDINAL) && (entrypoint_device != device))
-         {
-            if ((error = cudaSetDevice(entrypoint_device))) return error;
-         }
-      }
+                    cached_blocks.erase(block_itr);
+
+                    block_itr++;
+                }
 
-      // Copy device pointer to output parameter
-      *d_ptr = search_key.d_ptr;
+                // Unlock
+                mutex.Unlock();
 
-      if (debug) printf("\t\t%zu available blocks cached (%zu bytes), %zu live blocks outstanding(%zu bytes).\n",
-            cached_blocks.size(), cached_bytes[device].free, live_blocks.size(), cached_bytes[device].live);
+                // Return under error
+                if (error) return error;
 
-      return error;
-   }
+                // Try to allocate again
 
+                if (use_managed_memory) {
+                    error = cudaMallocManaged(&search_key.d_ptr, search_key.bytes);
+                } else {
+                    error = cudaMalloc(&search_key.d_ptr, search_key.bytes);
+                }
+                if ((error)) return error;
+            }
 
-   /**
+            // Create ready event
+            if ((error = cudaEventCreateWithFlags(&search_key.ready_event, cudaEventDisableTiming)))
+                return error;
+
+            // Insert into live blocks
+            mutex.Lock();
+            live_blocks.insert(search_key);
+            cached_bytes[device].live += search_key.bytes;
+            mutex.Unlock();
+
+            if (debug)
+                printf("\tDevice %d allocated new device block at %p (%zu bytes associated with stream "
+                       "%p).\n",
+                       device, search_key.d_ptr, search_key.bytes, search_key.associated_stream);
+
+            // Attempt to revert back to previous device if necessary
+            if ((entrypoint_device != INVALID_DEVICE_ORDINAL) && (entrypoint_device != device)) {
+                if ((error = cudaSetDevice(entrypoint_device))) return error;
+            }
+        }
+
+        // Copy device pointer to output parameter
+        *d_ptr = search_key.d_ptr;
+
+        if (debug)
+            printf("\t\t%zu available blocks cached (%zu bytes), %zu live blocks outstanding(%zu bytes).\n",
+                   cached_blocks.size(), cached_bytes[device].free, live_blocks.size(),
+                   cached_bytes[device].live);
+
+        return error;
+    }
+
+    /**
     * \brief Provides a suitable allocation of device memory for the given size on the current device.
     *
     * Once freed, the allocation becomes available immediately for reuse within the \p active_stream
     * with which it was associated with during allocation, and it becomes available for reuse within other
     * streams when all prior work submitted to \p active_stream has completed.
     */
-   cudaError_t DeviceAllocate(
-         void            **d_ptr,            ///< [out] Reference to pointer to the allocation
-         size_t          bytes,              ///< [in] Minimum number of bytes for the allocation
-         cudaStream_t    active_stream = 0)  ///< [in] The stream to be associated with this allocation
-   {
-      return DeviceAllocate(INVALID_DEVICE_ORDINAL, d_ptr, bytes, active_stream);
-   }
-
-   char * allocate(size_t bytes)
-   {
-      char *ptr;
-      DeviceAllocate((void **) &ptr, bytes);
+    cudaError_t DeviceAllocate(void **d_ptr,///< [out] Reference to pointer to the allocation
+                               size_t bytes,///< [in] Minimum number of bytes for the allocation
+                               cudaStream_t active_stream
+                               = 0)///< [in] The stream to be associated with this allocation
+    {
+        return DeviceAllocate(INVALID_DEVICE_ORDINAL, d_ptr, bytes, active_stream);
+    }
 
-      return ptr;
-   }
+    char *allocate(size_t bytes) {
+        char *ptr;
+        DeviceAllocate((void **) &ptr, bytes);
 
+        return ptr;
+    }
 
-   /**
+    /**
     * \brief Frees a live allocation of device memory on the specified device, returning it to the allocator.
     *
     * Once freed, the allocation becomes available immediately for reuse within the \p active_stream
     * with which it was associated with during allocation, and it becomes available for reuse within other
     * streams when all prior work submitted to \p active_stream has completed.
     */
-   cudaError_t DeviceFree(
-         hypre_int       device,
-         void*           d_ptr)
-   {
-      hypre_int entrypoint_device     = INVALID_DEVICE_ORDINAL;
-      cudaError_t error               = cudaSuccess;
-
-      if (device == INVALID_DEVICE_ORDINAL)
-      {
-         if ((error = cudaGetDevice(&entrypoint_device)))
-            return error;
-         device = entrypoint_device;
-      }
-
-      // Lock
-      mutex.Lock();
-
-      // Find corresponding block descriptor
-      bool recached = false;
-      BlockDescriptor search_key(d_ptr, device);
-      BusyBlocks::iterator block_itr = live_blocks.find(search_key);
-      if (block_itr != live_blocks.end())
-      {
-         // Remove from live blocks
-         search_key = *block_itr;
-         live_blocks.erase(block_itr);
-         cached_bytes[device].live -= search_key.bytes;
-
-         // Keep the returned allocation if bin is valid and we won't exceed the max cached threshold
-         if ((search_key.bin != INVALID_BIN) && (cached_bytes[device].free + search_key.bytes <= max_cached_bytes))
-         {
-            // Insert returned allocation into free blocks
-            recached = true;
-            cached_blocks.insert(search_key);
-            cached_bytes[device].free += search_key.bytes;
-
-            if (debug) printf("\tDevice %d returned %zu bytes from associated stream %p.\n\t\t %zu available blocks cached (%zu bytes), %zu live blocks outstanding. (%zu bytes)\n",
-                  device, search_key.bytes, search_key.associated_stream, cached_blocks.size(),
-                  cached_bytes[device].free, live_blocks.size(), cached_bytes[device].live);
-         }
-      }
-
-      // Unlock
-      mutex.Unlock();
-
-      // First set to specified device (entrypoint may not be set)
-      if (device != entrypoint_device)
-      {
-         if ((error = cudaGetDevice(&entrypoint_device))) return error;
-         if ((error = cudaSetDevice(device))) return error;
-      }
-
-      if (recached)
-      {
-         // Insert the ready event in the associated stream (must have current device set properly)
-         if ((error = cudaEventRecord(search_key.ready_event, search_key.associated_stream))) return error;
-      }
-      else
-      {
-         // Free the allocation from the runtime and cleanup the event.
-         if ((error = cudaFree(d_ptr))) return error;
-         if ((error = cudaEventDestroy(search_key.ready_event))) return error;
-
-         if (debug) printf("\tDevice %d freed %zu bytes from associated stream %p.\n\t\t  %zu available blocks cached (%zu bytes), %zu live blocks (%zu bytes) outstanding.\n",
-               device, search_key.bytes, search_key.associated_stream, cached_blocks.size(), cached_bytes[device].free, live_blocks.size(), cached_bytes[device].live);
-      }
-
-      // Reset device
-      if ((entrypoint_device != INVALID_DEVICE_ORDINAL) && (entrypoint_device != device))
-      {
-         if ((error = cudaSetDevice(entrypoint_device))) return error;
-      }
-
-      return error;
-   }
-
-   /**
+    cudaError_t DeviceFree(hypre_int device, void *d_ptr) {
+        hypre_int entrypoint_device = INVALID_DEVICE_ORDINAL;
+        cudaError_t error = cudaSuccess;
+
+        if (device == INVALID_DEVICE_ORDINAL) {
+            if ((error = cudaGetDevice(&entrypoint_device))) return error;
+            device = entrypoint_device;
+        }
+
+        // Lock
+        mutex.Lock();
+
+        // Find corresponding block descriptor
+        bool recached = false;
+        BlockDescriptor search_key(d_ptr, device);
+        BusyBlocks::iterator block_itr = live_blocks.find(search_key);
+        if (block_itr != live_blocks.end()) {
+            // Remove from live blocks
+            search_key = *block_itr;
+            live_blocks.erase(block_itr);
+            cached_bytes[device].live -= search_key.bytes;
+
+            // Keep the returned allocation if bin is valid and we won't exceed the max cached threshold
+            if ((search_key.bin != INVALID_BIN)
+                && (cached_bytes[device].free + search_key.bytes <= max_cached_bytes)) {
+                // Insert returned allocation into free blocks
+                recached = true;
+                cached_blocks.insert(search_key);
+                cached_bytes[device].free += search_key.bytes;
+
+                if (debug)
+                    printf("\tDevice %d returned %zu bytes from associated stream %p.\n\t\t %zu available "
+                           "blocks cached (%zu bytes), %zu live blocks outstanding. (%zu bytes)\n",
+                           device, search_key.bytes, search_key.associated_stream, cached_blocks.size(),
+                           cached_bytes[device].free, live_blocks.size(), cached_bytes[device].live);
+            }
+        }
+
+        // Unlock
+        mutex.Unlock();
+
+        // First set to specified device (entrypoint may not be set)
+        if (device != entrypoint_device) {
+            if ((error = cudaGetDevice(&entrypoint_device))) return error;
+            if ((error = cudaSetDevice(device))) return error;
+        }
+
+        if (recached) {
+            // Insert the ready event in the associated stream (must have current device set properly)
+            if ((error = cudaEventRecord(search_key.ready_event, search_key.associated_stream))) return error;
+        } else {
+            // Free the allocation from the runtime and cleanup the event.
+            if ((error = cudaFree(d_ptr))) return error;
+            if ((error = cudaEventDestroy(search_key.ready_event))) return error;
+
+            if (debug)
+                printf("\tDevice %d freed %zu bytes from associated stream %p.\n\t\t  %zu available blocks "
+                       "cached (%zu bytes), %zu live blocks (%zu bytes) outstanding.\n",
+                       device, search_key.bytes, search_key.associated_stream, cached_blocks.size(),
+                       cached_bytes[device].free, live_blocks.size(), cached_bytes[device].live);
+        }
+
+        // Reset device
+        if ((entrypoint_device != INVALID_DEVICE_ORDINAL) && (entrypoint_device != device)) {
+            if ((error = cudaSetDevice(entrypoint_device))) return error;
+        }
+
+        return error;
+    }
+
+    /**
     * \brief Frees a live allocation of device memory on the current device, returning it to the allocator.
     *
     * Once freed, the allocation becomes available immediately for reuse within the \p active_stream
     * with which it was associated with during allocation, and it becomes available for reuse within other
     * streams when all prior work submitted to \p active_stream has completed.
     */
-   cudaError_t DeviceFree(
-         void*           d_ptr)
-   {
-      return DeviceFree(INVALID_DEVICE_ORDINAL, d_ptr);
-   }
-
-   void deallocate(char *ptr, size_t)
-   {
-      DeviceFree((void *) ptr);
-   }
-
-   /**
+    cudaError_t DeviceFree(void *d_ptr) { return DeviceFree(INVALID_DEVICE_ORDINAL, d_ptr); }
+
+    void deallocate(char *ptr, size_t) { DeviceFree((void *) ptr); }
+
+    /**
     * \brief Frees all cached device allocations on all devices
     */
-   cudaError_t FreeAllCached()
-   {
-      cudaError_t error           = cudaSuccess;
-      hypre_int entrypoint_device = INVALID_DEVICE_ORDINAL;
-      hypre_int current_device    = INVALID_DEVICE_ORDINAL;
-
-      mutex.Lock();
+    cudaError_t FreeAllCached() {
+        cudaError_t error = cudaSuccess;
+        hypre_int entrypoint_device = INVALID_DEVICE_ORDINAL;
+        hypre_int current_device = INVALID_DEVICE_ORDINAL;
 
-      while (!cached_blocks.empty())
-      {
-         // Get first block
-         CachedBlocks::iterator begin = cached_blocks.begin();
+        mutex.Lock();
 
-         // Get entry-point device ordinal if necessary
-         if (entrypoint_device == INVALID_DEVICE_ORDINAL)
-         {
-            if ((error = cudaGetDevice(&entrypoint_device))) break;
-         }
+        while (!cached_blocks.empty()) {
+            // Get first block
+            CachedBlocks::iterator begin = cached_blocks.begin();
 
-         // Set current device ordinal if necessary
-         if (begin->device != current_device)
-         {
-            if ((error = cudaSetDevice(begin->device))) break;
-            current_device = begin->device;
-         }
+            // Get entry-point device ordinal if necessary
+            if (entrypoint_device == INVALID_DEVICE_ORDINAL) {
+                if ((error = cudaGetDevice(&entrypoint_device))) break;
+            }
 
-         // Free device memory
-         if ((error = cudaFree(begin->d_ptr))) break;
-         if ((error = cudaEventDestroy(begin->ready_event))) break;
+            // Set current device ordinal if necessary
+            if (begin->device != current_device) {
+                if ((error = cudaSetDevice(begin->device))) break;
+                current_device = begin->device;
+            }
 
-         // Reduce balance and erase entry
-         cached_bytes[current_device].free -= begin->bytes;
+            // Free device memory
+            if ((error = cudaFree(begin->d_ptr))) break;
+            if ((error = cudaEventDestroy(begin->ready_event))) break;
 
-         if (debug) printf("\tDevice %d freed %zu bytes.\n\t\t  %zu available blocks cached (%zu bytes), %zu live blocks (%zu bytes) outstanding.\n",
-               current_device, begin->bytes, cached_blocks.size(), cached_bytes[current_device].free, live_blocks.size(), cached_bytes[current_device].live);
+            // Reduce balance and erase entry
+            cached_bytes[current_device].free -= begin->bytes;
 
-         cached_blocks.erase(begin);
-      }
+            if (debug)
+                printf("\tDevice %d freed %zu bytes.\n\t\t  %zu available blocks cached (%zu bytes), %zu "
+                       "live blocks (%zu bytes) outstanding.\n",
+                       current_device, begin->bytes, cached_blocks.size(), cached_bytes[current_device].free,
+                       live_blocks.size(), cached_bytes[current_device].live);
 
-      mutex.Unlock();
+            cached_blocks.erase(begin);
+        }
 
-      // Attempt to revert back to entry-point device if necessary
-      if (entrypoint_device != INVALID_DEVICE_ORDINAL)
-      {
-         if ((error = cudaSetDevice(entrypoint_device))) return error;
-      }
+        mutex.Unlock();
 
-      return error;
-   }
+        // Attempt to revert back to entry-point device if necessary
+        if (entrypoint_device != INVALID_DEVICE_ORDINAL) {
+            if ((error = cudaSetDevice(entrypoint_device))) return error;
+        }
 
+        return error;
+    }
 
-   /**
+    /**
     * \brief Destructor
     */
-   virtual ~hypre_cub_CachingDeviceAllocator()
-   {
-      if (!skip_cleanup)
-         FreeAllCached();
-   }
+    virtual ~hypre_cub_CachingDeviceAllocator() {
+        if (!skip_cleanup) FreeAllCached();
+    }
 };
 
-#endif // #if defined(HYPRE_USING_CUDA) && defined(HYPRE_USING_DEVICE_POOL)
-#endif // #ifndef HYPRE_CUB_ALLOCATOR_HEADER
-
+#endif// #if defined(HYPRE_USING_CUDA) && defined(HYPRE_USING_DEVICE_POOL)
+#endif// #ifndef HYPRE_CUB_ALLOCATOR_HEADER
 
 #ifdef __cplusplus
 }
 #endif
 
 #endif
-
diff --git a/external/tbb/doc/main/reference/examples/blocked_nd_range_ctad_example.cpp b/external/tbb/doc/main/reference/examples/blocked_nd_range_ctad_example.cpp
index d80d6cd9..b27f0d86 100644
--- a/external/tbb/doc/main/reference/examples/blocked_nd_range_ctad_example.cpp
+++ b/external/tbb/doc/main/reference/examples/blocked_nd_range_ctad_example.cpp
@@ -50,12 +50,12 @@ int main() {
         oneapi::tbb::blocked_nd_range nd_range1(endings);
 
         // Deduced as blocked_nd_range<int, 3>
-        oneapi::tbb::blocked_nd_range nd_range2({100, 200, 300}, /*grainsize = */10);
+        oneapi::tbb::blocked_nd_range nd_range2({100, 200, 300}, /*grainsize = */ 10);
     }
     /*end_blocked_nd_range_ctad_example_2*/
 }
 
-#else 
+#else
 // Skip
 int main() {}
 #endif
diff --git a/external/tbb/doc/main/reference/examples/custom_mutex_chmap_example.cpp b/external/tbb/doc/main/reference/examples/custom_mutex_chmap_example.cpp
index b136241a..7fb529df 100644
--- a/external/tbb/doc/main/reference/examples/custom_mutex_chmap_example.cpp
+++ b/external/tbb/doc/main/reference/examples/custom_mutex_chmap_example.cpp
@@ -33,8 +33,7 @@ class SharedMutexWrapper {
     public:
         scoped_lock() : my_mutex_ptr(nullptr), my_writer_flag(false) {}
         scoped_lock(SharedMutexWrapper& mutex, bool write = true)
-            : my_mutex_ptr(&mutex), my_writer_flag(write)
-        {
+            : my_mutex_ptr(&mutex), my_writer_flag(write) {
             if (my_writer_flag) {
                 my_mutex_ptr->my_mutex.lock();
             } else {
@@ -86,44 +85,42 @@ class SharedMutexWrapper {
 
         bool upgrade_to_writer() {
             // std::shared_mutex does not have the upgrade/downgrade semantics
-            if (my_writer_flag) return true; // Already a writer
+            if (my_writer_flag) return true;// Already a writer
 
             my_mutex_ptr->my_mutex.unlock_shared();
             my_mutex_ptr->my_mutex.lock();
-            return false; // The lock was reacquired
+            return false;// The lock was reacquired
         }
 
         bool downgrade_to_reader() {
-            if (!my_writer_flag) return true; // Already a reader
+            if (!my_writer_flag) return true;// Already a reader
 
             my_mutex_ptr->my_mutex.unlock();
             my_mutex_ptr->my_mutex.lock_shared();
             return false;
         }
 
-        bool is_writer() const {
-            return my_writer_flag;
-        }
+        bool is_writer() const { return my_writer_flag; }
 
     private:
         SharedMutexWrapper* my_mutex_ptr;
-        bool                my_writer_flag;
+        bool my_writer_flag;
     };
+
 private:
     std::shared_mutex my_mutex;
-}; // struct SharedMutexWrapper
+};// struct SharedMutexWrapper
 
 int main() {
-    using map_type = oneapi::tbb::concurrent_hash_map<int, int,
-                                                      oneapi::tbb::tbb_hash_compare<int>,
+    using map_type = oneapi::tbb::concurrent_hash_map<int, int, oneapi::tbb::tbb_hash_compare<int>,
                                                       oneapi::tbb::tbb_allocator<std::pair<const int, int>>,
                                                       SharedMutexWrapper>;
 
-    map_type map; // This object will use SharedMutexWrapper for thread safety of insert/find/erase operations
+    map_type map;// This object will use SharedMutexWrapper for thread safety of insert/find/erase operations
 }
 /*end_custom_mutex_chmap_example*/
 
-#else // C++17
+#else// C++17
 // Skip
 int main() {}
 #endif
diff --git a/external/tbb/doc/main/reference/examples/helpers_for_expressing_graphs_preview_api_example.cpp b/external/tbb/doc/main/reference/examples/helpers_for_expressing_graphs_preview_api_example.cpp
index 6b7eb414..9c8961c3 100644
--- a/external/tbb/doc/main/reference/examples/helpers_for_expressing_graphs_preview_api_example.cpp
+++ b/external/tbb/doc/main/reference/examples/helpers_for_expressing_graphs_preview_api_example.cpp
@@ -35,16 +35,13 @@ int main() {
     join_node join(follows(handlers));
 
     int sum = 0;
-    function_node summer(follows(join), serial,
-                            [&](const std::tuple<int, int, int>& v) {
-                                int sub_sum = std::get<0>(v) + std::get<1>(v) + std::get<2>(v);
-                                sum += sub_sum;
-                                return sub_sum;
-                            });
-
-    for (int i = 1; i <= 10; ++i) {
-        input.try_put(i);
-    }
+    function_node summer(follows(join), serial, [&](const std::tuple<int, int, int>& v) {
+        int sub_sum = std::get<0>(v) + std::get<1>(v) + std::get<2>(v);
+        sum += sub_sum;
+        return sub_sum;
+    });
+
+    for (int i = 1; i <= 10; ++i) { input.try_put(i); }
     g.wait_for_all();
 }
 /*end_helpers_for_expressing_graphs_preview_api_example*/
diff --git a/external/tbb/doc/main/reference/examples/helpers_for_expressing_graphs_regular_api_example.cpp b/external/tbb/doc/main/reference/examples/helpers_for_expressing_graphs_regular_api_example.cpp
index 578f6347..77bdc731 100644
--- a/external/tbb/doc/main/reference/examples/helpers_for_expressing_graphs_regular_api_example.cpp
+++ b/external/tbb/doc/main/reference/examples/helpers_for_expressing_graphs_regular_api_example.cpp
@@ -47,9 +47,7 @@ int main() {
     make_edge(cuber, std::get<2>(join.input_ports()));
     make_edge(join, summer);
 
-    for (int i = 1; i <= 10; ++i) {
-        input.try_put(i);
-    }
+    for (int i = 1; i <= 10; ++i) { input.try_put(i); }
     g.wait_for_all();
 }
 /*end_helpers_for_expressing_graphs_regular_api_example*/
diff --git a/external/tbb/doc/main/reference/examples/make_edges_function_example.cpp b/external/tbb/doc/main/reference/examples/make_edges_function_example.cpp
index d2ee0c83..28ad45b9 100644
--- a/external/tbb/doc/main/reference/examples/make_edges_function_example.cpp
+++ b/external/tbb/doc/main/reference/examples/make_edges_function_example.cpp
@@ -36,9 +36,7 @@ int main() {
     make_edges(input, handlers);
     make_edges(handlers, buffer);
 
-    for (int i = 1; i <= 10; ++i) {
-        input.try_put(i);
-    }
+    for (int i = 1; i <= 10; ++i) { input.try_put(i); }
     g.wait_for_all();
 }
 /*end_make_edges_function_example*/
diff --git a/external/tbb/doc/main/reference/examples/malloc_replacement_log_example.cpp b/external/tbb/doc/main/reference/examples/malloc_replacement_log_example.cpp
index 4c6aba83..f85b94d0 100644
--- a/external/tbb/doc/main/reference/examples/malloc_replacement_log_example.cpp
+++ b/external/tbb/doc/main/reference/examples/malloc_replacement_log_example.cpp
@@ -20,14 +20,14 @@
 #include "oneapi/tbb/tbbmalloc_proxy.h"
 #include <stdio.h>
 
-int main(){
-    char **func_replacement_log;
+int main() {
+    char** func_replacement_log;
     int func_replacement_status = TBB_malloc_replacement_log(&func_replacement_log);
 
     if (func_replacement_status != 0) {
         printf("tbbmalloc_proxy cannot replace memory allocation routines\n");
         for (char** log_string = func_replacement_log; *log_string != 0; log_string++) {
-            printf("%s\n",*log_string);
+            printf("%s\n", *log_string);
         }
     }
 
diff --git a/external/tbb/doc/main/reference/examples/memory_pool_allocator_example.cpp b/external/tbb/doc/main/reference/examples/memory_pool_allocator_example.cpp
index 9cd971b7..b3aeb4d8 100644
--- a/external/tbb/doc/main/reference/examples/memory_pool_allocator_example.cpp
+++ b/external/tbb/doc/main/reference/examples/memory_pool_allocator_example.cpp
@@ -23,7 +23,7 @@ int main() {
     oneapi::tbb::memory_pool<std::allocator<int>> my_pool;
 
     typedef oneapi::tbb::memory_pool_allocator<int> pool_allocator_t;
-    std::list<int, pool_allocator_t> my_list(pool_allocator_t{my_pool});
+    std::list<int, pool_allocator_t> my_list(pool_allocator_t {my_pool});
 
     my_list.emplace_back(1);
 }
diff --git a/external/tbb/doc/main/reference/examples/parallel_phase_example.cpp b/external/tbb/doc/main/reference/examples/parallel_phase_example.cpp
index d5228143..ab90f487 100644
--- a/external/tbb/doc/main/reference/examples/parallel_phase_example.cpp
+++ b/external/tbb/doc/main/reference/examples/parallel_phase_example.cpp
@@ -17,37 +17,28 @@
 /*begin_parallel_phase_example*/
 #define TBB_PREVIEW_PARALLEL_PHASE 1
 
-#include "oneapi/tbb/task_arena.h"
 #include "oneapi/tbb/parallel_for.h"
 #include "oneapi/tbb/parallel_sort.h"
+#include "oneapi/tbb/task_arena.h"
 
 #include <vector>
 
 int main() {
-    oneapi::tbb::task_arena ta {
-        tbb::task_arena::automatic, /*reserved_for_masters=*/1,
-        tbb::task_arena::priority::normal,
-        tbb::task_arena::leave_policy::fast
-    };
+    oneapi::tbb::task_arena ta {tbb::task_arena::automatic, /*reserved_for_masters=*/1,
+                                tbb::task_arena::priority::normal, tbb::task_arena::leave_policy::fast};
 
     std::vector<int> data(1000);
 
     {
-        oneapi::tbb::task_arena::scoped_parallel_phase phase{ta};
+        oneapi::tbb::task_arena::scoped_parallel_phase phase {ta};
         ta.execute([&data]() {
-            oneapi::tbb::parallel_for(std::size_t(0), data.size(), [&data](std::size_t i) {
-                data[i] = static_cast<int>(i*i);
-            });
+            oneapi::tbb::parallel_for(std::size_t(0), data.size(),
+                                      [&data](std::size_t i) { data[i] = static_cast<int>(i * i); });
         });
 
-        for (std::size_t i = 1; i < data.size(); ++i) {
-            data[i] += data[i-1];
-        }
-
-        ta.execute([&data]() {
-            oneapi::tbb::parallel_sort(data.begin(), data.end());
-        });
+        for (std::size_t i = 1; i < data.size(); ++i) { data[i] += data[i - 1]; }
 
+        ta.execute([&data]() { oneapi::tbb::parallel_sort(data.begin(), data.end()); });
     }
 }
 /*end_parallel_phase_example*/
diff --git a/external/tbb/doc/main/reference/examples/parallel_sort_ranges_extension_example.cpp b/external/tbb/doc/main/reference/examples/parallel_sort_ranges_extension_example.cpp
index 74a1292b..b89bb731 100644
--- a/external/tbb/doc/main/reference/examples/parallel_sort_ranges_extension_example.cpp
+++ b/external/tbb/doc/main/reference/examples/parallel_sort_ranges_extension_example.cpp
@@ -18,17 +18,15 @@
 
 /*begin_parallel_sort_ranges_extension_example*/
 #include <array>
-#include <span> // requires C++20
 #include <oneapi/tbb/parallel_sort.h>
+#include <span>// requires C++20
 
 std::span<int> get_span() {
     static std::array<int, 3> arr = {3, 2, 1};
     return std::span<int>(arr);
 }
 
-int main() {
-    tbb::parallel_sort(get_span());
-}
+int main() { tbb::parallel_sort(get_span()); }
 /*end_parallel_sort_ranges_extension_example*/
 
 #else
diff --git a/external/tbb/doc/main/reference/examples/rvalue_reduce.cpp b/external/tbb/doc/main/reference/examples/rvalue_reduce.cpp
index 330498e1..00788870 100644
--- a/external/tbb/doc/main/reference/examples/rvalue_reduce.cpp
+++ b/external/tbb/doc/main/reference/examples/rvalue_reduce.cpp
@@ -18,29 +18,29 @@
 
 /*begin_rvalue_reduce_example*/
 // C++17
-#include <oneapi/tbb/parallel_reduce.h>
 #include <oneapi/tbb/blocked_range.h>
-#include <vector>
+#include <oneapi/tbb/parallel_reduce.h>
 #include <set>
+#include <vector>
 
 int main() {
     std::vector<std::set<int>> sets;
 
-    oneapi::tbb::parallel_reduce(oneapi::tbb::blocked_range<size_t>(0, sets.size()),
-                                    std::set<int>{}, // identity element - empty set
-                                    [&](const oneapi::tbb::blocked_range<size_t>& range, std::set<int>&& value) {
-                                        for (size_t i = range.begin(); i < range.end(); ++i) {
-                                            // Having value as a non-const rvalue reference allows to efficiently
-                                            // transfer nodes from sets[i] without copying/moving the data
-                                            value.merge(std::move(sets[i]));
-                                        }
-                                        return value;
-                                    },
-                                    [&](std::set<int>&& x, std::set<int>&& y) {
-                                        x.merge(std::move(y));
-                                        return x;
-                                    }
-                                    );
+    oneapi::tbb::parallel_reduce(
+            oneapi::tbb::blocked_range<size_t>(0, sets.size()),
+            std::set<int> {},// identity element - empty set
+            [&](const oneapi::tbb::blocked_range<size_t>& range, std::set<int>&& value) {
+                for (size_t i = range.begin(); i < range.end(); ++i) {
+                    // Having value as a non-const rvalue reference allows to efficiently
+                    // transfer nodes from sets[i] without copying/moving the data
+                    value.merge(std::move(sets[i]));
+                }
+                return value;
+            },
+            [&](std::set<int>&& x, std::set<int>&& y) {
+                x.merge(std::move(y));
+                return x;
+            });
 }
 /*end_rvalue_reduce_example*/
 
diff --git a/external/tbb/doc/main/reference/examples/try_put_and_wait_example.cpp b/external/tbb/doc/main/reference/examples/try_put_and_wait_example.cpp
index d86f8e07..7f0edf0e 100644
--- a/external/tbb/doc/main/reference/examples/try_put_and_wait_example.cpp
+++ b/external/tbb/doc/main/reference/examples/try_put_and_wait_example.cpp
@@ -25,9 +25,7 @@ struct f2_body : f1_body {};
 struct f3_body : f1_body {};
 
 struct f4_body {
-    int operator()(const std::tuple<int, int>& input) {
-        return 0;
-    }
+    int operator()(const std::tuple<int, int>& input) { return 0; }
 };
 
 /*begin_try_put_and_wait_example*/
@@ -47,13 +45,13 @@ int main() {
     flow::graph g;
     flow::broadcast_node<int> start_node(g);
 
-    flow::function_node<int, int> f1(g, flow::unlimited, f1_body{});
-    flow::function_node<int, int> f2(g, flow::unlimited, f2_body{});
-    flow::function_node<int, int> f3(g, flow::unlimited, f3_body{});
+    flow::function_node<int, int> f1(g, flow::unlimited, f1_body {});
+    flow::function_node<int, int> f2(g, flow::unlimited, f2_body {});
+    flow::function_node<int, int> f3(g, flow::unlimited, f3_body {});
 
     flow::join_node<std::tuple<int, int>> join(g);
 
-    flow::function_node<std::tuple<int, int>, int> f4(g, flow::serial, f4_body{});
+    flow::function_node<std::tuple<int, int>, int> f4(g, flow::serial, f4_body {});
 
     flow::make_edge(start_node, f1);
     flow::make_edge(f1, f2);
diff --git a/external/tbb/doc/main/tbb_userguide/examples/blocked_nd_range_example.cpp b/external/tbb/doc/main/tbb_userguide/examples/blocked_nd_range_example.cpp
index 4fc1473b..47cdaebe 100644
--- a/external/tbb/doc/main/tbb_userguide/examples/blocked_nd_range_example.cpp
+++ b/external/tbb/doc/main/tbb_userguide/examples/blocked_nd_range_example.cpp
@@ -18,9 +18,9 @@
 #include "oneapi/tbb/blocked_nd_range.h"
 #include "oneapi/tbb/parallel_for.h"
 
-template<typename Features>
-float kernel3d(const Features& feature_maps, int i, int j, int k,
-               int kernel_length, int kernel_width, int kernel_height) {
+template <typename Features>
+float kernel3d(const Features& feature_maps, int i, int j, int k, int kernel_length, int kernel_width,
+               int kernel_height) {
     float result = 0.f;
 
     for (int feature_i = i; feature_i < i + kernel_length; ++feature_i)
@@ -31,31 +31,28 @@ float kernel3d(const Features& feature_maps, int i, int j, int k,
     return result;
 }
 
-template<typename Features, typename Output>
-void convolution3d(const Features& feature_maps, Output& out,
-                   int out_length, int out_width, int out_heigth,
+template <typename Features, typename Output>
+void convolution3d(const Features& feature_maps, Output& out, int out_length, int out_width, int out_heigth,
                    int kernel_length, int kernel_width, int kernel_height) {
     using range_t = oneapi::tbb::blocked_nd_range<int, 3>;
 
-    oneapi::tbb::parallel_for(
-        range_t({0, out_length}, {0, out_width}, {0, out_heigth}),
-        [&](const range_t& out_range) {
-            auto out_x = out_range.dim(0);
-            auto out_y = out_range.dim(1);
-            auto out_z = out_range.dim(2);
-
-            for (int i = out_x.begin(); i < out_x.end(); ++i)
-                for (int j = out_y.begin(); j < out_y.end(); ++j)
-                    for (int k = out_z.begin(); k < out_z.end(); ++k)
-                        out[i][j][k] = kernel3d(feature_maps, i, j, k,
-                                                kernel_length, kernel_width, kernel_height);
-        }
-    );
+    oneapi::tbb::parallel_for(range_t({0, out_length}, {0, out_width}, {0, out_heigth}),
+                              [&](const range_t& out_range) {
+                                  auto out_x = out_range.dim(0);
+                                  auto out_y = out_range.dim(1);
+                                  auto out_z = out_range.dim(2);
+
+                                  for (int i = out_x.begin(); i < out_x.end(); ++i)
+                                      for (int j = out_y.begin(); j < out_y.end(); ++j)
+                                          for (int k = out_z.begin(); k < out_z.end(); ++k)
+                                              out[i][j][k] = kernel3d(feature_maps, i, j, k, kernel_length,
+                                                                      kernel_width, kernel_height);
+                              });
 }
 /*end_blocked_nd_range_example*/
 
-#include <vector>
 #include <cassert>
+#include <vector>
 
 int main() {
     const int kernel_length = 9;
@@ -71,21 +68,21 @@ int main() {
     const int out_heigth = feature_maps_heigth - kernel_height + 1;
 
     // Initializes feature maps with 1 in each cell and out with zeros.
-    std::vector<std::vector<std::vector<float>>> feature_maps(feature_maps_length, std::vector<std::vector<float>>(feature_maps_width, std::vector<float>(feature_maps_heigth, 1.0f)));
-    std::vector<std::vector<std::vector<float>>> out(out_length, std::vector<std::vector<float>>(out_width, std::vector<float>(out_heigth, 0.f)));
+    std::vector<std::vector<std::vector<float>>> feature_maps(
+            feature_maps_length, std::vector<std::vector<float>>(
+                                         feature_maps_width, std::vector<float>(feature_maps_heigth, 1.0f)));
+    std::vector<std::vector<std::vector<float>>> out(
+            out_length, std::vector<std::vector<float>>(out_width, std::vector<float>(out_heigth, 0.f)));
 
     // 3D convolution calculates the sum of all elements in the kernel
-    convolution3d(feature_maps, out,
-                  out_length, out_width, out_heigth,
-                  kernel_length, kernel_width, kernel_height);
+    convolution3d(feature_maps, out, out_length, out_width, out_heigth, kernel_length, kernel_width,
+                  kernel_height);
 
     // Checks correctness of convolution by equality to the expected sum of elements
     float expected = float(kernel_length * kernel_height * kernel_width);
     for (auto i : out) {
         for (auto j : i) {
-            for (auto k : j) {
-                assert(k == expected && "convolution failed to calculate correctly");
-            }
+            for (auto k : j) { assert(k == expected && "convolution failed to calculate correctly"); }
         }
     }
     return 0;
diff --git a/external/tbb/doc/main/tbb_userguide/examples/flow_graph_examples.cpp b/external/tbb/doc/main/tbb_userguide/examples/flow_graph_examples.cpp
index 5c66a9c8..d41d73df 100644
--- a/external/tbb/doc/main/tbb_userguide/examples/flow_graph_examples.cpp
+++ b/external/tbb/doc/main/tbb_userguide/examples/flow_graph_examples.cpp
@@ -25,43 +25,37 @@ using namespace tbb::flow;
 //! Example shows how to set the most performant core type as the preferred one
 //! for a graph execution.
 static void flow_graph_attach_to_arena_1() {
-/*begin_attach_to_arena_1*/
+    /*begin_attach_to_arena_1*/
     std::vector<tbb::core_type_id> core_types = tbb::info::core_types();
-    tbb::task_arena arena(
-        tbb::task_arena::constraints{}.set_core_type(core_types.back())
-    );
+    tbb::task_arena arena(tbb::task_arena::constraints {}.set_core_type(core_types.back()));
 
-    arena.execute( [&]() {
+    arena.execute([&]() {
         graph g;
-        function_node< int > f( g, unlimited, []( int ) {
-             /*the most performant core type is defined as preferred.*/
-        } );
+        function_node<int> f(g, unlimited, [](int) {
+            /*the most performant core type is defined as preferred.*/
+        });
         f.try_put(1);
         g.wait_for_all();
-    } );
-/*end_attach_to_arena_1*/
+    });
+    /*end_attach_to_arena_1*/
 }
 
 //! Reattach existing graph to an arena with the most performant core type as
 //! the preferred one for a work execution.
 static void flow_graph_attach_to_arena_2() {
-/*begin_attach_to_arena_2*/
+    /*begin_attach_to_arena_2*/
     graph g;
-    function_node< int > f( g, unlimited, []( int ) {
+    function_node<int> f(g, unlimited, [](int) {
         /*the most performant core type is defined as preferred.*/
-    } );
+    });
 
     std::vector<tbb::core_type_id> core_types = tbb::info::core_types();
-    tbb::task_arena arena(
-        tbb::task_arena::constraints{}.set_core_type(core_types.back())
-    );
+    tbb::task_arena arena(tbb::task_arena::constraints {}.set_core_type(core_types.back()));
 
-    arena.execute( [&]() {
-        g.reset();
-    } );
+    arena.execute([&]() { g.reset(); });
     f.try_put(1);
     g.wait_for_all();
-/*end_attach_to_arena_2*/
+    /*end_attach_to_arena_2*/
 }
 
 int main() {
diff --git a/external/tbb/doc/main/tbb_userguide/examples/parallel_for_lambda_example_1.cpp b/external/tbb/doc/main/tbb_userguide/examples/parallel_for_lambda_example_1.cpp
index 6d14eec1..4967156e 100644
--- a/external/tbb/doc/main/tbb_userguide/examples/parallel_for_lambda_example_1.cpp
+++ b/external/tbb/doc/main/tbb_userguide/examples/parallel_for_lambda_example_1.cpp
@@ -21,13 +21,10 @@ void Foo(float) {}
 
 using namespace oneapi::tbb;
 
-void ParallelApplyFoo( float* a, size_t n ) {
-    parallel_for( blocked_range<size_t>(0,n),
-        [=](const blocked_range<size_t>& r) {
-            for(size_t i=r.begin(); i!=r.end(); ++i)
-                Foo(a[i]);
-        }
-    );
+void ParallelApplyFoo(float* a, size_t n) {
+    parallel_for(blocked_range<size_t>(0, n), [=](const blocked_range<size_t>& r) {
+        for (size_t i = r.begin(); i != r.end(); ++i) Foo(a[i]);
+    });
 }
 /*end_parallel_for_lambda_1*/
 
diff --git a/external/tbb/doc/main/tbb_userguide/examples/parallel_for_lambda_example_2.cpp b/external/tbb/doc/main/tbb_userguide/examples/parallel_for_lambda_example_2.cpp
index 043abb77..5af06c30 100644
--- a/external/tbb/doc/main/tbb_userguide/examples/parallel_for_lambda_example_2.cpp
+++ b/external/tbb/doc/main/tbb_userguide/examples/parallel_for_lambda_example_2.cpp
@@ -21,10 +21,10 @@ void Foo(float) {}
 
 using namespace oneapi::tbb;
 
-#pragma warning(disable: 588)
+#pragma warning(disable : 588)
 
 void ParallelApplyFoo(float a[], size_t n) {
-    parallel_for(size_t(0), n, [=](size_t i) {Foo(a[i]);});
+    parallel_for(size_t(0), n, [=](size_t i) { Foo(a[i]); });
 }
 /*end_parallel_for_lambda_2*/
 
diff --git a/external/tbb/doc/main/tbb_userguide/examples/parallel_for_os_example.cpp b/external/tbb/doc/main/tbb_userguide/examples/parallel_for_os_example.cpp
index 66759388..db508780 100644
--- a/external/tbb/doc/main/tbb_userguide/examples/parallel_for_os_example.cpp
+++ b/external/tbb/doc/main/tbb_userguide/examples/parallel_for_os_example.cpp
@@ -23,24 +23,20 @@ using namespace oneapi::tbb;
 
 class ApplyFoo {
     float *const my_a;
+
 public:
-    void operator()( const blocked_range<size_t>& r ) const {
+    void operator()(const blocked_range<size_t> &r) const {
         float *a = my_a;
-        for( size_t i=r.begin(); i!=r.end(); ++i )
-            Foo(a[i]);
+        for (size_t i = r.begin(); i != r.end(); ++i) Foo(a[i]);
     }
-    ApplyFoo( float a[] ) :
-        my_a(a)
-    {}
+    ApplyFoo(float a[]) : my_a(a) {}
 };
 /*end_parallel_for_os_1*/
 
 /*begin_parallel_for_os_2*/
 #include "oneapi/tbb.h"
 
-void ParallelApplyFoo( float a[], size_t n ) {
-    parallel_for(blocked_range<size_t>(0,n), ApplyFoo(a));
-}
+void ParallelApplyFoo(float a[], size_t n) { parallel_for(blocked_range<size_t>(0, n), ApplyFoo(a)); }
 /*end_parallel_for_os_2*/
 
 int main() {
diff --git a/external/tbb/doc/main/tbb_userguide/snippets/blocked_nd_range_example.cpp b/external/tbb/doc/main/tbb_userguide/snippets/blocked_nd_range_example.cpp
index 74171239..b611ef28 100644
--- a/external/tbb/doc/main/tbb_userguide/snippets/blocked_nd_range_example.cpp
+++ b/external/tbb/doc/main/tbb_userguide/snippets/blocked_nd_range_example.cpp
@@ -1,6 +1,6 @@
 #include "blocked_nd_range_example.h"
-#include <vector>
 #include <cassert>
+#include <vector>
 
 int main() {
     const int kernel_length = 9;
@@ -16,21 +16,21 @@ int main() {
     const int out_heigth = feature_maps_heigth - kernel_height + 1;
 
     // Initializes feature maps with 1 in each cell and out with zeros.
-    std::vector<std::vector<std::vector<float>>> feature_maps(feature_maps_length, std::vector<std::vector<float>>(feature_maps_width, std::vector<float>(feature_maps_heigth, 1.0f)));
-    std::vector<std::vector<std::vector<float>>> out(out_length, std::vector<std::vector<float>>(out_width, std::vector<float>(out_heigth, 0.f)));
+    std::vector<std::vector<std::vector<float>>> feature_maps(
+            feature_maps_length, std::vector<std::vector<float>>(
+                                         feature_maps_width, std::vector<float>(feature_maps_heigth, 1.0f)));
+    std::vector<std::vector<std::vector<float>>> out(
+            out_length, std::vector<std::vector<float>>(out_width, std::vector<float>(out_heigth, 0.f)));
 
     // 3D convolution calculates the sum of all elements in the kernel
-    convolution3d(feature_maps, out,
-                  out_length, out_width, out_heigth,
-                  kernel_length, kernel_width, kernel_height);
+    convolution3d(feature_maps, out, out_length, out_width, out_heigth, kernel_length, kernel_width,
+                  kernel_height);
 
     // Checks correctness of convolution by equality to the expected sum of elements
     float expected = float(kernel_length * kernel_height * kernel_width);
     for (auto i : out) {
         for (auto j : i) {
-            for (auto k : j) {
-                assert(k == expected && "convolution failed to calculate correctly");
-            }
+            for (auto k : j) { assert(k == expected && "convolution failed to calculate correctly"); }
         }
     }
     return 0;
diff --git a/external/tbb/doc/main/tbb_userguide/snippets/flow_graph_examples.cpp b/external/tbb/doc/main/tbb_userguide/snippets/flow_graph_examples.cpp
index 72c594c5..9dee7299 100644
--- a/external/tbb/doc/main/tbb_userguide/snippets/flow_graph_examples.cpp
+++ b/external/tbb/doc/main/tbb_userguide/snippets/flow_graph_examples.cpp
@@ -25,43 +25,37 @@ using namespace tbb::flow;
 //! Example shows how to set the most performant core type as the preferred one
 //! for a graph execution.
 static void flow_graph_attach_to_arena_1() {
-/*begin_attach_to_arena_1*/
+    /*begin_attach_to_arena_1*/
     std::vector<tbb::core_type_id> core_types = tbb::info::core_types();
-    tbb::task_arena arena(
-        tbb::task_arena::constraints{}.set_core_type(core_types.back())
-    );
+    tbb::task_arena arena(tbb::task_arena::constraints {}.set_core_type(core_types.back()));
 
-    arena.execute( [&]() {
+    arena.execute([&]() {
         graph g;
-        function_node< int > f( g, unlimited, []( int ) {
-             /*the most performant core type is defined as preferred.*/
-        } );
+        function_node<int> f(g, unlimited, [](int) {
+            /*the most performant core type is defined as preferred.*/
+        });
         f.try_put(1);
         g.wait_for_all();
-    } );
-/*end_attach_to_arena_1*/
+    });
+    /*end_attach_to_arena_1*/
 }
 
 //! Reattach existing graph to an arena with the most performant core type as
 //! the preferred one for a work execution.
 static void flow_graph_attach_to_arena_2() {
-/*begin_attach_to_arena_2*/
+    /*begin_attach_to_arena_2*/
     graph g;
-    function_node< int > f( g, unlimited, []( int ) {
+    function_node<int> f(g, unlimited, [](int) {
         /*the most performant core type is defined as preferred.*/
-    } );
+    });
 
     std::vector<tbb::core_type_id> core_types = tbb::info::core_types();
-    tbb::task_arena arena(
-        tbb::task_arena::constraints{}.set_core_type(core_types.back())
-    );
+    tbb::task_arena arena(tbb::task_arena::constraints {}.set_core_type(core_types.back()));
 
-    arena.execute( [&]() {
-        g.reset();
-    } );
+    arena.execute([&]() { g.reset(); });
     f.try_put(1);
     g.wait_for_all();
-/*end_attach_to_arena_2*/
+    /*end_attach_to_arena_2*/
 }
 
 int main() {
diff --git a/external/tbb/python/rml/ipc_server.cpp b/external/tbb/python/rml/ipc_server.cpp
index fff5e9ed..f7031f25 100644
--- a/external/tbb/python/rml/ipc_server.cpp
+++ b/external/tbb/python/rml/ipc_server.cpp
@@ -15,14 +15,14 @@
 */
 
 #include <atomic>
-#include <cstring>
 #include <cstdlib>
+#include <cstring>
 
+#include "../../src/tbb/governor.h"
+#include "../../src/tbb/misc.h"
 #include "../../src/tbb/rml_tbb.h"
 #include "../../src/tbb/rml_thread_monitor.h"
 #include "../../src/tbb/scheduler_common.h"
-#include "../../src/tbb/governor.h"
-#include "../../src/tbb/misc.h"
 #include "tbb/cache_aligned_allocator.h"
 
 #include "ipc_utils.h"
@@ -31,214 +31,208 @@
 #include <stdlib.h>
 
 namespace rml {
-namespace internal {
+    namespace internal {
 
-static const char* IPC_ENABLE_VAR_NAME = "IPC_ENABLE";
+        static const char* IPC_ENABLE_VAR_NAME = "IPC_ENABLE";
 
-typedef versioned_object::version_type version_type;
+        typedef versioned_object::version_type version_type;
 
-extern "C" factory::status_type __RML_open_factory(factory& f, version_type& /*server_version*/, version_type /*client_version*/) {
-    if( !tbb::internal::rml::get_enable_flag( IPC_ENABLE_VAR_NAME ) ) {
-        return factory::st_incompatible;
-    }
+        extern "C" factory::status_type __RML_open_factory(factory& f, version_type& /*server_version*/,
+                                                           version_type /*client_version*/) {
+            if (!tbb::internal::rml::get_enable_flag(IPC_ENABLE_VAR_NAME)) {
+                return factory::st_incompatible;
+            }
 
-    // Hack to keep this library from being closed
-    static std::atomic<bool> one_time_flag{false};
-    bool expected = false;
+            // Hack to keep this library from being closed
+            static std::atomic<bool> one_time_flag {false};
+            bool expected = false;
 
-    if( one_time_flag.compare_exchange_strong(expected, true) ) {
-        __TBB_ASSERT( (size_t)f.library_handle!=factory::c_dont_unload, nullptr );
-#if _WIN32||_WIN64
-        f.library_handle = reinterpret_cast<HMODULE>(factory::c_dont_unload);
+            if (one_time_flag.compare_exchange_strong(expected, true)) {
+                __TBB_ASSERT((size_t) f.library_handle != factory::c_dont_unload, nullptr);
+#if _WIN32 || _WIN64
+                f.library_handle = reinterpret_cast<HMODULE>(factory::c_dont_unload);
 #else
-        f.library_handle = reinterpret_cast<void*>(factory::c_dont_unload);
+                f.library_handle = reinterpret_cast<void*>(factory::c_dont_unload);
 #endif
-    }
-    // End of hack
+            }
+            // End of hack
 
-    return factory::st_success;
-}
+            return factory::st_success;
+        }
 
-extern "C" void __RML_close_factory(factory& /*f*/) {
-}
+        extern "C" void __RML_close_factory(factory& /*f*/) {}
 
-class ipc_thread_monitor : public tbb::detail::r1::rml::internal::thread_monitor {
-public:
-    ipc_thread_monitor() : thread_monitor() {}
+        class ipc_thread_monitor : public tbb::detail::r1::rml::internal::thread_monitor {
+        public:
+            ipc_thread_monitor() : thread_monitor() {}
 
 #if USE_WINTHREAD
 #elif USE_PTHREAD
-    static handle_type launch(thread_routine_type thread_routine, void* arg, size_t stack_size);
+            static handle_type launch(thread_routine_type thread_routine, void* arg, size_t stack_size);
 #endif
-};
+        };
 
 #if USE_WINTHREAD
 #elif USE_PTHREAD
-inline ipc_thread_monitor::handle_type ipc_thread_monitor::launch(void* (*thread_routine)(void*), void* arg, size_t stack_size) {
-    pthread_attr_t s;
-    if( pthread_attr_init( &s ) ) return 0;
-    if( stack_size>0 ) {
-        if( pthread_attr_setstacksize( &s, stack_size ) ) return 0;
-    }
-    pthread_t handle;
-    if( pthread_create( &handle, &s, thread_routine, arg ) ) return 0;
-    if( pthread_attr_destroy( &s ) ) return 0;
-    return handle;
-}
+        inline ipc_thread_monitor::handle_type ipc_thread_monitor::launch(void* (*thread_routine)(void*),
+                                                                          void* arg, size_t stack_size) {
+            pthread_attr_t s;
+            if (pthread_attr_init(&s)) return 0;
+            if (stack_size > 0) {
+                if (pthread_attr_setstacksize(&s, stack_size)) return 0;
+            }
+            pthread_t handle;
+            if (pthread_create(&handle, &s, thread_routine, arg)) return 0;
+            if (pthread_attr_destroy(&s)) return 0;
+            return handle;
+        }
 #endif
 
-}} // rml::internal
+    }// namespace internal
+}// namespace rml
 
 using rml::internal::ipc_thread_monitor;
 using tbb::internal::rml::get_shared_name;
 
 namespace tbb {
-namespace detail {
+    namespace detail {
+
+        namespace r1 {
+            bool terminate_on_exception() { return false; }
+        }// namespace r1
+
+        namespace rml {
+
+            typedef ipc_thread_monitor::handle_type thread_handle;
+
+            class ipc_server;
+
+            static const char* IPC_MAX_THREADS_VAR_NAME = "MAX_THREADS";
+            static const char* IPC_ACTIVE_SEM_PREFIX = "/__IPC_active";
+            static const char* IPC_STOP_SEM_PREFIX = "/__IPC_stop";
+            static const char* IPC_ACTIVE_SEM_VAR_NAME = "IPC_ACTIVE_SEMAPHORE";
+            static const char* IPC_STOP_SEM_VAR_NAME = "IPC_STOP_SEMAPHORE";
+            static const mode_t IPC_SEM_MODE = 0660;
+
+            static std::atomic<int> my_global_thread_count;
+            using tbb_client = tbb::detail::r1::rml::tbb_client;
+            using tbb_server = tbb::detail::r1::rml::tbb_server;
+            using tbb_factory = tbb::detail::r1::rml::tbb_factory;
+
+            using tbb::detail::r1::runtime_warning;
+
+            char* get_sem_name(const char* name, const char* prefix) {
+                __TBB_ASSERT(name != nullptr, nullptr);
+                __TBB_ASSERT(prefix != nullptr, nullptr);
+                char* value = std::getenv(name);
+                std::size_t len = value == nullptr ? 0 : std::strlen(value);
+                if (len > 0) {
+                    // TODO: consider returning the original string instead of the copied string.
+                    char* sem_name = new char[len + 1];
+                    __TBB_ASSERT(sem_name != nullptr, nullptr);
+                    std::strncpy(sem_name, value, len + 1);
+                    __TBB_ASSERT(sem_name[len] == 0, nullptr);
+                    return sem_name;
+                } else {
+                    return get_shared_name(prefix);
+                }
+            }
 
-namespace r1 {
-bool terminate_on_exception() {
-    return false;
-}
-}
+            char* get_active_sem_name() {
+                return get_sem_name(IPC_ACTIVE_SEM_VAR_NAME, IPC_ACTIVE_SEM_PREFIX);
+            }
 
-namespace rml {
+            char* get_stop_sem_name() { return get_sem_name(IPC_STOP_SEM_VAR_NAME, IPC_STOP_SEM_PREFIX); }
 
-typedef ipc_thread_monitor::handle_type thread_handle;
-
-class ipc_server;
-
-static const char* IPC_MAX_THREADS_VAR_NAME = "MAX_THREADS";
-static const char* IPC_ACTIVE_SEM_PREFIX = "/__IPC_active";
-static const char* IPC_STOP_SEM_PREFIX = "/__IPC_stop";
-static const char* IPC_ACTIVE_SEM_VAR_NAME = "IPC_ACTIVE_SEMAPHORE";
-static const char* IPC_STOP_SEM_VAR_NAME = "IPC_STOP_SEMAPHORE";
-static const mode_t IPC_SEM_MODE = 0660;
-
-static std::atomic<int> my_global_thread_count;
-using tbb_client = tbb::detail::r1::rml::tbb_client;
-using tbb_server = tbb::detail::r1::rml::tbb_server;
-using tbb_factory = tbb::detail::r1::rml::tbb_factory;
-
-using tbb::detail::r1::runtime_warning;
-
-char* get_sem_name(const char* name, const char* prefix) {
-    __TBB_ASSERT(name != nullptr, nullptr);
-    __TBB_ASSERT(prefix != nullptr, nullptr);
-    char* value = std::getenv(name);
-    std::size_t len = value == nullptr ? 0 : std::strlen(value);
-    if (len > 0) {
-        // TODO: consider returning the original string instead of the copied string.
-        char* sem_name = new char[len + 1];
-        __TBB_ASSERT(sem_name != nullptr, nullptr);
-        std::strncpy(sem_name, value, len+1);
-        __TBB_ASSERT(sem_name[len] == 0, nullptr);
-        return sem_name;
-    } else {
-        return get_shared_name(prefix);
-    }
-}
-
-char* get_active_sem_name() {
-    return get_sem_name(IPC_ACTIVE_SEM_VAR_NAME, IPC_ACTIVE_SEM_PREFIX);
-}
-
-char* get_stop_sem_name() {
-    return get_sem_name(IPC_STOP_SEM_VAR_NAME, IPC_STOP_SEM_PREFIX);
-}
-
-static void release_thread_sem(sem_t* my_sem) {
-    int old = my_global_thread_count.load(std::memory_order_relaxed);
-    do {
-        if( old<=0 ) return;
-    } while( !my_global_thread_count.compare_exchange_strong(old, old-1) );
-    if( old>0 ) {
-        sem_post( my_sem );
-    }
-}
-
-void set_sem_name(const char* name, const char* prefix) {
-    __TBB_ASSERT(name != nullptr, nullptr);
-    __TBB_ASSERT(prefix != nullptr, nullptr);
-    const char* postfix = "_XXXXXX";
-    std::size_t plen = std::strlen(prefix);
-    std::size_t xlen = std::strlen(postfix);
-    char* templ = new char[plen + xlen + 1];
-    __TBB_ASSERT(templ != nullptr, nullptr);
-    strncpy(templ, prefix, plen+1);
-    __TBB_ASSERT(templ[plen] == 0, nullptr);
-    strncat(templ, postfix, xlen + 1);
-    __TBB_ASSERT(std::strlen(templ) == plen + xlen + 1, nullptr);
-    // TODO: consider using mkstemp instead of mktemp.
-    char* sem_name = mktemp(templ);
-    if (sem_name != nullptr) {
-        int status = setenv(name, sem_name,  /*overwrite*/ 1);
-        __TBB_ASSERT_EX(status == 0, nullptr);
-    }
-    delete[] templ;
-}
-
-extern "C" void set_active_sem_name() {
-    set_sem_name(IPC_ACTIVE_SEM_VAR_NAME, IPC_ACTIVE_SEM_PREFIX);
-}
-
-extern "C" void set_stop_sem_name() {
-    set_sem_name(IPC_STOP_SEM_VAR_NAME, IPC_STOP_SEM_PREFIX);
-}
-
-extern "C" void release_resources() {
-    if( my_global_thread_count.load(std::memory_order_acquire)!=0 ) {
-        char* active_sem_name = get_active_sem_name();
-        sem_t* my_active_sem = sem_open( active_sem_name, O_CREAT );
-        __TBB_ASSERT( my_active_sem, "Unable to open active threads semaphore" );
-        delete[] active_sem_name;
-
-        do {
-            release_thread_sem( my_active_sem );
-        } while( my_global_thread_count.load(std::memory_order_acquire)!=0 );
-    }
-}
-
-extern "C" void release_semaphores() {
-    int status = 0;
-    char* sem_name = nullptr;
-
-    sem_name = get_active_sem_name();
-    if( sem_name==nullptr ) {
-        runtime_warning("Can not get RML semaphore name");
-        return;
-    }
-    status = sem_unlink( sem_name );
-    if( status!=0 ) {
-        if( errno==ENOENT ) {
-            /* There is no semaphore with the given name, nothing to do */
-        } else {
-            runtime_warning("Can not release RML semaphore");
-            return;
-        }
-    }
-    delete[] sem_name;
-
-    sem_name = get_stop_sem_name();
-    if( sem_name==nullptr ) {
-        runtime_warning( "Can not get RML semaphore name" );
-        return;
-    }
-    status = sem_unlink( sem_name );
-    if( status!=0 ) {
-        if( errno==ENOENT ) {
-            /* There is no semaphore with the given name, nothing to do */
-        } else {
-            runtime_warning("Can not release RML semaphore");
-            return;
-        }
-    }
-    delete[] sem_name;
-}
-
-class ipc_worker: no_copy {
-protected:
-    //! State in finite-state machine that controls the worker.
-    /** State diagram:
+            static void release_thread_sem(sem_t* my_sem) {
+                int old = my_global_thread_count.load(std::memory_order_relaxed);
+                do {
+                    if (old <= 0) return;
+                } while (!my_global_thread_count.compare_exchange_strong(old, old - 1));
+                if (old > 0) { sem_post(my_sem); }
+            }
+
+            void set_sem_name(const char* name, const char* prefix) {
+                __TBB_ASSERT(name != nullptr, nullptr);
+                __TBB_ASSERT(prefix != nullptr, nullptr);
+                const char* postfix = "_XXXXXX";
+                std::size_t plen = std::strlen(prefix);
+                std::size_t xlen = std::strlen(postfix);
+                char* templ = new char[plen + xlen + 1];
+                __TBB_ASSERT(templ != nullptr, nullptr);
+                strncpy(templ, prefix, plen + 1);
+                __TBB_ASSERT(templ[plen] == 0, nullptr);
+                strncat(templ, postfix, xlen + 1);
+                __TBB_ASSERT(std::strlen(templ) == plen + xlen + 1, nullptr);
+                // TODO: consider using mkstemp instead of mktemp.
+                char* sem_name = mktemp(templ);
+                if (sem_name != nullptr) {
+                    int status = setenv(name, sem_name, /*overwrite*/ 1);
+                    __TBB_ASSERT_EX(status == 0, nullptr);
+                }
+                delete[] templ;
+            }
+
+            extern "C" void set_active_sem_name() {
+                set_sem_name(IPC_ACTIVE_SEM_VAR_NAME, IPC_ACTIVE_SEM_PREFIX);
+            }
+
+            extern "C" void set_stop_sem_name() { set_sem_name(IPC_STOP_SEM_VAR_NAME, IPC_STOP_SEM_PREFIX); }
+
+            extern "C" void release_resources() {
+                if (my_global_thread_count.load(std::memory_order_acquire) != 0) {
+                    char* active_sem_name = get_active_sem_name();
+                    sem_t* my_active_sem = sem_open(active_sem_name, O_CREAT);
+                    __TBB_ASSERT(my_active_sem, "Unable to open active threads semaphore");
+                    delete[] active_sem_name;
+
+                    do {
+                        release_thread_sem(my_active_sem);
+                    } while (my_global_thread_count.load(std::memory_order_acquire) != 0);
+                }
+            }
+
+            extern "C" void release_semaphores() {
+                int status = 0;
+                char* sem_name = nullptr;
+
+                sem_name = get_active_sem_name();
+                if (sem_name == nullptr) {
+                    runtime_warning("Can not get RML semaphore name");
+                    return;
+                }
+                status = sem_unlink(sem_name);
+                if (status != 0) {
+                    if (errno == ENOENT) {
+                        /* There is no semaphore with the given name, nothing to do */
+                    } else {
+                        runtime_warning("Can not release RML semaphore");
+                        return;
+                    }
+                }
+                delete[] sem_name;
+
+                sem_name = get_stop_sem_name();
+                if (sem_name == nullptr) {
+                    runtime_warning("Can not get RML semaphore name");
+                    return;
+                }
+                status = sem_unlink(sem_name);
+                if (status != 0) {
+                    if (errno == ENOENT) {
+                        /* There is no semaphore with the given name, nothing to do */
+                    } else {
+                        runtime_warning("Can not release RML semaphore");
+                        return;
+                    }
+                }
+                delete[] sem_name;
+            }
+
+            class ipc_worker : no_copy {
+            protected:
+                //! State in finite-state machine that controls the worker.
+                /** State diagram:
                     /----------stop---\
                     |           ^     |
                     V           |     |
@@ -247,890 +241,871 @@ class ipc_worker: no_copy {
           |         V           |     |
           \------> quit <-------/<----/
       */
-    enum state_t {
-        //! *this is initialized
-        st_init,
-        //! *this has associated thread that is starting up.
-        st_starting,
-        //! Associated thread is doing normal life sequence.
-        st_normal,
-        //! Associated thread is stopped but can be started again.
-        st_stop,
-        //! Associated thread has ended normal life sequence and promises to never touch *this again.
-        st_quit
-    };
-    std::atomic<state_t> my_state;
-
-    //! Associated server
-    ipc_server& my_server;
-
-    //! Associated client
-    tbb_client& my_client;
-
-    //! index used for avoiding the 64K aliasing problem
-    const size_t my_index;
-
-    //! Monitor for sleeping when there is no work to do.
-    /** The invariant that holds for sleeping workers is:
+                enum state_t {
+                    //! *this is initialized
+                    st_init,
+                    //! *this has associated thread that is starting up.
+                    st_starting,
+                    //! Associated thread is doing normal life sequence.
+                    st_normal,
+                    //! Associated thread is stopped but can be started again.
+                    st_stop,
+                    //! Associated thread has ended normal life sequence and promises to never touch *this again.
+                    st_quit
+                };
+                std::atomic<state_t> my_state;
+
+                //! Associated server
+                ipc_server& my_server;
+
+                //! Associated client
+                tbb_client& my_client;
+
+                //! index used for avoiding the 64K aliasing problem
+                const size_t my_index;
+
+                //! Monitor for sleeping when there is no work to do.
+                /** The invariant that holds for sleeping workers is:
         "my_slack<=0 && my_state==st_normal && I am on server's list of asleep threads" */
-    ipc_thread_monitor my_thread_monitor;
+                ipc_thread_monitor my_thread_monitor;
 
-    //! Handle of the OS thread associated with this worker
-    thread_handle my_handle;
+                //! Handle of the OS thread associated with this worker
+                thread_handle my_handle;
 
-    //! Link for list of workers that are sleeping or have no associated thread.
-    ipc_worker* my_next;
+                //! Link for list of workers that are sleeping or have no associated thread.
+                ipc_worker* my_next;
 
-    friend class ipc_server;
+                friend class ipc_server;
 
-    //! Actions executed by the associated thread
-    void run();
+                //! Actions executed by the associated thread
+                void run();
 
-    //! Wake up associated thread (or launch a thread if there is none)
-    bool wake_or_launch();
+                //! Wake up associated thread (or launch a thread if there is none)
+                bool wake_or_launch();
 
-    //! Called by a thread (usually not the associated thread) to commence termination.
-    void start_shutdown(bool join);
+                //! Called by a thread (usually not the associated thread) to commence termination.
+                void start_shutdown(bool join);
 
-    //! Called by a thread (usually not the associated thread) to commence stopping.
-    void start_stopping(bool join);
+                //! Called by a thread (usually not the associated thread) to commence stopping.
+                void start_stopping(bool join);
 
-    static __RML_DECL_THREAD_ROUTINE thread_routine(void* arg);
+                static __RML_DECL_THREAD_ROUTINE thread_routine(void* arg);
 
-    static void release_handle(thread_handle my_handle, bool join);
+                static void release_handle(thread_handle my_handle, bool join);
 
-protected:
-    ipc_worker(ipc_server& server, tbb_client& client, const size_t i) :
-        my_server(server),
-        my_client(client),
-        my_index(i)
-    {
-        my_state = st_init;
-    }
-};
+            protected:
+                ipc_worker(ipc_server& server, tbb_client& client, const size_t i)
+                    : my_server(server), my_client(client), my_index(i) {
+                    my_state = st_init;
+                }
+            };
 
-//TODO: cannot bind to nfs_size from allocator.cpp since nfs_size is constexpr defined in another translation unit
-constexpr static size_t cache_line_sz = 128;
+            //TODO: cannot bind to nfs_size from allocator.cpp since nfs_size is constexpr defined in another translation unit
+            constexpr static size_t cache_line_sz = 128;
 
 #if _MSC_VER && !defined(__INTEL_COMPILER)
-    // Suppress overzealous compiler warnings about uninstantiable class
-    #pragma warning(push)
-    #pragma warning(disable:4510 4610)
+// Suppress overzealous compiler warnings about uninstantiable class
+#pragma warning(push)
+#pragma warning(disable : 4510 4610)
 #endif
-class padded_ipc_worker: public ipc_worker {
-    char pad[cache_line_sz - sizeof(ipc_worker)%cache_line_sz];
-public:
-    padded_ipc_worker(ipc_server& server, tbb_client& client, const size_t i)
-    : ipc_worker( server,client,i ) { suppress_unused_warning(pad); }
-};
+            class padded_ipc_worker : public ipc_worker {
+                char pad[cache_line_sz - sizeof(ipc_worker) % cache_line_sz];
+
+            public:
+                padded_ipc_worker(ipc_server& server, tbb_client& client, const size_t i)
+                    : ipc_worker(server, client, i) {
+                    suppress_unused_warning(pad);
+                }
+            };
 #if _MSC_VER && !defined(__INTEL_COMPILER)
-    #pragma warning(pop)
+#pragma warning(pop)
 #endif
 
-class ipc_waker : public padded_ipc_worker {
-private:
-    static __RML_DECL_THREAD_ROUTINE thread_routine(void* arg);
-    void run();
-    bool wake_or_launch();
+            class ipc_waker : public padded_ipc_worker {
+            private:
+                static __RML_DECL_THREAD_ROUTINE thread_routine(void* arg);
+                void run();
+                bool wake_or_launch();
 
-    friend class ipc_server;
+                friend class ipc_server;
 
-public:
-    ipc_waker(ipc_server& server, tbb_client& client, const size_t i)
-    : padded_ipc_worker( server, client, i ) {}
-};
+            public:
+                ipc_waker(ipc_server& server, tbb_client& client, const size_t i)
+                    : padded_ipc_worker(server, client, i) {}
+            };
 
-class ipc_stopper : public padded_ipc_worker {
-private:
-    static __RML_DECL_THREAD_ROUTINE thread_routine(void* arg);
-    void run();
-    bool wake_or_launch();
+            class ipc_stopper : public padded_ipc_worker {
+            private:
+                static __RML_DECL_THREAD_ROUTINE thread_routine(void* arg);
+                void run();
+                bool wake_or_launch();
 
-    friend class ipc_server;
+                friend class ipc_server;
 
-public:
-    ipc_stopper(ipc_server& server, tbb_client& client, const size_t i)
-    : padded_ipc_worker( server, client, i ) {}
-};
+            public:
+                ipc_stopper(ipc_server& server, tbb_client& client, const size_t i)
+                    : padded_ipc_worker(server, client, i) {}
+            };
 
-class ipc_server: public tbb_server, no_copy {
-private:
-    tbb_client& my_client;
-    //! Maximum number of threads to be created.
-    /** Threads are created lazily, so maximum might not actually be reached. */
-    tbb_client::size_type my_n_thread;
+            class ipc_server : public tbb_server, no_copy {
+            private:
+                tbb_client& my_client;
+                //! Maximum number of threads to be created.
+                /** Threads are created lazily, so maximum might not actually be reached. */
+                tbb_client::size_type my_n_thread;
 
-    //! Stack size for each thread. */
-    const size_t my_stack_size;
+                //! Stack size for each thread. */
+                const size_t my_stack_size;
 
-    //! Number of jobs that could use their associated thread minus number of active threads.
-    /** If negative, indicates oversubscription.
+                //! Number of jobs that could use their associated thread minus number of active threads.
+                /** If negative, indicates oversubscription.
         If positive, indicates that more threads should run.
         Can be lowered asynchronously, but must be raised only while holding my_asleep_list_mutex,
         because raising it impacts the invariant for sleeping threads. */
-    std::atomic<int> my_slack;
+                std::atomic<int> my_slack;
 
-    //! Counter used to determine when to delete this.
-    std::atomic<int> my_ref_count;
+                //! Counter used to determine when to delete this.
+                std::atomic<int> my_ref_count;
 
-    padded_ipc_worker* my_thread_array;
+                padded_ipc_worker* my_thread_array;
 
-    //! List of workers that are asleep or committed to sleeping until notified by another thread.
-    std::atomic<ipc_worker*> my_asleep_list_root;
+                //! List of workers that are asleep or committed to sleeping until notified by another thread.
+                std::atomic<ipc_worker*> my_asleep_list_root;
 
-    //! Protects my_asleep_list_root
-    typedef scheduler_mutex_type asleep_list_mutex_type;
-    asleep_list_mutex_type my_asleep_list_mutex;
+                //! Protects my_asleep_list_root
+                typedef scheduler_mutex_type asleep_list_mutex_type;
+                asleep_list_mutex_type my_asleep_list_mutex;
 
-    //! Should server wait workers while terminate
-    const bool my_join_workers;
+                //! Should server wait workers while terminate
+                const bool my_join_workers;
 
-    //! Service thread for waking of workers
-    ipc_waker* my_waker;
+                //! Service thread for waking of workers
+                ipc_waker* my_waker;
 
-    //! Service thread to stop threads
-    ipc_stopper* my_stopper;
+                //! Service thread to stop threads
+                ipc_stopper* my_stopper;
 
-    //! Semaphore to account active threads
-    sem_t* my_active_sem;
+                //! Semaphore to account active threads
+                sem_t* my_active_sem;
 
-    //! Semaphore to account stop threads
-    sem_t* my_stop_sem;
+                //! Semaphore to account stop threads
+                sem_t* my_stop_sem;
 
 #if TBB_USE_ASSERT
-    std::atomic<int> my_net_slack_requests;
+                std::atomic<int> my_net_slack_requests;
 #endif /* TBB_USE_ASSERT */
 
-    //! Wake up to two sleeping workers, if there are any sleeping.
-    /** The call is used to propagate a chain reaction where each thread wakes up two threads,
+                //! Wake up to two sleeping workers, if there are any sleeping.
+                /** The call is used to propagate a chain reaction where each thread wakes up two threads,
         which in turn each wake up two threads, etc. */
-    void propagate_chain_reaction() {
-        // First test of a double-check idiom.  Second test is inside wake_some(0).
-        if( my_slack.load(std::memory_order_acquire)>0 ) {
-            int active_threads = 0;
-            if( try_get_active_thread() ) {
-                ++active_threads;
-                if( try_get_active_thread() ) {
-                    ++active_threads;
+                void propagate_chain_reaction() {
+                    // First test of a double-check idiom.  Second test is inside wake_some(0).
+                    if (my_slack.load(std::memory_order_acquire) > 0) {
+                        int active_threads = 0;
+                        if (try_get_active_thread()) {
+                            ++active_threads;
+                            if (try_get_active_thread()) { ++active_threads; }
+                            wake_some(0, active_threads);
+                        }
+                    }
                 }
-                wake_some( 0, active_threads );
-            }
-        }
-    }
 
-    //! Try to add t to list of sleeping workers
-    bool try_insert_in_asleep_list(ipc_worker& t);
+                //! Try to add t to list of sleeping workers
+                bool try_insert_in_asleep_list(ipc_worker& t);
 
-    //! Try to add t to list of sleeping workers even if there is some work to do
-    bool try_insert_in_asleep_list_forced(ipc_worker& t);
+                //! Try to add t to list of sleeping workers even if there is some work to do
+                bool try_insert_in_asleep_list_forced(ipc_worker& t);
 
-    //! Equivalent of adding additional_slack to my_slack and waking up to 2 threads if my_slack permits.
-    void wake_some(int additional_slack, int active_threads);
+                //! Equivalent of adding additional_slack to my_slack and waking up to 2 threads if my_slack permits.
+                void wake_some(int additional_slack, int active_threads);
 
-    //! Equivalent of adding additional_slack to my_slack and waking up to 1 thread if my_slack permits.
-    void wake_one_forced(int additional_slack);
+                //! Equivalent of adding additional_slack to my_slack and waking up to 1 thread if my_slack permits.
+                void wake_one_forced(int additional_slack);
 
-    //! Stop one thread from asleep list
-    bool stop_one();
+                //! Stop one thread from asleep list
+                bool stop_one();
 
-    //! Wait for active thread
-    bool wait_active_thread();
+                //! Wait for active thread
+                bool wait_active_thread();
 
-    //! Try to get active thread
-    bool try_get_active_thread();
+                //! Try to get active thread
+                bool try_get_active_thread();
 
-    //! Release active thread
-    void release_active_thread();
+                //! Release active thread
+                void release_active_thread();
 
-    //! Wait for thread to stop
-    bool wait_stop_thread();
+                //! Wait for thread to stop
+                bool wait_stop_thread();
 
-    //! Add thread to stop list
-    void add_stop_thread();
+                //! Add thread to stop list
+                void add_stop_thread();
 
-    void remove_server_ref() {
-        if( --my_ref_count==0 ) {
-            my_client.acknowledge_close_connection();
-            this->~ipc_server();
-            tbb::cache_aligned_allocator<ipc_server>().deallocate( this, 1 );
-        }
-    }
+                void remove_server_ref() {
+                    if (--my_ref_count == 0) {
+                        my_client.acknowledge_close_connection();
+                        this->~ipc_server();
+                        tbb::cache_aligned_allocator<ipc_server>().deallocate(this, 1);
+                    }
+                }
+
+                friend class ipc_worker;
+                friend class ipc_waker;
+                friend class ipc_stopper;
 
-    friend class ipc_worker;
-    friend class ipc_waker;
-    friend class ipc_stopper;
-public:
-    ipc_server(tbb_client& client);
-    virtual ~ipc_server();
+            public:
+                ipc_server(tbb_client& client);
+                virtual ~ipc_server();
 
-    version_type version() const override {
-        return 0;
-    }
+                version_type version() const override { return 0; }
 
-    void request_close_connection(bool /*exiting*/) override {
-        my_waker->start_shutdown(false);
-        my_stopper->start_shutdown(false);
-        for( size_t i=0; i<my_n_thread; ++i )
-            my_thread_array[i].start_shutdown( my_join_workers );
-        remove_server_ref();
-    }
+                void request_close_connection(bool /*exiting*/) override {
+                    my_waker->start_shutdown(false);
+                    my_stopper->start_shutdown(false);
+                    for (size_t i = 0; i < my_n_thread; ++i)
+                        my_thread_array[i].start_shutdown(my_join_workers);
+                    remove_server_ref();
+                }
 
-    void yield() override {d0::yield();}
+                void yield() override { d0::yield(); }
 
-    void independent_thread_number_changed(int) override { __TBB_ASSERT( false, nullptr ); }
+                void independent_thread_number_changed(int) override { __TBB_ASSERT(false, nullptr); }
 
-    unsigned default_concurrency() const override { return my_n_thread - 1; }
+                unsigned default_concurrency() const override { return my_n_thread - 1; }
 
-    void adjust_job_count_estimate(int delta) override;
+                void adjust_job_count_estimate(int delta) override;
 
-#if _WIN32||_WIN64
-    void register_external_thread(::rml::server::execution_resource_t&) override {}
-    void unregister_external_thread(::rml::server::execution_resource_t) override {}
+#if _WIN32 || _WIN64
+                void register_external_thread(::rml::server::execution_resource_t&) override {}
+                void unregister_external_thread(::rml::server::execution_resource_t) override {}
 #endif /* _WIN32||_WIN64 */
-};
+            };
 
 //------------------------------------------------------------------------
 // Methods of ipc_worker
 //------------------------------------------------------------------------
 #if _MSC_VER && !defined(__INTEL_COMPILER)
-    // Suppress overzealous compiler warnings about an initialized variable 'sink_for_alloca' not referenced
-    #pragma warning(push)
-    #pragma warning(disable:4189)
+// Suppress overzealous compiler warnings about an initialized variable 'sink_for_alloca' not referenced
+#pragma warning(push)
+#pragma warning(disable : 4189)
 #endif
-#if __MINGW32__ && __GNUC__==4 &&__GNUC_MINOR__>=2 && !__MINGW64__
-// ensure that stack is properly aligned
-__attribute__((force_align_arg_pointer))
+#if __MINGW32__ && __GNUC__ == 4 && __GNUC_MINOR__ >= 2 && !__MINGW64__
+            // ensure that stack is properly aligned
+            __attribute__((force_align_arg_pointer))
 #endif
-__RML_DECL_THREAD_ROUTINE ipc_worker::thread_routine(void* arg) {
-    ipc_worker* self = static_cast<ipc_worker*>(arg);
-    AVOID_64K_ALIASING( self->my_index );
-    self->run();
-    return 0;
-}
+            __RML_DECL_THREAD_ROUTINE
+            ipc_worker::thread_routine(void* arg) {
+                ipc_worker* self = static_cast<ipc_worker*>(arg);
+                AVOID_64K_ALIASING(self->my_index);
+                self->run();
+                return 0;
+            }
 #if _MSC_VER && !defined(__INTEL_COMPILER)
-    #pragma warning(pop)
+#pragma warning(pop)
 #endif
 
-void ipc_worker::release_handle(thread_handle handle, bool join) {
-    if( join )
-        ipc_thread_monitor::join( handle );
-    else
-        ipc_thread_monitor::detach_thread( handle );
-}
-
-void ipc_worker::start_shutdown(bool join) {
-    state_t s = my_state.load(std::memory_order_relaxed);
-
-    do {
-        __TBB_ASSERT( s!=st_quit, nullptr );
-    } while( !my_state.compare_exchange_strong( s, st_quit ) );
-    if( s==st_normal || s==st_starting ) {
-        // May have invalidated invariant for sleeping, so wake up the thread.
-        // Note that the notify() here occurs without maintaining invariants for my_slack.
-        // It does not matter, because my_state==st_quit overrides checking of my_slack.
-        my_thread_monitor.notify();
-        // Do not need release handle in st_init state,
-        // because in this case the thread wasn't started yet.
-        // For st_starting release is done at launch site.
-        if( s==st_normal )
-            release_handle( my_handle, join );
-    }
-}
-
-void ipc_worker::start_stopping(bool join) {
-    state_t s = my_state.load(std::memory_order_relaxed);
-
-    while( !my_state.compare_exchange_strong( s, st_quit ) ) {};
-    if( s==st_normal || s==st_starting ) {
-        // May have invalidated invariant for sleeping, so wake up the thread.
-        // Note that the notify() here occurs without maintaining invariants for my_slack.
-        // It does not matter, because my_state==st_quit overrides checking of my_slack.
-        my_thread_monitor.notify();
-        // Do not need release handle in st_init state,
-        // because in this case the thread wasn't started yet.
-        // For st_starting release is done at launch site.
-        if( s==st_normal )
-            release_handle( my_handle, join );
-    }
-}
-
-void ipc_worker::run() {
-    my_server.propagate_chain_reaction();
-
-    // Transiting to st_normal here would require setting my_handle,
-    // which would create race with the launching thread and
-    // complications in handle management on Windows.
-
-    ::rml::job& j = *my_client.create_one_job();
-    state_t state = my_state.load(std::memory_order_acquire);
-    while( state!=st_quit && state!=st_stop ) {
-        if( my_server.my_slack>=0 ) {
-            my_client.process(j);
-        } else {
-            // Check/set the invariant for sleeping
-            state = my_state.load(std::memory_order_seq_cst);
-            if( state!=st_quit && state!=st_stop && my_server.try_insert_in_asleep_list(*this) ) {
-                if( my_server.my_n_thread > 1 ) my_server.release_active_thread();
-                my_thread_monitor.wait();
+            void ipc_worker::release_handle(thread_handle handle, bool join) {
+                if (join) ipc_thread_monitor::join(handle);
+                else
+                    ipc_thread_monitor::detach_thread(handle);
+            }
+
+            void ipc_worker::start_shutdown(bool join) {
+                state_t s = my_state.load(std::memory_order_relaxed);
+
+                do {
+                    __TBB_ASSERT(s != st_quit, nullptr);
+                } while (!my_state.compare_exchange_strong(s, st_quit));
+                if (s == st_normal || s == st_starting) {
+                    // May have invalidated invariant for sleeping, so wake up the thread.
+                    // Note that the notify() here occurs without maintaining invariants for my_slack.
+                    // It does not matter, because my_state==st_quit overrides checking of my_slack.
+                    my_thread_monitor.notify();
+                    // Do not need release handle in st_init state,
+                    // because in this case the thread wasn't started yet.
+                    // For st_starting release is done at launch site.
+                    if (s == st_normal) release_handle(my_handle, join);
+                }
+            }
+
+            void ipc_worker::start_stopping(bool join) {
+                state_t s = my_state.load(std::memory_order_relaxed);
+
+                while (!my_state.compare_exchange_strong(s, st_quit)) {};
+                if (s == st_normal || s == st_starting) {
+                    // May have invalidated invariant for sleeping, so wake up the thread.
+                    // Note that the notify() here occurs without maintaining invariants for my_slack.
+                    // It does not matter, because my_state==st_quit overrides checking of my_slack.
+                    my_thread_monitor.notify();
+                    // Do not need release handle in st_init state,
+                    // because in this case the thread wasn't started yet.
+                    // For st_starting release is done at launch site.
+                    if (s == st_normal) release_handle(my_handle, join);
+                }
+            }
+
+            void ipc_worker::run() {
                 my_server.propagate_chain_reaction();
+
+                // Transiting to st_normal here would require setting my_handle,
+                // which would create race with the launching thread and
+                // complications in handle management on Windows.
+
+                ::rml::job& j = *my_client.create_one_job();
+                state_t state = my_state.load(std::memory_order_acquire);
+                while (state != st_quit && state != st_stop) {
+                    if (my_server.my_slack >= 0) {
+                        my_client.process(j);
+                    } else {
+                        // Check/set the invariant for sleeping
+                        state = my_state.load(std::memory_order_seq_cst);
+                        if (state != st_quit && state != st_stop
+                            && my_server.try_insert_in_asleep_list(*this)) {
+                            if (my_server.my_n_thread > 1) my_server.release_active_thread();
+                            my_thread_monitor.wait();
+                            my_server.propagate_chain_reaction();
+                        }
+                    }
+                    // memory_order_seq_cst to be strictly ordered after thread_monitor::wait
+                    state = my_state.load(std::memory_order_seq_cst);
+                }
+                my_client.cleanup(j);
+
+                my_server.remove_server_ref();
             }
-        }
-        // memory_order_seq_cst to be strictly ordered after thread_monitor::wait
-        state = my_state.load(std::memory_order_seq_cst);
-    }
-    my_client.cleanup(j);
-
-    my_server.remove_server_ref();
-}
-
-inline bool ipc_worker::wake_or_launch() {
-    state_t excepted_stop = st_stop, expected_init = st_init;
-    if( ( my_state.load(std::memory_order_acquire)==st_init && my_state.compare_exchange_strong( expected_init, st_starting ) ) ||
-        ( my_state.load(std::memory_order_acquire)==st_stop && my_state.compare_exchange_strong( excepted_stop, st_starting ) ) ) {
-        // after this point, remove_server_ref() must be done by created thread
+
+            inline bool ipc_worker::wake_or_launch() {
+                state_t excepted_stop = st_stop, expected_init = st_init;
+                if ((my_state.load(std::memory_order_acquire) == st_init
+                     && my_state.compare_exchange_strong(expected_init, st_starting))
+                    || (my_state.load(std::memory_order_acquire) == st_stop
+                        && my_state.compare_exchange_strong(excepted_stop, st_starting))) {
+                    // after this point, remove_server_ref() must be done by created thread
 #if USE_WINTHREAD
-        my_handle = ipc_thread_monitor::launch( thread_routine, this, my_server.my_stack_size, &this->my_index );
+                    my_handle = ipc_thread_monitor::launch(thread_routine, this, my_server.my_stack_size,
+                                                           &this->my_index);
 #elif USE_PTHREAD
-        {
-        affinity_helper fpa;
-        fpa.protect_affinity_mask( /*restore_process_mask=*/true );
-        my_handle = ipc_thread_monitor::launch( thread_routine, this, my_server.my_stack_size );
-        if( my_handle == 0 ) {
-            // Unable to create new thread for process
-            // However, this is expected situation for the use cases of this coordination server
-            state_t s = st_starting;
-            my_state.compare_exchange_strong( s, st_init );
-            if (st_starting != s) {
-                // Do shutdown during startup. my_handle can't be released
-                // by start_shutdown, because my_handle value might be not set yet
-                // at time of transition from st_starting to st_quit.
-                __TBB_ASSERT( s==st_quit, nullptr );
-                release_handle( my_handle, my_server.my_join_workers );
-            }
-            return false;
-        } else {
-            my_server.my_ref_count++;
-        }
-        // Implicit destruction of fpa resets original affinity mask.
-        }
+                    {
+                        affinity_helper fpa;
+                        fpa.protect_affinity_mask(/*restore_process_mask=*/true);
+                        my_handle = ipc_thread_monitor::launch(thread_routine, this, my_server.my_stack_size);
+                        if (my_handle == 0) {
+                            // Unable to create new thread for process
+                            // However, this is expected situation for the use cases of this coordination server
+                            state_t s = st_starting;
+                            my_state.compare_exchange_strong(s, st_init);
+                            if (st_starting != s) {
+                                // Do shutdown during startup. my_handle can't be released
+                                // by start_shutdown, because my_handle value might be not set yet
+                                // at time of transition from st_starting to st_quit.
+                                __TBB_ASSERT(s == st_quit, nullptr);
+                                release_handle(my_handle, my_server.my_join_workers);
+                            }
+                            return false;
+                        } else {
+                            my_server.my_ref_count++;
+                        }
+                        // Implicit destruction of fpa resets original affinity mask.
+                    }
 #endif /* USE_PTHREAD */
-        state_t s = st_starting;
-        my_state.compare_exchange_strong( s, st_normal );
-        if( st_starting!=s ) {
-            // Do shutdown during startup. my_handle can't be released
-            // by start_shutdown, because my_handle value might be not set yet
-            // at time of transition from st_starting to st_quit.
-            __TBB_ASSERT( s==st_quit, nullptr );
-            release_handle( my_handle, my_server.my_join_workers );
-        }
-    }
-    else {
-        my_thread_monitor.notify();
-    }
+                    state_t s = st_starting;
+                    my_state.compare_exchange_strong(s, st_normal);
+                    if (st_starting != s) {
+                        // Do shutdown during startup. my_handle can't be released
+                        // by start_shutdown, because my_handle value might be not set yet
+                        // at time of transition from st_starting to st_quit.
+                        __TBB_ASSERT(s == st_quit, nullptr);
+                        release_handle(my_handle, my_server.my_join_workers);
+                    }
+                } else {
+                    my_thread_monitor.notify();
+                }
 
-    return true;
-}
+                return true;
+            }
 
 //------------------------------------------------------------------------
 // Methods of ipc_waker
 //------------------------------------------------------------------------
 #if _MSC_VER && !defined(__INTEL_COMPILER)
-    // Suppress overzealous compiler warnings about an initialized variable 'sink_for_alloca' not referenced
-    #pragma warning(push)
-    #pragma warning(disable:4189)
+// Suppress overzealous compiler warnings about an initialized variable 'sink_for_alloca' not referenced
+#pragma warning(push)
+#pragma warning(disable : 4189)
 #endif
-#if __MINGW32__ && __GNUC__==4 &&__GNUC_MINOR__>=2 && !__MINGW64__
-// ensure that stack is properly aligned
-__attribute__((force_align_arg_pointer))
+#if __MINGW32__ && __GNUC__ == 4 && __GNUC_MINOR__ >= 2 && !__MINGW64__
+            // ensure that stack is properly aligned
+            __attribute__((force_align_arg_pointer))
 #endif
-__RML_DECL_THREAD_ROUTINE ipc_waker::thread_routine(void* arg) {
-    ipc_waker* self = static_cast<ipc_waker*>(arg);
-    AVOID_64K_ALIASING( self->my_index );
-    self->run();
-    return 0;
-}
+            __RML_DECL_THREAD_ROUTINE
+            ipc_waker::thread_routine(void* arg) {
+                ipc_waker* self = static_cast<ipc_waker*>(arg);
+                AVOID_64K_ALIASING(self->my_index);
+                self->run();
+                return 0;
+            }
 #if _MSC_VER && !defined(__INTEL_COMPILER)
-    #pragma warning(pop)
+#pragma warning(pop)
 #endif
 
-void ipc_waker::run() {
-    // Transiting to st_normal here would require setting my_handle,
-    // which would create race with the launching thread and
-    // complications in handle management on Windows.
-
-    // memory_order_seq_cst to be strictly ordered after thread_monitor::wait on the next iteration
-    while( my_state.load(std::memory_order_seq_cst)!=st_quit ) {
-        bool have_to_sleep = false;
-        if( my_server.my_slack.load(std::memory_order_acquire)>0 ) {
-            if( my_server.wait_active_thread() ) {
-                if( my_server.my_slack.load(std::memory_order_acquire)>0 ) {
-                    my_server.wake_some( 0, 1 );
-                } else {
-                    my_server.release_active_thread();
-                    have_to_sleep = true;
+            void ipc_waker::run() {
+                // Transiting to st_normal here would require setting my_handle,
+                // which would create race with the launching thread and
+                // complications in handle management on Windows.
+
+                // memory_order_seq_cst to be strictly ordered after thread_monitor::wait on the next iteration
+                while (my_state.load(std::memory_order_seq_cst) != st_quit) {
+                    bool have_to_sleep = false;
+                    if (my_server.my_slack.load(std::memory_order_acquire) > 0) {
+                        if (my_server.wait_active_thread()) {
+                            if (my_server.my_slack.load(std::memory_order_acquire) > 0) {
+                                my_server.wake_some(0, 1);
+                            } else {
+                                my_server.release_active_thread();
+                                have_to_sleep = true;
+                            }
+                        }
+                    } else {
+                        have_to_sleep = true;
+                    }
+                    if (have_to_sleep) {
+                        // Check/set the invariant for sleeping
+                        if (my_server.my_slack.load(std::memory_order_acquire) < 0) {
+                            my_thread_monitor.wait();
+                        }
+                    }
                 }
-            }
-        } else {
-            have_to_sleep = true;
-        }
-        if( have_to_sleep ) {
-            // Check/set the invariant for sleeping
-            if( my_server.my_slack.load(std::memory_order_acquire)<0 ) {
-                my_thread_monitor.wait();
-            }
-        }
-    }
 
-    my_server.remove_server_ref();
-}
+                my_server.remove_server_ref();
+            }
 
-inline bool ipc_waker::wake_or_launch() {
-    state_t excepted = st_init;
-    if( ( my_state.load(std::memory_order_acquire)==st_init && my_state.compare_exchange_strong( excepted, st_starting ) ) ) {
-        // after this point, remove_server_ref() must be done by created thread
+            inline bool ipc_waker::wake_or_launch() {
+                state_t excepted = st_init;
+                if ((my_state.load(std::memory_order_acquire) == st_init
+                     && my_state.compare_exchange_strong(excepted, st_starting))) {
+                    // after this point, remove_server_ref() must be done by created thread
 #if USE_WINTHREAD
-        my_handle = ipc_thread_monitor::launch( thread_routine, this, my_server.my_stack_size, &this->my_index );
+                    my_handle = ipc_thread_monitor::launch(thread_routine, this, my_server.my_stack_size,
+                                                           &this->my_index);
 #elif USE_PTHREAD
-        {
-        affinity_helper fpa;
-        fpa.protect_affinity_mask( /*restore_process_mask=*/true );
-        my_handle = ipc_thread_monitor::launch( thread_routine, this, my_server.my_stack_size );
-        if( my_handle == 0 ) {
-            runtime_warning( "Unable to create new thread for process %d", getpid() );
-            state_t s = st_starting;
-            my_state.compare_exchange_strong(s, st_init);
-            if (st_starting != s) {
-                // Do shutdown during startup. my_handle can't be released
-                // by start_shutdown, because my_handle value might be not set yet
-                // at time of transition from st_starting to st_quit.
-                __TBB_ASSERT( s==st_quit, nullptr );
-                release_handle( my_handle, my_server.my_join_workers );
-            }
-            return false;
-        } else {
-            my_server.my_ref_count++;
-        }
-        // Implicit destruction of fpa resets original affinity mask.
-        }
+                    {
+                        affinity_helper fpa;
+                        fpa.protect_affinity_mask(/*restore_process_mask=*/true);
+                        my_handle = ipc_thread_monitor::launch(thread_routine, this, my_server.my_stack_size);
+                        if (my_handle == 0) {
+                            runtime_warning("Unable to create new thread for process %d", getpid());
+                            state_t s = st_starting;
+                            my_state.compare_exchange_strong(s, st_init);
+                            if (st_starting != s) {
+                                // Do shutdown during startup. my_handle can't be released
+                                // by start_shutdown, because my_handle value might be not set yet
+                                // at time of transition from st_starting to st_quit.
+                                __TBB_ASSERT(s == st_quit, nullptr);
+                                release_handle(my_handle, my_server.my_join_workers);
+                            }
+                            return false;
+                        } else {
+                            my_server.my_ref_count++;
+                        }
+                        // Implicit destruction of fpa resets original affinity mask.
+                    }
 #endif /* USE_PTHREAD */
-        state_t s = st_starting;
-        my_state.compare_exchange_strong(s, st_normal);
-        if( st_starting!=s ) {
-            // Do shutdown during startup. my_handle can't be released
-            // by start_shutdown, because my_handle value might be not set yet
-            // at time of transition from st_starting to st_quit.
-            __TBB_ASSERT( s==st_quit, nullptr );
-            release_handle( my_handle, my_server.my_join_workers );
-        }
-    }
-    else {
-        my_thread_monitor.notify();
-    }
+                    state_t s = st_starting;
+                    my_state.compare_exchange_strong(s, st_normal);
+                    if (st_starting != s) {
+                        // Do shutdown during startup. my_handle can't be released
+                        // by start_shutdown, because my_handle value might be not set yet
+                        // at time of transition from st_starting to st_quit.
+                        __TBB_ASSERT(s == st_quit, nullptr);
+                        release_handle(my_handle, my_server.my_join_workers);
+                    }
+                } else {
+                    my_thread_monitor.notify();
+                }
 
-    return true;
-}
+                return true;
+            }
 
 //------------------------------------------------------------------------
 // Methods of ipc_stopper
 //------------------------------------------------------------------------
 #if _MSC_VER && !defined(__INTEL_COMPILER)
-    // Suppress overzealous compiler warnings about an initialized variable 'sink_for_alloca' not referenced
-    #pragma warning(push)
-    #pragma warning(disable:4189)
+// Suppress overzealous compiler warnings about an initialized variable 'sink_for_alloca' not referenced
+#pragma warning(push)
+#pragma warning(disable : 4189)
 #endif
-#if __MINGW32__ && __GNUC__==4 &&__GNUC_MINOR__>=2 && !__MINGW64__
-// ensure that stack is properly aligned
-__attribute__((force_align_arg_pointer))
+#if __MINGW32__ && __GNUC__ == 4 && __GNUC_MINOR__ >= 2 && !__MINGW64__
+            // ensure that stack is properly aligned
+            __attribute__((force_align_arg_pointer))
 #endif
-__RML_DECL_THREAD_ROUTINE ipc_stopper::thread_routine(void* arg) {
-    ipc_stopper* self = static_cast<ipc_stopper*>(arg);
-    AVOID_64K_ALIASING( self->my_index );
-    self->run();
-    return 0;
-}
+            __RML_DECL_THREAD_ROUTINE
+            ipc_stopper::thread_routine(void* arg) {
+                ipc_stopper* self = static_cast<ipc_stopper*>(arg);
+                AVOID_64K_ALIASING(self->my_index);
+                self->run();
+                return 0;
+            }
 #if _MSC_VER && !defined(__INTEL_COMPILER)
-    #pragma warning(pop)
+#pragma warning(pop)
 #endif
 
-void ipc_stopper::run() {
-    // Transiting to st_normal here would require setting my_handle,
-    // which would create race with the launching thread and
-    // complications in handle management on Windows.
-
-    while( my_state.load(std::memory_order_acquire)!=st_quit ) {
-        if( my_server.wait_stop_thread() ) {
-            if( my_state.load(std::memory_order_acquire)!=st_quit ) {
-                if( !my_server.stop_one() ) {
-                    my_server.add_stop_thread();
-                    tbb::detail::r1::prolonged_pause();
+            void ipc_stopper::run() {
+                // Transiting to st_normal here would require setting my_handle,
+                // which would create race with the launching thread and
+                // complications in handle management on Windows.
+
+                while (my_state.load(std::memory_order_acquire) != st_quit) {
+                    if (my_server.wait_stop_thread()) {
+                        if (my_state.load(std::memory_order_acquire) != st_quit) {
+                            if (!my_server.stop_one()) {
+                                my_server.add_stop_thread();
+                                tbb::detail::r1::prolonged_pause();
+                            }
+                        }
+                    }
                 }
-            }
-        }
-    }
 
-    my_server.remove_server_ref();
-}
+                my_server.remove_server_ref();
+            }
 
-inline bool ipc_stopper::wake_or_launch() {
-    state_t excepted = st_init;
-    if( ( my_state.load(std::memory_order_acquire)==st_init && my_state.compare_exchange_strong( excepted, st_starting ) ) ) {
-        // after this point, remove_server_ref() must be done by created thread
+            inline bool ipc_stopper::wake_or_launch() {
+                state_t excepted = st_init;
+                if ((my_state.load(std::memory_order_acquire) == st_init
+                     && my_state.compare_exchange_strong(excepted, st_starting))) {
+                    // after this point, remove_server_ref() must be done by created thread
 #if USE_WINTHREAD
-        my_handle = ipc_thread_monitor::launch( thread_routine, this, my_server.my_stack_size, &this->my_index );
+                    my_handle = ipc_thread_monitor::launch(thread_routine, this, my_server.my_stack_size,
+                                                           &this->my_index);
 #elif USE_PTHREAD
-        {
-        affinity_helper fpa;
-        fpa.protect_affinity_mask( /*restore_process_mask=*/true );
-        my_handle = ipc_thread_monitor::launch( thread_routine, this, my_server.my_stack_size );
-        if( my_handle == 0 ) {
-            runtime_warning( "Unable to create new thread for process %d", getpid() );
-            state_t s = st_starting;
-            my_state.compare_exchange_strong(s, st_init);
-            if (st_starting != s) {
-                // Do shutdown during startup. my_handle can't be released
-                // by start_shutdown, because my_handle value might be not set yet
-                // at time of transition from st_starting to st_quit.
-                __TBB_ASSERT( s==st_quit, nullptr );
-                release_handle( my_handle, my_server.my_join_workers );
-            }
-            return false;
-        } else {
-            my_server.my_ref_count++;
-        }
-        // Implicit destruction of fpa resets original affinity mask.
-        }
+                    {
+                        affinity_helper fpa;
+                        fpa.protect_affinity_mask(/*restore_process_mask=*/true);
+                        my_handle = ipc_thread_monitor::launch(thread_routine, this, my_server.my_stack_size);
+                        if (my_handle == 0) {
+                            runtime_warning("Unable to create new thread for process %d", getpid());
+                            state_t s = st_starting;
+                            my_state.compare_exchange_strong(s, st_init);
+                            if (st_starting != s) {
+                                // Do shutdown during startup. my_handle can't be released
+                                // by start_shutdown, because my_handle value might be not set yet
+                                // at time of transition from st_starting to st_quit.
+                                __TBB_ASSERT(s == st_quit, nullptr);
+                                release_handle(my_handle, my_server.my_join_workers);
+                            }
+                            return false;
+                        } else {
+                            my_server.my_ref_count++;
+                        }
+                        // Implicit destruction of fpa resets original affinity mask.
+                    }
 #endif /* USE_PTHREAD */
-        state_t s = st_starting;
-        my_state.compare_exchange_strong(s, st_normal);
-        if( st_starting!=s ) {
-            // Do shutdown during startup. my_handle can't be released
-            // by start_shutdown, because my_handle value might be not set yet
-            // at time of transition from st_starting to st_quit.
-            __TBB_ASSERT( s==st_quit, nullptr );
-            release_handle( my_handle, my_server.my_join_workers );
-        }
-    }
-    else {
-        my_thread_monitor.notify();
-    }
+                    state_t s = st_starting;
+                    my_state.compare_exchange_strong(s, st_normal);
+                    if (st_starting != s) {
+                        // Do shutdown during startup. my_handle can't be released
+                        // by start_shutdown, because my_handle value might be not set yet
+                        // at time of transition from st_starting to st_quit.
+                        __TBB_ASSERT(s == st_quit, nullptr);
+                        release_handle(my_handle, my_server.my_join_workers);
+                    }
+                } else {
+                    my_thread_monitor.notify();
+                }
 
-    return true;
-}
+                return true;
+            }
 
-//------------------------------------------------------------------------
-// Methods of ipc_server
-//------------------------------------------------------------------------
-ipc_server::ipc_server(tbb_client& client) :
-    my_client( client ),
-    my_stack_size( client.min_stack_size() ),
-    my_thread_array(nullptr),
-    my_join_workers(false),
-    my_waker(nullptr),
-    my_stopper(nullptr)
-{
-    my_ref_count = 1;
-    my_slack = 0;
+            //------------------------------------------------------------------------
+            // Methods of ipc_server
+            //------------------------------------------------------------------------
+            ipc_server::ipc_server(tbb_client& client)
+                : my_client(client), my_stack_size(client.min_stack_size()), my_thread_array(nullptr),
+                  my_join_workers(false), my_waker(nullptr), my_stopper(nullptr) {
+                my_ref_count = 1;
+                my_slack = 0;
 #if TBB_USE_ASSERT
-    my_net_slack_requests = 0;
+                my_net_slack_requests = 0;
 #endif /* TBB_USE_ASSERT */
-    my_n_thread = tbb::internal::rml::get_num_threads(IPC_MAX_THREADS_VAR_NAME);
-    if( my_n_thread==0 ) {
-        my_n_thread = tbb::detail::r1::AvailableHwConcurrency();
-        __TBB_ASSERT( my_n_thread>0, nullptr );
-    }
-
-    my_asleep_list_root = nullptr;
-    my_thread_array = tbb::cache_aligned_allocator<padded_ipc_worker>().allocate( my_n_thread );
-    for( size_t i=0; i<my_n_thread; ++i ) {
-        ipc_worker* t = new( &my_thread_array[i] ) padded_ipc_worker( *this, client, i );
-        t->my_next = my_asleep_list_root;
-        my_asleep_list_root = t;
-    }
-
-    my_waker = tbb::cache_aligned_allocator<ipc_waker>().allocate(1);
-    new( my_waker ) ipc_waker( *this, client, my_n_thread );
-
-    my_stopper = tbb::cache_aligned_allocator<ipc_stopper>().allocate(1);
-    new( my_stopper ) ipc_stopper( *this, client, my_n_thread + 1 );
-
-    char* active_sem_name = get_active_sem_name();
-    my_active_sem = sem_open( active_sem_name, O_CREAT, IPC_SEM_MODE, my_n_thread - 1 );
-    __TBB_ASSERT( my_active_sem, "Unable to open active threads semaphore" );
-    delete[] active_sem_name;
-
-    char* stop_sem_name = get_stop_sem_name();
-    my_stop_sem = sem_open( stop_sem_name, O_CREAT, IPC_SEM_MODE, 0 );
-    __TBB_ASSERT( my_stop_sem, "Unable to open stop threads semaphore" );
-    delete[] stop_sem_name;
-}
-
-ipc_server::~ipc_server() {
-    __TBB_ASSERT( my_net_slack_requests.load(std::memory_order_relaxed)==0, nullptr );
-
-    for( size_t i=my_n_thread; i--; )
-        my_thread_array[i].~padded_ipc_worker();
-    tbb::cache_aligned_allocator<padded_ipc_worker>().deallocate( my_thread_array, my_n_thread );
-    tbb::detail::d0::poison_pointer( my_thread_array );
-
-    my_waker->~ipc_waker();
-    tbb::cache_aligned_allocator<ipc_waker>().deallocate( my_waker, 1 );
-    tbb::detail::d0::poison_pointer( my_waker );
-
-    my_stopper->~ipc_stopper();
-    tbb::cache_aligned_allocator<ipc_stopper>().deallocate( my_stopper, 1 );
-    tbb::detail::d0::poison_pointer( my_stopper );
-
-    sem_close( my_active_sem );
-    sem_close( my_stop_sem );
-}
-
-inline bool ipc_server::try_insert_in_asleep_list(ipc_worker& t) {
-    asleep_list_mutex_type::scoped_lock lock;
-    if( !lock.try_acquire( my_asleep_list_mutex ) )
-        return false;
-    // Contribute to slack under lock so that if another takes that unit of slack,
-    // it sees us sleeping on the list and wakes us up.
-    int k = ++my_slack;
-    if( k<=0 ) {
-        t.my_next = my_asleep_list_root.load(std::memory_order_relaxed);
-        my_asleep_list_root.store(&t, std::memory_order_relaxed);
-        return true;
-    } else {
-        --my_slack;
-        return false;
-    }
-}
-
-inline bool ipc_server::try_insert_in_asleep_list_forced(ipc_worker& t) {
-    asleep_list_mutex_type::scoped_lock lock;
-    if( !lock.try_acquire( my_asleep_list_mutex ) )
-        return false;
-    // Contribute to slack under lock so that if another takes that unit of slack,
-    // it sees us sleeping on the list and wakes us up.
-    ++my_slack;
-    t.my_next = my_asleep_list_root.load(std::memory_order_relaxed);
-    my_asleep_list_root.store(&t, std::memory_order_relaxed);
-    return true;
-}
-
-inline bool ipc_server::wait_active_thread() {
-    if( sem_wait( my_active_sem ) == 0 ) {
-        ++my_global_thread_count;
-        return true;
-    }
-    return false;
-}
-
-inline bool ipc_server::try_get_active_thread() {
-    if( sem_trywait( my_active_sem ) == 0 ) {
-        ++my_global_thread_count;
-        return true;
-    }
-    return false;
-}
-
-inline void ipc_server::release_active_thread() {
-    release_thread_sem( my_active_sem );
-}
-
-inline bool ipc_server::wait_stop_thread() {
-    struct timespec ts;
-    if( clock_gettime( CLOCK_REALTIME, &ts )==0 ) {
-        ts.tv_sec++;
-        if( sem_timedwait( my_stop_sem, &ts )==0 ) {
-            return true;
-        }
-    }
-    return false;
-}
-
-inline void ipc_server::add_stop_thread() {
-    sem_post( my_stop_sem );
-}
-
-void ipc_server::wake_some( int additional_slack, int active_threads ) {
-    __TBB_ASSERT( additional_slack>=0, nullptr );
-    ipc_worker* wakee[2];
-    ipc_worker **w = wakee;
-    {
-        asleep_list_mutex_type::scoped_lock lock(my_asleep_list_mutex);
-        while( active_threads>0 && my_asleep_list_root.load(std::memory_order_relaxed) && w<wakee+2 ) {
-            if( additional_slack>0 ) {
-                if( additional_slack+my_slack.load(std::memory_order_acquire)<=0 ) // additional demand does not exceed surplus supply
-                    break;
-                --additional_slack;
-            } else {
-                // Chain reaction; Try to claim unit of slack
-                int old;
-                do {
-                    old = my_slack.load(std::memory_order_relaxed);
-                    if( old<=0 ) goto done;
-                } while( !my_slack.compare_exchange_strong( old, old-1 ) );
+                my_n_thread = tbb::internal::rml::get_num_threads(IPC_MAX_THREADS_VAR_NAME);
+                if (my_n_thread == 0) {
+                    my_n_thread = tbb::detail::r1::AvailableHwConcurrency();
+                    __TBB_ASSERT(my_n_thread > 0, nullptr);
+                }
+
+                my_asleep_list_root = nullptr;
+                my_thread_array = tbb::cache_aligned_allocator<padded_ipc_worker>().allocate(my_n_thread);
+                for (size_t i = 0; i < my_n_thread; ++i) {
+                    ipc_worker* t = new (&my_thread_array[i]) padded_ipc_worker(*this, client, i);
+                    t->my_next = my_asleep_list_root;
+                    my_asleep_list_root = t;
+                }
+
+                my_waker = tbb::cache_aligned_allocator<ipc_waker>().allocate(1);
+                new (my_waker) ipc_waker(*this, client, my_n_thread);
+
+                my_stopper = tbb::cache_aligned_allocator<ipc_stopper>().allocate(1);
+                new (my_stopper) ipc_stopper(*this, client, my_n_thread + 1);
+
+                char* active_sem_name = get_active_sem_name();
+                my_active_sem = sem_open(active_sem_name, O_CREAT, IPC_SEM_MODE, my_n_thread - 1);
+                __TBB_ASSERT(my_active_sem, "Unable to open active threads semaphore");
+                delete[] active_sem_name;
+
+                char* stop_sem_name = get_stop_sem_name();
+                my_stop_sem = sem_open(stop_sem_name, O_CREAT, IPC_SEM_MODE, 0);
+                __TBB_ASSERT(my_stop_sem, "Unable to open stop threads semaphore");
+                delete[] stop_sem_name;
             }
-            // Pop sleeping worker to combine with claimed unit of slack
-            my_asleep_list_root.store(
-                (*w++ = my_asleep_list_root.load(std::memory_order_relaxed))->my_next,
-                std::memory_order_relaxed
-            );
-            --active_threads;
-        }
-        if( additional_slack ) {
-            // Contribute our unused slack to my_slack.
-            my_slack += additional_slack;
-        }
-    }
-done:
-    while( w>wakee ) {
-        if( !(*--w)->wake_or_launch() ) {
-            add_stop_thread();
-            do {
-            } while( !try_insert_in_asleep_list_forced(**w) );
-            release_active_thread();
-        }
-    }
-    while( active_threads ) {
-        release_active_thread();
-        --active_threads;
-    }
-}
-
-void ipc_server::wake_one_forced( int additional_slack ) {
-    __TBB_ASSERT( additional_slack>=0, nullptr );
-    ipc_worker* wakee[1];
-    ipc_worker **w = wakee;
-    {
-        asleep_list_mutex_type::scoped_lock lock(my_asleep_list_mutex);
-        while( my_asleep_list_root.load(std::memory_order_relaxed) && w<wakee+1 ) {
-            if( additional_slack>0 ) {
-                if( additional_slack+my_slack.load(std::memory_order_acquire)<=0 ) // additional demand does not exceed surplus supply
-                    break;
-                --additional_slack;
-            } else {
-                // Chain reaction; Try to claim unit of slack
-                int old;
-                do {
-                    old = my_slack.load(std::memory_order_relaxed);
-                    if( old<=0 ) goto done;
-                } while( !my_slack.compare_exchange_strong( old, old-1 ) );
+
+            ipc_server::~ipc_server() {
+                __TBB_ASSERT(my_net_slack_requests.load(std::memory_order_relaxed) == 0, nullptr);
+
+                for (size_t i = my_n_thread; i--;) my_thread_array[i].~padded_ipc_worker();
+                tbb::cache_aligned_allocator<padded_ipc_worker>().deallocate(my_thread_array, my_n_thread);
+                tbb::detail::d0::poison_pointer(my_thread_array);
+
+                my_waker->~ipc_waker();
+                tbb::cache_aligned_allocator<ipc_waker>().deallocate(my_waker, 1);
+                tbb::detail::d0::poison_pointer(my_waker);
+
+                my_stopper->~ipc_stopper();
+                tbb::cache_aligned_allocator<ipc_stopper>().deallocate(my_stopper, 1);
+                tbb::detail::d0::poison_pointer(my_stopper);
+
+                sem_close(my_active_sem);
+                sem_close(my_stop_sem);
             }
-            // Pop sleeping worker to combine with claimed unit of slack
-            my_asleep_list_root.store(
-                (*w++ = my_asleep_list_root.load(std::memory_order_relaxed))->my_next,
-                std::memory_order_relaxed);
-        }
-        if( additional_slack ) {
-            // Contribute our unused slack to my_slack.
-            my_slack += additional_slack;
-        }
-    }
-done:
-    while( w>wakee ) {
-        if( !(*--w)->wake_or_launch() ) {
-            add_stop_thread();
-            do {
-            } while( !try_insert_in_asleep_list_forced(**w) );
-        }
-    }
-}
-
-bool ipc_server::stop_one() {
-    ipc_worker* current = nullptr;
-    ipc_worker* next = nullptr;
-    {
-        asleep_list_mutex_type::scoped_lock lock(my_asleep_list_mutex);
-        if( my_asleep_list_root.load(std::memory_order_relaxed) ) {
-            current = my_asleep_list_root.load(std::memory_order_relaxed);
-            if( current->my_state.load(std::memory_order_relaxed)==ipc_worker::st_normal ) {
-                next = current->my_next;
-                while( next!= nullptr && next->my_state.load(std::memory_order_relaxed)==ipc_worker::st_normal ) {
-                    current = next;
-                    next = current->my_next;
+
+            inline bool ipc_server::try_insert_in_asleep_list(ipc_worker& t) {
+                asleep_list_mutex_type::scoped_lock lock;
+                if (!lock.try_acquire(my_asleep_list_mutex)) return false;
+                // Contribute to slack under lock so that if another takes that unit of slack,
+                // it sees us sleeping on the list and wakes us up.
+                int k = ++my_slack;
+                if (k <= 0) {
+                    t.my_next = my_asleep_list_root.load(std::memory_order_relaxed);
+                    my_asleep_list_root.store(&t, std::memory_order_relaxed);
+                    return true;
+                } else {
+                    --my_slack;
+                    return false;
                 }
-                current->start_stopping( my_join_workers );
+            }
+
+            inline bool ipc_server::try_insert_in_asleep_list_forced(ipc_worker& t) {
+                asleep_list_mutex_type::scoped_lock lock;
+                if (!lock.try_acquire(my_asleep_list_mutex)) return false;
+                // Contribute to slack under lock so that if another takes that unit of slack,
+                // it sees us sleeping on the list and wakes us up.
+                ++my_slack;
+                t.my_next = my_asleep_list_root.load(std::memory_order_relaxed);
+                my_asleep_list_root.store(&t, std::memory_order_relaxed);
                 return true;
             }
-        }
-    }
-    return false;
-}
 
-void ipc_server::adjust_job_count_estimate( int delta ) {
-#if TBB_USE_ASSERT
-    my_net_slack_requests+=delta;
-#endif /* TBB_USE_ASSERT */
-    if( my_n_thread > 1 ) {
-        if( delta<0 ) {
-            my_slack+=delta;
-        } else if( delta>0 ) {
-            int active_threads = 0;
-            if( try_get_active_thread() ) {
-                ++active_threads;
-                if( try_get_active_thread() ) {
-                    ++active_threads;
+            inline bool ipc_server::wait_active_thread() {
+                if (sem_wait(my_active_sem) == 0) {
+                    ++my_global_thread_count;
+                    return true;
                 }
+                return false;
             }
-            wake_some( delta, active_threads );
 
-            if( !my_waker->wake_or_launch() ) {
-                add_stop_thread();
+            inline bool ipc_server::try_get_active_thread() {
+                if (sem_trywait(my_active_sem) == 0) {
+                    ++my_global_thread_count;
+                    return true;
+                }
+                return false;
             }
-            if( !my_stopper->wake_or_launch() ) {
-                add_stop_thread();
+
+            inline void ipc_server::release_active_thread() { release_thread_sem(my_active_sem); }
+
+            inline bool ipc_server::wait_stop_thread() {
+                struct timespec ts;
+                if (clock_gettime(CLOCK_REALTIME, &ts) == 0) {
+                    ts.tv_sec++;
+                    if (sem_timedwait(my_stop_sem, &ts) == 0) { return true; }
+                }
+                return false;
             }
-        }
-    } else { // Corner case when RML shouldn't provide any worker thread but client has to have at least one
-        if( delta<0 ) {
-            my_slack += delta;
-        } else {
-            wake_one_forced( delta );
-        }
-    }
-}
 
-//------------------------------------------------------------------------
-// RML factory methods
-//------------------------------------------------------------------------
+            inline void ipc_server::add_stop_thread() { sem_post(my_stop_sem); }
+
+            void ipc_server::wake_some(int additional_slack, int active_threads) {
+                __TBB_ASSERT(additional_slack >= 0, nullptr);
+                ipc_worker* wakee[2];
+                ipc_worker** w = wakee;
+                {
+                    asleep_list_mutex_type::scoped_lock lock(my_asleep_list_mutex);
+                    while (active_threads > 0 && my_asleep_list_root.load(std::memory_order_relaxed)
+                           && w < wakee + 2) {
+                        if (additional_slack > 0) {
+                            if (additional_slack + my_slack.load(std::memory_order_acquire)
+                                <= 0)// additional demand does not exceed surplus supply
+                                break;
+                            --additional_slack;
+                        } else {
+                            // Chain reaction; Try to claim unit of slack
+                            int old;
+                            do {
+                                old = my_slack.load(std::memory_order_relaxed);
+                                if (old <= 0) goto done;
+                            } while (!my_slack.compare_exchange_strong(old, old - 1));
+                        }
+                        // Pop sleeping worker to combine with claimed unit of slack
+                        my_asleep_list_root.store(
+                                (*w++ = my_asleep_list_root.load(std::memory_order_relaxed))->my_next,
+                                std::memory_order_relaxed);
+                        --active_threads;
+                    }
+                    if (additional_slack) {
+                        // Contribute our unused slack to my_slack.
+                        my_slack += additional_slack;
+                    }
+                }
+            done:
+                while (w > wakee) {
+                    if (!(*--w)->wake_or_launch()) {
+                        add_stop_thread();
+                        do {
+                        } while (!try_insert_in_asleep_list_forced(**w));
+                        release_active_thread();
+                    }
+                }
+                while (active_threads) {
+                    release_active_thread();
+                    --active_threads;
+                }
+            }
+
+            void ipc_server::wake_one_forced(int additional_slack) {
+                __TBB_ASSERT(additional_slack >= 0, nullptr);
+                ipc_worker* wakee[1];
+                ipc_worker** w = wakee;
+                {
+                    asleep_list_mutex_type::scoped_lock lock(my_asleep_list_mutex);
+                    while (my_asleep_list_root.load(std::memory_order_relaxed) && w < wakee + 1) {
+                        if (additional_slack > 0) {
+                            if (additional_slack + my_slack.load(std::memory_order_acquire)
+                                <= 0)// additional demand does not exceed surplus supply
+                                break;
+                            --additional_slack;
+                        } else {
+                            // Chain reaction; Try to claim unit of slack
+                            int old;
+                            do {
+                                old = my_slack.load(std::memory_order_relaxed);
+                                if (old <= 0) goto done;
+                            } while (!my_slack.compare_exchange_strong(old, old - 1));
+                        }
+                        // Pop sleeping worker to combine with claimed unit of slack
+                        my_asleep_list_root.store(
+                                (*w++ = my_asleep_list_root.load(std::memory_order_relaxed))->my_next,
+                                std::memory_order_relaxed);
+                    }
+                    if (additional_slack) {
+                        // Contribute our unused slack to my_slack.
+                        my_slack += additional_slack;
+                    }
+                }
+            done:
+                while (w > wakee) {
+                    if (!(*--w)->wake_or_launch()) {
+                        add_stop_thread();
+                        do { } while (!try_insert_in_asleep_list_forced(**w)); }
+                }
+            }
+
+            bool ipc_server::stop_one() {
+                ipc_worker* current = nullptr;
+                ipc_worker* next = nullptr;
+                {
+                    asleep_list_mutex_type::scoped_lock lock(my_asleep_list_mutex);
+                    if (my_asleep_list_root.load(std::memory_order_relaxed)) {
+                        current = my_asleep_list_root.load(std::memory_order_relaxed);
+                        if (current->my_state.load(std::memory_order_relaxed) == ipc_worker::st_normal) {
+                            next = current->my_next;
+                            while (next != nullptr
+                                   && next->my_state.load(std::memory_order_relaxed)
+                                              == ipc_worker::st_normal) {
+                                current = next;
+                                next = current->my_next;
+                            }
+                            current->start_stopping(my_join_workers);
+                            return true;
+                        }
+                    }
+                }
+                return false;
+            }
+
+            void ipc_server::adjust_job_count_estimate(int delta) {
+#if TBB_USE_ASSERT
+                my_net_slack_requests += delta;
+#endif /* TBB_USE_ASSERT */
+                if (my_n_thread > 1) {
+                    if (delta < 0) {
+                        my_slack += delta;
+                    } else if (delta > 0) {
+                        int active_threads = 0;
+                        if (try_get_active_thread()) {
+                            ++active_threads;
+                            if (try_get_active_thread()) { ++active_threads; }
+                        }
+                        wake_some(delta, active_threads);
+
+                        if (!my_waker->wake_or_launch()) { add_stop_thread(); }
+                        if (!my_stopper->wake_or_launch()) { add_stop_thread(); }
+                    }
+                } else {// Corner case when RML shouldn't provide any worker thread but client has to have at least one
+                    if (delta < 0) {
+                        my_slack += delta;
+                    } else {
+                        wake_one_forced(delta);
+                    }
+                }
+            }
+
+            //------------------------------------------------------------------------
+            // RML factory methods
+            //------------------------------------------------------------------------
 
 #if USE_PTHREAD
 
-static tbb_client* my_global_client = nullptr;
-static tbb_server* my_global_server = nullptr;
+            static tbb_client* my_global_client = nullptr;
+            static tbb_server* my_global_server = nullptr;
 
-void rml_atexit() {
-    release_resources();
-}
+            void rml_atexit() { release_resources(); }
 
-void rml_atfork_child() {
-    if( my_global_server!=nullptr && my_global_client!=nullptr ) {
-        ipc_server* server = static_cast<ipc_server*>( my_global_server );
-        server->~ipc_server();
-        // memset( server, 0, sizeof(ipc_server) );
-        new( server ) ipc_server( *my_global_client );
-        pthread_atfork( nullptr, nullptr, rml_atfork_child );
-        atexit( rml_atexit );
-    }
-}
+            void rml_atfork_child() {
+                if (my_global_server != nullptr && my_global_client != nullptr) {
+                    ipc_server* server = static_cast<ipc_server*>(my_global_server);
+                    server->~ipc_server();
+                    // memset( server, 0, sizeof(ipc_server) );
+                    new (server) ipc_server(*my_global_client);
+                    pthread_atfork(nullptr, nullptr, rml_atfork_child);
+                    atexit(rml_atexit);
+                }
+            }
 
 #endif /* USE_PTHREAD */
 
-extern "C" tbb_factory::status_type __TBB_make_rml_server(tbb_factory& /*f*/, tbb_server*& server, tbb_client& client) {
-    server = new( tbb::cache_aligned_allocator<ipc_server>().allocate(1) ) ipc_server(client);
+            extern "C" tbb_factory::status_type __TBB_make_rml_server(tbb_factory& /*f*/, tbb_server*& server,
+                                                                      tbb_client& client) {
+                server = new (tbb::cache_aligned_allocator<ipc_server>().allocate(1)) ipc_server(client);
 #if USE_PTHREAD
-    my_global_client = &client;
-    my_global_server = server;
-    pthread_atfork( nullptr, nullptr, rml_atfork_child );
-    atexit( rml_atexit );
+                my_global_client = &client;
+                my_global_server = server;
+                pthread_atfork(nullptr, nullptr, rml_atfork_child);
+                atexit(rml_atexit);
 #endif /* USE_PTHREAD */
-    if( getenv( "RML_DEBUG" ) ) {
-        runtime_warning("IPC server is started");
-    }
-    return tbb_factory::st_success;
-}
+                if (getenv("RML_DEBUG")) { runtime_warning("IPC server is started"); }
+                return tbb_factory::st_success;
+            }
 
-extern "C" void __TBB_call_with_my_server_info(::rml::server_info_callback_t /*cb*/, void* /*arg*/) {
-}
+            extern "C" void __TBB_call_with_my_server_info(::rml::server_info_callback_t /*cb*/,
+                                                           void* /*arg*/) {}
 
-} // namespace rml
-} // namespace detail
+        }// namespace rml
+    }    // namespace detail
 
-} // namespace tbb
+}// namespace tbb
diff --git a/external/tbb/python/rml/ipc_utils.cpp b/external/tbb/python/rml/ipc_utils.cpp
index 259d692e..80f2754f 100644
--- a/external/tbb/python/rml/ipc_utils.cpp
+++ b/external/tbb/python/rml/ipc_utils.cpp
@@ -16,125 +16,105 @@
 
 #include "ipc_utils.h"
 
-#include <stdlib.h>
-#include <stdio.h>
 #include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
 namespace tbb {
-namespace internal {
-namespace rml {
+    namespace internal {
+        namespace rml {
 
 #define MAX_STR_LEN 255
 #define STARTTIME_ITEM_ID 21
 
-static char* get_stat_item(char* line, int item_id) {
-    int id = 0, i = 0;
-
-    while( id!=item_id ) {
-        while( line[i]!='(' && line[i]!=' ' && line[i]!='\0' ) {
-            ++i;
-        }
-        if( line[i]==' ' ) {
-            ++id;
-            ++i;
-        } else if( line[i]=='(' ) {
-            while( line[i]!=')' && line[i]!='\0' ) {
-               ++i;
+            static char* get_stat_item(char* line, int item_id) {
+                int id = 0, i = 0;
+
+                while (id != item_id) {
+                    while (line[i] != '(' && line[i] != ' ' && line[i] != '\0') { ++i; }
+                    if (line[i] == ' ') {
+                        ++id;
+                        ++i;
+                    } else if (line[i] == '(') {
+                        while (line[i] != ')' && line[i] != '\0') { ++i; }
+                        if (line[i] == ')') {
+                            ++i;
+                        } else {
+                            return nullptr;
+                        }
+                    } else {
+                        return nullptr;
+                    }
+                }
+
+                return line + i;
+            }
+
+            unsigned long long get_start_time(int pid) {
+                const char* stat_file_path_template = "/proc/%d/stat";
+                char stat_file_path[MAX_STR_LEN + 1];
+                sprintf(stat_file_path, stat_file_path_template, pid);
+
+                FILE* stat_file = fopen(stat_file_path, "rt");
+                if (stat_file == nullptr) { return 0; }
+
+                char stat_line[MAX_STR_LEN + 1];
+                char* line = fgets(stat_line, MAX_STR_LEN, stat_file);
+                if (line == nullptr) { return 0; }
+
+                char* starttime_str = get_stat_item(stat_line, STARTTIME_ITEM_ID);
+                if (starttime_str == nullptr) { return 0; }
+
+                unsigned long long starttime = strtoull(starttime_str, nullptr, 10);
+                if (starttime == ULLONG_MAX) { return 0; }
+
+                return starttime;
+            }
+
+            char* get_shared_name(const char* prefix, int pid, unsigned long long time) {
+                const char* name_template = "%s_%d_%llu";
+                const int digits_in_int = 10;
+                const int digits_in_long = 20;
+
+                int len = strlen(name_template) + strlen(prefix) + digits_in_int + digits_in_long + 1;
+                char* name = new char[len];
+                sprintf(name, name_template, prefix, pid, time);
+
+                return name;
+            }
+
+            char* get_shared_name(const char* prefix) {
+                int pid = getpgrp();
+                unsigned long long time = get_start_time(pid);
+                return get_shared_name(prefix, pid, time);
             }
-            if( line[i]==')' ) {
-                ++i;
-            } else {
-                return nullptr;
+
+            int get_num_threads(const char* env_var) {
+                if (env_var == nullptr) { return 0; }
+
+                char* value = getenv(env_var);
+                if (value == nullptr) { return 0; }
+
+                int num_threads = (int) strtol(value, nullptr, 10);
+                return num_threads;
             }
-        } else {
-            return nullptr;
-        }
-    }
-
-    return line + i;
-}
-
-unsigned long long get_start_time(int pid) {
-    const char* stat_file_path_template = "/proc/%d/stat";
-    char stat_file_path[MAX_STR_LEN + 1];
-    sprintf( stat_file_path, stat_file_path_template, pid );
-
-    FILE* stat_file = fopen( stat_file_path, "rt" );
-    if( stat_file==nullptr ) {
-        return 0;
-    }
-
-    char stat_line[MAX_STR_LEN + 1];
-    char* line = fgets( stat_line, MAX_STR_LEN, stat_file );
-    if( line==nullptr ) {
-        return 0;
-    }
-
-    char* starttime_str = get_stat_item( stat_line, STARTTIME_ITEM_ID );
-    if( starttime_str==nullptr ) {
-        return 0;
-    }
-
-    unsigned long long starttime = strtoull( starttime_str, nullptr, 10 );
-    if( starttime==ULLONG_MAX ) {
-        return 0;
-    }
-
-    return starttime;
-}
-
-char* get_shared_name(const char* prefix, int pid, unsigned long long time) {
-    const char* name_template = "%s_%d_%llu";
-    const int digits_in_int = 10;
-    const int digits_in_long = 20;
-
-    int len = strlen( name_template ) + strlen( prefix ) + digits_in_int + digits_in_long + 1;
-    char* name = new char[len];
-    sprintf( name, name_template, prefix, pid, time );
-
-    return name;
-}
-
-char* get_shared_name(const char* prefix) {
-    int pid = getpgrp();
-    unsigned long long time = get_start_time( pid );
-    return get_shared_name( prefix, pid, time );
-}
-
-int get_num_threads(const char* env_var) {
-    if( env_var==nullptr ) {
-        return 0;
-    }
-
-    char* value = getenv( env_var );
-    if( value==nullptr ) {
-        return 0;
-    }
-
-    int num_threads = (int)strtol( value, nullptr, 10 );
-    return num_threads;
-}
-
-bool get_enable_flag(const char* env_var) {
-    if( env_var==nullptr ) {
-        return false;
-    }
-
-    char* value = getenv( env_var );
-    if( value==nullptr ) {
-        return false;
-    }
-
-    if( strcmp( value, "0" ) == 0 ||
-        strcmp( value, "false" ) == 0 ||
-        strcmp( value, "False" ) == 0 ||
-        strcmp( value, "FALSE" ) == 0 ) {
-        return false;
-    }
-
-    return true;
-}
-
-}}} // namespace tbb::internal::rml
+
+            bool get_enable_flag(const char* env_var) {
+                if (env_var == nullptr) { return false; }
+
+                char* value = getenv(env_var);
+                if (value == nullptr) { return false; }
+
+                if (strcmp(value, "0") == 0 || strcmp(value, "false") == 0 || strcmp(value, "False") == 0
+                    || strcmp(value, "FALSE") == 0) {
+                    return false;
+                }
+
+                return true;
+            }
+
+        }// namespace rml
+    }    // namespace internal
+}// namespace tbb
diff --git a/external/tbb/src/tbb/address_waiter.cpp b/external/tbb/src/tbb/address_waiter.cpp
index 1fd3dea8..e6f40bf3 100644
--- a/external/tbb/src/tbb/address_waiter.cpp
+++ b/external/tbb/src/tbb/address_waiter.cpp
@@ -14,93 +14,87 @@
     limitations under the License.
 */
 
-#include "oneapi/tbb/detail/_utils.h"
-#include "governor.h"
 #include "concurrent_monitor.h"
+#include "governor.h"
+#include "oneapi/tbb/detail/_utils.h"
 #include "oneapi/tbb/detail/_waitable_atomic.h"
 
 #include <type_traits>
 
 namespace tbb {
-namespace detail {
-namespace r1 {
-
-struct address_context {
-    address_context() = default;
-
-    address_context(void* address, std::uintptr_t context) :
-        my_address(address), my_context(context)
-    {}
-
-    void* my_address{nullptr};
-    std::uintptr_t my_context{0};
-};
-
-class address_waiter : public concurrent_monitor_base<address_context> {
-    using base_type = concurrent_monitor_base<address_context>;
-public:
-    using base_type::base_type;
-    /** per-thread descriptor for concurrent_monitor */
-    using thread_context = sleep_node<address_context>;
-};
-
-// 1024 is a rough estimate based on two assumptions:
-//   1) there are no more than 1000 threads in the application;
-//   2) the mutexes are optimized for short critical sections less than a couple of microseconds,
-//      which is less than 1/1000 of a time slice.
-// In the worst case, we have single mutex that is locked and its thread is preempted.
-// Therefore, the probability of a collision while taking unrelated mutex is about 1/size of a table.
-static constexpr std::size_t num_address_waiters = 2 << 10;
-static_assert(std::is_standard_layout<address_waiter>::value,
-              "address_waiter must be with standard layout");
-static address_waiter address_waiter_table[num_address_waiters];
-
-void clear_address_waiter_table() {
-    for (std::size_t i = 0; i < num_address_waiters; ++i) {
-        address_waiter_table[i].destroy();
-    }
-}
-
-static address_waiter& get_address_waiter(void* address) {
-    std::uintptr_t tag = std::uintptr_t(address);
-    return address_waiter_table[((tag >> 5) ^ tag) % num_address_waiters];
-}
-
-void wait_on_address(void* address, d1::delegate_base& predicate, std::uintptr_t context) {
-    address_waiter& waiter = get_address_waiter(address);
-    waiter.wait<address_waiter::thread_context>(predicate, address_context{address, context});
-}
-
-void notify_by_address(void* address, std::uintptr_t target_context) {
-    address_waiter& waiter = get_address_waiter(address);
-
-    auto predicate = [address, target_context] (address_context ctx) {
-        return ctx.my_address == address && ctx.my_context == target_context;
-    };
-
-    waiter.notify_relaxed(predicate);
-}
-
-void notify_by_address_one(void* address) {
-    address_waiter& waiter = get_address_waiter(address);
-
-    auto predicate = [address] (address_context ctx) {
-        return ctx.my_address == address;
-    };
-
-    waiter.notify_one_relaxed(predicate);
-}
-
-void notify_by_address_all(void* address) {
-    address_waiter& waiter = get_address_waiter(address);
-
-    auto predicate = [address] (address_context ctx) {
-        return ctx.my_address == address;
-    };
-
-    waiter.notify_relaxed(predicate);
-}
-
-} // namespace r1
-} // namespace detail
-} // namespace tbb
+    namespace detail {
+        namespace r1 {
+
+            struct address_context {
+                address_context() = default;
+
+                address_context(void* address, std::uintptr_t context)
+                    : my_address(address), my_context(context) {}
+
+                void* my_address {nullptr};
+                std::uintptr_t my_context {0};
+            };
+
+            class address_waiter : public concurrent_monitor_base<address_context> {
+                using base_type = concurrent_monitor_base<address_context>;
+
+            public:
+                using base_type::base_type;
+                /** per-thread descriptor for concurrent_monitor */
+                using thread_context = sleep_node<address_context>;
+            };
+
+            // 1024 is a rough estimate based on two assumptions:
+            //   1) there are no more than 1000 threads in the application;
+            //   2) the mutexes are optimized for short critical sections less than a couple of microseconds,
+            //      which is less than 1/1000 of a time slice.
+            // In the worst case, we have single mutex that is locked and its thread is preempted.
+            // Therefore, the probability of a collision while taking unrelated mutex is about 1/size of a table.
+            static constexpr std::size_t num_address_waiters = 2 << 10;
+            static_assert(std::is_standard_layout<address_waiter>::value,
+                          "address_waiter must be with standard layout");
+            static address_waiter address_waiter_table[num_address_waiters];
+
+            void clear_address_waiter_table() {
+                for (std::size_t i = 0; i < num_address_waiters; ++i) { address_waiter_table[i].destroy(); }
+            }
+
+            static address_waiter& get_address_waiter(void* address) {
+                std::uintptr_t tag = std::uintptr_t(address);
+                return address_waiter_table[((tag >> 5) ^ tag) % num_address_waiters];
+            }
+
+            void wait_on_address(void* address, d1::delegate_base& predicate, std::uintptr_t context) {
+                address_waiter& waiter = get_address_waiter(address);
+                waiter.wait<address_waiter::thread_context>(predicate, address_context {address, context});
+            }
+
+            void notify_by_address(void* address, std::uintptr_t target_context) {
+                address_waiter& waiter = get_address_waiter(address);
+
+                auto predicate = [address, target_context](address_context ctx) {
+                    return ctx.my_address == address && ctx.my_context == target_context;
+                };
+
+                waiter.notify_relaxed(predicate);
+            }
+
+            void notify_by_address_one(void* address) {
+                address_waiter& waiter = get_address_waiter(address);
+
+                auto predicate = [address](address_context ctx) { return ctx.my_address == address; };
+
+                waiter.notify_one_relaxed(predicate);
+            }
+
+            void notify_by_address_all(void* address) {
+                address_waiter& waiter = get_address_waiter(address);
+
+                auto predicate = [address](address_context ctx) { return ctx.my_address == address; };
+
+                waiter.notify_relaxed(predicate);
+            }
+
+        }// namespace r1
+    }    // namespace detail
+}// namespace tbb
diff --git a/external/tbb/src/tbb/allocator.cpp b/external/tbb/src/tbb/allocator.cpp
index 689c5125..7d3089a6 100644
--- a/external/tbb/src/tbb/allocator.cpp
+++ b/external/tbb/src/tbb/allocator.cpp
@@ -16,11 +16,11 @@
 
 #include "oneapi/tbb/version.h"
 
-#include "oneapi/tbb/detail/_exception.h"
+#include "oneapi/tbb/cache_aligned_allocator.h"
 #include "oneapi/tbb/detail/_assert.h"
+#include "oneapi/tbb/detail/_exception.h"
 #include "oneapi/tbb/detail/_utils.h"
-#include "oneapi/tbb/tbb_allocator.h" // Is this OK?
-#include "oneapi/tbb/cache_aligned_allocator.h"
+#include "oneapi/tbb/tbb_allocator.h"// Is this OK?
 
 #include "dynamic_link.h"
 #include "misc.h"
@@ -34,20 +34,20 @@
 #endif
 
 #if (!defined(_WIN32) && !defined(_WIN64)) || defined(__CYGWIN__)
-#include <stdlib.h> // posix_memalign, free
+#include <stdlib.h>// posix_memalign, free
 // With glibc, uClibc and musl on Linux and bionic on Android it is safe to use memalign(), as the allocated memory
 // can be freed with free(). It is also better to use memalign() since posix_memalign() is just a wrapper on top of
 // memalign() and it offers nothing but overhead due to inconvenient interface. This is likely the case with other
 // standard libraries as well, and more libraries can be added to the preprocessor check below. Unfortunately, we
 // can't detect musl, so we simply enable memalign() on Linux and Android in general.
 #if defined(linux) || defined(__linux) || defined(__linux__) || defined(__ANDROID__)
-#include <malloc.h> // memalign
+#include <malloc.h>// memalign
 #define __TBB_USE_MEMALIGN
 #else
 #define __TBB_USE_POSIX_MEMALIGN
 #endif
 #elif defined(_MSC_VER) || defined(__MINGW32__)
-#include <malloc.h> // _aligned_malloc, _aligned_free
+#include <malloc.h>// _aligned_malloc, _aligned_free
 #define __TBB_USE_MSVC_ALIGNED_MALLOC
 #endif
 
@@ -59,54 +59,54 @@
 #pragma weak scalable_aligned_free
 
 extern "C" {
-    void* scalable_malloc(std::size_t);
-    void  scalable_free(void*);
-    void* scalable_aligned_malloc(std::size_t, std::size_t);
-    void  scalable_aligned_free(void*);
+void* scalable_malloc(std::size_t);
+void scalable_free(void*);
+void* scalable_aligned_malloc(std::size_t, std::size_t);
+void scalable_aligned_free(void*);
 }
 
 #endif /* __TBB_WEAK_SYMBOLS_PRESENT */
 
 namespace tbb {
-namespace detail {
-namespace r1 {
+    namespace detail {
+        namespace r1 {
 
-//! Initialization routine used for first indirect call via allocate_handler.
-static void* initialize_allocate_handler(std::size_t size);
+            //! Initialization routine used for first indirect call via allocate_handler.
+            static void* initialize_allocate_handler(std::size_t size);
 
-//! Handler for memory allocation
-using allocate_handler_type = void* (*)(std::size_t size);
-static std::atomic<allocate_handler_type> allocate_handler{ &initialize_allocate_handler };
-allocate_handler_type allocate_handler_unsafe = nullptr;
+            //! Handler for memory allocation
+            using allocate_handler_type = void* (*) (std::size_t size);
+            static std::atomic<allocate_handler_type> allocate_handler {&initialize_allocate_handler};
+            allocate_handler_type allocate_handler_unsafe = nullptr;
 
-//! Handler for memory deallocation
-static void  (*deallocate_handler)(void* pointer) = nullptr;
+            //! Handler for memory deallocation
+            static void (*deallocate_handler)(void* pointer) = nullptr;
 
-//! Initialization routine used for first indirect call via cache_aligned_allocate_handler.
-static void* initialize_cache_aligned_allocate_handler(std::size_t n, std::size_t alignment);
+            //! Initialization routine used for first indirect call via cache_aligned_allocate_handler.
+            static void* initialize_cache_aligned_allocate_handler(std::size_t n, std::size_t alignment);
 
-//! Allocates overaligned memory using standard memory allocator. It is used when scalable_allocator is not available.
-static void* std_cache_aligned_allocate(std::size_t n, std::size_t alignment);
+            //! Allocates overaligned memory using standard memory allocator. It is used when scalable_allocator is not available.
+            static void* std_cache_aligned_allocate(std::size_t n, std::size_t alignment);
 
-//! Deallocates overaligned memory using standard memory allocator. It is used when scalable_allocator is not available.
-static void  std_cache_aligned_deallocate(void* p);
+            //! Deallocates overaligned memory using standard memory allocator. It is used when scalable_allocator is not available.
+            static void std_cache_aligned_deallocate(void* p);
 
-//! Handler for padded memory allocation
-using cache_aligned_allocate_handler_type = void* (*)(std::size_t n, std::size_t alignment);
-static std::atomic<cache_aligned_allocate_handler_type> cache_aligned_allocate_handler{ &initialize_cache_aligned_allocate_handler };
-cache_aligned_allocate_handler_type cache_aligned_allocate_handler_unsafe = nullptr;
+            //! Handler for padded memory allocation
+            using cache_aligned_allocate_handler_type = void* (*) (std::size_t n, std::size_t alignment);
+            static std::atomic<cache_aligned_allocate_handler_type> cache_aligned_allocate_handler {
+                    &initialize_cache_aligned_allocate_handler};
+            cache_aligned_allocate_handler_type cache_aligned_allocate_handler_unsafe = nullptr;
 
-//! Handler for padded memory deallocation
-static void (*cache_aligned_deallocate_handler)(void* p) = nullptr;
-
-//! Table describing how to link the handlers.
-static const dynamic_link_descriptor MallocLinkTable[] = {
-    DLD(scalable_malloc, allocate_handler_unsafe),
-    DLD(scalable_free, deallocate_handler),
-    DLD(scalable_aligned_malloc, cache_aligned_allocate_handler_unsafe),
-    DLD(scalable_aligned_free, cache_aligned_deallocate_handler),
-};
+            //! Handler for padded memory deallocation
+            static void (*cache_aligned_deallocate_handler)(void* p) = nullptr;
 
+            //! Table describing how to link the handlers.
+            static const dynamic_link_descriptor MallocLinkTable[] = {
+                    DLD(scalable_malloc, allocate_handler_unsafe),
+                    DLD(scalable_free, deallocate_handler),
+                    DLD(scalable_aligned_malloc, cache_aligned_allocate_handler_unsafe),
+                    DLD(scalable_aligned_free, cache_aligned_deallocate_handler),
+            };
 
 #if TBB_USE_DEBUG
 #define DEBUG_SUFFIX "_debug"
@@ -115,49 +115,50 @@ static const dynamic_link_descriptor MallocLinkTable[] = {
 #endif /* TBB_USE_DEBUG */
 
 // MALLOCLIB_NAME is the name of the oneTBB memory allocator library.
-#if _WIN32||_WIN64
+#if _WIN32 || _WIN64
 #define MALLOCLIB_NAME "tbbmalloc" DEBUG_SUFFIX ".dll"
 #elif __APPLE__
 #define MALLOCLIB_NAME "libtbbmalloc" DEBUG_SUFFIX ".2.dylib"
 #elif __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __sun || _AIX || __ANDROID__
 #define MALLOCLIB_NAME "libtbbmalloc" DEBUG_SUFFIX ".so"
-#elif __unix__  // Note that order of these #elif's is important!
+#elif __unix__// Note that order of these #elif's is important!
 #define MALLOCLIB_NAME "libtbbmalloc" DEBUG_SUFFIX ".so.2"
 #else
 #error Unknown OS
 #endif
 
-//! Initialize the allocation/free handler pointers.
-/** Caller is responsible for ensuring this routine is called exactly once.
+            //! Initialize the allocation/free handler pointers.
+            /** Caller is responsible for ensuring this routine is called exactly once.
     The routine attempts to dynamically link with the TBB memory allocator.
     If that allocator is not found, it links to malloc and free. */
-void initialize_handler_pointers() {
-    __TBB_ASSERT(allocate_handler == &initialize_allocate_handler, nullptr);
-    bool success = dynamic_link(MALLOCLIB_NAME, MallocLinkTable, 4);
-    if(!success) {
-        // If unsuccessful, set the handlers to the default routines.
-        // This must be done now, and not before FillDynamicLinks runs, because if other
-        // threads call the handlers, we want them to go through the DoOneTimeInitializations logic,
-        // which forces them to wait.
-        allocate_handler_unsafe = &std::malloc;
-        deallocate_handler = &std::free;
-        cache_aligned_allocate_handler_unsafe = &std_cache_aligned_allocate;
-        cache_aligned_deallocate_handler = &std_cache_aligned_deallocate;
-    }
-
-    allocate_handler.store(allocate_handler_unsafe, std::memory_order_release);
-    cache_aligned_allocate_handler.store(cache_aligned_allocate_handler_unsafe, std::memory_order_release);
-
-    PrintExtraVersionInfo( "ALLOCATOR", success?"scalable_malloc":"malloc" );
-}
-
-static std::once_flag initialization_state;
-void initialize_cache_aligned_allocator() {
-    std::call_once(initialization_state, &initialize_handler_pointers);
-}
-
-//! Executed on very first call through allocate_handler
-/** Only one of initialize_allocate_handler() and initialize_cache_aligned_allocate_handler()
+            void initialize_handler_pointers() {
+                __TBB_ASSERT(allocate_handler == &initialize_allocate_handler, nullptr);
+                bool success = dynamic_link(MALLOCLIB_NAME, MallocLinkTable, 4);
+                if (!success) {
+                    // If unsuccessful, set the handlers to the default routines.
+                    // This must be done now, and not before FillDynamicLinks runs, because if other
+                    // threads call the handlers, we want them to go through the DoOneTimeInitializations logic,
+                    // which forces them to wait.
+                    allocate_handler_unsafe = &std::malloc;
+                    deallocate_handler = &std::free;
+                    cache_aligned_allocate_handler_unsafe = &std_cache_aligned_allocate;
+                    cache_aligned_deallocate_handler = &std_cache_aligned_deallocate;
+                }
+
+                allocate_handler.store(allocate_handler_unsafe, std::memory_order_release);
+                cache_aligned_allocate_handler.store(cache_aligned_allocate_handler_unsafe,
+                                                     std::memory_order_release);
+
+                PrintExtraVersionInfo("ALLOCATOR", success ? "scalable_malloc" : "malloc");
+            }
+
+            static std::once_flag initialization_state;
+            void initialize_cache_aligned_allocator() {
+                std::call_once(initialization_state, &initialize_handler_pointers);
+            }
+
+            //! Executed on very first call through allocate_handler
+            /** Only one of initialize_allocate_handler() and initialize_cache_aligned_allocate_handler()
     is called, since each one of them also initializes the other.
 
     In the current implementation of oneTBB library initialization, cache_aligned_allocate() is
@@ -165,124 +166,124 @@ void initialize_cache_aligned_allocator() {
     that also initializes the regular allocate_handler.
 
     Therefore, initialize_allocate_handler() is not called in the current library implementation. */
-static void* initialize_allocate_handler(std::size_t size) {
-    initialize_cache_aligned_allocator();
-    __TBB_ASSERT(allocate_handler != &initialize_allocate_handler, nullptr);
-    return (*allocate_handler)(size);
-}
-
-//! Executed on very first call through cache_aligned_allocate_handler
-static void* initialize_cache_aligned_allocate_handler(std::size_t bytes, std::size_t alignment) {
-    initialize_cache_aligned_allocator();
-    __TBB_ASSERT(cache_aligned_allocate_handler != &initialize_cache_aligned_allocate_handler, nullptr);
-    return (*cache_aligned_allocate_handler)(bytes, alignment);
-}
-
-// TODO: use CPUID to find actual line size, though consider backward compatibility
-// nfs - no false sharing
-static constexpr std::size_t nfs_size = 128;
-
-std::size_t __TBB_EXPORTED_FUNC cache_line_size() {
-    return nfs_size;
-}
-
-void* __TBB_EXPORTED_FUNC cache_aligned_allocate(std::size_t size) {
-    const std::size_t cache_line_size = nfs_size;
-    __TBB_ASSERT(is_power_of_two(cache_line_size), "must be power of two");
-
-    // Check for overflow
-    if (size + cache_line_size < size) {
-        throw_exception(exception_id::bad_alloc);
-    }
-    // scalable_aligned_malloc considers zero size request an error, and returns nullptr
-    if (size == 0) size = 1;
-
-    void* result = cache_aligned_allocate_handler.load(std::memory_order_acquire)(size, cache_line_size);
-    if (!result) {
-        throw_exception(exception_id::bad_alloc);
-    }
-    __TBB_ASSERT(is_aligned(result, cache_line_size), "The returned address isn't aligned");
-    return result;
-}
-
-void __TBB_EXPORTED_FUNC cache_aligned_deallocate(void* p) {
-    __TBB_ASSERT(cache_aligned_deallocate_handler, "Initialization has not been yet.");
-    (*cache_aligned_deallocate_handler)(p);
-}
-
-static void* std_cache_aligned_allocate(std::size_t bytes, std::size_t alignment) {
+            static void* initialize_allocate_handler(std::size_t size) {
+                initialize_cache_aligned_allocator();
+                __TBB_ASSERT(allocate_handler != &initialize_allocate_handler, nullptr);
+                return (*allocate_handler)(size);
+            }
+
+            //! Executed on very first call through cache_aligned_allocate_handler
+            static void* initialize_cache_aligned_allocate_handler(std::size_t bytes, std::size_t alignment) {
+                initialize_cache_aligned_allocator();
+                __TBB_ASSERT(cache_aligned_allocate_handler != &initialize_cache_aligned_allocate_handler,
+                             nullptr);
+                return (*cache_aligned_allocate_handler)(bytes, alignment);
+            }
+
+            // TODO: use CPUID to find actual line size, though consider backward compatibility
+            // nfs - no false sharing
+            static constexpr std::size_t nfs_size = 128;
+
+            std::size_t __TBB_EXPORTED_FUNC cache_line_size() { return nfs_size; }
+
+            void* __TBB_EXPORTED_FUNC cache_aligned_allocate(std::size_t size) {
+                const std::size_t cache_line_size = nfs_size;
+                __TBB_ASSERT(is_power_of_two(cache_line_size), "must be power of two");
+
+                // Check for overflow
+                if (size + cache_line_size < size) { throw_exception(exception_id::bad_alloc); }
+                // scalable_aligned_malloc considers zero size request an error, and returns nullptr
+                if (size == 0) size = 1;
+
+                void* result = cache_aligned_allocate_handler.load(std::memory_order_acquire)(
+                        size, cache_line_size);
+                if (!result) { throw_exception(exception_id::bad_alloc); }
+                __TBB_ASSERT(is_aligned(result, cache_line_size), "The returned address isn't aligned");
+                return result;
+            }
+
+            void __TBB_EXPORTED_FUNC cache_aligned_deallocate(void* p) {
+                __TBB_ASSERT(cache_aligned_deallocate_handler, "Initialization has not been yet.");
+                (*cache_aligned_deallocate_handler)(p);
+            }
+
+            static void* std_cache_aligned_allocate(std::size_t bytes, std::size_t alignment) {
 #if defined(__TBB_USE_MEMALIGN)
-    return memalign(alignment, bytes);
+                return memalign(alignment, bytes);
 #elif defined(__TBB_USE_POSIX_MEMALIGN)
-    void* p = nullptr;
-    int res = posix_memalign(&p, alignment, bytes);
-    if (res != 0)
-        p = nullptr;
-    return p;
+                void* p = nullptr;
+                int res = posix_memalign(&p, alignment, bytes);
+                if (res != 0) p = nullptr;
+                return p;
 #elif defined(__TBB_USE_MSVC_ALIGNED_MALLOC)
-    return _aligned_malloc(bytes, alignment);
+                return _aligned_malloc(bytes, alignment);
 #else
-    // TODO: make it common with cache_aligned_resource
-    std::size_t space = alignment + bytes;
-    std::uintptr_t base = reinterpret_cast<std::uintptr_t>(std::malloc(space));
-    if (!base) {
-        return nullptr;
-    }
-    std::uintptr_t result = (base + nfs_size) & ~(nfs_size - 1);
-    // Round up to the next cache line (align the base address)
-    __TBB_ASSERT((result - base) >= sizeof(std::uintptr_t), "Cannot store a base pointer to the header");
-    __TBB_ASSERT(space - (result - base) >= bytes, "Not enough space for the storage");
-
-    // Record where block actually starts.
-    (reinterpret_cast<std::uintptr_t*>(result))[-1] = base;
-    return reinterpret_cast<void*>(result);
+                // TODO: make it common with cache_aligned_resource
+                std::size_t space = alignment + bytes;
+                std::uintptr_t base = reinterpret_cast<std::uintptr_t>(std::malloc(space));
+                if (!base) { return nullptr; }
+                std::uintptr_t result = (base + nfs_size) & ~(nfs_size - 1);
+                // Round up to the next cache line (align the base address)
+                __TBB_ASSERT((result - base) >= sizeof(std::uintptr_t),
+                             "Cannot store a base pointer to the header");
+                __TBB_ASSERT(space - (result - base) >= bytes, "Not enough space for the storage");
+
+                // Record where block actually starts.
+                (reinterpret_cast<std::uintptr_t*>(result))[-1] = base;
+                return reinterpret_cast<void*>(result);
 #endif
-}
+            }
 
-static void std_cache_aligned_deallocate(void* p) {
+            static void std_cache_aligned_deallocate(void* p) {
 #if defined(__TBB_USE_MEMALIGN) || defined(__TBB_USE_POSIX_MEMALIGN)
-    free(p);
+                free(p);
 #elif defined(__TBB_USE_MSVC_ALIGNED_MALLOC)
-    _aligned_free(p);
+                _aligned_free(p);
 #else
-    if (p) {
-        __TBB_ASSERT(reinterpret_cast<std::uintptr_t>(p) >= 0x4096, "attempt to free block not obtained from cache_aligned_allocator");
-        // Recover where block actually starts
-        std::uintptr_t base = (reinterpret_cast<std::uintptr_t*>(p))[-1];
-        __TBB_ASSERT(((base + nfs_size) & ~(nfs_size - 1)) == reinterpret_cast<std::uintptr_t>(p), "Incorrect alignment or not allocated by std_cache_aligned_deallocate?");
-        std::free(reinterpret_cast<void*>(base));
-    }
+                if (p) {
+                    __TBB_ASSERT(reinterpret_cast<std::uintptr_t>(p) >= 0x4096,
+                                 "attempt to free block not obtained from cache_aligned_allocator");
+                    // Recover where block actually starts
+                    std::uintptr_t base = (reinterpret_cast<std::uintptr_t*>(p))[-1];
+                    __TBB_ASSERT(((base + nfs_size) & ~(nfs_size - 1)) == reinterpret_cast<std::uintptr_t>(p),
+                                 "Incorrect alignment or not allocated by std_cache_aligned_deallocate?");
+                    std::free(reinterpret_cast<void*>(base));
+                }
 #endif
-}
-
-void* __TBB_EXPORTED_FUNC allocate_memory(std::size_t size) {
-    void* result = allocate_handler.load(std::memory_order_acquire)(size);
-    if (!result) {
-        throw_exception(exception_id::bad_alloc);
-    }
-    return result;
-}
-
-void __TBB_EXPORTED_FUNC deallocate_memory(void* p) {
-    if (p) {
-        __TBB_ASSERT(deallocate_handler, "Initialization has not been yet.");
-        (*deallocate_handler)(p);
-    }
-}
-
-bool __TBB_EXPORTED_FUNC is_tbbmalloc_used() {
-    auto handler_snapshot = allocate_handler.load(std::memory_order_acquire);
-    if (handler_snapshot == &initialize_allocate_handler) {
-        initialize_cache_aligned_allocator();
-    }
-    handler_snapshot = allocate_handler.load(std::memory_order_relaxed);
-    __TBB_ASSERT(handler_snapshot != &initialize_allocate_handler && deallocate_handler != nullptr, nullptr);
-    // Cast to void avoids type mismatch errors on some compilers (e.g. __IBMCPP__)
-    __TBB_ASSERT((reinterpret_cast<void*>(handler_snapshot) == reinterpret_cast<void*>(&std::malloc)) == (reinterpret_cast<void*>(deallocate_handler) == reinterpret_cast<void*>(&std::free)),
-                  "Both shim pointers must refer to routines from the same package (either TBB or CRT)");
-    return reinterpret_cast<void*>(handler_snapshot) == reinterpret_cast<void*>(&std::malloc);
-}
-
-} // namespace r1
-} // namespace detail
-} // namespace tbb
+            }
+
+            void* __TBB_EXPORTED_FUNC allocate_memory(std::size_t size) {
+                void* result = allocate_handler.load(std::memory_order_acquire)(size);
+                if (!result) { throw_exception(exception_id::bad_alloc); }
+                return result;
+            }
+
+            void __TBB_EXPORTED_FUNC deallocate_memory(void* p) {
+                if (p) {
+                    __TBB_ASSERT(deallocate_handler, "Initialization has not been yet.");
+                    (*deallocate_handler)(p);
+                }
+            }
+
+            bool __TBB_EXPORTED_FUNC is_tbbmalloc_used() {
+                auto handler_snapshot = allocate_handler.load(std::memory_order_acquire);
+                if (handler_snapshot == &initialize_allocate_handler) {
+                    initialize_cache_aligned_allocator();
+                }
+                handler_snapshot = allocate_handler.load(std::memory_order_relaxed);
+                __TBB_ASSERT(handler_snapshot != &initialize_allocate_handler
+                                     && deallocate_handler != nullptr,
+                             nullptr);
+                // Cast to void avoids type mismatch errors on some compilers (e.g. __IBMCPP__)
+                __TBB_ASSERT(
+                        (reinterpret_cast<void*>(handler_snapshot) == reinterpret_cast<void*>(&std::malloc))
+                                == (reinterpret_cast<void*>(deallocate_handler)
+                                    == reinterpret_cast<void*>(&std::free)),
+                        "Both shim pointers must refer to routines from the same package (either TBB or "
+                        "CRT)");
+                return reinterpret_cast<void*>(handler_snapshot) == reinterpret_cast<void*>(&std::malloc);
+            }
+
+        }// namespace r1
+    }    // namespace detail
+}// namespace tbb
diff --git a/external/tbb/src/tbb/arena.cpp b/external/tbb/src/tbb/arena.cpp
index eb91ddf5..0468adaf 100644
--- a/external/tbb/src/tbb/arena.cpp
+++ b/external/tbb/src/tbb/arena.cpp
@@ -14,943 +14,955 @@
     limitations under the License.
 */
 
-#include "task_dispatcher.h"
-#include "governor.h"
-#include "threading_control.h"
 #include "arena.h"
+#include "governor.h"
 #include "itt_notify.h"
-#include "semaphore.h"
-#include "waiters.h"
 #include "oneapi/tbb/detail/_task.h"
 #include "oneapi/tbb/info.h"
 #include "oneapi/tbb/tbb_allocator.h"
+#include "semaphore.h"
+#include "task_dispatcher.h"
+#include "threading_control.h"
+#include "waiters.h"
 
 #include <atomic>
 #include <cstring>
 #include <functional>
 
 namespace tbb {
-namespace detail {
-namespace r1 {
+    namespace detail {
+        namespace r1 {
 
 #if __TBB_ARENA_BINDING
-class numa_binding_observer : public tbb::task_scheduler_observer {
-    binding_handler* my_binding_handler;
-public:
-    numa_binding_observer( d1::task_arena* ta, int num_slots, int numa_id, core_type_id core_type, int max_threads_per_core )
-        : task_scheduler_observer(*ta)
-        , my_binding_handler(construct_binding_handler(num_slots, numa_id, core_type, max_threads_per_core))
-    {}
-
-    void on_scheduler_entry( bool ) override {
-        apply_affinity_mask(my_binding_handler, this_task_arena::current_thread_index());
-    }
-
-    void on_scheduler_exit( bool ) override {
-        restore_affinity_mask(my_binding_handler, this_task_arena::current_thread_index());
-    }
-
-    ~numa_binding_observer() override{
-        destroy_binding_handler(my_binding_handler);
-    }
-};
-
-numa_binding_observer* construct_binding_observer( d1::task_arena* ta, int num_slots, int numa_id, core_type_id core_type, int max_threads_per_core ) {
-    numa_binding_observer* binding_observer = nullptr;
-    if ((core_type >= 0 && core_type_count() > 1) || (numa_id >= 0 && numa_node_count() > 1) || max_threads_per_core > 0) {
-        binding_observer = new(allocate_memory(sizeof(numa_binding_observer))) numa_binding_observer(ta, num_slots, numa_id, core_type, max_threads_per_core);
-        __TBB_ASSERT(binding_observer, "Failure during NUMA binding observer allocation and construction");
-    }
-    return binding_observer;
-}
-
-void destroy_binding_observer( numa_binding_observer* binding_observer ) {
-    __TBB_ASSERT(binding_observer, "Trying to deallocate nullptr pointer");
-    binding_observer->observe(false);
-    binding_observer->~numa_binding_observer();
-    deallocate_memory(binding_observer);
-}
+            class numa_binding_observer : public tbb::task_scheduler_observer {
+                binding_handler* my_binding_handler;
+
+            public:
+                numa_binding_observer(d1::task_arena* ta, int num_slots, int numa_id, core_type_id core_type,
+                                      int max_threads_per_core)
+                    : task_scheduler_observer(*ta),
+                      my_binding_handler(construct_binding_handler(num_slots, numa_id, core_type,
+                                                                   max_threads_per_core)) {}
+
+                void on_scheduler_entry(bool) override {
+                    apply_affinity_mask(my_binding_handler, this_task_arena::current_thread_index());
+                }
+
+                void on_scheduler_exit(bool) override {
+                    restore_affinity_mask(my_binding_handler, this_task_arena::current_thread_index());
+                }
+
+                ~numa_binding_observer() override { destroy_binding_handler(my_binding_handler); }
+            };
+
+            numa_binding_observer* construct_binding_observer(d1::task_arena* ta, int num_slots, int numa_id,
+                                                              core_type_id core_type,
+                                                              int max_threads_per_core) {
+                numa_binding_observer* binding_observer = nullptr;
+                if ((core_type >= 0 && core_type_count() > 1) || (numa_id >= 0 && numa_node_count() > 1)
+                    || max_threads_per_core > 0) {
+                    binding_observer = new (allocate_memory(sizeof(numa_binding_observer)))
+                            numa_binding_observer(ta, num_slots, numa_id, core_type, max_threads_per_core);
+                    __TBB_ASSERT(binding_observer,
+                                 "Failure during NUMA binding observer allocation and construction");
+                }
+                return binding_observer;
+            }
+
+            void destroy_binding_observer(numa_binding_observer* binding_observer) {
+                __TBB_ASSERT(binding_observer, "Trying to deallocate nullptr pointer");
+                binding_observer->observe(false);
+                binding_observer->~numa_binding_observer();
+                deallocate_memory(binding_observer);
+            }
 #endif /*!__TBB_ARENA_BINDING*/
 
-void arena::on_thread_leaving(unsigned ref_param) {
-    //
-    // Implementation of arena destruction synchronization logic contained various
-    // bugs/flaws at the different stages of its evolution, so below is a detailed
-    // description of the issues taken into consideration in the framework of the
-    // current design.
-    //
-    // In case of using fire-and-forget tasks (scheduled via task::enqueue())
-    // external thread is allowed to leave its arena before all its work is executed,
-    // and market may temporarily revoke all workers from this arena. Since revoked
-    // workers never attempt to reset arena state to EMPTY and cancel its request
-    // to RML for threads, the arena object is destroyed only when both the last
-    // thread is leaving it and arena's state is EMPTY (that is its external thread
-    // left and it does not contain any work).
-    // Thus resetting arena to EMPTY state (as earlier TBB versions did) should not
-    // be done here (or anywhere else in the external thread to that matter); doing so
-    // can result either in arena's premature destruction (at least without
-    // additional costly checks in workers) or in unnecessary arena state changes
-    // (and ensuing workers migration).
-    //
-    // A worker that checks for work presence and transitions arena to the EMPTY
-    // state (in snapshot taking procedure arena::out_of_work()) updates
-    // arena::my_pool_state first and only then arena::my_num_workers_requested.
-    // So the check for work absence must be done against the latter field.
-    //
-    // In a time window between decrementing the active threads count and checking
-    // if there is an outstanding request for workers. New worker thread may arrive,
-    // finish remaining work, set arena state to empty, and leave decrementing its
-    // refcount and destroying. Then the current thread will destroy the arena
-    // the second time. To preclude it a local copy of the outstanding request
-    // value can be stored before decrementing active threads count.
-    //
-    // But this technique may cause two other problem. When the stored request is
-    // zero, it is possible that arena still has threads and they can generate new
-    // tasks and thus re-establish non-zero requests. Then all the threads can be
-    // revoked (as described above) leaving this thread the last one, and causing
-    // it to destroy non-empty arena.
-    //
-    // The other problem takes place when the stored request is non-zero. Another
-    // thread may complete the work, set arena state to empty, and leave without
-    // arena destruction before this thread decrements the refcount. This thread
-    // cannot destroy the arena either. Thus the arena may be "orphaned".
-    //
-    // In both cases we cannot dereference arena pointer after the refcount is
-    // decremented, as our arena may already be destroyed.
-    //
-    // If this is the external thread, the market is protected by refcount to it.
-    // In case of workers market's liveness is ensured by the RML connection
-    // rundown protocol, according to which the client (i.e. the market) lives
-    // until RML server notifies it about connection termination, and this
-    // notification is fired only after all workers return into RML.
-    //
-    // Thus if we decremented refcount to zero we ask the market to check arena
-    // state (including the fact if it is alive) under the lock.
-    //
-
-    __TBB_ASSERT(my_references.load(std::memory_order_relaxed) >= ref_param, "broken arena reference counter");
-
-    // When there is no workers someone must free arena, as
-    // without workers, no one calls out_of_work().
-    if (ref_param == ref_external && !my_mandatory_concurrency.test()) {
-        out_of_work();
-    }
-
-    threading_control* tc = my_threading_control;
-    auto tc_client_snapshot = tc->prepare_client_destruction(my_tc_client);
-    // Release our reference to sync with destroy_client
-    unsigned remaining_ref = my_references.fetch_sub(ref_param, std::memory_order_release) - ref_param;
-    // do not access `this` it might be destroyed already
-    if (remaining_ref == 0) {
-        if (tc->try_destroy_client(tc_client_snapshot)) {
-            // We are requested to destroy ourself
-            free_arena();
-        }
-    }
-}
-
-std::size_t arena::occupy_free_slot_in_range( thread_data& tls, std::size_t lower, std::size_t upper ) {
-    if ( lower >= upper ) return out_of_arena;
-    // Start search for an empty slot from the one we occupied the last time
-    std::size_t index = tls.my_arena_index;
-    if ( index < lower || index >= upper ) index = tls.my_random.get() % (upper - lower) + lower;
-    __TBB_ASSERT( index >= lower && index < upper, nullptr);
-    // Find a free slot
-    for ( std::size_t i = index; i < upper; ++i )
-        if (my_slots[i].try_occupy()) return i;
-    for ( std::size_t i = lower; i < index; ++i )
-        if (my_slots[i].try_occupy()) return i;
-    return out_of_arena;
-}
-
-template <bool as_worker>
-std::size_t arena::occupy_free_slot(thread_data& tls) {
-    // Firstly, external threads try to occupy reserved slots
-    std::size_t index = as_worker ? out_of_arena : occupy_free_slot_in_range( tls,  0, my_num_reserved_slots );
-    if ( index == out_of_arena ) {
-        // Secondly, all threads try to occupy all non-reserved slots
-        index = occupy_free_slot_in_range(tls, my_num_reserved_slots, my_num_slots );
-        // Likely this arena is already saturated
-        if ( index == out_of_arena )
-            return out_of_arena;
-    }
-
-    atomic_update( my_limit, (unsigned)(index + 1), std::less<unsigned>() );
-    return index;
-}
-
-std::uintptr_t arena::calculate_stealing_threshold() {
-    stack_anchor_type anchor;
-    return r1::calculate_stealing_threshold(reinterpret_cast<std::uintptr_t>(&anchor), my_threading_control->worker_stack_size());
-}
-
-void arena::process(thread_data& tls) {
-    governor::set_thread_data(tls); // TODO: consider moving to create_one_job.
-    __TBB_ASSERT( is_alive(my_guard), nullptr);
-    __TBB_ASSERT( my_num_slots >= 1, nullptr);
-
-    std::size_t index = occupy_free_slot</*as_worker*/true>(tls);
-    if (index == out_of_arena) {
-        on_thread_leaving(ref_worker);
-        return;
-    }
-
-    __TBB_ASSERT( index >= my_num_reserved_slots, "Workers cannot occupy reserved slots" );
-    tls.attach_arena(*this, index);
-    // worker thread enters the dispatch loop to look for a work
-    tls.my_inbox.set_is_idle(true);
-    if (tls.my_arena_slot->is_task_pool_published()) {
-        tls.my_inbox.set_is_idle(false);
-    }
-
-    task_dispatcher& task_disp = tls.my_arena_slot->default_task_dispatcher();
-    tls.enter_task_dispatcher(task_disp, calculate_stealing_threshold());
-    __TBB_ASSERT(task_disp.can_steal(), nullptr);
-
-    __TBB_ASSERT( !tls.my_last_observer, "There cannot be notified local observers when entering arena" );
-    my_observers.notify_entry_observers(tls.my_last_observer, tls.my_is_worker);
-
-    // Waiting on special object tied to this arena
-    outermost_worker_waiter waiter(*this);
-    d1::task* t = tls.my_task_dispatcher->local_wait_for_all(nullptr, waiter);
-    // For purposes of affinity support, the slot's mailbox is considered idle while no thread is
-    // attached to it.
-    tls.my_inbox.set_is_idle(true);
-
-    __TBB_ASSERT_EX(t == nullptr, "Outermost worker must not leave dispatch loop with a task");
-    __TBB_ASSERT(governor::is_thread_data_set(&tls), nullptr);
-    __TBB_ASSERT(tls.my_task_dispatcher == &task_disp, nullptr);
-
-    my_observers.notify_exit_observers(tls.my_last_observer, tls.my_is_worker);
-    tls.my_last_observer = nullptr;
-
-    tls.leave_task_dispatcher();
-
-    // Arena slot detach (arena may be used in market::process)
-    // TODO: Consider moving several calls below into a new method(e.g.detach_arena).
-    tls.my_arena_slot->release();
-    tls.my_arena_slot = nullptr;
-    tls.my_inbox.detach();
-    __TBB_ASSERT(tls.my_inbox.is_idle_state(true), nullptr);
-    __TBB_ASSERT(is_alive(my_guard), nullptr);
-
-    // In contrast to earlier versions of TBB (before 3.0 U5) now it is possible
-    // that arena may be temporarily left unpopulated by threads. See comments in
-    // arena::on_thread_leaving() for more details.
-    on_thread_leaving(ref_worker);
-    __TBB_ASSERT(tls.my_arena == this, "my_arena is used as a hint when searching the arena to join");
-}
-
-arena::arena(threading_control* control, unsigned num_slots, unsigned num_reserved_slots, unsigned priority_level
+            void arena::on_thread_leaving(unsigned ref_param) {
+                //
+                // Implementation of arena destruction synchronization logic contained various
+                // bugs/flaws at the different stages of its evolution, so below is a detailed
+                // description of the issues taken into consideration in the framework of the
+                // current design.
+                //
+                // In case of using fire-and-forget tasks (scheduled via task::enqueue())
+                // external thread is allowed to leave its arena before all its work is executed,
+                // and market may temporarily revoke all workers from this arena. Since revoked
+                // workers never attempt to reset arena state to EMPTY and cancel its request
+                // to RML for threads, the arena object is destroyed only when both the last
+                // thread is leaving it and arena's state is EMPTY (that is its external thread
+                // left and it does not contain any work).
+                // Thus resetting arena to EMPTY state (as earlier TBB versions did) should not
+                // be done here (or anywhere else in the external thread to that matter); doing so
+                // can result either in arena's premature destruction (at least without
+                // additional costly checks in workers) or in unnecessary arena state changes
+                // (and ensuing workers migration).
+                //
+                // A worker that checks for work presence and transitions arena to the EMPTY
+                // state (in snapshot taking procedure arena::out_of_work()) updates
+                // arena::my_pool_state first and only then arena::my_num_workers_requested.
+                // So the check for work absence must be done against the latter field.
+                //
+                // In a time window between decrementing the active threads count and checking
+                // if there is an outstanding request for workers. New worker thread may arrive,
+                // finish remaining work, set arena state to empty, and leave decrementing its
+                // refcount and destroying. Then the current thread will destroy the arena
+                // the second time. To preclude it a local copy of the outstanding request
+                // value can be stored before decrementing active threads count.
+                //
+                // But this technique may cause two other problem. When the stored request is
+                // zero, it is possible that arena still has threads and they can generate new
+                // tasks and thus re-establish non-zero requests. Then all the threads can be
+                // revoked (as described above) leaving this thread the last one, and causing
+                // it to destroy non-empty arena.
+                //
+                // The other problem takes place when the stored request is non-zero. Another
+                // thread may complete the work, set arena state to empty, and leave without
+                // arena destruction before this thread decrements the refcount. This thread
+                // cannot destroy the arena either. Thus the arena may be "orphaned".
+                //
+                // In both cases we cannot dereference arena pointer after the refcount is
+                // decremented, as our arena may already be destroyed.
+                //
+                // If this is the external thread, the market is protected by refcount to it.
+                // In case of workers market's liveness is ensured by the RML connection
+                // rundown protocol, according to which the client (i.e. the market) lives
+                // until RML server notifies it about connection termination, and this
+                // notification is fired only after all workers return into RML.
+                //
+                // Thus if we decremented refcount to zero we ask the market to check arena
+                // state (including the fact if it is alive) under the lock.
+                //
+
+                __TBB_ASSERT(my_references.load(std::memory_order_relaxed) >= ref_param,
+                             "broken arena reference counter");
+
+                // When there is no workers someone must free arena, as
+                // without workers, no one calls out_of_work().
+                if (ref_param == ref_external && !my_mandatory_concurrency.test()) { out_of_work(); }
+
+                threading_control* tc = my_threading_control;
+                auto tc_client_snapshot = tc->prepare_client_destruction(my_tc_client);
+                // Release our reference to sync with destroy_client
+                unsigned remaining_ref
+                        = my_references.fetch_sub(ref_param, std::memory_order_release) - ref_param;
+                // do not access `this` it might be destroyed already
+                if (remaining_ref == 0) {
+                    if (tc->try_destroy_client(tc_client_snapshot)) {
+                        // We are requested to destroy ourself
+                        free_arena();
+                    }
+                }
+            }
+
+            std::size_t arena::occupy_free_slot_in_range(thread_data& tls, std::size_t lower,
+                                                         std::size_t upper) {
+                if (lower >= upper) return out_of_arena;
+                // Start search for an empty slot from the one we occupied the last time
+                std::size_t index = tls.my_arena_index;
+                if (index < lower || index >= upper) index = tls.my_random.get() % (upper - lower) + lower;
+                __TBB_ASSERT(index >= lower && index < upper, nullptr);
+                // Find a free slot
+                for (std::size_t i = index; i < upper; ++i)
+                    if (my_slots[i].try_occupy()) return i;
+                for (std::size_t i = lower; i < index; ++i)
+                    if (my_slots[i].try_occupy()) return i;
+                return out_of_arena;
+            }
+
+            template <bool as_worker>
+            std::size_t arena::occupy_free_slot(thread_data& tls) {
+                // Firstly, external threads try to occupy reserved slots
+                std::size_t index
+                        = as_worker ? out_of_arena : occupy_free_slot_in_range(tls, 0, my_num_reserved_slots);
+                if (index == out_of_arena) {
+                    // Secondly, all threads try to occupy all non-reserved slots
+                    index = occupy_free_slot_in_range(tls, my_num_reserved_slots, my_num_slots);
+                    // Likely this arena is already saturated
+                    if (index == out_of_arena) return out_of_arena;
+                }
+
+                atomic_update(my_limit, (unsigned) (index + 1), std::less<unsigned>());
+                return index;
+            }
+
+            std::uintptr_t arena::calculate_stealing_threshold() {
+                stack_anchor_type anchor;
+                return r1::calculate_stealing_threshold(reinterpret_cast<std::uintptr_t>(&anchor),
+                                                        my_threading_control->worker_stack_size());
+            }
+
+            void arena::process(thread_data& tls) {
+                governor::set_thread_data(tls);// TODO: consider moving to create_one_job.
+                __TBB_ASSERT(is_alive(my_guard), nullptr);
+                __TBB_ASSERT(my_num_slots >= 1, nullptr);
+
+                std::size_t index = occupy_free_slot</*as_worker*/ true>(tls);
+                if (index == out_of_arena) {
+                    on_thread_leaving(ref_worker);
+                    return;
+                }
+
+                __TBB_ASSERT(index >= my_num_reserved_slots, "Workers cannot occupy reserved slots");
+                tls.attach_arena(*this, index);
+                // worker thread enters the dispatch loop to look for a work
+                tls.my_inbox.set_is_idle(true);
+                if (tls.my_arena_slot->is_task_pool_published()) { tls.my_inbox.set_is_idle(false); }
+
+                task_dispatcher& task_disp = tls.my_arena_slot->default_task_dispatcher();
+                tls.enter_task_dispatcher(task_disp, calculate_stealing_threshold());
+                __TBB_ASSERT(task_disp.can_steal(), nullptr);
+
+                __TBB_ASSERT(!tls.my_last_observer,
+                             "There cannot be notified local observers when entering arena");
+                my_observers.notify_entry_observers(tls.my_last_observer, tls.my_is_worker);
+
+                // Waiting on special object tied to this arena
+                outermost_worker_waiter waiter(*this);
+                d1::task* t = tls.my_task_dispatcher->local_wait_for_all(nullptr, waiter);
+                // For purposes of affinity support, the slot's mailbox is considered idle while no thread is
+                // attached to it.
+                tls.my_inbox.set_is_idle(true);
+
+                __TBB_ASSERT_EX(t == nullptr, "Outermost worker must not leave dispatch loop with a task");
+                __TBB_ASSERT(governor::is_thread_data_set(&tls), nullptr);
+                __TBB_ASSERT(tls.my_task_dispatcher == &task_disp, nullptr);
+
+                my_observers.notify_exit_observers(tls.my_last_observer, tls.my_is_worker);
+                tls.my_last_observer = nullptr;
+
+                tls.leave_task_dispatcher();
+
+                // Arena slot detach (arena may be used in market::process)
+                // TODO: Consider moving several calls below into a new method(e.g.detach_arena).
+                tls.my_arena_slot->release();
+                tls.my_arena_slot = nullptr;
+                tls.my_inbox.detach();
+                __TBB_ASSERT(tls.my_inbox.is_idle_state(true), nullptr);
+                __TBB_ASSERT(is_alive(my_guard), nullptr);
+
+                // In contrast to earlier versions of TBB (before 3.0 U5) now it is possible
+                // that arena may be temporarily left unpopulated by threads. See comments in
+                // arena::on_thread_leaving() for more details.
+                on_thread_leaving(ref_worker);
+                __TBB_ASSERT(tls.my_arena == this,
+                             "my_arena is used as a hint when searching the arena to join");
+            }
+
+            arena::arena(threading_control* control, unsigned num_slots, unsigned num_reserved_slots,
+                         unsigned priority_level
 #if __TBB_PREVIEW_PARALLEL_PHASE
-             , tbb::task_arena::leave_policy lp 
+                         ,
+                         tbb::task_arena::leave_policy lp
 #endif
-)
-{
-    __TBB_ASSERT( !my_guard, "improperly allocated arena?" );
-    __TBB_ASSERT( sizeof(my_slots[0]) % cache_line_size()==0, "arena::slot size not multiple of cache line size" );
-    __TBB_ASSERT( is_aligned(this, cache_line_size()), "arena misaligned" );
-    my_threading_control = control;
-    my_limit = 1;
-    // Two slots are mandatory: for the external thread, and for 1 worker (required to support starvation resistant tasks).
-    my_num_slots = num_arena_slots(num_slots, num_reserved_slots);
-    my_num_reserved_slots = num_reserved_slots;
-    my_max_num_workers = num_slots-num_reserved_slots;
-    my_priority_level = priority_level;
-    my_references = ref_external; // accounts for the external thread
-    my_observers.my_arena = this;
-    my_co_cache.init(4 * num_slots);
-    __TBB_ASSERT ( my_max_num_workers <= my_num_slots, nullptr);
-    // Initialize the default context. It should be allocated before task_dispatch construction.
-    my_default_ctx = new (cache_aligned_allocate(sizeof(d1::task_group_context)))
-        d1::task_group_context{ d1::task_group_context::isolated, d1::task_group_context::fp_settings };
-    // Construct slots. Mark internal synchronization elements for the tools.
-    task_dispatcher* base_td_pointer = reinterpret_cast<task_dispatcher*>(my_slots + my_num_slots);
-    for( unsigned i = 0; i < my_num_slots; ++i ) {
-        // __TBB_ASSERT( !my_slots[i].my_scheduler && !my_slots[i].task_pool, nullptr);
-        __TBB_ASSERT( !my_slots[i].task_pool_ptr, nullptr);
-        __TBB_ASSERT( !my_slots[i].my_task_pool_size, nullptr);
-        mailbox(i).construct();
-        my_slots[i].init_task_streams(i);
-        my_slots[i].my_default_task_dispatcher = new(base_td_pointer + i) task_dispatcher(this);
-        my_slots[i].my_is_occupied.store(false, std::memory_order_relaxed);
-    }
-    my_fifo_task_stream.initialize(my_num_slots);
-    my_resume_task_stream.initialize(my_num_slots);
+            ) {
+                __TBB_ASSERT(!my_guard, "improperly allocated arena?");
+                __TBB_ASSERT(sizeof(my_slots[0]) % cache_line_size() == 0,
+                             "arena::slot size not multiple of cache line size");
+                __TBB_ASSERT(is_aligned(this, cache_line_size()), "arena misaligned");
+                my_threading_control = control;
+                my_limit = 1;
+                // Two slots are mandatory: for the external thread, and for 1 worker (required to support starvation resistant tasks).
+                my_num_slots = num_arena_slots(num_slots, num_reserved_slots);
+                my_num_reserved_slots = num_reserved_slots;
+                my_max_num_workers = num_slots - num_reserved_slots;
+                my_priority_level = priority_level;
+                my_references = ref_external;// accounts for the external thread
+                my_observers.my_arena = this;
+                my_co_cache.init(4 * num_slots);
+                __TBB_ASSERT(my_max_num_workers <= my_num_slots, nullptr);
+                // Initialize the default context. It should be allocated before task_dispatch construction.
+                my_default_ctx = new (cache_aligned_allocate(sizeof(d1::task_group_context)))
+                        d1::task_group_context {d1::task_group_context::isolated,
+                                                d1::task_group_context::fp_settings};
+                // Construct slots. Mark internal synchronization elements for the tools.
+                task_dispatcher* base_td_pointer
+                        = reinterpret_cast<task_dispatcher*>(my_slots + my_num_slots);
+                for (unsigned i = 0; i < my_num_slots; ++i) {
+                    // __TBB_ASSERT( !my_slots[i].my_scheduler && !my_slots[i].task_pool, nullptr);
+                    __TBB_ASSERT(!my_slots[i].task_pool_ptr, nullptr);
+                    __TBB_ASSERT(!my_slots[i].my_task_pool_size, nullptr);
+                    mailbox(i).construct();
+                    my_slots[i].init_task_streams(i);
+                    my_slots[i].my_default_task_dispatcher = new (base_td_pointer + i) task_dispatcher(this);
+                    my_slots[i].my_is_occupied.store(false, std::memory_order_relaxed);
+                }
+                my_fifo_task_stream.initialize(my_num_slots);
+                my_resume_task_stream.initialize(my_num_slots);
 #if __TBB_PREVIEW_CRITICAL_TASKS
-    my_critical_task_stream.initialize(my_num_slots);
+                my_critical_task_stream.initialize(my_num_slots);
 #endif
-    my_mandatory_requests = 0;
+                my_mandatory_requests = 0;
 
 #if __TBB_PREVIEW_PARALLEL_PHASE
-    my_thread_leave.set_initial_state(lp);
+                my_thread_leave.set_initial_state(lp);
 #endif
-}
+            }
 
-arena& arena::allocate_arena(threading_control* control, unsigned num_slots, unsigned num_reserved_slots,
-                             unsigned priority_level
+            arena& arena::allocate_arena(threading_control* control, unsigned num_slots,
+                                         unsigned num_reserved_slots, unsigned priority_level
 #if __TBB_PREVIEW_PARALLEL_PHASE
-                             , tbb::task_arena::leave_policy lp
+                                         ,
+                                         tbb::task_arena::leave_policy lp
 #endif
-)
-{
-    __TBB_ASSERT( sizeof(base_type) + sizeof(arena_slot) == sizeof(arena), "All arena data fields must go to arena_base" );
-    __TBB_ASSERT( sizeof(base_type) % cache_line_size() == 0, "arena slots area misaligned: wrong padding" );
-    __TBB_ASSERT( sizeof(mail_outbox) == max_nfs_size, "Mailbox padding is wrong" );
-    std::size_t n = allocation_size(num_arena_slots(num_slots, num_reserved_slots));
-    unsigned char* storage = (unsigned char*)cache_aligned_allocate(n);
-    // Zero all slots to indicate that they are empty
-    std::memset( storage, 0, n );
-
-    return *new( storage + num_arena_slots(num_slots, num_reserved_slots) * sizeof(mail_outbox) )
-        arena(control, num_slots, num_reserved_slots, priority_level
+            ) {
+                __TBB_ASSERT(sizeof(base_type) + sizeof(arena_slot) == sizeof(arena),
+                             "All arena data fields must go to arena_base");
+                __TBB_ASSERT(sizeof(base_type) % cache_line_size() == 0,
+                             "arena slots area misaligned: wrong padding");
+                __TBB_ASSERT(sizeof(mail_outbox) == max_nfs_size, "Mailbox padding is wrong");
+                std::size_t n = allocation_size(num_arena_slots(num_slots, num_reserved_slots));
+                unsigned char* storage = (unsigned char*) cache_aligned_allocate(n);
+                // Zero all slots to indicate that they are empty
+                std::memset(storage, 0, n);
+
+                return *new (storage + num_arena_slots(num_slots, num_reserved_slots) * sizeof(mail_outbox))
+                        arena(control, num_slots, num_reserved_slots, priority_level
 #if __TBB_PREVIEW_PARALLEL_PHASE
-              , lp
+                              ,
+                              lp
 #endif
-        );
-}
-
-void arena::free_arena () {
-    __TBB_ASSERT( is_alive(my_guard), nullptr);
-    __TBB_ASSERT( !my_references.load(std::memory_order_relaxed), "There are threads in the dying arena" );
-    __TBB_ASSERT( !my_total_num_workers_requested && !my_num_workers_allotted, "Dying arena requests workers" );
-    __TBB_ASSERT( is_empty(), "Inconsistent state of a dying arena" );
+                        );
+            }
+
+            void arena::free_arena() {
+                __TBB_ASSERT(is_alive(my_guard), nullptr);
+                __TBB_ASSERT(!my_references.load(std::memory_order_relaxed),
+                             "There are threads in the dying arena");
+                __TBB_ASSERT(!my_total_num_workers_requested && !my_num_workers_allotted,
+                             "Dying arena requests workers");
+                __TBB_ASSERT(is_empty(), "Inconsistent state of a dying arena");
 #if __TBB_ARENA_BINDING
-    if (my_numa_binding_observer != nullptr) {
-        destroy_binding_observer(my_numa_binding_observer);
-        my_numa_binding_observer = nullptr;
-    }
+                if (my_numa_binding_observer != nullptr) {
+                    destroy_binding_observer(my_numa_binding_observer);
+                    my_numa_binding_observer = nullptr;
+                }
 #endif /*__TBB_ARENA_BINDING*/
-    poison_value( my_guard );
-    for ( unsigned i = 0; i < my_num_slots; ++i ) {
-        // __TBB_ASSERT( !my_slots[i].my_scheduler, "arena slot is not empty" );
-        // TODO: understand the assertion and modify
-        // __TBB_ASSERT( my_slots[i].task_pool == EmptyTaskPool, nullptr);
-        __TBB_ASSERT( my_slots[i].head == my_slots[i].tail, nullptr); // TODO: replace by is_quiescent_local_task_pool_empty
-        my_slots[i].free_task_pool();
-        mailbox(i).drain();
-        my_slots[i].my_default_task_dispatcher->~task_dispatcher();
-    }
-    __TBB_ASSERT(my_fifo_task_stream.empty(), "Not all enqueued tasks were executed");
-    __TBB_ASSERT(my_resume_task_stream.empty(), "Not all enqueued tasks were executed");
-    // Cleanup coroutines/schedulers cache
-    my_co_cache.cleanup();
-    my_default_ctx->~task_group_context();
-    cache_aligned_deallocate(my_default_ctx);
+                poison_value(my_guard);
+                for (unsigned i = 0; i < my_num_slots; ++i) {
+                    // __TBB_ASSERT( !my_slots[i].my_scheduler, "arena slot is not empty" );
+                    // TODO: understand the assertion and modify
+                    // __TBB_ASSERT( my_slots[i].task_pool == EmptyTaskPool, nullptr);
+                    __TBB_ASSERT(my_slots[i].head == my_slots[i].tail,
+                                 nullptr);// TODO: replace by is_quiescent_local_task_pool_empty
+                    my_slots[i].free_task_pool();
+                    mailbox(i).drain();
+                    my_slots[i].my_default_task_dispatcher->~task_dispatcher();
+                }
+                __TBB_ASSERT(my_fifo_task_stream.empty(), "Not all enqueued tasks were executed");
+                __TBB_ASSERT(my_resume_task_stream.empty(), "Not all enqueued tasks were executed");
+                // Cleanup coroutines/schedulers cache
+                my_co_cache.cleanup();
+                my_default_ctx->~task_group_context();
+                cache_aligned_deallocate(my_default_ctx);
 #if __TBB_PREVIEW_CRITICAL_TASKS
-    __TBB_ASSERT( my_critical_task_stream.empty(), "Not all critical tasks were executed");
+                __TBB_ASSERT(my_critical_task_stream.empty(), "Not all critical tasks were executed");
 #endif
-    // Clear enfources synchronization with observe(false)
-    my_observers.clear();
+                // Clear enfources synchronization with observe(false)
+                my_observers.clear();
 
-    void* storage  = &mailbox(my_num_slots-1);
-    __TBB_ASSERT( my_references.load(std::memory_order_relaxed) == 0, nullptr);
-    this->~arena();
+                void* storage = &mailbox(my_num_slots - 1);
+                __TBB_ASSERT(my_references.load(std::memory_order_relaxed) == 0, nullptr);
+                this->~arena();
 #if TBB_USE_ASSERT > 1
-    std::memset( storage, 0, allocation_size(my_num_slots) );
+                std::memset(storage, 0, allocation_size(my_num_slots));
 #endif /* TBB_USE_ASSERT */
-    cache_aligned_deallocate( storage );
-}
-
-bool arena::has_enqueued_tasks() {
-    return !my_fifo_task_stream.empty();
-}
-
-void arena::request_workers(int mandatory_delta, int workers_delta, bool wakeup_threads) {
-    my_threading_control->adjust_demand(my_tc_client, mandatory_delta, workers_delta);
-
-    if (wakeup_threads) {
-        // Notify all sleeping threads that work has appeared in the arena.
-        get_waiting_threads_monitor().notify([&] (market_context context) {
-            return this == context.my_arena_addr;
-        });
-    }
-}
-
-bool arena::has_tasks() {
-    // TODO: rework it to return at least a hint about where a task was found; better if the task itself.
-    std::size_t n = my_limit.load(std::memory_order_acquire);
-    bool tasks_are_available = false;
-    for (std::size_t k = 0; k < n && !tasks_are_available; ++k) {
-        tasks_are_available = !my_slots[k].is_empty();
-    }
-    tasks_are_available = tasks_are_available || has_enqueued_tasks() || !my_resume_task_stream.empty();
+                cache_aligned_deallocate(storage);
+            }
+
+            bool arena::has_enqueued_tasks() { return !my_fifo_task_stream.empty(); }
+
+            void arena::request_workers(int mandatory_delta, int workers_delta, bool wakeup_threads) {
+                my_threading_control->adjust_demand(my_tc_client, mandatory_delta, workers_delta);
+
+                if (wakeup_threads) {
+                    // Notify all sleeping threads that work has appeared in the arena.
+                    get_waiting_threads_monitor().notify(
+                            [&](market_context context) { return this == context.my_arena_addr; });
+                }
+            }
+
+            bool arena::has_tasks() {
+                // TODO: rework it to return at least a hint about where a task was found; better if the task itself.
+                std::size_t n = my_limit.load(std::memory_order_acquire);
+                bool tasks_are_available = false;
+                for (std::size_t k = 0; k < n && !tasks_are_available; ++k) {
+                    tasks_are_available = !my_slots[k].is_empty();
+                }
+                tasks_are_available
+                        = tasks_are_available || has_enqueued_tasks() || !my_resume_task_stream.empty();
 #if __TBB_PREVIEW_CRITICAL_TASKS
-    tasks_are_available = tasks_are_available || !my_critical_task_stream.empty();
+                tasks_are_available = tasks_are_available || !my_critical_task_stream.empty();
 #endif
-    return tasks_are_available;
-}
-
-void arena::out_of_work() {
-    // We should try unset my_pool_state first due to keep arena invariants in consistent state
-    // Otherwise, we might have my_pool_state = false and my_mandatory_concurrency = true that is broken invariant
-    bool disable_mandatory = my_mandatory_concurrency.try_clear_if([this] { return !has_enqueued_tasks(); });
-    bool release_workers = my_pool_state.try_clear_if([this] { return !has_tasks(); });
-
-    if (disable_mandatory || release_workers) {
-        int mandatory_delta = disable_mandatory ? -1 : 0;
-        int workers_delta = release_workers ? -(int)my_max_num_workers : 0;
-
-        if (disable_mandatory && is_arena_workerless()) {
-            // We had set workers_delta to 1 when enabled mandatory concurrency, so revert it now
-            workers_delta = -1;
-        }
-        request_workers(mandatory_delta, workers_delta);
-    }
-}
-
-void arena::set_top_priority(bool is_top_priority) {
-    my_is_top_priority.store(is_top_priority, std::memory_order_relaxed);
-}
-
-bool arena::is_top_priority() const {
-    return my_is_top_priority.load(std::memory_order_relaxed);
-}
-
-bool arena::try_join() {
-    if (is_joinable()) {
-        my_references += arena::ref_worker;
-        return true;
-    }
-    return false;
-}
-
-void arena::set_allotment(unsigned allotment) {
-    if (my_num_workers_allotted.load(std::memory_order_relaxed) != allotment) {
-        my_num_workers_allotted.store(allotment, std::memory_order_relaxed);
-    }
-}
-
-int arena::update_concurrency(unsigned allotment) {
-    int delta = allotment - my_num_workers_allotted.load(std::memory_order_relaxed);
-    if (delta != 0) {
-        my_num_workers_allotted.store(allotment, std::memory_order_relaxed);
-    }
-    return delta;
-}
-
-std::pair<int, int> arena::update_request(int mandatory_delta, int workers_delta) {
-    __TBB_ASSERT(-1 <= mandatory_delta && mandatory_delta <= 1, nullptr);
-
-    int min_workers_request = 0;
-    int max_workers_request = 0;
-
-    // Calculate min request
-    my_mandatory_requests += mandatory_delta;
-    min_workers_request = my_mandatory_requests > 0 ? 1 : 0;
-
-    // Calculate max request
-    my_total_num_workers_requested += workers_delta;
-    // Clamp worker request into interval [0, my_max_num_workers]
-    max_workers_request = clamp(my_total_num_workers_requested, 0,
-        min_workers_request > 0 && is_arena_workerless() ? 1 : (int)my_max_num_workers);
-
-    return { min_workers_request, max_workers_request };
-}
-
-thread_control_monitor& arena::get_waiting_threads_monitor() {
-    return my_threading_control->get_waiting_threads_monitor();
-}
-
-void arena::enqueue_task(d1::task& t, d1::task_group_context& ctx, thread_data& td) {
-    task_group_context_impl::bind_to(ctx, &td);
-    task_accessor::context(t) = &ctx;
-    task_accessor::isolation(t) = no_isolation;
-    my_fifo_task_stream.push( &t, random_lane_selector(td.my_random) );
-    advertise_new_work<work_enqueued>();
-}
-
-arena &arena::create(threading_control *control, unsigned num_slots,
-                     unsigned num_reserved_slots, unsigned arena_priority_level,
-                     d1::constraints constraints
+                return tasks_are_available;
+            }
+
+            void arena::out_of_work() {
+                // We should try unset my_pool_state first due to keep arena invariants in consistent state
+                // Otherwise, we might have my_pool_state = false and my_mandatory_concurrency = true that is broken invariant
+                bool disable_mandatory
+                        = my_mandatory_concurrency.try_clear_if([this] { return !has_enqueued_tasks(); });
+                bool release_workers = my_pool_state.try_clear_if([this] { return !has_tasks(); });
+
+                if (disable_mandatory || release_workers) {
+                    int mandatory_delta = disable_mandatory ? -1 : 0;
+                    int workers_delta = release_workers ? -(int) my_max_num_workers : 0;
+
+                    if (disable_mandatory && is_arena_workerless()) {
+                        // We had set workers_delta to 1 when enabled mandatory concurrency, so revert it now
+                        workers_delta = -1;
+                    }
+                    request_workers(mandatory_delta, workers_delta);
+                }
+            }
+
+            void arena::set_top_priority(bool is_top_priority) {
+                my_is_top_priority.store(is_top_priority, std::memory_order_relaxed);
+            }
+
+            bool arena::is_top_priority() const { return my_is_top_priority.load(std::memory_order_relaxed); }
+
+            bool arena::try_join() {
+                if (is_joinable()) {
+                    my_references += arena::ref_worker;
+                    return true;
+                }
+                return false;
+            }
+
+            void arena::set_allotment(unsigned allotment) {
+                if (my_num_workers_allotted.load(std::memory_order_relaxed) != allotment) {
+                    my_num_workers_allotted.store(allotment, std::memory_order_relaxed);
+                }
+            }
+
+            int arena::update_concurrency(unsigned allotment) {
+                int delta = allotment - my_num_workers_allotted.load(std::memory_order_relaxed);
+                if (delta != 0) { my_num_workers_allotted.store(allotment, std::memory_order_relaxed); }
+                return delta;
+            }
+
+            std::pair<int, int> arena::update_request(int mandatory_delta, int workers_delta) {
+                __TBB_ASSERT(-1 <= mandatory_delta && mandatory_delta <= 1, nullptr);
+
+                int min_workers_request = 0;
+                int max_workers_request = 0;
+
+                // Calculate min request
+                my_mandatory_requests += mandatory_delta;
+                min_workers_request = my_mandatory_requests > 0 ? 1 : 0;
+
+                // Calculate max request
+                my_total_num_workers_requested += workers_delta;
+                // Clamp worker request into interval [0, my_max_num_workers]
+                max_workers_request = clamp(
+                        my_total_num_workers_requested, 0,
+                        min_workers_request > 0 && is_arena_workerless() ? 1 : (int) my_max_num_workers);
+
+                return {min_workers_request, max_workers_request};
+            }
+
+            thread_control_monitor& arena::get_waiting_threads_monitor() {
+                return my_threading_control->get_waiting_threads_monitor();
+            }
+
+            void arena::enqueue_task(d1::task& t, d1::task_group_context& ctx, thread_data& td) {
+                task_group_context_impl::bind_to(ctx, &td);
+                task_accessor::context(t) = &ctx;
+                task_accessor::isolation(t) = no_isolation;
+                my_fifo_task_stream.push(&t, random_lane_selector(td.my_random));
+                advertise_new_work<work_enqueued>();
+            }
+
+            arena& arena::create(threading_control* control, unsigned num_slots, unsigned num_reserved_slots,
+                                 unsigned arena_priority_level, d1::constraints constraints
 #if __TBB_PREVIEW_PARALLEL_PHASE
-                     , tbb::task_arena::leave_policy lp 
+                                 ,
+                                 tbb::task_arena::leave_policy lp
 #endif
-) {
-    __TBB_ASSERT(num_slots > 0, NULL);
-    __TBB_ASSERT(num_reserved_slots <= num_slots, NULL);
-    // Add public market reference for an external thread/task_arena (that adds an internal reference in exchange).
-    arena& a = arena::allocate_arena(control, num_slots, num_reserved_slots, arena_priority_level
+            ) {
+                __TBB_ASSERT(num_slots > 0, NULL);
+                __TBB_ASSERT(num_reserved_slots <= num_slots, NULL);
+                // Add public market reference for an external thread/task_arena (that adds an internal reference in exchange).
+                arena& a = arena::allocate_arena(control, num_slots, num_reserved_slots, arena_priority_level
 #if __TBB_PREVIEW_PARALLEL_PHASE
-                                     , lp
+                                                 ,
+                                                 lp
 #endif
-    );
-    a.my_tc_client = control->create_client(a);
-    // We should not publish arena until all fields are initialized
-    control->publish_client(a.my_tc_client, constraints);
-    return a;
-}
+                );
+                a.my_tc_client = control->create_client(a);
+                // We should not publish arena until all fields are initialized
+                control->publish_client(a.my_tc_client, constraints);
+                return a;
+            }
 
-} // namespace r1
-} // namespace detail
-} // namespace tbb
+        }// namespace r1
+    }    // namespace detail
+}// namespace tbb
 
 // Enable task_arena.h
-#include "oneapi/tbb/task_arena.h" // task_arena_base
+#include "oneapi/tbb/task_arena.h"// task_arena_base
 
 namespace tbb {
-namespace detail {
-namespace r1 {
+    namespace detail {
+        namespace r1 {
 
 #if TBB_USE_ASSERT
-void assert_arena_priority_valid( tbb::task_arena::priority a_priority ) {
-    bool is_arena_priority_correct =
-        a_priority == tbb::task_arena::priority::high   ||
-        a_priority == tbb::task_arena::priority::normal ||
-        a_priority == tbb::task_arena::priority::low;
-    __TBB_ASSERT( is_arena_priority_correct,
-                  "Task arena priority should be equal to one of the predefined values." );
-}
+            void assert_arena_priority_valid(tbb::task_arena::priority a_priority) {
+                bool is_arena_priority_correct = a_priority == tbb::task_arena::priority::high
+                                                 || a_priority == tbb::task_arena::priority::normal
+                                                 || a_priority == tbb::task_arena::priority::low;
+                __TBB_ASSERT(is_arena_priority_correct,
+                             "Task arena priority should be equal to one of the predefined values.");
+            }
 #else
-void assert_arena_priority_valid( tbb::task_arena::priority ) {}
+            void assert_arena_priority_valid(tbb::task_arena::priority) {}
 #endif
 
-unsigned arena_priority_level( tbb::task_arena::priority a_priority ) {
-    assert_arena_priority_valid( a_priority );
-    return d1::num_priority_levels - unsigned(int(a_priority) / d1::priority_stride);
-}
-
-tbb::task_arena::priority arena_priority( unsigned priority_level ) {
-    auto priority = tbb::task_arena::priority(
-        (d1::num_priority_levels - priority_level) * d1::priority_stride
-    );
-    assert_arena_priority_valid( priority );
-    return priority;
-}
-
-struct task_arena_impl {
-    static void initialize(d1::task_arena_base&);
-    static void terminate(d1::task_arena_base&);
-    static bool attach(d1::task_arena_base&);
-    static void execute(d1::task_arena_base&, d1::delegate_base&);
-    static void wait(d1::task_arena_base&);
-    static int max_concurrency(const d1::task_arena_base*);
-    static void enqueue(d1::task&, d1::task_group_context*, d1::task_arena_base*);
-    static d1::slot_id execution_slot(const d1::task_arena_base&);
-    static void enter_parallel_phase(d1::task_arena_base*, std::uintptr_t);
-    static void exit_parallel_phase(d1::task_arena_base*, std::uintptr_t);
-};
-
-void __TBB_EXPORTED_FUNC initialize(d1::task_arena_base& ta) {
-    task_arena_impl::initialize(ta);
-}
-void __TBB_EXPORTED_FUNC terminate(d1::task_arena_base& ta) {
-    task_arena_impl::terminate(ta);
-}
-bool __TBB_EXPORTED_FUNC attach(d1::task_arena_base& ta) {
-    return task_arena_impl::attach(ta);
-}
-void __TBB_EXPORTED_FUNC execute(d1::task_arena_base& ta, d1::delegate_base& d) {
-    task_arena_impl::execute(ta, d);
-}
-void __TBB_EXPORTED_FUNC wait(d1::task_arena_base& ta) {
-    task_arena_impl::wait(ta);
-}
-
-int __TBB_EXPORTED_FUNC max_concurrency(const d1::task_arena_base* ta) {
-    return task_arena_impl::max_concurrency(ta);
-}
-
-void __TBB_EXPORTED_FUNC enqueue(d1::task& t, d1::task_arena_base* ta) {
-    task_arena_impl::enqueue(t, nullptr, ta);
-}
-
-void __TBB_EXPORTED_FUNC enqueue(d1::task& t, d1::task_group_context& ctx, d1::task_arena_base* ta) {
-    task_arena_impl::enqueue(t, &ctx, ta);
-}
-
-d1::slot_id __TBB_EXPORTED_FUNC execution_slot(const d1::task_arena_base& arena) {
-    return task_arena_impl::execution_slot(arena);
-}
-
-void __TBB_EXPORTED_FUNC enter_parallel_phase(d1::task_arena_base* ta, std::uintptr_t flags) {
-    task_arena_impl::enter_parallel_phase(ta, flags);
-}
-
-void __TBB_EXPORTED_FUNC exit_parallel_phase(d1::task_arena_base* ta, std::uintptr_t flags) {
-    task_arena_impl::exit_parallel_phase(ta, flags);
-}
-
-void task_arena_impl::initialize(d1::task_arena_base& ta) {
-    // Enforce global market initialization to properly initialize soft limit
-    (void)governor::get_thread_data();
-    d1::constraints arena_constraints;
+            unsigned arena_priority_level(tbb::task_arena::priority a_priority) {
+                assert_arena_priority_valid(a_priority);
+                return d1::num_priority_levels - unsigned(int(a_priority) / d1::priority_stride);
+            }
+
+            tbb::task_arena::priority arena_priority(unsigned priority_level) {
+                auto priority = tbb::task_arena::priority((d1::num_priority_levels - priority_level)
+                                                          * d1::priority_stride);
+                assert_arena_priority_valid(priority);
+                return priority;
+            }
+
+            struct task_arena_impl {
+                static void initialize(d1::task_arena_base&);
+                static void terminate(d1::task_arena_base&);
+                static bool attach(d1::task_arena_base&);
+                static void execute(d1::task_arena_base&, d1::delegate_base&);
+                static void wait(d1::task_arena_base&);
+                static int max_concurrency(const d1::task_arena_base*);
+                static void enqueue(d1::task&, d1::task_group_context*, d1::task_arena_base*);
+                static d1::slot_id execution_slot(const d1::task_arena_base&);
+                static void enter_parallel_phase(d1::task_arena_base*, std::uintptr_t);
+                static void exit_parallel_phase(d1::task_arena_base*, std::uintptr_t);
+            };
+
+            void __TBB_EXPORTED_FUNC initialize(d1::task_arena_base& ta) { task_arena_impl::initialize(ta); }
+            void __TBB_EXPORTED_FUNC terminate(d1::task_arena_base& ta) { task_arena_impl::terminate(ta); }
+            bool __TBB_EXPORTED_FUNC attach(d1::task_arena_base& ta) { return task_arena_impl::attach(ta); }
+            void __TBB_EXPORTED_FUNC execute(d1::task_arena_base& ta, d1::delegate_base& d) {
+                task_arena_impl::execute(ta, d);
+            }
+            void __TBB_EXPORTED_FUNC wait(d1::task_arena_base& ta) { task_arena_impl::wait(ta); }
+
+            int __TBB_EXPORTED_FUNC max_concurrency(const d1::task_arena_base* ta) {
+                return task_arena_impl::max_concurrency(ta);
+            }
+
+            void __TBB_EXPORTED_FUNC enqueue(d1::task& t, d1::task_arena_base* ta) {
+                task_arena_impl::enqueue(t, nullptr, ta);
+            }
+
+            void __TBB_EXPORTED_FUNC enqueue(d1::task& t, d1::task_group_context& ctx,
+                                             d1::task_arena_base* ta) {
+                task_arena_impl::enqueue(t, &ctx, ta);
+            }
+
+            d1::slot_id __TBB_EXPORTED_FUNC execution_slot(const d1::task_arena_base& arena) {
+                return task_arena_impl::execution_slot(arena);
+            }
+
+            void __TBB_EXPORTED_FUNC enter_parallel_phase(d1::task_arena_base* ta, std::uintptr_t flags) {
+                task_arena_impl::enter_parallel_phase(ta, flags);
+            }
+
+            void __TBB_EXPORTED_FUNC exit_parallel_phase(d1::task_arena_base* ta, std::uintptr_t flags) {
+                task_arena_impl::exit_parallel_phase(ta, flags);
+            }
+
+            void task_arena_impl::initialize(d1::task_arena_base& ta) {
+                // Enforce global market initialization to properly initialize soft limit
+                (void) governor::get_thread_data();
+                d1::constraints arena_constraints;
 
 #if __TBB_ARENA_BINDING
-    arena_constraints = d1::constraints{}
-        .set_core_type(ta.core_type())
-        .set_max_threads_per_core(ta.max_threads_per_core())
-        .set_numa_id(ta.my_numa_id);
+                arena_constraints = d1::constraints {}
+                                            .set_core_type(ta.core_type())
+                                            .set_max_threads_per_core(ta.max_threads_per_core())
+                                            .set_numa_id(ta.my_numa_id);
 #endif /*__TBB_ARENA_BINDING*/
 
-    if (ta.my_max_concurrency < 1) {
+                if (ta.my_max_concurrency < 1) {
 #if __TBB_ARENA_BINDING
-        ta.my_max_concurrency = (int)default_concurrency(arena_constraints);
-#else /*!__TBB_ARENA_BINDING*/
-        ta.my_max_concurrency = (int)governor::default_num_threads();
+                    ta.my_max_concurrency = (int) default_concurrency(arena_constraints);
+#else  /*!__TBB_ARENA_BINDING*/
+                    ta.my_max_concurrency = (int) governor::default_num_threads();
 #endif /*!__TBB_ARENA_BINDING*/
-    }
+                }
 
 #if __TBB_CPUBIND_PRESENT
-    numa_binding_observer* observer = construct_binding_observer(
-        static_cast<d1::task_arena*>(&ta), arena::num_arena_slots(ta.my_max_concurrency, ta.my_num_reserved_slots),
-        ta.my_numa_id, ta.core_type(), ta.max_threads_per_core());
-    if (observer) {
-        // TODO: Consider lazy initialization for internal arena so
-        // the direct calls to observer might be omitted until actual initialization.
-        observer->on_scheduler_entry(true);
-    }
+                numa_binding_observer* observer = construct_binding_observer(
+                        static_cast<d1::task_arena*>(&ta),
+                        arena::num_arena_slots(ta.my_max_concurrency, ta.my_num_reserved_slots),
+                        ta.my_numa_id, ta.core_type(), ta.max_threads_per_core());
+                if (observer) {
+                    // TODO: Consider lazy initialization for internal arena so
+                    // the direct calls to observer might be omitted until actual initialization.
+                    observer->on_scheduler_entry(true);
+                }
 #endif /*__TBB_CPUBIND_PRESENT*/
 
-    __TBB_ASSERT(ta.my_arena.load(std::memory_order_relaxed) == nullptr, "Arena already initialized");
-    unsigned priority_level = arena_priority_level(ta.my_priority);
-    threading_control* thr_control = threading_control::register_public_reference();
-    arena& a = arena::create(thr_control, unsigned(ta.my_max_concurrency), ta.my_num_reserved_slots,
-                             priority_level, arena_constraints
+                __TBB_ASSERT(ta.my_arena.load(std::memory_order_relaxed) == nullptr,
+                             "Arena already initialized");
+                unsigned priority_level = arena_priority_level(ta.my_priority);
+                threading_control* thr_control = threading_control::register_public_reference();
+                arena& a = arena::create(thr_control, unsigned(ta.my_max_concurrency),
+                                         ta.my_num_reserved_slots, priority_level, arena_constraints
 #if __TBB_PREVIEW_PARALLEL_PHASE
-                             , ta.get_leave_policy()
+                                         ,
+                                         ta.get_leave_policy()
 #endif
-    );
+                );
 
-    ta.my_arena.store(&a, std::memory_order_release);
+                ta.my_arena.store(&a, std::memory_order_release);
 #if __TBB_CPUBIND_PRESENT
-    a.my_numa_binding_observer = observer;
-    if (observer) {
-        observer->on_scheduler_exit(true);
-        observer->observe(true);
-    }
+                a.my_numa_binding_observer = observer;
+                if (observer) {
+                    observer->on_scheduler_exit(true);
+                    observer->observe(true);
+                }
 #endif /*__TBB_CPUBIND_PRESENT*/
-}
-
-void task_arena_impl::terminate(d1::task_arena_base& ta) {
-    arena* a = ta.my_arena.load(std::memory_order_relaxed);
-    assert_pointer_valid(a);
-    threading_control::unregister_public_reference(/*blocking_terminate=*/false);
-    a->on_thread_leaving(arena::ref_external);
-    ta.my_arena.store(nullptr, std::memory_order_relaxed);
-}
-
-bool task_arena_impl::attach(d1::task_arena_base& ta) {
-    __TBB_ASSERT(!ta.my_arena.load(std::memory_order_relaxed), nullptr);
-    thread_data* td = governor::get_thread_data_if_initialized();
-    if( td && td->my_arena ) {
-        arena* a = td->my_arena;
-        // There is an active arena to attach to.
-        // It's still used by s, so won't be destroyed right away.
-        __TBB_ASSERT(a->my_references > 0, nullptr);
-        a->my_references += arena::ref_external;
-        ta.my_num_reserved_slots = a->my_num_reserved_slots;
-        ta.my_priority = arena_priority(a->my_priority_level);
-        ta.my_max_concurrency = ta.my_num_reserved_slots + a->my_max_num_workers;
-        __TBB_ASSERT(arena::num_arena_slots(ta.my_max_concurrency, ta.my_num_reserved_slots) == a->my_num_slots, nullptr);
-        ta.my_arena.store(a, std::memory_order_release);
-        // increases threading_control's ref count for task_arena
-        threading_control::register_public_reference();
-        return true;
-    }
-    return false;
-}
-
-void task_arena_impl::enqueue(d1::task& t, d1::task_group_context* c, d1::task_arena_base* ta) {
-    thread_data* td = governor::get_thread_data();  // thread data is only needed for FastRandom instance
-    assert_pointer_valid(td, "thread_data pointer should not be null");
-    arena* a = ta ?
-              ta->my_arena.load(std::memory_order_relaxed)
-            : td->my_arena
-    ;
-    assert_pointer_valid(a, "arena pointer should not be null");
-    auto* ctx = c ? c : a->my_default_ctx;
-    assert_pointer_valid(ctx, "context pointer should not be null");
-    // Is there a better place for checking the state of ctx?
-     __TBB_ASSERT(!a->my_default_ctx->is_group_execution_cancelled(),
-                  "The task will not be executed because its task_group_context is cancelled.");
-     a->enqueue_task(t, *ctx, *td);
-}
-
-d1::slot_id task_arena_impl::execution_slot(const d1::task_arena_base& ta) {
-    thread_data* td = governor::get_thread_data_if_initialized();
-    if (td && (td->is_attached_to(ta.my_arena.load(std::memory_order_relaxed)))) {
-        return td->my_arena_index;
-    }
-    return d1::slot_id(-1);
-}
-
-class nested_arena_context : no_copy {
-public:
-    nested_arena_context(thread_data& td, arena& nested_arena, std::size_t slot_index)
-        : m_orig_execute_data_ext(td.my_task_dispatcher->m_execute_data_ext)
-    {
-        if (td.my_arena != &nested_arena) {
-            m_orig_arena = td.my_arena;
-            m_orig_slot_index = td.my_arena_index;
-            m_orig_last_observer = td.my_last_observer;
-            m_orig_is_thread_registered = td.my_is_registered;
-
-            td.detach_task_dispatcher();
-            td.attach_arena(nested_arena, slot_index);
-            td.my_is_registered = false;
-            if (td.my_inbox.is_idle_state(true))
-                td.my_inbox.set_is_idle(false);
-            task_dispatcher& task_disp = td.my_arena_slot->default_task_dispatcher();
-            td.enter_task_dispatcher(task_disp, m_orig_execute_data_ext.task_disp->m_stealing_threshold);
-
-            // If the calling thread occupies the slots out of external thread reserve we need to notify the
-            // market that this arena requires one worker less.
-            if (td.my_arena_index >= td.my_arena->my_num_reserved_slots) {
-                td.my_arena->request_workers(/* mandatory_delta = */ 0, /* workers_delta = */ -1);
-            }
-
-            td.my_last_observer = nullptr;
-            // The task_arena::execute method considers each calling thread as an external thread.
-            td.my_arena->my_observers.notify_entry_observers(td.my_last_observer, /* worker*/false);
-        }
-
-        m_task_dispatcher = td.my_task_dispatcher;
-        m_orig_fifo_tasks_allowed = m_task_dispatcher->allow_fifo_task(true);
-        m_orig_critical_task_allowed = m_task_dispatcher->m_properties.critical_task_allowed;
-        m_task_dispatcher->m_properties.critical_task_allowed = true;
-
-        execution_data_ext& ed_ext = td.my_task_dispatcher->m_execute_data_ext;
-        ed_ext.context = td.my_arena->my_default_ctx;
-        ed_ext.original_slot = td.my_arena_index;
-        ed_ext.affinity_slot = d1::no_slot;
-        ed_ext.task_disp = td.my_task_dispatcher;
-        ed_ext.isolation = no_isolation;
-
-        __TBB_ASSERT(td.my_arena_slot, nullptr);
-        __TBB_ASSERT(td.my_arena_slot->is_occupied(), nullptr);
-        __TBB_ASSERT(td.my_task_dispatcher, nullptr);
-    }
-    ~nested_arena_context() {
-        thread_data& td = *m_task_dispatcher->m_thread_data;
-        __TBB_ASSERT(governor::is_thread_data_set(&td), nullptr);
-        m_task_dispatcher->allow_fifo_task(m_orig_fifo_tasks_allowed);
-        m_task_dispatcher->m_properties.critical_task_allowed = m_orig_critical_task_allowed;
-        if (m_orig_arena) {
-            td.my_arena->my_observers.notify_exit_observers(td.my_last_observer, /*worker*/ false);
-            td.my_last_observer = m_orig_last_observer;
-
-            // Notify the market that this thread releasing a one slot
-            // that can be used by a worker thread.
-            if (td.my_arena_index >= td.my_arena->my_num_reserved_slots) {
-                td.my_arena->request_workers(/* mandatory_delta = */ 0, /* workers_delta = */ 1);
-            }
-
-            td.leave_task_dispatcher();
-            td.my_arena_slot->release();
-            td.my_arena->my_exit_monitors.notify_one(); // do not relax!
-            td.my_is_registered = m_orig_is_thread_registered;
-            td.attach_arena(*m_orig_arena, m_orig_slot_index);
-            td.attach_task_dispatcher(*m_orig_execute_data_ext.task_disp);
-            __TBB_ASSERT(td.my_inbox.is_idle_state(false), nullptr);
-        }
-        td.my_task_dispatcher->m_execute_data_ext = m_orig_execute_data_ext;
-    }
-
-private:
-    execution_data_ext    m_orig_execute_data_ext{};
-    arena*              m_orig_arena{ nullptr };
-    observer_proxy*     m_orig_last_observer{ nullptr };
-    task_dispatcher*    m_task_dispatcher{ nullptr };
-    unsigned            m_orig_slot_index{};
-    bool                m_orig_fifo_tasks_allowed{};
-    bool                m_orig_critical_task_allowed{};
-    bool                m_orig_is_thread_registered{};
-};
-
-class delegated_task : public d1::task {
-    d1::delegate_base&  m_delegate;
-    concurrent_monitor& m_monitor;
-    d1::wait_context&   m_wait_ctx;
-    std::atomic<bool>   m_completed;
-    d1::task* execute(d1::execution_data& ed) override {
-        const execution_data_ext& ed_ext = static_cast<const execution_data_ext&>(ed);
-        execution_data_ext orig_execute_data_ext = ed_ext.task_disp->m_execute_data_ext;
-        __TBB_ASSERT(&ed_ext.task_disp->m_execute_data_ext == &ed,
-            "The execute data shall point to the current task dispatcher execute data");
-        __TBB_ASSERT(ed_ext.task_disp->m_execute_data_ext.isolation == no_isolation, nullptr);
-
-        ed_ext.task_disp->m_execute_data_ext.context = ed_ext.task_disp->get_thread_data().my_arena->my_default_ctx;
-        bool fifo_task_allowed = ed_ext.task_disp->allow_fifo_task(true);
-        try_call([&] {
-            m_delegate();
-        }).on_completion([&] {
-            ed_ext.task_disp->m_execute_data_ext = orig_execute_data_ext;
-            ed_ext.task_disp->allow_fifo_task(fifo_task_allowed);
-        });
-
-        finalize();
-        return nullptr;
-    }
-    d1::task* cancel(d1::execution_data&) override {
-        finalize();
-        return nullptr;
-    }
-    void finalize() {
-        m_wait_ctx.release(); // must precede the wakeup
-        m_monitor.notify([this] (std::uintptr_t ctx) {
-            return ctx == std::uintptr_t(&m_delegate);
-        }); // do not relax, it needs a fence!
-        m_completed.store(true, std::memory_order_release);
-    }
-public:
-    delegated_task(d1::delegate_base& d, concurrent_monitor& s, d1::wait_context& wo)
-        : m_delegate(d), m_monitor(s), m_wait_ctx(wo), m_completed{ false }{}
-    ~delegated_task() override {
-        // The destructor can be called earlier than the m_monitor is notified
-        // because the waiting thread can be released after m_wait_ctx.release_wait.
-        // To close that race we wait for the m_completed signal.
-        spin_wait_until_eq(m_completed, true);
-    }
-};
-
-void task_arena_impl::execute(d1::task_arena_base& ta, d1::delegate_base& d) {
-    arena* a = ta.my_arena.load(std::memory_order_relaxed);
-    __TBB_ASSERT(a != nullptr, nullptr);
-    thread_data* td = governor::get_thread_data();
-
-    bool same_arena = td->my_arena == a;
-    std::size_t index1 = td->my_arena_index;
-    if (!same_arena) {
-        index1 = a->occupy_free_slot</*as_worker */false>(*td);
-        if (index1 == arena::out_of_arena) {
-            concurrent_monitor::thread_context waiter((std::uintptr_t)&d);
-            d1::wait_context wo(1);
-            d1::task_group_context exec_context(d1::task_group_context::isolated);
-            task_group_context_impl::copy_fp_settings(exec_context, *a->my_default_ctx);
-
-            delegated_task dt(d, a->my_exit_monitors, wo);
-            a->enqueue_task( dt, exec_context, *td);
-            size_t index2 = arena::out_of_arena;
-            do {
-                a->my_exit_monitors.prepare_wait(waiter);
-                if (!wo.continue_execution()) {
-                    a->my_exit_monitors.cancel_wait(waiter);
-                    break;
+            }
+
+            void task_arena_impl::terminate(d1::task_arena_base& ta) {
+                arena* a = ta.my_arena.load(std::memory_order_relaxed);
+                assert_pointer_valid(a);
+                threading_control::unregister_public_reference(/*blocking_terminate=*/false);
+                a->on_thread_leaving(arena::ref_external);
+                ta.my_arena.store(nullptr, std::memory_order_relaxed);
+            }
+
+            bool task_arena_impl::attach(d1::task_arena_base& ta) {
+                __TBB_ASSERT(!ta.my_arena.load(std::memory_order_relaxed), nullptr);
+                thread_data* td = governor::get_thread_data_if_initialized();
+                if (td && td->my_arena) {
+                    arena* a = td->my_arena;
+                    // There is an active arena to attach to.
+                    // It's still used by s, so won't be destroyed right away.
+                    __TBB_ASSERT(a->my_references > 0, nullptr);
+                    a->my_references += arena::ref_external;
+                    ta.my_num_reserved_slots = a->my_num_reserved_slots;
+                    ta.my_priority = arena_priority(a->my_priority_level);
+                    ta.my_max_concurrency = ta.my_num_reserved_slots + a->my_max_num_workers;
+                    __TBB_ASSERT(arena::num_arena_slots(ta.my_max_concurrency, ta.my_num_reserved_slots)
+                                         == a->my_num_slots,
+                                 nullptr);
+                    ta.my_arena.store(a, std::memory_order_release);
+                    // increases threading_control's ref count for task_arena
+                    threading_control::register_public_reference();
+                    return true;
+                }
+                return false;
+            }
+
+            void task_arena_impl::enqueue(d1::task& t, d1::task_group_context* c, d1::task_arena_base* ta) {
+                thread_data* td
+                        = governor::get_thread_data();// thread data is only needed for FastRandom instance
+                assert_pointer_valid(td, "thread_data pointer should not be null");
+                arena* a = ta ? ta->my_arena.load(std::memory_order_relaxed) : td->my_arena;
+                assert_pointer_valid(a, "arena pointer should not be null");
+                auto* ctx = c ? c : a->my_default_ctx;
+                assert_pointer_valid(ctx, "context pointer should not be null");
+                // Is there a better place for checking the state of ctx?
+                __TBB_ASSERT(!a->my_default_ctx->is_group_execution_cancelled(),
+                             "The task will not be executed because its task_group_context is cancelled.");
+                a->enqueue_task(t, *ctx, *td);
+            }
+
+            d1::slot_id task_arena_impl::execution_slot(const d1::task_arena_base& ta) {
+                thread_data* td = governor::get_thread_data_if_initialized();
+                if (td && (td->is_attached_to(ta.my_arena.load(std::memory_order_relaxed)))) {
+                    return td->my_arena_index;
+                }
+                return d1::slot_id(-1);
+            }
+
+            class nested_arena_context : no_copy {
+            public:
+                nested_arena_context(thread_data& td, arena& nested_arena, std::size_t slot_index)
+                    : m_orig_execute_data_ext(td.my_task_dispatcher->m_execute_data_ext) {
+                    if (td.my_arena != &nested_arena) {
+                        m_orig_arena = td.my_arena;
+                        m_orig_slot_index = td.my_arena_index;
+                        m_orig_last_observer = td.my_last_observer;
+                        m_orig_is_thread_registered = td.my_is_registered;
+
+                        td.detach_task_dispatcher();
+                        td.attach_arena(nested_arena, slot_index);
+                        td.my_is_registered = false;
+                        if (td.my_inbox.is_idle_state(true)) td.my_inbox.set_is_idle(false);
+                        task_dispatcher& task_disp = td.my_arena_slot->default_task_dispatcher();
+                        td.enter_task_dispatcher(task_disp,
+                                                 m_orig_execute_data_ext.task_disp->m_stealing_threshold);
+
+                        // If the calling thread occupies the slots out of external thread reserve we need to notify the
+                        // market that this arena requires one worker less.
+                        if (td.my_arena_index >= td.my_arena->my_num_reserved_slots) {
+                            td.my_arena->request_workers(/* mandatory_delta = */ 0, /* workers_delta = */ -1);
+                        }
+
+                        td.my_last_observer = nullptr;
+                        // The task_arena::execute method considers each calling thread as an external thread.
+                        td.my_arena->my_observers.notify_entry_observers(td.my_last_observer,
+                                                                         /* worker*/ false);
+                    }
+
+                    m_task_dispatcher = td.my_task_dispatcher;
+                    m_orig_fifo_tasks_allowed = m_task_dispatcher->allow_fifo_task(true);
+                    m_orig_critical_task_allowed = m_task_dispatcher->m_properties.critical_task_allowed;
+                    m_task_dispatcher->m_properties.critical_task_allowed = true;
+
+                    execution_data_ext& ed_ext = td.my_task_dispatcher->m_execute_data_ext;
+                    ed_ext.context = td.my_arena->my_default_ctx;
+                    ed_ext.original_slot = td.my_arena_index;
+                    ed_ext.affinity_slot = d1::no_slot;
+                    ed_ext.task_disp = td.my_task_dispatcher;
+                    ed_ext.isolation = no_isolation;
+
+                    __TBB_ASSERT(td.my_arena_slot, nullptr);
+                    __TBB_ASSERT(td.my_arena_slot->is_occupied(), nullptr);
+                    __TBB_ASSERT(td.my_task_dispatcher, nullptr);
+                }
+                ~nested_arena_context() {
+                    thread_data& td = *m_task_dispatcher->m_thread_data;
+                    __TBB_ASSERT(governor::is_thread_data_set(&td), nullptr);
+                    m_task_dispatcher->allow_fifo_task(m_orig_fifo_tasks_allowed);
+                    m_task_dispatcher->m_properties.critical_task_allowed = m_orig_critical_task_allowed;
+                    if (m_orig_arena) {
+                        td.my_arena->my_observers.notify_exit_observers(td.my_last_observer,
+                                                                        /*worker*/ false);
+                        td.my_last_observer = m_orig_last_observer;
+
+                        // Notify the market that this thread releasing a one slot
+                        // that can be used by a worker thread.
+                        if (td.my_arena_index >= td.my_arena->my_num_reserved_slots) {
+                            td.my_arena->request_workers(/* mandatory_delta = */ 0, /* workers_delta = */ 1);
+                        }
+
+                        td.leave_task_dispatcher();
+                        td.my_arena_slot->release();
+                        td.my_arena->my_exit_monitors.notify_one();// do not relax!
+                        td.my_is_registered = m_orig_is_thread_registered;
+                        td.attach_arena(*m_orig_arena, m_orig_slot_index);
+                        td.attach_task_dispatcher(*m_orig_execute_data_ext.task_disp);
+                        __TBB_ASSERT(td.my_inbox.is_idle_state(false), nullptr);
+                    }
+                    td.my_task_dispatcher->m_execute_data_ext = m_orig_execute_data_ext;
+                }
+
+            private:
+                execution_data_ext m_orig_execute_data_ext {};
+                arena* m_orig_arena {nullptr};
+                observer_proxy* m_orig_last_observer {nullptr};
+                task_dispatcher* m_task_dispatcher {nullptr};
+                unsigned m_orig_slot_index {};
+                bool m_orig_fifo_tasks_allowed {};
+                bool m_orig_critical_task_allowed {};
+                bool m_orig_is_thread_registered {};
+            };
+
+            class delegated_task : public d1::task {
+                d1::delegate_base& m_delegate;
+                concurrent_monitor& m_monitor;
+                d1::wait_context& m_wait_ctx;
+                std::atomic<bool> m_completed;
+                d1::task* execute(d1::execution_data& ed) override {
+                    const execution_data_ext& ed_ext = static_cast<const execution_data_ext&>(ed);
+                    execution_data_ext orig_execute_data_ext = ed_ext.task_disp->m_execute_data_ext;
+                    __TBB_ASSERT(&ed_ext.task_disp->m_execute_data_ext == &ed,
+                                 "The execute data shall point to the current task dispatcher execute data");
+                    __TBB_ASSERT(ed_ext.task_disp->m_execute_data_ext.isolation == no_isolation, nullptr);
+
+                    ed_ext.task_disp->m_execute_data_ext.context
+                            = ed_ext.task_disp->get_thread_data().my_arena->my_default_ctx;
+                    bool fifo_task_allowed = ed_ext.task_disp->allow_fifo_task(true);
+                    try_call([&] { m_delegate(); }).on_completion([&] {
+                        ed_ext.task_disp->m_execute_data_ext = orig_execute_data_ext;
+                        ed_ext.task_disp->allow_fifo_task(fifo_task_allowed);
+                    });
+
+                    finalize();
+                    return nullptr;
+                }
+                d1::task* cancel(d1::execution_data&) override {
+                    finalize();
+                    return nullptr;
+                }
+                void finalize() {
+                    m_wait_ctx.release();// must precede the wakeup
+                    m_monitor.notify([this](std::uintptr_t ctx) {
+                        return ctx == std::uintptr_t(&m_delegate);
+                    });// do not relax, it needs a fence!
+                    m_completed.store(true, std::memory_order_release);
                 }
-                index2 = a->occupy_free_slot</*as_worker*/false>(*td);
-                if (index2 != arena::out_of_arena) {
-                    a->my_exit_monitors.cancel_wait(waiter);
-                    nested_arena_context scope(*td, *a, index2 );
-                    r1::wait(wo, exec_context);
-                    __TBB_ASSERT(!exec_context.my_exception.load(std::memory_order_relaxed), nullptr); // exception can be thrown above, not deferred
-                    break;
+
+            public:
+                delegated_task(d1::delegate_base& d, concurrent_monitor& s, d1::wait_context& wo)
+                    : m_delegate(d), m_monitor(s), m_wait_ctx(wo), m_completed {false} {}
+                ~delegated_task() override {
+                    // The destructor can be called earlier than the m_monitor is notified
+                    // because the waiting thread can be released after m_wait_ctx.release_wait.
+                    // To close that race we wait for the m_completed signal.
+                    spin_wait_until_eq(m_completed, true);
                 }
-                a->my_exit_monitors.commit_wait(waiter);
-            } while (wo.continue_execution());
-            if (index2 == arena::out_of_arena) {
-                // notify a waiting thread even if this thread did not enter arena,
-                // in case it was woken by a leaving thread but did not need to enter
-                a->my_exit_monitors.notify_one(); // do not relax!
-            }
-            // process possible exception
-            auto exception = exec_context.my_exception.load(std::memory_order_acquire);
-            if (exception) {
-                __TBB_ASSERT(exec_context.is_group_execution_cancelled(), "The task group context with an exception should be canceled.");
-                exception->throw_self();
-            }
-            __TBB_ASSERT(governor::is_thread_data_set(td), nullptr);
-            return;
-        } // if (index1 == arena::out_of_arena)
-    } // if (!same_arena)
-
-    context_guard_helper</*report_tasks=*/false> context_guard;
-    context_guard.set_ctx(a->my_default_ctx);
-    nested_arena_context scope(*td, *a, index1);
+            };
+
+            void task_arena_impl::execute(d1::task_arena_base& ta, d1::delegate_base& d) {
+                arena* a = ta.my_arena.load(std::memory_order_relaxed);
+                __TBB_ASSERT(a != nullptr, nullptr);
+                thread_data* td = governor::get_thread_data();
+
+                bool same_arena = td->my_arena == a;
+                std::size_t index1 = td->my_arena_index;
+                if (!same_arena) {
+                    index1 = a->occupy_free_slot</*as_worker */ false>(*td);
+                    if (index1 == arena::out_of_arena) {
+                        concurrent_monitor::thread_context waiter((std::uintptr_t) &d);
+                        d1::wait_context wo(1);
+                        d1::task_group_context exec_context(d1::task_group_context::isolated);
+                        task_group_context_impl::copy_fp_settings(exec_context, *a->my_default_ctx);
+
+                        delegated_task dt(d, a->my_exit_monitors, wo);
+                        a->enqueue_task(dt, exec_context, *td);
+                        size_t index2 = arena::out_of_arena;
+                        do {
+                            a->my_exit_monitors.prepare_wait(waiter);
+                            if (!wo.continue_execution()) {
+                                a->my_exit_monitors.cancel_wait(waiter);
+                                break;
+                            }
+                            index2 = a->occupy_free_slot</*as_worker*/ false>(*td);
+                            if (index2 != arena::out_of_arena) {
+                                a->my_exit_monitors.cancel_wait(waiter);
+                                nested_arena_context scope(*td, *a, index2);
+                                r1::wait(wo, exec_context);
+                                __TBB_ASSERT(!exec_context.my_exception.load(std::memory_order_relaxed),
+                                             nullptr);// exception can be thrown above, not deferred
+                                break;
+                            }
+                            a->my_exit_monitors.commit_wait(waiter);
+                        } while (wo.continue_execution());
+                        if (index2 == arena::out_of_arena) {
+                            // notify a waiting thread even if this thread did not enter arena,
+                            // in case it was woken by a leaving thread but did not need to enter
+                            a->my_exit_monitors.notify_one();// do not relax!
+                        }
+                        // process possible exception
+                        auto exception = exec_context.my_exception.load(std::memory_order_acquire);
+                        if (exception) {
+                            __TBB_ASSERT(exec_context.is_group_execution_cancelled(),
+                                         "The task group context with an exception should be canceled.");
+                            exception->throw_self();
+                        }
+                        __TBB_ASSERT(governor::is_thread_data_set(td), nullptr);
+                        return;
+                    }// if (index1 == arena::out_of_arena)
+                }    // if (!same_arena)
+
+                context_guard_helper</*report_tasks=*/false> context_guard;
+                context_guard.set_ctx(a->my_default_ctx);
+                nested_arena_context scope(*td, *a, index1);
 #if _WIN64
-    try {
+                try {
 #endif
-        d();
-        __TBB_ASSERT(same_arena || governor::is_thread_data_set(td), nullptr);
+                    d();
+                    __TBB_ASSERT(same_arena || governor::is_thread_data_set(td), nullptr);
 #if _WIN64
-    } catch (...) {
-        context_guard.restore_default();
-        throw;
-    }
+                } catch (...) {
+                    context_guard.restore_default();
+                    throw;
+                }
 #endif
-}
-
-void task_arena_impl::wait(d1::task_arena_base& ta) {
-    arena* a = ta.my_arena.load(std::memory_order_relaxed);
-    __TBB_ASSERT(a != nullptr, nullptr);
-    thread_data* td = governor::get_thread_data();
-    __TBB_ASSERT_EX(td, "Scheduler is not initialized");
-    __TBB_ASSERT(td->my_arena != a || td->my_arena_index == 0, "internal_wait is not supported within a worker context" );
-    if (a->my_max_num_workers != 0) {
-        while (a->num_workers_active() || !a->is_empty()) {
-            yield();
-        }
-    }
-}
-
-int task_arena_impl::max_concurrency(const d1::task_arena_base *ta) {
-    arena* a = nullptr;
-    if( ta ) // for special cases of ta->max_concurrency()
-        a = ta->my_arena.load(std::memory_order_relaxed);
-    else if( thread_data* td = governor::get_thread_data_if_initialized() )
-        a = td->my_arena; // the current arena if any
-
-    if( a ) { // Get parameters from the arena
-        __TBB_ASSERT( !ta || ta->my_max_concurrency==1, nullptr);
-        int mandatory_worker = 0;
-        if (a->is_arena_workerless() && a->my_num_reserved_slots == 1) {
-            mandatory_worker = a->my_mandatory_concurrency.test() ? 1 : 0;
-        }
-        return a->my_num_reserved_slots + a->my_max_num_workers + mandatory_worker;
-    }
-
-    if (ta && ta->my_max_concurrency == 1) {
-        return 1;
-    }
+            }
+
+            void task_arena_impl::wait(d1::task_arena_base& ta) {
+                arena* a = ta.my_arena.load(std::memory_order_relaxed);
+                __TBB_ASSERT(a != nullptr, nullptr);
+                thread_data* td = governor::get_thread_data();
+                __TBB_ASSERT_EX(td, "Scheduler is not initialized");
+                __TBB_ASSERT(td->my_arena != a || td->my_arena_index == 0,
+                             "internal_wait is not supported within a worker context");
+                if (a->my_max_num_workers != 0) {
+                    while (a->num_workers_active() || !a->is_empty()) { yield(); }
+                }
+            }
+
+            int task_arena_impl::max_concurrency(const d1::task_arena_base* ta) {
+                arena* a = nullptr;
+                if (ta)// for special cases of ta->max_concurrency()
+                    a = ta->my_arena.load(std::memory_order_relaxed);
+                else if (thread_data* td = governor::get_thread_data_if_initialized())
+                    a = td->my_arena;// the current arena if any
+
+                if (a) {// Get parameters from the arena
+                    __TBB_ASSERT(!ta || ta->my_max_concurrency == 1, nullptr);
+                    int mandatory_worker = 0;
+                    if (a->is_arena_workerless() && a->my_num_reserved_slots == 1) {
+                        mandatory_worker = a->my_mandatory_concurrency.test() ? 1 : 0;
+                    }
+                    return a->my_num_reserved_slots + a->my_max_num_workers + mandatory_worker;
+                }
+
+                if (ta && ta->my_max_concurrency == 1) { return 1; }
 
 #if __TBB_ARENA_BINDING
-    if (ta) {
-        d1::constraints arena_constraints = d1::constraints{}
-            .set_numa_id(ta->my_numa_id)
-            .set_core_type(ta->core_type())
-            .set_max_threads_per_core(ta->max_threads_per_core());
-        return (int)default_concurrency(arena_constraints);
-    }
+                if (ta) {
+                    d1::constraints arena_constraints
+                            = d1::constraints {}
+                                      .set_numa_id(ta->my_numa_id)
+                                      .set_core_type(ta->core_type())
+                                      .set_max_threads_per_core(ta->max_threads_per_core());
+                    return (int) default_concurrency(arena_constraints);
+                }
 #endif /*!__TBB_ARENA_BINDING*/
 
-    __TBB_ASSERT(!ta || ta->my_max_concurrency==d1::task_arena_base::automatic, nullptr);
-    return int(governor::default_num_threads());
-}
+                __TBB_ASSERT(!ta || ta->my_max_concurrency == d1::task_arena_base::automatic, nullptr);
+                return int(governor::default_num_threads());
+            }
 
 #if __TBB_PREVIEW_PARALLEL_PHASE
-void task_arena_impl::enter_parallel_phase(d1::task_arena_base* ta, std::uintptr_t /*reserved*/) {
-    arena* a = ta ? ta->my_arena.load(std::memory_order_relaxed) : governor::get_thread_data()->my_arena;
-    __TBB_ASSERT(a, nullptr);
-    a->my_thread_leave.register_parallel_phase();
-    a->advertise_new_work<arena::work_enqueued>();
-}
-
-void task_arena_impl::exit_parallel_phase(d1::task_arena_base* ta, std::uintptr_t flags) {
-    arena* a = ta ? ta->my_arena.load(std::memory_order_relaxed) : governor::get_thread_data()->my_arena;
-    __TBB_ASSERT(a, nullptr);
-    a->my_thread_leave.unregister_parallel_phase(/*with_fast_leave=*/static_cast<bool>(flags));
-}
+            void task_arena_impl::enter_parallel_phase(d1::task_arena_base* ta, std::uintptr_t /*reserved*/) {
+                arena* a = ta ? ta->my_arena.load(std::memory_order_relaxed)
+                              : governor::get_thread_data()->my_arena;
+                __TBB_ASSERT(a, nullptr);
+                a->my_thread_leave.register_parallel_phase();
+                a->advertise_new_work<arena::work_enqueued>();
+            }
+
+            void task_arena_impl::exit_parallel_phase(d1::task_arena_base* ta, std::uintptr_t flags) {
+                arena* a = ta ? ta->my_arena.load(std::memory_order_relaxed)
+                              : governor::get_thread_data()->my_arena;
+                __TBB_ASSERT(a, nullptr);
+                a->my_thread_leave.unregister_parallel_phase(/*with_fast_leave=*/static_cast<bool>(flags));
+            }
 #endif
 
-void isolate_within_arena(d1::delegate_base& d, std::intptr_t isolation) {
-    // TODO: Decide what to do if the scheduler is not initialized. Is there a use case for it?
-    thread_data* tls = governor::get_thread_data();
-    assert_pointers_valid(tls, tls->my_task_dispatcher);
-    task_dispatcher* dispatcher = tls->my_task_dispatcher;
-    isolation_type previous_isolation = dispatcher->m_execute_data_ext.isolation;
-    try_call([&] {
-        // We temporarily change the isolation tag of the currently running task. It will be restored in the destructor of the guard.
-        isolation_type current_isolation = isolation ? isolation : reinterpret_cast<isolation_type>(&d);
-        // Save the current isolation value and set new one
-        previous_isolation = dispatcher->set_isolation(current_isolation);
-        // Isolation within this callable
-        d();
-    }).on_completion([&] {
-        __TBB_ASSERT(governor::get_thread_data()->my_task_dispatcher == dispatcher, nullptr);
-        dispatcher->set_isolation(previous_isolation);
-    });
-}
-
-} // namespace r1
-} // namespace detail
-} // namespace tbb
+            void isolate_within_arena(d1::delegate_base& d, std::intptr_t isolation) {
+                // TODO: Decide what to do if the scheduler is not initialized. Is there a use case for it?
+                thread_data* tls = governor::get_thread_data();
+                assert_pointers_valid(tls, tls->my_task_dispatcher);
+                task_dispatcher* dispatcher = tls->my_task_dispatcher;
+                isolation_type previous_isolation = dispatcher->m_execute_data_ext.isolation;
+                try_call([&] {
+                    // We temporarily change the isolation tag of the currently running task. It will be restored in the destructor of the guard.
+                    isolation_type current_isolation
+                            = isolation ? isolation : reinterpret_cast<isolation_type>(&d);
+                    // Save the current isolation value and set new one
+                    previous_isolation = dispatcher->set_isolation(current_isolation);
+                    // Isolation within this callable
+                    d();
+                }).on_completion([&] {
+                    __TBB_ASSERT(governor::get_thread_data()->my_task_dispatcher == dispatcher, nullptr);
+                    dispatcher->set_isolation(previous_isolation);
+                });
+            }
+
+        }// namespace r1
+    }    // namespace detail
+}// namespace tbb
diff --git a/external/tbb/src/tbb/arena_slot.cpp b/external/tbb/src/tbb/arena_slot.cpp
index bce5701d..c9b884c1 100644
--- a/external/tbb/src/tbb/arena_slot.cpp
+++ b/external/tbb/src/tbb/arena_slot.cpp
@@ -19,200 +19,194 @@
 #include "thread_data.h"
 
 namespace tbb {
-namespace detail {
-namespace r1 {
-
-//------------------------------------------------------------------------
-// Arena Slot
-//------------------------------------------------------------------------
-d1::task* arena_slot::get_task_impl(size_t T, execution_data_ext& ed, bool& tasks_omitted, isolation_type isolation) {
-    __TBB_ASSERT(tail.load(std::memory_order_relaxed) <= T || is_local_task_pool_quiescent(),
-            "Is it safe to get a task at position T?");
-
-    d1::task* result = task_pool_ptr[T];
-    __TBB_ASSERT(!is_poisoned( result ), "The poisoned task is going to be processed");
-
-    if (!result) {
-        return nullptr;
-    }
-    bool omit = isolation != no_isolation && isolation != task_accessor::isolation(*result);
-    if (!omit && !task_accessor::is_proxy_task(*result)) {
-        return result;
-    } else if (omit) {
-        tasks_omitted = true;
-        return nullptr;
-    }
-
-    task_proxy& tp = static_cast<task_proxy&>(*result);
-    d1::slot_id aff_id = tp.slot;
-    if ( d1::task *t = tp.extract_task<task_proxy::pool_bit>() ) {
-        ed.affinity_slot = aff_id;
-        return t;
-    }
-    // Proxy was empty, so it's our responsibility to free it
-    tp.allocator.delete_object(&tp, ed);
-
-    if ( tasks_omitted ) {
-        task_pool_ptr[T] = nullptr;
-    }
-    return nullptr;
-}
-
-d1::task* arena_slot::get_task(execution_data_ext& ed, isolation_type isolation) {
-    __TBB_ASSERT(is_task_pool_published(), nullptr);
-    // The current task position in the task pool.
-    std::size_t T0 = tail.load(std::memory_order_relaxed);
-    // The bounds of available tasks in the task pool. H0 is only used when the head bound is reached.
-    std::size_t H0 = (std::size_t)-1, T = T0;
-    d1::task* result = nullptr;
-    bool task_pool_empty = false;
-    bool tasks_omitted = false;
-    do {
-        __TBB_ASSERT( !result, nullptr );
-        // The full fence is required to sync the store of `tail` with the load of `head` (write-read barrier)
-        T = --tail;
-        // The acquire load of head is required to guarantee consistency of our task pool
-        // when a thief rolls back the head.
-        if ( (std::intptr_t)( head.load(std::memory_order_acquire) ) > (std::intptr_t)T ) {
-            acquire_task_pool();
-            H0 = head.load(std::memory_order_relaxed);
-            if ( (std::intptr_t)H0 > (std::intptr_t)T ) {
-                // The thief has not backed off - nothing to grab.
-                __TBB_ASSERT( H0 == head.load(std::memory_order_relaxed)
-                    && T == tail.load(std::memory_order_relaxed)
-                    && H0 == T + 1, "victim/thief arbitration algorithm failure" );
-                reset_task_pool_and_leave();
-                // No tasks in the task pool.
-                task_pool_empty = true;
-                break;
-            } else if ( H0 == T ) {
-                // There is only one task in the task pool.
-                reset_task_pool_and_leave();
-                task_pool_empty = true;
-            } else {
-                // Release task pool if there are still some tasks.
-                // After the release, the tail will be less than T, thus a thief
-                // will not attempt to get a task at position T.
-                release_task_pool();
-            }
-        }
-        result = get_task_impl( T, ed, tasks_omitted, isolation );
-        if ( result ) {
-            poison_pointer( task_pool_ptr[T] );
-            break;
-        } else if ( !tasks_omitted ) {
-            poison_pointer( task_pool_ptr[T] );
-            __TBB_ASSERT( T0 == T+1, nullptr );
-            T0 = T;
-        }
-    } while ( !result && !task_pool_empty );
-
-    if ( tasks_omitted ) {
-        if ( task_pool_empty ) {
-            // All tasks have been checked. The task pool should be  in reset state.
-            // We just restore the bounds for the available tasks.
-            // TODO: Does it have sense to move them to the beginning of the task pool?
-            __TBB_ASSERT( is_quiescent_local_task_pool_reset(), nullptr );
-            if ( result ) {
-                // If we have a task, it should be at H0 position.
-                __TBB_ASSERT( H0 == T, nullptr );
-                ++H0;
-            }
-            __TBB_ASSERT( H0 <= T0, nullptr );
-            if ( H0 < T0 ) {
-                // Restore the task pool if there are some tasks.
-                head.store(H0, std::memory_order_relaxed);
-                tail.store(T0, std::memory_order_relaxed);
-                // The release fence is used in publish_task_pool.
-                publish_task_pool();
-                // Synchronize with snapshot as we published some tasks.
-                ed.task_disp->m_thread_data->my_arena->advertise_new_work<arena::wakeup>();
-            }
-        } else {
-            // A task has been obtained. We need to make a hole in position T.
-            __TBB_ASSERT( is_task_pool_published(), nullptr );
-            __TBB_ASSERT( result, nullptr );
-            task_pool_ptr[T] = nullptr;
-            tail.store(T0, std::memory_order_release);
-            // Synchronize with snapshot as we published some tasks.
-            // TODO: consider some approach not to call wakeup for each time. E.g. check if the tail reached the head.
-            ed.task_disp->m_thread_data->my_arena->advertise_new_work<arena::wakeup>();
-        }
-    }
-
-    __TBB_ASSERT( (std::intptr_t)tail.load(std::memory_order_relaxed) >= 0, nullptr );
-    __TBB_ASSERT( result || tasks_omitted || is_quiescent_local_task_pool_reset(), nullptr );
-    return result;
-}
-
-d1::task* arena_slot::steal_task(arena& a, isolation_type isolation, std::size_t slot_index) {
-    d1::task** victim_pool = lock_task_pool();
-    if (!victim_pool) {
-        return nullptr;
-    }
-    d1::task* result = nullptr;
-    std::size_t H = head.load(std::memory_order_relaxed); // mirror
-    std::size_t H0 = H;
-    bool tasks_omitted = false;
-    do {
-        // The full fence is required to sync the store of `head` with the load of `tail` (write-read barrier)
-        H = ++head;
-        // The acquire load of tail is required to guarantee consistency of victim_pool
-        // because the owner synchronizes task spawning via tail.
-        if ((std::intptr_t)H > (std::intptr_t)(tail.load(std::memory_order_acquire))) {
-            // Stealing attempt failed, deque contents has not been changed by us
-            head.store( /*dead: H = */ H0, std::memory_order_relaxed );
-            __TBB_ASSERT( !result, nullptr );
-            goto unlock;
-        }
-        result = victim_pool[H-1];
-        __TBB_ASSERT( !is_poisoned( result ), nullptr );
-
-        if (result) {
-            if (isolation == no_isolation || isolation == task_accessor::isolation(*result)) {
-                if (!task_accessor::is_proxy_task(*result)) {
-                    break;
+    namespace detail {
+        namespace r1 {
+
+            //------------------------------------------------------------------------
+            // Arena Slot
+            //------------------------------------------------------------------------
+            d1::task* arena_slot::get_task_impl(size_t T, execution_data_ext& ed, bool& tasks_omitted,
+                                                isolation_type isolation) {
+                __TBB_ASSERT(tail.load(std::memory_order_relaxed) <= T || is_local_task_pool_quiescent(),
+                             "Is it safe to get a task at position T?");
+
+                d1::task* result = task_pool_ptr[T];
+                __TBB_ASSERT(!is_poisoned(result), "The poisoned task is going to be processed");
+
+                if (!result) { return nullptr; }
+                bool omit = isolation != no_isolation && isolation != task_accessor::isolation(*result);
+                if (!omit && !task_accessor::is_proxy_task(*result)) {
+                    return result;
+                } else if (omit) {
+                    tasks_omitted = true;
+                    return nullptr;
                 }
-                task_proxy& tp = *static_cast<task_proxy*>(result);
-                // If mailed task is likely to be grabbed by its destination thread, skip it.
-                if (!task_proxy::is_shared(tp.task_and_tag) || !tp.outbox->recipient_is_idle() || a.mailbox(slot_index).recipient_is_idle()) {
-                    break;
+
+                task_proxy& tp = static_cast<task_proxy&>(*result);
+                d1::slot_id aff_id = tp.slot;
+                if (d1::task* t = tp.extract_task<task_proxy::pool_bit>()) {
+                    ed.affinity_slot = aff_id;
+                    return t;
+                }
+                // Proxy was empty, so it's our responsibility to free it
+                tp.allocator.delete_object(&tp, ed);
+
+                if (tasks_omitted) { task_pool_ptr[T] = nullptr; }
+                return nullptr;
+            }
+
+            d1::task* arena_slot::get_task(execution_data_ext& ed, isolation_type isolation) {
+                __TBB_ASSERT(is_task_pool_published(), nullptr);
+                // The current task position in the task pool.
+                std::size_t T0 = tail.load(std::memory_order_relaxed);
+                // The bounds of available tasks in the task pool. H0 is only used when the head bound is reached.
+                std::size_t H0 = (std::size_t) -1, T = T0;
+                d1::task* result = nullptr;
+                bool task_pool_empty = false;
+                bool tasks_omitted = false;
+                do {
+                    __TBB_ASSERT(!result, nullptr);
+                    // The full fence is required to sync the store of `tail` with the load of `head` (write-read barrier)
+                    T = --tail;
+                    // The acquire load of head is required to guarantee consistency of our task pool
+                    // when a thief rolls back the head.
+                    if ((std::intptr_t)(head.load(std::memory_order_acquire)) > (std::intptr_t) T) {
+                        acquire_task_pool();
+                        H0 = head.load(std::memory_order_relaxed);
+                        if ((std::intptr_t) H0 > (std::intptr_t) T) {
+                            // The thief has not backed off - nothing to grab.
+                            __TBB_ASSERT(H0 == head.load(std::memory_order_relaxed)
+                                                 && T == tail.load(std::memory_order_relaxed) && H0 == T + 1,
+                                         "victim/thief arbitration algorithm failure");
+                            reset_task_pool_and_leave();
+                            // No tasks in the task pool.
+                            task_pool_empty = true;
+                            break;
+                        } else if (H0 == T) {
+                            // There is only one task in the task pool.
+                            reset_task_pool_and_leave();
+                            task_pool_empty = true;
+                        } else {
+                            // Release task pool if there are still some tasks.
+                            // After the release, the tail will be less than T, thus a thief
+                            // will not attempt to get a task at position T.
+                            release_task_pool();
+                        }
+                    }
+                    result = get_task_impl(T, ed, tasks_omitted, isolation);
+                    if (result) {
+                        poison_pointer(task_pool_ptr[T]);
+                        break;
+                    } else if (!tasks_omitted) {
+                        poison_pointer(task_pool_ptr[T]);
+                        __TBB_ASSERT(T0 == T + 1, nullptr);
+                        T0 = T;
+                    }
+                } while (!result && !task_pool_empty);
+
+                if (tasks_omitted) {
+                    if (task_pool_empty) {
+                        // All tasks have been checked. The task pool should be  in reset state.
+                        // We just restore the bounds for the available tasks.
+                        // TODO: Does it have sense to move them to the beginning of the task pool?
+                        __TBB_ASSERT(is_quiescent_local_task_pool_reset(), nullptr);
+                        if (result) {
+                            // If we have a task, it should be at H0 position.
+                            __TBB_ASSERT(H0 == T, nullptr);
+                            ++H0;
+                        }
+                        __TBB_ASSERT(H0 <= T0, nullptr);
+                        if (H0 < T0) {
+                            // Restore the task pool if there are some tasks.
+                            head.store(H0, std::memory_order_relaxed);
+                            tail.store(T0, std::memory_order_relaxed);
+                            // The release fence is used in publish_task_pool.
+                            publish_task_pool();
+                            // Synchronize with snapshot as we published some tasks.
+                            ed.task_disp->m_thread_data->my_arena->advertise_new_work<arena::wakeup>();
+                        }
+                    } else {
+                        // A task has been obtained. We need to make a hole in position T.
+                        __TBB_ASSERT(is_task_pool_published(), nullptr);
+                        __TBB_ASSERT(result, nullptr);
+                        task_pool_ptr[T] = nullptr;
+                        tail.store(T0, std::memory_order_release);
+                        // Synchronize with snapshot as we published some tasks.
+                        // TODO: consider some approach not to call wakeup for each time. E.g. check if the tail reached the head.
+                        ed.task_disp->m_thread_data->my_arena->advertise_new_work<arena::wakeup>();
+                    }
                 }
+
+                __TBB_ASSERT((std::intptr_t) tail.load(std::memory_order_relaxed) >= 0, nullptr);
+                __TBB_ASSERT(result || tasks_omitted || is_quiescent_local_task_pool_reset(), nullptr);
+                return result;
             }
-            // The task cannot be executed either due to isolation or proxy constraints.
-            result = nullptr;
-            tasks_omitted = true;
-        } else if (!tasks_omitted) {
-            // Cleanup the task pool from holes until a task is skipped.
-            __TBB_ASSERT( H0 == H-1, nullptr );
-            poison_pointer( victim_pool[H0] );
-            H0 = H;
-        }
-    } while (!result);
-    __TBB_ASSERT( result, nullptr );
-
-    // emit "task was consumed" signal
-    poison_pointer( victim_pool[H-1] );
-    if (tasks_omitted) {
-        // Some proxies in the task pool have been omitted. Set the stolen task to nullptr.
-        victim_pool[H-1] = nullptr;
-        // The release store synchronizes the victim_pool update(the store of nullptr).
-        head.store( /*dead: H = */ H0, std::memory_order_release );
-    }
-unlock:
-    unlock_task_pool(victim_pool);
+
+            d1::task* arena_slot::steal_task(arena& a, isolation_type isolation, std::size_t slot_index) {
+                d1::task** victim_pool = lock_task_pool();
+                if (!victim_pool) { return nullptr; }
+                d1::task* result = nullptr;
+                std::size_t H = head.load(std::memory_order_relaxed);// mirror
+                std::size_t H0 = H;
+                bool tasks_omitted = false;
+                do {
+                    // The full fence is required to sync the store of `head` with the load of `tail` (write-read barrier)
+                    H = ++head;
+                    // The acquire load of tail is required to guarantee consistency of victim_pool
+                    // because the owner synchronizes task spawning via tail.
+                    if ((std::intptr_t) H > (std::intptr_t)(tail.load(std::memory_order_acquire))) {
+                        // Stealing attempt failed, deque contents has not been changed by us
+                        head.store(/*dead: H = */ H0, std::memory_order_relaxed);
+                        __TBB_ASSERT(!result, nullptr);
+                        goto unlock;
+                    }
+                    result = victim_pool[H - 1];
+                    __TBB_ASSERT(!is_poisoned(result), nullptr);
+
+                    if (result) {
+                        if (isolation == no_isolation || isolation == task_accessor::isolation(*result)) {
+                            if (!task_accessor::is_proxy_task(*result)) { break; }
+                            task_proxy& tp = *static_cast<task_proxy*>(result);
+                            // If mailed task is likely to be grabbed by its destination thread, skip it.
+                            if (!task_proxy::is_shared(tp.task_and_tag) || !tp.outbox->recipient_is_idle()
+                                || a.mailbox(slot_index).recipient_is_idle()) {
+                                break;
+                            }
+                        }
+                        // The task cannot be executed either due to isolation or proxy constraints.
+                        result = nullptr;
+                        tasks_omitted = true;
+                    } else if (!tasks_omitted) {
+                        // Cleanup the task pool from holes until a task is skipped.
+                        __TBB_ASSERT(H0 == H - 1, nullptr);
+                        poison_pointer(victim_pool[H0]);
+                        H0 = H;
+                    }
+                } while (!result);
+                __TBB_ASSERT(result, nullptr);
+
+                // emit "task was consumed" signal
+                poison_pointer(victim_pool[H - 1]);
+                if (tasks_omitted) {
+                    // Some proxies in the task pool have been omitted. Set the stolen task to nullptr.
+                    victim_pool[H - 1] = nullptr;
+                    // The release store synchronizes the victim_pool update(the store of nullptr).
+                    head.store(/*dead: H = */ H0, std::memory_order_release);
+                }
+            unlock:
+                unlock_task_pool(victim_pool);
 
 #if __TBB_PREFETCHING
-    __TBB_cl_evict(&victim_slot.head);
-    __TBB_cl_evict(&victim_slot.tail);
+                __TBB_cl_evict(&victim_slot.head);
+                __TBB_cl_evict(&victim_slot.tail);
 #endif
-    if (tasks_omitted) {
-        // Synchronize with snapshot as the head and tail can be bumped which can falsely trigger EMPTY state
-        a.advertise_new_work<arena::wakeup>();
-    }
-    return result;
-}
-
-} // namespace r1
-} // namespace detail
-} // namespace tbb
+                if (tasks_omitted) {
+                    // Synchronize with snapshot as the head and tail can be bumped which can falsely trigger EMPTY state
+                    a.advertise_new_work<arena::wakeup>();
+                }
+                return result;
+            }
+
+        }// namespace r1
+    }    // namespace detail
+}// namespace tbb
diff --git a/external/tbb/src/tbb/concurrent_bounded_queue.cpp b/external/tbb/src/tbb/concurrent_bounded_queue.cpp
index 14617175..2a1c10db 100644
--- a/external/tbb/src/tbb/concurrent_bounded_queue.cpp
+++ b/external/tbb/src/tbb/concurrent_bounded_queue.cpp
@@ -14,71 +14,71 @@
     limitations under the License.
 */
 
-#include "oneapi/tbb/detail/_utils.h"
-#include "oneapi/tbb/concurrent_queue.h"
-#include "oneapi/tbb/cache_aligned_allocator.h"
 #include "concurrent_monitor.h"
+#include "oneapi/tbb/cache_aligned_allocator.h"
+#include "oneapi/tbb/concurrent_queue.h"
+#include "oneapi/tbb/detail/_utils.h"
 
 namespace tbb {
-namespace detail {
-namespace r1 {
-
-static constexpr std::size_t monitors_number = 2;
-
-std::uint8_t* __TBB_EXPORTED_FUNC allocate_bounded_queue_rep( std::size_t queue_rep_size )
-{
-    std::size_t monitors_mem_size = sizeof(concurrent_monitor) * monitors_number;
-    std::uint8_t* mem = static_cast<std::uint8_t*>(cache_aligned_allocate(queue_rep_size + monitors_mem_size));
-
-    concurrent_monitor* monitors = reinterpret_cast<concurrent_monitor*>(mem + queue_rep_size);
-    for (std::size_t i = 0; i < monitors_number; ++i) {
-        new (monitors + i) concurrent_monitor();
-    }
-
-    return mem;
-}
-
-void __TBB_EXPORTED_FUNC deallocate_bounded_queue_rep( std::uint8_t* mem, std::size_t queue_rep_size )
-{
-    concurrent_monitor* monitors = reinterpret_cast<concurrent_monitor*>(mem + queue_rep_size);
-    for (std::size_t i = 0; i < monitors_number; ++i) {
-        monitors[i].~concurrent_monitor();
-    }
-
-    cache_aligned_deallocate(mem);
-}
-
-void __TBB_EXPORTED_FUNC wait_bounded_queue_monitor( concurrent_monitor* monitors, std::size_t monitor_tag,
-                                                        std::ptrdiff_t target, d1::delegate_base& predicate )
-{
-    __TBB_ASSERT(monitor_tag < monitors_number, nullptr);
-    concurrent_monitor& monitor = monitors[monitor_tag];
-
-    monitor.wait<concurrent_monitor::thread_context>([&] { return !predicate(); }, std::uintptr_t(target));
-}
-
-void __TBB_EXPORTED_FUNC abort_bounded_queue_monitors( concurrent_monitor* monitors ) {
-    concurrent_monitor& items_avail = monitors[d2::cbq_items_avail_tag];
-    concurrent_monitor& slots_avail = monitors[d2::cbq_slots_avail_tag];
-
-    items_avail.abort_all();
-    slots_avail.abort_all();
-}
-
-struct predicate_leq {
-    std::size_t my_ticket;
-    predicate_leq( std::size_t ticket ) : my_ticket(ticket) {}
-    bool operator() ( std::uintptr_t ticket ) const { return static_cast<std::size_t>(ticket) <= my_ticket; }
-};
-
-void __TBB_EXPORTED_FUNC notify_bounded_queue_monitor( concurrent_monitor* monitors,
-                                                               std::size_t monitor_tag, std::size_t ticket)
-{
-    __TBB_ASSERT(monitor_tag < monitors_number, nullptr);
-    concurrent_monitor& monitor = monitors[monitor_tag];
-    monitor.notify(predicate_leq(ticket));
-}
-
-} // namespace r1
-} // namespace detail
-} // namespace tbb
+    namespace detail {
+        namespace r1 {
+
+            static constexpr std::size_t monitors_number = 2;
+
+            std::uint8_t* __TBB_EXPORTED_FUNC allocate_bounded_queue_rep(std::size_t queue_rep_size) {
+                std::size_t monitors_mem_size = sizeof(concurrent_monitor) * monitors_number;
+                std::uint8_t* mem = static_cast<std::uint8_t*>(
+                        cache_aligned_allocate(queue_rep_size + monitors_mem_size));
+
+                concurrent_monitor* monitors = reinterpret_cast<concurrent_monitor*>(mem + queue_rep_size);
+                for (std::size_t i = 0; i < monitors_number; ++i) { new (monitors + i) concurrent_monitor(); }
+
+                return mem;
+            }
+
+            void __TBB_EXPORTED_FUNC deallocate_bounded_queue_rep(std::uint8_t* mem,
+                                                                  std::size_t queue_rep_size) {
+                concurrent_monitor* monitors = reinterpret_cast<concurrent_monitor*>(mem + queue_rep_size);
+                for (std::size_t i = 0; i < monitors_number; ++i) { monitors[i].~concurrent_monitor(); }
+
+                cache_aligned_deallocate(mem);
+            }
+
+            void __TBB_EXPORTED_FUNC wait_bounded_queue_monitor(concurrent_monitor* monitors,
+                                                                std::size_t monitor_tag,
+                                                                std::ptrdiff_t target,
+                                                                d1::delegate_base& predicate) {
+                __TBB_ASSERT(monitor_tag < monitors_number, nullptr);
+                concurrent_monitor& monitor = monitors[monitor_tag];
+
+                monitor.wait<concurrent_monitor::thread_context>([&] { return !predicate(); },
+                                                                 std::uintptr_t(target));
+            }
+
+            void __TBB_EXPORTED_FUNC abort_bounded_queue_monitors(concurrent_monitor* monitors) {
+                concurrent_monitor& items_avail = monitors[d2::cbq_items_avail_tag];
+                concurrent_monitor& slots_avail = monitors[d2::cbq_slots_avail_tag];
+
+                items_avail.abort_all();
+                slots_avail.abort_all();
+            }
+
+            struct predicate_leq {
+                std::size_t my_ticket;
+                predicate_leq(std::size_t ticket) : my_ticket(ticket) {}
+                bool operator()(std::uintptr_t ticket) const {
+                    return static_cast<std::size_t>(ticket) <= my_ticket;
+                }
+            };
+
+            void __TBB_EXPORTED_FUNC notify_bounded_queue_monitor(concurrent_monitor* monitors,
+                                                                  std::size_t monitor_tag,
+                                                                  std::size_t ticket) {
+                __TBB_ASSERT(monitor_tag < monitors_number, nullptr);
+                concurrent_monitor& monitor = monitors[monitor_tag];
+                monitor.notify(predicate_leq(ticket));
+            }
+
+        }// namespace r1
+    }    // namespace detail
+}// namespace tbb
diff --git a/external/tbb/src/tbb/dynamic_link.cpp b/external/tbb/src/tbb/dynamic_link.cpp
index a21beb5a..b9c3b5d8 100644
--- a/external/tbb/src/tbb/dynamic_link.cpp
+++ b/external/tbb/src/tbb/dynamic_link.cpp
@@ -26,38 +26,36 @@
     __TBB_ASSERT_EX and DYNAMIC_LINK_WARNING instead.
 */
 
-#include <cstdarg>          // va_list etc.
-#include <cstring>          // strrchr
+#include <cstdarg>// va_list etc.
+#include <cstring>// strrchr
 #if _WIN32
-    #include <malloc.h>
-
-    // Unify system calls
-    #define dlopen( name, flags )   LoadLibrary( name )
-    #define dlsym( handle, name )   GetProcAddress( handle, name )
-    // FreeLibrary return bool value that is not used.
-    #define dlclose( handle )       (void)( ! FreeLibrary( handle ) )
-    #define dlerror()               GetLastError()
+#include <malloc.h>
+
+// Unify system calls
+#define dlopen(name, flags) LoadLibrary(name)
+#define dlsym(handle, name) GetProcAddress(handle, name)
+// FreeLibrary return bool value that is not used.
+#define dlclose(handle) (void) (!FreeLibrary(handle))
+#define dlerror() GetLastError()
 #ifndef PATH_MAX
-    #define PATH_MAX                MAX_PATH
+#define PATH_MAX MAX_PATH
 #endif
 #else /* _WIN32 */
-    #include <dlfcn.h>
-    #include <unistd.h>
+#include <dlfcn.h>
+#include <unistd.h>
 
-    #include <climits>
-    #include <cstdlib>
+#include <climits>
+#include <cstdlib>
 #endif /* _WIN32 */
 
 #if __TBB_WEAK_SYMBOLS_PRESENT && !__TBB_DYNAMIC_LOAD_ENABLED
-    //TODO: use function attribute for weak symbols instead of the pragma.
-    #pragma weak dlopen
-    #pragma weak dlsym
-    #pragma weak dlclose
+//TODO: use function attribute for weak symbols instead of the pragma.
+#pragma weak dlopen
+#pragma weak dlsym
+#pragma weak dlclose
 #endif /* __TBB_WEAK_SYMBOLS_PRESENT && !__TBB_DYNAMIC_LOAD_ENABLED */
 
-
-#define __USE_STATIC_DL_INIT    ( !__ANDROID__ )
-
+#define __USE_STATIC_DL_INIT (!__ANDROID__)
 
 /*
 dynamic_link is a common interface for searching for required symbols in an
@@ -102,67 +100,63 @@ soon as all of the symbols have been resolved.
 */
 
 namespace tbb {
-namespace detail {
-namespace r1 {
+    namespace detail {
+        namespace r1 {
 
 #if __TBB_WEAK_SYMBOLS_PRESENT || __TBB_DYNAMIC_LOAD_ENABLED
 
 #if !defined(DYNAMIC_LINK_WARNING) && !__TBB_WIN8UI_SUPPORT && __TBB_DYNAMIC_LOAD_ENABLED
-    // Report runtime errors and continue.
-    #define DYNAMIC_LINK_WARNING dynamic_link_warning
-    static void dynamic_link_warning( dynamic_link_error_t code, ... ) {
-        suppress_unused_warning(code);
-    } // library_warning
-#endif /* !defined(DYNAMIC_LINK_WARNING) && !__TBB_WIN8UI_SUPPORT && __TBB_DYNAMIC_LOAD_ENABLED */
-
-    static bool resolve_symbols( dynamic_link_handle module, const dynamic_link_descriptor descriptors[], std::size_t required )
-    {
-        if ( !module )
-            return false;
-
-        #if !__TBB_DYNAMIC_LOAD_ENABLED /* only __TBB_WEAK_SYMBOLS_PRESENT is defined */
-            if ( !dlsym ) return false;
-        #endif /* !__TBB_DYNAMIC_LOAD_ENABLED */
-
-        const std::size_t n_desc=20; // Usually we don't have more than 20 descriptors per library
-        __TBB_ASSERT_EX( required <= n_desc, "Too many descriptors is required" );
-        if ( required > n_desc ) return false;
-        pointer_to_handler h[n_desc];
-
-        for ( std::size_t k = 0; k < required; ++k ) {
-            dynamic_link_descriptor const & desc = descriptors[k];
-            pointer_to_handler addr = (pointer_to_handler)dlsym( module, desc.name );
-            if ( !addr ) {
-                return false;
-            }
-            h[k] = addr;
-        }
+// Report runtime errors and continue.
+#define DYNAMIC_LINK_WARNING dynamic_link_warning
+            static void dynamic_link_warning(dynamic_link_error_t code, ...) {
+                suppress_unused_warning(code);
+            }// library_warning
+#endif       /* !defined(DYNAMIC_LINK_WARNING) && !__TBB_WIN8UI_SUPPORT && __TBB_DYNAMIC_LOAD_ENABLED */
+
+            static bool resolve_symbols(dynamic_link_handle module,
+                                        const dynamic_link_descriptor descriptors[], std::size_t required) {
+                if (!module) return false;
+
+#if !__TBB_DYNAMIC_LOAD_ENABLED /* only __TBB_WEAK_SYMBOLS_PRESENT is defined */
+                if (!dlsym) return false;
+#endif /* !__TBB_DYNAMIC_LOAD_ENABLED */
+
+                const std::size_t n_desc = 20;// Usually we don't have more than 20 descriptors per library
+                __TBB_ASSERT_EX(required <= n_desc, "Too many descriptors is required");
+                if (required > n_desc) return false;
+                pointer_to_handler h[n_desc];
+
+                for (std::size_t k = 0; k < required; ++k) {
+                    dynamic_link_descriptor const& desc = descriptors[k];
+                    pointer_to_handler addr = (pointer_to_handler) dlsym(module, desc.name);
+                    if (!addr) { return false; }
+                    h[k] = addr;
+                }
 
-        // Commit the entry points.
-        // Cannot use memset here, because the writes must be atomic.
-        for( std::size_t k = 0; k < required; ++k )
-            *descriptors[k].handler = h[k];
-        return true;
-    }
+                // Commit the entry points.
+                // Cannot use memset here, because the writes must be atomic.
+                for (std::size_t k = 0; k < required; ++k) *descriptors[k].handler = h[k];
+                return true;
+            }
 
 #if __TBB_WIN8UI_SUPPORT
-    bool dynamic_link( const char*  library, const dynamic_link_descriptor descriptors[], std::size_t required, dynamic_link_handle*, int flags ) {
-        dynamic_link_handle tmp_handle = nullptr;
-        TCHAR wlibrary[256];
-        if ( MultiByteToWideChar(CP_UTF8, 0, library, -1, wlibrary, 255) == 0 ) return false;
-        if ( flags & DYNAMIC_LINK_LOAD )
-            tmp_handle = LoadPackagedLibrary( wlibrary, 0 );
-        if (tmp_handle != nullptr){
-            return resolve_symbols(tmp_handle, descriptors, required);
-        }else{
-            return false;
-        }
-    }
-    void dynamic_unlink( dynamic_link_handle ) {}
-    void dynamic_unlink_all() {}
+            bool dynamic_link(const char* library, const dynamic_link_descriptor descriptors[],
+                              std::size_t required, dynamic_link_handle*, int flags) {
+                dynamic_link_handle tmp_handle = nullptr;
+                TCHAR wlibrary[256];
+                if (MultiByteToWideChar(CP_UTF8, 0, library, -1, wlibrary, 255) == 0) return false;
+                if (flags & DYNAMIC_LINK_LOAD) tmp_handle = LoadPackagedLibrary(wlibrary, 0);
+                if (tmp_handle != nullptr) {
+                    return resolve_symbols(tmp_handle, descriptors, required);
+                } else {
+                    return false;
+                }
+            }
+            void dynamic_unlink(dynamic_link_handle) {}
+            void dynamic_unlink_all() {}
 #else
 #if __TBB_DYNAMIC_LOAD_ENABLED
-/*
+            /*
     There is a security issue on Windows: LoadLibrary() may load and execute malicious code.
     See http://www.microsoft.com/technet/security/advisory/2269637.mspx for details.
     To avoid the issue, we have to pass full path (not just library name) to LoadLibrary. This
@@ -179,127 +173,124 @@ namespace r1 {
         "malloc\tbbmalloc.dll" would be "c:\program files\common\intel\malloc\tbbmalloc.dll".
 */
 
-    // Struct handle_storage is used by dynamic_link routine to store handles of
-    // all loaded or pinned dynamic libraries. When TBB is shut down, it calls
-    // dynamic_unlink_all() that unloads modules referenced by handle_storage.
-    // This struct should not have any constructors since it may be used before
-    // the constructor is called.
-    #define MAX_LOADED_MODULES 8 // The number of maximum possible modules which can be loaded
-
-    using atomic_incrementer = std::atomic<std::size_t>;
-
-    static struct handles_t {
-        atomic_incrementer my_size;
-        dynamic_link_handle my_handles[MAX_LOADED_MODULES];
-
-        void add(const dynamic_link_handle &handle) {
-            const std::size_t ind = my_size++;
-            __TBB_ASSERT_EX( ind < MAX_LOADED_MODULES, "Too many modules are loaded" );
-            my_handles[ind] = handle;
-        }
-
-        void free() {
-            const std::size_t size = my_size;
-            for (std::size_t i=0; i<size; ++i)
-                dynamic_unlink( my_handles[i] );
-        }
-    } handles;
-
-    static std::once_flag init_dl_data_state;
-
-    static struct ap_data_t {
-        char _path[PATH_MAX+1];
-        std::size_t _len;
-    } ap_data;
-
-    static void init_ap_data() {
-    #if _WIN32
-        // Get handle of our DLL first.
-        HMODULE handle;
-        BOOL brc = GetModuleHandleEx(
-            GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
-            (LPCSTR)( & dynamic_link ), // any function inside the library can be used for the address
-            & handle
-            );
-        if ( !brc ) { // Error occurred.
-            int err = GetLastError();
-            DYNAMIC_LINK_WARNING( dl_sys_fail, "GetModuleHandleEx", err );
-            return;
-        }
-        // Now get path to our DLL.
-        DWORD drc = GetModuleFileName( handle, ap_data._path, static_cast< DWORD >( PATH_MAX ) );
-        if ( drc == 0 ) { // Error occurred.
-            int err = GetLastError();
-            DYNAMIC_LINK_WARNING( dl_sys_fail, "GetModuleFileName", err );
-            return;
-        }
-        if ( drc >= PATH_MAX ) { // Buffer too short.
-            DYNAMIC_LINK_WARNING( dl_buff_too_small );
-            return;
-        }
-        // Find the position of the last backslash.
-        char *backslash = std::strrchr( ap_data._path, '\\' );
-
-        if ( !backslash ) {    // Backslash not found.
-            __TBB_ASSERT_EX( backslash != nullptr, "Unbelievable.");
-            return;
-        }
-        __TBB_ASSERT_EX( backslash >= ap_data._path, "Unbelievable.");
-        ap_data._len = (std::size_t)(backslash - ap_data._path) + 1;
-        *(backslash+1) = 0;
-    #else
-        // Get the library path
-        Dl_info dlinfo;
-        int res = dladdr( (void*)&dynamic_link, &dlinfo ); // any function inside the library can be used for the address
-        if ( !res ) {
-            char const * err = dlerror();
-            DYNAMIC_LINK_WARNING( dl_sys_fail, "dladdr", err );
-            return;
-        } else {
-            __TBB_ASSERT_EX( dlinfo.dli_fname!=nullptr, "Unbelievable." );
-        }
-
-        char const *slash = std::strrchr( dlinfo.dli_fname, '/' );
-        std::size_t fname_len=0;
-        if ( slash ) {
-            __TBB_ASSERT_EX( slash >= dlinfo.dli_fname, "Unbelievable.");
-            fname_len = (std::size_t)(slash - dlinfo.dli_fname) + 1;
-        }
-
-        std::size_t rc;
-        if ( dlinfo.dli_fname[0]=='/' ) {
-            // The library path is absolute
-            rc = 0;
-            ap_data._len = 0;
-        } else {
-            // The library path is relative so get the current working directory
-            if ( !getcwd( ap_data._path, sizeof(ap_data._path)/sizeof(ap_data._path[0]) ) ) {
-                DYNAMIC_LINK_WARNING( dl_buff_too_small );
-                return;
-            }
-            ap_data._len = std::strlen( ap_data._path );
-            ap_data._path[ap_data._len++]='/';
-            rc = ap_data._len;
-        }
-
-        if ( fname_len>0 ) {
-            ap_data._len += fname_len;
-            if ( ap_data._len>PATH_MAX ) {
-                DYNAMIC_LINK_WARNING( dl_buff_too_small );
-                ap_data._len=0;
-                return;
+// Struct handle_storage is used by dynamic_link routine to store handles of
+// all loaded or pinned dynamic libraries. When TBB is shut down, it calls
+// dynamic_unlink_all() that unloads modules referenced by handle_storage.
+// This struct should not have any constructors since it may be used before
+// the constructor is called.
+#define MAX_LOADED_MODULES 8// The number of maximum possible modules which can be loaded
+
+            using atomic_incrementer = std::atomic<std::size_t>;
+
+            static struct handles_t {
+                atomic_incrementer my_size;
+                dynamic_link_handle my_handles[MAX_LOADED_MODULES];
+
+                void add(const dynamic_link_handle &handle) {
+                    const std::size_t ind = my_size++;
+                    __TBB_ASSERT_EX(ind < MAX_LOADED_MODULES, "Too many modules are loaded");
+                    my_handles[ind] = handle;
+                }
+
+                void free() {
+                    const std::size_t size = my_size;
+                    for (std::size_t i = 0; i < size; ++i) dynamic_unlink(my_handles[i]);
+                }
+            } handles;
+
+            static std::once_flag init_dl_data_state;
+
+            static struct ap_data_t {
+                char _path[PATH_MAX + 1];
+                std::size_t _len;
+            } ap_data;
+
+            static void init_ap_data() {
+#if _WIN32
+                // Get handle of our DLL first.
+                HMODULE handle;
+                BOOL brc = GetModuleHandleEx(
+                        GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
+                        (LPCSTR)(&dynamic_link),// any function inside the library can be used for the address
+                        &handle);
+                if (!brc) {// Error occurred.
+                    int err = GetLastError();
+                    DYNAMIC_LINK_WARNING(dl_sys_fail, "GetModuleHandleEx", err);
+                    return;
+                }
+                // Now get path to our DLL.
+                DWORD drc = GetModuleFileName(handle, ap_data._path, static_cast<DWORD>(PATH_MAX));
+                if (drc == 0) {// Error occurred.
+                    int err = GetLastError();
+                    DYNAMIC_LINK_WARNING(dl_sys_fail, "GetModuleFileName", err);
+                    return;
+                }
+                if (drc >= PATH_MAX) {// Buffer too short.
+                    DYNAMIC_LINK_WARNING(dl_buff_too_small);
+                    return;
+                }
+                // Find the position of the last backslash.
+                char *backslash = std::strrchr(ap_data._path, '\\');
+
+                if (!backslash) {// Backslash not found.
+                    __TBB_ASSERT_EX(backslash != nullptr, "Unbelievable.");
+                    return;
+                }
+                __TBB_ASSERT_EX(backslash >= ap_data._path, "Unbelievable.");
+                ap_data._len = (std::size_t)(backslash - ap_data._path) + 1;
+                *(backslash + 1) = 0;
+#else
+                // Get the library path
+                Dl_info dlinfo;
+                int res = dladdr((void *) &dynamic_link,
+                                 &dlinfo);// any function inside the library can be used for the address
+                if (!res) {
+                    char const *err = dlerror();
+                    DYNAMIC_LINK_WARNING(dl_sys_fail, "dladdr", err);
+                    return;
+                } else {
+                    __TBB_ASSERT_EX(dlinfo.dli_fname != nullptr, "Unbelievable.");
+                }
+
+                char const *slash = std::strrchr(dlinfo.dli_fname, '/');
+                std::size_t fname_len = 0;
+                if (slash) {
+                    __TBB_ASSERT_EX(slash >= dlinfo.dli_fname, "Unbelievable.");
+                    fname_len = (std::size_t)(slash - dlinfo.dli_fname) + 1;
+                }
+
+                std::size_t rc;
+                if (dlinfo.dli_fname[0] == '/') {
+                    // The library path is absolute
+                    rc = 0;
+                    ap_data._len = 0;
+                } else {
+                    // The library path is relative so get the current working directory
+                    if (!getcwd(ap_data._path, sizeof(ap_data._path) / sizeof(ap_data._path[0]))) {
+                        DYNAMIC_LINK_WARNING(dl_buff_too_small);
+                        return;
+                    }
+                    ap_data._len = std::strlen(ap_data._path);
+                    ap_data._path[ap_data._len++] = '/';
+                    rc = ap_data._len;
+                }
+
+                if (fname_len > 0) {
+                    ap_data._len += fname_len;
+                    if (ap_data._len > PATH_MAX) {
+                        DYNAMIC_LINK_WARNING(dl_buff_too_small);
+                        ap_data._len = 0;
+                        return;
+                    }
+                    std::strncpy(ap_data._path + rc, dlinfo.dli_fname, fname_len);
+                    ap_data._path[ap_data._len] = 0;
+                }
+#endif /* _WIN32 */
             }
-            std::strncpy( ap_data._path+rc, dlinfo.dli_fname, fname_len );
-            ap_data._path[ap_data._len]=0;
-        }
-    #endif /* _WIN32 */
-    }
 
-    static void init_dl_data() {
-        init_ap_data();
-    }
+            static void init_dl_data() { init_ap_data(); }
 
-    /*
+            /*
         The function constructs absolute path for given relative path. Important: Base directory is not
         current one, it is the directory libtbb.so loaded from.
 
@@ -311,194 +302,190 @@ namespace r1 {
                     > len     -- Buffer too short, required size returned.
                     otherwise -- Ok, number of characters (incl. terminating null) written to buffer.
     */
-    static std::size_t abs_path( char const * name, char * path, std::size_t len ) {
-        if ( ap_data._len == 0 )
-            return 0;
-
-        std::size_t name_len = std::strlen( name );
-        std::size_t full_len = name_len+ap_data._len;
-        if ( full_len < len ) {
-            __TBB_ASSERT( ap_data._path[ap_data._len] == 0, nullptr);
-            __TBB_ASSERT( std::strlen(ap_data._path) == ap_data._len, nullptr);
-            std::strncpy( path, ap_data._path, ap_data._len + 1 );
-            __TBB_ASSERT( path[ap_data._len] == 0, nullptr);
-            std::strncat( path, name, len - ap_data._len );
-            __TBB_ASSERT( std::strlen(path) == full_len, nullptr);
-        }
-        return full_len+1; // +1 for null character
-    }
-#endif  // __TBB_DYNAMIC_LOAD_ENABLED
-    void init_dynamic_link_data() {
-    #if __TBB_DYNAMIC_LOAD_ENABLED
-        std::call_once( init_dl_data_state, init_dl_data );
-    #endif
-    }
-
-    #if __USE_STATIC_DL_INIT
-    // ap_data structure is initialized with current directory on Linux.
-    // So it should be initialized as soon as possible since the current directory may be changed.
-    // static_init_ap_data object provides this initialization during library loading.
-    static struct static_init_dl_data_t {
-        static_init_dl_data_t() {
-            init_dynamic_link_data();
-        }
-    } static_init_dl_data;
-    #endif
-
-    #if __TBB_WEAK_SYMBOLS_PRESENT
-    static bool weak_symbol_link( const dynamic_link_descriptor descriptors[], std::size_t required )
-    {
-        // Check if the required entries are present in what was loaded into our process.
-        for ( std::size_t k = 0; k < required; ++k )
-            if ( !descriptors[k].ptr )
-                return false;
-        // Commit the entry points.
-        for ( std::size_t k = 0; k < required; ++k )
-            *descriptors[k].handler = (pointer_to_handler) descriptors[k].ptr;
-        return true;
-    }
-    #else
-    static bool weak_symbol_link( const dynamic_link_descriptor[], std::size_t ) {
-        return false;
-    }
-    #endif /* __TBB_WEAK_SYMBOLS_PRESENT */
-
-    void dynamic_unlink( dynamic_link_handle handle ) {
-    #if !__TBB_DYNAMIC_LOAD_ENABLED /* only __TBB_WEAK_SYMBOLS_PRESENT is defined */
-        if ( !dlclose ) return;
-    #endif
-        if ( handle ) {
-            dlclose( handle );
-        }
-    }
-
-    void dynamic_unlink_all() {
-    #if __TBB_DYNAMIC_LOAD_ENABLED
-        handles.free();
-    #endif
-    }
-
-    static dynamic_link_handle global_symbols_link( const char* library, const dynamic_link_descriptor descriptors[], std::size_t required ) {
-        dynamic_link_handle library_handle{};
+            static std::size_t abs_path(char const *name, char *path, std::size_t len) {
+                if (ap_data._len == 0) return 0;
+
+                std::size_t name_len = std::strlen(name);
+                std::size_t full_len = name_len + ap_data._len;
+                if (full_len < len) {
+                    __TBB_ASSERT(ap_data._path[ap_data._len] == 0, nullptr);
+                    __TBB_ASSERT(std::strlen(ap_data._path) == ap_data._len, nullptr);
+                    std::strncpy(path, ap_data._path, ap_data._len + 1);
+                    __TBB_ASSERT(path[ap_data._len] == 0, nullptr);
+                    std::strncat(path, name, len - ap_data._len);
+                    __TBB_ASSERT(std::strlen(path) == full_len, nullptr);
+                }
+                return full_len + 1;// +1 for null character
+            }
+#endif // __TBB_DYNAMIC_LOAD_ENABLED
+            void init_dynamic_link_data() {
+#if __TBB_DYNAMIC_LOAD_ENABLED
+                std::call_once(init_dl_data_state, init_dl_data);
+#endif
+            }
+
+#if __USE_STATIC_DL_INIT
+            // ap_data structure is initialized with current directory on Linux.
+            // So it should be initialized as soon as possible since the current directory may be changed.
+            // static_init_ap_data object provides this initialization during library loading.
+            static struct static_init_dl_data_t {
+                static_init_dl_data_t() { init_dynamic_link_data(); }
+            } static_init_dl_data;
+#endif
+
+#if __TBB_WEAK_SYMBOLS_PRESENT
+            static bool weak_symbol_link(const dynamic_link_descriptor descriptors[], std::size_t required) {
+                // Check if the required entries are present in what was loaded into our process.
+                for (std::size_t k = 0; k < required; ++k)
+                    if (!descriptors[k].ptr) return false;
+                // Commit the entry points.
+                for (std::size_t k = 0; k < required; ++k)
+                    *descriptors[k].handler = (pointer_to_handler) descriptors[k].ptr;
+                return true;
+            }
+#else
+            static bool weak_symbol_link(const dynamic_link_descriptor[], std::size_t) { return false; }
+#endif                          /* __TBB_WEAK_SYMBOLS_PRESENT */
+
+            void dynamic_unlink(dynamic_link_handle handle) {
+#if !__TBB_DYNAMIC_LOAD_ENABLED /* only __TBB_WEAK_SYMBOLS_PRESENT is defined */
+                if (!dlclose) return;
+#endif
+                if (handle) { dlclose(handle); }
+            }
+
+            void dynamic_unlink_all() {
+#if __TBB_DYNAMIC_LOAD_ENABLED
+                handles.free();
+#endif
+            }
+
+            static dynamic_link_handle global_symbols_link(const char *library,
+                                                           const dynamic_link_descriptor descriptors[],
+                                                           std::size_t required) {
+                dynamic_link_handle library_handle {};
 #if _WIN32
-        auto res = GetModuleHandleEx(0, library, &library_handle);
-        __TBB_ASSERT_EX((res && library_handle) || (!res && !library_handle), nullptr);
-#else /* _WIN32 */
-    #if !__TBB_DYNAMIC_LOAD_ENABLED /* only __TBB_WEAK_SYMBOLS_PRESENT is defined */
-        if ( !dlopen ) return 0;
-    #endif /* !__TBB_DYNAMIC_LOAD_ENABLED */
-        // RTLD_GLOBAL - to guarantee that old TBB will find the loaded library
-        // RTLD_NOLOAD - not to load the library without the full path
-        library_handle = dlopen(library, RTLD_LAZY | RTLD_GLOBAL | RTLD_NOLOAD);
-#endif /* _WIN32 */
-        if (library_handle) {
-            if (!resolve_symbols(library_handle, descriptors, required)) {
-                dynamic_unlink(library_handle);
-                library_handle = nullptr;
+                auto res = GetModuleHandleEx(0, library, &library_handle);
+                __TBB_ASSERT_EX((res && library_handle) || (!res && !library_handle), nullptr);
+#else                           /* _WIN32 */
+#if !__TBB_DYNAMIC_LOAD_ENABLED /* only __TBB_WEAK_SYMBOLS_PRESENT is defined */
+                if (!dlopen) return 0;
+#endif                          /* !__TBB_DYNAMIC_LOAD_ENABLED */
+                // RTLD_GLOBAL - to guarantee that old TBB will find the loaded library
+                // RTLD_NOLOAD - not to load the library without the full path
+                library_handle = dlopen(library, RTLD_LAZY | RTLD_GLOBAL | RTLD_NOLOAD);
+#endif                          /* _WIN32 */
+                if (library_handle) {
+                    if (!resolve_symbols(library_handle, descriptors, required)) {
+                        dynamic_unlink(library_handle);
+                        library_handle = nullptr;
+                    }
+                }
+                return library_handle;
+            }
+
+            static void save_library_handle(dynamic_link_handle src, dynamic_link_handle *dst) {
+                __TBB_ASSERT_EX(src, "The library handle to store must be non-zero");
+                if (dst) *dst = src;
+#if __TBB_DYNAMIC_LOAD_ENABLED
+                else
+                    handles.add(src);
+#endif /* __TBB_DYNAMIC_LOAD_ENABLED */
             }
-        }
-        return library_handle;
-    }
-
-    static void save_library_handle( dynamic_link_handle src, dynamic_link_handle *dst ) {
-        __TBB_ASSERT_EX( src, "The library handle to store must be non-zero" );
-        if ( dst )
-            *dst = src;
-    #if __TBB_DYNAMIC_LOAD_ENABLED
-        else
-            handles.add( src );
-    #endif /* __TBB_DYNAMIC_LOAD_ENABLED */
-    }
 
 #if !_WIN32
-    int loading_flags(bool local_binding) {
-        int flags = RTLD_NOW;
-        if (local_binding) {
-            flags = flags | RTLD_LOCAL;
+            int loading_flags(bool local_binding) {
+                int flags = RTLD_NOW;
+                if (local_binding) {
+                    flags = flags | RTLD_LOCAL;
 #if (__linux__ && __GLIBC__) && !__TBB_USE_SANITIZERS
-            if( !GetBoolEnvironmentVariable("TBB_ENABLE_SANITIZERS") ) {
-                flags = flags | RTLD_DEEPBIND;
-            }
+                    if (!GetBoolEnvironmentVariable("TBB_ENABLE_SANITIZERS")) {
+                        flags = flags | RTLD_DEEPBIND;
+                    }
 #endif
-        } else {
-            flags = flags | RTLD_GLOBAL;
-        }
-        return flags;
-    }
+                } else {
+                    flags = flags | RTLD_GLOBAL;
+                }
+                return flags;
+            }
 #endif
 
-    dynamic_link_handle dynamic_load( const char* library, const dynamic_link_descriptor descriptors[], std::size_t required, bool local_binding ) {
-        ::tbb::detail::suppress_unused_warning( library, descriptors, required, local_binding );
+            dynamic_link_handle dynamic_load(const char *library, const dynamic_link_descriptor descriptors[],
+                                             std::size_t required, bool local_binding) {
+                ::tbb::detail::suppress_unused_warning(library, descriptors, required, local_binding);
 #if __TBB_DYNAMIC_LOAD_ENABLED
-        std::size_t const len = PATH_MAX + 1;
-        char path[ len ];
-        std::size_t rc = abs_path( library, path, len );
-        if ( 0 < rc && rc <= len ) {
+                std::size_t const len = PATH_MAX + 1;
+                char path[len];
+                std::size_t rc = abs_path(library, path, len);
+                if (0 < rc && rc <= len) {
 #if _WIN32
-            // Prevent Windows from displaying silly message boxes if it fails to load library
-            // (e.g. because of MS runtime problems - one of those crazy manifest related ones)
-            UINT prev_mode = SetErrorMode (SEM_FAILCRITICALERRORS);
+                    // Prevent Windows from displaying silly message boxes if it fails to load library
+                    // (e.g. because of MS runtime problems - one of those crazy manifest related ones)
+                    UINT prev_mode = SetErrorMode(SEM_FAILCRITICALERRORS);
 #endif /* _WIN32 */
-            // The second argument (loading_flags) is ignored on Windows
-            dynamic_link_handle library_handle = dlopen( path, loading_flags(local_binding) );
+                    // The second argument (loading_flags) is ignored on Windows
+                    dynamic_link_handle library_handle = dlopen(path, loading_flags(local_binding));
 #if _WIN32
-            SetErrorMode (prev_mode);
+                    SetErrorMode(prev_mode);
 #endif /* _WIN32 */
-            if( library_handle ) {
-                if( !resolve_symbols( library_handle, descriptors, required ) ) {
-                    // The loaded library does not contain all the expected entry points
-                    dynamic_unlink( library_handle );
-                    library_handle = nullptr;
-                }
-            } else
-                DYNAMIC_LINK_WARNING( dl_lib_not_found, path, dlerror() );
-            return library_handle;
-        } else if ( rc>len )
-                DYNAMIC_LINK_WARNING( dl_buff_too_small );
-                // rc == 0 means failing of init_ap_data so the warning has already been issued.
+                    if (library_handle) {
+                        if (!resolve_symbols(library_handle, descriptors, required)) {
+                            // The loaded library does not contain all the expected entry points
+                            dynamic_unlink(library_handle);
+                            library_handle = nullptr;
+                        }
+                    } else
+                        DYNAMIC_LINK_WARNING(dl_lib_not_found, path, dlerror());
+                    return library_handle;
+                } else if (rc > len)
+                    DYNAMIC_LINK_WARNING(dl_buff_too_small);
+                    // rc == 0 means failing of init_ap_data so the warning has already been issued.
 
 #endif /* __TBB_DYNAMIC_LOAD_ENABLED */
-            return nullptr;
-    }
+                return nullptr;
+            }
 
-    bool dynamic_link( const char* library, const dynamic_link_descriptor descriptors[], std::size_t required, dynamic_link_handle *handle, int flags ) {
-        init_dynamic_link_data();
+            bool dynamic_link(const char *library, const dynamic_link_descriptor descriptors[],
+                              std::size_t required, dynamic_link_handle *handle, int flags) {
+                init_dynamic_link_data();
 
-        // TODO: May global_symbols_link find weak symbols?
-        dynamic_link_handle library_handle = ( flags & DYNAMIC_LINK_GLOBAL ) ? global_symbols_link( library, descriptors, required ) : nullptr;
+                // TODO: May global_symbols_link find weak symbols?
+                dynamic_link_handle library_handle
+                        = (flags & DYNAMIC_LINK_GLOBAL) ? global_symbols_link(library, descriptors, required)
+                                                        : nullptr;
 
 #if defined(_MSC_VER) && _MSC_VER <= 1900
-#pragma warning (push)
+#pragma warning(push)
 // MSVC 2015 warning: 'int': forcing value to bool 'true' or 'false'
-#pragma warning (disable: 4800)
+#pragma warning(disable : 4800)
 #endif
-        if ( !library_handle && ( flags & DYNAMIC_LINK_LOAD ) )
-            library_handle = dynamic_load( library, descriptors, required, flags & DYNAMIC_LINK_LOCAL );
+                if (!library_handle && (flags & DYNAMIC_LINK_LOAD))
+                    library_handle = dynamic_load(library, descriptors, required, flags & DYNAMIC_LINK_LOCAL);
 
 #if defined(_MSC_VER) && _MSC_VER <= 1900
-#pragma warning (pop)
+#pragma warning(pop)
 #endif
-        if ( !library_handle && ( flags & DYNAMIC_LINK_WEAK ) )
-            return weak_symbol_link( descriptors, required );
+                if (!library_handle && (flags & DYNAMIC_LINK_WEAK))
+                    return weak_symbol_link(descriptors, required);
 
-        if ( library_handle ) {
-            save_library_handle( library_handle, handle );
-            return true;
-        }
-        return false;
-    }
+                if (library_handle) {
+                    save_library_handle(library_handle, handle);
+                    return true;
+                }
+                return false;
+            }
 
 #endif /*__TBB_WIN8UI_SUPPORT*/
-#else /* __TBB_WEAK_SYMBOLS_PRESENT || __TBB_DYNAMIC_LOAD_ENABLED */
-    bool dynamic_link( const char*, const dynamic_link_descriptor*, std::size_t, dynamic_link_handle *handle, int ) {
-        if ( handle )
-            *handle=0;
-        return false;
-    }
-    void dynamic_unlink( dynamic_link_handle ) {}
-    void dynamic_unlink_all() {}
+#else  /* __TBB_WEAK_SYMBOLS_PRESENT || __TBB_DYNAMIC_LOAD_ENABLED */
+            bool dynamic_link(const char *, const dynamic_link_descriptor *, std::size_t,
+                              dynamic_link_handle *handle, int) {
+                if (handle) *handle = 0;
+                return false;
+            }
+            void dynamic_unlink(dynamic_link_handle) {}
+            void dynamic_unlink_all() {}
 #endif /* __TBB_WEAK_SYMBOLS_PRESENT || __TBB_DYNAMIC_LOAD_ENABLED */
 
-} // namespace r1
-} // namespace detail
-} // namespace tbb
+        }// namespace r1
+    }    // namespace detail
+}// namespace tbb
diff --git a/external/tbb/src/tbb/exception.cpp b/external/tbb/src/tbb/exception.cpp
index efc9b2a4..2c6ebaf7 100644
--- a/external/tbb/src/tbb/exception.cpp
+++ b/external/tbb/src/tbb/exception.cpp
@@ -14,18 +14,18 @@
     limitations under the License.
 */
 
-#include "oneapi/tbb/detail/_exception.h"
 #include "oneapi/tbb/detail/_assert.h"
+#include "oneapi/tbb/detail/_exception.h"
 #include "oneapi/tbb/detail/_template_helpers.h"
 
-#include <cstring>
 #include <cstdio>
-#include <stdexcept> // std::runtime_error
+#include <cstring>
 #include <new>
+#include <stdexcept>// std::runtime_error
 #include <stdexcept>
 
-#define __TBB_STD_RETHROW_EXCEPTION_POSSIBLY_BROKEN                             \
-    (__GLIBCXX__ && __TBB_GLIBCXX_VERSION>=40700 && __TBB_GLIBCXX_VERSION<60000 && TBB_USE_EXCEPTIONS)
+#define __TBB_STD_RETHROW_EXCEPTION_POSSIBLY_BROKEN                                                          \
+    (__GLIBCXX__ && __TBB_GLIBCXX_VERSION >= 40700 && __TBB_GLIBCXX_VERSION < 60000 && TBB_USE_EXCEPTIONS)
 
 #if __TBB_STD_RETHROW_EXCEPTION_POSSIBLY_BROKEN
 // GCC ABI declarations necessary for a workaround
@@ -33,134 +33,161 @@
 #endif
 
 namespace tbb {
-namespace detail {
-namespace r1 {
-
-const char* bad_last_alloc::what() const noexcept(true) { return "bad allocation in previous or concurrent attempt"; }
-const char* user_abort::what() const noexcept(true) { return "User-initiated abort has terminated this operation"; }
-const char* missing_wait::what() const noexcept(true) { return "wait() was not called on the structured_task_group"; }
+    namespace detail {
+        namespace r1 {
+
+            const char* bad_last_alloc::what() const noexcept(true) {
+                return "bad allocation in previous or concurrent attempt";
+            }
+            const char* user_abort::what() const noexcept(true) {
+                return "User-initiated abort has terminated this operation";
+            }
+            const char* missing_wait::what() const noexcept(true) {
+                return "wait() was not called on the structured_task_group";
+            }
 
 #if TBB_USE_EXCEPTIONS
-    template <typename F>
-    /*[[noreturn]]*/ void do_throw_noexcept(F throw_func) noexcept {
-        throw_func();
-    }
+            template <typename F>
+            /*[[noreturn]]*/ void do_throw_noexcept(F throw_func) noexcept {
+                throw_func();
+            }
 
-    /*[[noreturn]]*/ void do_throw_noexcept(void (*throw_func)()) noexcept {
-        throw_func();
+            /*[[noreturn]]*/ void do_throw_noexcept(void (*throw_func)()) noexcept {
+                throw_func();
 #if __GNUC__ == 7
-        // In release, GCC 7 loses noexcept attribute during tail call optimization.
-        // The following statement prevents tail call optimization.
-        volatile bool reach_this_point = true;
-        suppress_unused_warning(reach_this_point);
+                // In release, GCC 7 loses noexcept attribute during tail call optimization.
+                // The following statement prevents tail call optimization.
+                volatile bool reach_this_point = true;
+                suppress_unused_warning(reach_this_point);
 #endif
-    }
+            }
 
-    bool terminate_on_exception(); // defined in global_control.cpp and ipc_server.cpp
+            bool terminate_on_exception();// defined in global_control.cpp and ipc_server.cpp
 
-    template <typename F>
-    /*[[noreturn]]*/ void do_throw(F throw_func) {
-        if (terminate_on_exception()) {
-            do_throw_noexcept(throw_func);
-        }
-        throw_func();
-    }
+            template <typename F>
+            /*[[noreturn]]*/ void do_throw(F throw_func) {
+                if (terminate_on_exception()) { do_throw_noexcept(throw_func); }
+                throw_func();
+            }
 
-    #define DO_THROW(exc, init_args) do_throw( []{ throw exc init_args; } );
+#define DO_THROW(exc, init_args) do_throw([] { throw exc init_args; });
 #else /* !TBB_USE_EXCEPTIONS */
-    #define PRINT_ERROR_AND_ABORT(exc_name, msg) \
-        std::fprintf (stderr, "Exception %s with message %s would have been thrown, "  \
-            "if exception handling had not been disabled. Aborting.\n", exc_name, msg); \
-        std::fflush(stderr); \
-        std::abort();
-    #define DO_THROW(exc, init_args) PRINT_ERROR_AND_ABORT(#exc, #init_args)
+#define PRINT_ERROR_AND_ABORT(exc_name, msg)                                                                 \
+    std::fprintf(stderr,                                                                                     \
+                 "Exception %s with message %s would have been thrown, "                                     \
+                 "if exception handling had not been disabled. Aborting.\n",                                 \
+                 exc_name, msg);                                                                             \
+    std::fflush(stderr);                                                                                     \
+    std::abort();
+#define DO_THROW(exc, init_args) PRINT_ERROR_AND_ABORT(#exc, #init_args)
 #endif /* !TBB_USE_EXCEPTIONS */
 
-void throw_exception ( exception_id eid ) {
-    switch ( eid ) {
-    case exception_id::bad_alloc: DO_THROW(std::bad_alloc, ()); break;
-    case exception_id::bad_last_alloc: DO_THROW(bad_last_alloc, ()); break;
-    case exception_id::user_abort: DO_THROW( user_abort, () ); break;
-    case exception_id::nonpositive_step: DO_THROW(std::invalid_argument, ("Step must be positive") ); break;
-    case exception_id::out_of_range: DO_THROW(std::out_of_range, ("Index out of requested size range")); break;
-    case exception_id::reservation_length_error: DO_THROW(std::length_error, ("Attempt to exceed implementation defined length limits")); break;
-    case exception_id::missing_wait: DO_THROW(missing_wait, ()); break;
-    case exception_id::invalid_load_factor: DO_THROW(std::out_of_range, ("Invalid hash load factor")); break;
-    case exception_id::invalid_key: DO_THROW(std::out_of_range, ("invalid key")); break;
-    case exception_id::bad_tagged_msg_cast: DO_THROW(std::runtime_error, ("Illegal tagged_msg cast")); break;
-    case exception_id::unsafe_wait: DO_THROW(unsafe_wait, ("Unsafe to wait further")); break;
-    default: __TBB_ASSERT ( false, "Unknown exception ID" );
-    }
-    __TBB_ASSERT(false, "Unreachable code");
-}
-
-/* The "what" should be fairly short, not more than about 128 characters.
+            void throw_exception(exception_id eid) {
+                switch (eid) {
+                    case exception_id::bad_alloc:
+                        DO_THROW(std::bad_alloc, ());
+                        break;
+                    case exception_id::bad_last_alloc:
+                        DO_THROW(bad_last_alloc, ());
+                        break;
+                    case exception_id::user_abort:
+                        DO_THROW(user_abort, ());
+                        break;
+                    case exception_id::nonpositive_step:
+                        DO_THROW(std::invalid_argument, ("Step must be positive"));
+                        break;
+                    case exception_id::out_of_range:
+                        DO_THROW(std::out_of_range, ("Index out of requested size range"));
+                        break;
+                    case exception_id::reservation_length_error:
+                        DO_THROW(std::length_error,
+                                 ("Attempt to exceed implementation defined length limits"));
+                        break;
+                    case exception_id::missing_wait:
+                        DO_THROW(missing_wait, ());
+                        break;
+                    case exception_id::invalid_load_factor:
+                        DO_THROW(std::out_of_range, ("Invalid hash load factor"));
+                        break;
+                    case exception_id::invalid_key:
+                        DO_THROW(std::out_of_range, ("invalid key"));
+                        break;
+                    case exception_id::bad_tagged_msg_cast:
+                        DO_THROW(std::runtime_error, ("Illegal tagged_msg cast"));
+                        break;
+                    case exception_id::unsafe_wait:
+                        DO_THROW(unsafe_wait, ("Unsafe to wait further"));
+                        break;
+                    default:
+                        __TBB_ASSERT(false, "Unknown exception ID");
+                }
+                __TBB_ASSERT(false, "Unreachable code");
+            }
+
+            /* The "what" should be fairly short, not more than about 128 characters.
    Because we control all the call sites to handle_perror, it is pointless
    to bullet-proof it for very long strings.
 
    Design note: ADR put this routine off to the side in tbb_misc.cpp instead of
    Task.cpp because the throw generates a pathetic lot of code, and ADR wanted
    this large chunk of code to be placed on a cold page. */
-void handle_perror( int error_code, const char* what ) {
-    const int BUF_SIZE = 255;
-    char buf[BUF_SIZE + 1] = { 0 };
-    std::strncat(buf, what, BUF_SIZE);
-    std::size_t buf_len = std::strlen(buf);
-    if (error_code) {
-        std::strncat(buf, ": ", BUF_SIZE - buf_len);
-        buf_len = std::strlen(buf);
-        std::strncat(buf, std::strerror(error_code), BUF_SIZE - buf_len);
-        buf_len = std::strlen(buf);
-    }
-    __TBB_ASSERT(buf_len <= BUF_SIZE && buf[buf_len] == 0, nullptr);
+            void handle_perror(int error_code, const char* what) {
+                const int BUF_SIZE = 255;
+                char buf[BUF_SIZE + 1] = {0};
+                std::strncat(buf, what, BUF_SIZE);
+                std::size_t buf_len = std::strlen(buf);
+                if (error_code) {
+                    std::strncat(buf, ": ", BUF_SIZE - buf_len);
+                    buf_len = std::strlen(buf);
+                    std::strncat(buf, std::strerror(error_code), BUF_SIZE - buf_len);
+                    buf_len = std::strlen(buf);
+                }
+                __TBB_ASSERT(buf_len <= BUF_SIZE && buf[buf_len] == 0, nullptr);
 #if TBB_USE_EXCEPTIONS
-    do_throw([&buf] { throw std::runtime_error(buf); });
+                do_throw([&buf] { throw std::runtime_error(buf); });
 #else
-    PRINT_ERROR_AND_ABORT( "runtime_error", buf);
+                PRINT_ERROR_AND_ABORT("runtime_error", buf);
 #endif /* !TBB_USE_EXCEPTIONS */
-}
+            }
 
 #if __TBB_STD_RETHROW_EXCEPTION_POSSIBLY_BROKEN
-// Runtime detection and workaround for the GCC bug 62258.
-// The problem is that std::rethrow_exception() does not increment a counter
-// of active exceptions, causing std::uncaught_exception() to return a wrong value.
-// The code is created after, and roughly reflects, the workaround
-// at https://gcc.gnu.org/bugzilla/attachment.cgi?id=34683
-
-void fix_broken_rethrow() {
-    struct gcc_eh_data {
-        void *       caughtExceptions;
-        unsigned int uncaughtExceptions;
-    };
-    gcc_eh_data* eh_data = punned_cast<gcc_eh_data*>( abi::__cxa_get_globals() );
-    ++eh_data->uncaughtExceptions;
-}
-
-bool gcc_rethrow_exception_broken() {
-    bool is_broken;
-    __TBB_ASSERT( !std::uncaught_exception(),
-        "gcc_rethrow_exception_broken() must not be called when an exception is active" );
-    try {
-        // Throw, catch, and rethrow an exception
-        try {
-            throw __TBB_GLIBCXX_VERSION;
-        } catch(...) {
-            std::rethrow_exception( std::current_exception() );
-        }
-    } catch(...) {
-        // Check the bug presence
-        is_broken = std::uncaught_exception();
-    }
-    if( is_broken ) fix_broken_rethrow();
-    __TBB_ASSERT( !std::uncaught_exception(), nullptr);
-    return is_broken;
-}
+            // Runtime detection and workaround for the GCC bug 62258.
+            // The problem is that std::rethrow_exception() does not increment a counter
+            // of active exceptions, causing std::uncaught_exception() to return a wrong value.
+            // The code is created after, and roughly reflects, the workaround
+            // at https://gcc.gnu.org/bugzilla/attachment.cgi?id=34683
+
+            void fix_broken_rethrow() {
+                struct gcc_eh_data {
+                    void* caughtExceptions;
+                    unsigned int uncaughtExceptions;
+                };
+                gcc_eh_data* eh_data = punned_cast<gcc_eh_data*>(abi::__cxa_get_globals());
+                ++eh_data->uncaughtExceptions;
+            }
+
+            bool gcc_rethrow_exception_broken() {
+                bool is_broken;
+                __TBB_ASSERT(!std::uncaught_exception(),
+                             "gcc_rethrow_exception_broken() must not be called when an exception is active");
+                try {
+                    // Throw, catch, and rethrow an exception
+                    try {
+                        throw __TBB_GLIBCXX_VERSION;
+                    } catch (...) { std::rethrow_exception(std::current_exception()); }
+                } catch (...) {
+                    // Check the bug presence
+                    is_broken = std::uncaught_exception();
+                }
+                if (is_broken) fix_broken_rethrow();
+                __TBB_ASSERT(!std::uncaught_exception(), nullptr);
+                return is_broken;
+            }
 #else
-void fix_broken_rethrow() {}
-bool gcc_rethrow_exception_broken() { return false; }
+            void fix_broken_rethrow() {}
+            bool gcc_rethrow_exception_broken() { return false; }
 #endif /* __TBB_STD_RETHROW_EXCEPTION_POSSIBLY_BROKEN */
 
-} // namespace r1
-} // namespace detail
-} // namespace tbb
-
+        }// namespace r1
+    }    // namespace detail
+}// namespace tbb
diff --git a/external/tbb/src/tbb/global_control.cpp b/external/tbb/src/tbb/global_control.cpp
index f45c66b8..57d8b845 100644
--- a/external/tbb/src/tbb/global_control.cpp
+++ b/external/tbb/src/tbb/global_control.cpp
@@ -19,267 +19,251 @@
 
 #include "oneapi/tbb/cache_aligned_allocator.h"
 #include "oneapi/tbb/global_control.h"
-#include "oneapi/tbb/tbb_allocator.h"
 #include "oneapi/tbb/spin_mutex.h"
+#include "oneapi/tbb/tbb_allocator.h"
 
 #include "governor.h"
-#include "threading_control.h"
 #include "market.h"
 #include "misc.h"
+#include "threading_control.h"
 
 #include <atomic>
 #include <set>
 
 namespace tbb {
-namespace detail {
-namespace r1 {
-
-//! Comparator for a set of global_control objects
-struct control_storage_comparator {
-    bool operator()(const d1::global_control* lhs, const d1::global_control* rhs) const;
-};
-
-class control_storage {
-    friend struct global_control_impl;
-    friend std::size_t global_control_active_value(int);
-    friend void global_control_lock();
-    friend void global_control_unlock();
-    friend std::size_t global_control_active_value_unsafe(d1::global_control::parameter);
-protected:
-    std::size_t my_active_value{0};
-    std::set<d1::global_control*, control_storage_comparator, tbb_allocator<d1::global_control*>> my_list{};
-    spin_mutex my_list_mutex{};
-public:
-    virtual ~control_storage() = default;
-    virtual std::size_t default_value() const = 0;
-    virtual void apply_active(std::size_t new_active) {
-        my_active_value = new_active;
-    }
-    virtual bool is_first_arg_preferred(std::size_t a, std::size_t b) const {
-        return a>b; // prefer max by default
-    }
-    virtual std::size_t active_value() {
-        spin_mutex::scoped_lock lock(my_list_mutex); // protect my_list.empty() call
-        return !my_list.empty() ? my_active_value : default_value();
-    }
-
-    std::size_t active_value_unsafe() {
-        return !my_list.empty() ? my_active_value : default_value();
-    }
-};
-
-class alignas(max_nfs_size) allowed_parallelism_control : public control_storage {
-    std::size_t default_value() const override {
-        return max(1U, governor::default_num_threads());
-    }
-    bool is_first_arg_preferred(std::size_t a, std::size_t b) const override {
-        return a<b; // prefer min allowed parallelism
-    }
-    void apply_active(std::size_t new_active) override {
-        control_storage::apply_active(new_active);
-        __TBB_ASSERT(my_active_value >= 1, nullptr);
-        // -1 to take external thread into account
-        threading_control::set_active_num_workers(my_active_value - 1);
-    }
-    std::size_t active_value() override {
-        spin_mutex::scoped_lock lock(my_list_mutex); // protect my_list.empty() call
-        if (my_list.empty()) {
-            return default_value();
-        }
-
-        // non-zero, if market is active
-        const std::size_t workers = threading_control::max_num_workers();
-        // We can't exceed market's maximal number of workers.
-        // +1 to take external thread into account
-        return workers ? min(workers + 1, my_active_value) : my_active_value;
-    }
-};
-
-class alignas(max_nfs_size) stack_size_control : public control_storage {
-    std::size_t default_value() const override {
+    namespace detail {
+        namespace r1 {
+
+            //! Comparator for a set of global_control objects
+            struct control_storage_comparator {
+                bool operator()(const d1::global_control* lhs, const d1::global_control* rhs) const;
+            };
+
+            class control_storage {
+                friend struct global_control_impl;
+                friend std::size_t global_control_active_value(int);
+                friend void global_control_lock();
+                friend void global_control_unlock();
+                friend std::size_t global_control_active_value_unsafe(d1::global_control::parameter);
+
+            protected:
+                std::size_t my_active_value {0};
+                std::set<d1::global_control*, control_storage_comparator, tbb_allocator<d1::global_control*>>
+                        my_list {};
+                spin_mutex my_list_mutex {};
+
+            public:
+                virtual ~control_storage() = default;
+                virtual std::size_t default_value() const = 0;
+                virtual void apply_active(std::size_t new_active) { my_active_value = new_active; }
+                virtual bool is_first_arg_preferred(std::size_t a, std::size_t b) const {
+                    return a > b;// prefer max by default
+                }
+                virtual std::size_t active_value() {
+                    spin_mutex::scoped_lock lock(my_list_mutex);// protect my_list.empty() call
+                    return !my_list.empty() ? my_active_value : default_value();
+                }
+
+                std::size_t active_value_unsafe() {
+                    return !my_list.empty() ? my_active_value : default_value();
+                }
+            };
+
+            class alignas(max_nfs_size) allowed_parallelism_control : public control_storage {
+                std::size_t default_value() const override {
+                    return max(1U, governor::default_num_threads());
+                }
+                bool is_first_arg_preferred(std::size_t a, std::size_t b) const override {
+                    return a < b;// prefer min allowed parallelism
+                }
+                void apply_active(std::size_t new_active) override {
+                    control_storage::apply_active(new_active);
+                    __TBB_ASSERT(my_active_value >= 1, nullptr);
+                    // -1 to take external thread into account
+                    threading_control::set_active_num_workers(my_active_value - 1);
+                }
+                std::size_t active_value() override {
+                    spin_mutex::scoped_lock lock(my_list_mutex);// protect my_list.empty() call
+                    if (my_list.empty()) { return default_value(); }
+
+                    // non-zero, if market is active
+                    const std::size_t workers = threading_control::max_num_workers();
+                    // We can't exceed market's maximal number of workers.
+                    // +1 to take external thread into account
+                    return workers ? min(workers + 1, my_active_value) : my_active_value;
+                }
+            };
+
+            class alignas(max_nfs_size) stack_size_control : public control_storage {
+                std::size_t default_value() const override {
 #if _WIN32_WINNT >= 0x0602 /* _WIN32_WINNT_WIN8 */
-        static auto ThreadStackSizeDefault = [] {
-            ULONG_PTR hi, lo;
-            GetCurrentThreadStackLimits(&lo, &hi);
-            return hi - lo;
-        }();
-        return ThreadStackSizeDefault;
+                    static auto ThreadStackSizeDefault = [] {
+                        ULONG_PTR hi, lo;
+                        GetCurrentThreadStackLimits(&lo, &hi);
+                        return hi - lo;
+                    }();
+                    return ThreadStackSizeDefault;
 #elif defined(EMSCRIPTEN)
-        return __TBB_EMSCRIPTEN_STACK_SIZE;
+                    return __TBB_EMSCRIPTEN_STACK_SIZE;
 #else
-        return ThreadStackSize;
+                    return ThreadStackSize;
 #endif
-    }
-    void apply_active(std::size_t new_active) override {
-        control_storage::apply_active(new_active);
+                }
+                void apply_active(std::size_t new_active) override {
+                    control_storage::apply_active(new_active);
 #if __TBB_WIN8UI_SUPPORT && (_WIN32_WINNT < 0x0A00)
-        __TBB_ASSERT( false, "For Windows 8 Store* apps we must not set stack size" );
+                    __TBB_ASSERT(false, "For Windows 8 Store* apps we must not set stack size");
 #endif
-    }
-};
-
-class alignas(max_nfs_size) terminate_on_exception_control : public control_storage {
-    std::size_t default_value() const override {
-        return 0;
-    }
-};
-
-class alignas(max_nfs_size) lifetime_control : public control_storage {
-    bool is_first_arg_preferred(std::size_t, std::size_t) const override {
-        return false; // not interested
-    }
-    std::size_t default_value() const override {
-        return 0;
-    }
-    void apply_active(std::size_t new_active) override {
-        if (new_active == 1) {
-            // reserve the market reference
-            threading_control::register_lifetime_control();
-        } else if (new_active == 0) { // new_active == 0
-            threading_control::unregister_lifetime_control(/*blocking_terminate*/ false);
-        }
-        control_storage::apply_active(new_active);
-    }
-};
-
-static control_storage* controls[] = {nullptr, nullptr, nullptr, nullptr};
-
-void global_control_acquire() {
-    controls[0] = new (cache_aligned_allocate(sizeof(allowed_parallelism_control))) allowed_parallelism_control{};
-    controls[1] = new (cache_aligned_allocate(sizeof(stack_size_control))) stack_size_control{};
-    controls[2] = new (cache_aligned_allocate(sizeof(terminate_on_exception_control))) terminate_on_exception_control{};
-    controls[3] = new (cache_aligned_allocate(sizeof(lifetime_control))) lifetime_control{};
-}
-
-void global_control_release() {
-    for (auto& ptr : controls) {
-        ptr->~control_storage();
-        cache_aligned_deallocate(ptr);
-        ptr = nullptr;
-    }
-}
-
-void global_control_lock() {
-    for (auto& ctl : controls) {
-        ctl->my_list_mutex.lock();
-    }
-}
-
-void global_control_unlock() {
-    int N = std::distance(std::begin(controls), std::end(controls));
-    for (int i = N - 1; i >= 0; --i) {
-        controls[i]->my_list_mutex.unlock();
-    }
-}
-
-std::size_t global_control_active_value_unsafe(d1::global_control::parameter param) {
-    __TBB_ASSERT_RELEASE(param < d1::global_control::parameter_max, nullptr);
-    return controls[param]->active_value_unsafe();
-}
-
-//! Comparator for a set of global_control objects
-inline bool control_storage_comparator::operator()(const d1::global_control* lhs, const d1::global_control* rhs) const {
-    __TBB_ASSERT_RELEASE(lhs->my_param < d1::global_control::parameter_max , nullptr);
-    return lhs->my_value < rhs->my_value || (lhs->my_value == rhs->my_value && lhs < rhs);
-}
-
-bool terminate_on_exception() {
-    return d1::global_control::active_value(d1::global_control::terminate_on_exception) == 1;
-}
-
-struct global_control_impl {
-private:
-    static bool erase_if_present(control_storage* const c, d1::global_control& gc) {
-        auto it = c->my_list.find(&gc);
-        if (it != c->my_list.end()) {
-            c->my_list.erase(it);
-            return true;
-        }
-        return false;
-    }
-
-public:
-
-    static void create(d1::global_control& gc) {
-        __TBB_ASSERT_RELEASE(gc.my_param < d1::global_control::parameter_max, nullptr);
-        control_storage* const c = controls[gc.my_param];
-
-        spin_mutex::scoped_lock lock(c->my_list_mutex);
-        if (c->my_list.empty() || c->is_first_arg_preferred(gc.my_value, c->my_active_value)) {
-            // to guarantee that apply_active() is called with current active value,
-            // calls it here and in internal_destroy() under my_list_mutex
-            c->apply_active(gc.my_value);
-        }
-        c->my_list.insert(&gc);
-    }
-
-    static void destroy(d1::global_control& gc) {
-        __TBB_ASSERT_RELEASE(gc.my_param < d1::global_control::parameter_max, nullptr);
-        control_storage* const c = controls[gc.my_param];
-        // Concurrent reading and changing global parameter is possible.
-        spin_mutex::scoped_lock lock(c->my_list_mutex);
-        __TBB_ASSERT(gc.my_param == d1::global_control::scheduler_handle || !c->my_list.empty(), nullptr);
-        std::size_t new_active = (std::size_t)(-1), old_active = c->my_active_value;
-
-        if (!erase_if_present(c, gc)) {
-            __TBB_ASSERT(gc.my_param == d1::global_control::scheduler_handle , nullptr);
-            return;
-        }
-        if (c->my_list.empty()) {
-            __TBB_ASSERT(new_active == (std::size_t) - 1, nullptr);
-            new_active = c->default_value();
-        } else {
-            new_active = (*c->my_list.begin())->my_value;
-        }
-        if (new_active != old_active) {
-            c->apply_active(new_active);
-        }
-    }
-
-    static bool remove_and_check_if_empty(d1::global_control& gc) {
-        __TBB_ASSERT_RELEASE(gc.my_param < d1::global_control::parameter_max, nullptr);
-        control_storage* const c = controls[gc.my_param];
-
-        spin_mutex::scoped_lock lock(c->my_list_mutex);
-        __TBB_ASSERT(!c->my_list.empty(), nullptr);
-        erase_if_present(c, gc);
-        return c->my_list.empty();
-    }
+                }
+            };
+
+            class alignas(max_nfs_size) terminate_on_exception_control : public control_storage {
+                std::size_t default_value() const override { return 0; }
+            };
+
+            class alignas(max_nfs_size) lifetime_control : public control_storage {
+                bool is_first_arg_preferred(std::size_t, std::size_t) const override {
+                    return false;// not interested
+                }
+                std::size_t default_value() const override { return 0; }
+                void apply_active(std::size_t new_active) override {
+                    if (new_active == 1) {
+                        // reserve the market reference
+                        threading_control::register_lifetime_control();
+                    } else if (new_active == 0) {// new_active == 0
+                        threading_control::unregister_lifetime_control(/*blocking_terminate*/ false);
+                    }
+                    control_storage::apply_active(new_active);
+                }
+            };
+
+            static control_storage* controls[] = {nullptr, nullptr, nullptr, nullptr};
+
+            void global_control_acquire() {
+                controls[0] = new (cache_aligned_allocate(sizeof(allowed_parallelism_control)))
+                        allowed_parallelism_control {};
+                controls[1] = new (cache_aligned_allocate(sizeof(stack_size_control))) stack_size_control {};
+                controls[2] = new (cache_aligned_allocate(sizeof(terminate_on_exception_control)))
+                        terminate_on_exception_control {};
+                controls[3] = new (cache_aligned_allocate(sizeof(lifetime_control))) lifetime_control {};
+            }
+
+            void global_control_release() {
+                for (auto& ptr : controls) {
+                    ptr->~control_storage();
+                    cache_aligned_deallocate(ptr);
+                    ptr = nullptr;
+                }
+            }
+
+            void global_control_lock() {
+                for (auto& ctl : controls) { ctl->my_list_mutex.lock(); }
+            }
+
+            void global_control_unlock() {
+                int N = std::distance(std::begin(controls), std::end(controls));
+                for (int i = N - 1; i >= 0; --i) { controls[i]->my_list_mutex.unlock(); }
+            }
+
+            std::size_t global_control_active_value_unsafe(d1::global_control::parameter param) {
+                __TBB_ASSERT_RELEASE(param < d1::global_control::parameter_max, nullptr);
+                return controls[param]->active_value_unsafe();
+            }
+
+            //! Comparator for a set of global_control objects
+            inline bool control_storage_comparator::operator()(const d1::global_control* lhs,
+                                                               const d1::global_control* rhs) const {
+                __TBB_ASSERT_RELEASE(lhs->my_param < d1::global_control::parameter_max, nullptr);
+                return lhs->my_value < rhs->my_value || (lhs->my_value == rhs->my_value && lhs < rhs);
+            }
+
+            bool terminate_on_exception() {
+                return d1::global_control::active_value(d1::global_control::terminate_on_exception) == 1;
+            }
+
+            struct global_control_impl {
+            private:
+                static bool erase_if_present(control_storage* const c, d1::global_control& gc) {
+                    auto it = c->my_list.find(&gc);
+                    if (it != c->my_list.end()) {
+                        c->my_list.erase(it);
+                        return true;
+                    }
+                    return false;
+                }
+
+            public:
+                static void create(d1::global_control& gc) {
+                    __TBB_ASSERT_RELEASE(gc.my_param < d1::global_control::parameter_max, nullptr);
+                    control_storage* const c = controls[gc.my_param];
+
+                    spin_mutex::scoped_lock lock(c->my_list_mutex);
+                    if (c->my_list.empty() || c->is_first_arg_preferred(gc.my_value, c->my_active_value)) {
+                        // to guarantee that apply_active() is called with current active value,
+                        // calls it here and in internal_destroy() under my_list_mutex
+                        c->apply_active(gc.my_value);
+                    }
+                    c->my_list.insert(&gc);
+                }
+
+                static void destroy(d1::global_control& gc) {
+                    __TBB_ASSERT_RELEASE(gc.my_param < d1::global_control::parameter_max, nullptr);
+                    control_storage* const c = controls[gc.my_param];
+                    // Concurrent reading and changing global parameter is possible.
+                    spin_mutex::scoped_lock lock(c->my_list_mutex);
+                    __TBB_ASSERT(gc.my_param == d1::global_control::scheduler_handle || !c->my_list.empty(),
+                                 nullptr);
+                    std::size_t new_active = (std::size_t)(-1), old_active = c->my_active_value;
+
+                    if (!erase_if_present(c, gc)) {
+                        __TBB_ASSERT(gc.my_param == d1::global_control::scheduler_handle, nullptr);
+                        return;
+                    }
+                    if (c->my_list.empty()) {
+                        __TBB_ASSERT(new_active == (std::size_t) -1, nullptr);
+                        new_active = c->default_value();
+                    } else {
+                        new_active = (*c->my_list.begin())->my_value;
+                    }
+                    if (new_active != old_active) { c->apply_active(new_active); }
+                }
+
+                static bool remove_and_check_if_empty(d1::global_control& gc) {
+                    __TBB_ASSERT_RELEASE(gc.my_param < d1::global_control::parameter_max, nullptr);
+                    control_storage* const c = controls[gc.my_param];
+
+                    spin_mutex::scoped_lock lock(c->my_list_mutex);
+                    __TBB_ASSERT(!c->my_list.empty(), nullptr);
+                    erase_if_present(c, gc);
+                    return c->my_list.empty();
+                }
 #if TBB_USE_ASSERT
-    static bool is_present(d1::global_control& gc) {
-        __TBB_ASSERT_RELEASE(gc.my_param < d1::global_control::parameter_max, nullptr);
-        control_storage* const c = controls[gc.my_param];
-
-        spin_mutex::scoped_lock lock(c->my_list_mutex);
-        auto it = c->my_list.find(&gc);
-        if (it != c->my_list.end()) {
-            return true;
-        }
-        return false;
-    }
-#endif // TBB_USE_ASSERT
-};
-
-void __TBB_EXPORTED_FUNC create(d1::global_control& gc) {
-    global_control_impl::create(gc);
-}
-void __TBB_EXPORTED_FUNC destroy(d1::global_control& gc) {
-    global_control_impl::destroy(gc);
-}
-
-bool remove_and_check_if_empty(d1::global_control& gc) {
-    return global_control_impl::remove_and_check_if_empty(gc);
-}
+                static bool is_present(d1::global_control& gc) {
+                    __TBB_ASSERT_RELEASE(gc.my_param < d1::global_control::parameter_max, nullptr);
+                    control_storage* const c = controls[gc.my_param];
+
+                    spin_mutex::scoped_lock lock(c->my_list_mutex);
+                    auto it = c->my_list.find(&gc);
+                    if (it != c->my_list.end()) { return true; }
+                    return false;
+                }
+#endif// TBB_USE_ASSERT
+            };
+
+            void __TBB_EXPORTED_FUNC create(d1::global_control& gc) { global_control_impl::create(gc); }
+            void __TBB_EXPORTED_FUNC destroy(d1::global_control& gc) { global_control_impl::destroy(gc); }
+
+            bool remove_and_check_if_empty(d1::global_control& gc) {
+                return global_control_impl::remove_and_check_if_empty(gc);
+            }
 #if TBB_USE_ASSERT
-bool is_present(d1::global_control& gc) {
-    return global_control_impl::is_present(gc);
-}
-#endif // TBB_USE_ASSERT
-std::size_t __TBB_EXPORTED_FUNC global_control_active_value(int param) {
-    __TBB_ASSERT_RELEASE(param < d1::global_control::parameter_max, nullptr);
-    return controls[param]->active_value();
-}
-
-} // namespace r1
-} // namespace detail
-} // namespace tbb
+            bool is_present(d1::global_control& gc) { return global_control_impl::is_present(gc); }
+#endif// TBB_USE_ASSERT
+            std::size_t __TBB_EXPORTED_FUNC global_control_active_value(int param) {
+                __TBB_ASSERT_RELEASE(param < d1::global_control::parameter_max, nullptr);
+                return controls[param]->active_value();
+            }
+
+        }// namespace r1
+    }    // namespace detail
+}// namespace tbb
diff --git a/external/tbb/src/tbb/governor.cpp b/external/tbb/src/tbb/governor.cpp
index 4b417b40..e5ef6e74 100644
--- a/external/tbb/src/tbb/governor.cpp
+++ b/external/tbb/src/tbb/governor.cpp
@@ -15,124 +15,124 @@
 */
 
 #include "governor.h"
-#include "threading_control.h"
-#include "main.h"
-#include "thread_data.h"
-#include "market.h"
 #include "arena.h"
-#include "dynamic_link.h"
 #include "concurrent_monitor.h"
+#include "dynamic_link.h"
+#include "main.h"
+#include "market.h"
+#include "thread_data.h"
 #include "thread_dispatcher.h"
+#include "threading_control.h"
 
-#include "oneapi/tbb/task_group.h"
 #include "oneapi/tbb/global_control.h"
-#include "oneapi/tbb/tbb_allocator.h"
 #include "oneapi/tbb/info.h"
+#include "oneapi/tbb/task_group.h"
+#include "oneapi/tbb/tbb_allocator.h"
 
 #include "task_dispatcher.h"
 
+#include <algorithm>
+#include <atomic>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
-#include <atomic>
-#include <algorithm>
 
 #ifdef EMSCRIPTEN
 #include <emscripten/stack.h>
 #endif
 
 namespace tbb {
-namespace detail {
-namespace r1 {
+    namespace detail {
+        namespace r1 {
 
 #if TBB_USE_ASSERT
-std::atomic<int> the_observer_proxy_count;
+            std::atomic<int> the_observer_proxy_count;
 #endif /* TBB_USE_ASSERT */
 
-void clear_address_waiter_table();
-void global_control_acquire();
-void global_control_release();
+            void clear_address_waiter_table();
+            void global_control_acquire();
+            void global_control_release();
 
-//! global_control.cpp contains definition
-bool remove_and_check_if_empty(d1::global_control& gc);
-bool is_present(d1::global_control& gc);
+            //! global_control.cpp contains definition
+            bool remove_and_check_if_empty(d1::global_control& gc);
+            bool is_present(d1::global_control& gc);
 
-namespace rml {
-tbb_server* make_private_server( tbb_client& client );
-} // namespace rml
+            namespace rml {
+                tbb_server* make_private_server(tbb_client& client);
+            }// namespace rml
 
-namespace system_topology {
-    void destroy();
-}
+            namespace system_topology {
+                void destroy();
+            }
 
-//------------------------------------------------------------------------
-// governor
-//------------------------------------------------------------------------
+            //------------------------------------------------------------------------
+            // governor
+            //------------------------------------------------------------------------
 
-void governor::acquire_resources () {
-    global_control_acquire();
+            void governor::acquire_resources() {
+                global_control_acquire();
 #if __TBB_USE_POSIX
-    int status = theTLS.create(auto_terminate);
+                int status = theTLS.create(auto_terminate);
 #else
-    int status = theTLS.create();
+                int status = theTLS.create();
 #endif
-    if( status )
-        handle_perror(status, "TBB failed to initialize task scheduler TLS\n");
-    detect_cpu_features(cpu_features);
+                if (status) handle_perror(status, "TBB failed to initialize task scheduler TLS\n");
+                detect_cpu_features(cpu_features);
 
-    is_rethrow_broken = gcc_rethrow_exception_broken();
-}
+                is_rethrow_broken = gcc_rethrow_exception_broken();
+            }
 
-void governor::release_resources () {
-    theRMLServerFactory.close();
-    destroy_process_mask();
+            void governor::release_resources() {
+                theRMLServerFactory.close();
+                destroy_process_mask();
 
-    __TBB_ASSERT(!(__TBB_InitOnce::initialization_done() && theTLS.get()), "TBB is unloaded while thread data still alive?");
+                __TBB_ASSERT(!(__TBB_InitOnce::initialization_done() && theTLS.get()),
+                             "TBB is unloaded while thread data still alive?");
 
-    int status = theTLS.destroy();
-    if( status )
-        runtime_warning("failed to destroy task scheduler TLS: %s", std::strerror(status));
-    clear_address_waiter_table();
+                int status = theTLS.destroy();
+                if (status)
+                    runtime_warning("failed to destroy task scheduler TLS: %s", std::strerror(status));
+                clear_address_waiter_table();
 
 #if TBB_USE_ASSERT
-    if (the_observer_proxy_count != 0) {
-            runtime_warning("Leaked %ld observer_proxy objects\n", long(the_observer_proxy_count));
-    }
+                if (the_observer_proxy_count != 0) {
+                    runtime_warning("Leaked %ld observer_proxy objects\n", long(the_observer_proxy_count));
+                }
 #endif /* TBB_USE_ASSERT */
 
-    system_topology::destroy();
-    dynamic_unlink_all();
-    global_control_release();
-}
-
-rml::tbb_server* governor::create_rml_server ( rml::tbb_client& client ) {
-    rml::tbb_server* server = nullptr;
-    if( !UsePrivateRML ) {
-        ::rml::factory::status_type status = theRMLServerFactory.make_server( server, client );
-        if( status != ::rml::factory::st_success ) {
-            UsePrivateRML = true;
-            runtime_warning( "rml::tbb_factory::make_server failed with status %x, falling back on private rml", status );
-        }
-    }
-    if ( !server ) {
-        __TBB_ASSERT( UsePrivateRML, nullptr);
-        server = rml::make_private_server( client );
-    }
-    __TBB_ASSERT( server, "Failed to create RML server" );
-    return server;
-}
-
-void governor::one_time_init() {
-    if ( !__TBB_InitOnce::initialization_done() ) {
-        DoOneTimeInitialization();
-    }
-}
-
-bool governor::does_client_join_workers(const rml::tbb_client &client) {
-    return ((const thread_dispatcher&)client).must_join_workers();
-}
+                system_topology::destroy();
+                dynamic_unlink_all();
+                global_control_release();
+            }
 
-/*
+            rml::tbb_server* governor::create_rml_server(rml::tbb_client& client) {
+                rml::tbb_server* server = nullptr;
+                if (!UsePrivateRML) {
+                    ::rml::factory::status_type status = theRMLServerFactory.make_server(server, client);
+                    if (status != ::rml::factory::st_success) {
+                        UsePrivateRML = true;
+                        runtime_warning("rml::tbb_factory::make_server failed with status %x, falling back "
+                                        "on private rml",
+                                        status);
+                    }
+                }
+                if (!server) {
+                    __TBB_ASSERT(UsePrivateRML, nullptr);
+                    server = rml::make_private_server(client);
+                }
+                __TBB_ASSERT(server, "Failed to create RML server");
+                return server;
+            }
+
+            void governor::one_time_init() {
+                if (!__TBB_InitOnce::initialization_done()) { DoOneTimeInitialization(); }
+            }
+
+            bool governor::does_client_join_workers(const rml::tbb_client& client) {
+                return ((const thread_dispatcher&) client).must_join_workers();
+            }
+
+            /*
     There is no portable way to get stack base address in Posix, however the modern
     Linux versions provide pthread_attr_np API that can be used  to obtain thread's
     stack size and base address. Unfortunately even this function does not provide
@@ -151,189 +151,187 @@ bool governor::does_client_join_workers(const rml::tbb_client &client) {
     3) If the user app strives to conserve the memory by cutting stack size, it
     should do this for TBB workers too (as in the #1).
 */
-static void get_stack_attributes(std::uintptr_t& stack_base, std::size_t& stack_size, std::size_t fallback_stack_size) {
-    // Stacks are growing top-down. Highest address is called "stack base",
-    // and the lowest is "stack limit".
-    stack_size = fallback_stack_size;
+            static void get_stack_attributes(std::uintptr_t& stack_base, std::size_t& stack_size,
+                                             std::size_t fallback_stack_size) {
+                // Stacks are growing top-down. Highest address is called "stack base",
+                // and the lowest is "stack limit".
+                stack_size = fallback_stack_size;
 #if __TBB_USE_WINAPI
-    NT_TIB* pteb = (NT_TIB*)NtCurrentTeb();
-    __TBB_ASSERT(&pteb < pteb->StackBase && &pteb > pteb->StackLimit, "invalid stack info in TEB");
-    stack_base = reinterpret_cast<std::uintptr_t>(pteb->StackBase);
+                NT_TIB* pteb = (NT_TIB*) NtCurrentTeb();
+                __TBB_ASSERT(&pteb<pteb->StackBase&& & pteb> pteb->StackLimit, "invalid stack info in TEB");
+                stack_base = reinterpret_cast<std::uintptr_t>(pteb->StackBase);
 #elif defined(EMSCRIPTEN)
-    stack_base = reinterpret_cast<std::uintptr_t>(emscripten_stack_get_base());
+                stack_base = reinterpret_cast<std::uintptr_t>(emscripten_stack_get_base());
 #else
-    // There is no portable way to get stack base address in Posix, so we use
-    // non-portable method (on all modern Linux) or the simplified approach
-    // based on the common sense assumptions. The most important assumption
-    // is that the main thread's stack size is not less than that of other threads.
+                // There is no portable way to get stack base address in Posix, so we use
+                // non-portable method (on all modern Linux) or the simplified approach
+                // based on the common sense assumptions. The most important assumption
+                // is that the main thread's stack size is not less than that of other threads.
 
-    // Points to the lowest addressable byte of a stack.
-    void* stack_limit = nullptr;
+                // Points to the lowest addressable byte of a stack.
+                void* stack_limit = nullptr;
 #if __linux__ && !__bg__
-    size_t np_stack_size = 0;
-    pthread_attr_t np_attr_stack;
-    if (0 == pthread_getattr_np(pthread_self(), &np_attr_stack)) {
-        if (0 == pthread_attr_getstack(&np_attr_stack, &stack_limit, &np_stack_size)) {
-            __TBB_ASSERT( &stack_limit > stack_limit, "stack size must be positive" );
-            if (np_stack_size > 0)
-                stack_size = np_stack_size;
-        }
-        pthread_attr_destroy(&np_attr_stack);
-    }
+                size_t np_stack_size = 0;
+                pthread_attr_t np_attr_stack;
+                if (0 == pthread_getattr_np(pthread_self(), &np_attr_stack)) {
+                    if (0 == pthread_attr_getstack(&np_attr_stack, &stack_limit, &np_stack_size)) {
+                        __TBB_ASSERT(&stack_limit > stack_limit, "stack size must be positive");
+                        if (np_stack_size > 0) stack_size = np_stack_size;
+                    }
+                    pthread_attr_destroy(&np_attr_stack);
+                }
 #endif /* __linux__ */
-    if (stack_limit) {
-        stack_base = reinterpret_cast<std::uintptr_t>(stack_limit) + stack_size;
-    } else {
-        // Use an anchor as a base stack address.
-        int anchor{};
-        stack_base = reinterpret_cast<std::uintptr_t>(&anchor);
-    }
+                if (stack_limit) {
+                    stack_base = reinterpret_cast<std::uintptr_t>(stack_limit) + stack_size;
+                } else {
+                    // Use an anchor as a base stack address.
+                    int anchor {};
+                    stack_base = reinterpret_cast<std::uintptr_t>(&anchor);
+                }
 #endif /* __TBB_USE_WINAPI */
-}
-
-#if (_WIN32||_WIN64) && !__TBB_DYNAMIC_LOAD_ENABLED
-static void register_external_thread_destructor() {
-    struct thread_destructor {
-        ~thread_destructor() {
-            governor::terminate_external_thread();
-        }
-    };
-    // ~thread_destructor() will be call during the calling thread termination
-    static thread_local thread_destructor thr_destructor;
-}
-#endif // (_WIN32||_WIN64) && !__TBB_DYNAMIC_LOAD_ENABLED
-
-void governor::init_external_thread() {
-    one_time_init();
-    // Create new scheduler instance with arena
-    int num_slots = default_num_threads();
-    // TODO_REVAMP: support an external thread without an implicit arena
-    int num_reserved_slots = 1;
-    unsigned arena_priority_level = 1; // corresponds to tbb::task_arena::priority::normal
-    std::size_t stack_size = 0;
-    threading_control* thr_control = threading_control::register_public_reference();
-    arena& a = arena::create(thr_control, num_slots, num_reserved_slots, arena_priority_level);
-    // External thread always occupies the first slot
-    thread_data& td = *new(cache_aligned_allocate(sizeof(thread_data))) thread_data(0, false);
-    td.attach_arena(a, /*slot index*/ 0);
-    __TBB_ASSERT(td.my_inbox.is_idle_state(false), nullptr);
-
-    std::uintptr_t stack_base{};
-    get_stack_attributes(stack_base, stack_size, a.my_threading_control->worker_stack_size());
-    task_dispatcher& task_disp = td.my_arena_slot->default_task_dispatcher();
-    td.enter_task_dispatcher(task_disp, calculate_stealing_threshold(stack_base, stack_size));
-
-    td.my_arena_slot->occupy();
-    thr_control->register_thread(td);
-    set_thread_data(td);
-#if (_WIN32||_WIN64) && !__TBB_DYNAMIC_LOAD_ENABLED
-    // The external thread destructor is called from dllMain but it is not available with a static build.
-    // Therefore, we need to register the current thread to call the destructor during thread termination.
-    register_external_thread_destructor();
+            }
+
+#if (_WIN32 || _WIN64) && !__TBB_DYNAMIC_LOAD_ENABLED
+            static void register_external_thread_destructor() {
+                struct thread_destructor {
+                    ~thread_destructor() { governor::terminate_external_thread(); }
+                };
+                // ~thread_destructor() will be call during the calling thread termination
+                static thread_local thread_destructor thr_destructor;
+            }
+#endif// (_WIN32||_WIN64) && !__TBB_DYNAMIC_LOAD_ENABLED
+
+            void governor::init_external_thread() {
+                one_time_init();
+                // Create new scheduler instance with arena
+                int num_slots = default_num_threads();
+                // TODO_REVAMP: support an external thread without an implicit arena
+                int num_reserved_slots = 1;
+                unsigned arena_priority_level = 1;// corresponds to tbb::task_arena::priority::normal
+                std::size_t stack_size = 0;
+                threading_control* thr_control = threading_control::register_public_reference();
+                arena& a = arena::create(thr_control, num_slots, num_reserved_slots, arena_priority_level);
+                // External thread always occupies the first slot
+                thread_data& td = *new (cache_aligned_allocate(sizeof(thread_data))) thread_data(0, false);
+                td.attach_arena(a, /*slot index*/ 0);
+                __TBB_ASSERT(td.my_inbox.is_idle_state(false), nullptr);
+
+                std::uintptr_t stack_base {};
+                get_stack_attributes(stack_base, stack_size, a.my_threading_control->worker_stack_size());
+                task_dispatcher& task_disp = td.my_arena_slot->default_task_dispatcher();
+                td.enter_task_dispatcher(task_disp, calculate_stealing_threshold(stack_base, stack_size));
+
+                td.my_arena_slot->occupy();
+                thr_control->register_thread(td);
+                set_thread_data(td);
+#if (_WIN32 || _WIN64) && !__TBB_DYNAMIC_LOAD_ENABLED
+                // The external thread destructor is called from dllMain but it is not available with a static build.
+                // Therefore, we need to register the current thread to call the destructor during thread termination.
+                register_external_thread_destructor();
 #endif
-}
-
-void governor::auto_terminate(void* tls) {
-    __TBB_ASSERT(get_thread_data_if_initialized() == nullptr ||
-        get_thread_data_if_initialized() == tls, nullptr);
-    if (tls) {
-        thread_data* td = static_cast<thread_data*>(tls);
-
-        auto clear_tls = [td] {
-            td->~thread_data();
-            cache_aligned_deallocate(td);
-            clear_thread_data();
-        };
-
-        // Only external thread can be inside an arena during termination.
-        if (td->my_arena_slot) {
-            arena* a = td->my_arena;
-            threading_control* thr_control = a->my_threading_control;
-
-            // If the TLS slot is already cleared by OS or underlying concurrency
-            // runtime, restore its value to properly clean up arena
-            if (!is_thread_data_set(td)) {
-                set_thread_data(*td);
             }
 
-            a->my_observers.notify_exit_observers(td->my_last_observer, td->my_is_worker);
-
-            td->leave_task_dispatcher();
-            td->my_arena_slot->release();
-            // Release an arena
-            a->on_thread_leaving(arena::ref_external);
-
-            thr_control->unregister_thread(*td);
-
-            // The tls should be cleared before market::release because
-            // market can destroy the tls key if we keep the last reference
-            clear_tls();
-
-            // If there was an associated arena, it added a public market reference
-            thr_control->unregister_public_reference(/* blocking terminate =*/ false);
-        } else {
-            clear_tls();
-        }
-    }
-    __TBB_ASSERT(get_thread_data_if_initialized() == nullptr, nullptr);
-}
-
-void governor::initialize_rml_factory () {
-    ::rml::factory::status_type res = theRMLServerFactory.open();
-    UsePrivateRML = res != ::rml::factory::st_success;
-}
-
-void __TBB_EXPORTED_FUNC get(d1::task_scheduler_handle& handle) {
-    handle.m_ctl = new(allocate_memory(sizeof(global_control))) global_control(global_control::scheduler_handle, 1);
-}
-
-void release_impl(d1::task_scheduler_handle& handle) {
-    if (handle.m_ctl != nullptr) {
-        handle.m_ctl->~global_control();
-        deallocate_memory(handle.m_ctl);
-        handle.m_ctl = nullptr;
-    }
-}
-
-bool finalize_impl(d1::task_scheduler_handle& handle) {
-    __TBB_ASSERT_RELEASE(handle, "trying to finalize with null handle");
-    __TBB_ASSERT(is_present(*handle.m_ctl), "finalize or release was already called on this object");
-
-    bool ok = true; // ok if threading_control does not exist yet
-    if (threading_control::is_present()) {
-        thread_data* td = governor::get_thread_data_if_initialized();
-        if (td) {
-            task_dispatcher* task_disp = td->my_task_dispatcher;
-            __TBB_ASSERT(task_disp, nullptr);
-            if (task_disp->m_properties.outermost && !td->my_is_worker) { // is not inside a parallel region
-                governor::auto_terminate(td);
+            void governor::auto_terminate(void* tls) {
+                __TBB_ASSERT(get_thread_data_if_initialized() == nullptr
+                                     || get_thread_data_if_initialized() == tls,
+                             nullptr);
+                if (tls) {
+                    thread_data* td = static_cast<thread_data*>(tls);
+
+                    auto clear_tls = [td] {
+                        td->~thread_data();
+                        cache_aligned_deallocate(td);
+                        clear_thread_data();
+                    };
+
+                    // Only external thread can be inside an arena during termination.
+                    if (td->my_arena_slot) {
+                        arena* a = td->my_arena;
+                        threading_control* thr_control = a->my_threading_control;
+
+                        // If the TLS slot is already cleared by OS or underlying concurrency
+                        // runtime, restore its value to properly clean up arena
+                        if (!is_thread_data_set(td)) { set_thread_data(*td); }
+
+                        a->my_observers.notify_exit_observers(td->my_last_observer, td->my_is_worker);
+
+                        td->leave_task_dispatcher();
+                        td->my_arena_slot->release();
+                        // Release an arena
+                        a->on_thread_leaving(arena::ref_external);
+
+                        thr_control->unregister_thread(*td);
+
+                        // The tls should be cleared before market::release because
+                        // market can destroy the tls key if we keep the last reference
+                        clear_tls();
+
+                        // If there was an associated arena, it added a public market reference
+                        thr_control->unregister_public_reference(/* blocking terminate =*/false);
+                    } else {
+                        clear_tls();
+                    }
+                }
+                __TBB_ASSERT(get_thread_data_if_initialized() == nullptr, nullptr);
+            }
+
+            void governor::initialize_rml_factory() {
+                ::rml::factory::status_type res = theRMLServerFactory.open();
+                UsePrivateRML = res != ::rml::factory::st_success;
+            }
+
+            void __TBB_EXPORTED_FUNC get(d1::task_scheduler_handle& handle) {
+                handle.m_ctl = new (allocate_memory(sizeof(global_control)))
+                        global_control(global_control::scheduler_handle, 1);
+            }
+
+            void release_impl(d1::task_scheduler_handle& handle) {
+                if (handle.m_ctl != nullptr) {
+                    handle.m_ctl->~global_control();
+                    deallocate_memory(handle.m_ctl);
+                    handle.m_ctl = nullptr;
+                }
+            }
+
+            bool finalize_impl(d1::task_scheduler_handle& handle) {
+                __TBB_ASSERT_RELEASE(handle, "trying to finalize with null handle");
+                __TBB_ASSERT(is_present(*handle.m_ctl),
+                             "finalize or release was already called on this object");
+
+                bool ok = true;// ok if threading_control does not exist yet
+                if (threading_control::is_present()) {
+                    thread_data* td = governor::get_thread_data_if_initialized();
+                    if (td) {
+                        task_dispatcher* task_disp = td->my_task_dispatcher;
+                        __TBB_ASSERT(task_disp, nullptr);
+                        if (task_disp->m_properties.outermost
+                            && !td->my_is_worker) {// is not inside a parallel region
+                            governor::auto_terminate(td);
+                        }
+                    }
+
+                    if (remove_and_check_if_empty(*handle.m_ctl)) {
+                        ok = threading_control::unregister_lifetime_control(/*blocking_terminate*/ true);
+                    } else {
+                        ok = false;
+                    }
+                }
+
+                return ok;
+            }
+
+            bool __TBB_EXPORTED_FUNC finalize(d1::task_scheduler_handle& handle, std::intptr_t mode) {
+                if (mode == d1::release_nothrowing) {
+                    release_impl(handle);
+                    return true;
+                } else {
+                    bool ok = finalize_impl(handle);
+                    // TODO: it is unsafe when finalize is called concurrently and further library unload
+                    release_impl(handle);
+                    if (mode == d1::finalize_throwing && !ok) { throw_exception(exception_id::unsafe_wait); }
+                    return ok;
+                }
             }
-        }
-
-        if (remove_and_check_if_empty(*handle.m_ctl)) {
-            ok = threading_control::unregister_lifetime_control(/*blocking_terminate*/ true);
-        } else {
-            ok = false;
-        }
-    }
-
-    return ok;
-}
-
-bool __TBB_EXPORTED_FUNC finalize(d1::task_scheduler_handle& handle, std::intptr_t mode) {
-    if (mode == d1::release_nothrowing) {
-        release_impl(handle);
-        return true;
-    } else {
-        bool ok = finalize_impl(handle);
-        // TODO: it is unsafe when finalize is called concurrently and further library unload
-        release_impl(handle);
-        if (mode == d1::finalize_throwing && !ok) {
-            throw_exception(exception_id::unsafe_wait);
-        }
-        return ok;
-    }
-}
 
 #if __TBB_ARENA_BINDING
 
@@ -346,68 +344,71 @@ bool __TBB_EXPORTED_FUNC finalize(d1::task_scheduler_handle& handle, std::intptr
 #pragma weak __TBB_internal_restore_affinity
 #pragma weak __TBB_internal_get_default_concurrency
 
-extern "C" {
-void __TBB_internal_initialize_system_topology(
-    size_t groups_num,
-    int& numa_nodes_count, int*& numa_indexes_list,
-    int& core_types_count, int*& core_types_indexes_list
-);
-void __TBB_internal_destroy_system_topology( );
+            extern "C" {
+            void __TBB_internal_initialize_system_topology(size_t groups_num, int& numa_nodes_count,
+                                                           int*& numa_indexes_list, int& core_types_count,
+                                                           int*& core_types_indexes_list);
+            void __TBB_internal_destroy_system_topology();
 
-//TODO: consider renaming to `create_binding_handler` and `destroy_binding_handler`
-binding_handler* __TBB_internal_allocate_binding_handler( int slot_num, int numa_id, int core_type_id, int max_threads_per_core );
-void __TBB_internal_deallocate_binding_handler( binding_handler* handler_ptr );
+            //TODO: consider renaming to `create_binding_handler` and `destroy_binding_handler`
+            binding_handler* __TBB_internal_allocate_binding_handler(int slot_num, int numa_id,
+                                                                     int core_type_id,
+                                                                     int max_threads_per_core);
+            void __TBB_internal_deallocate_binding_handler(binding_handler* handler_ptr);
 
-void __TBB_internal_apply_affinity( binding_handler* handler_ptr, int slot_num );
-void __TBB_internal_restore_affinity( binding_handler* handler_ptr, int slot_num );
+            void __TBB_internal_apply_affinity(binding_handler* handler_ptr, int slot_num);
+            void __TBB_internal_restore_affinity(binding_handler* handler_ptr, int slot_num);
 
-int __TBB_internal_get_default_concurrency( int numa_id, int core_type_id, int max_threads_per_core );
-}
+            int __TBB_internal_get_default_concurrency(int numa_id, int core_type_id,
+                                                       int max_threads_per_core);
+            }
 #endif /* __TBB_WEAK_SYMBOLS_PRESENT */
 
-// Stubs that will be used if TBBbind library is unavailable.
-static void dummy_destroy_system_topology ( ) { }
-static binding_handler* dummy_allocate_binding_handler ( int, int, int, int ) { return nullptr; }
-static void dummy_deallocate_binding_handler ( binding_handler* ) { }
-static void dummy_apply_affinity ( binding_handler*, int ) { }
-static void dummy_restore_affinity ( binding_handler*, int ) { }
-static int dummy_get_default_concurrency( int, int, int ) { return governor::default_num_threads(); }
-
-// Handlers for communication with TBBbind
-static void (*initialize_system_topology_ptr)(
-    size_t groups_num,
-    int& numa_nodes_count, int*& numa_indexes_list,
-    int& core_types_count, int*& core_types_indexes_list
-) = nullptr;
-static void (*destroy_system_topology_ptr)( ) = dummy_destroy_system_topology;
-
-static binding_handler* (*allocate_binding_handler_ptr)( int slot_num, int numa_id, int core_type_id, int max_threads_per_core )
-    = dummy_allocate_binding_handler;
-static void (*deallocate_binding_handler_ptr)( binding_handler* handler_ptr )
-    = dummy_deallocate_binding_handler;
-static void (*apply_affinity_ptr)( binding_handler* handler_ptr, int slot_num )
-    = dummy_apply_affinity;
-static void (*restore_affinity_ptr)( binding_handler* handler_ptr, int slot_num )
-    = dummy_restore_affinity;
-int (*get_default_concurrency_ptr)( int numa_id, int core_type_id, int max_threads_per_core )
-    = dummy_get_default_concurrency;
+            // Stubs that will be used if TBBbind library is unavailable.
+            static void dummy_destroy_system_topology() {}
+            static binding_handler* dummy_allocate_binding_handler(int, int, int, int) { return nullptr; }
+            static void dummy_deallocate_binding_handler(binding_handler*) {}
+            static void dummy_apply_affinity(binding_handler*, int) {}
+            static void dummy_restore_affinity(binding_handler*, int) {}
+            static int dummy_get_default_concurrency(int, int, int) {
+                return governor::default_num_threads();
+            }
+
+            // Handlers for communication with TBBbind
+            static void (*initialize_system_topology_ptr)(size_t groups_num, int& numa_nodes_count,
+                                                          int*& numa_indexes_list, int& core_types_count,
+                                                          int*& core_types_indexes_list)
+                    = nullptr;
+            static void (*destroy_system_topology_ptr)() = dummy_destroy_system_topology;
+
+            static binding_handler* (*allocate_binding_handler_ptr)(int slot_num, int numa_id,
+                                                                    int core_type_id,
+                                                                    int max_threads_per_core)
+                    = dummy_allocate_binding_handler;
+            static void (*deallocate_binding_handler_ptr)(binding_handler* handler_ptr)
+                    = dummy_deallocate_binding_handler;
+            static void (*apply_affinity_ptr)(binding_handler* handler_ptr, int slot_num)
+                    = dummy_apply_affinity;
+            static void (*restore_affinity_ptr)(binding_handler* handler_ptr, int slot_num)
+                    = dummy_restore_affinity;
+            int (*get_default_concurrency_ptr)(int numa_id, int core_type_id, int max_threads_per_core)
+                    = dummy_get_default_concurrency;
 
 #if _WIN32 || _WIN64 || __unix__ || __APPLE__
 
-// Table describing how to link the handlers.
-static const dynamic_link_descriptor TbbBindLinkTable[] = {
-    DLD(__TBB_internal_initialize_system_topology, initialize_system_topology_ptr),
-    DLD(__TBB_internal_destroy_system_topology, destroy_system_topology_ptr),
+            // Table describing how to link the handlers.
+            static const dynamic_link_descriptor TbbBindLinkTable[]
+                    = {DLD(__TBB_internal_initialize_system_topology, initialize_system_topology_ptr),
+                       DLD(__TBB_internal_destroy_system_topology, destroy_system_topology_ptr),
 #if __TBB_CPUBIND_PRESENT
-    DLD(__TBB_internal_allocate_binding_handler, allocate_binding_handler_ptr),
-    DLD(__TBB_internal_deallocate_binding_handler, deallocate_binding_handler_ptr),
-    DLD(__TBB_internal_apply_affinity, apply_affinity_ptr),
-    DLD(__TBB_internal_restore_affinity, restore_affinity_ptr),
+                       DLD(__TBB_internal_allocate_binding_handler, allocate_binding_handler_ptr),
+                       DLD(__TBB_internal_deallocate_binding_handler, deallocate_binding_handler_ptr),
+                       DLD(__TBB_internal_apply_affinity, apply_affinity_ptr),
+                       DLD(__TBB_internal_restore_affinity, restore_affinity_ptr),
 #endif
-    DLD(__TBB_internal_get_default_concurrency, get_default_concurrency_ptr)
-};
+                       DLD(__TBB_internal_get_default_concurrency, get_default_concurrency_ptr)};
 
-static const unsigned LinkTableSize = sizeof(TbbBindLinkTable) / sizeof(dynamic_link_descriptor);
+            static const unsigned LinkTableSize = sizeof(TbbBindLinkTable) / sizeof(dynamic_link_descriptor);
 
 #if TBB_USE_DEBUG
 #define DEBUG_SUFFIX "_debug"
@@ -422,7 +423,7 @@ static const unsigned LinkTableSize = sizeof(TbbBindLinkTable) / sizeof(dynamic_
 #define LIBRARY_EXTENSION __TBB_STRING(.3.dylib)
 #define LIBRARY_PREFIX "lib"
 #elif __unix__
-#define LIBRARY_EXTENSION __TBB_STRING(.so.3)
+#define LIBRARY_EXTENSION __TBB_STRING(.so .3)
 #define LIBRARY_PREFIX "lib"
 #endif /* __unix__ */
 
@@ -432,174 +433,180 @@ static const unsigned LinkTableSize = sizeof(TbbBindLinkTable) / sizeof(dynamic_
 #define TBBBIND_2_5_NAME LIBRARY_PREFIX "tbbbind_2_5" DEBUG_SUFFIX LIBRARY_EXTENSION
 #endif /* _WIN32 || _WIN64 || __unix__ */
 
-// Representation of system hardware topology information on the TBB side.
-// System topology may be initialized by third-party component (e.g. hwloc)
-// or just filled in with default stubs.
-namespace system_topology {
+            // Representation of system hardware topology information on the TBB side.
+            // System topology may be initialized by third-party component (e.g. hwloc)
+            // or just filled in with default stubs.
+            namespace system_topology {
 
-constexpr int automatic = -1;
+                constexpr int automatic = -1;
 
-static std::atomic<do_once_state> initialization_state;
+                static std::atomic<do_once_state> initialization_state;
 
-namespace {
-int  numa_nodes_count = 0;
-int* numa_nodes_indexes = nullptr;
+                namespace {
+                    int numa_nodes_count = 0;
+                    int* numa_nodes_indexes = nullptr;
 
-int  core_types_count = 0;
-int* core_types_indexes = nullptr;
+                    int core_types_count = 0;
+                    int* core_types_indexes = nullptr;
 
-const char* load_tbbbind_shared_object() {
+                    const char* load_tbbbind_shared_object() {
 #if _WIN32 || _WIN64 || __unix__ || __APPLE__
 #if _WIN32 && !_WIN64
-    // For 32-bit Windows applications, process affinity masks can only support up to 32 logical CPUs.
-    SYSTEM_INFO si;
-    GetNativeSystemInfo(&si);
-    if (si.dwNumberOfProcessors > 32) return nullptr;
+                        // For 32-bit Windows applications, process affinity masks can only support up to 32 logical CPUs.
+                        SYSTEM_INFO si;
+                        GetNativeSystemInfo(&si);
+                        if (si.dwNumberOfProcessors > 32) return nullptr;
 #endif /* _WIN32 && !_WIN64 */
-    for (const auto& tbbbind_version : {TBBBIND_2_5_NAME, TBBBIND_2_0_NAME, TBBBIND_NAME}) {
-        if (dynamic_link(tbbbind_version, TbbBindLinkTable, LinkTableSize, nullptr, DYNAMIC_LINK_LOCAL_BINDING)) {
-            return tbbbind_version;
-        }
-    }
+                        for (const auto& tbbbind_version :
+                             {TBBBIND_2_5_NAME, TBBBIND_2_0_NAME, TBBBIND_NAME}) {
+                            if (dynamic_link(tbbbind_version, TbbBindLinkTable, LinkTableSize, nullptr,
+                                             DYNAMIC_LINK_LOCAL_BINDING)) {
+                                return tbbbind_version;
+                            }
+                        }
 #endif /* _WIN32 || _WIN64 || __unix__ || __APPLE__ */
-    return nullptr;
-}
+                        return nullptr;
+                    }
 
-int processor_groups_num() {
+                    int processor_groups_num() {
 #if _WIN32
-    return NumberOfProcessorGroups();
+                        return NumberOfProcessorGroups();
 #else
-    // Stub to improve code readability by reducing number of the compile-time conditions
-    return 1;
+                        // Stub to improve code readability by reducing number of the compile-time conditions
+                        return 1;
 #endif
-}
-} // internal namespace
-
-// Tries to load TBBbind library API, if success, gets NUMA topology information from it,
-// in another case, fills NUMA topology by stubs.
-void initialization_impl() {
-    governor::one_time_init();
-
-    if (const char* tbbbind_name = load_tbbbind_shared_object()) {
-        initialize_system_topology_ptr(
-            processor_groups_num(),
-            numa_nodes_count, numa_nodes_indexes,
-            core_types_count, core_types_indexes
-        );
-
-        PrintExtraVersionInfo("TBBBIND", tbbbind_name);
-        return;
-    }
-
-    static int dummy_index = automatic;
-
-    numa_nodes_count = 1;
-    numa_nodes_indexes = &dummy_index;
-
-    core_types_count = 1;
-    core_types_indexes = &dummy_index;
-
-    PrintExtraVersionInfo("TBBBIND", "UNAVAILABLE");
-}
-
-void initialize() {
-    atomic_do_once(initialization_impl, initialization_state);
-}
-
-void destroy() {
-    destroy_system_topology_ptr();
-}
-} // namespace system_topology
-
-binding_handler* construct_binding_handler(int slot_num, int numa_id, int core_type_id, int max_threads_per_core) {
-    system_topology::initialize();
-    return allocate_binding_handler_ptr(slot_num, numa_id, core_type_id, max_threads_per_core);
-}
-
-void destroy_binding_handler(binding_handler* handler_ptr) {
-    __TBB_ASSERT(deallocate_binding_handler_ptr, "tbbbind loading was not performed");
-    deallocate_binding_handler_ptr(handler_ptr);
-}
-
-void apply_affinity_mask(binding_handler* handler_ptr, int slot_index) {
-    __TBB_ASSERT(slot_index >= 0, "Negative thread index");
-    __TBB_ASSERT(apply_affinity_ptr, "tbbbind loading was not performed");
-    apply_affinity_ptr(handler_ptr, slot_index);
-}
-
-void restore_affinity_mask(binding_handler* handler_ptr, int slot_index) {
-    __TBB_ASSERT(slot_index >= 0, "Negative thread index");
-    __TBB_ASSERT(restore_affinity_ptr, "tbbbind loading was not performed");
-    restore_affinity_ptr(handler_ptr, slot_index);
-}
-
-unsigned __TBB_EXPORTED_FUNC numa_node_count() {
-    system_topology::initialize();
-    return system_topology::numa_nodes_count;
-}
-
-void __TBB_EXPORTED_FUNC fill_numa_indices(int* index_array) {
-    system_topology::initialize();
-    std::memcpy(index_array, system_topology::numa_nodes_indexes, system_topology::numa_nodes_count * sizeof(int));
-}
-
-int __TBB_EXPORTED_FUNC numa_default_concurrency(int node_id) {
-    if (node_id >= 0) {
-        system_topology::initialize();
-        int result = get_default_concurrency_ptr(
-            node_id,
-            /*core_type*/system_topology::automatic,
-            /*threads_per_core*/system_topology::automatic
-        );
-        if (result > 0) return result;
-    }
-    return governor::default_num_threads();
-}
-
-unsigned __TBB_EXPORTED_FUNC core_type_count(intptr_t /*reserved*/) {
-    system_topology::initialize();
-    return system_topology::core_types_count;
-}
-
-void __TBB_EXPORTED_FUNC fill_core_type_indices(int* index_array, intptr_t /*reserved*/) {
-    system_topology::initialize();
-    std::memcpy(index_array, system_topology::core_types_indexes, system_topology::core_types_count * sizeof(int));
-}
-
-void constraints_assertion(d1::constraints c) {
-    bool is_topology_initialized = system_topology::initialization_state == do_once_state::initialized;
-    __TBB_ASSERT_RELEASE(c.max_threads_per_core == system_topology::automatic || c.max_threads_per_core > 0,
-        "Wrong max_threads_per_core constraints field value.");
-
-    auto numa_nodes_begin = system_topology::numa_nodes_indexes;
-    auto numa_nodes_end = system_topology::numa_nodes_indexes + system_topology::numa_nodes_count;
-    __TBB_ASSERT_RELEASE(
-        c.numa_id == system_topology::automatic ||
-        (is_topology_initialized && std::find(numa_nodes_begin, numa_nodes_end, c.numa_id) != numa_nodes_end),
-        "The constraints::numa_id value is not known to the library. Use tbb::info::numa_nodes() to get the list of possible values.");
-
-    int* core_types_begin = system_topology::core_types_indexes;
-    int* core_types_end = system_topology::core_types_indexes + system_topology::core_types_count;
-    __TBB_ASSERT_RELEASE(c.core_type == system_topology::automatic ||
-        (is_topology_initialized && std::find(core_types_begin, core_types_end, c.core_type) != core_types_end),
-        "The constraints::core_type value is not known to the library. Use tbb::info::core_types() to get the list of possible values.");
-}
-
-int __TBB_EXPORTED_FUNC constraints_default_concurrency(const d1::constraints& c, intptr_t /*reserved*/) {
-    constraints_assertion(c);
-
-    if (c.numa_id >= 0 || c.core_type >= 0 || c.max_threads_per_core > 0) {
-        system_topology::initialize();
-        return get_default_concurrency_ptr(c.numa_id, c.core_type, c.max_threads_per_core);
-    }
-    return governor::default_num_threads();
-}
-
-int __TBB_EXPORTED_FUNC constraints_threads_per_core(const d1::constraints&, intptr_t /*reserved*/) {
-    return system_topology::automatic;
-}
+                    }
+                }// namespace
+
+                // Tries to load TBBbind library API, if success, gets NUMA topology information from it,
+                // in another case, fills NUMA topology by stubs.
+                void initialization_impl() {
+                    governor::one_time_init();
+
+                    if (const char* tbbbind_name = load_tbbbind_shared_object()) {
+                        initialize_system_topology_ptr(processor_groups_num(), numa_nodes_count,
+                                                       numa_nodes_indexes, core_types_count,
+                                                       core_types_indexes);
+
+                        PrintExtraVersionInfo("TBBBIND", tbbbind_name);
+                        return;
+                    }
+
+                    static int dummy_index = automatic;
+
+                    numa_nodes_count = 1;
+                    numa_nodes_indexes = &dummy_index;
+
+                    core_types_count = 1;
+                    core_types_indexes = &dummy_index;
+
+                    PrintExtraVersionInfo("TBBBIND", "UNAVAILABLE");
+                }
+
+                void initialize() { atomic_do_once(initialization_impl, initialization_state); }
+
+                void destroy() { destroy_system_topology_ptr(); }
+            }// namespace system_topology
+
+            binding_handler* construct_binding_handler(int slot_num, int numa_id, int core_type_id,
+                                                       int max_threads_per_core) {
+                system_topology::initialize();
+                return allocate_binding_handler_ptr(slot_num, numa_id, core_type_id, max_threads_per_core);
+            }
+
+            void destroy_binding_handler(binding_handler* handler_ptr) {
+                __TBB_ASSERT(deallocate_binding_handler_ptr, "tbbbind loading was not performed");
+                deallocate_binding_handler_ptr(handler_ptr);
+            }
+
+            void apply_affinity_mask(binding_handler* handler_ptr, int slot_index) {
+                __TBB_ASSERT(slot_index >= 0, "Negative thread index");
+                __TBB_ASSERT(apply_affinity_ptr, "tbbbind loading was not performed");
+                apply_affinity_ptr(handler_ptr, slot_index);
+            }
+
+            void restore_affinity_mask(binding_handler* handler_ptr, int slot_index) {
+                __TBB_ASSERT(slot_index >= 0, "Negative thread index");
+                __TBB_ASSERT(restore_affinity_ptr, "tbbbind loading was not performed");
+                restore_affinity_ptr(handler_ptr, slot_index);
+            }
+
+            unsigned __TBB_EXPORTED_FUNC numa_node_count() {
+                system_topology::initialize();
+                return system_topology::numa_nodes_count;
+            }
+
+            void __TBB_EXPORTED_FUNC fill_numa_indices(int* index_array) {
+                system_topology::initialize();
+                std::memcpy(index_array, system_topology::numa_nodes_indexes,
+                            system_topology::numa_nodes_count * sizeof(int));
+            }
+
+            int __TBB_EXPORTED_FUNC numa_default_concurrency(int node_id) {
+                if (node_id >= 0) {
+                    system_topology::initialize();
+                    int result = get_default_concurrency_ptr(node_id,
+                                                             /*core_type*/ system_topology::automatic,
+                                                             /*threads_per_core*/ system_topology::automatic);
+                    if (result > 0) return result;
+                }
+                return governor::default_num_threads();
+            }
+
+            unsigned __TBB_EXPORTED_FUNC core_type_count(intptr_t /*reserved*/) {
+                system_topology::initialize();
+                return system_topology::core_types_count;
+            }
+
+            void __TBB_EXPORTED_FUNC fill_core_type_indices(int* index_array, intptr_t /*reserved*/) {
+                system_topology::initialize();
+                std::memcpy(index_array, system_topology::core_types_indexes,
+                            system_topology::core_types_count * sizeof(int));
+            }
+
+            void constraints_assertion(d1::constraints c) {
+                bool is_topology_initialized
+                        = system_topology::initialization_state == do_once_state::initialized;
+                __TBB_ASSERT_RELEASE(c.max_threads_per_core == system_topology::automatic
+                                             || c.max_threads_per_core > 0,
+                                     "Wrong max_threads_per_core constraints field value.");
+
+                auto numa_nodes_begin = system_topology::numa_nodes_indexes;
+                auto numa_nodes_end = system_topology::numa_nodes_indexes + system_topology::numa_nodes_count;
+                __TBB_ASSERT_RELEASE(c.numa_id == system_topology::automatic
+                                             || (is_topology_initialized
+                                                 && std::find(numa_nodes_begin, numa_nodes_end, c.numa_id)
+                                                            != numa_nodes_end),
+                                     "The constraints::numa_id value is not known to the library. Use "
+                                     "tbb::info::numa_nodes() to get the list of possible values.");
+
+                int* core_types_begin = system_topology::core_types_indexes;
+                int* core_types_end = system_topology::core_types_indexes + system_topology::core_types_count;
+                __TBB_ASSERT_RELEASE(c.core_type == system_topology::automatic
+                                             || (is_topology_initialized
+                                                 && std::find(core_types_begin, core_types_end, c.core_type)
+                                                            != core_types_end),
+                                     "The constraints::core_type value is not known to the library. Use "
+                                     "tbb::info::core_types() to get the list of possible values.");
+            }
+
+            int __TBB_EXPORTED_FUNC constraints_default_concurrency(const d1::constraints& c,
+                                                                    intptr_t /*reserved*/) {
+                constraints_assertion(c);
+
+                if (c.numa_id >= 0 || c.core_type >= 0 || c.max_threads_per_core > 0) {
+                    system_topology::initialize();
+                    return get_default_concurrency_ptr(c.numa_id, c.core_type, c.max_threads_per_core);
+                }
+                return governor::default_num_threads();
+            }
+
+            int __TBB_EXPORTED_FUNC constraints_threads_per_core(const d1::constraints&,
+                                                                 intptr_t /*reserved*/) {
+                return system_topology::automatic;
+            }
 #endif /* __TBB_ARENA_BINDING */
 
-} // namespace r1
-} // namespace detail
-} // namespace tbb
+        }// namespace r1
+    }    // namespace detail
+}// namespace tbb
diff --git a/external/tbb/src/tbb/itt_notify.cpp b/external/tbb/src/tbb/itt_notify.cpp
index eda5e6ad..30711dbf 100644
--- a/external/tbb/src/tbb/itt_notify.cpp
+++ b/external/tbb/src/tbb/itt_notify.cpp
@@ -16,54 +16,52 @@
 
 #if __TBB_USE_ITT_NOTIFY
 
-#if _WIN32||_WIN64
-    #ifndef UNICODE
-        #define UNICODE
-    #endif
+#if _WIN32 || _WIN64
+#ifndef UNICODE
+#define UNICODE
+#endif
 #else
-    #pragma weak dlopen
-    #pragma weak dlsym
-    #pragma weak dlerror
+#pragma weak dlopen
+#pragma weak dlsym
+#pragma weak dlerror
 #endif /* WIN */
 
 #if __TBB_BUILD
 
 extern "C" void ITT_DoOneTimeInitialization();
-#define __itt_init_ittlib_name(x,y) (ITT_DoOneTimeInitialization(), true)
+#define __itt_init_ittlib_name(x, y) (ITT_DoOneTimeInitialization(), true)
 
 #elif __TBBMALLOC_BUILD
 
 extern "C" void MallocInitializeITT();
-#define __itt_init_ittlib_name(x,y) (MallocInitializeITT(), true)
+#define __itt_init_ittlib_name(x, y) (MallocInitializeITT(), true)
 
 #else
 #error This file is expected to be used for either TBB or TBB allocator build.
-#endif // __TBB_BUILD
+#endif// __TBB_BUILD
 
 #include "tools_api/ittnotify_static.c"
 
 namespace tbb {
-namespace detail {
-namespace r1 {
+    namespace detail {
+        namespace r1 {
 
-/** This extra proxy method is necessary since __itt_init_lib is declared as static **/
-int __TBB_load_ittnotify() {
-#if !(_WIN32||_WIN64)
-    // tool_api crashes without dlopen, check that it's present. Common case
-    // for lack of dlopen is static binaries, i.e. ones build with -static.
-    if (dlopen == nullptr)
-        return 0;
+            /** This extra proxy method is necessary since __itt_init_lib is declared as static **/
+            int __TBB_load_ittnotify() {
+#if !(_WIN32 || _WIN64)
+                // tool_api crashes without dlopen, check that it's present. Common case
+                // for lack of dlopen is static binaries, i.e. ones build with -static.
+                if (dlopen == nullptr) return 0;
 #endif
-    return __itt_init_ittlib(nullptr,       // groups for:
-      (__itt_group_id)(__itt_group_sync     // prepare/cancel/acquired/releasing
-                       | __itt_group_thread // name threads
-                       | __itt_group_stitch // stack stitching
-                       | __itt_group_structure
-                           ));
-}
+                return __itt_init_ittlib(nullptr,                         // groups for:
+                                         (__itt_group_id)(__itt_group_sync// prepare/cancel/acquired/releasing
+                                                          | __itt_group_thread// name threads
+                                                          | __itt_group_stitch// stack stitching
+                                                          | __itt_group_structure));
+            }
 
-} //namespace r1
-} //namespace detail
-} // namespace tbb
+        }//namespace r1
+    }    //namespace detail
+}// namespace tbb
 
 #endif /* __TBB_USE_ITT_NOTIFY */
diff --git a/external/tbb/src/tbb/main.cpp b/external/tbb/src/tbb/main.cpp
index f43c33f5..3ff94228 100644
--- a/external/tbb/src/tbb/main.cpp
+++ b/external/tbb/src/tbb/main.cpp
@@ -16,146 +16,146 @@
 
 #include "oneapi/tbb/detail/_config.h"
 
-#include "main.h"
-#include "governor.h"
-#include "threading_control.h"
 #include "environment.h"
+#include "governor.h"
+#include "itt_notify.h"
+#include "main.h"
 #include "market.h"
-#include "tcm_adaptor.h"
 #include "misc.h"
-#include "itt_notify.h"
+#include "tcm_adaptor.h"
+#include "threading_control.h"
 
 namespace tbb {
-namespace detail {
-namespace r1 {
+    namespace detail {
+        namespace r1 {
 
-//------------------------------------------------------------------------
-// Begin shared data layout.
-// The following global data items are mostly read-only after initialization.
-//------------------------------------------------------------------------
+            //------------------------------------------------------------------------
+            // Begin shared data layout.
+            // The following global data items are mostly read-only after initialization.
+            //------------------------------------------------------------------------
 
-//------------------------------------------------------------------------
-// governor data
-basic_tls<thread_data*> governor::theTLS;
-rml::tbb_factory governor::theRMLServerFactory;
-bool governor::UsePrivateRML;
-bool governor::is_rethrow_broken;
+            //------------------------------------------------------------------------
+            // governor data
+            basic_tls<thread_data*> governor::theTLS;
+            rml::tbb_factory governor::theRMLServerFactory;
+            bool governor::UsePrivateRML;
+            bool governor::is_rethrow_broken;
 
-//------------------------------------------------------------------------
-// threading_control data
-threading_control* threading_control::g_threading_control;
-threading_control::global_mutex_type threading_control::g_threading_control_mutex;
+            //------------------------------------------------------------------------
+            // threading_control data
+            threading_control* threading_control::g_threading_control;
+            threading_control::global_mutex_type threading_control::g_threading_control_mutex;
 
-//------------------------------------------------------------------------
-// context propagation data
-context_state_propagation_mutex_type the_context_state_propagation_mutex;
-std::atomic<uintptr_t> the_context_state_propagation_epoch{};
+            //------------------------------------------------------------------------
+            // context propagation data
+            context_state_propagation_mutex_type the_context_state_propagation_mutex;
+            std::atomic<uintptr_t> the_context_state_propagation_epoch {};
 
-//------------------------------------------------------------------------
-// One time initialization data
+            //------------------------------------------------------------------------
+            // One time initialization data
 
-//! Counter of references to global shared resources such as TLS.
-std::atomic<int> __TBB_InitOnce::count{};
+            //! Counter of references to global shared resources such as TLS.
+            std::atomic<int> __TBB_InitOnce::count {};
 
-std::atomic_flag __TBB_InitOnce::InitializationLock = ATOMIC_FLAG_INIT;
+            std::atomic_flag __TBB_InitOnce::InitializationLock = ATOMIC_FLAG_INIT;
 
-//! Flag that is set to true after one-time initializations are done.
-std::atomic<bool> __TBB_InitOnce::InitializationDone{};
+            //! Flag that is set to true after one-time initializations are done.
+            std::atomic<bool> __TBB_InitOnce::InitializationDone {};
 
 #if __TBB_USE_ITT_NOTIFY
-//! Defined in profiling.cpp
-extern bool ITT_Present;
-void ITT_DoUnsafeOneTimeInitialization();
+            //! Defined in profiling.cpp
+            extern bool ITT_Present;
+            void ITT_DoUnsafeOneTimeInitialization();
 #endif
 
-#if !(_WIN32||_WIN64) || __TBB_SOURCE_DIRECTLY_INCLUDED
-static __TBB_InitOnce __TBB_InitOnceHiddenInstance;
+#if !(_WIN32 || _WIN64) || __TBB_SOURCE_DIRECTLY_INCLUDED
+            static __TBB_InitOnce __TBB_InitOnceHiddenInstance;
 #endif
 
-//------------------------------------------------------------------------
-// __TBB_InitOnce
-//------------------------------------------------------------------------
-
-void __TBB_InitOnce::add_ref() {
-    if (++count == 1) {
-        governor::acquire_resources();
-        tcm_adaptor::initialize();
-    }
-}
-
-void __TBB_InitOnce::remove_ref() {
-    int k = --count;
-    __TBB_ASSERT(k>=0,"removed __TBB_InitOnce ref that was not added?");
-    if( k==0 ) {
-        governor::release_resources();
-        ITT_FINI_ITTLIB();
-        ITT_RELEASE_RESOURCES();
-    }
-}
-
-//------------------------------------------------------------------------
-// One-time Initializations
-//------------------------------------------------------------------------
-
-//! Defined in cache_aligned_allocator.cpp
-void initialize_cache_aligned_allocator();
-
-//! Performs thread-safe lazy one-time general TBB initialization.
-void DoOneTimeInitialization() {
-    __TBB_InitOnce::lock();
-    // No fence required for load of InitializationDone, because we are inside a critical section.
-    if( !__TBB_InitOnce::InitializationDone ) {
-        __TBB_InitOnce::add_ref();
-        if( GetBoolEnvironmentVariable("TBB_VERSION") ) {
-            PrintVersion();
-            tcm_adaptor::print_version();
-        }
-        bool itt_present = false;
+            //------------------------------------------------------------------------
+            // __TBB_InitOnce
+            //------------------------------------------------------------------------
+
+            void __TBB_InitOnce::add_ref() {
+                if (++count == 1) {
+                    governor::acquire_resources();
+                    tcm_adaptor::initialize();
+                }
+            }
+
+            void __TBB_InitOnce::remove_ref() {
+                int k = --count;
+                __TBB_ASSERT(k >= 0, "removed __TBB_InitOnce ref that was not added?");
+                if (k == 0) {
+                    governor::release_resources();
+                    ITT_FINI_ITTLIB();
+                    ITT_RELEASE_RESOURCES();
+                }
+            }
+
+            //------------------------------------------------------------------------
+            // One-time Initializations
+            //------------------------------------------------------------------------
+
+            //! Defined in cache_aligned_allocator.cpp
+            void initialize_cache_aligned_allocator();
+
+            //! Performs thread-safe lazy one-time general TBB initialization.
+            void DoOneTimeInitialization() {
+                __TBB_InitOnce::lock();
+                // No fence required for load of InitializationDone, because we are inside a critical section.
+                if (!__TBB_InitOnce::InitializationDone) {
+                    __TBB_InitOnce::add_ref();
+                    if (GetBoolEnvironmentVariable("TBB_VERSION")) {
+                        PrintVersion();
+                        tcm_adaptor::print_version();
+                    }
+                    bool itt_present = false;
 #if __TBB_USE_ITT_NOTIFY
-        ITT_DoUnsafeOneTimeInitialization();
-        itt_present = ITT_Present;
+                    ITT_DoUnsafeOneTimeInitialization();
+                    itt_present = ITT_Present;
 #endif /* __TBB_USE_ITT_NOTIFY */
-        initialize_cache_aligned_allocator();
-        governor::initialize_rml_factory();
-        // Force processor groups support detection
-        governor::default_num_threads();
-        // Force OS regular page size detection
-        governor::default_page_size();
-        PrintExtraVersionInfo( "TOOLS SUPPORT", itt_present ? "enabled" : "disabled" );
-        __TBB_InitOnce::InitializationDone = true;
-    }
-    __TBB_InitOnce::unlock();
-}
-
-#if (_WIN32||_WIN64) && !__TBB_SOURCE_DIRECTLY_INCLUDED
-//! Windows "DllMain" that handles startup and shutdown of dynamic library.
-extern "C" bool WINAPI DllMain( HANDLE /*hinstDLL*/, DWORD reason, LPVOID lpvReserved ) {
-    switch( reason ) {
-        case DLL_PROCESS_ATTACH:
-            __TBB_InitOnce::add_ref();
-            break;
-        case DLL_PROCESS_DETACH:
-            // Since THREAD_DETACH is not called for the main thread, call auto-termination
-            // here as well - but not during process shutdown (due to risk of a deadlock).
-            if ( lpvReserved == nullptr ) { // library unload
-                governor::terminate_external_thread();
+                    initialize_cache_aligned_allocator();
+                    governor::initialize_rml_factory();
+                    // Force processor groups support detection
+                    governor::default_num_threads();
+                    // Force OS regular page size detection
+                    governor::default_page_size();
+                    PrintExtraVersionInfo("TOOLS SUPPORT", itt_present ? "enabled" : "disabled");
+                    __TBB_InitOnce::InitializationDone = true;
+                }
+                __TBB_InitOnce::unlock();
             }
-            __TBB_InitOnce::remove_ref();
-            // It is assumed that InitializationDone is not set after DLL_PROCESS_DETACH,
-            // and thus no race on InitializationDone is possible.
-            if ( __TBB_InitOnce::initialization_done() ) {
-                // Remove reference that we added in DoOneTimeInitialization.
-                __TBB_InitOnce::remove_ref();
+
+#if (_WIN32 || _WIN64) && !__TBB_SOURCE_DIRECTLY_INCLUDED
+            //! Windows "DllMain" that handles startup and shutdown of dynamic library.
+            extern "C" bool WINAPI DllMain(HANDLE /*hinstDLL*/, DWORD reason, LPVOID lpvReserved) {
+                switch (reason) {
+                    case DLL_PROCESS_ATTACH:
+                        __TBB_InitOnce::add_ref();
+                        break;
+                    case DLL_PROCESS_DETACH:
+                        // Since THREAD_DETACH is not called for the main thread, call auto-termination
+                        // here as well - but not during process shutdown (due to risk of a deadlock).
+                        if (lpvReserved == nullptr) {// library unload
+                            governor::terminate_external_thread();
+                        }
+                        __TBB_InitOnce::remove_ref();
+                        // It is assumed that InitializationDone is not set after DLL_PROCESS_DETACH,
+                        // and thus no race on InitializationDone is possible.
+                        if (__TBB_InitOnce::initialization_done()) {
+                            // Remove reference that we added in DoOneTimeInitialization.
+                            __TBB_InitOnce::remove_ref();
+                        }
+                        break;
+                    case DLL_THREAD_DETACH:
+                        governor::terminate_external_thread();
+                        break;
+                }
+                return true;
             }
-            break;
-        case DLL_THREAD_DETACH:
-            governor::terminate_external_thread();
-            break;
-    }
-    return true;
-}
 #endif /* (_WIN32||_WIN64) && !__TBB_SOURCE_DIRECTLY_INCLUDED */
 
-} // namespace r1
-} // namespace detail
-} // namespace tbb
+        }// namespace r1
+    }    // namespace detail
+}// namespace tbb
diff --git a/external/tbb/src/tbb/market.cpp b/external/tbb/src/tbb/market.cpp
index ae3fadd4..5cdc94f2 100644
--- a/external/tbb/src/tbb/market.cpp
+++ b/external/tbb/src/tbb/market.cpp
@@ -14,130 +14,126 @@
     limitations under the License.
 */
 
-#include "arena.h"
 #include "market.h"
+#include "arena.h"
 
-#include <algorithm> // std::find
+#include <algorithm>// std::find
 
 namespace tbb {
-namespace detail {
-namespace r1 {
-
-
-class tbb_permit_manager_client : public pm_client {
-public:
-    tbb_permit_manager_client(arena& a) : pm_client(a) {}
-
-    void register_thread() override {}
-
-    void unregister_thread() override {}
-
-    void set_allotment(unsigned allotment) {
-        my_arena.set_allotment(allotment);
-    }
-};
-
-//------------------------------------------------------------------------
-// market
-//------------------------------------------------------------------------
-
-market::market(unsigned workers_soft_limit)
-    : my_num_workers_soft_limit(workers_soft_limit)
-{}
-
-pm_client* market::create_client(arena& a) {
-    return new (cache_aligned_allocate(sizeof(tbb_permit_manager_client))) tbb_permit_manager_client(a);
-}
-
-void market::register_client(pm_client* c, d1::constraints&) {
-    mutex_type::scoped_lock lock(my_mutex);
-    my_clients[c->priority_level()].push_back(c);
-}
-
-void market::unregister_and_destroy_client(pm_client& c) {
-    {
-        mutex_type::scoped_lock lock(my_mutex);
-        auto& clients = my_clients[c.priority_level()];
-        auto it = std::find(clients.begin(), clients.end(), &c);
-        __TBB_ASSERT(it != clients.end(), "Destroying of an unregistered client");
-        clients.erase(it);
-    }
-
-    auto client = static_cast<tbb_permit_manager_client*>(&c);
-    client->~tbb_permit_manager_client();
-    cache_aligned_deallocate(client);
-}
-
-void market::update_allotment() {
-    int effective_soft_limit = my_mandatory_num_requested > 0 && my_num_workers_soft_limit == 0 ? 1 : my_num_workers_soft_limit;
-    int max_workers = min(my_total_demand, effective_soft_limit);
-    __TBB_ASSERT(max_workers >= 0, nullptr);
-
-    int unassigned_workers = max_workers;
-    int assigned = 0;
-    int carry = 0;
-    unsigned max_priority_level = num_priority_levels;
-    for (unsigned list_idx = 0; list_idx < num_priority_levels; ++list_idx ) {
-        int assigned_per_priority = min(my_priority_level_demand[list_idx], unassigned_workers);
-        unassigned_workers -= assigned_per_priority;
-        // We use reverse iterator there to serve last added clients first
-        for (auto it = my_clients[list_idx].rbegin(); it != my_clients[list_idx].rend(); ++it) {
-            tbb_permit_manager_client& client = static_cast<tbb_permit_manager_client&>(**it);
-            if (client.max_workers() == 0) {
-                client.set_allotment(0);
-                continue;
+    namespace detail {
+        namespace r1 {
+
+            class tbb_permit_manager_client : public pm_client {
+            public:
+                tbb_permit_manager_client(arena& a) : pm_client(a) {}
+
+                void register_thread() override {}
+
+                void unregister_thread() override {}
+
+                void set_allotment(unsigned allotment) { my_arena.set_allotment(allotment); }
+            };
+
+            //------------------------------------------------------------------------
+            // market
+            //------------------------------------------------------------------------
+
+            market::market(unsigned workers_soft_limit) : my_num_workers_soft_limit(workers_soft_limit) {}
+
+            pm_client* market::create_client(arena& a) {
+                return new (cache_aligned_allocate(sizeof(tbb_permit_manager_client)))
+                        tbb_permit_manager_client(a);
+            }
+
+            void market::register_client(pm_client* c, d1::constraints&) {
+                mutex_type::scoped_lock lock(my_mutex);
+                my_clients[c->priority_level()].push_back(c);
+            }
+
+            void market::unregister_and_destroy_client(pm_client& c) {
+                {
+                    mutex_type::scoped_lock lock(my_mutex);
+                    auto& clients = my_clients[c.priority_level()];
+                    auto it = std::find(clients.begin(), clients.end(), &c);
+                    __TBB_ASSERT(it != clients.end(), "Destroying of an unregistered client");
+                    clients.erase(it);
+                }
+
+                auto client = static_cast<tbb_permit_manager_client*>(&c);
+                client->~tbb_permit_manager_client();
+                cache_aligned_deallocate(client);
+            }
+
+            void market::update_allotment() {
+                int effective_soft_limit = my_mandatory_num_requested > 0 && my_num_workers_soft_limit == 0
+                                                   ? 1
+                                                   : my_num_workers_soft_limit;
+                int max_workers = min(my_total_demand, effective_soft_limit);
+                __TBB_ASSERT(max_workers >= 0, nullptr);
+
+                int unassigned_workers = max_workers;
+                int assigned = 0;
+                int carry = 0;
+                unsigned max_priority_level = num_priority_levels;
+                for (unsigned list_idx = 0; list_idx < num_priority_levels; ++list_idx) {
+                    int assigned_per_priority = min(my_priority_level_demand[list_idx], unassigned_workers);
+                    unassigned_workers -= assigned_per_priority;
+                    // We use reverse iterator there to serve last added clients first
+                    for (auto it = my_clients[list_idx].rbegin(); it != my_clients[list_idx].rend(); ++it) {
+                        tbb_permit_manager_client& client = static_cast<tbb_permit_manager_client&>(**it);
+                        if (client.max_workers() == 0) {
+                            client.set_allotment(0);
+                            continue;
+                        }
+
+                        if (max_priority_level == num_priority_levels) { max_priority_level = list_idx; }
+
+                        int allotted = 0;
+                        if (my_num_workers_soft_limit == 0) {
+                            __TBB_ASSERT(max_workers == 0 || max_workers == 1, nullptr);
+                            allotted = client.min_workers() > 0 && assigned < max_workers ? 1 : 0;
+                        } else {
+                            int tmp = client.max_workers() * assigned_per_priority + carry;
+                            allotted = tmp / my_priority_level_demand[list_idx];
+                            carry = tmp % my_priority_level_demand[list_idx];
+                            __TBB_ASSERT(allotted <= client.max_workers(), nullptr);
+                        }
+                        client.set_allotment(allotted);
+                        client.set_top_priority(list_idx == max_priority_level);
+                        assigned += allotted;
+                    }
+                }
+                __TBB_ASSERT(assigned == max_workers, nullptr);
             }
 
-            if (max_priority_level == num_priority_levels) {
-                max_priority_level = list_idx;
+            void market::set_active_num_workers(int soft_limit) {
+                mutex_type::scoped_lock lock(my_mutex);
+                if (my_num_workers_soft_limit != soft_limit) {
+                    my_num_workers_soft_limit = soft_limit;
+                    update_allotment();
+                }
             }
 
-            int allotted = 0;
-            if (my_num_workers_soft_limit == 0) {
-                __TBB_ASSERT(max_workers == 0 || max_workers == 1, nullptr);
-                allotted = client.min_workers() > 0 && assigned < max_workers ? 1 : 0;
-            } else {
-                int tmp = client.max_workers() * assigned_per_priority + carry;
-                allotted = tmp / my_priority_level_demand[list_idx];
-                carry = tmp % my_priority_level_demand[list_idx];
-                __TBB_ASSERT(allotted <= client.max_workers(), nullptr);
+            void market::adjust_demand(pm_client& c, int mandatory_delta, int workers_delta) {
+                __TBB_ASSERT(-1 <= mandatory_delta && mandatory_delta <= 1, nullptr);
+
+                int delta {};
+                {
+                    mutex_type::scoped_lock lock(my_mutex);
+                    // Update client's state
+                    delta = c.update_request(mandatory_delta, workers_delta);
+
+                    // Update market's state
+                    my_total_demand += delta;
+                    my_priority_level_demand[c.priority_level()] += delta;
+                    my_mandatory_num_requested += mandatory_delta;
+
+                    update_allotment();
+                }
+
+                notify_thread_request(delta);
             }
-            client.set_allotment(allotted);
-            client.set_top_priority(list_idx == max_priority_level);
-            assigned += allotted;
-        }
-    }
-    __TBB_ASSERT(assigned == max_workers, nullptr);
-}
-
-void market::set_active_num_workers(int soft_limit) {
-    mutex_type::scoped_lock lock(my_mutex);
-    if (my_num_workers_soft_limit != soft_limit) {
-        my_num_workers_soft_limit = soft_limit;
-        update_allotment();
-    }
-}
-
-void market::adjust_demand(pm_client& c, int mandatory_delta, int workers_delta) {
-    __TBB_ASSERT(-1 <= mandatory_delta && mandatory_delta <= 1, nullptr);
-
-    int delta{};
-    {
-        mutex_type::scoped_lock lock(my_mutex);
-        // Update client's state
-        delta = c.update_request(mandatory_delta, workers_delta);
-
-        // Update market's state
-        my_total_demand += delta;
-        my_priority_level_demand[c.priority_level()] += delta;
-        my_mandatory_num_requested += mandatory_delta;
-
-        update_allotment();
-    }
-
-    notify_thread_request(delta);
-}
-
-} // namespace r1
-} // namespace detail
-} // namespace tbb
+
+        }// namespace r1
+    }    // namespace detail
+}// namespace tbb
diff --git a/external/tbb/src/tbb/misc.cpp b/external/tbb/src/tbb/misc.cpp
index 115a5f38..92cfaf36 100644
--- a/external/tbb/src/tbb/misc.cpp
+++ b/external/tbb/src/tbb/misc.cpp
@@ -22,135 +22,136 @@
 
 #include "oneapi/tbb/version.h"
 
-#include "misc.h"
-#include "governor.h"
-#include "assert_impl.h" // Out-of-line TBB assertion handling routines are instantiated here.
+#include "assert_impl.h"// Out-of-line TBB assertion handling routines are instantiated here.
 #include "concurrent_monitor_mutex.h"
+#include "governor.h"
+#include "misc.h"
 
+#include <cstdarg>
 #include <cstdio>
 #include <cstdlib>
-#include <stdexcept>
 #include <cstring>
-#include <cstdarg>
+#include <stdexcept>
 
-#if _WIN32||_WIN64
+#if _WIN32 || _WIN64
 #include <windows.h>
 #endif
 
 #if !_WIN32
-#include <unistd.h> // sysconf(_SC_PAGESIZE)
+#include <unistd.h>// sysconf(_SC_PAGESIZE)
 #endif
 
 namespace tbb {
-namespace detail {
-namespace r1 {
+    namespace detail {
+        namespace r1 {
 
-//------------------------------------------------------------------------
-// governor data
-//------------------------------------------------------------------------
-cpu_features_type governor::cpu_features;
+            //------------------------------------------------------------------------
+            // governor data
+            //------------------------------------------------------------------------
+            cpu_features_type governor::cpu_features;
 
 //------------------------------------------------------------------------
 // concurrent_monitor_mutex data
 //------------------------------------------------------------------------
 #if !__TBB_USE_FUTEX
-std::mutex concurrent_monitor_mutex::my_init_mutex;
+            std::mutex concurrent_monitor_mutex::my_init_mutex;
 #endif
 
-
-size_t DefaultSystemPageSize() {
+            size_t DefaultSystemPageSize() {
 #if _WIN32
-    SYSTEM_INFO si;
-    GetSystemInfo(&si);
-    return si.dwPageSize;
+                SYSTEM_INFO si;
+                GetSystemInfo(&si);
+                return si.dwPageSize;
 #else
-    return sysconf(_SC_PAGESIZE);
+                return sysconf(_SC_PAGESIZE);
 #endif
-}
-
-/** The leading "\0" is here so that applying "strings" to the binary delivers a clean result. */
-static const char VersionString[] = "\0" TBB_VERSION_STRINGS;
-
-static bool PrintVersionFlag = false;
-
-void PrintVersion() {
-    PrintVersionFlag = true;
-    std::fputs(VersionString+1,stderr);
-}
-
-void PrintExtraVersionInfo( const char* category, const char* format, ... ) {
-    if( PrintVersionFlag ) {
-        char str[1024]; std::memset(str, 0, 1024);
-        va_list args; va_start(args, format);
-        // Note: correct vsnprintf definition obtained from tbb_assert_impl.h
-        std::vsnprintf( str, 1024-1, format, args);
-        va_end(args);
-        std::fprintf(stderr, "oneTBB: %s\t%s\n", category, str );
-    }
-}
+            }
+
+            /** The leading "\0" is here so that applying "strings" to the binary delivers a clean result. */
+            static const char VersionString[] = "\0" TBB_VERSION_STRINGS;
+
+            static bool PrintVersionFlag = false;
+
+            void PrintVersion() {
+                PrintVersionFlag = true;
+                std::fputs(VersionString + 1, stderr);
+            }
+
+            void PrintExtraVersionInfo(const char* category, const char* format, ...) {
+                if (PrintVersionFlag) {
+                    char str[1024];
+                    std::memset(str, 0, 1024);
+                    va_list args;
+                    va_start(args, format);
+                    // Note: correct vsnprintf definition obtained from tbb_assert_impl.h
+                    std::vsnprintf(str, 1024 - 1, format, args);
+                    va_end(args);
+                    std::fprintf(stderr, "oneTBB: %s\t%s\n", category, str);
+                }
+            }
 
 //! check for transaction support.
 #if _MSC_VER
-#include <intrin.h> // for __cpuid
+#include <intrin.h>// for __cpuid
 #elif __APPLE__
 #include <sys/sysctl.h>
 #endif
 
 #if __TBB_x86_32 || __TBB_x86_64
-void check_cpuid(int leaf, int sub_leaf, int registers[4]) {
+            void check_cpuid(int leaf, int sub_leaf, int registers[4]) {
 #if _MSC_VER
-    __cpuidex(registers, leaf, sub_leaf);
+                __cpuidex(registers, leaf, sub_leaf);
 #else
-    int reg_eax = 0;
-    int reg_ebx = 0;
-    int reg_ecx = 0;
-    int reg_edx = 0;
+                int reg_eax = 0;
+                int reg_ebx = 0;
+                int reg_ecx = 0;
+                int reg_edx = 0;
 #if __TBB_x86_32 && __PIC__
-    // On 32-bit systems with position-independent code GCC fails to work around the stuff in EBX
-    // register. We help it using backup and restore.
-    __asm__("mov %%ebx, %%esi\n\t"
-            "cpuid\n\t"
-            "xchg %%ebx, %%esi"
-            : "=a"(reg_eax), "=S"(reg_ebx), "=c"(reg_ecx), "=d"(reg_edx)
-            : "0"(leaf), "2"(sub_leaf) // read value from eax and ecx
-    );
+                // On 32-bit systems with position-independent code GCC fails to work around the stuff in EBX
+                // register. We help it using backup and restore.
+                __asm__("mov %%ebx, %%esi\n\t"
+                        "cpuid\n\t"
+                        "xchg %%ebx, %%esi"
+                        : "=a"(reg_eax), "=S"(reg_ebx), "=c"(reg_ecx), "=d"(reg_edx)
+                        : "0"(leaf), "2"(sub_leaf)// read value from eax and ecx
+                );
 #else
-    __asm__("cpuid"
-            : "=a"(reg_eax), "=b"(reg_ebx), "=c"(reg_ecx), "=d"(reg_edx)
-            : "0"(leaf), "2"(sub_leaf) // read value from eax and ecx
-    );
+                __asm__("cpuid"
+                        : "=a"(reg_eax), "=b"(reg_ebx), "=c"(reg_ecx), "=d"(reg_edx)
+                        : "0"(leaf), "2"(sub_leaf)// read value from eax and ecx
+                );
 #endif
-    registers[0] = reg_eax;
-    registers[1] = reg_ebx;
-    registers[2] = reg_ecx;
-    registers[3] = reg_edx;
+                registers[0] = reg_eax;
+                registers[1] = reg_ebx;
+                registers[2] = reg_ecx;
+                registers[3] = reg_edx;
 #endif
-}
+            }
 #endif
 
-void detect_cpu_features(cpu_features_type& cpu_features) {
-    suppress_unused_warning(cpu_features);
+            void detect_cpu_features(cpu_features_type& cpu_features) {
+                suppress_unused_warning(cpu_features);
 #if __TBB_x86_32 || __TBB_x86_64
-    const int rtm_ebx_mask = 1 << 11;
-    const int waitpkg_ecx_mask = 1 << 5;
-    const int hybrid_edx_mask = 1 << 15;
-    int registers[4] = {0};
-
-    // Check RTM, WAITPKG, HYBRID
-    check_cpuid(7, 0, registers);
-    cpu_features.rtm_enabled = (registers[1] & rtm_ebx_mask) != 0;
-    cpu_features.waitpkg_enabled = (registers[2] & waitpkg_ecx_mask) != 0;
-    cpu_features.hybrid = (registers[3] & hybrid_edx_mask) != 0;
+                const int rtm_ebx_mask = 1 << 11;
+                const int waitpkg_ecx_mask = 1 << 5;
+                const int hybrid_edx_mask = 1 << 15;
+                int registers[4] = {0};
+
+                // Check RTM, WAITPKG, HYBRID
+                check_cpuid(7, 0, registers);
+                cpu_features.rtm_enabled = (registers[1] & rtm_ebx_mask) != 0;
+                cpu_features.waitpkg_enabled = (registers[2] & waitpkg_ecx_mask) != 0;
+                cpu_features.hybrid = (registers[3] & hybrid_edx_mask) != 0;
 #elif __APPLE__
-    // Check HYBRID (hw.nperflevels > 1)
-    uint64_t nperflevels = 0;
-    size_t nperflevels_size = sizeof(nperflevels);
-    if (!sysctlbyname("hw.nperflevels", &nperflevels, &nperflevels_size, nullptr, 0)) {
-        cpu_features.hybrid = (nperflevels > 1);
-    }
+                // Check HYBRID (hw.nperflevels > 1)
+                uint64_t nperflevels = 0;
+                size_t nperflevels_size = sizeof(nperflevels);
+                if (!sysctlbyname("hw.nperflevels", &nperflevels, &nperflevels_size, nullptr, 0)) {
+                    cpu_features.hybrid = (nperflevels > 1);
+                }
 #endif
-}
+            }
 
-} // namespace r1
-} // namespace detail
-} // namespace tbb
+        }// namespace r1
+    }    // namespace detail
+}// namespace tbb
diff --git a/external/tbb/src/tbb/misc_ex.cpp b/external/tbb/src/tbb/misc_ex.cpp
index 03b33b46..c5c4581e 100644
--- a/external/tbb/src/tbb/misc_ex.cpp
+++ b/external/tbb/src/tbb/misc_ex.cpp
@@ -22,10 +22,10 @@
 #if !defined(__TBB_HardwareConcurrency)
 
 #include "dynamic_link.h"
-#include <stdio.h>
 #include <limits.h>
+#include <stdio.h>
 
-#if _WIN32||_WIN64
+#if _WIN32 || _WIN64
 #include <windows.h>
 #if __TBB_WIN8UI_SUPPORT
 #include <thread>
@@ -36,374 +36,378 @@
 #if __linux__
 #include <sys/sysinfo.h>
 #endif
+#include <cerrno>
 #include <cstring>
 #include <sched.h>
-#include <cerrno>
 #elif __sun
 #include <sys/sysinfo.h>
 #elif __FreeBSD__
 #include <cerrno>
 #include <cstring>
-#include <sys/param.h>  // Required by <sys/cpuset.h>
 #include <sys/cpuset.h>
+#include <sys/param.h>// Required by <sys/cpuset.h>
 #endif
 #endif
 
 namespace tbb {
-namespace detail {
-namespace r1 {
+    namespace detail {
+        namespace r1 {
 
 #if __TBB_USE_OS_AFFINITY_SYSCALL
 
 #if __unix__
-// Handlers for interoperation with libiomp
-static int (*libiomp_try_restoring_original_mask)();
-// Table for mapping to libiomp entry points
-static const dynamic_link_descriptor iompLinkTable[] = {
-    DLD_NOWEAK( kmp_set_thread_affinity_mask_initial, libiomp_try_restoring_original_mask )
-};
+            // Handlers for interoperation with libiomp
+            static int (*libiomp_try_restoring_original_mask)();
+            // Table for mapping to libiomp entry points
+            static const dynamic_link_descriptor iompLinkTable[]
+                    = {DLD_NOWEAK(kmp_set_thread_affinity_mask_initial, libiomp_try_restoring_original_mask)};
 #endif
 
-static void set_thread_affinity_mask( std::size_t maskSize, const basic_mask_t* threadMask ) {
+            static void set_thread_affinity_mask(std::size_t maskSize, const basic_mask_t* threadMask) {
 #if __FreeBSD__ || __NetBSD__ || __OpenBSD__
-    if( cpuset_setaffinity( CPU_LEVEL_WHICH, CPU_WHICH_TID, -1, maskSize, threadMask ) )
+                if (cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_TID, -1, maskSize, threadMask))
 #else /* __unix__ */
-    if( sched_setaffinity( 0, maskSize, threadMask ) )
+                if (sched_setaffinity(0, maskSize, threadMask))
 #endif
-        // Here and below the error severity is lowered from critical level
-        // because it may happen during TBB library unload because of not
-        // waiting for workers to complete (current RML policy, to be fixed).
-        // handle_perror( errno, "setaffinity syscall" );
-        runtime_warning( "setaffinity syscall failed" );
-}
-
-static void get_thread_affinity_mask( std::size_t maskSize, basic_mask_t* threadMask ) {
+                    // Here and below the error severity is lowered from critical level
+                    // because it may happen during TBB library unload because of not
+                    // waiting for workers to complete (current RML policy, to be fixed).
+                    // handle_perror( errno, "setaffinity syscall" );
+                    runtime_warning("setaffinity syscall failed");
+            }
+
+            static void get_thread_affinity_mask(std::size_t maskSize, basic_mask_t* threadMask) {
 #if __FreeBSD__ || __NetBSD__ || __OpenBSD__
-    if( cpuset_getaffinity( CPU_LEVEL_WHICH, CPU_WHICH_TID, -1, maskSize, threadMask ) )
+                if (cpuset_getaffinity(CPU_LEVEL_WHICH, CPU_WHICH_TID, -1, maskSize, threadMask))
 #else /* __unix__ */
-    if( sched_getaffinity( 0, maskSize, threadMask ) )
+                if (sched_getaffinity(0, maskSize, threadMask))
 #endif
-    runtime_warning( "getaffinity syscall failed" );
-}
+                    runtime_warning("getaffinity syscall failed");
+            }
 
-static basic_mask_t* process_mask;
-static int num_masks;
+            static basic_mask_t* process_mask;
+            static int num_masks;
 
-void destroy_process_mask() {
-    delete [] process_mask;
-    process_mask = nullptr;
-}
+            void destroy_process_mask() {
+                delete[] process_mask;
+                process_mask = nullptr;
+            }
 
 #define curMaskSize sizeof(basic_mask_t) * num_masks
-affinity_helper::~affinity_helper() {
-    if( threadMask ) {
-        if( is_changed ) {
-            set_thread_affinity_mask( curMaskSize, threadMask );
-        }
-        delete [] threadMask;
-    }
-}
-void affinity_helper::protect_affinity_mask( bool restore_process_mask ) {
-    if( threadMask == nullptr && num_masks ) { // TODO: assert num_masks validity?
-        threadMask = new basic_mask_t [num_masks];
-        std::memset( threadMask, 0, curMaskSize );
-        get_thread_affinity_mask( curMaskSize, threadMask );
-        if( restore_process_mask ) {
-            __TBB_ASSERT( process_mask, "A process mask is requested but not yet stored" );
-            is_changed = memcmp( process_mask, threadMask, curMaskSize );
-            if( is_changed )
-                set_thread_affinity_mask( curMaskSize, process_mask );
-        } else {
-            // Assume that the mask will be changed by the caller.
-            is_changed = 1;
-        }
-    }
-}
-void affinity_helper::dismiss() {
-    delete [] threadMask;
-    threadMask = nullptr;
-    is_changed = 0;
-}
+            affinity_helper::~affinity_helper() {
+                if (threadMask) {
+                    if (is_changed) { set_thread_affinity_mask(curMaskSize, threadMask); }
+                    delete[] threadMask;
+                }
+            }
+            void affinity_helper::protect_affinity_mask(bool restore_process_mask) {
+                if (threadMask == nullptr && num_masks) {// TODO: assert num_masks validity?
+                    threadMask = new basic_mask_t[num_masks];
+                    std::memset(threadMask, 0, curMaskSize);
+                    get_thread_affinity_mask(curMaskSize, threadMask);
+                    if (restore_process_mask) {
+                        __TBB_ASSERT(process_mask, "A process mask is requested but not yet stored");
+                        is_changed = memcmp(process_mask, threadMask, curMaskSize);
+                        if (is_changed) set_thread_affinity_mask(curMaskSize, process_mask);
+                    } else {
+                        // Assume that the mask will be changed by the caller.
+                        is_changed = 1;
+                    }
+                }
+            }
+            void affinity_helper::dismiss() {
+                delete[] threadMask;
+                threadMask = nullptr;
+                is_changed = 0;
+            }
 #undef curMaskSize
 
-static std::atomic<do_once_state> hardware_concurrency_info;
-
-static int theNumProcs;
-
-static void initialize_hardware_concurrency_info () {
-    int err;
-    int availableProcs = 0;
-    int numMasks = 1;
-    int maxProcs = sysconf(_SC_NPROCESSORS_ONLN);
-    basic_mask_t* processMask;
-    const std::size_t BasicMaskSize =  sizeof(basic_mask_t);
-    for (;;) {
-        const int curMaskSize = BasicMaskSize * numMasks;
-        processMask = new basic_mask_t[numMasks];
-        std::memset( processMask, 0, curMaskSize );
+            static std::atomic<do_once_state> hardware_concurrency_info;
+
+            static int theNumProcs;
+
+            static void initialize_hardware_concurrency_info() {
+                int err;
+                int availableProcs = 0;
+                int numMasks = 1;
+                int maxProcs = sysconf(_SC_NPROCESSORS_ONLN);
+                basic_mask_t* processMask;
+                const std::size_t BasicMaskSize = sizeof(basic_mask_t);
+                for (;;) {
+                    const int curMaskSize = BasicMaskSize * numMasks;
+                    processMask = new basic_mask_t[numMasks];
+                    std::memset(processMask, 0, curMaskSize);
 #if __FreeBSD__ || __NetBSD__ || __OpenBSD__
-        // CPU_LEVEL_WHICH - anonymous (current) mask, CPU_LEVEL_CPUSET - assigned mask
-        err = cpuset_getaffinity( CPU_LEVEL_WHICH, CPU_WHICH_PID, -1, curMaskSize, processMask );
-        if ( !err || errno != ERANGE || curMaskSize * CHAR_BIT >= 16 * 1024 )
-            break;
+                    // CPU_LEVEL_WHICH - anonymous (current) mask, CPU_LEVEL_CPUSET - assigned mask
+                    err = cpuset_getaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID, -1, curMaskSize, processMask);
+                    if (!err || errno != ERANGE || curMaskSize * CHAR_BIT >= 16 * 1024) break;
 #else /* __unix__ */
-        int pid = getpid();
-        err = sched_getaffinity( pid, curMaskSize, processMask );
-        if ( !err || errno != EINVAL || curMaskSize * CHAR_BIT >= 256 * 1024 )
-             break;
+                    int pid = getpid();
+                    err = sched_getaffinity(pid, curMaskSize, processMask);
+                    if (!err || errno != EINVAL || curMaskSize * CHAR_BIT >= 256 * 1024) break;
 #endif
-        delete[] processMask;
-        numMasks <<= 1;
-    }
-    if ( !err ) {
-        // We have found the mask size and captured the process affinity mask into processMask.
-        num_masks = numMasks; // do here because it's needed for affinity_helper to work
+                    delete[] processMask;
+                    numMasks <<= 1;
+                }
+                if (!err) {
+                    // We have found the mask size and captured the process affinity mask into processMask.
+                    num_masks = numMasks;// do here because it's needed for affinity_helper to work
 #if __unix__
-        // For better coexistence with libiomp which might have changed the mask already,
-        // check for its presence and ask it to restore the mask.
-        dynamic_link_handle libhandle;
-        if ( dynamic_link( "libiomp5.so", iompLinkTable, 1, &libhandle, DYNAMIC_LINK_GLOBAL ) ) {
-            // We have found the symbol provided by libiomp5 for restoring original thread affinity.
-            affinity_helper affhelp;
-            affhelp.protect_affinity_mask( /*restore_process_mask=*/false );
-            if ( libiomp_try_restoring_original_mask()==0 ) {
-                // Now we have the right mask to capture, restored by libiomp.
-                const int curMaskSize = BasicMaskSize * numMasks;
-                std::memset( processMask, 0, curMaskSize );
-                get_thread_affinity_mask( curMaskSize, processMask );
-            } else
-                affhelp.dismiss();  // thread mask has not changed
-            dynamic_unlink( libhandle );
-            // Destructor of affinity_helper restores the thread mask (unless dismissed).
-        }
+                    // For better coexistence with libiomp which might have changed the mask already,
+                    // check for its presence and ask it to restore the mask.
+                    dynamic_link_handle libhandle;
+                    if (dynamic_link("libiomp5.so", iompLinkTable, 1, &libhandle, DYNAMIC_LINK_GLOBAL)) {
+                        // We have found the symbol provided by libiomp5 for restoring original thread affinity.
+                        affinity_helper affhelp;
+                        affhelp.protect_affinity_mask(/*restore_process_mask=*/false);
+                        if (libiomp_try_restoring_original_mask() == 0) {
+                            // Now we have the right mask to capture, restored by libiomp.
+                            const int curMaskSize = BasicMaskSize * numMasks;
+                            std::memset(processMask, 0, curMaskSize);
+                            get_thread_affinity_mask(curMaskSize, processMask);
+                        } else
+                            affhelp.dismiss();// thread mask has not changed
+                        dynamic_unlink(libhandle);
+                        // Destructor of affinity_helper restores the thread mask (unless dismissed).
+                    }
 #endif
-        for ( int m = 0; availableProcs < maxProcs && m < numMasks; ++m ) {
-            for ( std::size_t i = 0; (availableProcs < maxProcs) && (i < BasicMaskSize * CHAR_BIT); ++i ) {
-                if ( CPU_ISSET( i, processMask + m ) )
-                    ++availableProcs;
+                    for (int m = 0; availableProcs < maxProcs && m < numMasks; ++m) {
+                        for (std::size_t i = 0; (availableProcs < maxProcs) && (i < BasicMaskSize * CHAR_BIT);
+                             ++i) {
+                            if (CPU_ISSET(i, processMask + m)) ++availableProcs;
+                        }
+                    }
+                    process_mask = processMask;
+                } else {
+                    // Failed to get the process affinity mask; assume the whole machine can be used.
+                    availableProcs = (maxProcs == INT_MAX) ? sysconf(_SC_NPROCESSORS_ONLN) : maxProcs;
+                    delete[] processMask;
+                }
+                theNumProcs = availableProcs > 0 ? availableProcs : 1;// Fail safety strap
+                __TBB_ASSERT(theNumProcs <= sysconf(_SC_NPROCESSORS_ONLN), nullptr);
+            }
+
+            int AvailableHwConcurrency() {
+                atomic_do_once(&initialize_hardware_concurrency_info, hardware_concurrency_info);
+                return theNumProcs;
             }
-        }
-        process_mask = processMask;
-    }
-    else {
-        // Failed to get the process affinity mask; assume the whole machine can be used.
-        availableProcs = (maxProcs == INT_MAX) ? sysconf(_SC_NPROCESSORS_ONLN) : maxProcs;
-        delete[] processMask;
-    }
-    theNumProcs = availableProcs > 0 ? availableProcs : 1; // Fail safety strap
-    __TBB_ASSERT( theNumProcs <= sysconf(_SC_NPROCESSORS_ONLN), nullptr);
-}
-
-int AvailableHwConcurrency() {
-    atomic_do_once( &initialize_hardware_concurrency_info, hardware_concurrency_info );
-    return theNumProcs;
-}
 
 /* End of __TBB_USE_OS_AFFINITY_SYSCALL implementation */
 #elif __ANDROID__
 
-// Work-around for Android that reads the correct number of available CPUs since system calls are unreliable.
-// Format of "present" file is: ([<int>-<int>|<int>],)+
-int AvailableHwConcurrency() {
-    FILE *fp = fopen("/sys/devices/system/cpu/present", "r");
-    if (fp == nullptr) return 1;
-    int num_args, lower, upper, num_cpus=0;
-    while ((num_args = fscanf(fp, "%u-%u", &lower, &upper)) != EOF) {
-        switch(num_args) {
-            case 2: num_cpus += upper - lower + 1; break;
-            case 1: num_cpus += 1; break;
-        }
-        fscanf(fp, ",");
-    }
-    fclose(fp);
-    return (num_cpus > 0) ? num_cpus : 1;
-}
+            // Work-around for Android that reads the correct number of available CPUs since system calls are unreliable.
+            // Format of "present" file is: ([<int>-<int>|<int>],)+
+            int AvailableHwConcurrency() {
+                FILE *fp = fopen("/sys/devices/system/cpu/present", "r");
+                if (fp == nullptr) return 1;
+                int num_args, lower, upper, num_cpus = 0;
+                while ((num_args = fscanf(fp, "%u-%u", &lower, &upper)) != EOF) {
+                    switch (num_args) {
+                        case 2:
+                            num_cpus += upper - lower + 1;
+                            break;
+                        case 1:
+                            num_cpus += 1;
+                            break;
+                    }
+                    fscanf(fp, ",");
+                }
+                fclose(fp);
+                return (num_cpus > 0) ? num_cpus : 1;
+            }
 
 #elif defined(_SC_NPROCESSORS_ONLN)
 
-int AvailableHwConcurrency() {
-    int n = sysconf(_SC_NPROCESSORS_ONLN);
-    return (n > 0) ? n : 1;
-}
+            int AvailableHwConcurrency() {
+                int n = sysconf(_SC_NPROCESSORS_ONLN);
+                return (n > 0) ? n : 1;
+            }
 
-#elif _WIN32||_WIN64
+#elif _WIN32 || _WIN64
 
-static std::atomic<do_once_state> hardware_concurrency_info;
+            static std::atomic<do_once_state> hardware_concurrency_info;
 
-static const WORD TBB_ALL_PROCESSOR_GROUPS = 0xffff;
+            static const WORD TBB_ALL_PROCESSOR_GROUPS = 0xffff;
 
-// Statically allocate an array for processor group information.
-// Windows 7 supports maximum 4 groups, but let's look ahead a little.
-static const WORD MaxProcessorGroups = 64;
+            // Statically allocate an array for processor group information.
+            // Windows 7 supports maximum 4 groups, but let's look ahead a little.
+            static const WORD MaxProcessorGroups = 64;
 
-struct ProcessorGroupInfo {
-    DWORD_PTR   mask;                   ///< Affinity mask covering the whole group
-    int         numProcs;               ///< Number of processors in the group
-    int         numProcsRunningTotal;   ///< Subtotal of processors in this and preceding groups
+            struct ProcessorGroupInfo {
+                DWORD_PTR mask;          ///< Affinity mask covering the whole group
+                int numProcs;            ///< Number of processors in the group
+                int numProcsRunningTotal;///< Subtotal of processors in this and preceding groups
 
-    //! Total number of processor groups in the system
-    static int NumGroups;
+                //! Total number of processor groups in the system
+                static int NumGroups;
 
-    //! Index of the group with a slot reserved for the first external thread
-    /** In the context of multiple processor groups support current implementation
+                //! Index of the group with a slot reserved for the first external thread
+                /** In the context of multiple processor groups support current implementation
         defines "the first external thread" as the first thread to invoke
         AvailableHwConcurrency().
 
         TODO:   Implement a dynamic scheme remapping workers depending on the pending
                 external threads affinity. **/
-    static int HoleIndex;
-};
-
-int ProcessorGroupInfo::NumGroups = 1;
-int ProcessorGroupInfo::HoleIndex = 0;
-
-ProcessorGroupInfo theProcessorGroups[MaxProcessorGroups];
-int calculate_numa[MaxProcessorGroups];  //Array needed for FindProcessorGroupIndex to calculate Processor Group when number of threads > number of cores to distribute threads evenly between processor groups
-int numaSum;
-struct TBB_GROUP_AFFINITY {
-    DWORD_PTR Mask;
-    WORD   Group;
-    WORD   Reserved[3];
-};
-
-static DWORD (WINAPI *TBB_GetActiveProcessorCount)( WORD groupIndex ) = nullptr;
-static WORD (WINAPI *TBB_GetActiveProcessorGroupCount)() = nullptr;
-static BOOL (WINAPI *TBB_SetThreadGroupAffinity)( HANDLE hThread,
-                        const TBB_GROUP_AFFINITY* newAff, TBB_GROUP_AFFINITY *prevAff );
-static BOOL (WINAPI *TBB_GetThreadGroupAffinity)( HANDLE hThread, TBB_GROUP_AFFINITY* );
-
-static const dynamic_link_descriptor ProcessorGroupsApiLinkTable[] = {
-      DLD(GetActiveProcessorCount, TBB_GetActiveProcessorCount)
-    , DLD(GetActiveProcessorGroupCount, TBB_GetActiveProcessorGroupCount)
-    , DLD(SetThreadGroupAffinity, TBB_SetThreadGroupAffinity)
-    , DLD(GetThreadGroupAffinity, TBB_GetThreadGroupAffinity)
-};
-
-static void initialize_hardware_concurrency_info () {
-    suppress_unused_warning(TBB_ALL_PROCESSOR_GROUPS);
+                static int HoleIndex;
+            };
+
+            int ProcessorGroupInfo::NumGroups = 1;
+            int ProcessorGroupInfo::HoleIndex = 0;
+
+            ProcessorGroupInfo theProcessorGroups[MaxProcessorGroups];
+            int calculate_numa
+                    [MaxProcessorGroups];//Array needed for FindProcessorGroupIndex to calculate Processor Group when number of threads > number of cores to distribute threads evenly between processor groups
+            int numaSum;
+            struct TBB_GROUP_AFFINITY {
+                DWORD_PTR Mask;
+                WORD Group;
+                WORD Reserved[3];
+            };
+
+            static DWORD(WINAPI *TBB_GetActiveProcessorCount)(WORD groupIndex) = nullptr;
+            static WORD(WINAPI *TBB_GetActiveProcessorGroupCount)() = nullptr;
+            static BOOL(WINAPI *TBB_SetThreadGroupAffinity)(HANDLE hThread, const TBB_GROUP_AFFINITY *newAff,
+                                                            TBB_GROUP_AFFINITY *prevAff);
+            static BOOL(WINAPI *TBB_GetThreadGroupAffinity)(HANDLE hThread, TBB_GROUP_AFFINITY *);
+
+            static const dynamic_link_descriptor ProcessorGroupsApiLinkTable[]
+                    = {DLD(GetActiveProcessorCount, TBB_GetActiveProcessorCount),
+                       DLD(GetActiveProcessorGroupCount, TBB_GetActiveProcessorGroupCount),
+                       DLD(SetThreadGroupAffinity, TBB_SetThreadGroupAffinity),
+                       DLD(GetThreadGroupAffinity, TBB_GetThreadGroupAffinity)};
+
+            static void initialize_hardware_concurrency_info() {
+                suppress_unused_warning(TBB_ALL_PROCESSOR_GROUPS);
 #if __TBB_WIN8UI_SUPPORT
-    // For these applications processor groups info is unavailable
-    // Setting up a number of processors for one processor group
-    theProcessorGroups[0].numProcs = theProcessorGroups[0].numProcsRunningTotal = std::thread::hardware_concurrency();
-#else /* __TBB_WIN8UI_SUPPORT */
-    dynamic_link( "Kernel32.dll", ProcessorGroupsApiLinkTable,
-                  sizeof(ProcessorGroupsApiLinkTable)/sizeof(dynamic_link_descriptor) );
-    SYSTEM_INFO si;
-    GetNativeSystemInfo(&si);
-    DWORD_PTR pam, sam, m = 1;
-    GetProcessAffinityMask( GetCurrentProcess(), &pam, &sam );
-    int nproc = 0;
-    for ( std::size_t i = 0; i < sizeof(DWORD_PTR) * CHAR_BIT; ++i, m <<= 1 ) {
-        if ( pam & m )
-            ++nproc;
-    }
-    int number_of_processors = (int)si.dwNumberOfProcessors;
-    if (nproc > number_of_processors && TBB_GetThreadGroupAffinity) {
-        // Sometimes on systems with multiple processor groups GetNativeSystemInfo
-        // reports mask and processor count from the parent process
-        TBB_GROUP_AFFINITY ga;
-        if (TBB_GetThreadGroupAffinity(GetCurrentThread(), &ga)) {
-            number_of_processors = (int)TBB_GetActiveProcessorCount(ga.Group);
-        }
-    }
-
-    __TBB_ASSERT( nproc <= number_of_processors, nullptr);
-    // By default setting up a number of processors for one processor group
-    theProcessorGroups[0].numProcs = theProcessorGroups[0].numProcsRunningTotal = nproc;
-    // Setting up processor groups in case the process does not restrict affinity mask and more than one processor group is present
-    if ( nproc == number_of_processors && TBB_GetActiveProcessorCount ) {
-        // The process does not have restricting affinity mask and multiple processor groups are possible
-        ProcessorGroupInfo::NumGroups = (int)TBB_GetActiveProcessorGroupCount();
-        __TBB_ASSERT( ProcessorGroupInfo::NumGroups <= MaxProcessorGroups, nullptr);
-        // Fail safety bootstrap. Release versions will limit available concurrency
-        // level, while debug ones would assert.
-        if ( ProcessorGroupInfo::NumGroups > MaxProcessorGroups )
-            ProcessorGroupInfo::NumGroups = MaxProcessorGroups;
-        if ( ProcessorGroupInfo::NumGroups > 1 ) {
-            TBB_GROUP_AFFINITY ga;
-            if ( TBB_GetThreadGroupAffinity( GetCurrentThread(), &ga ) )
-                ProcessorGroupInfo::HoleIndex = ga.Group;
-            int nprocs = 0;
-            int min_procs = INT_MAX;
-            for ( WORD i = 0; i < ProcessorGroupInfo::NumGroups; ++i ) {
-                ProcessorGroupInfo  &pgi = theProcessorGroups[i];
-                pgi.numProcs = (int)TBB_GetActiveProcessorCount(i);
-                if (pgi.numProcs < min_procs) min_procs = pgi.numProcs;  //Finding the minimum number of processors in the Processor Groups
-                calculate_numa[i] = pgi.numProcs;
-                __TBB_ASSERT( pgi.numProcs <= (int)sizeof(DWORD_PTR) * CHAR_BIT, nullptr);
-                pgi.mask = pgi.numProcs == sizeof(DWORD_PTR) * CHAR_BIT ? ~(DWORD_PTR)0 : (DWORD_PTR(1) << pgi.numProcs) - 1;
-                pgi.numProcsRunningTotal = nprocs += pgi.numProcs;
-            }
-            __TBB_ASSERT( nprocs == (int)TBB_GetActiveProcessorCount( TBB_ALL_PROCESSOR_GROUPS ), nullptr);
+                // For these applications processor groups info is unavailable
+                // Setting up a number of processors for one processor group
+                theProcessorGroups[0].numProcs = theProcessorGroups[0].numProcsRunningTotal
+                        = std::thread::hardware_concurrency();
+#else  /* __TBB_WIN8UI_SUPPORT */
+                dynamic_link("Kernel32.dll", ProcessorGroupsApiLinkTable,
+                             sizeof(ProcessorGroupsApiLinkTable) / sizeof(dynamic_link_descriptor));
+                SYSTEM_INFO si;
+                GetNativeSystemInfo(&si);
+                DWORD_PTR pam, sam, m = 1;
+                GetProcessAffinityMask(GetCurrentProcess(), &pam, &sam);
+                int nproc = 0;
+                for (std::size_t i = 0; i < sizeof(DWORD_PTR) * CHAR_BIT; ++i, m <<= 1) {
+                    if (pam & m) ++nproc;
+                }
+                int number_of_processors = (int) si.dwNumberOfProcessors;
+                if (nproc > number_of_processors && TBB_GetThreadGroupAffinity) {
+                    // Sometimes on systems with multiple processor groups GetNativeSystemInfo
+                    // reports mask and processor count from the parent process
+                    TBB_GROUP_AFFINITY ga;
+                    if (TBB_GetThreadGroupAffinity(GetCurrentThread(), &ga)) {
+                        number_of_processors = (int) TBB_GetActiveProcessorCount(ga.Group);
+                    }
+                }
+
+                __TBB_ASSERT(nproc <= number_of_processors, nullptr);
+                // By default setting up a number of processors for one processor group
+                theProcessorGroups[0].numProcs = theProcessorGroups[0].numProcsRunningTotal = nproc;
+                // Setting up processor groups in case the process does not restrict affinity mask and more than one processor group is present
+                if (nproc == number_of_processors && TBB_GetActiveProcessorCount) {
+                    // The process does not have restricting affinity mask and multiple processor groups are possible
+                    ProcessorGroupInfo::NumGroups = (int) TBB_GetActiveProcessorGroupCount();
+                    __TBB_ASSERT(ProcessorGroupInfo::NumGroups <= MaxProcessorGroups, nullptr);
+                    // Fail safety bootstrap. Release versions will limit available concurrency
+                    // level, while debug ones would assert.
+                    if (ProcessorGroupInfo::NumGroups > MaxProcessorGroups)
+                        ProcessorGroupInfo::NumGroups = MaxProcessorGroups;
+                    if (ProcessorGroupInfo::NumGroups > 1) {
+                        TBB_GROUP_AFFINITY ga;
+                        if (TBB_GetThreadGroupAffinity(GetCurrentThread(), &ga))
+                            ProcessorGroupInfo::HoleIndex = ga.Group;
+                        int nprocs = 0;
+                        int min_procs = INT_MAX;
+                        for (WORD i = 0; i < ProcessorGroupInfo::NumGroups; ++i) {
+                            ProcessorGroupInfo &pgi = theProcessorGroups[i];
+                            pgi.numProcs = (int) TBB_GetActiveProcessorCount(i);
+                            if (pgi.numProcs < min_procs)
+                                min_procs
+                                        = pgi.numProcs;//Finding the minimum number of processors in the Processor Groups
+                            calculate_numa[i] = pgi.numProcs;
+                            __TBB_ASSERT(pgi.numProcs <= (int) sizeof(DWORD_PTR) * CHAR_BIT, nullptr);
+                            pgi.mask = pgi.numProcs == sizeof(DWORD_PTR) * CHAR_BIT
+                                               ? ~(DWORD_PTR) 0
+                                               : (DWORD_PTR(1) << pgi.numProcs) - 1;
+                            pgi.numProcsRunningTotal = nprocs += pgi.numProcs;
+                        }
+                        __TBB_ASSERT(nprocs == (int) TBB_GetActiveProcessorCount(TBB_ALL_PROCESSOR_GROUPS),
+                                     nullptr);
+
+                        calculate_numa[0] = (calculate_numa[0] / min_procs) - 1;
+                        for (WORD i = 1; i < ProcessorGroupInfo::NumGroups; ++i) {
+                            calculate_numa[i] = calculate_numa[i - 1] + (calculate_numa[i] / min_procs);
+                        }
+
+                        numaSum = calculate_numa[ProcessorGroupInfo::NumGroups - 1];
+                    }
+                }
+#endif /* __TBB_WIN8UI_SUPPORT */
 
-            calculate_numa[0] = (calculate_numa[0] / min_procs)-1;
-            for (WORD i = 1; i < ProcessorGroupInfo::NumGroups; ++i) {
-                calculate_numa[i] = calculate_numa[i-1] + (calculate_numa[i] / min_procs);
+                PrintExtraVersionInfo("Processor groups", "%d", ProcessorGroupInfo::NumGroups);
+                if (ProcessorGroupInfo::NumGroups > 1)
+                    for (int i = 0; i < ProcessorGroupInfo::NumGroups; ++i)
+                        PrintExtraVersionInfo("----- Group", "%d: size %d", i,
+                                              theProcessorGroups[i].numProcs);
             }
 
-            numaSum = calculate_numa[ProcessorGroupInfo::NumGroups - 1];
+            int NumberOfProcessorGroups() {
+                __TBB_ASSERT(hardware_concurrency_info == do_once_state::initialized,
+                             "NumberOfProcessorGroups is used before AvailableHwConcurrency");
+                return ProcessorGroupInfo::NumGroups;
+            }
 
-        }
+            int FindProcessorGroupIndex(int procIdx) {
+                int current_grp_idx = ProcessorGroupInfo::HoleIndex;
+                if (procIdx >= theProcessorGroups[current_grp_idx].numProcs
+                    && procIdx < theProcessorGroups[ProcessorGroupInfo::NumGroups - 1].numProcsRunningTotal) {
+                    procIdx = procIdx - theProcessorGroups[current_grp_idx].numProcs;
+                    do {
+                        current_grp_idx = (current_grp_idx + 1) % (ProcessorGroupInfo::NumGroups);
+                        procIdx = procIdx - theProcessorGroups[current_grp_idx].numProcs;
+
+                    } while (procIdx >= 0);
+                } else if (procIdx
+                           >= theProcessorGroups[ProcessorGroupInfo::NumGroups - 1].numProcsRunningTotal) {
+                    int temp_grp_index = 0;
+                    procIdx = procIdx
+                              - theProcessorGroups[ProcessorGroupInfo::NumGroups - 1].numProcsRunningTotal;
+                    procIdx = procIdx % (numaSum + 1);//ProcIdx to stay between 0 and numaSum
+
+                    while (procIdx - calculate_numa[temp_grp_index] > 0) {
+                        temp_grp_index = (temp_grp_index + 1) % ProcessorGroupInfo::NumGroups;
+                    }
+                    current_grp_idx = temp_grp_index;
+                }
+                __TBB_ASSERT(current_grp_idx < ProcessorGroupInfo::NumGroups, nullptr);
+
+                return current_grp_idx;
+            }
 
-    }
-#endif /* __TBB_WIN8UI_SUPPORT */
+            void MoveThreadIntoProcessorGroup(void *hThread, int groupIndex) {
+                __TBB_ASSERT(hardware_concurrency_info == do_once_state::initialized,
+                             "MoveThreadIntoProcessorGroup is used before AvailableHwConcurrency");
+                if (!TBB_SetThreadGroupAffinity) return;
+                TBB_GROUP_AFFINITY ga = {theProcessorGroups[groupIndex].mask, (WORD) groupIndex, {0, 0, 0}};
+                TBB_SetThreadGroupAffinity(hThread, &ga, nullptr);
+            }
 
-    PrintExtraVersionInfo("Processor groups", "%d", ProcessorGroupInfo::NumGroups);
-    if (ProcessorGroupInfo::NumGroups>1)
-        for (int i=0; i<ProcessorGroupInfo::NumGroups; ++i)
-            PrintExtraVersionInfo( "----- Group", "%d: size %d", i, theProcessorGroups[i].numProcs);
-}
-
-int NumberOfProcessorGroups() {
-    __TBB_ASSERT( hardware_concurrency_info == do_once_state::initialized, "NumberOfProcessorGroups is used before AvailableHwConcurrency" );
-    return ProcessorGroupInfo::NumGroups;
-}
-
-int FindProcessorGroupIndex ( int procIdx ) {
-    int current_grp_idx = ProcessorGroupInfo::HoleIndex;
-    if (procIdx >= theProcessorGroups[current_grp_idx].numProcs  && procIdx < theProcessorGroups[ProcessorGroupInfo::NumGroups - 1].numProcsRunningTotal) {
-        procIdx = procIdx - theProcessorGroups[current_grp_idx].numProcs;
-        do {
-            current_grp_idx = (current_grp_idx + 1) % (ProcessorGroupInfo::NumGroups);
-            procIdx = procIdx - theProcessorGroups[current_grp_idx].numProcs;
-
-        } while (procIdx >= 0);
-    }
-    else if (procIdx >= theProcessorGroups[ProcessorGroupInfo::NumGroups - 1].numProcsRunningTotal) {
-        int temp_grp_index = 0;
-        procIdx = procIdx - theProcessorGroups[ProcessorGroupInfo::NumGroups - 1].numProcsRunningTotal; 
-        procIdx = procIdx % (numaSum+1);  //ProcIdx to stay between 0 and numaSum
-
-        while (procIdx - calculate_numa[temp_grp_index] > 0) {
-            temp_grp_index = (temp_grp_index + 1) % ProcessorGroupInfo::NumGroups;
-        }
-        current_grp_idx = temp_grp_index;
-    }
-    __TBB_ASSERT(current_grp_idx < ProcessorGroupInfo::NumGroups, nullptr);
-
-    return current_grp_idx;
-}
-
-void MoveThreadIntoProcessorGroup( void* hThread, int groupIndex ) {
-    __TBB_ASSERT( hardware_concurrency_info == do_once_state::initialized, "MoveThreadIntoProcessorGroup is used before AvailableHwConcurrency" );
-    if ( !TBB_SetThreadGroupAffinity )
-        return;
-    TBB_GROUP_AFFINITY ga = { theProcessorGroups[groupIndex].mask, (WORD)groupIndex, {0,0,0} };
-    TBB_SetThreadGroupAffinity( hThread, &ga, nullptr);
-}
-
-int AvailableHwConcurrency() {
-    atomic_do_once( &initialize_hardware_concurrency_info, hardware_concurrency_info );
-    return theProcessorGroups[ProcessorGroupInfo::NumGroups - 1].numProcsRunningTotal;
-}
+            int AvailableHwConcurrency() {
+                atomic_do_once(&initialize_hardware_concurrency_info, hardware_concurrency_info);
+                return theProcessorGroups[ProcessorGroupInfo::NumGroups - 1].numProcsRunningTotal;
+            }
 
 /* End of _WIN32||_WIN64 implementation */
 #else
-    #error AvailableHwConcurrency is not implemented for this OS
+#error AvailableHwConcurrency is not implemented for this OS
 #endif
 
-} // namespace r1
-} // namespace detail
-} // namespace tbb
+        }// namespace r1
+    }    // namespace detail
+}// namespace tbb
 
 #endif /* !__TBB_HardwareConcurrency */
diff --git a/external/tbb/src/tbb/observer_proxy.cpp b/external/tbb/src/tbb/observer_proxy.cpp
index 2717d740..34f32623 100644
--- a/external/tbb/src/tbb/observer_proxy.cpp
+++ b/external/tbb/src/tbb/observer_proxy.cpp
@@ -17,303 +17,298 @@
 #include "oneapi/tbb/detail/_config.h"
 #include "oneapi/tbb/detail/_utils.h"
 
-#include "observer_proxy.h"
 #include "arena.h"
 #include "main.h"
+#include "observer_proxy.h"
 #include "thread_data.h"
 
 #include <atomic>
 
 namespace tbb {
-namespace detail {
-namespace r1 {
+    namespace detail {
+        namespace r1 {
 
 #if TBB_USE_ASSERT
-extern std::atomic<int> the_observer_proxy_count;
+            extern std::atomic<int> the_observer_proxy_count;
 #endif /* TBB_USE_ASSERT */
 
-observer_proxy::observer_proxy( d1::task_scheduler_observer& tso )
-    : my_ref_count(1), my_list(nullptr), my_next(nullptr), my_prev(nullptr), my_observer(&tso)
-{
+            observer_proxy::observer_proxy(d1::task_scheduler_observer& tso)
+                : my_ref_count(1), my_list(nullptr), my_next(nullptr), my_prev(nullptr), my_observer(&tso) {
 #if TBB_USE_ASSERT
-    ++the_observer_proxy_count;
+                ++the_observer_proxy_count;
 #endif /* TBB_USE_ASSERT */
-}
+            }
 
-observer_proxy::~observer_proxy() {
-    __TBB_ASSERT( !my_ref_count, "Attempt to destroy proxy still in use" );
-    poison_value(my_ref_count);
-    poison_pointer(my_prev);
-    poison_pointer(my_next);
+            observer_proxy::~observer_proxy() {
+                __TBB_ASSERT(!my_ref_count, "Attempt to destroy proxy still in use");
+                poison_value(my_ref_count);
+                poison_pointer(my_prev);
+                poison_pointer(my_next);
 #if TBB_USE_ASSERT
-    --the_observer_proxy_count;
+                --the_observer_proxy_count;
 #endif /* TBB_USE_ASSERT */
-}
-
-void observer_list::clear() {
-    {
-        scoped_lock lock(mutex(), /*is_writer=*/true);
-        observer_proxy *next = my_head.load(std::memory_order_relaxed);
-        while ( observer_proxy *p = next ) {
-            next = p->my_next;
-            // Both proxy p and observer p->my_observer (if non-null) are guaranteed
-            // to be alive while the list is locked.
-            d1::task_scheduler_observer *obs = p->my_observer;
-            // Make sure that possible concurrent observer destruction does not
-            // conflict with the proxy list cleanup.
-            if (!obs || !(p = obs->my_proxy.exchange(nullptr))) {
-                continue;
             }
-            // accessing 'obs' after detaching of obs->my_proxy leads to the race with observer destruction
-            __TBB_ASSERT(!next || p == next->my_prev, nullptr);
-            __TBB_ASSERT(is_alive(p->my_ref_count), "Observer's proxy died prematurely");
-            __TBB_ASSERT(p->my_ref_count.load(std::memory_order_relaxed) == 1, "Reference for observer is missing");
-            poison_pointer(p->my_observer);
-            remove(p);
-            --p->my_ref_count;
-            delete p;
-        }
-    }
 
-    // If observe(false) is called concurrently with the destruction of the arena,
-    // need to wait until all proxies are removed.
-    for (atomic_backoff backoff; ; backoff.pause()) {
-        scoped_lock lock(mutex(), /*is_writer=*/false);
-        if (my_head.load(std::memory_order_relaxed) == nullptr) {
-            break;
-        }
-    }
+            void observer_list::clear() {
+                {
+                    scoped_lock lock(mutex(), /*is_writer=*/true);
+                    observer_proxy* next = my_head.load(std::memory_order_relaxed);
+                    while (observer_proxy* p = next) {
+                        next = p->my_next;
+                        // Both proxy p and observer p->my_observer (if non-null) are guaranteed
+                        // to be alive while the list is locked.
+                        d1::task_scheduler_observer* obs = p->my_observer;
+                        // Make sure that possible concurrent observer destruction does not
+                        // conflict with the proxy list cleanup.
+                        if (!obs || !(p = obs->my_proxy.exchange(nullptr))) { continue; }
+                        // accessing 'obs' after detaching of obs->my_proxy leads to the race with observer destruction
+                        __TBB_ASSERT(!next || p == next->my_prev, nullptr);
+                        __TBB_ASSERT(is_alive(p->my_ref_count), "Observer's proxy died prematurely");
+                        __TBB_ASSERT(p->my_ref_count.load(std::memory_order_relaxed) == 1,
+                                     "Reference for observer is missing");
+                        poison_pointer(p->my_observer);
+                        remove(p);
+                        --p->my_ref_count;
+                        delete p;
+                    }
+                }
 
-    __TBB_ASSERT(my_head.load(std::memory_order_relaxed) == nullptr && my_tail.load(std::memory_order_relaxed) == nullptr, nullptr);
-}
+                // If observe(false) is called concurrently with the destruction of the arena,
+                // need to wait until all proxies are removed.
+                for (atomic_backoff backoff;; backoff.pause()) {
+                    scoped_lock lock(mutex(), /*is_writer=*/false);
+                    if (my_head.load(std::memory_order_relaxed) == nullptr) { break; }
+                }
 
-void observer_list::insert( observer_proxy* p ) {
-    scoped_lock lock(mutex(), /*is_writer=*/true);
-    if (my_head.load(std::memory_order_relaxed)) {
-        p->my_prev = my_tail.load(std::memory_order_relaxed);
-        my_tail.load(std::memory_order_relaxed)->my_next = p;
-    } else {
-        my_head.store(p, std::memory_order_relaxed);
-    }
-    my_tail.store(p, std::memory_order_relaxed);
-}
+                __TBB_ASSERT(my_head.load(std::memory_order_relaxed) == nullptr
+                                     && my_tail.load(std::memory_order_relaxed) == nullptr,
+                             nullptr);
+            }
 
-void observer_list::remove(observer_proxy* p) {
-    __TBB_ASSERT(my_head.load(std::memory_order_relaxed), "Attempt to remove an item from an empty list");
-    __TBB_ASSERT(!my_tail.load(std::memory_order_relaxed)->my_next, "Last item's my_next must be nullptr");
-    if (p == my_tail.load(std::memory_order_relaxed)) {
-        __TBB_ASSERT(!p->my_next, nullptr);
-        my_tail.store(p->my_prev, std::memory_order_relaxed);
-    } else {
-        __TBB_ASSERT(p->my_next, nullptr);
-        p->my_next->my_prev = p->my_prev;
-    }
-    if (p == my_head.load(std::memory_order_relaxed)) {
-        __TBB_ASSERT(!p->my_prev, nullptr);
-        my_head.store(p->my_next, std::memory_order_relaxed);
-    } else {
-        __TBB_ASSERT(p->my_prev, nullptr);
-        p->my_prev->my_next = p->my_next;
-    }
-    __TBB_ASSERT((my_head.load(std::memory_order_relaxed) && my_tail.load(std::memory_order_relaxed)) ||
-        (!my_head.load(std::memory_order_relaxed) && !my_tail.load(std::memory_order_relaxed)), nullptr);
-}
+            void observer_list::insert(observer_proxy* p) {
+                scoped_lock lock(mutex(), /*is_writer=*/true);
+                if (my_head.load(std::memory_order_relaxed)) {
+                    p->my_prev = my_tail.load(std::memory_order_relaxed);
+                    my_tail.load(std::memory_order_relaxed)->my_next = p;
+                } else {
+                    my_head.store(p, std::memory_order_relaxed);
+                }
+                my_tail.store(p, std::memory_order_relaxed);
+            }
 
-void observer_list::remove_ref(observer_proxy* p) {
-    std::uintptr_t r = p->my_ref_count.load(std::memory_order_acquire);
-    __TBB_ASSERT(is_alive(r), nullptr);
-    while (r > 1) {
-        if (p->my_ref_count.compare_exchange_strong(r, r - 1)) {
-            return;
-        }
-    }
-    __TBB_ASSERT(r == 1, nullptr);
-    // Reference count might go to zero
-    {
-        // Use lock to avoid resurrection by a thread concurrently walking the list
-        observer_list::scoped_lock lock(mutex(), /*is_writer=*/true);
-        r = --p->my_ref_count;
-        if (!r) {
-            remove(p);
-        }
-    }
-    __TBB_ASSERT(r || !p->my_ref_count, nullptr);
-    if (!r) {
-        delete p;
-    }
-}
+            void observer_list::remove(observer_proxy* p) {
+                __TBB_ASSERT(my_head.load(std::memory_order_relaxed),
+                             "Attempt to remove an item from an empty list");
+                __TBB_ASSERT(!my_tail.load(std::memory_order_relaxed)->my_next,
+                             "Last item's my_next must be nullptr");
+                if (p == my_tail.load(std::memory_order_relaxed)) {
+                    __TBB_ASSERT(!p->my_next, nullptr);
+                    my_tail.store(p->my_prev, std::memory_order_relaxed);
+                } else {
+                    __TBB_ASSERT(p->my_next, nullptr);
+                    p->my_next->my_prev = p->my_prev;
+                }
+                if (p == my_head.load(std::memory_order_relaxed)) {
+                    __TBB_ASSERT(!p->my_prev, nullptr);
+                    my_head.store(p->my_next, std::memory_order_relaxed);
+                } else {
+                    __TBB_ASSERT(p->my_prev, nullptr);
+                    p->my_prev->my_next = p->my_next;
+                }
+                __TBB_ASSERT(
+                        (my_head.load(std::memory_order_relaxed) && my_tail.load(std::memory_order_relaxed))
+                                || (!my_head.load(std::memory_order_relaxed)
+                                    && !my_tail.load(std::memory_order_relaxed)),
+                        nullptr);
+            }
 
-void observer_list::do_notify_entry_observers(observer_proxy*& last, bool worker) {
-    // Pointer p marches though the list from last (exclusively) to the end.
-    observer_proxy* p = last, * prev = p;
-    for (;;) {
-        d1::task_scheduler_observer* tso = nullptr;
-        // Hold lock on list only long enough to advance to the next proxy in the list.
-        {
-            scoped_lock lock(mutex(), /*is_writer=*/false);
-            do {
-                if (p) {
-                    // We were already processing the list.
-                    if (observer_proxy* q = p->my_next) {
-                        if (p == prev) {
-                            remove_ref_fast(prev); // sets prev to nullptr if successful
-                        }
-                        p = q;
-                    } else {
-                        // Reached the end of the list.
-                        if (p == prev) {
-                            // Keep the reference as we store the 'last' pointer in scheduler
-                            __TBB_ASSERT(int(p->my_ref_count.load(std::memory_order_relaxed)) >= 1 + (p->my_observer ? 1 : 0), nullptr);
-                        } else {
-                            // The last few proxies were empty
-                            __TBB_ASSERT(int(p->my_ref_count.load(std::memory_order_relaxed)), nullptr);
-                            ++p->my_ref_count;
-                            if (prev) {
-                                lock.release();
-                                remove_ref(prev);
+            void observer_list::remove_ref(observer_proxy* p) {
+                std::uintptr_t r = p->my_ref_count.load(std::memory_order_acquire);
+                __TBB_ASSERT(is_alive(r), nullptr);
+                while (r > 1) {
+                    if (p->my_ref_count.compare_exchange_strong(r, r - 1)) { return; }
+                }
+                __TBB_ASSERT(r == 1, nullptr);
+                // Reference count might go to zero
+                {
+                    // Use lock to avoid resurrection by a thread concurrently walking the list
+                    observer_list::scoped_lock lock(mutex(), /*is_writer=*/true);
+                    r = --p->my_ref_count;
+                    if (!r) { remove(p); }
+                }
+                __TBB_ASSERT(r || !p->my_ref_count, nullptr);
+                if (!r) { delete p; }
+            }
+
+            void observer_list::do_notify_entry_observers(observer_proxy*& last, bool worker) {
+                // Pointer p marches though the list from last (exclusively) to the end.
+                observer_proxy *p = last, *prev = p;
+                for (;;) {
+                    d1::task_scheduler_observer* tso = nullptr;
+                    // Hold lock on list only long enough to advance to the next proxy in the list.
+                    {
+                        scoped_lock lock(mutex(), /*is_writer=*/false);
+                        do {
+                            if (p) {
+                                // We were already processing the list.
+                                if (observer_proxy* q = p->my_next) {
+                                    if (p == prev) {
+                                        remove_ref_fast(prev);// sets prev to nullptr if successful
+                                    }
+                                    p = q;
+                                } else {
+                                    // Reached the end of the list.
+                                    if (p == prev) {
+                                        // Keep the reference as we store the 'last' pointer in scheduler
+                                        __TBB_ASSERT(int(p->my_ref_count.load(std::memory_order_relaxed))
+                                                             >= 1 + (p->my_observer ? 1 : 0),
+                                                     nullptr);
+                                    } else {
+                                        // The last few proxies were empty
+                                        __TBB_ASSERT(int(p->my_ref_count.load(std::memory_order_relaxed)),
+                                                     nullptr);
+                                        ++p->my_ref_count;
+                                        if (prev) {
+                                            lock.release();
+                                            remove_ref(prev);
+                                        }
+                                    }
+                                    last = p;
+                                    return;
+                                }
+                            } else {
+                                // Starting pass through the list
+                                p = my_head.load(std::memory_order_relaxed);
+                                if (!p) { return; }
                             }
-                        }
-                        last = p;
-                        return;
-                    }
-                } else {
-                    // Starting pass through the list
-                    p = my_head.load(std::memory_order_relaxed);
-                    if (!p) {
-                        return;
+                            tso = p->my_observer;
+                        } while (!tso);
+                        ++p->my_ref_count;
+                        ++tso->my_busy_count;
                     }
+                    __TBB_ASSERT(!prev || p != prev, nullptr);
+                    // Release the proxy pinned before p
+                    if (prev) { remove_ref(prev); }
+                    // Do not hold any locks on the list while calling user's code.
+                    // Do not intercept any exceptions that may escape the callback so that
+                    // they are either handled by the TBB scheduler or passed to the debugger.
+                    tso->on_scheduler_entry(worker);
+                    __TBB_ASSERT(p->my_ref_count.load(std::memory_order_relaxed), nullptr);
+                    intptr_t bc = --tso->my_busy_count;
+                    __TBB_ASSERT_EX(bc >= 0, "my_busy_count underflowed");
+                    prev = p;
                 }
-                tso = p->my_observer;
-            } while (!tso);
-            ++p->my_ref_count;
-            ++tso->my_busy_count;
-        }
-        __TBB_ASSERT(!prev || p != prev, nullptr);
-        // Release the proxy pinned before p
-        if (prev) {
-            remove_ref(prev);
-        }
-        // Do not hold any locks on the list while calling user's code.
-        // Do not intercept any exceptions that may escape the callback so that
-        // they are either handled by the TBB scheduler or passed to the debugger.
-        tso->on_scheduler_entry(worker);
-        __TBB_ASSERT(p->my_ref_count.load(std::memory_order_relaxed), nullptr);
-        intptr_t bc = --tso->my_busy_count;
-        __TBB_ASSERT_EX(bc >= 0, "my_busy_count underflowed");
-        prev = p;
-    }
-}
+            }
 
-void observer_list::do_notify_exit_observers(observer_proxy* last, bool worker) {
-    // Pointer p marches though the list from the beginning to last (inclusively).
-    observer_proxy* p = nullptr, * prev = nullptr;
-    for (;;) {
-        d1::task_scheduler_observer* tso = nullptr;
-        // Hold lock on list only long enough to advance to the next proxy in the list.
-        {
-            scoped_lock lock(mutex(), /*is_writer=*/false);
-            do {
-                if (p) {
-                    // We were already processing the list.
-                    if (p != last) {
-                        __TBB_ASSERT(p->my_next, "List items before 'last' must have valid my_next pointer");
-                        if (p == prev)
-                            remove_ref_fast(prev); // sets prev to nullptr if successful
-                        p = p->my_next;
-                    } else {
-                        // remove the reference from the last item
-                        remove_ref_fast(p);
-                        if (p) {
-                            lock.release();
-                            if (p != prev && prev) {
-                                remove_ref(prev);
+            void observer_list::do_notify_exit_observers(observer_proxy* last, bool worker) {
+                // Pointer p marches though the list from the beginning to last (inclusively).
+                observer_proxy *p = nullptr, *prev = nullptr;
+                for (;;) {
+                    d1::task_scheduler_observer* tso = nullptr;
+                    // Hold lock on list only long enough to advance to the next proxy in the list.
+                    {
+                        scoped_lock lock(mutex(), /*is_writer=*/false);
+                        do {
+                            if (p) {
+                                // We were already processing the list.
+                                if (p != last) {
+                                    __TBB_ASSERT(p->my_next,
+                                                 "List items before 'last' must have valid my_next pointer");
+                                    if (p == prev) remove_ref_fast(prev);// sets prev to nullptr if successful
+                                    p = p->my_next;
+                                } else {
+                                    // remove the reference from the last item
+                                    remove_ref_fast(p);
+                                    if (p) {
+                                        lock.release();
+                                        if (p != prev && prev) { remove_ref(prev); }
+                                        remove_ref(p);
+                                    }
+                                    return;
+                                }
+                            } else {
+                                // Starting pass through the list
+                                p = my_head.load(std::memory_order_relaxed);
+                                __TBB_ASSERT(
+                                        p, "Nonzero 'last' must guarantee that the global list is non-empty");
                             }
-                            remove_ref(p);
-                        }
-                        return;
+                            tso = p->my_observer;
+                        } while (!tso);
+                        // The item is already refcounted
+                        if (p != last)// the last is already referenced since entry notification
+                            ++p->my_ref_count;
+                        ++tso->my_busy_count;
                     }
-                } else {
-                    // Starting pass through the list
-                    p = my_head.load(std::memory_order_relaxed);
-                    __TBB_ASSERT(p, "Nonzero 'last' must guarantee that the global list is non-empty");
+                    __TBB_ASSERT(!prev || p != prev, nullptr);
+                    if (prev) remove_ref(prev);
+                    // Do not hold any locks on the list while calling user's code.
+                    // Do not intercept any exceptions that may escape the callback so that
+                    // they are either handled by the TBB scheduler or passed to the debugger.
+                    tso->on_scheduler_exit(worker);
+                    __TBB_ASSERT(p->my_ref_count || p == last, nullptr);
+                    intptr_t bc = --tso->my_busy_count;
+                    __TBB_ASSERT_EX(bc >= 0, "my_busy_count underflowed");
+                    prev = p;
                 }
-                tso = p->my_observer;
-            } while (!tso);
-            // The item is already refcounted
-            if (p != last) // the last is already referenced since entry notification
-                ++p->my_ref_count;
-            ++tso->my_busy_count;
-        }
-        __TBB_ASSERT(!prev || p != prev, nullptr);
-        if (prev)
-            remove_ref(prev);
-        // Do not hold any locks on the list while calling user's code.
-        // Do not intercept any exceptions that may escape the callback so that
-        // they are either handled by the TBB scheduler or passed to the debugger.
-        tso->on_scheduler_exit(worker);
-        __TBB_ASSERT(p->my_ref_count || p == last, nullptr);
-        intptr_t bc = --tso->my_busy_count;
-        __TBB_ASSERT_EX(bc >= 0, "my_busy_count underflowed");
-        prev = p;
-    }
-}
+            }
 
-void __TBB_EXPORTED_FUNC observe(d1::task_scheduler_observer &tso, bool enable) {
-    if( enable ) {
-        if( !tso.my_proxy.load(std::memory_order_relaxed) ) {
-            observer_proxy* p = new observer_proxy(tso);
-            tso.my_proxy.store(p, std::memory_order_relaxed);
-            tso.my_busy_count.store(0, std::memory_order_relaxed);
+            void __TBB_EXPORTED_FUNC observe(d1::task_scheduler_observer& tso, bool enable) {
+                if (enable) {
+                    if (!tso.my_proxy.load(std::memory_order_relaxed)) {
+                        observer_proxy* p = new observer_proxy(tso);
+                        tso.my_proxy.store(p, std::memory_order_relaxed);
+                        tso.my_busy_count.store(0, std::memory_order_relaxed);
 
-            thread_data* td = governor::get_thread_data_if_initialized();
-            if (p->my_observer->my_task_arena == nullptr) {
-                if (!(td && td->my_arena)) {
-                    td = governor::get_thread_data();
-                }
-                __TBB_ASSERT(__TBB_InitOnce::initialization_done(), nullptr);
-                __TBB_ASSERT(td && td->my_arena, nullptr);
-                p->my_list = &td->my_arena->my_observers;
-            } else {
-                d1::task_arena* ta = p->my_observer->my_task_arena;
-                arena* a = ta->my_arena.load(std::memory_order_acquire);
-                if (a == nullptr) { // Avoid recursion during arena initialization
-                    ta->initialize();
-                    a = ta->my_arena.load(std::memory_order_relaxed);
-                }
-                __TBB_ASSERT(a != nullptr, nullptr);
-                p->my_list = &a->my_observers;
-            }
-            p->my_list->insert(p);
-            // Notify newly activated observer and other pending ones if it belongs to current arena
-            if (td && td->my_arena && &td->my_arena->my_observers == p->my_list) {
-                p->my_list->notify_entry_observers(td->my_last_observer, td->my_is_worker);
-            }
-        }
-    } else {
-        // Make sure that possible concurrent proxy list cleanup does not conflict
-        // with the observer destruction here.
-        if ( observer_proxy* proxy = tso.my_proxy.exchange(nullptr) ) {
-            // List destruction should not touch this proxy after we've won the above interlocked exchange.
-            __TBB_ASSERT( proxy->my_observer == &tso, nullptr);
-            __TBB_ASSERT( is_alive(proxy->my_ref_count.load(std::memory_order_relaxed)), "Observer's proxy died prematurely" );
-            __TBB_ASSERT( proxy->my_ref_count.load(std::memory_order_relaxed) >= 1, "reference for observer missing" );
-            observer_list &list = *proxy->my_list;
-            {
-                // Ensure that none of the list walkers relies on observer pointer validity
-                observer_list::scoped_lock lock(list.mutex(), /*is_writer=*/true);
-                proxy->my_observer = nullptr;
-                // Proxy may still be held by other threads (to track the last notified observer)
-                if( !--proxy->my_ref_count ) {// nobody can increase it under exclusive lock
-                    list.remove(proxy);
-                    __TBB_ASSERT( !proxy->my_ref_count, nullptr);
-                    delete proxy;
+                        thread_data* td = governor::get_thread_data_if_initialized();
+                        if (p->my_observer->my_task_arena == nullptr) {
+                            if (!(td && td->my_arena)) { td = governor::get_thread_data(); }
+                            __TBB_ASSERT(__TBB_InitOnce::initialization_done(), nullptr);
+                            __TBB_ASSERT(td && td->my_arena, nullptr);
+                            p->my_list = &td->my_arena->my_observers;
+                        } else {
+                            d1::task_arena* ta = p->my_observer->my_task_arena;
+                            arena* a = ta->my_arena.load(std::memory_order_acquire);
+                            if (a == nullptr) {// Avoid recursion during arena initialization
+                                ta->initialize();
+                                a = ta->my_arena.load(std::memory_order_relaxed);
+                            }
+                            __TBB_ASSERT(a != nullptr, nullptr);
+                            p->my_list = &a->my_observers;
+                        }
+                        p->my_list->insert(p);
+                        // Notify newly activated observer and other pending ones if it belongs to current arena
+                        if (td && td->my_arena && &td->my_arena->my_observers == p->my_list) {
+                            p->my_list->notify_entry_observers(td->my_last_observer, td->my_is_worker);
+                        }
+                    }
+                } else {
+                    // Make sure that possible concurrent proxy list cleanup does not conflict
+                    // with the observer destruction here.
+                    if (observer_proxy* proxy = tso.my_proxy.exchange(nullptr)) {
+                        // List destruction should not touch this proxy after we've won the above interlocked exchange.
+                        __TBB_ASSERT(proxy->my_observer == &tso, nullptr);
+                        __TBB_ASSERT(is_alive(proxy->my_ref_count.load(std::memory_order_relaxed)),
+                                     "Observer's proxy died prematurely");
+                        __TBB_ASSERT(proxy->my_ref_count.load(std::memory_order_relaxed) >= 1,
+                                     "reference for observer missing");
+                        observer_list& list = *proxy->my_list;
+                        {
+                            // Ensure that none of the list walkers relies on observer pointer validity
+                            observer_list::scoped_lock lock(list.mutex(), /*is_writer=*/true);
+                            proxy->my_observer = nullptr;
+                            // Proxy may still be held by other threads (to track the last notified observer)
+                            if (!--proxy->my_ref_count) {// nobody can increase it under exclusive lock
+                                list.remove(proxy);
+                                __TBB_ASSERT(!proxy->my_ref_count, nullptr);
+                                delete proxy;
+                            }
+                        }
+                        spin_wait_until_eq(tso.my_busy_count,
+                                           0);// other threads are still accessing the callback
+                    }
                 }
             }
-            spin_wait_until_eq(tso.my_busy_count, 0); // other threads are still accessing the callback
-        }
-    }
-}
 
-} // namespace r1
-} // namespace detail
-} // namespace tbb
+        }// namespace r1
+    }    // namespace detail
+}// namespace tbb
diff --git a/external/tbb/src/tbb/parallel_pipeline.cpp b/external/tbb/src/tbb/parallel_pipeline.cpp
index bb8587b9..6a7c6433 100644
--- a/external/tbb/src/tbb/parallel_pipeline.cpp
+++ b/external/tbb/src/tbb/parallel_pipeline.cpp
@@ -15,457 +15,430 @@
 */
 
 #include "oneapi/tbb/parallel_pipeline.h"
-#include "oneapi/tbb/spin_mutex.h"
-#include "oneapi/tbb/tbb_allocator.h"
-#include "oneapi/tbb/cache_aligned_allocator.h"
 #include "itt_notify.h"
-#include "tls.h"
+#include "oneapi/tbb/cache_aligned_allocator.h"
 #include "oneapi/tbb/detail/_exception.h"
 #include "oneapi/tbb/detail/_small_object_pool.h"
+#include "oneapi/tbb/spin_mutex.h"
+#include "oneapi/tbb/tbb_allocator.h"
+#include "tls.h"
 
 namespace tbb {
-namespace detail {
-namespace r1 {
-
-void handle_perror(int error_code, const char* aux_info);
-
-using Token = unsigned long;
-
-//! A processing pipeline that applies filters to items.
-/** @ingroup algorithms */
-class pipeline {
-    friend void parallel_pipeline(d1::task_group_context&, std::size_t, const d1::filter_node&);
-public:
-
-    //! Construct empty pipeline.
-    pipeline(d1::task_group_context& cxt, std::size_t max_token) :
-        my_context(cxt),
-        first_filter(nullptr),
-        last_filter(nullptr),
-        input_tokens(Token(max_token)),
-        end_of_input(false),
-        wait_ctx(0) {
-            __TBB_ASSERT( max_token>0, "pipeline::run must have at least one token" );
-        }
-
-    ~pipeline();
-
-    //! Add filter to end of pipeline.
-    void add_filter( d1::base_filter& );
-
-    //! Traverse tree of fitler-node in-order and add filter for each leaf
-    void fill_pipeline(const d1::filter_node& root) {
-        if( root.left && root.right ) {
-            fill_pipeline(*root.left);
-            fill_pipeline(*root.right);
-        }
-        else {
-            __TBB_ASSERT(!root.left && !root.right, "tree should be full");
-            add_filter(*root.create_filter());
-        }
-    }
-
-private:
-    friend class stage_task;
-    friend class base_filter;
-    friend void set_end_of_input(d1::base_filter& bf);
-
-    task_group_context& my_context;
-
-    //! Pointer to first filter in the pipeline.
-    d1::base_filter* first_filter;
-
-    //! Pointer to last filter in the pipeline.
-    d1::base_filter* last_filter;
-
-    //! Number of idle tokens waiting for input stage.
-    std::atomic<Token> input_tokens;
-
-    //! False until flow_control::stop() is called.
-    std::atomic<bool> end_of_input;
-
-    d1::wait_context wait_ctx;
-};
-
-//! This structure is used to store task information in an input buffer
-struct task_info {
-    void* my_object = nullptr;
-    //! Invalid unless a task went through an ordered stage.
-    Token my_token = 0;
-    //! False until my_token is set.
-    bool my_token_ready  = false;
-    //! True if my_object is valid.
-    bool is_valid = false;
-    //! Set to initial state (no object, no token)
-    void reset() {
-        my_object = nullptr;
-        my_token = 0;
-        my_token_ready = false;
-        is_valid = false;
-    }
-};
-
-//! A buffer of input items for a filter.
-/** Each item is a task_info, inserted into a position in the buffer corresponding to a Token. */
-class input_buffer {
-    friend class base_filter;
-    friend class stage_task;
-    friend class pipeline;
-    friend void set_end_of_input(d1::base_filter& bf);
-
-    using size_type = Token;
-
-    //! Array of deferred tasks that cannot yet start executing.
-    task_info* array;
-
-    //! Size of array
-    /** Always 0 or a power of 2 */
-    size_type array_size;
-
-    //! Lowest token that can start executing.
-    /** All prior Token have already been seen. */
-    Token low_token;
-
-    //! Serializes updates.
-    spin_mutex array_mutex;
-
-    //! Resize "array".
-    /** Caller is responsible to acquiring a lock on "array_mutex". */
-    void grow( size_type minimum_size );
-
-    //! Initial size for "array"
-    /** Must be a power of 2 */
-    static const size_type initial_buffer_size = 4;
-
-    //! Used for out of order buffer, and for assigning my_token if is_ordered and my_token not already assigned
-    Token high_token;
-
-    //! True for ordered filter, false otherwise.
-    const bool is_ordered;
-
-    //! for parallel filters that accepts nullptrs, thread-local flag for reaching end_of_input
-    using end_of_input_tls_t = basic_tls<input_buffer*>;
-    end_of_input_tls_t end_of_input_tls;
-    bool end_of_input_tls_allocated; // no way to test pthread creation of TLS
-
-public:
-    input_buffer(const input_buffer&) = delete;
-    input_buffer& operator=(const input_buffer&) = delete;
-
-    //! Construct empty buffer.
-    input_buffer( bool ordered) :
-            array(nullptr),
-            array_size(0),
-            low_token(0),
-            high_token(0),
-            is_ordered(ordered),
-            end_of_input_tls(),
-            end_of_input_tls_allocated(false) {
-        grow(initial_buffer_size);
-        __TBB_ASSERT( array, nullptr );
-    }
-
-    //! Destroy the buffer.
-    ~input_buffer() {
-        __TBB_ASSERT( array, nullptr );
-        cache_aligned_allocator<task_info>().deallocate(array,array_size);
-        poison_pointer( array );
-        if( end_of_input_tls_allocated ) {
-            destroy_my_tls();
-        }
-    }
-
-    //! Define order when the first filter is serial_in_order.
-    Token get_ordered_token(){
-        return high_token++;
-    }
-
-    //! Put a token into the buffer.
-    /** If task information was placed into buffer, returns true;
+    namespace detail {
+        namespace r1 {
+
+            void handle_perror(int error_code, const char* aux_info);
+
+            using Token = unsigned long;
+
+            //! A processing pipeline that applies filters to items.
+            /** @ingroup algorithms */
+            class pipeline {
+                friend void parallel_pipeline(d1::task_group_context&, std::size_t, const d1::filter_node&);
+
+            public:
+                //! Construct empty pipeline.
+                pipeline(d1::task_group_context& cxt, std::size_t max_token)
+                    : my_context(cxt), first_filter(nullptr), last_filter(nullptr),
+                      input_tokens(Token(max_token)), end_of_input(false), wait_ctx(0) {
+                    __TBB_ASSERT(max_token > 0, "pipeline::run must have at least one token");
+                }
+
+                ~pipeline();
+
+                //! Add filter to end of pipeline.
+                void add_filter(d1::base_filter&);
+
+                //! Traverse tree of fitler-node in-order and add filter for each leaf
+                void fill_pipeline(const d1::filter_node& root) {
+                    if (root.left && root.right) {
+                        fill_pipeline(*root.left);
+                        fill_pipeline(*root.right);
+                    } else {
+                        __TBB_ASSERT(!root.left && !root.right, "tree should be full");
+                        add_filter(*root.create_filter());
+                    }
+                }
+
+            private:
+                friend class stage_task;
+                friend class base_filter;
+                friend void set_end_of_input(d1::base_filter& bf);
+
+                task_group_context& my_context;
+
+                //! Pointer to first filter in the pipeline.
+                d1::base_filter* first_filter;
+
+                //! Pointer to last filter in the pipeline.
+                d1::base_filter* last_filter;
+
+                //! Number of idle tokens waiting for input stage.
+                std::atomic<Token> input_tokens;
+
+                //! False until flow_control::stop() is called.
+                std::atomic<bool> end_of_input;
+
+                d1::wait_context wait_ctx;
+            };
+
+            //! This structure is used to store task information in an input buffer
+            struct task_info {
+                void* my_object = nullptr;
+                //! Invalid unless a task went through an ordered stage.
+                Token my_token = 0;
+                //! False until my_token is set.
+                bool my_token_ready = false;
+                //! True if my_object is valid.
+                bool is_valid = false;
+                //! Set to initial state (no object, no token)
+                void reset() {
+                    my_object = nullptr;
+                    my_token = 0;
+                    my_token_ready = false;
+                    is_valid = false;
+                }
+            };
+
+            //! A buffer of input items for a filter.
+            /** Each item is a task_info, inserted into a position in the buffer corresponding to a Token. */
+            class input_buffer {
+                friend class base_filter;
+                friend class stage_task;
+                friend class pipeline;
+                friend void set_end_of_input(d1::base_filter& bf);
+
+                using size_type = Token;
+
+                //! Array of deferred tasks that cannot yet start executing.
+                task_info* array;
+
+                //! Size of array
+                /** Always 0 or a power of 2 */
+                size_type array_size;
+
+                //! Lowest token that can start executing.
+                /** All prior Token have already been seen. */
+                Token low_token;
+
+                //! Serializes updates.
+                spin_mutex array_mutex;
+
+                //! Resize "array".
+                /** Caller is responsible to acquiring a lock on "array_mutex". */
+                void grow(size_type minimum_size);
+
+                //! Initial size for "array"
+                /** Must be a power of 2 */
+                static const size_type initial_buffer_size = 4;
+
+                //! Used for out of order buffer, and for assigning my_token if is_ordered and my_token not already assigned
+                Token high_token;
+
+                //! True for ordered filter, false otherwise.
+                const bool is_ordered;
+
+                //! for parallel filters that accepts nullptrs, thread-local flag for reaching end_of_input
+                using end_of_input_tls_t = basic_tls<input_buffer*>;
+                end_of_input_tls_t end_of_input_tls;
+                bool end_of_input_tls_allocated;// no way to test pthread creation of TLS
+
+            public:
+                input_buffer(const input_buffer&) = delete;
+                input_buffer& operator=(const input_buffer&) = delete;
+
+                //! Construct empty buffer.
+                input_buffer(bool ordered)
+                    : array(nullptr), array_size(0), low_token(0), high_token(0), is_ordered(ordered),
+                      end_of_input_tls(), end_of_input_tls_allocated(false) {
+                    grow(initial_buffer_size);
+                    __TBB_ASSERT(array, nullptr);
+                }
+
+                //! Destroy the buffer.
+                ~input_buffer() {
+                    __TBB_ASSERT(array, nullptr);
+                    cache_aligned_allocator<task_info>().deallocate(array, array_size);
+                    poison_pointer(array);
+                    if (end_of_input_tls_allocated) { destroy_my_tls(); }
+                }
+
+                //! Define order when the first filter is serial_in_order.
+                Token get_ordered_token() { return high_token++; }
+
+                //! Put a token into the buffer.
+                /** If task information was placed into buffer, returns true;
         otherwise returns false, informing the caller to create and spawn a task.
     */
-    bool try_put_token( task_info& info ) {
-        info.is_valid = true;
-        spin_mutex::scoped_lock lock( array_mutex );
-        Token token;
-        if( is_ordered ) {
-            if( !info.my_token_ready ) {
-                info.my_token = high_token++;
-                info.my_token_ready = true;
+                bool try_put_token(task_info& info) {
+                    info.is_valid = true;
+                    spin_mutex::scoped_lock lock(array_mutex);
+                    Token token;
+                    if (is_ordered) {
+                        if (!info.my_token_ready) {
+                            info.my_token = high_token++;
+                            info.my_token_ready = true;
+                        }
+                        token = info.my_token;
+                    } else
+                        token = high_token++;
+                    __TBB_ASSERT((long) (token - low_token) >= 0, nullptr);
+                    if (token != low_token) {
+                        // Trying to put token that is beyond low_token.
+                        // Need to wait until low_token catches up before dispatching.
+                        if (token - low_token >= array_size) grow(token - low_token + 1);
+                        ITT_NOTIFY(sync_releasing, this);
+                        array[token & (array_size - 1)] = info;
+                        return true;
+                    }
+                    return false;
+                }
+
+                //! Note that processing of a token is finished.
+                /** Fires up processing of the next token, if processing was deferred. */
+                // Uses template to avoid explicit dependency on stage_task.
+                template <typename StageTask>
+                void try_to_spawn_task_for_next_token(StageTask& spawner, d1::execution_data& ed) {
+                    task_info wakee;
+                    {
+                        spin_mutex::scoped_lock lock(array_mutex);
+                        // Wake the next task
+                        task_info& item = array[++low_token & (array_size - 1)];
+                        ITT_NOTIFY(sync_acquired, this);
+                        wakee = item;
+                        item.is_valid = false;
+                    }
+                    if (wakee.is_valid) spawner.spawn_stage_task(wakee, ed);
+                }
+
+                // end_of_input signal for parallel_pipeline, parallel input filters with 0 tokens allowed.
+                void create_my_tls() {
+                    int status = end_of_input_tls.create();
+                    if (status) handle_perror(status, "TLS not allocated for filter");
+                    end_of_input_tls_allocated = true;
+                }
+                void destroy_my_tls() {
+                    int status = end_of_input_tls.destroy();
+                    if (status) handle_perror(status, "Failed to destroy filter TLS");
+                }
+                bool my_tls_end_of_input() { return end_of_input_tls.get() != nullptr; }
+                void set_my_tls_end_of_input() { end_of_input_tls.set(this); }
+            };
+
+            void input_buffer::grow(size_type minimum_size) {
+                size_type old_size = array_size;
+                size_type new_size = old_size ? 2 * old_size : initial_buffer_size;
+                while (new_size < minimum_size) new_size *= 2;
+                task_info* new_array = cache_aligned_allocator<task_info>().allocate(new_size);
+                task_info* old_array = array;
+                for (size_type i = 0; i < new_size; ++i) new_array[i].is_valid = false;
+                Token t = low_token;
+                for (size_type i = 0; i < old_size; ++i, ++t)
+                    new_array[t & (new_size - 1)] = old_array[t & (old_size - 1)];
+                array = new_array;
+                array_size = new_size;
+                if (old_array) cache_aligned_allocator<task_info>().deallocate(old_array, old_size);
             }
-            token = info.my_token;
-        } else
-            token = high_token++;
-        __TBB_ASSERT( (long)(token-low_token)>=0, nullptr );
-        if( token!=low_token ) {
-            // Trying to put token that is beyond low_token.
-            // Need to wait until low_token catches up before dispatching.
-            if( token-low_token>=array_size )
-                grow( token-low_token+1 );
-            ITT_NOTIFY( sync_releasing, this );
-            array[token&(array_size-1)] = info;
-            return true;
-        }
-        return false;
-    }
-
-    //! Note that processing of a token is finished.
-    /** Fires up processing of the next token, if processing was deferred. */
-    // Uses template to avoid explicit dependency on stage_task.
-    template<typename StageTask>
-    void try_to_spawn_task_for_next_token(StageTask& spawner, d1::execution_data& ed) {
-        task_info wakee;
-        {
-            spin_mutex::scoped_lock lock( array_mutex );
-            // Wake the next task
-            task_info& item = array[++low_token & (array_size-1)];
-            ITT_NOTIFY( sync_acquired, this );
-            wakee = item;
-            item.is_valid = false;
-        }
-        if( wakee.is_valid )
-            spawner.spawn_stage_task(wakee, ed);
-    }
-
-    // end_of_input signal for parallel_pipeline, parallel input filters with 0 tokens allowed.
-    void create_my_tls() {
-        int status = end_of_input_tls.create();
-        if(status)
-            handle_perror(status, "TLS not allocated for filter");
-        end_of_input_tls_allocated = true;
-    }
-    void destroy_my_tls() {
-        int status = end_of_input_tls.destroy();
-        if(status)
-            handle_perror(status, "Failed to destroy filter TLS");
-    }
-    bool my_tls_end_of_input() {
-        return end_of_input_tls.get() != nullptr;
-    }
-    void set_my_tls_end_of_input() {
-        end_of_input_tls.set(this);
-    }
-};
-
-void input_buffer::grow( size_type minimum_size ) {
-    size_type old_size = array_size;
-    size_type new_size = old_size ? 2*old_size : initial_buffer_size;
-    while( new_size<minimum_size )
-        new_size*=2;
-    task_info* new_array = cache_aligned_allocator<task_info>().allocate(new_size);
-    task_info* old_array = array;
-    for( size_type i=0; i<new_size; ++i )
-        new_array[i].is_valid = false;
-    Token t=low_token;
-    for( size_type i=0; i<old_size; ++i, ++t )
-        new_array[t&(new_size-1)] = old_array[t&(old_size-1)];
-    array = new_array;
-    array_size = new_size;
-    if( old_array )
-        cache_aligned_allocator<task_info>().deallocate(old_array,old_size);
-}
-
-class stage_task : public d1::task, public task_info {
-private:
-    friend class pipeline;
-    pipeline& my_pipeline;
-    d1::base_filter* my_filter;
-    d1::small_object_allocator m_allocator;
-    //! True if this task has not yet read the input.
-    bool my_at_start;
-
-    //! True if this can be executed again.
-    bool execute_filter(d1::execution_data& ed);
-
-    //! Spawn task if token is available.
-    void try_spawn_stage_task(d1::execution_data& ed) {
-        ITT_NOTIFY( sync_releasing, &my_pipeline.input_tokens );
-        if( (my_pipeline.input_tokens.fetch_sub(1, std::memory_order_release)) > 1 ) {
-            d1::small_object_allocator alloc{};
-            r1::spawn( *alloc.new_object<stage_task>(ed, my_pipeline, alloc ), my_pipeline.my_context );
-        }
-    }
-
-public:
-
-    //! Construct stage_task for first stage in a pipeline.
-    /** Such a stage has not read any input yet. */
-    stage_task(pipeline& pipeline, d1::small_object_allocator& alloc ) :
-        my_pipeline(pipeline),
-        my_filter(pipeline.first_filter),
-        m_allocator(alloc),
-        my_at_start(true)
-    {
-        task_info::reset();
-        my_pipeline.wait_ctx.reserve();
-    }
-    //! Construct stage_task for a subsequent stage in a pipeline.
-    stage_task(pipeline& pipeline, d1::base_filter* filter, const task_info& info, d1::small_object_allocator& alloc) :
-        task_info(info),
-        my_pipeline(pipeline),
-        my_filter(filter),
-        m_allocator(alloc),
-        my_at_start(false)
-    {
-        my_pipeline.wait_ctx.reserve();
-    }
-    //! Roughly equivalent to the constructor of input stage task
-    void reset() {
-        task_info::reset();
-        my_filter = my_pipeline.first_filter;
-        my_at_start = true;
-    }
-    void finalize(d1::execution_data& ed) {
-        m_allocator.delete_object(this, ed);
-    }
-    //! The virtual task execution method
-    task* execute(d1::execution_data& ed) override {
-        if(!execute_filter(ed)) {
-            finalize(ed);
-            return nullptr;
-        }
-        return this;
-    }
-    task* cancel(d1::execution_data& ed) override {
-        finalize(ed);
-        return nullptr;
-    }
-
-    ~stage_task() override {
-        if ( my_filter && my_object ) {
-            my_filter->finalize(my_object);
-            my_object = nullptr;
-        }
-        my_pipeline.wait_ctx.release();
-    }
-    //! Creates and spawns stage_task from task_info
-    void spawn_stage_task(const task_info& info, d1::execution_data& ed) {
-        d1::small_object_allocator alloc{};
-        stage_task* clone = alloc.new_object<stage_task>(ed, my_pipeline, my_filter, info, alloc);
-        r1::spawn(*clone, my_pipeline.my_context);
-    }
-};
-
-bool stage_task::execute_filter(d1::execution_data& ed) {
-    __TBB_ASSERT( !my_at_start || !my_object, "invalid state of task" );
-    if( my_at_start ) {
-        if( my_filter->is_serial() ) {
-            my_object = (*my_filter)(my_object);
-            if( my_object || ( my_filter->object_may_be_null() && !my_pipeline.end_of_input.load(std::memory_order_relaxed)) ) {
-                if( my_filter->is_ordered() ) {
-                    my_token = my_filter->my_input_buffer->get_ordered_token();
-                    my_token_ready = true;
+
+            class stage_task : public d1::task, public task_info {
+            private:
+                friend class pipeline;
+                pipeline& my_pipeline;
+                d1::base_filter* my_filter;
+                d1::small_object_allocator m_allocator;
+                //! True if this task has not yet read the input.
+                bool my_at_start;
+
+                //! True if this can be executed again.
+                bool execute_filter(d1::execution_data& ed);
+
+                //! Spawn task if token is available.
+                void try_spawn_stage_task(d1::execution_data& ed) {
+                    ITT_NOTIFY(sync_releasing, &my_pipeline.input_tokens);
+                    if ((my_pipeline.input_tokens.fetch_sub(1, std::memory_order_release)) > 1) {
+                        d1::small_object_allocator alloc {};
+                        r1::spawn(*alloc.new_object<stage_task>(ed, my_pipeline, alloc),
+                                  my_pipeline.my_context);
+                    }
                 }
-                if( !my_filter->next_filter_in_pipeline ) { // we're only filter in pipeline
-                    reset();
-                    return true;
+
+            public:
+                //! Construct stage_task for first stage in a pipeline.
+                /** Such a stage has not read any input yet. */
+                stage_task(pipeline& pipeline, d1::small_object_allocator& alloc)
+                    : my_pipeline(pipeline), my_filter(pipeline.first_filter), m_allocator(alloc),
+                      my_at_start(true) {
+                    task_info::reset();
+                    my_pipeline.wait_ctx.reserve();
+                }
+                //! Construct stage_task for a subsequent stage in a pipeline.
+                stage_task(pipeline& pipeline, d1::base_filter* filter, const task_info& info,
+                           d1::small_object_allocator& alloc)
+                    : task_info(info), my_pipeline(pipeline), my_filter(filter), m_allocator(alloc),
+                      my_at_start(false) {
+                    my_pipeline.wait_ctx.reserve();
+                }
+                //! Roughly equivalent to the constructor of input stage task
+                void reset() {
+                    task_info::reset();
+                    my_filter = my_pipeline.first_filter;
+                    my_at_start = true;
+                }
+                void finalize(d1::execution_data& ed) { m_allocator.delete_object(this, ed); }
+                //! The virtual task execution method
+                task* execute(d1::execution_data& ed) override {
+                    if (!execute_filter(ed)) {
+                        finalize(ed);
+                        return nullptr;
+                    }
+                    return this;
+                }
+                task* cancel(d1::execution_data& ed) override {
+                    finalize(ed);
+                    return nullptr;
+                }
+
+                ~stage_task() override {
+                    if (my_filter && my_object) {
+                        my_filter->finalize(my_object);
+                        my_object = nullptr;
+                    }
+                    my_pipeline.wait_ctx.release();
+                }
+                //! Creates and spawns stage_task from task_info
+                void spawn_stage_task(const task_info& info, d1::execution_data& ed) {
+                    d1::small_object_allocator alloc {};
+                    stage_task* clone = alloc.new_object<stage_task>(ed, my_pipeline, my_filter, info, alloc);
+                    r1::spawn(*clone, my_pipeline.my_context);
+                }
+            };
+
+            bool stage_task::execute_filter(d1::execution_data& ed) {
+                __TBB_ASSERT(!my_at_start || !my_object, "invalid state of task");
+                if (my_at_start) {
+                    if (my_filter->is_serial()) {
+                        my_object = (*my_filter)(my_object);
+                        if (my_object
+                            || (my_filter->object_may_be_null()
+                                && !my_pipeline.end_of_input.load(std::memory_order_relaxed))) {
+                            if (my_filter->is_ordered()) {
+                                my_token = my_filter->my_input_buffer->get_ordered_token();
+                                my_token_ready = true;
+                            }
+                            if (!my_filter->next_filter_in_pipeline) {// we're only filter in pipeline
+                                reset();
+                                return true;
+                            } else {
+                                try_spawn_stage_task(ed);
+                            }
+                        } else {
+                            my_pipeline.end_of_input.store(true, std::memory_order_relaxed);
+                            return false;
+                        }
+                    } else /*not is_serial*/ {
+                        if (my_pipeline.end_of_input.load(std::memory_order_relaxed)) { return false; }
+
+                        try_spawn_stage_task(ed);
+
+                        my_object = (*my_filter)(my_object);
+                        if (!my_object
+                            && (!my_filter->object_may_be_null()
+                                || my_filter->my_input_buffer->my_tls_end_of_input())) {
+                            my_pipeline.end_of_input.store(true, std::memory_order_relaxed);
+                            return false;
+                        }
+                    }
+                    my_at_start = false;
                 } else {
-                    try_spawn_stage_task(ed);
+                    my_object = (*my_filter)(my_object);
+                    if (my_filter->is_serial())
+                        my_filter->my_input_buffer->try_to_spawn_task_for_next_token(*this, ed);
+                }
+                my_filter = my_filter->next_filter_in_pipeline;
+                if (my_filter) {
+                    // There is another filter to execute.
+                    if (my_filter->is_serial()) {
+                        // The next filter must execute tokens when they are available (in order for serial_in_order)
+                        if (my_filter->my_input_buffer->try_put_token(*this)) {
+                            my_filter = nullptr;// To prevent deleting my_object twice if exception occurs
+                            return false;
+                        }
+                    }
+                } else {
+                    // Reached end of the pipe.
+                    std::size_t ntokens_avail
+                            = my_pipeline.input_tokens.fetch_add(1, std::memory_order_acquire);
+
+                    if (ntokens_avail > 0// Only recycle if there is one available token
+                        || my_pipeline.end_of_input.load(std::memory_order_relaxed)) {
+                        return false;// No need to recycle for new input
+                    }
+                    ITT_NOTIFY(sync_acquired, &my_pipeline.input_tokens);
+                    // Recycle as an input stage task.
+                    reset();
                 }
-            } else {
-                my_pipeline.end_of_input.store(true, std::memory_order_relaxed);
-                return false;
+                return true;
             }
-        } else /*not is_serial*/ {
-            if ( my_pipeline.end_of_input.load(std::memory_order_relaxed) ) {
-                return false;
+
+            pipeline::~pipeline() {
+                while (first_filter) {
+                    d1::base_filter* f = first_filter;
+                    if (input_buffer* b = f->my_input_buffer) {
+                        b->~input_buffer();
+                        deallocate_memory(b);
+                    }
+                    first_filter = f->next_filter_in_pipeline;
+                    f->~base_filter();
+                    deallocate_memory(f);
+                }
             }
 
-            try_spawn_stage_task(ed);
+            void pipeline::add_filter(d1::base_filter& new_fitler) {
+                __TBB_ASSERT(new_fitler.next_filter_in_pipeline == d1::base_filter::not_in_pipeline(),
+                             "filter already part of pipeline?");
+                new_fitler.my_pipeline = this;
+                if (first_filter == nullptr) first_filter = &new_fitler;
+                else
+                    last_filter->next_filter_in_pipeline = &new_fitler;
+                new_fitler.next_filter_in_pipeline = nullptr;
+                last_filter = &new_fitler;
+                if (new_fitler.is_serial()) {
+                    new_fitler.my_input_buffer = new (allocate_memory(sizeof(input_buffer)))
+                            input_buffer(new_fitler.is_ordered());
+                } else {
+                    if (first_filter == &new_fitler && new_fitler.object_may_be_null()) {
+                        //TODO: buffer only needed to hold TLS; could improve
+                        new_fitler.my_input_buffer = new (allocate_memory(sizeof(input_buffer)))
+                                input_buffer(/*is_ordered*/ false);
+                        new_fitler.my_input_buffer->create_my_tls();
+                    }
+                }
+            }
+
+            void __TBB_EXPORTED_FUNC parallel_pipeline(d1::task_group_context& cxt, std::size_t max_token,
+                                                       const d1::filter_node& fn) {
+                pipeline pipe(cxt, max_token);
+
+                pipe.fill_pipeline(fn);
+
+                d1::small_object_allocator alloc {};
+                stage_task& st = *alloc.new_object<stage_task>(pipe, alloc);
 
-            my_object = (*my_filter)(my_object);
-            if( !my_object && (!my_filter->object_may_be_null() || my_filter->my_input_buffer->my_tls_end_of_input()) ){
-                my_pipeline.end_of_input.store(true, std::memory_order_relaxed);
-                return false;
+                // Start execution of tasks
+                r1::execute_and_wait(st, cxt, pipe.wait_ctx, cxt);
             }
-        }
-        my_at_start = false;
-    } else {
-        my_object = (*my_filter)(my_object);
-        if( my_filter->is_serial() )
-            my_filter->my_input_buffer->try_to_spawn_task_for_next_token(*this, ed);
-    }
-    my_filter = my_filter->next_filter_in_pipeline;
-    if( my_filter ) {
-        // There is another filter to execute.
-        if( my_filter->is_serial() ) {
-            // The next filter must execute tokens when they are available (in order for serial_in_order)
-            if( my_filter->my_input_buffer->try_put_token(*this) ){
-                my_filter = nullptr; // To prevent deleting my_object twice if exception occurs
-                return false;
+
+            void __TBB_EXPORTED_FUNC set_end_of_input(d1::base_filter& bf) {
+                __TBB_ASSERT(bf.my_input_buffer, nullptr);
+                __TBB_ASSERT(bf.object_may_be_null(), nullptr);
+                if (bf.is_serial()) {
+                    bf.my_pipeline->end_of_input.store(true, std::memory_order_relaxed);
+                } else {
+                    __TBB_ASSERT(bf.my_input_buffer->end_of_input_tls_allocated, nullptr);
+                    bf.my_input_buffer->set_my_tls_end_of_input();
+                }
             }
-        }
-    } else {
-        // Reached end of the pipe.
-        std::size_t ntokens_avail = my_pipeline.input_tokens.fetch_add(1, std::memory_order_acquire);
-
-        if( ntokens_avail>0  // Only recycle if there is one available token
-                || my_pipeline.end_of_input.load(std::memory_order_relaxed) ) {
-            return false; // No need to recycle for new input
-        }
-        ITT_NOTIFY( sync_acquired, &my_pipeline.input_tokens );
-        // Recycle as an input stage task.
-        reset();
-    }
-    return true;
-}
-
-pipeline::~pipeline() {
-    while( first_filter ) {
-        d1::base_filter* f = first_filter;
-        if( input_buffer* b = f->my_input_buffer ) {
-            b->~input_buffer();
-            deallocate_memory(b);
-        }
-        first_filter = f->next_filter_in_pipeline;
-        f->~base_filter();
-        deallocate_memory(f);
-    }
-}
-
-void pipeline::add_filter( d1::base_filter& new_fitler ) {
-    __TBB_ASSERT( new_fitler.next_filter_in_pipeline==d1::base_filter::not_in_pipeline(), "filter already part of pipeline?" );
-    new_fitler.my_pipeline = this;
-    if ( first_filter == nullptr )
-        first_filter = &new_fitler;
-    else
-        last_filter->next_filter_in_pipeline = &new_fitler;
-    new_fitler.next_filter_in_pipeline = nullptr;
-    last_filter = &new_fitler;
-    if( new_fitler.is_serial() ) {
-        new_fitler.my_input_buffer = new (allocate_memory(sizeof(input_buffer))) input_buffer( new_fitler.is_ordered() );
-    } else {
-        if( first_filter == &new_fitler && new_fitler.object_may_be_null() ) {
-            //TODO: buffer only needed to hold TLS; could improve
-            new_fitler.my_input_buffer = new (allocate_memory(sizeof(input_buffer))) input_buffer( /*is_ordered*/false );
-            new_fitler.my_input_buffer->create_my_tls();
-        }
-    }
-}
-
-void __TBB_EXPORTED_FUNC parallel_pipeline(d1::task_group_context& cxt, std::size_t max_token, const d1::filter_node& fn) {
-    pipeline pipe(cxt, max_token);
-
-    pipe.fill_pipeline(fn);
-
-    d1::small_object_allocator alloc{};
-    stage_task& st = *alloc.new_object<stage_task>(pipe, alloc);
-
-    // Start execution of tasks
-    r1::execute_and_wait(st, cxt, pipe.wait_ctx, cxt);
-}
-
-void __TBB_EXPORTED_FUNC set_end_of_input(d1::base_filter& bf) {
-    __TBB_ASSERT(bf.my_input_buffer, nullptr);
-    __TBB_ASSERT(bf.object_may_be_null(), nullptr);
-    if(bf.is_serial() ) {
-        bf.my_pipeline->end_of_input.store(true, std::memory_order_relaxed);
-    } else {
-        __TBB_ASSERT(bf.my_input_buffer->end_of_input_tls_allocated, nullptr);
-        bf.my_input_buffer->set_my_tls_end_of_input();
-    }
-}
-
-} // namespace r1
-} // namespace detail
-} // namespace tbb
+
+        }// namespace r1
+    }    // namespace detail
+}// namespace tbb
diff --git a/external/tbb/src/tbb/private_server.cpp b/external/tbb/src/tbb/private_server.cpp
index fbdbaba1..8c4c9e73 100644
--- a/external/tbb/src/tbb/private_server.cpp
+++ b/external/tbb/src/tbb/private_server.cpp
@@ -20,417 +20,419 @@
 #include "rml_tbb.h"
 #include "rml_thread_monitor.h"
 
-#include "scheduler_common.h"
 #include "governor.h"
 #include "misc.h"
+#include "scheduler_common.h"
 
 #include <atomic>
 
-
 namespace tbb {
-namespace detail {
-namespace r1 {
-namespace rml {
+    namespace detail {
+        namespace r1 {
+            namespace rml {
 
-using rml::internal::thread_monitor;
-typedef thread_monitor::handle_type thread_handle;
+                using rml::internal::thread_monitor;
+                typedef thread_monitor::handle_type thread_handle;
 
-class private_server;
+                class private_server;
 
-class private_worker: no_copy {
-private:
-    //! State in finite-state machine that controls the worker.
-    /** State diagram:
+                class private_worker : no_copy {
+                private:
+                    //! State in finite-state machine that controls the worker.
+                    /** State diagram:
         init --> starting --> normal
           |         |           |
           |         V           |
           \------> quit <------/
       */
-    enum state_t {
-        //! *this is initialized
-        st_init,
-        //! *this has associated thread that is starting up.
-        st_starting,
-        //! Associated thread is doing normal life sequence.
-        st_normal,
-        //! Associated thread has ended normal life sequence and promises to never touch *this again.
-        st_quit
-    };
-    std::atomic<state_t> my_state;
-
-    //! Associated server
-    private_server& my_server;
-
-    //! Associated client
-    tbb_client& my_client;
-
-    //! index used for avoiding the 64K aliasing problem
-    const std::size_t my_index;
-
-    //! Monitor for sleeping when there is no work to do.
-    /** The invariant that holds for sleeping workers is:
+                    enum state_t {
+                        //! *this is initialized
+                        st_init,
+                        //! *this has associated thread that is starting up.
+                        st_starting,
+                        //! Associated thread is doing normal life sequence.
+                        st_normal,
+                        //! Associated thread has ended normal life sequence and promises to never touch *this again.
+                        st_quit
+                    };
+                    std::atomic<state_t> my_state;
+
+                    //! Associated server
+                    private_server& my_server;
+
+                    //! Associated client
+                    tbb_client& my_client;
+
+                    //! index used for avoiding the 64K aliasing problem
+                    const std::size_t my_index;
+
+                    //! Monitor for sleeping when there is no work to do.
+                    /** The invariant that holds for sleeping workers is:
         "my_slack<=0 && my_state==st_normal && I am on server's list of asleep threads" */
-    thread_monitor my_thread_monitor;
+                    thread_monitor my_thread_monitor;
 
-    //! Handle of the OS thread associated with this worker
-    thread_handle my_handle;
+                    //! Handle of the OS thread associated with this worker
+                    thread_handle my_handle;
 
-    //! Link for list of workers that are sleeping or have no associated thread.
-    private_worker* my_next;
+                    //! Link for list of workers that are sleeping or have no associated thread.
+                    private_worker* my_next;
 
-    friend class private_server;
+                    friend class private_server;
 
-    //! Actions executed by the associated thread
-    void run() noexcept;
+                    //! Actions executed by the associated thread
+                    void run() noexcept;
 
-    //! Wake up associated thread (or launch a thread if there is none)
-    void wake_or_launch();
+                    //! Wake up associated thread (or launch a thread if there is none)
+                    void wake_or_launch();
 
-    //! Called by a thread (usually not the associated thread) to commence termination.
-    void start_shutdown();
+                    //! Called by a thread (usually not the associated thread) to commence termination.
+                    void start_shutdown();
 
-    static __RML_DECL_THREAD_ROUTINE thread_routine( void* arg );
+                    static __RML_DECL_THREAD_ROUTINE thread_routine(void* arg);
 
-    static void release_handle(thread_handle my_handle, bool join);
+                    static void release_handle(thread_handle my_handle, bool join);
 
-protected:
-    private_worker( private_server& server, tbb_client& client, const std::size_t i ) :
-        my_state(st_init), my_server(server), my_client(client), my_index(i),
-        my_handle(), my_next()
-    {}
-};
+                protected:
+                    private_worker(private_server& server, tbb_client& client, const std::size_t i)
+                        : my_state(st_init), my_server(server), my_client(client), my_index(i), my_handle(),
+                          my_next() {}
+                };
 
-static const std::size_t cache_line_size = tbb::detail::max_nfs_size;
+                static const std::size_t cache_line_size = tbb::detail::max_nfs_size;
 
 #if _MSC_VER && !defined(__INTEL_COMPILER)
-    // Suppress overzealous compiler warnings about uninstantiable class
-    #pragma warning(push)
-    #pragma warning(disable:4510 4610)
+// Suppress overzealous compiler warnings about uninstantiable class
+#pragma warning(push)
+#pragma warning(disable : 4510 4610)
 #endif
-class padded_private_worker: public private_worker {
-    char pad[cache_line_size - sizeof(private_worker)%cache_line_size];
-public:
-    padded_private_worker( private_server& server, tbb_client& client, const std::size_t i )
-    : private_worker(server,client,i) { suppress_unused_warning(pad); }
-};
+                class padded_private_worker : public private_worker {
+                    char pad[cache_line_size - sizeof(private_worker) % cache_line_size];
+
+                public:
+                    padded_private_worker(private_server& server, tbb_client& client, const std::size_t i)
+                        : private_worker(server, client, i) {
+                        suppress_unused_warning(pad);
+                    }
+                };
 #if _MSC_VER && !defined(__INTEL_COMPILER)
-    #pragma warning(pop)
+#pragma warning(pop)
 #endif
 
-class private_server: public tbb_server, no_copy {
-private:
-    tbb_client& my_client;
-    //! Maximum number of threads to be created.
-    /** Threads are created lazily, so maximum might not actually be reached. */
-    const tbb_client::size_type my_n_thread;
+                class private_server : public tbb_server, no_copy {
+                private:
+                    tbb_client& my_client;
+                    //! Maximum number of threads to be created.
+                    /** Threads are created lazily, so maximum might not actually be reached. */
+                    const tbb_client::size_type my_n_thread;
 
-    //! Stack size for each thread. */
-    const std::size_t my_stack_size;
+                    //! Stack size for each thread. */
+                    const std::size_t my_stack_size;
 
-    //! Number of jobs that could use their associated thread minus number of active threads.
-    /** If negative, indicates oversubscription.
+                    //! Number of jobs that could use their associated thread minus number of active threads.
+                    /** If negative, indicates oversubscription.
         If positive, indicates that more threads should run.
         Can be lowered asynchronously, but must be raised only while holding my_asleep_list_mutex,
         because raising it impacts the invariant for sleeping threads. */
-    std::atomic<int> my_slack;
+                    std::atomic<int> my_slack;
 
-    //! Counter used to determine when to delete this.
-    std::atomic<int> my_ref_count;
+                    //! Counter used to determine when to delete this.
+                    std::atomic<int> my_ref_count;
 
-    padded_private_worker* my_thread_array;
+                    padded_private_worker* my_thread_array;
 
-    //! List of workers that are asleep or committed to sleeping until notified by another thread.
-    std::atomic<private_worker*> my_asleep_list_root;
+                    //! List of workers that are asleep or committed to sleeping until notified by another thread.
+                    std::atomic<private_worker*> my_asleep_list_root;
 
-    //! Protects my_asleep_list_root
-    typedef mutex asleep_list_mutex_type;
-    asleep_list_mutex_type my_asleep_list_mutex;
+                    //! Protects my_asleep_list_root
+                    typedef mutex asleep_list_mutex_type;
+                    asleep_list_mutex_type my_asleep_list_mutex;
 
 #if TBB_USE_ASSERT
-    std::atomic<int> my_net_slack_requests;
+                    std::atomic<int> my_net_slack_requests;
 #endif /* TBB_USE_ASSERT */
 
-    //! Wake up to two sleeping workers, if there are any sleeping.
-    /** The call is used to propagate a chain reaction where each thread wakes up two threads,
+                    //! Wake up to two sleeping workers, if there are any sleeping.
+                    /** The call is used to propagate a chain reaction where each thread wakes up two threads,
         which in turn each wake up two threads, etc. */
-    void propagate_chain_reaction() {
-        // First test of a double-check idiom.  Second test is inside wake_some(0).
-        if( my_asleep_list_root.load(std::memory_order_relaxed) )
-            wake_some(0);
-    }
+                    void propagate_chain_reaction() {
+                        // First test of a double-check idiom.  Second test is inside wake_some(0).
+                        if (my_asleep_list_root.load(std::memory_order_relaxed)) wake_some(0);
+                    }
+
+                    //! Try to add t to list of sleeping workers
+                    bool try_insert_in_asleep_list(private_worker& t);
 
-    //! Try to add t to list of sleeping workers
-    bool try_insert_in_asleep_list( private_worker& t );
+                    //! Equivalent of adding additional_slack to my_slack and waking up to 2 threads if my_slack permits.
+                    void wake_some(int additional_slack);
 
-    //! Equivalent of adding additional_slack to my_slack and waking up to 2 threads if my_slack permits.
-    void wake_some( int additional_slack );
+                    ~private_server() override;
 
-    ~private_server() override;
+                    void remove_server_ref() {
+                        if (--my_ref_count == 0) {
+                            my_client.acknowledge_close_connection();
+                            this->~private_server();
+                            tbb::cache_aligned_allocator<private_server>().deallocate(this, 1);
+                        }
+                    }
 
-    void remove_server_ref() {
-        if( --my_ref_count==0 ) {
-            my_client.acknowledge_close_connection();
-            this->~private_server();
-            tbb::cache_aligned_allocator<private_server>().deallocate( this, 1 );
-        }
-    }
+                    friend class private_worker;
 
-    friend class private_worker;
-public:
-    private_server( tbb_client& client );
+                public:
+                    private_server(tbb_client& client);
 
-    version_type version() const override {
-        return 0;
-    }
+                    version_type version() const override { return 0; }
 
-    void request_close_connection( bool /*exiting*/ ) override {
-        for( std::size_t i=0; i<my_n_thread; ++i )
-            my_thread_array[i].start_shutdown();
-        remove_server_ref();
-    }
+                    void request_close_connection(bool /*exiting*/) override {
+                        for (std::size_t i = 0; i < my_n_thread; ++i) my_thread_array[i].start_shutdown();
+                        remove_server_ref();
+                    }
 
-    void yield() override { d0::yield(); }
+                    void yield() override { d0::yield(); }
 
-    void independent_thread_number_changed( int ) override {__TBB_ASSERT(false, nullptr);}
+                    void independent_thread_number_changed(int) override { __TBB_ASSERT(false, nullptr); }
 
-    unsigned default_concurrency() const override { return governor::default_num_threads() - 1; }
+                    unsigned default_concurrency() const override {
+                        return governor::default_num_threads() - 1;
+                    }
 
-    void adjust_job_count_estimate( int delta ) override;
+                    void adjust_job_count_estimate(int delta) override;
 
 #if _WIN32 || _WIN64
-    void register_external_thread ( ::rml::server::execution_resource_t& ) override {}
-    void unregister_external_thread ( ::rml::server::execution_resource_t ) override {}
+                    void register_external_thread(::rml::server::execution_resource_t&) override {}
+                    void unregister_external_thread(::rml::server::execution_resource_t) override {}
 #endif /* _WIN32||_WIN64 */
-};
+                };
 
 //------------------------------------------------------------------------
 // Methods of private_worker
 //------------------------------------------------------------------------
 #if _MSC_VER && !defined(__INTEL_COMPILER)
-    // Suppress overzealous compiler warnings about an initialized variable 'sink_for_alloca' not referenced
-    #pragma warning(push)
-    #pragma warning(disable:4189)
+// Suppress overzealous compiler warnings about an initialized variable 'sink_for_alloca' not referenced
+#pragma warning(push)
+#pragma warning(disable : 4189)
 #endif
-#if __MINGW32__ && __GNUC__==4 &&__GNUC_MINOR__>=2 && !__MINGW64__
-// ensure that stack is properly aligned for TBB threads
-__attribute__((force_align_arg_pointer))
+#if __MINGW32__ && __GNUC__ == 4 && __GNUC_MINOR__ >= 2 && !__MINGW64__
+                // ensure that stack is properly aligned for TBB threads
+                __attribute__((force_align_arg_pointer))
 #endif
-__RML_DECL_THREAD_ROUTINE private_worker::thread_routine( void* arg ) {
-    private_worker* self = static_cast<private_worker*>(arg);
-    AVOID_64K_ALIASING( self->my_index );
-    self->run();
-    // return 0 instead of nullptr due to the difference in the type __RML_DECL_THREAD_ROUTINE on various OSs
-    return 0;
-}
+                __RML_DECL_THREAD_ROUTINE
+                private_worker::thread_routine(void* arg) {
+                    private_worker* self = static_cast<private_worker*>(arg);
+                    AVOID_64K_ALIASING(self->my_index);
+                    self->run();
+                    // return 0 instead of nullptr due to the difference in the type __RML_DECL_THREAD_ROUTINE on various OSs
+                    return 0;
+                }
 #if _MSC_VER && !defined(__INTEL_COMPILER)
-    #pragma warning(pop)
+#pragma warning(pop)
 #endif
 
-void private_worker::release_handle(thread_handle handle, bool join) {
-    if (join)
-        thread_monitor::join(handle);
-    else
-        thread_monitor::detach_thread(handle);
-}
-
-void private_worker::start_shutdown() {
-    __TBB_ASSERT(my_state.load(std::memory_order_relaxed) != st_quit, "The quit state is expected to be set only once");
-
-    // `acq` to acquire my_handle
-    // `rel` to release market state
-    state_t prev_state = my_state.exchange(st_quit, std::memory_order_acq_rel);
-
-    if (prev_state == st_init) {
-        // Perform action that otherwise would be performed by associated thread when it quits.
-        my_server.remove_server_ref();
-    } else {
-        __TBB_ASSERT(prev_state == st_normal || prev_state == st_starting, nullptr);
-        // May have invalidated invariant for sleeping, so wake up the thread.
-        // Note that the notify() here occurs without maintaining invariants for my_slack.
-        // It does not matter, because my_state==st_quit overrides checking of my_slack.
-        my_thread_monitor.notify();
-        // Do not need release handle in st_init state,
-        // because in this case the thread wasn't started yet.
-        // For st_starting release is done at launch site.
-        if (prev_state == st_normal)
-            release_handle(my_handle, governor::does_client_join_workers(my_client));
-    }
-}
-
-void private_worker::run() noexcept {
-    my_server.propagate_chain_reaction();
-
-    // Transiting to st_normal here would require setting my_handle,
-    // which would create race with the launching thread and
-    // complications in handle management on Windows.
-
-    ::rml::job& j = *my_client.create_one_job();
-    // memory_order_seq_cst to be strictly ordered after thread_monitor::wait on the next iteration
-    while( my_state.load(std::memory_order_seq_cst)!=st_quit ) {
-        if( my_server.my_slack.load(std::memory_order_acquire)>=0 ) {
-            my_client.process(j);
-        } else if( my_server.try_insert_in_asleep_list(*this) ) {
-            my_thread_monitor.wait();
-            __TBB_ASSERT(my_state.load(std::memory_order_relaxed) == st_quit || !my_next, "Thread monitor missed a spurious wakeup?" );
-            my_server.propagate_chain_reaction();
-        }
-    }
-    my_client.cleanup(j);
-
-    ++my_server.my_slack;
-    my_server.remove_server_ref();
-}
-
-inline void private_worker::wake_or_launch() {
-    state_t state = my_state.load(std::memory_order_relaxed);
-
-    switch (state) {
-    case st_starting:
-        __TBB_fallthrough;
-    case st_normal:
-        __TBB_ASSERT(!my_next, "Should not wake a thread while it's still in asleep list");
-        my_thread_monitor.notify();
-        break;
-    case st_init:
-        if (my_state.compare_exchange_strong(state, st_starting)) {
-            // after this point, remove_server_ref() must be done by created thread
+                void private_worker::release_handle(thread_handle handle, bool join) {
+                    if (join) thread_monitor::join(handle);
+                    else
+                        thread_monitor::detach_thread(handle);
+                }
+
+                void private_worker::start_shutdown() {
+                    __TBB_ASSERT(my_state.load(std::memory_order_relaxed) != st_quit,
+                                 "The quit state is expected to be set only once");
+
+                    // `acq` to acquire my_handle
+                    // `rel` to release market state
+                    state_t prev_state = my_state.exchange(st_quit, std::memory_order_acq_rel);
+
+                    if (prev_state == st_init) {
+                        // Perform action that otherwise would be performed by associated thread when it quits.
+                        my_server.remove_server_ref();
+                    } else {
+                        __TBB_ASSERT(prev_state == st_normal || prev_state == st_starting, nullptr);
+                        // May have invalidated invariant for sleeping, so wake up the thread.
+                        // Note that the notify() here occurs without maintaining invariants for my_slack.
+                        // It does not matter, because my_state==st_quit overrides checking of my_slack.
+                        my_thread_monitor.notify();
+                        // Do not need release handle in st_init state,
+                        // because in this case the thread wasn't started yet.
+                        // For st_starting release is done at launch site.
+                        if (prev_state == st_normal)
+                            release_handle(my_handle, governor::does_client_join_workers(my_client));
+                    }
+                }
+
+                void private_worker::run() noexcept {
+                    my_server.propagate_chain_reaction();
+
+                    // Transiting to st_normal here would require setting my_handle,
+                    // which would create race with the launching thread and
+                    // complications in handle management on Windows.
+
+                    ::rml::job& j = *my_client.create_one_job();
+                    // memory_order_seq_cst to be strictly ordered after thread_monitor::wait on the next iteration
+                    while (my_state.load(std::memory_order_seq_cst) != st_quit) {
+                        if (my_server.my_slack.load(std::memory_order_acquire) >= 0) {
+                            my_client.process(j);
+                        } else if (my_server.try_insert_in_asleep_list(*this)) {
+                            my_thread_monitor.wait();
+                            __TBB_ASSERT(my_state.load(std::memory_order_relaxed) == st_quit || !my_next,
+                                         "Thread monitor missed a spurious wakeup?");
+                            my_server.propagate_chain_reaction();
+                        }
+                    }
+                    my_client.cleanup(j);
+
+                    ++my_server.my_slack;
+                    my_server.remove_server_ref();
+                }
+
+                inline void private_worker::wake_or_launch() {
+                    state_t state = my_state.load(std::memory_order_relaxed);
+
+                    switch (state) {
+                        case st_starting:
+                            __TBB_fallthrough;
+                        case st_normal:
+                            __TBB_ASSERT(!my_next,
+                                         "Should not wake a thread while it's still in asleep list");
+                            my_thread_monitor.notify();
+                            break;
+                        case st_init:
+                            if (my_state.compare_exchange_strong(state, st_starting)) {
+                                // after this point, remove_server_ref() must be done by created thread
 #if __TBB_USE_WINAPI
-            // Win thread_monitor::launch is designed on the assumption that the workers thread id go from 1 to Hard limit set by TBB market::global_market
-            const std::size_t worker_idx = my_server.my_n_thread - this->my_index; 
-            my_handle = thread_monitor::launch(thread_routine, this, my_server.my_stack_size, &worker_idx);
+                                // Win thread_monitor::launch is designed on the assumption that the workers thread id go from 1 to Hard limit set by TBB market::global_market
+                                const std::size_t worker_idx = my_server.my_n_thread - this->my_index;
+                                my_handle = thread_monitor::launch(thread_routine, this,
+                                                                   my_server.my_stack_size, &worker_idx);
 #elif __TBB_USE_POSIX
-            {
-                affinity_helper fpa;
-                fpa.protect_affinity_mask( /*restore_process_mask=*/true);
-                my_handle = thread_monitor::launch(thread_routine, this, my_server.my_stack_size);
-                // Implicit destruction of fpa resets original affinity mask.
-            }
+                                {
+                                    affinity_helper fpa;
+                                    fpa.protect_affinity_mask(/*restore_process_mask=*/true);
+                                    my_handle = thread_monitor::launch(thread_routine, this,
+                                                                       my_server.my_stack_size);
+                                    // Implicit destruction of fpa resets original affinity mask.
+                                }
 #endif /* __TBB_USE_POSIX */
-            state = st_starting;
-            if (!my_state.compare_exchange_strong(state, st_normal)) {
-                // Do shutdown during startup. my_handle can't be released
-                // by start_shutdown, because my_handle value might be not set yet
-                // at time of transition from st_starting to st_quit.
-                __TBB_ASSERT(state == st_quit, nullptr);
-                release_handle(my_handle, governor::does_client_join_workers(my_client));
-            }
-        }
-        break;
-    default:
-        __TBB_ASSERT(state == st_quit, nullptr);
-    }
-}
-
-//------------------------------------------------------------------------
-// Methods of private_server
-//------------------------------------------------------------------------
-private_server::private_server( tbb_client& client ) :
-    my_client(client),
-    my_n_thread(client.max_job_count()),
-    my_stack_size(client.min_stack_size()),
-    my_slack(0),
-    my_ref_count(my_n_thread+1),
-    my_thread_array(nullptr),
-    my_asleep_list_root(nullptr)
+                                state = st_starting;
+                                if (!my_state.compare_exchange_strong(state, st_normal)) {
+                                    // Do shutdown during startup. my_handle can't be released
+                                    // by start_shutdown, because my_handle value might be not set yet
+                                    // at time of transition from st_starting to st_quit.
+                                    __TBB_ASSERT(state == st_quit, nullptr);
+                                    release_handle(my_handle, governor::does_client_join_workers(my_client));
+                                }
+                            }
+                            break;
+                        default:
+                            __TBB_ASSERT(state == st_quit, nullptr);
+                    }
+                }
+
+                //------------------------------------------------------------------------
+                // Methods of private_server
+                //------------------------------------------------------------------------
+                private_server::private_server(tbb_client& client)
+                    : my_client(client), my_n_thread(client.max_job_count()),
+                      my_stack_size(client.min_stack_size()), my_slack(0), my_ref_count(my_n_thread + 1),
+                      my_thread_array(nullptr), my_asleep_list_root(nullptr)
 #if TBB_USE_ASSERT
-    , my_net_slack_requests(0)
+                      ,
+                      my_net_slack_requests(0)
 #endif /* TBB_USE_ASSERT */
-{
-    my_thread_array = tbb::cache_aligned_allocator<padded_private_worker>().allocate( my_n_thread );
-    for( std::size_t i=0; i<my_n_thread; ++i ) {
-        private_worker* t = new( &my_thread_array[i] ) padded_private_worker( *this, client, i );
-        t->my_next = my_asleep_list_root.load(std::memory_order_relaxed);
-        my_asleep_list_root.store(t, std::memory_order_relaxed);
-    }
-}
-
-private_server::~private_server() {
-    __TBB_ASSERT( my_net_slack_requests==0, nullptr);
-    for( std::size_t i=my_n_thread; i--; )
-        my_thread_array[i].~padded_private_worker();
-    tbb::cache_aligned_allocator<padded_private_worker>().deallocate( my_thread_array, my_n_thread );
-    tbb::detail::poison_pointer( my_thread_array );
-}
-
-inline bool private_server::try_insert_in_asleep_list( private_worker& t ) {
-    asleep_list_mutex_type::scoped_lock lock;
-    if( !lock.try_acquire(my_asleep_list_mutex) )
-        return false;
-    // Contribute to slack under lock so that if another takes that unit of slack,
-    // it sees us sleeping on the list and wakes us up.
-    auto expected = my_slack.load(std::memory_order_relaxed);
-    while (expected < 0) {
-        if (my_slack.compare_exchange_strong(expected, expected + 1)) {
-            t.my_next = my_asleep_list_root.load(std::memory_order_relaxed);
-            my_asleep_list_root.store(&t, std::memory_order_relaxed);
-            return true;
-        }
-    }
-
-    return false;
-}
-
-void private_server::wake_some( int additional_slack ) {
-    __TBB_ASSERT( additional_slack>=0, nullptr );
-    private_worker* wakee[2];
-    private_worker**w = wakee;
-
-    if (additional_slack) {
-        // Contribute our unused slack to my_slack.
-        my_slack += additional_slack;
-    }
-
-    int allotted_slack = 0;
-    while (allotted_slack < 2) {
-        // Chain reaction; Try to claim unit of slack
-        int old = my_slack.load(std::memory_order_relaxed);
-        do {
-            if (old <= 0) goto done;
-        } while (!my_slack.compare_exchange_strong(old, old - 1));
-        ++allotted_slack;
-    }
-done:
-
-    if (allotted_slack) {
-        asleep_list_mutex_type::scoped_lock lock(my_asleep_list_mutex);
-        auto root = my_asleep_list_root.load(std::memory_order_relaxed);
-        while( root && w<wakee+2 && allotted_slack) {
-            --allotted_slack;
-            // Pop sleeping worker to combine with claimed unit of slack
-            *w++ = root;
-            root = root->my_next;
-        }
-        my_asleep_list_root.store(root, std::memory_order_relaxed);
-        if(allotted_slack) {
-            // Contribute our unused slack to my_slack.
-            my_slack += allotted_slack;
-        }
-    }
-    while( w>wakee ) {
-        private_worker* ww = *--w;
-        ww->my_next = nullptr;
-        ww->wake_or_launch();
-    }
-}
-
-void private_server::adjust_job_count_estimate( int delta ) {
+                {
+                    my_thread_array
+                            = tbb::cache_aligned_allocator<padded_private_worker>().allocate(my_n_thread);
+                    for (std::size_t i = 0; i < my_n_thread; ++i) {
+                        private_worker* t = new (&my_thread_array[i]) padded_private_worker(*this, client, i);
+                        t->my_next = my_asleep_list_root.load(std::memory_order_relaxed);
+                        my_asleep_list_root.store(t, std::memory_order_relaxed);
+                    }
+                }
+
+                private_server::~private_server() {
+                    __TBB_ASSERT(my_net_slack_requests == 0, nullptr);
+                    for (std::size_t i = my_n_thread; i--;) my_thread_array[i].~padded_private_worker();
+                    tbb::cache_aligned_allocator<padded_private_worker>().deallocate(my_thread_array,
+                                                                                     my_n_thread);
+                    tbb::detail::poison_pointer(my_thread_array);
+                }
+
+                inline bool private_server::try_insert_in_asleep_list(private_worker& t) {
+                    asleep_list_mutex_type::scoped_lock lock;
+                    if (!lock.try_acquire(my_asleep_list_mutex)) return false;
+                    // Contribute to slack under lock so that if another takes that unit of slack,
+                    // it sees us sleeping on the list and wakes us up.
+                    auto expected = my_slack.load(std::memory_order_relaxed);
+                    while (expected < 0) {
+                        if (my_slack.compare_exchange_strong(expected, expected + 1)) {
+                            t.my_next = my_asleep_list_root.load(std::memory_order_relaxed);
+                            my_asleep_list_root.store(&t, std::memory_order_relaxed);
+                            return true;
+                        }
+                    }
+
+                    return false;
+                }
+
+                void private_server::wake_some(int additional_slack) {
+                    __TBB_ASSERT(additional_slack >= 0, nullptr);
+                    private_worker* wakee[2];
+                    private_worker** w = wakee;
+
+                    if (additional_slack) {
+                        // Contribute our unused slack to my_slack.
+                        my_slack += additional_slack;
+                    }
+
+                    int allotted_slack = 0;
+                    while (allotted_slack < 2) {
+                        // Chain reaction; Try to claim unit of slack
+                        int old = my_slack.load(std::memory_order_relaxed);
+                        do {
+                            if (old <= 0) goto done;
+                        } while (!my_slack.compare_exchange_strong(old, old - 1));
+                        ++allotted_slack;
+                    }
+                done:
+
+                    if (allotted_slack) {
+                        asleep_list_mutex_type::scoped_lock lock(my_asleep_list_mutex);
+                        auto root = my_asleep_list_root.load(std::memory_order_relaxed);
+                        while (root && w < wakee + 2 && allotted_slack) {
+                            --allotted_slack;
+                            // Pop sleeping worker to combine with claimed unit of slack
+                            *w++ = root;
+                            root = root->my_next;
+                        }
+                        my_asleep_list_root.store(root, std::memory_order_relaxed);
+                        if (allotted_slack) {
+                            // Contribute our unused slack to my_slack.
+                            my_slack += allotted_slack;
+                        }
+                    }
+                    while (w > wakee) {
+                        private_worker* ww = *--w;
+                        ww->my_next = nullptr;
+                        ww->wake_or_launch();
+                    }
+                }
+
+                void private_server::adjust_job_count_estimate(int delta) {
 #if TBB_USE_ASSERT
-    my_net_slack_requests+=delta;
+                    my_net_slack_requests += delta;
 #endif /* TBB_USE_ASSERT */
-    if( delta<0 ) {
-        my_slack+=delta;
-    } else if( delta>0 ) {
-        wake_some( delta );
-    }
-}
-
-//! Factory method called from task.cpp to create a private_server.
-tbb_server* make_private_server( tbb_client& client ) {
-    return new( tbb::cache_aligned_allocator<private_server>().allocate(1) ) private_server(client);
-}
-
-} // namespace rml
-} // namespace r1
-} // namespace detail
-} // namespace tbb
-
+                    if (delta < 0) {
+                        my_slack += delta;
+                    } else if (delta > 0) {
+                        wake_some(delta);
+                    }
+                }
+
+                //! Factory method called from task.cpp to create a private_server.
+                tbb_server* make_private_server(tbb_client& client) {
+                    return new (tbb::cache_aligned_allocator<private_server>().allocate(1))
+                            private_server(client);
+                }
+
+            }// namespace rml
+        }    // namespace r1
+    }        // namespace detail
+}// namespace tbb
diff --git a/external/tbb/src/tbb/profiling.cpp b/external/tbb/src/tbb/profiling.cpp
index 3cf4da3c..a713b6e5 100644
--- a/external/tbb/src/tbb/profiling.cpp
+++ b/external/tbb/src/tbb/profiling.cpp
@@ -17,249 +17,257 @@
 #include "oneapi/tbb/detail/_config.h"
 #include "oneapi/tbb/detail/_template_helpers.h"
 
-#include "main.h"
 #include "itt_notify.h"
+#include "main.h"
 
 #include "oneapi/tbb/profiling.h"
 
 #include <string.h>
 
 namespace tbb {
-namespace detail {
-namespace r1 {
+    namespace detail {
+        namespace r1 {
 
 #if __TBB_USE_ITT_NOTIFY
-bool ITT_Present;
-static std::atomic<bool> ITT_InitializationDone;
+            bool ITT_Present;
+            static std::atomic<bool> ITT_InitializationDone;
 
-static __itt_domain *tbb_domains[d1::ITT_NUM_DOMAINS] = {};
+            static __itt_domain *tbb_domains[d1::ITT_NUM_DOMAINS] = {};
 
-struct resource_string {
-    const char *str;
-    __itt_string_handle *itt_str_handle;
-};
+            struct resource_string {
+                const char *str;
+                __itt_string_handle *itt_str_handle;
+            };
 
 //
 // populate resource strings
 //
-#define TBB_STRING_RESOURCE( index_name, str ) { str, nullptr },
-static resource_string strings_for_itt[] = {
-    #include "oneapi/tbb/detail/_string_resource.h"
-    { "num_resource_strings", nullptr }
-};
+#define TBB_STRING_RESOURCE(index_name, str) {str, nullptr},
+            static resource_string strings_for_itt[] = {
+#include "oneapi/tbb/detail/_string_resource.h"
+                    {"num_resource_strings", nullptr}};
 #undef TBB_STRING_RESOURCE
 
-static __itt_string_handle* ITT_get_string_handle(std::uintptr_t idx) {
-    __TBB_ASSERT(idx < NUM_STRINGS, "string handle out of valid range");
-    return idx < NUM_STRINGS ? strings_for_itt[idx].itt_str_handle : nullptr;
-}
-
-static void ITT_init_domains() {
-    tbb_domains[d1::ITT_DOMAIN_MAIN] = __itt_domain_create( _T("tbb") );
-    tbb_domains[d1::ITT_DOMAIN_MAIN]->flags = 1;
-    tbb_domains[d1::ITT_DOMAIN_FLOW] = __itt_domain_create( _T("tbb.flow") );
-    tbb_domains[d1::ITT_DOMAIN_FLOW]->flags = 1;
-    tbb_domains[d1::ITT_DOMAIN_ALGO] = __itt_domain_create( _T("tbb.algorithm") );
-    tbb_domains[d1::ITT_DOMAIN_ALGO]->flags = 1;
-}
-
-static void ITT_init_strings() {
-    for ( std::uintptr_t i = 0; i < NUM_STRINGS; ++i ) {
-#if _WIN32||_WIN64
-        strings_for_itt[i].itt_str_handle = __itt_string_handle_createA( strings_for_itt[i].str );
+            static __itt_string_handle *ITT_get_string_handle(std::uintptr_t idx) {
+                __TBB_ASSERT(idx < NUM_STRINGS, "string handle out of valid range");
+                return idx < NUM_STRINGS ? strings_for_itt[idx].itt_str_handle : nullptr;
+            }
+
+            static void ITT_init_domains() {
+                tbb_domains[d1::ITT_DOMAIN_MAIN] = __itt_domain_create(_T("tbb"));
+                tbb_domains[d1::ITT_DOMAIN_MAIN]->flags = 1;
+                tbb_domains[d1::ITT_DOMAIN_FLOW] = __itt_domain_create(_T("tbb.flow"));
+                tbb_domains[d1::ITT_DOMAIN_FLOW]->flags = 1;
+                tbb_domains[d1::ITT_DOMAIN_ALGO] = __itt_domain_create(_T("tbb.algorithm"));
+                tbb_domains[d1::ITT_DOMAIN_ALGO]->flags = 1;
+            }
+
+            static void ITT_init_strings() {
+                for (std::uintptr_t i = 0; i < NUM_STRINGS; ++i) {
+#if _WIN32 || _WIN64
+                    strings_for_itt[i].itt_str_handle = __itt_string_handle_createA(strings_for_itt[i].str);
 #else
-        strings_for_itt[i].itt_str_handle = __itt_string_handle_create( strings_for_itt[i].str );
+                    strings_for_itt[i].itt_str_handle = __itt_string_handle_create(strings_for_itt[i].str);
 #endif
-    }
-}
+                }
+            }
 
-static void ITT_init() {
-    ITT_init_domains();
-    ITT_init_strings();
-}
+            static void ITT_init() {
+                ITT_init_domains();
+                ITT_init_strings();
+            }
 
-/** Thread-unsafe lazy one-time initialization of tools interop.
+            /** Thread-unsafe lazy one-time initialization of tools interop.
     Used by both dummy handlers and general TBB one-time initialization routine. **/
-void ITT_DoUnsafeOneTimeInitialization () {
-    // Double check ITT_InitializationDone is necessary because the first check
-    // in ITT_DoOneTimeInitialization is not guarded with the __TBB_InitOnce lock.
-    if ( !ITT_InitializationDone ) {
-        ITT_Present = (__TBB_load_ittnotify()!=0);
-        if (ITT_Present) ITT_init();
-        ITT_InitializationDone = true;
-    }
-}
-
-/** Thread-safe lazy one-time initialization of tools interop.
+            void ITT_DoUnsafeOneTimeInitialization() {
+                // Double check ITT_InitializationDone is necessary because the first check
+                // in ITT_DoOneTimeInitialization is not guarded with the __TBB_InitOnce lock.
+                if (!ITT_InitializationDone) {
+                    ITT_Present = (__TBB_load_ittnotify() != 0);
+                    if (ITT_Present) ITT_init();
+                    ITT_InitializationDone = true;
+                }
+            }
+
+            /** Thread-safe lazy one-time initialization of tools interop.
     Used by dummy handlers only. **/
-extern "C"
-void ITT_DoOneTimeInitialization() {
-    if ( !ITT_InitializationDone ) {
-        __TBB_InitOnce::lock();
-        ITT_DoUnsafeOneTimeInitialization();
-        __TBB_InitOnce::unlock();
-    }
-}
-
-void create_itt_sync(void* ptr, const tchar* objtype, const tchar* objname) {
-        ITT_SYNC_CREATE(ptr, objtype, objname);
-}
-
-void call_itt_notify(int t, void *ptr) {
-    switch (t) {
-    case 0: ITT_NOTIFY(sync_prepare, ptr); break;
-    case 1: ITT_NOTIFY(sync_cancel, ptr); break;
-    case 2: ITT_NOTIFY(sync_acquired, ptr); break;
-    case 3: ITT_NOTIFY(sync_releasing, ptr); break;
-    case 4: ITT_NOTIFY(sync_destroy, ptr); break;
-    }
-}
-
-void itt_set_sync_name(void* obj, const tchar* name) {
-    __itt_sync_rename(obj, name);
-}
-
-const __itt_id itt_null_id = { 0, 0, 0 };
-
-static inline __itt_domain* get_itt_domain(d1::itt_domain_enum idx) {
-    if (tbb_domains[idx] == nullptr) {
-        ITT_DoOneTimeInitialization();
-    }
-    return tbb_domains[idx];
-}
-
-static inline void itt_id_make(__itt_id* id, void* addr, unsigned long long extra) {
-    *id = __itt_id_make(addr, extra);
-}
-
-static inline void itt_id_create(const __itt_domain* domain, __itt_id id) {
-    __itt_id_create(domain, id);
-}
-
-void itt_make_task_group(d1::itt_domain_enum domain, void* group, unsigned long long group_extra,
-                         void* parent, unsigned long long parent_extra, string_resource_index name_index) {
-    if (__itt_domain* d = get_itt_domain(domain)) {
-        __itt_id group_id = itt_null_id;
-        __itt_id parent_id = itt_null_id;
-        itt_id_make(&group_id, group, group_extra);
-        itt_id_create(d, group_id);
-        if (parent) {
-            itt_id_make(&parent_id, parent, parent_extra);
-        }
-        __itt_string_handle* n = ITT_get_string_handle(name_index);
-        __itt_task_group(d, group_id, parent_id, n);
-    }
-}
-
-void __TBB_EXPORTED_FUNC itt_metadata_str_add(d1::itt_domain_enum domain, void *addr, unsigned long long addr_extra,
-                                              string_resource_index key, const char *value ) {
-    if ( __itt_domain *d = get_itt_domain( domain ) ) {
-        __itt_id id = itt_null_id;
-        itt_id_make( &id, addr, addr_extra );
-        __itt_string_handle *k = ITT_get_string_handle(key);
-        size_t value_length = strlen( value );
-#if _WIN32||_WIN64
-        __itt_metadata_str_addA(d, id, k, value, value_length);
+            extern "C" void ITT_DoOneTimeInitialization() {
+                if (!ITT_InitializationDone) {
+                    __TBB_InitOnce::lock();
+                    ITT_DoUnsafeOneTimeInitialization();
+                    __TBB_InitOnce::unlock();
+                }
+            }
+
+            void create_itt_sync(void *ptr, const tchar *objtype, const tchar *objname) {
+                ITT_SYNC_CREATE(ptr, objtype, objname);
+            }
+
+            void call_itt_notify(int t, void *ptr) {
+                switch (t) {
+                    case 0:
+                        ITT_NOTIFY(sync_prepare, ptr);
+                        break;
+                    case 1:
+                        ITT_NOTIFY(sync_cancel, ptr);
+                        break;
+                    case 2:
+                        ITT_NOTIFY(sync_acquired, ptr);
+                        break;
+                    case 3:
+                        ITT_NOTIFY(sync_releasing, ptr);
+                        break;
+                    case 4:
+                        ITT_NOTIFY(sync_destroy, ptr);
+                        break;
+                }
+            }
+
+            void itt_set_sync_name(void *obj, const tchar *name) { __itt_sync_rename(obj, name); }
+
+            const __itt_id itt_null_id = {0, 0, 0};
+
+            static inline __itt_domain *get_itt_domain(d1::itt_domain_enum idx) {
+                if (tbb_domains[idx] == nullptr) { ITT_DoOneTimeInitialization(); }
+                return tbb_domains[idx];
+            }
+
+            static inline void itt_id_make(__itt_id *id, void *addr, unsigned long long extra) {
+                *id = __itt_id_make(addr, extra);
+            }
+
+            static inline void itt_id_create(const __itt_domain *domain, __itt_id id) {
+                __itt_id_create(domain, id);
+            }
+
+            void itt_make_task_group(d1::itt_domain_enum domain, void *group, unsigned long long group_extra,
+                                     void *parent, unsigned long long parent_extra,
+                                     string_resource_index name_index) {
+                if (__itt_domain *d = get_itt_domain(domain)) {
+                    __itt_id group_id = itt_null_id;
+                    __itt_id parent_id = itt_null_id;
+                    itt_id_make(&group_id, group, group_extra);
+                    itt_id_create(d, group_id);
+                    if (parent) { itt_id_make(&parent_id, parent, parent_extra); }
+                    __itt_string_handle *n = ITT_get_string_handle(name_index);
+                    __itt_task_group(d, group_id, parent_id, n);
+                }
+            }
+
+            void __TBB_EXPORTED_FUNC itt_metadata_str_add(d1::itt_domain_enum domain, void *addr,
+                                                          unsigned long long addr_extra,
+                                                          string_resource_index key, const char *value) {
+                if (__itt_domain *d = get_itt_domain(domain)) {
+                    __itt_id id = itt_null_id;
+                    itt_id_make(&id, addr, addr_extra);
+                    __itt_string_handle *k = ITT_get_string_handle(key);
+                    size_t value_length = strlen(value);
+#if _WIN32 || _WIN64
+                    __itt_metadata_str_addA(d, id, k, value, value_length);
 #else
-        __itt_metadata_str_add(d, id, k, value, value_length);
+                    __itt_metadata_str_add(d, id, k, value, value_length);
 #endif
-    }
-}
-
-void __TBB_EXPORTED_FUNC itt_metadata_ptr_add(d1::itt_domain_enum domain, void *addr, unsigned long long addr_extra,
-                                              string_resource_index key, void *value ) {
-    if ( __itt_domain *d = get_itt_domain( domain ) ) {
-        __itt_id id = itt_null_id;
-        itt_id_make( &id, addr, addr_extra );
-        __itt_string_handle *k = ITT_get_string_handle(key);
+                }
+            }
+
+            void __TBB_EXPORTED_FUNC itt_metadata_ptr_add(d1::itt_domain_enum domain, void *addr,
+                                                          unsigned long long addr_extra,
+                                                          string_resource_index key, void *value) {
+                if (__itt_domain *d = get_itt_domain(domain)) {
+                    __itt_id id = itt_null_id;
+                    itt_id_make(&id, addr, addr_extra);
+                    __itt_string_handle *k = ITT_get_string_handle(key);
 #if __TBB_x86_32
-        __itt_metadata_add(d, id, k, __itt_metadata_u32, 1, value);
+                    __itt_metadata_add(d, id, k, __itt_metadata_u32, 1, value);
 #else
-        __itt_metadata_add(d, id, k, __itt_metadata_u64, 1, value);
+                    __itt_metadata_add(d, id, k, __itt_metadata_u64, 1, value);
 #endif
-    }
-}
-
-void __TBB_EXPORTED_FUNC itt_relation_add(d1::itt_domain_enum domain, void *addr0, unsigned long long addr0_extra,
-                                          itt_relation relation, void *addr1, unsigned long long addr1_extra ) {
-    if ( __itt_domain *d = get_itt_domain( domain ) ) {
-        __itt_id id0 = itt_null_id;
-        __itt_id id1 = itt_null_id;
-        itt_id_make( &id0, addr0, addr0_extra );
-        itt_id_make( &id1, addr1, addr1_extra );
-         __itt_relation_add( d, id0, (__itt_relation)relation, id1 );
-    }
-}
-
-void __TBB_EXPORTED_FUNC itt_task_begin(d1::itt_domain_enum domain, void* task, unsigned long long task_extra,
-                    void* parent, unsigned long long parent_extra, string_resource_index name_index) {
-    if (__itt_domain* d = get_itt_domain(domain)) {
-        __itt_id task_id = itt_null_id;
-        __itt_id parent_id = itt_null_id;
-        if (task) {
-            itt_id_make(&task_id, task, task_extra);
-        }
-        if (parent) {
-            itt_id_make(&parent_id, parent, parent_extra);
-        }
-        __itt_string_handle* n = ITT_get_string_handle(name_index);
-        __itt_task_begin(d, task_id, parent_id, n);
-    }
-}
-
-void __TBB_EXPORTED_FUNC itt_task_end(d1::itt_domain_enum domain) {
-    if (__itt_domain* d = get_itt_domain(domain)) {
-        __itt_task_end(d);
-    }
-}
-
-void __TBB_EXPORTED_FUNC itt_region_begin(d1::itt_domain_enum domain, void *region, unsigned long long region_extra,
-                      void *parent, unsigned long long parent_extra, string_resource_index /* name_index */ ) {
-    if ( __itt_domain *d = get_itt_domain( domain ) ) {
-        __itt_id region_id = itt_null_id;
-        __itt_id parent_id = itt_null_id;
-        itt_id_make( &region_id, region, region_extra );
-        if ( parent ) {
-            itt_id_make( &parent_id, parent, parent_extra );
-        }
-         __itt_region_begin( d, region_id, parent_id, nullptr );
-    }
-}
-
-void __TBB_EXPORTED_FUNC itt_region_end(d1::itt_domain_enum domain, void *region, unsigned long long region_extra ) {
-    if ( __itt_domain *d = get_itt_domain( domain ) ) {
-        __itt_id region_id = itt_null_id;
-        itt_id_make( &region_id, region, region_extra );
-         __itt_region_end( d, region_id );
-    }
-}
+                }
+            }
+
+            void __TBB_EXPORTED_FUNC itt_relation_add(d1::itt_domain_enum domain, void *addr0,
+                                                      unsigned long long addr0_extra, itt_relation relation,
+                                                      void *addr1, unsigned long long addr1_extra) {
+                if (__itt_domain *d = get_itt_domain(domain)) {
+                    __itt_id id0 = itt_null_id;
+                    __itt_id id1 = itt_null_id;
+                    itt_id_make(&id0, addr0, addr0_extra);
+                    itt_id_make(&id1, addr1, addr1_extra);
+                    __itt_relation_add(d, id0, (__itt_relation) relation, id1);
+                }
+            }
+
+            void __TBB_EXPORTED_FUNC itt_task_begin(d1::itt_domain_enum domain, void *task,
+                                                    unsigned long long task_extra, void *parent,
+                                                    unsigned long long parent_extra,
+                                                    string_resource_index name_index) {
+                if (__itt_domain *d = get_itt_domain(domain)) {
+                    __itt_id task_id = itt_null_id;
+                    __itt_id parent_id = itt_null_id;
+                    if (task) { itt_id_make(&task_id, task, task_extra); }
+                    if (parent) { itt_id_make(&parent_id, parent, parent_extra); }
+                    __itt_string_handle *n = ITT_get_string_handle(name_index);
+                    __itt_task_begin(d, task_id, parent_id, n);
+                }
+            }
+
+            void __TBB_EXPORTED_FUNC itt_task_end(d1::itt_domain_enum domain) {
+                if (__itt_domain *d = get_itt_domain(domain)) { __itt_task_end(d); }
+            }
+
+            void __TBB_EXPORTED_FUNC itt_region_begin(d1::itt_domain_enum domain, void *region,
+                                                      unsigned long long region_extra, void *parent,
+                                                      unsigned long long parent_extra,
+                                                      string_resource_index /* name_index */) {
+                if (__itt_domain *d = get_itt_domain(domain)) {
+                    __itt_id region_id = itt_null_id;
+                    __itt_id parent_id = itt_null_id;
+                    itt_id_make(&region_id, region, region_extra);
+                    if (parent) { itt_id_make(&parent_id, parent, parent_extra); }
+                    __itt_region_begin(d, region_id, parent_id, nullptr);
+                }
+            }
+
+            void __TBB_EXPORTED_FUNC itt_region_end(d1::itt_domain_enum domain, void *region,
+                                                    unsigned long long region_extra) {
+                if (__itt_domain *d = get_itt_domain(domain)) {
+                    __itt_id region_id = itt_null_id;
+                    itt_id_make(&region_id, region, region_extra);
+                    __itt_region_end(d, region_id);
+                }
+            }
 
 #else
-void create_itt_sync(void* /*ptr*/, const tchar* /*objtype*/, const tchar* /*objname*/) {}
-void call_itt_notify(int /*t*/, void* /*ptr*/) {}
-void itt_set_sync_name(void* /*obj*/, const tchar* /*name*/) {}
-void itt_make_task_group(d1::itt_domain_enum /*domain*/, void* /*group*/, unsigned long long /*group_extra*/,
-                         void* /*parent*/, unsigned long long /*parent_extra*/, string_resource_index /*name_index*/) {}
-void itt_metadata_str_add(d1::itt_domain_enum /*domain*/, void* /*addr*/, unsigned long long /*addr_extra*/,
-                          string_resource_index /*key*/, const char* /*value*/ ) { }
-void itt_metadata_ptr_add(d1::itt_domain_enum /*domain*/, void * /*addr*/, unsigned long long /*addr_extra*/,
-                          string_resource_index /*key*/, void * /*value*/ ) {}
-void itt_relation_add(d1::itt_domain_enum /*domain*/, void* /*addr0*/, unsigned long long /*addr0_extra*/,
-                      itt_relation /*relation*/, void* /*addr1*/, unsigned long long /*addr1_extra*/ ) { }
-void itt_task_begin(d1::itt_domain_enum /*domain*/, void* /*task*/, unsigned long long /*task_extra*/,
-                        void* /*parent*/, unsigned long long /*parent_extra*/, string_resource_index /*name_index*/ ) { }
-void itt_task_end(d1::itt_domain_enum /*domain*/ ) { }
-void itt_region_begin(d1::itt_domain_enum /*domain*/, void* /*region*/, unsigned long long /*region_extra*/,
-                          void* /*parent*/, unsigned long long /*parent_extra*/, string_resource_index /*name_index*/ ) { }
-void itt_region_end(d1::itt_domain_enum /*domain*/, void* /*region*/, unsigned long long /*region_extra*/ ) { }
+            void create_itt_sync(void* /*ptr*/, const tchar* /*objtype*/, const tchar* /*objname*/) {}
+            void call_itt_notify(int /*t*/, void* /*ptr*/) {}
+            void itt_set_sync_name(void* /*obj*/, const tchar* /*name*/) {}
+            void itt_make_task_group(d1::itt_domain_enum /*domain*/, void* /*group*/,
+                                     unsigned long long /*group_extra*/, void* /*parent*/,
+                                     unsigned long long /*parent_extra*/,
+                                     string_resource_index /*name_index*/) {}
+            void itt_metadata_str_add(d1::itt_domain_enum /*domain*/, void* /*addr*/,
+                                      unsigned long long /*addr_extra*/, string_resource_index /*key*/,
+                                      const char* /*value*/) {}
+            void itt_metadata_ptr_add(d1::itt_domain_enum /*domain*/, void* /*addr*/,
+                                      unsigned long long /*addr_extra*/, string_resource_index /*key*/,
+                                      void* /*value*/) {}
+            void itt_relation_add(d1::itt_domain_enum /*domain*/, void* /*addr0*/,
+                                  unsigned long long /*addr0_extra*/, itt_relation /*relation*/,
+                                  void* /*addr1*/, unsigned long long /*addr1_extra*/) {}
+            void itt_task_begin(d1::itt_domain_enum /*domain*/, void* /*task*/,
+                                unsigned long long /*task_extra*/, void* /*parent*/,
+                                unsigned long long /*parent_extra*/, string_resource_index /*name_index*/) {}
+            void itt_task_end(d1::itt_domain_enum /*domain*/) {}
+            void itt_region_begin(d1::itt_domain_enum /*domain*/, void* /*region*/,
+                                  unsigned long long /*region_extra*/, void* /*parent*/,
+                                  unsigned long long /*parent_extra*/, string_resource_index /*name_index*/) {
+            }
+            void itt_region_end(d1::itt_domain_enum /*domain*/, void* /*region*/,
+                                unsigned long long /*region_extra*/) {}
 #endif /* __TBB_USE_ITT_NOTIFY */
 
-const tchar
-    *SyncType_Scheduler = _T("%Constant")
-    ;
-const tchar
-    *SyncObj_ContextsList = _T("TBB Scheduler")
-    ;
-} // namespace r1
-} // namespace detail
-} // namespace tbb
+            const tchar *SyncType_Scheduler = _T("%Constant");
+            const tchar *SyncObj_ContextsList = _T("TBB Scheduler");
+        }// namespace r1
+    }    // namespace detail
+}// namespace tbb
diff --git a/external/tbb/src/tbb/queuing_rw_mutex.cpp b/external/tbb/src/tbb/queuing_rw_mutex.cpp
index 5826592b..98d9a73a 100644
--- a/external/tbb/src/tbb/queuing_rw_mutex.cpp
+++ b/external/tbb/src/tbb/queuing_rw_mutex.cpp
@@ -19,599 +19,658 @@
     There could be some code looking as "can be restructured" but its structure does matter! */
 
 #include "oneapi/tbb/queuing_rw_mutex.h"
+#include "itt_notify.h"
 #include "oneapi/tbb/detail/_assert.h"
 #include "oneapi/tbb/detail/_utils.h"
-#include "itt_notify.h"
 
 namespace tbb {
-namespace detail {
-namespace r1 {
+    namespace detail {
+        namespace r1 {
 
 #if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
-    // Workaround for overzealous compiler warnings
-    #pragma warning (push)
-    #pragma warning (disable: 4311 4312)
+// Workaround for overzealous compiler warnings
+#pragma warning(push)
+#pragma warning(disable : 4311 4312)
 #endif
 
-//! A view of a T* with additional functionality for twiddling low-order bits.
-template<typename T>
-class tricky_atomic_pointer {
-public:
-    using word = uintptr_t;
-
-    static T* fetch_add( std::atomic<word>& location, word addend, std::memory_order memory_order ) {
-        return reinterpret_cast<T*>(location.fetch_add(addend, memory_order));
-    }
-
-    static T* exchange( std::atomic<word>& location, T* value, std::memory_order memory_order ) {
-        return reinterpret_cast<T*>(location.exchange(reinterpret_cast<word>(value), memory_order));
-    }
-
-    static T* compare_exchange_strong( std::atomic<word>& obj, const T* expected, const T* desired, std::memory_order memory_order ) {
-        word expd = reinterpret_cast<word>(expected);
-        obj.compare_exchange_strong(expd, reinterpret_cast<word>(desired), memory_order);
-        return reinterpret_cast<T*>(expd);
-    }
-
-    static void store( std::atomic<word>& location, const T* value, std::memory_order memory_order ) {
-        location.store(reinterpret_cast<word>(value), memory_order);
-    }
-
-    static T* load( std::atomic<word>& location, std::memory_order memory_order ) {
-        return reinterpret_cast<T*>(location.load(memory_order));
-    }
-
-    static void spin_wait_while_eq(const std::atomic<word>& location, const T* value) {
-        tbb::detail::d0::spin_wait_while_eq(location, reinterpret_cast<word>(value) );
-    }
-
-    T* & ref;
-    tricky_atomic_pointer( T*& original ) : ref(original) {};
-    tricky_atomic_pointer(const tricky_atomic_pointer&) = delete;
-    tricky_atomic_pointer& operator=(const tricky_atomic_pointer&) = delete;
-    T* operator&( const word operand2 ) const {
-        return reinterpret_cast<T*>( reinterpret_cast<word>(ref) & operand2 );
-    }
-    T* operator|( const word operand2 ) const {
-        return reinterpret_cast<T*>( reinterpret_cast<word>(ref) | operand2 );
-    }
-};
-
-using tricky_pointer = tricky_atomic_pointer<queuing_rw_mutex::scoped_lock>;
+            //! A view of a T* with additional functionality for twiddling low-order bits.
+            template <typename T>
+            class tricky_atomic_pointer {
+            public:
+                using word = uintptr_t;
+
+                static T* fetch_add(std::atomic<word>& location, word addend,
+                                    std::memory_order memory_order) {
+                    return reinterpret_cast<T*>(location.fetch_add(addend, memory_order));
+                }
+
+                static T* exchange(std::atomic<word>& location, T* value, std::memory_order memory_order) {
+                    return reinterpret_cast<T*>(
+                            location.exchange(reinterpret_cast<word>(value), memory_order));
+                }
+
+                static T* compare_exchange_strong(std::atomic<word>& obj, const T* expected, const T* desired,
+                                                  std::memory_order memory_order) {
+                    word expd = reinterpret_cast<word>(expected);
+                    obj.compare_exchange_strong(expd, reinterpret_cast<word>(desired), memory_order);
+                    return reinterpret_cast<T*>(expd);
+                }
+
+                static void store(std::atomic<word>& location, const T* value,
+                                  std::memory_order memory_order) {
+                    location.store(reinterpret_cast<word>(value), memory_order);
+                }
+
+                static T* load(std::atomic<word>& location, std::memory_order memory_order) {
+                    return reinterpret_cast<T*>(location.load(memory_order));
+                }
+
+                static void spin_wait_while_eq(const std::atomic<word>& location, const T* value) {
+                    tbb::detail::d0::spin_wait_while_eq(location, reinterpret_cast<word>(value));
+                }
+
+                T*& ref;
+                tricky_atomic_pointer(T*& original) : ref(original) {};
+                tricky_atomic_pointer(const tricky_atomic_pointer&) = delete;
+                tricky_atomic_pointer& operator=(const tricky_atomic_pointer&) = delete;
+                T* operator&(const word operand2) const {
+                    return reinterpret_cast<T*>(reinterpret_cast<word>(ref) & operand2);
+                }
+                T* operator|(const word operand2) const {
+                    return reinterpret_cast<T*>(reinterpret_cast<word>(ref) | operand2);
+                }
+            };
+
+            using tricky_pointer = tricky_atomic_pointer<queuing_rw_mutex::scoped_lock>;
 
 #if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
-    // Workaround for overzealous compiler warnings
-    #pragma warning (pop)
+// Workaround for overzealous compiler warnings
+#pragma warning(pop)
 #endif
 
-//! Flag bits in a state_t that specify information about a locking request.
-enum state_t_flags : unsigned char {
-    STATE_NONE                   = 0,
-    STATE_WRITER                 = 1<<0,
-    STATE_READER                 = 1<<1,
-    STATE_READER_UNBLOCKNEXT     = 1<<2,
-    STATE_ACTIVEREADER           = 1<<3,
-    STATE_UPGRADE_REQUESTED      = 1<<4,
-    STATE_UPGRADE_WAITING        = 1<<5,
-    STATE_UPGRADE_LOSER          = 1<<6,
-    STATE_COMBINED_WAITINGREADER = STATE_READER | STATE_READER_UNBLOCKNEXT,
-    STATE_COMBINED_READER        = STATE_COMBINED_WAITINGREADER | STATE_ACTIVEREADER,
-    STATE_COMBINED_UPGRADING     = STATE_UPGRADE_WAITING | STATE_UPGRADE_LOSER
-};
-
-static const unsigned char RELEASED = 0;
-static const unsigned char ACQUIRED = 1;
-
-struct queuing_rw_mutex_impl {
-    //! Try to acquire the internal lock
-    /** Returns true if lock was successfully acquired. */
-    static bool try_acquire_internal_lock(d1::queuing_rw_mutex::scoped_lock& s)
-    {
-        auto expected = RELEASED;
-        return s.my_internal_lock.compare_exchange_strong(expected, ACQUIRED);
-    }
-
-    //! Acquire the internal lock
-    static void acquire_internal_lock(d1::queuing_rw_mutex::scoped_lock& s)
-    {
-        // Usually, we would use the test-test-and-set idiom here, with exponential backoff.
-        // But so far, experiments indicate there is no value in doing so here.
-        while( !try_acquire_internal_lock(s) ) {
-            machine_pause(1);
-        }
-    }
-
-    //! Release the internal lock
-    static void release_internal_lock(d1::queuing_rw_mutex::scoped_lock& s)
-    {
-        s.my_internal_lock.store(RELEASED, std::memory_order_release);
-    }
-
-    //! Wait for internal lock to be released
-    static void wait_for_release_of_internal_lock(d1::queuing_rw_mutex::scoped_lock& s)
-    {
-        spin_wait_until_eq(s.my_internal_lock, RELEASED);
-    }
-
-    //! A helper function
-    static void unblock_or_wait_on_internal_lock(d1::queuing_rw_mutex::scoped_lock& s, uintptr_t flag ) {
-        if( flag ) {
-            wait_for_release_of_internal_lock(s);
-        }
-        else {
-            release_internal_lock(s);
-        }
-    }
-
-    //! Mask for low order bit of a pointer.
-    static const tricky_pointer::word FLAG = 0x1;
-
-    static uintptr_t get_flag( d1::queuing_rw_mutex::scoped_lock* ptr ) {
-        return reinterpret_cast<uintptr_t>(ptr) & FLAG;
-    }
-
-    //------------------------------------------------------------------------
-    // Methods of queuing_rw_mutex::scoped_lock
-    //------------------------------------------------------------------------
-
-    //! A method to acquire queuing_rw_mutex lock
-    static void acquire(d1::queuing_rw_mutex& m, d1::queuing_rw_mutex::scoped_lock& s, bool write)
-    {
-        __TBB_ASSERT( !s.my_mutex, "scoped_lock is already holding a mutex");
-
-        // Must set all fields before the exchange, because once the
-        // exchange executes, *this becomes accessible to other threads.
-        s.my_mutex = &m;
-        s.my_prev.store(0U, std::memory_order_relaxed);
-        s.my_next.store(0U, std::memory_order_relaxed);
-        s.my_going.store(0U, std::memory_order_relaxed);
-        s.my_state.store(d1::queuing_rw_mutex::scoped_lock::state_t(write ? STATE_WRITER : STATE_READER), std::memory_order_relaxed);
-        s.my_internal_lock.store(RELEASED, std::memory_order_relaxed);
-
-
-        // The CAS must have release semantics, because we are
-        // "sending" the fields initialized above to other actors.
-        // We need acquire semantics, because we are acquiring the predecessor (or mutex if no predecessor)
-        queuing_rw_mutex::scoped_lock* predecessor = m.q_tail.exchange(&s, std::memory_order_acq_rel);
-
-        if( write ) {       // Acquiring for write
-
-            if( predecessor ) {
-                ITT_NOTIFY(sync_prepare, s.my_mutex);
-                predecessor = tricky_pointer(predecessor) & ~FLAG;
-                __TBB_ASSERT( !predecessor->my_next, "the predecessor has another successor!");
-                tricky_pointer::store(predecessor->my_next, &s, std::memory_order_release);
-                // We are acquiring the mutex
-                spin_wait_until_eq(s.my_going, 1U, std::memory_order_acquire);
-            }
+            //! Flag bits in a state_t that specify information about a locking request.
+            enum state_t_flags : unsigned char {
+                STATE_NONE = 0,
+                STATE_WRITER = 1 << 0,
+                STATE_READER = 1 << 1,
+                STATE_READER_UNBLOCKNEXT = 1 << 2,
+                STATE_ACTIVEREADER = 1 << 3,
+                STATE_UPGRADE_REQUESTED = 1 << 4,
+                STATE_UPGRADE_WAITING = 1 << 5,
+                STATE_UPGRADE_LOSER = 1 << 6,
+                STATE_COMBINED_WAITINGREADER = STATE_READER | STATE_READER_UNBLOCKNEXT,
+                STATE_COMBINED_READER = STATE_COMBINED_WAITINGREADER | STATE_ACTIVEREADER,
+                STATE_COMBINED_UPGRADING = STATE_UPGRADE_WAITING | STATE_UPGRADE_LOSER
+            };
+
+            static const unsigned char RELEASED = 0;
+            static const unsigned char ACQUIRED = 1;
+
+            struct queuing_rw_mutex_impl {
+                //! Try to acquire the internal lock
+                /** Returns true if lock was successfully acquired. */
+                static bool try_acquire_internal_lock(d1::queuing_rw_mutex::scoped_lock& s) {
+                    auto expected = RELEASED;
+                    return s.my_internal_lock.compare_exchange_strong(expected, ACQUIRED);
+                }
 
-        } else {            // Acquiring for read
-    #if __TBB_USE_ITT_NOTIFY
-            bool sync_prepare_done = false;
-    #endif
-            if( predecessor ) {
-                unsigned char pred_state{};
-                __TBB_ASSERT( !s.my_prev.load(std::memory_order_relaxed), "the predecessor is already set" );
-                if( tricky_pointer(predecessor) & FLAG ) {
-                    /* this is only possible if predecessor is an upgrading reader and it signals us to wait */
-                    pred_state = STATE_UPGRADE_WAITING;
-                    predecessor = tricky_pointer(predecessor) & ~FLAG;
-                } else {
-                    // Load predecessor->my_state now, because once predecessor->my_next becomes
-                    // non-null, we must assume that *predecessor might be destroyed.
-                    pred_state = predecessor->my_state.load(std::memory_order_relaxed);
-                    if (pred_state == STATE_READER) {
-                        // Notify the previous reader to unblock us.
-                        predecessor->my_state.compare_exchange_strong(pred_state, STATE_READER_UNBLOCKNEXT, std::memory_order_relaxed);
-                    }
-                    if (pred_state == STATE_ACTIVEREADER)  { // either we initially read it or CAS failed
-                        // Active reader means that the predecessor already acquired the mutex and cannot notify us.
-                        // Therefore, we need to acquire the mutex ourselves by re-reading predecessor state.
-                        (void)predecessor->my_state.load(std::memory_order_acquire);
+                //! Acquire the internal lock
+                static void acquire_internal_lock(d1::queuing_rw_mutex::scoped_lock& s) {
+                    // Usually, we would use the test-test-and-set idiom here, with exponential backoff.
+                    // But so far, experiments indicate there is no value in doing so here.
+                    while (!try_acquire_internal_lock(s)) { machine_pause(1); }
+                }
+
+                //! Release the internal lock
+                static void release_internal_lock(d1::queuing_rw_mutex::scoped_lock& s) {
+                    s.my_internal_lock.store(RELEASED, std::memory_order_release);
+                }
+
+                //! Wait for internal lock to be released
+                static void wait_for_release_of_internal_lock(d1::queuing_rw_mutex::scoped_lock& s) {
+                    spin_wait_until_eq(s.my_internal_lock, RELEASED);
+                }
+
+                //! A helper function
+                static void unblock_or_wait_on_internal_lock(d1::queuing_rw_mutex::scoped_lock& s,
+                                                             uintptr_t flag) {
+                    if (flag) {
+                        wait_for_release_of_internal_lock(s);
+                    } else {
+                        release_internal_lock(s);
                     }
                 }
-                tricky_pointer::store(s.my_prev, predecessor, std::memory_order_relaxed);
-                __TBB_ASSERT( !( tricky_pointer(predecessor) & FLAG ), "use of corrupted pointer!" );
-                __TBB_ASSERT( !predecessor->my_next.load(std::memory_order_relaxed), "the predecessor has another successor!");
-                tricky_pointer::store(predecessor->my_next, &s, std::memory_order_release);
-                if( pred_state != STATE_ACTIVEREADER ) {
-    #if __TBB_USE_ITT_NOTIFY
-                    sync_prepare_done = true;
-                    ITT_NOTIFY(sync_prepare, s.my_mutex);
-    #endif
-                    // We are acquiring the mutex
-                    spin_wait_until_eq(s.my_going, 1U, std::memory_order_acquire);
+
+                //! Mask for low order bit of a pointer.
+                static const tricky_pointer::word FLAG = 0x1;
+
+                static uintptr_t get_flag(d1::queuing_rw_mutex::scoped_lock* ptr) {
+                    return reinterpret_cast<uintptr_t>(ptr) & FLAG;
                 }
-            }
 
-            // The protected state must have been acquired here before it can be further released to any other reader(s):
-            unsigned char old_state = STATE_READER;
-            // When this reader is signaled by previous actor it acquires the mutex.
-            // We need to build happens-before relation with all other coming readers that will read our ACTIVEREADER
-            // without blocking on my_going. Therefore, we need to publish ACTIVEREADER with release semantics.
-            // On fail it is relaxed, because we will build happens-before on my_going.
-            s.my_state.compare_exchange_strong(old_state, STATE_ACTIVEREADER, std::memory_order_release, std::memory_order_relaxed);
-            if( old_state!=STATE_READER ) {
+                //------------------------------------------------------------------------
+                // Methods of queuing_rw_mutex::scoped_lock
+                //------------------------------------------------------------------------
+
+                //! A method to acquire queuing_rw_mutex lock
+                static void acquire(d1::queuing_rw_mutex& m, d1::queuing_rw_mutex::scoped_lock& s,
+                                    bool write) {
+                    __TBB_ASSERT(!s.my_mutex, "scoped_lock is already holding a mutex");
+
+                    // Must set all fields before the exchange, because once the
+                    // exchange executes, *this becomes accessible to other threads.
+                    s.my_mutex = &m;
+                    s.my_prev.store(0U, std::memory_order_relaxed);
+                    s.my_next.store(0U, std::memory_order_relaxed);
+                    s.my_going.store(0U, std::memory_order_relaxed);
+                    s.my_state.store(
+                            d1::queuing_rw_mutex::scoped_lock::state_t(write ? STATE_WRITER : STATE_READER),
+                            std::memory_order_relaxed);
+                    s.my_internal_lock.store(RELEASED, std::memory_order_relaxed);
+
+                    // The CAS must have release semantics, because we are
+                    // "sending" the fields initialized above to other actors.
+                    // We need acquire semantics, because we are acquiring the predecessor (or mutex if no predecessor)
+                    queuing_rw_mutex::scoped_lock* predecessor
+                            = m.q_tail.exchange(&s, std::memory_order_acq_rel);
+
+                    if (write) {// Acquiring for write
+
+                        if (predecessor) {
+                            ITT_NOTIFY(sync_prepare, s.my_mutex);
+                            predecessor = tricky_pointer(predecessor) & ~FLAG;
+                            __TBB_ASSERT(!predecessor->my_next, "the predecessor has another successor!");
+                            tricky_pointer::store(predecessor->my_next, &s, std::memory_order_release);
+                            // We are acquiring the mutex
+                            spin_wait_until_eq(s.my_going, 1U, std::memory_order_acquire);
+                        }
+
+                    } else {// Acquiring for read
 #if __TBB_USE_ITT_NOTIFY
-                if( !sync_prepare_done )
-                    ITT_NOTIFY(sync_prepare, s.my_mutex);
+                        bool sync_prepare_done = false;
+#endif
+                        if (predecessor) {
+                            unsigned char pred_state {};
+                            __TBB_ASSERT(!s.my_prev.load(std::memory_order_relaxed),
+                                         "the predecessor is already set");
+                            if (tricky_pointer(predecessor) & FLAG) {
+                                /* this is only possible if predecessor is an upgrading reader and it signals us to wait */
+                                pred_state = STATE_UPGRADE_WAITING;
+                                predecessor = tricky_pointer(predecessor) & ~FLAG;
+                            } else {
+                                // Load predecessor->my_state now, because once predecessor->my_next becomes
+                                // non-null, we must assume that *predecessor might be destroyed.
+                                pred_state = predecessor->my_state.load(std::memory_order_relaxed);
+                                if (pred_state == STATE_READER) {
+                                    // Notify the previous reader to unblock us.
+                                    predecessor->my_state.compare_exchange_strong(
+                                            pred_state, STATE_READER_UNBLOCKNEXT, std::memory_order_relaxed);
+                                }
+                                if (pred_state
+                                    == STATE_ACTIVEREADER) {// either we initially read it or CAS failed
+                                    // Active reader means that the predecessor already acquired the mutex and cannot notify us.
+                                    // Therefore, we need to acquire the mutex ourselves by re-reading predecessor state.
+                                    (void) predecessor->my_state.load(std::memory_order_acquire);
+                                }
+                            }
+                            tricky_pointer::store(s.my_prev, predecessor, std::memory_order_relaxed);
+                            __TBB_ASSERT(!(tricky_pointer(predecessor) & FLAG), "use of corrupted pointer!");
+                            __TBB_ASSERT(!predecessor->my_next.load(std::memory_order_relaxed),
+                                         "the predecessor has another successor!");
+                            tricky_pointer::store(predecessor->my_next, &s, std::memory_order_release);
+                            if (pred_state != STATE_ACTIVEREADER) {
+#if __TBB_USE_ITT_NOTIFY
+                                sync_prepare_done = true;
+                                ITT_NOTIFY(sync_prepare, s.my_mutex);
 #endif
-                // Failed to become active reader -> need to unblock the next waiting reader first
-                __TBB_ASSERT( s.my_state.load(std::memory_order_relaxed)==STATE_READER_UNBLOCKNEXT, "unexpected state" );
-                spin_wait_while_eq(s.my_next, 0U, std::memory_order_acquire);
-                /* my_state should be changed before unblocking the next otherwise it might finish
+                                // We are acquiring the mutex
+                                spin_wait_until_eq(s.my_going, 1U, std::memory_order_acquire);
+                            }
+                        }
+
+                        // The protected state must have been acquired here before it can be further released to any other reader(s):
+                        unsigned char old_state = STATE_READER;
+                        // When this reader is signaled by previous actor it acquires the mutex.
+                        // We need to build happens-before relation with all other coming readers that will read our ACTIVEREADER
+                        // without blocking on my_going. Therefore, we need to publish ACTIVEREADER with release semantics.
+                        // On fail it is relaxed, because we will build happens-before on my_going.
+                        s.my_state.compare_exchange_strong(old_state, STATE_ACTIVEREADER,
+                                                           std::memory_order_release,
+                                                           std::memory_order_relaxed);
+                        if (old_state != STATE_READER) {
+#if __TBB_USE_ITT_NOTIFY
+                            if (!sync_prepare_done) ITT_NOTIFY(sync_prepare, s.my_mutex);
+#endif
+                            // Failed to become active reader -> need to unblock the next waiting reader first
+                            __TBB_ASSERT(s.my_state.load(std::memory_order_relaxed)
+                                                 == STATE_READER_UNBLOCKNEXT,
+                                         "unexpected state");
+                            spin_wait_while_eq(s.my_next, 0U, std::memory_order_acquire);
+                            /* my_state should be changed before unblocking the next otherwise it might finish
                    and another thread can get our old state and left blocked */
-                s.my_state.store(STATE_ACTIVEREADER, std::memory_order_relaxed);
-                tricky_pointer::load(s.my_next, std::memory_order_relaxed)->my_going.store(1U, std::memory_order_release);
-            }
-            __TBB_ASSERT(s.my_state.load(std::memory_order_relaxed) == STATE_ACTIVEREADER, "unlocked reader is active reader");
-        }
-
-        ITT_NOTIFY(sync_acquired, s.my_mutex);
-    }
-
-    //! A method to acquire queuing_rw_mutex if it is free
-    static bool try_acquire(d1::queuing_rw_mutex& m, d1::queuing_rw_mutex::scoped_lock& s, bool write)
-    {
-        __TBB_ASSERT( !s.my_mutex, "scoped_lock is already holding a mutex");
-
-        if( m.q_tail.load(std::memory_order_relaxed) )
-            return false; // Someone already took the lock
-
-        // Must set all fields before the exchange, because once the
-        // exchange executes, *this becomes accessible to other threads.
-        s.my_prev.store(0U, std::memory_order_relaxed);
-        s.my_next.store(0U, std::memory_order_relaxed);
-        s.my_going.store(0U, std::memory_order_relaxed); // TODO: remove dead assignment?
-        s.my_state.store(d1::queuing_rw_mutex::scoped_lock::state_t(write ? STATE_WRITER : STATE_ACTIVEREADER), std::memory_order_relaxed);
-        s.my_internal_lock.store(RELEASED, std::memory_order_relaxed);
-
-        // The CAS must have release semantics, because we are
-        // "sending" the fields initialized above to other actors.
-        // We need acquire semantics, because we are acquiring the mutex
-        d1::queuing_rw_mutex::scoped_lock* expected = nullptr;
-        if (!m.q_tail.compare_exchange_strong(expected, &s, std::memory_order_acq_rel))
-            return false; // Someone already took the lock
-        s.my_mutex = &m;
-        ITT_NOTIFY(sync_acquired, s.my_mutex);
-        return true;
-    }
-
-    //! A method to release queuing_rw_mutex lock
-    static void release(d1::queuing_rw_mutex::scoped_lock& s) {
-        __TBB_ASSERT(s.my_mutex!=nullptr, "no lock acquired");
-
-        ITT_NOTIFY(sync_releasing, s.my_mutex);
-
-        if( s.my_state.load(std::memory_order_relaxed) == STATE_WRITER ) { // Acquired for write
-
-            // The logic below is the same as "writerUnlock", but elides
-            // "return" from the middle of the routine.
-            // In the statement below, acquire semantics of reading my_next is required
-            // so that following operations with fields of my_next are safe.
-            d1::queuing_rw_mutex::scoped_lock* next = tricky_pointer::load(s.my_next, std::memory_order_acquire);
-            if( !next ) {
-                d1::queuing_rw_mutex::scoped_lock* expected = &s;
-                // Release mutex on success otherwise wait for successor publication
-                if( s.my_mutex->q_tail.compare_exchange_strong(expected, nullptr,
-                    std::memory_order_release, std::memory_order_relaxed) )
-                {
-                    // this was the only item in the queue, and the queue is now empty.
-                    goto done;
+                            s.my_state.store(STATE_ACTIVEREADER, std::memory_order_relaxed);
+                            tricky_pointer::load(s.my_next, std::memory_order_relaxed)
+                                    ->my_going.store(1U, std::memory_order_release);
+                        }
+                        __TBB_ASSERT(s.my_state.load(std::memory_order_relaxed) == STATE_ACTIVEREADER,
+                                     "unlocked reader is active reader");
+                    }
+
+                    ITT_NOTIFY(sync_acquired, s.my_mutex);
+                }
+
+                //! A method to acquire queuing_rw_mutex if it is free
+                static bool try_acquire(d1::queuing_rw_mutex& m, d1::queuing_rw_mutex::scoped_lock& s,
+                                        bool write) {
+                    __TBB_ASSERT(!s.my_mutex, "scoped_lock is already holding a mutex");
+
+                    if (m.q_tail.load(std::memory_order_relaxed))
+                        return false;// Someone already took the lock
+
+                    // Must set all fields before the exchange, because once the
+                    // exchange executes, *this becomes accessible to other threads.
+                    s.my_prev.store(0U, std::memory_order_relaxed);
+                    s.my_next.store(0U, std::memory_order_relaxed);
+                    s.my_going.store(0U, std::memory_order_relaxed);// TODO: remove dead assignment?
+                    s.my_state.store(d1::queuing_rw_mutex::scoped_lock::state_t(write ? STATE_WRITER
+                                                                                      : STATE_ACTIVEREADER),
+                                     std::memory_order_relaxed);
+                    s.my_internal_lock.store(RELEASED, std::memory_order_relaxed);
+
+                    // The CAS must have release semantics, because we are
+                    // "sending" the fields initialized above to other actors.
+                    // We need acquire semantics, because we are acquiring the mutex
+                    d1::queuing_rw_mutex::scoped_lock* expected = nullptr;
+                    if (!m.q_tail.compare_exchange_strong(expected, &s, std::memory_order_acq_rel))
+                        return false;// Someone already took the lock
+                    s.my_mutex = &m;
+                    ITT_NOTIFY(sync_acquired, s.my_mutex);
+                    return true;
                 }
-                spin_wait_while_eq(s.my_next, 0U, std::memory_order_relaxed);
-                next = tricky_pointer::load(s.my_next, std::memory_order_acquire);
-            }
-            next->my_going.store(2U, std::memory_order_relaxed); // protect next queue node from being destroyed too early
-            // If the next is STATE_UPGRADE_WAITING, it is expected to acquire all other released readers via release
-            // sequence in next->my_state. In that case, we need to preserve release sequence in next->my_state
-            // contributed by other reader. So, there are two approaches not to break the release sequence:
-            //   1. Use read-modify-write (exchange) operation to store with release the UPGRADE_LOSER state;
-            //   2. Acquire the release sequence and store the sequence and UPGRADE_LOSER state.
-            // The second approach seems better on x86 because it does not involve interlocked operations.
-            // Therefore, we read next->my_state with acquire while it is not required for else branch to get the 
-            // release sequence.
-            if( next->my_state.load(std::memory_order_acquire)==STATE_UPGRADE_WAITING ) {
-                // the next waiting for upgrade means this writer was upgraded before.
-                acquire_internal_lock(s);
-                // Responsibility transition, the one who reads uncorrupted my_prev will do release.
-                // Guarantee that above store of 2 into next->my_going happens-before resetting of next->my_prev
-                d1::queuing_rw_mutex::scoped_lock* tmp = tricky_pointer::exchange(next->my_prev, nullptr, std::memory_order_release);
-                // Pass the release sequence that we acquired with the above load of next->my_state.
-                next->my_state.store(STATE_UPGRADE_LOSER, std::memory_order_release);
-                // We are releasing the mutex
-                next->my_going.store(1U, std::memory_order_release);
-                unblock_or_wait_on_internal_lock(s, get_flag(tmp));
-            } else {
-                // next->state cannot be STATE_UPGRADE_REQUESTED
-                __TBB_ASSERT( next->my_state.load(std::memory_order_relaxed) & (STATE_COMBINED_WAITINGREADER | STATE_WRITER), "unexpected state" );
-                __TBB_ASSERT( !( next->my_prev.load(std::memory_order_relaxed) & FLAG ), "use of corrupted pointer!" );
-                // Guarantee that above store of 2 into next->my_going happens-before resetting of next->my_prev
-                tricky_pointer::store(next->my_prev, nullptr, std::memory_order_release);
-                // We are releasing the mutex
-                next->my_going.store(1U, std::memory_order_release);
-            }
 
-        } else { // Acquired for read
-            // The basic idea it to build happens-before relation with left and right readers via prev and next. In addition,
-            // the first reader should acquire the left (prev) signal and propagate to right (next). To simplify, we always
-            // build happens-before relation between left and right (left is happened before right).
-            queuing_rw_mutex::scoped_lock *tmp = nullptr;
-    retry:
-            // Addition to the original paper: Mark my_prev as in use
-            queuing_rw_mutex::scoped_lock *predecessor = tricky_pointer::fetch_add(s.my_prev, FLAG, std::memory_order_acquire);
-
-            if( predecessor ) {
-                if( !(try_acquire_internal_lock(*predecessor)) )
-                {
-                    // Failed to acquire the lock on predecessor. The predecessor either unlinks or upgrades.
-                    // In the second case, it could or could not know my "in use" flag - need to check
-                    // Responsibility transition, the one who reads uncorrupted my_prev will do release.
-                    tmp = tricky_pointer::compare_exchange_strong(s.my_prev, tricky_pointer(predecessor) | FLAG, predecessor, std::memory_order_acquire);
-                    if( !(tricky_pointer(tmp) & FLAG) ) {
-                        __TBB_ASSERT(tricky_pointer::load(s.my_prev, std::memory_order_relaxed) != (tricky_pointer(predecessor) | FLAG), nullptr);
-                        // Now owner of predecessor is waiting for _us_ to release its lock
-                        release_internal_lock(*predecessor);
+                //! A method to release queuing_rw_mutex lock
+                static void release(d1::queuing_rw_mutex::scoped_lock& s) {
+                    __TBB_ASSERT(s.my_mutex != nullptr, "no lock acquired");
+
+                    ITT_NOTIFY(sync_releasing, s.my_mutex);
+
+                    if (s.my_state.load(std::memory_order_relaxed) == STATE_WRITER) {// Acquired for write
+
+                        // The logic below is the same as "writerUnlock", but elides
+                        // "return" from the middle of the routine.
+                        // In the statement below, acquire semantics of reading my_next is required
+                        // so that following operations with fields of my_next are safe.
+                        d1::queuing_rw_mutex::scoped_lock* next
+                                = tricky_pointer::load(s.my_next, std::memory_order_acquire);
+                        if (!next) {
+                            d1::queuing_rw_mutex::scoped_lock* expected = &s;
+                            // Release mutex on success otherwise wait for successor publication
+                            if (s.my_mutex->q_tail.compare_exchange_strong(expected, nullptr,
+                                                                           std::memory_order_release,
+                                                                           std::memory_order_relaxed)) {
+                                // this was the only item in the queue, and the queue is now empty.
+                                goto done;
+                            }
+                            spin_wait_while_eq(s.my_next, 0U, std::memory_order_relaxed);
+                            next = tricky_pointer::load(s.my_next, std::memory_order_acquire);
+                        }
+                        next->my_going.store(
+                                2U,
+                                std::memory_order_relaxed);// protect next queue node from being destroyed too early
+                        // If the next is STATE_UPGRADE_WAITING, it is expected to acquire all other released readers via release
+                        // sequence in next->my_state. In that case, we need to preserve release sequence in next->my_state
+                        // contributed by other reader. So, there are two approaches not to break the release sequence:
+                        //   1. Use read-modify-write (exchange) operation to store with release the UPGRADE_LOSER state;
+                        //   2. Acquire the release sequence and store the sequence and UPGRADE_LOSER state.
+                        // The second approach seems better on x86 because it does not involve interlocked operations.
+                        // Therefore, we read next->my_state with acquire while it is not required for else branch to get the
+                        // release sequence.
+                        if (next->my_state.load(std::memory_order_acquire) == STATE_UPGRADE_WAITING) {
+                            // the next waiting for upgrade means this writer was upgraded before.
+                            acquire_internal_lock(s);
+                            // Responsibility transition, the one who reads uncorrupted my_prev will do release.
+                            // Guarantee that above store of 2 into next->my_going happens-before resetting of next->my_prev
+                            d1::queuing_rw_mutex::scoped_lock* tmp = tricky_pointer::exchange(
+                                    next->my_prev, nullptr, std::memory_order_release);
+                            // Pass the release sequence that we acquired with the above load of next->my_state.
+                            next->my_state.store(STATE_UPGRADE_LOSER, std::memory_order_release);
+                            // We are releasing the mutex
+                            next->my_going.store(1U, std::memory_order_release);
+                            unblock_or_wait_on_internal_lock(s, get_flag(tmp));
+                        } else {
+                            // next->state cannot be STATE_UPGRADE_REQUESTED
+                            __TBB_ASSERT(next->my_state.load(std::memory_order_relaxed)
+                                                 & (STATE_COMBINED_WAITINGREADER | STATE_WRITER),
+                                         "unexpected state");
+                            __TBB_ASSERT(!(next->my_prev.load(std::memory_order_relaxed) & FLAG),
+                                         "use of corrupted pointer!");
+                            // Guarantee that above store of 2 into next->my_going happens-before resetting of next->my_prev
+                            tricky_pointer::store(next->my_prev, nullptr, std::memory_order_release);
+                            // We are releasing the mutex
+                            next->my_going.store(1U, std::memory_order_release);
+                        }
+
+                    } else {// Acquired for read
+                        // The basic idea it to build happens-before relation with left and right readers via prev and next. In addition,
+                        // the first reader should acquire the left (prev) signal and propagate to right (next). To simplify, we always
+                        // build happens-before relation between left and right (left is happened before right).
+                        queuing_rw_mutex::scoped_lock* tmp = nullptr;
+                    retry:
+                        // Addition to the original paper: Mark my_prev as in use
+                        queuing_rw_mutex::scoped_lock* predecessor
+                                = tricky_pointer::fetch_add(s.my_prev, FLAG, std::memory_order_acquire);
+
+                        if (predecessor) {
+                            if (!(try_acquire_internal_lock(*predecessor))) {
+                                // Failed to acquire the lock on predecessor. The predecessor either unlinks or upgrades.
+                                // In the second case, it could or could not know my "in use" flag - need to check
+                                // Responsibility transition, the one who reads uncorrupted my_prev will do release.
+                                tmp = tricky_pointer::compare_exchange_strong(
+                                        s.my_prev, tricky_pointer(predecessor) | FLAG, predecessor,
+                                        std::memory_order_acquire);
+                                if (!(tricky_pointer(tmp) & FLAG)) {
+                                    __TBB_ASSERT(tricky_pointer::load(s.my_prev, std::memory_order_relaxed)
+                                                         != (tricky_pointer(predecessor) | FLAG),
+                                                 nullptr);
+                                    // Now owner of predecessor is waiting for _us_ to release its lock
+                                    release_internal_lock(*predecessor);
+                                }
+                                // else the "in use" flag is back -> the predecessor didn't get it and will release itself; nothing to do
+
+                                tmp = nullptr;
+                                goto retry;
+                            }
+                            __TBB_ASSERT(
+                                    predecessor
+                                            && predecessor->my_internal_lock.load(std::memory_order_relaxed)
+                                                       == ACQUIRED,
+                                    "predecessor's lock is not acquired");
+                            tricky_pointer::store(s.my_prev, predecessor, std::memory_order_relaxed);
+                            acquire_internal_lock(s);
+
+                            tricky_pointer::store(predecessor->my_next, nullptr, std::memory_order_release);
+
+                            d1::queuing_rw_mutex::scoped_lock* expected = &s;
+                            if (!tricky_pointer::load(s.my_next, std::memory_order_acquire)
+                                && !s.my_mutex->q_tail.compare_exchange_strong(expected, predecessor,
+                                                                               std::memory_order_release)) {
+                                spin_wait_while_eq(s.my_next, 0U, std::memory_order_acquire);
+                            }
+                            __TBB_ASSERT(!(s.my_next.load(std::memory_order_relaxed) & FLAG),
+                                         "use of corrupted pointer");
+
+                            // my_next is acquired either with load or spin_wait.
+                            if (d1::queuing_rw_mutex::scoped_lock* const l_next = tricky_pointer::load(
+                                        s.my_next,
+                                        std::memory_order_relaxed)) {// I->next != nil, TODO: rename to next after clearing up and adapting the n in the comment two lines below
+                                // Equivalent to I->next->prev = I->prev but protected against (prev[n]&FLAG)!=0
+                                tmp = tricky_pointer::exchange(l_next->my_prev, predecessor,
+                                                               std::memory_order_release);
+                                // I->prev->next = I->next;
+                                __TBB_ASSERT(tricky_pointer::load(s.my_prev, std::memory_order_relaxed)
+                                                     == predecessor,
+                                             nullptr);
+                                predecessor->my_next.store(s.my_next.load(std::memory_order_relaxed),
+                                                           std::memory_order_release);
+                            }
+                            // Safe to release in the order opposite to acquiring which makes the code simpler
+                            release_internal_lock(*predecessor);
+
+                        } else {                     // No predecessor when we looked
+                            acquire_internal_lock(s);// "exclusiveLock(&I->EL)"
+                            d1::queuing_rw_mutex::scoped_lock* next
+                                    = tricky_pointer::load(s.my_next, std::memory_order_acquire);
+                            if (!next) {
+                                d1::queuing_rw_mutex::scoped_lock* expected = &s;
+                                // Release mutex on success otherwise wait for successor publication
+                                if (!s.my_mutex->q_tail.compare_exchange_strong(expected, nullptr,
+                                                                                std::memory_order_release,
+                                                                                std::memory_order_relaxed)) {
+                                    spin_wait_while_eq(s.my_next, 0U, std::memory_order_relaxed);
+                                    next = tricky_pointer::load(s.my_next, std::memory_order_acquire);
+                                } else {
+                                    goto unlock_self;
+                                }
+                            }
+                            next->my_going.store(2U, std::memory_order_relaxed);
+                            // Responsibility transition, the one who reads uncorrupted my_prev will do release.
+                            tmp = tricky_pointer::exchange(next->my_prev, nullptr, std::memory_order_release);
+                            next->my_going.store(1U, std::memory_order_release);
+                        }
+                    unlock_self:
+                        unblock_or_wait_on_internal_lock(s, get_flag(tmp));
                     }
-                    // else the "in use" flag is back -> the predecessor didn't get it and will release itself; nothing to do
+                done:
+                    // Lifetime synchronization, no need to build happens-before relation
+                    spin_wait_while_eq(s.my_going, 2U, std::memory_order_relaxed);
 
-                    tmp = nullptr;
-                    goto retry;
+                    s.initialize();
                 }
-                __TBB_ASSERT(predecessor && predecessor->my_internal_lock.load(std::memory_order_relaxed)==ACQUIRED, "predecessor's lock is not acquired");
-                tricky_pointer::store(s.my_prev, predecessor, std::memory_order_relaxed);
-                acquire_internal_lock(s);
 
-                tricky_pointer::store(predecessor->my_next, nullptr, std::memory_order_release);
+                static bool downgrade_to_reader(d1::queuing_rw_mutex::scoped_lock& s) {
+                    if (s.my_state.load(std::memory_order_relaxed) == STATE_ACTIVEREADER)
+                        return true;// Already a reader
+
+                    ITT_NOTIFY(sync_releasing, s.my_mutex);
+                    d1::queuing_rw_mutex::scoped_lock* next
+                            = tricky_pointer::load(s.my_next, std::memory_order_acquire);
+                    if (!next) {
+                        s.my_state.store(STATE_READER, std::memory_order_seq_cst);
+                        // the following load of q_tail must not be reordered with setting STATE_READER above
+                        if (&s == s.my_mutex->q_tail.load(std::memory_order_seq_cst)) {
+                            unsigned char old_state = STATE_READER;
+                            // When this reader is signaled by previous actor it acquires the mutex.
+                            // We need to build happens-before relation with all other coming readers that will read our ACTIVEREADER
+                            // without blocking on my_going. Therefore, we need to publish ACTIVEREADER with release semantics.
+                            // On fail it is relaxed, because we will build happens-before on my_going.
+                            s.my_state.compare_exchange_strong(old_state, STATE_ACTIVEREADER,
+                                                               std::memory_order_release,
+                                                               std::memory_order_relaxed);
+                            if (old_state == STATE_READER) return true;// Downgrade completed
+                        }
+                        /* wait for the next to register */
+                        spin_wait_while_eq(s.my_next, 0U, std::memory_order_relaxed);
+                        next = tricky_pointer::load(s.my_next, std::memory_order_acquire);
+                    }
 
-                d1::queuing_rw_mutex::scoped_lock* expected = &s;
-                if( !tricky_pointer::load(s.my_next, std::memory_order_acquire) && !s.my_mutex->q_tail.compare_exchange_strong(expected, predecessor, std::memory_order_release) ) {
-                    spin_wait_while_eq( s.my_next, 0U, std::memory_order_acquire );
-                }
-                __TBB_ASSERT( !(s.my_next.load(std::memory_order_relaxed) & FLAG), "use of corrupted pointer" );
-
-                // my_next is acquired either with load or spin_wait.
-                if(d1::queuing_rw_mutex::scoped_lock *const l_next = tricky_pointer::load(s.my_next, std::memory_order_relaxed) ) { // I->next != nil, TODO: rename to next after clearing up and adapting the n in the comment two lines below
-                    // Equivalent to I->next->prev = I->prev but protected against (prev[n]&FLAG)!=0
-                    tmp = tricky_pointer::exchange(l_next->my_prev, predecessor, std::memory_order_release);
-                    // I->prev->next = I->next;
-                    __TBB_ASSERT(tricky_pointer::load(s.my_prev, std::memory_order_relaxed)==predecessor, nullptr);
-                    predecessor->my_next.store(s.my_next.load(std::memory_order_relaxed), std::memory_order_release);
+                    __TBB_ASSERT(next, "still no successor at this point!");
+                    if (next->my_state.load(std::memory_order_relaxed) & STATE_COMBINED_WAITINGREADER)
+                        next->my_going.store(1U, std::memory_order_release);
+                    // If the next is STATE_UPGRADE_WAITING, it is expected to acquire all other released readers via release
+                    // sequence in next->my_state. In that case, we need to preserve release sequence in next->my_state
+                    // contributed by other reader. So, there are two approaches not to break the release sequence:
+                    //   1. Use read-modify-write (exchange) operation to store with release the UPGRADE_LOSER state;
+                    //   2. Acquire the release sequence and store the sequence and UPGRADE_LOSER state.
+                    // The second approach seems better on x86 because it does not involve interlocked operations.
+                    // Therefore, we read next->my_state with acquire while it is not required for else branch to get the
+                    // release sequence.
+                    else if (next->my_state.load(std::memory_order_acquire) == STATE_UPGRADE_WAITING)
+                        // the next waiting for upgrade means this writer was upgraded before.
+                        // To safe release sequence on next->my_state read it with acquire
+                        next->my_state.store(STATE_UPGRADE_LOSER, std::memory_order_release);
+                    s.my_state.store(STATE_ACTIVEREADER, std::memory_order_release);
+                    return true;
                 }
-                // Safe to release in the order opposite to acquiring which makes the code simpler
-                release_internal_lock(*predecessor);
 
-            } else { // No predecessor when we looked
-                acquire_internal_lock(s);  // "exclusiveLock(&I->EL)"
-                d1::queuing_rw_mutex::scoped_lock* next = tricky_pointer::load(s.my_next, std::memory_order_acquire);
-                if( !next ) {
+                static bool upgrade_to_writer(d1::queuing_rw_mutex::scoped_lock& s) {
+                    if (s.my_state.load(std::memory_order_relaxed) == STATE_WRITER) {
+                        // Already a writer
+                        return true;
+                    }
+
+                    __TBB_ASSERT(s.my_state.load(std::memory_order_relaxed) == STATE_ACTIVEREADER,
+                                 "only active reader can be updated");
+
+                    queuing_rw_mutex::scoped_lock* tmp {};
+                    queuing_rw_mutex::scoped_lock* me = &s;
+
+                    ITT_NOTIFY(sync_releasing, s.my_mutex);
+                    // Publish ourselves into my_state that other UPGRADE_WAITING actors can acquire our state.
+                    s.my_state.store(STATE_UPGRADE_REQUESTED, std::memory_order_release);
+                requested:
+                    __TBB_ASSERT(!(s.my_next.load(std::memory_order_relaxed) & FLAG),
+                                 "use of corrupted pointer!");
+                    acquire_internal_lock(s);
                     d1::queuing_rw_mutex::scoped_lock* expected = &s;
-                    // Release mutex on success otherwise wait for successor publication
-                    if( !s.my_mutex->q_tail.compare_exchange_strong(expected, nullptr,
-                        std::memory_order_release, std::memory_order_relaxed) )
+                    if (!s.my_mutex->q_tail.compare_exchange_strong(expected, tricky_pointer(me) | FLAG,
+                                                                    std::memory_order_acq_rel)) {
+                        spin_wait_while_eq(s.my_next, 0U, std::memory_order_relaxed);
+                        queuing_rw_mutex::scoped_lock* next;
+                        next = tricky_pointer::fetch_add(s.my_next, FLAG, std::memory_order_acquire);
+                        // While we were READER the next READER might reach STATE_UPGRADE_WAITING state.
+                        // Therefore, it did not build happens before relation with us and we need to acquire the
+                        // next->my_state to build the happens before relation ourselves
+                        unsigned short n_state = next->my_state.load(std::memory_order_acquire);
+                        /* the next reader can be blocked by our state. the best thing to do is to unblock it */
+                        if (n_state & STATE_COMBINED_WAITINGREADER)
+                            next->my_going.store(1U, std::memory_order_release);
+                        // Responsibility transition, the one who reads uncorrupted my_prev will do release.
+                        tmp = tricky_pointer::exchange(next->my_prev, &s, std::memory_order_release);
+                        unblock_or_wait_on_internal_lock(s, get_flag(tmp));
+                        if (n_state & (STATE_COMBINED_READER | STATE_UPGRADE_REQUESTED)) {
+                            // save next|FLAG for simplicity of following comparisons
+                            tmp = tricky_pointer(next) | FLAG;
+                            for (atomic_backoff b;
+                                 tricky_pointer::load(s.my_next, std::memory_order_relaxed) == tmp;
+                                 b.pause()) {
+                                if (s.my_state.load(std::memory_order_acquire) & STATE_COMBINED_UPGRADING) {
+                                    if (tricky_pointer::load(s.my_next, std::memory_order_acquire) == tmp)
+                                        tricky_pointer::store(s.my_next, next, std::memory_order_relaxed);
+                                    goto waiting;
+                                }
+                            }
+                            __TBB_ASSERT(tricky_pointer::load(s.my_next, std::memory_order_relaxed)
+                                                 != (tricky_pointer(next) | FLAG),
+                                         nullptr);
+                            goto requested;
+                        } else {
+                            __TBB_ASSERT(n_state & (STATE_WRITER | STATE_UPGRADE_WAITING),
+                                         "unexpected state");
+                            __TBB_ASSERT(
+                                    (tricky_pointer(next) | FLAG)
+                                            == tricky_pointer::load(s.my_next, std::memory_order_relaxed),
+                                    nullptr);
+                            tricky_pointer::store(s.my_next, next, std::memory_order_relaxed);
+                        }
+                    } else {
+                        /* We are in the tail; whoever comes next is blocked by q_tail&FLAG */
+                        release_internal_lock(s);
+                    }// if( this != my_mutex->q_tail... )
                     {
-                        spin_wait_while_eq( s.my_next, 0U, std::memory_order_relaxed );
-                        next = tricky_pointer::load(s.my_next, std::memory_order_acquire);
+                        unsigned char old_state = STATE_UPGRADE_REQUESTED;
+                        // If we reach STATE_UPGRADE_WAITING state we do not build happens-before relation with READER on
+                        // left. We delegate this responsibility to READER on left when it try upgrading. Therefore, we are releasing
+                        // on success.
+                        // Otherwise, on fail, we already acquired the next->my_state.
+                        s.my_state.compare_exchange_strong(old_state, STATE_UPGRADE_WAITING,
+                                                           std::memory_order_release,
+                                                           std::memory_order_relaxed);
+                    }
+                waiting:
+                    __TBB_ASSERT(!(s.my_next.load(std::memory_order_relaxed) & FLAG),
+                                 "use of corrupted pointer!");
+                    __TBB_ASSERT(s.my_state & STATE_COMBINED_UPGRADING,
+                                 "wrong state at upgrade waiting_retry");
+                    __TBB_ASSERT(me == &s, nullptr);
+                    ITT_NOTIFY(sync_prepare, s.my_mutex);
+                    /* if no one was blocked by the "corrupted" q_tail, turn it back */
+                    expected = tricky_pointer(me) | FLAG;
+                    s.my_mutex->q_tail.compare_exchange_strong(expected, &s, std::memory_order_release);
+                    queuing_rw_mutex::scoped_lock* predecessor;
+                    // Mark my_prev as 'in use' to prevent predecessor from releasing
+                    predecessor = tricky_pointer::fetch_add(s.my_prev, FLAG, std::memory_order_acquire);
+                    if (predecessor) {
+                        bool success = try_acquire_internal_lock(*predecessor);
+                        {
+                            // While the predecessor pointer (my_prev) is in use (FLAG is set), we can safely update the node`s state.
+                            // Corrupted pointer transitions responsibility to release the predecessor`s node on us.
+                            unsigned char old_state = STATE_UPGRADE_REQUESTED;
+                            // Try to build happens before with the upgrading READER on left. If fail, the predecessor state is not
+                            // important for us because it will acquire our state.
+                            predecessor->my_state.compare_exchange_strong(old_state, STATE_UPGRADE_WAITING,
+                                                                          std::memory_order_release,
+                                                                          std::memory_order_relaxed);
+                        }
+                        if (!success) {
+                            // Responsibility transition, the one who reads uncorrupted my_prev will do release.
+                            tmp = tricky_pointer::compare_exchange_strong(
+                                    s.my_prev, tricky_pointer(predecessor) | FLAG, predecessor,
+                                    std::memory_order_acquire);
+                            if (tricky_pointer(tmp) & FLAG) {
+                                tricky_pointer::spin_wait_while_eq(s.my_prev, predecessor);
+                                predecessor = tricky_pointer::load(s.my_prev, std::memory_order_relaxed);
+                            } else {
+                                // TODO: spin_wait condition seems never reachable
+                                tricky_pointer::spin_wait_while_eq(s.my_prev,
+                                                                   tricky_pointer(predecessor) | FLAG);
+                                release_internal_lock(*predecessor);
+                            }
+                        } else {
+                            tricky_pointer::store(s.my_prev, predecessor, std::memory_order_relaxed);
+                            release_internal_lock(*predecessor);
+                            tricky_pointer::spin_wait_while_eq(s.my_prev, predecessor);
+                            predecessor = tricky_pointer::load(s.my_prev, std::memory_order_relaxed);
+                        }
+                        if (predecessor) goto waiting;
                     } else {
-                        goto unlock_self;
+                        tricky_pointer::store(s.my_prev, nullptr, std::memory_order_relaxed);
                     }
+                    __TBB_ASSERT(!predecessor && !s.my_prev, nullptr);
+
+                    // additional lifetime issue prevention checks
+                    // wait for the successor to finish working with my fields
+                    wait_for_release_of_internal_lock(s);
+                    // now wait for the predecessor to finish working with my fields
+                    spin_wait_while_eq(s.my_going, 2U);
+
+                    bool result = (s.my_state != STATE_UPGRADE_LOSER);
+                    s.my_state.store(STATE_WRITER, std::memory_order_relaxed);
+                    s.my_going.store(1U, std::memory_order_relaxed);
+
+                    ITT_NOTIFY(sync_acquired, s.my_mutex);
+                    return result;
+                }
+
+                static bool is_writer(const d1::queuing_rw_mutex::scoped_lock& m) {
+                    return m.my_state.load(std::memory_order_relaxed) == STATE_WRITER;
+                }
+
+                static void construct(d1::queuing_rw_mutex& m) {
+                    suppress_unused_warning(m);
+                    ITT_SYNC_CREATE(&m, _T("tbb::queuing_rw_mutex"), _T(""));
                 }
-                next->my_going.store(2U, std::memory_order_relaxed);
-                // Responsibility transition, the one who reads uncorrupted my_prev will do release.
-                tmp = tricky_pointer::exchange(next->my_prev, nullptr, std::memory_order_release);
-                next->my_going.store(1U, std::memory_order_release);
+            };
+
+            void __TBB_EXPORTED_FUNC acquire(d1::queuing_rw_mutex& m, d1::queuing_rw_mutex::scoped_lock& s,
+                                             bool write) {
+                queuing_rw_mutex_impl::acquire(m, s, write);
             }
-    unlock_self:
-            unblock_or_wait_on_internal_lock(s, get_flag(tmp));
-        }
-    done:
-        // Lifetime synchronization, no need to build happens-before relation
-        spin_wait_while_eq( s.my_going, 2U, std::memory_order_relaxed );
-
-        s.initialize();
-    }
-
-    static bool downgrade_to_reader(d1::queuing_rw_mutex::scoped_lock& s) {
-        if ( s.my_state.load(std::memory_order_relaxed) == STATE_ACTIVEREADER ) return true; // Already a reader
-
-        ITT_NOTIFY(sync_releasing, s.my_mutex);
-        d1::queuing_rw_mutex::scoped_lock* next = tricky_pointer::load(s.my_next, std::memory_order_acquire);
-        if( !next ) {
-            s.my_state.store(STATE_READER, std::memory_order_seq_cst);
-            // the following load of q_tail must not be reordered with setting STATE_READER above
-            if( &s == s.my_mutex->q_tail.load(std::memory_order_seq_cst) ) {
-                unsigned char old_state = STATE_READER;
-                // When this reader is signaled by previous actor it acquires the mutex.
-                // We need to build happens-before relation with all other coming readers that will read our ACTIVEREADER
-                // without blocking on my_going. Therefore, we need to publish ACTIVEREADER with release semantics.
-                // On fail it is relaxed, because we will build happens-before on my_going.
-                s.my_state.compare_exchange_strong(old_state, STATE_ACTIVEREADER, std::memory_order_release, std::memory_order_relaxed);
-                if( old_state==STATE_READER )
-                    return true; // Downgrade completed
+
+            bool __TBB_EXPORTED_FUNC try_acquire(d1::queuing_rw_mutex& m,
+                                                 d1::queuing_rw_mutex::scoped_lock& s, bool write) {
+                return queuing_rw_mutex_impl::try_acquire(m, s, write);
             }
-            /* wait for the next to register */
-            spin_wait_while_eq(s.my_next, 0U, std::memory_order_relaxed);
-            next = tricky_pointer::load(s.my_next, std::memory_order_acquire);
-        }
-
-        __TBB_ASSERT( next, "still no successor at this point!" );
-        if( next->my_state.load(std::memory_order_relaxed) & STATE_COMBINED_WAITINGREADER )
-            next->my_going.store(1U, std::memory_order_release);
-        // If the next is STATE_UPGRADE_WAITING, it is expected to acquire all other released readers via release
-        // sequence in next->my_state. In that case, we need to preserve release sequence in next->my_state
-        // contributed by other reader. So, there are two approaches not to break the release sequence:
-        //   1. Use read-modify-write (exchange) operation to store with release the UPGRADE_LOSER state;
-        //   2. Acquire the release sequence and store the sequence and UPGRADE_LOSER state.
-        // The second approach seems better on x86 because it does not involve interlocked operations.
-        // Therefore, we read next->my_state with acquire while it is not required for else branch to get the 
-        // release sequence.
-        else if( next->my_state.load(std::memory_order_acquire)==STATE_UPGRADE_WAITING )
-            // the next waiting for upgrade means this writer was upgraded before.
-            // To safe release sequence on next->my_state read it with acquire
-            next->my_state.store(STATE_UPGRADE_LOSER, std::memory_order_release);
-        s.my_state.store(STATE_ACTIVEREADER, std::memory_order_release);
-        return true;
-    }
-
-    static bool upgrade_to_writer(d1::queuing_rw_mutex::scoped_lock& s) {
-        if (s.my_state.load(std::memory_order_relaxed) == STATE_WRITER) {
-            // Already a writer
-            return true;
-        }
-
-        __TBB_ASSERT(s.my_state.load(std::memory_order_relaxed) == STATE_ACTIVEREADER, "only active reader can be updated");
-
-        queuing_rw_mutex::scoped_lock* tmp{};
-        queuing_rw_mutex::scoped_lock* me = &s;
-
-        ITT_NOTIFY(sync_releasing, s.my_mutex);
-        // Publish ourselves into my_state that other UPGRADE_WAITING actors can acquire our state.
-        s.my_state.store(STATE_UPGRADE_REQUESTED, std::memory_order_release);
-    requested:
-        __TBB_ASSERT( !(s.my_next.load(std::memory_order_relaxed) & FLAG), "use of corrupted pointer!" );
-        acquire_internal_lock(s);
-        d1::queuing_rw_mutex::scoped_lock* expected = &s;
-        if( !s.my_mutex->q_tail.compare_exchange_strong(expected, tricky_pointer(me)|FLAG, std::memory_order_acq_rel) ) {
-            spin_wait_while_eq( s.my_next, 0U, std::memory_order_relaxed );
-            queuing_rw_mutex::scoped_lock * next;
-            next = tricky_pointer::fetch_add(s.my_next, FLAG, std::memory_order_acquire);
-            // While we were READER the next READER might reach STATE_UPGRADE_WAITING state.
-            // Therefore, it did not build happens before relation with us and we need to acquire the 
-            // next->my_state to build the happens before relation ourselves
-            unsigned short n_state = next->my_state.load(std::memory_order_acquire);
-            /* the next reader can be blocked by our state. the best thing to do is to unblock it */
-            if( n_state & STATE_COMBINED_WAITINGREADER )
-                next->my_going.store(1U, std::memory_order_release);
-            // Responsibility transition, the one who reads uncorrupted my_prev will do release.
-            tmp = tricky_pointer::exchange(next->my_prev, &s, std::memory_order_release);
-            unblock_or_wait_on_internal_lock(s, get_flag(tmp));
-            if( n_state & (STATE_COMBINED_READER | STATE_UPGRADE_REQUESTED) ) {
-                // save next|FLAG for simplicity of following comparisons
-                tmp = tricky_pointer(next)|FLAG;
-                for( atomic_backoff b; tricky_pointer::load(s.my_next, std::memory_order_relaxed)==tmp; b.pause() ) {
-                    if( s.my_state.load(std::memory_order_acquire) & STATE_COMBINED_UPGRADING ) {
-                        if( tricky_pointer::load(s.my_next, std::memory_order_acquire)==tmp )
-                            tricky_pointer::store(s.my_next, next, std::memory_order_relaxed);
-                        goto waiting;
-                    }
-                }
-                __TBB_ASSERT(tricky_pointer::load(s.my_next, std::memory_order_relaxed) != (tricky_pointer(next)|FLAG), nullptr);
-                goto requested;
-            } else {
-                __TBB_ASSERT( n_state & (STATE_WRITER | STATE_UPGRADE_WAITING), "unexpected state");
-                __TBB_ASSERT( (tricky_pointer(next)|FLAG) == tricky_pointer::load(s.my_next, std::memory_order_relaxed), nullptr);
-                tricky_pointer::store(s.my_next, next, std::memory_order_relaxed);
+
+            void __TBB_EXPORTED_FUNC release(d1::queuing_rw_mutex::scoped_lock& s) {
+                queuing_rw_mutex_impl::release(s);
             }
-        } else {
-            /* We are in the tail; whoever comes next is blocked by q_tail&FLAG */
-            release_internal_lock(s);
-        } // if( this != my_mutex->q_tail... )
-        {
-            unsigned char old_state = STATE_UPGRADE_REQUESTED;
-            // If we reach STATE_UPGRADE_WAITING state we do not build happens-before relation with READER on
-            // left. We delegate this responsibility to READER on left when it try upgrading. Therefore, we are releasing
-            // on success.
-            // Otherwise, on fail, we already acquired the next->my_state.
-            s.my_state.compare_exchange_strong(old_state, STATE_UPGRADE_WAITING, std::memory_order_release, std::memory_order_relaxed);
-        }
-    waiting:
-        __TBB_ASSERT( !( s.my_next.load(std::memory_order_relaxed) & FLAG ), "use of corrupted pointer!" );
-        __TBB_ASSERT( s.my_state & STATE_COMBINED_UPGRADING, "wrong state at upgrade waiting_retry" );
-        __TBB_ASSERT( me==&s, nullptr );
-        ITT_NOTIFY(sync_prepare, s.my_mutex);
-        /* if no one was blocked by the "corrupted" q_tail, turn it back */
-        expected = tricky_pointer(me)|FLAG;
-        s.my_mutex->q_tail.compare_exchange_strong(expected, &s, std::memory_order_release);
-        queuing_rw_mutex::scoped_lock * predecessor;
-        // Mark my_prev as 'in use' to prevent predecessor from releasing
-        predecessor = tricky_pointer::fetch_add(s.my_prev, FLAG, std::memory_order_acquire);
-        if( predecessor ) {
-            bool success = try_acquire_internal_lock(*predecessor);
-            {
-                // While the predecessor pointer (my_prev) is in use (FLAG is set), we can safely update the node`s state.
-                // Corrupted pointer transitions responsibility to release the predecessor`s node on us.
-                unsigned char old_state = STATE_UPGRADE_REQUESTED;
-                // Try to build happens before with the upgrading READER on left. If fail, the predecessor state is not
-                // important for us because it will acquire our state.
-                predecessor->my_state.compare_exchange_strong(old_state, STATE_UPGRADE_WAITING, std::memory_order_release,
-                    std::memory_order_relaxed);
+
+            bool __TBB_EXPORTED_FUNC upgrade_to_writer(d1::queuing_rw_mutex::scoped_lock& s) {
+                return queuing_rw_mutex_impl::upgrade_to_writer(s);
             }
-            if( !success ) {
-                // Responsibility transition, the one who reads uncorrupted my_prev will do release.
-                tmp = tricky_pointer::compare_exchange_strong(s.my_prev, tricky_pointer(predecessor)|FLAG, predecessor, std::memory_order_acquire);
-                if( tricky_pointer(tmp) & FLAG ) {
-                    tricky_pointer::spin_wait_while_eq(s.my_prev, predecessor);
-                    predecessor = tricky_pointer::load(s.my_prev, std::memory_order_relaxed);
-                } else {
-                    // TODO: spin_wait condition seems never reachable
-                    tricky_pointer::spin_wait_while_eq(s.my_prev, tricky_pointer(predecessor)|FLAG);
-                    release_internal_lock(*predecessor);
-                }
-            } else {
-                tricky_pointer::store(s.my_prev, predecessor, std::memory_order_relaxed);
-                release_internal_lock(*predecessor);
-                tricky_pointer::spin_wait_while_eq(s.my_prev, predecessor);
-                predecessor = tricky_pointer::load(s.my_prev, std::memory_order_relaxed);
+
+            bool __TBB_EXPORTED_FUNC is_writer(const d1::queuing_rw_mutex::scoped_lock& s) {
+                return queuing_rw_mutex_impl::is_writer(s);
             }
-            if( predecessor )
-                goto waiting;
-        } else {
-            tricky_pointer::store(s.my_prev, nullptr, std::memory_order_relaxed);
-        }
-        __TBB_ASSERT( !predecessor && !s.my_prev, nullptr );
-
-        // additional lifetime issue prevention checks
-        // wait for the successor to finish working with my fields
-        wait_for_release_of_internal_lock(s);
-        // now wait for the predecessor to finish working with my fields
-        spin_wait_while_eq( s.my_going, 2U );
-
-        bool result = ( s.my_state != STATE_UPGRADE_LOSER );
-        s.my_state.store(STATE_WRITER, std::memory_order_relaxed);
-        s.my_going.store(1U, std::memory_order_relaxed);
-
-        ITT_NOTIFY(sync_acquired, s.my_mutex);
-        return result;
-    }
-
-    static bool is_writer(const d1::queuing_rw_mutex::scoped_lock& m) {
-        return m.my_state.load(std::memory_order_relaxed) == STATE_WRITER;
-    }
-
-    static void construct(d1::queuing_rw_mutex& m) {
-        suppress_unused_warning(m);
-        ITT_SYNC_CREATE(&m, _T("tbb::queuing_rw_mutex"), _T(""));
-    }
-};
-
-void __TBB_EXPORTED_FUNC acquire(d1::queuing_rw_mutex& m, d1::queuing_rw_mutex::scoped_lock& s, bool write) {
-    queuing_rw_mutex_impl::acquire(m, s, write);
-}
-
-bool __TBB_EXPORTED_FUNC try_acquire(d1::queuing_rw_mutex& m, d1::queuing_rw_mutex::scoped_lock& s, bool write) {
-    return queuing_rw_mutex_impl::try_acquire(m, s, write);
-}
-
-void __TBB_EXPORTED_FUNC release(d1::queuing_rw_mutex::scoped_lock& s) {
-    queuing_rw_mutex_impl::release(s);
-}
-
-bool __TBB_EXPORTED_FUNC upgrade_to_writer(d1::queuing_rw_mutex::scoped_lock& s) {
-    return queuing_rw_mutex_impl::upgrade_to_writer(s);
-}
-
-bool __TBB_EXPORTED_FUNC is_writer(const d1::queuing_rw_mutex::scoped_lock& s) {
-    return queuing_rw_mutex_impl::is_writer(s);
-}
-
-bool __TBB_EXPORTED_FUNC downgrade_to_reader(d1::queuing_rw_mutex::scoped_lock& s) {
-    return queuing_rw_mutex_impl::downgrade_to_reader(s);
-}
-
-TBB_EXPORT void __TBB_EXPORTED_FUNC construct(d1::queuing_rw_mutex& m) {
-    queuing_rw_mutex_impl::construct(m);
-}
-
-} // namespace r1
-} // namespace detail
-} // namespace tbb
+
+            bool __TBB_EXPORTED_FUNC downgrade_to_reader(d1::queuing_rw_mutex::scoped_lock& s) {
+                return queuing_rw_mutex_impl::downgrade_to_reader(s);
+            }
+
+            TBB_EXPORT void __TBB_EXPORTED_FUNC construct(d1::queuing_rw_mutex& m) {
+                queuing_rw_mutex_impl::construct(m);
+            }
+
+        }// namespace r1
+    }    // namespace detail
+}// namespace tbb
diff --git a/external/tbb/src/tbb/rml_tbb.cpp b/external/tbb/src/tbb/rml_tbb.cpp
index d1cd285c..67dcc091 100644
--- a/external/tbb/src/tbb/rml_tbb.cpp
+++ b/external/tbb/src/tbb/rml_tbb.cpp
@@ -16,27 +16,28 @@
 
 #include "oneapi/tbb/detail/_assert.h"
 
-#include "rml_tbb.h"
 #include "dynamic_link.h"
+#include "rml_tbb.h"
 
 namespace tbb {
-namespace detail {
-namespace r1 {
-namespace rml {
+    namespace detail {
+        namespace r1 {
+            namespace rml {
 
-#define MAKE_SERVER(x) DLD(__TBB_make_rml_server,x)
-#define GET_INFO(x) DLD(__TBB_call_with_my_server_info,x)
+#define MAKE_SERVER(x) DLD(__TBB_make_rml_server, x)
+#define GET_INFO(x) DLD(__TBB_call_with_my_server_info, x)
 #define SERVER tbb_server
 #define CLIENT tbb_client
 #define FACTORY tbb_factory
 
 #if __TBB_WEAK_SYMBOLS_PRESENT
-    #pragma weak __TBB_make_rml_server
-    #pragma weak __TBB_call_with_my_server_info
-    extern "C" {
-        ::rml::factory::status_type __TBB_make_rml_server( rml::tbb_factory& f, rml::tbb_server*& server, rml::tbb_client& client );
-        void __TBB_call_with_my_server_info( ::rml::server_info_callback_t cb, void* arg );
-    }
+#pragma weak __TBB_make_rml_server
+#pragma weak __TBB_call_with_my_server_info
+                extern "C" {
+                ::rml::factory::status_type
+                __TBB_make_rml_server(rml::tbb_factory& f, rml::tbb_server*& server, rml::tbb_client& client);
+                void __TBB_call_with_my_server_info(::rml::server_info_callback_t cb, void* arg);
+                }
 #endif /* __TBB_WEAK_SYMBOLS_PRESENT */
 
 #if TBB_USE_DEBUG
@@ -58,55 +59,56 @@ namespace rml {
 #error Unknown OS
 #endif
 
-const ::rml::versioned_object::version_type CLIENT_VERSION = 2;
+                const ::rml::versioned_object::version_type CLIENT_VERSION = 2;
 
 #if __TBB_WEAK_SYMBOLS_PRESENT
-    #pragma weak __RML_open_factory
-    #pragma weak __RML_close_factory
-    extern "C" {
-        ::rml::factory::status_type __RML_open_factory ( ::rml::factory&, ::rml::versioned_object::version_type&, ::rml::versioned_object::version_type );
-        void __RML_close_factory( ::rml::factory& f );
-    }
+#pragma weak __RML_open_factory
+#pragma weak __RML_close_factory
+                extern "C" {
+                ::rml::factory::status_type __RML_open_factory(::rml::factory&,
+                                                               ::rml::versioned_object::version_type&,
+                                                               ::rml::versioned_object::version_type);
+                void __RML_close_factory(::rml::factory& f);
+                }
 #endif /* __TBB_WEAK_SYMBOLS_PRESENT */
 
-::rml::factory::status_type FACTORY::open() {
-    // Failure of following assertion indicates that factory is already open, or not zero-inited.
-    __TBB_ASSERT_EX( !library_handle, nullptr);
-    status_type (*open_factory_routine)( factory&, version_type&, version_type );
-    dynamic_link_descriptor server_link_table[4] = {
-        DLD(__RML_open_factory,open_factory_routine),
-        MAKE_SERVER(my_make_server_routine),
-        DLD(__RML_close_factory,my_wait_to_close_routine),
-        GET_INFO(my_call_with_server_info_routine),
-    };
-    status_type result;
-    if ( dynamic_link( RML_SERVER_NAME, server_link_table, 4, &library_handle ) ) {
-        version_type server_version;
-        result = (*open_factory_routine)( *this, server_version, CLIENT_VERSION );
-        // server_version can be checked here for incompatibility if necessary.
-    } else {
-        library_handle = nullptr;
-        result = st_not_found;
-    }
-    return result;
-}
-
-void FACTORY::close() {
-    if ( library_handle )
-        (*my_wait_to_close_routine)(*this);
-    if ( (size_t)library_handle>FACTORY::c_dont_unload ) {
-        dynamic_unlink(library_handle);
-        library_handle = nullptr;
-    }
-}
-
-::rml::factory::status_type FACTORY::make_server( SERVER*& s, CLIENT& c) {
-    // Failure of following assertion means that factory was not successfully opened.
-    __TBB_ASSERT_EX( my_make_server_routine, nullptr);
-    return (*my_make_server_routine)(*this,s,c);
-}
-
-} // namespace rml
-} // namespace r1
-} // namespace detail
-} // namespace tbb
+                ::rml::factory::status_type FACTORY::open() {
+                    // Failure of following assertion indicates that factory is already open, or not zero-inited.
+                    __TBB_ASSERT_EX(!library_handle, nullptr);
+                    status_type (*open_factory_routine)(factory&, version_type&, version_type);
+                    dynamic_link_descriptor server_link_table[4] = {
+                            DLD(__RML_open_factory, open_factory_routine),
+                            MAKE_SERVER(my_make_server_routine),
+                            DLD(__RML_close_factory, my_wait_to_close_routine),
+                            GET_INFO(my_call_with_server_info_routine),
+                    };
+                    status_type result;
+                    if (dynamic_link(RML_SERVER_NAME, server_link_table, 4, &library_handle)) {
+                        version_type server_version;
+                        result = (*open_factory_routine)(*this, server_version, CLIENT_VERSION);
+                        // server_version can be checked here for incompatibility if necessary.
+                    } else {
+                        library_handle = nullptr;
+                        result = st_not_found;
+                    }
+                    return result;
+                }
+
+                void FACTORY::close() {
+                    if (library_handle) (*my_wait_to_close_routine)(*this);
+                    if ((size_t) library_handle > FACTORY::c_dont_unload) {
+                        dynamic_unlink(library_handle);
+                        library_handle = nullptr;
+                    }
+                }
+
+                ::rml::factory::status_type FACTORY::make_server(SERVER*& s, CLIENT& c) {
+                    // Failure of following assertion means that factory was not successfully opened.
+                    __TBB_ASSERT_EX(my_make_server_routine, nullptr);
+                    return (*my_make_server_routine)(*this, s, c);
+                }
+
+            }// namespace rml
+        }    // namespace r1
+    }        // namespace detail
+}// namespace tbb
diff --git a/external/tbb/src/tbb/rtm_mutex.cpp b/external/tbb/src/tbb/rtm_mutex.cpp
index f386735b..418bea65 100644
--- a/external/tbb/src/tbb/rtm_mutex.cpp
+++ b/external/tbb/src/tbb/rtm_mutex.cpp
@@ -14,108 +14,102 @@
     limitations under the License.
 */
 
-#include "oneapi/tbb/detail/_assert.h"
-#include "oneapi/tbb/detail/_rtm_mutex.h"
-#include "itt_notify.h"
 #include "governor.h"
+#include "itt_notify.h"
 #include "misc.h"
+#include "oneapi/tbb/detail/_assert.h"
+#include "oneapi/tbb/detail/_rtm_mutex.h"
 
 #include <atomic>
 
 namespace tbb {
-namespace detail {
-namespace r1 {
-
-
-struct rtm_mutex_impl {
-    // maximum number of times to retry
-    // TODO: experiment on retry values.
-    static constexpr int retry_threshold = 10;
-    using transaction_result_type = decltype(begin_transaction());
+    namespace detail {
+        namespace r1 {
 
-    //! Release speculative mutex
-    static void release(d1::rtm_mutex::scoped_lock& s) {
-        switch(s.m_transaction_state) {
-        case d1::rtm_mutex::rtm_state::rtm_transacting:
-            __TBB_ASSERT(is_in_transaction(), "m_transaction_state && not speculating");
-            end_transaction();
-            s.m_mutex = nullptr;
-            break;
-        case d1::rtm_mutex::rtm_state::rtm_real:
-            s.m_mutex->unlock();
-            s.m_mutex = nullptr;
-            break;
-        case d1::rtm_mutex::rtm_state::rtm_none:
-            __TBB_ASSERT(false, "mutex is not locked, but in release");
-            break;
-        default:
-            __TBB_ASSERT(false, "invalid m_transaction_state");
-        }
-        s.m_transaction_state = d1::rtm_mutex::rtm_state::rtm_none;
-    }
+            struct rtm_mutex_impl {
+                // maximum number of times to retry
+                // TODO: experiment on retry values.
+                static constexpr int retry_threshold = 10;
+                using transaction_result_type = decltype(begin_transaction());
 
-    //! Acquire lock on the given mutex.
-    static void acquire(d1::rtm_mutex& m, d1::rtm_mutex::scoped_lock& s, bool only_speculate) {
-        __TBB_ASSERT(s.m_transaction_state == d1::rtm_mutex::rtm_state::rtm_none, "scoped_lock already in transaction");
-        if(governor::speculation_enabled()) {
-            int num_retries = 0;
-            transaction_result_type abort_code = 0;
-            do {
-                if(m.m_flag.load(std::memory_order_acquire)) {
-                    if(only_speculate) return;
-                    spin_wait_while_eq(m.m_flag, true);
-                }
-                // _xbegin returns -1 on success or the abort code, so capture it
-                if((abort_code = begin_transaction()) == transaction_result_type(speculation_successful_begin))
-                {
-                    // started speculation
-                    if(m.m_flag.load(std::memory_order_relaxed)) {
-                        abort_transaction();
+                //! Release speculative mutex
+                static void release(d1::rtm_mutex::scoped_lock& s) {
+                    switch (s.m_transaction_state) {
+                        case d1::rtm_mutex::rtm_state::rtm_transacting:
+                            __TBB_ASSERT(is_in_transaction(), "m_transaction_state && not speculating");
+                            end_transaction();
+                            s.m_mutex = nullptr;
+                            break;
+                        case d1::rtm_mutex::rtm_state::rtm_real:
+                            s.m_mutex->unlock();
+                            s.m_mutex = nullptr;
+                            break;
+                        case d1::rtm_mutex::rtm_state::rtm_none:
+                            __TBB_ASSERT(false, "mutex is not locked, but in release");
+                            break;
+                        default:
+                            __TBB_ASSERT(false, "invalid m_transaction_state");
                     }
-                    s.m_transaction_state = d1::rtm_mutex::rtm_state::rtm_transacting;
-                    // Don not wrap the following assignment to a function,
-                    // because it can abort the transaction in debug. Need mutex for release().
-                    s.m_mutex = &m;
-                    return;  // successfully started speculation
+                    s.m_transaction_state = d1::rtm_mutex::rtm_state::rtm_none;
                 }
-                ++num_retries;
-            } while((abort_code & speculation_retry) != 0 && (num_retries < retry_threshold));
-        }
 
-        if(only_speculate) return;
-        s.m_mutex = &m;
-        s.m_mutex->lock();
-        s.m_transaction_state = d1::rtm_mutex::rtm_state::rtm_real;
-    }
+                //! Acquire lock on the given mutex.
+                static void acquire(d1::rtm_mutex& m, d1::rtm_mutex::scoped_lock& s, bool only_speculate) {
+                    __TBB_ASSERT(s.m_transaction_state == d1::rtm_mutex::rtm_state::rtm_none,
+                                 "scoped_lock already in transaction");
+                    if (governor::speculation_enabled()) {
+                        int num_retries = 0;
+                        transaction_result_type abort_code = 0;
+                        do {
+                            if (m.m_flag.load(std::memory_order_acquire)) {
+                                if (only_speculate) return;
+                                spin_wait_while_eq(m.m_flag, true);
+                            }
+                            // _xbegin returns -1 on success or the abort code, so capture it
+                            if ((abort_code = begin_transaction())
+                                == transaction_result_type(speculation_successful_begin)) {
+                                // started speculation
+                                if (m.m_flag.load(std::memory_order_relaxed)) { abort_transaction(); }
+                                s.m_transaction_state = d1::rtm_mutex::rtm_state::rtm_transacting;
+                                // Don not wrap the following assignment to a function,
+                                // because it can abort the transaction in debug. Need mutex for release().
+                                s.m_mutex = &m;
+                                return;// successfully started speculation
+                            }
+                            ++num_retries;
+                        } while ((abort_code & speculation_retry) != 0 && (num_retries < retry_threshold));
+                    }
 
-    //! Try to acquire lock on the given mutex.
-    static bool try_acquire(d1::rtm_mutex& m, d1::rtm_mutex::scoped_lock& s) {
-        acquire(m, s, /*only_speculate=*/true);
-        if (s.m_transaction_state == d1::rtm_mutex::rtm_state::rtm_transacting) {
-            return true;
-        }
-        __TBB_ASSERT(s.m_transaction_state == d1::rtm_mutex::rtm_state::rtm_none, nullptr);
-        // transacting acquire failed. try_lock the real mutex
-        if (m.try_lock()) {
-            s.m_mutex = &m;
-            s.m_transaction_state = d1::rtm_mutex::rtm_state::rtm_real;
-            return true;
-        }
-        return false;
-    }
-};
+                    if (only_speculate) return;
+                    s.m_mutex = &m;
+                    s.m_mutex->lock();
+                    s.m_transaction_state = d1::rtm_mutex::rtm_state::rtm_real;
+                }
 
-void __TBB_EXPORTED_FUNC acquire(d1::rtm_mutex& m, d1::rtm_mutex::scoped_lock& s, bool only_speculate) {
-    rtm_mutex_impl::acquire(m, s, only_speculate);
-}
-bool __TBB_EXPORTED_FUNC try_acquire(d1::rtm_mutex& m, d1::rtm_mutex::scoped_lock& s) {
-    return rtm_mutex_impl::try_acquire(m, s);
-}
-void __TBB_EXPORTED_FUNC release(d1::rtm_mutex::scoped_lock& s) {
-    rtm_mutex_impl::release(s);
-}
+                //! Try to acquire lock on the given mutex.
+                static bool try_acquire(d1::rtm_mutex& m, d1::rtm_mutex::scoped_lock& s) {
+                    acquire(m, s, /*only_speculate=*/true);
+                    if (s.m_transaction_state == d1::rtm_mutex::rtm_state::rtm_transacting) { return true; }
+                    __TBB_ASSERT(s.m_transaction_state == d1::rtm_mutex::rtm_state::rtm_none, nullptr);
+                    // transacting acquire failed. try_lock the real mutex
+                    if (m.try_lock()) {
+                        s.m_mutex = &m;
+                        s.m_transaction_state = d1::rtm_mutex::rtm_state::rtm_real;
+                        return true;
+                    }
+                    return false;
+                }
+            };
 
-} // namespace r1
-} // namespace detail
-} // namespace tbb
+            void __TBB_EXPORTED_FUNC acquire(d1::rtm_mutex& m, d1::rtm_mutex::scoped_lock& s,
+                                             bool only_speculate) {
+                rtm_mutex_impl::acquire(m, s, only_speculate);
+            }
+            bool __TBB_EXPORTED_FUNC try_acquire(d1::rtm_mutex& m, d1::rtm_mutex::scoped_lock& s) {
+                return rtm_mutex_impl::try_acquire(m, s);
+            }
+            void __TBB_EXPORTED_FUNC release(d1::rtm_mutex::scoped_lock& s) { rtm_mutex_impl::release(s); }
 
+        }// namespace r1
+    }    // namespace detail
+}// namespace tbb
diff --git a/external/tbb/src/tbb/rtm_rw_mutex.cpp b/external/tbb/src/tbb/rtm_rw_mutex.cpp
index fa87d0e3..33abaa3e 100644
--- a/external/tbb/src/tbb/rtm_rw_mutex.cpp
+++ b/external/tbb/src/tbb/rtm_rw_mutex.cpp
@@ -14,258 +14,275 @@
     limitations under the License.
 */
 
-#include "oneapi/tbb/detail/_assert.h"
-#include "oneapi/tbb/detail/_rtm_rw_mutex.h"
-#include "itt_notify.h"
 #include "governor.h"
+#include "itt_notify.h"
 #include "misc.h"
+#include "oneapi/tbb/detail/_assert.h"
+#include "oneapi/tbb/detail/_rtm_rw_mutex.h"
 
 #include <atomic>
 
 namespace tbb {
-namespace detail {
-namespace r1 {
-
-struct rtm_rw_mutex_impl {
-    // maximum number of times to retry
-    // TODO: experiment on retry values.
-    static constexpr int retry_threshold_read = 10;
-    static constexpr int retry_threshold_write = 10;
-    using transaction_result_type = decltype(begin_transaction());
+    namespace detail {
+        namespace r1 {
 
-    //! Release speculative mutex
-    static void release(d1::rtm_rw_mutex::scoped_lock& s) {
-        switch(s.m_transaction_state) {
-        case d1::rtm_rw_mutex::rtm_type::rtm_transacting_writer:
-        case d1::rtm_rw_mutex::rtm_type::rtm_transacting_reader:
-            __TBB_ASSERT(is_in_transaction(), "m_transaction_state && not speculating");
-            end_transaction();
-            s.m_mutex = nullptr;
-            break;
-        case d1::rtm_rw_mutex::rtm_type::rtm_real_reader:
-            __TBB_ASSERT(!s.m_mutex->write_flag.load(std::memory_order_relaxed), "write_flag set but read lock acquired");
-            s.m_mutex->unlock_shared();
-            s.m_mutex = nullptr;
-            break;
-        case d1::rtm_rw_mutex::rtm_type::rtm_real_writer:
-            __TBB_ASSERT(s.m_mutex->write_flag.load(std::memory_order_relaxed), "write_flag unset but write lock acquired");
-            s.m_mutex->write_flag.store(false, std::memory_order_relaxed);
-            s.m_mutex->unlock();
-            s.m_mutex = nullptr;
-            break;
-        case d1::rtm_rw_mutex::rtm_type::rtm_not_in_mutex:
-            __TBB_ASSERT(false, "rtm_not_in_mutex, but in release");
-            break;
-        default:
-            __TBB_ASSERT(false, "invalid m_transaction_state");
-        }
-        s.m_transaction_state = d1::rtm_rw_mutex::rtm_type::rtm_not_in_mutex;
-    }
+            struct rtm_rw_mutex_impl {
+                // maximum number of times to retry
+                // TODO: experiment on retry values.
+                static constexpr int retry_threshold_read = 10;
+                static constexpr int retry_threshold_write = 10;
+                using transaction_result_type = decltype(begin_transaction());
 
-    //! Acquire write lock on the given mutex.
-    static void acquire_writer(d1::rtm_rw_mutex& m, d1::rtm_rw_mutex::scoped_lock& s, bool only_speculate) {
-        __TBB_ASSERT(s.m_transaction_state == d1::rtm_rw_mutex::rtm_type::rtm_not_in_mutex, "scoped_lock already in transaction");
-        if(governor::speculation_enabled()) {
-            int num_retries = 0;
-            transaction_result_type abort_code = 0;
-            do {
-                if(m.m_state.load(std::memory_order_acquire)) {
-                    if(only_speculate) return;
-                    spin_wait_until_eq(m.m_state, d1::rtm_rw_mutex::state_type(0));
-                }
-                // _xbegin returns -1 on success or the abort code, so capture it
-                if((abort_code = begin_transaction()) == transaction_result_type(speculation_successful_begin))
-                {
-                    // started speculation
-                    if(m.m_state.load(std::memory_order_relaxed)) {  // add spin_rw_mutex to read-set.
-                        // reader or writer grabbed the lock, so abort.
-                        abort_transaction();
+                //! Release speculative mutex
+                static void release(d1::rtm_rw_mutex::scoped_lock& s) {
+                    switch (s.m_transaction_state) {
+                        case d1::rtm_rw_mutex::rtm_type::rtm_transacting_writer:
+                        case d1::rtm_rw_mutex::rtm_type::rtm_transacting_reader:
+                            __TBB_ASSERT(is_in_transaction(), "m_transaction_state && not speculating");
+                            end_transaction();
+                            s.m_mutex = nullptr;
+                            break;
+                        case d1::rtm_rw_mutex::rtm_type::rtm_real_reader:
+                            __TBB_ASSERT(!s.m_mutex->write_flag.load(std::memory_order_relaxed),
+                                         "write_flag set but read lock acquired");
+                            s.m_mutex->unlock_shared();
+                            s.m_mutex = nullptr;
+                            break;
+                        case d1::rtm_rw_mutex::rtm_type::rtm_real_writer:
+                            __TBB_ASSERT(s.m_mutex->write_flag.load(std::memory_order_relaxed),
+                                         "write_flag unset but write lock acquired");
+                            s.m_mutex->write_flag.store(false, std::memory_order_relaxed);
+                            s.m_mutex->unlock();
+                            s.m_mutex = nullptr;
+                            break;
+                        case d1::rtm_rw_mutex::rtm_type::rtm_not_in_mutex:
+                            __TBB_ASSERT(false, "rtm_not_in_mutex, but in release");
+                            break;
+                        default:
+                            __TBB_ASSERT(false, "invalid m_transaction_state");
                     }
-                    s.m_transaction_state = d1::rtm_rw_mutex::rtm_type::rtm_transacting_writer;
-                    // Don not wrap the following assignment to a function,
-                    // because it can abort the transaction in debug. Need mutex for release().
-                    s.m_mutex = &m;
-                    return;  // successfully started speculation
+                    s.m_transaction_state = d1::rtm_rw_mutex::rtm_type::rtm_not_in_mutex;
                 }
-                ++num_retries;
-            } while((abort_code & speculation_retry) != 0 && (num_retries < retry_threshold_write));
-        }
 
-        if(only_speculate) return;
-        s.m_mutex = &m;                                                          // should apply a real try_lock...
-        s.m_mutex->lock();                                                       // kill transactional writers
-        __TBB_ASSERT(!m.write_flag.load(std::memory_order_relaxed), "After acquire for write, write_flag already true");
-        m.write_flag.store(true, std::memory_order_relaxed);                       // kill transactional readers
-        s.m_transaction_state = d1::rtm_rw_mutex::rtm_type::rtm_real_writer;
-    }
+                //! Acquire write lock on the given mutex.
+                static void acquire_writer(d1::rtm_rw_mutex& m, d1::rtm_rw_mutex::scoped_lock& s,
+                                           bool only_speculate) {
+                    __TBB_ASSERT(s.m_transaction_state == d1::rtm_rw_mutex::rtm_type::rtm_not_in_mutex,
+                                 "scoped_lock already in transaction");
+                    if (governor::speculation_enabled()) {
+                        int num_retries = 0;
+                        transaction_result_type abort_code = 0;
+                        do {
+                            if (m.m_state.load(std::memory_order_acquire)) {
+                                if (only_speculate) return;
+                                spin_wait_until_eq(m.m_state, d1::rtm_rw_mutex::state_type(0));
+                            }
+                            // _xbegin returns -1 on success or the abort code, so capture it
+                            if ((abort_code = begin_transaction())
+                                == transaction_result_type(speculation_successful_begin)) {
+                                // started speculation
+                                if (m.m_state.load(
+                                            std::memory_order_relaxed)) {// add spin_rw_mutex to read-set.
+                                    // reader or writer grabbed the lock, so abort.
+                                    abort_transaction();
+                                }
+                                s.m_transaction_state = d1::rtm_rw_mutex::rtm_type::rtm_transacting_writer;
+                                // Don not wrap the following assignment to a function,
+                                // because it can abort the transaction in debug. Need mutex for release().
+                                s.m_mutex = &m;
+                                return;// successfully started speculation
+                            }
+                            ++num_retries;
+                        } while ((abort_code & speculation_retry) != 0
+                                 && (num_retries < retry_threshold_write));
+                    }
 
-    //! Acquire read lock on given mutex.
-    //  only_speculate : true if we are doing a try_acquire.  If true and we fail to speculate, don't
-    //     really acquire the lock, return and do a try_acquire on the contained spin_rw_mutex.  If
-    //     the lock is already held by a writer, just return.
-    static void acquire_reader(d1::rtm_rw_mutex& m, d1::rtm_rw_mutex::scoped_lock& s, bool only_speculate) {
-        __TBB_ASSERT(s.m_transaction_state == d1::rtm_rw_mutex::rtm_type::rtm_not_in_mutex, "scoped_lock already in transaction");
-        if(governor::speculation_enabled()) {
-            int num_retries = 0;
-            transaction_result_type abort_code = 0;
-            do {
-                // if in try_acquire, and lock is held as writer, don't attempt to speculate.
-                if(m.write_flag.load(std::memory_order_acquire)) {
-                    if(only_speculate) return;
-                    spin_wait_while_eq(m.write_flag, true);
+                    if (only_speculate) return;
+                    s.m_mutex = &m;   // should apply a real try_lock...
+                    s.m_mutex->lock();// kill transactional writers
+                    __TBB_ASSERT(!m.write_flag.load(std::memory_order_relaxed),
+                                 "After acquire for write, write_flag already true");
+                    m.write_flag.store(true, std::memory_order_relaxed);// kill transactional readers
+                    s.m_transaction_state = d1::rtm_rw_mutex::rtm_type::rtm_real_writer;
                 }
-                // _xbegin returns -1 on success or the abort code, so capture it
-                if((abort_code = begin_transaction()) == transaction_result_type(speculation_successful_begin))
-                {
-                    // started speculation
-                    if(m.write_flag.load(std::memory_order_relaxed)) {  // add write_flag to read-set.
-                        abort_transaction();  // writer grabbed the lock, so abort.
+
+                //! Acquire read lock on given mutex.
+                //  only_speculate : true if we are doing a try_acquire.  If true and we fail to speculate, don't
+                //     really acquire the lock, return and do a try_acquire on the contained spin_rw_mutex.  If
+                //     the lock is already held by a writer, just return.
+                static void acquire_reader(d1::rtm_rw_mutex& m, d1::rtm_rw_mutex::scoped_lock& s,
+                                           bool only_speculate) {
+                    __TBB_ASSERT(s.m_transaction_state == d1::rtm_rw_mutex::rtm_type::rtm_not_in_mutex,
+                                 "scoped_lock already in transaction");
+                    if (governor::speculation_enabled()) {
+                        int num_retries = 0;
+                        transaction_result_type abort_code = 0;
+                        do {
+                            // if in try_acquire, and lock is held as writer, don't attempt to speculate.
+                            if (m.write_flag.load(std::memory_order_acquire)) {
+                                if (only_speculate) return;
+                                spin_wait_while_eq(m.write_flag, true);
+                            }
+                            // _xbegin returns -1 on success or the abort code, so capture it
+                            if ((abort_code = begin_transaction())
+                                == transaction_result_type(speculation_successful_begin)) {
+                                // started speculation
+                                if (m.write_flag.load(
+                                            std::memory_order_relaxed)) {// add write_flag to read-set.
+                                    abort_transaction();                 // writer grabbed the lock, so abort.
+                                }
+                                s.m_transaction_state = d1::rtm_rw_mutex::rtm_type::rtm_transacting_reader;
+                                // Don not wrap the following assignment to a function,
+                                // because it can abort the transaction in debug. Need mutex for release().
+                                s.m_mutex = &m;
+                                return;// successfully started speculation
+                            }
+                            // fallback path
+                            // retry only if there is any hope of getting into a transaction soon
+                            // Retry in the following cases (from Section 8.3.5 of
+                            // Intel(R) Architecture Instruction Set Extensions Programming Reference):
+                            // 1. abort caused by XABORT instruction (bit 0 of EAX register is set)
+                            // 2. the transaction may succeed on a retry (bit 1 of EAX register is set)
+                            // 3. if another logical processor conflicted with a memory address
+                            //    that was part of the transaction that aborted (bit 2 of EAX register is set)
+                            // That is, retry if (abort_code & 0x7) is non-zero
+                            ++num_retries;
+                        } while ((abort_code & speculation_retry) != 0
+                                 && (num_retries < retry_threshold_read));
                     }
-                    s.m_transaction_state = d1::rtm_rw_mutex::rtm_type::rtm_transacting_reader;
-                    // Don not wrap the following assignment to a function,
-                    // because it can abort the transaction in debug. Need mutex for release().
+
+                    if (only_speculate) return;
                     s.m_mutex = &m;
-                    return;  // successfully started speculation
+                    s.m_mutex->lock_shared();
+                    s.m_transaction_state = d1::rtm_rw_mutex::rtm_type::rtm_real_reader;
                 }
-                // fallback path
-                // retry only if there is any hope of getting into a transaction soon
-                // Retry in the following cases (from Section 8.3.5 of
-                // Intel(R) Architecture Instruction Set Extensions Programming Reference):
-                // 1. abort caused by XABORT instruction (bit 0 of EAX register is set)
-                // 2. the transaction may succeed on a retry (bit 1 of EAX register is set)
-                // 3. if another logical processor conflicted with a memory address
-                //    that was part of the transaction that aborted (bit 2 of EAX register is set)
-                // That is, retry if (abort_code & 0x7) is non-zero
-                ++num_retries;
-            } while((abort_code & speculation_retry) != 0 && (num_retries < retry_threshold_read));
-        }
-
-        if(only_speculate) return;
-        s.m_mutex = &m;
-        s.m_mutex->lock_shared();
-        s.m_transaction_state = d1::rtm_rw_mutex::rtm_type::rtm_real_reader;
-    }
 
-    //! Upgrade reader to become a writer.
-    /** Returns whether the upgrade happened without releasing and re-acquiring the lock */
-    static bool upgrade(d1::rtm_rw_mutex::scoped_lock& s) {
-        switch(s.m_transaction_state) {
-        case d1::rtm_rw_mutex::rtm_type::rtm_real_reader: {
-            s.m_transaction_state = d1::rtm_rw_mutex::rtm_type::rtm_real_writer;
-            bool no_release = s.m_mutex->upgrade();
-            __TBB_ASSERT(!s.m_mutex->write_flag.load(std::memory_order_relaxed), "After upgrade, write_flag already true");
-            s.m_mutex->write_flag.store(true, std::memory_order_relaxed);
-            return no_release;
-        }
-        case d1::rtm_rw_mutex::rtm_type::rtm_transacting_reader: {
-            d1::rtm_rw_mutex& m = *s.m_mutex;
-            if(m.m_state.load(std::memory_order_acquire)) {  // add spin_rw_mutex to read-set.
-                // Real reader or writer holds the lock; so commit the read and re-acquire for write.
-                release(s);
-                acquire_writer(m, s, false);
-                return false;
-            } else
-            {
-                s.m_transaction_state = d1::rtm_rw_mutex::rtm_type::rtm_transacting_writer;
-                return true;
-            }
-        }
-        default:
-            __TBB_ASSERT(false, "Invalid state for upgrade");
-            return false;
-        }
-    }
-
-    //! Downgrade writer to a reader.
-    static bool downgrade(d1::rtm_rw_mutex::scoped_lock& s) {
-        switch (s.m_transaction_state) {
-        case d1::rtm_rw_mutex::rtm_type::rtm_real_writer:
-            s.m_transaction_state = d1::rtm_rw_mutex::rtm_type::rtm_real_reader;
-            __TBB_ASSERT(s.m_mutex->write_flag.load(std::memory_order_relaxed), "Before downgrade write_flag not true");
-            s.m_mutex->write_flag.store(false, std::memory_order_relaxed);
-            s.m_mutex->downgrade();
-            return true;
-        case d1::rtm_rw_mutex::rtm_type::rtm_transacting_writer:
-            s.m_transaction_state = d1::rtm_rw_mutex::rtm_type::rtm_transacting_reader;
-            return true;
-        default:
-            __TBB_ASSERT(false, "Invalid state for downgrade");
-            return false;
-        }
-    }
-
-    //! Try to acquire write lock on the given mutex.
-    //  There may be reader(s) which acquired the spin_rw_mutex, as well as possibly
-    //  transactional reader(s).  If this is the case, the acquire will fail, and assigning
-    //  write_flag will kill the transactors.  So we only assign write_flag if we have successfully
-    //  acquired the lock.
-    static bool try_acquire_writer(d1::rtm_rw_mutex& m, d1::rtm_rw_mutex::scoped_lock& s) {
-        acquire_writer(m, s, /*only_speculate=*/true);
-        if (s.m_transaction_state == d1::rtm_rw_mutex::rtm_type::rtm_transacting_writer) {
-            return true;
-        }
-        __TBB_ASSERT(s.m_transaction_state == d1::rtm_rw_mutex::rtm_type::rtm_not_in_mutex, nullptr);
-        // transacting write acquire failed. try_lock the real mutex
-        if (m.try_lock()) {
-            s.m_mutex = &m;
-            // only shoot down readers if we're not transacting ourselves
-            __TBB_ASSERT(!m.write_flag.load(std::memory_order_relaxed), "After try_acquire_writer, write_flag already true");
-            m.write_flag.store(true, std::memory_order_relaxed);
-            s.m_transaction_state = d1::rtm_rw_mutex::rtm_type::rtm_real_writer;
-            return true;
-        }
-        return false;
-    }
+                //! Upgrade reader to become a writer.
+                /** Returns whether the upgrade happened without releasing and re-acquiring the lock */
+                static bool upgrade(d1::rtm_rw_mutex::scoped_lock& s) {
+                    switch (s.m_transaction_state) {
+                        case d1::rtm_rw_mutex::rtm_type::rtm_real_reader: {
+                            s.m_transaction_state = d1::rtm_rw_mutex::rtm_type::rtm_real_writer;
+                            bool no_release = s.m_mutex->upgrade();
+                            __TBB_ASSERT(!s.m_mutex->write_flag.load(std::memory_order_relaxed),
+                                         "After upgrade, write_flag already true");
+                            s.m_mutex->write_flag.store(true, std::memory_order_relaxed);
+                            return no_release;
+                        }
+                        case d1::rtm_rw_mutex::rtm_type::rtm_transacting_reader: {
+                            d1::rtm_rw_mutex& m = *s.m_mutex;
+                            if (m.m_state.load(std::memory_order_acquire)) {// add spin_rw_mutex to read-set.
+                                // Real reader or writer holds the lock; so commit the read and re-acquire for write.
+                                release(s);
+                                acquire_writer(m, s, false);
+                                return false;
+                            } else {
+                                s.m_transaction_state = d1::rtm_rw_mutex::rtm_type::rtm_transacting_writer;
+                                return true;
+                            }
+                        }
+                        default:
+                            __TBB_ASSERT(false, "Invalid state for upgrade");
+                            return false;
+                    }
+                }
 
-    //! Try to acquire read lock on the given mutex.
-    static bool try_acquire_reader(d1::rtm_rw_mutex& m, d1::rtm_rw_mutex::scoped_lock& s) {
-        // speculatively acquire the lock. If this fails, do try_lock_shared on the spin_rw_mutex.
-        acquire_reader(m, s, /*only_speculate=*/true);
-        if (s.m_transaction_state == d1::rtm_rw_mutex::rtm_type::rtm_transacting_reader) {
-            return true;
-        }
-        __TBB_ASSERT(s.m_transaction_state == d1::rtm_rw_mutex::rtm_type::rtm_not_in_mutex, nullptr);
-        // transacting read acquire failed. try_lock_shared the real mutex
-        if (m.try_lock_shared()) {
-            s.m_mutex = &m;
-            s.m_transaction_state = d1::rtm_rw_mutex::rtm_type::rtm_real_reader;
-            return true;
-        }
-        return false;
-    }
-};
+                //! Downgrade writer to a reader.
+                static bool downgrade(d1::rtm_rw_mutex::scoped_lock& s) {
+                    switch (s.m_transaction_state) {
+                        case d1::rtm_rw_mutex::rtm_type::rtm_real_writer:
+                            s.m_transaction_state = d1::rtm_rw_mutex::rtm_type::rtm_real_reader;
+                            __TBB_ASSERT(s.m_mutex->write_flag.load(std::memory_order_relaxed),
+                                         "Before downgrade write_flag not true");
+                            s.m_mutex->write_flag.store(false, std::memory_order_relaxed);
+                            s.m_mutex->downgrade();
+                            return true;
+                        case d1::rtm_rw_mutex::rtm_type::rtm_transacting_writer:
+                            s.m_transaction_state = d1::rtm_rw_mutex::rtm_type::rtm_transacting_reader;
+                            return true;
+                        default:
+                            __TBB_ASSERT(false, "Invalid state for downgrade");
+                            return false;
+                    }
+                }
 
-void __TBB_EXPORTED_FUNC acquire_writer(d1::rtm_rw_mutex& m, d1::rtm_rw_mutex::scoped_lock& s, bool only_speculate) {
-    rtm_rw_mutex_impl::acquire_writer(m, s, only_speculate);
-}
-//! Internal acquire read lock.
-// only_speculate == true if we're doing a try_lock, else false.
-void __TBB_EXPORTED_FUNC acquire_reader(d1::rtm_rw_mutex& m, d1::rtm_rw_mutex::scoped_lock& s, bool only_speculate) {
-    rtm_rw_mutex_impl::acquire_reader(m, s, only_speculate);
-}
-//! Internal upgrade reader to become a writer.
-bool __TBB_EXPORTED_FUNC upgrade(d1::rtm_rw_mutex::scoped_lock& s) {
-    return rtm_rw_mutex_impl::upgrade(s);
-}
-//! Internal downgrade writer to become a reader.
-bool __TBB_EXPORTED_FUNC downgrade(d1::rtm_rw_mutex::scoped_lock& s) {
-    return rtm_rw_mutex_impl::downgrade(s);
-}
-//! Internal try_acquire write lock.
-bool __TBB_EXPORTED_FUNC try_acquire_writer(d1::rtm_rw_mutex& m, d1::rtm_rw_mutex::scoped_lock& s) {
-    return rtm_rw_mutex_impl::try_acquire_writer(m, s);
-}
-//! Internal try_acquire read lock.
-bool __TBB_EXPORTED_FUNC try_acquire_reader(d1::rtm_rw_mutex& m, d1::rtm_rw_mutex::scoped_lock& s) {
-    return rtm_rw_mutex_impl::try_acquire_reader(m, s);
-}
-//! Internal release lock.
-void __TBB_EXPORTED_FUNC release(d1::rtm_rw_mutex::scoped_lock& s) {
-    rtm_rw_mutex_impl::release(s);
-}
+                //! Try to acquire write lock on the given mutex.
+                //  There may be reader(s) which acquired the spin_rw_mutex, as well as possibly
+                //  transactional reader(s).  If this is the case, the acquire will fail, and assigning
+                //  write_flag will kill the transactors.  So we only assign write_flag if we have successfully
+                //  acquired the lock.
+                static bool try_acquire_writer(d1::rtm_rw_mutex& m, d1::rtm_rw_mutex::scoped_lock& s) {
+                    acquire_writer(m, s, /*only_speculate=*/true);
+                    if (s.m_transaction_state == d1::rtm_rw_mutex::rtm_type::rtm_transacting_writer) {
+                        return true;
+                    }
+                    __TBB_ASSERT(s.m_transaction_state == d1::rtm_rw_mutex::rtm_type::rtm_not_in_mutex,
+                                 nullptr);
+                    // transacting write acquire failed. try_lock the real mutex
+                    if (m.try_lock()) {
+                        s.m_mutex = &m;
+                        // only shoot down readers if we're not transacting ourselves
+                        __TBB_ASSERT(!m.write_flag.load(std::memory_order_relaxed),
+                                     "After try_acquire_writer, write_flag already true");
+                        m.write_flag.store(true, std::memory_order_relaxed);
+                        s.m_transaction_state = d1::rtm_rw_mutex::rtm_type::rtm_real_writer;
+                        return true;
+                    }
+                    return false;
+                }
 
-} // namespace r1
-} // namespace detail
-} // namespace tbb
+                //! Try to acquire read lock on the given mutex.
+                static bool try_acquire_reader(d1::rtm_rw_mutex& m, d1::rtm_rw_mutex::scoped_lock& s) {
+                    // speculatively acquire the lock. If this fails, do try_lock_shared on the spin_rw_mutex.
+                    acquire_reader(m, s, /*only_speculate=*/true);
+                    if (s.m_transaction_state == d1::rtm_rw_mutex::rtm_type::rtm_transacting_reader) {
+                        return true;
+                    }
+                    __TBB_ASSERT(s.m_transaction_state == d1::rtm_rw_mutex::rtm_type::rtm_not_in_mutex,
+                                 nullptr);
+                    // transacting read acquire failed. try_lock_shared the real mutex
+                    if (m.try_lock_shared()) {
+                        s.m_mutex = &m;
+                        s.m_transaction_state = d1::rtm_rw_mutex::rtm_type::rtm_real_reader;
+                        return true;
+                    }
+                    return false;
+                }
+            };
 
+            void __TBB_EXPORTED_FUNC acquire_writer(d1::rtm_rw_mutex& m, d1::rtm_rw_mutex::scoped_lock& s,
+                                                    bool only_speculate) {
+                rtm_rw_mutex_impl::acquire_writer(m, s, only_speculate);
+            }
+            //! Internal acquire read lock.
+            // only_speculate == true if we're doing a try_lock, else false.
+            void __TBB_EXPORTED_FUNC acquire_reader(d1::rtm_rw_mutex& m, d1::rtm_rw_mutex::scoped_lock& s,
+                                                    bool only_speculate) {
+                rtm_rw_mutex_impl::acquire_reader(m, s, only_speculate);
+            }
+            //! Internal upgrade reader to become a writer.
+            bool __TBB_EXPORTED_FUNC upgrade(d1::rtm_rw_mutex::scoped_lock& s) {
+                return rtm_rw_mutex_impl::upgrade(s);
+            }
+            //! Internal downgrade writer to become a reader.
+            bool __TBB_EXPORTED_FUNC downgrade(d1::rtm_rw_mutex::scoped_lock& s) {
+                return rtm_rw_mutex_impl::downgrade(s);
+            }
+            //! Internal try_acquire write lock.
+            bool __TBB_EXPORTED_FUNC try_acquire_writer(d1::rtm_rw_mutex& m,
+                                                        d1::rtm_rw_mutex::scoped_lock& s) {
+                return rtm_rw_mutex_impl::try_acquire_writer(m, s);
+            }
+            //! Internal try_acquire read lock.
+            bool __TBB_EXPORTED_FUNC try_acquire_reader(d1::rtm_rw_mutex& m,
+                                                        d1::rtm_rw_mutex::scoped_lock& s) {
+                return rtm_rw_mutex_impl::try_acquire_reader(m, s);
+            }
+            //! Internal release lock.
+            void __TBB_EXPORTED_FUNC release(d1::rtm_rw_mutex::scoped_lock& s) {
+                rtm_rw_mutex_impl::release(s);
+            }
 
+        }// namespace r1
+    }    // namespace detail
+}// namespace tbb
diff --git a/external/tbb/src/tbb/semaphore.cpp b/external/tbb/src/tbb/semaphore.cpp
index 211091d1..bb1a8fd2 100644
--- a/external/tbb/src/tbb/semaphore.cpp
+++ b/external/tbb/src/tbb/semaphore.cpp
@@ -16,77 +16,78 @@
 
 #include "semaphore.h"
 #if __TBB_USE_SRWLOCK
-#include "dynamic_link.h" // Refers to src/tbb, not include/tbb
+#include "dynamic_link.h"// Refers to src/tbb, not include/tbb
 #include "tbb_misc.h"
 #endif
 
 namespace tbb {
-namespace detail {
-namespace r1 {
+    namespace detail {
+        namespace r1 {
 
 // TODO: For new win UI port, we can use SRWLock API without dynamic_link etc.
 #if __TBB_USE_SRWLOCK
 
-static std::atomic<do_once_state> concmon_module_inited;
-
-void WINAPI init_binsem_using_event( SRWLOCK* h_ )
-{
-    srwl_or_handle* shptr = (srwl_or_handle*) h_;
-    shptr->h = CreateEventEx( nullptr, nullptr, 0, EVENT_ALL_ACCESS|SEMAPHORE_ALL_ACCESS );
-}
-
-void WINAPI acquire_binsem_using_event( SRWLOCK* h_ )
-{
-    srwl_or_handle* shptr = (srwl_or_handle*) h_;
-    WaitForSingleObjectEx( shptr->h, INFINITE, FALSE );
-}
-
-void WINAPI release_binsem_using_event( SRWLOCK* h_ )
-{
-    srwl_or_handle* shptr = (srwl_or_handle*) h_;
-    SetEvent( shptr->h );
-}
-
-static void (WINAPI *__TBB_init_binsem)( SRWLOCK* ) = (void (WINAPI *)(SRWLOCK*))&init_binsem_using_event;
-static void (WINAPI *__TBB_acquire_binsem)( SRWLOCK* ) = (void (WINAPI *)(SRWLOCK*))&acquire_binsem_using_event;
-static void (WINAPI *__TBB_release_binsem)( SRWLOCK* ) = (void (WINAPI *)(SRWLOCK*))&release_binsem_using_event;
-
-//! Table describing the how to link the handlers.
-static const dynamic_link_descriptor SRWLLinkTable[] = {
-    DLD(InitializeSRWLock,       __TBB_init_binsem),
-    DLD(AcquireSRWLockExclusive, __TBB_acquire_binsem),
-    DLD(ReleaseSRWLockExclusive, __TBB_release_binsem)
-};
-
-inline void init_concmon_module()
-{
-    __TBB_ASSERT( (uintptr_t)__TBB_init_binsem==(uintptr_t)&init_binsem_using_event, nullptr);
-    if( dynamic_link( "Kernel32.dll", SRWLLinkTable, sizeof(SRWLLinkTable)/sizeof(dynamic_link_descriptor) ) ) {
-        __TBB_ASSERT( (uintptr_t)__TBB_init_binsem!=(uintptr_t)&init_binsem_using_event, nullptr);
-        __TBB_ASSERT( (uintptr_t)__TBB_acquire_binsem!=(uintptr_t)&acquire_binsem_using_event, nullptr);
-        __TBB_ASSERT( (uintptr_t)__TBB_release_binsem!=(uintptr_t)&release_binsem_using_event, nullptr);
-    }
-}
-
-binary_semaphore::binary_semaphore() {
-    atomic_do_once( &init_concmon_module, concmon_module_inited );
-
-    __TBB_init_binsem( &my_sem.lock );
-    if( (uintptr_t)__TBB_init_binsem!=(uintptr_t)&init_binsem_using_event )
-        P();
-}
-
-binary_semaphore::~binary_semaphore() {
-    if( (uintptr_t)__TBB_init_binsem==(uintptr_t)&init_binsem_using_event )
-        CloseHandle( my_sem.h );
-}
-
-void binary_semaphore::P() { __TBB_acquire_binsem( &my_sem.lock ); }
-
-void binary_semaphore::V() { __TBB_release_binsem( &my_sem.lock ); }
+            static std::atomic<do_once_state> concmon_module_inited;
+
+            void WINAPI init_binsem_using_event(SRWLOCK* h_) {
+                srwl_or_handle* shptr = (srwl_or_handle*) h_;
+                shptr->h = CreateEventEx(nullptr, nullptr, 0, EVENT_ALL_ACCESS | SEMAPHORE_ALL_ACCESS);
+            }
+
+            void WINAPI acquire_binsem_using_event(SRWLOCK* h_) {
+                srwl_or_handle* shptr = (srwl_or_handle*) h_;
+                WaitForSingleObjectEx(shptr->h, INFINITE, FALSE);
+            }
+
+            void WINAPI release_binsem_using_event(SRWLOCK* h_) {
+                srwl_or_handle* shptr = (srwl_or_handle*) h_;
+                SetEvent(shptr->h);
+            }
+
+            static void(WINAPI* __TBB_init_binsem)(SRWLOCK*)
+                    = (void(WINAPI*)(SRWLOCK*)) & init_binsem_using_event;
+            static void(WINAPI* __TBB_acquire_binsem)(SRWLOCK*)
+                    = (void(WINAPI*)(SRWLOCK*)) & acquire_binsem_using_event;
+            static void(WINAPI* __TBB_release_binsem)(SRWLOCK*)
+                    = (void(WINAPI*)(SRWLOCK*)) & release_binsem_using_event;
+
+            //! Table describing the how to link the handlers.
+            static const dynamic_link_descriptor SRWLLinkTable[]
+                    = {DLD(InitializeSRWLock, __TBB_init_binsem),
+                       DLD(AcquireSRWLockExclusive, __TBB_acquire_binsem),
+                       DLD(ReleaseSRWLockExclusive, __TBB_release_binsem)};
+
+            inline void init_concmon_module() {
+                __TBB_ASSERT((uintptr_t) __TBB_init_binsem == (uintptr_t) &init_binsem_using_event, nullptr);
+                if (dynamic_link("Kernel32.dll", SRWLLinkTable,
+                                 sizeof(SRWLLinkTable) / sizeof(dynamic_link_descriptor))) {
+                    __TBB_ASSERT((uintptr_t) __TBB_init_binsem != (uintptr_t) &init_binsem_using_event,
+                                 nullptr);
+                    __TBB_ASSERT((uintptr_t) __TBB_acquire_binsem != (uintptr_t) &acquire_binsem_using_event,
+                                 nullptr);
+                    __TBB_ASSERT((uintptr_t) __TBB_release_binsem != (uintptr_t) &release_binsem_using_event,
+                                 nullptr);
+                }
+            }
+
+            binary_semaphore::binary_semaphore() {
+                atomic_do_once(&init_concmon_module, concmon_module_inited);
+
+                __TBB_init_binsem(&my_sem.lock);
+                if ((uintptr_t) __TBB_init_binsem != (uintptr_t) &init_binsem_using_event) P();
+            }
+
+            binary_semaphore::~binary_semaphore() {
+                if ((uintptr_t) __TBB_init_binsem == (uintptr_t) &init_binsem_using_event)
+                    CloseHandle(my_sem.h);
+            }
+
+            void binary_semaphore::P() { __TBB_acquire_binsem(&my_sem.lock); }
+
+            void binary_semaphore::V() { __TBB_release_binsem(&my_sem.lock); }
 
 #endif /* __TBB_USE_SRWLOCK */
 
-} // namespace r1
-} // namespace detail
-} // namespace tbb
+        }// namespace r1
+    }    // namespace detail
+}// namespace tbb
diff --git a/external/tbb/src/tbb/small_object_pool.cpp b/external/tbb/src/tbb/small_object_pool.cpp
index c7926e8a..3c1cff77 100644
--- a/external/tbb/src/tbb/small_object_pool.cpp
+++ b/external/tbb/src/tbb/small_object_pool.cpp
@@ -14,143 +14,144 @@
     limitations under the License.
 */
 
+#include "governor.h"
 #include "oneapi/tbb/cache_aligned_allocator.h"
 #include "oneapi/tbb/detail/_small_object_pool.h"
 #include "oneapi/tbb/detail/_task.h"
-#include "governor.h"
-#include "thread_data.h"
 #include "task_dispatcher.h"
+#include "thread_data.h"
 
 #include <cstddef>
 
 namespace tbb {
-namespace detail {
-namespace r1 {
-
-small_object_pool_impl::small_object* const small_object_pool_impl::dead_public_list =
-                reinterpret_cast<small_object_pool_impl::small_object*>(1);
-
-void* __TBB_EXPORTED_FUNC allocate(d1::small_object_pool*& allocator, std::size_t number_of_bytes, const d1::execution_data& ed) {
-    auto& tls = static_cast<const execution_data_ext&>(ed).task_disp->get_thread_data();
-    auto pool = tls.my_small_object_pool;
-    return pool->allocate_impl(allocator, number_of_bytes);
-}
-
-void* __TBB_EXPORTED_FUNC allocate(d1::small_object_pool*& allocator, std::size_t number_of_bytes) {
-    // TODO: optimize if the allocator contains a valid pool.
-    auto tls = governor::get_thread_data();
-    auto pool = tls->my_small_object_pool;
-    return pool->allocate_impl(allocator, number_of_bytes);
-}
-
-void* small_object_pool_impl::allocate_impl(d1::small_object_pool*& allocator, std::size_t number_of_bytes)
-{
-    __TBB_ASSERT(allocator == nullptr || allocator == this,
-                 "An attempt was made to allocate using another thread's small memory pool");
-    small_object* obj{nullptr};
-
-    if (number_of_bytes <= small_object_size) {
-        if (m_private_list) {
-            obj = m_private_list;
-            m_private_list = m_private_list->next;
-        } else if (m_public_list.load(std::memory_order_relaxed)) {
-            // No fence required for read of my_public_list above, because std::atomic::exchange() has a fence.
-            obj = m_public_list.exchange(nullptr);
-            __TBB_ASSERT( obj, "another thread emptied the my_public_list" );
-            m_private_list = obj->next;
-        } else {
-            obj = new (cache_aligned_allocate(small_object_size)) small_object{nullptr};
-            ++m_private_counter;
-        }
-    } else {
-        obj = new (cache_aligned_allocate(number_of_bytes)) small_object{nullptr};
-    }
-    allocator = this;
-
-    // Return uninitialized memory for further construction on user side.
-    obj->~small_object();
-    return obj;
-}
-
-void __TBB_EXPORTED_FUNC deallocate(d1::small_object_pool& allocator, void* ptr, std::size_t number_of_bytes) {
-    auto pool = static_cast<small_object_pool_impl*>(&allocator);
-    auto tls = governor::get_thread_data();
-    pool->deallocate_impl(ptr, number_of_bytes, *tls);
-}
-
-void __TBB_EXPORTED_FUNC deallocate(d1::small_object_pool& allocator, void* ptr, std::size_t number_of_bytes, const d1::execution_data& ed) {
-    auto& tls = static_cast<const execution_data_ext&>(ed).task_disp->get_thread_data();
-    auto pool = static_cast<small_object_pool_impl*>(&allocator);
-    pool->deallocate_impl(ptr, number_of_bytes, tls);
-}
-
-void small_object_pool_impl::deallocate_impl(void* ptr, std::size_t number_of_bytes, thread_data& td) {
-    __TBB_ASSERT(ptr != nullptr, "pointer to deallocate should not be null");
-    __TBB_ASSERT(number_of_bytes >= sizeof(small_object), "number of bytes should be at least sizeof(small_object)");
-
-    if (number_of_bytes <= small_object_size) {
-        auto obj = new (ptr) small_object{nullptr};
-        if (td.my_small_object_pool == this) {
-            obj->next = m_private_list;
-            m_private_list = obj;
-        } else {
-            auto old_public_list = m_public_list.load(std::memory_order_relaxed);
-
-            for (;;) {
-                if (old_public_list == dead_public_list) {
-                    obj->~small_object();
-                    cache_aligned_deallocate(obj);
-                    if (++m_public_counter == 0)
-                    {
-                        this->~small_object_pool_impl();
-                        cache_aligned_deallocate(this);
+    namespace detail {
+        namespace r1 {
+
+            small_object_pool_impl::small_object* const small_object_pool_impl::dead_public_list
+                    = reinterpret_cast<small_object_pool_impl::small_object*>(1);
+
+            void* __TBB_EXPORTED_FUNC allocate(d1::small_object_pool*& allocator, std::size_t number_of_bytes,
+                                               const d1::execution_data& ed) {
+                auto& tls = static_cast<const execution_data_ext&>(ed).task_disp->get_thread_data();
+                auto pool = tls.my_small_object_pool;
+                return pool->allocate_impl(allocator, number_of_bytes);
+            }
+
+            void* __TBB_EXPORTED_FUNC allocate(d1::small_object_pool*& allocator,
+                                               std::size_t number_of_bytes) {
+                // TODO: optimize if the allocator contains a valid pool.
+                auto tls = governor::get_thread_data();
+                auto pool = tls->my_small_object_pool;
+                return pool->allocate_impl(allocator, number_of_bytes);
+            }
+
+            void* small_object_pool_impl::allocate_impl(d1::small_object_pool*& allocator,
+                                                        std::size_t number_of_bytes) {
+                __TBB_ASSERT(allocator == nullptr || allocator == this,
+                             "An attempt was made to allocate using another thread's small memory pool");
+                small_object* obj {nullptr};
+
+                if (number_of_bytes <= small_object_size) {
+                    if (m_private_list) {
+                        obj = m_private_list;
+                        m_private_list = m_private_list->next;
+                    } else if (m_public_list.load(std::memory_order_relaxed)) {
+                        // No fence required for read of my_public_list above, because std::atomic::exchange() has a fence.
+                        obj = m_public_list.exchange(nullptr);
+                        __TBB_ASSERT(obj, "another thread emptied the my_public_list");
+                        m_private_list = obj->next;
+                    } else {
+                        obj = new (cache_aligned_allocate(small_object_size)) small_object {nullptr};
+                        ++m_private_counter;
+                    }
+                } else {
+                    obj = new (cache_aligned_allocate(number_of_bytes)) small_object {nullptr};
+                }
+                allocator = this;
+
+                // Return uninitialized memory for further construction on user side.
+                obj->~small_object();
+                return obj;
+            }
+
+            void __TBB_EXPORTED_FUNC deallocate(d1::small_object_pool& allocator, void* ptr,
+                                                std::size_t number_of_bytes) {
+                auto pool = static_cast<small_object_pool_impl*>(&allocator);
+                auto tls = governor::get_thread_data();
+                pool->deallocate_impl(ptr, number_of_bytes, *tls);
+            }
+
+            void __TBB_EXPORTED_FUNC deallocate(d1::small_object_pool& allocator, void* ptr,
+                                                std::size_t number_of_bytes, const d1::execution_data& ed) {
+                auto& tls = static_cast<const execution_data_ext&>(ed).task_disp->get_thread_data();
+                auto pool = static_cast<small_object_pool_impl*>(&allocator);
+                pool->deallocate_impl(ptr, number_of_bytes, tls);
+            }
+
+            void small_object_pool_impl::deallocate_impl(void* ptr, std::size_t number_of_bytes,
+                                                         thread_data& td) {
+                __TBB_ASSERT(ptr != nullptr, "pointer to deallocate should not be null");
+                __TBB_ASSERT(number_of_bytes >= sizeof(small_object),
+                             "number of bytes should be at least sizeof(small_object)");
+
+                if (number_of_bytes <= small_object_size) {
+                    auto obj = new (ptr) small_object {nullptr};
+                    if (td.my_small_object_pool == this) {
+                        obj->next = m_private_list;
+                        m_private_list = obj;
+                    } else {
+                        auto old_public_list = m_public_list.load(std::memory_order_relaxed);
+
+                        for (;;) {
+                            if (old_public_list == dead_public_list) {
+                                obj->~small_object();
+                                cache_aligned_deallocate(obj);
+                                if (++m_public_counter == 0) {
+                                    this->~small_object_pool_impl();
+                                    cache_aligned_deallocate(this);
+                                }
+                                break;
+                            }
+                            obj->next = old_public_list;
+                            if (m_public_list.compare_exchange_strong(old_public_list, obj)) { break; }
+                        }
                     }
-                    break;
+                } else {
+                    cache_aligned_deallocate(ptr);
                 }
-                obj->next = old_public_list;
-                if (m_public_list.compare_exchange_strong(old_public_list, obj)) {
-                    break;
+            }
+
+            std::int64_t small_object_pool_impl::cleanup_list(small_object* list) {
+                std::int64_t removed_count {};
+
+                while (list) {
+                    small_object* current = list;
+                    list = list->next;
+                    current->~small_object();
+                    cache_aligned_deallocate(current);
+                    ++removed_count;
+                }
+                return removed_count;
+            }
+
+            void small_object_pool_impl::destroy() {
+                // clean up private list and subtract the removed count from private counter
+                m_private_counter -= cleanup_list(m_private_list);
+                // Grab public list and place dead mark
+                small_object* public_list = m_public_list.exchange(dead_public_list);
+                // clean up public list and subtract from private (intentionally) counter
+                m_private_counter -= cleanup_list(public_list);
+                __TBB_ASSERT(m_private_counter >= 0, "Private counter may not be less than 0");
+                // Equivalent to fetch_sub(m_private_counter) - m_private_counter. But we need to do it
+                // atomically with operator-= not to access m_private_counter after the subtraction.
+                auto new_value = m_public_counter -= m_private_counter;
+                // check if this method is responsible to clean up the resources
+                if (new_value == 0) {
+                    this->~small_object_pool_impl();
+                    cache_aligned_deallocate(this);
                 }
             }
-        }
-    } else {
-        cache_aligned_deallocate(ptr);
-    }
-}
-
-std::int64_t small_object_pool_impl::cleanup_list(small_object* list)
-{
-    std::int64_t removed_count{};
-
-    while (list) {
-        small_object* current = list;
-        list = list->next;
-        current->~small_object();
-        cache_aligned_deallocate(current);
-        ++removed_count;
-    }
-    return removed_count;
-}
-
-void small_object_pool_impl::destroy()
-{
-    // clean up private list and subtract the removed count from private counter
-    m_private_counter -= cleanup_list(m_private_list);
-    // Grab public list and place dead mark
-    small_object* public_list = m_public_list.exchange(dead_public_list);
-    // clean up public list and subtract from private (intentionally) counter
-    m_private_counter -= cleanup_list(public_list);
-    __TBB_ASSERT(m_private_counter >= 0, "Private counter may not be less than 0");
-    // Equivalent to fetch_sub(m_private_counter) - m_private_counter. But we need to do it
-    // atomically with operator-= not to access m_private_counter after the subtraction.
-    auto new_value = m_public_counter -= m_private_counter;
-    // check if this method is responsible to clean up the resources
-    if (new_value == 0) {
-        this->~small_object_pool_impl();
-        cache_aligned_deallocate(this);
-    }
-}
-
-} // namespace r1
-} // namespace detail
-} // namespace tbb
+
+        }// namespace r1
+    }    // namespace detail
+}// namespace tbb
diff --git a/external/tbb/src/tbb/task.cpp b/external/tbb/src/tbb/task.cpp
index 84b4278f..367385fe 100644
--- a/external/tbb/src/tbb/task.cpp
+++ b/external/tbb/src/tbb/task.cpp
@@ -15,13 +15,13 @@
 */
 
 // Do not include task.h directly. Use scheduler_common.h instead
-#include "scheduler_common.h"
-#include "governor.h"
 #include "arena.h"
-#include "thread_data.h"
+#include "governor.h"
+#include "itt_notify.h"
+#include "scheduler_common.h"
 #include "task_dispatcher.h"
+#include "thread_data.h"
 #include "waiters.h"
-#include "itt_notify.h"
 
 #include "oneapi/tbb/detail/_task.h"
 #include "oneapi/tbb/partitioner.h"
@@ -30,228 +30,231 @@
 #include <cstring>
 
 namespace tbb {
-namespace detail {
-namespace r1 {
+    namespace detail {
+        namespace r1 {
 
 //------------------------------------------------------------------------
 // resumable tasks
 //------------------------------------------------------------------------
 #if __TBB_RESUMABLE_TASKS
 
-void suspend(suspend_callback_type suspend_callback, void* user_callback) {
-    thread_data& td = *governor::get_thread_data();
-    td.my_task_dispatcher->suspend(suspend_callback, user_callback);
-    // Do not access td after suspend.
-}
-
-void resume(suspend_point_type* sp) {
-    assert_pointers_valid(sp, sp->m_arena);
-    task_dispatcher& task_disp = sp->m_resume_task.m_target;
-
-    if (sp->try_notify_resume()) {
-        // TODO: remove this work-around
-        // Prolong the arena's lifetime while all coroutines are alive
-        // (otherwise the arena can be destroyed while some tasks are suspended).
-        arena& a = *sp->m_arena;
-        a.my_references += arena::ref_worker;
-
-        if (task_disp.m_properties.critical_task_allowed) {
-            // The target is not in the process of executing critical task, so the resume task is not critical.
-            a.my_resume_task_stream.push(&sp->m_resume_task, random_lane_selector(sp->m_random));
-        } else {
-    #if __TBB_PREVIEW_CRITICAL_TASKS
-            // The target is in the process of executing critical task, so the resume task is critical.
-            a.my_critical_task_stream.push(&sp->m_resume_task, random_lane_selector(sp->m_random));
-    #endif
-        }
-        // Do not access target after that point.
-        a.advertise_new_work<arena::wakeup>();
-        // Release our reference to my_arena.
-        a.on_thread_leaving(arena::ref_worker);
-    }
-
-}
-
-suspend_point_type* current_suspend_point() {
-    thread_data& td = *governor::get_thread_data();
-    return td.my_task_dispatcher->get_suspend_point();
-}
-
-task_dispatcher& create_coroutine(thread_data& td) {
-    // We may have some task dispatchers cached
-    task_dispatcher* task_disp = td.my_arena->my_co_cache.pop();
-    if (!task_disp) {
-        void* ptr = cache_aligned_allocate(sizeof(task_dispatcher));
-        task_disp = new(ptr) task_dispatcher(td.my_arena);
-        task_disp->init_suspend_point(td.my_arena, td.my_arena->my_threading_control->worker_stack_size());
-    }
-    // Prolong the arena's lifetime until all coroutines is alive
-    // (otherwise the arena can be destroyed while some tasks are suspended).
-    // TODO: consider behavior if there are more than 4K external references.
-    td.my_arena->my_references += arena::ref_external;
-    return *task_disp;
-}
-
-void task_dispatcher::internal_suspend() {
-    __TBB_ASSERT(m_thread_data != nullptr, nullptr);
-
-    arena_slot* slot = m_thread_data->my_arena_slot;
-    __TBB_ASSERT(slot != nullptr, nullptr);
-
-    task_dispatcher& default_task_disp = slot->default_task_dispatcher();
-    // TODO: simplify the next line, e.g. is_task_dispatcher_recalled( task_dispatcher& )
-    bool is_recalled = default_task_disp.get_suspend_point()->m_is_owner_recalled.load(std::memory_order_acquire);
-    task_dispatcher& target = is_recalled ? default_task_disp : create_coroutine(*m_thread_data);
-
-    resume(target);
-
-    if (m_properties.outermost) {
-        recall_point();
-    }
-}
-
-void task_dispatcher::suspend(suspend_callback_type suspend_callback, void* user_callback) {
-    __TBB_ASSERT(suspend_callback != nullptr, nullptr);
-    __TBB_ASSERT(user_callback != nullptr, nullptr);
-    suspend_callback(user_callback, get_suspend_point());
-
-    __TBB_ASSERT(m_thread_data != nullptr, nullptr);
-    __TBB_ASSERT(m_thread_data->my_post_resume_action == post_resume_action::none, nullptr);
-    __TBB_ASSERT(m_thread_data->my_post_resume_arg == nullptr, nullptr);
-    internal_suspend();
-}
-
-bool task_dispatcher::resume(task_dispatcher& target) {
-    // Do not create non-trivial objects on the stack of this function. They might never be destroyed
-    {
-        thread_data* td = m_thread_data;
-        __TBB_ASSERT(&target != this, "We cannot resume to ourself");
-        __TBB_ASSERT(td != nullptr, "This task dispatcher must be attach to a thread data");
-        __TBB_ASSERT(td->my_task_dispatcher == this, "Thread data must be attached to this task dispatcher");
-
-        // Change the task dispatcher
-        td->detach_task_dispatcher();
-        td->attach_task_dispatcher(target);
-    }
-    __TBB_ASSERT(m_suspend_point != nullptr, "Suspend point must be created");
-    __TBB_ASSERT(target.m_suspend_point != nullptr, "Suspend point must be created");
-    // Swap to the target coroutine.
-
-    m_suspend_point->resume(target.m_suspend_point);
-    // Pay attention that m_thread_data can be changed after resume
-    if (m_thread_data) {
-        thread_data* td = m_thread_data;
-        __TBB_ASSERT(td != nullptr, "This task dispatcher must be attach to a thread data");
-        __TBB_ASSERT(td->my_task_dispatcher == this, "Thread data must be attached to this task dispatcher");
-        do_post_resume_action();
-
-        // Remove the recall flag if the thread in its original task dispatcher
-        arena_slot* slot = td->my_arena_slot;
-        __TBB_ASSERT(slot != nullptr, nullptr);
-        if (this == slot->my_default_task_dispatcher) {
-            __TBB_ASSERT(m_suspend_point != nullptr, nullptr);
-            m_suspend_point->m_is_owner_recalled.store(false, std::memory_order_relaxed);
-        }
-        return true;
-    }
-    return false;
-}
-
-void task_dispatcher::do_post_resume_action() {
-    thread_data* td = m_thread_data;
-    switch (td->my_post_resume_action) {
-    case post_resume_action::register_waiter:
-    {
-        __TBB_ASSERT(td->my_post_resume_arg, "The post resume action must have an argument");
-        static_cast<thread_control_monitor::resume_context*>(td->my_post_resume_arg)->notify();
-        break;
-    }
-    case post_resume_action::cleanup:
-    {
-        __TBB_ASSERT(td->my_post_resume_arg, "The post resume action must have an argument");
-        task_dispatcher* to_cleanup = static_cast<task_dispatcher*>(td->my_post_resume_arg);
-        // Release coroutine's reference to my_arena
-        td->my_arena->on_thread_leaving(arena::ref_external);
-        // Cache the coroutine for possible later re-usage
-        td->my_arena->my_co_cache.push(to_cleanup);
-        break;
-    }
-    case post_resume_action::notify:
-    {
-        __TBB_ASSERT(td->my_post_resume_arg, "The post resume action must have an argument");
-        suspend_point_type* sp = static_cast<suspend_point_type*>(td->my_post_resume_arg);
-        sp->recall_owner();
-        // Do not access sp because it can be destroyed after recall
-
-        auto is_our_suspend_point = [sp] (market_context ctx) {
-            return std::uintptr_t(sp) == ctx.my_uniq_addr;
-        };
-        td->my_arena->get_waiting_threads_monitor().notify(is_our_suspend_point);
-        break;
-    }
-    default:
-        __TBB_ASSERT(td->my_post_resume_action == post_resume_action::none, "Unknown post resume action");
-        __TBB_ASSERT(td->my_post_resume_arg == nullptr, "The post resume argument should not be set");
-    }
-    td->clear_post_resume_action();
-}
+            void suspend(suspend_callback_type suspend_callback, void* user_callback) {
+                thread_data& td = *governor::get_thread_data();
+                td.my_task_dispatcher->suspend(suspend_callback, user_callback);
+                // Do not access td after suspend.
+            }
+
+            void resume(suspend_point_type* sp) {
+                assert_pointers_valid(sp, sp->m_arena);
+                task_dispatcher& task_disp = sp->m_resume_task.m_target;
+
+                if (sp->try_notify_resume()) {
+                    // TODO: remove this work-around
+                    // Prolong the arena's lifetime while all coroutines are alive
+                    // (otherwise the arena can be destroyed while some tasks are suspended).
+                    arena& a = *sp->m_arena;
+                    a.my_references += arena::ref_worker;
+
+                    if (task_disp.m_properties.critical_task_allowed) {
+                        // The target is not in the process of executing critical task, so the resume task is not critical.
+                        a.my_resume_task_stream.push(&sp->m_resume_task, random_lane_selector(sp->m_random));
+                    } else {
+#if __TBB_PREVIEW_CRITICAL_TASKS
+                        // The target is in the process of executing critical task, so the resume task is critical.
+                        a.my_critical_task_stream.push(&sp->m_resume_task,
+                                                       random_lane_selector(sp->m_random));
+#endif
+                    }
+                    // Do not access target after that point.
+                    a.advertise_new_work<arena::wakeup>();
+                    // Release our reference to my_arena.
+                    a.on_thread_leaving(arena::ref_worker);
+                }
+            }
+
+            suspend_point_type* current_suspend_point() {
+                thread_data& td = *governor::get_thread_data();
+                return td.my_task_dispatcher->get_suspend_point();
+            }
+
+            task_dispatcher& create_coroutine(thread_data& td) {
+                // We may have some task dispatchers cached
+                task_dispatcher* task_disp = td.my_arena->my_co_cache.pop();
+                if (!task_disp) {
+                    void* ptr = cache_aligned_allocate(sizeof(task_dispatcher));
+                    task_disp = new (ptr) task_dispatcher(td.my_arena);
+                    task_disp->init_suspend_point(td.my_arena,
+                                                  td.my_arena->my_threading_control->worker_stack_size());
+                }
+                // Prolong the arena's lifetime until all coroutines is alive
+                // (otherwise the arena can be destroyed while some tasks are suspended).
+                // TODO: consider behavior if there are more than 4K external references.
+                td.my_arena->my_references += arena::ref_external;
+                return *task_disp;
+            }
+
+            void task_dispatcher::internal_suspend() {
+                __TBB_ASSERT(m_thread_data != nullptr, nullptr);
+
+                arena_slot* slot = m_thread_data->my_arena_slot;
+                __TBB_ASSERT(slot != nullptr, nullptr);
+
+                task_dispatcher& default_task_disp = slot->default_task_dispatcher();
+                // TODO: simplify the next line, e.g. is_task_dispatcher_recalled( task_dispatcher& )
+                bool is_recalled = default_task_disp.get_suspend_point()->m_is_owner_recalled.load(
+                        std::memory_order_acquire);
+                task_dispatcher& target = is_recalled ? default_task_disp : create_coroutine(*m_thread_data);
+
+                resume(target);
+
+                if (m_properties.outermost) { recall_point(); }
+            }
+
+            void task_dispatcher::suspend(suspend_callback_type suspend_callback, void* user_callback) {
+                __TBB_ASSERT(suspend_callback != nullptr, nullptr);
+                __TBB_ASSERT(user_callback != nullptr, nullptr);
+                suspend_callback(user_callback, get_suspend_point());
+
+                __TBB_ASSERT(m_thread_data != nullptr, nullptr);
+                __TBB_ASSERT(m_thread_data->my_post_resume_action == post_resume_action::none, nullptr);
+                __TBB_ASSERT(m_thread_data->my_post_resume_arg == nullptr, nullptr);
+                internal_suspend();
+            }
+
+            bool task_dispatcher::resume(task_dispatcher& target) {
+                // Do not create non-trivial objects on the stack of this function. They might never be destroyed
+                {
+                    thread_data* td = m_thread_data;
+                    __TBB_ASSERT(&target != this, "We cannot resume to ourself");
+                    __TBB_ASSERT(td != nullptr, "This task dispatcher must be attach to a thread data");
+                    __TBB_ASSERT(td->my_task_dispatcher == this,
+                                 "Thread data must be attached to this task dispatcher");
+
+                    // Change the task dispatcher
+                    td->detach_task_dispatcher();
+                    td->attach_task_dispatcher(target);
+                }
+                __TBB_ASSERT(m_suspend_point != nullptr, "Suspend point must be created");
+                __TBB_ASSERT(target.m_suspend_point != nullptr, "Suspend point must be created");
+                // Swap to the target coroutine.
+
+                m_suspend_point->resume(target.m_suspend_point);
+                // Pay attention that m_thread_data can be changed after resume
+                if (m_thread_data) {
+                    thread_data* td = m_thread_data;
+                    __TBB_ASSERT(td != nullptr, "This task dispatcher must be attach to a thread data");
+                    __TBB_ASSERT(td->my_task_dispatcher == this,
+                                 "Thread data must be attached to this task dispatcher");
+                    do_post_resume_action();
+
+                    // Remove the recall flag if the thread in its original task dispatcher
+                    arena_slot* slot = td->my_arena_slot;
+                    __TBB_ASSERT(slot != nullptr, nullptr);
+                    if (this == slot->my_default_task_dispatcher) {
+                        __TBB_ASSERT(m_suspend_point != nullptr, nullptr);
+                        m_suspend_point->m_is_owner_recalled.store(false, std::memory_order_relaxed);
+                    }
+                    return true;
+                }
+                return false;
+            }
+
+            void task_dispatcher::do_post_resume_action() {
+                thread_data* td = m_thread_data;
+                switch (td->my_post_resume_action) {
+                    case post_resume_action::register_waiter: {
+                        __TBB_ASSERT(td->my_post_resume_arg, "The post resume action must have an argument");
+                        static_cast<thread_control_monitor::resume_context*>(td->my_post_resume_arg)
+                                ->notify();
+                        break;
+                    }
+                    case post_resume_action::cleanup: {
+                        __TBB_ASSERT(td->my_post_resume_arg, "The post resume action must have an argument");
+                        task_dispatcher* to_cleanup = static_cast<task_dispatcher*>(td->my_post_resume_arg);
+                        // Release coroutine's reference to my_arena
+                        td->my_arena->on_thread_leaving(arena::ref_external);
+                        // Cache the coroutine for possible later re-usage
+                        td->my_arena->my_co_cache.push(to_cleanup);
+                        break;
+                    }
+                    case post_resume_action::notify: {
+                        __TBB_ASSERT(td->my_post_resume_arg, "The post resume action must have an argument");
+                        suspend_point_type* sp = static_cast<suspend_point_type*>(td->my_post_resume_arg);
+                        sp->recall_owner();
+                        // Do not access sp because it can be destroyed after recall
+
+                        auto is_our_suspend_point
+                                = [sp](market_context ctx) { return std::uintptr_t(sp) == ctx.my_uniq_addr; };
+                        td->my_arena->get_waiting_threads_monitor().notify(is_our_suspend_point);
+                        break;
+                    }
+                    default:
+                        __TBB_ASSERT(td->my_post_resume_action == post_resume_action::none,
+                                     "Unknown post resume action");
+                        __TBB_ASSERT(td->my_post_resume_arg == nullptr,
+                                     "The post resume argument should not be set");
+                }
+                td->clear_post_resume_action();
+            }
 
 #else
 
-void suspend(suspend_callback_type, void*) {
-    __TBB_ASSERT_RELEASE(false, "Resumable tasks are unsupported on this platform");
-}
+            void suspend(suspend_callback_type, void*) {
+                __TBB_ASSERT_RELEASE(false, "Resumable tasks are unsupported on this platform");
+            }
 
-void resume(suspend_point_type*) {
-    __TBB_ASSERT_RELEASE(false, "Resumable tasks are unsupported on this platform");
-}
+            void resume(suspend_point_type*) {
+                __TBB_ASSERT_RELEASE(false, "Resumable tasks are unsupported on this platform");
+            }
 
-suspend_point_type* current_suspend_point() {
-    __TBB_ASSERT_RELEASE(false, "Resumable tasks are unsupported on this platform");
-    return nullptr;
-}
+            suspend_point_type* current_suspend_point() {
+                __TBB_ASSERT_RELEASE(false, "Resumable tasks are unsupported on this platform");
+                return nullptr;
+            }
 
 #endif /* __TBB_RESUMABLE_TASKS */
 
-void notify_waiters(std::uintptr_t wait_ctx_addr) {
-    auto is_related_wait_ctx = [&] (market_context context) {
-        return wait_ctx_addr == context.my_uniq_addr;
-    };
-
-    governor::get_thread_data()->my_arena->get_waiting_threads_monitor().notify(is_related_wait_ctx);
-}
-
-d1::wait_tree_vertex_interface* get_thread_reference_vertex(d1::wait_tree_vertex_interface* top_wait_context) {
-    __TBB_ASSERT(top_wait_context, nullptr);
-    auto& dispatcher = *governor::get_thread_data()->my_task_dispatcher;
-
-    d1::reference_vertex* ref_counter{nullptr};
-    auto& reference_map = dispatcher.m_reference_vertex_map;
-    auto pos = reference_map.find(top_wait_context);
-    if (pos != reference_map.end()) {
-        ref_counter = pos->second;
-    } else {
-        constexpr std::size_t max_reference_vertex_map_size = 1000;
-        if (reference_map.size() > max_reference_vertex_map_size) {
-            // TODO: Research the possibility of using better approach for a clean-up
-            for (auto it = reference_map.begin(); it != reference_map.end();) {
-                if (it->second->get_num_child() == 0) {
-                    it->second->~reference_vertex();
-                    cache_aligned_deallocate(it->second);
-                    it = reference_map.erase(it);
-                } else {
-                    ++it;
-                }
+            void notify_waiters(std::uintptr_t wait_ctx_addr) {
+                auto is_related_wait_ctx
+                        = [&](market_context context) { return wait_ctx_addr == context.my_uniq_addr; };
+
+                governor::get_thread_data()->my_arena->get_waiting_threads_monitor().notify(
+                        is_related_wait_ctx);
             }
-        }
 
-        reference_map[top_wait_context] = ref_counter =
-            new (cache_aligned_allocate(sizeof(d1::reference_vertex))) d1::reference_vertex(top_wait_context, 0);
-    }
+            d1::wait_tree_vertex_interface*
+            get_thread_reference_vertex(d1::wait_tree_vertex_interface* top_wait_context) {
+                __TBB_ASSERT(top_wait_context, nullptr);
+                auto& dispatcher = *governor::get_thread_data()->my_task_dispatcher;
 
-    return ref_counter;
-}
+                d1::reference_vertex* ref_counter {nullptr};
+                auto& reference_map = dispatcher.m_reference_vertex_map;
+                auto pos = reference_map.find(top_wait_context);
+                if (pos != reference_map.end()) {
+                    ref_counter = pos->second;
+                } else {
+                    constexpr std::size_t max_reference_vertex_map_size = 1000;
+                    if (reference_map.size() > max_reference_vertex_map_size) {
+                        // TODO: Research the possibility of using better approach for a clean-up
+                        for (auto it = reference_map.begin(); it != reference_map.end();) {
+                            if (it->second->get_num_child() == 0) {
+                                it->second->~reference_vertex();
+                                cache_aligned_deallocate(it->second);
+                                it = reference_map.erase(it);
+                            } else {
+                                ++it;
+                            }
+                        }
+                    }
+
+                    reference_map[top_wait_context] = ref_counter
+                            = new (cache_aligned_allocate(sizeof(d1::reference_vertex)))
+                                    d1::reference_vertex(top_wait_context, 0);
+                }
+
+                return ref_counter;
+            }
 
-} // namespace r1
-} // namespace detail
-} // namespace tbb
+        }// namespace r1
+    }    // namespace detail
+}// namespace tbb
diff --git a/external/tbb/src/tbb/task_dispatcher.cpp b/external/tbb/src/tbb/task_dispatcher.cpp
index 5ea7d3f5..1280a329 100644
--- a/external/tbb/src/tbb/task_dispatcher.cpp
+++ b/external/tbb/src/tbb/task_dispatcher.cpp
@@ -18,227 +18,233 @@
 #include "waiters.h"
 
 namespace tbb {
-namespace detail {
-namespace r1 {
-
-static inline void spawn_and_notify(d1::task& t, arena_slot* slot, arena* a) {
-    slot->spawn(t);
-    a->advertise_new_work<arena::work_spawned>();
-    // TODO: TBB_REVAMP_TODO slot->assert_task_pool_valid();
-}
-
-void __TBB_EXPORTED_FUNC spawn(d1::task& t, d1::task_group_context& ctx) {
-    thread_data* tls = governor::get_thread_data();
-    task_group_context_impl::bind_to(ctx, tls);
-    arena* a = tls->my_arena;
-    arena_slot* slot = tls->my_arena_slot;
-    // Capture current context
-    task_accessor::context(t) = &ctx;
-    // Mark isolation
-    task_accessor::isolation(t) = tls->my_task_dispatcher->m_execute_data_ext.isolation;
-    spawn_and_notify(t, slot, a);
-}
-
-void __TBB_EXPORTED_FUNC spawn(d1::task& t, d1::task_group_context& ctx, d1::slot_id id) {
-    thread_data* tls = governor::get_thread_data();
-    task_group_context_impl::bind_to(ctx, tls);
-    arena* a = tls->my_arena;
-    arena_slot* slot = tls->my_arena_slot;
-    execution_data_ext& ed = tls->my_task_dispatcher->m_execute_data_ext;
-
-    // Capture context
-    task_accessor::context(t) = &ctx;
-    // Mark isolation
-    task_accessor::isolation(t) = ed.isolation;
-
-    if ( id != d1::no_slot && id != tls->my_arena_index && id < a->my_num_slots) {
-        // Allocate proxy task
-        d1::small_object_allocator alloc{};
-        auto proxy = alloc.new_object<task_proxy>(static_cast<d1::execution_data&>(ed));
-        // Mark as a proxy
-        task_accessor::set_proxy_trait(*proxy);
-        // Mark isolation for the proxy task
-        task_accessor::isolation(*proxy) = ed.isolation;
-        // Deallocation hint (tls) from the task allocator
-        proxy->allocator = alloc;
-        proxy->slot = id;
-        proxy->outbox = &a->mailbox(id);
-        // Mark proxy as present in both locations (sender's task pool and destination mailbox)
-        proxy->task_and_tag = intptr_t(&t) | task_proxy::location_mask;
-        // Mail the proxy - after this point t may be destroyed by another thread at any moment.
-        proxy->outbox->push(proxy);
-        // Spawn proxy to the local task pool
-        spawn_and_notify(*proxy, slot, a);
-    } else {
-        spawn_and_notify(t, slot, a);
-    }
-}
-
-void __TBB_EXPORTED_FUNC submit(d1::task& t, d1::task_group_context& ctx, arena* a, std::uintptr_t as_critical) {
-    suppress_unused_warning(as_critical);
-    assert_pointer_valid(a);
-    thread_data& tls = *governor::get_thread_data();
-
-    // TODO revamp: for each use case investigate neccesity to make this call
-    task_group_context_impl::bind_to(ctx, &tls);
-    task_accessor::context(t) = &ctx;
-    // TODO revamp: consider respecting task isolation if this call is being made by external thread
-    task_accessor::isolation(t) = tls.my_task_dispatcher->m_execute_data_ext.isolation;
-
-    // TODO: consider code refactoring when lane selection mechanism is unified.
-
-    if ( tls.is_attached_to(a) ) {
-        arena_slot* slot = tls.my_arena_slot;
+    namespace detail {
+        namespace r1 {
+
+            static inline void spawn_and_notify(d1::task& t, arena_slot* slot, arena* a) {
+                slot->spawn(t);
+                a->advertise_new_work<arena::work_spawned>();
+                // TODO: TBB_REVAMP_TODO slot->assert_task_pool_valid();
+            }
+
+            void __TBB_EXPORTED_FUNC spawn(d1::task& t, d1::task_group_context& ctx) {
+                thread_data* tls = governor::get_thread_data();
+                task_group_context_impl::bind_to(ctx, tls);
+                arena* a = tls->my_arena;
+                arena_slot* slot = tls->my_arena_slot;
+                // Capture current context
+                task_accessor::context(t) = &ctx;
+                // Mark isolation
+                task_accessor::isolation(t) = tls->my_task_dispatcher->m_execute_data_ext.isolation;
+                spawn_and_notify(t, slot, a);
+            }
+
+            void __TBB_EXPORTED_FUNC spawn(d1::task& t, d1::task_group_context& ctx, d1::slot_id id) {
+                thread_data* tls = governor::get_thread_data();
+                task_group_context_impl::bind_to(ctx, tls);
+                arena* a = tls->my_arena;
+                arena_slot* slot = tls->my_arena_slot;
+                execution_data_ext& ed = tls->my_task_dispatcher->m_execute_data_ext;
+
+                // Capture context
+                task_accessor::context(t) = &ctx;
+                // Mark isolation
+                task_accessor::isolation(t) = ed.isolation;
+
+                if (id != d1::no_slot && id != tls->my_arena_index && id < a->my_num_slots) {
+                    // Allocate proxy task
+                    d1::small_object_allocator alloc {};
+                    auto proxy = alloc.new_object<task_proxy>(static_cast<d1::execution_data&>(ed));
+                    // Mark as a proxy
+                    task_accessor::set_proxy_trait(*proxy);
+                    // Mark isolation for the proxy task
+                    task_accessor::isolation(*proxy) = ed.isolation;
+                    // Deallocation hint (tls) from the task allocator
+                    proxy->allocator = alloc;
+                    proxy->slot = id;
+                    proxy->outbox = &a->mailbox(id);
+                    // Mark proxy as present in both locations (sender's task pool and destination mailbox)
+                    proxy->task_and_tag = intptr_t(&t) | task_proxy::location_mask;
+                    // Mail the proxy - after this point t may be destroyed by another thread at any moment.
+                    proxy->outbox->push(proxy);
+                    // Spawn proxy to the local task pool
+                    spawn_and_notify(*proxy, slot, a);
+                } else {
+                    spawn_and_notify(t, slot, a);
+                }
+            }
+
+            void __TBB_EXPORTED_FUNC submit(d1::task& t, d1::task_group_context& ctx, arena* a,
+                                            std::uintptr_t as_critical) {
+                suppress_unused_warning(as_critical);
+                assert_pointer_valid(a);
+                thread_data& tls = *governor::get_thread_data();
+
+                // TODO revamp: for each use case investigate neccesity to make this call
+                task_group_context_impl::bind_to(ctx, &tls);
+                task_accessor::context(t) = &ctx;
+                // TODO revamp: consider respecting task isolation if this call is being made by external thread
+                task_accessor::isolation(t) = tls.my_task_dispatcher->m_execute_data_ext.isolation;
+
+                // TODO: consider code refactoring when lane selection mechanism is unified.
+
+                if (tls.is_attached_to(a)) {
+                    arena_slot* slot = tls.my_arena_slot;
 #if __TBB_PREVIEW_CRITICAL_TASKS
-        if( as_critical ) {
-            a->my_critical_task_stream.push( &t, subsequent_lane_selector(slot->critical_hint()) );
-        } else
+                    if (as_critical) {
+                        a->my_critical_task_stream.push(&t, subsequent_lane_selector(slot->critical_hint()));
+                    } else
 #endif
-        {
-            slot->spawn(t);
-        }
-    } else {
-        random_lane_selector lane_selector{tls.my_random};
+                    {
+                        slot->spawn(t);
+                    }
+                } else {
+                    random_lane_selector lane_selector {tls.my_random};
 #if !__TBB_PREVIEW_CRITICAL_TASKS
-        suppress_unused_warning(as_critical);
+                    suppress_unused_warning(as_critical);
 #else
-        if ( as_critical ) {
-            a->my_critical_task_stream.push( &t, lane_selector );
-        } else
+                    if (as_critical) {
+                        a->my_critical_task_stream.push(&t, lane_selector);
+                    } else
 #endif
-        {
-            // Avoid joining the arena the thread is not currently in.
-            a->my_fifo_task_stream.push( &t, lane_selector );
-        }
-    }
-    // It is assumed that some thread will explicitly wait in the arena the task is submitted
-    // into. Therefore, no need to utilize mandatory concurrency here.
-    a->advertise_new_work<arena::work_spawned>();
-}
-
-void __TBB_EXPORTED_FUNC execute_and_wait(d1::task& t, d1::task_group_context& t_ctx, d1::wait_context& wait_ctx, d1::task_group_context& w_ctx) {
-    task_accessor::context(t) = &t_ctx;
-    task_dispatcher::execute_and_wait(&t, wait_ctx, w_ctx);
-}
-
-void __TBB_EXPORTED_FUNC wait(d1::wait_context& wait_ctx, d1::task_group_context& w_ctx) {
-    // Enter the task dispatch loop without a task
-    task_dispatcher::execute_and_wait(nullptr, wait_ctx, w_ctx);
-}
-
-d1::slot_id __TBB_EXPORTED_FUNC execution_slot(const d1::execution_data* ed) {
-    if (ed) {
-        const execution_data_ext* ed_ext = static_cast<const execution_data_ext*>(ed);
-        assert_pointers_valid(ed_ext->task_disp, ed_ext->task_disp->m_thread_data);
-        return ed_ext->task_disp->m_thread_data->my_arena_index;
-    } else {
-        thread_data* td = governor::get_thread_data_if_initialized();
-        return td ? td->my_arena_index : d1::slot_id(-1);
-    }
-}
-
-d1::task_group_context* __TBB_EXPORTED_FUNC current_context() {
-    thread_data* td = governor::get_thread_data();
-    assert_pointers_valid(td, td->my_task_dispatcher);
-
-    task_dispatcher* task_disp = td->my_task_dispatcher;
-    if (task_disp->m_properties.outermost) {
-        // No one task is executed, so no execute_data.
-        return nullptr;
-    } else {
-        return td->my_task_dispatcher->m_execute_data_ext.context;
-    }
-}
-
-void task_dispatcher::execute_and_wait(d1::task* t, d1::wait_context& wait_ctx, d1::task_group_context& w_ctx) {
-    // Get an associated task dispatcher
-    thread_data* tls = governor::get_thread_data();
-    __TBB_ASSERT(tls->my_task_dispatcher != nullptr, nullptr);
-    task_dispatcher& local_td = *tls->my_task_dispatcher;
-
-    // TODO: factor out the binding to execute_and_wait_impl
-    if (t) {
-        task_group_context_impl::bind_to(*task_accessor::context(*t), tls);
-        // Propagate the isolation to the task executed without spawn.
-        task_accessor::isolation(*t) = tls->my_task_dispatcher->m_execute_data_ext.isolation;
-    }
-
-    // Waiting on special object tied to a waiting thread.
-    external_waiter waiter{ *tls->my_arena, wait_ctx };
-    t = local_td.local_wait_for_all(t, waiter);
-    __TBB_ASSERT_EX(t == nullptr, "External waiter must not leave dispatch loop with a task");
-
-    // The external thread couldn't exit the dispatch loop in an idle state
-    if (local_td.m_thread_data->my_inbox.is_idle_state(true)) {
-        local_td.m_thread_data->my_inbox.set_is_idle(false);
-    }
-
-    auto exception = w_ctx.my_exception.load(std::memory_order_acquire);
-    if (exception) {
-        __TBB_ASSERT(w_ctx.is_group_execution_cancelled(), "The task group context with an exception should be canceled.");
-        exception->throw_self();
-    }
-}
+                    {
+                        // Avoid joining the arena the thread is not currently in.
+                        a->my_fifo_task_stream.push(&t, lane_selector);
+                    }
+                }
+                // It is assumed that some thread will explicitly wait in the arena the task is submitted
+                // into. Therefore, no need to utilize mandatory concurrency here.
+                a->advertise_new_work<arena::work_spawned>();
+            }
+
+            void __TBB_EXPORTED_FUNC execute_and_wait(d1::task& t, d1::task_group_context& t_ctx,
+                                                      d1::wait_context& wait_ctx,
+                                                      d1::task_group_context& w_ctx) {
+                task_accessor::context(t) = &t_ctx;
+                task_dispatcher::execute_and_wait(&t, wait_ctx, w_ctx);
+            }
+
+            void __TBB_EXPORTED_FUNC wait(d1::wait_context& wait_ctx, d1::task_group_context& w_ctx) {
+                // Enter the task dispatch loop without a task
+                task_dispatcher::execute_and_wait(nullptr, wait_ctx, w_ctx);
+            }
+
+            d1::slot_id __TBB_EXPORTED_FUNC execution_slot(const d1::execution_data* ed) {
+                if (ed) {
+                    const execution_data_ext* ed_ext = static_cast<const execution_data_ext*>(ed);
+                    assert_pointers_valid(ed_ext->task_disp, ed_ext->task_disp->m_thread_data);
+                    return ed_ext->task_disp->m_thread_data->my_arena_index;
+                } else {
+                    thread_data* td = governor::get_thread_data_if_initialized();
+                    return td ? td->my_arena_index : d1::slot_id(-1);
+                }
+            }
+
+            d1::task_group_context* __TBB_EXPORTED_FUNC current_context() {
+                thread_data* td = governor::get_thread_data();
+                assert_pointers_valid(td, td->my_task_dispatcher);
+
+                task_dispatcher* task_disp = td->my_task_dispatcher;
+                if (task_disp->m_properties.outermost) {
+                    // No one task is executed, so no execute_data.
+                    return nullptr;
+                } else {
+                    return td->my_task_dispatcher->m_execute_data_ext.context;
+                }
+            }
+
+            void task_dispatcher::execute_and_wait(d1::task* t, d1::wait_context& wait_ctx,
+                                                   d1::task_group_context& w_ctx) {
+                // Get an associated task dispatcher
+                thread_data* tls = governor::get_thread_data();
+                __TBB_ASSERT(tls->my_task_dispatcher != nullptr, nullptr);
+                task_dispatcher& local_td = *tls->my_task_dispatcher;
+
+                // TODO: factor out the binding to execute_and_wait_impl
+                if (t) {
+                    task_group_context_impl::bind_to(*task_accessor::context(*t), tls);
+                    // Propagate the isolation to the task executed without spawn.
+                    task_accessor::isolation(*t) = tls->my_task_dispatcher->m_execute_data_ext.isolation;
+                }
+
+                // Waiting on special object tied to a waiting thread.
+                external_waiter waiter {*tls->my_arena, wait_ctx};
+                t = local_td.local_wait_for_all(t, waiter);
+                __TBB_ASSERT_EX(t == nullptr, "External waiter must not leave dispatch loop with a task");
+
+                // The external thread couldn't exit the dispatch loop in an idle state
+                if (local_td.m_thread_data->my_inbox.is_idle_state(true)) {
+                    local_td.m_thread_data->my_inbox.set_is_idle(false);
+                }
+
+                auto exception = w_ctx.my_exception.load(std::memory_order_acquire);
+                if (exception) {
+                    __TBB_ASSERT(w_ctx.is_group_execution_cancelled(),
+                                 "The task group context with an exception should be canceled.");
+                    exception->throw_self();
+                }
+            }
 
 #if __TBB_RESUMABLE_TASKS
 
 #if _WIN32
-/* [[noreturn]] */ void __stdcall co_local_wait_for_all(void* addr) noexcept
+            /* [[noreturn]] */ void __stdcall co_local_wait_for_all(void* addr) noexcept
 #else
-/* [[noreturn]] */ void co_local_wait_for_all(unsigned hi, unsigned lo) noexcept
+            /* [[noreturn]] */ void co_local_wait_for_all(unsigned hi, unsigned lo) noexcept
 #endif
-{
+            {
 #if !_WIN32
-    std::uintptr_t addr = lo;
-    __TBB_ASSERT(sizeof(addr) == 8 || hi == 0, nullptr);
-    addr += std::uintptr_t(std::uint64_t(hi) << 32);
+                std::uintptr_t addr = lo;
+                __TBB_ASSERT(sizeof(addr) == 8 || hi == 0, nullptr);
+                addr += std::uintptr_t(std::uint64_t(hi) << 32);
 #endif
-    task_dispatcher& task_disp = *reinterpret_cast<task_dispatcher*>(addr);
-    assert_pointers_valid(task_disp.m_thread_data, task_disp.m_thread_data->my_arena);
-    task_disp.set_stealing_threshold(task_disp.m_thread_data->my_arena->calculate_stealing_threshold());
-    __TBB_ASSERT(task_disp.can_steal(), nullptr);
-    task_disp.co_local_wait_for_all();
-    // This code is unreachable
-}
-
-/* [[noreturn]] */ void task_dispatcher::co_local_wait_for_all() noexcept {
-    // Do not create non-trivial objects on the stack of this function. They will never be destroyed.
-    assert_pointer_valid(m_thread_data);
-
-    m_suspend_point->finilize_resume();
-    // Basically calls the user callback passed to the tbb::task::suspend function
-    do_post_resume_action();
-
-    // Endless loop here because coroutine could be reused
-    d1::task* resume_task{};
-    do {
-        arena* a = m_thread_data->my_arena;
-        coroutine_waiter waiter(*a);
-        resume_task = local_wait_for_all(nullptr, waiter);
-        assert_task_valid(resume_task);
-        __TBB_ASSERT(this == m_thread_data->my_task_dispatcher, nullptr);
-
-        m_thread_data->set_post_resume_action(post_resume_action::cleanup, this);
-
-    } while (resume(static_cast<suspend_point_type::resume_task*>(resume_task)->m_target));
-    // This code might be unreachable
-}
-
-d1::suspend_point task_dispatcher::get_suspend_point() {
-    if (m_suspend_point == nullptr) {
-        assert_pointer_valid(m_thread_data);
-        // 0 means that we attach this task dispatcher to the current stack
-        init_suspend_point(m_thread_data->my_arena, 0);
-    }
-    assert_pointer_valid(m_suspend_point);
-    return m_suspend_point;
-}
-void task_dispatcher::init_suspend_point(arena* a, std::size_t stack_size) {
-    __TBB_ASSERT(m_suspend_point == nullptr, nullptr);
-    m_suspend_point = new(cache_aligned_allocate(sizeof(suspend_point_type)))
-        suspend_point_type(a, stack_size, *this);
-}
-#endif /* __TBB_RESUMABLE_TASKS */
-} // namespace r1
-} // namespace detail
-} // namespace tbb
+                task_dispatcher& task_disp = *reinterpret_cast<task_dispatcher*>(addr);
+                assert_pointers_valid(task_disp.m_thread_data, task_disp.m_thread_data->my_arena);
+                task_disp.set_stealing_threshold(
+                        task_disp.m_thread_data->my_arena->calculate_stealing_threshold());
+                __TBB_ASSERT(task_disp.can_steal(), nullptr);
+                task_disp.co_local_wait_for_all();
+                // This code is unreachable
+            }
+
+            /* [[noreturn]] */ void task_dispatcher::co_local_wait_for_all() noexcept {
+                // Do not create non-trivial objects on the stack of this function. They will never be destroyed.
+                assert_pointer_valid(m_thread_data);
+
+                m_suspend_point->finilize_resume();
+                // Basically calls the user callback passed to the tbb::task::suspend function
+                do_post_resume_action();
+
+                // Endless loop here because coroutine could be reused
+                d1::task* resume_task {};
+                do {
+                    arena* a = m_thread_data->my_arena;
+                    coroutine_waiter waiter(*a);
+                    resume_task = local_wait_for_all(nullptr, waiter);
+                    assert_task_valid(resume_task);
+                    __TBB_ASSERT(this == m_thread_data->my_task_dispatcher, nullptr);
+
+                    m_thread_data->set_post_resume_action(post_resume_action::cleanup, this);
+
+                } while (resume(static_cast<suspend_point_type::resume_task*>(resume_task)->m_target));
+                // This code might be unreachable
+            }
+
+            d1::suspend_point task_dispatcher::get_suspend_point() {
+                if (m_suspend_point == nullptr) {
+                    assert_pointer_valid(m_thread_data);
+                    // 0 means that we attach this task dispatcher to the current stack
+                    init_suspend_point(m_thread_data->my_arena, 0);
+                }
+                assert_pointer_valid(m_suspend_point);
+                return m_suspend_point;
+            }
+            void task_dispatcher::init_suspend_point(arena* a, std::size_t stack_size) {
+                __TBB_ASSERT(m_suspend_point == nullptr, nullptr);
+                m_suspend_point = new (cache_aligned_allocate(sizeof(suspend_point_type)))
+                        suspend_point_type(a, stack_size, *this);
+            }
+#endif   /* __TBB_RESUMABLE_TASKS */
+        }// namespace r1
+    }    // namespace detail
+}// namespace tbb
diff --git a/external/tbb/src/tbb/task_group_context.cpp b/external/tbb/src/tbb/task_group_context.cpp
index c20b2790..b85c4245 100644
--- a/external/tbb/src/tbb/task_group_context.cpp
+++ b/external/tbb/src/tbb/task_group_context.cpp
@@ -14,192 +14,217 @@
     limitations under the License.
 */
 
+#include "governor.h"
+#include "itt_notify.h"
 #include "oneapi/tbb/detail/_config.h"
-#include "oneapi/tbb/tbb_allocator.h"
 #include "oneapi/tbb/task_group.h"
-#include "governor.h"
-#include "thread_data.h"
+#include "oneapi/tbb/tbb_allocator.h"
 #include "scheduler_common.h"
-#include "itt_notify.h"
 #include "task_dispatcher.h"
+#include "thread_data.h"
 
 #include <type_traits>
 
 namespace tbb {
-namespace detail {
-namespace r1 {
-
-//------------------------------------------------------------------------
-// tbb_exception_ptr
-//------------------------------------------------------------------------
-tbb_exception_ptr* tbb_exception_ptr::allocate() noexcept {
-    tbb_exception_ptr* eptr = (tbb_exception_ptr*)allocate_memory(sizeof(tbb_exception_ptr));
-    return eptr ? new (eptr) tbb_exception_ptr(std::current_exception()) : nullptr;
-}
-
-void tbb_exception_ptr::destroy() noexcept {
-    this->~tbb_exception_ptr();
-    deallocate_memory(this);
-}
-
-void tbb_exception_ptr::throw_self() {
-    if (governor::rethrow_exception_broken()) fix_broken_rethrow();
-    std::rethrow_exception(my_ptr);
-}
-
-//------------------------------------------------------------------------
-// task_group_context
-//------------------------------------------------------------------------
-
-void task_group_context_impl::destroy(d1::task_group_context& ctx) {
-    __TBB_ASSERT(!is_poisoned(ctx.my_context_list), nullptr);
-
-    if (ctx.my_context_list != nullptr) {
-        __TBB_ASSERT(ctx.my_state.load(std::memory_order_relaxed) == d1::task_group_context::state::bound, nullptr);
-        // The owner can be destroyed at any moment. Access the associate data with caution.
-        ctx.my_context_list->remove(ctx.my_node);
-    }
-    d1::cpu_ctl_env* ctl = reinterpret_cast<d1::cpu_ctl_env*>(&ctx.my_cpu_ctl_env);
+    namespace detail {
+        namespace r1 {
+
+            //------------------------------------------------------------------------
+            // tbb_exception_ptr
+            //------------------------------------------------------------------------
+            tbb_exception_ptr* tbb_exception_ptr::allocate() noexcept {
+                tbb_exception_ptr* eptr = (tbb_exception_ptr*) allocate_memory(sizeof(tbb_exception_ptr));
+                return eptr ? new (eptr) tbb_exception_ptr(std::current_exception()) : nullptr;
+            }
+
+            void tbb_exception_ptr::destroy() noexcept {
+                this->~tbb_exception_ptr();
+                deallocate_memory(this);
+            }
+
+            void tbb_exception_ptr::throw_self() {
+                if (governor::rethrow_exception_broken()) fix_broken_rethrow();
+                std::rethrow_exception(my_ptr);
+            }
+
+            //------------------------------------------------------------------------
+            // task_group_context
+            //------------------------------------------------------------------------
+
+            void task_group_context_impl::destroy(d1::task_group_context& ctx) {
+                __TBB_ASSERT(!is_poisoned(ctx.my_context_list), nullptr);
+
+                if (ctx.my_context_list != nullptr) {
+                    __TBB_ASSERT(ctx.my_state.load(std::memory_order_relaxed)
+                                         == d1::task_group_context::state::bound,
+                                 nullptr);
+                    // The owner can be destroyed at any moment. Access the associate data with caution.
+                    ctx.my_context_list->remove(ctx.my_node);
+                }
+                d1::cpu_ctl_env* ctl = reinterpret_cast<d1::cpu_ctl_env*>(&ctx.my_cpu_ctl_env);
 #if _MSC_VER && _MSC_VER <= 1900 && !__INTEL_COMPILER
-    suppress_unused_warning(ctl);
+                suppress_unused_warning(ctl);
 #endif
-    ctl->~cpu_ctl_env();
-
-    auto exception = ctx.my_exception.load(std::memory_order_relaxed);
-    if (exception) {
-        exception->destroy();
-    }
-    ITT_STACK_DESTROY(ctx.my_itt_caller);
-
-    poison_pointer(ctx.my_parent);
-    poison_pointer(ctx.my_context_list);
-    poison_pointer(ctx.my_node.my_next_node);
-    poison_pointer(ctx.my_node.my_prev_node);
-    poison_pointer(ctx.my_exception);
-    poison_pointer(ctx.my_itt_caller);
-
-    ctx.my_state.store(d1::task_group_context::state::dead, std::memory_order_release);
-}
-
-void task_group_context_impl::initialize(d1::task_group_context& ctx) {
-    ITT_TASK_GROUP(&ctx, ctx.my_name, nullptr);
-
-    ctx.my_node.my_next_node = &ctx.my_node;
-    ctx.my_node.my_prev_node = &ctx.my_node;
-    ctx.my_cpu_ctl_env = 0;
-    ctx.my_cancellation_requested = 0;
-    ctx.my_may_have_children.store(0, std::memory_order_relaxed);
-    // Set the created state to bound at the first usage.
-    ctx.my_state.store(d1::task_group_context::state::created, std::memory_order_relaxed);
-    ctx.my_parent = nullptr;
-    ctx.my_context_list = nullptr;
-    ctx.my_exception.store(nullptr, std::memory_order_relaxed);
-    ctx.my_itt_caller = nullptr;
-
-    static_assert(sizeof(d1::cpu_ctl_env) <= sizeof(ctx.my_cpu_ctl_env), "FPU settings storage does not fit to uint64_t");
-    d1::cpu_ctl_env* ctl = new (&ctx.my_cpu_ctl_env) d1::cpu_ctl_env;
-    if (ctx.my_traits.fp_settings)
-        ctl->get_env();
-}
-
-void task_group_context_impl::register_with(d1::task_group_context& ctx, thread_data* td) {
-    __TBB_ASSERT(!is_poisoned(ctx.my_context_list), nullptr);
-    __TBB_ASSERT(td, nullptr);
-    ctx.my_context_list = td->my_context_list;
-
-    ctx.my_context_list->push_front(ctx.my_node);
-}
-
-void task_group_context_impl::bind_to_impl(d1::task_group_context& ctx, thread_data* td) {
-    __TBB_ASSERT(!is_poisoned(ctx.my_context_list), nullptr);
-    __TBB_ASSERT(ctx.my_state.load(std::memory_order_relaxed) == d1::task_group_context::state::locked, "The context can be bound only under the lock.");
-    __TBB_ASSERT(!ctx.my_parent, "Parent is set before initial binding");
-
-    ctx.my_parent = td->my_task_dispatcher->m_execute_data_ext.context;
-    __TBB_ASSERT(ctx.my_parent, nullptr);
-
-    // Inherit FPU settings only if the context has not captured FPU settings yet.
-    if (!ctx.my_traits.fp_settings)
-        copy_fp_settings(ctx, *ctx.my_parent);
-
-    // Condition below prevents unnecessary thrashing parent context's cache line
-    if (ctx.my_parent->my_may_have_children.load(std::memory_order_relaxed) != d1::task_group_context::may_have_children) {
-        ctx.my_parent->my_may_have_children.store(d1::task_group_context::may_have_children, std::memory_order_relaxed); // full fence is below
-    }
-    if (ctx.my_parent->my_parent) {
-        // Even if this context were made accessible for state change propagation
-        // (by placing store_with_release(td->my_context_list_state.head.my_next, &ctx.my_node)
-        // above), it still could be missed if state propagation from a grand-ancestor
-        // was underway concurrently with binding.
-        // Speculative propagation from the parent together with epoch counters
-        // detecting possibility of such a race allow to avoid taking locks when
-        // there is no contention.
-
-        // Acquire fence is necessary to prevent reordering subsequent speculative
-        // loads of parent state data out of the scope where epoch counters comparison
-        // can reliably validate it.
-        uintptr_t local_count_snapshot = ctx.my_parent->my_context_list->epoch.load(std::memory_order_acquire);
-        // Speculative propagation of parent's state. The speculation will be
-        // validated by the epoch counters check further on.
-        ctx.my_cancellation_requested.store(ctx.my_parent->my_cancellation_requested.load(std::memory_order_relaxed), std::memory_order_relaxed);
-        register_with(ctx, td); // Issues full fence
-
-        // If no state propagation was detected by the following condition, the above
-        // full fence guarantees that the parent had correct state during speculative
-        // propagation before the fence. Otherwise the propagation from parent is
-        // repeated under the lock.
-        if (local_count_snapshot != the_context_state_propagation_epoch.load(std::memory_order_relaxed)) {
-            // Another thread may be propagating state change right now. So resort to lock.
-            context_state_propagation_mutex_type::scoped_lock lock(the_context_state_propagation_mutex);
-            ctx.my_cancellation_requested.store(ctx.my_parent->my_cancellation_requested.load(std::memory_order_relaxed), std::memory_order_relaxed);
-        }
-    } else {
-        register_with(ctx, td); // Issues full fence
-        // As we do not have grand-ancestors, concurrent state propagation (if any)
-        // may originate only from the parent context, and thus it is safe to directly
-        // copy the state from it.
-        ctx.my_cancellation_requested.store(ctx.my_parent->my_cancellation_requested.load(std::memory_order_relaxed), std::memory_order_relaxed);
-    }
-}
-
-void task_group_context_impl::bind_to(d1::task_group_context& ctx, thread_data* td) {
-    d1::task_group_context::state state = ctx.my_state.load(std::memory_order_acquire);
-    if (state <= d1::task_group_context::state::locked) {
-        if (state == d1::task_group_context::state::created &&
+                ctl->~cpu_ctl_env();
+
+                auto exception = ctx.my_exception.load(std::memory_order_relaxed);
+                if (exception) { exception->destroy(); }
+                ITT_STACK_DESTROY(ctx.my_itt_caller);
+
+                poison_pointer(ctx.my_parent);
+                poison_pointer(ctx.my_context_list);
+                poison_pointer(ctx.my_node.my_next_node);
+                poison_pointer(ctx.my_node.my_prev_node);
+                poison_pointer(ctx.my_exception);
+                poison_pointer(ctx.my_itt_caller);
+
+                ctx.my_state.store(d1::task_group_context::state::dead, std::memory_order_release);
+            }
+
+            void task_group_context_impl::initialize(d1::task_group_context& ctx) {
+                ITT_TASK_GROUP(&ctx, ctx.my_name, nullptr);
+
+                ctx.my_node.my_next_node = &ctx.my_node;
+                ctx.my_node.my_prev_node = &ctx.my_node;
+                ctx.my_cpu_ctl_env = 0;
+                ctx.my_cancellation_requested = 0;
+                ctx.my_may_have_children.store(0, std::memory_order_relaxed);
+                // Set the created state to bound at the first usage.
+                ctx.my_state.store(d1::task_group_context::state::created, std::memory_order_relaxed);
+                ctx.my_parent = nullptr;
+                ctx.my_context_list = nullptr;
+                ctx.my_exception.store(nullptr, std::memory_order_relaxed);
+                ctx.my_itt_caller = nullptr;
+
+                static_assert(sizeof(d1::cpu_ctl_env) <= sizeof(ctx.my_cpu_ctl_env),
+                              "FPU settings storage does not fit to uint64_t");
+                d1::cpu_ctl_env* ctl = new (&ctx.my_cpu_ctl_env) d1::cpu_ctl_env;
+                if (ctx.my_traits.fp_settings) ctl->get_env();
+            }
+
+            void task_group_context_impl::register_with(d1::task_group_context& ctx, thread_data* td) {
+                __TBB_ASSERT(!is_poisoned(ctx.my_context_list), nullptr);
+                __TBB_ASSERT(td, nullptr);
+                ctx.my_context_list = td->my_context_list;
+
+                ctx.my_context_list->push_front(ctx.my_node);
+            }
+
+            void task_group_context_impl::bind_to_impl(d1::task_group_context& ctx, thread_data* td) {
+                __TBB_ASSERT(!is_poisoned(ctx.my_context_list), nullptr);
+                __TBB_ASSERT(ctx.my_state.load(std::memory_order_relaxed)
+                                     == d1::task_group_context::state::locked,
+                             "The context can be bound only under the lock.");
+                __TBB_ASSERT(!ctx.my_parent, "Parent is set before initial binding");
+
+                ctx.my_parent = td->my_task_dispatcher->m_execute_data_ext.context;
+                __TBB_ASSERT(ctx.my_parent, nullptr);
+
+                // Inherit FPU settings only if the context has not captured FPU settings yet.
+                if (!ctx.my_traits.fp_settings) copy_fp_settings(ctx, *ctx.my_parent);
+
+                // Condition below prevents unnecessary thrashing parent context's cache line
+                if (ctx.my_parent->my_may_have_children.load(std::memory_order_relaxed)
+                    != d1::task_group_context::may_have_children) {
+                    ctx.my_parent->my_may_have_children.store(
+                            d1::task_group_context::may_have_children,
+                            std::memory_order_relaxed);// full fence is below
+                }
+                if (ctx.my_parent->my_parent) {
+                    // Even if this context were made accessible for state change propagation
+                    // (by placing store_with_release(td->my_context_list_state.head.my_next, &ctx.my_node)
+                    // above), it still could be missed if state propagation from a grand-ancestor
+                    // was underway concurrently with binding.
+                    // Speculative propagation from the parent together with epoch counters
+                    // detecting possibility of such a race allow to avoid taking locks when
+                    // there is no contention.
+
+                    // Acquire fence is necessary to prevent reordering subsequent speculative
+                    // loads of parent state data out of the scope where epoch counters comparison
+                    // can reliably validate it.
+                    uintptr_t local_count_snapshot
+                            = ctx.my_parent->my_context_list->epoch.load(std::memory_order_acquire);
+                    // Speculative propagation of parent's state. The speculation will be
+                    // validated by the epoch counters check further on.
+                    ctx.my_cancellation_requested.store(
+                            ctx.my_parent->my_cancellation_requested.load(std::memory_order_relaxed),
+                            std::memory_order_relaxed);
+                    register_with(ctx, td);// Issues full fence
+
+                    // If no state propagation was detected by the following condition, the above
+                    // full fence guarantees that the parent had correct state during speculative
+                    // propagation before the fence. Otherwise the propagation from parent is
+                    // repeated under the lock.
+                    if (local_count_snapshot
+                        != the_context_state_propagation_epoch.load(std::memory_order_relaxed)) {
+                        // Another thread may be propagating state change right now. So resort to lock.
+                        context_state_propagation_mutex_type::scoped_lock lock(
+                                the_context_state_propagation_mutex);
+                        ctx.my_cancellation_requested.store(
+                                ctx.my_parent->my_cancellation_requested.load(std::memory_order_relaxed),
+                                std::memory_order_relaxed);
+                    }
+                } else {
+                    register_with(ctx, td);// Issues full fence
+                    // As we do not have grand-ancestors, concurrent state propagation (if any)
+                    // may originate only from the parent context, and thus it is safe to directly
+                    // copy the state from it.
+                    ctx.my_cancellation_requested.store(
+                            ctx.my_parent->my_cancellation_requested.load(std::memory_order_relaxed),
+                            std::memory_order_relaxed);
+                }
+            }
+
+            void task_group_context_impl::bind_to(d1::task_group_context& ctx, thread_data* td) {
+                d1::task_group_context::state state = ctx.my_state.load(std::memory_order_acquire);
+                if (state <= d1::task_group_context::state::locked) {
+                    if (state == d1::task_group_context::state::created &&
 #if defined(__INTEL_COMPILER) && __INTEL_COMPILER <= 1910
-            ((std::atomic<typename std::underlying_type<d1::task_group_context::state>::type>&)ctx.my_state).compare_exchange_strong(
-                (typename std::underlying_type<d1::task_group_context::state>::type&)state,
-                (typename std::underlying_type<d1::task_group_context::state>::type)d1::task_group_context::state::locked)
+                        ((std::atomic<typename std::underlying_type<d1::task_group_context::state>::type>&)
+                                 ctx.my_state)
+                                .compare_exchange_strong(
+                                        (typename std::underlying_type<d1::task_group_context::state>::type&)
+                                                state,
+                                        (typename std::underlying_type<d1::task_group_context::state>::type)
+                                                d1::task_group_context::state::locked)
 #else
-            ctx.my_state.compare_exchange_strong(state, d1::task_group_context::state::locked)
+                        ctx.my_state.compare_exchange_strong(state, d1::task_group_context::state::locked)
 #endif
-            ) {
-            // If we are in the outermost task dispatch loop of an external thread, then
-            // there is nothing to bind this context to, and we skip the binding part
-            // treating the context as isolated.
-            __TBB_ASSERT(td->my_task_dispatcher->m_execute_data_ext.context != nullptr, nullptr);
-            d1::task_group_context::state release_state{};
-            if (td->my_task_dispatcher->m_execute_data_ext.context == td->my_arena->my_default_ctx || !ctx.my_traits.bound) {
-                if (!ctx.my_traits.fp_settings) {
-                    copy_fp_settings(ctx, *td->my_arena->my_default_ctx);
+                    ) {
+                        // If we are in the outermost task dispatch loop of an external thread, then
+                        // there is nothing to bind this context to, and we skip the binding part
+                        // treating the context as isolated.
+                        __TBB_ASSERT(td->my_task_dispatcher->m_execute_data_ext.context != nullptr, nullptr);
+                        d1::task_group_context::state release_state {};
+                        if (td->my_task_dispatcher->m_execute_data_ext.context == td->my_arena->my_default_ctx
+                            || !ctx.my_traits.bound) {
+                            if (!ctx.my_traits.fp_settings) {
+                                copy_fp_settings(ctx, *td->my_arena->my_default_ctx);
+                            }
+                            release_state = d1::task_group_context::state::isolated;
+                        } else {
+                            bind_to_impl(ctx, td);
+                            release_state = d1::task_group_context::state::bound;
+                        }
+                        ITT_STACK_CREATE(ctx.my_itt_caller);
+                        ctx.my_state.store(release_state, std::memory_order_release);
+                    }
+                    spin_wait_while_eq(ctx.my_state, d1::task_group_context::state::locked);
                 }
-                release_state = d1::task_group_context::state::isolated;
-            } else {
-                bind_to_impl(ctx, td);
-                release_state = d1::task_group_context::state::bound;
+                __TBB_ASSERT(ctx.my_state.load(std::memory_order_relaxed)
+                                     != d1::task_group_context::state::created,
+                             nullptr);
+                __TBB_ASSERT(ctx.my_state.load(std::memory_order_relaxed)
+                                     != d1::task_group_context::state::locked,
+                             nullptr);
             }
-            ITT_STACK_CREATE(ctx.my_itt_caller);
-            ctx.my_state.store(release_state, std::memory_order_release);
-        }
-        spin_wait_while_eq(ctx.my_state, d1::task_group_context::state::locked);
-    }
-    __TBB_ASSERT(ctx.my_state.load(std::memory_order_relaxed) != d1::task_group_context::state::created, nullptr);
-    __TBB_ASSERT(ctx.my_state.load(std::memory_order_relaxed) != d1::task_group_context::state::locked, nullptr);
-}
-
-void task_group_context_impl::propagate_task_group_state(d1::task_group_context& ctx, std::atomic<std::uint32_t> d1::task_group_context::* mptr_state, d1::task_group_context& src, std::uint32_t new_state) {
-    __TBB_ASSERT(!is_poisoned(ctx.my_context_list), nullptr);
-    /*  1. if ((ctx.*mptr_state).load(std::memory_order_relaxed) == new_state):
+
+            void task_group_context_impl::propagate_task_group_state(
+                    d1::task_group_context& ctx,
+                    std::atomic<std::uint32_t> d1::task_group_context::*mptr_state,
+                    d1::task_group_context& src, std::uint32_t new_state) {
+                __TBB_ASSERT(!is_poisoned(ctx.my_context_list), nullptr);
+                /*  1. if ((ctx.*mptr_state).load(std::memory_order_relaxed) == new_state):
             Nothing to do, whether descending from "src" or not, so no need to scan.
             Hopefully this happens often thanks to earlier invocations.
             This optimization is enabled by LIFO order in the context lists:
@@ -212,74 +237,80 @@ void task_group_context_impl::propagate_task_group_state(d1::task_group_context&
             Such interference is probably not frequent enough to aim for optimisation by writing new_state again (to make the other thread back down).
             Letting the other thread prevail may also be fairer.
     */
-    if ((ctx.*mptr_state).load(std::memory_order_relaxed) != new_state && &ctx != &src) {
-        for (d1::task_group_context* ancestor = ctx.my_parent; ancestor != nullptr; ancestor = ancestor->my_parent) {
-            if (ancestor == &src) {
-                for (d1::task_group_context* c = &ctx; c != ancestor; c = c->my_parent)
-                    (c->*mptr_state).store(new_state, std::memory_order_relaxed);
-                break;
+                if ((ctx.*mptr_state).load(std::memory_order_relaxed) != new_state && &ctx != &src) {
+                    for (d1::task_group_context* ancestor = ctx.my_parent; ancestor != nullptr;
+                         ancestor = ancestor->my_parent) {
+                        if (ancestor == &src) {
+                            for (d1::task_group_context* c = &ctx; c != ancestor; c = c->my_parent)
+                                (c->*mptr_state).store(new_state, std::memory_order_relaxed);
+                            break;
+                        }
+                    }
+                }
             }
-        }
-    }
-}
-
-bool task_group_context_impl::cancel_group_execution(d1::task_group_context& ctx) {
-    __TBB_ASSERT(!is_poisoned(ctx.my_context_list), nullptr);
-    __TBB_ASSERT(ctx.my_cancellation_requested.load(std::memory_order_relaxed) <= 1, "The cancellation state can be either 0 or 1");
-    if (ctx.my_cancellation_requested.load(std::memory_order_relaxed) || ctx.my_cancellation_requested.exchange(1)) {
-        // This task group and any descendants have already been canceled.
-        // (A newly added descendant would inherit its parent's ctx.my_cancellation_requested,
-        // not missing out on any cancellation still being propagated, and a context cannot be uncanceled.)
-        return false;
-    }
-    governor::get_thread_data()->my_arena->my_threading_control->propagate_task_group_state(&d1::task_group_context::my_cancellation_requested, ctx, uint32_t(1));
-    return true;
-}
-
-bool task_group_context_impl::is_group_execution_cancelled(const d1::task_group_context& ctx) {
-    return ctx.my_cancellation_requested.load(std::memory_order_relaxed) != 0;
-}
-
-// IMPORTANT: It is assumed that this method is not used concurrently!
-void task_group_context_impl::reset(d1::task_group_context& ctx) {
-    __TBB_ASSERT(!is_poisoned(ctx.my_context_list), nullptr);
-    //! TODO: Add assertion that this context does not have children
-    // No fences are necessary since this context can be accessed from another thread
-    // only after stealing happened (which means necessary fences were used).
-
-    auto exception = ctx.my_exception.load(std::memory_order_relaxed);
-    if (exception) {
-        exception->destroy();
-        ctx.my_exception.store(nullptr, std::memory_order_relaxed);
-    }
-    ctx.my_cancellation_requested = 0;
-}
-
-// IMPORTANT: It is assumed that this method is not used concurrently!
-void task_group_context_impl::capture_fp_settings(d1::task_group_context& ctx) {
-    __TBB_ASSERT(!is_poisoned(ctx.my_context_list), nullptr);
-    //! TODO: Add assertion that this context does not have children
-    // No fences are necessary since this context can be accessed from another thread
-    // only after stealing happened (which means necessary fences were used).
-    d1::cpu_ctl_env* ctl = reinterpret_cast<d1::cpu_ctl_env*>(&ctx.my_cpu_ctl_env);
-    if (!ctx.my_traits.fp_settings) {
-        ctl = new (&ctx.my_cpu_ctl_env) d1::cpu_ctl_env;
-        ctx.my_traits.fp_settings = true;
-    }
-    ctl->get_env();
-}
-
-void task_group_context_impl::copy_fp_settings(d1::task_group_context& ctx, const d1::task_group_context& src) {
-    __TBB_ASSERT(!is_poisoned(ctx.my_context_list), nullptr);
-    __TBB_ASSERT(!ctx.my_traits.fp_settings, "The context already has FPU settings.");
-    __TBB_ASSERT(src.my_traits.fp_settings, "The source context does not have FPU settings.");
-
-    const d1::cpu_ctl_env* src_ctl = reinterpret_cast<const d1::cpu_ctl_env*>(&src.my_cpu_ctl_env);
-    new (&ctx.my_cpu_ctl_env) d1::cpu_ctl_env(*src_ctl);
-    ctx.my_traits.fp_settings = true;
-}
 
-/*
+            bool task_group_context_impl::cancel_group_execution(d1::task_group_context& ctx) {
+                __TBB_ASSERT(!is_poisoned(ctx.my_context_list), nullptr);
+                __TBB_ASSERT(ctx.my_cancellation_requested.load(std::memory_order_relaxed) <= 1,
+                             "The cancellation state can be either 0 or 1");
+                if (ctx.my_cancellation_requested.load(std::memory_order_relaxed)
+                    || ctx.my_cancellation_requested.exchange(1)) {
+                    // This task group and any descendants have already been canceled.
+                    // (A newly added descendant would inherit its parent's ctx.my_cancellation_requested,
+                    // not missing out on any cancellation still being propagated, and a context cannot be uncanceled.)
+                    return false;
+                }
+                governor::get_thread_data()->my_arena->my_threading_control->propagate_task_group_state(
+                        &d1::task_group_context::my_cancellation_requested, ctx, uint32_t(1));
+                return true;
+            }
+
+            bool task_group_context_impl::is_group_execution_cancelled(const d1::task_group_context& ctx) {
+                return ctx.my_cancellation_requested.load(std::memory_order_relaxed) != 0;
+            }
+
+            // IMPORTANT: It is assumed that this method is not used concurrently!
+            void task_group_context_impl::reset(d1::task_group_context& ctx) {
+                __TBB_ASSERT(!is_poisoned(ctx.my_context_list), nullptr);
+                //! TODO: Add assertion that this context does not have children
+                // No fences are necessary since this context can be accessed from another thread
+                // only after stealing happened (which means necessary fences were used).
+
+                auto exception = ctx.my_exception.load(std::memory_order_relaxed);
+                if (exception) {
+                    exception->destroy();
+                    ctx.my_exception.store(nullptr, std::memory_order_relaxed);
+                }
+                ctx.my_cancellation_requested = 0;
+            }
+
+            // IMPORTANT: It is assumed that this method is not used concurrently!
+            void task_group_context_impl::capture_fp_settings(d1::task_group_context& ctx) {
+                __TBB_ASSERT(!is_poisoned(ctx.my_context_list), nullptr);
+                //! TODO: Add assertion that this context does not have children
+                // No fences are necessary since this context can be accessed from another thread
+                // only after stealing happened (which means necessary fences were used).
+                d1::cpu_ctl_env* ctl = reinterpret_cast<d1::cpu_ctl_env*>(&ctx.my_cpu_ctl_env);
+                if (!ctx.my_traits.fp_settings) {
+                    ctl = new (&ctx.my_cpu_ctl_env) d1::cpu_ctl_env;
+                    ctx.my_traits.fp_settings = true;
+                }
+                ctl->get_env();
+            }
+
+            void task_group_context_impl::copy_fp_settings(d1::task_group_context& ctx,
+                                                           const d1::task_group_context& src) {
+                __TBB_ASSERT(!is_poisoned(ctx.my_context_list), nullptr);
+                __TBB_ASSERT(!ctx.my_traits.fp_settings, "The context already has FPU settings.");
+                __TBB_ASSERT(src.my_traits.fp_settings, "The source context does not have FPU settings.");
+
+                const d1::cpu_ctl_env* src_ctl
+                        = reinterpret_cast<const d1::cpu_ctl_env*>(&src.my_cpu_ctl_env);
+                new (&ctx.my_cpu_ctl_env) d1::cpu_ctl_env(*src_ctl);
+                ctx.my_traits.fp_settings = true;
+            }
+
+            /*
     Comments:
 
 1.  The premise of the cancellation support implementation is that cancellations are
@@ -333,26 +364,25 @@ void task_group_context_impl::copy_fp_settings(d1::task_group_context& ctx, cons
     However this version of the algorithm requires more analysis and verification.
 */
 
-void __TBB_EXPORTED_FUNC initialize(d1::task_group_context& ctx) {
-    task_group_context_impl::initialize(ctx);
-}
-void __TBB_EXPORTED_FUNC destroy(d1::task_group_context& ctx) {
-    task_group_context_impl::destroy(ctx);
-}
-void __TBB_EXPORTED_FUNC reset(d1::task_group_context& ctx) {
-    task_group_context_impl::reset(ctx);
-}
-bool __TBB_EXPORTED_FUNC cancel_group_execution(d1::task_group_context& ctx) {
-    return task_group_context_impl::cancel_group_execution(ctx);
-}
-bool __TBB_EXPORTED_FUNC is_group_execution_cancelled(d1::task_group_context& ctx) {
-    return task_group_context_impl::is_group_execution_cancelled(ctx);
-}
-void __TBB_EXPORTED_FUNC capture_fp_settings(d1::task_group_context& ctx) {
-    task_group_context_impl::capture_fp_settings(ctx);
-}
-
-} // namespace r1
-} // namespace detail
-} // namespace tbb
+            void __TBB_EXPORTED_FUNC initialize(d1::task_group_context& ctx) {
+                task_group_context_impl::initialize(ctx);
+            }
+            void __TBB_EXPORTED_FUNC destroy(d1::task_group_context& ctx) {
+                task_group_context_impl::destroy(ctx);
+            }
+            void __TBB_EXPORTED_FUNC reset(d1::task_group_context& ctx) {
+                task_group_context_impl::reset(ctx);
+            }
+            bool __TBB_EXPORTED_FUNC cancel_group_execution(d1::task_group_context& ctx) {
+                return task_group_context_impl::cancel_group_execution(ctx);
+            }
+            bool __TBB_EXPORTED_FUNC is_group_execution_cancelled(d1::task_group_context& ctx) {
+                return task_group_context_impl::is_group_execution_cancelled(ctx);
+            }
+            void __TBB_EXPORTED_FUNC capture_fp_settings(d1::task_group_context& ctx) {
+                task_group_context_impl::capture_fp_settings(ctx);
+            }
 
+        }// namespace r1
+    }    // namespace detail
+}// namespace tbb
diff --git a/external/tbb/src/tbb/tcm_adaptor.cpp b/external/tbb/src/tbb/tcm_adaptor.cpp
index 85ca125b..b13d8c31 100644
--- a/external/tbb/src/tbb/tcm_adaptor.cpp
+++ b/external/tbb/src/tbb/tcm_adaptor.cpp
@@ -18,19 +18,19 @@
 #include "oneapi/tbb/detail/_template_helpers.h"
 #include "oneapi/tbb/task_arena.h"
 
-#include "pm_client.h"
 #include "dynamic_link.h"
 #include "misc.h"
+#include "pm_client.h"
 #include "tcm.h"
 #include "tcm_adaptor.h"
 
 #include <iostream>
 
 namespace tbb {
-namespace detail {
-namespace r1 {
+    namespace detail {
+        namespace r1 {
 
-namespace {
+            namespace {
 #if __TBB_WEAK_SYMBOLS_PRESENT
 #pragma weak tcmConnect
 #pragma weak tcmDisconnect
@@ -45,32 +45,33 @@ namespace {
 #pragma weak tcmGetVersionInfo
 #endif /* __TBB_WEAK_SYMBOLS_PRESENT */
 
-tcm_result_t(*tcm_connect)(tcm_callback_t callback, tcm_client_id_t* client_id){nullptr};
-tcm_result_t(*tcm_disconnect)(tcm_client_id_t client_id){ nullptr };
-tcm_result_t(*tcm_request_permit)(tcm_client_id_t client_id, tcm_permit_request_t request,
-    void* callback_arg, tcm_permit_handle_t* permit_handle, tcm_permit_t* permit){nullptr};
-tcm_result_t(*tcm_get_permit_data)(tcm_permit_handle_t permit_handle, tcm_permit_t* permit){nullptr};
-tcm_result_t(*tcm_release_permit)(tcm_permit_handle_t permit){nullptr};
-tcm_result_t(*tcm_idle_permit)(tcm_permit_handle_t permit_handle){nullptr};
-tcm_result_t(*tcm_deactivate_permit)(tcm_permit_handle_t permit_handle){nullptr};
-tcm_result_t(*tcm_activate_permit)(tcm_permit_handle_t permit_handle){nullptr};
-tcm_result_t(*tcm_register_thread)(tcm_permit_handle_t permit_handle){nullptr};
-tcm_result_t(*tcm_unregister_thread)(){nullptr};
-tcm_result_t (*tcm_get_version_info)(char* buffer, uint32_t buffer_size){nullptr};
-
-static const dynamic_link_descriptor tcm_link_table[] = {
-    DLD(tcmConnect, tcm_connect),
-    DLD(tcmDisconnect, tcm_disconnect),
-    DLD(tcmRequestPermit, tcm_request_permit),
-    DLD(tcmGetPermitData, tcm_get_permit_data),
-    DLD(tcmReleasePermit, tcm_release_permit),
-    DLD(tcmIdlePermit, tcm_idle_permit),
-    DLD(tcmDeactivatePermit, tcm_deactivate_permit),
-    DLD(tcmActivatePermit, tcm_activate_permit),
-    DLD(tcmRegisterThread, tcm_register_thread),
-    DLD(tcmUnregisterThread, tcm_unregister_thread),
-    DLD(tcmGetVersionInfo, tcm_get_version_info)
-};
+                tcm_result_t (*tcm_connect)(tcm_callback_t callback, tcm_client_id_t* client_id) {nullptr};
+                tcm_result_t (*tcm_disconnect)(tcm_client_id_t client_id) {nullptr};
+                tcm_result_t (*tcm_request_permit)(tcm_client_id_t client_id, tcm_permit_request_t request,
+                                                   void* callback_arg, tcm_permit_handle_t* permit_handle,
+                                                   tcm_permit_t* permit) {nullptr};
+                tcm_result_t (*tcm_get_permit_data)(tcm_permit_handle_t permit_handle,
+                                                    tcm_permit_t* permit) {nullptr};
+                tcm_result_t (*tcm_release_permit)(tcm_permit_handle_t permit) {nullptr};
+                tcm_result_t (*tcm_idle_permit)(tcm_permit_handle_t permit_handle) {nullptr};
+                tcm_result_t (*tcm_deactivate_permit)(tcm_permit_handle_t permit_handle) {nullptr};
+                tcm_result_t (*tcm_activate_permit)(tcm_permit_handle_t permit_handle) {nullptr};
+                tcm_result_t (*tcm_register_thread)(tcm_permit_handle_t permit_handle) {nullptr};
+                tcm_result_t (*tcm_unregister_thread)() {nullptr};
+                tcm_result_t (*tcm_get_version_info)(char* buffer, uint32_t buffer_size) {nullptr};
+
+                static const dynamic_link_descriptor tcm_link_table[]
+                        = {DLD(tcmConnect, tcm_connect),
+                           DLD(tcmDisconnect, tcm_disconnect),
+                           DLD(tcmRequestPermit, tcm_request_permit),
+                           DLD(tcmGetPermitData, tcm_get_permit_data),
+                           DLD(tcmReleasePermit, tcm_release_permit),
+                           DLD(tcmIdlePermit, tcm_idle_permit),
+                           DLD(tcmDeactivatePermit, tcm_deactivate_permit),
+                           DLD(tcmActivatePermit, tcm_activate_permit),
+                           DLD(tcmRegisterThread, tcm_register_thread),
+                           DLD(tcmUnregisterThread, tcm_unregister_thread),
+                           DLD(tcmGetVersionInfo, tcm_get_version_info)};
 
 #if TBB_USE_DEBUG
 #define DEBUG_SUFFIX "_debug"
@@ -91,237 +92,229 @@ static const dynamic_link_descriptor tcm_link_table[] = {
 
 #define TCMLIB_NAME LIBRARY_PREFIX "tcm" DEBUG_SUFFIX LIBRARY_EXTENSION
 
-static bool tcm_functions_loaded{ false };
-}
-
-class tcm_client : public pm_client {
-    using tcm_client_mutex_type = d1::mutex;
-public:
-    tcm_client(tcm_adaptor& adaptor, arena& a) : pm_client(a), my_tcm_adaptor(adaptor) {}
-
-    ~tcm_client() {
-        if (my_permit_handle) {
-            __TBB_ASSERT(tcm_release_permit, nullptr);
-            auto res = tcm_release_permit(my_permit_handle);
-            __TBB_ASSERT_EX(res == TCM_RESULT_SUCCESS, nullptr);
-        }
-    }
-
-    int update_concurrency(uint32_t concurrency) {
-        return my_arena.update_concurrency(concurrency);
-    }
-
-    unsigned priority_level() {
-        return my_arena.priority_level();
-    }
-
-    tcm_permit_request_t& permit_request() {
-        return my_permit_request;
-    }
-
-    tcm_permit_handle_t& permit_handle() {
-        return my_permit_handle;
-    }
-
-    void actualize_permit() {
-        __TBB_ASSERT(tcm_get_permit_data, nullptr);
-        int delta{};
-        {
-            tcm_client_mutex_type::scoped_lock lock(my_permit_mutex);
-
-            uint32_t new_concurrency{};
-            tcm_permit_t new_permit{ &new_concurrency, nullptr, 1, TCM_PERMIT_STATE_VOID, {} };
-            auto res = tcm_get_permit_data(my_permit_handle, &new_permit);
-            __TBB_ASSERT_EX(res == TCM_RESULT_SUCCESS, nullptr);
-
-            // The permit has changed during the reading, so the callback will be invoked soon one more time and
-            // we can just skip this renegotiation iteration.
-            if (!new_permit.flags.stale) {
-                // If there is no other demand in TCM, the permit may still have granted concurrency but
-                // be in the deactivated state thus we enforce 0 allotment to preserve arena invariants.
-                delta = update_concurrency(new_permit.state != TCM_PERMIT_STATE_INACTIVE ? new_concurrency : 0);
+                static bool tcm_functions_loaded {false};
+            }// namespace
+
+            class tcm_client : public pm_client {
+                using tcm_client_mutex_type = d1::mutex;
+
+            public:
+                tcm_client(tcm_adaptor& adaptor, arena& a) : pm_client(a), my_tcm_adaptor(adaptor) {}
+
+                ~tcm_client() {
+                    if (my_permit_handle) {
+                        __TBB_ASSERT(tcm_release_permit, nullptr);
+                        auto res = tcm_release_permit(my_permit_handle);
+                        __TBB_ASSERT_EX(res == TCM_RESULT_SUCCESS, nullptr);
+                    }
+                }
+
+                int update_concurrency(uint32_t concurrency) {
+                    return my_arena.update_concurrency(concurrency);
+                }
+
+                unsigned priority_level() { return my_arena.priority_level(); }
+
+                tcm_permit_request_t& permit_request() { return my_permit_request; }
+
+                tcm_permit_handle_t& permit_handle() { return my_permit_handle; }
+
+                void actualize_permit() {
+                    __TBB_ASSERT(tcm_get_permit_data, nullptr);
+                    int delta {};
+                    {
+                        tcm_client_mutex_type::scoped_lock lock(my_permit_mutex);
+
+                        uint32_t new_concurrency {};
+                        tcm_permit_t new_permit {&new_concurrency, nullptr, 1, TCM_PERMIT_STATE_VOID, {}};
+                        auto res = tcm_get_permit_data(my_permit_handle, &new_permit);
+                        __TBB_ASSERT_EX(res == TCM_RESULT_SUCCESS, nullptr);
+
+                        // The permit has changed during the reading, so the callback will be invoked soon one more time and
+                        // we can just skip this renegotiation iteration.
+                        if (!new_permit.flags.stale) {
+                            // If there is no other demand in TCM, the permit may still have granted concurrency but
+                            // be in the deactivated state thus we enforce 0 allotment to preserve arena invariants.
+                            delta = update_concurrency(
+                                    new_permit.state != TCM_PERMIT_STATE_INACTIVE ? new_concurrency : 0);
+                        }
+                    }
+                    if (delta) { my_tcm_adaptor.notify_thread_request(delta); }
+                }
+
+                void request_permit(tcm_client_id_t client_id) {
+                    __TBB_ASSERT(tcm_request_permit, nullptr);
+
+                    my_permit_request.max_sw_threads = max_workers();
+                    my_permit_request.min_sw_threads
+                            = my_permit_request.max_sw_threads == 0 ? 0 : min_workers();
+
+                    if (my_permit_request.constraints_size > 0) {
+                        my_permit_request.cpu_constraints->min_concurrency = my_permit_request.min_sw_threads;
+                        my_permit_request.cpu_constraints->max_concurrency = my_permit_request.max_sw_threads;
+                    }
+
+                    __TBB_ASSERT(my_permit_request.max_sw_threads >= my_permit_request.min_sw_threads,
+                                 nullptr);
+
+                    tcm_result_t res = tcm_request_permit(client_id, my_permit_request, this,
+                                                          &my_permit_handle, nullptr);
+                    __TBB_ASSERT_EX(res == TCM_RESULT_SUCCESS, nullptr);
+                }
+
+                void deactivate_permit() {
+                    __TBB_ASSERT(tcm_deactivate_permit, nullptr);
+                    tcm_result_t res = tcm_deactivate_permit(my_permit_handle);
+                    __TBB_ASSERT_EX(res == TCM_RESULT_SUCCESS, nullptr);
+                }
+
+                void init(tcm_client_id_t client_id, d1::constraints& constraints) {
+                    __TBB_ASSERT(tcm_request_permit, nullptr);
+                    __TBB_ASSERT(tcm_deactivate_permit, nullptr);
+
+                    if (constraints.core_type != d1::task_arena::automatic
+                        || constraints.numa_id != d1::task_arena::automatic
+                        || constraints.max_threads_per_core != d1::task_arena::automatic) {
+                        my_permit_constraints.max_concurrency = constraints.max_concurrency;
+                        my_permit_constraints.min_concurrency = 0;
+                        my_permit_constraints.core_type_id = constraints.core_type;
+                        my_permit_constraints.numa_id = constraints.numa_id;
+                        my_permit_constraints.threads_per_core = constraints.max_threads_per_core;
+
+                        my_permit_request.cpu_constraints = &my_permit_constraints;
+                        my_permit_request.constraints_size = 1;
+                    }
+
+                    my_permit_request.min_sw_threads = 0;
+                    my_permit_request.max_sw_threads = 0;
+                    my_permit_request.flags.request_as_inactive = 1;
+
+                    tcm_result_t res = tcm_request_permit(client_id, my_permit_request, this,
+                                                          &my_permit_handle, nullptr);
+                    __TBB_ASSERT_EX(res == TCM_RESULT_SUCCESS, nullptr);
+
+                    my_permit_request.flags.request_as_inactive = 0;
+                }
+
+                void register_thread() override {
+                    __TBB_ASSERT(tcm_register_thread, nullptr);
+                    auto return_code = tcm_register_thread(my_permit_handle);
+                    __TBB_ASSERT_EX(return_code == TCM_RESULT_SUCCESS, nullptr);
+                }
+
+                void unregister_thread() override {
+                    __TBB_ASSERT(tcm_unregister_thread, nullptr);
+                    auto return_code = tcm_unregister_thread();
+                    __TBB_ASSERT_EX(return_code == TCM_RESULT_SUCCESS, nullptr);
+                }
+
+            private:
+                tcm_cpu_constraints_t my_permit_constraints = TCM_PERMIT_REQUEST_CONSTRAINTS_INITIALIZER;
+                tcm_permit_request_t my_permit_request = TCM_PERMIT_REQUEST_INITIALIZER;
+                tcm_permit_handle_t my_permit_handle {};
+                tcm_client_mutex_type my_permit_mutex;
+                tcm_adaptor& my_tcm_adaptor;
+            };
+
+            //------------------------------------------------------------------------
+            // tcm_adaptor_impl
+            //------------------------------------------------------------------------
+
+            struct tcm_adaptor_impl {
+                using demand_mutex_type = d1::mutex;
+                demand_mutex_type my_demand_mutex;
+                tcm_client_id_t client_id {};
+
+                tcm_adaptor_impl(tcm_client_id_t id) : client_id(id) {}
+            };
+
+            //------------------------------------------------------------------------
+            // tcm_adaptor
+            //------------------------------------------------------------------------
+
+            tcm_result_t renegotiation_callback(tcm_permit_handle_t, void* client_ptr, tcm_callback_flags_t) {
+                __TBB_ASSERT(client_ptr, nullptr);
+                static_cast<tcm_client*>(client_ptr)->actualize_permit();
+                return TCM_RESULT_SUCCESS;
+            }
+
+            void tcm_adaptor::initialize() {
+                tcm_functions_loaded
+                        = dynamic_link(TCMLIB_NAME, tcm_link_table, /* tcm_link_table size = */ 11);
+            }
+
+            bool tcm_adaptor::is_initialized() { return tcm_functions_loaded; }
+
+            void tcm_adaptor::print_version() {
+                if (is_initialized()) {
+                    __TBB_ASSERT(tcm_get_version_info, nullptr);
+                    char buffer[1024];
+                    tcm_get_version_info(buffer, 1024);
+                    std::fprintf(stderr, "%.*s", 1024, buffer);
+                }
+            }
+
+            tcm_adaptor::tcm_adaptor() {
+                __TBB_ASSERT(tcm_connect, nullptr);
+                tcm_client_id_t client_id {};
+                auto return_code = tcm_connect(renegotiation_callback, &client_id);
+                if (return_code == TCM_RESULT_SUCCESS) {
+                    my_impl = make_cache_aligned_unique<tcm_adaptor_impl>(client_id);
+                }
+            }
+
+            tcm_adaptor::~tcm_adaptor() {
+                if (my_impl) {
+                    __TBB_ASSERT(tcm_disconnect, nullptr);
+                    auto return_code = tcm_disconnect(my_impl->client_id);
+                    __TBB_ASSERT_EX(return_code == TCM_RESULT_SUCCESS, nullptr);
+                    my_impl = nullptr;
+                }
+            }
+
+            bool tcm_adaptor::is_connected() { return my_impl != nullptr; }
+
+            pm_client* tcm_adaptor::create_client(arena& a) {
+                return new (cache_aligned_allocate(sizeof(tcm_client))) tcm_client(*this, a);
             }
-        }
-        if (delta) {
-            my_tcm_adaptor.notify_thread_request(delta);
-        }
-    }
-
-    void request_permit(tcm_client_id_t client_id) {
-        __TBB_ASSERT(tcm_request_permit, nullptr);
-
-        my_permit_request.max_sw_threads = max_workers();
-        my_permit_request.min_sw_threads = my_permit_request.max_sw_threads == 0 ? 0 : min_workers();
-
-        if (my_permit_request.constraints_size > 0) {
-            my_permit_request.cpu_constraints->min_concurrency = my_permit_request.min_sw_threads;
-            my_permit_request.cpu_constraints->max_concurrency = my_permit_request.max_sw_threads;
-        }
-
-        __TBB_ASSERT(my_permit_request.max_sw_threads >= my_permit_request.min_sw_threads, nullptr);
-
-        tcm_result_t res = tcm_request_permit(client_id, my_permit_request, this, &my_permit_handle, nullptr);
-        __TBB_ASSERT_EX(res == TCM_RESULT_SUCCESS, nullptr);
-    }
-
-    void deactivate_permit() {
-         __TBB_ASSERT(tcm_deactivate_permit, nullptr);
-        tcm_result_t res = tcm_deactivate_permit(my_permit_handle);
-        __TBB_ASSERT_EX(res == TCM_RESULT_SUCCESS, nullptr);
-    }
-
-    void init(tcm_client_id_t client_id, d1::constraints& constraints) {
-        __TBB_ASSERT(tcm_request_permit, nullptr);
-        __TBB_ASSERT(tcm_deactivate_permit, nullptr);
-
-        if (constraints.core_type            != d1::task_arena::automatic ||
-            constraints.numa_id              != d1::task_arena::automatic ||
-            constraints.max_threads_per_core != d1::task_arena::automatic)
-        {
-            my_permit_constraints.max_concurrency = constraints.max_concurrency;
-            my_permit_constraints.min_concurrency = 0;
-            my_permit_constraints.core_type_id = constraints.core_type;
-            my_permit_constraints.numa_id = constraints.numa_id;
-            my_permit_constraints.threads_per_core = constraints.max_threads_per_core;
-
-            my_permit_request.cpu_constraints = &my_permit_constraints;
-            my_permit_request.constraints_size = 1;
-        }
-
-        my_permit_request.min_sw_threads = 0;
-        my_permit_request.max_sw_threads = 0;
-        my_permit_request.flags.request_as_inactive = 1;
-
-        tcm_result_t res = tcm_request_permit(client_id, my_permit_request, this, &my_permit_handle, nullptr);
-        __TBB_ASSERT_EX(res == TCM_RESULT_SUCCESS, nullptr);
-
-        my_permit_request.flags.request_as_inactive = 0;
-    }
-
-    void register_thread() override {
-        __TBB_ASSERT(tcm_register_thread, nullptr);
-        auto return_code = tcm_register_thread(my_permit_handle);
-        __TBB_ASSERT_EX(return_code == TCM_RESULT_SUCCESS, nullptr);
-    }
-
-    void unregister_thread() override {
-        __TBB_ASSERT(tcm_unregister_thread, nullptr);
-        auto return_code = tcm_unregister_thread();
-        __TBB_ASSERT_EX(return_code == TCM_RESULT_SUCCESS, nullptr);
-    }
-
-private:
-    tcm_cpu_constraints_t my_permit_constraints = TCM_PERMIT_REQUEST_CONSTRAINTS_INITIALIZER;
-    tcm_permit_request_t my_permit_request = TCM_PERMIT_REQUEST_INITIALIZER;
-    tcm_permit_handle_t my_permit_handle{};
-    tcm_client_mutex_type my_permit_mutex;
-    tcm_adaptor& my_tcm_adaptor;
-};
-
-//------------------------------------------------------------------------
-// tcm_adaptor_impl
-//------------------------------------------------------------------------
-
-struct tcm_adaptor_impl {
-    using demand_mutex_type = d1::mutex;
-    demand_mutex_type my_demand_mutex;
-    tcm_client_id_t client_id{};
-
-    tcm_adaptor_impl(tcm_client_id_t id) : client_id(id)
-    {}
-};
-
-//------------------------------------------------------------------------
-// tcm_adaptor
-//------------------------------------------------------------------------
-
-tcm_result_t renegotiation_callback(tcm_permit_handle_t, void* client_ptr, tcm_callback_flags_t) {
-    __TBB_ASSERT(client_ptr, nullptr);
-    static_cast<tcm_client*>(client_ptr)->actualize_permit();
-    return TCM_RESULT_SUCCESS;
-}
-
-void tcm_adaptor::initialize() {
-    tcm_functions_loaded = dynamic_link(TCMLIB_NAME, tcm_link_table, /* tcm_link_table size = */ 11);
-}
-
-bool tcm_adaptor::is_initialized() {
-    return tcm_functions_loaded;
-}
-
-void tcm_adaptor::print_version() {
-    if (is_initialized()) {
-        __TBB_ASSERT(tcm_get_version_info, nullptr);
-        char buffer[1024];
-        tcm_get_version_info(buffer, 1024);
-        std::fprintf(stderr, "%.*s", 1024, buffer);
-    }
-}
-
-tcm_adaptor::tcm_adaptor() {
-    __TBB_ASSERT(tcm_connect, nullptr);
-    tcm_client_id_t client_id{};
-    auto return_code = tcm_connect(renegotiation_callback, &client_id);
-    if (return_code == TCM_RESULT_SUCCESS) {
-        my_impl = make_cache_aligned_unique<tcm_adaptor_impl>(client_id);
-    }
-}
-
-tcm_adaptor::~tcm_adaptor() {
-    if (my_impl) {
-        __TBB_ASSERT(tcm_disconnect, nullptr);
-        auto return_code = tcm_disconnect(my_impl->client_id);
-        __TBB_ASSERT_EX(return_code == TCM_RESULT_SUCCESS, nullptr);
-        my_impl = nullptr;
-    }
-}
-
-bool tcm_adaptor::is_connected() {
-    return my_impl != nullptr;
-}
-
-pm_client* tcm_adaptor::create_client(arena& a) {
-    return new (cache_aligned_allocate(sizeof(tcm_client))) tcm_client(*this, a);
-}
-
-void tcm_adaptor::register_client(pm_client* c, d1::constraints& constraints) {
-    static_cast<tcm_client*>(c)->init(my_impl->client_id, constraints);
-}
-
-void tcm_adaptor::unregister_and_destroy_client(pm_client& c) {
-    auto& client = static_cast<tcm_client&>(c);
-
-    {
-        tcm_adaptor_impl::demand_mutex_type::scoped_lock lock(my_impl->my_demand_mutex);
-        client.~tcm_client();
-    }
-    cache_aligned_deallocate(&client);
-}
-
-void tcm_adaptor::set_active_num_workers(int) {}
-
-
-void tcm_adaptor::adjust_demand(pm_client& c, int mandatory_delta, int workers_delta) {
-    __TBB_ASSERT(-1 <= mandatory_delta && mandatory_delta <= 1, nullptr);
-
-    auto& client = static_cast<tcm_client&>(c);
-    {
-        tcm_adaptor_impl::demand_mutex_type::scoped_lock lock(my_impl->my_demand_mutex);
-
-        // Update client's state
-        workers_delta = client.update_request(mandatory_delta, workers_delta);
-        if (workers_delta == 0) return;
-
-        if (client.max_workers() == 0) {
-            client.deactivate_permit();
-        } else {
-            client.request_permit(my_impl->client_id);
-        }
-    }
-
-    client.actualize_permit();
-}
-
-} // namespace r1
-} // namespace detail
-} // namespace tbb
+
+            void tcm_adaptor::register_client(pm_client* c, d1::constraints& constraints) {
+                static_cast<tcm_client*>(c)->init(my_impl->client_id, constraints);
+            }
+
+            void tcm_adaptor::unregister_and_destroy_client(pm_client& c) {
+                auto& client = static_cast<tcm_client&>(c);
+
+                {
+                    tcm_adaptor_impl::demand_mutex_type::scoped_lock lock(my_impl->my_demand_mutex);
+                    client.~tcm_client();
+                }
+                cache_aligned_deallocate(&client);
+            }
+
+            void tcm_adaptor::set_active_num_workers(int) {}
+
+            void tcm_adaptor::adjust_demand(pm_client& c, int mandatory_delta, int workers_delta) {
+                __TBB_ASSERT(-1 <= mandatory_delta && mandatory_delta <= 1, nullptr);
+
+                auto& client = static_cast<tcm_client&>(c);
+                {
+                    tcm_adaptor_impl::demand_mutex_type::scoped_lock lock(my_impl->my_demand_mutex);
+
+                    // Update client's state
+                    workers_delta = client.update_request(mandatory_delta, workers_delta);
+                    if (workers_delta == 0) return;
+
+                    if (client.max_workers() == 0) {
+                        client.deactivate_permit();
+                    } else {
+                        client.request_permit(my_impl->client_id);
+                    }
+                }
+
+                client.actualize_permit();
+            }
+
+        }// namespace r1
+    }    // namespace detail
+}// namespace tbb
diff --git a/external/tbb/src/tbb/thread_dispatcher.cpp b/external/tbb/src/tbb/thread_dispatcher.cpp
index 69a108d6..ea85cb07 100644
--- a/external/tbb/src/tbb/thread_dispatcher.cpp
+++ b/external/tbb/src/tbb/thread_dispatcher.cpp
@@ -18,219 +18,195 @@
 #include "threading_control.h"
 
 namespace tbb {
-namespace detail {
-namespace r1 {
-
-thread_dispatcher::thread_dispatcher(threading_control& tc, unsigned hard_limit, std::size_t stack_size)
-    : my_threading_control(tc)
-    , my_num_workers_hard_limit(hard_limit)
-    , my_stack_size(stack_size)
-{
-    my_server = governor::create_rml_server( *this );
-    __TBB_ASSERT( my_server, "Failed to create RML server" );
-}
-
-thread_dispatcher::~thread_dispatcher() {
-    poison_pointer(my_server);
-}
-
-thread_dispatcher_client* thread_dispatcher::select_next_client(thread_dispatcher_client* hint) {
-    unsigned next_client_priority_level = num_priority_levels;
-    if (hint) {
-        next_client_priority_level = hint->priority_level();
-    }
-
-    for (unsigned idx = 0; idx < next_client_priority_level; ++idx) {
-        if (!my_client_list[idx].empty()) {
-            return &*my_client_list[idx].begin();
-        }
-    }
-
-    return hint;
-}
-
-thread_dispatcher_client* thread_dispatcher::create_client(arena& a) {
-    return new (cache_aligned_allocate(sizeof(thread_dispatcher_client))) thread_dispatcher_client(a, my_clients_aba_epoch);
-}
-
-
-void thread_dispatcher::register_client(thread_dispatcher_client* client) {
-    client_list_mutex_type::scoped_lock lock(my_list_mutex);
-    insert_client(*client);
-}
-
-bool thread_dispatcher::try_unregister_client(thread_dispatcher_client* client, std::uint64_t aba_epoch, unsigned priority) {
-    __TBB_ASSERT(client, nullptr);
-    // we hold reference to the server, so market cannot be destroyed at any moment here
-    __TBB_ASSERT(!is_poisoned(my_server), nullptr);
-    my_list_mutex.lock();
-    for (auto& it : my_client_list[priority]) {
-        if (client == &it) {
-            if (it.get_aba_epoch() == aba_epoch) {
-                // Client is alive
-                // Acquire my_references to sync with threads that just left the arena
-                // Pay attention that references should be read before workers_requested because
-                // if references is no zero some other thread might call adjust_demand and lead to
-                // a race over workers_requested
-                if (!client->references() && !client->has_request()) {
-                    // Client is abandoned. Destroy it.
-                    remove_client(*client);
-                    ++my_clients_aba_epoch;
-
-                    my_list_mutex.unlock();
-                    destroy_client(client);
-
-                    return true;
+    namespace detail {
+        namespace r1 {
+
+            thread_dispatcher::thread_dispatcher(threading_control& tc, unsigned hard_limit,
+                                                 std::size_t stack_size)
+                : my_threading_control(tc), my_num_workers_hard_limit(hard_limit), my_stack_size(stack_size) {
+                my_server = governor::create_rml_server(*this);
+                __TBB_ASSERT(my_server, "Failed to create RML server");
+            }
+
+            thread_dispatcher::~thread_dispatcher() { poison_pointer(my_server); }
+
+            thread_dispatcher_client* thread_dispatcher::select_next_client(thread_dispatcher_client* hint) {
+                unsigned next_client_priority_level = num_priority_levels;
+                if (hint) { next_client_priority_level = hint->priority_level(); }
+
+                for (unsigned idx = 0; idx < next_client_priority_level; ++idx) {
+                    if (!my_client_list[idx].empty()) { return &*my_client_list[idx].begin(); }
+                }
+
+                return hint;
+            }
+
+            thread_dispatcher_client* thread_dispatcher::create_client(arena& a) {
+                return new (cache_aligned_allocate(sizeof(thread_dispatcher_client)))
+                        thread_dispatcher_client(a, my_clients_aba_epoch);
+            }
+
+            void thread_dispatcher::register_client(thread_dispatcher_client* client) {
+                client_list_mutex_type::scoped_lock lock(my_list_mutex);
+                insert_client(*client);
+            }
+
+            bool thread_dispatcher::try_unregister_client(thread_dispatcher_client* client,
+                                                          std::uint64_t aba_epoch, unsigned priority) {
+                __TBB_ASSERT(client, nullptr);
+                // we hold reference to the server, so market cannot be destroyed at any moment here
+                __TBB_ASSERT(!is_poisoned(my_server), nullptr);
+                my_list_mutex.lock();
+                for (auto& it : my_client_list[priority]) {
+                    if (client == &it) {
+                        if (it.get_aba_epoch() == aba_epoch) {
+                            // Client is alive
+                            // Acquire my_references to sync with threads that just left the arena
+                            // Pay attention that references should be read before workers_requested because
+                            // if references is no zero some other thread might call adjust_demand and lead to
+                            // a race over workers_requested
+                            if (!client->references() && !client->has_request()) {
+                                // Client is abandoned. Destroy it.
+                                remove_client(*client);
+                                ++my_clients_aba_epoch;
+
+                                my_list_mutex.unlock();
+                                destroy_client(client);
+
+                                return true;
+                            }
+                        }
+                        break;
+                    }
+                }
+                my_list_mutex.unlock();
+                return false;
+            }
+
+            void thread_dispatcher::destroy_client(thread_dispatcher_client* client) {
+                client->~thread_dispatcher_client();
+                cache_aligned_deallocate(client);
+            }
+
+            // Should be called under lock
+            void thread_dispatcher::insert_client(thread_dispatcher_client& client) {
+                __TBB_ASSERT(client.priority_level() < num_priority_levels, nullptr);
+                my_client_list[client.priority_level()].push_front(client);
+
+                __TBB_ASSERT(!my_next_client || my_next_client->priority_level() < num_priority_levels,
+                             nullptr);
+                my_next_client = select_next_client(my_next_client);
+            }
+
+            // Should be called under lock
+            void thread_dispatcher::remove_client(thread_dispatcher_client& client) {
+                __TBB_ASSERT(client.priority_level() < num_priority_levels, nullptr);
+                my_client_list[client.priority_level()].remove(client);
+
+                if (my_next_client == &client) { my_next_client = nullptr; }
+                my_next_client = select_next_client(my_next_client);
+            }
+
+            bool thread_dispatcher::is_client_alive(thread_dispatcher_client* client) {
+                if (!client) { return false; }
+
+                // Still cannot access internals of the client since the object itself might be destroyed.
+                for (auto& priority_list : my_client_list) {
+                    for (auto& c : priority_list) {
+                        if (client == &c) { return true; }
+                    }
+                }
+                return false;
+            }
+
+            thread_dispatcher_client* thread_dispatcher::client_in_need(client_list_type* clients,
+                                                                        thread_dispatcher_client* hint) {
+                // TODO: make sure client with higher priority returned only if there are available slots in it.
+                hint = select_next_client(hint);
+                if (!hint) { return nullptr; }
+
+                client_list_type::iterator it = hint;
+                unsigned curr_priority_level = hint->priority_level();
+                __TBB_ASSERT(it != clients[curr_priority_level].end(), nullptr);
+                do {
+                    thread_dispatcher_client& t = *it;
+                    if (++it == clients[curr_priority_level].end()) {
+                        do {
+                            ++curr_priority_level %= num_priority_levels;
+                        } while (clients[curr_priority_level].empty());
+                        it = clients[curr_priority_level].begin();
+                    }
+                    if (t.try_join()) { return &t; }
+                } while (it != hint);
+                return nullptr;
+            }
+
+            thread_dispatcher_client* thread_dispatcher::client_in_need(thread_dispatcher_client* prev) {
+                client_list_mutex_type::scoped_lock lock(my_list_mutex, /*is_writer=*/false);
+                if (is_client_alive(prev)) { return client_in_need(my_client_list, prev); }
+                return client_in_need(my_client_list, my_next_client);
+            }
+
+            bool thread_dispatcher::is_any_client_in_need() {
+                client_list_mutex_type::scoped_lock lock(my_list_mutex, /*is_writer=*/false);
+                for (auto& priority_list : my_client_list) {
+                    for (auto& client : priority_list) {
+                        if (client.is_joinable()) { return true; }
+                    }
                 }
+                return false;
+            }
+
+            void thread_dispatcher::adjust_job_count_estimate(int delta) {
+                my_server->adjust_job_count_estimate(delta);
+            }
+
+            void thread_dispatcher::release(bool blocking_terminate) {
+                my_join_workers = blocking_terminate;
+                my_server->request_close_connection();
             }
-            break;
-        }
-    }
-    my_list_mutex.unlock();
-    return false;
-}
-
-void thread_dispatcher::destroy_client(thread_dispatcher_client* client) {
-    client->~thread_dispatcher_client();
-    cache_aligned_deallocate(client);
-}
-
-// Should be called under lock
-void thread_dispatcher::insert_client(thread_dispatcher_client& client) {
-    __TBB_ASSERT(client.priority_level() < num_priority_levels, nullptr);
-    my_client_list[client.priority_level()].push_front(client);
-
-    __TBB_ASSERT(!my_next_client || my_next_client->priority_level() < num_priority_levels, nullptr);
-    my_next_client = select_next_client(my_next_client);
-}
-
-// Should be called under lock
-void thread_dispatcher::remove_client(thread_dispatcher_client& client) {
-    __TBB_ASSERT(client.priority_level() < num_priority_levels, nullptr);
-    my_client_list[client.priority_level()].remove(client);
-
-    if (my_next_client == &client) {
-        my_next_client = nullptr;
-    }
-    my_next_client = select_next_client(my_next_client);
-}
-
-bool thread_dispatcher::is_client_alive(thread_dispatcher_client* client) {
-    if (!client) {
-        return false;
-    }
-
-    // Still cannot access internals of the client since the object itself might be destroyed.
-    for (auto& priority_list : my_client_list) {
-        for (auto& c : priority_list) {
-            if (client == &c) {
-                return true;
-            }
-        }
-    }
-    return false;
-}
-
-thread_dispatcher_client* thread_dispatcher::client_in_need(client_list_type* clients, thread_dispatcher_client* hint) {
-    // TODO: make sure client with higher priority returned only if there are available slots in it.
-    hint = select_next_client(hint);
-    if (!hint) {
-        return nullptr;
-    }
-
-    client_list_type::iterator it = hint;
-    unsigned curr_priority_level = hint->priority_level();
-    __TBB_ASSERT(it != clients[curr_priority_level].end(), nullptr);
-    do {
-        thread_dispatcher_client& t = *it;
-        if (++it == clients[curr_priority_level].end()) {
-            do {
-                ++curr_priority_level %= num_priority_levels;
-            } while (clients[curr_priority_level].empty());
-            it = clients[curr_priority_level].begin();
-        }
-        if (t.try_join()) {
-            return &t;
-        }
-    } while (it != hint);
-    return nullptr;
-}
-
-thread_dispatcher_client* thread_dispatcher::client_in_need(thread_dispatcher_client* prev) {
-    client_list_mutex_type::scoped_lock lock(my_list_mutex, /*is_writer=*/false);
-    if (is_client_alive(prev)) {
-        return client_in_need(my_client_list, prev);
-    }
-    return client_in_need(my_client_list, my_next_client);
-}
-
-bool thread_dispatcher::is_any_client_in_need() {
-    client_list_mutex_type::scoped_lock lock(my_list_mutex, /*is_writer=*/false);
-    for (auto& priority_list : my_client_list) {
-        for (auto& client : priority_list) {
-            if (client.is_joinable()) {
-                return true;
-            }
-        }
-    }
-    return false;
-}
-
-void thread_dispatcher::adjust_job_count_estimate(int delta) {
-    my_server->adjust_job_count_estimate(delta);
-}
-
-void thread_dispatcher::release(bool blocking_terminate) {
-    my_join_workers = blocking_terminate;
-    my_server->request_close_connection();
-}
-
-void thread_dispatcher::process(job& j) {
-    thread_data& td = static_cast<thread_data&>(j);
-    // td.my_last_client can be dead. Don't access it until client_in_need is called
-    thread_dispatcher_client* client = td.my_last_client;
-    for (int i = 0; i < 2; ++i) {
-        while ((client = client_in_need(client)) ) {
-            td.my_last_client = client;
-            client->process(td);
-        }
-        // Workers leave thread_dispatcher because there is no client in need. It can happen earlier than
-        // adjust_job_count_estimate() decreases my_slack and RML can put this thread to sleep.
-        // It might result in a busy-loop checking for my_slack<0 and calling this method instantly.
-        // the yield refines this spinning.
-        if ( !i ) {
-            yield();
-        }
-    }
-}
-
-
-//! Used when RML asks for join mode during workers termination.
-bool thread_dispatcher::must_join_workers() const { return my_join_workers; }
-
-//! Returns the requested stack size of worker threads.
-std::size_t thread_dispatcher::worker_stack_size() const { return my_stack_size; }
-
-void thread_dispatcher::acknowledge_close_connection() {
-    my_threading_control.destroy();
-}
-
-::rml::job* thread_dispatcher::create_one_job() {
-    unsigned short index = ++my_first_unused_worker_idx;
-    __TBB_ASSERT(index > 0, nullptr);
-    ITT_THREAD_SET_NAME(_T("TBB Worker Thread"));
-    // index serves as a hint decreasing conflicts between workers when they migrate between arenas
-    thread_data* td = new (cache_aligned_allocate(sizeof(thread_data))) thread_data{ index, true };
-    __TBB_ASSERT(index <= my_num_workers_hard_limit, nullptr);
-    my_threading_control.register_thread(*td);
-    return td;
-}
-
-void thread_dispatcher::cleanup(job& j) {
-    my_threading_control.unregister_thread(static_cast<thread_data&>(j));
-    governor::auto_terminate(&j);
-}
-
-} // namespace r1
-} // namespace detail
-} // namespace tbb
+
+            void thread_dispatcher::process(job& j) {
+                thread_data& td = static_cast<thread_data&>(j);
+                // td.my_last_client can be dead. Don't access it until client_in_need is called
+                thread_dispatcher_client* client = td.my_last_client;
+                for (int i = 0; i < 2; ++i) {
+                    while ((client = client_in_need(client))) {
+                        td.my_last_client = client;
+                        client->process(td);
+                    }
+                    // Workers leave thread_dispatcher because there is no client in need. It can happen earlier than
+                    // adjust_job_count_estimate() decreases my_slack and RML can put this thread to sleep.
+                    // It might result in a busy-loop checking for my_slack<0 and calling this method instantly.
+                    // the yield refines this spinning.
+                    if (!i) { yield(); }
+                }
+            }
+
+            //! Used when RML asks for join mode during workers termination.
+            bool thread_dispatcher::must_join_workers() const { return my_join_workers; }
+
+            //! Returns the requested stack size of worker threads.
+            std::size_t thread_dispatcher::worker_stack_size() const { return my_stack_size; }
+
+            void thread_dispatcher::acknowledge_close_connection() { my_threading_control.destroy(); }
+
+            ::rml::job* thread_dispatcher::create_one_job() {
+                unsigned short index = ++my_first_unused_worker_idx;
+                __TBB_ASSERT(index > 0, nullptr);
+                ITT_THREAD_SET_NAME(_T("TBB Worker Thread"));
+                // index serves as a hint decreasing conflicts between workers when they migrate between arenas
+                thread_data* td = new (cache_aligned_allocate(sizeof(thread_data))) thread_data {index, true};
+                __TBB_ASSERT(index <= my_num_workers_hard_limit, nullptr);
+                my_threading_control.register_thread(*td);
+                return td;
+            }
+
+            void thread_dispatcher::cleanup(job& j) {
+                my_threading_control.unregister_thread(static_cast<thread_data&>(j));
+                governor::auto_terminate(&j);
+            }
+
+        }// namespace r1
+    }    // namespace detail
+}// namespace tbb
diff --git a/external/tbb/src/tbb/thread_request_serializer.cpp b/external/tbb/src/tbb/thread_request_serializer.cpp
index 41cf51b0..a3f05e9a 100644
--- a/external/tbb/src/tbb/thread_request_serializer.cpp
+++ b/external/tbb/src/tbb/thread_request_serializer.cpp
@@ -14,126 +14,133 @@
     limitations under the License.
 */
 
-#include "misc.h"
 #include "thread_request_serializer.h"
+#include "misc.h"
 
 namespace tbb {
-namespace detail {
-namespace r1 {
-
-thread_request_serializer::thread_request_serializer(thread_dispatcher& td, int soft_limit)
-    : my_thread_dispatcher(td)
-    , my_soft_limit(soft_limit)
-{}
-
-void thread_request_serializer::update(int delta) {
-    constexpr std::uint64_t delta_mask = (pending_delta_base << 1) - 1;
-    constexpr std::uint64_t counter_value = delta_mask + 1;
-
-    int prev_pending_delta = my_pending_delta.fetch_add(counter_value + delta);
-
-    // There is a pseudo request aggregator, so only thread that see pending_delta_base in my_pending_delta
-    // Will enter to critical section and call adjust_job_count_estimate
-    if (prev_pending_delta == pending_delta_base) {
-        delta = int(my_pending_delta.exchange(pending_delta_base) & delta_mask) - int(pending_delta_base);
-        mutex_type::scoped_lock lock(my_mutex);
-        my_total_request.store(my_total_request.load(std::memory_order_relaxed) + delta, std::memory_order_relaxed);
-        delta = limit_delta(delta, my_soft_limit, my_total_request.load(std::memory_order_relaxed));
-        my_thread_dispatcher.adjust_job_count_estimate(delta);
-    }
-}
-
-void thread_request_serializer::set_active_num_workers(int soft_limit) {
-    mutex_type::scoped_lock lock(my_mutex);
-    int delta = soft_limit - my_soft_limit;
-    delta = limit_delta(delta, my_total_request.load(std::memory_order_relaxed), soft_limit);
-    my_thread_dispatcher.adjust_job_count_estimate(delta);
-    my_soft_limit = soft_limit;
-}
-
-int thread_request_serializer::limit_delta(int delta, int limit, int new_value) {
-    // This method can be described with such pseudocode:
-    // bool above_limit = prev_value >= limit && new_value >= limit;
-    // bool below_limit = prev_value <= limit && new_value <= limit;
-    // enum request_type { ABOVE_LIMIT, CROSS_LIMIT, BELOW_LIMIT };
-    // request = above_limit ? ABOVE_LIMIT : below_limit ? BELOW_LIMIT : CROSS_LIMIT;
-
-    // switch (request) {
-    // case ABOVE_LIMIT:
-    //     delta = 0;
-    // case CROSS_LIMIT:
-    //     delta = delta > 0 ? limit - prev_value : new_value - limit;
-    // case BELOW_LIMIT:
-    //     // No changes to delta
-    // }
-
-   int prev_value = new_value - delta;
-
-    // actual new_value and prev_value cannot exceed the limit
-    new_value = min(limit, new_value);
-    prev_value = min(limit, prev_value);
-    return new_value - prev_value;
-}
-
-
-thread_request_serializer_proxy::thread_request_serializer_proxy(thread_dispatcher& td, int soft_limit) : my_serializer(td, soft_limit)
-{}
-
-void thread_request_serializer_proxy::register_mandatory_request(int mandatory_delta) {
-    if (mandatory_delta != 0) {
-        mutex_type::scoped_lock lock(my_mutex, /* is_write = */ false);
-        int prev_value = my_num_mandatory_requests.fetch_add(mandatory_delta);
-
-        const bool should_try_enable = mandatory_delta > 0 && prev_value == 0;
-        const bool should_try_disable = mandatory_delta < 0 && prev_value == 1;
-
-        if (should_try_enable) {
-            enable_mandatory_concurrency(lock);
-        } else if (should_try_disable) {
-            disable_mandatory_concurrency(lock);
-        }
-    }
-}
-
-void thread_request_serializer_proxy::set_active_num_workers(int soft_limit) {
-    mutex_type::scoped_lock lock(my_mutex, /* is_write = */ true);
-
-    if (soft_limit != 0) {
-        my_is_mandatory_concurrency_enabled = false;
-    } else if (my_num_mandatory_requests > 0) {
-        my_is_mandatory_concurrency_enabled = true;
-        soft_limit = 1;
-    }
-
-    my_serializer.set_active_num_workers(soft_limit);
-}
-
-int thread_request_serializer_proxy::num_workers_requested() { return my_serializer.num_workers_requested(); }
-
-void thread_request_serializer_proxy::update(int delta) { my_serializer.update(delta); }
-
-void thread_request_serializer_proxy::enable_mandatory_concurrency(mutex_type::scoped_lock& lock) {
-    lock.upgrade_to_writer();
-    bool still_should_enable = my_num_mandatory_requests.load(std::memory_order_relaxed) > 0 &&
-            !my_is_mandatory_concurrency_enabled && my_serializer.is_no_workers_avaliable();
-
-    if (still_should_enable) {
-        my_is_mandatory_concurrency_enabled = true;
-        my_serializer.set_active_num_workers(1);
-    }
-}
-
-void thread_request_serializer_proxy::disable_mandatory_concurrency(mutex_type::scoped_lock& lock) {
-    lock.upgrade_to_writer();
-    bool still_should_disable = my_num_mandatory_requests.load(std::memory_order_relaxed) <= 0 &&
-            my_is_mandatory_concurrency_enabled && !my_serializer.is_no_workers_avaliable();
-
-    if (still_should_disable) {
-        my_is_mandatory_concurrency_enabled = false;
-        my_serializer.set_active_num_workers(0);
-    }
-}
-
-} // r1
-} // detail
-} // tbb
+    namespace detail {
+        namespace r1 {
+
+            thread_request_serializer::thread_request_serializer(thread_dispatcher& td, int soft_limit)
+                : my_thread_dispatcher(td), my_soft_limit(soft_limit) {}
+
+            void thread_request_serializer::update(int delta) {
+                constexpr std::uint64_t delta_mask = (pending_delta_base << 1) - 1;
+                constexpr std::uint64_t counter_value = delta_mask + 1;
+
+                int prev_pending_delta = my_pending_delta.fetch_add(counter_value + delta);
+
+                // There is a pseudo request aggregator, so only thread that see pending_delta_base in my_pending_delta
+                // Will enter to critical section and call adjust_job_count_estimate
+                if (prev_pending_delta == pending_delta_base) {
+                    delta = int(my_pending_delta.exchange(pending_delta_base) & delta_mask)
+                            - int(pending_delta_base);
+                    mutex_type::scoped_lock lock(my_mutex);
+                    my_total_request.store(my_total_request.load(std::memory_order_relaxed) + delta,
+                                           std::memory_order_relaxed);
+                    delta = limit_delta(delta, my_soft_limit,
+                                        my_total_request.load(std::memory_order_relaxed));
+                    my_thread_dispatcher.adjust_job_count_estimate(delta);
+                }
+            }
+
+            void thread_request_serializer::set_active_num_workers(int soft_limit) {
+                mutex_type::scoped_lock lock(my_mutex);
+                int delta = soft_limit - my_soft_limit;
+                delta = limit_delta(delta, my_total_request.load(std::memory_order_relaxed), soft_limit);
+                my_thread_dispatcher.adjust_job_count_estimate(delta);
+                my_soft_limit = soft_limit;
+            }
+
+            int thread_request_serializer::limit_delta(int delta, int limit, int new_value) {
+                // This method can be described with such pseudocode:
+                // bool above_limit = prev_value >= limit && new_value >= limit;
+                // bool below_limit = prev_value <= limit && new_value <= limit;
+                // enum request_type { ABOVE_LIMIT, CROSS_LIMIT, BELOW_LIMIT };
+                // request = above_limit ? ABOVE_LIMIT : below_limit ? BELOW_LIMIT : CROSS_LIMIT;
+
+                // switch (request) {
+                // case ABOVE_LIMIT:
+                //     delta = 0;
+                // case CROSS_LIMIT:
+                //     delta = delta > 0 ? limit - prev_value : new_value - limit;
+                // case BELOW_LIMIT:
+                //     // No changes to delta
+                // }
+
+                int prev_value = new_value - delta;
+
+                // actual new_value and prev_value cannot exceed the limit
+                new_value = min(limit, new_value);
+                prev_value = min(limit, prev_value);
+                return new_value - prev_value;
+            }
+
+            thread_request_serializer_proxy::thread_request_serializer_proxy(thread_dispatcher& td,
+                                                                             int soft_limit)
+                : my_serializer(td, soft_limit) {}
+
+            void thread_request_serializer_proxy::register_mandatory_request(int mandatory_delta) {
+                if (mandatory_delta != 0) {
+                    mutex_type::scoped_lock lock(my_mutex, /* is_write = */ false);
+                    int prev_value = my_num_mandatory_requests.fetch_add(mandatory_delta);
+
+                    const bool should_try_enable = mandatory_delta > 0 && prev_value == 0;
+                    const bool should_try_disable = mandatory_delta < 0 && prev_value == 1;
+
+                    if (should_try_enable) {
+                        enable_mandatory_concurrency(lock);
+                    } else if (should_try_disable) {
+                        disable_mandatory_concurrency(lock);
+                    }
+                }
+            }
+
+            void thread_request_serializer_proxy::set_active_num_workers(int soft_limit) {
+                mutex_type::scoped_lock lock(my_mutex, /* is_write = */ true);
+
+                if (soft_limit != 0) {
+                    my_is_mandatory_concurrency_enabled = false;
+                } else if (my_num_mandatory_requests > 0) {
+                    my_is_mandatory_concurrency_enabled = true;
+                    soft_limit = 1;
+                }
+
+                my_serializer.set_active_num_workers(soft_limit);
+            }
+
+            int thread_request_serializer_proxy::num_workers_requested() {
+                return my_serializer.num_workers_requested();
+            }
+
+            void thread_request_serializer_proxy::update(int delta) { my_serializer.update(delta); }
+
+            void
+            thread_request_serializer_proxy::enable_mandatory_concurrency(mutex_type::scoped_lock& lock) {
+                lock.upgrade_to_writer();
+                bool still_should_enable = my_num_mandatory_requests.load(std::memory_order_relaxed) > 0
+                                           && !my_is_mandatory_concurrency_enabled
+                                           && my_serializer.is_no_workers_avaliable();
+
+                if (still_should_enable) {
+                    my_is_mandatory_concurrency_enabled = true;
+                    my_serializer.set_active_num_workers(1);
+                }
+            }
+
+            void
+            thread_request_serializer_proxy::disable_mandatory_concurrency(mutex_type::scoped_lock& lock) {
+                lock.upgrade_to_writer();
+                bool still_should_disable = my_num_mandatory_requests.load(std::memory_order_relaxed) <= 0
+                                            && my_is_mandatory_concurrency_enabled
+                                            && !my_serializer.is_no_workers_avaliable();
+
+                if (still_should_disable) {
+                    my_is_mandatory_concurrency_enabled = false;
+                    my_serializer.set_active_num_workers(0);
+                }
+            }
+
+        }// namespace r1
+    }    // namespace detail
+}// namespace tbb
diff --git a/external/tbb/src/tbb/threading_control.cpp b/external/tbb/src/tbb/threading_control.cpp
index 7a62b337..232cfad2 100644
--- a/external/tbb/src/tbb/threading_control.cpp
+++ b/external/tbb/src/tbb/threading_control.cpp
@@ -15,397 +15,408 @@
 */
 
 #include "threading_control.h"
-#include "permit_manager.h"
+#include "governor.h"
 #include "market.h"
+#include "permit_manager.h"
 #include "tcm_adaptor.h"
 #include "thread_dispatcher.h"
-#include "governor.h"
 #include "thread_dispatcher_client.h"
 
 namespace tbb {
-namespace detail {
-namespace r1 {
-
-// ---------------------------------------- threading_control_impl --------------------------------------------------------------
-
-std::size_t global_control_active_value_unsafe(d1::global_control::parameter);
-
-std::pair<unsigned, unsigned> threading_control_impl::calculate_workers_limits() {
-    // Expecting that 4P is suitable for most applications.
-    // Limit to 2P for large thread number.
-    // TODO: ask RML for max concurrency and possibly correct hard_limit
-    unsigned factor = governor::default_num_threads() <= 128 ? 4 : 2;
-
-    // The requested number of threads is intentionally not considered in
-    // computation of the hard limit, in order to separate responsibilities
-    // and avoid complicated interactions between global_control and task_scheduler_init.
-    // The threading control guarantees that at least 256 threads might be created.
-    unsigned workers_app_limit = global_control_active_value_unsafe(global_control::max_allowed_parallelism);
-    unsigned workers_hard_limit = max(max(factor * governor::default_num_threads(), 256u), workers_app_limit);
-    unsigned workers_soft_limit = calc_workers_soft_limit(workers_hard_limit);
-    
-    return std::make_pair(workers_soft_limit, workers_hard_limit);
-}
-
-unsigned threading_control_impl::calc_workers_soft_limit(unsigned workers_hard_limit) {
-    unsigned workers_soft_limit{};
-    unsigned soft_limit = global_control_active_value_unsafe(global_control::max_allowed_parallelism);
-
-    // if user set no limits (yet), use default value
-    workers_soft_limit = soft_limit != 0 ? soft_limit - 1 : governor::default_num_threads() - 1;
-
-    if (workers_soft_limit >= workers_hard_limit) {
-        workers_soft_limit = workers_hard_limit - 1;
-    }
-
-    return workers_soft_limit;
-}
-
-cache_aligned_unique_ptr<permit_manager> threading_control_impl::make_permit_manager(unsigned workers_soft_limit) {
-     if (tcm_adaptor::is_initialized()) {
-        auto tcm = make_cache_aligned_unique<tcm_adaptor>();
-        if (tcm->is_connected()) {
-            return tcm;
-        }
-    }
-    return make_cache_aligned_unique<market>(workers_soft_limit);
-}
-
-cache_aligned_unique_ptr<thread_dispatcher> threading_control_impl::make_thread_dispatcher(threading_control& tc,
-                                                                                           unsigned workers_soft_limit,
-                                                                                           unsigned workers_hard_limit)
-{
-    stack_size_type stack_size = global_control_active_value_unsafe(global_control::thread_stack_size);
-
-    cache_aligned_unique_ptr<thread_dispatcher> td =
-        make_cache_aligned_unique<thread_dispatcher>(tc, workers_hard_limit, stack_size);
-    // This check relies on the fact that for shared RML default_concurrency == max_concurrency
-    if (!governor::UsePrivateRML && td->my_server->default_concurrency() < workers_soft_limit) {
-        runtime_warning("RML might limit the number of workers to %u while %u is requested.\n",
-            td->my_server->default_concurrency(), workers_soft_limit);
-    }
-
-    return td;
-}
-
-threading_control_impl::threading_control_impl(threading_control* tc) {
-    unsigned workers_soft_limit{}, workers_hard_limit{};
-    std::tie(workers_soft_limit, workers_hard_limit) = calculate_workers_limits();
-
-    my_permit_manager = make_permit_manager(workers_soft_limit);
-    my_thread_dispatcher = make_thread_dispatcher(*tc, workers_soft_limit, workers_hard_limit);
-    my_thread_request_serializer =
-        make_cache_aligned_unique<thread_request_serializer_proxy>(*my_thread_dispatcher, workers_soft_limit);
-    my_permit_manager->set_thread_request_observer(*my_thread_request_serializer);
-
-    my_cancellation_disseminator = make_cache_aligned_unique<cancellation_disseminator>();
-    my_waiting_threads_monitor = make_cache_aligned_unique<thread_control_monitor>();
-}
-
-void threading_control_impl::release(bool blocking_terminate) {
-    my_thread_dispatcher->release(blocking_terminate);
-}
-
-void threading_control_impl::set_active_num_workers(unsigned soft_limit) {
-    __TBB_ASSERT(soft_limit <= my_thread_dispatcher->my_num_workers_hard_limit, nullptr);
-    my_thread_request_serializer->set_active_num_workers(soft_limit);
-    my_permit_manager->set_active_num_workers(soft_limit);
-}
-
-threading_control_client threading_control_impl::create_client(arena& a) {
-    pm_client* pm_client = my_permit_manager->create_client(a);
-    thread_dispatcher_client* td_client = my_thread_dispatcher->create_client(a);
-
-    return threading_control_client{pm_client, td_client};
-}
-
-threading_control_impl::client_snapshot threading_control_impl::prepare_client_destruction(threading_control_client client) {
-    auto td_client = client.get_thread_dispatcher_client();
-    return {td_client->get_aba_epoch(), td_client->priority_level(), td_client, client.get_pm_client()};
-}
-
-bool threading_control_impl::try_destroy_client(threading_control_impl::client_snapshot snapshot) {
-    if (my_thread_dispatcher->try_unregister_client(snapshot.my_td_client, snapshot.aba_epoch, snapshot.priority_level)) {
-        my_permit_manager->unregister_and_destroy_client(*snapshot.my_pm_client);
-        return true;
-    }
-    return false;
-}
-
-void threading_control_impl::publish_client(threading_control_client tc_client, d1::constraints& constraints) {
-    my_permit_manager->register_client(tc_client.get_pm_client(), constraints);
-    my_thread_dispatcher->register_client(tc_client.get_thread_dispatcher_client());
-}
-
-void threading_control_impl::register_thread(thread_data& td) {
-    my_cancellation_disseminator->register_thread(td);
-}
-void threading_control_impl::unregister_thread(thread_data& td) {
-    my_cancellation_disseminator->unregister_thread(td);
-}
-
-void threading_control_impl::propagate_task_group_state(std::atomic<uint32_t> d1::task_group_context::*mptr_state,
-                                                        d1::task_group_context& src, uint32_t new_state)
-{
-    my_cancellation_disseminator->propagate_task_group_state(mptr_state, src, new_state);
-}
-
-std::size_t threading_control_impl::worker_stack_size() {
-    return my_thread_dispatcher->worker_stack_size();
-}
-
-unsigned threading_control_impl::max_num_workers() {
-    return my_thread_dispatcher->my_num_workers_hard_limit;
-}
-
-void threading_control_impl::adjust_demand(threading_control_client tc_client, int mandatory_delta, int workers_delta) {
-    auto& c = *tc_client.get_pm_client();
-    my_thread_request_serializer->register_mandatory_request(mandatory_delta);
-    my_permit_manager->adjust_demand(c, mandatory_delta, workers_delta);
-}
-
-bool threading_control_impl::is_any_other_client_active() {
-    return my_thread_request_serializer->num_workers_requested() > 0 ? my_thread_dispatcher->is_any_client_in_need() : false;
-}
-
-thread_control_monitor& threading_control_impl::get_waiting_threads_monitor() {
-    return *my_waiting_threads_monitor;
-}
-
-// ---------------------------------------- threading_control -------------------------------------------------------------------
-
-// Defined in global_control.cpp
-void global_control_lock();
-void global_control_unlock();
-
-void threading_control::add_ref(bool is_public) {
-    ++my_ref_count;
-    if (is_public) {
-        my_public_ref_count++;
-    }
-}
-
-bool threading_control::remove_ref(bool is_public) {
-    if (is_public) {
-        __TBB_ASSERT(g_threading_control == this, "Global threading control instance was destroyed prematurely?");
-        __TBB_ASSERT(my_public_ref_count.load(std::memory_order_relaxed), nullptr);
-        --my_public_ref_count;
-    }
-
-    bool is_last_ref = --my_ref_count == 0;
-    if (is_last_ref) {
-        __TBB_ASSERT(!my_public_ref_count.load(std::memory_order_relaxed), nullptr);
-        g_threading_control = nullptr;
-    }
-
-    return is_last_ref;
-}
-
-threading_control* threading_control::get_threading_control(bool is_public) {
-    threading_control* control = g_threading_control;
-    if (control) {
-        control->add_ref(is_public);
-    }
-
-    return control;
-}
-
-threading_control* threading_control::create_threading_control() {
-    // Global control should be locked before threading_control_impl
-    global_control_lock();
-
-    threading_control* thr_control{ nullptr };
-    try_call([&] {
-        global_mutex_type::scoped_lock lock(g_threading_control_mutex);
-
-        thr_control = get_threading_control(/*public = */ true);
-        if (thr_control == nullptr) {
-            thr_control =  new (cache_aligned_allocate(sizeof(threading_control))) threading_control(/*public_ref = */ 1, /*private_ref = */ 1);
-            thr_control->my_pimpl = make_cache_aligned_unique<threading_control_impl>(thr_control);
-
-            __TBB_InitOnce::add_ref();
-
-            if (global_control_active_value_unsafe(global_control::scheduler_handle)) {
-                ++thr_control->my_public_ref_count;
-                ++thr_control->my_ref_count;
-            }
-
-            g_threading_control = thr_control;
-        }
-    }).on_exception([&] {
-        global_control_unlock();
-
-        cache_aligned_deleter deleter{};
-        deleter(thr_control);
-    });
-
-    global_control_unlock();
-    return thr_control;
-}
-
-void threading_control::destroy () {
-    cache_aligned_deleter deleter;
-    deleter(this);
-    __TBB_InitOnce::remove_ref();
-}
-
-void threading_control::wait_last_reference(global_mutex_type::scoped_lock& lock) {
-    while (my_public_ref_count.load(std::memory_order_relaxed) == 1 && my_ref_count.load(std::memory_order_relaxed) > 1) {
-        lock.release();
-        // To guarantee that request_close_connection() is called by the last external thread, we need to wait till all
-        // references are released. Re-read my_public_ref_count to limit waiting if new external threads are created.
-        // Theoretically, new private references to the threading control can be added during waiting making it potentially
-        // endless.
-        // TODO: revise why the weak scheduler needs threading control's pointer and try to remove this wait.
-        // Note that the threading control should know about its schedulers for cancellation/exception/priority propagation,
-        // see e.g. task_group_context::cancel_group_execution()
-        while (my_public_ref_count.load(std::memory_order_acquire) == 1 && my_ref_count.load(std::memory_order_acquire) > 1) {
-            yield();
-        }
-        lock.acquire(g_threading_control_mutex);
-    }
-}
-
-bool threading_control::release(bool is_public, bool blocking_terminate) {
-    bool do_release = false;
-    {
-        global_mutex_type::scoped_lock lock(g_threading_control_mutex);
-        if (blocking_terminate) {
-            __TBB_ASSERT(is_public, "Only an object with a public reference can request the blocking terminate");
-            wait_last_reference(lock);
-        }
-        do_release = remove_ref(is_public);
-    }
-
-    if (do_release) {
-        __TBB_ASSERT(!my_public_ref_count.load(std::memory_order_relaxed), "No public references must remain if we remove the threading control.");
-        // inform RML that blocking termination is required
-        my_pimpl->release(blocking_terminate);
-        return blocking_terminate;
-    }
-    return false;
-}
-
-threading_control::threading_control(unsigned public_ref, unsigned ref) : my_public_ref_count(public_ref), my_ref_count(ref)
-{}
-
-threading_control* threading_control::register_public_reference() {
-    threading_control* control{nullptr};
-    global_mutex_type::scoped_lock lock(g_threading_control_mutex);
-    control = get_threading_control(/*public = */ true);
-    if (!control) {
-        // We are going to create threading_control_impl, we should acquire mutexes in right order
-        lock.release();
-        control = create_threading_control();
-    }
-
-    return control;
-}
-
-bool threading_control::unregister_public_reference(bool blocking_terminate) {
-    __TBB_ASSERT(g_threading_control, "Threading control should exist until last public reference");
-    __TBB_ASSERT(g_threading_control->my_public_ref_count.load(std::memory_order_relaxed), nullptr);
-    return g_threading_control->release(/*public = */ true, /*blocking_terminate = */ blocking_terminate);
-}
-
-threading_control_client threading_control::create_client(arena& a) {
-    {
-        global_mutex_type::scoped_lock lock(g_threading_control_mutex);
-        add_ref(/*public = */ false);
-    }
-
-    return my_pimpl->create_client(a);
-}
-
-void threading_control::publish_client(threading_control_client client, d1::constraints& constraints) {
-    return my_pimpl->publish_client(client, constraints);
-}
-
-threading_control::client_snapshot threading_control::prepare_client_destruction(threading_control_client client) {
-    return my_pimpl->prepare_client_destruction(client);
-}
-
-bool threading_control::try_destroy_client(threading_control::client_snapshot deleter) {
-    bool res = my_pimpl->try_destroy_client(deleter);
-    if (res) {
-        release(/*public = */ false, /*blocking_terminate = */ false);
-    }
-    return res;
-}
-
-void threading_control::set_active_num_workers(unsigned soft_limit) {
-    threading_control* thr_control{nullptr};
-    {
-        global_mutex_type::scoped_lock lock(g_threading_control_mutex);
-        thr_control = get_threading_control(/*public = */ false);
-    }
-
-    if (thr_control != nullptr) {
-        thr_control->my_pimpl->set_active_num_workers(soft_limit);
-        thr_control->release(/*is_public=*/false, /*blocking_terminate=*/false);
-    }
-}
-
-bool threading_control::is_present() {
-    global_mutex_type::scoped_lock lock(g_threading_control_mutex);
-    return g_threading_control != nullptr;
-}
-
-bool threading_control::register_lifetime_control() {
-    global_mutex_type::scoped_lock lock(g_threading_control_mutex);
-    return get_threading_control(/*public = */ true) != nullptr;
-}
-
-bool threading_control::unregister_lifetime_control(bool blocking_terminate) {
-    threading_control* thr_control{nullptr};
-    {
-        global_mutex_type::scoped_lock lock(g_threading_control_mutex);
-        thr_control = g_threading_control;
-    }
-
-    bool released{true};
-    if (thr_control) {
-        released = thr_control->release(/*public = */ true, /*blocking_terminate = */ blocking_terminate);
-    }
-
-    return released;
-}
-
-void threading_control::register_thread(thread_data& td) {
-    my_pimpl->register_thread(td);
-}
-
-void threading_control::unregister_thread(thread_data& td) {
-    my_pimpl->unregister_thread(td);
-}
-
-void threading_control::propagate_task_group_state(std::atomic<uint32_t> d1::task_group_context::*mptr_state,
-                                                   d1::task_group_context& src, uint32_t new_state)
-{
-    my_pimpl->propagate_task_group_state(mptr_state, src, new_state);
-}
-
-std::size_t threading_control::worker_stack_size() {
-    return my_pimpl->worker_stack_size();
-}
-
-unsigned threading_control::max_num_workers() {
-    global_mutex_type::scoped_lock lock(g_threading_control_mutex);
-    return g_threading_control ? g_threading_control->my_pimpl->max_num_workers() : 0;
-}
-
-void threading_control::adjust_demand(threading_control_client client, int mandatory_delta, int workers_delta) {
-    my_pimpl->adjust_demand(client, mandatory_delta, workers_delta);
-}
-
-bool threading_control::is_any_other_client_active() {
-    return my_pimpl->is_any_other_client_active();
-}
-
-thread_control_monitor& threading_control::get_waiting_threads_monitor() {
-    return my_pimpl->get_waiting_threads_monitor();
-}
-
-} // r1
-} // detail
-} // tbb
+    namespace detail {
+        namespace r1 {
+
+            // ---------------------------------------- threading_control_impl --------------------------------------------------------------
+
+            std::size_t global_control_active_value_unsafe(d1::global_control::parameter);
+
+            std::pair<unsigned, unsigned> threading_control_impl::calculate_workers_limits() {
+                // Expecting that 4P is suitable for most applications.
+                // Limit to 2P for large thread number.
+                // TODO: ask RML for max concurrency and possibly correct hard_limit
+                unsigned factor = governor::default_num_threads() <= 128 ? 4 : 2;
+
+                // The requested number of threads is intentionally not considered in
+                // computation of the hard limit, in order to separate responsibilities
+                // and avoid complicated interactions between global_control and task_scheduler_init.
+                // The threading control guarantees that at least 256 threads might be created.
+                unsigned workers_app_limit
+                        = global_control_active_value_unsafe(global_control::max_allowed_parallelism);
+                unsigned workers_hard_limit
+                        = max(max(factor * governor::default_num_threads(), 256u), workers_app_limit);
+                unsigned workers_soft_limit = calc_workers_soft_limit(workers_hard_limit);
+
+                return std::make_pair(workers_soft_limit, workers_hard_limit);
+            }
+
+            unsigned threading_control_impl::calc_workers_soft_limit(unsigned workers_hard_limit) {
+                unsigned workers_soft_limit {};
+                unsigned soft_limit
+                        = global_control_active_value_unsafe(global_control::max_allowed_parallelism);
+
+                // if user set no limits (yet), use default value
+                workers_soft_limit = soft_limit != 0 ? soft_limit - 1 : governor::default_num_threads() - 1;
+
+                if (workers_soft_limit >= workers_hard_limit) { workers_soft_limit = workers_hard_limit - 1; }
+
+                return workers_soft_limit;
+            }
+
+            cache_aligned_unique_ptr<permit_manager>
+            threading_control_impl::make_permit_manager(unsigned workers_soft_limit) {
+                if (tcm_adaptor::is_initialized()) {
+                    auto tcm = make_cache_aligned_unique<tcm_adaptor>();
+                    if (tcm->is_connected()) { return tcm; }
+                }
+                return make_cache_aligned_unique<market>(workers_soft_limit);
+            }
+
+            cache_aligned_unique_ptr<thread_dispatcher>
+            threading_control_impl::make_thread_dispatcher(threading_control& tc, unsigned workers_soft_limit,
+                                                           unsigned workers_hard_limit) {
+                stack_size_type stack_size
+                        = global_control_active_value_unsafe(global_control::thread_stack_size);
+
+                cache_aligned_unique_ptr<thread_dispatcher> td
+                        = make_cache_aligned_unique<thread_dispatcher>(tc, workers_hard_limit, stack_size);
+                // This check relies on the fact that for shared RML default_concurrency == max_concurrency
+                if (!governor::UsePrivateRML && td->my_server->default_concurrency() < workers_soft_limit) {
+                    runtime_warning("RML might limit the number of workers to %u while %u is requested.\n",
+                                    td->my_server->default_concurrency(), workers_soft_limit);
+                }
+
+                return td;
+            }
+
+            threading_control_impl::threading_control_impl(threading_control* tc) {
+                unsigned workers_soft_limit {}, workers_hard_limit {};
+                std::tie(workers_soft_limit, workers_hard_limit) = calculate_workers_limits();
+
+                my_permit_manager = make_permit_manager(workers_soft_limit);
+                my_thread_dispatcher = make_thread_dispatcher(*tc, workers_soft_limit, workers_hard_limit);
+                my_thread_request_serializer = make_cache_aligned_unique<thread_request_serializer_proxy>(
+                        *my_thread_dispatcher, workers_soft_limit);
+                my_permit_manager->set_thread_request_observer(*my_thread_request_serializer);
+
+                my_cancellation_disseminator = make_cache_aligned_unique<cancellation_disseminator>();
+                my_waiting_threads_monitor = make_cache_aligned_unique<thread_control_monitor>();
+            }
+
+            void threading_control_impl::release(bool blocking_terminate) {
+                my_thread_dispatcher->release(blocking_terminate);
+            }
+
+            void threading_control_impl::set_active_num_workers(unsigned soft_limit) {
+                __TBB_ASSERT(soft_limit <= my_thread_dispatcher->my_num_workers_hard_limit, nullptr);
+                my_thread_request_serializer->set_active_num_workers(soft_limit);
+                my_permit_manager->set_active_num_workers(soft_limit);
+            }
+
+            threading_control_client threading_control_impl::create_client(arena& a) {
+                pm_client* pm_client = my_permit_manager->create_client(a);
+                thread_dispatcher_client* td_client = my_thread_dispatcher->create_client(a);
+
+                return threading_control_client {pm_client, td_client};
+            }
+
+            threading_control_impl::client_snapshot
+            threading_control_impl::prepare_client_destruction(threading_control_client client) {
+                auto td_client = client.get_thread_dispatcher_client();
+                return {td_client->get_aba_epoch(), td_client->priority_level(), td_client,
+                        client.get_pm_client()};
+            }
+
+            bool
+            threading_control_impl::try_destroy_client(threading_control_impl::client_snapshot snapshot) {
+                if (my_thread_dispatcher->try_unregister_client(snapshot.my_td_client, snapshot.aba_epoch,
+                                                                snapshot.priority_level)) {
+                    my_permit_manager->unregister_and_destroy_client(*snapshot.my_pm_client);
+                    return true;
+                }
+                return false;
+            }
+
+            void threading_control_impl::publish_client(threading_control_client tc_client,
+                                                        d1::constraints& constraints) {
+                my_permit_manager->register_client(tc_client.get_pm_client(), constraints);
+                my_thread_dispatcher->register_client(tc_client.get_thread_dispatcher_client());
+            }
+
+            void threading_control_impl::register_thread(thread_data& td) {
+                my_cancellation_disseminator->register_thread(td);
+            }
+            void threading_control_impl::unregister_thread(thread_data& td) {
+                my_cancellation_disseminator->unregister_thread(td);
+            }
+
+            void threading_control_impl::propagate_task_group_state(
+                    std::atomic<uint32_t> d1::task_group_context::*mptr_state, d1::task_group_context& src,
+                    uint32_t new_state) {
+                my_cancellation_disseminator->propagate_task_group_state(mptr_state, src, new_state);
+            }
+
+            std::size_t threading_control_impl::worker_stack_size() {
+                return my_thread_dispatcher->worker_stack_size();
+            }
+
+            unsigned threading_control_impl::max_num_workers() {
+                return my_thread_dispatcher->my_num_workers_hard_limit;
+            }
+
+            void threading_control_impl::adjust_demand(threading_control_client tc_client,
+                                                       int mandatory_delta, int workers_delta) {
+                auto& c = *tc_client.get_pm_client();
+                my_thread_request_serializer->register_mandatory_request(mandatory_delta);
+                my_permit_manager->adjust_demand(c, mandatory_delta, workers_delta);
+            }
+
+            bool threading_control_impl::is_any_other_client_active() {
+                return my_thread_request_serializer->num_workers_requested() > 0
+                               ? my_thread_dispatcher->is_any_client_in_need()
+                               : false;
+            }
+
+            thread_control_monitor& threading_control_impl::get_waiting_threads_monitor() {
+                return *my_waiting_threads_monitor;
+            }
+
+            // ---------------------------------------- threading_control -------------------------------------------------------------------
+
+            // Defined in global_control.cpp
+            void global_control_lock();
+            void global_control_unlock();
+
+            void threading_control::add_ref(bool is_public) {
+                ++my_ref_count;
+                if (is_public) { my_public_ref_count++; }
+            }
+
+            bool threading_control::remove_ref(bool is_public) {
+                if (is_public) {
+                    __TBB_ASSERT(g_threading_control == this,
+                                 "Global threading control instance was destroyed prematurely?");
+                    __TBB_ASSERT(my_public_ref_count.load(std::memory_order_relaxed), nullptr);
+                    --my_public_ref_count;
+                }
+
+                bool is_last_ref = --my_ref_count == 0;
+                if (is_last_ref) {
+                    __TBB_ASSERT(!my_public_ref_count.load(std::memory_order_relaxed), nullptr);
+                    g_threading_control = nullptr;
+                }
+
+                return is_last_ref;
+            }
+
+            threading_control* threading_control::get_threading_control(bool is_public) {
+                threading_control* control = g_threading_control;
+                if (control) { control->add_ref(is_public); }
+
+                return control;
+            }
+
+            threading_control* threading_control::create_threading_control() {
+                // Global control should be locked before threading_control_impl
+                global_control_lock();
+
+                threading_control* thr_control {nullptr};
+                try_call([&] {
+                    global_mutex_type::scoped_lock lock(g_threading_control_mutex);
+
+                    thr_control = get_threading_control(/*public = */ true);
+                    if (thr_control == nullptr) {
+                        thr_control = new (cache_aligned_allocate(sizeof(threading_control)))
+                                threading_control(/*public_ref = */ 1, /*private_ref = */ 1);
+                        thr_control->my_pimpl
+                                = make_cache_aligned_unique<threading_control_impl>(thr_control);
+
+                        __TBB_InitOnce::add_ref();
+
+                        if (global_control_active_value_unsafe(global_control::scheduler_handle)) {
+                            ++thr_control->my_public_ref_count;
+                            ++thr_control->my_ref_count;
+                        }
+
+                        g_threading_control = thr_control;
+                    }
+                }).on_exception([&] {
+                    global_control_unlock();
+
+                    cache_aligned_deleter deleter {};
+                    deleter(thr_control);
+                });
+
+                global_control_unlock();
+                return thr_control;
+            }
+
+            void threading_control::destroy() {
+                cache_aligned_deleter deleter;
+                deleter(this);
+                __TBB_InitOnce::remove_ref();
+            }
+
+            void threading_control::wait_last_reference(global_mutex_type::scoped_lock& lock) {
+                while (my_public_ref_count.load(std::memory_order_relaxed) == 1
+                       && my_ref_count.load(std::memory_order_relaxed) > 1) {
+                    lock.release();
+                    // To guarantee that request_close_connection() is called by the last external thread, we need to wait till all
+                    // references are released. Re-read my_public_ref_count to limit waiting if new external threads are created.
+                    // Theoretically, new private references to the threading control can be added during waiting making it potentially
+                    // endless.
+                    // TODO: revise why the weak scheduler needs threading control's pointer and try to remove this wait.
+                    // Note that the threading control should know about its schedulers for cancellation/exception/priority propagation,
+                    // see e.g. task_group_context::cancel_group_execution()
+                    while (my_public_ref_count.load(std::memory_order_acquire) == 1
+                           && my_ref_count.load(std::memory_order_acquire) > 1) {
+                        yield();
+                    }
+                    lock.acquire(g_threading_control_mutex);
+                }
+            }
+
+            bool threading_control::release(bool is_public, bool blocking_terminate) {
+                bool do_release = false;
+                {
+                    global_mutex_type::scoped_lock lock(g_threading_control_mutex);
+                    if (blocking_terminate) {
+                        __TBB_ASSERT(
+                                is_public,
+                                "Only an object with a public reference can request the blocking terminate");
+                        wait_last_reference(lock);
+                    }
+                    do_release = remove_ref(is_public);
+                }
+
+                if (do_release) {
+                    __TBB_ASSERT(!my_public_ref_count.load(std::memory_order_relaxed),
+                                 "No public references must remain if we remove the threading control.");
+                    // inform RML that blocking termination is required
+                    my_pimpl->release(blocking_terminate);
+                    return blocking_terminate;
+                }
+                return false;
+            }
+
+            threading_control::threading_control(unsigned public_ref, unsigned ref)
+                : my_public_ref_count(public_ref), my_ref_count(ref) {}
+
+            threading_control* threading_control::register_public_reference() {
+                threading_control* control {nullptr};
+                global_mutex_type::scoped_lock lock(g_threading_control_mutex);
+                control = get_threading_control(/*public = */ true);
+                if (!control) {
+                    // We are going to create threading_control_impl, we should acquire mutexes in right order
+                    lock.release();
+                    control = create_threading_control();
+                }
+
+                return control;
+            }
+
+            bool threading_control::unregister_public_reference(bool blocking_terminate) {
+                __TBB_ASSERT(g_threading_control,
+                             "Threading control should exist until last public reference");
+                __TBB_ASSERT(g_threading_control->my_public_ref_count.load(std::memory_order_relaxed),
+                             nullptr);
+                return g_threading_control->release(/*public = */ true,
+                                                    /*blocking_terminate = */ blocking_terminate);
+            }
+
+            threading_control_client threading_control::create_client(arena& a) {
+                {
+                    global_mutex_type::scoped_lock lock(g_threading_control_mutex);
+                    add_ref(/*public = */ false);
+                }
+
+                return my_pimpl->create_client(a);
+            }
+
+            void threading_control::publish_client(threading_control_client client,
+                                                   d1::constraints& constraints) {
+                return my_pimpl->publish_client(client, constraints);
+            }
+
+            threading_control::client_snapshot
+            threading_control::prepare_client_destruction(threading_control_client client) {
+                return my_pimpl->prepare_client_destruction(client);
+            }
+
+            bool threading_control::try_destroy_client(threading_control::client_snapshot deleter) {
+                bool res = my_pimpl->try_destroy_client(deleter);
+                if (res) { release(/*public = */ false, /*blocking_terminate = */ false); }
+                return res;
+            }
+
+            void threading_control::set_active_num_workers(unsigned soft_limit) {
+                threading_control* thr_control {nullptr};
+                {
+                    global_mutex_type::scoped_lock lock(g_threading_control_mutex);
+                    thr_control = get_threading_control(/*public = */ false);
+                }
+
+                if (thr_control != nullptr) {
+                    thr_control->my_pimpl->set_active_num_workers(soft_limit);
+                    thr_control->release(/*is_public=*/false, /*blocking_terminate=*/false);
+                }
+            }
+
+            bool threading_control::is_present() {
+                global_mutex_type::scoped_lock lock(g_threading_control_mutex);
+                return g_threading_control != nullptr;
+            }
+
+            bool threading_control::register_lifetime_control() {
+                global_mutex_type::scoped_lock lock(g_threading_control_mutex);
+                return get_threading_control(/*public = */ true) != nullptr;
+            }
+
+            bool threading_control::unregister_lifetime_control(bool blocking_terminate) {
+                threading_control* thr_control {nullptr};
+                {
+                    global_mutex_type::scoped_lock lock(g_threading_control_mutex);
+                    thr_control = g_threading_control;
+                }
+
+                bool released {true};
+                if (thr_control) {
+                    released = thr_control->release(/*public = */ true,
+                                                    /*blocking_terminate = */ blocking_terminate);
+                }
+
+                return released;
+            }
+
+            void threading_control::register_thread(thread_data& td) { my_pimpl->register_thread(td); }
+
+            void threading_control::unregister_thread(thread_data& td) { my_pimpl->unregister_thread(td); }
+
+            void threading_control::propagate_task_group_state(
+                    std::atomic<uint32_t> d1::task_group_context::*mptr_state, d1::task_group_context& src,
+                    uint32_t new_state) {
+                my_pimpl->propagate_task_group_state(mptr_state, src, new_state);
+            }
+
+            std::size_t threading_control::worker_stack_size() { return my_pimpl->worker_stack_size(); }
+
+            unsigned threading_control::max_num_workers() {
+                global_mutex_type::scoped_lock lock(g_threading_control_mutex);
+                return g_threading_control ? g_threading_control->my_pimpl->max_num_workers() : 0;
+            }
+
+            void threading_control::adjust_demand(threading_control_client client, int mandatory_delta,
+                                                  int workers_delta) {
+                my_pimpl->adjust_demand(client, mandatory_delta, workers_delta);
+            }
+
+            bool threading_control::is_any_other_client_active() {
+                return my_pimpl->is_any_other_client_active();
+            }
+
+            thread_control_monitor& threading_control::get_waiting_threads_monitor() {
+                return my_pimpl->get_waiting_threads_monitor();
+            }
+
+        }// namespace r1
+    }    // namespace detail
+}// namespace tbb
diff --git a/external/tbb/src/tbb/version.cpp b/external/tbb/src/tbb/version.cpp
index ca113372..c4c7c2cc 100644
--- a/external/tbb/src/tbb/version.cpp
+++ b/external/tbb/src/tbb/version.cpp
@@ -16,9 +16,7 @@
 
 #include "oneapi/tbb/version.h"
 
-extern "C" int TBB_runtime_interface_version() {
-    return TBB_INTERFACE_VERSION;
-}
+extern "C" int TBB_runtime_interface_version() { return TBB_INTERFACE_VERSION; }
 
 extern "C" const char* TBB_runtime_version() {
     static const char version_str[] = TBB_VERSION_STRING;
diff --git a/external/tbb/src/tbbbind/tbb_bind.cpp b/external/tbb/src/tbbbind/tbb_bind.cpp
index 143d1433..45a496fa 100644
--- a/external/tbb/src/tbbbind/tbb_bind.cpp
+++ b/external/tbb/src/tbbbind/tbb_bind.cpp
@@ -14,23 +14,23 @@
     limitations under the License.
 */
 
-#include <vector>
 #include <mutex>
+#include <vector>
 
-#include "../tbb/assert_impl.h" // Out-of-line TBB assertion handling routines are instantiated here.
+#include "../tbb/assert_impl.h"// Out-of-line TBB assertion handling routines are instantiated here.
 #include "oneapi/tbb/detail/_assert.h"
 #include "oneapi/tbb/detail/_config.h"
 
 #if _MSC_VER && !__INTEL_COMPILER && !__clang__
-#pragma warning( push )
-#pragma warning( disable : 4100 )
+#pragma warning(push)
+#pragma warning(disable : 4100)
 #elif _MSC_VER && __clang__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #endif
 #include <hwloc.h>
 #if _MSC_VER && !__INTEL_COMPILER && !__clang__
-#pragma warning( pop )
+#pragma warning(pop)
 #elif _MSC_VER && __clang__
 #pragma GCC diagnostic pop
 #endif
@@ -39,566 +39,589 @@
 #define __TBBBIND_HWLOC_TOPOLOGY_FLAG_RESTRICT_TO_CPUBINDING_PRESENT (HWLOC_API_VERSION >= 0x20500)
 #define __TBBBIND_HWLOC_WINDOWS_API_AVAILABLE (_WIN32 && HWLOC_API_VERSION >= 0x20500)
 #if __TBBBIND_HWLOC_WINDOWS_API_AVAILABLE
-    #include <hwloc/windows.h>
+#include <hwloc/windows.h>
 #endif
 
 // Most of hwloc calls returns negative exit code on error.
 // This macro tracks error codes that are returned from the hwloc interfaces.
-#define assertion_hwloc_wrapper(command, ...) \
-        __TBB_ASSERT_EX( (command(__VA_ARGS__)) >= 0, "Error occurred during call to hwloc API.");
+#define assertion_hwloc_wrapper(command, ...)                                                                \
+    __TBB_ASSERT_EX((command(__VA_ARGS__)) >= 0, "Error occurred during call to hwloc API.");
 
 namespace tbb {
-namespace detail {
-namespace r1 {
-
-//------------------------------------------------------------------------
-// Information about the machine's hardware TBB is happen to work on
-//------------------------------------------------------------------------
-class system_topology {
-    friend class binding_handler;
-
-    // Common topology members
-    hwloc_topology_t topology{nullptr};
-    hwloc_cpuset_t   process_cpu_affinity_mask{nullptr};
-    hwloc_nodeset_t  process_node_affinity_mask{nullptr};
-    std::size_t number_of_processors_groups{1};
-    std::vector<hwloc_cpuset_t> processor_groups_affinity_masks_list{};
-
-    // NUMA API related topology members
-    std::vector<hwloc_cpuset_t> numa_affinity_masks_list{};
-    std::vector<int> numa_indexes_list{};
-    int numa_nodes_count{0};
-
-    // Hybrid CPUs API related topology members
-    std::vector<hwloc_cpuset_t> core_types_affinity_masks_list{};
-    std::vector<int> core_types_indexes_list{};
-
-    enum init_stages { uninitialized,
-                       started,
-                       topology_allocated,
-                       topology_loaded,
-                       topology_parsed } initialization_state;
-
-    // Binding threads that locate in another Windows Processor groups
-    // is allowed only if machine topology contains several Windows Processors groups
-    // and process affinity mask wasn't limited manually (affinity mask cannot violate
-    // processors group boundaries).
-    bool intergroup_binding_allowed(std::size_t groups_num) { return groups_num > 1; }
-
-private:
-    void topology_initialization(std::size_t groups_num) {
-        initialization_state = started;
-
-        // Parse topology
-        if ( hwloc_topology_init( &topology ) == 0 ) {
-            initialization_state = topology_allocated;
+    namespace detail {
+        namespace r1 {
+
+            //------------------------------------------------------------------------
+            // Information about the machine's hardware TBB is happen to work on
+            //------------------------------------------------------------------------
+            class system_topology {
+                friend class binding_handler;
+
+                // Common topology members
+                hwloc_topology_t topology {nullptr};
+                hwloc_cpuset_t process_cpu_affinity_mask {nullptr};
+                hwloc_nodeset_t process_node_affinity_mask {nullptr};
+                std::size_t number_of_processors_groups {1};
+                std::vector<hwloc_cpuset_t> processor_groups_affinity_masks_list {};
+
+                // NUMA API related topology members
+                std::vector<hwloc_cpuset_t> numa_affinity_masks_list {};
+                std::vector<int> numa_indexes_list {};
+                int numa_nodes_count {0};
+
+                // Hybrid CPUs API related topology members
+                std::vector<hwloc_cpuset_t> core_types_affinity_masks_list {};
+                std::vector<int> core_types_indexes_list {};
+
+                enum init_stages {
+                    uninitialized,
+                    started,
+                    topology_allocated,
+                    topology_loaded,
+                    topology_parsed
+                } initialization_state;
+
+                // Binding threads that locate in another Windows Processor groups
+                // is allowed only if machine topology contains several Windows Processors groups
+                // and process affinity mask wasn't limited manually (affinity mask cannot violate
+                // processors group boundaries).
+                bool intergroup_binding_allowed(std::size_t groups_num) { return groups_num > 1; }
+
+            private:
+                void topology_initialization(std::size_t groups_num) {
+                    initialization_state = started;
+
+                    // Parse topology
+                    if (hwloc_topology_init(&topology) == 0) {
+                        initialization_state = topology_allocated;
 #if __TBBBIND_HWLOC_TOPOLOGY_FLAG_RESTRICT_TO_CPUBINDING_PRESENT
-            unsigned long flags = 0;
-            if (groups_num > 1) {
-                // HWLOC x86 backend might interfere with process affinity mask on
-                // Windows systems with multiple processor groups.
-                flags = HWLOC_TOPOLOGY_FLAG_DONT_CHANGE_BINDING;
-            } else {
-                flags = HWLOC_TOPOLOGY_FLAG_IS_THISSYSTEM | HWLOC_TOPOLOGY_FLAG_RESTRICT_TO_CPUBINDING;
-            }
-            if (hwloc_topology_set_flags(topology, flags) != 0) {
-                return;
-            }
+                        unsigned long flags = 0;
+                        if (groups_num > 1) {
+                            // HWLOC x86 backend might interfere with process affinity mask on
+                            // Windows systems with multiple processor groups.
+                            flags = HWLOC_TOPOLOGY_FLAG_DONT_CHANGE_BINDING;
+                        } else {
+                            flags = HWLOC_TOPOLOGY_FLAG_IS_THISSYSTEM
+                                    | HWLOC_TOPOLOGY_FLAG_RESTRICT_TO_CPUBINDING;
+                        }
+                        if (hwloc_topology_set_flags(topology, flags) != 0) { return; }
 #endif
-            if ( hwloc_topology_load( topology ) == 0 ) {
-                initialization_state = topology_loaded;
-            }
-        }
-        if ( initialization_state != topology_loaded )
-            return;
+                        if (hwloc_topology_load(topology) == 0) { initialization_state = topology_loaded; }
+                    }
+                    if (initialization_state != topology_loaded) return;
 
 #if __TBB_CPUBIND_PRESENT
-        // Getting process affinity mask
-        if ( intergroup_binding_allowed(groups_num) ) {
-            process_cpu_affinity_mask  = hwloc_bitmap_dup(hwloc_topology_get_complete_cpuset (topology));
-            process_node_affinity_mask = hwloc_bitmap_dup(hwloc_topology_get_complete_nodeset(topology));
-        } else {
-            process_cpu_affinity_mask  = hwloc_bitmap_alloc();
-            process_node_affinity_mask = hwloc_bitmap_alloc();
-
-            assertion_hwloc_wrapper(hwloc_get_cpubind, topology, process_cpu_affinity_mask, 0);
-            hwloc_cpuset_to_nodeset(topology, process_cpu_affinity_mask, process_node_affinity_mask);
-        }
+                    // Getting process affinity mask
+                    if (intergroup_binding_allowed(groups_num)) {
+                        process_cpu_affinity_mask
+                                = hwloc_bitmap_dup(hwloc_topology_get_complete_cpuset(topology));
+                        process_node_affinity_mask
+                                = hwloc_bitmap_dup(hwloc_topology_get_complete_nodeset(topology));
+                    } else {
+                        process_cpu_affinity_mask = hwloc_bitmap_alloc();
+                        process_node_affinity_mask = hwloc_bitmap_alloc();
+
+                        assertion_hwloc_wrapper(hwloc_get_cpubind, topology, process_cpu_affinity_mask, 0);
+                        hwloc_cpuset_to_nodeset(topology, process_cpu_affinity_mask,
+                                                process_node_affinity_mask);
+                    }
 #else
-        process_cpu_affinity_mask  = hwloc_bitmap_dup(hwloc_topology_get_complete_cpuset (topology));
-        process_node_affinity_mask = hwloc_bitmap_dup(hwloc_topology_get_complete_nodeset(topology));
+                    process_cpu_affinity_mask
+                            = hwloc_bitmap_dup(hwloc_topology_get_complete_cpuset(topology));
+                    process_node_affinity_mask
+                            = hwloc_bitmap_dup(hwloc_topology_get_complete_nodeset(topology));
 #endif
 
-        number_of_processors_groups = groups_num;
-    }
-
-    void numa_topology_parsing() {
-        // Fill parameters with stubs if topology parsing is broken.
-        if ( initialization_state != topology_loaded ) {
-            numa_nodes_count = 1;
-            numa_indexes_list.push_back(-1);
-            return;
-        }
-
-        // If system contains no NUMA nodes, HWLOC 1.11 returns an infinitely filled bitmap.
-        // hwloc_bitmap_weight() returns negative value for such bitmaps, so we use this check
-        // to change way of topology initialization.
-        numa_nodes_count = hwloc_bitmap_weight(process_node_affinity_mask);
-        if (numa_nodes_count <= 0) {
-            // numa_nodes_count may be empty if the process affinity mask is empty too (invalid case)
-            // or if some internal HWLOC error occurred.
-            // So we place -1 as index in this case.
-            numa_indexes_list.push_back(numa_nodes_count == 0 ? -1 : 0);
-            numa_nodes_count = 1;
-
-            numa_affinity_masks_list.push_back(hwloc_bitmap_dup(process_cpu_affinity_mask));
-        } else {
-            // Get NUMA logical indexes list
-            unsigned counter = 0;
-            int i = 0;
-            int max_numa_index = -1;
-            numa_indexes_list.resize(numa_nodes_count);
-            hwloc_obj_t node_buffer;
-            hwloc_bitmap_foreach_begin(i, process_node_affinity_mask) {
-                node_buffer = hwloc_get_numanode_obj_by_os_index(topology, i);
-                numa_indexes_list[counter] = static_cast<int>(node_buffer->logical_index);
-
-                if ( numa_indexes_list[counter] > max_numa_index ) {
-                    max_numa_index = numa_indexes_list[counter];
+                    number_of_processors_groups = groups_num;
                 }
 
-                counter++;
-            } hwloc_bitmap_foreach_end();
-            __TBB_ASSERT(max_numa_index >= 0, "Maximal NUMA index must not be negative");
-
-            // Fill concurrency and affinity masks lists
-            numa_affinity_masks_list.resize(max_numa_index + 1);
-            int index = 0;
-            hwloc_bitmap_foreach_begin(i, process_node_affinity_mask) {
-                node_buffer = hwloc_get_numanode_obj_by_os_index(topology, i);
-                index = static_cast<int>(node_buffer->logical_index);
-
-                hwloc_cpuset_t& current_mask = numa_affinity_masks_list[index];
-                current_mask = hwloc_bitmap_dup(node_buffer->cpuset);
-
-                hwloc_bitmap_and(current_mask, current_mask, process_cpu_affinity_mask);
-                __TBB_ASSERT(!hwloc_bitmap_iszero(current_mask), "hwloc detected unavailable NUMA node");
-            } hwloc_bitmap_foreach_end();
-        }
-    }
-
-    void core_types_topology_parsing() {
-        // Fill parameters with stubs if topology parsing is broken.
-        if ( initialization_state != topology_loaded ) {
-            core_types_indexes_list.push_back(-1);
-            return;
-        }
-#if __TBBBIND_HWLOC_HYBRID_CPUS_INTERFACES_PRESENT
-        __TBB_ASSERT(hwloc_get_api_version() >= 0x20400, "Hybrid CPUs support interfaces required HWLOC >= 2.4");
-        // Parsing the hybrid CPU topology
-        int core_types_number = hwloc_cpukinds_get_nr(topology, 0);
-        bool core_types_parsing_broken = core_types_number <= 0;
-        if (!core_types_parsing_broken) {
-            core_types_affinity_masks_list.resize(core_types_number);
-            int efficiency{-1};
-
-            for (int core_type = 0; core_type < core_types_number; ++core_type) {
-                hwloc_cpuset_t& current_mask = core_types_affinity_masks_list[core_type];
-                current_mask = hwloc_bitmap_alloc();
-
-                if (!hwloc_cpukinds_get_info(topology, core_type, current_mask, &efficiency, nullptr, nullptr, 0)
-                    && efficiency >= 0
-                ) {
-                    hwloc_bitmap_and(current_mask, current_mask, process_cpu_affinity_mask);
+                void numa_topology_parsing() {
+                    // Fill parameters with stubs if topology parsing is broken.
+                    if (initialization_state != topology_loaded) {
+                        numa_nodes_count = 1;
+                        numa_indexes_list.push_back(-1);
+                        return;
+                    }
 
-                    if (hwloc_bitmap_weight(current_mask) > 0) {
-                        core_types_indexes_list.push_back(core_type);
+                    // If system contains no NUMA nodes, HWLOC 1.11 returns an infinitely filled bitmap.
+                    // hwloc_bitmap_weight() returns negative value for such bitmaps, so we use this check
+                    // to change way of topology initialization.
+                    numa_nodes_count = hwloc_bitmap_weight(process_node_affinity_mask);
+                    if (numa_nodes_count <= 0) {
+                        // numa_nodes_count may be empty if the process affinity mask is empty too (invalid case)
+                        // or if some internal HWLOC error occurred.
+                        // So we place -1 as index in this case.
+                        numa_indexes_list.push_back(numa_nodes_count == 0 ? -1 : 0);
+                        numa_nodes_count = 1;
+
+                        numa_affinity_masks_list.push_back(hwloc_bitmap_dup(process_cpu_affinity_mask));
+                    } else {
+                        // Get NUMA logical indexes list
+                        unsigned counter = 0;
+                        int i = 0;
+                        int max_numa_index = -1;
+                        numa_indexes_list.resize(numa_nodes_count);
+                        hwloc_obj_t node_buffer;
+                        hwloc_bitmap_foreach_begin(i, process_node_affinity_mask) {
+                            node_buffer = hwloc_get_numanode_obj_by_os_index(topology, i);
+                            numa_indexes_list[counter] = static_cast<int>(node_buffer->logical_index);
+
+                            if (numa_indexes_list[counter] > max_numa_index) {
+                                max_numa_index = numa_indexes_list[counter];
+                            }
+
+                            counter++;
+                        }
+                        hwloc_bitmap_foreach_end();
+                        __TBB_ASSERT(max_numa_index >= 0, "Maximal NUMA index must not be negative");
+
+                        // Fill concurrency and affinity masks lists
+                        numa_affinity_masks_list.resize(max_numa_index + 1);
+                        int index = 0;
+                        hwloc_bitmap_foreach_begin(i, process_node_affinity_mask) {
+                            node_buffer = hwloc_get_numanode_obj_by_os_index(topology, i);
+                            index = static_cast<int>(node_buffer->logical_index);
+
+                            hwloc_cpuset_t& current_mask = numa_affinity_masks_list[index];
+                            current_mask = hwloc_bitmap_dup(node_buffer->cpuset);
+
+                            hwloc_bitmap_and(current_mask, current_mask, process_cpu_affinity_mask);
+                            __TBB_ASSERT(!hwloc_bitmap_iszero(current_mask),
+                                         "hwloc detected unavailable NUMA node");
+                        }
+                        hwloc_bitmap_foreach_end();
                     }
-                    __TBB_ASSERT(hwloc_bitmap_weight(current_mask) >= 0, "Infinivitely filled core type mask");
-                } else {
-                    core_types_parsing_broken = true;
-                    break;
                 }
-            }
-        }
-#else /*!__TBBBIND_HWLOC_HYBRID_CPUS_INTERFACES_PRESENT*/
-        bool core_types_parsing_broken{true};
+
+                void core_types_topology_parsing() {
+                    // Fill parameters with stubs if topology parsing is broken.
+                    if (initialization_state != topology_loaded) {
+                        core_types_indexes_list.push_back(-1);
+                        return;
+                    }
+#if __TBBBIND_HWLOC_HYBRID_CPUS_INTERFACES_PRESENT
+                    __TBB_ASSERT(hwloc_get_api_version() >= 0x20400,
+                                 "Hybrid CPUs support interfaces required HWLOC >= 2.4");
+                    // Parsing the hybrid CPU topology
+                    int core_types_number = hwloc_cpukinds_get_nr(topology, 0);
+                    bool core_types_parsing_broken = core_types_number <= 0;
+                    if (!core_types_parsing_broken) {
+                        core_types_affinity_masks_list.resize(core_types_number);
+                        int efficiency {-1};
+
+                        for (int core_type = 0; core_type < core_types_number; ++core_type) {
+                            hwloc_cpuset_t& current_mask = core_types_affinity_masks_list[core_type];
+                            current_mask = hwloc_bitmap_alloc();
+
+                            if (!hwloc_cpukinds_get_info(topology, core_type, current_mask, &efficiency,
+                                                         nullptr, nullptr, 0)
+                                && efficiency >= 0) {
+                                hwloc_bitmap_and(current_mask, current_mask, process_cpu_affinity_mask);
+
+                                if (hwloc_bitmap_weight(current_mask) > 0) {
+                                    core_types_indexes_list.push_back(core_type);
+                                }
+                                __TBB_ASSERT(hwloc_bitmap_weight(current_mask) >= 0,
+                                             "Infinivitely filled core type mask");
+                            } else {
+                                core_types_parsing_broken = true;
+                                break;
+                            }
+                        }
+                    }
+#else  /*!__TBBBIND_HWLOC_HYBRID_CPUS_INTERFACES_PRESENT*/
+                    bool core_types_parsing_broken {true};
 #endif /*__TBBBIND_HWLOC_HYBRID_CPUS_INTERFACES_PRESENT*/
 
-        if (core_types_parsing_broken) {
-            for (auto& core_type_mask : core_types_affinity_masks_list) {
-                hwloc_bitmap_free(core_type_mask);
-            }
-            core_types_affinity_masks_list.resize(1);
-            core_types_indexes_list.resize(1);
+                    if (core_types_parsing_broken) {
+                        for (auto& core_type_mask : core_types_affinity_masks_list) {
+                            hwloc_bitmap_free(core_type_mask);
+                        }
+                        core_types_affinity_masks_list.resize(1);
+                        core_types_indexes_list.resize(1);
 
-            core_types_affinity_masks_list[0] = hwloc_bitmap_dup(process_cpu_affinity_mask);
-            core_types_indexes_list[0] = -1;
-        }
-    }
+                        core_types_affinity_masks_list[0] = hwloc_bitmap_dup(process_cpu_affinity_mask);
+                        core_types_indexes_list[0] = -1;
+                    }
+                }
 
 #if __TBBBIND_HWLOC_WINDOWS_API_AVAILABLE
-    void processor_groups_topology_parsing() {
-        __TBB_ASSERT(number_of_processors_groups > 1, nullptr);
-        processor_groups_affinity_masks_list.resize(number_of_processors_groups);
-        for (unsigned group = 0; group < number_of_processors_groups; ++group) {
-            processor_groups_affinity_masks_list[group] = hwloc_bitmap_alloc();
-            assertion_hwloc_wrapper(hwloc_windows_get_processor_group_cpuset, topology, group,
-                                    processor_groups_affinity_masks_list[group], /*flags*/0);
-        }
+                void processor_groups_topology_parsing() {
+                    __TBB_ASSERT(number_of_processors_groups > 1, nullptr);
+                    processor_groups_affinity_masks_list.resize(number_of_processors_groups);
+                    for (unsigned group = 0; group < number_of_processors_groups; ++group) {
+                        processor_groups_affinity_masks_list[group] = hwloc_bitmap_alloc();
+                        assertion_hwloc_wrapper(hwloc_windows_get_processor_group_cpuset, topology, group,
+                                                processor_groups_affinity_masks_list[group], /*flags*/ 0);
+                    }
 
 #if TBB_USE_ASSERT
-        affinity_mask tmp = hwloc_bitmap_alloc();
-        for (auto proc_group_mask : processor_groups_affinity_masks_list) {
-            __TBB_ASSERT(!hwloc_bitmap_intersects(tmp, proc_group_mask), "Masks of processor groups intersect.");
-            hwloc_bitmap_or(tmp, tmp, proc_group_mask);
-        }
-        hwloc_bitmap_free(tmp);
+                    affinity_mask tmp = hwloc_bitmap_alloc();
+                    for (auto proc_group_mask : processor_groups_affinity_masks_list) {
+                        __TBB_ASSERT(!hwloc_bitmap_intersects(tmp, proc_group_mask),
+                                     "Masks of processor groups intersect.");
+                        hwloc_bitmap_or(tmp, tmp, proc_group_mask);
+                    }
+                    hwloc_bitmap_free(tmp);
 #endif
-    }
+                }
 #endif
 
-    void enforce_hwloc_2_5_runtime_linkage() {
-        // Without the call of this function HWLOC 2.4 can be successfully loaded during the tbbbind_2_5 loading.
-        // It is possible since tbbbind_2_5 don't use any new entry points that were introduced in HWLOC 2.5
-        // But tbbbind_2_5 compiles with HWLOC 2.5 header, therefore such situation requires binary forward compatibility
-        // which are not guaranteed by the HWLOC library. To enforce linkage tbbbind_2_5 only with HWLOC >= 2.5 version
-        // this function calls the interface that is available in the HWLOC 2.5 only.
+                void enforce_hwloc_2_5_runtime_linkage() {
+                    // Without the call of this function HWLOC 2.4 can be successfully loaded during the tbbbind_2_5 loading.
+                    // It is possible since tbbbind_2_5 don't use any new entry points that were introduced in HWLOC 2.5
+                    // But tbbbind_2_5 compiles with HWLOC 2.5 header, therefore such situation requires binary forward compatibility
+                    // which are not guaranteed by the HWLOC library. To enforce linkage tbbbind_2_5 only with HWLOC >= 2.5 version
+                    // this function calls the interface that is available in the HWLOC 2.5 only.
 #if HWLOC_API_VERSION >= 0x20500
-        auto some_core = hwloc_get_next_obj_by_type(topology, HWLOC_OBJ_CORE, nullptr);
-        hwloc_get_obj_with_same_locality(topology, some_core, HWLOC_OBJ_CORE, nullptr, nullptr, 0);
+                    auto some_core = hwloc_get_next_obj_by_type(topology, HWLOC_OBJ_CORE, nullptr);
+                    hwloc_get_obj_with_same_locality(topology, some_core, HWLOC_OBJ_CORE, nullptr, nullptr,
+                                                     0);
 #endif
-    }
-
+                }
 
-    void initialize( std::size_t groups_num ) {
-        if ( initialization_state != uninitialized )
-            return;
+                void initialize(std::size_t groups_num) {
+                    if (initialization_state != uninitialized) return;
 
-        topology_initialization(groups_num);
-        numa_topology_parsing();
-        core_types_topology_parsing();
+                    topology_initialization(groups_num);
+                    numa_topology_parsing();
+                    core_types_topology_parsing();
 #if __TBBBIND_HWLOC_WINDOWS_API_AVAILABLE
-        if (intergroup_binding_allowed(groups_num)) {
-           processor_groups_topology_parsing();
-        }
+                    if (intergroup_binding_allowed(groups_num)) { processor_groups_topology_parsing(); }
 #endif
 
-        enforce_hwloc_2_5_runtime_linkage();
+                    enforce_hwloc_2_5_runtime_linkage();
 
-        if (initialization_state == topology_loaded)
-            initialization_state = topology_parsed;
-    }
+                    if (initialization_state == topology_loaded) initialization_state = topology_parsed;
+                }
 
-    static system_topology* instance_ptr;
-public:
-    typedef hwloc_cpuset_t             affinity_mask;
-    typedef hwloc_const_cpuset_t const_affinity_mask;
+                static system_topology* instance_ptr;
 
-    bool is_topology_parsed() { return initialization_state == topology_parsed; }
+            public:
+                typedef hwloc_cpuset_t affinity_mask;
+                typedef hwloc_const_cpuset_t const_affinity_mask;
 
-    static void construct( std::size_t groups_num ) {
-        if (instance_ptr == nullptr) {
-            instance_ptr = new system_topology();
-            instance_ptr->initialize(groups_num);
-        }
-    }
+                bool is_topology_parsed() { return initialization_state == topology_parsed; }
 
-    static system_topology& instance() {
-        __TBB_ASSERT(instance_ptr != nullptr, "Getting instance of non-constructed topology");
-        return *instance_ptr;
-    }
+                static void construct(std::size_t groups_num) {
+                    if (instance_ptr == nullptr) {
+                        instance_ptr = new system_topology();
+                        instance_ptr->initialize(groups_num);
+                    }
+                }
 
-    static void destroy() {
-        __TBB_ASSERT(instance_ptr != nullptr, "Destroying non-constructed topology");
-        delete instance_ptr;
-    }
+                static system_topology& instance() {
+                    __TBB_ASSERT(instance_ptr != nullptr, "Getting instance of non-constructed topology");
+                    return *instance_ptr;
+                }
 
-    ~system_topology() {
-        if ( is_topology_parsed() ) {
-            for (auto& numa_node_mask : numa_affinity_masks_list) {
-                hwloc_bitmap_free(numa_node_mask);
-            }
+                static void destroy() {
+                    __TBB_ASSERT(instance_ptr != nullptr, "Destroying non-constructed topology");
+                    delete instance_ptr;
+                }
 
-            for (auto& core_type_mask : core_types_affinity_masks_list) {
-                hwloc_bitmap_free(core_type_mask);
-            }
+                ~system_topology() {
+                    if (is_topology_parsed()) {
+                        for (auto& numa_node_mask : numa_affinity_masks_list) {
+                            hwloc_bitmap_free(numa_node_mask);
+                        }
 
-            for (auto& processor_group : processor_groups_affinity_masks_list) {
-                hwloc_bitmap_free(processor_group);
-            }
+                        for (auto& core_type_mask : core_types_affinity_masks_list) {
+                            hwloc_bitmap_free(core_type_mask);
+                        }
+
+                        for (auto& processor_group : processor_groups_affinity_masks_list) {
+                            hwloc_bitmap_free(processor_group);
+                        }
 
-            hwloc_bitmap_free(process_node_affinity_mask);
-            hwloc_bitmap_free(process_cpu_affinity_mask);
-        }
-
-        if ( initialization_state >= topology_allocated ) {
-            hwloc_topology_destroy(topology);
-        }
-
-        initialization_state = uninitialized;
-    }
-
-    void fill_topology_information(
-        int& _numa_nodes_count, int*& _numa_indexes_list,
-        int& _core_types_count, int*& _core_types_indexes_list
-    ) {
-        __TBB_ASSERT(is_topology_parsed(), "Trying to get access to uninitialized system_topology");
-        _numa_nodes_count = numa_nodes_count;
-        _numa_indexes_list = numa_indexes_list.data();
-
-        _core_types_count = (int)core_types_indexes_list.size();
-        _core_types_indexes_list = core_types_indexes_list.data();
-    }
-
-    void fill_constraints_affinity_mask(affinity_mask input_mask, int numa_node_index, int core_type_index, int max_threads_per_core) {
-        __TBB_ASSERT(is_topology_parsed(), "Trying to get access to uninitialized system_topology");
-        __TBB_ASSERT(numa_node_index < (int)numa_affinity_masks_list.size(), "Wrong NUMA node id");
-        __TBB_ASSERT(core_type_index < (int)core_types_affinity_masks_list.size(), "Wrong core type id");
-        __TBB_ASSERT(max_threads_per_core == -1 || max_threads_per_core > 0, "Wrong max_threads_per_core");
-
-        hwloc_cpuset_t constraints_mask = hwloc_bitmap_alloc();
-        hwloc_cpuset_t core_mask = hwloc_bitmap_alloc();
-
-        hwloc_bitmap_copy(constraints_mask, process_cpu_affinity_mask);
-        if (numa_node_index >= 0) {
-            hwloc_bitmap_and(constraints_mask, constraints_mask, numa_affinity_masks_list[numa_node_index]);
-        }
-        if (core_type_index >= 0) {
-            hwloc_bitmap_and(constraints_mask, constraints_mask, core_types_affinity_masks_list[core_type_index]);
-        }
-        if (max_threads_per_core > 0) {
-            // clear input mask
-            hwloc_bitmap_zero(input_mask);
-
-            hwloc_obj_t current_core = nullptr;
-            while ((current_core = hwloc_get_next_obj_by_type(topology, HWLOC_OBJ_CORE, current_core)) != nullptr) {
-                hwloc_bitmap_and(core_mask, constraints_mask, current_core->cpuset);
-
-                // fit the core mask to required bits number
-                int current_threads_per_core = 0;
-                for (int id = hwloc_bitmap_first(core_mask); id != -1; id = hwloc_bitmap_next(core_mask, id)) {
-                    if (++current_threads_per_core > max_threads_per_core) {
-                        hwloc_bitmap_clr(core_mask, id);
+                        hwloc_bitmap_free(process_node_affinity_mask);
+                        hwloc_bitmap_free(process_cpu_affinity_mask);
                     }
+
+                    if (initialization_state >= topology_allocated) { hwloc_topology_destroy(topology); }
+
+                    initialization_state = uninitialized;
                 }
 
-                hwloc_bitmap_or(input_mask, input_mask, core_mask);
-            }
-        } else {
-            hwloc_bitmap_copy(input_mask, constraints_mask);
-        }
-
-        hwloc_bitmap_free(core_mask);
-        hwloc_bitmap_free(constraints_mask);
-    }
-
-    void fit_num_threads_per_core(affinity_mask result_mask, affinity_mask current_mask, affinity_mask constraints_mask) {
-        hwloc_bitmap_zero(result_mask);
-        hwloc_obj_t current_core = nullptr;
-        while ((current_core = hwloc_get_next_obj_by_type(topology, HWLOC_OBJ_CORE, current_core)) != nullptr) {
-            if (hwloc_bitmap_intersects(current_mask, current_core->cpuset)) {
-                hwloc_bitmap_or(result_mask, result_mask, current_core->cpuset);
-            }
-        }
-        hwloc_bitmap_and(result_mask, result_mask, constraints_mask);
-    }
+                void fill_topology_information(int& _numa_nodes_count, int*& _numa_indexes_list,
+                                               int& _core_types_count, int*& _core_types_indexes_list) {
+                    __TBB_ASSERT(is_topology_parsed(),
+                                 "Trying to get access to uninitialized system_topology");
+                    _numa_nodes_count = numa_nodes_count;
+                    _numa_indexes_list = numa_indexes_list.data();
+
+                    _core_types_count = (int) core_types_indexes_list.size();
+                    _core_types_indexes_list = core_types_indexes_list.data();
+                }
+
+                void fill_constraints_affinity_mask(affinity_mask input_mask, int numa_node_index,
+                                                    int core_type_index, int max_threads_per_core) {
+                    __TBB_ASSERT(is_topology_parsed(),
+                                 "Trying to get access to uninitialized system_topology");
+                    __TBB_ASSERT(numa_node_index < (int) numa_affinity_masks_list.size(),
+                                 "Wrong NUMA node id");
+                    __TBB_ASSERT(core_type_index < (int) core_types_affinity_masks_list.size(),
+                                 "Wrong core type id");
+                    __TBB_ASSERT(max_threads_per_core == -1 || max_threads_per_core > 0,
+                                 "Wrong max_threads_per_core");
+
+                    hwloc_cpuset_t constraints_mask = hwloc_bitmap_alloc();
+                    hwloc_cpuset_t core_mask = hwloc_bitmap_alloc();
+
+                    hwloc_bitmap_copy(constraints_mask, process_cpu_affinity_mask);
+                    if (numa_node_index >= 0) {
+                        hwloc_bitmap_and(constraints_mask, constraints_mask,
+                                         numa_affinity_masks_list[numa_node_index]);
+                    }
+                    if (core_type_index >= 0) {
+                        hwloc_bitmap_and(constraints_mask, constraints_mask,
+                                         core_types_affinity_masks_list[core_type_index]);
+                    }
+                    if (max_threads_per_core > 0) {
+                        // clear input mask
+                        hwloc_bitmap_zero(input_mask);
+
+                        hwloc_obj_t current_core = nullptr;
+                        while ((current_core
+                                = hwloc_get_next_obj_by_type(topology, HWLOC_OBJ_CORE, current_core))
+                               != nullptr) {
+                            hwloc_bitmap_and(core_mask, constraints_mask, current_core->cpuset);
+
+                            // fit the core mask to required bits number
+                            int current_threads_per_core = 0;
+                            for (int id = hwloc_bitmap_first(core_mask); id != -1;
+                                 id = hwloc_bitmap_next(core_mask, id)) {
+                                if (++current_threads_per_core > max_threads_per_core) {
+                                    hwloc_bitmap_clr(core_mask, id);
+                                }
+                            }
+
+                            hwloc_bitmap_or(input_mask, input_mask, core_mask);
+                        }
+                    } else {
+                        hwloc_bitmap_copy(input_mask, constraints_mask);
+                    }
 
-    /**
+                    hwloc_bitmap_free(core_mask);
+                    hwloc_bitmap_free(constraints_mask);
+                }
+
+                void fit_num_threads_per_core(affinity_mask result_mask, affinity_mask current_mask,
+                                              affinity_mask constraints_mask) {
+                    hwloc_bitmap_zero(result_mask);
+                    hwloc_obj_t current_core = nullptr;
+                    while ((current_core = hwloc_get_next_obj_by_type(topology, HWLOC_OBJ_CORE, current_core))
+                           != nullptr) {
+                        if (hwloc_bitmap_intersects(current_mask, current_core->cpuset)) {
+                            hwloc_bitmap_or(result_mask, result_mask, current_core->cpuset);
+                        }
+                    }
+                    hwloc_bitmap_and(result_mask, result_mask, constraints_mask);
+                }
+
+                /**
      * Finds processor group for the passed slot number, which are from 0 to max concurrency - 1, by
      * traversing masks of processor groups one by one, intersecting them with the constrained mask.
      * Once total weight of processor groups united mask is greater than the slot number, the mask
      * of the last traversed processor group is returned, denoting the mask to apply to the thread
      * occupying given slot number.
      */
-    void fit_to_processor_group(affinity_mask result_mask, affinity_mask constraints_mask, std::size_t slot_num) {
-        __TBB_ASSERT(number_of_processors_groups > 1, nullptr);
-        hwloc_bitmap_zero(result_mask);
-        int constraints_mask_weight = hwloc_bitmap_weight(constraints_mask);
-        // Map slot number to a number within constraints mask if
-        // max concurrency is greater than weight of the mask.
-        slot_num %= constraints_mask_weight;
-        std::size_t total_weight = 0;
-        for (auto& processor_group : processor_groups_affinity_masks_list) {
-            if (hwloc_bitmap_intersects(constraints_mask, processor_group)) {
-                hwloc_bitmap_and(result_mask, processor_group, constraints_mask);
-                total_weight += hwloc_bitmap_weight(result_mask);
-                if (slot_num < total_weight) {
-                    return;     // Corresponding processor group where to bind the thread is found
+                void fit_to_processor_group(affinity_mask result_mask, affinity_mask constraints_mask,
+                                            std::size_t slot_num) {
+                    __TBB_ASSERT(number_of_processors_groups > 1, nullptr);
+                    hwloc_bitmap_zero(result_mask);
+                    int constraints_mask_weight = hwloc_bitmap_weight(constraints_mask);
+                    // Map slot number to a number within constraints mask if
+                    // max concurrency is greater than weight of the mask.
+                    slot_num %= constraints_mask_weight;
+                    std::size_t total_weight = 0;
+                    for (auto& processor_group : processor_groups_affinity_masks_list) {
+                        if (hwloc_bitmap_intersects(constraints_mask, processor_group)) {
+                            hwloc_bitmap_and(result_mask, processor_group, constraints_mask);
+                            total_weight += hwloc_bitmap_weight(result_mask);
+                            if (slot_num < total_weight) {
+                                return;// Corresponding processor group where to bind the thread is found
+                            }
+                        }
+                    }
                 }
-            }
-        }
-    }
 
-    int get_default_concurrency(int numa_node_index, int core_type_index, int max_threads_per_core) {
-        __TBB_ASSERT(is_topology_parsed(), "Trying to get access to uninitialized system_topology");
+                int get_default_concurrency(int numa_node_index, int core_type_index,
+                                            int max_threads_per_core) {
+                    __TBB_ASSERT(is_topology_parsed(),
+                                 "Trying to get access to uninitialized system_topology");
 
-        hwloc_cpuset_t constraints_mask = hwloc_bitmap_alloc();
-        fill_constraints_affinity_mask(constraints_mask, numa_node_index, core_type_index, max_threads_per_core);
+                    hwloc_cpuset_t constraints_mask = hwloc_bitmap_alloc();
+                    fill_constraints_affinity_mask(constraints_mask, numa_node_index, core_type_index,
+                                                   max_threads_per_core);
 
-        int default_concurrency = hwloc_bitmap_weight(constraints_mask);
-        hwloc_bitmap_free(constraints_mask);
-        return default_concurrency;
-    }
+                    int default_concurrency = hwloc_bitmap_weight(constraints_mask);
+                    hwloc_bitmap_free(constraints_mask);
+                    return default_concurrency;
+                }
 
-    affinity_mask allocate_process_affinity_mask() {
-        __TBB_ASSERT(is_topology_parsed(), "Trying to get access to uninitialized system_topology");
-        return hwloc_bitmap_dup(process_cpu_affinity_mask);
-    }
+                affinity_mask allocate_process_affinity_mask() {
+                    __TBB_ASSERT(is_topology_parsed(),
+                                 "Trying to get access to uninitialized system_topology");
+                    return hwloc_bitmap_dup(process_cpu_affinity_mask);
+                }
 
-    void free_affinity_mask( affinity_mask mask_to_free ) {
-        hwloc_bitmap_free(mask_to_free); // If bitmap is nullptr, no operation is performed.
-    }
+                void free_affinity_mask(affinity_mask mask_to_free) {
+                    hwloc_bitmap_free(mask_to_free);// If bitmap is nullptr, no operation is performed.
+                }
 
-    void store_current_affinity_mask( affinity_mask current_mask ) {
-        assertion_hwloc_wrapper(hwloc_get_cpubind, topology, current_mask, HWLOC_CPUBIND_THREAD);
+                void store_current_affinity_mask(affinity_mask current_mask) {
+                    assertion_hwloc_wrapper(hwloc_get_cpubind, topology, current_mask, HWLOC_CPUBIND_THREAD);
 
-        hwloc_bitmap_and(current_mask, current_mask, process_cpu_affinity_mask);
-        __TBB_ASSERT(!hwloc_bitmap_iszero(current_mask),
-            "Current affinity mask must intersects with process affinity mask");
-    }
+                    hwloc_bitmap_and(current_mask, current_mask, process_cpu_affinity_mask);
+                    __TBB_ASSERT(!hwloc_bitmap_iszero(current_mask),
+                                 "Current affinity mask must intersects with process affinity mask");
+                }
 
-    void set_affinity_mask( const_affinity_mask mask ) {
-        if (hwloc_bitmap_weight(mask) > 0) {
-            assertion_hwloc_wrapper(hwloc_set_cpubind, topology, mask, HWLOC_CPUBIND_THREAD);
-        }
-    }
-};
+                void set_affinity_mask(const_affinity_mask mask) {
+                    if (hwloc_bitmap_weight(mask) > 0) {
+                        assertion_hwloc_wrapper(hwloc_set_cpubind, topology, mask, HWLOC_CPUBIND_THREAD);
+                    }
+                }
+            };
 
-system_topology* system_topology::instance_ptr{nullptr};
+            system_topology* system_topology::instance_ptr {nullptr};
 
-class binding_handler {
-    // Following vector saves thread affinity mask on scheduler entry to return it to this thread
-    // on scheduler exit.
-    typedef std::vector<system_topology::affinity_mask> affinity_masks_container;
-    affinity_masks_container affinity_backup;
-    system_topology::affinity_mask handler_affinity_mask;
+            class binding_handler {
+                // Following vector saves thread affinity mask on scheduler entry to return it to this thread
+                // on scheduler exit.
+                typedef std::vector<system_topology::affinity_mask> affinity_masks_container;
+                affinity_masks_container affinity_backup;
+                system_topology::affinity_mask handler_affinity_mask;
 
 #ifdef _WIN32
-    affinity_masks_container affinity_buffer;
-    int my_numa_node_id;
-    int my_core_type_id;
-    int my_max_threads_per_core;
+                affinity_masks_container affinity_buffer;
+                int my_numa_node_id;
+                int my_core_type_id;
+                int my_max_threads_per_core;
 #endif
 
-public:
-    binding_handler( std::size_t size, int numa_node_id, int core_type_id, int max_threads_per_core )
-        : affinity_backup(size)
+            public:
+                binding_handler(std::size_t size, int numa_node_id, int core_type_id,
+                                int max_threads_per_core)
+                    : affinity_backup(size)
 #ifdef _WIN32
-        , affinity_buffer(size)
-        , my_numa_node_id(numa_node_id)
-        , my_core_type_id(core_type_id)
-        , my_max_threads_per_core(max_threads_per_core)
+                      ,
+                      affinity_buffer(size), my_numa_node_id(numa_node_id), my_core_type_id(core_type_id),
+                      my_max_threads_per_core(max_threads_per_core)
 #endif
-    {
-        for (std::size_t i = 0; i < size; ++i) {
-            affinity_backup[i] = system_topology::instance().allocate_process_affinity_mask();
+                {
+                    for (std::size_t i = 0; i < size; ++i) {
+                        affinity_backup[i] = system_topology::instance().allocate_process_affinity_mask();
 #ifdef _WIN32
-            affinity_buffer[i] = system_topology::instance().allocate_process_affinity_mask();
+                        affinity_buffer[i] = system_topology::instance().allocate_process_affinity_mask();
 #endif
-        }
-        handler_affinity_mask = system_topology::instance().allocate_process_affinity_mask();
-        system_topology::instance().fill_constraints_affinity_mask
-            (handler_affinity_mask, numa_node_id, core_type_id, max_threads_per_core);
-    }
-
-    ~binding_handler() {
-        for (std::size_t i = 0; i < affinity_backup.size(); ++i) {
-            system_topology::instance().free_affinity_mask(affinity_backup[i]);
+                    }
+                    handler_affinity_mask = system_topology::instance().allocate_process_affinity_mask();
+                    system_topology::instance().fill_constraints_affinity_mask(
+                            handler_affinity_mask, numa_node_id, core_type_id, max_threads_per_core);
+                }
+
+                ~binding_handler() {
+                    for (std::size_t i = 0; i < affinity_backup.size(); ++i) {
+                        system_topology::instance().free_affinity_mask(affinity_backup[i]);
 #ifdef _WIN32
-            system_topology::instance().free_affinity_mask(affinity_buffer[i]);
+                        system_topology::instance().free_affinity_mask(affinity_buffer[i]);
 #endif
-        }
-        system_topology::instance().free_affinity_mask(handler_affinity_mask);
-    }
-
-    void apply_affinity( unsigned slot_num ) {
-        auto& topology = system_topology::instance();
-        __TBB_ASSERT(slot_num < affinity_backup.size(),
-            "The slot number is greater than the number of slots in the arena");
-        __TBB_ASSERT(topology.is_topology_parsed(),
-            "Trying to get access to uninitialized system_topology");
-
-        topology.store_current_affinity_mask(affinity_backup[slot_num]);
-        system_topology::affinity_mask thread_affinity = handler_affinity_mask;
+                    }
+                    system_topology::instance().free_affinity_mask(handler_affinity_mask);
+                }
+
+                void apply_affinity(unsigned slot_num) {
+                    auto& topology = system_topology::instance();
+                    __TBB_ASSERT(slot_num < affinity_backup.size(),
+                                 "The slot number is greater than the number of slots in the arena");
+                    __TBB_ASSERT(topology.is_topology_parsed(),
+                                 "Trying to get access to uninitialized system_topology");
+
+                    topology.store_current_affinity_mask(affinity_backup[slot_num]);
+                    system_topology::affinity_mask thread_affinity = handler_affinity_mask;
 #ifdef _WIN32
-        // If we have a constraint based only on the max_threads_per_core setting, then the
-        // constraints affinity mask may cross the border between several processor groups
-        // on systems with more then 64 logical processors. That is why we need to use the special
-        // function, which regulates the number of threads in the current threads mask.
-        bool is_default_numa = my_numa_node_id == -1 || topology.numa_indexes_list.size() == 1;
-        bool is_default_core_type = my_core_type_id == -1 || topology.core_types_indexes_list.size() == 1;
-        if (topology.number_of_processors_groups > 1 && my_max_threads_per_core != -1 &&
-            is_default_numa && is_default_core_type
-        ) {
-            topology.fit_num_threads_per_core(affinity_buffer[slot_num], affinity_backup[slot_num], handler_affinity_mask);
-            thread_affinity = affinity_buffer[slot_num];
-        }
-    #if __TBBBIND_HWLOC_WINDOWS_API_AVAILABLE
-        else if (topology.number_of_processors_groups > 1) {
-            topology.fit_to_processor_group(affinity_buffer[slot_num], handler_affinity_mask, slot_num);
-            thread_affinity = affinity_buffer[slot_num];
-        }
-    #endif
+                    // If we have a constraint based only on the max_threads_per_core setting, then the
+                    // constraints affinity mask may cross the border between several processor groups
+                    // on systems with more then 64 logical processors. That is why we need to use the special
+                    // function, which regulates the number of threads in the current threads mask.
+                    bool is_default_numa = my_numa_node_id == -1 || topology.numa_indexes_list.size() == 1;
+                    bool is_default_core_type
+                            = my_core_type_id == -1 || topology.core_types_indexes_list.size() == 1;
+                    if (topology.number_of_processors_groups > 1 && my_max_threads_per_core != -1
+                        && is_default_numa && is_default_core_type) {
+                        topology.fit_num_threads_per_core(affinity_buffer[slot_num],
+                                                          affinity_backup[slot_num], handler_affinity_mask);
+                        thread_affinity = affinity_buffer[slot_num];
+                    }
+#if __TBBBIND_HWLOC_WINDOWS_API_AVAILABLE
+                    else if (topology.number_of_processors_groups > 1) {
+                        topology.fit_to_processor_group(affinity_buffer[slot_num], handler_affinity_mask,
+                                                        slot_num);
+                        thread_affinity = affinity_buffer[slot_num];
+                    }
 #endif
-        topology.set_affinity_mask(thread_affinity);
-    }
-
-    void restore_previous_affinity_mask( unsigned slot_num ) {
-        auto& topology = system_topology::instance();
-        __TBB_ASSERT(topology.is_topology_parsed(),
-            "Trying to get access to uninitialized system_topology");
-        topology.set_affinity_mask(affinity_backup[slot_num]);
-    };
-
-};
-
-extern "C" { // exported to TBB interfaces
-
-TBBBIND_EXPORT void __TBB_internal_initialize_system_topology(
-    std::size_t groups_num,
-    int& numa_nodes_count, int*& numa_indexes_list,
-    int& core_types_count, int*& core_types_indexes_list
-) {
-    system_topology::construct(groups_num);
-    system_topology::instance().fill_topology_information(
-        numa_nodes_count, numa_indexes_list,
-        core_types_count, core_types_indexes_list
-    );
-}
-
-TBBBIND_EXPORT binding_handler* __TBB_internal_allocate_binding_handler(int number_of_slots, int numa_id, int core_type_id, int max_threads_per_core) {
-    __TBB_ASSERT(number_of_slots > 0, "Trying to create numa handler for 0 threads.");
-    return new binding_handler(number_of_slots, numa_id, core_type_id, max_threads_per_core);
-}
-
-TBBBIND_EXPORT void __TBB_internal_deallocate_binding_handler(binding_handler* handler_ptr) {
-    __TBB_ASSERT(handler_ptr != nullptr, "Trying to deallocate nullptr pointer.");
-    delete handler_ptr;
-}
-
-TBBBIND_EXPORT void __TBB_internal_apply_affinity(binding_handler* handler_ptr, int slot_num) {
-    __TBB_ASSERT(handler_ptr != nullptr, "Trying to get access to uninitialized metadata.");
-    handler_ptr->apply_affinity(slot_num);
-}
-
-TBBBIND_EXPORT void __TBB_internal_restore_affinity(binding_handler* handler_ptr, int slot_num) {
-    __TBB_ASSERT(handler_ptr != nullptr, "Trying to get access to uninitialized metadata.");
-    handler_ptr->restore_previous_affinity_mask(slot_num);
-}
-
-TBBBIND_EXPORT int __TBB_internal_get_default_concurrency(int numa_id, int core_type_id, int max_threads_per_core) {
-    return system_topology::instance().get_default_concurrency(numa_id, core_type_id, max_threads_per_core);
-}
-
-TBBBIND_EXPORT void __TBB_internal_destroy_system_topology() {
-    return system_topology::destroy();
-}
-
-} // extern "C"
-
-} // namespace r1
-} // namespace detail
-} // namespace tbb
+#endif
+                    topology.set_affinity_mask(thread_affinity);
+                }
+
+                void restore_previous_affinity_mask(unsigned slot_num) {
+                    auto& topology = system_topology::instance();
+                    __TBB_ASSERT(topology.is_topology_parsed(),
+                                 "Trying to get access to uninitialized system_topology");
+                    topology.set_affinity_mask(affinity_backup[slot_num]);
+                };
+            };
+
+            extern "C" {// exported to TBB interfaces
+
+            TBBBIND_EXPORT void __TBB_internal_initialize_system_topology(std::size_t groups_num,
+                                                                          int& numa_nodes_count,
+                                                                          int*& numa_indexes_list,
+                                                                          int& core_types_count,
+                                                                          int*& core_types_indexes_list) {
+                system_topology::construct(groups_num);
+                system_topology::instance().fill_topology_information(
+                        numa_nodes_count, numa_indexes_list, core_types_count, core_types_indexes_list);
+            }
+
+            TBBBIND_EXPORT binding_handler*
+            __TBB_internal_allocate_binding_handler(int number_of_slots, int numa_id, int core_type_id,
+                                                    int max_threads_per_core) {
+                __TBB_ASSERT(number_of_slots > 0, "Trying to create numa handler for 0 threads.");
+                return new binding_handler(number_of_slots, numa_id, core_type_id, max_threads_per_core);
+            }
+
+            TBBBIND_EXPORT void __TBB_internal_deallocate_binding_handler(binding_handler* handler_ptr) {
+                __TBB_ASSERT(handler_ptr != nullptr, "Trying to deallocate nullptr pointer.");
+                delete handler_ptr;
+            }
+
+            TBBBIND_EXPORT void __TBB_internal_apply_affinity(binding_handler* handler_ptr, int slot_num) {
+                __TBB_ASSERT(handler_ptr != nullptr, "Trying to get access to uninitialized metadata.");
+                handler_ptr->apply_affinity(slot_num);
+            }
+
+            TBBBIND_EXPORT void __TBB_internal_restore_affinity(binding_handler* handler_ptr, int slot_num) {
+                __TBB_ASSERT(handler_ptr != nullptr, "Trying to get access to uninitialized metadata.");
+                handler_ptr->restore_previous_affinity_mask(slot_num);
+            }
+
+            TBBBIND_EXPORT int __TBB_internal_get_default_concurrency(int numa_id, int core_type_id,
+                                                                      int max_threads_per_core) {
+                return system_topology::instance().get_default_concurrency(numa_id, core_type_id,
+                                                                           max_threads_per_core);
+            }
+
+            TBBBIND_EXPORT void __TBB_internal_destroy_system_topology() {
+                return system_topology::destroy();
+            }
+
+            }// extern "C"
+
+        }// namespace r1
+    }    // namespace detail
+}// namespace tbb
 
 #undef assertion_hwloc_wrapper
diff --git a/external/tbb/src/tbbmalloc/backend.cpp b/external/tbb/src/tbbmalloc/backend.cpp
index 87531f81..adc15be9 100644
--- a/external/tbb/src/tbbmalloc/backend.cpp
+++ b/external/tbb/src/tbbmalloc/backend.cpp
@@ -14,16 +14,16 @@
     limitations under the License.
 */
 
-#include <string.h>   /* for memset */
-#include <errno.h>
 #include "tbbmalloc_internal.h"
+#include <errno.h>
+#include <string.h> /* for memset */
 
 namespace rml {
-namespace internal {
+    namespace internal {
 
-/*********** Code to acquire memory from the OS or other executive ****************/
+        /*********** Code to acquire memory from the OS or other executive ****************/
 
-/*
+        /*
   syscall/malloc can set non-zero errno in case of failure,
   but later allocator might be able to find memory to fulfill the request.
   And we do not want changing of errno by successful scalable_malloc call.
@@ -39,1475 +39,1382 @@ namespace internal {
 /* assume MapMemory and UnmapMemory are customized */
 #endif
 
-void* getRawMemory (size_t size, PageType pageType) {
-    return MapMemory(size, pageType);
-}
+        void *getRawMemory(size_t size, PageType pageType) { return MapMemory(size, pageType); }
 
-int freeRawMemory (void *object, size_t size) {
-    return UnmapMemory(object, size);
-}
+        int freeRawMemory(void *object, size_t size) { return UnmapMemory(object, size); }
 
 #if CHECK_ALLOCATION_RANGE
 
-void Backend::UsedAddressRange::registerAlloc(uintptr_t left, uintptr_t right)
-{
-    MallocMutex::scoped_lock lock(mutex);
-    if (left < leftBound.load(std::memory_order_relaxed))
-        leftBound.store(left, std::memory_order_relaxed);
-    if (right > rightBound.load(std::memory_order_relaxed))
-        rightBound.store(right, std::memory_order_relaxed);
-    MALLOC_ASSERT(leftBound.load(std::memory_order_relaxed), ASSERT_TEXT);
-    MALLOC_ASSERT(leftBound.load(std::memory_order_relaxed) < rightBound.load(std::memory_order_relaxed), ASSERT_TEXT);
-    MALLOC_ASSERT(leftBound.load(std::memory_order_relaxed) <= left && right <= rightBound.load(std::memory_order_relaxed), ASSERT_TEXT);
-}
-
-void Backend::UsedAddressRange::registerFree(uintptr_t left, uintptr_t right)
-{
-    MallocMutex::scoped_lock lock(mutex);
-    if (leftBound.load(std::memory_order_relaxed) == left) {
-        if (rightBound.load(std::memory_order_relaxed) == right) {
-            leftBound.store(ADDRESS_UPPER_BOUND, std::memory_order_relaxed);
-            rightBound.store(0, std::memory_order_relaxed);
-        } else
-            leftBound.store(right, std::memory_order_relaxed);
-    } else if (rightBound.load(std::memory_order_relaxed) == right)
-        rightBound.store(left, std::memory_order_relaxed);
-    MALLOC_ASSERT((!rightBound.load(std::memory_order_relaxed) && leftBound.load(std::memory_order_relaxed) == ADDRESS_UPPER_BOUND)
-                  || leftBound.load(std::memory_order_relaxed) < rightBound.load(std::memory_order_relaxed), ASSERT_TEXT);
-}
-#endif // CHECK_ALLOCATION_RANGE
-
-// Initialized in frontend inside defaultMemPool
-extern HugePagesStatus hugePages;
-
-void *Backend::allocRawMem(size_t &size)
-{
-    void *res = nullptr;
-    size_t allocSize = 0;
-
-    if (extMemPool->userPool()) {
-        if (extMemPool->fixedPool && bootsrapMemDone == bootsrapMemStatus.load(std::memory_order_acquire))
-            return nullptr;
-        MALLOC_ASSERT(bootsrapMemStatus != bootsrapMemNotDone,
-                      "Backend::allocRawMem() called prematurely?");
-        // TODO: support for raw mem not aligned at sizeof(uintptr_t)
-        // memory from fixed pool is asked once and only once
-        allocSize = alignUpGeneric(size, extMemPool->granularity);
-        res = (*extMemPool->rawAlloc)(extMemPool->poolId, allocSize);
-    } else {
-        // Align allocation on page size
-        size_t pageSize = hugePages.isEnabled ? hugePages.getGranularity() : extMemPool->granularity;
-        MALLOC_ASSERT(pageSize, "Page size cannot be zero.");
-        allocSize = alignUpGeneric(size, pageSize);
-
-        // If user requested huge pages and they are available, try to use preallocated ones firstly.
-        // If there are none, lets check transparent huge pages support and use them instead.
-        if (hugePages.isEnabled) {
-            if (hugePages.isHPAvailable) {
-                res = getRawMemory(allocSize, PREALLOCATED_HUGE_PAGE);
-            }
-            if (!res && hugePages.isTHPAvailable) {
-                res = getRawMemory(allocSize, TRANSPARENT_HUGE_PAGE);
-            }
+        void Backend::UsedAddressRange::registerAlloc(uintptr_t left, uintptr_t right) {
+            MallocMutex::scoped_lock lock(mutex);
+            if (left < leftBound.load(std::memory_order_relaxed))
+                leftBound.store(left, std::memory_order_relaxed);
+            if (right > rightBound.load(std::memory_order_relaxed))
+                rightBound.store(right, std::memory_order_relaxed);
+            MALLOC_ASSERT(leftBound.load(std::memory_order_relaxed), ASSERT_TEXT);
+            MALLOC_ASSERT(leftBound.load(std::memory_order_relaxed)
+                                  < rightBound.load(std::memory_order_relaxed),
+                          ASSERT_TEXT);
+            MALLOC_ASSERT(leftBound.load(std::memory_order_relaxed) <= left
+                                  && right <= rightBound.load(std::memory_order_relaxed),
+                          ASSERT_TEXT);
         }
 
-        if (!res) {
-            res = getRawMemory(allocSize, REGULAR);
+        void Backend::UsedAddressRange::registerFree(uintptr_t left, uintptr_t right) {
+            MallocMutex::scoped_lock lock(mutex);
+            if (leftBound.load(std::memory_order_relaxed) == left) {
+                if (rightBound.load(std::memory_order_relaxed) == right) {
+                    leftBound.store(ADDRESS_UPPER_BOUND, std::memory_order_relaxed);
+                    rightBound.store(0, std::memory_order_relaxed);
+                } else
+                    leftBound.store(right, std::memory_order_relaxed);
+            } else if (rightBound.load(std::memory_order_relaxed) == right)
+                rightBound.store(left, std::memory_order_relaxed);
+            MALLOC_ASSERT((!rightBound.load(std::memory_order_relaxed)
+                           && leftBound.load(std::memory_order_relaxed) == ADDRESS_UPPER_BOUND)
+                                  || leftBound.load(std::memory_order_relaxed)
+                                             < rightBound.load(std::memory_order_relaxed),
+                          ASSERT_TEXT);
         }
-    }
+#endif// CHECK_ALLOCATION_RANGE
+
+        // Initialized in frontend inside defaultMemPool
+        extern HugePagesStatus hugePages;
+
+        void *Backend::allocRawMem(size_t &size) {
+            void *res = nullptr;
+            size_t allocSize = 0;
+
+            if (extMemPool->userPool()) {
+                if (extMemPool->fixedPool
+                    && bootsrapMemDone == bootsrapMemStatus.load(std::memory_order_acquire))
+                    return nullptr;
+                MALLOC_ASSERT(bootsrapMemStatus != bootsrapMemNotDone,
+                              "Backend::allocRawMem() called prematurely?");
+                // TODO: support for raw mem not aligned at sizeof(uintptr_t)
+                // memory from fixed pool is asked once and only once
+                allocSize = alignUpGeneric(size, extMemPool->granularity);
+                res = (*extMemPool->rawAlloc)(extMemPool->poolId, allocSize);
+            } else {
+                // Align allocation on page size
+                size_t pageSize = hugePages.isEnabled ? hugePages.getGranularity() : extMemPool->granularity;
+                MALLOC_ASSERT(pageSize, "Page size cannot be zero.");
+                allocSize = alignUpGeneric(size, pageSize);
+
+                // If user requested huge pages and they are available, try to use preallocated ones firstly.
+                // If there are none, lets check transparent huge pages support and use them instead.
+                if (hugePages.isEnabled) {
+                    if (hugePages.isHPAvailable) { res = getRawMemory(allocSize, PREALLOCATED_HUGE_PAGE); }
+                    if (!res && hugePages.isTHPAvailable) {
+                        res = getRawMemory(allocSize, TRANSPARENT_HUGE_PAGE);
+                    }
+                }
+
+                if (!res) { res = getRawMemory(allocSize, REGULAR); }
+            }
 
-    if (res) {
-        MALLOC_ASSERT(allocSize > 0, "Invalid size of an allocated region.");
-        size = allocSize;
-        if (!extMemPool->userPool())
-            usedAddrRange.registerAlloc((uintptr_t)res, (uintptr_t)res+size);
+            if (res) {
+                MALLOC_ASSERT(allocSize > 0, "Invalid size of an allocated region.");
+                size = allocSize;
+                if (!extMemPool->userPool())
+                    usedAddrRange.registerAlloc((uintptr_t) res, (uintptr_t) res + size);
 #if MALLOC_DEBUG
-        volatile size_t curTotalSize = totalMemSize; // to read global value once
-        MALLOC_ASSERT(curTotalSize+size > curTotalSize, "Overflow allocation size.");
+                volatile size_t curTotalSize = totalMemSize;// to read global value once
+                MALLOC_ASSERT(curTotalSize + size > curTotalSize, "Overflow allocation size.");
 #endif
-        totalMemSize.fetch_add(size);
-    }
+                totalMemSize.fetch_add(size);
+            }
 
-    return res;
-}
+            return res;
+        }
 
-bool Backend::freeRawMem(void *object, size_t size)
-{
-    bool fail;
+        bool Backend::freeRawMem(void *object, size_t size) {
+            bool fail;
 #if MALLOC_DEBUG
-    volatile size_t curTotalSize = totalMemSize; // to read global value once
-    MALLOC_ASSERT(curTotalSize-size < curTotalSize, "Negative allocation size.");
+            volatile size_t curTotalSize = totalMemSize;// to read global value once
+            MALLOC_ASSERT(curTotalSize - size < curTotalSize, "Negative allocation size.");
 #endif
-    totalMemSize.fetch_sub(size);
-    if (extMemPool->userPool()) {
-        MALLOC_ASSERT(!extMemPool->fixedPool, "No free for fixed-size pools.");
-        fail = (*extMemPool->rawFree)(extMemPool->poolId, object, size);
-    } else {
-        usedAddrRange.registerFree((uintptr_t)object, (uintptr_t)object + size);
-        fail = freeRawMemory(object, size);
-    }
-    // TODO: use result in all freeRawMem() callers
-    return !fail;
-}
-
-/********* End memory acquisition code ********************************/
-
-// Protected object size. After successful locking returns size of locked block,
-// and releasing requires setting block size.
-class GuardedSize : tbb::detail::no_copy {
-    std::atomic<uintptr_t> value;
-public:
-    enum State {
-        LOCKED,
-        COAL_BLOCK,        // block is coalescing now
-        MAX_LOCKED_VAL = COAL_BLOCK,
-        LAST_REGION_BLOCK, // used to mark last block in region
-        // values after this are "normal" block sizes
-        MAX_SPEC_VAL = LAST_REGION_BLOCK
-    };
-
-    void initLocked() { value.store(LOCKED, std::memory_order_release); } // TBB_REVAMP_TODO: was relaxed
-    void makeCoalscing() {
-        MALLOC_ASSERT(value.load(std::memory_order_relaxed) == LOCKED, ASSERT_TEXT);
-        value.store(COAL_BLOCK, std::memory_order_release); // TBB_REVAMP_TODO: was relaxed
-    }
-    size_t tryLock(State state) {
-        MALLOC_ASSERT(state <= MAX_LOCKED_VAL, ASSERT_TEXT);
-        size_t sz = value.load(std::memory_order_acquire);
-        for (;;) {
-            if (sz <= MAX_LOCKED_VAL) {
-                break;
-            }
-            if (value.compare_exchange_strong(sz, state)) {
-                break;
+            totalMemSize.fetch_sub(size);
+            if (extMemPool->userPool()) {
+                MALLOC_ASSERT(!extMemPool->fixedPool, "No free for fixed-size pools.");
+                fail = (*extMemPool->rawFree)(extMemPool->poolId, object, size);
+            } else {
+                usedAddrRange.registerFree((uintptr_t) object, (uintptr_t) object + size);
+                fail = freeRawMemory(object, size);
             }
+            // TODO: use result in all freeRawMem() callers
+            return !fail;
         }
-        return sz;
-    }
-    void unlock(size_t size) {
-        MALLOC_ASSERT(value.load(std::memory_order_relaxed) <= MAX_LOCKED_VAL, "The lock is not locked");
-        MALLOC_ASSERT(size > MAX_LOCKED_VAL, ASSERT_TEXT);
-        value.store(size, std::memory_order_release);
-    }
-    bool isLastRegionBlock() const { return value.load(std::memory_order_relaxed) == LAST_REGION_BLOCK; }
-    friend void Backend::IndexedBins::verify();
-};
-
-struct MemRegion {
-    MemRegion *next,      // keep all regions in any pool to release all them on
-              *prev;      // pool destroying, 2-linked list to release individual
-                          // regions.
-    size_t     allocSz,   // got from pool callback
-               blockSz;   // initial and maximal inner block size
-    MemRegionType type;
-};
-
-// this data must be unmodified while block is in use, so separate it
-class BlockMutexes {
-protected:
-    GuardedSize myL,   // lock for me
-                leftL; // lock for left neighbor
-};
-
-class FreeBlock : BlockMutexes {
-public:
-    static const size_t minBlockSize;
-    friend void Backend::IndexedBins::verify();
-
-    FreeBlock    *prev,       // in 2-linked list related to bin
-                 *next,
-                 *nextToFree; // used to form a queue during coalescing
-    // valid only when block is in processing, i.e. one is not free and not
-    size_t        sizeTmp;    // used outside of backend
-    int           myBin;      // bin that is owner of the block
-    bool          slabAligned;
-    bool          blockInBin; // this block in myBin already
-
-    FreeBlock *rightNeig(size_t sz) const {
-        MALLOC_ASSERT(sz, ASSERT_TEXT);
-        return (FreeBlock*)((uintptr_t)this+sz);
-    }
-    FreeBlock *leftNeig(size_t sz) const {
-        MALLOC_ASSERT(sz, ASSERT_TEXT);
-        return (FreeBlock*)((uintptr_t)this - sz);
-    }
-
-    void initHeader() { myL.initLocked(); leftL.initLocked(); }
-    void setMeFree(size_t size) { myL.unlock(size); }
-    size_t trySetMeUsed(GuardedSize::State s) { return myL.tryLock(s); }
-    bool isLastRegionBlock() const { return myL.isLastRegionBlock(); }
-
-    void setLeftFree(size_t sz) { leftL.unlock(sz); }
-    size_t trySetLeftUsed(GuardedSize::State s) { return leftL.tryLock(s); }
-
-    size_t tryLockBlock() {
-        size_t rSz, sz = trySetMeUsed(GuardedSize::LOCKED);
-
-        if (sz <= GuardedSize::MAX_LOCKED_VAL)
-            return false;
-        rSz = rightNeig(sz)->trySetLeftUsed(GuardedSize::LOCKED);
-        if (rSz <= GuardedSize::MAX_LOCKED_VAL) {
-            setMeFree(sz);
-            return false;
-        }
-        MALLOC_ASSERT(rSz == sz, ASSERT_TEXT);
-        return sz;
-    }
-    void markCoalescing(size_t blockSz) {
-        myL.makeCoalscing();
-        rightNeig(blockSz)->leftL.makeCoalscing();
-        sizeTmp = blockSz;
-        nextToFree = nullptr;
-    }
-    void markUsed() {
-        myL.initLocked();
-        rightNeig(sizeTmp)->leftL.initLocked();
-        nextToFree = nullptr;
-    }
-    static void markBlocks(FreeBlock *fBlock, int num, size_t size) {
-        for (int i=1; i<num; i++) {
-            fBlock = (FreeBlock*)((uintptr_t)fBlock + size);
-            fBlock->initHeader();
-        }
-    }
-};
 
-// Last block in any region. Its "size" field is GuardedSize::LAST_REGION_BLOCK,
-// This kind of blocks used to find region header
-// and have a possibility to return region back to OS
-struct LastFreeBlock : public FreeBlock {
-    MemRegion *memRegion;
-};
+        /********* End memory acquisition code ********************************/
+
+        // Protected object size. After successful locking returns size of locked block,
+        // and releasing requires setting block size.
+        class GuardedSize : tbb::detail::no_copy {
+            std::atomic<uintptr_t> value;
+
+        public:
+            enum State {
+                LOCKED,
+                COAL_BLOCK,// block is coalescing now
+                MAX_LOCKED_VAL = COAL_BLOCK,
+                LAST_REGION_BLOCK,// used to mark last block in region
+                // values after this are "normal" block sizes
+                MAX_SPEC_VAL = LAST_REGION_BLOCK
+            };
+
+            void initLocked() {
+                value.store(LOCKED, std::memory_order_release);
+            }// TBB_REVAMP_TODO: was relaxed
+            void makeCoalscing() {
+                MALLOC_ASSERT(value.load(std::memory_order_relaxed) == LOCKED, ASSERT_TEXT);
+                value.store(COAL_BLOCK, std::memory_order_release);// TBB_REVAMP_TODO: was relaxed
+            }
+            size_t tryLock(State state) {
+                MALLOC_ASSERT(state <= MAX_LOCKED_VAL, ASSERT_TEXT);
+                size_t sz = value.load(std::memory_order_acquire);
+                for (;;) {
+                    if (sz <= MAX_LOCKED_VAL) { break; }
+                    if (value.compare_exchange_strong(sz, state)) { break; }
+                }
+                return sz;
+            }
+            void unlock(size_t size) {
+                MALLOC_ASSERT(value.load(std::memory_order_relaxed) <= MAX_LOCKED_VAL,
+                              "The lock is not locked");
+                MALLOC_ASSERT(size > MAX_LOCKED_VAL, ASSERT_TEXT);
+                value.store(size, std::memory_order_release);
+            }
+            bool isLastRegionBlock() const {
+                return value.load(std::memory_order_relaxed) == LAST_REGION_BLOCK;
+            }
+            friend void Backend::IndexedBins::verify();
+        };
+
+        struct MemRegion {
+            MemRegion *next,// keep all regions in any pool to release all them on
+                    *prev;  // pool destroying, 2-linked list to release individual
+                            // regions.
+            size_t allocSz, // got from pool callback
+                    blockSz;// initial and maximal inner block size
+            MemRegionType type;
+        };
+
+        // this data must be unmodified while block is in use, so separate it
+        class BlockMutexes {
+        protected:
+            GuardedSize myL,// lock for me
+                    leftL;  // lock for left neighbor
+        };
+
+        class FreeBlock : BlockMutexes {
+        public:
+            static const size_t minBlockSize;
+            friend void Backend::IndexedBins::verify();
+
+            FreeBlock *prev,// in 2-linked list related to bin
+                    *next,
+                    *nextToFree;// used to form a queue during coalescing
+            // valid only when block is in processing, i.e. one is not free and not
+            size_t sizeTmp;// used outside of backend
+            int myBin;     // bin that is owner of the block
+            bool slabAligned;
+            bool blockInBin;// this block in myBin already
+
+            FreeBlock *rightNeig(size_t sz) const {
+                MALLOC_ASSERT(sz, ASSERT_TEXT);
+                return (FreeBlock *) ((uintptr_t) this + sz);
+            }
+            FreeBlock *leftNeig(size_t sz) const {
+                MALLOC_ASSERT(sz, ASSERT_TEXT);
+                return (FreeBlock *) ((uintptr_t) this - sz);
+            }
+
+            void initHeader() {
+                myL.initLocked();
+                leftL.initLocked();
+            }
+            void setMeFree(size_t size) { myL.unlock(size); }
+            size_t trySetMeUsed(GuardedSize::State s) { return myL.tryLock(s); }
+            bool isLastRegionBlock() const { return myL.isLastRegionBlock(); }
+
+            void setLeftFree(size_t sz) { leftL.unlock(sz); }
+            size_t trySetLeftUsed(GuardedSize::State s) { return leftL.tryLock(s); }
 
-const size_t FreeBlock::minBlockSize = sizeof(FreeBlock);
+            size_t tryLockBlock() {
+                size_t rSz, sz = trySetMeUsed(GuardedSize::LOCKED);
 
-inline bool BackendSync::waitTillBlockReleased(intptr_t startModifiedCnt)
-{
-    AtomicBackoff backoff;
+                if (sz <= GuardedSize::MAX_LOCKED_VAL) return false;
+                rSz = rightNeig(sz)->trySetLeftUsed(GuardedSize::LOCKED);
+                if (rSz <= GuardedSize::MAX_LOCKED_VAL) {
+                    setMeFree(sz);
+                    return false;
+                }
+                MALLOC_ASSERT(rSz == sz, ASSERT_TEXT);
+                return sz;
+            }
+            void markCoalescing(size_t blockSz) {
+                myL.makeCoalscing();
+                rightNeig(blockSz)->leftL.makeCoalscing();
+                sizeTmp = blockSz;
+                nextToFree = nullptr;
+            }
+            void markUsed() {
+                myL.initLocked();
+                rightNeig(sizeTmp)->leftL.initLocked();
+                nextToFree = nullptr;
+            }
+            static void markBlocks(FreeBlock *fBlock, int num, size_t size) {
+                for (int i = 1; i < num; i++) {
+                    fBlock = (FreeBlock *) ((uintptr_t) fBlock + size);
+                    fBlock->initHeader();
+                }
+            }
+        };
+
+        // Last block in any region. Its "size" field is GuardedSize::LAST_REGION_BLOCK,
+        // This kind of blocks used to find region header
+        // and have a possibility to return region back to OS
+        struct LastFreeBlock : public FreeBlock {
+            MemRegion *memRegion;
+        };
+
+        const size_t FreeBlock::minBlockSize = sizeof(FreeBlock);
+
+        inline bool BackendSync::waitTillBlockReleased(intptr_t startModifiedCnt) {
+            AtomicBackoff backoff;
 #if __TBB_MALLOC_BACKEND_STAT
-    class ITT_Guard {
-        void *ptr;
-    public:
-        ITT_Guard(void *p) : ptr(p) {
-            MALLOC_ITT_SYNC_PREPARE(ptr);
-        }
-        ~ITT_Guard() {
-            MALLOC_ITT_SYNC_ACQUIRED(ptr);
-        }
-    };
-    ITT_Guard ittGuard(&inFlyBlocks);
+            class ITT_Guard {
+                void *ptr;
+
+            public:
+                ITT_Guard(void *p) : ptr(p) { MALLOC_ITT_SYNC_PREPARE(ptr); }
+                ~ITT_Guard() { MALLOC_ITT_SYNC_ACQUIRED(ptr); }
+            };
+            ITT_Guard ittGuard(&inFlyBlocks);
 #endif
-    intptr_t myBinsInFlyBlocks = inFlyBlocks.load(std::memory_order_acquire);
-    intptr_t myCoalescQInFlyBlocks = backend->blocksInCoalescing();
-    while (true) {
-        MALLOC_ASSERT(myBinsInFlyBlocks>=0 && myCoalescQInFlyBlocks>=0, nullptr);
-
-        intptr_t currBinsInFlyBlocks = inFlyBlocks.load(std::memory_order_acquire);
-        intptr_t currCoalescQInFlyBlocks = backend->blocksInCoalescing();
-        WhiteboxTestingYield();
-        // Stop waiting iff:
-
-        // 1) blocks were removed from processing, not added
-        if (myBinsInFlyBlocks > currBinsInFlyBlocks
-        // 2) released during delayed coalescing queue
-            || myCoalescQInFlyBlocks > currCoalescQInFlyBlocks)
-            break;
-        // 3) if there are blocks in coalescing, and no progress in its processing,
-        // try to scan coalescing queue and stop waiting, if changes were made
-        // (if there are no changes and in-fly blocks exist, we continue
-        //  waiting to not increase load on coalescQ)
-        if (currCoalescQInFlyBlocks > 0 && backend->scanCoalescQ(/*forceCoalescQDrop=*/false))
-            break;
-        // 4) when there are no blocks
-        if (!currBinsInFlyBlocks && !currCoalescQInFlyBlocks) {
-            // re-scan make sense only if bins were modified since scanned
-            auto pool = backend->extMemPool;
-            if (pool->hardCachesCleanupInProgress.load(std::memory_order_acquire) ||
-                pool->softCachesCleanupInProgress.load(std::memory_order_acquire)) {
+            intptr_t myBinsInFlyBlocks = inFlyBlocks.load(std::memory_order_acquire);
+            intptr_t myCoalescQInFlyBlocks = backend->blocksInCoalescing();
+            while (true) {
+                MALLOC_ASSERT(myBinsInFlyBlocks >= 0 && myCoalescQInFlyBlocks >= 0, nullptr);
+
+                intptr_t currBinsInFlyBlocks = inFlyBlocks.load(std::memory_order_acquire);
+                intptr_t currCoalescQInFlyBlocks = backend->blocksInCoalescing();
+                WhiteboxTestingYield();
+                // Stop waiting iff:
+
+                // 1) blocks were removed from processing, not added
+                if (myBinsInFlyBlocks > currBinsInFlyBlocks
+                    // 2) released during delayed coalescing queue
+                    || myCoalescQInFlyBlocks > currCoalescQInFlyBlocks)
+                    break;
+                // 3) if there are blocks in coalescing, and no progress in its processing,
+                // try to scan coalescing queue and stop waiting, if changes were made
+                // (if there are no changes and in-fly blocks exist, we continue
+                //  waiting to not increase load on coalescQ)
+                if (currCoalescQInFlyBlocks > 0 && backend->scanCoalescQ(/*forceCoalescQDrop=*/false)) break;
+                // 4) when there are no blocks
+                if (!currBinsInFlyBlocks && !currCoalescQInFlyBlocks) {
+                    // re-scan make sense only if bins were modified since scanned
+                    auto pool = backend->extMemPool;
+                    if (pool->hardCachesCleanupInProgress.load(std::memory_order_acquire)
+                        || pool->softCachesCleanupInProgress.load(std::memory_order_acquire)) {
+                        backoff.pause();
+                        continue;
+                    }
+
+                    return startModifiedCnt != getNumOfMods();
+                }
+                myBinsInFlyBlocks = currBinsInFlyBlocks;
+                myCoalescQInFlyBlocks = currCoalescQInFlyBlocks;
                 backoff.pause();
-                continue;
             }
+            return true;
+        }
+
+        void CoalRequestQ::putBlock(FreeBlock *fBlock) {
+            MALLOC_ASSERT(fBlock->sizeTmp >= FreeBlock::minBlockSize, ASSERT_TEXT);
+            fBlock->markUsed();
+            // the block is in the queue, do not forget that it's here
+            inFlyBlocks++;
+
+            FreeBlock *myBlToFree = blocksToFree.load(std::memory_order_acquire);
+            for (;;) {
+                fBlock->nextToFree = myBlToFree;
+                if (blocksToFree.compare_exchange_strong(myBlToFree, fBlock)) { return; }
+            }
+        }
 
-            return startModifiedCnt != getNumOfMods();
+        FreeBlock *CoalRequestQ::getAll() {
+            for (;;) {
+                FreeBlock *myBlToFree = blocksToFree.load(std::memory_order_acquire);
+
+                if (!myBlToFree) {
+                    return nullptr;
+                } else {
+                    if (blocksToFree.compare_exchange_strong(myBlToFree, nullptr)) {
+                        return myBlToFree;
+                    } else {
+                        continue;
+                    }
+                }
+            }
         }
-        myBinsInFlyBlocks = currBinsInFlyBlocks;
-        myCoalescQInFlyBlocks = currCoalescQInFlyBlocks;
-        backoff.pause();
-    }
-    return true;
-}
-
-void CoalRequestQ::putBlock(FreeBlock *fBlock)
-{
-    MALLOC_ASSERT(fBlock->sizeTmp >= FreeBlock::minBlockSize, ASSERT_TEXT);
-    fBlock->markUsed();
-    // the block is in the queue, do not forget that it's here
-    inFlyBlocks++;
-
-    FreeBlock *myBlToFree = blocksToFree.load(std::memory_order_acquire);
-    for (;;) {
-        fBlock->nextToFree = myBlToFree;
-        if (blocksToFree.compare_exchange_strong(myBlToFree, fBlock)) {
-            return;
+
+        inline void CoalRequestQ::blockWasProcessed() {
+            bkndSync->binsModified();
+            int prev = inFlyBlocks.fetch_sub(1);
+            tbb::detail::suppress_unused_warning(prev);
+            MALLOC_ASSERT(prev > 0, ASSERT_TEXT);
         }
-    }
-}
 
-FreeBlock *CoalRequestQ::getAll()
-{
-    for (;;) {
-        FreeBlock *myBlToFree = blocksToFree.load(std::memory_order_acquire);
+        // Try to get a block from a bin.
+        // If the remaining free space would stay in the same bin,
+        //     split the block without removing it.
+        // If the free space should go to other bin(s), remove the block.
+        // alignedBin is true, if all blocks in the bin have slab-aligned right side.
+        FreeBlock *Backend::IndexedBins::getFromBin(int binIdx, BackendSync *sync, size_t size,
+                                                    bool needAlignedRes, bool alignedBin, bool wait,
+                                                    int *binLocked) {
+            Bin *b = &freeBins[binIdx];
+        try_next:
+            FreeBlock *fBlock = nullptr;
+            if (!b->empty()) {
+                bool locked = false;
+                MallocMutex::scoped_lock scopedLock(b->tLock, wait, &locked);
+
+                if (!locked) {
+                    if (binLocked) (*binLocked)++;
+                    return nullptr;
+                }
 
-        if (!myBlToFree) {
-            return nullptr;
-        } else {
-            if (blocksToFree.compare_exchange_strong(myBlToFree, nullptr)) {
-                return myBlToFree;
-            } else {
-                continue;
+                for (FreeBlock *curr = b->head.load(std::memory_order_relaxed); curr; curr = curr->next) {
+                    size_t szBlock = curr->tryLockBlock();
+                    if (!szBlock) {
+                        // block is locked, re-do bin lock, as there is no place to spin
+                        // while block coalescing
+                        goto try_next;
+                    }
+
+                    // GENERAL CASE
+                    if (alignedBin || !needAlignedRes) {
+                        size_t splitSz = szBlock - size;
+                        // If we got a block as split result, it must have a room for control structures.
+                        if (szBlock >= size && (splitSz >= FreeBlock::minBlockSize || !splitSz))
+                            fBlock = curr;
+                    } else {
+                        // SPECIAL CASE, to get aligned block from unaligned bin we have to cut the middle of a block
+                        // and return remaining left and right part. Possible only in fixed pool scenario, assert for this
+                        // is set inside splitBlock() function.
+
+                        void *newB = alignUp(curr, slabSize);
+                        uintptr_t rightNew = (uintptr_t) newB + size;
+                        uintptr_t rightCurr = (uintptr_t) curr + szBlock;
+                        // Check if the block size is sufficient,
+                        // and also left and right split results are either big enough or non-existent
+                        if (rightNew <= rightCurr
+                            && (newB == curr
+                                || ((uintptr_t) newB - (uintptr_t) curr) >= FreeBlock::minBlockSize)
+                            && (rightNew == rightCurr || (rightCurr - rightNew) >= FreeBlock::minBlockSize))
+                            fBlock = curr;
+                    }
+
+                    if (fBlock) {
+                        // consume must be called before result of removing from a bin is visible externally.
+                        sync->blockConsumed();
+                        // TODO: think about cases when block stays in the same bin
+                        b->removeBlock(fBlock);
+                        if (freeBins[binIdx].empty()) bitMask.set(binIdx, false);
+                        fBlock->sizeTmp = szBlock;
+                        break;
+                    } else {// block size is not valid, search for next block in the bin
+                        curr->setMeFree(szBlock);
+                        curr->rightNeig(szBlock)->setLeftFree(szBlock);
+                    }
+                }
             }
+            return fBlock;
         }
-    }
-}
-
-inline void CoalRequestQ::blockWasProcessed()
-{
-    bkndSync->binsModified();
-    int prev = inFlyBlocks.fetch_sub(1);
-    tbb::detail::suppress_unused_warning(prev);
-    MALLOC_ASSERT(prev > 0, ASSERT_TEXT);
-}
-
-// Try to get a block from a bin.
-// If the remaining free space would stay in the same bin,
-//     split the block without removing it.
-// If the free space should go to other bin(s), remove the block.
-// alignedBin is true, if all blocks in the bin have slab-aligned right side.
-FreeBlock *Backend::IndexedBins::getFromBin(int binIdx, BackendSync *sync, size_t size,
-        bool needAlignedRes, bool alignedBin,  bool wait, int *binLocked)
-{
-    Bin *b = &freeBins[binIdx];
-try_next:
-    FreeBlock *fBlock = nullptr;
-    if (!b->empty()) {
-        bool locked = false;
-        MallocMutex::scoped_lock scopedLock(b->tLock, wait, &locked);
-
-        if (!locked) {
-            if (binLocked) (*binLocked)++;
-            return nullptr;
+
+        bool Backend::IndexedBins::tryReleaseRegions(int binIdx, Backend *backend) {
+            Bin *b = &freeBins[binIdx];
+            FreeBlock *fBlockList = nullptr;
+
+            // got all blocks from the bin and re-do coalesce on them
+            // to release single-block regions
+        try_next:
+            if (!b->empty()) {
+                MallocMutex::scoped_lock binLock(b->tLock);
+                for (FreeBlock *curr = b->head.load(std::memory_order_relaxed); curr;) {
+                    size_t szBlock = curr->tryLockBlock();
+                    if (!szBlock) goto try_next;
+
+                    FreeBlock *next = curr->next;
+
+                    b->removeBlock(curr);
+                    curr->sizeTmp = szBlock;
+                    curr->nextToFree = fBlockList;
+                    fBlockList = curr;
+                    curr = next;
+                }
+            }
+            return backend->coalescAndPutList(fBlockList, /*forceCoalescQDrop=*/true,
+                                              /*reportBlocksProcessed=*/false);
         }
 
-        for (FreeBlock *curr = b->head.load(std::memory_order_relaxed); curr; curr = curr->next) {
-            size_t szBlock = curr->tryLockBlock();
-            if (!szBlock) {
-                // block is locked, re-do bin lock, as there is no place to spin
-                // while block coalescing
-                goto try_next;
+        void Backend::Bin::removeBlock(FreeBlock *fBlock) {
+            MALLOC_ASSERT(fBlock->next || fBlock->prev || fBlock == head.load(std::memory_order_relaxed),
+                          "Detected that a block is not in the bin.");
+            if (head.load(std::memory_order_relaxed) == fBlock)
+                head.store(fBlock->next, std::memory_order_relaxed);
+            if (tail == fBlock) tail = fBlock->prev;
+            if (fBlock->prev) fBlock->prev->next = fBlock->next;
+            if (fBlock->next) fBlock->next->prev = fBlock->prev;
+        }
+
+        void Backend::IndexedBins::addBlock(int binIdx, FreeBlock *fBlock, size_t /* blockSz */,
+                                            bool addToTail) {
+            Bin *b = &freeBins[binIdx];
+            fBlock->myBin = binIdx;
+            fBlock->next = fBlock->prev = nullptr;
+            {
+                MallocMutex::scoped_lock scopedLock(b->tLock);
+                if (addToTail) {
+                    fBlock->prev = b->tail;
+                    b->tail = fBlock;
+                    if (fBlock->prev) fBlock->prev->next = fBlock;
+                    if (!b->head.load(std::memory_order_relaxed))
+                        b->head.store(fBlock, std::memory_order_relaxed);
+                } else {
+                    fBlock->next = b->head.load(std::memory_order_relaxed);
+                    b->head.store(fBlock, std::memory_order_relaxed);
+                    if (fBlock->next) fBlock->next->prev = fBlock;
+                    if (!b->tail) b->tail = fBlock;
+                }
             }
+            bitMask.set(binIdx, true);
+        }
 
-            // GENERAL CASE
-            if (alignedBin || !needAlignedRes) {
-                size_t splitSz = szBlock - size;
-                // If we got a block as split result, it must have a room for control structures.
-                if (szBlock >= size && (splitSz >= FreeBlock::minBlockSize || !splitSz))
-                    fBlock = curr;
+        bool Backend::IndexedBins::tryAddBlock(int binIdx, FreeBlock *fBlock, bool addToTail) {
+            bool locked = false;
+            Bin *b = &freeBins[binIdx];
+            fBlock->myBin = binIdx;
+            if (addToTail) {
+                fBlock->next = nullptr;
+                {
+                    MallocMutex::scoped_lock scopedLock(b->tLock, /*wait=*/false, &locked);
+                    if (!locked) return false;
+                    fBlock->prev = b->tail;
+                    b->tail = fBlock;
+                    if (fBlock->prev) fBlock->prev->next = fBlock;
+                    if (!b->head.load(std::memory_order_relaxed))
+                        b->head.store(fBlock, std::memory_order_relaxed);
+                }
             } else {
-                // SPECIAL CASE, to get aligned block from unaligned bin we have to cut the middle of a block
-                // and return remaining left and right part. Possible only in fixed pool scenario, assert for this
-                // is set inside splitBlock() function.
-
-                void *newB = alignUp(curr, slabSize);
-                uintptr_t rightNew = (uintptr_t)newB + size;
-                uintptr_t rightCurr = (uintptr_t)curr + szBlock;
-                // Check if the block size is sufficient,
-                // and also left and right split results are either big enough or non-existent
-                if (rightNew <= rightCurr
-                        && (newB == curr || ((uintptr_t)newB - (uintptr_t)curr) >= FreeBlock::minBlockSize)
-                        && (rightNew == rightCurr || (rightCurr - rightNew) >= FreeBlock::minBlockSize))
-                    fBlock = curr;
+                fBlock->prev = nullptr;
+                {
+                    MallocMutex::scoped_lock scopedLock(b->tLock, /*wait=*/false, &locked);
+                    if (!locked) return false;
+                    fBlock->next = b->head.load(std::memory_order_relaxed);
+                    b->head.store(fBlock, std::memory_order_relaxed);
+                    if (fBlock->next) fBlock->next->prev = fBlock;
+                    if (!b->tail) b->tail = fBlock;
+                }
             }
+            bitMask.set(binIdx, true);
+            return true;
+        }
 
-            if (fBlock) {
-                // consume must be called before result of removing from a bin is visible externally.
-                sync->blockConsumed();
-                // TODO: think about cases when block stays in the same bin
-                b->removeBlock(fBlock);
-                if (freeBins[binIdx].empty())
-                    bitMask.set(binIdx, false);
-                fBlock->sizeTmp = szBlock;
-                break;
-            } else { // block size is not valid, search for next block in the bin
-                curr->setMeFree(szBlock);
-                curr->rightNeig(szBlock)->setLeftFree(szBlock);
+        void Backend::IndexedBins::reset() {
+            for (unsigned i = 0; i < Backend::freeBinsNum; i++) freeBins[i].reset();
+            bitMask.reset();
+        }
+
+        void Backend::IndexedBins::lockRemoveBlock(int binIdx, FreeBlock *fBlock) {
+            MallocMutex::scoped_lock scopedLock(freeBins[binIdx].tLock);
+            freeBins[binIdx].removeBlock(fBlock);
+            if (freeBins[binIdx].empty()) bitMask.set(binIdx, false);
+        }
+
+        bool ExtMemoryPool::regionsAreReleaseable() const { return !keepAllMemory && !delayRegsReleasing; }
+
+        FreeBlock *Backend::splitBlock(FreeBlock *fBlock, int num, size_t size, bool blockIsAligned,
+                                       bool needAlignedBlock) {
+            const size_t totalSize = num * size;
+
+            // SPECIAL CASE, for unaligned block we have to cut the middle of a block
+            // and return remaining left and right part. Possible only in a fixed pool scenario.
+            if (needAlignedBlock && !blockIsAligned) {
+                MALLOC_ASSERT(
+                        extMemPool->fixedPool,
+                        "Aligned block request from unaligned bin possible only in fixed pool scenario.");
+
+                // Space to use is in the middle
+                FreeBlock *newBlock = alignUp(fBlock, slabSize);
+                FreeBlock *rightPart = (FreeBlock *) ((uintptr_t) newBlock + totalSize);
+                uintptr_t fBlockEnd = (uintptr_t) fBlock + fBlock->sizeTmp;
+
+                // Return free right part
+                if ((uintptr_t) rightPart != fBlockEnd) {
+                    rightPart->initHeader();// to prevent coalescing rightPart with fBlock
+                    size_t rightSize = fBlockEnd - (uintptr_t) rightPart;
+                    coalescAndPut(rightPart, rightSize, toAlignedBin(rightPart, rightSize));
+                }
+                // And free left part
+                if (newBlock != fBlock) {
+                    newBlock->initHeader();// to prevent coalescing fBlock with newB
+                    size_t leftSize = (uintptr_t) newBlock - (uintptr_t) fBlock;
+                    coalescAndPut(fBlock, leftSize, toAlignedBin(fBlock, leftSize));
+                }
+                fBlock = newBlock;
+            } else if (size_t splitSize = fBlock->sizeTmp - totalSize) {// need to split the block
+                // GENERAL CASE, cut the left or right part of the block
+                FreeBlock *splitBlock = nullptr;
+                if (needAlignedBlock) {
+                    // For slab aligned blocks cut the right side of the block
+                    // and return it to a requester, original block returns to backend
+                    splitBlock = fBlock;
+                    fBlock = (FreeBlock *) ((uintptr_t) splitBlock + splitSize);
+                    fBlock->initHeader();
+                } else {
+                    // For large object blocks cut original block and put free right part to backend
+                    splitBlock = (FreeBlock *) ((uintptr_t) fBlock + totalSize);
+                    splitBlock->initHeader();
+                }
+                // Mark free block as it`s parent only when the requested type (needAlignedBlock)
+                // and returned from Bins/OS block (isAligned) are equal (XOR operation used)
+                bool markAligned = (blockIsAligned ^ needAlignedBlock) ? toAlignedBin(splitBlock, splitSize)
+                                                                       : blockIsAligned;
+                coalescAndPut(splitBlock, splitSize, markAligned);
             }
+            MALLOC_ASSERT(!needAlignedBlock || isAligned(fBlock, slabSize),
+                          "Expect to get aligned block, if one was requested.");
+            FreeBlock::markBlocks(fBlock, num, size);
+            return fBlock;
         }
-    }
-    return fBlock;
-}
-
-bool Backend::IndexedBins::tryReleaseRegions(int binIdx, Backend *backend)
-{
-    Bin *b = &freeBins[binIdx];
-    FreeBlock *fBlockList = nullptr;
-
-    // got all blocks from the bin and re-do coalesce on them
-    // to release single-block regions
-try_next:
-    if (!b->empty()) {
-        MallocMutex::scoped_lock binLock(b->tLock);
-        for (FreeBlock *curr = b->head.load(std::memory_order_relaxed); curr; ) {
-            size_t szBlock = curr->tryLockBlock();
-            if (!szBlock)
-                goto try_next;
-
-            FreeBlock *next = curr->next;
-
-            b->removeBlock(curr);
-            curr->sizeTmp = szBlock;
-            curr->nextToFree = fBlockList;
-            fBlockList = curr;
-            curr = next;
+
+        size_t Backend::getMaxBinnedSize() const {
+            return hugePages.isEnabled && !inUserPool() ? maxBinned_HugePage : maxBinned_SmallPage;
         }
-    }
-    return backend->coalescAndPutList(fBlockList, /*forceCoalescQDrop=*/true,
-                                      /*reportBlocksProcessed=*/false);
-}
-
-void Backend::Bin::removeBlock(FreeBlock *fBlock)
-{
-    MALLOC_ASSERT(fBlock->next||fBlock->prev||fBlock== head.load(std::memory_order_relaxed),
-                  "Detected that a block is not in the bin.");
-    if (head.load(std::memory_order_relaxed) == fBlock)
-        head.store(fBlock->next, std::memory_order_relaxed);
-    if (tail == fBlock)
-        tail = fBlock->prev;
-    if (fBlock->prev)
-        fBlock->prev->next = fBlock->next;
-    if (fBlock->next)
-        fBlock->next->prev = fBlock->prev;
-}
-
-void Backend::IndexedBins::addBlock(int binIdx, FreeBlock *fBlock, size_t /* blockSz */, bool addToTail)
-{
-    Bin *b = &freeBins[binIdx];
-    fBlock->myBin = binIdx;
-    fBlock->next = fBlock->prev = nullptr;
-    {
-        MallocMutex::scoped_lock scopedLock(b->tLock);
-        if (addToTail) {
-            fBlock->prev = b->tail;
-            b->tail = fBlock;
-            if (fBlock->prev)
-                fBlock->prev->next = fBlock;
-            if (!b->head.load(std::memory_order_relaxed))
-                b->head.store(fBlock, std::memory_order_relaxed);
-        } else {
-            fBlock->next = b->head.load(std::memory_order_relaxed);
-            b->head.store(fBlock, std::memory_order_relaxed);
-            if (fBlock->next)
-                fBlock->next->prev = fBlock;
-            if (!b->tail)
-                b->tail = fBlock;
+
+        inline bool Backend::MaxRequestComparator::operator()(size_t oldMaxReq, size_t requestSize) const {
+            return requestSize > oldMaxReq && requestSize < backend->getMaxBinnedSize();
         }
-    }
-    bitMask.set(binIdx, true);
-}
-
-bool Backend::IndexedBins::tryAddBlock(int binIdx, FreeBlock *fBlock, bool addToTail)
-{
-    bool locked = false;
-    Bin *b = &freeBins[binIdx];
-    fBlock->myBin = binIdx;
-    if (addToTail) {
-        fBlock->next = nullptr;
-        {
-            MallocMutex::scoped_lock scopedLock(b->tLock, /*wait=*/false, &locked);
-            if (!locked)
-                return false;
-            fBlock->prev = b->tail;
-            b->tail = fBlock;
-            if (fBlock->prev)
-                fBlock->prev->next = fBlock;
-            if (!b->head.load(std::memory_order_relaxed))
-                b->head.store(fBlock, std::memory_order_relaxed);
+
+        // last chance to get memory
+        FreeBlock *Backend::releaseMemInCaches(intptr_t startModifiedCnt, int *lockedBinsThreshold,
+                                               int numOfLockedBins) {
+            // something released from caches
+            if (extMemPool->hardCachesCleanup(false)) return (FreeBlock *) VALID_BLOCK_IN_BIN;
+
+            if (bkndSync.waitTillBlockReleased(startModifiedCnt)) return (FreeBlock *) VALID_BLOCK_IN_BIN;
+
+            // OS can't give us more memory, but we have some in locked bins
+            if (*lockedBinsThreshold && numOfLockedBins) {
+                *lockedBinsThreshold = 0;
+                return (FreeBlock *) VALID_BLOCK_IN_BIN;
+            }
+            return nullptr;// nothing found, give up
         }
-    } else {
-        fBlock->prev = nullptr;
-        {
-            MallocMutex::scoped_lock scopedLock(b->tLock, /*wait=*/false, &locked);
-            if (!locked)
-                return false;
-            fBlock->next = b->head.load(std::memory_order_relaxed);
-            b->head.store(fBlock, std::memory_order_relaxed);
-            if (fBlock->next)
-                fBlock->next->prev = fBlock;
-            if (!b->tail)
-                b->tail = fBlock;
+
+        FreeBlock *Backend::askMemFromOS(size_t blockSize, intptr_t startModifiedCnt,
+                                         int *lockedBinsThreshold, int numOfLockedBins, bool *splittableRet,
+                                         bool needSlabRegion) {
+            FreeBlock *block;
+            // The block sizes can be divided into 3 groups:
+            //   1. "quite small": popular object size, we are in bootstarp or something
+            //      like; request several regions.
+            //   2. "quite large": we want to have several such blocks in the region
+            //      but not want several pre-allocated regions.
+            //   3. "huge": exact fit, we allocate only one block and do not allow
+            //       any other allocations to placed in a region.
+            // Dividing the block sizes in these groups we are trying to balance between
+            // too small regions (that leads to fragmentation) and too large ones (that
+            // leads to excessive address space consumption). If a region is "too
+            // large", allocate only one, to prevent fragmentation. It supposedly
+            // doesn't hurt performance, because the object requested by user is large.
+            // Bounds for the groups are:
+            const size_t maxBinned = getMaxBinnedSize();
+            const size_t quiteSmall = maxBinned / 8;
+            const size_t quiteLarge = maxBinned;
+
+            if (blockSize >= quiteLarge) {
+                // Do not interact with other threads via semaphores, as for exact fit
+                // we can't share regions with them, memory requesting is individual.
+                block = addNewRegion(blockSize, MEMREG_ONE_BLOCK, /*addToBin=*/false);
+                if (!block) return releaseMemInCaches(startModifiedCnt, lockedBinsThreshold, numOfLockedBins);
+                *splittableRet = false;
+            } else {
+                const size_t regSz_sizeBased = alignUp(4 * maxRequestedSize, 1024 * 1024);
+                // Another thread is modifying backend while we can't get the block.
+                // Wait while it leaves and re-do the scan
+                // before trying other ways to extend the backend.
+                if (bkndSync.waitTillBlockReleased(startModifiedCnt)
+                    // semaphore is protecting adding more more memory from OS
+                    || memExtendingSema.wait())
+                    return (FreeBlock *) VALID_BLOCK_IN_BIN;
+
+                if (startModifiedCnt != bkndSync.getNumOfMods()) {
+                    memExtendingSema.signal();
+                    return (FreeBlock *) VALID_BLOCK_IN_BIN;
+                }
+
+                if (blockSize < quiteSmall) {
+                    // For this size of blocks, add NUM_OF_REG "advance" regions in bin,
+                    // and return one as a result.
+                    // TODO: add to bin first, because other threads can use them right away.
+                    // This must be done carefully, because blocks in bins can be released
+                    // in releaseCachesToLimit().
+                    const unsigned NUM_OF_REG = 3;
+                    MemRegionType regType = needSlabRegion ? MEMREG_SLAB_BLOCKS : MEMREG_LARGE_BLOCKS;
+                    block = addNewRegion(regSz_sizeBased, regType, /*addToBin=*/false);
+                    if (block)
+                        for (unsigned idx = 0; idx < NUM_OF_REG; idx++)
+                            if (!addNewRegion(regSz_sizeBased, regType, /*addToBin=*/true)) break;
+                } else {
+                    block = addNewRegion(regSz_sizeBased, MEMREG_LARGE_BLOCKS, /*addToBin=*/false);
+                }
+                memExtendingSema.signal();
+
+                // no regions found, try to clean cache
+                if (!block || block == (FreeBlock *) VALID_BLOCK_IN_BIN)
+                    return releaseMemInCaches(startModifiedCnt, lockedBinsThreshold, numOfLockedBins);
+                // Since a region can hold more than one block it can be split.
+                *splittableRet = true;
+            }
+            // after asking memory from OS, release caches if we above the memory limits
+            releaseCachesToLimit();
+
+            return block;
         }
-    }
-    bitMask.set(binIdx, true);
-    return true;
-}
-
-void Backend::IndexedBins::reset()
-{
-    for (unsigned i=0; i<Backend::freeBinsNum; i++)
-        freeBins[i].reset();
-    bitMask.reset();
-}
-
-void Backend::IndexedBins::lockRemoveBlock(int binIdx, FreeBlock *fBlock)
-{
-    MallocMutex::scoped_lock scopedLock(freeBins[binIdx].tLock);
-    freeBins[binIdx].removeBlock(fBlock);
-    if (freeBins[binIdx].empty())
-        bitMask.set(binIdx, false);
-}
-
-bool ExtMemoryPool::regionsAreReleaseable() const
-{
-    return !keepAllMemory && !delayRegsReleasing;
-}
-
-FreeBlock *Backend::splitBlock(FreeBlock *fBlock, int num, size_t size, bool blockIsAligned, bool needAlignedBlock)
-{
-    const size_t totalSize = num * size;
-
-    // SPECIAL CASE, for unaligned block we have to cut the middle of a block
-    // and return remaining left and right part. Possible only in a fixed pool scenario.
-    if (needAlignedBlock && !blockIsAligned) {
-        MALLOC_ASSERT(extMemPool->fixedPool,
-                "Aligned block request from unaligned bin possible only in fixed pool scenario.");
-
-        // Space to use is in the middle
-        FreeBlock *newBlock = alignUp(fBlock, slabSize);
-        FreeBlock *rightPart = (FreeBlock*)((uintptr_t)newBlock + totalSize);
-        uintptr_t fBlockEnd = (uintptr_t)fBlock + fBlock->sizeTmp;
-
-        // Return free right part
-        if ((uintptr_t)rightPart != fBlockEnd) {
-            rightPart->initHeader();  // to prevent coalescing rightPart with fBlock
-            size_t rightSize = fBlockEnd - (uintptr_t)rightPart;
-            coalescAndPut(rightPart, rightSize, toAlignedBin(rightPart, rightSize));
+
+        void Backend::releaseCachesToLimit() {
+            if (!memSoftLimit.load(std::memory_order_relaxed)
+                || totalMemSize.load(std::memory_order_relaxed)
+                           <= memSoftLimit.load(std::memory_order_relaxed)) {
+                return;
+            }
+            size_t locTotalMemSize, locMemSoftLimit;
+
+            scanCoalescQ(/*forceCoalescQDrop=*/false);
+            if (extMemPool->softCachesCleanup()
+                && (locTotalMemSize = totalMemSize.load(std::memory_order_acquire))
+                           <= (locMemSoftLimit = memSoftLimit.load(std::memory_order_acquire)))
+                return;
+            // clean global large-object cache, if this is not enough, clean local caches
+            // do this in several tries, because backend fragmentation can prevent
+            // region from releasing
+            for (int cleanLocal = 0; cleanLocal < 2; cleanLocal++)
+                while (cleanLocal ? extMemPool->allLocalCaches.cleanup(/*cleanOnlyUnused=*/true)
+                                  : extMemPool->loc.decreasingCleanup())
+                    if ((locTotalMemSize = totalMemSize.load(std::memory_order_acquire))
+                        <= (locMemSoftLimit = memSoftLimit.load(std::memory_order_acquire)))
+                        return;
+            // last chance to match memSoftLimit
+            extMemPool->hardCachesCleanup(true);
         }
-        // And free left part
-        if (newBlock != fBlock) {
-            newBlock->initHeader(); // to prevent coalescing fBlock with newB
-            size_t leftSize = (uintptr_t)newBlock - (uintptr_t)fBlock;
-            coalescAndPut(fBlock, leftSize, toAlignedBin(fBlock, leftSize));
+
+        int Backend::IndexedBins::getMinNonemptyBin(unsigned startBin) const {
+            int p = bitMask.getMinTrue(startBin);
+            return p == -1 ? Backend::freeBinsNum : p;
         }
-        fBlock = newBlock;
-    } else if (size_t splitSize = fBlock->sizeTmp - totalSize) { // need to split the block
-        // GENERAL CASE, cut the left or right part of the block
-        FreeBlock *splitBlock = nullptr;
-        if (needAlignedBlock) {
-            // For slab aligned blocks cut the right side of the block
-            // and return it to a requester, original block returns to backend
-            splitBlock = fBlock;
-            fBlock = (FreeBlock*)((uintptr_t)splitBlock + splitSize);
-            fBlock->initHeader();
-        } else {
-            // For large object blocks cut original block and put free right part to backend
-            splitBlock = (FreeBlock*)((uintptr_t)fBlock + totalSize);
-            splitBlock->initHeader();
+
+        FreeBlock *Backend::IndexedBins::findBlock(int nativeBin, BackendSync *sync, size_t size,
+                                                   bool needAlignedBlock, bool alignedBin,
+                                                   int *numOfLockedBins) {
+            for (int i = getMinNonemptyBin(nativeBin); i < (int) freeBinsNum; i = getMinNonemptyBin(i + 1))
+                if (FreeBlock *block = getFromBin(i, sync, size, needAlignedBlock, alignedBin, /*wait=*/false,
+                                                  numOfLockedBins))
+                    return block;
+
+            return nullptr;
         }
-        // Mark free block as it`s parent only when the requested type (needAlignedBlock)
-        // and returned from Bins/OS block (isAligned) are equal (XOR operation used)
-        bool markAligned = (blockIsAligned ^ needAlignedBlock) ? toAlignedBin(splitBlock, splitSize) : blockIsAligned;
-        coalescAndPut(splitBlock, splitSize, markAligned);
-    }
-    MALLOC_ASSERT(!needAlignedBlock || isAligned(fBlock, slabSize), "Expect to get aligned block, if one was requested.");
-    FreeBlock::markBlocks(fBlock, num, size);
-    return fBlock;
-}
-
-size_t Backend::getMaxBinnedSize() const
-{
-    return hugePages.isEnabled && !inUserPool() ?
-        maxBinned_HugePage : maxBinned_SmallPage;
-}
-
-inline bool Backend::MaxRequestComparator::operator()(size_t oldMaxReq, size_t requestSize) const
-{
-    return requestSize > oldMaxReq && requestSize < backend->getMaxBinnedSize();
-}
-
-// last chance to get memory
-FreeBlock *Backend::releaseMemInCaches(intptr_t startModifiedCnt,
-                                    int *lockedBinsThreshold, int numOfLockedBins)
-{
-    // something released from caches
-    if (extMemPool->hardCachesCleanup(false))
-        return (FreeBlock*)VALID_BLOCK_IN_BIN;
-
-    if (bkndSync.waitTillBlockReleased(startModifiedCnt))
-        return (FreeBlock*)VALID_BLOCK_IN_BIN;
-
-    // OS can't give us more memory, but we have some in locked bins
-    if (*lockedBinsThreshold && numOfLockedBins) {
-        *lockedBinsThreshold = 0;
-        return (FreeBlock*)VALID_BLOCK_IN_BIN;
-    }
-    return nullptr; // nothing found, give up
-}
-
-FreeBlock *Backend::askMemFromOS(size_t blockSize, intptr_t startModifiedCnt,
-                                 int *lockedBinsThreshold, int numOfLockedBins,
-                                 bool *splittableRet, bool needSlabRegion)
-{
-    FreeBlock *block;
-    // The block sizes can be divided into 3 groups:
-    //   1. "quite small": popular object size, we are in bootstarp or something
-    //      like; request several regions.
-    //   2. "quite large": we want to have several such blocks in the region
-    //      but not want several pre-allocated regions.
-    //   3. "huge": exact fit, we allocate only one block and do not allow
-    //       any other allocations to placed in a region.
-    // Dividing the block sizes in these groups we are trying to balance between
-    // too small regions (that leads to fragmentation) and too large ones (that
-    // leads to excessive address space consumption). If a region is "too
-    // large", allocate only one, to prevent fragmentation. It supposedly
-    // doesn't hurt performance, because the object requested by user is large.
-    // Bounds for the groups are:
-    const size_t maxBinned = getMaxBinnedSize();
-    const size_t quiteSmall = maxBinned / 8;
-    const size_t quiteLarge = maxBinned;
-
-    if (blockSize >= quiteLarge) {
-        // Do not interact with other threads via semaphores, as for exact fit
-        // we can't share regions with them, memory requesting is individual.
-        block = addNewRegion(blockSize, MEMREG_ONE_BLOCK, /*addToBin=*/false);
-        if (!block)
-            return releaseMemInCaches(startModifiedCnt, lockedBinsThreshold, numOfLockedBins);
-        *splittableRet = false;
-    } else {
-        const size_t regSz_sizeBased = alignUp(4*maxRequestedSize, 1024*1024);
-        // Another thread is modifying backend while we can't get the block.
-        // Wait while it leaves and re-do the scan
-        // before trying other ways to extend the backend.
-        if (bkndSync.waitTillBlockReleased(startModifiedCnt)
-            // semaphore is protecting adding more more memory from OS
-            || memExtendingSema.wait())
-            return (FreeBlock*)VALID_BLOCK_IN_BIN;
-
-        if (startModifiedCnt != bkndSync.getNumOfMods()) {
-            memExtendingSema.signal();
-            return (FreeBlock*)VALID_BLOCK_IN_BIN;
+
+        void Backend::requestBootstrapMem() {
+            if (bootsrapMemDone == bootsrapMemStatus.load(std::memory_order_acquire)) return;
+            MallocMutex::scoped_lock lock(bootsrapMemStatusMutex);
+            if (bootsrapMemDone == bootsrapMemStatus) return;
+            MALLOC_ASSERT(bootsrapMemNotDone == bootsrapMemStatus, ASSERT_TEXT);
+            bootsrapMemStatus = bootsrapMemInitializing;
+            // request some rather big region during bootstrap in advance
+            // ok to get nullptr here, as later we re-do a request with more modest size
+            addNewRegion(2 * 1024 * 1024, MEMREG_SLAB_BLOCKS, /*addToBin=*/true);
+            bootsrapMemStatus = bootsrapMemDone;
         }
 
-        if (blockSize < quiteSmall) {
-            // For this size of blocks, add NUM_OF_REG "advance" regions in bin,
-            // and return one as a result.
-            // TODO: add to bin first, because other threads can use them right away.
-            // This must be done carefully, because blocks in bins can be released
-            // in releaseCachesToLimit().
-            const unsigned NUM_OF_REG = 3;
-            MemRegionType regType = needSlabRegion ? MEMREG_SLAB_BLOCKS : MEMREG_LARGE_BLOCKS;
-            block = addNewRegion(regSz_sizeBased, regType, /*addToBin=*/false);
-            if (block)
-                for (unsigned idx=0; idx<NUM_OF_REG; idx++)
-                    if (! addNewRegion(regSz_sizeBased, regType, /*addToBin=*/true))
+        // try to allocate size Byte block in available bins
+        // needAlignedRes is true if result must be slab-aligned
+        FreeBlock *Backend::genericGetBlock(int num, size_t size, bool needAlignedBlock) {
+            FreeBlock *block = nullptr;
+            const size_t totalReqSize = num * size;
+            // no splitting after requesting new region, asks exact size
+            const int nativeBin = sizeToBin(totalReqSize);
+
+            requestBootstrapMem();
+            // If we found 2 or less locked bins, it's time to ask more memory from OS.
+            // But nothing can be asked from fixed pool. And we prefer wait, not ask
+            // for more memory, if block is quite large.
+            int lockedBinsThreshold = extMemPool->fixedPool || size >= maxBinned_SmallPage ? 0 : 2;
+
+            // Find maximal requested size limited by getMaxBinnedSize()
+            AtomicUpdate(maxRequestedSize, totalReqSize, MaxRequestComparator(this));
+            scanCoalescQ(/*forceCoalescQDrop=*/false);
+
+            bool splittable = true;
+            for (;;) {
+                const intptr_t startModifiedCnt = bkndSync.getNumOfMods();
+                int numOfLockedBins;
+                intptr_t cleanCnt;
+                do {
+                    cleanCnt = backendCleanCnt.load(std::memory_order_acquire);
+                    numOfLockedBins = 0;
+                    if (needAlignedBlock) {
+                        block = freeSlabAlignedBins.findBlock(nativeBin, &bkndSync, num * size,
+                                                              needAlignedBlock,
+                                                              /*alignedBin=*/true, &numOfLockedBins);
+                        if (!block && extMemPool->fixedPool)
+                            block = freeLargeBlockBins.findBlock(nativeBin, &bkndSync, num * size,
+                                                                 needAlignedBlock,
+                                                                 /*alignedBin=*/false, &numOfLockedBins);
+                    } else {
+                        block = freeLargeBlockBins.findBlock(nativeBin, &bkndSync, num * size,
+                                                             needAlignedBlock,
+                                                             /*alignedBin=*/false, &numOfLockedBins);
+                        if (!block && extMemPool->fixedPool)
+                            block = freeSlabAlignedBins.findBlock(nativeBin, &bkndSync, num * size,
+                                                                  needAlignedBlock,
+                                                                  /*alignedBin=*/true, &numOfLockedBins);
+                    }
+                } while (!block
+                         && (numOfLockedBins > lockedBinsThreshold || cleanCnt % 2 == 1
+                             || cleanCnt != backendCleanCnt.load(std::memory_order_acquire)));
+
+                if (block) break;
+
+                bool retScanCoalescQ = scanCoalescQ(/*forceCoalescQDrop=*/true);
+                bool retSoftCachesCleanup = extMemPool->softCachesCleanup();
+                if (!(retScanCoalescQ || retSoftCachesCleanup)) {
+                    // bins are not updated,
+                    // only remaining possibility is to ask for more memory
+                    block = askMemFromOS(totalReqSize, startModifiedCnt, &lockedBinsThreshold,
+                                         numOfLockedBins, &splittable, needAlignedBlock);
+                    if (!block) return nullptr;
+                    if (block != (FreeBlock *) VALID_BLOCK_IN_BIN) {
+                        // size can be increased in askMemFromOS, that's why >=
+                        MALLOC_ASSERT(block->sizeTmp >= size, ASSERT_TEXT);
                         break;
-        } else {
-            block = addNewRegion(regSz_sizeBased, MEMREG_LARGE_BLOCKS, /*addToBin=*/false);
-        }
-        memExtendingSema.signal();
-
-        // no regions found, try to clean cache
-        if (!block || block == (FreeBlock*)VALID_BLOCK_IN_BIN)
-            return releaseMemInCaches(startModifiedCnt, lockedBinsThreshold, numOfLockedBins);
-        // Since a region can hold more than one block it can be split.
-        *splittableRet = true;
-    }
-    // after asking memory from OS, release caches if we above the memory limits
-    releaseCachesToLimit();
-
-    return block;
-}
-
-void Backend::releaseCachesToLimit()
-{
-    if (!memSoftLimit.load(std::memory_order_relaxed)
-            || totalMemSize.load(std::memory_order_relaxed) <= memSoftLimit.load(std::memory_order_relaxed)) {
-        return;
-    }
-    size_t locTotalMemSize, locMemSoftLimit;
-
-    scanCoalescQ(/*forceCoalescQDrop=*/false);
-    if (extMemPool->softCachesCleanup() &&
-        (locTotalMemSize = totalMemSize.load(std::memory_order_acquire)) <=
-        (locMemSoftLimit = memSoftLimit.load(std::memory_order_acquire)))
-        return;
-    // clean global large-object cache, if this is not enough, clean local caches
-    // do this in several tries, because backend fragmentation can prevent
-    // region from releasing
-    for (int cleanLocal = 0; cleanLocal<2; cleanLocal++)
-        while (cleanLocal ?
-                 extMemPool->allLocalCaches.cleanup(/*cleanOnlyUnused=*/true) :
-                 extMemPool->loc.decreasingCleanup())
-            if ((locTotalMemSize = totalMemSize.load(std::memory_order_acquire)) <=
-                (locMemSoftLimit = memSoftLimit.load(std::memory_order_acquire)))
-                return;
-    // last chance to match memSoftLimit
-    extMemPool->hardCachesCleanup(true);
-}
-
-int Backend::IndexedBins::getMinNonemptyBin(unsigned startBin) const
-{
-    int p = bitMask.getMinTrue(startBin);
-    return p == -1 ? Backend::freeBinsNum : p;
-}
-
-FreeBlock *Backend::IndexedBins::findBlock(int nativeBin, BackendSync *sync, size_t size,
-        bool needAlignedBlock, bool alignedBin, int *numOfLockedBins)
-{
-    for (int i=getMinNonemptyBin(nativeBin); i<(int)freeBinsNum; i=getMinNonemptyBin(i+1))
-        if (FreeBlock *block = getFromBin(i, sync, size, needAlignedBlock, alignedBin, /*wait=*/false, numOfLockedBins))
+                    }
+                    // valid block somewhere in bins, let's find it
+                    block = nullptr;
+                }
+            }
+            MALLOC_ASSERT(block, ASSERT_TEXT);
+            if (splittable) {
+                // At this point we have to be sure that slabAligned attribute describes the right block state
+                block = splitBlock(block, num, size, block->slabAligned, needAlignedBlock);
+            }
+            // matched blockConsumed() from startUseBlock()
+            bkndSync.blockReleased();
+
             return block;
+        }
 
-    return nullptr;
-}
-
-void Backend::requestBootstrapMem()
-{
-    if (bootsrapMemDone == bootsrapMemStatus.load(std::memory_order_acquire))
-        return;
-    MallocMutex::scoped_lock lock( bootsrapMemStatusMutex );
-    if (bootsrapMemDone == bootsrapMemStatus)
-        return;
-    MALLOC_ASSERT(bootsrapMemNotDone == bootsrapMemStatus, ASSERT_TEXT);
-    bootsrapMemStatus = bootsrapMemInitializing;
-    // request some rather big region during bootstrap in advance
-    // ok to get nullptr here, as later we re-do a request with more modest size
-    addNewRegion(2*1024*1024, MEMREG_SLAB_BLOCKS, /*addToBin=*/true);
-    bootsrapMemStatus = bootsrapMemDone;
-}
-
-// try to allocate size Byte block in available bins
-// needAlignedRes is true if result must be slab-aligned
-FreeBlock *Backend::genericGetBlock(int num, size_t size, bool needAlignedBlock)
-{
-    FreeBlock *block = nullptr;
-    const size_t totalReqSize = num*size;
-    // no splitting after requesting new region, asks exact size
-    const int nativeBin = sizeToBin(totalReqSize);
-
-    requestBootstrapMem();
-    // If we found 2 or less locked bins, it's time to ask more memory from OS.
-    // But nothing can be asked from fixed pool. And we prefer wait, not ask
-    // for more memory, if block is quite large.
-    int lockedBinsThreshold = extMemPool->fixedPool || size>=maxBinned_SmallPage? 0 : 2;
-
-    // Find maximal requested size limited by getMaxBinnedSize()
-    AtomicUpdate(maxRequestedSize, totalReqSize, MaxRequestComparator(this));
-    scanCoalescQ(/*forceCoalescQDrop=*/false);
-
-    bool splittable = true;
-    for (;;) {
-        const intptr_t startModifiedCnt = bkndSync.getNumOfMods();
-        int numOfLockedBins;
-        intptr_t cleanCnt;
-        do {
-            cleanCnt = backendCleanCnt.load(std::memory_order_acquire);
-            numOfLockedBins = 0;
-            if (needAlignedBlock) {
-                block = freeSlabAlignedBins.findBlock(nativeBin, &bkndSync, num*size, needAlignedBlock,
-                                                        /*alignedBin=*/true, &numOfLockedBins);
-                if (!block && extMemPool->fixedPool)
-                    block = freeLargeBlockBins.findBlock(nativeBin, &bkndSync, num*size, needAlignedBlock,
-                                                        /*alignedBin=*/false, &numOfLockedBins);
-            } else {
-                block = freeLargeBlockBins.findBlock(nativeBin, &bkndSync, num*size, needAlignedBlock,
-                                                        /*alignedBin=*/false, &numOfLockedBins);
-                if (!block && extMemPool->fixedPool)
-                    block = freeSlabAlignedBins.findBlock(nativeBin, &bkndSync, num*size, needAlignedBlock,
-                                                        /*alignedBin=*/true, &numOfLockedBins);
+        LargeMemoryBlock *Backend::getLargeBlock(size_t size) {
+            LargeMemoryBlock *lmb = (LargeMemoryBlock *) genericGetBlock(1, size, /*needAlignedRes=*/false);
+            if (lmb) {
+                lmb->unalignedSize = size;
+                if (extMemPool->userPool()) extMemPool->lmbList.add(lmb);
             }
-        } while (!block && (numOfLockedBins>lockedBinsThreshold || cleanCnt % 2 == 1 ||
-                            cleanCnt != backendCleanCnt.load(std::memory_order_acquire)));
-
-        if (block)
-            break;
-
-        bool retScanCoalescQ = scanCoalescQ(/*forceCoalescQDrop=*/true);
-        bool retSoftCachesCleanup = extMemPool->softCachesCleanup();
-        if (!(retScanCoalescQ || retSoftCachesCleanup)) {
-            // bins are not updated,
-            // only remaining possibility is to ask for more memory
-            block = askMemFromOS(totalReqSize, startModifiedCnt, &lockedBinsThreshold,
-                        numOfLockedBins, &splittable, needAlignedBlock);
-            if (!block)
-                return nullptr;
-            if (block != (FreeBlock*)VALID_BLOCK_IN_BIN) {
-                // size can be increased in askMemFromOS, that's why >=
-                MALLOC_ASSERT(block->sizeTmp >= size, ASSERT_TEXT);
-                break;
+            return lmb;
+        }
+
+        BlockI *Backend::getSlabBlock(int num) {
+            BlockI *b = (BlockI *) genericGetBlock(num, slabSize, /*slabAligned=*/true);
+            MALLOC_ASSERT(isAligned(b, slabSize), ASSERT_TEXT);
+            return b;
+        }
+
+        void Backend::putSlabBlock(BlockI *block) {
+            genericPutBlock((FreeBlock *) block, slabSize, /*slabAligned=*/true);
+        }
+
+        void *Backend::getBackRefSpace(size_t size, bool *rawMemUsed) {
+            // This block is released only at shutdown, so it can prevent
+            // a entire region releasing when it's received from the backend,
+            // so prefer getRawMemory using.
+            if (void *ret = getRawMemory(size, REGULAR)) {
+                *rawMemUsed = true;
+                return ret;
             }
-            // valid block somewhere in bins, let's find it
-            block = nullptr;
+            void *ret = genericGetBlock(1, size, /*needAlignedRes=*/false);
+            if (ret) *rawMemUsed = false;
+            return ret;
+        }
+
+        void Backend::putBackRefSpace(void *b, size_t size, bool rawMemUsed) {
+            if (rawMemUsed) freeRawMemory(b, size);
+            // ignore not raw mem, as it released on region releasing
+        }
+
+        void Backend::removeBlockFromBin(FreeBlock *fBlock) {
+            if (fBlock->myBin != Backend::NO_BIN) {
+                if (fBlock->slabAligned) freeSlabAlignedBins.lockRemoveBlock(fBlock->myBin, fBlock);
+                else
+                    freeLargeBlockBins.lockRemoveBlock(fBlock->myBin, fBlock);
+            }
+        }
+
+        void Backend::genericPutBlock(FreeBlock *fBlock, size_t blockSz, bool slabAligned) {
+            bkndSync.blockConsumed();
+            coalescAndPut(fBlock, blockSz, slabAligned);
+            bkndSync.blockReleased();
+        }
+
+        void AllLargeBlocksList::add(LargeMemoryBlock *lmb) {
+            MallocMutex::scoped_lock scoped_cs(largeObjLock);
+            lmb->gPrev = nullptr;
+            lmb->gNext = loHead;
+            if (lmb->gNext) lmb->gNext->gPrev = lmb;
+            loHead = lmb;
+        }
+
+        void AllLargeBlocksList::remove(LargeMemoryBlock *lmb) {
+            MallocMutex::scoped_lock scoped_cs(largeObjLock);
+            if (loHead == lmb) loHead = lmb->gNext;
+            if (lmb->gNext) lmb->gNext->gPrev = lmb->gPrev;
+            if (lmb->gPrev) lmb->gPrev->gNext = lmb->gNext;
+        }
+
+        void Backend::putLargeBlock(LargeMemoryBlock *lmb) {
+            if (extMemPool->userPool()) extMemPool->lmbList.remove(lmb);
+            genericPutBlock((FreeBlock *) lmb, lmb->unalignedSize, false);
+        }
+
+        void Backend::returnLargeObject(LargeMemoryBlock *lmb) {
+            removeBackRef(lmb->backRefIdx);
+            putLargeBlock(lmb);
+            STAT_increment(getThreadId(), ThreadCommonCounters, freeLargeObj);
         }
-    }
-    MALLOC_ASSERT(block, ASSERT_TEXT);
-    if (splittable) {
-        // At this point we have to be sure that slabAligned attribute describes the right block state
-        block = splitBlock(block, num, size, block->slabAligned, needAlignedBlock);
-    }
-    // matched blockConsumed() from startUseBlock()
-    bkndSync.blockReleased();
-
-    return block;
-}
-
-LargeMemoryBlock *Backend::getLargeBlock(size_t size)
-{
-    LargeMemoryBlock *lmb =
-        (LargeMemoryBlock*)genericGetBlock(1, size, /*needAlignedRes=*/false);
-    if (lmb) {
-        lmb->unalignedSize = size;
-        if (extMemPool->userPool())
-            extMemPool->lmbList.add(lmb);
-    }
-    return lmb;
-}
-
-BlockI *Backend::getSlabBlock(int num) {
-    BlockI *b = (BlockI*)genericGetBlock(num, slabSize, /*slabAligned=*/true);
-    MALLOC_ASSERT(isAligned(b, slabSize), ASSERT_TEXT);
-    return b;
-}
-
-void Backend::putSlabBlock(BlockI *block) {
-    genericPutBlock((FreeBlock *)block, slabSize, /*slabAligned=*/true);
-}
-
-void *Backend::getBackRefSpace(size_t size, bool *rawMemUsed)
-{
-    // This block is released only at shutdown, so it can prevent
-    // a entire region releasing when it's received from the backend,
-    // so prefer getRawMemory using.
-    if (void *ret = getRawMemory(size, REGULAR)) {
-        *rawMemUsed = true;
-        return ret;
-    }
-    void *ret = genericGetBlock(1, size, /*needAlignedRes=*/false);
-    if (ret) *rawMemUsed = false;
-    return ret;
-}
-
-void Backend::putBackRefSpace(void *b, size_t size, bool rawMemUsed)
-{
-    if (rawMemUsed)
-        freeRawMemory(b, size);
-    // ignore not raw mem, as it released on region releasing
-}
-
-void Backend::removeBlockFromBin(FreeBlock *fBlock)
-{
-    if (fBlock->myBin != Backend::NO_BIN) {
-        if (fBlock->slabAligned)
-            freeSlabAlignedBins.lockRemoveBlock(fBlock->myBin, fBlock);
-        else
-            freeLargeBlockBins.lockRemoveBlock(fBlock->myBin, fBlock);
-    }
-}
-
-void Backend::genericPutBlock(FreeBlock *fBlock, size_t blockSz, bool slabAligned)
-{
-    bkndSync.blockConsumed();
-    coalescAndPut(fBlock, blockSz, slabAligned);
-    bkndSync.blockReleased();
-}
-
-void AllLargeBlocksList::add(LargeMemoryBlock *lmb)
-{
-    MallocMutex::scoped_lock scoped_cs(largeObjLock);
-    lmb->gPrev = nullptr;
-    lmb->gNext = loHead;
-    if (lmb->gNext)
-        lmb->gNext->gPrev = lmb;
-    loHead = lmb;
-}
-
-void AllLargeBlocksList::remove(LargeMemoryBlock *lmb)
-{
-    MallocMutex::scoped_lock scoped_cs(largeObjLock);
-    if (loHead == lmb)
-        loHead = lmb->gNext;
-    if (lmb->gNext)
-        lmb->gNext->gPrev = lmb->gPrev;
-    if (lmb->gPrev)
-        lmb->gPrev->gNext = lmb->gNext;
-}
-
-void Backend::putLargeBlock(LargeMemoryBlock *lmb)
-{
-    if (extMemPool->userPool())
-        extMemPool->lmbList.remove(lmb);
-    genericPutBlock((FreeBlock *)lmb, lmb->unalignedSize, false);
-}
-
-void Backend::returnLargeObject(LargeMemoryBlock *lmb)
-{
-    removeBackRef(lmb->backRefIdx);
-    putLargeBlock(lmb);
-    STAT_increment(getThreadId(), ThreadCommonCounters, freeLargeObj);
-}
 
 #if BACKEND_HAS_MREMAP
-void *Backend::remap(void *ptr, size_t oldSize, size_t newSize, size_t alignment)
-{
-    // no remap for user pools and for object too small that living in bins
-    if (inUserPool() || min(oldSize, newSize)<maxBinned_SmallPage
-        // during remap, can't guarantee alignment more strict than current or
-        // more strict than page alignment
-        || !isAligned(ptr, alignment) || alignment>extMemPool->granularity)
-        return nullptr;
-    const LargeMemoryBlock* lmbOld = ((LargeObjectHdr *)ptr - 1)->memoryBlock;
-    const size_t oldUnalignedSize = lmbOld->unalignedSize;
-    FreeBlock *oldFBlock = (FreeBlock *)lmbOld;
-    FreeBlock *right = oldFBlock->rightNeig(oldUnalignedSize);
-    // in every region only one block can have LAST_REGION_BLOCK on right,
-    // so don't need no synchronization
-    if (!right->isLastRegionBlock())
-        return nullptr;
-
-    MemRegion *oldRegion = static_cast<LastFreeBlock*>(right)->memRegion;
-    MALLOC_ASSERT( oldRegion < ptr, ASSERT_TEXT );
-    const size_t oldRegionSize = oldRegion->allocSz;
-    if (oldRegion->type != MEMREG_ONE_BLOCK)
-        return nullptr;  // we are not single in the region
-    const size_t userOffset = (uintptr_t)ptr - (uintptr_t)oldRegion;
-    const size_t alignedSize = LargeObjectCache::alignToBin(newSize + userOffset);
-    const size_t requestSize =
-        alignUp(sizeof(MemRegion) + alignedSize + sizeof(LastFreeBlock), extMemPool->granularity);
-    if (requestSize < alignedSize) // is wrapped around?
-        return nullptr;
-    regionList.remove(oldRegion);
-
-    // The deallocation should be registered in address range before mremap to
-    // prevent a race condition with allocation on another thread.
-    // (OS can reuse the memory and registerAlloc will be missed on another thread)
-    usedAddrRange.registerFree((uintptr_t)oldRegion, (uintptr_t)oldRegion + oldRegionSize);
-
-    void *ret = mremap(oldRegion, oldRegion->allocSz, requestSize, MREMAP_MAYMOVE);
-    if (MAP_FAILED == ret) { // can't remap, revert and leave
-        regionList.add(oldRegion);
-        usedAddrRange.registerAlloc((uintptr_t)oldRegion, (uintptr_t)oldRegion + oldRegionSize);
-        return nullptr;
-    }
-    MemRegion *region = (MemRegion*)ret;
-    MALLOC_ASSERT(region->type == MEMREG_ONE_BLOCK, ASSERT_TEXT);
-    region->allocSz = requestSize;
-    region->blockSz = alignedSize;
-
-    FreeBlock *fBlock = (FreeBlock *)alignUp((uintptr_t)region + sizeof(MemRegion),
-                                             largeObjectAlignment);
-
-    regionList.add(region);
-    startUseBlock(region, fBlock, /*addToBin=*/false);
-    MALLOC_ASSERT(fBlock->sizeTmp == region->blockSz, ASSERT_TEXT);
-    // matched blockConsumed() in startUseBlock().
-    // TODO: get rid of useless pair blockConsumed()/blockReleased()
-    bkndSync.blockReleased();
-
-    // object must start at same offset from region's start
-    void *object = (void*)((uintptr_t)region + userOffset);
-    MALLOC_ASSERT(isAligned(object, alignment), ASSERT_TEXT);
-    LargeObjectHdr *header = (LargeObjectHdr*)object - 1;
-    setBackRef(header->backRefIdx, header);
-
-    LargeMemoryBlock *lmb = (LargeMemoryBlock*)fBlock;
-    lmb->unalignedSize = region->blockSz;
-    lmb->objectSize = newSize;
-    lmb->backRefIdx = header->backRefIdx;
-    header->memoryBlock = lmb;
-    MALLOC_ASSERT((uintptr_t)lmb + lmb->unalignedSize >=
-                  (uintptr_t)object + lmb->objectSize, "An object must fit to the block.");
-
-    usedAddrRange.registerAlloc((uintptr_t)region, (uintptr_t)region + requestSize);
-    totalMemSize.fetch_add(region->allocSz - oldRegionSize);
-
-    return object;
-}
-#endif /* BACKEND_HAS_MREMAP */
+        void *Backend::remap(void *ptr, size_t oldSize, size_t newSize, size_t alignment) {
+            // no remap for user pools and for object too small that living in bins
+            if (inUserPool()
+                || min(oldSize, newSize) < maxBinned_SmallPage
+                // during remap, can't guarantee alignment more strict than current or
+                // more strict than page alignment
+                || !isAligned(ptr, alignment) || alignment > extMemPool->granularity)
+                return nullptr;
+            const LargeMemoryBlock *lmbOld = ((LargeObjectHdr *) ptr - 1)->memoryBlock;
+            const size_t oldUnalignedSize = lmbOld->unalignedSize;
+            FreeBlock *oldFBlock = (FreeBlock *) lmbOld;
+            FreeBlock *right = oldFBlock->rightNeig(oldUnalignedSize);
+            // in every region only one block can have LAST_REGION_BLOCK on right,
+            // so don't need no synchronization
+            if (!right->isLastRegionBlock()) return nullptr;
+
+            MemRegion *oldRegion = static_cast<LastFreeBlock *>(right)->memRegion;
+            MALLOC_ASSERT(oldRegion < ptr, ASSERT_TEXT);
+            const size_t oldRegionSize = oldRegion->allocSz;
+            if (oldRegion->type != MEMREG_ONE_BLOCK) return nullptr;// we are not single in the region
+            const size_t userOffset = (uintptr_t) ptr - (uintptr_t) oldRegion;
+            const size_t alignedSize = LargeObjectCache::alignToBin(newSize + userOffset);
+            const size_t requestSize = alignUp(sizeof(MemRegion) + alignedSize + sizeof(LastFreeBlock),
+                                               extMemPool->granularity);
+            if (requestSize < alignedSize)// is wrapped around?
+                return nullptr;
+            regionList.remove(oldRegion);
 
-void Backend::releaseRegion(MemRegion *memRegion)
-{
-    regionList.remove(memRegion);
-    freeRawMem(memRegion, memRegion->allocSz);
-}
-
-// coalesce fBlock with its neighborhood
-FreeBlock *Backend::doCoalesc(FreeBlock *fBlock, MemRegion **mRegion)
-{
-    FreeBlock *resBlock = fBlock;
-    size_t resSize = fBlock->sizeTmp;
-    MemRegion *memRegion = nullptr;
-
-    fBlock->markCoalescing(resSize);
-    resBlock->blockInBin = false;
-
-    // coalescing with left neighbor
-    size_t leftSz = fBlock->trySetLeftUsed(GuardedSize::COAL_BLOCK);
-    if (leftSz != GuardedSize::LOCKED) {
-        if (leftSz == GuardedSize::COAL_BLOCK) {
-            coalescQ.putBlock(fBlock);
-            return nullptr;
-        } else {
-            FreeBlock *left = fBlock->leftNeig(leftSz);
-            size_t lSz = left->trySetMeUsed(GuardedSize::COAL_BLOCK);
-            if (lSz <= GuardedSize::MAX_LOCKED_VAL) {
-                fBlock->setLeftFree(leftSz); // rollback
-                coalescQ.putBlock(fBlock);
+            // The deallocation should be registered in address range before mremap to
+            // prevent a race condition with allocation on another thread.
+            // (OS can reuse the memory and registerAlloc will be missed on another thread)
+            usedAddrRange.registerFree((uintptr_t) oldRegion, (uintptr_t) oldRegion + oldRegionSize);
+
+            void *ret = mremap(oldRegion, oldRegion->allocSz, requestSize, MREMAP_MAYMOVE);
+            if (MAP_FAILED == ret) {// can't remap, revert and leave
+                regionList.add(oldRegion);
+                usedAddrRange.registerAlloc((uintptr_t) oldRegion, (uintptr_t) oldRegion + oldRegionSize);
                 return nullptr;
-            } else {
-                MALLOC_ASSERT(lSz == leftSz, "Invalid header");
-                left->blockInBin = true;
-                resBlock = left;
-                resSize += leftSz;
-                resBlock->sizeTmp = resSize;
             }
+            MemRegion *region = (MemRegion *) ret;
+            MALLOC_ASSERT(region->type == MEMREG_ONE_BLOCK, ASSERT_TEXT);
+            region->allocSz = requestSize;
+            region->blockSz = alignedSize;
+
+            FreeBlock *fBlock
+                    = (FreeBlock *) alignUp((uintptr_t) region + sizeof(MemRegion), largeObjectAlignment);
+
+            regionList.add(region);
+            startUseBlock(region, fBlock, /*addToBin=*/false);
+            MALLOC_ASSERT(fBlock->sizeTmp == region->blockSz, ASSERT_TEXT);
+            // matched blockConsumed() in startUseBlock().
+            // TODO: get rid of useless pair blockConsumed()/blockReleased()
+            bkndSync.blockReleased();
+
+            // object must start at same offset from region's start
+            void *object = (void *) ((uintptr_t) region + userOffset);
+            MALLOC_ASSERT(isAligned(object, alignment), ASSERT_TEXT);
+            LargeObjectHdr *header = (LargeObjectHdr *) object - 1;
+            setBackRef(header->backRefIdx, header);
+
+            LargeMemoryBlock *lmb = (LargeMemoryBlock *) fBlock;
+            lmb->unalignedSize = region->blockSz;
+            lmb->objectSize = newSize;
+            lmb->backRefIdx = header->backRefIdx;
+            header->memoryBlock = lmb;
+            MALLOC_ASSERT((uintptr_t) lmb + lmb->unalignedSize >= (uintptr_t) object + lmb->objectSize,
+                          "An object must fit to the block.");
+
+            usedAddrRange.registerAlloc((uintptr_t) region, (uintptr_t) region + requestSize);
+            totalMemSize.fetch_add(region->allocSz - oldRegionSize);
+
+            return object;
+        }
+#endif /* BACKEND_HAS_MREMAP */
+
+        void Backend::releaseRegion(MemRegion *memRegion) {
+            regionList.remove(memRegion);
+            freeRawMem(memRegion, memRegion->allocSz);
         }
-    }
-    // coalescing with right neighbor
-    FreeBlock *right = fBlock->rightNeig(fBlock->sizeTmp);
-    size_t rightSz = right->trySetMeUsed(GuardedSize::COAL_BLOCK);
-    if (rightSz != GuardedSize::LOCKED) {
-        // LastFreeBlock is on the right side
-        if (GuardedSize::LAST_REGION_BLOCK == rightSz) {
-            right->setMeFree(GuardedSize::LAST_REGION_BLOCK);
-            memRegion = static_cast<LastFreeBlock*>(right)->memRegion;
-        } else if (GuardedSize::COAL_BLOCK == rightSz) {
-            if (resBlock->blockInBin) {
-                resBlock->blockInBin = false;
-                removeBlockFromBin(resBlock);
+
+        // coalesce fBlock with its neighborhood
+        FreeBlock *Backend::doCoalesc(FreeBlock *fBlock, MemRegion **mRegion) {
+            FreeBlock *resBlock = fBlock;
+            size_t resSize = fBlock->sizeTmp;
+            MemRegion *memRegion = nullptr;
+
+            fBlock->markCoalescing(resSize);
+            resBlock->blockInBin = false;
+
+            // coalescing with left neighbor
+            size_t leftSz = fBlock->trySetLeftUsed(GuardedSize::COAL_BLOCK);
+            if (leftSz != GuardedSize::LOCKED) {
+                if (leftSz == GuardedSize::COAL_BLOCK) {
+                    coalescQ.putBlock(fBlock);
+                    return nullptr;
+                } else {
+                    FreeBlock *left = fBlock->leftNeig(leftSz);
+                    size_t lSz = left->trySetMeUsed(GuardedSize::COAL_BLOCK);
+                    if (lSz <= GuardedSize::MAX_LOCKED_VAL) {
+                        fBlock->setLeftFree(leftSz);// rollback
+                        coalescQ.putBlock(fBlock);
+                        return nullptr;
+                    } else {
+                        MALLOC_ASSERT(lSz == leftSz, "Invalid header");
+                        left->blockInBin = true;
+                        resBlock = left;
+                        resSize += leftSz;
+                        resBlock->sizeTmp = resSize;
+                    }
+                }
             }
-            coalescQ.putBlock(resBlock);
-            return nullptr;
-        } else {
-            size_t rSz = right->rightNeig(rightSz)->
-                trySetLeftUsed(GuardedSize::COAL_BLOCK);
-            if (rSz <= GuardedSize::MAX_LOCKED_VAL) {
-                right->setMeFree(rightSz);  // rollback
-                if (resBlock->blockInBin) {
-                    resBlock->blockInBin = false;
-                    removeBlockFromBin(resBlock);
+            // coalescing with right neighbor
+            FreeBlock *right = fBlock->rightNeig(fBlock->sizeTmp);
+            size_t rightSz = right->trySetMeUsed(GuardedSize::COAL_BLOCK);
+            if (rightSz != GuardedSize::LOCKED) {
+                // LastFreeBlock is on the right side
+                if (GuardedSize::LAST_REGION_BLOCK == rightSz) {
+                    right->setMeFree(GuardedSize::LAST_REGION_BLOCK);
+                    memRegion = static_cast<LastFreeBlock *>(right)->memRegion;
+                } else if (GuardedSize::COAL_BLOCK == rightSz) {
+                    if (resBlock->blockInBin) {
+                        resBlock->blockInBin = false;
+                        removeBlockFromBin(resBlock);
+                    }
+                    coalescQ.putBlock(resBlock);
+                    return nullptr;
+                } else {
+                    size_t rSz = right->rightNeig(rightSz)->trySetLeftUsed(GuardedSize::COAL_BLOCK);
+                    if (rSz <= GuardedSize::MAX_LOCKED_VAL) {
+                        right->setMeFree(rightSz);// rollback
+                        if (resBlock->blockInBin) {
+                            resBlock->blockInBin = false;
+                            removeBlockFromBin(resBlock);
+                        }
+                        coalescQ.putBlock(resBlock);
+                        return nullptr;
+                    } else {
+                        MALLOC_ASSERT(rSz == rightSz, "Invalid header");
+                        removeBlockFromBin(right);
+                        resSize += rightSz;
+
+                        // Is LastFreeBlock on the right side of right?
+                        FreeBlock *nextRight = right->rightNeig(rightSz);
+                        size_t nextRightSz = nextRight->trySetMeUsed(GuardedSize::COAL_BLOCK);
+                        if (nextRightSz > GuardedSize::MAX_LOCKED_VAL) {
+                            if (nextRightSz == GuardedSize::LAST_REGION_BLOCK)
+                                memRegion = static_cast<LastFreeBlock *>(nextRight)->memRegion;
+
+                            nextRight->setMeFree(nextRightSz);
+                        }
+                    }
                 }
-                coalescQ.putBlock(resBlock);
-                return nullptr;
-            } else {
-                MALLOC_ASSERT(rSz == rightSz, "Invalid header");
-                removeBlockFromBin(right);
-                resSize += rightSz;
-
-                // Is LastFreeBlock on the right side of right?
-                FreeBlock *nextRight = right->rightNeig(rightSz);
-                size_t nextRightSz = nextRight->
-                    trySetMeUsed(GuardedSize::COAL_BLOCK);
-                if (nextRightSz > GuardedSize::MAX_LOCKED_VAL) {
-                    if (nextRightSz == GuardedSize::LAST_REGION_BLOCK)
-                        memRegion = static_cast<LastFreeBlock*>(nextRight)->memRegion;
-
-                    nextRight->setMeFree(nextRightSz);
+            }
+            if (memRegion) {
+                MALLOC_ASSERT((uintptr_t) memRegion + memRegion->allocSz
+                                      >= (uintptr_t) right + sizeof(LastFreeBlock),
+                              ASSERT_TEXT);
+                MALLOC_ASSERT((uintptr_t) memRegion < (uintptr_t) resBlock, ASSERT_TEXT);
+                *mRegion = memRegion;
+            } else
+                *mRegion = nullptr;
+            resBlock->sizeTmp = resSize;
+            return resBlock;
+        }
+
+        bool Backend::coalescAndPutList(FreeBlock *list, bool forceCoalescQDrop, bool reportBlocksProcessed) {
+            bool regionReleased = false;
+
+            for (FreeBlock *helper; list; list = helper,
+                                          // matches block enqueue in CoalRequestQ::putBlock()
+                                          reportBlocksProcessed ? coalescQ.blockWasProcessed() : (void) 0) {
+                MemRegion *memRegion;
+                bool addToTail = false;
+
+                helper = list->nextToFree;
+                FreeBlock *toRet = doCoalesc(list, &memRegion);
+                if (!toRet) continue;
+
+                if (memRegion && memRegion->blockSz == toRet->sizeTmp && !extMemPool->fixedPool) {
+                    if (extMemPool->regionsAreReleaseable()) {
+                        // release the region, because there is no used blocks in it
+                        if (toRet->blockInBin) removeBlockFromBin(toRet);
+                        releaseRegion(memRegion);
+                        regionReleased = true;
+                        continue;
+                    } else               // add block from empty region to end of bin,
+                        addToTail = true;// preserving for exact fit
                 }
+                size_t currSz = toRet->sizeTmp;
+                int bin = sizeToBin(currSz);
+                bool toAligned = extMemPool->fixedPool ? toAlignedBin(toRet, currSz) : toRet->slabAligned;
+                bool needAddToBin = true;
+
+                if (toRet->blockInBin) {
+                    // Does it stay in same bin?
+                    if (toRet->myBin == bin && toRet->slabAligned == toAligned) needAddToBin = false;
+                    else {
+                        toRet->blockInBin = false;
+                        removeBlockFromBin(toRet);
+                    }
+                }
+
+                // Does not stay in same bin, or bin-less; add it
+                if (needAddToBin) {
+                    toRet->prev = toRet->next = toRet->nextToFree = nullptr;
+                    toRet->myBin = NO_BIN;
+                    toRet->slabAligned = toAligned;
+
+                    // If the block is too small to fit in any bin, keep it bin-less.
+                    // It's not a leak because the block later can be coalesced.
+                    if (currSz >= minBinnedSize) {
+                        toRet->sizeTmp = currSz;
+                        IndexedBins *target = toRet->slabAligned ? &freeSlabAlignedBins : &freeLargeBlockBins;
+                        if (forceCoalescQDrop) {
+                            target->addBlock(bin, toRet, toRet->sizeTmp, addToTail);
+                        } else if (!target->tryAddBlock(bin, toRet, addToTail)) {
+                            coalescQ.putBlock(toRet);
+                            continue;
+                        }
+                    }
+                    toRet->sizeTmp = 0;
+                }
+                // Free (possibly coalesced) free block.
+                // Adding to bin must be done before this point,
+                // because after a block is free it can be coalesced, and
+                // using its pointer became unsafe.
+                // Remember that coalescing is not done under any global lock.
+                toRet->setMeFree(currSz);
+                toRet->rightNeig(currSz)->setLeftFree(currSz);
             }
+            return regionReleased;
         }
-    }
-    if (memRegion) {
-        MALLOC_ASSERT((uintptr_t)memRegion + memRegion->allocSz >=
-                      (uintptr_t)right + sizeof(LastFreeBlock), ASSERT_TEXT);
-        MALLOC_ASSERT((uintptr_t)memRegion < (uintptr_t)resBlock, ASSERT_TEXT);
-        *mRegion = memRegion;
-    } else
-        *mRegion = nullptr;
-    resBlock->sizeTmp = resSize;
-    return resBlock;
-}
-
-bool Backend::coalescAndPutList(FreeBlock *list, bool forceCoalescQDrop, bool reportBlocksProcessed)
-{
-    bool regionReleased = false;
-
-    for (FreeBlock *helper; list;
-         list = helper,
-             // matches block enqueue in CoalRequestQ::putBlock()
-             reportBlocksProcessed? coalescQ.blockWasProcessed() : (void)0) {
-        MemRegion *memRegion;
-        bool addToTail = false;
-
-        helper = list->nextToFree;
-        FreeBlock *toRet = doCoalesc(list, &memRegion);
-        if (!toRet)
-            continue;
-
-        if (memRegion && memRegion->blockSz == toRet->sizeTmp
-            && !extMemPool->fixedPool) {
-            if (extMemPool->regionsAreReleaseable()) {
-                // release the region, because there is no used blocks in it
-                if (toRet->blockInBin)
-                    removeBlockFromBin(toRet);
-                releaseRegion(memRegion);
-                regionReleased = true;
-                continue;
-            } else // add block from empty region to end of bin,
-                addToTail = true; // preserving for exact fit
+
+        // Coalesce fBlock and add it back to a bin;
+        // processing delayed coalescing requests.
+        void Backend::coalescAndPut(FreeBlock *fBlock, size_t blockSz, bool slabAligned) {
+            fBlock->sizeTmp = blockSz;
+            fBlock->nextToFree = nullptr;
+            fBlock->slabAligned = slabAligned;
+
+            coalescAndPutList(fBlock, /*forceCoalescQDrop=*/false, /*reportBlocksProcessed=*/false);
         }
-        size_t currSz = toRet->sizeTmp;
-        int bin = sizeToBin(currSz);
-        bool toAligned = extMemPool->fixedPool ? toAlignedBin(toRet, currSz) : toRet->slabAligned;
-        bool needAddToBin = true;
-
-        if (toRet->blockInBin) {
-            // Does it stay in same bin?
-            if (toRet->myBin == bin && toRet->slabAligned == toAligned)
-                needAddToBin = false;
-            else {
-                toRet->blockInBin = false;
-                removeBlockFromBin(toRet);
+
+        bool Backend::scanCoalescQ(bool forceCoalescQDrop) {
+            FreeBlock *currCoalescList = coalescQ.getAll();
+
+            if (currCoalescList)
+                // reportBlocksProcessed=true informs that the blocks leave coalescQ,
+                // matches blockConsumed() from CoalRequestQ::putBlock()
+                coalescAndPutList(currCoalescList, forceCoalescQDrop,
+                                  /*reportBlocksProcessed=*/true);
+            // returns status of coalescQ.getAll(), as an indication of possible changes in backend
+            // TODO: coalescAndPutList() may report is some new free blocks became available or not
+            return currCoalescList;
+        }
+
+        FreeBlock *Backend::findBlockInRegion(MemRegion *region, size_t exactBlockSize) {
+            FreeBlock *fBlock;
+            size_t blockSz;
+            uintptr_t fBlockEnd, lastFreeBlock = (uintptr_t) region + region->allocSz - sizeof(LastFreeBlock);
+
+            static_assert(sizeof(LastFreeBlock) % sizeof(uintptr_t) == 0,
+                          "Atomic applied on LastFreeBlock, and we put it at the end of region, that"
+                          " is uintptr_t-aligned, so no unaligned atomic operations are possible.");
+            // right bound is slab-aligned, keep LastFreeBlock after it
+            if (region->type == MEMREG_SLAB_BLOCKS) {
+                fBlock = (FreeBlock *) alignUp((uintptr_t) region + sizeof(MemRegion), sizeof(uintptr_t));
+                fBlockEnd = alignDown(lastFreeBlock, slabSize);
+            } else {
+                fBlock = (FreeBlock *) alignUp((uintptr_t) region + sizeof(MemRegion), largeObjectAlignment);
+                fBlockEnd = (uintptr_t) fBlock + exactBlockSize;
+                MALLOC_ASSERT(fBlockEnd <= lastFreeBlock, ASSERT_TEXT);
             }
+            if (fBlockEnd <= (uintptr_t) fBlock) return nullptr;// allocSz is too small
+            blockSz = fBlockEnd - (uintptr_t) fBlock;
+            // TODO: extend getSlabBlock to support degradation, i.e. getting less blocks
+            // then requested, and then relax this check
+            // (now all or nothing is implemented, check according to this)
+            if (blockSz < numOfSlabAllocOnMiss * slabSize) return nullptr;
+
+            region->blockSz = blockSz;
+            return fBlock;
         }
 
-        // Does not stay in same bin, or bin-less; add it
-        if (needAddToBin) {
-            toRet->prev = toRet->next = toRet->nextToFree = nullptr;
-            toRet->myBin = NO_BIN;
-            toRet->slabAligned = toAligned;
-
-            // If the block is too small to fit in any bin, keep it bin-less.
-            // It's not a leak because the block later can be coalesced.
-            if (currSz >= minBinnedSize) {
-                toRet->sizeTmp = currSz;
-                IndexedBins *target = toRet->slabAligned ? &freeSlabAlignedBins : &freeLargeBlockBins;
-                if (forceCoalescQDrop) {
-                    target->addBlock(bin, toRet, toRet->sizeTmp, addToTail);
-                } else if (!target->tryAddBlock(bin, toRet, addToTail)) {
-                    coalescQ.putBlock(toRet);
-                    continue;
+        // startUseBlock may add the free block to a bin, the block can be used and
+        // even released after this, so the region must be added to regionList already
+        void Backend::startUseBlock(MemRegion *region, FreeBlock *fBlock, bool addToBin) {
+            size_t blockSz = region->blockSz;
+            fBlock->initHeader();
+            fBlock->setMeFree(blockSz);
+
+            LastFreeBlock *lastBl = static_cast<LastFreeBlock *>(fBlock->rightNeig(blockSz));
+            // to not get unaligned atomics during LastFreeBlock access
+            MALLOC_ASSERT(isAligned(lastBl, sizeof(uintptr_t)), nullptr);
+            lastBl->initHeader();
+            lastBl->setMeFree(GuardedSize::LAST_REGION_BLOCK);
+            lastBl->setLeftFree(blockSz);
+            lastBl->myBin = NO_BIN;
+            lastBl->memRegion = region;
+
+            if (addToBin) {
+                unsigned targetBin = sizeToBin(blockSz);
+                // during adding advance regions, register bin for a largest block in region
+                advRegBins.registerBin(targetBin);
+                if (region->type == MEMREG_SLAB_BLOCKS) {
+                    fBlock->slabAligned = true;
+                    freeSlabAlignedBins.addBlock(targetBin, fBlock, blockSz, /*addToTail=*/false);
+                } else {
+                    fBlock->slabAligned = false;
+                    freeLargeBlockBins.addBlock(targetBin, fBlock, blockSz, /*addToTail=*/false);
                 }
+            } else {
+                // to match with blockReleased() in genericGetBlock
+                bkndSync.blockConsumed();
+                // Understand our alignment for correct splitBlock operation
+                fBlock->slabAligned = region->type == MEMREG_SLAB_BLOCKS ? true : false;
+                fBlock->sizeTmp = fBlock->tryLockBlock();
+                MALLOC_ASSERT(fBlock->sizeTmp >= FreeBlock::minBlockSize, "Locking must be successful");
             }
-            toRet->sizeTmp = 0;
         }
-        // Free (possibly coalesced) free block.
-        // Adding to bin must be done before this point,
-        // because after a block is free it can be coalesced, and
-        // using its pointer became unsafe.
-        // Remember that coalescing is not done under any global lock.
-        toRet->setMeFree(currSz);
-        toRet->rightNeig(currSz)->setLeftFree(currSz);
-    }
-    return regionReleased;
-}
-
-// Coalesce fBlock and add it back to a bin;
-// processing delayed coalescing requests.
-void Backend::coalescAndPut(FreeBlock *fBlock, size_t blockSz, bool slabAligned)
-{
-    fBlock->sizeTmp = blockSz;
-    fBlock->nextToFree = nullptr;
-    fBlock->slabAligned = slabAligned;
-
-    coalescAndPutList(fBlock, /*forceCoalescQDrop=*/false, /*reportBlocksProcessed=*/false);
-}
-
-bool Backend::scanCoalescQ(bool forceCoalescQDrop)
-{
-    FreeBlock *currCoalescList = coalescQ.getAll();
-
-    if (currCoalescList)
-        // reportBlocksProcessed=true informs that the blocks leave coalescQ,
-        // matches blockConsumed() from CoalRequestQ::putBlock()
-        coalescAndPutList(currCoalescList, forceCoalescQDrop,
-                          /*reportBlocksProcessed=*/true);
-    // returns status of coalescQ.getAll(), as an indication of possible changes in backend
-    // TODO: coalescAndPutList() may report is some new free blocks became available or not
-    return currCoalescList;
-}
-
-FreeBlock *Backend::findBlockInRegion(MemRegion *region, size_t exactBlockSize)
-{
-    FreeBlock *fBlock;
-    size_t blockSz;
-    uintptr_t fBlockEnd,
-        lastFreeBlock = (uintptr_t)region + region->allocSz - sizeof(LastFreeBlock);
-
-    static_assert(sizeof(LastFreeBlock) % sizeof(uintptr_t) == 0,
-        "Atomic applied on LastFreeBlock, and we put it at the end of region, that"
-        " is uintptr_t-aligned, so no unaligned atomic operations are possible.");
-     // right bound is slab-aligned, keep LastFreeBlock after it
-    if (region->type == MEMREG_SLAB_BLOCKS) {
-        fBlock = (FreeBlock *)alignUp((uintptr_t)region + sizeof(MemRegion), sizeof(uintptr_t));
-        fBlockEnd = alignDown(lastFreeBlock, slabSize);
-    } else {
-        fBlock = (FreeBlock *)alignUp((uintptr_t)region + sizeof(MemRegion), largeObjectAlignment);
-        fBlockEnd = (uintptr_t)fBlock + exactBlockSize;
-        MALLOC_ASSERT(fBlockEnd <= lastFreeBlock, ASSERT_TEXT);
-    }
-    if (fBlockEnd <= (uintptr_t)fBlock)
-        return nullptr; // allocSz is too small
-    blockSz = fBlockEnd - (uintptr_t)fBlock;
-    // TODO: extend getSlabBlock to support degradation, i.e. getting less blocks
-    // then requested, and then relax this check
-    // (now all or nothing is implemented, check according to this)
-    if (blockSz < numOfSlabAllocOnMiss*slabSize)
-        return nullptr;
-
-    region->blockSz = blockSz;
-    return fBlock;
-}
-
-// startUseBlock may add the free block to a bin, the block can be used and
-// even released after this, so the region must be added to regionList already
-void Backend::startUseBlock(MemRegion *region, FreeBlock *fBlock, bool addToBin)
-{
-    size_t blockSz = region->blockSz;
-    fBlock->initHeader();
-    fBlock->setMeFree(blockSz);
-
-    LastFreeBlock *lastBl = static_cast<LastFreeBlock*>(fBlock->rightNeig(blockSz));
-    // to not get unaligned atomics during LastFreeBlock access
-    MALLOC_ASSERT(isAligned(lastBl, sizeof(uintptr_t)), nullptr);
-    lastBl->initHeader();
-    lastBl->setMeFree(GuardedSize::LAST_REGION_BLOCK);
-    lastBl->setLeftFree(blockSz);
-    lastBl->myBin = NO_BIN;
-    lastBl->memRegion = region;
-
-    if (addToBin) {
-        unsigned targetBin = sizeToBin(blockSz);
-        // during adding advance regions, register bin for a largest block in region
-        advRegBins.registerBin(targetBin);
-        if (region->type == MEMREG_SLAB_BLOCKS) {
-            fBlock->slabAligned = true;
-            freeSlabAlignedBins.addBlock(targetBin, fBlock, blockSz, /*addToTail=*/false);
-        } else {
-            fBlock->slabAligned = false;
-            freeLargeBlockBins.addBlock(targetBin, fBlock, blockSz, /*addToTail=*/false);
+
+        void MemRegionList::add(MemRegion *r) {
+            r->prev = nullptr;
+            MallocMutex::scoped_lock lock(regionListLock);
+            r->next = head;
+            head = r;
+            if (head->next) head->next->prev = head;
+        }
+
+        void MemRegionList::remove(MemRegion *r) {
+            MallocMutex::scoped_lock lock(regionListLock);
+            if (head == r) head = head->next;
+            if (r->next) r->next->prev = r->prev;
+            if (r->prev) r->prev->next = r->next;
         }
-    } else {
-        // to match with blockReleased() in genericGetBlock
-        bkndSync.blockConsumed();
-        // Understand our alignment for correct splitBlock operation
-        fBlock->slabAligned = region->type == MEMREG_SLAB_BLOCKS ? true : false;
-        fBlock->sizeTmp = fBlock->tryLockBlock();
-        MALLOC_ASSERT(fBlock->sizeTmp >= FreeBlock::minBlockSize, "Locking must be successful");
-    }
-}
-
-void MemRegionList::add(MemRegion *r)
-{
-    r->prev = nullptr;
-    MallocMutex::scoped_lock lock(regionListLock);
-    r->next = head;
-    head = r;
-    if (head->next)
-        head->next->prev = head;
-}
-
-void MemRegionList::remove(MemRegion *r)
-{
-    MallocMutex::scoped_lock lock(regionListLock);
-    if (head == r)
-        head = head->next;
-    if (r->next)
-        r->next->prev = r->prev;
-    if (r->prev)
-        r->prev->next = r->next;
-}
 
 #if __TBB_MALLOC_BACKEND_STAT
-int MemRegionList::reportStat(FILE *f)
-{
-    int regNum = 0;
-    MallocMutex::scoped_lock lock(regionListLock);
-    for (MemRegion *curr = head; curr; curr = curr->next) {
-        fprintf(f, "%p: max block %lu B, ", curr, curr->blockSz);
-        regNum++;
-    }
-    return regNum;
-}
+        int MemRegionList::reportStat(FILE *f) {
+            int regNum = 0;
+            MallocMutex::scoped_lock lock(regionListLock);
+            for (MemRegion *curr = head; curr; curr = curr->next) {
+                fprintf(f, "%p: max block %lu B, ", curr, curr->blockSz);
+                regNum++;
+            }
+            return regNum;
+        }
 #endif
 
-FreeBlock *Backend::addNewRegion(size_t size, MemRegionType memRegType, bool addToBin)
-{
-    static_assert(sizeof(BlockMutexes) <= sizeof(BlockI), "Header must be not overwritten in used blocks");
-    MALLOC_ASSERT(FreeBlock::minBlockSize > GuardedSize::MAX_SPEC_VAL,
-          "Block length must not conflict with special values of GuardedSize");
-    // If the region is not "for slabs" we should reserve some space for
-    // a region header, the worst case alignment and the last block mark.
-    const size_t requestSize = memRegType == MEMREG_SLAB_BLOCKS ? size :
-        size + sizeof(MemRegion) + largeObjectAlignment
-             +  FreeBlock::minBlockSize + sizeof(LastFreeBlock);
-
-    size_t rawSize = requestSize;
-    MemRegion *region = (MemRegion*)allocRawMem(rawSize);
-    if (!region) {
-        MALLOC_ASSERT(rawSize==requestSize, "getRawMem has not allocated memory but changed the allocated size.");
-        return nullptr;
-    }
-    if (rawSize < sizeof(MemRegion)) {
-        if (!extMemPool->fixedPool)
-            freeRawMem(region, rawSize);
-        return nullptr;
-    }
-
-    region->type = memRegType;
-    region->allocSz = rawSize;
-    FreeBlock *fBlock = findBlockInRegion(region, size);
-    if (!fBlock) {
-        if (!extMemPool->fixedPool)
-            freeRawMem(region, rawSize);
-        return nullptr;
-    }
-    regionList.add(region);
-    startUseBlock(region, fBlock, addToBin);
-    bkndSync.binsModified();
-    return addToBin? (FreeBlock*)VALID_BLOCK_IN_BIN : fBlock;
-}
-
-void Backend::init(ExtMemoryPool *extMemoryPool)
-{
-    extMemPool = extMemoryPool;
-    usedAddrRange.init();
-    coalescQ.init(&bkndSync);
-    bkndSync.init(this);
-}
-
-void Backend::reset()
-{
-    MALLOC_ASSERT(extMemPool->userPool(), "Only user pool can be reset.");
-    // no active threads are allowed in backend while reset() called
-    verify();
-
-    freeLargeBlockBins.reset();
-    freeSlabAlignedBins.reset();
-    advRegBins.reset();
-
-    for (MemRegion *curr = regionList.head; curr; curr = curr->next) {
-        FreeBlock *fBlock = findBlockInRegion(curr, curr->blockSz);
-        MALLOC_ASSERT(fBlock, "A memory region unexpectedly got smaller");
-        startUseBlock(curr, fBlock, /*addToBin=*/true);
-    }
-}
-
-bool Backend::destroy()
-{
-    bool noError = true;
-    // no active threads are allowed in backend while destroy() called
-    verify();
-    if (!inUserPool()) {
-        freeLargeBlockBins.reset();
-        freeSlabAlignedBins.reset();
-    }
-    while (regionList.head) {
-        MemRegion *helper = regionList.head->next;
-        noError &= freeRawMem(regionList.head, regionList.head->allocSz);
-        regionList.head = helper;
-    }
-    return noError;
-}
-
-bool Backend::clean()
-{
-    scanCoalescQ(/*forceCoalescQDrop=*/false);
-    // Backend::clean is always called under synchronization so only one thread can
-    // enter to this method at once.
-    // backendCleanCnt%2== 1 means that clean operation is in progress
-    backendCleanCnt.fetch_add(1, std::memory_order_acq_rel);
-    bool res = false;
-    // We can have several blocks occupying a whole region,
-    // because such regions are added in advance (see askMemFromOS() and reset()),
-    // and never used. Release them all.
-    for (int i = advRegBins.getMinUsedBin(0); i != -1; i = advRegBins.getMinUsedBin(i+1)) {
-        if (i == freeSlabAlignedBins.getMinNonemptyBin(i))
-            res |= freeSlabAlignedBins.tryReleaseRegions(i, this);
-        if (i == freeLargeBlockBins.getMinNonemptyBin(i))
-            res |= freeLargeBlockBins.tryReleaseRegions(i, this);
-    }
-    backendCleanCnt.fetch_add(1, std::memory_order_acq_rel);
-    return res;
-}
-
-void Backend::IndexedBins::verify()
-{
-#if MALLOC_DEBUG
-    for (int i=0; i<(int)freeBinsNum; i++) {
-        for (FreeBlock *fb = freeBins[i].head.load(std::memory_order_relaxed); fb; fb=fb->next) {
-            uintptr_t mySz = fb->myL.value;
-            MALLOC_ASSERT(mySz>GuardedSize::MAX_SPEC_VAL, ASSERT_TEXT);
-            FreeBlock *right = (FreeBlock*)((uintptr_t)fb + mySz);
-            suppress_unused_warning(right);
-            MALLOC_ASSERT(right->myL.value<=GuardedSize::MAX_SPEC_VAL, ASSERT_TEXT);
-            MALLOC_ASSERT(right->leftL.value==mySz, ASSERT_TEXT);
-            MALLOC_ASSERT(fb->leftL.value<=GuardedSize::MAX_SPEC_VAL, ASSERT_TEXT);
+        FreeBlock *Backend::addNewRegion(size_t size, MemRegionType memRegType, bool addToBin) {
+            static_assert(sizeof(BlockMutexes) <= sizeof(BlockI),
+                          "Header must be not overwritten in used blocks");
+            MALLOC_ASSERT(FreeBlock::minBlockSize > GuardedSize::MAX_SPEC_VAL,
+                          "Block length must not conflict with special values of GuardedSize");
+            // If the region is not "for slabs" we should reserve some space for
+            // a region header, the worst case alignment and the last block mark.
+            const size_t requestSize = memRegType == MEMREG_SLAB_BLOCKS
+                                               ? size
+                                               : size + sizeof(MemRegion) + largeObjectAlignment
+                                                         + FreeBlock::minBlockSize + sizeof(LastFreeBlock);
+
+            size_t rawSize = requestSize;
+            MemRegion *region = (MemRegion *) allocRawMem(rawSize);
+            if (!region) {
+                MALLOC_ASSERT(rawSize == requestSize,
+                              "getRawMem has not allocated memory but changed the allocated size.");
+                return nullptr;
+            }
+            if (rawSize < sizeof(MemRegion)) {
+                if (!extMemPool->fixedPool) freeRawMem(region, rawSize);
+                return nullptr;
+            }
+
+            region->type = memRegType;
+            region->allocSz = rawSize;
+            FreeBlock *fBlock = findBlockInRegion(region, size);
+            if (!fBlock) {
+                if (!extMemPool->fixedPool) freeRawMem(region, rawSize);
+                return nullptr;
+            }
+            regionList.add(region);
+            startUseBlock(region, fBlock, addToBin);
+            bkndSync.binsModified();
+            return addToBin ? (FreeBlock *) VALID_BLOCK_IN_BIN : fBlock;
+        }
+
+        void Backend::init(ExtMemoryPool *extMemoryPool) {
+            extMemPool = extMemoryPool;
+            usedAddrRange.init();
+            coalescQ.init(&bkndSync);
+            bkndSync.init(this);
+        }
+
+        void Backend::reset() {
+            MALLOC_ASSERT(extMemPool->userPool(), "Only user pool can be reset.");
+            // no active threads are allowed in backend while reset() called
+            verify();
+
+            freeLargeBlockBins.reset();
+            freeSlabAlignedBins.reset();
+            advRegBins.reset();
+
+            for (MemRegion *curr = regionList.head; curr; curr = curr->next) {
+                FreeBlock *fBlock = findBlockInRegion(curr, curr->blockSz);
+                MALLOC_ASSERT(fBlock, "A memory region unexpectedly got smaller");
+                startUseBlock(curr, fBlock, /*addToBin=*/true);
+            }
         }
-    }
+
+        bool Backend::destroy() {
+            bool noError = true;
+            // no active threads are allowed in backend while destroy() called
+            verify();
+            if (!inUserPool()) {
+                freeLargeBlockBins.reset();
+                freeSlabAlignedBins.reset();
+            }
+            while (regionList.head) {
+                MemRegion *helper = regionList.head->next;
+                noError &= freeRawMem(regionList.head, regionList.head->allocSz);
+                regionList.head = helper;
+            }
+            return noError;
+        }
+
+        bool Backend::clean() {
+            scanCoalescQ(/*forceCoalescQDrop=*/false);
+            // Backend::clean is always called under synchronization so only one thread can
+            // enter to this method at once.
+            // backendCleanCnt%2== 1 means that clean operation is in progress
+            backendCleanCnt.fetch_add(1, std::memory_order_acq_rel);
+            bool res = false;
+            // We can have several blocks occupying a whole region,
+            // because such regions are added in advance (see askMemFromOS() and reset()),
+            // and never used. Release them all.
+            for (int i = advRegBins.getMinUsedBin(0); i != -1; i = advRegBins.getMinUsedBin(i + 1)) {
+                if (i == freeSlabAlignedBins.getMinNonemptyBin(i))
+                    res |= freeSlabAlignedBins.tryReleaseRegions(i, this);
+                if (i == freeLargeBlockBins.getMinNonemptyBin(i))
+                    res |= freeLargeBlockBins.tryReleaseRegions(i, this);
+            }
+            backendCleanCnt.fetch_add(1, std::memory_order_acq_rel);
+            return res;
+        }
+
+        void Backend::IndexedBins::verify() {
+#if MALLOC_DEBUG
+            for (int i = 0; i < (int) freeBinsNum; i++) {
+                for (FreeBlock *fb = freeBins[i].head.load(std::memory_order_relaxed); fb; fb = fb->next) {
+                    uintptr_t mySz = fb->myL.value;
+                    MALLOC_ASSERT(mySz > GuardedSize::MAX_SPEC_VAL, ASSERT_TEXT);
+                    FreeBlock *right = (FreeBlock *) ((uintptr_t) fb + mySz);
+                    suppress_unused_warning(right);
+                    MALLOC_ASSERT(right->myL.value <= GuardedSize::MAX_SPEC_VAL, ASSERT_TEXT);
+                    MALLOC_ASSERT(right->leftL.value == mySz, ASSERT_TEXT);
+                    MALLOC_ASSERT(fb->leftL.value <= GuardedSize::MAX_SPEC_VAL, ASSERT_TEXT);
+                }
+            }
 #endif
-}
+        }
 
-// For correct operation, it must be called when no other threads
-// is changing backend.
-void Backend::verify()
-{
+        // For correct operation, it must be called when no other threads
+        // is changing backend.
+        void Backend::verify() {
 #if MALLOC_DEBUG
-    scanCoalescQ(/*forceCoalescQDrop=*/false);
-#endif // MALLOC_DEBUG
+            scanCoalescQ(/*forceCoalescQDrop=*/false);
+#endif// MALLOC_DEBUG
 
-    freeLargeBlockBins.verify();
-    freeSlabAlignedBins.verify();
-}
+            freeLargeBlockBins.verify();
+            freeSlabAlignedBins.verify();
+        }
 
 #if __TBB_MALLOC_BACKEND_STAT
-size_t Backend::Bin::countFreeBlocks()
-{
-    size_t cnt = 0;
-    {
-        MallocMutex::scoped_lock lock(tLock);
-        for (FreeBlock *fb = head; fb; fb = fb->next)
-            cnt++;
-    }
-    return cnt;
-}
-
-size_t Backend::Bin::reportFreeBlocks(FILE *f)
-{
-    size_t totalSz = 0;
-    MallocMutex::scoped_lock lock(tLock);
-    for (FreeBlock *fb = head; fb; fb = fb->next) {
-        size_t sz = fb->tryLockBlock();
-        fb->setMeFree(sz);
-        fb->rightNeig(sz)->setLeftFree(sz);
-        fprintf(f, " [%p;%p]", fb, (void*)((uintptr_t)fb+sz));
-        totalSz += sz;
-    }
-    return totalSz;
-}
-
-void Backend::IndexedBins::reportStat(FILE *f)
-{
-    size_t totalSize = 0;
-
-    for (int i=0; i<Backend::freeBinsNum; i++)
-        if (size_t cnt = freeBins[i].countFreeBlocks()) {
-            totalSize += freeBins[i].reportFreeBlocks(f);
-            fprintf(f, " %d:%lu, ", i, cnt);
+        size_t Backend::Bin::countFreeBlocks() {
+            size_t cnt = 0;
+            {
+                MallocMutex::scoped_lock lock(tLock);
+                for (FreeBlock *fb = head; fb; fb = fb->next) cnt++;
+            }
+            return cnt;
+        }
+
+        size_t Backend::Bin::reportFreeBlocks(FILE *f) {
+            size_t totalSz = 0;
+            MallocMutex::scoped_lock lock(tLock);
+            for (FreeBlock *fb = head; fb; fb = fb->next) {
+                size_t sz = fb->tryLockBlock();
+                fb->setMeFree(sz);
+                fb->rightNeig(sz)->setLeftFree(sz);
+                fprintf(f, " [%p;%p]", fb, (void *) ((uintptr_t) fb + sz));
+                totalSz += sz;
+            }
+            return totalSz;
+        }
+
+        void Backend::IndexedBins::reportStat(FILE *f) {
+            size_t totalSize = 0;
+
+            for (int i = 0; i < Backend::freeBinsNum; i++)
+                if (size_t cnt = freeBins[i].countFreeBlocks()) {
+                    totalSize += freeBins[i].reportFreeBlocks(f);
+                    fprintf(f, " %d:%lu, ", i, cnt);
+                }
+            fprintf(f, "\ttotal size %lu KB", totalSize / 1024);
         }
-    fprintf(f, "\ttotal size %lu KB", totalSize/1024);
-}
-
-void Backend::reportStat(FILE *f)
-{
-    scanCoalescQ(/*forceCoalescQDrop=*/false);
-
-    fprintf(f, "\n  regions:\n");
-    int regNum = regionList.reportStat(f);
-    fprintf(f, "\n%d regions, %lu KB in all regions\n  free bins:\nlarge bins: ",
-            regNum, totalMemSize/1024);
-    freeLargeBlockBins.reportStat(f);
-    fprintf(f, "\naligned bins: ");
-    freeSlabAlignedBins.reportStat(f);
-    fprintf(f, "\n");
-}
-#endif // __TBB_MALLOC_BACKEND_STAT
-
-} } // namespaces
+
+        void Backend::reportStat(FILE *f) {
+            scanCoalescQ(/*forceCoalescQDrop=*/false);
+
+            fprintf(f, "\n  regions:\n");
+            int regNum = regionList.reportStat(f);
+            fprintf(f, "\n%d regions, %lu KB in all regions\n  free bins:\nlarge bins: ", regNum,
+                    totalMemSize / 1024);
+            freeLargeBlockBins.reportStat(f);
+            fprintf(f, "\naligned bins: ");
+            freeSlabAlignedBins.reportStat(f);
+            fprintf(f, "\n");
+        }
+#endif// __TBB_MALLOC_BACKEND_STAT
+
+    }// namespace internal
+}// namespace rml
diff --git a/external/tbb/src/tbbmalloc/backref.cpp b/external/tbb/src/tbbmalloc/backref.cpp
index b0ea8306..6451ac45 100644
--- a/external/tbb/src/tbbmalloc/backref.cpp
+++ b/external/tbb/src/tbbmalloc/backref.cpp
@@ -15,344 +15,354 @@
 */
 
 #include "tbbmalloc_internal.h"
-#include <new>        /* for placement new */
+#include <new> /* for placement new */
 
 namespace rml {
-namespace internal {
+    namespace internal {
 
-
-/********* backreferences ***********************/
-/* Each slab block and each large memory object header contains BackRefIdx
+        /********* backreferences ***********************/
+        /* Each slab block and each large memory object header contains BackRefIdx
  * that points out in some BackRefBlock which points back to this block or header.
  */
-struct BackRefBlock : public BlockI {
-    BackRefBlock *nextForUse;     // the next in the chain of blocks with free items
-    FreeObject   *bumpPtr;        // bump pointer moves from the end to the beginning of the block
-    FreeObject   *freeList;
-    // list of all blocks that were allocated from raw mem (i.e., not from backend)
-    BackRefBlock *nextRawMemBlock;
-    std::atomic<int> allocatedCount; // the number of objects allocated
-    BackRefIdx::main_t myNum;   // the index in the main
-    MallocMutex   blockMutex;
-    // true if this block has been added to the listForUse chain,
-    // modifications protected by mainMutex
-    std::atomic<bool> addedToForUse;
-
-    BackRefBlock(const BackRefBlock *blockToUse, intptr_t num) :
-        nextForUse(nullptr), bumpPtr((FreeObject*)((uintptr_t)blockToUse + slabSize - sizeof(void*))),
-        freeList(nullptr), nextRawMemBlock(nullptr), allocatedCount(0), myNum(num),
-        addedToForUse(false) {
-        memset(static_cast<void*>(&blockMutex), 0, sizeof(MallocMutex));
-
-        MALLOC_ASSERT(!(num >> CHAR_BIT*sizeof(BackRefIdx::main_t)),
-                      "index in BackRefMain must fit to BackRefIdx::main");
-    }
-    // clean all but header
-    void zeroSet() { memset(static_cast<void*>(this+1), 0, BackRefBlock::bytes-sizeof(BackRefBlock)); }
-    static const int bytes = slabSize;
-};
-
-// max number of backreference pointers in slab block
-static const int BR_MAX_CNT = (BackRefBlock::bytes-sizeof(BackRefBlock))/sizeof(void*);
-
-struct BackRefMain {
-/* On 64-bit systems a slab block can hold up to ~2K back pointers to slab blocks
+        struct BackRefBlock : public BlockI {
+            BackRefBlock *nextForUse;// the next in the chain of blocks with free items
+            FreeObject *bumpPtr;     // bump pointer moves from the end to the beginning of the block
+            FreeObject *freeList;
+            // list of all blocks that were allocated from raw mem (i.e., not from backend)
+            BackRefBlock *nextRawMemBlock;
+            std::atomic<int> allocatedCount;// the number of objects allocated
+            BackRefIdx::main_t myNum;       // the index in the main
+            MallocMutex blockMutex;
+            // true if this block has been added to the listForUse chain,
+            // modifications protected by mainMutex
+            std::atomic<bool> addedToForUse;
+
+            BackRefBlock(const BackRefBlock *blockToUse, intptr_t num)
+                : nextForUse(nullptr),
+                  bumpPtr((FreeObject *) ((uintptr_t) blockToUse + slabSize - sizeof(void *))),
+                  freeList(nullptr), nextRawMemBlock(nullptr), allocatedCount(0), myNum(num),
+                  addedToForUse(false) {
+                memset(static_cast<void *>(&blockMutex), 0, sizeof(MallocMutex));
+
+                MALLOC_ASSERT(!(num >> CHAR_BIT * sizeof(BackRefIdx::main_t)),
+                              "index in BackRefMain must fit to BackRefIdx::main");
+            }
+            // clean all but header
+            void zeroSet() {
+                memset(static_cast<void *>(this + 1), 0, BackRefBlock::bytes - sizeof(BackRefBlock));
+            }
+            static const int bytes = slabSize;
+        };
+
+        // max number of backreference pointers in slab block
+        static const int BR_MAX_CNT = (BackRefBlock::bytes - sizeof(BackRefBlock)) / sizeof(void *);
+
+        struct BackRefMain {
+            /* On 64-bit systems a slab block can hold up to ~2K back pointers to slab blocks
  * or large objects, so it can address at least 32MB. The main array of 256KB
  * holds 32K pointers to such blocks, addressing ~1 TB.
  * On 32-bit systems there is ~4K back pointers in a slab block, so ~64MB can be addressed.
  * The main array of 8KB holds 2K pointers to leaves, so ~128 GB can addressed.
  */
-    static const size_t bytes = sizeof(uintptr_t)>4? 256*1024 : 8*1024;
-    static const int dataSz;
-/* space is reserved for main table and 4 leaves
+            static const size_t bytes = sizeof(uintptr_t) > 4 ? 256 * 1024 : 8 * 1024;
+            static const int dataSz;
+            /* space is reserved for main table and 4 leaves
    taking into account VirtualAlloc allocation granularity */
-    static const int leaves = 4;
-    static const size_t mainSize = BackRefMain::bytes+leaves*BackRefBlock::bytes;
-    // The size of memory request for a few more leaf blocks;
-    // selected to match VirtualAlloc granularity
-    static const size_t blockSpaceSize = 64*1024;
-
-    Backend       *backend;
-    std::atomic<BackRefBlock*> active;         // if defined, use it for allocations
-    std::atomic<BackRefBlock*> listForUse;     // the chain of data blocks with free items
-    BackRefBlock  *allRawMemBlocks;
-    std::atomic <intptr_t> lastUsed; // index of the last used block
-    bool           rawMemUsed;
-    MallocMutex    requestNewSpaceMutex;
-    BackRefBlock  *backRefBl[1];   // the real size of the array is dataSz
-
-    BackRefBlock *findFreeBlock();
-    void          addToForUseList(BackRefBlock *bl);
-    void          initEmptyBackRefBlock(BackRefBlock *newBl);
-    bool          requestNewSpace();
-};
-
-const int BackRefMain::dataSz
-    = 1+(BackRefMain::bytes-sizeof(BackRefMain))/sizeof(BackRefBlock*);
-
-static MallocMutex mainMutex;
-static std::atomic<BackRefMain*> backRefMain;
-
-bool initBackRefMain(Backend *backend)
-{
-    bool rawMemUsed;
-    BackRefMain *main =
-        (BackRefMain*)backend->getBackRefSpace(BackRefMain::mainSize,
-                                                 &rawMemUsed);
-    if (! main)
-        return false;
-    main->backend = backend;
-    main->listForUse.store(nullptr, std::memory_order_relaxed);
-    main->allRawMemBlocks = nullptr;
-    main->rawMemUsed = rawMemUsed;
-    main->lastUsed = -1;
-    memset(static_cast<void*>(&main->requestNewSpaceMutex), 0, sizeof(MallocMutex));
-    for (int i=0; i<BackRefMain::leaves; i++) {
-        BackRefBlock *bl = (BackRefBlock*)((uintptr_t)main + BackRefMain::bytes + i*BackRefBlock::bytes);
-        bl->zeroSet();
-        main->initEmptyBackRefBlock(bl);
-        if (i)
-            main->addToForUseList(bl);
-        else // active leaf is not needed in listForUse
-            main->active.store(bl, std::memory_order_relaxed);
-    }
-    // backRefMain is read in getBackRef, so publish it in consistent state
-    backRefMain.store(main, std::memory_order_release);
-    return true;
-}
+            static const int leaves = 4;
+            static const size_t mainSize = BackRefMain::bytes + leaves * BackRefBlock::bytes;
+            // The size of memory request for a few more leaf blocks;
+            // selected to match VirtualAlloc granularity
+            static const size_t blockSpaceSize = 64 * 1024;
+
+            Backend *backend;
+            std::atomic<BackRefBlock *> active;    // if defined, use it for allocations
+            std::atomic<BackRefBlock *> listForUse;// the chain of data blocks with free items
+            BackRefBlock *allRawMemBlocks;
+            std::atomic<intptr_t> lastUsed;// index of the last used block
+            bool rawMemUsed;
+            MallocMutex requestNewSpaceMutex;
+            BackRefBlock *backRefBl[1];// the real size of the array is dataSz
+
+            BackRefBlock *findFreeBlock();
+            void addToForUseList(BackRefBlock *bl);
+            void initEmptyBackRefBlock(BackRefBlock *newBl);
+            bool requestNewSpace();
+        };
+
+        const int BackRefMain::dataSz
+                = 1 + (BackRefMain::bytes - sizeof(BackRefMain)) / sizeof(BackRefBlock *);
+
+        static MallocMutex mainMutex;
+        static std::atomic<BackRefMain *> backRefMain;
+
+        bool initBackRefMain(Backend *backend) {
+            bool rawMemUsed;
+            BackRefMain *main = (BackRefMain *) backend->getBackRefSpace(BackRefMain::mainSize, &rawMemUsed);
+            if (!main) return false;
+            main->backend = backend;
+            main->listForUse.store(nullptr, std::memory_order_relaxed);
+            main->allRawMemBlocks = nullptr;
+            main->rawMemUsed = rawMemUsed;
+            main->lastUsed = -1;
+            memset(static_cast<void *>(&main->requestNewSpaceMutex), 0, sizeof(MallocMutex));
+            for (int i = 0; i < BackRefMain::leaves; i++) {
+                BackRefBlock *bl
+                        = (BackRefBlock *) ((uintptr_t) main + BackRefMain::bytes + i * BackRefBlock::bytes);
+                bl->zeroSet();
+                main->initEmptyBackRefBlock(bl);
+                if (i) main->addToForUseList(bl);
+                else// active leaf is not needed in listForUse
+                    main->active.store(bl, std::memory_order_relaxed);
+            }
+            // backRefMain is read in getBackRef, so publish it in consistent state
+            backRefMain.store(main, std::memory_order_release);
+            return true;
+        }
 
 #if __TBB_SOURCE_DIRECTLY_INCLUDED
-void destroyBackRefMain(Backend *backend)
-{
-    if (backRefMain.load(std::memory_order_acquire)) { // Is initBackRefMain() called?
-        for (BackRefBlock *curr = backRefMain.load(std::memory_order_relaxed)->allRawMemBlocks; curr; ) {
-            BackRefBlock *next = curr->nextRawMemBlock;
-            // allRawMemBlocks list is only for raw mem blocks
-            backend->putBackRefSpace(curr, BackRefMain::blockSpaceSize,
-                                     /*rawMemUsed=*/true);
-            curr = next;
+        void destroyBackRefMain(Backend *backend) {
+            if (backRefMain.load(std::memory_order_acquire)) {// Is initBackRefMain() called?
+                for (BackRefBlock *curr = backRefMain.load(std::memory_order_relaxed)->allRawMemBlocks;
+                     curr;) {
+                    BackRefBlock *next = curr->nextRawMemBlock;
+                    // allRawMemBlocks list is only for raw mem blocks
+                    backend->putBackRefSpace(curr, BackRefMain::blockSpaceSize,
+                                             /*rawMemUsed=*/true);
+                    curr = next;
+                }
+                backend->putBackRefSpace(backRefMain.load(std::memory_order_relaxed), BackRefMain::mainSize,
+                                         backRefMain.load(std::memory_order_relaxed)->rawMemUsed);
+            }
         }
-        backend->putBackRefSpace(backRefMain.load(std::memory_order_relaxed), BackRefMain::mainSize,
-                                 backRefMain.load(std::memory_order_relaxed)->rawMemUsed);
-    }
-}
 #endif
 
-void BackRefMain::addToForUseList(BackRefBlock *bl)
-{
-    bl->nextForUse = listForUse.load(std::memory_order_relaxed);
-    listForUse.store(bl, std::memory_order_relaxed);
-    bl->addedToForUse.store(true, std::memory_order_relaxed);
-}
-
-void BackRefMain::initEmptyBackRefBlock(BackRefBlock *newBl)
-{
-    intptr_t nextLU = lastUsed+1;
-    new (newBl) BackRefBlock(newBl, nextLU);
-    MALLOC_ASSERT(nextLU < dataSz, nullptr);
-    backRefBl[nextLU] = newBl;
-    // lastUsed is read in getBackRef, and access to backRefBl[lastUsed]
-    // is possible only after checking backref against current lastUsed
-    lastUsed.store(nextLU, std::memory_order_release);
-}
-
-bool BackRefMain::requestNewSpace()
-{
-    bool isRawMemUsed;
-    static_assert(!(blockSpaceSize % BackRefBlock::bytes),
-                         "Must request space for whole number of blocks.");
-
-    if (BackRefMain::dataSz <= lastUsed + 1) // no space in main
-        return false;
-
-    // only one thread at a time may add blocks
-    MallocMutex::scoped_lock newSpaceLock(requestNewSpaceMutex);
-
-    if (listForUse.load(std::memory_order_relaxed)) // double check that only one block is available
-        return true;
-    BackRefBlock *newBl = (BackRefBlock*)backend->getBackRefSpace(blockSpaceSize, &isRawMemUsed);
-    if (!newBl) return false;
-
-    // touch a page for the 1st time without taking mainMutex ...
-    for (BackRefBlock *bl = newBl; (uintptr_t)bl < (uintptr_t)newBl + blockSpaceSize;
-         bl = (BackRefBlock*)((uintptr_t)bl + BackRefBlock::bytes)) {
-        bl->zeroSet();
-    }
-
-    MallocMutex::scoped_lock lock(mainMutex); // ... and share under lock
-
-    const size_t numOfUnusedIdxs = BackRefMain::dataSz - lastUsed - 1;
-    if (numOfUnusedIdxs <= 0) { // no space in main under lock, roll back
-        backend->putBackRefSpace(newBl, blockSpaceSize, isRawMemUsed);
-        return false;
-    }
-    // It's possible that only part of newBl is used, due to lack of indices in main.
-    // This is OK as such underutilization is possible only once for backreferneces table.
-    int blocksToUse = min(numOfUnusedIdxs, blockSpaceSize / BackRefBlock::bytes);
-
-    // use the first block in the batch to maintain the list of "raw" memory
-    // to be released at shutdown
-    if (isRawMemUsed) {
-        newBl->nextRawMemBlock = backRefMain.load(std::memory_order_relaxed)->allRawMemBlocks;
-        backRefMain.load(std::memory_order_relaxed)->allRawMemBlocks = newBl;
-    }
-    for (BackRefBlock *bl = newBl; blocksToUse>0; bl = (BackRefBlock*)((uintptr_t)bl + BackRefBlock::bytes), blocksToUse--) {
-        initEmptyBackRefBlock(bl);
-        if (active.load(std::memory_order_relaxed)->allocatedCount.load(std::memory_order_relaxed) == BR_MAX_CNT) {
-            active.store(bl, std::memory_order_release); // active leaf is not needed in listForUse
-        } else {
-            addToForUseList(bl);
+        void BackRefMain::addToForUseList(BackRefBlock *bl) {
+            bl->nextForUse = listForUse.load(std::memory_order_relaxed);
+            listForUse.store(bl, std::memory_order_relaxed);
+            bl->addedToForUse.store(true, std::memory_order_relaxed);
         }
-    }
-    return true;
-}
-
-BackRefBlock *BackRefMain::findFreeBlock()
-{
-    BackRefBlock* active_block = active.load(std::memory_order_acquire);
-    MALLOC_ASSERT(active_block, ASSERT_TEXT);
-
-    if (active_block->allocatedCount.load(std::memory_order_relaxed) < BR_MAX_CNT)
-        return active_block;
-
-    if (listForUse.load(std::memory_order_relaxed)) { // use released list
-        MallocMutex::scoped_lock lock(mainMutex);
-
-        if (active_block->allocatedCount.load(std::memory_order_relaxed) == BR_MAX_CNT) {
-            active_block = listForUse.load(std::memory_order_relaxed);
-            if (active_block) {
-                active.store(active_block, std::memory_order_release);
-                listForUse.store(active_block->nextForUse, std::memory_order_relaxed);
-                MALLOC_ASSERT(active_block->addedToForUse.load(std::memory_order_relaxed), ASSERT_TEXT);
-                active_block->addedToForUse.store(false, std::memory_order_relaxed);
-            }
+
+        void BackRefMain::initEmptyBackRefBlock(BackRefBlock *newBl) {
+            intptr_t nextLU = lastUsed + 1;
+            new (newBl) BackRefBlock(newBl, nextLU);
+            MALLOC_ASSERT(nextLU < dataSz, nullptr);
+            backRefBl[nextLU] = newBl;
+            // lastUsed is read in getBackRef, and access to backRefBl[lastUsed]
+            // is possible only after checking backref against current lastUsed
+            lastUsed.store(nextLU, std::memory_order_release);
         }
-    } else // allocate new data node
-        if (!requestNewSpace())
-            return nullptr;
-    return active.load(std::memory_order_acquire); // reread because of requestNewSpace
-}
-
-void *getBackRef(BackRefIdx backRefIdx)
-{
-    // !backRefMain means no initialization done, so it can't be valid memory
-    // see addEmptyBackRefBlock for fences around lastUsed
-    if (!(backRefMain.load(std::memory_order_acquire))
-        || backRefIdx.getMain() > (backRefMain.load(std::memory_order_relaxed)->lastUsed.load(std::memory_order_acquire))
-        || backRefIdx.getOffset() >= BR_MAX_CNT)
-    {
-        return nullptr;
-    }
-    std::atomic<void*>& backRefEntry = *(std::atomic<void*>*)(
-            (uintptr_t)backRefMain.load(std::memory_order_relaxed)->backRefBl[backRefIdx.getMain()]
-            + sizeof(BackRefBlock) + backRefIdx.getOffset() * sizeof(std::atomic<void*>)
-        );
-    return backRefEntry.load(std::memory_order_relaxed);
-}
-
-void setBackRef(BackRefIdx backRefIdx, void *newPtr)
-{
-    MALLOC_ASSERT(backRefIdx.getMain()<=backRefMain.load(std::memory_order_relaxed)->lastUsed.load(std::memory_order_relaxed)
-                                 && backRefIdx.getOffset()<BR_MAX_CNT, ASSERT_TEXT);
-    ((std::atomic<void*>*)((uintptr_t)backRefMain.load(std::memory_order_relaxed)->backRefBl[backRefIdx.getMain()]
-        + sizeof(BackRefBlock) + backRefIdx.getOffset() * sizeof(void*)))->store(newPtr, std::memory_order_relaxed);
-}
-
-BackRefIdx BackRefIdx::newBackRef(bool largeObj)
-{
-    BackRefBlock *blockToUse;
-    void **toUse;
-    BackRefIdx res;
-    bool lastBlockFirstUsed = false;
-
-    do {
-        MALLOC_ASSERT(backRefMain.load(std::memory_order_relaxed), ASSERT_TEXT);
-        blockToUse = backRefMain.load(std::memory_order_relaxed)->findFreeBlock();
-        if (!blockToUse)
-            return BackRefIdx();
-        toUse = nullptr;
-        { // the block is locked to find a reference
-            MallocMutex::scoped_lock lock(blockToUse->blockMutex);
-
-            if (blockToUse->freeList) {
-                toUse = (void**)blockToUse->freeList;
-                blockToUse->freeList = blockToUse->freeList->next;
-                MALLOC_ASSERT(!blockToUse->freeList ||
-                              ((uintptr_t)blockToUse->freeList>=(uintptr_t)blockToUse
-                               && (uintptr_t)blockToUse->freeList <
-                               (uintptr_t)blockToUse + slabSize), ASSERT_TEXT);
-            } else if (blockToUse->allocatedCount.load(std::memory_order_relaxed) < BR_MAX_CNT) {
-                toUse = (void**)blockToUse->bumpPtr;
-                blockToUse->bumpPtr =
-                    (FreeObject*)((uintptr_t)blockToUse->bumpPtr - sizeof(void*));
-                if (blockToUse->allocatedCount.load(std::memory_order_relaxed) == BR_MAX_CNT-1) {
-                    MALLOC_ASSERT((uintptr_t)blockToUse->bumpPtr
-                                  < (uintptr_t)blockToUse+sizeof(BackRefBlock),
-                                  ASSERT_TEXT);
-                    blockToUse->bumpPtr = nullptr;
+
+        bool BackRefMain::requestNewSpace() {
+            bool isRawMemUsed;
+            static_assert(!(blockSpaceSize % BackRefBlock::bytes),
+                          "Must request space for whole number of blocks.");
+
+            if (BackRefMain::dataSz <= lastUsed + 1)// no space in main
+                return false;
+
+            // only one thread at a time may add blocks
+            MallocMutex::scoped_lock newSpaceLock(requestNewSpaceMutex);
+
+            if (listForUse.load(std::memory_order_relaxed))// double check that only one block is available
+                return true;
+            BackRefBlock *newBl = (BackRefBlock *) backend->getBackRefSpace(blockSpaceSize, &isRawMemUsed);
+            if (!newBl) return false;
+
+            // touch a page for the 1st time without taking mainMutex ...
+            for (BackRefBlock *bl = newBl; (uintptr_t) bl < (uintptr_t) newBl + blockSpaceSize;
+                 bl = (BackRefBlock *) ((uintptr_t) bl + BackRefBlock::bytes)) {
+                bl->zeroSet();
+            }
+
+            MallocMutex::scoped_lock lock(mainMutex);// ... and share under lock
+
+            const size_t numOfUnusedIdxs = BackRefMain::dataSz - lastUsed - 1;
+            if (numOfUnusedIdxs <= 0) {// no space in main under lock, roll back
+                backend->putBackRefSpace(newBl, blockSpaceSize, isRawMemUsed);
+                return false;
+            }
+            // It's possible that only part of newBl is used, due to lack of indices in main.
+            // This is OK as such underutilization is possible only once for backreferneces table.
+            int blocksToUse = min(numOfUnusedIdxs, blockSpaceSize / BackRefBlock::bytes);
+
+            // use the first block in the batch to maintain the list of "raw" memory
+            // to be released at shutdown
+            if (isRawMemUsed) {
+                newBl->nextRawMemBlock = backRefMain.load(std::memory_order_relaxed)->allRawMemBlocks;
+                backRefMain.load(std::memory_order_relaxed)->allRawMemBlocks = newBl;
+            }
+            for (BackRefBlock *bl = newBl; blocksToUse > 0;
+                 bl = (BackRefBlock *) ((uintptr_t) bl + BackRefBlock::bytes), blocksToUse--) {
+                initEmptyBackRefBlock(bl);
+                if (active.load(std::memory_order_relaxed)->allocatedCount.load(std::memory_order_relaxed)
+                    == BR_MAX_CNT) {
+                    active.store(bl, std::memory_order_release);// active leaf is not needed in listForUse
+                } else {
+                    addToForUseList(bl);
                 }
             }
-            if (toUse) {
-                if (!blockToUse->allocatedCount.load(std::memory_order_relaxed) &&
-                    !backRefMain.load(std::memory_order_relaxed)->listForUse.load(std::memory_order_relaxed)) {
-                    lastBlockFirstUsed = true;
+            return true;
+        }
+
+        BackRefBlock *BackRefMain::findFreeBlock() {
+            BackRefBlock *active_block = active.load(std::memory_order_acquire);
+            MALLOC_ASSERT(active_block, ASSERT_TEXT);
+
+            if (active_block->allocatedCount.load(std::memory_order_relaxed) < BR_MAX_CNT)
+                return active_block;
+
+            if (listForUse.load(std::memory_order_relaxed)) {// use released list
+                MallocMutex::scoped_lock lock(mainMutex);
+
+                if (active_block->allocatedCount.load(std::memory_order_relaxed) == BR_MAX_CNT) {
+                    active_block = listForUse.load(std::memory_order_relaxed);
+                    if (active_block) {
+                        active.store(active_block, std::memory_order_release);
+                        listForUse.store(active_block->nextForUse, std::memory_order_relaxed);
+                        MALLOC_ASSERT(active_block->addedToForUse.load(std::memory_order_relaxed),
+                                      ASSERT_TEXT);
+                        active_block->addedToForUse.store(false, std::memory_order_relaxed);
+                    }
                 }
-                blockToUse->allocatedCount.store(blockToUse->allocatedCount.load(std::memory_order_relaxed) + 1, std::memory_order_relaxed);
+            } else// allocate new data node
+                    if (!requestNewSpace())
+                return nullptr;
+            return active.load(std::memory_order_acquire);// reread because of requestNewSpace
+        }
+
+        void *getBackRef(BackRefIdx backRefIdx) {
+            // !backRefMain means no initialization done, so it can't be valid memory
+            // see addEmptyBackRefBlock for fences around lastUsed
+            if (!(backRefMain.load(std::memory_order_acquire))
+                || backRefIdx.getMain() > (backRefMain.load(std::memory_order_relaxed)
+                                                   ->lastUsed.load(std::memory_order_acquire))
+                || backRefIdx.getOffset() >= BR_MAX_CNT) {
+                return nullptr;
             }
-        } // end of lock scope
-    } while (!toUse);
-    // The first thread that uses the last block requests new space in advance;
-    // possible failures are ignored.
-    if (lastBlockFirstUsed)
-        backRefMain.load(std::memory_order_relaxed)->requestNewSpace();
-
-    res.main = blockToUse->myNum;
-    uintptr_t offset =
-        ((uintptr_t)toUse - ((uintptr_t)blockToUse + sizeof(BackRefBlock)))/sizeof(void*);
-    // Is offset too big?
-    MALLOC_ASSERT(!(offset >> 15), ASSERT_TEXT);
-    res.offset = offset;
-    if (largeObj) res.largeObj = largeObj;
-
-    return res;
-}
-
-void removeBackRef(BackRefIdx backRefIdx)
-{
-    MALLOC_ASSERT(!backRefIdx.isInvalid(), ASSERT_TEXT);
-    MALLOC_ASSERT(backRefIdx.getMain()<=backRefMain.load(std::memory_order_relaxed)->lastUsed.load(std::memory_order_relaxed)
-                  && backRefIdx.getOffset()<BR_MAX_CNT, ASSERT_TEXT);
-    BackRefBlock *currBlock = backRefMain.load(std::memory_order_relaxed)->backRefBl[backRefIdx.getMain()];
-    std::atomic<void*>& backRefEntry = *(std::atomic<void*>*)((uintptr_t)currBlock + sizeof(BackRefBlock)
-                                        + backRefIdx.getOffset()*sizeof(std::atomic<void*>));
-    MALLOC_ASSERT(((uintptr_t)&backRefEntry >(uintptr_t)currBlock &&
-                   (uintptr_t)&backRefEntry <(uintptr_t)currBlock + slabSize), ASSERT_TEXT);
-    {
-        MallocMutex::scoped_lock lock(currBlock->blockMutex);
-
-        backRefEntry.store(currBlock->freeList, std::memory_order_relaxed);
-#if MALLOC_DEBUG
-        uintptr_t backRefEntryValue = (uintptr_t)backRefEntry.load(std::memory_order_relaxed);
-        MALLOC_ASSERT(!backRefEntryValue ||
-                      (backRefEntryValue > (uintptr_t)currBlock
-                       && backRefEntryValue < (uintptr_t)currBlock + slabSize), ASSERT_TEXT);
-#endif
-        currBlock->freeList = (FreeObject*)&backRefEntry;
-        currBlock->allocatedCount.store(currBlock->allocatedCount.load(std::memory_order_relaxed)-1, std::memory_order_relaxed);
-    }
-    // TODO: do we need double-check here?
-    if (!currBlock->addedToForUse.load(std::memory_order_relaxed) &&
-        currBlock!=backRefMain.load(std::memory_order_relaxed)->active.load(std::memory_order_relaxed)) {
-        MallocMutex::scoped_lock lock(mainMutex);
+            std::atomic<void *> &backRefEntry
+                    = *(std::atomic<void *> *) ((uintptr_t) backRefMain.load(std::memory_order_relaxed)
+                                                        ->backRefBl[backRefIdx.getMain()]
+                                                + sizeof(BackRefBlock)
+                                                + backRefIdx.getOffset() * sizeof(std::atomic<void *>));
+            return backRefEntry.load(std::memory_order_relaxed);
+        }
 
-        if (!currBlock->addedToForUse.load(std::memory_order_relaxed) &&
-            currBlock!=backRefMain.load(std::memory_order_relaxed)->active.load(std::memory_order_relaxed))
-            backRefMain.load(std::memory_order_relaxed)->addToForUseList(currBlock);
-    }
-}
+        void setBackRef(BackRefIdx backRefIdx, void *newPtr) {
+            MALLOC_ASSERT(backRefIdx.getMain() <= backRefMain.load(std::memory_order_relaxed)
+                                                          ->lastUsed.load(std::memory_order_relaxed)
+                                  && backRefIdx.getOffset() < BR_MAX_CNT,
+                          ASSERT_TEXT);
+            ((std::atomic<void *> *) ((uintptr_t) backRefMain.load(std::memory_order_relaxed)
+                                              ->backRefBl[backRefIdx.getMain()]
+                                      + sizeof(BackRefBlock) + backRefIdx.getOffset() * sizeof(void *)))
+                    ->store(newPtr, std::memory_order_relaxed);
+        }
 
-/********* End of backreferences ***********************/
+        BackRefIdx BackRefIdx::newBackRef(bool largeObj) {
+            BackRefBlock *blockToUse;
+            void **toUse;
+            BackRefIdx res;
+            bool lastBlockFirstUsed = false;
+
+            do {
+                MALLOC_ASSERT(backRefMain.load(std::memory_order_relaxed), ASSERT_TEXT);
+                blockToUse = backRefMain.load(std::memory_order_relaxed)->findFreeBlock();
+                if (!blockToUse) return BackRefIdx();
+                toUse = nullptr;
+                {// the block is locked to find a reference
+                    MallocMutex::scoped_lock lock(blockToUse->blockMutex);
+
+                    if (blockToUse->freeList) {
+                        toUse = (void **) blockToUse->freeList;
+                        blockToUse->freeList = blockToUse->freeList->next;
+                        MALLOC_ASSERT(!blockToUse->freeList
+                                              || ((uintptr_t) blockToUse->freeList >= (uintptr_t) blockToUse
+                                                  && (uintptr_t) blockToUse->freeList
+                                                             < (uintptr_t) blockToUse + slabSize),
+                                      ASSERT_TEXT);
+                    } else if (blockToUse->allocatedCount.load(std::memory_order_relaxed) < BR_MAX_CNT) {
+                        toUse = (void **) blockToUse->bumpPtr;
+                        blockToUse->bumpPtr
+                                = (FreeObject *) ((uintptr_t) blockToUse->bumpPtr - sizeof(void *));
+                        if (blockToUse->allocatedCount.load(std::memory_order_relaxed) == BR_MAX_CNT - 1) {
+                            MALLOC_ASSERT((uintptr_t) blockToUse->bumpPtr
+                                                  < (uintptr_t) blockToUse + sizeof(BackRefBlock),
+                                          ASSERT_TEXT);
+                            blockToUse->bumpPtr = nullptr;
+                        }
+                    }
+                    if (toUse) {
+                        if (!blockToUse->allocatedCount.load(std::memory_order_relaxed)
+                            && !backRefMain.load(std::memory_order_relaxed)
+                                        ->listForUse.load(std::memory_order_relaxed)) {
+                            lastBlockFirstUsed = true;
+                        }
+                        blockToUse->allocatedCount.store(
+                                blockToUse->allocatedCount.load(std::memory_order_relaxed) + 1,
+                                std::memory_order_relaxed);
+                    }
+                }// end of lock scope
+            } while (!toUse);
+            // The first thread that uses the last block requests new space in advance;
+            // possible failures are ignored.
+            if (lastBlockFirstUsed) backRefMain.load(std::memory_order_relaxed)->requestNewSpace();
+
+            res.main = blockToUse->myNum;
+            uintptr_t offset
+                    = ((uintptr_t) toUse - ((uintptr_t) blockToUse + sizeof(BackRefBlock))) / sizeof(void *);
+            // Is offset too big?
+            MALLOC_ASSERT(!(offset >> 15), ASSERT_TEXT);
+            res.offset = offset;
+            if (largeObj) res.largeObj = largeObj;
+
+            return res;
+        }
+
+        void removeBackRef(BackRefIdx backRefIdx) {
+            MALLOC_ASSERT(!backRefIdx.isInvalid(), ASSERT_TEXT);
+            MALLOC_ASSERT(backRefIdx.getMain() <= backRefMain.load(std::memory_order_relaxed)
+                                                          ->lastUsed.load(std::memory_order_relaxed)
+                                  && backRefIdx.getOffset() < BR_MAX_CNT,
+                          ASSERT_TEXT);
+            BackRefBlock *currBlock
+                    = backRefMain.load(std::memory_order_relaxed)->backRefBl[backRefIdx.getMain()];
+            std::atomic<void *> &backRefEntry
+                    = *(std::atomic<void *> *) ((uintptr_t) currBlock + sizeof(BackRefBlock)
+                                                + backRefIdx.getOffset() * sizeof(std::atomic<void *>));
+            MALLOC_ASSERT(((uintptr_t) &backRefEntry > (uintptr_t) currBlock
+                           && (uintptr_t) &backRefEntry < (uintptr_t) currBlock + slabSize),
+                          ASSERT_TEXT);
+            {
+                MallocMutex::scoped_lock lock(currBlock->blockMutex);
+
+                backRefEntry.store(currBlock->freeList, std::memory_order_relaxed);
+#if MALLOC_DEBUG
+                uintptr_t backRefEntryValue = (uintptr_t) backRefEntry.load(std::memory_order_relaxed);
+                MALLOC_ASSERT(!backRefEntryValue
+                                      || (backRefEntryValue > (uintptr_t) currBlock
+                                          && backRefEntryValue < (uintptr_t) currBlock + slabSize),
+                              ASSERT_TEXT);
+#endif
+                currBlock->freeList = (FreeObject *) &backRefEntry;
+                currBlock->allocatedCount.store(currBlock->allocatedCount.load(std::memory_order_relaxed) - 1,
+                                                std::memory_order_relaxed);
+            }
+            // TODO: do we need double-check here?
+            if (!currBlock->addedToForUse.load(std::memory_order_relaxed)
+                && currBlock
+                           != backRefMain.load(std::memory_order_relaxed)
+                                      ->active.load(std::memory_order_relaxed)) {
+                MallocMutex::scoped_lock lock(mainMutex);
+
+                if (!currBlock->addedToForUse.load(std::memory_order_relaxed)
+                    && currBlock
+                               != backRefMain.load(std::memory_order_relaxed)
+                                          ->active.load(std::memory_order_relaxed))
+                    backRefMain.load(std::memory_order_relaxed)->addToForUseList(currBlock);
+            }
+        }
 
-} // namespace internal
-} // namespace rml
+        /********* End of backreferences ***********************/
 
+    }// namespace internal
+}// namespace rml
diff --git a/external/tbb/src/tbbmalloc/frontend.cpp b/external/tbb/src/tbbmalloc/frontend.cpp
index f05aff23..62af9ca1 100644
--- a/external/tbb/src/tbbmalloc/frontend.cpp
+++ b/external/tbb/src/tbbmalloc/frontend.cpp
@@ -16,234 +16,228 @@
 
 #include "tbbmalloc_internal.h"
 #include <errno.h>
-#include <new>        /* for placement new */
-#include <string.h>   /* for memset */
+#include <new>      /* for placement new */
+#include <string.h> /* for memset */
 
-#include "oneapi/tbb/version.h"
 #include "../tbb/environment.h"
-#include "../tbb/itt_notify.h" // for __TBB_load_ittnotify()
+#include "../tbb/itt_notify.h"// for __TBB_load_ittnotify()
+#include "oneapi/tbb/version.h"
 
 #if USE_PTHREAD
-    #define TlsSetValue_func pthread_setspecific
-    #define TlsGetValue_func pthread_getspecific
-    #define GetMyTID() pthread_self()
-    #include <sched.h>
-    extern "C" { static void mallocThreadShutdownNotification(void*); }
-    #if __sun || __SUNPRO_CC
-    #define __asm__ asm
-    #endif
-    #include <unistd.h> // sysconf(_SC_PAGESIZE)
+#define TlsSetValue_func pthread_setspecific
+#define TlsGetValue_func pthread_getspecific
+#define GetMyTID() pthread_self()
+#include <sched.h>
+extern "C" {
+static void mallocThreadShutdownNotification(void *);
+}
+#if __sun || __SUNPRO_CC
+#define __asm__ asm
+#endif
+#include <unistd.h>// sysconf(_SC_PAGESIZE)
 #elif USE_WINTHREAD
-    #define GetMyTID() GetCurrentThreadId()
+#define GetMyTID() GetCurrentThreadId()
 #if __TBB_WIN8UI_SUPPORT
-    #include<thread>
-    #define TlsSetValue_func FlsSetValue
-    #define TlsGetValue_func FlsGetValue
-    #define TlsAlloc() FlsAlloc(nullptr)
-    #define TLS_ALLOC_FAILURE FLS_OUT_OF_INDEXES
-    #define TlsFree FlsFree
+#include <thread>
+#define TlsSetValue_func FlsSetValue
+#define TlsGetValue_func FlsGetValue
+#define TlsAlloc() FlsAlloc(nullptr)
+#define TLS_ALLOC_FAILURE FLS_OUT_OF_INDEXES
+#define TlsFree FlsFree
 #else
-    #define TlsSetValue_func TlsSetValue
-    #define TlsGetValue_func TlsGetValue
-    #define TLS_ALLOC_FAILURE TLS_OUT_OF_INDEXES
+#define TlsSetValue_func TlsSetValue
+#define TlsGetValue_func TlsGetValue
+#define TLS_ALLOC_FAILURE TLS_OUT_OF_INDEXES
 #endif
 #else
-    #error Must define USE_PTHREAD or USE_WINTHREAD
+#error Must define USE_PTHREAD or USE_WINTHREAD
 #endif
 
 #define FREELIST_NONBLOCKING 1
 
 namespace rml {
-class MemoryPool;
-namespace internal {
+    class MemoryPool;
+    namespace internal {
 
-class Block;
-class MemoryPool;
+        class Block;
+        class MemoryPool;
 
 #if MALLOC_CHECK_RECURSION
 
-inline bool isMallocInitialized();
+        inline bool isMallocInitialized();
 
-#endif // MALLOC_CHECK_RECURSION
+#endif// MALLOC_CHECK_RECURSION
 
-/** Support for handling the special UNUSABLE pointer state **/
-const intptr_t UNUSABLE = 0x1;
-inline bool isSolidPtr( void* ptr ) {
-    return (UNUSABLE|(intptr_t)ptr)!=UNUSABLE;
-}
-inline bool isNotForUse( void* ptr ) {
-    return (intptr_t)ptr==UNUSABLE;
-}
+        /** Support for handling the special UNUSABLE pointer state **/
+        const intptr_t UNUSABLE = 0x1;
+        inline bool isSolidPtr(void *ptr) { return (UNUSABLE | (intptr_t) ptr) != UNUSABLE; }
+        inline bool isNotForUse(void *ptr) { return (intptr_t) ptr == UNUSABLE; }
 
-/*
+        /*
  * Block::objectSize value used to mark blocks allocated by startupAlloc
  */
-const uint16_t startupAllocObjSizeMark = ~(uint16_t)0;
+        const uint16_t startupAllocObjSizeMark = ~(uint16_t) 0;
 
-/*
+        /*
  * The following constant is used to define the size of struct Block, the block header.
  * The intent is to have the size of a Block multiple of the cache line size, this allows us to
  * get good alignment at the cost of some overhead equal to the amount of padding included in the Block.
  */
-const int blockHeaderAlignment = estimatedCacheLineSize;
+        const int blockHeaderAlignment = estimatedCacheLineSize;
 
-/********* The data structures and global objects        **************/
+        /********* The data structures and global objects        **************/
 
-/*
+        /*
  * The malloc routines themselves need to be able to occasionally malloc some space,
  * in order to set up the structures used by the thread local structures. This
  * routine performs that functions.
  */
-class BootStrapBlocks {
-    MallocMutex bootStrapLock;
-    Block      *bootStrapBlock;
-    Block      *bootStrapBlockUsed;
-    FreeObject *bootStrapObjectList;
-public:
-    void *allocate(MemoryPool *memPool, size_t size);
-    void free(void* ptr);
-    void reset();
-};
+        class BootStrapBlocks {
+            MallocMutex bootStrapLock;
+            Block *bootStrapBlock;
+            Block *bootStrapBlockUsed;
+            FreeObject *bootStrapObjectList;
+
+        public:
+            void *allocate(MemoryPool *memPool, size_t size);
+            void free(void *ptr);
+            void reset();
+        };
 
 #if USE_INTERNAL_TID
-class ThreadId {
-    static tls_key_t Tid_key;
-    std::atomic<intptr_t> ThreadCount;
-
-    unsigned int id;
+        class ThreadId {
+            static tls_key_t Tid_key;
+            std::atomic<intptr_t> ThreadCount;
+
+            unsigned int id;
+
+            static unsigned int tlsNumber() {
+                unsigned int result = reinterpret_cast<intptr_t>(TlsGetValue_func(Tid_key));
+                if (!result) {
+                    RecursiveMallocCallProtector scoped;
+                    // Thread-local value is zero -> first call from this thread,
+                    // need to initialize with next ID value (IDs start from 1)
+                    result = ++ThreadCount;// returned new value!
+                    TlsSetValue_func(Tid_key, reinterpret_cast<void *>(result));
+                }
+                return result;
+            }
 
-    static unsigned int tlsNumber() {
-        unsigned int result = reinterpret_cast<intptr_t>(TlsGetValue_func(Tid_key));
-        if( !result ) {
-            RecursiveMallocCallProtector scoped;
-            // Thread-local value is zero -> first call from this thread,
-            // need to initialize with next ID value (IDs start from 1)
-            result = ++ThreadCount; // returned new value!
-            TlsSetValue_func( Tid_key, reinterpret_cast<void*>(result) );
-        }
-        return result;
-    }
-public:
-    static bool init() {
+        public:
+            static bool init() {
 #if USE_WINTHREAD
-        Tid_key = TlsAlloc();
-        if (Tid_key == TLS_ALLOC_FAILURE)
-            return false;
+                Tid_key = TlsAlloc();
+                if (Tid_key == TLS_ALLOC_FAILURE) return false;
 #else
-        int status = pthread_key_create( &Tid_key, nullptr );
-        if ( status ) {
-            fprintf (stderr, "The memory manager cannot create tls key during initialization\n");
-            return false;
-        }
+                int status = pthread_key_create(&Tid_key, nullptr);
+                if (status) {
+                    fprintf(stderr, "The memory manager cannot create tls key during initialization\n");
+                    return false;
+                }
 #endif /* USE_WINTHREAD */
-        return true;
-    }
+                return true;
+            }
 #if __TBB_SOURCE_DIRECTLY_INCLUDED
-    static void destroy() {
-        if( Tid_key ) {
+            static void destroy() {
+                if (Tid_key) {
 #if USE_WINTHREAD
-            BOOL status = !(TlsFree( Tid_key ));  // fail is zero
+                    BOOL status = !(TlsFree(Tid_key));// fail is zero
 #else
-            int status = pthread_key_delete( Tid_key );
+                    int status = pthread_key_delete(Tid_key);
 #endif /* USE_WINTHREAD */
-            if ( status )
-                fprintf (stderr, "The memory manager cannot delete tls key\n");
-            Tid_key = 0;
-        }
-    }
+                    if (status) fprintf(stderr, "The memory manager cannot delete tls key\n");
+                    Tid_key = 0;
+                }
+            }
 #endif
 
-    ThreadId() : id(ThreadId::tlsNumber()) {}
-    bool isCurrentThreadId() const { return id == ThreadId::tlsNumber(); }
+            ThreadId() : id(ThreadId::tlsNumber()) {}
+            bool isCurrentThreadId() const { return id == ThreadId::tlsNumber(); }
 
 #if COLLECT_STATISTICS || MALLOC_TRACE
-    friend unsigned int getThreadId() { return ThreadId::tlsNumber(); }
+            friend unsigned int getThreadId() { return ThreadId::tlsNumber(); }
 #endif
 #if COLLECT_STATISTICS
-    static unsigned getMaxThreadId() { return ThreadCount.load(std::memory_order_relaxed); }
+            static unsigned getMaxThreadId() { return ThreadCount.load(std::memory_order_relaxed); }
 
-    friend int STAT_increment(ThreadId tid, int bin, int ctr);
+            friend int STAT_increment(ThreadId tid, int bin, int ctr);
 #endif
-};
+        };
 
-tls_key_t ThreadId::Tid_key;
-intptr_t ThreadId::ThreadCount;
+        tls_key_t ThreadId::Tid_key;
+        intptr_t ThreadId::ThreadCount;
 
 #if COLLECT_STATISTICS
-int STAT_increment(ThreadId tid, int bin, int ctr)
-{
-    return ::STAT_increment(tid.id, bin, ctr);
-}
+        int STAT_increment(ThreadId tid, int bin, int ctr) { return ::STAT_increment(tid.id, bin, ctr); }
 #endif
 
-#else // USE_INTERNAL_TID
+#else// USE_INTERNAL_TID
 
-class ThreadId {
+        class ThreadId {
 #if USE_PTHREAD
-    std::atomic<pthread_t> tid;
+            std::atomic<pthread_t> tid;
 #else
-    std::atomic<DWORD>     tid;
+            std::atomic<DWORD> tid;
 #endif
-public:
-    ThreadId() : tid(GetMyTID()) {}
-    ThreadId(ThreadId &other) = delete;
-    ~ThreadId() = default;
+        public:
+            ThreadId() : tid(GetMyTID()) {}
+            ThreadId(ThreadId &other) = delete;
+            ~ThreadId() = default;
 
 #if USE_PTHREAD
-    bool isCurrentThreadId() const { return pthread_equal(pthread_self(), tid.load(std::memory_order_relaxed)); }
+            bool isCurrentThreadId() const {
+                return pthread_equal(pthread_self(), tid.load(std::memory_order_relaxed));
+            }
 #else
-    bool isCurrentThreadId() const { return GetCurrentThreadId() == tid.load(std::memory_order_relaxed); }
+            bool isCurrentThreadId() const {
+                return GetCurrentThreadId() == tid.load(std::memory_order_relaxed);
+            }
 #endif
-    ThreadId& operator=(const ThreadId& other) {
-        tid.store(other.tid.load(std::memory_order_relaxed), std::memory_order_relaxed);
-        return *this;
-    }
-    static bool init() { return true; }
+            ThreadId &operator=(const ThreadId &other) {
+                tid.store(other.tid.load(std::memory_order_relaxed), std::memory_order_relaxed);
+                return *this;
+            }
+            static bool init() { return true; }
 #if __TBB_SOURCE_DIRECTLY_INCLUDED
-    static void destroy() {}
+            static void destroy() {}
 #endif
-};
+        };
 
-#endif // USE_INTERNAL_TID
+#endif// USE_INTERNAL_TID
 
-/*********** Code to provide thread ID and a thread-local void pointer **********/
+        /*********** Code to provide thread ID and a thread-local void pointer **********/
 
-bool TLSKey::init()
-{
+        bool TLSKey::init() {
 #if USE_WINTHREAD
-    TLS_pointer_key = TlsAlloc();
-    if (TLS_pointer_key == TLS_ALLOC_FAILURE)
-        return false;
+            TLS_pointer_key = TlsAlloc();
+            if (TLS_pointer_key == TLS_ALLOC_FAILURE) return false;
 #else
-    int status = pthread_key_create( &TLS_pointer_key, mallocThreadShutdownNotification );
-    if ( status )
-        return false;
+            int status = pthread_key_create(&TLS_pointer_key, mallocThreadShutdownNotification);
+            if (status) return false;
 #endif /* USE_WINTHREAD */
-    return true;
-}
+            return true;
+        }
 
-bool TLSKey::destroy()
-{
+        bool TLSKey::destroy() {
 #if USE_WINTHREAD
-    BOOL status1 = !(TlsFree(TLS_pointer_key)); // fail is zero
+            BOOL status1 = !(TlsFree(TLS_pointer_key));// fail is zero
 #else
-    int status1 = pthread_key_delete(TLS_pointer_key);
+            int status1 = pthread_key_delete(TLS_pointer_key);
 #endif /* USE_WINTHREAD */
-    MALLOC_ASSERT(!status1, "The memory manager cannot delete tls key.");
-    return status1==0;
-}
+            MALLOC_ASSERT(!status1, "The memory manager cannot delete tls key.");
+            return status1 == 0;
+        }
 
-inline TLSData* TLSKey::getThreadMallocTLS() const
-{
-    return (TLSData *)TlsGetValue_func( TLS_pointer_key );
-}
+        inline TLSData *TLSKey::getThreadMallocTLS() const {
+            return (TLSData *) TlsGetValue_func(TLS_pointer_key);
+        }
 
-inline void TLSKey::setThreadMallocTLS( TLSData * newvalue ) {
-    RecursiveMallocCallProtector scoped;
-    TlsSetValue_func( TLS_pointer_key, newvalue );
-}
+        inline void TLSKey::setThreadMallocTLS(TLSData *newvalue) {
+            RecursiveMallocCallProtector scoped;
+            TlsSetValue_func(TLS_pointer_key, newvalue);
+        }
 
-/* The 'next' field in the block header has to maintain some invariants:
+        /* The 'next' field in the block header has to maintain some invariants:
  *   it needs to be on a 16K boundary and the first field in the block.
  *   Any value stored there needs to have the lower 14 bits set to 0
  *   so that various assert work. This means that if you want to smash this memory
@@ -255,509 +249,507 @@ inline void TLSKey::setThreadMallocTLS( TLSData * newvalue ) {
  * Changing the size of the block header would require to change
  * some bin allocation sizes, in particular "fitting" sizes (see above).
  */
-class Bin;
-class StartupBlock;
-
-class MemoryPool {
-    // if no explicit grainsize, expect to see malloc in user's pAlloc
-    // and set reasonable low granularity
-    static const size_t defaultGranularity = estimatedCacheLineSize;
-
-    MemoryPool() = delete;                  // deny
-public:
-    static MallocMutex  memPoolListLock;
-
-    // list of all active pools is used to release
-    // all TLS data on thread termination or library unload
-    MemoryPool    *next,
-                  *prev;
-    ExtMemoryPool  extMemPool;
-    BootStrapBlocks bootStrapBlocks;
-
-    static void initDefaultPool();
-
-    bool init(intptr_t poolId, const MemPoolPolicy* memPoolPolicy);
-    bool reset();
-    bool destroy();
-    void onThreadShutdown(TLSData *tlsData);
-
-    inline TLSData *getTLS(bool create);
-    void clearTLS() { extMemPool.tlsPointerKey.setThreadMallocTLS(nullptr); }
-
-    Block *getEmptyBlock(size_t size);
-    void returnEmptyBlock(Block *block, bool poolTheBlock);
-
-    // get/put large object to/from local large object cache
-    void *getFromLLOCache(TLSData *tls, size_t size, size_t alignment);
-    void putToLLOCache(TLSData *tls, void *object);
-};
-
-static intptr_t defaultMemPool_space[sizeof(MemoryPool)/sizeof(intptr_t) +
-                                     (sizeof(MemoryPool)%sizeof(intptr_t)? 1 : 0)];
-static MemoryPool *defaultMemPool = (MemoryPool*)defaultMemPool_space;
-const size_t MemoryPool::defaultGranularity;
-// zero-initialized
-MallocMutex  MemoryPool::memPoolListLock;
-// TODO: move huge page status to default pool, because that's its states
-HugePagesStatus hugePages;
-static bool usedBySrcIncluded = false;
-
-// Padding helpers
-template<size_t padd>
-struct PaddingImpl {
-    size_t       __padding[padd];
-};
-
-template<>
-struct PaddingImpl<0> {};
-
-template<int N>
-struct Padding : PaddingImpl<N/sizeof(size_t)> {};
-
-// Slab block is 16KB-aligned. To prevent false sharing, separate locally-accessed
-// fields and fields commonly accessed by not owner threads.
-class GlobalBlockFields : public BlockI {
-protected:
-    std::atomic<FreeObject*> publicFreeList;
-    std::atomic<Block*> nextPrivatizable;
-    MemoryPool  *poolPtr;
-};
-
-class LocalBlockFields : public GlobalBlockFields, Padding<blockHeaderAlignment - sizeof(GlobalBlockFields)>  {
-protected:
-    Block       *next;
-    Block       *previous;        /* Use double linked list to speed up removal */
-    FreeObject  *bumpPtr;         /* Bump pointer moves from the end to the beginning of a block */
-    FreeObject  *freeList;
-    /* Pointer to local data for the owner thread. Used for fast finding tls
+        class Bin;
+        class StartupBlock;
+
+        class MemoryPool {
+            // if no explicit grainsize, expect to see malloc in user's pAlloc
+            // and set reasonable low granularity
+            static const size_t defaultGranularity = estimatedCacheLineSize;
+
+            MemoryPool() = delete;// deny
+        public:
+            static MallocMutex memPoolListLock;
+
+            // list of all active pools is used to release
+            // all TLS data on thread termination or library unload
+            MemoryPool *next, *prev;
+            ExtMemoryPool extMemPool;
+            BootStrapBlocks bootStrapBlocks;
+
+            static void initDefaultPool();
+
+            bool init(intptr_t poolId, const MemPoolPolicy *memPoolPolicy);
+            bool reset();
+            bool destroy();
+            void onThreadShutdown(TLSData *tlsData);
+
+            inline TLSData *getTLS(bool create);
+            void clearTLS() { extMemPool.tlsPointerKey.setThreadMallocTLS(nullptr); }
+
+            Block *getEmptyBlock(size_t size);
+            void returnEmptyBlock(Block *block, bool poolTheBlock);
+
+            // get/put large object to/from local large object cache
+            void *getFromLLOCache(TLSData *tls, size_t size, size_t alignment);
+            void putToLLOCache(TLSData *tls, void *object);
+        };
+
+        static intptr_t defaultMemPool_space[sizeof(MemoryPool) / sizeof(intptr_t)
+                                             + (sizeof(MemoryPool) % sizeof(intptr_t) ? 1 : 0)];
+        static MemoryPool *defaultMemPool = (MemoryPool *) defaultMemPool_space;
+        const size_t MemoryPool::defaultGranularity;
+        // zero-initialized
+        MallocMutex MemoryPool::memPoolListLock;
+        // TODO: move huge page status to default pool, because that's its states
+        HugePagesStatus hugePages;
+        static bool usedBySrcIncluded = false;
+
+        // Padding helpers
+        template <size_t padd>
+        struct PaddingImpl {
+            size_t __padding[padd];
+        };
+
+        template <>
+        struct PaddingImpl<0> {};
+
+        template <int N>
+        struct Padding : PaddingImpl<N / sizeof(size_t)> {};
+
+        // Slab block is 16KB-aligned. To prevent false sharing, separate locally-accessed
+        // fields and fields commonly accessed by not owner threads.
+        class GlobalBlockFields : public BlockI {
+        protected:
+            std::atomic<FreeObject *> publicFreeList;
+            std::atomic<Block *> nextPrivatizable;
+            MemoryPool *poolPtr;
+        };
+
+        class LocalBlockFields : public GlobalBlockFields,
+                                 Padding<blockHeaderAlignment - sizeof(GlobalBlockFields)> {
+        protected:
+            Block *next;
+            Block *previous;     /* Use double linked list to speed up removal */
+            FreeObject *bumpPtr; /* Bump pointer moves from the end to the beginning of a block */
+            FreeObject *freeList;
+            /* Pointer to local data for the owner thread. Used for fast finding tls
        when releasing object from a block that current thread owned.
        nullptr for orphaned blocks. */
-    std::atomic<TLSData*> tlsPtr;
-    ThreadId     ownerTid;        /* the ID of the thread that owns or last owned the block */
-    BackRefIdx   backRefIdx;
-    uint16_t     allocatedCount;  /* Number of objects allocated (obviously by the owning thread) */
-    uint16_t     objectSize;
-    bool         isFull;
-
-    friend class FreeBlockPool;
-    friend class StartupBlock;
-    friend class LifoList;
-    friend void *BootStrapBlocks::allocate(MemoryPool *, size_t);
-    friend bool OrphanedBlocks::cleanup(Backend*);
-    friend Block *MemoryPool::getEmptyBlock(size_t);
-};
-
-// Use inheritance to guarantee that a user data start on next cache line.
-// Can't use member for it, because when LocalBlockFields already on cache line,
-// we must have no additional memory consumption for all compilers.
-class Block : public LocalBlockFields,
-              Padding<2*blockHeaderAlignment - sizeof(LocalBlockFields)> {
-public:
-    bool empty() const {
-        if (allocatedCount > 0) return false;
-        MALLOC_ASSERT(!isSolidPtr(publicFreeList.load(std::memory_order_relaxed)), ASSERT_TEXT);
-        return true;
-    }
-    inline FreeObject* allocate();
-    inline FreeObject *allocateFromFreeList();
+            std::atomic<TLSData *> tlsPtr;
+            ThreadId ownerTid; /* the ID of the thread that owns or last owned the block */
+            BackRefIdx backRefIdx;
+            uint16_t allocatedCount; /* Number of objects allocated (obviously by the owning thread) */
+            uint16_t objectSize;
+            bool isFull;
+
+            friend class FreeBlockPool;
+            friend class StartupBlock;
+            friend class LifoList;
+            friend void *BootStrapBlocks::allocate(MemoryPool *, size_t);
+            friend bool OrphanedBlocks::cleanup(Backend *);
+            friend Block *MemoryPool::getEmptyBlock(size_t);
+        };
+
+        // Use inheritance to guarantee that a user data start on next cache line.
+        // Can't use member for it, because when LocalBlockFields already on cache line,
+        // we must have no additional memory consumption for all compilers.
+        class Block : public LocalBlockFields, Padding<2 * blockHeaderAlignment - sizeof(LocalBlockFields)> {
+        public:
+            bool empty() const {
+                if (allocatedCount > 0) return false;
+                MALLOC_ASSERT(!isSolidPtr(publicFreeList.load(std::memory_order_relaxed)), ASSERT_TEXT);
+                return true;
+            }
+            inline FreeObject *allocate();
+            inline FreeObject *allocateFromFreeList();
 
-    inline bool adjustFullness();
-    void adjustPositionInBin(Bin* bin = nullptr);
+            inline bool adjustFullness();
+            void adjustPositionInBin(Bin *bin = nullptr);
 #if MALLOC_DEBUG
-    bool freeListNonNull() { return freeList; }
+            bool freeListNonNull() { return freeList; }
 #endif
-    void freePublicObject(FreeObject *objectToFree);
-    inline void freeOwnObject(void *object);
-    void reset();
-    void privatizePublicFreeList( bool reset = true );
-    void restoreBumpPtr();
-    void privatizeOrphaned(TLSData *tls, unsigned index);
-    bool readyToShare();
-    void shareOrphaned(intptr_t binTag, unsigned index);
-    unsigned int getSize() const {
-        MALLOC_ASSERT(isStartupAllocObject() || objectSize<minLargeObjectSize,
-                      "Invalid object size");
-        return isStartupAllocObject()? 0 : objectSize;
-    }
-    const BackRefIdx *getBackRefIdx() const { return &backRefIdx; }
-    inline bool isOwnedByCurrentThread() const;
-    bool isStartupAllocObject() const { return objectSize == startupAllocObjSizeMark; }
-    inline FreeObject *findObjectToFree(const void *object) const;
-    void checkFreePrecond(const void *object) const {
+            void freePublicObject(FreeObject *objectToFree);
+            inline void freeOwnObject(void *object);
+            void reset();
+            void privatizePublicFreeList(bool reset = true);
+            void restoreBumpPtr();
+            void privatizeOrphaned(TLSData *tls, unsigned index);
+            bool readyToShare();
+            void shareOrphaned(intptr_t binTag, unsigned index);
+            unsigned int getSize() const {
+                MALLOC_ASSERT(isStartupAllocObject() || objectSize < minLargeObjectSize,
+                              "Invalid object size");
+                return isStartupAllocObject() ? 0 : objectSize;
+            }
+            const BackRefIdx *getBackRefIdx() const { return &backRefIdx; }
+            inline bool isOwnedByCurrentThread() const;
+            bool isStartupAllocObject() const { return objectSize == startupAllocObjSizeMark; }
+            inline FreeObject *findObjectToFree(const void *object) const;
+            void checkFreePrecond(const void *object) const {
 #if MALLOC_DEBUG
-        const char *msg = "Possible double free or heap corruption.";
-        // small objects are always at least sizeof(size_t) Byte aligned,
-        // try to check this before this dereference as for invalid objects
-        // this may be unreadable
-        MALLOC_ASSERT(isAligned(object, sizeof(size_t)), "Try to free invalid small object");
+                const char *msg = "Possible double free or heap corruption.";
+                // small objects are always at least sizeof(size_t) Byte aligned,
+                // try to check this before this dereference as for invalid objects
+                // this may be unreadable
+                MALLOC_ASSERT(isAligned(object, sizeof(size_t)), "Try to free invalid small object");
 #if !__TBB_USE_THREAD_SANITIZER
-        // releasing to free slab
-        MALLOC_ASSERT(allocatedCount>0, msg);
+                // releasing to free slab
+                MALLOC_ASSERT(allocatedCount > 0, msg);
 #endif
-        // must not point to slab's header
-        MALLOC_ASSERT((uintptr_t)object - (uintptr_t)this >= sizeof(Block), msg);
-        if (startupAllocObjSizeMark == objectSize) // startup block
-            MALLOC_ASSERT(object<=bumpPtr, msg);
-        else {
-            // non-startup objects are 8 Byte aligned
-            MALLOC_ASSERT(isAligned(object, 8), "Try to free invalid small object");
-            FreeObject *toFree = findObjectToFree(object);
+                // must not point to slab's header
+                MALLOC_ASSERT((uintptr_t) object - (uintptr_t) this >= sizeof(Block), msg);
+                if (startupAllocObjSizeMark == objectSize)// startup block
+                    MALLOC_ASSERT(object <= bumpPtr, msg);
+                else {
+                    // non-startup objects are 8 Byte aligned
+                    MALLOC_ASSERT(isAligned(object, 8), "Try to free invalid small object");
+                    FreeObject *toFree = findObjectToFree(object);
 #if !__TBB_USE_THREAD_SANITIZER
-            MALLOC_ASSERT(allocatedCount <= (slabSize-sizeof(Block))/objectSize
-                          && (!bumpPtr || object>bumpPtr), msg);
-            // check against head of freeList, as this is mostly
-            // expected after double free
-            MALLOC_ASSERT(toFree != freeList, msg);
+                    MALLOC_ASSERT(allocatedCount <= (slabSize - sizeof(Block)) / objectSize
+                                          && (!bumpPtr || object > bumpPtr),
+                                  msg);
+                    // check against head of freeList, as this is mostly
+                    // expected after double free
+                    MALLOC_ASSERT(toFree != freeList, msg);
 #endif
-            // check against head of publicFreeList, to detect double free
-            // involving foreign thread
-            MALLOC_ASSERT(toFree != publicFreeList.load(std::memory_order_relaxed), msg);
-        }
+                    // check against head of publicFreeList, to detect double free
+                    // involving foreign thread
+                    MALLOC_ASSERT(toFree != publicFreeList.load(std::memory_order_relaxed), msg);
+                }
 #else
-        suppress_unused_warning(object);
+                suppress_unused_warning(object);
 #endif
-    }
-    void initEmptyBlock(TLSData *tls, size_t size);
-    size_t findObjectSize(void *object) const;
-    MemoryPool *getMemPool() const { return poolPtr; } // do not use on the hot path!
+            }
+            void initEmptyBlock(TLSData *tls, size_t size);
+            size_t findObjectSize(void *object) const;
+            MemoryPool *getMemPool() const { return poolPtr; }// do not use on the hot path!
 
-protected:
-    void cleanBlockHeader();
+        protected:
+            void cleanBlockHeader();
 
-private:
-    static const float emptyEnoughRatio; /* Threshold on free space needed to "reactivate" a block */
+        private:
+            static const float emptyEnoughRatio; /* Threshold on free space needed to "reactivate" a block */
 
-    inline FreeObject *allocateFromBumpPtr();
-    inline FreeObject *findAllocatedObject(const void *address) const;
+            inline FreeObject *allocateFromBumpPtr();
+            inline FreeObject *findAllocatedObject(const void *address) const;
 #if MALLOC_DEBUG
-    inline bool isProperlyPlaced(const void *object) const;
+            inline bool isProperlyPlaced(const void *object) const;
 #endif
-    inline void markOwned(TLSData *tls) {
-        MALLOC_ASSERT(!tlsPtr.load(std::memory_order_relaxed), ASSERT_TEXT);
-        ownerTid = ThreadId(); /* save the ID of the current thread */
-        tlsPtr.store(tls, std::memory_order_relaxed);
-    }
-    inline void markOrphaned() {
-        MALLOC_ASSERT(tlsPtr.load(std::memory_order_relaxed), ASSERT_TEXT);
-        tlsPtr.store(nullptr, std::memory_order_relaxed);
-    }
+            inline void markOwned(TLSData *tls) {
+                MALLOC_ASSERT(!tlsPtr.load(std::memory_order_relaxed), ASSERT_TEXT);
+                ownerTid = ThreadId(); /* save the ID of the current thread */
+                tlsPtr.store(tls, std::memory_order_relaxed);
+            }
+            inline void markOrphaned() {
+                MALLOC_ASSERT(tlsPtr.load(std::memory_order_relaxed), ASSERT_TEXT);
+                tlsPtr.store(nullptr, std::memory_order_relaxed);
+            }
 
-    friend class Bin;
-    friend class TLSData;
-    friend bool MemoryPool::destroy();
-};
-
-const float Block::emptyEnoughRatio = 1.0 / 4.0;
-
-static_assert(sizeof(Block) <= 2*estimatedCacheLineSize,
-    "The class Block does not fit into 2 cache lines on this platform. "
-    "Defining USE_INTERNAL_TID may help to fix it.");
-
-class Bin {
-private:
-public:
-    Block *activeBlk;
-    std::atomic<Block*> mailbox;
-    MallocMutex mailLock;
-
-public:
-    inline Block* getActiveBlock() const { return activeBlk; }
-    void resetActiveBlock() { activeBlk = nullptr; }
-    inline void setActiveBlock(Block *block);
-    inline Block* setPreviousBlockActive();
-    Block* getPrivatizedFreeListBlock();
-    void moveBlockToFront(Block *block);
-    bool cleanPublicFreeLists();
-    void processEmptyBlock(Block *block, bool poolTheBlock);
-    void addPublicFreeListBlock(Block* block);
-
-    void outofTLSBin(Block* block);
-    void verifyTLSBin(size_t size) const;
-    void pushTLSBin(Block* block);
+            friend class Bin;
+            friend class TLSData;
+            friend bool MemoryPool::destroy();
+        };
+
+        const float Block::emptyEnoughRatio = 1.0 / 4.0;
+
+        static_assert(sizeof(Block) <= 2 * estimatedCacheLineSize,
+                      "The class Block does not fit into 2 cache lines on this platform. "
+                      "Defining USE_INTERNAL_TID may help to fix it.");
+
+        class Bin {
+        private:
+        public:
+            Block *activeBlk;
+            std::atomic<Block *> mailbox;
+            MallocMutex mailLock;
+
+        public:
+            inline Block *getActiveBlock() const { return activeBlk; }
+            void resetActiveBlock() { activeBlk = nullptr; }
+            inline void setActiveBlock(Block *block);
+            inline Block *setPreviousBlockActive();
+            Block *getPrivatizedFreeListBlock();
+            void moveBlockToFront(Block *block);
+            bool cleanPublicFreeLists();
+            void processEmptyBlock(Block *block, bool poolTheBlock);
+            void addPublicFreeListBlock(Block *block);
+
+            void outofTLSBin(Block *block);
+            void verifyTLSBin(size_t size) const;
+            void pushTLSBin(Block *block);
 
 #if MALLOC_DEBUG
-    void verifyInitState() const {
-        MALLOC_ASSERT( !activeBlk, ASSERT_TEXT );
-        MALLOC_ASSERT( !mailbox.load(std::memory_order_relaxed), ASSERT_TEXT );
-    }
+            void verifyInitState() const {
+                MALLOC_ASSERT(!activeBlk, ASSERT_TEXT);
+                MALLOC_ASSERT(!mailbox.load(std::memory_order_relaxed), ASSERT_TEXT);
+            }
 #endif
 
-    friend void Block::freePublicObject (FreeObject *objectToFree);
-};
+            friend void Block::freePublicObject(FreeObject *objectToFree);
+        };
 
-/********* End of the data structures                    **************/
+        /********* End of the data structures                    **************/
 
-/*
+        /*
  * There are bins for all 8 byte aligned objects less than this segregated size; 8 bins in total
  */
-const uint32_t minSmallObjectIndex = 0;
-const uint32_t numSmallObjectBins = 8;
-const uint32_t maxSmallObjectSize = 64;
+        const uint32_t minSmallObjectIndex = 0;
+        const uint32_t numSmallObjectBins = 8;
+        const uint32_t maxSmallObjectSize = 64;
 
-/*
+        /*
  * There are 4 bins between each couple of powers of 2 [64-128-256-...]
  * from maxSmallObjectSize till this size; 16 bins in total
  */
-const uint32_t minSegregatedObjectIndex = minSmallObjectIndex+numSmallObjectBins;
-const uint32_t numSegregatedObjectBins = 16;
-const uint32_t maxSegregatedObjectSize = 1024;
+        const uint32_t minSegregatedObjectIndex = minSmallObjectIndex + numSmallObjectBins;
+        const uint32_t numSegregatedObjectBins = 16;
+        const uint32_t maxSegregatedObjectSize = 1024;
 
-/*
+        /*
  * And there are 5 bins with allocation sizes that are multiples of estimatedCacheLineSize
  * and selected to fit 9, 6, 4, 3, and 2 allocations in a block.
  */
-const uint32_t minFittingIndex = minSegregatedObjectIndex+numSegregatedObjectBins;
-const uint32_t numFittingBins = 5;
-
-const uint32_t fittingAlignment = estimatedCacheLineSize;
-
-#define SET_FITTING_SIZE(N) ( (slabSize-sizeof(Block))/N ) & ~(fittingAlignment-1)
-// For blockSize=16*1024, sizeof(Block)=2*estimatedCacheLineSize and fittingAlignment=estimatedCacheLineSize,
-// the comments show the fitting sizes and the amounts left unused for estimatedCacheLineSize=64/128:
-const uint32_t fittingSize1 = SET_FITTING_SIZE(9); // 1792/1792 128/000
-const uint32_t fittingSize2 = SET_FITTING_SIZE(6); // 2688/2688 128/000
-const uint32_t fittingSize3 = SET_FITTING_SIZE(4); // 4032/3968 128/256
-const uint32_t fittingSize4 = SET_FITTING_SIZE(3); // 5376/5376 128/000
-const uint32_t fittingSize5 = SET_FITTING_SIZE(2); // 8128/8064 000/000
+        const uint32_t minFittingIndex = minSegregatedObjectIndex + numSegregatedObjectBins;
+        const uint32_t numFittingBins = 5;
+
+        const uint32_t fittingAlignment = estimatedCacheLineSize;
+
+#define SET_FITTING_SIZE(N) ((slabSize - sizeof(Block)) / N) & ~(fittingAlignment - 1)
+        // For blockSize=16*1024, sizeof(Block)=2*estimatedCacheLineSize and fittingAlignment=estimatedCacheLineSize,
+        // the comments show the fitting sizes and the amounts left unused for estimatedCacheLineSize=64/128:
+        const uint32_t fittingSize1 = SET_FITTING_SIZE(9);// 1792/1792 128/000
+        const uint32_t fittingSize2 = SET_FITTING_SIZE(6);// 2688/2688 128/000
+        const uint32_t fittingSize3 = SET_FITTING_SIZE(4);// 4032/3968 128/256
+        const uint32_t fittingSize4 = SET_FITTING_SIZE(3);// 5376/5376 128/000
+        const uint32_t fittingSize5 = SET_FITTING_SIZE(2);// 8128/8064 000/000
 #undef SET_FITTING_SIZE
 
-/*
+        /*
  * The total number of thread-specific Block-based bins
  */
-const uint32_t numBlockBins = minFittingIndex+numFittingBins;
+        const uint32_t numBlockBins = minFittingIndex + numFittingBins;
 
-/*
+        /*
  * Objects of this size and larger are considered large objects.
  */
-const uint32_t minLargeObjectSize = fittingSize5 + 1;
+        const uint32_t minLargeObjectSize = fittingSize5 + 1;
 
-/*
+        /*
  * Per-thread pool of slab blocks. Idea behind it is to not share with other
  * threads memory that are likely in local cache(s) of our CPU.
  */
-class FreeBlockPool {
-private:
-    std::atomic<Block*> head;
-    int         size;
-    Backend    *backend;
-public:
-    static const int POOL_HIGH_MARK = 32;
-    static const int POOL_LOW_MARK  = 8;
-
-    class ResOfGet {
-        ResOfGet() = delete;
-    public:
-        Block* block;
-        bool   lastAccMiss;
-        ResOfGet(Block *b, bool lastMiss) : block(b), lastAccMiss(lastMiss) {}
-    };
-
-    // allocated in zero-initialized memory
-    FreeBlockPool(Backend *bknd) : backend(bknd) {}
-    ResOfGet getBlock();
-    void returnBlock(Block *block);
-    bool externalCleanup(); // can be called by another thread
-};
-
-template<int LOW_MARK, int HIGH_MARK>
-class LocalLOCImpl {
-private:
-    static const size_t MAX_TOTAL_SIZE = 4*1024*1024;
-    // TODO: can single-linked list be faster here?
-    LargeMemoryBlock *tail; // need it when do releasing on overflow
-    std::atomic<LargeMemoryBlock*> head;
-    size_t            totalSize;
-    int               numOfBlocks;
-public:
-    bool put(LargeMemoryBlock *object, ExtMemoryPool *extMemPool);
-    LargeMemoryBlock *get(size_t size);
-    bool externalCleanup(ExtMemoryPool *extMemPool);
+        class FreeBlockPool {
+        private:
+            std::atomic<Block *> head;
+            int size;
+            Backend *backend;
+
+        public:
+            static const int POOL_HIGH_MARK = 32;
+            static const int POOL_LOW_MARK = 8;
+
+            class ResOfGet {
+                ResOfGet() = delete;
+
+            public:
+                Block *block;
+                bool lastAccMiss;
+                ResOfGet(Block *b, bool lastMiss) : block(b), lastAccMiss(lastMiss) {}
+            };
+
+            // allocated in zero-initialized memory
+            FreeBlockPool(Backend *bknd) : backend(bknd) {}
+            ResOfGet getBlock();
+            void returnBlock(Block *block);
+            bool externalCleanup();// can be called by another thread
+        };
+
+        template <int LOW_MARK, int HIGH_MARK>
+        class LocalLOCImpl {
+        private:
+            static const size_t MAX_TOTAL_SIZE = 4 * 1024 * 1024;
+            // TODO: can single-linked list be faster here?
+            LargeMemoryBlock *tail;// need it when do releasing on overflow
+            std::atomic<LargeMemoryBlock *> head;
+            size_t totalSize;
+            int numOfBlocks;
+
+        public:
+            bool put(LargeMemoryBlock *object, ExtMemoryPool *extMemPool);
+            LargeMemoryBlock *get(size_t size);
+            bool externalCleanup(ExtMemoryPool *extMemPool);
 #if __TBB_MALLOC_WHITEBOX_TEST
-    LocalLOCImpl() : tail(nullptr), head(nullptr), totalSize(0), numOfBlocks(0) {}
-    static size_t getMaxSize() { return MAX_TOTAL_SIZE; }
-    static const int LOC_HIGH_MARK = HIGH_MARK;
+            LocalLOCImpl() : tail(nullptr), head(nullptr), totalSize(0), numOfBlocks(0) {}
+            static size_t getMaxSize() { return MAX_TOTAL_SIZE; }
+            static const int LOC_HIGH_MARK = HIGH_MARK;
 #else
-    // no ctor, object must be created in zero-initialized memory
+            // no ctor, object must be created in zero-initialized memory
 #endif
-};
-
-typedef LocalLOCImpl<8,32> LocalLOC; // set production code parameters
-
-class TLSData : public TLSRemote {
-    MemoryPool   *memPool;
-public:
-    Bin           bin[numBlockBinLimit];
-    FreeBlockPool freeSlabBlocks;
-    LocalLOC      lloc;
-    unsigned      currCacheIdx;
-private:
-    std::atomic<bool> unused;
-public:
-    TLSData(MemoryPool *mPool, Backend *bknd) : memPool(mPool), freeSlabBlocks(bknd), currCacheIdx(0) {}
-    MemoryPool *getMemPool() const { return memPool; }
-    Bin* getAllocationBin(size_t size);
-    void release();
-    bool externalCleanup(bool cleanOnlyUnused, bool cleanBins) {
-        if (!unused.load(std::memory_order_relaxed) && cleanOnlyUnused) return false;
-        // Heavy operation in terms of synchronization complexity,
-        // should be called only for the current thread
-        bool released = cleanBins ? cleanupBlockBins() : false;
-        // both cleanups to be called, and the order is not important
-        bool lloc_cleaned = lloc.externalCleanup(&memPool->extMemPool);
-        bool free_slab_blocks_cleaned = freeSlabBlocks.externalCleanup();
-        return released || lloc_cleaned || free_slab_blocks_cleaned;
-    }
-    bool cleanupBlockBins();
-    void markUsed() { unused.store(false, std::memory_order_relaxed); } // called by owner when TLS touched
-    void markUnused() { unused.store(true, std::memory_order_relaxed); } // can be called by not owner thread
-};
-
-TLSData *TLSKey::createTLS(MemoryPool *memPool, Backend *backend)
-{
-    MALLOC_ASSERT( sizeof(TLSData) >= sizeof(Bin) * numBlockBins + sizeof(FreeBlockPool), ASSERT_TEXT );
-    TLSData* tls = (TLSData*) memPool->bootStrapBlocks.allocate(memPool, sizeof(TLSData));
-    if ( !tls )
-        return nullptr;
-    new(tls) TLSData(memPool, backend);
-    /* the block contains zeroes after bootStrapMalloc, so bins are initialized */
+        };
+
+        typedef LocalLOCImpl<8, 32> LocalLOC;// set production code parameters
+
+        class TLSData : public TLSRemote {
+            MemoryPool *memPool;
+
+        public:
+            Bin bin[numBlockBinLimit];
+            FreeBlockPool freeSlabBlocks;
+            LocalLOC lloc;
+            unsigned currCacheIdx;
+
+        private:
+            std::atomic<bool> unused;
+
+        public:
+            TLSData(MemoryPool *mPool, Backend *bknd)
+                : memPool(mPool), freeSlabBlocks(bknd), currCacheIdx(0) {}
+            MemoryPool *getMemPool() const { return memPool; }
+            Bin *getAllocationBin(size_t size);
+            void release();
+            bool externalCleanup(bool cleanOnlyUnused, bool cleanBins) {
+                if (!unused.load(std::memory_order_relaxed) && cleanOnlyUnused) return false;
+                // Heavy operation in terms of synchronization complexity,
+                // should be called only for the current thread
+                bool released = cleanBins ? cleanupBlockBins() : false;
+                // both cleanups to be called, and the order is not important
+                bool lloc_cleaned = lloc.externalCleanup(&memPool->extMemPool);
+                bool free_slab_blocks_cleaned = freeSlabBlocks.externalCleanup();
+                return released || lloc_cleaned || free_slab_blocks_cleaned;
+            }
+            bool cleanupBlockBins();
+            void markUsed() {
+                unused.store(false, std::memory_order_relaxed);
+            }// called by owner when TLS touched
+            void markUnused() {
+                unused.store(true, std::memory_order_relaxed);
+            }// can be called by not owner thread
+        };
+
+        TLSData *TLSKey::createTLS(MemoryPool *memPool, Backend *backend) {
+            MALLOC_ASSERT(sizeof(TLSData) >= sizeof(Bin) * numBlockBins + sizeof(FreeBlockPool), ASSERT_TEXT);
+            TLSData *tls = (TLSData *) memPool->bootStrapBlocks.allocate(memPool, sizeof(TLSData));
+            if (!tls) return nullptr;
+            new (tls) TLSData(memPool, backend);
+            /* the block contains zeroes after bootStrapMalloc, so bins are initialized */
 #if MALLOC_DEBUG
-    for (uint32_t i = 0; i < numBlockBinLimit; i++)
-        tls->bin[i].verifyInitState();
+            for (uint32_t i = 0; i < numBlockBinLimit; i++) tls->bin[i].verifyInitState();
 #endif
-    setThreadMallocTLS(tls);
-    memPool->extMemPool.allLocalCaches.registerThread(tls);
-    return tls;
-}
+            setThreadMallocTLS(tls);
+            memPool->extMemPool.allLocalCaches.registerThread(tls);
+            return tls;
+        }
 
-bool TLSData::cleanupBlockBins()
-{
-    bool released = false;
-    for (uint32_t i = 0; i < numBlockBinLimit; i++) {
-        released |= bin[i].cleanPublicFreeLists();
-        // After cleaning public free lists, only the active block might be empty.
-        // Do not use processEmptyBlock because it will just restore bumpPtr.
-        Block *block = bin[i].getActiveBlock();
-        if (block && block->empty()) {
-            bin[i].outofTLSBin(block);
-            memPool->returnEmptyBlock(block, /*poolTheBlock=*/false);
-            released = true;
+        bool TLSData::cleanupBlockBins() {
+            bool released = false;
+            for (uint32_t i = 0; i < numBlockBinLimit; i++) {
+                released |= bin[i].cleanPublicFreeLists();
+                // After cleaning public free lists, only the active block might be empty.
+                // Do not use processEmptyBlock because it will just restore bumpPtr.
+                Block *block = bin[i].getActiveBlock();
+                if (block && block->empty()) {
+                    bin[i].outofTLSBin(block);
+                    memPool->returnEmptyBlock(block, /*poolTheBlock=*/false);
+                    released = true;
+                }
+            }
+            return released;
         }
-    }
-    return released;
-}
 
-bool ExtMemoryPool::releaseAllLocalCaches()
-{
-    // Iterate all registered TLS data and clean LLOC and Slab pools
-    bool released = allLocalCaches.cleanup(/*cleanOnlyUnused=*/false);
+        bool ExtMemoryPool::releaseAllLocalCaches() {
+            // Iterate all registered TLS data and clean LLOC and Slab pools
+            bool released = allLocalCaches.cleanup(/*cleanOnlyUnused=*/false);
 
-    // Bins privatization is done only for the current thread
-    if (TLSData *tlsData = tlsPointerKey.getThreadMallocTLS())
-        released |= tlsData->cleanupBlockBins();
+            // Bins privatization is done only for the current thread
+            if (TLSData *tlsData = tlsPointerKey.getThreadMallocTLS())
+                released |= tlsData->cleanupBlockBins();
 
-    return released;
-}
+            return released;
+        }
 
-void AllLocalCaches::registerThread(TLSRemote *tls)
-{
-    tls->prev = nullptr;
-    MallocMutex::scoped_lock lock(listLock);
-    MALLOC_ASSERT(head!=tls, ASSERT_TEXT);
-    tls->next = head;
-    if (head)
-        head->prev = tls;
-    head = tls;
-    MALLOC_ASSERT(head->next!=head, ASSERT_TEXT);
-}
+        void AllLocalCaches::registerThread(TLSRemote *tls) {
+            tls->prev = nullptr;
+            MallocMutex::scoped_lock lock(listLock);
+            MALLOC_ASSERT(head != tls, ASSERT_TEXT);
+            tls->next = head;
+            if (head) head->prev = tls;
+            head = tls;
+            MALLOC_ASSERT(head->next != head, ASSERT_TEXT);
+        }
 
-void AllLocalCaches::unregisterThread(TLSRemote *tls)
-{
-    MallocMutex::scoped_lock lock(listLock);
-    MALLOC_ASSERT(head, "Can't unregister thread: no threads are registered.");
-    if (head == tls)
-        head = tls->next;
-    if (tls->next)
-        tls->next->prev = tls->prev;
-    if (tls->prev)
-        tls->prev->next = tls->next;
-    MALLOC_ASSERT(!tls->next || tls->next->next!=tls->next, ASSERT_TEXT);
-}
+        void AllLocalCaches::unregisterThread(TLSRemote *tls) {
+            MallocMutex::scoped_lock lock(listLock);
+            MALLOC_ASSERT(head, "Can't unregister thread: no threads are registered.");
+            if (head == tls) head = tls->next;
+            if (tls->next) tls->next->prev = tls->prev;
+            if (tls->prev) tls->prev->next = tls->next;
+            MALLOC_ASSERT(!tls->next || tls->next->next != tls->next, ASSERT_TEXT);
+        }
 
-bool AllLocalCaches::cleanup(bool cleanOnlyUnused)
-{
-    bool released = false;
-    {
-        MallocMutex::scoped_lock lock(listLock);
-        for (TLSRemote *curr=head; curr; curr=curr->next)
-            released |= static_cast<TLSData*>(curr)->externalCleanup(cleanOnlyUnused, /*cleanBins=*/false);
-    }
-    return released;
-}
+        bool AllLocalCaches::cleanup(bool cleanOnlyUnused) {
+            bool released = false;
+            {
+                MallocMutex::scoped_lock lock(listLock);
+                for (TLSRemote *curr = head; curr; curr = curr->next)
+                    released |= static_cast<TLSData *>(curr)->externalCleanup(cleanOnlyUnused,
+                                                                              /*cleanBins=*/false);
+            }
+            return released;
+        }
 
-void AllLocalCaches::markUnused()
-{
-    bool locked = false;
-    MallocMutex::scoped_lock lock(listLock, /*block=*/false, &locked);
-    if (!locked) // not wait for marking if someone doing something with it
-        return;
+        void AllLocalCaches::markUnused() {
+            bool locked = false;
+            MallocMutex::scoped_lock lock(listLock, /*block=*/false, &locked);
+            if (!locked)// not wait for marking if someone doing something with it
+                return;
 
-    for (TLSRemote *curr=head; curr; curr=curr->next)
-        static_cast<TLSData*>(curr)->markUnused();
-}
+            for (TLSRemote *curr = head; curr; curr = curr->next) static_cast<TLSData *>(curr)->markUnused();
+        }
 
 #if MALLOC_CHECK_RECURSION
-MallocMutex RecursiveMallocCallProtector::rmc_mutex;
-std::atomic<pthread_t> RecursiveMallocCallProtector::owner_thread;
-std::atomic<void*> RecursiveMallocCallProtector::autoObjPtr;
-bool        RecursiveMallocCallProtector::mallocRecursionDetected;
+        MallocMutex RecursiveMallocCallProtector::rmc_mutex;
+        std::atomic<pthread_t> RecursiveMallocCallProtector::owner_thread;
+        std::atomic<void *> RecursiveMallocCallProtector::autoObjPtr;
+        bool RecursiveMallocCallProtector::mallocRecursionDetected;
 #if __FreeBSD__
-bool        RecursiveMallocCallProtector::canUsePthread;
+        bool RecursiveMallocCallProtector::canUsePthread;
 #endif
 
 #endif
 
-/*********** End code to provide thread ID and a TLS pointer **********/
+        /*********** End code to provide thread ID and a TLS pointer **********/
 
-// Parameter for isLargeObject, keeps our expectations on memory origin.
-// Assertions must use unknownMem to reliably report object invalidity.
-enum MemoryOrigin {
-    ourMem,    // allocated by TBB allocator
-    unknownMem // can be allocated by system allocator or TBB allocator
-};
+        // Parameter for isLargeObject, keeps our expectations on memory origin.
+        // Assertions must use unknownMem to reliably report object invalidity.
+        enum MemoryOrigin {
+            ourMem,   // allocated by TBB allocator
+            unknownMem// can be allocated by system allocator or TBB allocator
+        };
 
-template<MemoryOrigin>
+        template <MemoryOrigin>
 #if __TBB_USE_THREAD_SANITIZER
-// We have a real race when accessing the large object header for
-// non large objects (e.g. small or foreign objects).
-// Therefore, we need to hide this access from the thread sanitizer
-__attribute__((no_sanitize("thread")))
+        // We have a real race when accessing the large object header for
+        // non large objects (e.g. small or foreign objects).
+        // Therefore, we need to hide this access from the thread sanitizer
+        __attribute__((no_sanitize("thread")))
 #endif
-bool isLargeObject(void *object);
-static void *internalMalloc(size_t size);
-static void internalFree(void *object);
-static void *internalPoolMalloc(MemoryPool* mPool, size_t size);
-static bool internalPoolFree(MemoryPool *mPool, void *object, size_t size);
+        bool
+        isLargeObject(void *object);
+        static void *internalMalloc(size_t size);
+        static void internalFree(void *object);
+        static void *internalPoolMalloc(MemoryPool *mPool, size_t size);
+        static bool internalPoolFree(MemoryPool *mPool, void *object, size_t size);
 
 #if !MALLOC_DEBUG
 #if __INTEL_COMPILER || _MSC_VER
 #define NOINLINE(decl) __declspec(noinline) decl
 #define ALWAYSINLINE(decl) __forceinline decl
 #elif __GNUC__
-#define NOINLINE(decl) decl __attribute__ ((noinline))
-#define ALWAYSINLINE(decl) decl __attribute__ ((always_inline))
+#define NOINLINE(decl) decl __attribute__((noinline))
+#define ALWAYSINLINE(decl) decl __attribute__((always_inline))
 #else
 #define NOINLINE(decl) decl
 #define ALWAYSINLINE(decl) decl
 #endif
 
-static NOINLINE( bool doInitialization() );
-ALWAYSINLINE( bool isMallocInitialized() );
+        static NOINLINE(bool doInitialization());
+        ALWAYSINLINE(bool isMallocInitialized());
 
 #undef ALWAYSINLINE
 #undef NOINLINE
 #endif /* !MALLOC_DEBUG */
 
-
 /********* Now some rough utility code to deal with indexing the size bins. **************/
 
 /*
@@ -766,1065 +758,988 @@ ALWAYSINLINE( bool isMallocInitialized() );
  * This is enough for current algorithm of distribution of sizes among bins.
  * __TBB_Log2 is not used here to minimize dependencies on TBB specific sources.
  */
-#if _WIN64 && _MSC_VER>=1400 && !__INTEL_COMPILER
-extern "C" unsigned char _BitScanReverse( unsigned long* i, unsigned long w );
+#if _WIN64 && _MSC_VER >= 1400 && !__INTEL_COMPILER
+        extern "C" unsigned char _BitScanReverse(unsigned long *i, unsigned long w);
 #pragma intrinsic(_BitScanReverse)
 #endif
-static inline unsigned int highestBitPos(unsigned int n)
-{
-    MALLOC_ASSERT( n>=64 && n<1024, ASSERT_TEXT ); // only needed for bsr array lookup, but always true
-    unsigned int pos;
-#if __ARCH_x86_32||__ARCH_x86_64
-
-# if __unix__||__APPLE__||__MINGW32__
-    __asm__ ("bsr %1,%0" : "=r"(pos) : "r"(n));
-# elif (_WIN32 && (!_WIN64 || __INTEL_COMPILER))
-    __asm
-    {
+        static inline unsigned int highestBitPos(unsigned int n) {
+            MALLOC_ASSERT(n >= 64 && n < 1024,
+                          ASSERT_TEXT);// only needed for bsr array lookup, but always true
+            unsigned int pos;
+#if __ARCH_x86_32 || __ARCH_x86_64
+
+#if __unix__ || __APPLE__ || __MINGW32__
+            __asm__("bsr %1,%0" : "=r"(pos) : "r"(n));
+#elif (_WIN32 && (!_WIN64 || __INTEL_COMPILER))
+            __asm
+            {
         bsr eax, n
         mov pos, eax
-    }
-# elif _WIN64 && _MSC_VER>=1400
-    _BitScanReverse((unsigned long*)&pos, (unsigned long)n);
-# else
-#   error highestBitPos() not implemented for this platform
-# endif
+            }
+#elif _WIN64 && _MSC_VER >= 1400
+            _BitScanReverse((unsigned long *) &pos, (unsigned long) n);
+#else
+#error highestBitPos() not implemented for this platform
+#endif
 #elif __arm__
-    __asm__ __volatile__
-    (
-       "clz %0, %1\n"
-       "rsb %0, %0, %2\n"
-       :"=r" (pos) :"r" (n), "I" (31)
-    );
+            __asm__ __volatile__("clz %0, %1\n"
+                                 "rsb %0, %0, %2\n"
+                                 : "=r"(pos)
+                                 : "r"(n), "I"(31));
 #else
-    static unsigned int bsr[16] = {0/*N/A*/,6,7,7,8,8,8,8,9,9,9,9,9,9,9,9};
-    pos = bsr[ n>>6 ];
+            static unsigned int bsr[16] = {0 /*N/A*/, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9};
+            pos = bsr[n >> 6];
 #endif /* __ARCH_* */
-    return pos;
-}
+            return pos;
+        }
 
-unsigned int getSmallObjectIndex(unsigned int size)
-{
-    unsigned int result = (size-1)>>3;
-    constexpr bool is_64bit = (8 == sizeof(void*));
-    if (is_64bit) {
-        // For 64-bit malloc, 16 byte alignment is needed except for bin 0.
-        if (result) result |= 1; // 0,1,3,5,7; bins 2,4,6 are not aligned to 16 bytes
-    }
-    return result;
-}
+        unsigned int getSmallObjectIndex(unsigned int size) {
+            unsigned int result = (size - 1) >> 3;
+            constexpr bool is_64bit = (8 == sizeof(void *));
+            if (is_64bit) {
+                // For 64-bit malloc, 16 byte alignment is needed except for bin 0.
+                if (result) result |= 1;// 0,1,3,5,7; bins 2,4,6 are not aligned to 16 bytes
+            }
+            return result;
+        }
 
-/*
+        /*
  * Depending on indexRequest, for a given size return either the index into the bin
  * for objects of this size, or the actual size of objects in this bin.
  * TODO: Change return type to unsigned short.
  */
-template<bool indexRequest>
-static unsigned int getIndexOrObjectSize (unsigned int size)
-{
-    if (size <= maxSmallObjectSize) { // selection from 8/16/24/32/40/48/56/64
-        unsigned int index = getSmallObjectIndex( size );
-         /* Bin 0 is for 8 bytes, bin 1 is for 16, and so forth */
-        return indexRequest ? index : (index+1)<<3;
-    }
-    else if (size <= maxSegregatedObjectSize ) { // 80/96/112/128 / 160/192/224/256 / 320/384/448/512 / 640/768/896/1024
-        unsigned int order = highestBitPos(size-1); // which group of bin sizes?
-        MALLOC_ASSERT( 6<=order && order<=9, ASSERT_TEXT );
-        if (indexRequest)
-            return minSegregatedObjectIndex - (4*6) - 4 + (4*order) + ((size-1)>>(order-2));
-        else {
-            unsigned int alignment = 128 >> (9-order); // alignment in the group
-            MALLOC_ASSERT( alignment==16 || alignment==32 || alignment==64 || alignment==128, ASSERT_TEXT );
-            return alignUp(size,alignment);
-        }
-    }
-    else {
-        if( size <= fittingSize3 ) {
-            if( size <= fittingSize2 ) {
-                if( size <= fittingSize1 )
-                    return indexRequest ? minFittingIndex : fittingSize1;
-                else
-                    return indexRequest ? minFittingIndex+1 : fittingSize2;
-            } else
-                return indexRequest ? minFittingIndex+2 : fittingSize3;
-        } else {
-            if( size <= fittingSize5 ) {
-                if( size <= fittingSize4 )
-                    return indexRequest ? minFittingIndex+3 : fittingSize4;
-                else
-                    return indexRequest ? minFittingIndex+4 : fittingSize5;
+        template <bool indexRequest>
+        static unsigned int getIndexOrObjectSize(unsigned int size) {
+            if (size <= maxSmallObjectSize) {// selection from 8/16/24/32/40/48/56/64
+                unsigned int index = getSmallObjectIndex(size);
+                /* Bin 0 is for 8 bytes, bin 1 is for 16, and so forth */
+                return indexRequest ? index : (index + 1) << 3;
+            } else if (
+                    size
+                    <= maxSegregatedObjectSize) {// 80/96/112/128 / 160/192/224/256 / 320/384/448/512 / 640/768/896/1024
+                unsigned int order = highestBitPos(size - 1);// which group of bin sizes?
+                MALLOC_ASSERT(6 <= order && order <= 9, ASSERT_TEXT);
+                if (indexRequest)
+                    return minSegregatedObjectIndex - (4 * 6) - 4 + (4 * order) + ((size - 1) >> (order - 2));
+                else {
+                    unsigned int alignment = 128 >> (9 - order);// alignment in the group
+                    MALLOC_ASSERT(alignment == 16 || alignment == 32 || alignment == 64 || alignment == 128,
+                                  ASSERT_TEXT);
+                    return alignUp(size, alignment);
+                }
             } else {
-                MALLOC_ASSERT( 0,ASSERT_TEXT ); // this should not happen
-                return ~0U;
+                if (size <= fittingSize3) {
+                    if (size <= fittingSize2) {
+                        if (size <= fittingSize1) return indexRequest ? minFittingIndex : fittingSize1;
+                        else
+                            return indexRequest ? minFittingIndex + 1 : fittingSize2;
+                    } else
+                        return indexRequest ? minFittingIndex + 2 : fittingSize3;
+                } else {
+                    if (size <= fittingSize5) {
+                        if (size <= fittingSize4) return indexRequest ? minFittingIndex + 3 : fittingSize4;
+                        else
+                            return indexRequest ? minFittingIndex + 4 : fittingSize5;
+                    } else {
+                        MALLOC_ASSERT(0, ASSERT_TEXT);// this should not happen
+                        return ~0U;
+                    }
+                }
             }
         }
-    }
-}
 
-static unsigned int getIndex (unsigned int size)
-{
-    return getIndexOrObjectSize</*indexRequest=*/true>(size);
-}
-
-static unsigned int getObjectSize (unsigned int size)
-{
-    return getIndexOrObjectSize</*indexRequest=*/false>(size);
-}
+        static unsigned int getIndex(unsigned int size) {
+            return getIndexOrObjectSize</*indexRequest=*/true>(size);
+        }
 
+        static unsigned int getObjectSize(unsigned int size) {
+            return getIndexOrObjectSize</*indexRequest=*/false>(size);
+        }
 
-void *BootStrapBlocks::allocate(MemoryPool *memPool, size_t size)
-{
-    FreeObject *result;
+        void *BootStrapBlocks::allocate(MemoryPool *memPool, size_t size) {
+            FreeObject *result;
 
-    MALLOC_ASSERT( size == sizeof(TLSData), ASSERT_TEXT );
+            MALLOC_ASSERT(size == sizeof(TLSData), ASSERT_TEXT);
 
-    { // Lock with acquire
-        MallocMutex::scoped_lock scoped_cs(bootStrapLock);
+            {// Lock with acquire
+                MallocMutex::scoped_lock scoped_cs(bootStrapLock);
 
-        if( bootStrapObjectList) {
-            result = bootStrapObjectList;
-            bootStrapObjectList = bootStrapObjectList->next;
-        } else {
-            if (!bootStrapBlock) {
-                bootStrapBlock = memPool->getEmptyBlock(size);
-                if (!bootStrapBlock) return nullptr;
-            }
-            result = bootStrapBlock->bumpPtr;
-            bootStrapBlock->bumpPtr = (FreeObject *)((uintptr_t)bootStrapBlock->bumpPtr - bootStrapBlock->objectSize);
-            if ((uintptr_t)bootStrapBlock->bumpPtr < (uintptr_t)bootStrapBlock+sizeof(Block)) {
-                bootStrapBlock->bumpPtr = nullptr;
-                bootStrapBlock->next = bootStrapBlockUsed;
-                bootStrapBlockUsed = bootStrapBlock;
-                bootStrapBlock = nullptr;
-            }
-        }
-    } // Unlock with release
-    memset (result, 0, size);
-    return (void*)result;
-}
+                if (bootStrapObjectList) {
+                    result = bootStrapObjectList;
+                    bootStrapObjectList = bootStrapObjectList->next;
+                } else {
+                    if (!bootStrapBlock) {
+                        bootStrapBlock = memPool->getEmptyBlock(size);
+                        if (!bootStrapBlock) return nullptr;
+                    }
+                    result = bootStrapBlock->bumpPtr;
+                    bootStrapBlock->bumpPtr = (FreeObject *) ((uintptr_t) bootStrapBlock->bumpPtr
+                                                              - bootStrapBlock->objectSize);
+                    if ((uintptr_t) bootStrapBlock->bumpPtr < (uintptr_t) bootStrapBlock + sizeof(Block)) {
+                        bootStrapBlock->bumpPtr = nullptr;
+                        bootStrapBlock->next = bootStrapBlockUsed;
+                        bootStrapBlockUsed = bootStrapBlock;
+                        bootStrapBlock = nullptr;
+                    }
+                }
+            }// Unlock with release
+            memset(result, 0, size);
+            return (void *) result;
+        }
 
-void BootStrapBlocks::free(void* ptr)
-{
-    MALLOC_ASSERT( ptr, ASSERT_TEXT );
-    { // Lock with acquire
-        MallocMutex::scoped_lock scoped_cs(bootStrapLock);
-        ((FreeObject*)ptr)->next = bootStrapObjectList;
-        bootStrapObjectList = (FreeObject*)ptr;
-    } // Unlock with release
-}
+        void BootStrapBlocks::free(void *ptr) {
+            MALLOC_ASSERT(ptr, ASSERT_TEXT);
+            {// Lock with acquire
+                MallocMutex::scoped_lock scoped_cs(bootStrapLock);
+                ((FreeObject *) ptr)->next = bootStrapObjectList;
+                bootStrapObjectList = (FreeObject *) ptr;
+            }// Unlock with release
+        }
 
-void BootStrapBlocks::reset()
-{
-    bootStrapBlock = bootStrapBlockUsed = nullptr;
-    bootStrapObjectList = nullptr;
-}
+        void BootStrapBlocks::reset() {
+            bootStrapBlock = bootStrapBlockUsed = nullptr;
+            bootStrapObjectList = nullptr;
+        }
 
 #if !(FREELIST_NONBLOCKING)
-static MallocMutex publicFreeListLock; // lock for changes of publicFreeList
+        static MallocMutex publicFreeListLock;// lock for changes of publicFreeList
 #endif
 
-/********* End rough utility code  **************/
+        /********* End rough utility code  **************/
 
-/* LifoList assumes zero initialization so a vector of it can be created
+        /* LifoList assumes zero initialization so a vector of it can be created
  * by just allocating some space with no call to constructor.
  * On Linux, it seems to be necessary to avoid linking with C++ libraries.
  *
  * By usage convention there is no race on the initialization. */
-LifoList::LifoList( ) : top(nullptr)
-{
-    // MallocMutex assumes zero initialization
-    memset(static_cast<void*>(&lock), 0, sizeof(MallocMutex));
-}
+        LifoList::LifoList() : top(nullptr) {
+            // MallocMutex assumes zero initialization
+            memset(static_cast<void *>(&lock), 0, sizeof(MallocMutex));
+        }
 
-void LifoList::push(Block *block)
-{
-    MallocMutex::scoped_lock scoped_cs(lock);
-    block->next = top.load(std::memory_order_relaxed);
-    top.store(block, std::memory_order_relaxed);
-}
+        void LifoList::push(Block *block) {
+            MallocMutex::scoped_lock scoped_cs(lock);
+            block->next = top.load(std::memory_order_relaxed);
+            top.store(block, std::memory_order_relaxed);
+        }
 
-Block *LifoList::pop()
-{
-    Block* block = nullptr;
-    if (top.load(std::memory_order_relaxed)) {
-        MallocMutex::scoped_lock scoped_cs(lock);
-        block = top.load(std::memory_order_relaxed);
-        if (block) {
-            top.store(block->next, std::memory_order_relaxed);
+        Block *LifoList::pop() {
+            Block *block = nullptr;
+            if (top.load(std::memory_order_relaxed)) {
+                MallocMutex::scoped_lock scoped_cs(lock);
+                block = top.load(std::memory_order_relaxed);
+                if (block) { top.store(block->next, std::memory_order_relaxed); }
+            }
+            return block;
         }
-    }
-    return block;
-}
 
-Block *LifoList::grab()
-{
-    Block *block = nullptr;
-    if (top.load(std::memory_order_relaxed)) {
-        MallocMutex::scoped_lock scoped_cs(lock);
-        block = top.load(std::memory_order_relaxed);
-        top.store(nullptr, std::memory_order_relaxed);
-    }
-    return block;
-}
+        Block *LifoList::grab() {
+            Block *block = nullptr;
+            if (top.load(std::memory_order_relaxed)) {
+                MallocMutex::scoped_lock scoped_cs(lock);
+                block = top.load(std::memory_order_relaxed);
+                top.store(nullptr, std::memory_order_relaxed);
+            }
+            return block;
+        }
 
-/********* Thread and block related code      *************/
-
-template<bool poolDestroy> void AllLargeBlocksList::releaseAll(Backend *backend) {
-     LargeMemoryBlock *next, *lmb = loHead;
-     loHead = nullptr;
-
-     for (; lmb; lmb = next) {
-         next = lmb->gNext;
-         if (poolDestroy) {
-             // as it's pool destruction, no need to return object to backend,
-             // only remove backrefs, as they are global
-             removeBackRef(lmb->backRefIdx);
-         } else {
-             // clean g(Next|Prev) to prevent removing lmb
-             // from AllLargeBlocksList inside returnLargeObject
-             lmb->gNext = lmb->gPrev = nullptr;
-             backend->returnLargeObject(lmb);
-         }
-     }
-}
+        /********* Thread and block related code      *************/
+
+        template <bool poolDestroy>
+        void AllLargeBlocksList::releaseAll(Backend *backend) {
+            LargeMemoryBlock *next, *lmb = loHead;
+            loHead = nullptr;
+
+            for (; lmb; lmb = next) {
+                next = lmb->gNext;
+                if (poolDestroy) {
+                    // as it's pool destruction, no need to return object to backend,
+                    // only remove backrefs, as they are global
+                    removeBackRef(lmb->backRefIdx);
+                } else {
+                    // clean g(Next|Prev) to prevent removing lmb
+                    // from AllLargeBlocksList inside returnLargeObject
+                    lmb->gNext = lmb->gPrev = nullptr;
+                    backend->returnLargeObject(lmb);
+                }
+            }
+        }
 
-TLSData* MemoryPool::getTLS(bool create)
-{
-    TLSData* tls = extMemPool.tlsPointerKey.getThreadMallocTLS();
-    if (create && !tls)
-        tls = extMemPool.tlsPointerKey.createTLS(this, &extMemPool.backend);
-    return tls;
-}
+        TLSData *MemoryPool::getTLS(bool create) {
+            TLSData *tls = extMemPool.tlsPointerKey.getThreadMallocTLS();
+            if (create && !tls) tls = extMemPool.tlsPointerKey.createTLS(this, &extMemPool.backend);
+            return tls;
+        }
 
-/*
+        /*
  * Return the bin for the given size.
  */
-inline Bin* TLSData::getAllocationBin(size_t size)
-{
-    return bin + getIndex(size);
-}
-
-/* Return an empty uninitialized block in a non-blocking fashion. */
-Block *MemoryPool::getEmptyBlock(size_t size)
-{
-    TLSData* tls = getTLS(/*create=*/false);
-    // try to use per-thread cache, if TLS available
-    FreeBlockPool::ResOfGet resOfGet = tls?
-        tls->freeSlabBlocks.getBlock() : FreeBlockPool::ResOfGet(nullptr, false);
-    Block *result = resOfGet.block;
-
-    if (!result) { // not found in local cache, asks backend for slabs
-        int num = resOfGet.lastAccMiss? Backend::numOfSlabAllocOnMiss : 1;
-        BackRefIdx backRefIdx[Backend::numOfSlabAllocOnMiss];
-
-        result = static_cast<Block*>(extMemPool.backend.getSlabBlock(num));
-        if (!result) return nullptr;
-
-        if (!extMemPool.userPool())
-            for (int i=0; i<num; i++) {
-                backRefIdx[i] = BackRefIdx::newBackRef(/*largeObj=*/false);
-                if (backRefIdx[i].isInvalid()) {
-                    // roll back resource allocation
-                    for (int j=0; j<i; j++)
-                        removeBackRef(backRefIdx[j]);
-                    Block *b = result;
-                    for (int j=0; j<num; b=(Block*)((uintptr_t)b+slabSize), j++)
-                        extMemPool.backend.putSlabBlock(b);
-                    return nullptr;
+        inline Bin *TLSData::getAllocationBin(size_t size) { return bin + getIndex(size); }
+
+        /* Return an empty uninitialized block in a non-blocking fashion. */
+        Block *MemoryPool::getEmptyBlock(size_t size) {
+            TLSData *tls = getTLS(/*create=*/false);
+            // try to use per-thread cache, if TLS available
+            FreeBlockPool::ResOfGet resOfGet
+                    = tls ? tls->freeSlabBlocks.getBlock() : FreeBlockPool::ResOfGet(nullptr, false);
+            Block *result = resOfGet.block;
+
+            if (!result) {// not found in local cache, asks backend for slabs
+                int num = resOfGet.lastAccMiss ? Backend::numOfSlabAllocOnMiss : 1;
+                BackRefIdx backRefIdx[Backend::numOfSlabAllocOnMiss];
+
+                result = static_cast<Block *>(extMemPool.backend.getSlabBlock(num));
+                if (!result) return nullptr;
+
+                if (!extMemPool.userPool())
+                    for (int i = 0; i < num; i++) {
+                        backRefIdx[i] = BackRefIdx::newBackRef(/*largeObj=*/false);
+                        if (backRefIdx[i].isInvalid()) {
+                            // roll back resource allocation
+                            for (int j = 0; j < i; j++) removeBackRef(backRefIdx[j]);
+                            Block *b = result;
+                            for (int j = 0; j < num; b = (Block *) ((uintptr_t) b + slabSize), j++)
+                                extMemPool.backend.putSlabBlock(b);
+                            return nullptr;
+                        }
+                    }
+                // resources were allocated, register blocks
+                Block *b = result;
+                for (int i = 0; i < num; b = (Block *) ((uintptr_t) b + slabSize), i++) {
+                    // slab block in user's pool must have invalid backRefIdx
+                    if (extMemPool.userPool()) {
+                        new (&b->backRefIdx) BackRefIdx();
+                    } else {
+                        setBackRef(backRefIdx[i], b);
+                        b->backRefIdx = backRefIdx[i];
+                    }
+                    b->tlsPtr.store(tls, std::memory_order_relaxed);
+                    b->poolPtr = this;
+                    // all but first one go to per-thread pool
+                    if (i > 0) {
+                        MALLOC_ASSERT(tls, ASSERT_TEXT);
+                        tls->freeSlabBlocks.returnBlock(b);
+                    }
                 }
             }
-        // resources were allocated, register blocks
-        Block *b = result;
-        for (int i=0; i<num; b=(Block*)((uintptr_t)b+slabSize), i++) {
-            // slab block in user's pool must have invalid backRefIdx
-            if (extMemPool.userPool()) {
-                new (&b->backRefIdx) BackRefIdx();
+            MALLOC_ASSERT(result, ASSERT_TEXT);
+            result->initEmptyBlock(tls, size);
+            STAT_increment(getThreadId(), getIndex(result->objectSize), allocBlockNew);
+            return result;
+        }
+
+        void MemoryPool::returnEmptyBlock(Block *block, bool poolTheBlock) {
+            block->reset();
+            if (poolTheBlock) {
+                getTLS(/*create=*/false)->freeSlabBlocks.returnBlock(block);
             } else {
-                setBackRef(backRefIdx[i], b);
-                b->backRefIdx = backRefIdx[i];
-            }
-            b->tlsPtr.store(tls, std::memory_order_relaxed);
-            b->poolPtr = this;
-            // all but first one go to per-thread pool
-            if (i > 0) {
-                MALLOC_ASSERT(tls, ASSERT_TEXT);
-                tls->freeSlabBlocks.returnBlock(b);
+                // slab blocks in user's pools do not have valid backRefIdx
+                if (!extMemPool.userPool()) removeBackRef(*(block->getBackRefIdx()));
+                extMemPool.backend.putSlabBlock(block);
             }
         }
-    }
-    MALLOC_ASSERT(result, ASSERT_TEXT);
-    result->initEmptyBlock(tls, size);
-    STAT_increment(getThreadId(), getIndex(result->objectSize), allocBlockNew);
-    return result;
-}
 
-void MemoryPool::returnEmptyBlock(Block *block, bool poolTheBlock)
-{
-    block->reset();
-    if (poolTheBlock) {
-        getTLS(/*create=*/false)->freeSlabBlocks.returnBlock(block);
-    } else {
-        // slab blocks in user's pools do not have valid backRefIdx
-        if (!extMemPool.userPool())
-            removeBackRef(*(block->getBackRefIdx()));
-        extMemPool.backend.putSlabBlock(block);
-    }
-}
+        bool ExtMemoryPool::init(intptr_t poolId, rawAllocType rawAlloc, rawFreeType rawFree,
+                                 size_t granularity, bool keepAllMemory, bool fixedPool) {
+            this->poolId = poolId;
+            this->rawAlloc = rawAlloc;
+            this->rawFree = rawFree;
+            this->granularity = granularity;
+            this->keepAllMemory = keepAllMemory;
+            this->fixedPool = fixedPool;
+            this->delayRegsReleasing = false;
+            if (!initTLS()) return false;
+            loc.init(this);
+            backend.init(this);
+            MALLOC_ASSERT(isPoolValid(), nullptr);
+            return true;
+        }
 
-bool ExtMemoryPool::init(intptr_t poolId, rawAllocType rawAlloc,
-                         rawFreeType rawFree, size_t granularity,
-                         bool keepAllMemory, bool fixedPool)
-{
-    this->poolId = poolId;
-    this->rawAlloc = rawAlloc;
-    this->rawFree = rawFree;
-    this->granularity = granularity;
-    this->keepAllMemory = keepAllMemory;
-    this->fixedPool = fixedPool;
-    this->delayRegsReleasing = false;
-    if (!initTLS())
-        return false;
-    loc.init(this);
-    backend.init(this);
-    MALLOC_ASSERT(isPoolValid(), nullptr);
-    return true;
-}
+        bool ExtMemoryPool::initTLS() { return tlsPointerKey.init(); }
+
+        bool MemoryPool::init(intptr_t poolId, const MemPoolPolicy *policy) {
+            if (!extMemPool.init(poolId, policy->pAlloc, policy->pFree,
+                                 policy->granularity ? policy->granularity : defaultGranularity,
+                                 policy->keepAllMemory, policy->fixedPool))
+                return false;
+            {
+                MallocMutex::scoped_lock lock(memPoolListLock);
+                next = defaultMemPool->next;
+                defaultMemPool->next = this;
+                prev = defaultMemPool;
+                if (next) next->prev = this;
+            }
+            return true;
+        }
 
-bool ExtMemoryPool::initTLS() { return tlsPointerKey.init(); }
+        bool MemoryPool::reset() {
+            MALLOC_ASSERT(extMemPool.userPool(), "No reset for the system pool.");
+            // memory is not releasing during pool reset
+            // TODO: mark regions to release unused on next reset()
+            extMemPool.delayRegionsReleasing(true);
 
-bool MemoryPool::init(intptr_t poolId, const MemPoolPolicy *policy)
-{
-    if (!extMemPool.init(poolId, policy->pAlloc, policy->pFree,
-               policy->granularity? policy->granularity : defaultGranularity,
-               policy->keepAllMemory, policy->fixedPool))
-        return false;
-    {
-        MallocMutex::scoped_lock lock(memPoolListLock);
-        next = defaultMemPool->next;
-        defaultMemPool->next = this;
-        prev = defaultMemPool;
-        if (next)
-            next->prev = this;
-    }
-    return true;
-}
+            bootStrapBlocks.reset();
+            extMemPool.lmbList.releaseAll</*poolDestroy=*/false>(&extMemPool.backend);
+            if (!extMemPool.reset()) return false;
 
-bool MemoryPool::reset()
-{
-    MALLOC_ASSERT(extMemPool.userPool(), "No reset for the system pool.");
-    // memory is not releasing during pool reset
-    // TODO: mark regions to release unused on next reset()
-    extMemPool.delayRegionsReleasing(true);
-
-    bootStrapBlocks.reset();
-    extMemPool.lmbList.releaseAll</*poolDestroy=*/false>(&extMemPool.backend);
-    if (!extMemPool.reset())
-        return false;
-
-    if (!extMemPool.initTLS())
-        return false;
-    extMemPool.delayRegionsReleasing(false);
-    return true;
-}
+            if (!extMemPool.initTLS()) return false;
+            extMemPool.delayRegionsReleasing(false);
+            return true;
+        }
 
-bool MemoryPool::destroy()
-{
+        bool MemoryPool::destroy() {
 #if __TBB_MALLOC_LOCACHE_STAT
-    extMemPool.loc.reportStat(stdout);
+            extMemPool.loc.reportStat(stdout);
 #endif
 #if __TBB_MALLOC_BACKEND_STAT
-    extMemPool.backend.reportStat(stdout);
+            extMemPool.backend.reportStat(stdout);
 #endif
-    {
-        MallocMutex::scoped_lock lock(memPoolListLock);
-        // remove itself from global pool list
-        if (prev)
-            prev->next = next;
-        if (next)
-            next->prev = prev;
-    }
-    // slab blocks in non-default pool do not have backreferences,
-    // only large objects do
-    if (extMemPool.userPool())
-        extMemPool.lmbList.releaseAll</*poolDestroy=*/true>(&extMemPool.backend);
-    else {
-        // only one non-userPool() is supported now
-        MALLOC_ASSERT(this==defaultMemPool, nullptr);
-        // There and below in extMemPool.destroy(), do not restore initial state
-        // for user pool, because it's just about to be released. But for system
-        // pool restoring, we do not want to do zeroing of it on subsequent reload.
-        bootStrapBlocks.reset();
-        extMemPool.orphanedBlocks.reset();
-    }
-    return extMemPool.destroy();
-}
+            {
+                MallocMutex::scoped_lock lock(memPoolListLock);
+                // remove itself from global pool list
+                if (prev) prev->next = next;
+                if (next) next->prev = prev;
+            }
+            // slab blocks in non-default pool do not have backreferences,
+            // only large objects do
+            if (extMemPool.userPool())
+                extMemPool.lmbList.releaseAll</*poolDestroy=*/true>(&extMemPool.backend);
+            else {
+                // only one non-userPool() is supported now
+                MALLOC_ASSERT(this == defaultMemPool, nullptr);
+                // There and below in extMemPool.destroy(), do not restore initial state
+                // for user pool, because it's just about to be released. But for system
+                // pool restoring, we do not want to do zeroing of it on subsequent reload.
+                bootStrapBlocks.reset();
+                extMemPool.orphanedBlocks.reset();
+            }
+            return extMemPool.destroy();
+        }
 
-void MemoryPool::onThreadShutdown(TLSData *tlsData)
-{
-    if (tlsData) { // might be called for "empty" TLS
-        tlsData->release();
-        bootStrapBlocks.free(tlsData);
-        clearTLS();
-    }
-}
+        void MemoryPool::onThreadShutdown(TLSData *tlsData) {
+            if (tlsData) {// might be called for "empty" TLS
+                tlsData->release();
+                bootStrapBlocks.free(tlsData);
+                clearTLS();
+            }
+        }
 
 #if MALLOC_DEBUG
-void Bin::verifyTLSBin (size_t size) const
-{
-/* The debug version verifies the TLSBin as needed */
-    uint32_t objSize = getObjectSize(size);
-
-    if (activeBlk) {
-        MALLOC_ASSERT( activeBlk->isOwnedByCurrentThread(), ASSERT_TEXT );
-        MALLOC_ASSERT( activeBlk->objectSize == objSize, ASSERT_TEXT );
-#if MALLOC_DEBUG>1
-        for (Block* temp = activeBlk->next; temp; temp=temp->next) {
-            MALLOC_ASSERT( temp!=activeBlk, ASSERT_TEXT );
-            MALLOC_ASSERT( temp->isOwnedByCurrentThread(), ASSERT_TEXT );
-            MALLOC_ASSERT( temp->objectSize == objSize, ASSERT_TEXT );
-            MALLOC_ASSERT( temp->previous->next == temp, ASSERT_TEXT );
-            if (temp->next) {
-                MALLOC_ASSERT( temp->next->previous == temp, ASSERT_TEXT );
-            }
-        }
-        for (Block* temp = activeBlk->previous; temp; temp=temp->previous) {
-            MALLOC_ASSERT( temp!=activeBlk, ASSERT_TEXT );
-            MALLOC_ASSERT( temp->isOwnedByCurrentThread(), ASSERT_TEXT );
-            MALLOC_ASSERT( temp->objectSize == objSize, ASSERT_TEXT );
-            MALLOC_ASSERT( temp->next->previous == temp, ASSERT_TEXT );
-            if (temp->previous) {
-                MALLOC_ASSERT( temp->previous->next == temp, ASSERT_TEXT );
+        void Bin::verifyTLSBin(size_t size) const {
+            /* The debug version verifies the TLSBin as needed */
+            uint32_t objSize = getObjectSize(size);
+
+            if (activeBlk) {
+                MALLOC_ASSERT(activeBlk->isOwnedByCurrentThread(), ASSERT_TEXT);
+                MALLOC_ASSERT(activeBlk->objectSize == objSize, ASSERT_TEXT);
+#if MALLOC_DEBUG > 1
+                for (Block *temp = activeBlk->next; temp; temp = temp->next) {
+                    MALLOC_ASSERT(temp != activeBlk, ASSERT_TEXT);
+                    MALLOC_ASSERT(temp->isOwnedByCurrentThread(), ASSERT_TEXT);
+                    MALLOC_ASSERT(temp->objectSize == objSize, ASSERT_TEXT);
+                    MALLOC_ASSERT(temp->previous->next == temp, ASSERT_TEXT);
+                    if (temp->next) { MALLOC_ASSERT(temp->next->previous == temp, ASSERT_TEXT); }
+                }
+                for (Block *temp = activeBlk->previous; temp; temp = temp->previous) {
+                    MALLOC_ASSERT(temp != activeBlk, ASSERT_TEXT);
+                    MALLOC_ASSERT(temp->isOwnedByCurrentThread(), ASSERT_TEXT);
+                    MALLOC_ASSERT(temp->objectSize == objSize, ASSERT_TEXT);
+                    MALLOC_ASSERT(temp->next->previous == temp, ASSERT_TEXT);
+                    if (temp->previous) { MALLOC_ASSERT(temp->previous->next == temp, ASSERT_TEXT); }
+                }
+#endif /* MALLOC_DEBUG>1 */
             }
         }
-#endif /* MALLOC_DEBUG>1 */
-    }
-}
-#else /* MALLOC_DEBUG */
-inline void Bin::verifyTLSBin (size_t) const { }
+#else  /* MALLOC_DEBUG */
+        inline void Bin::verifyTLSBin(size_t) const {}
 #endif /* MALLOC_DEBUG */
 
-/*
+        /*
  * Add a block to the start of this tls bin list.
  */
-void Bin::pushTLSBin(Block* block)
-{
-    /* The objectSize should be defined and not a parameter
+        void Bin::pushTLSBin(Block *block) {
+            /* The objectSize should be defined and not a parameter
        because the function is applied to partially filled blocks as well */
-    unsigned int size = block->objectSize;
-
-    MALLOC_ASSERT( block->isOwnedByCurrentThread(), ASSERT_TEXT );
-    MALLOC_ASSERT( block->objectSize != 0, ASSERT_TEXT );
-    MALLOC_ASSERT( block->next == nullptr, ASSERT_TEXT );
-    MALLOC_ASSERT( block->previous == nullptr, ASSERT_TEXT );
-
-    MALLOC_ASSERT( this, ASSERT_TEXT );
-    verifyTLSBin(size);
-
-    block->next = activeBlk;
-    if( activeBlk ) {
-        block->previous = activeBlk->previous;
-        activeBlk->previous = block;
-        if( block->previous )
-            block->previous->next = block;
-    } else {
-        activeBlk = block;
-    }
+            unsigned int size = block->objectSize;
 
-    verifyTLSBin(size);
-}
+            MALLOC_ASSERT(block->isOwnedByCurrentThread(), ASSERT_TEXT);
+            MALLOC_ASSERT(block->objectSize != 0, ASSERT_TEXT);
+            MALLOC_ASSERT(block->next == nullptr, ASSERT_TEXT);
+            MALLOC_ASSERT(block->previous == nullptr, ASSERT_TEXT);
 
-/*
+            MALLOC_ASSERT(this, ASSERT_TEXT);
+            verifyTLSBin(size);
+
+            block->next = activeBlk;
+            if (activeBlk) {
+                block->previous = activeBlk->previous;
+                activeBlk->previous = block;
+                if (block->previous) block->previous->next = block;
+            } else {
+                activeBlk = block;
+            }
+
+            verifyTLSBin(size);
+        }
+
+        /*
  * Take a block out of its tls bin (e.g. before removal).
  */
-void Bin::outofTLSBin(Block* block)
-{
-    unsigned int size = block->objectSize;
+        void Bin::outofTLSBin(Block *block) {
+            unsigned int size = block->objectSize;
 
-    MALLOC_ASSERT( block->isOwnedByCurrentThread(), ASSERT_TEXT );
-    MALLOC_ASSERT( block->objectSize != 0, ASSERT_TEXT );
+            MALLOC_ASSERT(block->isOwnedByCurrentThread(), ASSERT_TEXT);
+            MALLOC_ASSERT(block->objectSize != 0, ASSERT_TEXT);
 
-    MALLOC_ASSERT( this, ASSERT_TEXT );
-    verifyTLSBin(size);
+            MALLOC_ASSERT(this, ASSERT_TEXT);
+            verifyTLSBin(size);
 
-    if (block == activeBlk) {
-        activeBlk = block->previous? block->previous : block->next;
-    }
-    /* Unlink the block */
-    if (block->previous) {
-        MALLOC_ASSERT( block->previous->next == block, ASSERT_TEXT );
-        block->previous->next = block->next;
-    }
-    if (block->next) {
-        MALLOC_ASSERT( block->next->previous == block, ASSERT_TEXT );
-        block->next->previous = block->previous;
-    }
-    block->next = nullptr;
-    block->previous = nullptr;
+            if (block == activeBlk) { activeBlk = block->previous ? block->previous : block->next; }
+            /* Unlink the block */
+            if (block->previous) {
+                MALLOC_ASSERT(block->previous->next == block, ASSERT_TEXT);
+                block->previous->next = block->next;
+            }
+            if (block->next) {
+                MALLOC_ASSERT(block->next->previous == block, ASSERT_TEXT);
+                block->next->previous = block->previous;
+            }
+            block->next = nullptr;
+            block->previous = nullptr;
 
-    verifyTLSBin(size);
-}
+            verifyTLSBin(size);
+        }
 
-Block* Bin::getPrivatizedFreeListBlock()
-{
-    Block* block;
-    MALLOC_ASSERT( this, ASSERT_TEXT );
-    // if this method is called, active block usage must be unsuccessful
-    MALLOC_ASSERT( (!activeBlk && !mailbox.load(std::memory_order_relaxed)) || (activeBlk && activeBlk->isFull), ASSERT_TEXT );
+        Block *Bin::getPrivatizedFreeListBlock() {
+            Block *block;
+            MALLOC_ASSERT(this, ASSERT_TEXT);
+            // if this method is called, active block usage must be unsuccessful
+            MALLOC_ASSERT((!activeBlk && !mailbox.load(std::memory_order_relaxed))
+                                  || (activeBlk && activeBlk->isFull),
+                          ASSERT_TEXT);
 
-// the counter should be changed    STAT_increment(getThreadId(), ThreadCommonCounters, lockPublicFreeList);
-    if (!mailbox.load(std::memory_order_acquire)) // hotpath is empty mailbox
-        return nullptr;
-    else { // mailbox is not empty, take lock and inspect it
-        MallocMutex::scoped_lock scoped_cs(mailLock);
-        block = mailbox.load(std::memory_order_relaxed);
-        if( block ) {
-            MALLOC_ASSERT( block->isOwnedByCurrentThread(), ASSERT_TEXT );
-            MALLOC_ASSERT( !isNotForUse(block->nextPrivatizable.load(std::memory_order_relaxed)), ASSERT_TEXT );
-            mailbox.store(block->nextPrivatizable.load(std::memory_order_relaxed), std::memory_order_relaxed);
-            block->nextPrivatizable.store((Block*)this, std::memory_order_relaxed);
+            // the counter should be changed    STAT_increment(getThreadId(), ThreadCommonCounters, lockPublicFreeList);
+            if (!mailbox.load(std::memory_order_acquire))// hotpath is empty mailbox
+                return nullptr;
+            else {// mailbox is not empty, take lock and inspect it
+                MallocMutex::scoped_lock scoped_cs(mailLock);
+                block = mailbox.load(std::memory_order_relaxed);
+                if (block) {
+                    MALLOC_ASSERT(block->isOwnedByCurrentThread(), ASSERT_TEXT);
+                    MALLOC_ASSERT(!isNotForUse(block->nextPrivatizable.load(std::memory_order_relaxed)),
+                                  ASSERT_TEXT);
+                    mailbox.store(block->nextPrivatizable.load(std::memory_order_relaxed),
+                                  std::memory_order_relaxed);
+                    block->nextPrivatizable.store((Block *) this, std::memory_order_relaxed);
+                }
+            }
+            if (block) {
+                MALLOC_ASSERT(isSolidPtr(block->publicFreeList.load(std::memory_order_relaxed)), ASSERT_TEXT);
+                block->privatizePublicFreeList();
+                block->adjustPositionInBin(this);
+            }
+            return block;
         }
-    }
-    if( block ) {
-        MALLOC_ASSERT( isSolidPtr(block->publicFreeList.load(std::memory_order_relaxed)), ASSERT_TEXT );
-        block->privatizePublicFreeList();
-        block->adjustPositionInBin(this);
-    }
-    return block;
-}
 
-void Bin::addPublicFreeListBlock(Block* block)
-{
-    MallocMutex::scoped_lock scoped_cs(mailLock);
-    block->nextPrivatizable.store(mailbox.load(std::memory_order_relaxed), std::memory_order_relaxed);
-    mailbox.store(block, std::memory_order_relaxed);
-}
+        void Bin::addPublicFreeListBlock(Block *block) {
+            MallocMutex::scoped_lock scoped_cs(mailLock);
+            block->nextPrivatizable.store(mailbox.load(std::memory_order_relaxed), std::memory_order_relaxed);
+            mailbox.store(block, std::memory_order_relaxed);
+        }
 
-// Process publicly freed objects in all blocks and return empty blocks
-// to the backend in order to reduce overall footprint.
-bool Bin::cleanPublicFreeLists()
-{
-    Block* block;
-    if (!mailbox.load(std::memory_order_acquire))
-        return false;
-    else {
-        // Grab all the blocks in the mailbox
-        MallocMutex::scoped_lock scoped_cs(mailLock);
-        block = mailbox.load(std::memory_order_relaxed);
-        mailbox.store(nullptr, std::memory_order_relaxed);
-    }
-    bool released = false;
-    while (block) {
-        MALLOC_ASSERT( block->isOwnedByCurrentThread(), ASSERT_TEXT );
-        Block* tmp = block->nextPrivatizable.load(std::memory_order_relaxed);
-        block->nextPrivatizable.store((Block*)this, std::memory_order_relaxed);
-        block->privatizePublicFreeList();
-        if (block->empty()) {
-            processEmptyBlock(block, /*poolTheBlock=*/false);
-            released = true;
-        } else
-            block->adjustPositionInBin(this);
-        block = tmp;
-    }
-    return released;
-}
+        // Process publicly freed objects in all blocks and return empty blocks
+        // to the backend in order to reduce overall footprint.
+        bool Bin::cleanPublicFreeLists() {
+            Block *block;
+            if (!mailbox.load(std::memory_order_acquire)) return false;
+            else {
+                // Grab all the blocks in the mailbox
+                MallocMutex::scoped_lock scoped_cs(mailLock);
+                block = mailbox.load(std::memory_order_relaxed);
+                mailbox.store(nullptr, std::memory_order_relaxed);
+            }
+            bool released = false;
+            while (block) {
+                MALLOC_ASSERT(block->isOwnedByCurrentThread(), ASSERT_TEXT);
+                Block *tmp = block->nextPrivatizable.load(std::memory_order_relaxed);
+                block->nextPrivatizable.store((Block *) this, std::memory_order_relaxed);
+                block->privatizePublicFreeList();
+                if (block->empty()) {
+                    processEmptyBlock(block, /*poolTheBlock=*/false);
+                    released = true;
+                } else
+                    block->adjustPositionInBin(this);
+                block = tmp;
+            }
+            return released;
+        }
 
-bool Block::adjustFullness()
-{
-    if (bumpPtr) {
-        /* If we are still using a bump ptr for this block it is empty enough to use. */
-        STAT_increment(getThreadId(), getIndex(objectSize), examineEmptyEnough);
-        isFull = false;
-    } else {
-        const float threshold = (slabSize - sizeof(Block)) * (1 - emptyEnoughRatio);
-        /* allocatedCount shows how many objects in the block are in use; however it still counts
+        bool Block::adjustFullness() {
+            if (bumpPtr) {
+                /* If we are still using a bump ptr for this block it is empty enough to use. */
+                STAT_increment(getThreadId(), getIndex(objectSize), examineEmptyEnough);
+                isFull = false;
+            } else {
+                const float threshold = (slabSize - sizeof(Block)) * (1 - emptyEnoughRatio);
+                /* allocatedCount shows how many objects in the block are in use; however it still counts
          * blocks freed by other threads; so prior call to privatizePublicFreeList() is recommended */
-        isFull = (allocatedCount*objectSize > threshold) ? true : false;
+                isFull = (allocatedCount * objectSize > threshold) ? true : false;
 #if COLLECT_STATISTICS
-        if (isFull)
-            STAT_increment(getThreadId(), getIndex(objectSize), examineNotEmpty);
-        else
-            STAT_increment(getThreadId(), getIndex(objectSize), examineEmptyEnough);
+                if (isFull) STAT_increment(getThreadId(), getIndex(objectSize), examineNotEmpty);
+                else
+                    STAT_increment(getThreadId(), getIndex(objectSize), examineEmptyEnough);
 #endif
-    }
-    return isFull;
-}
+            }
+            return isFull;
+        }
 
-// This method resides in class Block, and not in class Bin, in order to avoid
-// calling getAllocationBin on a reasonably hot path in Block::freeOwnObject
-void Block::adjustPositionInBin(Bin* bin/*=nullptr*/)
-{
-    // If the block were full, but became empty enough to use,
-    // move it to the front of the list
-    if (isFull && !adjustFullness()) {
-        if (!bin)
-            bin = tlsPtr.load(std::memory_order_relaxed)->getAllocationBin(objectSize);
-        bin->moveBlockToFront(this);
-    }
-}
+        // This method resides in class Block, and not in class Bin, in order to avoid
+        // calling getAllocationBin on a reasonably hot path in Block::freeOwnObject
+        void Block::adjustPositionInBin(Bin *bin /*=nullptr*/) {
+            // If the block were full, but became empty enough to use,
+            // move it to the front of the list
+            if (isFull && !adjustFullness()) {
+                if (!bin) bin = tlsPtr.load(std::memory_order_relaxed)->getAllocationBin(objectSize);
+                bin->moveBlockToFront(this);
+            }
+        }
 
-/* Restore the bump pointer for an empty block that is planned to use */
-void Block::restoreBumpPtr()
-{
-    MALLOC_ASSERT( allocatedCount == 0, ASSERT_TEXT );
-    MALLOC_ASSERT( !isSolidPtr(publicFreeList.load(std::memory_order_relaxed)), ASSERT_TEXT );
-    STAT_increment(getThreadId(), getIndex(objectSize), freeRestoreBumpPtr);
-    bumpPtr = (FreeObject *)((uintptr_t)this + slabSize - objectSize);
-    freeList = nullptr;
-    isFull = false;
-}
+        /* Restore the bump pointer for an empty block that is planned to use */
+        void Block::restoreBumpPtr() {
+            MALLOC_ASSERT(allocatedCount == 0, ASSERT_TEXT);
+            MALLOC_ASSERT(!isSolidPtr(publicFreeList.load(std::memory_order_relaxed)), ASSERT_TEXT);
+            STAT_increment(getThreadId(), getIndex(objectSize), freeRestoreBumpPtr);
+            bumpPtr = (FreeObject *) ((uintptr_t) this + slabSize - objectSize);
+            freeList = nullptr;
+            isFull = false;
+        }
 
-void Block::freeOwnObject(void *object)
-{
-    tlsPtr.load(std::memory_order_relaxed)->markUsed();
-    allocatedCount--;
-    MALLOC_ASSERT( allocatedCount < (slabSize-sizeof(Block))/objectSize, ASSERT_TEXT );
+        void Block::freeOwnObject(void *object) {
+            tlsPtr.load(std::memory_order_relaxed)->markUsed();
+            allocatedCount--;
+            MALLOC_ASSERT(allocatedCount < (slabSize - sizeof(Block)) / objectSize, ASSERT_TEXT);
 #if COLLECT_STATISTICS
-    // Note that getAllocationBin is not called on the hottest path with statistics off.
-    if (tlsPtr.load(std::memory_order_relaxed)->getAllocationBin(objectSize)->getActiveBlock() != this)
-        STAT_increment(getThreadId(), getIndex(objectSize), freeToInactiveBlock);
-    else
-        STAT_increment(getThreadId(), getIndex(objectSize), freeToActiveBlock);
+            // Note that getAllocationBin is not called on the hottest path with statistics off.
+            if (tlsPtr.load(std::memory_order_relaxed)->getAllocationBin(objectSize)->getActiveBlock()
+                != this)
+                STAT_increment(getThreadId(), getIndex(objectSize), freeToInactiveBlock);
+            else
+                STAT_increment(getThreadId(), getIndex(objectSize), freeToActiveBlock);
 #endif
-    if (empty()) {
-        // If the last object of a slab is freed, the slab cannot be marked full
-        MALLOC_ASSERT(!isFull, ASSERT_TEXT);
-        tlsPtr.load(std::memory_order_relaxed)->getAllocationBin(objectSize)->processEmptyBlock(this, /*poolTheBlock=*/true);
-    } else { // hot path
-        FreeObject *objectToFree = findObjectToFree(object);
-        objectToFree->next = freeList;
-        freeList = objectToFree;
-        adjustPositionInBin();
-    }
-}
+            if (empty()) {
+                // If the last object of a slab is freed, the slab cannot be marked full
+                MALLOC_ASSERT(!isFull, ASSERT_TEXT);
+                tlsPtr.load(std::memory_order_relaxed)
+                        ->getAllocationBin(objectSize)
+                        ->processEmptyBlock(this, /*poolTheBlock=*/true);
+            } else {// hot path
+                FreeObject *objectToFree = findObjectToFree(object);
+                objectToFree->next = freeList;
+                freeList = objectToFree;
+                adjustPositionInBin();
+            }
+        }
 
-void Block::freePublicObject (FreeObject *objectToFree)
-{
-    FreeObject* localPublicFreeList{};
+        void Block::freePublicObject(FreeObject *objectToFree) {
+            FreeObject *localPublicFreeList {};
 
-    MALLOC_ITT_SYNC_RELEASING(&publicFreeList);
+            MALLOC_ITT_SYNC_RELEASING(&publicFreeList);
 #if FREELIST_NONBLOCKING
-    // TBB_REVAMP_TODO: make it non atomic in non-blocking scenario
-    localPublicFreeList = publicFreeList.load(std::memory_order_relaxed);
-    do {
-        objectToFree->next = localPublicFreeList;
-        // no backoff necessary because trying to make change, not waiting for a change
-    } while( !publicFreeList.compare_exchange_strong(localPublicFreeList, objectToFree) );
+            // TBB_REVAMP_TODO: make it non atomic in non-blocking scenario
+            localPublicFreeList = publicFreeList.load(std::memory_order_relaxed);
+            do {
+                objectToFree->next = localPublicFreeList;
+                // no backoff necessary because trying to make change, not waiting for a change
+            } while (!publicFreeList.compare_exchange_strong(localPublicFreeList, objectToFree));
 #else
-    STAT_increment(getThreadId(), ThreadCommonCounters, lockPublicFreeList);
-    {
-        MallocMutex::scoped_lock scoped_cs(publicFreeListLock);
-        localPublicFreeList = objectToFree->next = publicFreeList;
-        publicFreeList = objectToFree;
-    }
+            STAT_increment(getThreadId(), ThreadCommonCounters, lockPublicFreeList);
+            {
+                MallocMutex::scoped_lock scoped_cs(publicFreeListLock);
+                localPublicFreeList = objectToFree->next = publicFreeList;
+                publicFreeList = objectToFree;
+            }
 #endif
 
-    if( localPublicFreeList==nullptr ) {
-        // if the block is abandoned, its nextPrivatizable pointer should be UNUSABLE
-        // otherwise, it should point to the bin the block belongs to.
-        // reading nextPrivatizable is thread-safe below, because:
-        // 1) the executing thread atomically got publicFreeList==nullptr and changed it to non-nullptr;
-        // 2) only owning thread can change it back to nullptr,
-        // 3) but it can not be done until the block is put to the mailbox
-        // So the executing thread is now the only one that can change nextPrivatizable
-        Block* next = nextPrivatizable.load(std::memory_order_acquire);
-        if( !isNotForUse(next) ) {
-            MALLOC_ASSERT( next!=nullptr, ASSERT_TEXT );
-            Bin* theBin = (Bin*) next;
+            if (localPublicFreeList == nullptr) {
+                // if the block is abandoned, its nextPrivatizable pointer should be UNUSABLE
+                // otherwise, it should point to the bin the block belongs to.
+                // reading nextPrivatizable is thread-safe below, because:
+                // 1) the executing thread atomically got publicFreeList==nullptr and changed it to non-nullptr;
+                // 2) only owning thread can change it back to nullptr,
+                // 3) but it can not be done until the block is put to the mailbox
+                // So the executing thread is now the only one that can change nextPrivatizable
+                Block *next = nextPrivatizable.load(std::memory_order_acquire);
+                if (!isNotForUse(next)) {
+                    MALLOC_ASSERT(next != nullptr, ASSERT_TEXT);
+                    Bin *theBin = (Bin *) next;
 #if MALLOC_DEBUG && TBB_REVAMP_TODO
-            // FIXME: The thread that returns the block is not the block's owner.
-            // The below assertion compares 'theBin' against the caller's local bin, thus, it always fails.
-            // Need to find a way to get the correct remote bin for comparison.
-            { // check that nextPrivatizable points to the bin the block belongs to
-                uint32_t index = getIndex( objectSize );
-                TLSData* tls = getThreadMallocTLS();
-                MALLOC_ASSERT( theBin==tls->bin+index, ASSERT_TEXT );
+                    // FIXME: The thread that returns the block is not the block's owner.
+                    // The below assertion compares 'theBin' against the caller's local bin, thus, it always fails.
+                    // Need to find a way to get the correct remote bin for comparison.
+                    {// check that nextPrivatizable points to the bin the block belongs to
+                        uint32_t index = getIndex(objectSize);
+                        TLSData *tls = getThreadMallocTLS();
+                        MALLOC_ASSERT(theBin == tls->bin + index, ASSERT_TEXT);
+                    }
+#endif// MALLOC_DEBUG
+                    theBin->addPublicFreeListBlock(this);
+                }
             }
-#endif // MALLOC_DEBUG
-            theBin->addPublicFreeListBlock(this);
+            STAT_increment(getThreadId(), ThreadCommonCounters, freeToOtherThread);
+            STAT_increment(ownerTid.load(std::memory_order_relaxed), getIndex(objectSize), freeByOtherThread);
         }
-    }
-    STAT_increment(getThreadId(), ThreadCommonCounters, freeToOtherThread);
-    STAT_increment(ownerTid.load(std::memory_order_relaxed), getIndex(objectSize), freeByOtherThread);
-}
 
-// Make objects freed by other threads available for use again
-void Block::privatizePublicFreeList( bool reset )
-{
-    FreeObject *localPublicFreeList;
-    // If reset is false, publicFreeList should not be zeroed but set to UNUSABLE
-    // to properly synchronize with other threads freeing objects to this slab.
-    const intptr_t endMarker = reset ? 0 : UNUSABLE;
+        // Make objects freed by other threads available for use again
+        void Block::privatizePublicFreeList(bool reset) {
+            FreeObject *localPublicFreeList;
+            // If reset is false, publicFreeList should not be zeroed but set to UNUSABLE
+            // to properly synchronize with other threads freeing objects to this slab.
+            const intptr_t endMarker = reset ? 0 : UNUSABLE;
 
-    // Only the owner thread may reset the pointer to nullptr
-    MALLOC_ASSERT( isOwnedByCurrentThread() || !reset, ASSERT_TEXT );
+            // Only the owner thread may reset the pointer to nullptr
+            MALLOC_ASSERT(isOwnedByCurrentThread() || !reset, ASSERT_TEXT);
 #if FREELIST_NONBLOCKING
-    localPublicFreeList = publicFreeList.exchange((FreeObject*)endMarker);
+            localPublicFreeList = publicFreeList.exchange((FreeObject *) endMarker);
 #else
-    STAT_increment(getThreadId(), ThreadCommonCounters, lockPublicFreeList);
-    {
-        MallocMutex::scoped_lock scoped_cs(publicFreeListLock);
-        localPublicFreeList = publicFreeList;
-        publicFreeList = endMarker;
-    }
+            STAT_increment(getThreadId(), ThreadCommonCounters, lockPublicFreeList);
+            {
+                MallocMutex::scoped_lock scoped_cs(publicFreeListLock);
+                localPublicFreeList = publicFreeList;
+                publicFreeList = endMarker;
+            }
 #endif
-    MALLOC_ITT_SYNC_ACQUIRED(&publicFreeList);
-    MALLOC_ASSERT( !(reset && isNotForUse(publicFreeList)), ASSERT_TEXT );
-
-    // publicFreeList must have been UNUSABLE or valid, but not nullptr
-    MALLOC_ASSERT( localPublicFreeList!=nullptr, ASSERT_TEXT );
-    if( isSolidPtr(localPublicFreeList) ) {
-        MALLOC_ASSERT( allocatedCount <= (slabSize-sizeof(Block))/objectSize, ASSERT_TEXT );
-        /* other threads did not change the counter freeing our blocks */
-        allocatedCount--;
-        FreeObject *temp = localPublicFreeList;
-        while( isSolidPtr(temp->next) ){ // the list will end with either nullptr or UNUSABLE
-            temp = temp->next;
-            allocatedCount--;
-            MALLOC_ASSERT( allocatedCount < (slabSize-sizeof(Block))/objectSize, ASSERT_TEXT );
+            MALLOC_ITT_SYNC_ACQUIRED(&publicFreeList);
+            MALLOC_ASSERT(!(reset && isNotForUse(publicFreeList)), ASSERT_TEXT);
+
+            // publicFreeList must have been UNUSABLE or valid, but not nullptr
+            MALLOC_ASSERT(localPublicFreeList != nullptr, ASSERT_TEXT);
+            if (isSolidPtr(localPublicFreeList)) {
+                MALLOC_ASSERT(allocatedCount <= (slabSize - sizeof(Block)) / objectSize, ASSERT_TEXT);
+                /* other threads did not change the counter freeing our blocks */
+                allocatedCount--;
+                FreeObject *temp = localPublicFreeList;
+                while (isSolidPtr(temp->next)) {// the list will end with either nullptr or UNUSABLE
+                    temp = temp->next;
+                    allocatedCount--;
+                    MALLOC_ASSERT(allocatedCount < (slabSize - sizeof(Block)) / objectSize, ASSERT_TEXT);
+                }
+                /* merge with local freeList */
+                temp->next = freeList;
+                freeList = localPublicFreeList;
+                STAT_increment(getThreadId(), getIndex(objectSize), allocPrivatized);
+            }
         }
-        /* merge with local freeList */
-        temp->next = freeList;
-        freeList = localPublicFreeList;
-        STAT_increment(getThreadId(), getIndex(objectSize), allocPrivatized);
-    }
-}
-
-void Block::privatizeOrphaned(TLSData *tls, unsigned index)
-{
-    Bin* bin = tls->bin + index;
-    STAT_increment(getThreadId(), index, allocBlockPublic);
-    next = nullptr;
-    previous = nullptr;
-    MALLOC_ASSERT( publicFreeList.load(std::memory_order_relaxed) != nullptr, ASSERT_TEXT );
-    /* There is not a race here since no other thread owns this block */
-    markOwned(tls);
-    // It is safe to change nextPrivatizable, as publicFreeList is not null
-    MALLOC_ASSERT( isNotForUse(nextPrivatizable.load(std::memory_order_relaxed)), ASSERT_TEXT );
-    nextPrivatizable.store((Block*)bin, std::memory_order_relaxed);
-    // the next call is required to change publicFreeList to 0
-    privatizePublicFreeList();
-    if( empty() ) {
-        restoreBumpPtr();
-    } else {
-        adjustFullness(); // check the block fullness and set isFull
-    }
-    MALLOC_ASSERT( !isNotForUse(publicFreeList.load(std::memory_order_relaxed)), ASSERT_TEXT );
-}
 
+        void Block::privatizeOrphaned(TLSData *tls, unsigned index) {
+            Bin *bin = tls->bin + index;
+            STAT_increment(getThreadId(), index, allocBlockPublic);
+            next = nullptr;
+            previous = nullptr;
+            MALLOC_ASSERT(publicFreeList.load(std::memory_order_relaxed) != nullptr, ASSERT_TEXT);
+            /* There is not a race here since no other thread owns this block */
+            markOwned(tls);
+            // It is safe to change nextPrivatizable, as publicFreeList is not null
+            MALLOC_ASSERT(isNotForUse(nextPrivatizable.load(std::memory_order_relaxed)), ASSERT_TEXT);
+            nextPrivatizable.store((Block *) bin, std::memory_order_relaxed);
+            // the next call is required to change publicFreeList to 0
+            privatizePublicFreeList();
+            if (empty()) {
+                restoreBumpPtr();
+            } else {
+                adjustFullness();// check the block fullness and set isFull
+            }
+            MALLOC_ASSERT(!isNotForUse(publicFreeList.load(std::memory_order_relaxed)), ASSERT_TEXT);
+        }
 
-bool Block::readyToShare()
-{
-    FreeObject* oldVal = nullptr;
+        bool Block::readyToShare() {
+            FreeObject *oldVal = nullptr;
 #if FREELIST_NONBLOCKING
-    publicFreeList.compare_exchange_strong(oldVal, (FreeObject*)UNUSABLE);
+            publicFreeList.compare_exchange_strong(oldVal, (FreeObject *) UNUSABLE);
 #else
-    STAT_increment(getThreadId(), ThreadCommonCounters, lockPublicFreeList);
-    {
-        MallocMutex::scoped_lock scoped_cs(publicFreeListLock);
-        if ( (oldVal=publicFreeList)==nullptr )
-            publicFreeList = reinterpret_cast<FreeObject *>(UNUSABLE);
-    }
+            STAT_increment(getThreadId(), ThreadCommonCounters, lockPublicFreeList);
+            {
+                MallocMutex::scoped_lock scoped_cs(publicFreeListLock);
+                if ((oldVal = publicFreeList) == nullptr)
+                    publicFreeList = reinterpret_cast<FreeObject *>(UNUSABLE);
+            }
 #endif
-    return oldVal==nullptr;
-}
+            return oldVal == nullptr;
+        }
 
-void Block::shareOrphaned(intptr_t binTag, unsigned index)
-{
-    MALLOC_ASSERT( binTag, ASSERT_TEXT );
-    // unreferenced formal parameter warning
-    tbb::detail::suppress_unused_warning(index);
-    STAT_increment(getThreadId(), index, freeBlockPublic);
-    markOrphaned();
-    if ((intptr_t)nextPrivatizable.load(std::memory_order_relaxed) == binTag) {
-        // First check passed: the block is not in mailbox yet.
-        // Need to set publicFreeList to non-zero, so other threads
-        // will not change nextPrivatizable and it can be zeroed.
-        if ( !readyToShare() ) {
-            // another thread freed an object; we need to wait until it finishes.
-            // There is no need for exponential backoff, as the wait here is not for a lock;
-            // but need to yield, so the thread we wait has a chance to run.
-            // TODO: add a pause to also be friendly to hyperthreads
-            int count = 256;
-            while ((intptr_t)nextPrivatizable.load(std::memory_order_relaxed) == binTag) {
-                if (--count==0) {
-                    do_yield();
-                    count = 256;
+        void Block::shareOrphaned(intptr_t binTag, unsigned index) {
+            MALLOC_ASSERT(binTag, ASSERT_TEXT);
+            // unreferenced formal parameter warning
+            tbb::detail::suppress_unused_warning(index);
+            STAT_increment(getThreadId(), index, freeBlockPublic);
+            markOrphaned();
+            if ((intptr_t) nextPrivatizable.load(std::memory_order_relaxed) == binTag) {
+                // First check passed: the block is not in mailbox yet.
+                // Need to set publicFreeList to non-zero, so other threads
+                // will not change nextPrivatizable and it can be zeroed.
+                if (!readyToShare()) {
+                    // another thread freed an object; we need to wait until it finishes.
+                    // There is no need for exponential backoff, as the wait here is not for a lock;
+                    // but need to yield, so the thread we wait has a chance to run.
+                    // TODO: add a pause to also be friendly to hyperthreads
+                    int count = 256;
+                    while ((intptr_t) nextPrivatizable.load(std::memory_order_relaxed) == binTag) {
+                        if (--count == 0) {
+                            do_yield();
+                            count = 256;
+                        }
+                    }
                 }
             }
+            MALLOC_ASSERT(publicFreeList.load(std::memory_order_relaxed) != nullptr, ASSERT_TEXT);
+            // now it is safe to change our data
+            previous = nullptr;
+            // it is caller responsibility to ensure that the list of blocks
+            // formed by nextPrivatizable pointers is kept consistent if required.
+            // if only called from thread shutdown code, it does not matter.
+            nextPrivatizable.store((Block *) UNUSABLE, std::memory_order_relaxed);
         }
-    }
-    MALLOC_ASSERT( publicFreeList.load(std::memory_order_relaxed) !=nullptr, ASSERT_TEXT );
-    // now it is safe to change our data
-    previous = nullptr;
-    // it is caller responsibility to ensure that the list of blocks
-    // formed by nextPrivatizable pointers is kept consistent if required.
-    // if only called from thread shutdown code, it does not matter.
-    nextPrivatizable.store((Block*)UNUSABLE, std::memory_order_relaxed);
-}
-
-void Block::cleanBlockHeader()
-{
-    next = nullptr;
-    previous = nullptr;
-    freeList = nullptr;
-    allocatedCount = 0;
-    isFull = false;
-    tlsPtr.store(nullptr, std::memory_order_relaxed);
-
-    publicFreeList.store(nullptr, std::memory_order_relaxed);
-}
-
-void Block::initEmptyBlock(TLSData *tls, size_t size)
-{
-    // Having getIndex and getObjectSize called next to each other
-    // allows better compiler optimization as they basically share the code.
-    unsigned int index = getIndex(size);
-    unsigned int objSz = getObjectSize(size);
-
-    cleanBlockHeader();
-    MALLOC_ASSERT(objSz <= USHRT_MAX, "objSz must not be less 2^16-1");
-    objectSize = objSz;
-    markOwned(tls);
-    // bump pointer should be prepared for first allocation - thus mode it down to objectSize
-    bumpPtr = (FreeObject *)((uintptr_t)this + slabSize - objectSize);
-
-    // each block should have the address where the head of the list of "privatizable" blocks is kept
-    // the only exception is a block for boot strap which is initialized when TLS is yet nullptr
-    nextPrivatizable.store( tls? (Block*)(tls->bin + index) : nullptr, std::memory_order_relaxed);
-    TRACEF(( "[ScalableMalloc trace] Empty block %p is initialized, owner is %ld, objectSize is %d, bumpPtr is %p\n",
-             this, tlsPtr.load(std::memory_order_relaxed) ? getThreadId() : -1, objectSize, bumpPtr ));
-}
 
-Block *OrphanedBlocks::get(TLSData *tls, unsigned int size)
-{
-    // TODO: try to use index from getAllocationBin
-    unsigned int index = getIndex(size);
-    Block *block = bins[index].pop();
-    if (block) {
-        MALLOC_ITT_SYNC_ACQUIRED(bins+index);
-        block->privatizeOrphaned(tls, index);
-    }
-    return block;
-}
+        void Block::cleanBlockHeader() {
+            next = nullptr;
+            previous = nullptr;
+            freeList = nullptr;
+            allocatedCount = 0;
+            isFull = false;
+            tlsPtr.store(nullptr, std::memory_order_relaxed);
 
-void OrphanedBlocks::put(intptr_t binTag, Block *block)
-{
-    unsigned int index = getIndex(block->getSize());
-    block->shareOrphaned(binTag, index);
-    MALLOC_ITT_SYNC_RELEASING(bins+index);
-    bins[index].push(block);
-}
+            publicFreeList.store(nullptr, std::memory_order_relaxed);
+        }
 
-void OrphanedBlocks::reset()
-{
-    for (uint32_t i=0; i<numBlockBinLimit; i++)
-        new (bins+i) LifoList();
-}
+        void Block::initEmptyBlock(TLSData *tls, size_t size) {
+            // Having getIndex and getObjectSize called next to each other
+            // allows better compiler optimization as they basically share the code.
+            unsigned int index = getIndex(size);
+            unsigned int objSz = getObjectSize(size);
+
+            cleanBlockHeader();
+            MALLOC_ASSERT(objSz <= USHRT_MAX, "objSz must not be less 2^16-1");
+            objectSize = objSz;
+            markOwned(tls);
+            // bump pointer should be prepared for first allocation - thus mode it down to objectSize
+            bumpPtr = (FreeObject *) ((uintptr_t) this + slabSize - objectSize);
+
+            // each block should have the address where the head of the list of "privatizable" blocks is kept
+            // the only exception is a block for boot strap which is initialized when TLS is yet nullptr
+            nextPrivatizable.store(tls ? (Block *) (tls->bin + index) : nullptr, std::memory_order_relaxed);
+            TRACEF(("[ScalableMalloc trace] Empty block %p is initialized, owner is %ld, objectSize is %d, "
+                    "bumpPtr is %p\n",
+                    this, tlsPtr.load(std::memory_order_relaxed) ? getThreadId() : -1, objectSize, bumpPtr));
+        }
 
-bool OrphanedBlocks::cleanup(Backend* backend)
-{
-    bool released = false;
-    for (uint32_t i=0; i<numBlockBinLimit; i++) {
-        Block* block = bins[i].grab();
-        MALLOC_ITT_SYNC_ACQUIRED(bins+i);
-        while (block) {
-            Block* next = block->next;
-            block->privatizePublicFreeList( /*reset=*/false ); // do not set publicFreeList to nullptr
-            if (block->empty()) {
-                block->reset();
-                // slab blocks in user's pools do not have valid backRefIdx
-                if (!backend->inUserPool())
-                    removeBackRef(*(block->getBackRefIdx()));
-                backend->putSlabBlock(block);
-                released = true;
-            } else {
-                MALLOC_ITT_SYNC_RELEASING(bins+i);
-                bins[i].push(block);
+        Block *OrphanedBlocks::get(TLSData *tls, unsigned int size) {
+            // TODO: try to use index from getAllocationBin
+            unsigned int index = getIndex(size);
+            Block *block = bins[index].pop();
+            if (block) {
+                MALLOC_ITT_SYNC_ACQUIRED(bins + index);
+                block->privatizeOrphaned(tls, index);
             }
-            block = next;
+            return block;
         }
-    }
-    return released;
-}
 
-FreeBlockPool::ResOfGet FreeBlockPool::getBlock()
-{
-    Block *b = head.exchange(nullptr);
-    bool lastAccessMiss;
-
-    if (b) {
-        size--;
-        Block *newHead = b->next;
-        lastAccessMiss = false;
-        head.store(newHead, std::memory_order_release);
-    } else {
-        lastAccessMiss = true;
-    }
-    return ResOfGet(b, lastAccessMiss);
-}
+        void OrphanedBlocks::put(intptr_t binTag, Block *block) {
+            unsigned int index = getIndex(block->getSize());
+            block->shareOrphaned(binTag, index);
+            MALLOC_ITT_SYNC_RELEASING(bins + index);
+            bins[index].push(block);
+        }
 
-void FreeBlockPool::returnBlock(Block *block)
-{
-    MALLOC_ASSERT( size <= POOL_HIGH_MARK, ASSERT_TEXT );
-    Block *localHead = head.exchange(nullptr);
-
-    if (!localHead) {
-        size = 0; // head was stolen by externalClean, correct size accordingly
-    } else if (size == POOL_HIGH_MARK) {
-        // release cold blocks and add hot one,
-        // so keep POOL_LOW_MARK-1 blocks and add new block to head
-        Block *headToFree = localHead, *helper;
-        for (int i=0; i<POOL_LOW_MARK-2; i++)
-            headToFree = headToFree->next;
-        Block *last = headToFree;
-        headToFree = headToFree->next;
-        last->next = nullptr;
-        size = POOL_LOW_MARK-1;
-        for (Block *currBl = headToFree; currBl; currBl = helper) {
-            helper = currBl->next;
-            // slab blocks in user's pools do not have valid backRefIdx
-            if (!backend->inUserPool())
-                removeBackRef(currBl->backRefIdx);
-            backend->putSlabBlock(currBl);
+        void OrphanedBlocks::reset() {
+            for (uint32_t i = 0; i < numBlockBinLimit; i++) new (bins + i) LifoList();
         }
-    }
-    size++;
-    block->next = localHead;
-    head.store(block, std::memory_order_release);
-}
 
-bool FreeBlockPool::externalCleanup()
-{
-    Block *helper;
-    bool released = false;
+        bool OrphanedBlocks::cleanup(Backend *backend) {
+            bool released = false;
+            for (uint32_t i = 0; i < numBlockBinLimit; i++) {
+                Block *block = bins[i].grab();
+                MALLOC_ITT_SYNC_ACQUIRED(bins + i);
+                while (block) {
+                    Block *next = block->next;
+                    block->privatizePublicFreeList(/*reset=*/false);// do not set publicFreeList to nullptr
+                    if (block->empty()) {
+                        block->reset();
+                        // slab blocks in user's pools do not have valid backRefIdx
+                        if (!backend->inUserPool()) removeBackRef(*(block->getBackRefIdx()));
+                        backend->putSlabBlock(block);
+                        released = true;
+                    } else {
+                        MALLOC_ITT_SYNC_RELEASING(bins + i);
+                        bins[i].push(block);
+                    }
+                    block = next;
+                }
+            }
+            return released;
+        }
 
-    for (Block *currBl=head.exchange(nullptr); currBl; currBl=helper) {
-        helper = currBl->next;
-        // slab blocks in user's pools do not have valid backRefIdx
-        if (!backend->inUserPool())
-            removeBackRef(currBl->backRefIdx);
-        backend->putSlabBlock(currBl);
-        released = true;
-    }
-    return released;
-}
+        FreeBlockPool::ResOfGet FreeBlockPool::getBlock() {
+            Block *b = head.exchange(nullptr);
+            bool lastAccessMiss;
 
-/* Prepare the block for returning to FreeBlockPool */
-void Block::reset()
-{
-    // it is caller's responsibility to ensure no data is lost before calling this
-    MALLOC_ASSERT( allocatedCount==0, ASSERT_TEXT );
-    MALLOC_ASSERT( !isSolidPtr(publicFreeList.load(std::memory_order_relaxed)), ASSERT_TEXT );
-    if (!isStartupAllocObject())
-        STAT_increment(getThreadId(), getIndex(objectSize), freeBlockBack);
+            if (b) {
+                size--;
+                Block *newHead = b->next;
+                lastAccessMiss = false;
+                head.store(newHead, std::memory_order_release);
+            } else {
+                lastAccessMiss = true;
+            }
+            return ResOfGet(b, lastAccessMiss);
+        }
 
-    cleanBlockHeader();
+        void FreeBlockPool::returnBlock(Block *block) {
+            MALLOC_ASSERT(size <= POOL_HIGH_MARK, ASSERT_TEXT);
+            Block *localHead = head.exchange(nullptr);
+
+            if (!localHead) {
+                size = 0;// head was stolen by externalClean, correct size accordingly
+            } else if (size == POOL_HIGH_MARK) {
+                // release cold blocks and add hot one,
+                // so keep POOL_LOW_MARK-1 blocks and add new block to head
+                Block *headToFree = localHead, *helper;
+                for (int i = 0; i < POOL_LOW_MARK - 2; i++) headToFree = headToFree->next;
+                Block *last = headToFree;
+                headToFree = headToFree->next;
+                last->next = nullptr;
+                size = POOL_LOW_MARK - 1;
+                for (Block *currBl = headToFree; currBl; currBl = helper) {
+                    helper = currBl->next;
+                    // slab blocks in user's pools do not have valid backRefIdx
+                    if (!backend->inUserPool()) removeBackRef(currBl->backRefIdx);
+                    backend->putSlabBlock(currBl);
+                }
+            }
+            size++;
+            block->next = localHead;
+            head.store(block, std::memory_order_release);
+        }
 
-    nextPrivatizable.store(nullptr, std::memory_order_relaxed);
+        bool FreeBlockPool::externalCleanup() {
+            Block *helper;
+            bool released = false;
 
-    objectSize = 0;
-    // for an empty block, bump pointer should point right after the end of the block
-    bumpPtr = (FreeObject *)((uintptr_t)this + slabSize);
-}
+            for (Block *currBl = head.exchange(nullptr); currBl; currBl = helper) {
+                helper = currBl->next;
+                // slab blocks in user's pools do not have valid backRefIdx
+                if (!backend->inUserPool()) removeBackRef(currBl->backRefIdx);
+                backend->putSlabBlock(currBl);
+                released = true;
+            }
+            return released;
+        }
 
-inline void Bin::setActiveBlock (Block *block)
-{
-//    MALLOC_ASSERT( bin, ASSERT_TEXT );
-    MALLOC_ASSERT( block->isOwnedByCurrentThread(), ASSERT_TEXT );
-    // it is the caller responsibility to keep bin consistence (i.e. ensure this block is in the bin list)
-    activeBlk = block;
-}
+        /* Prepare the block for returning to FreeBlockPool */
+        void Block::reset() {
+            // it is caller's responsibility to ensure no data is lost before calling this
+            MALLOC_ASSERT(allocatedCount == 0, ASSERT_TEXT);
+            MALLOC_ASSERT(!isSolidPtr(publicFreeList.load(std::memory_order_relaxed)), ASSERT_TEXT);
+            if (!isStartupAllocObject()) STAT_increment(getThreadId(), getIndex(objectSize), freeBlockBack);
 
-inline Block* Bin::setPreviousBlockActive()
-{
-    MALLOC_ASSERT( activeBlk, ASSERT_TEXT );
-    Block* temp = activeBlk->previous;
-    if( temp ) {
-        MALLOC_ASSERT( !(temp->isFull), ASSERT_TEXT );
-        activeBlk = temp;
-    }
-    return temp;
-}
+            cleanBlockHeader();
 
-inline bool Block::isOwnedByCurrentThread() const {
-    return tlsPtr.load(std::memory_order_relaxed) && ownerTid.isCurrentThreadId();
-}
+            nextPrivatizable.store(nullptr, std::memory_order_relaxed);
 
-FreeObject *Block::findObjectToFree(const void *object) const
-{
-    FreeObject *objectToFree;
-    // Due to aligned allocations, a pointer passed to scalable_free
-    // might differ from the address of internally allocated object.
-    // Small objects however should always be fine.
-    if (objectSize <= maxSegregatedObjectSize)
-        objectToFree = (FreeObject*)object;
-    // "Fitting size" allocations are suspicious if aligned higher than naturally
-    else {
-        if ( ! isAligned(object,2*fittingAlignment) )
-            // TODO: the above check is questionable - it gives false negatives in ~50% cases,
-            //       so might even be slower in average than unconditional use of findAllocatedObject.
-            // here it should be a "real" object
-            objectToFree = (FreeObject*)object;
-        else
-            // here object can be an aligned address, so applying additional checks
-            objectToFree = findAllocatedObject(object);
-        MALLOC_ASSERT( isAligned(objectToFree,fittingAlignment), ASSERT_TEXT );
-    }
-    MALLOC_ASSERT( isProperlyPlaced(objectToFree), ASSERT_TEXT );
+            objectSize = 0;
+            // for an empty block, bump pointer should point right after the end of the block
+            bumpPtr = (FreeObject *) ((uintptr_t) this + slabSize);
+        }
 
-    return objectToFree;
-}
+        inline void Bin::setActiveBlock(Block *block) {
+            //    MALLOC_ASSERT( bin, ASSERT_TEXT );
+            MALLOC_ASSERT(block->isOwnedByCurrentThread(), ASSERT_TEXT);
+            // it is the caller responsibility to keep bin consistence (i.e. ensure this block is in the bin list)
+            activeBlk = block;
+        }
 
-void TLSData::release()
-{
-    memPool->extMemPool.allLocalCaches.unregisterThread(this);
-    externalCleanup(/*cleanOnlyUnused=*/false, /*cleanBins=*/false);
-
-    for (unsigned index = 0; index < numBlockBins; index++) {
-        Block *activeBlk = bin[index].getActiveBlock();
-        if (!activeBlk)
-            continue;
-        Block *threadlessBlock = activeBlk->previous;
-        bool syncOnMailbox = false;
-        while (threadlessBlock) {
-            Block *threadBlock = threadlessBlock->previous;
-            if (threadlessBlock->empty()) {
-                /* we destroy the thread, so not use its block pool */
-                memPool->returnEmptyBlock(threadlessBlock, /*poolTheBlock=*/false);
-            } else {
-                memPool->extMemPool.orphanedBlocks.put(intptr_t(bin+index), threadlessBlock);
-                syncOnMailbox = true;
+        inline Block *Bin::setPreviousBlockActive() {
+            MALLOC_ASSERT(activeBlk, ASSERT_TEXT);
+            Block *temp = activeBlk->previous;
+            if (temp) {
+                MALLOC_ASSERT(!(temp->isFull), ASSERT_TEXT);
+                activeBlk = temp;
             }
-            threadlessBlock = threadBlock;
+            return temp;
         }
-        threadlessBlock = activeBlk;
-        while (threadlessBlock) {
-            Block *threadBlock = threadlessBlock->next;
-            if (threadlessBlock->empty()) {
-                /* we destroy the thread, so not use its block pool */
-                memPool->returnEmptyBlock(threadlessBlock, /*poolTheBlock=*/false);
-            } else {
-                memPool->extMemPool.orphanedBlocks.put(intptr_t(bin+index), threadlessBlock);
-                syncOnMailbox = true;
-            }
-            threadlessBlock = threadBlock;
+
+        inline bool Block::isOwnedByCurrentThread() const {
+            return tlsPtr.load(std::memory_order_relaxed) && ownerTid.isCurrentThreadId();
         }
-        bin[index].resetActiveBlock();
 
-        if (syncOnMailbox) {
-            // Although, we synchronized on nextPrivatizable inside a block, we still need to
-            // synchronize on the bin lifetime because the thread releasing an object into the public
-            // free list is touching the bin (mailbox and mailLock)
-            MallocMutex::scoped_lock scoped_cs(bin[index].mailLock);
+        FreeObject *Block::findObjectToFree(const void *object) const {
+            FreeObject *objectToFree;
+            // Due to aligned allocations, a pointer passed to scalable_free
+            // might differ from the address of internally allocated object.
+            // Small objects however should always be fine.
+            if (objectSize <= maxSegregatedObjectSize) objectToFree = (FreeObject *) object;
+            // "Fitting size" allocations are suspicious if aligned higher than naturally
+            else {
+                if (!isAligned(object, 2 * fittingAlignment))
+                    // TODO: the above check is questionable - it gives false negatives in ~50% cases,
+                    //       so might even be slower in average than unconditional use of findAllocatedObject.
+                    // here it should be a "real" object
+                    objectToFree = (FreeObject *) object;
+                else
+                    // here object can be an aligned address, so applying additional checks
+                    objectToFree = findAllocatedObject(object);
+                MALLOC_ASSERT(isAligned(objectToFree, fittingAlignment), ASSERT_TEXT);
+            }
+            MALLOC_ASSERT(isProperlyPlaced(objectToFree), ASSERT_TEXT);
+
+            return objectToFree;
         }
-    }
-}
 
+        void TLSData::release() {
+            memPool->extMemPool.allLocalCaches.unregisterThread(this);
+            externalCleanup(/*cleanOnlyUnused=*/false, /*cleanBins=*/false);
+
+            for (unsigned index = 0; index < numBlockBins; index++) {
+                Block *activeBlk = bin[index].getActiveBlock();
+                if (!activeBlk) continue;
+                Block *threadlessBlock = activeBlk->previous;
+                bool syncOnMailbox = false;
+                while (threadlessBlock) {
+                    Block *threadBlock = threadlessBlock->previous;
+                    if (threadlessBlock->empty()) {
+                        /* we destroy the thread, so not use its block pool */
+                        memPool->returnEmptyBlock(threadlessBlock, /*poolTheBlock=*/false);
+                    } else {
+                        memPool->extMemPool.orphanedBlocks.put(intptr_t(bin + index), threadlessBlock);
+                        syncOnMailbox = true;
+                    }
+                    threadlessBlock = threadBlock;
+                }
+                threadlessBlock = activeBlk;
+                while (threadlessBlock) {
+                    Block *threadBlock = threadlessBlock->next;
+                    if (threadlessBlock->empty()) {
+                        /* we destroy the thread, so not use its block pool */
+                        memPool->returnEmptyBlock(threadlessBlock, /*poolTheBlock=*/false);
+                    } else {
+                        memPool->extMemPool.orphanedBlocks.put(intptr_t(bin + index), threadlessBlock);
+                        syncOnMailbox = true;
+                    }
+                    threadlessBlock = threadBlock;
+                }
+                bin[index].resetActiveBlock();
+
+                if (syncOnMailbox) {
+                    // Although, we synchronized on nextPrivatizable inside a block, we still need to
+                    // synchronize on the bin lifetime because the thread releasing an object into the public
+                    // free list is touching the bin (mailbox and mailLock)
+                    MallocMutex::scoped_lock scoped_cs(bin[index].mailLock);
+                }
+            }
+        }
 
 #if MALLOC_CHECK_RECURSION
-// TODO: Use dedicated heap for this
+        // TODO: Use dedicated heap for this
 
-/*
+        /*
  * It's a special kind of allocation that can be used when malloc is
  * not available (either during startup or when malloc was already called and
  * we are, say, inside pthread_setspecific's call).
@@ -1835,526 +1750,480 @@ void TLSData::release()
  * TODO: make bump pointer to grow to the same backward direction as all the others.
  */
 
-class StartupBlock : public Block {
-    size_t availableSize() const {
-        return slabSize - ((uintptr_t)bumpPtr - (uintptr_t)this);
-    }
-    static StartupBlock *getBlock();
-public:
-    static FreeObject *allocate(size_t size);
-    static size_t msize(void *ptr) { return *((size_t*)ptr - 1); }
-    void free(void *ptr);
-};
-
-static MallocMutex startupMallocLock;
-static StartupBlock *firstStartupBlock;
-
-StartupBlock *StartupBlock::getBlock()
-{
-    BackRefIdx backRefIdx = BackRefIdx::newBackRef(/*largeObj=*/false);
-    if (backRefIdx.isInvalid()) return nullptr;
-
-    StartupBlock *block = static_cast<StartupBlock*>(
-        defaultMemPool->extMemPool.backend.getSlabBlock(1));
-    if (!block) return nullptr;
-
-    block->cleanBlockHeader();
-    setBackRef(backRefIdx, block);
-    block->backRefIdx = backRefIdx;
-    // use startupAllocObjSizeMark to mark objects from startup block marker
-    block->objectSize = startupAllocObjSizeMark;
-    block->bumpPtr = (FreeObject *)((uintptr_t)block + sizeof(StartupBlock));
-    return block;
-}
+        class StartupBlock : public Block {
+            size_t availableSize() const { return slabSize - ((uintptr_t) bumpPtr - (uintptr_t) this); }
+            static StartupBlock *getBlock();
+
+        public:
+            static FreeObject *allocate(size_t size);
+            static size_t msize(void *ptr) { return *((size_t *) ptr - 1); }
+            void free(void *ptr);
+        };
+
+        static MallocMutex startupMallocLock;
+        static StartupBlock *firstStartupBlock;
+
+        StartupBlock *StartupBlock::getBlock() {
+            BackRefIdx backRefIdx = BackRefIdx::newBackRef(/*largeObj=*/false);
+            if (backRefIdx.isInvalid()) return nullptr;
+
+            StartupBlock *block
+                    = static_cast<StartupBlock *>(defaultMemPool->extMemPool.backend.getSlabBlock(1));
+            if (!block) return nullptr;
+
+            block->cleanBlockHeader();
+            setBackRef(backRefIdx, block);
+            block->backRefIdx = backRefIdx;
+            // use startupAllocObjSizeMark to mark objects from startup block marker
+            block->objectSize = startupAllocObjSizeMark;
+            block->bumpPtr = (FreeObject *) ((uintptr_t) block + sizeof(StartupBlock));
+            return block;
+        }
 
-FreeObject *StartupBlock::allocate(size_t size)
-{
-    FreeObject *result;
-    StartupBlock *newBlock = nullptr;
+        FreeObject *StartupBlock::allocate(size_t size) {
+            FreeObject *result;
+            StartupBlock *newBlock = nullptr;
 
-    /* Objects must be aligned on their natural bounds,
+            /* Objects must be aligned on their natural bounds,
        and objects bigger than word on word's bound. */
-    size = alignUp(size, sizeof(size_t));
-    // We need size of an object to implement msize.
-    size_t reqSize = size + sizeof(size_t);
-    {
-        MallocMutex::scoped_lock scoped_cs(startupMallocLock);
-        // Re-check whether we need a new block (conditions might have changed)
-        if (!firstStartupBlock || firstStartupBlock->availableSize() < reqSize) {
-            if (!newBlock) {
-                newBlock = StartupBlock::getBlock();
-                if (!newBlock) return nullptr;
-            }
-            newBlock->next = (Block*)firstStartupBlock;
-            if (firstStartupBlock)
-                firstStartupBlock->previous = (Block*)newBlock;
-            firstStartupBlock = newBlock;
-        }
-        result = firstStartupBlock->bumpPtr;
-        firstStartupBlock->allocatedCount++;
-        firstStartupBlock->bumpPtr =
-            (FreeObject *)((uintptr_t)firstStartupBlock->bumpPtr + reqSize);
-    }
+            size = alignUp(size, sizeof(size_t));
+            // We need size of an object to implement msize.
+            size_t reqSize = size + sizeof(size_t);
+            {
+                MallocMutex::scoped_lock scoped_cs(startupMallocLock);
+                // Re-check whether we need a new block (conditions might have changed)
+                if (!firstStartupBlock || firstStartupBlock->availableSize() < reqSize) {
+                    if (!newBlock) {
+                        newBlock = StartupBlock::getBlock();
+                        if (!newBlock) return nullptr;
+                    }
+                    newBlock->next = (Block *) firstStartupBlock;
+                    if (firstStartupBlock) firstStartupBlock->previous = (Block *) newBlock;
+                    firstStartupBlock = newBlock;
+                }
+                result = firstStartupBlock->bumpPtr;
+                firstStartupBlock->allocatedCount++;
+                firstStartupBlock->bumpPtr
+                        = (FreeObject *) ((uintptr_t) firstStartupBlock->bumpPtr + reqSize);
+            }
 
-    // keep object size at the negative offset
-    *((size_t*)result) = size;
-    return (FreeObject*)((size_t*)result+1);
-}
+            // keep object size at the negative offset
+            *((size_t *) result) = size;
+            return (FreeObject *) ((size_t *) result + 1);
+        }
 
-void StartupBlock::free(void *ptr)
-{
-    Block* blockToRelease = nullptr;
-    {
-        MallocMutex::scoped_lock scoped_cs(startupMallocLock);
-
-        MALLOC_ASSERT(firstStartupBlock, ASSERT_TEXT);
-        MALLOC_ASSERT(startupAllocObjSizeMark==objectSize
-                      && allocatedCount>0, ASSERT_TEXT);
-        MALLOC_ASSERT((uintptr_t)ptr>=(uintptr_t)this+sizeof(StartupBlock)
-                      && (uintptr_t)ptr+StartupBlock::msize(ptr)<=(uintptr_t)this+slabSize,
-                      ASSERT_TEXT);
-        if (0 == --allocatedCount) {
-            if (this == firstStartupBlock)
-                firstStartupBlock = (StartupBlock*)firstStartupBlock->next;
-            if (previous)
-                previous->next = next;
-            if (next)
-                next->previous = previous;
-            blockToRelease = this;
-        } else if ((uintptr_t)ptr + StartupBlock::msize(ptr) == (uintptr_t)bumpPtr) {
-            // last object in the block released
-            FreeObject *newBump = (FreeObject*)((size_t*)ptr - 1);
-            MALLOC_ASSERT((uintptr_t)newBump>(uintptr_t)this+sizeof(StartupBlock),
-                          ASSERT_TEXT);
-            bumpPtr = newBump;
+        void StartupBlock::free(void *ptr) {
+            Block *blockToRelease = nullptr;
+            {
+                MallocMutex::scoped_lock scoped_cs(startupMallocLock);
+
+                MALLOC_ASSERT(firstStartupBlock, ASSERT_TEXT);
+                MALLOC_ASSERT(startupAllocObjSizeMark == objectSize && allocatedCount > 0, ASSERT_TEXT);
+                MALLOC_ASSERT((uintptr_t) ptr >= (uintptr_t) this + sizeof(StartupBlock)
+                                      && (uintptr_t) ptr + StartupBlock::msize(ptr)
+                                                 <= (uintptr_t) this + slabSize,
+                              ASSERT_TEXT);
+                if (0 == --allocatedCount) {
+                    if (this == firstStartupBlock)
+                        firstStartupBlock = (StartupBlock *) firstStartupBlock->next;
+                    if (previous) previous->next = next;
+                    if (next) next->previous = previous;
+                    blockToRelease = this;
+                } else if ((uintptr_t) ptr + StartupBlock::msize(ptr) == (uintptr_t) bumpPtr) {
+                    // last object in the block released
+                    FreeObject *newBump = (FreeObject *) ((size_t *) ptr - 1);
+                    MALLOC_ASSERT((uintptr_t) newBump > (uintptr_t) this + sizeof(StartupBlock), ASSERT_TEXT);
+                    bumpPtr = newBump;
+                }
+            }
+            if (blockToRelease) {
+                blockToRelease->previous = blockToRelease->next = nullptr;
+                defaultMemPool->returnEmptyBlock(blockToRelease, /*poolTheBlock=*/false);
+            }
         }
-    }
-    if (blockToRelease) {
-        blockToRelease->previous = blockToRelease->next = nullptr;
-        defaultMemPool->returnEmptyBlock(blockToRelease, /*poolTheBlock=*/false);
-    }
-}
 
 #endif /* MALLOC_CHECK_RECURSION */
 
-/********* End thread related code  *************/
+        /********* End thread related code  *************/
 
-/********* Library initialization *************/
+        /********* Library initialization *************/
 
-//! Value indicating the state of initialization.
-/* 0 = initialization not started.
+        //! Value indicating the state of initialization.
+        /* 0 = initialization not started.
  * 1 = initialization started but not finished.
  * 2 = initialization finished.
  * In theory, we only need values 0 and 2. But value 1 is nonetheless
  * useful for detecting errors in the double-check pattern.
  */
-static std::atomic<intptr_t> mallocInitialized{0};   // implicitly initialized to 0
-static MallocMutex initMutex;
+        static std::atomic<intptr_t> mallocInitialized {0};// implicitly initialized to 0
+        static MallocMutex initMutex;
 
-/** The leading "\0" is here so that applying "strings" to the binary
+        /** The leading "\0" is here so that applying "strings" to the binary
     delivers a clean result. */
-static char VersionString[] = "\0" TBBMALLOC_VERSION_STRINGS;
+        static char VersionString[] = "\0" TBBMALLOC_VERSION_STRINGS;
 
 #if USE_PTHREAD && __TBB_SOURCE_DIRECTLY_INCLUDED
 
-/* Decrease race interval between dynamic library unloading and pthread key
+        /* Decrease race interval between dynamic library unloading and pthread key
    destructor. Protect only Pthreads with supported unloading. */
-class ShutdownSync {
-/* flag is the number of threads in pthread key dtor body
+        class ShutdownSync {
+            /* flag is the number of threads in pthread key dtor body
    (i.e., between threadDtorStart() and threadDtorDone())
    or the signal to skip dtor, if flag < 0 */
-    std::atomic<intptr_t> flag;
-    static const intptr_t skipDtor = INTPTR_MIN/2;
-public:
-    void init() { flag.store(0, std::memory_order_release); }
-/* Suppose that 2*abs(skipDtor) or more threads never call threadDtorStart()
+            std::atomic<intptr_t> flag;
+            static const intptr_t skipDtor = INTPTR_MIN / 2;
+
+        public:
+            void init() { flag.store(0, std::memory_order_release); }
+            /* Suppose that 2*abs(skipDtor) or more threads never call threadDtorStart()
    simultaneously, so flag never becomes negative because of that. */
-    bool threadDtorStart() {
-        if (flag.load(std::memory_order_acquire) < 0)
-            return false;
-        if (++flag <= 0) { // note that new value returned
-            flag.fetch_sub(1); // flag is spoiled by us, restore it
-            return false;
-        }
-        return true;
-    }
-    void threadDtorDone() {
-        flag.fetch_sub(1);
-    }
-    void processExit() {
-        if (flag.fetch_add(skipDtor) != 0) {
-            SpinWaitUntilEq(flag, skipDtor);
-        }
-    }
-};
+            bool threadDtorStart() {
+                if (flag.load(std::memory_order_acquire) < 0) return false;
+                if (++flag <= 0) {    // note that new value returned
+                    flag.fetch_sub(1);// flag is spoiled by us, restore it
+                    return false;
+                }
+                return true;
+            }
+            void threadDtorDone() { flag.fetch_sub(1); }
+            void processExit() {
+                if (flag.fetch_add(skipDtor) != 0) { SpinWaitUntilEq(flag, skipDtor); }
+            }
+        };
 
 #else
 
-class ShutdownSync {
-public:
-    void init() { }
-    bool threadDtorStart() { return true; }
-    void threadDtorDone() { }
-    void processExit() { }
-};
+        class ShutdownSync {
+        public:
+            void init() {}
+            bool threadDtorStart() { return true; }
+            void threadDtorDone() {}
+            void processExit() {}
+        };
 
-#endif // USE_PTHREAD && __TBB_SOURCE_DIRECTLY_INCLUDED
+#endif// USE_PTHREAD && __TBB_SOURCE_DIRECTLY_INCLUDED
 
-static ShutdownSync shutdownSync;
+        static ShutdownSync shutdownSync;
 
-inline bool isMallocInitialized() {
-    // Load must have acquire fence; otherwise thread taking "initialized" path
-    // might perform textually later loads *before* mallocInitialized becomes 2.
-    return 2 == mallocInitialized.load(std::memory_order_acquire);
-}
+        inline bool isMallocInitialized() {
+            // Load must have acquire fence; otherwise thread taking "initialized" path
+            // might perform textually later loads *before* mallocInitialized becomes 2.
+            return 2 == mallocInitialized.load(std::memory_order_acquire);
+        }
 
-/* Caller is responsible for ensuring this routine is called exactly once. */
-extern "C" void MallocInitializeITT() {
+        /* Caller is responsible for ensuring this routine is called exactly once. */
+        extern "C" void MallocInitializeITT() {
 #if __TBB_USE_ITT_NOTIFY
-    if (!usedBySrcIncluded)
-        tbb::detail::r1::__TBB_load_ittnotify();
+            if (!usedBySrcIncluded) tbb::detail::r1::__TBB_load_ittnotify();
 #endif
-}
+        }
 
-void MemoryPool::initDefaultPool() {
-    hugePages.init();
-}
+        void MemoryPool::initDefaultPool() { hugePages.init(); }
 
-/*
+        /*
  * Allocator initialization routine;
  * it is called lazily on the very first scalable_malloc call.
  */
-static bool initMemoryManager()
-{
-    TRACEF(( "[ScalableMalloc trace] sizeof(Block) is %d (expected 128); sizeof(uintptr_t) is %d\n",
-             sizeof(Block), sizeof(uintptr_t) ));
-    MALLOC_ASSERT( 2*blockHeaderAlignment == sizeof(Block), ASSERT_TEXT );
-    MALLOC_ASSERT( sizeof(FreeObject) == sizeof(void*), ASSERT_TEXT );
-    MALLOC_ASSERT( isAligned(defaultMemPool, sizeof(intptr_t)),
-                   "Memory pool must be void*-aligned for atomic to work over aligned arguments.");
+        static bool initMemoryManager() {
+            TRACEF(("[ScalableMalloc trace] sizeof(Block) is %d (expected 128); sizeof(uintptr_t) is %d\n",
+                    sizeof(Block), sizeof(uintptr_t)));
+            MALLOC_ASSERT(2 * blockHeaderAlignment == sizeof(Block), ASSERT_TEXT);
+            MALLOC_ASSERT(sizeof(FreeObject) == sizeof(void *), ASSERT_TEXT);
+            MALLOC_ASSERT(isAligned(defaultMemPool, sizeof(intptr_t)),
+                          "Memory pool must be void*-aligned for atomic to work over aligned arguments.");
 
 #if USE_WINTHREAD
-    const size_t granularity = 64*1024; // granulatity of VirtualAlloc
+            const size_t granularity = 64 * 1024;// granulatity of VirtualAlloc
 #else
-    // POSIX.1-2001-compliant way to get page size
-    const size_t granularity = sysconf(_SC_PAGESIZE);
+            // POSIX.1-2001-compliant way to get page size
+            const size_t granularity = sysconf(_SC_PAGESIZE);
 #endif
-    if (!defaultMemPool) {
-        // Do not rely on static constructors and do the assignment in case
-        // of library static section not initialized at this call yet.
-        defaultMemPool = (MemoryPool*)defaultMemPool_space;
-    }
-    bool initOk = defaultMemPool->
-        extMemPool.init(0, nullptr, nullptr, granularity,
-                        /*keepAllMemory=*/false, /*fixedPool=*/false);
-// TODO: extMemPool.init() to not allocate memory
-    if (!initOk || !initBackRefMain(&defaultMemPool->extMemPool.backend) || !ThreadId::init())
-        return false;
-    MemoryPool::initDefaultPool();
-    // init() is required iff initMemoryManager() is called
-    // after mallocProcessShutdownNotification()
-    shutdownSync.init();
+            if (!defaultMemPool) {
+                // Do not rely on static constructors and do the assignment in case
+                // of library static section not initialized at this call yet.
+                defaultMemPool = (MemoryPool *) defaultMemPool_space;
+            }
+            bool initOk = defaultMemPool->extMemPool.init(0, nullptr, nullptr, granularity,
+                                                          /*keepAllMemory=*/false, /*fixedPool=*/false);
+            // TODO: extMemPool.init() to not allocate memory
+            if (!initOk || !initBackRefMain(&defaultMemPool->extMemPool.backend) || !ThreadId::init())
+                return false;
+            MemoryPool::initDefaultPool();
+            // init() is required iff initMemoryManager() is called
+            // after mallocProcessShutdownNotification()
+            shutdownSync.init();
 #if COLLECT_STATISTICS
-    initStatisticsCollection();
+            initStatisticsCollection();
 #endif
-    return true;
-}
+            return true;
+        }
 
-static bool GetBoolEnvironmentVariable(const char* name) {
-    return tbb::detail::r1::GetBoolEnvironmentVariable(name);
-}
+        static bool GetBoolEnvironmentVariable(const char *name) {
+            return tbb::detail::r1::GetBoolEnvironmentVariable(name);
+        }
 
-//! Ensures that initMemoryManager() is called once and only once.
-/** Does not return until initMemoryManager() has been completed by a thread.
+        //! Ensures that initMemoryManager() is called once and only once.
+        /** Does not return until initMemoryManager() has been completed by a thread.
     There is no need to call this routine if mallocInitialized==2 . */
-static bool doInitialization()
-{
-    MallocMutex::scoped_lock lock( initMutex );
-    if (mallocInitialized.load(std::memory_order_relaxed)!=2) {
-        MALLOC_ASSERT( mallocInitialized.load(std::memory_order_relaxed)==0, ASSERT_TEXT );
-        mallocInitialized.store(1, std::memory_order_relaxed);
-        RecursiveMallocCallProtector scoped;
-        if (!initMemoryManager()) {
-            mallocInitialized.store(0, std::memory_order_relaxed); // restore and out
-            return false;
-        }
-#ifdef  MALLOC_EXTRA_INITIALIZATION
-        MALLOC_EXTRA_INITIALIZATION;
+        static bool doInitialization() {
+            MallocMutex::scoped_lock lock(initMutex);
+            if (mallocInitialized.load(std::memory_order_relaxed) != 2) {
+                MALLOC_ASSERT(mallocInitialized.load(std::memory_order_relaxed) == 0, ASSERT_TEXT);
+                mallocInitialized.store(1, std::memory_order_relaxed);
+                RecursiveMallocCallProtector scoped;
+                if (!initMemoryManager()) {
+                    mallocInitialized.store(0, std::memory_order_relaxed);// restore and out
+                    return false;
+                }
+#ifdef MALLOC_EXTRA_INITIALIZATION
+                MALLOC_EXTRA_INITIALIZATION;
 #endif
 #if MALLOC_CHECK_RECURSION
-        RecursiveMallocCallProtector::detectNaiveOverload();
+                RecursiveMallocCallProtector::detectNaiveOverload();
 #endif
-        MALLOC_ASSERT( mallocInitialized.load(std::memory_order_relaxed)==1, ASSERT_TEXT );
-        // Store must have release fence, otherwise mallocInitialized==2
-        // might become remotely visible before side effects of
-        // initMemoryManager() become remotely visible.
-        mallocInitialized.store(2, std::memory_order_release);
-        if( GetBoolEnvironmentVariable("TBB_VERSION") ) {
-            fputs(VersionString+1,stderr);
-            hugePages.printStatus();
+                MALLOC_ASSERT(mallocInitialized.load(std::memory_order_relaxed) == 1, ASSERT_TEXT);
+                // Store must have release fence, otherwise mallocInitialized==2
+                // might become remotely visible before side effects of
+                // initMemoryManager() become remotely visible.
+                mallocInitialized.store(2, std::memory_order_release);
+                if (GetBoolEnvironmentVariable("TBB_VERSION")) {
+                    fputs(VersionString + 1, stderr);
+                    hugePages.printStatus();
+                }
+            }
+            /* It can't be 0 or I would have initialized it */
+            MALLOC_ASSERT(mallocInitialized.load(std::memory_order_relaxed) == 2, ASSERT_TEXT);
+            return true;
         }
-    }
-    /* It can't be 0 or I would have initialized it */
-    MALLOC_ASSERT( mallocInitialized.load(std::memory_order_relaxed)==2, ASSERT_TEXT );
-    return true;
-}
-
-/********* End library initialization *************/
 
-/********* The malloc show begins     *************/
+        /********* End library initialization *************/
 
+        /********* The malloc show begins     *************/
 
-FreeObject *Block::allocateFromFreeList()
-{
-    FreeObject *result;
+        FreeObject *Block::allocateFromFreeList() {
+            FreeObject *result;
 
-    if (!freeList) return nullptr;
+            if (!freeList) return nullptr;
 
-    result = freeList;
-    MALLOC_ASSERT( result, ASSERT_TEXT );
+            result = freeList;
+            MALLOC_ASSERT(result, ASSERT_TEXT);
 
-    freeList = result->next;
-    MALLOC_ASSERT( allocatedCount < (slabSize-sizeof(Block))/objectSize, ASSERT_TEXT );
-    allocatedCount++;
-    STAT_increment(getThreadId(), getIndex(objectSize), allocFreeListUsed);
+            freeList = result->next;
+            MALLOC_ASSERT(allocatedCount < (slabSize - sizeof(Block)) / objectSize, ASSERT_TEXT);
+            allocatedCount++;
+            STAT_increment(getThreadId(), getIndex(objectSize), allocFreeListUsed);
 
-    return result;
-}
+            return result;
+        }
 
-FreeObject *Block::allocateFromBumpPtr()
-{
-    FreeObject *result = bumpPtr;
-    if (result) {
-        bumpPtr = (FreeObject *) ((uintptr_t) bumpPtr - objectSize);
-        if ( (uintptr_t)bumpPtr < (uintptr_t)this+sizeof(Block) ) {
-            bumpPtr = nullptr;
-        }
-        MALLOC_ASSERT( allocatedCount < (slabSize-sizeof(Block))/objectSize, ASSERT_TEXT );
-        allocatedCount++;
-        STAT_increment(getThreadId(), getIndex(objectSize), allocBumpPtrUsed);
-    }
-    return result;
-}
+        FreeObject *Block::allocateFromBumpPtr() {
+            FreeObject *result = bumpPtr;
+            if (result) {
+                bumpPtr = (FreeObject *) ((uintptr_t) bumpPtr - objectSize);
+                if ((uintptr_t) bumpPtr < (uintptr_t) this + sizeof(Block)) { bumpPtr = nullptr; }
+                MALLOC_ASSERT(allocatedCount < (slabSize - sizeof(Block)) / objectSize, ASSERT_TEXT);
+                allocatedCount++;
+                STAT_increment(getThreadId(), getIndex(objectSize), allocBumpPtrUsed);
+            }
+            return result;
+        }
 
-inline FreeObject* Block::allocate()
-{
-    MALLOC_ASSERT( isOwnedByCurrentThread(), ASSERT_TEXT );
+        inline FreeObject *Block::allocate() {
+            MALLOC_ASSERT(isOwnedByCurrentThread(), ASSERT_TEXT);
 
-    /* for better cache locality, first looking in the free list. */
-    if ( FreeObject *result = allocateFromFreeList() ) {
-        return result;
-    }
-    MALLOC_ASSERT( !freeList, ASSERT_TEXT );
+            /* for better cache locality, first looking in the free list. */
+            if (FreeObject *result = allocateFromFreeList()) { return result; }
+            MALLOC_ASSERT(!freeList, ASSERT_TEXT);
 
-    /* if free list is empty, try thread local bump pointer allocation. */
-    if ( FreeObject *result = allocateFromBumpPtr() ) {
-        return result;
-    }
-    MALLOC_ASSERT( !bumpPtr, ASSERT_TEXT );
+            /* if free list is empty, try thread local bump pointer allocation. */
+            if (FreeObject *result = allocateFromBumpPtr()) { return result; }
+            MALLOC_ASSERT(!bumpPtr, ASSERT_TEXT);
 
-    /* the block is considered full. */
-    isFull = true;
-    return nullptr;
-}
+            /* the block is considered full. */
+            isFull = true;
+            return nullptr;
+        }
 
-size_t Block::findObjectSize(void *object) const
-{
-    size_t blSize = getSize();
+        size_t Block::findObjectSize(void *object) const {
+            size_t blSize = getSize();
 #if MALLOC_CHECK_RECURSION
-    // Currently, there is no aligned allocations from startup blocks,
-    // so we can return just StartupBlock::msize().
-    // TODO: This must be extended if we add aligned allocation from startup blocks.
-    if (!blSize)
-        return StartupBlock::msize(object);
+            // Currently, there is no aligned allocations from startup blocks,
+            // so we can return just StartupBlock::msize().
+            // TODO: This must be extended if we add aligned allocation from startup blocks.
+            if (!blSize) return StartupBlock::msize(object);
 #endif
-    // object can be aligned, so real size can be less than block's
-    size_t size =
-        blSize - ((uintptr_t)object - (uintptr_t)findObjectToFree(object));
-    MALLOC_ASSERT(size>0 && size<minLargeObjectSize, ASSERT_TEXT);
-    return size;
-}
+            // object can be aligned, so real size can be less than block's
+            size_t size = blSize - ((uintptr_t) object - (uintptr_t) findObjectToFree(object));
+            MALLOC_ASSERT(size > 0 && size < minLargeObjectSize, ASSERT_TEXT);
+            return size;
+        }
 
-void Bin::moveBlockToFront(Block *block)
-{
-    /* move the block to the front of the bin */
-    if (block == activeBlk) return;
-    outofTLSBin(block);
-    pushTLSBin(block);
-}
+        void Bin::moveBlockToFront(Block *block) {
+            /* move the block to the front of the bin */
+            if (block == activeBlk) return;
+            outofTLSBin(block);
+            pushTLSBin(block);
+        }
 
-void Bin::processEmptyBlock(Block *block, bool poolTheBlock)
-{
-    if (block != activeBlk) {
-        /* We are not using this block; return it to the pool */
-        outofTLSBin(block);
-        block->getMemPool()->returnEmptyBlock(block, poolTheBlock);
-    } else {
-        /* all objects are free - let's restore the bump pointer */
-        block->restoreBumpPtr();
-    }
-}
+        void Bin::processEmptyBlock(Block *block, bool poolTheBlock) {
+            if (block != activeBlk) {
+                /* We are not using this block; return it to the pool */
+                outofTLSBin(block);
+                block->getMemPool()->returnEmptyBlock(block, poolTheBlock);
+            } else {
+                /* all objects are free - let's restore the bump pointer */
+                block->restoreBumpPtr();
+            }
+        }
 
-template<int LOW_MARK, int HIGH_MARK>
-bool LocalLOCImpl<LOW_MARK, HIGH_MARK>::put(LargeMemoryBlock *object, ExtMemoryPool *extMemPool)
-{
-    const size_t size = object->unalignedSize;
-    // not spoil cache with too large object, that can cause its total cleanup
-    if (size > MAX_TOTAL_SIZE)
-        return false;
-    LargeMemoryBlock *localHead = head.exchange(nullptr);
-
-    object->prev = nullptr;
-    object->next = localHead;
-    if (localHead)
-        localHead->prev = object;
-    else {
-        // those might not be cleaned during local cache stealing, correct them
-        totalSize = 0;
-        numOfBlocks = 0;
-        tail = object;
-    }
-    localHead = object;
-    totalSize += size;
-    numOfBlocks++;
-    // must meet both size and number of cached objects constrains
-    if (totalSize > MAX_TOTAL_SIZE || numOfBlocks >= HIGH_MARK) {
-        // scanning from tail until meet conditions
-        while (totalSize > MAX_TOTAL_SIZE || numOfBlocks > LOW_MARK) {
-            totalSize -= tail->unalignedSize;
-            numOfBlocks--;
-            tail = tail->prev;
-        }
-        LargeMemoryBlock *headToRelease = tail->next;
-        tail->next = nullptr;
-
-        extMemPool->freeLargeObjectList(headToRelease);
-    }
+        template <int LOW_MARK, int HIGH_MARK>
+        bool LocalLOCImpl<LOW_MARK, HIGH_MARK>::put(LargeMemoryBlock *object, ExtMemoryPool *extMemPool) {
+            const size_t size = object->unalignedSize;
+            // not spoil cache with too large object, that can cause its total cleanup
+            if (size > MAX_TOTAL_SIZE) return false;
+            LargeMemoryBlock *localHead = head.exchange(nullptr);
+
+            object->prev = nullptr;
+            object->next = localHead;
+            if (localHead) localHead->prev = object;
+            else {
+                // those might not be cleaned during local cache stealing, correct them
+                totalSize = 0;
+                numOfBlocks = 0;
+                tail = object;
+            }
+            localHead = object;
+            totalSize += size;
+            numOfBlocks++;
+            // must meet both size and number of cached objects constrains
+            if (totalSize > MAX_TOTAL_SIZE || numOfBlocks >= HIGH_MARK) {
+                // scanning from tail until meet conditions
+                while (totalSize > MAX_TOTAL_SIZE || numOfBlocks > LOW_MARK) {
+                    totalSize -= tail->unalignedSize;
+                    numOfBlocks--;
+                    tail = tail->prev;
+                }
+                LargeMemoryBlock *headToRelease = tail->next;
+                tail->next = nullptr;
 
-    head.store(localHead, std::memory_order_release);
-    return true;
-}
+                extMemPool->freeLargeObjectList(headToRelease);
+            }
 
-template<int LOW_MARK, int HIGH_MARK>
-LargeMemoryBlock *LocalLOCImpl<LOW_MARK, HIGH_MARK>::get(size_t size)
-{
-    LargeMemoryBlock *localHead, *res = nullptr;
+            head.store(localHead, std::memory_order_release);
+            return true;
+        }
 
-    if (size > MAX_TOTAL_SIZE)
-        return nullptr;
+        template <int LOW_MARK, int HIGH_MARK>
+        LargeMemoryBlock *LocalLOCImpl<LOW_MARK, HIGH_MARK>::get(size_t size) {
+            LargeMemoryBlock *localHead, *res = nullptr;
 
-    // TBB_REVAMP_TODO: review this line
-    if (!head.load(std::memory_order_acquire) || (localHead = head.exchange(nullptr)) == nullptr) {
-        // do not restore totalSize, numOfBlocks and tail at this point,
-        // as they are used only in put(), where they must be restored
-        return nullptr;
-    }
+            if (size > MAX_TOTAL_SIZE) return nullptr;
 
-    for (LargeMemoryBlock *curr = localHead; curr; curr=curr->next) {
-        if (curr->unalignedSize == size) {
-            res = curr;
-            if (curr->next)
-                curr->next->prev = curr->prev;
-            else
-                tail = curr->prev;
-            if (curr != localHead)
-                curr->prev->next = curr->next;
-            else
-                localHead = curr->next;
-            totalSize -= size;
-            numOfBlocks--;
-            break;
+            // TBB_REVAMP_TODO: review this line
+            if (!head.load(std::memory_order_acquire) || (localHead = head.exchange(nullptr)) == nullptr) {
+                // do not restore totalSize, numOfBlocks and tail at this point,
+                // as they are used only in put(), where they must be restored
+                return nullptr;
+            }
+
+            for (LargeMemoryBlock *curr = localHead; curr; curr = curr->next) {
+                if (curr->unalignedSize == size) {
+                    res = curr;
+                    if (curr->next) curr->next->prev = curr->prev;
+                    else
+                        tail = curr->prev;
+                    if (curr != localHead) curr->prev->next = curr->next;
+                    else
+                        localHead = curr->next;
+                    totalSize -= size;
+                    numOfBlocks--;
+                    break;
+                }
+            }
+
+            head.store(localHead, std::memory_order_release);
+            return res;
         }
-    }
 
-    head.store(localHead, std::memory_order_release);
-    return res;
-}
+        template <int LOW_MARK, int HIGH_MARK>
+        bool LocalLOCImpl<LOW_MARK, HIGH_MARK>::externalCleanup(ExtMemoryPool *extMemPool) {
+            if (LargeMemoryBlock *localHead = head.exchange(nullptr)) {
+                extMemPool->freeLargeObjectList(localHead);
+                return true;
+            }
+            return false;
+        }
 
-template<int LOW_MARK, int HIGH_MARK>
-bool LocalLOCImpl<LOW_MARK, HIGH_MARK>::externalCleanup(ExtMemoryPool *extMemPool)
-{
-    if (LargeMemoryBlock *localHead = head.exchange(nullptr)) {
-        extMemPool->freeLargeObjectList(localHead);
-        return true;
-    }
-    return false;
-}
+        void *MemoryPool::getFromLLOCache(TLSData *tls, size_t size, size_t alignment) {
+            LargeMemoryBlock *lmb = nullptr;
 
-void *MemoryPool::getFromLLOCache(TLSData* tls, size_t size, size_t alignment)
-{
-    LargeMemoryBlock *lmb = nullptr;
+            size_t headersSize = sizeof(LargeMemoryBlock) + sizeof(LargeObjectHdr);
+            size_t allocationSize = LargeObjectCache::alignToBin(size + headersSize + alignment);
+            if (allocationSize < size)// allocationSize is wrapped around after alignToBin
+                return nullptr;
+            MALLOC_ASSERT(allocationSize >= alignment, "Overflow must be checked before.");
 
-    size_t headersSize = sizeof(LargeMemoryBlock)+sizeof(LargeObjectHdr);
-    size_t allocationSize = LargeObjectCache::alignToBin(size+headersSize+alignment);
-    if (allocationSize < size) // allocationSize is wrapped around after alignToBin
-        return nullptr;
-    MALLOC_ASSERT(allocationSize >= alignment, "Overflow must be checked before.");
+            if (tls) {
+                tls->markUsed();
+                lmb = tls->lloc.get(allocationSize);
+            }
+            if (!lmb) lmb = extMemPool.mallocLargeObject(this, allocationSize);
+
+            if (lmb) {
+                // doing shuffle we suppose that alignment offset guarantees
+                // that different cache lines are in use
+                MALLOC_ASSERT(alignment >= estimatedCacheLineSize, ASSERT_TEXT);
+
+                void *alignedArea = (void *) alignUp((uintptr_t) lmb + headersSize, alignment);
+                uintptr_t alignedRight = alignDown((uintptr_t) lmb + lmb->unalignedSize - size, alignment);
+                // Has some room to shuffle object between cache lines?
+                // Note that alignedRight and alignedArea are aligned at alignment.
+                unsigned ptrDelta = alignedRight - (uintptr_t) alignedArea;
+                if (ptrDelta && tls) {// !tls is cold path
+                    // for the hot path of alignment==estimatedCacheLineSize,
+                    // allow compilers to use shift for division
+                    // (since estimatedCacheLineSize is a power-of-2 constant)
+                    unsigned numOfPossibleOffsets = alignment == estimatedCacheLineSize
+                                                            ? ptrDelta / estimatedCacheLineSize
+                                                            : ptrDelta / alignment;
+                    unsigned myCacheIdx = ++tls->currCacheIdx;
+                    unsigned offset = myCacheIdx % numOfPossibleOffsets;
+
+                    // Move object to a cache line with an offset that is different from
+                    // previous allocation. This supposedly allows us to use cache
+                    // associativity more efficiently.
+                    alignedArea = (void *) ((uintptr_t) alignedArea + offset * alignment);
+                }
+                MALLOC_ASSERT((uintptr_t) lmb + lmb->unalignedSize >= (uintptr_t) alignedArea + size,
+                              "Object doesn't fit the block.");
+                LargeObjectHdr *header = (LargeObjectHdr *) alignedArea - 1;
+                header->memoryBlock = lmb;
+                header->backRefIdx = lmb->backRefIdx;
+                setBackRef(header->backRefIdx, header);
 
-    if (tls) {
-        tls->markUsed();
-        lmb = tls->lloc.get(allocationSize);
-    }
-    if (!lmb)
-        lmb = extMemPool.mallocLargeObject(this, allocationSize);
-
-    if (lmb) {
-        // doing shuffle we suppose that alignment offset guarantees
-        // that different cache lines are in use
-        MALLOC_ASSERT(alignment >= estimatedCacheLineSize, ASSERT_TEXT);
-
-        void *alignedArea = (void*)alignUp((uintptr_t)lmb+headersSize, alignment);
-        uintptr_t alignedRight =
-            alignDown((uintptr_t)lmb+lmb->unalignedSize - size, alignment);
-        // Has some room to shuffle object between cache lines?
-        // Note that alignedRight and alignedArea are aligned at alignment.
-        unsigned ptrDelta = alignedRight - (uintptr_t)alignedArea;
-        if (ptrDelta && tls) { // !tls is cold path
-            // for the hot path of alignment==estimatedCacheLineSize,
-            // allow compilers to use shift for division
-            // (since estimatedCacheLineSize is a power-of-2 constant)
-            unsigned numOfPossibleOffsets = alignment == estimatedCacheLineSize?
-                  ptrDelta / estimatedCacheLineSize :
-                  ptrDelta / alignment;
-            unsigned myCacheIdx = ++tls->currCacheIdx;
-            unsigned offset = myCacheIdx % numOfPossibleOffsets;
-
-            // Move object to a cache line with an offset that is different from
-            // previous allocation. This supposedly allows us to use cache
-            // associativity more efficiently.
-            alignedArea = (void*)((uintptr_t)alignedArea + offset*alignment);
-        }
-        MALLOC_ASSERT((uintptr_t)lmb+lmb->unalignedSize >=
-                      (uintptr_t)alignedArea+size, "Object doesn't fit the block.");
-        LargeObjectHdr *header = (LargeObjectHdr*)alignedArea-1;
-        header->memoryBlock = lmb;
-        header->backRefIdx = lmb->backRefIdx;
-        setBackRef(header->backRefIdx, header);
-
-        lmb->objectSize = size;
-
-        MALLOC_ASSERT( isLargeObject<unknownMem>(alignedArea), ASSERT_TEXT );
-        MALLOC_ASSERT( isAligned(alignedArea, alignment), ASSERT_TEXT );
-
-        return alignedArea;
-    }
-    return nullptr;
-}
+                lmb->objectSize = size;
 
-void MemoryPool::putToLLOCache(TLSData *tls, void *object)
-{
-    LargeObjectHdr *header = (LargeObjectHdr*)object - 1;
-    // overwrite backRefIdx to simplify double free detection
-    header->backRefIdx = BackRefIdx();
+                MALLOC_ASSERT(isLargeObject<unknownMem>(alignedArea), ASSERT_TEXT);
+                MALLOC_ASSERT(isAligned(alignedArea, alignment), ASSERT_TEXT);
 
-    if (tls) {
-        tls->markUsed();
-        if (tls->lloc.put(header->memoryBlock, &extMemPool))
-            return;
-    }
-    extMemPool.freeLargeObject(header->memoryBlock);
-}
+                return alignedArea;
+            }
+            return nullptr;
+        }
 
-/*
+        void MemoryPool::putToLLOCache(TLSData *tls, void *object) {
+            LargeObjectHdr *header = (LargeObjectHdr *) object - 1;
+            // overwrite backRefIdx to simplify double free detection
+            header->backRefIdx = BackRefIdx();
+
+            if (tls) {
+                tls->markUsed();
+                if (tls->lloc.put(header->memoryBlock, &extMemPool)) return;
+            }
+            extMemPool.freeLargeObject(header->memoryBlock);
+        }
+
+        /*
  * All aligned allocations fall into one of the following categories:
  *  1. if both request size and alignment are <= maxSegregatedObjectSize,
  *       we just align the size up, and request this amount, because for every size
@@ -2366,471 +2235,430 @@ void MemoryPool::putToLLOCache(TLSData *tls, void *object)
  *       alignment plus minLargeObjectSize can't lead to wrapping.
  * 4. otherwise, aligned large object is allocated.
  */
-static void *allocateAligned(MemoryPool *memPool, size_t size, size_t alignment)
-{
-    MALLOC_ASSERT( isPowerOfTwo(alignment), ASSERT_TEXT );
-
-    if (!isMallocInitialized())
-        if (!doInitialization())
-            return nullptr;
-
-    void *result;
-    if (size<=maxSegregatedObjectSize && alignment<=maxSegregatedObjectSize)
-        result = internalPoolMalloc(memPool, alignUp(size? size: sizeof(size_t), alignment));
-    else if (size<minLargeObjectSize) {
-        if (alignment<=fittingAlignment)
-            result = internalPoolMalloc(memPool, size);
-        else if (size+alignment < minLargeObjectSize) {
-            void *unaligned = internalPoolMalloc(memPool, size+alignment);
-            if (!unaligned) return nullptr;
-            result = alignUp(unaligned, alignment);
-        } else
-            goto LargeObjAlloc;
-    } else {
-    LargeObjAlloc:
-        TLSData *tls = memPool->getTLS(/*create=*/true);
-        // take into account only alignment that are higher then natural
-        result =
-            memPool->getFromLLOCache(tls, size, largeObjectAlignment>alignment?
-                                               largeObjectAlignment: alignment);
-    }
+        static void *allocateAligned(MemoryPool *memPool, size_t size, size_t alignment) {
+            MALLOC_ASSERT(isPowerOfTwo(alignment), ASSERT_TEXT);
+
+            if (!isMallocInitialized())
+                if (!doInitialization()) return nullptr;
+
+            void *result;
+            if (size <= maxSegregatedObjectSize && alignment <= maxSegregatedObjectSize)
+                result = internalPoolMalloc(memPool, alignUp(size ? size : sizeof(size_t), alignment));
+            else if (size < minLargeObjectSize) {
+                if (alignment <= fittingAlignment) result = internalPoolMalloc(memPool, size);
+                else if (size + alignment < minLargeObjectSize) {
+                    void *unaligned = internalPoolMalloc(memPool, size + alignment);
+                    if (!unaligned) return nullptr;
+                    result = alignUp(unaligned, alignment);
+                } else
+                    goto LargeObjAlloc;
+            } else {
+            LargeObjAlloc:
+                TLSData *tls = memPool->getTLS(/*create=*/true);
+                // take into account only alignment that are higher then natural
+                result = memPool->getFromLLOCache(
+                        tls, size, largeObjectAlignment > alignment ? largeObjectAlignment : alignment);
+            }
 
-    MALLOC_ASSERT( isAligned(result, alignment), ASSERT_TEXT );
-    return result;
-}
+            MALLOC_ASSERT(isAligned(result, alignment), ASSERT_TEXT);
+            return result;
+        }
 
-static void *reallocAligned(MemoryPool *memPool, void *ptr,
-                            size_t newSize, size_t alignment = 0)
-{
-    void *result;
-    size_t copySize;
+        static void *reallocAligned(MemoryPool *memPool, void *ptr, size_t newSize, size_t alignment = 0) {
+            void *result;
+            size_t copySize;
 
-    if (isLargeObject<ourMem>(ptr)) {
-        LargeMemoryBlock* lmb = ((LargeObjectHdr *)ptr - 1)->memoryBlock;
-        copySize = lmb->unalignedSize-((uintptr_t)ptr-(uintptr_t)lmb);
+            if (isLargeObject<ourMem>(ptr)) {
+                LargeMemoryBlock *lmb = ((LargeObjectHdr *) ptr - 1)->memoryBlock;
+                copySize = lmb->unalignedSize - ((uintptr_t) ptr - (uintptr_t) lmb);
 
-        // Apply different strategies if size decreases
-        if (newSize <= copySize && (0 == alignment || isAligned(ptr, alignment))) {
+                // Apply different strategies if size decreases
+                if (newSize <= copySize && (0 == alignment || isAligned(ptr, alignment))) {
 
-            // For huge objects (that do not fit in backend cache), keep the same space unless
-            // the new size is at least twice smaller
-            bool isMemoryBlockHuge = copySize > memPool->extMemPool.backend.getMaxBinnedSize();
-            size_t threshold = isMemoryBlockHuge ? copySize / 2 : 0;
-            if (newSize > threshold) {
-                lmb->objectSize = newSize;
-                return ptr;
-            }
-            // TODO: For large objects suitable for the backend cache,
-            // split out the excessive part and put it to the backend.
-        }
-        // Reallocate for real
-        copySize = lmb->objectSize;
+                    // For huge objects (that do not fit in backend cache), keep the same space unless
+                    // the new size is at least twice smaller
+                    bool isMemoryBlockHuge = copySize > memPool->extMemPool.backend.getMaxBinnedSize();
+                    size_t threshold = isMemoryBlockHuge ? copySize / 2 : 0;
+                    if (newSize > threshold) {
+                        lmb->objectSize = newSize;
+                        return ptr;
+                    }
+                    // TODO: For large objects suitable for the backend cache,
+                    // split out the excessive part and put it to the backend.
+                }
+                // Reallocate for real
+                copySize = lmb->objectSize;
 #if BACKEND_HAS_MREMAP
-        if (void *r = memPool->extMemPool.remap(ptr, copySize, newSize,
-                          alignment < largeObjectAlignment ? largeObjectAlignment : alignment))
-            return r;
+                if (void *r = memPool->extMemPool.remap(
+                            ptr, copySize, newSize,
+                            alignment < largeObjectAlignment ? largeObjectAlignment : alignment))
+                    return r;
 #endif
-        result = alignment ? allocateAligned(memPool, newSize, alignment) :
-            internalPoolMalloc(memPool, newSize);
+                result = alignment ? allocateAligned(memPool, newSize, alignment)
+                                   : internalPoolMalloc(memPool, newSize);
 
-    } else {
-        Block* block = (Block *)alignDown(ptr, slabSize);
-        copySize = block->findObjectSize(ptr);
-
-        // TODO: Move object to another bin if size decreases and the current bin is "empty enough".
-        // Currently, in case of size decreasing, old pointer is returned
-        if (newSize <= copySize && (0==alignment || isAligned(ptr, alignment))) {
-            return ptr;
-        } else {
-            result = alignment ? allocateAligned(memPool, newSize, alignment) :
-                internalPoolMalloc(memPool, newSize);
+            } else {
+                Block *block = (Block *) alignDown(ptr, slabSize);
+                copySize = block->findObjectSize(ptr);
+
+                // TODO: Move object to another bin if size decreases and the current bin is "empty enough".
+                // Currently, in case of size decreasing, old pointer is returned
+                if (newSize <= copySize && (0 == alignment || isAligned(ptr, alignment))) {
+                    return ptr;
+                } else {
+                    result = alignment ? allocateAligned(memPool, newSize, alignment)
+                                       : internalPoolMalloc(memPool, newSize);
+                }
+            }
+            if (result) {
+                memcpy(result, ptr, copySize < newSize ? copySize : newSize);
+                internalPoolFree(memPool, ptr, 0);
+            }
+            return result;
         }
-    }
-    if (result) {
-        memcpy(result, ptr, copySize < newSize ? copySize : newSize);
-        internalPoolFree(memPool, ptr, 0);
-    }
-    return result;
-}
 
 #if MALLOC_DEBUG
-/* A predicate checks if an object is properly placed inside its block */
-inline bool Block::isProperlyPlaced(const void *object) const
-{
-    return 0 == ((uintptr_t)this + slabSize - (uintptr_t)object) % objectSize;
-}
+        /* A predicate checks if an object is properly placed inside its block */
+        inline bool Block::isProperlyPlaced(const void *object) const {
+            return 0 == ((uintptr_t) this + slabSize - (uintptr_t) object) % objectSize;
+        }
 #endif
 
-/* Finds the real object inside the block */
-FreeObject *Block::findAllocatedObject(const void *address) const
-{
-    // calculate offset from the end of the block space
-    uint16_t offset = (uintptr_t)this + slabSize - (uintptr_t)address;
-    MALLOC_ASSERT( offset<=slabSize-sizeof(Block), ASSERT_TEXT );
-    // find offset difference from a multiple of allocation size
-    offset %= objectSize;
-    // and move the address down to where the real object starts.
-    return (FreeObject*)((uintptr_t)address - (offset? objectSize-offset: 0));
-}
+        /* Finds the real object inside the block */
+        FreeObject *Block::findAllocatedObject(const void *address) const {
+            // calculate offset from the end of the block space
+            uint16_t offset = (uintptr_t) this + slabSize - (uintptr_t) address;
+            MALLOC_ASSERT(offset <= slabSize - sizeof(Block), ASSERT_TEXT);
+            // find offset difference from a multiple of allocation size
+            offset %= objectSize;
+            // and move the address down to where the real object starts.
+            return (FreeObject *) ((uintptr_t) address - (offset ? objectSize - offset : 0));
+        }
 
-/*
+        /*
  * Bad dereference caused by a foreign pointer is possible only here, not earlier in call chain.
  * Separate function isolates SEH code, as it has bad influence on compiler optimization.
  */
-static inline BackRefIdx safer_dereference (const BackRefIdx *ptr)
-{
-    BackRefIdx id;
+        static inline BackRefIdx safer_dereference(const BackRefIdx *ptr) {
+            BackRefIdx id;
 #if _MSC_VER
-    __try {
+            __try {
 #endif
-        id = dereference(ptr);
+                id = dereference(ptr);
 #if _MSC_VER
-    } __except( GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION?
-                EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH ) {
-        id = BackRefIdx();
-    }
+            } __except (GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION ? EXCEPTION_EXECUTE_HANDLER
+                                                                         : EXCEPTION_CONTINUE_SEARCH) {
+                id = BackRefIdx();
+            }
 #endif
-    return id;
-}
+            return id;
+        }
 
-template<MemoryOrigin memOrigin>
-bool isLargeObject(void *object)
-{
-    if (!isAligned(object, largeObjectAlignment))
-        return false;
-    LargeObjectHdr *header = (LargeObjectHdr*)object - 1;
-    BackRefIdx idx = (memOrigin == unknownMem) ?
-        safer_dereference(&header->backRefIdx) : dereference(&header->backRefIdx);
-
-    return idx.isLargeObject()
-        // in valid LargeObjectHdr memoryBlock is not nullptr
-        && header->memoryBlock
-        // in valid LargeObjectHdr memoryBlock points somewhere before header
-        // TODO: more strict check
-        && (uintptr_t)header->memoryBlock < (uintptr_t)header
-        && getBackRef(idx) == header;
-}
+        template <MemoryOrigin memOrigin>
+        bool isLargeObject(void *object) {
+            if (!isAligned(object, largeObjectAlignment)) return false;
+            LargeObjectHdr *header = (LargeObjectHdr *) object - 1;
+            BackRefIdx idx = (memOrigin == unknownMem) ? safer_dereference(&header->backRefIdx)
+                                                       : dereference(&header->backRefIdx);
+
+            return idx.isLargeObject()
+                   // in valid LargeObjectHdr memoryBlock is not nullptr
+                   && header->memoryBlock
+                   // in valid LargeObjectHdr memoryBlock points somewhere before header
+                   // TODO: more strict check
+                   && (uintptr_t) header->memoryBlock < (uintptr_t) header && getBackRef(idx) == header;
+        }
 
-static inline bool isSmallObject (void *ptr)
-{
-    Block* expectedBlock = (Block*)alignDown(ptr, slabSize);
-    const BackRefIdx* idx = expectedBlock->getBackRefIdx();
+        static inline bool isSmallObject(void *ptr) {
+            Block *expectedBlock = (Block *) alignDown(ptr, slabSize);
+            const BackRefIdx *idx = expectedBlock->getBackRefIdx();
 
-    bool isSmall = expectedBlock == getBackRef(safer_dereference(idx));
-    if (isSmall)
-        expectedBlock->checkFreePrecond(ptr);
-    return isSmall;
-}
+            bool isSmall = expectedBlock == getBackRef(safer_dereference(idx));
+            if (isSmall) expectedBlock->checkFreePrecond(ptr);
+            return isSmall;
+        }
 
-/**** Check if an object was allocated by scalable_malloc ****/
-static inline bool isRecognized (void* ptr)
-{
-    return defaultMemPool->extMemPool.backend.ptrCanBeValid(ptr) &&
-        (isLargeObject<unknownMem>(ptr) || isSmallObject(ptr));
-}
+        /**** Check if an object was allocated by scalable_malloc ****/
+        static inline bool isRecognized(void *ptr) {
+            return defaultMemPool->extMemPool.backend.ptrCanBeValid(ptr)
+                   && (isLargeObject<unknownMem>(ptr) || isSmallObject(ptr));
+        }
 
-static inline void freeSmallObject(void *object)
-{
-    /* mask low bits to get the block */
-    Block *block = (Block *)alignDown(object, slabSize);
-    block->checkFreePrecond(object);
+        static inline void freeSmallObject(void *object) {
+            /* mask low bits to get the block */
+            Block *block = (Block *) alignDown(object, slabSize);
+            block->checkFreePrecond(object);
 
 #if MALLOC_CHECK_RECURSION
-    if (block->isStartupAllocObject()) {
-        ((StartupBlock *)block)->free(object);
-        return;
-    }
+            if (block->isStartupAllocObject()) {
+                ((StartupBlock *) block)->free(object);
+                return;
+            }
 #endif
-    if (block->isOwnedByCurrentThread()) {
-        block->freeOwnObject(object);
-    } else { /* Slower path to add to the shared list, the allocatedCount is updated by the owner thread in malloc. */
-        FreeObject *objectToFree = block->findObjectToFree(object);
-        block->freePublicObject(objectToFree);
-    }
-}
+            if (block->isOwnedByCurrentThread()) {
+                block->freeOwnObject(object);
+            } else { /* Slower path to add to the shared list, the allocatedCount is updated by the owner thread in malloc. */
+                FreeObject *objectToFree = block->findObjectToFree(object);
+                block->freePublicObject(objectToFree);
+            }
+        }
 
-static void *internalPoolMalloc(MemoryPool* memPool, size_t size)
-{
-    Bin* bin;
-    Block * mallocBlock;
+        static void *internalPoolMalloc(MemoryPool *memPool, size_t size) {
+            Bin *bin;
+            Block *mallocBlock;
 
-    if (!memPool) return nullptr;
+            if (!memPool) return nullptr;
 
-    if (!size) size = sizeof(size_t);
+            if (!size) size = sizeof(size_t);
 
-    TLSData *tls = memPool->getTLS(/*create=*/true);
+            TLSData *tls = memPool->getTLS(/*create=*/true);
 
-    /* Allocate a large object */
-    if (size >= minLargeObjectSize)
-        return memPool->getFromLLOCache(tls, size, largeObjectAlignment);
+            /* Allocate a large object */
+            if (size >= minLargeObjectSize) return memPool->getFromLLOCache(tls, size, largeObjectAlignment);
 
-    if (!tls) return nullptr;
+            if (!tls) return nullptr;
 
-    tls->markUsed();
-    /*
+            tls->markUsed();
+            /*
      * Get an element in thread-local array corresponding to the given size;
      * It keeps ptr to the active block for allocations of this size
      */
-    bin = tls->getAllocationBin(size);
-    if ( !bin ) return nullptr;
-
-    /* Get a block to try to allocate in. */
-    for( mallocBlock = bin->getActiveBlock(); mallocBlock;
-         mallocBlock = bin->setPreviousBlockActive() ) // the previous block should be empty enough
-    {
-        if( FreeObject *result = mallocBlock->allocate() )
-            return result;
-    }
+            bin = tls->getAllocationBin(size);
+            if (!bin) return nullptr;
+
+            /* Get a block to try to allocate in. */
+            for (mallocBlock = bin->getActiveBlock(); mallocBlock;
+                 mallocBlock = bin->setPreviousBlockActive())// the previous block should be empty enough
+            {
+                if (FreeObject *result = mallocBlock->allocate()) return result;
+            }
 
-    /*
+            /*
      * else privatize publicly freed objects in some block and allocate from it
      */
-    mallocBlock = bin->getPrivatizedFreeListBlock();
-    if (mallocBlock) {
-        MALLOC_ASSERT( mallocBlock->freeListNonNull(), ASSERT_TEXT );
-        if ( FreeObject *result = mallocBlock->allocateFromFreeList() )
-            return result;
-        /* Else something strange happened, need to retry from the beginning; */
-        TRACEF(( "[ScalableMalloc trace] Something is wrong: no objects in public free list; reentering.\n" ));
-        return internalPoolMalloc(memPool, size);
-    }
+            mallocBlock = bin->getPrivatizedFreeListBlock();
+            if (mallocBlock) {
+                MALLOC_ASSERT(mallocBlock->freeListNonNull(), ASSERT_TEXT);
+                if (FreeObject *result = mallocBlock->allocateFromFreeList()) return result;
+                /* Else something strange happened, need to retry from the beginning; */
+                TRACEF(("[ScalableMalloc trace] Something is wrong: no objects in public free list; "
+                        "reentering.\n"));
+                return internalPoolMalloc(memPool, size);
+            }
 
-    /*
+            /*
      * no suitable own blocks, try to get a partial block that some other thread has discarded.
      */
-    mallocBlock = memPool->extMemPool.orphanedBlocks.get(tls, size);
-    while (mallocBlock) {
-        bin->pushTLSBin(mallocBlock);
-        bin->setActiveBlock(mallocBlock); // TODO: move under the below condition?
-        if( FreeObject *result = mallocBlock->allocate() )
-            return result;
-        mallocBlock = memPool->extMemPool.orphanedBlocks.get(tls, size);
-    }
+            mallocBlock = memPool->extMemPool.orphanedBlocks.get(tls, size);
+            while (mallocBlock) {
+                bin->pushTLSBin(mallocBlock);
+                bin->setActiveBlock(mallocBlock);// TODO: move under the below condition?
+                if (FreeObject *result = mallocBlock->allocate()) return result;
+                mallocBlock = memPool->extMemPool.orphanedBlocks.get(tls, size);
+            }
 
-    /*
+            /*
      * else try to get a new empty block
      */
-    mallocBlock = memPool->getEmptyBlock(size);
-    if (mallocBlock) {
-        bin->pushTLSBin(mallocBlock);
-        bin->setActiveBlock(mallocBlock);
-        if( FreeObject *result = mallocBlock->allocate() )
-            return result;
-        /* Else something strange happened, need to retry from the beginning; */
-        TRACEF(( "[ScalableMalloc trace] Something is wrong: no objects in empty block; reentering.\n" ));
-        return internalPoolMalloc(memPool, size);
-    }
-    /*
+            mallocBlock = memPool->getEmptyBlock(size);
+            if (mallocBlock) {
+                bin->pushTLSBin(mallocBlock);
+                bin->setActiveBlock(mallocBlock);
+                if (FreeObject *result = mallocBlock->allocate()) return result;
+                /* Else something strange happened, need to retry from the beginning; */
+                TRACEF(("[ScalableMalloc trace] Something is wrong: no objects in empty block; "
+                        "reentering.\n"));
+                return internalPoolMalloc(memPool, size);
+            }
+            /*
      * else nothing works so return nullptr
      */
-    TRACEF(( "[ScalableMalloc trace] No memory found, returning nullptr.\n" ));
-    return nullptr;
-}
+            TRACEF(("[ScalableMalloc trace] No memory found, returning nullptr.\n"));
+            return nullptr;
+        }
 
-// When size==0 (i.e. unknown), detect here whether the object is large.
-// For size is known and < minLargeObjectSize, we still need to check
-// if the actual object is large, because large objects might be used
-// for aligned small allocations.
-static bool internalPoolFree(MemoryPool *memPool, void *object, size_t size)
-{
-    if (!memPool || !object) return false;
-
-    // The library is initialized at allocation call, so releasing while
-    // not initialized means foreign object is releasing.
-    MALLOC_ASSERT(isMallocInitialized(), ASSERT_TEXT);
-    MALLOC_ASSERT(memPool->extMemPool.userPool() || isRecognized(object),
-                  "Invalid pointer during object releasing is detected.");
-
-    if (size >= minLargeObjectSize || isLargeObject<ourMem>(object))
-        memPool->putToLLOCache(memPool->getTLS(/*create=*/false), object);
-    else
-        freeSmallObject(object);
-    return true;
-}
+        // When size==0 (i.e. unknown), detect here whether the object is large.
+        // For size is known and < minLargeObjectSize, we still need to check
+        // if the actual object is large, because large objects might be used
+        // for aligned small allocations.
+        static bool internalPoolFree(MemoryPool *memPool, void *object, size_t size) {
+            if (!memPool || !object) return false;
+
+            // The library is initialized at allocation call, so releasing while
+            // not initialized means foreign object is releasing.
+            MALLOC_ASSERT(isMallocInitialized(), ASSERT_TEXT);
+            MALLOC_ASSERT(memPool->extMemPool.userPool() || isRecognized(object),
+                          "Invalid pointer during object releasing is detected.");
+
+            if (size >= minLargeObjectSize || isLargeObject<ourMem>(object))
+                memPool->putToLLOCache(memPool->getTLS(/*create=*/false), object);
+            else
+                freeSmallObject(object);
+            return true;
+        }
 
-static void *internalMalloc(size_t size)
-{
-    if (!size) size = sizeof(size_t);
+        static void *internalMalloc(size_t size) {
+            if (!size) size = sizeof(size_t);
 
 #if MALLOC_CHECK_RECURSION
-    if (RecursiveMallocCallProtector::sameThreadActive())
-        return size<minLargeObjectSize? StartupBlock::allocate(size) :
-            // nested allocation, so skip tls
-            (FreeObject*)defaultMemPool->getFromLLOCache(nullptr, size, slabSize);
+            if (RecursiveMallocCallProtector::sameThreadActive())
+                return size < minLargeObjectSize ? StartupBlock::allocate(size) :
+                                                 // nested allocation, so skip tls
+                               (FreeObject *) defaultMemPool->getFromLLOCache(nullptr, size, slabSize);
 #endif
 
-    if (!isMallocInitialized())
-        if (!doInitialization())
-            return nullptr;
-    return internalPoolMalloc(defaultMemPool, size);
-}
-
-static void internalFree(void *object)
-{
-    internalPoolFree(defaultMemPool, object, 0);
-}
+            if (!isMallocInitialized())
+                if (!doInitialization()) return nullptr;
+            return internalPoolMalloc(defaultMemPool, size);
+        }
 
-static size_t internalMsize(void* ptr)
-{
-    MALLOC_ASSERT(ptr, "Invalid pointer passed to internalMsize");
-    if (isLargeObject<ourMem>(ptr)) {
-        // TODO: return the maximum memory size, that can be written to this object
-        LargeMemoryBlock* lmb = ((LargeObjectHdr*)ptr - 1)->memoryBlock;
-        return lmb->objectSize;
-    } else {
-        Block *block = (Block*)alignDown(ptr, slabSize);
-        return block->findObjectSize(ptr);
-    }
-}
+        static void internalFree(void *object) { internalPoolFree(defaultMemPool, object, 0); }
 
-} // namespace internal
+        static size_t internalMsize(void *ptr) {
+            MALLOC_ASSERT(ptr, "Invalid pointer passed to internalMsize");
+            if (isLargeObject<ourMem>(ptr)) {
+                // TODO: return the maximum memory size, that can be written to this object
+                LargeMemoryBlock *lmb = ((LargeObjectHdr *) ptr - 1)->memoryBlock;
+                return lmb->objectSize;
+            } else {
+                Block *block = (Block *) alignDown(ptr, slabSize);
+                return block->findObjectSize(ptr);
+            }
+        }
 
-using namespace rml::internal;
+    }// namespace internal
 
-// legacy entry point saved for compatibility with binaries complied
-// with pre-6003 versions of TBB
-TBBMALLOC_EXPORT rml::MemoryPool *pool_create(intptr_t pool_id, const MemPoolPolicy *policy)
-{
-    rml::MemoryPool *pool;
-    MemPoolPolicy pol(policy->pAlloc, policy->pFree, policy->granularity);
+    using namespace rml::internal;
 
-    pool_create_v1(pool_id, &pol, &pool);
-    return pool;
-}
+    // legacy entry point saved for compatibility with binaries complied
+    // with pre-6003 versions of TBB
+    TBBMALLOC_EXPORT rml::MemoryPool *pool_create(intptr_t pool_id, const MemPoolPolicy *policy) {
+        rml::MemoryPool *pool;
+        MemPoolPolicy pol(policy->pAlloc, policy->pFree, policy->granularity);
 
-rml::MemPoolError pool_create_v1(intptr_t pool_id, const MemPoolPolicy *policy,
-                                 rml::MemoryPool **pool)
-{
-    if ( !policy->pAlloc || policy->version<MemPoolPolicy::TBBMALLOC_POOL_VERSION
-         // empty pFree allowed only for fixed pools
-         || !(policy->fixedPool || policy->pFree)) {
-        *pool = nullptr;
-        return INVALID_POLICY;
-    }
-    if ( policy->version>MemPoolPolicy::TBBMALLOC_POOL_VERSION // future versions are not supported
-         // new flags can be added in place of reserved, but default
-         // behaviour must be supported by this version
-         || policy->reserved ) {
-        *pool = nullptr;
-        return UNSUPPORTED_POLICY;
+        pool_create_v1(pool_id, &pol, &pool);
+        return pool;
     }
-    if (!isMallocInitialized())
-        if (!doInitialization()) {
+
+    rml::MemPoolError pool_create_v1(intptr_t pool_id, const MemPoolPolicy *policy, rml::MemoryPool **pool) {
+        if (!policy->pAlloc
+            || policy->version < MemPoolPolicy::TBBMALLOC_POOL_VERSION
+            // empty pFree allowed only for fixed pools
+            || !(policy->fixedPool || policy->pFree)) {
+            *pool = nullptr;
+            return INVALID_POLICY;
+        }
+        if (policy->version > MemPoolPolicy::TBBMALLOC_POOL_VERSION// future versions are not supported
+            // new flags can be added in place of reserved, but default
+            // behaviour must be supported by this version
+            || policy->reserved) {
+            *pool = nullptr;
+            return UNSUPPORTED_POLICY;
+        }
+        if (!isMallocInitialized())
+            if (!doInitialization()) {
+                *pool = nullptr;
+                return NO_MEMORY;
+            }
+        rml::internal::MemoryPool *memPool
+                = (rml::internal::MemoryPool *) internalMalloc((sizeof(rml::internal::MemoryPool)));
+        if (!memPool) {
+            *pool = nullptr;
+            return NO_MEMORY;
+        }
+        memset(static_cast<void *>(memPool), 0, sizeof(rml::internal::MemoryPool));
+        if (!memPool->init(pool_id, policy)) {
+            internalFree(memPool);
             *pool = nullptr;
             return NO_MEMORY;
         }
-    rml::internal::MemoryPool *memPool =
-        (rml::internal::MemoryPool*)internalMalloc((sizeof(rml::internal::MemoryPool)));
-    if (!memPool) {
-        *pool = nullptr;
-        return NO_MEMORY;
-    }
-    memset(static_cast<void*>(memPool), 0, sizeof(rml::internal::MemoryPool));
-    if (!memPool->init(pool_id, policy)) {
-        internalFree(memPool);
-        *pool = nullptr;
-        return NO_MEMORY;
-    }
-
-    *pool = (rml::MemoryPool*)memPool;
-    return POOL_OK;
-}
 
-bool pool_destroy(rml::MemoryPool* memPool)
-{
-    if (!memPool) return false;
-    bool ret = ((rml::internal::MemoryPool*)memPool)->destroy();
-    internalFree(memPool);
+        *pool = (rml::MemoryPool *) memPool;
+        return POOL_OK;
+    }
 
-    return ret;
-}
+    bool pool_destroy(rml::MemoryPool *memPool) {
+        if (!memPool) return false;
+        bool ret = ((rml::internal::MemoryPool *) memPool)->destroy();
+        internalFree(memPool);
 
-bool pool_reset(rml::MemoryPool* memPool)
-{
-    if (!memPool) return false;
+        return ret;
+    }
 
-    return ((rml::internal::MemoryPool*)memPool)->reset();
-}
+    bool pool_reset(rml::MemoryPool *memPool) {
+        if (!memPool) return false;
 
-void *pool_malloc(rml::MemoryPool* mPool, size_t size)
-{
-    return internalPoolMalloc((rml::internal::MemoryPool*)mPool, size);
-}
+        return ((rml::internal::MemoryPool *) memPool)->reset();
+    }
 
-void *pool_realloc(rml::MemoryPool* mPool, void *object, size_t size)
-{
-    if (!object)
-        return internalPoolMalloc((rml::internal::MemoryPool*)mPool, size);
-    if (!size) {
-        internalPoolFree((rml::internal::MemoryPool*)mPool, object, 0);
-        return nullptr;
+    void *pool_malloc(rml::MemoryPool *mPool, size_t size) {
+        return internalPoolMalloc((rml::internal::MemoryPool *) mPool, size);
     }
-    return reallocAligned((rml::internal::MemoryPool*)mPool, object, size, 0);
-}
 
-void *pool_aligned_malloc(rml::MemoryPool* mPool, size_t size, size_t alignment)
-{
-    if (!isPowerOfTwo(alignment) || 0==size)
-        return nullptr;
+    void *pool_realloc(rml::MemoryPool *mPool, void *object, size_t size) {
+        if (!object) return internalPoolMalloc((rml::internal::MemoryPool *) mPool, size);
+        if (!size) {
+            internalPoolFree((rml::internal::MemoryPool *) mPool, object, 0);
+            return nullptr;
+        }
+        return reallocAligned((rml::internal::MemoryPool *) mPool, object, size, 0);
+    }
 
-    return allocateAligned((rml::internal::MemoryPool*)mPool, size, alignment);
-}
+    void *pool_aligned_malloc(rml::MemoryPool *mPool, size_t size, size_t alignment) {
+        if (!isPowerOfTwo(alignment) || 0 == size) return nullptr;
 
-void *pool_aligned_realloc(rml::MemoryPool* memPool, void *ptr, size_t size, size_t alignment)
-{
-    if (!isPowerOfTwo(alignment))
-        return nullptr;
-    rml::internal::MemoryPool *mPool = (rml::internal::MemoryPool*)memPool;
-    void *tmp;
+        return allocateAligned((rml::internal::MemoryPool *) mPool, size, alignment);
+    }
 
-    if (!ptr)
-        tmp = allocateAligned(mPool, size, alignment);
-    else if (!size) {
-        internalPoolFree(mPool, ptr, 0);
-        return nullptr;
-    } else
-        tmp = reallocAligned(mPool, ptr, size, alignment);
+    void *pool_aligned_realloc(rml::MemoryPool *memPool, void *ptr, size_t size, size_t alignment) {
+        if (!isPowerOfTwo(alignment)) return nullptr;
+        rml::internal::MemoryPool *mPool = (rml::internal::MemoryPool *) memPool;
+        void *tmp;
 
-    return tmp;
-}
+        if (!ptr) tmp = allocateAligned(mPool, size, alignment);
+        else if (!size) {
+            internalPoolFree(mPool, ptr, 0);
+            return nullptr;
+        } else
+            tmp = reallocAligned(mPool, ptr, size, alignment);
 
-bool pool_free(rml::MemoryPool *mPool, void *object)
-{
-    return internalPoolFree((rml::internal::MemoryPool*)mPool, object, 0);
-}
+        return tmp;
+    }
 
-rml::MemoryPool *pool_identify(void *object)
-{
-    rml::internal::MemoryPool *pool;
-    if (isLargeObject<ourMem>(object)) {
-        LargeObjectHdr *header = (LargeObjectHdr*)object - 1;
-        pool = header->memoryBlock->pool;
-    } else {
-        Block *block = (Block*)alignDown(object, slabSize);
-        pool = block->getMemPool();
+    bool pool_free(rml::MemoryPool *mPool, void *object) {
+        return internalPoolFree((rml::internal::MemoryPool *) mPool, object, 0);
     }
-    // do not return defaultMemPool, as it can't be used in pool_free() etc
-    __TBB_ASSERT_RELEASE(pool!=defaultMemPool,
-        "rml::pool_identify() can't be used for scalable_malloc() etc results.");
-    return (rml::MemoryPool*)pool;
-}
 
-size_t pool_msize(rml::MemoryPool *mPool, void* object)
-{
-    if (object) {
-        // No assert for object recognition, cause objects allocated from non-default
-        // memory pool do not participate in range checking and do not have valid backreferences for
-        // small objects. Instead, check that an object belong to the certain memory pool.
-        MALLOC_ASSERT_EX(mPool == pool_identify(object), "Object does not belong to the specified pool");
-        return internalMsize(object);
+    rml::MemoryPool *pool_identify(void *object) {
+        rml::internal::MemoryPool *pool;
+        if (isLargeObject<ourMem>(object)) {
+            LargeObjectHdr *header = (LargeObjectHdr *) object - 1;
+            pool = header->memoryBlock->pool;
+        } else {
+            Block *block = (Block *) alignDown(object, slabSize);
+            pool = block->getMemPool();
+        }
+        // do not return defaultMemPool, as it can't be used in pool_free() etc
+        __TBB_ASSERT_RELEASE(pool != defaultMemPool,
+                             "rml::pool_identify() can't be used for scalable_malloc() etc results.");
+        return (rml::MemoryPool *) pool;
+    }
+
+    size_t pool_msize(rml::MemoryPool *mPool, void *object) {
+        if (object) {
+            // No assert for object recognition, cause objects allocated from non-default
+            // memory pool do not participate in range checking and do not have valid backreferences for
+            // small objects. Instead, check that an object belong to the certain memory pool.
+            MALLOC_ASSERT_EX(mPool == pool_identify(object), "Object does not belong to the specified pool");
+            return internalMsize(object);
+        }
+        errno = EINVAL;
+        // Unlike _msize, return 0 in case of parameter error.
+        // Returning size_t(-1) looks more like the way to troubles.
+        return 0;
     }
-    errno = EINVAL;
-    // Unlike _msize, return 0 in case of parameter error.
-    // Returning size_t(-1) looks more like the way to troubles.
-    return 0;
-}
 
-} // namespace rml
+}// namespace rml
 
 using namespace rml::internal;
 
@@ -2852,10 +2680,9 @@ static unsigned int threadGoingDownCount = 0;
  *
 */
 // TODO: Consider making this function part of class MemoryPool.
-void doThreadShutdownNotification(TLSData* tls, bool main_thread)
-{
-    TRACEF(( "[ScalableMalloc trace] Thread id %d blocks return start %d\n",
-             getThreadId(),  threadGoingDownCount++ ));
+void doThreadShutdownNotification(TLSData *tls, bool main_thread) {
+    TRACEF(("[ScalableMalloc trace] Thread id %d blocks return start %d\n", getThreadId(),
+            threadGoingDownCount++));
 
 #if USE_PTHREAD
     if (tls) {
@@ -2865,7 +2692,7 @@ void doThreadShutdownNotification(TLSData* tls, bool main_thread)
     } else
 #endif
     {
-        suppress_unused_warning(tls); // not used on Windows
+        suppress_unused_warning(tls);// not used on Windows
         // The default pool is safe to use at this point:
         //   on Linux, only the main thread can go here before destroying defaultMemPool;
         //   on Windows, shutdown is synchronized via loader lock and isMallocInitialized().
@@ -2875,62 +2702,55 @@ void doThreadShutdownNotification(TLSData* tls, bool main_thread)
         // (e.g. on Windows the main thread might deadlock)
         bool locked = false;
         MallocMutex::scoped_lock lock(MemoryPool::memPoolListLock, /*wait=*/!main_thread, &locked);
-        if (locked) { // the list is safe to process
+        if (locked) {// the list is safe to process
             for (MemoryPool *memPool = defaultMemPool->next; memPool; memPool = memPool->next)
                 memPool->onThreadShutdown(memPool->getTLS(/*create=*/false));
         }
     }
 
-    TRACEF(( "[ScalableMalloc trace] Thread id %d blocks return end\n", getThreadId() ));
+    TRACEF(("[ScalableMalloc trace] Thread id %d blocks return end\n", getThreadId()));
 }
 
 #if USE_PTHREAD
-void mallocThreadShutdownNotification(void* arg)
-{
+void mallocThreadShutdownNotification(void *arg) {
     // The routine is called for each pool (as TLS dtor) on each thread, except for the main thread
     if (!isMallocInitialized()) return;
-    doThreadShutdownNotification((TLSData*)arg, false);
+    doThreadShutdownNotification((TLSData *) arg, false);
 }
 #else
-extern "C" void __TBB_mallocThreadShutdownNotification()
-{
+extern "C" void __TBB_mallocThreadShutdownNotification() {
     // The routine is called once per thread on Windows
     if (!isMallocInitialized()) return;
     doThreadShutdownNotification(nullptr, false);
 }
 #endif
 
-extern "C" void __TBB_mallocProcessShutdownNotification(bool windows_process_dying)
-{
+extern "C" void __TBB_mallocProcessShutdownNotification(bool windows_process_dying) {
     if (!isMallocInitialized()) return;
 
     // Don't clean allocator internals if the entire process is exiting
-    if (!windows_process_dying) {
-        doThreadShutdownNotification(nullptr, /*main_thread=*/true);
-    }
-#if  __TBB_MALLOC_LOCACHE_STAT
-    printf("cache hit ratio %f, size hit %f\n",
-           1.*cacheHits/mallocCalls, 1.*memHitKB/memAllocKB);
+    if (!windows_process_dying) { doThreadShutdownNotification(nullptr, /*main_thread=*/true); }
+#if __TBB_MALLOC_LOCACHE_STAT
+    printf("cache hit ratio %f, size hit %f\n", 1. * cacheHits / mallocCalls, 1. * memHitKB / memAllocKB);
     defaultMemPool->extMemPool.loc.reportStat(stdout);
 #endif
 
     shutdownSync.processExit();
 #if __TBB_SOURCE_DIRECTLY_INCLUDED
-/* Pthread keys must be deleted as soon as possible to not call key dtor
+    /* Pthread keys must be deleted as soon as possible to not call key dtor
    on thread termination when then the tbbmalloc code can be already unloaded.
 */
     defaultMemPool->destroy();
     destroyBackRefMain(&defaultMemPool->extMemPool.backend);
-    ThreadId::destroy();      // Delete key for thread id
+    ThreadId::destroy();// Delete key for thread id
     hugePages.reset();
     // new total malloc initialization is possible after this point
     mallocInitialized.store(0, std::memory_order_release);
-#endif // __TBB_SOURCE_DIRECTLY_INCLUDED
+#endif// __TBB_SOURCE_DIRECTLY_INCLUDED
 
 #if COLLECT_STATISTICS
     unsigned nThreads = ThreadId::getMaxThreadId();
-    for( int i=1; i<=nThreads && i<MAX_THREADS; ++i )
-        STAT_print(i);
+    for (int i = 1; i <= nThreads && i < MAX_THREADS; ++i) STAT_print(i);
 #endif
     if (!usedBySrcIncluded) {
         MALLOC_ITT_FINI_ITTLIB();
@@ -2938,21 +2758,16 @@ extern "C" void __TBB_mallocProcessShutdownNotification(bool windows_process_dyi
     }
 }
 
-extern "C" void * scalable_malloc(size_t size)
-{
+extern "C" void *scalable_malloc(size_t size) {
     void *ptr = internalMalloc(size);
     if (!ptr) errno = ENOMEM;
     return ptr;
 }
 
-extern "C" void scalable_free(void *object)
-{
-    internalFree(object);
-}
+extern "C" void scalable_free(void *object) { internalFree(object); }
 
 #if MALLOC_ZONE_OVERLOAD_ENABLED
-extern "C" TBBMALLOC_EXPORT void __TBB_malloc_free_definite_size(void *object, size_t size)
-{
+extern "C" TBBMALLOC_EXPORT void __TBB_malloc_free_definite_size(void *object, size_t size) {
     internalPoolFree(defaultMemPool, object, size);
 }
 #endif
@@ -2961,13 +2776,12 @@ extern "C" TBBMALLOC_EXPORT void __TBB_malloc_free_definite_size(void *object, s
  * A variant that provides additional memory safety, by checking whether the given address
  * was obtained with this allocator, and if not redirecting to the provided alternative call.
  */
-extern "C" TBBMALLOC_EXPORT void __TBB_malloc_safer_free(void *object, void (*original_free)(void*))
-{
-    if (!object)
-        return;
+extern "C" TBBMALLOC_EXPORT void __TBB_malloc_safer_free(void *object, void (*original_free)(void *)) {
+    if (!object) return;
 
     // tbbmalloc can allocate object only when tbbmalloc has been initialized
-    if (mallocInitialized.load(std::memory_order_acquire) && defaultMemPool->extMemPool.backend.ptrCanBeValid(object)) {
+    if (mallocInitialized.load(std::memory_order_acquire)
+        && defaultMemPool->extMemPool.backend.ptrCanBeValid(object)) {
         if (isLargeObject<unknownMem>(object)) {
             // must check 1st for large object, because small object check touches 4 pages on left,
             // and it can be inaccessible
@@ -2980,8 +2794,7 @@ extern "C" TBBMALLOC_EXPORT void __TBB_malloc_safer_free(void *object, void (*or
             return;
         }
     }
-    if (original_free)
-        original_free(object);
+    if (original_free) original_free(object);
 }
 
 /********* End the free code        *************/
@@ -2996,12 +2809,10 @@ extern "C" TBBMALLOC_EXPORT void __TBB_malloc_safer_free(void *object, void (*or
  * nullptr if the request cannot be satisfied, in which case *p is unchanged."
  *
  */
-extern "C" void* scalable_realloc(void* ptr, size_t size)
-{
+extern "C" void *scalable_realloc(void *ptr, size_t size) {
     void *tmp;
 
-    if (!ptr)
-        tmp = internalMalloc(size);
+    if (!ptr) tmp = internalMalloc(size);
     else if (!size) {
         internalFree(ptr);
         return nullptr;
@@ -3016,9 +2827,8 @@ extern "C" void* scalable_realloc(void* ptr, size_t size)
  * A variant that provides additional memory safety, by checking whether the given address
  * was obtained with this allocator, and if not redirecting to the provided alternative call.
  */
-extern "C" TBBMALLOC_EXPORT void* __TBB_malloc_safer_realloc(void* ptr, size_t sz, void* original_realloc)
-{
-    void *tmp; // TODO: fix warnings about uninitialized use of tmp
+extern "C" TBBMALLOC_EXPORT void *__TBB_malloc_safer_realloc(void *ptr, size_t sz, void *original_realloc) {
+    void *tmp;// TODO: fix warnings about uninitialized use of tmp
 
     if (!ptr) {
         tmp = internalMalloc(sz);
@@ -3032,28 +2842,27 @@ extern "C" TBBMALLOC_EXPORT void* __TBB_malloc_safer_realloc(void* ptr, size_t s
     }
 #if USE_WINTHREAD
     else if (original_realloc && sz) {
-        orig_ptrs *original_ptrs = static_cast<orig_ptrs*>(original_realloc);
-        if ( original_ptrs->msize ){
+        orig_ptrs *original_ptrs = static_cast<orig_ptrs *>(original_realloc);
+        if (original_ptrs->msize) {
             size_t oldSize = original_ptrs->msize(ptr);
             tmp = internalMalloc(sz);
             if (tmp) {
-                memcpy(tmp, ptr, sz<oldSize? sz : oldSize);
-                if ( original_ptrs->free ){
-                    original_ptrs->free( ptr );
-                }
+                memcpy(tmp, ptr, sz < oldSize ? sz : oldSize);
+                if (original_ptrs->free) { original_ptrs->free(ptr); }
             }
         } else
             tmp = nullptr;
     }
 #else
     else if (original_realloc) {
-        typedef void* (*realloc_ptr_t)(void*,size_t);
+        typedef void *(*realloc_ptr_t)(void *, size_t);
         realloc_ptr_t original_realloc_ptr;
-        (void *&)original_realloc_ptr = original_realloc;
-        tmp = original_realloc_ptr(ptr,sz);
+        (void *&) original_realloc_ptr = original_realloc;
+        tmp = original_realloc_ptr(ptr, sz);
     }
 #endif
-    else tmp = nullptr;
+    else
+        tmp = nullptr;
 
     if (!tmp) errno = ENOMEM;
     return tmp;
@@ -3071,21 +2880,19 @@ extern "C" TBBMALLOC_EXPORT void* __TBB_malloc_safer_realloc(void* ptr, size_t s
  *
  */
 
-extern "C" void * scalable_calloc(size_t nobj, size_t size)
-{
+extern "C" void *scalable_calloc(size_t nobj, size_t size) {
     // it's square root of maximal size_t value
-    const size_t mult_not_overflow = size_t(1) << (sizeof(size_t)*CHAR_BIT/2);
+    const size_t mult_not_overflow = size_t(1) << (sizeof(size_t) * CHAR_BIT / 2);
     const size_t arraySize = nobj * size;
 
     // check for overflow during multiplication:
-    if (nobj>=mult_not_overflow || size>=mult_not_overflow) // 1) heuristic check
-        if (nobj && arraySize / nobj != size) {             // 2) exact check
+    if (nobj >= mult_not_overflow || size >= mult_not_overflow)// 1) heuristic check
+        if (nobj && arraySize / nobj != size) {                // 2) exact check
             errno = ENOMEM;
             return nullptr;
         }
-    void* result = internalMalloc(arraySize);
-    if (result)
-        memset(result, 0, arraySize);
+    void *result = internalMalloc(arraySize);
+    if (result) memset(result, 0, arraySize);
     else
         errno = ENOMEM;
     return result;
@@ -3095,20 +2902,16 @@ extern "C" void * scalable_calloc(size_t nobj, size_t size)
 
 /********* Code for aligned allocation API **********/
 
-extern "C" int scalable_posix_memalign(void **memptr, size_t alignment, size_t size)
-{
-    if ( !isPowerOfTwoAtLeast(alignment, sizeof(void*)) )
-        return EINVAL;
+extern "C" int scalable_posix_memalign(void **memptr, size_t alignment, size_t size) {
+    if (!isPowerOfTwoAtLeast(alignment, sizeof(void *))) return EINVAL;
     void *result = allocateAligned(defaultMemPool, size, alignment);
-    if (!result)
-        return ENOMEM;
+    if (!result) return ENOMEM;
     *memptr = result;
     return 0;
 }
 
-extern "C" void * scalable_aligned_malloc(size_t size, size_t alignment)
-{
-    if (!isPowerOfTwo(alignment) || 0==size) {
+extern "C" void *scalable_aligned_malloc(size_t size, size_t alignment) {
+    if (!isPowerOfTwo(alignment) || 0 == size) {
         errno = EINVAL;
         return nullptr;
     }
@@ -3117,16 +2920,14 @@ extern "C" void * scalable_aligned_malloc(size_t size, size_t alignment)
     return tmp;
 }
 
-extern "C" void * scalable_aligned_realloc(void *ptr, size_t size, size_t alignment)
-{
+extern "C" void *scalable_aligned_realloc(void *ptr, size_t size, size_t alignment) {
     if (!isPowerOfTwo(alignment)) {
         errno = EINVAL;
         return nullptr;
     }
     void *tmp;
 
-    if (!ptr)
-        tmp = allocateAligned(defaultMemPool, size, alignment);
+    if (!ptr) tmp = allocateAligned(defaultMemPool, size, alignment);
     else if (!size) {
         scalable_free(ptr);
         return nullptr;
@@ -3137,8 +2938,8 @@ extern "C" void * scalable_aligned_realloc(void *ptr, size_t size, size_t alignm
     return tmp;
 }
 
-extern "C" TBBMALLOC_EXPORT void * __TBB_malloc_safer_aligned_realloc(void *ptr, size_t size, size_t alignment, void* orig_function)
-{
+extern "C" TBBMALLOC_EXPORT void *__TBB_malloc_safer_aligned_realloc(void *ptr, size_t size, size_t alignment,
+                                                                     void *orig_function) {
     /* corner cases left out of reallocAligned to not deal with errno there */
     if (!isPowerOfTwo(alignment)) {
         errno = EINVAL;
@@ -3158,25 +2959,21 @@ extern "C" TBBMALLOC_EXPORT void * __TBB_malloc_safer_aligned_realloc(void *ptr,
     }
 #if USE_WINTHREAD
     else {
-        orig_aligned_ptrs *original_ptrs = static_cast<orig_aligned_ptrs*>(orig_function);
+        orig_aligned_ptrs *original_ptrs = static_cast<orig_aligned_ptrs *>(orig_function);
         if (size) {
             // Without orig_msize, we can't do anything with this.
             // Just keeping old pointer.
-            if ( original_ptrs->aligned_msize ){
+            if (original_ptrs->aligned_msize) {
                 // set alignment and offset to have possibly correct oldSize
-                size_t oldSize = original_ptrs->aligned_msize(ptr, sizeof(void*), 0);
+                size_t oldSize = original_ptrs->aligned_msize(ptr, sizeof(void *), 0);
                 tmp = allocateAligned(defaultMemPool, size, alignment);
                 if (tmp) {
-                    memcpy(tmp, ptr, size<oldSize? size : oldSize);
-                    if ( original_ptrs->aligned_free ){
-                        original_ptrs->aligned_free( ptr );
-                    }
+                    memcpy(tmp, ptr, size < oldSize ? size : oldSize);
+                    if (original_ptrs->aligned_free) { original_ptrs->aligned_free(ptr); }
                 }
             }
         } else {
-            if ( original_ptrs->aligned_free ){
-                original_ptrs->aligned_free( ptr );
-            }
+            if (original_ptrs->aligned_free) { original_ptrs->aligned_free(ptr); }
             return nullptr;
         }
     }
@@ -3189,10 +2986,7 @@ extern "C" TBBMALLOC_EXPORT void * __TBB_malloc_safer_aligned_realloc(void *ptr,
     return tmp;
 }
 
-extern "C" void scalable_aligned_free(void *ptr)
-{
-    internalFree(ptr);
-}
+extern "C" void scalable_aligned_free(void *ptr) { internalFree(ptr); }
 
 /********* end code for aligned allocation API **********/
 
@@ -3201,8 +2995,7 @@ extern "C" void scalable_aligned_free(void *ptr)
 /*
  * Returns the size of a memory block allocated in the heap.
  */
-extern "C" size_t scalable_msize(void* ptr)
-{
+extern "C" size_t scalable_msize(void *ptr) {
     if (ptr) {
         MALLOC_ASSERT(isRecognized(ptr), "Invalid pointer in scalable_msize detected.");
         return internalMsize(ptr);
@@ -3217,8 +3010,7 @@ extern "C" size_t scalable_msize(void* ptr)
  * A variant that provides additional memory safety, by checking whether the given address
  * was obtained with this allocator, and if not redirecting to the provided alternative call.
  */
-extern "C" TBBMALLOC_EXPORT size_t __TBB_malloc_safer_msize(void *object, size_t (*original_msize)(void*))
-{
+extern "C" TBBMALLOC_EXPORT size_t __TBB_malloc_safer_msize(void *object, size_t (*original_msize)(void *)) {
     if (object) {
         // Check if the memory was allocated by scalable_malloc
         if (mallocInitialized.load(std::memory_order_acquire) && isRecognized(object))
@@ -3228,7 +3020,7 @@ extern "C" TBBMALLOC_EXPORT size_t __TBB_malloc_safer_msize(void *object, size_t
     }
     // object is nullptr or unknown, or foreign and no original_msize
 #if USE_WINTHREAD
-    errno = EINVAL; // errno expected to be set only on this platform
+    errno = EINVAL;// errno expected to be set only on this platform
 #endif
     return 0;
 }
@@ -3236,14 +3028,14 @@ extern "C" TBBMALLOC_EXPORT size_t __TBB_malloc_safer_msize(void *object, size_t
 /*
  * The same as above but for _aligned_msize case
  */
-extern "C" TBBMALLOC_EXPORT size_t __TBB_malloc_safer_aligned_msize(void *object, size_t alignment, size_t offset, size_t (*orig_aligned_msize)(void*,size_t,size_t))
-{
+extern "C" TBBMALLOC_EXPORT size_t __TBB_malloc_safer_aligned_msize(
+        void *object, size_t alignment, size_t offset, size_t (*orig_aligned_msize)(void *, size_t, size_t)) {
     if (object) {
         // Check if the memory was allocated by scalable_malloc
         if (mallocInitialized.load(std::memory_order_acquire) && isRecognized(object))
             return internalMsize(object);
         else if (orig_aligned_msize)
-            return orig_aligned_msize(object,alignment,offset);
+            return orig_aligned_msize(object, alignment, offset);
     }
     // object is nullptr or unknown
     errno = EINVAL;
@@ -3252,20 +3044,19 @@ extern "C" TBBMALLOC_EXPORT size_t __TBB_malloc_safer_aligned_msize(void *object
 
 /********* End code for scalable_msize   ***********/
 
-extern "C" int scalable_allocation_mode(int param, intptr_t value)
-{
+extern "C" int scalable_allocation_mode(int param, intptr_t value) {
     if (param == TBBMALLOC_SET_SOFT_HEAP_LIMIT) {
-        defaultMemPool->extMemPool.backend.setRecommendedMaxSize((size_t)value);
+        defaultMemPool->extMemPool.backend.setRecommendedMaxSize((size_t) value);
         return TBBMALLOC_OK;
     } else if (param == USE_HUGE_PAGES) {
 #if __unix__
         switch (value) {
-        case 0:
-        case 1:
-            hugePages.setMode(value);
-            return TBBMALLOC_OK;
-        default:
-            return TBBMALLOC_INVALID_PARAM;
+            case 0:
+            case 1:
+                hugePages.setMode(value);
+                return TBBMALLOC_OK;
+            default:
+                return TBBMALLOC_INVALID_PARAM;
         }
 #else
         return TBBMALLOC_NO_EFFECT;
@@ -3273,37 +3064,35 @@ extern "C" int scalable_allocation_mode(int param, intptr_t value)
 #if __TBB_SOURCE_DIRECTLY_INCLUDED
     } else if (param == TBBMALLOC_INTERNAL_SOURCE_INCLUDED) {
         switch (value) {
-        case 0: // used by dynamic library
-        case 1: // used by static library or directly included sources
-            usedBySrcIncluded = value;
-            return TBBMALLOC_OK;
-        default:
-            return TBBMALLOC_INVALID_PARAM;
+            case 0:// used by dynamic library
+            case 1:// used by static library or directly included sources
+                usedBySrcIncluded = value;
+                return TBBMALLOC_OK;
+            default:
+                return TBBMALLOC_INVALID_PARAM;
         }
 #endif
     } else if (param == TBBMALLOC_SET_HUGE_SIZE_THRESHOLD) {
-        defaultMemPool->extMemPool.loc.setHugeSizeThreshold((size_t)value);
+        defaultMemPool->extMemPool.loc.setHugeSizeThreshold((size_t) value);
         return TBBMALLOC_OK;
     }
     return TBBMALLOC_INVALID_PARAM;
 }
 
-extern "C" int scalable_allocation_command(int cmd, void *param)
-{
-    if (param)
-        return TBBMALLOC_INVALID_PARAM;
+extern "C" int scalable_allocation_command(int cmd, void *param) {
+    if (param) return TBBMALLOC_INVALID_PARAM;
 
     bool released = false;
-    switch(cmd) {
-    case TBBMALLOC_CLEAN_THREAD_BUFFERS:
-        if (TLSData *tls = defaultMemPool->getTLS(/*create=*/false))
-            released = tls->externalCleanup(/*cleanOnlyUnused*/false, /*cleanBins=*/true);
-        break;
-    case TBBMALLOC_CLEAN_ALL_BUFFERS:
-        released = defaultMemPool->extMemPool.hardCachesCleanup(true);
-        break;
-    default:
-        return TBBMALLOC_INVALID_PARAM;
+    switch (cmd) {
+        case TBBMALLOC_CLEAN_THREAD_BUFFERS:
+            if (TLSData *tls = defaultMemPool->getTLS(/*create=*/false))
+                released = tls->externalCleanup(/*cleanOnlyUnused*/ false, /*cleanBins=*/true);
+            break;
+        case TBBMALLOC_CLEAN_ALL_BUFFERS:
+            released = defaultMemPool->extMemPool.hardCachesCleanup(true);
+            break;
+        default:
+            return TBBMALLOC_INVALID_PARAM;
     }
     return released ? TBBMALLOC_OK : TBBMALLOC_NO_EFFECT;
 }
diff --git a/external/tbb/src/tbbmalloc/large_objects.cpp b/external/tbb/src/tbbmalloc/large_objects.cpp
index 3454ca62..983c2590 100644
--- a/external/tbb/src/tbbmalloc/large_objects.cpp
+++ b/external/tbb/src/tbbmalloc/large_objects.cpp
@@ -14,1060 +14,1010 @@
     limitations under the License.
 */
 
-#include "tbbmalloc_internal.h"
 #include "../src/tbb/environment.h"
+#include "tbbmalloc_internal.h"
 
 #if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
-    // Suppress warning: unary minus operator applied to unsigned type, result still unsigned
-    // TBB_REVAMP_TODO: review this warning
-    #pragma warning(push)
-    #pragma warning(disable:4146)
+// Suppress warning: unary minus operator applied to unsigned type, result still unsigned
+// TBB_REVAMP_TODO: review this warning
+#pragma warning(push)
+#pragma warning(disable : 4146)
 #endif
 
 /******************************* Allocation of large objects *********************************************/
 
 namespace rml {
-namespace internal {
-
-/* ---------------------------- Large Object cache init section ---------------------------------------- */
-
-void LargeObjectCache::init(ExtMemoryPool *memPool)
-{
-    extMemPool = memPool;
-    // scalable_allocation_mode can be called before allocator initialization, respect this manual request
-    if (hugeSizeThreshold == 0) {
-        // Huge size threshold initialization if environment variable was set
-        long requestedThreshold = tbb::detail::r1::GetIntegralEnvironmentVariable("TBB_MALLOC_SET_HUGE_SIZE_THRESHOLD");
-        // Read valid env or initialize by default with max possible values
-        if (requestedThreshold != -1) {
-            setHugeSizeThreshold(requestedThreshold);
-        } else {
-            setHugeSizeThreshold(maxHugeSize);
+    namespace internal {
+
+        /* ---------------------------- Large Object cache init section ---------------------------------------- */
+
+        void LargeObjectCache::init(ExtMemoryPool *memPool) {
+            extMemPool = memPool;
+            // scalable_allocation_mode can be called before allocator initialization, respect this manual request
+            if (hugeSizeThreshold == 0) {
+                // Huge size threshold initialization if environment variable was set
+                long requestedThreshold = tbb::detail::r1::GetIntegralEnvironmentVariable(
+                        "TBB_MALLOC_SET_HUGE_SIZE_THRESHOLD");
+                // Read valid env or initialize by default with max possible values
+                if (requestedThreshold != -1) {
+                    setHugeSizeThreshold(requestedThreshold);
+                } else {
+                    setHugeSizeThreshold(maxHugeSize);
+                }
+            }
+        }
+
+        /* ----------------------------- Huge size threshold settings ----------------------------------------- */
+
+        void LargeObjectCache::setHugeSizeThreshold(size_t value) {
+            // Valid in the huge cache range: [MaxLargeSize, MaxHugeSize].
+            if (value <= maxHugeSize) {
+                hugeSizeThreshold = value >= maxLargeSize ? alignToBin(value) : maxLargeSize;
+
+                // Calculate local indexes for the global threshold size (for fast search inside a regular cleanup)
+                largeCache.hugeSizeThresholdIdx = LargeCacheType::numBins;
+                hugeCache.hugeSizeThresholdIdx = HugeCacheType::sizeToIdx(hugeSizeThreshold);
+            }
+        }
+
+        bool LargeObjectCache::sizeInCacheRange(size_t size) {
+            return size < maxHugeSize && (size <= defaultMaxHugeSize || size >= hugeSizeThreshold);
         }
-    }
-}
-
-/* ----------------------------- Huge size threshold settings ----------------------------------------- */
-
-void LargeObjectCache::setHugeSizeThreshold(size_t value)
-{
-    // Valid in the huge cache range: [MaxLargeSize, MaxHugeSize].
-    if (value <= maxHugeSize) {
-        hugeSizeThreshold = value >= maxLargeSize ? alignToBin(value) : maxLargeSize;
-
-        // Calculate local indexes for the global threshold size (for fast search inside a regular cleanup)
-        largeCache.hugeSizeThresholdIdx = LargeCacheType::numBins;
-        hugeCache.hugeSizeThresholdIdx = HugeCacheType::sizeToIdx(hugeSizeThreshold);
-    }
-}
-
-bool LargeObjectCache::sizeInCacheRange(size_t size)
-{
-    return size < maxHugeSize && (size <= defaultMaxHugeSize || size >= hugeSizeThreshold);
-}
-
-/* ----------------------------------------------------------------------------------------------------- */
-
-/* The functor called by the aggregator for the operation list */
-template<typename Props>
-class CacheBinFunctor {
-    typename LargeObjectCacheImpl<Props>::CacheBin *const bin;
-    ExtMemoryPool *const extMemPool;
-    typename LargeObjectCacheImpl<Props>::BinBitMask *const bitMask;
-    const int idx;
-
-    LargeMemoryBlock *toRelease;
-    bool needCleanup;
-    uintptr_t currTime;
-
-    /* Do preprocessing under the operation list. */
-    /* All the OP_PUT_LIST operations are merged in the one operation.
+
+        /* ----------------------------------------------------------------------------------------------------- */
+
+        /* The functor called by the aggregator for the operation list */
+        template <typename Props>
+        class CacheBinFunctor {
+            typename LargeObjectCacheImpl<Props>::CacheBin *const bin;
+            ExtMemoryPool *const extMemPool;
+            typename LargeObjectCacheImpl<Props>::BinBitMask *const bitMask;
+            const int idx;
+
+            LargeMemoryBlock *toRelease;
+            bool needCleanup;
+            uintptr_t currTime;
+
+            /* Do preprocessing under the operation list. */
+            /* All the OP_PUT_LIST operations are merged in the one operation.
        All OP_GET operations are merged with the OP_PUT_LIST operations but
        it demands the update of the moving average value in the bin.
        Only the last OP_CLEAN_TO_THRESHOLD operation has sense.
        The OP_CLEAN_ALL operation also should be performed only once.
        Moreover it cancels the OP_CLEAN_TO_THRESHOLD operation. */
-    class OperationPreprocessor {
-        // TODO: remove the dependency on CacheBin.
-        typename LargeObjectCacheImpl<Props>::CacheBin *const  bin;
+            class OperationPreprocessor {
+                // TODO: remove the dependency on CacheBin.
+                typename LargeObjectCacheImpl<Props>::CacheBin *const bin;
 
-        /* Contains the relative time in the operation list.
+                /* Contains the relative time in the operation list.
            It counts in the reverse order since the aggregator also
            provides operations in the reverse order. */
-        uintptr_t lclTime;
+                uintptr_t lclTime;
 
-        /* opGet contains only OP_GET operations which cannot be merge with OP_PUT operations
+                /* opGet contains only OP_GET operations which cannot be merge with OP_PUT operations
            opClean contains all OP_CLEAN_TO_THRESHOLD and OP_CLEAN_ALL operations. */
-        CacheBinOperation *opGet, *opClean;
-        /* The time of the last OP_CLEAN_TO_THRESHOLD operations */
-        uintptr_t cleanTime;
+                CacheBinOperation *opGet, *opClean;
+                /* The time of the last OP_CLEAN_TO_THRESHOLD operations */
+                uintptr_t cleanTime;
 
-        /* lastGetOpTime - the time of the last OP_GET operation.
+                /* lastGetOpTime - the time of the last OP_GET operation.
            lastGet - the same meaning as CacheBin::lastGet */
-        uintptr_t lastGetOpTime, lastGet;
-
-        /* The total sum of all usedSize changes requested with CBOP_UPDATE_USED_SIZE operations. */
-        size_t updateUsedSize;
-
-        /* The list of blocks for the OP_PUT_LIST operation. */
-        LargeMemoryBlock *head, *tail;
-        int putListNum;
-
-        /* if the OP_CLEAN_ALL is requested. */
-        bool isCleanAll;
-
-        inline void commitOperation(CacheBinOperation *op) const;
-        inline void addOpToOpList(CacheBinOperation *op, CacheBinOperation **opList) const;
-        bool getFromPutList(CacheBinOperation* opGet, uintptr_t currTime);
-        void addToPutList( LargeMemoryBlock *head, LargeMemoryBlock *tail, int num );
-
-    public:
-        OperationPreprocessor(typename LargeObjectCacheImpl<Props>::CacheBin *bin) :
-            bin(bin), lclTime(0), opGet(nullptr), opClean(nullptr), cleanTime(0),
-            lastGetOpTime(0), lastGet(0), updateUsedSize(0), head(nullptr), tail(nullptr), putListNum(0), isCleanAll(false)  {}
-        void operator()(CacheBinOperation* opList);
-        uintptr_t getTimeRange() const { return -lclTime; }
-
-        friend class CacheBinFunctor;
-    };
-
-public:
-    CacheBinFunctor(typename LargeObjectCacheImpl<Props>::CacheBin *bin, ExtMemoryPool *extMemPool,
-                    typename LargeObjectCacheImpl<Props>::BinBitMask *bitMask, int idx) :
-        bin(bin), extMemPool(extMemPool), bitMask(bitMask), idx(idx), toRelease(nullptr), needCleanup(false), currTime(0) {}
-    void operator()(CacheBinOperation* opList);
-
-    bool isCleanupNeeded() const { return needCleanup; }
-    LargeMemoryBlock *getToRelease() const { return toRelease; }
-    uintptr_t getCurrTime() const { return currTime; }
-};
-
-/* ---------------- Cache Bin Aggregator Operation Helpers ---------------- */
-
-// The list of structures which describe the operation data
-struct OpGet {
-    static const CacheBinOperationType type = CBOP_GET;
-    LargeMemoryBlock **res;
-    size_t size;
-    uintptr_t currTime;
-};
-
-struct OpPutList {
-    static const CacheBinOperationType type = CBOP_PUT_LIST;
-    LargeMemoryBlock *head;
-};
-
-struct OpCleanToThreshold {
-    static const CacheBinOperationType type = CBOP_CLEAN_TO_THRESHOLD;
-    LargeMemoryBlock **res;
-    uintptr_t currTime;
-};
-
-struct OpCleanAll {
-    static const CacheBinOperationType type = CBOP_CLEAN_ALL;
-    LargeMemoryBlock **res;
-};
-
-struct OpUpdateUsedSize {
-    static const CacheBinOperationType type = CBOP_UPDATE_USED_SIZE;
-    size_t size;
-};
-
-union CacheBinOperationData {
-private:
-    OpGet opGet;
-    OpPutList opPutList;
-    OpCleanToThreshold opCleanToThreshold;
-    OpCleanAll opCleanAll;
-    OpUpdateUsedSize opUpdateUsedSize;
-};
-
-// Forward declarations
-template <typename OpTypeData> OpTypeData& opCast(CacheBinOperation &op);
-
-// Describes the aggregator operation
-struct CacheBinOperation : public MallocAggregatedOperation<CacheBinOperation>::type {
-    CacheBinOperationType type;
-
-    template <typename OpTypeData>
-    CacheBinOperation(OpTypeData &d, CacheBinOperationStatus st = CBST_WAIT) {
-        opCast<OpTypeData>(*this) = d;
-        type = OpTypeData::type;
-        MallocAggregatedOperation<CacheBinOperation>::type::status = st;
-    }
-private:
-    CacheBinOperationData data;
-
-    template <typename OpTypeData>
-    friend OpTypeData& opCast(CacheBinOperation &op);
-};
-
-// The opCast function can be the member of CacheBinOperation but it will have
-// small stylistic ambiguity: it will look like a getter (with a cast) for the
-// CacheBinOperation::data data member but it should return a reference to
-// simplify the code from a lot of getter/setter calls. So the global cast in
-// the style of static_cast (or reinterpret_cast) seems to be more readable and
-// have more explicit semantic.
-template <typename OpTypeData>
-OpTypeData& opCast(CacheBinOperation &op) {
-    return *reinterpret_cast<OpTypeData*>(&op.data);
-}
-
-/* ------------------------------------------------------------------------ */
+                uintptr_t lastGetOpTime, lastGet;
+
+                /* The total sum of all usedSize changes requested with CBOP_UPDATE_USED_SIZE operations. */
+                size_t updateUsedSize;
+
+                /* The list of blocks for the OP_PUT_LIST operation. */
+                LargeMemoryBlock *head, *tail;
+                int putListNum;
+
+                /* if the OP_CLEAN_ALL is requested. */
+                bool isCleanAll;
+
+                inline void commitOperation(CacheBinOperation *op) const;
+                inline void addOpToOpList(CacheBinOperation *op, CacheBinOperation **opList) const;
+                bool getFromPutList(CacheBinOperation *opGet, uintptr_t currTime);
+                void addToPutList(LargeMemoryBlock *head, LargeMemoryBlock *tail, int num);
+
+            public:
+                OperationPreprocessor(typename LargeObjectCacheImpl<Props>::CacheBin *bin)
+                    : bin(bin), lclTime(0), opGet(nullptr), opClean(nullptr), cleanTime(0), lastGetOpTime(0),
+                      lastGet(0), updateUsedSize(0), head(nullptr), tail(nullptr), putListNum(0),
+                      isCleanAll(false) {}
+                void operator()(CacheBinOperation *opList);
+                uintptr_t getTimeRange() const { return -lclTime; }
+
+                friend class CacheBinFunctor;
+            };
+
+        public:
+            CacheBinFunctor(typename LargeObjectCacheImpl<Props>::CacheBin *bin, ExtMemoryPool *extMemPool,
+                            typename LargeObjectCacheImpl<Props>::BinBitMask *bitMask, int idx)
+                : bin(bin), extMemPool(extMemPool), bitMask(bitMask), idx(idx), toRelease(nullptr),
+                  needCleanup(false), currTime(0) {}
+            void operator()(CacheBinOperation *opList);
+
+            bool isCleanupNeeded() const { return needCleanup; }
+            LargeMemoryBlock *getToRelease() const { return toRelease; }
+            uintptr_t getCurrTime() const { return currTime; }
+        };
+
+        /* ---------------- Cache Bin Aggregator Operation Helpers ---------------- */
+
+        // The list of structures which describe the operation data
+        struct OpGet {
+            static const CacheBinOperationType type = CBOP_GET;
+            LargeMemoryBlock **res;
+            size_t size;
+            uintptr_t currTime;
+        };
+
+        struct OpPutList {
+            static const CacheBinOperationType type = CBOP_PUT_LIST;
+            LargeMemoryBlock *head;
+        };
+
+        struct OpCleanToThreshold {
+            static const CacheBinOperationType type = CBOP_CLEAN_TO_THRESHOLD;
+            LargeMemoryBlock **res;
+            uintptr_t currTime;
+        };
+
+        struct OpCleanAll {
+            static const CacheBinOperationType type = CBOP_CLEAN_ALL;
+            LargeMemoryBlock **res;
+        };
+
+        struct OpUpdateUsedSize {
+            static const CacheBinOperationType type = CBOP_UPDATE_USED_SIZE;
+            size_t size;
+        };
+
+        union CacheBinOperationData {
+        private:
+            OpGet opGet;
+            OpPutList opPutList;
+            OpCleanToThreshold opCleanToThreshold;
+            OpCleanAll opCleanAll;
+            OpUpdateUsedSize opUpdateUsedSize;
+        };
+
+        // Forward declarations
+        template <typename OpTypeData>
+        OpTypeData &opCast(CacheBinOperation &op);
+
+        // Describes the aggregator operation
+        struct CacheBinOperation : public MallocAggregatedOperation<CacheBinOperation>::type {
+            CacheBinOperationType type;
+
+            template <typename OpTypeData>
+            CacheBinOperation(OpTypeData &d, CacheBinOperationStatus st = CBST_WAIT) {
+                opCast<OpTypeData>(*this) = d;
+                type = OpTypeData::type;
+                MallocAggregatedOperation<CacheBinOperation>::type::status = st;
+            }
+
+        private:
+            CacheBinOperationData data;
+
+            template <typename OpTypeData>
+            friend OpTypeData &opCast(CacheBinOperation &op);
+        };
+
+        // The opCast function can be the member of CacheBinOperation but it will have
+        // small stylistic ambiguity: it will look like a getter (with a cast) for the
+        // CacheBinOperation::data data member but it should return a reference to
+        // simplify the code from a lot of getter/setter calls. So the global cast in
+        // the style of static_cast (or reinterpret_cast) seems to be more readable and
+        // have more explicit semantic.
+        template <typename OpTypeData>
+        OpTypeData &opCast(CacheBinOperation &op) {
+            return *reinterpret_cast<OpTypeData *>(&op.data);
+        }
+
+        /* ------------------------------------------------------------------------ */
 
 #if __TBB_MALLOC_LOCACHE_STAT
-//intptr_t mallocCalls, cacheHits;
-std::atomic<intptr_t> mallocCalls, cacheHits;
-//intptr_t memAllocKB, memHitKB;
-std::atomic<intptr_t> memAllocKB, memHitKB;
+        //intptr_t mallocCalls, cacheHits;
+        std::atomic<intptr_t> mallocCalls, cacheHits;
+        //intptr_t memAllocKB, memHitKB;
+        std::atomic<intptr_t> memAllocKB, memHitKB;
 #endif
 
 #if MALLOC_DEBUG
-inline bool lessThanWithOverflow(intptr_t a, intptr_t b)
-{
-    return (a < b && (b - a < static_cast<intptr_t>(UINTPTR_MAX/2))) ||
-           (a > b && (a - b > static_cast<intptr_t>(UINTPTR_MAX/2)));
-}
+        inline bool lessThanWithOverflow(intptr_t a, intptr_t b) {
+            return (a < b && (b - a < static_cast<intptr_t>(UINTPTR_MAX / 2)))
+                   || (a > b && (a - b > static_cast<intptr_t>(UINTPTR_MAX / 2)));
+        }
 #endif
 
-/* ----------------------------------- Operation processing methods ------------------------------------ */
-
-template<typename Props> void CacheBinFunctor<Props>::
-    OperationPreprocessor::commitOperation(CacheBinOperation *op) const
-{
-    // FencedStore( (intptr_t&)(op->status), CBST_DONE );
-    op->status.store(CBST_DONE, std::memory_order_release);
-}
-
-template<typename Props> void CacheBinFunctor<Props>::
-    OperationPreprocessor::addOpToOpList(CacheBinOperation *op, CacheBinOperation **opList) const
-{
-    op->next = *opList;
-    *opList = op;
-}
-
-template<typename Props> bool CacheBinFunctor<Props>::
-    OperationPreprocessor::getFromPutList(CacheBinOperation *opGet, uintptr_t currTime)
-{
-    if ( head ) {
-        uintptr_t age = head->age;
-        LargeMemoryBlock *next = head->next;
-        *opCast<OpGet>(*opGet).res = head;
-        commitOperation( opGet );
-        head = next;
-        putListNum--;
-        MALLOC_ASSERT( putListNum>=0, ASSERT_TEXT );
-
-        // use moving average with current hit interval
-        bin->updateMeanHitRange( currTime - age );
-        return true;
-    }
-    return false;
-}
-
-template<typename Props> void CacheBinFunctor<Props>::
-    OperationPreprocessor::addToPutList(LargeMemoryBlock *h, LargeMemoryBlock *t, int num)
-{
-    if ( head ) {
-        MALLOC_ASSERT( tail, ASSERT_TEXT );
-        tail->next = h;
-        h->prev = tail;
-        tail = t;
-        putListNum += num;
-    } else {
-        head = h;
-        tail = t;
-        putListNum = num;
-    }
-}
-
-template<typename Props> void CacheBinFunctor<Props>::
-    OperationPreprocessor::operator()(CacheBinOperation* opList)
-{
-    for ( CacheBinOperation *op = opList, *opNext; op; op = opNext ) {
-        opNext = op->next;
-        switch ( op->type ) {
-        case CBOP_GET:
-            {
-                lclTime--;
-                if ( !lastGetOpTime ) {
-                    lastGetOpTime = lclTime;
-                    lastGet = 0;
-                } else if ( !lastGet ) lastGet = lclTime;
-
-                if ( !getFromPutList(op,lclTime) ) {
-                    opCast<OpGet>(*op).currTime = lclTime;
-                    addOpToOpList( op, &opGet );
-                }
-            }
-            break;
+        /* ----------------------------------- Operation processing methods ------------------------------------ */
 
-        case CBOP_PUT_LIST:
-            {
-                LargeMemoryBlock *head = opCast<OpPutList>(*op).head;
-                LargeMemoryBlock *curr = head, *prev = nullptr;
-
-                int num = 0;
-                do {
-                    // we do not kept prev pointers during assigning blocks to bins, set them now
-                    curr->prev = prev;
+        template <typename Props>
+        void CacheBinFunctor<Props>::OperationPreprocessor::commitOperation(CacheBinOperation *op) const {
+            // FencedStore( (intptr_t&)(op->status), CBST_DONE );
+            op->status.store(CBST_DONE, std::memory_order_release);
+        }
 
-                    // Save the local times to the memory blocks. Local times are necessary
-                    // for the getFromPutList function which updates the hit range value in
-                    // CacheBin when OP_GET and OP_PUT_LIST operations are merged successfully.
-                    // The age will be updated to the correct global time after preprocessing
-                    // when global cache time is updated.
-                    curr->age = --lclTime;
+        template <typename Props>
+        void CacheBinFunctor<Props>::OperationPreprocessor::addOpToOpList(CacheBinOperation *op,
+                                                                          CacheBinOperation **opList) const {
+            op->next = *opList;
+            *opList = op;
+        }
 
-                    prev = curr;
-                    num += 1;
+        template <typename Props>
+        bool CacheBinFunctor<Props>::OperationPreprocessor::getFromPutList(CacheBinOperation *opGet,
+                                                                           uintptr_t currTime) {
+            if (head) {
+                uintptr_t age = head->age;
+                LargeMemoryBlock *next = head->next;
+                *opCast<OpGet>(*opGet).res = head;
+                commitOperation(opGet);
+                head = next;
+                putListNum--;
+                MALLOC_ASSERT(putListNum >= 0, ASSERT_TEXT);
+
+                // use moving average with current hit interval
+                bin->updateMeanHitRange(currTime - age);
+                return true;
+            }
+            return false;
+        }
 
-                    STAT_increment(getThreadId(), ThreadCommonCounters, cacheLargeObj);
-                } while ((curr = curr->next) != nullptr);
+        template <typename Props>
+        void CacheBinFunctor<Props>::OperationPreprocessor::addToPutList(LargeMemoryBlock *h,
+                                                                         LargeMemoryBlock *t, int num) {
+            if (head) {
+                MALLOC_ASSERT(tail, ASSERT_TEXT);
+                tail->next = h;
+                h->prev = tail;
+                tail = t;
+                putListNum += num;
+            } else {
+                head = h;
+                tail = t;
+                putListNum = num;
+            }
+        }
 
-                LargeMemoryBlock *tail = prev;
-                addToPutList(head, tail, num);
+        template <typename Props>
+        void CacheBinFunctor<Props>::OperationPreprocessor::operator()(CacheBinOperation *opList) {
+            for (CacheBinOperation *op = opList, *opNext; op; op = opNext) {
+                opNext = op->next;
+                switch (op->type) {
+                    case CBOP_GET: {
+                        lclTime--;
+                        if (!lastGetOpTime) {
+                            lastGetOpTime = lclTime;
+                            lastGet = 0;
+                        } else if (!lastGet)
+                            lastGet = lclTime;
+
+                        if (!getFromPutList(op, lclTime)) {
+                            opCast<OpGet>(*op).currTime = lclTime;
+                            addOpToOpList(op, &opGet);
+                        }
+                    } break;
+
+                    case CBOP_PUT_LIST: {
+                        LargeMemoryBlock *head = opCast<OpPutList>(*op).head;
+                        LargeMemoryBlock *curr = head, *prev = nullptr;
+
+                        int num = 0;
+                        do {
+                            // we do not kept prev pointers during assigning blocks to bins, set them now
+                            curr->prev = prev;
+
+                            // Save the local times to the memory blocks. Local times are necessary
+                            // for the getFromPutList function which updates the hit range value in
+                            // CacheBin when OP_GET and OP_PUT_LIST operations are merged successfully.
+                            // The age will be updated to the correct global time after preprocessing
+                            // when global cache time is updated.
+                            curr->age = --lclTime;
+
+                            prev = curr;
+                            num += 1;
+
+                            STAT_increment(getThreadId(), ThreadCommonCounters, cacheLargeObj);
+                        } while ((curr = curr->next) != nullptr);
+
+                        LargeMemoryBlock *tail = prev;
+                        addToPutList(head, tail, num);
+
+                        while (opGet) {
+                            CacheBinOperation *next = opGet->next;
+                            if (!getFromPutList(opGet, opCast<OpGet>(*opGet).currTime)) break;
+                            opGet = next;
+                        }
+                    } break;
+
+                    case CBOP_UPDATE_USED_SIZE:
+                        updateUsedSize += opCast<OpUpdateUsedSize>(*op).size;
+                        commitOperation(op);
+                        break;
 
-                while ( opGet ) {
-                    CacheBinOperation *next = opGet->next;
-                    if ( !getFromPutList(opGet, opCast<OpGet>(*opGet).currTime) )
+                    case CBOP_CLEAN_ALL:
+                        isCleanAll = true;
+                        addOpToOpList(op, &opClean);
                         break;
-                    opGet = next;
+
+                    case CBOP_CLEAN_TO_THRESHOLD: {
+                        uintptr_t currTime = opCast<OpCleanToThreshold>(*op).currTime;
+                        // We don't worry about currTime overflow since it is a rare
+                        // occurrence and doesn't affect correctness
+                        cleanTime = cleanTime < currTime ? currTime : cleanTime;
+                        addOpToOpList(op, &opClean);
+                    } break;
+
+                    default:
+                        MALLOC_ASSERT(false, "Unknown operation.");
                 }
             }
-            break;
-
-        case CBOP_UPDATE_USED_SIZE:
-            updateUsedSize += opCast<OpUpdateUsedSize>(*op).size;
-            commitOperation( op );
-            break;
-
-        case CBOP_CLEAN_ALL:
-            isCleanAll = true;
-            addOpToOpList( op, &opClean );
-            break;
-
-        case CBOP_CLEAN_TO_THRESHOLD:
-            {
-                uintptr_t currTime = opCast<OpCleanToThreshold>(*op).currTime;
-                // We don't worry about currTime overflow since it is a rare
-                // occurrence and doesn't affect correctness
-                cleanTime = cleanTime < currTime ? currTime : cleanTime;
-                addOpToOpList( op, &opClean );
-            }
-            break;
-
-        default:
-            MALLOC_ASSERT( false, "Unknown operation." );
+            MALLOC_ASSERT(!(opGet && head), "Not all put/get pairs are processed!");
         }
-    }
-    MALLOC_ASSERT( !( opGet && head ), "Not all put/get pairs are processed!" );
-}
 
-template<typename Props> void CacheBinFunctor<Props>::operator()(CacheBinOperation* opList)
-{
-    MALLOC_ASSERT( opList, "Empty operation list is passed into operation handler." );
+        template <typename Props>
+        void CacheBinFunctor<Props>::operator()(CacheBinOperation *opList) {
+            MALLOC_ASSERT(opList, "Empty operation list is passed into operation handler.");
 
-    OperationPreprocessor prep(bin);
-    prep(opList);
+            OperationPreprocessor prep(bin);
+            prep(opList);
 
-    if ( uintptr_t timeRange = prep.getTimeRange() ) {
-        uintptr_t startTime = extMemPool->loc.getCurrTimeRange(timeRange);
-        // endTime is used as the current (base) time since the local time is negative.
-        uintptr_t endTime = startTime + timeRange;
+            if (uintptr_t timeRange = prep.getTimeRange()) {
+                uintptr_t startTime = extMemPool->loc.getCurrTimeRange(timeRange);
+                // endTime is used as the current (base) time since the local time is negative.
+                uintptr_t endTime = startTime + timeRange;
 
-        if ( prep.lastGetOpTime && prep.lastGet ) bin->setLastGet(prep.lastGet+endTime);
+                if (prep.lastGetOpTime && prep.lastGet) bin->setLastGet(prep.lastGet + endTime);
 
-        if ( CacheBinOperation *opGet = prep.opGet ) {
-            bool isEmpty = false;
-            do {
+                if (CacheBinOperation *opGet = prep.opGet) {
+                    bool isEmpty = false;
+                    do {
 #if __TBB_MALLOC_WHITEBOX_TEST
-                tbbmalloc_whitebox::locGetProcessed++;
+                        tbbmalloc_whitebox::locGetProcessed++;
 #endif
-                const OpGet &opGetData = opCast<OpGet>(*opGet);
-                if ( !isEmpty ) {
-                    if ( LargeMemoryBlock *res = bin->get() ) {
-                        uintptr_t getTime = opGetData.currTime + endTime;
-                        // use moving average with current hit interval
-                        bin->updateMeanHitRange( getTime - res->age);
-                        bin->updateCachedSize( -opGetData.size );
-                        *opGetData.res = res;
-                    } else {
-                        isEmpty = true;
-                        uintptr_t lastGetOpTime = prep.lastGetOpTime+endTime;
-                        bin->forgetOutdatedState(lastGetOpTime);
-                        bin->updateAgeThreshold(lastGetOpTime);
+                        const OpGet &opGetData = opCast<OpGet>(*opGet);
+                        if (!isEmpty) {
+                            if (LargeMemoryBlock *res = bin->get()) {
+                                uintptr_t getTime = opGetData.currTime + endTime;
+                                // use moving average with current hit interval
+                                bin->updateMeanHitRange(getTime - res->age);
+                                bin->updateCachedSize(-opGetData.size);
+                                *opGetData.res = res;
+                            } else {
+                                isEmpty = true;
+                                uintptr_t lastGetOpTime = prep.lastGetOpTime + endTime;
+                                bin->forgetOutdatedState(lastGetOpTime);
+                                bin->updateAgeThreshold(lastGetOpTime);
+                            }
+                        }
+
+                        CacheBinOperation *opNext = opGet->next;
+                        bin->updateUsedSize(opGetData.size, bitMask, idx);
+                        prep.commitOperation(opGet);
+                        opGet = opNext;
+                    } while (opGet);
+                    if (prep.lastGetOpTime) bin->setLastGet(prep.lastGetOpTime + endTime);
+                } else if (LargeMemoryBlock *curr = prep.head) {
+                    curr->prev = nullptr;
+                    while (curr) {
+                        // Update local times to global times
+                        curr->age += endTime;
+                        curr = curr->next;
                     }
+#if __TBB_MALLOC_WHITEBOX_TEST
+                    tbbmalloc_whitebox::locPutProcessed += prep.putListNum;
+#endif
+                    toRelease = bin->putList(prep.head, prep.tail, bitMask, idx, prep.putListNum,
+                                             extMemPool->loc.hugeSizeThreshold);
                 }
+                needCleanup = extMemPool->loc.isCleanupNeededOnRange(timeRange, startTime);
+                currTime = endTime - 1;
+            }
+
+            if (CacheBinOperation *opClean = prep.opClean) {
+                if (prep.isCleanAll) *opCast<OpCleanAll>(*opClean).res = bin->cleanAll(bitMask, idx);
+                else
+                    *opCast<OpCleanToThreshold>(*opClean).res
+                            = bin->cleanToThreshold(prep.cleanTime, bitMask, idx);
+
+                CacheBinOperation *opNext = opClean->next;
+                prep.commitOperation(opClean);
 
-                CacheBinOperation *opNext = opGet->next;
-                bin->updateUsedSize( opGetData.size, bitMask, idx );
-                prep.commitOperation( opGet );
-                opGet = opNext;
-            } while ( opGet );
-            if ( prep.lastGetOpTime )
-                bin->setLastGet( prep.lastGetOpTime + endTime );
-        } else if ( LargeMemoryBlock *curr = prep.head ) {
-            curr->prev = nullptr;
-            while ( curr ) {
-                // Update local times to global times
-                curr->age += endTime;
-                curr=curr->next;
+                while ((opClean = opNext) != nullptr) {
+                    opNext = opClean->next;
+                    prep.commitOperation(opClean);
+                }
             }
-#if __TBB_MALLOC_WHITEBOX_TEST
-            tbbmalloc_whitebox::locPutProcessed+=prep.putListNum;
-#endif
-            toRelease = bin->putList(prep.head, prep.tail, bitMask, idx, prep.putListNum, extMemPool->loc.hugeSizeThreshold);
+
+            if (size_t size = prep.updateUsedSize) bin->updateUsedSize(size, bitMask, idx);
         }
-        needCleanup = extMemPool->loc.isCleanupNeededOnRange(timeRange, startTime);
-        currTime = endTime - 1;
-    }
-
-    if ( CacheBinOperation *opClean = prep.opClean ) {
-        if ( prep.isCleanAll )
-            *opCast<OpCleanAll>(*opClean).res = bin->cleanAll(bitMask, idx);
-        else
-            *opCast<OpCleanToThreshold>(*opClean).res = bin->cleanToThreshold(prep.cleanTime, bitMask, idx);
-
-        CacheBinOperation *opNext = opClean->next;
-        prep.commitOperation( opClean );
-
-        while ((opClean = opNext) != nullptr) {
-            opNext = opClean->next;
-            prep.commitOperation(opClean);
+        /* ----------------------------------------------------------------------------------------------------- */
+        /* --------------------------- Methods for creating and executing operations --------------------------- */
+        template <typename Props>
+        void LargeObjectCacheImpl<Props>::CacheBin::ExecuteOperation(CacheBinOperation *op,
+                                                                     ExtMemoryPool *extMemPool,
+                                                                     BinBitMask *bitMask, int idx,
+                                                                     bool longLifeTime) {
+            CacheBinFunctor<Props> func(this, extMemPool, bitMask, idx);
+            aggregator.execute(op, func, longLifeTime);
+
+            if (LargeMemoryBlock *toRelease = func.getToRelease()) {
+                extMemPool->backend.returnLargeObject(toRelease);
+            }
+
+            if (func.isCleanupNeeded()) {
+                extMemPool->loc.doCleanup(func.getCurrTime(), /*doThreshDecr=*/false);
+            }
         }
-    }
-
-    if ( size_t size = prep.updateUsedSize )
-        bin->updateUsedSize(size, bitMask, idx);
-}
-/* ----------------------------------------------------------------------------------------------------- */
-/* --------------------------- Methods for creating and executing operations --------------------------- */
-template<typename Props> void LargeObjectCacheImpl<Props>::
-    CacheBin::ExecuteOperation(CacheBinOperation *op, ExtMemoryPool *extMemPool, BinBitMask *bitMask, int idx, bool longLifeTime)
-{
-    CacheBinFunctor<Props> func( this, extMemPool, bitMask, idx );
-    aggregator.execute( op, func, longLifeTime );
-
-    if ( LargeMemoryBlock *toRelease = func.getToRelease()) {
-        extMemPool->backend.returnLargeObject(toRelease);
-    }
-
-    if ( func.isCleanupNeeded() ) {
-        extMemPool->loc.doCleanup( func.getCurrTime(), /*doThreshDecr=*/false);
-    }
-}
-
-template<typename Props> LargeMemoryBlock *LargeObjectCacheImpl<Props>::
-    CacheBin::get(ExtMemoryPool *extMemPool, size_t size, BinBitMask *bitMask, int idx)
-{
-    LargeMemoryBlock *lmb=nullptr;
-    OpGet data = {&lmb, size, static_cast<uintptr_t>(0)};
-    CacheBinOperation op(data);
-    ExecuteOperation( &op, extMemPool, bitMask, idx );
-    return lmb;
-}
-
-template<typename Props> void LargeObjectCacheImpl<Props>::
-    CacheBin::putList(ExtMemoryPool *extMemPool, LargeMemoryBlock *head, BinBitMask *bitMask, int idx)
-{
-    MALLOC_ASSERT(sizeof(LargeMemoryBlock)+sizeof(CacheBinOperation)<=head->unalignedSize, "CacheBinOperation is too large to be placed in LargeMemoryBlock!");
-
-    OpPutList data = {head};
-    CacheBinOperation *op = new (head+1) CacheBinOperation(data, CBST_NOWAIT);
-    ExecuteOperation( op, extMemPool, bitMask, idx, false );
-}
-
-template<typename Props> bool LargeObjectCacheImpl<Props>::
-    CacheBin::cleanToThreshold(ExtMemoryPool *extMemPool, BinBitMask *bitMask, uintptr_t currTime, int idx)
-{
-    LargeMemoryBlock *toRelease = nullptr;
-
-    /* oldest may be more recent then age, that's why cast to signed type
+
+        template <typename Props>
+        LargeMemoryBlock *LargeObjectCacheImpl<Props>::CacheBin::get(ExtMemoryPool *extMemPool, size_t size,
+                                                                     BinBitMask *bitMask, int idx) {
+            LargeMemoryBlock *lmb = nullptr;
+            OpGet data = {&lmb, size, static_cast<uintptr_t>(0)};
+            CacheBinOperation op(data);
+            ExecuteOperation(&op, extMemPool, bitMask, idx);
+            return lmb;
+        }
+
+        template <typename Props>
+        void LargeObjectCacheImpl<Props>::CacheBin::putList(ExtMemoryPool *extMemPool, LargeMemoryBlock *head,
+                                                            BinBitMask *bitMask, int idx) {
+            MALLOC_ASSERT(sizeof(LargeMemoryBlock) + sizeof(CacheBinOperation) <= head->unalignedSize,
+                          "CacheBinOperation is too large to be placed in LargeMemoryBlock!");
+
+            OpPutList data = {head};
+            CacheBinOperation *op = new (head + 1) CacheBinOperation(data, CBST_NOWAIT);
+            ExecuteOperation(op, extMemPool, bitMask, idx, false);
+        }
+
+        template <typename Props>
+        bool LargeObjectCacheImpl<Props>::CacheBin::cleanToThreshold(ExtMemoryPool *extMemPool,
+                                                                     BinBitMask *bitMask, uintptr_t currTime,
+                                                                     int idx) {
+            LargeMemoryBlock *toRelease = nullptr;
+
+            /* oldest may be more recent then age, that's why cast to signed type
        was used. age overflow is also processed correctly. */
-    if (last.load(std::memory_order_relaxed) &&
-        (intptr_t)(currTime - oldest.load(std::memory_order_relaxed)) > ageThreshold.load(std::memory_order_relaxed)) {
-        OpCleanToThreshold data = {&toRelease, currTime};
-        CacheBinOperation op(data);
-        ExecuteOperation( &op, extMemPool, bitMask, idx );
-    }
-    bool released = toRelease;
-
-    Backend *backend = &extMemPool->backend;
-    while ( toRelease ) {
-        LargeMemoryBlock *helper = toRelease->next;
-        backend->returnLargeObject(toRelease);
-        toRelease = helper;
-    }
-    return released;
-}
-
-template<typename Props> bool LargeObjectCacheImpl<Props>::
-    CacheBin::releaseAllToBackend(ExtMemoryPool *extMemPool, BinBitMask *bitMask, int idx)
-{
-    LargeMemoryBlock *toRelease = nullptr;
-
-    if (last.load(std::memory_order_relaxed)) {
-        OpCleanAll data = {&toRelease};
-        CacheBinOperation op(data);
-        ExecuteOperation(&op, extMemPool, bitMask, idx);
-    }
-    bool released = toRelease;
-
-    Backend *backend = &extMemPool->backend;
-    while ( toRelease ) {
-        LargeMemoryBlock *helper = toRelease->next;
-        MALLOC_ASSERT(!helper || lessThanWithOverflow(helper->age, toRelease->age),
-                      ASSERT_TEXT);
-        backend->returnLargeObject(toRelease);
-        toRelease = helper;
-    }
-    return released;
-}
-
-template<typename Props> void LargeObjectCacheImpl<Props>::
-    CacheBin::updateUsedSize(ExtMemoryPool *extMemPool, size_t size, BinBitMask *bitMask, int idx)
-{
-    OpUpdateUsedSize data = {size};
-    CacheBinOperation op(data);
-    ExecuteOperation( &op, extMemPool, bitMask, idx );
-}
-
-/* ------------------------------ Unsafe methods used with the aggregator ------------------------------ */
-
-template<typename Props> LargeMemoryBlock *LargeObjectCacheImpl<Props>::
-    CacheBin::putList(LargeMemoryBlock *head, LargeMemoryBlock *tail, BinBitMask *bitMask, int idx, int num, size_t hugeSizeThreshold)
-{
-    size_t size = head->unalignedSize;
-    usedSize.store(usedSize.load(std::memory_order_relaxed) - num * size, std::memory_order_relaxed);
-    MALLOC_ASSERT( !last.load(std::memory_order_relaxed) ||
-        (last.load(std::memory_order_relaxed)->age != 0 && last.load(std::memory_order_relaxed)->age != -1U), ASSERT_TEXT );
-    MALLOC_ASSERT( (tail==head && num==1) || (tail!=head && num>1), ASSERT_TEXT );
-    MALLOC_ASSERT( tail, ASSERT_TEXT );
-    LargeMemoryBlock *toRelease = nullptr;
-    if (size < hugeSizeThreshold && !lastCleanedAge) {
-        // 1st object of such size was released.
-        // Not cache it, and remember when this occurs
-        // to take into account during cache miss.
-        lastCleanedAge = tail->age;
-        toRelease = tail;
-        tail = tail->prev;
-        if (tail)
-            tail->next = nullptr;
-        else
-            head = nullptr;
-        num--;
-    }
-    if (num) {
-        // add [head;tail] list to cache
-        tail->next = first;
-        if (first)
-            first->prev = tail;
-        first = head;
-        if (!last.load(std::memory_order_relaxed)) {
-            MALLOC_ASSERT(0 == oldest.load(std::memory_order_relaxed), ASSERT_TEXT);
-            oldest.store(tail->age, std::memory_order_relaxed);
-            last.store(tail, std::memory_order_relaxed);
+            if (last.load(std::memory_order_relaxed)
+                && (intptr_t)(currTime - oldest.load(std::memory_order_relaxed))
+                           > ageThreshold.load(std::memory_order_relaxed)) {
+                OpCleanToThreshold data = {&toRelease, currTime};
+                CacheBinOperation op(data);
+                ExecuteOperation(&op, extMemPool, bitMask, idx);
+            }
+            bool released = toRelease;
+
+            Backend *backend = &extMemPool->backend;
+            while (toRelease) {
+                LargeMemoryBlock *helper = toRelease->next;
+                backend->returnLargeObject(toRelease);
+                toRelease = helper;
+            }
+            return released;
         }
 
-        cachedSize.store(cachedSize.load(std::memory_order_relaxed) + num * size, std::memory_order_relaxed);
-    }
-
-    // No used object, and nothing in the bin, mark the bin as empty
-    if (!usedSize.load(std::memory_order_relaxed) && !first)
-        bitMask->set(idx, false);
-
-    return toRelease;
-}
-
-template<typename Props> LargeMemoryBlock *LargeObjectCacheImpl<Props>::
-    CacheBin::get()
-{
-    LargeMemoryBlock *result=first;
-    if (result) {
-        first = result->next;
-        if (first)
-            first->prev = nullptr;
-        else {
-            last.store(nullptr, std::memory_order_relaxed);
-            oldest.store(0, std::memory_order_relaxed);
+        template <typename Props>
+        bool LargeObjectCacheImpl<Props>::CacheBin::releaseAllToBackend(ExtMemoryPool *extMemPool,
+                                                                        BinBitMask *bitMask, int idx) {
+            LargeMemoryBlock *toRelease = nullptr;
+
+            if (last.load(std::memory_order_relaxed)) {
+                OpCleanAll data = {&toRelease};
+                CacheBinOperation op(data);
+                ExecuteOperation(&op, extMemPool, bitMask, idx);
+            }
+            bool released = toRelease;
+
+            Backend *backend = &extMemPool->backend;
+            while (toRelease) {
+                LargeMemoryBlock *helper = toRelease->next;
+                MALLOC_ASSERT(!helper || lessThanWithOverflow(helper->age, toRelease->age), ASSERT_TEXT);
+                backend->returnLargeObject(toRelease);
+                toRelease = helper;
+            }
+            return released;
+        }
+
+        template <typename Props>
+        void LargeObjectCacheImpl<Props>::CacheBin::updateUsedSize(ExtMemoryPool *extMemPool, size_t size,
+                                                                   BinBitMask *bitMask, int idx) {
+            OpUpdateUsedSize data = {size};
+            CacheBinOperation op(data);
+            ExecuteOperation(&op, extMemPool, bitMask, idx);
         }
-    }
-
-    return result;
-}
-
-template<typename Props> void LargeObjectCacheImpl<Props>::
-    CacheBin::forgetOutdatedState(uintptr_t currTime)
-{
-    // If the time since the last get is LongWaitFactor times more than ageThreshold
-    // for the bin, treat the bin as rarely-used and forget everything we know
-    // about it.
-    // If LongWaitFactor is too small, we forget too early and
-    // so prevents good caching, while if too high, caching blocks
-    // with unrelated usage pattern occurs.
-    const uintptr_t sinceLastGet = currTime - lastGet;
-    bool doCleanup = false;
-
-    intptr_t threshold = ageThreshold.load(std::memory_order_relaxed);
-    if (threshold)
-        doCleanup = sinceLastGet > static_cast<uintptr_t>(Props::LongWaitFactor * threshold);
-    else if (lastCleanedAge)
-        doCleanup = sinceLastGet > static_cast<uintptr_t>(Props::LongWaitFactor * (lastCleanedAge - lastGet));
-
-    if (doCleanup) {
-        lastCleanedAge = 0;
-        ageThreshold.store(0, std::memory_order_relaxed);
-    }
-
-}
-
-template<typename Props> LargeMemoryBlock *LargeObjectCacheImpl<Props>::
-    CacheBin::cleanToThreshold(uintptr_t currTime, BinBitMask *bitMask, int idx)
-{
-    /* oldest may be more recent then age, that's why cast to signed type
+
+        /* ------------------------------ Unsafe methods used with the aggregator ------------------------------ */
+
+        template <typename Props>
+        LargeMemoryBlock *LargeObjectCacheImpl<Props>::CacheBin::putList(LargeMemoryBlock *head,
+                                                                         LargeMemoryBlock *tail,
+                                                                         BinBitMask *bitMask, int idx,
+                                                                         int num, size_t hugeSizeThreshold) {
+            size_t size = head->unalignedSize;
+            usedSize.store(usedSize.load(std::memory_order_relaxed) - num * size, std::memory_order_relaxed);
+            MALLOC_ASSERT(!last.load(std::memory_order_relaxed)
+                                  || (last.load(std::memory_order_relaxed)->age != 0
+                                      && last.load(std::memory_order_relaxed)->age != -1U),
+                          ASSERT_TEXT);
+            MALLOC_ASSERT((tail == head && num == 1) || (tail != head && num > 1), ASSERT_TEXT);
+            MALLOC_ASSERT(tail, ASSERT_TEXT);
+            LargeMemoryBlock *toRelease = nullptr;
+            if (size < hugeSizeThreshold && !lastCleanedAge) {
+                // 1st object of such size was released.
+                // Not cache it, and remember when this occurs
+                // to take into account during cache miss.
+                lastCleanedAge = tail->age;
+                toRelease = tail;
+                tail = tail->prev;
+                if (tail) tail->next = nullptr;
+                else
+                    head = nullptr;
+                num--;
+            }
+            if (num) {
+                // add [head;tail] list to cache
+                tail->next = first;
+                if (first) first->prev = tail;
+                first = head;
+                if (!last.load(std::memory_order_relaxed)) {
+                    MALLOC_ASSERT(0 == oldest.load(std::memory_order_relaxed), ASSERT_TEXT);
+                    oldest.store(tail->age, std::memory_order_relaxed);
+                    last.store(tail, std::memory_order_relaxed);
+                }
+
+                cachedSize.store(cachedSize.load(std::memory_order_relaxed) + num * size,
+                                 std::memory_order_relaxed);
+            }
+
+            // No used object, and nothing in the bin, mark the bin as empty
+            if (!usedSize.load(std::memory_order_relaxed) && !first) bitMask->set(idx, false);
+
+            return toRelease;
+        }
+
+        template <typename Props>
+        LargeMemoryBlock *LargeObjectCacheImpl<Props>::CacheBin::get() {
+            LargeMemoryBlock *result = first;
+            if (result) {
+                first = result->next;
+                if (first) first->prev = nullptr;
+                else {
+                    last.store(nullptr, std::memory_order_relaxed);
+                    oldest.store(0, std::memory_order_relaxed);
+                }
+            }
+
+            return result;
+        }
+
+        template <typename Props>
+        void LargeObjectCacheImpl<Props>::CacheBin::forgetOutdatedState(uintptr_t currTime) {
+            // If the time since the last get is LongWaitFactor times more than ageThreshold
+            // for the bin, treat the bin as rarely-used and forget everything we know
+            // about it.
+            // If LongWaitFactor is too small, we forget too early and
+            // so prevents good caching, while if too high, caching blocks
+            // with unrelated usage pattern occurs.
+            const uintptr_t sinceLastGet = currTime - lastGet;
+            bool doCleanup = false;
+
+            intptr_t threshold = ageThreshold.load(std::memory_order_relaxed);
+            if (threshold)
+                doCleanup = sinceLastGet > static_cast<uintptr_t>(Props::LongWaitFactor * threshold);
+            else if (lastCleanedAge)
+                doCleanup = sinceLastGet
+                            > static_cast<uintptr_t>(Props::LongWaitFactor * (lastCleanedAge - lastGet));
+
+            if (doCleanup) {
+                lastCleanedAge = 0;
+                ageThreshold.store(0, std::memory_order_relaxed);
+            }
+        }
+
+        template <typename Props>
+        LargeMemoryBlock *LargeObjectCacheImpl<Props>::CacheBin::cleanToThreshold(uintptr_t currTime,
+                                                                                  BinBitMask *bitMask,
+                                                                                  int idx) {
+            /* oldest may be more recent then age, that's why cast to signed type
     was used. age overflow is also processed correctly. */
-    if ( !last.load(std::memory_order_relaxed) ||
-        (intptr_t)(currTime - last.load(std::memory_order_relaxed)->age) < ageThreshold.load(std::memory_order_relaxed) )
-        return nullptr;
+            if (!last.load(std::memory_order_relaxed)
+                || (intptr_t)(currTime - last.load(std::memory_order_relaxed)->age)
+                           < ageThreshold.load(std::memory_order_relaxed))
+                return nullptr;
 
 #if MALLOC_DEBUG
-    uintptr_t nextAge = 0;
+            uintptr_t nextAge = 0;
 #endif
-    do {
+            do {
 #if MALLOC_DEBUG
-        // check that list ordered
-        MALLOC_ASSERT(!nextAge || lessThanWithOverflow(nextAge, last.load(std::memory_order_relaxed)->age),
-            ASSERT_TEXT);
-        nextAge = last.load(std::memory_order_relaxed)->age;
+                // check that list ordered
+                MALLOC_ASSERT(
+                        !nextAge || lessThanWithOverflow(nextAge, last.load(std::memory_order_relaxed)->age),
+                        ASSERT_TEXT);
+                nextAge = last.load(std::memory_order_relaxed)->age;
 #endif
-        cachedSize.store(cachedSize.load(std::memory_order_relaxed) - last.load(std::memory_order_relaxed)->unalignedSize, std::memory_order_relaxed);
-        last.store(last.load(std::memory_order_relaxed)->prev, std::memory_order_relaxed);
-    } while (last.load(std::memory_order_relaxed) &&
-        (intptr_t)(currTime - last.load(std::memory_order_relaxed)->age) > ageThreshold.load(std::memory_order_relaxed));
-
-    LargeMemoryBlock *toRelease = nullptr;
-    if (last.load(std::memory_order_relaxed)) {
-        toRelease = last.load(std::memory_order_relaxed)->next;
-        oldest.store(last.load(std::memory_order_relaxed)->age, std::memory_order_relaxed);
-        last.load(std::memory_order_relaxed)->next = nullptr;
-    } else {
-        toRelease = first;
-        first = nullptr;
-        oldest.store(0, std::memory_order_relaxed);
-        if (!usedSize.load(std::memory_order_relaxed))
-            bitMask->set(idx, false);
-    }
-    MALLOC_ASSERT( toRelease, ASSERT_TEXT );
-    lastCleanedAge = toRelease->age;
-
-    return toRelease;
-}
-
-template<typename Props> LargeMemoryBlock *LargeObjectCacheImpl<Props>::
-    CacheBin::cleanAll(BinBitMask *bitMask, int idx)
-{
-    if (!last.load(std::memory_order_relaxed)) return nullptr;
-
-    LargeMemoryBlock *toRelease = first;
-    last.store(nullptr, std::memory_order_relaxed);
-    first = nullptr;
-    oldest.store(0, std::memory_order_relaxed);
-    cachedSize.store(0, std::memory_order_relaxed);
-    if (!usedSize.load(std::memory_order_relaxed))
-        bitMask->set(idx, false);
-
-    return toRelease;
-}
-
-/* ----------------------------------------------------------------------------------------------------- */
+                cachedSize.store(cachedSize.load(std::memory_order_relaxed)
+                                         - last.load(std::memory_order_relaxed)->unalignedSize,
+                                 std::memory_order_relaxed);
+                last.store(last.load(std::memory_order_relaxed)->prev, std::memory_order_relaxed);
+            } while (last.load(std::memory_order_relaxed)
+                     && (intptr_t)(currTime - last.load(std::memory_order_relaxed)->age)
+                                > ageThreshold.load(std::memory_order_relaxed));
+
+            LargeMemoryBlock *toRelease = nullptr;
+            if (last.load(std::memory_order_relaxed)) {
+                toRelease = last.load(std::memory_order_relaxed)->next;
+                oldest.store(last.load(std::memory_order_relaxed)->age, std::memory_order_relaxed);
+                last.load(std::memory_order_relaxed)->next = nullptr;
+            } else {
+                toRelease = first;
+                first = nullptr;
+                oldest.store(0, std::memory_order_relaxed);
+                if (!usedSize.load(std::memory_order_relaxed)) bitMask->set(idx, false);
+            }
+            MALLOC_ASSERT(toRelease, ASSERT_TEXT);
+            lastCleanedAge = toRelease->age;
+
+            return toRelease;
+        }
+
+        template <typename Props>
+        LargeMemoryBlock *LargeObjectCacheImpl<Props>::CacheBin::cleanAll(BinBitMask *bitMask, int idx) {
+            if (!last.load(std::memory_order_relaxed)) return nullptr;
+
+            LargeMemoryBlock *toRelease = first;
+            last.store(nullptr, std::memory_order_relaxed);
+            first = nullptr;
+            oldest.store(0, std::memory_order_relaxed);
+            cachedSize.store(0, std::memory_order_relaxed);
+            if (!usedSize.load(std::memory_order_relaxed)) bitMask->set(idx, false);
+
+            return toRelease;
+        }
+
+        /* ----------------------------------------------------------------------------------------------------- */
 
 #if __TBB_MALLOC_BACKEND_STAT
-template<typename Props> size_t LargeObjectCacheImpl<Props>::
-    CacheBin::reportStat(int num, FILE *f)
-{
+        template <typename Props>
+        size_t LargeObjectCacheImpl<Props>::CacheBin::reportStat(int num, FILE *f) {
 #if __TBB_MALLOC_LOCACHE_STAT
-    if (first)
-        printf("%d(%lu): total %lu KB thr %ld lastCln %lu oldest %lu\n",
-               num, num*Props::CacheStep+Props::MinSize,
-               cachedSize.load(std::memory_order_relaxed)/1024, ageThresholdageThreshold.load(std::memory_order_relaxed), lastCleanedAge, oldest.load(std::memory_order_relaxed));
+            if (first)
+                printf("%d(%lu): total %lu KB thr %ld lastCln %lu oldest %lu\n", num,
+                       num * Props::CacheStep + Props::MinSize,
+                       cachedSize.load(std::memory_order_relaxed) / 1024,
+                       ageThresholdageThreshold.load(std::memory_order_relaxed), lastCleanedAge,
+                       oldest.load(std::memory_order_relaxed));
 #else
-    suppress_unused_warning(num);
-    suppress_unused_warning(f);
+            suppress_unused_warning(num);
+            suppress_unused_warning(f);
 #endif
-    return cachedSize.load(std::memory_order_relaxed);
-}
+            return cachedSize.load(std::memory_order_relaxed);
+        }
 #endif
 
-// Release objects from cache blocks that are older than ageThreshold
-template<typename Props>
-bool LargeObjectCacheImpl<Props>::regularCleanup(ExtMemoryPool *extMemPool, uintptr_t currTime, bool doThreshDecr)
-{
-    bool released = false;
-    BinsSummary binsSummary;
-
-    // Threshold settings is below this cache or starts from zero index
-    if (hugeSizeThresholdIdx == 0) return false;
-
-    // Starting searching for bin that is less than huge size threshold (can be cleaned-up)
-    int startSearchIdx = hugeSizeThresholdIdx - 1;
-
-    for (int i = bitMask.getMaxTrue(startSearchIdx); i >= 0; i = bitMask.getMaxTrue(i-1)) {
-        bin[i].updateBinsSummary(&binsSummary);
-        if (!doThreshDecr && tooLargeLOC.load(std::memory_order_relaxed) > 2 && binsSummary.isLOCTooLarge()) {
-            // if LOC is too large for quite long time, decrease the threshold
-            // based on bin hit statistics.
-            // For this, redo cleanup from the beginning.
-            // Note: on this iteration total usedSz can be not too large
-            // in comparison to total cachedSz, as we calculated it only
-            // partially. We are ok with it.
-            i = bitMask.getMaxTrue(startSearchIdx)+1;
-            doThreshDecr = true;
-            binsSummary.reset();
-            continue;
+        // Release objects from cache blocks that are older than ageThreshold
+        template <typename Props>
+        bool LargeObjectCacheImpl<Props>::regularCleanup(ExtMemoryPool *extMemPool, uintptr_t currTime,
+                                                         bool doThreshDecr) {
+            bool released = false;
+            BinsSummary binsSummary;
+
+            // Threshold settings is below this cache or starts from zero index
+            if (hugeSizeThresholdIdx == 0) return false;
+
+            // Starting searching for bin that is less than huge size threshold (can be cleaned-up)
+            int startSearchIdx = hugeSizeThresholdIdx - 1;
+
+            for (int i = bitMask.getMaxTrue(startSearchIdx); i >= 0; i = bitMask.getMaxTrue(i - 1)) {
+                bin[i].updateBinsSummary(&binsSummary);
+                if (!doThreshDecr && tooLargeLOC.load(std::memory_order_relaxed) > 2
+                    && binsSummary.isLOCTooLarge()) {
+                    // if LOC is too large for quite long time, decrease the threshold
+                    // based on bin hit statistics.
+                    // For this, redo cleanup from the beginning.
+                    // Note: on this iteration total usedSz can be not too large
+                    // in comparison to total cachedSz, as we calculated it only
+                    // partially. We are ok with it.
+                    i = bitMask.getMaxTrue(startSearchIdx) + 1;
+                    doThreshDecr = true;
+                    binsSummary.reset();
+                    continue;
+                }
+                if (doThreshDecr) bin[i].decreaseThreshold();
+
+                if (bin[i].cleanToThreshold(extMemPool, &bitMask, currTime, i)) { released = true; }
+            }
+            // We want to find if LOC was too large for some time continuously,
+            // so OK with races between incrementing and zeroing, but incrementing
+            // must be atomic.
+            if (binsSummary.isLOCTooLarge()) {
+                tooLargeLOC++;
+            } else {
+                tooLargeLOC.store(0, std::memory_order_relaxed);
+            }
+            return released;
+        }
+
+        template <typename Props>
+        bool LargeObjectCacheImpl<Props>::cleanAll(ExtMemoryPool *extMemPool) {
+            bool released = false;
+            for (int i = numBins - 1; i >= 0; i--) {
+                released |= bin[i].releaseAllToBackend(extMemPool, &bitMask, i);
+            }
+            return released;
         }
-        if (doThreshDecr)
-            bin[i].decreaseThreshold();
 
-        if (bin[i].cleanToThreshold(extMemPool, &bitMask, currTime, i)) {
-            released = true;
+        template <typename Props>
+        void LargeObjectCacheImpl<Props>::reset() {
+            tooLargeLOC.store(0, std::memory_order_relaxed);
+            for (int i = numBins - 1; i >= 0; i--) bin[i].init();
+            bitMask.reset();
         }
-    }
-    // We want to find if LOC was too large for some time continuously,
-    // so OK with races between incrementing and zeroing, but incrementing
-    // must be atomic.
-    if (binsSummary.isLOCTooLarge()) {
-        tooLargeLOC++;
-    } else {
-        tooLargeLOC.store(0, std::memory_order_relaxed);
-    }
-    return released;
-}
-
-template<typename Props>
-bool LargeObjectCacheImpl<Props>::cleanAll(ExtMemoryPool *extMemPool)
-{
-    bool released = false;
-    for (int i = numBins-1; i >= 0; i--) {
-        released |= bin[i].releaseAllToBackend(extMemPool, &bitMask, i);
-    }
-    return released;
-}
-
-template<typename Props>
-void LargeObjectCacheImpl<Props>::reset() {
-    tooLargeLOC.store(0, std::memory_order_relaxed);
-    for (int i = numBins-1; i >= 0; i--)
-        bin[i].init();
-    bitMask.reset();
-}
 
 #if __TBB_MALLOC_WHITEBOX_TEST
-template<typename Props>
-size_t LargeObjectCacheImpl<Props>::getLOCSize() const
-{
-    size_t size = 0;
-    for (int i = numBins-1; i >= 0; i--)
-        size += bin[i].getSize();
-    return size;
-}
-
-size_t LargeObjectCache::getLOCSize() const
-{
-    return largeCache.getLOCSize() + hugeCache.getLOCSize();
-}
-
-template<typename Props>
-size_t LargeObjectCacheImpl<Props>::getUsedSize() const
-{
-    size_t size = 0;
-    for (int i = numBins-1; i >= 0; i--)
-        size += bin[i].getUsedSize();
-    return size;
-}
-
-size_t LargeObjectCache::getUsedSize() const
-{
-    return largeCache.getUsedSize() + hugeCache.getUsedSize();
-}
-#endif // __TBB_MALLOC_WHITEBOX_TEST
-
-inline bool LargeObjectCache::isCleanupNeededOnRange(uintptr_t range, uintptr_t currTime)
-{
-    return range >= cacheCleanupFreq
-        || currTime+range < currTime-1 // overflow, 0 is power of 2, do cleanup
-        // (prev;prev+range] contains n*cacheCleanupFreq
-        || alignUp(currTime, cacheCleanupFreq)<currTime+range;
-}
-
-bool LargeObjectCache::doCleanup(uintptr_t currTime, bool doThreshDecr)
-{
-    if (!doThreshDecr)
-        extMemPool->allLocalCaches.markUnused();
-
-    bool large_cache_cleaned = largeCache.regularCleanup(extMemPool, currTime, doThreshDecr);
-    bool huge_cache_cleaned = hugeCache.regularCleanup(extMemPool, currTime, doThreshDecr);
-    return large_cache_cleaned || huge_cache_cleaned;
-}
-
-bool LargeObjectCache::decreasingCleanup()
-{
-    return doCleanup(cacheCurrTime.load(std::memory_order_acquire), /*doThreshDecr=*/true);
-}
-
-bool LargeObjectCache::regularCleanup()
-{
-    return doCleanup(cacheCurrTime.load(std::memory_order_acquire), /*doThreshDecr=*/false);
-}
-
-bool LargeObjectCache::cleanAll()
-{
-    bool large_cache_cleaned = largeCache.cleanAll(extMemPool);
-    bool huge_cache_cleaned = hugeCache.cleanAll(extMemPool);
-    return large_cache_cleaned || huge_cache_cleaned;
-}
-
-void LargeObjectCache::reset()
-{
-    largeCache.reset();
-    hugeCache.reset();
-}
-
-template<typename Props>
-LargeMemoryBlock *LargeObjectCacheImpl<Props>::get(ExtMemoryPool *extMemoryPool, size_t size)
-{
-    int idx = Props::sizeToIdx(size);
-
-    LargeMemoryBlock *lmb = bin[idx].get(extMemoryPool, size, &bitMask, idx);
-
-    if (lmb) {
-        MALLOC_ITT_SYNC_ACQUIRED(bin+idx);
-        STAT_increment(getThreadId(), ThreadCommonCounters, allocCachedLargeObj);
-    }
-    return lmb;
-}
-
-template<typename Props>
-void LargeObjectCacheImpl<Props>::updateCacheState(ExtMemoryPool *extMemPool, DecreaseOrIncrease op, size_t size)
-{
-    int idx = Props::sizeToIdx(size);
-    MALLOC_ASSERT(idx < static_cast<int>(numBins), ASSERT_TEXT);
-    bin[idx].updateUsedSize(extMemPool, op==decrease? -size : size, &bitMask, idx);
-}
+        template <typename Props>
+        size_t LargeObjectCacheImpl<Props>::getLOCSize() const {
+            size_t size = 0;
+            for (int i = numBins - 1; i >= 0; i--) size += bin[i].getSize();
+            return size;
+        }
+
+        size_t LargeObjectCache::getLOCSize() const {
+            return largeCache.getLOCSize() + hugeCache.getLOCSize();
+        }
+
+        template <typename Props>
+        size_t LargeObjectCacheImpl<Props>::getUsedSize() const {
+            size_t size = 0;
+            for (int i = numBins - 1; i >= 0; i--) size += bin[i].getUsedSize();
+            return size;
+        }
+
+        size_t LargeObjectCache::getUsedSize() const {
+            return largeCache.getUsedSize() + hugeCache.getUsedSize();
+        }
+#endif// __TBB_MALLOC_WHITEBOX_TEST
+
+        inline bool LargeObjectCache::isCleanupNeededOnRange(uintptr_t range, uintptr_t currTime) {
+            return range >= cacheCleanupFreq
+                   || currTime + range < currTime - 1// overflow, 0 is power of 2, do cleanup
+                   // (prev;prev+range] contains n*cacheCleanupFreq
+                   || alignUp(currTime, cacheCleanupFreq) < currTime + range;
+        }
+
+        bool LargeObjectCache::doCleanup(uintptr_t currTime, bool doThreshDecr) {
+            if (!doThreshDecr) extMemPool->allLocalCaches.markUnused();
+
+            bool large_cache_cleaned = largeCache.regularCleanup(extMemPool, currTime, doThreshDecr);
+            bool huge_cache_cleaned = hugeCache.regularCleanup(extMemPool, currTime, doThreshDecr);
+            return large_cache_cleaned || huge_cache_cleaned;
+        }
+
+        bool LargeObjectCache::decreasingCleanup() {
+            return doCleanup(cacheCurrTime.load(std::memory_order_acquire), /*doThreshDecr=*/true);
+        }
+
+        bool LargeObjectCache::regularCleanup() {
+            return doCleanup(cacheCurrTime.load(std::memory_order_acquire), /*doThreshDecr=*/false);
+        }
+
+        bool LargeObjectCache::cleanAll() {
+            bool large_cache_cleaned = largeCache.cleanAll(extMemPool);
+            bool huge_cache_cleaned = hugeCache.cleanAll(extMemPool);
+            return large_cache_cleaned || huge_cache_cleaned;
+        }
+
+        void LargeObjectCache::reset() {
+            largeCache.reset();
+            hugeCache.reset();
+        }
+
+        template <typename Props>
+        LargeMemoryBlock *LargeObjectCacheImpl<Props>::get(ExtMemoryPool *extMemoryPool, size_t size) {
+            int idx = Props::sizeToIdx(size);
+
+            LargeMemoryBlock *lmb = bin[idx].get(extMemoryPool, size, &bitMask, idx);
+
+            if (lmb) {
+                MALLOC_ITT_SYNC_ACQUIRED(bin + idx);
+                STAT_increment(getThreadId(), ThreadCommonCounters, allocCachedLargeObj);
+            }
+            return lmb;
+        }
+
+        template <typename Props>
+        void LargeObjectCacheImpl<Props>::updateCacheState(ExtMemoryPool *extMemPool, DecreaseOrIncrease op,
+                                                           size_t size) {
+            int idx = Props::sizeToIdx(size);
+            MALLOC_ASSERT(idx < static_cast<int>(numBins), ASSERT_TEXT);
+            bin[idx].updateUsedSize(extMemPool, op == decrease ? -size : size, &bitMask, idx);
+        }
 
 #if __TBB_MALLOC_LOCACHE_STAT
-template<typename Props>
-void LargeObjectCacheImpl<Props>::reportStat(FILE *f)
-{
-    size_t cachedSize = 0;
-    for (int i=0; i<numBins; i++)
-        cachedSize += bin[i].reportStat(i, f);
-    fprintf(f, "total LOC size %lu MB\n", cachedSize/1024/1024);
-}
-
-void LargeObjectCache::reportStat(FILE *f)
-{
-    largeCache.reportStat(f);
-    hugeCache.reportStat(f);
-    fprintf(f, "cache time %lu\n", cacheCurrTime.load(std::memory_order_relaxed));
-}
+        template <typename Props>
+        void LargeObjectCacheImpl<Props>::reportStat(FILE *f) {
+            size_t cachedSize = 0;
+            for (int i = 0; i < numBins; i++) cachedSize += bin[i].reportStat(i, f);
+            fprintf(f, "total LOC size %lu MB\n", cachedSize / 1024 / 1024);
+        }
+
+        void LargeObjectCache::reportStat(FILE *f) {
+            largeCache.reportStat(f);
+            hugeCache.reportStat(f);
+            fprintf(f, "cache time %lu\n", cacheCurrTime.load(std::memory_order_relaxed));
+        }
 #endif
 
-template<typename Props>
-void LargeObjectCacheImpl<Props>::putList(ExtMemoryPool *extMemPool, LargeMemoryBlock *toCache)
-{
-    int toBinIdx = Props::sizeToIdx(toCache->unalignedSize);
-
-    MALLOC_ITT_SYNC_RELEASING(bin+toBinIdx);
-    bin[toBinIdx].putList(extMemPool, toCache, &bitMask, toBinIdx);
-}
-
-void LargeObjectCache::updateCacheState(DecreaseOrIncrease op, size_t size)
-{
-    if (size < maxLargeSize)
-        largeCache.updateCacheState(extMemPool, op, size);
-    else if (size < maxHugeSize)
-        hugeCache.updateCacheState(extMemPool, op, size);
-}
-
-
-uintptr_t LargeObjectCache::getCurrTimeRange(uintptr_t range)
-{
-    return (cacheCurrTime.fetch_add(range) + 1);
-}
-
-void LargeObjectCache::registerRealloc(size_t oldSize, size_t newSize)
-{
-    updateCacheState(decrease, oldSize);
-    updateCacheState(increase, alignToBin(newSize));
-}
-
-size_t LargeObjectCache::alignToBin(size_t size) {
-    return size < maxLargeSize ? LargeCacheType::alignToBin(size) : HugeCacheType::alignToBin(size);
-}
-
-// Used for internal purpose
-int LargeObjectCache::sizeToIdx(size_t size)
-{
-    MALLOC_ASSERT(size <= maxHugeSize, ASSERT_TEXT);
-    return size < maxLargeSize ?
-        LargeCacheType::sizeToIdx(size) :
-        LargeCacheType::numBins + HugeCacheType::sizeToIdx(size);
-}
-
-void LargeObjectCache::putList(LargeMemoryBlock *list)
-{
-    LargeMemoryBlock *toProcess, *n;
-
-    for (LargeMemoryBlock *curr = list; curr; curr = toProcess) {
-        LargeMemoryBlock *tail = curr;
-        toProcess = curr->next;
-        if (!sizeInCacheRange(curr->unalignedSize)) {
-            extMemPool->backend.returnLargeObject(curr);
-            continue;
+        template <typename Props>
+        void LargeObjectCacheImpl<Props>::putList(ExtMemoryPool *extMemPool, LargeMemoryBlock *toCache) {
+            int toBinIdx = Props::sizeToIdx(toCache->unalignedSize);
+
+            MALLOC_ITT_SYNC_RELEASING(bin + toBinIdx);
+            bin[toBinIdx].putList(extMemPool, toCache, &bitMask, toBinIdx);
         }
-        int currIdx = sizeToIdx(curr->unalignedSize);
-
-        // Find all blocks fitting to same bin. Not use more efficient sorting
-        // algorithm because list is short (commonly,
-        // LocalLOC's HIGH_MARK-LOW_MARK, i.e. 24 items).
-        for (LargeMemoryBlock *b = toProcess; b; b = n) {
-            n = b->next;
-            if (sizeToIdx(b->unalignedSize) == currIdx) {
-                tail->next = b;
-                tail = b;
-                if (toProcess == b)
-                    toProcess = toProcess->next;
-                else {
-                    b->prev->next = b->next;
-                    if (b->next)
-                        b->next->prev = b->prev;
+
+        void LargeObjectCache::updateCacheState(DecreaseOrIncrease op, size_t size) {
+            if (size < maxLargeSize) largeCache.updateCacheState(extMemPool, op, size);
+            else if (size < maxHugeSize)
+                hugeCache.updateCacheState(extMemPool, op, size);
+        }
+
+        uintptr_t LargeObjectCache::getCurrTimeRange(uintptr_t range) {
+            return (cacheCurrTime.fetch_add(range) + 1);
+        }
+
+        void LargeObjectCache::registerRealloc(size_t oldSize, size_t newSize) {
+            updateCacheState(decrease, oldSize);
+            updateCacheState(increase, alignToBin(newSize));
+        }
+
+        size_t LargeObjectCache::alignToBin(size_t size) {
+            return size < maxLargeSize ? LargeCacheType::alignToBin(size) : HugeCacheType::alignToBin(size);
+        }
+
+        // Used for internal purpose
+        int LargeObjectCache::sizeToIdx(size_t size) {
+            MALLOC_ASSERT(size <= maxHugeSize, ASSERT_TEXT);
+            return size < maxLargeSize ? LargeCacheType::sizeToIdx(size)
+                                       : LargeCacheType::numBins + HugeCacheType::sizeToIdx(size);
+        }
+
+        void LargeObjectCache::putList(LargeMemoryBlock *list) {
+            LargeMemoryBlock *toProcess, *n;
+
+            for (LargeMemoryBlock *curr = list; curr; curr = toProcess) {
+                LargeMemoryBlock *tail = curr;
+                toProcess = curr->next;
+                if (!sizeInCacheRange(curr->unalignedSize)) {
+                    extMemPool->backend.returnLargeObject(curr);
+                    continue;
                 }
+                int currIdx = sizeToIdx(curr->unalignedSize);
+
+                // Find all blocks fitting to same bin. Not use more efficient sorting
+                // algorithm because list is short (commonly,
+                // LocalLOC's HIGH_MARK-LOW_MARK, i.e. 24 items).
+                for (LargeMemoryBlock *b = toProcess; b; b = n) {
+                    n = b->next;
+                    if (sizeToIdx(b->unalignedSize) == currIdx) {
+                        tail->next = b;
+                        tail = b;
+                        if (toProcess == b) toProcess = toProcess->next;
+                        else {
+                            b->prev->next = b->next;
+                            if (b->next) b->next->prev = b->prev;
+                        }
+                    }
+                }
+                tail->next = nullptr;
+                if (curr->unalignedSize < maxLargeSize) largeCache.putList(extMemPool, curr);
+                else
+                    hugeCache.putList(extMemPool, curr);
             }
         }
-        tail->next = nullptr;
-        if (curr->unalignedSize < maxLargeSize)
-            largeCache.putList(extMemPool, curr);
-        else
-            hugeCache.putList(extMemPool, curr);
-    }
-}
-
-void LargeObjectCache::put(LargeMemoryBlock *largeBlock)
-{
-    size_t blockSize = largeBlock->unalignedSize;
-    if (sizeInCacheRange(blockSize)) {
-        largeBlock->next = nullptr;
-        if (blockSize < maxLargeSize)
-            largeCache.putList(extMemPool, largeBlock);
-        else
-            hugeCache.putList(extMemPool, largeBlock);
-    } else {
-        extMemPool->backend.returnLargeObject(largeBlock);
-    }
-}
-
-LargeMemoryBlock *LargeObjectCache::get(size_t size)
-{
-    MALLOC_ASSERT( size >= minLargeSize, ASSERT_TEXT );
-    if (sizeInCacheRange(size)) {
-        return size < maxLargeSize ?
-            largeCache.get(extMemPool, size) : hugeCache.get(extMemPool, size);
-    }
-    return nullptr;
-}
-
-LargeMemoryBlock *ExtMemoryPool::mallocLargeObject(MemoryPool *pool, size_t allocationSize)
-{
-#if __TBB_MALLOC_LOCACHE_STAT
-    mallocCalls++;
-    memAllocKB.fetch_add(allocationSize/1024);
-#endif
-    LargeMemoryBlock* lmb = loc.get(allocationSize);
-    if (!lmb) {
-        BackRefIdx backRefIdx = BackRefIdx::newBackRef(/*largeObj=*/true);
-        if (backRefIdx.isInvalid())
-            return nullptr;
 
-        // unalignedSize is set in getLargeBlock
-        lmb = backend.getLargeBlock(allocationSize);
-        if (!lmb) {
-            removeBackRef(backRefIdx);
-            loc.updateCacheState(decrease, allocationSize);
+        void LargeObjectCache::put(LargeMemoryBlock *largeBlock) {
+            size_t blockSize = largeBlock->unalignedSize;
+            if (sizeInCacheRange(blockSize)) {
+                largeBlock->next = nullptr;
+                if (blockSize < maxLargeSize) largeCache.putList(extMemPool, largeBlock);
+                else
+                    hugeCache.putList(extMemPool, largeBlock);
+            } else {
+                extMemPool->backend.returnLargeObject(largeBlock);
+            }
+        }
+
+        LargeMemoryBlock *LargeObjectCache::get(size_t size) {
+            MALLOC_ASSERT(size >= minLargeSize, ASSERT_TEXT);
+            if (sizeInCacheRange(size)) {
+                return size < maxLargeSize ? largeCache.get(extMemPool, size)
+                                           : hugeCache.get(extMemPool, size);
+            }
             return nullptr;
         }
-        lmb->backRefIdx = backRefIdx;
-        lmb->pool = pool;
-        STAT_increment(getThreadId(), ThreadCommonCounters, allocNewLargeObj);
-    } else {
+
+        LargeMemoryBlock *ExtMemoryPool::mallocLargeObject(MemoryPool *pool, size_t allocationSize) {
 #if __TBB_MALLOC_LOCACHE_STAT
-        cacheHits++;
-        memHitKB.fetch_add(allocationSize/1024);
+            mallocCalls++;
+            memAllocKB.fetch_add(allocationSize / 1024);
 #endif
-    }
-    return lmb;
-}
-
-void ExtMemoryPool::freeLargeObject(LargeMemoryBlock *mBlock)
-{
-    loc.put(mBlock);
-}
-
-void ExtMemoryPool::freeLargeObjectList(LargeMemoryBlock *head)
-{
-    loc.putList(head);
-}
-
-bool ExtMemoryPool::softCachesCleanup()
-{
-    bool ret = false;
-    if (!softCachesCleanupInProgress.exchange(1, std::memory_order_acq_rel)) {
-        ret = loc.regularCleanup();
-        softCachesCleanupInProgress.store(0, std::memory_order_release);
-    }
-    return ret;
-}
-
-bool ExtMemoryPool::hardCachesCleanup(bool wait)
-{
-    if (hardCachesCleanupInProgress.exchange(1, std::memory_order_acq_rel)) {
-        if (!wait)
-            return false;
+            LargeMemoryBlock *lmb = loc.get(allocationSize);
+            if (!lmb) {
+                BackRefIdx backRefIdx = BackRefIdx::newBackRef(/*largeObj=*/true);
+                if (backRefIdx.isInvalid()) return nullptr;
+
+                // unalignedSize is set in getLargeBlock
+                lmb = backend.getLargeBlock(allocationSize);
+                if (!lmb) {
+                    removeBackRef(backRefIdx);
+                    loc.updateCacheState(decrease, allocationSize);
+                    return nullptr;
+                }
+                lmb->backRefIdx = backRefIdx;
+                lmb->pool = pool;
+                STAT_increment(getThreadId(), ThreadCommonCounters, allocNewLargeObj);
+            } else {
+#if __TBB_MALLOC_LOCACHE_STAT
+                cacheHits++;
+                memHitKB.fetch_add(allocationSize / 1024);
+#endif
+            }
+            return lmb;
+        }
 
-        AtomicBackoff backoff;
-        while (hardCachesCleanupInProgress.exchange(1, std::memory_order_acq_rel))
-            backoff.pause();
-    }
+        void ExtMemoryPool::freeLargeObject(LargeMemoryBlock *mBlock) { loc.put(mBlock); }
 
-    // thread-local caches must be cleaned before LOC,
-    // because object from thread-local cache can be released to LOC
-    bool ret = releaseAllLocalCaches();
-    ret |= orphanedBlocks.cleanup(&backend);
-    ret |= loc.cleanAll();
-    ret |= backend.clean();
+        void ExtMemoryPool::freeLargeObjectList(LargeMemoryBlock *head) { loc.putList(head); }
 
-    hardCachesCleanupInProgress.store(0, std::memory_order_release);
-    return ret;
-}
+        bool ExtMemoryPool::softCachesCleanup() {
+            bool ret = false;
+            if (!softCachesCleanupInProgress.exchange(1, std::memory_order_acq_rel)) {
+                ret = loc.regularCleanup();
+                softCachesCleanupInProgress.store(0, std::memory_order_release);
+            }
+            return ret;
+        }
+
+        bool ExtMemoryPool::hardCachesCleanup(bool wait) {
+            if (hardCachesCleanupInProgress.exchange(1, std::memory_order_acq_rel)) {
+                if (!wait) return false;
+
+                AtomicBackoff backoff;
+                while (hardCachesCleanupInProgress.exchange(1, std::memory_order_acq_rel)) backoff.pause();
+            }
+
+            // thread-local caches must be cleaned before LOC,
+            // because object from thread-local cache can be released to LOC
+            bool ret = releaseAllLocalCaches();
+            ret |= orphanedBlocks.cleanup(&backend);
+            ret |= loc.cleanAll();
+            ret |= backend.clean();
+
+            hardCachesCleanupInProgress.store(0, std::memory_order_release);
+            return ret;
+        }
 
 #if BACKEND_HAS_MREMAP
-void *ExtMemoryPool::remap(void *ptr, size_t oldSize, size_t newSize, size_t alignment)
-{
-    const size_t oldUnalignedSize = ((LargeObjectHdr*)ptr - 1)->memoryBlock->unalignedSize;
-    void *o = backend.remap(ptr, oldSize, newSize, alignment);
-    if (o) {
-        LargeMemoryBlock *lmb = ((LargeObjectHdr*)o - 1)->memoryBlock;
-        loc.registerRealloc(oldUnalignedSize, lmb->unalignedSize);
-    }
-    return o;
-}
+        void *ExtMemoryPool::remap(void *ptr, size_t oldSize, size_t newSize, size_t alignment) {
+            const size_t oldUnalignedSize = ((LargeObjectHdr *) ptr - 1)->memoryBlock->unalignedSize;
+            void *o = backend.remap(ptr, oldSize, newSize, alignment);
+            if (o) {
+                LargeMemoryBlock *lmb = ((LargeObjectHdr *) o - 1)->memoryBlock;
+                loc.registerRealloc(oldUnalignedSize, lmb->unalignedSize);
+            }
+            return o;
+        }
 #endif /* BACKEND_HAS_MREMAP */
 
-/*********** End allocation of large objects **********/
+        /*********** End allocation of large objects **********/
 
-} // namespace internal
-} // namespace rml
+    }// namespace internal
+}// namespace rml
 
 #if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
-    #pragma warning(pop)
+#pragma warning(pop)
 #endif
diff --git a/external/tbb/src/tbbmalloc/tbbmalloc.cpp b/external/tbb/src/tbbmalloc/tbbmalloc.cpp
index b72e03a7..0725885c 100644
--- a/external/tbb/src/tbbmalloc/tbbmalloc.cpp
+++ b/external/tbb/src/tbbmalloc/tbbmalloc.cpp
@@ -14,23 +14,23 @@
     limitations under the License.
 */
 
-#include "TypeDefinitions.h" // Customize.h and proxy.h get included
+#include "TypeDefinitions.h"// Customize.h and proxy.h get included
 #include "tbbmalloc_internal_api.h"
 
-#include "../tbb/assert_impl.h" // Out-of-line TBB assertion handling routines are instantiated here.
-#include "oneapi/tbb/version.h"
+#include "../tbb/assert_impl.h"// Out-of-line TBB assertion handling routines are instantiated here.
 #include "oneapi/tbb/scalable_allocator.h"
+#include "oneapi/tbb/version.h"
 
 #undef UNICODE
 
 #if USE_PTHREAD
-#include <dlfcn.h> // dlopen
+#include <dlfcn.h>// dlopen
 #elif USE_WINTHREAD
 #include <windows.h>
 #endif
 
 namespace rml {
-namespace internal {
+    namespace internal {
 
 #if TBB_USE_DEBUG
 #define DEBUG_SUFFIX "_debug"
@@ -39,77 +39,72 @@ namespace internal {
 #endif /* TBB_USE_DEBUG */
 
 // MALLOCLIB_NAME is the name of the oneTBB memory allocator library.
-#if _WIN32||_WIN64
+#if _WIN32 || _WIN64
 #define MALLOCLIB_NAME "tbbmalloc" DEBUG_SUFFIX ".dll"
 #elif __APPLE__
 #define MALLOCLIB_NAME "libtbbmalloc" DEBUG_SUFFIX ".2.dylib"
 #elif __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __sun || _AIX || __ANDROID__
 #define MALLOCLIB_NAME "libtbbmalloc" DEBUG_SUFFIX ".so"
 #elif __unix__
-#define MALLOCLIB_NAME "libtbbmalloc" DEBUG_SUFFIX  __TBB_STRING(.so.2)
+#define MALLOCLIB_NAME "libtbbmalloc" DEBUG_SUFFIX __TBB_STRING(.so .2)
 #else
 #error Unknown OS
 #endif
 
-void init_tbbmalloc() {
+        void init_tbbmalloc() {
 #if __TBB_USE_ITT_NOTIFY
-    MallocInitializeITT();
+            MallocInitializeITT();
 #endif
 
 /* Preventing TBB allocator library from unloading to prevent
    resource leak, as memory is not released on the library unload.
 */
 #if USE_WINTHREAD && !__TBB_SOURCE_DIRECTLY_INCLUDED && !__TBB_WIN8UI_SUPPORT
-    // Prevent Windows from displaying message boxes if it fails to load library
-    UINT prev_mode = SetErrorMode (SEM_FAILCRITICALERRORS);
-    HMODULE lib;
-    BOOL ret = GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS
-                                 |GET_MODULE_HANDLE_EX_FLAG_PIN,
-                                 (LPCTSTR)&scalable_malloc, &lib);
-    MALLOC_ASSERT(lib && ret, "Allocator can't find itself.");
-    tbb::detail::suppress_unused_warning(ret);
-    SetErrorMode (prev_mode);
+            // Prevent Windows from displaying message boxes if it fails to load library
+            UINT prev_mode = SetErrorMode(SEM_FAILCRITICALERRORS);
+            HMODULE lib;
+            BOOL ret = GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS
+                                                 | GET_MODULE_HANDLE_EX_FLAG_PIN,
+                                         (LPCTSTR) &scalable_malloc, &lib);
+            MALLOC_ASSERT(lib && ret, "Allocator can't find itself.");
+            tbb::detail::suppress_unused_warning(ret);
+            SetErrorMode(prev_mode);
 #endif /* USE_PTHREAD && !__TBB_SOURCE_DIRECTLY_INCLUDED */
-}
+        }
 
 #if !__TBB_SOURCE_DIRECTLY_INCLUDED
 #if USE_WINTHREAD
-extern "C" BOOL WINAPI DllMain( HINSTANCE /*hInst*/, DWORD callReason, LPVOID lpvReserved)
-{
-    if (callReason==DLL_THREAD_DETACH)
-    {
-        __TBB_mallocThreadShutdownNotification();
-    }
-    else if (callReason==DLL_PROCESS_DETACH)
-    {
-        __TBB_mallocProcessShutdownNotification(lpvReserved != nullptr);
-    }
-    return TRUE;
-}
-#else /* !USE_WINTHREAD */
-struct RegisterProcessShutdownNotification {
-// Work around non-reentrancy in dlopen() on Android
-    RegisterProcessShutdownNotification() {
-        // prevents unloading, POSIX case
-
-        // We need better support for the library pinning
-        // when dlopen can't find TBBmalloc library.
-        // for example: void *ret = dlopen(MALLOCLIB_NAME, RTLD_NOW);
-        // MALLOC_ASSERT(ret, "Allocator can't load itself.");
-        dlopen(MALLOCLIB_NAME, RTLD_NOW);
-    }
-
-    RegisterProcessShutdownNotification(RegisterProcessShutdownNotification&) = delete;
-    RegisterProcessShutdownNotification& operator=(const RegisterProcessShutdownNotification&) = delete;
-
-    ~RegisterProcessShutdownNotification() {
-        __TBB_mallocProcessShutdownNotification(false);
-    }
-};
-
-static RegisterProcessShutdownNotification reg;
+        extern "C" BOOL WINAPI DllMain(HINSTANCE /*hInst*/, DWORD callReason, LPVOID lpvReserved) {
+            if (callReason == DLL_THREAD_DETACH) {
+                __TBB_mallocThreadShutdownNotification();
+            } else if (callReason == DLL_PROCESS_DETACH) {
+                __TBB_mallocProcessShutdownNotification(lpvReserved != nullptr);
+            }
+            return TRUE;
+        }
+#else  /* !USE_WINTHREAD */
+        struct RegisterProcessShutdownNotification {
+            // Work around non-reentrancy in dlopen() on Android
+            RegisterProcessShutdownNotification() {
+                // prevents unloading, POSIX case
+
+                // We need better support for the library pinning
+                // when dlopen can't find TBBmalloc library.
+                // for example: void *ret = dlopen(MALLOCLIB_NAME, RTLD_NOW);
+                // MALLOC_ASSERT(ret, "Allocator can't load itself.");
+                dlopen(MALLOCLIB_NAME, RTLD_NOW);
+            }
+
+            RegisterProcessShutdownNotification(RegisterProcessShutdownNotification&) = delete;
+            RegisterProcessShutdownNotification& operator=(const RegisterProcessShutdownNotification&)
+                    = delete;
+
+            ~RegisterProcessShutdownNotification() { __TBB_mallocProcessShutdownNotification(false); }
+        };
+
+        static RegisterProcessShutdownNotification reg;
 #endif /* !USE_WINTHREAD */
 #endif /* !__TBB_SOURCE_DIRECTLY_INCLUDED */
 
-} } // namespaces
-
+    }// namespace internal
+}// namespace rml
diff --git a/external/tbb/src/tbbmalloc_proxy/function_replacement.cpp b/external/tbb/src/tbbmalloc_proxy/function_replacement.cpp
index ad05354f..63c496d8 100644
--- a/external/tbb/src/tbbmalloc_proxy/function_replacement.cpp
+++ b/external/tbb/src/tbbmalloc_proxy/function_replacement.cpp
@@ -14,9 +14,9 @@
     limitations under the License.
 */
 
-#include "oneapi/tbb/detail/_config.h"
-#include "oneapi/tbb/detail/_assert.h"
 #include "../tbb/assert_impl.h"
+#include "oneapi/tbb/detail/_assert.h"
+#include "oneapi/tbb/detail/_config.h"
 
 #if !__TBB_WIN8UI_SUPPORT && defined(_WIN32)
 
@@ -25,23 +25,23 @@
 #endif
 
 // no standard-conforming implementation of snprintf prior to VS 2015
-#if !defined(_MSC_VER) || _MSC_VER>=1900
+#if !defined(_MSC_VER) || _MSC_VER >= 1900
 #define LOG_PRINT(s, n, format, ...) snprintf(s, n, format, __VA_ARGS__)
 #else
 #define LOG_PRINT(s, n, format, ...) _snprintf_s(s, n, _TRUNCATE, format, __VA_ARGS__)
 #endif
 
-#include <windows.h>
 #include <new>
 #include <stdio.h>
 #include <string.h>
+#include <windows.h>
 
 #include "function_replacement.h"
 
 // The information about a standard memory allocation function for the replacement log
 struct FunctionInfo {
-    const char* funcName;
-    const char* dllName;
+    const char *funcName;
+    const char *dllName;
 };
 
 // Namespace that processes and manages the output of records to the Log journal
@@ -63,7 +63,7 @@ namespace Log {
     // functionInfo - information about a standard memory allocation function for the replacement log
     // opcodeString - string, that contain byte code of this function
     // status - information about function replacement status
-    static void record(FunctionInfo functionInfo, const char * opcodeString, bool status) {
+    static void record(FunctionInfo functionInfo, const char *opcodeString, bool status) {
         __TBB_ASSERT(functionInfo.dllName, "Empty DLL name value");
         __TBB_ASSERT(functionInfo.funcName, "Empty function name value");
         __TBB_ASSERT(opcodeString, "Empty opcode");
@@ -79,35 +79,32 @@ namespace Log {
             return;
         }
 
-        char* entry = (char*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, RECORD_LENGTH);
+        char *entry = (char *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, RECORD_LENGTH);
         __TBB_ASSERT(entry, "Invalid memory was returned");
 
-        LOG_PRINT(entry, RECORD_LENGTH, "%s: %s (%s), byte pattern: <%s>",
-            status ? "Success" : "Fail", functionInfo.funcName, functionInfo.dllName, opcodeString);
+        LOG_PRINT(entry, RECORD_LENGTH, "%s: %s (%s), byte pattern: <%s>", status ? "Success" : "Fail",
+                  functionInfo.funcName, functionInfo.dllName, opcodeString);
 
         records[record_number++] = entry;
     }
-};
+};// namespace Log
 
-inline UINT_PTR Ptr2Addrint(LPVOID ptr)
-{
+inline UINT_PTR Ptr2Addrint(LPVOID ptr) {
     Int2Ptr i2p;
     i2p.lpv = ptr;
     return i2p.uip;
 }
 
-inline LPVOID Addrint2Ptr(UINT_PTR ptr)
-{
+inline LPVOID Addrint2Ptr(UINT_PTR ptr) {
     Int2Ptr i2p;
     i2p.uip = ptr;
     return i2p.lpv;
 }
 
 // Is the distance between addr1 and addr2 smaller than dist
-inline bool IsInDistance(UINT_PTR addr1, UINT_PTR addr2, __int64 dist)
-{
-    __int64 diff = addr1>addr2 ? addr1-addr2 : addr2-addr1;
-    return diff<dist;
+inline bool IsInDistance(UINT_PTR addr1, UINT_PTR addr2, __int64 dist) {
+    __int64 diff = addr1 > addr2 ? addr1 - addr2 : addr2 - addr1;
+    return diff < dist;
 }
 
 /*
@@ -128,52 +125,45 @@ inline bool IsInDistance(UINT_PTR addr1, UINT_PTR addr2, __int64 dist)
 class MemoryProvider {
 private:
     struct MemoryBuffer {
-        UINT_PTR m_base;    // base address of the buffer
-        UINT_PTR m_next;    // next free location in the buffer
-        DWORD    m_size;    // size of buffer
+        UINT_PTR m_base;// base address of the buffer
+        UINT_PTR m_next;// next free location in the buffer
+        DWORD m_size;   // size of buffer
 
         // Default constructor
         MemoryBuffer() : m_base(0), m_next(0), m_size(0) {}
 
         // Constructor
-        MemoryBuffer(void *base, DWORD size)
-        {
+        MemoryBuffer(void *base, DWORD size) {
             m_base = Ptr2Addrint(base);
             m_next = m_base;
             m_size = size;
         }
     };
 
-MemoryBuffer *CreateBuffer(UINT_PTR addr)
-    {
+    MemoryBuffer *CreateBuffer(UINT_PTR addr) {
         // No more room in the pages database
-        if (m_lastBuffer - m_pages == MAX_NUM_BUFFERS)
-            return 0;
+        if (m_lastBuffer - m_pages == MAX_NUM_BUFFERS) return 0;
 
         void *newAddr = Addrint2Ptr(addr);
         // Get information for the region which the given address belongs to
         MEMORY_BASIC_INFORMATION memInfo;
-        if (VirtualQuery(newAddr, &memInfo, sizeof(memInfo)) != sizeof(memInfo))
-            return 0;
+        if (VirtualQuery(newAddr, &memInfo, sizeof(memInfo)) != sizeof(memInfo)) return 0;
 
-        for(;;) {
+        for (;;) {
             // The new address to check is beyond the current region and aligned to allocation size
-            newAddr = Addrint2Ptr( (Ptr2Addrint(memInfo.BaseAddress) + memInfo.RegionSize + m_allocSize) & ~(UINT_PTR)(m_allocSize-1) );
+            newAddr = Addrint2Ptr((Ptr2Addrint(memInfo.BaseAddress) + memInfo.RegionSize + m_allocSize)
+                                  & ~(UINT_PTR)(m_allocSize - 1));
 
             // Check that the address is in the right distance.
             // VirtualAlloc can only round the address down; so it will remain in the right distance
-            if (!IsInDistance(addr, Ptr2Addrint(newAddr), MAX_DISTANCE))
-                break;
+            if (!IsInDistance(addr, Ptr2Addrint(newAddr), MAX_DISTANCE)) break;
 
-            if (VirtualQuery(newAddr, &memInfo, sizeof(memInfo)) != sizeof(memInfo))
-                break;
+            if (VirtualQuery(newAddr, &memInfo, sizeof(memInfo)) != sizeof(memInfo)) break;
 
-            if (memInfo.State == MEM_FREE && memInfo.RegionSize >= m_allocSize)
-            {
+            if (memInfo.State == MEM_FREE && memInfo.RegionSize >= m_allocSize) {
                 // Found a free region, try to allocate a page in this region
-                void *newPage = VirtualAlloc(newAddr, m_allocSize, MEM_COMMIT|MEM_RESERVE, PAGE_READWRITE);
-                if (!newPage)
-                    break;
+                void *newPage = VirtualAlloc(newAddr, m_allocSize, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
+                if (!newPage) break;
 
                 // Add the new page to the pages database
                 MemoryBuffer *pBuff = new (m_lastBuffer) MemoryBuffer(newPage, m_allocSize);
@@ -187,8 +177,7 @@ MemoryBuffer *CreateBuffer(UINT_PTR addr)
     }
 
 public:
-    MemoryProvider()
-    {
+    MemoryProvider() {
         SYSTEM_INFO sysInfo;
         GetSystemInfo(&sysInfo);
         m_allocSize = sysInfo.dwAllocationGranularity;
@@ -198,18 +187,13 @@ MemoryBuffer *CreateBuffer(UINT_PTR addr)
     // We can't free the pages in the destructor because the trampolines
     // are using these memory locations and a replaced function might be called
     // after the destructor was called.
-    ~MemoryProvider()
-    {
-    }
+    ~MemoryProvider() {}
 
     // Return a memory location in distance less than 2^31 from input address
-    UINT_PTR GetLocation(UINT_PTR addr)
-    {
+    UINT_PTR GetLocation(UINT_PTR addr) {
         MemoryBuffer *pBuff = m_pages;
-        for (; pBuff<m_lastBuffer && IsInDistance(pBuff->m_next, addr, MAX_DISTANCE); ++pBuff)
-        {
-            if (pBuff->m_next < pBuff->m_base + pBuff->m_size)
-            {
+        for (; pBuff < m_lastBuffer && IsInDistance(pBuff->m_next, addr, MAX_DISTANCE); ++pBuff) {
+            if (pBuff->m_next < pBuff->m_base + pBuff->m_size) {
                 UINT_PTR loc = pBuff->m_next;
                 pBuff->m_next += MAX_PROBE_SIZE;
                 return loc;
@@ -217,8 +201,7 @@ MemoryBuffer *CreateBuffer(UINT_PTR addr)
         }
 
         pBuff = CreateBuffer(addr);
-        if(!pBuff)
-            return 0;
+        if (!pBuff) return 0;
 
         UINT_PTR loc = pBuff->m_next;
         pBuff->m_next += MAX_PROBE_SIZE;
@@ -236,12 +219,11 @@ static MemoryProvider memProvider;
 // Compare opcodes from dictionary (str1) and opcodes from code (str2)
 // str1 might contain '*' to mask addresses
 // RETURN: 0 if opcodes did not match, 1 on success
-size_t compareStrings( const char *str1, const char *str2 )
-{
-   for (size_t i=0; str1[i]!=0; i++){
-       if( str1[i]!='*' && str1[i]!='#' && str1[i]!=str2[i] ) return 0;
-   }
-   return 1;
+size_t compareStrings(const char *str1, const char *str2) {
+    for (size_t i = 0; str1[i] != 0; i++) {
+        if (str1[i] != '*' && str1[i] != '#' && str1[i] != str2[i]) return 0;
+    }
+    return 1;
 }
 
 // Check function prologue with known prologues from the dictionary
@@ -250,61 +232,56 @@ size_t compareStrings( const char *str1, const char *str2 )
 // Dictionary contains opcodes for several full asm instructions
 // + one opcode byte for the next asm instruction for safe address processing
 // RETURN: 1 + the index of the matched pattern, or 0 if no match found.
-static UINT CheckOpcodes( const char ** opcodes, void *inpAddr, bool abortOnError, const FunctionInfo* functionInfo = nullptr)
-{
+static UINT CheckOpcodes(const char **opcodes, void *inpAddr, bool abortOnError,
+                         const FunctionInfo *functionInfo = nullptr) {
     static size_t opcodesStringsCount = 0;
     static size_t maxOpcodesLength = 0;
-    static size_t opcodes_pointer = (size_t)opcodes;
-    char opcodeString[2*MAX_PATTERN_SIZE+1];
+    static size_t opcodes_pointer = (size_t) opcodes;
+    char opcodeString[2 * MAX_PATTERN_SIZE + 1];
     size_t i;
     size_t result = 0;
 
     // Get the values for static variables
     // max length and number of patterns
-    if( !opcodesStringsCount || opcodes_pointer != (size_t)opcodes ){
-        while( *(opcodes + opcodesStringsCount)!= nullptr ){
-            if( (i=strlen(*(opcodes + opcodesStringsCount))) > maxOpcodesLength )
-                maxOpcodesLength = i;
+    if (!opcodesStringsCount || opcodes_pointer != (size_t) opcodes) {
+        while (*(opcodes + opcodesStringsCount) != nullptr) {
+            if ((i = strlen(*(opcodes + opcodesStringsCount))) > maxOpcodesLength) maxOpcodesLength = i;
             opcodesStringsCount++;
         }
-        opcodes_pointer = (size_t)opcodes;
-        __TBB_ASSERT( maxOpcodesLength/2 <= MAX_PATTERN_SIZE, "Pattern exceeded the limit of 28 opcodes/56 symbols" );
+        opcodes_pointer = (size_t) opcodes;
+        __TBB_ASSERT(maxOpcodesLength / 2 <= MAX_PATTERN_SIZE,
+                     "Pattern exceeded the limit of 28 opcodes/56 symbols");
     }
 
     // Translate prologue opcodes to string format to compare
-    for( i=0; i<maxOpcodesLength/2 && i<MAX_PATTERN_SIZE; ++i ){
-        sprintf( opcodeString + 2*i, "%.2X", *((unsigned char*)inpAddr+i) );
+    for (i = 0; i < maxOpcodesLength / 2 && i < MAX_PATTERN_SIZE; ++i) {
+        sprintf(opcodeString + 2 * i, "%.2X", *((unsigned char *) inpAddr + i));
     }
-    opcodeString[2*i] = 0;
+    opcodeString[2 * i] = 0;
 
     // Compare translated opcodes with patterns
-    for( UINT idx=0; idx<opcodesStringsCount; ++idx ){
-        result = compareStrings( opcodes[idx],opcodeString );
-        if( result ) {
-            if (functionInfo) {
-                Log::record(*functionInfo, opcodeString, /*status*/ true);
-            }
-            return idx + 1; // avoid 0 which indicates a failure
+    for (UINT idx = 0; idx < opcodesStringsCount; ++idx) {
+        result = compareStrings(opcodes[idx], opcodeString);
+        if (result) {
+            if (functionInfo) { Log::record(*functionInfo, opcodeString, /*status*/ true); }
+            return idx + 1;// avoid 0 which indicates a failure
         }
     }
-    if (functionInfo) {
-        Log::record(*functionInfo, opcodeString, /*status*/ false);
-    }
+    if (functionInfo) { Log::record(*functionInfo, opcodeString, /*status*/ false); }
     if (abortOnError) {
         // Impossibility to find opcodes in the dictionary is a serious issue,
         // as if we unable to call original function, leak or crash is expected result.
-        __TBB_ASSERT_RELEASE( false, "CheckOpcodes failed" );
+        __TBB_ASSERT_RELEASE(false, "CheckOpcodes failed");
     }
     return 0;
 }
 
 // Modify offsets in original code after moving it to a trampoline.
 // We do not have more than one offset to correct in existing opcode patterns.
-static void CorrectOffset( UINT_PTR address, const char* pattern, UINT distance )
-{
-    const char* pos = strstr(pattern, "#*******");
-    if( pos ) {
-        address += (pos - pattern)/2; // compute the offset position
+static void CorrectOffset(UINT_PTR address, const char *pattern, UINT distance) {
+    const char *pos = strstr(pattern, "#*******");
+    if (pos) {
+        address += (pos - pattern) / 2;// compute the offset position
         UINT value;
         // UINT assignment is not used to avoid potential alignment issues
         memcpy(&value, Addrint2Ptr(address), sizeof(value));
@@ -315,25 +292,22 @@ static void CorrectOffset( UINT_PTR address, const char* pattern, UINT distance
 
 // Insert jump relative instruction to the input address
 // RETURN: the size of the trampoline or 0 on failure
-static DWORD InsertTrampoline32(void *inpAddr, void *targetAddr, const char* pattern, void** storedAddr)
-{
+static DWORD InsertTrampoline32(void *inpAddr, void *targetAddr, const char *pattern, void **storedAddr) {
     size_t bytesToMove = SIZE_OF_RELJUMP;
     UINT_PTR srcAddr = Ptr2Addrint(inpAddr);
     UINT_PTR tgtAddr = Ptr2Addrint(targetAddr);
     // Check that the target fits in 32 bits
-    if (!IsInDistance(srcAddr, tgtAddr, MAX_DISTANCE))
-        return 0;
+    if (!IsInDistance(srcAddr, tgtAddr, MAX_DISTANCE)) return 0;
 
     UINT_PTR offset;
     UINT offset32;
-    UCHAR *codePtr = (UCHAR *)inpAddr;
+    UCHAR *codePtr = (UCHAR *) inpAddr;
 
-    if ( storedAddr ){ // If requested, store original function code
-        bytesToMove = strlen(pattern)/2-1; // The last byte matching the pattern must not be copied
-        __TBB_ASSERT_RELEASE( bytesToMove >= SIZE_OF_RELJUMP, "Incorrect bytecode pattern?" );
+    if (storedAddr) {                         // If requested, store original function code
+        bytesToMove = strlen(pattern) / 2 - 1;// The last byte matching the pattern must not be copied
+        __TBB_ASSERT_RELEASE(bytesToMove >= SIZE_OF_RELJUMP, "Incorrect bytecode pattern?");
         UINT_PTR trampAddr = memProvider.GetLocation(srcAddr);
-        if (!trampAddr)
-            return 0;
+        if (!trampAddr) return 0;
         *storedAddr = Addrint2Ptr(trampAddr);
         // Set 'executable' flag for original instructions in the new place
         DWORD pageFlags = PAGE_EXECUTE_READWRITE;
@@ -342,11 +316,11 @@ static DWORD InsertTrampoline32(void *inpAddr, void *targetAddr, const char* pat
         memcpy(*storedAddr, codePtr, bytesToMove);
         offset = srcAddr - trampAddr;
         offset32 = (UINT)(offset & 0xFFFFFFFF);
-        CorrectOffset( trampAddr, pattern, offset32 );
+        CorrectOffset(trampAddr, pattern, offset32);
         // Set jump to the code after replacement
         offset32 -= SIZE_OF_RELJUMP;
-        *(UCHAR*)(trampAddr+bytesToMove) = 0xE9;
-        memcpy((UCHAR*)(trampAddr+bytesToMove+1), &offset32, sizeof(offset32));
+        *(UCHAR *) (trampAddr + bytesToMove) = 0xE9;
+        memcpy((UCHAR *) (trampAddr + bytesToMove + 1), &offset32, sizeof(offset32));
     }
 
     // The following will work correctly even if srcAddr>tgtAddr, as long as
@@ -355,12 +329,10 @@ static DWORD InsertTrampoline32(void *inpAddr, void *targetAddr, const char* pat
     offset32 = (UINT)(offset & 0xFFFFFFFF);
     // Insert the jump to the new code
     *codePtr = 0xE9;
-    memcpy(codePtr+1, &offset32, sizeof(offset32));
+    memcpy(codePtr + 1, &offset32, sizeof(offset32));
 
     // Fill the rest with NOPs to correctly see disassembler of old code in debugger.
-    for( unsigned i=SIZE_OF_RELJUMP; i<bytesToMove; i++ ){
-        *(codePtr+i) = 0x90;
-    }
+    for (unsigned i = SIZE_OF_RELJUMP; i < bytesToMove; i++) { *(codePtr + i) = 0x90; }
 
     return SIZE_OF_RELJUMP;
 }
@@ -370,8 +342,7 @@ static DWORD InsertTrampoline32(void *inpAddr, void *targetAddr, const char* pat
 // 2  Put jump RIP relative indirect through the address in the close page
 // 3  Put the absolute address of the target in the allocated location
 // RETURN: the size of the trampoline or 0 on failure
-static DWORD InsertTrampoline64(void *inpAddr, void *targetAddr, const char* pattern, void** storedAddr)
-{
+static DWORD InsertTrampoline64(void *inpAddr, void *targetAddr, const char *pattern, void **storedAddr) {
     size_t bytesToMove = SIZE_OF_INDJUMP;
 
     UINT_PTR srcAddr = Ptr2Addrint(inpAddr);
@@ -379,23 +350,21 @@ static DWORD InsertTrampoline64(void *inpAddr, void *targetAddr, const char* pat
 
     // Get a location close to the source address
     UINT_PTR location = memProvider.GetLocation(srcAddr);
-    if (!location)
-        return 0;
+    if (!location) return 0;
 
     UINT_PTR offset;
     UINT offset32;
-    UCHAR *codePtr = (UCHAR *)inpAddr;
+    UCHAR *codePtr = (UCHAR *) inpAddr;
 
     // Fill the location
-    UINT_PTR *locPtr = (UINT_PTR *)Addrint2Ptr(location);
+    UINT_PTR *locPtr = (UINT_PTR *) Addrint2Ptr(location);
     *locPtr = tgtAddr;
 
-    if ( storedAddr ){ // If requested, store original function code
-        bytesToMove = strlen(pattern)/2-1; // The last byte matching the pattern must not be copied
-        __TBB_ASSERT_RELEASE( bytesToMove >= SIZE_OF_INDJUMP, "Incorrect bytecode pattern?" );
+    if (storedAddr) {                         // If requested, store original function code
+        bytesToMove = strlen(pattern) / 2 - 1;// The last byte matching the pattern must not be copied
+        __TBB_ASSERT_RELEASE(bytesToMove >= SIZE_OF_INDJUMP, "Incorrect bytecode pattern?");
         UINT_PTR trampAddr = memProvider.GetLocation(srcAddr);
-        if (!trampAddr)
-            return 0;
+        if (!trampAddr) return 0;
         *storedAddr = Addrint2Ptr(trampAddr);
         // Set 'executable' flag for original instructions in the new place
         DWORD pageFlags = PAGE_EXECUTE_READWRITE;
@@ -404,24 +373,22 @@ static DWORD InsertTrampoline64(void *inpAddr, void *targetAddr, const char* pat
         memcpy(*storedAddr, codePtr, bytesToMove);
         offset = srcAddr - trampAddr;
         offset32 = (UINT)(offset & 0xFFFFFFFF);
-        CorrectOffset( trampAddr, pattern, offset32 );
+        CorrectOffset(trampAddr, pattern, offset32);
         // Set jump to the code after replacement. It is within the distance of relative jump!
         offset32 -= SIZE_OF_RELJUMP;
-        *(UCHAR*)(trampAddr+bytesToMove) = 0xE9;
-        memcpy((UCHAR*)(trampAddr+bytesToMove+1), &offset32, sizeof(offset32));
+        *(UCHAR *) (trampAddr + bytesToMove) = 0xE9;
+        memcpy((UCHAR *) (trampAddr + bytesToMove + 1), &offset32, sizeof(offset32));
     }
 
     // Fill the buffer
     offset = location - srcAddr - SIZE_OF_INDJUMP;
     offset32 = (UINT)(offset & 0xFFFFFFFF);
     *(codePtr) = 0xFF;
-    *(codePtr+1) = 0x25;
-    memcpy(codePtr+2, &offset32, sizeof(offset32));
+    *(codePtr + 1) = 0x25;
+    memcpy(codePtr + 2, &offset32, sizeof(offset32));
 
     // Fill the rest with NOPs to correctly see disassembler of old code in debugger.
-    for( unsigned i=SIZE_OF_INDJUMP; i<bytesToMove; i++ ){
-        *(codePtr+i) = 0x90;
-    }
+    for (unsigned i = SIZE_OF_INDJUMP; i < bytesToMove; i++) { *(codePtr + i) = 0x90; }
 
     return SIZE_OF_INDJUMP;
 }
@@ -432,40 +399,36 @@ static DWORD InsertTrampoline64(void *inpAddr, void *targetAddr, const char* pat
 // 3. Call InsertTrampoline32 or InsertTrampoline64
 // 4. Restore memory protection
 // RETURN: FALSE on failure, TRUE on success
-static bool InsertTrampoline(void *inpAddr, void *targetAddr, const char ** opcodes, void** origFunc)
-{
+static bool InsertTrampoline(void *inpAddr, void *targetAddr, const char **opcodes, void **origFunc) {
     DWORD probeSize;
     // Change page protection to EXECUTE+WRITE
     DWORD origProt = 0;
-    if (!VirtualProtect(inpAddr, MAX_PROBE_SIZE, PAGE_EXECUTE_WRITECOPY, &origProt))
-        return FALSE;
+    if (!VirtualProtect(inpAddr, MAX_PROBE_SIZE, PAGE_EXECUTE_WRITECOPY, &origProt)) return FALSE;
 
-    const char* pattern = nullptr;
-    if ( origFunc ){ // Need to store original function code
-        UCHAR * const codePtr = (UCHAR *)inpAddr;
-        if ( *codePtr == 0xE9 ){ // JMP relative instruction
+    const char *pattern = nullptr;
+    if (origFunc) {// Need to store original function code
+        UCHAR *const codePtr = (UCHAR *) inpAddr;
+        if (*codePtr == 0xE9) {// JMP relative instruction
             // For the special case when a system function consists of a single near jump,
             // instead of moving it somewhere we use the target of the jump as the original function.
-            unsigned offsetInJmp = *(unsigned*)(codePtr + 1);
-            *origFunc = (void*)(Ptr2Addrint(inpAddr) + offsetInJmp + SIZE_OF_RELJUMP);
-            origFunc = nullptr; // now it must be ignored by InsertTrampoline32/64
+            unsigned offsetInJmp = *(unsigned *) (codePtr + 1);
+            *origFunc = (void *) (Ptr2Addrint(inpAddr) + offsetInJmp + SIZE_OF_RELJUMP);
+            origFunc = nullptr;// now it must be ignored by InsertTrampoline32/64
         } else {
             // find the right opcode pattern
-            UINT opcodeIdx = CheckOpcodes( opcodes, inpAddr, /*abortOnError=*/true );
-            __TBB_ASSERT( opcodeIdx > 0, "abortOnError ignored in CheckOpcodes?" );
-            pattern = opcodes[opcodeIdx-1];  // -1 compensates for +1 in CheckOpcodes
+            UINT opcodeIdx = CheckOpcodes(opcodes, inpAddr, /*abortOnError=*/true);
+            __TBB_ASSERT(opcodeIdx > 0, "abortOnError ignored in CheckOpcodes?");
+            pattern = opcodes[opcodeIdx - 1];// -1 compensates for +1 in CheckOpcodes
         }
     }
 
     probeSize = InsertTrampoline32(inpAddr, targetAddr, pattern, origFunc);
-    if (!probeSize)
-        probeSize = InsertTrampoline64(inpAddr, targetAddr, pattern, origFunc);
+    if (!probeSize) probeSize = InsertTrampoline64(inpAddr, targetAddr, pattern, origFunc);
 
     // Restore original protection
     VirtualProtect(inpAddr, MAX_PROBE_SIZE, origProt, &origProt);
 
-    if (!probeSize)
-        return FALSE;
+    if (!probeSize) return FALSE;
 
     FlushInstructionCache(GetCurrentProcess(), inpAddr, probeSize);
     FlushInstructionCache(GetCurrentProcess(), origFunc, probeSize);
@@ -475,22 +438,19 @@ static bool InsertTrampoline(void *inpAddr, void *targetAddr, const char ** opco
 
 // Routine to replace the functions
 // TODO: replace opcodesNumber with opcodes and opcodes number to check if we replace right code.
-FRR_TYPE ReplaceFunctionA(const char *dllName, const char *funcName, FUNCPTR newFunc, const char ** opcodes, FUNCPTR* origFunc)
-{
+FRR_TYPE ReplaceFunctionA(const char *dllName, const char *funcName, FUNCPTR newFunc, const char **opcodes,
+                          FUNCPTR *origFunc) {
     // Cache the results of the last search for the module
     // Assume that there was no DLL unload between
-    static char cachedName[MAX_PATH+1];
+    static char cachedName[MAX_PATH + 1];
     static HMODULE cachedHM = 0;
 
-    if (!dllName || !*dllName)
-        return FRR_NODLL;
+    if (!dllName || !*dllName) return FRR_NODLL;
 
-    if (!cachedHM || strncmp(dllName, cachedName, MAX_PATH) != 0)
-    {
+    if (!cachedHM || strncmp(dllName, cachedName, MAX_PATH) != 0) {
         // Find the module handle for the input dll
         HMODULE hModule = GetModuleHandleA(dllName);
-        if (hModule == 0)
-        {
+        if (hModule == 0) {
             // Couldn't find the module with the input name
             cachedHM = 0;
             return FRR_NODLL;
@@ -501,13 +461,12 @@ FRR_TYPE ReplaceFunctionA(const char *dllName, const char *funcName, FUNCPTR new
     }
 
     FARPROC inpFunc = GetProcAddress(cachedHM, funcName);
-    if (inpFunc == 0)
-    {
+    if (inpFunc == 0) {
         // Function was not found
         return FRR_NOFUNC;
     }
 
-    if (!InsertTrampoline((void*)inpFunc, (void*)newFunc, opcodes, (void**)origFunc)){
+    if (!InsertTrampoline((void *) inpFunc, (void *) newFunc, opcodes, (void **) origFunc)) {
         // Failed to insert the trampoline to the target address
         return FRR_FAILED;
     }
@@ -515,22 +474,19 @@ FRR_TYPE ReplaceFunctionA(const char *dllName, const char *funcName, FUNCPTR new
     return FRR_OK;
 }
 
-FRR_TYPE ReplaceFunctionW(const wchar_t *dllName, const char *funcName, FUNCPTR newFunc, const char ** opcodes, FUNCPTR* origFunc)
-{
+FRR_TYPE ReplaceFunctionW(const wchar_t *dllName, const char *funcName, FUNCPTR newFunc, const char **opcodes,
+                          FUNCPTR *origFunc) {
     // Cache the results of the last search for the module
     // Assume that there was no DLL unload between
-    static wchar_t cachedName[MAX_PATH+1];
+    static wchar_t cachedName[MAX_PATH + 1];
     static HMODULE cachedHM = 0;
 
-    if (!dllName || !*dllName)
-        return FRR_NODLL;
+    if (!dllName || !*dllName) return FRR_NODLL;
 
-    if (!cachedHM || wcsncmp(dllName, cachedName, MAX_PATH) != 0)
-    {
+    if (!cachedHM || wcsncmp(dllName, cachedName, MAX_PATH) != 0) {
         // Find the module handle for the input dll
         HMODULE hModule = GetModuleHandleW(dllName);
-        if (hModule == 0)
-        {
+        if (hModule == 0) {
             // Couldn't find the module with the input name
             cachedHM = 0;
             return FRR_NODLL;
@@ -541,13 +497,12 @@ FRR_TYPE ReplaceFunctionW(const wchar_t *dllName, const char *funcName, FUNCPTR
     }
 
     FARPROC inpFunc = GetProcAddress(cachedHM, funcName);
-    if (inpFunc == 0)
-    {
+    if (inpFunc == 0) {
         // Function was not found
         return FRR_NOFUNC;
     }
 
-    if (!InsertTrampoline((void*)inpFunc, (void*)newFunc, opcodes, (void**)origFunc)){
+    if (!InsertTrampoline((void *) inpFunc, (void *) newFunc, opcodes, (void **) origFunc)) {
         // Failed to insert the trampoline to the target address
         return FRR_FAILED;
     }
@@ -555,25 +510,21 @@ FRR_TYPE ReplaceFunctionW(const wchar_t *dllName, const char *funcName, FUNCPTR
     return FRR_OK;
 }
 
-bool IsPrologueKnown(const char* dllName, const char *funcName, const char **opcodes, HMODULE module)
-{
+bool IsPrologueKnown(const char *dllName, const char *funcName, const char **opcodes, HMODULE module) {
     FARPROC inpFunc = GetProcAddress(module, funcName);
-    FunctionInfo functionInfo = { funcName, dllName };
+    FunctionInfo functionInfo = {funcName, dllName};
 
     if (!inpFunc) {
         Log::record(functionInfo, "unknown", /*status*/ false);
         return false;
     }
 
-    return CheckOpcodes( opcodes, (void*)inpFunc, /*abortOnError=*/false, &functionInfo) != 0;
+    return CheckOpcodes(opcodes, (void *) inpFunc, /*abortOnError=*/false, &functionInfo) != 0;
 }
 
 // Public Windows API
-extern "C" __declspec(dllexport) int TBB_malloc_replacement_log(char *** function_replacement_log_ptr)
-{
-    if (function_replacement_log_ptr != nullptr) {
-        *function_replacement_log_ptr = Log::records;
-    }
+extern "C" __declspec(dllexport) int TBB_malloc_replacement_log(char ***function_replacement_log_ptr) {
+    if (function_replacement_log_ptr != nullptr) { *function_replacement_log_ptr = Log::records; }
 
     // If we have no logs -> return false status
     return Log::replacement_status && Log::records[0] != nullptr ? 0 : -1;
diff --git a/external/tbb/src/tbbmalloc_proxy/proxy.cpp b/external/tbb/src/tbbmalloc_proxy/proxy.cpp
index d27591bb..d2d4b2e4 100644
--- a/external/tbb/src/tbbmalloc_proxy/proxy.cpp
+++ b/external/tbb/src/tbbmalloc_proxy/proxy.cpp
@@ -33,25 +33,25 @@
 // Fix the state and undefine the trick
 #include <cstdlib>
 #undef aligned_alloc
-#endif // !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC
-#endif // defined(__GLIBC_PREREQ)
+#endif// !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC
+#endif// defined(__GLIBC_PREREQ)
 #include <cstdlib>
-#endif // __unix__ && !__ANDROID__
+#endif// __unix__ && !__ANDROID__
 
 #include "proxy.h"
 
+#include "../tbb/environment.h"
 #include "oneapi/tbb/detail/_config.h"
 #include "oneapi/tbb/scalable_allocator.h"
-#include "../tbb/environment.h"
 
 #if !defined(__EXCEPTIONS) && !defined(_CPPUNWIND) && !defined(__SUNPRO_CC)
-    #if TBB_USE_EXCEPTIONS
-        #error Compilation settings do not support exception handling. Please do not set TBB_USE_EXCEPTIONS macro or set it to 0.
-    #elif !defined(TBB_USE_EXCEPTIONS)
-        #define TBB_USE_EXCEPTIONS 0
-    #endif
+#if TBB_USE_EXCEPTIONS
+#error Compilation settings do not support exception handling. Please do not set TBB_USE_EXCEPTIONS macro or set it to 0.
+#elif !defined(TBB_USE_EXCEPTIONS)
+#define TBB_USE_EXCEPTIONS 0
+#endif
 #elif !defined(TBB_USE_EXCEPTIONS)
-    #define TBB_USE_EXCEPTIONS 1
+#define TBB_USE_EXCEPTIONS 1
 #endif
 
 #if MALLOC_UNIXLIKE_OVERLOAD_ENABLED || _WIN32 && !__TBB_WIN8UI_SUPPORT
@@ -65,13 +65,13 @@ typedef MallocMutex ProxyMutex;
 
 // Adds aliasing and copy attributes to function if available
 #if defined(__has_attribute)
-    #if __has_attribute(__copy__)
-        #define __TBB_ALIAS_ATTR_COPY(name) __attribute__((alias (#name), __copy__(name)))
-    #endif
+#if __has_attribute(__copy__)
+#define __TBB_ALIAS_ATTR_COPY(name) __attribute__((alias(#name), __copy__(name)))
+#endif
 #endif
 
 #ifndef __TBB_ALIAS_ATTR_COPY
-    #define __TBB_ALIAS_ATTR_COPY(name) __attribute__((alias (#name)))
+#define __TBB_ALIAS_ATTR_COPY(name) __attribute__((alias(#name)))
 #endif
 
 // In case there is no std::get_new_handler function
@@ -80,8 +80,8 @@ typedef MallocMutex ProxyMutex;
 static ProxyMutex new_lock;
 #endif
 
-static inline void* InternalOperatorNew(size_t sz) {
-    void* res = scalable_malloc(sz);
+static inline void *InternalOperatorNew(size_t sz) {
+    void *res = scalable_malloc(sz);
 #if TBB_USE_EXCEPTIONS
     while (!res) {
         std::new_handler handler;
@@ -100,12 +100,12 @@ static inline void* InternalOperatorNew(size_t sz) {
             throw std::bad_alloc();
         }
         res = scalable_malloc(sz);
-}
+    }
 #endif /* TBB_USE_EXCEPTIONS */
     return res;
 }
 /*** end of internal global operator new implementation ***/
-#endif // MALLOC_UNIXLIKE_OVERLOAD_ENABLED || _WIN32 && !__TBB_WIN8UI_SUPPORT
+#endif// MALLOC_UNIXLIKE_OVERLOAD_ENABLED || _WIN32 && !__TBB_WIN8UI_SUPPORT
 
 #if MALLOC_UNIXLIKE_OVERLOAD_ENABLED || MALLOC_ZONE_OVERLOAD_ENABLED
 
@@ -114,19 +114,16 @@ static inline void* InternalOperatorNew(size_t sz) {
 #endif
 
 /*** service functions and variables ***/
-#include <string.h> // for memset
-#include <unistd.h> // for sysconf
+#include <string.h>// for memset
+#include <unistd.h>// for sysconf
 
 static long memoryPageSize;
 
-static inline void initPageSize()
-{
-    memoryPageSize = sysconf(_SC_PAGESIZE);
-}
+static inline void initPageSize() { memoryPageSize = sysconf(_SC_PAGESIZE); }
 
 #if MALLOC_UNIXLIKE_OVERLOAD_ENABLED
 #include <dlfcn.h>
-#include <malloc.h>    // mallinfo
+#include <malloc.h>// mallinfo
 
 /* __TBB_malloc_proxy used as a weak symbol by libtbbmalloc for:
    1) detection that the proxy library is loaded
@@ -141,25 +138,22 @@ static void *orig_msize;
 
 #include "proxy_overload_osx.h"
 
-#endif // MALLOC_ZONE_OVERLOAD_ENABLED
+#endif// MALLOC_ZONE_OVERLOAD_ENABLED
 
 // Original (i.e., replaced) functions,
 // they are never changed for MALLOC_ZONE_OVERLOAD_ENABLED.
-static void *orig_free,
-    *orig_realloc;
+static void *orig_free, *orig_realloc;
 
 #if MALLOC_UNIXLIKE_OVERLOAD_ENABLED
 #define ZONE_ARG
 #define PREFIX(name) name
 
-static void *orig_libc_free,
-    *orig_libc_realloc;
+static void *orig_libc_free, *orig_libc_realloc;
 
 // We already tried to find ptr to original functions.
-static std::atomic<bool> origFuncSearched{false};
+static std::atomic<bool> origFuncSearched {false};
 
-inline void InitOrigPointers()
-{
+inline void InitOrigPointers() {
     // race is OK here, as different threads found same functions
     if (!origFuncSearched.load(std::memory_order_acquire)) {
         orig_free = dlsym(RTLD_NEXT, "free");
@@ -182,26 +176,20 @@ extern "C" {
 // not interested in original functions for zone overload
 inline void InitOrigPointers() {}
 
-#endif // MALLOC_UNIXLIKE_OVERLOAD_ENABLED and MALLOC_ZONE_OVERLOAD_ENABLED
+#endif// MALLOC_UNIXLIKE_OVERLOAD_ENABLED and MALLOC_ZONE_OVERLOAD_ENABLED
 
-TBBMALLOCPROXY_EXPORT void *PREFIX(malloc)(ZONE_ARG size_t size) __THROW
-{
-    return scalable_malloc(size);
-}
+TBBMALLOCPROXY_EXPORT void *PREFIX(malloc)(ZONE_ARG size_t size) __THROW { return scalable_malloc(size); }
 
-TBBMALLOCPROXY_EXPORT void *PREFIX(calloc)(ZONE_ARG size_t num, size_t size) __THROW
-{
+TBBMALLOCPROXY_EXPORT void *PREFIX(calloc)(ZONE_ARG size_t num, size_t size) __THROW {
     return scalable_calloc(num, size);
 }
 
-TBBMALLOCPROXY_EXPORT void PREFIX(free)(ZONE_ARG void *object) __THROW
-{
+TBBMALLOCPROXY_EXPORT void PREFIX(free)(ZONE_ARG void *object) __THROW {
     InitOrigPointers();
-    __TBB_malloc_safer_free(object, (void (*)(void*))orig_free);
+    __TBB_malloc_safer_free(object, (void (*)(void *)) orig_free);
 }
 
-TBBMALLOCPROXY_EXPORT void *PREFIX(realloc)(ZONE_ARG void* ptr, size_t sz) __THROW
-{
+TBBMALLOCPROXY_EXPORT void *PREFIX(realloc)(ZONE_ARG void *ptr, size_t sz) __THROW {
     InitOrigPointers();
     return __TBB_malloc_safer_realloc(ptr, sz, orig_realloc);
 }
@@ -209,15 +197,13 @@ TBBMALLOCPROXY_EXPORT void *PREFIX(realloc)(ZONE_ARG void* ptr, size_t sz) __THR
 /* The older *NIX interface for aligned allocations;
    it's formally substituted by posix_memalign and deprecated,
    so we do not expect it to cause cyclic dependency with C RTL. */
-TBBMALLOCPROXY_EXPORT void *PREFIX(memalign)(ZONE_ARG size_t alignment, size_t size) __THROW
-{
+TBBMALLOCPROXY_EXPORT void *PREFIX(memalign)(ZONE_ARG size_t alignment, size_t size) __THROW {
     return scalable_aligned_malloc(size, alignment);
 }
 
 /* valloc allocates memory aligned on a page boundary */
-TBBMALLOCPROXY_EXPORT void *PREFIX(valloc)(ZONE_ARG size_t size) __THROW
-{
-    if (! memoryPageSize) initPageSize();
+TBBMALLOCPROXY_EXPORT void *PREFIX(valloc)(ZONE_ARG size_t size) __THROW {
+    if (!memoryPageSize) initPageSize();
 
     return scalable_aligned_malloc(size, memoryPageSize);
 }
@@ -235,34 +221,28 @@ TBBMALLOCPROXY_EXPORT size_t malloc_usable_size(void *ptr) __THROW
 #endif
 {
     InitOrigPointers();
-    return __TBB_malloc_safer_msize(const_cast<void*>(ptr), (size_t (*)(void*))orig_msize);
+    return __TBB_malloc_safer_msize(const_cast<void *>(ptr), (size_t(*)(void *)) orig_msize);
 }
 
-TBBMALLOCPROXY_EXPORT int posix_memalign(void **memptr, size_t alignment, size_t size) __THROW
-{
+TBBMALLOCPROXY_EXPORT int posix_memalign(void **memptr, size_t alignment, size_t size) __THROW {
     return scalable_posix_memalign(memptr, alignment, size);
 }
 
 /* pvalloc allocates smallest set of complete pages which can hold
    the requested number of bytes. Result is aligned on page boundary. */
-TBBMALLOCPROXY_EXPORT void *pvalloc(size_t size) __THROW
-{
-    if (! memoryPageSize) initPageSize();
+TBBMALLOCPROXY_EXPORT void *pvalloc(size_t size) __THROW {
+    if (!memoryPageSize) initPageSize();
     // align size up to the page size,
     // pvalloc(0) returns 1 page, see man libmpatrol
-    size = size? ((size-1) | (memoryPageSize-1)) + 1 : memoryPageSize;
+    size = size ? ((size - 1) | (memoryPageSize - 1)) + 1 : memoryPageSize;
 
     return scalable_aligned_malloc(size, memoryPageSize);
 }
 
-TBBMALLOCPROXY_EXPORT int mallopt(int /*param*/, int /*value*/) __THROW
-{
-    return 1;
-}
+TBBMALLOCPROXY_EXPORT int mallopt(int /*param*/, int /*value*/) __THROW { return 1; }
 
 #if defined(__GLIBC__) || defined(__ANDROID__)
-TBBMALLOCPROXY_EXPORT struct mallinfo mallinfo() __THROW
-{
+TBBMALLOCPROXY_EXPORT struct mallinfo mallinfo() __THROW {
     struct mallinfo m;
     memset(&m, 0, sizeof(struct mallinfo));
 
@@ -291,50 +271,44 @@ TBBMALLOCPROXY_EXPORT void *__libc_pvalloc(size_t size) __TBB_ALIAS_ATTR_COPY(pv
 TBBMALLOCPROXY_EXPORT void *__libc_valloc(size_t size) __TBB_ALIAS_ATTR_COPY(valloc);
 
 // call original __libc_* to support naive replacement of free via __libc_free etc
-TBBMALLOCPROXY_EXPORT void __libc_free(void *ptr)
-{
+TBBMALLOCPROXY_EXPORT void __libc_free(void *ptr) {
     InitOrigPointers();
-    __TBB_malloc_safer_free(ptr, (void (*)(void*))orig_libc_free);
+    __TBB_malloc_safer_free(ptr, (void (*)(void *)) orig_libc_free);
 }
 
-TBBMALLOCPROXY_EXPORT void *__libc_realloc(void *ptr, size_t size)
-{
+TBBMALLOCPROXY_EXPORT void *__libc_realloc(void *ptr, size_t size) {
     InitOrigPointers();
     return __TBB_malloc_safer_realloc(ptr, size, orig_libc_realloc);
 }
-#endif // !__ANDROID__
+#endif// !__ANDROID__
 
 } /* extern "C" */
 
 /*** replacements for global operators new and delete ***/
 
-TBBMALLOCPROXY_EXPORT void* operator new(size_t sz) {
-    return InternalOperatorNew(sz);
-}
-TBBMALLOCPROXY_EXPORT void* operator new[](size_t sz) {
-    return InternalOperatorNew(sz);
-}
-TBBMALLOCPROXY_EXPORT void operator delete(void* ptr) noexcept {
+TBBMALLOCPROXY_EXPORT void *operator new(size_t sz) { return InternalOperatorNew(sz); }
+TBBMALLOCPROXY_EXPORT void *operator new[](size_t sz) { return InternalOperatorNew(sz); }
+TBBMALLOCPROXY_EXPORT void operator delete(void *ptr) noexcept {
     InitOrigPointers();
-    __TBB_malloc_safer_free(ptr, (void (*)(void*))orig_free);
+    __TBB_malloc_safer_free(ptr, (void (*)(void *)) orig_free);
 }
-TBBMALLOCPROXY_EXPORT void operator delete[](void* ptr) noexcept {
+TBBMALLOCPROXY_EXPORT void operator delete[](void *ptr) noexcept {
     InitOrigPointers();
-    __TBB_malloc_safer_free(ptr, (void (*)(void*))orig_free);
+    __TBB_malloc_safer_free(ptr, (void (*)(void *)) orig_free);
 }
-TBBMALLOCPROXY_EXPORT void* operator new(size_t sz, const std::nothrow_t&) noexcept {
+TBBMALLOCPROXY_EXPORT void *operator new(size_t sz, const std::nothrow_t &) noexcept {
     return scalable_malloc(sz);
 }
-TBBMALLOCPROXY_EXPORT void* operator new[](std::size_t sz, const std::nothrow_t&) noexcept {
+TBBMALLOCPROXY_EXPORT void *operator new[](std::size_t sz, const std::nothrow_t &) noexcept {
     return scalable_malloc(sz);
 }
-TBBMALLOCPROXY_EXPORT void operator delete(void* ptr, const std::nothrow_t&) noexcept {
+TBBMALLOCPROXY_EXPORT void operator delete(void *ptr, const std::nothrow_t &) noexcept {
     InitOrigPointers();
-    __TBB_malloc_safer_free(ptr, (void (*)(void*))orig_free);
+    __TBB_malloc_safer_free(ptr, (void (*)(void *)) orig_free);
 }
-TBBMALLOCPROXY_EXPORT void operator delete[](void* ptr, const std::nothrow_t&) noexcept {
+TBBMALLOCPROXY_EXPORT void operator delete[](void *ptr, const std::nothrow_t &) noexcept {
     InitOrigPointers();
-    __TBB_malloc_safer_free(ptr, (void (*)(void*))orig_free);
+    __TBB_malloc_safer_free(ptr, (void (*)(void *)) orig_free);
 }
 
 #endif /* MALLOC_UNIXLIKE_OVERLOAD_ENABLED */
@@ -349,77 +323,56 @@ TBBMALLOCPROXY_EXPORT void operator delete[](void* ptr, const std::nothrow_t&) n
 
 #include "function_replacement.h"
 
-template<typename T, size_t N> // generic function to find length of array
-inline size_t arrayLength(const T(&)[N]) {
+template <typename T, size_t N>// generic function to find length of array
+inline size_t arrayLength(const T (&)[N]) {
     return N;
 }
 
-void __TBB_malloc_safer_delete( void *ptr)
-{
-    __TBB_malloc_safer_free( ptr, nullptr );
-}
+void __TBB_malloc_safer_delete(void *ptr) { __TBB_malloc_safer_free(ptr, nullptr); }
 
-void* safer_aligned_malloc( size_t size, size_t alignment )
-{
+void *safer_aligned_malloc(size_t size, size_t alignment) {
     // workaround for "is power of 2 pow N" bug that accepts zeros
-    return scalable_aligned_malloc( size, alignment>sizeof(size_t*)?alignment:sizeof(size_t*) );
+    return scalable_aligned_malloc(size, alignment > sizeof(size_t *) ? alignment : sizeof(size_t *));
 }
 
 // we do not support _expand();
-void* safer_expand( void *, size_t )
-{
-    return nullptr;
-}
-
-#define __TBB_ORIG_ALLOCATOR_REPLACEMENT_WRAPPER(CRTLIB)                                             \
-void (*orig_free_##CRTLIB)(void*);                                                                   \
-void __TBB_malloc_safer_free_##CRTLIB(void *ptr)                                                     \
-{                                                                                                    \
-    __TBB_malloc_safer_free( ptr, orig_free_##CRTLIB );                                              \
-}                                                                                                    \
-                                                                                                     \
-void (*orig__aligned_free_##CRTLIB)(void*);                                                          \
-void __TBB_malloc_safer__aligned_free_##CRTLIB(void *ptr)                                            \
-{                                                                                                    \
-    __TBB_malloc_safer_free( ptr, orig__aligned_free_##CRTLIB );                                     \
-}                                                                                                    \
-                                                                                                     \
-size_t (*orig__msize_##CRTLIB)(void*);                                                               \
-size_t __TBB_malloc_safer__msize_##CRTLIB(void *ptr)                                                 \
-{                                                                                                    \
-    return __TBB_malloc_safer_msize( ptr, orig__msize_##CRTLIB );                                    \
-}                                                                                                    \
-                                                                                                     \
-size_t (*orig__aligned_msize_##CRTLIB)(void*, size_t, size_t);                                       \
-size_t __TBB_malloc_safer__aligned_msize_##CRTLIB( void *ptr, size_t alignment, size_t offset)       \
-{                                                                                                    \
-    return __TBB_malloc_safer_aligned_msize( ptr, alignment, offset, orig__aligned_msize_##CRTLIB ); \
-}                                                                                                    \
-                                                                                                     \
-void* __TBB_malloc_safer_realloc_##CRTLIB( void *ptr, size_t size )                                  \
-{                                                                                                    \
-    orig_ptrs func_ptrs = {orig_free_##CRTLIB, orig__msize_##CRTLIB};                                \
-    return __TBB_malloc_safer_realloc( ptr, size, &func_ptrs );                                      \
-}                                                                                                    \
-                                                                                                     \
-void* __TBB_malloc_safer__aligned_realloc_##CRTLIB( void *ptr, size_t size, size_t alignment )       \
-{                                                                                                    \
-    orig_aligned_ptrs func_ptrs = {orig__aligned_free_##CRTLIB, orig__aligned_msize_##CRTLIB};       \
-    return __TBB_malloc_safer_aligned_realloc( ptr, size, alignment, &func_ptrs );                   \
-}
+void *safer_expand(void *, size_t) { return nullptr; }
+
+#define __TBB_ORIG_ALLOCATOR_REPLACEMENT_WRAPPER(CRTLIB)                                                     \
+    void (*orig_free_##CRTLIB)(void *);                                                                      \
+    void __TBB_malloc_safer_free_##CRTLIB(void *ptr) { __TBB_malloc_safer_free(ptr, orig_free_##CRTLIB); }   \
+                                                                                                             \
+    void (*orig__aligned_free_##CRTLIB)(void *);                                                             \
+    void __TBB_malloc_safer__aligned_free_##CRTLIB(void *ptr) {                                              \
+        __TBB_malloc_safer_free(ptr, orig__aligned_free_##CRTLIB);                                           \
+    }                                                                                                        \
+                                                                                                             \
+    size_t (*orig__msize_##CRTLIB)(void *);                                                                  \
+    size_t __TBB_malloc_safer__msize_##CRTLIB(void *ptr) {                                                   \
+        return __TBB_malloc_safer_msize(ptr, orig__msize_##CRTLIB);                                          \
+    }                                                                                                        \
+                                                                                                             \
+    size_t (*orig__aligned_msize_##CRTLIB)(void *, size_t, size_t);                                          \
+    size_t __TBB_malloc_safer__aligned_msize_##CRTLIB(void *ptr, size_t alignment, size_t offset) {          \
+        return __TBB_malloc_safer_aligned_msize(ptr, alignment, offset, orig__aligned_msize_##CRTLIB);       \
+    }                                                                                                        \
+                                                                                                             \
+    void *__TBB_malloc_safer_realloc_##CRTLIB(void *ptr, size_t size) {                                      \
+        orig_ptrs func_ptrs = {orig_free_##CRTLIB, orig__msize_##CRTLIB};                                    \
+        return __TBB_malloc_safer_realloc(ptr, size, &func_ptrs);                                            \
+    }                                                                                                        \
+                                                                                                             \
+    void *__TBB_malloc_safer__aligned_realloc_##CRTLIB(void *ptr, size_t size, size_t alignment) {           \
+        orig_aligned_ptrs func_ptrs = {orig__aligned_free_##CRTLIB, orig__aligned_msize_##CRTLIB};           \
+        return __TBB_malloc_safer_aligned_realloc(ptr, size, alignment, &func_ptrs);                         \
+    }
 
 // Only for ucrtbase: substitution for _o_free
-void (*orig__o_free)(void*);
-void __TBB_malloc__o_free(void *ptr)
-{
-    __TBB_malloc_safer_free( ptr, orig__o_free );
-}
+void (*orig__o_free)(void *);
+void __TBB_malloc__o_free(void *ptr) { __TBB_malloc_safer_free(ptr, orig__o_free); }
 // Only for ucrtbase: substitution for _free_base
-void(*orig__free_base)(void*);
-void __TBB_malloc__free_base(void *ptr)
-{
-    __TBB_malloc_safer_free(ptr, orig__free_base);
-}
+void (*orig__free_base)(void *);
+void __TBB_malloc__free_base(void *ptr) { __TBB_malloc_safer_free(ptr, orig__free_base); }
 
 // Size limit is MAX_PATTERN_SIZE (28) byte codes / 56 symbols per line.
 // * can be used to match any digit in byte codes.
@@ -428,75 +381,77 @@ void __TBB_malloc__free_base(void *ptr)
 // full instructions plus one extra byte code. It's not required for the patterns
 // to be unique (i.e., it's OK to have same pattern for unrelated functions).
 // TODO: use hot patch prologues if exist
-const char* known_bytecodes[] = {
+const char *known_bytecodes[] = {
 #if _WIN64
-//  "========================================================" - 56 symbols
-    "E9********CCCC",         // multiple - jmp(0xE9) with address followed by empty space (0xCC - INT 3)
-    "4883EC284885C974",       // release free()
-    "4883EC284885C975",       // release _msize()
-    "4885C974375348",         // release free() 8.0.50727.42, 10.0
-    "C7442410000000008B",     // release free() ucrtbase.dll 10.0.14393.33
-    "48895C24085748",         // release _aligned_msize() ucrtbase.dll 10.0.14393.33
-    "48894C24084883EC28BA",   // debug prologue
-    "4C894424184889542410",   // debug _aligned_msize() 10.0
-    "48894C24084883EC2848",   // debug _aligned_free 10.0
-    "488BD1488D0D#*******E9", // _o_free(), ucrtbase.dll
- #if __TBB_OVERLOAD_OLD_MSVCR
-    "48895C2408574883EC3049", // release _aligned_msize 9.0
-    "4883EC384885C975",       // release _msize() 9.0
-    "4C8BC1488B0DA6E4040033", // an old win64 SDK
- #endif
-#else // _WIN32
-//  "========================================================" - 56 symbols
-    "8BFF558BEC8B",           // multiple
-    "8BFF558BEC83",           // release free() & _msize() 10.0.40219.325, _msize() ucrtbase.dll
-    "8BFF558BECFF",           // release _aligned_msize ucrtbase.dll
-    "8BFF558BEC51",           // release free() & _msize() ucrtbase.dll 10.0.14393.33
-    "558BEC8B450885C074",     // release _aligned_free 11.0
-    "558BEC837D08000F",       // release _msize() 11.0.51106.1
-    "558BEC837D08007419FF",   // release free() 11.0.50727.1
-    "558BEC8B450885C075",     // release _aligned_msize() 11.0.50727.1
-    "558BEC6A018B",           // debug free() & _msize() 11.0
-    "558BEC8B451050",         // debug _aligned_msize() 11.0
-    "558BEC8B450850",         // debug _aligned_free 11.0
-    "8BFF558BEC6A",           // debug free() & _msize() 10.0.40219.325
- #if __TBB_OVERLOAD_OLD_MSVCR
-    "6A1868********E8",       // release free() 8.0.50727.4053, 9.0
-    "6A1C68********E8",       // release _msize() 8.0.50727.4053, 9.0
- #endif
-#endif // _WIN64/_WIN32
-    nullptr
-    };
-
-#define __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_ENTRY(CRT_VER,function_name,dbgsuffix) \
-    ReplaceFunctionWithStore( #CRT_VER #dbgsuffix ".dll", #function_name, \
-      (FUNCPTR)__TBB_malloc_safer_##function_name##_##CRT_VER##dbgsuffix, \
-      known_bytecodes, (FUNCPTR*)&orig_##function_name##_##CRT_VER##dbgsuffix );
-
-#define __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_ENTRY_NO_FALLBACK(CRT_VER,function_name,dbgsuffix) \
-    ReplaceFunctionWithStore( #CRT_VER #dbgsuffix ".dll", #function_name, \
-      (FUNCPTR)__TBB_malloc_safer_##function_name##_##CRT_VER##dbgsuffix, 0, nullptr );
-
-#define __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_ENTRY_REDIRECT(CRT_VER,function_name,dest_func,dbgsuffix) \
-    ReplaceFunctionWithStore( #CRT_VER #dbgsuffix ".dll", #function_name, \
-      (FUNCPTR)__TBB_malloc_safer_##dest_func##_##CRT_VER##dbgsuffix, 0, nullptr );
-
-#define __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_IMPL(CRT_VER,dbgsuffix)                             \
-    if (BytecodesAreKnown(#CRT_VER #dbgsuffix ".dll")) {                                          \
-      __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_ENTRY(CRT_VER,free,dbgsuffix)                         \
-      __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_ENTRY(CRT_VER,_msize,dbgsuffix)                       \
-      __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_ENTRY_NO_FALLBACK(CRT_VER,realloc,dbgsuffix)          \
-      __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_ENTRY(CRT_VER,_aligned_free,dbgsuffix)                \
-      __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_ENTRY(CRT_VER,_aligned_msize,dbgsuffix)               \
-      __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_ENTRY_NO_FALLBACK(CRT_VER,_aligned_realloc,dbgsuffix) \
-    } else                                                                                        \
+        //  "========================================================" - 56 symbols
+        "E9********CCCC",        // multiple - jmp(0xE9) with address followed by empty space (0xCC - INT 3)
+        "4883EC284885C974",      // release free()
+        "4883EC284885C975",      // release _msize()
+        "4885C974375348",        // release free() 8.0.50727.42, 10.0
+        "C7442410000000008B",    // release free() ucrtbase.dll 10.0.14393.33
+        "48895C24085748",        // release _aligned_msize() ucrtbase.dll 10.0.14393.33
+        "48894C24084883EC28BA",  // debug prologue
+        "4C894424184889542410",  // debug _aligned_msize() 10.0
+        "48894C24084883EC2848",  // debug _aligned_free 10.0
+        "488BD1488D0D#*******E9",// _o_free(), ucrtbase.dll
+#if __TBB_OVERLOAD_OLD_MSVCR
+        "48895C2408574883EC3049",// release _aligned_msize 9.0
+        "4883EC384885C975",      // release _msize() 9.0
+        "4C8BC1488B0DA6E4040033",// an old win64 SDK
+#endif
+#else// _WIN32
+        //  "========================================================" - 56 symbols
+        "8BFF558BEC8B",        // multiple
+        "8BFF558BEC83",        // release free() & _msize() 10.0.40219.325, _msize() ucrtbase.dll
+        "8BFF558BECFF",        // release _aligned_msize ucrtbase.dll
+        "8BFF558BEC51",        // release free() & _msize() ucrtbase.dll 10.0.14393.33
+        "558BEC8B450885C074",  // release _aligned_free 11.0
+        "558BEC837D08000F",    // release _msize() 11.0.51106.1
+        "558BEC837D08007419FF",// release free() 11.0.50727.1
+        "558BEC8B450885C075",  // release _aligned_msize() 11.0.50727.1
+        "558BEC6A018B",        // debug free() & _msize() 11.0
+        "558BEC8B451050",      // debug _aligned_msize() 11.0
+        "558BEC8B450850",      // debug _aligned_free 11.0
+        "8BFF558BEC6A",        // debug free() & _msize() 10.0.40219.325
+#if __TBB_OVERLOAD_OLD_MSVCR
+        "6A1868********E8",    // release free() 8.0.50727.4053, 9.0
+        "6A1C68********E8",    // release _msize() 8.0.50727.4053, 9.0
+#endif
+#endif// _WIN64/_WIN32
+        nullptr};
+
+#define __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_ENTRY(CRT_VER, function_name, dbgsuffix)                       \
+    ReplaceFunctionWithStore(#CRT_VER #dbgsuffix ".dll", #function_name,                                     \
+                             (FUNCPTR) __TBB_malloc_safer_##function_name##_##CRT_VER##dbgsuffix,            \
+                             known_bytecodes, (FUNCPTR *) &orig_##function_name##_##CRT_VER##dbgsuffix);
+
+#define __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_ENTRY_NO_FALLBACK(CRT_VER, function_name, dbgsuffix)           \
+    ReplaceFunctionWithStore(#CRT_VER #dbgsuffix ".dll", #function_name,                                     \
+                             (FUNCPTR) __TBB_malloc_safer_##function_name##_##CRT_VER##dbgsuffix, 0,         \
+                             nullptr);
+
+#define __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_ENTRY_REDIRECT(CRT_VER, function_name, dest_func, dbgsuffix)   \
+    ReplaceFunctionWithStore(#CRT_VER #dbgsuffix ".dll", #function_name,                                     \
+                             (FUNCPTR) __TBB_malloc_safer_##dest_func##_##CRT_VER##dbgsuffix, 0, nullptr);
+
+#define __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_IMPL(CRT_VER, dbgsuffix)                                       \
+    if (BytecodesAreKnown(#CRT_VER #dbgsuffix ".dll")) {                                                     \
+        __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_ENTRY(CRT_VER, free, dbgsuffix)                                \
+        __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_ENTRY(CRT_VER, _msize, dbgsuffix)                              \
+        __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_ENTRY_NO_FALLBACK(CRT_VER, realloc, dbgsuffix)                 \
+        __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_ENTRY(CRT_VER, _aligned_free, dbgsuffix)                       \
+        __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_ENTRY(CRT_VER, _aligned_msize, dbgsuffix)                      \
+        __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_ENTRY_NO_FALLBACK(CRT_VER, _aligned_realloc, dbgsuffix)        \
+    } else                                                                                                   \
         SkipReplacement(#CRT_VER #dbgsuffix ".dll");
 
-#define __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_RELEASE(CRT_VER) __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_IMPL(CRT_VER,)
-#define __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_DEBUG(CRT_VER) __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_IMPL(CRT_VER,d)
+#define __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_RELEASE(CRT_VER)                                               \
+    __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_IMPL(CRT_VER, )
+#define __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_DEBUG(CRT_VER)                                                 \
+    __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_IMPL(CRT_VER, d)
 
-#define __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL(CRT_VER)     \
-    __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_RELEASE(CRT_VER) \
+#define __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL(CRT_VER)                                                       \
+    __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_RELEASE(CRT_VER)                                                   \
     __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL_DEBUG(CRT_VER)
 
 #if __TBB_OVERLOAD_OLD_MSVCR
@@ -520,71 +475,55 @@ __TBB_ORIG_ALLOCATOR_REPLACEMENT_WRAPPER(ucrtbase);
 /*** replacements for global operators new and delete ***/
 
 #if _MSC_VER && !defined(__INTEL_COMPILER)
-#pragma warning( push )
-#pragma warning( disable : 4290 )
+#pragma warning(push)
+#pragma warning(disable : 4290)
 #endif
 
 /*** operator new overloads internals (Linux, Windows) ***/
 
-void* operator_new(size_t sz) {
-    return InternalOperatorNew(sz);
-}
-void* operator_new_arr(size_t sz) {
-    return InternalOperatorNew(sz);
-}
-void operator_delete(void* ptr) noexcept {
-    __TBB_malloc_safer_delete(ptr);
-}
+void *operator_new(size_t sz) { return InternalOperatorNew(sz); }
+void *operator_new_arr(size_t sz) { return InternalOperatorNew(sz); }
+void operator_delete(void *ptr) noexcept { __TBB_malloc_safer_delete(ptr); }
 #if _MSC_VER && !defined(__INTEL_COMPILER)
-#pragma warning( pop )
+#pragma warning(pop)
 #endif
 
-void operator_delete_arr(void* ptr) noexcept {
-    __TBB_malloc_safer_delete(ptr);
-}
-void* operator_new_t(size_t sz, const std::nothrow_t&) noexcept {
-    return scalable_malloc(sz);
-}
-void* operator_new_arr_t(std::size_t sz, const std::nothrow_t&) noexcept {
-    return scalable_malloc(sz);
-}
-void operator_delete_t(void* ptr, const std::nothrow_t&) noexcept {
-    __TBB_malloc_safer_delete(ptr);
-}
-void operator_delete_arr_t(void* ptr, const std::nothrow_t&) noexcept {
-    __TBB_malloc_safer_delete(ptr);
-}
+void operator_delete_arr(void *ptr) noexcept { __TBB_malloc_safer_delete(ptr); }
+void *operator_new_t(size_t sz, const std::nothrow_t &) noexcept { return scalable_malloc(sz); }
+void *operator_new_arr_t(std::size_t sz, const std::nothrow_t &) noexcept { return scalable_malloc(sz); }
+void operator_delete_t(void *ptr, const std::nothrow_t &) noexcept { __TBB_malloc_safer_delete(ptr); }
+void operator_delete_arr_t(void *ptr, const std::nothrow_t &) noexcept { __TBB_malloc_safer_delete(ptr); }
 
 struct Module {
     const char *name;
-    bool        doFuncReplacement; // do replacement in the DLL
+    bool doFuncReplacement;// do replacement in the DLL
 };
 
 Module modules_to_replace[] = {
-    {"msvcr100d.dll", true},
-    {"msvcr100.dll", true},
-    {"msvcr110d.dll", true},
-    {"msvcr110.dll", true},
-    {"msvcr120d.dll", true},
-    {"msvcr120.dll", true},
-    {"ucrtbase.dll", true},
+        {"msvcr100d.dll", true},
+        {"msvcr100.dll", true},
+        {"msvcr110d.dll", true},
+        {"msvcr110.dll", true},
+        {"msvcr120d.dll", true},
+        {"msvcr120.dll", true},
+        {"ucrtbase.dll", true},
 //    "ucrtbased.dll" is not supported because of problems with _dbg functions
 #if __TBB_OVERLOAD_OLD_MSVCR
-    {"msvcr90d.dll", true},
-    {"msvcr90.dll", true},
-    {"msvcr80d.dll", true},
-    {"msvcr80.dll", true},
-    {"msvcr70d.dll", true},
-    {"msvcr70.dll", true},
-    {"msvcr71d.dll", true},
-    {"msvcr71.dll", true},
+        {"msvcr90d.dll", true},
+        {"msvcr90.dll", true},
+        {"msvcr80d.dll", true},
+        {"msvcr80.dll", true},
+        {"msvcr70d.dll", true},
+        {"msvcr70.dll", true},
+        {"msvcr71d.dll", true},
+        {"msvcr71.dll", true},
 #endif
 #if __TBB_TODO
-    // TODO: Try enabling replacement for non-versioned system binaries below
-    {"msvcrtd.dll", true},
-    {"msvcrt.dll", true},
+        // TODO: Try enabling replacement for non-versioned system binaries below
+        {"msvcrtd.dll", true},
+        {"msvcrt.dll", true},
 #endif
-    };
+};
 
 /*
 We need to replace following functions:
@@ -620,27 +559,26 @@ typedef struct FRData_t {
 } FRDATA;
 
 FRDATA c_routines_to_replace[] = {
-    { "malloc",  (FUNCPTR)scalable_malloc, FRR_FAIL },
-    { "calloc",  (FUNCPTR)scalable_calloc, FRR_FAIL },
-    { "_aligned_malloc",  (FUNCPTR)safer_aligned_malloc, FRR_FAIL },
-    { "_expand",  (FUNCPTR)safer_expand, FRR_IGNORE },
+        {"malloc", (FUNCPTR) scalable_malloc, FRR_FAIL},
+        {"calloc", (FUNCPTR) scalable_calloc, FRR_FAIL},
+        {"_aligned_malloc", (FUNCPTR) safer_aligned_malloc, FRR_FAIL},
+        {"_expand", (FUNCPTR) safer_expand, FRR_IGNORE},
 };
 
 FRDATA cxx_routines_to_replace[] = {
 #if _WIN64
-    { "??2@YAPEAX_K@Z", (FUNCPTR)operator_new, FRR_FAIL },
-    { "??_U@YAPEAX_K@Z", (FUNCPTR)operator_new_arr, FRR_FAIL },
-    { "??3@YAXPEAX@Z", (FUNCPTR)operator_delete, FRR_FAIL },
-    { "??_V@YAXPEAX@Z", (FUNCPTR)operator_delete_arr, FRR_FAIL },
+        {"??2@YAPEAX_K@Z", (FUNCPTR) operator_new, FRR_FAIL},
+        {"??_U@YAPEAX_K@Z", (FUNCPTR) operator_new_arr, FRR_FAIL},
+        {"??3@YAXPEAX@Z", (FUNCPTR) operator_delete, FRR_FAIL},
+        {"??_V@YAXPEAX@Z", (FUNCPTR) operator_delete_arr, FRR_FAIL},
 #else
-    { "??2@YAPAXI@Z", (FUNCPTR)operator_new, FRR_FAIL },
-    { "??_U@YAPAXI@Z", (FUNCPTR)operator_new_arr, FRR_FAIL },
-    { "??3@YAXPAX@Z", (FUNCPTR)operator_delete, FRR_FAIL },
-    { "??_V@YAXPAX@Z", (FUNCPTR)operator_delete_arr, FRR_FAIL },
+        {"??2@YAPAXI@Z", (FUNCPTR) operator_new, FRR_FAIL},
+        {"??_U@YAPAXI@Z", (FUNCPTR) operator_new_arr, FRR_FAIL},
+        {"??3@YAXPAX@Z", (FUNCPTR) operator_delete, FRR_FAIL},
+        {"??_V@YAXPAX@Z", (FUNCPTR) operator_delete_arr, FRR_FAIL},
 #endif
-    { "??2@YAPAXIABUnothrow_t@std@@@Z", (FUNCPTR)operator_new_t, FRR_IGNORE },
-    { "??_U@YAPAXIABUnothrow_t@std@@@Z", (FUNCPTR)operator_new_arr_t, FRR_IGNORE }
-};
+        {"??2@YAPAXIABUnothrow_t@std@@@Z", (FUNCPTR) operator_new_t, FRR_IGNORE},
+        {"??_U@YAPAXIABUnothrow_t@std@@@Z", (FUNCPTR) operator_new_arr_t, FRR_IGNORE}};
 
 #ifndef UNICODE
 typedef char unicode_char_t;
@@ -652,53 +590,51 @@ typedef wchar_t unicode_char_t;
 
 // Check that we recognize bytecodes that should be replaced by trampolines.
 // If some functions have unknown prologue patterns, replacement should not be done.
-bool BytecodesAreKnown(const unicode_char_t *dllName)
-{
+bool BytecodesAreKnown(const unicode_char_t *dllName) {
     const char *funcName[] = {"free", "_msize", "_aligned_free", "_aligned_msize", 0};
     HMODULE module = GetModuleHandle(dllName);
 
-    if (!module)
-        return false;
-    for (int i=0; funcName[i]; i++)
-        if (! IsPrologueKnown(dllName, funcName[i], known_bytecodes, module)) {
-            fprintf(stderr, "TBBmalloc: skip allocation functions replacement in " WCHAR_SPEC
-                    ": unknown prologue for function " WCHAR_SPEC "\n", dllName, funcName[i]);
+    if (!module) return false;
+    for (int i = 0; funcName[i]; i++)
+        if (!IsPrologueKnown(dllName, funcName[i], known_bytecodes, module)) {
+            fprintf(stderr,
+                    "TBBmalloc: skip allocation functions replacement in " WCHAR_SPEC
+                    ": unknown prologue for function " WCHAR_SPEC "\n",
+                    dllName, funcName[i]);
             return false;
         }
     return true;
 }
 
-void SkipReplacement(const unicode_char_t *dllName)
-{
+void SkipReplacement(const unicode_char_t *dllName) {
 #ifndef UNICODE
     const char *dllStr = dllName;
 #else
-    const size_t sz = 128; // all DLL name must fit
+    const size_t sz = 128;// all DLL name must fit
 
     char buffer[sz];
     size_t real_sz;
     char *dllStr = buffer;
 
-    errno_t ret = wcstombs_s(&real_sz, dllStr, sz, dllName, sz-1);
+    errno_t ret = wcstombs_s(&real_sz, dllStr, sz, dllName, sz - 1);
     __TBB_ASSERT(!ret, "Dll name conversion failed");
 #endif
 
-    for (size_t i=0; i<arrayLength(modules_to_replace); i++)
+    for (size_t i = 0; i < arrayLength(modules_to_replace); i++)
         if (!strcmp(modules_to_replace[i].name, dllStr)) {
             modules_to_replace[i].doFuncReplacement = false;
             break;
         }
 }
 
-void ReplaceFunctionWithStore( const unicode_char_t *dllName, const char *funcName, FUNCPTR newFunc, const char ** opcodes, FUNCPTR* origFunc,  FRR_ON_ERROR on_error = FRR_FAIL )
-{
-    FRR_TYPE res = ReplaceFunction( dllName, funcName, newFunc, opcodes, origFunc );
+void ReplaceFunctionWithStore(const unicode_char_t *dllName, const char *funcName, FUNCPTR newFunc,
+                              const char **opcodes, FUNCPTR *origFunc, FRR_ON_ERROR on_error = FRR_FAIL) {
+    FRR_TYPE res = ReplaceFunction(dllName, funcName, newFunc, opcodes, origFunc);
 
-    if (res == FRR_OK || res == FRR_NODLL || (res == FRR_NOFUNC && on_error == FRR_IGNORE))
-        return;
+    if (res == FRR_OK || res == FRR_NODLL || (res == FRR_NOFUNC && on_error == FRR_IGNORE)) return;
 
-    fprintf(stderr, "Failed to %s function %s in module %s\n",
-            res==FRR_NOFUNC? "find" : "replace", funcName, dllName);
+    fprintf(stderr, "Failed to %s function %s in module %s\n", res == FRR_NOFUNC ? "find" : "replace",
+            funcName, dllName);
 
     // Unable to replace a required function
     // Aborting because incomplete replacement of memory management functions
@@ -706,8 +642,7 @@ void ReplaceFunctionWithStore( const unicode_char_t *dllName, const char *funcNa
     abort();
 }
 
-void doMallocReplacement()
-{
+void doMallocReplacement() {
     // Replace functions and keep backup of original code (separate for each runtime)
 #if __TBB_OVERLOAD_OLD_MSVCR
     __TBB_ORIG_ALLOCATOR_REPLACEMENT_CALL(msvcr70)
@@ -722,75 +657,77 @@ void doMallocReplacement()
 
     // Replace functions without storing original code
     for (size_t j = 0; j < arrayLength(modules_to_replace); j++) {
-        if (!modules_to_replace[j].doFuncReplacement)
-            continue;
-        for (size_t i = 0; i < arrayLength(c_routines_to_replace); i++)
-        {
-            ReplaceFunctionWithStore( modules_to_replace[j].name, c_routines_to_replace[i]._func, c_routines_to_replace[i]._fptr, nullptr, nullptr,  c_routines_to_replace[i]._on_error );
+        if (!modules_to_replace[j].doFuncReplacement) continue;
+        for (size_t i = 0; i < arrayLength(c_routines_to_replace); i++) {
+            ReplaceFunctionWithStore(modules_to_replace[j].name, c_routines_to_replace[i]._func,
+                                     c_routines_to_replace[i]._fptr, nullptr, nullptr,
+                                     c_routines_to_replace[i]._on_error);
         }
-        if ( strcmp(modules_to_replace[j].name, "ucrtbase.dll") == 0 ) {
+        if (strcmp(modules_to_replace[j].name, "ucrtbase.dll") == 0) {
             HMODULE ucrtbase_handle = GetModuleHandle("ucrtbase.dll");
-            if (!ucrtbase_handle)
-                continue;
+            if (!ucrtbase_handle) continue;
             // If _o_free function is present and patchable, redirect it to tbbmalloc as well
             // This prevents issues with other _o_* functions which might allocate memory with malloc
-            if ( IsPrologueKnown("ucrtbase.dll", "_o_free", known_bytecodes, ucrtbase_handle)) {
-                ReplaceFunctionWithStore( "ucrtbase.dll", "_o_free", (FUNCPTR)__TBB_malloc__o_free, known_bytecodes, (FUNCPTR*)&orig__o_free,  FRR_FAIL );
+            if (IsPrologueKnown("ucrtbase.dll", "_o_free", known_bytecodes, ucrtbase_handle)) {
+                ReplaceFunctionWithStore("ucrtbase.dll", "_o_free", (FUNCPTR) __TBB_malloc__o_free,
+                                         known_bytecodes, (FUNCPTR *) &orig__o_free, FRR_FAIL);
             }
             // Similarly for _free_base
             if (IsPrologueKnown("ucrtbase.dll", "_free_base", known_bytecodes, ucrtbase_handle)) {
-                ReplaceFunctionWithStore("ucrtbase.dll", "_free_base", (FUNCPTR)__TBB_malloc__free_base, known_bytecodes, (FUNCPTR*)&orig__free_base, FRR_FAIL);
+                ReplaceFunctionWithStore("ucrtbase.dll", "_free_base", (FUNCPTR) __TBB_malloc__free_base,
+                                         known_bytecodes, (FUNCPTR *) &orig__free_base, FRR_FAIL);
             }
             // ucrtbase.dll does not export operator new/delete, so skip the rest of the loop.
             continue;
         }
 
-        for (size_t i = 0; i < arrayLength(cxx_routines_to_replace); i++)
-        {
+        for (size_t i = 0; i < arrayLength(cxx_routines_to_replace); i++) {
 #if !_WIN64
             // in Microsoft* Visual Studio* 2012 and 2013 32-bit operator delete consists of 2 bytes only: short jump to free(ptr);
             // replacement should be skipped for this particular case.
-            if ( ((strcmp(modules_to_replace[j].name, "msvcr110.dll") == 0) || (strcmp(modules_to_replace[j].name, "msvcr120.dll") == 0)) && (strcmp(cxx_routines_to_replace[i]._func, "??3@YAXPAX@Z") == 0) ) continue;
+            if (((strcmp(modules_to_replace[j].name, "msvcr110.dll") == 0)
+                 || (strcmp(modules_to_replace[j].name, "msvcr120.dll") == 0))
+                && (strcmp(cxx_routines_to_replace[i]._func, "??3@YAXPAX@Z") == 0))
+                continue;
             // in Microsoft* Visual Studio* 2013 32-bit operator delete[] consists of 2 bytes only: short jump to free(ptr);
             // replacement should be skipped for this particular case.
-            if ( (strcmp(modules_to_replace[j].name, "msvcr120.dll") == 0) && (strcmp(cxx_routines_to_replace[i]._func, "??_V@YAXPAX@Z") == 0) ) continue;
+            if ((strcmp(modules_to_replace[j].name, "msvcr120.dll") == 0)
+                && (strcmp(cxx_routines_to_replace[i]._func, "??_V@YAXPAX@Z") == 0))
+                continue;
 #endif
-            ReplaceFunctionWithStore( modules_to_replace[j].name, cxx_routines_to_replace[i]._func, cxx_routines_to_replace[i]._fptr, nullptr, nullptr,  cxx_routines_to_replace[i]._on_error );
+            ReplaceFunctionWithStore(modules_to_replace[j].name, cxx_routines_to_replace[i]._func,
+                                     cxx_routines_to_replace[i]._fptr, nullptr, nullptr,
+                                     cxx_routines_to_replace[i]._on_error);
         }
     }
 }
 
-#endif // !__TBB_WIN8UI_SUPPORT
+#endif// !__TBB_WIN8UI_SUPPORT
 
 #if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
-    // Suppress warning for UWP build ('main' signature found without threading model)
-    #pragma warning(push)
-    #pragma warning(disable:4447)
+// Suppress warning for UWP build ('main' signature found without threading model)
+#pragma warning(push)
+#pragma warning(disable : 4447)
 #endif
 
-extern "C" BOOL WINAPI DllMain( HINSTANCE hInst, DWORD callReason, LPVOID reserved )
-{
+extern "C" BOOL WINAPI DllMain(HINSTANCE hInst, DWORD callReason, LPVOID reserved) {
 
-    if ( callReason==DLL_PROCESS_ATTACH && reserved && hInst ) {
+    if (callReason == DLL_PROCESS_ATTACH && reserved && hInst) {
 #if !__TBB_WIN8UI_SUPPORT
-        if (!tbb::detail::r1::GetBoolEnvironmentVariable("TBB_MALLOC_DISABLE_REPLACEMENT"))
-        {
+        if (!tbb::detail::r1::GetBoolEnvironmentVariable("TBB_MALLOC_DISABLE_REPLACEMENT")) {
             doMallocReplacement();
         }
-#endif // !__TBB_WIN8UI_SUPPORT
+#endif// !__TBB_WIN8UI_SUPPORT
     }
 
     return TRUE;
 }
 
 #if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
-    #pragma warning(pop)
+#pragma warning(pop)
 #endif
 
 // Just to make the linker happy and link the DLL to the application
-extern "C" __declspec(dllexport) void __TBB_malloc_proxy()
-{
-
-}
+extern "C" __declspec(dllexport) void __TBB_malloc_proxy() {}
 
-#endif //_WIN32
+#endif//_WIN32
diff --git a/external/tbb/test/conformance/conformance_allocators.cpp b/external/tbb/test/conformance/conformance_allocators.cpp
index 60ec5cae..e01c58c6 100644
--- a/external/tbb/test/conformance/conformance_allocators.cpp
+++ b/external/tbb/test/conformance/conformance_allocators.cpp
@@ -18,8 +18,8 @@
 #include "oneapi/tbb/tbb_allocator.h"
 
 // the real body of the test is there:
-#include "common/allocator_test_common.h"
 #include "common/allocator_stl_test_common.h"
+#include "common/allocator_test_common.h"
 
 //! \file conformance_allocators.cpp
 //! \brief Test for [memory_allocation.cache_aligned_allocator memory_allocation.tbb_allocator memory_allocation.cache_aligned_resource] specifications
@@ -37,7 +37,9 @@ TEST_CASE("Allocator concept") {
     AssertSameType(allocator.max_size(), typename std::allocator_traits<Allocator>::size_type(0));
     // Following assertion catches case where max_size() is so large that computation of
     // number of bytes for such an allocation would overflow size_type.
-    REQUIRE_MESSAGE((allocator.max_size() * typename std::allocator_traits<Allocator>::size_type(sizeof(int)) >= allocator.max_size()), "max_size larger than reasonable");
+    REQUIRE_MESSAGE((allocator.max_size() * typename std::allocator_traits<Allocator>::size_type(sizeof(int))
+                     >= allocator.max_size()),
+                    "max_size larger than reasonable");
 
     // operator==
     TestAllocator<oneapi::tbb::cache_aligned_allocator<void>>(Comparison);
@@ -68,7 +70,8 @@ TEST_CASE("Thread safety") {
 //! Testing tbb_allocator to return the type of allocation library used
 //! \brief \ref requirement
 TEST_CASE("tbb_allocator allocator type") {
-    using Allocator = oneapi::tbb::tbb_allocator<int>; Allocator tbb_alloc;
+    using Allocator = oneapi::tbb::tbb_allocator<int>;
+    Allocator tbb_alloc;
 #if _MSC_VER && _MSC_VER <= 1900 && !__INTEL_COMPILER
     utils::suppress_unused_warning(tbb_alloc);
 #endif
@@ -83,7 +86,7 @@ TEST_CASE("tbb_allocator allocator type") {
 //! \brief \ref interface \ref requirement
 TEST_CASE("polymorphic_allocator test") {
     oneapi::tbb::cache_aligned_resource aligned_resource;
-    TestAllocator<std::pmr::polymorphic_allocator<void>>(Concept, std::pmr::polymorphic_allocator<void>(&aligned_resource));
+    TestAllocator<std::pmr::polymorphic_allocator<void>>(
+            Concept, std::pmr::polymorphic_allocator<void>(&aligned_resource));
 }
 #endif
-
diff --git a/external/tbb/test/conformance/conformance_arena_constraints.cpp b/external/tbb/test/conformance/conformance_arena_constraints.cpp
index de70fe8c..8592476d 100644
--- a/external/tbb/test/conformance/conformance_arena_constraints.cpp
+++ b/external/tbb/test/conformance/conformance_arena_constraints.cpp
@@ -25,16 +25,16 @@
 //! \brief \ref interface \ref requirement
 TEST_CASE("NUMA aware arenas task execution test") {
     system_info::initialize();
-    for(auto& numa_index: oneapi::tbb::info::numa_nodes()) {
-        oneapi::tbb::task_arena arena(oneapi::tbb::task_arena::constraints{numa_index});
+    for (auto& numa_index : oneapi::tbb::info::numa_nodes()) {
+        oneapi::tbb::task_arena arena(oneapi::tbb::task_arena::constraints {numa_index});
 
-        std::atomic<bool> task_done{false};
-        arena.execute([&]{ task_done = true; });
+        std::atomic<bool> task_done {false};
+        arena.execute([&] { task_done = true; });
         REQUIRE_MESSAGE(task_done, "Execute was performed but task was not executed.");
 
         task_done = false;
-        arena.enqueue([&]{ task_done = true; });
-        while(!task_done) { utils::yield(); }
+        arena.enqueue([&] { task_done = true; });
+        while (!task_done) { utils::yield(); }
     }
 }
 
@@ -45,10 +45,9 @@ TEST_CASE("Test NUMA topology traversal correctness") {
     std::vector<index_info> numa_nodes_info = system_info::get_numa_nodes_info();
 
     std::vector<oneapi::tbb::numa_node_id> numa_indexes = oneapi::tbb::info::numa_nodes();
-    for (const auto& numa_id: numa_indexes) {
+    for (const auto& numa_id : numa_indexes) {
         auto pos = std::find_if(numa_nodes_info.begin(), numa_nodes_info.end(),
-            [&](const index_info& numa_info){ return numa_info.index == numa_id; }
-        );
+                                [&](const index_info& numa_info) { return numa_info.index == numa_id; });
 
         REQUIRE_MESSAGE(pos != numa_nodes_info.end(), "Wrong, extra or repeated NUMA node index detected.");
         numa_nodes_info.erase(pos);
@@ -80,11 +79,13 @@ TEST_CASE("Test validity of NUMA interfaces when HWLOC is not present on the sys
     std::vector<oneapi::tbb::numa_node_id> numa_indexes = oneapi::tbb::info::numa_nodes();
 
     REQUIRE_MESSAGE(numa_indexes.size() == 1,
-        "Number of NUMA nodes must be pinned to 1, if we have no HWLOC on the system.");
+                    "Number of NUMA nodes must be pinned to 1, if we have no HWLOC on the system.");
     REQUIRE_MESSAGE(numa_indexes[0] == -1,
-        "Index of NUMA node must be pinned to -1, if we have no HWLOC on the system.");
-    REQUIRE_MESSAGE(oneapi::tbb::info::default_concurrency(numa_indexes[0]) == utils::get_platform_max_threads(),
-        "Concurrency for NUMA node must be equal to default_num_threads(), if we have no HWLOC on the system.");
+                    "Index of NUMA node must be pinned to -1, if we have no HWLOC on the system.");
+    REQUIRE_MESSAGE(oneapi::tbb::info::default_concurrency(numa_indexes[0])
+                            == utils::get_platform_max_threads(),
+                    "Concurrency for NUMA node must be equal to default_num_threads(), if we have no HWLOC "
+                    "on the system.");
 }
 
 #endif /*__TBB_HWLOC_VALID_ENVIRONMENT*/
diff --git a/external/tbb/test/conformance/conformance_async_node.cpp b/external/tbb/test/conformance/conformance_async_node.cpp
index 486e61d5..bd052099 100644
--- a/external/tbb/test/conformance/conformance_async_node.cpp
+++ b/external/tbb/test/conformance/conformance_async_node.cpp
@@ -15,21 +15,21 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
 #endif
 
-#include "conformance_flowgraph.h"
 #include "common/test_invoke.h"
+#include "conformance_flowgraph.h"
 
 //! \file conformance_async_node.cpp
 //! \brief Test for [flow_graph.async_node] specification
 
-using input_msg = conformance::message</*default_ctor*/true, /*copy_ctor*/true, /*copy_assign*/false>;
-using output_msg = conformance::message</*default_ctor*/false, /*copy_ctor*/false, /*copy_assign*/false>;
+using input_msg = conformance::message</*default_ctor*/ true, /*copy_ctor*/ true, /*copy_assign*/ false>;
+using output_msg = conformance::message</*default_ctor*/ false, /*copy_ctor*/ false, /*copy_assign*/ false>;
 
 //! Test async_node constructors
 //! \brief \ref requirement
-TEST_CASE("async_node constructors"){
+TEST_CASE("async_node constructors") {
     using namespace oneapi::tbb::flow;
     graph g;
 
@@ -39,68 +39,76 @@ TEST_CASE("async_node constructors"){
     async_node<int, int> fn2(g, unlimited, fun, oneapi::tbb::flow::node_priority_t(1));
 
     async_node<int, int, lightweight> lw_node1(g, serial, fun, lightweight());
-    async_node<int, int, lightweight> lw_node2(g, serial, fun, lightweight(), oneapi::tbb::flow::node_priority_t(1));
+    async_node<int, int, lightweight> lw_node2(g, serial, fun, lightweight(),
+                                               oneapi::tbb::flow::node_priority_t(1));
 }
 
 //! Test buffering property
 //! \brief \ref requirement
 TEST_CASE("async_node buffering") {
     conformance::dummy_functor<int> fun;
-    conformance::test_buffering<oneapi::tbb::flow::async_node<input_msg, int>, input_msg>(oneapi::tbb::flow::unlimited, fun);
+    conformance::test_buffering<oneapi::tbb::flow::async_node<input_msg, int>, input_msg>(
+            oneapi::tbb::flow::unlimited, fun);
 }
 
 //! Test priorities work in single-threaded configuration
 //! \brief \ref requirement
-TEST_CASE("async_node priority support"){
-    conformance::test_priority<oneapi::tbb::flow::async_node<input_msg, int>, input_msg>(oneapi::tbb::flow::unlimited);
+TEST_CASE("async_node priority support") {
+    conformance::test_priority<oneapi::tbb::flow::async_node<input_msg, int>, input_msg>(
+            oneapi::tbb::flow::unlimited);
 }
 
 //! The node that is constructed has a reference to the same graph object as src, has a copy of the initial body used by src, and has the same concurrency threshold as src.
 //! The predecessors and successors of src are not copied.
 //! \brief \ref requirement
-TEST_CASE("async_node copy constructor"){
+TEST_CASE("async_node copy constructor") {
     conformance::test_copy_ctor<oneapi::tbb::flow::async_node<int, int>>();
 }
 
 //! Test calling async body
 //! \brief \ref interface \ref requirement
 TEST_CASE("Test async_node body") {
-    conformance::test_body_exec<oneapi::tbb::flow::async_node<input_msg, output_msg>, input_msg, output_msg>(oneapi::tbb::flow::unlimited);
+    conformance::test_body_exec<oneapi::tbb::flow::async_node<input_msg, output_msg>, input_msg, output_msg>(
+            oneapi::tbb::flow::unlimited);
 }
 
 //! Test async_node inheritance relations
 //! \brief \ref interface
-TEST_CASE("async_node superclasses"){
+TEST_CASE("async_node superclasses") {
     conformance::test_inheritance<oneapi::tbb::flow::async_node<int, int>, int, int>();
     conformance::test_inheritance<oneapi::tbb::flow::async_node<void*, float>, void*, float>();
-    conformance::test_inheritance<oneapi::tbb::flow::async_node<input_msg, output_msg>, input_msg, output_msg>();
+    conformance::test_inheritance<oneapi::tbb::flow::async_node<input_msg, output_msg>, input_msg,
+                                  output_msg>();
 }
 
 //! Test node broadcast messages to successors
 //! \brief \ref requirement
-TEST_CASE("async_node broadcast"){
+TEST_CASE("async_node broadcast") {
     conformance::counting_functor<int> fun(conformance::expected);
-    conformance::test_forwarding<oneapi::tbb::flow::async_node<input_msg, int>, input_msg, int>(1, oneapi::tbb::flow::unlimited, fun);
+    conformance::test_forwarding<oneapi::tbb::flow::async_node<input_msg, int>, input_msg, int>(
+            1, oneapi::tbb::flow::unlimited, fun);
 }
 
 //! Test async_node has a user-settable concurrency limit. It can be set to one of predefined values.
 //! The user can also provide a value of type std::size_t to limit concurrency.
 //! Test that not more than limited threads works in parallel.
 //! \brief \ref requirement
-TEST_CASE("concurrency follows set limits"){
+TEST_CASE("concurrency follows set limits") {
     conformance::test_concurrency<oneapi::tbb::flow::async_node<int, int>>();
 }
 
 //! Test body copying and copy_body logic
 //! Test the body object passed to a node is copied
 //! \brief \ref interface
-TEST_CASE("async_node body copying"){
-    conformance::test_copy_body_function<oneapi::tbb::flow::async_node<int, int>, conformance::copy_counting_object<int>>(oneapi::tbb::flow::unlimited);
+TEST_CASE("async_node body copying") {
+    conformance::test_copy_body_function<oneapi::tbb::flow::async_node<int, int>,
+                                         conformance::copy_counting_object<int>>(
+            oneapi::tbb::flow::unlimited);
 }
 
 //! Test node reject the incoming message if the concurrency limit achieved.
 //! \brief \ref interface
-TEST_CASE("async_node with rejecting policy"){
+TEST_CASE("async_node with rejecting policy") {
     conformance::test_rejecting<oneapi::tbb::flow::async_node<int, int, oneapi::tbb::flow::rejecting>>();
 }
 
@@ -113,28 +121,26 @@ TEST_CASE("Test async_node Output and Input class") {
 
 //! Test the body of assync_node typically submits the messages to an external activity for processing outside of the graph.
 //! \brief \ref interface
-TEST_CASE("async_node with rejecting policy"){
+TEST_CASE("async_node with rejecting policy") {
     using async_node_type = tbb::flow::async_node<int, int>;
     using gateway_type = async_node_type::gateway_type;
 
     oneapi::tbb::flow::graph g;
-    std::atomic<bool> flag{false};
+    std::atomic<bool> flag {false};
     std::thread thr;
-    async_node_type testing_node{
-      g, tbb::flow::unlimited,
-      [&](const int& input, gateway_type& gateway) {
-          gateway.reserve_wait();
-          thr = std::thread{[&]{
-              flag = true;
-              gateway.try_put(input);
-              gateway.release_wait();
-          }};
-      }
-    };
+    async_node_type testing_node {g, tbb::flow::unlimited, [&](const int& input, gateway_type& gateway) {
+                                      gateway.reserve_wait();
+                                      thr = std::thread {[&] {
+                                          flag = true;
+                                          gateway.try_put(input);
+                                          gateway.release_wait();
+                                      }};
+                                  }};
 
     testing_node.try_put(1);
     g.wait_for_all();
-    CHECK_MESSAGE((flag.load()), "The body of assync_node must submits the messages to an external activity for processing outside of the graph");
+    CHECK_MESSAGE((flag.load()), "The body of assync_node must submits the messages to an external activity "
+                                 "for processing outside of the graph");
     thr.join();
 }
 
@@ -147,10 +153,12 @@ TEST_CASE("async_node and std::invoke") {
     using start_node_type = function_node<std::size_t, test_invoke::SmartID<std::size_t>>;
     using async_node_type = async_node<test_invoke::SmartID<std::size_t>, std::size_t>;
 
-    auto async_body = &test_invoke::SmartID<std::size_t>::template send_id_to_gateway<typename async_node_type::gateway_type>;
+    auto async_body = &test_invoke::SmartID<std::size_t>::template send_id_to_gateway<
+            typename async_node_type::gateway_type>;
 
     graph g;
-    start_node_type starter(g, serial, [](std::size_t i) -> test_invoke::SmartID<std::size_t> { return {i}; });
+    start_node_type starter(g, serial,
+                            [](std::size_t i) -> test_invoke::SmartID<std::size_t> { return {i}; });
     async_node_type activity_submitter(g, serial, async_body);
     buffer_node<std::size_t> buf(g);
 
diff --git a/external/tbb/test/conformance/conformance_blocked_nd_range.cpp b/external/tbb/test/conformance/conformance_blocked_nd_range.cpp
index 999eacb3..8413f91d 100644
--- a/external/tbb/test/conformance/conformance_blocked_nd_range.cpp
+++ b/external/tbb/test/conformance/conformance_blocked_nd_range.cpp
@@ -23,16 +23,17 @@
 //! \brief Test for [algorithms.blocked_nd_range] specification
 
 #include "oneapi/tbb/blocked_nd_range.h"
-#include "oneapi/tbb/parallel_for.h"
 #include "oneapi/tbb/global_control.h"
+#include "oneapi/tbb/parallel_for.h"
 
-#include <algorithm> // std::for_each
+#include <algorithm>// std::for_each
 #include <array>
 
 // AbstractValueType class represents Value concept's requirements in the most abstract way
 class AbstractValueType {
     int value;
     AbstractValueType() {}
+
 public:
     friend AbstractValueType MakeAbstractValue(int i);
     friend int GetValueOf(const AbstractValueType& v);
@@ -59,19 +60,22 @@ AbstractValueType operator+(const AbstractValueType& u, std::size_t offset) {
     return MakeAbstractValue(GetValueOf(u) + int(offset));
 }
 
-template<typename range_t, unsigned int N>
+template <typename range_t, unsigned int N>
 struct range_utils {
     using val_t = typename range_t::value_type;
 
-    template<typename EntityType, std::size_t DimSize>
-    using data_type = std::array<typename range_utils<range_t, N - 1>::template data_type<EntityType, DimSize>, DimSize>;
+    template <typename EntityType, std::size_t DimSize>
+    using data_type
+            = std::array<typename range_utils<range_t, N - 1>::template data_type<EntityType, DimSize>,
+                         DimSize>;
 
-    template<typename EntityType, std::size_t DimSize>
+    template <typename EntityType, std::size_t DimSize>
     static void init_data(data_type<EntityType, DimSize>& data) {
-        std::for_each(data.begin(), data.end(), range_utils<range_t, N - 1>::template init_data<EntityType, DimSize>);
+        std::for_each(data.begin(), data.end(),
+                      range_utils<range_t, N - 1>::template init_data<EntityType, DimSize>);
     }
 
-    template<typename EntityType, std::size_t DimSize>
+    template <typename EntityType, std::size_t DimSize>
     static void increment_data(const range_t& range, data_type<EntityType, DimSize>& data) {
         auto begin = data.begin() + range.dim(N - 1).begin();
         // same as "auto end = out.begin() + range.dim(N - 1).end();"
@@ -81,7 +85,7 @@ struct range_utils {
         }
     }
 
-    template<typename EntityType, std::size_t DimSize>
+    template <typename EntityType, std::size_t DimSize>
     static void check_data(const range_t& range, data_type<EntityType, DimSize>& data) {
         auto begin = data.begin() + range.dim(N - 1).begin();
         // same as "auto end = out.begin() + range.dim(N - 1).end();"
@@ -97,9 +101,10 @@ struct range_utils {
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wsequence-point"
 #endif
-    template<typename input_t, std::size_t... Is>
-    static range_t make_range(std::size_t shift, bool negative, val_t(*gen)(input_t), oneapi::tbb::detail::index_sequence<Is...>) {
-        return range_t( { { gen(negative ? -input_t(Is + shift) : 0), gen(input_t(Is + shift)), Is + 1} ... } );
+    template <typename input_t, std::size_t... Is>
+    static range_t make_range(std::size_t shift, bool negative, val_t (*gen)(input_t),
+                              oneapi::tbb::detail::index_sequence<Is...>) {
+        return range_t({{gen(negative ? -input_t(Is + shift) : 0), gen(input_t(Is + shift)), Is + 1}...});
     }
 #if __GNUC__ && !defined(__clang__) && !defined(__INTEL_COMPILER)
 #pragma GCC diagnostic pop
@@ -115,33 +120,37 @@ struct range_utils {
         return range_utils<range_t, N - 1>::is_divisible(range);
     }
 
-    static void check_splitting(const range_t& range_split, const range_t& range_new, int(*get)(const val_t&), bool split_checker = false) {
+    static void check_splitting(const range_t& range_split, const range_t& range_new,
+                                int (*get)(const val_t&), bool split_checker = false) {
         if (get(range_split.dim(N - 1).begin()) == get(range_new.dim(N - 1).begin())) {
             REQUIRE(get(range_split.dim(N - 1).end()) == get(range_new.dim(N - 1).end()));
-        }
-        else {
-            REQUIRE((get(range_split.dim(N - 1).end()) == get(range_new.dim(N - 1).begin()) && !split_checker));
+        } else {
+            REQUIRE((get(range_split.dim(N - 1).end()) == get(range_new.dim(N - 1).begin())
+                     && !split_checker));
             split_checker = true;
         }
         range_utils<range_t, N - 1>::check_splitting(range_split, range_new, get, split_checker);
     }
-
 };
 
-template<typename range_t>
+template <typename range_t>
 struct range_utils<range_t, 0> {
     using val_t = typename range_t::value_type;
 
-    template<typename EntityType, std::size_t DimSize>
+    template <typename EntityType, std::size_t DimSize>
     using data_type = EntityType;
 
-    template<typename EntityType, std::size_t DimSize>
-    static void init_data(data_type<EntityType, DimSize>& data) { data = 0; }
+    template <typename EntityType, std::size_t DimSize>
+    static void init_data(data_type<EntityType, DimSize>& data) {
+        data = 0;
+    }
 
-    template<typename EntityType, std::size_t DimSize>
-    static void increment_data(const range_t&, data_type<EntityType, DimSize>& data) { ++data; }
+    template <typename EntityType, std::size_t DimSize>
+    static void increment_data(const range_t&, data_type<EntityType, DimSize>& data) {
+        ++data;
+    }
 
-    template<typename EntityType, std::size_t DimSize>
+    template <typename EntityType, std::size_t DimSize>
     static void check_data(const range_t&, data_type<EntityType, DimSize>& data) {
         REQUIRE(data == 1);
     }
@@ -150,23 +159,25 @@ struct range_utils<range_t, 0> {
 
     static bool is_divisible(const range_t&) { return false; }
 
-    static void check_splitting(const range_t&, const range_t&, int(*)(const val_t&), bool) {}
+    static void check_splitting(const range_t&, const range_t&, int (*)(const val_t&), bool) {}
 };
 
 // We need MakeInt function to pass it into make_range as factory function
 // because of matching make_range with AbstractValueType and other types too
 int MakeInt(int i) { return i; }
 
-template<unsigned int DimAmount>
+template <unsigned int DimAmount>
 void SerialTest() {
-    static_assert((oneapi::tbb::blocked_nd_range<int, DimAmount>::dim_count() == oneapi::tbb::blocked_nd_range<AbstractValueType, DimAmount>::dim_count()),
-                         "different amount of dimensions");
+    static_assert((oneapi::tbb::blocked_nd_range<int, DimAmount>::dim_count()
+                   == oneapi::tbb::blocked_nd_range<AbstractValueType, DimAmount>::dim_count()),
+                  "different amount of dimensions");
 
     using range_t = oneapi::tbb::blocked_nd_range<AbstractValueType, DimAmount>;
     using utils_t = range_utils<range_t, DimAmount>;
 
     // Generate empty range
-    range_t r = utils_t::make_range(0, true, &MakeAbstractValue, oneapi::tbb::detail::make_index_sequence<DimAmount>());
+    range_t r = utils_t::make_range(0, true, &MakeAbstractValue,
+                                    oneapi::tbb::detail::make_index_sequence<DimAmount>());
 
     utils::AssertSameType(r.is_divisible(), bool());
     utils::AssertSameType(r.empty(), bool());
@@ -176,7 +187,8 @@ void SerialTest() {
     REQUIRE(r.is_divisible() == utils_t::is_divisible(r));
 
     // Generate not-empty range divisible range
-    r = utils_t::make_range(1, true, &MakeAbstractValue, oneapi::tbb::detail::make_index_sequence<DimAmount>());
+    r = utils_t::make_range(1, true, &MakeAbstractValue,
+                            oneapi::tbb::detail::make_index_sequence<DimAmount>());
     REQUIRE((r.empty() == utils_t::is_empty(r) && !r.empty()));
     REQUIRE((r.is_divisible() == utils_t::is_divisible(r) && r.is_divisible()));
 
@@ -185,9 +197,10 @@ void SerialTest() {
 
     SerialTest<DimAmount - 1>();
 }
-template<> void SerialTest<0>() {}
+template <>
+void SerialTest<0>() {}
 
-template<unsigned int DimAmount>
+template <unsigned int DimAmount>
 void ParallelTest() {
     using range_t = oneapi::tbb::blocked_nd_range<int, DimAmount>;
     using utils_t = range_utils<range_t, DimAmount>;
@@ -197,76 +210,76 @@ void ParallelTest() {
     typename utils_t::template data_type<unsigned char, 1 << (20 / DimAmount - 1)> data;
     utils_t::init_data(data);
 
-    range_t r = utils_t::make_range((1 << (20 / DimAmount - 1)) - DimAmount, false, &MakeInt, oneapi::tbb::detail::make_index_sequence<DimAmount>());
+    range_t r = utils_t::make_range((1 << (20 / DimAmount - 1)) - DimAmount, false, &MakeInt,
+                                    oneapi::tbb::detail::make_index_sequence<DimAmount>());
 
-    oneapi::tbb::parallel_for(r, [&data](const range_t& range) {
-        utils_t::increment_data(range, data);
-    });
+    oneapi::tbb::parallel_for(r, [&data](const range_t& range) { utils_t::increment_data(range, data); });
 
     utils_t::check_data(r, data);
 
     ParallelTest<DimAmount - 1>();
 }
-template<> void ParallelTest<0>() {}
+template <>
+void ParallelTest<0>() {}
 
 //! Testing blocked_nd_range construction
 //! \brief \ref interface
 TEST_CASE("Construction") {
-    oneapi::tbb::blocked_nd_range<int, 1>{ { 0,13,3 } };
+    oneapi::tbb::blocked_nd_range<int, 1> {{0, 13, 3}};
 
-    oneapi::tbb::blocked_nd_range<int, 1>{ oneapi::tbb::blocked_range<int>{ 0,13,3 } };
+    oneapi::tbb::blocked_nd_range<int, 1> {oneapi::tbb::blocked_range<int> {0, 13, 3}};
 
-    oneapi::tbb::blocked_nd_range<int, 2>(oneapi::tbb::blocked_range<int>(-8923, 8884, 13), oneapi::tbb::blocked_range<int>(-8923, 5, 13));
+    oneapi::tbb::blocked_nd_range<int, 2>(oneapi::tbb::blocked_range<int>(-8923, 8884, 13),
+                                          oneapi::tbb::blocked_range<int>(-8923, 5, 13));
 
-    oneapi::tbb::blocked_nd_range<int, 2>({ -8923, 8884, 13 }, { -8923, 8884, 13 });
+    oneapi::tbb::blocked_nd_range<int, 2>({-8923, 8884, 13}, {-8923, 8884, 13});
 
     oneapi::tbb::blocked_range<int> r1(0, 13);
 
     oneapi::tbb::blocked_range<int> r2(-12, 23);
 
-    oneapi::tbb::blocked_nd_range<int, 2>({ { -8923, 8884, 13 }, r1});
+    oneapi::tbb::blocked_nd_range<int, 2>({{-8923, 8884, 13}, r1});
 
-    oneapi::tbb::blocked_nd_range<int, 2>({ r2, r1 });
+    oneapi::tbb::blocked_nd_range<int, 2>({r2, r1});
 
     oneapi::tbb::blocked_nd_range<int, 2>(r1, r2);
 
     int sizes[] = {174, 39, 2481, 93};
-    oneapi::tbb::blocked_nd_range<int, 4> rNd_1(sizes, /*grainsize*/7);
+    oneapi::tbb::blocked_nd_range<int, 4> rNd_1(sizes, /*grainsize*/ 7);
 
-    oneapi::tbb::blocked_nd_range<int, 4> rNd_2({174, 39, 2481, 93}, /*grainsize*/11);
+    oneapi::tbb::blocked_nd_range<int, 4> rNd_2({174, 39, 2481, 93}, /*grainsize*/ 11);
 
     for (unsigned i = 0; i < rNd_1.dim_count(); ++i) {
         oneapi::tbb::blocked_nd_range<int, 4>::dim_range_type dim1 = rNd_1.dim(i);
         oneapi::tbb::blocked_nd_range<int, 4>::dim_range_type dim2 = rNd_2.dim(i);
-        REQUIRE(dim1.begin()==0);
-        REQUIRE(dim2.begin()==0);
-        unsigned int szi = sizes[i]; // to compare with unsigned integrals without warnings
-        REQUIRE(dim1.size()==szi);
-        REQUIRE(dim2.size()==szi);
-        REQUIRE(dim1.grainsize()==7);
-        REQUIRE(dim2.grainsize()==11);
+        REQUIRE(dim1.begin() == 0);
+        REQUIRE(dim2.begin() == 0);
+        unsigned int szi = sizes[i];// to compare with unsigned integrals without warnings
+        REQUIRE(dim1.size() == szi);
+        REQUIRE(dim2.size() == szi);
+        REQUIRE(dim1.grainsize() == 7);
+        REQUIRE(dim2.grainsize() == 11);
     }
 
-    oneapi::tbb::blocked_nd_range<AbstractValueType, 4>({ MakeAbstractValue(-3), MakeAbstractValue(13), 8 },
-                                               { MakeAbstractValue(-53), MakeAbstractValue(23), 2 },
-                                               { MakeAbstractValue(-23), MakeAbstractValue(33), 1 },
-                                               { MakeAbstractValue(-13), MakeAbstractValue(43), 7 });
+    oneapi::tbb::blocked_nd_range<AbstractValueType, 4>({MakeAbstractValue(-3), MakeAbstractValue(13), 8},
+                                                        {MakeAbstractValue(-53), MakeAbstractValue(23), 2},
+                                                        {MakeAbstractValue(-23), MakeAbstractValue(33), 1},
+                                                        {MakeAbstractValue(-13), MakeAbstractValue(43), 7});
 }
 
 static const std::size_t N = 4;
 
 //! Testing blocked_nd_range interface
 //! \brief \ref interface \ref requirement
-TEST_CASE("Serial test") {
-    SerialTest<N>();
-}
+TEST_CASE("Serial test") { SerialTest<N>(); }
 
 #if !EMSCRIPTEN
 //! Testing blocked_nd_range interface with parallel_for
 //! \brief \ref requirement
 TEST_CASE("Parallel test") {
-    for ( auto concurrency_level : utils::concurrency_range() ) {
-        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism, concurrency_level);
+    for (auto concurrency_level : utils::concurrency_range()) {
+        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism,
+                                            concurrency_level);
         ParallelTest<N>();
     }
 }
@@ -275,19 +288,21 @@ TEST_CASE("Parallel test") {
 //! Testing blocked_nd_range with proportional splitting
 //! \brief \ref interface \ref requirement
 TEST_CASE("blocked_nd_range proportional splitting") {
-    oneapi::tbb::blocked_nd_range<int, 2> original{{0, 100}, {0, 100}};
+    oneapi::tbb::blocked_nd_range<int, 2> original {{0, 100}, {0, 100}};
     oneapi::tbb::blocked_nd_range<int, 2> first(original);
     oneapi::tbb::proportional_split ps(3, 1);
     oneapi::tbb::blocked_nd_range<int, 2> second(first, ps);
 
-    int expected_first_end = static_cast<int>(
-        original.dim(0).begin() + ps.left() * (original.dim(0).end() - original.dim(0).begin()) / (ps.left() + ps.right())
-    );
+    int expected_first_end = static_cast<int>(original.dim(0).begin()
+                                              + ps.left() * (original.dim(0).end() - original.dim(0).begin())
+                                                        / (ps.left() + ps.right()));
     if (first.dim(0).size() == second.dim(0).size()) {
         // Splitting was made by cols
-        utils::check_range_bounds_after_splitting(original.dim(1), first.dim(1), second.dim(1), expected_first_end);
+        utils::check_range_bounds_after_splitting(original.dim(1), first.dim(1), second.dim(1),
+                                                  expected_first_end);
     } else {
         // Splitting was made by rows
-        utils::check_range_bounds_after_splitting(original.dim(0), first.dim(0), second.dim(0), expected_first_end);
+        utils::check_range_bounds_after_splitting(original.dim(0), first.dim(0), second.dim(0),
+                                                  expected_first_end);
     }
 }
diff --git a/external/tbb/test/conformance/conformance_blocked_range.cpp b/external/tbb/test/conformance/conformance_blocked_range.cpp
index b4afe06e..16bd918a 100644
--- a/external/tbb/test/conformance/conformance_blocked_range.cpp
+++ b/external/tbb/test/conformance/conformance_blocked_range.cpp
@@ -20,8 +20,8 @@
 #include "common/utils_concurrency_limit.h"
 
 #include "oneapi/tbb/blocked_range.h"
-#include "oneapi/tbb/parallel_for.h"
 #include "oneapi/tbb/global_control.h"
+#include "oneapi/tbb/parallel_for.h"
 
 #include <vector>
 
@@ -31,55 +31,57 @@
 class AbstractValueType {
     AbstractValueType() {}
     int value;
+
 public:
-    friend AbstractValueType MakeAbstractValueType( int i );
-    friend int GetValueOf( const AbstractValueType& v ) {return v.value;}
+    friend AbstractValueType MakeAbstractValueType(int i);
+    friend int GetValueOf(const AbstractValueType& v) { return v.value; }
 };
 
-AbstractValueType MakeAbstractValueType( int i ) {
+AbstractValueType MakeAbstractValueType(int i) {
     AbstractValueType x;
     x.value = i;
     return x;
 }
 
-std::size_t operator-( const AbstractValueType& u, const AbstractValueType& v ) {
+std::size_t operator-(const AbstractValueType& u, const AbstractValueType& v) {
     return GetValueOf(u) - GetValueOf(v);
 }
 
-bool operator<( const AbstractValueType& u, const AbstractValueType& v ) {
+bool operator<(const AbstractValueType& u, const AbstractValueType& v) {
     return GetValueOf(u) < GetValueOf(v);
 }
 
-AbstractValueType operator+( const AbstractValueType& u, std::size_t offset ) {
+AbstractValueType operator+(const AbstractValueType& u, std::size_t offset) {
     return MakeAbstractValueType(GetValueOf(u) + int(offset));
 }
 
 static void SerialTest() {
-    for( int x=-10; x<10; ++x ) {
-        for( int y=-10; y<10; ++y ) {
+    for (int x = -10; x < 10; ++x) {
+        for (int y = -10; y < 10; ++y) {
             AbstractValueType i = MakeAbstractValueType(x);
             AbstractValueType j = MakeAbstractValueType(y);
-            for( std::size_t k=1; k<10; ++k ) {
+            for (std::size_t k = 1; k < 10; ++k) {
                 typedef oneapi::tbb::blocked_range<AbstractValueType> range_type;
-                range_type r( i, j, k );
-                utils::AssertSameType( r.empty(), true );
-                utils::AssertSameType( range_type::size_type(), std::size_t() );
-                utils::AssertSameType( static_cast<range_type::const_iterator*>(nullptr), static_cast<AbstractValueType*>(nullptr) );
-                utils::AssertSameType( r.begin(), MakeAbstractValueType(0) );
-                utils::AssertSameType( r.end(), MakeAbstractValueType(0) );
-                CHECK( r.empty()==(y<=x));
-                CHECK( r.grainsize()==k);
-                if( x<=y ) {
-                    utils::AssertSameType( r.is_divisible(), true );
-                    CHECK( r.is_divisible()==(std::size_t(y-x)>k) );
-                    CHECK( r.size()==std::size_t(y-x) );
-                    if( r.is_divisible() ) {
-                        oneapi::tbb::blocked_range<AbstractValueType> r2(r,oneapi::tbb::split());
-                        CHECK( GetValueOf(r.begin())==x );
-                        CHECK( GetValueOf(r.end())==GetValueOf(r2.begin()) );
-                        CHECK( GetValueOf(r2.end())==y );
-                        CHECK( r.grainsize()==k );
-                        CHECK( r2.grainsize()==k );
+                range_type r(i, j, k);
+                utils::AssertSameType(r.empty(), true);
+                utils::AssertSameType(range_type::size_type(), std::size_t());
+                utils::AssertSameType(static_cast<range_type::const_iterator*>(nullptr),
+                                      static_cast<AbstractValueType*>(nullptr));
+                utils::AssertSameType(r.begin(), MakeAbstractValueType(0));
+                utils::AssertSameType(r.end(), MakeAbstractValueType(0));
+                CHECK(r.empty() == (y <= x));
+                CHECK(r.grainsize() == k);
+                if (x <= y) {
+                    utils::AssertSameType(r.is_divisible(), true);
+                    CHECK(r.is_divisible() == (std::size_t(y - x) > k));
+                    CHECK(r.size() == std::size_t(y - x));
+                    if (r.is_divisible()) {
+                        oneapi::tbb::blocked_range<AbstractValueType> r2(r, oneapi::tbb::split());
+                        CHECK(GetValueOf(r.begin()) == x);
+                        CHECK(GetValueOf(r.end()) == GetValueOf(r2.begin()));
+                        CHECK(GetValueOf(r2.end()) == y);
+                        CHECK(r.grainsize() == k);
+                        CHECK(r2.grainsize() == k);
                     }
                 }
             }
@@ -87,22 +89,21 @@ static void SerialTest() {
     }
 }
 
-const int N = 1<<22;
+const int N = 1 << 22;
 unsigned char Array[N];
 
 struct Striker {
-    void operator()( const oneapi::tbb::blocked_range<int>& r ) const {
-        for( oneapi::tbb::blocked_range<int>::const_iterator i=r.begin(); i!=r.end(); ++i )
-            ++Array[i];
+    void operator()(const oneapi::tbb::blocked_range<int>& r) const {
+        for (oneapi::tbb::blocked_range<int>::const_iterator i = r.begin(); i != r.end(); ++i) ++Array[i];
     }
 };
 
 void ParallelTest() {
-    for (int i=0; i<N; i=i<3 ? i+1 : i*3) {
-        const oneapi::tbb::blocked_range<int> r( 0, i, 10 );
-        oneapi::tbb::parallel_for( r, Striker() );
-        for (int k=0; k<N; ++k) {
-            if (Array[k] != (k<i)) CHECK(false);
+    for (int i = 0; i < N; i = i < 3 ? i + 1 : i * 3) {
+        const oneapi::tbb::blocked_range<int> r(0, i, 10);
+        oneapi::tbb::parallel_for(r, Striker());
+        for (int k = 0; k < N; ++k) {
+            if (Array[k] != (k < i)) CHECK(false);
             Array[k] = 0;
         }
     }
@@ -110,15 +111,14 @@ void ParallelTest() {
 
 //! Testing blocked_range interface
 //! \brief \ref interface \ref requirement
-TEST_CASE("Basic serial") {
-    SerialTest();
-}
+TEST_CASE("Basic serial") { SerialTest(); }
 
 //! Testing blocked_range interface with parallel_for
 //! \brief \ref requirement
 TEST_CASE("Basic parallel") {
-    for ( auto concurrency_level : utils::concurrency_range() ) {
-        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism, concurrency_level);
+    for (auto concurrency_level : utils::concurrency_range()) {
+        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism,
+                                            concurrency_level);
         ParallelTest();
     }
 }
@@ -138,10 +138,8 @@ TEST_CASE("blocked_range proportional splitting") {
     CHECK(copy.size() == original.size() / 2);
     CHECK(splitted_copy.size() == copy.size());
 
-
     int expected_first_end = static_cast<int>(
-        original.begin() + ps.left() * (original.end() - original.begin()) / (ps.left() + ps.right())
-    );
+            original.begin() + ps.left() * (original.end() - original.begin()) / (ps.left() + ps.right()));
     utils::check_range_bounds_after_splitting(original, first, second, expected_first_end);
 }
 
@@ -149,7 +147,7 @@ TEST_CASE("blocked_range proportional splitting") {
 //! Testing blocked_range deduction guides
 //! \brief \ref interface
 TEST_CASE("Deduction guides") {
-    std::vector<const int *> v;
+    std::vector<const int*> v;
 
     // check blocked_range(Value, Value, size_t)
     oneapi::tbb::blocked_range r1(v.begin(), v.end());
@@ -164,4 +162,3 @@ TEST_CASE("Deduction guides") {
     static_assert(std::is_same<decltype(r3), decltype(r1)>::value);
 }
 #endif
-
diff --git a/external/tbb/test/conformance/conformance_blocked_range2d.cpp b/external/tbb/test/conformance/conformance_blocked_range2d.cpp
index 31636968..1137f755 100644
--- a/external/tbb/test/conformance/conformance_blocked_range2d.cpp
+++ b/external/tbb/test/conformance/conformance_blocked_range2d.cpp
@@ -20,47 +20,50 @@
 #include "common/utils_concurrency_limit.h"
 
 #include "oneapi/tbb/blocked_range2d.h"
-#include "oneapi/tbb/parallel_for.h"
 #include "oneapi/tbb/global_control.h"
+#include "oneapi/tbb/parallel_for.h"
 
 //! \file conformance_blocked_range2d.cpp
 //! \brief Test for [algorithms.blocked_range2d] specification
 
-template<typename Tag>
+template <typename Tag>
 class AbstractValueType {
     AbstractValueType() {}
     int value;
+
 public:
-    template<typename OtherTag>
-    friend AbstractValueType<OtherTag> MakeAbstractValueType( int i );
+    template <typename OtherTag>
+    friend AbstractValueType<OtherTag> MakeAbstractValueType(int i);
 
-    template<typename OtherTag>
-    friend int GetValueOf( const AbstractValueType<OtherTag>& v ) ;
+    template <typename OtherTag>
+    friend int GetValueOf(const AbstractValueType<OtherTag>& v);
 };
 
-template<typename Tag>
-AbstractValueType<Tag> MakeAbstractValueType( int i ) {
+template <typename Tag>
+AbstractValueType<Tag> MakeAbstractValueType(int i) {
     AbstractValueType<Tag> x;
     x.value = i;
     return x;
 }
 
-template<typename Tag>
-int GetValueOf( const AbstractValueType<Tag>& v ) {return v.value;}
+template <typename Tag>
+int GetValueOf(const AbstractValueType<Tag>& v) {
+    return v.value;
+}
 
-template<typename Tag>
-bool operator<( const AbstractValueType<Tag>& u, const AbstractValueType<Tag>& v ) {
-    return GetValueOf(u)<GetValueOf(v);
+template <typename Tag>
+bool operator<(const AbstractValueType<Tag>& u, const AbstractValueType<Tag>& v) {
+    return GetValueOf(u) < GetValueOf(v);
 }
 
-template<typename Tag>
-std::size_t operator-( const AbstractValueType<Tag>& u, const AbstractValueType<Tag>& v ) {
-    return GetValueOf(u)-GetValueOf(v);
+template <typename Tag>
+std::size_t operator-(const AbstractValueType<Tag>& u, const AbstractValueType<Tag>& v) {
+    return GetValueOf(u) - GetValueOf(v);
 }
 
-template<typename Tag>
-AbstractValueType<Tag> operator+( const AbstractValueType<Tag>& u, std::size_t offset ) {
-    return MakeAbstractValueType<Tag>(GetValueOf(u)+int(offset));
+template <typename Tag>
+AbstractValueType<Tag> operator+(const AbstractValueType<Tag>& u, std::size_t offset) {
+    return MakeAbstractValueType<Tag>(GetValueOf(u) + int(offset));
 }
 
 struct RowTag {};
@@ -69,34 +72,41 @@ struct ColTag {};
 static void SerialTest() {
     typedef AbstractValueType<RowTag> row_type;
     typedef AbstractValueType<ColTag> col_type;
-    typedef oneapi::tbb::blocked_range2d<row_type,col_type> range_type;
-    for( int row_x=-10; row_x<10; ++row_x ) {
-        for( int row_y=row_x; row_y<10; ++row_y ) {
+    typedef oneapi::tbb::blocked_range2d<row_type, col_type> range_type;
+    for (int row_x = -10; row_x < 10; ++row_x) {
+        for (int row_y = row_x; row_y < 10; ++row_y) {
             row_type row_i = MakeAbstractValueType<RowTag>(row_x);
             row_type row_j = MakeAbstractValueType<RowTag>(row_y);
-            for( int row_grain=1; row_grain<10; ++row_grain ) {
-                for( int col_x=-10; col_x<10; ++col_x ) {
-                    for( int col_y=col_x; col_y<10; ++col_y ) {
+            for (int row_grain = 1; row_grain < 10; ++row_grain) {
+                for (int col_x = -10; col_x < 10; ++col_x) {
+                    for (int col_y = col_x; col_y < 10; ++col_y) {
                         col_type col_i = MakeAbstractValueType<ColTag>(col_x);
                         col_type col_j = MakeAbstractValueType<ColTag>(col_y);
-                        for( int col_grain=1; col_grain<10; ++col_grain ) {
-                            range_type r( row_i, row_j, row_grain, col_i, col_j, col_grain );
-                            utils::AssertSameType( r.is_divisible(), true );
-                            utils::AssertSameType( r.empty(), true );
-                            utils::AssertSameType( static_cast<range_type::row_range_type::const_iterator*>(nullptr), static_cast<row_type*>(nullptr) );
-                            utils::AssertSameType( static_cast<range_type::col_range_type::const_iterator*>(nullptr), static_cast<col_type*>(nullptr) );
-                            utils::AssertSameType( r.rows(), oneapi::tbb::blocked_range<row_type>( row_i, row_j, 1 ));
-                            utils::AssertSameType( r.cols(), oneapi::tbb::blocked_range<col_type>( col_i, col_j, 1 ));
-                            REQUIRE( r.empty()==(row_x==row_y||col_x==col_y) );
-                            REQUIRE( r.is_divisible()==(row_y-row_x>row_grain||col_y-col_x>col_grain) );
-                            if( r.is_divisible() ) {
-                                range_type r2(r,oneapi::tbb::split());
-                                if( GetValueOf(r2.rows().begin())==GetValueOf(r.rows().begin()) ) {
-                                    REQUIRE( GetValueOf(r2.rows().end())==GetValueOf(r.rows().end()) );
-                                    REQUIRE( GetValueOf(r2.cols().begin())==GetValueOf(r.cols().end()) );
+                        for (int col_grain = 1; col_grain < 10; ++col_grain) {
+                            range_type r(row_i, row_j, row_grain, col_i, col_j, col_grain);
+                            utils::AssertSameType(r.is_divisible(), true);
+                            utils::AssertSameType(r.empty(), true);
+                            utils::AssertSameType(
+                                    static_cast<range_type::row_range_type::const_iterator*>(nullptr),
+                                    static_cast<row_type*>(nullptr));
+                            utils::AssertSameType(
+                                    static_cast<range_type::col_range_type::const_iterator*>(nullptr),
+                                    static_cast<col_type*>(nullptr));
+                            utils::AssertSameType(r.rows(),
+                                                  oneapi::tbb::blocked_range<row_type>(row_i, row_j, 1));
+                            utils::AssertSameType(r.cols(),
+                                                  oneapi::tbb::blocked_range<col_type>(col_i, col_j, 1));
+                            REQUIRE(r.empty() == (row_x == row_y || col_x == col_y));
+                            REQUIRE(r.is_divisible()
+                                    == (row_y - row_x > row_grain || col_y - col_x > col_grain));
+                            if (r.is_divisible()) {
+                                range_type r2(r, oneapi::tbb::split());
+                                if (GetValueOf(r2.rows().begin()) == GetValueOf(r.rows().begin())) {
+                                    REQUIRE(GetValueOf(r2.rows().end()) == GetValueOf(r.rows().end()));
+                                    REQUIRE(GetValueOf(r2.cols().begin()) == GetValueOf(r.cols().end()));
                                 } else {
-                                    REQUIRE( GetValueOf(r2.cols().end())==GetValueOf(r.cols().end()) );
-                                    REQUIRE( GetValueOf(r2.rows().begin())==GetValueOf(r.rows().end()) );
+                                    REQUIRE(GetValueOf(r2.cols().end()) == GetValueOf(r.cols().end()));
+                                    REQUIRE(GetValueOf(r2.rows().begin()) == GetValueOf(r.rows().end()));
                                 }
                             }
                         }
@@ -107,27 +117,28 @@ static void SerialTest() {
     }
 }
 
-const int N = 1<<10;
+const int N = 1 << 10;
 
 unsigned char Array[N][N];
 
 struct Striker {
-   // Note: we use <int> here instead of <long> in order to test for problems similar to Quad 407676
-    void operator()( const oneapi::tbb::blocked_range2d<int>& r ) const {
-        for( oneapi::tbb::blocked_range<int>::const_iterator i=r.rows().begin(); i!=r.rows().end(); ++i )
-            for( oneapi::tbb::blocked_range<int>::const_iterator j=r.cols().begin(); j!=r.cols().end(); ++j )
+    // Note: we use <int> here instead of <long> in order to test for problems similar to Quad 407676
+    void operator()(const oneapi::tbb::blocked_range2d<int>& r) const {
+        for (oneapi::tbb::blocked_range<int>::const_iterator i = r.rows().begin(); i != r.rows().end(); ++i)
+            for (oneapi::tbb::blocked_range<int>::const_iterator j = r.cols().begin(); j != r.cols().end();
+                 ++j)
                 ++Array[i][j];
     }
 };
 
 void ParallelTest() {
-    for( int i=0; i<N; i=i<3 ? i+1 : i*3 ) {
-        for( int j=0; j<N; j=j<3 ? j+1 : j*3 ) {
-            const oneapi::tbb::blocked_range2d<int> r( 0, i, 7, 0, j, 5 );
-            oneapi::tbb::parallel_for( r, Striker() );
-            for( int k=0; k<N; ++k ) {
-                for( int l=0; l<N; ++l ) {
-                    if( Array[k][l] != (k<i && l<j) ) REQUIRE(false);
+    for (int i = 0; i < N; i = i < 3 ? i + 1 : i * 3) {
+        for (int j = 0; j < N; j = j < 3 ? j + 1 : j * 3) {
+            const oneapi::tbb::blocked_range2d<int> r(0, i, 7, 0, j, 5);
+            oneapi::tbb::parallel_for(r, Striker());
+            for (int k = 0; k < N; ++k) {
+                for (int l = 0; l < N; ++l) {
+                    if (Array[k][l] != (k < i && l < j)) REQUIRE(false);
                     Array[k][l] = 0;
                 }
             }
@@ -137,15 +148,14 @@ void ParallelTest() {
 
 //! Testing blocked_range2d interface
 //! \brief \ref interface \ref requirement
-TEST_CASE("Serial test") {
-    SerialTest();
-}
+TEST_CASE("Serial test") { SerialTest(); }
 
 //! Testing blocked_range2d interface with parallel_for
 //! \brief \ref requirement
 TEST_CASE("Parallel test") {
-    for ( auto concurrency_level : utils::concurrency_range() ) {
-        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism, concurrency_level);
+    for (auto concurrency_level : utils::concurrency_range()) {
+        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism,
+                                            concurrency_level);
         ParallelTest();
     }
 }
@@ -158,15 +168,17 @@ TEST_CASE("blocked_range2d proportional splitting") {
     oneapi::tbb::proportional_split ps(3, 1);
     oneapi::tbb::blocked_range2d<int> second(first, ps);
 
-    int expected_first_end = static_cast<int>(
-        original.rows().begin() + ps.left() * (original.rows().end() - original.rows().begin()) / (ps.left() + ps.right())
-    );
+    int expected_first_end = static_cast<int>(original.rows().begin()
+                                              + ps.left() * (original.rows().end() - original.rows().begin())
+                                                        / (ps.left() + ps.right()));
     if (first.rows().size() == second.rows().size()) {
         // Splitting was made by cols
-        utils::check_range_bounds_after_splitting(original.cols(), first.cols(), second.cols(), expected_first_end);
+        utils::check_range_bounds_after_splitting(original.cols(), first.cols(), second.cols(),
+                                                  expected_first_end);
     } else {
         // Splitting was made by rows
-        utils::check_range_bounds_after_splitting(original.rows(), first.rows(), second.rows(), expected_first_end);
+        utils::check_range_bounds_after_splitting(original.rows(), first.rows(), second.rows(),
+                                                  expected_first_end);
     }
 }
 
@@ -174,12 +186,14 @@ TEST_CASE("blocked_range2d proportional splitting") {
 //! Testing blocked_range2d deduction guides
 //! \brief \ref interface
 TEST_CASE("Deduction guides") {
-    std::vector<const unsigned long *> v;
+    std::vector<const unsigned long*> v;
     std::vector<double> v2;
 
     // check blocked_range2d(RowValue, RowValue, size_t, ColValue, ColValue, size_t)
     oneapi::tbb::blocked_range2d r1(v.begin(), v.end(), 2, v2.begin(), v2.end(), 2);
-    static_assert(std::is_same<decltype(r1), oneapi::tbb::blocked_range2d<decltype(v)::iterator, decltype(v2)::iterator>>::value);
+    static_assert(
+            std::is_same<decltype(r1),
+                         oneapi::tbb::blocked_range2d<decltype(v)::iterator, decltype(v2)::iterator>>::value);
 
     // check blocked_range2d(blocked_range2d &)
     oneapi::tbb::blocked_range2d r2(r1);
@@ -190,4 +204,3 @@ TEST_CASE("Deduction guides") {
     static_assert(std::is_same<decltype(r3), decltype(r1)>::value);
 }
 #endif
-
diff --git a/external/tbb/test/conformance/conformance_blocked_range3d.cpp b/external/tbb/test/conformance/conformance_blocked_range3d.cpp
index b5888a10..7f935086 100644
--- a/external/tbb/test/conformance/conformance_blocked_range3d.cpp
+++ b/external/tbb/test/conformance/conformance_blocked_range3d.cpp
@@ -20,49 +20,52 @@
 #include "common/utils_concurrency_limit.h"
 
 #include "oneapi/tbb/blocked_range3d.h"
-#include "oneapi/tbb/parallel_for.h"
 #include "oneapi/tbb/global_control.h"
+#include "oneapi/tbb/parallel_for.h"
 
 #include <vector>
 
 //! \file conformance_blocked_range3d.cpp
 //! \brief Test for [algorithms.blocked_range3d] specification
 
-template<typename Tag>
+template <typename Tag>
 class AbstractValueType {
     AbstractValueType() {}
     int value;
+
 public:
-    template<typename OtherTag>
-    friend AbstractValueType<OtherTag> MakeAbstractValueType( int i );
+    template <typename OtherTag>
+    friend AbstractValueType<OtherTag> MakeAbstractValueType(int i);
 
-    template<typename OtherTag>
-    friend int GetValueOf( const AbstractValueType<OtherTag>& v ) ;
+    template <typename OtherTag>
+    friend int GetValueOf(const AbstractValueType<OtherTag>& v);
 };
 
-template<typename Tag>
-AbstractValueType<Tag> MakeAbstractValueType( int i ) {
+template <typename Tag>
+AbstractValueType<Tag> MakeAbstractValueType(int i) {
     AbstractValueType<Tag> x;
     x.value = i;
     return x;
 }
 
-template<typename Tag>
-int GetValueOf( const AbstractValueType<Tag>& v ) {return v.value;}
+template <typename Tag>
+int GetValueOf(const AbstractValueType<Tag>& v) {
+    return v.value;
+}
 
-template<typename Tag>
-bool operator<( const AbstractValueType<Tag>& u, const AbstractValueType<Tag>& v ) {
-    return GetValueOf(u)<GetValueOf(v);
+template <typename Tag>
+bool operator<(const AbstractValueType<Tag>& u, const AbstractValueType<Tag>& v) {
+    return GetValueOf(u) < GetValueOf(v);
 }
 
-template<typename Tag>
-std::size_t operator-( const AbstractValueType<Tag>& u, const AbstractValueType<Tag>& v ) {
-    return GetValueOf(u)-GetValueOf(v);
+template <typename Tag>
+std::size_t operator-(const AbstractValueType<Tag>& u, const AbstractValueType<Tag>& v) {
+    return GetValueOf(u) - GetValueOf(v);
 }
 
-template<typename Tag>
-AbstractValueType<Tag> operator+( const AbstractValueType<Tag>& u, std::size_t offset ) {
-    return MakeAbstractValueType<Tag>(GetValueOf(u)+int(offset));
+template <typename Tag>
+AbstractValueType<Tag> operator+(const AbstractValueType<Tag>& u, std::size_t offset) {
+    return MakeAbstractValueType<Tag>(GetValueOf(u) + int(offset));
 }
 
 struct PageTag {};
@@ -73,54 +76,86 @@ static void SerialTest() {
     typedef AbstractValueType<PageTag> page_type;
     typedef AbstractValueType<RowTag> row_type;
     typedef AbstractValueType<ColTag> col_type;
-    typedef oneapi::tbb::blocked_range3d<page_type,row_type,col_type> range_type;
-    for( int page_x=-4; page_x<4; ++page_x ) {
-        for( int page_y=page_x; page_y<4; ++page_y ) {
+    typedef oneapi::tbb::blocked_range3d<page_type, row_type, col_type> range_type;
+    for (int page_x = -4; page_x < 4; ++page_x) {
+        for (int page_y = page_x; page_y < 4; ++page_y) {
             page_type page_i = MakeAbstractValueType<PageTag>(page_x);
             page_type page_j = MakeAbstractValueType<PageTag>(page_y);
-            for( int page_grain=1; page_grain<4; ++page_grain ) {
-                for( int row_x=-4; row_x<4; ++row_x ) {
-                    for( int row_y=row_x; row_y<4; ++row_y ) {
+            for (int page_grain = 1; page_grain < 4; ++page_grain) {
+                for (int row_x = -4; row_x < 4; ++row_x) {
+                    for (int row_y = row_x; row_y < 4; ++row_y) {
                         row_type row_i = MakeAbstractValueType<RowTag>(row_x);
                         row_type row_j = MakeAbstractValueType<RowTag>(row_y);
-                        for( int row_grain=1; row_grain<4; ++row_grain ) {
-                            for( int col_x=-4; col_x<4; ++col_x ) {
-                                for( int col_y=col_x; col_y<4; ++col_y ) {
+                        for (int row_grain = 1; row_grain < 4; ++row_grain) {
+                            for (int col_x = -4; col_x < 4; ++col_x) {
+                                for (int col_y = col_x; col_y < 4; ++col_y) {
                                     col_type col_i = MakeAbstractValueType<ColTag>(col_x);
                                     col_type col_j = MakeAbstractValueType<ColTag>(col_y);
-                                    for( int col_grain=1; col_grain<4; ++col_grain ) {
-                                        range_type r( page_i, page_j, page_grain, row_i, row_j, row_grain, col_i, col_j, col_grain );
-                                        utils::AssertSameType( r.is_divisible(), true );
-
-                                        utils::AssertSameType( r.empty(), true );
-
-                                        utils::AssertSameType( static_cast<range_type::page_range_type::const_iterator*>(nullptr), static_cast<page_type*>(nullptr) );
-                                        utils::AssertSameType( static_cast<range_type::row_range_type::const_iterator*>(nullptr), static_cast<row_type*>(nullptr) );
-                                        utils::AssertSameType( static_cast<range_type::col_range_type::const_iterator*>(nullptr), static_cast<col_type*>(nullptr) );
-
-                                        utils::AssertSameType( r.pages(), oneapi::tbb::blocked_range<page_type>( page_i, page_j, 1 ));
-                                        utils::AssertSameType( r.rows(), oneapi::tbb::blocked_range<row_type>( row_i, row_j, 1 ));
-                                        utils::AssertSameType( r.cols(), oneapi::tbb::blocked_range<col_type>( col_i, col_j, 1 ));
-
-                                        REQUIRE( r.empty()==(page_x==page_y||row_x==row_y||col_x==col_y) );
-
-                                        REQUIRE( r.is_divisible()==(page_y-page_x>page_grain||row_y-row_x>row_grain||col_y-col_x>col_grain) );
-
-                                        if( r.is_divisible() ) {
-                                            range_type r2(r,oneapi::tbb::split());
-                                            if( (GetValueOf(r2.pages().begin())==GetValueOf(r.pages().begin())) && (GetValueOf(r2.rows().begin())==GetValueOf(r.rows().begin())) ) {
-                                                REQUIRE( GetValueOf(r2.pages().end())==GetValueOf(r.pages().end()) );
-                                                REQUIRE( GetValueOf(r2.rows().end())==GetValueOf(r.rows().end()) );
-                                                REQUIRE( GetValueOf(r2.cols().begin())==GetValueOf(r.cols().end()) );
+                                    for (int col_grain = 1; col_grain < 4; ++col_grain) {
+                                        range_type r(page_i, page_j, page_grain, row_i, row_j, row_grain,
+                                                     col_i, col_j, col_grain);
+                                        utils::AssertSameType(r.is_divisible(), true);
+
+                                        utils::AssertSameType(r.empty(), true);
+
+                                        utils::AssertSameType(
+                                                static_cast<range_type::page_range_type::const_iterator*>(
+                                                        nullptr),
+                                                static_cast<page_type*>(nullptr));
+                                        utils::AssertSameType(
+                                                static_cast<range_type::row_range_type::const_iterator*>(
+                                                        nullptr),
+                                                static_cast<row_type*>(nullptr));
+                                        utils::AssertSameType(
+                                                static_cast<range_type::col_range_type::const_iterator*>(
+                                                        nullptr),
+                                                static_cast<col_type*>(nullptr));
+
+                                        utils::AssertSameType(
+                                                r.pages(),
+                                                oneapi::tbb::blocked_range<page_type>(page_i, page_j, 1));
+                                        utils::AssertSameType(r.rows(), oneapi::tbb::blocked_range<row_type>(
+                                                                                row_i, row_j, 1));
+                                        utils::AssertSameType(r.cols(), oneapi::tbb::blocked_range<col_type>(
+                                                                                col_i, col_j, 1));
+
+                                        REQUIRE(r.empty()
+                                                == (page_x == page_y || row_x == row_y || col_x == col_y));
+
+                                        REQUIRE(r.is_divisible()
+                                                == (page_y - page_x > page_grain || row_y - row_x > row_grain
+                                                    || col_y - col_x > col_grain));
+
+                                        if (r.is_divisible()) {
+                                            range_type r2(r, oneapi::tbb::split());
+                                            if ((GetValueOf(r2.pages().begin())
+                                                 == GetValueOf(r.pages().begin()))
+                                                && (GetValueOf(r2.rows().begin())
+                                                    == GetValueOf(r.rows().begin()))) {
+                                                REQUIRE(GetValueOf(r2.pages().end())
+                                                        == GetValueOf(r.pages().end()));
+                                                REQUIRE(GetValueOf(r2.rows().end())
+                                                        == GetValueOf(r.rows().end()));
+                                                REQUIRE(GetValueOf(r2.cols().begin())
+                                                        == GetValueOf(r.cols().end()));
                                             } else {
-                                                if ( (GetValueOf(r2.pages().begin())==GetValueOf(r.pages().begin())) && (GetValueOf(r2.cols().begin())==GetValueOf(r.cols().begin())) ) {
-                                                    REQUIRE( GetValueOf(r2.pages().end())==GetValueOf(r.pages().end()) );
-                                                    REQUIRE( GetValueOf(r2.cols().end())==GetValueOf(r.cols().end()) );
-                                                    REQUIRE( GetValueOf(r2.rows().begin())==GetValueOf(r.rows().end()) );
+                                                if ((GetValueOf(r2.pages().begin())
+                                                     == GetValueOf(r.pages().begin()))
+                                                    && (GetValueOf(r2.cols().begin())
+                                                        == GetValueOf(r.cols().begin()))) {
+                                                    REQUIRE(GetValueOf(r2.pages().end())
+                                                            == GetValueOf(r.pages().end()));
+                                                    REQUIRE(GetValueOf(r2.cols().end())
+                                                            == GetValueOf(r.cols().end()));
+                                                    REQUIRE(GetValueOf(r2.rows().begin())
+                                                            == GetValueOf(r.rows().end()));
                                                 } else {
-                                                    REQUIRE( GetValueOf(r2.rows().end())==GetValueOf(r.rows().end()) );
-                                                    REQUIRE( GetValueOf(r2.cols().end())==GetValueOf(r.cols().end()) );
-                                                    REQUIRE( GetValueOf(r2.pages().begin())==GetValueOf(r.pages().end()) );
+                                                    REQUIRE(GetValueOf(r2.rows().end())
+                                                            == GetValueOf(r.rows().end()));
+                                                    REQUIRE(GetValueOf(r2.cols().end())
+                                                            == GetValueOf(r.cols().end()));
+                                                    REQUIRE(GetValueOf(r2.pages().begin())
+                                                            == GetValueOf(r.pages().end()));
                                                 }
                                             }
                                         }
@@ -135,31 +170,33 @@ static void SerialTest() {
     }
 }
 
-const int N = 1<<5;
+const int N = 1 << 5;
 
 unsigned char Array[N][N][N];
 
 struct Striker {
-   // Note: we use <int> here instead of <long> in order to test for problems similar to Quad 407676
-    void operator()( const oneapi::tbb::blocked_range3d<int>& r ) const {
-        for( oneapi::tbb::blocked_range<int>::const_iterator i=r.pages().begin(); i!=r.pages().end(); ++i )
-            for( oneapi::tbb::blocked_range<int>::const_iterator j=r.rows().begin(); j!=r.rows().end(); ++j )
-                for( oneapi::tbb::blocked_range<int>::const_iterator k=r.cols().begin(); k!=r.cols().end(); ++k )
+    // Note: we use <int> here instead of <long> in order to test for problems similar to Quad 407676
+    void operator()(const oneapi::tbb::blocked_range3d<int>& r) const {
+        for (oneapi::tbb::blocked_range<int>::const_iterator i = r.pages().begin(); i != r.pages().end(); ++i)
+            for (oneapi::tbb::blocked_range<int>::const_iterator j = r.rows().begin(); j != r.rows().end();
+                 ++j)
+                for (oneapi::tbb::blocked_range<int>::const_iterator k = r.cols().begin();
+                     k != r.cols().end(); ++k)
                     ++Array[i][j][k];
     }
 };
 
 void ParallelTest() {
-    for( int i=0; i<N; i=i<3 ? i+1 : i*3 ) {
-        for( int j=0; j<N; j=j<3 ? j+1 : j*3 ) {
-            for( int k=0; k<N; k=k<3 ? k+1 : k*3 ) {
-                const oneapi::tbb::blocked_range3d<int> r( 0, i, 5, 0, j, 3, 0, k, 1 );
-                oneapi::tbb::parallel_for( r, Striker() );
-                for( int l=0; l<N; ++l ) {
-                    for( int m=0; m<N; ++m ) {
-                        for( int n=0; n<N; ++n ) {
-                             if( Array[l][m][n] != (l<i && m<j && n<k) ) REQUIRE(false);
-                             Array[l][m][n] = 0;
+    for (int i = 0; i < N; i = i < 3 ? i + 1 : i * 3) {
+        for (int j = 0; j < N; j = j < 3 ? j + 1 : j * 3) {
+            for (int k = 0; k < N; k = k < 3 ? k + 1 : k * 3) {
+                const oneapi::tbb::blocked_range3d<int> r(0, i, 5, 0, j, 3, 0, k, 1);
+                oneapi::tbb::parallel_for(r, Striker());
+                for (int l = 0; l < N; ++l) {
+                    for (int m = 0; m < N; ++m) {
+                        for (int n = 0; n < N; ++n) {
+                            if (Array[l][m][n] != (l < i && m < j && n < k)) REQUIRE(false);
+                            Array[l][m][n] = 0;
                         }
                     }
                 }
@@ -170,15 +207,14 @@ void ParallelTest() {
 
 //! Testing blocked_range3d interface
 //! \brief \ref interface \ref requirement
-TEST_CASE("Serial test") {
-    SerialTest();
-}
+TEST_CASE("Serial test") { SerialTest(); }
 
 //! Testing blocked_range3d interface with parallel_for
 //! \brief \ref requirement
 TEST_CASE("Parallel test") {
-    for ( auto concurrency_level : utils::concurrency_range() ) {
-        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism, concurrency_level);
+    for (auto concurrency_level : utils::concurrency_range()) {
+        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism,
+                                            concurrency_level);
         ParallelTest();
     }
 }
@@ -191,20 +227,23 @@ TEST_CASE("blocked_range3d proportional splitting") {
     oneapi::tbb::proportional_split ps(3, 1);
     oneapi::tbb::blocked_range3d<int> second(first, ps);
 
-    int expected_first_end = static_cast<int>(
-        original.rows().begin() + ps.left() * (original.rows().end() - original.rows().begin()) / (ps.left() + ps.right())
-    );
+    int expected_first_end = static_cast<int>(original.rows().begin()
+                                              + ps.left() * (original.rows().end() - original.rows().begin())
+                                                        / (ps.left() + ps.right()));
     if (first.rows().size() == second.rows().size()) {
         if (first.cols().size() == second.cols().size()) {
             // Splitting was made by pages
-            utils::check_range_bounds_after_splitting(original.pages(), first.pages(), second.pages(), expected_first_end);
+            utils::check_range_bounds_after_splitting(original.pages(), first.pages(), second.pages(),
+                                                      expected_first_end);
         } else {
             // Splitting was made by cols
-            utils::check_range_bounds_after_splitting(original.cols(), first.cols(), second.cols(), expected_first_end);
+            utils::check_range_bounds_after_splitting(original.cols(), first.cols(), second.cols(),
+                                                      expected_first_end);
         }
     } else {
         // Splitting was made by rows
-        utils::check_range_bounds_after_splitting(original.rows(), first.rows(), second.rows(), expected_first_end);
+        utils::check_range_bounds_after_splitting(original.rows(), first.rows(), second.rows(),
+                                                  expected_first_end);
     }
 }
 
@@ -212,14 +251,15 @@ TEST_CASE("blocked_range3d proportional splitting") {
 //! Testing blocked_range3d deduction guides
 //! \brief \ref interface
 TEST_CASE("Deduction guides") {
-    std::vector<const unsigned long *> v;
+    std::vector<const unsigned long*> v;
     std::vector<double> v2;
     std::vector<std::vector<int>> v3;
 
     // check blocked_range2d(PageValue, PageValue, size_t, RowValue, RowValue, size_t, ColValue, ColValue, size_t)
     oneapi::tbb::blocked_range3d r1(v.begin(), v.end(), 2, v2.begin(), v2.end(), 2, v3.begin(), v3.end(), 6);
     static_assert(std::is_same<decltype(r1),
-        oneapi::tbb::blocked_range3d<decltype(v)::iterator, decltype(v2)::iterator, decltype(v3)::iterator>>::value);
+                               oneapi::tbb::blocked_range3d<decltype(v)::iterator, decltype(v2)::iterator,
+                                                            decltype(v3)::iterator>>::value);
 
     // check blocked_range2d(blocked_range3d &)
     oneapi::tbb::blocked_range3d r2(r1);
@@ -230,4 +270,3 @@ TEST_CASE("Deduction guides") {
     static_assert(std::is_same<decltype(r3), decltype(r1)>::value);
 }
 #endif
-
diff --git a/external/tbb/test/conformance/conformance_blocked_rangeNd.cpp b/external/tbb/test/conformance/conformance_blocked_rangeNd.cpp
index 52faac52..3854cde1 100644
--- a/external/tbb/test/conformance/conformance_blocked_rangeNd.cpp
+++ b/external/tbb/test/conformance/conformance_blocked_rangeNd.cpp
@@ -24,16 +24,17 @@
 
 #define TBB_PREVIEW_BLOCKED_RANGE_ND 1
 #include "oneapi/tbb/blocked_rangeNd.h"
-#include "oneapi/tbb/parallel_for.h"
 #include "oneapi/tbb/global_control.h"
+#include "oneapi/tbb/parallel_for.h"
 
-#include <algorithm> // std::for_each
+#include <algorithm>// std::for_each
 #include <array>
 
 // AbstractValueType class represents Value concept's requirements in the most abstract way
 class AbstractValueType {
     int value;
     AbstractValueType() {}
+
 public:
     friend AbstractValueType MakeAbstractValue(int i);
     friend int GetValueOf(const AbstractValueType& v);
@@ -60,19 +61,22 @@ AbstractValueType operator+(const AbstractValueType& u, std::size_t offset) {
     return MakeAbstractValue(GetValueOf(u) + int(offset));
 }
 
-template<typename range_t, unsigned int N>
+template <typename range_t, unsigned int N>
 struct range_utils {
     using val_t = typename range_t::value_type;
 
-    template<typename EntityType, std::size_t DimSize>
-    using data_type = std::array<typename range_utils<range_t, N - 1>::template data_type<EntityType, DimSize>, DimSize>;
+    template <typename EntityType, std::size_t DimSize>
+    using data_type
+            = std::array<typename range_utils<range_t, N - 1>::template data_type<EntityType, DimSize>,
+                         DimSize>;
 
-    template<typename EntityType, std::size_t DimSize>
+    template <typename EntityType, std::size_t DimSize>
     static void init_data(data_type<EntityType, DimSize>& data) {
-        std::for_each(data.begin(), data.end(), range_utils<range_t, N - 1>::template init_data<EntityType, DimSize>);
+        std::for_each(data.begin(), data.end(),
+                      range_utils<range_t, N - 1>::template init_data<EntityType, DimSize>);
     }
 
-    template<typename EntityType, std::size_t DimSize>
+    template <typename EntityType, std::size_t DimSize>
     static void increment_data(const range_t& range, data_type<EntityType, DimSize>& data) {
         auto begin = data.begin() + range.dim(N - 1).begin();
         // same as "auto end = out.begin() + range.dim(N - 1).end();"
@@ -82,7 +86,7 @@ struct range_utils {
         }
     }
 
-    template<typename EntityType, std::size_t DimSize>
+    template <typename EntityType, std::size_t DimSize>
     static void check_data(const range_t& range, data_type<EntityType, DimSize>& data) {
         auto begin = data.begin() + range.dim(N - 1).begin();
         // same as "auto end = out.begin() + range.dim(N - 1).end();"
@@ -98,9 +102,10 @@ struct range_utils {
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wsequence-point"
 #endif
-    template<typename input_t, std::size_t... Is>
-    static range_t make_range(std::size_t shift, bool negative, val_t(*gen)(input_t), oneapi::tbb::detail::index_sequence<Is...>) {
-        return range_t( { { gen(negative ? -input_t(Is + shift) : 0), gen(input_t(Is + shift)), Is + 1} ... } );
+    template <typename input_t, std::size_t... Is>
+    static range_t make_range(std::size_t shift, bool negative, val_t (*gen)(input_t),
+                              oneapi::tbb::detail::index_sequence<Is...>) {
+        return range_t({{gen(negative ? -input_t(Is + shift) : 0), gen(input_t(Is + shift)), Is + 1}...});
     }
 #if __GNUC__ && !defined(__clang__) && !defined(__INTEL_COMPILER)
 #pragma GCC diagnostic pop
@@ -116,33 +121,37 @@ struct range_utils {
         return range_utils<range_t, N - 1>::is_divisible(range);
     }
 
-    static void check_splitting(const range_t& range_split, const range_t& range_new, int(*get)(const val_t&), bool split_checker = false) {
+    static void check_splitting(const range_t& range_split, const range_t& range_new,
+                                int (*get)(const val_t&), bool split_checker = false) {
         if (get(range_split.dim(N - 1).begin()) == get(range_new.dim(N - 1).begin())) {
             REQUIRE(get(range_split.dim(N - 1).end()) == get(range_new.dim(N - 1).end()));
-        }
-        else {
-            REQUIRE((get(range_split.dim(N - 1).end()) == get(range_new.dim(N - 1).begin()) && !split_checker));
+        } else {
+            REQUIRE((get(range_split.dim(N - 1).end()) == get(range_new.dim(N - 1).begin())
+                     && !split_checker));
             split_checker = true;
         }
         range_utils<range_t, N - 1>::check_splitting(range_split, range_new, get, split_checker);
     }
-
 };
 
-template<typename range_t>
+template <typename range_t>
 struct range_utils<range_t, 0> {
     using val_t = typename range_t::value_type;
 
-    template<typename EntityType, std::size_t DimSize>
+    template <typename EntityType, std::size_t DimSize>
     using data_type = EntityType;
 
-    template<typename EntityType, std::size_t DimSize>
-    static void init_data(data_type<EntityType, DimSize>& data) { data = 0; }
+    template <typename EntityType, std::size_t DimSize>
+    static void init_data(data_type<EntityType, DimSize>& data) {
+        data = 0;
+    }
 
-    template<typename EntityType, std::size_t DimSize>
-    static void increment_data(const range_t&, data_type<EntityType, DimSize>& data) { ++data; }
+    template <typename EntityType, std::size_t DimSize>
+    static void increment_data(const range_t&, data_type<EntityType, DimSize>& data) {
+        ++data;
+    }
 
-    template<typename EntityType, std::size_t DimSize>
+    template <typename EntityType, std::size_t DimSize>
     static void check_data(const range_t&, data_type<EntityType, DimSize>& data) {
         REQUIRE(data == 1);
     }
@@ -151,23 +160,25 @@ struct range_utils<range_t, 0> {
 
     static bool is_divisible(const range_t&) { return false; }
 
-    static void check_splitting(const range_t&, const range_t&, int(*)(const val_t&), bool) {}
+    static void check_splitting(const range_t&, const range_t&, int (*)(const val_t&), bool) {}
 };
 
 // We need MakeInt function to pass it into make_range as factory function
 // because of matching make_range with AbstractValueType and other types too
 int MakeInt(int i) { return i; }
 
-template<unsigned int DimAmount>
+template <unsigned int DimAmount>
 void SerialTest() {
-    static_assert((oneapi::tbb::blocked_rangeNd<int, DimAmount>::ndims() == oneapi::tbb::blocked_rangeNd<AbstractValueType, DimAmount>::ndims()),
-                         "different amount of dimensions");
+    static_assert((oneapi::tbb::blocked_rangeNd<int, DimAmount>::ndims()
+                   == oneapi::tbb::blocked_rangeNd<AbstractValueType, DimAmount>::ndims()),
+                  "different amount of dimensions");
 
     using range_t = oneapi::tbb::blocked_rangeNd<AbstractValueType, DimAmount>;
     using utils_t = range_utils<range_t, DimAmount>;
 
     // Generate empty range
-    range_t r = utils_t::make_range(0, true, &MakeAbstractValue, oneapi::tbb::detail::make_index_sequence<DimAmount>());
+    range_t r = utils_t::make_range(0, true, &MakeAbstractValue,
+                                    oneapi::tbb::detail::make_index_sequence<DimAmount>());
 
     utils::AssertSameType(r.is_divisible(), bool());
     utils::AssertSameType(r.empty(), bool());
@@ -177,7 +188,8 @@ void SerialTest() {
     REQUIRE(r.is_divisible() == utils_t::is_divisible(r));
 
     // Generate not-empty range divisible range
-    r = utils_t::make_range(1, true, &MakeAbstractValue, oneapi::tbb::detail::make_index_sequence<DimAmount>());
+    r = utils_t::make_range(1, true, &MakeAbstractValue,
+                            oneapi::tbb::detail::make_index_sequence<DimAmount>());
     REQUIRE((r.empty() == utils_t::is_empty(r) && !r.empty()));
     REQUIRE((r.is_divisible() == utils_t::is_divisible(r) && r.is_divisible()));
 
@@ -186,9 +198,10 @@ void SerialTest() {
 
     SerialTest<DimAmount - 1>();
 }
-template<> void SerialTest<0>() {}
+template <>
+void SerialTest<0>() {}
 
-template<unsigned int DimAmount>
+template <unsigned int DimAmount>
 void ParallelTest() {
     using range_t = oneapi::tbb::blocked_rangeNd<int, DimAmount>;
     using utils_t = range_utils<range_t, DimAmount>;
@@ -198,59 +211,59 @@ void ParallelTest() {
     typename utils_t::template data_type<unsigned char, 1 << (20 / DimAmount - 1)> data;
     utils_t::init_data(data);
 
-    range_t r = utils_t::make_range((1 << (20 / DimAmount - 1)) - DimAmount, false, &MakeInt, oneapi::tbb::detail::make_index_sequence<DimAmount>());
+    range_t r = utils_t::make_range((1 << (20 / DimAmount - 1)) - DimAmount, false, &MakeInt,
+                                    oneapi::tbb::detail::make_index_sequence<DimAmount>());
 
-    oneapi::tbb::parallel_for(r, [&data](const range_t& range) {
-        utils_t::increment_data(range, data);
-    });
+    oneapi::tbb::parallel_for(r, [&data](const range_t& range) { utils_t::increment_data(range, data); });
 
     utils_t::check_data(r, data);
 
     ParallelTest<DimAmount - 1>();
 }
-template<> void ParallelTest<0>() {}
+template <>
+void ParallelTest<0>() {}
 
 //! Testing blocked_rangeNd construction
 //! \brief \ref interface
 TEST_CASE("Construction") {
-    oneapi::tbb::blocked_rangeNd<int, 1>{ { 0,13,3 } };
+    oneapi::tbb::blocked_rangeNd<int, 1> {{0, 13, 3}};
 
-    oneapi::tbb::blocked_rangeNd<int, 1>{ oneapi::tbb::blocked_range<int>{ 0,13,3 } };
+    oneapi::tbb::blocked_rangeNd<int, 1> {oneapi::tbb::blocked_range<int> {0, 13, 3}};
 
-    oneapi::tbb::blocked_rangeNd<int, 2>(oneapi::tbb::blocked_range<int>(-8923, 8884, 13), oneapi::tbb::blocked_range<int>(-8923, 5, 13));
+    oneapi::tbb::blocked_rangeNd<int, 2>(oneapi::tbb::blocked_range<int>(-8923, 8884, 13),
+                                         oneapi::tbb::blocked_range<int>(-8923, 5, 13));
 
-    oneapi::tbb::blocked_rangeNd<int, 2>({ -8923, 8884, 13 }, { -8923, 8884, 13 });
+    oneapi::tbb::blocked_rangeNd<int, 2>({-8923, 8884, 13}, {-8923, 8884, 13});
 
     oneapi::tbb::blocked_range<int> r1(0, 13);
 
     oneapi::tbb::blocked_range<int> r2(-12, 23);
 
-    oneapi::tbb::blocked_rangeNd<int, 2>({ { -8923, 8884, 13 }, r1});
+    oneapi::tbb::blocked_rangeNd<int, 2>({{-8923, 8884, 13}, r1});
 
-    oneapi::tbb::blocked_rangeNd<int, 2>({ r2, r1 });
+    oneapi::tbb::blocked_rangeNd<int, 2>({r2, r1});
 
     oneapi::tbb::blocked_rangeNd<int, 2>(r1, r2);
 
-    oneapi::tbb::blocked_rangeNd<AbstractValueType, 4>({ MakeAbstractValue(-3), MakeAbstractValue(13), 8 },
-                                               { MakeAbstractValue(-53), MakeAbstractValue(23), 2 },
-                                               { MakeAbstractValue(-23), MakeAbstractValue(33), 1 },
-                                               { MakeAbstractValue(-13), MakeAbstractValue(43), 7 });
+    oneapi::tbb::blocked_rangeNd<AbstractValueType, 4>({MakeAbstractValue(-3), MakeAbstractValue(13), 8},
+                                                       {MakeAbstractValue(-53), MakeAbstractValue(23), 2},
+                                                       {MakeAbstractValue(-23), MakeAbstractValue(33), 1},
+                                                       {MakeAbstractValue(-13), MakeAbstractValue(43), 7});
 }
 
 static const std::size_t N = 4;
 
 //! Testing blocked_rangeNd interface
 //! \brief \ref interface \ref requirement
-TEST_CASE("Serial test") {
-    SerialTest<N>();
-}
+TEST_CASE("Serial test") { SerialTest<N>(); }
 
 #if !EMSCRIPTEN
 //! Testing blocked_rangeNd interface with parallel_for
 //! \brief \ref requirement
 TEST_CASE("Parallel test") {
-    for ( auto concurrency_level : utils::concurrency_range() ) {
-        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism, concurrency_level);
+    for (auto concurrency_level : utils::concurrency_range()) {
+        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism,
+                                            concurrency_level);
         ParallelTest<N>();
     }
 }
@@ -259,19 +272,21 @@ TEST_CASE("Parallel test") {
 //! Testing blocked_rangeNd with proportional splitting
 //! \brief \ref interface \ref requirement
 TEST_CASE("blocked_rangeNd proportional splitting") {
-    oneapi::tbb::blocked_rangeNd<int, 2> original{{0, 100}, {0, 100}};
+    oneapi::tbb::blocked_rangeNd<int, 2> original {{0, 100}, {0, 100}};
     oneapi::tbb::blocked_rangeNd<int, 2> first(original);
     oneapi::tbb::proportional_split ps(3, 1);
     oneapi::tbb::blocked_rangeNd<int, 2> second(first, ps);
 
-    int expected_first_end = static_cast<int>(
-        original.dim(0).begin() + ps.left() * (original.dim(0).end() - original.dim(0).begin()) / (ps.left() + ps.right())
-    );
+    int expected_first_end = static_cast<int>(original.dim(0).begin()
+                                              + ps.left() * (original.dim(0).end() - original.dim(0).begin())
+                                                        / (ps.left() + ps.right()));
     if (first.dim(0).size() == second.dim(0).size()) {
         // Splitting was made by cols
-        utils::check_range_bounds_after_splitting(original.dim(1), first.dim(1), second.dim(1), expected_first_end);
+        utils::check_range_bounds_after_splitting(original.dim(1), first.dim(1), second.dim(1),
+                                                  expected_first_end);
     } else {
         // Splitting was made by rows
-        utils::check_range_bounds_after_splitting(original.dim(0), first.dim(0), second.dim(0), expected_first_end);
+        utils::check_range_bounds_after_splitting(original.dim(0), first.dim(0), second.dim(0),
+                                                  expected_first_end);
     }
 }
diff --git a/external/tbb/test/conformance/conformance_broadcast_node.cpp b/external/tbb/test/conformance/conformance_broadcast_node.cpp
index f39819fd..7c1ce68b 100644
--- a/external/tbb/test/conformance/conformance_broadcast_node.cpp
+++ b/external/tbb/test/conformance/conformance_broadcast_node.cpp
@@ -15,7 +15,7 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
 #endif
 
 #include "conformance_flowgraph.h"
@@ -23,24 +23,26 @@
 //! \file conformance_broadcast_node.cpp
 //! \brief Test for [flow_graph.broadcast_node] specification
 
-using input_msg = conformance::message</*default_ctor*/false, /*copy_ctor*/true/*enable for queue_node successor*/, /*copy_assign*/true/*enable for queue_node successor*/>;
+using input_msg
+        = conformance::message</*default_ctor*/ false, /*copy_ctor*/ true /*enable for queue_node successor*/,
+                               /*copy_assign*/ true /*enable for queue_node successor*/>;
 
 //! Test function_node broadcast
 //! \brief \ref requirement
-TEST_CASE("broadcast_node broadcasts"){
+TEST_CASE("broadcast_node broadcasts") {
     conformance::test_forwarding<oneapi::tbb::flow::broadcast_node<int>, int>(1);
     conformance::test_forwarding<oneapi::tbb::flow::broadcast_node<input_msg>, input_msg>(1);
 }
 
 //! Test broadcast_node buffering
 //! \brief \ref requirement
-TEST_CASE("broadcast_node buffering"){
+TEST_CASE("broadcast_node buffering") {
     conformance::test_buffering<oneapi::tbb::flow::broadcast_node<int>, int>();
 }
 
 //! Test inheritance relations
 //! \brief \ref interface
-TEST_CASE("broadcast_node superclasses"){
+TEST_CASE("broadcast_node superclasses") {
     conformance::test_inheritance<oneapi::tbb::flow::broadcast_node<int>, int, int>();
     conformance::test_inheritance<oneapi::tbb::flow::broadcast_node<float>, float, float>();
     conformance::test_inheritance<oneapi::tbb::flow::broadcast_node<input_msg>, input_msg, input_msg>();
@@ -49,7 +51,7 @@ TEST_CASE("broadcast_node superclasses"){
 //! The node that is constructed has a reference to the same graph object as src.
 //! The predecessors and successors of src are not copied.
 //! \brief \ref interface
-TEST_CASE("broadcast_node copy constructor"){
+TEST_CASE("broadcast_node copy constructor") {
     using namespace oneapi::tbb::flow;
     graph g;
 
@@ -68,10 +70,12 @@ TEST_CASE("broadcast_node copy constructor"){
     node_copy.try_put(1);
     g.wait_for_all();
 
-    CHECK_MESSAGE((conformance::get_values(node2).size() == 0 && conformance::get_values(node3).size() == 1), "Copied node doesn`t copy successor");
+    CHECK_MESSAGE((conformance::get_values(node2).size() == 0 && conformance::get_values(node3).size() == 1),
+                  "Copied node doesn`t copy successor");
 
     node0.try_put(1);
     g.wait_for_all();
 
-    CHECK_MESSAGE((conformance::get_values(node2).size() == 1 && conformance::get_values(node3).size() == 0), "Copied node doesn`t copy predecessor");
+    CHECK_MESSAGE((conformance::get_values(node2).size() == 1 && conformance::get_values(node3).size() == 0),
+                  "Copied node doesn`t copy predecessor");
 }
diff --git a/external/tbb/test/conformance/conformance_buffer_node.cpp b/external/tbb/test/conformance/conformance_buffer_node.cpp
index 5c355f43..6f06e53c 100644
--- a/external/tbb/test/conformance/conformance_buffer_node.cpp
+++ b/external/tbb/test/conformance/conformance_buffer_node.cpp
@@ -15,7 +15,7 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
 #endif
 
 #define CONFORMANCE_BUFFERING_NODES
@@ -27,40 +27,41 @@
 
 //! Test buffer_node broadcast
 //! \brief \ref requirement
-TEST_CASE("buffer_node single_push"){
+TEST_CASE("buffer_node single_push") {
     conformance::test_forwarding_single_push<oneapi::tbb::flow::buffer_node<int>>();
 }
 
 //! Test function_node buffering
 //! \brief \ref requirement
-TEST_CASE("buffer_node buffering"){
+TEST_CASE("buffer_node buffering") {
     conformance::test_buffering<oneapi::tbb::flow::buffer_node<int>, int>();
 }
 
 //! Constructs an empty buffer_node that belongs to the same graph g as src.
 //! Any intermediate state of src, including its links to predecessors and successors, is not copied.
 //! \brief \ref requirement
-TEST_CASE("buffer_node copy constructor"){
+TEST_CASE("buffer_node copy constructor") {
     conformance::test_copy_ctor_for_buffering_nodes<oneapi::tbb::flow::buffer_node<int>>();
 }
 
 //! Test inheritance relations
 //! \brief \ref interface
-TEST_CASE("buffer_node superclasses"){
+TEST_CASE("buffer_node superclasses") {
     conformance::test_inheritance<oneapi::tbb::flow::buffer_node<int>, int, int>();
     conformance::test_inheritance<oneapi::tbb::flow::buffer_node<void*>, void*, void*>();
 }
 
 //! Test buffer_node node `try_put()` and `try_get()`
 //! \brief \ref requirement
-TEST_CASE("buffer_node methods"){
+TEST_CASE("buffer_node methods") {
     oneapi::tbb::flow::graph g;
     oneapi::tbb::flow::buffer_node<int> testing_node(g);
 
     int tmp1 = -1;
     int tmp2 = -1;
 
-    CHECK_MESSAGE((!testing_node.try_get(tmp1) && tmp1 == -1), "`try_get` must returns false if there is no non-reserved item currently in the node.");
+    CHECK_MESSAGE((!testing_node.try_get(tmp1) && tmp1 == -1),
+                  "`try_get` must returns false if there is no non-reserved item currently in the node.");
 
     testing_node.try_put(1);
     testing_node.try_put(2);
@@ -70,5 +71,6 @@ TEST_CASE("buffer_node methods"){
     CHECK_MESSAGE((tmp1 == 1 || tmp1 == 2), "Messages must be an arbitrary order");
 
     testing_node.try_get(tmp2);
-    CHECK_MESSAGE((tmp2 != -1 && tmp2 != tmp1), "Additional `try_get()' does not receive the same value as previous");
+    CHECK_MESSAGE((tmp2 != -1 && tmp2 != tmp1),
+                  "Additional `try_get()' does not receive the same value as previous");
 }
diff --git a/external/tbb/test/conformance/conformance_collaborative_call_once.cpp b/external/tbb/test/conformance/conformance_collaborative_call_once.cpp
index 2c5ddfc1..52972a79 100644
--- a/external/tbb/test/conformance/conformance_collaborative_call_once.cpp
+++ b/external/tbb/test/conformance/conformance_collaborative_call_once.cpp
@@ -15,26 +15,26 @@
 */
 
 #if _MSC_VER && !defined(__INTEL_COMPILER)
-    // unreachable code
-    #pragma warning( push )
-    #pragma warning( disable: 4702 )
+// unreachable code
+#pragma warning(push)
+#pragma warning(disable : 4702)
 #endif
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
 #endif
 
 #include "common/test.h"
 #include "oneapi/tbb/collaborative_call_once.h"
 
+#include "common/spin_barrier.h"
 #include "common/utils.h"
 #include "common/utils_concurrency_limit.h"
-#include "common/spin_barrier.h"
 #include "oneapi/tbb/parallel_for.h"
 #include "oneapi/tbb/task_group.h"
 
-#include <type_traits>
 #include <exception>
+#include <type_traits>
 
 //! \file conformance_collaborative_call_once.cpp
 //! \brief Test for [algorithms.collaborative_call_once] specification
@@ -42,16 +42,16 @@
 //! Test for collaborative_once_flag member functions to be matched with spec
 //! \brief \ref interface \ref requirement
 TEST_CASE("collaborative_once_flag member functions match") {
-    REQUIRE_MESSAGE(std::is_default_constructible<oneapi::tbb::collaborative_once_flag>::value == true, 
-        "collaborative_once_flag must be default constructible");
-    REQUIRE_MESSAGE(std::is_copy_constructible<oneapi::tbb::collaborative_once_flag>::value == false, 
-        "collaborative_once_flag must not be copy constructible");
-    REQUIRE_MESSAGE(std::is_copy_assignable<oneapi::tbb::collaborative_once_flag>::value == false, 
-        "collaborative_once_flag must not be copy assignable");
-    REQUIRE_MESSAGE(std::is_move_constructible<oneapi::tbb::collaborative_once_flag>::value == false, 
-        "collaborative_once_flag must not be move constructible");
-    REQUIRE_MESSAGE(std::is_move_assignable<oneapi::tbb::collaborative_once_flag>::value == false, 
-        "collaborative_once_flag must not be move assignable");
+    REQUIRE_MESSAGE(std::is_default_constructible<oneapi::tbb::collaborative_once_flag>::value == true,
+                    "collaborative_once_flag must be default constructible");
+    REQUIRE_MESSAGE(std::is_copy_constructible<oneapi::tbb::collaborative_once_flag>::value == false,
+                    "collaborative_once_flag must not be copy constructible");
+    REQUIRE_MESSAGE(std::is_copy_assignable<oneapi::tbb::collaborative_once_flag>::value == false,
+                    "collaborative_once_flag must not be copy assignable");
+    REQUIRE_MESSAGE(std::is_move_constructible<oneapi::tbb::collaborative_once_flag>::value == false,
+                    "collaborative_once_flag must not be move constructible");
+    REQUIRE_MESSAGE(std::is_move_assignable<oneapi::tbb::collaborative_once_flag>::value == false,
+                    "collaborative_once_flag must not be move assignable");
 }
 
 //! Test for collaborative_call_once to execute function exactly once
@@ -60,15 +60,18 @@ TEST_CASE("collaborative_call_once executes function exactly once") {
     oneapi::tbb::collaborative_once_flag once_flag;
 
     for (int iter = 0; iter < 100; ++iter) {
-        oneapi::tbb::collaborative_call_once(once_flag, [](int number) {
-            // Will be executed only on first iteration
-            REQUIRE(number == 0);
-        }, iter);
+        oneapi::tbb::collaborative_call_once(
+                once_flag,
+                [](int number) {
+                    // Will be executed only on first iteration
+                    REQUIRE(number == 0);
+                },
+                iter);
     }
 
     // concurrent call
     std::size_t num_threads = utils::get_platform_max_threads();
-    utils::SpinBarrier barrier{num_threads};
+    utils::SpinBarrier barrier {num_threads};
 
     int flag = 0;
     auto func = [&flag] { flag++; };
@@ -81,7 +84,6 @@ TEST_CASE("collaborative_call_once executes function exactly once") {
     REQUIRE(flag == 1);
 }
 
-
 #if TBB_USE_EXCEPTIONS
 
 //! Exception is received only by winner thread
@@ -93,26 +95,22 @@ TEST_CASE("Exception is received only by winner thread") {
     oneapi::tbb::task_group tg;
     oneapi::tbb::collaborative_once_flag flag;
 
-    for (int i = 0; i < num_threads-1; ++i) {
+    for (int i = 0; i < num_threads - 1; ++i) {
         tg.run([&flag, &barrier] {
             barrier.wait();
             try {
-                oneapi::tbb::collaborative_call_once(flag, [] { });
-            } catch(...) {
-                REQUIRE_MESSAGE(false, "Unreachable code");
-            }
+                oneapi::tbb::collaborative_call_once(flag, [] {});
+            } catch (...) { REQUIRE_MESSAGE(false, "Unreachable code"); }
         });
     };
 
-    bool exception_happened{false};
+    bool exception_happened {false};
     try {
         oneapi::tbb::collaborative_call_once(flag, [&barrier] {
             barrier.wait();
-            throw std::exception{};
+            throw std::exception {};
         });
-    } catch (std::exception&) {
-        exception_happened = true;
-    }
+    } catch (std::exception&) { exception_happened = true; }
 
     REQUIRE_MESSAGE(exception_happened == true, "Exception hasn't been received from the winner thread");
     tg.wait();
@@ -121,5 +119,5 @@ TEST_CASE("Exception is received only by winner thread") {
 #endif
 
 #if _MSC_VER && !defined(__INTEL_COMPILER)
-    #pragma warning( pop )
+#pragma warning(pop)
 #endif
diff --git a/external/tbb/test/conformance/conformance_combinable.cpp b/external/tbb/test/conformance/conformance_combinable.cpp
index 9f1ef774..9326afba 100644
--- a/external/tbb/test/conformance/conformance_combinable.cpp
+++ b/external/tbb/test/conformance/conformance_combinable.cpp
@@ -14,24 +14,24 @@
     limitations under the License.
 */
 
+#include "common/checktype.h"
+#include "common/spin_barrier.h"
 #include "common/test.h"
 #include "common/utils.h"
 #include "common/utils_report.h"
-#include "common/spin_barrier.h"
-#include "common/checktype.h"
 
 #include "common/container_move_support.h"
 
-#include "oneapi/tbb/combinable.h"
-#include "oneapi/tbb/parallel_for.h"
 #include "oneapi/tbb/blocked_range.h"
+#include "oneapi/tbb/combinable.h"
 #include "oneapi/tbb/global_control.h"
+#include "oneapi/tbb/parallel_for.h"
 #include "oneapi/tbb/tbb_allocator.h"
 // INFO: #include "oneapi/tbb/tick_count.h"
 
 #include <cstring>
-#include <vector>
 #include <utility>
+#include <vector>
 
 //! \file conformance_combinable.cpp
 //! \brief Test for [tls.combinable] specification
@@ -58,15 +58,22 @@ const double EXPECTED_SUM = (REPETITIONS + 1) * N;
 class minimalCombinable {
 private:
     int my_value;
+
 public:
-    minimalCombinable(int val=0) : my_value(val) { ++construction_counter; }
-    minimalCombinable( const minimalCombinable&m ) : my_value(m.my_value) { ++construction_counter; }
-    minimalCombinable& operator=(const minimalCombinable& other) { my_value = other.my_value; return *this; }
-    minimalCombinable& operator+=(const minimalCombinable& other) { my_value += other.my_value; return *this; }
+    minimalCombinable(int val = 0) : my_value(val) { ++construction_counter; }
+    minimalCombinable(const minimalCombinable& m) : my_value(m.my_value) { ++construction_counter; }
+    minimalCombinable& operator=(const minimalCombinable& other) {
+        my_value = other.my_value;
+        return *this;
+    }
+    minimalCombinable& operator+=(const minimalCombinable& other) {
+        my_value += other.my_value;
+        return *this;
+    }
     operator int() const { return my_value; }
     ~minimalCombinable() { ++destruction_counter; }
-    void set_value( const int i ) { my_value = i; }
-    int value( ) const { return my_value; }
+    void set_value(const int i) { my_value = i; }
+    int value() const { return my_value; }
 };
 
 //// functors for initialization and combine
@@ -83,29 +90,30 @@ struct FunctorAddFinit7 {
 
 template <typename T>
 struct FunctorAddCombine {
-    T operator()(T left, T right ) const {
-        return left + right;
-    }
+    T operator()(T left, T right) const { return left + right; }
 };
 
 template <typename T>
 struct FunctorAddCombineRef {
-    T operator()(const T& left, const T& right ) const {
-        return left + right;
-    }
+    T operator()(const T& left, const T& right) const { return left + right; }
 };
 
 template <typename T>
-T my_combine( T left, T right) { return left + right; }
+T my_combine(T left, T right) {
+    return left + right;
+}
 
 template <typename T>
-T my_combine_ref( const T &left, const T &right) { return left + right; }
+T my_combine_ref(const T& left, const T& right) {
+    return left + right;
+}
 
 template <typename T>
 class CombineEachHelper {
 public:
     CombineEachHelper(T& _result) : my_result(_result) {}
-    void operator()(const T& new_bit) { my_result +=  new_bit; }
+    void operator()(const T& new_bit) { my_result += new_bit; }
+
 private:
     T& my_result;
 };
@@ -114,7 +122,11 @@ template <typename T>
 class CombineEachHelperCnt {
 public:
     CombineEachHelperCnt(T& _result, int& _nbuckets) : my_result(_result), nBuckets(_nbuckets) {}
-    void operator()(const T& new_bit) { my_result +=  new_bit; ++nBuckets; }
+    void operator()(const T& new_bit) {
+        my_result += new_bit;
+        ++nBuckets;
+    }
+
 private:
     T& my_result;
     int& nBuckets;
@@ -123,11 +135,11 @@ class CombineEachHelperCnt {
 template <typename T>
 class CombineEachVectorHelper {
 public:
-    typedef std::vector<T, oneapi::tbb::tbb_allocator<T> > ContainerType;
-    CombineEachVectorHelper(T& _result) : my_result(_result) { }
+    typedef std::vector<T, oneapi::tbb::tbb_allocator<T>> ContainerType;
+    CombineEachVectorHelper(T& _result) : my_result(_result) {}
     void operator()(const ContainerType& new_bit) {
-        for(typename ContainerType::const_iterator ci = new_bit.begin(); ci != new_bit.end(); ++ci) {
-            my_result +=  *ci;
+        for (typename ContainerType::const_iterator ci = new_bit.begin(); ci != new_bit.end(); ++ci) {
+            my_result += *ci;
         }
     }
 
@@ -139,44 +151,38 @@ class CombineEachVectorHelper {
 
 // parallel body with a test for first access
 template <typename T>
-class ParallelScalarBody: utils::NoAssign {
+class ParallelScalarBody : utils::NoAssign {
 
-    oneapi::tbb::combinable<T> &sums;
+    oneapi::tbb::combinable<T>& sums;
 
 public:
+    ParallelScalarBody(oneapi::tbb::combinable<T>& _sums) : sums(_sums) {}
 
-    ParallelScalarBody ( oneapi::tbb::combinable<T> &_sums ) : sums(_sums) { }
-
-    void operator()( const oneapi::tbb::blocked_range<int> &r ) const {
+    void operator()(const oneapi::tbb::blocked_range<int>& r) const {
         for (int i = r.begin(); i != r.end(); ++i) {
             bool was_there;
             T& my_local = sums.local(was_there);
-            if(!was_there) my_local = 0;
-             my_local +=  1 ;
+            if (!was_there) my_local = 0;
+            my_local += 1;
         }
     }
-
 };
 
 // parallel body with no test for first access
 template <typename T>
-class ParallelScalarBodyNoInit: utils::NoAssign {
+class ParallelScalarBodyNoInit : utils::NoAssign {
 
-    oneapi::tbb::combinable<T> &sums;
+    oneapi::tbb::combinable<T>& sums;
 
 public:
+    ParallelScalarBodyNoInit(oneapi::tbb::combinable<T>& _sums) : sums(_sums) {}
 
-    ParallelScalarBodyNoInit ( oneapi::tbb::combinable<T> &_sums ) : sums(_sums) { }
-
-    void operator()( const oneapi::tbb::blocked_range<int> &r ) const {
-        for (int i = r.begin(); i != r.end(); ++i) {
-             sums.local() +=  1 ;
-        }
+    void operator()(const oneapi::tbb::blocked_range<int>& r) const {
+        for (int i = r.begin(); i != r.end(); ++i) { sums.local() += 1; }
     }
-
 };
 
-template< typename T >
+template <typename T>
 void RunParallelScalarTests(const char* /* test_name */) {
     for (int p = MinThread; p <= MaxThread; ++p) {
 
@@ -199,20 +205,23 @@ void RunParallelScalarTests(const char* /* test_name */) {
 
             // test uninitialized parallel combinable
             oneapi::tbb::combinable<T> sums;
-            oneapi::tbb::parallel_for( oneapi::tbb::blocked_range<int>( 0, N, 10000 ), ParallelScalarBody<T>( sums ) );
+            oneapi::tbb::parallel_for(oneapi::tbb::blocked_range<int>(0, N, 10000),
+                                      ParallelScalarBody<T>(sums));
             combine_sum += sums.combine(my_combine<T>);
             combine_ref_sum += sums.combine(my_combine_ref<T>);
 
             // test combinable::clear()
             oneapi::tbb::combinable<T> sums_to_clear;
-            oneapi::tbb::parallel_for( oneapi::tbb::blocked_range<int>(0, N, 10000), ParallelScalarBody<T>(sums_to_clear) );
+            oneapi::tbb::parallel_for(oneapi::tbb::blocked_range<int>(0, N, 10000),
+                                      ParallelScalarBody<T>(sums_to_clear));
             sums_to_clear.clear();
             CHECK_MESSAGE(sums_to_clear.combine(my_combine<T>) == 0, "Failed combinable::clear test");
 
             // test parallel combinable preinitialized with a functor that returns 0
             FunctorAddFinit<T> my_finit_decl;
             oneapi::tbb::combinable<T> finit_combinable(my_finit_decl);
-            oneapi::tbb::parallel_for( oneapi::tbb::blocked_range<int>( 0, N, 10000 ), ParallelScalarBodyNoInit<T>( finit_combinable ) );
+            oneapi::tbb::parallel_for(oneapi::tbb::blocked_range<int>(0, N, 10000),
+                                      ParallelScalarBodyNoInit<T>(finit_combinable));
             combine_finit_sum += finit_combinable.combine(my_combine<T>);
 
             // test another way of combining the elements using CombineEachHelper<T> functor
@@ -234,45 +243,42 @@ void RunParallelScalarTests(const char* /* test_name */) {
 
             // test move assignment for uninitialized parallel combinable
             oneapi::tbb::combinable<T> moved2;
-            moved2=std::move(finit_combinable);
+            moved2 = std::move(finit_combinable);
             move_assign_sum += moved2.combine(my_combine<T>);
         }
         // Here and below comparison for equality of float numbers succeeds
         // as the rounding error doesn't accumulate and doesn't affect the comparison
-        REQUIRE( EXPECTED_SUM == combine_sum );
-        REQUIRE( EXPECTED_SUM == combine_ref_sum );
-        REQUIRE( EXPECTED_SUM == combine_finit_sum );
-        REQUIRE( EXPECTED_SUM == combine_each_sum );
-        REQUIRE( EXPECTED_SUM == copy_construct_sum );
-        REQUIRE( EXPECTED_SUM == copy_assign_sum );
-        REQUIRE( EXPECTED_SUM == move_construct_sum );
-        REQUIRE( EXPECTED_SUM == move_assign_sum );
+        REQUIRE(EXPECTED_SUM == combine_sum);
+        REQUIRE(EXPECTED_SUM == combine_ref_sum);
+        REQUIRE(EXPECTED_SUM == combine_finit_sum);
+        REQUIRE(EXPECTED_SUM == combine_each_sum);
+        REQUIRE(EXPECTED_SUM == copy_construct_sum);
+        REQUIRE(EXPECTED_SUM == copy_assign_sum);
+        REQUIRE(EXPECTED_SUM == move_construct_sum);
+        REQUIRE(EXPECTED_SUM == move_assign_sum);
         // REMARK("  done parallel %s, %d, %g, %g\n", test_name, p, static_cast<double>(combine_sum), ( oneapi::tbb::tick_count::now() - t0).seconds());
     }
 }
 
 template <typename T>
-class ParallelVectorForBody: utils::NoAssign {
+class ParallelVectorForBody : utils::NoAssign {
 
-    oneapi::tbb::combinable< std::vector<T, oneapi::tbb::tbb_allocator<T> > > &locals;
+    oneapi::tbb::combinable<std::vector<T, oneapi::tbb::tbb_allocator<T>>>& locals;
 
 public:
+    ParallelVectorForBody(oneapi::tbb::combinable<std::vector<T, oneapi::tbb::tbb_allocator<T>>>& _locals)
+        : locals(_locals) {}
 
-    ParallelVectorForBody ( oneapi::tbb::combinable< std::vector<T, oneapi::tbb::tbb_allocator<T> > > &_locals ) : locals(_locals) { }
-
-    void operator()( const oneapi::tbb::blocked_range<int> &r ) const {
+    void operator()(const oneapi::tbb::blocked_range<int>& r) const {
         T one = 1;
 
-        for (int i = r.begin(); i < r.end(); ++i) {
-            locals.local().push_back( one );
-        }
+        for (int i = r.begin(); i < r.end(); ++i) { locals.local().push_back(one); }
     }
-
 };
 
-template< typename T >
+template <typename T>
 void RunParallelVectorTests(const char* /* test_name */) {
-    typedef std::vector<T, oneapi::tbb::tbb_allocator<T> > ContainerType;
+    typedef std::vector<T, oneapi::tbb::tbb_allocator<T>> ContainerType;
 
     for (int p = MinThread; p <= MaxThread; ++p) {
 
@@ -290,13 +296,14 @@ void RunParallelVectorTests(const char* /* test_name */) {
         for (int t = -1; t < REPETITIONS; ++t) {
             // if (Verbose && t == 0) t0 = oneapi::tbb::tick_count::now();
 
-            typedef typename oneapi::tbb::combinable< ContainerType > CombinableType;
+            typedef typename oneapi::tbb::combinable<ContainerType> CombinableType;
 
             // test uninitialized parallel combinable
             CombinableType vs;
-            oneapi::tbb::parallel_for( oneapi::tbb::blocked_range<int> (0, N, 10000), ParallelVectorForBody<T>( vs ) );
+            oneapi::tbb::parallel_for(oneapi::tbb::blocked_range<int>(0, N, 10000),
+                                      ParallelVectorForBody<T>(vs));
             CombineEachVectorHelper<T> MyCombineEach(defaultConstructed_sum);
-            vs.combine_each(MyCombineEach); // combine_each sums all elements of each vector into the result
+            vs.combine_each(MyCombineEach);// combine_each sums all elements of each vector into the result
 
             // test copy constructor for parallel combinable with vectors
             CombinableType vs2(vs);
@@ -315,28 +322,27 @@ void RunParallelVectorTests(const char* /* test_name */) {
             vs4.combine_each(MyCombineEach4);
 
             // test move assignment for uninitialized parallel combinable with vectors
-            vs4=std::move(vs3);
+            vs4 = std::move(vs3);
             CombineEachVectorHelper<T> MyCombineEach5(moveAssigned_sum);
             vs4.combine_each(MyCombineEach5);
         }
 
         double ResultValue = defaultConstructed_sum;
-        REQUIRE( EXPECTED_SUM == ResultValue );
+        REQUIRE(EXPECTED_SUM == ResultValue);
         ResultValue = copyConstructed_sum;
-        REQUIRE( EXPECTED_SUM == ResultValue );
+        REQUIRE(EXPECTED_SUM == ResultValue);
         ResultValue = copyAssigned_sum;
-        REQUIRE( EXPECTED_SUM == ResultValue );
+        REQUIRE(EXPECTED_SUM == ResultValue);
         ResultValue = moveConstructed_sum;
-        REQUIRE( EXPECTED_SUM == ResultValue );
+        REQUIRE(EXPECTED_SUM == ResultValue);
         ResultValue = moveAssigned_sum;
-        REQUIRE( EXPECTED_SUM == ResultValue );
+        REQUIRE(EXPECTED_SUM == ResultValue);
 
         // REMARK("  done parallel %s, %d, %g, %g\n", test_name, p, ResultValue, ( oneapi::tbb::tick_count::now() - t0).seconds());
     }
 }
 
-void
-RunParallelTests() {
+void RunParallelTests() {
     // REMARK("Running RunParallelTests\n");
     RunParallelScalarTests<int>("int");
     RunParallelScalarTests<double>("double");
@@ -346,36 +352,39 @@ RunParallelTests() {
 }
 
 template <typename T>
-void
-RunAssignmentAndCopyConstructorTest(const char* /* test_name */) {
+void RunAssignmentAndCopyConstructorTest(const char* /* test_name */) {
     // REMARK("  Testing assignment and copy construction for combinable<%s>...\n", test_name);
 
     // test creation with finit function (combine returns finit return value if no threads have created locals)
     FunctorAddFinit7<T> my_finit7_decl;
     oneapi::tbb::combinable<T> create1(my_finit7_decl);
-    REQUIRE_MESSAGE(7 == create1.combine(my_combine<T>), "Unexpected combine result for combinable object preinitialized with functor");
+    REQUIRE_MESSAGE(7 == create1.combine(my_combine<T>),
+                    "Unexpected combine result for combinable object preinitialized with functor");
 
     // test copy construction with function initializer
     oneapi::tbb::combinable<T> copy1(create1);
-    REQUIRE_MESSAGE(7 == copy1.combine(my_combine<T>), "Unexpected combine result for copy-constructed combinable object");
+    REQUIRE_MESSAGE(7 == copy1.combine(my_combine<T>),
+                    "Unexpected combine result for copy-constructed combinable object");
 
     // test copy assignment with function initializer
     FunctorAddFinit<T> my_finit_decl;
     oneapi::tbb::combinable<T> assign1(my_finit_decl);
     assign1 = create1;
-    REQUIRE_MESSAGE(7 == assign1.combine(my_combine<T>), "Unexpected combine result for copy-assigned combinable object");
+    REQUIRE_MESSAGE(7 == assign1.combine(my_combine<T>),
+                    "Unexpected combine result for copy-assigned combinable object");
 
     // test move construction with function initializer
     oneapi::tbb::combinable<T> move1(std::move(create1));
-    REQUIRE_MESSAGE(7 == move1.combine(my_combine<T>), "Unexpected combine result for move-constructed combinable object");
+    REQUIRE_MESSAGE(7 == move1.combine(my_combine<T>),
+                    "Unexpected combine result for move-constructed combinable object");
 
     // test move assignment with function initializer
     oneapi::tbb::combinable<T> move2;
-    move2=std::move(copy1);
-    REQUIRE_MESSAGE(7 == move2.combine(my_combine<T>), "Unexpected combine result for move-assigned combinable object");
+    move2 = std::move(copy1);
+    REQUIRE_MESSAGE(7 == move2.combine(my_combine<T>),
+                    "Unexpected combine result for move-assigned combinable object");
 
     // REMARK("  done\n");
-
 }
 
 void RunAssignmentAndCopyConstructorTests() {
@@ -388,33 +397,35 @@ void RunAssignmentAndCopyConstructorTests() {
 void RunMoveSemanticsForStateTrackableObjectTest() {
     // REMARK("Testing move assignment and move construction for combinable<Harness::StateTrackable>...\n");
 
-    oneapi::tbb::combinable< StateTrackable<true> > create1;
+    oneapi::tbb::combinable<StateTrackable<true>> create1;
     REQUIRE_MESSAGE(create1.local().state == StateTrackable<true>::DefaultInitialized,
-           "Unexpected value in default combinable object");
+                    "Unexpected value in default combinable object");
 
     // Copy constructing of the new combinable causes copying of stored values
-    oneapi::tbb::combinable< StateTrackable<true> > copy1(create1);
+    oneapi::tbb::combinable<StateTrackable<true>> copy1(create1);
     REQUIRE_MESSAGE(copy1.local().state == StateTrackable<true>::CopyInitialized,
-           "Unexpected value in copy-constructed combinable object");
+                    "Unexpected value in copy-constructed combinable object");
 
     // Copy assignment also causes copying of stored values
-    oneapi::tbb::combinable< StateTrackable<true> > copy2;
+    oneapi::tbb::combinable<StateTrackable<true>> copy2;
     REQUIRE_MESSAGE(copy2.local().state == StateTrackable<true>::DefaultInitialized,
-           "Unexpected value in default combinable object");
-    copy2=create1;
+                    "Unexpected value in default combinable object");
+    copy2 = create1;
     REQUIRE_MESSAGE(copy2.local().state == StateTrackable<true>::CopyInitialized,
-           "Unexpected value in copy-assigned combinable object");
+                    "Unexpected value in copy-assigned combinable object");
 
     // Store some marked values in the initial combinable object
     create1.local().state = StateTrackableBase::Unspecified;
 
     // Move constructing of the new combinable must not cause copying of stored values
-    oneapi::tbb::combinable< StateTrackable<true> > move1(std::move(create1));
-    REQUIRE_MESSAGE(move1.local().state == StateTrackableBase::Unspecified, "Unexpected value in move-constructed combinable object");
+    oneapi::tbb::combinable<StateTrackable<true>> move1(std::move(create1));
+    REQUIRE_MESSAGE(move1.local().state == StateTrackableBase::Unspecified,
+                    "Unexpected value in move-constructed combinable object");
 
     // Move assignment must not cause copying of stored values
-    copy1=std::move(move1);
-    REQUIRE_MESSAGE(copy1.local().state == StateTrackableBase::Unspecified, "Unexpected value in move-assigned combinable object");
+    copy1 = std::move(move1);
+    REQUIRE_MESSAGE(copy1.local().state == StateTrackableBase::Unspecified,
+                    "Unexpected value in move-assigned combinable object");
 
     // Make the stored values valid again in order to delete StateTrackable object correctly
     copy1.local().state = StateTrackable<true>::MoveAssigned;
@@ -428,12 +439,12 @@ struct Body : utils::NoAssign {
     oneapi::tbb::combinable<int>* locals;
     const int nthread;
     const int nIters;
-    Body( int nthread_, int niters_ ) : nthread(nthread_), nIters(niters_) { sBarrier.initialize(nthread_); }
+    Body(int nthread_, int niters_) : nthread(nthread_), nIters(niters_) { sBarrier.initialize(nthread_); }
 
-    void operator()(int thread_id ) const {
+    void operator()(int thread_id) const {
         bool existed;
         sBarrier.wait();
-        for(int i = 0; i < nIters; ++i ) {
+        for (int i = 0; i < nIters; ++i) {
             existed = thread_id & 1;
             int oldval = locals->local(existed);
             REQUIRE_MESSAGE(existed == (i > 0), "Error on first reference");
@@ -445,14 +456,14 @@ struct Body : utils::NoAssign {
     }
 };
 
-void TestLocalAllocations( int nthread ) {
+void TestLocalAllocations(int nthread) {
     REQUIRE_MESSAGE(nthread > 0, "nthread must be positive");
 #define NITERATIONS 1000
     Body myBody(nthread, NITERATIONS);
     oneapi::tbb::combinable<int> myCombinable;
     myBody.locals = &myCombinable;
 
-    NativeParallelFor( nthread, myBody );
+    NativeParallelFor(nthread, myBody);
 
     int mySum = 0;
     int mySlots = 0;
@@ -465,11 +476,9 @@ void TestLocalAllocations( int nthread ) {
 
 void RunLocalAllocationsTests() {
     // REMARK("Testing local() allocations\n");
-    for(int i = 1 <= MinThread ? MinThread : 1; i <= MaxThread; ++i) {
+    for (int i = 1 <= MinThread ? MinThread : 1; i <= MaxThread; ++i) {
         // REMARK("  Testing local() allocation with nthreads=%d...\n", i);
-        for(int j = 0; j < 100; ++j) {
-            TestLocalAllocations(i);
-        }
+        for (int j = 0; j < 100; ++j) { TestLocalAllocations(i); }
         // REMARK("  done\n");
     }
 }
@@ -483,13 +492,8 @@ TEST_CASE("Parallel scenario") {
 
 //! Test assignment and copy construction
 //! \brief \ref interface \ref requirement
-TEST_CASE("Assignment and copy constructor test") {
-    RunAssignmentAndCopyConstructorTests();
-}
+TEST_CASE("Assignment and copy constructor test") { RunAssignmentAndCopyConstructorTests(); }
 
 //! Test move support
 //! \brief \ref interface \ref requirement
-TEST_CASE("Move semantics") {
-    RunMoveSemanticsForStateTrackableObjectTest();
-}
-
+TEST_CASE("Move semantics") { RunMoveSemanticsForStateTrackableObjectTest(); }
diff --git a/external/tbb/test/conformance/conformance_composite_node.cpp b/external/tbb/test/conformance/conformance_composite_node.cpp
index cb0821e5..eef1cd6e 100644
--- a/external/tbb/test/conformance/conformance_composite_node.cpp
+++ b/external/tbb/test/conformance/conformance_composite_node.cpp
@@ -15,7 +15,7 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
 #endif
 
 #include "conformance_flowgraph.h"
@@ -24,62 +24,66 @@
 //! \brief Test for [flow_graph.composite_node] specification
 
 class adder : public oneapi::tbb::flow::composite_node<std::tuple<int, int>, std::tuple<int>> {
-    oneapi::tbb::flow::join_node<std::tuple<int,int>, oneapi::tbb::flow::queueing> j;
-    oneapi::tbb::flow::function_node<std::tuple<int,int>, int> f;
+    oneapi::tbb::flow::join_node<std::tuple<int, int>, oneapi::tbb::flow::queueing> j;
+    oneapi::tbb::flow::function_node<std::tuple<int, int>, int> f;
     oneapi::tbb::flow::queue_node<int> qn;
-    using base_type = oneapi::tbb::flow::composite_node<std::tuple<int,int>, std::tuple<int>>;
+    using base_type = oneapi::tbb::flow::composite_node<std::tuple<int, int>, std::tuple<int>>;
 
     struct f_body {
-        int operator()(const std::tuple<int,int> &t) {
+        int operator()(const std::tuple<int, int> &t) {
             int sum = std::get<0>(t) + std::get<1>(t);
-            return  sum;
+            return sum;
         }
     };
 
 public:
-    adder(oneapi::tbb::flow::graph &g) : base_type(g), j(g), f(g, oneapi::tbb::flow::unlimited, f_body()), qn(g) {
+    adder(oneapi::tbb::flow::graph &g)
+        : base_type(g), j(g), f(g, oneapi::tbb::flow::unlimited, f_body()), qn(g) {
         make_edge(j, f);
         make_edge(f, qn);
 
-        base_type::input_ports_type input_tuple(oneapi::tbb::flow::input_port<0>(j), oneapi::tbb::flow::input_port<1>(j));
+        base_type::input_ports_type input_tuple(oneapi::tbb::flow::input_port<0>(j),
+                                                oneapi::tbb::flow::input_port<1>(j));
         base_type::output_ports_type output_tuple(qn);
         base_type::set_external_ports(input_tuple, output_tuple);
     }
 };
 
-template<int N, typename T1, typename T2>
+template <int N, typename T1, typename T2>
 struct compare {
     static void compare_refs(T1 tuple1, T2 tuple2) {
-    CHECK_MESSAGE(( &std::get<N>(tuple1) == &std::get<N>(tuple2)), "ports not set correctly");
-    compare<N-1, T1, T2>::compare_refs(tuple1, tuple2);
+        CHECK_MESSAGE((&std::get<N>(tuple1) == &std::get<N>(tuple2)), "ports not set correctly");
+        compare<N - 1, T1, T2>::compare_refs(tuple1, tuple2);
     }
 };
 
-template<typename T1, typename T2>
+template <typename T1, typename T2>
 struct compare<1, T1, T2> {
     static void compare_refs(T1 tuple1, T2 tuple2) {
-    CHECK_MESSAGE((&std::get<0>(tuple1) == &std::get<0>(tuple2)), "port 0 not correctly set");
+        CHECK_MESSAGE((&std::get<0>(tuple1) == &std::get<0>(tuple2)), "port 0 not correctly set");
     }
 };
 
 //! Test inheritance relations
 //! \brief \ref interface
-TEST_CASE("composite_node superclasses"){
-    CHECK_MESSAGE((std::is_base_of<oneapi::tbb::flow::graph_node, adder>::value), "composite_node should be derived from graph_node");
+TEST_CASE("composite_node superclasses") {
+    CHECK_MESSAGE((std::is_base_of<oneapi::tbb::flow::graph_node, adder>::value),
+                  "composite_node should be derived from graph_node");
 }
 
 //! Test composite_node ports
 //! \brief \ref interface \ref requirement
-TEST_CASE("composite_node ports"){
+TEST_CASE("composite_node ports") {
     oneapi::tbb::flow::graph g;
 
-    using InputTupleType = std::tuple<tbb::flow::continue_msg, std::tuple<int, int>, int, int, int, int,
-                             int, int, int, int, int, int, int, int>;
+    using InputTupleType = std::tuple<tbb::flow::continue_msg, std::tuple<int, int>, int, int, int, int, int,
+                                      int, int, int, int, int, int, int>;
 
-    using OutputTupleType = std::tuple<tbb::flow::continue_msg, std::tuple<int, int>, oneapi::tbb::flow::tagged_msg<size_t, int, float>,
-                             int, int, int, int, int, int, int, int, int, int, int, int>;
+    using OutputTupleType = std::tuple<tbb::flow::continue_msg, std::tuple<int, int>,
+                                       oneapi::tbb::flow::tagged_msg<size_t, int, float>, int, int, int, int,
+                                       int, int, int, int, int, int, int, int>;
 
-    using EmptyTupleType= std::tuple<>;
+    using EmptyTupleType = std::tuple<>;
 
     using input_output_type = oneapi::tbb::flow::composite_node<InputTupleType, OutputTupleType>;
     using input_only_type = oneapi::tbb::flow::composite_node<InputTupleType, EmptyTupleType>;
@@ -92,14 +96,15 @@ TEST_CASE("composite_node ports"){
 
     //node types
     oneapi::tbb::flow::continue_node<tbb::flow::continue_msg> ct(g, body());
-    oneapi::tbb::flow::split_node< std::tuple<int, int> > s(g);
+    oneapi::tbb::flow::split_node<std::tuple<int, int>> s(g);
     oneapi::tbb::flow::input_node<int> src(g, body());
     oneapi::tbb::flow::function_node<int, int> fxn(g, oneapi::tbb::flow::unlimited, body());
-    oneapi::tbb::flow::multifunction_node<int, std::tuple<int, int> > m_fxn(g, oneapi::tbb::flow::unlimited, body());
+    oneapi::tbb::flow::multifunction_node<int, std::tuple<int, int>> m_fxn(g, oneapi::tbb::flow::unlimited,
+                                                                           body());
     oneapi::tbb::flow::broadcast_node<int> bc(g);
     oneapi::tbb::flow::limiter_node<int> lim(g, 2);
     oneapi::tbb::flow::indexer_node<int, float> ind(g);
-    oneapi::tbb::flow::join_node< std::tuple< int, int >, oneapi::tbb::flow::queueing > j(g);
+    oneapi::tbb::flow::join_node<std::tuple<int, int>, oneapi::tbb::flow::queueing> j(g);
     oneapi::tbb::flow::queue_node<int> q(g);
     oneapi::tbb::flow::buffer_node<int> bf(g);
     oneapi::tbb::flow::priority_queue_node<int> pq(g);
@@ -107,10 +112,10 @@ TEST_CASE("composite_node ports"){
     oneapi::tbb::flow::overwrite_node<int> ovw(g);
     oneapi::tbb::flow::sequencer_node<int> seq(g, conformance::sequencer_functor<int>());
 
-    auto input_tuple = std::tie(ct, s, m_fxn, fxn, bc, oneapi::tbb::flow::input_port<0>(j), lim, q, oneapi::tbb::flow::input_port<0>(ind),
-                                pq, ovw, wo, bf, seq);
-    auto output_tuple = std::tie(ct,j, ind, fxn, src, bc, oneapi::tbb::flow::output_port<0>(s), lim, oneapi::tbb::flow::output_port<0>(m_fxn),
-                                 q, pq, ovw, wo, bf, seq);
+    auto input_tuple = std::tie(ct, s, m_fxn, fxn, bc, oneapi::tbb::flow::input_port<0>(j), lim, q,
+                                oneapi::tbb::flow::input_port<0>(ind), pq, ovw, wo, bf, seq);
+    auto output_tuple = std::tie(ct, j, ind, fxn, src, bc, oneapi::tbb::flow::output_port<0>(s), lim,
+                                 oneapi::tbb::flow::output_port<0>(m_fxn), q, pq, ovw, wo, bf, seq);
 
     //composite_node with both input_ports and output_ports
     input_output_type a_node(g);
@@ -120,12 +125,16 @@ TEST_CASE("composite_node ports"){
     a_node.add_nodes(src, fxn, m_fxn, bc, lim, ind, s, ct, j, q, bf, pq, wo, ovw, seq);
 
     auto a_node_input_ports_ptr = a_node.input_ports();
-    compare<NUM_INPUTS-1, decltype(a_node_input_ports_ptr), decltype(input_tuple)>::compare_refs(a_node_input_ports_ptr, input_tuple);
-    CHECK_MESSAGE(NUM_INPUTS == std::tuple_size<decltype(a_node_input_ports_ptr)>::value, "not all declared input ports were bound to nodes");
+    compare<NUM_INPUTS - 1, decltype(a_node_input_ports_ptr), decltype(input_tuple)>::compare_refs(
+            a_node_input_ports_ptr, input_tuple);
+    CHECK_MESSAGE(NUM_INPUTS == std::tuple_size<decltype(a_node_input_ports_ptr)>::value,
+                  "not all declared input ports were bound to nodes");
 
     auto a_node_output_ports_ptr = a_node.output_ports();
-    compare<NUM_OUTPUTS-1, decltype(a_node_output_ports_ptr), decltype(output_tuple)>::compare_refs(a_node_output_ports_ptr, output_tuple);
-    CHECK_MESSAGE((NUM_OUTPUTS == std::tuple_size<decltype(a_node_output_ports_ptr)>::value), "not all declared output ports were bound to nodes");
+    compare<NUM_OUTPUTS - 1, decltype(a_node_output_ports_ptr), decltype(output_tuple)>::compare_refs(
+            a_node_output_ports_ptr, output_tuple);
+    CHECK_MESSAGE((NUM_OUTPUTS == std::tuple_size<decltype(a_node_output_ports_ptr)>::value),
+                  "not all declared output ports were bound to nodes");
 
     //composite_node with only input_ports
     input_only_type b_node(g);
@@ -135,8 +144,10 @@ TEST_CASE("composite_node ports"){
     b_node.add_nodes(src, fxn, m_fxn, bc, lim, ind, s, ct, j, q, bf, pq, wo, ovw, seq);
 
     auto b_node_input_ports_ptr = b_node.input_ports();
-    compare<NUM_INPUTS-1, decltype(b_node_input_ports_ptr), decltype(input_tuple)>::compare_refs(b_node_input_ports_ptr, input_tuple);
-    CHECK_MESSAGE(NUM_INPUTS == std::tuple_size<decltype(b_node_input_ports_ptr)>::value, "not all declared input ports were bound to nodes");
+    compare<NUM_INPUTS - 1, decltype(b_node_input_ports_ptr), decltype(input_tuple)>::compare_refs(
+            b_node_input_ports_ptr, input_tuple);
+    CHECK_MESSAGE(NUM_INPUTS == std::tuple_size<decltype(b_node_input_ports_ptr)>::value,
+                  "not all declared input ports were bound to nodes");
 
     //composite_node with only output_ports
     output_only_type c_node(g);
@@ -150,13 +161,15 @@ TEST_CASE("composite_node ports"){
     c_node.add_nodes(src, fxn, m_fxn, bc, lim, ind, s, ct, j, q, bf, pq, wo, ovw, seq);
 
     auto c_node_output_ports_ptr = c_node.output_ports();
-    compare<NUM_OUTPUTS-1, decltype(c_node_output_ports_ptr), decltype(output_tuple)>::compare_refs(c_node_output_ports_ptr, output_tuple);
-    CHECK_MESSAGE(NUM_OUTPUTS == std::tuple_size<decltype(c_node_output_ports_ptr)>::value, "not all declared input ports were bound to nodes");
+    compare<NUM_OUTPUTS - 1, decltype(c_node_output_ports_ptr), decltype(output_tuple)>::compare_refs(
+            c_node_output_ports_ptr, output_tuple);
+    CHECK_MESSAGE(NUM_OUTPUTS == std::tuple_size<decltype(c_node_output_ports_ptr)>::value,
+                  "not all declared input ports were bound to nodes");
 }
 
 //! Test composite_node construction and message passing
 //! \brief \ref interface \ref requirement
-TEST_CASE("composite_node construction and message test"){
+TEST_CASE("composite_node construction and message test") {
     using namespace oneapi::tbb::flow;
     graph g;
     split_node<std::tuple<int, int, int, int>> s(g);
@@ -167,16 +180,16 @@ TEST_CASE("composite_node construction and message test"){
     make_edge(output_port<0>(s), input_port<0>(a0));
     make_edge(output_port<1>(s), input_port<1>(a0));
 
-    make_edge(output_port<0>(a0),input_port<0>(a1));
+    make_edge(output_port<0>(a0), input_port<0>(a1));
     make_edge(output_port<2>(s), input_port<1>(a1));
 
     make_edge(output_port<0>(a1), input_port<0>(a2));
     make_edge(output_port<3>(s), input_port<1>(a2));
 
-    s.try_put(std::make_tuple(1,3,5,7));
+    s.try_put(std::make_tuple(1, 3, 5, 7));
     g.wait_for_all();
 
     int tmp = -1;
     CHECK_MESSAGE((output_port<0>(a2).try_get(tmp) == true), "Composite node should produce a value");
-    CHECK_MESSAGE((tmp == 1+3+5+7), "Composite node should produce correct sum");
+    CHECK_MESSAGE((tmp == 1 + 3 + 5 + 7), "Composite node should produce correct sum");
 }
diff --git a/external/tbb/test/conformance/conformance_concurrent_hash_map.cpp b/external/tbb/test/conformance/conformance_concurrent_hash_map.cpp
index 889739b9..08853f1f 100644
--- a/external/tbb/test/conformance/conformance_concurrent_hash_map.cpp
+++ b/external/tbb/test/conformance/conformance_concurrent_hash_map.cpp
@@ -14,19 +14,19 @@
     limitations under the License.
 */
 
-#include <common/test.h>
-#include <common/utils.h>
 #include "common/utils_report.h"
-#include <common/spin_barrier.h>
-#include <common/state_trackable.h>
+#include "oneapi/tbb/concurrent_hash_map.h"
+#include "oneapi/tbb/global_control.h"
+#include "oneapi/tbb/parallel_for.h"
 #include <common/container_move_support.h>
 #include <common/containers_common.h>
 #include <common/initializer_list_support.h>
-#include <common/vector_types.h>
+#include <common/spin_barrier.h>
+#include <common/state_trackable.h>
+#include <common/test.h>
 #include <common/test_comparisons.h>
-#include "oneapi/tbb/concurrent_hash_map.h"
-#include "oneapi/tbb/global_control.h"
-#include "oneapi/tbb/parallel_for.h"
+#include <common/utils.h>
+#include <common/vector_types.h>
 
 //! \file conformance_concurrent_hash_map.cpp
 //! \brief Test for [containers.concurrent_hash_map containers.tbb_hash_compare] specification
@@ -35,7 +35,7 @@
     that concurrent_hash_map uses only the required interface. */
 class MyException : public std::bad_alloc {
 public:
-    virtual const char *what() const noexcept override { return "out of items limit"; }
+    virtual const char* what() const noexcept override { return "out of items limit"; }
     virtual ~MyException() noexcept {}
 };
 
@@ -46,11 +46,12 @@ class MyKey {
     int key;
     friend class MyHashCompare;
     friend class YourHashCompare;
+
 public:
     MyKey() = default;
-    MyKey( const MyKey& ) = default;
-    void operator=( const MyKey&  ) = delete;
-    static MyKey make( int i ) {
+    MyKey(const MyKey&) = default;
+    void operator=(const MyKey&) = delete;
+    static MyKey make(int i) {
         MyKey result;
         result.key = i;
         return result;
@@ -66,28 +67,21 @@ class MyData {
 protected:
     friend class MyData2;
     int data;
-    enum state_t {
-        LIVE=0x1234,
-        DEAD=0x5678
-    } my_state;
-    void operator=( const MyData& );    // Deny access
+    enum state_t { LIVE = 0x1234, DEAD = 0x5678 } my_state;
+    void operator=(const MyData&);// Deny access
 public:
     MyData(int i = 0) {
         my_state = LIVE;
         data = i;
-        if (MyDataCountLimit && MyDataCount + 1 >= MyDataCountLimit) {
-            TBB_TEST_THROW(MyException{});
-        }
+        if (MyDataCountLimit && MyDataCount + 1 >= MyDataCountLimit) { TBB_TEST_THROW(MyException {}); }
         ++MyDataCount;
     }
 
-    MyData( const MyData& other ) {
-        CHECK_FAST(other.my_state==LIVE);
+    MyData(const MyData& other) {
+        CHECK_FAST(other.my_state == LIVE);
         my_state = LIVE;
         data = other.data;
-        if(MyDataCountLimit && MyDataCount + 1 >= MyDataCountLimit) {
-            TBB_TEST_THROW(MyException{});
-        }
+        if (MyDataCountLimit && MyDataCount + 1 >= MyDataCountLimit) { TBB_TEST_THROW(MyException {}); }
         ++MyDataCount;
     }
 
@@ -96,84 +90,76 @@ class MyData {
         my_state = DEAD;
     }
 
-    static MyData make( int i ) {
+    static MyData make(int i) {
         MyData result;
         result.data = i;
         return result;
     }
 
     int value_of() const {
-        CHECK_FAST(my_state==LIVE);
+        CHECK_FAST(my_state == LIVE);
         return data;
     }
 
-    void set_value( int i ) {
-        CHECK_FAST(my_state==LIVE);
+    void set_value(int i) {
+        CHECK_FAST(my_state == LIVE);
         data = i;
     }
 
-    bool operator==( const MyData& other ) const {
-        CHECK_FAST(other.my_state==LIVE);
-        CHECK_FAST(my_state==LIVE);
+    bool operator==(const MyData& other) const {
+        CHECK_FAST(other.my_state == LIVE);
+        CHECK_FAST(my_state == LIVE);
         return data == other.data;
     }
 };
 
 class MyData2 : public MyData {
 public:
-    MyData2( ) {}
+    MyData2() {}
 
-    MyData2( const MyData2& other ) : MyData() {
-        CHECK_FAST(other.my_state==LIVE);
-        CHECK_FAST(my_state==LIVE);
+    MyData2(const MyData2& other) : MyData() {
+        CHECK_FAST(other.my_state == LIVE);
+        CHECK_FAST(my_state == LIVE);
         data = other.data;
     }
 
-    MyData2( const MyData& other ) {
-        CHECK_FAST(other.my_state==LIVE);
-        CHECK_FAST(my_state==LIVE);
+    MyData2(const MyData& other) {
+        CHECK_FAST(other.my_state == LIVE);
+        CHECK_FAST(my_state == LIVE);
         data = other.data;
     }
 
-    void operator=( const MyData& other ) {
-        CHECK_FAST(other.my_state==LIVE);
-        CHECK_FAST(my_state==LIVE);
+    void operator=(const MyData& other) {
+        CHECK_FAST(other.my_state == LIVE);
+        CHECK_FAST(my_state == LIVE);
         data = other.data;
     }
 
-    void operator=( const MyData2& other ) {
-        CHECK_FAST(other.my_state==LIVE);
-        CHECK_FAST(my_state==LIVE);
+    void operator=(const MyData2& other) {
+        CHECK_FAST(other.my_state == LIVE);
+        CHECK_FAST(my_state == LIVE);
         data = other.data;
     }
 
-    bool operator==( const MyData2& other ) const {
-        CHECK_FAST(other.my_state==LIVE);
-        CHECK_FAST(my_state==LIVE);
+    bool operator==(const MyData2& other) const {
+        CHECK_FAST(other.my_state == LIVE);
+        CHECK_FAST(my_state == LIVE);
         return data == other.data;
     }
 };
 
 class MyHashCompare {
 public:
-    bool equal( const MyKey& j, const MyKey& k ) const {
-        return j.key==k.key;
-    }
+    bool equal(const MyKey& j, const MyKey& k) const { return j.key == k.key; }
 
-    std::size_t hash( const MyKey& k ) const {
-        return k.key;
-    }
+    std::size_t hash(const MyKey& k) const { return k.key; }
 };
 
 class YourHashCompare {
 public:
-    bool equal( const MyKey& j, const MyKey& k ) const {
-        return j.key==k.key;
-    }
+    bool equal(const MyKey& j, const MyKey& k) const { return j.key == k.key; }
 
-    std::size_t hash( const MyKey& ) const {
-        return 1;
-    }
+    std::size_t hash(const MyKey&) const { return 1; }
 };
 
 using test_allocator_type = StaticSharedCountingAllocator<std::allocator<std::pair<const MyKey, MyData>>>;
@@ -183,7 +169,8 @@ using other_test_table_type = oneapi::tbb::concurrent_hash_map<MyKey, MyData2, M
 template <template <typename...> class ContainerType>
 void test_member_types() {
     using container_type = ContainerType<int, int>;
-    static_assert(std::is_same<typename container_type::allocator_type, oneapi::tbb::tbb_allocator<std::pair<const int, int>>>::value,
+    static_assert(std::is_same<typename container_type::allocator_type,
+                               oneapi::tbb::tbb_allocator<std::pair<const int, int>>>::value,
                   "Incorrect default template allocator");
 
     static_assert(std::is_same<typename container_type::key_type, int>::value,
@@ -202,9 +189,11 @@ void test_member_types() {
     static_assert(std::is_same<typename container_type::const_reference, const value_type&>::value,
                   "Incorrect container const_reference member type");
     using allocator_type = typename container_type::allocator_type;
-    static_assert(std::is_same<typename container_type::pointer, typename std::allocator_traits<allocator_type>::pointer>::value,
+    static_assert(std::is_same<typename container_type::pointer,
+                               typename std::allocator_traits<allocator_type>::pointer>::value,
                   "Incorrect container pointer member type");
-    static_assert(std::is_same<typename container_type::const_pointer, typename std::allocator_traits<allocator_type>::const_pointer>::value,
+    static_assert(std::is_same<typename container_type::const_pointer,
+                               typename std::allocator_traits<allocator_type>::const_pointer>::value,
                   "Incorrect container const_pointer member type");
 
     static_assert(utils::is_forward_iterator<typename container_type::iterator>::value,
@@ -217,89 +206,88 @@ void test_member_types() {
                   "Incorrect container iterator member type");
 }
 
-template<typename test_table_type>
-void FillTable( test_table_type& x, int n ) {
-    for( int i=1; i<=n; ++i ) {
-        MyKey key( MyKey::make(-i) ); // hash values must not be specified in direct order
+template <typename test_table_type>
+void FillTable(test_table_type& x, int n) {
+    for (int i = 1; i <= n; ++i) {
+        MyKey key(MyKey::make(-i));// hash values must not be specified in direct order
         typename test_table_type::accessor a;
-        bool b = x.insert(a,key);
+        bool b = x.insert(a, key);
         CHECK_FAST(b);
-        a->second.set_value( i*i );
+        a->second.set_value(i * i);
     }
 }
 
-template<typename test_table_type>
-static void CheckTable( const test_table_type& x, int n ) {
-    REQUIRE_MESSAGE( x.size()==size_t(n), "table is different size than expected" );
-    CHECK(x.empty()==(n==0));
-    CHECK(x.size()<=x.max_size());
-    for( int i=1; i<=n; ++i ) {
-        MyKey key( MyKey::make(-i) );
+template <typename test_table_type>
+static void CheckTable(const test_table_type& x, int n) {
+    REQUIRE_MESSAGE(x.size() == size_t(n), "table is different size than expected");
+    CHECK(x.empty() == (n == 0));
+    CHECK(x.size() <= x.max_size());
+    for (int i = 1; i <= n; ++i) {
+        MyKey key(MyKey::make(-i));
         typename test_table_type::const_accessor a;
-        bool b = x.find(a,key);
+        bool b = x.find(a, key);
         CHECK_FAST(b);
-        CHECK_FAST(a->second.value_of()==i*i);
+        CHECK_FAST(a->second.value_of() == i * i);
     }
     int count = 0;
     int key_sum = 0;
-    for( typename test_table_type::const_iterator i(x.begin()); i!=x.end(); ++i ) {
+    for (typename test_table_type::const_iterator i(x.begin()); i != x.end(); ++i) {
         ++count;
         key_sum += -i->first.value_of();
     }
-    CHECK(count==n);
-    CHECK(key_sum==n*(n+1)/2);
+    CHECK(count == n);
+    CHECK(key_sum == n * (n + 1) / 2);
 }
 
 void TestCopy() {
     INFO("testing copy\n");
     test_table_type t1;
-    for( int i=0; i<10000; i=(i<100 ? i+1 : i*3) ) {
+    for (int i = 0; i < 10000; i = (i < 100 ? i + 1 : i * 3)) {
         MyDataCount = 0;
 
-        FillTable(t1,i);
+        FillTable(t1, i);
         // Do not call CheckTable(t1,i) before copying, it enforces rehashing
 
         test_table_type t2(t1);
         // Check that copy constructor did not mangle source table.
-        CheckTable(t1,i);
+        CheckTable(t1, i);
         swap(t1, t2);
-        CheckTable(t1,i);
+        CheckTable(t1, i);
         CHECK(!(t1 != t2));
 
         // Clear original table
         t2.clear();
         swap(t2, t1);
-        CheckTable(t1,0);
+        CheckTable(t1, 0);
 
         // Verify that copy of t1 is correct, even after t1 is cleared.
-        CheckTable(t2,i);
+        CheckTable(t2, i);
         t2.clear();
-        t1.swap( t2 );
-        CheckTable(t1,0);
-        CheckTable(t2,0);
-        REQUIRE_MESSAGE( MyDataCount==0, "data leak?" );
+        t1.swap(t2);
+        CheckTable(t1, 0);
+        CheckTable(t2, 0);
+        REQUIRE_MESSAGE(MyDataCount == 0, "data leak?");
     }
 }
 
 void TestRehash() {
     INFO("testing rehashing\n");
     test_table_type w;
-    w.insert( std::make_pair(MyKey::make(-5), MyData()) );
-    w.rehash(); // without this, assertion will fail
+    w.insert(std::make_pair(MyKey::make(-5), MyData()));
+    w.rehash();// without this, assertion will fail
     test_table_type::iterator it = w.begin();
-    int i = 0; // check for non-rehashed buckets
-    for( ; it != w.end(); i++ )
-        w.count( (it++)->first );
+    int i = 0;// check for non-rehashed buckets
+    for (; it != w.end(); i++) w.count((it++)->first);
     CHECK(i == 1);
-    for( i=0; i<1000; i=(i<29 ? i+1 : i*2) ) {
-        for( int j=std::max(256+i, i*2); j<10000; j*=3 ) {
+    for (i = 0; i < 1000; i = (i < 29 ? i + 1 : i * 2)) {
+        for (int j = std::max(256 + i, i * 2); j < 10000; j *= 3) {
             test_table_type v;
-            FillTable( v, i );
+            FillTable(v, i);
             CHECK(int(v.size()) == i);
             CHECK(int(v.bucket_count()) <= j);
-            v.rehash( j );
+            v.rehash(j);
             CHECK(int(v.bucket_count()) >= j);
-            CheckTable( v, i );
+            CheckTable(v, i);
         }
     }
 }
@@ -307,72 +295,73 @@ void TestRehash() {
 void TestAssignment() {
     INFO("testing assignment\n");
     oneapi::tbb::concurrent_hash_map<int, int> test_map({{1, 2}, {2, 4}});
-    test_map.operator=(test_map); // suppress self assign warning
+    test_map.operator=(test_map);// suppress self assign warning
     CHECK(!test_map.empty());
 
-    for( int i=0; i<1000; i=(i<30 ? i+1 : i*5) ) {
-        for( int j=0; j<1000; j=(j<30 ? j+1 : j*7) ) {
+    for (int i = 0; i < 1000; i = (i < 30 ? i + 1 : i * 5)) {
+        for (int j = 0; j < 1000; j = (j < 30 ? j + 1 : j * 7)) {
             test_table_type t1;
             test_table_type t2;
-            FillTable(t1,i);
-            FillTable(t2,j);
+            FillTable(t1, i);
+            FillTable(t2, j);
             CHECK((t1 == t2) == (i == j));
-            CheckTable(t2,j);
+            CheckTable(t2, j);
 
-            test_table_type& tref = t2=t1;
-            CHECK(&tref==&t2);
+            test_table_type& tref = t2 = t1;
+            CHECK(&tref == &t2);
             CHECK(t1 == t2);
-            CheckTable(t1,i);
-            CheckTable(t2,i);
+            CheckTable(t1, i);
+            CheckTable(t2, i);
 
             t1.clear();
-            CheckTable(t1,0);
-            CheckTable(t2,i);
-            REQUIRE_MESSAGE( MyDataCount==i, "data leak?" );
+            CheckTable(t1, 0);
+            CheckTable(t2, i);
+            REQUIRE_MESSAGE(MyDataCount == i, "data leak?");
 
             t2.clear();
-            CheckTable(t1,0);
-            CheckTable(t2,0);
-            REQUIRE_MESSAGE( MyDataCount==0, "data leak?" );
+            CheckTable(t1, 0);
+            CheckTable(t2, 0);
+            REQUIRE_MESSAGE(MyDataCount == 0, "data leak?");
         }
     }
 }
 
-template<typename Iterator, typename T>
+template <typename Iterator, typename T>
 void TestIteratorTraits() {
     T x;
     typename Iterator::reference xr = x;
     typename Iterator::pointer xp = &x;
-    CHECK(&xr==xp);
+    CHECK(&xr == xp);
 }
 
-template<typename Iterator1, typename Iterator2>
-void TestIteratorAssignment( Iterator2 j ) {
+template <typename Iterator1, typename Iterator2>
+void TestIteratorAssignment(Iterator2 j) {
     Iterator1 i(j), k;
-    CHECK(i==j);
-    CHECK(!(i!=j));
+    CHECK(i == j);
+    CHECK(!(i != j));
     k = j;
-    CHECK(k==j);
-    CHECK(!(k!=j));
+    CHECK(k == j);
+    CHECK(!(k != j));
 }
 
-template<typename Range1, typename Range2>
-void TestRangeAssignment( Range2 r2 ) {
-    Range1 r1(r2); r1 = r2;
+template <typename Range1, typename Range2>
+void TestRangeAssignment(Range2 r2) {
+    Range1 r1(r2);
+    r1 = r2;
 }
 
 void TestIteratorsAndRanges() {
     INFO("testing iterators compliance\n");
-    TestIteratorTraits<test_table_type::iterator,test_table_type::value_type>();
-    TestIteratorTraits<test_table_type::const_iterator,const test_table_type::value_type>();
+    TestIteratorTraits<test_table_type::iterator, test_table_type::value_type>();
+    TestIteratorTraits<test_table_type::const_iterator, const test_table_type::value_type>();
 
     test_table_type v;
     CHECK(v.range().grainsize() == 1);
-    test_table_type const &u = v;
+    test_table_type const& u = v;
 
-    TestIteratorAssignment<test_table_type::const_iterator>( u.begin() );
-    TestIteratorAssignment<test_table_type::const_iterator>( v.begin() );
-    TestIteratorAssignment<test_table_type::iterator>( v.begin() );
+    TestIteratorAssignment<test_table_type::const_iterator>(u.begin());
+    TestIteratorAssignment<test_table_type::const_iterator>(v.begin());
+    TestIteratorAssignment<test_table_type::iterator>(v.begin());
     // doesn't compile as expected: TestIteratorAssignment<typename V::iterator>( u.begin() );
 
     // check for non-existing
@@ -380,65 +369,70 @@ void TestIteratorsAndRanges() {
     CHECK(u.equal_range(MyKey::make(-1)) == std::make_pair(u.end(), u.end()));
 
     INFO("testing ranges compliance\n");
-    TestRangeAssignment<test_table_type::const_range_type>( u.range() );
-    TestRangeAssignment<test_table_type::range_type>( v.range() );
+    TestRangeAssignment<test_table_type::const_range_type>(u.range());
+    TestRangeAssignment<test_table_type::range_type>(v.range());
     // doesn't compile as expected: TestRangeAssignment<typename V::range_type>( u.range() );
 
     INFO("testing construction and insertion from iterators range\n");
-    FillTable( v, 1000 );
+    FillTable(v, 1000);
     other_test_table_type t(v.begin(), v.end());
     v.rehash();
     CheckTable(t, 1000);
-    t.insert(v.begin(), v.end()); // do nothing
+    t.insert(v.begin(), v.end());// do nothing
     CheckTable(t, 1000);
     t.clear();
-    t.insert(v.begin(), v.end()); // restore
+    t.insert(v.begin(), v.end());// restore
     CheckTable(t, 1000);
 
     INFO("testing comparison\n");
-    using test_allocator_type2 = StaticSharedCountingAllocator<std::allocator<std::pair<const MyKey, MyData2>>>;
-    using YourTable1 = oneapi::tbb::concurrent_hash_map<MyKey,MyData2,YourHashCompare, test_allocator_type2>;
-    using YourTable2 = oneapi::tbb::concurrent_hash_map<MyKey,MyData2,YourHashCompare>;
+    using test_allocator_type2
+            = StaticSharedCountingAllocator<std::allocator<std::pair<const MyKey, MyData2>>>;
+    using YourTable1
+            = oneapi::tbb::concurrent_hash_map<MyKey, MyData2, YourHashCompare, test_allocator_type2>;
+    using YourTable2 = oneapi::tbb::concurrent_hash_map<MyKey, MyData2, YourHashCompare>;
     YourTable1 t1;
-    FillTable( t1, 10 );
-    CheckTable(t1, 10 );
+    FillTable(t1, 10);
+    CheckTable(t1, 10);
     YourTable2 t2(t1.begin(), t1.end());
-    MyKey key( MyKey::make(-5) ); MyData2 data;
+    MyKey key(MyKey::make(-5));
+    MyData2 data;
     CHECK(t2.erase(key));
     YourTable2::accessor a;
     CHECK(t2.insert(a, key));
-    data.set_value(0);   a->second = data;
+    data.set_value(0);
+    a->second = data;
     CHECK(t1 != t2);
-    data.set_value(5*5); a->second = data;
+    data.set_value(5 * 5);
+    a->second = data;
     CHECK(t1 == t2);
 }
 
 struct test_insert {
-    template<typename container_type, typename element_type>
-    static void test( std::initializer_list<element_type> il, container_type const& expected ) {
+    template <typename container_type, typename element_type>
+    static void test(std::initializer_list<element_type> il, container_type const& expected) {
         container_type vd;
-        vd.insert( il );
-        REQUIRE_MESSAGE( vd == expected, "inserting with an initializer list failed" );
+        vd.insert(il);
+        REQUIRE_MESSAGE(vd == expected, "inserting with an initializer list failed");
     }
 };
 
 struct ctor_test {
- template<typename container_type, typename element_type>
-    static void test( std::initializer_list<element_type> il, container_type const& expected ) {
-        container_type vd(il, tbb::tbb_allocator<std::pair<element_type, element_type>>{});
-        REQUIRE_MESSAGE( vd == expected, "inserting with an initializer list failed" );
+    template <typename container_type, typename element_type>
+    static void test(std::initializer_list<element_type> il, container_type const& expected) {
+        container_type vd(il, tbb::tbb_allocator<std::pair<element_type, element_type>> {});
+        REQUIRE_MESSAGE(vd == expected, "inserting with an initializer list failed");
     }
 };
 
-void TestInitList(){
+void TestInitList() {
     using namespace initializer_list_support_tests;
     INFO("testing initializer_list methods \n");
 
-    using ch_map_type = oneapi::tbb::concurrent_hash_map<int,int>;
-    std::initializer_list<ch_map_type::value_type> pairs_il = {{1,1},{2,2},{3,3},{4,4},{5,5}};
+    using ch_map_type = oneapi::tbb::concurrent_hash_map<int, int>;
+    std::initializer_list<ch_map_type::value_type> pairs_il = {{1, 1}, {2, 2}, {3, 3}, {4, 4}, {5, 5}};
 
-    test_initializer_list_support_without_assign<ch_map_type, test_insert>( pairs_il );
-    test_initializer_list_support_without_assign<ch_map_type, test_insert>( {} );
+    test_initializer_list_support_without_assign<ch_map_type, test_insert>(pairs_il);
+    test_initializer_list_support_without_assign<ch_map_type, test_insert>({});
     test_initializer_list_support_without_assign<ch_map_type, ctor_test>(pairs_il);
 }
 
@@ -446,8 +440,9 @@ template <typename base_alloc_type>
 class only_node_counting_allocator : public StaticSharedCountingAllocator<base_alloc_type> {
     using base_type = StaticSharedCountingAllocator<base_alloc_type>;
     using base_traits = oneapi::tbb::detail::allocator_traits<base_alloc_type>;
+
 public:
-    template<typename U>
+    template <typename U>
     struct rebind {
         using other = only_node_counting_allocator<typename base_traits::template rebind_alloc<U>>;
     };
@@ -455,11 +450,11 @@ class only_node_counting_allocator : public StaticSharedCountingAllocator<base_a
     only_node_counting_allocator() : base_type() {}
     only_node_counting_allocator(const only_node_counting_allocator& a) : base_type(a) {}
 
-    template<typename U>
+    template <typename U>
     only_node_counting_allocator(const only_node_counting_allocator<U>& a) : base_type(a) {}
 
     typename base_type::value_type* allocate(const std::size_t n) {
-        if ( n > 1) {
+        if (n > 1) {
             return base_alloc_type::allocate(n);
         } else {
             return base_type::allocate(n);
@@ -469,93 +464,89 @@ class only_node_counting_allocator : public StaticSharedCountingAllocator<base_a
 
 #if TBB_USE_EXCEPTIONS
 void TestExceptions() {
-    using allocator_type = only_node_counting_allocator<oneapi::tbb::tbb_allocator<std::pair<const MyKey, MyData2>>>;
+    using allocator_type
+            = only_node_counting_allocator<oneapi::tbb::tbb_allocator<std::pair<const MyKey, MyData2>>>;
     using throwing_table = oneapi::tbb::concurrent_hash_map<MyKey, MyData2, MyHashCompare, allocator_type>;
-    enum methods {
-        zero_method = 0,
-        ctor_copy, op_assign, op_insert,
-        all_methods
-    };
+    enum methods { zero_method = 0, ctor_copy, op_assign, op_insert, all_methods };
 
     INFO("testing exception-safety guarantees\n");
     throwing_table src;
-    FillTable( src, 1000 );
-    CHECK(MyDataCount==1000);
+    FillTable(src, 1000);
+    CHECK(MyDataCount == 1000);
 
     try {
-        for(int t = 0; t < 2; t++) // exception type
-        for(int m = zero_method+1; m < all_methods; m++)
-        {
-            allocator_type a;
-            allocator_type::init_counters();
-            if(t) MyDataCountLimit = 101;
-            else a.set_limits(101);
-            throwing_table victim(a);
-            MyDataCount = 0;
-
-            try {
-                switch(m) {
-                case ctor_copy: {
-                        throwing_table acopy(src, a);
-                    } break;
-                case op_assign: {
-                        victim = src;
-                    } break;
-                case op_insert: {
-                        // Insertion in cpp11 don't make copy constructions
-                        // during the insertion, so we need to decrement limit
-                        // to throw an exception in the right place and to prevent
-                        // successful insertion of one unexpected item
-                        if (MyDataCountLimit)
-                            --MyDataCountLimit;
-                        FillTable( victim, 1000 );
-                    } break;
-                default:;
-                }
-                REQUIRE_MESSAGE(false, "should throw an exception");
-            } catch(std::bad_alloc &e) {
-                MyDataCountLimit = 0;
-                size_t size = victim.size();
-                switch(m) {
-                case op_assign:
-                    REQUIRE_MESSAGE( MyDataCount==100, "data leak?" );
-                    CHECK(size>=100);
-                    utils_fallthrough;
-                case ctor_copy:
-                    CheckTable(src, 1000);
-                    break;
-                case op_insert:
-                    CHECK(size==size_t(100-t));
-                    REQUIRE_MESSAGE( MyDataCount==100-t, "data leak?" );
-                    CheckTable(victim, 100-t);
-                    break;
-
-                default:; // nothing to check here
-                }
-                INFO("Exception "<< m << " : " << e.what() << "- ok ()");
-            }
-            catch ( ... ) {
-                REQUIRE_MESSAGE( false, "Unrecognized exception" );
+        for (int t = 0; t < 2; t++)// exception type
+            for (int m = zero_method + 1; m < all_methods; m++) {
+                allocator_type a;
+                allocator_type::init_counters();
+                if (t) MyDataCountLimit = 101;
+                else
+                    a.set_limits(101);
+                throwing_table victim(a);
+                MyDataCount = 0;
+
+                try {
+                    switch (m) {
+                        case ctor_copy: {
+                            throwing_table acopy(src, a);
+                        } break;
+                        case op_assign: {
+                            victim = src;
+                        } break;
+                        case op_insert: {
+                            // Insertion in cpp11 don't make copy constructions
+                            // during the insertion, so we need to decrement limit
+                            // to throw an exception in the right place and to prevent
+                            // successful insertion of one unexpected item
+                            if (MyDataCountLimit) --MyDataCountLimit;
+                            FillTable(victim, 1000);
+                        } break;
+                        default:;
+                    }
+                    REQUIRE_MESSAGE(false, "should throw an exception");
+                } catch (std::bad_alloc& e) {
+                    MyDataCountLimit = 0;
+                    size_t size = victim.size();
+                    switch (m) {
+                        case op_assign:
+                            REQUIRE_MESSAGE(MyDataCount == 100, "data leak?");
+                            CHECK(size >= 100);
+                            utils_fallthrough;
+                        case ctor_copy:
+                            CheckTable(src, 1000);
+                            break;
+                        case op_insert:
+                            CHECK(size == size_t(100 - t));
+                            REQUIRE_MESSAGE(MyDataCount == 100 - t, "data leak?");
+                            CheckTable(victim, 100 - t);
+                            break;
+
+                        default:;// nothing to check here
+                    }
+                    INFO("Exception " << m << " : " << e.what() << "- ok ()");
+                } catch (...) { REQUIRE_MESSAGE(false, "Unrecognized exception"); }
             }
-        }
-    } catch(...) {
-        REQUIRE_MESSAGE(false, "unexpected exception");
-    }
-    src.clear(); MyDataCount = 0;
+    } catch (...) { REQUIRE_MESSAGE(false, "unexpected exception"); }
+    src.clear();
+    MyDataCount = 0;
     allocator_type::max_items = 0;
 }
 #endif
 
 struct default_container_traits {
     template <typename container_type, typename iterator_type>
-    static container_type& construct_container(typename std::aligned_storage<sizeof(container_type)>::type& storage, iterator_type begin, iterator_type end){
+    static container_type&
+    construct_container(typename std::aligned_storage<sizeof(container_type)>::type& storage,
+                        iterator_type begin, iterator_type end) {
         container_type* ptr = reinterpret_cast<container_type*>(&storage);
         new (ptr) container_type(begin, end);
         return *ptr;
     }
 
     template <typename container_type, typename iterator_type, typename allocator_type>
-    static container_type& construct_container(typename std::aligned_storage<sizeof(container_type)>::type& storage, iterator_type begin, iterator_type end, allocator_type const& a){
+    static container_type&
+    construct_container(typename std::aligned_storage<sizeof(container_type)>::type& storage,
+                        iterator_type begin, iterator_type end, allocator_type const& a) {
         container_type* ptr = reinterpret_cast<container_type*>(&storage);
         new (ptr) container_type(begin, end, a);
         return *ptr;
@@ -563,16 +554,12 @@ struct default_container_traits {
 };
 
 struct hash_map_traits : default_container_traits {
-    enum{ expected_number_of_items_to_allocate_for_steal_move = 0 };
+    enum { expected_number_of_items_to_allocate_for_steal_move = 0 };
 
-    template<typename T>
+    template <typename T>
     struct hash_compare {
-        bool equal( const T& lhs, const T& rhs ) const {
-            return lhs==rhs;
-        }
-        size_t hash( const T& k ) const {
-            return my_hash_func(k);
-        }
+        bool equal(const T& lhs, const T& rhs) const { return lhs == rhs; }
+        size_t hash(const T& k) const { return my_hash_func(k); }
         std::hash<T> my_hash_func;
     };
 
@@ -582,22 +569,20 @@ struct hash_map_traits : default_container_traits {
     template <typename T>
     using container_value_type = std::pair<const T, T>;
 
-    template<typename element_type, typename allocator_type>
+    template <typename element_type, typename allocator_type>
     struct apply {
-        using type = oneapi::tbb::concurrent_hash_map<element_type, element_type, hash_compare<element_type>, allocator_type>;
+        using type = oneapi::tbb::concurrent_hash_map<element_type, element_type, hash_compare<element_type>,
+                                                      allocator_type>;
     };
 
     using init_iterator_type = move_support_tests::FooPairIterator;
     template <typename hash_map_type, typename iterator>
-    static bool equal(hash_map_type const& c, iterator begin, iterator end){
-        bool equal_sizes = ( static_cast<size_t>(std::distance(begin, end)) == c.size() );
-        if (!equal_sizes)
-            return false;
-
-        for (iterator it = begin; it != end; ++it ){
-            if (c.count( (*it).first) == 0){
-                return false;
-            }
+    static bool equal(hash_map_type const& c, iterator begin, iterator end) {
+        bool equal_sizes = (static_cast<size_t>(std::distance(begin, end)) == c.size());
+        if (!equal_sizes) return false;
+
+        for (iterator it = begin; it != end; ++it) {
+            if (c.count((*it).first) == 0) { return false; }
         }
         return true;
     }
@@ -606,11 +591,11 @@ struct hash_map_traits : default_container_traits {
 using DataStateTrackedTable = oneapi::tbb::concurrent_hash_map<MyKey, move_support_tests::Foo, MyHashCompare>;
 
 struct RvalueInsert {
-    static void apply( DataStateTrackedTable& table, int i ) {
+    static void apply(DataStateTrackedTable& table, int i) {
         DataStateTrackedTable::accessor a;
         int next = i + 1;
-        CHECK_FAST_MESSAGE((table.insert( a, std::make_pair(MyKey::make(i), move_support_tests::Foo(next)))),
-            "already present while should not ?" );
+        CHECK_FAST_MESSAGE((table.insert(a, std::make_pair(MyKey::make(i), move_support_tests::Foo(next)))),
+                           "already present while should not ?");
         CHECK_FAST((*a).second == next);
         CHECK_FAST((*a).second.state == StateTrackableBase::MoveInitialized);
     }
@@ -618,15 +603,14 @@ struct RvalueInsert {
 
 struct Emplace {
     template <typename Accessor>
-    static void apply_impl( DataStateTrackedTable& table, int i) {
+    static void apply_impl(DataStateTrackedTable& table, int i) {
         Accessor a;
-        CHECK_FAST_MESSAGE((table.emplace( a, MyKey::make(i), (i + 1))),
-                "already present while should not ?" );
+        CHECK_FAST_MESSAGE((table.emplace(a, MyKey::make(i), (i + 1))), "already present while should not ?");
         CHECK_FAST((*a).second == i + 1);
         CHECK_FAST((*a).second.state == StateTrackableBase::DirectInitialized);
     }
 
-    static void apply( DataStateTrackedTable& table, int i ) {
+    static void apply(DataStateTrackedTable& table, int i) {
         // TODO: investigate ability to rewrite apply methods with use apply_imp method.
         if (i % 2) {
             apply_impl<DataStateTrackedTable::accessor>(table, i);
@@ -636,136 +620,131 @@ struct Emplace {
     }
 };
 
-template<typename Op, typename test_table_type>
+template <typename Op, typename test_table_type>
 class TableOperation {
     test_table_type& my_table;
+
 public:
-    void operator()( const oneapi::tbb::blocked_range<int>& range ) const {
-        for( int i=range.begin(); i!=range.end(); ++i )
-            Op::apply(my_table,i);
+    void operator()(const oneapi::tbb::blocked_range<int>& range) const {
+        for (int i = range.begin(); i != range.end(); ++i) Op::apply(my_table, i);
     }
-    TableOperation( test_table_type& table ) : my_table(table) {}
+    TableOperation(test_table_type& table) : my_table(table) {}
 };
 
-bool UseKey( size_t i ) {
-    return (i&3)!=3;
-}
+bool UseKey(size_t i) { return (i & 3) != 3; }
 
 struct Insert {
-    static void apply( test_table_type& table, int i ) {
-        if( UseKey(i) ) {
-            if( i&4 ) {
+    static void apply(test_table_type& table, int i) {
+        if (UseKey(i)) {
+            if (i & 4) {
                 test_table_type::accessor a;
-                table.insert( a, MyKey::make(i) );
-                if( i&1 )
-                    (*a).second.set_value(i*i);
+                table.insert(a, MyKey::make(i));
+                if (i & 1) (*a).second.set_value(i * i);
                 else
-                    a->second.set_value(i*i);
-            } else
-                if( i&1 ) {
-                    test_table_type::accessor a;
-                    table.insert( a, std::make_pair(MyKey::make(i), MyData(i*i)) );
-                    CHECK_FAST((*a).second.value_of()==i*i);
-                } else {
-                    test_table_type::const_accessor ca;
-                    table.insert( ca, std::make_pair(MyKey::make(i), MyData(i*i)) );
-                    CHECK_FAST(ca->second.value_of()==i*i);
-                }
+                    a->second.set_value(i * i);
+            } else if (i & 1) {
+                test_table_type::accessor a;
+                table.insert(a, std::make_pair(MyKey::make(i), MyData(i * i)));
+                CHECK_FAST((*a).second.value_of() == i * i);
+            } else {
+                test_table_type::const_accessor ca;
+                table.insert(ca, std::make_pair(MyKey::make(i), MyData(i * i)));
+                CHECK_FAST(ca->second.value_of() == i * i);
+            }
         }
     }
 };
 
 struct Find {
-    static void apply( test_table_type& table, int i ) {
+    static void apply(test_table_type& table, int i) {
         test_table_type::accessor a;
         const test_table_type::accessor& ca = a;
-        bool b = table.find( a, MyKey::make(i) );
-        CHECK_FAST(b==!a.empty());
-        if( b ) {
-            if( !UseKey(i) )
-                REPORT("Line %d: unexpected key %d present\n",__LINE__,i);
-            CHECK_FAST(ca->second.value_of()==i*i);
-            CHECK_FAST((*ca).second.value_of()==i*i);
-            if( i&1 )
-                ca->second.set_value( ~ca->second.value_of() );
+        bool b = table.find(a, MyKey::make(i));
+        CHECK_FAST(b == !a.empty());
+        if (b) {
+            if (!UseKey(i)) REPORT("Line %d: unexpected key %d present\n", __LINE__, i);
+            CHECK_FAST(ca->second.value_of() == i * i);
+            CHECK_FAST((*ca).second.value_of() == i * i);
+            if (i & 1) ca->second.set_value(~ca->second.value_of());
             else
-                (*ca).second.set_value( ~ca->second.value_of() );
+                (*ca).second.set_value(~ca->second.value_of());
         } else {
-            if( UseKey(i) )
-                REPORT("Line %d: key %d missing\n",__LINE__,i);
+            if (UseKey(i)) REPORT("Line %d: key %d missing\n", __LINE__, i);
         }
     }
 };
 
 struct FindConst {
-    static void apply( const test_table_type& table, int i ) {
+    static void apply(const test_table_type& table, int i) {
         test_table_type::const_accessor a;
         const test_table_type::const_accessor& ca = a;
-        bool b = table.find( a, MyKey::make(i) );
-        CHECK_FAST(b==(table.count(MyKey::make(i))>0));
-        CHECK_FAST(b==!a.empty());
-        CHECK_FAST(b==UseKey(i));
-        if( b ) {
-            CHECK_FAST(ca->second.value_of()==~(i*i));
-            CHECK_FAST((*ca).second.value_of()==~(i*i));
+        bool b = table.find(a, MyKey::make(i));
+        CHECK_FAST(b == (table.count(MyKey::make(i)) > 0));
+        CHECK_FAST(b == !a.empty());
+        CHECK_FAST(b == UseKey(i));
+        if (b) {
+            CHECK_FAST(ca->second.value_of() == ~(i * i));
+            CHECK_FAST((*ca).second.value_of() == ~(i * i));
         }
     }
 };
 
 struct InsertInitList {
-    static void apply( test_table_type& table, int i ) {
-        if ( UseKey( i ) ) {
+    static void apply(test_table_type& table, int i) {
+        if (UseKey(i)) {
             // TODO: investigate why the following sequence causes an additional allocation sometimes:
             // table.insert( test_table_type::value_type( MyKey::make( i ), i*i ) );
             // table.insert( test_table_type::value_type( MyKey::make( i ), i*i+1 ) );
             std::initializer_list<test_table_type::value_type> il = {
-                test_table_type::value_type( MyKey::make( i ), i*i )
-                /*, test_table_type::value_type( MyKey::make( i ), i*i+1 ) */
-                                                                    };
-            table.insert( il );
+                    test_table_type::value_type(MyKey::make(i), i * i)
+                    /*, test_table_type::value_type( MyKey::make( i ), i*i+1 ) */
+            };
+            table.insert(il);
         }
     }
 };
 
-template<typename Op, typename TableType>
-void DoConcurrentOperations( TableType& table, int n, const char* what, std::size_t nthread ) {
+template <typename Op, typename TableType>
+void DoConcurrentOperations(TableType& table, int n, const char* what, std::size_t nthread) {
     INFO("testing " << what << " with " << nthread << " threads");
-    oneapi::tbb::parallel_for(oneapi::tbb::blocked_range<int>(0, n ,100), TableOperation<Op, TableType>(table));
+    oneapi::tbb::parallel_for(oneapi::tbb::blocked_range<int>(0, n, 100),
+                              TableOperation<Op, TableType>(table));
 }
 
 //! Test traversing the table with an iterator.
-void TraverseTable( test_table_type& table, size_t n, size_t expected_size ) {
+void TraverseTable(test_table_type& table, size_t n, size_t expected_size) {
     INFO("testing traversal\n");
     size_t actual_size = table.size();
-    CHECK(actual_size==expected_size);
+    CHECK(actual_size == expected_size);
     size_t count = 0;
     bool* array = new bool[n];
-    memset( array, 0, n*sizeof(bool) );
+    memset(array, 0, n * sizeof(bool));
     const test_table_type& const_table = table;
     test_table_type::const_iterator ci = const_table.begin();
-    for( test_table_type::iterator i = table.begin(); i!=table.end(); ++i ) {
+    for (test_table_type::iterator i = table.begin(); i != table.end(); ++i) {
         // Check iterator
         int k = i->first.value_of();
         CHECK_FAST(UseKey(k));
-        CHECK_FAST((*i).first.value_of()==k);
-        CHECK_FAST_MESSAGE((0<=k && size_t(k)<n), "out of bounds key" );
-        CHECK_FAST_MESSAGE( !array[k], "duplicate key" );
+        CHECK_FAST((*i).first.value_of() == k);
+        CHECK_FAST_MESSAGE((0 <= k && size_t(k) < n), "out of bounds key");
+        CHECK_FAST_MESSAGE(!array[k], "duplicate key");
         array[k] = true;
         ++count;
 
         // Check lower/upper bounds
         std::pair<test_table_type::iterator, test_table_type::iterator> er = table.equal_range(i->first);
-        std::pair<test_table_type::const_iterator, test_table_type::const_iterator> cer = const_table.equal_range(i->first);
+        std::pair<test_table_type::const_iterator, test_table_type::const_iterator> cer
+                = const_table.equal_range(i->first);
         CHECK_FAST((cer.first == er.first && cer.second == er.second));
         CHECK_FAST(cer.first == i);
         CHECK_FAST(std::distance(cer.first, cer.second) == 1);
 
         // Check const_iterator
         test_table_type::const_iterator cic = ci++;
-        CHECK_FAST(cic->first.value_of()==k);
-        CHECK_FAST((*cic).first.value_of()==k);
+        CHECK_FAST(cic->first.value_of() == k);
+        CHECK_FAST((*cic).first.value_of() == k);
     }
-    CHECK(ci==const_table.end());
+    CHECK(ci == const_table.end());
     delete[] array;
     if (count != expected_size) {
         INFO("Line " << __LINE__ << ": count=" << count << " but should be " << expected_size);
@@ -775,19 +754,19 @@ void TraverseTable( test_table_type& table, size_t n, size_t expected_size ) {
 std::atomic<int> EraseCount;
 
 struct Erase {
-    static void apply( test_table_type& table, int i ) {
+    static void apply(test_table_type& table, int i) {
         bool b;
-        if(i&4) {
-            if(i&8) {
+        if (i & 4) {
+            if (i & 8) {
                 test_table_type::const_accessor a;
-                b = table.find( a, MyKey::make(i) ) && table.erase( a );
+                b = table.find(a, MyKey::make(i)) && table.erase(a);
             } else {
                 test_table_type::accessor a;
-                b = table.find( a, MyKey::make(i) ) && table.erase( a );
+                b = table.find(a, MyKey::make(i)) && table.erase(a);
             }
         } else
-            b = table.erase( MyKey::make(i) );
-        if( b ) ++EraseCount;
+            b = table.erase(MyKey::make(i));
+        if (b) ++EraseCount;
         CHECK_FAST(table.count(MyKey::make(i)) == 0);
     }
 };
@@ -796,168 +775,159 @@ using YourTable = oneapi::tbb::concurrent_hash_map<MyKey, MyData, YourHashCompar
 static const int IE_SIZE = 2;
 std::atomic<YourTable::size_type> InsertEraseCount[IE_SIZE];
 
-struct InsertErase  {
-    static void apply( YourTable& table, int i ) {
-        if ( i%3 ) {
-            int key = i%IE_SIZE;
-            if ( table.insert( std::make_pair(MyKey::make(key), MyData2()) ) )
-                ++InsertEraseCount[key];
+struct InsertErase {
+    static void apply(YourTable& table, int i) {
+        if (i % 3) {
+            int key = i % IE_SIZE;
+            if (table.insert(std::make_pair(MyKey::make(key), MyData2()))) ++InsertEraseCount[key];
         } else {
-            int key = i%IE_SIZE;
-            if( i&1 ) {
+            int key = i % IE_SIZE;
+            if (i & 1) {
                 YourTable::accessor res;
-                if(table.find( res, MyKey::make(key) ) && table.erase( res ) )
-                    --InsertEraseCount[key];
+                if (table.find(res, MyKey::make(key)) && table.erase(res)) --InsertEraseCount[key];
             } else {
                 YourTable::const_accessor res;
-                if(table.find( res, MyKey::make(key) ) && table.erase( res ) )
-                    --InsertEraseCount[key];
+                if (table.find(res, MyKey::make(key)) && table.erase(res)) --InsertEraseCount[key];
             }
         }
     }
 };
 
 struct InnerInsert {
-    static void apply( YourTable& table, int i ) {
+    static void apply(YourTable& table, int i) {
         YourTable::accessor a1, a2;
-        if(i&1) utils::yield();
-        table.insert( a1, MyKey::make(1) );
+        if (i & 1) utils::yield();
+        table.insert(a1, MyKey::make(1));
         utils::yield();
-        table.insert( a2, MyKey::make(1 + (1<<30)) ); // the same chain
-        table.erase( a2 ); // if erase by key it would lead to deadlock for single thread
+        table.insert(a2, MyKey::make(1 + (1 << 30)));// the same chain
+        table.erase(a2);// if erase by key it would lead to deadlock for single thread
     }
 };
 
 struct FakeExclusive {
     utils::SpinBarrier& barrier;
     YourTable& table;
-    FakeExclusive(utils::SpinBarrier& b, YourTable&t) : barrier(b), table(t) {}
-    void operator()( std::size_t i ) const {
-        if(i) {
+    FakeExclusive(utils::SpinBarrier& b, YourTable& t) : barrier(b), table(t) {}
+    void operator()(std::size_t i) const {
+        if (i) {
             YourTable::const_accessor real_ca;
             // const accessor on non-const table acquired as reader (shared)
-            CHECK(table.find(real_ca,MyKey::make(1)));
-            barrier.wait(); // item can be erased
-            std::this_thread::sleep_for(std::chrono::milliseconds(10)); // let it enter the erase
-            real_ca->second.value_of(); // check the state while holding accessor
+            CHECK(table.find(real_ca, MyKey::make(1)));
+            barrier.wait();                                            // item can be erased
+            std::this_thread::sleep_for(std::chrono::milliseconds(10));// let it enter the erase
+            real_ca->second.value_of();// check the state while holding accessor
         } else {
             YourTable::accessor fake_ca;
-            const YourTable &const_table = table;
+            const YourTable& const_table = table;
             // non-const accessor on const table acquired as reader (shared)
-            CHECK(const_table.find(fake_ca,MyKey::make(1)));
-            barrier.wait(); // readers acquired
+            CHECK(const_table.find(fake_ca, MyKey::make(1)));
+            barrier.wait();// readers acquired
             // can mistakenly remove the item while other readers still refers to it
-            table.erase( fake_ca );
+            table.erase(fake_ca);
         }
     }
 };
 
 using AtomicByte = std::atomic<unsigned char>;
 
-template<typename RangeType>
+template <typename RangeType>
 struct ParallelTraverseBody {
     const size_t n;
     AtomicByte* const array;
-    ParallelTraverseBody( AtomicByte array_[], size_t n_ ) :
-        n(n_),
-        array(array_)
-    {}
-    void operator()( const RangeType& range ) const {
-        for( typename RangeType::iterator i = range.begin(); i!=range.end(); ++i ) {
+    ParallelTraverseBody(AtomicByte array_[], size_t n_) : n(n_), array(array_) {}
+    void operator()(const RangeType& range) const {
+        for (typename RangeType::iterator i = range.begin(); i != range.end(); ++i) {
             int k = i->first.value_of();
-            CHECK_FAST((0<=k && size_t(k)<n));
+            CHECK_FAST((0 <= k && size_t(k) < n));
             ++array[k];
         }
     }
 };
 
-void Check( AtomicByte array[], size_t n, size_t expected_size ) {
-    if( expected_size )
-        for( size_t k=0; k<n; ++k ) {
-            if( array[k] != int(UseKey(k)) ) {
-                REPORT("array[%d]=%d != %d=UseKey(%d)\n",
-                       int(k), int(array[k]), int(UseKey(k)), int(k));
+void Check(AtomicByte array[], size_t n, size_t expected_size) {
+    if (expected_size)
+        for (size_t k = 0; k < n; ++k) {
+            if (array[k] != int(UseKey(k))) {
+                REPORT("array[%d]=%d != %d=UseKey(%d)\n", int(k), int(array[k]), int(UseKey(k)), int(k));
                 CHECK(false);
             }
         }
 }
 
 //! Test traversing the table with a parallel range
-void ParallelTraverseTable( test_table_type& table, size_t n, size_t expected_size ) {
+void ParallelTraverseTable(test_table_type& table, size_t n, size_t expected_size) {
     INFO("testing parallel traversal\n");
-    CHECK(table.size()==expected_size);
+    CHECK(table.size() == expected_size);
     AtomicByte* array = new AtomicByte[n];
 
-    memset( static_cast<void*>(array), 0, n*sizeof(AtomicByte) );
+    memset(static_cast<void*>(array), 0, n * sizeof(AtomicByte));
     test_table_type::range_type r = table.range(10);
-    oneapi::tbb::parallel_for( r, ParallelTraverseBody<test_table_type::range_type>( array, n ));
-    Check( array, n, expected_size );
+    oneapi::tbb::parallel_for(r, ParallelTraverseBody<test_table_type::range_type>(array, n));
+    Check(array, n, expected_size);
 
     const test_table_type& const_table = table;
-    memset( static_cast<void*>(array), 0, n*sizeof(AtomicByte) );
+    memset(static_cast<void*>(array), 0, n * sizeof(AtomicByte));
     test_table_type::const_range_type cr = const_table.range(10);
-    oneapi::tbb::parallel_for( cr, ParallelTraverseBody<test_table_type::const_range_type>( array, n ));
-    Check( array, n, expected_size );
+    oneapi::tbb::parallel_for(cr, ParallelTraverseBody<test_table_type::const_range_type>(array, n));
+    Check(array, n, expected_size);
 
     delete[] array;
 }
 
-void TestInsertFindErase( std::size_t nthread ) {
-    int n=250000;
+void TestInsertFindErase(std::size_t nthread) {
+    int n = 250000;
 
     // compute m = number of unique keys
     int m = 0;
-    for( int i=0; i<n; ++i )
-        m += UseKey(i);
+    for (int i = 0; i < n; ++i) m += UseKey(i);
     {
         test_allocator_type alloc;
         test_allocator_type::init_counters();
-        CHECK(MyDataCount==0);
+        CHECK(MyDataCount == 0);
         test_table_type table(alloc);
-        TraverseTable(table,n,0);
-        ParallelTraverseTable(table,n,0);
+        TraverseTable(table, n, 0);
+        ParallelTraverseTable(table, n, 0);
 
-        for ( int i = 0; i < 2; ++i ) {
-            if ( i==0 )
-                DoConcurrentOperations<InsertInitList, test_table_type>( table, n, "insert(std::initializer_list)", nthread );
+        for (int i = 0; i < 2; ++i) {
+            if (i == 0)
+                DoConcurrentOperations<InsertInitList, test_table_type>(
+                        table, n, "insert(std::initializer_list)", nthread);
             else
-                DoConcurrentOperations<Insert, test_table_type>( table, n, "insert", nthread );
+                DoConcurrentOperations<Insert, test_table_type>(table, n, "insert", nthread);
             CHECK(MyDataCount == m);
-            TraverseTable( table, n, m );
-            ParallelTraverseTable( table, n, m );
+            TraverseTable(table, n, m);
+            ParallelTraverseTable(table, n, m);
 
-            DoConcurrentOperations<Find, test_table_type>( table, n, "find", nthread );
+            DoConcurrentOperations<Find, test_table_type>(table, n, "find", nthread);
             CHECK(MyDataCount == m);
 
-            DoConcurrentOperations<FindConst, test_table_type>( table, n, "find(const)", nthread );
+            DoConcurrentOperations<FindConst, test_table_type>(table, n, "find(const)", nthread);
             CHECK(MyDataCount == m);
 
             EraseCount = 0;
-            DoConcurrentOperations<Erase, test_table_type>( table, n, "erase", nthread );
+            DoConcurrentOperations<Erase, test_table_type>(table, n, "erase", nthread);
             CHECK(EraseCount == m);
             CHECK(MyDataCount == 0);
-            TraverseTable( table, n, 0 );
+            TraverseTable(table, n, 0);
 
             table.clear();
         }
 
-        if( nthread > 1 ) {
+        if (nthread > 1) {
             YourTable ie_table;
-            for( int i=0; i<IE_SIZE; ++i )
-                InsertEraseCount[i] = 0;
-            DoConcurrentOperations<InsertErase,YourTable>(ie_table,n/2,"insert_erase",nthread);
-            for( int i=0; i<IE_SIZE; ++i )
-                CHECK(InsertEraseCount[i]==ie_table.count(MyKey::make(i)));
+            for (int i = 0; i < IE_SIZE; ++i) InsertEraseCount[i] = 0;
+            DoConcurrentOperations<InsertErase, YourTable>(ie_table, n / 2, "insert_erase", nthread);
+            for (int i = 0; i < IE_SIZE; ++i) CHECK(InsertEraseCount[i] == ie_table.count(MyKey::make(i)));
 
-            DoConcurrentOperations<InnerInsert, YourTable>(ie_table,2000,"inner insert",nthread);
+            DoConcurrentOperations<InnerInsert, YourTable>(ie_table, 2000, "inner insert", nthread);
             utils::SpinBarrier barrier(nthread);
             INFO("testing erase on fake exclusive accessor\n");
-            utils::NativeParallelFor( nthread, FakeExclusive(barrier, ie_table));
+            utils::NativeParallelFor(nthread, FakeExclusive(barrier, ie_table));
         }
     }
-    REQUIRE( test_allocator_type::items_constructed == test_allocator_type::items_destroyed );
-    REQUIRE( test_allocator_type::items_allocated == test_allocator_type::items_freed );
-    REQUIRE( test_allocator_type::allocations == test_allocator_type::frees );
+    REQUIRE(test_allocator_type::items_constructed == test_allocator_type::items_destroyed);
+    REQUIRE(test_allocator_type::items_allocated == test_allocator_type::items_freed);
+    REQUIRE(test_allocator_type::allocations == test_allocator_type::frees);
 }
 
 std::atomic<int> Counter;
@@ -966,14 +936,16 @@ class AddToTable {
     test_table_type& my_table;
     const std::size_t my_nthread;
     const int my_m;
+
 public:
-    AddToTable( test_table_type& table, std::size_t nthread, int m ) : my_table(table), my_nthread(nthread), my_m(m) {}
-    void operator()( std::size_t ) const {
-        for( int i=0; i<my_m; ++i ) {
+    AddToTable(test_table_type& table, std::size_t nthread, int m)
+        : my_table(table), my_nthread(nthread), my_m(m) {}
+    void operator()(std::size_t) const {
+        for (int i = 0; i < my_m; ++i) {
             // Busy wait to synchronize threads
             int j = 0;
-            while( Counter<i ) {
-                if( ++j==1000000 ) {
+            while (Counter < i) {
+                if (++j == 1000000) {
                     // If Counter<i after a million iterations, then we almost surely have
                     // more logical threads than physical threads, and should yield in
                     // order to let suspended logical threads make progress.
@@ -986,14 +958,12 @@ class AddToTable {
             {
                 test_table_type::accessor a;
                 MyKey key = MyKey::make(i);
-                if( my_table.insert( a, key ) )
-                    a->second.set_value( 1 );
+                if (my_table.insert(a, key)) a->second.set_value(1);
                 else
-                    a->second.set_value( a->second.value_of()+1 );
+                    a->second.set_value(a->second.value_of() + 1);
                 k = a->second.value_of();
             }
-            if( std::size_t(k) == my_nthread )
-                Counter=i+1;
+            if (std::size_t(k) == my_nthread) Counter = i + 1;
         }
     }
 };
@@ -1001,55 +971,56 @@ class AddToTable {
 class RemoveFromTable {
     test_table_type& my_table;
     const int my_m;
+
 public:
-    RemoveFromTable( test_table_type& table, int m ) : my_table(table), my_m(m) {}
+    RemoveFromTable(test_table_type& table, int m) : my_table(table), my_m(m) {}
     void operator()(std::size_t) const {
-        for( int i=0; i<my_m; ++i ) {
+        for (int i = 0; i < my_m; ++i) {
             bool b;
-            if(i&4) {
-                if(i&8) {
+            if (i & 4) {
+                if (i & 8) {
                     test_table_type::const_accessor a;
-                    b = my_table.find( a, MyKey::make(i) ) && my_table.erase( a );
+                    b = my_table.find(a, MyKey::make(i)) && my_table.erase(a);
                 } else {
                     test_table_type::accessor a;
-                    b = my_table.find( a, MyKey::make(i) ) && my_table.erase( a );
+                    b = my_table.find(a, MyKey::make(i)) && my_table.erase(a);
                 }
             } else
-                b = my_table.erase( MyKey::make(i) );
-            if( b ) ++EraseCount;
+                b = my_table.erase(MyKey::make(i));
+            if (b) ++EraseCount;
         }
     }
 };
 
-void TestConcurrency( std::size_t nthread ) {
+void TestConcurrency(std::size_t nthread) {
     INFO("testing multiple insertions/deletions of same key with " << nthread << " threads");
     test_allocator_type::init_counters();
     {
-        CHECK( MyDataCount==0);
+        CHECK(MyDataCount == 0);
         test_table_type table;
         const int m = 1000;
         Counter = 0;
         oneapi::tbb::tick_count t0 = oneapi::tbb::tick_count::now();
-        utils::NativeParallelFor( nthread, AddToTable(table,nthread,m) );
-        REQUIRE_MESSAGE( MyDataCount==m, "memory leak detected" );
+        utils::NativeParallelFor(nthread, AddToTable(table, nthread, m));
+        REQUIRE_MESSAGE(MyDataCount == m, "memory leak detected");
 
         EraseCount = 0;
         t0 = oneapi::tbb::tick_count::now();
-        utils::NativeParallelFor( nthread, RemoveFromTable(table,m) );
-        REQUIRE_MESSAGE(MyDataCount==0, "memory leak detected");
-        REQUIRE_MESSAGE(EraseCount==m, "return value of erase() is broken");
-
+        utils::NativeParallelFor(nthread, RemoveFromTable(table, m));
+        REQUIRE_MESSAGE(MyDataCount == 0, "memory leak detected");
+        REQUIRE_MESSAGE(EraseCount == m, "return value of erase() is broken");
     }
-    REQUIRE( test_allocator_type::items_constructed == test_allocator_type::items_destroyed );
-    REQUIRE( test_allocator_type::items_allocated == test_allocator_type::items_freed );
-    REQUIRE( test_allocator_type::allocations == test_allocator_type::frees );
-    REQUIRE_MESSAGE(MyDataCount==0, "memory leak detected");
+    REQUIRE(test_allocator_type::items_constructed == test_allocator_type::items_destroyed);
+    REQUIRE(test_allocator_type::items_allocated == test_allocator_type::items_freed);
+    REQUIRE(test_allocator_type::allocations == test_allocator_type::frees);
+    REQUIRE_MESSAGE(MyDataCount == 0, "memory leak detected");
 }
 
-template<typename Key>
+template <typename Key>
 struct non_default_constructible_hash_compare : oneapi::tbb::detail::d1::tbb_hash_compare<Key> {
     non_default_constructible_hash_compare() {
-        REQUIRE_MESSAGE(false, "Hash compare object must not default construct during the construction of hash_map with compare argument");
+        REQUIRE_MESSAGE(false, "Hash compare object must not default construct during the construction of "
+                               "hash_map with compare argument");
     }
 
     non_default_constructible_hash_compare(int) {}
@@ -1057,7 +1028,8 @@ struct non_default_constructible_hash_compare : oneapi::tbb::detail::d1::tbb_has
 
 void TestHashCompareConstructors() {
     using key_type = int;
-    using map_type = oneapi::tbb::concurrent_hash_map<key_type, key_type, non_default_constructible_hash_compare<key_type>>;
+    using map_type = oneapi::tbb::concurrent_hash_map<key_type, key_type,
+                                                      non_default_constructible_hash_compare<key_type>>;
 
     non_default_constructible_hash_compare<key_type> compare(0);
     map_type::allocator_type allocator;
@@ -1094,7 +1066,7 @@ void TestDeductionGuides() {
     using Allocator = std::allocator<ComplexTypeConst>;
 
     std::vector<ComplexType> v;
-    auto l = { ComplexTypeConst(1, "one"), ComplexTypeConst(2, "two") };
+    auto l = {ComplexTypeConst(1, "one"), ComplexTypeConst(2, "two")};
     Compare compare;
     Allocator allocator;
 
@@ -1146,19 +1118,19 @@ void TestDeductionGuides() {
     TMap m12(std::move(m4), allocator);
     static_assert(std::is_same<decltype(m12), decltype(m4)>::value);
 }
-#endif // __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
+#endif// __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 
 template <typename CHMapType>
 void test_comparisons_basic() {
     using comparisons_testing::testEqualityComparisons;
     CHMapType c1, c2;
-    testEqualityComparisons</*ExpectEqual = */true>(c1, c2);
+    testEqualityComparisons</*ExpectEqual = */ true>(c1, c2);
 
     c1.emplace(1, 1);
-    testEqualityComparisons</*ExpectEqual = */false>(c1, c2);
+    testEqualityComparisons</*ExpectEqual = */ false>(c1, c2);
 
     c2.emplace(1, 1);
-    testEqualityComparisons</*ExpectEqual = */true>(c1, c2);
+    testEqualityComparisons</*ExpectEqual = */ true>(c1, c2);
 }
 
 template <typename TwoWayComparableContainerType>
@@ -1175,8 +1147,9 @@ void test_two_way_comparable_chmap() {
 
 void TestCHMapComparisons() {
     using integral_container = oneapi::tbb::concurrent_hash_map<int, int>;
-    using two_way_comparable_container = oneapi::tbb::concurrent_hash_map<comparisons_testing::TwoWayComparable,
-                                                                          comparisons_testing::TwoWayComparable>;
+    using two_way_comparable_container
+            = oneapi::tbb::concurrent_hash_map<comparisons_testing::TwoWayComparable,
+                                               comparisons_testing::TwoWayComparable>;
 
     test_comparisons_basic<integral_container>();
     test_comparisons_basic<two_way_comparable_container>();
@@ -1184,23 +1157,23 @@ void TestCHMapComparisons() {
 }
 
 template <typename Iterator, typename CHMapType>
-void TestCHMapIteratorComparisonsBasic( CHMapType& chmap ) {
+void TestCHMapIteratorComparisonsBasic(CHMapType& chmap) {
     REQUIRE_MESSAGE(!chmap.empty(), "Incorrect test setup");
     using namespace comparisons_testing;
     Iterator it1, it2;
-    testEqualityComparisons</*ExpectEqual = */true>(it1, it2);
+    testEqualityComparisons</*ExpectEqual = */ true>(it1, it2);
     it1 = chmap.begin();
-    testEqualityComparisons</*ExpectEqual = */false>(it1, it2);
+    testEqualityComparisons</*ExpectEqual = */ false>(it1, it2);
     it2 = chmap.begin();
-    testEqualityComparisons</*ExpectEqual = */true>(it1, it2);
+    testEqualityComparisons</*ExpectEqual = */ true>(it1, it2);
     it2 = chmap.end();
-    testEqualityComparisons</*ExpectEqual = */false>(it1, it2);
+    testEqualityComparisons</*ExpectEqual = */ false>(it1, it2);
 }
 
 void TestCHMapIteratorComparisons() {
     using chmap_type = oneapi::tbb::concurrent_hash_map<int, int>;
     using value_type = typename chmap_type::value_type;
-    chmap_type chmap = {value_type{1, 1}, value_type{2, 2}, value_type{3, 3}};
+    chmap_type chmap = {value_type {1, 1}, value_type {2, 2}, value_type {3, 3}};
     TestCHMapIteratorComparisonsBasic<typename chmap_type::iterator>(chmap);
     const chmap_type& cchmap = chmap;
     TestCHMapIteratorComparisonsBasic<typename chmap_type::const_iterator>(cchmap);
@@ -1214,7 +1187,9 @@ class HeterogeneousKey {
     int integer_key() const { return my_key; }
 
     template <bool I = IsConstructible, typename = typename std::enable_if<I>::type>
-    HeterogeneousKey(int key) : my_key(key) { ++heterogeneous_keys_count; }
+    HeterogeneousKey(int key) : my_key(key) {
+        ++heterogeneous_keys_count;
+    }
 
     HeterogeneousKey(const HeterogeneousKey&) = delete;
     HeterogeneousKey& operator=(const HeterogeneousKey&) = delete;
@@ -1223,11 +1198,11 @@ class HeterogeneousKey {
 
     struct construct_flag {};
 
-    HeterogeneousKey( construct_flag, int key ) : my_key(key) {}
+    HeterogeneousKey(construct_flag, int key) : my_key(key) {}
 
 private:
     int my_key;
-}; // class HeterogeneousKey
+};// class HeterogeneousKey
 
 template <bool IsConstructible>
 std::size_t HeterogeneousKey<IsConstructible>::heterogeneous_keys_count = 0;
@@ -1236,35 +1211,32 @@ struct HeterogeneousHashCompare {
     using is_transparent = void;
 
     template <bool IsConstructible>
-    std::size_t hash( const HeterogeneousKey<IsConstructible>& key ) const {
+    std::size_t hash(const HeterogeneousKey<IsConstructible>& key) const {
         return my_hash_object(key.integer_key());
     }
 
-    std::size_t hash( const int& key ) const {
-        return my_hash_object(key);
-    }
+    std::size_t hash(const int& key) const { return my_hash_object(key); }
 
-    bool equal( const int& key1, const int& key2 ) const {
-        return key1 == key2;
-    }
+    bool equal(const int& key1, const int& key2) const { return key1 == key2; }
 
     template <bool IsConstructible>
-    bool equal( const int& key1, const HeterogeneousKey<IsConstructible>& key2 ) const {
+    bool equal(const int& key1, const HeterogeneousKey<IsConstructible>& key2) const {
         return key1 == key2.integer_key();
     }
 
     template <bool IsConstructible>
-    bool equal( const HeterogeneousKey<IsConstructible>& key1, const int& key2 ) const {
+    bool equal(const HeterogeneousKey<IsConstructible>& key1, const int& key2) const {
         return key1.integer_key() == key2;
     }
 
     template <bool IsConstructible>
-    bool equal( const HeterogeneousKey<IsConstructible>& key1, const HeterogeneousKey<IsConstructible>& key2 ) const {
+    bool equal(const HeterogeneousKey<IsConstructible>& key1,
+               const HeterogeneousKey<IsConstructible>& key2) const {
         return key1.integer_key() == key2.integer_key();
     }
 
     std::hash<int> my_hash_object;
-}; // struct HeterogeneousHashCompare
+};// struct HeterogeneousHashCompare
 
 class DefaultConstructibleValue {
 public:
@@ -1272,14 +1244,15 @@ class DefaultConstructibleValue {
 
     int value() const { return my_i; }
     static constexpr int default_value = -4242;
+
 private:
     int my_i;
-}; // class DefaultConstructibleValue
+};// class DefaultConstructibleValue
 
 constexpr int DefaultConstructibleValue::default_value;
 
 void test_heterogeneous_find() {
-    using key_type = HeterogeneousKey</*IsConstructible = */false>;
+    using key_type = HeterogeneousKey</*IsConstructible = */ false>;
     using chmap_type = oneapi::tbb::concurrent_hash_map<key_type, int, HeterogeneousHashCompare>;
 
     chmap_type chmap;
@@ -1290,14 +1263,15 @@ void test_heterogeneous_find() {
 
     REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 0, "Incorrect test setup");
 
-    key_type key(key_type::construct_flag{}, 1);
+    key_type key(key_type::construct_flag {}, 1);
     bool regular_result = chmap.find(cacc, key);
     bool heterogeneous_result = chmap.find(cacc, int(1));
 
     REQUIRE(!regular_result);
     REQUIRE_MESSAGE(regular_result == heterogeneous_result,
                     "Incorrect heterogeneous find result with const_accessor (no element)");
-    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 0, "Temporary key object was created during find call with const_accessor (no element)");
+    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 0,
+                    "Temporary key object was created during find call with const_accessor (no element)");
 
     regular_result = chmap.find(acc, key);
     heterogeneous_result = chmap.find(acc, int(1));
@@ -1305,60 +1279,71 @@ void test_heterogeneous_find() {
     REQUIRE(!regular_result);
     REQUIRE_MESSAGE(regular_result == heterogeneous_result,
                     "Incorrect heterogeneous find result with accessor (no element)");
-    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 0, "Temporary key object was created during find call with accessor (no element)");
+    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 0,
+                    "Temporary key object was created during find call with accessor (no element)");
 
     bool tmp_result = chmap.emplace(cacc, std::piecewise_construct,
-                                    std::forward_as_tuple(key_type::construct_flag{}, 1), std::forward_as_tuple(100));
+                                    std::forward_as_tuple(key_type::construct_flag {}, 1),
+                                    std::forward_as_tuple(100));
     REQUIRE(tmp_result);
 
     regular_result = chmap.find(cacc, key);
     heterogeneous_result = chmap.find(cacc, int(1));
 
     REQUIRE(regular_result);
-    REQUIRE_MESSAGE(regular_result == heterogeneous_result, "Incorrect heterogeneous find result with const_accessor (element exists)");
+    REQUIRE_MESSAGE(regular_result == heterogeneous_result,
+                    "Incorrect heterogeneous find result with const_accessor (element exists)");
     REQUIRE_MESSAGE(cacc->first.integer_key() == 1, "Incorrect accessor returned");
-    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 0, "Temporary key object was created during find call with const_accessor (element exists)");
+    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 0,
+                    "Temporary key object was created during find call with const_accessor (element exists)");
     cacc.release();
 
     regular_result = chmap.find(acc, key);
     heterogeneous_result = chmap.find(acc, int(1));
 
     REQUIRE(regular_result);
-    REQUIRE_MESSAGE(regular_result == heterogeneous_result, "Incorrect heterogeneous find result with accessor (element exists)");
+    REQUIRE_MESSAGE(regular_result == heterogeneous_result,
+                    "Incorrect heterogeneous find result with accessor (element exists)");
     REQUIRE_MESSAGE(acc->first.integer_key() == 1, "Incorrect accessor returned");
-    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 0, "Temporary key object was created during find call with accessor (element exists)");
+    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 0,
+                    "Temporary key object was created during find call with accessor (element exists)");
     key_type::reset();
 }
 
 void test_heterogeneous_count() {
-    using key_type = HeterogeneousKey</*IsConstructible = */false>;
+    using key_type = HeterogeneousKey</*IsConstructible = */ false>;
     using chmap_type = oneapi::tbb::concurrent_hash_map<key_type, int, HeterogeneousHashCompare>;
 
     chmap_type chmap;
 
     REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 0, "Incorrect test setup");
-    key_type key(key_type::construct_flag{}, 1);
+    key_type key(key_type::construct_flag {}, 1);
 
     typename chmap_type::size_type regular_count = chmap.count(key);
     typename chmap_type::size_type heterogeneous_count = chmap.count(int(1));
 
     REQUIRE(regular_count == 0);
-    REQUIRE_MESSAGE(regular_count == heterogeneous_count, "Incorrect heterogeneous count result (no element)");
-    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 0, "Temporary key object was created during count call (no element)");
+    REQUIRE_MESSAGE(regular_count == heterogeneous_count,
+                    "Incorrect heterogeneous count result (no element)");
+    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 0,
+                    "Temporary key object was created during count call (no element)");
 
-    chmap.emplace(std::piecewise_construct, std::forward_as_tuple(key_type::construct_flag{}, 1), std::forward_as_tuple(100));
+    chmap.emplace(std::piecewise_construct, std::forward_as_tuple(key_type::construct_flag {}, 1),
+                  std::forward_as_tuple(100));
 
     regular_count = chmap.count(key);
     heterogeneous_count = chmap.count(int(1));
 
     REQUIRE(regular_count == 1);
-    REQUIRE_MESSAGE(regular_count == heterogeneous_count, "Incorrect heterogeneous count result (element exists)");
-    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 0, "Temporary key object was created during count call (element exists)");
+    REQUIRE_MESSAGE(regular_count == heterogeneous_count,
+                    "Incorrect heterogeneous count result (element exists)");
+    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 0,
+                    "Temporary key object was created during count call (element exists)");
     key_type::reset();
 }
 
 void test_heterogeneous_equal_range() {
-    using key_type = HeterogeneousKey</*IsConstructible = */false>;
+    using key_type = HeterogeneousKey</*IsConstructible = */ false>;
     using chmap_type = oneapi::tbb::concurrent_hash_map<key_type, int, HeterogeneousHashCompare>;
 
     chmap_type chmap;
@@ -1368,15 +1353,17 @@ void test_heterogeneous_equal_range() {
     using const_iterator = typename chmap_type::const_iterator;
     using result = std::pair<iterator, iterator>;
     using const_result = std::pair<const_iterator, const_iterator>;
-    key_type key(key_type::construct_flag{}, 1);
+    key_type key(key_type::construct_flag {}, 1);
 
     result regular_result = chmap.equal_range(key);
     result heterogeneous_result = chmap.equal_range(int(1));
 
     REQUIRE(regular_result.first == chmap.end());
     REQUIRE(regular_result.second == chmap.end());
-    REQUIRE_MESSAGE(regular_result == heterogeneous_result, "Incorrect heterogeneous equal_range result (non const, no element)");
-    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 0, "Temporary key object was created during equal_range call (non const, no element)");
+    REQUIRE_MESSAGE(regular_result == heterogeneous_result,
+                    "Incorrect heterogeneous equal_range result (non const, no element)");
+    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 0,
+                    "Temporary key object was created during equal_range call (non const, no element)");
 
     const chmap_type& cchmap = chmap;
 
@@ -1387,9 +1374,11 @@ void test_heterogeneous_equal_range() {
     REQUIRE(regular_const_result.second == cchmap.end());
     REQUIRE_MESSAGE(regular_const_result == heterogeneous_const_result,
                     "Incorrect heterogeneous equal_range result (const, no element)");
-    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 0, "Temporary key object was created during equal_range call (const, no element)");
+    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 0,
+                    "Temporary key object was created during equal_range call (const, no element)");
 
-    chmap.emplace(std::piecewise_construct, std::forward_as_tuple(key_type::construct_flag{}, 1), std::forward_as_tuple(100));
+    chmap.emplace(std::piecewise_construct, std::forward_as_tuple(key_type::construct_flag {}, 1),
+                  std::forward_as_tuple(100));
 
     regular_result = chmap.equal_range(key);
     heterogeneous_result = chmap.equal_range(int(1));
@@ -1397,20 +1386,24 @@ void test_heterogeneous_equal_range() {
     REQUIRE(regular_result.first != chmap.end());
     REQUIRE(regular_result.first->first.integer_key() == 1);
     REQUIRE(regular_result.second == chmap.end());
-    REQUIRE_MESSAGE(regular_result == heterogeneous_result, "Incorrect heterogeneous equal_range result (non const, element exists)");
-    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 0, "Temporary key object was created during equal_range call (non const, element exists)");
+    REQUIRE_MESSAGE(regular_result == heterogeneous_result,
+                    "Incorrect heterogeneous equal_range result (non const, element exists)");
+    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 0,
+                    "Temporary key object was created during equal_range call (non const, element exists)");
 
     regular_const_result = cchmap.equal_range(key);
     heterogeneous_const_result = cchmap.equal_range(int(1));
     REQUIRE_MESSAGE(regular_const_result == heterogeneous_const_result,
                     "Incorrect heterogeneous equal_range result (const, element exists)");
-    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 0, "Temporary key object was created during equal_range call (const, element exists)");
+    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 0,
+                    "Temporary key object was created during equal_range call (const, element exists)");
     key_type::reset();
 }
 
 void test_heterogeneous_insert() {
-    using key_type = HeterogeneousKey</*IsConstructible = */true>;
-    using chmap_type = oneapi::tbb::concurrent_hash_map<key_type, DefaultConstructibleValue, HeterogeneousHashCompare>;
+    using key_type = HeterogeneousKey</*IsConstructible = */ true>;
+    using chmap_type
+            = oneapi::tbb::concurrent_hash_map<key_type, DefaultConstructibleValue, HeterogeneousHashCompare>;
 
     chmap_type chmap;
     using const_accessor = typename chmap_type::const_accessor;
@@ -1425,42 +1418,49 @@ void test_heterogeneous_insert() {
     REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 1, "Only one heterogeneous key should be created");
     REQUIRE_MESSAGE(result, "Incorrect heterogeneous insert result (const_accessor)");
     REQUIRE_MESSAGE(cacc->first.integer_key() == 1, "Incorrect accessor");
-    REQUIRE_MESSAGE(cacc->second.value() == DefaultConstructibleValue::default_value, "Value should be default constructed");
+    REQUIRE_MESSAGE(cacc->second.value() == DefaultConstructibleValue::default_value,
+                    "Value should be default constructed");
 
     result = chmap.insert(cacc, int(1));
 
     REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 1, "No extra keys should be created");
     REQUIRE_MESSAGE(!result, "Incorrect heterogeneous insert result (const_accessor)");
     REQUIRE_MESSAGE(cacc->first.integer_key() == 1, "Incorrect accessor");
-    REQUIRE_MESSAGE(cacc->second.value() == DefaultConstructibleValue::default_value, "Value should be default constructed");
+    REQUIRE_MESSAGE(cacc->second.value() == DefaultConstructibleValue::default_value,
+                    "Value should be default constructed");
 
     result = chmap.insert(acc, int(2));
 
-    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 2, "Only one extra heterogeneous key should be created");
+    REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 2,
+                    "Only one extra heterogeneous key should be created");
     REQUIRE_MESSAGE(result, "Incorrect heterogeneous insert result (accessor)");
     REQUIRE_MESSAGE(acc->first.integer_key() == 2, "Incorrect accessor");
-    REQUIRE_MESSAGE(acc->second.value() == DefaultConstructibleValue::default_value, "Value should be default constructed");
+    REQUIRE_MESSAGE(acc->second.value() == DefaultConstructibleValue::default_value,
+                    "Value should be default constructed");
 
     result = chmap.insert(acc, int(2));
 
     REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 2, "No extra keys should be created");
     REQUIRE_MESSAGE(!result, "Incorrect heterogeneous insert result (accessor)");
     REQUIRE_MESSAGE(acc->first.integer_key() == 2, "Incorrect accessor");
-    REQUIRE_MESSAGE(acc->second.value() == DefaultConstructibleValue::default_value, "Value should be default constructed");
+    REQUIRE_MESSAGE(acc->second.value() == DefaultConstructibleValue::default_value,
+                    "Value should be default constructed");
 
     key_type::reset();
 }
 
 void test_heterogeneous_erase() {
-    using key_type = HeterogeneousKey</*IsConstructible = */false>;
+    using key_type = HeterogeneousKey</*IsConstructible = */ false>;
     using chmap_type = oneapi::tbb::concurrent_hash_map<key_type, int, HeterogeneousHashCompare>;
 
     chmap_type chmap;
 
     REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 0, "Incorrect test setup");
 
-    chmap.emplace(std::piecewise_construct, std::forward_as_tuple(key_type::construct_flag{}, 1), std::forward_as_tuple(100));
-    chmap.emplace(std::piecewise_construct, std::forward_as_tuple(key_type::construct_flag{}, 2), std::forward_as_tuple(200));
+    chmap.emplace(std::piecewise_construct, std::forward_as_tuple(key_type::construct_flag {}, 1),
+                  std::forward_as_tuple(100));
+    chmap.emplace(std::piecewise_construct, std::forward_as_tuple(key_type::construct_flag {}, 2),
+                  std::forward_as_tuple(200));
 
     typename chmap_type::const_accessor cacc;
 
@@ -1474,7 +1474,6 @@ void test_heterogeneous_erase() {
     REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 0, "No extra keys should be created");
     REQUIRE_MESSAGE(!chmap.find(cacc, int(1)), "Element was not erased");
 
-
     result = chmap.erase(int(1));
     REQUIRE_MESSAGE(!result, "Erasure should fail");
     REQUIRE_MESSAGE(key_type::heterogeneous_keys_count == 0, "No extra keys should be created");
@@ -1489,52 +1488,36 @@ void test_heterogeneous_lookup() {
 
 //! Test construction with hash_compare
 //! \brief \ref interface \ref requirement
-TEST_CASE("testing construction with hash_compare") {
-    TestHashCompareConstructors();
-}
+TEST_CASE("testing construction with hash_compare") { TestHashCompareConstructors(); }
 
 //! Test concurrent_hash_map member types
 //! \brief \ref interface \ref requirement
-TEST_CASE("test types"){
-    test_member_types<oneapi::tbb::concurrent_hash_map>();
-}
+TEST_CASE("test types") { test_member_types<oneapi::tbb::concurrent_hash_map>(); }
 
 //! Test swap and clear operations
 //! \brief \ref interface \ref requirement
-TEST_CASE("test copy operations") {
-    TestCopy();
-}
+TEST_CASE("test copy operations") { TestCopy(); }
 
 //! Test rehash operation
 //! \brief \ref interface \ref requirement
-TEST_CASE("test rehash operation") {
-    TestRehash();
-}
+TEST_CASE("test rehash operation") { TestRehash(); }
 
 //! Test assignment operation
 //! \brief \ref interface \ref requirement
-TEST_CASE("test assignment operation") {
-    TestAssignment();
-}
+TEST_CASE("test assignment operation") { TestAssignment(); }
 
 //! Test iterators and ranges
 //! \brief \ref interface \ref requirement
-TEST_CASE("test iterators and ranges") {
-    TestIteratorsAndRanges();
-}
+TEST_CASE("test iterators and ranges") { TestIteratorsAndRanges(); }
 
 //! Test work with initializer_list
 //! \brief \ref interface \ref requirement
-TEST_CASE("test work with initializer_list") {
-    TestInitList();
-}
+TEST_CASE("test work with initializer_list") { TestInitList(); }
 
 #if TBB_USE_EXCEPTIONS
 //! Test exception safety
 //! \brief \ref requirement
-TEST_CASE("test exception safety") {
-    TestExceptions();
-}
+TEST_CASE("test exception safety") { TestExceptions(); }
 
 //! Test exceptions safety guarantees for move constructor
 //! \brief \ref requirement
@@ -1546,39 +1529,33 @@ TEST_CASE("test move support with exceptions") {
 
 //! Test move constructor
 //! \brief \ref interface \ref requirement
-TEST_CASE("testing move constructor"){
-    move_support_tests::test_move_constructor<hash_map_traits>();
-}
+TEST_CASE("testing move constructor") { move_support_tests::test_move_constructor<hash_map_traits>(); }
 
 //! Test move assign operator
 //! \brief \ref interface \ref requirement
-TEST_CASE("testing move assign operator"){
-    move_support_tests::test_move_assignment<hash_map_traits>();
-}
+TEST_CASE("testing move assign operator") { move_support_tests::test_move_assignment<hash_map_traits>(); }
 
 //! Test insert and empace
 //! \brief \ref interface \ref requirement
-TEST_CASE("testing concurrent insert and emplace"){
-    int n=250000;
+TEST_CASE("testing concurrent insert and emplace") {
+    int n = 250000;
     {
         DataStateTrackedTable table;
-        DoConcurrentOperations<RvalueInsert, DataStateTrackedTable>( table, n, "rvalue ref insert", 1 );
+        DoConcurrentOperations<RvalueInsert, DataStateTrackedTable>(table, n, "rvalue ref insert", 1);
     }
     {
         DataStateTrackedTable table;
-        DoConcurrentOperations<Emplace, DataStateTrackedTable>( table, n, "emplace", 1 );
+        DoConcurrentOperations<Emplace, DataStateTrackedTable>(table, n, "emplace", 1);
     }
 }
 
 //! Test allocator traits
 //! \brief \ref requirement
-TEST_CASE("testing allocator traits") {
-    test_allocator_traits_support<hash_map_traits>();
-}
+TEST_CASE("testing allocator traits") { test_allocator_traits_support<hash_map_traits>(); }
 
 //! Test concurrent operations
 //! \brief \ref requirement
-TEST_CASE("testing concurrency"){
+TEST_CASE("testing concurrency") {
     for (std::size_t p = 1; p <= 4; ++p) {
         oneapi::tbb::global_control limit(oneapi::tbb::global_control::max_allowed_parallelism, p);
         TestInsertFindErase(p);
@@ -1589,32 +1566,20 @@ TEST_CASE("testing concurrency"){
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 //! Test deduction guides
 //! \brief \ref interface
-TEST_CASE("testing deduction guides") {
-    TestDeductionGuides<oneapi::tbb::concurrent_hash_map>();
-}
-#endif // __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
+TEST_CASE("testing deduction guides") { TestDeductionGuides<oneapi::tbb::concurrent_hash_map>(); }
+#endif// __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 
 //! \brief \ref interface \ref requirement
-TEST_CASE("concurrent_hash_map comparisons") {
-    TestCHMapComparisons();
-}
+TEST_CASE("concurrent_hash_map comparisons") { TestCHMapComparisons(); }
 
 //! \brief \ref interface \ref requirement
-TEST_CASE("concurrent_hash_map iterator comparisons") {
-    TestCHMapIteratorComparisons();
-}
+TEST_CASE("concurrent_hash_map iterator comparisons") { TestCHMapIteratorComparisons(); }
 
 //! \brief \ref interface \ref requirement
-TEST_CASE("test concurrent_hash_map heterogeneous lookup") {
-    test_heterogeneous_lookup();
-}
+TEST_CASE("test concurrent_hash_map heterogeneous lookup") { test_heterogeneous_lookup(); }
 
 //! \brief \ref interface \ref requirement
-TEST_CASE("test concurrent_hash_map heterogeneous insert") {
-    test_heterogeneous_insert();
-}
+TEST_CASE("test concurrent_hash_map heterogeneous insert") { test_heterogeneous_insert(); }
 
 //! \brief \ref interface \ref requirement
-TEST_CASE("test concurrent_hash_map heterogeneous erase") {
-    test_heterogeneous_erase();
-}
+TEST_CASE("test concurrent_hash_map heterogeneous erase") { test_heterogeneous_erase(); }
diff --git a/external/tbb/test/conformance/conformance_concurrent_lru_cache.cpp b/external/tbb/test/conformance/conformance_concurrent_lru_cache.cpp
index 85024f70..bcdd4f43 100644
--- a/external/tbb/test/conformance/conformance_concurrent_lru_cache.cpp
+++ b/external/tbb/test/conformance/conformance_concurrent_lru_cache.cpp
@@ -15,7 +15,7 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
 #endif
 
 #define TBB_PREVIEW_CONCURRENT_LRU_CACHE 1
@@ -38,19 +38,19 @@ TEST_CASE("basic test for creation and use") {
     auto callback = [](int key) -> int { return key; };
     std::size_t number_of_lru_history_items = 8;
 
-    preset preset_object{callback, number_of_lru_history_items};
+    preset preset_object {callback, number_of_lru_history_items};
     preset::cache_type& cache = preset_object.cache;
 
     int dummy_key = 0;
     preset::handle_type h = cache[dummy_key];
     int value = h.value();
-    (void)value;
+    (void) value;
 }
 
 //! \brief \ref interface \ref requirement
 TEST_CASE("basic test for std::move") {
     using preset = concurrent_lru_cache_presets::preset1;
-    preset preset_object{};
+    preset preset_object {};
     preset::cache_type& cache = preset_object.cache;
 
     // retain handle object to keep an item in the cache
@@ -75,10 +75,9 @@ TEST_CASE("basic test for std::move") {
 TEST_CASE("basic test for to bool conversion") {
     using concurrent_lru_cache_presets::preset1;
 
-    preset1 preset_instance{};
+    preset1 preset_instance {};
     preset1::cache_type& cache = preset_instance.cache;
 
-
     preset1::handle_type handle;
     preset1::handle_type foobar = preset1::handle_type();
 
@@ -90,12 +89,8 @@ TEST_CASE("basic test for to bool conversion") {
 
     handle = std::move(handle1);
 
-    REQUIRE_MESSAGE(
-        !preset1::handle_type(),
-        "user-defined to-bool conversion does not work");
-    REQUIRE_MESSAGE(
-        handle,
-        "user-defined to-bool conversion does not work");
+    REQUIRE_MESSAGE(!preset1::handle_type(), "user-defined to-bool conversion does not work");
+    REQUIRE_MESSAGE(handle, "user-defined to-bool conversion does not work");
 
     handle = preset1::handle_type();
 }
@@ -103,28 +98,23 @@ TEST_CASE("basic test for to bool conversion") {
 //! \brief \ref requirement
 TEST_CASE("basic test for cache hit") {
     using preset = concurrent_lru_cache_presets::preset_call_count<__LINE__>;
-    preset preset_object{};
+    preset preset_object {};
     preset::cache_type& cache = preset_object.cache;
 
     int dummy_key = 0;
     cache[dummy_key];
     cache[dummy_key];
 
-    REQUIRE_MESSAGE(
-        preset::counter_type::calls == 1,
-        "value function should be called only on a cache miss");
+    REQUIRE_MESSAGE(preset::counter_type::calls == 1, "value function should be called only on a cache miss");
 }
 
 //! \brief \ref requirement
 TEST_CASE("basic test for unused objects") {
     using preset = concurrent_lru_cache_presets::preset_instance_count;
-    preset preset_object{};
+    preset preset_object {};
 
-    for (std::size_t i = 0; i < preset_object.number_of_lru_history_items; ++i)
-        preset_object.cache[i];
+    for (std::size_t i = 0; i < preset_object.number_of_lru_history_items; ++i) preset_object.cache[i];
 
-    REQUIRE_MESSAGE(
-        preset_object.source.instances_count() == preset_object.number_of_lru_history_items+1,
-        "cache should respect number of stored unused objects to number passed in constructor");
+    REQUIRE_MESSAGE(preset_object.source.instances_count() == preset_object.number_of_lru_history_items + 1,
+                    "cache should respect number of stored unused objects to number passed in constructor");
 }
-
diff --git a/external/tbb/test/conformance/conformance_concurrent_map.cpp b/external/tbb/test/conformance/conformance_concurrent_map.cpp
index 7d82366e..6d177019 100644
--- a/external/tbb/test/conformance/conformance_concurrent_map.cpp
+++ b/external/tbb/test/conformance/conformance_concurrent_map.cpp
@@ -15,16 +15,16 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
 #endif
 
 #ifndef NOMINMAX
 #define NOMINMAX
 #endif
 #include "oneapi/tbb/concurrent_map.h"
+#include <common/concurrent_ordered_common.h>
 #include <common/test.h>
 #include <common/utils.h>
-#include <common/concurrent_ordered_common.h>
 #include <memory>
 #include <type_traits>
 
@@ -42,16 +42,12 @@ using multimap_type = oneapi::tbb::concurrent_multimap<int, int, std::less<int>,
 
 template <>
 struct SpecialTests<map_type> {
-    static void Test() {
-        SpecialMapTests<map_type>();
-    }
+    static void Test() { SpecialMapTests<map_type>(); }
 };
 
 template <>
 struct SpecialTests<multimap_type> {
-    static void Test() {
-        SpecialMultiMapTests<multimap_type>();
-    }
+    static void Test() { SpecialMultiMapTests<multimap_type>(); }
 };
 
 template <template <typename...> class ContainerType>
@@ -59,10 +55,11 @@ void test_member_types() {
     using default_container_type = ContainerType<int, int>;
     static_assert(std::is_same<typename default_container_type::key_compare, std::less<int>>::value,
                   "Incorrect default template comparator");
-    static_assert(std::is_same<typename default_container_type::allocator_type, oneapi::tbb::tbb_allocator<std::pair<const int, int>>>::value,
+    static_assert(std::is_same<typename default_container_type::allocator_type,
+                               oneapi::tbb::tbb_allocator<std::pair<const int, int>>>::value,
                   "Incorrect default template allocator");
 
-    auto test_comparator = [](const int&, const int&)->bool { return true; };
+    auto test_comparator = [](const int&, const int&) -> bool { return true; };
     using test_allocator_type = std::allocator<std::pair<const int, int>>;
 
     using container_type = ContainerType<int, int, decltype(test_comparator), test_allocator_type>;
@@ -90,9 +87,11 @@ void test_member_types() {
     static_assert(std::is_same<typename container_type::const_reference, const value_type&>::value,
                   "Incorrect container const_reference member type");
     using allocator_type = typename container_type::allocator_type;
-    static_assert(std::is_same<typename container_type::pointer, typename std::allocator_traits<allocator_type>::pointer>::value,
+    static_assert(std::is_same<typename container_type::pointer,
+                               typename std::allocator_traits<allocator_type>::pointer>::value,
                   "Incorrect container pointer member type");
-    static_assert(std::is_same<typename container_type::const_pointer, typename std::allocator_traits<allocator_type>::const_pointer>::value,
+    static_assert(std::is_same<typename container_type::const_pointer,
+                               typename std::allocator_traits<allocator_type>::const_pointer>::value,
                   "Incorrect container const_pointer member type");
 
     static_assert(utils::is_forward_iterator<typename container_type::iterator>::value,
@@ -110,34 +109,38 @@ template <template <typename...> typename TMap>
 void test_deduction_guides() {
     std::vector<std::pair<int, int>> v(10, {0, 0});
     TMap map(v.begin(), v.end());
-    static_assert(std::is_same_v<decltype(map), TMap<int, int> >, "WRONG\n");
+    static_assert(std::is_same_v<decltype(map), TMap<int, int>>, "WRONG\n");
 
     std::greater<int> compare;
     std::allocator<std::pair<const int, int>> allocator;
     TMap map2(v.begin(), v.end(), compare);
-    static_assert(std::is_same_v<decltype(map2), TMap<int, int, decltype(compare)> >, "WRONG\n");
+    static_assert(std::is_same_v<decltype(map2), TMap<int, int, decltype(compare)>>, "WRONG\n");
 
     TMap map3(v.begin(), v.end(), allocator);
-    static_assert(std::is_same_v<decltype(map3), TMap<int, int, std::less<int>, decltype(allocator)> >, "WRONG\n");
+    static_assert(std::is_same_v<decltype(map3), TMap<int, int, std::less<int>, decltype(allocator)>>,
+                  "WRONG\n");
 
     TMap map4(v.begin(), v.end(), compare, allocator);
-    static_assert(std::is_same_v<decltype(map4), TMap<int, int, decltype(compare), decltype(allocator)> >, "WRONG\n");
+    static_assert(std::is_same_v<decltype(map4), TMap<int, int, decltype(compare), decltype(allocator)>>,
+                  "WRONG\n");
 
     using pair_t = std::pair<const int, int>;
-    auto init = { pair_t{1, 1}, pair_t{2, 2}, pair_t{3, 3} };
+    auto init = {pair_t {1, 1}, pair_t {2, 2}, pair_t {3, 3}};
     TMap map5(init);
-    static_assert(std::is_same_v<decltype(map5), TMap<int, int> >, "WRONG\n");
+    static_assert(std::is_same_v<decltype(map5), TMap<int, int>>, "WRONG\n");
 
     TMap map6(init, compare);
-    static_assert(std::is_same_v<decltype(map6), TMap<int, int, decltype(compare)> >, "WRONG\n");
+    static_assert(std::is_same_v<decltype(map6), TMap<int, int, decltype(compare)>>, "WRONG\n");
 
     TMap map7(init, allocator);
-    static_assert(std::is_same_v<decltype(map7), TMap<int, int, std::less<int>, decltype(allocator)> >, "WRONG\n");
+    static_assert(std::is_same_v<decltype(map7), TMap<int, int, std::less<int>, decltype(allocator)>>,
+                  "WRONG\n");
 
     TMap map8(init, compare, allocator);
-    static_assert(std::is_same_v<decltype(map8), TMap<int, int, decltype(compare), decltype(allocator)> >, "WRONG\n");
+    static_assert(std::is_same_v<decltype(map8), TMap<int, int, decltype(compare), decltype(allocator)>>,
+                  "WRONG\n");
 }
-#endif // __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
+#endif// __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 
 template <template <typename...> class MapType>
 void test_heterogeneous_functions() {
@@ -154,7 +157,7 @@ struct COMapTraits : OrderedMoveTraitsBase {
     using container_value_type = std::pair<const T, T>;
 
     using init_iterator_type = move_support_tests::FooPairIterator;
-}; // struct COMapTraits
+};// struct COMapTraits
 
 struct COMultimapTraits : OrderedMoveTraitsBase {
     template <typename T, typename Allocator>
@@ -164,31 +167,23 @@ struct COMultimapTraits : OrderedMoveTraitsBase {
     using container_value_type = std::pair<const T, T>;
 
     using init_iterator_type = move_support_tests::FooPairIterator;
-}; // struct COMultimapTraits
+};// struct COMultimapTraits
 
 //! Testing concurrent_map member types
 //! \brief \ref interface \ref requirement
-TEST_CASE("concurrent_map member types") {
-    test_member_types<oneapi::tbb::concurrent_map>();
-}
+TEST_CASE("concurrent_map member types") { test_member_types<oneapi::tbb::concurrent_map>(); }
 
 //! Testing requirements of concurrent_map
 //! \brief \ref interface \ref requirement
-TEST_CASE("concurrent_map requirements") {
-    test_basic<map_type>();
-}
+TEST_CASE("concurrent_map requirements") { test_basic<map_type>(); }
 
 //! Testing multithreading support in concurrent_map
 //! \brief \ref requirement
-TEST_CASE("concurrent_map multithreading support") {
-    test_concurrent<map_type>();
-}
+TEST_CASE("concurrent_map multithreading support") { test_concurrent<map_type>(); }
 
 //! Testing move constructors and assignment operator in concurrent_map
 //! \brief \ref interface \ref requirement
-TEST_CASE("concurrent_map move semantics support") {
-    test_rvalue_ref_support<COMapTraits>();
-}
+TEST_CASE("concurrent_map move semantics support") { test_rvalue_ref_support<COMapTraits>(); }
 
 //! Testing std::initializer_list constructors and modifiers in concurrent_map
 //! \brief \ref interface \ref requirement
@@ -204,9 +199,7 @@ TEST_CASE("node handling support in concurrent_map") {
 
 //! Testing std::allocator_traits support in concurrent_map
 //! \brief \ref interface \ref requirement
-TEST_CASE("std::allocator_traits support in concurrent_map") {
-    test_allocator_traits_support<COMapTraits>();
-}
+TEST_CASE("std::allocator_traits support in concurrent_map") { test_allocator_traits_support<COMapTraits>(); }
 
 //! Testing heterogeneous overloads in concurrent_map
 //! \brief \ref interface \ref requirement
@@ -223,40 +216,28 @@ TEST_CASE("insertion by generic pair in concurrent_map") {
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 //! Testing Class Template Argument Deduction in concurrent_map
 //! \brief \ref interface \ref requirement
-TEST_CASE("CTAD support in concurrent_map") {
-    test_deduction_guides<oneapi::tbb::concurrent_map>();
-}
-#endif // __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
+TEST_CASE("CTAD support in concurrent_map") { test_deduction_guides<oneapi::tbb::concurrent_map>(); }
+#endif// __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 
 //! Testing comparisons of concurrent_map
 //! \brief \ref interface \ref requirement
-TEST_CASE("test concurrent_map comparisons") {
-    test_map_comparisons<oneapi::tbb::concurrent_map>();
-}
+TEST_CASE("test concurrent_map comparisons") { test_map_comparisons<oneapi::tbb::concurrent_map>(); }
 
 //! Testing concurrent_multimap member types
 //! \brief \ref interface \ref requirement
-TEST_CASE("concurrent_multimap member types") {
-    test_member_types<oneapi::tbb::concurrent_multimap>();
-}
+TEST_CASE("concurrent_multimap member types") { test_member_types<oneapi::tbb::concurrent_multimap>(); }
 
 //! Testing requirements of concurrent_multimap
 //! \brief \ref interface \ref requirement
-TEST_CASE("concurrent_multimap requirements") {
-    test_basic<multimap_type>();
-}
+TEST_CASE("concurrent_multimap requirements") { test_basic<multimap_type>(); }
 
 //! Testing multithreading support in concurrent_multimap
 //! \brief \ref requirement
-TEST_CASE("concurrent_multimap multithreading support") {
-    test_concurrent<multimap_type>();
-}
+TEST_CASE("concurrent_multimap multithreading support") { test_concurrent<multimap_type>(); }
 
 //! Testing move constructors and assignment operator in concurrent_multimap
 //! \brief \ref interface \ref requirement
-TEST_CASE("concurrent_multimap multithreading support") {
-    test_rvalue_ref_support<COMultimapTraits>();
-}
+TEST_CASE("concurrent_multimap multithreading support") { test_rvalue_ref_support<COMultimapTraits>(); }
 
 //! Testing std::initializer_list constructors and modifiers in concurrent_multimap
 //! \brief \ref interface \ref requirement
@@ -294,7 +275,7 @@ TEST_CASE("insertion by generic pair in concurrent_multimap") {
 TEST_CASE("CTAD support in concurrent_multimap") {
     test_deduction_guides<oneapi::tbb::concurrent_multimap>();
 }
-#endif // __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
+#endif// __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 
 //! Testing comparison operators in concurrent_multimap
 //! \brief \ref interface \ref requirement
@@ -304,6 +285,4 @@ TEST_CASE("test concurrent_multimap comparisons") {
 
 //! Testing of merge operations in concurrent_map and concurrent_multimap
 //! \brief \ref interface \ref requirement
-TEST_CASE("merge operations") {
-    node_handling_tests::test_merge<map_type, multimap_type>(1000);
-}
+TEST_CASE("merge operations") { node_handling_tests::test_merge<map_type, multimap_type>(1000); }
diff --git a/external/tbb/test/conformance/conformance_concurrent_priority_queue.cpp b/external/tbb/test/conformance/conformance_concurrent_priority_queue.cpp
index ccb145b3..8acca9a6 100644
--- a/external/tbb/test/conformance/conformance_concurrent_priority_queue.cpp
+++ b/external/tbb/test/conformance/conformance_concurrent_priority_queue.cpp
@@ -15,13 +15,13 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
 #endif
 
 #include <common/concurrent_priority_queue_common.h>
-#include <common/initializer_list_support.h>
 #include <common/container_move_support.h>
 #include <common/containers_common.h>
+#include <common/initializer_list_support.h>
 #include <common/test_comparisons.h>
 #include <scoped_allocator>
 
@@ -38,7 +38,8 @@ void test_to_vector() {
     std::vector<int> from_cpq = toVector(q);
 
     std::sort(source.begin(), source.end());
-    REQUIRE_MESSAGE(source == from_cpq, "equality_comparison_helpers::toVector incorrectly copied items from CPQ");
+    REQUIRE_MESSAGE(source == from_cpq,
+                    "equality_comparison_helpers::toVector incorrectly copied items from CPQ");
 }
 
 void test_basic() {
@@ -46,10 +47,9 @@ void test_basic() {
     utils::FastRandom<> rnd(1234);
 
     std::vector<int> arrInt;
-    for (int i = 0; i < NUMBER; ++i)
-        arrInt.emplace_back(rnd.get());
+    for (int i = 0; i < NUMBER; ++i) arrInt.emplace_back(rnd.get());
 
-    type_tester(arrInt); // Test integers
+    type_tester(arrInt);// Test integers
 }
 
 void test_initializer_list() {
@@ -63,13 +63,13 @@ struct SpecialMemberCalls {
     std::size_t move_ctor_called_times;
     std::size_t copy_assign_called_times;
     std::size_t move_assign_called_times;
-}; // struct SpecialMemberCalls
+};// struct SpecialMemberCalls
 
-bool operator==( const SpecialMemberCalls& lhs, const SpecialMemberCalls& rhs ) {
-    return lhs.copy_ctor_called_times == rhs.copy_ctor_called_times &&
-           lhs.move_ctor_called_times == rhs.move_ctor_called_times &&
-           lhs.copy_assign_called_times == rhs.copy_assign_called_times &&
-           lhs.move_assign_called_times == rhs.move_assign_called_times;
+bool operator==(const SpecialMemberCalls& lhs, const SpecialMemberCalls& rhs) {
+    return lhs.copy_ctor_called_times == rhs.copy_ctor_called_times
+           && lhs.move_ctor_called_times == rhs.move_ctor_called_times
+           && lhs.copy_assign_called_times == rhs.copy_assign_called_times
+           && lhs.move_assign_called_times == rhs.move_assign_called_times;
 }
 
 template <typename CounterType>
@@ -80,34 +80,35 @@ struct MoveOperationTrackerBase {
     static CounterType move_assign_called_times;
 
     static SpecialMemberCalls special_member_calls() {
-        return SpecialMemberCalls{copy_ctor_called_times, move_ctor_called_times, copy_assign_called_times, move_assign_called_times};
+        return SpecialMemberCalls {copy_ctor_called_times, move_ctor_called_times, copy_assign_called_times,
+                                   move_assign_called_times};
     }
     static CounterType value_counter;
     std::size_t value;
 
     MoveOperationTrackerBase() : value(++value_counter) {}
-    explicit MoveOperationTrackerBase( const std::size_t val ) : value(val) {}
+    explicit MoveOperationTrackerBase(const std::size_t val) : value(val) {}
     ~MoveOperationTrackerBase() { value = 0; }
 
-    MoveOperationTrackerBase( const MoveOperationTrackerBase& other ) : value(other.value) {
+    MoveOperationTrackerBase(const MoveOperationTrackerBase& other) : value(other.value) {
         REQUIRE_MESSAGE(other.value, "The object has been moved or destroyed");
         ++copy_ctor_called_times;
     }
 
-    MoveOperationTrackerBase( MoveOperationTrackerBase&& other ) noexcept : value(other.value) {
+    MoveOperationTrackerBase(MoveOperationTrackerBase&& other) noexcept : value(other.value) {
         REQUIRE_MESSAGE(other.value, "The object has been moved or destroyed");
         other.value = 0;
         ++move_ctor_called_times;
     }
 
-    MoveOperationTrackerBase& operator=( const MoveOperationTrackerBase& other ) {
+    MoveOperationTrackerBase& operator=(const MoveOperationTrackerBase& other) {
         REQUIRE_MESSAGE(other.value, "The object has been moved or destroyed");
         value = other.value;
         ++copy_assign_called_times;
         return *this;
     }
 
-    MoveOperationTrackerBase& operator=( MoveOperationTrackerBase&& other ) noexcept {
+    MoveOperationTrackerBase& operator=(MoveOperationTrackerBase&& other) noexcept {
         REQUIRE_MESSAGE(other.value, "The object has been moved or destroyed");
         value = other.value;
         other.value = 0;
@@ -115,35 +116,43 @@ struct MoveOperationTrackerBase {
         return *this;
     }
 
-    bool operator<( const MoveOperationTrackerBase& other ) const {
+    bool operator<(const MoveOperationTrackerBase& other) const {
         REQUIRE_MESSAGE(value, "The object has been moved or destroyed");
         REQUIRE_MESSAGE(other.value, "The object has been moved or destroyed");
         return value < other.value;
     }
-}; // struct MoveOperationTrackerBase
+};// struct MoveOperationTrackerBase
 
-template<typename CounterType>
-bool operator==( const MoveOperationTrackerBase<CounterType>& lhs, const MoveOperationTrackerBase<CounterType>& rhs ) {
+template <typename CounterType>
+bool operator==(const MoveOperationTrackerBase<CounterType>& lhs,
+                const MoveOperationTrackerBase<CounterType>& rhs) {
     return !(lhs < rhs) && !(rhs < lhs);
 }
 
 using MoveOperationTracker = MoveOperationTrackerBase<std::size_t>;
 using MoveOperationTrackerConc = MoveOperationTrackerBase<std::atomic<std::size_t>>;
 
-template <typename CounterType> CounterType MoveOperationTrackerBase<CounterType>::copy_ctor_called_times(0);
-template <typename CounterType> CounterType MoveOperationTrackerBase<CounterType>::move_ctor_called_times(0);
-template <typename CounterType> CounterType MoveOperationTrackerBase<CounterType>::copy_assign_called_times(0);
-template <typename CounterType> CounterType MoveOperationTrackerBase<CounterType>::move_assign_called_times(0);
-template <typename CounterType> CounterType MoveOperationTrackerBase<CounterType>::value_counter(0);
+template <typename CounterType>
+CounterType MoveOperationTrackerBase<CounterType>::copy_ctor_called_times(0);
+template <typename CounterType>
+CounterType MoveOperationTrackerBase<CounterType>::move_ctor_called_times(0);
+template <typename CounterType>
+CounterType MoveOperationTrackerBase<CounterType>::copy_assign_called_times(0);
+template <typename CounterType>
+CounterType MoveOperationTrackerBase<CounterType>::move_assign_called_times(0);
+template <typename CounterType>
+CounterType MoveOperationTrackerBase<CounterType>::value_counter(0);
 
 template <typename Allocator = std::allocator<MoveOperationTracker>>
 struct CPQSrcFixture {
-    CPQSrcFixture& operator=( const CPQSrcFixture& ) = delete;
+    CPQSrcFixture& operator=(const CPQSrcFixture&) = delete;
 
-    enum {default_container_size = 100};
+    enum { default_container_size = 100 };
     using cpq_compare_type = std::less<MoveOperationTracker>;
-    using cpq_allocator_type = typename std::allocator_traits<Allocator>::template rebind_alloc<MoveOperationTracker>;
-    using cpq_type = oneapi::tbb::concurrent_priority_queue<MoveOperationTracker, cpq_compare_type, cpq_allocator_type>;
+    using cpq_allocator_type =
+            typename std::allocator_traits<Allocator>::template rebind_alloc<MoveOperationTracker>;
+    using cpq_type = oneapi::tbb::concurrent_priority_queue<MoveOperationTracker, cpq_compare_type,
+                                                            cpq_allocator_type>;
 
     cpq_type cpq_src;
     const std::size_t container_size;
@@ -155,31 +164,29 @@ struct CPQSrcFixture {
         std::size_t& mact = MoveOperationTracker::move_assign_called_times;
         mcct = ccct = cact = mact = 0;
 
-        for (std::size_t i = 1; i <= container_size; ++i) {
-            cpq_src.push(MoveOperationTracker(i));
-        }
+        for (std::size_t i = 1; i <= container_size; ++i) { cpq_src.push(MoveOperationTracker(i)); }
         REQUIRE_MESSAGE(cpq_src.size() == container_size, "Error in test setup");
     }
 
-    CPQSrcFixture( std::size_t size = default_container_size )
+    CPQSrcFixture(std::size_t size = default_container_size)
         : CPQSrcFixture(typename cpq_type::allocator_type(), size) {}
 
-    CPQSrcFixture( const typename cpq_type::allocator_type& a, std::size_t size = default_container_size )
-        : cpq_src(a), container_size(size)
-    {
+    CPQSrcFixture(const typename cpq_type::allocator_type& a, std::size_t size = default_container_size)
+        : cpq_src(a), container_size(size) {
         init();
     }
-}; // struct CPQSrcFixture
+};// struct CPQSrcFixture
 
 void test_steal_move_ctor() {
     using fixture_type = CPQSrcFixture<>;
     using container_type = typename fixture_type::cpq_type;
     fixture_type fixture;
-    container_type src_copy{fixture.cpq_src};
+    container_type src_copy {fixture.cpq_src};
 
     SpecialMemberCalls previous = MoveOperationTracker::special_member_calls();
-    container_type dst{std::move(fixture.cpq_src)};
-    REQUIRE_MESSAGE(previous == MoveOperationTracker::special_member_calls(), "Steal move ctor should not create any new elements");
+    container_type dst {std::move(fixture.cpq_src)};
+    REQUIRE_MESSAGE(previous == MoveOperationTracker::special_member_calls(),
+                    "Steal move ctor should not create any new elements");
     REQUIRE_MESSAGE(dst == src_copy, "cpq content changed during steal move");
     REQUIRE_MESSAGE(!(dst != src_copy), "cpq content changed during steal move");
 }
@@ -194,7 +201,8 @@ void test_steal_move_ctor_with_allocator() {
 
     SpecialMemberCalls previous = MoveOperationTracker::special_member_calls();
     fixture_type::cpq_type dst(std::move(fixture.cpq_src), arena_fixture.source_allocator);
-    REQUIRE_MESSAGE(previous == MoveOperationTracker::special_member_calls(), "Steal move ctor should not create any new elements");
+    REQUIRE_MESSAGE(previous == MoveOperationTracker::special_member_calls(),
+                    "Steal move ctor should not create any new elements");
     REQUIRE_MESSAGE(dst == src_copy, "cpq content changed during steal move");
     REQUIRE_MESSAGE(!(dst != src_copy), "cpq content changed during steal move");
 }
@@ -227,14 +235,16 @@ void test_steal_move_assign_operator() {
     SpecialMemberCalls previous = MoveOperationTracker::special_member_calls();
     dst = std::move(fixture.cpq_src);
 
-    REQUIRE_MESSAGE(previous == MoveOperationTracker::special_member_calls(), "Steal move assign operator should not create any new elements");
+    REQUIRE_MESSAGE(previous == MoveOperationTracker::special_member_calls(),
+                    "Steal move assign operator should not create any new elements");
     REQUIRE_MESSAGE(dst == src_copy, "cpq content changed during steal move assignment");
     REQUIRE_MESSAGE(!(dst != src_copy), "cpq content changed during steal move assignment");
 }
 
 void test_steal_move_assign_operator_with_stateful_allocator() {
     // Use stateful allocator which is propagated on move assignment
-    using arena_fixture_type = move_support_tests::TwoMemoryArenasFixture<MoveOperationTracker, /*POCMA = */std::true_type>;
+    using arena_fixture_type
+            = move_support_tests::TwoMemoryArenasFixture<MoveOperationTracker, /*POCMA = */ std::true_type>;
     using fixture_type = CPQSrcFixture<arena_fixture_type::allocator_type>;
 
     arena_fixture_type arena_fixture(8 * fixture_type::default_container_size);
@@ -244,14 +254,16 @@ void test_steal_move_assign_operator_with_stateful_allocator() {
 
     SpecialMemberCalls previous = MoveOperationTracker::special_member_calls();
     dst = std::move(fixture.cpq_src);
-    REQUIRE_MESSAGE(previous == MoveOperationTracker::special_member_calls(), "Steal move assign operator should not create any new elements");
+    REQUIRE_MESSAGE(previous == MoveOperationTracker::special_member_calls(),
+                    "Steal move assign operator should not create any new elements");
     REQUIRE_MESSAGE(dst == src_copy, "cpq content changed during steal move assignment");
     REQUIRE_MESSAGE(!(dst != src_copy), "cpq content changed during steal move assignment");
 }
 
 void test_per_element_move_assign_operator() {
     // Use stateful allocator which is not prepagated on move assignment
-    using arena_fixture_type = move_support_tests::TwoMemoryArenasFixture<MoveOperationTracker, /*POCMA = */std::false_type>;
+    using arena_fixture_type
+            = move_support_tests::TwoMemoryArenasFixture<MoveOperationTracker, /*POCMA = */ std::false_type>;
     using fixture_type = CPQSrcFixture<arena_fixture_type::allocator_type>;
 
     arena_fixture_type arena_fixture(8 * fixture_type::default_container_size);
@@ -280,42 +292,41 @@ void test_cpq_move_assignment() {
     test_per_element_move_assign_operator();
 }
 
-
 struct NoDefaultCtorType {
     NoDefaultCtorType() = delete;
 
-    NoDefaultCtorType( std::size_t val1, std::size_t val2 ) : value1(val1), value2(val2) {}
+    NoDefaultCtorType(std::size_t val1, std::size_t val2) : value1(val1), value2(val2) {}
     bool operator<(const NoDefaultCtorType& other) const {
         return value1 + value2 < other.value1 + other.value2;
     }
 
     std::size_t value1, value2;
-}; // struct NoDefaultCtorType
+};// struct NoDefaultCtorType
 
 struct ForwardInEmplaceTester {
     int a;
     static bool move_ctor_called;
     static bool move_assign_called;
 
-    ForwardInEmplaceTester( int val ) : a(val) {}
-    ForwardInEmplaceTester( const ForwardInEmplaceTester& ) = default;
-    ForwardInEmplaceTester( ForwardInEmplaceTester&& ) = default;
+    ForwardInEmplaceTester(int val) : a(val) {}
+    ForwardInEmplaceTester(const ForwardInEmplaceTester&) = default;
+    ForwardInEmplaceTester(ForwardInEmplaceTester&&) = default;
 
-    ForwardInEmplaceTester( ForwardInEmplaceTester&& obj, int val ) : a(obj.a) {
+    ForwardInEmplaceTester(ForwardInEmplaceTester&& obj, int val) : a(obj.a) {
         move_ctor_called = true;
         obj.a = val;
     }
 
-    ForwardInEmplaceTester& operator=( const ForwardInEmplaceTester& ) = default;
+    ForwardInEmplaceTester& operator=(const ForwardInEmplaceTester&) = default;
 
-    ForwardInEmplaceTester& operator=( ForwardInEmplaceTester&& obj ) {
+    ForwardInEmplaceTester& operator=(ForwardInEmplaceTester&& obj) {
         a = obj.a;
         move_assign_called = true;
         return *this;
     }
 
-    bool operator<( const ForwardInEmplaceTester& ) const { return true; }
-}; // struct ForwardInEmplaceTester
+    bool operator<(const ForwardInEmplaceTester&) const { return true; }
+};// struct ForwardInEmplaceTester
 
 bool ForwardInEmplaceTester::move_ctor_called = false;
 bool ForwardInEmplaceTester::move_assign_called = false;
@@ -332,7 +343,7 @@ void test_move_support_in_push_pop() {
     REQUIRE_MESSAGE(mcct == 0, "Value must be zero-initialized");
     REQUIRE_MESSAGE(ccct == 0, "Value must be zero-initialized");
 
-    q1.push(MoveOperationTracker{});
+    q1.push(MoveOperationTracker {});
     REQUIRE_MESSAGE(mcct > 0, "Not working push(T&&)");
     REQUIRE_MESSAGE(ccct == 0, "Copying of arg occurred during push(T&&)");
 
@@ -364,12 +375,13 @@ void test_move_support_in_push_pop() {
 
     oneapi::tbb::concurrent_priority_queue<ForwardInEmplaceTester> q3;
     REQUIRE(ForwardInEmplaceTester::move_ctor_called == false);
-    q3.emplace(ForwardInEmplaceTester{5}, 2);
+    q3.emplace(ForwardInEmplaceTester {5}, 2);
     REQUIRE_MESSAGE(ForwardInEmplaceTester::move_ctor_called == true, "Not used std::forward in emplace()");
     ForwardInEmplaceTester obj(0);
     q3.try_pop(obj);
 
-    REQUIRE_MESSAGE(ForwardInEmplaceTester::move_assign_called == true, "Not used move assignment in try_pop");
+    REQUIRE_MESSAGE(ForwardInEmplaceTester::move_assign_called == true,
+                    "Not used move assignment in try_pop");
     REQUIRE_MESSAGE(obj.a == 5, "Not used std::forward in emplace");
     REQUIRE_MESSAGE(!q3.try_pop(obj), "The queue should be empty");
 }
@@ -378,10 +390,10 @@ void test_move_support_in_push_pop() {
 template <typename T>
 class LessA : public std::less<T> {
 public:
-    explicit LessA( bool no_assert = false ) {
+    explicit LessA(bool no_assert = false) {
         REQUIRE_MESSAGE(no_assert, "Default ctor should not be called");
     }
-}; // class LessA
+};// class LessA
 
 // TODO: consider use of TEST_SUITE for these tests
 // TODO: combine with the constructors test from the common part
@@ -391,7 +403,8 @@ void test_ctors_dtor_accessors() {
 
     using cpq_type = oneapi::tbb::concurrent_priority_queue<int, std::less<int>>;
     using cpq_with_compare_type = oneapi::tbb::concurrent_priority_queue<int, LessA<int>>;
-    using cpq_with_compare_and_allocator_type = oneapi::tbb::concurrent_priority_queue<int, LessA<int>, std::allocator<int>>;
+    using cpq_with_compare_and_allocator_type
+            = oneapi::tbb::concurrent_priority_queue<int, LessA<int>, std::allocator<int>>;
 
     LessA<int> l(true);
 
@@ -426,9 +439,7 @@ void test_ctors_dtor_accessors() {
     REQUIRE_MESSAGE(cpq6.empty(), "Failed empty test for capacity+compare+allocator ctor");
 
     // Test half-open range ctor
-    for (int i = 0; i < 42; ++i) {
-        v.emplace_back(i);
-    }
+    for (int i = 0; i < 42; ++i) { v.emplace_back(i); }
     using equality_comparison_helpers::toVector;
     cpq_type cpq7(v.begin(), v.end());
     REQUIRE_MESSAGE(cpq7.size() == 42, "Failed size test for half-open range ctor");
@@ -454,8 +465,7 @@ void test_assignment_clear_swap() {
     std::vector<int> v;
     int e;
 
-    for( int i = 0; i < 42; ++i )
-        v.emplace_back(i);
+    for (int i = 0; i < 42; ++i) v.emplace_back(i);
 
     cpq_type q(v.begin(), v.end());
     cpq_type qo;
@@ -481,15 +491,13 @@ void test_assignment_clear_swap() {
     REQUIRE_MESSAGE(q.empty(), "Failed clear empty test");
 
     // Test assignment again
-    for (std::size_t i = 0; i < 5; ++i)
-        qo.try_pop(e);
+    for (std::size_t i = 0; i < 5; ++i) qo.try_pop(e);
 
     q = qo;
     REQUIRE_MESSAGE(q.size() == 37, "Failed assignment size test");
     REQUIRE_MESSAGE(!q.empty(), "Failed assignment empty test");
 
-    for (std::size_t i = 0; i < 5; ++i)
-        qo.try_pop(e);
+    for (std::size_t i = 0; i < 5; ++i) qo.try_pop(e);
 
     q.swap(qo);
 
@@ -508,14 +516,14 @@ void test_serial_push_pop() {
     // Test serial push
     for (std::size_t i = 0; i < MAX_ITER; ++i) {
         push_selector(q, e, i);
-        e = e*-1 + int(i);
+        e = e * -1 + int(i);
     }
 
     REQUIRE_MESSAGE(q.size() == MAX_ITER, "Failed push size test");
     REQUIRE_MESSAGE(!q.empty(), "Failed push empty test");
 
     // Test serial pop
-    while(!q.empty()) {
+    while (!q.empty()) {
         REQUIRE_MESSAGE(q.try_pop(e), "Failed pop test");
         REQUIRE_MESSAGE(prev >= e, "Failed pop priority test");
         prev = e;
@@ -529,20 +537,19 @@ void test_serial_push_pop() {
 
 void test_concurrent(std::size_t n) {
     test_parallel_push_pop<std::less<int>>(n, INT_MAX, INT_MIN);
-    test_parallel_push_pop<std::less<int>>(n, (unsigned char)CHAR_MAX, (unsigned char)CHAR_MIN);
+    test_parallel_push_pop<std::less<int>>(n, (unsigned char) CHAR_MAX, (unsigned char) CHAR_MIN);
 
     test_flogger<std::less<int>, int>(n);
     test_flogger<std::less<int>, unsigned char>(n);
 
     MoveOperationTrackerConc::copy_assign_called_times = 0;
     test_flogger<std::less<MoveOperationTrackerConc>, MoveOperationTrackerConc>(n);
-    REQUIRE_MESSAGE(MoveOperationTrackerConc::copy_assign_called_times == 0, "Copy assignment called during try_pop");
+    REQUIRE_MESSAGE(MoveOperationTrackerConc::copy_assign_called_times == 0,
+                    "Copy assignment called during try_pop");
 }
 
 void test_multithreading() {
-    for (std::size_t n = utils::MinThread; n != utils::MaxThread; ++n) {
-        test_concurrent(n);
-    }
+    for (std::size_t n = utils::MinThread; n != utils::MaxThread; ++n) { test_concurrent(n); }
 }
 
 struct CPQTraits {
@@ -551,24 +558,25 @@ struct CPQTraits {
 
     template <typename T, typename Allocator>
     using container_type = oneapi::tbb::concurrent_priority_queue<T, std::less<T>, Allocator>;
-}; // struct CPQTraits
+};// struct CPQTraits
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
-template <template <typename...>typename TQueue>
+template <template <typename...> typename TQueue>
 void TestDeductionGuides() {
     using ComplexType = const std::string*;
     std::string s("s");
     std::vector<ComplexType> v;
-    auto l = {ComplexType(&s), ComplexType(&s) };
+    auto l = {ComplexType(&s), ComplexType(&s)};
 
     // check TQueue(InputIterator, InputIterator)
     TQueue qv(v.begin(), v.end());
-    static_assert(std::is_same<decltype(qv), TQueue<ComplexType> >::value);
+    static_assert(std::is_same<decltype(qv), TQueue<ComplexType>>::value);
 
     // check TQueue(InputIterator, InputIterator, Allocator)
     TQueue qva(v.begin(), v.end(), std::allocator<ComplexType>());
-    static_assert(std::is_same<decltype(qva), TQueue<ComplexType, std::less<ComplexType>,
-        std::allocator<ComplexType>>>::value);
+    static_assert(
+            std::is_same<decltype(qva),
+                         TQueue<ComplexType, std::less<ComplexType>, std::allocator<ComplexType>>>::value);
 
     // check TQueue(InputIterator, InputIterator, Compare)
     TQueue qvc(v.begin(), v.end(), LessA<ComplexType>(true));
@@ -576,8 +584,8 @@ void TestDeductionGuides() {
 
     // check TQueue(InputIterator, InputIterator, Compare, Allocator)
     TQueue qvca(v.begin(), v.end(), LessA<ComplexType>(true), std::allocator<ComplexType>());
-    static_assert(std::is_same<decltype(qvca), TQueue<ComplexType, LessA<ComplexType>,
-        std::allocator<ComplexType>>>::value);
+    static_assert(std::is_same<decltype(qvca),
+                               TQueue<ComplexType, LessA<ComplexType>, std::allocator<ComplexType>>>::value);
 
     // check TQueue(std::initializer_list)
     TQueue ql(l);
@@ -585,8 +593,9 @@ void TestDeductionGuides() {
 
     // check TQueue(std::initializer_list, Allocator)
     TQueue qla(l, std::allocator<ComplexType>());
-    static_assert(std::is_same<decltype(qla), TQueue<ComplexType, std::less<ComplexType>,
-        std::allocator<ComplexType>>>::value);
+    static_assert(
+            std::is_same<decltype(qla),
+                         TQueue<ComplexType, std::less<ComplexType>, std::allocator<ComplexType>>>::value);
 
     // check TQueue(std::initializer_list, Compare)
     TQueue qlc(l, LessA<ComplexType>(true));
@@ -594,8 +603,8 @@ void TestDeductionGuides() {
 
     // check TQueue(std::initializer_list, Compare, Allocator)
     TQueue qlca(l, LessA<ComplexType>(true), std::allocator<ComplexType>());
-    static_assert(std::is_same<decltype(qlca), TQueue<ComplexType, LessA<ComplexType>,
-        std::allocator<ComplexType>>>::value);
+    static_assert(std::is_same<decltype(qlca),
+                               TQueue<ComplexType, LessA<ComplexType>, std::allocator<ComplexType>>>::value);
 
     // check TQueue(TQueue &)
     TQueue qc(qv);
@@ -613,19 +622,19 @@ void TestDeductionGuides() {
     TQueue qma(std::move(qva), std::allocator<ComplexType>());
     static_assert(std::is_same<decltype(qma), decltype(qva)>::value);
 }
-#endif // __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
+#endif// __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 
 template <typename CPQType>
 void TestComparisonsBasic() {
     using comparisons_testing::testEqualityComparisons;
     CPQType c1, c2;
-    testEqualityComparisons</*ExpectEqual = */true>(c1, c2);
+    testEqualityComparisons</*ExpectEqual = */ true>(c1, c2);
 
     c1.emplace(1);
-    testEqualityComparisons</*ExpectEqual = */false>(c1, c2);
+    testEqualityComparisons</*ExpectEqual = */ false>(c1, c2);
 
     c2.emplace(1);
-    testEqualityComparisons</*ExpectEqual = */true>(c1, c2);
+    testEqualityComparisons</*ExpectEqual = */ true>(c1, c2);
 }
 
 template <typename TwoWayComparableCPQType>
@@ -642,7 +651,8 @@ void TestTwoWayComparableCPQ() {
 
 void TestCPQComparisons() {
     using integral_container = oneapi::tbb::concurrent_priority_queue<int>;
-    using two_way_comparable_container = oneapi::tbb::concurrent_priority_queue<comparisons_testing::TwoWayComparable>;
+    using two_way_comparable_container
+            = oneapi::tbb::concurrent_priority_queue<comparisons_testing::TwoWayComparable>;
 
     TestComparisonsBasic<integral_container>();
     TestComparisonsBasic<two_way_comparable_container>();
@@ -652,55 +662,39 @@ void TestCPQComparisons() {
 // Testing basic operations with concurrent_priority_queue with integral value type
 //! \brief \ref interface \ref requirement
 TEST_CASE("basic test for concurrent_priority_queue") {
-    test_to_vector(); // Test concurrent_priority_queue helper
+    test_to_vector();// Test concurrent_priority_queue helper
     test_basic();
 }
 
 // Testing std::initializer_list interfaces in concurrent_priority_queue
 //! \brief \ref interface \ref requirement
-TEST_CASE("std::initializer_list support in concurrent_priority_queue") {
-    test_initializer_list();
-}
+TEST_CASE("std::initializer_list support in concurrent_priority_queue") { test_initializer_list(); }
 
 //! Testing concurrent_priority_queue moving constructors
 //! \brief \ref interface \ref requirement
-TEST_CASE("concurrent_priority_queue move constructor") {
-    test_cpq_move_constructor();
-}
+TEST_CASE("concurrent_priority_queue move constructor") { test_cpq_move_constructor(); }
 
 //! Testing concurrent_priority_queue move assignment operator with different allocator types
 //! \brief \ref interface \ref requirement
-TEST_CASE("concurrent_priority_queue move assignment operator") {
-    test_cpq_move_assignment();
-}
+TEST_CASE("concurrent_priority_queue move assignment operator") { test_cpq_move_assignment(); }
 
 //! Testing move semantics on basic push-pop operations
 //! \brief \ref requirement
-TEST_CASE("move semantics support on push-pop operations") {
-    test_move_support_in_push_pop();
-}
+TEST_CASE("move semantics support on push-pop operations") { test_move_support_in_push_pop(); }
 
 //! \brief \ref interface \ref requirement
-TEST_CASE("constructors, destructor and accessors") {
-    test_ctors_dtor_accessors();
-}
+TEST_CASE("constructors, destructor and accessors") { test_ctors_dtor_accessors(); }
 
 //! \brief \ref interface \ref requirement
-TEST_CASE("assignment, clear and swap operations") {
-    test_assignment_clear_swap();
-}
+TEST_CASE("assignment, clear and swap operations") { test_assignment_clear_swap(); }
 
 //! Testing push-pop operations in concurrent_priority_queue
 //! \brief \ref requirement
-TEST_CASE("serial push-pop") {
-    test_serial_push_pop();
-}
+TEST_CASE("serial push-pop") { test_serial_push_pop(); }
 
 //! Testing push-pop operations in concurrent_priority_queue with multithreading
 //! \brief \ref requirement
-TEST_CASE("multithreading support in concurrent_priority_queue") {
-    test_multithreading();
-}
+TEST_CASE("multithreading support in concurrent_priority_queue") { test_multithreading(); }
 
 #if !_MSC_VER || _MSC_VER > 1900
 // MSVC 2015 does not provide required level of allocator support for standard containers
@@ -717,9 +711,7 @@ TEST_CASE("std::allocator_traits support in concurrent_priority_queue") {
 TEST_CASE("CTAD support in concurrent_priority_queue") {
     TestDeductionGuides<oneapi::tbb::concurrent_priority_queue>();
 }
-#endif // __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
+#endif// __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 
 //! \brief \ref interface \ref requirement
-TEST_CASE("concurrent_priority_queue iterator comparisons") {
-    TestCPQComparisons();
-}
+TEST_CASE("concurrent_priority_queue iterator comparisons") { TestCPQComparisons(); }
diff --git a/external/tbb/test/conformance/conformance_concurrent_queue.cpp b/external/tbb/test/conformance/conformance_concurrent_queue.cpp
index 9bda9a46..e32b56cc 100644
--- a/external/tbb/test/conformance/conformance_concurrent_queue.cpp
+++ b/external/tbb/test/conformance/conformance_concurrent_queue.cpp
@@ -14,17 +14,17 @@
     limitations under the License.
 */
 
+#include <common/container_move_support.h>
+#include <common/custom_allocators.h>
 #include <common/test.h>
+#include <common/test_comparisons.h>
 #include <common/utils.h>
 #include <common/utils_report.h>
-#include <common/custom_allocators.h>
-#include <common/container_move_support.h>
-#include <common/test_comparisons.h>
 
-#include "oneapi/tbb/concurrent_queue.h"
 #include "oneapi/tbb/cache_aligned_allocator.h"
-#include <type_traits>
+#include "oneapi/tbb/concurrent_queue.h"
 #include <atomic>
+#include <type_traits>
 
 //! \file conformance_concurrent_queue.cpp
 //! \brief Test for [containers.concurrent_queue containers.concurrent_bounded_queue] specification
@@ -42,40 +42,43 @@ static std::atomic<long> PopKind[3];
 
 static int Sum[MAXTHREAD];
 
-template<typename CQ, typename ValueType, typename CounterType>
+template <typename CQ, typename ValueType, typename CounterType>
 void push(CQ& q, ValueType v, CounterType i) {
     switch (i % 3) {
-        case 0: q.push( v); break;
-        case 1: q.push( std::move(v)); break;
-        case 2: q.emplace( v); break;
-        default: CHECK(false); break;
+        case 0:
+            q.push(v);
+            break;
+        case 1:
+            q.push(std::move(v));
+            break;
+        case 2:
+            q.emplace(v);
+            break;
+        default:
+            CHECK(false);
+            break;
     }
 }
 
-template<typename T>
+template <typename T>
 class ConcQWithCapacity : public oneapi::tbb::concurrent_queue<T, test_allocator<T>> {
     using base_type = oneapi::tbb::concurrent_queue<T, test_allocator<T>>;
+
 public:
-    ConcQWithCapacity() : my_capacity( std::size_t(-1) / (sizeof(void*) + sizeof(T)) ) {}
-    std::size_t size() const {
-        return this->unsafe_size();
-    }
+    ConcQWithCapacity() : my_capacity(std::size_t(-1) / (sizeof(void*) + sizeof(T))) {}
+    std::size_t size() const { return this->unsafe_size(); }
 
-    std::size_t capacity() const {
-        return my_capacity;
-    }
+    std::size_t capacity() const { return my_capacity; }
 
-    void set_capacity( const std::size_t n ) {
-        my_capacity = n;
-    }
+    void set_capacity(const std::size_t n) { my_capacity = n; }
 
-    bool try_push( const T& source ) {
-        base_type::push( source);
+    bool try_push(const T& source) {
+        base_type::push(source);
         return source.get_serial() < my_capacity;
     }
 
-    bool try_pop( T& dest ) {
-        base_type::try_pop( dest);
+    bool try_pop(T& dest) {
+        base_type::try_pop(dest);
         return dest.get_serial() < my_capacity;
     }
 
@@ -83,12 +86,12 @@ class ConcQWithCapacity : public oneapi::tbb::concurrent_queue<T, test_allocator
     std::size_t my_capacity;
 };
 
-template<typename CQ, typename T>
+template <typename CQ, typename T>
 void TestEmptyQueue() {
     const CQ queue;
     CHECK(queue.size() == 0);
-    CHECK(queue.capacity()> 0);
-    CHECK(size_t(queue.capacity())>= std::size_t(-1)/(sizeof(void*)+sizeof(T)));
+    CHECK(queue.capacity() > 0);
+    CHECK(size_t(queue.capacity()) >= std::size_t(-1) / (sizeof(void*) + sizeof(T)));
 }
 
 void TestEmptiness() {
@@ -96,10 +99,11 @@ void TestEmptiness() {
     TestEmptyQueue<ConcQWithCapacity<move_support_tests::Foo>, move_support_tests::Foo>();
     TestEmptyQueue<oneapi::tbb::concurrent_bounded_queue<char, test_allocator<char>>, char>();
     TestEmptyQueue<oneapi::tbb::concurrent_bounded_queue<move_support_tests::Foo,
-           test_allocator<move_support_tests::Foo>>, move_support_tests::Foo>();
+                                                         test_allocator<move_support_tests::Foo>>,
+                   move_support_tests::Foo>();
 }
 
-template<typename CQ, typename T>
+template <typename CQ, typename T>
 void TestFullQueue() {
     using allocator_type = decltype(std::declval<CQ>().get_allocator());
 
@@ -111,7 +115,7 @@ void TestFullQueue() {
             for (std::size_t i = 0; i <= n; ++i) {
                 T f;
                 f.set_serial(i);
-                bool result = queue.try_push( f);
+                bool result = queue.try_push(f);
                 CHECK((result == (i < n)));
             }
 
@@ -129,10 +133,12 @@ void TestFullQueue() {
 
 void TestFullness() {
     TestFullQueue<ConcQWithCapacity<move_support_tests::Foo>, move_support_tests::Foo>();
-    TestFullQueue<oneapi::tbb::concurrent_bounded_queue<move_support_tests::Foo, test_allocator<move_support_tests::Foo>>, move_support_tests::Foo>();
+    TestFullQueue<oneapi::tbb::concurrent_bounded_queue<move_support_tests::Foo,
+                                                        test_allocator<move_support_tests::Foo>>,
+                  move_support_tests::Foo>();
 }
 
-template<typename CQ>
+template <typename CQ>
 void TestClear() {
     using allocator_type = decltype(std::declval<CQ>().get_allocator());
     allocator_type::init_counters();
@@ -151,11 +157,11 @@ void TestClear() {
     CHECK(queue.size() == n);
 
     queue.clear();
-    CHECK(queue.size()==0);
+    CHECK(queue.size() == 0);
     for (std::size_t i = 0; i < n; ++i) {
         move_support_tests::Foo f;
         f.set_serial(i);
-        queue.push( f);
+        queue.push(f);
     }
 
     CHECK(queue.size() == n);
@@ -168,22 +174,23 @@ void TestClear() {
         queue.push(f);
     }
 
-    CHECK(queue.size()==n);
+    CHECK(queue.size() == n);
 }
 
 void TestClearWorks() {
     TestClear<ConcQWithCapacity<move_support_tests::Foo>>();
-    TestClear<oneapi::tbb::concurrent_bounded_queue<move_support_tests::Foo, test_allocator<move_support_tests::Foo>>>();
+    TestClear<oneapi::tbb::concurrent_bounded_queue<move_support_tests::Foo,
+                                                    test_allocator<move_support_tests::Foo>>>();
 }
 
-template<typename Iterator1, typename Iterator2>
-void TestIteratorAux( Iterator1 i, Iterator2 j, int size ) {
-    Iterator1 old_i; // assigned at first iteration below
-    for (std::size_t k = 0; k < (std::size_t)size; ++k) {
+template <typename Iterator1, typename Iterator2>
+void TestIteratorAux(Iterator1 i, Iterator2 j, int size) {
+    Iterator1 old_i;// assigned at first iteration below
+    for (std::size_t k = 0; k < (std::size_t) size; ++k) {
         CHECK_FAST(i != j);
         CHECK_FAST(!(i == j));
         // Test "->"
-        CHECK_FAST((k+1 == i->get_serial()));
+        CHECK_FAST((k + 1 == i->get_serial()));
         if (k & 1) {
             // Test post-increment
             move_support_tests::Foo f = *old_i++;
@@ -195,7 +202,8 @@ void TestIteratorAux( Iterator1 i, Iterator2 j, int size ) {
             if (k < std::size_t(size - 1)) {
                 move_support_tests::Foo f = *++i;
                 CHECK_FAST((k + 2 == f.get_serial()));
-            } else ++i;
+            } else
+                ++i;
             // Test assignment
             old_i = i;
         }
@@ -204,8 +212,8 @@ void TestIteratorAux( Iterator1 i, Iterator2 j, int size ) {
     CHECK_FAST(i == j);
 }
 
-template<typename Iterator1, typename Iterator2>
-void TestIteratorAssignment( Iterator2 j ) {
+template <typename Iterator1, typename Iterator2>
+void TestIteratorAssignment(Iterator2 j) {
     Iterator1 i(j);
     CHECK(i == j);
     CHECK(!(i != j));
@@ -216,9 +224,10 @@ void TestIteratorAssignment( Iterator2 j ) {
     CHECK(!(k != j));
 }
 
-template<typename Iterator, typename T>
+template <typename Iterator, typename T>
 void TestIteratorTraits() {
-    static_assert( std::is_same<typename Iterator::iterator_category, std::forward_iterator_tag>::value, "wrong iterator category");
+    static_assert(std::is_same<typename Iterator::iterator_category, std::forward_iterator_tag>::value,
+                  "wrong iterator category");
 
     T x;
 
@@ -232,63 +241,63 @@ template <typename CQ>
 void TestIterator() {
     CQ queue;
     const CQ& const_queue = queue;
-    for (int j=0; j < 500; ++j) {
-        TestIteratorAux( queue.unsafe_begin()      , queue.unsafe_end()      , j);
-        TestIteratorAux( queue.unsafe_cbegin()      , queue.unsafe_cend()      , j);
-        TestIteratorAux( const_queue.unsafe_begin(), const_queue.unsafe_end(), j);
-        TestIteratorAux( const_queue.unsafe_begin(), queue.unsafe_end()      , j);
-        TestIteratorAux( queue.unsafe_begin()      , const_queue.unsafe_end(), j);
+    for (int j = 0; j < 500; ++j) {
+        TestIteratorAux(queue.unsafe_begin(), queue.unsafe_end(), j);
+        TestIteratorAux(queue.unsafe_cbegin(), queue.unsafe_cend(), j);
+        TestIteratorAux(const_queue.unsafe_begin(), const_queue.unsafe_end(), j);
+        TestIteratorAux(const_queue.unsafe_begin(), queue.unsafe_end(), j);
+        TestIteratorAux(queue.unsafe_begin(), const_queue.unsafe_end(), j);
         move_support_tests::Foo f;
-        f.set_serial(j+1);
+        f.set_serial(j + 1);
         queue.push(f);
     }
-    TestIteratorAssignment<typename CQ::const_iterator>( const_queue.unsafe_begin());
-    TestIteratorAssignment<typename CQ::const_iterator>( queue.unsafe_begin());
-    TestIteratorAssignment<typename CQ::iterator>( queue.unsafe_begin());
+    TestIteratorAssignment<typename CQ::const_iterator>(const_queue.unsafe_begin());
+    TestIteratorAssignment<typename CQ::const_iterator>(queue.unsafe_begin());
+    TestIteratorAssignment<typename CQ::iterator>(queue.unsafe_begin());
     TestIteratorTraits<typename CQ::const_iterator, const move_support_tests::Foo>();
     TestIteratorTraits<typename CQ::iterator, move_support_tests::Foo>();
 }
 
 void TestQueueIteratorWorks() {
-    TestIterator<oneapi::tbb::concurrent_queue<move_support_tests::Foo, test_allocator<move_support_tests::Foo>>>();
-    TestIterator<oneapi::tbb::concurrent_bounded_queue<move_support_tests::Foo, test_allocator<move_support_tests::Foo>>>();
+    TestIterator<oneapi::tbb::concurrent_queue<move_support_tests::Foo,
+                                               test_allocator<move_support_tests::Foo>>>();
+    TestIterator<oneapi::tbb::concurrent_bounded_queue<move_support_tests::Foo,
+                                                       test_allocator<move_support_tests::Foo>>>();
 }
 
 // Define wrapper classes to test oneapi::tbb::concurrent_queue<T>
-template<typename T, typename A = oneapi::tbb::cache_aligned_allocator<T>>
+template <typename T, typename A = oneapi::tbb::cache_aligned_allocator<T>>
 class ConcQWithSizeWrapper : public oneapi::tbb::concurrent_queue<T, A> {
 public:
     ConcQWithSizeWrapper() {}
-    ConcQWithSizeWrapper( const ConcQWithSizeWrapper& q ) : oneapi::tbb::concurrent_queue<T, A>(q) {}
-    ConcQWithSizeWrapper( const ConcQWithSizeWrapper& q, const A& a ) : oneapi::tbb::concurrent_queue<T, A>(q, a) {}
-    ConcQWithSizeWrapper( const A& a ) : oneapi::tbb::concurrent_queue<T, A>( a ) {}
+    ConcQWithSizeWrapper(const ConcQWithSizeWrapper& q) : oneapi::tbb::concurrent_queue<T, A>(q) {}
+    ConcQWithSizeWrapper(const ConcQWithSizeWrapper& q, const A& a)
+        : oneapi::tbb::concurrent_queue<T, A>(q, a) {}
+    ConcQWithSizeWrapper(const A& a) : oneapi::tbb::concurrent_queue<T, A>(a) {}
 
-    ConcQWithSizeWrapper( ConcQWithSizeWrapper&& q ) : oneapi::tbb::concurrent_queue<T>(std::move(q)) {}
-    ConcQWithSizeWrapper( ConcQWithSizeWrapper&& q, const A& a )
-        : oneapi::tbb::concurrent_queue<T, A>(std::move(q), a) { }
+    ConcQWithSizeWrapper(ConcQWithSizeWrapper&& q) : oneapi::tbb::concurrent_queue<T>(std::move(q)) {}
+    ConcQWithSizeWrapper(ConcQWithSizeWrapper&& q, const A& a)
+        : oneapi::tbb::concurrent_queue<T, A>(std::move(q), a) {}
 
-    template<typename InputIterator>
-    ConcQWithSizeWrapper( InputIterator begin, InputIterator end, const A& a = A() )
+    template <typename InputIterator>
+    ConcQWithSizeWrapper(InputIterator begin, InputIterator end, const A& a = A())
         : oneapi::tbb::concurrent_queue<T, A>(begin, end, a) {}
     typename oneapi::tbb::concurrent_queue<T, A>::size_type size() const { return this->unsafe_size(); }
 };
 
-enum state_type {
-    LIVE = 0x1234,
-    DEAD = 0xDEAD
-};
+enum state_type { LIVE = 0x1234, DEAD = 0xDEAD };
 
 class Bar {
     state_type state;
+
 public:
     static std::size_t construction_num, destruction_num;
     std::ptrdiff_t my_id;
-    Bar() : state(LIVE), my_id(-1)
-    {}
+    Bar() : state(LIVE), my_id(-1) {}
 
-    Bar( std::size_t _i ) : state(LIVE), my_id(_i) { construction_num++; }
+    Bar(std::size_t _i) : state(LIVE), my_id(_i) { construction_num++; }
 
-    Bar( const Bar& a_bar ) : state(LIVE) {
+    Bar(const Bar& a_bar) : state(LIVE) {
         CHECK_FAST(a_bar.state == LIVE);
         my_id = a_bar.my_id;
         construction_num++;
@@ -301,18 +310,18 @@ class Bar {
         destruction_num++;
     }
 
-    void operator=( const Bar& a_bar ) {
+    void operator=(const Bar& a_bar) {
         CHECK_FAST(a_bar.state == LIVE);
         CHECK_FAST(state == LIVE);
         my_id = a_bar.my_id;
     }
-    friend bool operator==( const Bar& bar1, const Bar& bar2 ) ;
+    friend bool operator==(const Bar& bar1, const Bar& bar2);
 };
 
 std::size_t Bar::construction_num = 0;
 std::size_t Bar::destruction_num = 0;
 
-bool operator==( const Bar& bar1, const Bar& bar2 ) {
+bool operator==(const Bar& bar1, const Bar& bar2) {
     CHECK_FAST(bar1.state == LIVE);
     CHECK_FAST(bar2.state == LIVE);
     return bar1.my_id == bar2.my_id;
@@ -321,10 +330,9 @@ bool operator==( const Bar& bar1, const Bar& bar2 ) {
 class BarIterator {
     Bar* bar_ptr;
     BarIterator(Bar* bp_) : bar_ptr(bp_) {}
+
 public:
-    Bar& operator*() const {
-        return *bar_ptr;
-    }
+    Bar& operator*() const { return *bar_ptr; }
     BarIterator& operator++() {
         ++bar_ptr;
         return *this;
@@ -334,54 +342,43 @@ class BarIterator {
         operator++();
         return result;
     }
-    friend bool operator==(const BarIterator& bia, const BarIterator& bib) ;
-    friend bool operator!=(const BarIterator& bia, const BarIterator& bib) ;
-    template<typename CQ, typename T, typename TIter, typename CQ_EX, typename T_EX>
-    friend void TestConstructors ();
-} ;
-
-bool operator==(const BarIterator& bia, const BarIterator& bib) {
-    return bia.bar_ptr==bib.bar_ptr;
-}
+    friend bool operator==(const BarIterator& bia, const BarIterator& bib);
+    friend bool operator!=(const BarIterator& bia, const BarIterator& bib);
+    template <typename CQ, typename T, typename TIter, typename CQ_EX, typename T_EX>
+    friend void TestConstructors();
+};
 
-bool operator!=(const BarIterator& bia, const BarIterator& bib) {
-    return bia.bar_ptr!=bib.bar_ptr;
-}
+bool operator==(const BarIterator& bia, const BarIterator& bib) { return bia.bar_ptr == bib.bar_ptr; }
 
+bool operator!=(const BarIterator& bia, const BarIterator& bib) { return bia.bar_ptr != bib.bar_ptr; }
 
 class Bar_exception : public std::bad_alloc {
 public:
-    virtual const char *what() const noexcept override { return "making the entry invalid"; }
+    virtual const char* what() const noexcept override { return "making the entry invalid"; }
     virtual ~Bar_exception() noexcept {}
 };
 
 class BarEx {
     static int count;
+
 public:
     state_type state;
-    typedef enum {
-        PREPARATION,
-        COPY_CONSTRUCT
-    } mode_type;
+    typedef enum { PREPARATION, COPY_CONSTRUCT } mode_type;
     static mode_type mode;
     std::ptrdiff_t my_id;
     std::ptrdiff_t my_tilda_id;
 
     static int button;
 
-    BarEx() : state(LIVE), my_id(-1), my_tilda_id(-1)
-    {}
+    BarEx() : state(LIVE), my_id(-1), my_tilda_id(-1) {}
 
-    BarEx(std::size_t _i) : state(LIVE), my_id(_i), my_tilda_id(my_id^(-1))
-    {}
+    BarEx(std::size_t _i) : state(LIVE), my_id(_i), my_tilda_id(my_id ^ (-1)) {}
 
-    BarEx( const BarEx& a_bar ) : state(LIVE) {
+    BarEx(const BarEx& a_bar) : state(LIVE) {
         CHECK_FAST(a_bar.state == LIVE);
         my_id = a_bar.my_id;
         if (mode == PREPARATION)
-            if (!(++count % 100)) {
-                TBB_TEST_THROW(Bar_exception());
-            }
+            if (!(++count % 100)) { TBB_TEST_THROW(Bar_exception()); }
         my_tilda_id = a_bar.my_tilda_id;
     }
 
@@ -390,16 +387,16 @@ class BarEx {
         state = DEAD;
         my_id = DEAD;
     }
-    static void set_mode( mode_type m ) { mode = m; }
+    static void set_mode(mode_type m) { mode = m; }
 
-    void operator=( const BarEx& a_bar ) {
+    void operator=(const BarEx& a_bar) {
         CHECK_FAST(a_bar.state == LIVE);
         CHECK_FAST(state == LIVE);
         my_id = a_bar.my_id;
         my_tilda_id = a_bar.my_tilda_id;
     }
 
-    friend bool operator==(const BarEx& bar1, const BarEx& bar2 ) ;
+    friend bool operator==(const BarEx& bar1, const BarEx& bar2);
 };
 
 int BarEx::count = 0;
@@ -413,8 +410,8 @@ bool operator==(const BarEx& bar1, const BarEx& bar2) {
     return bar1.my_id == bar2.my_id && bar1.my_tilda_id == bar2.my_tilda_id;
 }
 
-template<typename CQ, typename T, typename TIter, typename CQ_EX, typename T_EX>
-void TestConstructors () {
+template <typename CQ, typename T, typename TIter, typename CQ_EX, typename T_EX>
+void TestConstructors() {
     CQ src_queue;
     typename CQ::const_iterator dqb;
     typename CQ::const_iterator dqe;
@@ -422,10 +419,9 @@ void TestConstructors () {
     using size_type = typename CQ::size_type;
 
     for (size_type size = 0; size < 1001; ++size) {
-        for (size_type i = 0; i < size; ++i)
-            src_queue.push(T(i + (i ^ size)));
-        typename CQ::const_iterator sqb( src_queue.unsafe_begin());
-        typename CQ::const_iterator sqe( src_queue.unsafe_end()  );
+        for (size_type i = 0; i < size; ++i) src_queue.push(T(i + (i ^ size)));
+        typename CQ::const_iterator sqb(src_queue.unsafe_begin());
+        typename CQ::const_iterator sqe(src_queue.unsafe_end());
 
         CQ dst_queue(sqb, sqe);
         CQ copy_with_alloc(src_queue, typename CQ::allocator_type());
@@ -437,10 +433,8 @@ void TestConstructors () {
     }
 
     T bar_array[1001];
-    for (size_type size=0; size < 1001; ++size) {
-        for (size_type i=0; i < size; ++i) {
-            bar_array[i] = T(i+(i^size));
-        }
+    for (size_type size = 0; size < 1001; ++size) {
+        for (size_type i = 0; i < size; ++i) { bar_array[i] = T(i + (i ^ size)); }
 
         const TIter sab(bar_array + 0);
         const TIter sae(bar_array + size);
@@ -448,13 +442,13 @@ void TestConstructors () {
         CQ dst_queue2(sab, sae);
 
         CHECK_FAST(size == dst_queue2.size());
-        CHECK_FAST(sab == TIter(bar_array+0));
-        CHECK_FAST(sae == TIter(bar_array+size));
+        CHECK_FAST(sab == TIter(bar_array + 0));
+        CHECK_FAST(sae == TIter(bar_array + size));
 
         dqb = dst_queue2.unsafe_begin();
         dqe = dst_queue2.unsafe_end();
         auto res = std::mismatch(dqb, dqe, bar_array);
-        CHECK_FAST_MESSAGE(res.first == dqe,  "unexpected element");
+        CHECK_FAST_MESSAGE(res.first == dqe, "unexpected element");
         CHECK_FAST_MESSAGE(res.second == bar_array + size, "different size?");
     }
 
@@ -471,7 +465,7 @@ void TestConstructors () {
         src_queue.push(T(++k));
         src_queue.try_pop(tmp_bar);
 
-        CQ dst_queue4( src_queue);
+        CQ dst_queue4(src_queue);
 
         CHECK_FAST(src_queue.size() == dst_queue4.size());
 
@@ -491,7 +485,7 @@ void TestConstructors () {
     iter = src_queue.unsafe_begin();
     REQUIRE_MESSAGE(std::equal(dqb, dqe, iter), "unexpected element");
 
-    for (size_type i=0; i<100; ++i) {
+    for (size_type i = 0; i < 100; ++i) {
         T tmp_bar;
         src_queue.push(T(i + 1000));
         src_queue.push(T(i + 1000));
@@ -521,14 +515,12 @@ void TestConstructors () {
         try {
             src_queue_ex.push(T_EX(k + (k ^ size)));
             ++n_successful_pushes;
-        } catch (...) {
-        }
+        } catch (...) {}
         ++k;
         try {
             src_queue_ex.push(T_EX(k + (k ^ size)));
             ++n_successful_pushes;
-        } catch (...) {
-        }
+        } catch (...) {}
         ++k;
         src_queue_ex.try_pop(tmp_bar_ex);
         n_elements += (n_successful_pushes - 1);
@@ -551,30 +543,26 @@ void TestConstructors () {
     src_queue.clear();
 
     for (size_type size = 0; size < 1001; ++size) {
-        for (size_type i = 0; i < size; ++i) {
-            src_queue.push(T(i + (i ^ size)));
-        }
+        for (size_type i = 0; i < size; ++i) { src_queue.push(T(i + (i ^ size))); }
         std::vector<const T*> locations(size);
         typename CQ::const_iterator qit = src_queue.unsafe_begin();
-        for (size_type i = 0; i < size; ++i, ++qit) {
-            locations[i] = &(*qit);
-        }
+        for (size_type i = 0; i < size; ++i, ++qit) { locations[i] = &(*qit); }
 
         size_type size_of_queue = src_queue.size();
         CQ dst_queue(std::move(src_queue));
 
         CHECK_FAST_MESSAGE((src_queue.empty() && src_queue.size() == 0), "not working move constructor?");
-        CHECK_FAST_MESSAGE((size == size_of_queue && size_of_queue == dst_queue.size()), "not working move constructor?");
+        CHECK_FAST_MESSAGE((size == size_of_queue && size_of_queue == dst_queue.size()),
+                           "not working move constructor?");
 
-        CHECK_FAST_MESSAGE(
-            std::equal(locations.begin(), locations.end(), dst_queue.unsafe_begin(), [](const T* t1, const T& r2) { return t1 == &r2; }),
-            "there was data movement during move constructor"
-        );
+        CHECK_FAST_MESSAGE(std::equal(locations.begin(), locations.end(), dst_queue.unsafe_begin(),
+                                      [](const T* t1, const T& r2) { return t1 == &r2; }),
+                           "there was data movement during move constructor");
 
         for (size_type i = 0; i < size; ++i) {
             T test(i + (i ^ size));
             T popped;
-            bool pop_result = dst_queue.try_pop( popped);
+            bool pop_result = dst_queue.try_pop(popped);
 
             CHECK_FAST(pop_result);
             CHECK_FAST(test == popped);
@@ -584,23 +572,23 @@ void TestConstructors () {
 
 void TestQueueConstructors() {
     TestConstructors<ConcQWithSizeWrapper<Bar>, Bar, BarIterator, ConcQWithSizeWrapper<BarEx>, BarEx>();
-    TestConstructors<oneapi::tbb::concurrent_bounded_queue<Bar>, Bar, BarIterator, oneapi::tbb::concurrent_bounded_queue<BarEx>, BarEx>();
+    TestConstructors<oneapi::tbb::concurrent_bounded_queue<Bar>, Bar, BarIterator,
+                     oneapi::tbb::concurrent_bounded_queue<BarEx>, BarEx>();
 }
 
-template<typename T>
+template <typename T>
 struct TestNegativeQueueBody {
     oneapi::tbb::concurrent_bounded_queue<T>& queue;
     const std::size_t nthread;
-    TestNegativeQueueBody( oneapi::tbb::concurrent_bounded_queue<T>& q, std::size_t n ) : queue(q), nthread(n) {}
-    void operator()( std::size_t k ) const {
+    TestNegativeQueueBody(oneapi::tbb::concurrent_bounded_queue<T>& q, std::size_t n)
+        : queue(q), nthread(n) {}
+    void operator()(std::size_t k) const {
         if (k == 0) {
             int number_of_pops = int(nthread) - 1;
             // Wait for all pops to pend.
-            while (int(queue.size())> -number_of_pops) {
-                utils::yield();
-            }
+            while (int(queue.size()) > -number_of_pops) { utils::yield(); }
 
-            for (int i = 0; ; ++i) {
+            for (int i = 0;; ++i) {
                 CHECK(queue.size() == std::size_t(i - number_of_pops));
                 CHECK((queue.empty() == (queue.size() <= 0)));
                 if (i == number_of_pops) break;
@@ -616,31 +604,30 @@ struct TestNegativeQueueBody {
 };
 
 //! Test a queue with a negative size.
-template<typename T>
-void TestNegativeQueue( std::size_t nthread ) {
+template <typename T>
+void TestNegativeQueue(std::size_t nthread) {
     oneapi::tbb::concurrent_bounded_queue<T> queue;
-    utils::NativeParallelFor( nthread, TestNegativeQueueBody<T>(queue,nthread));
+    utils::NativeParallelFor(nthread, TestNegativeQueueBody<T>(queue, nthread));
 }
 
-template<typename T>
+template <typename T>
 class ConcQPushPopWrapper : public oneapi::tbb::concurrent_queue<T, test_allocator<T>> {
 public:
-    ConcQPushPopWrapper() : my_capacity(std::size_t(-1) / (sizeof(void*) + sizeof(T)))
-    {}
+    ConcQPushPopWrapper() : my_capacity(std::size_t(-1) / (sizeof(void*) + sizeof(T))) {}
 
     std::size_t size() const { return this->unsafe_size(); }
-    void set_capacity( const ptrdiff_t n ) { my_capacity = n; }
-    bool try_push( const T& source ) { return this->push( source); }
-    bool try_pop( T& dest ) { return this->oneapi::tbb::concurrent_queue<T, test_allocator<T>>::try_pop(dest); }
+    void set_capacity(const ptrdiff_t n) { my_capacity = n; }
+    bool try_push(const T& source) { return this->push(source); }
+    bool try_pop(T& dest) { return this->oneapi::tbb::concurrent_queue<T, test_allocator<T>>::try_pop(dest); }
     std::size_t my_capacity;
 };
 
-template<typename CQ, typename T>
+template <typename CQ, typename T>
 struct Body {
     CQ* queue;
     const std::size_t nthread;
-    Body( std::size_t nthread_ ) : nthread(nthread_) {}
-    void operator()( std::size_t thread_id ) const {
+    Body(std::size_t nthread_) : nthread(nthread_) {}
+    void operator()(std::size_t thread_id) const {
         long pop_kind[3] = {0, 0, 0};
         std::size_t serial[MAXTHREAD + 1];
         memset(serial, 0, nthread * sizeof(std::size_t));
@@ -661,38 +648,34 @@ struct Body {
             g.set_serial(j + 1);
             push(*queue, g, j);
             if (!prepopped) {
-                while(!(queue)->try_pop(f)) utils::yield();
+                while (!(queue)->try_pop(f)) utils::yield();
                 ++pop_kind[2];
             }
             CHECK_FAST(f.get_thread_id() <= nthread);
-            CHECK_FAST_MESSAGE((f.get_thread_id() == nthread || serial[f.get_thread_id()] < f.get_serial()), "partial order violation");
+            CHECK_FAST_MESSAGE((f.get_thread_id() == nthread || serial[f.get_thread_id()] < f.get_serial()),
+                               "partial order violation");
             serial[f.get_thread_id()] = f.get_serial();
             sum += int(f.get_serial() - 1);
         }
         Sum[thread_id] = sum;
-        for (std::size_t k = 0; k < 3; ++k)
-            PopKind[k] += pop_kind[k];
+        for (std::size_t k = 0; k < 3; ++k) PopKind[k] += pop_kind[k];
     }
 };
 
-template<typename CQ, typename T>
-void TestPushPop(typename CQ::size_type prefill, std::ptrdiff_t capacity, std::size_t nthread ) {
+template <typename CQ, typename T>
+void TestPushPop(typename CQ::size_type prefill, std::ptrdiff_t capacity, std::size_t nthread) {
     using allocator_type = decltype(std::declval<CQ>().get_allocator());
-    CHECK(nthread> 0);
+    CHECK(nthread > 0);
     std::ptrdiff_t signed_prefill = std::ptrdiff_t(prefill);
 
-    if (signed_prefill + 1>= capacity) {
-        return;
-    }
+    if (signed_prefill + 1 >= capacity) { return; }
 
     bool success = false;
-    for (std::size_t k=0; k < 3; ++k) {
-        PopKind[k] = 0;
-    }
+    for (std::size_t k = 0; k < 3; ++k) { PopKind[k] = 0; }
 
     for (std::size_t trial = 0; !success; ++trial) {
         allocator_type::init_counters();
-        Body<CQ,T> body(nthread);
+        Body<CQ, T> body(nthread);
         CQ queue;
         queue.set_capacity(capacity);
         body.queue = &queue;
@@ -705,15 +688,13 @@ void TestPushPop(typename CQ::size_type prefill, std::ptrdiff_t capacity, std::s
             CHECK_FAST(!queue.empty());
         }
 
-        utils::NativeParallelFor( nthread, body);
+        utils::NativeParallelFor(nthread, body);
 
         int sum = 0;
-        for (std::size_t k = 0; k < nthread; ++k) {
-            sum += Sum[k];
-        }
+        for (std::size_t k = 0; k < nthread; ++k) { sum += Sum[k]; }
 
-        int expected = int( nthread * ((M - 1) * M / 2) + ((prefill - 1) * prefill) / 2);
-        for (int i = int(prefill); --i>=0;) {
+        int expected = int(nthread * ((M - 1) * M / 2) + ((prefill - 1) * prefill) / 2);
+        for (int i = int(prefill); --i >= 0;) {
             CHECK_FAST(!queue.empty());
             T f;
             bool result = queue.try_pop(f);
@@ -723,27 +704,27 @@ void TestPushPop(typename CQ::size_type prefill, std::ptrdiff_t capacity, std::s
         }
         REQUIRE_MESSAGE(queue.empty(), "The queue should be empty");
         REQUIRE_MESSAGE(queue.size() == 0, "The queue should have zero size");
-        if (sum != expected) {
-            REPORT("sum=%d expected=%d\n",sum,expected);
-        }
+        if (sum != expected) { REPORT("sum=%d expected=%d\n", sum, expected); }
 
         success = true;
-        if (nthread> 1 && prefill == 0) {
+        if (nthread > 1 && prefill == 0) {
             // Check that pop_if_present got sufficient exercise
             for (std::size_t k = 0; k < 2; ++k) {
                 const int min_requirement = 100;
                 const int max_trial = 20;
 
                 if (PopKind[k] < min_requirement) {
-                    if (trial>= max_trial) {
-                        REPORT("Warning: %d threads had only %ld pop_if_present operations %s after %d trials (expected at least %d). "
-                            "This problem may merely be unlucky scheduling. "
-                            "Investigate only if it happens repeatedly.\n",
-                            nthread, long(PopKind[k]), k==0?"failed":"succeeded", max_trial, min_requirement);
+                    if (trial >= max_trial) {
+                        REPORT("Warning: %d threads had only %ld pop_if_present operations %s after %d "
+                               "trials (expected at least %d). "
+                               "This problem may merely be unlucky scheduling. "
+                               "Investigate only if it happens repeatedly.\n",
+                               nthread, long(PopKind[k]), k == 0 ? "failed" : "succeeded", max_trial,
+                               min_requirement);
                     } else {
                         success = false;
                     }
-               }
+                }
             }
         }
     }
@@ -751,33 +732,43 @@ void TestPushPop(typename CQ::size_type prefill, std::ptrdiff_t capacity, std::s
 
 void TestConcurrentPushPop() {
     for (std::size_t nthread = MinThread; nthread <= MaxThread; ++nthread) {
-        INFO(" Testing with "<< nthread << " thread(s)");
+        INFO(" Testing with " << nthread << " thread(s)");
         TestNegativeQueue<move_support_tests::Foo>(nthread);
-        for (std::size_t prefill=0; prefill < 64; prefill += (1 + prefill / 3)) {
-            TestPushPop<ConcQPushPopWrapper<move_support_tests::Foo>, move_support_tests::Foo>(prefill, std::ptrdiff_t(-1), nthread);
-            TestPushPop<ConcQPushPopWrapper<move_support_tests::Foo>, move_support_tests::Foo>(prefill, std::ptrdiff_t(1), nthread);
-            TestPushPop<ConcQPushPopWrapper<move_support_tests::Foo>, move_support_tests::Foo>(prefill, std::ptrdiff_t(2), nthread);
-            TestPushPop<ConcQPushPopWrapper<move_support_tests::Foo>, move_support_tests::Foo>(prefill, std::ptrdiff_t(10), nthread);
-            TestPushPop<ConcQPushPopWrapper<move_support_tests::Foo>, move_support_tests::Foo>(prefill, std::ptrdiff_t(100), nthread);
+        for (std::size_t prefill = 0; prefill < 64; prefill += (1 + prefill / 3)) {
+            TestPushPop<ConcQPushPopWrapper<move_support_tests::Foo>, move_support_tests::Foo>(
+                    prefill, std::ptrdiff_t(-1), nthread);
+            TestPushPop<ConcQPushPopWrapper<move_support_tests::Foo>, move_support_tests::Foo>(
+                    prefill, std::ptrdiff_t(1), nthread);
+            TestPushPop<ConcQPushPopWrapper<move_support_tests::Foo>, move_support_tests::Foo>(
+                    prefill, std::ptrdiff_t(2), nthread);
+            TestPushPop<ConcQPushPopWrapper<move_support_tests::Foo>, move_support_tests::Foo>(
+                    prefill, std::ptrdiff_t(10), nthread);
+            TestPushPop<ConcQPushPopWrapper<move_support_tests::Foo>, move_support_tests::Foo>(
+                    prefill, std::ptrdiff_t(100), nthread);
         }
-        for (std::size_t prefill = 0; prefill < 64; prefill += (1 + prefill / 3) ) {
-            TestPushPop<oneapi::tbb::concurrent_bounded_queue<move_support_tests::Foo, test_allocator<move_support_tests::Foo>>,
-                move_support_tests::Foo>(prefill, std::ptrdiff_t(-1), nthread);
-            TestPushPop<oneapi::tbb::concurrent_bounded_queue<move_support_tests::Foo, test_allocator<move_support_tests::Foo>>,
-                move_support_tests::Foo>(prefill, std::ptrdiff_t(1), nthread);
-            TestPushPop<oneapi::tbb::concurrent_bounded_queue<move_support_tests::Foo, test_allocator<move_support_tests::Foo>>,
-                move_support_tests::Foo>(prefill, std::ptrdiff_t(2), nthread);
-            TestPushPop<oneapi::tbb::concurrent_bounded_queue<move_support_tests::Foo, test_allocator<move_support_tests::Foo>>,
-                move_support_tests::Foo>(prefill, std::ptrdiff_t(10), nthread);
-            TestPushPop<oneapi::tbb::concurrent_bounded_queue<move_support_tests::Foo, test_allocator<move_support_tests::Foo>>,
-                move_support_tests::Foo>(prefill, std::ptrdiff_t(100), nthread);
+        for (std::size_t prefill = 0; prefill < 64; prefill += (1 + prefill / 3)) {
+            TestPushPop<oneapi::tbb::concurrent_bounded_queue<move_support_tests::Foo,
+                                                              test_allocator<move_support_tests::Foo>>,
+                        move_support_tests::Foo>(prefill, std::ptrdiff_t(-1), nthread);
+            TestPushPop<oneapi::tbb::concurrent_bounded_queue<move_support_tests::Foo,
+                                                              test_allocator<move_support_tests::Foo>>,
+                        move_support_tests::Foo>(prefill, std::ptrdiff_t(1), nthread);
+            TestPushPop<oneapi::tbb::concurrent_bounded_queue<move_support_tests::Foo,
+                                                              test_allocator<move_support_tests::Foo>>,
+                        move_support_tests::Foo>(prefill, std::ptrdiff_t(2), nthread);
+            TestPushPop<oneapi::tbb::concurrent_bounded_queue<move_support_tests::Foo,
+                                                              test_allocator<move_support_tests::Foo>>,
+                        move_support_tests::Foo>(prefill, std::ptrdiff_t(10), nthread);
+            TestPushPop<oneapi::tbb::concurrent_bounded_queue<move_support_tests::Foo,
+                                                              test_allocator<move_support_tests::Foo>>,
+                        move_support_tests::Foo>(prefill, std::ptrdiff_t(100), nthread);
         }
     }
 }
 
 class Foo_exception : public std::bad_alloc {
 public:
-    virtual const char *what() const noexcept override { return "out of Foo limit"; }
+    virtual const char* what() const noexcept override { return "out of Foo limit"; }
     virtual ~Foo_exception() noexcept {}
 };
 
@@ -790,6 +781,7 @@ static const long Threshold = 400;
 
 class FooEx {
     state_type state;
+
 public:
     int serial;
     FooEx() : state(LIVE) {
@@ -797,127 +789,123 @@ class FooEx {
         serial = serial_source++;
     }
 
-    FooEx( const FooEx& item ) : state(LIVE) {
+    FooEx(const FooEx& item) : state(LIVE) {
         CHECK(item.state == LIVE);
         ++FooExConstructed;
-        if (MaxFooCount && (FooExConstructed - FooExDestroyed) >= MaxFooCount) { // in push()
+        if (MaxFooCount && (FooExConstructed - FooExDestroyed) >= MaxFooCount) {// in push()
             throw Foo_exception();
         }
         serial = item.serial;
     }
 
     ~FooEx() {
-        CHECK(state==LIVE);
+        CHECK(state == LIVE);
         ++FooExDestroyed;
-        state=DEAD;
-        serial=DEAD;
+        state = DEAD;
+        serial = DEAD;
     }
 
-    void operator=( FooEx& item ) {
-        CHECK(item.state==LIVE);
-        CHECK(state==LIVE);
+    void operator=(FooEx& item) {
+        CHECK(item.state == LIVE);
+        CHECK(state == LIVE);
         serial = item.serial;
-        if( MaxFooCount==2*Threshold && (FooExConstructed-FooExDestroyed) <= MaxFooCount/4 ) // in pop()
+        if (MaxFooCount == 2 * Threshold && (FooExConstructed - FooExDestroyed) <= MaxFooCount / 4)// in pop()
             throw Foo_exception();
     }
 
-    void operator=( FooEx&& item ) {
-        operator=( item );
+    void operator=(FooEx&& item) {
+        operator=(item);
         item.serial = 0;
     }
-
 };
 
 template <template <typename, typename> class CQ, typename A1, typename A2, typename T>
 void TestExceptionBody() {
-    enum methods {
-        m_push = 0,
-        m_pop
-    };
+    enum methods { m_push = 0, m_pop };
 
-    const int N = 1000;     // # of bytes
+    const int N = 1000;// # of bytes
 
     MaxFooCount = 5;
 
     try {
-        int n_pushed=0, n_popped=0;
-        for(int t = 0; t <= 1; t++)// exception type -- 0 : from allocator(), 1 : from Foo's constructor
+        int n_pushed = 0, n_popped = 0;
+        for (int t = 0; t <= 1; t++)// exception type -- 0 : from allocator(), 1 : from Foo's constructor
         {
-            CQ<T,A1> queue_test;
-            for( int m=m_push; m<=m_pop; m++ ) {
+            CQ<T, A1> queue_test;
+            for (int m = m_push; m <= m_pop; m++) {
                 // concurrent_queue internally rebinds the allocator to the one for 'char'
                 A2::init_counters();
 
-                if(t) MaxFooCount = MaxFooCount + 400;
-                else A2::set_limits(N/2);
+                if (t) MaxFooCount = MaxFooCount + 400;
+                else
+                    A2::set_limits(N / 2);
 
                 try {
-                    switch(m) {
-                    case m_push:
-                        for( int k=0; k<N; k++ ) {
-                            push( queue_test, T(), k);
-                            n_pushed++;
-                        }
-                        break;
-                    case m_pop:
-                        n_popped=0;
-                        for( int k=0; k<n_pushed; k++ ) {
-                            T elt;
-                            queue_test.try_pop( elt);
-                            n_popped++;
-                        }
-                        n_pushed = 0;
-                        A2::set_limits();
-                        break;
+                    switch (m) {
+                        case m_push:
+                            for (int k = 0; k < N; k++) {
+                                push(queue_test, T(), k);
+                                n_pushed++;
+                            }
+                            break;
+                        case m_pop:
+                            n_popped = 0;
+                            for (int k = 0; k < n_pushed; k++) {
+                                T elt;
+                                queue_test.try_pop(elt);
+                                n_popped++;
+                            }
+                            n_pushed = 0;
+                            A2::set_limits();
+                            break;
                     }
-                    if( !t && m==m_push ) REQUIRE_MESSAGE(false, "should throw an exception");
-                } catch ( Foo_exception & ) {
+                    if (!t && m == m_push) REQUIRE_MESSAGE(false, "should throw an exception");
+                } catch (Foo_exception&) {
                     long tc = MaxFooCount;
-                    MaxFooCount = 0; // disable exception
-                    switch(m) {
-                    case m_push:
-                        REQUIRE_MESSAGE(ptrdiff_t(queue_test.size())==n_pushed, "incorrect queue size");
-                        for( int k=0; k<(int)tc; k++ ) {
-                            push( queue_test, T(), k);
-                            n_pushed++;
-                        }
-                        break;
-                    case m_pop:
-                        n_pushed -= (n_popped+1); // including one that threw the exception
-                        REQUIRE_MESSAGE(n_pushed>=0, "n_pushed cannot be less than 0");
-                        for( int k=0; k<1000; k++ ) {
-                            push( queue_test, T(), k);
-                            n_pushed++;
-                        }
-                        REQUIRE_MESSAGE(!queue_test.empty(), "queue must not be empty");
-                        REQUIRE_MESSAGE(ptrdiff_t(queue_test.size())==n_pushed, "queue size must be equal to n pushed");
-                        for( int k=0; k<n_pushed; k++ ) {
-                            T elt;
-                            queue_test.try_pop( elt);
-                        }
-                        REQUIRE_MESSAGE(queue_test.empty(), "queue must be empty");
-                        REQUIRE_MESSAGE(queue_test.size()==0, "queue must be empty");
-                        break;
+                    MaxFooCount = 0;// disable exception
+                    switch (m) {
+                        case m_push:
+                            REQUIRE_MESSAGE(ptrdiff_t(queue_test.size()) == n_pushed, "incorrect queue size");
+                            for (int k = 0; k < (int) tc; k++) {
+                                push(queue_test, T(), k);
+                                n_pushed++;
+                            }
+                            break;
+                        case m_pop:
+                            n_pushed -= (n_popped + 1);// including one that threw the exception
+                            REQUIRE_MESSAGE(n_pushed >= 0, "n_pushed cannot be less than 0");
+                            for (int k = 0; k < 1000; k++) {
+                                push(queue_test, T(), k);
+                                n_pushed++;
+                            }
+                            REQUIRE_MESSAGE(!queue_test.empty(), "queue must not be empty");
+                            REQUIRE_MESSAGE(ptrdiff_t(queue_test.size()) == n_pushed,
+                                            "queue size must be equal to n pushed");
+                            for (int k = 0; k < n_pushed; k++) {
+                                T elt;
+                                queue_test.try_pop(elt);
+                            }
+                            REQUIRE_MESSAGE(queue_test.empty(), "queue must be empty");
+                            REQUIRE_MESSAGE(queue_test.size() == 0, "queue must be empty");
+                            break;
                     }
                     MaxFooCount = tc;
-                } catch ( std::bad_alloc & ) {
-                    A2::set_limits(); // disable exception from allocator
+                } catch (std::bad_alloc&) {
+                    A2::set_limits();// disable exception from allocator
                     std::size_t size = queue_test.size();
-                    switch(m) {
+                    switch (m) {
                         case m_push:
-                            REQUIRE_MESSAGE(size>0, "incorrect queue size");
+                            REQUIRE_MESSAGE(size > 0, "incorrect queue size");
                             break;
                         case m_pop:
-                            if( !t ) REQUIRE_MESSAGE(false, "should not throw an exception");
+                            if (!t) REQUIRE_MESSAGE(false, "should not throw an exception");
                             break;
                     }
                 }
                 INFO("for t= " << t << "and m= " << m << " exception test passed");
             }
         }
-    } catch(...) {
-        REQUIRE_MESSAGE(false, "unexpected exception");
-    }
+    } catch (...) { REQUIRE_MESSAGE(false, "unexpected exception"); }
 }
 
 void TestExceptions() {
@@ -925,7 +913,6 @@ void TestExceptions() {
     using allocator_char_t = StaticSharedCountingAllocator<oneapi::tbb::cache_aligned_allocator<char>>;
     TestExceptionBody<ConcQWithSizeWrapper, allocator_t, allocator_char_t, FooEx>();
     TestExceptionBody<oneapi::tbb::concurrent_bounded_queue, allocator_t, allocator_char_t, FooEx>();
-
 }
 
 std::atomic<std::size_t> num_pushed;
@@ -936,23 +923,20 @@ std::atomic<std::size_t> failed_pops;
 class SimplePushBody {
     oneapi::tbb::concurrent_bounded_queue<int>* q;
     std::size_t max;
+
 public:
     SimplePushBody(oneapi::tbb::concurrent_bounded_queue<int>* _q, std::size_t hi_thr) : q(_q), max(hi_thr) {}
 
     void operator()(std::size_t thread_id) const {
         if (thread_id == max) {
-            while ( q->size() < std::ptrdiff_t(max) ) {
-                utils::yield();
-            }
+            while (q->size() < std::ptrdiff_t(max)) { utils::yield(); }
             q->abort();
             return;
         }
         try {
             q->push(42);
             ++num_pushed;
-        } catch (...) {
-            ++failed_pushes;
-        }
+        } catch (...) { ++failed_pushes; }
     }
 };
 
@@ -960,16 +944,15 @@ class SimplePopBody {
     oneapi::tbb::concurrent_bounded_queue<int>* q;
     std::ptrdiff_t max;
     std::ptrdiff_t prefill;
+
 public:
     SimplePopBody(oneapi::tbb::concurrent_bounded_queue<int>* _q, std::size_t hi_thr, std::size_t nitems)
-    : q(_q), max(hi_thr), prefill(nitems) {}
+        : q(_q), max(hi_thr), prefill(nitems) {}
 
     void operator()(std::size_t thread_id) const {
         int e;
         if (thread_id == std::size_t(max)) {
-            while (q->size()> prefill - max) {
-                utils::yield();
-            }
+            while (q->size() > prefill - max) { utils::yield(); }
 
             q->abort();
             return;
@@ -977,9 +960,7 @@ class SimplePopBody {
         try {
             q->pop(e);
             ++num_popped;
-        } catch ( ... ) {
-            ++failed_pops;
-        }
+        } catch (...) { ++failed_pops; }
     }
 };
 
@@ -995,7 +976,8 @@ void TestAbort() {
             SimplePushBody my_push_body1(&iq1, nthreads);
             utils::NativeParallelFor(nthreads + 1, my_push_body1);
             REQUIRE_MESSAGE(num_pushed == 0, "no elements should have been pushed to zero-sized queue");
-            REQUIRE_MESSAGE(failed_pushes == nthreads, "All threads should have failed to push an element to zero-sized queue");
+            REQUIRE_MESSAGE(failed_pushes == nthreads,
+                            "All threads should have failed to push an element to zero-sized queue");
             // Do not test popping each time in order to test queue destruction with no previous pops
             if (nthreads < (MaxThread + MinThread) / 2) {
                 int e;
@@ -1006,7 +988,7 @@ void TestAbort() {
 
         oneapi::tbb::concurrent_bounded_queue<int> iq2;
         iq2.set_capacity(2);
-        for (std::size_t i=0; i < 10; ++i) {
+        for (std::size_t i = 0; i < 10; ++i) {
             num_pushed.store(0, std::memory_order_relaxed);
             num_popped.store(0, std::memory_order_relaxed);
             failed_pushes.store(0, std::memory_order_relaxed);
@@ -1014,10 +996,13 @@ void TestAbort() {
             SimplePushBody my_push_body2(&iq2, nthreads);
             utils::NativeParallelFor(nthreads + 1, my_push_body2);
             REQUIRE_MESSAGE(num_pushed <= 2, "at most 2 elements should have been pushed to queue of size 2");
-            if (nthreads>= 2)
-                REQUIRE_MESSAGE(failed_pushes == nthreads - 2, "nthreads-2 threads should have failed to push an element to queue of size 2");
+            if (nthreads >= 2)
+                REQUIRE_MESSAGE(
+                        failed_pushes == nthreads - 2,
+                        "nthreads-2 threads should have failed to push an element to queue of size 2");
             int e;
-            while (iq2.try_pop(e)) ;
+            while (iq2.try_pop(e))
+                ;
         }
 
         oneapi::tbb::concurrent_bounded_queue<int> iq3;
@@ -1030,10 +1015,13 @@ void TestAbort() {
             iq3.push(42);
             iq3.push(42);
             SimplePopBody my_pop_body(&iq3, nthreads, 2);
-            utils::NativeParallelFor( nthreads+1, my_pop_body );
-            REQUIRE_MESSAGE(num_popped <= 2, "at most 2 elements should have been popped from queue of size 2");
-            if (nthreads>= 2)
-                REQUIRE_MESSAGE(failed_pops == nthreads - 2, "nthreads-2 threads should have failed to pop an element from queue of size 2");
+            utils::NativeParallelFor(nthreads + 1, my_pop_body);
+            REQUIRE_MESSAGE(num_popped <= 2,
+                            "at most 2 elements should have been popped from queue of size 2");
+            if (nthreads >= 2)
+                REQUIRE_MESSAGE(
+                        failed_pops == nthreads - 2,
+                        "nthreads-2 threads should have failed to pop an element from queue of size 2");
             else {
                 int e;
                 iq3.pop(e);
@@ -1044,24 +1032,31 @@ void TestAbort() {
         std::size_t cap = nthreads / 2;
         if (!cap) cap = 1;
         iq4.set_capacity(cap);
-        for (int i=0; i<10; ++i) {
+        for (int i = 0; i < 10; ++i) {
             num_pushed.store(0, std::memory_order_relaxed);
             num_popped.store(0, std::memory_order_relaxed);
             failed_pushes.store(0, std::memory_order_relaxed);
             failed_pops.store(0, std::memory_order_relaxed);
             SimplePushBody my_push_body2(&iq4, nthreads);
             utils::NativeParallelFor(nthreads + 1, my_push_body2);
-            REQUIRE_MESSAGE(num_pushed <= cap, "at most cap elements should have been pushed to queue of size cap");
-            if (nthreads>= cap)
-                REQUIRE_MESSAGE(failed_pushes == nthreads-cap, "nthreads-cap threads should have failed to push an element to queue of size cap");
+            REQUIRE_MESSAGE(num_pushed <= cap,
+                            "at most cap elements should have been pushed to queue of size cap");
+            if (nthreads >= cap)
+                REQUIRE_MESSAGE(
+                        failed_pushes == nthreads - cap,
+                        "nthreads-cap threads should have failed to push an element to queue of size cap");
             SimplePopBody my_pop_body(&iq4, nthreads, num_pushed);
-            utils::NativeParallelFor( nthreads+1, my_pop_body );
-            REQUIRE_MESSAGE((int)num_popped <= cap, "at most cap elements should have been popped from queue of size cap");
-            if (nthreads>= cap)
-                REQUIRE_MESSAGE(failed_pops == nthreads-cap, "nthreads-cap threads should have failed to pop an element from queue of size cap");
+            utils::NativeParallelFor(nthreads + 1, my_pop_body);
+            REQUIRE_MESSAGE((int) num_popped <= cap,
+                            "at most cap elements should have been popped from queue of size cap");
+            if (nthreads >= cap)
+                REQUIRE_MESSAGE(
+                        failed_pops == nthreads - cap,
+                        "nthreads-cap threads should have failed to pop an element from queue of size cap");
             else {
                 int e;
-                while (iq4.try_pop(e)) ;
+                while (iq4.try_pop(e))
+                    ;
             }
         }
     }
@@ -1071,7 +1066,8 @@ void TestAbort() {
 template <template <typename...> class ContainerType>
 void test_member_types() {
     using container_type = ContainerType<int>;
-    static_assert(std::is_same<typename container_type::allocator_type, oneapi::tbb::cache_aligned_allocator<int>>::value,
+    static_assert(std::is_same<typename container_type::allocator_type,
+                               oneapi::tbb::cache_aligned_allocator<int>>::value,
                   "Incorrect default template allocator");
 
     static_assert(std::is_same<typename container_type::value_type, int>::value,
@@ -1086,9 +1082,11 @@ void test_member_types() {
     static_assert(std::is_same<typename container_type::const_reference, const value_type&>::value,
                   "Incorrect container const_reference member type");
     using allocator_type = typename container_type::allocator_type;
-    static_assert(std::is_same<typename container_type::pointer, typename std::allocator_traits<allocator_type>::pointer>::value,
+    static_assert(std::is_same<typename container_type::pointer,
+                               typename std::allocator_traits<allocator_type>::pointer>::value,
                   "Incorrect container pointer member type");
-    static_assert(std::is_same<typename container_type::const_pointer, typename std::allocator_traits<allocator_type>::const_pointer>::value,
+    static_assert(std::is_same<typename container_type::const_pointer,
+                               typename std::allocator_traits<allocator_type>::const_pointer>::value,
                   "Incorrect container const_pointer member type");
 
     static_assert(utils::is_forward_iterator<typename container_type::iterator>::value,
@@ -1103,40 +1101,40 @@ void test_member_types() {
 
 enum push_t { push_op, try_push_op };
 
-template<push_t push_op>
+template <push_t push_op>
 struct pusher {
-    template<typename CQ, typename VType>
-    static bool push( CQ& queue, VType&& val ) {
-        queue.push( std::forward<VType>( val ) );
+    template <typename CQ, typename VType>
+    static bool push(CQ& queue, VType&& val) {
+        queue.push(std::forward<VType>(val));
         return true;
     }
 };
 
-template<>
-struct pusher< try_push_op> {
-    template<typename CQ, typename VType>
-    static bool push( CQ& queue, VType&& val ) {
-        return queue.try_push( std::forward<VType>( val ) );
+template <>
+struct pusher<try_push_op> {
+    template <typename CQ, typename VType>
+    static bool push(CQ& queue, VType&& val) {
+        return queue.try_push(std::forward<VType>(val));
     }
 };
 
 enum pop_t { pop_op, try_pop_op };
 
-template<pop_t pop_op>
+template <pop_t pop_op>
 struct popper {
-    template<typename CQ, typename VType>
-    static bool pop( CQ& queue, VType&& val ) {
-        if( queue.empty() ) return false;
-        queue.pop( std::forward<VType>( val ) );
+    template <typename CQ, typename VType>
+    static bool pop(CQ& queue, VType&& val) {
+        if (queue.empty()) return false;
+        queue.pop(std::forward<VType>(val));
         return true;
     }
 };
 
-template<>
+template <>
 struct popper<try_pop_op> {
-    template<typename CQ, typename VType>
-    static bool pop( CQ& queue, VType&& val ) {
-        return queue.try_pop( std::forward<VType>( val ) );
+    template <typename CQ, typename VType>
+    static bool pop(CQ& queue, VType&& val) {
+        return queue.try_pop(std::forward<VType>(val));
     }
 };
 
@@ -1147,12 +1145,8 @@ struct MoveOperationTracker {
     static std::size_t move_assignment_called_times;
 
     MoveOperationTracker() {}
-    MoveOperationTracker(const MoveOperationTracker&) {
-        ++copy_constructor_called_times;
-    }
-    MoveOperationTracker(MoveOperationTracker&&) {
-        ++move_constructor_called_times;
-    }
+    MoveOperationTracker(const MoveOperationTracker&) { ++copy_constructor_called_times; }
+    MoveOperationTracker(MoveOperationTracker&&) { ++move_constructor_called_times; }
     MoveOperationTracker& operator=(MoveOperationTracker const&) {
         ++copy_assignment_called_times;
         return *this;
@@ -1170,29 +1164,29 @@ size_t MoveOperationTracker::move_assignment_called_times = 0;
 
 template <class CQ, push_t push_op, pop_t pop_op>
 void TestMoveSupport() {
-    std::size_t &mcct = MoveOperationTracker::move_constructor_called_times;
-    std::size_t &ccct = MoveOperationTracker::copy_constructor_called_times;
-    std::size_t &cact = MoveOperationTracker::copy_assignment_called_times;
-    std::size_t &mact = MoveOperationTracker::move_assignment_called_times;
+    std::size_t& mcct = MoveOperationTracker::move_constructor_called_times;
+    std::size_t& ccct = MoveOperationTracker::copy_constructor_called_times;
+    std::size_t& cact = MoveOperationTracker::copy_assignment_called_times;
+    std::size_t& mact = MoveOperationTracker::move_assignment_called_times;
     mcct = ccct = cact = mact = 0;
 
     CQ q;
 
     REQUIRE_MESSAGE(mcct == 0, "Value must be zero-initialized");
     REQUIRE_MESSAGE(ccct == 0, "Value must be zero-initialized");
-    CHECK(pusher<push_op>::push( q, MoveOperationTracker() ));
+    CHECK(pusher<push_op>::push(q, MoveOperationTracker()));
     REQUIRE_MESSAGE(mcct == 1, "Not working push(T&&) or try_push(T&&)?");
     REQUIRE_MESSAGE(ccct == 0, "Copying of arg occurred during push(T&&) or try_push(T&&)");
 
     MoveOperationTracker ob;
-    CHECK(pusher<push_op>::push( q, std::move(ob) ));
+    CHECK(pusher<push_op>::push(q, std::move(ob)));
     REQUIRE_MESSAGE(mcct == 2, "Not working push(T&&) or try_push(T&&)?");
     REQUIRE_MESSAGE(ccct == 0, "Copying of arg occurred during push(T&&) or try_push(T&&)");
 
     REQUIRE_MESSAGE(cact == 0, "Copy assignment called during push(T&&) or try_push(T&&)");
     REQUIRE_MESSAGE(mact == 0, "Move assignment called during push(T&&) or try_push(T&&)");
 
-    bool result = popper<pop_op>::pop( q, ob );
+    bool result = popper<pop_op>::pop(q, ob);
     CHECK(result);
     REQUIRE_MESSAGE(cact == 0, "Copy assignment called during try_pop(T&&)");
     REQUIRE_MESSAGE(mact == 1, "Move assignment was not called during try_pop(T&&)");
@@ -1204,13 +1198,13 @@ void TestMoveSupportInPushPop() {
     TestMoveSupport<oneapi::tbb::concurrent_bounded_queue<MoveOperationTracker>, try_push_op, try_pop_op>();
 }
 
-template<class T>
-class allocator: public oneapi::tbb::cache_aligned_allocator<T> {
+template <class T>
+class allocator : public oneapi::tbb::cache_aligned_allocator<T> {
 public:
     state_type state = LIVE;
     std::size_t m_unique_id;
 
-    allocator() : m_unique_id( 0 ) {}
+    allocator() : m_unique_id(0) {}
     allocator(size_t unique_id) { m_unique_id = unique_id; }
 
     ~allocator() {
@@ -1218,14 +1212,16 @@ class allocator: public oneapi::tbb::cache_aligned_allocator<T> {
         state = DEAD;
     }
 
-    template<typename U>
+    template <typename U>
     allocator(const allocator<U>& a) noexcept {
         REQUIRE_MESSAGE(a.state == LIVE, "Destroyed allocator has been used.");
         m_unique_id = a.m_unique_id;
     }
 
-    template<typename U>
-    struct rebind { typedef allocator<U> other; };
+    template <typename U>
+    struct rebind {
+        typedef allocator<U> other;
+    };
 
     friend bool operator==(const allocator& lhs, const allocator& rhs) {
         REQUIRE_MESSAGE(lhs.state == LIVE, "Destroyed allocator has been used.");
@@ -1235,13 +1231,13 @@ class allocator: public oneapi::tbb::cache_aligned_allocator<T> {
 };
 
 template <typename Queue>
-void AssertEquality(Queue &q, const std::vector<typename Queue::value_type> &vec) {
+void AssertEquality(Queue& q, const std::vector<typename Queue::value_type>& vec) {
     CHECK(q.size() == typename Queue::size_type(vec.size()));
     CHECK(std::equal(q.unsafe_begin(), q.unsafe_end(), vec.begin()));
 }
 
 template <typename Queue>
-void AssertEmptiness(Queue &q) {
+void AssertEmptiness(Queue& q) {
     CHECK(q.empty());
     CHECK(!q.size());
     typename Queue::value_type elem;
@@ -1249,14 +1245,15 @@ void AssertEmptiness(Queue &q) {
 }
 
 template <push_t push_op, typename Queue>
-void FillTest(Queue &q, const std::vector<typename Queue::value_type> &vec) {
-    for (typename std::vector<typename Queue::value_type>::const_iterator it = vec.begin(); it != vec.end(); ++it)
+void FillTest(Queue& q, const std::vector<typename Queue::value_type>& vec) {
+    for (typename std::vector<typename Queue::value_type>::const_iterator it = vec.begin(); it != vec.end();
+         ++it)
         CHECK(pusher<push_op>::push(q, *it));
     AssertEquality(q, vec);
 }
 
 template <pop_t pop_op, typename Queue>
-void EmptyTest(Queue &q, const std::vector<typename Queue::value_type> &vec) {
+void EmptyTest(Queue& q, const std::vector<typename Queue::value_type>& vec) {
     typedef typename Queue::value_type value_type;
 
     value_type elem;
@@ -1270,10 +1267,12 @@ void EmptyTest(Queue &q, const std::vector<typename Queue::value_type> &vec) {
 }
 
 template <typename T, typename A>
-void bounded_queue_specific_test(oneapi::tbb::concurrent_queue<T, A> &, const std::vector<T> &) { /* do nothing */ }
+void bounded_queue_specific_test(oneapi::tbb::concurrent_queue<T, A>&,
+                                 const std::vector<T>&) { /* do nothing */
+}
 
 template <typename T, typename A>
-void bounded_queue_specific_test(oneapi::tbb::concurrent_bounded_queue<T, A> &q, const std::vector<T> &vec) {
+void bounded_queue_specific_test(oneapi::tbb::concurrent_bounded_queue<T, A>& q, const std::vector<T>& vec) {
     typedef typename oneapi::tbb::concurrent_bounded_queue<T, A>::size_type size_type;
 
     FillTest<try_push_op>(q, vec);
@@ -1289,63 +1288,61 @@ void bounded_queue_specific_test(oneapi::tbb::concurrent_bounded_queue<T, A> &q,
 }
 
 // Checks operability of the queue the data was moved from
-template<typename T, typename CQ>
-void TestQueueOperabilityAfterDataMove( CQ& queue ) {
+template <typename T, typename CQ>
+void TestQueueOperabilityAfterDataMove(CQ& queue) {
     const std::size_t size = 10;
     std::vector<T> v(size);
-    for( std::size_t i = 0; i < size; ++i ) v[i] = T( i * i + i );
+    for (std::size_t i = 0; i < size; ++i) v[i] = T(i * i + i);
 
     FillTest<push_op>(queue, v);
     EmptyTest<try_pop_op>(queue, v);
     bounded_queue_specific_test(queue, v);
 }
 
-template<class CQ, class T>
+template <class CQ, class T>
 void TestMoveConstructors() {
     T::construction_num = T::destruction_num = 0;
-    CQ src_queue( allocator<T>(0) );
+    CQ src_queue(allocator<T>(0));
     const std::size_t size = 10;
-    for( std::size_t i = 0; i < size; ++i )
-        src_queue.push( T(i + (i ^ size)) );
+    for (std::size_t i = 0; i < size; ++i) src_queue.push(T(i + (i ^ size)));
     CHECK(T::construction_num == 2 * size);
     CHECK(T::destruction_num == size);
 
     const T* locations[size];
     typename CQ::const_iterator qit = src_queue.unsafe_begin();
-    for( std::size_t i = 0; i < size; ++i, ++qit )
-        locations[i] = &(*qit);
+    for (std::size_t i = 0; i < size; ++i, ++qit) locations[i] = &(*qit);
 
     // Ensuring allocation operation takes place during move when allocators are different
     T::construction_num = T::destruction_num = 0;
-    CQ dst_queue( std::move(src_queue), allocator<T>(1) );
+    CQ dst_queue(std::move(src_queue), allocator<T>(1));
     CHECK(T::construction_num == size);
     CHECK(T::destruction_num == size);
 
-    TestQueueOperabilityAfterDataMove<T>( src_queue );
+    TestQueueOperabilityAfterDataMove<T>(src_queue);
 
     qit = dst_queue.unsafe_begin();
-    for( std::size_t i = 0; i < size; ++i, ++qit ) {
-        REQUIRE_MESSAGE(locations[i] != &(*qit), "an item should have been copied but was not" );
+    for (std::size_t i = 0; i < size; ++i, ++qit) {
+        REQUIRE_MESSAGE(locations[i] != &(*qit), "an item should have been copied but was not");
         locations[i] = &(*qit);
     }
 
     T::construction_num = T::destruction_num = 0;
     // Ensuring there is no allocation operation during move with equal allocators
-    CQ dst_queue2( std::move(dst_queue), allocator<T>(1) );
+    CQ dst_queue2(std::move(dst_queue), allocator<T>(1));
     CHECK(T::construction_num == 0);
     CHECK(T::destruction_num == 0);
 
-    TestQueueOperabilityAfterDataMove<T>( dst_queue );
+    TestQueueOperabilityAfterDataMove<T>(dst_queue);
 
     qit = dst_queue2.unsafe_begin();
-    for( std::size_t i = 0; i < size; ++i, ++qit ) {
-        REQUIRE_MESSAGE(locations[i] == &(*qit), "an item should have been moved but was not" );
+    for (std::size_t i = 0; i < size; ++i, ++qit) {
+        REQUIRE_MESSAGE(locations[i] == &(*qit), "an item should have been moved but was not");
     }
 
-    for( std::size_t i = 0; i < size; ++i) {
+    for (std::size_t i = 0; i < size; ++i) {
         T test(i + (i ^ size));
         T popped;
-        bool pop_result = dst_queue2.try_pop( popped );
+        bool pop_result = dst_queue2.try_pop(popped);
         CHECK(pop_result);
         CHECK(test == popped);
     }
@@ -1360,11 +1357,12 @@ void TestMoveConstruction() {
 
 class NonTrivialConstructorType {
 public:
-    NonTrivialConstructorType( int a = 0 ) : m_a( a ), m_str( "" ) {}
-    NonTrivialConstructorType( const std::string& str ) : m_a( 0 ), m_str( str ) {}
-    NonTrivialConstructorType( int a, const std::string& str ) : m_a( a ), m_str( str ) {}
+    NonTrivialConstructorType(int a = 0) : m_a(a), m_str("") {}
+    NonTrivialConstructorType(const std::string& str) : m_a(0), m_str(str) {}
+    NonTrivialConstructorType(int a, const std::string& str) : m_a(a), m_str(str) {}
     int get_a() const { return m_a; }
     std::string get_str() const { return m_str; }
+
 private:
     int m_a;
     std::string m_str;
@@ -1372,41 +1370,43 @@ class NonTrivialConstructorType {
 
 enum emplace_t { emplace_op, try_emplace_op };
 
-template<emplace_t emplace_op>
+template <emplace_t emplace_op>
 struct emplacer {
-    template<typename CQ, typename... Args>
-    static void emplace( CQ& queue, Args&&... val ) { queue.emplace( std::forward<Args>( val )... ); }
+    template <typename CQ, typename... Args>
+    static void emplace(CQ& queue, Args&&... val) {
+        queue.emplace(std::forward<Args>(val)...);
+    }
 };
 
-template<>
-struct emplacer <try_emplace_op> {
-    template<typename CQ, typename... Args>
-    static void emplace( CQ& queue, Args&&... val ) {
-        bool result = queue.try_emplace( std::forward<Args>( val )... );
+template <>
+struct emplacer<try_emplace_op> {
+    template <typename CQ, typename... Args>
+    static void emplace(CQ& queue, Args&&... val) {
+        bool result = queue.try_emplace(std::forward<Args>(val)...);
         REQUIRE_MESSAGE(result, "try_emplace error\n");
     }
 };
 
-template<typename CQ, emplace_t emplace_op>
+template <typename CQ, emplace_t emplace_op>
 void TestEmplaceInQueue() {
     CQ cq;
     std::string test_str = "I'm being emplaced!";
     {
-        emplacer<emplace_op>::emplace( cq, 5 );
+        emplacer<emplace_op>::emplace(cq, 5);
         CHECK(cq.size() == 1);
-        NonTrivialConstructorType popped( -1 );
-        bool result = cq.try_pop( popped );
+        NonTrivialConstructorType popped(-1);
+        bool result = cq.try_pop(popped);
         CHECK(result);
         CHECK(popped.get_a() == 5);
-        CHECK(popped.get_str() == std::string( "" ));
+        CHECK(popped.get_str() == std::string(""));
     }
 
     CHECK(cq.empty());
 
     {
-        NonTrivialConstructorType popped( -1 );
-        emplacer<emplace_op>::emplace( cq, std::string(test_str) );
-        bool result = cq.try_pop( popped );
+        NonTrivialConstructorType popped(-1);
+        emplacer<emplace_op>::emplace(cq, std::string(test_str));
+        bool result = cq.try_pop(popped);
         CHECK(result);
         CHECK(popped.get_a() == 0);
         CHECK(popped.get_str() == test_str);
@@ -1415,9 +1415,9 @@ void TestEmplaceInQueue() {
     CHECK(cq.empty());
 
     {
-        NonTrivialConstructorType popped( -1, "" );
-        emplacer<emplace_op>::emplace( cq, 5, std::string(test_str) );
-        bool result = cq.try_pop( popped );
+        NonTrivialConstructorType popped(-1, "");
+        emplacer<emplace_op>::emplace(cq, 5, std::string(test_str));
+        bool result = cq.try_pop(popped);
         CHECK(result);
         CHECK(popped.get_a() == 5);
         CHECK(popped.get_str() == test_str);
@@ -1462,17 +1462,17 @@ void TestDeductionGuides() {
 #endif
 
 template <typename Iterator, typename QueueType>
-void TestQueueIteratorComparisonsBasic( QueueType& q ) {
+void TestQueueIteratorComparisonsBasic(QueueType& q) {
     REQUIRE_MESSAGE(!q.empty(), "Incorrect test setup");
     using namespace comparisons_testing;
     Iterator it1, it2;
-    testEqualityComparisons</*ExpectEqual = */true>(it1, it2);
+    testEqualityComparisons</*ExpectEqual = */ true>(it1, it2);
     it1 = q.unsafe_begin();
-    testEqualityComparisons</*ExpectEqual = */false>(it1, it2);
+    testEqualityComparisons</*ExpectEqual = */ false>(it1, it2);
     it2 = q.unsafe_begin();
-    testEqualityComparisons</*ExpectEqual = */true>(it1, it2);
+    testEqualityComparisons</*ExpectEqual = */ true>(it1, it2);
     it2 = q.unsafe_end();
-    testEqualityComparisons</*ExpectEqual = */false>(it1, it2);
+    testEqualityComparisons</*ExpectEqual = */ false>(it1, it2);
 }
 
 template <typename QueueType>
@@ -1488,49 +1488,35 @@ void TestQueueIteratorComparisons() {
 
 //! Test constructors
 //! \brief \ref interface \ref requirement
-TEST_CASE("testing constructors") {
-    TestQueueConstructors();
-}
+TEST_CASE("testing constructors") { TestQueueConstructors(); }
 
 //! Test work with empty queue
 //! \brief \ref interface \ref requirement
-TEST_CASE("testing work with empty queue") {
-    TestEmptiness();
-}
+TEST_CASE("testing work with empty queue") { TestEmptiness(); }
 
 //! Test set capacity operation
 //! \brief \ref interface \ref requirement
-TEST_CASE("testing set capacity operation") {
-    TestFullness();
-}
+TEST_CASE("testing set capacity operation") { TestFullness(); }
 
 //! Test clean operation
 //! \brief \ref interface \ref requirement
-TEST_CASE("testing clean operation") {
-    TestClearWorks();
-}
+TEST_CASE("testing clean operation") { TestClearWorks(); }
 
 //! Test move constructors
 //! \brief \ref interface \ref requirement
-TEST_CASE("testing move constructor") {
-    TestMoveConstruction();
-}
+TEST_CASE("testing move constructor") { TestMoveConstruction(); }
 
 //! Test move support in push and pop
 //! \brief \ref requirement
-TEST_CASE("testing move support in push and pop") {
-    TestMoveSupportInPushPop();
-}
+TEST_CASE("testing move support in push and pop") { TestMoveSupportInPushPop(); }
 
 //! Test emplace operation
 //! \brief \ref interface \ref requirement
-TEST_CASE("testing emplace") {
-    TestEmplace();
-}
+TEST_CASE("testing emplace") { TestEmplace(); }
 
 //! Test concurrent_queues member types
 //! \brief \ref interface \ref requirement
-TEST_CASE("testing concurrent_queues member types"){
+TEST_CASE("testing concurrent_queues member types") {
     test_member_types<oneapi::tbb::concurrent_queue>();
     test_member_types<oneapi::tbb::concurrent_bounded_queue>();
 
@@ -1543,28 +1529,20 @@ TEST_CASE("testing concurrent_queues member types"){
 
 //! Test iterators
 //! \brief \ref interface \ref requirement
-TEST_CASE("testing iterators") {
-    TestQueueIteratorWorks();
-}
+TEST_CASE("testing iterators") { TestQueueIteratorWorks(); }
 
 //! Test concurrent operations support
 //! \brief \ref requirement
-TEST_CASE("testing concurrent operations support") {
-    TestConcurrentPushPop();
-}
+TEST_CASE("testing concurrent operations support") { TestConcurrentPushPop(); }
 
 #if TBB_USE_EXCEPTIONS
 //! Test exception safety
 //! \brief \ref requirement
-TEST_CASE("testing exception safety") {
-    TestExceptions();
-}
+TEST_CASE("testing exception safety") { TestExceptions(); }
 
 //! Test abort operation
 //! \brief \ref interface \ref requirement
-TEST_CASE("testing abort operation") {
-    TestAbort();
-}
+TEST_CASE("testing abort operation") { TestAbort(); }
 #endif
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
@@ -1641,7 +1619,7 @@ void test_with_minimalistic_objects() {
         Container<MinimalisticObject> default_container;
 
         for (std::size_t i = 0; i < elements_count; ++i) {
-            default_container.emplace(MinimalisticObject::flag{});
+            default_container.emplace(MinimalisticObject::flag {});
         }
         test_basics(default_container, elements_count);
     }
@@ -1650,16 +1628,16 @@ void test_with_minimalistic_objects() {
         Container<MoveAssignableMinimalisticObject> default_container;
 
         for (std::size_t i = 0; i < elements_count; ++i) {
-            default_container.emplace(MinimalisticObject::flag{});
+            default_container.emplace(MinimalisticObject::flag {});
         }
         test_basics(default_container, elements_count);
 
         // Refill again
         for (std::size_t i = 0; i < elements_count; ++i) {
-            default_container.emplace(MinimalisticObject::flag{});
+            default_container.emplace(MinimalisticObject::flag {});
         }
 
-        MoveAssignableMinimalisticObject result(MinimalisticObject::flag{});
+        MoveAssignableMinimalisticObject result(MinimalisticObject::flag {});
 
         std::size_t element_counter = 0;
         while (!default_container.empty()) {
@@ -1681,7 +1659,7 @@ TEST_CASE("Test with minimalistic object type") {
 //TODO: Once support for std::allocator_traits::propagate_on_container_* is implemented,
 //      most of the 4 test cases below can be replaced with move_support_tests::test_*.
 
-template<typename CQ>
+template <typename CQ>
 void test_queue_helper() {
     int size = 5;
     typename CQ::value_type vec_1(size, 0), vec_2(size, 0), vec_3(size, 0), vec_4(size, 0);
@@ -1724,15 +1702,13 @@ void TestMoveQueue() {
     size_t n1(15), n2(7);
 
     allocator_type::init_counters();
-    for(size_t i =0; i < n1; i++)
-        q1.push(obj);
+    for (size_t i = 0; i < n1; i++) q1.push(obj);
     size_t q1_items_constructed = allocator_type::items_constructed;
-    size_t q1_items_allocated =  allocator_type::items_allocated;
+    size_t q1_items_allocated = allocator_type::items_allocated;
 
     allocator_type::init_counters();
-    for(size_t i =0; i < n2; i++)
-        q2.push(obj);
-    size_t q2_items_allocated =  allocator_type::items_allocated;
+    for (size_t i = 0; i < n2; i++) q2.push(obj);
+    size_t q2_items_allocated = allocator_type::items_allocated;
 
     allocator_type::init_counters();
     q1 = std::move(q2);
@@ -1750,28 +1726,28 @@ TEST_CASE("testing move assignment with equal counting allocators") {
     TestMoveQueue<tbb::concurrent_bounded_queue<move_support_tests::Foo, allocator_type>>();
 }
 
-template<class T>
+template <class T>
 struct stateful_allocator {
     typedef T value_type;
     stateful_allocator() = default;
     int state = 0;
-    template<class U>
+    template <class U>
     constexpr stateful_allocator(const stateful_allocator<U>& src) noexcept : state(src.state) {}
 
-    T* allocate(std::size_t n) {
-        return static_cast<T*>(::operator new(n * sizeof(T)));
-    }
+    T* allocate(std::size_t n) { return static_cast<T*>(::operator new(n * sizeof(T))); }
 
-    void deallocate(T* p, std::size_t) noexcept {
-        ::operator delete(p);
-    }
+    void deallocate(T* p, std::size_t) noexcept { ::operator delete(p); }
 };
 
-template<class T, class U>
-bool operator==(const stateful_allocator<T>& lhs, const stateful_allocator<U>& rhs) { return lhs.state == rhs.state; }
+template <class T, class U>
+bool operator==(const stateful_allocator<T>& lhs, const stateful_allocator<U>& rhs) {
+    return lhs.state == rhs.state;
+}
 
-template<class T, class U>
-bool operator!=(const stateful_allocator<T>& lhs, const stateful_allocator<U>& rhs) { return lhs.state != rhs.state; }
+template <class T, class U>
+bool operator!=(const stateful_allocator<T>& lhs, const stateful_allocator<U>& rhs) {
+    return lhs.state != rhs.state;
+}
 
 template <typename QueueType>
 void TestMoveQueueUnequal() {
@@ -1785,21 +1761,22 @@ void TestMoveQueueUnequal() {
     size_t n1(15), n2(7);
 
     allocator_type::init_counters();
-    for(size_t i =0; i < n1; i++)
-        q1.push(obj);
+    for (size_t i = 0; i < n1; i++) q1.push(obj);
 
     allocator_type::init_counters();
-    for(size_t i =0; i < n2; i++)
-        q2.push(obj);
-    size_t q2_items_allocated =  allocator_type::items_allocated;
+    for (size_t i = 0; i < n2; i++) q2.push(obj);
+    size_t q2_items_allocated = allocator_type::items_allocated;
 
     allocator_type::init_counters();
     q1 = std::move(q2);
 
-    REQUIRE_MESSAGE(allocator_type::items_allocated == q2_items_allocated, "More than expected memory allocated?");
-    REQUIRE_MESSAGE(std::all_of(q1.unsafe_begin(), q1.unsafe_end(), is_state_predicate<move_support_tests::Foo::MoveInitialized>()),
+    REQUIRE_MESSAGE(allocator_type::items_allocated == q2_items_allocated,
+                    "More than expected memory allocated?");
+    REQUIRE_MESSAGE(std::all_of(q1.unsafe_begin(), q1.unsafe_end(),
+                                is_state_predicate<move_support_tests::Foo::MoveInitialized>()),
                     "Container did not move construct some elements");
-    REQUIRE_MESSAGE(std::all_of(q2.unsafe_begin(), q2.unsafe_end(), is_state_predicate<move_support_tests::Foo::MovedFrom>()),
+    REQUIRE_MESSAGE(std::all_of(q2.unsafe_begin(), q2.unsafe_end(),
+                                is_state_predicate<move_support_tests::Foo::MovedFrom>()),
                     "Container did not move all the elements");
 }
 
@@ -1811,27 +1788,30 @@ TEST_CASE("testing move assignment with unequal counting allocators") {
     TestMoveQueueUnequal<tbb::concurrent_bounded_queue<move_support_tests::Foo, allocator_type>>();
 }
 
-template<typename Container>
+template <typename Container>
 void test_check_move_allocator(Container& src, Container& dst, Container& cpy) {
     REQUIRE_MESSAGE(src.empty(), "Source didn't clear");
-    REQUIRE_MESSAGE(std::equal(dst.unsafe_begin(), dst.unsafe_end(), cpy.unsafe_begin()), "Elements are not equal");
+    REQUIRE_MESSAGE(std::equal(dst.unsafe_begin(), dst.unsafe_end(), cpy.unsafe_begin()),
+                    "Elements are not equal");
 }
 
 void test_move_assignment_test_equal() {
     int n = 5;
-    std::vector<int> vect1(n, 10), vect2(n,20), vect3(n, 30);
+    std::vector<int> vect1(n, 10), vect2(n, 20), vect3(n, 30);
 
     tbb::concurrent_queue<std::vector<int>> src({vect1, vect2, vect3});
     tbb::concurrent_queue<std::vector<int>> dst(src.get_allocator());
     tbb::concurrent_queue<std::vector<int>> cpy(src.get_allocator());
-    REQUIRE_MESSAGE(src.get_allocator() == dst.get_allocator(), "Incorrect test setup: allocators should be equal");
+    REQUIRE_MESSAGE(src.get_allocator() == dst.get_allocator(),
+                    "Incorrect test setup: allocators should be equal");
     cpy = src;
     dst = std::move(src);
 
     tbb::concurrent_bounded_queue<std::vector<int>> src_bnd({vect1, vect2, vect3});
     tbb::concurrent_bounded_queue<std::vector<int>> dst_bnd(src_bnd.get_allocator());
     tbb::concurrent_bounded_queue<std::vector<int>> cpy_bnd(src_bnd.get_allocator());
-    REQUIRE_MESSAGE(src_bnd.get_allocator() == dst_bnd.get_allocator(), "Incorrect test setup: allocators should be equal");
+    REQUIRE_MESSAGE(src_bnd.get_allocator() == dst_bnd.get_allocator(),
+                    "Incorrect test setup: allocators should be equal");
     cpy_bnd = src_bnd;
     dst_bnd = std::move(src_bnd);
 
@@ -1857,23 +1837,32 @@ void test_move_assignment_test_unequal() {
     dst_alloc.state = 1;
     tbb::concurrent_queue<std::vector<int, stateful_allocator<int>>, stateful_allocator<int>> dst(dst_alloc);
     tbb::concurrent_queue<std::vector<int, stateful_allocator<int>>, stateful_allocator<int>> cpy(src_alloc);
-    REQUIRE_MESSAGE(src.get_allocator() != dst.get_allocator(), "Incorrect test setup: allocators should be unequal");
+    REQUIRE_MESSAGE(src.get_allocator() != dst.get_allocator(),
+                    "Incorrect test setup: allocators should be unequal");
     cpy = src;
     dst = std::move(src);
 
-    tbb::concurrent_bounded_queue<std::vector<int, stateful_allocator<int>>, stateful_allocator<int>> src_bnd(src_alloc);
-    tbb::concurrent_bounded_queue<std::vector<int, stateful_allocator<int>>, stateful_allocator<int>> dst_bnd(dst_alloc);
-    tbb::concurrent_bounded_queue<std::vector<int, stateful_allocator<int>>, stateful_allocator<int>> cpy_bnd(src_alloc);
-    REQUIRE_MESSAGE(src_bnd.get_allocator() != dst_bnd.get_allocator(), "Incorrect test setup: allocators should be unequal");
+    tbb::concurrent_bounded_queue<std::vector<int, stateful_allocator<int>>, stateful_allocator<int>> src_bnd(
+            src_alloc);
+    tbb::concurrent_bounded_queue<std::vector<int, stateful_allocator<int>>, stateful_allocator<int>> dst_bnd(
+            dst_alloc);
+    tbb::concurrent_bounded_queue<std::vector<int, stateful_allocator<int>>, stateful_allocator<int>> cpy_bnd(
+            src_alloc);
+    REQUIRE_MESSAGE(src_bnd.get_allocator() != dst_bnd.get_allocator(),
+                    "Incorrect test setup: allocators should be unequal");
     src_bnd.push(v);
     src_bnd.push(v);
     cpy_bnd = src_bnd;
     dst_bnd = std::move(src_bnd);
 
-    test_check_move_allocator<tbb::concurrent_queue<std::vector<int, stateful_allocator<int>>, stateful_allocator<int>>>(src, dst, cpy);
+    test_check_move_allocator<
+            tbb::concurrent_queue<std::vector<int, stateful_allocator<int>>, stateful_allocator<int>>>(
+            src, dst, cpy);
     REQUIRE_MESSAGE(dst.unsafe_size() == cpy.unsafe_size(), "Queues are not equal");
 
-    test_check_move_allocator<tbb::concurrent_bounded_queue<std::vector<int, stateful_allocator<int>>, stateful_allocator<int>>>(src_bnd, dst_bnd, cpy_bnd);
+    test_check_move_allocator<tbb::concurrent_bounded_queue<std::vector<int, stateful_allocator<int>>,
+                                                            stateful_allocator<int>>>(src_bnd, dst_bnd,
+                                                                                      cpy_bnd);
     REQUIRE_MESSAGE(dst_bnd.size() == cpy_bnd.size(), "Queues are not equal");
 }
 
diff --git a/external/tbb/test/conformance/conformance_concurrent_set.cpp b/external/tbb/test/conformance/conformance_concurrent_set.cpp
index beb874b5..28227fb5 100644
--- a/external/tbb/test/conformance/conformance_concurrent_set.cpp
+++ b/external/tbb/test/conformance/conformance_concurrent_set.cpp
@@ -18,9 +18,9 @@
 #define NOMINMAX
 #endif
 #include "oneapi/tbb/concurrent_set.h"
+#include <common/concurrent_ordered_common.h>
 #include <common/test.h>
 #include <common/utils.h>
-#include <common/concurrent_ordered_common.h>
 #include <memory>
 #include <type_traits>
 
@@ -41,10 +41,11 @@ void test_member_types() {
     using default_container_type = ContainerType<int>;
     static_assert(std::is_same<typename default_container_type::key_compare, std::less<int>>::value,
                   "Incorrect default template comparator");
-    static_assert(std::is_same<typename default_container_type::allocator_type, oneapi::tbb::tbb_allocator<int>>::value,
+    static_assert(std::is_same<typename default_container_type::allocator_type,
+                               oneapi::tbb::tbb_allocator<int>>::value,
                   "Incorrect default template allocator");
 
-    auto test_comparator = [](const int&, const int&)->bool { return true; };
+    auto test_comparator = [](const int&, const int&) -> bool { return true; };
     using test_allocator_type = std::allocator<int>;
 
     using container_type = ContainerType<int, decltype(test_comparator), test_allocator_type>;
@@ -70,9 +71,11 @@ void test_member_types() {
     static_assert(std::is_same<typename container_type::const_reference, const value_type&>::value,
                   "Incorrect container const_reference member type");
     using allocator_type = typename container_type::allocator_type;
-    static_assert(std::is_same<typename container_type::pointer, typename std::allocator_traits<allocator_type>::pointer>::value,
+    static_assert(std::is_same<typename container_type::pointer,
+                               typename std::allocator_traits<allocator_type>::pointer>::value,
                   "Incorrect container pointer member type");
-    static_assert(std::is_same<typename container_type::const_pointer, typename std::allocator_traits<allocator_type>::const_pointer>::value,
+    static_assert(std::is_same<typename container_type::const_pointer,
+                               typename std::allocator_traits<allocator_type>::const_pointer>::value,
                   "Incorrect container const_pointer member type");
 
     static_assert(utils::is_forward_iterator<typename container_type::iterator>::value,
@@ -86,7 +89,7 @@ void test_member_types() {
 }
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
-template <template <typename ...> typename TSet>
+template <template <typename...> typename TSet>
 void test_deduction_guides() {
     std::vector<int> vc({1, 2, 3});
     TSet set(vc.begin(), vc.end());
@@ -104,7 +107,7 @@ void test_deduction_guides() {
     TSet set4(vc.begin(), vc.end(), compare, allocator);
     static_assert(std::is_same_v<decltype(set4), TSet<int, decltype(compare), decltype(allocator)>>, "Wrong");
 
-    auto init_list = { int(1), int(2), int(3) };
+    auto init_list = {int(1), int(2), int(3)};
 
     TSet set5(init_list);
     static_assert(std::is_same_v<decltype(set5), TSet<int>>, "Wrong");
@@ -135,7 +138,7 @@ struct COSetTraits : OrderedMoveTraitsBase {
     using container_value_type = T;
 
     using init_iterator_type = move_support_tests::FooIterator;
-}; // struct COSetTraits
+};// struct COSetTraits
 
 struct COMultisetTraits : OrderedMoveTraitsBase {
     template <typename T, typename Allocator>
@@ -145,25 +148,19 @@ struct COMultisetTraits : OrderedMoveTraitsBase {
     using container_value_type = T;
 
     using init_iterator_type = move_support_tests::FooIterator;
-}; // struct COMultisetTraits
+};// struct COMultisetTraits
 
 //! Testing concurrent_set member types
 //! \brief \ref interface \ref requirement
-TEST_CASE("concurrent_set member types") {
-    test_member_types<oneapi::tbb::concurrent_set>();
-}
+TEST_CASE("concurrent_set member types") { test_member_types<oneapi::tbb::concurrent_set>(); }
 
 //! Testing multithreading support in concurrent_set
 //! \brief \ref requirement
-TEST_CASE("concurrent_set multithreading support") {
-    test_concurrent<set_type>();
-}
+TEST_CASE("concurrent_set multithreading support") { test_concurrent<set_type>(); }
 
 //! Testing move constructors and assignment operator in concurrent_set
 //! \brief \ref interface \ref requirement
-TEST_CASE("concurrent_set move semantics support") {
-    test_rvalue_ref_support<COSetTraits>();
-}
+TEST_CASE("concurrent_set move semantics support") { test_rvalue_ref_support<COSetTraits>(); }
 
 //! Testing std::initializer_list constructors and modifiers in concurrent_set
 //! \brief \ref interface \ref requirement
@@ -179,9 +176,7 @@ TEST_CASE("node handling support in concurrent_set") {
 
 //! Testing std::allocator_traits support in concurrent_set
 //! \brief \ref interface \ref requirement
-TEST_CASE("std::allocator_traits support in concurrent_set") {
-    test_allocator_traits_support<COSetTraits>();
-}
+TEST_CASE("std::allocator_traits support in concurrent_set") { test_allocator_traits_support<COSetTraits>(); }
 
 //! Testing heterogeneous overloads in concurrent_set
 //! \brief \ref interface \ref requirement
@@ -192,40 +187,28 @@ TEST_CASE("heterogeneous overloads in concurrent_set") {
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 //! Testing Class Template Argument Deduction in concurrent_set
 //! \brief \ref interface \ref requirement
-TEST_CASE("CTAD support in concurrent_set") {
-    test_deduction_guides<oneapi::tbb::concurrent_set>();
-}
-#endif // __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
+TEST_CASE("CTAD support in concurrent_set") { test_deduction_guides<oneapi::tbb::concurrent_set>(); }
+#endif// __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 
 //! Testing comparison operators in concurrent_set
 //! \brief \ref interface \ref requirement
-TEST_CASE("test concurrent_set comparisons") {
-    test_set_comparisons<oneapi::tbb::concurrent_set>();
-}
+TEST_CASE("test concurrent_set comparisons") { test_set_comparisons<oneapi::tbb::concurrent_set>(); }
 
 //! Testing concurrent_multiset member types
 //! \brief \ref interface \ref requirement
-TEST_CASE("concurrent_multiset member types") {
-    test_member_types<oneapi::tbb::concurrent_multiset>();
-}
+TEST_CASE("concurrent_multiset member types") { test_member_types<oneapi::tbb::concurrent_multiset>(); }
 
 //! Testing requirements of concurrent_multiset
 //! \brief \ref interface \ref requirement
-TEST_CASE("concurrent_multiset requirements") {
-    test_basic<multiset_type>();
-}
+TEST_CASE("concurrent_multiset requirements") { test_basic<multiset_type>(); }
 
 //! Testing multithreading support in concurrent_multiset
 //! \brief \ref requirement
-TEST_CASE("concurrent_multiset multithreading support") {
-    test_concurrent<multiset_type>();
-}
+TEST_CASE("concurrent_multiset multithreading support") { test_concurrent<multiset_type>(); }
 
 //! Testing move constructors and assignment operator in concurrent_multiset
 //! \brief \ref interface \ref requirement
-TEST_CASE("concurrent_multiset multithreading support") {
-    test_rvalue_ref_support<COMultisetTraits>();
-}
+TEST_CASE("concurrent_multiset multithreading support") { test_rvalue_ref_support<COMultisetTraits>(); }
 
 //! Testing std::initializer_list constructors and modifiers in concurrent_multiset
 //! \brief \ref interface \ref requirement
@@ -257,16 +240,12 @@ TEST_CASE("heterogeneous overloads in concurrent_multiset") {
 TEST_CASE("CTAD support in concurrent_multiset") {
     test_deduction_guides<oneapi::tbb::concurrent_multiset>();
 }
-#endif // __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
+#endif// __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 
 //! Testing comparison operators in concurrent_multiset
 //! \brief \ref interface \ref requirement
-TEST_CASE("test concurrent_set comparisons") {
-    test_set_comparisons<oneapi::tbb::concurrent_multiset>();
-}
+TEST_CASE("test concurrent_set comparisons") { test_set_comparisons<oneapi::tbb::concurrent_multiset>(); }
 
 //! Testing of merge operations in concurrent_set and concurrent_multiset
 //! \brief \ref interface \ref requirement
-TEST_CASE("merge operations") {
-    node_handling_tests::test_merge<set_type, multiset_type>(1000);
-}
+TEST_CASE("merge operations") { node_handling_tests::test_merge<set_type, multiset_type>(1000); }
diff --git a/external/tbb/test/conformance/conformance_concurrent_unordered_map.cpp b/external/tbb/test/conformance/conformance_concurrent_unordered_map.cpp
index 11202f4e..b19a2c37 100644
--- a/external/tbb/test/conformance/conformance_concurrent_unordered_map.cpp
+++ b/external/tbb/test/conformance/conformance_concurrent_unordered_map.cpp
@@ -15,13 +15,13 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
 #endif
 
 #include "oneapi/tbb/concurrent_unordered_map.h"
+#include <common/concurrent_unordered_common.h>
 #include <common/test.h>
 #include <common/utils.h>
-#include <common/concurrent_unordered_common.h>
 #include <memory>
 #include <type_traits>
 
@@ -34,24 +34,22 @@ struct AllowMultimapping<oneapi::tbb::concurrent_unordered_multimap<Args...>> :
 template <typename Key, typename Mapped>
 using Allocator = LocalCountingAllocator<std::allocator<std::pair<const Key, Mapped>>>;
 
-using map_type = oneapi::tbb::concurrent_unordered_map<int, int, std::hash<int>, std::equal_to<int>, Allocator<int, int>>;
-using multimap_type = oneapi::tbb::concurrent_unordered_multimap<int, int, std::hash<int>, std::equal_to<int>, Allocator<int, int>>;
+using map_type = oneapi::tbb::concurrent_unordered_map<int, int, std::hash<int>, std::equal_to<int>,
+                                                       Allocator<int, int>>;
+using multimap_type = oneapi::tbb::concurrent_unordered_multimap<int, int, std::hash<int>, std::equal_to<int>,
+                                                                 Allocator<int, int>>;
 
 template <>
 struct SpecialTests<map_type> {
-    static void Test() {
-        SpecialMapTests<map_type>();
-    }
+    static void Test() { SpecialMapTests<map_type>(); }
 };
 
 template <>
 struct SpecialTests<multimap_type> {
-    static void Test() {
-        SpecialMultiMapTests<multimap_type>();
-    }
+    static void Test() { SpecialMultiMapTests<multimap_type>(); }
 };
 
-template <template <typename... > class ContainerType>
+template <template <typename...> class ContainerType>
 void test_member_types() {
     using default_container_type = ContainerType<int, int>;
     static_assert(std::is_same<typename default_container_type::hasher, std::hash<int>>::value,
@@ -62,12 +60,12 @@ void test_member_types() {
                                oneapi::tbb::tbb_allocator<std::pair<const int, int>>>::value,
                   "Incorrect default template allocator");
 
-    auto test_hasher = [](const int&)->std::size_t { return 0; };
-    auto test_equality = [](const int&, const int&)->bool { return true; };
+    auto test_hasher = [](const int&) -> std::size_t { return 0; };
+    auto test_equality = [](const int&, const int&) -> bool { return true; };
     using test_allocator_type = std::allocator<std::pair<const int, int>>;
 
-    using container_type = ContainerType<int, int, decltype(test_hasher),
-                                         decltype(test_equality), test_allocator_type>;
+    using container_type
+            = ContainerType<int, int, decltype(test_hasher), decltype(test_equality), test_allocator_type>;
 
     static_assert(std::is_same<typename container_type::key_type, int>::value,
                   "Incorrect container key_type member type");
@@ -89,8 +87,9 @@ void test_member_types() {
     using transparent_container_type = ContainerType<int, int, hasher_with_transparent_key_equal,
                                                      std::equal_to<int>, test_allocator_type>;
 
-    static_assert(std::is_same<typename transparent_container_type::key_equal, transparent_key_equality>::value,
-                  "Incorrect container key_equal member type");
+    static_assert(
+            std::is_same<typename transparent_container_type::key_equal, transparent_key_equality>::value,
+            "Incorrect container key_equal member type");
     static_assert(std::is_same<typename container_type::allocator_type, test_allocator_type>::value,
                   "Incorrect container allocator_type member type");
 
@@ -100,9 +99,11 @@ void test_member_types() {
     static_assert(std::is_same<typename container_type::const_reference, const value_type&>::value,
                   "Incorrect container const_reference member type");
     using allocator_type = typename container_type::allocator_type;
-    static_assert(std::is_same<typename container_type::pointer, typename std::allocator_traits<allocator_type>::pointer>::value,
+    static_assert(std::is_same<typename container_type::pointer,
+                               typename std::allocator_traits<allocator_type>::pointer>::value,
                   "Incorrect container pointer member type");
-    static_assert(std::is_same<typename container_type::const_pointer, typename std::allocator_traits<allocator_type>::const_pointer>::value,
+    static_assert(std::is_same<typename container_type::const_pointer,
+                               typename std::allocator_traits<allocator_type>::const_pointer>::value,
                   "Incorrect container const_pointer member type");
 
     static_assert(utils::is_forward_iterator<typename container_type::iterator>::value,
@@ -129,7 +130,7 @@ void test_deduction_guides() {
     using ComplexType = std::pair<int, std::string>;
     using ComplexTypeConst = std::pair<const int, std::string>;
     std::vector<ComplexType> v;
-    auto l = { ComplexTypeConst(1, "one"), ComplexTypeConst(2, "two")};
+    auto l = {ComplexTypeConst(1, "one"), ComplexTypeConst(2, "two")};
     using custom_allocator_type = std::allocator<ComplexTypeConst>;
 
     // check TMap(InputIterator, InputIterator)
@@ -146,22 +147,23 @@ void test_deduction_guides() {
 
     // check TMap(InputIterator, InputIterator, size_t, Hasher, Equality)
     TMap m3(v.begin(), v.end(), 4, degenerate_hash<int>(), std::less<int>());
-    static_assert(std::is_same<decltype(m3), TMap<int, std::string, degenerate_hash<int>, std::less<int>>>::value);
+    static_assert(
+            std::is_same<decltype(m3), TMap<int, std::string, degenerate_hash<int>, std::less<int>>>::value);
 
     // check TMap(InputIterator, InputIterator, size_t, Hasher, Equality, Allocator)
-    TMap m4(v.begin(), v.end(), 4, degenerate_hash<int>(), std::less<int>(), custom_allocator_type{});
-    static_assert(std::is_same<decltype(m4), TMap<int, std::string, degenerate_hash<int>,
-        std::less<int>, custom_allocator_type>>::value);
+    TMap m4(v.begin(), v.end(), 4, degenerate_hash<int>(), std::less<int>(), custom_allocator_type {});
+    static_assert(std::is_same<decltype(m4), TMap<int, std::string, degenerate_hash<int>, std::less<int>,
+                                                  custom_allocator_type>>::value);
 
     // check TMap(InputIterator, InputIterator, size_t, Allocator)
-    TMap m5(v.begin(), v.end(), 5, custom_allocator_type{});
-    static_assert(std::is_same<decltype(m5), TMap<int, std::string, std::hash<int>,
-        std::equal_to<int>, custom_allocator_type>>::value);
+    TMap m5(v.begin(), v.end(), 5, custom_allocator_type {});
+    static_assert(std::is_same<decltype(m5), TMap<int, std::string, std::hash<int>, std::equal_to<int>,
+                                                  custom_allocator_type>>::value);
 
     // check TMap(InputIterator, InputIterator, size_t, Hasher, Allocator)
-    TMap m6(v.begin(), v.end(), 4, degenerate_hash<int>(), custom_allocator_type{});
-    static_assert(std::is_same<decltype(m6), TMap<int, std::string, degenerate_hash<int>,
-        std::equal_to<int>, custom_allocator_type>>::value);
+    TMap m6(v.begin(), v.end(), 4, degenerate_hash<int>(), custom_allocator_type {});
+    static_assert(std::is_same<decltype(m6), TMap<int, std::string, degenerate_hash<int>, std::equal_to<int>,
+                                                  custom_allocator_type>>::value);
 
     // check TMap(std::initializer_list)
     TMap m7(l);
@@ -177,22 +179,23 @@ void test_deduction_guides() {
 
     // check TMap(std::initializer_list, size_t, Hasher, Equality)
     TMap m10(l, 4, degenerate_hash<int>(), std::less<int>());
-    static_assert(std::is_same<decltype(m10), TMap<int, std::string, degenerate_hash<int>, std::less<int>>>::value);
+    static_assert(
+            std::is_same<decltype(m10), TMap<int, std::string, degenerate_hash<int>, std::less<int>>>::value);
 
     // check TMap(std::initializer_list, size_t, Hasher, Equality, Allocator)
-    TMap m11(l, 4, degenerate_hash<int>(), std::less<int>(), custom_allocator_type{});
-    static_assert(std::is_same<decltype(m11), TMap<int, std::string, degenerate_hash<int>,
-        std::less<int>, custom_allocator_type>>::value);
+    TMap m11(l, 4, degenerate_hash<int>(), std::less<int>(), custom_allocator_type {});
+    static_assert(std::is_same<decltype(m11), TMap<int, std::string, degenerate_hash<int>, std::less<int>,
+                                                   custom_allocator_type>>::value);
 
     // check TMap(std::initializer_list, size_t, Allocator)
-    TMap m12(l, 4, custom_allocator_type{});
-    static_assert(std::is_same<decltype(m12), TMap<int, std::string, std::hash<int>,
-        std::equal_to<int>, custom_allocator_type>>::value);
+    TMap m12(l, 4, custom_allocator_type {});
+    static_assert(std::is_same<decltype(m12), TMap<int, std::string, std::hash<int>, std::equal_to<int>,
+                                                   custom_allocator_type>>::value);
 
     // check TMap(std::initializer_list, size_t, Hasher, Allocator)
-    TMap m13(l, 4, degenerate_hash<int>(), custom_allocator_type{});
-    static_assert(std::is_same<decltype(m13), TMap<int, std::string, degenerate_hash<int>,
-        std::equal_to<int>, custom_allocator_type>>::value);
+    TMap m13(l, 4, degenerate_hash<int>(), custom_allocator_type {});
+    static_assert(std::is_same<decltype(m13), TMap<int, std::string, degenerate_hash<int>, std::equal_to<int>,
+                                                   custom_allocator_type>>::value);
 
     // check TMap(TMap &)
     TMap m14(m1);
@@ -200,7 +203,7 @@ void test_deduction_guides() {
 
     // check TMap(TMap &, Allocator)
     // TODO: investigate why no implicit deduction guides generated for this ctor
-    TMap m15(m5, custom_allocator_type{});
+    TMap m15(m5, custom_allocator_type {});
     static_assert(std::is_same<decltype(m15), decltype(m5)>::value);
 
     // check TMap(TMap &&)
@@ -209,7 +212,7 @@ void test_deduction_guides() {
 
     // check TMap(TMap &&, Allocator)
     // TODO: investigate why no implicit deduction guides generated for this ctor
-    TMap m17(std::move(m5), custom_allocator_type{});
+    TMap m17(std::move(m5), custom_allocator_type {});
     static_assert(std::is_same<decltype(m17), decltype(m5)>::value);
 }
 #endif
@@ -217,29 +220,33 @@ void test_deduction_guides() {
 void test_heterogeneous_functions() {
     check_heterogeneous_functions_key_int<oneapi::tbb::concurrent_unordered_map, int, int>();
     check_heterogeneous_functions_key_int<oneapi::tbb::concurrent_unordered_multimap, int, int>();
-    check_heterogeneous_functions_key_string<oneapi::tbb::concurrent_unordered_map, std::string, std::string>();
-    check_heterogeneous_functions_key_string<oneapi::tbb::concurrent_unordered_multimap, std::string, std::string>();
+    check_heterogeneous_functions_key_string<oneapi::tbb::concurrent_unordered_map, std::string,
+                                             std::string>();
+    check_heterogeneous_functions_key_string<oneapi::tbb::concurrent_unordered_multimap, std::string,
+                                             std::string>();
 }
 
 struct CumapTraits : UnorderedMoveTraitsBase {
     template <typename T, typename Allocator>
-    using container_type = oneapi::tbb::concurrent_unordered_map<T, T, std::hash<T>, std::equal_to<T>, Allocator>;
+    using container_type
+            = oneapi::tbb::concurrent_unordered_map<T, T, std::hash<T>, std::equal_to<T>, Allocator>;
 
     template <typename T>
     using container_value_type = std::pair<const T, T>;
 
     using init_iterator_type = move_support_tests::FooPairIterator;
-}; // struct CumapTraits
+};// struct CumapTraits
 
 struct CumultimapTraits : UnorderedMoveTraitsBase {
     template <typename T, typename Allocator>
-    using container_type = oneapi::tbb::concurrent_unordered_multimap<T, T, std::hash<T>, std::equal_to<T>, Allocator>;
+    using container_type
+            = oneapi::tbb::concurrent_unordered_multimap<T, T, std::hash<T>, std::equal_to<T>, Allocator>;
 
     template <typename T>
     using container_value_type = std::pair<const T, T>;
 
     using init_iterator_type = move_support_tests::FooPairIterator;
-}; // struct CumultimapTraits
+};// struct CumultimapTraits
 
 //! Testing concurrent_unordered_map member types
 //! \brief \ref interface \ref requirement
@@ -249,21 +256,15 @@ TEST_CASE("concurrent_unordered_map member types") {
 
 //! Testing requirements of concurrent_unordered_map
 //! \brief \ref interface \ref requirement
-TEST_CASE("concurrent_unordered_map requirements") {
-    test_basic<map_type>();
-}
+TEST_CASE("concurrent_unordered_map requirements") { test_basic<map_type>(); }
 
 //! Testing multithreading support in concurrent_unordered_map
 //! \brief \ref requirement
-TEST_CASE("concurrent_unordered_map multithreading support") {
-    test_concurrent<map_type>();
-}
+TEST_CASE("concurrent_unordered_map multithreading support") { test_concurrent<map_type>(); }
 
 //! Testing move constructors and assignment operator in concurrent_unordered_map
 //! \brief \ref interface \ref requirement
-TEST_CASE("concurrent_unordered_map move semantics support") {
-    test_rvalue_ref_support<CumapTraits>();
-}
+TEST_CASE("concurrent_unordered_map move semantics support") { test_rvalue_ref_support<CumapTraits>(); }
 
 //! Testing std::initializer_list constructors and modifiers in concurrent_unordered_map
 //! \brief \ref interface \ref requirement
@@ -287,7 +288,8 @@ TEST_CASE("std::allocator_traits support in concurrent_unordered_map") {
 //! \brief \ref interface \ref requirement
 TEST_CASE("heterogeneous overloads in concurrent_unordered_map") {
     check_heterogeneous_functions_key_int<oneapi::tbb::concurrent_unordered_map, int, int>();
-    check_heterogeneous_functions_key_string<oneapi::tbb::concurrent_unordered_map, std::string, std::string>();
+    check_heterogeneous_functions_key_string<oneapi::tbb::concurrent_unordered_map, std::string,
+                                             std::string>();
 }
 
 //! Testing insert overloads with generic pair in concurrent_unordered_map
@@ -318,15 +320,11 @@ TEST_CASE("concurrent_unordered_multimap member types") {
 
 //! Testing requirements of concurrent_unordered_multimap
 //! \brief \ref interface \ref requirement
-TEST_CASE("concurrent_unordered_multimap requirements") {
-    test_basic<multimap_type>();
-}
+TEST_CASE("concurrent_unordered_multimap requirements") { test_basic<multimap_type>(); }
 
 //! Testing multithreading support in concurrent_unordered_multimap
 //! \brief \ref requirement
-TEST_CASE("concurrent_unordered_multimap multithreading support") {
-    test_concurrent<multimap_type>();
-}
+TEST_CASE("concurrent_unordered_multimap multithreading support") { test_concurrent<multimap_type>(); }
 
 //! Testing move constructors and assignment operator in concurrent_unordered_multimap
 //! \brief \ref interface \ref requirement
@@ -356,7 +354,8 @@ TEST_CASE("std::allocator_traits support in concurrent_unordered_multimap") {
 //! \brief \ref interface \ref requirement
 TEST_CASE("heterogeneous overloads in concurrent_unordered_multimap") {
     check_heterogeneous_functions_key_int<oneapi::tbb::concurrent_unordered_multimap, int, int>();
-    check_heterogeneous_functions_key_string<oneapi::tbb::concurrent_unordered_multimap, std::string, std::string>();
+    check_heterogeneous_functions_key_string<oneapi::tbb::concurrent_unordered_multimap, std::string,
+                                             std::string>();
 }
 
 //! Testing insert overloads with generic pair in concurrent_unordered_multimap
@@ -381,6 +380,4 @@ TEST_CASE("concurrent_unordered_multimap comparisons") {
 
 //! Testing of merge operations in concurrent_unordered_map and concurrent_unordered_multimap
 //! \brief \ref interface \ref requirement
-TEST_CASE("merge operations") {
-    node_handling_tests::test_merge<map_type, multimap_type>(1000);
-}
+TEST_CASE("merge operations") { node_handling_tests::test_merge<map_type, multimap_type>(1000); }
diff --git a/external/tbb/test/conformance/conformance_concurrent_unordered_set.cpp b/external/tbb/test/conformance/conformance_concurrent_unordered_set.cpp
index c69c9b2c..c6556547 100644
--- a/external/tbb/test/conformance/conformance_concurrent_unordered_set.cpp
+++ b/external/tbb/test/conformance/conformance_concurrent_unordered_set.cpp
@@ -15,14 +15,13 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
 #endif
 
-
 #include "oneapi/tbb/concurrent_unordered_set.h"
+#include <common/concurrent_unordered_common.h>
 #include <common/test.h>
 #include <common/utils.h>
-#include <common/concurrent_unordered_common.h>
 #include <memory>
 #include <type_traits>
 
@@ -35,8 +34,10 @@ struct AllowMultimapping<oneapi::tbb::concurrent_unordered_multiset<Args...>> :
 template <typename Key>
 using Allocator = LocalCountingAllocator<std::allocator<Key>>;
 
-using set_type = oneapi::tbb::concurrent_unordered_set<int, std::hash<int>, std::equal_to<int>, Allocator<int>>;
-using multiset_type = oneapi::tbb::concurrent_unordered_multiset<int, std::hash<int>, std::equal_to<int>, Allocator<int>>;
+using set_type
+        = oneapi::tbb::concurrent_unordered_set<int, std::hash<int>, std::equal_to<int>, Allocator<int>>;
+using multiset_type
+        = oneapi::tbb::concurrent_unordered_multiset<int, std::hash<int>, std::equal_to<int>, Allocator<int>>;
 
 template <template <typename...> class ContainerType>
 void test_member_types() {
@@ -45,14 +46,16 @@ void test_member_types() {
                   "Incorrect default template hasher");
     static_assert(std::is_same<typename default_container_type::key_equal, std::equal_to<int>>::value,
                   "Incorrect default template key equality");
-    static_assert(std::is_same<typename default_container_type::allocator_type, oneapi::tbb::tbb_allocator<int>>::value,
+    static_assert(std::is_same<typename default_container_type::allocator_type,
+                               oneapi::tbb::tbb_allocator<int>>::value,
                   "Incorrect default template allocator");
 
-    auto test_hasher = [](const int&)->std::size_t { return 0; };
-    auto test_equality = [](const int&, const int&)->bool { return true; };
+    auto test_hasher = [](const int &) -> std::size_t { return 0; };
+    auto test_equality = [](const int &, const int &) -> bool { return true; };
     using test_allocator_type = std::allocator<int>;
 
-    using container_type = ContainerType<int, decltype(test_hasher), decltype(test_equality), test_allocator_type>;
+    using container_type
+            = ContainerType<int, decltype(test_hasher), decltype(test_equality), test_allocator_type>;
 
     static_assert(std::is_same<typename container_type::key_type, int>::value,
                   "Incorrect container key_type member type");
@@ -69,23 +72,26 @@ void test_member_types() {
     static_assert(std::is_same<typename container_type::key_equal, decltype(test_equality)>::value,
                   "Incorrect container key_equal member type");
 
-    using transparent_container_type = ContainerType<int, hasher_with_transparent_key_equal,
-                                                     std::equal_to<int>, test_allocator_type>;
+    using transparent_container_type
+            = ContainerType<int, hasher_with_transparent_key_equal, std::equal_to<int>, test_allocator_type>;
 
-    static_assert(std::is_same<typename transparent_container_type::key_equal, transparent_key_equality>::value,
-                  "Incorrect container key_equal member type");
+    static_assert(
+            std::is_same<typename transparent_container_type::key_equal, transparent_key_equality>::value,
+            "Incorrect container key_equal member type");
     static_assert(std::is_same<typename container_type::allocator_type, test_allocator_type>::value,
                   "Incorrect container allocator_type member type");
 
     using value_type = typename container_type::value_type;
-    static_assert(std::is_same<typename container_type::reference, value_type&>::value,
+    static_assert(std::is_same<typename container_type::reference, value_type &>::value,
                   "Incorrect container reference member type");
-    static_assert(std::is_same<typename container_type::const_reference, const value_type&>::value,
+    static_assert(std::is_same<typename container_type::const_reference, const value_type &>::value,
                   "Incorrect container const_reference member type");
     using allocator_type = typename container_type::allocator_type;
-    static_assert(std::is_same<typename container_type::pointer, typename std::allocator_traits<allocator_type>::pointer>::value,
+    static_assert(std::is_same<typename container_type::pointer,
+                               typename std::allocator_traits<allocator_type>::pointer>::value,
                   "Incorrect container pointer member type");
-    static_assert(std::is_same<typename container_type::const_pointer, typename std::allocator_traits<allocator_type>::const_pointer>::value,
+    static_assert(std::is_same<typename container_type::const_pointer,
+                               typename std::allocator_traits<allocator_type>::const_pointer>::value,
                   "Incorrect container const_pointer member type");
 
     static_assert(utils::is_forward_iterator<typename container_type::iterator>::value,
@@ -108,31 +114,33 @@ void test_member_types() {
 
 struct CusetTraits : UnorderedMoveTraitsBase {
     template <typename T, typename Allocator>
-    using container_type = oneapi::tbb::concurrent_unordered_set<T, std::hash<T>, std::equal_to<T>, Allocator>;
+    using container_type
+            = oneapi::tbb::concurrent_unordered_set<T, std::hash<T>, std::equal_to<T>, Allocator>;
 
     template <typename T>
     using container_value_type = T;
 
     using init_iterator_type = move_support_tests::FooIterator;
-}; // struct CusetTraits
+};// struct CusetTraits
 
 struct CumultisetTraits : UnorderedMoveTraitsBase {
     template <typename T, typename Allocator>
-    using container_type = oneapi::tbb::concurrent_unordered_multiset<T, std::hash<T>, std::equal_to<T>, Allocator>;
+    using container_type
+            = oneapi::tbb::concurrent_unordered_multiset<T, std::hash<T>, std::equal_to<T>, Allocator>;
 
     template <typename T>
     using container_value_type = T;
 
     using init_iterator_type = move_support_tests::FooIterator;
-}; // struct CumultisetTraits
+};// struct CumultisetTraits
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
-template <template <typename ...> typename TSet>
+template <template <typename...> typename TSet>
 void test_deduction_guides() {
     using ComplexType = const std::string *;
     std::vector<ComplexType> v;
     std::string s = "s";
-    auto l = { ComplexType(&s), ComplexType(&s)};
+    auto l = {ComplexType(&s), ComplexType(&s)};
     using custom_allocator_type = std::allocator<ComplexType>;
 
     // check TSet(InputIterator,InputIterator)
@@ -145,24 +153,25 @@ void test_deduction_guides() {
 
     // check TSet(InputIterator,InputIterator, size_t, Hasher, Equality)
     TSet s3(v.begin(), v.end(), 5, degenerate_hash<ComplexType>(), std::less<ComplexType>());
-    static_assert(std::is_same<decltype(s3), TSet<ComplexType, degenerate_hash<ComplexType>,
-        std::less<ComplexType>>>::value);
+    static_assert(
+            std::is_same<decltype(s3),
+                         TSet<ComplexType, degenerate_hash<ComplexType>, std::less<ComplexType>>>::value);
 
     // check TSet(InputIterator,InputIterator, size_t, Hasher, Equality, Allocator)
     TSet s4(v.begin(), v.end(), 5, degenerate_hash<ComplexType>(), std::less<ComplexType>(),
-            custom_allocator_type{});
+            custom_allocator_type {});
     static_assert(std::is_same<decltype(s4), TSet<ComplexType, degenerate_hash<ComplexType>,
-        std::less<ComplexType>, custom_allocator_type>>::value);
+                                                  std::less<ComplexType>, custom_allocator_type>>::value);
 
     // check TSet(InputIterator,InputIterator, size_t, Allocator)
-    TSet s5(v.begin(), v.end(), 5, custom_allocator_type{});
+    TSet s5(v.begin(), v.end(), 5, custom_allocator_type {});
     static_assert(std::is_same<decltype(s5), TSet<ComplexType, std::hash<ComplexType>,
-        std::equal_to<ComplexType>, custom_allocator_type>>::value);
+                                                  std::equal_to<ComplexType>, custom_allocator_type>>::value);
 
     // check TSet(InputIterator,InputIterator, size_t, Hasher, Allocator)
-    TSet s6(v.begin(), v.end(), 5, degenerate_hash<ComplexType>(), custom_allocator_type{});
+    TSet s6(v.begin(), v.end(), 5, degenerate_hash<ComplexType>(), custom_allocator_type {});
     static_assert(std::is_same<decltype(s6), TSet<ComplexType, degenerate_hash<ComplexType>,
-        std::equal_to<ComplexType>, custom_allocator_type>>::value);
+                                                  std::equal_to<ComplexType>, custom_allocator_type>>::value);
 
     // check TSet(std::initializer_list)
     TSet s7(l);
@@ -174,30 +183,33 @@ void test_deduction_guides() {
 
     // check TSet(std::initializer_list, size_t, Hasher, Equality)
     TSet s9(l, 5, degenerate_hash<ComplexType>(), std::less<ComplexType>());
-    static_assert(std::is_same<decltype(s9), TSet<ComplexType, degenerate_hash<ComplexType>,
-        std::less<ComplexType>>>::value);
+    static_assert(
+            std::is_same<decltype(s9),
+                         TSet<ComplexType, degenerate_hash<ComplexType>, std::less<ComplexType>>>::value);
 
     // check TSet(std::initializer_list, size_t, Hasher, Equality, Allocator)
-    TSet s10(l, 5, degenerate_hash<ComplexType>(), std::less<ComplexType>(), custom_allocator_type{});
+    TSet s10(l, 5, degenerate_hash<ComplexType>(), std::less<ComplexType>(), custom_allocator_type {});
     static_assert(std::is_same<decltype(s10), TSet<ComplexType, degenerate_hash<ComplexType>,
-        std::less<ComplexType>, custom_allocator_type>>::value);
+                                                   std::less<ComplexType>, custom_allocator_type>>::value);
 
     // check TSet(std::initializer_list, size_t, Allocator)
-    TSet s11(l, 5, custom_allocator_type{});
-    static_assert(std::is_same<decltype(s11), TSet<ComplexType, std::hash<ComplexType>,
-        std::equal_to<ComplexType>, custom_allocator_type>>::value);
+    TSet s11(l, 5, custom_allocator_type {});
+    static_assert(
+            std::is_same<decltype(s11), TSet<ComplexType, std::hash<ComplexType>, std::equal_to<ComplexType>,
+                                             custom_allocator_type>>::value);
 
     // check TSet(std::initializer_list, size_t, Hasher, Allocator)
-    TSet s12(l, 5, std::hash<ComplexType>(), custom_allocator_type{});
-    static_assert(std::is_same<decltype(s12), TSet<ComplexType, std::hash<ComplexType>,
-        std::equal_to<ComplexType>, custom_allocator_type>>::value);
+    TSet s12(l, 5, std::hash<ComplexType>(), custom_allocator_type {});
+    static_assert(
+            std::is_same<decltype(s12), TSet<ComplexType, std::hash<ComplexType>, std::equal_to<ComplexType>,
+                                             custom_allocator_type>>::value);
 
     // check TSet(TSet &)
     TSet s13(s1);
     static_assert(std::is_same<decltype(s13), decltype(s1)>::value);
 
     // check TSet(TSet &, Allocator)
-    TSet s14(s5, custom_allocator_type{});
+    TSet s14(s5, custom_allocator_type {});
     // TODO: investigate why no implicit deduction guides generated for this ctor
     static_assert(std::is_same<decltype(s14), decltype(s5)>::value);
 
@@ -206,11 +218,11 @@ void test_deduction_guides() {
     static_assert(std::is_same<decltype(s15), decltype(s1)>::value);
 
     // check TSet(TSet &&, Allocator)
-    TSet s16(std::move(s5), custom_allocator_type{});
+    TSet s16(std::move(s5), custom_allocator_type {});
     // TODO: investigate why no implicit deduction guides generated for this ctor
     static_assert(std::is_same<decltype(s16), decltype(s5)>::value);
 }
-#endif // __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
+#endif// __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 
 //! Testing concurrent_unordered_set member types
 //! \brief \ref interface \ref requirement
@@ -220,21 +232,15 @@ TEST_CASE("concurrent_unordered_set member types") {
 
 //! Testing requirements of concurrent_unordered_set
 //! \brief \ref interface \ref requirement
-TEST_CASE("concurrent_unordered_set requirements") {
-    test_basic<set_type>();
-}
+TEST_CASE("concurrent_unordered_set requirements") { test_basic<set_type>(); }
 
 //! Testing multithreading support in concurrent_unordered_set
 //! \brief \ref requirement
-TEST_CASE("concurrent_unordered_set multithreading support") {
-    test_concurrent<set_type>();
-}
+TEST_CASE("concurrent_unordered_set multithreading support") { test_concurrent<set_type>(); }
 
 //! Testing move constructors and assignment operator in concurrent_unordered_set
 //! \brief \ref interface \ref requirement
-TEST_CASE("concurrent_unordered_set move semantics support") {
-    test_rvalue_ref_support<CusetTraits>();
-}
+TEST_CASE("concurrent_unordered_set move semantics support") { test_rvalue_ref_support<CusetTraits>(); }
 
 //! Testing std::initializer_list constructors and modifiers in concurrent_unordered_set
 //! \brief \ref interface \ref requirement
@@ -283,15 +289,11 @@ TEST_CASE("concurrent_unordered_multiset member types") {
 
 //! Testing requirements of concurrent_unordered_multiset
 //! \brief \ref interface \ref requirement
-TEST_CASE("concurrent_unordered_multiset requirements") {
-    test_basic<multiset_type>();
-}
+TEST_CASE("concurrent_unordered_multiset requirements") { test_basic<multiset_type>(); }
 
 //! Testing move constructors and assignment operator in concurrent_unordered_multiset
 //! \brief \ref requirement
-TEST_CASE("concurrent_unordered_multiset multithreading support") {
-    test_concurrent<multiset_type>();
-}
+TEST_CASE("concurrent_unordered_multiset multithreading support") { test_concurrent<multiset_type>(); }
 
 //! Testing move constructors and assignment operator in concurrent_unordered_multiset
 //! \brief \ref interface \ref requirement
@@ -340,6 +342,4 @@ TEST_CASE("concurrent_unordered_multiset comparisons") {
 
 //! Testing of merge operation in concurrent_unordered_set and concurrent_unordered_multiset
 //! \brief \ref interface \ref requirement
-TEST_CASE("merge operations") {
-    node_handling_tests::test_merge<set_type, multiset_type>(1000);
-}
+TEST_CASE("merge operations") { node_handling_tests::test_merge<set_type, multiset_type>(1000); }
diff --git a/external/tbb/test/conformance/conformance_concurrent_vector.cpp b/external/tbb/test/conformance/conformance_concurrent_vector.cpp
index 8bc67a60..7be7c7ae 100644
--- a/external/tbb/test/conformance/conformance_concurrent_vector.cpp
+++ b/external/tbb/test/conformance/conformance_concurrent_vector.cpp
@@ -14,20 +14,20 @@
     limitations under the License.
 */
 
-#include "common/test.h"
-#include "common/utils.h"
-#include "common/utils_report.h"
-#include "common/state_trackable.h"
 #include "common/container_move_support.h"
+#include "common/containers_common.h"
 #include "common/custom_allocators.h"
 #include "common/initializer_list_support.h"
-#include "common/containers_common.h"
-#define __TBB_TEST_CPP20_COMPARISONS __TBB_CPP20_COMPARISONS_PRESENT && __TBB_CPP20_CONCEPTS_PRESENT
+#include "common/state_trackable.h"
+#include "common/test.h"
+#include "common/utils.h"
+#include "common/utils_report.h"
+#define __TBB_TEST_CPP20_COMPARISONS __TBB_CPP20_COMPARISONS_PRESENT&& __TBB_CPP20_CONCEPTS_PRESENT
 #include "common/test_comparisons.h"
 #include "oneapi/tbb/concurrent_vector.h"
+#include "oneapi/tbb/global_control.h"
 #include "oneapi/tbb/parallel_for.h"
 #include "oneapi/tbb/tick_count.h"
-#include "oneapi/tbb/global_control.h"
 #include <initializer_list>
 #include <numeric>
 
@@ -36,34 +36,34 @@
 
 const size_t N = 8192;
 
-template<typename Vector, typename Iterator>
-void CheckConstIterator( const Vector& u, int i, const Iterator& cp ) {
+template <typename Vector, typename Iterator>
+void CheckConstIterator(const Vector& u, int i, const Iterator& cp) {
     typename Vector::const_reference pref = *cp;
-    CHECK((pref.bar()==i));
-    typename Vector::difference_type delta = cp-u.begin();
-    REQUIRE( delta==i );
-    CHECK((u[i].bar()==i));
-    REQUIRE( u.begin()[i].bar()==i );
+    CHECK((pref.bar() == i));
+    typename Vector::difference_type delta = cp - u.begin();
+    REQUIRE(delta == i);
+    CHECK((u[i].bar() == i));
+    REQUIRE(u.begin()[i].bar() == i);
 }
 
-template<typename Iterator1, typename Iterator2, typename V>
-void CheckIteratorComparison( V& u ) {
+template <typename Iterator1, typename Iterator2, typename V>
+void CheckIteratorComparison(V& u) {
     V u2 = u;
     Iterator1 i = u.begin();
 
-    for( int i_count=0; i_count<100; ++i_count ) {
+    for (int i_count = 0; i_count < 100; ++i_count) {
         Iterator2 j = u.begin();
         Iterator2 i2 = u2.begin();
-        for( int j_count=0; j_count<100; ++j_count ) {
-            REQUIRE( ((i==j)==(i_count==j_count)) );
-            REQUIRE( ((i!=j)==(i_count!=j_count)) );
-            REQUIRE( ((i-j)==(i_count-j_count)) );
-            REQUIRE( ((i<j)==(i_count<j_count)) );
-            REQUIRE( ((i>j)==(i_count>j_count)) );
-            REQUIRE( ((i<=j)==(i_count<=j_count)) );
-            REQUIRE( ((i>=j)==(i_count>=j_count)) );
-            REQUIRE( (!(i==i2)) );
-            REQUIRE( i!=i2 );
+        for (int j_count = 0; j_count < 100; ++j_count) {
+            REQUIRE(((i == j) == (i_count == j_count)));
+            REQUIRE(((i != j) == (i_count != j_count)));
+            REQUIRE(((i - j) == (i_count - j_count)));
+            REQUIRE(((i < j) == (i_count < j_count)));
+            REQUIRE(((i > j) == (i_count > j_count)));
+            REQUIRE(((i <= j) == (i_count <= j_count)));
+            REQUIRE(((i >= j) == (i_count >= j_count)));
+            REQUIRE((!(i == i2)));
+            REQUIRE(i != i2);
             ++j;
             ++i2;
         }
@@ -71,23 +71,24 @@ void CheckIteratorComparison( V& u ) {
     }
 }
 
-template<typename Iterator1, typename Iterator2>
-void TestIteratorAssignment( Iterator2 j ) {
+template <typename Iterator1, typename Iterator2>
+void TestIteratorAssignment(Iterator2 j) {
     Iterator1 i(j);
-    REQUIRE( i==j );
-    REQUIRE( !(i!=j) );
+    REQUIRE(i == j);
+    REQUIRE(!(i != j));
     Iterator1 k;
     k = j;
-    REQUIRE( k==j );
-    REQUIRE( !(k!=j) );
+    REQUIRE(k == j);
+    REQUIRE(!(k != j));
 }
 
-template<typename Range1, typename Range2>
-void TestRangeAssignment( Range2 r2 ) {
-    Range1 r1(r2); r1 = r2;
+template <typename Range1, typename Range2>
+void TestRangeAssignment(Range2 r2) {
+    Range1 r1(r2);
+    r1 = r2;
 }
 
-template<typename T>
+template <typename T>
 void TestSequentialFor() {
     using V = oneapi::tbb::concurrent_vector<move_support_tests::FooWithAssign>;
     V v(N);
@@ -95,78 +96,78 @@ void TestSequentialFor() {
 
     // Check iterator
     typename V::iterator p = v.begin();
-    REQUIRE( !(*p).is_const() );
-    REQUIRE( !p->is_const() );
-    for( int i=0; std::size_t(i)<v.size(); ++i, ++p ) {
-        CHECK( ((*p).state==move_support_tests::Foo::DefaultInitialized) );
+    REQUIRE(!(*p).is_const());
+    REQUIRE(!p->is_const());
+    for (int i = 0; std::size_t(i) < v.size(); ++i, ++p) {
+        CHECK(((*p).state == move_support_tests::Foo::DefaultInitialized));
         typename V::reference pref = *p;
         pref.bar() = i;
-        typename V::difference_type delta = p-v.begin();
-        REQUIRE( delta==i );
-        REQUIRE_MESSAGE( (-delta<=0), "difference type not signed?" );
+        typename V::difference_type delta = p - v.begin();
+        REQUIRE(delta == i);
+        REQUIRE_MESSAGE((-delta <= 0), "difference type not signed?");
     }
 
     // Check const_iterator going forwards
     const V& u = v;
     typename V::const_iterator cp = u.begin();
-    REQUIRE( cp == v.cbegin() );
-    REQUIRE( (*cp).is_const() );
-    REQUIRE( (cp->is_const()) );
-    REQUIRE( (*cp == v.front()) );
-    for( int i=0; std::size_t(i)<u.size(); ++i ) {
-        CheckConstIterator(u,i,cp);
-        V::const_iterator &cpr = ++cp;
-        REQUIRE_MESSAGE( (&cpr == &cp), "pre-increment not returning a reference?");
+    REQUIRE(cp == v.cbegin());
+    REQUIRE((*cp).is_const());
+    REQUIRE((cp->is_const()));
+    REQUIRE((*cp == v.front()));
+    for (int i = 0; std::size_t(i) < u.size(); ++i) {
+        CheckConstIterator(u, i, cp);
+        V::const_iterator& cpr = ++cp;
+        REQUIRE_MESSAGE((&cpr == &cp), "pre-increment not returning a reference?");
     }
 
     // Now go backwards
     cp = u.end();
-    REQUIRE( cp == v.cend() );
-    for( int i=int(u.size()); i>0; ) {
+    REQUIRE(cp == v.cend());
+    for (int i = int(u.size()); i > 0;) {
         --i;
-        V::const_iterator &cpr = --cp;
-        REQUIRE_MESSAGE( &cpr == &cp, "pre-decrement not returning a reference?");
-        if( i>0 ) {
+        V::const_iterator& cpr = --cp;
+        REQUIRE_MESSAGE(&cpr == &cp, "pre-decrement not returning a reference?");
+        if (i > 0) {
             typename V::const_iterator cp_old = cp--;
             intptr_t here = (*cp_old).bar();
-            REQUIRE( here==u[i].bar() );
+            REQUIRE(here == u[i].bar());
             typename V::const_iterator cp_new = cp++;
             intptr_t prev = (*cp_new).bar();
-            REQUIRE( prev==u[i-1].bar() );
+            REQUIRE(prev == u[i - 1].bar());
         }
-        CheckConstIterator(u,i,cp);
+        CheckConstIterator(u, i, cp);
     }
 
     // Now go forwards and backwards
     std::ptrdiff_t k = 0;
     cp = u.begin();
-    for( std::size_t i=0; i<u.size(); ++i ) {
-        CheckConstIterator(u,int(k),cp);
-        typename V::difference_type delta = i*3 % u.size();
-        if( 0<=k+delta && std::size_t(k+delta)<u.size() ) {
-            V::const_iterator &cpr = (cp += delta);
-            REQUIRE_MESSAGE( (&cpr == &cp), "+= not returning a reference?");
+    for (std::size_t i = 0; i < u.size(); ++i) {
+        CheckConstIterator(u, int(k), cp);
+        typename V::difference_type delta = i * 3 % u.size();
+        if (0 <= k + delta && std::size_t(k + delta) < u.size()) {
+            V::const_iterator& cpr = (cp += delta);
+            REQUIRE_MESSAGE((&cpr == &cp), "+= not returning a reference?");
             k += delta;
         }
-        delta = i*7 % u.size();
-        if( 0<=k-delta && std::size_t(k-delta)<u.size() ) {
-            if( i&1 ) {
-                V::const_iterator &cpr = (cp -= delta);
-                REQUIRE_MESSAGE( (&cpr == &cp), "-= not returning a reference?");
+        delta = i * 7 % u.size();
+        if (0 <= k - delta && std::size_t(k - delta) < u.size()) {
+            if (i & 1) {
+                V::const_iterator& cpr = (cp -= delta);
+                REQUIRE_MESSAGE((&cpr == &cp), "-= not returning a reference?");
             } else
-                cp = cp - delta;        // Test operator-
+                cp = cp - delta;// Test operator-
             k -= delta;
         }
     }
 
-    for( int i=0; std::size_t(i)<u.size(); i=(i<50?i+1:i*3) )
-        for( int j=-i; std::size_t(i+j)<u.size(); j=(j<50?j+1:j*5) ) {
-            REQUIRE( ((u.begin()+i)[j].bar()==i+j) );
-            REQUIRE( ((v.begin()+i)[j].bar()==i+j) );
-            REQUIRE( ((v.cbegin()+i)[j].bar()==i+j) );
-            REQUIRE( ((i+u.begin())[j].bar()==i+j) );
-            REQUIRE( ((i+v.begin())[j].bar()==i+j) );
-            REQUIRE(((i+v.cbegin())[j].bar()==i+j) );
+    for (int i = 0; std::size_t(i) < u.size(); i = (i < 50 ? i + 1 : i * 3))
+        for (int j = -i; std::size_t(i + j) < u.size(); j = (j < 50 ? j + 1 : j * 5)) {
+            REQUIRE(((u.begin() + i)[j].bar() == i + j));
+            REQUIRE(((v.begin() + i)[j].bar() == i + j));
+            REQUIRE(((v.cbegin() + i)[j].bar() == i + j));
+            REQUIRE(((i + u.begin())[j].bar() == i + j));
+            REQUIRE(((i + v.begin())[j].bar() == i + j));
+            REQUIRE(((i + v.cbegin())[j].bar() == i + j));
         }
 
     CheckIteratorComparison<typename V::iterator, typename V::iterator>(v);
@@ -174,40 +175,40 @@ void TestSequentialFor() {
     CheckIteratorComparison<typename V::const_iterator, typename V::iterator>(v);
     CheckIteratorComparison<typename V::const_iterator, typename V::const_iterator>(v);
 
-    TestIteratorAssignment<typename V::const_iterator>( u.begin() );
-    TestIteratorAssignment<typename V::const_iterator>( v.begin() );
-    TestIteratorAssignment<typename V::const_iterator>( v.cbegin() );
-    TestIteratorAssignment<typename V::iterator>( v.begin() );
+    TestIteratorAssignment<typename V::const_iterator>(u.begin());
+    TestIteratorAssignment<typename V::const_iterator>(v.begin());
+    TestIteratorAssignment<typename V::const_iterator>(v.cbegin());
+    TestIteratorAssignment<typename V::iterator>(v.begin());
     // doesn't compile as expected: TestIteratorAssignment<typename V::iterator>( u.begin() );
 
-    TestRangeAssignment<typename V::const_range_type>( u.range() );
-    TestRangeAssignment<typename V::const_range_type>( v.range() );
-    TestRangeAssignment<typename V::range_type>( v.range() );
+    TestRangeAssignment<typename V::const_range_type>(u.range());
+    TestRangeAssignment<typename V::const_range_type>(v.range());
+    TestRangeAssignment<typename V::range_type>(v.range());
     // doesn't compile as expected: TestRangeAssignment<typename V::range_type>( u.range() );
 
     // Check reverse_iterator
     typename V::reverse_iterator rp = v.rbegin();
-    for( std::size_t i=v.size(); i>0; --i, ++rp ) {
+    for (std::size_t i = v.size(); i > 0; --i, ++rp) {
         typename V::reference pref = *rp;
-        REQUIRE( (std::size_t(pref.bar())==i-1) );
-        REQUIRE( (rp!=v.rend()) );
+        REQUIRE((std::size_t(pref.bar()) == i - 1));
+        REQUIRE((rp != v.rend()));
     }
-    REQUIRE( rp==v.rend() );
+    REQUIRE(rp == v.rend());
 
     // Check const_reverse_iterator
     typename V::const_reverse_iterator crp = u.rbegin();
-    REQUIRE( crp == v.crbegin() );
-    REQUIRE( *crp == v.back() );
-    for(std::size_t i = v.size(); i>0; --i, ++crp) {
+    REQUIRE(crp == v.crbegin());
+    REQUIRE(*crp == v.back());
+    for (std::size_t i = v.size(); i > 0; --i, ++crp) {
         typename V::const_reference cpref = *crp;
-        REQUIRE( (std::size_t(cpref.bar())==i-1) );
-        REQUIRE( crp!=u.rend() );
+        REQUIRE((std::size_t(cpref.bar()) == i - 1));
+        REQUIRE(crp != u.rend());
     }
-    REQUIRE( crp == u.rend() );
-    REQUIRE( crp == v.crend() );
+    REQUIRE(crp == u.rend());
+    REQUIRE(crp == v.crend());
 
-    TestIteratorAssignment<typename V::const_reverse_iterator>( u.rbegin() );
-    TestIteratorAssignment<typename V::reverse_iterator>( v.rbegin() );
+    TestIteratorAssignment<typename V::const_reverse_iterator>(u.rbegin());
+    TestIteratorAssignment<typename V::reverse_iterator>(v.rbegin());
 
     {
         oneapi::tbb::concurrent_vector<int> v1, v2(1ul, 100);
@@ -217,167 +218,165 @@ void TestSequentialFor() {
     }
 }
 
-inline void NextSize( int& s ) {
-    if( s<=32 ) ++s;
-    else s += s/10;
+inline void NextSize(int& s) {
+    if (s <= 32) ++s;
+    else
+        s += s / 10;
 }
 
-
-template<typename T, std::size_t N>
-inline T* end( T(& array)[N]) {
-    return array + utils::array_length(array) ;
+template <typename T, std::size_t N>
+inline T* end(T (&array)[N]) {
+    return array + utils::array_length(array);
 }
 
-template<typename vector_t>
-static void CheckVector( const vector_t& cv, std::size_t expected_size, std::size_t /*old_size*/ ) {
-    REQUIRE( cv.capacity()>=expected_size );
-    REQUIRE( cv.size()==expected_size );
-    REQUIRE( cv.empty()==(expected_size==0) );
-    for( int j=0; j<int(expected_size); ++j ) {
-        CHECK((cv[j].bar()==~j));
-    }
+template <typename vector_t>
+static void CheckVector(const vector_t& cv, std::size_t expected_size, std::size_t /*old_size*/) {
+    REQUIRE(cv.capacity() >= expected_size);
+    REQUIRE(cv.size() == expected_size);
+    REQUIRE(cv.empty() == (expected_size == 0));
+    for (int j = 0; j < int(expected_size); ++j) { CHECK((cv[j].bar() == ~j)); }
 }
 
 void TestResizeAndCopy() {
     using allocator_t = StaticSharedCountingAllocator<std::allocator<move_support_tests::Foo>>;
     using vector_t = oneapi::tbb::concurrent_vector<move_support_tests::Foo, allocator_t>;
     allocator_t::init_counters();
-    for( int old_size=0; old_size<=0; NextSize( old_size ) ) {
-        for( int new_size=0; new_size<=8; NextSize( new_size ) ) {
+    for (int old_size = 0; old_size <= 0; NextSize(old_size)) {
+        for (int new_size = 0; new_size <= 8; NextSize(new_size)) {
             std::size_t count = move_support_tests::foo_count;
 
             vector_t v;
-            REQUIRE( count==move_support_tests::foo_count );
-            v.assign(old_size/2, move_support_tests::Foo() );
-            REQUIRE( ((count+old_size/2) == move_support_tests::foo_count) );
-            for( int j=0; j<old_size/2; ++j ){
-                REQUIRE( v[j].state == move_support_tests::Foo::CopyInitialized);
+            REQUIRE(count == move_support_tests::foo_count);
+            v.assign(old_size / 2, move_support_tests::Foo());
+            REQUIRE(((count + old_size / 2) == move_support_tests::foo_count));
+            for (int j = 0; j < old_size / 2; ++j) {
+                REQUIRE(v[j].state == move_support_tests::Foo::CopyInitialized);
             }
 
             v.assign(move_support_tests::FooIterator(0), move_support_tests::FooIterator(old_size));
-            v.resize(new_size, move_support_tests::Foo(33) );
-            REQUIRE(count+new_size==move_support_tests::foo_count);
-            for( int j=0; j<new_size; ++j ) {
-                int expected = j<old_size ? j : 33;
-                CHECK((v[j].bar()==expected));
-            }
-            REQUIRE( v.size()==std::size_t(new_size) );
-            for( int j=0; j<new_size; ++j ) {
-                v[j].bar() = ~j;
+            v.resize(new_size, move_support_tests::Foo(33));
+            REQUIRE(count + new_size == move_support_tests::foo_count);
+            for (int j = 0; j < new_size; ++j) {
+                int expected = j < old_size ? j : 33;
+                CHECK((v[j].bar() == expected));
             }
+            REQUIRE(v.size() == std::size_t(new_size));
+            for (int j = 0; j < new_size; ++j) { v[j].bar() = ~j; }
 
             const vector_t& cv = v;
             // Try copy constructor
             vector_t copy_of_v(cv);
-            CheckVector(cv,new_size,old_size);
+            CheckVector(cv, new_size, old_size);
 
-            REQUIRE( !(v != copy_of_v) );
+            REQUIRE(!(v != copy_of_v));
             v.clear();
 
-            REQUIRE( v.empty() );
+            REQUIRE(v.empty());
             swap(v, copy_of_v);
-            REQUIRE( copy_of_v.empty() );
-            CheckVector(v,new_size,old_size);
+            REQUIRE(copy_of_v.empty());
+            CheckVector(v, new_size, old_size);
         }
     }
-    REQUIRE( allocator_t::items_constructed == allocator_t::items_destroyed );
-    REQUIRE( allocator_t::items_allocated == allocator_t::items_freed );
-    REQUIRE( allocator_t::allocations == allocator_t::frees );
+    REQUIRE(allocator_t::items_constructed == allocator_t::items_destroyed);
+    REQUIRE(allocator_t::items_allocated == allocator_t::items_freed);
+    REQUIRE(allocator_t::allocations == allocator_t::frees);
 }
 
-
 void TestCopyAssignment() {
     using allocator_t = StaticCountingAllocator<std::allocator<move_support_tests::FooWithAssign>>;
     using vector_t = oneapi::tbb::concurrent_vector<move_support_tests::FooWithAssign, allocator_t>;
     StaticCountingAllocator<std::allocator<move_support_tests::FooWithAssign>> init_alloc;
-    for( int dst_size=1; dst_size<=128; NextSize( dst_size ) ) {
-        for( int src_size=2; src_size<=128; NextSize( src_size ) ) {
-            vector_t u(move_support_tests::FooIterator(0), move_support_tests::FooIterator(src_size), init_alloc);
-            for( int i=0; i<src_size; ++i )
-                REQUIRE( u[i].bar()==i );
+    for (int dst_size = 1; dst_size <= 128; NextSize(dst_size)) {
+        for (int src_size = 2; src_size <= 128; NextSize(src_size)) {
+            vector_t u(move_support_tests::FooIterator(0), move_support_tests::FooIterator(src_size),
+                       init_alloc);
+            for (int i = 0; i < src_size; ++i) REQUIRE(u[i].bar() == i);
             vector_t v(dst_size, move_support_tests::FooWithAssign(), init_alloc);
-            for( int i=0; i<dst_size; ++i ) {
-                REQUIRE( v[i].state==move_support_tests::Foo::CopyInitialized );
+            for (int i = 0; i < dst_size; ++i) {
+                REQUIRE(v[i].state == move_support_tests::Foo::CopyInitialized);
                 v[i].bar() = ~i;
             }
-            REQUIRE( v != u );
+            REQUIRE(v != u);
             v.swap(u);
             CheckVector(u, dst_size, src_size);
             u.swap(v);
             // using assignment
             v = u;
-            REQUIRE( v == u );
+            REQUIRE(v == u);
             u.clear();
-            REQUIRE( u.size()==0 );
-            REQUIRE( v.size()==std::size_t(src_size) );
-            for( int i=0; i<src_size; ++i ){
-                REQUIRE( v[i].bar()==i );
-            }
-            u.shrink_to_fit(); // deallocate unused memory
+            REQUIRE(u.size() == 0);
+            REQUIRE(v.size() == std::size_t(src_size));
+            for (int i = 0; i < src_size; ++i) { REQUIRE(v[i].bar() == i); }
+            u.shrink_to_fit();// deallocate unused memory
         }
     }
-    REQUIRE( allocator_t::items_allocated == allocator_t::items_freed );
-    REQUIRE( allocator_t::allocations == allocator_t::frees );
+    REQUIRE(allocator_t::items_allocated == allocator_t::items_freed);
+    REQUIRE(allocator_t::allocations == allocator_t::frees);
 }
 
-template<typename Vector, typename T>
-void TestGrowToAtLeastWithSourceParameter(T const& src){
+template <typename Vector, typename T>
+void TestGrowToAtLeastWithSourceParameter(T const& src) {
     static const std::size_t vector_size = 10;
-    Vector v1(vector_size,src);
+    Vector v1(vector_size, src);
     Vector v2;
-    v2.grow_to_at_least(vector_size,src);
-    REQUIRE_MESSAGE(v1==v2,"grow_to_at_least(vector_size,src) did not properly initialize new elements ?");
+    v2.grow_to_at_least(vector_size, src);
+    REQUIRE_MESSAGE(v1 == v2, "grow_to_at_least(vector_size,src) did not properly initialize new elements ?");
 }
 
 void TestCapacity() {
-    using allocator_t = StaticCountingAllocator<std::allocator<move_support_tests::Foo> /*TODO: oneapi::tbb::cache_aligned_allocator*/>;
+    using allocator_t = StaticCountingAllocator<
+            std::allocator<move_support_tests::Foo> /*TODO: oneapi::tbb::cache_aligned_allocator*/>;
     using vector_t = oneapi::tbb::concurrent_vector<move_support_tests::Foo, allocator_t>;
     allocator_t::init_counters();
-    for( std::size_t old_size=0; old_size<=11000; old_size=(old_size<5 ? old_size+1 : 3*old_size) ) {
-        for( std::size_t new_size=0; new_size<=11000; new_size=(new_size<5 ? new_size+1 : 3*new_size) ) {
+    for (std::size_t old_size = 0; old_size <= 11000;
+         old_size = (old_size < 5 ? old_size + 1 : 3 * old_size)) {
+        for (std::size_t new_size = 0; new_size <= 11000;
+             new_size = (new_size < 5 ? new_size + 1 : 3 * new_size)) {
             std::size_t count = move_support_tests::foo_count;
             {
-                vector_t v; v.reserve(old_size);
-                REQUIRE( v.capacity()>=old_size );
-                v.reserve( new_size );
-                REQUIRE( v.capacity()>=old_size );
-                REQUIRE( v.capacity()>=new_size );
-                REQUIRE( v.empty() );
-                std::size_t fill_size = 2*new_size;
-                for (std::size_t i=0; i<fill_size; ++i) {
-                    REQUIRE( std::size_t(move_support_tests::foo_count)==count+i );
+                vector_t v;
+                v.reserve(old_size);
+                REQUIRE(v.capacity() >= old_size);
+                v.reserve(new_size);
+                REQUIRE(v.capacity() >= old_size);
+                REQUIRE(v.capacity() >= new_size);
+                REQUIRE(v.empty());
+                std::size_t fill_size = 2 * new_size;
+                for (std::size_t i = 0; i < fill_size; ++i) {
+                    REQUIRE(std::size_t(move_support_tests::foo_count) == count + i);
                     std::size_t j = v.grow_by(1) - v.begin();
-                    REQUIRE( j==i );
+                    REQUIRE(j == i);
                     v[j].bar() = int(~j);
                 }
-                vector_t copy_of_v(v); // should allocate first segment with same size as for shrink_to_fit()
-                if(oneapi::tbb::detail::log2(/*reserved size*/old_size|1) > oneapi::tbb::detail::log2(fill_size|1) ){
-                   REQUIRE( v.capacity() != copy_of_v.capacity() );
+                vector_t copy_of_v(v);// should allocate first segment with same size as for shrink_to_fit()
+                if (oneapi::tbb::detail::log2(/*reserved size*/ old_size | 1)
+                    > oneapi::tbb::detail::log2(fill_size | 1)) {
+                    REQUIRE(v.capacity() != copy_of_v.capacity());
                 }
                 v.shrink_to_fit();
-                REQUIRE( v.capacity() == copy_of_v.capacity() );
-                CheckVector(v, new_size*2, old_size); // check vector correctness
-                REQUIRE( v==copy_of_v ); // TODO: check also segments layout equality
+                REQUIRE(v.capacity() == copy_of_v.capacity());
+                CheckVector(v, new_size * 2, old_size);// check vector correctness
+                REQUIRE(v == copy_of_v);               // TODO: check also segments layout equality
             }
-            REQUIRE( move_support_tests::foo_count==count );
+            REQUIRE(move_support_tests::foo_count == count);
         }
     }
-    REQUIRE( allocator_t::items_allocated == allocator_t::items_freed );
-    REQUIRE( allocator_t::allocations == allocator_t::frees );
+    REQUIRE(allocator_t::items_allocated == allocator_t::items_freed);
+    REQUIRE(allocator_t::allocations == allocator_t::frees);
 }
 
-template<typename c_vector>
-std::size_t get_early_size(c_vector & v){
-      return v.grow_by(0) - v.begin();
+template <typename c_vector>
+std::size_t get_early_size(c_vector& v) {
+    return v.grow_by(0) - v.begin();
 }
 
-void verify_c_vector_size(std::size_t size, std::size_t capacity, std::size_t early_size){
-    REQUIRE( size <= capacity );
-    REQUIRE( early_size >= size );
+void verify_c_vector_size(std::size_t size, std::size_t capacity, std::size_t early_size) {
+    REQUIRE(size <= capacity);
+    REQUIRE(early_size >= size);
 }
 
-template<typename c_vector_t>
-void verify_c_vector_size(c_vector_t & c_v){
+template <typename c_vector_t>
+void verify_c_vector_size(c_vector_t& c_v) {
     verify_c_vector_size(c_v.size(), c_v.capacity(), get_early_size(c_v));
 }
 
@@ -388,139 +387,147 @@ void TestExceptions() {
 
     enum methods {
         zero_method = 0,
-        ctor_copy, ctor_size, assign_nt, assign_ir, reserve, compact,
+        ctor_copy,
+        ctor_size,
+        assign_nt,
+        assign_ir,
+        reserve,
+        compact,
         all_methods
     };
-    REQUIRE( !move_support_tests::foo_count );
+    REQUIRE(!move_support_tests::foo_count);
 
     try {
-        vector_t src(move_support_tests::FooIterator(0), move_support_tests::FooIterator(N)); // original data
-
-        for(int t = 0; t < 2; ++t) // exception type
-        for(int m = zero_method+1; m < all_methods; ++m)
-        {
-            move_support_tests::track_foo_count<__LINE__> check_all_foo_destroyed_on_exit{};
-            move_support_tests::track_allocator_memory<allocator_t> verify_no_leak_at_exit{};
-            allocator_t::init_counters();
-            if(t) move_support_tests::max_foo_count = move_support_tests::foo_count + N/4;
-            else allocator_t::set_limits(N/4);
-            vector_t victim;
-            try {
-                switch(m) {
-                case ctor_copy: {
-                        vector_t acopy(src);
-                    } break; // auto destruction after exception is checked by ~Foo
-                case ctor_size: {
-                        vector_t sized(N);
-                    } break; // auto destruction after exception is checked by ~Foo
-                // Do not test assignment constructor due to reusing of same methods as below
-                case assign_nt: {
-                        victim.assign(N, move_support_tests::FooWithAssign());
-                    } break;
-                case assign_ir: {
-                        victim.assign(move_support_tests::FooIterator(0), move_support_tests::FooIterator(N));
-                    } break;
-                case reserve: {
-                        try {
-                            victim.reserve(victim.max_size()+1);
-                        } catch(std::length_error &) {
-                        } catch(...) {
-                            INFO("ERROR: unrecognized exception - known compiler issue\n");
-                        }
-                        victim.reserve(N);
-                    } break;
-                case compact: {
-                        if(t) move_support_tests::max_foo_count = 0; else allocator_t::set_limits(); // reset limits
-                        victim.reserve(2);
-                        victim = src; // fragmented assignment
-                        if(t) {
-                            move_support_tests::max_foo_count = move_support_tests::foo_count + 10;
-                        }
-                        else {
-                            allocator_t::set_limits(1); // block any allocation
-                        }
-                        victim.shrink_to_fit(); // should start defragmenting first segment
-                    } break;
-                default:;
-                }
-                if(!t || m != reserve) REQUIRE_MESSAGE(false, "should throw an exception");
-            } catch(std::bad_alloc &e) {
-                allocator_t::set_limits(); move_support_tests::max_foo_count = 0;
-                std::size_t capacity = victim.capacity();
-                std::size_t size = victim.size();
-
-                std::size_t req_size = get_early_size(victim);
-
-                verify_c_vector_size(size, capacity, req_size);
-
-                switch(m) {
-                case reserve:
-                    if(t) REQUIRE(false);
-                    utils_fallthrough;
-                case assign_nt:
-                case assign_ir:
-                    if(!t) {
-                        REQUIRE_MESSAGE(capacity < N/2, "unexpected capacity");
-                        REQUIRE_MESSAGE(size == 0, "unexpected size");
-                        break;
-                    } else {
-                        REQUIRE_MESSAGE(size == N, "unexpected size");
-                        REQUIRE_MESSAGE(capacity >= N, "unexpected capacity");
-                        int i;
-                        for(i = 1; ; ++i)
-                            if(!victim[i].zero_bar()) break;
-                            else {
-                                REQUIRE(victim[i].bar() == (m == assign_ir? i : move_support_tests::initial_bar));
+        vector_t src(move_support_tests::FooIterator(0), move_support_tests::FooIterator(N));// original data
+
+        for (int t = 0; t < 2; ++t)// exception type
+            for (int m = zero_method + 1; m < all_methods; ++m) {
+                move_support_tests::track_foo_count<__LINE__> check_all_foo_destroyed_on_exit {};
+                move_support_tests::track_allocator_memory<allocator_t> verify_no_leak_at_exit {};
+                allocator_t::init_counters();
+                if (t) move_support_tests::max_foo_count = move_support_tests::foo_count + N / 4;
+                else
+                    allocator_t::set_limits(N / 4);
+                vector_t victim;
+                try {
+                    switch (m) {
+                        case ctor_copy: {
+                            vector_t acopy(src);
+                        } break;// auto destruction after exception is checked by ~Foo
+                        case ctor_size: {
+                            vector_t sized(N);
+                        } break;// auto destruction after exception is checked by ~Foo
+                        // Do not test assignment constructor due to reusing of same methods as below
+                        case assign_nt: {
+                            victim.assign(N, move_support_tests::FooWithAssign());
+                        } break;
+                        case assign_ir: {
+                            victim.assign(move_support_tests::FooIterator(0),
+                                          move_support_tests::FooIterator(N));
+                        } break;
+                        case reserve: {
+                            try {
+                                victim.reserve(victim.max_size() + 1);
+                            } catch (std::length_error&) {
+                            } catch (...) { INFO("ERROR: unrecognized exception - known compiler issue\n"); }
+                            victim.reserve(N);
+                        } break;
+                        case compact: {
+                            if (t) move_support_tests::max_foo_count = 0;
+                            else
+                                allocator_t::set_limits();// reset limits
+                            victim.reserve(2);
+                            victim = src;// fragmented assignment
+                            if (t) {
+                                move_support_tests::max_foo_count = move_support_tests::foo_count + 10;
+                            } else {
+                                allocator_t::set_limits(1);// block any allocation
                             }
-                        for(; size_t(i) < size; ++i) {
-                            REQUIRE(!victim[i].zero_bar());
-                        }
-                        REQUIRE(size_t(i) == size);
-                        break;
+                            victim.shrink_to_fit();// should start defragmenting first segment
+                        } break;
+                        default:;
                     }
-                case compact:
-                    REQUIRE_MESSAGE(capacity > 0, "unexpected capacity");
-                    REQUIRE_MESSAGE(victim == src, "shrink_to_fit() is broken");
-                    break;
+                    if (!t || m != reserve) REQUIRE_MESSAGE(false, "should throw an exception");
+                } catch (std::bad_alloc& e) {
+                    allocator_t::set_limits();
+                    move_support_tests::max_foo_count = 0;
+                    std::size_t capacity = victim.capacity();
+                    std::size_t size = victim.size();
+
+                    std::size_t req_size = get_early_size(victim);
+
+                    verify_c_vector_size(size, capacity, req_size);
+
+                    switch (m) {
+                        case reserve:
+                            if (t) REQUIRE(false);
+                            utils_fallthrough;
+                        case assign_nt:
+                        case assign_ir:
+                            if (!t) {
+                                REQUIRE_MESSAGE(capacity < N / 2, "unexpected capacity");
+                                REQUIRE_MESSAGE(size == 0, "unexpected size");
+                                break;
+                            } else {
+                                REQUIRE_MESSAGE(size == N, "unexpected size");
+                                REQUIRE_MESSAGE(capacity >= N, "unexpected capacity");
+                                int i;
+                                for (i = 1;; ++i)
+                                    if (!victim[i].zero_bar()) break;
+                                    else {
+                                        REQUIRE(victim[i].bar()
+                                                == (m == assign_ir ? i : move_support_tests::initial_bar));
+                                    }
+                                for (; size_t(i) < size; ++i) { REQUIRE(!victim[i].zero_bar()); }
+                                REQUIRE(size_t(i) == size);
+                                break;
+                            }
+                        case compact:
+                            REQUIRE_MESSAGE(capacity > 0, "unexpected capacity");
+                            REQUIRE_MESSAGE(victim == src, "shrink_to_fit() is broken");
+                            break;
 
-                default:; // nothing to check here
+                        default:;// nothing to check here
+                    }
+                    INFO("Exception " << m << ": " << e.what() << "\t- ok\n");
                 }
-                INFO("Exception " << m << ": " << e.what() << "\t- ok\n");
             }
-        }
-    } catch(...) {
-        REQUIRE_MESSAGE(false, "unexpected exception");
-    }
+    } catch (...) { REQUIRE_MESSAGE(false, "unexpected exception"); }
 }
 #endif
 
-void verify_c_vector_capacity_is_below(size_t capacity, size_t high){
+void verify_c_vector_capacity_is_below(size_t capacity, size_t high) {
     REQUIRE_MESSAGE(capacity > 0, "unexpected capacity");
     REQUIRE_MESSAGE(capacity < high, "unexpected capacity");
 }
 
-template<typename allocator_t>
+template <typename allocator_t>
 void verify_vector_partially_copied(
-        oneapi::tbb::concurrent_vector<move_support_tests::FooWithAssign, allocator_t> const& victim, size_t planned_victim_size,
-        oneapi::tbb::concurrent_vector<move_support_tests::FooWithAssign, allocator_t> const& src,  bool is_memory_allocation_failure)
-{
-    if (is_memory_allocation_failure) { // allocator generated exception
+        oneapi::tbb::concurrent_vector<move_support_tests::FooWithAssign, allocator_t> const& victim,
+        size_t planned_victim_size,
+        oneapi::tbb::concurrent_vector<move_support_tests::FooWithAssign, allocator_t> const& src,
+        bool is_memory_allocation_failure) {
+    if (is_memory_allocation_failure) {// allocator generated exception
         using vector_t = oneapi::tbb::concurrent_vector<move_support_tests::FooWithAssign, allocator_t>;
-        REQUIRE_MESSAGE( victim == vector_t(src.begin(), src.begin() + victim.size(), src.get_allocator()), "failed to properly copy of source ?" );
-    }else{
-        REQUIRE_MESSAGE( std::equal(victim.begin(), victim.begin() + planned_victim_size, src.begin()), "failed to properly copy items before the exception?" );
-        REQUIRE_MESSAGE( (std::all_of( victim.begin() + planned_victim_size, victim.end(), is_state_predicate<move_support_tests::Foo::ZeroInitialized>()) ), "failed to zero-initialize items left not constructed after the exception?" );
+        REQUIRE_MESSAGE(victim == vector_t(src.begin(), src.begin() + victim.size(), src.get_allocator()),
+                        "failed to properly copy of source ?");
+    } else {
+        REQUIRE_MESSAGE(std::equal(victim.begin(), victim.begin() + planned_victim_size, src.begin()),
+                        "failed to properly copy items before the exception?");
+        REQUIRE_MESSAGE((std::all_of(victim.begin() + planned_victim_size, victim.end(),
+                                     is_state_predicate<move_support_tests::Foo::ZeroInitialized>())),
+                        "failed to zero-initialize items left not constructed after the exception?");
     }
 }
 
-template<typename vector_t>
-void verify_last_segment_allocation_failed(vector_t const& victim){
+template <typename vector_t>
+void verify_last_segment_allocation_failed(vector_t const& victim) {
     utils::suppress_unused_warning(victim);
     CHECK_THROWS_AS((victim.at(victim.size())), std::out_of_range);
 }
 
-template<typename vector_t>
-void verify_copy_and_assign_from_produce_the_same(vector_t const& victim){
+template <typename vector_t>
+void verify_copy_and_assign_from_produce_the_same(vector_t const& victim) {
     //TODO: remove explicit copy of allocator when full support of C++11 allocator_traits in concurrent_vector is present
     vector_t copy_of_victim(victim, victim.get_allocator());
     REQUIRE_MESSAGE(copy_of_victim == victim, "copy doesn't match original");
@@ -529,105 +536,111 @@ void verify_copy_and_assign_from_produce_the_same(vector_t const& victim){
     REQUIRE_MESSAGE(copy_of_victim == copy_of_victim2, "assignment doesn't match copying");
 }
 
-template<typename vector_t>
-void verify_assignment_operator_throws_bad_last_alloc(vector_t & victim){
+template <typename vector_t>
+void verify_assignment_operator_throws_bad_last_alloc(vector_t& victim) {
     vector_t copy_of_victim(victim, victim.get_allocator());
     //CHECK_THROWS_AS(victim = copy_of_victim, oneapi::tbb::bad_last_alloc); //TODO exceptions support
 }
 
 #if _MSC_VER
-#pragma warning (push)
+#pragma warning(push)
 // Forcing value to bool 'true' or 'false'
-#pragma warning (disable: 4800)
-#endif //#if _MSC_VER
+#pragma warning(disable : 4800)
+#endif//#if _MSC_VER
 
 //TODO: split into two separate tests
 //TODO: remove code duplication in exception safety tests
-void test_ex_assign_operator(){
+void test_ex_assign_operator() {
     //TODO: use __FUNCTION__ for test name
     using allocator_t = StaticCountingAllocator<std::allocator<move_support_tests::FooWithAssign>>;
     using vector_t = oneapi::tbb::concurrent_vector<move_support_tests::FooWithAssign, allocator_t>;
 
-    move_support_tests::track_foo_count<__LINE__> check_all_foo_destroyed_on_exit{};
-    move_support_tests::track_allocator_memory<allocator_t> verify_no_leak_at_exit{};
+    move_support_tests::track_foo_count<__LINE__> check_all_foo_destroyed_on_exit {};
+    move_support_tests::track_allocator_memory<allocator_t> verify_no_leak_at_exit {};
 
-    vector_t src(move_support_tests::FooIterator(0), move_support_tests::FooIterator(N)); // original data
+    vector_t src(move_support_tests::FooIterator(0), move_support_tests::FooIterator(N));// original data
 
-    const size_t planned_victim_size = N/4;
+    const size_t planned_victim_size = N / 4;
 
-    for(int t = 0; t < 2; ++t) { // exception type
+    for (int t = 0; t < 2; ++t) {// exception type
         vector_t victim;
-        victim.reserve(2); // get fragmented assignment
-        REQUIRE_THROWS_AS([&](){
-            move_support_tests::LimitFooCountInScope foo_limit(move_support_tests::foo_count + planned_victim_size, t);
-            move_support_tests::LimitAllocatedItemsInScope<allocator_t> allocator_limit(allocator_t::items_allocated + planned_victim_size, !t);
-
-            victim = src; // fragmented assignment
-        }(), const std::bad_alloc);
+        victim.reserve(2);// get fragmented assignment
+        REQUIRE_THROWS_AS(
+                [&]() {
+                    move_support_tests::LimitFooCountInScope foo_limit(
+                            move_support_tests::foo_count + planned_victim_size, t);
+                    move_support_tests::LimitAllocatedItemsInScope<allocator_t> allocator_limit(
+                            allocator_t::items_allocated + planned_victim_size, !t);
+
+                    victim = src;// fragmented assignment
+                }(),
+                const std::bad_alloc);
 
         verify_c_vector_size(victim);
 
-        if(!t) {
-            verify_c_vector_capacity_is_below(victim.capacity(), N);
-        }
+        if (!t) { verify_c_vector_capacity_is_below(victim.capacity(), N); }
 
         verify_vector_partially_copied(victim, planned_victim_size, src, !t);
         verify_last_segment_allocation_failed(victim);
         verify_copy_and_assign_from_produce_the_same(victim);
-        verify_assignment_operator_throws_bad_last_alloc(victim); //TODO exceptions support
+        verify_assignment_operator_throws_bad_last_alloc(victim);//TODO exceptions support
     }
 }
 
 #if _MSC_VER
-#pragma warning (pop)
+#pragma warning(pop)
 #endif
 
-template<typename T>
-void AssertSameType( const T& /*x*/, const T& /*y*/ ) {}
+template <typename T>
+void AssertSameType(const T& /*x*/, const T& /*y*/) {}
 
 struct test_grow_by {
-    template<typename container_type, typename element_type>
-    static void test( std::initializer_list<element_type> const& il, container_type const& expected ) {
+    template <typename container_type, typename element_type>
+    static void test(std::initializer_list<element_type> const& il, container_type const& expected) {
         container_type vd;
-        vd.grow_by( il );
-        REQUIRE_MESSAGE( vd == expected, "grow_by with an initializer list failed" );
+        vd.grow_by(il);
+        REQUIRE_MESSAGE(vd == expected, "grow_by with an initializer list failed");
     }
 };
 
-template<typename Iterator, typename T>
+template <typename Iterator, typename T>
 void TestIteratorTraits() {
-    AssertSameType( static_cast<typename Iterator::difference_type*>(nullptr), static_cast<std::ptrdiff_t*>(nullptr) );
-    AssertSameType( static_cast<typename Iterator::value_type*>(nullptr), static_cast<T*>(nullptr) );
-    AssertSameType( static_cast<typename Iterator::pointer*>(nullptr), static_cast<T**>(nullptr) );
-    AssertSameType( static_cast<typename Iterator::iterator_category*>(nullptr), static_cast<std::random_access_iterator_tag*>(nullptr) );
+    AssertSameType(static_cast<typename Iterator::difference_type*>(nullptr),
+                   static_cast<std::ptrdiff_t*>(nullptr));
+    AssertSameType(static_cast<typename Iterator::value_type*>(nullptr), static_cast<T*>(nullptr));
+    AssertSameType(static_cast<typename Iterator::pointer*>(nullptr), static_cast<T**>(nullptr));
+    AssertSameType(static_cast<typename Iterator::iterator_category*>(nullptr),
+                   static_cast<std::random_access_iterator_tag*>(nullptr));
     T x;
     typename Iterator::reference xr = x;
     typename Iterator::pointer xp = &x;
-    REQUIRE( &xr==xp );
+    REQUIRE(&xr == xp);
 }
 
 void TestInitList() {
     using namespace initializer_list_support_tests;
-    test_initializer_list_support<oneapi::tbb::concurrent_vector<char>, test_grow_by>( { 1, 2, 3, 4, 5 } );
-    test_initializer_list_support<oneapi::tbb::concurrent_vector<int>, test_grow_by>( {} );
+    test_initializer_list_support<oneapi::tbb::concurrent_vector<char>, test_grow_by>({1, 2, 3, 4, 5});
+    test_initializer_list_support<oneapi::tbb::concurrent_vector<int>, test_grow_by>({});
 }
 
 namespace TestMoveInShrinkToFitHelpers {
-    struct dummy : StateTrackable<>{
+    struct dummy : StateTrackable<> {
         int i;
         dummy(int an_i) noexcept : StateTrackable<>(0), i(an_i) {}
 
-        friend bool operator== (const dummy &lhs, const dummy &rhs){ return lhs.i == rhs.i; }
+        friend bool operator==(const dummy& lhs, const dummy& rhs) { return lhs.i == rhs.i; }
     };
-}
+}// namespace TestMoveInShrinkToFitHelpers
 
-void TestSerialMoveInShrinkToFit(){
+void TestSerialMoveInShrinkToFit() {
     using TestMoveInShrinkToFitHelpers::dummy;
 
-    static_assert(std::is_nothrow_move_constructible<dummy>::value,"incorrect test setup or broken configuration?");
+    static_assert(std::is_nothrow_move_constructible<dummy>::value,
+                  "incorrect test setup or broken configuration?");
     {
         dummy src(0);
-        REQUIRE_MESSAGE(is_state<StateTrackableBase::MoveInitialized>(dummy(std::move_if_noexcept(src))),"broken configuration ?");
+        REQUIRE_MESSAGE(is_state<StateTrackableBase::MoveInitialized>(dummy(std::move_if_noexcept(src))),
+                        "broken configuration ?");
     }
     static const std::size_t sequence_size = 15;
     using c_vector_t = oneapi::tbb::concurrent_vector<dummy>;
@@ -635,27 +648,35 @@ void TestSerialMoveInShrinkToFit(){
     std::generate_n(source.begin(), source.size(), std::rand);
 
     c_vector_t c_vector;
-    c_vector.reserve(1); //make it fragmented
+    c_vector.reserve(1);//make it fragmented
 
     c_vector.assign(source.begin(), source.end());
     move_support_tests::MemoryLocations c_vector_before_shrink(c_vector);
     c_vector.shrink_to_fit();
 
-    REQUIRE_MESSAGE(c_vector_before_shrink.content_location_changed(c_vector), "incorrect test setup? shrink_to_fit should cause moving elements to other memory locations while it is not");
-    REQUIRE_MESSAGE((std::all_of(c_vector.begin(), c_vector.end(), is_state_predicate<StateTrackableBase::MoveInitialized>())), "container did not move construct some elements?");
-    REQUIRE((c_vector == c_vector_t(source.begin(),source.end())));
+    REQUIRE_MESSAGE(c_vector_before_shrink.content_location_changed(c_vector),
+                    "incorrect test setup? shrink_to_fit should cause moving elements to other memory "
+                    "locations while it is not");
+    REQUIRE_MESSAGE((std::all_of(c_vector.begin(), c_vector.end(),
+                                 is_state_predicate<StateTrackableBase::MoveInitialized>())),
+                    "container did not move construct some elements?");
+    REQUIRE((c_vector == c_vector_t(source.begin(), source.end())));
 }
 
 struct default_container_traits {
     template <typename container_type, typename iterator_type>
-    static container_type& construct_container(typename std::aligned_storage<sizeof(container_type)>::type& storage, iterator_type begin, iterator_type end){
+    static container_type&
+    construct_container(typename std::aligned_storage<sizeof(container_type)>::type& storage,
+                        iterator_type begin, iterator_type end) {
         container_type* ptr = reinterpret_cast<container_type*>(&storage);
         new (ptr) container_type(begin, end);
         return *ptr;
     }
 
     template <typename container_type, typename iterator_type, typename allocator_type>
-    static container_type& construct_container(typename std::aligned_storage<sizeof(container_type)>::type& storage, iterator_type begin, iterator_type end, allocator_type const& a){
+    static container_type&
+    construct_container(typename std::aligned_storage<sizeof(container_type)>::type& storage,
+                        iterator_type begin, iterator_type end, allocator_type const& a) {
         container_type* ptr = reinterpret_cast<container_type*>(&storage);
         new (ptr) container_type(begin, end, a);
         return *ptr;
@@ -670,66 +691,70 @@ struct c_vector_type : default_container_traits {
     using container_value_type = T;
 
     using init_iterator_type = move_support_tests::FooIterator;
-    template<typename element_type, typename allocator_type>
-    struct apply{
-        using type = oneapi::tbb::concurrent_vector<element_type,  allocator_type >;
+    template <typename element_type, typename allocator_type>
+    struct apply {
+        using type = oneapi::tbb::concurrent_vector<element_type, allocator_type>;
     };
 
-    enum{ expected_number_of_items_to_allocate_for_steal_move = 0 };
+    enum { expected_number_of_items_to_allocate_for_steal_move = 0 };
 
-    template<typename element_type, typename allocator_type, typename iterator>
-    static bool equal(oneapi::tbb::concurrent_vector<element_type, allocator_type > const& c, iterator begin, iterator end){
-        bool equal_sizes = (std::size_t)std::distance(begin, end) == c.size();
-        return  equal_sizes && std::equal(c.begin(), c.end(), begin);
+    template <typename element_type, typename allocator_type, typename iterator>
+    static bool equal(oneapi::tbb::concurrent_vector<element_type, allocator_type> const& c, iterator begin,
+                      iterator end) {
+        bool equal_sizes = (std::size_t) std::distance(begin, end) == c.size();
+        return equal_sizes && std::equal(c.begin(), c.end(), begin);
     }
 };
 
-void TestSerialGrowByWithMoveIterators(){
+void TestSerialGrowByWithMoveIterators() {
     using fixture_t = move_support_tests::DefaultStatefulFixtureHelper<c_vector_type>::type;
     using vector_t = fixture_t::container_type;
 
     fixture_t fixture;
 
     vector_t dst(fixture.dst_allocator);
-    dst.grow_by(std::make_move_iterator(fixture.source.begin()), std::make_move_iterator(fixture.source.end()));
+    dst.grow_by(std::make_move_iterator(fixture.source.begin()),
+                std::make_move_iterator(fixture.source.end()));
 
     fixture.verify_content_deep_moved(dst);
 }
 
 namespace test_grow_to_at_least_helpers {
-    template<typename MyVector >
+    template <typename MyVector>
     class GrowToAtLeast {
         using const_reference = typename MyVector::const_reference;
 
-        const bool my_use_two_args_form ;
+        const bool my_use_two_args_form;
         MyVector& my_vector;
         const_reference my_init_from;
+
     public:
-        void operator()( const oneapi::tbb::blocked_range<std::size_t>& range ) const {
-            for( std::size_t i=range.begin(); i!=range.end(); ++i ) {
+        void operator()(const oneapi::tbb::blocked_range<std::size_t>& range) const {
+            for (std::size_t i = range.begin(); i != range.end(); ++i) {
                 std::size_t n = my_vector.size();
-                std::size_t req = (i % (2*n+1))+1;
+                std::size_t req = (i % (2 * n + 1)) + 1;
 
                 typename MyVector::iterator p;
                 move_support_tests::Foo::State desired_state;
-                if (my_use_two_args_form){
-                    p = my_vector.grow_to_at_least(req,my_init_from);
+                if (my_use_two_args_form) {
+                    p = my_vector.grow_to_at_least(req, my_init_from);
                     desired_state = move_support_tests::Foo::CopyInitialized;
-                }else{
+                } else {
                     p = my_vector.grow_to_at_least(req);
                     desired_state = move_support_tests::Foo::DefaultInitialized;
                 }
-                if( p-my_vector.begin() < typename MyVector::difference_type(req) )
-                    CHECK((p->state == desired_state || p->state == move_support_tests::Foo::ZeroInitialized));
+                if (p - my_vector.begin() < typename MyVector::difference_type(req))
+                    CHECK((p->state == desired_state
+                           || p->state == move_support_tests::Foo::ZeroInitialized));
                 CHECK(my_vector.size() >= req);
             }
         }
-        GrowToAtLeast(bool use_two_args_form, MyVector& vector, const_reference init_from )
+        GrowToAtLeast(bool use_two_args_form, MyVector& vector, const_reference init_from)
             : my_use_two_args_form(use_two_args_form), my_vector(vector), my_init_from(init_from) {}
     };
-}
+}// namespace test_grow_to_at_least_helpers
 
-template<bool use_two_arg_form>
+template <bool use_two_arg_form>
 void TestConcurrentGrowToAtLeastImpl() {
     using namespace test_grow_to_at_least_helpers;
     using MyAllocator = StaticCountingAllocator<std::allocator<move_support_tests::Foo>>;
@@ -737,49 +762,46 @@ void TestConcurrentGrowToAtLeastImpl() {
     move_support_tests::Foo copy_from;
     MyAllocator::init_counters();
     MyVector v(2, move_support_tests::Foo(), MyAllocator());
-    for (std::size_t s=1; s<1000; s*=10) {
-        oneapi::tbb::parallel_for(oneapi::tbb::blocked_range<std::size_t>(0, 10000*s, s), GrowToAtLeast<MyVector>(use_two_arg_form, v, copy_from), oneapi::tbb::simple_partitioner());
+    for (std::size_t s = 1; s < 1000; s *= 10) {
+        oneapi::tbb::parallel_for(oneapi::tbb::blocked_range<std::size_t>(0, 10000 * s, s),
+                                  GrowToAtLeast<MyVector>(use_two_arg_form, v, copy_from),
+                                  oneapi::tbb::simple_partitioner());
     }
 
     v.clear();
     v.shrink_to_fit();
     std::size_t items_allocated = v.get_allocator().items_allocated,
-           items_freed = v.get_allocator().items_freed;
-    std::size_t allocations = v.get_allocator().allocations,
-           frees = v.get_allocator().frees;
-    REQUIRE( items_allocated == items_freed );
-    REQUIRE( allocations == frees );
+                items_freed = v.get_allocator().items_freed;
+    std::size_t allocations = v.get_allocator().allocations, frees = v.get_allocator().frees;
+    REQUIRE(items_allocated == items_freed);
+    REQUIRE(allocations == frees);
 }
 
 struct AssignElement {
     using iterator = oneapi::tbb::concurrent_vector<int>::range_type::iterator;
     iterator base;
-    void operator()( const oneapi::tbb::concurrent_vector<int>::range_type& range ) const {
+    void operator()(const oneapi::tbb::concurrent_vector<int>::range_type& range) const {
         for (iterator i = range.begin(); i != range.end(); ++i) {
-            if (*i != 0) {
-                REPORT("ERROR for v[%ld]\n", long(i - base));
-            }
-            *i = int(i-base);
+            if (*i != 0) { REPORT("ERROR for v[%ld]\n", long(i - base)); }
+            *i = int(i - base);
         }
     }
-    AssignElement( iterator base_ ) : base(base_) {}
+    AssignElement(iterator base_) : base(base_) {}
 };
 
 struct CheckElement {
     using iterator = oneapi::tbb::concurrent_vector<int>::const_range_type::iterator;
     iterator base;
-    void operator()( const oneapi::tbb::concurrent_vector<int>::const_range_type& range ) const {
+    void operator()(const oneapi::tbb::concurrent_vector<int>::const_range_type& range) const {
         for (iterator i = range.begin(); i != range.end(); ++i) {
-            if (*i != int(i-base)) {
-                REPORT("ERROR for v[%ld]\n", long(i-base));
-            }
+            if (*i != int(i - base)) { REPORT("ERROR for v[%ld]\n", long(i - base)); }
         }
     }
-    CheckElement( iterator base_ ) : base(base_) {}
+    CheckElement(iterator base_) : base(base_) {}
 };
 
 // Test parallel access by iterators
-void TestParallelFor( std::size_t nthread ) {
+void TestParallelFor(std::size_t nthread) {
     using vector_type = oneapi::tbb::concurrent_vector<int>;
     vector_type v;
     v.resize(N);
@@ -790,16 +812,13 @@ void TestParallelFor( std::size_t nthread ) {
     const vector_type& u = v;
     oneapi::tbb::parallel_for(u.range(10000), CheckElement(u.begin()));
     oneapi::tbb::tick_count t2 = oneapi::tbb::tick_count::now();
-    INFO("Time for parallel_for: assign time = " << (t1 - t0).seconds() <<
-        " , check time = " << (t2 - t1).seconds());
+    INFO("Time for parallel_for: assign time = " << (t1 - t0).seconds()
+                                                 << " , check time = " << (t2 - t1).seconds());
     for (int i = 0; std::size_t(i) < v.size(); ++i) {
-        if (v[i] != i) {
-            REPORT("ERROR for v[%ld]\n", i);
-        }
+        if (v[i] != i) { REPORT("ERROR for v[%ld]\n", i); }
     }
 }
 
-
 struct grain_map {
     enum grow_method_enum {
         grow_by_range = 1,
@@ -824,20 +843,21 @@ struct grain_map {
     const std::size_t total_number_of_parts;
 
     grain_map(const range_part* begin, const range_part* end)
-    : distributed(separate(begin,end, &distributed::is_not))
-    , batched(separate(begin,end, &distributed::is_yes))
-    , total_number_of_parts(std::accumulate(begin, end, (std::size_t)0, &sum_number_of_parts::sum))
-    {}
+        : distributed(separate(begin, end, &distributed::is_not)),
+          batched(separate(begin, end, &distributed::is_yes)),
+          total_number_of_parts(std::accumulate(begin, end, (std::size_t) 0, &sum_number_of_parts::sum)) {}
 
 private:
-    struct sum_number_of_parts{
-        static std::size_t sum(std::size_t accumulator, grain_map::range_part const& rp){ return accumulator + rp.number_of_parts;}
+    struct sum_number_of_parts {
+        static std::size_t sum(std::size_t accumulator, grain_map::range_part const& rp) {
+            return accumulator + rp.number_of_parts;
+        }
     };
 
     template <typename functor_t>
-    static std::vector<range_part> separate(const range_part* begin, const range_part* end, functor_t f){
+    static std::vector<range_part> separate(const range_part* begin, const range_part* end, functor_t f) {
         std::vector<range_part> part;
-        part.reserve(std::distance(begin,end));
+        part.reserve(std::distance(begin, end));
         //copy all that false==f(*it)
         std::remove_copy_if(begin, end, std::back_inserter(part), f);
 
@@ -845,71 +865,78 @@ struct grain_map {
     }
 
     struct distributed {
-        static bool is_not(range_part const& rp){ return !rp.distribute;}
-        static bool is_yes(range_part const& rp){ return rp.distribute;}
+        static bool is_not(range_part const& rp) { return !rp.distribute; }
+        static bool is_yes(range_part const& rp) { return rp.distribute; }
     };
 };
 
-
 //! Test concurrent invocations of method concurrent_vector::grow_by
-template<typename MyVector>
+template <typename MyVector>
 class GrowBy {
     MyVector& my_vector;
     const grain_map& my_grain_map;
     std::size_t my_part_weight;
+
 public:
-    void operator()( const oneapi::tbb::blocked_range<std::size_t>& range ) const {
+    void operator()(const oneapi::tbb::blocked_range<std::size_t>& range) const {
         CHECK(range.begin() < range.end());
 
         std::size_t current_adding_index_in_cvector = range.begin();
 
-        for (std::size_t index = 0; index < my_grain_map.batched.size(); ++index){
+        for (std::size_t index = 0; index < my_grain_map.batched.size(); ++index) {
             const grain_map::range_part& batch_part = my_grain_map.batched[index];
             const std::size_t number_of_items_to_add = batch_part.number_of_parts * my_part_weight;
             const std::size_t end = current_adding_index_in_cvector + number_of_items_to_add;
 
-            switch(batch_part.method){
-            case grain_map::grow_by_range : {
-                    my_vector.grow_by(move_support_tests::FooIterator(current_adding_index_in_cvector), move_support_tests::FooIterator(end));
+            switch (batch_part.method) {
+                case grain_map::grow_by_range: {
+                    my_vector.grow_by(move_support_tests::FooIterator(current_adding_index_in_cvector),
+                                      move_support_tests::FooIterator(end));
                 } break;
-            case grain_map::grow_by_default : {
+                case grain_map::grow_by_default: {
                     typename MyVector::iterator const s = my_vector.grow_by(number_of_items_to_add);
                     for (std::size_t k = 0; k < number_of_items_to_add; ++k) {
                         s[k].bar() = current_adding_index_in_cvector + k;
                     }
                 } break;
-            case grain_map::grow_by_init_list : {
+                case grain_map::grow_by_init_list: {
                     move_support_tests::FooIterator curr(current_adding_index_in_cvector);
                     for (std::size_t k = 0; k < number_of_items_to_add; ++k) {
                         if (k + 4 < number_of_items_to_add) {
-                            my_vector.grow_by( { *curr++, *curr++, *curr++, *curr++, *curr++ } );
+                            my_vector.grow_by({*curr++, *curr++, *curr++, *curr++, *curr++});
                             k += 4;
                         } else {
-                            my_vector.grow_by( { *curr++ } );
+                            my_vector.grow_by({*curr++});
                         }
                     }
                     CHECK(curr == move_support_tests::FooIterator(end));
                 } break;
-            default : { REQUIRE_MESSAGE(false, "using unimplemented method of batch add in ConcurrentGrow test.");} break;
+                default: {
+                    REQUIRE_MESSAGE(false, "using unimplemented method of batch add in ConcurrentGrow test.");
+                } break;
             };
 
             current_adding_index_in_cvector = end;
         }
 
         std::vector<std::size_t> items_left_to_add(my_grain_map.distributed.size());
-        for (std::size_t i=0; i < my_grain_map.distributed.size(); ++i) {
+        for (std::size_t i = 0; i < my_grain_map.distributed.size(); ++i) {
             items_left_to_add[i] = my_grain_map.distributed[i].number_of_parts * my_part_weight;
         }
 
-        for (;current_adding_index_in_cvector < range.end(); ++current_adding_index_in_cvector) {
+        for (; current_adding_index_in_cvector < range.end(); ++current_adding_index_in_cvector) {
             std::size_t method_index = current_adding_index_in_cvector % my_grain_map.distributed.size();
 
             if (!items_left_to_add[method_index]) {
-                struct not_zero{
-                    static bool is(std::size_t items_to_add){ return items_to_add != 0;}
+                struct not_zero {
+                    static bool is(std::size_t items_to_add) { return items_to_add != 0; }
                 };
-                method_index = std::distance(items_left_to_add.begin(), std::find_if(items_left_to_add.begin(), items_left_to_add.end(), &not_zero::is));
-                REQUIRE_MESSAGE(method_index < my_grain_map.distributed.size(), "incorrect test setup - wrong expected distribution: left free space but no elements to add?");
+                method_index = std::distance(
+                        items_left_to_add.begin(),
+                        std::find_if(items_left_to_add.begin(), items_left_to_add.end(), &not_zero::is));
+                REQUIRE_MESSAGE(method_index < my_grain_map.distributed.size(),
+                                "incorrect test setup - wrong expected distribution: left free space but no "
+                                "elements to add?");
             };
 
             REQUIRE_MESSAGE(items_left_to_add[method_index], "logic error ?");
@@ -919,57 +946,57 @@ class GrowBy {
             typename MyVector::value_type source;
             source.bar() = current_adding_index_in_cvector;
 
-            switch(distributed_part.method){
-            case grain_map::grow_by_default : {
+            switch (distributed_part.method) {
+                case grain_map::grow_by_default: {
                     (r = my_vector.grow_by(1))->bar() = current_adding_index_in_cvector;
                 } break;
-            case grain_map::grow_by_copy : {
+                case grain_map::grow_by_copy: {
                     r = my_vector.grow_by(1, source);
                 } break;
-            case grain_map::push_back : {
+                case grain_map::push_back: {
                     r = my_vector.push_back(source);
                 } break;
-            case grain_map::push_back_move : {
+                case grain_map::push_back_move: {
                     r = my_vector.push_back(std::move(source));
                 } break;
-            case grain_map::emplace_back : {
+                case grain_map::emplace_back: {
                     r = my_vector.emplace_back(current_adding_index_in_cvector);
                 } break;
 
-            default : { REQUIRE_MESSAGE(false, "using unimplemented method of batch add in ConcurrentGrow test.");} break;
+                default: {
+                    REQUIRE_MESSAGE(false, "using unimplemented method of batch add in ConcurrentGrow test.");
+                } break;
             };
 
             CHECK(static_cast<std::size_t>(r->bar()) == current_adding_index_in_cvector);
-            }
-
         }
+    }
 
-    GrowBy( MyVector& vector, const grain_map& m, std::size_t part_weight )
-    : my_vector(vector), my_grain_map(m), my_part_weight(part_weight)
-    {}
+    GrowBy(MyVector& vector, const grain_map& m, std::size_t part_weight)
+        : my_vector(vector), my_grain_map(m), my_part_weight(part_weight) {}
 };
 
 //! Test concurrent invocations of grow methods
 void TestConcurrentGrowBy() {
 
-    const grain_map::range_part concurrent_grow_single_range_map [] = {
-    //  number_of_parts,         method,             distribute,   expected_element_state
-            {3,           grain_map::grow_by_range,     false,   move_support_tests::Foo::MoveInitialized},
+    const grain_map::range_part concurrent_grow_single_range_map[] = {
+            //  number_of_parts,         method,             distribute,   expected_element_state
+            {3, grain_map::grow_by_range, false, move_support_tests::Foo::MoveInitialized},
 
-            {1,           grain_map::grow_by_init_list, false,   move_support_tests::Foo::CopyInitialized},
+            {1, grain_map::grow_by_init_list, false, move_support_tests::Foo::CopyInitialized},
 
-            {2,           grain_map::grow_by_default,   false,   move_support_tests::Foo::DefaultInitialized},
-            {1,           grain_map::grow_by_default,   true,    move_support_tests::Foo::DefaultInitialized},
-            {1,           grain_map::grow_by_copy,      true,    move_support_tests::Foo::CopyInitialized},
-            {1,           grain_map::push_back,         true,    move_support_tests::Foo::CopyInitialized},
+            {2, grain_map::grow_by_default, false, move_support_tests::Foo::DefaultInitialized},
+            {1, grain_map::grow_by_default, true, move_support_tests::Foo::DefaultInitialized},
+            {1, grain_map::grow_by_copy, true, move_support_tests::Foo::CopyInitialized},
+            {1, grain_map::push_back, true, move_support_tests::Foo::CopyInitialized},
 
-            {1,           grain_map::push_back_move,    true,    move_support_tests::Foo::MoveInitialized},
+            {1, grain_map::push_back_move, true, move_support_tests::Foo::MoveInitialized},
 
-            {1,           grain_map::emplace_back,      true,    move_support_tests::Foo::DirectInitialized},
+            {1, grain_map::emplace_back, true, move_support_tests::Foo::DirectInitialized},
 
     };
 
-    using MyAllocator = StaticCountingAllocator<std::allocator<move_support_tests::Foo> >;
+    using MyAllocator = StaticCountingAllocator<std::allocator<move_support_tests::Foo>>;
     using MyVector = oneapi::tbb::concurrent_vector<move_support_tests::Foo, MyAllocator>;
 
     MyAllocator::init_counters();
@@ -980,58 +1007,72 @@ void TestConcurrentGrowBy() {
 
         static const std::size_t part_weight = desired_grain_size / m.total_number_of_parts;
         static const std::size_t grain_size = part_weight * m.total_number_of_parts;
-        static const std::size_t number_of_grains = 8; //this should be (power of two) in order to get minimal ranges equal to grain_size
+        static const std::size_t number_of_grains
+                = 8;//this should be (power of two) in order to get minimal ranges equal to grain_size
         static const std::size_t range_size = grain_size * number_of_grains;
 
         MyAllocator a;
         MyVector v(a);
-        oneapi::tbb::parallel_for(oneapi::tbb::blocked_range<std::size_t>(0, range_size, grain_size), GrowBy<MyVector>(v, m, part_weight), oneapi::tbb::simple_partitioner());
+        oneapi::tbb::parallel_for(oneapi::tbb::blocked_range<std::size_t>(0, range_size, grain_size),
+                                  GrowBy<MyVector>(v, m, part_weight), oneapi::tbb::simple_partitioner());
 
-        REQUIRE( v.size() == std::size_t(range_size) );
+        REQUIRE(v.size() == std::size_t(range_size));
 
         // Verify that v is a permutation of 0..m
         size_t direct_inits = 0, def_inits = 0, copy_inits = 0, move_inits = 0;
         std::vector<bool> found(range_size, 0);
-        for( std::size_t i=0; i<range_size; ++i ) {
-            if( v[i].state == move_support_tests::Foo::DefaultInitialized ) ++def_inits;
-            else if( v[i].state == move_support_tests::Foo::DirectInitialized ) ++direct_inits;
-            else if( v[i].state == move_support_tests::Foo::CopyInitialized ) ++copy_inits;
-            else if( v[i].state == move_support_tests::Foo::MoveInitialized ) ++move_inits;
+        for (std::size_t i = 0; i < range_size; ++i) {
+            if (v[i].state == move_support_tests::Foo::DefaultInitialized) ++def_inits;
+            else if (v[i].state == move_support_tests::Foo::DirectInitialized)
+                ++direct_inits;
+            else if (v[i].state == move_support_tests::Foo::CopyInitialized)
+                ++copy_inits;
+            else if (v[i].state == move_support_tests::Foo::MoveInitialized)
+                ++move_inits;
             else {
-                REQUIRE_MESSAGE( false, "v[i] seems not initialized");
+                REQUIRE_MESSAGE(false, "v[i] seems not initialized");
             }
             intptr_t index = v[i].bar();
-            REQUIRE( !found[index] );
+            REQUIRE(!found[index]);
             found[index] = true;
         }
 
-        std::size_t expected_direct_inits = 0, expected_def_inits = 0, expected_copy_inits = 0, expected_move_inits = 0;
-        for (std::size_t i=0; i < utils::array_length(concurrent_grow_single_range_map); ++i){
-            const grain_map::range_part& rp =concurrent_grow_single_range_map[i];
-            switch (rp.expected_element_state){
-            case move_support_tests::Foo::DefaultInitialized: { expected_def_inits += rp.number_of_parts ; } break;
-            case move_support_tests::Foo::DirectInitialized:  { expected_direct_inits += rp.number_of_parts ;} break;
-            case move_support_tests::Foo::MoveInitialized:    { expected_move_inits += rp.number_of_parts ;} break;
-            case move_support_tests::Foo::CopyInitialized:    { expected_copy_inits += rp.number_of_parts ;} break;
-            default: {REQUIRE_MESSAGE(false, "unexpected expected state");}break;
+        std::size_t expected_direct_inits = 0, expected_def_inits = 0, expected_copy_inits = 0,
+                    expected_move_inits = 0;
+        for (std::size_t i = 0; i < utils::array_length(concurrent_grow_single_range_map); ++i) {
+            const grain_map::range_part& rp = concurrent_grow_single_range_map[i];
+            switch (rp.expected_element_state) {
+                case move_support_tests::Foo::DefaultInitialized: {
+                    expected_def_inits += rp.number_of_parts;
+                } break;
+                case move_support_tests::Foo::DirectInitialized: {
+                    expected_direct_inits += rp.number_of_parts;
+                } break;
+                case move_support_tests::Foo::MoveInitialized: {
+                    expected_move_inits += rp.number_of_parts;
+                } break;
+                case move_support_tests::Foo::CopyInitialized: {
+                    expected_copy_inits += rp.number_of_parts;
+                } break;
+                default: {
+                    REQUIRE_MESSAGE(false, "unexpected expected state");
+                } break;
             };
         }
 
-        expected_def_inits    *= part_weight * number_of_grains;
-        expected_move_inits   *= part_weight * number_of_grains;
-        expected_copy_inits   *= part_weight * number_of_grains;
+        expected_def_inits *= part_weight * number_of_grains;
+        expected_move_inits *= part_weight * number_of_grains;
+        expected_copy_inits *= part_weight * number_of_grains;
         expected_direct_inits *= part_weight * number_of_grains;
 
-        REQUIRE( def_inits == expected_def_inits );
-        REQUIRE( copy_inits == expected_copy_inits );
-        REQUIRE( move_inits == expected_move_inits );
-        REQUIRE( direct_inits == expected_direct_inits );
+        REQUIRE(def_inits == expected_def_inits);
+        REQUIRE(copy_inits == expected_copy_inits);
+        REQUIRE(move_inits == expected_move_inits);
+        REQUIRE(direct_inits == expected_direct_inits);
     }
     //TODO: factor this into separate thing, as it seems to used in big number of tests
-    std::size_t items_allocated = MyAllocator::items_allocated,
-           items_freed = MyAllocator::items_freed;
-    std::size_t allocations = MyAllocator::allocations,
-           frees = MyAllocator::frees;
+    std::size_t items_allocated = MyAllocator::items_allocated, items_freed = MyAllocator::items_freed;
+    std::size_t allocations = MyAllocator::allocations, frees = MyAllocator::frees;
     REQUIRE(items_allocated == items_freed);
     REQUIRE(allocations == frees);
 }
@@ -1040,45 +1081,48 @@ void TestComparison() {
     std::string str[3];
     str[0] = "abc";
     str[1].assign("cba");
-    str[2].assign("abc"); // same as 0th
+    str[2].assign("abc");// same as 0th
     oneapi::tbb::concurrent_vector<char> var[3];
     var[0].assign(str[0].begin(), str[0].end());
     var[1].assign(str[0].rbegin(), str[0].rend());
-    var[2].assign(var[1].rbegin(), var[1].rend()); // same as 0th
+    var[2].assign(var[1].rbegin(), var[1].rend());// same as 0th
     for (int i = 0; i < 3; ++i) {
         for (int j = 0; j < 3; ++j) {
-            REQUIRE( (var[i] == var[j]) == (str[i] == str[j]) );
-            REQUIRE( (var[i] != var[j]) == (str[i] != str[j]) );
-            REQUIRE( (var[i] < var[j]) == (str[i] < str[j]) );
-            REQUIRE( (var[i] > var[j]) == (str[i] > str[j]) );
-            REQUIRE( (var[i] <= var[j]) == (str[i] <= str[j]) );
-            REQUIRE( (var[i] >= var[j]) == (str[i] >= str[j]) );
+            REQUIRE((var[i] == var[j]) == (str[i] == str[j]));
+            REQUIRE((var[i] != var[j]) == (str[i] != str[j]));
+            REQUIRE((var[i] < var[j]) == (str[i] < str[j]));
+            REQUIRE((var[i] > var[j]) == (str[i] > str[j]));
+            REQUIRE((var[i] <= var[j]) == (str[i] <= str[j]));
+            REQUIRE((var[i] >= var[j]) == (str[i] >= str[j]));
         }
     }
 }
 
 #if TBB_USE_EXCEPTIONS
 void test_ex_move_assignment_memory_failure() {
-    using fixture_type = move_support_tests::DefaultStatefulFixtureHelper<c_vector_type, /*POCMA = */std::false_type>::type;
-    using arena_allocator_fixture_type = move_support_tests::ArenaAllocatorFixture<move_support_tests::FooWithAssign, /*POCMA = */std::false_type>;
+    using fixture_type = move_support_tests::DefaultStatefulFixtureHelper<c_vector_type,
+                                                                          /*POCMA = */ std::false_type>::type;
+    using arena_allocator_fixture_type
+            = move_support_tests::ArenaAllocatorFixture<move_support_tests::FooWithAssign,
+                                                        /*POCMA = */ std::false_type>;
     using allocator_type = fixture_type::allocator_type;
     using vector_type = fixture_type::container_type;
 
     fixture_type fixture;
     arena_allocator_fixture_type arena_allocator_fixture(4 * fixture.container_size);
 
-    const std::size_t allocation_limit = fixture.container_size/4;
+    const std::size_t allocation_limit = fixture.container_size / 4;
 
     vector_type victim(arena_allocator_fixture.allocator);
-    victim.reserve(2); // for fragmented assignment
+    victim.reserve(2);// for fragmented assignment
 
     REQUIRE_THROWS_AS(
-        [&]() {
-            move_support_tests::LimitAllocatedItemsInScope<allocator_type> allocator_limit(allocator_type::items_allocated + allocation_limit);
-            victim = std::move(fixture.source); // fragmented assignment
-        }(),
-        std::bad_alloc
-    );
+            [&]() {
+                move_support_tests::LimitAllocatedItemsInScope<allocator_type> allocator_limit(
+                        allocator_type::items_allocated + allocation_limit);
+                victim = std::move(fixture.source);// fragmented assignment
+            }(),
+            std::bad_alloc);
 
     verify_c_vector_size(victim);
     verify_c_vector_capacity_is_below(victim.capacity(), allocation_limit + 2);
@@ -1089,25 +1133,27 @@ void test_ex_move_assignment_memory_failure() {
     verify_assignment_operator_throws_bad_last_alloc(victim);
 }
 
-void test_ex_move_assignment_element_ctor_exception(){
-    using fixture_type = move_support_tests::DefaultStatefulFixtureHelper<c_vector_type, std::false_type>::type;
-    using arena_allocator_fixture_type = move_support_tests::ArenaAllocatorFixture<move_support_tests::FooWithAssign, std::false_type>;
+void test_ex_move_assignment_element_ctor_exception() {
+    using fixture_type
+            = move_support_tests::DefaultStatefulFixtureHelper<c_vector_type, std::false_type>::type;
+    using arena_allocator_fixture_type
+            = move_support_tests::ArenaAllocatorFixture<move_support_tests::FooWithAssign, std::false_type>;
     using vector_type = fixture_type::container_type;
 
     fixture_type fixture;
-    const size_t planned_victim_size = fixture.container_size/4;
+    const size_t planned_victim_size = fixture.container_size / 4;
     arena_allocator_fixture_type arena_allocator_fixture(4 * fixture.container_size);
 
     vector_type victim(arena_allocator_fixture.allocator);
-    victim.reserve(2); // get fragmented assignment
+    victim.reserve(2);// get fragmented assignment
 
     REQUIRE_THROWS_AS(
-        [&](){
-            move_support_tests::LimitFooCountInScope foo_limit(move_support_tests::foo_count + planned_victim_size);
-            victim = std::move(fixture.source); // fragmented assignment
-        }(),
-        std::bad_alloc
-    );
+            [&]() {
+                move_support_tests::LimitFooCountInScope foo_limit(move_support_tests::foo_count
+                                                                   + planned_victim_size);
+                victim = std::move(fixture.source);// fragmented assignment
+            }(),
+            std::bad_alloc);
 
     verify_c_vector_size(victim);
 
@@ -1126,41 +1172,43 @@ void test_ex_move_assignment() {
 
 template <typename Type, typename Allocator>
 class test_grow_by_and_resize {
-    oneapi::tbb::concurrent_vector<Type, Allocator> &my_c;
+    oneapi::tbb::concurrent_vector<Type, Allocator>& my_c;
+
 public:
-    test_grow_by_and_resize( oneapi::tbb::concurrent_vector<Type, Allocator> &c ) : my_c(c) {}
+    test_grow_by_and_resize(oneapi::tbb::concurrent_vector<Type, Allocator>& c) : my_c(c) {}
     void operator()() const {
         const typename oneapi::tbb::concurrent_vector<Type, Allocator>::size_type sz = my_c.size();
-        my_c.grow_by( 5 );
-        REQUIRE( my_c.size() == sz + 5 );
-        my_c.resize( sz );
-        REQUIRE( my_c.size() == sz );
+        my_c.grow_by(5);
+        REQUIRE(my_c.size() == sz + 5);
+        my_c.resize(sz);
+        REQUIRE(my_c.size() == sz);
     }
 };
 
 namespace push_back_exception_safety_helpers {
     //TODO: remove code duplication with emplace_helpers::wrapper_type
-    struct throwing_foo:move_support_tests::Foo {
+    struct throwing_foo : move_support_tests::Foo {
         int value1;
         int value2;
-        explicit throwing_foo(int v1, int v2) : value1 (v1), value2(v2) {}
+        explicit throwing_foo(int v1, int v2) : value1(v1), value2(v2) {}
     };
 
-    template< typename foo_t = throwing_foo>
+    template <typename foo_t = throwing_foo>
     struct fixture {
-        using vector_t = oneapi::tbb::concurrent_vector<foo_t, std::allocator<foo_t> >;
+        using vector_t = oneapi::tbb::concurrent_vector<foo_t, std::allocator<foo_t>>;
         vector_t v;
 
-        void test( void(*p_test)(vector_t&)){
+        void test(void (*p_test)(vector_t&)) {
             utils::suppress_unused_warning(p_test);
-            move_support_tests::track_foo_count<__LINE__> verify_no_foo_leaked_during_exception{};
+            move_support_tests::track_foo_count<__LINE__> verify_no_foo_leaked_during_exception {};
             utils::suppress_unused_warning(verify_no_foo_leaked_during_exception);
-            REQUIRE_MESSAGE(v.empty(),"incorrect test setup?" );
+            REQUIRE_MESSAGE(v.empty(), "incorrect test setup?");
             REQUIRE_THROWS_AS(p_test(v), move_support_tests::FooException);
-            REQUIRE_MESSAGE(is_state<move_support_tests::Foo::ZeroInitialized>(v[0]),"incorrectly filled item during exception in emplace_back?");
+            REQUIRE_MESSAGE(is_state<move_support_tests::Foo::ZeroInitialized>(v[0]),
+                            "incorrectly filled item during exception in emplace_back?");
         }
     };
-}
+}// namespace push_back_exception_safety_helpers
 
 void TestPushBackMoveExceptionSafety() {
     using fixture_t = push_back_exception_safety_helpers::fixture<move_support_tests::Foo>;
@@ -1177,18 +1225,16 @@ void TestPushBackMoveExceptionSafety() {
     t.test(&test::test_move_push_back);
 }
 
-void TestEmplaceBackExceptionSafety(){
+void TestEmplaceBackExceptionSafety() {
     using fixture_t = push_back_exception_safety_helpers::fixture<>;
     fixture_t t;
 
-    move_support_tests::Foo dummy; //make FooCount non zero;
+    move_support_tests::Foo dummy;//make FooCount non zero;
     utils::suppress_unused_warning(dummy);
     move_support_tests::LimitFooCountInScope foo_limit(move_support_tests::foo_count);
 
     struct test {
-        static void test_emplace(fixture_t::vector_t& v) {
-            v.emplace_back(1,2);
-        }
+        static void test_emplace(fixture_t::vector_t& v) { v.emplace_back(1, 2); }
     };
     t.test(&test::test_emplace);
 }
@@ -1196,20 +1242,20 @@ void TestEmplaceBackExceptionSafety(){
 namespace move_semantics_helpers {
     struct move_only_type {
         const int* my_pointer;
-        move_only_type(move_only_type && other): my_pointer(other.my_pointer){other.my_pointer=nullptr;}
-        explicit move_only_type(const int* value): my_pointer(value) {}
+        move_only_type(move_only_type&& other) : my_pointer(other.my_pointer) { other.my_pointer = nullptr; }
+        explicit move_only_type(const int* value) : my_pointer(value) {}
     };
-}
+}// namespace move_semantics_helpers
 
-void TestPushBackMoveOnlyContainer(){
+void TestPushBackMoveOnlyContainer() {
     using namespace move_semantics_helpers;
-    using vector_t = oneapi::tbb::concurrent_vector<move_only_type >;
+    using vector_t = oneapi::tbb::concurrent_vector<move_only_type>;
     vector_t v;
     static const int magic_number = 7;
     move_only_type src(&magic_number);
     v.push_back(std::move(src));
-    REQUIRE_MESSAGE((v[0].my_pointer == &magic_number),"item was incorrectly moved during push_back?");
-    REQUIRE_MESSAGE(src.my_pointer == nullptr,"item was incorrectly moved during push_back?");
+    REQUIRE_MESSAGE((v[0].my_pointer == &magic_number), "item was incorrectly moved during push_back?");
+    REQUIRE_MESSAGE(src.my_pointer == nullptr, "item was incorrectly moved during push_back?");
 }
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
@@ -1226,13 +1272,11 @@ void TestDeductionGuides() {
 
     // check TVector(InputIterator, InputIterator, Allocator)
     TVector v2(v.begin(), v.end(), std::allocator<ComplexType>());
-    static_assert(std::is_same<decltype(v2),
-       TVector<ComplexType, std::allocator<ComplexType>>>::value);
+    static_assert(std::is_same<decltype(v2), TVector<ComplexType, std::allocator<ComplexType>>>::value);
 
     // check TVector(std::initializer_list<T>)
     TVector v3(l);
-    static_assert(std::is_same<decltype(v3),
-        TVector<ComplexType>>::value);
+    static_assert(std::is_same<decltype(v3), TVector<ComplexType>>::value);
 
     // check TVector(std::initializer_list, Allocator)
     TVector v4(l, std::allocator<ComplexType>());
@@ -1244,7 +1288,9 @@ void TestDeductionGuides() {
 
     // check TVector(TVector&, Allocator)
     TVector v6(v5, oneapi::tbb::cache_aligned_allocator<ComplexType>());
-    static_assert(std::is_same<decltype(v6), TVector<ComplexType, oneapi::tbb::cache_aligned_allocator<ComplexType>>>::value);
+    static_assert(
+            std::is_same<decltype(v6),
+                         TVector<ComplexType, oneapi::tbb::cache_aligned_allocator<ComplexType>>>::value);
 
     // check TVector(TVector&&)
     TVector v7(std::move(v1));
@@ -1252,12 +1298,13 @@ void TestDeductionGuides() {
 
     // check TVector(TVector&&, Allocator)
     TVector v8(std::move(v5), oneapi::tbb::cache_aligned_allocator<ComplexType>());
-    static_assert(std::is_same<decltype(v8), TVector<ComplexType, oneapi::tbb::cache_aligned_allocator<ComplexType>>>::value);
-
+    static_assert(
+            std::is_same<decltype(v8),
+                         TVector<ComplexType, oneapi::tbb::cache_aligned_allocator<ComplexType>>>::value);
 }
 #endif
 
-template <template <typename... > class ContainerType>
+template <template <typename...> class ContainerType>
 void test_member_types() {
     using default_container_type = ContainerType<int>;
 
@@ -1265,7 +1312,6 @@ void test_member_types() {
                                oneapi::tbb::cache_aligned_allocator<int>>::value,
                   "Incorrect default template allocator");
 
-
     using test_allocator_type = oneapi::tbb::cache_aligned_allocator<int>;
     using container_type = ContainerType<int, test_allocator_type>;
 
@@ -1283,9 +1329,11 @@ void test_member_types() {
     static_assert(std::is_same<typename container_type::const_reference, const value_type&>::value,
                   "Incorrect container const_reference member type");
     using allocator_type = typename container_type::allocator_type;
-    static_assert(std::is_same<typename container_type::pointer, typename std::allocator_traits<allocator_type>::pointer>::value,
+    static_assert(std::is_same<typename container_type::pointer,
+                               typename std::allocator_traits<allocator_type>::pointer>::value,
                   "Incorrect container pointer member type");
-    static_assert(std::is_same<typename container_type::const_pointer, typename std::allocator_traits<allocator_type>::const_pointer>::value,
+    static_assert(std::is_same<typename container_type::const_pointer,
+                               typename std::allocator_traits<allocator_type>::const_pointer>::value,
                   "Incorrect container const_pointer member type");
 
     static_assert(utils::is_random_access_iterator<typename container_type::iterator>::value,
@@ -1307,20 +1355,20 @@ template <typename Vector>
 void test_comparisons_basic() {
     using comparisons_testing::testEqualityAndLessComparisons;
     Vector v1, v2;
-    testEqualityAndLessComparisons</*ExpectEqual = */true, /*ExpectLess = */false>(v1, v2);
+    testEqualityAndLessComparisons</*ExpectEqual = */ true, /*ExpectLess = */ false>(v1, v2);
 
     v1.emplace_back(1);
-    testEqualityAndLessComparisons</*ExpectEqual = */false, /*ExpectLess = */false>(v1, v2);
+    testEqualityAndLessComparisons</*ExpectEqual = */ false, /*ExpectLess = */ false>(v1, v2);
 
     v2.emplace_back(1);
-    testEqualityAndLessComparisons</*ExpectEqual = */true, /*ExpectLess = */false>(v1, v2);
+    testEqualityAndLessComparisons</*ExpectEqual = */ true, /*ExpectLess = */ false>(v1, v2);
 
     v2.emplace_back(2);
-    testEqualityAndLessComparisons</*ExpectEqual = */false, /*ExpectLess = */true>(v1, v2);
+    testEqualityAndLessComparisons</*ExpectEqual = */ false, /*ExpectLess = */ true>(v1, v2);
 
     v1.clear();
     v2.clear();
-    testEqualityAndLessComparisons</*ExpectEqual = */true, /*ExpectLess = */false>(v1, v2);
+    testEqualityAndLessComparisons</*ExpectEqual = */ true, /*ExpectLess = */ false>(v1, v2);
 }
 
 template <typename TwoWayComparableVectorType>
@@ -1361,7 +1409,7 @@ void test_three_way_comparable_vector() {
     REQUIRE_MESSAGE(v1 >= v2, "Incorrect operator>= result");
     comparisons_testing::check_three_way_comparison();
 }
-#endif // __TBB_TEST_CPP20_COMPARISONS
+#endif// __TBB_TEST_CPP20_COMPARISONS
 
 void TestVectorComparisons() {
     using integral_vector = oneapi::tbb::concurrent_vector<int>;
@@ -1374,17 +1422,18 @@ void TestVectorComparisons() {
 #if __TBB_TEST_CPP20_COMPARISONS
     using two_way_less_only_vector = oneapi::tbb::concurrent_vector<comparisons_testing::LessComparableOnly>;
     using three_way_only_vector = oneapi::tbb::concurrent_vector<comparisons_testing::ThreeWayComparableOnly>;
-    using three_way_comparable_vector = oneapi::tbb::concurrent_vector<comparisons_testing::ThreeWayComparable>;
+    using three_way_comparable_vector
+            = oneapi::tbb::concurrent_vector<comparisons_testing::ThreeWayComparable>;
 
     test_comparisons_basic<two_way_less_only_vector>();
     test_comparisons_basic<three_way_only_vector>();
     test_comparisons_basic<three_way_comparable_vector>();
     test_three_way_comparable_vector<three_way_comparable_vector>();
-#endif // __TBB_CPP20_COMPARISONS_PRESENT && __TBB_CPP20_CONVEPTS_PRESENT
+#endif// __TBB_CPP20_COMPARISONS_PRESENT && __TBB_CPP20_CONVEPTS_PRESENT
 }
 
 template <bool ExpectEqual, bool ExpectLess, typename Iterator>
-void DoVectorIteratorComparisons( const Iterator& lhs, const Iterator& rhs ) {
+void DoVectorIteratorComparisons(const Iterator& lhs, const Iterator& rhs) {
     // TODO: replace with testEqualityAndLessComparisons after adding <=> operator for concurrent_vector iterator
     using namespace comparisons_testing;
     testEqualityComparisons<ExpectEqual>(lhs, rhs);
@@ -1392,15 +1441,15 @@ void DoVectorIteratorComparisons( const Iterator& lhs, const Iterator& rhs ) {
 }
 
 template <typename Iterator, typename VectorType>
-void TestVectorIteratorComparisonsBasic( VectorType& vec ) {
+void TestVectorIteratorComparisonsBasic(VectorType& vec) {
     REQUIRE_MESSAGE(!vec.empty(), "Incorrect test setup");
     Iterator it1, it2;
-    DoVectorIteratorComparisons</*ExpectEqual = */true, /*ExpectLess = */false>(it1, it2);
+    DoVectorIteratorComparisons</*ExpectEqual = */ true, /*ExpectLess = */ false>(it1, it2);
     it1 = vec.begin();
     it2 = vec.begin();
-    DoVectorIteratorComparisons</*ExpectEqual = */true, /*ExpectLess = */false>(it1, it2);
+    DoVectorIteratorComparisons</*ExpectEqual = */ true, /*ExpectLess = */ false>(it1, it2);
     it2 = std::prev(vec.end());
-    DoVectorIteratorComparisons</*ExpectEqual = */false, /*ExpectLess = */true>(it1, it2);
+    DoVectorIteratorComparisons</*ExpectEqual = */ false, /*ExpectLess = */ true>(it1, it2);
 }
 
 void TestVectorIteratorComparisons() {
@@ -1413,64 +1462,46 @@ void TestVectorIteratorComparisons() {
 
 //! Test type matching
 //! \brief \ref interface \ref requirement
-TEST_CASE("test type matching") {
-    test_member_types<oneapi::tbb::concurrent_vector>();
-}
+TEST_CASE("test type matching") { test_member_types<oneapi::tbb::concurrent_vector>(); }
 
 //! Test sequential access to elements
 //! \brief \ref interface \ref requirement
-TEST_CASE("testing sequential for") {
-    TestSequentialFor<move_support_tests::FooWithAssign> ();
-}
+TEST_CASE("testing sequential for") { TestSequentialFor<move_support_tests::FooWithAssign>(); }
 
 //! Test of assign, grow, copying with various sizes
 //! \brief \ref interface \ref requirement
-TEST_CASE("testing resize and copy"){
-    TestResizeAndCopy();
-}
+TEST_CASE("testing resize and copy") { TestResizeAndCopy(); }
 
 //! Test the assignment operator and swap
 //! \brief \ref interface \ref requirement
-TEST_CASE("testing copy assignment"){
-    TestCopyAssignment();
-}
+TEST_CASE("testing copy assignment") { TestCopyAssignment(); }
 
 //! Testing grow_to_at_least operations
 //! \brief \ref interface
-TEST_CASE("testing grow_to_at_least with source parameter"){
+TEST_CASE("testing grow_to_at_least with source parameter") {
     TestGrowToAtLeastWithSourceParameter<oneapi::tbb::concurrent_vector<int>>(12345);
 }
 
 //! Test of capacity, reserve, and shrink_to_fit
 //! \brief \ref interface \ref requirement
-TEST_CASE("testing capacity"){
-   TestCapacity();
-}
+TEST_CASE("testing capacity") { TestCapacity(); }
 
 #if TBB_USE_EXCEPTIONS
 //! Test exceptions
 //! \brief \ref requirement
-TEST_CASE("testing exceptions"){
-    TestExceptions();
-}
+TEST_CASE("testing exceptions") { TestExceptions(); }
 
 //! Test of push_back move exception safety
 //! \brief \ref requirement
-TEST_CASE("testing push_back move exception safety"){
-    TestPushBackMoveExceptionSafety();
-}
+TEST_CASE("testing push_back move exception safety") { TestPushBackMoveExceptionSafety(); }
 
 //! Test of emplace back move exception safety
 //! \brief \ref requirement
-TEST_CASE("testing emplace back exception safety"){
-    TestEmplaceBackExceptionSafety();
-}
+TEST_CASE("testing emplace back exception safety") { TestEmplaceBackExceptionSafety(); }
 
 //! Test exceptions guarantees for assign operator
 //! \brief \ref requirement
-TEST_CASE("testing exception safety guaranteees for assign operator"){
-    test_ex_assign_operator();
-}
+TEST_CASE("testing exception safety guaranteees for assign operator") { test_ex_assign_operator(); }
 
 //! Test exceptions safety guarantees for concurrent_vector move constructor
 //! \brief \ref requirement
@@ -1480,73 +1511,61 @@ TEST_CASE("exception safety guarantees for concurrent_vector move constructor")
 
 //! Test exceptions safety guarantees for concurrent_vector move assignment
 //! \brief \ref requirement
-TEST_CASE("test exception safety on concurrent_vector move assignment") {
-    test_ex_move_assignment();
-}
+TEST_CASE("test exception safety on concurrent_vector move assignment") { test_ex_move_assignment(); }
 #endif
 //! Test push_back in move only container
 //! \brief \ref requirement
-TEST_CASE("testing push_back move only container"){
-    TestPushBackMoveOnlyContainer();
-}
+TEST_CASE("testing push_back move only container") { TestPushBackMoveOnlyContainer(); }
 
 //! Test types for std::iterator_traits in concurrent_vector::iterator
 //! \brief \ref requirement
-TEST_CASE("testing std::iterator_traits for concurrent_vector::iterator"){
-    TestIteratorTraits<oneapi::tbb::concurrent_vector<move_support_tests::Foo>::iterator,move_support_tests::Foo>();
+TEST_CASE("testing std::iterator_traits for concurrent_vector::iterator") {
+    TestIteratorTraits<oneapi::tbb::concurrent_vector<move_support_tests::Foo>::iterator,
+                       move_support_tests::Foo>();
 }
 
 //! Test types for std::iterator_traits in concurrent_vector::const_iterator
 //! \brief \ref requirement
-TEST_CASE("testing std::iterator_traits for concurrent_vector::const_iterator"){
-    TestIteratorTraits<oneapi::tbb::concurrent_vector<move_support_tests::Foo>::const_iterator,const move_support_tests::Foo>();
+TEST_CASE("testing std::iterator_traits for concurrent_vector::const_iterator") {
+    TestIteratorTraits<oneapi::tbb::concurrent_vector<move_support_tests::Foo>::const_iterator,
+                       const move_support_tests::Foo>();
 }
 
 //! Test initializer_list support
 //! \brief \ref interface \ref requirement
-TEST_CASE("testing initializer_list support"){
-    TestInitList();
-}
+TEST_CASE("testing initializer_list support") { TestInitList(); }
 
 //! Test move constructor
 //! \brief \ref interface \ref requirement
-TEST_CASE("testing move constructor"){
-    move_support_tests::test_move_constructor<c_vector_type>();
-}
+TEST_CASE("testing move constructor") { move_support_tests::test_move_constructor<c_vector_type>(); }
 
 //! Test move assign operator
 //! \brief \ref interface \ref requirement
-TEST_CASE("testing move assign operator"){
-    move_support_tests::test_move_assignment<c_vector_type>();
-}
+TEST_CASE("testing move assign operator") { move_support_tests::test_move_assignment<c_vector_type>(); }
 
 //! Test constructor with move iterators
 //! \brief \ref requirement
-TEST_CASE("testing constructor with move iterators"){
+TEST_CASE("testing constructor with move iterators") {
     move_support_tests::test_constructor_with_move_iterators<c_vector_type>();
 }
 
 //! Test assign with move iterators
 //! \brief \ref interface \ref requirement
-TEST_CASE("testing assign with move iterators"){
+TEST_CASE("testing assign with move iterators") {
     move_support_tests::test_assign_with_move_iterators<c_vector_type>();
 }
 
 //! Test grow_by with move iterator
 //! \brief \ref requirement
-TEST_CASE("testing serial grow_by with move iterator"){
-    TestSerialGrowByWithMoveIterators();
-}
+TEST_CASE("testing serial grow_by with move iterator") { TestSerialGrowByWithMoveIterators(); }
 
 //! Test grow_by with move iterator
 //! \brief \ref requirement
-TEST_CASE("testing serial move in shrink_to_fit"){
-    TestSerialMoveInShrinkToFit();
-}
+TEST_CASE("testing serial move in shrink_to_fit") { TestSerialMoveInShrinkToFit(); }
 
 //! Test concurrent grow
 //! \brief \ref requirement
-TEST_CASE("testing concurrency"){
+TEST_CASE("testing concurrency") {
     REQUIRE(!move_support_tests::foo_count);
     for (std::size_t p = 1; p <= 4; ++p) {
         oneapi::tbb::global_control limit(oneapi::tbb::global_control::max_allowed_parallelism, p);
@@ -1560,9 +1579,7 @@ TEST_CASE("testing concurrency"){
 
 //! Test assign operations
 //! \brief \ref interface \ref requirement
-TEST_CASE("testing comparison on assign operations"){
-    TestComparison();
-}
+TEST_CASE("testing comparison on assign operations") { TestComparison(); }
 
 //! Test allocator_traits support in concurrent_vector
 //! \brief \ref requirement
@@ -1573,19 +1590,13 @@ TEST_CASE("test allocator_traits support in concurrent_vector") {
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 //! Test deduction guides
 //! \brief \ref requirement
-TEST_CASE("testing deduction guides"){
-    TestDeductionGuides<oneapi::tbb::concurrent_vector>();
-}
+TEST_CASE("testing deduction guides") { TestDeductionGuides<oneapi::tbb::concurrent_vector>(); }
 #endif
 
 //! Test concurrent_vector comparisons
 //! \brief \ref interface \ref requirement
-TEST_CASE("concurrent_vector comparisons") {
-    TestVectorComparisons();
-}
+TEST_CASE("concurrent_vector comparisons") { TestVectorComparisons(); }
 
 //! Test concurrent_vector iterators comparisons
 //! \brief \ref interface \ref requirement
-TEST_CASE("concurrent_vector iterators comparisons") {
-    TestVectorIteratorComparisons();
-}
+TEST_CASE("concurrent_vector iterators comparisons") { TestVectorIteratorComparisons(); }
diff --git a/external/tbb/test/conformance/conformance_continue_node.cpp b/external/tbb/test/conformance/conformance_continue_node.cpp
index a7eac7fa..f84af1b5 100644
--- a/external/tbb/test/conformance/conformance_continue_node.cpp
+++ b/external/tbb/test/conformance/conformance_continue_node.cpp
@@ -15,7 +15,7 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
 #endif
 
 #define CONFORMANCE_CONTINUE_NODE
@@ -25,7 +25,8 @@
 //! \file conformance_continue_node.cpp
 //! \brief Test for [flow_graph.continue_node] specification
 
-using output_msg = conformance::message</*default_ctor*/false, /*copy_ctor*/true, /*copy_assign*/true/*enable for queue_node successor*/>;
+using output_msg = conformance::message</*default_ctor*/ false, /*copy_ctor*/ true,
+                                        /*copy_assign*/ true /*enable for queue_node successor*/>;
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 
@@ -84,7 +85,7 @@ void test_deduction_guides_common(Body body) {
 
     continue_node c16(follows(b), 5, body, lightweight(), node_priority_t(5));
     static_assert(std::is_same_v<decltype(c16), continue_node<ExpectedType, lightweight>>);
-#endif // __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+#endif// __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 
     continue_node c17(c1);
     static_assert(std::is_same_v<decltype(c17), continue_node<ExpectedType>>);
@@ -95,43 +96,49 @@ void continue_void_body_f(const tbb::flow::continue_msg&) {}
 
 void test_deduction_guides() {
     using tbb::flow::continue_msg;
-    test_deduction_guides_common<int>([](const continue_msg&)->int { return 1; } );
+    test_deduction_guides_common<int>([](const continue_msg&) -> int { return 1; });
     test_deduction_guides_common<continue_msg>([](const continue_msg&) {});
 
-    test_deduction_guides_common<int>([](const continue_msg&) mutable ->int { return 1; });
+    test_deduction_guides_common<int>([](const continue_msg&) mutable -> int { return 1; });
     test_deduction_guides_common<continue_msg>([](const continue_msg&) mutable {});
 
     test_deduction_guides_common<int>(continue_body_f);
     test_deduction_guides_common<continue_msg>(continue_void_body_f);
 }
 
-#endif // __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
+#endif// __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 
 //! Test execution of node body
 //! Test node can do try_put call
 //! \brief \ref interface \ref requirement
 TEST_CASE("continue body") {
-    conformance::test_body_exec<oneapi::tbb::flow::continue_node<output_msg>, oneapi::tbb::flow::continue_msg, output_msg>();
+    conformance::test_body_exec<oneapi::tbb::flow::continue_node<output_msg>, oneapi::tbb::flow::continue_msg,
+                                output_msg>();
 }
 
 //! Test continue_node is a graph_node, receiver<continue_msg>, and sender<Output>
 //! \brief \ref interface
-TEST_CASE("continue_node superclasses"){
-    conformance::test_inheritance<oneapi::tbb::flow::continue_node<int>, oneapi::tbb::flow::continue_msg, int>();
-    conformance::test_inheritance<oneapi::tbb::flow::continue_node<void*>, oneapi::tbb::flow::continue_msg, void*>();
-    conformance::test_inheritance<oneapi::tbb::flow::continue_node<output_msg>, oneapi::tbb::flow::continue_msg, output_msg>();
+TEST_CASE("continue_node superclasses") {
+    conformance::test_inheritance<oneapi::tbb::flow::continue_node<int>, oneapi::tbb::flow::continue_msg,
+                                  int>();
+    conformance::test_inheritance<oneapi::tbb::flow::continue_node<void*>, oneapi::tbb::flow::continue_msg,
+                                  void*>();
+    conformance::test_inheritance<oneapi::tbb::flow::continue_node<output_msg>,
+                                  oneapi::tbb::flow::continue_msg, output_msg>();
 }
 
 //! Test body copying and copy_body logic
 //! Test the body object passed to a node is copied
 //! \brief \ref interface
-TEST_CASE("continue_node and body copying"){
-    conformance::test_copy_body_function<oneapi::tbb::flow::continue_node<int>, conformance::copy_counting_object<int, oneapi::tbb::flow::continue_msg>>();
+TEST_CASE("continue_node and body copying") {
+    conformance::test_copy_body_function<
+            oneapi::tbb::flow::continue_node<int>,
+            conformance::copy_counting_object<int, oneapi::tbb::flow::continue_msg>>();
 }
 
 //! Test deduction guides
 //! \brief \ref interface \ref requirement
-TEST_CASE("Deduction guides"){
+TEST_CASE("Deduction guides") {
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
     test_deduction_guides();
 #endif
@@ -139,21 +146,22 @@ TEST_CASE("Deduction guides"){
 
 //! Test node broadcast messages to successors
 //! \brief \ref requirement
-TEST_CASE("continue_node broadcast"){
+TEST_CASE("continue_node broadcast") {
     conformance::counting_functor<int> fun(conformance::expected);
-    conformance::test_forwarding<oneapi::tbb::flow::continue_node<int>, oneapi::tbb::flow::continue_msg, int>(1, fun);
+    conformance::test_forwarding<oneapi::tbb::flow::continue_node<int>, oneapi::tbb::flow::continue_msg, int>(
+            1, fun);
 }
 
 //! Test node not buffered unsuccessful message, and try_get after rejection should not succeed.
 //! \brief \ref requirement
-TEST_CASE("continue_node buffering"){
+TEST_CASE("continue_node buffering") {
     conformance::dummy_functor<int> fun;
     conformance::test_buffering<oneapi::tbb::flow::continue_node<int>, oneapi::tbb::flow::continue_msg>(fun);
 }
 
 //! Test all node costructors
 //! \brief \ref requirement
-TEST_CASE("continue_node constructors"){
+TEST_CASE("continue_node constructors") {
     using namespace oneapi::tbb::flow;
     graph g;
 
@@ -174,7 +182,7 @@ TEST_CASE("continue_node constructors"){
 //! has a copy of the initial body used by src, and only has a non-zero threshold if src is constructed with a non-zero threshold..
 //! The predecessors and successors of src are not copied.
 //! \brief \ref interface
-TEST_CASE("continue_node copy constructor"){
+TEST_CASE("continue_node copy constructor") {
     using namespace oneapi::tbb::flow;
     graph g;
 
@@ -201,19 +209,22 @@ TEST_CASE("continue_node copy constructor"){
     node_copy.try_put(oneapi::tbb::flow::continue_msg());
     g.wait_for_all();
 
-    CHECK_MESSAGE((conformance::get_values(node2).size() == 0 && conformance::get_values(node3).size() == 0), "Copied node doesn`t copy successor, but copy number of predecessors");
+    CHECK_MESSAGE((conformance::get_values(node2).size() == 0 && conformance::get_values(node3).size() == 0),
+                  "Copied node doesn`t copy successor, but copy number of predecessors");
 
     node_copy.try_put(oneapi::tbb::flow::continue_msg());
     g.wait_for_all();
 
-    CHECK_MESSAGE((conformance::get_values(node2).size() == 0 && conformance::get_values(node3).size() == 1), "Copied node doesn`t copy successor, but copy number of predecessors");
+    CHECK_MESSAGE((conformance::get_values(node2).size() == 0 && conformance::get_values(node3).size() == 1),
+                  "Copied node doesn`t copy successor, but copy number of predecessors");
 
     node1.try_put(oneapi::tbb::flow::continue_msg());
     node1.try_put(oneapi::tbb::flow::continue_msg());
     node0.try_put(oneapi::tbb::flow::continue_msg());
     g.wait_for_all();
 
-    CHECK_MESSAGE((conformance::get_values(node2).size() == 1 && conformance::get_values(node3).size() == 0), "Copied node doesn`t copy predecessor, but copy number of predecessors");
+    CHECK_MESSAGE((conformance::get_values(node2).size() == 1 && conformance::get_values(node3).size() == 0),
+                  "Copied node doesn`t copy predecessor, but copy number of predecessors");
 }
 
 //! Test continue_node wait for their predecessors to complete before executing, but no explicit data is passed across the incoming edges.
@@ -226,7 +237,7 @@ TEST_CASE("continue_node number_of_predecessors") {
     oneapi::tbb::flow::continue_node<oneapi::tbb::flow::continue_msg> node1(g, fun);
     oneapi::tbb::flow::continue_node<oneapi::tbb::flow::continue_msg> node2(g, 1, fun);
     oneapi::tbb::flow::continue_node<oneapi::tbb::flow::continue_msg> node3(g, 1, fun);
-    oneapi::tbb::flow::continue_node<int> node4(g, fun); 
+    oneapi::tbb::flow::continue_node<int> node4(g, fun);
 
     oneapi::tbb::flow::make_edge(node1, node2);
     oneapi::tbb::flow::make_edge(node2, node4);
@@ -244,14 +255,17 @@ TEST_CASE("continue_node number_of_predecessors") {
 
 //! Test nodes for execution with priority in single-threaded configuration
 //! \brief \ref requirement
-TEST_CASE("continue_node priority support"){
-    conformance::test_priority<oneapi::tbb::flow::continue_node<oneapi::tbb::flow::continue_msg, int>, oneapi::tbb::flow::continue_msg>();
+TEST_CASE("continue_node priority support") {
+    conformance::test_priority<oneapi::tbb::flow::continue_node<oneapi::tbb::flow::continue_msg, int>,
+                               oneapi::tbb::flow::continue_msg>();
 }
 
 //! Test node Output class meet the CopyConstructible requirements.
 //! \brief \ref requirement
 TEST_CASE("continue_node Output class") {
-    conformance::test_output_class<oneapi::tbb::flow::continue_node<conformance::copy_counting_object<int, oneapi::tbb::flow::continue_msg>>, conformance::copy_counting_object<int, oneapi::tbb::flow::continue_msg>>();
+    conformance::test_output_class<oneapi::tbb::flow::continue_node<conformance::copy_counting_object<
+                                           int, oneapi::tbb::flow::continue_msg>>,
+                                   conformance::copy_counting_object<int, oneapi::tbb::flow::continue_msg>>();
 }
 
 //! Test body `try_put' statement not wait for the execution of the body to complete
diff --git a/external/tbb/test/conformance/conformance_enumerable_thread_specific.cpp b/external/tbb/test/conformance/conformance_enumerable_thread_specific.cpp
index d33cd5d7..6210a042 100644
--- a/external/tbb/test/conformance/conformance_enumerable_thread_specific.cpp
+++ b/external/tbb/test/conformance/conformance_enumerable_thread_specific.cpp
@@ -16,37 +16,37 @@
 
 #if _MSC_VER
 #if __INTEL_COMPILER
-    #pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
 #else
-    // Workaround for vs2015 and warning name was longer than the compiler limit (4096).
-    #pragma warning (disable: 4503)
+// Workaround for vs2015 and warning name was longer than the compiler limit (4096).
+#pragma warning(disable : 4503)
 #endif
 #endif
 
+#include "common/checktype.h"
+#include "common/spin_barrier.h"
 #include "common/test.h"
+#include "common/test_comparisons.h"
 #include "common/utils.h"
-#include "common/utils_report.h"
 #include "common/utils_concurrency_limit.h"
-#include "common/spin_barrier.h"
-#include "common/checktype.h"
-#include "common/test_comparisons.h"
+#include "common/utils_report.h"
 
+#include "oneapi/tbb/blocked_range.h"
+#include "oneapi/tbb/cache_aligned_allocator.h"
 #include "oneapi/tbb/detail/_utils.h"
 #include "oneapi/tbb/enumerable_thread_specific.h"
+#include "oneapi/tbb/global_control.h"
 #include "oneapi/tbb/parallel_for.h"
-#include "oneapi/tbb/parallel_reduce.h"
 #include "oneapi/tbb/parallel_invoke.h"
-#include "oneapi/tbb/blocked_range.h"
+#include "oneapi/tbb/parallel_reduce.h"
 #include "oneapi/tbb/tbb_allocator.h"
-#include "oneapi/tbb/global_control.h"
-#include "oneapi/tbb/cache_aligned_allocator.h"
 
-#include <cstring>
+#include <atomic>
 #include <cstdio>
-#include <vector>
+#include <cstring>
 #include <numeric>
 #include <utility>
-#include <atomic>
+#include <vector>
 
 //! \file conformance_enumerable_thread_specific.cpp
 //! \brief Test for [tls.enumerable_thread_specific tls.flattened2d] specification
@@ -71,38 +71,55 @@ const double EXPECTED_SUM = (REPETITIONS + 1) * N;
 
 //! A minimal class that occupies N bytes.
 /** Defines default and copy constructor, and allows implicit operator&. Hides operator=. */
-template<size_t N = oneapi::tbb::detail::max_nfs_size>
-class minimalNComparable: utils::NoAssign {
+template <size_t N = oneapi::tbb::detail::max_nfs_size>
+class minimalNComparable : utils::NoAssign {
 private:
     int my_value;
     bool is_constructed;
-    char pad[N-sizeof(int) - sizeof(bool)];
+    char pad[N - sizeof(int) - sizeof(bool)];
+
 public:
-    minimalNComparable() : utils::NoAssign(), my_value(0) { ++construction_counter; is_constructed = true; }
-    minimalNComparable( const minimalNComparable &m ) : utils::NoAssign(), my_value(m.my_value) { ++construction_counter; is_constructed = true; }
-    ~minimalNComparable() { ++destruction_counter; CHECK_FAST(is_constructed); is_constructed = false; }
-    void set_value( const int i ) { CHECK_FAST(is_constructed); my_value = i; }
-    int value( ) const { CHECK_FAST(is_constructed); return my_value; }
+    minimalNComparable() : utils::NoAssign(), my_value(0) {
+        ++construction_counter;
+        is_constructed = true;
+    }
+    minimalNComparable(const minimalNComparable& m) : utils::NoAssign(), my_value(m.my_value) {
+        ++construction_counter;
+        is_constructed = true;
+    }
+    ~minimalNComparable() {
+        ++destruction_counter;
+        CHECK_FAST(is_constructed);
+        is_constructed = false;
+    }
+    void set_value(const int i) {
+        CHECK_FAST(is_constructed);
+        my_value = i;
+    }
+    int value() const {
+        CHECK_FAST(is_constructed);
+        return my_value;
+    }
 
-    bool operator==( const minimalNComparable& other ) const { return my_value == other.my_value; }
+    bool operator==(const minimalNComparable& other) const { return my_value == other.my_value; }
 };
 
-static size_t AlignMask = 0;  // set to cache-line-size - 1
+static size_t AlignMask = 0;// set to cache-line-size - 1
 
-template<typename T>
-T& check_alignment(T& t, const char *aname) {
-    if( !oneapi::tbb::detail::is_aligned(&t, AlignMask)) {
+template <typename T>
+T& check_alignment(T& t, const char* aname) {
+    if (!oneapi::tbb::detail::is_aligned(&t, AlignMask)) {
         // TBB_REVAMP_TODO: previously was REPORT_ONCE
-        REPORT("alignment error with %s allocator (%x)\n", aname, (int)size_t(&t) & (AlignMask-1));
+        REPORT("alignment error with %s allocator (%x)\n", aname, (int) size_t(&t) & (AlignMask - 1));
     }
     return t;
 }
 
-template<typename T>
-const T& check_alignment(const T& t, const char *aname) {
-    if( !oneapi::tbb::detail::is_aligned(&t, AlignMask)) {
+template <typename T>
+const T& check_alignment(const T& t, const char* aname) {
+    if (!oneapi::tbb::detail::is_aligned(&t, AlignMask)) {
         // TBB_REVAMP_TODO: previously was REPORT_ONCE
-        REPORT("alignment error with %s allocator (%x)\n", aname, (int)size_t(&t) & (AlignMask-1));
+        REPORT("alignment error with %s allocator (%x)\n", aname, (int) size_t(&t) & (AlignMask - 1));
     }
     return t;
 }
@@ -118,9 +135,7 @@ class Thrower {
 public:
     Thrower() {
 #if TBB_USE_EXCEPTIONS
-        if(++gThrowValue == targetThrowValue) {
-            throw std::bad_alloc();
-        }
+        if (++gThrowValue == targetThrowValue) { throw std::bad_alloc(); }
 #endif
     }
 };
@@ -131,11 +146,13 @@ class Thrower {
 class ThrowingConstructor {
     CheckType<int> m_checktype;
     Thrower m_throwing_field;
+
 public:
     int m_cnt;
-    ThrowingConstructor() : m_checktype(), m_throwing_field() { m_cnt = 0;}
+    ThrowingConstructor() : m_checktype(), m_throwing_field() { m_cnt = 0; }
+
+    bool operator==(const ThrowingConstructor& other) const { return m_cnt == other.m_cnt; }
 
-    bool operator==( const ThrowingConstructor& other ) const { return m_cnt == other.m_cnt; }
 private:
 };
 
@@ -144,37 +161,50 @@ class ThrowingConstructor {
 // define = or + operators.
 //
 
-template< typename T >
+template <typename T>
 struct test_helper {
-   static inline void init(T &e) { e = static_cast<T>(0); }
-   static inline void sum(T &e, const int addend ) { e += static_cast<T>(addend); }
-   static inline void sum(T &e, const double addend ) { e += static_cast<T>(addend); }
-   static inline void set(T &e, const int value ) { e = static_cast<T>(value); }
-   static inline double get(const T &e ) { return static_cast<double>(e); }
+    static inline void init(T& e) { e = static_cast<T>(0); }
+    static inline void sum(T& e, const int addend) { e += static_cast<T>(addend); }
+    static inline void sum(T& e, const double addend) { e += static_cast<T>(addend); }
+    static inline void set(T& e, const int value) { e = static_cast<T>(value); }
+    static inline double get(const T& e) { return static_cast<double>(e); }
 };
 
-template<size_t N>
-struct test_helper<minimalNComparable<N> > {
-   static inline void init(minimalNComparable<N> &sum) { sum.set_value( 0 ); }
-   static inline void sum(minimalNComparable<N> &sum, const int addend ) { sum.set_value( sum.value() + addend); }
-   static inline void sum(minimalNComparable<N> &sum, const double addend ) { sum.set_value( sum.value() + static_cast<int>(addend)); }
-   static inline void sum(minimalNComparable<N> &sum, const minimalNComparable<N> &addend ) { sum.set_value( sum.value() + addend.value()); }
-   static inline void set(minimalNComparable<N> &v, const int value ) { v.set_value( static_cast<int>(value) ); }
-   static inline double get(const minimalNComparable<N> &sum ) { return static_cast<double>(sum.value()); }
+template <size_t N>
+struct test_helper<minimalNComparable<N>> {
+    static inline void init(minimalNComparable<N>& sum) { sum.set_value(0); }
+    static inline void sum(minimalNComparable<N>& sum, const int addend) {
+        sum.set_value(sum.value() + addend);
+    }
+    static inline void sum(minimalNComparable<N>& sum, const double addend) {
+        sum.set_value(sum.value() + static_cast<int>(addend));
+    }
+    static inline void sum(minimalNComparable<N>& sum, const minimalNComparable<N>& addend) {
+        sum.set_value(sum.value() + addend.value());
+    }
+    static inline void set(minimalNComparable<N>& v, const int value) {
+        v.set_value(static_cast<int>(value));
+    }
+    static inline double get(const minimalNComparable<N>& sum) { return static_cast<double>(sum.value()); }
 };
 
-template<>
+template <>
 struct test_helper<ThrowingConstructor> {
-   static inline void init(ThrowingConstructor &sum) { sum.m_cnt = 0; }
-   static inline void sum(ThrowingConstructor &sum, const int addend ) { sum.m_cnt += addend; }
-   static inline void sum(ThrowingConstructor &sum, const double addend ) { sum.m_cnt += static_cast<int>(addend); }
-   static inline void sum(ThrowingConstructor &sum, const ThrowingConstructor &addend ) { sum.m_cnt += addend.m_cnt; }
-   static inline void set(ThrowingConstructor &v, const int value ) { v.m_cnt = static_cast<int>(value); }
-   static inline double get(const ThrowingConstructor &sum ) { return static_cast<double>(sum.m_cnt); }
+    static inline void init(ThrowingConstructor& sum) { sum.m_cnt = 0; }
+    static inline void sum(ThrowingConstructor& sum, const int addend) { sum.m_cnt += addend; }
+    static inline void sum(ThrowingConstructor& sum, const double addend) {
+        sum.m_cnt += static_cast<int>(addend);
+    }
+    static inline void sum(ThrowingConstructor& sum, const ThrowingConstructor& addend) {
+        sum.m_cnt += addend.m_cnt;
+    }
+    static inline void set(ThrowingConstructor& v, const int value) { v.m_cnt = static_cast<int>(value); }
+    static inline double get(const ThrowingConstructor& sum) { return static_cast<double>(sum.m_cnt); }
 };
 
 //! Tag class used to make certain constructors hard to invoke accidentally.
-struct SecretTagType {} SecretTag;
+struct SecretTagType {
+} SecretTag;
 
 //// functors and routines for initialization and combine
 
@@ -183,28 +213,32 @@ static std::atomic<int> FinitCounter;
 
 template <typename T, int Value>
 struct FunctorFinit {
-    FunctorFinit( const FunctorFinit& ) {++FinitCounter;}
-    FunctorFinit( SecretTagType ) {++FinitCounter;}
-    ~FunctorFinit() {--FinitCounter;}
+    FunctorFinit(const FunctorFinit&) { ++FinitCounter; }
+    FunctorFinit(SecretTagType) { ++FinitCounter; }
+    ~FunctorFinit() { --FinitCounter; }
     T operator()() { return Value; }
 };
 
 template <int Value>
-struct FunctorFinit<ThrowingConstructor,Value> {
-    FunctorFinit( const FunctorFinit& ) {++FinitCounter;}
-    FunctorFinit( SecretTagType ) {++FinitCounter;}
-    ~FunctorFinit() {--FinitCounter;}
-    ThrowingConstructor operator()() { ThrowingConstructor temp; temp.m_cnt = Value; return temp; }
+struct FunctorFinit<ThrowingConstructor, Value> {
+    FunctorFinit(const FunctorFinit&) { ++FinitCounter; }
+    FunctorFinit(SecretTagType) { ++FinitCounter; }
+    ~FunctorFinit() { --FinitCounter; }
+    ThrowingConstructor operator()() {
+        ThrowingConstructor temp;
+        temp.m_cnt = Value;
+        return temp;
+    }
 };
 
 template <size_t N, int Value>
-struct FunctorFinit<minimalNComparable<N>,Value> {
-    FunctorFinit( const FunctorFinit& ) {++FinitCounter;}
-    FunctorFinit( SecretTagType ) {++FinitCounter;}
-    ~FunctorFinit() {--FinitCounter;}
+struct FunctorFinit<minimalNComparable<N>, Value> {
+    FunctorFinit(const FunctorFinit&) { ++FinitCounter; }
+    FunctorFinit(SecretTagType) { ++FinitCounter; }
+    ~FunctorFinit() { --FinitCounter; }
     minimalNComparable<N> operator()() {
         minimalNComparable<N> result;
-        result.set_value( Value );
+        result.set_value(Value);
         return result;
     }
 };
@@ -213,16 +247,15 @@ struct FunctorFinit<minimalNComparable<N>,Value> {
 
 template <typename T>
 struct FunctorAddCombineRef {
-    T operator()(const T& left, const T& right) const {
-        return left+right;
-    }
+    T operator()(const T& left, const T& right) const { return left + right; }
 };
 
 template <size_t N>
-struct FunctorAddCombineRef<minimalNComparable<N> > {
-    minimalNComparable<N> operator()(const minimalNComparable<N>& left, const minimalNComparable<N>& right) const {
+struct FunctorAddCombineRef<minimalNComparable<N>> {
+    minimalNComparable<N> operator()(const minimalNComparable<N>& left,
+                                     const minimalNComparable<N>& right) const {
         minimalNComparable<N> result;
-        result.set_value( left.value() + right.value() );
+        result.set_value(left.value() + right.value());
         return result;
     }
 };
@@ -231,25 +264,25 @@ template <>
 struct FunctorAddCombineRef<ThrowingConstructor> {
     ThrowingConstructor operator()(const ThrowingConstructor& left, const ThrowingConstructor& right) const {
         ThrowingConstructor result;
-        result.m_cnt = ( left.m_cnt + right.m_cnt );
+        result.m_cnt = (left.m_cnt + right.m_cnt);
         return result;
     }
 };
 
 template <typename T>
 struct FunctorAddCombine {
-    T operator()(T left, T right ) const {
-        return FunctorAddCombineRef<T>()( left, right );
-    }
+    T operator()(T left, T right) const { return FunctorAddCombineRef<T>()(left, right); }
 };
 
 template <typename T>
-T FunctionAddByRef( const T &left, const T &right) {
-    return FunctorAddCombineRef<T>()( left, right );
+T FunctionAddByRef(const T& left, const T& right) {
+    return FunctorAddCombineRef<T>()(left, right);
 }
 
 template <typename T>
-T FunctionAdd( T left, T right) { return FunctionAddByRef(left,right); }
+T FunctionAdd(T left, T right) {
+    return FunctionAddByRef(left, right);
+}
 
 template <typename T>
 class Accumulator {
@@ -261,6 +294,7 @@ class Accumulator {
         return *this;
     }
     void operator()(const T& new_bit) { test_helper<T>::sum(my_result, new_bit); }
+
 private:
     T& my_result;
 };
@@ -281,9 +315,10 @@ class ClearingAccumulator {
     static void AssertClean(const T& thread_local_value) {
         T zero;
         test_helper<T>::init(zero);
-        REQUIRE_MESSAGE(test_helper<T>::get(thread_local_value)==test_helper<T>::get(zero),
-               "combine_each does not allow to modify thread local values?");
+        REQUIRE_MESSAGE(test_helper<T>::get(thread_local_value) == test_helper<T>::get(zero),
+                        "combine_each does not allow to modify thread local values?");
     }
+
 private:
     T& my_result;
 };
@@ -294,27 +329,25 @@ class ClearingAccumulator {
 // Tests for tests cases
 //------------------------------------------------------------------------------------------------------
 
-template <typename T, template<class> class Allocator>
-class parallel_scalar_body: utils::NoAssign {
-    typedef oneapi::tbb::enumerable_thread_specific<T, Allocator<T> > ets_type;
-    ets_type &sums;
+template <typename T, template <class> class Allocator>
+class parallel_scalar_body : utils::NoAssign {
+    typedef oneapi::tbb::enumerable_thread_specific<T, Allocator<T>> ets_type;
+    ets_type& sums;
     const char* allocator_name;
 
 public:
+    parallel_scalar_body(ets_type& _sums, const char* alloc_name) : sums(_sums), allocator_name(alloc_name) {}
 
-    parallel_scalar_body ( ets_type &_sums, const char *alloc_name ) : sums(_sums), allocator_name(alloc_name) { }
-
-    void operator()( const oneapi::tbb::blocked_range<int> &r ) const {
+    void operator()(const oneapi::tbb::blocked_range<int>& r) const {
         for (int i = r.begin(); i != r.end(); ++i)
-            test_helper<T>::sum( check_alignment(sums.local(),allocator_name), 1 );
+            test_helper<T>::sum(check_alignment(sums.local(), allocator_name), 1);
     }
-
 };
 
-template< typename T, template<class> class Allocator>
-void run_parallel_scalar_tests_nocombine(const char* /* test_name */, const char *allocator_name) {
+template <typename T, template <class> class Allocator>
+void run_parallel_scalar_tests_nocombine(const char* /* test_name */, const char* allocator_name) {
 
-    typedef oneapi::tbb::enumerable_thread_specific<T, Allocator<T> > ets_type;
+    typedef oneapi::tbb::enumerable_thread_specific<T, Allocator<T>> ets_type;
 
     Checker<T> my_check;
 
@@ -322,18 +355,16 @@ void run_parallel_scalar_tests_nocombine(const char* /* test_name */, const char
     struct fail_on_exception_guard {
         bool dismiss = false;
         ~fail_on_exception_guard() {
-            if (!dismiss) {
-                FAIL("The exception is not expected");
-            }
+            if (!dismiss) { FAIL("The exception is not expected"); }
         }
     } guard;
-    T default_value{};
+    T default_value {};
     guard.dismiss = true;
 
     gThrowValue = 0;
     {
         // We assume that static_sums zero-initialized or has a default constructor that zeros it.
-        ets_type static_sums = ets_type( T() );
+        ets_type static_sums = ets_type(T());
 
         T exemplar;
         test_helper<T>::init(exemplar);
@@ -374,121 +405,126 @@ void run_parallel_scalar_tests_nocombine(const char* /* test_name */, const char
                 static_sums.clear();
 
                 ets_type sums(exemplar);
-                FunctorFinit<T,0> my_finit(SecretTag);
+                FunctorFinit<T, 0> my_finit(SecretTag);
                 ets_type finit_ets(my_finit);
 
-                REQUIRE( sums.empty());
-                oneapi::tbb::parallel_for( oneapi::tbb::blocked_range<int>( 0, N*p, RANGE_MIN ), parallel_scalar_body<T,Allocator>( sums, allocator_name ) );
-                REQUIRE( !sums.empty());
+                REQUIRE(sums.empty());
+                oneapi::tbb::parallel_for(oneapi::tbb::blocked_range<int>(0, N * p, RANGE_MIN),
+                                          parallel_scalar_body<T, Allocator>(sums, allocator_name));
+                REQUIRE(!sums.empty());
 
-                REQUIRE( finit_ets.empty());
-                oneapi::tbb::parallel_for( oneapi::tbb::blocked_range<int>( 0, N*p, RANGE_MIN ), parallel_scalar_body<T,Allocator>( finit_ets, allocator_name ) );
-                REQUIRE( !finit_ets.empty());
+                REQUIRE(finit_ets.empty());
+                oneapi::tbb::parallel_for(oneapi::tbb::blocked_range<int>(0, N * p, RANGE_MIN),
+                                          parallel_scalar_body<T, Allocator>(finit_ets, allocator_name));
+                REQUIRE(!finit_ets.empty());
 
                 REQUIRE(static_sums.empty());
-                oneapi::tbb::parallel_for( oneapi::tbb::blocked_range<int>( 0, N*p, RANGE_MIN ), parallel_scalar_body<T,Allocator>( static_sums, allocator_name ) );
-                REQUIRE( !static_sums.empty());
+                oneapi::tbb::parallel_for(oneapi::tbb::blocked_range<int>(0, N * p, RANGE_MIN),
+                                          parallel_scalar_body<T, Allocator>(static_sums, allocator_name));
+                REQUIRE(!static_sums.empty());
 
                 // use iterator
                 typename ets_type::size_type size = 0;
-                for ( typename ets_type::iterator i = sums.begin(); i != sums.end(); ++i ) {
-                     ++size;
-                     test_helper<T>::sum(iterator_sum, *i);
+                for (typename ets_type::iterator i = sums.begin(); i != sums.end(); ++i) {
+                    ++size;
+                    test_helper<T>::sum(iterator_sum, *i);
                 }
-                REQUIRE( sums.size() == size);
+                REQUIRE(sums.size() == size);
 
                 // use const_iterator
-                for ( typename ets_type::const_iterator i = sums.begin(); i != sums.end(); ++i ) {
-                     test_helper<T>::sum(const_iterator_sum, *i);
+                for (typename ets_type::const_iterator i = sums.begin(); i != sums.end(); ++i) {
+                    test_helper<T>::sum(const_iterator_sum, *i);
                 }
 
                 // use range_type
                 typename ets_type::range_type r = sums.range();
-                for ( typename ets_type::range_type::const_iterator i = r.begin(); i != r.end(); ++i ) {
-                     test_helper<T>::sum(range_sum, *i);
+                for (typename ets_type::range_type::const_iterator i = r.begin(); i != r.end(); ++i) {
+                    test_helper<T>::sum(range_sum, *i);
                 }
 
                 // use const_range_type
                 const ets_type& csums = sums;
                 typename ets_type::const_range_type cr = csums.range();
-                for ( typename ets_type::const_range_type::iterator i = cr.begin(); i != cr.end(); ++i ) {
-                     test_helper<T>::sum(const_range_sum, *i);
+                for (typename ets_type::const_range_type::iterator i = cr.begin(); i != cr.end(); ++i) {
+                    test_helper<T>::sum(const_range_sum, *i);
                 }
 
                 // test copy constructor, with TLS-cached locals
-                typedef typename oneapi::tbb::enumerable_thread_specific<T, Allocator<T>, oneapi::tbb::ets_key_per_instance> cached_ets_type;
+                typedef typename oneapi::tbb::enumerable_thread_specific<T, Allocator<T>,
+                                                                         oneapi::tbb::ets_key_per_instance>
+                        cached_ets_type;
 
                 cached_ets_type cconst(sums);
-                oneapi::tbb::parallel_for( oneapi::tbb::blocked_range<int>(0, N*p, RANGE_MIN), [&]( const oneapi::tbb::blocked_range<int>& ) {
-                    bool exists = false;
-                    T& ref = cconst.local(exists);
-                    CHECK( (exists || ref == default_value) );
-                } );
+                oneapi::tbb::parallel_for(oneapi::tbb::blocked_range<int>(0, N * p, RANGE_MIN),
+                                          [&](const oneapi::tbb::blocked_range<int>&) {
+                                              bool exists = false;
+                                              T& ref = cconst.local(exists);
+                                              CHECK((exists || ref == default_value));
+                                          });
                 cached_ets_type cconst_to_assign1 = cconst;
                 cached_ets_type cconst_to_assign2;
                 cconst_to_assign2 = std::move(cconst_to_assign1);
                 REQUIRE(cconst_to_assign2.size() == cconst.size());
 
-                for ( typename cached_ets_type::const_iterator i = cconst.begin(); i != cconst.end(); ++i ) {
-                     test_helper<T>::sum(cconst_sum, *i);
+                for (typename cached_ets_type::const_iterator i = cconst.begin(); i != cconst.end(); ++i) {
+                    test_helper<T>::sum(cconst_sum, *i);
                 }
 
                 // test assignment
                 ets_type assigned;
                 assigned = sums;
 
-                for ( typename ets_type::const_iterator i = assigned.begin(); i != assigned.end(); ++i ) {
-                     test_helper<T>::sum(assign_sum, *i);
+                for (typename ets_type::const_iterator i = assigned.begin(); i != assigned.end(); ++i) {
+                    test_helper<T>::sum(assign_sum, *i);
                 }
 
                 // test assign to and from cached locals
                 cached_ets_type cassgn;
                 cassgn = sums;
-                for ( typename cached_ets_type::const_iterator i = cassgn.begin(); i != cassgn.end(); ++i ) {
-                     test_helper<T>::sum(cassgn_sum, *i);
+                for (typename cached_ets_type::const_iterator i = cassgn.begin(); i != cassgn.end(); ++i) {
+                    test_helper<T>::sum(cassgn_sum, *i);
                 }
 
                 ets_type non_cassgn;
                 non_cassgn = cassgn;
-                for ( typename ets_type::const_iterator i = non_cassgn.begin(); i != non_cassgn.end(); ++i ) {
-                     test_helper<T>::sum(non_cassgn_sum, *i);
+                for (typename ets_type::const_iterator i = non_cassgn.begin(); i != non_cassgn.end(); ++i) {
+                    test_helper<T>::sum(non_cassgn_sum, *i);
                 }
 
                 // test finit-initialized ets
-                for(typename ets_type::const_iterator i = finit_ets.begin(); i != finit_ets.end(); ++i) {
+                for (typename ets_type::const_iterator i = finit_ets.begin(); i != finit_ets.end(); ++i) {
                     test_helper<T>::sum(finit_ets_sum, *i);
                 }
 
                 // test static ets
-                for(typename ets_type::const_iterator i = static_sums.begin(); i != static_sums.end(); ++i) {
+                for (typename ets_type::const_iterator i = static_sums.begin(); i != static_sums.end(); ++i) {
                     test_helper<T>::sum(static_sum, *i);
                 }
-
             }
 
-            REQUIRE(EXPECTED_SUM*p == test_helper<T>::get(iterator_sum));
-            REQUIRE(EXPECTED_SUM*p == test_helper<T>::get(const_iterator_sum));
-            REQUIRE(EXPECTED_SUM*p == test_helper<T>::get(range_sum));
-            REQUIRE(EXPECTED_SUM*p == test_helper<T>::get(const_range_sum));
-
-            REQUIRE(EXPECTED_SUM*p == test_helper<T>::get(cconst_sum));
-            REQUIRE(EXPECTED_SUM*p == test_helper<T>::get(assign_sum));
-            REQUIRE(EXPECTED_SUM*p == test_helper<T>::get(cassgn_sum));
-            REQUIRE(EXPECTED_SUM*p == test_helper<T>::get(non_cassgn_sum));
-            REQUIRE(EXPECTED_SUM*p == test_helper<T>::get(finit_ets_sum));
-            REQUIRE(EXPECTED_SUM*p == test_helper<T>::get(static_sum));
+            REQUIRE(EXPECTED_SUM * p == test_helper<T>::get(iterator_sum));
+            REQUIRE(EXPECTED_SUM * p == test_helper<T>::get(const_iterator_sum));
+            REQUIRE(EXPECTED_SUM * p == test_helper<T>::get(range_sum));
+            REQUIRE(EXPECTED_SUM * p == test_helper<T>::get(const_range_sum));
+
+            REQUIRE(EXPECTED_SUM * p == test_helper<T>::get(cconst_sum));
+            REQUIRE(EXPECTED_SUM * p == test_helper<T>::get(assign_sum));
+            REQUIRE(EXPECTED_SUM * p == test_helper<T>::get(cassgn_sum));
+            REQUIRE(EXPECTED_SUM * p == test_helper<T>::get(non_cassgn_sum));
+            REQUIRE(EXPECTED_SUM * p == test_helper<T>::get(finit_ets_sum));
+            REQUIRE(EXPECTED_SUM * p == test_helper<T>::get(static_sum));
         }
-    }  // Checker block
+    }// Checker block
 }
 
-template< typename T, template<class> class Allocator>
+template <typename T, template <class> class Allocator>
 void run_parallel_scalar_tests(const char* test_name, const char* allocator_name) {
 
-    typedef oneapi::tbb::enumerable_thread_specific<T, Allocator<T> > ets_type;
+    typedef oneapi::tbb::enumerable_thread_specific<T, Allocator<T>> ets_type;
     bool exception_caught = false;
 
     // We assume that static_sums zero-initialized or has a default constructor that zeros it.
-    ets_type static_sums = ets_type( T() );
+    ets_type static_sums = ets_type(T());
 
     T exemplar;
     test_helper<T>::init(exemplar);
@@ -498,15 +534,14 @@ void run_parallel_scalar_tests(const char* test_name, const char* allocator_name
     // this means once; for the throwing type test it may loop two or three times.  The
     // value of targetThrowValue will determine when and if the test will throw.
     do {
-        targetThrowValue = test_throw_count;  // keep testing until we get no exception
+        targetThrowValue = test_throw_count;// keep testing until we get no exception
         exception_caught = false;
 #if TBB_USE_EXCEPTIONS
         try {
 #endif
-            run_parallel_scalar_tests_nocombine<T,Allocator>(test_name, allocator_name);
+            run_parallel_scalar_tests_nocombine<T, Allocator>(test_name, allocator_name);
 #if TBB_USE_EXCEPTIONS
-        }
-        catch(...) {}
+        } catch (...) {}
 #endif
         for (int p = std::max(MinThread, 2); p <= MaxThread; ++p) {
             oneapi::tbb::global_control gc(oneapi::tbb::global_control::max_allowed_parallelism, p);
@@ -541,12 +576,13 @@ void run_parallel_scalar_tests(const char* test_name, const char* allocator_name
 
                         REQUIRE(sums.empty());
                         oneapi::tbb::parallel_for(oneapi::tbb::blocked_range<int>(0, N * p, RANGE_MIN),
-                            parallel_scalar_body<T, Allocator>(sums, allocator_name));
+                                                  parallel_scalar_body<T, Allocator>(sums, allocator_name));
                         REQUIRE(!sums.empty());
 
                         REQUIRE(static_sums.empty());
-                        oneapi::tbb::parallel_for(oneapi::tbb::blocked_range<int>(0, N * p, RANGE_MIN),
-                            parallel_scalar_body<T, Allocator>(static_sums, allocator_name));
+                        oneapi::tbb::parallel_for(
+                                oneapi::tbb::blocked_range<int>(0, N * p, RANGE_MIN),
+                                parallel_scalar_body<T, Allocator>(static_sums, allocator_name));
                         REQUIRE(!static_sums.empty());
 
                         // Use combine
@@ -577,32 +613,30 @@ void run_parallel_scalar_tests(const char* test_name, const char* allocator_name
                 REQUIRE(EXPECTED_SUM * p == test_helper<T>::get(clearing_accumulator_sum));
             }
 
-        }  // MinThread .. MaxThread
-        test_throw_count += 10;  // keep testing until we don't get an exception
+        }                      // MinThread .. MaxThread
+        test_throw_count += 10;// keep testing until we don't get an exception
     } while (exception_caught && test_throw_count < 200);
     REQUIRE_MESSAGE(!exception_caught, "No non-exception test completed");
 }
 
-template <typename T, template<class> class Allocator>
-class parallel_vector_for_body: utils::NoAssign {
-    typedef std::vector<T, oneapi::tbb::tbb_allocator<T> > container_type;
-    typedef oneapi::tbb::enumerable_thread_specific< container_type, Allocator<container_type> > ets_type;
-    ets_type &locals;
-    const char *allocator_name;
+template <typename T, template <class> class Allocator>
+class parallel_vector_for_body : utils::NoAssign {
+    typedef std::vector<T, oneapi::tbb::tbb_allocator<T>> container_type;
+    typedef oneapi::tbb::enumerable_thread_specific<container_type, Allocator<container_type>> ets_type;
+    ets_type& locals;
+    const char* allocator_name;
 
 public:
+    parallel_vector_for_body(ets_type& _locals, const char* aname) : locals(_locals), allocator_name(aname) {}
 
-    parallel_vector_for_body ( ets_type &_locals, const char *aname ) : locals(_locals), allocator_name(aname) { }
-
-    void operator()( const oneapi::tbb::blocked_range<int> &r ) const {
+    void operator()(const oneapi::tbb::blocked_range<int>& r) const {
         T one;
         test_helper<T>::set(one, 1);
 
         for (int i = r.begin(); i < r.end(); ++i) {
-            check_alignment(locals.local(),allocator_name).push_back( one );
+            check_alignment(locals.local(), allocator_name).push_back(one);
         }
     }
-
 };
 
 template <typename R, typename T>
@@ -610,14 +644,16 @@ struct parallel_vector_reduce_body {
 
     T sum;
     size_t count;
-    typedef std::vector<T, oneapi::tbb::tbb_allocator<T> > container_type;
+    typedef std::vector<T, oneapi::tbb::tbb_allocator<T>> container_type;
 
-    parallel_vector_reduce_body ( ) : count(0) { test_helper<T>::init(sum); }
-    parallel_vector_reduce_body ( parallel_vector_reduce_body<R, T> &, oneapi::tbb::split ) : count(0) {  test_helper<T>::init(sum); }
+    parallel_vector_reduce_body() : count(0) { test_helper<T>::init(sum); }
+    parallel_vector_reduce_body(parallel_vector_reduce_body<R, T>&, oneapi::tbb::split) : count(0) {
+        test_helper<T>::init(sum);
+    }
 
-    void operator()( const R &r ) {
+    void operator()(const R& r) {
         for (typename R::iterator ri = r.begin(); ri != r.end(); ++ri) {
-            const container_type &v = *ri;
+            const container_type& v = *ri;
             ++count;
             for (typename container_type::const_iterator vi = v.begin(); vi != v.end(); ++vi) {
                 test_helper<T>::sum(sum, *vi);
@@ -625,17 +661,16 @@ struct parallel_vector_reduce_body {
         }
     }
 
-    void join( const parallel_vector_reduce_body &b ) {
-        test_helper<T>::sum(sum,b.sum);
+    void join(const parallel_vector_reduce_body& b) {
+        test_helper<T>::sum(sum, b.sum);
         count += b.count;
     }
-
 };
 
-template< typename T, template<class> class Allocator>
-void run_parallel_vector_tests(const char* /* test_name */, const char *allocator_name) {
-    typedef std::vector<T, oneapi::tbb::tbb_allocator<T> > container_type;
-    typedef oneapi::tbb::enumerable_thread_specific< container_type, Allocator<container_type> > ets_type;
+template <typename T, template <class> class Allocator>
+void run_parallel_vector_tests(const char* /* test_name */, const char* allocator_name) {
+    typedef std::vector<T, oneapi::tbb::tbb_allocator<T>> container_type;
+    typedef oneapi::tbb::enumerable_thread_specific<container_type, Allocator<container_type>> ets_type;
 
     for (int p = std::max(MinThread, 2); p <= MaxThread; ++p) {
         oneapi::tbb::global_control gc(oneapi::tbb::global_control::max_allowed_parallelism, p);
@@ -646,30 +681,30 @@ void run_parallel_vector_tests(const char* /* test_name */, const char *allocato
         for (int t = -1; t < REPETITIONS; ++t) {
             ets_type vs;
 
-            REQUIRE( vs.empty() );
-            oneapi::tbb::parallel_for( oneapi::tbb::blocked_range<int> (0, N*p, RANGE_MIN),
-                               parallel_vector_for_body<T,Allocator>( vs, allocator_name ) );
-            REQUIRE( !vs.empty() );
+            REQUIRE(vs.empty());
+            oneapi::tbb::parallel_for(oneapi::tbb::blocked_range<int>(0, N * p, RANGE_MIN),
+                                      parallel_vector_for_body<T, Allocator>(vs, allocator_name));
+            REQUIRE(!vs.empty());
 
             // copy construct
-            ets_type vs2(vs); // this causes an assertion failure, related to allocators...
+            ets_type vs2(vs);// this causes an assertion failure, related to allocators...
 
             // assign
             ets_type vs3;
             vs3 = vs;
 
-            parallel_vector_reduce_body< typename ets_type::const_range_type, T > pvrb;
-            oneapi::tbb::parallel_reduce ( vs.range(1), pvrb );
+            parallel_vector_reduce_body<typename ets_type::const_range_type, T> pvrb;
+            oneapi::tbb::parallel_reduce(vs.range(1), pvrb);
 
             test_helper<T>::sum(sum, pvrb.sum);
 
-            REQUIRE( vs.size() == pvrb.count );
-            REQUIRE( vs2.size() == pvrb.count );
-            REQUIRE( vs3.size() == pvrb.count );
+            REQUIRE(vs.size() == pvrb.count);
+            REQUIRE(vs2.size() == pvrb.count);
+            REQUIRE(vs3.size() == pvrb.count);
 
             oneapi::tbb::flattened2d<ets_type> fvs = flatten2d(vs);
             size_t ccount = fvs.size();
-            REQUIRE( ccount == size_t(N*p) );
+            REQUIRE(ccount == size_t(N * p));
             size_t elem_cnt = 0;
             typename oneapi::tbb::flattened2d<ets_type>::iterator it;
             auto it2(it);
@@ -681,46 +716,48 @@ void run_parallel_vector_tests(const char* /* test_name */, const char *allocato
             REQUIRE(it3 == cit);
             REQUIRE(it3.operator->() == &(*it3));
 
-            for(typename oneapi::tbb::flattened2d<ets_type>::const_iterator i = fvs.begin(); i != fvs.end(); ++i) {
+            for (typename oneapi::tbb::flattened2d<ets_type>::const_iterator i = fvs.begin(); i != fvs.end();
+                 ++i) {
                 ++elem_cnt;
             };
-            REQUIRE( ccount == elem_cnt );
+            REQUIRE(ccount == elem_cnt);
 
             elem_cnt = 0;
-            for(typename oneapi::tbb::flattened2d<ets_type>::iterator i = fvs.begin(); i != fvs.end(); i++) {
+            for (typename oneapi::tbb::flattened2d<ets_type>::iterator i = fvs.begin(); i != fvs.end(); i++) {
                 ++elem_cnt;
             };
-            REQUIRE( ccount == elem_cnt );
+            REQUIRE(ccount == elem_cnt);
 
             // Test the ETS constructor with multiple args
             T minus_one;
             test_helper<T>::set(minus_one, -1);
             // Set ETS to construct "local" vectors pre-occupied with 25 "minus_one"s
             // Cast 25 to size_type to prevent Intel Compiler SFINAE compilation issues with gcc 5.
-            ets_type vvs( typename container_type::size_type(25), minus_one, oneapi::tbb::tbb_allocator<T>() );
-            REQUIRE( vvs.empty() );
-            oneapi::tbb::parallel_for ( oneapi::tbb::blocked_range<int> (0, N*p, RANGE_MIN), parallel_vector_for_body<T,Allocator>( vvs, allocator_name ) );
-            REQUIRE( !vvs.empty() );
+            ets_type vvs(typename container_type::size_type(25), minus_one, oneapi::tbb::tbb_allocator<T>());
+            REQUIRE(vvs.empty());
+            oneapi::tbb::parallel_for(oneapi::tbb::blocked_range<int>(0, N * p, RANGE_MIN),
+                                      parallel_vector_for_body<T, Allocator>(vvs, allocator_name));
+            REQUIRE(!vvs.empty());
 
-            parallel_vector_reduce_body< typename ets_type::const_range_type, T > pvrb2;
-            oneapi::tbb::parallel_reduce ( vvs.range(1), pvrb2 );
-            REQUIRE( pvrb2.count == vvs.size() );
-            REQUIRE( test_helper<T>::get(pvrb2.sum) == N*p-pvrb2.count*25 );
+            parallel_vector_reduce_body<typename ets_type::const_range_type, T> pvrb2;
+            oneapi::tbb::parallel_reduce(vvs.range(1), pvrb2);
+            REQUIRE(pvrb2.count == vvs.size());
+            REQUIRE(test_helper<T>::get(pvrb2.sum) == N * p - pvrb2.count * 25);
 
             oneapi::tbb::flattened2d<ets_type> fvvs = flatten2d(vvs);
             ccount = fvvs.size();
-            REQUIRE( ccount == N*p+pvrb2.count*25 );
+            REQUIRE(ccount == N * p + pvrb2.count * 25);
         }
 
         double result_value = test_helper<T>::get(sum);
-        REQUIRE( EXPECTED_SUM*p == result_value);
+        REQUIRE(EXPECTED_SUM * p == result_value);
     }
 }
 
-template<typename T, template<class> class Allocator>
+template <typename T, template <class> class Allocator>
 void run_cross_type_vector_tests(const char* /* test_name */) {
     const char* allocator_name = "default";
-    typedef std::vector<T, oneapi::tbb::tbb_allocator<T> > container_type;
+    typedef std::vector<T, oneapi::tbb::tbb_allocator<T>> container_type;
 
     for (int p = std::max(MinThread, 2); p <= MaxThread; ++p) {
         oneapi::tbb::global_control gc(oneapi::tbb::global_control::max_allowed_parallelism, p);
@@ -729,13 +766,18 @@ void run_cross_type_vector_tests(const char* /* test_name */) {
         test_helper<T>::init(sum);
 
         for (int t = -1; t < REPETITIONS; ++t) {
-            typedef typename oneapi::tbb::enumerable_thread_specific< container_type, Allocator<container_type>, oneapi::tbb::ets_no_key > ets_nokey_type;
-            typedef typename oneapi::tbb::enumerable_thread_specific< container_type, Allocator<container_type>, oneapi::tbb::ets_key_per_instance > ets_tlskey_type;
+            typedef typename oneapi::tbb::enumerable_thread_specific<
+                    container_type, Allocator<container_type>, oneapi::tbb::ets_no_key>
+                    ets_nokey_type;
+            typedef typename oneapi::tbb::enumerable_thread_specific<
+                    container_type, Allocator<container_type>, oneapi::tbb::ets_key_per_instance>
+                    ets_tlskey_type;
             ets_nokey_type vs;
 
-            REQUIRE( vs.empty());
-            oneapi::tbb::parallel_for ( oneapi::tbb::blocked_range<int> (0, N*p, RANGE_MIN), parallel_vector_for_body<T, Allocator>( vs, allocator_name ) );
-            REQUIRE( !vs.empty());
+            REQUIRE(vs.empty());
+            oneapi::tbb::parallel_for(oneapi::tbb::blocked_range<int>(0, N * p, RANGE_MIN),
+                                      parallel_vector_for_body<T, Allocator>(vs, allocator_name));
+            REQUIRE(!vs.empty());
 
             // copy construct
             ets_tlskey_type vs2(vs);
@@ -744,54 +786,55 @@ void run_cross_type_vector_tests(const char* /* test_name */) {
             ets_nokey_type vs3;
             vs3 = vs2;
 
-            parallel_vector_reduce_body< typename ets_nokey_type::const_range_type, T > pvrb;
-            oneapi::tbb::parallel_reduce ( vs3.range(1), pvrb );
+            parallel_vector_reduce_body<typename ets_nokey_type::const_range_type, T> pvrb;
+            oneapi::tbb::parallel_reduce(vs3.range(1), pvrb);
 
             test_helper<T>::sum(sum, pvrb.sum);
 
-            REQUIRE( vs3.size() == pvrb.count);
+            REQUIRE(vs3.size() == pvrb.count);
 
             oneapi::tbb::flattened2d<ets_nokey_type> fvs = flatten2d(vs3);
             size_t ccount = fvs.size();
             size_t elem_cnt = 0;
-            for(typename oneapi::tbb::flattened2d<ets_nokey_type>::const_iterator i = fvs.begin(); i != fvs.end(); ++i) {
+            for (typename oneapi::tbb::flattened2d<ets_nokey_type>::const_iterator i = fvs.begin();
+                 i != fvs.end(); ++i) {
                 ++elem_cnt;
             };
             REQUIRE(ccount == elem_cnt);
 
             elem_cnt = 0;
-            for(typename oneapi::tbb::flattened2d<ets_nokey_type>::iterator i = fvs.begin(); i != fvs.end(); ++i) {
+            for (typename oneapi::tbb::flattened2d<ets_nokey_type>::iterator i = fvs.begin(); i != fvs.end();
+                 ++i) {
                 ++elem_cnt;
             };
             REQUIRE(ccount == elem_cnt);
 
-            oneapi::tbb::flattened2d<ets_nokey_type> fvs2 = flatten2d(vs3, vs3.begin(), std::next(vs3.begin()));
+            oneapi::tbb::flattened2d<ets_nokey_type> fvs2
+                    = flatten2d(vs3, vs3.begin(), std::next(vs3.begin()));
             REQUIRE(std::distance(fvs2.begin(), fvs2.end()) == vs3.begin()->size());
             const oneapi::tbb::flattened2d<ets_nokey_type>& cfvs2(fvs2);
             REQUIRE(std::distance(cfvs2.begin(), cfvs2.end()) == vs3.begin()->size());
         }
 
         double result_value = test_helper<T>::get(sum);
-        REQUIRE( EXPECTED_SUM*p == result_value);
+        REQUIRE(EXPECTED_SUM * p == result_value);
     }
 }
 
-template< typename T >
+template <typename T>
 void run_serial_scalar_tests(const char* /* test_name */) {
     T sum;
     test_helper<T>::init(sum);
 
     for (int t = -1; t < REPETITIONS; ++t) {
-        for (int i = 0; i < N; ++i) {
-            test_helper<T>::sum(sum,1);
-        }
+        for (int i = 0; i < N; ++i) { test_helper<T>::sum(sum, 1); }
     }
 
     double result_value = test_helper<T>::get(sum);
-    REQUIRE( EXPECTED_SUM == result_value);
+    REQUIRE(EXPECTED_SUM == result_value);
 }
 
-template< typename T >
+template <typename T>
 void run_serial_vector_tests(const char* /* test_name */) {
     T sum;
     test_helper<T>::init(sum);
@@ -799,16 +842,15 @@ void run_serial_vector_tests(const char* /* test_name */) {
     test_helper<T>::set(one, 1);
 
     for (int t = -1; t < REPETITIONS; ++t) {
-        std::vector<T, oneapi::tbb::tbb_allocator<T> > v;
-        for (int i = 0; i < N; ++i) {
-            v.push_back( one );
-        }
-        for (typename std::vector<T, oneapi::tbb::tbb_allocator<T> >::const_iterator i = v.begin(); i != v.end(); ++i)
+        std::vector<T, oneapi::tbb::tbb_allocator<T>> v;
+        for (int i = 0; i < N; ++i) { v.push_back(one); }
+        for (typename std::vector<T, oneapi::tbb::tbb_allocator<T>>::const_iterator i = v.begin();
+             i != v.end(); ++i)
             test_helper<T>::sum(sum, *i);
     }
 
     double result_value = test_helper<T>::get(sum);
-    REQUIRE( EXPECTED_SUM == result_value);
+    REQUIRE(EXPECTED_SUM == result_value);
 }
 
 const size_t line_size = oneapi::tbb::detail::max_nfs_size;
@@ -816,154 +858,160 @@ const size_t line_size = oneapi::tbb::detail::max_nfs_size;
 void run_reference_check() {
     run_serial_scalar_tests<int>("int");
     run_serial_scalar_tests<double>("double");
-    run_serial_scalar_tests<minimalNComparable<> >("minimalNComparable<>");
+    run_serial_scalar_tests<minimalNComparable<>>("minimalNComparable<>");
     run_serial_vector_tests<int>("std::vector<int, oneapi::tbb::tbb_allocator<int> >");
     run_serial_vector_tests<double>("std::vector<double, oneapi::tbb::tbb_allocator<double> >");
 }
 
-template<template<class>class Allocator>
-void run_parallel_tests(const char *allocator_name) {
-    run_parallel_scalar_tests<int, Allocator>("int",allocator_name);
-    run_parallel_scalar_tests<double, Allocator>("double",allocator_name);
-    run_parallel_scalar_tests_nocombine<minimalNComparable<>,Allocator>("minimalNComparable<>",allocator_name);
+template <template <class> class Allocator>
+void run_parallel_tests(const char* allocator_name) {
+    run_parallel_scalar_tests<int, Allocator>("int", allocator_name);
+    run_parallel_scalar_tests<double, Allocator>("double", allocator_name);
+    run_parallel_scalar_tests_nocombine<minimalNComparable<>, Allocator>("minimalNComparable<>",
+                                                                         allocator_name);
     run_parallel_scalar_tests<ThrowingConstructor, Allocator>("ThrowingConstructor", allocator_name);
-    run_parallel_vector_tests<int, Allocator>("std::vector<int, oneapi::tbb::tbb_allocator<int> >",allocator_name);
-    run_parallel_vector_tests<double, Allocator>("std::vector<double, oneapi::tbb::tbb_allocator<double> >",allocator_name);
+    run_parallel_vector_tests<int, Allocator>("std::vector<int, oneapi::tbb::tbb_allocator<int> >",
+                                              allocator_name);
+    run_parallel_vector_tests<double, Allocator>("std::vector<double, oneapi::tbb::tbb_allocator<double> >",
+                                                 allocator_name);
 }
 
 void run_cross_type_tests() {
     // cross-type scalar tests are part of run_parallel_scalar_tests_nocombine
-    run_cross_type_vector_tests<int, oneapi::tbb::tbb_allocator>("std::vector<int, oneapi::tbb::tbb_allocator<int> >");
-    run_cross_type_vector_tests<double, oneapi::tbb::tbb_allocator>("std::vector<double, oneapi::tbb::tbb_allocator<double> >");
+    run_cross_type_vector_tests<int, oneapi::tbb::tbb_allocator>(
+            "std::vector<int, oneapi::tbb::tbb_allocator<int> >");
+    run_cross_type_vector_tests<double, oneapi::tbb::tbb_allocator>(
+            "std::vector<double, oneapi::tbb::tbb_allocator<double> >");
 }
 
-template<typename T, template<class> class Allocator, typename Init>
-oneapi::tbb::enumerable_thread_specific<T,Allocator<T> > MakeETS( Init init ) {
-    return oneapi::tbb::enumerable_thread_specific<T,Allocator<T> >(init);
+template <typename T, template <class> class Allocator, typename Init>
+oneapi::tbb::enumerable_thread_specific<T, Allocator<T>> MakeETS(Init init) {
+    return oneapi::tbb::enumerable_thread_specific<T, Allocator<T>>(init);
 }
 // In some GCC versions, parameter packs in lambdas might cause compile errors
-template<typename ETS, typename... P>
+template <typename ETS, typename... P>
 struct MakeETS_Functor {
-    ETS operator()( typename std::decay<P>::type&&... params ) {
-        return ETS(std::move(params)...);
-    }
+    ETS operator()(typename std::decay<P>::type&&... params) { return ETS(std::move(params)...); }
 };
-template<typename T, template<class> class Allocator, typename... P>
-oneapi::tbb::enumerable_thread_specific<T,Allocator<T> > MakeETS( oneapi::tbb::detail::stored_pack<P...> pack ) {
-    typedef oneapi::tbb::enumerable_thread_specific<T,Allocator<T> > result_type;
-    return oneapi::tbb::detail::call_and_return< result_type >(
-        MakeETS_Functor<result_type,P...>(), std::move(pack)
-    );
+template <typename T, template <class> class Allocator, typename... P>
+oneapi::tbb::enumerable_thread_specific<T, Allocator<T>>
+MakeETS(oneapi::tbb::detail::stored_pack<P...> pack) {
+    typedef oneapi::tbb::enumerable_thread_specific<T, Allocator<T>> result_type;
+    return oneapi::tbb::detail::call_and_return<result_type>(MakeETS_Functor<result_type, P...>(),
+                                                             std::move(pack));
 }
 
-template<typename T, template<class> class Allocator, typename InitSrc, typename InitDst, typename Validator>
-void ets_copy_assign_test( InitSrc init1, InitDst init2, Validator check, const char *allocator_name ) {
-    typedef oneapi::tbb::enumerable_thread_specific<T, Allocator<T> > ets_type;
+template <typename T, template <class> class Allocator, typename InitSrc, typename InitDst,
+          typename Validator>
+void ets_copy_assign_test(InitSrc init1, InitDst init2, Validator check, const char* allocator_name) {
+    typedef oneapi::tbb::enumerable_thread_specific<T, Allocator<T>> ets_type;
 
     // Create the source instance
     const ets_type& cref_binder = MakeETS<T, Allocator>(init1);
     ets_type& source = const_cast<ets_type&>(cref_binder);
-    check(check_alignment(source.local(),allocator_name));
+    check(check_alignment(source.local(), allocator_name));
 
     // Test copy construction
     bool existed = false;
     ets_type copy(source);
-    check(check_alignment(copy.local(existed),allocator_name));
+    check(check_alignment(copy.local(existed), allocator_name));
     REQUIRE_MESSAGE(existed, "Local data not created by ETS copy constructor");
     copy.clear();
-    check(check_alignment(copy.local(),allocator_name));
+    check(check_alignment(copy.local(), allocator_name));
 
     // Test assignment
     existed = false;
     ets_type assign(init2);
     assign = source;
-    check(check_alignment(assign.local(existed),allocator_name));
+    check(check_alignment(assign.local(existed), allocator_name));
     REQUIRE_MESSAGE(existed, "Local data not created by ETS assignment");
     assign.clear();
-    check(check_alignment(assign.local(),allocator_name));
+    check(check_alignment(assign.local(), allocator_name));
 
     // Create the source instance
     ets_type&& rvref_binder = MakeETS<T, Allocator>(init1);
-    check(check_alignment(rvref_binder.local(),allocator_name));
+    check(check_alignment(rvref_binder.local(), allocator_name));
 
     // Test move construction
     existed = false;
     ets_type moved(rvref_binder);
-    check(check_alignment(moved.local(existed),allocator_name));
+    check(check_alignment(moved.local(existed), allocator_name));
     REQUIRE_MESSAGE(existed, "Local data not created by ETS move constructor");
     moved.clear();
-    check(check_alignment(moved.local(),allocator_name));
+    check(check_alignment(moved.local(), allocator_name));
 
     // Test assignment
     existed = false;
     ets_type move_assign(init2);
     move_assign = std::move(moved);
-    check(check_alignment(move_assign.local(existed),allocator_name));
+    check(check_alignment(move_assign.local(existed), allocator_name));
     REQUIRE_MESSAGE(existed, "Local data not created by ETS move assignment");
     move_assign.clear();
-    check(check_alignment(move_assign.local(),allocator_name));
+    check(check_alignment(move_assign.local(), allocator_name));
 }
 
-template<typename T, int Expected>
+template <typename T, int Expected>
 struct Validator {
-    void operator()( const T& value ) {
-        REQUIRE(test_helper<T>::get(value) == Expected);
-    }
-    void operator()( const std::pair<int,T>& value ) {
+    void operator()(const T& value) { REQUIRE(test_helper<T>::get(value) == Expected); }
+    void operator()(const std::pair<int, T>& value) {
         REQUIRE(value.first > 0);
-        REQUIRE(test_helper<T>::get(value.second) == Expected*value.first);
+        REQUIRE(test_helper<T>::get(value.second) == Expected * value.first);
     }
 };
 
-template <typename T, template<class> class Allocator>
-void run_assign_and_copy_constructor_test(const char* /* test_name */, const char *allocator_name) {
-    #define EXPECTED 3142
+template <typename T, template <class> class Allocator>
+void run_assign_and_copy_constructor_test(const char* /* test_name */, const char* allocator_name) {
+#define EXPECTED 3142
 
     // test with exemplar initializer
     T src_init;
-    test_helper<T>::set(src_init,EXPECTED);
+    test_helper<T>::set(src_init, EXPECTED);
     T other_init;
     test_helper<T>::init(other_init);
-    ets_copy_assign_test<T, Allocator>(src_init, other_init, Validator<T,EXPECTED>(), allocator_name);
+    ets_copy_assign_test<T, Allocator>(src_init, other_init, Validator<T, EXPECTED>(), allocator_name);
 
     // test with function initializer
-    FunctorFinit<T,EXPECTED> src_finit(SecretTag);
-    FunctorFinit<T,0> other_finit(SecretTag);
-    ets_copy_assign_test<T, Allocator>(src_finit, other_finit, Validator<T,EXPECTED>(), allocator_name);
+    FunctorFinit<T, EXPECTED> src_finit(SecretTag);
+    FunctorFinit<T, 0> other_finit(SecretTag);
+    ets_copy_assign_test<T, Allocator>(src_finit, other_finit, Validator<T, EXPECTED>(), allocator_name);
 
     // test with multi-argument "emplace" initializer
     // The arguments are wrapped into oneapi::tbb::internal::stored_pack to avoid variadic templates in ets_copy_assign_test.
-    test_helper<T>::set(src_init,EXPECTED*17);
-    ets_copy_assign_test< std::pair<int,T>, Allocator>(oneapi::tbb::detail::save_pack(17,src_init), std::make_pair(-1,T()), Validator<T,EXPECTED>(), allocator_name);
-    #undef EXPECTED
+    test_helper<T>::set(src_init, EXPECTED * 17);
+    ets_copy_assign_test<std::pair<int, T>, Allocator>(oneapi::tbb::detail::save_pack(17, src_init),
+                                                       std::make_pair(-1, T()), Validator<T, EXPECTED>(),
+                                                       allocator_name);
+#undef EXPECTED
 }
 
-template< template<class> class Allocator>
+template <template <class> class Allocator>
 void run_assignment_and_copy_constructor_tests(const char* allocator_name) {
     run_assign_and_copy_constructor_test<int, Allocator>("int", allocator_name);
     run_assign_and_copy_constructor_test<double, Allocator>("double", allocator_name);
     // Try class sizes that are close to a cache line in size, in order to check padding calculations.
-    run_assign_and_copy_constructor_test<minimalNComparable<line_size-1>, Allocator >("minimalNComparable<line_size-1>", allocator_name);
-    run_assign_and_copy_constructor_test<minimalNComparable<line_size>, Allocator >("minimalNComparable<line_size>", allocator_name);
-    run_assign_and_copy_constructor_test<minimalNComparable<line_size+1>, Allocator >("minimalNComparable<line_size+1>", allocator_name);
-    REQUIRE(FinitCounter==0);
+    run_assign_and_copy_constructor_test<minimalNComparable<line_size - 1>, Allocator>(
+            "minimalNComparable<line_size-1>", allocator_name);
+    run_assign_and_copy_constructor_test<minimalNComparable<line_size>, Allocator>(
+            "minimalNComparable<line_size>", allocator_name);
+    run_assign_and_copy_constructor_test<minimalNComparable<line_size + 1>, Allocator>(
+            "minimalNComparable<line_size+1>", allocator_name);
+    REQUIRE(FinitCounter == 0);
 }
 
 // Class with no default constructor
 class HasNoDefaultConstructor {
     HasNoDefaultConstructor();
+
 public:
-    HasNoDefaultConstructor( SecretTagType ) {}
+    HasNoDefaultConstructor(SecretTagType) {}
 };
 // Initialization functor for HasNoDefaultConstructor
 struct HasNoDefaultConstructorFinit {
-    HasNoDefaultConstructor operator()() {
-        return HasNoDefaultConstructor(SecretTag);
-    }
+    HasNoDefaultConstructor operator()() { return HasNoDefaultConstructor(SecretTag); }
 };
 // Combine functor for HasNoDefaultConstructor
 struct HasNoDefaultConstructorCombine {
-    HasNoDefaultConstructor operator()( HasNoDefaultConstructor, HasNoDefaultConstructor ) {
+    HasNoDefaultConstructor operator()(HasNoDefaultConstructor, HasNoDefaultConstructor) {
         return HasNoDefaultConstructor(SecretTag);
     }
 };
@@ -971,56 +1019,62 @@ struct HasNoDefaultConstructorCombine {
 // Class that only has a constructor with multiple parameters and a move constructor
 class HasSpecialAndMoveCtor : utils::NoCopy {
     HasSpecialAndMoveCtor();
+
 public:
-    HasSpecialAndMoveCtor( SecretTagType, size_t = size_t(0), const char* = "" ) {}
-    HasSpecialAndMoveCtor( HasSpecialAndMoveCtor&& ) {}
+    HasSpecialAndMoveCtor(SecretTagType, size_t = size_t(0), const char* = "") {}
+    HasSpecialAndMoveCtor(HasSpecialAndMoveCtor&&) {}
 };
 
 // No-op combine-each functor
-template<typename V>
+template <typename V>
 struct EmptyCombineEach {
-    void operator()( const V& ) { }
+    void operator()(const V&) {}
 };
 
 //! Test situations where only default constructor or copy constructor is required.
-template<template<class> class Allocator>
+template <template <class> class Allocator>
 void TestInstantiation(const char* /* allocator_name */) {
     // Test instantiation is possible when copy constructor is not required.
-    oneapi::tbb::enumerable_thread_specific<utils::NoCopy, Allocator<utils::NoCopy> > ets1;
+    oneapi::tbb::enumerable_thread_specific<utils::NoCopy, Allocator<utils::NoCopy>> ets1;
     ets1.local();
     ets1.combine_each(EmptyCombineEach<utils::NoCopy>());
 
     // Test instantiation when default constructor is not required, because exemplar is provided.
     HasNoDefaultConstructor x(SecretTag);
-    oneapi::tbb::enumerable_thread_specific<HasNoDefaultConstructor, Allocator<HasNoDefaultConstructor> > ets2(x);
+    oneapi::tbb::enumerable_thread_specific<HasNoDefaultConstructor, Allocator<HasNoDefaultConstructor>> ets2(
+            x);
     ets2.local();
     ets2.combine(HasNoDefaultConstructorCombine());
 
     // Test instantiation when default constructor is not required, because init function is provided.
     HasNoDefaultConstructorFinit f;
-    oneapi::tbb::enumerable_thread_specific<HasNoDefaultConstructor, Allocator<HasNoDefaultConstructor> > ets3(f);
+    oneapi::tbb::enumerable_thread_specific<HasNoDefaultConstructor, Allocator<HasNoDefaultConstructor>> ets3(
+            f);
     ets3.local();
     ets3.combine(HasNoDefaultConstructorCombine());
 
     // Test instantiation with multiple arguments
-    oneapi::tbb::enumerable_thread_specific<HasSpecialAndMoveCtor, Allocator<HasSpecialAndMoveCtor> > ets4(SecretTag, 0x42, "meaningless");
+    oneapi::tbb::enumerable_thread_specific<HasSpecialAndMoveCtor, Allocator<HasSpecialAndMoveCtor>> ets4(
+            SecretTag, 0x42, "meaningless");
     ets4.local();
     ets4.combine_each(EmptyCombineEach<HasSpecialAndMoveCtor>());
     // Test instantiation with one argument that should however use the variadic constructor
-    oneapi::tbb::enumerable_thread_specific<HasSpecialAndMoveCtor, Allocator<HasSpecialAndMoveCtor> > ets5(SecretTag);
+    oneapi::tbb::enumerable_thread_specific<HasSpecialAndMoveCtor, Allocator<HasSpecialAndMoveCtor>> ets5(
+            SecretTag);
     ets5.local();
     ets5.combine_each(EmptyCombineEach<HasSpecialAndMoveCtor>());
     // Test that move operations do not impose extra requirements
     // Default allocator is used. If it does not match Allocator, there will be elementwise move
-    oneapi::tbb::enumerable_thread_specific<HasSpecialAndMoveCtor> ets6( std::move(ets4) );
+    oneapi::tbb::enumerable_thread_specific<HasSpecialAndMoveCtor> ets6(std::move(ets4));
     ets6.combine_each(EmptyCombineEach<HasSpecialAndMoveCtor>());
     ets6 = std::move(ets5);
 }
 
 void TestMemberTypes() {
     using default_container_type = oneapi::tbb::enumerable_thread_specific<int>;
-    static_assert(std::is_same<typename default_container_type::allocator_type, oneapi::tbb::cache_aligned_allocator<int>>::value,
-            "Incorrect default template allocator");
+    static_assert(std::is_same<typename default_container_type::allocator_type,
+                               oneapi::tbb::cache_aligned_allocator<int>>::value,
+                  "Incorrect default template allocator");
 
     using test_allocator_type = std::allocator<int>;
     using ets_container_type = oneapi::tbb::enumerable_thread_specific<int, test_allocator_type>;
@@ -1038,9 +1092,11 @@ void TestMemberTypes() {
                   "Incorrect container const_reference member type");
 
     using allocator_type = typename ets_container_type::allocator_type;
-    static_assert(std::is_same<typename ets_container_type::pointer, typename std::allocator_traits<allocator_type>::pointer>::value,
+    static_assert(std::is_same<typename ets_container_type::pointer,
+                               typename std::allocator_traits<allocator_type>::pointer>::value,
                   "Incorrect container pointer member type");
-    static_assert(std::is_same<typename ets_container_type::const_pointer, typename std::allocator_traits<allocator_type>::const_pointer>::value,
+    static_assert(std::is_same<typename ets_container_type::const_pointer,
+                               typename std::allocator_traits<allocator_type>::const_pointer>::value,
                   "Incorrect container const_pointer member type");
 
     static_assert(std::is_unsigned<typename ets_container_type::size_type>::value,
@@ -1060,13 +1116,12 @@ void TestMemberTypes() {
 
 size_t init_tbb_alloc_mask() {
     // TODO: use __TBB_alignof(T) to check for local() results instead of using internal knowledges of ets element padding
-    if(oneapi::tbb::tbb_allocator<int>::allocator_type() == oneapi::tbb::tbb_allocator<int>::standard) {
+    if (oneapi::tbb::tbb_allocator<int>::allocator_type() == oneapi::tbb::tbb_allocator<int>::standard) {
         // scalable allocator is not available.
         return 1;
-    }
-    else {
+    } else {
         // this value is for large objects, but will be correct for small.
-        return 64; // TBB_REVAMP_TODO: enable as estimatedCacheLineSize when tbbmalloc is available;
+        return 64;// TBB_REVAMP_TODO: enable as estimatedCacheLineSize when tbbmalloc is available;
     }
 }
 
@@ -1088,11 +1143,10 @@ void TestETSIterator() {
         ets_type ets;
         const ets_type& cets(ets);
 
-        auto fill_ets_body = [&](){
+        auto fill_ets_body = [&]() {
             ets.local() = 42;
             ++sync_counter;
-            while(sync_counter != expected_ets_size)
-                utils::yield();
+            while (sync_counter != expected_ets_size) utils::yield();
         };
 
         oneapi::tbb::parallel_invoke(fill_ets_body, fill_ets_body);
@@ -1100,22 +1154,14 @@ void TestETSIterator() {
 
         std::size_t counter = 0;
         auto iter = ets.begin();
-        while(iter != ets.end()) {
-            ++counter % 2 == 0 ? ++iter : iter++;
-        }
+        while (iter != ets.end()) { ++counter % 2 == 0 ? ++iter : iter++; }
         REQUIRE(counter == expected_ets_size);
-        while(iter != ets.begin()) {
-            --counter % 2 == 0 ? --iter : iter--;
-        }
+        while (iter != ets.begin()) { --counter % 2 == 0 ? --iter : iter--; }
         REQUIRE(counter == 0);
         auto citer = cets.begin();
-        while(citer != cets.end()) {
-            ++counter % 2 == 0 ? ++citer : citer++;
-        }
+        while (citer != cets.end()) { ++counter % 2 == 0 ? ++citer : citer++; }
         REQUIRE(counter == expected_ets_size);
-        while(citer != cets.begin()) {
-            --counter % 2 == 0 ? --citer : citer--;
-        }
+        while (citer != cets.begin()) { --counter % 2 == 0 ? --citer : citer--; }
         REQUIRE(counter == 0);
         REQUIRE(ets.begin() + expected_ets_size == ets.end());
         REQUIRE(expected_ets_size + ets.begin() == ets.end());
@@ -1149,7 +1195,7 @@ void TestETSIterator() {
 }
 
 template <bool ExpectEqual, bool ExpectLess, typename Iterator>
-void DoETSIteratorComparisons( const Iterator& lhs, const Iterator& rhs ) {
+void DoETSIteratorComparisons(const Iterator& lhs, const Iterator& rhs) {
     // TODO: replace with testEqualityAndLessComparisons after adding <=> operator for ETS iterator
     using namespace comparisons_testing;
     testEqualityComparisons<ExpectEqual>(lhs, rhs);
@@ -1157,15 +1203,15 @@ void DoETSIteratorComparisons( const Iterator& lhs, const Iterator& rhs ) {
 }
 
 template <typename Iterator, typename ETS>
-void TestETSIteratorComparisonsBasic( ETS& ets ) {
+void TestETSIteratorComparisonsBasic(ETS& ets) {
     REQUIRE_MESSAGE(!ets.empty(), "Incorrect test setup");
     Iterator it1, it2;
-    DoETSIteratorComparisons</*ExpectEqual = */true, /*ExpectLess = */false>(it1, it2);
+    DoETSIteratorComparisons</*ExpectEqual = */ true, /*ExpectLess = */ false>(it1, it2);
     it1 = ets.begin();
     it2 = ets.begin();
-    DoETSIteratorComparisons</*ExpectEqual = */true, /*ExpectLess = */false>(it1, it2);
+    DoETSIteratorComparisons</*ExpectEqual = */ true, /*ExpectLess = */ false>(it1, it2);
     it2 = std::prev(ets.end());
-    DoETSIteratorComparisons</*ExpectEqual = */false, /*ExpectLess = */true>(it1, it2);
+    DoETSIteratorComparisons</*ExpectEqual = */ false, /*ExpectLess = */ true>(it1, it2);
 }
 
 void TestETSIteratorComparisons() {
@@ -1175,12 +1221,11 @@ void TestETSIteratorComparisons() {
     // Fill the ets
     const std::size_t expected_ets_size = 2;
     std::atomic<std::size_t> sync_counter(0);
-    auto fill_ets_body = [&](int){
-            ets.local() = 42;
-            ++sync_counter;
-            while(sync_counter != expected_ets_size)
-                std::this_thread::yield();
-        };
+    auto fill_ets_body = [&](int) {
+        ets.local() = 42;
+        ++sync_counter;
+        while (sync_counter != expected_ets_size) std::this_thread::yield();
+    };
 
     utils::NativeParallelFor(2, fill_ets_body);
 
@@ -1202,7 +1247,8 @@ TEST_CASE("Instantiation") {
 //! \brief \ref interface \ref requirement
 TEST_CASE("Assignment and copy constructor") {
     AlignMask = cache_allocator_mask;
-    run_assignment_and_copy_constructor_tests<oneapi::tbb::cache_aligned_allocator>("oneapi::tbb::cache_aligned_allocator");
+    run_assignment_and_copy_constructor_tests<oneapi::tbb::cache_aligned_allocator>(
+            "oneapi::tbb::cache_aligned_allocator");
     AlignMask = tbb_allocator_mask;
     run_assignment_and_copy_constructor_tests<oneapi::tbb::tbb_allocator>("oneapi::tbb::tbb_allocator");
 }
@@ -1223,16 +1269,12 @@ TEST_CASE("Basic ETS functionality") {
     });
     CHECK(ets.local() == 42);
 
-    int ref_combined{0};
+    int ref_combined {0};
     std::vector<int> sequence(LOCALS);
     std::iota(sequence.begin(), sequence.end(), 0);
-    for (int i : sequence) {
-        ref_combined += i;
-    }
+    for (int i : sequence) { ref_combined += i; }
     ref_combined += 42;
-    int ets_combined = ets.combine([](int x, int y) {
-        return x + y;
-    });
+    int ets_combined = ets.combine([](int x, int y) { return x + y; });
     CHECK(ref_combined == ets_combined);
 }
 
@@ -1249,16 +1291,10 @@ TEST_CASE("Parallel test") {
 }
 
 //! \brief \ref interface \ref requirement
-TEST_CASE("Member types") {
-    TestMemberTypes();
-}
+TEST_CASE("Member types") { TestMemberTypes(); }
 
 //! \brief \ref interface \ref requirement
-TEST_CASE("enumerable_thread_specific iterator") {
-    TestETSIterator();
-}
+TEST_CASE("enumerable_thread_specific iterator") { TestETSIterator(); }
 
 //! \brief \ref interface \ref requirement
-TEST_CASE("enumerable_thread_specific iterator comparisons") {
-    TestETSIteratorComparisons();
-}
+TEST_CASE("enumerable_thread_specific iterator comparisons") { TestETSIteratorComparisons(); }
diff --git a/external/tbb/test/conformance/conformance_function_node.cpp b/external/tbb/test/conformance/conformance_function_node.cpp
index 332558cf..3912a6aa 100644
--- a/external/tbb/test/conformance/conformance_function_node.cpp
+++ b/external/tbb/test/conformance/conformance_function_node.cpp
@@ -15,14 +15,14 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
 #endif
 
-#include "conformance_flowgraph.h"
 #include "common/test_invoke.h"
+#include "conformance_flowgraph.h"
 
-using input_msg = conformance::message</*default_ctor*/true, /*copy_ctor*/true, /*copy_assign*/false>;
-using output_msg = conformance::message</*default_ctor*/false, /*copy_ctor*/true, /*copy_assign*/false>;
+using input_msg = conformance::message</*default_ctor*/ true, /*copy_ctor*/ true, /*copy_assign*/ false>;
+using output_msg = conformance::message</*default_ctor*/ false, /*copy_ctor*/ true, /*copy_assign*/ false>;
 
 //! \file conformance_function_node.cpp
 //! \brief Test for [flow_graph.function_node] specification
@@ -63,15 +63,15 @@ void test_deduction_guides_common(Body body) {
 
     function_node f8(follows(f7), unlimited, body, rejecting(), node_priority_t(5));
     static_assert(std::is_same_v<decltype(f8), function_node<int, int, rejecting>>);
-#endif // __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+#endif// __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 
     function_node f9(f1);
     static_assert(std::is_same_v<decltype(f9), function_node<int, int>>);
 }
 
 void test_deduction_guides() {
-    test_deduction_guides_common([](const int&)->int { return 1; });
-    test_deduction_guides_common([](const int&) mutable ->int { return 1; });
+    test_deduction_guides_common([](const int&) -> int { return 1; });
+    test_deduction_guides_common([](const int&) mutable -> int { return 1; });
     test_deduction_guides_common(function_body_f);
 }
 
@@ -79,8 +79,7 @@ void test_deduction_guides() {
 
 #if __TBB_CPP17_INVOKE_PRESENT
 
-template <typename InputType, typename OutputType1, typename OutputType2,
-          typename Body1, typename Body2>
+template <typename InputType, typename OutputType1, typename OutputType2, typename Body1, typename Body2>
 void test_fn_invoke_basic(const Body1& body1, const Body2& body2) {
     using namespace oneapi::tbb::flow;
 
@@ -93,7 +92,7 @@ void test_fn_invoke_basic(const Body1& body1, const Body2& body2) {
     make_edge(f1, f2);
     make_edge(f2, buf);
 
-    f1.try_put(InputType{OutputType1{1}});
+    f1.try_put(InputType {OutputType1 {1}});
 
     g.wait_for_all();
 
@@ -111,17 +110,18 @@ void test_fn_invoke() {
     // Testing pointer to member object
     test_fn_invoke_basic<input_type, output_type, std::size_t>(&input_type::id, &output_type::id);
 }
-#endif // __TBB_CPP17_INVOKE_PRESENT
+#endif// __TBB_CPP17_INVOKE_PRESENT
 
 //! Test calling function body
 //! \brief \ref interface \ref requirement
 TEST_CASE("Test function_node body") {
-    conformance::test_body_exec<oneapi::tbb::flow::function_node<input_msg, output_msg>, input_msg, output_msg>(oneapi::tbb::flow::unlimited);
+    conformance::test_body_exec<oneapi::tbb::flow::function_node<input_msg, output_msg>, input_msg,
+                                output_msg>(oneapi::tbb::flow::unlimited);
 }
 
 //! Test function_node constructors
 //! \brief \ref requirement
-TEST_CASE("function_node constructors"){
+TEST_CASE("function_node constructors") {
     using namespace oneapi::tbb::flow;
     graph g;
 
@@ -131,55 +131,63 @@ TEST_CASE("function_node constructors"){
     function_node<int, int> fn2(g, unlimited, fun, oneapi::tbb::flow::node_priority_t(1));
 
     function_node<int, int, lightweight> lw_node1(g, serial, fun, lightweight());
-    function_node<int, int, lightweight> lw_node2(g, serial, fun, lightweight(), oneapi::tbb::flow::node_priority_t(1));
+    function_node<int, int, lightweight> lw_node2(g, serial, fun, lightweight(),
+                                                  oneapi::tbb::flow::node_priority_t(1));
 }
 
 //! The node that is constructed has a reference to the same graph object as src, has a copy of the initial body used by src, and has the same concurrency threshold as src.
 //! The predecessors and successors of src are not copied.
 //! \brief \ref requirement
-TEST_CASE("function_node copy constructor"){
+TEST_CASE("function_node copy constructor") {
     conformance::test_copy_ctor<oneapi::tbb::flow::function_node<int, int>>();
 }
 
 //! Test node reject the incoming message if the concurrency limit achieved.
 //! \brief \ref interface
-TEST_CASE("function_node with rejecting policy"){
+TEST_CASE("function_node with rejecting policy") {
     conformance::test_rejecting<oneapi::tbb::flow::function_node<int, int, oneapi::tbb::flow::rejecting>>();
 }
 
 //! Test body copying and copy_body logic
 //! Test the body object passed to a node is copied
 //! \brief \ref interface
-TEST_CASE("function_node and body copying"){
-    conformance::test_copy_body_function<oneapi::tbb::flow::function_node<int, int>, conformance::copy_counting_object<int>>(oneapi::tbb::flow::unlimited);
+TEST_CASE("function_node and body copying") {
+    conformance::test_copy_body_function<oneapi::tbb::flow::function_node<int, int>,
+                                         conformance::copy_counting_object<int>>(
+            oneapi::tbb::flow::unlimited);
 }
 
 //! Test function_node is a graph_node, receiver<Input>, and sender<Output>
 //! \brief \ref interface
-TEST_CASE("function_node superclasses"){
+TEST_CASE("function_node superclasses") {
     conformance::test_inheritance<oneapi::tbb::flow::function_node<int, int>, int, int>();
     conformance::test_inheritance<oneapi::tbb::flow::function_node<void*, float>, void*, float>();
-    conformance::test_inheritance<oneapi::tbb::flow::function_node<input_msg, output_msg>, input_msg, output_msg>();
+    conformance::test_inheritance<oneapi::tbb::flow::function_node<input_msg, output_msg>, input_msg,
+                                  output_msg>();
 }
 
 //! Test node not buffered unsuccessful message, and try_get after rejection should not succeed.
 //! \brief \ref requirement
-TEST_CASE("function_node buffering"){
+TEST_CASE("function_node buffering") {
     conformance::dummy_functor<int> fun;
-    conformance::test_buffering<oneapi::tbb::flow::function_node<input_msg, int, oneapi::tbb::flow::rejecting>, input_msg>(oneapi::tbb::flow::unlimited, fun);
-    conformance::test_buffering<oneapi::tbb::flow::function_node<input_msg, int, oneapi::tbb::flow::queueing>, input_msg>(oneapi::tbb::flow::unlimited, fun);
+    conformance::test_buffering<
+            oneapi::tbb::flow::function_node<input_msg, int, oneapi::tbb::flow::rejecting>, input_msg>(
+            oneapi::tbb::flow::unlimited, fun);
+    conformance::test_buffering<oneapi::tbb::flow::function_node<input_msg, int, oneapi::tbb::flow::queueing>,
+                                input_msg>(oneapi::tbb::flow::unlimited, fun);
 }
 
 //! Test node broadcast messages to successors
 //! \brief \ref requirement
-TEST_CASE("function_node broadcast"){
+TEST_CASE("function_node broadcast") {
     conformance::counting_functor<int> fun(conformance::expected);
-    conformance::test_forwarding<oneapi::tbb::flow::function_node<input_msg, int>, input_msg, int>(1, oneapi::tbb::flow::unlimited, fun);
+    conformance::test_forwarding<oneapi::tbb::flow::function_node<input_msg, int>, input_msg, int>(
+            1, oneapi::tbb::flow::unlimited, fun);
 }
 
 //! Test deduction guides
 //! \brief \ref interface \ref requirement
-TEST_CASE("Deduction guides"){
+TEST_CASE("Deduction guides") {
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
     test_deduction_guides();
 #endif
@@ -187,15 +195,16 @@ TEST_CASE("Deduction guides"){
 
 //! Test priorities work in single-threaded configuration
 //! \brief \ref requirement
-TEST_CASE("function_node priority support"){
-    conformance::test_priority<oneapi::tbb::flow::function_node<input_msg, int>, input_msg>(oneapi::tbb::flow::unlimited);
+TEST_CASE("function_node priority support") {
+    conformance::test_priority<oneapi::tbb::flow::function_node<input_msg, int>, input_msg>(
+            oneapi::tbb::flow::unlimited);
 }
 
 //! Test function_node has a user-settable concurrency limit. It can be set to one of predefined values.
 //! The user can also provide a value of type std::size_t to limit concurrency.
 //! Test that not more than limited threads works in parallel.
 //! \brief \ref requirement
-TEST_CASE("concurrency follows set limits"){
+TEST_CASE("concurrency follows set limits") {
     conformance::test_concurrency<oneapi::tbb::flow::function_node<int, int>>();
 }
 
@@ -209,7 +218,5 @@ TEST_CASE("Test function_node Output and Input class") {
 #if __TBB_CPP17_INVOKE_PRESENT
 //! Test that function_node uses std::invoke to execute the body
 //! \brief \ref interface \ref requirement
-TEST_CASE("Test function_node and std::invoke") {
-    test_fn_invoke();
-}
+TEST_CASE("Test function_node and std::invoke") { test_fn_invoke(); }
 #endif
diff --git a/external/tbb/test/conformance/conformance_global_control.cpp b/external/tbb/test/conformance/conformance_global_control.cpp
index 250fda90..fb501d43 100644
--- a/external/tbb/test/conformance/conformance_global_control.cpp
+++ b/external/tbb/test/conformance/conformance_global_control.cpp
@@ -13,12 +13,12 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 */
-#include "common/test.h"
 #include "common/concurrency_tracker.h"
+#include "common/cpu_usertime.h"
 #include "common/spin_barrier.h"
+#include "common/test.h"
 #include "common/utils.h"
 #include "common/utils_concurrency_limit.h"
-#include "common/cpu_usertime.h"
 
 #include "oneapi/tbb/global_control.h"
 #include "oneapi/tbb/parallel_for.h"
@@ -29,17 +29,19 @@
 //! \file conformance_global_control.cpp
 //! \brief Test for [sched.global_control] specification
 
-const std::size_t MB = 1024*1024;
+const std::size_t MB = 1024 * 1024;
 
 void TestStackSizeSimpleControl() {
-    oneapi::tbb::global_control s0(oneapi::tbb::global_control::thread_stack_size, 1*MB);
+    oneapi::tbb::global_control s0(oneapi::tbb::global_control::thread_stack_size, 1 * MB);
 
     {
-        oneapi::tbb::global_control s1(oneapi::tbb::global_control::thread_stack_size, 8*MB);
+        oneapi::tbb::global_control s1(oneapi::tbb::global_control::thread_stack_size, 8 * MB);
 
-        CHECK(8*MB == oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::thread_stack_size));
+        CHECK(8 * MB
+              == oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::thread_stack_size));
     }
-    CHECK(1*MB == oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::thread_stack_size));
+    CHECK(1 * MB
+          == oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::thread_stack_size));
 }
 
 struct StackSizeRun : utils::NoAssign {
@@ -47,14 +49,15 @@ struct StackSizeRun : utils::NoAssign {
     int num_threads;
     utils::SpinBarrier *barr1, *barr2;
 
-    StackSizeRun(int threads, utils::SpinBarrier *b1, utils::SpinBarrier *b2) :
-        num_threads(threads), barr1(b1), barr2(b2) {}
-    void operator()( int id ) const {
-        oneapi::tbb::global_control s1(oneapi::tbb::global_control::thread_stack_size, (1+id)*MB);
+    StackSizeRun(int threads, utils::SpinBarrier* b1, utils::SpinBarrier* b2)
+        : num_threads(threads), barr1(b1), barr2(b2) {}
+    void operator()(int id) const {
+        oneapi::tbb::global_control s1(oneapi::tbb::global_control::thread_stack_size, (1 + id) * MB);
 
         barr1->wait();
 
-        REQUIRE(num_threads*MB == oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::thread_stack_size));
+        REQUIRE(num_threads * MB
+                == oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::thread_stack_size));
         barr2->wait();
     }
 };
@@ -62,55 +65,55 @@ struct StackSizeRun : utils::NoAssign {
 void TestStackSizeThreadsControl() {
     int threads = 4;
     utils::SpinBarrier barr1(threads), barr2(threads);
-    utils::NativeParallelFor( threads, StackSizeRun(threads, &barr1, &barr2) );
+    utils::NativeParallelFor(threads, StackSizeRun(threads, &barr1, &barr2));
 }
 
-void RunWorkersLimited(size_t parallelism)
-{
+void RunWorkersLimited(size_t parallelism) {
     oneapi::tbb::global_control s(oneapi::tbb::global_control::max_allowed_parallelism, parallelism);
     // TODO: consider better testing approach
     // Sleep is required because after destruction global_control on the previous iteration,
     // it recalls the maximum concurrency and excessive worker threads might populate the arena.
     // So, we need to wait when arena becomes empty but it is unreliable and might sporadically fail.
     utils::Sleep(100);
-    const std::size_t expected_threads = (utils::get_platform_max_threads()==1)? 1 : parallelism;
+    const std::size_t expected_threads = (utils::get_platform_max_threads() == 1) ? 1 : parallelism;
     utils::ExactConcurrencyLevel::check(expected_threads);
 }
 
-void TestWorkersConstraints()
-{
-    const size_t max_parallelism =
-        oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::max_allowed_parallelism);
+void TestWorkersConstraints() {
+    const size_t max_parallelism
+            = oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::max_allowed_parallelism);
     if (max_parallelism > 3) {
-        oneapi::tbb::global_control c(oneapi::tbb::global_control::max_allowed_parallelism, max_parallelism-1);
-        CHECK_MESSAGE(max_parallelism-1 ==
-               oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::max_allowed_parallelism),
-               "Allowed parallelism must be decreasable.");
-        oneapi::tbb::global_control c1(oneapi::tbb::global_control::max_allowed_parallelism, max_parallelism-2);
-        CHECK_MESSAGE(max_parallelism-2 ==
-               oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::max_allowed_parallelism),
-               "Allowed parallelism must be decreasable.");
+        oneapi::tbb::global_control c(oneapi::tbb::global_control::max_allowed_parallelism,
+                                      max_parallelism - 1);
+        CHECK_MESSAGE(max_parallelism - 1
+                              == oneapi::tbb::global_control::active_value(
+                                      oneapi::tbb::global_control::max_allowed_parallelism),
+                      "Allowed parallelism must be decreasable.");
+        oneapi::tbb::global_control c1(oneapi::tbb::global_control::max_allowed_parallelism,
+                                       max_parallelism - 2);
+        CHECK_MESSAGE(max_parallelism - 2
+                              == oneapi::tbb::global_control::active_value(
+                                      oneapi::tbb::global_control::max_allowed_parallelism),
+                      "Allowed parallelism must be decreasable.");
     }
     const size_t limit_par = utils::min(max_parallelism, 4U);
     // check that constrains are really met
-    for (size_t num=2; num<limit_par; num++)
-        RunWorkersLimited(num);
-    for (size_t num=limit_par; num>1; num--)
-        RunWorkersLimited(num);
+    for (size_t num = 2; num < limit_par; num++) RunWorkersLimited(num);
+    for (size_t num = limit_par; num > 1; num--) RunWorkersLimited(num);
 }
 
-struct SetUseRun: utils::NoAssign {
-    utils::SpinBarrier &barr;
+struct SetUseRun : utils::NoAssign {
+    utils::SpinBarrier& barr;
 
     SetUseRun(utils::SpinBarrier& b) : barr(b) {}
-    void operator()( int id ) const {
+    void operator()(int id) const {
         if (id == 0) {
-            for (int i=0; i<10; i++) {
+            for (int i = 0; i < 10; i++) {
                 oneapi::tbb::parallel_for(0, 1000, utils::DummyBody(10), oneapi::tbb::simple_partitioner());
                 barr.wait();
             }
         } else {
-            for (int i=0; i<10; i++) {
+            for (int i = 0; i < 10; i++) {
                 oneapi::tbb::global_control c(oneapi::tbb::global_control::max_allowed_parallelism, 8);
                 barr.wait();
             }
@@ -118,38 +121,39 @@ struct SetUseRun: utils::NoAssign {
     }
 };
 
-void TestConcurrentSetUseConcurrency()
-{
+void TestConcurrentSetUseConcurrency() {
     utils::SpinBarrier barr(2);
-    NativeParallelFor( 2, SetUseRun(barr) );
+    NativeParallelFor(2, SetUseRun(barr));
 }
 
 // check number of workers after autoinitialization
-void TestAutoInit()
-{
-    const size_t max_parallelism =
-        oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::max_allowed_parallelism);
-    const unsigned expected_threads = utils::get_platform_max_threads()==1?
-        1 : (unsigned)max_parallelism;
+void TestAutoInit() {
+    const size_t max_parallelism
+            = oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::max_allowed_parallelism);
+    const unsigned expected_threads = utils::get_platform_max_threads() == 1 ? 1 : (unsigned) max_parallelism;
     utils::ExactConcurrencyLevel::check(expected_threads);
-    CHECK_MESSAGE(oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::max_allowed_parallelism)
-           == max_parallelism, "max_allowed_parallelism must not be changed after auto init");
+    CHECK_MESSAGE(
+            oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::max_allowed_parallelism)
+                    == max_parallelism,
+            "max_allowed_parallelism must not be changed after auto init");
     if (max_parallelism > 2) {
         // after autoinit it's possible to decrease workers number
-        oneapi::tbb::global_control s(oneapi::tbb::global_control::max_allowed_parallelism, max_parallelism-1);
+        oneapi::tbb::global_control s(oneapi::tbb::global_control::max_allowed_parallelism,
+                                      max_parallelism - 1);
         // TODO: consider better testing approach
         // Sleep is required because after previous concurrency check, the arena is still populated with workers.
         // So, we need to wait when arena becomes empty but it is unreliable and might sporadically fail.
         utils::Sleep(100);
-        utils::ExactConcurrencyLevel::check(max_parallelism-1);
+        utils::ExactConcurrencyLevel::check(max_parallelism - 1);
     }
 }
 
 class TestMultipleControlsRun {
-    utils::SpinBarrier &barrier;
+    utils::SpinBarrier& barrier;
+
 public:
     TestMultipleControlsRun(utils::SpinBarrier& b) : barrier(b) {}
-    void operator()( int id ) const {
+    void operator()(int id) const {
         barrier.wait();
         if (id) {
             {
@@ -184,45 +188,41 @@ class TestMultipleControlsRun {
 
 // test that global controls from different thread with overlapping lifetime
 // still keep parallelism under control
-void TestMultipleControls()
-{
+void TestMultipleControls() {
     utils::SpinBarrier barrier(2);
-    utils::NativeParallelFor( 2, TestMultipleControlsRun(barrier) );
+    utils::NativeParallelFor(2, TestMultipleControlsRun(barrier));
 }
 
 #if !(__TBB_WIN8UI_SUPPORT && (_WIN32_WINNT < 0x0A00))
 //! Testing setting stack size
 //! \brief \ref interface \ref requirement
 TEST_CASE("setting stack size") {
-    std::size_t default_ss = oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::thread_stack_size);
+    std::size_t default_ss
+            = oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::thread_stack_size);
     CHECK(default_ss > 0);
     TestStackSizeSimpleControl();
     TestStackSizeThreadsControl();
-    CHECK(default_ss == oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::thread_stack_size));
+    CHECK(default_ss
+          == oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::thread_stack_size));
 }
 #endif
 
 //! Testing setting max number of threads
 //! \brief \ref interface \ref requirement
-TEST_CASE("setting max number of threads") {
-    TestWorkersConstraints();
-}
+TEST_CASE("setting max number of threads") { TestWorkersConstraints(); }
 //! Testing concurrenct setting concurrency
 //! \brief \ref interface \ref requirement
-TEST_CASE("concurrenct setting concurrency") {
-    TestConcurrentSetUseConcurrency();
-}
+TEST_CASE("concurrenct setting concurrency") { TestConcurrentSetUseConcurrency(); }
 
 //! Testing auto initialization
 //! \brief \ref interface \ref requirement
-TEST_CASE("auto initialization") {
-    TestAutoInit();
-}
+TEST_CASE("auto initialization") { TestAutoInit(); }
 
 //! Test terminate_on_exception default value
 //! \brief \ref interface \ref requirement
 TEST_CASE("terminate_on_exception: default") {
-    std::size_t default_toe = oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::terminate_on_exception);
+    std::size_t default_toe
+            = oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::terminate_on_exception);
     CHECK(default_toe == 0);
 }
 
@@ -232,15 +232,20 @@ TEST_CASE("terminate_on_exception: nested") {
     oneapi::tbb::global_control* c0;
     {
         oneapi::tbb::global_control c1(oneapi::tbb::global_control::terminate_on_exception, 1);
-        CHECK(oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::terminate_on_exception) == 1);
+        CHECK(oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::terminate_on_exception)
+              == 1);
         {
             oneapi::tbb::global_control c2(oneapi::tbb::global_control::terminate_on_exception, 0);
-            CHECK(oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::terminate_on_exception) == 1);
+            CHECK(oneapi::tbb::global_control::active_value(
+                          oneapi::tbb::global_control::terminate_on_exception)
+                  == 1);
         }
-        CHECK(oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::terminate_on_exception) == 1);
+        CHECK(oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::terminate_on_exception)
+              == 1);
         c0 = new oneapi::tbb::global_control(oneapi::tbb::global_control::terminate_on_exception, 0);
     }
-    CHECK(oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::terminate_on_exception) == 0);
+    CHECK(oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::terminate_on_exception)
+          == 0);
     delete c0;
 }
 
@@ -249,10 +254,13 @@ TEST_CASE("terminate_on_exception: nested") {
 TEST_CASE("setting same value") {
     const std::size_t value = 2;
 
-    oneapi::tbb::global_control* ctl1 = new oneapi::tbb::global_control(oneapi::tbb::global_control::max_allowed_parallelism, value);
-    oneapi::tbb::global_control* ctl2 = new oneapi::tbb::global_control(oneapi::tbb::global_control::max_allowed_parallelism, value);
+    oneapi::tbb::global_control* ctl1
+            = new oneapi::tbb::global_control(oneapi::tbb::global_control::max_allowed_parallelism, value);
+    oneapi::tbb::global_control* ctl2
+            = new oneapi::tbb::global_control(oneapi::tbb::global_control::max_allowed_parallelism, value);
 
-    std::size_t active = oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::max_allowed_parallelism);
+    std::size_t active
+            = oneapi::tbb::global_control::active_value(oneapi::tbb::global_control::max_allowed_parallelism);
     REQUIRE(active == value);
     delete ctl2;
 
@@ -264,12 +272,12 @@ TEST_CASE("setting same value") {
 //! Testing lifetime control conformance
 //! \brief \ref interface \ref requirement
 TEST_CASE("prolong lifetime simple") {
-    tbb::task_scheduler_handle hdl1{ tbb::attach{} };
+    tbb::task_scheduler_handle hdl1 {tbb::attach {}};
     {
         tbb::parallel_for(0, 10, utils::DummyBody());
 
         tbb::task_scheduler_handle hdl2;
-        hdl2 = tbb::task_scheduler_handle{ tbb::attach{} };
+        hdl2 = tbb::task_scheduler_handle {tbb::attach {}};
         hdl2.release();
     }
     bool ok = tbb::finalize(hdl1, std::nothrow);
@@ -286,8 +294,8 @@ TEST_CASE("null handle check") {
 //! Testing handle check for emptiness
 //! \brief \ref interface \ref requirement
 TEST_CASE("null handle check 2") {
-    tbb::task_scheduler_handle hndl{ tbb::attach{} };
-    bool not_empty = (bool)hndl;
+    tbb::task_scheduler_handle hndl {tbb::attach {}};
+    bool not_empty = (bool) hndl;
 
     tbb::finalize(hndl, std::nothrow);
 
@@ -298,11 +306,11 @@ TEST_CASE("null handle check 2") {
 //! Testing handle check for emptiness
 //! \brief \ref interface \ref requirement
 TEST_CASE("null handle check 3") {
-    tbb::task_scheduler_handle handle1{ tbb::attach{} };
+    tbb::task_scheduler_handle handle1 {tbb::attach {}};
     tbb::task_scheduler_handle handle2(std::move(handle1));
 
     bool handle1_empty = !handle1;
-    bool handle2_not_empty = (bool)handle2;
+    bool handle2_not_empty = (bool) handle2;
 
     tbb::finalize(handle2, std::nothrow);
 
@@ -314,7 +322,7 @@ TEST_CASE("null handle check 3") {
 //! \brief \ref interface \ref requirement
 TEST_CASE("cross thread 1") {
     // created task_scheduler_handle, parallel_for on another thread - finalize
-    tbb::task_scheduler_handle handle{ tbb::attach{} };
+    tbb::task_scheduler_handle handle {tbb::attach {}};
     utils::NativeParallelFor(1, [&](int) {
         tbb::parallel_for(0, 10, utils::DummyBody());
         bool res = tbb::finalize(handle, std::nothrow);
@@ -328,7 +336,7 @@ TEST_CASE("cross thread 2") {
     // created task_scheduler_handle, called parallel_for on this thread, killed the thread - and finalize on another thread
     tbb::task_scheduler_handle handle;
     utils::NativeParallelFor(1, [&](int) {
-        handle = tbb::task_scheduler_handle{ tbb::attach{} };
+        handle = tbb::task_scheduler_handle {tbb::attach {}};
         tbb::parallel_for(0, 10, utils::DummyBody());
     });
     bool res = tbb::finalize(handle, std::nothrow);
@@ -341,7 +349,7 @@ TEST_CASE("simple prolong lifetime 3") {
     // Parallel region
     tbb::parallel_for(0, 10, utils::DummyBody());
     // Termination
-    tbb::task_scheduler_handle handle = tbb::task_scheduler_handle{ tbb::attach{} };
+    tbb::task_scheduler_handle handle = tbb::task_scheduler_handle {tbb::attach {}};
     bool res = tbb::finalize(handle, std::nothrow);
     REQUIRE(res);
     // New parallel region
@@ -351,20 +359,14 @@ TEST_CASE("simple prolong lifetime 3") {
 //! \brief \ref regression \ref interface \ref requirement
 TEST_CASE("Test worker threads remain inactive in enforced serial execution mode") {
     auto num_threads = utils::get_platform_max_threads();
-    utils::SpinBarrier barrier{num_threads};
+    utils::SpinBarrier barrier {num_threads};
 
     // Warm-up threads
-    tbb::parallel_for(std::size_t(0), num_threads, [&] (std::size_t) {
-        barrier.wait();
-    });
+    tbb::parallel_for(std::size_t(0), num_threads, [&](std::size_t) { barrier.wait(); });
 
     tbb::global_control control(tbb::global_control::max_allowed_parallelism, 1);
 
-    std::thread thr([&] {
-        tbb::parallel_for(0, 100000, [&] (int) {
-            utils::doDummyWork(100);
-        });
-    });
+    std::thread thr([&] { tbb::parallel_for(0, 100000, [&](int) { utils::doDummyWork(100); }); });
 
     // Workers should sleep because of global_control enforced serial execution of tasks
     TestCPUUserTime(utils::get_platform_max_threads() - 1);
@@ -397,7 +399,7 @@ TEST_CASE("terminate_on_exception: enabled") {
         });
 #if _MSC_VER
 #pragma warning(push)
-#pragma warning(disable:4611) // interaction between '_setjmp' and C++ object destruction is non - portable
+#pragma warning(disable : 4611)// interaction between '_setjmp' and C++ object destruction is non - portable
 #endif
         SUBCASE("internal exception") {
             if (setjmp(buffer) == 0) {
@@ -410,9 +412,7 @@ TEST_CASE("terminate_on_exception: enabled") {
             if (setjmp(buffer) == 0) {
                 oneapi::tbb::parallel_for(0, 1, [](int) {
                     volatile bool suppress_unreachable_code_warning = true;
-                    if (suppress_unreachable_code_warning) {
-                        throw std::exception();
-                    }
+                    if (suppress_unreachable_code_warning) { throw std::exception(); }
                 });
                 FAIL("Unreachable code");
             }
@@ -424,9 +424,7 @@ TEST_CASE("terminate_on_exception: enabled") {
         std::set_terminate(prev);
         terminate_handler_called = true;
 #if TBB_USE_EXCEPTIONS
-    } catch (...) {
-        FAIL("The exception is not expected");
-    }
+    } catch (...) { FAIL("The exception is not expected"); }
 #endif
     CHECK(terminate_handler_called);
 }
diff --git a/external/tbb/test/conformance/conformance_graph.cpp b/external/tbb/test/conformance/conformance_graph.cpp
index 1f73999f..b6b26e4a 100644
--- a/external/tbb/test/conformance/conformance_graph.cpp
+++ b/external/tbb/test/conformance/conformance_graph.cpp
@@ -15,7 +15,7 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
 #endif
 
 #include "conformance_flowgraph.h"
@@ -23,12 +23,15 @@
 //! \file conformance_graph.cpp
 //! \brief Test for [flow_graph.graph] specification
 
-void test_continue_node_rf_reset_protocol(){
+void test_continue_node_rf_reset_protocol() {
     using namespace oneapi::tbb::flow;
     graph g;
 
     std::atomic<bool> flag = {false};
-    continue_node<int> source(g, 2, [&](const continue_msg&){ flag = true; return 1;});
+    continue_node<int> source(g, 2, [&](const continue_msg&) {
+        flag = true;
+        return 1;
+    });
 
     source.try_put(continue_msg());
     g.wait_for_all();
@@ -46,7 +49,7 @@ void test_continue_node_rf_reset_protocol(){
     CHECK_MESSAGE((flag == true), "Should be true");
 }
 
-void test_input_node_rf_reset_protocol(){
+void test_input_node_rf_reset_protocol() {
     oneapi::tbb::flow::graph g;
 
     conformance::copy_counting_object<int> fun;
@@ -65,11 +68,12 @@ void test_input_node_rf_reset_protocol(){
     CHECK_MESSAGE((node.try_get(tmp) == false), "Should be false");
 }
 
-template<typename Node>
-void test_functional_nodes_rf_reset_protocol(){
+template <typename Node>
+void test_functional_nodes_rf_reset_protocol() {
     oneapi::tbb::flow::graph g;
     size_t concurrency_limit = 1;
-    oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism, concurrency_limit);
+    oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism,
+                                        concurrency_limit);
 
     conformance::counting_functor<int> counting_body;
     Node f(g, oneapi::tbb::flow::serial, counting_body);
@@ -83,8 +87,8 @@ void test_functional_nodes_rf_reset_protocol(){
     CHECK_MESSAGE((counting_body.execute_count == 1), "Body should be executed");
 }
 
-template<typename Node, typename ...Args>
-void test_buffering_nodes_rf_reset_protocol(Args... node_body){
+template <typename Node, typename... Args>
+void test_buffering_nodes_rf_reset_protocol(Args... node_body) {
     oneapi::tbb::flow::graph g;
     Node testing_node(g, node_body...);
 
@@ -102,8 +106,8 @@ void test_buffering_nodes_rf_reset_protocol(Args... node_body){
     g.wait_for_all();
 }
 
-template<typename Node, typename InputType, typename ...Args>
-void test_nodes_with_body_rf_reset_bodies(Args... node_args){
+template <typename Node, typename InputType, typename... Args>
+void test_nodes_with_body_rf_reset_bodies(Args... node_args) {
     oneapi::tbb::flow::graph g;
     conformance::counting_functor<int> counting_body(5);
     Node testing_node(g, node_args..., counting_body);
@@ -120,7 +124,7 @@ void test_nodes_with_body_rf_reset_bodies(Args... node_args){
     CHECK_MESSAGE((counting_body.execute_count == 1), "Body should be replaced with a copy of the body");
 }
 
-void test_limiter_node_rf_reset_protocol(){
+void test_limiter_node_rf_reset_protocol() {
     oneapi::tbb::flow::graph g;
 
     constexpr int limit = 5;
@@ -129,28 +133,28 @@ void test_limiter_node_rf_reset_protocol(){
 
     oneapi::tbb::flow::make_edge(testing_node, suc_node);
 
-    for(int i = 0; i < limit * 2; ++i)
-        testing_node.try_put(1);
+    for (int i = 0; i < limit * 2; ++i) testing_node.try_put(1);
     g.wait_for_all();
 
-    CHECK_MESSAGE((conformance::get_values(suc_node).size() == limit), "Descendant of the node needs be receive limited number of messages");
+    CHECK_MESSAGE((conformance::get_values(suc_node).size() == limit),
+                  "Descendant of the node needs be receive limited number of messages");
 
     g.reset(oneapi::tbb::flow::rf_reset_protocol);
 
-    for(int i = 0; i < limit * 2; ++i)
-        testing_node.try_put(1);
+    for (int i = 0; i < limit * 2; ++i) testing_node.try_put(1);
     g.wait_for_all();
 
-    CHECK_MESSAGE((conformance::get_values(suc_node).size() == limit), "Descendant of the node needs be receive limited number of messages");
+    CHECK_MESSAGE((conformance::get_values(suc_node).size() == limit),
+                  "Descendant of the node needs be receive limited number of messages");
 }
 
-void test_join_node_rf_reset_protocol(){
+void test_join_node_rf_reset_protocol() {
     oneapi::tbb::flow::graph g;
 
     oneapi::tbb::flow::join_node<std::tuple<int>, oneapi::tbb::flow::queueing> testing_node(g);
 
     oneapi::tbb::flow::input_port<0>(testing_node).try_put(1);
-    
+
     g.wait_for_all();
     g.reset(oneapi::tbb::flow::rf_reset_protocol);
 
@@ -195,14 +199,15 @@ TEST_CASE("graph reset with rf_clear_edges") {
 
     //node types
     oneapi::tbb::flow::continue_node<int> ct(g, body());
-    oneapi::tbb::flow::split_node< std::tuple<int> > s(g);
+    oneapi::tbb::flow::split_node<std::tuple<int>> s(g);
     oneapi::tbb::flow::input_node<int> src(g, body());
     oneapi::tbb::flow::function_node<int, int> fxn(g, oneapi::tbb::flow::unlimited, body());
-    oneapi::tbb::flow::multifunction_node<int, std::tuple<int, int> > m_fxn(g, oneapi::tbb::flow::unlimited, body());
+    oneapi::tbb::flow::multifunction_node<int, std::tuple<int, int>> m_fxn(g, oneapi::tbb::flow::unlimited,
+                                                                           body());
     oneapi::tbb::flow::broadcast_node<int> bc(g);
     oneapi::tbb::flow::limiter_node<int> lim(g, 2);
     oneapi::tbb::flow::indexer_node<int> ind(g);
-    oneapi::tbb::flow::join_node< std::tuple< int >, oneapi::tbb::flow::queueing > j(g);
+    oneapi::tbb::flow::join_node<std::tuple<int>, oneapi::tbb::flow::queueing> j(g);
     oneapi::tbb::flow::buffer_node<int> bf(g);
     oneapi::tbb::flow::priority_queue_node<int> pq(g);
     oneapi::tbb::flow::write_once_node<int> wo(g);
@@ -228,7 +233,7 @@ TEST_CASE("graph reset with rf_clear_edges") {
     g.reset(oneapi::tbb::flow::rf_clear_edges);
 
     ct.try_put(oneapi::tbb::flow::continue_msg());
-    s.try_put(std::tuple<int>{1});
+    s.try_put(std::tuple<int> {1});
     src.activate();
     fxn.try_put(1);
     m_fxn.try_put(1);
@@ -244,9 +249,12 @@ TEST_CASE("graph reset with rf_clear_edges") {
 
     g.wait_for_all();
 
-    CHECK_MESSAGE((conformance::get_values(successor).size() == 0), "Message should not pass when edges doesn't exist");
-    CHECK_MESSAGE((conformance::get_values(successor2).size() == 0), "Message should not pass when edge doesn't exist");
-    CHECK_MESSAGE((conformance::get_values(successor3).size() == 0), "Message should not pass when edge doesn't exist");
+    CHECK_MESSAGE((conformance::get_values(successor).size() == 0),
+                  "Message should not pass when edges doesn't exist");
+    CHECK_MESSAGE((conformance::get_values(successor2).size() == 0),
+                  "Message should not pass when edge doesn't exist");
+    CHECK_MESSAGE((conformance::get_values(successor3).size() == 0),
+                  "Message should not pass when edge doesn't exist");
 }
 
 //! Graph reset rf_reset_bodies
@@ -260,7 +268,7 @@ TEST_CASE("graph reset with rf_reset_bodies") {
 
     graph g;
     conformance::counting_functor<int> counting_body(1);
-    input_node<int> testing_node(g,counting_body);
+    input_node<int> testing_node(g, counting_body);
     queue_node<int> q_node(g);
 
     make_edge(testing_node, q_node);
@@ -281,37 +289,35 @@ TEST_CASE("graph reset with rf_reset_bodies") {
 //! \brief \ref requirement
 TEST_CASE("graph cancel") {
     oneapi::tbb::flow::graph g;
-    CHECK_MESSAGE(!g.is_cancelled(), "Freshly created graph should not be cancelled." );
+    CHECK_MESSAGE(!g.is_cancelled(), "Freshly created graph should not be cancelled.");
 
     g.cancel();
-    CHECK_MESSAGE(!g.is_cancelled(), "Cancelled status should appear only after the wait_for_all() call." );
+    CHECK_MESSAGE(!g.is_cancelled(), "Cancelled status should appear only after the wait_for_all() call.");
 
     g.wait_for_all();
-    CHECK_MESSAGE(g.is_cancelled(), "Waiting should allow checking the cancellation status." );
+    CHECK_MESSAGE(g.is_cancelled(), "Waiting should allow checking the cancellation status.");
 
     g.reset();
-    CHECK_MESSAGE(!g.is_cancelled(), "Resetting must reset the cancellation status." );
+    CHECK_MESSAGE(!g.is_cancelled(), "Resetting must reset the cancellation status.");
 
     std::atomic<bool> cancelled(false);
     std::atomic<unsigned> executed(0);
     oneapi::tbb::flow::function_node<int> f(g, oneapi::tbb::flow::serial, [&](int) {
         ++executed;
-        while( !cancelled.load(std::memory_order_relaxed) )
+        while (!cancelled.load(std::memory_order_relaxed))
             std::this_thread::sleep_for(std::chrono::milliseconds(1));
     });
 
     const unsigned N = 10;
-    for( unsigned i = 0; i < N; ++i )
-        f.try_put(0);
+    for (unsigned i = 0; i < N; ++i) f.try_put(0);
 
     std::thread thr([&] {
-        while( !executed )
-            std::this_thread::sleep_for(std::chrono::milliseconds(1));
+        while (!executed) std::this_thread::sleep_for(std::chrono::milliseconds(1));
         g.cancel();
         cancelled.store(true, std::memory_order_relaxed);
     });
     g.wait_for_all();
     thr.join();
-    CHECK_MESSAGE(g.is_cancelled(), "Wait for all should not change the cancellation status." );
-    CHECK_MESSAGE(1 == executed, "Buffered messages should be dropped by the cancelled graph." );
+    CHECK_MESSAGE(g.is_cancelled(), "Wait for all should not change the cancellation status.");
+    CHECK_MESSAGE(1 == executed, "Buffered messages should be dropped by the cancelled graph.");
 }
diff --git a/external/tbb/test/conformance/conformance_indexer_node.cpp b/external/tbb/test/conformance/conformance_indexer_node.cpp
index 1cad744e..2ef7a0fa 100644
--- a/external/tbb/test/conformance/conformance_indexer_node.cpp
+++ b/external/tbb/test/conformance/conformance_indexer_node.cpp
@@ -15,7 +15,7 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
 #endif
 
 #include "conformance_flowgraph.h"
@@ -23,19 +23,19 @@
 //! \file conformance_indexer_node.cpp
 //! \brief Test for [flow_graph.indexer_node] specification
 
-using input_msg = conformance::message</*default_ctor*/false, /*copy_ctor*/true, /*copy_assign*/false>;
+using input_msg = conformance::message</*default_ctor*/ false, /*copy_ctor*/ true, /*copy_assign*/ false>;
 using my_indexer_type = oneapi::tbb::flow::indexer_node<int, float, input_msg>;
 using my_output_type = my_indexer_type::output_type;
 
 //! Test node broadcast messages to successors
 //! \brief \ref requirement
-TEST_CASE("indexer_node broadcasts"){
+TEST_CASE("indexer_node broadcasts") {
     oneapi::tbb::flow::graph g;
 
     my_indexer_type testing_node(g);
-    std::vector<conformance::test_push_receiver<my_output_type>*> receiver_nodes;
+    std::vector<conformance::test_push_receiver<my_output_type> *> receiver_nodes;
 
-    for(std::size_t i = 0; i < 3; ++i) {
+    for (std::size_t i = 0; i < 3; ++i) {
         receiver_nodes.emplace_back(new conformance::test_push_receiver<my_output_type>(g));
         oneapi::tbb::flow::make_edge(testing_node, *receiver_nodes.back());
     }
@@ -45,13 +45,13 @@ TEST_CASE("indexer_node broadcasts"){
     oneapi::tbb::flow::input_port<2>(testing_node).try_put(input_msg(1));
     g.wait_for_all();
 
-    for(auto receiver: receiver_nodes) {
+    for (auto receiver : receiver_nodes) {
         auto values = conformance::get_values(*receiver);
         CHECK_MESSAGE((values.size() == 3), std::string("Descendant of the node must receive 3 messages."));
-        for(auto& value : values){
-            if(value.is_a<int>()){
+        for (auto &value : values) {
+            if (value.is_a<int>()) {
                 CHECK_MESSAGE((value.cast_to<int>() == 6), "Value passed is the actual one received.");
-            } else if(value.is_a<float>()){
+            } else if (value.is_a<float>()) {
                 CHECK_MESSAGE((value.cast_to<float>() == 1.5), "Value passed is the actual one received.");
             } else {
                 CHECK_MESSAGE((value.cast_to<input_msg>() == 1), "Value passed is the actual one received.");
@@ -63,8 +63,9 @@ TEST_CASE("indexer_node broadcasts"){
 
 //! Test inheritance relations
 //! \brief \ref interface
-TEST_CASE("indexer_node superclasses"){
-    CHECK_MESSAGE((std::is_base_of<oneapi::tbb::flow::graph_node, my_indexer_type>::value), "indexer_node should be derived from graph_node");
+TEST_CASE("indexer_node superclasses") {
+    CHECK_MESSAGE((std::is_base_of<oneapi::tbb::flow::graph_node, my_indexer_type>::value),
+                  "indexer_node should be derived from graph_node");
 }
 
 //! Test node not buffered unsuccessful message, and try_get after rejection should not succeed.
@@ -74,7 +75,7 @@ TEST_CASE("indexer_node buffering") {
 
     my_indexer_type testing_node(g);
 
-    oneapi::tbb::flow::limiter_node<my_output_type> rejecter(g,0);
+    oneapi::tbb::flow::limiter_node<my_output_type> rejecter(g, 0);
     oneapi::tbb::flow::make_edge(testing_node, rejecter);
 
     oneapi::tbb::flow::input_port<0>(testing_node).try_put(6);
@@ -90,30 +91,29 @@ TEST_CASE("indexer_node buffering") {
 //! \brief \ref requirement
 TEST_CASE("indexer_node behaviour") {
     oneapi::tbb::flow::graph g;
-    oneapi::tbb::flow::function_node<int, int> f1( g, oneapi::tbb::flow::unlimited,
-                                [](const int &i) { return 2*i; } );
-    oneapi::tbb::flow::function_node<float, float> f2( g, oneapi::tbb::flow::unlimited,
-                                [](const float &f) { return f/2; } );
-    oneapi::tbb::flow::continue_node<input_msg> c1( g,
-                                [](oneapi::tbb::flow::continue_msg) { return input_msg(5); } );
+    oneapi::tbb::flow::function_node<int, int> f1(g, oneapi::tbb::flow::unlimited,
+                                                  [](const int &i) { return 2 * i; });
+    oneapi::tbb::flow::function_node<float, float> f2(g, oneapi::tbb::flow::unlimited,
+                                                      [](const float &f) { return f / 2; });
+    oneapi::tbb::flow::continue_node<input_msg> c1(
+            g, [](oneapi::tbb::flow::continue_msg) { return input_msg(5); });
 
     my_indexer_type testing_node(g);
 
-    oneapi::tbb::flow::function_node<my_output_type>
-        f3( g, oneapi::tbb::flow::unlimited,
-            []( const my_output_type &v ) {
+    oneapi::tbb::flow::function_node<my_output_type> f3(
+            g, oneapi::tbb::flow::unlimited, [](const my_output_type &v) {
                 if (v.tag() == 0) {
-                    CHECK_MESSAGE((v.is_a<int>()), "Expected to int" );
-                    CHECK_MESSAGE((oneapi::tbb::flow::cast_to<int>(v) == 6), "Expected to receive 6" );
+                    CHECK_MESSAGE((v.is_a<int>()), "Expected to int");
+                    CHECK_MESSAGE((oneapi::tbb::flow::cast_to<int>(v) == 6), "Expected to receive 6");
                 } else if (v.tag() == 1) {
-                    CHECK_MESSAGE((v.is_a<float>()), "Expected to float" );
-                    CHECK_MESSAGE((oneapi::tbb::flow::cast_to<float>(v) == 1.5), "Expected to receive 1.5" );
+                    CHECK_MESSAGE((v.is_a<float>()), "Expected to float");
+                    CHECK_MESSAGE((oneapi::tbb::flow::cast_to<float>(v) == 1.5), "Expected to receive 1.5");
                 } else {
-                    CHECK_MESSAGE((v.is_a<input_msg>()), "Expected to float" );
-                    CHECK_MESSAGE((oneapi::tbb::flow::cast_to<input_msg>(v) == 5), "Expected to receive input_msg(5)" );
+                    CHECK_MESSAGE((v.is_a<input_msg>()), "Expected to float");
+                    CHECK_MESSAGE((oneapi::tbb::flow::cast_to<input_msg>(v) == 5),
+                                  "Expected to receive input_msg(5)");
                 }
-            }
-        );
+            });
 
     oneapi::tbb::flow::make_edge(f1, oneapi::tbb::flow::input_port<0>(testing_node));
     oneapi::tbb::flow::make_edge(f2, oneapi::tbb::flow::input_port<1>(testing_node));
@@ -129,10 +129,9 @@ TEST_CASE("indexer_node behaviour") {
 //! The node that is constructed has a reference to the same graph object as src.
 //! The list of predecessors, messages in the input ports, and successors are not copied.
 //! \brief \ref interface
-TEST_CASE("indexer_node copy constructor"){
+TEST_CASE("indexer_node copy constructor") {
     oneapi::tbb::flow::graph g;
-    oneapi::tbb::flow::continue_node<int> node0( g,
-                                [](oneapi::tbb::flow::continue_msg) { return 1; } );
+    oneapi::tbb::flow::continue_node<int> node0(g, [](oneapi::tbb::flow::continue_msg) { return 1; });
 
     my_indexer_type node1(g);
     conformance::test_push_receiver<my_output_type> node2(g);
@@ -148,16 +147,21 @@ TEST_CASE("indexer_node copy constructor"){
     oneapi::tbb::flow::input_port<0>(node_copy).try_put(1);
     g.wait_for_all();
 
-    CHECK_MESSAGE((conformance::get_values(node2).size() == 0 && conformance::get_values(node3).size() == 1), "Copied node doesn`t copy successor");
+    CHECK_MESSAGE((conformance::get_values(node2).size() == 0 && conformance::get_values(node3).size() == 1),
+                  "Copied node doesn`t copy successor");
 
     node0.try_put(oneapi::tbb::flow::continue_msg());
     g.wait_for_all();
 
-    CHECK_MESSAGE((conformance::get_values(node2).size() == 1 && conformance::get_values(node3).size() == 0), "Copied node doesn`t copy predecessor");
+    CHECK_MESSAGE((conformance::get_values(node2).size() == 1 && conformance::get_values(node3).size() == 0),
+                  "Copied node doesn`t copy predecessor");
 }
 
 //! Test indexer_node output_type
 //! \brief \ref interface \ref requirement
 TEST_CASE("indexer_node output_type") {
-    CHECK_MESSAGE((conformance::check_output_type<my_output_type, oneapi::tbb::flow::tagged_msg<size_t, int, float, input_msg>>()), "indexer_node output_type should returns a tagged_msg");
+    CHECK_MESSAGE(
+            (conformance::check_output_type<my_output_type,
+                                            oneapi::tbb::flow::tagged_msg<size_t, int, float, input_msg>>()),
+            "indexer_node output_type should returns a tagged_msg");
 }
diff --git a/external/tbb/test/conformance/conformance_input_node.cpp b/external/tbb/test/conformance/conformance_input_node.cpp
index e641787d..e71b4489 100644
--- a/external/tbb/test/conformance/conformance_input_node.cpp
+++ b/external/tbb/test/conformance/conformance_input_node.cpp
@@ -15,7 +15,7 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
 #endif
 
 #define CONFORMANCE_INPUT_NODE
@@ -66,28 +66,32 @@ void test_deduction_guides() {
     g.wait_for_all();
 }
 
-#endif // __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
+#endif// __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 
-template<typename O>
-void test_inheritance(){
+template <typename O>
+void test_inheritance() {
     using namespace oneapi::tbb::flow;
 
-    CHECK_MESSAGE((std::is_base_of<graph_node, input_node<O>>::value), "input_node should be derived from graph_node");
-    CHECK_MESSAGE((std::is_base_of<sender<O>, input_node<O>>::value), "input_node should be derived from sender<Output>");
-    CHECK_MESSAGE((!std::is_base_of<receiver<O>, input_node<O>>::value), "input_node cannot have predecessors");
+    CHECK_MESSAGE((std::is_base_of<graph_node, input_node<O>>::value),
+                  "input_node should be derived from graph_node");
+    CHECK_MESSAGE((std::is_base_of<sender<O>, input_node<O>>::value),
+                  "input_node should be derived from sender<Output>");
+    CHECK_MESSAGE((!std::is_base_of<receiver<O>, input_node<O>>::value),
+                  "input_node cannot have predecessors");
 }
 
 //! Test the body object passed to a node is copied
 //! \brief \ref interface
-TEST_CASE("input_node and body copying"){
-    conformance::test_copy_body_function<oneapi::tbb::flow::input_node<int>, conformance::copy_counting_object<int>>();
+TEST_CASE("input_node and body copying") {
+    conformance::test_copy_body_function<oneapi::tbb::flow::input_node<int>,
+                                         conformance::copy_counting_object<int>>();
 }
 
 //! The node that is constructed has a reference to the same graph object as src,
 //! has a copy of the initial body used by src.
 //! The successors of src are not copied.
 //! \brief \ref requirement
-TEST_CASE("input_node copy constructor"){
+TEST_CASE("input_node copy constructor") {
     using namespace oneapi::tbb::flow;
     graph g;
 
@@ -101,7 +105,8 @@ TEST_CASE("input_node copy constructor"){
 
     input_node<output_msg> node_copy(node1);
 
-    conformance::copy_counting_object<output_msg> b2 = copy_body<conformance::copy_counting_object<output_msg>, input_node<output_msg>>(node_copy);
+    conformance::copy_counting_object<output_msg> b2
+            = copy_body<conformance::copy_counting_object<output_msg>, input_node<output_msg>>(node_copy);
 
     CHECK_MESSAGE((fun2.copy_count + 1 < b2.copy_count), "constructor should copy bodies");
 
@@ -110,17 +115,19 @@ TEST_CASE("input_node copy constructor"){
     node_copy.activate();
     g.wait_for_all();
 
-    CHECK_MESSAGE((conformance::get_values(node2).size() == 0 && conformance::get_values(node3).size() == 1), "Copied node doesn`t copy successor");
+    CHECK_MESSAGE((conformance::get_values(node2).size() == 0 && conformance::get_values(node3).size() == 1),
+                  "Copied node doesn`t copy successor");
 
     node1.activate();
     g.wait_for_all();
 
-    CHECK_MESSAGE((conformance::get_values(node2).size() == 1 && conformance::get_values(node3).size() == 0), "Copied node doesn`t copy successor");
+    CHECK_MESSAGE((conformance::get_values(node2).size() == 1 && conformance::get_values(node3).size() == 0),
+                  "Copied node doesn`t copy successor");
 }
 
 //! Test inheritance relations
 //! \brief \ref interface
-TEST_CASE("input_node superclasses"){
+TEST_CASE("input_node superclasses") {
     test_inheritance<int>();
     test_inheritance<void*>();
     test_inheritance<output_msg>();
@@ -128,14 +135,14 @@ TEST_CASE("input_node superclasses"){
 
 //! Test input_node forwarding
 //! \brief \ref requirement
-TEST_CASE("input_node forwarding"){
+TEST_CASE("input_node forwarding") {
     conformance::counting_functor<output_msg> fun(conformance::expected);
     conformance::test_forwarding<oneapi::tbb::flow::input_node<output_msg>, void, output_msg>(5, fun);
 }
 
 //! Test input_node buffering
 //! \brief \ref requirement
-TEST_CASE("input_node buffering"){
+TEST_CASE("input_node buffering") {
     conformance::dummy_functor<int> fun;
     conformance::test_buffering<oneapi::tbb::flow::input_node<int>, int>(fun);
 }
@@ -155,13 +162,15 @@ TEST_CASE("input_node body") {
     node1.activate();
     g.wait_for_all();
 
-    CHECK_MESSAGE((conformance::get_values(node2).size() == counting_threshold), "Descendant of the node needs to be receive N messages");
-    CHECK_MESSAGE((fun.execute_count == counting_threshold + 1), "Body of the node needs to be executed N + 1 times");
+    CHECK_MESSAGE((conformance::get_values(node2).size() == counting_threshold),
+                  "Descendant of the node needs to be receive N messages");
+    CHECK_MESSAGE((fun.execute_count == counting_threshold + 1),
+                  "Body of the node needs to be executed N + 1 times");
 }
 
 //! Test deduction guides
 //! \brief \ref interface \ref requirement
-TEST_CASE("Deduction guides"){
+TEST_CASE("Deduction guides") {
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
     test_deduction_guides();
 #endif
@@ -169,11 +178,10 @@ TEST_CASE("Deduction guides"){
 
 //! Test that measured concurrency respects set limits
 //! \brief \ref requirement
-TEST_CASE("concurrency follows set limits"){
+TEST_CASE("concurrency follows set limits") {
     oneapi::tbb::global_control c(oneapi::tbb::global_control::max_allowed_parallelism,
                                   oneapi::tbb::this_task_arena::max_concurrency());
 
-
     utils::ConcurrencyTracker::Reset();
     oneapi::tbb::flow::graph g;
     conformance::concurrency_peak_checker_body counter(1);
@@ -193,28 +201,30 @@ TEST_CASE("Test input_node Output class") {
     conformance::test_output_class<oneapi::tbb::flow::input_node<conformance::copy_counting_object<int>>>();
 }
 
-struct input_node_counter{
+struct input_node_counter {
     static int count;
     int N;
-    input_node_counter(int n) : N(n){};
-    
-    int operator()( oneapi::tbb::flow_control & fc ) {
-       ++count;
-       if(count > N){
-           fc.stop();
-           return N;
-       }
-       return N;
+    input_node_counter(int n) : N(n) {};
+
+    int operator()(oneapi::tbb::flow_control& fc) {
+        ++count;
+        if (count > N) {
+            fc.stop();
+            return N;
+        }
+        return N;
     }
 };
 
-struct function_node_counter{
+struct function_node_counter {
     static int count;
 
-    int operator()( int ) {
+    int operator()(int) {
         ++count;
         utils::doDummyWork(1000000);
-        CHECK_MESSAGE((input_node_counter::count <= function_node_counter::count + 1), "input_node `try_get()' call testing: a call to body is made only when the internal buffer is empty");
+        CHECK_MESSAGE((input_node_counter::count <= function_node_counter::count + 1),
+                      "input_node `try_get()' call testing: a call to body is made only when the internal "
+                      "buffer is empty");
         return 1;
     }
 };
@@ -224,13 +234,15 @@ int function_node_counter::count = 0;
 
 //! Test input_node `try_get()' call testing: a call to body is made only when the internal buffer is empty.
 //! \brief \ref requirement
-TEST_CASE("input_node `try_get()' call testing: a call to body is made only when the internal buffer is empty.") {
+TEST_CASE("input_node `try_get()' call testing: a call to body is made only when the internal buffer is "
+          "empty.") {
     oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism, 1);
     oneapi::tbb::flow::graph g;
     input_node_counter fun1(500);
     function_node_counter fun2;
 
-    oneapi::tbb::flow::function_node <int, int, oneapi::tbb::flow::rejecting> fnode(g, oneapi::tbb::flow::serial, fun2);
+    oneapi::tbb::flow::function_node<int, int, oneapi::tbb::flow::rejecting> fnode(
+            g, oneapi::tbb::flow::serial, fun2);
     oneapi::tbb::flow::input_node<int> testing_node(g, fun1);
 
     make_edge(testing_node, fnode);
diff --git a/external/tbb/test/conformance/conformance_join_node.cpp b/external/tbb/test/conformance/conformance_join_node.cpp
index 52623471..1b9c23ba 100644
--- a/external/tbb/test/conformance/conformance_join_node.cpp
+++ b/external/tbb/test/conformance/conformance_join_node.cpp
@@ -15,24 +15,22 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
 #endif
 
-#include "conformance_flowgraph.h"
 #include "common/test_invoke.h"
+#include "conformance_flowgraph.h"
 
 //! \file conformance_join_node.cpp
 //! \brief Test for [flow_graph.join_node] specification
 
-using input_msg = conformance::message</*default_ctor*/true, /*copy_ctor*/true, /*copy_assign*/true>;
+using input_msg = conformance::message</*default_ctor*/ true, /*copy_ctor*/ true, /*copy_assign*/ true>;
 using my_input_tuple = std::tuple<int, float, input_msg>;
 
-std::vector<my_input_tuple> get_values( conformance::test_push_receiver<my_input_tuple>& rr ) {
+std::vector<my_input_tuple> get_values(conformance::test_push_receiver<my_input_tuple> &rr) {
     std::vector<my_input_tuple> messages;
     my_input_tuple tmp(0, 0.f, input_msg(0));
-    while(rr.try_get(tmp)) {
-        messages.push_back(tmp);
-    }
+    while (rr.try_get(tmp)) { messages.push_back(tmp); }
     return messages;
 }
 
@@ -69,10 +67,9 @@ void test_deduction_guides() {
 //! The node that is constructed has a reference to the same graph object as src.
 //! The list of predecessors, messages in the input ports, and successors are not copied.
 //! \brief \ref interface
-TEST_CASE("join_node copy constructor"){
+TEST_CASE("join_node copy constructor") {
     oneapi::tbb::flow::graph g;
-    oneapi::tbb::flow::continue_node<int> node0( g,
-                                [](oneapi::tbb::flow::continue_msg) { return 1; } );
+    oneapi::tbb::flow::continue_node<int> node0(g, [](oneapi::tbb::flow::continue_msg) { return 1; });
 
     oneapi::tbb::flow::join_node<std::tuple<int>> node1(g);
     conformance::test_push_receiver<std::tuple<int>> node2(g);
@@ -88,12 +85,14 @@ TEST_CASE("join_node copy constructor"){
     g.wait_for_all();
 
     auto values = conformance::get_values(node3);
-    CHECK_MESSAGE((conformance::get_values(node2).size() == 0 && values.size() == 1), "Copied node doesn`t copy successor");
+    CHECK_MESSAGE((conformance::get_values(node2).size() == 0 && values.size() == 1),
+                  "Copied node doesn`t copy successor");
 
     node0.try_put(oneapi::tbb::flow::continue_msg());
     g.wait_for_all();
 
-    CHECK_MESSAGE((conformance::get_values(node2).size() == 1 && conformance::get_values(node3).size() == 0), "Copied node doesn`t copy predecessor");
+    CHECK_MESSAGE((conformance::get_values(node2).size() == 1 && conformance::get_values(node3).size() == 0),
+                  "Copied node doesn`t copy predecessor");
 
     oneapi::tbb::flow::remove_edge(node1, node2);
     oneapi::tbb::flow::input_port<0>(node1).try_put(1);
@@ -102,45 +101,46 @@ TEST_CASE("join_node copy constructor"){
     oneapi::tbb::flow::make_edge(node_copy2, node3);
     oneapi::tbb::flow::input_port<0>(node_copy2).try_put(2);
     g.wait_for_all();
-    CHECK_MESSAGE((std::get<0>(conformance::get_values(node3)[0]) == 2), "Copied node doesn`t copy messages in the input ports");
+    CHECK_MESSAGE((std::get<0>(conformance::get_values(node3)[0]) == 2),
+                  "Copied node doesn`t copy messages in the input ports");
 }
 
 //! Test inheritance relations
 //! \brief \ref interface
-TEST_CASE("join_node inheritance"){
+TEST_CASE("join_node inheritance") {
     CHECK_MESSAGE((std::is_base_of<oneapi::tbb::flow::graph_node,
-                   oneapi::tbb::flow::join_node<my_input_tuple>>::value),
-                   "join_node should be derived from graph_node");
+                                   oneapi::tbb::flow::join_node<my_input_tuple>>::value),
+                  "join_node should be derived from graph_node");
     CHECK_MESSAGE((std::is_base_of<oneapi::tbb::flow::sender<my_input_tuple>,
-                   oneapi::tbb::flow::join_node<my_input_tuple>>::value),
-                   "join_node should be derived from sender<input_tuple>");
+                                   oneapi::tbb::flow::join_node<my_input_tuple>>::value),
+                  "join_node should be derived from sender<input_tuple>");
 }
 
 //! Test join_node<queueing> behavior and broadcast property
 //! \brief \ref requirement
 TEST_CASE("join_node queueing policy and broadcast property") {
     oneapi::tbb::flow::graph g;
-    oneapi::tbb::flow::function_node<int, int>
-        f1( g, oneapi::tbb::flow::unlimited, [](const int &i) { return i; } );
-    oneapi::tbb::flow::function_node<float, float>
-        f2( g, oneapi::tbb::flow::unlimited, [](const float &f) { return f; } );
-    oneapi::tbb::flow::continue_node<input_msg> c1( g,
-                            [](oneapi::tbb::flow::continue_msg) { return input_msg(1); } );
+    oneapi::tbb::flow::function_node<int, int> f1(g, oneapi::tbb::flow::unlimited,
+                                                  [](const int &i) { return i; });
+    oneapi::tbb::flow::function_node<float, float> f2(g, oneapi::tbb::flow::unlimited,
+                                                      [](const float &f) { return f; });
+    oneapi::tbb::flow::continue_node<input_msg> c1(
+            g, [](oneapi::tbb::flow::continue_msg) { return input_msg(1); });
 
     oneapi::tbb::flow::join_node<my_input_tuple, oneapi::tbb::flow::queueing> testing_node(g);
 
     conformance::test_push_receiver<my_input_tuple> q_node(g);
 
-    std::atomic<int> number{1};
-    oneapi::tbb::flow::function_node<my_input_tuple, my_input_tuple>
-        f3( g, oneapi::tbb::flow::unlimited,
-            [&]( const my_input_tuple &t ) {
-                CHECK_MESSAGE((std::get<0>(t) == number), "Messages must be in first-in first-out order" );
-                CHECK_MESSAGE((std::get<1>(t) == static_cast<float>(number) + 0.5f), "Messages must be in first-in first-out order" );
-                CHECK_MESSAGE((std::get<2>(t) == 1), "Messages must be in first-in first-out order" );
+    std::atomic<int> number {1};
+    oneapi::tbb::flow::function_node<my_input_tuple, my_input_tuple> f3(
+            g, oneapi::tbb::flow::unlimited, [&](const my_input_tuple &t) {
+                CHECK_MESSAGE((std::get<0>(t) == number), "Messages must be in first-in first-out order");
+                CHECK_MESSAGE((std::get<1>(t) == static_cast<float>(number) + 0.5f),
+                              "Messages must be in first-in first-out order");
+                CHECK_MESSAGE((std::get<2>(t) == 1), "Messages must be in first-in first-out order");
                 ++number;
                 return t;
-            } );
+            });
 
     oneapi::tbb::flow::make_edge(f1, oneapi::tbb::flow::input_port<0>(testing_node));
     oneapi::tbb::flow::make_edge(f2, oneapi::tbb::flow::input_port<1>(testing_node));
@@ -151,31 +151,33 @@ TEST_CASE("join_node queueing policy and broadcast property") {
     f1.try_put(1);
     g.wait_for_all();
     CHECK_MESSAGE((get_values(q_node).size() == 0),
-        "join_node must broadcast when there is at least one message at each input port");
+                  "join_node must broadcast when there is at least one message at each input port");
     f1.try_put(2);
     f2.try_put(1.5f);
     g.wait_for_all();
     CHECK_MESSAGE((get_values(q_node).size() == 0),
-        "join_node must broadcast when there is at least one message at each input port");
+                  "join_node must broadcast when there is at least one message at each input port");
     f1.try_put(3);
     f2.try_put(2.5f);
     c1.try_put(oneapi::tbb::flow::continue_msg());
     g.wait_for_all();
     CHECK_MESSAGE((get_values(q_node).size() == 1),
-        "join_node must broadcast when there is at least one message at each input port");
+                  "join_node must broadcast when there is at least one message at each input port");
     f2.try_put(3.5f);
     c1.try_put(oneapi::tbb::flow::continue_msg());
     g.wait_for_all();
-    CHECK_MESSAGE((get_values(q_node).size() == 1),
-        "If at least one successor accepts the tuple, the head of each input port’s queue is removed");
+    CHECK_MESSAGE(
+            (get_values(q_node).size() == 1),
+            "If at least one successor accepts the tuple, the head of each input port’s queue is removed");
     c1.try_put(oneapi::tbb::flow::continue_msg());
     g.wait_for_all();
-    CHECK_MESSAGE((get_values(q_node).size() == 1),
-        "If at least one successor accepts the tuple, the head of each input port’s queue is removed");
+    CHECK_MESSAGE(
+            (get_values(q_node).size() == 1),
+            "If at least one successor accepts the tuple, the head of each input port’s queue is removed");
     c1.try_put(oneapi::tbb::flow::continue_msg());
     g.wait_for_all();
     CHECK_MESSAGE((get_values(q_node).size() == 0),
-        "join_node must broadcast when there is at least one message at each input port");
+                  "join_node must broadcast when there is at least one message at each input port");
 
     oneapi::tbb::flow::remove_edge(testing_node, f3);
 
@@ -197,26 +199,23 @@ TEST_CASE("join_node reserving policy") {
     conformance::test_with_reserving_join_node_class<oneapi::tbb::flow::write_once_node<int>>();
 }
 
-template<typename KeyType>
-struct MyHash{
-    std::size_t hash(const KeyType &k) const {
-        return k * 2000 + 3;
-    }
+template <typename KeyType>
+struct MyHash {
+    std::size_t hash(const KeyType &k) const { return k * 2000 + 3; }
 
-    bool equal(const KeyType &k1, const KeyType &k2) const{
-        return hash(k1) == hash(k2);
-    }
+    bool equal(const KeyType &k1, const KeyType &k2) const { return hash(k1) == hash(k2); }
 };
 
 //! Test join_node<key_matching> behavior
 //! \brief \ref requirement
-TEST_CASE("join_node key_matching policy"){
+TEST_CASE("join_node key_matching policy") {
     oneapi::tbb::flow::graph g;
     auto body1 = [](const oneapi::tbb::flow::continue_msg &) -> int { return 1; };
     auto body2 = [](const float &val) -> int { return static_cast<int>(val); };
 
     oneapi::tbb::flow::join_node<std::tuple<oneapi::tbb::flow::continue_msg, float>,
-        oneapi::tbb::flow::key_matching<int, MyHash<int>>> testing_node(g, body1, body2);
+                                 oneapi::tbb::flow::key_matching<int, MyHash<int>>>
+            testing_node(g, body1, body2);
 
     oneapi::tbb::flow::input_port<0>(testing_node).try_put(oneapi::tbb::flow::continue_msg());
     oneapi::tbb::flow::input_port<1>(testing_node).try_put(1.3f);
@@ -231,13 +230,16 @@ TEST_CASE("join_node key_matching policy"){
 
 //! Test join_node<tag_matching> behavior
 //! \brief \ref requirement
-TEST_CASE("join_node tag_matching policy"){
+TEST_CASE("join_node tag_matching policy") {
     oneapi::tbb::flow::graph g;
     auto body1 = [](const oneapi::tbb::flow::continue_msg &) -> oneapi::tbb::flow::tag_value { return 1; };
-    auto body2 = [](const float &val) -> oneapi::tbb::flow::tag_value { return static_cast<oneapi::tbb::flow::tag_value>(val); };
+    auto body2 = [](const float &val) -> oneapi::tbb::flow::tag_value {
+        return static_cast<oneapi::tbb::flow::tag_value>(val);
+    };
 
     oneapi::tbb::flow::join_node<std::tuple<oneapi::tbb::flow::continue_msg, float>,
-        oneapi::tbb::flow::tag_matching> testing_node(g, body1, body2);
+                                 oneapi::tbb::flow::tag_matching>
+            testing_node(g, body1, body2);
 
     oneapi::tbb::flow::input_port<0>(testing_node).try_put(oneapi::tbb::flow::continue_msg());
     oneapi::tbb::flow::input_port<1>(testing_node).try_put(1.3f);
@@ -251,9 +253,7 @@ TEST_CASE("join_node tag_matching policy"){
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 //! Test deduction guides
 //! \brief \ref requirement
-TEST_CASE("Deduction guides test"){
-    test_deduction_guides();
-}
+TEST_CASE("Deduction guides test") { test_deduction_guides(); }
 #endif
 
 //! Test join_node input_ports() returns a tuple of input ports.
@@ -262,8 +262,9 @@ TEST_CASE("join_node output_ports") {
     oneapi::tbb::flow::graph g;
     oneapi::tbb::flow::join_node<std::tuple<int>> node(g);
 
-    CHECK_MESSAGE((std::is_same<oneapi::tbb::flow::join_node<std::tuple<int>>::input_ports_type&,
-        decltype(node.input_ports())>::value), "join_node input_ports should returns a tuple of input ports");
+    CHECK_MESSAGE((std::is_same<oneapi::tbb::flow::join_node<std::tuple<int>>::input_ports_type &,
+                                decltype(node.input_ports())>::value),
+                  "join_node input_ports should returns a tuple of input ports");
 }
 
 #if __TBB_CPP17_INVOKE_PRESENT
@@ -281,7 +282,6 @@ void test_invoke_basic(Body1 body1, Body2 body2) {
     using tuple_type = std::tuple<test_invoke::SmartID<std::size_t>, test_invoke::SmartID<std::size_t>>;
     using join_type = join_node<tuple_type, key_matching<K>>;
 
-
     join_type j(g, body1, body2);
 
     buffer_node<tuple_type> buf(g);
@@ -301,7 +301,7 @@ void test_invoke_basic(Body1 body1, Body2 body2) {
     std::size_t buf_size = 0;
     tuple_type tpl;
 
-    while(buf.try_get(tpl)) {
+    while (buf.try_get(tpl)) {
         ++buf_size;
         CHECK(std::get<0>(tpl).id == std::get<1>(tpl).id);
     }
@@ -311,7 +311,9 @@ void test_invoke_basic(Body1 body1, Body2 body2) {
 //! Test that key_matching join_node uses std::invoke to run the body
 //! \brief \ref requirement
 TEST_CASE("key_matching join_node invoke semantics") {
-    test_invoke_basic</*K = */std::size_t>(&test_invoke::SmartID<std::size_t>::get_id, &test_invoke::SmartID<std::size_t>::id);
-    test_invoke_basic</*K = */const std::size_t&>(&test_invoke::SmartID<std::size_t>::get_id_ref, &test_invoke::SmartID<std::size_t>::get_id_ref);
+    test_invoke_basic</*K = */ std::size_t>(&test_invoke::SmartID<std::size_t>::get_id,
+                                            &test_invoke::SmartID<std::size_t>::id);
+    test_invoke_basic</*K = */ const std::size_t &>(&test_invoke::SmartID<std::size_t>::get_id_ref,
+                                                    &test_invoke::SmartID<std::size_t>::get_id_ref);
 }
-#endif // __TBB_CPP17_INVOKE_PRESENT
+#endif// __TBB_CPP17_INVOKE_PRESENT
diff --git a/external/tbb/test/conformance/conformance_limiter_node.cpp b/external/tbb/test/conformance/conformance_limiter_node.cpp
index 5a017ce8..9e4084cf 100644
--- a/external/tbb/test/conformance/conformance_limiter_node.cpp
+++ b/external/tbb/test/conformance/conformance_limiter_node.cpp
@@ -15,7 +15,7 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
 #endif
 
 #include "conformance_flowgraph.h"
@@ -23,11 +23,13 @@
 //! \file conformance_limiter_node.cpp
 //! \brief Test for [flow_graph.limiter_node] specification
 
-using input_msg = conformance::message</*default_ctor*/true, /*copy_ctor*/true/*enable for queue_node successor*/, /*copy_assign*/true/*enable for queue_node successor*/>;
+using input_msg
+        = conformance::message</*default_ctor*/ true, /*copy_ctor*/ true /*enable for queue_node successor*/,
+                               /*copy_assign*/ true /*enable for queue_node successor*/>;
 
 //! Test limiter_node limiting
 //! \brief \ref requirement
-TEST_CASE("limiter_node limiting"){
+TEST_CASE("limiter_node limiting") {
     oneapi::tbb::flow::graph g;
 
     constexpr int limit = 5;
@@ -36,23 +38,23 @@ TEST_CASE("limiter_node limiting"){
 
     oneapi::tbb::flow::make_edge(node1, node2);
 
-    for(int i = 0; i < limit * 2; ++i)
-        node1.try_put(input_msg(1));
+    for (int i = 0; i < limit * 2; ++i) node1.try_put(input_msg(1));
     g.wait_for_all();
 
-    CHECK_MESSAGE((conformance::get_values(node2).size() == limit), "Descendant of the node needs be receive limited number of messages");
+    CHECK_MESSAGE((conformance::get_values(node2).size() == limit),
+                  "Descendant of the node needs be receive limited number of messages");
 }
 
 //! Test node broadcast messages to successors
 //! \brief \ref requirement
-TEST_CASE("limiter_node broadcast"){
+TEST_CASE("limiter_node broadcast") {
     conformance::test_forwarding<oneapi::tbb::flow::limiter_node<int>, int>(1, 5);
     conformance::test_forwarding<oneapi::tbb::flow::limiter_node<input_msg>, input_msg>(1, 5);
 }
 
 //! Test node not buffered unsuccessful message, and try_get after rejection should not succeed.
 //! \brief \ref requirement
-TEST_CASE("limiter_node buffering"){
+TEST_CASE("limiter_node buffering") {
     conformance::test_buffering<oneapi::tbb::flow::limiter_node<int>, int>(5);
     conformance::test_buffering<oneapi::tbb::flow::limiter_node<int, int>, int>(5);
 }
@@ -60,7 +62,7 @@ TEST_CASE("limiter_node buffering"){
 //! The node that is constructed has a reference to the same graph object as src, has the same threshold.
 //! The predecessors and successors of src are not copied.
 //! \brief \ref interface
-TEST_CASE("limiter_node copy constructor"){
+TEST_CASE("limiter_node copy constructor") {
     using namespace oneapi::tbb::flow;
     graph g;
 
@@ -79,22 +81,25 @@ TEST_CASE("limiter_node copy constructor"){
     node_copy.try_put(1);
     g.wait_for_all();
 
-    CHECK_MESSAGE((conformance::get_values(node2).size() == 0 && conformance::get_values(node3).size() == 1), "Copied node doesn`t copy successor");
+    CHECK_MESSAGE((conformance::get_values(node2).size() == 0 && conformance::get_values(node3).size() == 1),
+                  "Copied node doesn`t copy successor");
 
     node_copy.try_put(1);
     g.wait_for_all();
 
-    CHECK_MESSAGE((conformance::get_values(node2).size() == 0 && conformance::get_values(node3).size() == 0), "Copied node copy threshold");
+    CHECK_MESSAGE((conformance::get_values(node2).size() == 0 && conformance::get_values(node3).size() == 0),
+                  "Copied node copy threshold");
 
     node0.try_put(1);
     g.wait_for_all();
 
-    CHECK_MESSAGE((conformance::get_values(node2).size() == 1 && conformance::get_values(node3).size() == 0), "Copied node doesn`t copy predecessor");
+    CHECK_MESSAGE((conformance::get_values(node2).size() == 1 && conformance::get_values(node3).size() == 0),
+                  "Copied node doesn`t copy predecessor");
 }
 
 //! Test inheritance relations
 //! \brief \ref interface
-TEST_CASE("limiter_node superclasses"){
+TEST_CASE("limiter_node superclasses") {
     conformance::test_inheritance<oneapi::tbb::flow::limiter_node<int>, int, int>();
     conformance::test_inheritance<oneapi::tbb::flow::limiter_node<float>, float, float>();
     conformance::test_inheritance<oneapi::tbb::flow::limiter_node<input_msg>, input_msg, input_msg>();
@@ -102,66 +107,65 @@ TEST_CASE("limiter_node superclasses"){
 
 //! Test limiter_node decrementer
 //! \brief \ref interface
-TEST_CASE("limiter_node decrementer"){
+TEST_CASE("limiter_node decrementer") {
     const int threshold = 5;
     oneapi::tbb::flow::graph g;
     oneapi::tbb::flow::limiter_node<int, int> limit(g, threshold);
     oneapi::tbb::flow::queue_node<int> queue(g);
     make_edge(limit, queue);
     int m = 0;
-    CHECK_MESSAGE(( limit.try_put( m++ )), "Newly constructed limiter node does not accept message." );
-    CHECK_MESSAGE(limit.decrementer().try_put( -threshold ), // close limiter's gate
-                   "Limiter node decrementer's port does not accept message." );
-    CHECK_MESSAGE(( !limit.try_put( m++ )), "Closed limiter node's accepts message." );
-    CHECK_MESSAGE(limit.decrementer().try_put( threshold + 5 ),  // open limiter's gate
-                   "Limiter node decrementer's port does not accept message." );
-    for( int i = 0; i < threshold; ++i )
-        CHECK_MESSAGE(( limit.try_put( m++ )), "Limiter node does not accept message while open." );
-    CHECK_MESSAGE(( !limit.try_put( m )), "Limiter node's gate is not closed." );
+    CHECK_MESSAGE((limit.try_put(m++)), "Newly constructed limiter node does not accept message.");
+    CHECK_MESSAGE(limit.decrementer().try_put(-threshold),// close limiter's gate
+                  "Limiter node decrementer's port does not accept message.");
+    CHECK_MESSAGE((!limit.try_put(m++)), "Closed limiter node's accepts message.");
+    CHECK_MESSAGE(limit.decrementer().try_put(threshold + 5),// open limiter's gate
+                  "Limiter node decrementer's port does not accept message.");
+    for (int i = 0; i < threshold; ++i)
+        CHECK_MESSAGE((limit.try_put(m++)), "Limiter node does not accept message while open.");
+    CHECK_MESSAGE((!limit.try_put(m)), "Limiter node's gate is not closed.");
     g.wait_for_all();
     int expected[] = {0, 2, 3, 4, 5, 6};
-    int actual = -1; m = 0;
-    while( queue.try_get(actual) )
-        CHECK_MESSAGE(actual == expected[m++], "" );
-    CHECK_MESSAGE(( sizeof(expected) / sizeof(expected[0]) == m), "Not all messages have been processed." );
+    int actual = -1;
+    m = 0;
+    while (queue.try_get(actual)) CHECK_MESSAGE(actual == expected[m++], "");
+    CHECK_MESSAGE((sizeof(expected) / sizeof(expected[0]) == m), "Not all messages have been processed.");
     g.wait_for_all();
 
     const size_t threshold2 = size_t(-1);
     oneapi::tbb::flow::limiter_node<int, long long> limit2(g, threshold2);
     make_edge(limit2, queue);
-    CHECK_MESSAGE(( limit2.try_put( 1 )), "Newly constructed limiter node does not accept message." );
-    long long decrement_value = (long long)( size_t(-1)/2 );
-    CHECK_MESSAGE(limit2.decrementer().try_put( -decrement_value ),
-                   "Limiter node decrementer's port does not accept message" );
-    CHECK_MESSAGE(( limit2.try_put( 2 )), "Limiter's gate should not be closed yet." );
-    CHECK_MESSAGE(limit2.decrementer().try_put( -decrement_value ),
-                   "Limiter node decrementer's port does not accept message" );
-    CHECK_MESSAGE(( !limit2.try_put( 3 )), "Overflow happened for internal counter." );
+    CHECK_MESSAGE((limit2.try_put(1)), "Newly constructed limiter node does not accept message.");
+    long long decrement_value = (long long) (size_t(-1) / 2);
+    CHECK_MESSAGE(limit2.decrementer().try_put(-decrement_value),
+                  "Limiter node decrementer's port does not accept message");
+    CHECK_MESSAGE((limit2.try_put(2)), "Limiter's gate should not be closed yet.");
+    CHECK_MESSAGE(limit2.decrementer().try_put(-decrement_value),
+                  "Limiter node decrementer's port does not accept message");
+    CHECK_MESSAGE((!limit2.try_put(3)), "Overflow happened for internal counter.");
     int expected2[] = {1, 2};
-    actual = -1; m = 0;
-    while( queue.try_get(actual) )
-        CHECK_MESSAGE(actual == expected2[m++], "" );
-    CHECK_MESSAGE(( sizeof(expected2) / sizeof(expected2[0]) == m), "Not all messages have been processed." );
+    actual = -1;
+    m = 0;
+    while (queue.try_get(actual)) CHECK_MESSAGE(actual == expected2[m++], "");
+    CHECK_MESSAGE((sizeof(expected2) / sizeof(expected2[0]) == m), "Not all messages have been processed.");
     g.wait_for_all();
 
     const size_t threshold3 = 10;
     oneapi::tbb::flow::limiter_node<int, long long> limit3(g, threshold3);
     make_edge(limit3, queue);
     long long decrement_value3 = 3;
-    CHECK_MESSAGE(limit3.decrementer().try_put( -decrement_value3 ),
-                   "Limiter node decrementer's port does not accept message" );
+    CHECK_MESSAGE(limit3.decrementer().try_put(-decrement_value3),
+                  "Limiter node decrementer's port does not accept message");
 
     m = 0;
-    while( limit3.try_put( m ) ){ m++; };
-    CHECK_MESSAGE(m == threshold3 - decrement_value3, "Not all messages have been accepted." );
+    while (limit3.try_put(m)) { m++; };
+    CHECK_MESSAGE(m == threshold3 - decrement_value3, "Not all messages have been accepted.");
 
-    actual = -1; m = 0;
-    while( queue.try_get(actual) ){
-        CHECK_MESSAGE(actual == m++, "Not all messages have been processed." );
-    }
+    actual = -1;
+    m = 0;
+    while (queue.try_get(actual)) { CHECK_MESSAGE(actual == m++, "Not all messages have been processed."); }
 
     g.wait_for_all();
-    CHECK_MESSAGE(m == threshold3 - decrement_value3, "Not all messages have been processed." );
+    CHECK_MESSAGE(m == threshold3 - decrement_value3, "Not all messages have been processed.");
 
     const size_t threshold4 = 10;
     oneapi::tbb::flow::limiter_node<int> limit4(g, threshold4);
@@ -169,16 +173,15 @@ TEST_CASE("limiter_node decrementer"){
 
     limit4.try_put(-1);
     CHECK_MESSAGE(limit4.decrementer().try_put(oneapi::tbb::flow::continue_msg()),
-                   "Limiter node decrementer's port does not accept continue_msg" );
+                  "Limiter node decrementer's port does not accept continue_msg");
 
     m = 0;
-    while( limit4.try_put( m ) ){ m++; };
-    CHECK_MESSAGE(m == threshold4, "Not all messages have been accepted." );
+    while (limit4.try_put(m)) { m++; };
+    CHECK_MESSAGE(m == threshold4, "Not all messages have been accepted.");
 
-    actual = -1; m = -1;
-    while( queue.try_get(actual) ){
-        CHECK_MESSAGE(actual == m++, "Not all messages have been processed." );
-    }
+    actual = -1;
+    m = -1;
+    while (queue.try_get(actual)) { CHECK_MESSAGE(actual == m++, "Not all messages have been processed."); }
 
     g.wait_for_all();
 }
diff --git a/external/tbb/test/conformance/conformance_multifunction_node.cpp b/external/tbb/test/conformance/conformance_multifunction_node.cpp
index 1ad7b530..a7267c49 100644
--- a/external/tbb/test/conformance/conformance_multifunction_node.cpp
+++ b/external/tbb/test/conformance/conformance_multifunction_node.cpp
@@ -15,54 +15,58 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
 #endif
 
 #define CONFORMANCE_MULTIFUNCTION_NODE
 
-#include "conformance_flowgraph.h"
 #include "common/test_invoke.h"
+#include "conformance_flowgraph.h"
 
 //! \file conformance_multifunction_node.cpp
 //! \brief Test for [flow_graph.function_node] specification
 
-using input_msg = conformance::message</*default_ctor*/true, /*copy_ctor*/true, /*copy_assign*/false>;
-using output_msg = conformance::message</*default_ctor*/false, /*copy_ctor*/false, /*copy_assign*/false>;
+using input_msg = conformance::message</*default_ctor*/ true, /*copy_ctor*/ true, /*copy_assign*/ false>;
+using output_msg = conformance::message</*default_ctor*/ false, /*copy_ctor*/ false, /*copy_assign*/ false>;
 
 /*
     Test function_node is a graph_node, receiver<Input>, and sender<Output>
 */
-template<typename I, typename O>
-void test_inheritance(){
+template <typename I, typename O>
+void test_inheritance() {
     using namespace oneapi::tbb::flow;
 
-    CHECK_MESSAGE((std::is_base_of<graph_node, multifunction_node<I, O>>::value), "multifunction_node should be derived from graph_node");
-    CHECK_MESSAGE((std::is_base_of<receiver<I>, multifunction_node<I, O>>::value), "multifunction_node should be derived from receiver<Input>");
+    CHECK_MESSAGE((std::is_base_of<graph_node, multifunction_node<I, O>>::value),
+                  "multifunction_node should be derived from graph_node");
+    CHECK_MESSAGE((std::is_base_of<receiver<I>, multifunction_node<I, O>>::value),
+                  "multifunction_node should be derived from receiver<Input>");
 }
 
 //! Test node reject the incoming message if the concurrency limit achieved.
 //! \brief \ref interface
-TEST_CASE("multifunction_node with rejecting policy"){
-    conformance::test_rejecting<oneapi::tbb::flow::multifunction_node<int, std::tuple<int>, oneapi::tbb::flow::rejecting>>();
+TEST_CASE("multifunction_node with rejecting policy") {
+    conformance::test_rejecting<
+            oneapi::tbb::flow::multifunction_node<int, std::tuple<int>, oneapi::tbb::flow::rejecting>>();
 }
 
 //! Test nodes for execution with priority in single-threaded configuration
 //! \brief \ref interface
-TEST_CASE("multifunction_node priority"){
-    conformance::test_priority<oneapi::tbb::flow::multifunction_node<input_msg, std::tuple<int>>, input_msg>(oneapi::tbb::flow::unlimited);
+TEST_CASE("multifunction_node priority") {
+    conformance::test_priority<oneapi::tbb::flow::multifunction_node<input_msg, std::tuple<int>>, input_msg>(
+            oneapi::tbb::flow::unlimited);
 }
 
 //! Test function_node has a user-settable concurrency limit. It can be set to one of predefined values.
 //! The user can also provide a value of type std::size_t to limit concurrency.
 //! Test that not more than limited threads works in parallel.
 //! \brief \ref interface
-TEST_CASE("multifunction_node concurrency"){
+TEST_CASE("multifunction_node concurrency") {
     conformance::test_concurrency<oneapi::tbb::flow::multifunction_node<int, std::tuple<int>>>();
 }
 
 //! Test all node constructors
 //! \brief \ref interface
-TEST_CASE("multifunction_node constructors"){
+TEST_CASE("multifunction_node constructors") {
     using namespace oneapi::tbb::flow;
     graph g;
 
@@ -72,42 +76,49 @@ TEST_CASE("multifunction_node constructors"){
     multifunction_node<int, std::tuple<int>> fn2(g, unlimited, fun, oneapi::tbb::flow::node_priority_t(1));
 
     multifunction_node<int, std::tuple<int>, lightweight> lw_node1(g, serial, fun, lightweight());
-    multifunction_node<int, std::tuple<int>, lightweight> lw_node2(g, serial, fun, lightweight(), oneapi::tbb::flow::node_priority_t(1));
+    multifunction_node<int, std::tuple<int>, lightweight> lw_node2(g, serial, fun, lightweight(),
+                                                                   oneapi::tbb::flow::node_priority_t(1));
 }
 
 //! The node that is constructed has a reference to the same graph object as src, has a copy of the initial body used by src, and has the same concurrency threshold as src.
 //! The predecessors and successors of src are not copied.
 //! \brief \ref interface
-TEST_CASE("multifunction_node copy constructor"){
+TEST_CASE("multifunction_node copy constructor") {
     conformance::test_copy_ctor<oneapi::tbb::flow::multifunction_node<int, std::tuple<int>>>();
 }
 
 //! Test node not buffered unsuccessful message, and try_get after rejection should not succeed.
 //! \brief \ref requirement
-TEST_CASE("multifunction_node buffering"){
+TEST_CASE("multifunction_node buffering") {
     conformance::dummy_functor<int> fun;
-    conformance::test_buffering<oneapi::tbb::flow::multifunction_node<input_msg, std::tuple<int>,
-    oneapi::tbb::flow::rejecting>, input_msg>(oneapi::tbb::flow::unlimited, fun);
+    conformance::test_buffering<
+            oneapi::tbb::flow::multifunction_node<input_msg, std::tuple<int>, oneapi::tbb::flow::rejecting>,
+            input_msg>(oneapi::tbb::flow::unlimited, fun);
 }
 
 //! Test multifunction_node broadcasting
 //! \brief \ref requirement
-TEST_CASE("multifunction_node broadcast"){
+TEST_CASE("multifunction_node broadcast") {
     conformance::counting_functor<int> fun(conformance::expected);
-    conformance::test_forwarding<oneapi::tbb::flow::multifunction_node<input_msg, std::tuple<int>>, input_msg, int>(1, oneapi::tbb::flow::unlimited, fun);
+    conformance::test_forwarding<oneapi::tbb::flow::multifunction_node<input_msg, std::tuple<int>>, input_msg,
+                                 int>(1, oneapi::tbb::flow::unlimited, fun);
 }
 
 //! Test the body object passed to a node is copied
 //! \brief \ref interface
-TEST_CASE("multifunction_node copy body"){
-    conformance::test_copy_body_function<oneapi::tbb::flow::multifunction_node<int, std::tuple<int>>, conformance::copy_counting_object<int>>(oneapi::tbb::flow::unlimited);
+TEST_CASE("multifunction_node copy body") {
+    conformance::test_copy_body_function<oneapi::tbb::flow::multifunction_node<int, std::tuple<int>>,
+                                         conformance::copy_counting_object<int>>(
+            oneapi::tbb::flow::unlimited);
 }
 
 //! Test execution of node body
 //! Test node can do try_put call
 //! \brief \ref interface \ref requirement
 TEST_CASE("multifunction_node body") {
-    conformance::test_body_exec<oneapi::tbb::flow::multifunction_node<input_msg, std::tuple<output_msg>, oneapi::tbb::flow::rejecting>, input_msg, output_msg>(oneapi::tbb::flow::unlimited);
+    conformance::test_body_exec<oneapi::tbb::flow::multifunction_node<input_msg, std::tuple<output_msg>,
+                                                                      oneapi::tbb::flow::rejecting>,
+                                input_msg, output_msg>(oneapi::tbb::flow::unlimited);
 }
 
 //! Test multifunction_node output_ports() returns a tuple of output ports.
@@ -116,15 +127,17 @@ TEST_CASE("multifunction_node output_ports") {
     using namespace oneapi::tbb::flow;
     graph g;
     conformance::dummy_functor<int> fun;
-    oneapi::tbb::flow::multifunction_node <int, std::tuple<int>> node(g, unlimited, fun);
+    oneapi::tbb::flow::multifunction_node<int, std::tuple<int>> node(g, unlimited, fun);
 
-    CHECK_MESSAGE((std::is_same<oneapi::tbb::flow::multifunction_node<int, std::tuple<int>>::output_ports_type&,
-        decltype(node.output_ports())>::value), "multifunction_node output_ports should returns a tuple of output ports");
+    CHECK_MESSAGE(
+            (std::is_same<oneapi::tbb::flow::multifunction_node<int, std::tuple<int>>::output_ports_type&,
+                          decltype(node.output_ports())>::value),
+            "multifunction_node output_ports should returns a tuple of output ports");
 }
 
 //! Test inheritance relations
 //! \brief \ref interface
-TEST_CASE("multifunction_node superclasses"){
+TEST_CASE("multifunction_node superclasses") {
     test_inheritance<int, std::tuple<int>>();
     test_inheritance<void*, std::tuple<float>>();
     test_inheritance<input_msg, std::tuple<output_msg>>();
@@ -134,7 +147,8 @@ TEST_CASE("multifunction_node superclasses"){
 //! \brief \ref interface \ref requirement
 TEST_CASE("Test function_node Output and Input class") {
     using Body = conformance::copy_counting_object<int>;
-    conformance::test_output_input_class<oneapi::tbb::flow::multifunction_node<Body, std::tuple<Body>>, Body>();
+    conformance::test_output_input_class<oneapi::tbb::flow::multifunction_node<Body, std::tuple<Body>>,
+                                         Body>();
 }
 
 #if __TBB_CPP17_INVOKE_PRESENT
@@ -172,13 +186,13 @@ TEST_CASE("Test multifunction_node and std::invoke") {
     make_edge(output_port<0>(mf21), buf);
     make_edge(output_port<0>(mf22), buf);
 
-    mf1.try_put(input_type{output_type1{1}});
+    mf1.try_put(input_type {output_type1 {1}});
 
     g.wait_for_all();
 
     std::size_t buf_size = 0;
     std::size_t tmp = 0;
-    while(buf.try_get(tmp)) {
+    while (buf.try_get(tmp)) {
         ++buf_size;
         CHECK(tmp == 1);
     }
diff --git a/external/tbb/test/conformance/conformance_mutex.cpp b/external/tbb/test/conformance/conformance_mutex.cpp
index d8a01f1c..2b8fb370 100644
--- a/external/tbb/test/conformance/conformance_mutex.cpp
+++ b/external/tbb/test/conformance/conformance_mutex.cpp
@@ -15,19 +15,19 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
 #endif
 
 #include "conformance_mutex.h"
 
-#include "oneapi/tbb/spin_mutex.h"
 #include "oneapi/tbb/mutex.h"
-#include "oneapi/tbb/spin_rw_mutex.h"
-#include "oneapi/tbb/rw_mutex.h"
-#include "oneapi/tbb/queuing_mutex.h"
-#include "oneapi/tbb/queuing_rw_mutex.h"
 #include "oneapi/tbb/null_mutex.h"
 #include "oneapi/tbb/null_rw_mutex.h"
+#include "oneapi/tbb/queuing_mutex.h"
+#include "oneapi/tbb/queuing_rw_mutex.h"
+#include "oneapi/tbb/rw_mutex.h"
+#include "oneapi/tbb/spin_mutex.h"
+#include "oneapi/tbb/spin_rw_mutex.h"
 
 //! \file conformance_mutex.cpp
 //! \brief Test for [mutex.spin_mutex mutex.spin_rw_mutex mutex.queuing_mutex mutex.queuing_rw_mutex mutex.mutex mutex.rw_mutex mutex.speculative_spin_mutex mutex.speculative_spin_rw_mutex mutex.null_mutex mutex.null_rw_mutex] specifications
@@ -50,7 +50,8 @@ TEST_CASE("Basic Locable requirement test") {
 #endif
     // NullMutexes
     GeneralTest<oneapi::tbb::null_mutex, utils::AtomicCounter<oneapi::tbb::null_mutex>>("Null Mutex", false);
-    GeneralTest<oneapi::tbb::null_rw_mutex, utils::AtomicCounter<oneapi::tbb::null_rw_mutex>>("Null RW Mutex", false);
+    GeneralTest<oneapi::tbb::null_rw_mutex, utils::AtomicCounter<oneapi::tbb::null_rw_mutex>>("Null RW Mutex",
+                                                                                              false);
     TestNullMutex<oneapi::tbb::null_mutex>("Null Mutex");
     TestNullMutex<oneapi::tbb::null_rw_mutex>("Null RW Mutex");
 }
@@ -97,16 +98,16 @@ TEST_CASE("Shared mutexes (reader/writer) test") {
 //! Compatibility with the standard
 //! \brief \ref interface \ref requirement
 TEST_CASE("ISO interface test") {
-    GeneralTest<TBB_MutexFromISO_Mutex<oneapi::tbb::spin_mutex> >("ISO Spin Mutex");
-    GeneralTest<TBB_MutexFromISO_Mutex<oneapi::tbb::spin_rw_mutex> >("ISO Spin RW Mutex");
-    GeneralTest<TBB_MutexFromISO_Mutex<oneapi::tbb::mutex> >("ISO Adaprive Mutex");
+    GeneralTest<TBB_MutexFromISO_Mutex<oneapi::tbb::spin_mutex>>("ISO Spin Mutex");
+    GeneralTest<TBB_MutexFromISO_Mutex<oneapi::tbb::spin_rw_mutex>>("ISO Spin RW Mutex");
+    GeneralTest<TBB_MutexFromISO_Mutex<oneapi::tbb::mutex>>("ISO Adaprive Mutex");
     GeneralTest<TBB_MutexFromISO_Mutex<oneapi::tbb::rw_mutex>>("ISO Adaptive RW Mutex");
-    TestTryAcquire<TBB_MutexFromISO_Mutex<oneapi::tbb::spin_mutex> >("ISO Spin Mutex");
-    TestTryAcquire<TBB_MutexFromISO_Mutex<oneapi::tbb::spin_rw_mutex> >("ISO Spin RW Mutex");
-    TestTryAcquire<TBB_MutexFromISO_Mutex<oneapi::tbb::mutex> >("ISO Adaptive  Mutex");
+    TestTryAcquire<TBB_MutexFromISO_Mutex<oneapi::tbb::spin_mutex>>("ISO Spin Mutex");
+    TestTryAcquire<TBB_MutexFromISO_Mutex<oneapi::tbb::spin_rw_mutex>>("ISO Spin RW Mutex");
+    TestTryAcquire<TBB_MutexFromISO_Mutex<oneapi::tbb::mutex>>("ISO Adaptive  Mutex");
     TestTryAcquire<TBB_MutexFromISO_Mutex<oneapi::tbb::rw_mutex>>("ISO Adaptive RW Mutex");
-    TestTryAcquireReader<TBB_MutexFromISO_Mutex<oneapi::tbb::spin_rw_mutex> >("ISO Spin RW Mutex");
-    TestReaderWriterLock<TBB_MutexFromISO_Mutex<oneapi::tbb::spin_rw_mutex> >("ISO Spin RW Mutex");
+    TestTryAcquireReader<TBB_MutexFromISO_Mutex<oneapi::tbb::spin_rw_mutex>>("ISO Spin RW Mutex");
+    TestReaderWriterLock<TBB_MutexFromISO_Mutex<oneapi::tbb::spin_rw_mutex>>("ISO Spin RW Mutex");
     TestTryAcquireReader<TBB_MutexFromISO_Mutex<oneapi::tbb::rw_mutex>>("ISO Adaptive RW Mutex");
     TestReaderWriterLock<TBB_MutexFromISO_Mutex<oneapi::tbb::rw_mutex>>("ISO Adaptive RW Mutex");
 }
diff --git a/external/tbb/test/conformance/conformance_overwrite_node.cpp b/external/tbb/test/conformance/conformance_overwrite_node.cpp
index 0e5d881c..09a84aa1 100644
--- a/external/tbb/test/conformance/conformance_overwrite_node.cpp
+++ b/external/tbb/test/conformance/conformance_overwrite_node.cpp
@@ -15,7 +15,7 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
 #endif
 
 #define CONFORMANCE_BUFFERING_NODES
@@ -28,7 +28,7 @@
 
 //! Test overwrite_node behavior
 //! \brief \ref requirement
-TEST_CASE("overwrite_node messages"){
+TEST_CASE("overwrite_node messages") {
     oneapi::tbb::flow::graph g;
 
     oneapi::tbb::flow::overwrite_node<int> testing_node(g);
@@ -49,51 +49,52 @@ TEST_CASE("overwrite_node messages"){
 
 //! Test function_node broadcast
 //! \brief \ref requirement
-TEST_CASE("overwrite_node broadcast"){
+TEST_CASE("overwrite_node broadcast") {
     conformance::test_forwarding<oneapi::tbb::flow::overwrite_node<int>, int>(1);
 }
 
 //! Test function_node buffering
 //! \brief \ref requirement
-TEST_CASE("overwrite_node buffering"){
+TEST_CASE("overwrite_node buffering") {
     conformance::test_buffering<oneapi::tbb::flow::overwrite_node<int>, int>();
 }
 
-//! The node that is constructed has a reference to the same graph object as src,with an invalid internal buffer item. 
+//! The node that is constructed has a reference to the same graph object as src,with an invalid internal buffer item.
 //! The buffered value and list of successors are not copied from src.
 //! \brief \ref requirement
-TEST_CASE("overwrite_node copy constructor"){
+TEST_CASE("overwrite_node copy constructor") {
     conformance::test_copy_ctor_for_buffering_nodes<oneapi::tbb::flow::overwrite_node<int>>();
 }
 
 //! Test inheritance relations
 //! \brief \ref interface
-TEST_CASE("overwrite_node superclasses"){
+TEST_CASE("overwrite_node superclasses") {
     conformance::test_inheritance<oneapi::tbb::flow::overwrite_node<int>, int, int>();
     conformance::test_inheritance<oneapi::tbb::flow::overwrite_node<void*>, void*, void*>();
 }
 
 //! Test overwrite_node node constructor
 //! \brief \ref requirement
-TEST_CASE("overwrite_node constructor"){
+TEST_CASE("overwrite_node constructor") {
     oneapi::tbb::flow::graph g;
     oneapi::tbb::flow::overwrite_node<int> testing_node(g);
 
     int tmp = -1;
     CHECK_MESSAGE((!testing_node.is_valid()), "Constructed node has invalid internal buffer item");
-    CHECK_MESSAGE((!testing_node.try_get(tmp)), "Gets from the node are non-destructive, but the first `try_get' fails");
+    CHECK_MESSAGE((!testing_node.try_get(tmp)),
+                  "Gets from the node are non-destructive, but the first `try_get' fails");
 }
 
 //! Test overwrite_node node `is_valid()` and `clear()`
 //! \brief \ref requirement
-TEST_CASE("overwrite_node methods"){
+TEST_CASE("overwrite_node methods") {
     oneapi::tbb::flow::graph g;
     oneapi::tbb::flow::overwrite_node<int> testing_node(g);
 
     CHECK_MESSAGE((!testing_node.is_valid()), "Constructed node has invalid internal buffer item");
-    
+
     testing_node.try_put(1);
-    
+
     CHECK_MESSAGE((testing_node.is_valid()), "Buffer must be valid after try_put call");
 
     testing_node.clear();
@@ -104,6 +105,6 @@ TEST_CASE("overwrite_node methods"){
 //! The following test shows the possibility to connect the node to a reserving join_node,
 //! avoiding direct calls to the try_get() method from the body of the successor node
 //! \brief \ref requirement
-TEST_CASE("overwrite_node with reserving join_node as successor"){
+TEST_CASE("overwrite_node with reserving join_node as successor") {
     conformance::test_with_reserving_join_node_class<oneapi::tbb::flow::overwrite_node<int>>();
 }
diff --git a/external/tbb/test/conformance/conformance_parallel_for.cpp b/external/tbb/test/conformance/conformance_parallel_for.cpp
index 463ea526..bc76383f 100644
--- a/external/tbb/test/conformance/conformance_parallel_for.cpp
+++ b/external/tbb/test/conformance/conformance_parallel_for.cpp
@@ -16,9 +16,9 @@
 
 #define DOCTEST_CONFIG_SUPER_FAST_ASSERTS
 #include "common/test.h"
+#include "common/test_invoke.h"
 #include "common/utils.h"
 #include "common/utils_report.h"
-#include "common/test_invoke.h"
 
 #include "oneapi/tbb/parallel_for.h"
 #include "oneapi/tbb/tick_count.h"
@@ -42,71 +42,73 @@ const std::size_t PFOR_BUFFER_TEST_SIZE = 1024;
 const std::size_t PFOR_BUFFER_ACTUAL_SIZE = PFOR_BUFFER_TEST_SIZE + 1024;
 size_t pfor_buffer[PFOR_BUFFER_ACTUAL_SIZE];
 
-template<typename T>
-class TestFunctor{
+template <typename T>
+class TestFunctor {
 public:
-    void operator ()(T index) const {
-        pfor_buffer[index]++;
-    }
+    void operator()(T index) const { pfor_buffer[index]++; }
 };
 
 static std::atomic<int> FooBodyCount;
 
 // A range object whose only public members are those required by the Range concept.
-template<size_t Pad>
+template <size_t Pad>
 class FooRange {
     // Start of range
     int start;
 
     // Size of range
     int size;
-    FooRange( int start_, int size_ ) : start(start_), size(size_) {
+    FooRange(int start_, int size_) : start(start_), size(size_) {
         utils::zero_fill<char>(pad, Pad);
-        pad[Pad-1] = 'x';
+        pad[Pad - 1] = 'x';
     }
-    template<typename Flavor_, std::size_t Pad_> friend void Flog( );
-    template<size_t Pad_> friend class FooBody;
+    template <typename Flavor_, std::size_t Pad_>
+    friend void Flog();
+    template <size_t Pad_>
+    friend class FooBody;
     void operator&();
 
     char pad[Pad];
+
 public:
-    bool empty() const {return size==0;}
-    bool is_divisible() const {return size>1;}
-    FooRange( FooRange& original, oneapi::tbb::split ) : size(original.size/2) {
+    bool empty() const { return size == 0; }
+    bool is_divisible() const { return size > 1; }
+    FooRange(FooRange& original, oneapi::tbb::split) : size(original.size / 2) {
         original.size -= size;
-        start = original.start+original.size;
-        CHECK_FAST( original.pad[Pad-1]=='x');
-        pad[Pad-1] = 'x';
+        start = original.start + original.size;
+        CHECK_FAST(original.pad[Pad - 1] == 'x');
+        pad[Pad - 1] = 'x';
     }
 };
 
 // A range object whose only public members are those required by the parallel_for.h body concept.
-template<size_t Pad>
+template <size_t Pad>
 class FooBody {
 public:
     ~FooBody() {
         --FooBodyCount;
-        for( std::size_t i=0; i<sizeof(*this); ++i )
-            reinterpret_cast<char*>(this)[i] = -1;
+        for (std::size_t i = 0; i < sizeof(*this); ++i) reinterpret_cast<char*>(this)[i] = -1;
     }
     // Copy constructor
-    FooBody( const FooBody& other ) : array(other.array), state(other.state) {
+    FooBody(const FooBody& other) : array(other.array), state(other.state) {
         ++FooBodyCount;
         CHECK_FAST(state == LIVE);
     }
-    void operator()( FooRange<Pad>& r ) const {
+    void operator()(FooRange<Pad>& r) const {
         for (int k = r.start; k < r.start + r.size; ++k) {
             CHECK_FAST(array[k].load(std::memory_order_relaxed) == 0);
             array[k].store(1, std::memory_order_relaxed);
         }
     }
+
 private:
     const int LIVE = 0x1234;
     std::atomic<int>* array;
     int state;
     friend class FooRange<Pad>;
-    template<typename Flavor_, std::size_t Pad_> friend void Flog( );
-    FooBody( std::atomic<int>* array_ ) : array(array_), state(LIVE) {}
+    template <typename Flavor_, std::size_t Pad_>
+    friend void Flog();
+    FooBody(std::atomic<int>* array_) : array(array_), state(LIVE) {}
 };
 
 template <typename Flavor, typename Partitioner, typename Range, typename Body>
@@ -114,15 +116,15 @@ struct Invoker;
 
 template <typename Range, typename Body>
 struct Invoker<parallel_tag, empty_partitioner_tag, Range, Body> {
-    void operator()( const Range& r, const Body& body, empty_partitioner_tag& ) {
-        oneapi::tbb::parallel_for( r, body );
+    void operator()(const Range& r, const Body& body, empty_partitioner_tag&) {
+        oneapi::tbb::parallel_for(r, body);
     }
 };
 
 template <typename Partitioner, typename Range, typename Body>
 struct Invoker<parallel_tag, Partitioner, Range, Body> {
-    void operator()( const Range& r, const Body& body, Partitioner& p ) {
-        oneapi::tbb::parallel_for( r, body, p );
+    void operator()(const Range& r, const Body& body, Partitioner& p) {
+        oneapi::tbb::parallel_for(r, body, p);
     }
 };
 
@@ -131,80 +133,83 @@ struct InvokerStep;
 
 template <typename T, typename Body>
 struct InvokerStep<parallel_tag, empty_partitioner_tag, T, Body> {
-    void operator()( const T& first, const T& last, const Body& f, empty_partitioner_tag& ) {
-        oneapi::tbb::parallel_for( first, last, f );
+    void operator()(const T& first, const T& last, const Body& f, empty_partitioner_tag&) {
+        oneapi::tbb::parallel_for(first, last, f);
     }
-    void operator()( const T& first, const T& last, const T& step, const Body& f, empty_partitioner_tag& ) {
-        oneapi::tbb::parallel_for( first, last, step, f );
+    void operator()(const T& first, const T& last, const T& step, const Body& f, empty_partitioner_tag&) {
+        oneapi::tbb::parallel_for(first, last, step, f);
     }
 };
 
 template <typename Partitioner, typename T, typename Body>
 struct InvokerStep<parallel_tag, Partitioner, T, Body> {
-    void operator()( const T& first, const T& last, const Body& f, Partitioner& p ) {
-        oneapi::tbb::parallel_for( first, last, f, p );
+    void operator()(const T& first, const T& last, const Body& f, Partitioner& p) {
+        oneapi::tbb::parallel_for(first, last, f, p);
     }
-    void operator()( const T& first, const T& last, const T& step, const Body& f, Partitioner& p ) {
-        oneapi::tbb::parallel_for( first, last, step, f, p );
+    void operator()(const T& first, const T& last, const T& step, const Body& f, Partitioner& p) {
+        oneapi::tbb::parallel_for(first, last, step, f, p);
     }
 };
 
-template<typename Flavor, std::size_t Pad>
+template <typename Flavor, std::size_t Pad>
 void Flog() {
-    for ( int i=0; i<N; ++i ) {
-        for ( int mode = 0; mode < 4; ++mode) {
-            FooRange<Pad> r( 0, i );
+    for (int i = 0; i < N; ++i) {
+        for (int mode = 0; mode < 4; ++mode) {
+            FooRange<Pad> r(0, i);
             const FooRange<Pad> rc = r;
-            FooBody<Pad> f( Array );
+            FooBody<Pad> f(Array);
             const FooBody<Pad> fc = f;
-            for (int a_i = 0; a_i < N; a_i++) {
-                Array[a_i].store(0, std::memory_order_relaxed);
-            }
+            for (int a_i = 0; a_i < N; a_i++) { Array[a_i].store(0, std::memory_order_relaxed); }
             FooBodyCount = 1;
             switch (mode) {
-            case 0: {
-                empty_partitioner_tag p;
-                Invoker< Flavor, empty_partitioner_tag, FooRange<Pad>, FooBody<Pad> > invoke_for;
-                invoke_for( rc, fc, p );
+                case 0: {
+                    empty_partitioner_tag p;
+                    Invoker<Flavor, empty_partitioner_tag, FooRange<Pad>, FooBody<Pad>> invoke_for;
+                    invoke_for(rc, fc, p);
+                } break;
+                case 1: {
+                    Invoker<Flavor, const oneapi::tbb::simple_partitioner, FooRange<Pad>, FooBody<Pad>>
+                            invoke_for;
+                    invoke_for(rc, fc, oneapi::tbb::simple_partitioner());
+                } break;
+                case 2: {
+                    Invoker<Flavor, const oneapi::tbb::auto_partitioner, FooRange<Pad>, FooBody<Pad>>
+                            invoke_for;
+                    invoke_for(rc, fc, oneapi::tbb::auto_partitioner());
+                } break;
+                case 3: {
+                    static oneapi::tbb::affinity_partitioner affinity;
+                    Invoker<Flavor, oneapi::tbb::affinity_partitioner, FooRange<Pad>, FooBody<Pad>>
+                            invoke_for;
+                    invoke_for(rc, fc, affinity);
+                } break;
             }
-                break;
-            case 1: {
-                Invoker< Flavor, const oneapi::tbb::simple_partitioner, FooRange<Pad>, FooBody<Pad> > invoke_for;
-                invoke_for( rc, fc, oneapi::tbb::simple_partitioner() );
-            }
-                break;
-            case 2: {
-                Invoker< Flavor, const oneapi::tbb::auto_partitioner, FooRange<Pad>, FooBody<Pad> > invoke_for;
-                invoke_for( rc, fc, oneapi::tbb::auto_partitioner() );
-            }
-                break;
-            case 3: {
-                static oneapi::tbb::affinity_partitioner affinity;
-                Invoker< Flavor, oneapi::tbb::affinity_partitioner, FooRange<Pad>, FooBody<Pad> > invoke_for;
-                invoke_for( rc, fc, affinity );
-            }
-                break;
-            }
-            CHECK(std::find_if_not(Array, Array + i, [](const std::atomic<int>& v) { return v.load(std::memory_order_relaxed) == 1; }) == Array + i);
-            CHECK(std::find_if_not(Array + i, Array + N, [](const std::atomic<int>& v) { return v.load(std::memory_order_relaxed) == 0; }) == Array + N);
+            CHECK(std::find_if_not(
+                          Array, Array + i,
+                          [](const std::atomic<int>& v) { return v.load(std::memory_order_relaxed) == 1; })
+                  == Array + i);
+            CHECK(std::find_if_not(
+                          Array + i, Array + N,
+                          [](const std::atomic<int>& v) { return v.load(std::memory_order_relaxed) == 0; })
+                  == Array + N);
             CHECK(FooBodyCount == 1);
         }
     }
 }
 
-#include <stdexcept> // std::invalid_argument
+#include <stdexcept>// std::invalid_argument
 
 template <typename Flavor, typename T, typename Partitioner>
 void TestParallelForWithStepSupportHelper(Partitioner& p) {
     const T pfor_buffer_test_size = static_cast<T>(PFOR_BUFFER_TEST_SIZE);
     const T pfor_buffer_actual_size = static_cast<T>(PFOR_BUFFER_ACTUAL_SIZE);
     // Testing parallel_for with different step values
-    InvokerStep< Flavor, Partitioner, T, TestFunctor<T> > invoke_for;
+    InvokerStep<Flavor, Partitioner, T, TestFunctor<T>> invoke_for;
     for (T begin = 0; begin < pfor_buffer_test_size - 1; begin += pfor_buffer_test_size / 10 + 1) {
         T step;
         for (step = 1; step < pfor_buffer_test_size; step++) {
             std::memset(pfor_buffer, 0, pfor_buffer_actual_size * sizeof(std::size_t));
-            if (step == 1){
+            if (step == 1) {
                 invoke_for(begin, pfor_buffer_test_size, TestFunctor<T>(), p);
             } else {
                 invoke_for(begin, pfor_buffer_test_size, step, TestFunctor<T>(), p);
@@ -218,9 +223,7 @@ void TestParallelForWithStepSupportHelper(Partitioner& p) {
             }
             // Verifying that no extra items were processed and right bound of array wasn't crossed
             for (T i = 0; i < pfor_buffer_actual_size; i++) {
-                if (pfor_buffer[i] != 0) {
-                    CHECK_MESSAGE(false, "parallel_for processed an extra element");
-                }
+                if (pfor_buffer[i] != 0) { CHECK_MESSAGE(false, "parallel_for processed an extra element"); }
             }
         }
     }
@@ -235,11 +238,11 @@ void TestParallelForWithStepSupport() {
     empty_partitioner_tag p;
 
     // Try out all partitioner combinations
-    TestParallelForWithStepSupportHelper< Flavor,T,empty_partitioner_tag >(p);
-    TestParallelForWithStepSupportHelper< Flavor,T,const oneapi::tbb::auto_partitioner >(auto_p);
-    TestParallelForWithStepSupportHelper< Flavor,T,const oneapi::tbb::simple_partitioner >(simple_p);
-    TestParallelForWithStepSupportHelper< Flavor,T,oneapi::tbb::affinity_partitioner >(affinity_p);
-    TestParallelForWithStepSupportHelper< Flavor,T,oneapi::tbb::static_partitioner >(static_p);
+    TestParallelForWithStepSupportHelper<Flavor, T, empty_partitioner_tag>(p);
+    TestParallelForWithStepSupportHelper<Flavor, T, const oneapi::tbb::auto_partitioner>(auto_p);
+    TestParallelForWithStepSupportHelper<Flavor, T, const oneapi::tbb::simple_partitioner>(simple_p);
+    TestParallelForWithStepSupportHelper<Flavor, T, oneapi::tbb::affinity_partitioner>(affinity_p);
+    TestParallelForWithStepSupportHelper<Flavor, T, oneapi::tbb::static_partitioner>(static_p);
 
     // Testing some corner cases
     oneapi::tbb::parallel_for(static_cast<T>(2), static_cast<T>(1), static_cast<T>(1), TestFunctor<T>());
@@ -249,10 +252,8 @@ void TestParallelForWithStepSupport() {
 class SmartIndex {
 public:
     SmartIndex(std::size_t ri) : real_index(ri), change_vector(nullptr) {}
-    SmartIndex(std::size_t ri, std::vector<std::size_t>& cv)
-        : real_index(ri), change_vector(&cv) {}
-    SmartIndex(const SmartIndex& other) : real_index(other.real_index),
-                                          change_vector(other.change_vector) {}
+    SmartIndex(std::size_t ri, std::vector<std::size_t>& cv) : real_index(ri), change_vector(&cv) {}
+    SmartIndex(const SmartIndex& other) : real_index(other.real_index), change_vector(other.change_vector) {}
     ~SmartIndex() = default;
 
     SmartIndex& operator=(const SmartIndex& other) {
@@ -261,13 +262,9 @@ class SmartIndex {
         return *this;
     }
 
-    bool operator<(const SmartIndex& other) const {
-        return real_index < other.real_index;
-    }
+    bool operator<(const SmartIndex& other) const { return real_index < other.real_index; }
 
-    bool operator<=(const SmartIndex& other) const {
-        return real_index <= other.real_index;
-    }
+    bool operator<=(const SmartIndex& other) const { return real_index <= other.real_index; }
 
     SmartIndex operator/(const SmartIndex& other) const {
         return {real_index / other.real_index, *change_vector};
@@ -286,20 +283,20 @@ class SmartIndex {
         return *this;
     }
 
-    SmartIndex& operator++() { ++real_index; return *this; }
-
-    std::size_t operator-(const SmartIndex& other) const {
-        return real_index - other.real_index;
+    SmartIndex& operator++() {
+        ++real_index;
+        return *this;
     }
 
-    SmartIndex operator+(std::size_t k) {
-        return {real_index + k, *change_vector};
-    }
+    std::size_t operator-(const SmartIndex& other) const { return real_index - other.real_index; }
+
+    SmartIndex operator+(std::size_t k) { return {real_index + k, *change_vector}; }
 
     void increase() const {
         CHECK(change_vector);
         ++(*change_vector)[real_index];
     }
+
 private:
     std::size_t real_index;
     std::vector<std::size_t>* change_vector;
@@ -311,7 +308,7 @@ void test_pfor_body_invoke() {
 
     using range_type = test_invoke::SmartRange<std::size_t>;
     std::vector<std::size_t> change_vector(iterations, 0);
-    range_type range{0, iterations, change_vector};
+    range_type range {0, iterations, change_vector};
 
     oneapi::tbb::parallel_for(range, &range_type::increase);
     oneapi::tbb::parallel_for(range, &range_type::increase, oneapi::tbb::simple_partitioner());
@@ -320,20 +317,17 @@ void test_pfor_body_invoke() {
     oneapi::tbb::affinity_partitioner aff;
     oneapi::tbb::parallel_for(range, &range_type::increase, aff);
 
-    for (std::size_t item : change_vector) {
-        CHECK(item == number_of_overloads);
-    }
+    for (std::size_t item : change_vector) { CHECK(item == number_of_overloads); }
 }
 
-
 void test_pfor_func_invoke() {
     const std::size_t number_of_overloads = 5;
     const std::size_t iterations = 100000;
 
     std::vector<std::size_t> change_vector(iterations, 0);
-    SmartIndex first{0, change_vector};
-    SmartIndex last{iterations, change_vector};
-    SmartIndex stride{2};
+    SmartIndex first {0, change_vector};
+    SmartIndex last {iterations, change_vector};
+    SmartIndex stride {2};
 
     oneapi::tbb::parallel_for(first, last, &SmartIndex::increase);
     oneapi::tbb::parallel_for(first, last, &SmartIndex::increase, oneapi::tbb::simple_partitioner());
@@ -359,35 +353,29 @@ void test_pfor_func_invoke() {
         CHECK(change_vector[i] == expected);
     }
 }
-#endif // __TBB_CPP17_INVOKE_PRESENT
+#endif// __TBB_CPP17_INVOKE_PRESENT
 
 //! Test simple parallel_for with different partitioners
 //! \brief \ref interface \ref requirement
 TEST_CASE("Basic parallel_for") {
-    std::atomic<unsigned long> counter{};
+    std::atomic<unsigned long> counter {};
     const std::size_t number_of_partitioners = 5;
     const std::size_t iterations = 100000;
 
-    oneapi::tbb::parallel_for(std::size_t(0), iterations, [&](std::size_t) {
-        counter++;
-    });
+    oneapi::tbb::parallel_for(std::size_t(0), iterations, [&](std::size_t) { counter++; });
 
-    oneapi::tbb::parallel_for(std::size_t(0), iterations, [&](std::size_t) {
-        counter++;
-    }, oneapi::tbb::simple_partitioner());
+    oneapi::tbb::parallel_for(
+            std::size_t(0), iterations, [&](std::size_t) { counter++; }, oneapi::tbb::simple_partitioner());
 
-    oneapi::tbb::parallel_for(std::size_t(0), iterations, [&](std::size_t) {
-        counter++;
-    }, oneapi::tbb::auto_partitioner());
+    oneapi::tbb::parallel_for(
+            std::size_t(0), iterations, [&](std::size_t) { counter++; }, oneapi::tbb::auto_partitioner());
 
-    oneapi::tbb::parallel_for(std::size_t(0), iterations, [&](std::size_t) {
-        counter++;
-    }, oneapi::tbb::static_partitioner());
+    oneapi::tbb::parallel_for(
+            std::size_t(0), iterations, [&](std::size_t) { counter++; }, oneapi::tbb::static_partitioner());
 
     oneapi::tbb::affinity_partitioner aff;
-    oneapi::tbb::parallel_for(std::size_t(0), iterations, [&](std::size_t) {
-        counter++;
-    }, aff);
+    oneapi::tbb::parallel_for(
+            std::size_t(0), iterations, [&](std::size_t) { counter++; }, aff);
 
     CHECK_EQ(counter.load(std::memory_order_relaxed), iterations * number_of_partitioners);
 }
@@ -399,15 +387,15 @@ TEST_CASE("Flog test") {
     Flog<parallel_tag, 10>();
     Flog<parallel_tag, 100>();
     Flog<parallel_tag, 1000>();
-#if !EMSCRIPTEN    
+#if !EMSCRIPTEN
     Flog<parallel_tag, 10000>();
 #endif
 }
 
 //! Testing parallel for with different types and step
 //! \brief \ref interface \ref requirement
-TEST_CASE_TEMPLATE("parallel_for with step support", T, short, unsigned short, int, unsigned int,
-                                    long, unsigned long, long long, unsigned long long, std::size_t) {
+TEST_CASE_TEMPLATE("parallel_for with step support", T, short, unsigned short, int, unsigned int, long,
+                   unsigned long, long long, unsigned long long, std::size_t) {
     // Testing with different integer types
     TestParallelForWithStepSupport<parallel_tag, T>();
 }
diff --git a/external/tbb/test/conformance/conformance_parallel_for_each.cpp b/external/tbb/test/conformance/conformance_parallel_for_each.cpp
index e36a2803..20c36b18 100644
--- a/external/tbb/test/conformance/conformance_parallel_for_each.cpp
+++ b/external/tbb/test/conformance/conformance_parallel_for_each.cpp
@@ -22,13 +22,13 @@
 //! Test input access iterator support
 //! \brief \ref requirement \ref interface
 TEST_CASE("Input iterator support") {
-    for ( auto concurrency_level : utils::concurrency_range() ) {
-        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism, concurrency_level);
+    for (auto concurrency_level : utils::concurrency_range()) {
+        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism,
+                                            concurrency_level);
 
-        for( size_t depth = 0; depth <= depths_nubmer; ++depth ) {
+        for (size_t depth = 0; depth <= depths_nubmer; ++depth) {
             g_tasks_expected = 0;
-            for ( size_t i=0; i < depth; ++i )
-                g_tasks_expected += FindNumOfTasks(g_depths[i].value());
+            for (size_t i = 0; i < depth; ++i) g_tasks_expected += FindNumOfTasks(g_depths[i].value());
             TestIterator_Const<utils::InputIterator<value_t>>(depth);
             TestIterator_Move<utils::InputIterator<value_t>>(depth);
 #if __TBB_CPP14_GENERIC_LAMBDAS_PRESENT
@@ -41,14 +41,14 @@ TEST_CASE("Input iterator support") {
 //! Test container based overload
 //! \brief \ref requirement \ref interface
 TEST_CASE("Container based overload - input iterator based container") {
-    container_based_overload_test_case<utils::InputIterator, incremental_functor_const>(/*expected_value*/0);
+    container_based_overload_test_case<utils::InputIterator, incremental_functor_const>(/*expected_value*/ 0);
 }
 
 const size_t elements = 10000;
 const size_t init_sum = 0;
 std::atomic<size_t> element_counter;
 
-template<size_t K>
+template <size_t K>
 struct set_to {
     void operator()(size_t& x) const {
         x = K;
@@ -57,13 +57,14 @@ struct set_to {
 };
 
 #include "common/range_based_for_support.h"
-#include <functional>
 #include <deque>
+#include <functional>
 
-template<typename... Context>
+template <typename... Context>
 void WorkProducingTest(Context&... context) {
-    for ( auto concurrency_level : utils::concurrency_range() ) {
-        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism, concurrency_level);
+    for (auto concurrency_level : utils::concurrency_range()) {
+        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism,
+                                            concurrency_level);
 
         using namespace range_based_for_support_tests;
         std::deque<size_t> v(elements, 0);
@@ -71,23 +72,25 @@ void WorkProducingTest(Context&... context) {
         element_counter = 0;
         oneapi::tbb::parallel_for_each(v.begin(), v.end(), set_to<0>(), context...);
         REQUIRE_MESSAGE((element_counter == v.size() && element_counter == elements),
-            "not all elements were set");
+                        "not all elements were set");
         REQUIRE_MESSAGE(range_based_for_accumulate(v, std::plus<size_t>(), init_sum) == init_sum,
-            "elements of v not all ones");
+                        "elements of v not all ones");
 
         element_counter = 0;
         oneapi::tbb::parallel_for_each(v, set_to<1>(), context...);
         REQUIRE_MESSAGE((element_counter == v.size() && element_counter == elements),
-            "not all elements were set");
+                        "not all elements were set");
         REQUIRE_MESSAGE(range_based_for_accumulate(v, std::plus<size_t>(), init_sum) == v.size(),
-            "elements of v not all ones");
+                        "elements of v not all ones");
 
         element_counter = 0;
-        oneapi::tbb::parallel_for_each(oneapi::tbb::blocked_range<std::deque<size_t>::iterator>(v.begin(), v.end()), set_to<0>(), context...);
+        oneapi::tbb::parallel_for_each(
+                oneapi::tbb::blocked_range<std::deque<size_t>::iterator>(v.begin(), v.end()), set_to<0>(),
+                context...);
         REQUIRE_MESSAGE((element_counter == v.size() && element_counter == elements),
-            "not all elements were set");
+                        "not all elements were set");
         REQUIRE_MESSAGE(range_based_for_accumulate(v, std::plus<size_t>(), init_sum) == init_sum,
-            "elements of v not all zeros");
+                        "elements of v not all zeros");
     }
 }
 
@@ -103,10 +106,9 @@ class ForEachInvokeItem {
         CHECK_MESSAGE(change_vector.size() % 2 == 0, "incorrect test setup");
         std::size_t shift = change_vector.size() / 2;
         ++change_vector[real_value];
-        if (real_value < shift) {
-            feeder.add(ForEachInvokeItem(real_value + shift, change_vector));
-        }
+        if (real_value < shift) { feeder.add(ForEachInvokeItem(real_value + shift, change_vector)); }
     }
+
 private:
     std::size_t real_value;
     std::vector<std::size_t>& change_vector;
@@ -118,9 +120,7 @@ void test_pfor_each_invoke_basic() {
     std::vector<ForEachInvokeItem> items_to_proceed;
     std::vector<std::size_t> change_vector(2 * items_count, 0);
 
-    for (std::size_t i = 0; i < items_count; ++i) {
-        items_to_proceed.emplace_back(i, change_vector);
-    }
+    for (std::size_t i = 0; i < items_count; ++i) { items_to_proceed.emplace_back(i, change_vector); }
 
     using iterator_type = IteratorType<ForEachInvokeItem>;
 
@@ -132,7 +132,7 @@ void test_pfor_each_invoke_basic() {
     for (std::size_t i = 0; i < items_count; ++i) {
         CHECK(change_vector[i] == 1);
         CHECK(change_vector[i + items_count] == 0);
-        change_vector[i] = 0; // reset
+        change_vector[i] = 0;// reset
     }
 
     // Test with feeder
@@ -140,9 +140,7 @@ void test_pfor_each_invoke_basic() {
                                    iterator_type(items_to_proceed.data() + items_count),
                                    &ForEachInvokeItem::do_action_and_feed);
 
-    for (auto item : change_vector) {
-        CHECK(item == 1);
-    }
+    for (auto item : change_vector) { CHECK(item == 1); }
 }
 
 #endif
diff --git a/external/tbb/test/conformance/conformance_parallel_invoke.cpp b/external/tbb/test/conformance/conformance_parallel_invoke.cpp
index 337e554f..3bdbe990 100644
--- a/external/tbb/test/conformance/conformance_parallel_invoke.cpp
+++ b/external/tbb/test/conformance/conformance_parallel_invoke.cpp
@@ -15,30 +15,29 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
 #endif
 
-
+#include "common/cpu_usertime.h"
+#include "common/memory_usage.h"
+#include "common/parallel_invoke_common.h"
 #include "common/test.h"
 #include "common/utils.h"
-#include "common/cpu_usertime.h"
 #include "common/utils_concurrency_limit.h"
-#include "common/parallel_invoke_common.h"
-#include "common/memory_usage.h"
 
+#include <atomic>
 #include <cstddef>
 #include <cstdint>
-#include <atomic>
 
 //! \file conformance_parallel_invoke.cpp
 //! \brief Test for [algorithms.parallel_invoke] specification
 
-template<std::size_t TaskCount>
+template <std::size_t TaskCount>
 struct correctness_test_case {
     static std::atomic<std::size_t> data_array[TaskCount];
 
     // invocation functor
-    template<std::size_t Position>
+    template <std::size_t Position>
     struct functor {
 
         functor() = default;
@@ -52,23 +51,24 @@ struct correctness_test_case {
     };
 
     static void run_validate_and_reset(oneapi::tbb::task_group_context* context_ptr) {
-        for (auto& elem : data_array)
-            elem.store(0, std::memory_order_relaxed);
+        for (auto& elem : data_array) elem.store(0, std::memory_order_relaxed);
 
         parallel_invoke_call<TaskCount, functor>::perform(context_ptr);
         for (std::size_t i = 0; i < TaskCount; i++) {
-            REQUIRE_MESSAGE(data_array[i] == 1, "Some task was executed more than once, or was not executed.");
+            REQUIRE_MESSAGE(data_array[i] == 1,
+                            "Some task was executed more than once, or was not executed.");
             data_array[i] = 0;
         }
     }
 };
 
-template<std::size_t TaskCount>
+template <std::size_t TaskCount>
 std::atomic<std::size_t> correctness_test_case<TaskCount>::data_array[TaskCount];
 
 void correctness_test(oneapi::tbb::task_group_context* context_ptr = nullptr) {
-    for ( auto concurrency_level : utils::concurrency_range() ) {
-        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism, concurrency_level);
+    for (auto concurrency_level : utils::concurrency_range()) {
+        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism,
+                                            concurrency_level);
 
         correctness_test_case<2>::run_validate_and_reset(context_ptr);
         correctness_test_case<3>::run_validate_and_reset(context_ptr);
@@ -88,9 +88,7 @@ void correctness_test(oneapi::tbb::task_group_context* context_ptr = nullptr) {
 
 //! Testing correctness with various functors count
 //! \brief \ref requirement \ref interface
-TEST_CASE("Test correctness") {
-    correctness_test();
-}
+TEST_CASE("Test correctness") { correctness_test(); }
 
 //! Testing correctness with various functors count using task_group_context
 //! \brief \ref requirement \ref interface
@@ -105,10 +103,10 @@ TEST_CASE("Test correctness using context") {
 
 #if TBB_USE_EXCEPTIONS
 
-template<std::size_t TaskCount>
+template <std::size_t TaskCount>
 struct exception_handling_test_case {
     // invocation functor
-    template<std::size_t Position>
+    template <std::size_t Position>
     struct functor {
         functor() = default;
         functor(const functor&) = delete;
@@ -116,35 +114,36 @@ struct exception_handling_test_case {
 
         void operator()() const {
             REQUIRE_MESSAGE(Position < TaskCount, "Wrong structure configuration.");
-            if (exception_mask & (1 << Position)) {
-                ThrowTestException();
-            }
+            if (exception_mask & (1 << Position)) { ThrowTestException(); }
         }
     };
 
     static void run_validate_and_reset() {
         // Checks all permutations of the exception handling mask for the current tasks count
-        for( exception_mask = 1; exception_mask < (std::size_t(1) << TaskCount); ++exception_mask ) {
+        for (exception_mask = 1; exception_mask < (std::size_t(1) << TaskCount); ++exception_mask) {
             ResetEhGlobals();
             TRY();
-                parallel_invoke_call<TaskCount, functor>::perform();
+            parallel_invoke_call<TaskCount, functor>::perform();
             CATCH();
             ASSERT_EXCEPTION();
         }
     }
+
 private:
-    static std::uint64_t exception_mask; // each bit represents whether the function should throw exception or not
+    static std::uint64_t
+            exception_mask;// each bit represents whether the function should throw exception or not
 };
 
-template<std::size_t TaskCount>
+template <std::size_t TaskCount>
 std::uint64_t exception_handling_test_case<TaskCount>::exception_mask(0);
 
 //! Testing exception hangling
 //! \brief \ref requirement \ref error_guessing
 TEST_CASE("Test exception hangling") {
-    for ( auto concurrency_level : utils::concurrency_range() ) {
+    for (auto concurrency_level : utils::concurrency_range()) {
         if (concurrency_level < 2) continue;
-        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism, concurrency_level);
+        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism,
+                                            concurrency_level);
 
         exception_handling_test_case<2>::run_validate_and_reset();
         exception_handling_test_case<3>::run_validate_and_reset();
@@ -166,37 +165,36 @@ void function_to_cancel() {
 }
 
 // The function is used to test cancellation
-void simple_test_nothrow (){
-    ++g_CurExecuted;
-}
+void simple_test_nothrow() { ++g_CurExecuted; }
 
 std::size_t g_numFunctions, g_functionToCancel;
 
 struct ParInvokeLauncher {
-    oneapi::tbb::task_group_context &my_ctx;
+    oneapi::tbb::task_group_context& my_ctx;
 
     void operator()() const {
-        void(*func_array[10])(void);
-        for (int i = 0; i <=9; ++i)
-            func_array[i] = &simple_test_nothrow;
+        void (*func_array[10])(void);
+        for (int i = 0; i <= 9; ++i) func_array[i] = &simple_test_nothrow;
         func_array[g_functionToCancel] = &function_to_cancel;
 
         oneapi::tbb::parallel_invoke(func_array[0], func_array[1], func_array[2], func_array[3],
-            func_array[4], func_array[5], func_array[6], func_array[7], func_array[8], func_array[9], my_ctx);
+                                     func_array[4], func_array[5], func_array[6], func_array[7],
+                                     func_array[8], func_array[9], my_ctx);
     }
 
-    ParInvokeLauncher ( oneapi::tbb::task_group_context& ctx ) : my_ctx(ctx) {}
+    ParInvokeLauncher(oneapi::tbb::task_group_context& ctx) : my_ctx(ctx) {}
 };
 
 //! Testing cancellation
 //! \brief \ref requirement \ref error_guessing
 TEST_CASE("Test cancellation") {
-    for ( auto concurrency_level : utils::concurrency_range() ) {
+    for (auto concurrency_level : utils::concurrency_range()) {
         if (concurrency_level < 2) continue;
-        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism, concurrency_level);
+        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism,
+                                            concurrency_level);
 
-        for ( int n = 2; n <= 10; ++n ) {
-            for ( int m = 0; m <= n - 1; ++m ) {
+        for (int n = 2; n <= 10; ++n) {
+            for (int m = 0; m <= n - 1; ++m) {
                 g_numFunctions = n;
                 g_functionToCancel = m;
                 ResetEhGlobals();
diff --git a/external/tbb/test/conformance/conformance_parallel_pipeline.cpp b/external/tbb/test/conformance/conformance_parallel_pipeline.cpp
index 1e67e17c..97d9734d 100644
--- a/external/tbb/test/conformance/conformance_parallel_pipeline.cpp
+++ b/external/tbb/test/conformance/conformance_parallel_pipeline.cpp
@@ -14,21 +14,21 @@
     limitations under the License.
 */
 
-#include "common/test.h"
-#include "common/utils.h"
 #include "common/checktype.h"
 #include "common/spin_barrier.h"
-#include "common/utils_concurrency_limit.h"
+#include "common/test.h"
 #include "common/test_invoke.h"
+#include "common/utils.h"
+#include "common/utils_concurrency_limit.h"
 
-#include "oneapi/tbb/parallel_pipeline.h"
 #include "oneapi/tbb/global_control.h"
+#include "oneapi/tbb/parallel_pipeline.h"
 #include "oneapi/tbb/task_group.h"
 
 #include <atomic>
-#include <thread>
-#include <string.h>
 #include <memory>
+#include <string.h>
+#include <thread>
 #include <tuple>
 
 //! \file conformance_parallel_pipeline.cpp
@@ -38,13 +38,13 @@ constexpr std::size_t n_tokens = 8;
 
 constexpr int max_counter = 1024;
 
-static std::atomic<int> input_counter{ max_counter };
+static std::atomic<int> input_counter {max_counter};
 
-template<typename U>
+template <typename U>
 class input_filter {
 public:
-    U operator()( oneapi::tbb::flow_control& control ) const {
-        if( --input_counter < 0 ) {
+    U operator()(oneapi::tbb::flow_control& control) const {
+        if (--input_counter < 0) {
             control.stop();
             input_counter = max_counter;
         }
@@ -52,38 +52,38 @@ class input_filter {
     }
 };
 
-template<typename T, typename U>
+template <typename T, typename U>
 class middle_filter {
 public:
     U operator()(T) const {
-        U out{};
+        U out {};
         return out;
     }
 };
 
-template<typename T>
+template <typename T>
 class output_filter {
 public:
-    void operator()(T ) const {}
+    void operator()(T) const {}
 };
 
-static const oneapi::tbb::filter_mode filter_table[] = { oneapi::tbb::filter_mode::parallel,
-                                                 oneapi::tbb::filter_mode::serial_in_order,
-                                                 oneapi::tbb::filter_mode::serial_out_of_order};
+static const oneapi::tbb::filter_mode filter_table[]
+        = {oneapi::tbb::filter_mode::parallel, oneapi::tbb::filter_mode::serial_in_order,
+           oneapi::tbb::filter_mode::serial_out_of_order};
 
-template<typename Body, typename... Cotnext>
+template <typename Body, typename... Cotnext>
 void TestSingleFilter(Body body, Cotnext&... context) {
 
-    for(int i =0; i <3; i++)
-    {
+    for (int i = 0; i < 3; i++) {
         oneapi::tbb::filter_mode mode = filter_table[i];
 
-        oneapi::tbb::filter<void, void> one_filter( mode, body );
-        oneapi::tbb::parallel_pipeline( n_tokens, one_filter, context...   );
+        oneapi::tbb::filter<void, void> one_filter(mode, body);
+        oneapi::tbb::parallel_pipeline(n_tokens, one_filter, context...);
 
-        oneapi::tbb::parallel_pipeline( n_tokens, oneapi::tbb::filter<void, void>(mode, body), context... );
+        oneapi::tbb::parallel_pipeline(n_tokens, oneapi::tbb::filter<void, void>(mode, body), context...);
 
-        oneapi::tbb::parallel_pipeline( n_tokens, oneapi::tbb::make_filter<void, void>(mode, body), context...);
+        oneapi::tbb::parallel_pipeline(n_tokens, oneapi::tbb::make_filter<void, void>(mode, body),
+                                       context...);
     }
 }
 
@@ -94,132 +94,117 @@ void TestSingleFilterFunctor() {
     TestSingleFilter(i_filter);
 
     oneapi::tbb::task_group_context context;
-    TestSingleFilter(i_filter,  context);
+    TestSingleFilter(i_filter, context);
 }
 
-
 void TestSingleFilterLambda() {
 
-
-    TestSingleFilter([]( oneapi::tbb::flow_control& control ) {
-                    if(input_counter-- == 0 ) {
-                        control.stop();
-                        input_counter = max_counter;
-                        }
-                    } );
+    TestSingleFilter([](oneapi::tbb::flow_control& control) {
+        if (input_counter-- == 0) {
+            control.stop();
+            input_counter = max_counter;
+        }
+    });
 
     oneapi::tbb::task_group_context context;
-    TestSingleFilter([]( oneapi::tbb::flow_control& control ) {
-                     if(input_counter-- == 0 ) {
-                        control.stop();
-                        input_counter = max_counter;
-                        }
-                    },  context);
+    TestSingleFilter(
+            [](oneapi::tbb::flow_control& control) {
+                if (input_counter-- == 0) {
+                    control.stop();
+                    input_counter = max_counter;
+                }
+            },
+            context);
 }
 
-template<typename I, typename O>
-void RunPipeline(const oneapi::tbb::filter<I, O> &filter)
-{
-    bool flag{false};
+template <typename I, typename O>
+void RunPipeline(const oneapi::tbb::filter<I, O>& filter) {
+    bool flag {false};
 
     auto f_beg = oneapi::tbb::make_filter<void, I>(oneapi::tbb::filter_mode::serial_out_of_order,
-                                        [&flag](oneapi::tbb::flow_control& fc) -> I{
-                                            if(flag) {
-                                                fc.stop();
-                                            }
-                                            flag = true;
-                                            return I();
-                                        });
+                                                   [&flag](oneapi::tbb::flow_control& fc) -> I {
+                                                       if (flag) { fc.stop(); }
+                                                       flag = true;
+                                                       return I();
+                                                   });
 
-    auto f_end = oneapi::tbb::make_filter<O, void>(oneapi::tbb::filter_mode::serial_in_order,
-                                            [](O) {});
+    auto f_end = oneapi::tbb::make_filter<O, void>(oneapi::tbb::filter_mode::serial_in_order, [](O) {});
 
     oneapi::tbb::parallel_pipeline(n_tokens, f_beg & filter & f_end);
 }
 
-void RunPipeline(const oneapi::tbb::filter<void, void> &filter)
-{
+void RunPipeline(const oneapi::tbb::filter<void, void>& filter) {
     oneapi::tbb::parallel_pipeline(n_tokens, filter);
 }
 
-template<typename Iterator1, typename Iterator2>
-void RootSequence( Iterator1 first, Iterator1 last, Iterator2 res) {
+template <typename Iterator1, typename Iterator2>
+void RootSequence(Iterator1 first, Iterator1 last, Iterator2 res) {
     using ValueType = typename Iterator1::value_type;
-    oneapi::tbb::parallel_pipeline( n_tokens,
-        oneapi::tbb::make_filter<void,ValueType>(
-            oneapi::tbb::filter_mode::serial_in_order,
-            [&first, &last](oneapi::tbb::flow_control& fc)-> ValueType{
-                if( first<last ) {
-                    ValueType val  = *first;
-                    ++first;
-                    return val;
-                 } else {
-                    fc.stop();
-                    return ValueType{};
-                }
-            }
-        ) &
-        oneapi::tbb::make_filter<ValueType,ValueType>(
-            oneapi::tbb::filter_mode::parallel,
-            [](ValueType p){return p*p;}
-        ) &
-        oneapi::tbb::make_filter<ValueType,void>(
-            oneapi::tbb::filter_mode::serial_in_order,
-            [&res](ValueType x) {
-                *res = x;
-                ++res; }
-        )
-    );
+    oneapi::tbb::parallel_pipeline(
+            n_tokens, oneapi::tbb::make_filter<void, ValueType>(
+                              oneapi::tbb::filter_mode::serial_in_order,
+                              [&first, &last](oneapi::tbb::flow_control& fc) -> ValueType {
+                                  if (first < last) {
+                                      ValueType val = *first;
+                                      ++first;
+                                      return val;
+                                  } else {
+                                      fc.stop();
+                                      return ValueType {};
+                                  }
+                              })
+                              & oneapi::tbb::make_filter<ValueType, ValueType>(
+                                      oneapi::tbb::filter_mode::parallel, [](ValueType p) { return p * p; })
+                              & oneapi::tbb::make_filter<ValueType, void>(
+                                      oneapi::tbb::filter_mode::serial_in_order, [&res](ValueType x) {
+                                          *res = x;
+                                          ++res;
+                                      }));
 }
 
 //! Testing pipeline correctness
 //! \brief \ref interface \ref requirement
-TEST_CASE("Testing pipeline correctness")
-{
+TEST_CASE("Testing pipeline correctness") {
     std::vector<double> input(max_counter);
     std::vector<double> output(max_counter);
-    for(std::size_t i = 0; i < max_counter; i++)
-        input[i] = (double)i;
+    for (std::size_t i = 0; i < max_counter; i++) input[i] = (double) i;
 
     RootSequence(input.cbegin(), input.cend(), output.begin());
-    for(int  i = 0; i < max_counter; i++) {
-        CHECK_MESSAGE(output[i] == input[i]*input[i], "pipeline result is incorrect");
+    for (int i = 0; i < max_counter; i++) {
+        CHECK_MESSAGE(output[i] == input[i] * input[i], "pipeline result is incorrect");
     }
 }
 
 //! Testing pipeline with single filter
 //! \brief \ref interface \ref requirement
-TEST_CASE("Testing pipeline with single filter")
-{
+TEST_CASE("Testing pipeline with single filter") {
     TestSingleFilterFunctor();
     TestSingleFilterLambda();
 }
 
 //! Testing single filter with different ways of creation
 //! \brief \ref interface \ref requirement
-TEST_CASE_TEMPLATE("Filter creation testing", T, std::tuple<size_t, int>,
-                                                 std::tuple<int, double>,
-                                                 std::tuple<unsigned int*, size_t>,
-                                                 std::tuple<unsigned short, unsigned short*>,
-                                                 std::tuple<double*, unsigned short*>,
-                                                 std::tuple<std::unique_ptr<int>, std::unique_ptr<int> >)
-{
+TEST_CASE_TEMPLATE("Filter creation testing", T, std::tuple<size_t, int>, std::tuple<int, double>,
+                   std::tuple<unsigned int*, size_t>, std::tuple<unsigned short, unsigned short*>,
+                   std::tuple<double*, unsigned short*>,
+                   std::tuple<std::unique_ptr<int>, std::unique_ptr<int>>) {
     using I = typename std::tuple_element<0, T>::type;
     using O = typename std::tuple_element<1, T>::type;
-    for(int i = 0; i < 3; i++)
-    {
+    for (int i = 0; i < 3; i++) {
         oneapi::tbb::filter_mode mode = filter_table[i];
         oneapi::tbb::filter<I, O> default_filter;
 
-        auto made_filter1 = oneapi::tbb::make_filter<I,O>(mode, [](I)->O{return O();});
-        static_assert(std::is_same<oneapi::tbb::filter<I, O>, decltype(made_filter1)>::value, "make_filter wrong result type");
+        auto made_filter1 = oneapi::tbb::make_filter<I, O>(mode, [](I) -> O { return O(); });
+        static_assert(std::is_same<oneapi::tbb::filter<I, O>, decltype(made_filter1)>::value,
+                      "make_filter wrong result type");
         RunPipeline(made_filter1);
 
-        auto made_filter2 = oneapi::tbb::make_filter(mode, [](I)->O{return O();});
-        static_assert(std::is_same<oneapi::tbb::filter<I, O>, decltype(made_filter2)>::value, "make_filter wrong result type");
+        auto made_filter2 = oneapi::tbb::make_filter(mode, [](I) -> O { return O(); });
+        static_assert(std::is_same<oneapi::tbb::filter<I, O>, decltype(made_filter2)>::value,
+                      "make_filter wrong result type");
         RunPipeline(made_filter2);
 
-        oneapi::tbb::filter<I, O> one_filter(mode, [](I)->O{return O();});
+        oneapi::tbb::filter<I, O> one_filter(mode, [](I) -> O { return O(); });
         RunPipeline(one_filter);
 
         oneapi::tbb::filter<I, O> copy_filter(one_filter);
@@ -233,29 +218,27 @@ TEST_CASE_TEMPLATE("Filter creation testing", T, std::tuple<size_t, int>,
 
 //! Testing filters concatenation
 //! \brief \ref interface \ref requirement
-TEST_CASE_TEMPLATE("Testing filters concatenation", T, std::tuple<size_t, int>,
-                                                       std::tuple<int, double>,
-                                                       std::tuple<unsigned int*, size_t>,
-                                                       std::tuple<unsigned short, unsigned short*>,
-                                                       std::tuple<double*, unsigned short*>,
-                                                       std::tuple<std::unique_ptr<int>, std::unique_ptr<int> >)
-{
+TEST_CASE_TEMPLATE("Testing filters concatenation", T, std::tuple<size_t, int>, std::tuple<int, double>,
+                   std::tuple<unsigned int*, size_t>, std::tuple<unsigned short, unsigned short*>,
+                   std::tuple<double*, unsigned short*>,
+                   std::tuple<std::unique_ptr<int>, std::unique_ptr<int>>) {
     using I = typename std::tuple_element<0, T>::type;
     using O = typename std::tuple_element<1, T>::type;
 
-    for(int fi = 0; fi< 27; fi++)
-    {
-        int i = fi%3;
-        int j = (fi/3)%3;
-        int k = (fi/9);
-        auto filter_chain = oneapi::tbb::filter<void, I>(filter_table[i], input_filter<I>()) &
-                            oneapi::tbb::filter<I, O>(filter_table[j], middle_filter<I,O>()) &
-                            oneapi::tbb::filter<O, void>(filter_table[k], output_filter<O>());
+    for (int fi = 0; fi < 27; fi++) {
+        int i = fi % 3;
+        int j = (fi / 3) % 3;
+        int k = (fi / 9);
+        auto filter_chain = oneapi::tbb::filter<void, I>(filter_table[i], input_filter<I>())
+                            & oneapi::tbb::filter<I, O>(filter_table[j], middle_filter<I, O>())
+                            & oneapi::tbb::filter<O, void>(filter_table[k], output_filter<O>());
         RunPipeline(filter_chain);
 
-        oneapi::tbb::filter<void, I> filter1 = oneapi::tbb::filter<void, I>(filter_table[i], input_filter<I>());
-        oneapi::tbb::filter<I, O> filter2 = oneapi::tbb::filter<I, O>(filter_table[j], middle_filter<I,O>());
-        oneapi::tbb::filter<O, void> filter3 = oneapi::tbb::filter<O, void>(filter_table[k], output_filter<O>());
+        oneapi::tbb::filter<void, I> filter1
+                = oneapi::tbb::filter<void, I>(filter_table[i], input_filter<I>());
+        oneapi::tbb::filter<I, O> filter2 = oneapi::tbb::filter<I, O>(filter_table[j], middle_filter<I, O>());
+        oneapi::tbb::filter<O, void> filter3
+                = oneapi::tbb::filter<O, void>(filter_table[k], output_filter<O>());
 
         auto fitler12 = filter1 & filter2;
         auto fitler23 = filter2 & filter3;
@@ -268,58 +251,50 @@ TEST_CASE_TEMPLATE("Testing filters concatenation", T, std::tuple<size_t, int>,
 }
 
 void doWork() {
-    for (int i = 0; i < 10; ++i)
-        utils::yield();
+    for (int i = 0; i < 10; ++i) utils::yield();
 }
 
 //! Testing filter modes
 //! \brief \ref interface \ref requirement
-TEST_CASE("Testing filter modes")
-{
-    for ( auto concurrency_level : utils::concurrency_range() )
-    {
-        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism, concurrency_level);
-
-        short serial_checker{0};
-        oneapi::tbb::filter<void,short> filter1(oneapi::tbb::filter_mode::serial_out_of_order,
-                                [&serial_checker](oneapi::tbb::flow_control&fc)
-                                {
-                                    auto check_value = ++serial_checker;
-                                    doWork();
-                                    CHECK_MESSAGE(check_value == serial_checker, "a serial filter was executed concurrently");
-                                    if(serial_checker>=(short)max_counter)
-                                    {
-                                        fc.stop();
-                                    }
-                                    return check_value;
-                                });
-
-        short serial_checker2{ 0 };
-        oneapi::tbb::filter<short, short> filter2(oneapi::tbb::filter_mode::serial_in_order,
-            [&serial_checker2](int)
-            {
-                auto check_value = ++serial_checker2;
-                doWork();
-                CHECK_MESSAGE(check_value == serial_checker2, "a serial filter was executed concurrently");
-                return check_value;
-            });
+TEST_CASE("Testing filter modes") {
+    for (auto concurrency_level : utils::concurrency_range()) {
+        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism,
+                                            concurrency_level);
+
+        short serial_checker {0};
+        oneapi::tbb::filter<void, short> filter1(
+                oneapi::tbb::filter_mode::serial_out_of_order,
+                [&serial_checker](oneapi::tbb::flow_control& fc) {
+                    auto check_value = ++serial_checker;
+                    doWork();
+                    CHECK_MESSAGE(check_value == serial_checker, "a serial filter was executed concurrently");
+                    if (serial_checker >= (short) max_counter) { fc.stop(); }
+                    return check_value;
+                });
+
+        short serial_checker2 {0};
+        oneapi::tbb::filter<short, short> filter2(
+                oneapi::tbb::filter_mode::serial_in_order, [&serial_checker2](int) {
+                    auto check_value = ++serial_checker2;
+                    doWork();
+                    CHECK_MESSAGE(check_value == serial_checker2,
+                                  "a serial filter was executed concurrently");
+                    return check_value;
+                });
 
         utils::SpinBarrier spin_barrier(utils::min(concurrency_level, n_tokens), true);
-        oneapi::tbb::filter<short,int> filter3(oneapi::tbb::filter_mode::parallel,
-                                [&spin_barrier](int value)
-                                {
-                                    spin_barrier.wait();
-                                    doWork();
-                                    return value;
-                                });
-
-
-        short order_checker{0};
-        oneapi::tbb::filter<int,void> filter4(oneapi::tbb::filter_mode::serial_in_order,
-                                [&order_checker](int value)
-                                {
-                                    CHECK_MESSAGE(++order_checker == value, "the order of message was broken");
-                                });
+        oneapi::tbb::filter<short, int> filter3(oneapi::tbb::filter_mode::parallel,
+                                                [&spin_barrier](int value) {
+                                                    spin_barrier.wait();
+                                                    doWork();
+                                                    return value;
+                                                });
+
+        short order_checker {0};
+        oneapi::tbb::filter<int, void> filter4(
+                oneapi::tbb::filter_mode::serial_in_order, [&order_checker](int value) {
+                    CHECK_MESSAGE(++order_checker == value, "the order of message was broken");
+                });
 
         oneapi::tbb::parallel_pipeline(n_tokens, filter1 & filter2 & filter3 & filter4);
     }
@@ -327,44 +302,39 @@ TEST_CASE("Testing filter modes")
 
 //! Testing max tocken number
 //! \brief \ref interface \ref requirement
-TEST_CASE("Testing max token number")
-{
-    for(unsigned int i = 1; i < n_tokens; i++)
-    {
-        std::atomic<short> active_tokens{0};
-
-        oneapi::tbb::filter<void,int> filter1(oneapi::tbb::filter_mode::parallel,
-                                [&active_tokens](oneapi::tbb::flow_control&fc)
-                                {
-                                    ++active_tokens;
-                                    doWork();
-                                    CHECK_MESSAGE(active_tokens <= n_tokens, "max number of tokens is exceed");
-                                    --active_tokens;
-                                    if (--input_counter < 0) {
-                                        fc.stop();
-                                        input_counter = max_counter;
-                                    }
-                                    return 0;
-                                });
-
-        oneapi::tbb::filter<int,int> filter2(oneapi::tbb::filter_mode::parallel,
-                                [&active_tokens](int value)
-                                {
-                                    ++active_tokens;
-                                    doWork();
-                                    CHECK_MESSAGE(active_tokens <= n_tokens, "max number of tockens is exceed");
-                                    --active_tokens;
-                                    return value;
-                                });
-
-        oneapi::tbb::filter<int,void> filter3(oneapi::tbb::filter_mode::serial_out_of_order,
-                                [&active_tokens](int)
-                                {
-                                    ++active_tokens;
-                                    doWork();
-                                    CHECK_MESSAGE(active_tokens <= n_tokens, "max number of tockens is exceed");
-                                    --active_tokens;
-                                });
+TEST_CASE("Testing max token number") {
+    for (unsigned int i = 1; i < n_tokens; i++) {
+        std::atomic<short> active_tokens {0};
+
+        oneapi::tbb::filter<void, int> filter1(
+                oneapi::tbb::filter_mode::parallel, [&active_tokens](oneapi::tbb::flow_control& fc) {
+                    ++active_tokens;
+                    doWork();
+                    CHECK_MESSAGE(active_tokens <= n_tokens, "max number of tokens is exceed");
+                    --active_tokens;
+                    if (--input_counter < 0) {
+                        fc.stop();
+                        input_counter = max_counter;
+                    }
+                    return 0;
+                });
+
+        oneapi::tbb::filter<int, int> filter2(
+                oneapi::tbb::filter_mode::parallel, [&active_tokens](int value) {
+                    ++active_tokens;
+                    doWork();
+                    CHECK_MESSAGE(active_tokens <= n_tokens, "max number of tockens is exceed");
+                    --active_tokens;
+                    return value;
+                });
+
+        oneapi::tbb::filter<int, void> filter3(
+                oneapi::tbb::filter_mode::serial_out_of_order, [&active_tokens](int) {
+                    ++active_tokens;
+                    doWork();
+                    CHECK_MESSAGE(active_tokens <= n_tokens, "max number of tockens is exceed");
+                    --active_tokens;
+                });
 
         oneapi::tbb::parallel_pipeline(i, filter1 & filter2 & filter3);
     }
@@ -372,33 +342,35 @@ TEST_CASE("Testing max token number")
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 
-template <typename... T> struct print;
+template <typename... T>
+struct print;
 
 //! Testing deduction guides
 //! \brief \ref interface \ref requirement
-TEST_CASE_TEMPLATE("Deduction guides testing", T, int, unsigned int, double)
-{
+TEST_CASE_TEMPLATE("Deduction guides testing", T, int, unsigned int, double) {
     input_filter<T> i_filter;
 
-    oneapi::tbb::filter  fc1(oneapi::tbb::filter_mode::serial_in_order, i_filter);
+    oneapi::tbb::filter fc1(oneapi::tbb::filter_mode::serial_in_order, i_filter);
     static_assert(std::is_same_v<decltype(fc1), oneapi::tbb::filter<void, T>>);
 
-    oneapi::tbb::filter fc2 (fc1);
+    oneapi::tbb::filter fc2(fc1);
     static_assert(std::is_same_v<decltype(fc2), oneapi::tbb::filter<void, T>>);
 
     middle_filter<T, std::size_t> m_filter;
-    oneapi::tbb::filter  fc3(oneapi::tbb::filter_mode::serial_in_order, m_filter);
+    oneapi::tbb::filter fc3(oneapi::tbb::filter_mode::serial_in_order, m_filter);
     static_assert(std::is_same_v<decltype(fc3), oneapi::tbb::filter<T, std::size_t>>);
 
-    oneapi::tbb::filter frv(oneapi::tbb::filter_mode::serial_in_order, [](int&&) -> double { return 0.0; });
-    oneapi::tbb::filter fclv(oneapi::tbb::filter_mode::serial_in_order, [](const int&) -> double { return 0.0; });
-    oneapi::tbb::filter fc(oneapi::tbb::filter_mode::serial_in_order, [](const int) -> double { return 0.0; });
+    oneapi::tbb::filter frv(oneapi::tbb::filter_mode::serial_in_order, [](int &&) -> double { return 0.0; });
+    oneapi::tbb::filter fclv(oneapi::tbb::filter_mode::serial_in_order,
+                             [](const int&) -> double { return 0.0; });
+    oneapi::tbb::filter fc(oneapi::tbb::filter_mode::serial_in_order,
+                           [](const int) -> double { return 0.0; });
 
     static_assert(std::is_same_v<decltype(frv), oneapi::tbb::filter<int, double>>);
     static_assert(std::is_same_v<decltype(fclv), oneapi::tbb::filter<int, double>>);
     static_assert(std::is_same_v<decltype(fc), oneapi::tbb::filter<int, double>>);
 }
-#endif  //__TBB_CPP17_DEDUCTION_GUIDES_PRESENT
+#endif//__TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 
 #if __TBB_CPP17_INVOKE_PRESENT
 
@@ -412,15 +384,16 @@ void test_pipeline_invoke_basic(const MiddleFilterBody& middle_body, const LastF
     std::size_t counter = 0;
 
     auto first_body = [&](oneapi::tbb::flow_control& fc) -> middle_filter_type {
-        if (++counter > input_count) {
-            fc.stop();
-        }
-        return middle_filter_type{output_filter_type{&signal_point}};
+        if (++counter > input_count) { fc.stop(); }
+        return middle_filter_type {output_filter_type {&signal_point}};
     };
 
-    auto first_filter = oneapi::tbb::make_filter<void, middle_filter_type>(oneapi::tbb::filter_mode::serial_in_order, first_body);
-    auto middle_filter = oneapi::tbb::make_filter<middle_filter_type, output_filter_type>(oneapi::tbb::filter_mode::serial_in_order, middle_body);
-    auto last_filter = oneapi::tbb::make_filter<output_filter_type, void>(oneapi::tbb::filter_mode::serial_in_order, last_body);
+    auto first_filter = oneapi::tbb::make_filter<void, middle_filter_type>(
+            oneapi::tbb::filter_mode::serial_in_order, first_body);
+    auto middle_filter = oneapi::tbb::make_filter<middle_filter_type, output_filter_type>(
+            oneapi::tbb::filter_mode::serial_in_order, middle_body);
+    auto last_filter = oneapi::tbb::make_filter<output_filter_type, void>(
+            oneapi::tbb::filter_mode::serial_in_order, last_body);
 
     oneapi::tbb::parallel_pipeline(16, first_filter & middle_filter & last_filter);
 
@@ -433,8 +406,11 @@ TEST_CASE("parallel_pipeline and std::invoke") {
     using output_filter_type = test_invoke::SmartID<std::size_t>;
     using middle_filter_type = test_invoke::SmartID<output_filter_type>;
 
-    test_pipeline_invoke_basic(&middle_filter_type::get_id, &output_filter_type::operate); // Pointer to non-static function as middle filter
-    test_pipeline_invoke_basic(&middle_filter_type::id, &output_filter_type::operate); // Pointer to non-static member as middle filter
+    test_pipeline_invoke_basic(
+            &middle_filter_type::get_id,
+            &output_filter_type::operate);// Pointer to non-static function as middle filter
+    test_pipeline_invoke_basic(&middle_filter_type::id,
+                               &output_filter_type::operate);// Pointer to non-static member as middle filter
 }
 
-#endif // __TBB_CPP17_INVOKE_PRESENT
+#endif// __TBB_CPP17_INVOKE_PRESENT
diff --git a/external/tbb/test/conformance/conformance_parallel_reduce.cpp b/external/tbb/test/conformance/conformance_parallel_reduce.cpp
index 0214bfd9..bfe60935 100644
--- a/external/tbb/test/conformance/conformance_parallel_reduce.cpp
+++ b/external/tbb/test/conformance/conformance_parallel_reduce.cpp
@@ -14,8 +14,8 @@
     limitations under the License.
 */
 
-#include "common/parallel_reduce_common.h"
 #include "common/concurrency_tracker.h"
+#include "common/parallel_reduce_common.h"
 #include "common/test_invoke.h"
 
 #include "../tbb/test_partitioner.h"
@@ -27,12 +27,8 @@
 class RotOp {
 public:
     using Type = int;
-    int operator() ( int x, int i ) const {
-        return ( x<<1 ) ^ i;
-    }
-    int join( int x, int y ) const {
-        return operator()( x, y );
-    }
+    int operator()(int x, int i) const { return (x << 1) ^ i; }
+    int join(int x, int y) const { return operator()(x, y); }
 };
 
 template <class Op>
@@ -41,17 +37,17 @@ struct ReduceBody {
     result_type my_value;
 
     ReduceBody() : my_value() {}
-    ReduceBody( ReduceBody &, oneapi::tbb::split ) : my_value() {}
+    ReduceBody(ReduceBody&, oneapi::tbb::split) : my_value() {}
 
-    void operator() ( const oneapi::tbb::blocked_range<int>& r ) {
+    void operator()(const oneapi::tbb::blocked_range<int>& r) {
         utils::ConcurrencyTracker ct;
-        for ( int i = r.begin(); i != r.end(); ++i ) {
+        for (int i = r.begin(); i != r.end(); ++i) {
             Op op;
             my_value = op(my_value, i);
         }
     }
 
-    void join( const ReduceBody& y ) {
+    void join(const ReduceBody& y) {
         Op op;
         my_value = op.join(my_value, y.my_value);
     }
@@ -70,9 +66,10 @@ class MoveOnlyWrapper {
     MoveOnlyWrapper& operator=(const MoveOnlyWrapper&) = delete;
 
     bool operator==(const MoveOnlyWrapper& other) const { return my_obj == other.my_obj; }
+
 private:
     T my_obj;
-}; // class MoveOnlyWrapper
+};// class MoveOnlyWrapper
 
 // The container wrapper that is copyable but the copy constructor fails if the source container is non-empty
 // If such an empty container is provided as an identity into parallel reduce algorithm with rvalue-friendly body,
@@ -108,7 +105,7 @@ class EmptyCopyList {
 
 private:
     std::list<T> my_list;
-}; // class EmptyCopyList
+};// class EmptyCopyList
 
 template <class Partitioner>
 void TestDeterministicReductionFor() {
@@ -119,37 +116,38 @@ void TestDeterministicReductionFor() {
 
     BodyType benchmark_body;
     deterministic_reduce_invoker(range, benchmark_body, Partitioner());
-    for ( int i=0; i<100; ++i ) {
+    for (int i = 0; i < 100; ++i) {
         BodyType measurement_body;
         deterministic_reduce_invoker(range, measurement_body, Partitioner());
-        REQUIRE_MESSAGE( benchmark_body.my_value == measurement_body.my_value,
-        "parallel_deterministic_reduce behaves differently from run to run" );
-
-        Type lambda_measurement_result = deterministic_reduce_invoker<Type>( range,
-            [](const oneapi::tbb::blocked_range<int>& br, Type value) -> Type {
-                utils::ConcurrencyTracker ct;
-                for ( int ii = br.begin(); ii != br.end(); ++ii ) {
+        REQUIRE_MESSAGE(benchmark_body.my_value == measurement_body.my_value,
+                        "parallel_deterministic_reduce behaves differently from run to run");
+
+        Type lambda_measurement_result = deterministic_reduce_invoker<Type>(
+                range,
+                [](const oneapi::tbb::blocked_range<int>& br, Type value) -> Type {
+                    utils::ConcurrencyTracker ct;
+                    for (int ii = br.begin(); ii != br.end(); ++ii) {
+                        RotOp op;
+                        value = op(value, ii);
+                    }
+                    return value;
+                },
+                [](const Type& v1, const Type& v2) -> Type {
                     RotOp op;
-                    value = op(value, ii);
-                }
-                return value;
-            },
-            [](const Type& v1, const Type& v2) -> Type {
-                RotOp op;
-                return op.join(v1,v2);
-            },
-            Partitioner()
-        );
-        REQUIRE_MESSAGE( benchmark_body.my_value == lambda_measurement_result,
-            "lambda-based parallel_deterministic_reduce behaves differently from run to run" );
+                    return op.join(v1, v2);
+                },
+                Partitioner());
+        REQUIRE_MESSAGE(benchmark_body.my_value == lambda_measurement_result,
+                        "lambda-based parallel_deterministic_reduce behaves differently from run to run");
     }
 }
 
 //! Test that deterministic reduction returns the same result during several measurements
 //! \brief \ref requirement \ref interface
 TEST_CASE("Test deterministic reduce correctness") {
-    for ( auto concurrency_level : utils::concurrency_range() ) {
-        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism, concurrency_level);
+    for (auto concurrency_level : utils::concurrency_range()) {
+        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism,
+                                            concurrency_level);
         TestDeterministicReductionFor<oneapi::tbb::simple_partitioner>();
         TestDeterministicReductionFor<oneapi::tbb::static_partitioner>();
         TestDeterministicReductionFor<utils_default_partitioner>();
@@ -160,8 +158,9 @@ TEST_CASE("Test deterministic reduce correctness") {
 //! \brief \ref requirement \ref interface
 TEST_CASE("Test partitioners interaction with various ranges") {
     using namespace test_partitioner_utils::interaction_with_range_and_partitioner;
-    for ( auto concurrency_level : utils::concurrency_range() ) {
-        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism, concurrency_level);
+    for (auto concurrency_level : utils::concurrency_range()) {
+        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism,
+                                            concurrency_level);
 
         test_partitioner_utils::SimpleReduceBody body;
         oneapi::tbb::affinity_partitioner ap;
@@ -169,19 +168,26 @@ TEST_CASE("Test partitioners interaction with various ranges") {
         parallel_reduce(Range1(/*assert_in_split*/ true, /*assert_in_proportional_split*/ false), body, ap);
         parallel_reduce(Range6(false, true), body, ap);
 
-        parallel_reduce(Range1(/*assert_in_split*/ true, /*assert_in_proportional_split*/ false), body, oneapi::tbb::static_partitioner());
+        parallel_reduce(Range1(/*assert_in_split*/ true, /*assert_in_proportional_split*/ false), body,
+                        oneapi::tbb::static_partitioner());
         parallel_reduce(Range6(false, true), body, oneapi::tbb::static_partitioner());
 
-        parallel_reduce(Range1(/*assert_in_split*/ false, /*assert_in_proportional_split*/ true), body, oneapi::tbb::simple_partitioner());
+        parallel_reduce(Range1(/*assert_in_split*/ false, /*assert_in_proportional_split*/ true), body,
+                        oneapi::tbb::simple_partitioner());
         parallel_reduce(Range6(false, true), body, oneapi::tbb::simple_partitioner());
 
-        parallel_reduce(Range1(/*assert_in_split*/ false, /*assert_in_proportional_split*/ true), body, oneapi::tbb::auto_partitioner());
+        parallel_reduce(Range1(/*assert_in_split*/ false, /*assert_in_proportional_split*/ true), body,
+                        oneapi::tbb::auto_partitioner());
         parallel_reduce(Range6(false, true), body, oneapi::tbb::auto_partitioner());
 
-        parallel_deterministic_reduce(Range1(/*assert_in_split*/true, /*assert_in_proportional_split*/ false), body, oneapi::tbb::static_partitioner());
+        parallel_deterministic_reduce(
+                Range1(/*assert_in_split*/ true, /*assert_in_proportional_split*/ false), body,
+                oneapi::tbb::static_partitioner());
         parallel_deterministic_reduce(Range6(false, true), body, oneapi::tbb::static_partitioner());
 
-        parallel_deterministic_reduce(Range1(/*assert_in_split*/false, /*assert_in_proportional_split*/ true), body, oneapi::tbb::simple_partitioner());
+        parallel_deterministic_reduce(
+                Range1(/*assert_in_split*/ false, /*assert_in_proportional_split*/ true), body,
+                oneapi::tbb::simple_partitioner());
         parallel_deterministic_reduce(Range6(false, true), body, oneapi::tbb::simple_partitioner());
     }
 }
@@ -197,32 +203,44 @@ void test_preduce_invoke_basic(const Body& body, const Reduction& reduction) {
     test_invoke::SmartValue identity(0);
 
     CHECK(result == oneapi::tbb::parallel_reduce(range, identity, body, reduction).get());
-    CHECK(result == oneapi::tbb::parallel_reduce(range, identity, body, reduction, oneapi::tbb::simple_partitioner()).get());
-    CHECK(result == oneapi::tbb::parallel_reduce(range, identity, body, reduction, oneapi::tbb::auto_partitioner()).get());
-    CHECK(result == oneapi::tbb::parallel_reduce(range, identity, body, reduction, oneapi::tbb::static_partitioner()).get());
+    CHECK(result
+          == oneapi::tbb::parallel_reduce(range, identity, body, reduction, oneapi::tbb::simple_partitioner())
+                     .get());
+    CHECK(result
+          == oneapi::tbb::parallel_reduce(range, identity, body, reduction, oneapi::tbb::auto_partitioner())
+                     .get());
+    CHECK(result
+          == oneapi::tbb::parallel_reduce(range, identity, body, reduction, oneapi::tbb::static_partitioner())
+                     .get());
     oneapi::tbb::affinity_partitioner aff;
     CHECK(result == oneapi::tbb::parallel_reduce(range, identity, body, reduction, aff).get());
 
     CHECK(result == oneapi::tbb::parallel_deterministic_reduce(range, identity, body, reduction).get());
-    CHECK(result == oneapi::tbb::parallel_deterministic_reduce(range, identity, body, reduction, oneapi::tbb::simple_partitioner()).get());
-    CHECK(result == oneapi::tbb::parallel_deterministic_reduce(range, identity, body, reduction, oneapi::tbb::static_partitioner()).get());
+    CHECK(result
+          == oneapi::tbb::parallel_deterministic_reduce(range, identity, body, reduction,
+                                                        oneapi::tbb::simple_partitioner())
+                     .get());
+    CHECK(result
+          == oneapi::tbb::parallel_deterministic_reduce(range, identity, body, reduction,
+                                                        oneapi::tbb::static_partitioner())
+                     .get());
 }
 
 //! Test that parallel_reduce uses std::invoke to run the body
 //! \brief \ref interface \ref requirement
 TEST_CASE("parallel_[deterministic_]reduce and std::invoke") {
-    auto regular_reduce = [](const test_invoke::SmartRange<test_invoke::SmartValue>& range, const test_invoke::SmartValue& idx) {
+    auto regular_reduce = [](const test_invoke::SmartRange<test_invoke::SmartValue>& range,
+                             const test_invoke::SmartValue& idx) {
         test_invoke::SmartValue result = idx;
-        for (auto i = range.begin(); i.get() != range.end().get(); ++i) {
-            result = result + i;
-        }
+        for (auto i = range.begin(); i.get() != range.end().get(); ++i) { result = result + i; }
         return result;
     };
     auto regular_join = [](const test_invoke::SmartValue& lhs, const test_invoke::SmartValue& rhs) {
         return lhs + rhs;
     };
 
-    test_preduce_invoke_basic(&test_invoke::SmartRange<test_invoke::SmartValue>::reduction, &test_invoke::SmartValue::operator+);
+    test_preduce_invoke_basic(&test_invoke::SmartRange<test_invoke::SmartValue>::reduction,
+                              &test_invoke::SmartValue::operator+);
     test_preduce_invoke_basic(&test_invoke::SmartRange<test_invoke::SmartValue>::reduction, regular_join);
     test_preduce_invoke_basic(regular_reduce, &test_invoke::SmartValue::operator+);
 }
@@ -243,11 +261,11 @@ void test_vector_of_lists_rvalue_reduce_basic(const Runner& runner, PartitionerC
     for (std::size_t i = 0; i < n_vectors; ++i) {
         list_type list;
 
-        list.insert(list.end(), inner_type{1});
-        list.insert(list.end(), inner_type{2});
-        list.insert(list.end(), inner_type{3});
-        list.insert(list.end(), inner_type{4});
-        list.insert(list.end(), inner_type{5});
+        list.insert(list.end(), inner_type {1});
+        list.insert(list.end(), inner_type {2});
+        list.insert(list.end(), inner_type {3});
+        list.insert(list.end(), inner_type {4});
+        list.insert(list.end(), inner_type {5});
         vector_of_lists.emplace_back(std::move(list));
     }
 
@@ -269,16 +287,17 @@ void test_vector_of_lists_rvalue_reduce_basic(const Runner& runner, PartitionerC
         return new_list;
     };
 
-    list_type result = runner(range, list_type{}, reduce_body, join_body, std::forward<PartitionerContext>(args)...);
+    list_type result
+            = runner(range, list_type {}, reduce_body, join_body, std::forward<PartitionerContext>(args)...);
 
     list_type expected_result;
 
     for (std::size_t i = 0; i < n_vectors; ++i) {
-        expected_result.insert(expected_result.end(), inner_type{1});
-        expected_result.insert(expected_result.end(), inner_type{2});
-        expected_result.insert(expected_result.end(), inner_type{3});
-        expected_result.insert(expected_result.end(), inner_type{4});
-        expected_result.insert(expected_result.end(), inner_type{5});
+        expected_result.insert(expected_result.end(), inner_type {1});
+        expected_result.insert(expected_result.end(), inner_type {2});
+        expected_result.insert(expected_result.end(), inner_type {3});
+        expected_result.insert(expected_result.end(), inner_type {4});
+        expected_result.insert(expected_result.end(), inner_type {5});
     }
 
     REQUIRE_MESSAGE(expected_result == result, "Incorrect reduce result");
@@ -286,14 +305,16 @@ void test_vector_of_lists_rvalue_reduce_basic(const Runner& runner, PartitionerC
 
 struct ReduceRunner {
     template <typename... Args>
-    auto operator()(Args&&... args) const -> decltype(oneapi::tbb::parallel_reduce(std::forward<Args>(args)...)) {
+    auto operator()(Args&&... args) const
+            -> decltype(oneapi::tbb::parallel_reduce(std::forward<Args>(args)...)) {
         return oneapi::tbb::parallel_reduce(std::forward<Args>(args)...);
     }
 };
 
 struct DeterministicReduceRunner {
     template <typename... Args>
-    auto operator()(Args&&... args) const -> decltype(oneapi::tbb::parallel_deterministic_reduce(std::forward<Args>(args)...)) {
+    auto operator()(Args&&... args) const
+            -> decltype(oneapi::tbb::parallel_deterministic_reduce(std::forward<Args>(args)...)) {
         return oneapi::tbb::parallel_deterministic_reduce(std::forward<Args>(args)...);
     }
 };
@@ -304,15 +325,15 @@ void test_vector_of_lists_rvalue_reduce() {
     oneapi::tbb::task_group_context context;
 
     test_vector_of_lists_rvalue_reduce_basic(runner);
-    test_vector_of_lists_rvalue_reduce_basic(runner, oneapi::tbb::auto_partitioner{});
-    test_vector_of_lists_rvalue_reduce_basic(runner, oneapi::tbb::simple_partitioner{});
-    test_vector_of_lists_rvalue_reduce_basic(runner, oneapi::tbb::static_partitioner{});
+    test_vector_of_lists_rvalue_reduce_basic(runner, oneapi::tbb::auto_partitioner {});
+    test_vector_of_lists_rvalue_reduce_basic(runner, oneapi::tbb::simple_partitioner {});
+    test_vector_of_lists_rvalue_reduce_basic(runner, oneapi::tbb::static_partitioner {});
     test_vector_of_lists_rvalue_reduce_basic(runner, af_partitioner);
 
     test_vector_of_lists_rvalue_reduce_basic(runner, context);
-    test_vector_of_lists_rvalue_reduce_basic(runner, oneapi::tbb::auto_partitioner{}, context);
-    test_vector_of_lists_rvalue_reduce_basic(runner, oneapi::tbb::simple_partitioner{}, context);
-    test_vector_of_lists_rvalue_reduce_basic(runner, oneapi::tbb::static_partitioner{}, context);
+    test_vector_of_lists_rvalue_reduce_basic(runner, oneapi::tbb::auto_partitioner {}, context);
+    test_vector_of_lists_rvalue_reduce_basic(runner, oneapi::tbb::simple_partitioner {}, context);
+    test_vector_of_lists_rvalue_reduce_basic(runner, oneapi::tbb::static_partitioner {}, context);
     test_vector_of_lists_rvalue_reduce_basic(runner, af_partitioner, context);
 }
 
@@ -321,12 +342,12 @@ void test_vector_of_lists_rvalue_deterministic_reduce() {
     oneapi::tbb::task_group_context context;
 
     test_vector_of_lists_rvalue_reduce_basic(runner);
-    test_vector_of_lists_rvalue_reduce_basic(runner, oneapi::tbb::simple_partitioner{});
-    test_vector_of_lists_rvalue_reduce_basic(runner, oneapi::tbb::static_partitioner{});
+    test_vector_of_lists_rvalue_reduce_basic(runner, oneapi::tbb::simple_partitioner {});
+    test_vector_of_lists_rvalue_reduce_basic(runner, oneapi::tbb::static_partitioner {});
 
     test_vector_of_lists_rvalue_reduce_basic(runner, context);
-    test_vector_of_lists_rvalue_reduce_basic(runner, oneapi::tbb::simple_partitioner{}, context);
-    test_vector_of_lists_rvalue_reduce_basic(runner, oneapi::tbb::static_partitioner{}, context);
+    test_vector_of_lists_rvalue_reduce_basic(runner, oneapi::tbb::simple_partitioner {}, context);
+    test_vector_of_lists_rvalue_reduce_basic(runner, oneapi::tbb::static_partitioner {}, context);
 }
 
 //! \brief \ref interface \ref requirement
diff --git a/external/tbb/test/conformance/conformance_parallel_scan.cpp b/external/tbb/test/conformance/conformance_parallel_scan.cpp
index 5876746b..7a385865 100644
--- a/external/tbb/test/conformance/conformance_parallel_scan.cpp
+++ b/external/tbb/test/conformance/conformance_parallel_scan.cpp
@@ -15,7 +15,7 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
 #endif
 
 #define DOCTEST_CONFIG_SUPER_FAST_ASSERTS
@@ -31,69 +31,69 @@
 
 constexpr std::size_t size = 1000;
 
-template<typename T, typename Op>
+template <typename T, typename Op>
 class Body {
     const T identity;
     T sum;
     std::vector<T>& y;
     const std::vector<T>& z;
+
 public:
-    Body( const std::vector<T>& z_, std::vector<T>& y_, T id ) : identity(id), sum(id), y(y_), z(z_) {}
+    Body(const std::vector<T>& z_, std::vector<T>& y_, T id) : identity(id), sum(id), y(y_), z(z_) {}
     T get_sum() const { return sum; }
 
-    template<typename Tag>
-    void operator()( const oneapi::tbb::blocked_range<std::size_t>& r, Tag ) {
+    template <typename Tag>
+    void operator()(const oneapi::tbb::blocked_range<std::size_t>& r, Tag) {
         T temp = sum;
-        for(std::size_t i=r.begin(); i<r.end(); ++i ) {
+        for (std::size_t i = r.begin(); i < r.end(); ++i) {
             temp = Op()(temp, z[i]);
-            if( Tag::is_final_scan() )
-                y[i] = temp;
+            if (Tag::is_final_scan()) y[i] = temp;
         }
         sum = temp;
     }
-    Body( Body& b, oneapi::tbb::split ): identity(b.identity), sum(b.identity), y(b.y), z(b.z) {}
-    void reverse_join( Body& a ) { sum = Op()(a.sum, sum); }
-    void assign( Body& b ) { sum = b.sum; }
+    Body(Body& b, oneapi::tbb::split) : identity(b.identity), sum(b.identity), y(b.y), z(b.z) {}
+    void reverse_join(Body& a) { sum = Op()(a.sum, sum); }
+    void assign(Body& b) { sum = b.sum; }
 };
 
-class default_partitioner_tag{};
+class default_partitioner_tag {};
 
-template<typename Partitioner>
-struct parallel_scan_wrapper{
-    template<typename... Args>
+template <typename Partitioner>
+struct parallel_scan_wrapper {
+    template <typename... Args>
     void operator()(Args&&... args) {
-    oneapi::tbb::parallel_scan(std::forward<Args>(args)..., Partitioner());
+        oneapi::tbb::parallel_scan(std::forward<Args>(args)..., Partitioner());
     }
 };
 
-template<>
-struct parallel_scan_wrapper<default_partitioner_tag>{
-    template<typename... Args>
+template <>
+struct parallel_scan_wrapper<default_partitioner_tag> {
+    template <typename... Args>
     void operator()(Args&&... args) {
-    oneapi::tbb::parallel_scan(std::forward<Args>(args)...);
+        oneapi::tbb::parallel_scan(std::forward<Args>(args)...);
     }
 };
 
 // Test scan tag
 //! \brief \ref interface
 TEST_CASE("scan tags testing") {
-    CHECK(oneapi::tbb::pre_scan_tag::is_final_scan()==false);
-    CHECK(oneapi::tbb::final_scan_tag::is_final_scan()==true);
-    CHECK((bool)oneapi::tbb::pre_scan_tag()==false);
-    CHECK((bool)oneapi::tbb::final_scan_tag()==true);
+    CHECK(oneapi::tbb::pre_scan_tag::is_final_scan() == false);
+    CHECK(oneapi::tbb::final_scan_tag::is_final_scan() == true);
+    CHECK((bool) oneapi::tbb::pre_scan_tag() == false);
+    CHECK((bool) oneapi::tbb::final_scan_tag() == true);
 }
 
 //! Test parallel prefix sum calculation for body-based interface
 //! \brief \ref requirement \ref interface
-TEST_CASE_TEMPLATE("Test parallel scan with body", Partitioner, default_partitioner_tag, oneapi::tbb::simple_partitioner, oneapi::tbb::auto_partitioner) {
+TEST_CASE_TEMPLATE("Test parallel scan with body", Partitioner, default_partitioner_tag,
+                   oneapi::tbb::simple_partitioner, oneapi::tbb::auto_partitioner) {
     std::vector<int> input(size);
     std::vector<int> output(size);
     std::vector<int> control(size);
 
-    for(size_t i = 0; i < size; ++i) {
+    for (size_t i = 0; i < size; ++i) {
         input[i] = int(i / 2);
-        if(i)
-            control[i] = control[i-1] + input[i];
+        if (i) control[i] = control[i - 1] + input[i];
         else
             control[i] = input[i];
     }
@@ -102,45 +102,40 @@ TEST_CASE_TEMPLATE("Test parallel scan with body", Partitioner, default_partitio
     CHECK((control == output));
 }
 
-
 //! Test parallel prefix sum calculation for scan-based interface
 //! \brief \ref requirement \ref interface
-TEST_CASE_TEMPLATE("Test parallel scan with body", Partitioner, default_partitioner_tag, oneapi::tbb::simple_partitioner, oneapi::tbb::auto_partitioner) {
+TEST_CASE_TEMPLATE("Test parallel scan with body", Partitioner, default_partitioner_tag,
+                   oneapi::tbb::simple_partitioner, oneapi::tbb::auto_partitioner) {
     std::vector<std::size_t> input(size);
     std::vector<std::size_t> output(size);
     std::vector<std::size_t> control(size);
 
-    for (std::size_t i = 0; i<size; ++i) {
+    for (std::size_t i = 0; i < size; ++i) {
         input[i] = i;
-        if (i)
-            control[i] = control[i-1]+input[i];
+        if (i) control[i] = control[i - 1] + input[i];
         else
             control[i] = input[i];
     }
-    parallel_scan_wrapper<Partitioner>()(oneapi::tbb::blocked_range<std::size_t>(0U, size, 1U), std::size_t(0),
-        [&](const oneapi::tbb::blocked_range<std::size_t>& r, std::size_t sum, bool is_final) -> std::size_t
-        {
-            std::size_t temp = sum;
-            for (std::size_t i = r.begin(); i<r.end(); ++i) {
-                temp = temp + input[i];
-                if (is_final)
-                    output[i] = temp;
-            }
-            return temp;
-        },
-        [](std::size_t a, std::size_t b) -> std::size_t
-        {
-            return a + b;
-        });
-
-    CHECK((control==output));
+    parallel_scan_wrapper<Partitioner>()(
+            oneapi::tbb::blocked_range<std::size_t>(0U, size, 1U), std::size_t(0),
+            [&](const oneapi::tbb::blocked_range<std::size_t>& r, std::size_t sum,
+                bool is_final) -> std::size_t {
+                std::size_t temp = sum;
+                for (std::size_t i = r.begin(); i < r.end(); ++i) {
+                    temp = temp + input[i];
+                    if (is_final) output[i] = temp;
+                }
+                return temp;
+            },
+            [](std::size_t a, std::size_t b) -> std::size_t { return a + b; });
+
+    CHECK((control == output));
 }
 
 #if __TBB_CPP17_INVOKE_PRESENT
 template <typename... Args>
 void test_pscan_invoke(const std::vector<std::size_t>& desired_vector,
-                       std::vector<std::size_t>& result_vector,
-                       Args&&... args) {
+                       std::vector<std::size_t>& result_vector, Args&&... args) {
     auto result = oneapi::tbb::parallel_scan(std::forward<Args>(args)...);
     CHECK(desired_vector == result_vector);
     CHECK(result.get() == result_vector.back());
@@ -154,9 +149,7 @@ TEST_CASE("parallel_scan and std::invoke") {
     const std::size_t iterations = 1000000;
     std::vector<std::size_t> desired_vector(iterations);
 
-    for (std::size_t i = 1; i < iterations; ++i) {
-        desired_vector[i] = desired_vector[i - 1] + i;
-    }
+    for (std::size_t i = 1; i < iterations; ++i) { desired_vector[i] = desired_vector[i - 1] + i; }
 
     std::vector<std::size_t> change_vector(iterations, 0);
     test_invoke::SmartRange<test_invoke::SmartValue> range(0, iterations, change_vector);
@@ -166,8 +159,10 @@ TEST_CASE("parallel_scan and std::invoke") {
     auto combine = &test_invoke::SmartValue::operator+;
 
     test_pscan_invoke(desired_vector, change_vector, range, identity, scan, combine);
-    test_pscan_invoke(desired_vector, change_vector, range, identity, scan, combine, oneapi::tbb::auto_partitioner());
-    test_pscan_invoke(desired_vector, change_vector, range, identity, scan, combine, oneapi::tbb::simple_partitioner());
+    test_pscan_invoke(desired_vector, change_vector, range, identity, scan, combine,
+                      oneapi::tbb::auto_partitioner());
+    test_pscan_invoke(desired_vector, change_vector, range, identity, scan, combine,
+                      oneapi::tbb::simple_partitioner());
 }
 
-#endif // __TBB_CPP17_INVOKE_PRESENT
+#endif// __TBB_CPP17_INVOKE_PRESENT
diff --git a/external/tbb/test/conformance/conformance_parallel_sort.cpp b/external/tbb/test/conformance/conformance_parallel_sort.cpp
index 923aabfb..83c20e0d 100644
--- a/external/tbb/test/conformance/conformance_parallel_sort.cpp
+++ b/external/tbb/test/conformance/conformance_parallel_sort.cpp
@@ -17,8 +17,8 @@
 #include "common/test.h"
 #include "common/utils_concurrency_limit.h"
 
-#include "oneapi/tbb/parallel_sort.h"
 #include "oneapi/tbb/global_control.h"
+#include "oneapi/tbb/parallel_sort.h"
 
 #include <vector>
 
@@ -29,63 +29,66 @@ const int vector_size = 10000;
 
 std::vector<int> get_random_vector() {
     std::vector<int> result(vector_size);
-    for (int i = 0; i < vector_size; ++i)
-        result[i] = rand() % vector_size;
+    for (int i = 0; i < vector_size; ++i) result[i] = rand() % vector_size;
     return result;
 }
 
 //! Iterator based range sorting test (default comparator)
 //! \brief \ref requirement \ref interface
 TEST_CASE("Iterator based range sorting test (default comparator)") {
-    for ( auto concurrency_level : utils::concurrency_range() ) {
-        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism, concurrency_level);
+    for (auto concurrency_level : utils::concurrency_range()) {
+        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism,
+                                            concurrency_level);
 
         auto test_vector = get_random_vector();
         oneapi::tbb::parallel_sort(test_vector.begin(), test_vector.end());
 
-        for(auto it = test_vector.begin(); it != test_vector.end() - 1; ++it)
-            REQUIRE_MESSAGE(*it <= *(it+1), "Testing data not sorted");
+        for (auto it = test_vector.begin(); it != test_vector.end() - 1; ++it)
+            REQUIRE_MESSAGE(*it <= *(it + 1), "Testing data not sorted");
     }
 }
 
 //! Iterator based range sorting test (greater comparator)
 //! \brief \ref requirement \ref interface
-TEST_CASE ("Iterator based range sorting test (greater comparator)") {
-    for ( auto concurrency_level : utils::concurrency_range() ) {
-        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism, concurrency_level);
+TEST_CASE("Iterator based range sorting test (greater comparator)") {
+    for (auto concurrency_level : utils::concurrency_range()) {
+        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism,
+                                            concurrency_level);
 
         auto test_vector = get_random_vector();
         oneapi::tbb::parallel_sort(test_vector.begin(), test_vector.end(), std::greater<int>());
 
-        for(auto it = test_vector.begin(); it != test_vector.end() - 1; ++it)
-            REQUIRE_MESSAGE(*it >= *(it+1), "Testing data not sorted");
+        for (auto it = test_vector.begin(); it != test_vector.end() - 1; ++it)
+            REQUIRE_MESSAGE(*it >= *(it + 1), "Testing data not sorted");
     }
 }
 
 //! Range sorting test (default comparator)
 //! \brief \ref requirement \ref interface
-TEST_CASE ("Range sorting test (default comparator)") {
-    for ( auto concurrency_level : utils::concurrency_range() ) {
-        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism, concurrency_level);
+TEST_CASE("Range sorting test (default comparator)") {
+    for (auto concurrency_level : utils::concurrency_range()) {
+        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism,
+                                            concurrency_level);
 
         auto test_vector = get_random_vector();
         oneapi::tbb::parallel_sort(test_vector);
 
-        for(auto it = test_vector.begin(); it != test_vector.end() - 1; ++it)
-            REQUIRE_MESSAGE(*it <= *(it+1), "Testing data not sorted");
+        for (auto it = test_vector.begin(); it != test_vector.end() - 1; ++it)
+            REQUIRE_MESSAGE(*it <= *(it + 1), "Testing data not sorted");
     }
 }
 
 //! Range sorting test (greater comparator)
 //! \brief \ref requirement \ref interface
-TEST_CASE ("Range sorting test (greater comparator)") {
-    for ( auto concurrency_level : utils::concurrency_range() ) {
-        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism, concurrency_level);
+TEST_CASE("Range sorting test (greater comparator)") {
+    for (auto concurrency_level : utils::concurrency_range()) {
+        oneapi::tbb::global_control control(oneapi::tbb::global_control::max_allowed_parallelism,
+                                            concurrency_level);
 
         auto test_vector = get_random_vector();
         oneapi::tbb::parallel_sort(test_vector, std::greater<int>());
 
-        for(auto it = test_vector.begin(); it != test_vector.end() - 1; ++it)
-            REQUIRE_MESSAGE(*it >= *(it+1), "Testing data not sorted");
+        for (auto it = test_vector.begin(); it != test_vector.end() - 1; ++it)
+            REQUIRE_MESSAGE(*it >= *(it + 1), "Testing data not sorted");
     }
 }
diff --git a/external/tbb/test/conformance/conformance_priority_queue_node.cpp b/external/tbb/test/conformance/conformance_priority_queue_node.cpp
index 4e014a2b..1a05e34c 100644
--- a/external/tbb/test/conformance/conformance_priority_queue_node.cpp
+++ b/external/tbb/test/conformance/conformance_priority_queue_node.cpp
@@ -15,7 +15,7 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
 #endif
 
 #define CONFORMANCE_BUFFERING_NODES
@@ -28,33 +28,33 @@
 
 //! Test priority_queue_node single_push
 //! \brief \ref requirement
-TEST_CASE("priority_queue_node single_push"){
+TEST_CASE("priority_queue_node single_push") {
     conformance::test_forwarding_single_push<oneapi::tbb::flow::priority_queue_node<int>>();
 }
 
 //! Test function_node buffering
 //! \brief \ref requirement
-TEST_CASE("priority_queue_node buffering"){
+TEST_CASE("priority_queue_node buffering") {
     conformance::test_buffering<oneapi::tbb::flow::priority_queue_node<int>, int>();
 }
 
 //! Constructs an empty priority_queue_node that belongs to the same graph g as src.
 //! Any intermediate state of src, including its links to predecessors and successors, is not copied.
 //! \brief \ref requirement
-TEST_CASE("priority_queue_node copy constructor"){
+TEST_CASE("priority_queue_node copy constructor") {
     conformance::test_copy_ctor_for_buffering_nodes<oneapi::tbb::flow::priority_queue_node<int>>();
 }
 
 //! Test inheritance relations
 //! \brief \ref interface
-TEST_CASE("priority_queue_node superclasses"){
+TEST_CASE("priority_queue_node superclasses") {
     conformance::test_inheritance<oneapi::tbb::flow::priority_queue_node<int>, int, int>();
     conformance::test_inheritance<oneapi::tbb::flow::priority_queue_node<void*>, void*, void*>();
 }
 
 //! Test priority_queue_node node `try_put()` and `try_get()`
 //! \brief \ref requirement
-TEST_CASE("priority_queue_node methods"){
+TEST_CASE("priority_queue_node methods") {
     oneapi::tbb::flow::graph g;
 
     oneapi::tbb::flow::priority_queue_node<int, std::greater<int>> testing_node(g);
diff --git a/external/tbb/test/conformance/conformance_queue_node.cpp b/external/tbb/test/conformance/conformance_queue_node.cpp
index 7d4d4ecd..e9d4be45 100644
--- a/external/tbb/test/conformance/conformance_queue_node.cpp
+++ b/external/tbb/test/conformance/conformance_queue_node.cpp
@@ -15,7 +15,7 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
 #endif
 
 #define CONFORMANCE_BUFFERING_NODES
@@ -28,40 +28,39 @@
 
 //! Test queue_node single_push
 //! \brief \ref requirement
-TEST_CASE("queue_node single_push"){
+TEST_CASE("queue_node single_push") {
     conformance::test_forwarding_single_push<oneapi::tbb::flow::queue_node<int>>();
 }
 
 //! Test function_node buffering
 //! \brief \ref requirement
-TEST_CASE("queue_node buffering"){
-    conformance::test_buffering<oneapi::tbb::flow::queue_node<int>, int>();
-}
+TEST_CASE("queue_node buffering") { conformance::test_buffering<oneapi::tbb::flow::queue_node<int>, int>(); }
 
 //! Constructs an empty queue_node that belongs to the same graph g as src.
 //! Any intermediate state of src, including its links to predecessors and successors, is not copied.
 //! \brief \ref requirement
-TEST_CASE("queue_node copy constructor"){
+TEST_CASE("queue_node copy constructor") {
     conformance::test_copy_ctor_for_buffering_nodes<oneapi::tbb::flow::queue_node<int>>();
 }
 
 //! Test inheritance relations
 //! \brief \ref interface
-TEST_CASE("queue_node superclasses"){
+TEST_CASE("queue_node superclasses") {
     conformance::test_inheritance<oneapi::tbb::flow::queue_node<int>, int, int>();
     conformance::test_inheritance<oneapi::tbb::flow::queue_node<void*>, void*, void*>();
 }
 
 //! Test queue_node node `try_put()` and `try_get()`
 //! \brief \ref requirement
-TEST_CASE("queue_node methods"){
+TEST_CASE("queue_node methods") {
     oneapi::tbb::flow::graph g;
     oneapi::tbb::flow::queue_node<int> testing_node(g);
 
     int tmp1 = -1;
     int tmp2 = -1;
 
-    CHECK_MESSAGE((!testing_node.try_get(tmp1) && tmp1 == -1), "`try_get` must returns false if there is no non-reserved item currently in the node.");
+    CHECK_MESSAGE((!testing_node.try_get(tmp1) && tmp1 == -1),
+                  "`try_get` must returns false if there is no non-reserved item currently in the node.");
 
     testing_node.try_put(1);
     testing_node.try_put(2);
diff --git a/external/tbb/test/conformance/conformance_resumable_tasks.cpp b/external/tbb/test/conformance/conformance_resumable_tasks.cpp
index 70fd878d..0f6c914e 100644
--- a/external/tbb/test/conformance/conformance_resumable_tasks.cpp
+++ b/external/tbb/test/conformance/conformance_resumable_tasks.cpp
@@ -54,7 +54,7 @@ TEST_CASE("Parallel test") {
     CHECK(!mLocal);
     mLocal = true;
     constexpr int N = 100;
-    std::atomic<int> suspend{}, resume{};
+    std::atomic<int> suspend {}, resume {};
     oneapi::tbb::task_group tg;
     for (int i = 0; i < N; ++i) {
         tg.run([&tg, &suspend, &resume] {
diff --git a/external/tbb/test/conformance/conformance_sequencer_node.cpp b/external/tbb/test/conformance/conformance_sequencer_node.cpp
index a28fa9e5..a2a0f5e7 100644
--- a/external/tbb/test/conformance/conformance_sequencer_node.cpp
+++ b/external/tbb/test/conformance/conformance_sequencer_node.cpp
@@ -15,18 +15,17 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
 #endif
 
 #define SEQUENCER_NODE
 
-#include "conformance_flowgraph.h"
 #include "common/test_invoke.h"
+#include "conformance_flowgraph.h"
 
 //! \file conformance_sequencer_node.cpp
 //! \brief Test for [flow_graph.sequencer_node] specification
 
-
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 template <typename Body>
 void test_deduction_guides_common(Body body) {
@@ -49,15 +48,15 @@ void test_deduction_guides_common(Body body) {
 std::size_t sequencer_body_f(const int&) { return 1; }
 
 void test_deduction_guides() {
-    test_deduction_guides_common([](const int&)->std::size_t { return 1; });
-    test_deduction_guides_common([](const int&) mutable ->std::size_t { return 1; });
+    test_deduction_guides_common([](const int&) -> std::size_t { return 1; });
+    test_deduction_guides_common([](const int&) mutable -> std::size_t { return 1; });
     test_deduction_guides_common(sequencer_body_f);
 }
 #endif
 
 //! Test deduction guides
 //! \brief \ref interface \ref requirement
-TEST_CASE("Deduction guides"){
+TEST_CASE("Deduction guides") {
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
     test_deduction_guides();
 #endif
@@ -65,14 +64,14 @@ TEST_CASE("Deduction guides"){
 
 //! Test sequencer_node single_push
 //! \brief \ref requirement
-TEST_CASE("sequencer_node single_push"){
+TEST_CASE("sequencer_node single_push") {
     conformance::sequencer_functor<int> sequencer;
     conformance::test_forwarding_single_push<oneapi::tbb::flow::sequencer_node<int>>(sequencer);
 }
 
 //! Test function_node buffering
 //! \brief \ref requirement
-TEST_CASE("sequencer_node buffering"){
+TEST_CASE("sequencer_node buffering") {
     conformance::sequencer_functor<int> sequencer;
     conformance::test_buffering<oneapi::tbb::flow::sequencer_node<int>, int>(sequencer);
 }
@@ -80,21 +79,21 @@ TEST_CASE("sequencer_node buffering"){
 //! Constructs an empty sequencer_node that belongs to the same graph g as src.
 //! Any intermediate state of src, including its links to predecessors and successors, is not copied.
 //! \brief \ref requirement
-TEST_CASE("sequencer_node copy constructor"){
+TEST_CASE("sequencer_node copy constructor") {
     conformance::sequencer_functor<int> sequencer;
     conformance::test_copy_ctor_for_buffering_nodes<oneapi::tbb::flow::sequencer_node<int>>(sequencer);
 }
 
 //! Test inheritance relations
 //! \brief \ref interface
-TEST_CASE("sequencer_node superclasses"){
+TEST_CASE("sequencer_node superclasses") {
     conformance::test_inheritance<oneapi::tbb::flow::sequencer_node<int>, int, int>();
     conformance::test_inheritance<oneapi::tbb::flow::sequencer_node<void*>, void*, void*>();
 }
 
 //! Test the sequencer_node rejects duplicate sequencer numbers
 //! \brief \ref interface
-TEST_CASE("sequencer_node rejects duplicate"){
+TEST_CASE("sequencer_node rejects duplicate") {
     oneapi::tbb::flow::graph g;
     conformance::sequencer_functor<int> sequencer;
 
@@ -108,7 +107,7 @@ TEST_CASE("sequencer_node rejects duplicate"){
 
 //! Test queue_node node `try_put()` and `try_get()`
 //! \brief \ref requirement
-TEST_CASE("queue_node methods"){
+TEST_CASE("queue_node methods") {
     oneapi::tbb::flow::graph g;
     conformance::sequencer_functor<int> sequencer;
 
@@ -134,22 +133,23 @@ TEST_CASE("queue_node methods"){
 //! The example demonstrates ordering capabilities of the sequencer_node.
 //! While being processed in parallel, the data is passed to the successor node in the exact same order it was read.
 //! \brief \ref requirement
-TEST_CASE("sequencer_node ordering"){
+TEST_CASE("sequencer_node ordering") {
     using namespace oneapi::tbb::flow;
     using message = conformance::sequencer_functor<int>::seq_message;
     graph g;
 
     // Due to parallelism the node can push messages to its successors in any order
-    function_node<message, message> process(g, unlimited, [] (message msg) {
+    function_node<message, message> process(g, unlimited, [](message msg) {
         msg.data++;
         return msg;
     });
 
     sequencer_node<message> ordering(g, conformance::sequencer_functor<int>());
 
-    std::atomic<std::size_t> counter{0};
-    function_node<message> writer(g, tbb::flow::serial, [&] (const message& msg) {
-        CHECK_MESSAGE((msg.id == counter++), "The data is passed to the successor node in the exact same order it was read");
+    std::atomic<std::size_t> counter {0};
+    function_node<message> writer(g, tbb::flow::serial, [&](const message& msg) {
+        CHECK_MESSAGE((msg.id == counter++),
+                      "The data is passed to the successor node in the exact same order it was read");
     });
 
     tbb::flow::make_edge(process, ordering);
@@ -171,26 +171,28 @@ TEST_CASE("sequencer_node and std::invoke") {
 
     graph g;
 
-    function_node<std::size_t, test_invoke::SmartID<std::size_t>> starter(g, unlimited, [](std::size_t x) { return test_invoke::SmartID(x); });
-    sequencer_node<test_invoke::SmartID<std::size_t>> seq1(g, &test_invoke::SmartID<std::size_t>::get_id); // Member function
-    sequencer_node<test_invoke::SmartID<std::size_t>> seq2(g, &test_invoke::SmartID<std::size_t>::id); // Member object
+    function_node<std::size_t, test_invoke::SmartID<std::size_t>> starter(
+            g, unlimited, [](std::size_t x) { return test_invoke::SmartID(x); });
+    sequencer_node<test_invoke::SmartID<std::size_t>> seq1(
+            g, &test_invoke::SmartID<std::size_t>::get_id);// Member function
+    sequencer_node<test_invoke::SmartID<std::size_t>> seq2(
+            g, &test_invoke::SmartID<std::size_t>::id);// Member object
 
     std::size_t expected_item = 0;
 
-    function_node<test_invoke::SmartID<std::size_t>, std::size_t> check(g, serial, [&](const test_invoke::SmartID<std::size_t>& x) {
-        CHECK(x.id == expected_item);
-        ++expected_item;
-        return x.id;
-    });
+    function_node<test_invoke::SmartID<std::size_t>, std::size_t> check(
+            g, serial, [&](const test_invoke::SmartID<std::size_t>& x) {
+                CHECK(x.id == expected_item);
+                ++expected_item;
+                return x.id;
+            });
 
     // Build the first graph
     make_edge(starter, seq1);
     make_edge(seq1, check);
 
     std::size_t objects_count = 10;
-    for (std::size_t i = 0; i < objects_count; ++i) {
-        starter.try_put(objects_count - i - 1);
-    }
+    for (std::size_t i = 0; i < objects_count; ++i) { starter.try_put(objects_count - i - 1); }
 
     g.wait_for_all();
 
@@ -202,13 +204,11 @@ TEST_CASE("sequencer_node and std::invoke") {
     make_edge(seq2, check);
     expected_item = 0;
 
-    for (std::size_t i = 0; i < objects_count; ++i) {
-        starter.try_put(objects_count - i - 1);
-    }
+    for (std::size_t i = 0; i < objects_count; ++i) { starter.try_put(objects_count - i - 1); }
 
     g.wait_for_all();
 
     CHECK(expected_item == objects_count);
 }
 
-#endif // __TBB_CPP17_INVOKE_PRESENT
+#endif// __TBB_CPP17_INVOKE_PRESENT
diff --git a/external/tbb/test/conformance/conformance_split_node.cpp b/external/tbb/test/conformance/conformance_split_node.cpp
index 83bb57f8..fa2cff53 100644
--- a/external/tbb/test/conformance/conformance_split_node.cpp
+++ b/external/tbb/test/conformance/conformance_split_node.cpp
@@ -15,7 +15,7 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
 #endif
 
 #include "conformance_flowgraph.h"
@@ -23,7 +23,8 @@
 //! \file conformance_split_node.cpp
 //! \brief Test for [flow_graph.split_node] specification
 
-using input_msg = conformance::message</*default_ctor*/true, /*copy_ctor*/true, /*copy_assign*/true/*enable for queue_node successor*/>;
+using input_msg = conformance::message</*default_ctor*/ true, /*copy_ctor*/ true,
+                                       /*copy_assign*/ true /*enable for queue_node successor*/>;
 using my_input_tuple = std::tuple<int, float, input_msg>;
 using my_split_type = oneapi::tbb::flow::split_node<my_input_tuple>;
 
@@ -34,9 +35,9 @@ TEST_CASE("split_node buffering") {
 
     my_split_type testing_node(g);
 
-    oneapi::tbb::flow::limiter_node<int> rejecter1(g,0);
-    oneapi::tbb::flow::limiter_node<float> rejecter2(g,0);
-    oneapi::tbb::flow::limiter_node<input_msg> rejecter3(g,0);
+    oneapi::tbb::flow::limiter_node<int> rejecter1(g, 0);
+    oneapi::tbb::flow::limiter_node<float> rejecter2(g, 0);
+    oneapi::tbb::flow::limiter_node<input_msg> rejecter3(g, 0);
 
     oneapi::tbb::flow::make_edge(oneapi::tbb::flow::output_port<0>(testing_node), rejecter1);
     oneapi::tbb::flow::make_edge(oneapi::tbb::flow::output_port<1>(testing_node), rejecter2);
@@ -49,17 +50,17 @@ TEST_CASE("split_node buffering") {
     int tmp1 = -1;
     float tmp2 = -1;
     input_msg tmp3(-1);
-    CHECK_MESSAGE((oneapi::tbb::flow::output_port<0>(testing_node).try_get(tmp1) == false 
-                    && tmp1 == -1), "Value should be discarded after rejection");
-    CHECK_MESSAGE((oneapi::tbb::flow::output_port<1>(testing_node).try_get(tmp2) == false 
-                    && tmp2 == -1.f), "Value should be discarded after rejection");
-    CHECK_MESSAGE((oneapi::tbb::flow::output_port<2>(testing_node).try_get(tmp3) == false 
-                    && tmp3 == -1), "Value should be discarded after rejection");
+    CHECK_MESSAGE((oneapi::tbb::flow::output_port<0>(testing_node).try_get(tmp1) == false && tmp1 == -1),
+                  "Value should be discarded after rejection");
+    CHECK_MESSAGE((oneapi::tbb::flow::output_port<1>(testing_node).try_get(tmp2) == false && tmp2 == -1.f),
+                  "Value should be discarded after rejection");
+    CHECK_MESSAGE((oneapi::tbb::flow::output_port<2>(testing_node).try_get(tmp3) == false && tmp3 == -1),
+                  "Value should be discarded after rejection");
 }
 
 //! Test node broadcast messages to successors and splitting them in correct order
 //! \brief \ref requirement
-TEST_CASE("split_node broadcast and splitting"){
+TEST_CASE("split_node broadcast and splitting") {
     using namespace oneapi::tbb::flow;
     oneapi::tbb::flow::graph g;
 
@@ -91,10 +92,10 @@ TEST_CASE("split_node broadcast and splitting"){
 //! The node that is constructed has a reference to the same graph object as src.
 //! The predecessors and successors of src are not copied.
 //! \brief \ref interface
-TEST_CASE("split_node copy constructor"){
+TEST_CASE("split_node copy constructor") {
     oneapi::tbb::flow::graph g;
-    oneapi::tbb::flow::continue_node<std::tuple<int>> node0( g,
-                                [](oneapi::tbb::flow::continue_msg) { return std::tuple<int>(1); } );
+    oneapi::tbb::flow::continue_node<std::tuple<int>> node0(
+            g, [](oneapi::tbb::flow::continue_msg) { return std::tuple<int>(1); });
 
     oneapi::tbb::flow::split_node<std::tuple<int>> node1(g);
     conformance::test_push_receiver<int> node2(g);
@@ -110,19 +111,23 @@ TEST_CASE("split_node copy constructor"){
     node_copy.try_put(std::tuple<int>(1));
     g.wait_for_all();
 
-    CHECK_MESSAGE((conformance::get_values(node2).size() == 0 && conformance::get_values(node3).size() == 1), "Copied node doesn`t copy successor");
+    CHECK_MESSAGE((conformance::get_values(node2).size() == 0 && conformance::get_values(node3).size() == 1),
+                  "Copied node doesn`t copy successor");
 
     node0.try_put(oneapi::tbb::flow::continue_msg());
     g.wait_for_all();
 
-    CHECK_MESSAGE((conformance::get_values(node2).size() == 1 && conformance::get_values(node3).size() == 0), "Copied node doesn`t copy predecessor");
+    CHECK_MESSAGE((conformance::get_values(node2).size() == 1 && conformance::get_values(node3).size() == 0),
+                  "Copied node doesn`t copy predecessor");
 }
 
 //! Test copy constructor
 //! \brief \ref interface
 TEST_CASE("split_node superclasses") {
-    CHECK_MESSAGE((std::is_base_of<oneapi::tbb::flow::graph_node, my_split_type>::value), "split_node should be derived from graph_node");
-    CHECK_MESSAGE((std::is_base_of<oneapi::tbb::flow::receiver<my_input_tuple>, my_split_type>::value), "split_node should be derived from receiver<T>");
+    CHECK_MESSAGE((std::is_base_of<oneapi::tbb::flow::graph_node, my_split_type>::value),
+                  "split_node should be derived from graph_node");
+    CHECK_MESSAGE((std::is_base_of<oneapi::tbb::flow::receiver<my_input_tuple>, my_split_type>::value),
+                  "split_node should be derived from receiver<T>");
 }
 
 //! Test split_node output_ports() returns a tuple of output ports.
@@ -131,6 +136,6 @@ TEST_CASE("split_node output_ports") {
     oneapi::tbb::flow::graph g;
     my_split_type node(g);
 
-    CHECK_MESSAGE((std::is_same<my_split_type::output_ports_type&,
-        decltype(node.output_ports())>::value), "split_node output_ports should returns a tuple of output ports");
+    CHECK_MESSAGE((std::is_same<my_split_type::output_ports_type&, decltype(node.output_ports())>::value),
+                  "split_node output_ports should returns a tuple of output ports");
 }
diff --git a/external/tbb/test/conformance/conformance_task_arena.cpp b/external/tbb/test/conformance/conformance_task_arena.cpp
index c4b4cef2..5165104f 100644
--- a/external/tbb/test/conformance/conformance_task_arena.cpp
+++ b/external/tbb/test/conformance/conformance_task_arena.cpp
@@ -17,10 +17,10 @@
 #include "common/test.h"
 #include "common/utils.h"
 
-#include "oneapi/tbb/task_arena.h"
-#include "oneapi/tbb/task_scheduler_observer.h"
 #include "oneapi/tbb/enumerable_thread_specific.h"
 #include "oneapi/tbb/parallel_for.h"
+#include "oneapi/tbb/task_arena.h"
+#include "oneapi/tbb/task_scheduler_observer.h"
 
 //! \file conformance_task_arena.cpp
 //! \brief Test for [scheduler.task_arena scheduler.task_scheduler_observer] specification
@@ -29,15 +29,17 @@
 //! Test for uninitilized arena
 //! \brief \ref requirement \ref interface
 TEST_CASE("Test current_thread_index") {
-    REQUIRE_MESSAGE((tbb::this_task_arena::current_thread_index() == tbb::task_arena::not_initialized), "TBB was initialized state");
+    REQUIRE_MESSAGE((tbb::this_task_arena::current_thread_index() == tbb::task_arena::not_initialized),
+                    "TBB was initialized state");
 }
 
 //! Test task arena interfaces
 //! \brief \ref requirement \ref interface
 TEST_CASE("Arena interfaces") {
     //! Initialization interfaces
-    oneapi::tbb::task_arena a(1,1); a.initialize();
-    std::atomic<bool> done{ false };
+    oneapi::tbb::task_arena a(1, 1);
+    a.initialize();
+    std::atomic<bool> done {false};
     //! Enqueue interface
     a.enqueue([&done] {
         CHECK(oneapi::tbb::this_task_arena::max_concurrency() == 2);
@@ -48,14 +50,12 @@ TEST_CASE("Arena interfaces") {
         //! oneapi::tbb::this_task_arena interfaces
         CHECK(oneapi::tbb::this_task_arena::current_thread_index() >= 0);
         //! Attach interface
-        oneapi::tbb::task_arena attached_arena{oneapi::tbb::task_arena::attach()};
+        oneapi::tbb::task_arena attached_arena {oneapi::tbb::task_arena::attach()};
         CHECK(attached_arena.is_active());
-        oneapi::tbb::task_arena attached_arena2{oneapi::tbb::attach()};
+        oneapi::tbb::task_arena attached_arena2 {oneapi::tbb::attach()};
         CHECK(attached_arena2.is_active());
     });
-    while (!done) {
-        utils::yield();
-    }
+    while (!done) { utils::yield(); }
     //! Terminate interface
     a.terminate();
 }
@@ -70,44 +70,38 @@ TEST_CASE("Task isolation") {
         ets.local() = i;
         // Run the second parallel loop in an isolated region to prevent the current thread
         // from taking tasks related to the outer parallel loop.
-        oneapi::tbb::this_task_arena::isolate([&]{
-            oneapi::tbb::parallel_for(0, N2, utils::DummyBody(10));
-        });
+        oneapi::tbb::this_task_arena::isolate(
+                [&] { oneapi::tbb::parallel_for(0, N2, utils::DummyBody(10)); });
         REQUIRE(ets.local() == i);
     });
 }
 
-class conformance_observer: public oneapi::tbb::task_scheduler_observer {
+class conformance_observer : public oneapi::tbb::task_scheduler_observer {
 public:
-    std::atomic<bool> is_entry_called{false};
-    std::atomic<bool> is_exit_called{false};
+    std::atomic<bool> is_entry_called {false};
+    std::atomic<bool> is_exit_called {false};
 
-    conformance_observer( oneapi::tbb::task_arena &a ) : oneapi::tbb::task_scheduler_observer(a) {
-        observe(true); // activate the observer
+    conformance_observer(oneapi::tbb::task_arena &a) : oneapi::tbb::task_scheduler_observer(a) {
+        observe(true);// activate the observer
     }
 
-    ~conformance_observer() {
-        observe(false);
-    }
+    ~conformance_observer() { observe(false); }
 
-    void on_scheduler_entry(bool) override {
-        is_entry_called.store(true, std::memory_order_relaxed);
-    }
+    void on_scheduler_entry(bool) override { is_entry_called.store(true, std::memory_order_relaxed); }
 
-    void on_scheduler_exit(bool) override {
-        is_exit_called.store(true, std::memory_order_relaxed);
-    }
+    void on_scheduler_exit(bool) override { is_exit_called.store(true, std::memory_order_relaxed); }
 
     bool is_callbacks_called() {
         return is_entry_called.load(std::memory_order_relaxed)
-            && is_exit_called.load(std::memory_order_relaxed);
+               && is_exit_called.load(std::memory_order_relaxed);
     }
 };
 
 //! Test task arena observer interfaces
 //! \brief \ref requirement \ref interface
 TEST_CASE("Task arena observer") {
-    oneapi::tbb::task_arena a; a.initialize();
+    oneapi::tbb::task_arena a;
+    a.initialize();
     conformance_observer observer(a);
     a.execute([&] {
         oneapi::tbb::parallel_for(0, 100, utils::DummyBody(10), oneapi::tbb::simple_partitioner());
@@ -125,7 +119,6 @@ TEST_CASE("Task arena copy constructor") {
     REQUIRE(arena.is_active() == copy.is_active());
 }
 
-
 //! Basic test for arena::enqueue with task handle
 //! \brief \ref interface \ref requirement
 TEST_CASE("enqueue task_handle") {
@@ -134,9 +127,9 @@ TEST_CASE("enqueue task_handle") {
 
     //This flag is intentionally made non-atomic for Thread Sanitizer
     //to raise a flag if implementation of task_group is incorrect
-    bool run{false};
+    bool run {false};
 
-    auto task_handle = tg.defer([&]{ run = true; });
+    auto task_handle = tg.defer([&] { run = true; });
 
     arena.enqueue(std::move(task_handle));
     tg.wait();
@@ -152,10 +145,10 @@ TEST_CASE("this_task_arena::enqueue task_handle") {
 
     //This flag is intentionally made non-atomic for Thread Sanitizer
     //to raise a flag if implementation of task_group is incorrect
-    bool run{false};
+    bool run {false};
 
-    arena.execute([&]{
-        auto task_handle = tg.defer([&]{ run = true; });
+    arena.execute([&] {
+        auto task_handle = tg.defer([&] { run = true; });
 
         oneapi::tbb::this_task_arena::enqueue(std::move(task_handle));
     });
@@ -176,16 +169,16 @@ TEST_CASE("this_task_arena::enqueue prolonging task_group") {
 
     //This flag is intentionally made non-atomic for Thread Sanitizer
     //to raise a flag if implementation of task_group is incorrect
-    bool run{false};
+    bool run {false};
 
     //block the task_group to wait on it
-    auto task_handle = tg.defer([]{});
+    auto task_handle = tg.defer([] {});
 
-    arena.execute([&]{
-        oneapi::tbb::this_task_arena::enqueue([&]{
+    arena.execute([&] {
+        oneapi::tbb::this_task_arena::enqueue([&] {
             run = true;
             //release the task_group
-            task_handle = oneapi::tbb::task_handle{};
+            task_handle = oneapi::tbb::task_handle {};
         });
     });
 
@@ -197,15 +190,13 @@ TEST_CASE("this_task_arena::enqueue prolonging task_group") {
 #if TBB_USE_EXCEPTIONS
 //! Basic test for exceptions in task_arena::enqueue with task_handle
 //! \brief \ref interface \ref requirement
-TEST_CASE("task_arena::enqueue(task_handle) exception propagation"){
+TEST_CASE("task_arena::enqueue(task_handle) exception propagation") {
     oneapi::tbb::task_group tg;
     oneapi::tbb::task_arena arena;
 
-    oneapi::tbb::task_handle h = tg.defer([&]{
+    oneapi::tbb::task_handle h = tg.defer([&] {
         volatile bool suppress_unreachable_code_warning = true;
-        if (suppress_unreachable_code_warning) {
-            throw std::runtime_error{ "" };
-        }
+        if (suppress_unreachable_code_warning) { throw std::runtime_error {""}; }
     });
 
     arena.enqueue(std::move(h));
@@ -215,14 +206,12 @@ TEST_CASE("task_arena::enqueue(task_handle) exception propagation"){
 
 //! Basic test for exceptions in this_task_arena::enqueue with task_handle
 //! \brief \ref interface \ref requirement
-TEST_CASE("this_task_arena::enqueue(task_handle) exception propagation"){
+TEST_CASE("this_task_arena::enqueue(task_handle) exception propagation") {
     oneapi::tbb::task_group tg;
 
-    oneapi::tbb::task_handle h = tg.defer([&]{
+    oneapi::tbb::task_handle h = tg.defer([&] {
         volatile bool suppress_unreachable_code_warning = true;
-        if (suppress_unreachable_code_warning) {
-            throw std::runtime_error{ "" };
-        }
+        if (suppress_unreachable_code_warning) { throw std::runtime_error {""}; }
     });
 
     oneapi::tbb::this_task_arena::enqueue(std::move(h));
@@ -230,4 +219,4 @@ TEST_CASE("this_task_arena::enqueue(task_handle) exception propagation"){
     CHECK_THROWS_AS(tg.wait(), std::runtime_error);
 }
 
-#endif // TBB_USE_EXCEPTIONS
+#endif// TBB_USE_EXCEPTIONS
diff --git a/external/tbb/test/conformance/conformance_task_group.cpp b/external/tbb/test/conformance/conformance_task_group.cpp
index ef2ac39d..f8a1c341 100644
--- a/external/tbb/test/conformance/conformance_task_group.cpp
+++ b/external/tbb/test/conformance/conformance_task_group.cpp
@@ -14,23 +14,22 @@
     limitations under the License.
 */
 
-#include "oneapi/tbb/task_group.h"
-#include "oneapi/tbb/task_arena.h"
 #include "common/test.h"
 #include "common/utils.h"
+#include "oneapi/tbb/task_arena.h"
+#include "oneapi/tbb/task_group.h"
 
 #include "common/spin_barrier.h"
 
-#include <type_traits>
 #include "oneapi/tbb/global_control.h"
-
+#include <type_traits>
 
 //! \file conformance_task_group.cpp
 //! \brief Test for [scheduler.task_group] specification
 
 //! Test checks that for lost task handle
 //! \brief \ref requirement
-TEST_CASE("Task handle created but not run"){
+TEST_CASE("Task handle created but not run") {
     {
         oneapi::tbb::task_group tg;
 
@@ -38,16 +37,14 @@ TEST_CASE("Task handle created but not run"){
         //to raise a flag if implementation of task_group is incorrect
         bool run {false};
 
-        auto h = tg.defer([&]{
-            run = true;
-        });
+        auto h = tg.defer([&] { run = true; });
         CHECK_MESSAGE(run == false, "delayed task should not be run until run(task_handle) is called");
     }
 }
 
 //! Basic test for task handle
 //! \brief \ref interface \ref requirement
-TEST_CASE("Task handle run"){
+TEST_CASE("Task handle run") {
     oneapi::tbb::task_handle h;
 
     oneapi::tbb::task_group tg;
@@ -55,9 +52,7 @@ TEST_CASE("Task handle run"){
     //to raise a flag if implementation of task_group is incorrect
     bool run {false};
 
-    h = tg.defer([&]{
-        run = true;
-    });
+    h = tg.defer([&] { run = true; });
     CHECK_MESSAGE(run == false, "delayed task should not be run until run(task_handle) is called");
     tg.run(std::move(h));
     tg.wait();
@@ -68,7 +63,7 @@ TEST_CASE("Task handle run"){
 
 //! Basic test for task handle
 //! \brief \ref interface \ref requirement
-TEST_CASE("Task handle run_and_wait"){
+TEST_CASE("Task handle run_and_wait") {
     oneapi::tbb::task_handle h;
 
     oneapi::tbb::task_group tg;
@@ -76,9 +71,7 @@ TEST_CASE("Task handle run_and_wait"){
     //to raise a flag if implementation of task_group is incorrect
     bool run {false};
 
-    h = tg.defer([&]{
-        run = true;
-    });
+    h = tg.defer([&] { run = true; });
     CHECK_MESSAGE(run == false, "delayed task should not be run until run(task_handle) is called");
     tg.run_and_wait(std::move(h));
     CHECK_MESSAGE(run == true, "Delayed task should be completed when task_group::wait exits");
@@ -88,7 +81,7 @@ TEST_CASE("Task handle run_and_wait"){
 
 //! Test for empty check
 //! \brief \ref interface
-TEST_CASE("Task handle empty check"){
+TEST_CASE("Task handle empty check") {
     oneapi::tbb::task_group tg;
 
     oneapi::tbb::task_handle h;
@@ -96,41 +89,39 @@ TEST_CASE("Task handle empty check"){
     bool empty = (h == nullptr);
     CHECK_MESSAGE(empty, "default constructed task_handle should be empty");
 
-    h = tg.defer([]{});
+    h = tg.defer([] {});
 
     CHECK_MESSAGE(h != nullptr, "delayed task returned by task_group::delayed should not be empty");
 }
 
 //! Test for comparison operations
 //! \brief \ref interface
-TEST_CASE("Task handle comparison/empty checks"){
+TEST_CASE("Task handle comparison/empty checks") {
     oneapi::tbb::task_group tg;
 
     oneapi::tbb::task_handle h;
 
-    bool empty =  ! static_cast<bool>(h);
+    bool empty = !static_cast<bool>(h);
     CHECK_MESSAGE(empty, "default constructed task_handle should be empty");
     CHECK_MESSAGE(h == nullptr, "default constructed task_handle should be empty");
     CHECK_MESSAGE(nullptr == h, "default constructed task_handle should be empty");
 
-    h = tg.defer([]{});
+    h = tg.defer([] {});
 
     CHECK_MESSAGE(h != nullptr, "deferred task returned by task_group::defer() should not be empty");
     CHECK_MESSAGE(nullptr != h, "deferred task returned by task_group::defer() should not be empty");
-
 }
 
 //! Test for task_handle being non copyable
 //! \brief \ref interface
-TEST_CASE("Task handle being non copyable"){
-    static_assert(
-              (!std::is_copy_constructible<oneapi::tbb::task_handle>::value)
-            &&(!std::is_copy_assignable<oneapi::tbb::task_handle>::value),
-            "oneapi::tbb::task_handle should be non copyable");
+TEST_CASE("Task handle being non copyable") {
+    static_assert((!std::is_copy_constructible<oneapi::tbb::task_handle>::value)
+                          && (!std::is_copy_assignable<oneapi::tbb::task_handle>::value),
+                  "oneapi::tbb::task_handle should be non copyable");
 }
 //! Test that task_handle prolongs task_group::wait
 //! \brief \ref requirement
-TEST_CASE("Task handle blocks wait"){
+TEST_CASE("Task handle blocks wait") {
     //Forbid creation of worker threads to ensure that task described by the task_handle is not run until wait is called
     oneapi::tbb::global_control s(oneapi::tbb::global_control::max_allowed_parallelism, 1);
     oneapi::tbb::task_group tg;
@@ -141,20 +132,18 @@ TEST_CASE("Task handle blocks wait"){
 
     //This flag is intentionally made non-atomic for Thread Sanitizer
     //to raise a flag if implementation of task_group is incorrect
-    bool completed  {false};
+    bool completed {false};
     std::atomic<bool> start_wait {false};
-    std::atomic<bool> thread_started{false};
+    std::atomic<bool> thread_started {false};
 
-    oneapi::tbb::task_handle h = tg.defer([&]{
-        completed = true;
-    });
+    oneapi::tbb::task_handle h = tg.defer([&] { completed = true; });
 
-    std::thread wait_thread {[&]{
+    std::thread wait_thread {[&] {
         CHECK_MESSAGE(completed == false, "Deferred task should not be run until run(task_handle) is called");
 
         thread_started = true;
         utils::SpinWaitUntilEq(start_wait, true);
-        arena.execute([&]{
+        arena.execute([&] {
             tg.wait();
             CHECK_MESSAGE(completed == true, "Deferred task should be completed when task_group::wait exits");
         });
@@ -163,10 +152,9 @@ TEST_CASE("Task handle blocks wait"){
     utils::SpinWaitUntilEq(thread_started, true);
     CHECK_MESSAGE(completed == false, "Deferred task should not be run until run(task_handle) is called");
 
-    arena.execute([&]{
-        tg.run(std::move(h));
-    });
-    CHECK_MESSAGE(completed == false, "Deferred task should not be run until run(task_handle) and wait is called");
+    arena.execute([&] { tg.run(std::move(h)); });
+    CHECK_MESSAGE(completed == false,
+                  "Deferred task should not be run until run(task_handle) and wait is called");
     start_wait = true;
     wait_thread.join();
 }
@@ -174,110 +162,94 @@ TEST_CASE("Task handle blocks wait"){
 #if TBB_USE_EXCEPTIONS
 //! The test for exception handling in task_handle
 //! \brief \ref requirement
-TEST_CASE("Task handle exception propagation"){
+TEST_CASE("Task handle exception propagation") {
     oneapi::tbb::task_group tg;
 
-    oneapi::tbb::task_handle h = tg.defer([&]{
+    oneapi::tbb::task_handle h = tg.defer([&] {
         volatile bool suppress_unreachable_code_warning = true;
-        if (suppress_unreachable_code_warning) {
-            throw std::runtime_error{ "" };
-        }
+        if (suppress_unreachable_code_warning) { throw std::runtime_error {""}; }
     });
 
     tg.run(std::move(h));
 
     CHECK_THROWS_AS(tg.wait(), std::runtime_error);
 }
-#endif // TBB_USE_EXCEPTIONS
+#endif// TBB_USE_EXCEPTIONS
 
 //TODO: move to some common place to share with unit tests
 namespace accept_task_group_context {
 
-struct SelfRunner {
-    tbb::task_group& m_tg;
-    std::atomic<unsigned>& count;
-    void operator()() const {
-        unsigned previous_count = count.fetch_sub(1);
-        if (previous_count > 1)
-            m_tg.run( *this );
-    }
-};
-
-template <typename TaskGroup, typename CancelF, typename WaitF>
-void run_cancellation_use_case(CancelF&& cancel, WaitF&& wait) {
-    std::atomic<bool> outer_cancelled{false};
-    std::atomic<unsigned> count{13};
-
-    tbb::task_group_context inner_ctx(tbb::task_group_context::isolated);
-    TaskGroup inner_tg(inner_ctx);
-
-    tbb::task_group outer_tg;
-    auto outer_tg_task = [&] {
-        inner_tg.run([&] {
-            utils::SpinWaitUntilEq(outer_cancelled, true);
-            inner_tg.run( SelfRunner{inner_tg, count} );
-        });
-
-        utils::try_call([&] {
-            std::forward<CancelF>(cancel)(outer_tg);
-        }).on_completion([&] {
-            outer_cancelled = true;
-        });
-    };
-
-    auto check = [&] {
-        tbb::task_group_status outer_status = tbb::task_group_status::not_complete;
-        outer_status = std::forward<WaitF>(wait)(outer_tg);
-        CHECK_MESSAGE(
-            outer_status == tbb::task_group_status::canceled,
-            "Outer task group should have been cancelled."
-        );
-
-        tbb::task_group_status inner_status = inner_tg.wait();
-        CHECK_MESSAGE(
-            inner_status == tbb::task_group_status::complete,
-            "Inner task group should have completed despite the cancellation of the outer one."
-        );
-
-        CHECK_MESSAGE(0 == count, "Some of the inner group tasks were not executed.");
+    struct SelfRunner {
+        tbb::task_group& m_tg;
+        std::atomic<unsigned>& count;
+        void operator()() const {
+            unsigned previous_count = count.fetch_sub(1);
+            if (previous_count > 1) m_tg.run(*this);
+        }
     };
 
-    outer_tg.run(outer_tg_task);
-    check();
-}
+    template <typename TaskGroup, typename CancelF, typename WaitF>
+    void run_cancellation_use_case(CancelF&& cancel, WaitF&& wait) {
+        std::atomic<bool> outer_cancelled {false};
+        std::atomic<unsigned> count {13};
+
+        tbb::task_group_context inner_ctx(tbb::task_group_context::isolated);
+        TaskGroup inner_tg(inner_ctx);
+
+        tbb::task_group outer_tg;
+        auto outer_tg_task = [&] {
+            inner_tg.run([&] {
+                utils::SpinWaitUntilEq(outer_cancelled, true);
+                inner_tg.run(SelfRunner {inner_tg, count});
+            });
+
+            utils::try_call([&] { std::forward<CancelF>(cancel)(outer_tg); }).on_completion([&] {
+                outer_cancelled = true;
+            });
+        };
+
+        auto check = [&] {
+            tbb::task_group_status outer_status = tbb::task_group_status::not_complete;
+            outer_status = std::forward<WaitF>(wait)(outer_tg);
+            CHECK_MESSAGE(outer_status == tbb::task_group_status::canceled,
+                          "Outer task group should have been cancelled.");
+
+            tbb::task_group_status inner_status = inner_tg.wait();
+            CHECK_MESSAGE(
+                    inner_status == tbb::task_group_status::complete,
+                    "Inner task group should have completed despite the cancellation of the outer one.");
+
+            CHECK_MESSAGE(0 == count, "Some of the inner group tasks were not executed.");
+        };
+
+        outer_tg.run(outer_tg_task);
+        check();
+    }
 
-template <typename TaskGroup>
-void test() {
-    run_cancellation_use_case<TaskGroup>(
-        [](tbb::task_group& outer) { outer.cancel(); },
-        [](tbb::task_group& outer) { return outer.wait(); }
-    );
+    template <typename TaskGroup>
+    void test() {
+        run_cancellation_use_case<TaskGroup>([](tbb::task_group& outer) { outer.cancel(); },
+                                             [](tbb::task_group& outer) { return outer.wait(); });
 
 #if TBB_USE_EXCEPTIONS
-    run_cancellation_use_case<TaskGroup>(
-        [](tbb::task_group& /*outer*/) {
-            volatile bool suppress_unreachable_code_warning = true;
-            if (suppress_unreachable_code_warning) {
-                throw int();
-            }
-        },
-        [](tbb::task_group& outer) {
-            try {
-                outer.wait();
-                return tbb::task_group_status::complete;
-            } catch(const int&) {
-                return tbb::task_group_status::canceled;
-            }
-        }
-    );
+        run_cancellation_use_case<TaskGroup>(
+                [](tbb::task_group& /*outer*/) {
+                    volatile bool suppress_unreachable_code_warning = true;
+                    if (suppress_unreachable_code_warning) { throw int(); }
+                },
+                [](tbb::task_group& outer) {
+                    try {
+                        outer.wait();
+                        return tbb::task_group_status::complete;
+                    } catch (const int&) { return tbb::task_group_status::canceled; }
+                });
 #endif
-}
+    }
 
-} // namespace accept_task_group_context
+}// namespace accept_task_group_context
 
 //! Respect task_group_context passed from outside
 //! \brief \ref interface \ref requirement
 TEST_CASE("Respect task_group_context passed from outside") {
     accept_task_group_context::test<tbb::task_group>();
 }
-
diff --git a/external/tbb/test/conformance/conformance_task_group_context.cpp b/external/tbb/test/conformance/conformance_task_group_context.cpp
index 49fbc9b9..6d64cebf 100644
--- a/external/tbb/test/conformance/conformance_task_group_context.cpp
+++ b/external/tbb/test/conformance/conformance_task_group_context.cpp
@@ -30,12 +30,14 @@ TEST_CASE("Test construction") {
         utils::suppress_unused_warning(ctx);
     }
     {
-        oneapi::tbb::task_group_context ctx{ oneapi::tbb::task_group_context::bound };
+        oneapi::tbb::task_group_context ctx {oneapi::tbb::task_group_context::bound};
         utils::suppress_unused_warning(ctx);
     }
     {
-        oneapi::tbb::task_group_context ctx{ oneapi::tbb::task_group_context::isolated
-            , oneapi::tbb::task_group_context::default_traits | oneapi::tbb::task_group_context::fp_settings | oneapi::tbb::task_group_context::concurrent_wait };
+        oneapi::tbb::task_group_context ctx {oneapi::tbb::task_group_context::isolated,
+                                             oneapi::tbb::task_group_context::default_traits
+                                                     | oneapi::tbb::task_group_context::fp_settings
+                                                     | oneapi::tbb::task_group_context::concurrent_wait};
         utils::suppress_unused_warning(ctx);
     }
 }
@@ -43,7 +45,8 @@ TEST_CASE("Test construction") {
 //! Test methods
 //! \brief \ref interface \ref requirement
 TEST_CASE("Test methods") {
-    oneapi::tbb::task_group_context ctx{ oneapi::tbb::task_group_context::bound, oneapi::tbb::task_group_context::default_traits };
+    oneapi::tbb::task_group_context ctx {oneapi::tbb::task_group_context::bound,
+                                         oneapi::tbb::task_group_context::default_traits};
     ctx.capture_fp_settings();
     CHECK_FALSE(ctx.is_group_execution_cancelled());
     CHECK(ctx.cancel_group_execution());
diff --git a/external/tbb/test/conformance/conformance_tick_count.cpp b/external/tbb/test/conformance/conformance_tick_count.cpp
index d9a3028c..556dd5ec 100644
--- a/external/tbb/test/conformance/conformance_tick_count.cpp
+++ b/external/tbb/test/conformance/conformance_tick_count.cpp
@@ -17,8 +17,8 @@
 #include "common/test.h"
 #include "common/utils.h"
 
-#include "oneapi/tbb/tick_count.h"
 #include "oneapi/tbb/detail/_template_helpers.h"
+#include "oneapi/tbb/tick_count.h"
 #include <type_traits>
 
 //! \file conformance_tick_count.cpp
@@ -45,15 +45,13 @@ TEST_CASE("Subtraction of equal tick_counts") {
 TEST_CASE("Subtraction subsequent timestamp") {
     oneapi::tbb::tick_count tick_f(oneapi::tbb::tick_count::now());
     oneapi::tbb::tick_count tick_s(oneapi::tbb::tick_count::now());
-    while ((tick_s - tick_f).seconds() == 0) {
-        tick_s = oneapi::tbb::tick_count::now();
-    }
+    while ((tick_s - tick_f).seconds() == 0) { tick_s = oneapi::tbb::tick_count::now(); }
     CHECK_GT((tick_s - tick_f).seconds(), 0);
 }
 
 // Wait for given duration.
 // The duration parameter is in units of seconds.
-static void WaitForDuration( double duration ) {
+static void WaitForDuration(double duration) {
     CHECK_GT(duration, 0);
     oneapi::tbb::tick_count start = oneapi::tbb::tick_count::now();
     double sec = 0;
@@ -64,9 +62,9 @@ static void WaitForDuration( double duration ) {
 }
 
 // CHECK that two times in seconds are very close.
-void CheckNear( double x, double y ) {
-    CHECK_GE(x-y, -1.0E-10);
-    CHECK_GE(1.0E-10, x-y);
+void CheckNear(double x, double y) {
+    CHECK_GE(x - y, -1.0E-10);
+    CHECK_GE(1.0E-10, x - y);
 }
 
 //! Test arithmetic operators on tick_count::interval_t
@@ -97,7 +95,6 @@ TEST_CASE("Arithmetic operators") {
     CheckNear(sum.seconds(), 0.0);
 }
 
-
 //! Test resolution of oneapi::tbb::tick_count::interval_t
 //! \brief \ref interface \ref requirement
 TEST_CASE("oneapi::tbb::tick_count::interval_t resolution") {
diff --git a/external/tbb/test/conformance/conformance_version.cpp b/external/tbb/test/conformance/conformance_version.cpp
index eaf6d3c0..21af6efa 100644
--- a/external/tbb/test/conformance/conformance_version.cpp
+++ b/external/tbb/test/conformance/conformance_version.cpp
@@ -27,21 +27,21 @@
 TEST_CASE("Test specification version") {
     int expected = 104;
     REQUIRE_MESSAGE(ONETBB_SPEC_VERSION == expected,
-        "Expected and actual specification versions do not match.");
+                    "Expected and actual specification versions do not match.");
 }
 
 //! Testing the match of compile-time and runtime interface versions
 //! \brief \ref requirement \ref interface
 TEST_CASE("Test interface version") {
-    REQUIRE_MESSAGE(TBB_runtime_interface_version()==TBB_INTERFACE_VERSION,
-        "Running with the library of different version than the test was compiled against.");
+    REQUIRE_MESSAGE(TBB_runtime_interface_version() == TBB_INTERFACE_VERSION,
+                    "Running with the library of different version than the test was compiled against.");
 }
 
 //! Testing the match of compile-time and runtime version strings
 //! \brief \ref requirement \ref interface
 TEST_CASE("Test version string") {
-    REQUIRE_MESSAGE(std::strcmp( TBB_runtime_version(), TBB_VERSION_STRING )==0,
-        "Running with the library of different version than the test was compiled against.");
+    REQUIRE_MESSAGE(std::strcmp(TBB_runtime_version(), TBB_VERSION_STRING) == 0,
+                    "Running with the library of different version than the test was compiled against.");
 }
 
 //! Testing interface macros
diff --git a/external/tbb/test/conformance/conformance_write_once_node.cpp b/external/tbb/test/conformance/conformance_write_once_node.cpp
index f21b4b0b..53a8cb75 100644
--- a/external/tbb/test/conformance/conformance_write_once_node.cpp
+++ b/external/tbb/test/conformance/conformance_write_once_node.cpp
@@ -15,7 +15,7 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
 #endif
 
 #define CONFORMANCE_BUFFERING_NODES
@@ -28,44 +28,45 @@
 
 //! Test function_node broadcast
 //! \brief \ref requirement
-TEST_CASE("write_once_node broadcast"){
+TEST_CASE("write_once_node broadcast") {
     conformance::test_forwarding<oneapi::tbb::flow::write_once_node<int>, int>(1);
 }
 
 //! Test write_once_node buffering
 //! \brief \ref requirement
-TEST_CASE("write_once_node buffering"){
+TEST_CASE("write_once_node buffering") {
     conformance::test_buffering<oneapi::tbb::flow::write_once_node<int>, int>();
 }
 
-//! The node that is constructed has a reference to the same graph object as src,with an invalid internal buffer item. 
+//! The node that is constructed has a reference to the same graph object as src,with an invalid internal buffer item.
 //! The buffered value and list of successors are not copied from src.
 //! \brief \ref requirement
-TEST_CASE("write_once_node copy constructor"){
+TEST_CASE("write_once_node copy constructor") {
     conformance::test_copy_ctor_for_buffering_nodes<oneapi::tbb::flow::write_once_node<int>>();
 }
 
 //! Test inheritance relations
 //! \brief \ref interface
-TEST_CASE("write_once_node superclasses"){
+TEST_CASE("write_once_node superclasses") {
     conformance::test_inheritance<oneapi::tbb::flow::write_once_node<int>, int, int>();
     conformance::test_inheritance<oneapi::tbb::flow::write_once_node<void*>, void*, void*>();
 }
 
 //! Test overwrite_node node constructor
 //! \brief \ref requirement
-TEST_CASE("write_once_node constructor"){
+TEST_CASE("write_once_node constructor") {
     oneapi::tbb::flow::graph g;
     oneapi::tbb::flow::overwrite_node<int> testing_node(g);
 
     int tmp = -1;
     CHECK_MESSAGE((!testing_node.is_valid()), "Constructed node has invalid internal buffer item");
-    CHECK_MESSAGE((!testing_node.try_get(tmp)), "Gets from the node are non-destructive, but the first `try_get' fails");
+    CHECK_MESSAGE((!testing_node.try_get(tmp)),
+                  "Gets from the node are non-destructive, but the first `try_get' fails");
 }
 
 //! Test write_once_node node `is_valid()` and `clear()`
 //! \brief \ref requirement
-TEST_CASE("write_once_node methods"){
+TEST_CASE("write_once_node methods") {
     oneapi::tbb::flow::graph g;
     oneapi::tbb::flow::write_once_node<int> testing_node(g);
 
@@ -83,6 +84,6 @@ TEST_CASE("write_once_node methods"){
 //! The following test shows the possibility to connect the node to a reserving join_node,
 //! avoiding direct calls to the try_get() method from the body of the successor node
 //! \brief \ref requirement
-TEST_CASE("write_once_node with reserving join_node as successor"){
+TEST_CASE("write_once_node with reserving join_node as successor") {
     conformance::test_with_reserving_join_node_class<oneapi::tbb::flow::write_once_node<int>>();
 }
diff --git a/external/tbb/test/tbb/test_adaptive_mutex.cpp b/external/tbb/test/tbb/test_adaptive_mutex.cpp
index 9fceb4c7..c5a6a991 100644
--- a/external/tbb/test/tbb/test_adaptive_mutex.cpp
+++ b/external/tbb/test/tbb/test_adaptive_mutex.cpp
@@ -17,7 +17,7 @@
 #define TBB_PREVIEW_MUTEXES 1
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
 #endif
 
 #include "../conformance/conformance_mutex.h"
@@ -30,14 +30,10 @@
 //! \brief Test for [preview] functionality
 
 //! \brief \ref error_guessing
-TEST_CASE("test upgrade/downgrade with rw_mutex") {
-    test_rwm_upgrade_downgrade<tbb::rw_mutex>();
-}
+TEST_CASE("test upgrade/downgrade with rw_mutex") { test_rwm_upgrade_downgrade<tbb::rw_mutex>(); }
 
 //! \brief \ref error_guessing
-TEST_CASE("test mutex with native threads") {
-    test_with_native_threads::test<tbb::mutex>();
-}
+TEST_CASE("test mutex with native threads") { test_with_native_threads::test<tbb::mutex>(); }
 
 //! \brief \ref error_guessing
 TEST_CASE("test rw_mutex with native threads") {
@@ -72,9 +68,9 @@ TEST_CASE("Shared mutexes (reader/writer) test") {
 //! Compatibility with the standard
 //! \brief \ref interface \ref requirement
 TEST_CASE("ISO interface test") {
-    GeneralTest<TBB_MutexFromISO_Mutex<oneapi::tbb::mutex> >("ISO Adaprive Mutex");
+    GeneralTest<TBB_MutexFromISO_Mutex<oneapi::tbb::mutex>>("ISO Adaprive Mutex");
     GeneralTest<TBB_MutexFromISO_Mutex<oneapi::tbb::rw_mutex>>("ISO Adaptive RW Mutex");
-    TestTryAcquire<TBB_MutexFromISO_Mutex<oneapi::tbb::mutex> >("ISO Adaptive  Mutex");
+    TestTryAcquire<TBB_MutexFromISO_Mutex<oneapi::tbb::mutex>>("ISO Adaptive  Mutex");
     TestTryAcquire<TBB_MutexFromISO_Mutex<oneapi::tbb::rw_mutex>>("ISO Adaptive RW Mutex");
     TestTryAcquireReader<TBB_MutexFromISO_Mutex<oneapi::tbb::rw_mutex>>("ISO Adaptive RW Mutex");
     TestReaderWriterLock<TBB_MutexFromISO_Mutex<oneapi::tbb::rw_mutex>>("ISO Adaptive RW Mutex");
diff --git a/external/tbb/test/tbb/test_allocators.cpp b/external/tbb/test/tbb/test_allocators.cpp
index a31778db..135bbd3c 100644
--- a/external/tbb/test/tbb/test_allocators.cpp
+++ b/external/tbb/test/tbb/test_allocators.cpp
@@ -14,11 +14,12 @@
     limitations under the License.
 */
 
-#include <tbb/version.h> // For __TBB_GLIBCXX_VERSION and __TBB_CPP20_PRESENT
+#include <tbb/version.h>// For __TBB_GLIBCXX_VERSION and __TBB_CPP20_PRESENT
 
 // Intel LLVM compiler triggers a deprecation warning in the implementation of std::allocator_traits::destroy
 // inside Standard Library while using STL PMR containers since std::polymorphic_allocator::destroy is deprecated since C++20
-#define TEST_LLVM_COMPILER_PMR_DESTROY_DEPRECATED_BROKEN __INTEL_LLVM_COMPILER == 20250000 && __TBB_GLIBCXX_VERSION == 110000 && __TBB_CPP20_PRESENT
+#define TEST_LLVM_COMPILER_PMR_DESTROY_DEPRECATED_BROKEN                                                     \
+    __INTEL_LLVM_COMPILER == 20250000 && __TBB_GLIBCXX_VERSION == 110000 && __TBB_CPP20_PRESENT
 
 #if TEST_LLVM_COMPILER_PMR_DESTROY_DEPRECATED_BROKEN
 #pragma clang diagnostic push
@@ -29,8 +30,8 @@
 #include "tbb/tbb_allocator.h"
 
 // the real body of the test is there:
-#include "common/allocator_test_common.h"
 #include "common/allocator_stl_test_common.h"
+#include "common/allocator_test_common.h"
 
 //! \file test_allocators.cpp
 //! \brief Test for [memory_allocation.cache_aligned_allocator memory_allocation.tbb_allocator memory_allocation.cache_aligned_resource] specifications
@@ -39,11 +40,11 @@
 //! Test that cache_aligned_allocate() throws bad_alloc if cannot allocate memory.
 //! \brief \ref requirement
 TEST_CASE("Test cache_aligned_allocate throws") {
-    #if __APPLE__
-        // On macOS*, failure to map memory results in messages to stderr;
-        // suppress them.
-        DisableStderr disableStderr;
-    #endif
+#if __APPLE__
+    // On macOS*, failure to map memory results in messages to stderr;
+    // suppress them.
+    DisableStderr disableStderr;
+#endif
 
     using namespace tbb::detail::r1;
 
@@ -51,11 +52,11 @@ TEST_CASE("Test cache_aligned_allocate throws") {
     // to not cause warp around in system allocator after adding object header
     // during address2 allocation.
     const size_t itemsize = 1024;
-    const size_t nitems   = 1024;
+    const size_t nitems = 1024;
     void *address1 = nullptr;
     try {
         address1 = cache_aligned_allocate(nitems * itemsize);
-    } catch(...) {
+    } catch (...) {
         // intentionally empty
     }
     REQUIRE_MESSAGE(address1, "cache_aligned_allocate unable to obtain 1024*1024 bytes");
@@ -63,10 +64,8 @@ TEST_CASE("Test cache_aligned_allocate throws") {
     bool exception_caught = false;
     try {
         // Try allocating more memory than left in the address space; should cause std::bad_alloc
-        (void)cache_aligned_allocate(~size_t(0) - itemsize * nitems + cache_line_size());
-    } catch (std::bad_alloc&) {
-        exception_caught = true;
-    } catch (...) {
+        (void) cache_aligned_allocate(~size_t(0) - itemsize * nitems + cache_line_size());
+    } catch (std::bad_alloc &) { exception_caught = true; } catch (...) {
         REQUIRE_MESSAGE(false, "Unexpected exception type (std::bad_alloc was expected)");
         exception_caught = true;
     }
@@ -75,7 +74,9 @@ TEST_CASE("Test cache_aligned_allocate throws") {
     try {
         cache_aligned_deallocate(address1);
     } catch (...) {
-        REQUIRE_MESSAGE(false, "cache_aligned_deallocate did not accept the address obtained with cache_aligned_allocate");
+        REQUIRE_MESSAGE(
+                false,
+                "cache_aligned_deallocate did not accept the address obtained with cache_aligned_allocate");
     }
 }
 #endif /* TBB_USE_EXCEPTIONS */
@@ -104,13 +105,13 @@ TEST_CASE("polymorphic_allocator test") {
     tbb::cache_aligned_resource aligned_resource;
     tbb::cache_aligned_resource equal_aligned_resource(std::pmr::get_default_resource());
     REQUIRE_MESSAGE(aligned_resource.is_equal(equal_aligned_resource),
-            "Underlying upstream resources should be equal.");
+                    "Underlying upstream resources should be equal.");
     REQUIRE_MESSAGE(!aligned_resource.is_equal(*std::pmr::null_memory_resource()),
-            "Cache aligned resource upstream shouldn't be equal to the standard resource.");
+                    "Cache aligned resource upstream shouldn't be equal to the standard resource.");
     TestAllocatorWithSTL(std::pmr::polymorphic_allocator<void>(&aligned_resource));
 }
 #endif
 
 #if TEST_LLVM_COMPILER_PMR_DESTROY_DEPRECATED_BROKEN
-#pragma clang diagnostic pop // "-Wdeprecated-declarations"
+#pragma clang diagnostic pop// "-Wdeprecated-declarations"
 #endif
diff --git a/external/tbb/test/tbb/test_arena_constraints.cpp b/external/tbb/test/tbb/test_arena_constraints.cpp
index 846bf0fc..9051c09f 100644
--- a/external/tbb/test/tbb/test_arena_constraints.cpp
+++ b/external/tbb/test/tbb/test_arena_constraints.cpp
@@ -26,8 +26,8 @@
 //! \brief \ref error_guessing
 TEST_CASE("Test affinity and default_concurrency correctness for all available constraints.") {
     system_info::initialize();
-    for (const auto& constraints: generate_constraints_variety()) {
-        tbb::task_arena ta{constraints};
+    for (const auto& constraints : generate_constraints_variety()) {
+        tbb::task_arena ta {constraints};
         test_constraints_affinity_and_concurrency(constraints, get_arena_affinity(ta));
     }
 }
@@ -35,18 +35,18 @@ TEST_CASE("Test affinity and default_concurrency correctness for all available c
 bool is_observer_created(const tbb::task_arena::constraints& c) {
     std::vector<tbb::core_type_id> core_types = tbb::info::core_types();
     std::vector<tbb::numa_node_id> numa_nodes = tbb::info::numa_nodes();
-    return
-        (c.numa_id != tbb::task_arena::automatic && numa_nodes.size() > 1) ||
-        (c.core_type != tbb::task_arena::automatic && core_types.size() > 1) ||
-        c.max_threads_per_core != tbb::task_arena::automatic;
+    return (c.numa_id != tbb::task_arena::automatic && numa_nodes.size() > 1)
+           || (c.core_type != tbb::task_arena::automatic && core_types.size() > 1)
+           || c.max_threads_per_core != tbb::task_arena::automatic;
 }
 
-void recursive_arena_binding(constraints_container::iterator current_pos, constraints_container::iterator end_pos) {
+void recursive_arena_binding(constraints_container::iterator current_pos,
+                             constraints_container::iterator end_pos) {
     system_info::affinity_mask affinity_before = system_info::allocate_current_affinity_mask();
 
     if (current_pos != end_pos) {
         auto constraints = *current_pos;
-        tbb::task_arena current_level_arena{constraints};
+        tbb::task_arena current_level_arena {constraints};
 
         if (is_observer_created(constraints)) {
             system_info::affinity_mask affinity = get_arena_affinity(current_level_arena);
@@ -54,15 +54,12 @@ void recursive_arena_binding(constraints_container::iterator current_pos, constr
         }
 
         current_level_arena.execute(
-            [&current_pos, &end_pos]() {
-                recursive_arena_binding(++current_pos, end_pos);
-            }
-        );
+                [&current_pos, &end_pos]() { recursive_arena_binding(++current_pos, end_pos); });
     }
 
     system_info::affinity_mask affinity_after = system_info::allocate_current_affinity_mask();
     REQUIRE_MESSAGE(hwloc_bitmap_isequal(affinity_before, affinity_after),
-        "After nested arena execution previous affinity mask was not restored.");
+                    "After nested arena execution previous affinity mask was not restored.");
 }
 
 //! Testing binding correctness during passing through nested arenas
@@ -73,13 +70,12 @@ TEST_CASE("Test binding with nested arenas") {
     recursive_arena_binding(constraints_variety.begin(), constraints_variety.end());
 }
 
-
 //! Testing constraints propagation during arenas copy construction
 //! \brief \ref regression
 TEST_CASE("Test constraints propagation during arenas copy construction") {
     system_info::initialize();
-    for (const auto& constraints: generate_constraints_variety()) {
-        tbb::task_arena constructed{constraints};
+    for (const auto& constraints : generate_constraints_variety()) {
+        tbb::task_arena constructed {constraints};
 
         tbb::task_arena copied(constructed);
         system_info::affinity_mask copied_affinity = get_arena_affinity(copied);
@@ -99,30 +95,26 @@ TEST_CASE("Test memory leaks") {
 
     // To reduce the test session time only one constraints object is used inside this test.
     // This constraints should use all available settings to cover the most part of tbbbind functionality.
-    auto constraints = tbb::task_arena::constraints{}
-        .set_numa_id(tbb::info::numa_nodes().front())
-        .set_core_type(tbb::info::core_types().front())
-        .set_max_threads_per_core(1);
+    auto constraints = tbb::task_arena::constraints {}
+                               .set_numa_id(tbb::info::numa_nodes().front())
+                               .set_core_type(tbb::info::core_types().front())
+                               .set_max_threads_per_core(1);
 
     size_t current_memory_usage = 0, previous_memory_usage = 0, stability_counter = 0;
     bool no_memory_leak = false;
     for (size_t i = 0; i < num_trials; i++) {
         { /* All DTORs must be called before GetMemoryUsage() call*/
-            tbb::task_arena arena{constraints};
-            arena.execute([]{
+            tbb::task_arena arena {constraints};
+            arena.execute([] {
                 utils::SpinBarrier barrier;
                 barrier.initialize(tbb::this_task_arena::max_concurrency());
-                tbb::parallel_for(
-                    tbb::blocked_range<size_t>(0, tbb::this_task_arena::max_concurrency()),
-                    [&barrier](const tbb::blocked_range<size_t>&) {
-                        barrier.wait();
-                    }
-                );
+                tbb::parallel_for(tbb::blocked_range<size_t>(0, tbb::this_task_arena::max_concurrency()),
+                                  [&barrier](const tbb::blocked_range<size_t>&) { barrier.wait(); });
             });
         }
 
         current_memory_usage = utils::GetMemoryUsage();
-        stability_counter = current_memory_usage==previous_memory_usage ? stability_counter + 1 : 0;
+        stability_counter = current_memory_usage == previous_memory_usage ? stability_counter + 1 : 0;
         // If the amount of used memory has not changed during 5% of executions,
         // then we can assume that the check was successful
         if (stability_counter > num_trials / 20) {
@@ -140,38 +132,43 @@ TEST_CASE("Test memory leaks") {
 TEST_CASE("Test arena constraints setters") {
     using constraints = tbb::task_arena::constraints;
     auto constraints_comparison = [](const constraints& c1, const constraints& c2) {
-        REQUIRE_MESSAGE(constraints_equal{}(c1, c2),
-            "Equal constraints settings specified by different interfaces shows different result.");
+        REQUIRE_MESSAGE(
+                constraints_equal {}(c1, c2),
+                "Equal constraints settings specified by different interfaces shows different result.");
     };
 
     // NUMA node ID setter testing
-    for(const auto& numa_index: tbb::info::numa_nodes()) {
-        constraints setter_c = constraints{}.set_numa_id(numa_index);
-        constraints assignment_c{}; assignment_c.numa_id = numa_index;
+    for (const auto& numa_index : tbb::info::numa_nodes()) {
+        constraints setter_c = constraints {}.set_numa_id(numa_index);
+        constraints assignment_c {};
+        assignment_c.numa_id = numa_index;
 
         constraints_comparison(setter_c, assignment_c);
     }
 
     // Core type setter testing
-    for(const auto& core_type_index: tbb::info::core_types()) {
-        constraints setter_c = constraints{}.set_core_type(core_type_index);
-        constraints assignment_c{}; assignment_c.core_type = core_type_index;
+    for (const auto& core_type_index : tbb::info::core_types()) {
+        constraints setter_c = constraints {}.set_core_type(core_type_index);
+        constraints assignment_c {};
+        assignment_c.core_type = core_type_index;
 
         constraints_comparison(setter_c, assignment_c);
     }
 
     // Max concurrency setter testing
     {
-        constraints setter_c = constraints{}.set_max_concurrency(1);
-        constraints assignment_c{}; assignment_c.max_concurrency = 1;
+        constraints setter_c = constraints {}.set_max_concurrency(1);
+        constraints assignment_c {};
+        assignment_c.max_concurrency = 1;
 
         constraints_comparison(setter_c, assignment_c);
     }
 
     // Threads per core setter testing
     {
-        constraints setter_c = constraints{}.set_max_threads_per_core(1);
-        constraints assignment_c{}; assignment_c.max_threads_per_core = 1;
+        constraints setter_c = constraints {}.set_max_threads_per_core(1);
+        constraints assignment_c {};
+        assignment_c.max_threads_per_core = 1;
 
         constraints_comparison(setter_c, assignment_c);
     }
@@ -180,15 +177,17 @@ TEST_CASE("Test arena constraints setters") {
 const int custom_concurrency_value = 42;
 void check_concurrency_level(const tbb::task_arena::constraints& c) {
     REQUIRE_MESSAGE(tbb::info::default_concurrency(c) == custom_concurrency_value,
-        "Custom arena concurrency was passed to constraints, but was not respected by default_concurrency() call.");
-    REQUIRE_MESSAGE(tbb::task_arena{c}.max_concurrency() == custom_concurrency_value,
-        "Custom arena concurrency was passed to constraints, but was not respected by default_concurrency() call.");
+                    "Custom arena concurrency was passed to constraints, but was not respected by "
+                    "default_concurrency() call.");
+    REQUIRE_MESSAGE(tbb::task_arena {c}.max_concurrency() == custom_concurrency_value,
+                    "Custom arena concurrency was passed to constraints, but was not respected by "
+                    "default_concurrency() call.");
 }
 
 //! Testing concurrency getters output for constraints with custom concurrency value
 //! \brief \ref interface \ref error_guessing
 TEST_CASE("Test concurrency getters output for constraints with custom concurrency value") {
-    tbb::task_arena::constraints c{};
+    tbb::task_arena::constraints c {};
     c.set_max_concurrency(custom_concurrency_value);
     check_concurrency_level(c);
 
@@ -205,6 +204,6 @@ TEST_CASE("Test concurrency getters output for constraints with custom concurren
 //! Testing constraints_threads_per_core() reserved entry point
 //! \brief \ref error_guessing
 TEST_CASE("Testing constraints_threads_per_core() reserved entry point") {
-    tbb::task_arena::constraints c{};
+    tbb::task_arena::constraints c {};
     tbb::detail::r1::constraints_threads_per_core(c);
 }
diff --git a/external/tbb/test/tbb/test_arena_priorities.cpp b/external/tbb/test/tbb/test_arena_priorities.cpp
index ba160df8..9a637352 100644
--- a/external/tbb/test/tbb/test_arena_priorities.cpp
+++ b/external/tbb/test/tbb/test_arena_priorities.cpp
@@ -16,16 +16,16 @@
 
 #include "common/test.h"
 
-#include "tbb/task_group.h"
-#include "tbb/task_arena.h"
 #include "tbb/global_control.h"
+#include "tbb/task_arena.h"
+#include "tbb/task_group.h"
 
 #include "common/spin_barrier.h"
 #include "common/utils.h"
 #include "common/utils_concurrency_limit.h"
 
-#include <cstddef>
 #include <algorithm>
+#include <cstddef>
 #include <numeric>
 
 //! \file test_arena_priorities.cpp
@@ -41,328 +41,300 @@ std::atomic<bool> g_work_submitted;
 
 namespace HighPriorityArenasTakeExecutionPrecedence {
 
-using concurrency_type = int;
-using arena_info =
-    std::tuple<std::unique_ptr<tbb::task_arena>,
-               concurrency_type,
-               tbb::task_arena::priority,
-               std::unique_ptr<tbb::task_group>>;
-
-enum arena_info_keys {
-    arena_pointer, arena_concurrency, arena_priority, associated_task_group
-};
-
-void prepare_logging_data(std::vector<tbb::task_arena::priority>& task_log, unsigned overall_tasks_num) {
-    task_log.clear();
-    task_log.resize(overall_tasks_num);
-    for( auto& record : task_log )
-        record = tbb::task_arena::priority::normal;
-}
-
-template<typename... ArenaArgs>
-tbb::task_arena* do_allocate_and_construct( const ArenaArgs&... arena_args )
-{
-    const int dummy_max_concurrency = 4;
-    const int dummy_reserved_for_masters = 4;
-
-    enum initialization_methods {
-        lazy,
-        explicit_initialize,
-        explicit_initialize_with_different_constructor_parameters,
-        initialization_methods_num
-    };
-    static initialization_methods initialization_method = lazy;
-
-    tbb::task_arena* result_arena = nullptr;
-
-    switch( initialization_method ) {
-
-    case lazy:
-        result_arena = new tbb::task_arena( arena_args... );
-        break;
-
-    case explicit_initialize:
-        result_arena = new tbb::task_arena;
-        result_arena->initialize( arena_args... );
-        break;
-
-    case explicit_initialize_with_different_constructor_parameters:
-    {
-        tbb::task_arena tmp(dummy_max_concurrency, dummy_reserved_for_masters);
-        result_arena = new tbb::task_arena(tmp);
-        result_arena->initialize(arena_args...);
-        break;
+    using concurrency_type = int;
+    using arena_info = std::tuple<std::unique_ptr<tbb::task_arena>, concurrency_type,
+                                  tbb::task_arena::priority, std::unique_ptr<tbb::task_group>>;
+
+    enum arena_info_keys { arena_pointer, arena_concurrency, arena_priority, associated_task_group };
+
+    void prepare_logging_data(std::vector<tbb::task_arena::priority>& task_log, unsigned overall_tasks_num) {
+        task_log.clear();
+        task_log.resize(overall_tasks_num);
+        for (auto& record : task_log) record = tbb::task_arena::priority::normal;
     }
 
-    default:
-        REQUIRE_MESSAGE( false, "Not implemented method of initialization." );
-        break;
+    template <typename... ArenaArgs>
+    tbb::task_arena* do_allocate_and_construct(const ArenaArgs&... arena_args) {
+        const int dummy_max_concurrency = 4;
+        const int dummy_reserved_for_masters = 4;
+
+        enum initialization_methods {
+            lazy,
+            explicit_initialize,
+            explicit_initialize_with_different_constructor_parameters,
+            initialization_methods_num
+        };
+        static initialization_methods initialization_method = lazy;
+
+        tbb::task_arena* result_arena = nullptr;
+
+        switch (initialization_method) {
+
+            case lazy:
+                result_arena = new tbb::task_arena(arena_args...);
+                break;
+
+            case explicit_initialize:
+                result_arena = new tbb::task_arena;
+                result_arena->initialize(arena_args...);
+                break;
+
+            case explicit_initialize_with_different_constructor_parameters: {
+                tbb::task_arena tmp(dummy_max_concurrency, dummy_reserved_for_masters);
+                result_arena = new tbb::task_arena(tmp);
+                result_arena->initialize(arena_args...);
+                break;
+            }
+
+            default:
+                REQUIRE_MESSAGE(false, "Not implemented method of initialization.");
+                break;
+        }
+
+        int next_value = (initialization_method + 1) % initialization_methods_num;
+        initialization_method = (initialization_methods) next_value;
+
+        return result_arena;
     }
 
-    int next_value = (initialization_method + 1) % initialization_methods_num;
-    initialization_method = (initialization_methods)next_value;
-
-    return result_arena;
-}
-
-template<typename FirstArenaArg>
-tbb::task_arena* decide_on_arguments(
-    const FirstArenaArg& first_arg, const int reserved_for_masters,
-    tbb::task_arena::priority a_priority )
-{
-    const tbb::task_arena::priority default_priority = tbb::task_arena::priority::normal;
-    static bool pass_default_priority_implicitly = false;
-    if( default_priority == a_priority ) {
-        pass_default_priority_implicitly = !pass_default_priority_implicitly;
-        if( pass_default_priority_implicitly )
-            return do_allocate_and_construct( first_arg, reserved_for_masters );
+    template <typename FirstArenaArg>
+    tbb::task_arena* decide_on_arguments(const FirstArenaArg& first_arg, const int reserved_for_masters,
+                                         tbb::task_arena::priority a_priority) {
+        const tbb::task_arena::priority default_priority = tbb::task_arena::priority::normal;
+        static bool pass_default_priority_implicitly = false;
+        if (default_priority == a_priority) {
+            pass_default_priority_implicitly = !pass_default_priority_implicitly;
+            if (pass_default_priority_implicitly)
+                return do_allocate_and_construct(first_arg, reserved_for_masters);
+        }
+        return do_allocate_and_construct(first_arg, reserved_for_masters, a_priority);
     }
-    return do_allocate_and_construct( first_arg, reserved_for_masters, a_priority );
-}
 
+    tbb::task_arena* allocate_and_construct_arena(int arena_max_concurrency,
+                                                  tbb::task_arena::priority a_priority) {
+        const int reserved_for_masters = 0;
 
-tbb::task_arena* allocate_and_construct_arena(
-    int arena_max_concurrency, tbb::task_arena::priority a_priority )
-{
-    const int reserved_for_masters = 0;
+        static bool use_constraints = false;
+        use_constraints = !use_constraints;
 
-    static bool use_constraints = false;
-    use_constraints = !use_constraints;
+        if (use_constraints) {
+            tbb::task_arena::constraints properties {tbb::task_arena::automatic, arena_max_concurrency};
+            return decide_on_arguments(properties, reserved_for_masters, a_priority);
+        }
 
-    if( use_constraints ) {
-        tbb::task_arena::constraints properties{tbb::task_arena::automatic, arena_max_concurrency};
-        return decide_on_arguments( properties, reserved_for_masters, a_priority );
+        return decide_on_arguments(arena_max_concurrency, reserved_for_masters, a_priority);
     }
 
-    return decide_on_arguments( arena_max_concurrency, reserved_for_masters, a_priority );
-}
-
-void submit_work( std::vector<arena_info>& arenas, unsigned repeats, utils::SpinBarrier& barrier ) {
-    for( auto& item : arenas ) {
-        tbb::task_arena& arena = *std::get<arena_pointer>(item).get();
-        concurrency_type concurrency = std::get<arena_concurrency>(item);
-        tbb::task_arena::priority priority_value = std::get<arena_priority>(item);
-        auto& tg = std::get<associated_task_group>(item);
-
-        arena.execute(
-            [repeats, &barrier, &tg, priority_value, concurrency]() {
-                for( unsigned i = 0; i < repeats * concurrency; ++i ) {
-                    tg->run(
-                        [&barrier, priority_value](){
-                            while( !g_work_submitted.load(std::memory_order_acquire) )
-                                utils::yield();
-                            g_task_info[g_task_num++] = priority_value;
-                            barrier.wait();
-                        }
-                    );
+    void submit_work(std::vector<arena_info>& arenas, unsigned repeats, utils::SpinBarrier& barrier) {
+        for (auto& item : arenas) {
+            tbb::task_arena& arena = *std::get<arena_pointer>(item).get();
+            concurrency_type concurrency = std::get<arena_concurrency>(item);
+            tbb::task_arena::priority priority_value = std::get<arena_priority>(item);
+            auto& tg = std::get<associated_task_group>(item);
+
+            arena.execute([repeats, &barrier, &tg, priority_value, concurrency]() {
+                for (unsigned i = 0; i < repeats * concurrency; ++i) {
+                    tg->run([&barrier, priority_value]() {
+                        while (!g_work_submitted.load(std::memory_order_acquire)) utils::yield();
+                        g_task_info[g_task_num++] = priority_value;
+                        barrier.wait();
+                    });
                 }
-            } // arena work submission functor
-        );
-    }
-}
-
-void wait_work_completion(
-    std::vector<arena_info>& arenas, std::size_t max_num_threads, unsigned overall_tasks_num )
-{
-    if( max_num_threads > 1 )
-        while( g_task_num < overall_tasks_num )
-            utils::yield();
-
-    for( auto& item : arenas ) {
-        tbb::task_arena& arena = *std::get<arena_pointer>(item).get();
-        auto& tg = std::get<associated_task_group>(item);
-        arena.execute( [&tg]() { tg->wait(); } );
+            }// arena work submission functor
+            );
+        }
     }
-    CHECK_MESSAGE(g_task_num == overall_tasks_num, "Not all tasks were executed.");
-}
-
-void test() {
 
-    const std::size_t max_num_threads = utils::get_platform_max_threads();
+    void wait_work_completion(std::vector<arena_info>& arenas, std::size_t max_num_threads,
+                              unsigned overall_tasks_num) {
+        if (max_num_threads > 1)
+            while (g_task_num < overall_tasks_num) utils::yield();
 
-    tbb::global_control control(tbb::global_control::max_allowed_parallelism, max_num_threads + 1);
-    concurrency_type signed_max_num_threads = static_cast<int>(max_num_threads);
-    if (1 == max_num_threads) {
-        // Skipping workerless case
-        return;
+        for (auto& item : arenas) {
+            tbb::task_arena& arena = *std::get<arena_pointer>(item).get();
+            auto& tg = std::get<associated_task_group>(item);
+            arena.execute([&tg]() { tg->wait(); });
+        }
+        CHECK_MESSAGE(g_task_num == overall_tasks_num, "Not all tasks were executed.");
     }
 
-    INFO( "max_num_threads = " << max_num_threads );
-    // TODO: iterate over threads to see that the work is going on in low priority arena.
+    void test() {
 
-    const int min_arena_concurrency = 2; // implementation detail
+        const std::size_t max_num_threads = utils::get_platform_max_threads();
 
-    tbb::task_arena::priority high   = tbb::task_arena::priority::high;
-    tbb::task_arena::priority normal = tbb::task_arena::priority::normal;
-    tbb::task_arena::priority low    = tbb::task_arena::priority::low;
+        tbb::global_control control(tbb::global_control::max_allowed_parallelism, max_num_threads + 1);
+        concurrency_type signed_max_num_threads = static_cast<int>(max_num_threads);
+        if (1 == max_num_threads) {
+            // Skipping workerless case
+            return;
+        }
 
-    // TODO: use vector or std::array of priorities instead of the c-style array.
+        INFO("max_num_threads = " << max_num_threads);
+        // TODO: iterate over threads to see that the work is going on in low priority arena.
 
-    // TODO: consider extending priorities to have more than three arenas.
+        const int min_arena_concurrency = 2;// implementation detail
 
-    tbb::task_arena::priority priorities[] = {high, normal, low}; // keep it sorted
-    const unsigned priorities_num = sizeof(priorities) / sizeof(priorities[0]);
-    const unsigned overall_arenas_num = priorities_num;
+        tbb::task_arena::priority high = tbb::task_arena::priority::high;
+        tbb::task_arena::priority normal = tbb::task_arena::priority::normal;
+        tbb::task_arena::priority low = tbb::task_arena::priority::low;
 
-    std::vector<arena_info> arenas;
+        // TODO: use vector or std::array of priorities instead of the c-style array.
 
-    std::vector<unsigned> progressing_arenas( overall_arenas_num, 0 );
-    std::iota( progressing_arenas.begin(), progressing_arenas.end(), 1 );
+        // TODO: consider extending priorities to have more than three arenas.
 
-    for( const auto& progressing_arenas_num : progressing_arenas ) {
+        tbb::task_arena::priority priorities[] = {high, normal, low};// keep it sorted
+        const unsigned priorities_num = sizeof(priorities) / sizeof(priorities[0]);
+        const unsigned overall_arenas_num = priorities_num;
 
-        INFO( "progressing_arenas_num = " << progressing_arenas_num );
+        std::vector<arena_info> arenas;
 
-        // TODO: consider populating vector with arenas in separate function.
-        unsigned adjusted_progressing_arenas = progressing_arenas_num;
+        std::vector<unsigned> progressing_arenas(overall_arenas_num, 0);
+        std::iota(progressing_arenas.begin(), progressing_arenas.end(), 1);
 
-        arenas.clear();
-        g_task_num = 0;
+        for (const auto& progressing_arenas_num : progressing_arenas) {
 
-        concurrency_type projected_concurrency =
-            (signed_max_num_threads + progressing_arenas_num - 1) / progressing_arenas_num;
-        projected_concurrency = std::max(min_arena_concurrency, projected_concurrency); // implementation detail
-        adjusted_progressing_arenas = signed_max_num_threads / projected_concurrency;
+            INFO("progressing_arenas_num = " << progressing_arenas_num);
 
-        int threads_left = signed_max_num_threads;
+            // TODO: consider populating vector with arenas in separate function.
+            unsigned adjusted_progressing_arenas = progressing_arenas_num;
 
-        // Instantiate arenas with necessary concurrency so that progressing arenas consume all
-        // available threads.
-        for( unsigned arena_idx = 0; arena_idx < overall_arenas_num; ++arena_idx ) {
-            tbb::task_arena::priority a_priority = priorities[arena_idx];
+            arenas.clear();
+            g_task_num = 0;
 
-            concurrency_type concurrency = projected_concurrency;
-            concurrency_type actual_concurrency = projected_concurrency;
-            if( threads_left < actual_concurrency ||
-                arena_idx == adjusted_progressing_arenas - 1 ) // give all remaining threads to last progressing arena
-            {
-                concurrency = actual_concurrency = threads_left;
-            }
+            concurrency_type projected_concurrency
+                    = (signed_max_num_threads + progressing_arenas_num - 1) / progressing_arenas_num;
+            projected_concurrency
+                    = std::max(min_arena_concurrency, projected_concurrency);// implementation detail
+            adjusted_progressing_arenas = signed_max_num_threads / projected_concurrency;
 
-            threads_left -= actual_concurrency;
+            int threads_left = signed_max_num_threads;
 
-            if( !actual_concurrency ) {
-                concurrency = tbb::task_arena::automatic;
-                actual_concurrency = signed_max_num_threads;
-            }
-            actual_concurrency = std::max( min_arena_concurrency, actual_concurrency ); // implementation detail
-
-            tbb::task_arena* arena = allocate_and_construct_arena(concurrency, a_priority);
-            arenas.push_back(
-                std::make_tuple(
-                    std::unique_ptr<tbb::task_arena>(arena),
-                    actual_concurrency,
-                    a_priority,
-                    std::unique_ptr<tbb::task_group>(new tbb::task_group)
-                )
-            );
-        }
+            // Instantiate arenas with necessary concurrency so that progressing arenas consume all
+            // available threads.
+            for (unsigned arena_idx = 0; arena_idx < overall_arenas_num; ++arena_idx) {
+                tbb::task_arena::priority a_priority = priorities[arena_idx];
 
-        std::rotate( arenas.begin(), arenas.begin() + progressing_arenas_num - 1, arenas.end() );
+                concurrency_type concurrency = projected_concurrency;
+                concurrency_type actual_concurrency = projected_concurrency;
+                if (threads_left < actual_concurrency
+                    || arena_idx
+                               == adjusted_progressing_arenas
+                                          - 1)// give all remaining threads to last progressing arena
+                {
+                    concurrency = actual_concurrency = threads_left;
+                }
 
-        const unsigned repeats = 10;
+                threads_left -= actual_concurrency;
 
-        unsigned overall_tasks_num = 0;
-        for( auto& item : arenas )
-            overall_tasks_num += std::get<arena_concurrency>(item) * repeats;
+                if (!actual_concurrency) {
+                    concurrency = tbb::task_arena::automatic;
+                    actual_concurrency = signed_max_num_threads;
+                }
+                actual_concurrency
+                        = std::max(min_arena_concurrency, actual_concurrency);// implementation detail
 
-        prepare_logging_data( g_task_info, overall_tasks_num );
+                tbb::task_arena* arena = allocate_and_construct_arena(concurrency, a_priority);
+                arenas.push_back(std::make_tuple(std::unique_ptr<tbb::task_arena>(arena), actual_concurrency,
+                                                 a_priority,
+                                                 std::unique_ptr<tbb::task_group>(new tbb::task_group)));
+            }
 
-        g_work_submitted = false;
+            std::rotate(arenas.begin(), arenas.begin() + progressing_arenas_num - 1, arenas.end());
 
-        utils::SpinBarrier barrier{ max_num_threads };
-        submit_work( arenas, repeats, barrier );
+            const unsigned repeats = 10;
 
-        g_work_submitted = true;
+            unsigned overall_tasks_num = 0;
+            for (auto& item : arenas) overall_tasks_num += std::get<arena_concurrency>(item) * repeats;
 
-        wait_work_completion( arenas, max_num_threads, overall_tasks_num );
+            prepare_logging_data(g_task_info, overall_tasks_num);
 
-        std::map<tbb::task_arena::priority, unsigned> wasted_tasks;
+            g_work_submitted = false;
 
-        tbb::task_arena::priority* end_ptr = priorities + adjusted_progressing_arenas;
+            utils::SpinBarrier barrier {max_num_threads};
+            submit_work(arenas, repeats, barrier);
 
-        {
-            // First epoch - check progressing arenas only
-            unsigned overall_progressing_arenas_tasks_num = 0;
-            std::map<tbb::task_arena::priority, unsigned> per_priority_tasks_num;
+            g_work_submitted = true;
 
-            // Due to indeterministic submission of tasks in the beginning, count tasks priorities up
-            // to additional epoch. Assume threads are rebalanced once the work is submitted.
-            unsigned last_task_idx = std::min((repeats + 1) * unsigned(max_num_threads), overall_tasks_num);
-            for( unsigned i = 0; i < last_task_idx; ++i ) {
-                tbb::task_arena::priority p = g_task_info[i];
-                ++per_priority_tasks_num[p];
+            wait_work_completion(arenas, max_num_threads, overall_tasks_num);
 
-                overall_progressing_arenas_tasks_num += (int)(
-                    end_ptr != std::find(priorities, end_ptr, p)
-                );
+            std::map<tbb::task_arena::priority, unsigned> wasted_tasks;
 
-                if( i < max_num_threads || i >= repeats * max_num_threads )
-                    ++wasted_tasks[p];
-            }
+            tbb::task_arena::priority* end_ptr = priorities + adjusted_progressing_arenas;
 
-            unsigned expected_overall_progressing_arenas_tasks_num = 0;
-            for( unsigned i = 0; i < adjusted_progressing_arenas; ++i ) {
-                tbb::task_arena::priority p = priorities[i];
-                concurrency_type concurrency = 0;
-                for( auto& item : arenas ) {
-                    if( std::get<arena_priority>(item) == p ) {
-                        concurrency = std::get<arena_concurrency>(item);
-                        break;
-                    }
+            {
+                // First epoch - check progressing arenas only
+                unsigned overall_progressing_arenas_tasks_num = 0;
+                std::map<tbb::task_arena::priority, unsigned> per_priority_tasks_num;
+
+                // Due to indeterministic submission of tasks in the beginning, count tasks priorities up
+                // to additional epoch. Assume threads are rebalanced once the work is submitted.
+                unsigned last_task_idx
+                        = std::min((repeats + 1) * unsigned(max_num_threads), overall_tasks_num);
+                for (unsigned i = 0; i < last_task_idx; ++i) {
+                    tbb::task_arena::priority p = g_task_info[i];
+                    ++per_priority_tasks_num[p];
+
+                    overall_progressing_arenas_tasks_num
+                            += (int) (end_ptr != std::find(priorities, end_ptr, p));
+
+                    if (i < max_num_threads || i >= repeats * max_num_threads) ++wasted_tasks[p];
                 }
-                unsigned expected_tasks_num = repeats * concurrency;
 
-                CHECK_MESSAGE( expected_tasks_num == per_priority_tasks_num[p],
-                               "Unexpected number of executed tasks in arena with index " << i << " and concurrency = " << concurrency ) ;
+                unsigned expected_overall_progressing_arenas_tasks_num = 0;
+                for (unsigned i = 0; i < adjusted_progressing_arenas; ++i) {
+                    tbb::task_arena::priority p = priorities[i];
+                    concurrency_type concurrency = 0;
+                    for (auto& item : arenas) {
+                        if (std::get<arena_priority>(item) == p) {
+                            concurrency = std::get<arena_concurrency>(item);
+                            break;
+                        }
+                    }
+                    unsigned expected_tasks_num = repeats * concurrency;
+
+                    CHECK_MESSAGE(expected_tasks_num == per_priority_tasks_num[p],
+                                  "Unexpected number of executed tasks in arena with index "
+                                          << i << " and concurrency = " << concurrency);
 
-                expected_overall_progressing_arenas_tasks_num += expected_tasks_num;
+                    expected_overall_progressing_arenas_tasks_num += expected_tasks_num;
+                }
+                CHECK_MESSAGE(expected_overall_progressing_arenas_tasks_num
+                                      == overall_progressing_arenas_tasks_num,
+                              "Number of tasks for progressing arenas mismatched.");
             }
-            CHECK_MESSAGE(
-                expected_overall_progressing_arenas_tasks_num == overall_progressing_arenas_tasks_num,
-                "Number of tasks for progressing arenas mismatched."
-            );
-        }
-        {
-            // Other epochs - check remaining arenas
-            std::map<tbb::task_arena::priority, unsigned> per_priority_tasks_num;
+            {
+                // Other epochs - check remaining arenas
+                std::map<tbb::task_arena::priority, unsigned> per_priority_tasks_num;
 
-            std::size_t lower_priority_start = (repeats + 1) * max_num_threads;
-            for( std::size_t i = lower_priority_start; i < overall_tasks_num; ++i )
-                ++per_priority_tasks_num[ g_task_info[i] ];
+                std::size_t lower_priority_start = (repeats + 1) * max_num_threads;
+                for (std::size_t i = lower_priority_start; i < overall_tasks_num; ++i)
+                    ++per_priority_tasks_num[g_task_info[i]];
 
-            for( auto& e : per_priority_tasks_num ) {
-                auto priority = e.first;
-                auto tasks_num = e.second;
+                for (auto& e : per_priority_tasks_num) {
+                    auto priority = e.first;
+                    auto tasks_num = e.second;
 
-                auto priorities_it = std::find( end_ptr, priorities + priorities_num, priority );
-                CHECK_MESSAGE( priorities_it != priorities + priorities_num,
-                               "Tasks from prioritized arena got deferred." );
+                    auto priorities_it = std::find(end_ptr, priorities + priorities_num, priority);
+                    CHECK_MESSAGE(priorities_it != priorities + priorities_num,
+                                  "Tasks from prioritized arena got deferred.");
 
-                auto it = std::find_if(
-                    arenas.begin(), arenas.end(),
-                    [priority](arena_info& info) {
+                    auto it = std::find_if(arenas.begin(), arenas.end(), [priority](arena_info& info) {
                         return std::get<arena_priority>(info) == priority;
-                    }
-                );
-                auto per_arena_tasks_num = repeats * std::get<arena_concurrency>(*it);
-                CHECK_MESSAGE(
-                    tasks_num == per_arena_tasks_num - wasted_tasks[priority],
-                    "Incorrect number of tasks from deferred (non-progressing) arenas were executed."
-                );
-            }
-        } // Other epochs
-    } // loop over simultaneously progressing arenas
-
-    INFO( "Done\n" );
-}
+                    });
+                    auto per_arena_tasks_num = repeats * std::get<arena_concurrency>(*it);
+                    CHECK_MESSAGE(tasks_num == per_arena_tasks_num - wasted_tasks[priority],
+                                  "Incorrect number of tasks from deferred (non-progressing) arenas were "
+                                  "executed.");
+                }
+            }// Other epochs
+        }    // loop over simultaneously progressing arenas
 
-} // namespace HighPriorityArenasTakeExecutionPrecedence
+        INFO("Done\n");
+    }
 
+}// namespace HighPriorityArenasTakeExecutionPrecedence
 
 // TODO: nested arena case
 //! Test for setting a priority to arena
 //! \brief \ref requirement
-TEST_CASE("Arena priorities") {
-    HighPriorityArenasTakeExecutionPrecedence::test();
-}
+TEST_CASE("Arena priorities") { HighPriorityArenasTakeExecutionPrecedence::test(); }
diff --git a/external/tbb/test/tbb/test_async_node.cpp b/external/tbb/test/tbb/test_async_node.cpp
index edab0c38..88857055 100644
--- a/external/tbb/test/tbb/test_async_node.cpp
+++ b/external/tbb/test/tbb/test_async_node.cpp
@@ -15,35 +15,33 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
 #endif
 
 #include "common/config.h"
 
 #include "tbb/flow_graph.h"
 
-#include "tbb/task.h"
 #include "tbb/global_control.h"
+#include "tbb/task.h"
 
-#include "common/test.h"
-#include "common/utils.h"
-#include "common/utils_assert.h"
+#include "common/concepts_common.h"
 #include "common/graph_utils.h"
 #include "common/spin_barrier.h"
+#include "common/test.h"
 #include "common/test_follows_and_precedes_api.h"
-#include "common/concepts_common.h"
+#include "common/utils.h"
+#include "common/utils_assert.h"
 
+#include <mutex>
 #include <string>
 #include <thread>
-#include <mutex>
-
 
 //! \file test_async_node.cpp
 //! \brief Test for [flow_graph.async_node] specification
 
-
 class minimal_type {
-    template<typename T>
+    template <typename T>
     friend struct place_wrapper;
 
     int value;
@@ -51,8 +49,11 @@ class minimal_type {
 public:
     minimal_type() : value(-1) {}
     minimal_type(int v) : value(v) {}
-    minimal_type(const minimal_type &m) : value(m.value) { }
-    minimal_type &operator=(const minimal_type &m) { value = m.value; return *this; }
+    minimal_type(const minimal_type& m) : value(m.value) {}
+    minimal_type& operator=(const minimal_type& m) {
+        value = m.value;
+        return *this;
+    }
 };
 
 template <typename T>
@@ -61,12 +62,10 @@ struct place_wrapper {
     T value;
     std::thread::id thread_id;
 
-    place_wrapper( int v = 0 ) : value(v), thread_id(std::this_thread::get_id()) {}
+    place_wrapper(int v = 0) : value(v), thread_id(std::this_thread::get_id()) {}
 
     template <typename Q>
-    place_wrapper(const place_wrapper<Q>& v)
-        : value(v.value), thread_id(v.thread_id)
-    {}
+    place_wrapper(const place_wrapper<Q>& v) : value(v.value), thread_id(v.thread_id) {}
 
     template <typename Q>
     place_wrapper<Q>& operator=(const place_wrapper<Q>& v) {
@@ -76,24 +75,21 @@ struct place_wrapper {
         }
         return *this;
     }
-
 };
 
-template<typename T1, typename T2>
+template <typename T1, typename T2>
 struct wrapper_helper {
-    static void check(const T1 &, const T2 &) { }
-    static void copy_value(const T1 &in, T2 &out) { out = in; }
+    static void check(const T1&, const T2&) {}
+    static void copy_value(const T1& in, T2& out) { out = in; }
 };
 
-template<typename T1, typename T2>
-struct wrapper_helper< place_wrapper<T1>, place_wrapper<T2> > {
-    static void check(const place_wrapper<T1> &a, const place_wrapper<T2> &b) {
-       CHECK_MESSAGE( ( (a.thread_id != b.thread_id)), "same thread used to execute adjacent nodes");
-       return;
-    }
-    static void copy_value(const place_wrapper<T1> &in, place_wrapper<T2> &out) {
-        out.value = in.value;
+template <typename T1, typename T2>
+struct wrapper_helper<place_wrapper<T1>, place_wrapper<T2>> {
+    static void check(const place_wrapper<T1>& a, const place_wrapper<T2>& b) {
+        CHECK_MESSAGE(((a.thread_id != b.thread_id)), "same thread used to execute adjacent nodes");
+        return;
     }
+    static void copy_value(const place_wrapper<T1>& in, place_wrapper<T2>& out) { out.value = in.value; }
 };
 
 const int NUMBER_OF_MSGS = 10;
@@ -103,27 +99,28 @@ std::atomic<int> async_activity_processed_msg_count;
 std::atomic<int> end_body_exec_count;
 
 // queueing required in test_reset for testing of cancellation
-typedef tbb::flow::async_node< int, int, tbb::flow::queueing > counting_async_node_type;
+typedef tbb::flow::async_node<int, int, tbb::flow::queueing> counting_async_node_type;
 typedef counting_async_node_type::gateway_type counting_gateway_type;
 
 struct counting_async_unlimited_body {
 
-    counting_async_unlimited_body(tbb::task_group_context& graph_tgc) : my_tgc( graph_tgc ) {}
+    counting_async_unlimited_body(tbb::task_group_context& graph_tgc) : my_tgc(graph_tgc) {}
 
-    void operator()( const int &input, counting_gateway_type& gateway) {
+    void operator()(const int& input, counting_gateway_type& gateway) {
         // TODO revamp: reconsider logging for the tests. It is known that frequent calls to
         // doctest's INFO cause issues.
 
         // INFO( "Body execution with input == " << input << "\n");
         ++async_body_exec_count;
-        if ( input == -1 ) {
+        if (input == -1) {
             bool result = my_tgc.cancel_group_execution();
             // INFO( "Canceling graph execution\n" );
-            CHECK_MESSAGE( ( result == true), "attempted to cancel graph twice" );
+            CHECK_MESSAGE((result == true), "attempted to cancel graph twice");
             utils::Sleep(50);
         }
         gateway.try_put(input);
     }
+
 private:
     tbb::task_group_context& my_tgc;
 };
@@ -132,12 +129,11 @@ struct counting_async_serial_body : counting_async_unlimited_body {
     typedef counting_async_unlimited_body base_type;
     int my_async_body_exec_count;
 
-    counting_async_serial_body(tbb::task_group_context& tgc)
-        : base_type(tgc), my_async_body_exec_count( 0 ) { }
+    counting_async_serial_body(tbb::task_group_context& tgc) : base_type(tgc), my_async_body_exec_count(0) {}
 
-    void operator()( const int &input, counting_gateway_type& gateway ) {
+    void operator()(const int& input, counting_gateway_type& gateway) {
         ++my_async_body_exec_count;
-        base_type::operator()( input, gateway );
+        base_type::operator()(input, gateway);
     }
 };
 
@@ -147,158 +143,141 @@ void test_reset() {
 
     tbb::task_group_context graph_ctx;
     tbb::flow::graph g(graph_ctx);
-    counting_async_node_type a(g, tbb::flow::serial, counting_async_serial_body(graph_ctx) );
+    counting_async_node_type a(g, tbb::flow::serial, counting_async_serial_body(graph_ctx));
 
     const int R = 3;
-    std::vector< std::shared_ptr<harness_counting_receiver<int>> > r;
-    for (size_t i = 0; i < R; ++i) {
-        r.push_back( std::make_shared<harness_counting_receiver<int>>(g) );
-    }
+    std::vector<std::shared_ptr<harness_counting_receiver<int>>> r;
+    for (size_t i = 0; i < R; ++i) { r.push_back(std::make_shared<harness_counting_receiver<int>>(g)); }
 
-    for (int i = 0; i < R; ++i) {
-        tbb::flow::make_edge(a, *r[i]);
-    }
+    for (int i = 0; i < R; ++i) { tbb::flow::make_edge(a, *r[i]); }
 
-    INFO( "One body execution\n" );
+    INFO("One body execution\n");
     a.try_put(-1);
-    for (int i = 0; i < N; ++i) {
-       a.try_put(i);
-    }
+    for (int i = 0; i < N; ++i) { a.try_put(i); }
     g.wait_for_all();
     // should be canceled with only 1 item reaching the async_body and the counting receivers
     // and N items left in the node's queue
-    CHECK_MESSAGE( ( g.is_cancelled() == true), "task group not canceled" );
+    CHECK_MESSAGE((g.is_cancelled() == true), "task group not canceled");
 
     counting_async_serial_body b1 = tbb::flow::copy_body<counting_async_serial_body>(a);
-    CHECK_MESSAGE( ( int(async_body_exec_count) == int(b1.my_async_body_exec_count)), "body and global body counts are different" );
-    CHECK_MESSAGE( ( int(async_body_exec_count) == 1), "global body execution count not 1"  );
+    CHECK_MESSAGE((int(async_body_exec_count) == int(b1.my_async_body_exec_count)),
+                  "body and global body counts are different");
+    CHECK_MESSAGE((int(async_body_exec_count) == 1), "global body execution count not 1");
     for (int i = 0; i < R; ++i) {
-        CHECK_MESSAGE( ( int(r[i]->my_count) == 1), "counting receiver count not 1" );
+        CHECK_MESSAGE((int(r[i]->my_count) == 1), "counting receiver count not 1");
     }
 
     // should clear the async_node queue, but retain its local count at 1 and keep all edges
     g.reset(tbb::flow::rf_reset_protocol);
 
-    INFO( "N body executions\n" );
-    for (int i = 0; i < N; ++i) {
-       a.try_put(i);
-    }
+    INFO("N body executions\n");
+    for (int i = 0; i < N; ++i) { a.try_put(i); }
     g.wait_for_all();
-    CHECK_MESSAGE( ( g.is_cancelled() == false), "task group not canceled" );
+    CHECK_MESSAGE((g.is_cancelled() == false), "task group not canceled");
 
     // a total of N+1 items should have passed through the node body
     // the local body count should also be N+1
     // and the counting receivers should all have a count of N+1
     counting_async_serial_body b2 = tbb::flow::copy_body<counting_async_serial_body>(a);
-    CHECK_MESSAGE( int(async_body_exec_count) == int(b2.my_async_body_exec_count),
-                   "local and global body execution counts are different" );
-    INFO( "async_body_exec_count==" << int(async_body_exec_count) << "\n" );
-    CHECK_MESSAGE( ( int(async_body_exec_count) == N+1), "global body execution count not N+1"  );
+    CHECK_MESSAGE(int(async_body_exec_count) == int(b2.my_async_body_exec_count),
+                  "local and global body execution counts are different");
+    INFO("async_body_exec_count==" << int(async_body_exec_count) << "\n");
+    CHECK_MESSAGE((int(async_body_exec_count) == N + 1), "global body execution count not N+1");
     for (int i = 0; i < R; ++i) {
-        CHECK_MESSAGE( ( int(r[i]->my_count) == N+1), "counting receiver has not received N+1 items" );
+        CHECK_MESSAGE((int(r[i]->my_count) == N + 1), "counting receiver has not received N+1 items");
     }
 
-    INFO( "N body executions with new bodies\n" );
+    INFO("N body executions with new bodies\n");
     // should clear the async_node queue and reset its local count to 0, but keep all edges
     g.reset(tbb::flow::rf_reset_bodies);
-    for (int i = 0; i < N; ++i) {
-       a.try_put(i);
-    }
+    for (int i = 0; i < N; ++i) { a.try_put(i); }
     g.wait_for_all();
-    CHECK_MESSAGE( ( g.is_cancelled() == false), "task group not canceled" );
+    CHECK_MESSAGE((g.is_cancelled() == false), "task group not canceled");
 
     // a total of 2N+1 items should have passed through the node body
     // the local body count should be N
     // and the counting receivers should all have a count of 2N+1
     counting_async_serial_body b3 = tbb::flow::copy_body<counting_async_serial_body>(a);
-    CHECK_MESSAGE( ( int(async_body_exec_count) == 2*N+1), "global body execution count not 2N+1"  );
-    CHECK_MESSAGE( ( int(b3.my_async_body_exec_count) == N), "local body execution count not N"  );
+    CHECK_MESSAGE((int(async_body_exec_count) == 2 * N + 1), "global body execution count not 2N+1");
+    CHECK_MESSAGE((int(b3.my_async_body_exec_count) == N), "local body execution count not N");
     for (int i = 0; i < R; ++i) {
-        CHECK_MESSAGE( ( int(r[i]->my_count) == 2*N+1), "counting receiver has not received 2N+1 items" );
+        CHECK_MESSAGE((int(r[i]->my_count) == 2 * N + 1), "counting receiver has not received 2N+1 items");
     }
 
     // should clear the async_node queue and keep its local count at N and remove all edges
-    INFO( "N body executions with no edges\n" );
+    INFO("N body executions with no edges\n");
     g.reset(tbb::flow::rf_clear_edges);
-    for (int i = 0; i < N; ++i) {
-       a.try_put(i);
-    }
+    for (int i = 0; i < N; ++i) { a.try_put(i); }
     g.wait_for_all();
-    CHECK_MESSAGE( ( g.is_cancelled() == false), "task group not canceled" );
+    CHECK_MESSAGE((g.is_cancelled() == false), "task group not canceled");
 
     // a total of 3N+1 items should have passed through the node body
     // the local body count should now be 2*N
     // and the counting receivers should remain at a count of 2N+1
     counting_async_serial_body b4 = tbb::flow::copy_body<counting_async_serial_body>(a);
-    CHECK_MESSAGE( ( int(async_body_exec_count) == 3*N+1), "global body execution count not 3N+1"  );
-    CHECK_MESSAGE( ( int(b4.my_async_body_exec_count) == 2*N), "local body execution count not 2N"  );
+    CHECK_MESSAGE((int(async_body_exec_count) == 3 * N + 1), "global body execution count not 3N+1");
+    CHECK_MESSAGE((int(b4.my_async_body_exec_count) == 2 * N), "local body execution count not 2N");
     for (int i = 0; i < R; ++i) {
-        CHECK_MESSAGE( ( int(r[i]->my_count) == 2*N+1), "counting receiver has not received 2N+1 items" );
+        CHECK_MESSAGE((int(r[i]->my_count) == 2 * N + 1), "counting receiver has not received 2N+1 items");
     }
 
     // put back 1 edge to receiver 0
-    INFO( "N body executions with 1 edge\n" );
+    INFO("N body executions with 1 edge\n");
     tbb::flow::make_edge(a, *r[0]);
-    for (int i = 0; i < N; ++i) {
-       a.try_put(i);
-    }
+    for (int i = 0; i < N; ++i) { a.try_put(i); }
     g.wait_for_all();
-    CHECK_MESSAGE( ( g.is_cancelled() == false), "task group not canceled" );
+    CHECK_MESSAGE((g.is_cancelled() == false), "task group not canceled");
 
     // a total of 4N+1 items should have passed through the node body
     // the local body count should now be 3*N
     // and all of the counting receivers should remain at a count of 2N+1, except r[0] which should be 3N+1
     counting_async_serial_body b5 = tbb::flow::copy_body<counting_async_serial_body>(a);
-    CHECK_MESSAGE( ( int(async_body_exec_count) == 4*N+1), "global body execution count not 4N+1"  );
-    CHECK_MESSAGE( ( int(b5.my_async_body_exec_count) == 3*N), "local body execution count not 3N"  );
-    CHECK_MESSAGE( ( int(r[0]->my_count) == 3*N+1), "counting receiver has not received 3N+1 items" );
+    CHECK_MESSAGE((int(async_body_exec_count) == 4 * N + 1), "global body execution count not 4N+1");
+    CHECK_MESSAGE((int(b5.my_async_body_exec_count) == 3 * N), "local body execution count not 3N");
+    CHECK_MESSAGE((int(r[0]->my_count) == 3 * N + 1), "counting receiver has not received 3N+1 items");
     for (int i = 1; i < R; ++i) {
-        CHECK_MESSAGE( ( int(r[i]->my_count) == 2*N+1), "counting receiver has not received 2N+1 items" );
+        CHECK_MESSAGE((int(r[i]->my_count) == 2 * N + 1), "counting receiver has not received 2N+1 items");
     }
 
     // should clear the async_node queue and keep its local count at N and remove all edges
-    INFO( "N body executions with no edges and new body\n" );
-    g.reset(static_cast<tbb::flow::reset_flags>(tbb::flow::rf_reset_bodies|tbb::flow::rf_clear_edges));
-    for (int i = 0; i < N; ++i) {
-       a.try_put(i);
-    }
+    INFO("N body executions with no edges and new body\n");
+    g.reset(static_cast<tbb::flow::reset_flags>(tbb::flow::rf_reset_bodies | tbb::flow::rf_clear_edges));
+    for (int i = 0; i < N; ++i) { a.try_put(i); }
     g.wait_for_all();
-    CHECK_MESSAGE( ( g.is_cancelled() == false), "task group not canceled" );
+    CHECK_MESSAGE((g.is_cancelled() == false), "task group not canceled");
 
     // a total of 4N+1 items should have passed through the node body
     // the local body count should now be 3*N
     // and all of the counting receivers should remain at a count of 2N+1, except r[0] which should be 3N+1
     counting_async_serial_body b6 = tbb::flow::copy_body<counting_async_serial_body>(a);
-    CHECK_MESSAGE( ( int(async_body_exec_count) == 5*N+1), "global body execution count not 5N+1"  );
-    CHECK_MESSAGE( ( int(b6.my_async_body_exec_count) == N), "local body execution count not N"  );
-    CHECK_MESSAGE( ( int(r[0]->my_count) == 3*N+1), "counting receiver has not received 3N+1 items" );
+    CHECK_MESSAGE((int(async_body_exec_count) == 5 * N + 1), "global body execution count not 5N+1");
+    CHECK_MESSAGE((int(b6.my_async_body_exec_count) == N), "local body execution count not N");
+    CHECK_MESSAGE((int(r[0]->my_count) == 3 * N + 1), "counting receiver has not received 3N+1 items");
     for (int i = 1; i < R; ++i) {
-        CHECK_MESSAGE( ( int(r[i]->my_count) == 2*N+1), "counting receiver has not received 2N+1 items" );
+        CHECK_MESSAGE((int(r[i]->my_count) == 2 * N + 1), "counting receiver has not received 2N+1 items");
     }
 }
 
-
 #include <mutex>
 
 template <typename T>
 class async_activity_queue {
 public:
-    void push( const T& item ) {
-        std::lock_guard<mutex_t> lock( m_mutex );
-        m_queue.push( item );
+    void push(const T& item) {
+        std::lock_guard<mutex_t> lock(m_mutex);
+        m_queue.push(item);
     }
 
-    bool try_pop( T& item ) {
-        std::lock_guard<mutex_t> lock( m_mutex );
-        if( m_queue.empty() )
-            return false;
+    bool try_pop(T& item) {
+        std::lock_guard<mutex_t> lock(m_mutex);
+        if (m_queue.empty()) return false;
         item = m_queue.front();
         m_queue.pop();
         return true;
     }
 
     bool empty() {
-        std::lock_guard<mutex_t> lock( m_mutex );
+        std::lock_guard<mutex_t> lock(m_mutex);
         return m_queue.empty();
     }
 
@@ -308,12 +287,12 @@ class async_activity_queue {
     std::queue<T> m_queue;
 };
 
-template< typename Input, typename Output >
+template <typename Input, typename Output>
 class async_activity : utils::NoAssign {
 public:
     typedef Input input_type;
     typedef Output output_type;
-    typedef tbb::flow::async_node< input_type, output_type > async_node_type;
+    typedef tbb::flow::async_node<input_type, output_type> async_node_type;
     typedef typename async_node_type::gateway_type gateway_type;
 
     struct work_type {
@@ -323,25 +302,22 @@ class async_activity : utils::NoAssign {
 
     class ServiceThreadBody {
     public:
-        ServiceThreadBody( async_activity* activity ) : my_activity( activity ) {}
+        ServiceThreadBody(async_activity* activity) : my_activity(activity) {}
         void operator()() { my_activity->process(); }
+
     private:
         async_activity* my_activity;
     };
 
     async_activity(int expected_items, bool deferred = false, int sleep_time = 50)
-        : my_expected_items(expected_items), my_sleep_time(sleep_time)
-    {
+        : my_expected_items(expected_items), my_sleep_time(sleep_time) {
         is_active = !deferred;
         my_quit = false;
-        std::thread( ServiceThreadBody( this ) ).swap( my_service_thread );
+        std::thread(ServiceThreadBody(this)).swap(my_service_thread);
     }
 
 private:
-
-    async_activity( const async_activity& )
-        : my_expected_items(UNKNOWN_NUMBER_OF_ITEMS), my_sleep_time(0)
-    {
+    async_activity(const async_activity&) : my_expected_items(UNKNOWN_NUMBER_OF_ITEMS), my_sleep_time(0) {
         is_active = true;
     }
 
@@ -351,62 +327,56 @@ class async_activity : utils::NoAssign {
         my_service_thread.join();
     }
 
-    void submit( const input_type &input, gateway_type& gateway ) {
+    void submit(const input_type& input, gateway_type& gateway) {
         work_type work = {input, &gateway};
-        my_work_queue.push( work );
+        my_work_queue.push(work);
     }
 
     void process() {
         do {
             work_type work;
-            if( is_active && my_work_queue.try_pop( work ) ) {
+            if (is_active && my_work_queue.try_pop(work)) {
                 utils::Sleep(my_sleep_time);
                 ++async_activity_processed_msg_count;
                 output_type output;
                 wrapper_helper<output_type, output_type>::copy_value(work.input, output);
                 wrapper_helper<output_type, output_type>::check(work.input, output);
                 work.gateway->try_put(output);
-                if ( my_expected_items == UNKNOWN_NUMBER_OF_ITEMS ||
-                     int(async_activity_processed_msg_count) == my_expected_items ) {
+                if (my_expected_items == UNKNOWN_NUMBER_OF_ITEMS
+                    || int(async_activity_processed_msg_count) == my_expected_items) {
                     work.gateway->release_wait();
                 }
             }
-        } while( my_quit == false || !my_work_queue.empty());
+        } while (my_quit == false || !my_work_queue.empty());
     }
 
-    void stop() {
-        my_quit = true;
-    }
+    void stop() { my_quit = true; }
 
-    void activate() {
-        is_active = true;
-    }
+    void activate() { is_active = true; }
 
     bool should_reserve_each_time() {
-        if ( my_expected_items == UNKNOWN_NUMBER_OF_ITEMS )
-            return true;
+        if (my_expected_items == UNKNOWN_NUMBER_OF_ITEMS) return true;
         else
             return false;
     }
 
 private:
-
     const int my_expected_items;
     const int my_sleep_time;
-    std::atomic< bool > is_active;
+    std::atomic<bool> is_active;
 
     async_activity_queue<work_type> my_work_queue;
 
-    std::atomic< bool > my_quit;
+    std::atomic<bool> my_quit;
 
     std::thread my_service_thread;
 };
 
-template<typename Input, typename Output>
+template <typename Input, typename Output>
 struct basic_test {
     typedef Input input_type;
     typedef Output output_type;
-    typedef tbb::flow::async_node< input_type, output_type > async_node_type;
+    typedef tbb::flow::async_node<input_type, output_type> async_node_type;
     typedef typename async_node_type::gateway_type gateway_type;
 
     basic_test() {}
@@ -416,51 +386,43 @@ struct basic_test {
 
         tbb::flow::graph g;
 
-        tbb::flow::function_node< int, input_type > start_node(
-            g, tbb::flow::unlimited, [](int input) { return input_type(input); }
-        );
-        async_node_type offload_node(
-            g, tbb::flow::unlimited,
-            [&] (const input_type &input, gateway_type& gateway) {
-                ++async_body_exec_count;
-                if(my_async_activity.should_reserve_each_time())
-                    gateway.reserve_wait();
-                my_async_activity.submit(input, gateway);
-            }
-        );
-        tbb::flow::function_node< output_type > end_node(
-            g, tbb::flow::unlimited,
-            [&](const output_type& input) {
-                ++end_body_exec_count;
-                output_type output;
-                wrapper_helper<output_type, output_type>::check(input, output);
-            }
-        );
+        tbb::flow::function_node<int, input_type> start_node(g, tbb::flow::unlimited,
+                                                             [](int input) { return input_type(input); });
+        async_node_type offload_node(g, tbb::flow::unlimited,
+                                     [&](const input_type& input, gateway_type& gateway) {
+                                         ++async_body_exec_count;
+                                         if (my_async_activity.should_reserve_each_time())
+                                             gateway.reserve_wait();
+                                         my_async_activity.submit(input, gateway);
+                                     });
+        tbb::flow::function_node<output_type> end_node(
+                g, tbb::flow::unlimited, [&](const output_type& input) {
+                    ++end_body_exec_count;
+                    output_type output;
+                    wrapper_helper<output_type, output_type>::check(input, output);
+                });
 
-        tbb::flow::make_edge( start_node, offload_node );
-        tbb::flow::make_edge( offload_node, end_node );
+        tbb::flow::make_edge(start_node, offload_node);
+        tbb::flow::make_edge(offload_node, end_node);
 
         async_body_exec_count = 0;
         async_activity_processed_msg_count = 0;
         end_body_exec_count = 0;
 
-        if (async_expected_items != UNKNOWN_NUMBER_OF_ITEMS) {
-            offload_node.gateway().reserve_wait();
-        }
-        for (int i = 0; i < NUMBER_OF_MSGS; ++i) {
-            start_node.try_put(i);
-        }
+        if (async_expected_items != UNKNOWN_NUMBER_OF_ITEMS) { offload_node.gateway().reserve_wait(); }
+        for (int i = 0; i < NUMBER_OF_MSGS; ++i) { start_node.try_put(i); }
         g.wait_for_all();
-        CHECK_MESSAGE( ( async_body_exec_count == NUMBER_OF_MSGS), "AsyncBody processed wrong number of signals" );
-        CHECK_MESSAGE( ( async_activity_processed_msg_count == NUMBER_OF_MSGS), "AsyncActivity processed wrong number of signals" );
-        CHECK_MESSAGE( ( end_body_exec_count == NUMBER_OF_MSGS), "EndBody processed wrong number of signals");
-        INFO( "async_body_exec_count == " << int(async_body_exec_count) <<
-              " == async_activity_processed_msg_count == " << int(async_activity_processed_msg_count) <<
-              " == end_body_exec_count == " << int(end_body_exec_count) << "\n"
-        );
+        CHECK_MESSAGE((async_body_exec_count == NUMBER_OF_MSGS),
+                      "AsyncBody processed wrong number of signals");
+        CHECK_MESSAGE((async_activity_processed_msg_count == NUMBER_OF_MSGS),
+                      "AsyncActivity processed wrong number of signals");
+        CHECK_MESSAGE((end_body_exec_count == NUMBER_OF_MSGS), "EndBody processed wrong number of signals");
+        INFO("async_body_exec_count == "
+             << int(async_body_exec_count)
+             << " == async_activity_processed_msg_count == " << int(async_activity_processed_msg_count)
+             << " == end_body_exec_count == " << int(end_body_exec_count) << "\n");
         return 0;
     }
-
 };
 
 int test_copy_ctor() {
@@ -473,57 +435,54 @@ int test_copy_ctor() {
     harness_counting_receiver<int> r2(g);
 
     tbb::task_group_context graph_ctx;
-    counting_async_node_type a(g, tbb::flow::unlimited, counting_async_unlimited_body(graph_ctx) );
+    counting_async_node_type a(g, tbb::flow::unlimited, counting_async_unlimited_body(graph_ctx));
     counting_async_node_type b(a);
 
-    tbb::flow::make_edge(a, r1);                             // C++11-style of making edges
-    tbb::flow::make_edge(tbb::flow::output_port<0>(b), r2);  // usual way of making edges
+    tbb::flow::make_edge(a, r1);                           // C++11-style of making edges
+    tbb::flow::make_edge(tbb::flow::output_port<0>(b), r2);// usual way of making edges
 
-    for (int i = 0; i < N; ++i) {
-       a.try_put(i);
-    }
+    for (int i = 0; i < N; ++i) { a.try_put(i); }
     g.wait_for_all();
 
-    INFO("async_body_exec_count = " << int(async_body_exec_count) << "\n" );
-    INFO("r1.my_count == " << int(r1.my_count) << " and r2.my_count = " << int(r2.my_count) << "\n" );
-    CHECK_MESSAGE( ( int(async_body_exec_count) == NUMBER_OF_MSGS), "AsyncBody processed wrong number of signals" );
-    CHECK_MESSAGE( ( int(r1.my_count) == N), "counting receiver r1 has not received N items" );
-    CHECK_MESSAGE( ( int(r2.my_count) == 0), "counting receiver r2 has not received 0 items" );
+    INFO("async_body_exec_count = " << int(async_body_exec_count) << "\n");
+    INFO("r1.my_count == " << int(r1.my_count) << " and r2.my_count = " << int(r2.my_count) << "\n");
+    CHECK_MESSAGE((int(async_body_exec_count) == NUMBER_OF_MSGS),
+                  "AsyncBody processed wrong number of signals");
+    CHECK_MESSAGE((int(r1.my_count) == N), "counting receiver r1 has not received N items");
+    CHECK_MESSAGE((int(r2.my_count) == 0), "counting receiver r2 has not received 0 items");
 
-    for (int i = 0; i < N; ++i) {
-       b.try_put(i);
-    }
+    for (int i = 0; i < N; ++i) { b.try_put(i); }
     g.wait_for_all();
 
-    INFO("async_body_exec_count = " << int(async_body_exec_count) << "\n" );
-    INFO("r1.my_count == " << int(r1.my_count) << " and r2.my_count = " << int(r2.my_count) << "\n" );
-    CHECK_MESSAGE( ( int(async_body_exec_count) == 2*NUMBER_OF_MSGS), "AsyncBody processed wrong number of signals" );
-    CHECK_MESSAGE( ( int(r1.my_count) == N), "counting receiver r1 has not received N items" );
-    CHECK_MESSAGE( ( int(r2.my_count) == N), "counting receiver r2 has not received N items" );
+    INFO("async_body_exec_count = " << int(async_body_exec_count) << "\n");
+    INFO("r1.my_count == " << int(r1.my_count) << " and r2.my_count = " << int(r2.my_count) << "\n");
+    CHECK_MESSAGE((int(async_body_exec_count) == 2 * NUMBER_OF_MSGS),
+                  "AsyncBody processed wrong number of signals");
+    CHECK_MESSAGE((int(r1.my_count) == N), "counting receiver r1 has not received N items");
+    CHECK_MESSAGE((int(r2.my_count) == N), "counting receiver r2 has not received N items");
     return 0;
 }
 
 std::atomic<int> main_tid_count;
 
-template<typename Input, typename Output>
+template <typename Input, typename Output>
 struct spin_test {
     typedef Input input_type;
     typedef Output output_type;
-    typedef tbb::flow::async_node< input_type, output_type > async_node_type;
+    typedef tbb::flow::async_node<input_type, output_type> async_node_type;
     typedef typename async_node_type::gateway_type gateway_type;
 
     class end_body_type {
         typedef Output output_type;
         std::thread::id my_main_tid;
-        utils::SpinBarrier *my_barrier;
+        utils::SpinBarrier* my_barrier;
+
     public:
-        end_body_type(std::thread::id t, utils::SpinBarrier &b) : my_main_tid(t), my_barrier(&b) { }
+        end_body_type(std::thread::id t, utils::SpinBarrier& b) : my_main_tid(t), my_barrier(&b) {}
 
-        void operator()( const output_type & ) {
+        void operator()(const output_type&) {
             ++end_body_exec_count;
-            if (std::this_thread::get_id() == my_main_tid) {
-               ++main_tid_count;
-            }
+            if (std::this_thread::get_id() == my_main_tid) { ++main_tid_count; }
             my_barrier->wait();
         }
     };
@@ -536,75 +495,64 @@ struct spin_test {
         utils::SpinBarrier spin_barrier(nthreads);
 
         tbb::flow::graph g;
-        tbb::flow::function_node<int, input_type> start_node(
-            g, tbb::flow::unlimited, [](int input) { return input_type(input); }
-        );
-        async_node_type offload_node(
-            g, tbb::flow::unlimited,
-            [&](const input_type &input, gateway_type& gateway) {
-                ++async_body_exec_count;
-                if(my_async_activity.should_reserve_each_time())
-                    gateway.reserve_wait();
-                my_async_activity.submit(input, gateway);
-            }
-        );
+        tbb::flow::function_node<int, input_type> start_node(g, tbb::flow::unlimited,
+                                                             [](int input) { return input_type(input); });
+        async_node_type offload_node(g, tbb::flow::unlimited,
+                                     [&](const input_type& input, gateway_type& gateway) {
+                                         ++async_body_exec_count;
+                                         if (my_async_activity.should_reserve_each_time())
+                                             gateway.reserve_wait();
+                                         my_async_activity.submit(input, gateway);
+                                     });
         tbb::flow::function_node<output_type> end_node(
-            g, tbb::flow::unlimited, end_body_type(std::this_thread::get_id(), spin_barrier)
-        );
+                g, tbb::flow::unlimited, end_body_type(std::this_thread::get_id(), spin_barrier));
 
-        tbb::flow::make_edge( start_node, offload_node );
-        tbb::flow::make_edge( offload_node, end_node );
+        tbb::flow::make_edge(start_node, offload_node);
+        tbb::flow::make_edge(offload_node, end_node);
 
         async_body_exec_count = 0;
         async_activity_processed_msg_count = 0;
         end_body_exec_count = 0;
         main_tid_count = 0;
 
-        if (async_expected_items != UNKNOWN_NUMBER_OF_ITEMS ) {
-            offload_node.gateway().reserve_wait();
-        }
-        for (int i = 0; i < overall_message_count; ++i) {
-            start_node.try_put(i);
-        }
+        if (async_expected_items != UNKNOWN_NUMBER_OF_ITEMS) { offload_node.gateway().reserve_wait(); }
+        for (int i = 0; i < overall_message_count; ++i) { start_node.try_put(i); }
         g.wait_for_all();
-        CHECK_MESSAGE( (async_body_exec_count == overall_message_count),
-                       "AsyncBody processed wrong number of signals" );
-        CHECK_MESSAGE( (async_activity_processed_msg_count == overall_message_count),
-                       "AsyncActivity processed wrong number of signals" );
-        CHECK_MESSAGE( (end_body_exec_count == overall_message_count),
-                       "EndBody processed wrong number of signals");
-
-        INFO( "Main thread participated in " << main_tid_count << " end_body tasks\n");
-
-        INFO("async_body_exec_count == " << int(async_body_exec_count) <<
-             " == async_activity_processed_msg_count == " << int(async_activity_processed_msg_count) <<
-             " == end_body_exec_count == " << int(end_body_exec_count) << "\n"
-        );
+        CHECK_MESSAGE((async_body_exec_count == overall_message_count),
+                      "AsyncBody processed wrong number of signals");
+        CHECK_MESSAGE((async_activity_processed_msg_count == overall_message_count),
+                      "AsyncActivity processed wrong number of signals");
+        CHECK_MESSAGE((end_body_exec_count == overall_message_count),
+                      "EndBody processed wrong number of signals");
+
+        INFO("Main thread participated in " << main_tid_count << " end_body tasks\n");
+
+        INFO("async_body_exec_count == "
+             << int(async_body_exec_count)
+             << " == async_activity_processed_msg_count == " << int(async_activity_processed_msg_count)
+             << " == end_body_exec_count == " << int(end_body_exec_count) << "\n");
         return 0;
     }
-
 };
 
 void test_for_spin_avoidance() {
     const int nthreads = 4;
     tbb::global_control gc(tbb::global_control::max_allowed_parallelism, nthreads);
     tbb::task_arena a(nthreads);
-    a.execute([&] {
-        spin_test<int, int>::run(nthreads);
-    });
+    a.execute([&] { spin_test<int, int>::run(nthreads); });
 }
 
-template< typename Input, typename Output >
+template <typename Input, typename Output>
 int run_tests() {
     basic_test<Input, Output>::run();
     basic_test<Input, Output>::run(NUMBER_OF_MSGS);
-    basic_test<place_wrapper<Input>, place_wrapper<Output> >::run();
-    basic_test<place_wrapper<Input>, place_wrapper<Output> >::run(NUMBER_OF_MSGS);
+    basic_test<place_wrapper<Input>, place_wrapper<Output>>::run();
+    basic_test<place_wrapper<Input>, place_wrapper<Output>>::run(NUMBER_OF_MSGS);
     return 0;
 }
 
 #include "tbb/parallel_for.h"
-template<typename Input, typename Output>
+template <typename Input, typename Output>
 class enqueueing_on_inner_level {
     typedef Input input_type;
     typedef Output output_type;
@@ -614,25 +562,22 @@ class enqueueing_on_inner_level {
 
     class body_graph_with_async {
     public:
-        body_graph_with_async( utils::SpinBarrier& barrier, async_activity_type& activity )
+        body_graph_with_async(utils::SpinBarrier& barrier, async_activity_type& activity)
             : spin_barrier(&barrier), my_async_activity(&activity) {}
 
         void operator()(int) const {
             tbb::flow::graph g;
-            tbb::flow::function_node< int, input_type > start_node(
-                g, tbb::flow::unlimited, [](int input) { return input_type(input); }
-            );
-            async_node_type offload_node(
-                g, tbb::flow::unlimited,
-                [&](const input_type &input, gateway_type& gateway) {
-                    gateway.reserve_wait();
-                    my_async_activity->submit( input, gateway );
-                }
-            );
-            tbb::flow::function_node< output_type > end_node( g, tbb::flow::unlimited, [](output_type){} );
-
-            tbb::flow::make_edge( start_node, offload_node );
-            tbb::flow::make_edge( offload_node, end_node );
+            tbb::flow::function_node<int, input_type> start_node(g, tbb::flow::unlimited,
+                                                                 [](int input) { return input_type(input); });
+            async_node_type offload_node(g, tbb::flow::unlimited,
+                                         [&](const input_type& input, gateway_type& gateway) {
+                                             gateway.reserve_wait();
+                                             my_async_activity->submit(input, gateway);
+                                         });
+            tbb::flow::function_node<output_type> end_node(g, tbb::flow::unlimited, [](output_type) {});
+
+            tbb::flow::make_edge(start_node, offload_node);
+            tbb::flow::make_edge(offload_node, end_node);
 
             start_node.try_put(1);
 
@@ -649,14 +594,13 @@ class enqueueing_on_inner_level {
     };
 
 public:
-    static int run ()
-    {
+    static int run() {
         const int nthreads = tbb::this_task_arena::max_concurrency();
-        utils::SpinBarrier spin_barrier( nthreads );
+        utils::SpinBarrier spin_barrier(nthreads);
 
-        async_activity_type my_async_activity( UNKNOWN_NUMBER_OF_ITEMS, true );
+        async_activity_type my_async_activity(UNKNOWN_NUMBER_OF_ITEMS, true);
 
-        tbb::parallel_for( 0, nthreads, body_graph_with_async( spin_barrier, my_async_activity ) );
+        tbb::parallel_for(0, nthreads, body_graph_with_async(spin_barrier, my_async_activity));
         return 0;
     }
 };
@@ -669,7 +613,7 @@ int run_test_enqueueing_on_inner_level() {
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 #include <array>
 
-template<typename NodeType>
+template <typename NodeType>
 class AsyncActivity {
 public:
     using gateway_t = typename NodeType::gateway_type;
@@ -679,17 +623,18 @@ class AsyncActivity {
         gateway_t* gateway;
     };
 
-    AsyncActivity(size_t limit) : stop_limit(limit), c(0), thr([this]() {
-        while(!end_of_work()) {
-            work_type w;
-            while( my_q.try_pop(w) ) {
-                int res = do_work(w.input);
-                w.gateway->try_put(res);
-                w.gateway->release_wait();
-                ++c;
-            }
-        }
-    }) {}
+    AsyncActivity(size_t limit)
+        : stop_limit(limit), c(0), thr([this]() {
+              while (!end_of_work()) {
+                  work_type w;
+                  while (my_q.try_pop(w)) {
+                      int res = do_work(w.input);
+                      w.gateway->try_put(res);
+                      w.gateway->release_wait();
+                      ++c;
+                  }
+              }
+          }) {}
 
     void submit(int i, gateway_t* gateway) {
         work_type w = {i, gateway};
@@ -721,31 +666,25 @@ void test_follows() {
 
     AsyncActivity<node_t> async_activity(3);
 
-    std::array<broadcast_node<input_t>, 3> preds = {
-      {
-        broadcast_node<input_t>(g),
-        broadcast_node<input_t>(g),
-        broadcast_node<input_t>(g)
-      }
-    };
+    std::array<broadcast_node<input_t>, 3> preds
+            = {{broadcast_node<input_t>(g), broadcast_node<input_t>(g), broadcast_node<input_t>(g)}};
 
-    node_t node(follows(preds[0], preds[1], preds[2]), unlimited, [&](int input, node_t::gateway_type& gtw) {
-        async_activity.submit(input, &gtw);
-    }, no_priority);
+    node_t node(
+            follows(preds[0], preds[1], preds[2]), unlimited,
+            [&](int input, node_t::gateway_type& gtw) { async_activity.submit(input, &gtw); }, no_priority);
 
     buffer_node<output_t> buf(g);
     make_edge(node, buf);
 
-    for(auto& pred: preds) {
-        pred.try_put(1);
-    }
+    for (auto& pred : preds) { pred.try_put(1); }
 
     g.wait_for_all();
     async_activity.wait_for_all();
 
     output_t storage;
-    CHECK_MESSAGE((buf.try_get(storage) && buf.try_get(storage) && buf.try_get(storage) && !buf.try_get(storage)),
-                  "Not exact edge quantity was made");
+    CHECK_MESSAGE(
+            (buf.try_get(storage) && buf.try_get(storage) && buf.try_get(storage) && !buf.try_get(storage)),
+            "Not exact edge quantity was made");
 }
 
 void test_precedes() {
@@ -759,13 +698,13 @@ void test_precedes() {
 
     AsyncActivity<node_t> async_activity(1);
 
-    std::array<buffer_node<input_t>, 1> successors = { {buffer_node<input_t>(g)} };
+    std::array<buffer_node<input_t>, 1> successors = {{buffer_node<input_t>(g)}};
 
     broadcast_node<input_t> start(g);
 
-    node_t node(precedes(successors[0]), unlimited, [&](int input, node_t::gateway_type& gtw) {
-        async_activity.submit(input, &gtw);
-    }, no_priority);
+    node_t node(
+            precedes(successors[0]), unlimited,
+            [&](int input, node_t::gateway_type& gtw) { async_activity.submit(input, &gtw); }, no_priority);
 
     make_edge(start, node);
 
@@ -774,7 +713,7 @@ void test_precedes() {
     g.wait_for_all();
     async_activity.wait_for_all();
 
-    for(auto& successor : successors) {
+    for (auto& successor : successors) {
         output_t storage;
         CHECK_MESSAGE((successor.try_get(storage) && !successor.try_get(storage)),
                       "Not exact edge quantity was made");
@@ -785,57 +724,43 @@ void test_follows_and_precedes_api() {
     test_follows();
     test_precedes();
 }
-#endif // __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+#endif// __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 
 //! Test async bodies processing
 //! \brief \ref requirement \ref error_guessing
-TEST_CASE("Basic tests"){
+TEST_CASE("Basic tests") {
     tbb::task_arena arena(utils::MaxThread);
-    arena.execute(
-        [&]() {
-            run_tests<int, int>();
-            run_tests<minimal_type, minimal_type>();
-            run_tests<int, minimal_type>();
-        }
-    );
+    arena.execute([&]() {
+        run_tests<int, int>();
+        run_tests<minimal_type, minimal_type>();
+        run_tests<int, minimal_type>();
+    });
 }
 
 //! NativeParallelFor test with various concurrency settings
 //! \brief \ref requirement \ref error_guessing
-TEST_CASE("Lightweight tests"){
-    lightweight_testing::test<tbb::flow::async_node>(NUMBER_OF_MSGS);
-}
+TEST_CASE("Lightweight tests") { lightweight_testing::test<tbb::flow::async_node>(NUMBER_OF_MSGS); }
 
 //! Test reset and cancellation
 //! \brief \ref error_guessing
-TEST_CASE("Reset test"){
-    test_reset();
-}
+TEST_CASE("Reset test") { test_reset(); }
 
 //! Test
 //! \brief \ref requirement \ref error_guessing
-TEST_CASE("Copy constructor test"){
-    test_copy_ctor();
-}
+TEST_CASE("Copy constructor test") { test_copy_ctor(); }
 
 //! Test if main thread spins
 //! \brief \ref stress
-TEST_CASE("Spin avoidance test"){
-    test_for_spin_avoidance();
-}
+TEST_CASE("Spin avoidance test") { test_for_spin_avoidance(); }
 
 //! Test nested enqueuing
 //! \brief \ref error_guessing
-TEST_CASE("Inner enqueuing test"){
-    run_test_enqueueing_on_inner_level();
-}
+TEST_CASE("Inner enqueuing test") { run_test_enqueueing_on_inner_level(); }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 //! Test deprecated follows and precedes API
 //! \brief \ref error_guessing
-TEST_CASE("Test follows and precedes API"){
-    test_follows_and_precedes_api();
-}
+TEST_CASE("Test follows and precedes API") { test_follows_and_precedes_api(); }
 #endif
 
 #if __TBB_CPP20_CONCEPTS_PRESENT
@@ -843,24 +768,26 @@ TEST_CASE("Test follows and precedes API"){
 TEST_CASE("constraints for async_node input") {
     struct InputObject {
         InputObject() = default;
-        InputObject( const InputObject& ) = default;
+        InputObject(const InputObject&) = default;
     };
 
     static_assert(utils::well_formed_instantiation<tbb::flow::async_node, InputObject, int>);
     static_assert(utils::well_formed_instantiation<tbb::flow::async_node, int, int>);
     static_assert(!utils::well_formed_instantiation<tbb::flow::async_node, test_concepts::NonCopyable, int>);
-    static_assert(!utils::well_formed_instantiation<tbb::flow::async_node, test_concepts::NonDefaultInitializable, int>);
+    static_assert(!utils::well_formed_instantiation<tbb::flow::async_node,
+                                                    test_concepts::NonDefaultInitializable, int>);
 }
 
 template <typename Input, typename Output, typename Body>
-concept can_call_async_node_ctor = requires( tbb::flow::graph& graph, std::size_t concurrency,
-                                             Body body, tbb::flow::node_priority_t priority, tbb::flow::buffer_node<int>& f ) {
+concept can_call_async_node_ctor
+        = requires(tbb::flow::graph& graph, std::size_t concurrency, Body body,
+                   tbb::flow::node_priority_t priority, tbb::flow::buffer_node<int>& f) {
     tbb::flow::async_node<Input, Output>(graph, concurrency, body);
     tbb::flow::async_node<Input, Output>(graph, concurrency, body, priority);
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
     tbb::flow::async_node<Input, Output>(tbb::flow::follows(f), concurrency, body);
     tbb::flow::async_node<Input, Output>(tbb::flow::follows(f), concurrency, body, priority);
-#endif // __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+#endif// __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 };
 
 //! \brief \ref error_guessing
@@ -871,10 +798,14 @@ TEST_CASE("constraints for async_node body") {
 
     static_assert(can_call_async_node_ctor<input_type, output_type, Correct<input_type, output_type>>);
     static_assert(!can_call_async_node_ctor<input_type, output_type, NonCopyable<input_type, output_type>>);
-    static_assert(!can_call_async_node_ctor<input_type, output_type, NonDestructible<input_type, output_type>>);
-    static_assert(!can_call_async_node_ctor<input_type, output_type, NoOperatorRoundBrackets<input_type, output_type>>);
-    static_assert(!can_call_async_node_ctor<input_type, output_type, WrongFirstInputOperatorRoundBrackets<input_type, output_type>>);
-    static_assert(!can_call_async_node_ctor<input_type, output_type, WrongSecondInputOperatorRoundBrackets<input_type, output_type>>);
+    static_assert(
+            !can_call_async_node_ctor<input_type, output_type, NonDestructible<input_type, output_type>>);
+    static_assert(!can_call_async_node_ctor<input_type, output_type,
+                                            NoOperatorRoundBrackets<input_type, output_type>>);
+    static_assert(!can_call_async_node_ctor<input_type, output_type,
+                                            WrongFirstInputOperatorRoundBrackets<input_type, output_type>>);
+    static_assert(!can_call_async_node_ctor<input_type, output_type,
+                                            WrongSecondInputOperatorRoundBrackets<input_type, output_type>>);
 }
 
-#endif // __TBB_CPP20_CONCEPTS_PRESENT
+#endif// __TBB_CPP20_CONCEPTS_PRESENT
diff --git a/external/tbb/test/tbb/test_blocked_range.cpp b/external/tbb/test/tbb/test_blocked_range.cpp
index cd1636e7..378fea56 100644
--- a/external/tbb/test/tbb/test_blocked_range.cpp
+++ b/external/tbb/test/tbb/test_blocked_range.cpp
@@ -14,23 +14,23 @@
     limitations under the License.
 */
 
+#include "common/concepts_common.h"
+#include "common/config.h"
+#include "common/range_based_for_support.h"
 #include "common/test.h"
 #include "common/utils.h"
 #include "common/utils_report.h"
-#include "common/range_based_for_support.h"
-#include "common/config.h"
-#include "common/concepts_common.h"
 
+#include "tbb/blocked_nd_range.h"
 #include "tbb/blocked_range.h"
 #include "tbb/blocked_range2d.h"
 #include "tbb/blocked_range3d.h"
-#include "tbb/blocked_nd_range.h"
 
 //! \file test_blocked_range.cpp
 //! \brief Test for [algorithms.blocked_range algorithms.blocked_range2d algorithms.blocked_range3d algorithms.blocked_nd_range] specification
 
-#include <utility> //for std::pair
 #include <functional>
+#include <utility>//for std::pair
 #include <vector>
 
 //! Testing blocked_range with range based for
@@ -41,13 +41,12 @@ TEST_CASE("Range based for") {
     const std::size_t sequence_length = 100;
     std::size_t int_array[sequence_length] = {0};
 
-    for (std::size_t i = 0; i < sequence_length; ++i) {
-        int_array[i] = i + 1;
-    }
+    for (std::size_t i = 0; i < sequence_length; ++i) { int_array[i] = i + 1; }
     const tbb::blocked_range<std::size_t*> r(int_array, int_array + sequence_length, 1);
 
     CHECK_MESSAGE(range_based_for_accumulate<std::size_t>(r, std::plus<std::size_t>(), std::size_t(0))
-            == gauss_summ_of_int_sequence(sequence_length), "incorrect accumulated value generated via range based for ?");
+                          == gauss_summ_of_int_sequence(sequence_length),
+                  "incorrect accumulated value generated via range based for ?");
 }
 
 //! Proportional split does not overflow with blocked range
@@ -67,19 +66,21 @@ TEST_CASE("Proportional split overflow") {
     // overflow-free computation
     std::size_t parts = p.left() + p.right();
     std::size_t int_part = size / parts;
-    std::size_t fraction = size - int_part * parts; // fraction < parts
+    std::size_t fraction = size - int_part * parts;// fraction < parts
     std::size_t right_idx = int_part * p.right() + fraction * p.right() / parts + 1;
     std::size_t newRangeBegin = end - right_idx;
 
     // Division in 'right_idx' very likely is inexact also.
     std::size_t tolerance = 1;
-    std::size_t diff = (r2.begin() < newRangeBegin) ? (newRangeBegin - r2.begin()) : (r2.begin() - newRangeBegin);
+    std::size_t diff
+            = (r2.begin() < newRangeBegin) ? (newRangeBegin - r2.begin()) : (r2.begin() - newRangeBegin);
     bool is_split_correct = diff <= tolerance;
-    bool test_passed = (r1.begin() == begin && r1.end() == r2.begin() && is_split_correct &&
-                        r2.end() == end);
+    bool test_passed = (r1.begin() == begin && r1.end() == r2.begin() && is_split_correct && r2.end() == end);
     if (!test_passed) {
         REPORT("Incorrect split of blocked range[%lu, %lu) into r1[%lu, %lu) and r2[%lu, %lu), "
-               "must be r1[%lu, %lu) and r2[%lu, %lu)\n", begin, end, r1.begin(), r1.end(), r2.begin(), r2.end(), begin, newRangeBegin, newRangeBegin, end);
+               "must be r1[%lu, %lu) and r2[%lu, %lu)\n",
+               begin, end, r1.begin(), r1.end(), r2.begin(), r2.end(), begin, newRangeBegin, newRangeBegin,
+               end);
         CHECK(test_passed);
     }
 }
@@ -87,36 +88,51 @@ TEST_CASE("Proportional split overflow") {
 #if __TBB_CPP20_CONCEPTS_PRESENT
 
 template <bool ExpectSatisfies, typename... Types>
-    requires (... && (utils::well_formed_instantiation<tbb::blocked_range, Types> == ExpectSatisfies))
-void test_blocked_range_constraint() {}
+requires(...
+         && (utils::well_formed_instantiation<
+                     tbb::blocked_range, Types> == ExpectSatisfies)) void test_blocked_range_constraint() {}
 
 template <bool ExpectSatisfies, typename... Types>
-    requires (... && (utils::well_formed_instantiation<tbb::blocked_range2d, Types, Types> == ExpectSatisfies))
-void test_blocked_range2d_constraint() {}
+requires(...
+         && (utils::well_formed_instantiation<
+                     tbb::blocked_range2d, Types,
+                     Types> == ExpectSatisfies)) void test_blocked_range2d_constraint() {}
 
 template <typename... Types>
-    requires (... && (utils::well_formed_instantiation<tbb::blocked_range2d, Types, test_concepts::Dummy> == false))
-void test_blocked_range2d_col_invalid_constraint() {}
+requires(...
+         && (utils::well_formed_instantiation<
+                     tbb::blocked_range2d, Types,
+                     test_concepts::Dummy> == false)) void test_blocked_range2d_col_invalid_constraint() {}
 
 template <typename... Types>
-    requires (... && (utils::well_formed_instantiation<tbb::blocked_range2d, test_concepts::Dummy, Types> == false))
-void test_blocked_range2d_row_invalid_constraint() {}
+requires(...
+         && (utils::well_formed_instantiation<
+                     tbb::blocked_range2d, test_concepts::Dummy,
+                     Types> == false)) void test_blocked_range2d_row_invalid_constraint() {}
 
 template <bool ExpectSatisfies, typename... Types>
-    requires (... && (utils::well_formed_instantiation<tbb::blocked_range3d, Types, Types, Types> == ExpectSatisfies))
-void test_blocked_range3d_constraint() {}
+requires(...
+         && (utils::well_formed_instantiation<
+                     tbb::blocked_range3d, Types, Types,
+                     Types> == ExpectSatisfies)) void test_blocked_range3d_constraint() {}
 
 template <typename... Types>
-    requires (... && (utils::well_formed_instantiation<tbb::blocked_range3d, test_concepts::Dummy, Types, Types> == false))
-void test_blocked_range3d_page_invalid_constraint() {}
+requires(...
+         && (utils::well_formed_instantiation<
+                     tbb::blocked_range3d, test_concepts::Dummy, Types,
+                     Types> == false)) void test_blocked_range3d_page_invalid_constraint() {}
 
 template <typename... Types>
-    requires (... && (utils::well_formed_instantiation<tbb::blocked_range3d, Types, test_concepts::Dummy, Types> == false))
-void test_blocked_range3d_row_invalid_constraint() {}
+requires(...
+         && (utils::well_formed_instantiation<
+                     tbb::blocked_range3d, Types, test_concepts::Dummy,
+                     Types> == false)) void test_blocked_range3d_row_invalid_constraint() {}
 
 template <typename... Types>
-    requires (... && (utils::well_formed_instantiation<tbb::blocked_range3d, Types, Types, test_concepts::Dummy> == false))
-void test_blocked_range3d_col_invalid_constraint() {}
+requires(...
+         && (utils::well_formed_instantiation<
+                     tbb::blocked_range3d, Types, Types,
+                     test_concepts::Dummy> == false)) void test_blocked_range3d_col_invalid_constraint() {}
 
 template <typename T>
 concept well_formed_blocked_nd_range_instantiation_basic = requires {
@@ -124,18 +140,17 @@ concept well_formed_blocked_nd_range_instantiation_basic = requires {
 };
 
 template <typename... Types>
-concept well_formed_blocked_nd_range_instantiation = ( ... && well_formed_blocked_nd_range_instantiation_basic<Types> );
+concept well_formed_blocked_nd_range_instantiation
+        = (... && well_formed_blocked_nd_range_instantiation_basic<Types>);
 
 //! \brief \ref error_guessing
 TEST_CASE("constraints for blocked_range value") {
     using namespace test_concepts::blocked_range_value;
     using const_iterator = typename std::vector<int>::const_iterator;
 
-    test_blocked_range_constraint</*Expected = */true,
-                                  Correct, char, int, std::size_t, const_iterator>();
+    test_blocked_range_constraint</*Expected = */ true, Correct, char, int, std::size_t, const_iterator>();
 
-    test_blocked_range_constraint</*Expected = */false,
-                                  NonCopyable, NonCopyAssignable, NonDestructible,
+    test_blocked_range_constraint</*Expected = */ false, NonCopyable, NonCopyAssignable, NonDestructible,
                                   NoOperatorLess, OperatorLessNonConst, WrongReturnOperatorLess,
                                   NoOperatorMinus, OperatorMinusNonConst, WrongReturnOperatorMinus,
                                   NoOperatorPlus, OperatorPlusNonConst, WrongReturnOperatorPlus>();
@@ -146,11 +161,9 @@ TEST_CASE("constraints for blocked_range2d value") {
     using namespace test_concepts::blocked_range_value;
     using const_iterator = typename std::vector<int>::const_iterator;
 
-    test_blocked_range2d_constraint</*Expected = */true,
-                                    Correct, char, int, std::size_t, const_iterator>();
+    test_blocked_range2d_constraint</*Expected = */ true, Correct, char, int, std::size_t, const_iterator>();
 
-    test_blocked_range2d_constraint</*Expected = */false,
-                                    NonCopyable, NonCopyAssignable, NonDestructible,
+    test_blocked_range2d_constraint</*Expected = */ false, NonCopyable, NonCopyAssignable, NonDestructible,
                                     NoOperatorLess, OperatorLessNonConst, WrongReturnOperatorLess,
                                     NoOperatorMinus, OperatorMinusNonConst, WrongReturnOperatorMinus,
                                     NoOperatorPlus, OperatorPlusNonConst, WrongReturnOperatorPlus>();
@@ -164,11 +177,9 @@ TEST_CASE("constraints for blocked_range3d value") {
     using namespace test_concepts::blocked_range_value;
     using const_iterator = typename std::vector<int>::const_iterator;
 
-    test_blocked_range3d_constraint</*Expected = */true,
-                                    Correct, char, int, std::size_t, const_iterator>();
+    test_blocked_range3d_constraint</*Expected = */ true, Correct, char, int, std::size_t, const_iterator>();
 
-    test_blocked_range3d_constraint</*Expected = */false,
-                                    NonCopyable, NonCopyAssignable, NonDestructible,
+    test_blocked_range3d_constraint</*Expected = */ false, NonCopyable, NonCopyAssignable, NonDestructible,
                                     NoOperatorLess, OperatorLessNonConst, WrongReturnOperatorLess,
                                     NoOperatorMinus, OperatorMinusNonConst, WrongReturnOperatorMinus,
                                     NoOperatorPlus, OperatorPlusNonConst, WrongReturnOperatorPlus>();
@@ -183,15 +194,16 @@ TEST_CASE("constraints for blocked_nd_range value") {
     using namespace test_concepts::blocked_range_value;
     using const_iterator = typename std::vector<int>::const_iterator;
 
-    static_assert(well_formed_blocked_nd_range_instantiation<Correct, char, int, std::size_t, const_iterator>);
+    static_assert(
+            well_formed_blocked_nd_range_instantiation<Correct, char, int, std::size_t, const_iterator>);
 
-    static_assert(!well_formed_blocked_nd_range_instantiation<NonCopyable, NonCopyAssignable, NonDestructible,
-                                                              NoOperatorLess, OperatorLessNonConst, WrongReturnOperatorLess,
-                                                              NoOperatorMinus, OperatorMinusNonConst, WrongReturnOperatorMinus,
-                                                              NoOperatorPlus, OperatorPlusNonConst, WrongReturnOperatorPlus>);
+    static_assert(!well_formed_blocked_nd_range_instantiation<
+                  NonCopyable, NonCopyAssignable, NonDestructible, NoOperatorLess, OperatorLessNonConst,
+                  WrongReturnOperatorLess, NoOperatorMinus, OperatorMinusNonConst, WrongReturnOperatorMinus,
+                  NoOperatorPlus, OperatorPlusNonConst, WrongReturnOperatorPlus>);
 }
 
-#endif // __TBB_CPP20_CONCEPTS_PRESENT
+#endif// __TBB_CPP20_CONCEPTS_PRESENT
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT && __TBB_PREVIEW_BLOCKED_ND_RANGE_DEDUCTION_GUIDES
 template <typename T>
@@ -219,11 +231,12 @@ void test_deduction_guides() {
         static_assert(std::is_same_v<decltype(range), blocked_nd_range<iterator, 2>>);
     }
     {
-        blocked_nd_range range({T{0}, T{100}}, {T{0}, T{100}, T{5}}, {T{0}, T{100}}, {T{0}, T{100}, T{5}});
+        blocked_nd_range range({T {0}, T {100}}, {T {0}, T {100}, T {5}}, {T {0}, T {100}},
+                               {T {0}, T {100}, T {5}});
         static_assert(std::is_same_v<decltype(range), blocked_nd_range<T, 4>>);
     }
     {
-        blocked_nd_range range({T{100}});
+        blocked_nd_range range({T {100}});
         static_assert(std::is_same_v<decltype(range), blocked_nd_range<T, 1>>);
     }
     {
@@ -232,7 +245,7 @@ void test_deduction_guides() {
         static_assert(std::is_same_v<decltype(range), blocked_nd_range<T, 1>>);
     }
     {
-        blocked_nd_range range({T{100}}, 5);
+        blocked_nd_range range({T {100}}, 5);
         static_assert(std::is_same_v<decltype(range), blocked_nd_range<T, 1>>);
     }
     {
@@ -241,11 +254,11 @@ void test_deduction_guides() {
         static_assert(std::is_same_v<decltype(range), blocked_nd_range<T, 1>>);
     }
     {
-        blocked_nd_range range({T{100}, T{200}}, 5);
+        blocked_nd_range range({T {100}, T {200}}, 5);
         static_assert(std::is_same_v<decltype(range), blocked_nd_range<T, 2>>);
     }
     {
-        blocked_nd_range range({T{100}, T{200}});
+        blocked_nd_range range({T {100}, T {200}});
         static_assert(std::is_same_v<decltype(range), blocked_nd_range<T, 2>>);
     }
     {
@@ -254,11 +267,11 @@ void test_deduction_guides() {
         static_assert(std::is_same_v<decltype(range), blocked_nd_range<T, 2>>);
     }
     {
-        blocked_nd_range range({T{100}, T{200}, T{300}}, 5);
+        blocked_nd_range range({T {100}, T {200}, T {300}}, 5);
         static_assert(std::is_same_v<decltype(range), blocked_nd_range<T, 3>>);
     }
     {
-        blocked_nd_range range({T{100}, T{200}, T{300}});
+        blocked_nd_range range({T {100}, T {200}, T {300}});
         static_assert(std::is_same_v<decltype(range), blocked_nd_range<T, 3>>);
     }
     {
@@ -267,17 +280,16 @@ void test_deduction_guides() {
         static_assert(std::is_same_v<decltype(range), blocked_nd_range<T, 3>>);
     }
     {
-        blocked_nd_range range({T{100}, T{200}, T{300}, T{400}});
+        blocked_nd_range range({T {100}, T {200}, T {300}, T {400}});
         static_assert(std::is_same_v<decltype(range), blocked_nd_range<T, 4>>);
     }
     {
         T array[4] = {100, 200, 300, 400};
         blocked_nd_range range(array);
         static_assert(std::is_same_v<decltype(range), blocked_nd_range<T, 4>>);
-
     }
     {
-        blocked_nd_range range({T{100}, T{200}, T{300}, T{400}}, 5);
+        blocked_nd_range range({T {100}, T {200}, T {300}, T {400}}, 5);
         static_assert(std::is_same_v<decltype(range), blocked_nd_range<T, 4>>);
     }
     {
@@ -286,11 +298,11 @@ void test_deduction_guides() {
         static_assert(std::is_same_v<decltype(range), blocked_nd_range<T, 4>>);
     }
     {
-        blocked_nd_range range(source_range, oneapi::tbb::split{});
+        blocked_nd_range range(source_range, oneapi::tbb::split {});
         static_assert(std::is_same_v<decltype(range), decltype(source_range)>);
     }
     {
-        blocked_nd_range range(source_range, oneapi::tbb::proportional_split{1, 3});
+        blocked_nd_range range(source_range, oneapi::tbb::proportional_split {1, 3});
         static_assert(std::is_same_v<decltype(range), decltype(source_range)>);
     }
     {
@@ -323,9 +335,8 @@ class fancy_value {
         return fancy_value(lhs.my_real_value + offset);
     }
 
-    operator std::size_t() const {
-        return my_real_value;
-    }
+    operator std::size_t() const { return my_real_value; }
+
 private:
     std::size_t my_real_value;
 };
@@ -336,4 +347,4 @@ TEST_CASE("blocked_nd_range deduction guides") {
     test_deduction_guides<int>();
     test_deduction_guides<fancy_value>();
 }
-#endif // __TBB_CPP17_DEDUCTION_GUIDES_PRESENT && __TBB_PREVIEW_BLOCKED_ND_RANGE_DEDUCTION_GUIDES
+#endif// __TBB_CPP17_DEDUCTION_GUIDES_PRESENT && __TBB_PREVIEW_BLOCKED_ND_RANGE_DEDUCTION_GUIDES
diff --git a/external/tbb/test/tbb/test_broadcast_node.cpp b/external/tbb/test/tbb/test_broadcast_node.cpp
index 662a0833..ce4e5ae1 100644
--- a/external/tbb/test/tbb/test_broadcast_node.cpp
+++ b/external/tbb/test/tbb/test_broadcast_node.cpp
@@ -19,19 +19,17 @@
 #include "tbb/flow_graph.h"
 
 #include "common/test.h"
-#include "common/utils.h"
 #include "common/test_follows_and_precedes_api.h"
+#include "common/utils.h"
 
 #include <atomic>
 
-
 //! \file test_broadcast_node.cpp
 //! \brief Test for [flow_graph.broadcast_node] specification
 
-
 #define TBB_INTERNAL_NAMESPACE detail::d2
 namespace tbb {
-using task = TBB_INTERNAL_NAMESPACE::graph_task;
+    using task = TBB_INTERNAL_NAMESPACE::graph_task;
 }
 using tbb::TBB_INTERNAL_NAMESPACE::SUCCESSFULLY_ENQUEUED;
 
@@ -40,125 +38,101 @@ const int R = 4;
 
 class int_convertable_type : private utils::NoAssign {
 
-   int my_value;
+    int my_value;
 
 public:
-
-   int_convertable_type( int v ) : my_value(v) {}
-   operator int() const { return my_value; }
-
+    int_convertable_type(int v) : my_value(v) {}
+    operator int() const { return my_value; }
 };
 
-
-template< typename T >
+template <typename T>
 class counting_array_receiver : public tbb::flow::receiver<T> {
 
     std::atomic<size_t> my_counters[N];
     tbb::flow::graph& my_graph;
 
 public:
-
     counting_array_receiver(tbb::flow::graph& g) : my_graph(g) {
-        for (int i = 0; i < N; ++i )
-           my_counters[i] = 0;
+        for (int i = 0; i < N; ++i) my_counters[i] = 0;
     }
 
-    size_t operator[]( int i ) {
+    size_t operator[](int i) {
         size_t v = my_counters[i];
         return v;
     }
 
-    tbb::task * try_put_task( const T &v ) override {
-        ++my_counters[(int)v];
-        return const_cast<tbb::task *>(SUCCESSFULLY_ENQUEUED);
+    tbb::task* try_put_task(const T& v) override {
+        ++my_counters[(int) v];
+        return const_cast<tbb::task*>(SUCCESSFULLY_ENQUEUED);
     }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
-    tbb::task * try_put_task( const T &v, const tbb::detail::d2::message_metainfo& ) override {
+    tbb::task* try_put_task(const T& v, const tbb::detail::d2::message_metainfo&) override {
         return try_put_task(v);
     }
 #endif
 
-    tbb::flow::graph& graph_reference() const override {
-        return my_graph;
-    }
+    tbb::flow::graph& graph_reference() const override { return my_graph; }
 };
 
-template< typename T >
+template <typename T>
 void test_serial_broadcasts() {
 
     tbb::flow::graph g;
     tbb::flow::broadcast_node<T> b(g);
 
-    for ( int num_receivers = 1; num_receivers < R; ++num_receivers ) {
-        std::vector< std::shared_ptr<counting_array_receiver<T>> > receivers;
-        for( int i = 0; i < num_receivers; ++i )
-            receivers.push_back( std::make_shared<counting_array_receiver<T>>(g) );
+    for (int num_receivers = 1; num_receivers < R; ++num_receivers) {
+        std::vector<std::shared_ptr<counting_array_receiver<T>>> receivers;
+        for (int i = 0; i < num_receivers; ++i)
+            receivers.push_back(std::make_shared<counting_array_receiver<T>>(g));
 
-        for ( int r = 0; r < num_receivers; ++r ) {
-            tbb::flow::make_edge( b, *receivers[r] );
-        }
+        for (int r = 0; r < num_receivers; ++r) { tbb::flow::make_edge(b, *receivers[r]); }
 
-        for (int n = 0; n < N; ++n ) {
-            CHECK_MESSAGE( b.try_put( (T)n ), "" );
-        }
+        for (int n = 0; n < N; ++n) { CHECK_MESSAGE(b.try_put((T) n), ""); }
 
-        for ( int r = 0; r < num_receivers; ++r ) {
-            for (int n = 0; n < N; ++n ) {
-                CHECK_MESSAGE( (*receivers[r])[n] == 1, "" );
-            }
-            tbb::flow::remove_edge( b, *receivers[r] );
+        for (int r = 0; r < num_receivers; ++r) {
+            for (int n = 0; n < N; ++n) { CHECK_MESSAGE((*receivers[r])[n] == 1, ""); }
+            tbb::flow::remove_edge(b, *receivers[r]);
         }
-        CHECK_MESSAGE( b.try_put( (T)0 ), "" );
-        for ( int r = 0; r < num_receivers; ++r )
-            CHECK_MESSAGE( (*receivers[0])[0] == 1, "" );
+        CHECK_MESSAGE(b.try_put((T) 0), "");
+        for (int r = 0; r < num_receivers; ++r) CHECK_MESSAGE((*receivers[0])[0] == 1, "");
     }
-
 }
 
-template< typename T >
+template <typename T>
 class native_body : private utils::NoAssign {
 
-    tbb::flow::broadcast_node<T> &my_b;
+    tbb::flow::broadcast_node<T>& my_b;
 
 public:
-
-    native_body( tbb::flow::broadcast_node<T> &b ) : my_b(b) {}
+    native_body(tbb::flow::broadcast_node<T>& b) : my_b(b) {}
 
     void operator()(int) const {
-        for (int n = 0; n < N; ++n ) {
-            CHECK_MESSAGE( my_b.try_put( (T)n ), "" );
-        }
+        for (int n = 0; n < N; ++n) { CHECK_MESSAGE(my_b.try_put((T) n), ""); }
     }
-
 };
 
-template< typename T >
+template <typename T>
 void run_parallel_broadcasts(tbb::flow::graph& g, int p, tbb::flow::broadcast_node<T>& b) {
-    for ( int num_receivers = 1; num_receivers < R; ++num_receivers ) {
-        std::vector< std::shared_ptr<counting_array_receiver<T>> > receivers;
-        for( int i = 0; i < num_receivers; ++i )
-            receivers.push_back( std::make_shared< counting_array_receiver<T> >(g) );
+    for (int num_receivers = 1; num_receivers < R; ++num_receivers) {
+        std::vector<std::shared_ptr<counting_array_receiver<T>>> receivers;
+        for (int i = 0; i < num_receivers; ++i)
+            receivers.push_back(std::make_shared<counting_array_receiver<T>>(g));
 
-        for ( int r = 0; r < num_receivers; ++r ) {
-            tbb::flow::make_edge( b, *receivers[r] );
-        }
+        for (int r = 0; r < num_receivers; ++r) { tbb::flow::make_edge(b, *receivers[r]); }
 
-        utils::NativeParallelFor( p, native_body<T>( b ) );
+        utils::NativeParallelFor(p, native_body<T>(b));
 
-        for ( int r = 0; r < num_receivers; ++r ) {
-            for (int n = 0; n < N; ++n ) {
-                CHECK_MESSAGE( (int)(*receivers[r])[n] == p, "" );
-            }
-            tbb::flow::remove_edge( b, *receivers[r] );
+        for (int r = 0; r < num_receivers; ++r) {
+            for (int n = 0; n < N; ++n) { CHECK_MESSAGE((int) (*receivers[r])[n] == p, ""); }
+            tbb::flow::remove_edge(b, *receivers[r]);
         }
-        CHECK_MESSAGE( b.try_put( (T)0 ), "" );
-        for ( int r = 0; r < num_receivers; ++r )
-            CHECK_MESSAGE( (int)(*receivers[r])[0] == p, "" );
+        CHECK_MESSAGE(b.try_put((T) 0), "");
+        for (int r = 0; r < num_receivers; ++r) CHECK_MESSAGE((int) (*receivers[r])[0] == p, "");
     }
 }
 
-template< typename T >
+template <typename T>
 void test_parallel_broadcasts(int p) {
 
     tbb::flow::graph g;
@@ -172,42 +146,34 @@ void test_parallel_broadcasts(int p) {
 
 // broadcast_node does not allow successors to try_get from it (it does not allow
 // the flow edge to switch) so we only need test the forward direction.
-template<typename T>
+template <typename T>
 void test_resets() {
     tbb::flow::graph g;
     tbb::flow::broadcast_node<T> b0(g);
     tbb::flow::broadcast_node<T> b1(g);
     tbb::flow::queue_node<T> q0(g);
-    tbb::flow::make_edge(b0,b1);
-    tbb::flow::make_edge(b1,q0);
+    tbb::flow::make_edge(b0, b1);
+    tbb::flow::make_edge(b1, q0);
     T j;
 
     // test standard reset
-    for(int testNo = 0; testNo < 2; ++testNo) {
-        for(T i= 0; i <= 3; i += 1) {
-            b0.try_put(i);
-        }
+    for (int testNo = 0; testNo < 2; ++testNo) {
+        for (T i = 0; i <= 3; i += 1) { b0.try_put(i); }
         g.wait_for_all();
-        for(T i= 0; i <= 3; i += 1) {
-            CHECK_MESSAGE( (q0.try_get(j) && j == i), "Bad value in queue");
-        }
-        CHECK_MESSAGE( (!q0.try_get(j)), "extra value in queue");
+        for (T i = 0; i <= 3; i += 1) { CHECK_MESSAGE((q0.try_get(j) && j == i), "Bad value in queue"); }
+        CHECK_MESSAGE((!q0.try_get(j)), "extra value in queue");
 
         // reset the graph.  It should work as before.
         if (testNo == 0) g.reset();
     }
 
     g.reset(tbb::flow::rf_clear_edges);
-    for(T i= 0; i <= 3; i += 1) {
-        b0.try_put(i);
-    }
+    for (T i = 0; i <= 3; i += 1) { b0.try_put(i); }
     g.wait_for_all();
-    CHECK_MESSAGE( (!q0.try_get(j)), "edge between nodes not removed");
-    for(T i= 0; i <= 3; i += 1) {
-        b1.try_put(i);
-    }
+    CHECK_MESSAGE((!q0.try_get(j)), "edge between nodes not removed");
+    for (T i = 0; i <= 3; i += 1) { b1.try_put(i); }
     g.wait_for_all();
-    CHECK_MESSAGE( (!q0.try_get(j)), "edge between nodes not removed");
+    CHECK_MESSAGE((!q0.try_get(j)), "edge between nodes not removed");
 }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
@@ -216,11 +182,12 @@ void test_resets() {
 void test_follows_and_precedes_api() {
     using msg_t = tbb::flow::continue_msg;
 
-    std::array<msg_t, 3> messages_for_follows= { {msg_t(), msg_t(), msg_t()} };
+    std::array<msg_t, 3> messages_for_follows = {{msg_t(), msg_t(), msg_t()}};
     std::vector<msg_t> messages_for_precedes = {msg_t()};
 
-    follows_and_precedes_testing::test_follows <msg_t, tbb::flow::broadcast_node<msg_t>>(messages_for_follows);
-    follows_and_precedes_testing::test_precedes <msg_t, tbb::flow::broadcast_node<msg_t>>(messages_for_precedes);
+    follows_and_precedes_testing::test_follows<msg_t, tbb::flow::broadcast_node<msg_t>>(messages_for_follows);
+    follows_and_precedes_testing::test_precedes<msg_t, tbb::flow::broadcast_node<msg_t>>(
+            messages_for_precedes);
 }
 #endif
 
@@ -257,7 +224,7 @@ void test_deduction_guides() {
 void test_try_put_and_wait_spawning_and_serial_receiver() {
     tbb::task_arena arena(1);
 
-    arena.execute([&]{
+    arena.execute([&] {
         tbb::flow::graph g;
 
         std::vector<int> start_work_items;
@@ -274,28 +241,24 @@ void test_try_put_and_wait_spawning_and_serial_receiver() {
         tbb::flow::broadcast_node<int> broadcast(g);
 
         // Broadcast to 2 function_nodes, one with unlimited concurrency and the other serial
-        tbb::flow::function_node<int, int, tbb::flow::queueing> unlimited(g, tbb::flow::unlimited,
-            [&](int input) noexcept {
-                if (input == wait_message) {
-                    for (auto item : new_work_items) {
-                        broadcast.try_put(item);
+        tbb::flow::function_node<int, int, tbb::flow::queueing> unlimited(
+                g, tbb::flow::unlimited, [&](int input) noexcept {
+                    if (input == wait_message) {
+                        for (auto item : new_work_items) { broadcast.try_put(item); }
                     }
-                }
-                processed_items_unlimited.emplace_back(input);
-                return 0;
-            });
+                    processed_items_unlimited.emplace_back(input);
+                    return 0;
+                });
         tbb::flow::make_edge(broadcast, unlimited);
 
-        tbb::flow::function_node<int, int, tbb::flow::queueing> serial(g, tbb::flow::serial,
-            [&](int input) noexcept {
-                processed_items_serial.emplace_back(input);
-                return 0;
-            });
+        tbb::flow::function_node<int, int, tbb::flow::queueing> serial(
+                g, tbb::flow::serial, [&](int input) noexcept {
+                    processed_items_serial.emplace_back(input);
+                    return 0;
+                });
         tbb::flow::make_edge(broadcast, serial);
 
-        for (int i = 0; i < wait_message; ++i) {
-            broadcast.try_put(i);
-        }
+        for (int i = 0; i < wait_message; ++i) { broadcast.try_put(i); }
 
         broadcast.try_put_and_wait(wait_message);
 
@@ -306,12 +269,15 @@ void test_try_put_and_wait_spawning_and_serial_receiver() {
         // The first processed item is expected to be wait_message since it was spawned last
         CHECK_MESSAGE(processed_items_unlimited.size() == new_work_items.size() + start_work_items.size(),
                       "Unexpected number of processed items");
-        CHECK_MESSAGE(processed_items_unlimited[unlimited_check_index++] == wait_message, "Unexpected items processing");
+        CHECK_MESSAGE(processed_items_unlimited[unlimited_check_index++] == wait_message,
+                      "Unexpected items processing");
         for (int i = int(new_work_items.size()) - 1; i >= 0; --i) {
-            CHECK_MESSAGE(processed_items_unlimited[unlimited_check_index++] == new_work_items[i], "Unexpected items processing");
+            CHECK_MESSAGE(processed_items_unlimited[unlimited_check_index++] == new_work_items[i],
+                          "Unexpected items processing");
         }
         for (int i = int(start_work_items.size()) - 1; i >= 1; --i) {
-            CHECK_MESSAGE(processed_items_unlimited[unlimited_check_index++] == start_work_items[i], "Unexpected items processing");
+            CHECK_MESSAGE(processed_items_unlimited[unlimited_check_index++] == start_work_items[i],
+                          "Unexpected items processing");
         }
 
         // Serial queueing function_node should add all start_work_items except the first one into the queue
@@ -320,18 +286,22 @@ void test_try_put_and_wait_spawning_and_serial_receiver() {
         CHECK_MESSAGE(processed_items_serial.size() == start_work_items.size() + 1,
                       "Unexpected number of processed items");
         for (auto item : start_work_items) {
-            CHECK_MESSAGE(processed_items_serial[serial_check_index++] == item, "Unexpected items processing");
+            CHECK_MESSAGE(processed_items_serial[serial_check_index++] == item,
+                          "Unexpected items processing");
         }
-        CHECK_MESSAGE(processed_items_serial[serial_check_index++] == wait_message, "Unexpected items processing");
+        CHECK_MESSAGE(processed_items_serial[serial_check_index++] == wait_message,
+                      "Unexpected items processing");
 
         g.wait_for_all();
 
-        CHECK_MESSAGE(processed_items_unlimited[unlimited_check_index++] == start_work_items[0], "Unexpected items processing");
+        CHECK_MESSAGE(processed_items_unlimited[unlimited_check_index++] == start_work_items[0],
+                      "Unexpected items processing");
 
         // For serial queueing function_node, the new_work_items are expected to be processed while calling to wait_for_all
         // They would be queued and processed later in FIFO order
         for (auto item : new_work_items) {
-            CHECK_MESSAGE(processed_items_serial[serial_check_index++] == item, "Unexpected items processing");
+            CHECK_MESSAGE(processed_items_serial[serial_check_index++] == item,
+                          "Unexpected items processing");
         }
         CHECK(serial_check_index == processed_items_serial.size());
         CHECK(unlimited_check_index == processed_items_unlimited.size());
@@ -341,7 +311,7 @@ void test_try_put_and_wait_spawning_and_serial_receiver() {
 void test_try_put_and_wait_spawning_receivers() {
     tbb::task_arena arena(1);
 
-    arena.execute([&]{
+    arena.execute([&] {
         tbb::flow::graph g;
 
         int wait_message = 10;
@@ -361,31 +331,28 @@ void test_try_put_and_wait_spawning_receivers() {
         std::vector<tbb::flow::function_node<int, int, tbb::flow::queueing>> successors;
         successors.reserve(num_successors);
         for (int i = 0; i < num_successors; ++i) {
-            successors.emplace_back(g, tbb::flow::unlimited,
-                [&, i](int input) noexcept {
-                    if (input == wait_message) {
-                        broadcast.try_put(new_work_items[i]);
-                    }
-                    processed_items[i].emplace_back(input);
-                    return 0;
-                });
+            successors.emplace_back(g, tbb::flow::unlimited, [&, i](int input) noexcept {
+                if (input == wait_message) { broadcast.try_put(new_work_items[i]); }
+                processed_items[i].emplace_back(input);
+                return 0;
+            });
             tbb::flow::make_edge(broadcast, successors.back());
         }
 
-        for (int i = 0; i < wait_message; ++i) {
-            broadcast.try_put(i);
-        }
+        for (int i = 0; i < wait_message; ++i) { broadcast.try_put(i); }
 
         broadcast.try_put_and_wait(wait_message);
 
         for (int i = num_successors - 1; i >= 0; --i) {
             size_t check_index = 0;
             for (int j = num_successors - 1; j != i; --j) {
-                CHECK_MESSAGE(processed_items[i][check_index++] == new_work_items[j], "Unexpected items processing");
+                CHECK_MESSAGE(processed_items[i][check_index++] == new_work_items[j],
+                              "Unexpected items processing");
             }
             CHECK_MESSAGE(processed_items[i][check_index++] == wait_message, "Unexpected items processing");
             for (int j = i; j >= 1; --j) {
-                CHECK_MESSAGE(processed_items[i][check_index++] == new_work_items[j], "Unexpected items processing");
+                CHECK_MESSAGE(processed_items[i][check_index++] == new_work_items[j],
+                              "Unexpected items processing");
             }
         }
 
@@ -395,7 +362,8 @@ void test_try_put_and_wait_spawning_receivers() {
             size_t check_index = num_successors;
             CHECK_MESSAGE(processed_item[check_index++] == new_work_items[0], "Unexpected items processing");
             for (int i = int(start_work_items.size()) - 1; i >= 0; --i) {
-                CHECK_MESSAGE(processed_item[check_index++] == start_work_items[i], "Unexpected items processing");
+                CHECK_MESSAGE(processed_item[check_index++] == start_work_items[i],
+                              "Unexpected items processing");
             }
         }
     });
@@ -405,52 +373,46 @@ void test_try_put_and_wait() {
     test_try_put_and_wait_spawning_and_serial_receiver();
     test_try_put_and_wait_spawning_receivers();
 }
-#endif // __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+#endif// __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
 
 //! Test serial broadcasts
 //! \brief \ref error_guessing
-TEST_CASE("Serial broadcasts"){
-   test_serial_broadcasts<int>();
-   test_serial_broadcasts<float>();
-   test_serial_broadcasts<int_convertable_type>();
+TEST_CASE("Serial broadcasts") {
+    test_serial_broadcasts<int>();
+    test_serial_broadcasts<float>();
+    test_serial_broadcasts<int_convertable_type>();
 }
 
 //! Test parallel broadcasts
 //! \brief \ref error_guessing
-TEST_CASE("Parallel broadcasts"){
-    for( unsigned int p=utils::MinThread; p<=utils::MaxThread; ++p ) {
-       test_parallel_broadcasts<int>(p);
-       test_parallel_broadcasts<float>(p);
-       test_parallel_broadcasts<int_convertable_type>(p);
-   }
+TEST_CASE("Parallel broadcasts") {
+    for (unsigned int p = utils::MinThread; p <= utils::MaxThread; ++p) {
+        test_parallel_broadcasts<int>(p);
+        test_parallel_broadcasts<float>(p);
+        test_parallel_broadcasts<int_convertable_type>(p);
+    }
 }
 
 //! Test reset and cancellation behavior
 //! \brief \ref error_guessing
-TEST_CASE("Resets"){
-   test_resets<int>();
-   test_resets<float>();
+TEST_CASE("Resets") {
+    test_resets<int>();
+    test_resets<float>();
 }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 //! Test deprecated follows and precedes API
 //! \brief \ref error_guessing
-TEST_CASE("Follows and precedes API"){
-    test_follows_and_precedes_api();
-}
+TEST_CASE("Follows and precedes API") { test_follows_and_precedes_api(); }
 #endif
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 //! Test deduction guides
 //! \brief requirement
-TEST_CASE("Deduction guides"){
-    test_deduction_guides();
-}
+TEST_CASE("Deduction guides") { test_deduction_guides(); }
 #endif
 
 #if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
 //! \brief \ref error_guessing
-TEST_CASE("test broadcast_node try_put_and_wait") {
-    test_try_put_and_wait();
-}
+TEST_CASE("test broadcast_node try_put_and_wait") { test_try_put_and_wait(); }
 #endif
diff --git a/external/tbb/test/tbb/test_buffer_node.cpp b/external/tbb/test/tbb/test_buffer_node.cpp
index 527005ae..f15c4800 100644
--- a/external/tbb/test/tbb/test_buffer_node.cpp
+++ b/external/tbb/test/tbb/test_buffer_node.cpp
@@ -19,10 +19,10 @@
 #include "tbb/flow_graph.h"
 #include "tbb/global_control.h"
 
-#include "common/test.h"
-#include "common/utils.h"
 #include "common/graph_utils.h"
+#include "common/test.h"
 #include "common/test_follows_and_precedes_api.h"
+#include "common/utils.h"
 
 #include "test_buffering_try_put_and_wait.h"
 
@@ -32,112 +32,103 @@
 #define N 1000
 #define C 10
 
-template< typename T >
-void spin_try_get( tbb::flow::buffer_node<T> &b, T &value ) {
-    while ( b.try_get(value) != true ) {}
+template <typename T>
+void spin_try_get(tbb::flow::buffer_node<T> &b, T &value) {
+    while (b.try_get(value) != true) {}
 }
 
-template< typename T >
-void check_item( T* count_value, T &value ) {
+template <typename T>
+void check_item(T *count_value, T &value) {
     count_value[value / N] += value % N;
 }
 
-template< typename T >
+template <typename T>
 struct parallel_puts : utils::NoAssign {
 
     tbb::flow::buffer_node<T> &my_b;
 
-    parallel_puts( tbb::flow::buffer_node<T> &b ) : my_b(b) {}
+    parallel_puts(tbb::flow::buffer_node<T> &b) : my_b(b) {}
 
     void operator()(int i) const {
         for (int j = 0; j < N; ++j) {
-            bool msg = my_b.try_put( T(N*i + j) );
-            CHECK_MESSAGE( msg == true, "" );
+            bool msg = my_b.try_put(T(N * i + j));
+            CHECK_MESSAGE(msg == true, "");
         }
     }
 };
 
-template< typename T >
+template <typename T>
 struct touches {
 
     bool **my_touches;
     int my_num_threads;
 
-    touches( int num_threads ) : my_num_threads(num_threads) {
-        my_touches = new bool* [my_num_threads];
-        for ( int p = 0; p < my_num_threads; ++p) {
+    touches(int num_threads) : my_num_threads(num_threads) {
+        my_touches = new bool *[my_num_threads];
+        for (int p = 0; p < my_num_threads; ++p) {
             my_touches[p] = new bool[N];
-            for ( int n = 0; n < N; ++n)
-                my_touches[p][n] = false;
+            for (int n = 0; n < N; ++n) my_touches[p][n] = false;
         }
     }
 
     ~touches() {
-        for ( int p = 0; p < my_num_threads; ++p) {
-            delete [] my_touches[p];
-        }
-        delete [] my_touches;
+        for (int p = 0; p < my_num_threads; ++p) { delete[] my_touches[p]; }
+        delete[] my_touches;
     }
 
-    bool check( T v ) {
-        CHECK_MESSAGE( my_touches[v/N][v%N] == false, "" );
-        my_touches[v/N][v%N] = true;
+    bool check(T v) {
+        CHECK_MESSAGE(my_touches[v / N][v % N] == false, "");
+        my_touches[v / N][v % N] = true;
         return true;
     }
 
     bool validate_touches() {
-        for ( int p = 0; p < my_num_threads; ++p) {
-            for ( int n = 0; n < N; ++n) {
-                CHECK_MESSAGE( my_touches[p][n] == true, "" );
-            }
+        for (int p = 0; p < my_num_threads; ++p) {
+            for (int n = 0; n < N; ++n) { CHECK_MESSAGE(my_touches[p][n] == true, ""); }
         }
         return true;
     }
 };
 
-template< typename T >
+template <typename T>
 struct parallel_gets : utils::NoAssign {
 
     tbb::flow::buffer_node<T> &my_b;
     touches<T> &my_touches;
 
-    parallel_gets( tbb::flow::buffer_node<T> &b, touches<T> &t) : my_b(b), my_touches(t) {}
+    parallel_gets(tbb::flow::buffer_node<T> &b, touches<T> &t) : my_b(b), my_touches(t) {}
 
     void operator()(int) const {
         for (int j = 0; j < N; ++j) {
             T v;
-            spin_try_get( my_b, v );
-            my_touches.check( v );
+            spin_try_get(my_b, v);
+            my_touches.check(v);
         }
     }
-
 };
 
-template< typename T >
+template <typename T>
 struct parallel_put_get : utils::NoAssign {
 
     tbb::flow::buffer_node<T> &my_b;
     touches<T> &my_touches;
 
-    parallel_put_get( tbb::flow::buffer_node<T> &b, touches<T> &t ) : my_b(b), my_touches(t) {}
+    parallel_put_get(tbb::flow::buffer_node<T> &b, touches<T> &t) : my_b(b), my_touches(t) {}
 
     void operator()(int tid) const {
 
-        for ( int i = 0; i < N; i+=C ) {
-            int j_end = ( N < i + C ) ? N : i + C;
+        for (int i = 0; i < N; i += C) {
+            int j_end = (N < i + C) ? N : i + C;
             // dump about C values into the buffer
-            for ( int j = i; j < j_end; ++j ) {
-                CHECK_MESSAGE( my_b.try_put( T (N*tid + j ) ) == true, "" );
-            }
+            for (int j = i; j < j_end; ++j) { CHECK_MESSAGE(my_b.try_put(T(N * tid + j)) == true, ""); }
             // receiver about C values from the buffer
-            for ( int j = i; j < j_end; ++j ) {
+            for (int j = i; j < j_end; ++j) {
                 T v;
-                spin_try_get( my_b, v );
-                my_touches.check( v );
+                spin_try_get(my_b, v);
+                my_touches.check(v);
             }
         }
     }
-
 };
 
 //
@@ -145,7 +136,7 @@ struct parallel_put_get : utils::NoAssign {
 //
 // Item can be reserved, released, consumed ( single serial receiver )
 //
-template< typename T >
+template <typename T>
 int test_reservation() {
     tbb::flow::graph g;
     T bogus_value(-1);
@@ -158,29 +149,29 @@ int test_reservation() {
     b.try_put(T(3));
 
     T v, vsum;
-    CHECK_MESSAGE( b.try_reserve(v) == true, "" );
-    CHECK_MESSAGE( b.try_release() == true, "" );
+    CHECK_MESSAGE(b.try_reserve(v) == true, "");
+    CHECK_MESSAGE(b.try_release() == true, "");
     v = bogus_value;
     g.wait_for_all();
-    CHECK_MESSAGE( b.try_reserve(v) == true, "" );
-    CHECK_MESSAGE( b.try_consume() == true, "" );
+    CHECK_MESSAGE(b.try_reserve(v) == true, "");
+    CHECK_MESSAGE(b.try_consume() == true, "");
     vsum += v;
     v = bogus_value;
     g.wait_for_all();
 
-    CHECK_MESSAGE( b.try_get(v) == true, "" );
+    CHECK_MESSAGE(b.try_get(v) == true, "");
     vsum += v;
     v = bogus_value;
     g.wait_for_all();
 
-    CHECK_MESSAGE( b.try_reserve(v) == true, "" );
-    CHECK_MESSAGE( b.try_release() == true, "" );
+    CHECK_MESSAGE(b.try_reserve(v) == true, "");
+    CHECK_MESSAGE(b.try_release() == true, "");
     v = bogus_value;
     g.wait_for_all();
-    CHECK_MESSAGE( b.try_reserve(v) == true, "" );
-    CHECK_MESSAGE( b.try_consume() == true, "" );
+    CHECK_MESSAGE(b.try_reserve(v) == true, "");
+    CHECK_MESSAGE(b.try_consume() == true, "");
     vsum += v;
-    CHECK_MESSAGE( vsum == T(6), "");
+    CHECK_MESSAGE(vsum == T(6), "");
     v = bogus_value;
     g.wait_for_all();
 
@@ -195,7 +186,7 @@ int test_reservation() {
 //   * overlapped puts / gets
 //   * all puts finished before any getS
 //
-template< typename T >
+template <typename T>
 int test_parallel(int num_threads) {
     tbb::flow::graph g;
     tbb::flow::buffer_node<T> b(g);
@@ -204,97 +195,97 @@ int test_parallel(int num_threads) {
     T bogus_value(-1);
     T j = bogus_value;
 
-    NativeParallelFor( num_threads, parallel_puts<T>(b) );
+    NativeParallelFor(num_threads, parallel_puts<T>(b));
 
     T *next_value = new T[num_threads];
     for (int tid = 0; tid < num_threads; ++tid) next_value[tid] = T(0);
 
-    for (int i = 0; i < num_threads * N; ++i ) {
-        spin_try_get( b, j );
-        check_item( next_value, j );
+    for (int i = 0; i < num_threads * N; ++i) {
+        spin_try_get(b, j);
+        check_item(next_value, j);
         j = bogus_value;
     }
-    for (int tid = 0; tid < num_threads; ++tid)  {
-        CHECK_MESSAGE( next_value[tid] == T((N*(N-1))/2), "" );
+    for (int tid = 0; tid < num_threads; ++tid) {
+        CHECK_MESSAGE(next_value[tid] == T((N * (N - 1)) / 2), "");
     }
 
     j = bogus_value;
     g.wait_for_all();
-    CHECK_MESSAGE( b.try_get( j ) == false, "" );
-    CHECK_MESSAGE( j == bogus_value, "" );
+    CHECK_MESSAGE(b.try_get(j) == false, "");
+    CHECK_MESSAGE(j == bogus_value, "");
 
-    NativeParallelFor( num_threads, parallel_puts<T>(b) );
+    NativeParallelFor(num_threads, parallel_puts<T>(b));
 
     {
-        touches< T > t( num_threads );
-        NativeParallelFor( num_threads, parallel_gets<T>(b, t) );
+        touches<T> t(num_threads);
+        NativeParallelFor(num_threads, parallel_gets<T>(b, t));
         g.wait_for_all();
-        CHECK_MESSAGE( t.validate_touches(), "" );
+        CHECK_MESSAGE(t.validate_touches(), "");
     }
     j = bogus_value;
-    CHECK_MESSAGE( b.try_get( j ) == false, "" );
-    CHECK_MESSAGE( j == bogus_value, "" );
+    CHECK_MESSAGE(b.try_get(j) == false, "");
+    CHECK_MESSAGE(j == bogus_value, "");
 
     g.wait_for_all();
     {
-        touches< T > t( num_threads );
-        NativeParallelFor( num_threads, parallel_put_get<T>(b, t) );
+        touches<T> t(num_threads);
+        NativeParallelFor(num_threads, parallel_put_get<T>(b, t));
         g.wait_for_all();
-        CHECK_MESSAGE( t.validate_touches(), "" );
+        CHECK_MESSAGE(t.validate_touches(), "");
     }
     j = bogus_value;
-    CHECK_MESSAGE( b.try_get( j ) == false, "" );
-    CHECK_MESSAGE( j == bogus_value, "" );
+    CHECK_MESSAGE(b.try_get(j) == false, "");
+    CHECK_MESSAGE(j == bogus_value, "");
 
-    tbb::flow::make_edge( b, b2 );
-    tbb::flow::make_edge( b2, b3 );
+    tbb::flow::make_edge(b, b2);
+    tbb::flow::make_edge(b2, b3);
 
-    NativeParallelFor( num_threads, parallel_puts<T>(b) );
+    NativeParallelFor(num_threads, parallel_puts<T>(b));
     {
-        touches< T > t( num_threads );
-        NativeParallelFor( num_threads, parallel_gets<T>(b3, t) );
+        touches<T> t(num_threads);
+        NativeParallelFor(num_threads, parallel_gets<T>(b3, t));
         g.wait_for_all();
-        CHECK_MESSAGE( t.validate_touches(), "" );
+        CHECK_MESSAGE(t.validate_touches(), "");
     }
     j = bogus_value;
     g.wait_for_all();
-    CHECK_MESSAGE( b.try_get( j ) == false, "" );
+    CHECK_MESSAGE(b.try_get(j) == false, "");
     g.wait_for_all();
-    CHECK_MESSAGE( b2.try_get( j ) == false, "" );
+    CHECK_MESSAGE(b2.try_get(j) == false, "");
     g.wait_for_all();
-    CHECK_MESSAGE( b3.try_get( j ) == false, "" );
-    CHECK_MESSAGE( j == bogus_value, "" );
+    CHECK_MESSAGE(b3.try_get(j) == false, "");
+    CHECK_MESSAGE(j == bogus_value, "");
 
     // test copy constructor
-    CHECK_MESSAGE( b.remove_successor( b2 ), "" );
+    CHECK_MESSAGE(b.remove_successor(b2), "");
     // fill up b:
-    NativeParallelFor( num_threads, parallel_puts<T>(b) );
+    NativeParallelFor(num_threads, parallel_puts<T>(b));
     // copy b:
     tbb::flow::buffer_node<T> b_copy(b);
 
     // b_copy should be empty
     j = bogus_value;
     g.wait_for_all();
-    CHECK_MESSAGE( b_copy.try_get( j ) == false, "" );
+    CHECK_MESSAGE(b_copy.try_get(j) == false, "");
 
     // hook them together:
-    CHECK_MESSAGE( b.register_successor(b_copy) == true, "" );
+    CHECK_MESSAGE(b.register_successor(b_copy) == true, "");
     // try to get content from b_copy
     {
-        touches< T > t( num_threads );
-        NativeParallelFor( num_threads, parallel_gets<T>(b_copy, t) );
+        touches<T> t(num_threads);
+        NativeParallelFor(num_threads, parallel_gets<T>(b_copy, t));
         g.wait_for_all();
-        CHECK_MESSAGE( t.validate_touches(), "" );
+        CHECK_MESSAGE(t.validate_touches(), "");
     }
     // now both should be empty
     j = bogus_value;
     g.wait_for_all();
-    CHECK_MESSAGE( b.try_get( j ) == false, "" );
+    CHECK_MESSAGE(b.try_get(j) == false, "");
     g.wait_for_all();
-    CHECK_MESSAGE( b_copy.try_get( j ) == false, "" );
-    CHECK_MESSAGE( j == bogus_value, "" );
+    CHECK_MESSAGE(b_copy.try_get(j) == false, "");
+    CHECK_MESSAGE(j == bogus_value, "");
 
-    delete [] next_value;
+    delete[] next_value;
     return 0;
 }
 
@@ -311,7 +302,7 @@ int test_parallel(int num_threads) {
 using tbb::TBB_INTERNAL_NAMESPACE::register_predecessor;
 using tbb::TBB_INTERNAL_NAMESPACE::remove_predecessor;
 
-template< typename T >
+template <typename T>
 int test_serial() {
     tbb::flow::graph g;
     T bogus_value(-1);
@@ -324,98 +315,98 @@ int test_serial() {
     // Rejects attempts to add / remove predecessor
     // Rejects request from empty buffer
     //
-    CHECK_MESSAGE( register_predecessor<T>( b, b2 ) == false, "" );
-    CHECK_MESSAGE( remove_predecessor<T>( b, b2 ) == false, "" );
-    CHECK_MESSAGE( b.try_get( j ) == false, "" );
-    CHECK_MESSAGE( j == bogus_value, "" );
+    CHECK_MESSAGE(register_predecessor<T>(b, b2) == false, "");
+    CHECK_MESSAGE(remove_predecessor<T>(b, b2) == false, "");
+    CHECK_MESSAGE(b.try_get(j) == false, "");
+    CHECK_MESSAGE(j == bogus_value, "");
 
     //
     // Simple puts and gets
     //
 
     for (int i = 0; i < N; ++i) {
-        bool msg = b.try_put( T(i) );
-        CHECK_MESSAGE( msg == true, "" );
+        bool msg = b.try_put(T(i));
+        CHECK_MESSAGE(msg == true, "");
     }
 
     T vsum = T(0);
     for (int i = 0; i < N; ++i) {
         j = bogus_value;
-        spin_try_get( b, j );
+        spin_try_get(b, j);
         vsum += j;
     }
-    CHECK_MESSAGE( vsum == (N*(N-1))/2, "");
+    CHECK_MESSAGE(vsum == (N * (N - 1)) / 2, "");
     j = bogus_value;
     g.wait_for_all();
-    CHECK_MESSAGE( b.try_get( j ) == false, "" );
-    CHECK_MESSAGE( j == bogus_value, "" );
+    CHECK_MESSAGE(b.try_get(j) == false, "");
+    CHECK_MESSAGE(j == bogus_value, "");
 
     tbb::flow::make_edge(b, b2);
 
     vsum = T(0);
     for (int i = 0; i < N; ++i) {
-        bool msg = b.try_put( T(i) );
-        CHECK_MESSAGE( msg == true, "" );
+        bool msg = b.try_put(T(i));
+        CHECK_MESSAGE(msg == true, "");
     }
 
     for (int i = 0; i < N; ++i) {
         j = bogus_value;
-        spin_try_get( b2, j );
+        spin_try_get(b2, j);
         vsum += j;
     }
-    CHECK_MESSAGE( vsum == (N*(N-1))/2, "");
+    CHECK_MESSAGE(vsum == (N * (N - 1)) / 2, "");
     j = bogus_value;
     g.wait_for_all();
-    CHECK_MESSAGE( b.try_get( j ) == false, "" );
+    CHECK_MESSAGE(b.try_get(j) == false, "");
     g.wait_for_all();
-    CHECK_MESSAGE( b2.try_get( j ) == false, "" );
-    CHECK_MESSAGE( j == bogus_value, "" );
+    CHECK_MESSAGE(b2.try_get(j) == false, "");
+    CHECK_MESSAGE(j == bogus_value, "");
 
     tbb::flow::remove_edge(b, b2);
-    CHECK_MESSAGE( b.try_put( 1 ) == true, "" );
+    CHECK_MESSAGE(b.try_put(1) == true, "");
     g.wait_for_all();
-    CHECK_MESSAGE( b2.try_get( j ) == false, "" );
-    CHECK_MESSAGE( j == bogus_value, "" );
+    CHECK_MESSAGE(b2.try_get(j) == false, "");
+    CHECK_MESSAGE(j == bogus_value, "");
     g.wait_for_all();
-    CHECK_MESSAGE( b.try_get( j ) == true, "" );
-    CHECK_MESSAGE( j == 1, "" );
+    CHECK_MESSAGE(b.try_get(j) == true, "");
+    CHECK_MESSAGE(j == 1, "");
 
     tbb::flow::buffer_node<T> b3(g);
-    tbb::flow::make_edge( b, b2 );
-    tbb::flow::make_edge( b2, b3 );
+    tbb::flow::make_edge(b, b2);
+    tbb::flow::make_edge(b2, b3);
 
     vsum = T(0);
     for (int i = 0; i < N; ++i) {
-        bool msg = b.try_put( T(i) );
-        CHECK_MESSAGE( msg == true, "" );
+        bool msg = b.try_put(T(i));
+        CHECK_MESSAGE(msg == true, "");
     }
 
     for (int i = 0; i < N; ++i) {
         j = bogus_value;
-        spin_try_get( b3, j );
+        spin_try_get(b3, j);
         vsum += j;
     }
-    CHECK_MESSAGE( vsum == (N*(N-1))/2, "");
+    CHECK_MESSAGE(vsum == (N * (N - 1)) / 2, "");
     j = bogus_value;
     g.wait_for_all();
-    CHECK_MESSAGE( b.try_get( j ) == false, "" );
+    CHECK_MESSAGE(b.try_get(j) == false, "");
     g.wait_for_all();
-    CHECK_MESSAGE( b2.try_get( j ) == false, "" );
+    CHECK_MESSAGE(b2.try_get(j) == false, "");
     g.wait_for_all();
-    CHECK_MESSAGE( b3.try_get( j ) == false, "" );
-    CHECK_MESSAGE( j == bogus_value, "" );
+    CHECK_MESSAGE(b3.try_get(j) == false, "");
+    CHECK_MESSAGE(j == bogus_value, "");
 
     tbb::flow::remove_edge(b, b2);
-    CHECK_MESSAGE( b.try_put( 1 ) == true, "" );
+    CHECK_MESSAGE(b.try_put(1) == true, "");
     g.wait_for_all();
-    CHECK_MESSAGE( b2.try_get( j ) == false, "" );
-    CHECK_MESSAGE( j == bogus_value, "" );
+    CHECK_MESSAGE(b2.try_get(j) == false, "");
+    CHECK_MESSAGE(j == bogus_value, "");
     g.wait_for_all();
-    CHECK_MESSAGE( b3.try_get( j ) == false, "" );
-    CHECK_MESSAGE( j == bogus_value, "" );
+    CHECK_MESSAGE(b3.try_get(j) == false, "");
+    CHECK_MESSAGE(j == bogus_value, "");
     g.wait_for_all();
-    CHECK_MESSAGE( b.try_get( j ) == true, "" );
-    CHECK_MESSAGE( j == 1, "" );
+    CHECK_MESSAGE(b.try_get(j) == true, "");
+    CHECK_MESSAGE(j == 1, "");
 
     return 0;
 }
@@ -426,7 +417,7 @@ int test_serial() {
 void test_follows_and_precedes_api() {
     using msg_t = tbb::flow::continue_msg;
 
-    std::array<msg_t, 3> messages_for_follows = { {msg_t(), msg_t(), msg_t()} };
+    std::array<msg_t, 3> messages_for_follows = {{msg_t(), msg_t(), msg_t()}};
     std::vector<msg_t> messages_for_precedes = {msg_t(), msg_t(), msg_t()};
 
     follows_and_precedes_testing::test_follows<msg_t, tbb::flow::buffer_node<msg_t>>(messages_for_follows);
@@ -481,8 +472,8 @@ void test_buffer_node_try_put_and_wait() {
     {
         std::vector<int> processed_items;
 
-        std::size_t after_start = test_buffer_push<tbb::flow::buffer_node<int>>(start_work_items, wait_message,
-                                                                                new_work_items, processed_items);
+        std::size_t after_start = test_buffer_push<tbb::flow::buffer_node<int>>(
+                start_work_items, wait_message, new_work_items, processed_items);
 
         // Expected effect:
         // During buffer1.try_put_and_wait()
@@ -503,7 +494,8 @@ void test_buffer_node_try_put_and_wait() {
 
         std::size_t check_index = 0;
         CHECK_MESSAGE(after_start == 1, "try_put_and_wait should process only the wait_message");
-        CHECK_MESSAGE(processed_items[check_index++] == wait_message, "try_put_and_wait should process only the wait_message");
+        CHECK_MESSAGE(processed_items[check_index++] == wait_message,
+                      "try_put_and_wait should process only the wait_message");
 
         for (std::size_t index = start_work_items.size(); index != 0; --index) {
             CHECK_MESSAGE(processed_items[check_index++] == start_work_items[index - 1],
@@ -514,7 +506,7 @@ void test_buffer_node_try_put_and_wait() {
                           "wait_for_all should process new_work_items LIFO");
         }
         CHECK(check_index == processed_items.size());
-    } // Test push
+    }// Test push
 
     // Test pull
     // test_buffer_pull tests the graph
@@ -532,8 +524,8 @@ void test_buffer_node_try_put_and_wait() {
         std::vector<int> processed_items;
         int occupier = 42;
 
-        std::size_t after_start = test_buffer_pull<tbb::flow::buffer_node<int>>(start_work_items, wait_message, occupier,
-                                                                                new_work_items, processed_items);
+        std::size_t after_start = test_buffer_pull<tbb::flow::buffer_node<int>>(
+                start_work_items, wait_message, occupier, new_work_items, processed_items);
 
         // Expected effect
         // 0. task for occupier processing would be spawned by the function
@@ -549,9 +541,12 @@ void test_buffer_node_try_put_and_wait() {
 
         std::size_t check_index = 0;
 
-        CHECK_MESSAGE(after_start == 2, "Only wait_message and occupier should be processed by try_put_and_wait");
-        CHECK_MESSAGE(processed_items[check_index++] == occupier, "Unexpected items processing by try_put_and_wait");
-        CHECK_MESSAGE(processed_items[check_index++] == wait_message, "Unexpected items processing by try_put_and_wait");
+        CHECK_MESSAGE(after_start == 2,
+                      "Only wait_message and occupier should be processed by try_put_and_wait");
+        CHECK_MESSAGE(processed_items[check_index++] == occupier,
+                      "Unexpected items processing by try_put_and_wait");
+        CHECK_MESSAGE(processed_items[check_index++] == wait_message,
+                      "Unexpected items processing by try_put_and_wait");
 
         for (std::size_t index = new_work_items.size(); index != 0; --index) {
             CHECK_MESSAGE(processed_items[check_index++] == new_work_items[index - 1],
@@ -566,7 +561,7 @@ void test_buffer_node_try_put_and_wait() {
 
     // Test reserve
     {
-        int thresholds[] = { 1, 2 };
+        int thresholds[] = {1, 2};
 
         for (int threshold : thresholds) {
             std::vector<int> processed_items;
@@ -576,8 +571,8 @@ void test_buffer_node_try_put_and_wait() {
             //  function is a rejecting serial function_node that puts an item to the decrementer port
             //  of the limiter inside of the body
 
-            std::size_t after_start = test_buffer_reserve<tbb::flow::buffer_node<int>>(threshold,
-                start_work_items, wait_message, new_work_items, processed_items);
+            std::size_t after_start = test_buffer_reserve<tbb::flow::buffer_node<int>>(
+                    threshold, start_work_items, wait_message, new_work_items, processed_items);
 
             // Expected effect:
             // 1. start_work_items would be pushed to the buffer
@@ -595,64 +590,58 @@ void test_buffer_node_try_put_and_wait() {
             std::size_t check_index = 0;
 
             CHECK_MESSAGE(after_start == 1, "try_put_and_wait should process only wait_message");
-            CHECK_MESSAGE(processed_items[check_index++] == wait_message, "Unexpected wait_message processing");
+            CHECK_MESSAGE(processed_items[check_index++] == wait_message,
+                          "Unexpected wait_message processing");
 
             for (auto item : start_work_items) {
-                CHECK_MESSAGE(processed_items[check_index++] == item, "Unexpected start_work_items processing");
+                CHECK_MESSAGE(processed_items[check_index++] == item,
+                              "Unexpected start_work_items processing");
             }
 
             for (auto item : new_work_items) {
-                CHECK_MESSAGE(processed_items[check_index++] == item, "Unexpected start_work_items processing");
+                CHECK_MESSAGE(processed_items[check_index++] == item,
+                              "Unexpected start_work_items processing");
             }
-
         }
     }
 }
-#endif // __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+#endif// __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
 
 #include <iomanip>
 
 //! Test buffer_node with parallel and serial neighbours
 //! \brief \ref requirement \ref error_guessing
-TEST_CASE("Serial and parallel test"){
+TEST_CASE("Serial and parallel test") {
     for (int p = 2; p <= 4; ++p) {
         tbb::global_control thread_limit(tbb::global_control::max_allowed_parallelism, p);
         tbb::task_arena arena(p);
-        arena.execute(
-            [&]() {
-                test_serial<int>();
-                test_parallel<int>(p);
-            }
-        );
+        arena.execute([&]() {
+            test_serial<int>();
+            test_parallel<int>(p);
+        });
     }
 }
 
 //! Test reset and cancellation behavior
 //! \brief \ref error_guessing
-TEST_CASE("Resets"){
-    test_resets<int,tbb::flow::buffer_node<int> >();
-    test_resets<float,tbb::flow::buffer_node<float> >();
+TEST_CASE("Resets") {
+    test_resets<int, tbb::flow::buffer_node<int>>();
+    test_resets<float, tbb::flow::buffer_node<float>>();
 }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 //! Test deprecated follows and precedes API
 //! \brief \ref error_guessing
-TEST_CASE("Follows and precedes API"){
-    test_follows_and_precedes_api();
-}
+TEST_CASE("Follows and precedes API") { test_follows_and_precedes_api(); }
 #endif
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 //! Test deduction guides
 //! \brief \ref requirement
-TEST_CASE("Deduction guides"){
-    test_deduction_guides();
-}
+TEST_CASE("Deduction guides") { test_deduction_guides(); }
 #endif
 
 #if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
 //! \brief \ref error_guessing
-TEST_CASE("test buffer_node try_put_and_wait") {
-    test_buffer_node_try_put_and_wait();
-}
+TEST_CASE("test buffer_node try_put_and_wait") { test_buffer_node_try_put_and_wait(); }
 #endif
diff --git a/external/tbb/test/tbb/test_collaborative_call_once.cpp b/external/tbb/test/tbb/test_collaborative_call_once.cpp
index 11a04a10..c8eef7ee 100644
--- a/external/tbb/test/tbb/test_collaborative_call_once.cpp
+++ b/external/tbb/test/tbb/test_collaborative_call_once.cpp
@@ -16,12 +16,12 @@
 
 #if _MSC_VER && !defined(__INTEL_COMPILER)
 // unreachable code
-#pragma warning( push )
-#pragma warning( disable: 4702 )
+#pragma warning(push)
+#pragma warning(disable : 4702)
 #endif
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
 #endif
 
 #include "common/config.h"
@@ -29,8 +29,8 @@
 // Include first to check missed header dependencies
 #include "tbb/collaborative_call_once.h"
 
-#include "common/test.h"
 #include "common/exception_handling.h"
+#include "common/test.h"
 #include "common/utils_concurrency_limit.h"
 
 #include "tbb/parallel_invoke.h"
@@ -41,22 +41,20 @@
 //! \brief Tests for [algorithms.collaborative_call_once] functionality
 
 struct increment_functor {
-    int ct{0};
+    int ct {0};
 
-    void operator()() {
-        ct++;
-    }
+    void operator()() { ct++; }
 };
 
 struct sum_functor {
-    int sum{0};
+    int sum {0};
 
-    template<typename T>
+    template <typename T>
     void operator()(T first_op) {
         sum += first_op;
     }
 
-    template<typename T, typename... Args>
+    template <typename T, typename... Args>
     void operator()(T first_op, Args&&... args) {
         (*this)(first_op);
         (*this)(std::forward<Args>(args)...);
@@ -65,14 +63,13 @@ struct sum_functor {
 
 struct move_only_type {
     const int* my_pointer;
-    move_only_type(move_only_type && other): my_pointer(other.my_pointer){ other.my_pointer=nullptr; }
-    explicit move_only_type(const int* value): my_pointer(value) {}
+    move_only_type(move_only_type&& other) : my_pointer(other.my_pointer) { other.my_pointer = nullptr; }
+    explicit move_only_type(const int* value) : my_pointer(value) {}
 };
 
-
 class call_once_exception : public std::exception {};
 
-template<typename Fn, typename... Args>
+template <typename Fn, typename... Args>
 void call_once_in_for_loop(std::size_t N, Fn&& body, Args&&... args) {
     tbb::collaborative_once_flag flag;
     for (std::size_t i = 0; i < N; ++i) {
@@ -80,13 +77,13 @@ void call_once_in_for_loop(std::size_t N, Fn&& body, Args&&... args) {
     }
 }
 
-template<typename Fn, typename... Args>
+template <typename Fn, typename... Args>
 void call_once_in_parallel_for(std::size_t N, Fn&& body, Args&&... args) {
     tbb::collaborative_once_flag flag;
 #if __TBB_GCC_PARAMETER_PACK_IN_LAMBDAS_BROKEN
     auto stored_pack = tbb::detail::d0::save_pack(std::forward<Args>(args)...);
     auto func = [&] { tbb::detail::d0::call(std::forward<Fn>(body), std::move(stored_pack)); };
-#endif // __TBB_GCC_PARAMETER_PACK_IN_LAMBDAS_BROKEN
+#endif// __TBB_GCC_PARAMETER_PACK_IN_LAMBDAS_BROKEN
 
     tbb::parallel_for(tbb::blocked_range<size_t>(0, N), [&](const tbb::blocked_range<size_t>& range) {
         for (size_t i = range.begin(); i != range.end(); ++i) {
@@ -94,12 +91,12 @@ void call_once_in_parallel_for(std::size_t N, Fn&& body, Args&&... args) {
             tbb::collaborative_call_once(flag, func);
 #else
             tbb::collaborative_call_once(flag, std::forward<Fn>(body), std::forward<Args>(args)...);
-#endif //__TBB_GCC_PARAMETER_PACK_IN_LAMBDAS_BROKEN
+#endif//__TBB_GCC_PARAMETER_PACK_IN_LAMBDAS_BROKEN
         }
     });
 }
 
-template<typename Fn, typename... Args>
+template <typename Fn, typename... Args>
 void call_once_threads(std::size_t N, Fn&& body, Args&&... args) {
     tbb::collaborative_once_flag flag;
     std::vector<std::thread> threads;
@@ -107,21 +104,18 @@ void call_once_threads(std::size_t N, Fn&& body, Args&&... args) {
 #if __TBB_GCC_PARAMETER_PACK_IN_LAMBDAS_BROKEN
     auto stored_pack = tbb::detail::d0::save_pack(std::forward<Args>(args)...);
     auto func = [&] { tbb::detail::d0::call(std::forward<Fn>(body), std::move(stored_pack)); };
-#endif // __TBB_GCC_PARAMETER_PACK_IN_LAMBDAS_BROKEN
+#endif// __TBB_GCC_PARAMETER_PACK_IN_LAMBDAS_BROKEN
 
-    for (std::size_t i = 0; i < N; ++i)
-    {
+    for (std::size_t i = 0; i < N; ++i) {
         threads.push_back(std::thread([&]() {
 #if __TBB_GCC_PARAMETER_PACK_IN_LAMBDAS_BROKEN
             tbb::collaborative_call_once(flag, func);
 #else
             tbb::collaborative_call_once(flag, std::forward<Fn>(body), std::forward<Args>(args)...);
-#endif // __TBB_GCC_PARAMETER_PACK_IN_LAMBDAS_BROKEN
+#endif// __TBB_GCC_PARAMETER_PACK_IN_LAMBDAS_BROKEN
         }));
     }
-    for (auto& thread : threads) {
-        thread.join();
-    }
+    for (auto& thread : threads) { thread.join(); }
 }
 
 //! Test for functor to be called only once
@@ -132,7 +126,7 @@ TEST_CASE("only calls once 1") {
 
         call_once_in_for_loop(1024, f);
 
-        REQUIRE( f.ct == 1);
+        REQUIRE(f.ct == 1);
     }
     {
         increment_functor f;
@@ -156,7 +150,7 @@ TEST_CASE("only calls once 2") {
     {
         sum_functor f;
 
-        call_once_in_for_loop(1024, f, 1, 2, 3 ,4);
+        call_once_in_for_loop(1024, f, 1, 2, 3, 4);
 
         REQUIRE(f.sum == 10);
     }
@@ -180,9 +174,9 @@ TEST_CASE("only calls once 2") {
 //! \brief \ref interface \ref requirement
 TEST_CASE("only calls once - move only argument") {
     const int value = 42;
-    int ready{0};
+    int ready {0};
 
-    auto func = [&ready, &value] (move_only_type other) {
+    auto func = [&ready, &value](move_only_type other) {
         REQUIRE(other.my_pointer == &value);
         ready++;
     };
@@ -212,7 +206,7 @@ TEST_CASE("only calls once - move only argument") {
 TEST_CASE("only calls once - stress test") {
 #if TBB_TEST_LOW_WORKLOAD
     constexpr std::size_t N = 32;
-#elif __TBB_x86_32 || __arm__  || __ANDROID__
+#elif __TBB_x86_32 || __arm__ || __ANDROID__
     // Some C++ implementations allocate 8MB stacks for std::thread on 32 bit platforms
     // that makes impossible to create more than ~500 threads.
     // Android has been added to decrease testing time.
@@ -220,7 +214,7 @@ TEST_CASE("only calls once - stress test") {
 #elif __TBB_USE_THREAD_SANITIZER
     // Reduce execution time under Thread Sanitizer
     constexpr std::size_t N = tbb::detail::d0::max_nfs_size + 64;
-#else 
+#else
     constexpr std::size_t N = tbb::detail::d0::max_nfs_size * 4;
 #endif
     {
@@ -233,14 +227,14 @@ TEST_CASE("only calls once - stress test") {
     {
         increment_functor f;
 
-        utils::SpinBarrier barrier{N};
+        utils::SpinBarrier barrier {N};
         tbb::collaborative_once_flag flag;
         utils::NativeParallelFor(N, [&](std::size_t) {
             for (int i = 0; i < 100; ++i) {
                 REQUIRE(f.ct == i);
                 barrier.wait([&] {
                     flag.~collaborative_once_flag();
-                    new (&flag) tbb::collaborative_once_flag{};
+                    new (&flag) tbb::collaborative_once_flag {};
                 });
                 tbb::collaborative_call_once(flag, f);
             }
@@ -253,11 +247,11 @@ TEST_CASE("only calls once - stress test") {
 //! Test for collaborative_call_once exception handling
 //! \brief \ref error_guessing
 TEST_CASE("handles exceptions - state reset") {
-    bool b{ false };
+    bool b {false};
     auto setB = [&b]() { b = true; };
     auto setBAndCancel = [&b]() {
         b = true;
-        throw call_once_exception{};
+        throw call_once_exception {};
     };
 
     tbb::collaborative_once_flag flag;
@@ -273,11 +267,12 @@ TEST_CASE("handles exceptions - state reset") {
     REQUIRE(b);
 
     b = false;
-    tbb::collaborative_call_once(flag, setB); // Now the call_once flag should be set.
+    tbb::collaborative_call_once(flag, setB);// Now the call_once flag should be set.
     REQUIRE(!b);
 
     b = false;
-    REQUIRE_NOTHROW(tbb::collaborative_call_once(flag, setBAndCancel)); // Flag still set, so it shouldn't be called.
+    REQUIRE_NOTHROW(
+            tbb::collaborative_call_once(flag, setBAndCancel));// Flag still set, so it shouldn't be called.
     REQUIRE(!b);
 }
 
@@ -291,18 +286,18 @@ TEST_CASE("handles exceptions - stress test") {
     // that makes impossible to create more than ~500 threads.
     // Android has been added to decrease testing time.
     constexpr std::size_t N = tbb::detail::d0::max_nfs_size * 2;
-#else 
+#else
     constexpr std::size_t N = tbb::detail::d0::max_nfs_size * 4;
 #endif
 
-    int data{0};
-    std::atomic<bool> run_again{true};
+    int data {0};
+    std::atomic<bool> run_again {true};
 
     auto throwing_func = [&] {
         utils::doDummyWork(10000);
         if (data < 100) {
             data++;
-            throw call_once_exception{};
+            throw call_once_exception {};
         }
         run_again = false;
     };
@@ -310,14 +305,12 @@ TEST_CASE("handles exceptions - stress test") {
     tbb::collaborative_once_flag flag;
 
     utils::NativeParallelFor(N, [&](std::size_t) {
-        while(run_again) {
+        while (run_again) {
             try {
                 tbb::collaborative_call_once(flag, throwing_func);
             } catch (const call_once_exception&) {
                 // We expecting only const call_once_exception&
-            } catch (...) {
-                FAIL("Unexpected exception");
-            }
+            } catch (...) { FAIL("Unexpected exception"); }
         }
     });
     REQUIRE(data == 100);
@@ -330,16 +323,14 @@ TEST_CASE("handles exceptions - stress test") {
 //! \brief \ref interface \ref requirement
 TEST_CASE("multiple help") {
     std::size_t num_threads = utils::get_platform_max_threads();
-    utils::SpinBarrier barrier{num_threads};
+    utils::SpinBarrier barrier {num_threads};
 
     tbb::collaborative_once_flag flag;
 
     tbb::parallel_for<std::size_t>(0, num_threads, [&](std::size_t) {
         barrier.wait();
         tbb::collaborative_call_once(flag, [&] {
-            tbb::parallel_for<std::size_t>(0, num_threads, [&](std::size_t) {
-                barrier.wait();
-            });
+            tbb::parallel_for<std::size_t>(0, num_threads, [&](std::size_t) { barrier.wait(); });
         });
     });
 }
@@ -370,14 +361,11 @@ TEST_CASE("multiple arenas") {
 
     a2.execute([&] {
         utils::ConcurrencyTracker ct;
-        tbb::parallel_for(0, num_threads, [&](int) {
-            CHECK(utils::ConcurrencyTracker::PeakParallelism() == 1);
-        });
+        tbb::parallel_for(0, num_threads,
+                          [&](int) { CHECK(utils::ConcurrencyTracker::PeakParallelism() == 1); });
         tbb::collaborative_call_once(flag, [&] {
             barrier.wait();
-            tbb::parallel_for(0, num_threads, [&](int) {
-                barrier.wait();
-            });
+            tbb::parallel_for(0, num_threads, [&](int) { barrier.wait(); });
         });
         // To sync collaborative_once_flag lifetime
         barrier.wait();
@@ -386,9 +374,7 @@ TEST_CASE("multiple arenas") {
 
 using FibBuffer = std::vector<std::pair<tbb::collaborative_once_flag, std::uint64_t>>;
 std::uint64_t collaborative_recursive_fib(int n, FibBuffer& buffer) {
-    if (n <= 1) {
-        return 1;
-    }
+    if (n <= 1) { return 1; }
     tbb::collaborative_call_once(buffer[n].first, [&]() {
         std::uint64_t a, b;
         tbb::parallel_invoke([&] { a = collaborative_recursive_fib(n - 2, buffer); },
@@ -400,7 +386,7 @@ std::uint64_t collaborative_recursive_fib(int n, FibBuffer& buffer) {
 
 std::uint64_t collaborative_recursive_fib(int n) {
     FibBuffer buffer(n);
-    return collaborative_recursive_fib(n-1, buffer);
+    return collaborative_recursive_fib(n - 1, buffer);
 }
 
 //! Correctness test for Fibonacci example
@@ -415,5 +401,5 @@ TEST_CASE("fibonacci example") {
 }
 
 #if _MSC_VER && !defined(__INTEL_COMPILER)
-#pragma warning( pop )
+#pragma warning(pop)
 #endif
diff --git a/external/tbb/test/tbb/test_composite_node.cpp b/external/tbb/test/tbb/test_composite_node.cpp
index e7524129..073d8872 100644
--- a/external/tbb/test/tbb/test_composite_node.cpp
+++ b/external/tbb/test/tbb/test_composite_node.cpp
@@ -15,230 +15,246 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
 #endif
 
 #include "common/config.h"
 
 #include "tbb/flow_graph.h"
 
+#include "common/graph_utils.h"
 #include "common/test.h"
 #include "common/utils.h"
-#include "common/graph_utils.h"
 
-#include <tuple>
 #include <cmath>
+#include <tuple>
 #include <vector>
 
-
 //! \file test_composite_node.cpp
 //! \brief Test for [flow_graph.composite_node] specification
 
-
 struct passthru_body {
-    int operator()( int i ) {
-        return i;
-    }
+    int operator()(int i) { return i; }
 };
 
-class my_input_body{
+class my_input_body {
     int start;
     int finish;
     int step;
+
 public:
     my_input_body(int f, int s) : start(1), finish(f), step(s) {}
-    int operator()(tbb::flow_control& fc) {
-       int a = start;
-       if (start <= finish) {
-           a = start;
-           start+=step;
-           return a;
-       }
-       else {
-           fc.stop();
-           return int();
-       };
-   }
+    int operator()(tbb::flow_control &fc) {
+        int a = start;
+        if (start <= finish) {
+            a = start;
+            start += step;
+            return a;
+        } else {
+            fc.stop();
+            return int();
+        };
+    }
 };
 
-struct m_fxn_body{
-    void operator()(int, tbb::flow::multifunction_node<int, std::tuple<int,int> >::output_ports_type ) {}
+struct m_fxn_body {
+    void operator()(int, tbb::flow::multifunction_node<int, std::tuple<int, int>>::output_ports_type) {}
 };
 
 struct ct_body {
-ct_body(){}
-    void operator()(tbb::flow::continue_msg){}
+    ct_body() {}
+    void operator()(tbb::flow::continue_msg) {}
 };
 
 struct seq_body {
-std::size_t operator()(int i) { return i; }
+    std::size_t operator()(int i) { return i; }
 };
 
-template<int N, typename T1, typename T2>
+template <int N, typename T1, typename T2>
 struct compare {
     static void compare_refs(T1 tuple1, T2 tuple2) {
-    CHECK_MESSAGE( ( &std::get<N>(tuple1) == &std::get<N>(tuple2)), "ports not set correctly");
-    compare<N-1, T1, T2>::compare_refs(tuple1, tuple2);
+        CHECK_MESSAGE((&std::get<N>(tuple1) == &std::get<N>(tuple2)), "ports not set correctly");
+        compare<N - 1, T1, T2>::compare_refs(tuple1, tuple2);
     }
 };
 
-template<typename T1, typename T2>
+template <typename T1, typename T2>
 struct compare<1, T1, T2> {
     static void compare_refs(T1 tuple1, T2 tuple2) {
-    CHECK_MESSAGE( (&std::get<0>(tuple1) == &std::get<0>(tuple2)), "port 0 not correctly set");
+        CHECK_MESSAGE((&std::get<0>(tuple1) == &std::get<0>(tuple2)), "port 0 not correctly set");
     }
 };
 
-struct tiny_node : public tbb::flow::composite_node< std::tuple< int >, std::tuple< int > > {
-    tbb::flow::function_node< int, int > f1;
-    tbb::flow::function_node< int, int > f2;
-    typedef tbb::flow::composite_node< std::tuple< int >, std::tuple< int > > base_type;
+struct tiny_node : public tbb::flow::composite_node<std::tuple<int>, std::tuple<int>> {
+    tbb::flow::function_node<int, int> f1;
+    tbb::flow::function_node<int, int> f2;
+    typedef tbb::flow::composite_node<std::tuple<int>, std::tuple<int>> base_type;
 
 public:
-    tiny_node(tbb::flow::graph &g, bool hidden = false) : base_type(g), f1(g, tbb::flow::unlimited, passthru_body() ), f2(g, tbb::flow::unlimited, passthru_body() ) {
+    tiny_node(tbb::flow::graph &g, bool hidden = false)
+        : base_type(g), f1(g, tbb::flow::unlimited, passthru_body()),
+          f2(g, tbb::flow::unlimited, passthru_body()) {
         tbb::flow::make_edge(f1, f2);
 
-        std::tuple<tbb::flow::function_node< int, int >& > input_tuple(f1);
-        std::tuple<tbb::flow::function_node< int, int >& > output_tuple(f2);
+        std::tuple<tbb::flow::function_node<int, int> &> input_tuple(f1);
+        std::tuple<tbb::flow::function_node<int, int> &> output_tuple(f2);
         base_type::set_external_ports(input_tuple, output_tuple);
 
-        if(hidden)
-            base_type::add_nodes(f1, f2);
+        if (hidden) base_type::add_nodes(f1, f2);
         else
             base_type::add_visible_nodes(f1, f2);
-
     }
 };
 
 int test_tiny(bool hidden = false) {
     tbb::flow::graph g;
-    tbb::flow::function_node< int, int > f0( g, tbb::flow::unlimited, passthru_body() );
+    tbb::flow::function_node<int, int> f0(g, tbb::flow::unlimited, passthru_body());
     tiny_node t(g, hidden);
-    CHECK_MESSAGE( (&tbb::flow::input_port<0>(t) == &t.f1), "f1 not bound to input port 0 in composite_node t");
-    CHECK_MESSAGE( (&tbb::flow::output_port<0>(t) == &t.f2), "f2 not bound to output port 0 in composite_node t");
+    CHECK_MESSAGE((&tbb::flow::input_port<0>(t) == &t.f1),
+                  "f1 not bound to input port 0 in composite_node t");
+    CHECK_MESSAGE((&tbb::flow::output_port<0>(t) == &t.f2),
+                  "f2 not bound to output port 0 in composite_node t");
 
     tiny_node t1(g, hidden);
-    CHECK_MESSAGE( (&std::get<0>(t1.input_ports()) == &t1.f1), "f1 not bound to input port 0 in composite_node t1");
-    CHECK_MESSAGE( (&std::get<0>(t1.output_ports()) == &t1.f2), "f2 not bound to output port 0 in composite_node t1");
+    CHECK_MESSAGE((&std::get<0>(t1.input_ports()) == &t1.f1),
+                  "f1 not bound to input port 0 in composite_node t1");
+    CHECK_MESSAGE((&std::get<0>(t1.output_ports()) == &t1.f2),
+                  "f2 not bound to output port 0 in composite_node t1");
 
     test_input_ports_return_ref(t1);
     test_output_ports_return_ref(t1);
 
     tiny_node t2(g, hidden);
-    CHECK_MESSAGE( (&tbb::flow::input_port<0>(t2) == &t2.f1), "f1 not bound to input port 0 in composite_node t2");
-    CHECK_MESSAGE( (&tbb::flow::output_port<0>(t2) == &t2.f2), "f2 not bound to output port 0 in composite_node t2");
-
-    tbb::flow::function_node< int, int > f3( g, tbb::flow::unlimited, passthru_body() );
-    tbb::flow::make_edge( f0, t );
-    tbb::flow::make_edge( t, t1 );
-    tbb::flow::make_edge( t1, t2 );
-    tbb::flow::make_edge( t2 , f3 );
+    CHECK_MESSAGE((&tbb::flow::input_port<0>(t2) == &t2.f1),
+                  "f1 not bound to input port 0 in composite_node t2");
+    CHECK_MESSAGE((&tbb::flow::output_port<0>(t2) == &t2.f2),
+                  "f2 not bound to output port 0 in composite_node t2");
+
+    tbb::flow::function_node<int, int> f3(g, tbb::flow::unlimited, passthru_body());
+    tbb::flow::make_edge(f0, t);
+    tbb::flow::make_edge(t, t1);
+    tbb::flow::make_edge(t1, t2);
+    tbb::flow::make_edge(t2, f3);
     tbb::flow::queue_node<int> q(g);
     tbb::flow::make_edge(f3, q);
     f0.try_put(1);
     g.wait_for_all();
 
-    int i, j =0;
+    int i, j = 0;
     q.try_get(i);
-    CHECK_MESSAGE( ( i == 1), "item did not go through graph");
+    CHECK_MESSAGE((i == 1), "item did not go through graph");
     q.try_get(j);
-    CHECK_MESSAGE( ( !j), "unexpected item in graph");
+    CHECK_MESSAGE((!j), "unexpected item in graph");
     g.wait_for_all();
 
     tbb::flow::remove_edge(f3, q);
     tbb::flow::remove_edge(t2, f3);
     tbb::flow::remove_edge(t1, t2);
 
-    tbb::flow::make_edge( t1 , f3 );
+    tbb::flow::make_edge(t1, f3);
     tbb::flow::make_edge(f3, q);
 
     f0.try_put(2);
     g.wait_for_all();
 
     q.try_get(i);
-    CHECK_MESSAGE( ( i == 2), "item did not go through graph after removal of edge");
+    CHECK_MESSAGE((i == 2), "item did not go through graph after removal of edge");
     q.try_get(j);
-    CHECK_MESSAGE( ( !j), "unexpected item in graph after removal of edge");
+    CHECK_MESSAGE((!j), "unexpected item in graph after removal of edge");
 
     return 0;
 }
 
-class adder_node : public tbb::flow::composite_node< std::tuple< int, int >, std::tuple< int > > {
+class adder_node : public tbb::flow::composite_node<std::tuple<int, int>, std::tuple<int>> {
 public:
-    tbb::flow::join_node< std::tuple< int, int >, tbb::flow::queueing > j;
-    tbb::flow::function_node< std::tuple< int, int >, int > f;
+    tbb::flow::join_node<std::tuple<int, int>, tbb::flow::queueing> j;
+    tbb::flow::function_node<std::tuple<int, int>, int> f;
+
 private:
-    typedef tbb::flow::composite_node< std::tuple< int, int >, std::tuple< int > > base_type;
+    typedef tbb::flow::composite_node<std::tuple<int, int>, std::tuple<int>> base_type;
 
     struct f_body {
-        int operator()( const std::tuple< int, int > &t ) {
-            return std::get<0>(t) + std::get<1>(t);
-        }
+        int operator()(const std::tuple<int, int> &t) { return std::get<0>(t) + std::get<1>(t); }
     };
 
 public:
-    adder_node(tbb::flow::graph &g, bool hidden = false) : base_type(g), j(g), f(g, tbb::flow::unlimited, f_body() ) {
-        tbb::flow::make_edge( j, f );
+    adder_node(tbb::flow::graph &g, bool hidden = false)
+        : base_type(g), j(g), f(g, tbb::flow::unlimited, f_body()) {
+        tbb::flow::make_edge(j, f);
 
-        base_type::set_external_ports(base_type::input_ports_type(tbb::flow::input_port<0>(j), tbb::flow::input_port<1>(j)), base_type::output_ports_type(f));
+        base_type::set_external_ports(
+                base_type::input_ports_type(tbb::flow::input_port<0>(j), tbb::flow::input_port<1>(j)),
+                base_type::output_ports_type(f));
 
-        if (hidden)
-            base_type::add_nodes(j, f);
+        if (hidden) base_type::add_nodes(j, f);
         else
             base_type::add_visible_nodes(j, f);
-
     }
 };
 
-struct square_body { int operator()(int v) { return v*v; } };
-struct cube_body { int operator()(int v) { return v*v*v; } };
-int adder_sum(int i) {
-    return (int)(pow(3*pow(i,3) + pow(i, 2),2));
-}
+struct square_body {
+    int operator()(int v) { return v * v; }
+};
+struct cube_body {
+    int operator()(int v) { return v * v * v; }
+};
+int adder_sum(int i) { return (int) (pow(3 * pow(i, 3) + pow(i, 2), 2)); }
 int test_adder(bool hidden = false) {
     tbb::flow::graph g;
-    tbb::flow::function_node<int,int> s(g, tbb::flow::unlimited, square_body());
-    tbb::flow::function_node<int,int> c(g, tbb::flow::unlimited, cube_body());
-    tbb::flow::function_node<int,int> p(g, tbb::flow::unlimited, passthru_body());
+    tbb::flow::function_node<int, int> s(g, tbb::flow::unlimited, square_body());
+    tbb::flow::function_node<int, int> c(g, tbb::flow::unlimited, cube_body());
+    tbb::flow::function_node<int, int> p(g, tbb::flow::unlimited, passthru_body());
 
     adder_node a0(g, hidden);
-    CHECK_MESSAGE( (&tbb::flow::input_port<0>(a0) == &tbb::flow::input_port<0>(a0.j)), "input_port 0 of j not bound to input port 0 in composite_node a0");
-    CHECK_MESSAGE( (&tbb::flow::input_port<1>(a0) == &tbb::flow::input_port<1>(a0.j)), "input_port 1 of j not bound to input port 1 in composite_node a0");
-    CHECK_MESSAGE( (&tbb::flow::output_port<0>(a0) == &a0.f), "f not bound to output port 0 in composite_node a0");
+    CHECK_MESSAGE((&tbb::flow::input_port<0>(a0) == &tbb::flow::input_port<0>(a0.j)),
+                  "input_port 0 of j not bound to input port 0 in composite_node a0");
+    CHECK_MESSAGE((&tbb::flow::input_port<1>(a0) == &tbb::flow::input_port<1>(a0.j)),
+                  "input_port 1 of j not bound to input port 1 in composite_node a0");
+    CHECK_MESSAGE((&tbb::flow::output_port<0>(a0) == &a0.f),
+                  "f not bound to output port 0 in composite_node a0");
 
     adder_node a1(g, hidden);
-    CHECK_MESSAGE( (&std::get<0>(a0.input_ports()) == &tbb::flow::input_port<0>(a0.j)), "input_port 0 of j not bound to input port 0 in composite_node a1");
-    CHECK_MESSAGE( (&std::get<1>(a0.input_ports()) == &tbb::flow::input_port<1>(a0.j)), "input_port1 of j not bound to input port 1 in composite_node a1");
-    CHECK_MESSAGE( (&std::get<0>(a0.output_ports()) == &a0.f), "f not bound to output port 0 in composite_node a1");
+    CHECK_MESSAGE((&std::get<0>(a0.input_ports()) == &tbb::flow::input_port<0>(a0.j)),
+                  "input_port 0 of j not bound to input port 0 in composite_node a1");
+    CHECK_MESSAGE((&std::get<1>(a0.input_ports()) == &tbb::flow::input_port<1>(a0.j)),
+                  "input_port1 of j not bound to input port 1 in composite_node a1");
+    CHECK_MESSAGE((&std::get<0>(a0.output_ports()) == &a0.f),
+                  "f not bound to output port 0 in composite_node a1");
 
     adder_node a2(g, hidden);
-    CHECK_MESSAGE( (&tbb::flow::input_port<0>(a2) == &tbb::flow::input_port<0>(a2.j)), "input_port 0 of j not bound to input port 0 in composite_node a2");
-    CHECK_MESSAGE( (&tbb::flow::input_port<1>(a2) == &tbb::flow::input_port<1>(a2.j)), "input_port 1 of j not bound to input port 1 in composite_node a2");
-    CHECK_MESSAGE( (&tbb::flow::output_port<0>(a2) == &a2.f), "f not bound to output port 0 in composite_node a2");
+    CHECK_MESSAGE((&tbb::flow::input_port<0>(a2) == &tbb::flow::input_port<0>(a2.j)),
+                  "input_port 0 of j not bound to input port 0 in composite_node a2");
+    CHECK_MESSAGE((&tbb::flow::input_port<1>(a2) == &tbb::flow::input_port<1>(a2.j)),
+                  "input_port 1 of j not bound to input port 1 in composite_node a2");
+    CHECK_MESSAGE((&tbb::flow::output_port<0>(a2) == &a2.f),
+                  "f not bound to output port 0 in composite_node a2");
 
     adder_node a3(g, hidden);
-    CHECK_MESSAGE( (&std::get<0>(a3.input_ports()) == &tbb::flow::input_port<0>(a3.j)), "input_port 0 of j not bound to input port 0 in composite_node a3");
-    CHECK_MESSAGE( (&std::get<1>(a3.input_ports()) == &tbb::flow::input_port<1>(a3.j)), "input_port1 of j not bound to input port 1 in composite_node a3");
-    CHECK_MESSAGE( (&std::get<0>(a3.output_ports()) == &a3.f), "f not bound to output port 0 in composite_node a3");
-
-    tbb::flow::function_node<int,int> s2(g, tbb::flow::unlimited, square_body());
+    CHECK_MESSAGE((&std::get<0>(a3.input_ports()) == &tbb::flow::input_port<0>(a3.j)),
+                  "input_port 0 of j not bound to input port 0 in composite_node a3");
+    CHECK_MESSAGE((&std::get<1>(a3.input_ports()) == &tbb::flow::input_port<1>(a3.j)),
+                  "input_port1 of j not bound to input port 1 in composite_node a3");
+    CHECK_MESSAGE((&std::get<0>(a3.output_ports()) == &a3.f),
+                  "f not bound to output port 0 in composite_node a3");
+
+    tbb::flow::function_node<int, int> s2(g, tbb::flow::unlimited, square_body());
     tbb::flow::queue_node<int> q(g);
 
-    tbb::flow::make_edge( s, tbb::flow::input_port<0>(a0) );
-    tbb::flow::make_edge( c, tbb::flow::input_port<1>(a0) );
+    tbb::flow::make_edge(s, tbb::flow::input_port<0>(a0));
+    tbb::flow::make_edge(c, tbb::flow::input_port<1>(a0));
 
-    tbb::flow::make_edge( c, tbb::flow::input_port<0>(a1) );
-    tbb::flow::make_edge( c, tbb::flow::input_port<1>(a1) );
+    tbb::flow::make_edge(c, tbb::flow::input_port<0>(a1));
+    tbb::flow::make_edge(c, tbb::flow::input_port<1>(a1));
 
-    tbb::flow::make_edge( tbb::flow::output_port<0>(a0), tbb::flow::input_port<0>(a2) );
-    tbb::flow::make_edge( tbb::flow::output_port<0>(a1), tbb::flow::input_port<1>(a2) );
+    tbb::flow::make_edge(tbb::flow::output_port<0>(a0), tbb::flow::input_port<0>(a2));
+    tbb::flow::make_edge(tbb::flow::output_port<0>(a1), tbb::flow::input_port<1>(a2));
 
-    tbb::flow::make_edge( tbb::flow::output_port<0>(a2), s2 );
-    tbb::flow::make_edge( s2, q );
+    tbb::flow::make_edge(tbb::flow::output_port<0>(a2), s2);
+    tbb::flow::make_edge(s2, q);
 
-    int sum_total=0;
-    int result=0;
-    for ( int i = 1; i < 4; ++i ) {
+    int sum_total = 0;
+    int result = 0;
+    for (int i = 1; i < 4; ++i) {
         s.try_put(i);
         c.try_put(i);
         sum_total += adder_sum(i);
@@ -246,35 +262,36 @@ int test_adder(bool hidden = false) {
     }
 
     int j;
-    for ( int i = 1; i < 4; ++i ) {
+    for (int i = 1; i < 4; ++i) {
         q.try_get(j);
         result += j;
     }
     g.wait_for_all();
-    CHECK_MESSAGE( (result == sum_total), "the sum from the graph does not match the calculated value");
+    CHECK_MESSAGE((result == sum_total), "the sum from the graph does not match the calculated value");
 
     tbb::flow::remove_edge(s2, q);
-    tbb::flow::remove_edge( a2, s2 );
-    tbb::flow::make_edge( a0, a3 );
-    tbb::flow::make_edge( a1, tbb::flow::input_port<1>(a3) );
-    tbb::flow::make_edge( a3, s2 );
-    tbb::flow::make_edge( s2, q );
-
-    sum_total=0;
-    result=0;
-    for ( int i = 10; i < 20; ++i ) {
+    tbb::flow::remove_edge(a2, s2);
+    tbb::flow::make_edge(a0, a3);
+    tbb::flow::make_edge(a1, tbb::flow::input_port<1>(a3));
+    tbb::flow::make_edge(a3, s2);
+    tbb::flow::make_edge(s2, q);
+
+    sum_total = 0;
+    result = 0;
+    for (int i = 10; i < 20; ++i) {
         s.try_put(i);
         c.try_put(i);
         sum_total += adder_sum(i);
         g.wait_for_all();
     }
 
-    for ( int i = 10; i < 20; ++i ) {
+    for (int i = 10; i < 20; ++i) {
         q.try_get(j);
         result += j;
     }
     g.wait_for_all();
-    CHECK_MESSAGE( (result == sum_total), "the new sum after the replacement of the nodes does not match the calculated value");
+    CHECK_MESSAGE((result == sum_total),
+                  "the new sum after the replacement of the nodes does not match the calculated value");
 
     return 0;
 }
@@ -293,10 +310,10 @@ int test_adder(bool hidden = false) {
                                      |-------------------------------------------------------------------|
 
 */
-int test_nested_adder(bool hidden=false) {
+int test_nested_adder(bool hidden = false) {
     tbb::flow::graph g;
-    tbb::flow::composite_node<std::tuple<int, int>, std::tuple<int> > outer_node(g);
-    typedef tbb::flow::composite_node<std::tuple<int, int>, std::tuple<int> > base_type;
+    tbb::flow::composite_node<std::tuple<int, int>, std::tuple<int>> outer_node(g);
+    typedef tbb::flow::composite_node<std::tuple<int, int>, std::tuple<int>> base_type;
     tbb::flow::broadcast_node<int> input(g);
     tbb::flow::queue_node<int> output(g);
 
@@ -304,14 +321,19 @@ int test_nested_adder(bool hidden=false) {
     adder_node inner_node2(g, hidden);
     adder_node inner_node3(g, hidden);
 
-    outer_node.set_external_ports(base_type::input_ports_type(tbb::flow::input_port<0>(inner_node1), tbb::flow::input_port<1>(inner_node1)), base_type::output_ports_type(tbb::flow::output_port<0>(inner_node3)));
+    outer_node.set_external_ports(base_type::input_ports_type(tbb::flow::input_port<0>(inner_node1),
+                                                              tbb::flow::input_port<1>(inner_node1)),
+                                  base_type::output_ports_type(tbb::flow::output_port<0>(inner_node3)));
 
-    CHECK_MESSAGE( (&tbb::flow::input_port<0>(outer_node) == &tbb::flow::input_port<0>(inner_node1)), "input port 0 of inner_node1 not bound to input port 0 in outer_node");
-    CHECK_MESSAGE( (&tbb::flow::input_port<1>(outer_node) == &tbb::flow::input_port<1>(inner_node1)), "input port 1 of inner_node1 not bound to input port 1 in outer_node");
-    CHECK_MESSAGE( (&tbb::flow::output_port<0>(outer_node) == &tbb::flow::output_port<0>(inner_node3)), "output port 0 of inner_node3 not bound to output port 0 in outer_node");
+    CHECK_MESSAGE((&tbb::flow::input_port<0>(outer_node) == &tbb::flow::input_port<0>(inner_node1)),
+                  "input port 0 of inner_node1 not bound to input port 0 in outer_node");
+    CHECK_MESSAGE((&tbb::flow::input_port<1>(outer_node) == &tbb::flow::input_port<1>(inner_node1)),
+                  "input port 1 of inner_node1 not bound to input port 1 in outer_node");
+    CHECK_MESSAGE((&tbb::flow::output_port<0>(outer_node) == &tbb::flow::output_port<0>(inner_node3)),
+                  "output port 0 of inner_node3 not bound to output port 0 in outer_node");
 
-    tbb::flow::make_edge(input, tbb::flow::input_port<0>(outer_node)/*inner_node1*/);
-    tbb::flow::make_edge(input, tbb::flow::input_port<1>(outer_node)/*inner_node1*/);
+    tbb::flow::make_edge(input, tbb::flow::input_port<0>(outer_node) /*inner_node1*/);
+    tbb::flow::make_edge(input, tbb::flow::input_port<1>(outer_node) /*inner_node1*/);
 
     tbb::flow::make_edge(inner_node1, tbb::flow::input_port<0>(inner_node2));
     tbb::flow::make_edge(inner_node1, tbb::flow::input_port<1>(inner_node2));
@@ -319,10 +341,9 @@ int test_nested_adder(bool hidden=false) {
     tbb::flow::make_edge(inner_node2, tbb::flow::input_port<0>(inner_node3));
     tbb::flow::make_edge(inner_node2, tbb::flow::input_port<1>(inner_node3));
 
-    tbb::flow::make_edge(outer_node/*inner_node3*/, output);
+    tbb::flow::make_edge(outer_node /*inner_node3*/, output);
 
-    if(hidden)
-        outer_node.add_nodes(inner_node1, inner_node2, inner_node3);
+    if (hidden) outer_node.add_nodes(inner_node1, inner_node2, inner_node3);
     else
         outer_node.add_visible_nodes(inner_node1, inner_node2, inner_node3);
 
@@ -331,50 +352,56 @@ int test_nested_adder(bool hidden=false) {
         input.try_put(i);
         g.wait_for_all();
         output.try_get(out);
-        CHECK_MESSAGE( (tbb::flow::output_port<0>(outer_node).try_get(out) == output.try_get(out)), "output from outer_node does not match output from graph");
-        CHECK_MESSAGE( (out == 8*i), "output from outer_node not correct");
+        CHECK_MESSAGE((tbb::flow::output_port<0>(outer_node).try_get(out) == output.try_get(out)),
+                      "output from outer_node does not match output from graph");
+        CHECK_MESSAGE((out == 8 * i), "output from outer_node not correct");
     }
     g.wait_for_all();
 
     return 0;
 }
 
-template< typename T >
-class prefix_node : public tbb::flow::composite_node< std::tuple< T, T, T, T, T >, std::tuple< T, T, T, T, T > > {
-    typedef std::tuple< T, T, T, T, T > my_tuple_t;
+template <typename T>
+class prefix_node : public tbb::flow::composite_node<std::tuple<T, T, T, T, T>, std::tuple<T, T, T, T, T>> {
+    typedef std::tuple<T, T, T, T, T> my_tuple_t;
+
 public:
-    tbb::flow::join_node< my_tuple_t, tbb::flow::queueing > j;
-    tbb::flow::split_node< my_tuple_t > s;
+    tbb::flow::join_node<my_tuple_t, tbb::flow::queueing> j;
+    tbb::flow::split_node<my_tuple_t> s;
+
 private:
-    tbb::flow::function_node< my_tuple_t, my_tuple_t > f;
-    typedef tbb::flow::composite_node< my_tuple_t, my_tuple_t > base_type;
+    tbb::flow::function_node<my_tuple_t, my_tuple_t> f;
+    typedef tbb::flow::composite_node<my_tuple_t, my_tuple_t> base_type;
 
     struct f_body {
-        my_tuple_t operator()( const my_tuple_t &t ) {
-            return my_tuple_t( std::get<0>(t),
-                               std::get<0>(t) + std::get<1>(t),
-                               std::get<0>(t) + std::get<1>(t) + std::get<2>(t),
-                               std::get<0>(t) + std::get<1>(t) + std::get<2>(t) + std::get<3>(t),
-                               std::get<0>(t) + std::get<1>(t) + std::get<2>(t) + std::get<3>(t) + std::get<4>(t) );
+        my_tuple_t operator()(const my_tuple_t &t) {
+            return my_tuple_t(std::get<0>(t), std::get<0>(t) + std::get<1>(t),
+                              std::get<0>(t) + std::get<1>(t) + std::get<2>(t),
+                              std::get<0>(t) + std::get<1>(t) + std::get<2>(t) + std::get<3>(t),
+                              std::get<0>(t) + std::get<1>(t) + std::get<2>(t) + std::get<3>(t)
+                                      + std::get<4>(t));
         }
     };
 
 public:
-    prefix_node(tbb::flow::graph &g, bool hidden = false ) : base_type(g), j(g), s(g), f(g, tbb::flow::serial, f_body() ) {
-        tbb::flow::make_edge( j, f );
-        tbb::flow::make_edge( f, s );
+    prefix_node(tbb::flow::graph &g, bool hidden = false)
+        : base_type(g), j(g), s(g), f(g, tbb::flow::serial, f_body()) {
+        tbb::flow::make_edge(j, f);
+        tbb::flow::make_edge(f, s);
 
-    typename base_type::input_ports_type input_tuple(tbb::flow::input_port<0>(j), tbb::flow::input_port<1>(j), tbb::flow::input_port<2>(j), tbb::flow::input_port<3>(j), tbb::flow::input_port<4>(j));
+        typename base_type::input_ports_type input_tuple(
+                tbb::flow::input_port<0>(j), tbb::flow::input_port<1>(j), tbb::flow::input_port<2>(j),
+                tbb::flow::input_port<3>(j), tbb::flow::input_port<4>(j));
 
-    typename base_type::output_ports_type output_tuple(tbb::flow::output_port<0>(s), tbb::flow::output_port<1>(s), tbb::flow::output_port<2>(s), tbb::flow::output_port<3>(s), tbb::flow::output_port<4>(s));
+        typename base_type::output_ports_type output_tuple(
+                tbb::flow::output_port<0>(s), tbb::flow::output_port<1>(s), tbb::flow::output_port<2>(s),
+                tbb::flow::output_port<3>(s), tbb::flow::output_port<4>(s));
 
-    base_type::set_external_ports(input_tuple, output_tuple);
+        base_type::set_external_ports(input_tuple, output_tuple);
 
-        if(hidden)
-            base_type::add_nodes(j,s,f);
+        if (hidden) base_type::add_nodes(j, s, f);
         else
-            base_type::add_visible_nodes(j,s,f);
-
+            base_type::add_visible_nodes(j, s, f);
     }
 };
 
@@ -382,39 +409,48 @@ int test_prefix(bool hidden = false) {
     tbb::flow::graph g;
     prefix_node<double> p(g, hidden);
 
-    CHECK_MESSAGE( (&std::get<0>(p.input_ports()) == &tbb::flow::input_port<0>(p.j)), "input port 0 of j is not bound to input port 0 of composite node p");
-    CHECK_MESSAGE( (&tbb::flow::input_port<1>(p.j) == &tbb::flow::input_port<1>(p.j)), "input port 1 of j is not bound to input port 1 of composite node p");
-    CHECK_MESSAGE( (&std::get<2>(p.input_ports()) == &tbb::flow::input_port<2>(p.j)), "input port 2 of j is not bound to input port 2 of composite node p");
-    CHECK_MESSAGE( (&tbb::flow::input_port<3>(p.j) == &tbb::flow::input_port<3>(p.j)), "input port 3 of j is not bound to input port 3 of composite node p");
-    CHECK_MESSAGE( (&std::get<4>(p.input_ports()) == &tbb::flow::input_port<4>(p.j)), "input port 4 of j is not bound to input port 4 of composite node p");
-
-
-    CHECK_MESSAGE( (&std::get<0>(p.output_ports()) == &tbb::flow::output_port<0>(p.s)), "output port 0 of s is not bound to output port 0 of composite node p");
-    CHECK_MESSAGE( (&tbb::flow::output_port<1>(p.s) == &tbb::flow::output_port<1>(p.s)), "output port 1 of s is not bound to output port 1 of composite node p");
-    CHECK_MESSAGE( (&std::get<2>(p.output_ports()) == &tbb::flow::output_port<2>(p.s)), "output port 2 of s is not bound to output port 2 of composite node p");
-    CHECK_MESSAGE( (&tbb::flow::output_port<3>(p.s) == &tbb::flow::output_port<3>(p.s)), "output port 3 of s is not bound to output port 3 of composite node p");
-    CHECK_MESSAGE( (&std::get<4>(p.output_ports()) == &tbb::flow::output_port<4>(p.s)), "output port 4 of s is not bound to output port 4 of composite node p");
-
-    std::vector< tbb::flow::queue_node<double> > v( 5, tbb::flow::queue_node<double>(g) );
-    tbb::flow::make_edge( tbb::flow::output_port<0>(p), v[0] );
-    tbb::flow::make_edge( tbb::flow::output_port<1>(p), v[1] );
-    tbb::flow::make_edge( tbb::flow::output_port<2>(p), v[2] );
-    tbb::flow::make_edge( tbb::flow::output_port<3>(p), v[3] );
-    tbb::flow::make_edge( tbb::flow::output_port<4>(p), v[4] );
-
-    for(  double offset = 1; offset < 10000; offset *= 10 ) {
-        tbb::flow::input_port<0>(p).try_put( offset );
-        tbb::flow::input_port<1>(p).try_put( offset + 1 );
-        tbb::flow::input_port<2>(p).try_put( offset + 2 );
-        tbb::flow::input_port<3>(p).try_put( offset + 3 );
-        tbb::flow::input_port<4>(p).try_put( offset + 4 );
+    CHECK_MESSAGE((&std::get<0>(p.input_ports()) == &tbb::flow::input_port<0>(p.j)),
+                  "input port 0 of j is not bound to input port 0 of composite node p");
+    CHECK_MESSAGE((&tbb::flow::input_port<1>(p.j) == &tbb::flow::input_port<1>(p.j)),
+                  "input port 1 of j is not bound to input port 1 of composite node p");
+    CHECK_MESSAGE((&std::get<2>(p.input_ports()) == &tbb::flow::input_port<2>(p.j)),
+                  "input port 2 of j is not bound to input port 2 of composite node p");
+    CHECK_MESSAGE((&tbb::flow::input_port<3>(p.j) == &tbb::flow::input_port<3>(p.j)),
+                  "input port 3 of j is not bound to input port 3 of composite node p");
+    CHECK_MESSAGE((&std::get<4>(p.input_ports()) == &tbb::flow::input_port<4>(p.j)),
+                  "input port 4 of j is not bound to input port 4 of composite node p");
+
+    CHECK_MESSAGE((&std::get<0>(p.output_ports()) == &tbb::flow::output_port<0>(p.s)),
+                  "output port 0 of s is not bound to output port 0 of composite node p");
+    CHECK_MESSAGE((&tbb::flow::output_port<1>(p.s) == &tbb::flow::output_port<1>(p.s)),
+                  "output port 1 of s is not bound to output port 1 of composite node p");
+    CHECK_MESSAGE((&std::get<2>(p.output_ports()) == &tbb::flow::output_port<2>(p.s)),
+                  "output port 2 of s is not bound to output port 2 of composite node p");
+    CHECK_MESSAGE((&tbb::flow::output_port<3>(p.s) == &tbb::flow::output_port<3>(p.s)),
+                  "output port 3 of s is not bound to output port 3 of composite node p");
+    CHECK_MESSAGE((&std::get<4>(p.output_ports()) == &tbb::flow::output_port<4>(p.s)),
+                  "output port 4 of s is not bound to output port 4 of composite node p");
+
+    std::vector<tbb::flow::queue_node<double>> v(5, tbb::flow::queue_node<double>(g));
+    tbb::flow::make_edge(tbb::flow::output_port<0>(p), v[0]);
+    tbb::flow::make_edge(tbb::flow::output_port<1>(p), v[1]);
+    tbb::flow::make_edge(tbb::flow::output_port<2>(p), v[2]);
+    tbb::flow::make_edge(tbb::flow::output_port<3>(p), v[3]);
+    tbb::flow::make_edge(tbb::flow::output_port<4>(p), v[4]);
+
+    for (double offset = 1; offset < 10000; offset *= 10) {
+        tbb::flow::input_port<0>(p).try_put(offset);
+        tbb::flow::input_port<1>(p).try_put(offset + 1);
+        tbb::flow::input_port<2>(p).try_put(offset + 2);
+        tbb::flow::input_port<3>(p).try_put(offset + 3);
+        tbb::flow::input_port<4>(p).try_put(offset + 4);
     }
     g.wait_for_all();
 
     double x;
-    while ( v[0].try_get(x) ) {
+    while (v[0].try_get(x)) {
         g.wait_for_all();
-        for ( int i = 1; i < 5; ++i ) {
+        for (int i = 1; i < 5; ++i) {
             v[i].try_get(x);
             g.wait_for_all();
         }
@@ -432,10 +468,10 @@ struct input_only_output_only_seq {
 void input_only_output_only_composite(bool hidden) {
     tbb::flow::graph g;
 
-    tbb::flow::composite_node<std::tuple<int>, std::tuple<int> > input_output(g);
+    tbb::flow::composite_node<std::tuple<int>, std::tuple<int>> input_output(g);
 
-    typedef tbb::flow::composite_node<std::tuple<int>, std::tuple<> > input_only_composite;
-    typedef tbb::flow::composite_node<std::tuple<>, std::tuple<int> > output_only_composite;
+    typedef tbb::flow::composite_node<std::tuple<int>, std::tuple<>> input_only_composite;
+    typedef tbb::flow::composite_node<std::tuple<>, std::tuple<int>> output_only_composite;
 
     typedef tbb::flow::input_node<int> src_type;
     typedef tbb::flow::queue_node<int> q_type;
@@ -443,7 +479,7 @@ void input_only_output_only_composite(bool hidden) {
     typedef tbb::flow::sequencer_node<int> sequencer_type;
 
     int num = 0;
-    int finish=1000;
+    int finish = 1000;
     int step = 4;
 
     input_only_composite a_in(g);
@@ -457,15 +493,17 @@ void input_only_output_only_composite(bool hidden) {
     // not a sequential order of messages dispatch
     sequencer_type seq(g, input_only_output_only_seq());
 
-    std::tuple<f_type& > input_tuple(f);
+    std::tuple<f_type &> input_tuple(f);
     a_in.set_external_ports(input_tuple);
-    CHECK_MESSAGE( (&std::get<0>(a_in.input_ports()) == &f), "f not bound to input port 0 in composite_node a_in");
+    CHECK_MESSAGE((&std::get<0>(a_in.input_ports()) == &f),
+                  "f not bound to input port 0 in composite_node a_in");
 
-    std::tuple<src_type&> output_tuple(src);
+    std::tuple<src_type &> output_tuple(src);
     a_out.set_external_ports(output_tuple);
-    CHECK_MESSAGE( (&std::get<0>(a_out.output_ports()) == &src), "src not bound to output port 0 in composite_node a_out");
+    CHECK_MESSAGE((&std::get<0>(a_out.output_ports()) == &src),
+                  "src not bound to output port 0 in composite_node a_out");
 
-    if(hidden) {
+    if (hidden) {
         a_in.add_nodes(f, seq, que);
         a_out.add_nodes(src);
     } else {
@@ -479,45 +517,44 @@ void input_only_output_only_composite(bool hidden) {
     src.activate();
     g.wait_for_all();
 
-    for(int i = 1; i<finish/step; ++i) {
+    for (int i = 1; i < finish / step; ++i) {
         que.try_get(num);
-        CHECK_MESSAGE( (num == 4*i - 3), "number does not match position in sequence");
+        CHECK_MESSAGE((num == 4 * i - 3), "number does not match position in sequence");
     }
     g.wait_for_all();
 }
 
 //! Test single node inside composite nodes
 //! \brief \ref error_guessing
-TEST_CASE("Tiny tests"){
+TEST_CASE("Tiny tests") {
     test_tiny(false);
     test_tiny(true);
 }
 
 //! Test basic adders in composite node
 //! \brief \ref error_guessing
-TEST_CASE("Adder tests"){
+TEST_CASE("Adder tests") {
     test_adder(false);
     test_adder(true);
 }
 
 //! Test nested adders in composite node
 //! \brief \ref error_guessing
-TEST_CASE("Nested adder tests"){
+TEST_CASE("Nested adder tests") {
     test_nested_adder(true);
     test_nested_adder(false);
 }
 
 //! Test returning a subset of inputs
 //! \brief \ref error_guessing
-TEST_CASE("Prefix test"){
+TEST_CASE("Prefix test") {
     test_prefix(false);
     test_prefix(true);
 }
 
 //! Test input-only composite node
 //! \brief \ref error_guessing \ref boundary
-TEST_CASE("Input-only composite"){
+TEST_CASE("Input-only composite") {
     input_only_output_only_composite(true);
     input_only_output_only_composite(false);
 }
-
diff --git a/external/tbb/test/tbb/test_concurrent_hash_map.cpp b/external/tbb/test/tbb/test_concurrent_hash_map.cpp
index fcef8263..97844df8 100644
--- a/external/tbb/test/tbb/test_concurrent_hash_map.cpp
+++ b/external/tbb/test/tbb/test_concurrent_hash_map.cpp
@@ -16,76 +16,82 @@
 
 #if _MSC_VER
 #if __INTEL_COMPILER
-    #pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
 #else
-    // Workaround for vs2015 and warning name was longer than the compiler limit (4096).
-    #pragma warning (disable: 4503)
+// Workaround for vs2015 and warning name was longer than the compiler limit (4096).
+#pragma warning(disable : 4503)
 #endif
 #endif
 
 #define TBB_DEFINE_STD_HASH_SPECIALIZATIONS 1
 #define TBB_PREVIEW_CONCURRENT_HASH_MAP_EXTENSIONS 1
+#include <algorithm>
+#include <common/concepts_common.h>
+#include <common/concurrent_associative_common.h>
+#include <common/containers_common.h>
+#include <common/custom_allocators.h>
+#include <common/range_based_for_support.h>
 #include <common/test.h>
 #include <common/utils.h>
-#include <common/range_based_for_support.h>
-#include <common/custom_allocators.h>
-#include <common/containers_common.h>
-#include <common/concepts_common.h>
+#include <functional>
+#include <list>
+#include <mutex>
+#include <scoped_allocator>
 #include <tbb/concurrent_hash_map.h>
 #include <tbb/parallel_for.h>
-#include <common/concurrent_associative_common.h>
 #include <vector>
-#include <list>
-#include <algorithm>
-#include <functional>
-#include <scoped_allocator>
-#include <mutex>
 
 //! \file test_concurrent_hash_map.cpp
 //! \brief Test for [containers.concurrent_hash_map containers.tbb_hash_compare] specification
 
-void TestRangeBasedFor(){
+void TestRangeBasedFor() {
     using namespace range_based_for_support_tests;
 
     INFO("testing range based for loop compatibility \n");
-    using ch_map = tbb::concurrent_hash_map<int,int>;
+    using ch_map = tbb::concurrent_hash_map<int, int>;
     ch_map a_ch_map;
 
     const int sequence_length = 100;
-    for (int i = 1; i <= sequence_length; ++i){
-        a_ch_map.insert(ch_map::value_type(i,i));
-    }
+    for (int i = 1; i <= sequence_length; ++i) { a_ch_map.insert(ch_map::value_type(i, i)); }
 
-    REQUIRE_MESSAGE((range_based_for_accumulate(a_ch_map, pair_second_summer(), 0) == gauss_summ_of_int_sequence(sequence_length)),
-        "incorrect accumulated value generated via range based for ?");
+    REQUIRE_MESSAGE((range_based_for_accumulate(a_ch_map, pair_second_summer(), 0)
+                     == gauss_summ_of_int_sequence(sequence_length)),
+                    "incorrect accumulated value generated via range based for ?");
 }
 
 // The helper to run a test only when a default construction is present.
-template <bool default_construction_present> struct do_default_construction_test {
-    template<typename FuncType> void operator() ( FuncType func ) const { func(); }
+template <bool default_construction_present>
+struct do_default_construction_test {
+    template <typename FuncType>
+    void operator()(FuncType func) const {
+        func();
+    }
 };
 
-template <> struct do_default_construction_test<false> {
-    template<typename FuncType> void operator()( FuncType ) const {}
+template <>
+struct do_default_construction_test<false> {
+    template <typename FuncType>
+    void operator()(FuncType) const {}
 };
 
 template <typename Table>
 class test_insert_by_key {
     using value_type = typename Table::value_type;
-    Table &my_c;
-    const value_type &my_value;
+    Table& my_c;
+    const value_type& my_value;
+
 public:
-    test_insert_by_key( Table &c, const value_type &value ) : my_c(c), my_value(value) {}
+    test_insert_by_key(Table& c, const value_type& value) : my_c(c), my_value(value) {}
     void operator()() const {
         {
             typename Table::accessor a;
-            CHECK(my_c.insert( a, my_value.first ));
+            CHECK(my_c.insert(a, my_value.first));
             CHECK(utils::IsEqual()(a->first, my_value.first));
             a->second = my_value.second;
         }
         {
             typename Table::const_accessor ca;
-            CHECK(!my_c.insert( ca, my_value.first ));
+            CHECK(!my_c.insert(ca, my_value.first));
             CHECK(utils::IsEqual()(ca->first, my_value.first));
             CHECK(utils::IsEqual()(ca->second, my_value.second));
         }
@@ -95,23 +101,26 @@ class test_insert_by_key {
 template <typename Table, typename Iterator, typename Range = typename Table::range_type>
 class test_range {
     using value_type = typename Table::value_type;
-    Table &my_c;
-    const std::list<value_type> &my_lst;
+    Table& my_c;
+    const std::list<value_type>& my_lst;
     std::vector<detail::atomic_type<bool>>& my_marks;
+
 public:
-    test_range( Table &c, const std::list<value_type> &lst, std::vector<detail::atomic_type<bool>> &marks ) : my_c(c), my_lst(lst), my_marks(marks) {
+    test_range(Table& c, const std::list<value_type>& lst, std::vector<detail::atomic_type<bool>>& marks)
+        : my_c(c), my_lst(lst), my_marks(marks) {
         for (std::size_t i = 0; i < my_marks.size(); ++i) {
             my_marks[i].store(false, std::memory_order_relaxed);
         }
     }
 
-    void operator()( const Range &r ) const { do_test_range( r.begin(), r.end() ); }
-    void do_test_range( Iterator i, Iterator j ) const {
-        for ( Iterator it = i; it != j; ) {
+    void operator()(const Range& r) const { do_test_range(r.begin(), r.end()); }
+    void do_test_range(Iterator i, Iterator j) const {
+        for (Iterator it = i; it != j;) {
             Iterator it_prev = it++;
-            typename std::list<value_type>::const_iterator it2 = std::search( my_lst.begin(), my_lst.end(), it_prev, it, utils::IsEqual() );
+            typename std::list<value_type>::const_iterator it2
+                    = std::search(my_lst.begin(), my_lst.end(), it_prev, it, utils::IsEqual());
             CHECK(it2 != my_lst.end());
-            typename std::list<value_type>::difference_type dist = std::distance( my_lst.begin(), it2 );
+            typename std::list<value_type>::difference_type dist = std::distance(my_lst.begin(), it2);
             CHECK(!my_marks[dist]);
             my_marks[dist].store(true);
         }
@@ -123,76 +132,78 @@ class check_value {
     using const_iterator = typename Table::const_iterator;
     using iterator = typename Table::iterator;
     using size_type = typename Table::size_type;
-    Table &my_c;
+    Table& my_c;
+
 public:
-    check_value( Table &c ) : my_c(c) {}
-    void operator()(const typename Table::value_type &value ) {
-        const Table &const_c = my_c;
-        CHECK(my_c.count( value.first ) == 1);
-        { // tests with a const accessor.
+    check_value(Table& c) : my_c(c) {}
+    void operator()(const typename Table::value_type& value) {
+        const Table& const_c = my_c;
+        CHECK(my_c.count(value.first) == 1);
+        {// tests with a const accessor.
             typename Table::const_accessor ca;
             // find
-            CHECK(my_c.find( ca, value.first ));
-            CHECK(!ca.empty() );
+            CHECK(my_c.find(ca, value.first));
+            CHECK(!ca.empty());
             CHECK(utils::IsEqual()(ca->first, value.first));
             CHECK(utils::IsEqual()(ca->second, value.second));
             // erase
-            CHECK(my_c.erase( ca ));
-            CHECK(my_c.count( value.first ) == 0);
+            CHECK(my_c.erase(ca));
+            CHECK(my_c.count(value.first) == 0);
             // insert (pair)
-            CHECK(my_c.insert( ca, value ));
+            CHECK(my_c.insert(ca, value));
             CHECK(utils::IsEqual()(ca->first, value.first));
             CHECK(utils::IsEqual()(ca->second, value.second));
-        } { // tests with a non-const accessor.
+        }
+        {// tests with a non-const accessor.
             typename Table::accessor a;
             // find
-            CHECK(my_c.find( a, value.first ));
-            CHECK(!a.empty() );
+            CHECK(my_c.find(a, value.first));
+            CHECK(!a.empty());
             CHECK(utils::IsEqual()(a->first, value.first));
             CHECK(utils::IsEqual()(a->second, value.second));
             // erase
-            CHECK(my_c.erase( a ));
-            CHECK(my_c.count( value.first ) == 0);
+            CHECK(my_c.erase(a));
+            CHECK(my_c.count(value.first) == 0);
             // insert
-            CHECK(my_c.insert( a, value ));
+            CHECK(my_c.insert(a, value));
             CHECK(utils::IsEqual()(a->first, value.first));
             CHECK(utils::IsEqual()(a->second, value.second));
         }
         // erase by key
-        CHECK(my_c.erase( value.first ));
-        CHECK(my_c.count( value.first ) == 0);
-        do_default_construction_test<default_construction_present>()(test_insert_by_key<Table>( my_c, value ));
+        CHECK(my_c.erase(value.first));
+        CHECK(my_c.count(value.first) == 0);
+        do_default_construction_test<default_construction_present>()(test_insert_by_key<Table>(my_c, value));
         // insert by value
-        CHECK(my_c.insert( value ) != default_construction_present);
+        CHECK(my_c.insert(value) != default_construction_present);
         // equal_range
-        std::pair<iterator,iterator> r1 = my_c.equal_range( value.first );
+        std::pair<iterator, iterator> r1 = my_c.equal_range(value.first);
         iterator r1_first_prev = r1.first++;
-        CHECK((utils::IsEqual()( *r1_first_prev, value ) && utils::IsEqual()( r1.first, r1.second )));
-        std::pair<const_iterator,const_iterator> r2 = const_c.equal_range( value.first );
+        CHECK((utils::IsEqual()(*r1_first_prev, value) && utils::IsEqual()(r1.first, r1.second)));
+        std::pair<const_iterator, const_iterator> r2 = const_c.equal_range(value.first);
         const_iterator r2_first_prev = r2.first++;
-        CHECK((utils::IsEqual()( *r2_first_prev, value ) && utils::IsEqual()( r2.first, r2.second )));
+        CHECK((utils::IsEqual()(*r2_first_prev, value) && utils::IsEqual()(r2.first, r2.second)));
     }
 };
 
 template <typename Value, typename U = Value>
 struct CompareTables {
     template <typename T>
-    static bool IsEqual( const T& t1, const T& t2 ) {
+    static bool IsEqual(const T& t1, const T& t2) {
         return (t1 == t2) && !(t1 != t2);
     }
 };
 
 template <typename U>
-struct CompareTables< std::pair<const std::weak_ptr<U>, std::weak_ptr<U> > > {
+struct CompareTables<std::pair<const std::weak_ptr<U>, std::weak_ptr<U>>> {
     template <typename T>
-    static bool IsEqual( const T&, const T& ) {
+    static bool IsEqual(const T&, const T&) {
         /* do nothing for std::weak_ptr */
         return true;
     }
 };
 
 template <bool default_construction_present, typename Table>
-void Examine( Table c, const std::list<typename Table::value_type> &lst) {
+void Examine(Table c, const std::list<typename Table::value_type>& lst) {
     using const_table = const Table;
     using const_iterator = typename Table::const_iterator;
     using iterator = typename Table::iterator;
@@ -204,122 +215,121 @@ void Examine( Table c, const std::list<typename Table::value_type> &lst) {
     CHECK(c.max_size() >= c.size());
 
     const check_value<default_construction_present, Table> cv(c);
-    std::for_each( lst.begin(), lst.end(), cv );
+    std::for_each(lst.begin(), lst.end(), cv);
 
-    std::vector<detail::atomic_type<bool>> marks( lst.size() );
+    std::vector<detail::atomic_type<bool>> marks(lst.size());
 
-    test_range<Table,iterator>( c, lst, marks ).do_test_range( c.begin(), c.end() );
-    CHECK(std::find( marks.begin(), marks.end(), false ) == marks.end());
+    test_range<Table, iterator>(c, lst, marks).do_test_range(c.begin(), c.end());
+    CHECK(std::find(marks.begin(), marks.end(), false) == marks.end());
 
-    test_range<const_table,const_iterator>( c, lst, marks ).do_test_range( c.begin(), c.end() );
-    CHECK(std::find( marks.begin(), marks.end(), false ) == marks.end());
+    test_range<const_table, const_iterator>(c, lst, marks).do_test_range(c.begin(), c.end());
+    CHECK(std::find(marks.begin(), marks.end(), false) == marks.end());
 
     using range_type = typename Table::range_type;
-    tbb::parallel_for( c.range(), test_range<Table,typename range_type::iterator,range_type>( c, lst, marks ) );
-    CHECK(std::find( marks.begin(), marks.end(), false ) == marks.end());
+    tbb::parallel_for(c.range(), test_range<Table, typename range_type::iterator, range_type>(c, lst, marks));
+    CHECK(std::find(marks.begin(), marks.end(), false) == marks.end());
 
     const_table const_c = c;
-    CHECK(CompareTables<value_type>::IsEqual( c, const_c ));
+    CHECK(CompareTables<value_type>::IsEqual(c, const_c));
 
-    const size_type new_bucket_count = 2*c.bucket_count();
-    c.rehash( new_bucket_count );
+    const size_type new_bucket_count = 2 * c.bucket_count();
+    c.rehash(new_bucket_count);
     CHECK(c.bucket_count() >= new_bucket_count);
 
     Table c2;
     typename std::list<value_type>::const_iterator begin5 = lst.begin();
-    std::advance( begin5, 5 );
-    c2.insert( lst.begin(), begin5 );
-    std::for_each( lst.begin(), begin5, check_value<default_construction_present, Table>( c2 ) );
+    std::advance(begin5, 5);
+    c2.insert(lst.begin(), begin5);
+    std::for_each(lst.begin(), begin5, check_value<default_construction_present, Table>(c2));
 
-    c2.swap( c );
-    CHECK(CompareTables<value_type>::IsEqual( c2, const_c ));
+    c2.swap(c);
+    CHECK(CompareTables<value_type>::IsEqual(c2, const_c));
     CHECK(c.size() == 5);
-    std::for_each( lst.begin(), lst.end(), check_value<default_construction_present,Table>(c2) );
+    std::for_each(lst.begin(), lst.end(), check_value<default_construction_present, Table>(c2));
 
-    swap( c, c2 );
-    CHECK(CompareTables<value_type>::IsEqual( c, const_c ));
+    swap(c, c2);
+    CHECK(CompareTables<value_type>::IsEqual(c, const_c));
     CHECK(c2.size() == 5);
 
     c2.clear();
-    CHECK(CompareTables<value_type>::IsEqual( c2, Table() ));
+    CHECK(CompareTables<value_type>::IsEqual(c2, Table()));
 
     typename Table::allocator_type a = c.get_allocator();
-    value_type *ptr = a.allocate(1);
+    value_type* ptr = a.allocate(1);
     CHECK(ptr);
-    a.deallocate( ptr, 1 );
+    a.deallocate(ptr, 1);
 }
 
 template <typename T>
 struct debug_hash_compare : public tbb::detail::d1::tbb_hash_compare<T> {};
 
 template <bool default_construction_present, typename Value>
-void TypeTester( const std::list<Value> &lst ) {
+void TypeTester(const std::list<Value>& lst) {
     using first_type = typename Value::first_type;
     using key_type = typename std::remove_const<first_type>::type;
     using second_type = typename Value::second_type;
     using ch_map = tbb::concurrent_hash_map<key_type, second_type>;
-    debug_hash_compare<key_type> compare{};
+    debug_hash_compare<key_type> compare {};
     // Construct an empty hash map.
     ch_map c1;
-    c1.insert( lst.begin(), lst.end() );
-    Examine<default_construction_present>( c1, lst );
+    c1.insert(lst.begin(), lst.end());
+    Examine<default_construction_present>(c1, lst);
 
     // Constructor from initializer_list.
     typename std::list<Value>::const_iterator it = lst.begin();
-    std::initializer_list<Value> il = { *it++, *it++, *it++ };
-    ch_map c2( il );
-    c2.insert( it, lst.end() );
-    Examine<default_construction_present>( c2, lst );
+    std::initializer_list<Value> il = {*it++, *it++, *it++};
+    ch_map c2(il);
+    c2.insert(it, lst.end());
+    Examine<default_construction_present>(c2, lst);
 
     // Constructor from initializer_list and compare object
-    ch_map c3( il, compare);
-    c3.insert( it, lst.end() );
-    Examine<default_construction_present>( c3, lst );
+    ch_map c3(il, compare);
+    c3.insert(it, lst.end());
+    Examine<default_construction_present>(c3, lst);
 
     // Constructor from initializer_list, compare object and allocator
-    ch_map c4( il, compare, typename ch_map::allocator_type());
-    c4.insert( it, lst.end());
-    Examine<default_construction_present>( c4, lst );
+    ch_map c4(il, compare, typename ch_map::allocator_type());
+    c4.insert(it, lst.end());
+    Examine<default_construction_present>(c4, lst);
 
     // Copying constructor.
     ch_map c5(c1);
-    Examine<default_construction_present>( c5, lst );
+    Examine<default_construction_present>(c5, lst);
     // Construct with non-default allocator
-    using ch_map_debug_alloc = tbb::concurrent_hash_map<key_type, second_type,
-                                                        tbb::detail::d1::tbb_hash_compare<key_type>,
-                                                        LocalCountingAllocator<std::allocator<Value>>>;
+    using ch_map_debug_alloc
+            = tbb::concurrent_hash_map<key_type, second_type, tbb::detail::d1::tbb_hash_compare<key_type>,
+                                       LocalCountingAllocator<std::allocator<Value>>>;
     ch_map_debug_alloc c6;
-    c6.insert( lst.begin(), lst.end() );
-    Examine<default_construction_present>( c6, lst );
+    c6.insert(lst.begin(), lst.end());
+    Examine<default_construction_present>(c6, lst);
     // Copying constructor
     ch_map_debug_alloc c7(c6);
-    Examine<default_construction_present>( c7, lst );
+    Examine<default_construction_present>(c7, lst);
     // Construction empty table with n preallocated buckets.
-    ch_map c8( lst.size() );
-    c8.insert( lst.begin(), lst.end() );
-    Examine<default_construction_present>( c8, lst );
-    ch_map_debug_alloc c9( lst.size() );
-    c9.insert( lst.begin(), lst.end() );
-    Examine<default_construction_present>( c9, lst );
+    ch_map c8(lst.size());
+    c8.insert(lst.begin(), lst.end());
+    Examine<default_construction_present>(c8, lst);
+    ch_map_debug_alloc c9(lst.size());
+    c9.insert(lst.begin(), lst.end());
+    Examine<default_construction_present>(c9, lst);
     // Construction with copying iteration range.
-    ch_map c10_1( c1.begin(), c1.end() ), c10_2(c1.cbegin(), c1.cend());
-    Examine<default_construction_present>( c10_1, lst );
-    Examine<default_construction_present>( c10_2, lst );
+    ch_map c10_1(c1.begin(), c1.end()), c10_2(c1.cbegin(), c1.cend());
+    Examine<default_construction_present>(c10_1, lst);
+    Examine<default_construction_present>(c10_2, lst);
     // Construction with copying iteration range and given allocator instance.
     LocalCountingAllocator<std::allocator<Value>> allocator;
-    ch_map_debug_alloc c11( lst.begin(), lst.end(), allocator );
-    Examine<default_construction_present>( c11, lst );
+    ch_map_debug_alloc c11(lst.begin(), lst.end(), allocator);
+    Examine<default_construction_present>(c11, lst);
 
-    using ch_map_debug_hash = tbb::concurrent_hash_map<key_type, second_type,
-                                                       debug_hash_compare<key_type>,
+    using ch_map_debug_hash = tbb::concurrent_hash_map<key_type, second_type, debug_hash_compare<key_type>,
                                                        typename ch_map::allocator_type>;
 
     // Constructor with two iterators and hash_compare
     ch_map_debug_hash c12(c1.begin(), c1.end(), compare);
-    Examine<default_construction_present>( c12, lst );
+    Examine<default_construction_present>(c12, lst);
 
     ch_map_debug_hash c13(c1.begin(), c1.end(), compare, typename ch_map::allocator_type());
-    Examine<default_construction_present>( c13, lst );
+    Examine<default_construction_present>(c13, lst);
 }
 
 void TestSpecificTypes() {
@@ -327,42 +337,40 @@ void TestSpecificTypes() {
 
     using int_int_t = std::pair<const int, int>;
     std::list<int_int_t> arrIntInt;
-    for ( int i=0; i<NUMBER; ++i ) arrIntInt.push_back( int_int_t(i, NUMBER-i) );
-    TypeTester</*default_construction_present = */true>( arrIntInt );
+    for (int i = 0; i < NUMBER; ++i) arrIntInt.push_back(int_int_t(i, NUMBER - i));
+    TypeTester</*default_construction_present = */ true>(arrIntInt);
 
     using ref_int_t = std::pair<const std::reference_wrapper<const int>, int>;
     std::list<ref_int_t> arrRefInt;
-    for ( std::list<int_int_t>::iterator it = arrIntInt.begin(); it != arrIntInt.end(); ++it )
-        arrRefInt.push_back( ref_int_t( it->first, it->second ) );
-    TypeTester</*default_construction_present = */true>( arrRefInt );
+    for (std::list<int_int_t>::iterator it = arrIntInt.begin(); it != arrIntInt.end(); ++it)
+        arrRefInt.push_back(ref_int_t(it->first, it->second));
+    TypeTester</*default_construction_present = */ true>(arrRefInt);
 
-    using int_ref_t = std::pair< const int, std::reference_wrapper<int> >;
+    using int_ref_t = std::pair<const int, std::reference_wrapper<int>>;
     std::list<int_ref_t> arrIntRef;
-    for ( std::list<int_int_t>::iterator it = arrIntInt.begin(); it != arrIntInt.end(); ++it )
-        arrIntRef.push_back( int_ref_t( it->first, it->second ) );
-    TypeTester</*default_construction_present = */false>( arrIntRef );
+    for (std::list<int_int_t>::iterator it = arrIntInt.begin(); it != arrIntInt.end(); ++it)
+        arrIntRef.push_back(int_ref_t(it->first, it->second));
+    TypeTester</*default_construction_present = */ false>(arrIntRef);
 
-    using shr_shr_t = std::pair< const std::shared_ptr<int>, std::shared_ptr<int> >;
+    using shr_shr_t = std::pair<const std::shared_ptr<int>, std::shared_ptr<int>>;
     std::list<shr_shr_t> arrShrShr;
-    for ( int i=0; i<NUMBER; ++i ) {
+    for (int i = 0; i < NUMBER; ++i) {
         const int NUMBER_minus_i = NUMBER - i;
-        arrShrShr.push_back( shr_shr_t( std::make_shared<int>(i), std::make_shared<int>(NUMBER_minus_i) ) );
+        arrShrShr.push_back(shr_shr_t(std::make_shared<int>(i), std::make_shared<int>(NUMBER_minus_i)));
     }
-    TypeTester< /*default_construction_present = */true>( arrShrShr );
+    TypeTester</*default_construction_present = */ true>(arrShrShr);
 
-    using wk_wk_t = std::pair< const std::weak_ptr<int>, std::weak_ptr<int> >;
-    std::list< wk_wk_t > arrWkWk;
-    std::copy( arrShrShr.begin(), arrShrShr.end(), std::back_inserter(arrWkWk) );
-    TypeTester< /*default_construction_present = */true>( arrWkWk );
+    using wk_wk_t = std::pair<const std::weak_ptr<int>, std::weak_ptr<int>>;
+    std::list<wk_wk_t> arrWkWk;
+    std::copy(arrShrShr.begin(), arrShrShr.end(), std::back_inserter(arrWkWk));
+    TypeTester</*default_construction_present = */ true>(arrWkWk);
 
     // Check working with deprecated hashers
     using pair_key_type = std::pair<int, int>;
     using pair_int_t = std::pair<const pair_key_type, int>;
     std::list<pair_int_t> arr_pair_int;
-    for (int i = 0; i < NUMBER; ++i) {
-        arr_pair_int.push_back(pair_int_t(pair_key_type{i, i}, i));
-    }
-    TypeTester</*default_construction_present = */true>(arr_pair_int);
+    for (int i = 0; i < NUMBER; ++i) { arr_pair_int.push_back(pair_int_t(pair_key_type {i, i}, i)); }
+    TypeTester</*default_construction_present = */ true>(arr_pair_int);
 
     using tbb_string_key_type = std::basic_string<char, std::char_traits<char>, tbb::tbb_allocator<char>>;
     using pair_tbb_string_int_t = std::pair<const tbb_string_key_type, int>;
@@ -371,16 +379,16 @@ void TestSpecificTypes() {
         tbb_string_key_type key(i, char(i));
         arr_pair_string_int.push_back(pair_tbb_string_int_t(key, i));
     }
-    TypeTester</*default_construction_present = */true>(arr_pair_string_int);
+    TypeTester</*default_construction_present = */ true>(arr_pair_string_int);
 }
 
 struct custom_hash_compare {
-    template<typename Allocator>
+    template <typename Allocator>
     size_t hash(const AllocatorAwareData<Allocator>& key) const {
         return my_hash_compare.hash(key.value());
     }
 
-    template<typename Allocator>
+    template <typename Allocator>
     bool equal(const AllocatorAwareData<Allocator>& key1, const AllocatorAwareData<Allocator>& key2) const {
         return my_hash_compare.equal(key1.value(), key2.value());
     }
@@ -391,7 +399,8 @@ struct custom_hash_compare {
 
 void TestScopedAllocator() {
     using allocator_data_type = AllocatorAwareData<std::scoped_allocator_adaptor<tbb::tbb_allocator<int>>>;
-    using allocator_type = std::scoped_allocator_adaptor<tbb::tbb_allocator<std::pair<const allocator_data_type, allocator_data_type>>>;
+    using allocator_type = std::scoped_allocator_adaptor<
+            tbb::tbb_allocator<std::pair<const allocator_data_type, allocator_data_type>>>;
     using hash_map_type = tbb::concurrent_hash_map<allocator_data_type, allocator_data_type,
                                                    custom_hash_compare, allocator_type>;
 
@@ -402,7 +411,7 @@ void TestScopedAllocator() {
 
     hash_map_type::value_type v1(key1, data1), v2(key2, data2);
 
-    auto init_list = { v1, v2 };
+    auto init_list = {v1, v2};
 
     allocator_data_type::assert_on_constructions = true;
     map1.emplace(key1, data1);
@@ -450,9 +459,7 @@ void TestInternalFastFind() {
     chmap m;
     int sz = 100;
 
-    for (int i = 0; i != sz; ++i) {
-        m.insert(std::make_pair(i, i * i));
-    }
+    for (int i = 0; i != sz; ++i) { m.insert(std::make_pair(i, i * i)); }
     REQUIRE_MESSAGE(m.size() == 100, "Incorrect concurrent_hash_map size");
 
     for (int i = 0; i != sz; ++i) {
@@ -471,14 +478,18 @@ void TestInternalFastFind() {
 
 struct default_container_traits {
     template <typename container_type, typename iterator_type>
-    static container_type& construct_container(typename std::aligned_storage<sizeof(container_type)>::type& storage, iterator_type begin, iterator_type end){
+    static container_type&
+    construct_container(typename std::aligned_storage<sizeof(container_type)>::type& storage,
+                        iterator_type begin, iterator_type end) {
         container_type* ptr = reinterpret_cast<container_type*>(&storage);
         new (ptr) container_type(begin, end);
         return *ptr;
     }
 
     template <typename container_type, typename iterator_type, typename allocator_type>
-    static container_type& construct_container(typename std::aligned_storage<sizeof(container_type)>::type& storage, iterator_type begin, iterator_type end, allocator_type const& a){
+    static container_type&
+    construct_container(typename std::aligned_storage<sizeof(container_type)>::type& storage,
+                        iterator_type begin, iterator_type end, allocator_type const& a) {
         container_type* ptr = reinterpret_cast<container_type*>(&storage);
         new (ptr) container_type(begin, end, a);
         return *ptr;
@@ -486,16 +497,12 @@ struct default_container_traits {
 };
 
 struct hash_map_traits : default_container_traits {
-    enum{ expected_number_of_items_to_allocate_for_steal_move = 0 };
+    enum { expected_number_of_items_to_allocate_for_steal_move = 0 };
 
-    template<typename T>
+    template <typename T>
     struct hash_compare {
-        bool equal( const T& lhs, const T& rhs ) const {
-            return lhs==rhs;
-        }
-        size_t hash( const T& k ) const {
-            return my_hash_func(k);
-        }
+        bool equal(const T& lhs, const T& rhs) const { return lhs == rhs; }
+        size_t hash(const T& k) const { return my_hash_func(k); }
         std::hash<T> my_hash_func;
     };
 
@@ -505,22 +512,20 @@ struct hash_map_traits : default_container_traits {
     template <typename T>
     using container_value_type = std::pair<const T, T>;
 
-    template<typename element_type, typename allocator_type>
+    template <typename element_type, typename allocator_type>
     struct apply {
-        using type = tbb::concurrent_hash_map<element_type, element_type, hash_compare<element_type>, allocator_type>;
+        using type = tbb::concurrent_hash_map<element_type, element_type, hash_compare<element_type>,
+                                              allocator_type>;
     };
 
     using init_iterator_type = move_support_tests::FooPairIterator;
     template <typename hash_map_type, typename iterator>
-    static bool equal(hash_map_type const& c, iterator begin, iterator end){
-        bool equal_sizes = ( static_cast<size_t>(std::distance(begin, end)) == c.size() );
-        if (!equal_sizes)
-            return false;
+    static bool equal(hash_map_type const& c, iterator begin, iterator end) {
+        bool equal_sizes = (static_cast<size_t>(std::distance(begin, end)) == c.size());
+        if (!equal_sizes) return false;
 
-        for (iterator it = begin; it != end; ++it ){
-            if (c.count( (*it).first) == 0){
-                return false;
-            }
+        for (iterator it = begin; it != end; ++it) {
+            if (c.count((*it).first) == 0) { return false; }
         }
         return true;
     }
@@ -537,24 +542,22 @@ class MinimalisticMutex {
     public:
         constexpr scoped_lock() noexcept : my_mutex_ptr(nullptr) {}
 
-        scoped_lock( MinimalisticMutex& m, bool = true ) : my_mutex_ptr(&m) {
-            my_mutex_ptr->my_mutex.lock();
-        }
+        scoped_lock(MinimalisticMutex& m, bool = true) : my_mutex_ptr(&m) { my_mutex_ptr->my_mutex.lock(); }
 
-        scoped_lock( const scoped_lock& ) = delete;
-        scoped_lock& operator=( const scoped_lock& ) = delete;
+        scoped_lock(const scoped_lock&) = delete;
+        scoped_lock& operator=(const scoped_lock&) = delete;
 
         ~scoped_lock() {
             if (my_mutex_ptr) release();
         }
 
-        void acquire( MinimalisticMutex& m, bool = true ) {
+        void acquire(MinimalisticMutex& m, bool = true) {
             CHECK(my_mutex_ptr == nullptr);
             my_mutex_ptr = &m;
             my_mutex_ptr->my_mutex.lock();
         }
 
-        bool try_acquire( MinimalisticMutex& m, bool = true ) {
+        bool try_acquire(MinimalisticMutex& m, bool = true) {
             if (m.my_mutex.try_lock()) {
                 my_mutex_ptr = &m;
                 return true;
@@ -582,22 +585,21 @@ class MinimalisticMutex {
 
         bool is_writer() const {
             CHECK(my_mutex_ptr != nullptr);
-            return true; // Always a writer
+            return true;// Always a writer
         }
 
     private:
         MinimalisticMutex* my_mutex_ptr;
-    }; // class scoped_lock
+    };// class scoped_lock
 private:
     std::mutex my_mutex;
-}; // class MinimalisticMutex
+};// class MinimalisticMutex
 
 template <bool SimulateReacquiring>
 void test_with_minimalistic_mutex() {
     using mutex_type = MinimalisticMutex<SimulateReacquiring>;
     using chmap_type = tbb::concurrent_hash_map<int, int, tbb::tbb_hash_compare<int>,
-                                                tbb::tbb_allocator<std::pair<const int, int>>,
-                                                mutex_type>;
+                                                tbb::tbb_allocator<std::pair<const int, int>>, mutex_type>;
 
     chmap_type chmap;
 
@@ -613,10 +615,10 @@ void test_with_minimalistic_mutex() {
         CHECK(result);
     }
 
-    auto thread_body = [&]( const tbb::blocked_range<std::size_t>& range ) {
+    auto thread_body = [&](const tbb::blocked_range<std::size_t>& range) {
         for (std::size_t item = range.begin(); item != range.end(); ++item) {
-            switch(item % 4) {
-                case 0 :
+            switch (item % 4) {
+                case 0:
                     // Insert new elements
                     for (int i = 100; i < 200; ++i) {
                         typename chmap_type::const_accessor acc;
@@ -625,7 +627,7 @@ void test_with_minimalistic_mutex() {
                         CHECK(acc->second == i);
                     }
                     break;
-                case 1 :
+                case 1:
                     // Insert pre-existing elements
                     for (int i = 0; i < 100; ++i) {
                         typename chmap_type::const_accessor acc;
@@ -635,7 +637,7 @@ void test_with_minimalistic_mutex() {
                         CHECK(acc->second == i);
                     }
                     break;
-                case 2 :
+                case 2:
                     // Find pre-existing elements
                     for (int i = 0; i < 100; ++i) {
                         typename chmap_type::const_accessor acc;
@@ -645,15 +647,13 @@ void test_with_minimalistic_mutex() {
                         CHECK(acc->second == i);
                     }
                     break;
-                case 3 :
+                case 3:
                     // Erase pre-existing elements
-                    for (int i = 10000; i < 10005; ++i) {
-                        chmap.erase(i);
-                    }
-                break;
+                    for (int i = 10000; i < 10005; ++i) { chmap.erase(i); }
+                    break;
             }
         }
-    }; // thread_body
+    };// thread_body
 
     tbb::blocked_range<std::size_t> br(0, 1000, 8);
 
@@ -677,18 +677,22 @@ void test_with_minimalistic_mutex() {
 }
 
 void test_mutex_customization() {
-    test_with_minimalistic_mutex</*SimulateReacquiring = */false>();
-    test_with_minimalistic_mutex</*SimulateReacquiring = */true>();
+    test_with_minimalistic_mutex</*SimulateReacquiring = */ false>();
+    test_with_minimalistic_mutex</*SimulateReacquiring = */ true>();
 }
 
 struct SimpleTransparentHashCompare {
     using is_transparent = void;
 
     template <typename T>
-    std::size_t hash(const T&) const { return 0; }
+    std::size_t hash(const T&) const {
+        return 0;
+    }
 
     template <typename T, typename U>
-    bool equal(const T& key1, const U& key2) const { return key1 == key2; }
+    bool equal(const T& key1, const U& key2) const {
+        return key1 == key2;
+    }
 };
 
 template <typename Accessor>
@@ -713,13 +717,13 @@ void test_chmap_access_mode(bool expect_write) {
     CHECK_MESSAGE(acc.is_writer() == expect_write, "Incorrect access into the map from heterogeneous insert");
 
     // Test lvalue insert
-    typename Map::value_type value{3, 3};
+    typename Map::value_type value {3, 3};
     result = map.insert(acc, value);
     CHECK(result);
     CHECK_MESSAGE(acc.is_writer() == expect_write, "Incorrect access into the map from lvalue insert");
 
     // Test rvalue insert
-    result = map.insert(acc, typename Map::value_type{4, 4});
+    result = map.insert(acc, typename Map::value_type {4, 4});
     CHECK(result);
     CHECK_MESSAGE(acc.is_writer() == expect_write, "Incorrect access into the map from rvalue insert");
 
@@ -736,31 +740,23 @@ void test_chmap_access_mode(bool expect_write) {
 
 //! Test of insert operation
 //! \brief \ref error_guessing
-TEST_CASE("testing range based for support"){
-    TestRangeBasedFor();
-}
+TEST_CASE("testing range based for support") { TestRangeBasedFor(); }
 
 //! Test concurrent_hash_map with specific key/mapped types
 //! \brief \ref regression \ref error_guessing
-TEST_CASE("testing concurrent_hash_map with specific key/mapped types") {
-    TestSpecificTypes();
-}
+TEST_CASE("testing concurrent_hash_map with specific key/mapped types") { TestSpecificTypes(); }
 
 //! Test work with scoped allocator
 //! \brief \ref regression
-TEST_CASE("testing work with scoped allocator") {
-    TestScopedAllocator();
-}
+TEST_CASE("testing work with scoped allocator") { TestScopedAllocator(); }
 
 //! Test internal fast find for concurrent_hash_map
 //! \brief \ref regression
-TEST_CASE("testing internal fast find for concurrent_hash_map") {
-    TestInternalFastFind();
-}
+TEST_CASE("testing internal fast find for concurrent_hash_map") { TestInternalFastFind(); }
 
 //! Test constructor with move iterators
 //! \brief \ref error_guessing
-TEST_CASE("testing constructor with move iterators"){
+TEST_CASE("testing constructor with move iterators") {
     move_support_tests::test_constructor_with_move_iterators<hash_map_traits>();
 }
 
@@ -771,59 +767,70 @@ TEST_CASE("Test exception in constructors") {
     using allocator_type = StaticSharedCountingAllocator<std::allocator<std::pair<const int, int>>>;
     using map_type = tbb::concurrent_hash_map<int, int, tbb::tbb_hash_compare<int>, allocator_type>;
 
-    auto init_list = {std::pair<const int, int>(1, 42), std::pair<const int, int>(2, 42), std::pair<const int, int>(3, 42),
-        std::pair<const int, int>(4, 42), std::pair<const int, int>(5, 42), std::pair<const int, int>(6, 42)};
+    auto init_list = {std::pair<const int, int>(1, 42), std::pair<const int, int>(2, 42),
+                      std::pair<const int, int>(3, 42), std::pair<const int, int>(4, 42),
+                      std::pair<const int, int>(5, 42), std::pair<const int, int>(6, 42)};
     map_type map(init_list);
 
     allocator_type::set_limits(1);
-    REQUIRE_THROWS_AS( [&] {
-        map_type map1(map);
-        utils::suppress_unused_warning(map1);
-    }(), const std::bad_alloc);
-
-    REQUIRE_THROWS_AS( [&] {
-        map_type map2(init_list.begin(), init_list.end());
-        utils::suppress_unused_warning(map2);
-    }(), const std::bad_alloc);
+    REQUIRE_THROWS_AS(
+            [&] {
+                map_type map1(map);
+                utils::suppress_unused_warning(map1);
+            }(),
+            const std::bad_alloc);
+
+    REQUIRE_THROWS_AS(
+            [&] {
+                map_type map2(init_list.begin(), init_list.end());
+                utils::suppress_unused_warning(map2);
+            }(),
+            const std::bad_alloc);
 
     tbb::tbb_hash_compare<int> test_hash;
 
-    REQUIRE_THROWS_AS( [&] {
-        map_type map3(init_list.begin(), init_list.end(), test_hash);
-        utils::suppress_unused_warning(map3);
-    }(), const std::bad_alloc);
-
-    REQUIRE_THROWS_AS( [&] {
-        map_type map4(init_list, test_hash);
-        utils::suppress_unused_warning(map4);
-    }(), const std::bad_alloc);
-
-    REQUIRE_THROWS_AS( [&] {
-        map_type map5(init_list);
-        utils::suppress_unused_warning(map5);
-    }(), const std::bad_alloc);
+    REQUIRE_THROWS_AS(
+            [&] {
+                map_type map3(init_list.begin(), init_list.end(), test_hash);
+                utils::suppress_unused_warning(map3);
+            }(),
+            const std::bad_alloc);
+
+    REQUIRE_THROWS_AS(
+            [&] {
+                map_type map4(init_list, test_hash);
+                utils::suppress_unused_warning(map4);
+            }(),
+            const std::bad_alloc);
+
+    REQUIRE_THROWS_AS(
+            [&] {
+                map_type map5(init_list);
+                utils::suppress_unused_warning(map5);
+            }(),
+            const std::bad_alloc);
 
     allocator_type::set_limits(0);
-    map_type big_map{};
-    for (int i = 0; i < 1000; ++i) {
-        big_map.insert(std::pair<const int, int>(i, 42));
-    }
+    map_type big_map {};
+    for (int i = 0; i < 1000; ++i) { big_map.insert(std::pair<const int, int>(i, 42)); }
 
     allocator_type::init_counters();
     allocator_type::set_limits(300);
-    REQUIRE_THROWS_AS( [&] {
-        map_type map6(big_map);
-        utils::suppress_unused_warning(map6);
-    }(), const std::bad_alloc);
+    REQUIRE_THROWS_AS(
+            [&] {
+                map_type map6(big_map);
+                utils::suppress_unused_warning(map6);
+            }(),
+            const std::bad_alloc);
 }
-#endif // TBB_USE_EXCEPTIONS
+#endif// TBB_USE_EXCEPTIONS
 
 //! \brief \ref error_guessing
 TEST_CASE("swap with NotAlwaysEqualAllocator allocators") {
     using allocator_type = NotAlwaysEqualAllocator<std::pair<const int, int>>;
     using map_type = tbb::concurrent_hash_map<int, int, tbb::tbb_hash_compare<int>, allocator_type>;
 
-    map_type map1{};
+    map_type map1 {};
     map_type map2({{42, 42}, {24, 42}});
     map_type map3(map2);
 
@@ -834,9 +841,7 @@ TEST_CASE("swap with NotAlwaysEqualAllocator allocators") {
 }
 
 //! \brief \ref error_guessing
-TEST_CASE("test concurrent_hash_map mutex customization") {
-    test_mutex_customization();
-}
+TEST_CASE("test concurrent_hash_map mutex customization") { test_mutex_customization(); }
 
 // A test for an issue when const_accessor passed to find provides write access into the map after the lookup
 //! \brief \ref regression
@@ -845,14 +850,16 @@ TEST_CASE("test concurrent_hash_map accessors issue") {
     using accessor = IsWriterAccessor<typename map_type::accessor>;
     using const_accessor = IsWriterAccessor<typename map_type::const_accessor>;
 
-    test_chmap_access_mode<map_type, accessor>(/*expect_write = */true);
-    test_chmap_access_mode<map_type, const_accessor>(/*expect_write = */false);
+    test_chmap_access_mode<map_type, accessor>(/*expect_write = */ true);
+    test_chmap_access_mode<map_type, const_accessor>(/*expect_write = */ false);
 }
 
 #if __TBB_CPP20_CONCEPTS_PRESENT
 template <bool ExpectSatisfies, typename Key, typename Mapped, typename... HCTypes>
-    requires (... && (utils::well_formed_instantiation<tbb::concurrent_hash_map, Key, Mapped, HCTypes> == ExpectSatisfies))
-void test_chmap_hash_compare_constraints() {}
+requires(...
+         && (utils::well_formed_instantiation<
+                     tbb::concurrent_hash_map, Key, Mapped,
+                     HCTypes> == ExpectSatisfies)) void test_chmap_hash_compare_constraints() {}
 
 //! \brief \ref error_guessing
 TEST_CASE("tbb::concurrent_hash_map hash_compare constraints") {
@@ -860,20 +867,22 @@ TEST_CASE("tbb::concurrent_hash_map hash_compare constraints") {
     using mapped_type = int;
     using namespace test_concepts::hash_compare;
 
-    test_chmap_hash_compare_constraints</*Expected = */true, /*key = */key_type, /*mapped = */mapped_type,
+    test_chmap_hash_compare_constraints</*Expected = */ true, /*key = */ key_type, /*mapped = */ mapped_type,
                                         Correct<key_type>, tbb::tbb_hash_compare<key_type>>();
 
-    test_chmap_hash_compare_constraints</*Expected = */false, /*key = */key_type, /*mapped = */mapped_type,
-                                        NonCopyable<key_type>, NonDestructible<key_type>,
-                                        NoHash<key_type>, HashNonConst<key_type>, WrongInputHash<key_type>, WrongReturnHash<key_type>,
-                                        NoEqual<key_type>, EqualNonConst<key_type>,
-                                        WrongFirstInputEqual<key_type>, WrongSecondInputEqual<key_type>, WrongReturnEqual<key_type>>();
+    test_chmap_hash_compare_constraints<
+            /*Expected = */ false, /*key = */ key_type, /*mapped = */ mapped_type, NonCopyable<key_type>,
+            NonDestructible<key_type>, NoHash<key_type>, HashNonConst<key_type>, WrongInputHash<key_type>,
+            WrongReturnHash<key_type>, NoEqual<key_type>, EqualNonConst<key_type>,
+            WrongFirstInputEqual<key_type>, WrongSecondInputEqual<key_type>, WrongReturnEqual<key_type>>();
 }
 
 template <bool ExpectSatisfies, typename Key, typename Mapped, typename... RWMutexes>
-    requires (... && (utils::well_formed_instantiation<tbb::concurrent_hash_map, Key, Mapped,
-                                                tbb::tbb_hash_compare<Key>, tbb::tbb_allocator<std::pair<const Key, Mapped>>, RWMutexes> == ExpectSatisfies))
-void test_chmap_mutex_constraints() {}
+requires(...
+         && (utils::well_formed_instantiation<
+                     tbb::concurrent_hash_map, Key, Mapped, tbb::tbb_hash_compare<Key>,
+                     tbb::tbb_allocator<std::pair<const Key, Mapped>>,
+                     RWMutexes> == ExpectSatisfies)) void test_chmap_mutex_constraints() {}
 
 //! \brief \ref error_guessing
 TEST_CASE("tbb::concurrent_hash_map rw_mutex constraints") {
@@ -881,15 +890,16 @@ TEST_CASE("tbb::concurrent_hash_map rw_mutex constraints") {
     using mapped_type = int;
     using namespace test_concepts::rw_mutex;
 
-    test_chmap_mutex_constraints</*Expected = */true, key_type, mapped_type,
-                                 Correct>();
+    test_chmap_mutex_constraints</*Expected = */ true, key_type, mapped_type, Correct>();
 
-    test_chmap_mutex_constraints</*Expected = */false, key_type, mapped_type,
-                                 NoScopedLock, ScopedLockNoDefaultCtor, ScopedLockNoMutexCtor,
-                                 ScopedLockNoDtor, ScopedLockNoAcquire, ScopedLockWrongFirstInputAcquire, ScopedLockWrongSecondInputAcquire, ScopedLockNoTryAcquire,
-                                 ScopedLockWrongFirstInputTryAcquire, ScopedLockWrongSecondInputTryAcquire, ScopedLockWrongReturnTryAcquire, ScopedLockNoRelease,
-                                 ScopedLockNoUpgrade, ScopedLockWrongReturnUpgrade, ScopedLockNoDowngrade, ScopedLockWrongReturnDowngrade,
-                                 ScopedLockNoIsWriter, ScopedLockIsWriterNonConst, ScopedLockWrongReturnIsWriter>();
+    test_chmap_mutex_constraints<
+            /*Expected = */ false, key_type, mapped_type, NoScopedLock, ScopedLockNoDefaultCtor,
+            ScopedLockNoMutexCtor, ScopedLockNoDtor, ScopedLockNoAcquire, ScopedLockWrongFirstInputAcquire,
+            ScopedLockWrongSecondInputAcquire, ScopedLockNoTryAcquire, ScopedLockWrongFirstInputTryAcquire,
+            ScopedLockWrongSecondInputTryAcquire, ScopedLockWrongReturnTryAcquire, ScopedLockNoRelease,
+            ScopedLockNoUpgrade, ScopedLockWrongReturnUpgrade, ScopedLockNoDowngrade,
+            ScopedLockWrongReturnDowngrade, ScopedLockNoIsWriter, ScopedLockIsWriterNonConst,
+            ScopedLockWrongReturnIsWriter>();
 }
 
 //! \brief \ref error_guessing
@@ -898,4 +908,4 @@ TEST_CASE("container_range concept for tbb::concurrent_hash_map ranges") {
     static_assert(test_concepts::container_range<tbb::concurrent_hash_map<int, int>::const_range_type>);
 }
 
-#endif // __TBB_CPP20_CONCEPTS_PRESENT
+#endif// __TBB_CPP20_CONCEPTS_PRESENT
diff --git a/external/tbb/test/tbb/test_concurrent_lru_cache.cpp b/external/tbb/test/tbb/test_concurrent_lru_cache.cpp
index 00f0c8df..f79f0411 100644
--- a/external/tbb/test/tbb/test_concurrent_lru_cache.cpp
+++ b/external/tbb/test/tbb/test_concurrent_lru_cache.cpp
@@ -17,13 +17,13 @@
 #define TBB_PREVIEW_CONCURRENT_LRU_CACHE 1
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
 #endif
 
 #include "common/test.h"
 #include "common/utils.h"
-#include <tbb/concurrent_lru_cache.h>
 #include <common/concurrent_lru_cache_common.h>
+#include <tbb/concurrent_lru_cache.h>
 
 //! \file test_concurrent_lru_cache.cpp
 //! \brief Test for [preview] functionality
@@ -39,49 +39,41 @@ TEST_CASE("basic test for return value") {
     auto dummy_f = [](int /*key*/) -> int { return 0xDEADBEEF; };
     std::size_t number_of_lru_history_items = 8;
 
-    preset preset_object{dummy_f, number_of_lru_history_items};
+    preset preset_object {dummy_f, number_of_lru_history_items};
     preset::cache_type& cache = preset_object.cache;
 
     int dummy_key = 1;
-    REQUIRE_MESSAGE(
-        dummy_f(dummy_key) == cache[dummy_key].value(),
-        "cache operator() must return only values obtained from value function");
+    REQUIRE_MESSAGE(dummy_f(dummy_key) == cache[dummy_key].value(),
+                    "cache operator() must return only values obtained from value function");
 }
 
 //! \brief \ref error_guessing
 TEST_CASE("basic test for unused objects") {
     using preset = concurrent_lru_cache_presets::preset_instance_count;
-    preset preset_object{};
+    preset preset_object {};
 
-    for (std::size_t i = 0; i < preset_object.number_of_lru_history_items; ++i)
-        preset_object.cache[i];
+    for (std::size_t i = 0; i < preset_object.number_of_lru_history_items; ++i) preset_object.cache[i];
 
-    REQUIRE_MESSAGE(
-        preset_object.source.instances_count() > 1,
-        "cache should store some unused objects");
+    REQUIRE_MESSAGE(preset_object.source.instances_count() > 1, "cache should store some unused objects");
 }
 
 //! \brief \ref error_guessing
 TEST_CASE("basic test for unused object limit") {
     using preset = concurrent_lru_cache_presets::preset_instance_count;
-    preset preset_object{};
+    preset preset_object {};
 
-    for (std::size_t i = 0; i < preset_object.number_of_lru_history_items + 1; ++i)
-        preset_object.cache[i];
+    for (std::size_t i = 0; i < preset_object.number_of_lru_history_items + 1; ++i) preset_object.cache[i];
 
-    REQUIRE_MESSAGE(
-        preset_object.source.instances_count() == preset_object.number_of_lru_history_items + 1,
-        "cache should respect number of stored unused objects to number passed in constructor");
+    REQUIRE_MESSAGE(preset_object.source.instances_count() == preset_object.number_of_lru_history_items + 1,
+                    "cache should respect number of stored unused objects to number passed in constructor");
 }
 
 //! \brief \ref error_guessing
 TEST_CASE("basic test for eviction order") {
     using preset = concurrent_lru_cache_presets::preset_map_instance_count;
-    preset preset_object{};
+    preset preset_object {};
 
-    REQUIRE_MESSAGE(
-        preset_object.number_of_lru_history_items > 2,
-        "incorrect test setup");
+    REQUIRE_MESSAGE(preset_object.number_of_lru_history_items > 2, "incorrect test setup");
 
     preset_object.fill_up_cache(0, preset_object.number_of_lru_history_items);
 
@@ -98,12 +90,12 @@ TEST_CASE("basic test for eviction order") {
 //! \brief \ref error_guessing
 TEST_CASE("basic test for eviction of only unused items") {
     using preset = concurrent_lru_cache_presets::preset_map_instance_count;
-    preset preset_object{};
+    preset preset_object {};
 
     preset::handle_type h = preset_object.cache[0];
 
     //cause eviction
-    preset_object.fill_up_cache(1, preset_object.number_of_lru_history_items+2);
+    preset_object.fill_up_cache(1, preset_object.number_of_lru_history_items + 2);
 
     bool is_correct = preset_object.is_evicted(1) && !preset_object.is_evicted(0);
     REQUIRE_MESSAGE(is_correct, "cache should not evict items in use");
@@ -112,15 +104,13 @@ TEST_CASE("basic test for eviction of only unused items") {
 //! \brief \ref error_guessing
 TEST_CASE("basic test for eviction of only unused items 2") {
     using preset = concurrent_lru_cache_presets::preset_map_instance_count;
-    preset preset_object{};
+    preset preset_object {};
 
     preset::handle_type h = preset_object.cache[0];
-    {
-        preset::handle_type h1 = preset_object.cache[0];
-    }
+    { preset::handle_type h1 = preset_object.cache[0]; }
 
     //cause eviction
-    preset_object.fill_up_cache(1,preset_object.number_of_lru_history_items+2);
+    preset_object.fill_up_cache(1, preset_object.number_of_lru_history_items + 2);
 
     bool is_correct = preset_object.is_evicted(1) && !preset_object.is_evicted(0);
     REQUIRE_MESSAGE(is_correct, "cache should not evict items in use");
@@ -128,26 +118,26 @@ TEST_CASE("basic test for eviction of only unused items 2") {
 
 //! \brief \ref error_guessing
 TEST_CASE("basic test for handling case when number_of_lru_history_items is zero") {
-    auto foo = [] (int) {
-        return utils::LifeTrackableObject{};
-    };
-    using cache_type =  tbb::concurrent_lru_cache<int, utils::LifeTrackableObject, decltype(foo)>;
-    cache_type cache{foo, 0};
-    
-    for(int i = 0; i < 10; ++i) {
+    auto foo = [](int) { return utils::LifeTrackableObject {}; };
+    using cache_type = tbb::concurrent_lru_cache<int, utils::LifeTrackableObject, decltype(foo)>;
+    cache_type cache {foo, 0};
+
+    for (int i = 0; i < 10; ++i) {
         // Check that no history is stored when my_history_list_capacity is 0.
         // In this case, when trying to fill the cache, the items will be deleted if reference was not taken.
         const utils::LifeTrackableObject* obj_addr = &cache[1].value();
-        REQUIRE_MESSAGE(utils::LifeTrackableObject::is_alive(obj_addr) == false, "when number_of_lru_history_items is zero, element must be erased after use");
+        REQUIRE_MESSAGE(utils::LifeTrackableObject::is_alive(obj_addr) == false,
+                        "when number_of_lru_history_items is zero, element must be erased after use");
     }
 
     cache_type::handle h = cache[1];
     const utils::LifeTrackableObject* obj_addr = &h.value();
     auto& object_set = utils::LifeTrackableObject::set();
-    for(int i = 0; i < 10; ++i) {
+    for (int i = 0; i < 10; ++i) {
         // Verify that item will still be alive if there is a handle holding that item.
         cache[1];
-        REQUIRE_MESSAGE(utils::LifeTrackableObject::is_alive(obj_addr), "the object with the key=1 was destroyed but should not");
+        REQUIRE_MESSAGE(utils::LifeTrackableObject::is_alive(obj_addr),
+                        "the object with the key=1 was destroyed but should not");
         REQUIRE_MESSAGE(object_set.size() == 1, "no other values should be added");
     }
 }
diff --git a/external/tbb/test/tbb/test_concurrent_map.cpp b/external/tbb/test/tbb/test_concurrent_map.cpp
index 362dd0b5..3cb567db 100644
--- a/external/tbb/test/tbb/test_concurrent_map.cpp
+++ b/external/tbb/test/tbb/test_concurrent_map.cpp
@@ -16,8 +16,8 @@
 #ifndef NOMINMAX
 #define NOMINMAX
 #endif
-#include <tbb/concurrent_map.h>
 #include "common/concurrent_ordered_common.h"
+#include <tbb/concurrent_map.h>
 
 //! \file test_concurrent_map.cpp
 //! \brief Test for [containers.concurrent_map containers.concurrent_multimap] specifications
@@ -32,8 +32,10 @@ using move_support_tests::FooWithAssign;
 
 using map_type = tbb::concurrent_map<int, int, std::less<int>, MyAllocator<int, int>>;
 using multimap_type = tbb::concurrent_multimap<int, int, std::less<int>, MyAllocator<int, int>>;
-using checked_map_type = tbb::concurrent_map<int, CheckType<int>, std::less<int>, MyAllocator<int, CheckType<int>>>;
-using checked_multimap_type = tbb::concurrent_multimap<int, CheckType<int>, std::less<int>, MyAllocator<int, CheckType<int>>>;
+using checked_map_type
+        = tbb::concurrent_map<int, CheckType<int>, std::less<int>, MyAllocator<int, CheckType<int>>>;
+using checked_multimap_type
+        = tbb::concurrent_multimap<int, CheckType<int>, std::less<int>, MyAllocator<int, CheckType<int>>>;
 using greater_map_type = tbb::concurrent_map<int, int, std::greater<int>, MyAllocator<int, int>>;
 using greater_multimap_type = tbb::concurrent_multimap<int, int, std::greater<int>, MyAllocator<int, int>>;
 using checked_state_map_type = tbb::concurrent_map<intptr_t, FooWithAssign, std::less<intptr_t>,
@@ -43,16 +45,12 @@ using checked_state_multimap_type = tbb::concurrent_multimap<intptr_t, FooWithAs
 
 template <>
 struct SpecialTests<map_type> {
-    static void Test() {
-        SpecialMapTests<map_type>();
-    }
+    static void Test() { SpecialMapTests<map_type>(); }
 };
 
 template <>
 struct SpecialTests<multimap_type> {
-    static void Test() {
-        SpecialMultiMapTests<multimap_type>();
-    }
+    static void Test() { SpecialMultiMapTests<multimap_type>(); }
 };
 
 struct COMapTraits : OrderedMoveTraitsBase {
@@ -63,7 +61,7 @@ struct COMapTraits : OrderedMoveTraitsBase {
     using container_value_type = std::pair<const T, T>;
 
     using init_iterator_type = move_support_tests::FooPairIterator;
-}; // struct COMapTraits
+};// struct COMapTraits
 
 struct COMultimapTraits : OrderedMoveTraitsBase {
     template <typename T, typename Allocator>
@@ -73,27 +71,26 @@ struct COMultimapTraits : OrderedMoveTraitsBase {
     using container_value_type = std::pair<const T, T>;
 
     using init_iterator_type = move_support_tests::FooPairIterator;
-}; // struct COMultimapTraits
+};// struct COMultimapTraits
 
 struct OrderedMapTypesTester {
     template <bool DefCtorPresent, typename ValueType>
-    void check( const std::list<ValueType>& lst ) {
+    void check(const std::list<ValueType>& lst) {
         using key_type = typename ValueType::first_type;
         using mapped_type = typename ValueType::second_type;
 
         TypeTester<DefCtorPresent, tbb::concurrent_map<key_type, mapped_type>>(lst);
         TypeTester<DefCtorPresent, tbb::concurrent_multimap<key_type, mapped_type>>(lst);
     }
-}; // struct OrderedMapTypesTester
+};// struct OrderedMapTypesTester
 
 void test_specific_types() {
     test_map_specific_types<OrderedMapTypesTester>();
 
     // Regression test for a problem with excessive requirements of emplace()
-    test_emplace_insert<tbb::concurrent_map<int*, test::unique_ptr<int>>,std::false_type>
-                       (new int, new int);
-    test_emplace_insert<tbb::concurrent_multimap<int*, test::unique_ptr<int>>,std::false_type>
-                       (new int, new int);
+    test_emplace_insert<tbb::concurrent_map<int*, test::unique_ptr<int>>, std::false_type>(new int, new int);
+    test_emplace_insert<tbb::concurrent_multimap<int*, test::unique_ptr<int>>, std::false_type>(new int,
+                                                                                                new int);
 }
 
 // Regression test for an issue in lock free algorithms
@@ -105,32 +102,22 @@ void test_cycles_absense() {
         std::vector<int> v(2);
         int vector_size = int(v.size());
 
-        for (int i = 0; i != vector_size; ++i) {
-            v[i] = i;
-        }
-        size_t num_threads = 4; // Can be changed to 2 for debugging
+        for (int i = 0; i != vector_size; ++i) { v[i] = i; }
+        size_t num_threads = 4;// Can be changed to 2 for debugging
 
         utils::NativeParallelFor(num_threads, [&](size_t) {
-            for (int i = 0; i != vector_size; ++i) {
-                mmap.emplace(i, i);
-            }
+            for (int i = 0; i != vector_size; ++i) { mmap.emplace(i, i); }
         });
 
-        for (int i = 0; i != vector_size; ++i) {
-            REQUIRE(mmap.count(i) == num_threads);
-        }
+        for (int i = 0; i != vector_size; ++i) { REQUIRE(mmap.count(i) == num_threads); }
     }
 }
 
 //! \brief \ref error_guessing
-TEST_CASE("basic test for concurrent_map with greater compare") {
-    test_basic<greater_map_type>();
-}
+TEST_CASE("basic test for concurrent_map with greater compare") { test_basic<greater_map_type>(); }
 
 //! \brief \ref error_guessing
-TEST_CASE("basic test for concurrent_multimap with greater compare") {
-    test_basic<greater_multimap_type>();
-}
+TEST_CASE("basic test for concurrent_multimap with greater compare") { test_basic<greater_multimap_type>(); }
 
 //! \brief \ref resource_usage
 TEST_CASE("basic test for concurrent_map with elements ctor and dtor check") {
@@ -146,12 +133,12 @@ TEST_CASE("basic test for concurrent_multimap with elements ctor and dtor check"
 
 //! \brief \ref resource_usage
 TEST_CASE("basic test for concurrent_map with elements state check") {
-    test_basic<checked_state_map_type, /*CheckState = */std::true_type>();
+    test_basic<checked_state_map_type, /*CheckState = */ std::true_type>();
 }
 
 //! \brief \ref resource_usage
 TEST_CASE("basic test for concurrent_multimap with elements state check") {
-    test_basic<checked_state_multimap_type, /*CheckState = */std::true_type>();
+    test_basic<checked_state_multimap_type, /*CheckState = */ std::true_type>();
 }
 
 //! \brief \ref error_guessing
@@ -197,38 +184,32 @@ TEST_CASE("multithreading support in concurrent_multimap with greater compare an
 }
 
 //! \brief \ref interface \ref error_guessing
-TEST_CASE("range based for support in concurrent_map") {
-    test_range_based_for_support<map_type>();
-}
+TEST_CASE("range based for support in concurrent_map") { test_range_based_for_support<map_type>(); }
 
 //! \brief \ref interface \ref error_guessing
-TEST_CASE("range based for support in concurrent_multimap") {
-    test_range_based_for_support<multimap_type>();
-}
+TEST_CASE("range based for support in concurrent_multimap") { test_range_based_for_support<multimap_type>(); }
 
 //! \brief \ref regression
-TEST_CASE("concurrent_map/multimap with specific key/mapped types") {
-    test_specific_types();
-}
+TEST_CASE("concurrent_map/multimap with specific key/mapped types") { test_specific_types(); }
 
 // TODO: add test with scoped_allocator_adaptor with broken macro
 
 //! \brief \ref regression
-TEST_CASE("broken internal structure for multimap") {
-    test_cycles_absense();
-}
+TEST_CASE("broken internal structure for multimap") { test_cycles_absense(); }
 
 //! \brief \ref error_guessing
 TEST_CASE("concurrent_map::swap with not always equal allocator") {
-    using not_always_equal_alloc_map_type = tbb::concurrent_map<int, int, std::less<int>,
-                                                                NotAlwaysEqualAllocator<std::pair<const int, int>>>;
+    using not_always_equal_alloc_map_type
+            = tbb::concurrent_map<int, int, std::less<int>,
+                                  NotAlwaysEqualAllocator<std::pair<const int, int>>>;
     test_swap_not_always_equal_allocator<not_always_equal_alloc_map_type>();
 }
 
 //! \brief \ref error_guessing
 TEST_CASE("concurrent_multimap::swap with not always equal allocator") {
-    using not_always_equal_alloc_mmap_type = tbb::concurrent_multimap<int, int, std::less<int>,
-                                                                      NotAlwaysEqualAllocator<std::pair<const int, int>>>;
+    using not_always_equal_alloc_mmap_type
+            = tbb::concurrent_multimap<int, int, std::less<int>,
+                                       NotAlwaysEqualAllocator<std::pair<const int, int>>>;
     test_swap_not_always_equal_allocator<not_always_equal_alloc_mmap_type>();
 }
 
@@ -244,7 +225,7 @@ TEST_CASE("concurrent_multimap throwing copy constructor") {
     using exception_mmap_type = tbb::concurrent_multimap<ThrowOnCopy, ThrowOnCopy>;
     test_exception_on_copy_ctor<exception_mmap_type>();
 }
-#endif // TBB_USE_EXCEPTIONS
+#endif// TBB_USE_EXCEPTIONS
 
 #if __TBB_CPP20_CONCEPTS_PRESENT
 //! \brief \ref error_guessing
@@ -256,6 +237,7 @@ TEST_CASE("container_range concept for concurrent_map ranges") {
 //! \brief \ref error_guessing
 TEST_CASE("container_range concept for concurrent_multimap ranges") {
     static_assert(test_concepts::container_range<typename tbb::concurrent_multimap<int, int>::range_type>);
-    static_assert(test_concepts::container_range<typename tbb::concurrent_multimap<int, int>::const_range_type>);
+    static_assert(
+            test_concepts::container_range<typename tbb::concurrent_multimap<int, int>::const_range_type>);
 }
-#endif // __TBB_CPP20_CONCEPTS_PRESENT
+#endif// __TBB_CPP20_CONCEPTS_PRESENT
diff --git a/external/tbb/test/tbb/test_concurrent_monitor.cpp b/external/tbb/test/tbb/test_concurrent_monitor.cpp
index a9233f8c..2c8de99f 100644
--- a/external/tbb/test/tbb/test_concurrent_monitor.cpp
+++ b/external/tbb/test/tbb/test_concurrent_monitor.cpp
@@ -20,18 +20,18 @@
 
 #if _MSC_VER && !defined(__INTEL_COMPILER)
 // structure was padded due to alignment specifier
-#pragma warning( disable: 4324 )
+#pragma warning(disable : 4324)
 #endif
 
+#include "common/spin_barrier.h"
 #include "common/test.h"
 #include "common/utils.h"
 #include "common/utils_concurrency_limit.h"
-#include "common/spin_barrier.h"
 
-#include "tbb/global_control.h"
-#include "tbb/task_arena.h"
 #include "../../src/tbb/concurrent_monitor.h"
 #include "../../src/tbb/misc.cpp"
+#include "tbb/global_control.h"
+#include "tbb/task_arena.h"
 
 //! \file test_concurrent_monitor.cpp
 //! \brief Test for [internal] functionality
@@ -39,17 +39,12 @@
 #if TBB_USE_EXCEPTIONS
 //! \brief \ref error_guessing
 TEST_CASE("Stress test") {
-    enum class notification_types {
-        notify,
-        notify_one,
-        notify_all,
-        notify_number
-    };
+    enum class notification_types { notify, notify_one, notify_all, notify_number };
 
     std::size_t threads_number = utils::get_platform_max_threads();
 
     // Need to prolong lifetime of the exposed concurrent_monitor
-    tbb::task_scheduler_handle handler{tbb::attach{}};
+    tbb::task_scheduler_handle handler {tbb::attach {}};
 
     utils::SpinBarrier barrier(threads_number);
 
@@ -57,38 +52,32 @@ TEST_CASE("Stress test") {
     {
         tbb::task_arena arena(static_cast<int>(threads_number - 1), 0);
 
-
         std::size_t iter_on_operation = 1000;
         std::size_t operation_number = std::size_t(notification_types::notify_number) * iter_on_operation;
 
         auto thread_func = [&, operation_number] {
             for (std::size_t i = 0; i < operation_number; ++i) {
-                tbb::detail::r1::concurrent_monitor::thread_context context{std::uintptr_t(1)};
+                tbb::detail::r1::concurrent_monitor::thread_context context {std::uintptr_t(1)};
                 test_monitor.prepare_wait(context);
                 barrier.wait();
                 test_monitor.cancel_wait(context);
             }
         };
 
-        for (std::size_t i = 0; i < threads_number - 1; ++i) {
-            arena.enqueue(thread_func);
-        }
+        for (std::size_t i = 0; i < threads_number - 1; ++i) { arena.enqueue(thread_func); }
 
         for (std::size_t i = 0; i < operation_number; ++i) {
             barrier.wait();
             switch (i / iter_on_operation) {
-                case 0:
-                {
-                    test_monitor.notify([] ( std::uintptr_t ) { return true; });
+                case 0: {
+                    test_monitor.notify([](std::uintptr_t) { return true; });
                     break;
                 }
-                case 1:
-                {
+                case 1: {
                     test_monitor.notify_one();
                     break;
                 }
-                case 2:
-                {
+                case 2: {
                     test_monitor.notify_all();
                     break;
                 }
@@ -98,4 +87,4 @@ TEST_CASE("Stress test") {
 
     tbb::finalize(handler);
 }
-#endif // TBB_USE_EXCEPTIONS
+#endif// TBB_USE_EXCEPTIONS
diff --git a/external/tbb/test/tbb/test_concurrent_priority_queue.cpp b/external/tbb/test/tbb/test_concurrent_priority_queue.cpp
index 53e43e83..3fd4665f 100644
--- a/external/tbb/test/tbb/test_concurrent_priority_queue.cpp
+++ b/external/tbb/test/tbb/test_concurrent_priority_queue.cpp
@@ -15,7 +15,7 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
 #endif
 
 #include <common/concurrent_priority_queue_common.h>
@@ -30,21 +30,20 @@ void test_cpq_with_smart_pointers() {
     utils::FastRandom<> rnd(1234);
 
     std::vector<std::shared_ptr<int>> shared_pointers;
-    for (int i = 0; i < NUMBER; ++i ) {
+    for (int i = 0; i < NUMBER; ++i) {
         const int rnd_get = rnd.get();
         shared_pointers.emplace_back(std::make_shared<int>(rnd_get));
     }
     std::vector<std::weak_ptr<int>> weak_pointers;
     std::copy(shared_pointers.begin(), shared_pointers.end(), std::back_inserter(weak_pointers));
 
-    type_tester(shared_pointers, LessForSmartPointers{});
-    type_tester(weak_pointers, LessForSmartPointers{});
+    type_tester(shared_pointers, LessForSmartPointers {});
+    type_tester(weak_pointers, LessForSmartPointers {});
 
     std::vector<int> arrInt;
-    for (int i = 0; i < NUMBER; ++i)
-        arrInt.emplace_back(rnd.get());
+    for (int i = 0; i < NUMBER; ++i) arrInt.emplace_back(rnd.get());
 
-    type_tester_unique_ptr(arrInt); // Test std::unique_ptr
+    type_tester_unique_ptr(arrInt);// Test std::unique_ptr
 }
 
 struct MyDataType {
@@ -52,47 +51,39 @@ struct MyDataType {
     char padding[tbb::detail::max_nfs_size - sizeof(int) % tbb::detail::max_nfs_size];
 
     MyDataType() = default;
-    MyDataType( int val ) : priority(std::size_t(val)) {}
+    MyDataType(int val) : priority(std::size_t(val)) {}
 
-    const MyDataType operator+( const MyDataType& other ) const {
+    const MyDataType operator+(const MyDataType& other) const {
         return MyDataType(int(priority + other.priority));
     }
 
-    bool operator==(const MyDataType& other) const {
-        return this->priority == other.priority;
-    }
-}; // struct MyDataType
+    bool operator==(const MyDataType& other) const { return this->priority == other.priority; }
+};// struct MyDataType
 
 const MyDataType DATA_MIN(INT_MIN);
 const MyDataType DATA_MAX(INT_MAX);
 
 struct MyLess {
-    bool operator()( const MyDataType d1, const MyDataType d2 ) const {
-        return d1.priority < d2.priority;
-    }
-}; // struct MyLess
+    bool operator()(const MyDataType d1, const MyDataType d2) const { return d1.priority < d2.priority; }
+};// struct MyLess
 
-void test_concurrent( std::size_t n ) {
+void test_concurrent(std::size_t n) {
     test_parallel_push_pop<MyLess>(n, DATA_MAX, DATA_MIN);
     test_flogger<MyLess, MyDataType>(n);
 }
 
 void test_multithreading() {
-    for (std::size_t n = utils::MinThread; n != utils::MaxThread; ++n) {
-        test_concurrent(n);
-    }
+    for (std::size_t n = utils::MinThread; n != utils::MaxThread; ++n) { test_concurrent(n); }
 }
 
 struct MyThrowingType : public MyDataType {
     static int throw_flag;
     MyThrowingType() = default;
-    MyThrowingType( const MyThrowingType& src ) : MyDataType(src) {
-        if (throw_flag) {
-            TBB_TEST_THROW(42);
-        }
+    MyThrowingType(const MyThrowingType& src) : MyDataType(src) {
+        if (throw_flag) { TBB_TEST_THROW(42); }
     }
 
-    MyThrowingType& operator=( const MyThrowingType& other ) {
+    MyThrowingType& operator=(const MyThrowingType& other) {
         priority = other.priority;
         return *this;
     }
@@ -105,25 +96,26 @@ using CPQExTestType = tbb::concurrent_priority_queue<MyThrowingType, MyLess>;
 #if TBB_USE_EXCEPTIONS
 void test_exceptions() {
     // TODO: TBB_USE_EXCEPTIONS?
-    const std::size_t TOO_LARGE_SZ = std::vector<MyThrowingType, typename CPQExTestType::allocator_type>{}.max_size() + 1;
+    const std::size_t TOO_LARGE_SZ
+            = std::vector<MyThrowingType, typename CPQExTestType::allocator_type> {}.max_size() + 1;
 
     REQUIRE(TOO_LARGE_SZ < std::numeric_limits<std::size_t>::max());
     MyThrowingType elem;
 
     // Allocation of empty queue should not throw
-    REQUIRE_NOTHROW([]{
+    REQUIRE_NOTHROW([] {
         MyThrowingType::throw_flag = 1;
         CPQExTestType q;
     }());
 
     // Allocation of small queue should not throw for reasonably sized type
-    REQUIRE_NOTHROW([]{
+    REQUIRE_NOTHROW([] {
         MyThrowingType::throw_flag = 1;
         CPQExTestType(42);
     }());
 
     // Allocate a queue with too large initial size
-    REQUIRE_THROWS([&]{
+    REQUIRE_THROWS([&] {
         MyThrowingType::throw_flag = 0;
         CPQExTestType q(TOO_LARGE_SZ);
     }());
@@ -134,25 +126,29 @@ void test_exceptions() {
     elem.priority = 42;
     for (std::size_t i = 0; i < 42; ++i) src_q.push(elem);
 
-    REQUIRE_THROWS_MESSAGE([&]{
-        MyThrowingType::throw_flag = 1;
-        CPQExTestType q(src_q);
-    }(), "Copy ctor did not throw exception");
+    REQUIRE_THROWS_MESSAGE(
+            [&] {
+                MyThrowingType::throw_flag = 1;
+                CPQExTestType q(src_q);
+            }(),
+            "Copy ctor did not throw exception");
 
     // Test assignment
     MyThrowingType::throw_flag = 0;
     CPQExTestType assign_q(24);
 
-    REQUIRE_THROWS_MESSAGE([&]{
-        MyThrowingType::throw_flag = 1;
-        assign_q = src_q;
-    }(), "Assignment did not throw exception");
+    REQUIRE_THROWS_MESSAGE(
+            [&] {
+                MyThrowingType::throw_flag = 1;
+                assign_q = src_q;
+            }(),
+            "Assignment did not throw exception");
     REQUIRE(assign_q.empty());
 
     for (std::size_t i = 0; i < push_selector_variants; ++i) {
         MyThrowingType::throw_flag = 0;
         CPQExTestType pq(3);
-        REQUIRE_NOTHROW([&]{
+        REQUIRE_NOTHROW([&] {
             push_selector(pq, elem, i);
             push_selector(pq, elem, i);
             push_selector(pq, elem, i);
@@ -161,7 +157,7 @@ void test_exceptions() {
         try {
             MyThrowingType::throw_flag = 1;
             push_selector(pq, elem, i);
-        } catch(...) {
+        } catch (...) {
             REQUIRE_MESSAGE(!pq.empty(), "Failed: pq should not be empty");
             REQUIRE_MESSAGE(pq.size() == 3, "Failed: pq should contain only three elements");
             REQUIRE_MESSAGE(pq.try_pop(elem), "Failed: pq is not functional");
@@ -169,7 +165,7 @@ void test_exceptions() {
 
         MyThrowingType::throw_flag = 0;
         CPQExTestType pq2(3);
-        REQUIRE_NOTHROW([&]{
+        REQUIRE_NOTHROW([&] {
             push_selector(pq2, elem, i);
             push_selector(pq2, elem, i);
         }());
@@ -177,7 +173,7 @@ void test_exceptions() {
         try {
             MyThrowingType::throw_flag = 1;
             push_selector(pq2, elem, i);
-        } catch(...) {
+        } catch (...) {
             REQUIRE_MESSAGE(!pq2.empty(), "Failed: pq should not be empty");
             REQUIRE_MESSAGE(pq2.size() == 2, "Failed: pq should contain only two elements");
             REQUIRE_MESSAGE(pq2.try_pop(elem), "Failed: pq is not functional");
@@ -189,8 +185,10 @@ void test_exceptions() {
 void test_scoped_allocator() {
     using allocator_data_type = AllocatorAwareData<std::scoped_allocator_adaptor<std::allocator<int>>>;
     using basic_allocator_type = std::scoped_allocator_adaptor<std::allocator<allocator_data_type>>;
-    using allocator_type = std::allocator_traits<basic_allocator_type>::template rebind_alloc<allocator_data_type>;
-    using container_type = tbb::concurrent_priority_queue<allocator_data_type, std::less<allocator_data_type>, allocator_type>;
+    using allocator_type
+            = std::allocator_traits<basic_allocator_type>::template rebind_alloc<allocator_data_type>;
+    using container_type = tbb::concurrent_priority_queue<allocator_data_type, std::less<allocator_data_type>,
+                                                          allocator_type>;
 
     allocator_type allocator;
     allocator_data_type data1(1, allocator);
@@ -215,9 +213,7 @@ void test_scoped_allocator() {
 
 // Testing concurrent_priority_queue with smart pointers and other special types
 //! \brief \ref error_guessing
-TEST_CASE("concurrent_priority_queue with smart_pointers") {
-    test_cpq_with_smart_pointers();
-}
+TEST_CASE("concurrent_priority_queue with smart_pointers") { test_cpq_with_smart_pointers(); }
 
 //! Testing push-pop operations in concurrent_priority_queue with multithreading and specific value type
 //! \brief \ref error_guessing
@@ -228,12 +224,8 @@ TEST_CASE("multithreading support in concurrent_priority_queue with specific val
 #if TBB_USE_EXCEPTIONS
 //! Testing exceptions support in concurrent_priority_queue
 //! \brief \ref stress \ref error_guessing
-TEST_CASE("exception handling in concurrent_priority_queue") {
-    test_exceptions();
-}
+TEST_CASE("exception handling in concurrent_priority_queue") { test_exceptions(); }
 #endif
 
 //! \brief \ref error_guessing
-TEST_CASE("concurrent_priority_queue with std::scoped_allocator_adaptor") {
-    test_scoped_allocator();
-}
+TEST_CASE("concurrent_priority_queue with std::scoped_allocator_adaptor") { test_scoped_allocator(); }
diff --git a/external/tbb/test/tbb/test_concurrent_queue.cpp b/external/tbb/test/tbb/test_concurrent_queue.cpp
index 57f53a95..80995997 100644
--- a/external/tbb/test/tbb/test_concurrent_queue.cpp
+++ b/external/tbb/test/tbb/test_concurrent_queue.cpp
@@ -14,10 +14,10 @@
     limitations under the License.
 */
 
+#include <common/custom_allocators.h>
 #include <common/test.h>
 #include <common/utils.h>
 #include <common/vector_types.h>
-#include <common/custom_allocators.h>
 
 #include <tbb/concurrent_queue.h>
 #include <unordered_set>
@@ -27,14 +27,14 @@
 
 static constexpr std::size_t MaxThread = 4;
 
-template<typename CQ, typename T>
+template <typename CQ, typename T>
 struct TestQueueElements {
     CQ& queue;
     const std::size_t nthread;
-    TestQueueElements( CQ& q, std::size_t n ) : queue(q), nthread(n) {}
-    void operator()( std::size_t k ) const {
-        for (std::size_t i=0; i < 1000; ++i) {
-            if( (i&0x1)==0 ) {
+    TestQueueElements(CQ& q, std::size_t n) : queue(q), nthread(n) {}
+    void operator()(std::size_t k) const {
+        for (std::size_t i = 0; i < 1000; ++i) {
+            if ((i & 0x1) == 0) {
                 CHECK(T(k) < T(nthread));
                 queue.push(T(k));
             } else {
@@ -48,30 +48,28 @@ struct TestQueueElements {
 };
 
 //! Test concurrent queue with primitive data type
-template<typename CQ, typename T>
+template <typename CQ, typename T>
 void TestPrimitiveTypes(std::size_t nthread, T exemplar) {
     CQ queue;
-    for (std::size_t i = 0; i < 100; ++i) {
-        queue.push(exemplar);
-    }
+    for (std::size_t i = 0; i < 100; ++i) { queue.push(exemplar); }
     utils::NativeParallelFor(nthread, TestQueueElements<CQ, T>(queue, nthread));
 }
 
 void TestQueueWorksWithPrimitiveTypes() {
-    TestPrimitiveTypes<tbb::concurrent_queue<char>, char>(MaxThread, (char)1);
-    TestPrimitiveTypes<tbb::concurrent_queue<int>, int>(MaxThread, (int)-12);
-    TestPrimitiveTypes<tbb::concurrent_queue<float>, float>(MaxThread, (float)-1.2f);
-    TestPrimitiveTypes<tbb::concurrent_queue<double>, double>(MaxThread, (double)-4.3);
-    TestPrimitiveTypes<tbb::concurrent_bounded_queue<char>, char>(MaxThread, (char)1);
-    TestPrimitiveTypes<tbb::concurrent_bounded_queue<int>, int>(MaxThread, (int)-12);
-    TestPrimitiveTypes<tbb::concurrent_bounded_queue<float>, float>(MaxThread, (float)-1.2f);
-    TestPrimitiveTypes<tbb::concurrent_bounded_queue<double>, double>(MaxThread, (double)-4.3);
+    TestPrimitiveTypes<tbb::concurrent_queue<char>, char>(MaxThread, (char) 1);
+    TestPrimitiveTypes<tbb::concurrent_queue<int>, int>(MaxThread, (int) -12);
+    TestPrimitiveTypes<tbb::concurrent_queue<float>, float>(MaxThread, (float) -1.2f);
+    TestPrimitiveTypes<tbb::concurrent_queue<double>, double>(MaxThread, (double) -4.3);
+    TestPrimitiveTypes<tbb::concurrent_bounded_queue<char>, char>(MaxThread, (char) 1);
+    TestPrimitiveTypes<tbb::concurrent_bounded_queue<int>, int>(MaxThread, (int) -12);
+    TestPrimitiveTypes<tbb::concurrent_bounded_queue<float>, float>(MaxThread, (float) -1.2f);
+    TestPrimitiveTypes<tbb::concurrent_bounded_queue<double>, double>(MaxThread, (double) -4.3);
 }
 
 #if HAVE_m128 || HAVE_m256
 //! Test concurrent queue with vector types
 /** Type Queue should be a queue of ClassWithSSE/ClassWithAVX. */
-template<typename ClassWithVectorType, typename Queue>
+template <typename ClassWithVectorType, typename Queue>
 void TestVectorTypes() {
     Queue q1;
     for (int i = 0; i < 100; ++i) {
@@ -84,7 +82,7 @@ void TestVectorTypes() {
     Queue q2 = q1;
     // Check that elements of the copy are correct
     typename Queue::const_iterator ci = q2.unsafe_begin();
-    for (int i=0; i < 100; ++i ) {
+    for (int i = 0; i < 100; ++i) {
         CHECK((ci != q2.unsafe_end()));
         ClassWithVectorType foo = *ci;
         ClassWithVectorType bar(i);
@@ -97,7 +95,7 @@ void TestVectorTypes() {
         bool b = q1.try_pop(tmp);
         CHECK((b == (i < 100)));
         ClassWithVectorType bar(i);
-        CHECK((!b || tmp==bar));
+        CHECK((!b || tmp == bar));
     }
 }
 #endif /* HAVE_m128 || HAVE_m256 */
@@ -105,29 +103,27 @@ void TestVectorTypes() {
 void TestQueueWorksWithSSE() {
 
 #if HAVE_m128
-    TestVectorTypes<ClassWithSSE, tbb::concurrent_queue<ClassWithSSE> >();
-    TestVectorTypes<ClassWithSSE, tbb::concurrent_bounded_queue<ClassWithSSE> >();
+    TestVectorTypes<ClassWithSSE, tbb::concurrent_queue<ClassWithSSE>>();
+    TestVectorTypes<ClassWithSSE, tbb::concurrent_bounded_queue<ClassWithSSE>>();
 #endif /* HAVE_m128 */
 #if HAVE_m256
-    if( have_AVX() ) {
-        TestVectorTypes<ClassWithAVX, tbb::concurrent_queue<ClassWithAVX> >();
-        TestVectorTypes<ClassWithAVX, tbb::concurrent_bounded_queue<ClassWithAVX> >();
+    if (have_AVX()) {
+        TestVectorTypes<ClassWithAVX, tbb::concurrent_queue<ClassWithAVX>>();
+        TestVectorTypes<ClassWithAVX, tbb::concurrent_bounded_queue<ClassWithAVX>>();
     }
 #endif /* HAVE_m256 */
 }
 #if TBB_USE_EXCEPTIONS
-    int rnd_elem = -1;
-    int global_counter = -1;
+int rnd_elem = -1;
+int global_counter = -1;
 
 struct throw_element {
     throw_element() = default;
     throw_element(const throw_element&) {
-        if (global_counter++ == rnd_elem) {
-            throw std::exception{};
-        }
+        if (global_counter++ == rnd_elem) { throw std::exception {}; }
     }
 
-    throw_element& operator= (const throw_element&) = default;
+    throw_element& operator=(const throw_element&) = default;
 };
 
 template <typename Queue>
@@ -137,33 +133,29 @@ void CopyWithThrowElement() {
     Queue source;
 
     constexpr size_t queue_size = 100000;
-    for (std::size_t i = 0; i < queue_size; ++i) {
-        source.emplace();
-    }
+    for (std::size_t i = 0; i < queue_size; ++i) { source.emplace(); }
 
     for (std::size_t i = 0; i < 100; ++i) {
         global_counter = 0;
         rnd_elem = rnd.get() % queue_size;
 
-        REQUIRE_THROWS_AS( [&] {
-            Queue copy(source);
-            utils::suppress_unused_warning(copy);
-        }(), std::exception);
+        REQUIRE_THROWS_AS(
+                [&] {
+                    Queue copy(source);
+                    utils::suppress_unused_warning(copy);
+                }(),
+                std::exception);
     }
 }
-#endif // TBB_USE_EXCEPTIONS
+#endif// TBB_USE_EXCEPTIONS
 
 //! Test work with different fypes
 //! \brief \ref error_guessing
-TEST_CASE("testing work with different fypes") {
-    TestQueueWorksWithPrimitiveTypes();
-}
+TEST_CASE("testing work with different fypes") { TestQueueWorksWithPrimitiveTypes(); }
 
 //! Test work with vector types
 //! \brief \ref error_guessing
-TEST_CASE("testing vector types") {
-    TestQueueWorksWithSSE();
-}
+TEST_CASE("testing vector types") { TestQueueWorksWithSSE(); }
 
 #if TBB_USE_EXCEPTIONS
 //! \brief \ref regression \ref error_guessing
@@ -172,24 +164,26 @@ TEST_CASE("Test exception in allocation") {
     using queue_type = tbb::concurrent_queue<int, allocator_type>;
 
     queue_type src_queue;
-    for (int i = 0; i < 100000; ++i) {
-        src_queue.push(i);
-    }
+    for (int i = 0; i < 100000; ++i) { src_queue.push(i); }
 
     allocator_type::set_limits(1);
 
-    REQUIRE_THROWS_AS( [] {
-        queue_type queue1;
-        queue1.push(1);
-    }(), const std::bad_alloc);
+    REQUIRE_THROWS_AS(
+            [] {
+                queue_type queue1;
+                queue1.push(1);
+            }(),
+            const std::bad_alloc);
 
     for (std::size_t i = 1; i < 1000; ++i) {
         allocator_type::init_counters();
         allocator_type::set_limits(1);
-        REQUIRE_THROWS_AS( [&] {
-            queue_type queue2(src_queue);
-            utils::suppress_unused_warning(queue2);
-        }(), const std::bad_alloc);
+        REQUIRE_THROWS_AS(
+                [&] {
+                    queue_type queue2(src_queue);
+                    utils::suppress_unused_warning(queue2);
+                }(),
+                const std::bad_alloc);
     }
 }
 
@@ -199,7 +193,7 @@ TEST_CASE("Test exception in allocation") {
     CopyWithThrowElement<tbb::concurrent_bounded_queue<throw_element>>();
 }
 
-#endif // TBB_USE_EXCEPTIONS
+#endif// TBB_USE_EXCEPTIONS
 
 struct TrackableItem {
     static std::unordered_set<TrackableItem*> object_addresses;
@@ -232,9 +226,7 @@ void fill_and_catch(Container& q, std::size_t elements_count) {
 #endif
             q.emplace();
 #if TBB_USE_EXCEPTIONS
-        } catch (int exception) {
-            CHECK(exception == 1);
-        }
+        } catch (int exception) { CHECK(exception == 1); }
 #endif
     }
 #if TBB_USE_EXCEPTIONS
@@ -258,7 +250,7 @@ void test_tracking_dtors_on_clear() {
         fill_and_catch(q, elements_count);
 
         q.clear();
-        
+
         CHECK(q.empty());
         CHECK(TrackableItem::object_addresses.empty());
 #if TBB_USE_EXCEPTIONS
@@ -269,7 +261,7 @@ void test_tracking_dtors_on_clear() {
         {
             Container q;
             fill_and_catch(q, elements_count);
-        } // Dtor of q would be called here
+        }// Dtor of q would be called here
         CHECK(TrackableItem::object_addresses.empty());
 #if TBB_USE_EXCEPTIONS
         TrackableItem::global_count_for_exceptions = 0;
@@ -283,7 +275,7 @@ TEST_CASE("Test clear and dtor with TrackableItem") {
     test_tracking_dtors_on_clear<oneapi::tbb::concurrent_bounded_queue<TrackableItem>>();
 }
 
-//! \brief \ref regression 
+//! \brief \ref regression
 TEST_CASE("test capacity on modifying operations") {
     // Test that concurrent_bounded_queue capacity is preserved on copying, moving and swapping
     using queue_type = oneapi::tbb::concurrent_bounded_queue<int>;
diff --git a/external/tbb/test/tbb/test_concurrent_queue_whitebox.cpp b/external/tbb/test/tbb/test_concurrent_queue_whitebox.cpp
index 1ba1530e..af785662 100644
--- a/external/tbb/test/tbb/test_concurrent_queue_whitebox.cpp
+++ b/external/tbb/test/tbb/test_concurrent_queue_whitebox.cpp
@@ -20,7 +20,7 @@
 
 #if _MSC_VER && !defined(__INTEL_COMPILER)
 // structure was padded due to alignment specifier
-#pragma warning( disable: 4324 )
+#pragma warning(disable : 4324)
 #endif
 
 #include "common/test.h"
@@ -41,12 +41,11 @@
 template <typename Q>
 class FloggerBody {
 public:
-    FloggerBody& operator=( const FloggerBody& ) = delete;
+    FloggerBody& operator=(const FloggerBody&) = delete;
 
-    FloggerBody( Q& queue, std::size_t el_num )
-        : q(queue), elem_num(el_num) {}
+    FloggerBody(Q& queue, std::size_t el_num) : q(queue), elem_num(el_num) {}
 
-    void operator()( const int thread_id ) const {
+    void operator()(const int thread_id) const {
         using value_type = typename Q::value_type;
         value_type elem = value_type(thread_id);
         for (std::size_t i = 0; i < elem_num; ++i) {
@@ -59,10 +58,10 @@ class FloggerBody {
 private:
     Q& q;
     std::size_t elem_num;
-}; // class FloggerBody
+};// class FloggerBody
 
 template <typename Q>
-void test_flogger_help( Q& q, std::size_t items_per_page ) {
+void test_flogger_help(Q& q, std::size_t items_per_page) {
     std::size_t nq = q.my_queue_representation->n_queue;
     std::size_t reserved_elem_num = nq * items_per_page - 1;
     std::size_t hack_val = std::numeric_limits<std::size_t>::max() & ~reserved_elem_num;
@@ -70,7 +69,7 @@ void test_flogger_help( Q& q, std::size_t items_per_page ) {
     q.my_queue_representation->head_counter = hack_val;
     q.my_queue_representation->tail_counter = hack_val;
 
-    std::size_t k = q.my_queue_representation->tail_counter & -(std::ptrdiff_t)nq;
+    std::size_t k = q.my_queue_representation->tail_counter & -(std::ptrdiff_t) nq;
 
     for (std::size_t i = 0; i < nq; ++i) {
         q.my_queue_representation->array[i].head_counter = k;
@@ -78,7 +77,8 @@ void test_flogger_help( Q& q, std::size_t items_per_page ) {
     }
 
     // To induce the overflow occurrence
-    utils::NativeParallelFor(static_cast<typename Q::value_type>(utils::MaxThread), FloggerBody<Q>(q, reserved_elem_num + 20));
+    utils::NativeParallelFor(static_cast<typename Q::value_type>(utils::MaxThread),
+                             FloggerBody<Q>(q, reserved_elem_num + 20));
 
     REQUIRE_MESSAGE(q.empty(), "Failed flogger/empty test");
     REQUIRE_MESSAGE(q.my_queue_representation->head_counter < hack_val, "Failed wraparound test");
diff --git a/external/tbb/test/tbb/test_concurrent_set.cpp b/external/tbb/test/tbb/test_concurrent_set.cpp
index 8c00708c..9f4f28cf 100644
--- a/external/tbb/test/tbb/test_concurrent_set.cpp
+++ b/external/tbb/test/tbb/test_concurrent_set.cpp
@@ -17,8 +17,8 @@
 #define NOMINMAX
 #endif
 
-#include <tbb/concurrent_set.h>
 #include "common/concurrent_ordered_common.h"
+#include <tbb/concurrent_set.h>
 
 //! \file test_concurrent_set.cpp
 //! \brief Test for [containers.concurrent_set containers.concurrent_multiset] specifications
@@ -33,12 +33,16 @@ using move_support_tests::FooWithAssign;
 
 using set_type = tbb::concurrent_set<int, std::less<int>, MyAllocator<int>>;
 using multiset_type = tbb::concurrent_multiset<int, std::less<int>, MyAllocator<int>>;
-using checked_set_type = tbb::concurrent_set<CheckType<int>, std::less<CheckType<int>>, MyAllocator<CheckType<int>>>;
-using checked_multiset_type = tbb::concurrent_multiset<CheckType<int>, std::less<CheckType<int>>, MyAllocator<CheckType<int>>>;
+using checked_set_type
+        = tbb::concurrent_set<CheckType<int>, std::less<CheckType<int>>, MyAllocator<CheckType<int>>>;
+using checked_multiset_type
+        = tbb::concurrent_multiset<CheckType<int>, std::less<CheckType<int>>, MyAllocator<CheckType<int>>>;
 using greater_set_type = tbb::concurrent_set<int, std::greater<int>, MyAllocator<int>>;
 using greater_multiset_type = tbb::concurrent_multiset<int, std::greater<int>, MyAllocator<int>>;
-using checked_state_set_type = tbb::concurrent_set<FooWithAssign, std::less<FooWithAssign>, MyAllocator<FooWithAssign>>;
-using checked_state_multiset_type = tbb::concurrent_multiset<FooWithAssign, std::less<FooWithAssign>, MyAllocator<FooWithAssign>>;
+using checked_state_set_type
+        = tbb::concurrent_set<FooWithAssign, std::less<FooWithAssign>, MyAllocator<FooWithAssign>>;
+using checked_state_multiset_type
+        = tbb::concurrent_multiset<FooWithAssign, std::less<FooWithAssign>, MyAllocator<FooWithAssign>>;
 
 struct COSetTraits : OrderedMoveTraitsBase {
     template <typename T, typename Allocator>
@@ -48,7 +52,7 @@ struct COSetTraits : OrderedMoveTraitsBase {
     using container_value_type = T;
 
     using init_iterator_type = move_support_tests::FooIterator;
-}; // struct COSetTraits
+};// struct COSetTraits
 
 struct COMultisetTraits : OrderedMoveTraitsBase {
     template <typename T, typename Allocator>
@@ -58,24 +62,22 @@ struct COMultisetTraits : OrderedMoveTraitsBase {
     using container_value_type = T;
 
     using init_iterator_type = move_support_tests::FooIterator;
-}; // struct COMultisetTraits
+};// struct COMultisetTraits
 
 struct OrderedSetTypesTester {
     template <bool DefCtorPresent, typename ValueType>
-    void check( const std::list<ValueType>& lst ) {
+    void check(const std::list<ValueType>& lst) {
         TypeTester<DefCtorPresent, tbb::concurrent_set<ValueType>>(lst);
         TypeTester<DefCtorPresent, tbb::concurrent_multiset<ValueType>>(lst);
     }
-}; // struct OrderedMapTypesTester
+};// struct OrderedMapTypesTester
 
 void test_specific_types() {
     test_set_specific_types<OrderedSetTypesTester>();
 
     // Regression test for a problem with excessive requirements of emplace
-    test_emplace_insert<tbb::concurrent_set<test::unique_ptr<int>>, std::false_type>
-                       (new int, new int);
-    test_emplace_insert<tbb::concurrent_multiset<test::unique_ptr<int>>, std::false_type>
-                       (new int, new int);
+    test_emplace_insert<tbb::concurrent_set<test::unique_ptr<int>>, std::false_type>(new int, new int);
+    test_emplace_insert<tbb::concurrent_multiset<test::unique_ptr<int>>, std::false_type>(new int, new int);
 }
 
 // Regression test for an issue in lock free algorithms
@@ -87,32 +89,22 @@ void test_cycles_absense() {
         std::vector<int> v(2);
         int vector_size = int(v.size());
 
-        for (int i = 0; i != vector_size; ++i) {
-            v[i] = int(i);
-        }
-        size_t num_threads = 4; // Can be changed to 2 for debugging
+        for (int i = 0; i != vector_size; ++i) { v[i] = int(i); }
+        size_t num_threads = 4;// Can be changed to 2 for debugging
 
         utils::NativeParallelFor(num_threads, [&](size_t) {
-            for (int i = 0; i != vector_size; ++i) {
-                mset.emplace(i);
-            }
+            for (int i = 0; i != vector_size; ++i) { mset.emplace(i); }
         });
 
-        for (int i = 0; i != vector_size; ++i) {
-            REQUIRE(mset.count(i) == num_threads);
-        }
+        for (int i = 0; i != vector_size; ++i) { REQUIRE(mset.count(i) == num_threads); }
     }
 }
 
 //! \brief \ref error_guessing
-TEST_CASE("basic test for concurrent_set with greater compare") {
-    test_basic<greater_set_type>();
-}
+TEST_CASE("basic test for concurrent_set with greater compare") { test_basic<greater_set_type>(); }
 
 //! \brief \ref error_guessing
-TEST_CASE("basic test for concurrent_multiset with greater compare") {
-    test_basic<greater_multiset_type>();
-}
+TEST_CASE("basic test for concurrent_multiset with greater compare") { test_basic<greater_multiset_type>(); }
 
 //! \brief \ref resource_usage
 TEST_CASE("basic test for concurrent_set with elements ctor and dtor check") {
@@ -128,12 +120,12 @@ TEST_CASE("basic test for concurrent_multiset with elements ctor and dtor check"
 
 //! \brief \ref resource_usage
 TEST_CASE("basic test for concurrent_set with elements state check") {
-    test_basic<checked_state_set_type, /*CheckState = */std::true_type>();
+    test_basic<checked_state_set_type, /*CheckState = */ std::true_type>();
 }
 
 //! \brief \ref resource_usage
 TEST_CASE("basic test for concurrent_multiset with elements state check") {
-    test_basic<checked_state_multiset_type, /*CheckState = */std::true_type>();
+    test_basic<checked_state_multiset_type, /*CheckState = */ std::true_type>();
 }
 
 //! \brief \ref error_guessing
@@ -179,24 +171,16 @@ TEST_CASE("multithreading support in concurrent_multiset with greater compare an
 }
 
 //! \brief \ref interface \ref error_guessing
-TEST_CASE("range based for support in concurrent_set") {
-    test_range_based_for_support<set_type>();
-}
+TEST_CASE("range based for support in concurrent_set") { test_range_based_for_support<set_type>(); }
 
 //! \brief \ref interface \ref error_guessing
-TEST_CASE("range based for support in concurrent_multiset") {
-    test_range_based_for_support<multiset_type>();
-}
+TEST_CASE("range based for support in concurrent_multiset") { test_range_based_for_support<multiset_type>(); }
 
 //! \brief \ref regression
-TEST_CASE("concurrent set/multiset with specific key types") {
-    test_specific_types();
-}
+TEST_CASE("concurrent set/multiset with specific key types") { test_specific_types(); }
 
 //! \brief \ref error_guessing
-TEST_CASE("concurrent_set with std::scoped_allocator_adaptor") {
-    test_scoped_allocator<COSetTraits>();
-}
+TEST_CASE("concurrent_set with std::scoped_allocator_adaptor") { test_scoped_allocator<COSetTraits>(); }
 
 //! \brief \ref error_guessing
 TEST_CASE("concurrent_multiset with std::scoped_allocator_adaptor") {
@@ -204,19 +188,19 @@ TEST_CASE("concurrent_multiset with std::scoped_allocator_adaptor") {
 }
 
 //! \brief \ref regression
-TEST_CASE("broken internal structure for multiset") {
-    test_cycles_absense();
-}
+TEST_CASE("broken internal structure for multiset") { test_cycles_absense(); }
 
 //! \brief \ref error_guessing
 TEST_CASE("concurrent_set::swap with not always equal allocator") {
-    using not_always_equal_alloc_set_type = tbb::concurrent_set<int, std::less<int>, NotAlwaysEqualAllocator<int>>;
+    using not_always_equal_alloc_set_type
+            = tbb::concurrent_set<int, std::less<int>, NotAlwaysEqualAllocator<int>>;
     test_swap_not_always_equal_allocator<not_always_equal_alloc_set_type>();
 }
 
 //! \brief \ref error_guessing
 TEST_CASE("concurrent_multiset::swap with not always equal allocator") {
-    using not_always_equal_alloc_mset_type = tbb::concurrent_multiset<int, std::less<int>, NotAlwaysEqualAllocator<int>>;
+    using not_always_equal_alloc_mset_type
+            = tbb::concurrent_multiset<int, std::less<int>, NotAlwaysEqualAllocator<int>>;
     test_swap_not_always_equal_allocator<not_always_equal_alloc_mset_type>();
 }
 
@@ -232,7 +216,7 @@ TEST_CASE("concurrent_multiset throwing copy constructor") {
     using exception_mset_type = tbb::concurrent_multiset<ThrowOnCopy>;
     test_exception_on_copy_ctor<exception_mset_type>();
 }
-#endif // TBB_USE_EXCEPTIONS
+#endif// TBB_USE_EXCEPTIONS
 
 #if __TBB_CPP20_CONCEPTS_PRESENT
 //! \brief \ref error_guessing
@@ -246,4 +230,4 @@ TEST_CASE("container range concept for concurrent_multiset ranges") {
     static_assert(test_concepts::container_range<typename tbb::concurrent_multiset<int>::range_type>);
     static_assert(test_concepts::container_range<typename tbb::concurrent_multiset<int>::const_range_type>);
 }
-#endif // __TBB_CPP20_CONCEPTS_PRESENT
+#endif// __TBB_CPP20_CONCEPTS_PRESENT
diff --git a/external/tbb/test/tbb/test_concurrent_unordered_map.cpp b/external/tbb/test/tbb/test_concurrent_unordered_map.cpp
index b676b455..52f0a20a 100644
--- a/external/tbb/test/tbb/test_concurrent_unordered_map.cpp
+++ b/external/tbb/test/tbb/test_concurrent_unordered_map.cpp
@@ -15,12 +15,12 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
 #endif
 
 #define TBB_DEFINE_STD_HASH_SPECIALIZATIONS 1
-#include <tbb/concurrent_unordered_map.h>
 #include "common/concurrent_unordered_common.h"
+#include <tbb/concurrent_unordered_map.h>
 
 //! \file test_concurrent_unordered_map.cpp
 //! \brief Test for [containers.concurrent_unordered_map containers.concurrent_unordered_multimap] specifications
@@ -33,17 +33,27 @@ using MyAllocator = LocalCountingAllocator<std::allocator<std::pair<const Key, M
 
 using move_support_tests::FooWithAssign;
 
-using map_type = tbb::concurrent_unordered_map<int, int, std::hash<int>, std::equal_to<int>, MyAllocator<int, int>>;
-using multimap_type = tbb::concurrent_unordered_multimap<int, int, std::hash<int>, std::equal_to<int>, MyAllocator<int, int>>;
-using degenerate_map_type = tbb::concurrent_unordered_map<int, int, degenerate_hash<int>, std::equal_to<int>, MyAllocator<int, int>>;
-using degenerate_multimap_type = tbb::concurrent_unordered_multimap<int, int, degenerate_hash<int>, std::equal_to<int>, MyAllocator<int, int>>;
-
-using checked_map_type = tbb::concurrent_unordered_map<int, CheckType<int>, std::hash<int>, std::equal_to<int>, MyAllocator<int, CheckType<int>>>;
-using checked_multimap_type = tbb::concurrent_unordered_multimap<int, CheckType<int>, std::hash<int>, std::equal_to<int>, MyAllocator<int, CheckType<int>>>;
-using checked_state_map_type = tbb::concurrent_unordered_map<intptr_t, FooWithAssign, std::hash<intptr_t>,
-                                                             std::equal_to<intptr_t>, MyAllocator<intptr_t, FooWithAssign>>;
-using checked_state_multimap_type = tbb::concurrent_unordered_multimap<intptr_t, FooWithAssign, std::hash<intptr_t>,
-                                                                       std::equal_to<intptr_t>, MyAllocator<intptr_t, FooWithAssign>>;
+using map_type
+        = tbb::concurrent_unordered_map<int, int, std::hash<int>, std::equal_to<int>, MyAllocator<int, int>>;
+using multimap_type = tbb::concurrent_unordered_multimap<int, int, std::hash<int>, std::equal_to<int>,
+                                                         MyAllocator<int, int>>;
+using degenerate_map_type = tbb::concurrent_unordered_map<int, int, degenerate_hash<int>, std::equal_to<int>,
+                                                          MyAllocator<int, int>>;
+using degenerate_multimap_type
+        = tbb::concurrent_unordered_multimap<int, int, degenerate_hash<int>, std::equal_to<int>,
+                                             MyAllocator<int, int>>;
+
+using checked_map_type = tbb::concurrent_unordered_map<int, CheckType<int>, std::hash<int>,
+                                                       std::equal_to<int>, MyAllocator<int, CheckType<int>>>;
+using checked_multimap_type
+        = tbb::concurrent_unordered_multimap<int, CheckType<int>, std::hash<int>, std::equal_to<int>,
+                                             MyAllocator<int, CheckType<int>>>;
+using checked_state_map_type
+        = tbb::concurrent_unordered_map<intptr_t, FooWithAssign, std::hash<intptr_t>, std::equal_to<intptr_t>,
+                                        MyAllocator<intptr_t, FooWithAssign>>;
+using checked_state_multimap_type
+        = tbb::concurrent_unordered_multimap<intptr_t, FooWithAssign, std::hash<intptr_t>,
+                                             std::equal_to<intptr_t>, MyAllocator<intptr_t, FooWithAssign>>;
 
 struct CumapTraits : UnorderedMoveTraitsBase {
     template <typename T, typename Allocator>
@@ -53,30 +63,27 @@ struct CumapTraits : UnorderedMoveTraitsBase {
     using container_value_type = std::pair<const T, T>;
 
     using init_iterator_type = move_support_tests::FooPairIterator;
-}; // struct CumapTraits
+};// struct CumapTraits
 
 struct CumultimapTraits : UnorderedMoveTraitsBase {
     template <typename T, typename Allocator>
-    using container_type = tbb::concurrent_unordered_multimap<T, T, std::hash<T>, std::equal_to<T>, Allocator>;
+    using container_type
+            = tbb::concurrent_unordered_multimap<T, T, std::hash<T>, std::equal_to<T>, Allocator>;
 
     template <typename T>
     using container_value_type = std::pair<const T, T>;
 
     using init_iterator_type = move_support_tests::FooPairIterator;
-}; // struct CumultimapTraits
+};// struct CumultimapTraits
 
 template <>
 struct SpecialTests<map_type> {
-    static void Test() {
-        SpecialMapTests<map_type>();
-    }
+    static void Test() { SpecialMapTests<map_type>(); }
 };
 
 template <>
 struct SpecialTests<multimap_type> {
-    static void Test() {
-        SpecialMultiMapTests<multimap_type>();
-    }
+    static void Test() { SpecialMultiMapTests<multimap_type>(); }
 };
 
 struct UnorderedMapTypesTester {
@@ -84,23 +91,24 @@ struct UnorderedMapTypesTester {
     using table_type = GeneralTableType<Key, Mapped, std::hash<Key>, utils::IsEqual>;
 
     template <bool DefCtorPresent, typename ValueType>
-    void check( const std::list<ValueType>& lst ) {
+    void check(const std::list<ValueType>& lst) {
         using key_type = typename std::remove_const<typename ValueType::first_type>::type;
         using mapped_type = typename ValueType::second_type;
 
         TypeTester<DefCtorPresent, table_type<tbb::concurrent_unordered_map, key_type, mapped_type>>(lst);
-        TypeTester<DefCtorPresent, table_type<tbb::concurrent_unordered_multimap, key_type, mapped_type>>(lst);
+        TypeTester<DefCtorPresent, table_type<tbb::concurrent_unordered_multimap, key_type, mapped_type>>(
+                lst);
     }
-}; // struct UnorderedMapTypesTester
+};// struct UnorderedMapTypesTester
 
 void test_specific_types() {
     test_map_specific_types<UnorderedMapTypesTester>();
 
     // Regression test for a problem with excessive requirements of emplace()
-    test_emplace_insert<tbb::concurrent_unordered_map<int*, test::unique_ptr<int>>, std::false_type>
-                       (new int, new int);
-    test_emplace_insert<tbb::concurrent_unordered_multimap<int*, test::unique_ptr<int>>, std::false_type>
-                       (new int, new int);
+    test_emplace_insert<tbb::concurrent_unordered_map<int*, test::unique_ptr<int>>, std::false_type>(new int,
+                                                                                                     new int);
+    test_emplace_insert<tbb::concurrent_unordered_multimap<int*, test::unique_ptr<int>>, std::false_type>(
+            new int, new int);
 }
 
 //! \brief \ref stress \ref error_guessing
@@ -127,12 +135,12 @@ TEST_CASE("basic test for concurrent_unordered_multimap with elements ctor and d
 
 //! \brief \ref resource_usage
 TEST_CASE("basic test for concurrent_unordered_map with elements state check") {
-    test_basic<checked_state_map_type, /*CheckState = */std::true_type>();
+    test_basic<checked_state_map_type, /*CheckState = */ std::true_type>();
 }
 
 //! \brief \ref resource_usage
 TEST_CASE("basic test for concurrent_unordered_multimap with elements state check") {
-    test_basic<checked_state_multimap_type, /*CheckState = */std::true_type>();
+    test_basic<checked_state_multimap_type, /*CheckState = */ std::true_type>();
 }
 
 //! \brief \ref stress \ref error_guessing
@@ -178,9 +186,7 @@ TEST_CASE("multithreading support in concurrent_unordered_multimap with elements
 }
 
 //! \brief \ref interface \ref error_guessing
-TEST_CASE("range based for support in concurrent_unordered_map") {
-    test_range_based_for_support<map_type>();
-}
+TEST_CASE("range based for support in concurrent_unordered_map") { test_range_based_for_support<map_type>(); }
 
 //! \brief \ref interface \ref error_guessing
 TEST_CASE("range based for support in concurrent_unordered_multimap") {
@@ -193,21 +199,21 @@ TEST_CASE("merge and concurrent merge in concurrent_unordered_map with degenerat
 }
 
 //! \brief \ref regression
-TEST_CASE("concurrent_unordered map/multimap with specific key/mapped types") {
-    test_specific_types();
-}
+TEST_CASE("concurrent_unordered map/multimap with specific key/mapped types") { test_specific_types(); }
 
 //! \brief \ref error_guessing
 TEST_CASE("concurrent_unordered_map::swap with not always equal allocator") {
-    using not_always_equal_alloc_map_type = tbb::concurrent_unordered_map<int, int, std::hash<int>, std::equal_to<int>,
-                                                                          NotAlwaysEqualAllocator<std::pair<const int, int>>>;
+    using not_always_equal_alloc_map_type
+            = tbb::concurrent_unordered_map<int, int, std::hash<int>, std::equal_to<int>,
+                                            NotAlwaysEqualAllocator<std::pair<const int, int>>>;
     test_swap_not_always_equal_allocator<not_always_equal_alloc_map_type>();
 }
 
 //! \brief \ref error_guessing
 TEST_CASE("concurrent_unordered_multimap::swap with not always equal allocator") {
-    using not_always_equal_alloc_mmap_type = tbb::concurrent_unordered_multimap<int, int, std::hash<int>, std::equal_to<int>,
-                                                                                NotAlwaysEqualAllocator<std::pair<const int, int>>>;
+    using not_always_equal_alloc_mmap_type
+            = tbb::concurrent_unordered_multimap<int, int, std::hash<int>, std::equal_to<int>,
+                                                 NotAlwaysEqualAllocator<std::pair<const int, int>>>;
     test_swap_not_always_equal_allocator<not_always_equal_alloc_mmap_type>();
 }
 
@@ -227,37 +233,42 @@ TEST_CASE("concurrent_unordered_multimap throwing copy constructor") {
 //! \brief \ref error_guessing
 TEST_CASE("concurrent_unordered_map whitebox throwing copy constructor") {
     using allocator_type = StaticSharedCountingAllocator<std::allocator<std::pair<const int, int>>>;
-    using exception_mmap_type = tbb::concurrent_unordered_map<int, int, std::hash<int>, std::equal_to<int>, allocator_type>;
+    using exception_mmap_type
+            = tbb::concurrent_unordered_map<int, int, std::hash<int>, std::equal_to<int>, allocator_type>;
 
     exception_mmap_type map;
-    for (int i = 0; i < 10; ++i) {
-        map.insert(std::pair<const int, int>(i, 42));
-    }
+    for (int i = 0; i < 10; ++i) { map.insert(std::pair<const int, int>(i, 42)); }
 
     allocator_type::set_limits(1);
-    REQUIRE_THROWS_AS( [&] {
-        exception_mmap_type map1(map);
-        utils::suppress_unused_warning(map1);
-    }(), const std::bad_alloc);
+    REQUIRE_THROWS_AS(
+            [&] {
+                exception_mmap_type map1(map);
+                utils::suppress_unused_warning(map1);
+            }(),
+            const std::bad_alloc);
 }
 
-#endif // TBB_USE_EXCEPTIONS
+#endif// TBB_USE_EXCEPTIONS
 
 // TODO: add test_scoped_allocator support with broken macro
 
 #if __TBB_CPP20_CONCEPTS_PRESENT
 //! \brief \ref error_guessing
 TEST_CASE("container_range concept for concurrent_unordered_map ranges") {
-    static_assert(test_concepts::container_range<typename tbb::concurrent_unordered_map<int, int>::range_type>);
-    static_assert(test_concepts::container_range<typename tbb::concurrent_unordered_map<int, int>::const_range_type>);
+    static_assert(
+            test_concepts::container_range<typename tbb::concurrent_unordered_map<int, int>::range_type>);
+    static_assert(test_concepts::container_range<
+                  typename tbb::concurrent_unordered_map<int, int>::const_range_type>);
 }
 
 //! \brief \ref error_guessing
 TEST_CASE("container_range concept for concurrent_unordered_multimap ranges") {
-    static_assert(test_concepts::container_range<typename tbb::concurrent_unordered_multimap<int, int>::range_type>);
-    static_assert(test_concepts::container_range<typename tbb::concurrent_unordered_multimap<int, int>::const_range_type>);
+    static_assert(test_concepts::container_range<
+                  typename tbb::concurrent_unordered_multimap<int, int>::range_type>);
+    static_assert(test_concepts::container_range<
+                  typename tbb::concurrent_unordered_multimap<int, int>::const_range_type>);
 }
-#endif // __TBB_CPP20_CONCEPTS_PRESENT
+#endif// __TBB_CPP20_CONCEPTS_PRESENT
 
 //! \brief \ref regression
 TEST_CASE("reserve(0) issue regression test") {
diff --git a/external/tbb/test/tbb/test_concurrent_unordered_set.cpp b/external/tbb/test/tbb/test_concurrent_unordered_set.cpp
index 1b5195ba..7ad737c0 100644
--- a/external/tbb/test/tbb/test_concurrent_unordered_set.cpp
+++ b/external/tbb/test/tbb/test_concurrent_unordered_set.cpp
@@ -15,12 +15,12 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
 #endif
 
 #define TBB_DEFINE_STD_HASH_SPECIALIZATIONS 1
-#include <tbb/concurrent_unordered_set.h>
 #include "common/concurrent_unordered_common.h"
+#include <tbb/concurrent_unordered_set.h>
 
 //! \file test_concurrent_unordered_set.cpp
 //! \brief Test for [containers.concurrent_unordered_set containers.concurrent_unordered_multiset] specifications
@@ -34,17 +34,25 @@ using MyAllocator = LocalCountingAllocator<std::allocator<Value>>;
 using move_support_tests::FooWithAssign;
 
 using set_type = tbb::concurrent_unordered_set<int, std::hash<int>, std::equal_to<int>, MyAllocator<int>>;
-using multiset_type = tbb::concurrent_unordered_multiset<int, std::hash<int>, std::equal_to<int>, MyAllocator<int>>;
-using degenerate_set_type = tbb::concurrent_unordered_set<int, degenerate_hash<int>, std::equal_to<int>, MyAllocator<int>>;
-using degenerate_multiset_type = tbb::concurrent_unordered_multiset<int, degenerate_hash<int>, std::equal_to<int>, MyAllocator<int>>;
-
-using checked_set_type = tbb::concurrent_unordered_set<CheckType<int>, std::hash<CheckType<int>>, std::equal_to<CheckType<int>>, MyAllocator<CheckType<int>>>;
-using checked_multiset_type = tbb::concurrent_unordered_multiset<CheckType<int>, std::hash<CheckType<int>>,
-                                                                 std::equal_to<CheckType<int>>, MyAllocator<CheckType<int>>>;
-using checked_state_set_type = tbb::concurrent_unordered_set<FooWithAssign, std::hash<FooWithAssign>, std::equal_to<FooWithAssign>,
-                                                             MyAllocator<FooWithAssign>>;
-using checked_state_multiset_type = tbb::concurrent_unordered_multiset<FooWithAssign, std::hash<FooWithAssign>, std::equal_to<FooWithAssign>,
-                                                                       MyAllocator<FooWithAssign>>;
+using multiset_type
+        = tbb::concurrent_unordered_multiset<int, std::hash<int>, std::equal_to<int>, MyAllocator<int>>;
+using degenerate_set_type
+        = tbb::concurrent_unordered_set<int, degenerate_hash<int>, std::equal_to<int>, MyAllocator<int>>;
+using degenerate_multiset_type
+        = tbb::concurrent_unordered_multiset<int, degenerate_hash<int>, std::equal_to<int>, MyAllocator<int>>;
+
+using checked_set_type
+        = tbb::concurrent_unordered_set<CheckType<int>, std::hash<CheckType<int>>,
+                                        std::equal_to<CheckType<int>>, MyAllocator<CheckType<int>>>;
+using checked_multiset_type
+        = tbb::concurrent_unordered_multiset<CheckType<int>, std::hash<CheckType<int>>,
+                                             std::equal_to<CheckType<int>>, MyAllocator<CheckType<int>>>;
+using checked_state_set_type
+        = tbb::concurrent_unordered_set<FooWithAssign, std::hash<FooWithAssign>, std::equal_to<FooWithAssign>,
+                                        MyAllocator<FooWithAssign>>;
+using checked_state_multiset_type
+        = tbb::concurrent_unordered_multiset<FooWithAssign, std::hash<FooWithAssign>,
+                                             std::equal_to<FooWithAssign>, MyAllocator<FooWithAssign>>;
 
 struct CusetTraits : UnorderedMoveTraitsBase {
     template <typename T, typename Allocator>
@@ -54,7 +62,7 @@ struct CusetTraits : UnorderedMoveTraitsBase {
     using container_value_type = T;
 
     using init_iterator_type = move_support_tests::FooIterator;
-}; // struct CusetTraits
+};// struct CusetTraits
 
 struct CumultisetTraits : UnorderedMoveTraitsBase {
     template <typename T, typename Allocator>
@@ -64,13 +72,15 @@ struct CumultisetTraits : UnorderedMoveTraitsBase {
     using container_value_type = T;
 
     using init_iterator_type = move_support_tests::FooIterator;
-}; // struct CumultisetTraits
+};// struct CumultisetTraits
 
 struct UnorderedSetTypesTester {
     template <bool DefCtorPresent, typename ValueType>
-    void check( const std::list<ValueType>& lst ) {
-        TypeTester<DefCtorPresent, tbb::concurrent_unordered_set<ValueType, std::hash<ValueType>, utils::IsEqual>>(lst);
-        TypeTester<DefCtorPresent, tbb::concurrent_unordered_multiset<ValueType, std::hash<ValueType>, utils::IsEqual>>(lst);
+    void check(const std::list<ValueType>& lst) {
+        TypeTester<DefCtorPresent,
+                   tbb::concurrent_unordered_set<ValueType, std::hash<ValueType>, utils::IsEqual>>(lst);
+        TypeTester<DefCtorPresent,
+                   tbb::concurrent_unordered_multiset<ValueType, std::hash<ValueType>, utils::IsEqual>>(lst);
     }
 };
 
@@ -78,10 +88,10 @@ void test_specific_types() {
     test_set_specific_types<UnorderedSetTypesTester>();
 
     // Regressiong test for a problem with excessive requirements of emplace()
-    test_emplace_insert<tbb::concurrent_unordered_set<test::unique_ptr<int>>,
-                        std::false_type>(new int, new int);
-    test_emplace_insert<tbb::concurrent_unordered_multiset<test::unique_ptr<int>>,
-                        std::false_type>(new int, new int);
+    test_emplace_insert<tbb::concurrent_unordered_set<test::unique_ptr<int>>, std::false_type>(new int,
+                                                                                               new int);
+    test_emplace_insert<tbb::concurrent_unordered_multiset<test::unique_ptr<int>>, std::false_type>(new int,
+                                                                                                    new int);
 }
 
 //! \brief \ref stress \ref error_guessing
@@ -108,12 +118,12 @@ TEST_CASE("basic test for concurrent_unordered_multiset with elements ctor and d
 
 //! \brief \ref resource_usage
 TEST_CASE("basic test for concurrent_unordered_set with elements state check") {
-    test_basic<checked_state_set_type, /*CheckState = */std::true_type>();
+    test_basic<checked_state_set_type, /*CheckState = */ std::true_type>();
 }
 
 //! \brief \ref resource_usage
 TEST_CASE("basic test for concurrent_unordered_multiset with elements state check") {
-    test_basic<checked_state_multiset_type, /*CheckState = */std::true_type>();
+    test_basic<checked_state_multiset_type, /*CheckState = */ std::true_type>();
 }
 
 //! \brief \ref stress \ref error_guessing
@@ -159,9 +169,7 @@ TEST_CASE("multithreading support in concurrent_unordered_multiset with elements
 }
 
 //! \brief \ref interface \ref error_guessing
-TEST_CASE("range based for support in concurrent_unordered_set") {
-    test_range_based_for_support<set_type>();
-}
+TEST_CASE("range based for support in concurrent_unordered_set") { test_range_based_for_support<set_type>(); }
 
 //! \brief \ref interface \ref error_guessing
 TEST_CASE("range based for support in concurrent_unordered_multiset") {
@@ -174,9 +182,7 @@ TEST_CASE("merge and concurrent merge in concurrent_unordered_set and set with d
 }
 
 //! \brief \ref regression
-TEST_CASE("concurrent_unordered_set/multiset with specific key types") {
-    test_specific_types();
-}
+TEST_CASE("concurrent_unordered_set/multiset with specific key types") { test_specific_types(); }
 
 //! \brief \ref error_guessing
 TEST_CASE("concurrent_unordered_set with std::scoped_allocator_adaptor") {
@@ -190,15 +196,17 @@ TEST_CASE("concurrent_unordered_multiset with std::scoped_allocator_adaptor") {
 
 //! \brief \ref error_guessing
 TEST_CASE("concurrent_unordered_set::swap with not always equal allocator") {
-    using not_always_equal_alloc_set_type = tbb::concurrent_unordered_set<int, std::hash<int>, std::equal_to<int>,
-                                                                          NotAlwaysEqualAllocator<int>>;
+    using not_always_equal_alloc_set_type
+            = tbb::concurrent_unordered_set<int, std::hash<int>, std::equal_to<int>,
+                                            NotAlwaysEqualAllocator<int>>;
     test_swap_not_always_equal_allocator<not_always_equal_alloc_set_type>();
 }
 
 //! \brief \ref error_guessing
 TEST_CASE("concurrent_unordered_multiset::swap with not always equal allocator") {
-    using not_always_equal_alloc_mset_type = tbb::concurrent_unordered_multiset<int, std::hash<int>, std::equal_to<int>,
-                                                                                NotAlwaysEqualAllocator<int>>;
+    using not_always_equal_alloc_mset_type
+            = tbb::concurrent_unordered_multiset<int, std::hash<int>, std::equal_to<int>,
+                                                 NotAlwaysEqualAllocator<int>>;
     test_swap_not_always_equal_allocator<not_always_equal_alloc_mset_type>();
 }
 
@@ -214,21 +222,24 @@ TEST_CASE("concurrent_unordered_multimap throwing copy constructor") {
     using exception_mset_type = tbb::concurrent_unordered_multiset<ThrowOnCopy>;
     test_exception_on_copy_ctor<exception_mset_type>();
 }
-#endif // __TBB_USE_EXCEPTIONS
+#endif// __TBB_USE_EXCEPTIONS
 
 #if __TBB_CPP20_CONCEPTS_PRESENT
 //! \brief \ref error_guessing
 TEST_CASE("container_range concept for concurrent_unordered_set ranges") {
     static_assert(test_concepts::container_range<typename tbb::concurrent_unordered_set<int>::range_type>);
-    static_assert(test_concepts::container_range<typename tbb::concurrent_unordered_set<int>::const_range_type>);
+    static_assert(
+            test_concepts::container_range<typename tbb::concurrent_unordered_set<int>::const_range_type>);
 }
 
 //! \brief \ref error_guessing
 TEST_CASE("container_range concept for concurrent_unordered_multiset ranges") {
-    static_assert(test_concepts::container_range<typename tbb::concurrent_unordered_multiset<int>::range_type>);
-    static_assert(test_concepts::container_range<typename tbb::concurrent_unordered_multiset<int>::const_range_type>);
+    static_assert(
+            test_concepts::container_range<typename tbb::concurrent_unordered_multiset<int>::range_type>);
+    static_assert(test_concepts::container_range<
+                  typename tbb::concurrent_unordered_multiset<int>::const_range_type>);
 }
-#endif // __TBB_CPP20_CONCEPTS_PRESENT
+#endif// __TBB_CPP20_CONCEPTS_PRESENT
 
 //! \brief \ref regression
 TEST_CASE("reserve(0) issue regression test") {
diff --git a/external/tbb/test/tbb/test_concurrent_vector.cpp b/external/tbb/test/tbb/test_concurrent_vector.cpp
index 0237102e..432e5b55 100644
--- a/external/tbb/test/tbb/test_concurrent_vector.cpp
+++ b/external/tbb/test/tbb/test_concurrent_vector.cpp
@@ -15,66 +15,66 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
 #endif
 
-#include <common/test.h>
-#include <common/spin_barrier.h>
-#include <common/state_trackable.h>
+#include <algorithm>
+#include <cmath>
+#include <common/concepts_common.h>
 #include <common/container_move_support.h>
 #include <common/range_based_for_support.h>
+#include <common/spin_barrier.h>
+#include <common/state_trackable.h>
+#include <common/test.h>
 #include <common/utils.h>
 #include <common/utils_concurrency_limit.h>
 #include <common/vector_types.h>
-#include <common/concepts_common.h>
+#include <random>
 #include <tbb/concurrent_vector.h>
-#include <tbb/tick_count.h>
-#include <tbb/parallel_reduce.h>
 #include <tbb/parallel_for.h>
-#include <algorithm>
-#include <cmath>
-#include <random>
+#include <tbb/parallel_reduce.h>
+#include <tbb/tick_count.h>
 
 //! \file test_concurrent_vector.cpp
 //! \brief Test for [containers.concurrent_vector] specification
 
 void TestSort() {
-    for( int n=0; n<100; n=n*3+1 ) {
+    for (int n = 0; n < 100; n = n * 3 + 1) {
         tbb::concurrent_vector<int> array(n);
-        for( int i=0; i<n; ++i ){
-            array.at(i) = (i*7)%n;
-        }
-        std::sort( array.begin(), array.end() );
-        for( int i=0; i<n; ++i ){
-            REQUIRE( array[i]==i );
-        }
+        for (int i = 0; i < n; ++i) { array.at(i) = (i * 7) % n; }
+        std::sort(array.begin(), array.end());
+        for (int i = 0; i < n; ++i) { REQUIRE(array[i] == i); }
     }
 }
 
-void TestRangeBasedFor(){
+void TestRangeBasedFor() {
     using namespace range_based_for_support_tests;
 
     using c_vector = tbb::concurrent_vector<int>;
     c_vector a_c_vector;
 
     const int sequence_length = 10;
-    for (int i = 1; i<= sequence_length; ++i){
-        a_c_vector.push_back(i);
-    }
+    for (int i = 1; i <= sequence_length; ++i) { a_c_vector.push_back(i); }
 
-    REQUIRE_MESSAGE( range_based_for_accumulate(a_c_vector, std::plus<int>(), 0) == gauss_summ_of_int_sequence(sequence_length), "incorrect accumulated value generated via range based for ?");
+    REQUIRE_MESSAGE(range_based_for_accumulate(a_c_vector, std::plus<int>(), 0)
+                            == gauss_summ_of_int_sequence(sequence_length),
+                    "incorrect accumulated value generated via range based for ?");
 }
 
 struct default_container_traits {
     template <typename container_type, typename iterator_type>
-    static container_type& construct_container(typename std::aligned_storage<sizeof(container_type)>::type& storage, iterator_type begin, iterator_type end){
+    static container_type&
+    construct_container(typename std::aligned_storage<sizeof(container_type)>::type& storage,
+                        iterator_type begin, iterator_type end) {
         container_type* ptr = reinterpret_cast<container_type*>(&storage);
         new (ptr) container_type(begin, end);
         return *ptr;
     }
 
     template <typename container_type, typename iterator_type, typename allocator_type>
-    static container_type& construct_container(typename std::aligned_storage<sizeof(container_type)>::type& storage, iterator_type begin, iterator_type end, allocator_type const& a){
+    static container_type&
+    construct_container(typename std::aligned_storage<sizeof(container_type)>::type& storage,
+                        iterator_type begin, iterator_type end, allocator_type const& a) {
         container_type* ptr = reinterpret_cast<container_type*>(&storage);
         new (ptr) container_type(begin, end, a);
         return *ptr;
@@ -89,88 +89,86 @@ struct c_vector_type : default_container_traits {
     using container_value_type = T;
 
     using init_iterator_type = move_support_tests::FooIterator;
-    template<typename element_type, typename allocator_type>
-    struct apply{
-        using type = tbb::concurrent_vector<element_type,  allocator_type >;
+    template <typename element_type, typename allocator_type>
+    struct apply {
+        using type = tbb::concurrent_vector<element_type, allocator_type>;
     };
 
-    enum{ expected_number_of_items_to_allocate_for_steal_move = 0 };
+    enum { expected_number_of_items_to_allocate_for_steal_move = 0 };
 
-    template<typename element_type, typename allocator_type, typename iterator>
-    static bool equal(tbb::concurrent_vector<element_type, allocator_type > const& c, iterator begin, iterator end){
-        bool equal_sizes = (size_t)std::distance(begin, end) == c.size();
-        return  equal_sizes && std::equal(c.begin(), c.end(), begin);
+    template <typename element_type, typename allocator_type, typename iterator>
+    static bool equal(tbb::concurrent_vector<element_type, allocator_type> const& c, iterator begin,
+                      iterator end) {
+        bool equal_sizes = (size_t) std::distance(begin, end) == c.size();
+        return equal_sizes && std::equal(c.begin(), c.end(), begin);
     }
 };
 
-void TestSerialGrowByWithMoveIterators(){
+void TestSerialGrowByWithMoveIterators() {
     using fixture_t = move_support_tests::DefaultStatefulFixtureHelper<c_vector_type>::type;
     using vector_t = fixture_t::container_type;
 
     fixture_t fixture;
 
     vector_t dst(fixture.dst_allocator);
-    dst.grow_by(std::make_move_iterator(fixture.source.begin()), std::make_move_iterator(fixture.source.end()));
+    dst.grow_by(std::make_move_iterator(fixture.source.begin()),
+                std::make_move_iterator(fixture.source.end()));
 
     fixture.verify_content_deep_moved(dst);
 }
 
 #if HAVE_m128 || HAVE_m256
 
-template<typename ClassWithVectorType>
+template <typename ClassWithVectorType>
 void TestVectorTypes() {
     tbb::concurrent_vector<ClassWithVectorType> v;
-    for( int i = 0; i < 100; ++i ) {
+    for (int i = 0; i < 100; ++i) {
         // VC8 does not properly align a temporary value; to work around, use explicit variable
         ClassWithVectorType foo(i);
         v.push_back(foo);
-        for( int j=0; j<i; ++j ) {
+        for (int j = 0; j < i; ++j) {
             ClassWithVectorType bar(j);
-            REQUIRE( v[j]==bar );
+            REQUIRE(v[j] == bar);
         }
     }
 }
 #endif /* HAVE_m128 | HAVE_m256 */
 
-
 static tbb::concurrent_vector<std::size_t> Primes;
 
 class FindPrimes {
-    bool is_prime( std::size_t val ) const {
+    bool is_prime(std::size_t val) const {
         int limit, factor = 3;
-        if( val<5u )
-            return val==2;
+        if (val < 5u) return val == 2;
         else {
-            limit = long(sqrtf(float(val))+0.5f);
-            while( factor<=limit && val % factor )
-                ++factor;
-            return factor>limit;
+            limit = long(sqrtf(float(val)) + 0.5f);
+            while (factor <= limit && val % factor) ++factor;
+            return factor > limit;
         }
     }
+
 public:
-    void operator()( const std::size_t idx ) const {
-        if( idx % 2 && is_prime(idx) ) {
-            Primes.push_back( idx );
-        }
+    void operator()(const std::size_t idx) const {
+        if (idx % 2 && is_prime(idx)) { Primes.push_back(idx); }
     }
 };
 
-double TimeFindPrimes( std::size_t nthread ) {
+double TimeFindPrimes(std::size_t nthread) {
     Primes.clear();
     const std::size_t count = 1048576;
     Primes.reserve(count);// TODO: or compact()?
     tbb::tick_count t0 = tbb::tick_count::now();
     std::size_t block_size = count / nthread;
-    utils::NativeParallelFor(count, block_size, FindPrimes() );
+    utils::NativeParallelFor(count, block_size, FindPrimes());
     tbb::tick_count t1 = tbb::tick_count::now();
-    return (t1-t0).seconds();
+    return (t1 - t0).seconds();
 }
 
 void TestFindPrimes() {
     // Time fully subscribed run.
 
     // TimeFindPrimes( tbb::task_scheduler_init::automatic );
-    double t2 = TimeFindPrimes( utils::get_platform_max_threads() );
+    double t2 = TimeFindPrimes(utils::get_platform_max_threads());
 
     // Time parallel run that is very likely oversubscribed.
 #if TBB_TEST_LOW_WORKLOAD
@@ -184,21 +182,22 @@ void TestFindPrimes() {
     // Theoretically, following test will fail on machine with >X processors.
     // But that situation is not going to come up in the near future,
     // and the generalization to fix the issue is not worth the trouble.
-    WARN_MESSAGE( tx <= 1.3*t2, "Warning: grow_by is pathetically slow");
+    WARN_MESSAGE(tx <= 1.3 * t2, "Warning: grow_by is pathetically slow");
     INFO("t2 == " << t2 << " tx == " << tx << "k == " << tx / t2);
 }
 
 template <typename Type, typename Allocator>
 class test_grow_by_and_resize {
-    tbb::concurrent_vector<Type, Allocator> &my_c;
+    tbb::concurrent_vector<Type, Allocator>& my_c;
+
 public:
-    test_grow_by_and_resize( tbb::concurrent_vector<Type, Allocator> &c ) : my_c(c) {}
+    test_grow_by_and_resize(tbb::concurrent_vector<Type, Allocator>& c) : my_c(c) {}
     void operator()() const {
         const typename tbb::concurrent_vector<Type, Allocator>::size_type sz = my_c.size();
-        my_c.grow_by( 5 );
-        REQUIRE( my_c.size() == sz + 5 );
-        my_c.resize( sz );
-        REQUIRE( my_c.size() == sz );
+        my_c.grow_by(5);
+        REQUIRE(my_c.size() == sz + 5);
+        my_c.resize(sz);
+        REQUIRE(my_c.size() == sz);
     }
 };
 
@@ -255,147 +254,154 @@ void test_scoped_allocator() {
     allocator_data_type::deactivate();
 }
 
-template <bool default_construction_present> struct do_default_construction_test {
-    template<typename FuncType> void operator() ( FuncType func ) const { func(); }
+template <bool default_construction_present>
+struct do_default_construction_test {
+    template <typename FuncType>
+    void operator()(FuncType func) const {
+        func();
+    }
 };
-template <> struct do_default_construction_test<false> {
-    template<typename FuncType> void operator()( FuncType ) const {}
+template <>
+struct do_default_construction_test<false> {
+    template <typename FuncType>
+    void operator()(FuncType) const {}
 };
 
 template <typename Type, typename Allocator>
-void CompareVectors( const tbb::concurrent_vector<Type, Allocator> &c1, const tbb::concurrent_vector<Type, Allocator> &c2 ) {
-    REQUIRE( (!(c1 == c2) && c1 != c2) );
-    REQUIRE( (c1 <= c2 && c1 < c2 && c2 >= c1 && c2 > c1) );
+void CompareVectors(const tbb::concurrent_vector<Type, Allocator>& c1,
+                    const tbb::concurrent_vector<Type, Allocator>& c2) {
+    REQUIRE((!(c1 == c2) && c1 != c2));
+    REQUIRE((c1 <= c2 && c1 < c2 && c2 >= c1 && c2 > c1));
 }
 
 template <typename Type, typename Allocator>
-void CompareVectors( const tbb::concurrent_vector<std::weak_ptr<Type>, Allocator> &, const tbb::concurrent_vector<std::weak_ptr<Type>, Allocator> & ) {
+void CompareVectors(const tbb::concurrent_vector<std::weak_ptr<Type>, Allocator>&,
+                    const tbb::concurrent_vector<std::weak_ptr<Type>, Allocator>&) {
     /* do nothing for std::weak_ptr */
 }
 
 template <bool default_construction_present, typename Type, typename Allocator>
-void Examine( tbb::concurrent_vector<Type, Allocator> c, const std::vector<Type> &vec ) {
+void Examine(tbb::concurrent_vector<Type, Allocator> c, const std::vector<Type>& vec) {
     using vector_t = tbb::concurrent_vector<Type, Allocator>;
     using size_type_t = typename vector_t::size_type;
 
-
-    REQUIRE( c.size() == vec.size() );
-    for ( size_type_t i=0; i<c.size(); ++i ) {
-        REQUIRE( utils::IsEqual()(c[i], vec[i]) );
-    }
-    do_default_construction_test<default_construction_present>()(test_grow_by_and_resize<Type,Allocator>(c));
-    c.grow_by( size_type_t(5), c[0] );
-    c.grow_to_at_least( c.size()+5, c.at(0) );
+    REQUIRE(c.size() == vec.size());
+    for (size_type_t i = 0; i < c.size(); ++i) { REQUIRE(utils::IsEqual()(c[i], vec[i])); }
+    do_default_construction_test<default_construction_present>()(test_grow_by_and_resize<Type, Allocator>(c));
+    c.grow_by(size_type_t(5), c[0]);
+    c.grow_to_at_least(c.size() + 5, c.at(0));
     vector_t c2;
-    c2.reserve( 5 );
-    std::copy( c.begin(), c.begin() + 5, std::back_inserter( c2 ) );
+    c2.reserve(5);
+    std::copy(c.begin(), c.begin() + 5, std::back_inserter(c2));
 
-    c.grow_by( c2.begin(), c2.end() );
+    c.grow_by(c2.begin(), c2.end());
     const vector_t& cvcr = c;
-    REQUIRE( utils::IsEqual()(cvcr.front(), *(c2.rend()-1)) );
-    REQUIRE( utils::IsEqual()(cvcr.back(), *c2.rbegin()));
-    REQUIRE( utils::IsEqual()(*c.cbegin(), *(c.crend()-1)) );
-    REQUIRE( utils::IsEqual()(*(c.cend()-1), *c.crbegin()) );
-    c.swap( c2 );
-    REQUIRE( c.size() == 5 );
-    CompareVectors( c, c2 );
-    c.swap( c2 );
+    REQUIRE(utils::IsEqual()(cvcr.front(), *(c2.rend() - 1)));
+    REQUIRE(utils::IsEqual()(cvcr.back(), *c2.rbegin()));
+    REQUIRE(utils::IsEqual()(*c.cbegin(), *(c.crend() - 1)));
+    REQUIRE(utils::IsEqual()(*(c.cend() - 1), *c.crbegin()));
+    c.swap(c2);
+    REQUIRE(c.size() == 5);
+    CompareVectors(c, c2);
+    c.swap(c2);
     c2.clear();
-    REQUIRE( c2.size() == 0 );
+    REQUIRE(c2.size() == 0);
     c2.shrink_to_fit();
     Allocator a = c.get_allocator();
-    a.deallocate( a.allocate(1), 1 );
+    a.deallocate(a.allocate(1), 1);
 }
 
 template <typename Type>
 class test_default_construction {
-    const std::vector<Type> &my_vec;
+    const std::vector<Type>& my_vec;
+
 public:
-    test_default_construction( const std::vector<Type> &vec ) : my_vec(vec) {}
+    test_default_construction(const std::vector<Type>& vec) : my_vec(vec) {}
     void operator()() const {
         // Construction with initial size specified by argument n.
-        tbb::concurrent_vector<Type> c7( my_vec.size() );
-        std::copy( my_vec.begin(), my_vec.end(), c7.begin() );
-        Examine</*default_construction_present = */true>( c7, my_vec );
-        tbb::concurrent_vector< Type, std::allocator<Type> > c8( my_vec.size() );
-        std::copy( c7.begin(), c7.end(), c8.begin() );
-        Examine</*default_construction_present = */true>( c8, my_vec );
+        tbb::concurrent_vector<Type> c7(my_vec.size());
+        std::copy(my_vec.begin(), my_vec.end(), c7.begin());
+        Examine</*default_construction_present = */ true>(c7, my_vec);
+        tbb::concurrent_vector<Type, std::allocator<Type>> c8(my_vec.size());
+        std::copy(c7.begin(), c7.end(), c8.begin());
+        Examine</*default_construction_present = */ true>(c8, my_vec);
     }
 };
 
 template <bool default_construction_present, typename Type>
-void TypeTester( const std::vector<Type> &vec ) {
-    __TBB_ASSERT( vec.size() >= 5, "Array should have at least 5 elements" );
+void TypeTester(const std::vector<Type>& vec) {
+    __TBB_ASSERT(vec.size() >= 5, "Array should have at least 5 elements");
     // Construct empty vector.
     tbb::concurrent_vector<Type> c1;
-    std::copy( vec.begin(), vec.end(), std::back_inserter(c1) );
-    Examine<default_construction_present>( c1, vec );
+    std::copy(vec.begin(), vec.end(), std::back_inserter(c1));
+    Examine<default_construction_present>(c1, vec);
     // Constructor from initializer_list.
-    tbb::concurrent_vector<Type> c2({vec[0],vec[1],vec[2]});
-    std::copy( vec.begin()+3, vec.end(), std::back_inserter(c2) );
-    Examine<default_construction_present>( c2, vec );
+    tbb::concurrent_vector<Type> c2({vec[0], vec[1], vec[2]});
+    std::copy(vec.begin() + 3, vec.end(), std::back_inserter(c2));
+    Examine<default_construction_present>(c2, vec);
     // Copying constructor.
     tbb::concurrent_vector<Type> c3(c1);
-    Examine<default_construction_present>( c3, vec );
+    Examine<default_construction_present>(c3, vec);
     // Construct with non-default allocator
-    tbb::concurrent_vector< Type, std::allocator<Type> > c4;
-    std::copy( vec.begin(), vec.end(), std::back_inserter(c4) );
-    Examine<default_construction_present>( c4, vec );
+    tbb::concurrent_vector<Type, std::allocator<Type>> c4;
+    std::copy(vec.begin(), vec.end(), std::back_inserter(c4));
+    Examine<default_construction_present>(c4, vec);
     // Construction with initial size specified by argument n.
     do_default_construction_test<default_construction_present>()(test_default_construction<Type>(vec));
     // Construction with initial size specified by argument n, initialization by copying of t, and given allocator instance.
     std::allocator<Type> allocator;
-    tbb::concurrent_vector< Type, std::allocator<Type> > c9(vec.size(), vec[1], allocator);
-    Examine<default_construction_present>( c9, std::vector<Type>(vec.size(), vec[1]) );
+    tbb::concurrent_vector<Type, std::allocator<Type>> c9(vec.size(), vec[1], allocator);
+    Examine<default_construction_present>(c9, std::vector<Type>(vec.size(), vec[1]));
     // Construction with copying iteration range and given allocator instance.
-    tbb::concurrent_vector< Type, std::allocator<Type> > c10(c1.begin(), c1.end(), allocator);
-    Examine<default_construction_present>( c10, vec );
+    tbb::concurrent_vector<Type, std::allocator<Type>> c10(c1.begin(), c1.end(), allocator);
+    Examine<default_construction_present>(c10, vec);
     tbb::concurrent_vector<Type> c11(vec.begin(), vec.end());
-    Examine<default_construction_present>( c11, vec );
+    Examine<default_construction_present>(c11, vec);
 }
 
 void TestTypes() {
     const int NUMBER = 100;
 
     std::vector<int> intArr;
-    for ( int i=0; i<NUMBER; ++i ) intArr.push_back(i);
-    TypeTester</*default_construction_present = */true>( intArr );
+    for (int i = 0; i < NUMBER; ++i) intArr.push_back(i);
+    TypeTester</*default_construction_present = */ true>(intArr);
 
-    std::vector< std::reference_wrapper<int> > refArr;
+    std::vector<std::reference_wrapper<int>> refArr;
     // The constructor of std::reference_wrapper<T> from T& is explicit in some versions of libstdc++.
-    for ( int i=0; i<NUMBER; ++i ) refArr.push_back( std::reference_wrapper<int>(intArr[i]) );
-    TypeTester</*default_construction_present = */false>( refArr );
+    for (int i = 0; i < NUMBER; ++i) refArr.push_back(std::reference_wrapper<int>(intArr[i]));
+    TypeTester</*default_construction_present = */ false>(refArr);
 
     // std::vector< std::atomic<int> > tbbIntArr( NUMBER ); //TODO compilation error
     // for ( int i=0; i<NUMBER; ++i ) tbbIntArr[i] = i;
     // TypeTester</*default_construction_present = */true>( tbbIntArr );
 
-    std::vector< std::shared_ptr<int> > shrPtrArr;
-    for ( int i=0; i<NUMBER; ++i ) shrPtrArr.push_back( std::make_shared<int>(i) );
-    TypeTester</*default_construction_present = */true>( shrPtrArr );
+    std::vector<std::shared_ptr<int>> shrPtrArr;
+    for (int i = 0; i < NUMBER; ++i) shrPtrArr.push_back(std::make_shared<int>(i));
+    TypeTester</*default_construction_present = */ true>(shrPtrArr);
 
-    std::vector< std::weak_ptr<int> > wkPtrArr;
-    std::copy( shrPtrArr.begin(), shrPtrArr.end(), std::back_inserter(wkPtrArr) );
-    TypeTester</*default_construction_present = */true>( wkPtrArr );
+    std::vector<std::weak_ptr<int>> wkPtrArr;
+    std::copy(shrPtrArr.begin(), shrPtrArr.end(), std::back_inserter(wkPtrArr));
+    TypeTester</*default_construction_present = */ true>(wkPtrArr);
 }
 
 template <typename Vector>
-void test_grow_by_empty_range( Vector &v, typename Vector::value_type* range_begin_end ) {
+void test_grow_by_empty_range(Vector& v, typename Vector::value_type* range_begin_end) {
     const Vector v_copy = v;
-    REQUIRE_MESSAGE( (v.grow_by( range_begin_end, range_begin_end ) == v.end()), "grow_by(empty_range) returned a wrong iterator." );
-    REQUIRE_MESSAGE( v == v_copy, "grow_by(empty_range) has changed the vector." );
+    REQUIRE_MESSAGE((v.grow_by(range_begin_end, range_begin_end) == v.end()),
+                    "grow_by(empty_range) returned a wrong iterator.");
+    REQUIRE_MESSAGE(v == v_copy, "grow_by(empty_range) has changed the vector.");
 }
 
-void TestSerialGrowByRange( bool fragmented_vector ) {
+void TestSerialGrowByRange(bool fragmented_vector) {
     tbb::concurrent_vector<int> v;
-    if ( fragmented_vector ) {
-        v.reserve( 1 );
-    }
-    int init_range[] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 };
-    REQUIRE_MESSAGE( (v.grow_by( init_range, init_range + (utils::array_length( init_range )) ) == v.begin()), "grow_by(I,I) returned a wrong iterator." );
-    REQUIRE_MESSAGE( std::equal( v.begin(), v.end(), init_range ), "grow_by(I,I) did not properly copied all elements ?" );
-    test_grow_by_empty_range( v, init_range );
-    test_grow_by_empty_range( v, (int*)nullptr );
+    if (fragmented_vector) { v.reserve(1); }
+    int init_range[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
+    REQUIRE_MESSAGE((v.grow_by(init_range, init_range + (utils::array_length(init_range))) == v.begin()),
+                    "grow_by(I,I) returned a wrong iterator.");
+    REQUIRE_MESSAGE(std::equal(v.begin(), v.end(), init_range),
+                    "grow_by(I,I) did not properly copied all elements ?");
+    test_grow_by_empty_range(v, init_range);
+    test_grow_by_empty_range(v, (int*) nullptr);
 }
 
 template <typename allocator_type>
@@ -405,7 +411,7 @@ void TestConcurrentOperationsWithUnSafeOperations(std::size_t threads_number) {
     vector_type vector;
 
     constexpr std::size_t max_operations = 1000;
-    std::atomic<int> curr_unsafe_thread{-1};
+    std::atomic<int> curr_unsafe_thread {-1};
     // 0 - is safe operations
     // 1 - is shrink_to_fit
     // 2 - is clear + shrink_to_fit
@@ -418,7 +424,7 @@ void TestConcurrentOperationsWithUnSafeOperations(std::size_t threads_number) {
     }
 
     // Array of active threads
-    std::unique_ptr<std::atomic<int>[]> active_threads{ new std::atomic<int>[threads_number]() };
+    std::unique_ptr<std::atomic<int>[]> active_threads { new std::atomic<int>[threads_number]() };
     // If thread still have i < max_operations than in array will be false
     // When some thread finish it operation, set true in active_thread on thread_id position and start executing only safe operations
     // Than wait all threads
@@ -431,7 +437,7 @@ void TestConcurrentOperationsWithUnSafeOperations(std::size_t threads_number) {
     };
 
     // Need double synchronization to correct work
-    std::unique_ptr<std::atomic<int>[]> ready_threads{ new std::atomic<int>[threads_number]() };
+    std::unique_ptr<std::atomic<int>[]> ready_threads { new std::atomic<int>[threads_number]() };
     auto all_ready_leave = [&ready_threads, threads_number] {
         for (std::size_t i = 0; i < threads_number; ++i) {
             if (ready_threads[i].load(std::memory_order_relaxed) == 0) return false;
@@ -441,8 +447,7 @@ void TestConcurrentOperationsWithUnSafeOperations(std::size_t threads_number) {
 
     utils::SpinBarrier barrier(threads_number);
     auto concurrent_func = [&operations, &vector, &curr_unsafe_thread, &barrier, &all_done, &active_threads,
-                            &all_ready_leave, &ready_threads] (std::size_t thread_id)
-    {
+                            &all_ready_leave, &ready_threads](std::size_t thread_id) {
         std::vector<std::size_t> local_operations(operations);
         utils::FastRandom<> rand(thread_id);
         // std::shuffle doesn't work with msvc2017 and FastRandom
@@ -455,34 +460,28 @@ void TestConcurrentOperationsWithUnSafeOperations(std::size_t threads_number) {
         do {
             if (all_done()) ready_threads[thread_id] = 1;
             if (curr_unsafe_thread.load() != -1) {
-                    // If lock taken, wait
-                    // First wait unblock unsafe thread
-                    // Second wait finish unsafe operations
-                    barrier.wait();
-                    barrier.wait();
+                // If lock taken, wait
+                // First wait unblock unsafe thread
+                // Second wait finish unsafe operations
+                barrier.wait();
+                barrier.wait();
             }
             // Is safe operation
             if (active_threads[thread_id] == 1 || local_operations[i] == 0) {
                 // If lock is free, perform various operations
                 std::size_t random_operation = rand.get() % 3;
                 switch (random_operation) {
-                    case 0:
-                        {
-                            vector.push_back(1);
-                        }
-                        break;
-                    case 1:
-                        {
-                            std::size_t grow_size = rand.get() % 100;
-                            vector.grow_by(grow_size, 1);
-                        }
-                        break;
-                    case 2:
-                        {
-                            std::size_t grow_at_least_size = vector.size() + rand.get() % 100;
-                            vector.grow_to_at_least(grow_at_least_size, 1);
-                        }
-                        break;
+                    case 0: {
+                        vector.push_back(1);
+                    } break;
+                    case 1: {
+                        std::size_t grow_size = rand.get() % 100;
+                        vector.grow_by(grow_size, 1);
+                    } break;
+                    case 2: {
+                        std::size_t grow_at_least_size = vector.size() + rand.get() % 100;
+                        vector.grow_to_at_least(grow_at_least_size, 1);
+                    } break;
                 }
             } else {
                 int default_unsafe_thread = -1;
@@ -493,17 +492,13 @@ void TestConcurrentOperationsWithUnSafeOperations(std::size_t threads_number) {
                         case 1:
                             vector.shrink_to_fit();
                             break;
-                        case 2:
-                            {
-                                vector.clear();
-                                vector.shrink_to_fit();
-                            }
-                            break;
-                        case 3:
-                            {
-                                vector.resize(0);
-                            }
-                            break;
+                        case 2: {
+                            vector.clear();
+                            vector.shrink_to_fit();
+                        } break;
+                        case 3: {
+                            vector.resize(0);
+                        } break;
                     }
                     curr_unsafe_thread = -1;
                     barrier.wait();
@@ -522,42 +517,34 @@ void TestConcurrentOperationsWithUnSafeOperations(std::size_t threads_number) {
 
 template <typename RangeType>
 int reduce_vector(RangeType test_range) {
-    return tbb::parallel_reduce(test_range, 0,
-        [] ( const RangeType& range, int sum ) {
-            for (auto it = range.begin(); it != range.end(); ++it) {
-                sum += *it;
-            }
-
-            return sum;
-        },
-        [] ( const int& lhs, const int& rhs) {
-            return lhs + rhs;
-        }
-    );
+    return tbb::parallel_reduce(
+            test_range, 0,
+            [](const RangeType& range, int sum) {
+                for (auto it = range.begin(); it != range.end(); ++it) { sum += *it; }
+
+                return sum;
+            },
+            [](const int& lhs, const int& rhs) { return lhs + rhs; });
 }
 
 //! Test the grow_by on range
 //! \brief \ref interface \ref requirement
-TEST_CASE("testing serial grow_by range"){
-    TestSerialGrowByRange(/*fragmented_vector = */false);
-    TestSerialGrowByRange(/*fragmented_vector = */true);
+TEST_CASE("testing serial grow_by range") {
+    TestSerialGrowByRange(/*fragmented_vector = */ false);
+    TestSerialGrowByRange(/*fragmented_vector = */ true);
 }
 
 //! Test of push_back operation
 //! \brief \ref interface
-TEST_CASE("testing range based for support"){
-    TestRangeBasedFor();
-}
+TEST_CASE("testing range based for support") { TestRangeBasedFor(); }
 
 //! Test of work STL algorithms  with concurrent_vector iterator.
 //! \brief \ref interface
-TEST_CASE("testing sort"){
-    TestSort();
-}
+TEST_CASE("testing sort") { TestSort(); }
 
 //! Test concurrent_vector with vector types
 //! \brief \ref error_guessing
-TEST_CASE("testing concurrent_vector with vector types"){
+TEST_CASE("testing concurrent_vector with vector types") {
 #if HAVE_m128
     TestVectorTypes<ClassWithSSE>();
 #endif
@@ -568,21 +555,15 @@ TEST_CASE("testing concurrent_vector with vector types"){
 
 //! Test concurrent push_back operation
 //! \brief \ref error_guessing
-TEST_CASE("testing find primes"){
-    TestFindPrimes();
-}
+TEST_CASE("testing find primes") { TestFindPrimes(); }
 
 //! Test concurrent_vector with std::scoped_allocator_adaptor
 //! \brief \ref error_guessing
-TEST_CASE("test concurrent_vector with std::scoped_allocator_adaptor") {
-    test_scoped_allocator();
-}
+TEST_CASE("test concurrent_vector with std::scoped_allocator_adaptor") { test_scoped_allocator(); }
 
 //! Test type of vector
 //! \brief \ref requirement
-TEST_CASE("testing types"){
-    TestTypes();
-}
+TEST_CASE("testing types") { TestTypes(); }
 
 //! Test concurrent and unsafe operations
 //! \brief \ref regression \ref error_guessing
@@ -594,9 +575,9 @@ TEST_CASE("Work without hang") {
         allocator_type::init_counters();
         TestConcurrentOperationsWithUnSafeOperations<allocator_type>(threads);
 
-        REQUIRE( allocator_type::allocations == allocator_type::frees );
-        REQUIRE( allocator_type::items_allocated == allocator_type::items_freed );
-        REQUIRE( allocator_type::items_constructed == allocator_type::items_destroyed );
+        REQUIRE(allocator_type::allocations == allocator_type::frees);
+        REQUIRE(allocator_type::items_allocated == allocator_type::items_freed);
+        REQUIRE(allocator_type::items_constructed == allocator_type::items_destroyed);
     }
 }
 
@@ -615,11 +596,9 @@ TEST_CASE("Whitebox test for segment table extension") {
         allocator_type::set_limits(std::size_t(1) << (i + 1));
 
         try {
-            for (std::size_t j = 0; j < std::size_t(1) << i; ++j) {
-                vector.push_back(1);
-            }
+            for (std::size_t j = 0; j < std::size_t(1) << i; ++j) { vector.push_back(1); }
             vector.grow_by(1000);
-        } catch (std::bad_alloc& ) {
+        } catch (std::bad_alloc&) {
             allocator_type::set_limits();
             vector_type copy_of_vector(vector);
             vector_type copy_of_copy(copy_of_vector);
@@ -639,28 +618,34 @@ TEST_CASE("Test exception in constructors") {
 
     allocator_type::set_limits(1);
 
-    REQUIRE_THROWS_AS( [] {
-        vector_type vec1(42, 42.);
-        utils::suppress_unused_warning(vec1);
-    }(), const std::bad_alloc);
-
-    auto list = { 42., 42., 42., 42., 42., 42., 42., 42., 42., 42. };
-    REQUIRE_THROWS_AS( [&] {
-        vector_type vec2(list.begin(), list.end());
-        utils::suppress_unused_warning(vec2);
-    }(), const std::bad_alloc);
+    REQUIRE_THROWS_AS(
+            [] {
+                vector_type vec1(42, 42.);
+                utils::suppress_unused_warning(vec1);
+            }(),
+            const std::bad_alloc);
+
+    auto list = {42., 42., 42., 42., 42., 42., 42., 42., 42., 42.};
+    REQUIRE_THROWS_AS(
+            [&] {
+                vector_type vec2(list.begin(), list.end());
+                utils::suppress_unused_warning(vec2);
+            }(),
+            const std::bad_alloc);
 
     allocator_type::init_counters();
     allocator_type::set_limits(0);
     vector_type src_vec(42, 42.);
     allocator_type::set_limits(1);
 
-    REQUIRE_THROWS_AS( [&] {
-        vector_type vec3(src_vec, allocator_type{});
-        utils::suppress_unused_warning(vec3);
-    }(), const std::bad_alloc);
+    REQUIRE_THROWS_AS(
+            [&] {
+                vector_type vec3(src_vec, allocator_type {});
+                utils::suppress_unused_warning(vec3);
+            }(),
+            const std::bad_alloc);
 }
-#endif // TBB_USE_EXCEPTIONS
+#endif// TBB_USE_EXCEPTIONS
 
 //! \brief \ref regression \ref error_guessing
 TEST_CASE("Reducing concurrent_vector") {
@@ -672,13 +657,12 @@ TEST_CASE("Reducing concurrent_vector") {
     CHECK(reduce_vector(cvec.range()) == final_sum);
 }
 
-
 //! \brief \ref error_guessing
-TEST_CASE("swap with not always equal allocators"){
+TEST_CASE("swap with not always equal allocators") {
     using allocator_type = NotAlwaysEqualAllocator<int>;
     using vector_type = tbb::concurrent_vector<int, allocator_type>;
 
-    vector_type vec1{};
+    vector_type vec1 {};
     vector_type vec2(42, 42);
 
     swap(vec1, vec2);
@@ -693,8 +677,8 @@ TEST_CASE("swap with not always equal allocators"){
 // or fail with the assertion in debug mode.
 //! \brief \ref regression
 TEST_CASE("Testing vector in a highly concurrent environment") {
-    std::uniform_int_distribution<> uniform_dist(1, 32); // grow by from 1 to 32 randomly
-    std::mt19937_64 gen(/*seed*/1); // Constructing with seed to have reproducible results
+    std::uniform_int_distribution<> uniform_dist(1, 32);// grow by from 1 to 32 randomly
+    std::mt19937_64 gen(/*seed*/ 1);                    // Constructing with seed to have reproducible results
     constexpr int num_repeats = 10000, num_inserts = 256;
     std::vector<int> grow_by_vals(num_inserts);
 
@@ -709,19 +693,15 @@ TEST_CASE("Testing vector in a highly concurrent environment") {
                       });
 
         tbb::concurrent_vector<int> test_vec;
-        tbb::parallel_for(0, num_inserts, [&] (int j) {
+        tbb::parallel_for(0, num_inserts, [&](int j) {
             tbb::concurrent_vector<int>::iterator start_it = test_vec.grow_by(grow_by_vals[j]);
             tbb::concurrent_vector<int>::iterator end_it = start_it + grow_by_vals[j];
-            do {
-                *start_it = grow_by_vals[j];
-            } while (++start_it != end_it);
+            do { *start_it = grow_by_vals[j]; } while (++start_it != end_it);
         });
 
         REQUIRE(test_vec.size() == expected_size);
         int actual_sum = 0;
-        for (int j = 0; j < expected_size; ++j) {
-            actual_sum += test_vec[j];
-        }
+        for (int j = 0; j < expected_size; ++j) { actual_sum += test_vec[j]; }
         REQUIRE(expected_sum == actual_sum);
     }
 }
@@ -732,7 +712,7 @@ TEST_CASE("container_range concept for concurrent_vector ranges") {
     static_assert(test_concepts::container_range<typename tbb::concurrent_vector<int>::range_type>);
     static_assert(test_concepts::container_range<typename tbb::concurrent_vector<int>::const_range_type>);
 }
-#endif // __TBB_CPP20_CONCEPTS_PRESENT
+#endif// __TBB_CPP20_CONCEPTS_PRESENT
 
 // There was a bug in concurrent_vector that was reproduced when resize marked
 // segment (that owned by my_first_block) as deleted and
@@ -744,30 +724,22 @@ TEST_CASE("testing resize on sequantual mode") {
 
     v.resize(382);
     CHECK(v.size() == 382);
-    while (v.size() < 737) {
-        v.emplace_back();
-    }
+    while (v.size() < 737) { v.emplace_back(); }
     CHECK(v.size() == 737);
 
     v.resize(27);
     CHECK(v.size() == 27);
-    while (v.size() < 737) {
-        v.emplace_back();
-    }
+    while (v.size() < 737) { v.emplace_back(); }
     CHECK(v.size() == 737);
 
     v.resize(1);
     CHECK(v.size() == 1);
-    while (v.size() < 40) {
-        v.emplace_back();
-    }
+    while (v.size() < 40) { v.emplace_back(); }
     CHECK(v.size() == 40);
 
     v.resize(2222);
     CHECK(v.size() == 2222);
-    while (v.size() < 4444) {
-        v.emplace_back();
-    }
+    while (v.size() < 4444) { v.emplace_back(); }
     CHECK(v.size() == 4444);
 
     v.clear();
diff --git a/external/tbb/test/tbb/test_continue_node.cpp b/external/tbb/test/tbb/test_continue_node.cpp
index 1cfea3df..28e3cb7a 100644
--- a/external/tbb/test/tbb/test_continue_node.cpp
+++ b/external/tbb/test/tbb/test_continue_node.cpp
@@ -18,187 +18,170 @@
 
 #include "tbb/flow_graph.h"
 
-#include "common/test.h"
-#include "common/utils.h"
+#include "common/concepts_common.h"
 #include "common/graph_utils.h"
+#include "common/test.h"
 #include "common/test_follows_and_precedes_api.h"
-#include "common/concepts_common.h"
-
+#include "common/utils.h"
 
 //! \file test_continue_node.cpp
 //! \brief Test for [flow_graph.continue_node] specification
 
-
 #define N 1000
 #define MAX_NODES 4
 #define C 8
 
 // A class to use as a fake predecessor of continue_node
-struct fake_continue_sender : public tbb::flow::sender<tbb::flow::continue_msg>
-{
+struct fake_continue_sender : public tbb::flow::sender<tbb::flow::continue_msg> {
     typedef tbb::flow::sender<tbb::flow::continue_msg>::successor_type successor_type;
     // Define implementations of virtual methods that are abstract in the base class
-    bool register_successor( successor_type& ) override { return false; }
-    bool remove_successor( successor_type& )   override { return false; }
+    bool register_successor(successor_type&) override { return false; }
+    bool remove_successor(successor_type&) override { return false; }
 };
 
-template< typename InputType >
+template <typename InputType>
 struct parallel_puts {
 
-    tbb::flow::receiver< InputType > * const my_exe_node;
+    tbb::flow::receiver<InputType>* const my_exe_node;
 
-    parallel_puts( tbb::flow::receiver< InputType > &exe_node ) : my_exe_node(&exe_node) {}
+    parallel_puts(tbb::flow::receiver<InputType>& exe_node) : my_exe_node(&exe_node) {}
     parallel_puts& operator=(const parallel_puts&) = delete;
 
-    void operator()( int ) const  {
-        for ( int i = 0; i < N; ++i ) {
+    void operator()(int) const {
+        for (int i = 0; i < N; ++i) {
             // the nodes will accept all puts
-            CHECK_MESSAGE( my_exe_node->try_put( InputType() ) == true, "" );
+            CHECK_MESSAGE(my_exe_node->try_put(InputType()) == true, "");
         }
     }
-
 };
 
-template< typename OutputType >
-void run_continue_nodes( int p, tbb::flow::graph& g, tbb::flow::continue_node< OutputType >& n ) {
+template <typename OutputType>
+void run_continue_nodes(int p, tbb::flow::graph& g, tbb::flow::continue_node<OutputType>& n) {
     fake_continue_sender fake_sender;
-    for (size_t i = 0; i < N; ++i) {
-        tbb::detail::d2::register_predecessor(n, fake_sender);
-    }
+    for (size_t i = 0; i < N; ++i) { tbb::detail::d2::register_predecessor(n, fake_sender); }
 
-    for (size_t num_receivers = 1; num_receivers <= MAX_NODES; ++num_receivers ) {
-        std::vector< std::shared_ptr<harness_counting_receiver<OutputType>> > receivers;
+    for (size_t num_receivers = 1; num_receivers <= MAX_NODES; ++num_receivers) {
+        std::vector<std::shared_ptr<harness_counting_receiver<OutputType>>> receivers;
         for (size_t i = 0; i < num_receivers; ++i) {
-            receivers.push_back( std::make_shared<harness_counting_receiver<OutputType>>(g) );
+            receivers.push_back(std::make_shared<harness_counting_receiver<OutputType>>(g));
         }
         harness_graph_executor<tbb::flow::continue_msg, OutputType>::execute_count = 0;
 
-        for (size_t r = 0; r < num_receivers; ++r ) {
-            tbb::flow::make_edge( n, *receivers[r] );
-        }
+        for (size_t r = 0; r < num_receivers; ++r) { tbb::flow::make_edge(n, *receivers[r]); }
 
-        utils::NativeParallelFor( p, parallel_puts<tbb::flow::continue_msg>(n) );
+        utils::NativeParallelFor(p, parallel_puts<tbb::flow::continue_msg>(n));
         g.wait_for_all();
 
         // 2) the nodes will receive puts from multiple predecessors simultaneously,
         size_t ec = harness_graph_executor<tbb::flow::continue_msg, OutputType>::execute_count;
-        CHECK_MESSAGE( (int)ec == p, "" );
-        for (size_t r = 0; r < num_receivers; ++r ) {
+        CHECK_MESSAGE((int) ec == p, "");
+        for (size_t r = 0; r < num_receivers; ++r) {
             size_t c = receivers[r]->my_count;
             // 3) the nodes will send to multiple successors.
-            CHECK_MESSAGE( (int)c == p, "" );
+            CHECK_MESSAGE((int) c == p, "");
         }
 
-        for (size_t r = 0; r < num_receivers; ++r ) {
-            tbb::flow::remove_edge( n, *receivers[r] );
-        }
+        for (size_t r = 0; r < num_receivers; ++r) { tbb::flow::remove_edge(n, *receivers[r]); }
     }
 }
 
-template< typename OutputType, typename Body >
-void continue_nodes( Body body ) {
-    for (int p = 1; p < 2*4/*MaxThread*/; ++p) {
+template <typename OutputType, typename Body>
+void continue_nodes(Body body) {
+    for (int p = 1; p < 2 * 4 /*MaxThread*/; ++p) {
         tbb::flow::graph g;
-        tbb::flow::continue_node< OutputType > exe_node( g, body );
-        run_continue_nodes( p, g, exe_node);
+        tbb::flow::continue_node<OutputType> exe_node(g, body);
+        run_continue_nodes(p, g, exe_node);
         exe_node.try_put(tbb::flow::continue_msg());
-        tbb::flow::continue_node< OutputType > exe_node_copy( exe_node );
-        run_continue_nodes( p, g, exe_node_copy);
+        tbb::flow::continue_node<OutputType> exe_node_copy(exe_node);
+        run_continue_nodes(p, g, exe_node_copy);
     }
 }
 
 const size_t Offset = 123;
 std::atomic<size_t> global_execute_count;
 
-template< typename OutputType >
+template <typename OutputType>
 struct inc_functor {
 
     std::atomic<size_t> local_execute_count;
-    inc_functor( ) { local_execute_count = 0; }
-    inc_functor( const inc_functor &f ) { local_execute_count = size_t(f.local_execute_count); }
-    void operator=(const inc_functor &f) { local_execute_count = size_t(f.local_execute_count); }
-
-    OutputType operator()( tbb::flow::continue_msg ) {
-       ++global_execute_count;
-       ++local_execute_count;
-       return OutputType();
+    inc_functor() { local_execute_count = 0; }
+    inc_functor(const inc_functor& f) { local_execute_count = size_t(f.local_execute_count); }
+    void operator=(const inc_functor& f) { local_execute_count = size_t(f.local_execute_count); }
+
+    OutputType operator()(tbb::flow::continue_msg) {
+        ++global_execute_count;
+        ++local_execute_count;
+        return OutputType();
     }
-
 };
 
-template< typename OutputType >
-void continue_nodes_with_copy( ) {
+template <typename OutputType>
+void continue_nodes_with_copy() {
 
-    for (int p = 1; p < 2*4/*MaxThread*/; ++p) {
+    for (int p = 1; p < 2 * 4 /*MaxThread*/; ++p) {
         tbb::flow::graph g;
         inc_functor<OutputType> cf;
         cf.local_execute_count = Offset;
         global_execute_count = Offset;
 
-        tbb::flow::continue_node< OutputType > exe_node( g, cf );
+        tbb::flow::continue_node<OutputType> exe_node(g, cf);
         fake_continue_sender fake_sender;
-        for (size_t i = 0; i < N; ++i) {
-            tbb::detail::d2::register_predecessor(exe_node, fake_sender);
-        }
+        for (size_t i = 0; i < N; ++i) { tbb::detail::d2::register_predecessor(exe_node, fake_sender); }
 
-        for (size_t num_receivers = 1; num_receivers <= MAX_NODES; ++num_receivers ) {
-            std::vector< std::shared_ptr<harness_counting_receiver<OutputType>> > receivers;
+        for (size_t num_receivers = 1; num_receivers <= MAX_NODES; ++num_receivers) {
+            std::vector<std::shared_ptr<harness_counting_receiver<OutputType>>> receivers;
             for (size_t i = 0; i < num_receivers; ++i) {
-                receivers.push_back( std::make_shared<harness_counting_receiver<OutputType>>(g) );
+                receivers.push_back(std::make_shared<harness_counting_receiver<OutputType>>(g));
             }
 
-            for (size_t r = 0; r < num_receivers; ++r ) {
-                tbb::flow::make_edge( exe_node, *receivers[r] );
-            }
+            for (size_t r = 0; r < num_receivers; ++r) { tbb::flow::make_edge(exe_node, *receivers[r]); }
 
-            utils::NativeParallelFor( p, parallel_puts<tbb::flow::continue_msg>(exe_node) );
+            utils::NativeParallelFor(p, parallel_puts<tbb::flow::continue_msg>(exe_node));
             g.wait_for_all();
 
             // 2) the nodes will receive puts from multiple predecessors simultaneously,
-            for (size_t r = 0; r < num_receivers; ++r ) {
+            for (size_t r = 0; r < num_receivers; ++r) {
                 size_t c = receivers[r]->my_count;
                 // 3) the nodes will send to multiple successors.
-                CHECK_MESSAGE( (int)c == p, "" );
-            }
-            for (size_t r = 0; r < num_receivers; ++r ) {
-                tbb::flow::remove_edge( exe_node, *receivers[r] );
+                CHECK_MESSAGE((int) c == p, "");
             }
+            for (size_t r = 0; r < num_receivers; ++r) { tbb::flow::remove_edge(exe_node, *receivers[r]); }
         }
 
         // validate that the local body matches the global execute_count and both are correct
-        inc_functor<OutputType> body_copy = tbb::flow::copy_body< inc_functor<OutputType> >( exe_node );
-        const size_t expected_count = p*MAX_NODES + Offset;
+        inc_functor<OutputType> body_copy = tbb::flow::copy_body<inc_functor<OutputType>>(exe_node);
+        const size_t expected_count = p * MAX_NODES + Offset;
         size_t global_count = global_execute_count;
         size_t inc_count = body_copy.local_execute_count;
-        CHECK_MESSAGE( global_count == expected_count, "" );
-        CHECK_MESSAGE( global_count == inc_count, "" );
+        CHECK_MESSAGE(global_count == expected_count, "");
+        CHECK_MESSAGE(global_count == inc_count, "");
         g.reset(tbb::flow::rf_reset_bodies);
-        body_copy = tbb::flow::copy_body< inc_functor<OutputType> >( exe_node );
+        body_copy = tbb::flow::copy_body<inc_functor<OutputType>>(exe_node);
         inc_count = body_copy.local_execute_count;
-        CHECK_MESSAGE( ( Offset == inc_count), "reset(rf_reset_bodies) did not reset functor" );
-
+        CHECK_MESSAGE((Offset == inc_count), "reset(rf_reset_bodies) did not reset functor");
     }
 }
 
-template< typename OutputType >
+template <typename OutputType>
 void run_continue_nodes() {
-    harness_graph_executor< tbb::flow::continue_msg, OutputType>::max_executors = 0;
-    continue_nodes<OutputType>( []( tbb::flow::continue_msg i ) -> OutputType { return harness_graph_executor<tbb::flow::continue_msg, OutputType>::func(i); } );
-    continue_nodes<OutputType>( &harness_graph_executor<tbb::flow::continue_msg, OutputType>::func );
-    continue_nodes<OutputType>( typename harness_graph_executor<tbb::flow::continue_msg, OutputType>::functor() );
+    harness_graph_executor<tbb::flow::continue_msg, OutputType>::max_executors = 0;
+    continue_nodes<OutputType>([](tbb::flow::continue_msg i) -> OutputType {
+        return harness_graph_executor<tbb::flow::continue_msg, OutputType>::func(i);
+    });
+    continue_nodes<OutputType>(&harness_graph_executor<tbb::flow::continue_msg, OutputType>::func);
+    continue_nodes<OutputType>(
+            typename harness_graph_executor<tbb::flow::continue_msg, OutputType>::functor());
     continue_nodes_with_copy<OutputType>();
 }
 
 //! Tests limited concurrency cases for nodes that accept data messages
 void test_concurrency(int num_threads) {
     tbb::task_arena arena(num_threads);
-    arena.execute(
-        [&] {
-            run_continue_nodes<tbb::flow::continue_msg>();
-            run_continue_nodes<int>();
-            run_continue_nodes<utils::NoAssign>();
-        }
-    );
+    arena.execute([&] {
+        run_continue_nodes<tbb::flow::continue_msg>();
+        run_continue_nodes<int>();
+        run_continue_nodes<utils::NoAssign>();
+    });
 }
 /*
  * Connection of two graphs is not currently supported, but works to some limited extent.
@@ -210,12 +193,12 @@ using namespace tbb::flow;
 
 struct add_to_counter {
     int* counter;
-    add_to_counter(int& var):counter(&var){}
-    void operator()(continue_msg){*counter+=1;}
+    add_to_counter(int& var) : counter(&var) {}
+    void operator()(continue_msg) { *counter += 1; }
 };
 
-void test_two_graphs(){
-    int count=0;
+void test_two_graphs() {
+    int count = 0;
 
     //graph g with broadcast_node and continue_node
     graph g;
@@ -227,46 +210,45 @@ void test_two_graphs(){
     broadcast_node<continue_msg> start_h(h);
 
     //making two edges to first_g from the two graphs
-    make_edge(start_g,first_g);
+    make_edge(start_g, first_g);
     make_edge(start_h, first_g);
 
     //two try_puts from the two graphs
     start_g.try_put(continue_msg());
     start_h.try_put(continue_msg());
     g.wait_for_all();
-    CHECK_MESSAGE( (count==1), "Not all continue messages received");
+    CHECK_MESSAGE((count == 1), "Not all continue messages received");
 
     //two try_puts from the graph that doesn't contain the node
-    count=0;
+    count = 0;
     start_h.try_put(continue_msg());
     start_h.try_put(continue_msg());
     g.wait_for_all();
-    CHECK_MESSAGE( (count==1), "Not all continue messages received -1");
+    CHECK_MESSAGE((count == 1), "Not all continue messages received -1");
 
     //only one try_put
-    count=0;
+    count = 0;
     start_g.try_put(continue_msg());
     g.wait_for_all();
-    CHECK_MESSAGE( (count==0), "Node executed without waiting for all predecessors");
+    CHECK_MESSAGE((count == 0), "Node executed without waiting for all predecessors");
 }
 
 struct lightweight_policy_body {
     const std::thread::id my_thread_id;
     std::atomic<size_t>& my_count;
 
-    lightweight_policy_body( std::atomic<size_t>& count )
-        : my_thread_id(std::this_thread::get_id()), my_count(count)
-    {
+    lightweight_policy_body(std::atomic<size_t>& count)
+        : my_thread_id(std::this_thread::get_id()), my_count(count) {
         my_count = 0;
     }
 
-    lightweight_policy_body( const lightweight_policy_body& ) = default;
-    lightweight_policy_body& operator=( const lightweight_policy_body& ) = delete;
+    lightweight_policy_body(const lightweight_policy_body&) = default;
+    lightweight_policy_body& operator=(const lightweight_policy_body&) = delete;
 
-    void operator()( tbb::flow::continue_msg ) {
+    void operator()(tbb::flow::continue_msg) {
         ++my_count;
         std::thread::id body_thread_id = std::this_thread::get_id();
-        CHECK_MESSAGE( (body_thread_id == my_thread_id), "Body executed as not lightweight");
+        CHECK_MESSAGE((body_thread_id == my_thread_id), "Body executed as not lightweight");
     }
 };
 
@@ -274,22 +256,20 @@ void test_lightweight_policy() {
     tbb::flow::graph g;
     std::atomic<size_t> count1;
     std::atomic<size_t> count2;
-    tbb::flow::continue_node<tbb::flow::continue_msg, tbb::flow::lightweight>
-        node1(g, lightweight_policy_body(count1));
-    tbb::flow::continue_node<tbb::flow::continue_msg, tbb::flow::lightweight>
-        node2(g, lightweight_policy_body(count2));
+    tbb::flow::continue_node<tbb::flow::continue_msg, tbb::flow::lightweight> node1(
+            g, lightweight_policy_body(count1));
+    tbb::flow::continue_node<tbb::flow::continue_msg, tbb::flow::lightweight> node2(
+            g, lightweight_policy_body(count2));
 
     tbb::flow::make_edge(node1, node2);
     const size_t n = 10;
-    for(size_t i = 0; i < n; ++i) {
-        node1.try_put(tbb::flow::continue_msg());
-    }
+    for (size_t i = 0; i < n; ++i) { node1.try_put(tbb::flow::continue_msg()); }
     g.wait_for_all();
 
     lightweight_policy_body body1 = tbb::flow::copy_body<lightweight_policy_body>(node1);
     lightweight_policy_body body2 = tbb::flow::copy_body<lightweight_policy_body>(node2);
-    CHECK_MESSAGE( (body1.my_count == n), "Body of the first node needs to be executed N times");
-    CHECK_MESSAGE( (body2.my_count == n), "Body of the second node needs to be executed N times");
+    CHECK_MESSAGE((body1.my_count == n), "Body of the first node needs to be executed N times");
+    CHECK_MESSAGE((body2.my_count == n), "Body of the second node needs to be executed N times");
 }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
@@ -298,27 +278,23 @@ void test_lightweight_policy() {
 void test_follows_and_precedes_api() {
     using msg_t = tbb::flow::continue_msg;
 
-    std::array<msg_t, 3> messages_for_follows = { { msg_t(), msg_t(), msg_t() } };
-    std::vector<msg_t> messages_for_precedes  = { msg_t() };
+    std::array<msg_t, 3> messages_for_follows = {{msg_t(), msg_t(), msg_t()}};
+    std::vector<msg_t> messages_for_precedes = {msg_t()};
 
     auto pass_through = [](const msg_t& msg) { return msg; };
 
-    follows_and_precedes_testing::test_follows
-        <msg_t, tbb::flow::continue_node<msg_t>>
-        (messages_for_follows, pass_through, node_priority_t(0));
+    follows_and_precedes_testing::test_follows<msg_t, tbb::flow::continue_node<msg_t>>(
+            messages_for_follows, pass_through, node_priority_t(0));
 
-    follows_and_precedes_testing::test_precedes
-        <msg_t, tbb::flow::continue_node<msg_t>>
-        (messages_for_precedes, /* number_of_predecessors = */0, pass_through, node_priority_t(1));
+    follows_and_precedes_testing::test_precedes<msg_t, tbb::flow::continue_node<msg_t>>(
+            messages_for_precedes, /* number_of_predecessors = */ 0, pass_through, node_priority_t(1));
 }
-#endif // __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+#endif// __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 
 // TODO: use pass_through from test_function_node instead
-template<typename T>
+template <typename T>
 struct passing_body {
-    T operator()(const T& val) {
-        return val;
-    }
+    T operator()(const T& val) { return val; }
 };
 
 /*
@@ -358,34 +334,29 @@ void test_successor_cache_specialization() {
 void test_try_put_and_wait_default() {
     tbb::task_arena arena(1);
 
-    arena.execute([&]{
+    arena.execute([&] {
         tbb::flow::graph g;
 
         int processed_items = 0;
 
         tbb::flow::continue_node<tbb::flow::continue_msg>* start_node = nullptr;
 
-        tbb::flow::continue_node<tbb::flow::continue_msg> cont(g,
-            [&](tbb::flow::continue_msg) noexcept {
-                static bool put_ten_msgs = true;
-                if (put_ten_msgs) {
-                    for (std::size_t i = 0; i < 10; ++i) {
-                        start_node->try_put(tbb::flow::continue_msg{});
-                    }
-                    put_ten_msgs = false;
-                }
-            });
+        tbb::flow::continue_node<tbb::flow::continue_msg> cont(g, [&](tbb::flow::continue_msg) noexcept {
+            static bool put_ten_msgs = true;
+            if (put_ten_msgs) {
+                for (std::size_t i = 0; i < 10; ++i) { start_node->try_put(tbb::flow::continue_msg {}); }
+                put_ten_msgs = false;
+            }
+        });
 
         start_node = &cont;
 
-        tbb::flow::continue_node<tbb::flow::continue_msg, tbb::flow::lightweight> writer(g,
-            [&](tbb::flow::continue_msg) noexcept {
-                ++processed_items;
-            });
+        tbb::flow::continue_node<tbb::flow::continue_msg, tbb::flow::lightweight> writer(
+                g, [&](tbb::flow::continue_msg) noexcept { ++processed_items; });
 
         tbb::flow::make_edge(cont, writer);
 
-        cont.try_put_and_wait(tbb::flow::continue_msg{});
+        cont.try_put_and_wait(tbb::flow::continue_msg {});
 
         // Only 1 item should be processed, with the additional 10 items having been spawned
         CHECK_MESSAGE(processed_items == 1, "Unexpected items processing");
@@ -400,7 +371,7 @@ void test_try_put_and_wait_default() {
 void test_try_put_and_wait_lightweight() {
     tbb::task_arena arena(1);
 
-    arena.execute([&]{
+    arena.execute([&] {
         tbb::flow::graph g;
 
         std::vector<int> start_work_items;
@@ -416,35 +387,34 @@ void test_try_put_and_wait_lightweight() {
 
         tbb::flow::continue_node<int, tbb::flow::lightweight>* start_node = nullptr;
 
-        tbb::flow::continue_node<int, tbb::flow::lightweight> cont(g,
-            [&](tbb::flow::continue_msg) noexcept {
-                static int counter = 0;
-                int i = counter++;
-                if (i == wait_message) {
-                    for (auto item : new_work_items) {
-                        (void)item;
-                        start_node->try_put(tbb::flow::continue_msg{});
-                    }
+        tbb::flow::continue_node<int, tbb::flow::lightweight> cont(g, [&](tbb::flow::continue_msg) noexcept {
+            static int counter = 0;
+            int i = counter++;
+            if (i == wait_message) {
+                for (auto item : new_work_items) {
+                    (void) item;
+                    start_node->try_put(tbb::flow::continue_msg {});
                 }
-                return i;
-            });
+            }
+            return i;
+        });
 
         start_node = &cont;
 
-        tbb::flow::function_node<int, int, tbb::flow::lightweight> writer(g, tbb::flow::unlimited,
-            [&](int input) noexcept {
-                processed_items.emplace_back(input);
-                return 0;
-            });
+        tbb::flow::function_node<int, int, tbb::flow::lightweight> writer(
+                g, tbb::flow::unlimited, [&](int input) noexcept {
+                    processed_items.emplace_back(input);
+                    return 0;
+                });
 
         tbb::flow::make_edge(cont, writer);
 
         for (auto item : start_work_items) {
-            (void)item;
-            cont.try_put(tbb::flow::continue_msg{});
+            (void) item;
+            cont.try_put(tbb::flow::continue_msg {});
         }
 
-        cont.try_put_and_wait(tbb::flow::continue_msg{});
+        cont.try_put_and_wait(tbb::flow::continue_msg {});
 
         CHECK_MESSAGE(processed_items.size() == start_work_items.size() + new_work_items.size() + 1,
                       "Unexpected number of elements processed");
@@ -479,41 +449,37 @@ void test_metainfo_buffering() {
 
         tbb::flow::continue_node<tbb::flow::continue_msg>* b_ptr = nullptr;
 
-        tbb::flow::continue_node<tbb::flow::continue_msg> a(g,
-            [&](tbb::flow::continue_msg) noexcept {
-                call_order.push_back('A');
-                static std::once_flag flag; // Send a signal to B only in the first call
-                std::call_once(flag, [&]{ b_ptr->try_put(tbb::flow::continue_msg{}); });
-            });
+        tbb::flow::continue_node<tbb::flow::continue_msg> a(g, [&](tbb::flow::continue_msg) noexcept {
+            call_order.push_back('A');
+            static std::once_flag flag;// Send a signal to B only in the first call
+            std::call_once(flag, [&] { b_ptr->try_put(tbb::flow::continue_msg {}); });
+        });
 
-        tbb::flow::continue_node<tbb::flow::continue_msg> b(g,
-            [&](tbb::flow::continue_msg) noexcept {
-                call_order.push_back('B');
-                a.try_put(tbb::flow::continue_msg{});
-            });
+        tbb::flow::continue_node<tbb::flow::continue_msg> b(g, [&](tbb::flow::continue_msg) noexcept {
+            call_order.push_back('B');
+            a.try_put(tbb::flow::continue_msg {});
+        });
 
         b_ptr = &b;
 
-        tbb::flow::continue_node<tbb::flow::continue_msg, tbb::flow::lightweight> c(g,
-            [&](tbb::flow::continue_msg) noexcept {
-                call_order.push_back('C');
-            });
+        tbb::flow::continue_node<tbb::flow::continue_msg, tbb::flow::lightweight> c(
+                g, [&](tbb::flow::continue_msg) noexcept { call_order.push_back('C'); });
 
         tbb::flow::make_edge(a, c);
         tbb::flow::make_edge(b, c);
 
-        a.try_put_and_wait(tbb::flow::continue_msg{});
+        a.try_put_and_wait(tbb::flow::continue_msg {});
 
         // Inside the first call of A, we send a signal to B.
         // Both of them send signals to C. Since C lightweight, it is processed immediately
         // upon receiving signals from both predecessors. This completes the wait.
-        CHECK(call_order == std::vector<char>{'A', 'B', 'C'});
+        CHECK(call_order == std::vector<char> {'A', 'B', 'C'});
 
         g.wait_for_all();
 
         // B previously sent a signal to A, which has now been processed.
         // A sends a signal to C, which is not processed because no signal is received from B this time.
-        CHECK(call_order == std::vector<char>{'A', 'B', 'C', 'A'});
+        CHECK(call_order == std::vector<char> {'A', 'B', 'C', 'A'});
     });
 }
 
@@ -522,14 +488,12 @@ void test_try_put_and_wait() {
     test_try_put_and_wait_lightweight();
     test_metainfo_buffering();
 }
-#endif // __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+#endif// __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
 
 //! Test concurrent continue_node for correctness
 //! \brief \ref error_guessing
 TEST_CASE("Concurrency testing") {
-    for( unsigned p=utils::MinThread; p<=utils::MaxThread; ++p ) {
-        test_concurrency(p);
-    }
+    for (unsigned p = utils::MinThread; p <= utils::MaxThread; ++p) { test_concurrency(p); }
 }
 
 //! Test concurrent continue_node in separate graphs
@@ -538,19 +502,17 @@ TEST_CASE("Two graphs") { test_two_graphs(); }
 
 //! Test basic behaviour with lightweight body
 //! \brief \ref requirement \ref error_guessing
-TEST_CASE( "Lightweight policy" ) { test_lightweight_policy(); }
+TEST_CASE("Lightweight policy") { test_lightweight_policy(); }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 //! Test deprecated follows and precedes API
 //! \brief \ref error_guessing
-TEST_CASE( "Support for follows and precedes API" ) { test_follows_and_precedes_api(); }
+TEST_CASE("Support for follows and precedes API") { test_follows_and_precedes_api(); }
 #endif
 
 //! Test for successor cache specialization
 //! \brief \ref regression
-TEST_CASE( "Regression for successor cache specialization" ) {
-    test_successor_cache_specialization();
-}
+TEST_CASE("Regression for successor cache specialization") { test_successor_cache_specialization(); }
 
 #if __TBB_CPP20_CONCEPTS_PRESENT
 //! \brief \ref error_guessing
@@ -560,9 +522,9 @@ TEST_CASE("constraints for continue_node input") {
 }
 
 template <typename Input, typename Body>
-concept can_call_continue_node_ctor = requires( tbb::flow::graph& graph, Body body,
-                                                tbb::flow::buffer_node<int>& f, std::size_t num,
-                                                tbb::flow::node_priority_t priority  ) {
+concept can_call_continue_node_ctor
+        = requires(tbb::flow::graph& graph, Body body, tbb::flow::buffer_node<int>& f, std::size_t num,
+                   tbb::flow::node_priority_t priority) {
     tbb::flow::continue_node<Input>(graph, body);
     tbb::flow::continue_node<Input>(graph, body, priority);
     tbb::flow::continue_node<Input>(graph, num, body);
@@ -572,7 +534,7 @@ concept can_call_continue_node_ctor = requires( tbb::flow::graph& graph, Body bo
     tbb::flow::continue_node<Input>(tbb::flow::follows(f), body, priority);
     tbb::flow::continue_node<Input>(tbb::flow::follows(f), num, body);
     tbb::flow::continue_node<Input>(tbb::flow::follows(f), num, body, priority);
-#endif // __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+#endif// __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 };
 
 //! \brief \ref error_guessing
@@ -587,11 +549,9 @@ TEST_CASE("constraints for continue_node body") {
     static_assert(!can_call_continue_node_ctor<output_type, WrongInputOperatorRoundBrackets<output_type>>);
     static_assert(!can_call_continue_node_ctor<output_type, WrongReturnOperatorRoundBrackets<output_type>>);
 }
-#endif // __TBB_CPP20_CONCEPTS_PRESENT
+#endif// __TBB_CPP20_CONCEPTS_PRESENT
 
 #if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
 //! \brief \ref error_guessing
-TEST_CASE("test continue_node try_put_and_wait") {
-    test_try_put_and_wait();
-}
+TEST_CASE("test continue_node try_put_and_wait") { test_try_put_and_wait(); }
 #endif
diff --git a/external/tbb/test/tbb/test_dynamic_link.cpp b/external/tbb/test/tbb/test_dynamic_link.cpp
index 3372eb72..c2486ddf 100644
--- a/external/tbb/test/tbb/test_dynamic_link.cpp
+++ b/external/tbb/test/tbb/test_dynamic_link.cpp
@@ -23,10 +23,7 @@
 
 #include "common/test.h"
 
-enum FOO_TYPE {
-    FOO_DUMMY,
-    FOO_IMPLEMENTATION
-};
+enum FOO_TYPE { FOO_DUMMY, FOO_IMPLEMENTATION };
 
 #if _WIN32 || _WIN64
 #define TEST_EXPORT
@@ -54,23 +51,23 @@ static FOO_TYPE (*foo1_handler)() = &dummy_foo1;
 static FOO_TYPE (*foo2_handler)() = &dummy_foo2;
 
 // Table describing how to link the handlers.
-static const tbb::detail::r1::dynamic_link_descriptor LinkTable[] = {
-    { "foo1", (tbb::detail::r1::pointer_to_handler*)(void*)(&foo1_handler) },
-    { "foo2", (tbb::detail::r1::pointer_to_handler*)(void*)(&foo2_handler) }
-};
+static const tbb::detail::r1::dynamic_link_descriptor LinkTable[]
+        = {{"foo1", (tbb::detail::r1::pointer_to_handler*) (void*) (&foo1_handler)},
+           {"foo2", (tbb::detail::r1::pointer_to_handler*) (void*) (&foo2_handler)}};
 #endif
 
 // The direct include since we want to test internal functionality.
-#include "src/tbb/dynamic_link.cpp"
 #include "common/utils.h"
 #include "common/utils_dynamic_libs.h"
+#include "src/tbb/dynamic_link.cpp"
 
 void test_dynamic_link(const char* lib_name) {
 #if __TBB_DYNAMIC_LOAD_ENABLED
 #if !_WIN32
     // Check if the executable exports its symbols.
-    REQUIRE_MESSAGE((utils::GetAddress(utils::OpenLibrary(nullptr), "foo1") && utils::GetAddress(utils::OpenLibrary(nullptr), "foo2")),
-            "The executable doesn't export its symbols. Is the -rdynamic switch set during linking?");
+    REQUIRE_MESSAGE((utils::GetAddress(utils::OpenLibrary(nullptr), "foo1")
+                     && utils::GetAddress(utils::OpenLibrary(nullptr), "foo2")),
+                    "The executable doesn't export its symbols. Is the -rdynamic switch set during linking?");
 #endif /* !_WIN32 */
     // We want to link (or fail to link) to the symbols available from the
     // executable so it doesn't matter what the library name is specified in
@@ -80,9 +77,10 @@ void test_dynamic_link(const char* lib_name) {
     if (tbb::detail::r1::dynamic_link(lib_name, LinkTable, sizeof(LinkTable) / sizeof(LinkTable[0]))) {
         REQUIRE_MESSAGE((foo1_handler && foo2_handler), "The symbols are corrupted by dynamic_link");
         REQUIRE_MESSAGE((foo1_handler() == FOO_IMPLEMENTATION && foo2_handler() == FOO_IMPLEMENTATION),
-                "dynamic_link returned the successful code but symbol(s) are wrong");
+                        "dynamic_link returned the successful code but symbol(s) are wrong");
     } else {
-        REQUIRE_MESSAGE((foo1_handler == dummy_foo1 && foo2_handler == dummy_foo2), "The symbols are corrupted by dynamic_link");
+        REQUIRE_MESSAGE((foo1_handler == dummy_foo1 && foo2_handler == dummy_foo2),
+                        "The symbols are corrupted by dynamic_link");
     }
 #else
     utils::suppress_unused_warning(lib_name);
@@ -91,12 +89,8 @@ void test_dynamic_link(const char* lib_name) {
 
 //! Testing dynamic_link with non-existing library
 //! \brief \ref error_guessing
-TEST_CASE("Test dynamic_link with non-existing library") {
-    test_dynamic_link("tbb_unrealNAME.so");
-}
+TEST_CASE("Test dynamic_link with non-existing library") { test_dynamic_link("tbb_unrealNAME.so"); }
 
 //! Testing dynamic_link
 //! \brief \ref error_guessing
-TEST_CASE("Test dynamic_link") {
-    test_dynamic_link("");
-}
+TEST_CASE("Test dynamic_link") { test_dynamic_link(""); }
diff --git a/external/tbb/test/tbb/test_eh_algorithms.cpp b/external/tbb/test/tbb/test_eh_algorithms.cpp
index 7a2b59b4..620d4eae 100644
--- a/external/tbb/test/tbb/test_eh_algorithms.cpp
+++ b/external/tbb/test/tbb/test_eh_algorithms.cpp
@@ -14,37 +14,37 @@
     limitations under the License.
 */
 
-#include "common/test.h"
 #include "common/concurrency_tracker.h"
 #include "common/iterator.h"
+#include "common/test.h"
 #include "common/utils_concurrency_limit.h"
 
-#include <limits.h> // for INT_MAX
+#include <limits.h>// for INT_MAX
 #include <thread>
 #include <vector>
 
+#include "tbb/blocked_range.h"
+#include "tbb/concurrent_unordered_map.h"
+#include "tbb/global_control.h"
 #include "tbb/parallel_for.h"
-#include "tbb/parallel_reduce.h"
 #include "tbb/parallel_for_each.h"
 #include "tbb/parallel_pipeline.h"
-#include "tbb/blocked_range.h"
-#include "tbb/task_group.h"
-#include "tbb/concurrent_unordered_map.h"
+#include "tbb/parallel_reduce.h"
 #include "tbb/task.h"
-#include "tbb/global_control.h"
+#include "tbb/task_group.h"
 
 //! \file test_eh_algorithms.cpp
 //! \brief Test for [algorithms.parallel_for algorithms.parallel_reduce algorithms.parallel_deterministic_reduce algorithms.parallel_for_each algorithms.parallel_pipeline algorithms.parallel_pipeline.flow_control] specifications
 
-#define FLAT_RANGE  100000
-#define FLAT_GRAIN  100
-#define OUTER_RANGE  100
-#define OUTER_GRAIN  10
-#define INNER_RANGE  (FLAT_RANGE / OUTER_RANGE)
-#define INNER_GRAIN  (FLAT_GRAIN / OUTER_GRAIN)
+#define FLAT_RANGE 100000
+#define FLAT_GRAIN 100
+#define OUTER_RANGE 100
+#define OUTER_GRAIN 10
+#define INNER_RANGE (FLAT_RANGE / OUTER_RANGE)
+#define INNER_GRAIN (FLAT_GRAIN / OUTER_GRAIN)
 
 struct context_specific_counter {
-    tbb::concurrent_unordered_map<tbb::task_group_context*, std::atomic<unsigned>> context_map{};
+    tbb::concurrent_unordered_map<tbb::task_group_context*, std::atomic<unsigned>> context_map {};
 
     void increment() {
         tbb::task_group_context* ctx = tbb::task::current_context();
@@ -52,20 +52,18 @@ struct context_specific_counter {
         context_map[ctx]++;
     }
 
-    void reset() {
-        context_map.clear();
-    }
+    void reset() { context_map.clear(); }
 
     void validate(unsigned expected_count, const char* msg) {
         for (auto it = context_map.begin(); it != context_map.end(); it++) {
-            REQUIRE_MESSAGE( it->second <= expected_count, msg);
+            REQUIRE_MESSAGE(it->second <= expected_count, msg);
         }
     }
 };
 
-std::atomic<intptr_t> g_FedTasksCount{}; // number of tasks added by parallel_for_each feeder
-std::atomic<intptr_t> g_OuterParCalls{};  // number of actual invocations of the outer construct executed.
-context_specific_counter g_TGCCancelled{};  // Number of times a task sees its group cancelled at start
+std::atomic<intptr_t> g_FedTasksCount {};  // number of tasks added by parallel_for_each feeder
+std::atomic<intptr_t> g_OuterParCalls {};  // number of actual invocations of the outer construct executed.
+context_specific_counter g_TGCCancelled {};// Number of times a task sees its group cancelled at start
 
 #include "common/exception_handling.h"
 
@@ -100,8 +98,8 @@ __ Test control variables
       g_ExecutedAtFirstCatch -- value of g_CurExecuted when first catch is made, 0 if none.
   *********************************/
 
-inline void ResetGlobals (  bool throwException = true, bool flog = false ) {
-    ResetEhGlobals( throwException, flog );
+inline void ResetGlobals(bool throwException = true, bool flog = false) {
+    ResetEhGlobals(throwException, flog);
     g_FedTasksCount = 0;
     g_OuterParCalls = 0;
     g_NestedPipelines = false;
@@ -116,78 +114,79 @@ typedef size_t count_type;
 typedef tbb::blocked_range<count_type> range_type;
 
 inline intptr_t CountSubranges(range_type r) {
-    if(!r.is_divisible()) return intptr_t(1);
-    range_type r2(r,tbb::split());
+    if (!r.is_divisible()) return intptr_t(1);
+    range_type r2(r, tbb::split());
     return CountSubranges(r) + CountSubranges(r2);
 }
 
-inline intptr_t NumSubranges ( intptr_t length, intptr_t grain ) {
-    return CountSubranges(range_type(0,length,grain));
+inline intptr_t NumSubranges(intptr_t length, intptr_t grain) {
+    return CountSubranges(range_type(0, length, grain));
 }
 
-template<class Body>
-intptr_t TestNumSubrangesCalculation ( intptr_t length, intptr_t grain, intptr_t inner_length, intptr_t inner_grain ) {
+template <class Body>
+intptr_t TestNumSubrangesCalculation(intptr_t length, intptr_t grain, intptr_t inner_length,
+                                     intptr_t inner_grain) {
     ResetGlobals();
     g_ThrowException = false;
-    intptr_t outerCalls = NumSubranges(length, grain),
-             innerCalls = NumSubranges(inner_length, inner_grain),
+    intptr_t outerCalls = NumSubranges(length, grain), innerCalls = NumSubranges(inner_length, inner_grain),
              maxExecuted = outerCalls * (innerCalls + 1);
-    tbb::parallel_for( range_type(0, length, grain), Body() );
-    REQUIRE_MESSAGE (g_CurExecuted == maxExecuted, "Wrong estimation of bodies invocation count");
+    tbb::parallel_for(range_type(0, length, grain), Body());
+    REQUIRE_MESSAGE(g_CurExecuted == maxExecuted, "Wrong estimation of bodies invocation count");
     return maxExecuted;
 }
 
 class NoThrowParForBody {
 public:
-    void operator()( const range_type& r ) const {
-        if(g_Master == std::this_thread::get_id()) g_MasterExecuted = true;
-        else g_NonMasterExecuted = true;
-        if( tbb::is_current_task_group_canceling() ) g_TGCCancelled.increment();
+    void operator()(const range_type& r) const {
+        if (g_Master == std::this_thread::get_id()) g_MasterExecuted = true;
+        else
+            g_NonMasterExecuted = true;
+        if (tbb::is_current_task_group_canceling()) g_TGCCancelled.increment();
         utils::doDummyWork(r.size());
     }
 };
 
 #if TBB_USE_EXCEPTIONS
 
-void Test0 () {
+void Test0() {
     ResetGlobals();
     tbb::simple_partitioner p;
-    for( size_t i=0; i<10; ++i ) {
-        tbb::parallel_for( range_type(0, 0, 1), NoThrowParForBody() );
-        tbb::parallel_for( range_type(0, 0, 1), NoThrowParForBody(), p );
-        tbb::parallel_for( range_type(0, 128, 8), NoThrowParForBody() );
-        tbb::parallel_for( range_type(0, 128, 8), NoThrowParForBody(), p );
+    for (size_t i = 0; i < 10; ++i) {
+        tbb::parallel_for(range_type(0, 0, 1), NoThrowParForBody());
+        tbb::parallel_for(range_type(0, 0, 1), NoThrowParForBody(), p);
+        tbb::parallel_for(range_type(0, 128, 8), NoThrowParForBody());
+        tbb::parallel_for(range_type(0, 128, 8), NoThrowParForBody(), p);
     }
-} // void Test0 ()
+}// void Test0 ()
 
 //! Template that creates a functor suitable for parallel_reduce from a functor for parallel_for.
-template<typename ParForBody>
+template <typename ParForBody>
 class SimpleParReduceBody {
     ParForBody m_Body;
+
 public:
     void operator=(const SimpleParReduceBody&) = delete;
     SimpleParReduceBody(const SimpleParReduceBody&) = default;
     SimpleParReduceBody() = default;
 
-    void operator()( const range_type& r ) const { m_Body(r); }
-    SimpleParReduceBody( SimpleParReduceBody& left, tbb::split ) : m_Body(left.m_Body) {}
-    void join( SimpleParReduceBody& /*right*/ ) {}
-}; // SimpleParReduceBody
+    void operator()(const range_type& r) const { m_Body(r); }
+    SimpleParReduceBody(SimpleParReduceBody& left, tbb::split) : m_Body(left.m_Body) {}
+    void join(SimpleParReduceBody& /*right*/) {}
+};// SimpleParReduceBody
 
 //! Test parallel_for and parallel_reduce for a given partitioner.
 /** The Body need only be suitable for a parallel_for. */
-template<typename ParForBody, typename Partitioner>
+template <typename ParForBody, typename Partitioner>
 void TestParallelLoopAux() {
     Partitioner partitioner;
-    for( int i=0; i<2; ++i ) {
+    for (int i = 0; i < 2; ++i) {
         ResetGlobals();
         TRY();
-            if( i==0 )
-                tbb::parallel_for( range_type(0, FLAT_RANGE, FLAT_GRAIN), ParForBody(), partitioner );
-            else {
-                SimpleParReduceBody<ParForBody> rb;
-                tbb::parallel_reduce( range_type(0, FLAT_RANGE, FLAT_GRAIN), rb, partitioner );
-            }
+        if (i == 0) tbb::parallel_for(range_type(0, FLAT_RANGE, FLAT_GRAIN), ParForBody(), partitioner);
+        else {
+            SimpleParReduceBody<ParForBody> rb;
+            tbb::parallel_reduce(range_type(0, FLAT_RANGE, FLAT_GRAIN), rb, partitioner);
+        }
         CATCH_AND_ASSERT();
         // two cases: g_SolitaryException and !g_SolitaryException
         //   1) g_SolitaryException: only one thread actually threw.  There is only one context, so the exception
@@ -203,27 +202,29 @@ void TestParallelLoopAux() {
         // If a thread throws in a context, more than one subsequent task body may see the
         // cancelled state (if they are scheduled before the state is propagated.) this is
         // infrequent, but it occurs.  So what was to be an assertion must be a remark.
-        g_TGCCancelled.validate( g_NumThreads, "Too many tasks ran after exception thrown");
-        REQUIRE_MESSAGE(g_CurExecuted <= g_ExecutedAtLastCatch + g_NumThreads, "Too many tasks survived exception");
-        if ( g_SolitaryException ) {
+        g_TGCCancelled.validate(g_NumThreads, "Too many tasks ran after exception thrown");
+        REQUIRE_MESSAGE(g_CurExecuted <= g_ExecutedAtLastCatch + g_NumThreads,
+                        "Too many tasks survived exception");
+        if (g_SolitaryException) {
             REQUIRE_MESSAGE(g_NumExceptionsCaught == 1, "No try_blocks in any body expected in this test");
-            REQUIRE_MESSAGE(g_NumExceptionsCaught == (g_ExceptionInMaster ? g_MasterExecutedThrow : g_NonMasterExecutedThrow),
-                "Not all throws were caught");
+            REQUIRE_MESSAGE(
+                    g_NumExceptionsCaught
+                            == (g_ExceptionInMaster ? g_MasterExecutedThrow : g_NonMasterExecutedThrow),
+                    "Not all throws were caught");
             REQUIRE_MESSAGE(g_ExecutedAtFirstCatch == g_ExecutedAtLastCatch, "Too many exceptions occurred");
-        }
-        else {
+        } else {
             REQUIRE_MESSAGE(g_NumExceptionsCaught >= 1, "No try blocks in any body expected in this test");
         }
     }
-}  // TestParallelLoopAux
+}// TestParallelLoopAux
 
 //! Test with parallel_for and parallel_reduce, over all three kinds of partitioners.
 /** The Body only needs to be suitable for tbb::parallel_for. */
-template<typename Body>
+template <typename Body>
 void TestParallelLoop() {
     // The simple and auto partitioners should be const, but not the affinity partitioner.
-    TestParallelLoopAux<Body, const tbb::simple_partitioner  >();
-    TestParallelLoopAux<Body, const tbb::auto_partitioner    >();
+    TestParallelLoopAux<Body, const tbb::simple_partitioner>();
+    TestParallelLoopAux<Body, const tbb::auto_partitioner>();
 #define __TBB_TEMPORARILY_DISABLED 1
 #if !__TBB_TEMPORARILY_DISABLED
     // TODO: Improve the test so that it tolerates delayed start of tasks with affinity_partitioner
@@ -238,12 +239,13 @@ class SimpleParForBody {
     SimpleParForBody(const SimpleParForBody&) = default;
     SimpleParForBody() = default;
 
-    void operator()( const range_type& r ) const {
+    void operator()(const range_type& r) const {
         utils::ConcurrencyTracker ct;
         ++g_CurExecuted;
-        if(g_Master == std::this_thread::get_id()) g_MasterExecuted = true;
-        else g_NonMasterExecuted = true;
-        if( tbb::is_current_task_group_canceling() ) g_TGCCancelled.increment();
+        if (g_Master == std::this_thread::get_id()) g_MasterExecuted = true;
+        else
+            g_NonMasterExecuted = true;
+        if (tbb::is_current_task_group_canceling()) g_TGCCancelled.increment();
         utils::doDummyWork(r.size());
         WaitUntilConcurrencyPeaks();
         ThrowTestException(1);
@@ -253,17 +255,17 @@ class SimpleParForBody {
 void Test1() {
     // non-nested parallel_for/reduce with throwing body, one context
     TestParallelLoop<SimpleParForBody>();
-} // void Test1 ()
+}// void Test1 ()
 
 class OuterParForBody {
 public:
     void operator=(const OuterParForBody&) = delete;
     OuterParForBody(const OuterParForBody&) = default;
     OuterParForBody() = default;
-    void operator()( const range_type& ) const {
+    void operator()(const range_type&) const {
         utils::ConcurrencyTracker ct;
         ++g_OuterParCalls;
-        tbb::parallel_for( tbb::blocked_range<size_t>(0, INNER_RANGE, INNER_GRAIN), SimpleParForBody() );
+        tbb::parallel_for(tbb::blocked_range<size_t>(0, INNER_RANGE, INNER_GRAIN), SimpleParForBody());
     }
 };
 
@@ -272,16 +274,15 @@ class OuterParForBody {
     exceptions thrown from the inner parallel_for are not handled by the caller
     (outer parallel_for body) in this test, they will cancel all the sibling inner
     algorithms. **/
-void Test2 () {
-    TestParallelLoop<OuterParForBody>();
-} // void Test2 ()
+void Test2() { TestParallelLoop<OuterParForBody>(); }// void Test2 ()
 
 class OuterParForBodyWithIsolatedCtx {
 public:
-    void operator()( const range_type& ) const {
+    void operator()(const range_type&) const {
         tbb::task_group_context ctx(tbb::task_group_context::isolated);
         ++g_OuterParCalls;
-        tbb::parallel_for( tbb::blocked_range<size_t>(0, INNER_RANGE, INNER_GRAIN), SimpleParForBody(), tbb::simple_partitioner(), ctx );
+        tbb::parallel_for(tbb::blocked_range<size_t>(0, INNER_RANGE, INNER_GRAIN), SimpleParForBody(),
+                          tbb::simple_partitioner(), ctx);
     }
 };
 
@@ -291,20 +292,20 @@ class OuterParForBodyWithIsolatedCtx {
     already running because of the isolated contexts. However because the first
     exception cancels the root parallel_for only the first g_NumThreads subranges
     will be processed (which launch inner parallel_fors) **/
-void Test3 () {
+void Test3() {
     ResetGlobals();
     typedef OuterParForBodyWithIsolatedCtx body_type;
-    intptr_t  innerCalls = NumSubranges(INNER_RANGE, INNER_GRAIN),
-            // we expect one thread to throw without counting, the rest to run to completion
+    intptr_t innerCalls = NumSubranges(INNER_RANGE, INNER_GRAIN),
+             // we expect one thread to throw without counting, the rest to run to completion
             // this formula assumes g_numThreads outer pfor ranges will be started, but that is not the
             // case; the SimpleParFor subranges are started up as part of the outer ones, and when
             // the amount of concurrency reaches g_NumThreads no more outer Pfor ranges are started.
             // so we have to count the number of outer Pfors actually started.
             minExecuted = (g_NumThreads - 1) * innerCalls;
     TRY();
-        tbb::parallel_for( range_type(0, OUTER_RANGE, OUTER_GRAIN), body_type() );
+    tbb::parallel_for(range_type(0, OUTER_RANGE, OUTER_GRAIN), body_type());
     CATCH_AND_ASSERT();
-    minExecuted = (g_OuterParCalls - 1) * innerCalls;  // see above
+    minExecuted = (g_OuterParCalls - 1) * innerCalls;// see above
 
     // The first formula above assumes all ranges of the outer parallel for are executed, and one
     // cancels.  In the event, we have a smaller number of ranges that start before the exception
@@ -319,27 +320,32 @@ void Test3 () {
     // In either case, once the outer pfor gets the exception it will stop executing further ranges.
 
     // if the only threads executing were not allowed to throw, then not seeing an exception is okay.
-    bool okayNoExceptionsCaught = (g_ExceptionInMaster && !g_MasterExecuted) || (!g_ExceptionInMaster && !g_NonMasterExecuted);
-    if ( g_SolitaryException ) {
+    bool okayNoExceptionsCaught
+            = (g_ExceptionInMaster && !g_MasterExecuted) || (!g_ExceptionInMaster && !g_NonMasterExecuted);
+    if (g_SolitaryException) {
         g_TGCCancelled.validate(g_NumThreads, "Too many tasks survived exception");
-        REQUIRE_MESSAGE (g_CurExecuted > minExecuted, "Too few tasks survived exception");
-        REQUIRE_MESSAGE ((g_CurExecuted <= minExecuted + (g_ExecutedAtLastCatch + g_NumThreads)), "Too many tasks survived exception");
-        REQUIRE_MESSAGE ((g_NumExceptionsCaught == 1 || okayNoExceptionsCaught), "No try_blocks in any body expected in this test");
-    }
-    else {
-        REQUIRE_MESSAGE ((g_CurExecuted <= g_ExecutedAtLastCatch + g_NumThreads), "Too many tasks survived exception");
-        REQUIRE_MESSAGE ((g_NumExceptionsCaught >= 1 || okayNoExceptionsCaught), "No try_blocks in any body expected in this test");
-    }
-} // void Test3 ()
+        REQUIRE_MESSAGE(g_CurExecuted > minExecuted, "Too few tasks survived exception");
+        REQUIRE_MESSAGE((g_CurExecuted <= minExecuted + (g_ExecutedAtLastCatch + g_NumThreads)),
+                        "Too many tasks survived exception");
+        REQUIRE_MESSAGE((g_NumExceptionsCaught == 1 || okayNoExceptionsCaught),
+                        "No try_blocks in any body expected in this test");
+    } else {
+        REQUIRE_MESSAGE((g_CurExecuted <= g_ExecutedAtLastCatch + g_NumThreads),
+                        "Too many tasks survived exception");
+        REQUIRE_MESSAGE((g_NumExceptionsCaught >= 1 || okayNoExceptionsCaught),
+                        "No try_blocks in any body expected in this test");
+    }
+}// void Test3 ()
 
 class OuterParForExceptionSafeBody {
 public:
-    void operator()( const range_type& ) const {
+    void operator()(const range_type&) const {
         tbb::task_group_context ctx(tbb::task_group_context::isolated);
         ++g_OuterParCalls;
         TRY();
-            tbb::parallel_for( tbb::blocked_range<size_t>(0, INNER_RANGE, INNER_GRAIN), SimpleParForBody(), tbb::simple_partitioner(), ctx );
-        CATCH();  // this macro sets g_ExceptionCaught
+        tbb::parallel_for(tbb::blocked_range<size_t>(0, INNER_RANGE, INNER_GRAIN), SimpleParForBody(),
+                          tbb::simple_partitioner(), ctx);
+        CATCH();// this macro sets g_ExceptionCaught
     }
 };
 
@@ -347,44 +353,49 @@ class OuterParForExceptionSafeBody {
 /** Since exception(s) thrown from the inner parallel_for are handled by the caller
     in this test, they do not affect neither other tasks of the the root parallel_for
     nor sibling inner algorithms. **/
-void Test4 () {
-    ResetGlobals( true, true );
-    intptr_t  innerCalls = NumSubranges(INNER_RANGE, INNER_GRAIN),
-              outerCalls = NumSubranges(OUTER_RANGE, OUTER_GRAIN);
+void Test4() {
+    ResetGlobals(true, true);
+    intptr_t innerCalls = NumSubranges(INNER_RANGE, INNER_GRAIN),
+             outerCalls = NumSubranges(OUTER_RANGE, OUTER_GRAIN);
     TRY();
-        tbb::parallel_for( range_type(0, OUTER_RANGE, OUTER_GRAIN), OuterParForExceptionSafeBody() );
+    tbb::parallel_for(range_type(0, OUTER_RANGE, OUTER_GRAIN), OuterParForExceptionSafeBody());
     CATCH();
     // g_SolitaryException  : one inner pfor will throw, the rest will execute to completion.
     //                        so the count should be (outerCalls -1) * innerCalls, if a throw happened.
     // !g_SolitaryException : possible multiple inner pfor throws.  Should be approximately
     //                        (outerCalls - g_NumExceptionsCaught) * innerCalls, give or take a few
-    intptr_t  minExecuted = (outerCalls - g_NumExceptionsCaught) * innerCalls;
-    bool okayNoExceptionsCaught = (g_ExceptionInMaster && !g_MasterExecuted) || (!g_ExceptionInMaster && !g_NonMasterExecuted);
-    if ( g_SolitaryException ) {
+    intptr_t minExecuted = (outerCalls - g_NumExceptionsCaught) * innerCalls;
+    bool okayNoExceptionsCaught
+            = (g_ExceptionInMaster && !g_MasterExecuted) || (!g_ExceptionInMaster && !g_NonMasterExecuted);
+    if (g_SolitaryException) {
         // only one task had exception thrown. That task had at least one execution (the one that threw).
         // There may be an arbitrary number of ranges executed after the throw but before the exception
         // is caught in the scheduler and cancellation is signaled.  (seen 9, 11 and 62 (!) for 8 threads)
-        REQUIRE_MESSAGE ((g_NumExceptionsCaught == 1 || okayNoExceptionsCaught), "No exception registered");
-        REQUIRE_MESSAGE (g_CurExecuted >= minExecuted, "Too few tasks executed");
+        REQUIRE_MESSAGE((g_NumExceptionsCaught == 1 || okayNoExceptionsCaught), "No exception registered");
+        REQUIRE_MESSAGE(g_CurExecuted >= minExecuted, "Too few tasks executed");
         g_TGCCancelled.validate(g_NumThreads, "Too many tasks survived exception");
         // a small number of threads can execute in a throwing sub-pfor, if the task which is
         // to do the solitary throw swaps out after registering its intent to throw but before it
         // actually does so. As a result, the number of extra tasks cannot exceed the number of thread
         // for each nested pfor invication)
-        REQUIRE_MESSAGE (g_CurExecuted <= minExecuted + (g_ExecutedAtLastCatch + g_NumThreads), "Too many tasks survived exception");
-    }
-    else {
-        REQUIRE_MESSAGE (((g_NumExceptionsCaught >= 1 && g_NumExceptionsCaught <= outerCalls) || okayNoExceptionsCaught), "Unexpected actual number of exceptions");
-        REQUIRE_MESSAGE (g_CurExecuted >= minExecuted, "Too few executed tasks reported");
-        REQUIRE_MESSAGE ((g_CurExecuted <= g_ExecutedAtLastCatch + g_NumThreads), "Too many tasks survived multiple exceptions");
-        REQUIRE_MESSAGE (g_CurExecuted <= outerCalls * (1 + g_NumThreads), "Too many tasks survived exception");
-    }
-} // void Test4 ()
+        REQUIRE_MESSAGE(g_CurExecuted <= minExecuted + (g_ExecutedAtLastCatch + g_NumThreads),
+                        "Too many tasks survived exception");
+    } else {
+        REQUIRE_MESSAGE(((g_NumExceptionsCaught >= 1 && g_NumExceptionsCaught <= outerCalls)
+                         || okayNoExceptionsCaught),
+                        "Unexpected actual number of exceptions");
+        REQUIRE_MESSAGE(g_CurExecuted >= minExecuted, "Too few executed tasks reported");
+        REQUIRE_MESSAGE((g_CurExecuted <= g_ExecutedAtLastCatch + g_NumThreads),
+                        "Too many tasks survived multiple exceptions");
+        REQUIRE_MESSAGE(g_CurExecuted <= outerCalls * (1 + g_NumThreads),
+                        "Too many tasks survived exception");
+    }
+}// void Test4 ()
 
 //! Testing parallel_for and parallel_reduce exception handling
 //! \brief \ref error_guessing
 TEST_CASE("parallel_for and parallel_reduce exception handling test #0") {
-    for (auto concurrency_level: utils::concurrency_range()) {
+    for (auto concurrency_level : utils::concurrency_range()) {
         g_NumThreads = static_cast<int>(concurrency_level);
         g_Master = std::this_thread::get_id();
         if (g_NumThreads > 1) {
@@ -405,7 +416,7 @@ TEST_CASE("parallel_for and parallel_reduce exception handling test #0") {
 //! Testing parallel_for and parallel_reduce exception handling
 //! \brief \ref error_guessing
 TEST_CASE("parallel_for and parallel_reduce exception handling test #1") {
-    for (auto concurrency_level: utils::concurrency_range()) {
+    for (auto concurrency_level : utils::concurrency_range()) {
         g_NumThreads = static_cast<int>(concurrency_level);
         g_Master = std::this_thread::get_id();
         if (g_NumThreads > 1) {
@@ -426,7 +437,7 @@ TEST_CASE("parallel_for and parallel_reduce exception handling test #1") {
 //! Testing parallel_for and parallel_reduce exception handling
 //! \brief \ref error_guessing
 TEST_CASE("parallel_for and parallel_reduce exception handling test #2") {
-    for (auto concurrency_level: utils::concurrency_range()) {
+    for (auto concurrency_level : utils::concurrency_range()) {
         g_NumThreads = static_cast<int>(concurrency_level);
         g_Master = std::this_thread::get_id();
         if (g_NumThreads > 1) {
@@ -447,7 +458,7 @@ TEST_CASE("parallel_for and parallel_reduce exception handling test #2") {
 //! Testing parallel_for and parallel_reduce exception handling
 //! \brief \ref error_guessing
 TEST_CASE("parallel_for and parallel_reduce exception handling test #3") {
-    for (auto concurrency_level: utils::concurrency_range()) {
+    for (auto concurrency_level : utils::concurrency_range()) {
         g_NumThreads = static_cast<int>(concurrency_level);
         g_Master = std::this_thread::get_id();
         if (g_NumThreads > 1) {
@@ -468,7 +479,7 @@ TEST_CASE("parallel_for and parallel_reduce exception handling test #3") {
 //! Testing parallel_for and parallel_reduce exception handling
 //! \brief \ref error_guessing
 TEST_CASE("parallel_for and parallel_reduce exception handling test #4") {
-    for (auto concurrency_level: utils::concurrency_range()) {
+    for (auto concurrency_level : utils::concurrency_range()) {
         g_NumThreads = static_cast<int>(concurrency_level);
         g_Master = std::this_thread::get_id();
         if (g_NumThreads > 1) {
@@ -490,30 +501,32 @@ TEST_CASE("parallel_for and parallel_reduce exception handling test #4") {
 #endif /* TBB_USE_EXCEPTIONS */
 class ParForBodyToCancel {
 public:
-    void operator()( const range_type& ) const {
+    void operator()(const range_type&) const {
         ++g_CurExecuted;
         Cancellator::WaitUntilReady();
     }
 };
 
-template<class B>
+template <class B>
 class ParForLauncher {
-    tbb::task_group_context &my_ctx;
+    tbb::task_group_context& my_ctx;
+
 public:
     void operator()() const {
-        tbb::parallel_for( range_type(0, FLAT_RANGE, FLAT_GRAIN), B(), tbb::simple_partitioner(), my_ctx );
+        tbb::parallel_for(range_type(0, FLAT_RANGE, FLAT_GRAIN), B(), tbb::simple_partitioner(), my_ctx);
     }
-    ParForLauncher ( tbb::task_group_context& ctx ) : my_ctx(ctx) {}
+    ParForLauncher(tbb::task_group_context& ctx) : my_ctx(ctx) {}
 };
 
 //! Test for cancelling an algorithm from outside (from a task running in parallel with the algorithm).
-void TestCancelation1 () {
-    ResetGlobals( false );
-    RunCancellationTest<ParForLauncher<ParForBodyToCancel>, Cancellator>( NumSubranges(FLAT_RANGE, FLAT_GRAIN) / 4 );
+void TestCancelation1() {
+    ResetGlobals(false);
+    RunCancellationTest<ParForLauncher<ParForBodyToCancel>, Cancellator>(NumSubranges(FLAT_RANGE, FLAT_GRAIN)
+                                                                         / 4);
 }
 
-class Cancellator2  {
-    tbb::task_group_context &m_GroupToCancel;
+class Cancellator2 {
+    tbb::task_group_context& m_GroupToCancel;
 
 public:
     void operator()() const {
@@ -523,28 +536,29 @@ class Cancellator2  {
         g_ExecutedAtLastCatch = g_CurExecuted.load();
     }
 
-    Cancellator2 ( tbb::task_group_context& ctx, intptr_t ) : m_GroupToCancel(ctx) {}
+    Cancellator2(tbb::task_group_context& ctx, intptr_t) : m_GroupToCancel(ctx) {}
 };
 
 class ParForBodyToCancel2 {
 public:
-    void operator()( const range_type& ) const {
+    void operator()(const range_type&) const {
         ++g_CurExecuted;
         utils::ConcurrencyTracker ct;
         // The test will hang (and be timed out by the test system) if is_cancelled() is broken
-        while( !tbb::is_current_task_group_canceling() )
-            utils::yield();
+        while (!tbb::is_current_task_group_canceling()) utils::yield();
     }
 };
 
 //! Test for cancelling an algorithm from outside (from a task running in parallel with the algorithm).
 /** This version also tests tbb::is_current_task_group_canceling() method. **/
-void TestCancelation2 () {
+void TestCancelation2() {
     ResetGlobals();
     RunCancellationTest<ParForLauncher<ParForBodyToCancel2>, Cancellator2>();
-    REQUIRE_MESSAGE (g_ExecutedAtLastCatch < g_NumThreads, "Somehow worker tasks started their execution before the cancellator task");
+    REQUIRE_MESSAGE(g_ExecutedAtLastCatch < g_NumThreads,
+                    "Somehow worker tasks started their execution before the cancellator task");
     g_TGCCancelled.validate(g_NumThreads, "Too many tasks survived cancellation");
-    REQUIRE_MESSAGE (g_CurExecuted <= g_ExecutedAtLastCatch + g_NumThreads, "Some tasks were executed after cancellation");
+    REQUIRE_MESSAGE(g_CurExecuted <= g_ExecutedAtLastCatch + g_NumThreads,
+                    "Some tasks were executed after cancellation");
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -555,63 +569,54 @@ class Worker {
     static const int max_nesting = 3;
     static const int reduce_range = 1024;
     static const int reduce_grain = 256;
+
 public:
-    int DoWork (int level);
-    int Validate (int start_level) {
-        int expected = 1; // identity for multiplication
-        for(int i=start_level+1; i<max_nesting; ++i)
-             expected *= reduce_range;
+    int DoWork(int level);
+    int Validate(int start_level) {
+        int expected = 1;// identity for multiplication
+        for (int i = start_level + 1; i < max_nesting; ++i) expected *= reduce_range;
         return expected;
     }
 };
 
 class RecursiveParReduceBodyWithSharedWorker {
-    Worker * m_SharedWorker;
+    Worker* m_SharedWorker;
     int m_NestingLevel;
     int m_Result;
+
 public:
-    RecursiveParReduceBodyWithSharedWorker ( RecursiveParReduceBodyWithSharedWorker& src, tbb::split )
-        : m_SharedWorker(src.m_SharedWorker)
-        , m_NestingLevel(src.m_NestingLevel)
-        , m_Result(0)
-    {}
-    RecursiveParReduceBodyWithSharedWorker ( Worker *w, int outer )
-        : m_SharedWorker(w)
-        , m_NestingLevel(outer)
-        , m_Result(0)
-    {}
-
-    void operator() ( const tbb::blocked_range<size_t>& r ) {
-        if(g_Master == std::this_thread::get_id()) g_MasterExecuted = true;
-        else g_NonMasterExecuted = true;
-        if( tbb::is_current_task_group_canceling() ) g_TGCCancelled.increment();
-        for (size_t i = r.begin (); i != r.end (); ++i) {
-            m_Result += m_SharedWorker->DoWork (m_NestingLevel);
-        }
-    }
-    void join (const RecursiveParReduceBodyWithSharedWorker & x) {
-        m_Result += x.m_Result;
-    }
-    int result () { return m_Result; }
+    RecursiveParReduceBodyWithSharedWorker(RecursiveParReduceBodyWithSharedWorker& src, tbb::split)
+        : m_SharedWorker(src.m_SharedWorker), m_NestingLevel(src.m_NestingLevel), m_Result(0) {}
+    RecursiveParReduceBodyWithSharedWorker(Worker* w, int outer)
+        : m_SharedWorker(w), m_NestingLevel(outer), m_Result(0) {}
+
+    void operator()(const tbb::blocked_range<size_t>& r) {
+        if (g_Master == std::this_thread::get_id()) g_MasterExecuted = true;
+        else
+            g_NonMasterExecuted = true;
+        if (tbb::is_current_task_group_canceling()) g_TGCCancelled.increment();
+        for (size_t i = r.begin(); i != r.end(); ++i) { m_Result += m_SharedWorker->DoWork(m_NestingLevel); }
+    }
+    void join(const RecursiveParReduceBodyWithSharedWorker& x) { m_Result += x.m_Result; }
+    int result() { return m_Result; }
 };
 
-int Worker::DoWork ( int level ) {
+int Worker::DoWork(int level) {
     ++level;
-    if ( level < max_nesting ) {
-        RecursiveParReduceBodyWithSharedWorker rt (this, level);
-        tbb::parallel_reduce (tbb::blocked_range<size_t>(0, reduce_range, reduce_grain), rt);
+    if (level < max_nesting) {
+        RecursiveParReduceBodyWithSharedWorker rt(this, level);
+        tbb::parallel_reduce(tbb::blocked_range<size_t>(0, reduce_range, reduce_grain), rt);
         return rt.result();
-    }
-    else
+    } else
         return 1;
 }
 
 //! Regression test for hanging that occurred with the first version of cancellation propagation
-void TestCancelation3 () {
+void TestCancelation3() {
     Worker w;
-    int result   = w.DoWork (0);
+    int result = w.DoWork(0);
     int expected = w.Validate(0);
-    REQUIRE_MESSAGE ( result == expected, "Wrong calculation result");
+    REQUIRE_MESSAGE(result == expected, "Wrong calculation result");
 }
 
 struct StatsCounters {
@@ -630,34 +635,33 @@ class ParReduceBody {
     tbb::task_group_context& tgc;
 
 public:
-    ParReduceBody( StatsCounters& s_, tbb::task_group_context& context, bool e_ ) :
-        my_stats(&s_), my_exception(e_), tgc(context) {
+    ParReduceBody(StatsCounters& s_, tbb::task_group_context& context, bool e_)
+        : my_stats(&s_), my_exception(e_), tgc(context) {
         my_id = my_stats->my_total_created++;
     }
 
-    ParReduceBody( const ParReduceBody& lhs ) : tgc(lhs.tgc) {
+    ParReduceBody(const ParReduceBody& lhs) : tgc(lhs.tgc) {
         my_stats = lhs.my_stats;
         my_id = my_stats->my_total_created++;
     }
 
-    ParReduceBody( ParReduceBody& lhs, tbb::split ) : tgc(lhs.tgc) {
+    ParReduceBody(ParReduceBody& lhs, tbb::split) : tgc(lhs.tgc) {
         my_stats = lhs.my_stats;
         my_id = my_stats->my_total_created++;
     }
 
-    ~ParReduceBody(){ ++my_stats->my_total_deleted; }
+    ~ParReduceBody() { ++my_stats->my_total_deleted; }
 
-    void operator()( const tbb::blocked_range<std::size_t>& /*range*/ ) const {
+    void operator()(const tbb::blocked_range<std::size_t>& /*range*/) const {
         //Do nothing, except for one task (chosen arbitrarily)
-        if( my_id >= 12 ) {
-            if( my_exception )
-                ThrowTestException(1);
+        if (my_id >= 12) {
+            if (my_exception) ThrowTestException(1);
             else
                 tgc.cancel_group_execution();
         }
     }
 
-    void join( ParReduceBody& /*rhs*/ ) {}
+    void join(ParReduceBody& /*rhs*/) {}
 };
 
 void TestCancelation4() {
@@ -668,19 +672,23 @@ void TestCancelation4() {
     {
         tbb::task_group_context tgc1, tgc2;
         ParReduceBody body_for_cancellation(statsObj, tgc1, false), body_for_exception(statsObj, tgc2, true);
-        tbb::parallel_reduce( tbb::blocked_range<std::size_t>(0,100000000,100), body_for_cancellation, tbb::simple_partitioner(), tgc1 );
-        tbb::parallel_reduce( tbb::blocked_range<std::size_t>(0,100000000,100), body_for_exception, tbb::simple_partitioner(), tgc2 );
+        tbb::parallel_reduce(tbb::blocked_range<std::size_t>(0, 100000000, 100), body_for_cancellation,
+                             tbb::simple_partitioner(), tgc1);
+        tbb::parallel_reduce(tbb::blocked_range<std::size_t>(0, 100000000, 100), body_for_exception,
+                             tbb::simple_partitioner(), tgc2);
     }
 #if TBB_USE_EXCEPTIONS
-    catch(...) {}
+    catch (...) {
+    }
 #endif
-    REQUIRE_MESSAGE ( statsObj.my_total_created==statsObj.my_total_deleted, "Not all parallel_reduce body objects created were reclaimed");
+    REQUIRE_MESSAGE(statsObj.my_total_created == statsObj.my_total_deleted,
+                    "Not all parallel_reduce body objects created were reclaimed");
 }
 
 //! Testing parallel_for and parallel_reduce cancellation
 //! \brief \ref error_guessing
 TEST_CASE("parallel_for and parallel_reduce cancellation test #1") {
-    for (auto concurrency_level: utils::concurrency_range()) {
+    for (auto concurrency_level : utils::concurrency_range()) {
         g_NumThreads = static_cast<int>(concurrency_level);
         g_Master = std::this_thread::get_id();
         if (g_NumThreads > 1) {
@@ -702,7 +710,7 @@ TEST_CASE("parallel_for and parallel_reduce cancellation test #1") {
 //! Testing parallel_for and parallel_reduce cancellation
 //! \brief \ref error_guessing
 TEST_CASE("parallel_for and parallel_reduce cancellation test #2") {
-    for (auto concurrency_level: utils::concurrency_range()) {
+    for (auto concurrency_level : utils::concurrency_range()) {
         g_NumThreads = static_cast<int>(concurrency_level);
         g_Master = std::this_thread::get_id();
         if (g_NumThreads > 1) {
@@ -724,7 +732,7 @@ TEST_CASE("parallel_for and parallel_reduce cancellation test #2") {
 //! Testing parallel_for and parallel_reduce cancellation
 //! \brief \ref error_guessing
 TEST_CASE("parallel_for and parallel_reduce cancellation test #3") {
-    for (auto concurrency_level: utils::concurrency_range()) {
+    for (auto concurrency_level : utils::concurrency_range()) {
         g_NumThreads = static_cast<int>(concurrency_level);
         g_Master = std::this_thread::get_id();
         if (g_NumThreads > 1) {
@@ -745,7 +753,7 @@ TEST_CASE("parallel_for and parallel_reduce cancellation test #3") {
 //! Testing parallel_for and parallel_reduce cancellation
 //! \brief \ref error_guessing
 TEST_CASE("parallel_for and parallel_reduce cancellation test #4") {
-    for (auto concurrency_level: utils::concurrency_range()) {
+    for (auto concurrency_level : utils::concurrency_range()) {
         g_NumThreads = static_cast<int>(concurrency_level);
         g_Master = std::this_thread::get_id();
         if (g_NumThreads > 1) {
@@ -772,54 +780,45 @@ std::size_t get_iter_range_size() {
     return std::max(50, g_NumThreads * 2);
 }
 
-template<typename Iterator>
+template <typename Iterator>
 struct adaptive_range {
     std::vector<std::size_t> my_array;
 
     adaptive_range(std::size_t size) : my_array(size + 1) {}
     using iterator = Iterator;
 
-    iterator begin() const {
-        return iterator{&my_array.front()};
-    }
-    iterator begin() {
-        return iterator{&my_array.front()};
-    }
-    iterator end() const {
-        return iterator{&my_array.back()};
-    }
-    iterator end() {
-        return iterator{&my_array.back()};
-    }
+    iterator begin() const { return iterator {&my_array.front()}; }
+    iterator begin() { return iterator {&my_array.front()}; }
+    iterator end() const { return iterator {&my_array.back()}; }
+    iterator end() { return iterator {&my_array.back()}; }
 };
 
-void Feed ( tbb::feeder<size_t> &feeder, size_t val ) {
+void Feed(tbb::feeder<size_t>& feeder, size_t val) {
     if (g_FedTasksCount < 50) {
         ++g_FedTasksCount;
         feeder.add(val);
     }
 }
 
-#define RunWithSimpleBody(func, body)       \
-    func<utils::ForwardIterator<size_t>, body>();         \
+#define RunWithSimpleBody(func, body)                                                                        \
+    func<utils::ForwardIterator<size_t>, body>();                                                            \
     func<utils::ForwardIterator<size_t>, body##WithFeeder>()
 
-#define RunWithTemplatedBody(func, body)     \
-    func<utils::ForwardIterator<size_t>, body<utils::ForwardIterator<size_t> > >();         \
-    func<utils::ForwardIterator<size_t>, body##WithFeeder<utils::ForwardIterator<size_t> > >()
+#define RunWithTemplatedBody(func, body)                                                                     \
+    func<utils::ForwardIterator<size_t>, body<utils::ForwardIterator<size_t>>>();                            \
+    func<utils::ForwardIterator<size_t>, body##WithFeeder<utils::ForwardIterator<size_t>>>()
 
 #if TBB_USE_EXCEPTIONS
 
 // Simple functor object with exception
 class SimpleParForEachBody {
 public:
-    void operator() ( size_t &value ) const {
+    void operator()(size_t& value) const {
         ++g_CurExecuted;
-        if(g_Master == std::this_thread::get_id()) g_MasterExecuted = true;
-        else g_NonMasterExecuted = true;
-        if( tbb::is_current_task_group_canceling() ) {
-            g_TGCCancelled.increment();
-        }
+        if (g_Master == std::this_thread::get_id()) g_MasterExecuted = true;
+        else
+            g_NonMasterExecuted = true;
+        if (tbb::is_current_task_group_canceling()) { g_TGCCancelled.increment(); }
         utils::ConcurrencyTracker ct;
         value += 1000;
         WaitUntilConcurrencyPeaks();
@@ -830,7 +829,7 @@ class SimpleParForEachBody {
 // Simple functor object with exception and feeder
 class SimpleParForEachBodyWithFeeder : SimpleParForEachBody {
 public:
-    void operator() ( size_t &value, tbb::feeder<size_t> &feeder ) const {
+    void operator()(size_t& value, tbb::feeder<size_t>& feeder) const {
         Feed(feeder, 0);
         SimpleParForEachBody::operator()(value);
     }
@@ -838,24 +837,26 @@ class SimpleParForEachBodyWithFeeder : SimpleParForEachBody {
 
 // Tests exceptions without nesting
 template <class Iterator, class simple_body>
-void Test1_parallel_for_each () {
+void Test1_parallel_for_each() {
     ResetGlobals();
     auto range = adaptive_range<Iterator>(get_iter_range_size());
     TRY();
-        tbb::parallel_for_each(std::begin(range), std::end(range), simple_body() );
+    tbb::parallel_for_each(std::begin(range), std::end(range), simple_body());
     CATCH_AND_ASSERT();
-    REQUIRE_MESSAGE (g_CurExecuted <= g_ExecutedAtLastCatch + g_NumThreads, "Too many tasks survived exception");
+    REQUIRE_MESSAGE(g_CurExecuted <= g_ExecutedAtLastCatch + g_NumThreads,
+                    "Too many tasks survived exception");
     g_TGCCancelled.validate(g_NumThreads, "Too many tasks survived cancellation");
-    REQUIRE_MESSAGE (g_NumExceptionsCaught == 1, "No try_blocks in any body expected in this test");
-    if ( !g_SolitaryException )
-        REQUIRE_MESSAGE (g_CurExecuted <= g_ExecutedAtLastCatch + g_NumThreads, "Too many tasks survived exception");
+    REQUIRE_MESSAGE(g_NumExceptionsCaught == 1, "No try_blocks in any body expected in this test");
+    if (!g_SolitaryException)
+        REQUIRE_MESSAGE(g_CurExecuted <= g_ExecutedAtLastCatch + g_NumThreads,
+                        "Too many tasks survived exception");
 
-} // void Test1_parallel_for_each ()
+}// void Test1_parallel_for_each ()
 
 template <class Iterator>
 class OuterParForEachBody {
 public:
-    void operator()( size_t& /*value*/ ) const {
+    void operator()(size_t& /*value*/) const {
         ++g_OuterParCalls;
         auto range = adaptive_range<Iterator>(get_iter_range_size());
         tbb::parallel_for_each(std::begin(range), std::end(range), SimpleParForEachBody());
@@ -865,7 +866,7 @@ class OuterParForEachBody {
 template <class Iterator>
 class OuterParForEachBodyWithFeeder : OuterParForEachBody<Iterator> {
 public:
-    void operator()( size_t& value, tbb::feeder<size_t>& feeder ) const {
+    void operator()(size_t& value, tbb::feeder<size_t>& feeder) const {
         Feed(feeder, 0);
         OuterParForEachBody<Iterator>::operator()(value);
     }
@@ -877,23 +878,25 @@ class OuterParForEachBodyWithFeeder : OuterParForEachBody<Iterator> {
     (outer parallel_for_each body) in this test, they will cancel all the sibling inner
     algorithms. **/
 template <class Iterator, class outer_body>
-void Test2_parallel_for_each () {
+void Test2_parallel_for_each() {
     ResetGlobals();
     auto range = adaptive_range<Iterator>(get_iter_range_size());
     TRY();
-        tbb::parallel_for_each(std::begin(range), std::end(range), outer_body() );
+    tbb::parallel_for_each(std::begin(range), std::end(range), outer_body());
     CATCH_AND_ASSERT();
-    REQUIRE_MESSAGE (g_CurExecuted <= g_ExecutedAtLastCatch + g_NumThreads, "Too many tasks survived exception");
+    REQUIRE_MESSAGE(g_CurExecuted <= g_ExecutedAtLastCatch + g_NumThreads,
+                    "Too many tasks survived exception");
     g_TGCCancelled.validate(g_NumThreads, "Too many tasks survived cancellation");
-    REQUIRE_MESSAGE (g_NumExceptionsCaught == 1, "No try_blocks in any body expected in this test");
-    if ( !g_SolitaryException )
-        REQUIRE_MESSAGE (g_CurExecuted <= g_ExecutedAtLastCatch + g_NumThreads, "Too many tasks survived exception");
-} // void Test2_parallel_for_each ()
+    REQUIRE_MESSAGE(g_NumExceptionsCaught == 1, "No try_blocks in any body expected in this test");
+    if (!g_SolitaryException)
+        REQUIRE_MESSAGE(g_CurExecuted <= g_ExecutedAtLastCatch + g_NumThreads,
+                        "Too many tasks survived exception");
+}// void Test2_parallel_for_each ()
 
 template <class Iterator>
 class OuterParForEachBodyWithIsolatedCtx {
 public:
-    void operator()( size_t& /*value*/ ) const {
+    void operator()(size_t& /*value*/) const {
         tbb::task_group_context ctx(tbb::task_group_context::isolated);
         ++g_OuterParCalls;
         auto range = adaptive_range<Iterator>(get_iter_range_size());
@@ -904,7 +907,7 @@ class OuterParForEachBodyWithIsolatedCtx {
 template <class Iterator>
 class OuterParForEachBodyWithIsolatedCtxWithFeeder : OuterParForEachBodyWithIsolatedCtx<Iterator> {
 public:
-    void operator()( size_t& value, tbb::feeder<size_t> &feeder ) const {
+    void operator()(size_t& value, tbb::feeder<size_t>& feeder) const {
         Feed(feeder, 0);
         OuterParForEachBodyWithIsolatedCtx<Iterator>::operator()(value);
     }
@@ -917,38 +920,40 @@ class OuterParForEachBodyWithIsolatedCtxWithFeeder : OuterParForEachBodyWithIsol
     exception cancels the root parallel_for_each, at most the first g_NumThreads subranges
     will be processed (which launch inner parallel_for_eachs) **/
 template <class Iterator, class outer_body>
-void Test3_parallel_for_each () {
+void Test3_parallel_for_each() {
     ResetGlobals();
     auto range = adaptive_range<Iterator>(get_iter_range_size());
     intptr_t innerCalls = get_iter_range_size(),
              // The assumption here is the same as in outer parallel fors.
-             minExecuted = (g_NumThreads - 1) * innerCalls;
+            minExecuted = (g_NumThreads - 1) * innerCalls;
     g_Master = std::this_thread::get_id();
     TRY();
-        tbb::parallel_for_each(std::begin(range), std::end(range), outer_body());
+    tbb::parallel_for_each(std::begin(range), std::end(range), outer_body());
     CATCH_AND_ASSERT();
     // figure actual number of expected executions given the number of outer PDos started.
     minExecuted = (g_OuterParCalls - 1) * innerCalls;
     // one extra thread may run a task that sees cancellation.  Infrequent but possible
     g_TGCCancelled.validate(g_NumThreads, "Too many tasks survived exception");
-    if ( g_SolitaryException ) {
-        REQUIRE_MESSAGE (g_CurExecuted > minExecuted, "Too few tasks survived exception");
-        REQUIRE_MESSAGE (g_CurExecuted <= minExecuted + (g_ExecutedAtLastCatch + g_NumThreads), "Too many tasks survived exception");
+    if (g_SolitaryException) {
+        REQUIRE_MESSAGE(g_CurExecuted > minExecuted, "Too few tasks survived exception");
+        REQUIRE_MESSAGE(g_CurExecuted <= minExecuted + (g_ExecutedAtLastCatch + g_NumThreads),
+                        "Too many tasks survived exception");
     }
-    REQUIRE_MESSAGE (g_NumExceptionsCaught == 1, "No try_blocks in any body expected in this test");
-    if ( !g_SolitaryException )
-        REQUIRE_MESSAGE (g_CurExecuted <= g_ExecutedAtLastCatch + g_NumThreads, "Too many tasks survived exception");
-} // void Test3_parallel_for_each ()
+    REQUIRE_MESSAGE(g_NumExceptionsCaught == 1, "No try_blocks in any body expected in this test");
+    if (!g_SolitaryException)
+        REQUIRE_MESSAGE(g_CurExecuted <= g_ExecutedAtLastCatch + g_NumThreads,
+                        "Too many tasks survived exception");
+}// void Test3_parallel_for_each ()
 
 template <class Iterator>
 class OuterParForEachWithEhBody {
 public:
-    void operator()( size_t& /*value*/ ) const {
+    void operator()(size_t& /*value*/) const {
         tbb::task_group_context ctx(tbb::task_group_context::isolated);
         ++g_OuterParCalls;
         auto range = adaptive_range<Iterator>(get_iter_range_size());
         TRY();
-            tbb::parallel_for_each(std::begin(range), std::end(range), SimpleParForEachBody(), ctx);
+        tbb::parallel_for_each(std::begin(range), std::end(range), SimpleParForEachBody(), ctx);
         CATCH();
     }
 };
@@ -959,7 +964,7 @@ class OuterParForEachWithEhBodyWithFeeder : OuterParForEachWithEhBody<Iterator>
     void operator=(const OuterParForEachWithEhBodyWithFeeder&) = delete;
     OuterParForEachWithEhBodyWithFeeder(const OuterParForEachWithEhBodyWithFeeder&) = default;
     OuterParForEachWithEhBodyWithFeeder() = default;
-    void operator()( size_t &value, tbb::feeder<size_t> &feeder ) const {
+    void operator()(size_t& value, tbb::feeder<size_t>& feeder) const {
         Feed(feeder, 0);
         OuterParForEachWithEhBody<Iterator>::operator()(value);
     }
@@ -970,76 +975,81 @@ class OuterParForEachWithEhBodyWithFeeder : OuterParForEachWithEhBody<Iterator>
     in this test, they do not affect neither other tasks of the the root parallel_for
     nor sibling inner algorithms. **/
 template <class Iterator, class outer_body_with_eh>
-void Test4_parallel_for_each () {
-    ResetGlobals( true, true );
+void Test4_parallel_for_each() {
+    ResetGlobals(true, true);
     auto range = adaptive_range<Iterator>(get_iter_range_size());
     g_Master = std::this_thread::get_id();
     TRY();
-        tbb::parallel_for_each(std::begin(range), std::end(range), outer_body_with_eh());
+    tbb::parallel_for_each(std::begin(range), std::end(range), outer_body_with_eh());
     CATCH();
-    REQUIRE_MESSAGE (!l_ExceptionCaughtAtCurrentLevel, "All exceptions must have been handled in the parallel_for_each body");
-    intptr_t innerCalls = get_iter_range_size(),
-             outerCalls = get_iter_range_size() + g_FedTasksCount,
-             maxExecuted = outerCalls * innerCalls,
-             minExecuted = 0;
+    REQUIRE_MESSAGE(!l_ExceptionCaughtAtCurrentLevel,
+                    "All exceptions must have been handled in the parallel_for_each body");
+    intptr_t innerCalls = get_iter_range_size(), outerCalls = get_iter_range_size() + g_FedTasksCount,
+             maxExecuted = outerCalls * innerCalls, minExecuted = 0;
     g_TGCCancelled.validate(g_NumThreads, "Too many tasks survived exception");
-    if ( g_SolitaryException ) {
+    if (g_SolitaryException) {
         minExecuted = maxExecuted - innerCalls;
-        REQUIRE_MESSAGE (g_NumExceptionsCaught == 1, "No exception registered");
-        REQUIRE_MESSAGE (g_CurExecuted >= minExecuted, "Too few tasks executed");
+        REQUIRE_MESSAGE(g_NumExceptionsCaught == 1, "No exception registered");
+        REQUIRE_MESSAGE(g_CurExecuted >= minExecuted, "Too few tasks executed");
         // This test has the same property as Test4 (parallel_for); the exception can be
         // thrown, but some number of tasks from the outer Pdo can execute after the throw but
         // before the cancellation is signaled (have seen 36).
         DOCTEST_WARN_MESSAGE(g_CurExecuted < maxExecuted, "All tasks survived exception. Oversubscription?");
-    }
-    else {
+    } else {
         minExecuted = g_NumExceptionsCaught;
-        REQUIRE_MESSAGE ((g_NumExceptionsCaught > 1 && g_NumExceptionsCaught <= outerCalls), "Unexpected actual number of exceptions");
-        REQUIRE_MESSAGE (g_CurExecuted >= minExecuted, "Too many executed tasks reported");
-        REQUIRE_MESSAGE (g_CurExecuted < g_ExecutedAtLastCatch + g_NumThreads + outerCalls, "Too many tasks survived multiple exceptions");
-        REQUIRE_MESSAGE (g_CurExecuted <= outerCalls * (1 + g_NumThreads), "Too many tasks survived exception");
+        REQUIRE_MESSAGE((g_NumExceptionsCaught > 1 && g_NumExceptionsCaught <= outerCalls),
+                        "Unexpected actual number of exceptions");
+        REQUIRE_MESSAGE(g_CurExecuted >= minExecuted, "Too many executed tasks reported");
+        REQUIRE_MESSAGE(g_CurExecuted < g_ExecutedAtLastCatch + g_NumThreads + outerCalls,
+                        "Too many tasks survived multiple exceptions");
+        REQUIRE_MESSAGE(g_CurExecuted <= outerCalls * (1 + g_NumThreads),
+                        "Too many tasks survived exception");
     }
-} // void Test4_parallel_for_each ()
+}// void Test4_parallel_for_each ()
 
 // This body throws an exception only if the task was added by feeder
 class ParForEachBodyWithThrowingFeederTasks {
 public:
     //! This form of the function call operator can be used when the body needs to add more work during the processing
-    void operator() (const size_t &value, tbb::feeder<size_t> &feeder ) const {
+    void operator()(const size_t& value, tbb::feeder<size_t>& feeder) const {
         ++g_CurExecuted;
-        if(g_Master == std::this_thread::get_id()) g_MasterExecuted = true;
-        else g_NonMasterExecuted = true;
-        if( tbb::is_current_task_group_canceling() ) g_TGCCancelled.increment();
+        if (g_Master == std::this_thread::get_id()) g_MasterExecuted = true;
+        else
+            g_NonMasterExecuted = true;
+        if (tbb::is_current_task_group_canceling()) g_TGCCancelled.increment();
         Feed(feeder, 1);
-        if (value == 1)
-            ThrowTestException(1);
+        if (value == 1) ThrowTestException(1);
     }
-}; // class ParForEachBodyWithThrowingFeederTasks
+};// class ParForEachBodyWithThrowingFeederTasks
 
 // Test exception in task, which was added by feeder.
 template <class Iterator>
-void Test5_parallel_for_each () {
+void Test5_parallel_for_each() {
     ResetGlobals();
     auto range = adaptive_range<Iterator>(get_iter_range_size());
     g_Master = std::this_thread::get_id();
     TRY();
-        tbb::parallel_for_each(std::begin(range), std::end(range), ParForEachBodyWithThrowingFeederTasks());
+    tbb::parallel_for_each(std::begin(range), std::end(range), ParForEachBodyWithThrowingFeederTasks());
     CATCH();
     if (g_SolitaryException) {
         // Failure occurs when g_ExceptionInMaster is false, but all the 1 values in the range
         // are handled by the external thread.  In this case no throw occurs.
-        REQUIRE_MESSAGE ((l_ExceptionCaughtAtCurrentLevel               // we saw an exception
-                || (!g_ExceptionInMaster && !g_NonMasterExecutedThrow)  // non-external trhead throws but none tried
-                || (g_ExceptionInMaster && !g_MasterExecutedThrow))     // external thread throws but external thread didn't try
-                , "At least one exception should occur");
+        REQUIRE_MESSAGE(
+                (l_ExceptionCaughtAtCurrentLevel// we saw an exception
+                 || (!g_ExceptionInMaster
+                     && !g_NonMasterExecutedThrow)// non-external trhead throws but none tried
+                 || (g_ExceptionInMaster
+                     && !g_MasterExecutedThrow))// external thread throws but external thread didn't try
+                ,
+                "At least one exception should occur");
     }
-} // void Test5_parallel_for_each ()
+}// void Test5_parallel_for_each ()
 
 #if !EMSCRIPTEN
 //! Testing parallel_for_each exception handling
 //! \brief \ref error_guessing
 TEST_CASE("parallel_for_each exception handling test #1") {
-    for (auto concurrency_level: utils::concurrency_range()) {
+    for (auto concurrency_level : utils::concurrency_range()) {
         g_NumThreads = static_cast<int>(concurrency_level);
         g_Master = std::this_thread::get_id();
         if (g_NumThreads > 1) {
@@ -1061,7 +1071,7 @@ TEST_CASE("parallel_for_each exception handling test #1") {
 //! Testing parallel_for_each exception handling
 //! \brief \ref error_guessing
 TEST_CASE("parallel_for_each exception handling test #2") {
-    for (auto concurrency_level: utils::concurrency_range()) {
+    for (auto concurrency_level : utils::concurrency_range()) {
         g_NumThreads = static_cast<int>(concurrency_level);
         g_Master = std::this_thread::get_id();
         if (g_NumThreads > 1) {
@@ -1083,7 +1093,7 @@ TEST_CASE("parallel_for_each exception handling test #2") {
 //! Testing parallel_for_each exception handling
 //! \brief \ref error_guessing
 TEST_CASE("parallel_for_each exception handling test #3") {
-    for (auto concurrency_level: utils::concurrency_range()) {
+    for (auto concurrency_level : utils::concurrency_range()) {
         g_NumThreads = static_cast<int>(concurrency_level);
         g_Master = std::this_thread::get_id();
         if (g_NumThreads > 1) {
@@ -1105,7 +1115,7 @@ TEST_CASE("parallel_for_each exception handling test #3") {
 //! Testing parallel_for_each exception handling
 //! \brief \ref error_guessing
 TEST_CASE("parallel_for_each exception handling test #4") {
-    for (auto concurrency_level: utils::concurrency_range()) {
+    for (auto concurrency_level : utils::concurrency_range()) {
         g_NumThreads = static_cast<int>(concurrency_level);
         g_Master = std::this_thread::get_id();
         if (g_NumThreads > 1) {
@@ -1127,7 +1137,7 @@ TEST_CASE("parallel_for_each exception handling test #4") {
 //! Testing parallel_for_each exception handling
 //! \brief \ref error_guessing
 TEST_CASE("parallel_for_each exception handling test #5") {
-    for (auto concurrency_level: utils::concurrency_range()) {
+    for (auto concurrency_level : utils::concurrency_range()) {
         g_NumThreads = static_cast<int>(concurrency_level);
         g_Master = std::this_thread::get_id();
         if (g_NumThreads > 1) {
@@ -1138,9 +1148,9 @@ TEST_CASE("parallel_for_each exception handling test #5") {
                     g_ExceptionInMaster = (j & 1) != 0;
                     g_SolitaryException = (j & 2) != 0;
 
-                    Test5_parallel_for_each<utils::InputIterator<size_t> >();
-                    Test5_parallel_for_each<utils::ForwardIterator<size_t> >();
-                    Test5_parallel_for_each<utils::RandomIterator<size_t> >();
+                    Test5_parallel_for_each<utils::InputIterator<size_t>>();
+                    Test5_parallel_for_each<utils::ForwardIterator<size_t>>();
+                    Test5_parallel_for_each<utils::RandomIterator<size_t>>();
                 }
             });
         }
@@ -1151,7 +1161,7 @@ TEST_CASE("parallel_for_each exception handling test #5") {
 
 class ParForEachBodyToCancel {
 public:
-    void operator()( size_t& /*value*/ ) const {
+    void operator()(size_t& /*value*/) const {
         ++g_CurExecuted;
         Cancellator::WaitUntilReady();
     }
@@ -1159,58 +1169,60 @@ class ParForEachBodyToCancel {
 
 class ParForEachBodyToCancelWithFeeder : ParForEachBodyToCancel {
 public:
-    void operator()( size_t& value, tbb::feeder<size_t> &feeder ) const {
+    void operator()(size_t& value, tbb::feeder<size_t>& feeder) const {
         Feed(feeder, 0);
         ParForEachBodyToCancel::operator()(value);
     }
 };
 
-template<class B, class Iterator>
+template <class B, class Iterator>
 class ParForEachWorker {
-    tbb::task_group_context &my_ctx;
+    tbb::task_group_context& my_ctx;
+
 public:
     void operator()() const {
         auto range = adaptive_range<Iterator>(get_iter_range_size());
-        tbb::parallel_for_each( std::begin(range), std::end(range), B(), my_ctx );
+        tbb::parallel_for_each(std::begin(range), std::end(range), B(), my_ctx);
     }
 
-    ParForEachWorker ( tbb::task_group_context& ctx ) : my_ctx(ctx) {}
+    ParForEachWorker(tbb::task_group_context& ctx) : my_ctx(ctx) {}
 };
 
 //! Test for cancelling an algorithm from outside (from a task running in parallel with the algorithm).
 template <class Iterator, class body_to_cancel>
-void TestCancelation1_parallel_for_each () {
-    ResetGlobals( false );
+void TestCancelation1_parallel_for_each() {
+    ResetGlobals(false);
     // Threshold should leave more than max_threads tasks to test the cancellation. Set the threshold to iter_range_size()/4 since iter_range_size >= max_threads*2
     intptr_t threshold = get_iter_range_size() / 4;
-    REQUIRE_MESSAGE(get_iter_range_size() - threshold > g_NumThreads, "Threshold should leave more than max_threads tasks to test the cancellation.");
+    REQUIRE_MESSAGE(get_iter_range_size() - threshold > g_NumThreads,
+                    "Threshold should leave more than max_threads tasks to test the cancellation.");
     tbb::task_group tg;
-    tbb::task_group_context  ctx;
+    tbb::task_group_context ctx;
     Cancellator cancellator(ctx, threshold);
     ParForEachWorker<body_to_cancel, Iterator> worker(ctx);
-    tg.run( cancellator );
+    tg.run(cancellator);
     utils::yield();
-    tg.run( worker );
+    tg.run(worker);
     TRY();
-        tg.wait();
+    tg.wait();
     CATCH_AND_FAIL();
-    REQUIRE_MESSAGE (g_CurExecuted < g_ExecutedAtLastCatch + g_NumThreads, "Too many tasks were executed after cancellation");
+    REQUIRE_MESSAGE(g_CurExecuted < g_ExecutedAtLastCatch + g_NumThreads,
+                    "Too many tasks were executed after cancellation");
 }
 
 class ParForEachBodyToCancel2 {
 public:
-    void operator()( size_t& /*value*/ ) const {
+    void operator()(size_t& /*value*/) const {
         ++g_CurExecuted;
         utils::ConcurrencyTracker ct;
         // The test will hang (and be timed out by the test system) if is_cancelled() is broken
-        while( !tbb::is_current_task_group_canceling() )
-            utils::yield();
+        while (!tbb::is_current_task_group_canceling()) utils::yield();
     }
 };
 
 class ParForEachBodyToCancel2WithFeeder : ParForEachBodyToCancel2 {
 public:
-    void operator()( size_t& value, tbb::feeder<size_t> &feeder ) const {
+    void operator()(size_t& value, tbb::feeder<size_t>& feeder) const {
         Feed(feeder, 0);
         ParForEachBodyToCancel2::operator()(value);
     }
@@ -1219,7 +1231,7 @@ class ParForEachBodyToCancel2WithFeeder : ParForEachBodyToCancel2 {
 //! Test for cancelling an algorithm from outside (from a task running in parallel with the algorithm).
 /** This version also tests tbb::is_current_task_group_canceling() method. **/
 template <class Iterator, class body_to_cancel>
-void TestCancelation2_parallel_for_each () {
+void TestCancelation2_parallel_for_each() {
     ResetGlobals();
     RunCancellationTest<ParForEachWorker<body_to_cancel, Iterator>, Cancellator2>();
 }
@@ -1228,7 +1240,7 @@ void TestCancelation2_parallel_for_each () {
 //! Testing parallel_for_each cancellation test
 //! \brief \ref error_guessing
 TEST_CASE("parallel_for_each cancellation test #1") {
-    for (auto concurrency_level: utils::concurrency_range()) {
+    for (auto concurrency_level : utils::concurrency_range()) {
         g_NumThreads = static_cast<int>(concurrency_level);
         g_Master = std::this_thread::get_id();
         if (g_NumThreads > 1) {
@@ -1248,7 +1260,7 @@ TEST_CASE("parallel_for_each cancellation test #1") {
 //! Testing parallel_for_each cancellation test
 //! \brief \ref error_guessing
 TEST_CASE("parallel_for_each cancellation test #2") {
-    for (auto concurrency_level: utils::concurrency_range()) {
+    for (auto concurrency_level : utils::concurrency_range()) {
         g_NumThreads = static_cast<int>(concurrency_level);
         g_Master = std::this_thread::get_id();
         if (g_NumThreads > 1) {
@@ -1275,28 +1287,28 @@ int g_NumTokens = 0;
 // Simple input filter class, it assigns 1 to all array members
 // It stops when it receives item equal to -1
 class InputFilter {
-    mutable std::atomic<size_t> m_Item{};
+    mutable std::atomic<size_t> m_Item {};
     mutable std::vector<size_t> m_Buffer;
+
 public:
     InputFilter() : m_Buffer(get_iter_range_size()) {
         m_Item = 0;
-        for (size_t i = 0; i < get_iter_range_size(); ++i )
-            m_Buffer[i] = 1;
+        for (size_t i = 0; i < get_iter_range_size(); ++i) m_Buffer[i] = 1;
     }
     InputFilter(const InputFilter& other) : m_Item(other.m_Item.load()), m_Buffer(get_iter_range_size()) {
-        for (size_t i = 0; i < get_iter_range_size(); ++i )
-            m_Buffer[i] = other.m_Buffer[i];
+        for (size_t i = 0; i < get_iter_range_size(); ++i) m_Buffer[i] = other.m_Buffer[i];
     }
 
     void* operator()(tbb::flow_control& control) const {
         size_t item = m_Item++;
-        if(g_Master == std::this_thread::get_id()) g_MasterExecuted = true;
-        else g_NonMasterExecuted = true;
-        if( tbb::is_current_task_group_canceling() ) g_TGCCancelled.increment();
-        if(item == 1) {
-            ++g_PipelinesStarted;   // count on emitting the first item.
+        if (g_Master == std::this_thread::get_id()) g_MasterExecuted = true;
+        else
+            g_NonMasterExecuted = true;
+        if (tbb::is_current_task_group_canceling()) g_TGCCancelled.increment();
+        if (item == 1) {
+            ++g_PipelinesStarted;// count on emitting the first item.
         }
-        if ( item >= get_iter_range_size() ) {
+        if (item >= get_iter_range_size()) {
             control.stop();
             return nullptr;
         }
@@ -1305,7 +1317,7 @@ class InputFilter {
     }
 
     size_t* buffer() { return m_Buffer.data(); }
-}; // class InputFilter
+};// class InputFilter
 
 #if TBB_USE_EXCEPTIONS
 
@@ -1314,101 +1326,101 @@ class InputFilter {
 class SimpleFilter {
     bool m_canThrow;
     bool m_serial;
+
 public:
-    SimpleFilter (bool canThrow, bool serial ) : m_canThrow(canThrow), m_serial(serial) {}
+    SimpleFilter(bool canThrow, bool serial) : m_canThrow(canThrow), m_serial(serial) {}
     void* operator()(void* item) const {
         ++g_CurExecuted;
-        if(g_Master == std::this_thread::get_id()) g_MasterExecuted = true;
-        else g_NonMasterExecuted = true;
-        if( tbb::is_current_task_group_canceling() ) g_TGCCancelled.increment();
-        if ( m_canThrow ) {
-            if ( !m_serial ) {
+        if (g_Master == std::this_thread::get_id()) g_MasterExecuted = true;
+        else
+            g_NonMasterExecuted = true;
+        if (tbb::is_current_task_group_canceling()) g_TGCCancelled.increment();
+        if (m_canThrow) {
+            if (!m_serial) {
                 utils::ConcurrencyTracker ct;
-                WaitUntilConcurrencyPeaks( std::min(g_NumTokens, g_NumThreads) );
+                WaitUntilConcurrencyPeaks(std::min(g_NumTokens, g_NumThreads));
             }
             ThrowTestException(1);
         }
         return item;
     }
-}; // class SimpleFilter
+};// class SimpleFilter
 
 // This enumeration represents filters order in pipeline
 struct FilterSet {
     tbb::filter_mode mode1, mode2;
     bool throw1, throw2;
 
-    FilterSet( tbb::filter_mode m1, tbb::filter_mode m2, bool t1, bool t2 )
-        : mode1(m1), mode2(m2), throw1(t1), throw2(t2)
-    {}
-}; // struct FilterSet
+    FilterSet(tbb::filter_mode m1, tbb::filter_mode m2, bool t1, bool t2)
+        : mode1(m1), mode2(m2), throw1(t1), throw2(t2) {}
+};// struct FilterSet
 
-FilterSet serial_parallel( tbb::filter_mode::serial_in_order, tbb::filter_mode::parallel, /*throw1*/false, /*throw2*/true );
+FilterSet serial_parallel(tbb::filter_mode::serial_in_order, tbb::filter_mode::parallel, /*throw1*/ false,
+                          /*throw2*/ true);
 
-template<typename InFilter, typename Filter>
+template <typename InFilter, typename Filter>
 class CustomPipeline {
     InFilter inputFilter;
     Filter filter1;
     Filter filter2;
     FilterSet my_filters;
+
 public:
-    CustomPipeline( const FilterSet& filters )
+    CustomPipeline(const FilterSet& filters)
         : filter1(filters.throw1, filters.mode1 != tbb::filter_mode::parallel),
-          filter2(filters.throw2, filters.mode2 != tbb::filter_mode::parallel),
-          my_filters(filters)
-    {}
+          filter2(filters.throw2, filters.mode2 != tbb::filter_mode::parallel), my_filters(filters) {}
 
-    void run () {
-        tbb::parallel_pipeline(
-            g_NumTokens,
-            tbb::make_filter<void, void*>(tbb::filter_mode::parallel, inputFilter) &
-            tbb::make_filter<void*, void*>(my_filters.mode1, filter1) &
-            tbb::make_filter<void*, void>(my_filters.mode2, filter2)
-        );
+    void run() {
+        tbb::parallel_pipeline(g_NumTokens,
+                               tbb::make_filter<void, void*>(tbb::filter_mode::parallel, inputFilter)
+                                       & tbb::make_filter<void*, void*>(my_filters.mode1, filter1)
+                                       & tbb::make_filter<void*, void>(my_filters.mode2, filter2));
     }
-    void run ( tbb::task_group_context& ctx ) {
-        tbb::parallel_pipeline(
-            g_NumTokens,
-            tbb::make_filter<void, void*>(tbb::filter_mode::parallel, inputFilter) &
-            tbb::make_filter<void*, void*>(my_filters.mode1, filter1) &
-            tbb::make_filter<void*, void>(my_filters.mode2, filter2),
-            ctx
-        );
+    void run(tbb::task_group_context& ctx) {
+        tbb::parallel_pipeline(g_NumTokens,
+                               tbb::make_filter<void, void*>(tbb::filter_mode::parallel, inputFilter)
+                                       & tbb::make_filter<void*, void*>(my_filters.mode1, filter1)
+                                       & tbb::make_filter<void*, void>(my_filters.mode2, filter2),
+                               ctx);
     }
 };
 
 typedef CustomPipeline<InputFilter, SimpleFilter> SimplePipeline;
 
 // Tests exceptions without nesting
-void Test1_pipeline ( const FilterSet& filters ) {
+void Test1_pipeline(const FilterSet& filters) {
     ResetGlobals();
     SimplePipeline testPipeline(filters);
     TRY();
-        testPipeline.run();
-        if ( g_CurExecuted == 2 * static_cast<int>(get_iter_range_size()) ) {
-            // all the items were processed, though an exception was supposed to occur.
-            if(!g_ExceptionInMaster && g_NonMasterExecutedThrow > 0) {
-                // if !g_ExceptionInMaster, the external thread is not allowed to throw.
-                // if g_nonMasterExcutedThrow > 0 then a thread besides the external thread tried to throw.
-                REQUIRE_MESSAGE((filters.mode1 != tbb::filter_mode::parallel && filters.mode2 != tbb::filter_mode::parallel),
-                    "Unusual count");
-            }
-            // In case of all serial filters they might be all executed in the thread(s)
-            // where exceptions are not allowed by the common test logic. So we just quit.
-            return;
+    testPipeline.run();
+    if (g_CurExecuted == 2 * static_cast<int>(get_iter_range_size())) {
+        // all the items were processed, though an exception was supposed to occur.
+        if (!g_ExceptionInMaster && g_NonMasterExecutedThrow > 0) {
+            // if !g_ExceptionInMaster, the external thread is not allowed to throw.
+            // if g_nonMasterExcutedThrow > 0 then a thread besides the external thread tried to throw.
+            REQUIRE_MESSAGE((filters.mode1 != tbb::filter_mode::parallel
+                             && filters.mode2 != tbb::filter_mode::parallel),
+                            "Unusual count");
         }
+        // In case of all serial filters they might be all executed in the thread(s)
+        // where exceptions are not allowed by the common test logic. So we just quit.
+        return;
+    }
     CATCH_AND_ASSERT();
     g_TGCCancelled.validate(g_NumThreads, "Too many tasks survived exception");
-    REQUIRE_MESSAGE (g_CurExecuted <= g_ExecutedAtLastCatch + g_NumThreads, "Too many tasks survived exception");
-    REQUIRE_MESSAGE (g_NumExceptionsCaught == 1, "No try_blocks in any body expected in this test");
-    if ( !g_SolitaryException )
-        REQUIRE_MESSAGE (g_CurExecuted <= g_ExecutedAtLastCatch + g_NumThreads, "Too many tasks survived exception");
+    REQUIRE_MESSAGE(g_CurExecuted <= g_ExecutedAtLastCatch + g_NumThreads,
+                    "Too many tasks survived exception");
+    REQUIRE_MESSAGE(g_NumExceptionsCaught == 1, "No try_blocks in any body expected in this test");
+    if (!g_SolitaryException)
+        REQUIRE_MESSAGE(g_CurExecuted <= g_ExecutedAtLastCatch + g_NumThreads,
+                        "Too many tasks survived exception");
 
-} // void Test1_pipeline ()
+}// void Test1_pipeline ()
 
 // Filter with nesting
 class OuterFilter {
 public:
-    OuterFilter ( bool, bool ) {}
+    OuterFilter(bool, bool) {}
 
     void* operator()(void* item) const {
         ++g_OuterParCalls;
@@ -1416,31 +1428,34 @@ class OuterFilter {
         testPipeline.run();
         return item;
     }
-}; // class OuterFilter
+};// class OuterFilter
 
 //! Uses pipeline containing an inner pipeline with the default context not wrapped by a try-block.
 /** Inner algorithms are spawned inside the new bound context by default. Since
     exceptions thrown from the inner pipeline are not handled by the caller
     (outer pipeline body) in this test, they will cancel all the sibling inner
     algorithms. **/
-void Test2_pipeline ( const FilterSet& filters ) {
+void Test2_pipeline(const FilterSet& filters) {
     ResetGlobals();
     g_NestedPipelines = true;
     CustomPipeline<InputFilter, OuterFilter> testPipeline(filters);
     TRY();
-        testPipeline.run();
+    testPipeline.run();
     CATCH_AND_ASSERT();
-    bool okayNoExceptionCaught = (g_ExceptionInMaster && !g_MasterExecutedThrow) || (!g_ExceptionInMaster && !g_NonMasterExecutedThrow);
-    REQUIRE_MESSAGE ((g_NumExceptionsCaught == 1 || okayNoExceptionCaught), "No try_blocks in any body expected in this test");
-    if ( !g_SolitaryException ) {
-        REQUIRE_MESSAGE (g_CurExecuted <= g_ExecutedAtLastCatch + g_NumThreads, "Too many tasks survived exception");
+    bool okayNoExceptionCaught = (g_ExceptionInMaster && !g_MasterExecutedThrow)
+                                 || (!g_ExceptionInMaster && !g_NonMasterExecutedThrow);
+    REQUIRE_MESSAGE((g_NumExceptionsCaught == 1 || okayNoExceptionCaught),
+                    "No try_blocks in any body expected in this test");
+    if (!g_SolitaryException) {
+        REQUIRE_MESSAGE(g_CurExecuted <= g_ExecutedAtLastCatch + g_NumThreads,
+                        "Too many tasks survived exception");
     }
-} // void Test2_pipeline ()
+}// void Test2_pipeline ()
 
 //! creates isolated inner pipeline and runs it.
 class OuterFilterWithIsolatedCtx {
 public:
-    OuterFilterWithIsolatedCtx( bool , bool ) {}
+    OuterFilterWithIsolatedCtx(bool, bool) {}
 
     void* operator()(void* item) const {
         ++g_OuterParCalls;
@@ -1450,7 +1465,7 @@ class OuterFilterWithIsolatedCtx {
         testPipeline.run(ctx);
         return item;
     }
-}; // class OuterFilterWithIsolatedCtx
+};// class OuterFilterWithIsolatedCtx
 
 //! Uses pipeline invoking an inner pipeline with an isolated context without a try-block.
 /** Even though exceptions thrown from the inner pipeline are not handled
@@ -1458,23 +1473,22 @@ class OuterFilterWithIsolatedCtx {
     already running because of the isolated contexts. However because the first
     exception cancels the root parallel_for_each only the first g_NumThreads subranges
     will be processed (which launch inner pipelines) **/
-void Test3_pipeline ( const FilterSet& filters ) {
-    for( int nTries = 1; nTries <= 4; ++nTries) {
+void Test3_pipeline(const FilterSet& filters) {
+    for (int nTries = 1; nTries <= 4; ++nTries) {
         ResetGlobals();
         g_NestedPipelines = true;
         g_Master = std::this_thread::get_id();
-        intptr_t innerCalls = get_iter_range_size(),
-                 minExecuted = (g_NumThreads - 1) * innerCalls;
+        intptr_t innerCalls = get_iter_range_size(), minExecuted = (g_NumThreads - 1) * innerCalls;
         CustomPipeline<InputFilter, OuterFilterWithIsolatedCtx> testPipeline(filters);
         TRY();
-            testPipeline.run();
+        testPipeline.run();
         CATCH_AND_ASSERT();
 
-        bool okayNoExceptionCaught = (g_ExceptionInMaster && !g_MasterExecuted) ||
-            (!g_ExceptionInMaster && !g_NonMasterExecuted);
+        bool okayNoExceptionCaught = (g_ExceptionInMaster && !g_MasterExecuted)
+                                     || (!g_ExceptionInMaster && !g_NonMasterExecuted);
         // only test assertions if the test threw an exception (or we don't care)
         bool testSucceeded = okayNoExceptionCaught || g_NumExceptionsCaught > 0;
-        if(testSucceeded) {
+        if (testSucceeded) {
             if (g_SolitaryException) {
 
                 // The test is one outer pipeline with two NestedFilters that each start an inner pipeline.
@@ -1495,7 +1509,7 @@ void Test3_pipeline ( const FilterSet& filters ) {
                 //                   ^ completing pipelines (remembering two will not complete)
                 //                                              ^ one for the inner throwing pipeline
 
-                minExecuted = (2*get_iter_range_size()) * (g_PipelinesStarted - 2) + 1;
+                minExecuted = (2 * get_iter_range_size()) * (g_PipelinesStarted - 2) + 1;
                 // each failing pipeline must execute at least two tasks
                 REQUIRE_MESSAGE(g_CurExecuted >= minExecuted, "Too few tasks survived exception");
                 // no more than g_NumThreads tasks will be executed in a cancelled context.  Otherwise
@@ -1505,97 +1519,98 @@ void Test3_pipeline ( const FilterSet& filters ) {
                 // if we're only throwing from the external thread, and that thread didn't
                 // participate in the pipelines, then no throw occurred.
             }
-            REQUIRE_MESSAGE ((g_NumExceptionsCaught == 1 || okayNoExceptionCaught), "No try_blocks in any body expected in this test");
-            REQUIRE_MESSAGE (((g_CurExecuted <= g_ExecutedAtLastCatch + g_NumThreads) || okayNoExceptionCaught), "Too many tasks survived exception");
+            REQUIRE_MESSAGE((g_NumExceptionsCaught == 1 || okayNoExceptionCaught),
+                            "No try_blocks in any body expected in this test");
+            REQUIRE_MESSAGE(
+                    ((g_CurExecuted <= g_ExecutedAtLastCatch + g_NumThreads) || okayNoExceptionCaught),
+                    "Too many tasks survived exception");
             return;
         }
     }
 }
 
-class OuterFilterWithEhBody  {
+class OuterFilterWithEhBody {
 public:
-    OuterFilterWithEhBody( bool, bool ){}
+    OuterFilterWithEhBody(bool, bool) {}
 
     void* operator()(void* item) const {
         tbb::task_group_context ctx(tbb::task_group_context::isolated);
         ++g_OuterParCalls;
         SimplePipeline testPipeline(serial_parallel);
         TRY();
-            testPipeline.run(ctx);
+        testPipeline.run(ctx);
         CATCH();
         return item;
     }
-}; // class OuterFilterWithEhBody
+};// class OuterFilterWithEhBody
 
 //! Uses pipeline body invoking an inner pipeline (with isolated context) inside a try-block.
 /** Since exception(s) thrown from the inner pipeline are handled by the caller
     in this test, they do not affect other tasks of the the root pipeline
     nor sibling inner algorithms. **/
-void Test4_pipeline ( const FilterSet& filters ) {
+void Test4_pipeline(const FilterSet& filters) {
 #if __GNUC__ && !__INTEL_COMPILER
-    if ( strncmp(__VERSION__, "4.1.0", 5) == 0 ) {
+    if (strncmp(__VERSION__, "4.1.0", 5) == 0) {
         MESSAGE("Known issue: one of exception handling tests is skipped.");
         return;
     }
 #endif
-    ResetGlobals( true, true );
+    ResetGlobals(true, true);
     // each outer pipeline stage will start get_iter_range_size() inner pipelines.
     // each inner pipeline that doesn't throw will process get_iter_range_size() items.
     // for solitary exception there will be one pipeline that only processes one stage, one item.
     // innerCalls should be 2*get_iter_range_size()
-    intptr_t innerCalls = 2*get_iter_range_size(),
-             outerCalls = 2*get_iter_range_size(),
-             maxExecuted = outerCalls * innerCalls;  // the number of invocations of the inner pipelines
+    intptr_t innerCalls = 2 * get_iter_range_size(), outerCalls = 2 * get_iter_range_size(),
+             maxExecuted = outerCalls * innerCalls;// the number of invocations of the inner pipelines
     CustomPipeline<InputFilter, OuterFilterWithEhBody> testPipeline(filters);
     TRY();
-        testPipeline.run();
+    testPipeline.run();
     CATCH_AND_ASSERT();
-    intptr_t  minExecuted = 0;
-    bool okayNoExceptionCaught = (g_ExceptionInMaster && !g_MasterExecuted) ||
-        (!g_ExceptionInMaster && !g_NonMasterExecuted);
-    if ( g_SolitaryException ) {
-        minExecuted = maxExecuted - innerCalls;  // one throwing inner pipeline
+    intptr_t minExecuted = 0;
+    bool okayNoExceptionCaught
+            = (g_ExceptionInMaster && !g_MasterExecuted) || (!g_ExceptionInMaster && !g_NonMasterExecuted);
+    if (g_SolitaryException) {
+        minExecuted = maxExecuted - innerCalls;// one throwing inner pipeline
         REQUIRE_MESSAGE((g_NumExceptionsCaught == 1 || okayNoExceptionCaught), "No exception registered");
-        g_TGCCancelled.validate(g_NumThreads, "Too many tasks survived exception");  // probably will assert.
-    }
-    else {
+        g_TGCCancelled.validate(g_NumThreads, "Too many tasks survived exception");// probably will assert.
+    } else {
         // we assume throwing pipelines will not count
         minExecuted = (outerCalls - g_NumExceptionsCaught) * innerCalls;
-        REQUIRE_MESSAGE(((g_NumExceptionsCaught >= 1 && g_NumExceptionsCaught <= outerCalls) || okayNoExceptionCaught), "Unexpected actual number of exceptions");
-        REQUIRE_MESSAGE (g_CurExecuted >= minExecuted, "Too many executed tasks reported");
+        REQUIRE_MESSAGE(((g_NumExceptionsCaught >= 1 && g_NumExceptionsCaught <= outerCalls)
+                         || okayNoExceptionCaught),
+                        "Unexpected actual number of exceptions");
+        REQUIRE_MESSAGE(g_CurExecuted >= minExecuted, "Too many executed tasks reported");
         // too many already-scheduled tasks are started after the first exception is
         // thrown.  And g_ExecutedAtLastCatch is updated every time an exception is caught.
         // So with multiple exceptions there are a variable number of tasks that have been
         // discarded because of the signals.
         // each throw is caught, so we will see many cancelled tasks.  g_ExecutedAtLastCatch is
         // updated with each throw, so the value will be the number of tasks executed at the last
-        REQUIRE_MESSAGE (g_CurExecuted <= g_ExecutedAtLastCatch + g_NumThreads, "Too many tasks survived multiple exceptions");
+        REQUIRE_MESSAGE(g_CurExecuted <= g_ExecutedAtLastCatch + g_NumThreads,
+                        "Too many tasks survived multiple exceptions");
     }
-} // void Test4_pipeline ()
+}// void Test4_pipeline ()
 
 //! Tests pipeline function passed with different combination of filters
-template<void testFunc(const FilterSet&)>
+template <void testFunc(const FilterSet&)>
 void TestWithDifferentFiltersAndConcurrency() {
 #if __TBB_USE_ADDRESS_SANITIZER
     // parallel_pipeline allocates tls that sporadically observed as a memory leak with
     // detached threads. So, use task_scheduler_handle to join threads with finalize
-    tbb::task_scheduler_handle handle{ tbb::attach{} };
+    tbb::task_scheduler_handle handle {tbb::attach {}};
 #endif
-    for (auto concurrency_level: utils::concurrency_range()) {
+    for (auto concurrency_level : utils::concurrency_range()) {
         g_NumThreads = static_cast<int>(concurrency_level);
         g_Master = std::this_thread::get_id();
         if (g_NumThreads > 1) {
 
-            const tbb::filter_mode modes[] = {
-                tbb::filter_mode::parallel,
-                tbb::filter_mode::serial_in_order,
-                tbb::filter_mode::serial_out_of_order
-            };
+            const tbb::filter_mode modes[] = {tbb::filter_mode::parallel, tbb::filter_mode::serial_in_order,
+                                              tbb::filter_mode::serial_out_of_order};
 
-            const int NumFilterTypes = sizeof(modes)/sizeof(modes[0]);
+            const int NumFilterTypes = sizeof(modes) / sizeof(modes[0]);
 
             // Execute in all the possible modes
-            for ( size_t j = 0; j < 4; ++j ) {
+            for (size_t j = 0; j < 4; ++j) {
                 tbb::task_arena a(g_NumThreads);
                 a.execute([&] {
                     g_ExceptionInMaster = (j & 1) != 0;
@@ -1644,7 +1659,7 @@ TEST_CASE("parallel_pipeline exception handling test #4") {
 #endif
 #endif /* TBB_USE_EXCEPTIONS */
 
-class FilterToCancel  {
+class FilterToCancel {
 public:
     FilterToCancel() {}
     void* operator()(void* item) const {
@@ -1652,40 +1667,42 @@ class FilterToCancel  {
         Cancellator::WaitUntilReady();
         return item;
     }
-}; // class FilterToCancel
+};// class FilterToCancel
 
 template <class Filter_to_cancel>
 class PipelineLauncher {
-    tbb::task_group_context &my_ctx;
+    tbb::task_group_context& my_ctx;
+
 public:
-    PipelineLauncher ( tbb::task_group_context& ctx ) : my_ctx(ctx) {}
+    PipelineLauncher(tbb::task_group_context& ctx) : my_ctx(ctx) {}
 
     void operator()() const {
         // Run test when serial filter is the first non-input filter
         InputFilter inputFilter;
         Filter_to_cancel filterToCancel;
         tbb::parallel_pipeline(
-            g_NumTokens,
-            tbb::make_filter<void, void*>(tbb::filter_mode::parallel, inputFilter) &
-            tbb::make_filter<void*, void>(tbb::filter_mode::parallel, filterToCancel),
-            my_ctx
-        );
+                g_NumTokens,
+                tbb::make_filter<void, void*>(tbb::filter_mode::parallel, inputFilter)
+                        & tbb::make_filter<void*, void>(tbb::filter_mode::parallel, filterToCancel),
+                my_ctx);
     }
 };
 
 //! Test for cancelling an algorithm from outside (from a task running in parallel with the algorithm).
-void TestCancelation1_pipeline () {
+void TestCancelation1_pipeline() {
     ResetGlobals();
     g_ThrowException = false;
     // Threshold should leave more than max_threads tasks to test the cancellation. Set the threshold to iter_range_size()/4 since iter_range_size >= max_threads*2
     intptr_t threshold = get_iter_range_size() / 4;
-    REQUIRE_MESSAGE(get_iter_range_size() - threshold > g_NumThreads, "Threshold should leave more than max_threads tasks to test the cancellation.");
+    REQUIRE_MESSAGE(get_iter_range_size() - threshold > g_NumThreads,
+                    "Threshold should leave more than max_threads tasks to test the cancellation.");
     RunCancellationTest<PipelineLauncher<FilterToCancel>, Cancellator>(threshold);
     g_TGCCancelled.validate(g_NumThreads, "Too many tasks survived cancellation");
-    REQUIRE_MESSAGE (g_CurExecuted < g_ExecutedAtLastCatch + g_NumThreads, "Too many tasks were executed after cancellation");
+    REQUIRE_MESSAGE(g_CurExecuted < g_ExecutedAtLastCatch + g_NumThreads,
+                    "Too many tasks were executed after cancellation");
 }
 
-class FilterToCancel2  {
+class FilterToCancel2 {
 public:
     FilterToCancel2() {}
 
@@ -1693,22 +1710,21 @@ class FilterToCancel2  {
         ++g_CurExecuted;
         utils::ConcurrencyTracker ct;
         // The test will hang (and be timed out by the test system) if is_cancelled() is broken
-        while( !tbb::is_current_task_group_canceling() )
-            utils::yield();
+        while (!tbb::is_current_task_group_canceling()) utils::yield();
         return item;
     }
 };
 
 //! Test for cancelling an algorithm from outside (from a task running in parallel with the algorithm).
 /** This version also tests task::is_cancelled() method. **/
-void TestCancelation2_pipeline () {
+void TestCancelation2_pipeline() {
     ResetGlobals();
     RunCancellationTest<PipelineLauncher<FilterToCancel2>, Cancellator2>();
     // g_CurExecuted is always >= g_ExecutedAtLastCatch, because the latter is always a snapshot of the
     // former, and g_CurExecuted is monotonic increasing.  so the comparison should be at least ==.
     // If another filter is started after cancel but before cancellation is propagated, then the
     // number will be larger.
-    REQUIRE_MESSAGE (g_CurExecuted <= g_ExecutedAtLastCatch, "Some tasks were executed after cancellation");
+    REQUIRE_MESSAGE(g_CurExecuted <= g_ExecutedAtLastCatch, "Some tasks were executed after cancellation");
 }
 
 /** If min and max thread numbers specified on the command line are different,
@@ -1718,7 +1734,7 @@ void TestCancelation2_pipeline () {
 //! Testing parallel_pipeline cancellation
 //! \brief \ref error_guessing
 TEST_CASE("parallel_pipeline cancellation test #1") {
-    for (auto concurrency_level: utils::concurrency_range()) {
+    for (auto concurrency_level : utils::concurrency_range()) {
         g_NumThreads = static_cast<int>(concurrency_level);
         g_Master = std::this_thread::get_id();
         if (g_NumThreads > 1) {
@@ -1741,7 +1757,7 @@ TEST_CASE("parallel_pipeline cancellation test #1") {
 //! Testing parallel_pipeline cancellation
 //! \brief \ref error_guessing
 TEST_CASE("parallel_pipeline cancellation test #2") {
-    for (auto concurrency_level: utils::concurrency_range()) {
+    for (auto concurrency_level : utils::concurrency_range()) {
         g_NumThreads = static_cast<int>(concurrency_level);
         g_Master = std::this_thread::get_id();
         if (g_NumThreads > 1) {
diff --git a/external/tbb/test/tbb/test_eh_flow_graph.cpp b/external/tbb/test/tbb/test_eh_flow_graph.cpp
index 160efe90..4f354ceb 100644
--- a/external/tbb/test/tbb/test_eh_flow_graph.cpp
+++ b/external/tbb/test/tbb/test_eh_flow_graph.cpp
@@ -29,17 +29,17 @@
 
 #if TBB_USE_EXCEPTIONS
 
-#include "common/utils.h"
 #include "common/checktype.h"
 #include "common/concurrency_tracker.h"
+#include "common/utils.h"
 
 #if _MSC_VER
-    #pragma warning (disable: 4503) // Suppress "decorated name length exceeded, name was truncated" warning
+#pragma warning(disable : 4503)// Suppress "decorated name length exceeded, name was truncated" warning
 #endif
 
 #if __TBB_MSVC_UNREACHABLE_CODE_IGNORED
-    // Suppress "unreachable code" warning by VC++ 17.0-18.0 (VS 2012 or newer)
-    #pragma warning (disable: 4702)
+// Suppress "unreachable code" warning by VC++ 17.0-18.0 (VS 2012 or newer)
+#pragma warning(disable : 4702)
 #endif
 
 // global task_scheduler_observer is an imperfect tool to find how many threads are really
@@ -68,14 +68,31 @@ static const size_t unlimited_type = 0;
 static const size_t serial_type = 1;
 static const size_t limited_type = 4;
 
-template<TestNodeTypeEnum T> struct TestNodeTypeName;
-template<> struct TestNodeTypeName<nonThrowing> { static const char *name() { return "nonThrowing"; } };
-template<> struct TestNodeTypeName<isThrowing> { static const char *name() { return "isThrowing"; } };
+template <TestNodeTypeEnum T>
+struct TestNodeTypeName;
+template <>
+struct TestNodeTypeName<nonThrowing> {
+    static const char *name() { return "nonThrowing"; }
+};
+template <>
+struct TestNodeTypeName<isThrowing> {
+    static const char *name() { return "isThrowing"; }
+};
 
-template<size_t Conc> struct concurrencyName;
-template<> struct concurrencyName<serial_type>{ static const char *name() { return "serial"; } };
-template<> struct concurrencyName<unlimited_type>{ static const char *name() { return "unlimited"; } };
-template<> struct concurrencyName<limited_type>{ static const char *name() { return "limited"; } };
+template <size_t Conc>
+struct concurrencyName;
+template <>
+struct concurrencyName<serial_type> {
+    static const char *name() { return "serial"; }
+};
+template <>
+struct concurrencyName<unlimited_type> {
+    static const char *name() { return "unlimited"; }
+};
+template <>
+struct concurrencyName<limited_type> {
+    static const char *name() { return "limited"; }
+};
 
 // Class that provides waiting and throwing behavior.  If we are not throwing, do nothing
 // If serial, we can't wait for concurrency to peak; we may be the bottleneck and will
@@ -83,25 +100,25 @@ template<> struct concurrencyName<limited_type>{ static const char *name() { ret
 // arbitrary, and just makes sure there are enough items in the graph to keep it flowing),
 // If parallel or serial and throwing, use utils::ConcurrencyTracker to wait.
 
-template<size_t Conc, TestNodeTypeEnum t = nonThrowing>
+template <size_t Conc, TestNodeTypeEnum t = nonThrowing>
 class WaitThrow;
 
-template<>
-class WaitThrow<serial_type,nonThrowing> {
+template <>
+class WaitThrow<serial_type, nonThrowing> {
 protected:
     void WaitAndThrow(int cnt, const char * /*name*/) {
-        if(cnt > g_NumThreads + 10) {
+        if (cnt > g_NumThreads + 10) {
             utils::ConcurrencyTracker ct;
             WaitUntilConcurrencyPeaks();
         }
     }
 };
 
-template<>
-class WaitThrow<serial_type,isThrowing> {
+template <>
+class WaitThrow<serial_type, isThrowing> {
 protected:
     void WaitAndThrow(int cnt, const char * /*name*/) {
-        if(cnt > g_NumThreads + 10) {
+        if (cnt > g_NumThreads + 10) {
             utils::ConcurrencyTracker ct;
             WaitUntilConcurrencyPeaks();
             ThrowTestException(1);
@@ -115,33 +132,29 @@ class WaitThrow<serial_type,isThrowing> {
 // "absorbers" (because we broadcast to successors.)  for an odd number of threads we
 // need (g_NumThreads - limited + 1) / 2 items (that will give us one extra execution
 // of an "absorber", but we can't change that without changing the behavior of the node.)
-template<>
-class WaitThrow<limited_type,nonThrowing> {
+template <>
+class WaitThrow<limited_type, nonThrowing> {
 protected:
     void WaitAndThrow(int cnt, const char * /*name*/) {
-        if(cnt <= (g_NumThreads - (int)limited_type + 1)/2) {
-            return;
-        }
+        if (cnt <= (g_NumThreads - (int) limited_type + 1) / 2) { return; }
         utils::ConcurrencyTracker ct;
         WaitUntilConcurrencyPeaks();
     }
 };
 
-template<>
-class WaitThrow<limited_type,isThrowing> {
+template <>
+class WaitThrow<limited_type, isThrowing> {
 protected:
     void WaitAndThrow(int cnt, const char * /*name*/) {
         utils::ConcurrencyTracker ct;
-        if(cnt <= (g_NumThreads - (int)limited_type + 1)/2) {
-            return;
-        }
+        if (cnt <= (g_NumThreads - (int) limited_type + 1) / 2) { return; }
         WaitUntilConcurrencyPeaks();
         ThrowTestException(1);
     }
 };
 
-template<>
-class WaitThrow<unlimited_type,nonThrowing> {
+template <>
+class WaitThrow<unlimited_type, nonThrowing> {
 protected:
     void WaitAndThrow(int /*cnt*/, const char * /*name*/) {
         utils::ConcurrencyTracker ct;
@@ -149,8 +162,8 @@ class WaitThrow<unlimited_type,nonThrowing> {
     }
 };
 
-template<>
-class WaitThrow<unlimited_type,isThrowing> {
+template <>
+class WaitThrow<unlimited_type, isThrowing> {
 protected:
     void WaitAndThrow(int /*cnt*/, const char * /*name*/) {
         utils::ConcurrencyTracker ct;
@@ -159,8 +172,7 @@ class WaitThrow<unlimited_type,isThrowing> {
     }
 };
 
-void
-ResetGlobals(bool throwException = true, bool flog = false) {
+void ResetGlobals(bool throwException = true, bool flog = false) {
     nExceptions = 0;
     g_TGCCancelled = 0;
     ResetEhGlobals(throwException, flog);
@@ -172,12 +184,14 @@ class test_input_body : WaitThrow<serial_type, TType> {
     using WaitThrow<serial_type, TType>::WaitAndThrow;
     std::atomic<int> *my_current_val;
     int my_mult;
+
 public:
-    test_input_body(std::atomic<int> &my_cnt, int multiplier = 1) : my_current_val(&my_cnt), my_mult(multiplier) {
+    test_input_body(std::atomic<int> &my_cnt, int multiplier = 1)
+        : my_current_val(&my_cnt), my_mult(multiplier) {
         // INFO("- --------- - - -   constructed " << (size_t)(my_current_val) << "\n");
     }
 
-    OutputType operator()(tbb::flow_control& fc) {
+    OutputType operator()(tbb::flow_control &fc) {
         UPDATE_COUNTS();
         OutputType ret = OutputType(my_mult * ++(*my_current_val));
         // TODO revamp: reconsider logging for the tests.
@@ -186,52 +200,54 @@ class test_input_body : WaitThrow<serial_type, TType> {
         // calls to INFO() macro.
 
         // INFO("xx(" << (size_t)(my_current_val) << ") ret == " << (int)ret << "\n");
-        if(*my_current_val > g_NumItems) {
+        if (*my_current_val > g_NumItems) {
             // INFO(" ------ End of the line!\n");
             *my_current_val = g_NumItems;
             fc.stop();
             return OutputType();
         }
-        WaitAndThrow((int)ret,"test_input_body");
+        WaitAndThrow((int) ret, "test_input_body");
         return ret;
     }
 
-    int count_value() { return (int)*my_current_val; }
+    int count_value() { return (int) *my_current_val; }
 };
 
 template <TestNodeTypeEnum TType>
 class test_input_body<tbb::flow::continue_msg, TType> : WaitThrow<serial_type, TType> {
     using WaitThrow<serial_type, TType>::WaitAndThrow;
     std::atomic<int> *my_current_val;
+
 public:
-    test_input_body(std::atomic<int> &my_cnt) : my_current_val(&my_cnt) { }
+    test_input_body(std::atomic<int> &my_cnt) : my_current_val(&my_cnt) {}
 
-    tbb::flow::continue_msg operator()( tbb::flow_control & fc) {
+    tbb::flow::continue_msg operator()(tbb::flow_control &fc) {
         UPDATE_COUNTS();
         int outint = ++(*my_current_val);
-        if(*my_current_val > g_NumItems) {
+        if (*my_current_val > g_NumItems) {
             *my_current_val = g_NumItems;
             fc.stop();
             return tbb::flow::continue_msg();
         }
-        WaitAndThrow(outint,"test_input_body");
+        WaitAndThrow(outint, "test_input_body");
         return tbb::flow::continue_msg();
     }
 
-    int count_value() { return (int)*my_current_val; }
+    int count_value() { return (int) *my_current_val; }
 };
 
 // -------{function/continue}_node body ------------------
-template<class InputType, class OutputType, TestNodeTypeEnum T, size_t Conc>
-class absorber_body : WaitThrow<Conc,T> {
-    using WaitThrow<Conc,T>::WaitAndThrow;
+template <class InputType, class OutputType, TestNodeTypeEnum T, size_t Conc>
+class absorber_body : WaitThrow<Conc, T> {
+    using WaitThrow<Conc, T>::WaitAndThrow;
     std::atomic<int> *my_count;
+
 public:
-    absorber_body(std::atomic<int> &my_cnt) : my_count(&my_cnt) { }
-    OutputType operator()(const InputType &/*p_in*/) {
+    absorber_body(std::atomic<int> &my_cnt) : my_count(&my_cnt) {}
+    OutputType operator()(const InputType & /*p_in*/) {
         UPDATE_COUNTS();
         int out = ++(*my_count);
-        WaitAndThrow(out,"absorber_body");
+        WaitAndThrow(out, "absorber_body");
         return OutputType();
     }
     int count_value() { return *my_count; }
@@ -240,70 +256,70 @@ class absorber_body : WaitThrow<Conc,T> {
 // -------multifunction_node body ------------------
 
 // helper classes
-template<int N,class PortsType>
+template <int N, class PortsType>
 struct IssueOutput {
-    typedef typename std::tuple_element<N-1,PortsType>::type::output_type my_type;
+    typedef typename std::tuple_element<N - 1, PortsType>::type::output_type my_type;
 
-    static void issue_tuple_element( PortsType &my_ports) {
-        CHECK_MESSAGE( (std::get<N-1>(my_ports).try_put(my_type())), "Error putting to successor");
-        IssueOutput<N-1,PortsType>::issue_tuple_element(my_ports);
+    static void issue_tuple_element(PortsType &my_ports) {
+        CHECK_MESSAGE((std::get<N - 1>(my_ports).try_put(my_type())), "Error putting to successor");
+        IssueOutput<N - 1, PortsType>::issue_tuple_element(my_ports);
     }
 };
 
-template<class PortsType>
-struct IssueOutput<1,PortsType> {
-    typedef typename std::tuple_element<0,PortsType>::type::output_type my_type;
+template <class PortsType>
+struct IssueOutput<1, PortsType> {
+    typedef typename std::tuple_element<0, PortsType>::type::output_type my_type;
 
-    static void issue_tuple_element( PortsType &my_ports) {
-        CHECK_MESSAGE( (std::get<0>(my_ports).try_put(my_type())), "Error putting to successor");
+    static void issue_tuple_element(PortsType &my_ports) {
+        CHECK_MESSAGE((std::get<0>(my_ports).try_put(my_type())), "Error putting to successor");
     }
 };
 
-template<class InputType, class OutputTupleType, TestNodeTypeEnum T, size_t Conc>
-class multifunction_node_body : WaitThrow<Conc,T> {
-    using WaitThrow<Conc,T>::WaitAndThrow;
+template <class InputType, class OutputTupleType, TestNodeTypeEnum T, size_t Conc>
+class multifunction_node_body : WaitThrow<Conc, T> {
+    using WaitThrow<Conc, T>::WaitAndThrow;
     static const int N = std::tuple_size<OutputTupleType>::value;
-    typedef typename tbb::flow::multifunction_node<InputType,OutputTupleType> NodeType;
+    typedef typename tbb::flow::multifunction_node<InputType, OutputTupleType> NodeType;
     typedef typename NodeType::output_ports_type PortsType;
     std::atomic<int> *my_count;
+
 public:
-    multifunction_node_body(std::atomic<int> &my_cnt) : my_count(&my_cnt) { }
-    void operator()(const InputType& /*in*/, PortsType &my_ports) {
+    multifunction_node_body(std::atomic<int> &my_cnt) : my_count(&my_cnt) {}
+    void operator()(const InputType & /*in*/, PortsType &my_ports) {
         UPDATE_COUNTS();
         int out = ++(*my_count);
-        WaitAndThrow(out,"multifunction_node_body");
+        WaitAndThrow(out, "multifunction_node_body");
         // issue an item to each output port.
-        IssueOutput<N,PortsType>::issue_tuple_element(my_ports);
+        IssueOutput<N, PortsType>::issue_tuple_element(my_ports);
     }
 
     int count_value() { return *my_count; }
 };
 
 // --------- body to sort items in sequencer_node
-template<class BufferItemType>
+template <class BufferItemType>
 struct sequencer_body {
     size_t operator()(const BufferItemType &s) {
-        CHECK_MESSAGE( (s), "sequencer item out of range (== 0)");
+        CHECK_MESSAGE((s), "sequencer item out of range (== 0)");
         return size_t(s) - 1;
     }
 };
 
 // --------- type for < comparison in priority_queue_node.
-template<class ItemType>
+template <class ItemType>
 struct less_body {
-    bool operator()(const ItemType &lhs, const ItemType &rhs) {
-        return (int(lhs) % 3) < (int(rhs) % 3);
-    }
+    bool operator()(const ItemType &lhs, const ItemType &rhs) { return (int(lhs) % 3) < (int(rhs) % 3); }
 };
 
 // --------- tag methods for tag_matching join_node
-template<typename TT>
+template <typename TT>
 class tag_func {
     TT my_mult;
+
 public:
-    tag_func(TT multiplier) : my_mult(multiplier) { }
+    tag_func(TT multiplier) : my_mult(multiplier) {}
     // operator() will return [0 .. Count)
-    tbb::flow::tag_value operator()( TT v) {
+    tbb::flow::tag_value operator()(TT v) {
         tbb::flow::tag_value t = tbb::flow::tag_value(v / my_mult);
         return t;
     }
@@ -312,26 +328,27 @@ class tag_func {
 // --------- Input body for split_node test.
 template <class OutputTuple, TestNodeTypeEnum TType>
 class tuple_test_input_body : WaitThrow<serial_type, TType> {
-    typedef typename std::tuple_element<0,OutputTuple>::type ItemType0;
-    typedef typename std::tuple_element<1,OutputTuple>::type ItemType1;
+    typedef typename std::tuple_element<0, OutputTuple>::type ItemType0;
+    typedef typename std::tuple_element<1, OutputTuple>::type ItemType1;
     using WaitThrow<serial_type, TType>::WaitAndThrow;
     std::atomic<int> *my_current_val;
+
 public:
-    tuple_test_input_body(std::atomic<int> &my_cnt) : my_current_val(&my_cnt) { }
+    tuple_test_input_body(std::atomic<int> &my_cnt) : my_current_val(&my_cnt) {}
 
-    OutputTuple operator()(tbb::flow_control& fc) {
+    OutputTuple operator()(tbb::flow_control &fc) {
         UPDATE_COUNTS();
         int ival = ++(*my_current_val);
-        if(*my_current_val > g_NumItems) {
-            *my_current_val = g_NumItems;  // jam the final value; we assert on it later.
+        if (*my_current_val > g_NumItems) {
+            *my_current_val = g_NumItems;// jam the final value; we assert on it later.
             fc.stop();
             return OutputTuple();
         }
-        WaitAndThrow(ival,"tuple_test_input_body");
-        return OutputTuple(ItemType0(ival),ItemType1(ival));
+        WaitAndThrow(ival, "tuple_test_input_body");
+        return OutputTuple(ItemType0(ival), ItemType1(ival));
     }
 
-    int count_value() { return (int)*my_current_val; }
+    int count_value() { return (int) *my_current_val; }
 };
 
 // ------- end of node bodies
@@ -344,11 +361,11 @@ class tuple_test_input_body : WaitThrow<serial_type, TType> {
 //    After each run the graph is reset(), to test the reset functionality.
 //
 
-
-template<class ItemType, TestNodeTypeEnum inpThrowType, TestNodeTypeEnum absorbThrowType>
+template <class ItemType, TestNodeTypeEnum inpThrowType, TestNodeTypeEnum absorbThrowType>
 void run_one_input_node_test(bool throwException, bool flog) {
-    typedef test_input_body<ItemType,inpThrowType> src_body_type;
-    typedef absorber_body<ItemType, tbb::flow::continue_msg, absorbThrowType, unlimited_type> parallel_absorb_body_type;
+    typedef test_input_body<ItemType, inpThrowType> src_body_type;
+    typedef absorber_body<ItemType, tbb::flow::continue_msg, absorbThrowType, unlimited_type>
+            parallel_absorb_body_type;
     std::atomic<int> input_body_count;
     std::atomic<int> absorber_body_count;
     input_body_count = 0;
@@ -365,67 +382,67 @@ void run_one_input_node_test(bool throwException, bool flog) {
 
     tbb::flow::input_node<ItemType> sn(g, src_body_type(input_body_count));
     parallel_absorb_body_type ab2(absorber_body_count);
-    tbb::flow::function_node<ItemType> parallel_fn(g,tbb::flow::unlimited,ab2);
+    tbb::flow::function_node<ItemType> parallel_fn(g, tbb::flow::unlimited, ab2);
     make_edge(sn, parallel_fn);
-    for(int runcnt = 0; runcnt < 2; ++runcnt) {
-        ResetGlobals(throwException,flog);
-        if(throwException) {
+    for (int runcnt = 0; runcnt < 2; ++runcnt) {
+        ResetGlobals(throwException, flog);
+        if (throwException) {
             TRY();
-                sn.activate();
-                g.wait_for_all();
+            sn.activate();
+            g.wait_for_all();
             CATCH_AND_ASSERT();
-        }
-        else {
+        } else {
             TRY();
-                sn.activate();
-                g.wait_for_all();
+            sn.activate();
+            g.wait_for_all();
             CATCH_AND_FAIL();
         }
 
-        bool okayNoExceptionsCaught = (g_ExceptionInMaster && !g_MasterExecutedThrow) || (!g_ExceptionInMaster && !g_NonMasterExecutedThrow) || !throwException;
+        bool okayNoExceptionsCaught = (g_ExceptionInMaster && !g_MasterExecutedThrow)
+                                      || (!g_ExceptionInMaster && !g_NonMasterExecutedThrow)
+                                      || !throwException;
         int src_cnt = tbb::flow::copy_body<src_body_type>(sn).count_value();
         int sink_cnt = tbb::flow::copy_body<parallel_absorb_body_type>(parallel_fn).count_value();
-        if(throwException) {
-            CHECK_MESSAGE( (g.exception_thrown() || okayNoExceptionsCaught), "Exception flag in flow::graph not set");
-            CHECK_MESSAGE( (g.is_cancelled() || okayNoExceptionsCaught), "canceled flag not set");
-            CHECK_MESSAGE( (src_cnt <= g_NumItems), "Too many input_node items emitted");
-            CHECK_MESSAGE( (sink_cnt <= src_cnt), "Too many input_node items received");
+        if (throwException) {
+            CHECK_MESSAGE((g.exception_thrown() || okayNoExceptionsCaught),
+                          "Exception flag in flow::graph not set");
+            CHECK_MESSAGE((g.is_cancelled() || okayNoExceptionsCaught), "canceled flag not set");
+            CHECK_MESSAGE((src_cnt <= g_NumItems), "Too many input_node items emitted");
+            CHECK_MESSAGE((sink_cnt <= src_cnt), "Too many input_node items received");
+        } else {
+            CHECK_MESSAGE((!g.exception_thrown()), "Exception flag in flow::graph set but no throw occurred");
+            CHECK_MESSAGE((!g.is_cancelled()), "canceled flag set but no throw occurred");
+            CHECK_MESSAGE((src_cnt == g_NumItems), "Incorrect # input_node items emitted");
+            CHECK_MESSAGE((sink_cnt == src_cnt), "Incorrect # input_node items received");
         }
-        else {
-            CHECK_MESSAGE( (!g.exception_thrown()), "Exception flag in flow::graph set but no throw occurred");
-            CHECK_MESSAGE( (!g.is_cancelled()), "canceled flag set but no throw occurred");
-            CHECK_MESSAGE( (src_cnt == g_NumItems), "Incorrect # input_node items emitted");
-            CHECK_MESSAGE( (sink_cnt == src_cnt), "Incorrect # input_node items received");
-        }
-        g.reset();  // resets the body of the input_node and the absorb_nodes.
+        g.reset();// resets the body of the input_node and the absorb_nodes.
         input_body_count = 0;
         absorber_body_count = 0;
-        CHECK_MESSAGE( (!g.exception_thrown()), "Reset didn't clear exception_thrown()");
-        CHECK_MESSAGE( (!g.is_cancelled()), "Reset didn't clear is_cancelled()");
+        CHECK_MESSAGE((!g.exception_thrown()), "Reset didn't clear exception_thrown()");
+        CHECK_MESSAGE((!g.is_cancelled()), "Reset didn't clear is_cancelled()");
         src_cnt = tbb::flow::copy_body<src_body_type>(sn).count_value();
         sink_cnt = tbb::flow::copy_body<parallel_absorb_body_type>(parallel_fn).count_value();
-        CHECK_MESSAGE( (src_cnt == 0), "input_node count not reset");
-        CHECK_MESSAGE( (sink_cnt == 0), "sink_node count not reset");
+        CHECK_MESSAGE((src_cnt == 0), "input_node count not reset");
+        CHECK_MESSAGE((sink_cnt == 0), "sink_node count not reset");
     }
 #if USE_TASK_SCHEDULER_OBSERVER
     o.observe(false);
 #endif
-}  // run_one_input_node_test
-
+}// run_one_input_node_test
 
-template<class ItemType, TestNodeTypeEnum inpThrowType, TestNodeTypeEnum absorbThrowType>
+template <class ItemType, TestNodeTypeEnum inpThrowType, TestNodeTypeEnum absorbThrowType>
 void run_input_node_test() {
-    run_one_input_node_test<ItemType,inpThrowType,absorbThrowType>(false,false);
-    run_one_input_node_test<ItemType,inpThrowType,absorbThrowType>(true,false);
-    run_one_input_node_test<ItemType,inpThrowType,absorbThrowType>(true,true);
-}  // run_input_node_test
+    run_one_input_node_test<ItemType, inpThrowType, absorbThrowType>(false, false);
+    run_one_input_node_test<ItemType, inpThrowType, absorbThrowType>(true, false);
+    run_one_input_node_test<ItemType, inpThrowType, absorbThrowType>(true, true);
+}// run_input_node_test
 
 void test_input_node() {
     INFO("Testing input_node\n");
     CheckType<int>::check_type_counter = 0;
     g_Wakeup_Msg = "input_node(1): Missed wakeup or machine is overloaded?";
     run_input_node_test<CheckType<int>, isThrowing, nonThrowing>();
-    CHECK_MESSAGE( (!CheckType<int>::check_type_counter), "Some items leaked in test");
+    CHECK_MESSAGE((!CheckType<int>::check_type_counter), "Some items leaked in test");
     g_Wakeup_Msg = "input_node(2): Missed wakeup or machine is overloaded?";
     run_input_node_test<int, isThrowing, nonThrowing>();
     g_Wakeup_Msg = "input_node(3): Missed wakeup or machine is overloaded?";
@@ -435,7 +452,7 @@ void test_input_node() {
     g_Wakeup_Msg = "input_node(5): Missed wakeup or machine is overloaded?";
     run_input_node_test<CheckType<int>, isThrowing, isThrowing>();
     g_Wakeup_Msg = g_Orig_Wakeup_Msg;
-    CHECK_MESSAGE( (!CheckType<int>::check_type_counter), "Some items leaked in test");
+    CHECK_MESSAGE((!CheckType<int>::check_type_counter), "Some items leaked in test");
 }
 
 // -------- utilities & types to test function_node and multifunction_node.
@@ -443,43 +460,29 @@ void test_input_node() {
 // need to tell the template which node type I am using so it attaches successors correctly.
 enum NodeFetchType { func_node_type, multifunc_node_type };
 
-template<class NodeType, class ItemType, int indx, NodeFetchType NFT>
+template <class NodeType, class ItemType, int indx, NodeFetchType NFT>
 struct AttachPoint;
 
-template<class NodeType, class ItemType, int indx>
-struct AttachPoint<NodeType,ItemType,indx,multifunc_node_type> {
-    static tbb::flow::sender<ItemType> &GetSender(NodeType &n) {
-        return tbb::flow::output_port<indx>(n);
-    }
+template <class NodeType, class ItemType, int indx>
+struct AttachPoint<NodeType, ItemType, indx, multifunc_node_type> {
+    static tbb::flow::sender<ItemType> &GetSender(NodeType &n) { return tbb::flow::output_port<indx>(n); }
 };
 
-template<class NodeType, class ItemType, int indx>
-struct AttachPoint<NodeType,ItemType,indx,func_node_type> {
-    static tbb::flow::sender<ItemType> &GetSender(NodeType &n) {
-        return n;
-    }
+template <class NodeType, class ItemType, int indx>
+struct AttachPoint<NodeType, ItemType, indx, func_node_type> {
+    static tbb::flow::sender<ItemType> &GetSender(NodeType &n) { return n; }
 };
 
-
 // common template for running function_node, multifunction_node.  continue_node
 // has different firing requirements, so it needs a different graph topology.
-template<
-    class InputNodeType,
-    class InputNodeBodyType0,
-    class InputNodeBodyType1,
-    NodeFetchType NFT,
-    class TestNodeType,
-    class TestNodeBodyType,
-    class TypeToSink0,          // what kind of item are we sending to sink0
-    class TypeToSink1,          // what kind of item are we sending to sink1
-    class SinkNodeType0,        // will be same for function;
-    class SinkNodeType1,        // may differ for multifunction_node
-    class SinkNodeBodyType0,
-    class SinkNodeBodyType1,
-    size_t Conc
-    >
-void
-run_one_functype_node_test(bool throwException, bool flog, const char * /*name*/) {
+template <class InputNodeType, class InputNodeBodyType0, class InputNodeBodyType1, NodeFetchType NFT,
+          class TestNodeType, class TestNodeBodyType,
+          class TypeToSink0,  // what kind of item are we sending to sink0
+          class TypeToSink1,  // what kind of item are we sending to sink1
+          class SinkNodeType0,// will be same for function;
+          class SinkNodeType1,// may differ for multifunction_node
+          class SinkNodeBodyType0, class SinkNodeBodyType1, size_t Conc>
+void run_one_functype_node_test(bool throwException, bool flog, const char * /*name*/) {
 
     std::stringstream ss;
     std::string ss_str;
@@ -502,60 +505,68 @@ run_one_functype_node_test(bool throwException, bool flog, const char * /*name*/
     InputNodeType input0(g, InputNodeBodyType0(input0_count));
     InputNodeType input1(g, InputNodeBodyType1(input1_count));
     TestNodeType node_to_test(g, Conc, TestNodeBodyType(test_count));
-    SinkNodeType0 sink0(g,tbb::flow::unlimited,SinkNodeBodyType0(sink0_count));
-    SinkNodeType1 sink1(g,tbb::flow::unlimited,SinkNodeBodyType1(sink1_count));
+    SinkNodeType0 sink0(g, tbb::flow::unlimited, SinkNodeBodyType0(sink0_count));
+    SinkNodeType1 sink1(g, tbb::flow::unlimited, SinkNodeBodyType1(sink1_count));
     make_edge(input0, node_to_test);
     make_edge(input1, node_to_test);
     make_edge(AttachPoint<TestNodeType, TypeToSink0, 0, NFT>::GetSender(node_to_test), sink0);
     make_edge(AttachPoint<TestNodeType, TypeToSink1, 1, NFT>::GetSender(node_to_test), sink1);
 
-    for(int iter = 0; iter < 2; ++iter) {  // run, reset, run again
+    for (int iter = 0; iter < 2; ++iter) {// run, reset, run again
         ss.clear();
-        ss << saved_msg << " iter=" << iter << ", threads=" << g_NumThreads << ", throw=" << (throwException ? "T" : "F") << ", flow=" << (flog ? "T" : "F");
+        ss << saved_msg << " iter=" << iter << ", threads=" << g_NumThreads
+           << ", throw=" << (throwException ? "T" : "F") << ", flow=" << (flog ? "T" : "F");
         ss_str = ss.str();
         g_Wakeup_Msg = ss_str.c_str();
-        ResetGlobals(throwException,flog);
-        if(throwException) {
+        ResetGlobals(throwException, flog);
+        if (throwException) {
             TRY();
-                input0.activate();
-                input1.activate();
-                g.wait_for_all();
+            input0.activate();
+            input1.activate();
+            g.wait_for_all();
             CATCH_AND_ASSERT();
-        }
-        else {
+        } else {
             TRY();
-                input0.activate();
-                input1.activate();
-                g.wait_for_all();
+            input0.activate();
+            input1.activate();
+            g.wait_for_all();
             CATCH_AND_FAIL();
         }
-        bool okayNoExceptionsCaught = (g_ExceptionInMaster && !g_MasterExecutedThrow) || (!g_ExceptionInMaster && !g_NonMasterExecutedThrow) || !throwException;
+        bool okayNoExceptionsCaught = (g_ExceptionInMaster && !g_MasterExecutedThrow)
+                                      || (!g_ExceptionInMaster && !g_NonMasterExecutedThrow)
+                                      || !throwException;
         int ib0_cnt = tbb::flow::copy_body<InputNodeBodyType0>(input0).count_value();
         int ib1_cnt = tbb::flow::copy_body<InputNodeBodyType1>(input1).count_value();
-        int t_cnt   = tbb::flow::copy_body<TestNodeBodyType>(node_to_test).count_value();
+        int t_cnt = tbb::flow::copy_body<TestNodeBodyType>(node_to_test).count_value();
         int nb0_cnt = tbb::flow::copy_body<SinkNodeBodyType0>(sink0).count_value();
         int nb1_cnt = tbb::flow::copy_body<SinkNodeBodyType1>(sink1).count_value();
-        if(throwException) {
-            CHECK_MESSAGE( (g.exception_thrown() || okayNoExceptionsCaught), "Exception not caught by graph");
-            CHECK_MESSAGE( (g.is_cancelled() || okayNoExceptionsCaught), "Cancellation not signalled in graph");
-            CHECK_MESSAGE( (ib0_cnt + ib1_cnt <= 2*g_NumItems), "Too many items sent by inputs");
-            CHECK_MESSAGE( (ib0_cnt + ib1_cnt >= t_cnt), "Too many items received by test node");
-            CHECK_MESSAGE( (nb0_cnt + nb1_cnt <= t_cnt*2), "Too many items received by sink nodes");
-        }
-        else {
-            CHECK_MESSAGE( (!g.exception_thrown()), "Exception flag in flow::graph set but no throw occurred");
-            CHECK_MESSAGE( (!g.is_cancelled()), "canceled flag set but no throw occurred");
-            CHECK_MESSAGE( (ib0_cnt + ib1_cnt == 2*g_NumItems), "Missing invocations of input_nodes");
-            CHECK_MESSAGE( (t_cnt == 2*g_NumItems), "Not all items reached test node");
-            CHECK_MESSAGE( (nb0_cnt == 2*g_NumItems && nb1_cnt == 2*g_NumItems), "Missing items in absorbers");
+        if (throwException) {
+            CHECK_MESSAGE((g.exception_thrown() || okayNoExceptionsCaught), "Exception not caught by graph");
+            CHECK_MESSAGE((g.is_cancelled() || okayNoExceptionsCaught),
+                          "Cancellation not signalled in graph");
+            CHECK_MESSAGE((ib0_cnt + ib1_cnt <= 2 * g_NumItems), "Too many items sent by inputs");
+            CHECK_MESSAGE((ib0_cnt + ib1_cnt >= t_cnt), "Too many items received by test node");
+            CHECK_MESSAGE((nb0_cnt + nb1_cnt <= t_cnt * 2), "Too many items received by sink nodes");
+        } else {
+            CHECK_MESSAGE((!g.exception_thrown()), "Exception flag in flow::graph set but no throw occurred");
+            CHECK_MESSAGE((!g.is_cancelled()), "canceled flag set but no throw occurred");
+            CHECK_MESSAGE((ib0_cnt + ib1_cnt == 2 * g_NumItems), "Missing invocations of input_nodes");
+            CHECK_MESSAGE((t_cnt == 2 * g_NumItems), "Not all items reached test node");
+            CHECK_MESSAGE((nb0_cnt == 2 * g_NumItems && nb1_cnt == 2 * g_NumItems),
+                          "Missing items in absorbers");
         }
-        g.reset();  // resets the body of the input_nodes, test_node and the absorb_nodes.
+        g.reset();// resets the body of the input_nodes, test_node and the absorb_nodes.
         input0_count = input1_count = sink0_count = sink1_count = test_count = 0;
-        CHECK_MESSAGE( (0 == tbb::flow::copy_body<InputNodeBodyType0>(input0).count_value()),"Reset input 0 failed");
-        CHECK_MESSAGE( (0 == tbb::flow::copy_body<InputNodeBodyType1>(input1).count_value()),"Reset input 1 failed");
-        CHECK_MESSAGE( (0 == tbb::flow::copy_body<TestNodeBodyType>(node_to_test).count_value()),"Reset test_node failed");
-        CHECK_MESSAGE( (0 == tbb::flow::copy_body<SinkNodeBodyType0>(sink0).count_value()),"Reset sink 0 failed");
-        CHECK_MESSAGE( (0 == tbb::flow::copy_body<SinkNodeBodyType1>(sink1).count_value()),"Reset sink 1 failed");
+        CHECK_MESSAGE((0 == tbb::flow::copy_body<InputNodeBodyType0>(input0).count_value()),
+                      "Reset input 0 failed");
+        CHECK_MESSAGE((0 == tbb::flow::copy_body<InputNodeBodyType1>(input1).count_value()),
+                      "Reset input 1 failed");
+        CHECK_MESSAGE((0 == tbb::flow::copy_body<TestNodeBodyType>(node_to_test).count_value()),
+                      "Reset test_node failed");
+        CHECK_MESSAGE((0 == tbb::flow::copy_body<SinkNodeBodyType0>(sink0).count_value()),
+                      "Reset sink 0 failed");
+        CHECK_MESSAGE((0 == tbb::flow::copy_body<SinkNodeBodyType1>(sink1).count_value()),
+                      "Reset sink 1 failed");
 
         g_Wakeup_Msg = saved_msg;
     }
@@ -576,92 +587,107 @@ run_one_functype_node_test(bool throwException, bool flog, const char * /*name*/
 //
 //    After each run the graph is reset(), to test the reset functionality.
 //
-template<
-    TestNodeTypeEnum IType1,                          // does input node 1 throw?
-    TestNodeTypeEnum IType2,                          // does input node 2 throw?
-    class Item12,                                     // type of item passed between inputs and test node
-    TestNodeTypeEnum FType,                           // does function node throw?
-    class Item23,                                     // type passed from function_node to sink nodes
-    TestNodeTypeEnum NType1,                          // does sink node 1 throw?
-    TestNodeTypeEnum NType2,                          // does sink node 1 throw?
-    class NodePolicy,                                 // rejecting,queueing
-    size_t Conc                                       // is node concurrent? {serial | limited | unlimited}
->
+template <TestNodeTypeEnum IType1,// does input node 1 throw?
+          TestNodeTypeEnum IType2,// does input node 2 throw?
+          class Item12,           // type of item passed between inputs and test node
+          TestNodeTypeEnum FType, // does function node throw?
+          class Item23,           // type passed from function_node to sink nodes
+          TestNodeTypeEnum NType1,// does sink node 1 throw?
+          TestNodeTypeEnum NType2,// does sink node 1 throw?
+          class NodePolicy,       // rejecting,queueing
+          size_t Conc             // is node concurrent? {serial | limited | unlimited}
+          >
 void run_function_node_test() {
 
-    typedef test_input_body<Item12,IType1> IBodyType1;
-    typedef test_input_body<Item12,IType2> IBodyType2;
+    typedef test_input_body<Item12, IType1> IBodyType1;
+    typedef test_input_body<Item12, IType2> IBodyType2;
     typedef absorber_body<Item12, Item23, FType, Conc> TestBodyType;
-    typedef absorber_body<Item23,tbb::flow::continue_msg, NType1, unlimited_type> SinkBodyType1;
-    typedef absorber_body<Item23,tbb::flow::continue_msg, NType2, unlimited_type> SinkBodyType2;
+    typedef absorber_body<Item23, tbb::flow::continue_msg, NType1, unlimited_type> SinkBodyType1;
+    typedef absorber_body<Item23, tbb::flow::continue_msg, NType2, unlimited_type> SinkBodyType2;
 
     typedef tbb::flow::input_node<Item12> InputType;
     typedef tbb::flow::function_node<Item12, Item23, NodePolicy> TestType;
-    typedef tbb::flow::function_node<Item23,tbb::flow::continue_msg> SnkType;
+    typedef tbb::flow::function_node<Item23, tbb::flow::continue_msg> SnkType;
 
-    for(int i = 0; i < 4; ++i ) {
-        if(i != 2) {  // doesn't make sense to flog a non-throwing test
+    for (int i = 0; i < 4; ++i) {
+        if (i != 2) {// doesn't make sense to flog a non-throwing test
             bool doThrow = (i & 0x1) != 0;
             bool doFlog = (i & 0x2) != 0;
             run_one_functype_node_test<
-                /*InputNodeType*/       InputType,
-                /*InputNodeBodyType0*/  IBodyType1,
-                /*InputNodeBodyType1*/  IBodyType2,
-                /* NFT */               func_node_type,
-                /*TestNodeType*/        TestType,
-                /*TestNodeBodyType*/    TestBodyType,
-                /*TypeToSink0 */        Item23,
-                /*TypeToSink1 */        Item23,
-                /*SinkNodeType0*/       SnkType,
-                /*SinkNodeType1*/       SnkType,
-                /*SinkNodeBodyType1*/   SinkBodyType1,
-                /*SinkNodeBodyType2*/   SinkBodyType2,
-                /*Conc*/                Conc>
-                    (doThrow,doFlog,"function_node");
+                    /*InputNodeType*/ InputType,
+                    /*InputNodeBodyType0*/ IBodyType1,
+                    /*InputNodeBodyType1*/ IBodyType2,
+                    /* NFT */ func_node_type,
+                    /*TestNodeType*/ TestType,
+                    /*TestNodeBodyType*/ TestBodyType,
+                    /*TypeToSink0 */ Item23,
+                    /*TypeToSink1 */ Item23,
+                    /*SinkNodeType0*/ SnkType,
+                    /*SinkNodeType1*/ SnkType,
+                    /*SinkNodeBodyType1*/ SinkBodyType1,
+                    /*SinkNodeBodyType2*/ SinkBodyType2,
+                    /*Conc*/ Conc>(doThrow, doFlog, "function_node");
         }
     }
-}  // run_function_node_test
+}// run_function_node_test
 
 void test_function_node() {
     INFO("Testing function_node\n");
     // serial rejecting
     g_Wakeup_Msg = "function_node(1a): Missed wakeup or machine is overloaded?";
-    run_function_node_test<isThrowing, nonThrowing, int, nonThrowing, int, nonThrowing, nonThrowing, tbb::flow::rejecting, serial_type>();
+    run_function_node_test<isThrowing, nonThrowing, int, nonThrowing, int, nonThrowing, nonThrowing,
+                           tbb::flow::rejecting, serial_type>();
     g_Wakeup_Msg = "function_node(1b): Missed wakeup or machine is overloaded?";
-    run_function_node_test<nonThrowing, nonThrowing, int, isThrowing, int, nonThrowing, nonThrowing, tbb::flow::rejecting, serial_type>();
+    run_function_node_test<nonThrowing, nonThrowing, int, isThrowing, int, nonThrowing, nonThrowing,
+                           tbb::flow::rejecting, serial_type>();
     g_Wakeup_Msg = "function_node(1c): Missed wakeup or machine is overloaded?";
-    run_function_node_test<nonThrowing, nonThrowing, int, nonThrowing, int, isThrowing, nonThrowing, tbb::flow::rejecting, serial_type>();
+    run_function_node_test<nonThrowing, nonThrowing, int, nonThrowing, int, isThrowing, nonThrowing,
+                           tbb::flow::rejecting, serial_type>();
 
     // serial queueing
     g_Wakeup_Msg = "function_node(2): Missed wakeup or machine is overloaded?";
-    run_function_node_test<isThrowing, nonThrowing, int, nonThrowing, int, nonThrowing, nonThrowing, tbb::flow::queueing, serial_type>();
-    run_function_node_test<nonThrowing, nonThrowing, int, isThrowing, int, nonThrowing, nonThrowing, tbb::flow::queueing, serial_type>();
-    run_function_node_test<nonThrowing, nonThrowing, int, nonThrowing, int, isThrowing, nonThrowing, tbb::flow::queueing, serial_type>();
+    run_function_node_test<isThrowing, nonThrowing, int, nonThrowing, int, nonThrowing, nonThrowing,
+                           tbb::flow::queueing, serial_type>();
+    run_function_node_test<nonThrowing, nonThrowing, int, isThrowing, int, nonThrowing, nonThrowing,
+                           tbb::flow::queueing, serial_type>();
+    run_function_node_test<nonThrowing, nonThrowing, int, nonThrowing, int, isThrowing, nonThrowing,
+                           tbb::flow::queueing, serial_type>();
     CheckType<int>::check_type_counter = 0;
-    run_function_node_test<nonThrowing, nonThrowing, CheckType<int>, nonThrowing, CheckType<int>, isThrowing, nonThrowing, tbb::flow::queueing, serial_type>();
-    CHECK_MESSAGE( (!CheckType<int>::check_type_counter), "Some items leaked in test");
+    run_function_node_test<nonThrowing, nonThrowing, CheckType<int>, nonThrowing, CheckType<int>, isThrowing,
+                           nonThrowing, tbb::flow::queueing, serial_type>();
+    CHECK_MESSAGE((!CheckType<int>::check_type_counter), "Some items leaked in test");
 
     // unlimited parallel rejecting
     g_Wakeup_Msg = "function_node(3): Missed wakeup or machine is overloaded?";
-    run_function_node_test<isThrowing, nonThrowing, int, nonThrowing, int, nonThrowing, nonThrowing, tbb::flow::rejecting, unlimited_type>();
-    run_function_node_test<nonThrowing, nonThrowing, int, isThrowing, int, nonThrowing, nonThrowing, tbb::flow::rejecting, unlimited_type>();
-    run_function_node_test<nonThrowing, nonThrowing, int, nonThrowing, int, nonThrowing, isThrowing, tbb::flow::rejecting, unlimited_type>();
+    run_function_node_test<isThrowing, nonThrowing, int, nonThrowing, int, nonThrowing, nonThrowing,
+                           tbb::flow::rejecting, unlimited_type>();
+    run_function_node_test<nonThrowing, nonThrowing, int, isThrowing, int, nonThrowing, nonThrowing,
+                           tbb::flow::rejecting, unlimited_type>();
+    run_function_node_test<nonThrowing, nonThrowing, int, nonThrowing, int, nonThrowing, isThrowing,
+                           tbb::flow::rejecting, unlimited_type>();
 
     // limited parallel rejecting
     g_Wakeup_Msg = "function_node(4): Missed wakeup or machine is overloaded?";
-    run_function_node_test<isThrowing, nonThrowing, int, nonThrowing, int, nonThrowing, nonThrowing, tbb::flow::rejecting, limited_type>();
-    run_function_node_test<nonThrowing, nonThrowing, int, isThrowing, int, nonThrowing, nonThrowing, tbb::flow::rejecting, (size_t)limited_type>();
-    run_function_node_test<nonThrowing, nonThrowing, int, nonThrowing, int, nonThrowing, isThrowing, tbb::flow::rejecting, (size_t)limited_type>();
+    run_function_node_test<isThrowing, nonThrowing, int, nonThrowing, int, nonThrowing, nonThrowing,
+                           tbb::flow::rejecting, limited_type>();
+    run_function_node_test<nonThrowing, nonThrowing, int, isThrowing, int, nonThrowing, nonThrowing,
+                           tbb::flow::rejecting, (size_t) limited_type>();
+    run_function_node_test<nonThrowing, nonThrowing, int, nonThrowing, int, nonThrowing, isThrowing,
+                           tbb::flow::rejecting, (size_t) limited_type>();
 
     // limited parallel queueing
     g_Wakeup_Msg = "function_node(5): Missed wakeup or machine is overloaded?";
-    run_function_node_test<isThrowing, nonThrowing, int, nonThrowing, int, nonThrowing, nonThrowing, tbb::flow::queueing, (size_t)limited_type>();
-    run_function_node_test<nonThrowing, nonThrowing, int, isThrowing, int, nonThrowing, nonThrowing, tbb::flow::queueing, (size_t)limited_type>();
-    run_function_node_test<nonThrowing, nonThrowing, int, nonThrowing, int, nonThrowing, isThrowing, tbb::flow::queueing, (size_t)limited_type>();
+    run_function_node_test<isThrowing, nonThrowing, int, nonThrowing, int, nonThrowing, nonThrowing,
+                           tbb::flow::queueing, (size_t) limited_type>();
+    run_function_node_test<nonThrowing, nonThrowing, int, isThrowing, int, nonThrowing, nonThrowing,
+                           tbb::flow::queueing, (size_t) limited_type>();
+    run_function_node_test<nonThrowing, nonThrowing, int, nonThrowing, int, nonThrowing, isThrowing,
+                           tbb::flow::queueing, (size_t) limited_type>();
 
     // everyone throwing
     g_Wakeup_Msg = "function_node(6): Missed wakeup or machine is overloaded?";
-    run_function_node_test<isThrowing, isThrowing, int, isThrowing, int, isThrowing, isThrowing, tbb::flow::rejecting, unlimited_type>();
+    run_function_node_test<isThrowing, isThrowing, int, isThrowing, int, isThrowing, isThrowing,
+                           tbb::flow::rejecting, unlimited_type>();
     g_Wakeup_Msg = g_Orig_Wakeup_Msg;
 }
 
@@ -680,95 +706,114 @@ void test_function_node() {
 //    multifunction_node will put an item to each successor for every item
 //    received.
 //
-template<
-    TestNodeTypeEnum IType0,                          // does input node 1 throw?
-    TestNodeTypeEnum IType1,                          // does input node 2 thorw?
-    class Item12,                                 // type of item passed between inputs and test node
-    TestNodeTypeEnum FType,                           // does multifunction node throw?
-    class ItemTuple,                              // tuple of types passed from multifunction_node to sink nodes
-    TestNodeTypeEnum NType1,                          // does sink node 1 throw?
-    TestNodeTypeEnum NType2,                          // does sink node 2 throw?
-    class  NodePolicy,                            // rejecting,queueing
-    size_t Conc                                   // is node concurrent? {serial | limited | unlimited}
->
+template <TestNodeTypeEnum IType0,// does input node 1 throw?
+          TestNodeTypeEnum IType1,// does input node 2 thorw?
+          class Item12,           // type of item passed between inputs and test node
+          TestNodeTypeEnum FType, // does multifunction node throw?
+          class ItemTuple,        // tuple of types passed from multifunction_node to sink nodes
+          TestNodeTypeEnum NType1,// does sink node 1 throw?
+          TestNodeTypeEnum NType2,// does sink node 2 throw?
+          class NodePolicy,       // rejecting,queueing
+          size_t Conc             // is node concurrent? {serial | limited | unlimited}
+          >
 void run_multifunction_node_test() {
 
-    typedef typename std::tuple_element<0,ItemTuple>::type Item23Type0;
-    typedef typename std::tuple_element<1,ItemTuple>::type Item23Type1;
-    typedef test_input_body<Item12,IType0> IBodyType1;
-    typedef test_input_body<Item12,IType1> IBodyType2;
+    typedef typename std::tuple_element<0, ItemTuple>::type Item23Type0;
+    typedef typename std::tuple_element<1, ItemTuple>::type Item23Type1;
+    typedef test_input_body<Item12, IType0> IBodyType1;
+    typedef test_input_body<Item12, IType1> IBodyType2;
     typedef multifunction_node_body<Item12, ItemTuple, FType, Conc> TestBodyType;
-    typedef absorber_body<Item23Type0,tbb::flow::continue_msg, NType1, unlimited_type> SinkBodyType1;
-    typedef absorber_body<Item23Type1,tbb::flow::continue_msg, NType2, unlimited_type> SinkBodyType2;
+    typedef absorber_body<Item23Type0, tbb::flow::continue_msg, NType1, unlimited_type> SinkBodyType1;
+    typedef absorber_body<Item23Type1, tbb::flow::continue_msg, NType2, unlimited_type> SinkBodyType2;
 
     typedef tbb::flow::input_node<Item12> InputType;
     typedef tbb::flow::multifunction_node<Item12, ItemTuple, NodePolicy> TestType;
-    typedef tbb::flow::function_node<Item23Type0,tbb::flow::continue_msg> SnkType0;
-    typedef tbb::flow::function_node<Item23Type1,tbb::flow::continue_msg> SnkType1;
+    typedef tbb::flow::function_node<Item23Type0, tbb::flow::continue_msg> SnkType0;
+    typedef tbb::flow::function_node<Item23Type1, tbb::flow::continue_msg> SnkType1;
 
-    for(int i = 0; i < 4; ++i ) {
-        if(i != 2) {  // doesn't make sense to flog a non-throwing test
+    for (int i = 0; i < 4; ++i) {
+        if (i != 2) {// doesn't make sense to flog a non-throwing test
             bool doThrow = (i & 0x1) != 0;
             bool doFlog = (i & 0x2) != 0;
-    run_one_functype_node_test<
-        /*InputNodeType*/       InputType,
-        /*InputNodeBodyType0*/  IBodyType1,
-        /*InputNodeBodyType1*/  IBodyType2,
-        /*NFT*/                 multifunc_node_type,
-        /*TestNodeType*/        TestType,
-        /*TestNodeBodyType*/    TestBodyType,
-        /*TypeToSink0*/         Item23Type0,
-        /*TypeToSink1*/         Item23Type1,
-        /*SinkNodeType0*/       SnkType0,
-        /*SinkNodeType1*/       SnkType1,
-        /*SinkNodeBodyType0*/   SinkBodyType1,
-        /*SinkNodeBodyType1*/   SinkBodyType2,
-        /*Conc*/                Conc>
-            (doThrow,doFlog,"multifunction_node");
+            run_one_functype_node_test<
+                    /*InputNodeType*/ InputType,
+                    /*InputNodeBodyType0*/ IBodyType1,
+                    /*InputNodeBodyType1*/ IBodyType2,
+                    /*NFT*/ multifunc_node_type,
+                    /*TestNodeType*/ TestType,
+                    /*TestNodeBodyType*/ TestBodyType,
+                    /*TypeToSink0*/ Item23Type0,
+                    /*TypeToSink1*/ Item23Type1,
+                    /*SinkNodeType0*/ SnkType0,
+                    /*SinkNodeType1*/ SnkType1,
+                    /*SinkNodeBodyType0*/ SinkBodyType1,
+                    /*SinkNodeBodyType1*/ SinkBodyType2,
+                    /*Conc*/ Conc>(doThrow, doFlog, "multifunction_node");
         }
     }
-}  // run_multifunction_node_test
+}// run_multifunction_node_test
 
 void test_multifunction_node() {
     INFO("Testing multifunction_node\n");
-    g_Wakeup_Msg = "multifunction_node(input throws,rejecting,serial): Missed wakeup or machine is overloaded?";
+    g_Wakeup_Msg
+            = "multifunction_node(input throws,rejecting,serial): Missed wakeup or machine is overloaded?";
     // serial rejecting
-    run_multifunction_node_test<isThrowing, nonThrowing, int, nonThrowing, std::tuple<int,float>, nonThrowing, nonThrowing, tbb::flow::rejecting, serial_type>();
-    g_Wakeup_Msg = "multifunction_node(test throws,rejecting,serial): Missed wakeup or machine is overloaded?";
-    run_multifunction_node_test<nonThrowing, nonThrowing, int, isThrowing, std::tuple<int,int>, nonThrowing, nonThrowing, tbb::flow::rejecting, serial_type>();
-    g_Wakeup_Msg = "multifunction_node(sink throws,rejecting,serial): Missed wakeup or machine is overloaded?";
-    run_multifunction_node_test<nonThrowing, nonThrowing, int, nonThrowing, std::tuple<int,int>, isThrowing, nonThrowing, tbb::flow::rejecting, serial_type>();
+    run_multifunction_node_test<isThrowing, nonThrowing, int, nonThrowing, std::tuple<int, float>,
+                                nonThrowing, nonThrowing, tbb::flow::rejecting, serial_type>();
+    g_Wakeup_Msg
+            = "multifunction_node(test throws,rejecting,serial): Missed wakeup or machine is overloaded?";
+    run_multifunction_node_test<nonThrowing, nonThrowing, int, isThrowing, std::tuple<int, int>, nonThrowing,
+                                nonThrowing, tbb::flow::rejecting, serial_type>();
+    g_Wakeup_Msg
+            = "multifunction_node(sink throws,rejecting,serial): Missed wakeup or machine is overloaded?";
+    run_multifunction_node_test<nonThrowing, nonThrowing, int, nonThrowing, std::tuple<int, int>, isThrowing,
+                                nonThrowing, tbb::flow::rejecting, serial_type>();
 
     g_Wakeup_Msg = "multifunction_node(2): Missed wakeup or machine is overloaded?";
     // serial queueing
-    run_multifunction_node_test<isThrowing, nonThrowing, int, nonThrowing, std::tuple<int,int>, nonThrowing, nonThrowing, tbb::flow::queueing, serial_type>();
-    run_multifunction_node_test<nonThrowing, nonThrowing, int, isThrowing, std::tuple<int,int>, nonThrowing, nonThrowing, tbb::flow::queueing, serial_type>();
-    run_multifunction_node_test<nonThrowing, nonThrowing, int, nonThrowing, std::tuple<int,int>, isThrowing, nonThrowing, tbb::flow::queueing, serial_type>();
+    run_multifunction_node_test<isThrowing, nonThrowing, int, nonThrowing, std::tuple<int, int>, nonThrowing,
+                                nonThrowing, tbb::flow::queueing, serial_type>();
+    run_multifunction_node_test<nonThrowing, nonThrowing, int, isThrowing, std::tuple<int, int>, nonThrowing,
+                                nonThrowing, tbb::flow::queueing, serial_type>();
+    run_multifunction_node_test<nonThrowing, nonThrowing, int, nonThrowing, std::tuple<int, int>, isThrowing,
+                                nonThrowing, tbb::flow::queueing, serial_type>();
     CheckType<int>::check_type_counter = 0;
-    run_multifunction_node_test<nonThrowing, nonThrowing, CheckType<int>, nonThrowing, std::tuple<CheckType<int>, CheckType<int> >, isThrowing, nonThrowing, tbb::flow::queueing, serial_type>();
-    CHECK_MESSAGE( (!CheckType<int>::check_type_counter), "Some items leaked in test");
+    run_multifunction_node_test<nonThrowing, nonThrowing, CheckType<int>, nonThrowing,
+                                std::tuple<CheckType<int>, CheckType<int>>, isThrowing, nonThrowing,
+                                tbb::flow::queueing, serial_type>();
+    CHECK_MESSAGE((!CheckType<int>::check_type_counter), "Some items leaked in test");
 
     g_Wakeup_Msg = "multifunction_node(3): Missed wakeup or machine is overloaded?";
     // unlimited parallel rejecting
-    run_multifunction_node_test<isThrowing, nonThrowing, int, nonThrowing, std::tuple<int,int>, nonThrowing, nonThrowing, tbb::flow::rejecting, unlimited_type>();
-    run_multifunction_node_test<nonThrowing, nonThrowing, int, isThrowing, std::tuple<int,int>, nonThrowing, nonThrowing, tbb::flow::rejecting, unlimited_type>();
-    run_multifunction_node_test<nonThrowing, nonThrowing, int, nonThrowing, std::tuple<int,int>, nonThrowing, isThrowing, tbb::flow::rejecting, unlimited_type>();
+    run_multifunction_node_test<isThrowing, nonThrowing, int, nonThrowing, std::tuple<int, int>, nonThrowing,
+                                nonThrowing, tbb::flow::rejecting, unlimited_type>();
+    run_multifunction_node_test<nonThrowing, nonThrowing, int, isThrowing, std::tuple<int, int>, nonThrowing,
+                                nonThrowing, tbb::flow::rejecting, unlimited_type>();
+    run_multifunction_node_test<nonThrowing, nonThrowing, int, nonThrowing, std::tuple<int, int>, nonThrowing,
+                                isThrowing, tbb::flow::rejecting, unlimited_type>();
 
     g_Wakeup_Msg = "multifunction_node(4): Missed wakeup or machine is overloaded?";
     // limited parallel rejecting
-    run_multifunction_node_test<isThrowing, nonThrowing, int, nonThrowing, std::tuple<int,int>, nonThrowing, nonThrowing, tbb::flow::rejecting, limited_type>();
-    run_multifunction_node_test<nonThrowing, nonThrowing, int, isThrowing, std::tuple<int,int>, nonThrowing, nonThrowing, tbb::flow::rejecting, (size_t)limited_type>();
-    run_multifunction_node_test<nonThrowing, nonThrowing, int, nonThrowing, std::tuple<int,int>, nonThrowing, isThrowing, tbb::flow::rejecting, (size_t)limited_type>();
+    run_multifunction_node_test<isThrowing, nonThrowing, int, nonThrowing, std::tuple<int, int>, nonThrowing,
+                                nonThrowing, tbb::flow::rejecting, limited_type>();
+    run_multifunction_node_test<nonThrowing, nonThrowing, int, isThrowing, std::tuple<int, int>, nonThrowing,
+                                nonThrowing, tbb::flow::rejecting, (size_t) limited_type>();
+    run_multifunction_node_test<nonThrowing, nonThrowing, int, nonThrowing, std::tuple<int, int>, nonThrowing,
+                                isThrowing, tbb::flow::rejecting, (size_t) limited_type>();
 
     g_Wakeup_Msg = "multifunction_node(5): Missed wakeup or machine is overloaded?";
     // limited parallel queueing
-    run_multifunction_node_test<isThrowing, nonThrowing, int, nonThrowing, std::tuple<int,int>, nonThrowing, nonThrowing, tbb::flow::queueing, (size_t)limited_type>();
-    run_multifunction_node_test<nonThrowing, nonThrowing, int, isThrowing, std::tuple<int,int>, nonThrowing, nonThrowing, tbb::flow::queueing, (size_t)limited_type>();
-    run_multifunction_node_test<nonThrowing, nonThrowing, int, nonThrowing, std::tuple<int,int>, nonThrowing, isThrowing, tbb::flow::queueing, (size_t)limited_type>();
+    run_multifunction_node_test<isThrowing, nonThrowing, int, nonThrowing, std::tuple<int, int>, nonThrowing,
+                                nonThrowing, tbb::flow::queueing, (size_t) limited_type>();
+    run_multifunction_node_test<nonThrowing, nonThrowing, int, isThrowing, std::tuple<int, int>, nonThrowing,
+                                nonThrowing, tbb::flow::queueing, (size_t) limited_type>();
+    run_multifunction_node_test<nonThrowing, nonThrowing, int, nonThrowing, std::tuple<int, int>, nonThrowing,
+                                isThrowing, tbb::flow::queueing, (size_t) limited_type>();
 
     g_Wakeup_Msg = "multifunction_node(6): Missed wakeup or machine is overloaded?";
     // everyone throwing
-    run_multifunction_node_test<isThrowing, isThrowing, int, isThrowing, std::tuple<int,int>, isThrowing, isThrowing, tbb::flow::rejecting, unlimited_type>();
+    run_multifunction_node_test<isThrowing, isThrowing, int, isThrowing, std::tuple<int, int>, isThrowing,
+                                isThrowing, tbb::flow::rejecting, unlimited_type>();
     g_Wakeup_Msg = g_Orig_Wakeup_Msg;
 }
 
@@ -791,9 +836,9 @@ void test_multifunction_node() {
 // spinning.  So for N threads we pass N-1 continue_messages, then spin wait and then throw if
 // we are allowed to.
 
-template < class InputNodeType, class InputNodeBodyType, class TTestNodeType, class TestNodeBodyType,
-        class SinkNodeType, class SinkNodeBodyType>
-void run_one_continue_node_test (bool throwException, bool flog) {
+template <class InputNodeType, class InputNodeBodyType, class TTestNodeType, class TestNodeBodyType,
+          class SinkNodeType, class SinkNodeBodyType>
+void run_one_continue_node_test(bool throwException, bool flog) {
     tbb::flow::graph g;
 
     std::atomic<int> input_count;
@@ -807,84 +852,85 @@ void run_one_continue_node_test (bool throwException, bool flog) {
     g_Master = std::this_thread::get_id();
     InputNodeType input(g, InputNodeBodyType(input_count));
     TTestNodeType node_to_test(g, TestNodeBodyType(test_count));
-    SinkNodeType sink(g,tbb::flow::unlimited,SinkNodeBodyType(sink_count));
+    SinkNodeType sink(g, tbb::flow::unlimited, SinkNodeBodyType(sink_count));
     tbb::flow::broadcast_node<tbb::flow::continue_msg> b1(g), b2(g), b3(g);
     make_edge(input, b1);
-    make_edge(b1,b2);
-    make_edge(b1,b3);
-    make_edge(b2,node_to_test);
-    make_edge(b3,node_to_test);
+    make_edge(b1, b2);
+    make_edge(b1, b3);
+    make_edge(b2, node_to_test);
+    make_edge(b3, node_to_test);
     make_edge(node_to_test, sink);
-    for(int iter = 0; iter < 2; ++iter) {
-        ResetGlobals(throwException,flog);
-        if(throwException) {
+    for (int iter = 0; iter < 2; ++iter) {
+        ResetGlobals(throwException, flog);
+        if (throwException) {
             TRY();
-                input.activate();
-                g.wait_for_all();
+            input.activate();
+            g.wait_for_all();
             CATCH_AND_ASSERT();
-        }
-        else {
+        } else {
             TRY();
-                input.activate();
-                g.wait_for_all();
+            input.activate();
+            g.wait_for_all();
             CATCH_AND_FAIL();
         }
-        bool okayNoExceptionsCaught = (g_ExceptionInMaster && !g_MasterExecutedThrow) || (!g_ExceptionInMaster && !g_NonMasterExecutedThrow) || !throwException;
+        bool okayNoExceptionsCaught = (g_ExceptionInMaster && !g_MasterExecutedThrow)
+                                      || (!g_ExceptionInMaster && !g_NonMasterExecutedThrow)
+                                      || !throwException;
         int ib_cnt = tbb::flow::copy_body<InputNodeBodyType>(input).count_value();
-        int t_cnt   = tbb::flow::copy_body<TestNodeBodyType>(node_to_test).count_value();
+        int t_cnt = tbb::flow::copy_body<TestNodeBodyType>(node_to_test).count_value();
         int nb_cnt = tbb::flow::copy_body<SinkNodeBodyType>(sink).count_value();
-        if(throwException) {
-            CHECK_MESSAGE( (g.exception_thrown() || okayNoExceptionsCaught), "Exception not caught by graph");
-            CHECK_MESSAGE( (g.is_cancelled() || okayNoExceptionsCaught), "Cancellation not signalled in graph");
-            CHECK_MESSAGE( (ib_cnt <= g_NumItems), "Too many items sent by inputs");
-            CHECK_MESSAGE( (ib_cnt >= t_cnt), "Too many items received by test node");
-            CHECK_MESSAGE( (nb_cnt <= t_cnt), "Too many items received by sink nodes");
+        if (throwException) {
+            CHECK_MESSAGE((g.exception_thrown() || okayNoExceptionsCaught), "Exception not caught by graph");
+            CHECK_MESSAGE((g.is_cancelled() || okayNoExceptionsCaught),
+                          "Cancellation not signalled in graph");
+            CHECK_MESSAGE((ib_cnt <= g_NumItems), "Too many items sent by inputs");
+            CHECK_MESSAGE((ib_cnt >= t_cnt), "Too many items received by test node");
+            CHECK_MESSAGE((nb_cnt <= t_cnt), "Too many items received by sink nodes");
+        } else {
+            CHECK_MESSAGE((!g.exception_thrown()), "Exception flag in flow::graph set but no throw occurred");
+            CHECK_MESSAGE((!g.is_cancelled()), "canceled flag set but no throw occurred");
+            CHECK_MESSAGE((ib_cnt == g_NumItems), "Missing invocations of input_node");
+            CHECK_MESSAGE((t_cnt == g_NumItems), "Not all items reached test node");
+            CHECK_MESSAGE((nb_cnt == g_NumItems), "Missing items in absorbers");
         }
-        else {
-            CHECK_MESSAGE( (!g.exception_thrown()), "Exception flag in flow::graph set but no throw occurred");
-            CHECK_MESSAGE( (!g.is_cancelled()), "canceled flag set but no throw occurred");
-            CHECK_MESSAGE( (ib_cnt == g_NumItems), "Missing invocations of input_node");
-            CHECK_MESSAGE( (t_cnt == g_NumItems), "Not all items reached test node");
-            CHECK_MESSAGE( (nb_cnt == g_NumItems), "Missing items in absorbers");
-        }
-        g.reset();  // resets the body of the input_nodes, test_node and the absorb_nodes.
+        g.reset();// resets the body of the input_nodes, test_node and the absorb_nodes.
         input_count = test_count = sink_count = 0;
-        CHECK_MESSAGE( (0 == (int)test_count), "Atomic wasn't reset properly");
-        CHECK_MESSAGE( (0 == tbb::flow::copy_body<InputNodeBodyType>(input).count_value()),"Reset input failed");
-        CHECK_MESSAGE( (0 == tbb::flow::copy_body<TestNodeBodyType>(node_to_test).count_value()),"Reset test_node failed");
-        CHECK_MESSAGE( (0 == tbb::flow::copy_body<SinkNodeBodyType>(sink).count_value()),"Reset sink failed");
+        CHECK_MESSAGE((0 == (int) test_count), "Atomic wasn't reset properly");
+        CHECK_MESSAGE((0 == tbb::flow::copy_body<InputNodeBodyType>(input).count_value()),
+                      "Reset input failed");
+        CHECK_MESSAGE((0 == tbb::flow::copy_body<TestNodeBodyType>(node_to_test).count_value()),
+                      "Reset test_node failed");
+        CHECK_MESSAGE((0 == tbb::flow::copy_body<SinkNodeBodyType>(sink).count_value()), "Reset sink failed");
     }
 #if USE_TASK_SCHEDULER_OBSERVER
     o.observe(false);
 #endif
 }
 
-template<
-    class ItemType,
-    TestNodeTypeEnum IType,   // does input node throw?
-    TestNodeTypeEnum CType,   // does continue_node throw?
-    TestNodeTypeEnum AType>    // does absorber throw
+template <class ItemType,
+          TestNodeTypeEnum IType,// does input node throw?
+          TestNodeTypeEnum CType,// does continue_node throw?
+          TestNodeTypeEnum AType>// does absorber throw
 void run_continue_node_test() {
-    typedef test_input_body<tbb::flow::continue_msg,IType> IBodyType;
-    typedef absorber_body<tbb::flow::continue_msg,ItemType,CType,unlimited_type> ContBodyType;
-    typedef absorber_body<ItemType,tbb::flow::continue_msg, AType, unlimited_type> SinkBodyType;
+    typedef test_input_body<tbb::flow::continue_msg, IType> IBodyType;
+    typedef absorber_body<tbb::flow::continue_msg, ItemType, CType, unlimited_type> ContBodyType;
+    typedef absorber_body<ItemType, tbb::flow::continue_msg, AType, unlimited_type> SinkBodyType;
 
     typedef tbb::flow::input_node<tbb::flow::continue_msg> InputType;
     typedef tbb::flow::continue_node<ItemType> TestType;
-    typedef tbb::flow::function_node<ItemType,tbb::flow::continue_msg> SnkType;
+    typedef tbb::flow::function_node<ItemType, tbb::flow::continue_msg> SnkType;
 
-    for(int i = 0; i < 4; ++i ) {
-        if(i == 2) continue;  // don't run (false,true); it doesn't make sense.
+    for (int i = 0; i < 4; ++i) {
+        if (i == 2) continue;// don't run (false,true); it doesn't make sense.
         bool doThrow = (i & 0x1) != 0;
         bool doFlog = (i & 0x2) != 0;
         run_one_continue_node_test<
-            /*InputNodeType*/       InputType,
-            /*InputNodeBodyType*/   IBodyType,
-            /*TestNodeType*/        TestType,
-            /*TestNodeBodyType*/    ContBodyType,
-            /*SinkNodeType*/        SnkType,
-            /*SinkNodeBodyType*/    SinkBodyType>
-            (doThrow,doFlog);
+                /*InputNodeType*/ InputType,
+                /*InputNodeBodyType*/ IBodyType,
+                /*TestNodeType*/ TestType,
+                /*TestNodeBodyType*/ ContBodyType,
+                /*SinkNodeType*/ SnkType,
+                /*SinkNodeBodyType*/ SinkBodyType>(doThrow, doFlog);
     }
 }
 
@@ -892,29 +938,25 @@ void run_continue_node_test() {
 void test_continue_node() {
     INFO("Testing continue_node\n");
     g_Wakeup_Msg = "buffer_node(non,is,non): Missed wakeup or machine is overloaded?";
-    run_continue_node_test<int,nonThrowing,isThrowing,nonThrowing>();
+    run_continue_node_test<int, nonThrowing, isThrowing, nonThrowing>();
     g_Wakeup_Msg = "buffer_node(non,non,is): Missed wakeup or machine is overloaded?";
-    run_continue_node_test<int,nonThrowing,nonThrowing,isThrowing>();
+    run_continue_node_test<int, nonThrowing, nonThrowing, isThrowing>();
     g_Wakeup_Msg = "buffer_node(is,non,non): Missed wakeup or machine is overloaded?";
-    run_continue_node_test<int,isThrowing,nonThrowing,nonThrowing>();
+    run_continue_node_test<int, isThrowing, nonThrowing, nonThrowing>();
     g_Wakeup_Msg = "buffer_node(is,is,is): Missed wakeup or machine is overloaded?";
-    run_continue_node_test<int,isThrowing,isThrowing,isThrowing>();
+    run_continue_node_test<int, isThrowing, isThrowing, isThrowing>();
     CheckType<double>::check_type_counter = 0;
-    run_continue_node_test<CheckType<double>,isThrowing,isThrowing,isThrowing>();
-    CHECK_MESSAGE( (!CheckType<double>::check_type_counter), "Dropped objects in continue_node test");
+    run_continue_node_test<CheckType<double>, isThrowing, isThrowing, isThrowing>();
+    CHECK_MESSAGE((!CheckType<double>::check_type_counter), "Dropped objects in continue_node test");
     g_Wakeup_Msg = g_Orig_Wakeup_Msg;
 }
 
 // ---------- buffer_node queue_node overwrite_node --------------
 
-template<
-    class BufferItemType,       //
-    class InputNodeType,
-    class InputNodeBodyType,
-    class TestNodeType,
-    class SinkNodeType,
-    class SinkNodeBodyType >
-void run_one_buffer_node_test(bool throwException,bool flog) {
+template <class BufferItemType,//
+          class InputNodeType, class InputNodeBodyType, class TestNodeType, class SinkNodeType,
+          class SinkNodeBodyType>
+void run_one_buffer_node_test(bool throwException, bool flog) {
     tbb::flow::graph g;
 
     std::atomic<int> input_count;
@@ -927,128 +969,119 @@ void run_one_buffer_node_test(bool throwException,bool flog) {
     g_Master = std::this_thread::get_id();
     InputNodeType input(g, InputNodeBodyType(input_count));
     TestNodeType node_to_test(g);
-    SinkNodeType sink(g,tbb::flow::unlimited,SinkNodeBodyType(sink_count));
-    make_edge(input,node_to_test);
+    SinkNodeType sink(g, tbb::flow::unlimited, SinkNodeBodyType(sink_count));
+    make_edge(input, node_to_test);
     make_edge(node_to_test, sink);
-    for(int iter = 0; iter < 2; ++iter) {
-        ResetGlobals(throwException,flog);
-        if(throwException) {
+    for (int iter = 0; iter < 2; ++iter) {
+        ResetGlobals(throwException, flog);
+        if (throwException) {
             TRY();
-                input.activate();
-                g.wait_for_all();
+            input.activate();
+            g.wait_for_all();
             CATCH_AND_ASSERT();
-        }
-        else {
+        } else {
             TRY();
-                input.activate();
-                g.wait_for_all();
+            input.activate();
+            g.wait_for_all();
             CATCH_AND_FAIL();
         }
-        bool okayNoExceptionsCaught = (g_ExceptionInMaster && !g_MasterExecutedThrow) || (!g_ExceptionInMaster && !g_NonMasterExecutedThrow) || !throwException;
+        bool okayNoExceptionsCaught = (g_ExceptionInMaster && !g_MasterExecutedThrow)
+                                      || (!g_ExceptionInMaster && !g_NonMasterExecutedThrow)
+                                      || !throwException;
         int ib_cnt = tbb::flow::copy_body<InputNodeBodyType>(input).count_value();
         int nb_cnt = tbb::flow::copy_body<SinkNodeBodyType>(sink).count_value();
-        if(throwException) {
-            CHECK_MESSAGE( (g.exception_thrown() || okayNoExceptionsCaught), "Exception not caught by graph");
-            CHECK_MESSAGE( (g.is_cancelled() || okayNoExceptionsCaught), "Cancellation not signalled in graph");
-            CHECK_MESSAGE( (ib_cnt <= g_NumItems), "Too many items sent by inputs");
-            CHECK_MESSAGE( (nb_cnt <= ib_cnt), "Too many items received by sink nodes");
+        if (throwException) {
+            CHECK_MESSAGE((g.exception_thrown() || okayNoExceptionsCaught), "Exception not caught by graph");
+            CHECK_MESSAGE((g.is_cancelled() || okayNoExceptionsCaught),
+                          "Cancellation not signalled in graph");
+            CHECK_MESSAGE((ib_cnt <= g_NumItems), "Too many items sent by inputs");
+            CHECK_MESSAGE((nb_cnt <= ib_cnt), "Too many items received by sink nodes");
+        } else {
+            CHECK_MESSAGE((!g.exception_thrown()), "Exception flag in flow::graph set but no throw occurred");
+            CHECK_MESSAGE((!g.is_cancelled()), "canceled flag set but no throw occurred");
+            CHECK_MESSAGE((ib_cnt == g_NumItems), "Missing invocations of input_node");
+            CHECK_MESSAGE((nb_cnt == g_NumItems), "Missing items in absorbers");
         }
-        else {
-            CHECK_MESSAGE( (!g.exception_thrown()), "Exception flag in flow::graph set but no throw occurred");
-            CHECK_MESSAGE( (!g.is_cancelled()), "canceled flag set but no throw occurred");
-            CHECK_MESSAGE( (ib_cnt == g_NumItems), "Missing invocations of input_node");
-            CHECK_MESSAGE( (nb_cnt == g_NumItems), "Missing items in absorbers");
-        }
-        if(iter == 0) {
+        if (iter == 0) {
             remove_edge(node_to_test, sink);
             node_to_test.try_put(BufferItemType());
             g.wait_for_all();
             g.reset();
             input_count = sink_count = 0;
             BufferItemType tmp;
-            CHECK_MESSAGE( (!node_to_test.try_get(tmp)), "node not empty");
+            CHECK_MESSAGE((!node_to_test.try_get(tmp)), "node not empty");
             make_edge(node_to_test, sink);
             g.wait_for_all();
-        }
-        else {
+        } else {
             g.reset();
             input_count = sink_count = 0;
         }
-        CHECK_MESSAGE( (0 == tbb::flow::copy_body<InputNodeBodyType>(input).count_value()),"Reset input failed");
-        CHECK_MESSAGE( (0 == tbb::flow::copy_body<SinkNodeBodyType>(sink).count_value()),"Reset sink failed");
+        CHECK_MESSAGE((0 == tbb::flow::copy_body<InputNodeBodyType>(input).count_value()),
+                      "Reset input failed");
+        CHECK_MESSAGE((0 == tbb::flow::copy_body<SinkNodeBodyType>(sink).count_value()), "Reset sink failed");
     }
 
 #if USE_TASK_SCHEDULER_OBSERVER
     o.observe(false);
 #endif
 }
-template<class BufferItemType,
-         TestNodeTypeEnum InputThrowType,
-         TestNodeTypeEnum SinkThrowType>
+template <class BufferItemType, TestNodeTypeEnum InputThrowType, TestNodeTypeEnum SinkThrowType>
 void run_buffer_queue_and_overwrite_node_test() {
-    typedef test_input_body<BufferItemType,InputThrowType> InputBodyType;
-    typedef absorber_body<BufferItemType,tbb::flow::continue_msg,SinkThrowType,unlimited_type> SinkBodyType;
+    typedef test_input_body<BufferItemType, InputThrowType> InputBodyType;
+    typedef absorber_body<BufferItemType, tbb::flow::continue_msg, SinkThrowType, unlimited_type>
+            SinkBodyType;
 
     typedef tbb::flow::input_node<BufferItemType> InputType;
     typedef tbb::flow::buffer_node<BufferItemType> BufType;
-    typedef tbb::flow::queue_node<BufferItemType>  QueType;
-    typedef tbb::flow::overwrite_node<BufferItemType>  OvrType;
-    typedef tbb::flow::function_node<BufferItemType,tbb::flow::continue_msg> SnkType;
+    typedef tbb::flow::queue_node<BufferItemType> QueType;
+    typedef tbb::flow::overwrite_node<BufferItemType> OvrType;
+    typedef tbb::flow::function_node<BufferItemType, tbb::flow::continue_msg> SnkType;
 
-    for(int i = 0; i < 4; ++i) {
-        if(i == 2) continue;  // no need to test flog w/o throws
+    for (int i = 0; i < 4; ++i) {
+        if (i == 2) continue;// no need to test flog w/o throws
         bool throwException = (i & 0x1) != 0;
         bool doFlog = (i & 0x2) != 0;
         run_one_buffer_node_test<
-            /* class BufferItemType*/     BufferItemType,
-            /*class InputNodeType*/       InputType,
-            /*class InputNodeBodyType*/   InputBodyType,
-            /*class TestNodeType*/        BufType,
-            /*class SinkNodeType*/        SnkType,
-            /*class SinkNodeBodyType*/    SinkBodyType
-            >(throwException, doFlog);
+                /* class BufferItemType*/ BufferItemType,
+                /*class InputNodeType*/ InputType,
+                /*class InputNodeBodyType*/ InputBodyType,
+                /*class TestNodeType*/ BufType,
+                /*class SinkNodeType*/ SnkType,
+                /*class SinkNodeBodyType*/ SinkBodyType>(throwException, doFlog);
         run_one_buffer_node_test<
-            /* class BufferItemType*/     BufferItemType,
-            /*class InputNodeType*/       InputType,
-            /*class InputNodeBodyType*/   InputBodyType,
-            /*class TestNodeType*/        QueType,
-            /*class SinkNodeType*/        SnkType,
-            /*class SinkNodeBodyType*/    SinkBodyType
-            >(throwException, doFlog);
+                /* class BufferItemType*/ BufferItemType,
+                /*class InputNodeType*/ InputType,
+                /*class InputNodeBodyType*/ InputBodyType,
+                /*class TestNodeType*/ QueType,
+                /*class SinkNodeType*/ SnkType,
+                /*class SinkNodeBodyType*/ SinkBodyType>(throwException, doFlog);
         run_one_buffer_node_test<
-            /* class BufferItemType*/     BufferItemType,
-            /*class InputNodeType*/       InputType,
-            /*class InputNodeBodyType*/   InputBodyType,
-            /*class TestNodeType*/        OvrType,
-            /*class SinkNodeType*/        SnkType,
-            /*class SinkNodeBodyType*/    SinkBodyType
-            >(throwException, doFlog);
+                /* class BufferItemType*/ BufferItemType,
+                /*class InputNodeType*/ InputType,
+                /*class InputNodeBodyType*/ InputBodyType,
+                /*class TestNodeType*/ OvrType,
+                /*class SinkNodeType*/ SnkType,
+                /*class SinkNodeBodyType*/ SinkBodyType>(throwException, doFlog);
     }
 }
 
 void test_buffer_queue_and_overwrite_node() {
     INFO("Testing buffer_node, queue_node and overwrite_node\n");
     g_Wakeup_Msg = "buffer, queue, overwrite(is,non): Missed wakeup or machine is overloaded?";
-    run_buffer_queue_and_overwrite_node_test<int,isThrowing,nonThrowing>();
+    run_buffer_queue_and_overwrite_node_test<int, isThrowing, nonThrowing>();
     g_Wakeup_Msg = "buffer, queue, overwrite(non,is): Missed wakeup or machine is overloaded?";
-    run_buffer_queue_and_overwrite_node_test<int,nonThrowing,isThrowing>();
+    run_buffer_queue_and_overwrite_node_test<int, nonThrowing, isThrowing>();
     g_Wakeup_Msg = "buffer, queue, overwrite(is,is): Missed wakeup or machine is overloaded?";
-    run_buffer_queue_and_overwrite_node_test<int,isThrowing,isThrowing>();
+    run_buffer_queue_and_overwrite_node_test<int, isThrowing, isThrowing>();
     g_Wakeup_Msg = g_Orig_Wakeup_Msg;
 }
 
 // ---------- sequencer_node -------------------------
 
-
-template<
-    class BufferItemType,       //
-    class InputNodeType,
-    class InputNodeBodyType,
-    class TestNodeType,
-    class SeqBodyType,
-    class SinkNodeType,
-    class SinkNodeBodyType >
-void run_one_sequencer_node_test(bool throwException,bool flog) {
+template <class BufferItemType,//
+          class InputNodeType, class InputNodeBodyType, class TestNodeType, class SeqBodyType,
+          class SinkNodeType, class SinkNodeBodyType>
+void run_one_sequencer_node_test(bool throwException, bool flog) {
     tbb::flow::graph g;
 
     std::atomic<int> input_count;
@@ -1060,40 +1093,41 @@ void run_one_sequencer_node_test(bool throwException,bool flog) {
 #endif
     g_Master = std::this_thread::get_id();
     InputNodeType input(g, InputNodeBodyType(input_count));
-    TestNodeType node_to_test(g,SeqBodyType());
-    SinkNodeType sink(g,tbb::flow::unlimited,SinkNodeBodyType(sink_count));
-    make_edge(input,node_to_test);
+    TestNodeType node_to_test(g, SeqBodyType());
+    SinkNodeType sink(g, tbb::flow::unlimited, SinkNodeBodyType(sink_count));
+    make_edge(input, node_to_test);
     make_edge(node_to_test, sink);
-    for(int iter = 0; iter < 2; ++iter) {
-        ResetGlobals(throwException,flog);
-        if(throwException) {
+    for (int iter = 0; iter < 2; ++iter) {
+        ResetGlobals(throwException, flog);
+        if (throwException) {
             TRY();
-                input.activate();
-                g.wait_for_all();
+            input.activate();
+            g.wait_for_all();
             CATCH_AND_ASSERT();
-        }
-        else {
+        } else {
             TRY();
-                input.activate();
-                g.wait_for_all();
+            input.activate();
+            g.wait_for_all();
             CATCH_AND_FAIL();
         }
-        bool okayNoExceptionsCaught = (g_ExceptionInMaster && !g_MasterExecutedThrow) || (!g_ExceptionInMaster && !g_NonMasterExecutedThrow) || !throwException;
+        bool okayNoExceptionsCaught = (g_ExceptionInMaster && !g_MasterExecutedThrow)
+                                      || (!g_ExceptionInMaster && !g_NonMasterExecutedThrow)
+                                      || !throwException;
         int ib_cnt = tbb::flow::copy_body<InputNodeBodyType>(input).count_value();
         int nb_cnt = tbb::flow::copy_body<SinkNodeBodyType>(sink).count_value();
-        if(throwException) {
-            CHECK_MESSAGE( (g.exception_thrown() || okayNoExceptionsCaught), "Exception not caught by graph");
-            CHECK_MESSAGE( (g.is_cancelled() || okayNoExceptionsCaught), "Cancellation not signalled in graph");
-            CHECK_MESSAGE( (ib_cnt <= g_NumItems), "Too many items sent by inputs");
-            CHECK_MESSAGE( (nb_cnt <= ib_cnt), "Too many items received by sink nodes");
-        }
-        else {
-            CHECK_MESSAGE( (!g.exception_thrown()), "Exception flag in flow::graph set but no throw occurred");
-            CHECK_MESSAGE( (!g.is_cancelled()), "canceled flag set but no throw occurred");
-            CHECK_MESSAGE( (ib_cnt == g_NumItems), "Missing invocations of input_node");
-            CHECK_MESSAGE( (nb_cnt == g_NumItems), "Missing items in absorbers");
+        if (throwException) {
+            CHECK_MESSAGE((g.exception_thrown() || okayNoExceptionsCaught), "Exception not caught by graph");
+            CHECK_MESSAGE((g.is_cancelled() || okayNoExceptionsCaught),
+                          "Cancellation not signalled in graph");
+            CHECK_MESSAGE((ib_cnt <= g_NumItems), "Too many items sent by inputs");
+            CHECK_MESSAGE((nb_cnt <= ib_cnt), "Too many items received by sink nodes");
+        } else {
+            CHECK_MESSAGE((!g.exception_thrown()), "Exception flag in flow::graph set but no throw occurred");
+            CHECK_MESSAGE((!g.is_cancelled()), "canceled flag set but no throw occurred");
+            CHECK_MESSAGE((ib_cnt == g_NumItems), "Missing invocations of input_node");
+            CHECK_MESSAGE((nb_cnt == g_NumItems), "Missing items in absorbers");
         }
-        if(iter == 0) {
+        if (iter == 0) {
             remove_edge(node_to_test, sink);
             node_to_test.try_put(BufferItemType(g_NumItems + 1));
             node_to_test.try_put(BufferItemType(1));
@@ -1102,13 +1136,13 @@ void run_one_sequencer_node_test(bool throwException,bool flog) {
             input_count = sink_count = 0;
             make_edge(node_to_test, sink);
             g.wait_for_all();
-        }
-        else {
+        } else {
             g.reset();
             input_count = sink_count = 0;
         }
-        CHECK_MESSAGE( (0 == tbb::flow::copy_body<InputNodeBodyType>(input).count_value()),"Reset input failed");
-        CHECK_MESSAGE( (0 == tbb::flow::copy_body<SinkNodeBodyType>(sink).count_value()),"Reset sink failed");
+        CHECK_MESSAGE((0 == tbb::flow::copy_body<InputNodeBodyType>(input).count_value()),
+                      "Reset input failed");
+        CHECK_MESSAGE((0 == tbb::flow::copy_body<SinkNodeBodyType>(sink).count_value()), "Reset sink failed");
     }
 
 #if USE_TASK_SCHEDULER_OBSERVER
@@ -1116,59 +1150,50 @@ void run_one_sequencer_node_test(bool throwException,bool flog) {
 #endif
 }
 
-template<class BufferItemType,
-         TestNodeTypeEnum InputThrowType,
-         TestNodeTypeEnum SinkThrowType>
+template <class BufferItemType, TestNodeTypeEnum InputThrowType, TestNodeTypeEnum SinkThrowType>
 void run_sequencer_node_test() {
-    typedef test_input_body<BufferItemType,InputThrowType> InputBodyType;
-    typedef absorber_body<BufferItemType,tbb::flow::continue_msg,SinkThrowType,unlimited_type> SinkBodyType;
+    typedef test_input_body<BufferItemType, InputThrowType> InputBodyType;
+    typedef absorber_body<BufferItemType, tbb::flow::continue_msg, SinkThrowType, unlimited_type>
+            SinkBodyType;
     typedef sequencer_body<BufferItemType> SeqBodyType;
 
     typedef tbb::flow::input_node<BufferItemType> InputType;
-    typedef tbb::flow::sequencer_node<BufferItemType>  SeqType;
-    typedef tbb::flow::function_node<BufferItemType,tbb::flow::continue_msg> SnkType;
+    typedef tbb::flow::sequencer_node<BufferItemType> SeqType;
+    typedef tbb::flow::function_node<BufferItemType, tbb::flow::continue_msg> SnkType;
 
-    for(int i = 0; i < 4; ++i) {
-        if(i == 2) continue;  // no need to test flog w/o throws
+    for (int i = 0; i < 4; ++i) {
+        if (i == 2) continue;// no need to test flog w/o throws
         bool throwException = (i & 0x1) != 0;
         bool doFlog = (i & 0x2) != 0;
         run_one_sequencer_node_test<
-            /* class BufferItemType*/     BufferItemType,
-            /*class InputNodeType*/       InputType,
-            /*class InputNodeBodyType*/   InputBodyType,
-            /*class TestNodeType*/        SeqType,
-            /*class SeqBodyType*/         SeqBodyType,
-            /*class SinkNodeType*/        SnkType,
-            /*class SinkNodeBodyType*/    SinkBodyType
-            >(throwException, doFlog);
+                /* class BufferItemType*/ BufferItemType,
+                /*class InputNodeType*/ InputType,
+                /*class InputNodeBodyType*/ InputBodyType,
+                /*class TestNodeType*/ SeqType,
+                /*class SeqBodyType*/ SeqBodyType,
+                /*class SinkNodeType*/ SnkType,
+                /*class SinkNodeBodyType*/ SinkBodyType>(throwException, doFlog);
     }
 }
 
-
-
 void test_sequencer_node() {
     INFO("Testing sequencer_node\n");
     g_Wakeup_Msg = "sequencer_node(is,non): Missed wakeup or machine is overloaded?";
-    run_sequencer_node_test<int, isThrowing,nonThrowing>();
+    run_sequencer_node_test<int, isThrowing, nonThrowing>();
     CheckType<int>::check_type_counter = 0;
     g_Wakeup_Msg = "sequencer_node(non,is): Missed wakeup or machine is overloaded?";
-    run_sequencer_node_test<CheckType<int>, nonThrowing,isThrowing>();
-    CHECK_MESSAGE( (!CheckType<int>::check_type_counter), "Dropped objects in sequencer_node test");
+    run_sequencer_node_test<CheckType<int>, nonThrowing, isThrowing>();
+    CHECK_MESSAGE((!CheckType<int>::check_type_counter), "Dropped objects in sequencer_node test");
     g_Wakeup_Msg = "sequencer_node(is,is): Missed wakeup or machine is overloaded?";
-    run_sequencer_node_test<int, isThrowing,isThrowing>();
+    run_sequencer_node_test<int, isThrowing, isThrowing>();
     g_Wakeup_Msg = g_Orig_Wakeup_Msg;
 }
 
 // ------------ priority_queue_node ------------------
 
-template<
-    class BufferItemType,
-    class InputNodeType,
-    class InputNodeBodyType,
-    class TestNodeType,
-    class SinkNodeType,
-    class SinkNodeBodyType >
-void run_one_priority_queue_node_test(bool throwException,bool flog) {
+template <class BufferItemType, class InputNodeType, class InputNodeBodyType, class TestNodeType,
+          class SinkNodeType, class SinkNodeBodyType>
+void run_one_priority_queue_node_test(bool throwException, bool flog) {
     tbb::flow::graph g;
 
     std::atomic<int> input_count;
@@ -1183,40 +1208,41 @@ void run_one_priority_queue_node_test(bool throwException,bool flog) {
 
     TestNodeType node_to_test(g);
 
-    SinkNodeType sink(g,tbb::flow::unlimited,SinkNodeBodyType(sink_count));
+    SinkNodeType sink(g, tbb::flow::unlimited, SinkNodeBodyType(sink_count));
 
-    make_edge(input,node_to_test);
+    make_edge(input, node_to_test);
     make_edge(node_to_test, sink);
-    for(int iter = 0; iter < 2; ++iter) {
-        ResetGlobals(throwException,flog);
-        if(throwException) {
+    for (int iter = 0; iter < 2; ++iter) {
+        ResetGlobals(throwException, flog);
+        if (throwException) {
             TRY();
-                input.activate();
-                g.wait_for_all();
+            input.activate();
+            g.wait_for_all();
             CATCH_AND_ASSERT();
-        }
-        else {
+        } else {
             TRY();
-                input.activate();
-                g.wait_for_all();
+            input.activate();
+            g.wait_for_all();
             CATCH_AND_FAIL();
         }
-        bool okayNoExceptionsCaught = (g_ExceptionInMaster && !g_MasterExecutedThrow) || (!g_ExceptionInMaster && !g_NonMasterExecutedThrow) || !throwException;
+        bool okayNoExceptionsCaught = (g_ExceptionInMaster && !g_MasterExecutedThrow)
+                                      || (!g_ExceptionInMaster && !g_NonMasterExecutedThrow)
+                                      || !throwException;
         int ib_cnt = tbb::flow::copy_body<InputNodeBodyType>(input).count_value();
         int nb_cnt = tbb::flow::copy_body<SinkNodeBodyType>(sink).count_value();
-        if(throwException) {
-            CHECK_MESSAGE( (g.exception_thrown() || okayNoExceptionsCaught), "Exception not caught by graph");
-            CHECK_MESSAGE( (g.is_cancelled() || okayNoExceptionsCaught), "Cancellation not signalled in graph");
-            CHECK_MESSAGE( (ib_cnt <= g_NumItems), "Too many items sent by inputs");
-            CHECK_MESSAGE( (nb_cnt <= ib_cnt), "Too many items received by sink nodes");
+        if (throwException) {
+            CHECK_MESSAGE((g.exception_thrown() || okayNoExceptionsCaught), "Exception not caught by graph");
+            CHECK_MESSAGE((g.is_cancelled() || okayNoExceptionsCaught),
+                          "Cancellation not signalled in graph");
+            CHECK_MESSAGE((ib_cnt <= g_NumItems), "Too many items sent by inputs");
+            CHECK_MESSAGE((nb_cnt <= ib_cnt), "Too many items received by sink nodes");
+        } else {
+            CHECK_MESSAGE((!g.exception_thrown()), "Exception flag in flow::graph set but no throw occurred");
+            CHECK_MESSAGE((!g.is_cancelled()), "canceled flag set but no throw occurred");
+            CHECK_MESSAGE((ib_cnt == g_NumItems), "Missing invocations of input_node");
+            CHECK_MESSAGE((nb_cnt == g_NumItems), "Missing items in absorbers");
         }
-        else {
-            CHECK_MESSAGE( (!g.exception_thrown()), "Exception flag in flow::graph set but no throw occurred");
-            CHECK_MESSAGE( (!g.is_cancelled()), "canceled flag set but no throw occurred");
-            CHECK_MESSAGE( (ib_cnt == g_NumItems), "Missing invocations of input_node");
-            CHECK_MESSAGE( (nb_cnt == g_NumItems), "Missing items in absorbers");
-        }
-        if(iter == 0) {
+        if (iter == 0) {
             remove_edge(node_to_test, sink);
             node_to_test.try_put(BufferItemType(g_NumItems + 1));
             node_to_test.try_put(BufferItemType(g_NumItems + 2));
@@ -1226,13 +1252,13 @@ void run_one_priority_queue_node_test(bool throwException,bool flog) {
             input_count = sink_count = 0;
             make_edge(node_to_test, sink);
             g.wait_for_all();
-        }
-        else {
+        } else {
             g.reset();
             input_count = sink_count = 0;
         }
-        CHECK_MESSAGE( (0 == tbb::flow::copy_body<InputNodeBodyType>(input).count_value()),"Reset input failed");
-        CHECK_MESSAGE( (0 == tbb::flow::copy_body<SinkNodeBodyType>(sink).count_value()),"Reset sink failed");
+        CHECK_MESSAGE((0 == tbb::flow::copy_body<InputNodeBodyType>(input).count_value()),
+                      "Reset input failed");
+        CHECK_MESSAGE((0 == tbb::flow::copy_body<SinkNodeBodyType>(sink).count_value()), "Reset sink failed");
     }
 
 #if USE_TASK_SCHEDULER_OBSERVER
@@ -1240,82 +1266,74 @@ void run_one_priority_queue_node_test(bool throwException,bool flog) {
 #endif
 }
 
-template<class BufferItemType,
-         TestNodeTypeEnum InputThrowType,
-         TestNodeTypeEnum SinkThrowType>
+template <class BufferItemType, TestNodeTypeEnum InputThrowType, TestNodeTypeEnum SinkThrowType>
 void run_priority_queue_node_test() {
-    typedef test_input_body<BufferItemType,InputThrowType> InputBodyType;
-    typedef absorber_body<BufferItemType,tbb::flow::continue_msg,SinkThrowType,unlimited_type> SinkBodyType;
+    typedef test_input_body<BufferItemType, InputThrowType> InputBodyType;
+    typedef absorber_body<BufferItemType, tbb::flow::continue_msg, SinkThrowType, unlimited_type>
+            SinkBodyType;
     typedef less_body<BufferItemType> LessBodyType;
 
     typedef tbb::flow::input_node<BufferItemType> InputType;
-    typedef tbb::flow::priority_queue_node<BufferItemType,LessBodyType>  PrqType;
-    typedef tbb::flow::function_node<BufferItemType,tbb::flow::continue_msg> SnkType;
+    typedef tbb::flow::priority_queue_node<BufferItemType, LessBodyType> PrqType;
+    typedef tbb::flow::function_node<BufferItemType, tbb::flow::continue_msg> SnkType;
 
-    for(int i = 0; i < 4; ++i) {
-        if(i == 2) continue;  // no need to test flog w/o throws
+    for (int i = 0; i < 4; ++i) {
+        if (i == 2) continue;// no need to test flog w/o throws
         bool throwException = (i & 0x1) != 0;
         bool doFlog = (i & 0x2) != 0;
         run_one_priority_queue_node_test<
-            /* class BufferItemType*/     BufferItemType,
-            /*class InputNodeType*/       InputType,
-            /*class InputNodeBodyType*/   InputBodyType,
-            /*class TestNodeType*/        PrqType,
-            /*class SinkNodeType*/        SnkType,
-            /*class SinkNodeBodyType*/    SinkBodyType
-            >(throwException, doFlog);
+                /* class BufferItemType*/ BufferItemType,
+                /*class InputNodeType*/ InputType,
+                /*class InputNodeBodyType*/ InputBodyType,
+                /*class TestNodeType*/ PrqType,
+                /*class SinkNodeType*/ SnkType,
+                /*class SinkNodeBodyType*/ SinkBodyType>(throwException, doFlog);
     }
 }
 
 void test_priority_queue_node() {
     INFO("Testing priority_queue_node\n");
     g_Wakeup_Msg = "priority_queue_node(is,non): Missed wakeup or machine is overloaded?";
-    run_priority_queue_node_test<int, isThrowing,nonThrowing>();
+    run_priority_queue_node_test<int, isThrowing, nonThrowing>();
     CheckType<int>::check_type_counter = 0;
     g_Wakeup_Msg = "priority_queue_node(non,is): Missed wakeup or machine is overloaded?";
-    run_priority_queue_node_test<CheckType<int>, nonThrowing,isThrowing>();
-    CHECK_MESSAGE( (!CheckType<int>::check_type_counter), "Dropped objects in priority_queue_node test");
+    run_priority_queue_node_test<CheckType<int>, nonThrowing, isThrowing>();
+    CHECK_MESSAGE((!CheckType<int>::check_type_counter), "Dropped objects in priority_queue_node test");
     g_Wakeup_Msg = "priority_queue_node(is,is): Missed wakeup or machine is overloaded?";
-    run_priority_queue_node_test<int, isThrowing,isThrowing>();
+    run_priority_queue_node_test<int, isThrowing, isThrowing>();
     g_Wakeup_Msg = g_Orig_Wakeup_Msg;
 }
 
 // ------------------- join_node ----------------
-template<class JP> struct graph_policy_name{
-    static const char* name() {return "unknown"; }
+template <class JP>
+struct graph_policy_name {
+    static const char *name() { return "unknown"; }
 };
-template<> struct graph_policy_name<tbb::flow::queueing>  {
-    static const char* name() {return "queueing"; }
+template <>
+struct graph_policy_name<tbb::flow::queueing> {
+    static const char *name() { return "queueing"; }
 };
-template<> struct graph_policy_name<tbb::flow::reserving> {
-    static const char* name() {return "reserving"; }
+template <>
+struct graph_policy_name<tbb::flow::reserving> {
+    static const char *name() { return "reserving"; }
 };
-template<> struct graph_policy_name<tbb::flow::tag_matching> {
-    static const char* name() {return "tag_matching"; }
+template <>
+struct graph_policy_name<tbb::flow::tag_matching> {
+    static const char *name() { return "tag_matching"; }
 };
 
-
-template<
-    class JP,
-    class OutputTuple,
-    class InputType0,
-    class InputBodyType0,
-    class InputType1,
-    class InputBodyType1,
-    class TestJoinType,
-    class SinkType,
-    class SinkBodyType
-    >
+template <class JP, class OutputTuple, class InputType0, class InputBodyType0, class InputType1,
+          class InputBodyType1, class TestJoinType, class SinkType, class SinkBodyType>
 struct run_one_join_node_test {
     run_one_join_node_test() {}
-    static void execute_test(bool throwException,bool flog) {
-        typedef typename std::tuple_element<0,OutputTuple>::type ItemType0;
-        typedef typename std::tuple_element<1,OutputTuple>::type ItemType1;
+    static void execute_test(bool throwException, bool flog) {
+        typedef typename std::tuple_element<0, OutputTuple>::type ItemType0;
+        typedef typename std::tuple_element<1, OutputTuple>::type ItemType1;
 
         tbb::flow::graph g;
-        std::atomic<int>input0_count;
-        std::atomic<int>input1_count;
-        std::atomic<int>sink_count;
+        std::atomic<int> input0_count;
+        std::atomic<int> input1_count;
+        std::atomic<int> sink_count;
         input0_count = input1_count = sink_count = 0;
 #if USE_TASK_SCHEDULER_OBSERVER
         eh_test_observer o;
@@ -1325,50 +1343,55 @@ struct run_one_join_node_test {
         InputType0 input0(g, InputBodyType0(input0_count));
         InputType1 input1(g, InputBodyType1(input1_count));
         TestJoinType node_to_test(g);
-        SinkType sink(g,tbb::flow::unlimited,SinkBodyType(sink_count));
-        make_edge(input0,tbb::flow::input_port<0>(node_to_test));
-        make_edge(input1,tbb::flow::input_port<1>(node_to_test));
+        SinkType sink(g, tbb::flow::unlimited, SinkBodyType(sink_count));
+        make_edge(input0, tbb::flow::input_port<0>(node_to_test));
+        make_edge(input1, tbb::flow::input_port<1>(node_to_test));
         make_edge(node_to_test, sink);
-        for(int iter = 0; iter < 2; ++iter) {
-            ResetGlobals(throwException,flog);
-            if(throwException) {
+        for (int iter = 0; iter < 2; ++iter) {
+            ResetGlobals(throwException, flog);
+            if (throwException) {
                 TRY();
-                    input0.activate();
-                    input1.activate();
-                    g.wait_for_all();
+                input0.activate();
+                input1.activate();
+                g.wait_for_all();
                 CATCH_AND_ASSERT();
-            }
-            else {
+            } else {
                 TRY();
-                    input0.activate();
-                    input1.activate();
-                    g.wait_for_all();
+                input0.activate();
+                input1.activate();
+                g.wait_for_all();
                 CATCH_AND_FAIL();
             }
-            bool okayNoExceptionsCaught = (g_ExceptionInMaster && !g_MasterExecutedThrow) || (!g_ExceptionInMaster && !g_NonMasterExecutedThrow) || !throwException;
+            bool okayNoExceptionsCaught = (g_ExceptionInMaster && !g_MasterExecutedThrow)
+                                          || (!g_ExceptionInMaster && !g_NonMasterExecutedThrow)
+                                          || !throwException;
             int ib0_cnt = tbb::flow::copy_body<InputBodyType0>(input0).count_value();
             int ib1_cnt = tbb::flow::copy_body<InputBodyType1>(input1).count_value();
             int nb_cnt = tbb::flow::copy_body<SinkBodyType>(sink).count_value();
-            if(throwException) {
-                CHECK_MESSAGE( (g.exception_thrown() || okayNoExceptionsCaught), "Exception not caught by graph");
-                CHECK_MESSAGE( (g.is_cancelled() || okayNoExceptionsCaught), "Cancellation not signalled in graph");
-                CHECK_MESSAGE( (ib0_cnt <= g_NumItems && ib1_cnt <= g_NumItems), "Too many items sent by inputs");
-                CHECK_MESSAGE( (nb_cnt <= ((ib0_cnt < ib1_cnt) ? ib0_cnt : ib1_cnt)), "Too many items received by sink nodes");
-            }
-            else {
-                CHECK_MESSAGE( (!g.exception_thrown()), "Exception flag in flow::graph set but no throw occurred");
-                CHECK_MESSAGE( (!g.is_cancelled()), "canceled flag set but no throw occurred");
-                if(ib0_cnt != g_NumItems) {
-                //     INFO("throwException == %s\n" << (throwException ? "true" : "false"));
-                //     INFO("iter == " << iter << "\n");
-                //     INFO("ib0_cnt == " << ib0_cnt << "\n");
-                //     INFO("g_NumItems == " << g_NumItems << "\n");
+            if (throwException) {
+                CHECK_MESSAGE((g.exception_thrown() || okayNoExceptionsCaught),
+                              "Exception not caught by graph");
+                CHECK_MESSAGE((g.is_cancelled() || okayNoExceptionsCaught),
+                              "Cancellation not signalled in graph");
+                CHECK_MESSAGE((ib0_cnt <= g_NumItems && ib1_cnt <= g_NumItems),
+                              "Too many items sent by inputs");
+                CHECK_MESSAGE((nb_cnt <= ((ib0_cnt < ib1_cnt) ? ib0_cnt : ib1_cnt)),
+                              "Too many items received by sink nodes");
+            } else {
+                CHECK_MESSAGE((!g.exception_thrown()),
+                              "Exception flag in flow::graph set but no throw occurred");
+                CHECK_MESSAGE((!g.is_cancelled()), "canceled flag set but no throw occurred");
+                if (ib0_cnt != g_NumItems) {
+                    //     INFO("throwException == %s\n" << (throwException ? "true" : "false"));
+                    //     INFO("iter == " << iter << "\n");
+                    //     INFO("ib0_cnt == " << ib0_cnt << "\n");
+                    //     INFO("g_NumItems == " << g_NumItems << "\n");
                 }
-                CHECK_MESSAGE( (ib0_cnt == g_NumItems), "Missing invocations of input_node0");  // this one
-                CHECK_MESSAGE( (ib1_cnt == g_NumItems), "Missing invocations of input_node1");
-                CHECK_MESSAGE( (nb_cnt == g_NumItems), "Missing items in absorbers");
+                CHECK_MESSAGE((ib0_cnt == g_NumItems), "Missing invocations of input_node0");// this one
+                CHECK_MESSAGE((ib1_cnt == g_NumItems), "Missing invocations of input_node1");
+                CHECK_MESSAGE((nb_cnt == g_NumItems), "Missing items in absorbers");
             }
-            if(iter == 0) {
+            if (iter == 0) {
                 remove_edge(node_to_test, sink);
                 tbb::flow::input_port<0>(node_to_test).try_put(ItemType0(g_NumItems + 1));
                 tbb::flow::input_port<1>(node_to_test).try_put(ItemType1(g_NumItems + 2));
@@ -1377,55 +1400,39 @@ struct run_one_join_node_test {
                 input0_count = input1_count = sink_count = 0;
                 make_edge(node_to_test, sink);
                 g.wait_for_all();
-            }
-            else {
+            } else {
                 g.wait_for_all();
                 g.reset();
                 input0_count = input1_count = sink_count = 0;
             }
-            CHECK_MESSAGE( (0 == tbb::flow::copy_body<InputBodyType0>(input0).count_value()),"Reset input failed");
-            CHECK_MESSAGE( (0 == tbb::flow::copy_body<InputBodyType1>(input1).count_value()),"Reset input failed");
+            CHECK_MESSAGE((0 == tbb::flow::copy_body<InputBodyType0>(input0).count_value()),
+                          "Reset input failed");
+            CHECK_MESSAGE((0 == tbb::flow::copy_body<InputBodyType1>(input1).count_value()),
+                          "Reset input failed");
             nb_cnt = tbb::flow::copy_body<SinkBodyType>(sink).count_value();
-            CHECK_MESSAGE( (0 == tbb::flow::copy_body<SinkBodyType>(sink).count_value()),"Reset sink failed");
+            CHECK_MESSAGE((0 == tbb::flow::copy_body<SinkBodyType>(sink).count_value()), "Reset sink failed");
         }
 
 #if USE_TASK_SCHEDULER_OBSERVER
         o.observe(false);
 #endif
     }
-};  // run_one_join_node_test
-
-template<
-    class OutputTuple,
-    class InputType0,
-    class InputBodyType0,
-    class InputType1,
-    class InputBodyType1,
-    class TestJoinType,
-    class SinkType,
-    class SinkBodyType
-    >
-struct run_one_join_node_test<
-        tbb::flow::tag_matching,
-        OutputTuple,
-        InputType0,
-        InputBodyType0,
-        InputType1,
-        InputBodyType1,
-        TestJoinType,
-        SinkType,
-        SinkBodyType
-    > {
+};// run_one_join_node_test
+
+template <class OutputTuple, class InputType0, class InputBodyType0, class InputType1, class InputBodyType1,
+          class TestJoinType, class SinkType, class SinkBodyType>
+struct run_one_join_node_test<tbb::flow::tag_matching, OutputTuple, InputType0, InputBodyType0, InputType1,
+                              InputBodyType1, TestJoinType, SinkType, SinkBodyType> {
     run_one_join_node_test() {}
-    static void execute_test(bool throwException,bool flog) {
-        typedef typename std::tuple_element<0,OutputTuple>::type ItemType0;
-        typedef typename std::tuple_element<1,OutputTuple>::type ItemType1;
+    static void execute_test(bool throwException, bool flog) {
+        typedef typename std::tuple_element<0, OutputTuple>::type ItemType0;
+        typedef typename std::tuple_element<1, OutputTuple>::type ItemType1;
 
         tbb::flow::graph g;
 
-        std::atomic<int>input0_count;
-        std::atomic<int>input1_count;
-        std::atomic<int>sink_count;
+        std::atomic<int> input0_count;
+        std::atomic<int> input1_count;
+        std::atomic<int> sink_count;
         input0_count = input1_count = sink_count = 0;
 #if USE_TASK_SCHEDULER_OBSERVER
         eh_test_observer o;
@@ -1435,127 +1442,119 @@ struct run_one_join_node_test<
         InputType0 input0(g, InputBodyType0(input0_count, 2));
         InputType1 input1(g, InputBodyType1(input1_count, 3));
         TestJoinType node_to_test(g, tag_func<ItemType0>(ItemType0(2)), tag_func<ItemType1>(ItemType1(3)));
-        SinkType sink(g,tbb::flow::unlimited,SinkBodyType(sink_count));
-        make_edge(input0,tbb::flow::input_port<0>(node_to_test));
-        make_edge(input1,tbb::flow::input_port<1>(node_to_test));
+        SinkType sink(g, tbb::flow::unlimited, SinkBodyType(sink_count));
+        make_edge(input0, tbb::flow::input_port<0>(node_to_test));
+        make_edge(input1, tbb::flow::input_port<1>(node_to_test));
         make_edge(node_to_test, sink);
-        for(int iter = 0; iter < 2; ++iter) {
-            ResetGlobals(throwException,flog);
-            if(throwException) {
+        for (int iter = 0; iter < 2; ++iter) {
+            ResetGlobals(throwException, flog);
+            if (throwException) {
                 TRY();
-                    input0.activate();
-                    input1.activate();
-                    g.wait_for_all();
+                input0.activate();
+                input1.activate();
+                g.wait_for_all();
                 CATCH_AND_ASSERT();
-            }
-            else {
+            } else {
                 TRY();
-                    input0.activate();
-                    input1.activate();
-                    g.wait_for_all();
+                input0.activate();
+                input1.activate();
+                g.wait_for_all();
                 CATCH_AND_FAIL();
             }
-            bool okayNoExceptionsCaught = (g_ExceptionInMaster && !g_MasterExecutedThrow) || (!g_ExceptionInMaster && !g_NonMasterExecutedThrow) || !throwException;
+            bool okayNoExceptionsCaught = (g_ExceptionInMaster && !g_MasterExecutedThrow)
+                                          || (!g_ExceptionInMaster && !g_NonMasterExecutedThrow)
+                                          || !throwException;
             int ib0_cnt = tbb::flow::copy_body<InputBodyType0>(input0).count_value();
             int ib1_cnt = tbb::flow::copy_body<InputBodyType1>(input1).count_value();
             int nb_cnt = tbb::flow::copy_body<SinkBodyType>(sink).count_value();
-            if(throwException) {
-                CHECK_MESSAGE( (g.exception_thrown() || okayNoExceptionsCaught), "Exception not caught by graph");
-                CHECK_MESSAGE( (g.is_cancelled() || okayNoExceptionsCaught), "Cancellation not signalled in graph");
-                CHECK_MESSAGE( (ib0_cnt <= g_NumItems && ib1_cnt <= g_NumItems), "Too many items sent by inputs");
-                CHECK_MESSAGE( (nb_cnt <= ((ib0_cnt < ib1_cnt) ? ib0_cnt : ib1_cnt)), "Too many items received by sink nodes");
+            if (throwException) {
+                CHECK_MESSAGE((g.exception_thrown() || okayNoExceptionsCaught),
+                              "Exception not caught by graph");
+                CHECK_MESSAGE((g.is_cancelled() || okayNoExceptionsCaught),
+                              "Cancellation not signalled in graph");
+                CHECK_MESSAGE((ib0_cnt <= g_NumItems && ib1_cnt <= g_NumItems),
+                              "Too many items sent by inputs");
+                CHECK_MESSAGE((nb_cnt <= ((ib0_cnt < ib1_cnt) ? ib0_cnt : ib1_cnt)),
+                              "Too many items received by sink nodes");
+            } else {
+                CHECK_MESSAGE((!g.exception_thrown()),
+                              "Exception flag in flow::graph set but no throw occurred");
+                CHECK_MESSAGE((!g.is_cancelled()), "canceled flag set but no throw occurred");
+                CHECK_MESSAGE((ib0_cnt == g_NumItems), "Missing invocations of input_node0");
+                CHECK_MESSAGE((ib1_cnt == g_NumItems), "Missing invocations of input_node1");
+                CHECK_MESSAGE((nb_cnt == g_NumItems), "Missing items in absorbers");
             }
-            else {
-                CHECK_MESSAGE( (!g.exception_thrown()), "Exception flag in flow::graph set but no throw occurred");
-                CHECK_MESSAGE( (!g.is_cancelled()), "canceled flag set but no throw occurred");
-                CHECK_MESSAGE( (ib0_cnt == g_NumItems), "Missing invocations of input_node0");
-                CHECK_MESSAGE( (ib1_cnt == g_NumItems), "Missing invocations of input_node1");
-                CHECK_MESSAGE( (nb_cnt == g_NumItems), "Missing items in absorbers");
-            }
-            if(iter == 0) {
+            if (iter == 0) {
                 remove_edge(node_to_test, sink);
                 tbb::flow::input_port<0>(node_to_test).try_put(ItemType0(g_NumItems + 4));
                 tbb::flow::input_port<1>(node_to_test).try_put(ItemType1(g_NumItems + 2));
-                g.wait_for_all();   // have to wait for the graph to stop again....
-                g.reset();  // resets the body of the input_nodes, test_node and the absorb_nodes.
+                g.wait_for_all();// have to wait for the graph to stop again....
+                g.reset();       // resets the body of the input_nodes, test_node and the absorb_nodes.
                 input0_count = input1_count = sink_count = 0;
                 make_edge(node_to_test, sink);
-                g.wait_for_all();   // have to wait for the graph to stop again....
-            }
-            else {
+                g.wait_for_all();// have to wait for the graph to stop again....
+            } else {
                 g.wait_for_all();
                 g.reset();
                 input0_count = input1_count = sink_count = 0;
             }
-            CHECK_MESSAGE( (0 == tbb::flow::copy_body<InputBodyType0>(input0).count_value()),"Reset input failed");
-            CHECK_MESSAGE( (0 == tbb::flow::copy_body<InputBodyType1>(input1).count_value()),"Reset input failed");
+            CHECK_MESSAGE((0 == tbb::flow::copy_body<InputBodyType0>(input0).count_value()),
+                          "Reset input failed");
+            CHECK_MESSAGE((0 == tbb::flow::copy_body<InputBodyType1>(input1).count_value()),
+                          "Reset input failed");
             nb_cnt = tbb::flow::copy_body<SinkBodyType>(sink).count_value();
-            CHECK_MESSAGE( (0 == tbb::flow::copy_body<SinkBodyType>(sink).count_value()),"Reset sink failed");
+            CHECK_MESSAGE((0 == tbb::flow::copy_body<SinkBodyType>(sink).count_value()), "Reset sink failed");
         }
 
 #if USE_TASK_SCHEDULER_OBSERVER
         o.observe(false);
 #endif
     }
-};  // run_one_join_node_test<tag_matching>
+};// run_one_join_node_test<tag_matching>
 
-template<class JP, class OutputTuple,
-             TestNodeTypeEnum InputThrowType,
-             TestNodeTypeEnum SinkThrowType>
+template <class JP, class OutputTuple, TestNodeTypeEnum InputThrowType, TestNodeTypeEnum SinkThrowType>
 void run_join_node_test() {
-    typedef typename std::tuple_element<0,OutputTuple>::type ItemType0;
-    typedef typename std::tuple_element<1,OutputTuple>::type ItemType1;
-    typedef test_input_body<ItemType0,InputThrowType> InputBodyType0;
-    typedef test_input_body<ItemType1,InputThrowType> InputBodyType1;
-    typedef absorber_body<OutputTuple,tbb::flow::continue_msg,SinkThrowType,unlimited_type> SinkBodyType;
+    typedef typename std::tuple_element<0, OutputTuple>::type ItemType0;
+    typedef typename std::tuple_element<1, OutputTuple>::type ItemType1;
+    typedef test_input_body<ItemType0, InputThrowType> InputBodyType0;
+    typedef test_input_body<ItemType1, InputThrowType> InputBodyType1;
+    typedef absorber_body<OutputTuple, tbb::flow::continue_msg, SinkThrowType, unlimited_type> SinkBodyType;
 
     typedef typename tbb::flow::input_node<ItemType0> InputType0;
     typedef typename tbb::flow::input_node<ItemType1> InputType1;
-    typedef typename tbb::flow::join_node<OutputTuple,JP> TestJoinType;
-    typedef typename tbb::flow::function_node<OutputTuple,tbb::flow::continue_msg> SinkType;
+    typedef typename tbb::flow::join_node<OutputTuple, JP> TestJoinType;
+    typedef typename tbb::flow::function_node<OutputTuple, tbb::flow::continue_msg> SinkType;
 
-    for(int i = 0; i < 4; ++i) {
-        if(2 == i) continue;
+    for (int i = 0; i < 4; ++i) {
+        if (2 == i) continue;
         bool throwException = (i & 0x1) != 0;
         bool doFlog = (i & 0x2) != 0;
-        run_one_join_node_test<
-             JP,
-             OutputTuple,
-             InputType0,
-             InputBodyType0,
-             InputType1,
-             InputBodyType1,
-             TestJoinType,
-             SinkType,
-             SinkBodyType>::execute_test(throwException,doFlog);
+        run_one_join_node_test<JP, OutputTuple, InputType0, InputBodyType0, InputType1, InputBodyType1,
+                               TestJoinType, SinkType, SinkBodyType>::execute_test(throwException, doFlog);
     }
 }
 
-template<class JP>
+template <class JP>
 void test_join_node() {
     INFO("Testing join_node<" << graph_policy_name<JP>::name() << ">\n");
     // only doing two-input joins
     g_Wakeup_Msg = "join(is,non): Missed wakeup or machine is overloaded?";
-    run_join_node_test<JP, std::tuple<int,int>,  isThrowing, nonThrowing>();
+    run_join_node_test<JP, std::tuple<int, int>, isThrowing, nonThrowing>();
     CheckType<int>::check_type_counter = 0;
     g_Wakeup_Msg = "join(non,is): Missed wakeup or machine is overloaded?";
-    run_join_node_test<JP, std::tuple<CheckType<int>,int>, nonThrowing, isThrowing>();
-    CHECK_MESSAGE( (!CheckType<int>::check_type_counter), "Dropped items in test");
+    run_join_node_test<JP, std::tuple<CheckType<int>, int>, nonThrowing, isThrowing>();
+    CHECK_MESSAGE((!CheckType<int>::check_type_counter), "Dropped items in test");
     g_Wakeup_Msg = "join(is,is): Missed wakeup or machine is overloaded?";
-    run_join_node_test<JP, std::tuple<int,int>,  isThrowing, isThrowing>();
+    run_join_node_test<JP, std::tuple<int, int>, isThrowing, isThrowing>();
     g_Wakeup_Msg = g_Orig_Wakeup_Msg;
 }
 
 // ------------------- limiter_node -------------
 
-template<
-    class BufferItemType,       //
-    class InputNodeType,
-    class InputNodeBodyType,
-    class TestNodeType,
-    class SinkNodeType,
-    class SinkNodeBodyType >
-void run_one_limiter_node_test(bool throwException,bool flog) {
+template <class BufferItemType,//
+          class InputNodeType, class InputNodeBodyType, class TestNodeType, class SinkNodeType,
+          class SinkNodeBodyType>
+void run_one_limiter_node_test(bool throwException, bool flog) {
     tbb::flow::graph g;
 
     std::atomic<int> input_count;
@@ -1567,42 +1566,43 @@ void run_one_limiter_node_test(bool throwException,bool flog) {
 #endif
     g_Master = std::this_thread::get_id();
     InputNodeType input(g, InputNodeBodyType(input_count));
-    TestNodeType node_to_test(g,g_NumThreads + 1);
-    SinkNodeType sink(g,tbb::flow::unlimited,SinkNodeBodyType(sink_count));
-    make_edge(input,node_to_test);
+    TestNodeType node_to_test(g, g_NumThreads + 1);
+    SinkNodeType sink(g, tbb::flow::unlimited, SinkNodeBodyType(sink_count));
+    make_edge(input, node_to_test);
     make_edge(node_to_test, sink);
-    for(int iter = 0; iter < 2; ++iter) {
-        ResetGlobals(throwException,flog);
-        if(throwException) {
+    for (int iter = 0; iter < 2; ++iter) {
+        ResetGlobals(throwException, flog);
+        if (throwException) {
             TRY();
-                input.activate();
-                g.wait_for_all();
+            input.activate();
+            g.wait_for_all();
             CATCH_AND_ASSERT();
-        }
-        else {
+        } else {
             TRY();
-                input.activate();
-                g.wait_for_all();
+            input.activate();
+            g.wait_for_all();
             CATCH_AND_FAIL();
         }
-        bool okayNoExceptionsCaught = (g_ExceptionInMaster && !g_MasterExecutedThrow) || (!g_ExceptionInMaster && !g_NonMasterExecutedThrow) || !throwException;
+        bool okayNoExceptionsCaught = (g_ExceptionInMaster && !g_MasterExecutedThrow)
+                                      || (!g_ExceptionInMaster && !g_NonMasterExecutedThrow)
+                                      || !throwException;
         int ib_cnt = tbb::flow::copy_body<InputNodeBodyType>(input).count_value();
         int nb_cnt = tbb::flow::copy_body<SinkNodeBodyType>(sink).count_value();
-        if(throwException) {
-            CHECK_MESSAGE( (g.exception_thrown() || okayNoExceptionsCaught), "Exception not caught by graph");
-            CHECK_MESSAGE( (g.is_cancelled() || okayNoExceptionsCaught), "Cancellation not signalled in graph");
-            CHECK_MESSAGE( (ib_cnt <= g_NumItems), "Too many items sent by inputs");
-            CHECK_MESSAGE( (nb_cnt <= ib_cnt), "Too many items received by sink nodes");
-        }
-        else {
-            CHECK_MESSAGE( (!g.exception_thrown()), "Exception flag in flow::graph set but no throw occurred");
-            CHECK_MESSAGE( (!g.is_cancelled()), "canceled flag set but no throw occurred");
+        if (throwException) {
+            CHECK_MESSAGE((g.exception_thrown() || okayNoExceptionsCaught), "Exception not caught by graph");
+            CHECK_MESSAGE((g.is_cancelled() || okayNoExceptionsCaught),
+                          "Cancellation not signalled in graph");
+            CHECK_MESSAGE((ib_cnt <= g_NumItems), "Too many items sent by inputs");
+            CHECK_MESSAGE((nb_cnt <= ib_cnt), "Too many items received by sink nodes");
+        } else {
+            CHECK_MESSAGE((!g.exception_thrown()), "Exception flag in flow::graph set but no throw occurred");
+            CHECK_MESSAGE((!g.is_cancelled()), "canceled flag set but no throw occurred");
             // we stop after limiter's limit, which is g_NumThreads + 1.  The input_node
             // is invoked one extra time, filling its buffer, so its limit is g_NumThreads + 2.
-            CHECK_MESSAGE( (ib_cnt == g_NumThreads + 2), "Missing invocations of input_node");
-            CHECK_MESSAGE( (nb_cnt == g_NumThreads + 1), "Missing items in absorbers");
+            CHECK_MESSAGE((ib_cnt == g_NumThreads + 2), "Missing invocations of input_node");
+            CHECK_MESSAGE((nb_cnt == g_NumThreads + 1), "Missing items in absorbers");
         }
-        if(iter == 0) {
+        if (iter == 0) {
             remove_edge(node_to_test, sink);
             node_to_test.try_put(BufferItemType());
             node_to_test.try_put(BufferItemType());
@@ -1610,16 +1610,16 @@ void run_one_limiter_node_test(bool throwException,bool flog) {
             g.reset();
             input_count = sink_count = 0;
             BufferItemType tmp;
-            CHECK_MESSAGE( (!node_to_test.try_get(tmp)), "node not empty");
+            CHECK_MESSAGE((!node_to_test.try_get(tmp)), "node not empty");
             make_edge(node_to_test, sink);
             g.wait_for_all();
-        }
-        else {
+        } else {
             g.reset();
             input_count = sink_count = 0;
         }
-        CHECK_MESSAGE( (0 == tbb::flow::copy_body<InputNodeBodyType>(input).count_value()),"Reset input failed");
-        CHECK_MESSAGE( (0 == tbb::flow::copy_body<SinkNodeBodyType>(sink).count_value()),"Reset sink failed");
+        CHECK_MESSAGE((0 == tbb::flow::copy_body<InputNodeBodyType>(input).count_value()),
+                      "Reset input failed");
+        CHECK_MESSAGE((0 == tbb::flow::copy_body<SinkNodeBodyType>(sink).count_value()), "Reset sink failed");
     }
 
 #if USE_TASK_SCHEDULER_OBSERVER
@@ -1627,54 +1627,45 @@ void run_one_limiter_node_test(bool throwException,bool flog) {
 #endif
 }
 
-template<class BufferItemType,
-         TestNodeTypeEnum InputThrowType,
-         TestNodeTypeEnum SinkThrowType>
+template <class BufferItemType, TestNodeTypeEnum InputThrowType, TestNodeTypeEnum SinkThrowType>
 void run_limiter_node_test() {
-    typedef test_input_body<BufferItemType,InputThrowType> InputBodyType;
-    typedef absorber_body<BufferItemType,tbb::flow::continue_msg,SinkThrowType,unlimited_type> SinkBodyType;
+    typedef test_input_body<BufferItemType, InputThrowType> InputBodyType;
+    typedef absorber_body<BufferItemType, tbb::flow::continue_msg, SinkThrowType, unlimited_type>
+            SinkBodyType;
 
     typedef tbb::flow::input_node<BufferItemType> InputType;
-    typedef tbb::flow::limiter_node<BufferItemType>  LmtType;
-    typedef tbb::flow::function_node<BufferItemType,tbb::flow::continue_msg> SnkType;
+    typedef tbb::flow::limiter_node<BufferItemType> LmtType;
+    typedef tbb::flow::function_node<BufferItemType, tbb::flow::continue_msg> SnkType;
 
-    for(int i = 0; i < 4; ++i) {
-        if(i == 2) continue;  // no need to test flog w/o throws
+    for (int i = 0; i < 4; ++i) {
+        if (i == 2) continue;// no need to test flog w/o throws
         bool throwException = (i & 0x1) != 0;
         bool doFlog = (i & 0x2) != 0;
         run_one_limiter_node_test<
-            /* class BufferItemType*/     BufferItemType,
-            /*class InputNodeType*/       InputType,
-            /*class InputNodeBodyType*/   InputBodyType,
-            /*class TestNodeType*/        LmtType,
-            /*class SinkNodeType*/        SnkType,
-            /*class SinkNodeBodyType*/    SinkBodyType
-            >(throwException, doFlog);
+                /* class BufferItemType*/ BufferItemType,
+                /*class InputNodeType*/ InputType,
+                /*class InputNodeBodyType*/ InputBodyType,
+                /*class TestNodeType*/ LmtType,
+                /*class SinkNodeType*/ SnkType,
+                /*class SinkNodeBodyType*/ SinkBodyType>(throwException, doFlog);
     }
 }
 
 void test_limiter_node() {
     INFO("Testing limiter_node\n");
     g_Wakeup_Msg = "limiter_node(is,non): Missed wakeup or machine is overloaded?";
-    run_limiter_node_test<int,isThrowing,nonThrowing>();
+    run_limiter_node_test<int, isThrowing, nonThrowing>();
     g_Wakeup_Msg = "limiter_node(non,is): Missed wakeup or machine is overloaded?";
-    run_limiter_node_test<int,nonThrowing,isThrowing>();
+    run_limiter_node_test<int, nonThrowing, isThrowing>();
     g_Wakeup_Msg = "limiter_node(is,is): Missed wakeup or machine is overloaded?";
-    run_limiter_node_test<int,isThrowing,isThrowing>();
+    run_limiter_node_test<int, isThrowing, isThrowing>();
     g_Wakeup_Msg = g_Orig_Wakeup_Msg;
 }
 
 // -------- split_node --------------------
 
-template<
-    class InputTuple,
-    class InputType,
-    class InputBodyType,
-    class TestSplitType,
-    class SinkType0,
-    class SinkBodyType0,
-    class SinkType1,
-    class SinkBodyType1>
+template <class InputTuple, class InputType, class InputBodyType, class TestSplitType, class SinkType0,
+          class SinkBodyType0, class SinkType1, class SinkBodyType1>
 void run_one_split_node_test(bool throwException, bool flog) {
 
     tbb::flow::graph g;
@@ -1691,109 +1682,94 @@ void run_one_split_node_test(bool throwException, bool flog) {
     g_Master = std::this_thread::get_id();
     InputType input(g, InputBodyType(input_count));
     TestSplitType node_to_test(g);
-    SinkType0 sink0(g,tbb::flow::unlimited,SinkBodyType0(sink0_count));
-    SinkType1 sink1(g,tbb::flow::unlimited,SinkBodyType1(sink1_count));
+    SinkType0 sink0(g, tbb::flow::unlimited, SinkBodyType0(sink0_count));
+    SinkType1 sink1(g, tbb::flow::unlimited, SinkBodyType1(sink1_count));
     make_edge(input, node_to_test);
     make_edge(tbb::flow::output_port<0>(node_to_test), sink0);
     make_edge(tbb::flow::output_port<1>(node_to_test), sink1);
 
-    for(int iter = 0; iter < 2; ++iter) {  // run, reset, run again
-        ResetGlobals(throwException,flog);
-        if(throwException) {
+    for (int iter = 0; iter < 2; ++iter) {// run, reset, run again
+        ResetGlobals(throwException, flog);
+        if (throwException) {
             TRY();
-                input.activate();
-                g.wait_for_all();
+            input.activate();
+            g.wait_for_all();
             CATCH_AND_ASSERT();
-        }
-        else {
+        } else {
             TRY();
-                input.activate();
-                g.wait_for_all();
+            input.activate();
+            g.wait_for_all();
             CATCH_AND_FAIL();
         }
-        bool okayNoExceptionsCaught = (g_ExceptionInMaster && !g_MasterExecutedThrow) || (!g_ExceptionInMaster && !g_NonMasterExecutedThrow) || !throwException;
+        bool okayNoExceptionsCaught = (g_ExceptionInMaster && !g_MasterExecutedThrow)
+                                      || (!g_ExceptionInMaster && !g_NonMasterExecutedThrow)
+                                      || !throwException;
         int ib_cnt = tbb::flow::copy_body<InputBodyType>(input).count_value();
         int nb0_cnt = tbb::flow::copy_body<SinkBodyType0>(sink0).count_value();
         int nb1_cnt = tbb::flow::copy_body<SinkBodyType1>(sink1).count_value();
-        if(throwException) {
-            CHECK_MESSAGE( (g.exception_thrown() || okayNoExceptionsCaught), "Exception not caught by graph");
-            CHECK_MESSAGE( (g.is_cancelled() || okayNoExceptionsCaught), "Cancellation not signalled in graph");
-            CHECK_MESSAGE( (ib_cnt <= 2*g_NumItems), "Too many items sent by input");
-            CHECK_MESSAGE( (nb0_cnt + nb1_cnt <= ib_cnt*2), "Too many items received by sink nodes");
+        if (throwException) {
+            CHECK_MESSAGE((g.exception_thrown() || okayNoExceptionsCaught), "Exception not caught by graph");
+            CHECK_MESSAGE((g.is_cancelled() || okayNoExceptionsCaught),
+                          "Cancellation not signalled in graph");
+            CHECK_MESSAGE((ib_cnt <= 2 * g_NumItems), "Too many items sent by input");
+            CHECK_MESSAGE((nb0_cnt + nb1_cnt <= ib_cnt * 2), "Too many items received by sink nodes");
+        } else {
+            CHECK_MESSAGE((!g.exception_thrown()), "Exception flag in flow::graph set but no throw occurred");
+            CHECK_MESSAGE((!g.is_cancelled()), "canceled flag set but no throw occurred");
+            CHECK_MESSAGE((ib_cnt == g_NumItems), "Missing invocations of input_nodes");
+            CHECK_MESSAGE((nb0_cnt == g_NumItems && nb1_cnt == g_NumItems), "Missing items in absorbers");
         }
-        else {
-            CHECK_MESSAGE( (!g.exception_thrown()), "Exception flag in flow::graph set but no throw occurred");
-            CHECK_MESSAGE( (!g.is_cancelled()), "canceled flag set but no throw occurred");
-            CHECK_MESSAGE( (ib_cnt == g_NumItems), "Missing invocations of input_nodes");
-            CHECK_MESSAGE( (nb0_cnt == g_NumItems && nb1_cnt == g_NumItems), "Missing items in absorbers");
-        }
-        g.reset();  // resets the body of the input_nodes and the absorb_nodes.
+        g.reset();// resets the body of the input_nodes and the absorb_nodes.
         input_count = sink0_count = sink1_count = 0;
-        CHECK_MESSAGE( (0 == tbb::flow::copy_body<InputBodyType>(input).count_value()),"Reset input failed");
-        CHECK_MESSAGE( (0 == tbb::flow::copy_body<SinkBodyType0>(sink0).count_value()),"Reset sink 0 failed");
-        CHECK_MESSAGE( (0 == tbb::flow::copy_body<SinkBodyType1>(sink1).count_value()),"Reset sink 1 failed");
+        CHECK_MESSAGE((0 == tbb::flow::copy_body<InputBodyType>(input).count_value()), "Reset input failed");
+        CHECK_MESSAGE((0 == tbb::flow::copy_body<SinkBodyType0>(sink0).count_value()), "Reset sink 0 failed");
+        CHECK_MESSAGE((0 == tbb::flow::copy_body<SinkBodyType1>(sink1).count_value()), "Reset sink 1 failed");
     }
 #if USE_TASK_SCHEDULER_OBSERVER
     o.observe(false);
 #endif
 }
 
-template<class InputTuple,
-             TestNodeTypeEnum InputThrowType,
-             TestNodeTypeEnum SinkThrowType>
+template <class InputTuple, TestNodeTypeEnum InputThrowType, TestNodeTypeEnum SinkThrowType>
 void run_split_node_test() {
-    typedef typename std::tuple_element<0,InputTuple>::type ItemType0;
-    typedef typename std::tuple_element<1,InputTuple>::type ItemType1;
-    typedef tuple_test_input_body<InputTuple,InputThrowType> InputBodyType;
-    typedef absorber_body<ItemType0,tbb::flow::continue_msg,SinkThrowType,unlimited_type> SinkBodyType0;
-    typedef absorber_body<ItemType1,tbb::flow::continue_msg,SinkThrowType,unlimited_type> SinkBodyType1;
+    typedef typename std::tuple_element<0, InputTuple>::type ItemType0;
+    typedef typename std::tuple_element<1, InputTuple>::type ItemType1;
+    typedef tuple_test_input_body<InputTuple, InputThrowType> InputBodyType;
+    typedef absorber_body<ItemType0, tbb::flow::continue_msg, SinkThrowType, unlimited_type> SinkBodyType0;
+    typedef absorber_body<ItemType1, tbb::flow::continue_msg, SinkThrowType, unlimited_type> SinkBodyType1;
 
     typedef typename tbb::flow::input_node<InputTuple> InputType;
     typedef typename tbb::flow::split_node<InputTuple> TestSplitType;
-    typedef typename tbb::flow::function_node<ItemType0,tbb::flow::continue_msg> SinkType0;
-    typedef typename tbb::flow::function_node<ItemType1,tbb::flow::continue_msg> SinkType1;
+    typedef typename tbb::flow::function_node<ItemType0, tbb::flow::continue_msg> SinkType0;
+    typedef typename tbb::flow::function_node<ItemType1, tbb::flow::continue_msg> SinkType1;
 
-    for(int i = 0; i < 4; ++i) {
-        if(2 == i) continue;
+    for (int i = 0; i < 4; ++i) {
+        if (2 == i) continue;
         bool throwException = (i & 0x1) != 0;
         bool doFlog = (i & 0x2) != 0;
-        run_one_split_node_test<
-            InputTuple,
-            InputType,
-            InputBodyType,
-            TestSplitType,
-            SinkType0,
-            SinkBodyType0,
-            SinkType1,
-            SinkBodyType1>
-                (throwException,doFlog);
+        run_one_split_node_test<InputTuple, InputType, InputBodyType, TestSplitType, SinkType0, SinkBodyType0,
+                                SinkType1, SinkBodyType1>(throwException, doFlog);
     }
 }
 
 void test_split_node() {
     INFO("Testing split_node\n");
     g_Wakeup_Msg = "split_node(is,non): Missed wakeup or machine is overloaded?";
-    run_split_node_test<std::tuple<int,int>, isThrowing, nonThrowing>();
+    run_split_node_test<std::tuple<int, int>, isThrowing, nonThrowing>();
     g_Wakeup_Msg = "split_node(non,is): Missed wakeup or machine is overloaded?";
-    run_split_node_test<std::tuple<int,int>, nonThrowing, isThrowing>();
+    run_split_node_test<std::tuple<int, int>, nonThrowing, isThrowing>();
     g_Wakeup_Msg = "split_node(is,is): Missed wakeup or machine is overloaded?";
-    run_split_node_test<std::tuple<int,int>, isThrowing,  isThrowing>();
+    run_split_node_test<std::tuple<int, int>, isThrowing, isThrowing>();
     g_Wakeup_Msg = g_Orig_Wakeup_Msg;
 }
 
 // --------- indexer_node ----------------------
 
-template < class InputTuple,
-    class InputType0,
-    class InputBodyType0,
-    class InputType1,
-    class InputBodyType1,
-    class TestNodeType,
-    class SinkType,
-    class SinkBodyType>
-void run_one_indexer_node_test(bool throwException,bool flog) {
-    typedef typename std::tuple_element<0,InputTuple>::type ItemType0;
-    typedef typename std::tuple_element<1,InputTuple>::type ItemType1;
+template <class InputTuple, class InputType0, class InputBodyType0, class InputType1, class InputBodyType1,
+          class TestNodeType, class SinkType, class SinkBodyType>
+void run_one_indexer_node_test(bool throwException, bool flog) {
+    typedef typename std::tuple_element<0, InputTuple>::type ItemType0;
+    typedef typename std::tuple_element<1, InputTuple>::type ItemType1;
 
     tbb::flow::graph g;
 
@@ -1809,44 +1785,45 @@ void run_one_indexer_node_test(bool throwException,bool flog) {
     InputType0 input0(g, InputBodyType0(input0_count));
     InputType1 input1(g, InputBodyType1(input1_count));
     TestNodeType node_to_test(g);
-    SinkType sink(g,tbb::flow::unlimited,SinkBodyType(sink_count));
-    make_edge(input0,tbb::flow::input_port<0>(node_to_test));
-    make_edge(input1,tbb::flow::input_port<1>(node_to_test));
+    SinkType sink(g, tbb::flow::unlimited, SinkBodyType(sink_count));
+    make_edge(input0, tbb::flow::input_port<0>(node_to_test));
+    make_edge(input1, tbb::flow::input_port<1>(node_to_test));
     make_edge(node_to_test, sink);
-    for(int iter = 0; iter < 2; ++iter) {
-        ResetGlobals(throwException,flog);
-        if(throwException) {
+    for (int iter = 0; iter < 2; ++iter) {
+        ResetGlobals(throwException, flog);
+        if (throwException) {
             TRY();
-                input0.activate();
-                input1.activate();
-                g.wait_for_all();
+            input0.activate();
+            input1.activate();
+            g.wait_for_all();
             CATCH_AND_ASSERT();
-        }
-        else {
+        } else {
             TRY();
-                input0.activate();
-                input1.activate();
-                g.wait_for_all();
+            input0.activate();
+            input1.activate();
+            g.wait_for_all();
             CATCH_AND_FAIL();
         }
-        bool okayNoExceptionsCaught = (g_ExceptionInMaster && !g_MasterExecutedThrow) || (!g_ExceptionInMaster && !g_NonMasterExecutedThrow) || !throwException;
+        bool okayNoExceptionsCaught = (g_ExceptionInMaster && !g_MasterExecutedThrow)
+                                      || (!g_ExceptionInMaster && !g_NonMasterExecutedThrow)
+                                      || !throwException;
         int ib0_cnt = tbb::flow::copy_body<InputBodyType0>(input0).count_value();
         int ib1_cnt = tbb::flow::copy_body<InputBodyType1>(input1).count_value();
         int nb_cnt = tbb::flow::copy_body<SinkBodyType>(sink).count_value();
-        if(throwException) {
-            CHECK_MESSAGE( (g.exception_thrown() || okayNoExceptionsCaught), "Exception not caught by graph");
-            CHECK_MESSAGE( (g.is_cancelled() || okayNoExceptionsCaught), "Cancellation not signalled in graph");
-            CHECK_MESSAGE( (ib0_cnt <= g_NumItems && ib1_cnt <= g_NumItems), "Too many items sent by inputs");
-            CHECK_MESSAGE( (nb_cnt <= ib0_cnt + ib1_cnt), "Too many items received by sink nodes");
-        }
-        else {
-            CHECK_MESSAGE( (!g.exception_thrown()), "Exception flag in flow::graph set but no throw occurred");
-            CHECK_MESSAGE( (!g.is_cancelled()), "canceled flag set but no throw occurred");
-            CHECK_MESSAGE( (ib0_cnt == g_NumItems), "Missing invocations of input_node0");
-            CHECK_MESSAGE( (ib1_cnt == g_NumItems), "Missing invocations of input_node1");
-            CHECK_MESSAGE( (nb_cnt == 2*g_NumItems), "Missing items in absorbers");
+        if (throwException) {
+            CHECK_MESSAGE((g.exception_thrown() || okayNoExceptionsCaught), "Exception not caught by graph");
+            CHECK_MESSAGE((g.is_cancelled() || okayNoExceptionsCaught),
+                          "Cancellation not signalled in graph");
+            CHECK_MESSAGE((ib0_cnt <= g_NumItems && ib1_cnt <= g_NumItems), "Too many items sent by inputs");
+            CHECK_MESSAGE((nb_cnt <= ib0_cnt + ib1_cnt), "Too many items received by sink nodes");
+        } else {
+            CHECK_MESSAGE((!g.exception_thrown()), "Exception flag in flow::graph set but no throw occurred");
+            CHECK_MESSAGE((!g.is_cancelled()), "canceled flag set but no throw occurred");
+            CHECK_MESSAGE((ib0_cnt == g_NumItems), "Missing invocations of input_node0");
+            CHECK_MESSAGE((ib1_cnt == g_NumItems), "Missing invocations of input_node1");
+            CHECK_MESSAGE((nb_cnt == 2 * g_NumItems), "Missing items in absorbers");
         }
-        if(iter == 0) {
+        if (iter == 0) {
             remove_edge(node_to_test, sink);
             tbb::flow::input_port<0>(node_to_test).try_put(ItemType0(g_NumItems + 4));
             tbb::flow::input_port<1>(node_to_test).try_put(ItemType1(g_NumItems + 2));
@@ -1855,16 +1832,17 @@ void run_one_indexer_node_test(bool throwException,bool flog) {
             input0_count = input1_count = sink_count = 0;
             make_edge(node_to_test, sink);
             g.wait_for_all();
-        }
-        else {
+        } else {
             g.wait_for_all();
             g.reset();
             input0_count = input1_count = sink_count = 0;
         }
-        CHECK_MESSAGE( (0 == tbb::flow::copy_body<InputBodyType0>(input0).count_value()),"Reset input failed");
-        CHECK_MESSAGE( (0 == tbb::flow::copy_body<InputBodyType1>(input1).count_value()),"Reset input failed");
+        CHECK_MESSAGE((0 == tbb::flow::copy_body<InputBodyType0>(input0).count_value()),
+                      "Reset input failed");
+        CHECK_MESSAGE((0 == tbb::flow::copy_body<InputBodyType1>(input1).count_value()),
+                      "Reset input failed");
         nb_cnt = tbb::flow::copy_body<SinkBodyType>(sink).count_value();
-        CHECK_MESSAGE( (0 == tbb::flow::copy_body<SinkBodyType>(sink).count_value()),"Reset sink failed");
+        CHECK_MESSAGE((0 == tbb::flow::copy_body<SinkBodyType>(sink).count_value()), "Reset sink failed");
     }
 
 #if USE_TASK_SCHEDULER_OBSERVER
@@ -1872,45 +1850,39 @@ void run_one_indexer_node_test(bool throwException,bool flog) {
 #endif
 }
 
-template<class InputTuple,
-    TestNodeTypeEnum InputThrowType,
-    TestNodeTypeEnum SinkThrowType>
+template <class InputTuple, TestNodeTypeEnum InputThrowType, TestNodeTypeEnum SinkThrowType>
 void run_indexer_node_test() {
-    typedef typename std::tuple_element<0,InputTuple>::type ItemType0;
-    typedef typename std::tuple_element<1,InputTuple>::type ItemType1;
-    typedef test_input_body<ItemType0,InputThrowType> InputBodyType0;
-    typedef test_input_body<ItemType1,InputThrowType> InputBodyType1;
+    typedef typename std::tuple_element<0, InputTuple>::type ItemType0;
+    typedef typename std::tuple_element<1, InputTuple>::type ItemType1;
+    typedef test_input_body<ItemType0, InputThrowType> InputBodyType0;
+    typedef test_input_body<ItemType1, InputThrowType> InputBodyType1;
     typedef typename tbb::flow::indexer_node<ItemType0, ItemType1> TestNodeType;
-    typedef absorber_body<typename TestNodeType::output_type,tbb::flow::continue_msg,SinkThrowType,unlimited_type> SinkBodyType;
+    typedef absorber_body<typename TestNodeType::output_type, tbb::flow::continue_msg, SinkThrowType,
+                          unlimited_type>
+            SinkBodyType;
 
     typedef typename tbb::flow::input_node<ItemType0> InputType0;
     typedef typename tbb::flow::input_node<ItemType1> InputType1;
-    typedef typename tbb::flow::function_node<typename TestNodeType::output_type,tbb::flow::continue_msg> SinkType;
+    typedef typename tbb::flow::function_node<typename TestNodeType::output_type, tbb::flow::continue_msg>
+            SinkType;
 
-    for(int i = 0; i < 4; ++i) {
-        if(2 == i) continue;
+    for (int i = 0; i < 4; ++i) {
+        if (2 == i) continue;
         bool throwException = (i & 0x1) != 0;
         bool doFlog = (i & 0x2) != 0;
-        run_one_indexer_node_test<
-             InputTuple,
-             InputType0,
-             InputBodyType0,
-             InputType1,
-             InputBodyType1,
-             TestNodeType,
-             SinkType,
-             SinkBodyType>(throwException,doFlog);
+        run_one_indexer_node_test<InputTuple, InputType0, InputBodyType0, InputType1, InputBodyType1,
+                                  TestNodeType, SinkType, SinkBodyType>(throwException, doFlog);
     }
 }
 
 void test_indexer_node() {
     INFO("Testing indexer_node\n");
     g_Wakeup_Msg = "indexer_node(is,non): Missed wakeup or machine is overloaded?";
-    run_indexer_node_test<std::tuple<int,int>, isThrowing, nonThrowing>();
+    run_indexer_node_test<std::tuple<int, int>, isThrowing, nonThrowing>();
     g_Wakeup_Msg = "indexer_node(non,is): Missed wakeup or machine is overloaded?";
-    run_indexer_node_test<std::tuple<int,int>, nonThrowing, isThrowing>();
+    run_indexer_node_test<std::tuple<int, int>, nonThrowing, isThrowing>();
     g_Wakeup_Msg = "indexer_node(is,is): Missed wakeup or machine is overloaded?";
-    run_indexer_node_test<std::tuple<int,int>, isThrowing,  isThrowing>();
+    run_indexer_node_test<std::tuple<int, int>, isThrowing, isThrowing>();
     g_Wakeup_Msg = g_Orig_Wakeup_Msg;
 }
 
@@ -1920,20 +1892,20 @@ void test_indexer_node() {
 class Foo {
 private:
     // std::vector<int>& m_vec;
-    std::vector<int>* m_vec;
+    std::vector<int> *m_vec;
+
 public:
-    Foo(std::vector<int>& vec) : m_vec(&vec) { }
-    void operator() (tbb::flow::continue_msg) const {
+    Foo(std::vector<int> &vec) : m_vec(&vec) {}
+    void operator()(tbb::flow::continue_msg) const {
         ++nExceptions;
-        (void)m_vec->at(m_vec->size()); // Will throw out_of_range exception
-        CHECK_MESSAGE( (false), "Exception not thrown by invalid access");
+        (void) m_vec->at(m_vec->size());// Will throw out_of_range exception
+        CHECK_MESSAGE((false), "Exception not thrown by invalid access");
     }
 };
 
 // test from user ahelwer: https://community.intel.com/t5/Intel-oneAPI-Threading-Building/Exception-in-flow-graph-results-in-graph-wait-for-all-hanging/td-p/789352
 // exception thrown in graph node, not caught in wait_for_all()
-void
-test_flow_graph_exception0() {
+void test_flow_graph_exception0() {
     // Initializes body
     std::vector<int> vec;
     vec.push_back(0);
@@ -1949,85 +1921,76 @@ test_flow_graph_exception0() {
     tbb::flow::make_edge(start, fooNode);
 
     // Execute graph
-    CHECK_MESSAGE( (!g.exception_thrown()), "exception_thrown flag already set");
-    CHECK_MESSAGE( (!g.is_cancelled()), "canceled flag already set");
+    CHECK_MESSAGE((!g.exception_thrown()), "exception_thrown flag already set");
+    CHECK_MESSAGE((!g.is_cancelled()), "canceled flag already set");
     try {
         start.try_put(tbb::flow::continue_msg());
         g.wait_for_all();
-        CHECK_MESSAGE( (false), "Exception not thrown");
-    }
-    catch(std::out_of_range& ex) {
-        INFO("Exception: " << ex.what() << "(expected)\n");
-    }
-    catch(...) {
+        CHECK_MESSAGE((false), "Exception not thrown");
+    } catch (std::out_of_range &ex) { INFO("Exception: " << ex.what() << "(expected)\n"); } catch (...) {
         INFO("Unknown exception caught (expected)\n");
     }
-    CHECK_MESSAGE( (nExceptions > 0), "Exception caught, but no body signaled exception being thrown");
+    CHECK_MESSAGE((nExceptions > 0), "Exception caught, but no body signaled exception being thrown");
     nExceptions = 0;
-    CHECK_MESSAGE( (g.exception_thrown()), "Exception not intercepted");
+    CHECK_MESSAGE((g.exception_thrown()), "Exception not intercepted");
     // if exception set, cancellation also set.
-    CHECK_MESSAGE( (g.is_cancelled()), "Exception cancellation not signaled");
+    CHECK_MESSAGE((g.is_cancelled()), "Exception cancellation not signaled");
     // in case we got an exception
     try {
-        g.wait_for_all();  // context still signalled canceled, my_exception still set.
-    }
-    catch(...) {
-        CHECK_MESSAGE( (false), "Second exception thrown but no task executing");
-    }
-    CHECK_MESSAGE( (nExceptions == 0), "body signaled exception being thrown, but no body executed");
-    CHECK_MESSAGE( (!g.exception_thrown()), "exception_thrown flag not reset");
-    CHECK_MESSAGE( (!g.is_cancelled()), "canceled flag not reset");
+        g.wait_for_all();// context still signalled canceled, my_exception still set.
+    } catch (...) { CHECK_MESSAGE((false), "Second exception thrown but no task executing"); }
+    CHECK_MESSAGE((nExceptions == 0), "body signaled exception being thrown, but no body executed");
+    CHECK_MESSAGE((!g.exception_thrown()), "exception_thrown flag not reset");
+    CHECK_MESSAGE((!g.is_cancelled()), "canceled flag not reset");
 }
 
 void TestOneThreadNum(int nThread) {
     INFO("Testing " << nThread << "%d threads\n");
-    g_NumItems = ((nThread > NUM_ITEMS) ? nThread *2 : NUM_ITEMS);
+    g_NumItems = ((nThread > NUM_ITEMS) ? nThread * 2 : NUM_ITEMS);
     g_NumThreads = nThread;
     tbb::task_arena arena(nThread);
-	arena.execute(
-        [&]() {
-            // whole-graph exception catch and rethrow test
-            test_flow_graph_exception0();
-            for(int i = 0; i < 4; ++i) {
-                g_ExceptionInMaster = (i & 1) != 0;
-                g_SolitaryException = (i & 2) != 0;
-                INFO("g_ExceptionInMaster == " << (g_ExceptionInMaster ? "T":"F")
-                     << ", g_SolitaryException == " << (g_SolitaryException ? "T":"F") << "\n");
-                test_input_node();
-                test_function_node();
-                test_continue_node();  // also test broadcast_node
-                test_multifunction_node();
-                // single- and multi-item buffering nodes
-                test_buffer_queue_and_overwrite_node();
-                test_sequencer_node();
-                test_priority_queue_node();
-
-                // join_nodes
-                test_join_node<tbb::flow::queueing>();
-                test_join_node<tbb::flow::reserving>();
-                test_join_node<tbb::flow::tag_matching>();
-
-                test_limiter_node();
-                test_split_node();
-                // graph for write_once_node will be complicated by the fact the node will
-                // not do try_puts after it has been set.  To get parallelism of N we have
-                // to attach N successor nodes to the write_once (or play some similar game).
-                // test_write_once_node();
-                test_indexer_node();
-            }
+    arena.execute([&]() {
+        // whole-graph exception catch and rethrow test
+        test_flow_graph_exception0();
+        for (int i = 0; i < 4; ++i) {
+            g_ExceptionInMaster = (i & 1) != 0;
+            g_SolitaryException = (i & 2) != 0;
+            INFO("g_ExceptionInMaster == " << (g_ExceptionInMaster ? "T" : "F") << ", g_SolitaryException == "
+                                           << (g_SolitaryException ? "T" : "F") << "\n");
+            test_input_node();
+            test_function_node();
+            test_continue_node();// also test broadcast_node
+            test_multifunction_node();
+            // single- and multi-item buffering nodes
+            test_buffer_queue_and_overwrite_node();
+            test_sequencer_node();
+            test_priority_queue_node();
+
+            // join_nodes
+            test_join_node<tbb::flow::queueing>();
+            test_join_node<tbb::flow::reserving>();
+            test_join_node<tbb::flow::tag_matching>();
+
+            test_limiter_node();
+            test_split_node();
+            // graph for write_once_node will be complicated by the fact the node will
+            // not do try_puts after it has been set.  To get parallelism of N we have
+            // to attach N successor nodes to the write_once (or play some similar game).
+            // test_write_once_node();
+            test_indexer_node();
         }
-    );
+    });
 }
 
 #if !EMSCRIPTEN
 //! Test exceptions with parallelism
 //! \brief \ref error_guessing
-TEST_CASE("Testing several threads"){
+TEST_CASE("Testing several threads") {
     // reverse order of tests
-    for(unsigned int nThread=utils::MaxThread; nThread >= utils::MinThread; --nThread) {
+    for (unsigned int nThread = utils::MaxThread; nThread >= utils::MinThread; --nThread) {
         tbb::global_control thread_limit(tbb::global_control::max_allowed_parallelism, nThread);
         TestOneThreadNum(nThread);
     }
 }
 #endif
-#endif // TBB_USE_EXCEPTIONS
+#endif// TBB_USE_EXCEPTIONS
diff --git a/external/tbb/test/tbb/test_eh_thread.cpp b/external/tbb/test/tbb/test_eh_thread.cpp
index dde61b91..cced9144 100644
--- a/external/tbb/test/tbb/test_eh_thread.cpp
+++ b/external/tbb/test/tbb/test_eh_thread.cpp
@@ -16,8 +16,8 @@
 
 #include "common/config.h"
 
-#include "tbb/parallel_for.h"
 #include "tbb/global_control.h"
+#include "tbb/parallel_for.h"
 
 #include "common/test.h"
 #include "common/utils.h"
@@ -37,18 +37,17 @@
 #if TBB_USE_EXCEPTIONS && !_WIN32 && !__ANDROID__
 
 #include <limits.h>
-#include <sys/types.h>
-#include <sys/time.h>
 #include <sys/resource.h>
+#include <sys/time.h>
+#include <sys/types.h>
 
-void limitThreads(size_t limit)
-{
+void limitThreads(size_t limit) {
     rlimit rlim;
 
     int ret = getrlimit(RLIMIT_NPROC, &rlim);
     CHECK_MESSAGE(0 == ret, "getrlimit has returned an error");
 
-    rlim.rlim_cur = (rlim.rlim_max == (rlim_t)RLIM_INFINITY) ? limit : utils::min(limit, rlim.rlim_max);
+    rlim.rlim_cur = (rlim.rlim_max == (rlim_t) RLIM_INFINITY) ? limit : utils::min(limit, rlim.rlim_max);
 
     ret = setrlimit(RLIMIT_NPROC, &rlim);
     CHECK_MESSAGE(0 == ret, "setrlimit has returned an error");
@@ -62,28 +61,24 @@ size_t getThreadLimit() {
     return rlim.rlim_cur;
 }
 
-static void* thread_routine(void*)
-{
-    return nullptr;
-}
+static void* thread_routine(void*) { return nullptr; }
 
 class Thread {
-    pthread_t mHandle{};
-    bool mValid{};
+    pthread_t mHandle {};
+    bool mValid {};
+
 public:
     Thread() {
         mValid = false;
         pthread_attr_t attr;
         // Limit the stack size not to consume all virtual memory on 32 bit platforms.
-        std::size_t stacksize = utils::max(std::size_t(128*1024), std::size_t(PTHREAD_STACK_MIN));
+        std::size_t stacksize = utils::max(std::size_t(128 * 1024), std::size_t(PTHREAD_STACK_MIN));
         if (pthread_attr_init(&attr) == 0 && pthread_attr_setstacksize(&attr, stacksize) == 0) {
             mValid = pthread_create(&mHandle, &attr, thread_routine, /* arg = */ nullptr) == 0;
         }
     }
     bool isValid() const { return mValid; }
-    void join() {
-        pthread_join(mHandle, nullptr);
-    }
+    void join() { pthread_join(mHandle, nullptr); }
 };
 
 //! Test for exception when too many threads
@@ -109,17 +104,13 @@ TEST_CASE("Too many threads") {
         try {
             // Initialize the library to create worker threads
             tbb::parallel_for(0, 2, [](int) {});
-        } catch (const std::exception & e) {
+        } catch (const std::exception& e) {
             g_exception_caught = true;
             // Do not CHECK to avoid memory allocation (we can be out of memory)
-            if (e.what()== nullptr) {
-                FAIL("Exception does not have description");
-            }
+            if (e.what() == nullptr) { FAIL("Exception does not have description"); }
         }
         // Do not CHECK to avoid memory allocation (we can be out of memory)
-        if (!g_exception_caught) {
-            FAIL("No exception was thrown on library initialization");
-        }
+        if (!g_exception_caught) { FAIL("No exception was thrown on library initialization"); }
     } else {
         WARN_MESSAGE(false, "setrlimit seems having no effect");
     }
diff --git a/external/tbb/test/tbb/test_enumerable_thread_specific.cpp b/external/tbb/test/tbb/test_enumerable_thread_specific.cpp
index 904c7d5a..6e831f42 100644
--- a/external/tbb/test/tbb/test_enumerable_thread_specific.cpp
+++ b/external/tbb/test/tbb/test_enumerable_thread_specific.cpp
@@ -14,28 +14,28 @@
     limitations under the License.
 */
 
+#include "common/checktype.h"
 #include "common/test.h"
 #include "common/utils.h"
 #include "common/utils_report.h"
-#include "common/checktype.h"
 
 #include "oneapi/tbb/detail/_utils.h"
 
+#include "tbb/blocked_range.h"
+#include "tbb/cache_aligned_allocator.h"
 #include "tbb/enumerable_thread_specific.h"
+#include "tbb/global_control.h"
 #include "tbb/parallel_for.h"
-#include "tbb/blocked_range.h"
 #include "tbb/tbb_allocator.h"
-#include "tbb/global_control.h"
-#include "tbb/cache_aligned_allocator.h"
 
-#include <cstring>
+#include <atomic>
 #include <cstdio>
-#include <vector>
+#include <cstring>
 #include <deque>
 #include <list>
 #include <map>
 #include <utility>
-#include <atomic>
+#include <vector>
 
 //! \file test_enumerable_thread_specific.cpp
 //! \brief Test for [tls.enumerable_thread_specific] specification
@@ -53,36 +53,53 @@ const int VALID_NUMBER_OF_KEYS = 100;
 
 //! A minimal class that occupies N bytes.
 /** Defines default and copy constructor, and allows implicit operator&. Hides operator=. */
-template<size_t N = tbb::detail::max_nfs_size>
-class minimalN: utils::NoAssign {
+template <size_t N = tbb::detail::max_nfs_size>
+class minimalN : utils::NoAssign {
 private:
     int my_value;
     bool is_constructed;
-    char pad[N-sizeof(int) - sizeof(bool)];
+    char pad[N - sizeof(int) - sizeof(bool)];
+
 public:
-    minimalN() : utils::NoAssign(), my_value(0) { ++construction_counter; is_constructed = true; }
-    minimalN( const minimalN&m ) : utils::NoAssign(), my_value(m.my_value) { ++construction_counter; is_constructed = true; }
-    ~minimalN() { ++destruction_counter; REQUIRE(is_constructed); is_constructed = false; }
-    void set_value( const int i ) { REQUIRE(is_constructed); my_value = i; }
-    int value( ) const { REQUIRE(is_constructed); return my_value; }
+    minimalN() : utils::NoAssign(), my_value(0) {
+        ++construction_counter;
+        is_constructed = true;
+    }
+    minimalN(const minimalN& m) : utils::NoAssign(), my_value(m.my_value) {
+        ++construction_counter;
+        is_constructed = true;
+    }
+    ~minimalN() {
+        ++destruction_counter;
+        REQUIRE(is_constructed);
+        is_constructed = false;
+    }
+    void set_value(const int i) {
+        REQUIRE(is_constructed);
+        my_value = i;
+    }
+    int value() const {
+        REQUIRE(is_constructed);
+        return my_value;
+    }
 };
 
-static size_t AlignMask = 0;  // set to cache-line-size - 1
+static size_t AlignMask = 0;// set to cache-line-size - 1
 
-template<typename T>
-T& check_alignment(T& t, const char *aname) {
-    if( !tbb::detail::is_aligned(&t, AlignMask)) {
+template <typename T>
+T& check_alignment(T& t, const char* aname) {
+    if (!tbb::detail::is_aligned(&t, AlignMask)) {
         // TBB_REVAMP_TODO: previously was REPORT_ONCE
-        REPORT("alignment error with %s allocator (%x)\n", aname, (int)size_t(&t) & (AlignMask-1));
+        REPORT("alignment error with %s allocator (%x)\n", aname, (int) size_t(&t) & (AlignMask - 1));
     }
     return t;
 }
 
-template<typename T>
-const T& check_alignment(const T& t, const char *aname) {
-    if( !tbb::detail::is_aligned(&t, AlignMask)) {
+template <typename T>
+const T& check_alignment(const T& t, const char* aname) {
+    if (!tbb::detail::is_aligned(&t, AlignMask)) {
         // TBB_REVAMP_TODO: previously was REPORT_ONCE
-        REPORT("alignment error with %s allocator (%x)\n", aname, (int)size_t(&t) & (AlignMask-1));
+        REPORT("alignment error with %s allocator (%x)\n", aname, (int) size_t(&t) & (AlignMask - 1));
     }
     return t;
 }
@@ -94,36 +111,29 @@ const T& check_alignment(const T& t, const char *aname) {
 
 const size_t line_size = tbb::detail::max_nfs_size;
 
-typedef tbb::enumerable_thread_specific<minimalN<line_size> > flogged_ets;
+typedef tbb::enumerable_thread_specific<minimalN<line_size>> flogged_ets;
 
 class set_body {
-    flogged_ets *a;
+    flogged_ets* a;
 
 public:
-    set_body( flogged_ets*_a ) : a(_a) { }
+    set_body(flogged_ets* _a) : a(_a) {}
 
-    void operator() ( ) const {
+    void operator()() const {
         for (int i = 0; i < VALID_NUMBER_OF_KEYS; ++i) {
             check_alignment(a[i].local(), "default").set_value(i + 1);
         }
     }
-
 };
 
-void do_std_threads( int max_threads, flogged_ets a[] ) {
-    std::vector< std::thread * > threads;
+void do_std_threads(int max_threads, flogged_ets a[]) {
+    std::vector<std::thread*> threads;
 
-    for (int p = 0; p < max_threads; ++p) {
-        threads.push_back( new std::thread ( set_body( a ) ) );
-    }
+    for (int p = 0; p < max_threads; ++p) { threads.push_back(new std::thread(set_body(a))); }
 
-    for (int p = 0; p < max_threads; ++p) {
-        threads[p]->join();
-    }
+    for (int p = 0; p < max_threads; ++p) { threads[p]->join(); }
 
-    for(int p = 0; p < max_threads; ++p) {
-        delete threads[p];
-    }
+    for (int p = 0; p < max_threads; ++p) { delete threads[p]; }
 }
 
 void flog_key_creation_and_deletion() {
@@ -135,22 +145,22 @@ void flog_key_creation_and_deletion() {
             destruction_counter = 0;
             // causes VALID_NUMBER_OF_KEYS exemplar instances to be constructed
             flogged_ets* a = new flogged_ets[VALID_NUMBER_OF_KEYS];
-            REQUIRE(int(construction_counter) == 0);   // no exemplars or actual locals have been constructed
-            REQUIRE(int(destruction_counter) == 0);    // and none have been destroyed
+            REQUIRE(int(construction_counter) == 0);// no exemplars or actual locals have been constructed
+            REQUIRE(int(destruction_counter) == 0); // and none have been destroyed
             // causes p * VALID_NUMBER_OF_KEYS minimals to be created
             do_std_threads(p, a);
             for (int i = 0; i < VALID_NUMBER_OF_KEYS; ++i) {
                 int pcnt = 0;
-                for ( flogged_ets::iterator tli = a[i].begin(); tli != a[i].end(); ++tli ) {
-                    REQUIRE( (*tli).value() == i+1 );
+                for (flogged_ets::iterator tli = a[i].begin(); tli != a[i].end(); ++tli) {
+                    REQUIRE((*tli).value() == i + 1);
                     ++pcnt;
                 }
-                REQUIRE( pcnt == p);  // should be one local per thread.
+                REQUIRE(pcnt == p);// should be one local per thread.
             }
             delete[] a;
         }
-        REQUIRE( int(construction_counter) == (p)*VALID_NUMBER_OF_KEYS );
-        REQUIRE( int(destruction_counter) == (p)*VALID_NUMBER_OF_KEYS );
+        REQUIRE(int(construction_counter) == (p) *VALID_NUMBER_OF_KEYS);
+        REQUIRE(int(destruction_counter) == (p) *VALID_NUMBER_OF_KEYS);
 
         construction_counter = 0;
         destruction_counter = 0;
@@ -163,18 +173,17 @@ void flog_key_creation_and_deletion() {
             do_std_threads(p, a);
 
             for (int i = 0; i < VALID_NUMBER_OF_KEYS; ++i) {
-                for ( flogged_ets::iterator tli = a[i].begin(); tli != a[i].end(); ++tli ) {
-                    REQUIRE( (*tli).value() == i+1 );
+                for (flogged_ets::iterator tli = a[i].begin(); tli != a[i].end(); ++tli) {
+                    REQUIRE((*tli).value() == i + 1);
                 }
                 a[i].clear();
-                REQUIRE( static_cast<int>(a[i].end() - a[i].begin()) == 0 );
+                REQUIRE(static_cast<int>(a[i].end() - a[i].begin()) == 0);
             }
         }
         delete[] a;
-        REQUIRE( int(construction_counter) == (FLOG_REPETITIONS*p)*VALID_NUMBER_OF_KEYS );
-        REQUIRE( int(destruction_counter) == (FLOG_REPETITIONS*p)*VALID_NUMBER_OF_KEYS );
+        REQUIRE(int(construction_counter) == (FLOG_REPETITIONS * p) * VALID_NUMBER_OF_KEYS);
+        REQUIRE(int(destruction_counter) == (FLOG_REPETITIONS * p) * VALID_NUMBER_OF_KEYS);
     }
-
 }
 
 template <typename inner_container>
@@ -182,170 +191,148 @@ void flog_segmented_interator() {
 
     bool found_error = false;
     typedef typename inner_container::value_type T;
-    typedef std::vector< inner_container > nested_vec;
+    typedef std::vector<inner_container> nested_vec;
     inner_container my_inner_container;
     my_inner_container.clear();
     nested_vec my_vec;
 
     // simple nested vector (neither level empty)
     const int maxval = 10;
-    for(int i=0; i < maxval; i++) {
+    for (int i = 0; i < maxval; i++) {
         my_vec.push_back(my_inner_container);
-        for(int j = 0; j < maxval; j++) {
-            my_vec.at(i).push_back((T)(maxval * i + j));
-        }
+        for (int j = 0; j < maxval; j++) { my_vec.at(i).push_back((T)(maxval * i + j)); }
     }
 
     tbb::detail::d1::segmented_iterator<nested_vec, T> my_si(my_vec);
 
     T ii;
-    for(my_si=my_vec.begin(), ii=0; my_si != my_vec.end(); ++my_si, ++ii) {
-        if((*my_si) != ii) {
-            found_error = true;
-        }
+    for (my_si = my_vec.begin(), ii = 0; my_si != my_vec.end(); ++my_si, ++ii) {
+        if ((*my_si) != ii) { found_error = true; }
     }
 
     // outer level empty
     my_vec.clear();
-    for(my_si=my_vec.begin(); my_si != my_vec.end(); ++my_si) {
-        found_error = true;
-    }
+    for (my_si = my_vec.begin(); my_si != my_vec.end(); ++my_si) { found_error = true; }
 
     // inner levels empty
     my_vec.clear();
-    for(int i =0; i < maxval; ++i) {
-        my_vec.push_back(my_inner_container);
-    }
-    for(my_si = my_vec.begin(); my_si != my_vec.end(); ++my_si) {
-        found_error = true;
-    }
+    for (int i = 0; i < maxval; ++i) { my_vec.push_back(my_inner_container); }
+    for (my_si = my_vec.begin(); my_si != my_vec.end(); ++my_si) { found_error = true; }
 
     // every other inner container is empty
     my_vec.clear();
-    for(int i=0; i < maxval; ++i) {
+    for (int i = 0; i < maxval; ++i) {
         my_vec.push_back(my_inner_container);
-        if(i%2) {
-            for(int j = 0; j < maxval; ++j) {
-                my_vec.at(i).push_back((T)(maxval * (i/2) + j));
-            }
+        if (i % 2) {
+            for (int j = 0; j < maxval; ++j) { my_vec.at(i).push_back((T)(maxval * (i / 2) + j)); }
         }
     }
-    for(my_si = my_vec.begin(), ii=0; my_si != my_vec.end(); ++my_si, ++ii) {
-        if((*my_si) != ii) {
-            found_error = true;
-        }
+    for (my_si = my_vec.begin(), ii = 0; my_si != my_vec.end(); ++my_si, ++ii) {
+        if ((*my_si) != ii) { found_error = true; }
     }
 
     tbb::detail::d1::segmented_iterator<nested_vec, const T> my_csi(my_vec);
-    for(my_csi=my_vec.begin(), ii=0; my_csi != my_vec.end(); ++my_csi, ++ii) {
-        if((*my_csi) != ii) {
-            found_error = true;
-        }
+    for (my_csi = my_vec.begin(), ii = 0; my_csi != my_vec.end(); ++my_csi, ++ii) {
+        if ((*my_csi) != ii) { found_error = true; }
     }
 
     // outer level empty
     my_vec.clear();
-    for(my_csi=my_vec.begin(); my_csi != my_vec.end(); ++my_csi) {
-        found_error = true;
-    }
+    for (my_csi = my_vec.begin(); my_csi != my_vec.end(); ++my_csi) { found_error = true; }
 
     // inner levels empty
     my_vec.clear();
-    for(int i =0; i < maxval; ++i) {
-        my_vec.push_back(my_inner_container);
-    }
-    for(my_csi = my_vec.begin(); my_csi != my_vec.end(); ++my_csi) {
-        found_error = true;
-    }
+    for (int i = 0; i < maxval; ++i) { my_vec.push_back(my_inner_container); }
+    for (my_csi = my_vec.begin(); my_csi != my_vec.end(); ++my_csi) { found_error = true; }
 
     // every other inner container is empty
     my_vec.clear();
-    for(int i=0; i < maxval; ++i) {
+    for (int i = 0; i < maxval; ++i) {
         my_vec.push_back(my_inner_container);
-        if(i%2) {
-            for(int j = 0; j < maxval; ++j) {
-                my_vec.at(i).push_back((T)(maxval * (i/2) + j));
-            }
+        if (i % 2) {
+            for (int j = 0; j < maxval; ++j) { my_vec.at(i).push_back((T)(maxval * (i / 2) + j)); }
         }
     }
-    for(my_csi = my_vec.begin(), ii=0; my_csi != my_vec.end(); ++my_csi, ++ii) {
-        if((*my_csi) != ii) {
-            found_error = true;
-        }
+    for (my_csi = my_vec.begin(), ii = 0; my_csi != my_vec.end(); ++my_csi, ++ii) {
+        if ((*my_csi) != ii) { found_error = true; }
     }
 
-
-    if(found_error) REPORT("segmented_iterator failed\n");
+    if (found_error) REPORT("segmented_iterator failed\n");
 }
 
 template <typename Key, typename Val>
 void flog_segmented_iterator_map() {
-   typedef typename std::map<Key, Val> my_map;
-   typedef std::vector< my_map > nested_vec;
-   my_map my_inner_container;
-   my_inner_container.clear();
-   nested_vec my_vec;
-   my_vec.clear();
-   bool found_error = false;
-
-   // simple nested vector (neither level empty)
-   const int maxval = 4;
-   for(int i=0; i < maxval; i++) {
-       my_vec.push_back(my_inner_container);
-       for(int j = 0; j < maxval; j++) {
-           my_vec.at(i).insert(std::make_pair<Key,Val>(maxval * i + j, 2*(maxval*i + j)));
-       }
-   }
-
-   tbb::detail::d1::segmented_iterator<nested_vec, std::pair<const Key, Val> > my_si(my_vec);
-   Key ii;
-   for(my_si=my_vec.begin(), ii=0; my_si != my_vec.end(); ++my_si, ++ii) {
-       if(((*my_si).first != ii) || ((*my_si).second != 2*ii)) {
-           found_error = true;
-       }
-   }
-
-   tbb::detail::d1::segmented_iterator<nested_vec, const std::pair<const Key, Val> > my_csi(my_vec);
-   for(my_csi=my_vec.begin(), ii=0; my_csi != my_vec.end(); ++my_csi, ++ii) {
-       if(((*my_csi).first != ii) || ((*my_csi).second != 2*ii)) {
-           found_error = true;
-           // INFO( "ii=%d, (*my_csi).first=%d, second=%d\n",ii, int((*my_csi).first), int((*my_csi).second));
-       }
-   }
-   if(found_error) REPORT("segmented_iterator_map failed\n");
+    typedef typename std::map<Key, Val> my_map;
+    typedef std::vector<my_map> nested_vec;
+    my_map my_inner_container;
+    my_inner_container.clear();
+    nested_vec my_vec;
+    my_vec.clear();
+    bool found_error = false;
+
+    // simple nested vector (neither level empty)
+    const int maxval = 4;
+    for (int i = 0; i < maxval; i++) {
+        my_vec.push_back(my_inner_container);
+        for (int j = 0; j < maxval; j++) {
+            my_vec.at(i).insert(std::make_pair<Key, Val>(maxval * i + j, 2 * (maxval * i + j)));
+        }
+    }
+
+    tbb::detail::d1::segmented_iterator<nested_vec, std::pair<const Key, Val>> my_si(my_vec);
+    Key ii;
+    for (my_si = my_vec.begin(), ii = 0; my_si != my_vec.end(); ++my_si, ++ii) {
+        if (((*my_si).first != ii) || ((*my_si).second != 2 * ii)) { found_error = true; }
+    }
+
+    tbb::detail::d1::segmented_iterator<nested_vec, const std::pair<const Key, Val>> my_csi(my_vec);
+    for (my_csi = my_vec.begin(), ii = 0; my_csi != my_vec.end(); ++my_csi, ++ii) {
+        if (((*my_csi).first != ii) || ((*my_csi).second != 2 * ii)) {
+            found_error = true;
+            // INFO( "ii=%d, (*my_csi).first=%d, second=%d\n",ii, int((*my_csi).first), int((*my_csi).second));
+        }
+    }
+    if (found_error) REPORT("segmented_iterator_map failed\n");
 }
 
 void run_segmented_iterator_tests() {
-   // only the following containers can be used with the segmented iterator.
-   flog_segmented_interator<std::vector< int > >();
-   flog_segmented_interator<std::vector< double > >();
-   flog_segmented_interator<std::deque< int > >();
-   flog_segmented_interator<std::deque< double > >();
-   flog_segmented_interator<std::list< int > >();
-   flog_segmented_interator<std::list< double > >();
-
-   flog_segmented_iterator_map<int, int>();
-   flog_segmented_iterator_map<int, double>();
+    // only the following containers can be used with the segmented iterator.
+    flog_segmented_interator<std::vector<int>>();
+    flog_segmented_interator<std::vector<double>>();
+    flog_segmented_interator<std::deque<int>>();
+    flog_segmented_interator<std::deque<double>>();
+    flog_segmented_interator<std::list<int>>();
+    flog_segmented_interator<std::list<double>>();
+
+    flog_segmented_iterator_map<int, int>();
+    flog_segmented_iterator_map<int, double>();
 }
 
-int align_val(void * const p) {
-    size_t tmp = (size_t)p;
+int align_val(void* const p) {
+    size_t tmp = (size_t) p;
     int a = 1;
-    while((tmp&0x1) == 0) { a <<=1; tmp >>= 1; }
+    while ((tmp & 0x1) == 0) {
+        a <<= 1;
+        tmp >>= 1;
+    }
     return a;
 }
 
-bool is_between(void* lowp, void *highp, void *testp) {
-    if((size_t)lowp < (size_t)testp && (size_t)testp < (size_t)highp) return true;
-    return (size_t)lowp > (size_t)testp && (size_t)testp > (size_t)highp;
+bool is_between(void* lowp, void* highp, void* testp) {
+    if ((size_t) lowp < (size_t) testp && (size_t) testp < (size_t) highp) return true;
+    return (size_t) lowp > (size_t) testp && (size_t) testp > (size_t) highp;
 }
 
-template<class U> struct alignment_of {
-    typedef struct { char t; U    padded; } test_alignment;
+template <class U>
+struct alignment_of {
+    typedef struct {
+        char t;
+        U padded;
+    } test_alignment;
     static const size_t value = sizeof(test_alignment) - sizeof(U);
 };
 using tbb::detail::d1::ets_element;
-template<typename T, typename OtherType>
+template <typename T, typename OtherType>
 void allocate_ets_element_on_stack(const char* /* name */) {
     typedef T aligning_element_type;
     const size_t my_align = alignment_of<aligning_element_type>::value;
@@ -357,21 +344,25 @@ void allocate_ets_element_on_stack(const char* /* name */) {
         OtherType cxx;
         ets_element<aligning_element_type> my_struct_element;
     } mystruct1;
-    tbb::detail::suppress_unused_warning(c1,c2);
-    REQUIRE_MESSAGE(tbb::detail::is_aligned(my_stack_element.value(), my_align), "Error in first stack alignment" );
-    REQUIRE_MESSAGE(tbb::detail::is_aligned(my_stack_element2.value(), my_align), "Error in second stack alignment" );
-    REQUIRE_MESSAGE(tbb::detail::is_aligned(mystruct1.my_struct_element.value(), my_align), "Error in struct element alignment" );
+    tbb::detail::suppress_unused_warning(c1, c2);
+    REQUIRE_MESSAGE(tbb::detail::is_aligned(my_stack_element.value(), my_align),
+                    "Error in first stack alignment");
+    REQUIRE_MESSAGE(tbb::detail::is_aligned(my_stack_element2.value(), my_align),
+                    "Error in second stack alignment");
+    REQUIRE_MESSAGE(tbb::detail::is_aligned(mystruct1.my_struct_element.value(), my_align),
+                    "Error in struct element alignment");
 }
 
 class BigType {
 public:
-    BigType() { /* avoid cl warning C4345 about default initialization of POD types */ }
+    BigType() { /* avoid cl warning C4345 about default initialization of POD types */
+    }
     char my_data[12 * 1024 * 1024];
 };
 
-template<template<class> class Allocator>
+template <template <class> class Allocator>
 void TestConstructorWithBigType(const char* allocator_name) {
-    typedef tbb::enumerable_thread_specific<BigType, Allocator<BigType> > CounterBigType;
+    typedef tbb::enumerable_thread_specific<BigType, Allocator<BigType>> CounterBigType;
     // Test default constructor
     CounterBigType MyCounters;
     // Create a local instance.
@@ -379,19 +370,18 @@ void TestConstructorWithBigType(const char* allocator_name) {
     my_local.my_data[0] = 'a';
     // Test copy constructor
     CounterBigType MyCounters2(MyCounters);
-    REQUIRE(check_alignment(MyCounters2.local(), allocator_name).my_data[0]=='a');
+    REQUIRE(check_alignment(MyCounters2.local(), allocator_name).my_data[0] == 'a');
 }
 
 size_t init_tbb_alloc_mask() {
     // TODO: use __TBB_alignof(T) to check for local() results instead of using internal knowledges of ets element padding
-    if(tbb::tbb_allocator<int>::allocator_type() == tbb::tbb_allocator<int>::standard) {
+    if (tbb::tbb_allocator<int>::allocator_type() == tbb::tbb_allocator<int>::standard) {
         // scalable allocator is not available.
         // INFO("tbb::tbb_allocator is not available\n");
         return 1;
-    }
-    else {
+    } else {
         // this value is for large objects, but will be correct for small.
-        return 64; // TBB_REVAMP_TODO: enable as estimatedCacheLineSize when tbbmalloc is available;
+        return 64;// TBB_REVAMP_TODO: enable as estimatedCacheLineSize when tbbmalloc is available;
     }
 }
 
@@ -425,11 +415,10 @@ TEST_CASE("Constructor with big type") {
 //! \brief \ref error_guessing
 TEST_CASE("Allocate ETS on stack") {
     AlignMask = tbb_allocator_mask;
-    allocate_ets_element_on_stack<int,char>("int vs. char");
-    allocate_ets_element_on_stack<int,short>("int vs. short");
-    allocate_ets_element_on_stack<int,char[3]>("int vs. char[3]");
-    allocate_ets_element_on_stack<float,char>("float vs. char");
-    allocate_ets_element_on_stack<float,short>("float vs. short");
-    allocate_ets_element_on_stack<float,char[3]>("float vs. char[3]");
+    allocate_ets_element_on_stack<int, char>("int vs. char");
+    allocate_ets_element_on_stack<int, short>("int vs. short");
+    allocate_ets_element_on_stack<int, char[3]>("int vs. char[3]");
+    allocate_ets_element_on_stack<float, char>("float vs. char");
+    allocate_ets_element_on_stack<float, short>("float vs. short");
+    allocate_ets_element_on_stack<float, char[3]>("float vs. char[3]");
 }
-
diff --git a/external/tbb/test/tbb/test_environment_whitebox.cpp b/external/tbb/test/tbb/test_environment_whitebox.cpp
index 9092135d..00e97178 100644
--- a/external/tbb/test/tbb/test_environment_whitebox.cpp
+++ b/external/tbb/test/tbb/test_environment_whitebox.cpp
@@ -26,10 +26,10 @@
 #include "common/utils_env.h"
 #include "src/tbb/environment.h"
 
-#include <string>
 #include <algorithm>
-#include <sstream>
 #include <climits>
+#include <sstream>
+#include <string>
 #include <utility>
 #include <vector>
 
@@ -47,9 +47,8 @@ const std::size_t large_length = 1000000;
 #endif
 
 template <typename T>
-void set_and_get_test_variable( T (*environment_variable_getter)( const char* ),
-                                std::pair<std::string, T> test_case )
-{
+void set_and_get_test_variable(T (*environment_variable_getter)(const char*),
+                               std::pair<std::string, T> test_case) {
     utils::SetEnv(environment_variable_name, test_case.first.c_str());
     T result = environment_variable_getter(environment_variable_name);
     REQUIRE_MESSAGE(result == test_case.second, "Wrong Get<Type>EnvironmentVariable return value");
@@ -60,11 +59,11 @@ utils::FastRandom<> rnd(12345);
 
 struct RandomCharacterGenerator {
     char operator()() {
-        return rnd.get() % 128; // 127 - the last ASCII symbol
+        return rnd.get() % 128;// 127 - the last ASCII symbol
     }
-}; // struct RandomCharacterGenerator
+};// struct RandomCharacterGenerator
 
-bool alternative_env_variable_checker( const char* str, bool ) {
+bool alternative_env_variable_checker(const char* str, bool) {
     bool result = false;
     for (unsigned i = 0; str[i]; ++i) {
         if (str[i] == '1') {
@@ -81,28 +80,25 @@ bool alternative_env_variable_checker( const char* str, bool ) {
 
 // Suitable alternative checker for GetLongEnvVariable() was not found
 // So here we use the code from GetLongEnvVariable() realization
-long alternative_env_variable_checker( const char* str, long ) {
+long alternative_env_variable_checker(const char* str, long) {
     char* end;
     errno = 0;
     long result = std::strtol(str, &end, 10);
 
     // We have exceeded the range, value is negative or it is the end of the string
-    if (errno == ERANGE || result < 0 || end == str) {
-        result = -1;
-    }
+    if (errno == ERANGE || result < 0 || end == str) { result = -1; }
 
     for (; *end != '\0'; ++end) {
-        if (!std::isspace(*end))
-            result = -1;
+        if (!std::isspace(*end)) result = -1;
     }
     return result;
 }
 
 template <typename T>
-std::pair<std::string, T> create_random_case( std::size_t length ) {
+std::pair<std::string, T> create_random_case(std::size_t length) {
     REQUIRE_MESSAGE(length != 0, "Requested random string cannot be empty");
     std::string rand_string(length, ' ');
-    std::generate(rand_string.begin(), rand_string.end(), RandomCharacterGenerator{});
+    std::generate(rand_string.begin(), rand_string.end(), RandomCharacterGenerator {});
 
     T expected_result = alternative_env_variable_checker(rand_string.c_str(), T());
 
@@ -110,19 +106,17 @@ std::pair<std::string, T> create_random_case( std::size_t length ) {
 }
 
 template <typename T>
-void prepare_random_cases( std::vector<std::pair<std::string, T>>& cases ) {
+void prepare_random_cases(std::vector<std::pair<std::string, T>>& cases) {
     // Random cases
     std::size_t length = 10000;
 
-    for (std::size_t i = 0; i < 10; ++i) {
-        cases.push_back(create_random_case<T>((rnd.get() % length) + 1));
-    }
+    for (std::size_t i = 0; i < 10; ++i) { cases.push_back(create_random_case<T>((rnd.get() % length) + 1)); }
 
     // Random case with large string
     cases.push_back(create_random_case<T>(large_length));
 }
 
-std::vector<std::pair<std::string, bool>> initialize_cases( bool wrong_result ) {
+std::vector<std::pair<std::string, bool>> initialize_cases(bool wrong_result) {
     std::vector<std::pair<std::string, bool>> cases;
     // Valid cases
     cases.push_back(std::make_pair("1", true));
@@ -156,7 +150,7 @@ std::vector<std::pair<std::string, bool>> initialize_cases( bool wrong_result )
     return cases;
 }
 
-std::vector<std::pair<std::string, long>> initialize_cases( long wrong_result ) {
+std::vector<std::pair<std::string, long>> initialize_cases(long wrong_result) {
     std::vector<std::pair<std::string, long>> cases;
     std::stringstream ss;
     // Valid cases
@@ -214,7 +208,7 @@ std::vector<std::pair<std::string, long>> initialize_cases( long wrong_result )
 }
 
 template <typename T>
-void test_environment_variable( T (*environment_variables_handler)( const char* ), T wrong_result ) {
+void test_environment_variable(T (*environment_variables_handler)(const char*), T wrong_result) {
     REQUIRE_MESSAGE(environment_variables_handler(environment_variable_name) == wrong_result,
                     "Tested environment variable should not be defined in the beginning");
 
@@ -238,4 +232,4 @@ TEST_CASE("testing GetIntegralEnvironmentVariable") {
     test_environment_variable(tbb::detail::r1::GetIntegralEnvironmentVariable, -1L);
 }
 
-#endif // !__TBB_WIN8UI_SUPPORT
+#endif// !__TBB_WIN8UI_SUPPORT
diff --git a/external/tbb/test/tbb/test_flow_graph.cpp b/external/tbb/test/tbb/test_flow_graph.cpp
index 4ae4c0f1..d6951c6f 100644
--- a/external/tbb/test/tbb/test_flow_graph.cpp
+++ b/external/tbb/test/tbb/test_flow_graph.cpp
@@ -15,18 +15,17 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
 #endif
 
 #include "common/config.h"
 
 #include "tbb/flow_graph.h"
 
-#include "common/test.h"
-#include "common/utils.h"
 #include "common/graph_utils.h"
 #include "common/spin_barrier.h"
-
+#include "common/test.h"
+#include "common/utils.h"
 
 //! \file test_flow_graph.cpp
 //! \brief Test for [flow_graph.continue_msg flow_graph.graph_node flow_graph.input_port flow_graph.output_port flow_graph.join_node flow_graph.split_node flow_graph.limiter_node flow_graph.write_once_node flow_graph.overwrite_node flow_graph.make_edge flow_graph.graph flow_graph.buffer_node flow_graph.function_node flow_graph.multifunction_node flow_graph.continue_node flow_graph.input_node] specification
@@ -36,10 +35,10 @@ const int W = 4;
 
 struct decrement_wait : utils::NoAssign {
 
-    tbb::flow::graph * const my_graph;
-    bool * const my_done_flag;
+    tbb::flow::graph* const my_graph;
+    bool* const my_done_flag;
 
-    decrement_wait( tbb::flow::graph &h, bool *done_flag ) : my_graph(&h), my_done_flag(done_flag) {}
+    decrement_wait(tbb::flow::graph& h, bool* done_flag) : my_graph(&h), my_done_flag(done_flag) {}
 
     void operator()(int i) const {
         utils::Sleep(10 * i);
@@ -51,17 +50,18 @@ struct decrement_wait : utils::NoAssign {
 
 static void test_wait_count() {
     tbb::flow::graph h;
-    for (int i = 0; i < T; ++i ) {
+    for (int i = 0; i < T; ++i) {
         bool done_flag[W];
-        for (int j = 0; j < W; ++j ) {
-            for ( int w = 0; w < W; ++w ) done_flag[w] = false;
-            for ( int w = 0; w < j; ++w ) h.reserve_wait();
+        for (int j = 0; j < W; ++j) {
+            for (int w = 0; w < W; ++w) done_flag[w] = false;
+            for (int w = 0; w < j; ++w) h.reserve_wait();
 
-            utils::NativeParallelFor( j, decrement_wait(h, done_flag) );
+            utils::NativeParallelFor(j, decrement_wait(h, done_flag));
             h.wait_for_all();
-            for ( int w = 0; w < W; ++w ) {
-                if ( w < j ) CHECK_MESSAGE( done_flag[w] == true, "" );
-                else CHECK_MESSAGE( done_flag[w] == false, "" );
+            for (int w = 0; w < W; ++w) {
+                if (w < j) CHECK_MESSAGE(done_flag[w] == true, "");
+                else
+                    CHECK_MESSAGE(done_flag[w] == false, "");
             }
         }
     }
@@ -70,17 +70,16 @@ static void test_wait_count() {
 // Encapsulate object we want to store in vector (because contained type must have
 // copy constructor and assignment operator
 class my_int_buffer {
-    tbb::flow::buffer_node<int> *b;
+    tbb::flow::buffer_node<int>* b;
     tbb::flow::graph& my_graph;
+
 public:
-    my_int_buffer(tbb::flow::graph &g) : my_graph(g) { b = new tbb::flow::buffer_node<int>(my_graph); }
+    my_int_buffer(tbb::flow::graph& g) : my_graph(g) { b = new tbb::flow::buffer_node<int>(my_graph); }
     my_int_buffer(const my_int_buffer& other) : my_graph(other.my_graph) {
         b = new tbb::flow::buffer_node<int>(my_graph);
     }
     ~my_int_buffer() { delete b; }
-    my_int_buffer& operator=(const my_int_buffer& /*other*/) {
-        return *this;
-    }
+    my_int_buffer& operator=(const my_int_buffer& /*other*/) { return *this; }
 };
 
 // test the graph iterator, delete nodes from graph, test again
@@ -89,63 +88,53 @@ void test_iterator() {
     my_int_buffer a_buffer(g);
     my_int_buffer b_buffer(g);
     my_int_buffer c_buffer(g);
-    my_int_buffer *d_buffer = new my_int_buffer(g);
+    my_int_buffer* d_buffer = new my_int_buffer(g);
     my_int_buffer e_buffer(g);
-    std::vector< my_int_buffer > my_buffer_vector(10, c_buffer);
+    std::vector<my_int_buffer> my_buffer_vector(10, c_buffer);
 
     int count = 0;
-    for (tbb::flow::graph::iterator it = g.begin(); it != g.end(); ++it) {
-        count++;
-    }
-    CHECK_MESSAGE( (count==15), "error in iterator count");
+    for (tbb::flow::graph::iterator it = g.begin(); it != g.end(); ++it) { count++; }
+    CHECK_MESSAGE((count == 15), "error in iterator count");
 
     delete d_buffer;
 
     count = 0;
-    for (tbb::flow::graph::iterator it = g.begin(); it != g.end(); ++it) {
-        count++;
-    }
-    CHECK_MESSAGE( (count==14), "error in iterator count");
+    for (tbb::flow::graph::iterator it = g.begin(); it != g.end(); ++it) { count++; }
+    CHECK_MESSAGE((count == 14), "error in iterator count");
 
     my_buffer_vector.clear();
 
     count = 0;
-    for (tbb::flow::graph::iterator it = g.begin(); it != g.end(); ++it) {
-        count++;
-    }
-    CHECK_MESSAGE( (count==4), "error in iterator count");
+    for (tbb::flow::graph::iterator it = g.begin(); it != g.end(); ++it) { count++; }
+    CHECK_MESSAGE((count == 4), "error in iterator count");
 }
 
 class AddRemoveBody : utils::NoAssign {
     tbb::flow::graph& g;
     int nThreads;
-    utils::SpinBarrier &barrier;
+    utils::SpinBarrier& barrier;
+
 public:
-    AddRemoveBody(int nthr, utils::SpinBarrier &barrier_, tbb::flow::graph& _g) :
-        g(_g), nThreads(nthr), barrier(barrier_)
-    {}
+    AddRemoveBody(int nthr, utils::SpinBarrier& barrier_, tbb::flow::graph& _g)
+        : g(_g), nThreads(nthr), barrier(barrier_) {}
     void operator()(const int /*threadID*/) const {
         my_int_buffer b(g);
         {
             std::vector<my_int_buffer> my_buffer_vector(100, b);
-            barrier.wait();  // wait until all nodes are created
+            barrier.wait();// wait until all nodes are created
             // now test that the proper number of nodes were created
             int count = 0;
-            for (tbb::flow::graph::iterator it = g.begin(); it != g.end(); ++it) {
-                count++;
-            }
-            CHECK_MESSAGE( (count==101*nThreads), "error in iterator count");
-            barrier.wait();  // wait until all threads are done counting
-        } // all nodes but for the initial node on this thread are deleted
-        barrier.wait(); // wait until all threads have deleted all nodes in their vectors
+            for (tbb::flow::graph::iterator it = g.begin(); it != g.end(); ++it) { count++; }
+            CHECK_MESSAGE((count == 101 * nThreads), "error in iterator count");
+            barrier.wait();// wait until all threads are done counting
+        }                  // all nodes but for the initial node on this thread are deleted
+        barrier.wait();    // wait until all threads have deleted all nodes in their vectors
         // now test that all the nodes were deleted except for the initial node
         int count = 0;
-        for (tbb::flow::graph::iterator it = g.begin(); it != g.end(); ++it) {
-            count++;
-        }
-        CHECK_MESSAGE( (count==nThreads), "error in iterator count");
-        barrier.wait();  // wait until all threads are done counting
-    } // initial node gets deleted
+        for (tbb::flow::graph::iterator it = g.begin(); it != g.end(); ++it) { count++; }
+        CHECK_MESSAGE((count == nThreads), "error in iterator count");
+        barrier.wait();// wait until all threads are done counting
+    }                  // initial node gets deleted
 };
 
 void test_parallel(int nThreads) {
@@ -174,7 +163,7 @@ struct run_functor {
     }
 };
 
-template < typename T >
+template <typename T>
 struct function_body {
     tbb::task_arena* midway_arena;
     function_body(tbb::task_arena* a) : midway_arena(a) {}
@@ -184,7 +173,7 @@ struct function_body {
     }
 };
 
-typedef tbb::flow::multifunction_node< int, std::tuple< int > > mf_node;
+typedef tbb::flow::multifunction_node<int, std::tuple<int>> mf_node;
 
 struct multifunction_body {
     tbb::task_arena* midway_arena;
@@ -198,11 +187,9 @@ struct input_body {
     tbb::task_arena* midway_arena;
     int counter;
     input_body(tbb::task_arena* a) : midway_arena(a), counter(0) {}
-    int operator()(tbb::flow_control &fc) {
+    int operator()(tbb::flow_control& fc) {
         check_arena(midway_arena);
-        if (counter++ >= 1) {
-            fc.stop();
-        }
+        if (counter++ >= 1) { fc.stop(); }
         return int();
     }
 };
@@ -216,49 +203,49 @@ struct nodes_test_functor : utils::NoAssign {
 
         // Define test nodes
         // Continue, function, source nodes
-        tbb::flow::continue_node< tbb::flow::continue_msg > c_n(my_graph, function_body<tbb::flow::continue_msg>(midway_arena));
-        tbb::flow::function_node< int > f_n(my_graph, tbb::flow::unlimited, function_body<int>(midway_arena));
-        tbb::flow::input_node< int > s_n(my_graph, input_body(midway_arena));
+        tbb::flow::continue_node<tbb::flow::continue_msg> c_n(
+                my_graph, function_body<tbb::flow::continue_msg>(midway_arena));
+        tbb::flow::function_node<int> f_n(my_graph, tbb::flow::unlimited, function_body<int>(midway_arena));
+        tbb::flow::input_node<int> s_n(my_graph, input_body(midway_arena));
 
         // Multifunction node
         mf_node m_n(my_graph, tbb::flow::unlimited, multifunction_body(midway_arena));
 
         // Join node
-        tbb::flow::function_node< std::tuple< int, int > > join_f_n(
-            my_graph, tbb::flow::unlimited, function_body< std::tuple< int, int > >(midway_arena)
-        );
-        tbb::flow::join_node< std::tuple< int, int > > j_n(my_graph);
+        tbb::flow::function_node<std::tuple<int, int>> join_f_n(
+                my_graph, tbb::flow::unlimited, function_body<std::tuple<int, int>>(midway_arena));
+        tbb::flow::join_node<std::tuple<int, int>> j_n(my_graph);
         make_edge(j_n, join_f_n);
 
         // Split node
-        tbb::flow::function_node< int > split_f_n1 = f_n;
-        tbb::flow::function_node< int > split_f_n2 = f_n;
-        tbb::flow::split_node< std::tuple< int, int > > sp_n(my_graph);
+        tbb::flow::function_node<int> split_f_n1 = f_n;
+        tbb::flow::function_node<int> split_f_n2 = f_n;
+        tbb::flow::split_node<std::tuple<int, int>> sp_n(my_graph);
         make_edge(tbb::flow::output_port<0>(sp_n), split_f_n1);
         make_edge(tbb::flow::output_port<1>(sp_n), split_f_n2);
 
         // Overwrite node
-        tbb::flow::function_node< int > ow_f_n = f_n;
-        tbb::flow::overwrite_node< int > ow_n(my_graph);
+        tbb::flow::function_node<int> ow_f_n = f_n;
+        tbb::flow::overwrite_node<int> ow_n(my_graph);
         make_edge(ow_n, ow_f_n);
 
         // Write once node
-        tbb::flow::function_node< int > w_f_n = f_n;
-        tbb::flow::write_once_node< int > w_n(my_graph);
+        tbb::flow::function_node<int> w_f_n = f_n;
+        tbb::flow::write_once_node<int> w_n(my_graph);
         make_edge(w_n, w_f_n);
 
         // Buffer node
-        tbb::flow::function_node< int > buf_f_n = f_n;
-        tbb::flow::buffer_node< int > buf_n(my_graph);
+        tbb::flow::function_node<int> buf_f_n = f_n;
+        tbb::flow::buffer_node<int> buf_n(my_graph);
         make_edge(w_n, buf_f_n);
 
         // Limiter node
-        tbb::flow::function_node< int > l_f_n = f_n;
-        tbb::flow::limiter_node< int > l_n(my_graph, 1);
+        tbb::flow::function_node<int> l_f_n = f_n;
+        tbb::flow::limiter_node<int> l_n(my_graph, 1);
         make_edge(l_n, l_f_n);
 
         // Execute nodes
-        c_n.try_put( tbb::flow::continue_msg() );
+        c_n.try_put(tbb::flow::continue_msg());
         f_n.try_put(1);
         m_n.try_put(1);
         s_n.activate();
@@ -266,7 +253,7 @@ struct nodes_test_functor : utils::NoAssign {
         tbb::flow::input_port<0>(j_n).try_put(1);
         tbb::flow::input_port<1>(j_n).try_put(1);
 
-        std::tuple< int, int > sp_tuple(1, 1);
+        std::tuple<int, int> sp_tuple(1, 1);
         sp_n.try_put(sp_tuple);
 
         ow_n.try_put(1);
@@ -284,61 +271,44 @@ void test_graph_arena() {
     // external thread won't be able to find them in its own arena.
     // In this case test should hang.
     tbb::task_arena arena(1);
-	arena.execute(
-        [&]() {
-            tbb::flow::graph g;
-            tbb::task_arena midway_arena;
-            midway_arena.initialize(2);
-            midway_arena.execute(nodes_test_functor(&midway_arena, g));
-
-        }
-	);
+    arena.execute([&]() {
+        tbb::flow::graph g;
+        tbb::task_arena midway_arena;
+        midway_arena.initialize(2);
+        midway_arena.execute(nodes_test_functor(&midway_arena, g));
+    });
 }
 
 //! Test wait counts
 //! \brief error_guessing
-TEST_CASE("Test wait_count"){
-    for(unsigned int p=utils::MinThread; p<=utils::MaxThread; ++p ) {
+TEST_CASE("Test wait_count") {
+    for (unsigned int p = utils::MinThread; p <= utils::MaxThread; ++p) {
         tbb::task_arena arena(p);
-        arena.execute(
-            [&]() {
-                test_wait_count();
-            }
-        );
-	}
+        arena.execute([&]() { test_wait_count(); });
+    }
 }
 
 //! Test graph iterators
 //! \brief interface
-TEST_CASE("Test graph::iterator"){
-    for(unsigned int p=utils::MinThread; p<=utils::MaxThread; ++p ) {
+TEST_CASE("Test graph::iterator") {
+    for (unsigned int p = utils::MinThread; p <= utils::MaxThread; ++p) {
         tbb::task_arena arena(p);
-        arena.execute(
-            [&]() {
-                test_iterator();
-            }
-        );
-	}
+        arena.execute([&]() { test_iterator(); });
+    }
 }
 
 //! Test parallel for body
 //! \brief \ref error_guessing
-TEST_CASE("Test parallel"){
-    for(unsigned int p=utils::MinThread; p<=utils::MaxThread; ++p ) {
+TEST_CASE("Test parallel") {
+    for (unsigned int p = utils::MinThread; p <= utils::MaxThread; ++p) {
         tbb::task_arena arena(p);
-        arena.execute(
-            [&]() {
-                test_parallel(p);
-            }
-        );
-	}
+        arena.execute([&]() { test_parallel(p); });
+    }
 }
 
 //! Test separate arena isn't used
 //! \brief \ref error_guessing
-TEST_CASE("Test graph_arena"){
-    test_graph_arena();
-}
+TEST_CASE("Test graph_arena") { test_graph_arena(); }
 
 //! Graph iterator
 //! \brief \ref error_guessing
@@ -346,25 +316,23 @@ TEST_CASE("graph iterator") {
     using namespace tbb::flow;
 
     graph g;
-    
+
     auto past_end = g.end();
     ++past_end;
 
-    continue_node<int> n(g, [](const continue_msg &){return 1;});
+    continue_node<int> n(g, [](const continue_msg&) { return 1; });
 
     size_t item_count = 0;
 
-    for(auto it = g.cbegin(); it != g.cend(); it++)
-        ++item_count;
+    for (auto it = g.cbegin(); it != g.cend(); it++) ++item_count;
     CHECK_MESSAGE((item_count == 1), "Should find 1 item");
 
     item_count = 0;
     auto jt(g.begin());
-    for(; jt != g.end(); jt++)
-        ++item_count;
+    for (; jt != g.end(); jt++) ++item_count;
     CHECK_MESSAGE((item_count == 1), "Should find 1 item");
 
     graph g2;
-    continue_node<int> n2(g, [](const continue_msg &){return 1;});
+    continue_node<int> n2(g, [](const continue_msg&) { return 1; });
     CHECK_MESSAGE((g.begin() != g2.begin()), "Different graphs should have different iterators");
 }
diff --git a/external/tbb/test/tbb/test_flow_graph_priorities.cpp b/external/tbb/test/tbb/test_flow_graph_priorities.cpp
index 483daadb..b2d47a1b 100644
--- a/external/tbb/test/tbb/test_flow_graph_priorities.cpp
+++ b/external/tbb/test/tbb/test_flow_graph_priorities.cpp
@@ -15,38 +15,35 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
 #endif
 
 #include "common/config.h"
 
 #include "tbb/flow_graph.h"
-#include "tbb/parallel_for.h"
 #include "tbb/global_control.h"
+#include "tbb/parallel_for.h"
 #include "tbb/task_arena.h"
 
+#include "common/spin_barrier.h"
 #include "common/test.h"
 #include "common/utils.h"
 #include "common/utils_concurrency_limit.h"
-#include "common/spin_barrier.h"
 
-#include <vector>
-#include <cstdlib>
-#include <random>
 #include <algorithm>
+#include <cstdlib>
 #include <memory>
-
+#include <random>
+#include <vector>
 
 //! \file test_flow_graph_priorities.cpp
 //! \brief Test for [flow_graph.copy_body flow_graph.function_node flow_graph.multifunction_node flow_graph.continue_node flow_graph.async_node] specification
 
-
 using namespace tbb::flow;
 
 struct TaskInfo {
     TaskInfo() : my_priority(-1), my_task_index(-1) {}
-    TaskInfo( int priority, int task_index )
-        : my_priority(priority), my_task_index(task_index) {}
+    TaskInfo(int priority, int task_index) : my_priority(priority), my_task_index(task_index) {}
     int my_priority;
     int my_task_index;
 };
@@ -55,326 +52,328 @@ std::vector<TaskInfo> g_task_info;
 
 std::atomic<unsigned> g_task_num;
 
-void spin_for( double delta ) {
+void spin_for(double delta) {
     tbb::tick_count start = tbb::tick_count::now();
-    while( (tbb::tick_count::now() - start).seconds() < delta ) ;
+    while ((tbb::tick_count::now() - start).seconds() < delta)
+        ;
 }
 
 namespace PriorityNodesTakePrecedence {
 
-std::atomic<bool> g_work_submitted;
-
-const unsigned node_num = 100;
-const unsigned start_index = node_num / 3;
-const unsigned end_index = node_num * 2 / 3;
-std::atomic<unsigned> g_priority_task_index;
-
-void body_func( int priority, utils::SpinBarrier& my_barrier ) {
-    while( !g_work_submitted.load(std::memory_order_acquire) )
-        tbb::detail::d0::yield();
-    int current_task_index = g_task_num++;
-    if( priority != no_priority )
-        g_task_info[g_priority_task_index++] = TaskInfo( priority, current_task_index );
-    const bool all_threads_will_come =
-        unsigned(current_task_index) < node_num - (node_num % tbb::this_task_arena::max_concurrency());
-    if( all_threads_will_come )
-        my_barrier.wait();
-}
+    std::atomic<bool> g_work_submitted;
 
-typedef multifunction_node< int, std::tuple<int> > multi_node;
+    const unsigned node_num = 100;
+    const unsigned start_index = node_num / 3;
+    const unsigned end_index = node_num * 2 / 3;
+    std::atomic<unsigned> g_priority_task_index;
 
-template <typename T>
-struct Body {
-    Body( int priority, utils::SpinBarrier& barrier )
-        : my_priority( priority ), my_barrier( barrier ) {}
-    T operator()( const T& msg ) const {
-        body_func( my_priority, my_barrier );
-        return msg;
-    }
-    void operator()( int msg, multi_node::output_ports_type& op ) const {
-        body_func( my_priority, my_barrier );
-        std::get<0>(op).try_put( msg );
+    void body_func(int priority, utils::SpinBarrier& my_barrier) {
+        while (!g_work_submitted.load(std::memory_order_acquire)) tbb::detail::d0::yield();
+        int current_task_index = g_task_num++;
+        if (priority != no_priority)
+            g_task_info[g_priority_task_index++] = TaskInfo(priority, current_task_index);
+        const bool all_threads_will_come = unsigned(current_task_index)
+                                           < node_num - (node_num % tbb::this_task_arena::max_concurrency());
+        if (all_threads_will_come) my_barrier.wait();
     }
-private:
-    int my_priority;
-    utils::SpinBarrier& my_barrier;
-};
 
-template<typename NodeType, typename BodyType>
-struct node_creator_t {
-    NodeType* operator()( graph& g, unsigned index, utils::SpinBarrier& barrier ) {
-        if( start_index <= index && index < end_index )
-            return new NodeType( g, unlimited, BodyType(index, barrier), node_priority_t(index) );
-        else
-            return new NodeType( g, unlimited, BodyType(no_priority, barrier) );
-    }
-};
+    typedef multifunction_node<int, std::tuple<int>> multi_node;
 
-template<typename BodyType>
-struct node_creator_t< continue_node<continue_msg>, BodyType > {
-    continue_node<continue_msg>* operator()( graph& g, unsigned index, utils::SpinBarrier& barrier ) {
-        if( start_index <= index && index < end_index )
-            return new continue_node<continue_msg>( g, BodyType(index, barrier), node_priority_t(index) );
-        else
-            return new continue_node<continue_msg>( g, BodyType(no_priority, barrier) );
-    }
-};
+    template <typename T>
+    struct Body {
+        Body(int priority, utils::SpinBarrier& barrier) : my_priority(priority), my_barrier(barrier) {}
+        T operator()(const T& msg) const {
+            body_func(my_priority, my_barrier);
+            return msg;
+        }
+        void operator()(int msg, multi_node::output_ports_type& op) const {
+            body_func(my_priority, my_barrier);
+            std::get<0>(op).try_put(msg);
+        }
 
+    private:
+        int my_priority;
+        utils::SpinBarrier& my_barrier;
+    };
 
-struct passthru_body {
-    template<typename T>
-    continue_msg operator()( T ) const { return continue_msg(); }
-};
+    template <typename NodeType, typename BodyType>
+    struct node_creator_t {
+        NodeType* operator()(graph& g, unsigned index, utils::SpinBarrier& barrier) {
+            if (start_index <= index && index < end_index)
+                return new NodeType(g, unlimited, BodyType(index, barrier), node_priority_t(index));
+            else
+                return new NodeType(g, unlimited, BodyType(no_priority, barrier));
+        }
+    };
 
-template<typename NodeType, typename NodeTypeCreator>
-void test_node( NodeTypeCreator node_creator ) {
-    const int num_threads = tbb::this_task_arena::max_concurrency();
-    utils::SpinBarrier barrier( num_threads );
-    graph g;
-    broadcast_node<typename NodeType::input_type> bn(g);
-    function_node<typename NodeType::input_type> tn(g, unlimited, passthru_body());
-    // Using pointers to nodes to avoid errors on compilers, which try to generate assignment
-    // operator for the nodes
-    std::vector< std::unique_ptr<NodeType> > nodes;
-    for( unsigned i = 0; i < node_num; ++i ) {
-        nodes.push_back(std::unique_ptr<NodeType>( node_creator(g, i, barrier) ));
-        make_edge( bn, *nodes.back() );
-        make_edge( *nodes.back(), tn );
-    }
+    template <typename BodyType>
+    struct node_creator_t<continue_node<continue_msg>, BodyType> {
+        continue_node<continue_msg>* operator()(graph& g, unsigned index, utils::SpinBarrier& barrier) {
+            if (start_index <= index && index < end_index)
+                return new continue_node<continue_msg>(g, BodyType(index, barrier), node_priority_t(index));
+            else
+                return new continue_node<continue_msg>(g, BodyType(no_priority, barrier));
+        }
+    };
 
-    const size_t repeats = 10;
-    const size_t priority_nodes_num = end_index - start_index;
-    size_t global_order_failures = 0;
-    for( size_t repeat = 0; repeat < repeats; ++repeat ) {
-        g_work_submitted.store( false, std::memory_order_release );
-        g_task_num = g_priority_task_index = 0;
-        g_task_info.clear(); g_task_info.resize( priority_nodes_num );
-
-        bn.try_put( typename NodeType::input_type{} );
-        // Setting of the flag is based on the knowledge that the calling thread broadcasts the
-        // message to successor nodes. Thus, once the calling thread returns from try_put() call all
-        // necessary tasks are spawned. Thus, this makes this test to be a whitebox test to some
-        // extent.
-        g_work_submitted.store( true, std::memory_order_release );
+    struct passthru_body {
+        template <typename T>
+        continue_msg operator()(T) const {
+            return continue_msg();
+        }
+    };
 
-        g.wait_for_all();
+    template <typename NodeType, typename NodeTypeCreator>
+    void test_node(NodeTypeCreator node_creator) {
+        const int num_threads = tbb::this_task_arena::max_concurrency();
+        utils::SpinBarrier barrier(num_threads);
+        graph g;
+        broadcast_node<typename NodeType::input_type> bn(g);
+        function_node<typename NodeType::input_type> tn(g, unlimited, passthru_body());
+        // Using pointers to nodes to avoid errors on compilers, which try to generate assignment
+        // operator for the nodes
+        std::vector<std::unique_ptr<NodeType>> nodes;
+        for (unsigned i = 0; i < node_num; ++i) {
+            nodes.push_back(std::unique_ptr<NodeType>(node_creator(g, i, barrier)));
+            make_edge(bn, *nodes.back());
+            make_edge(*nodes.back(), tn);
+        }
+
+        const size_t repeats = 10;
+        const size_t priority_nodes_num = end_index - start_index;
+        size_t global_order_failures = 0;
+        for (size_t repeat = 0; repeat < repeats; ++repeat) {
+            g_work_submitted.store(false, std::memory_order_release);
+            g_task_num = g_priority_task_index = 0;
+            g_task_info.clear();
+            g_task_info.resize(priority_nodes_num);
+
+            bn.try_put(typename NodeType::input_type {});
+            // Setting of the flag is based on the knowledge that the calling thread broadcasts the
+            // message to successor nodes. Thus, once the calling thread returns from try_put() call all
+            // necessary tasks are spawned. Thus, this makes this test to be a whitebox test to some
+            // extent.
+            g_work_submitted.store(true, std::memory_order_release);
 
-        CHECK_MESSAGE( (g_priority_task_index == g_task_info.size()), "Incorrect number of tasks with priority." );
-        CHECK_MESSAGE( (priority_nodes_num == g_task_info.size()), "Incorrect number of tasks with priority executed." );
+            g.wait_for_all();
 
-        for( unsigned i = 0; i < g_priority_task_index; i += num_threads ) {
-            bool found = false;
-            unsigned highest_priority_within_group = end_index - i - 1;
-            for( unsigned j = i; j < i+num_threads; ++j ) {
-                if( g_task_info[j].my_priority == int(highest_priority_within_group) ) {
-                    found = true;
-                    break;
+            CHECK_MESSAGE((g_priority_task_index == g_task_info.size()),
+                          "Incorrect number of tasks with priority.");
+            CHECK_MESSAGE((priority_nodes_num == g_task_info.size()),
+                          "Incorrect number of tasks with priority executed.");
+
+            for (unsigned i = 0; i < g_priority_task_index; i += num_threads) {
+                bool found = false;
+                unsigned highest_priority_within_group = end_index - i - 1;
+                for (unsigned j = i; j < i + num_threads; ++j) {
+                    if (g_task_info[j].my_priority == int(highest_priority_within_group)) {
+                        found = true;
+                        break;
+                    }
                 }
+                CHECK_MESSAGE(found, "Highest priority task within a group was not found");
+            }
+            for (unsigned i = 0; i < g_priority_task_index; ++i) {
+                // This check might fail because priorities do not guarantee ordering, i.e. assumption
+                // that all priority nodes should increment the task counter before any subsequent
+                // no-priority node is not correct. In the worst case, a thread that took a priority
+                // node might be preempted and become the last to increment the counter. That's why the
+                // test passing is based on statistics, which could be affected by machine overload
+                // unfortunately.
+                // TODO revamp: reconsider the following check for this test
+                if (g_task_info[i].my_task_index > int(priority_nodes_num + num_threads))
+                    ++global_order_failures;
             }
-            CHECK_MESSAGE( found, "Highest priority task within a group was not found" );
-        }
-        for( unsigned i = 0; i < g_priority_task_index; ++i ) {
-            // This check might fail because priorities do not guarantee ordering, i.e. assumption
-            // that all priority nodes should increment the task counter before any subsequent
-            // no-priority node is not correct. In the worst case, a thread that took a priority
-            // node might be preempted and become the last to increment the counter. That's why the
-            // test passing is based on statistics, which could be affected by machine overload
-            // unfortunately.
-            // TODO revamp: reconsider the following check for this test
-            if( g_task_info[i].my_task_index > int(priority_nodes_num + num_threads) )
-                ++global_order_failures;
         }
+        float failure_ratio = float(global_order_failures) / float(repeats * priority_nodes_num);
+        CHECK_MESSAGE(
+                failure_ratio <= 0.1f,
+                "Nodes with priorities executed in wrong order too frequently over non-prioritized nodes.");
     }
-    float failure_ratio = float(global_order_failures) / float(repeats*priority_nodes_num);
-    CHECK_MESSAGE(
-        failure_ratio <= 0.1f,
-        "Nodes with priorities executed in wrong order too frequently over non-prioritized nodes."
-    );
-}
 
-template<typename NodeType, typename NodeBody>
-void call_within_arena( tbb::task_arena& arena ) {
-    arena.execute(
-        [&]() {
-            test_node<NodeType>( node_creator_t<NodeType, NodeBody>() );
-        }
-    );
-}
+    template <typename NodeType, typename NodeBody>
+    void call_within_arena(tbb::task_arena& arena) {
+        arena.execute([&]() { test_node<NodeType>(node_creator_t<NodeType, NodeBody>()); });
+    }
 
-void test( int num_threads ) {
-    INFO( "Testing execution of nodes with priority takes precedence (num_threads=" << num_threads << ") - " );
-    tbb::task_arena arena(num_threads);
-    call_within_arena< function_node<int,int>, Body<int> >( arena );
-    call_within_arena< multi_node, Body<int> >( arena );
-    call_within_arena< continue_node<continue_msg>, Body<continue_msg> >( arena );
-}
+    void test(int num_threads) {
+        INFO("Testing execution of nodes with priority takes precedence (num_threads=" << num_threads
+                                                                                       << ") - ");
+        tbb::task_arena arena(num_threads);
+        call_within_arena<function_node<int, int>, Body<int>>(arena);
+        call_within_arena<multi_node, Body<int>>(arena);
+        call_within_arena<continue_node<continue_msg>, Body<continue_msg>>(arena);
+    }
 
 } /* namespace PriorityNodesTakePrecedence */
 
 namespace ThreadsEagerReaction {
 
-// TODO revamp: combine with similar queue from test_async_node
-template <typename T>
-class concurrent_queue {
-public:
-    bool try_pop(T& item) {
-        std::lock_guard<queue_mutex> lock(mutex);
-        if ( q.empty() )
-            return false;
-        item = q.front();
-        q.pop();
-        return true;
-    }
-
-    void push(const T& item) {
-        std::lock_guard<queue_mutex> lock(mutex);
-        q.push(item);
-    }
-private:
-    std::queue<T> q;
-    using queue_mutex = std::mutex;
-    std::mutex mutex;
-};
-
-using utils::SpinBarrier;
+    // TODO revamp: combine with similar queue from test_async_node
+    template <typename T>
+    class concurrent_queue {
+    public:
+        bool try_pop(T& item) {
+            std::lock_guard<queue_mutex> lock(mutex);
+            if (q.empty()) return false;
+            item = q.front();
+            q.pop();
+            return true;
+        }
 
-enum task_type_t { no_task, regular_task, async_task };
+        void push(const T& item) {
+            std::lock_guard<queue_mutex> lock(mutex);
+            q.push(item);
+        }
 
-struct profile_t {
-    task_type_t task_type;
-    unsigned global_task_id;
-    double elapsed;
-};
+    private:
+        std::queue<T> q;
+        using queue_mutex = std::mutex;
+        std::mutex mutex;
+    };
 
-std::vector<unsigned> g_async_task_ids;
+    using utils::SpinBarrier;
 
-typedef unsigned data_type;
-typedef async_node<data_type, data_type> async_node_type;
-typedef multifunction_node<
-    data_type, std::tuple<data_type, data_type> > decider_node_type;
-struct AsyncActivity {
-    typedef async_node_type::gateway_type gateway_type;
+    enum task_type_t { no_task, regular_task, async_task };
 
-    struct work_type { data_type input; gateway_type* gateway; };
-    std::atomic<bool> done;
-    concurrent_queue<work_type> my_queue;
-    std::thread my_service_thread;
+    struct profile_t {
+        task_type_t task_type;
+        unsigned global_task_id;
+        double elapsed;
+    };
 
-    struct ServiceThreadFunc {
-        SpinBarrier& my_barrier;
-        ServiceThreadFunc(SpinBarrier& barrier) : my_barrier(barrier) {}
-        void operator()(AsyncActivity* activity) {
-            while (!activity->done) {
-                work_type work;
-                while (activity->my_queue.try_pop(work)) {
-                    g_async_task_ids.push_back( ++g_task_num );
-                    work.gateway->try_put(work.input);
-                    work.gateway->release_wait();
-                    my_barrier.wait();
+    std::vector<unsigned> g_async_task_ids;
+
+    typedef unsigned data_type;
+    typedef async_node<data_type, data_type> async_node_type;
+    typedef multifunction_node<data_type, std::tuple<data_type, data_type>> decider_node_type;
+    struct AsyncActivity {
+        typedef async_node_type::gateway_type gateway_type;
+
+        struct work_type {
+            data_type input;
+            gateway_type* gateway;
+        };
+        std::atomic<bool> done;
+        concurrent_queue<work_type> my_queue;
+        std::thread my_service_thread;
+
+        struct ServiceThreadFunc {
+            SpinBarrier& my_barrier;
+            ServiceThreadFunc(SpinBarrier& barrier) : my_barrier(barrier) {}
+            void operator()(AsyncActivity* activity) {
+                while (!activity->done) {
+                    work_type work;
+                    while (activity->my_queue.try_pop(work)) {
+                        g_async_task_ids.push_back(++g_task_num);
+                        work.gateway->try_put(work.input);
+                        work.gateway->release_wait();
+                        my_barrier.wait();
+                    }
                 }
             }
+        };
+        void stop_and_wait() {
+            done = true;
+            my_service_thread.join();
         }
-    };
-    void stop_and_wait() { done = true; my_service_thread.join(); }
 
-    void submit(data_type input, gateway_type* gateway) {
-        work_type work = { input, gateway };
-        gateway->reserve_wait();
-        my_queue.push(work);
-    }
-    AsyncActivity(SpinBarrier& barrier)
-        : done(false), my_service_thread(ServiceThreadFunc(barrier), this) {}
-};
+        void submit(data_type input, gateway_type* gateway) {
+            work_type work = {input, gateway};
+            gateway->reserve_wait();
+            my_queue.push(work);
+        }
+        AsyncActivity(SpinBarrier& barrier)
+            : done(false), my_service_thread(ServiceThreadFunc(barrier), this) {}
+    };
 
-struct StartBody {
-    bool has_run;
-    data_type operator()(tbb::flow_control& fc) {
-        if (has_run){
-            fc.stop();
-            return data_type();
+    struct StartBody {
+        bool has_run;
+        data_type operator()(tbb::flow_control& fc) {
+            if (has_run) {
+                fc.stop();
+                return data_type();
+            }
+            has_run = true;
+            return 1;
         }
-        has_run = true;
-        return 1;
-    }
-    StartBody() : has_run(false) {}
-};
+        StartBody() : has_run(false) {}
+    };
 
-struct ParallelForBody {
-    SpinBarrier& my_barrier;
-    const data_type& my_input;
-    ParallelForBody(SpinBarrier& barrier, const data_type& input)
-        : my_barrier(barrier), my_input(input) {}
-    void operator()(const data_type&) const {
-        my_barrier.wait();
-        ++g_task_num;
-    }
-};
+    struct ParallelForBody {
+        SpinBarrier& my_barrier;
+        const data_type& my_input;
+        ParallelForBody(SpinBarrier& barrier, const data_type& input)
+            : my_barrier(barrier), my_input(input) {}
+        void operator()(const data_type&) const {
+            my_barrier.wait();
+            ++g_task_num;
+        }
+    };
 
-struct CpuWorkBody {
-    SpinBarrier& my_barrier;
-    const int my_tasks_count;
-    data_type operator()(const data_type& input) {
-        tbb::parallel_for(0, my_tasks_count, ParallelForBody(my_barrier, input), tbb::simple_partitioner());
-        return input;
-    }
-    CpuWorkBody(SpinBarrier& barrier, int tasks_count)
-        : my_barrier(barrier), my_tasks_count(tasks_count) {}
-};
+    struct CpuWorkBody {
+        SpinBarrier& my_barrier;
+        const int my_tasks_count;
+        data_type operator()(const data_type& input) {
+            tbb::parallel_for(0, my_tasks_count, ParallelForBody(my_barrier, input),
+                              tbb::simple_partitioner());
+            return input;
+        }
+        CpuWorkBody(SpinBarrier& barrier, int tasks_count)
+            : my_barrier(barrier), my_tasks_count(tasks_count) {}
+    };
 
-struct DeciderBody {
-    const data_type my_limit;
-    DeciderBody( const data_type& limit ) : my_limit( limit ) {}
-    void operator()(data_type input, decider_node_type::output_ports_type& ports) {
-        if (input < my_limit)
-            std::get<0>(ports).try_put(input + 1);
-    }
-};
+    struct DeciderBody {
+        const data_type my_limit;
+        DeciderBody(const data_type& limit) : my_limit(limit) {}
+        void operator()(data_type input, decider_node_type::output_ports_type& ports) {
+            if (input < my_limit) std::get<0>(ports).try_put(input + 1);
+        }
+    };
 
-struct AsyncSubmissionBody {
-    AsyncActivity* my_activity;
-    // It is important that async_node in the test executes without spawning a TBB task, because
-    // it passes the work to asynchronous thread, which unlocks the barrier that is waited
-    // by every execution thread (asynchronous thread and any TBB worker or main thread).
-    // This is why async_node's body marked noexcept.
-    void operator()(data_type input, async_node_type::gateway_type& gateway) noexcept {
-        my_activity->submit(input, &gateway);
-    }
-    AsyncSubmissionBody(AsyncActivity* activity) : my_activity(activity) {}
-};
+    struct AsyncSubmissionBody {
+        AsyncActivity* my_activity;
+        // It is important that async_node in the test executes without spawning a TBB task, because
+        // it passes the work to asynchronous thread, which unlocks the barrier that is waited
+        // by every execution thread (asynchronous thread and any TBB worker or main thread).
+        // This is why async_node's body marked noexcept.
+        void operator()(data_type input, async_node_type::gateway_type& gateway) noexcept {
+            my_activity->submit(input, &gateway);
+        }
+        AsyncSubmissionBody(AsyncActivity* activity) : my_activity(activity) {}
+    };
 
-void test( unsigned num_threads ) {
-    INFO( "Testing threads react eagerly on asynchronous tasks (num_threads=" << num_threads << ") - " );
-    if( num_threads == std::thread::hardware_concurrency() ) {
-        // one thread is required for asynchronous compute resource
-        INFO("skipping test since it is designed to work on less number of threads than "
-             "hardware concurrency allows\n");
-        return;
-    }
-    const unsigned cpu_threads = unsigned(num_threads);
-    const unsigned cpu_tasks_per_thread = 4;
-    const unsigned nested_cpu_tasks = cpu_tasks_per_thread * cpu_threads;
-    const unsigned async_subgraph_reruns = 8;
-    const unsigned cpu_subgraph_reruns = 2;
-
-    SpinBarrier barrier(cpu_threads + /*async thread=*/1);
-    g_task_num = 0;
-    g_async_task_ids.clear();
-    g_async_task_ids.reserve(async_subgraph_reruns);
-
-    tbb::task_arena arena(cpu_threads);
-	arena.execute(
-        [&]() {
+    void test(unsigned num_threads) {
+        INFO("Testing threads react eagerly on asynchronous tasks (num_threads=" << num_threads << ") - ");
+        if (num_threads == std::thread::hardware_concurrency()) {
+            // one thread is required for asynchronous compute resource
+            INFO("skipping test since it is designed to work on less number of threads than "
+                 "hardware concurrency allows\n");
+            return;
+        }
+        const unsigned cpu_threads = unsigned(num_threads);
+        const unsigned cpu_tasks_per_thread = 4;
+        const unsigned nested_cpu_tasks = cpu_tasks_per_thread * cpu_threads;
+        const unsigned async_subgraph_reruns = 8;
+        const unsigned cpu_subgraph_reruns = 2;
+
+        SpinBarrier barrier(cpu_threads + /*async thread=*/1);
+        g_task_num = 0;
+        g_async_task_ids.clear();
+        g_async_task_ids.reserve(async_subgraph_reruns);
+
+        tbb::task_arena arena(cpu_threads);
+        arena.execute([&]() {
             AsyncActivity activity(barrier);
             graph g;
 
             input_node<data_type> starter_node(g, StartBody());
-            function_node<data_type, data_type> cpu_work_node(
-                g, unlimited, CpuWorkBody(barrier, nested_cpu_tasks));
+            function_node<data_type, data_type> cpu_work_node(g, unlimited,
+                                                              CpuWorkBody(barrier, nested_cpu_tasks));
             decider_node_type cpu_restarter_node(g, unlimited, DeciderBody(cpu_subgraph_reruns));
             async_node_type async_node(g, unlimited, AsyncSubmissionBody(&activity));
-            decider_node_type async_restarter_node(
-                g, unlimited, DeciderBody(async_subgraph_reruns), node_priority_t(1)
-            );
+            decider_node_type async_restarter_node(g, unlimited, DeciderBody(async_subgraph_reruns),
+                                                   node_priority_t(1));
 
             make_edge(starter_node, cpu_work_node);
             make_edge(cpu_work_node, cpu_restarter_node);
@@ -389,127 +388,119 @@ void test( unsigned num_threads ) {
             activity.stop_and_wait();
 
             const size_t async_task_num = size_t(async_subgraph_reruns);
-            CHECK_MESSAGE( ( g_async_task_ids.size() == async_task_num), "Incorrect number of async tasks." );
+            CHECK_MESSAGE((g_async_task_ids.size() == async_task_num), "Incorrect number of async tasks.");
             unsigned max_span = unsigned(2 * cpu_threads + 1);
-            for( size_t idx = 1; idx < async_task_num; ++idx ) {
-                CHECK_MESSAGE( (g_async_task_ids[idx] - g_async_task_ids[idx-1] <= max_span),
-                               "Async tasks were not able to interfere with CPU tasks." );
-
+            for (size_t idx = 1; idx < async_task_num; ++idx) {
+                CHECK_MESSAGE((g_async_task_ids[idx] - g_async_task_ids[idx - 1] <= max_span),
+                              "Async tasks were not able to interfere with CPU tasks.");
             }
-        }
-    );
-    INFO("done\n");
-}
-} /* ThreadsEagerReaction */
+        });
+        INFO("done\n");
+    }
+}// namespace ThreadsEagerReaction
 
 namespace LimitingExecutionToPriorityTask {
 
-enum work_type_t { NONPRIORITIZED_WORK, PRIORITIZED_WORK };
+    enum work_type_t { NONPRIORITIZED_WORK, PRIORITIZED_WORK };
 
-struct execution_tracker_t {
-    execution_tracker_t() { reset(); }
-    void reset() {
-        prioritized_work_submitter = std::thread::id();
-        prioritized_work_started = false;
-        prioritized_work_finished = false;
-        prioritized_work_interrupted = false;
-    }
-    std::thread::id prioritized_work_submitter;
-    std::atomic<bool> prioritized_work_started;
-    bool prioritized_work_finished;
-    bool prioritized_work_interrupted;
-} exec_tracker;
-
-template<work_type_t work_type>
-void do_node_work( int work_size );
-
-template<work_type_t>
-void do_nested_work( const std::thread::id& tid, const tbb::blocked_range<int>& subrange );
-
-template<work_type_t work_type>
-struct CommonBody {
-    CommonBody() : my_body_size( 0 ) { }
-    CommonBody( int body_size ) : my_body_size( body_size ) { }
-    continue_msg operator()( const continue_msg& msg ) const {
-        do_node_work<work_type>(my_body_size);
-        return msg;
-    }
-    void operator()( const tbb::blocked_range<int>& subrange ) const {
-        do_nested_work<work_type>( /*tid=*/std::this_thread::get_id(), subrange );
-    }
-    int my_body_size;
-};
-
-template<work_type_t work_type>
-void do_node_work(int work_size) {
-    tbb::parallel_for( tbb::blocked_range<int>(0, work_size), CommonBody<work_type>(),
-                       tbb::simple_partitioner() );
-}
+    struct execution_tracker_t {
+        execution_tracker_t() { reset(); }
+        void reset() {
+            prioritized_work_submitter = std::thread::id();
+            prioritized_work_started = false;
+            prioritized_work_finished = false;
+            prioritized_work_interrupted = false;
+        }
+        std::thread::id prioritized_work_submitter;
+        std::atomic<bool> prioritized_work_started;
+        bool prioritized_work_finished;
+        bool prioritized_work_interrupted;
+    } exec_tracker;
+
+    template <work_type_t work_type>
+    void do_node_work(int work_size);
+
+    template <work_type_t>
+    void do_nested_work(const std::thread::id& tid, const tbb::blocked_range<int>& subrange);
+
+    template <work_type_t work_type>
+    struct CommonBody {
+        CommonBody() : my_body_size(0) {}
+        CommonBody(int body_size) : my_body_size(body_size) {}
+        continue_msg operator()(const continue_msg& msg) const {
+            do_node_work<work_type>(my_body_size);
+            return msg;
+        }
+        void operator()(const tbb::blocked_range<int>& subrange) const {
+            do_nested_work<work_type>(/*tid=*/std::this_thread::get_id(), subrange);
+        }
+        int my_body_size;
+    };
 
-template<work_type_t>
-void do_nested_work( const std::thread::id& tid, const tbb::blocked_range<int>& /*subrange*/ ) {
-    // This is non-prioritized work...
-    if( !exec_tracker.prioritized_work_started || exec_tracker.prioritized_work_submitter != tid )
-        return;
-    // ...being executed by the thread that initially started prioritized one...
-    CHECK_MESSAGE( exec_tracker.prioritized_work_started,
-                   "Prioritized work should have been started by that time." );
-    // ...prioritized work has been started already...
-    if( exec_tracker.prioritized_work_finished )
-        return;
-    // ...but has not been finished yet
-    exec_tracker.prioritized_work_interrupted = true;
-}
+    template <work_type_t work_type>
+    void do_node_work(int work_size) {
+        tbb::parallel_for(tbb::blocked_range<int>(0, work_size), CommonBody<work_type>(),
+                          tbb::simple_partitioner());
+    }
+
+    template <work_type_t>
+    void do_nested_work(const std::thread::id& tid, const tbb::blocked_range<int>& /*subrange*/) {
+        // This is non-prioritized work...
+        if (!exec_tracker.prioritized_work_started || exec_tracker.prioritized_work_submitter != tid) return;
+        // ...being executed by the thread that initially started prioritized one...
+        CHECK_MESSAGE(exec_tracker.prioritized_work_started,
+                      "Prioritized work should have been started by that time.");
+        // ...prioritized work has been started already...
+        if (exec_tracker.prioritized_work_finished) return;
+        // ...but has not been finished yet
+        exec_tracker.prioritized_work_interrupted = true;
+    }
+
+    struct IsolationFunctor {
+        int work_size;
+        IsolationFunctor(int ws) : work_size(ws) {}
+        void operator()() const {
+            tbb::parallel_for(tbb::blocked_range<int>(0, work_size), CommonBody<PRIORITIZED_WORK>(),
+                              tbb::simple_partitioner());
+        }
+    };
 
-struct IsolationFunctor {
-    int work_size;
-    IsolationFunctor(int ws) : work_size(ws) {}
-    void operator()() const {
-        tbb::parallel_for( tbb::blocked_range<int>(0, work_size), CommonBody<PRIORITIZED_WORK>(),
-                           tbb::simple_partitioner() );
+    template <>
+    void do_node_work<PRIORITIZED_WORK>(int work_size) {
+        exec_tracker.prioritized_work_submitter = std::this_thread::get_id();
+        exec_tracker.prioritized_work_started = true;
+        tbb::this_task_arena::isolate(IsolationFunctor(work_size));
+        exec_tracker.prioritized_work_finished = true;
+    }
+
+    template <>
+    void do_nested_work<PRIORITIZED_WORK>(const std::thread::id& tid,
+                                          const tbb::blocked_range<int>& /*subrange*/) {
+        if (exec_tracker.prioritized_work_started && exec_tracker.prioritized_work_submitter == tid) {
+            CHECK_MESSAGE(!exec_tracker.prioritized_work_interrupted,
+                          "Thread was not fully devoted to processing of prioritized task.");
+        } else {
+            // prolong processing of prioritized work so that the thread that started
+            // prioritized work has higher probability to help with non-prioritized one.
+            spin_for(0.1);
+        }
     }
-};
 
-template<>
-void do_node_work<PRIORITIZED_WORK>(int work_size) {
-    exec_tracker.prioritized_work_submitter = std::this_thread::get_id();
-    exec_tracker.prioritized_work_started = true;
-    tbb::this_task_arena::isolate( IsolationFunctor(work_size) );
-    exec_tracker.prioritized_work_finished = true;
-}
+    // Using pointers to nodes to avoid errors on compilers, which try to generate assignment operator
+    // for the nodes
+    typedef std::vector<std::unique_ptr<continue_node<continue_msg>>> nodes_container_t;
 
-template<>
-void do_nested_work<PRIORITIZED_WORK>( const std::thread::id& tid,
-                                       const tbb::blocked_range<int>& /*subrange*/ ) {
-    if( exec_tracker.prioritized_work_started && exec_tracker.prioritized_work_submitter == tid ) {
-        CHECK_MESSAGE( !exec_tracker.prioritized_work_interrupted,
-                       "Thread was not fully devoted to processing of prioritized task." );
-    } else {
-        // prolong processing of prioritized work so that the thread that started
-        // prioritized work has higher probability to help with non-prioritized one.
-        spin_for(0.1);
+    void create_nodes(nodes_container_t& nodes, graph& g, int num, int body_size) {
+        for (int i = 0; i < num; ++i)
+            nodes.push_back(std::unique_ptr<continue_node<continue_msg>>(
+                    new continue_node<continue_msg>(g, CommonBody<NONPRIORITIZED_WORK>(body_size))));
     }
-}
-
-// Using pointers to nodes to avoid errors on compilers, which try to generate assignment operator
-// for the nodes
-typedef std::vector< std::unique_ptr<continue_node<continue_msg>> > nodes_container_t;
-
-void create_nodes( nodes_container_t& nodes, graph& g, int num, int body_size ) {
-    for( int i = 0; i < num; ++i )
-        nodes.push_back(
-            std::unique_ptr<continue_node<continue_msg>>(
-                new continue_node<continue_msg>( g, CommonBody<NONPRIORITIZED_WORK>( body_size ) )
-            )
-        );
-}
 
-void test( int num_threads ) {
-    INFO( "Testing limit execution to priority tasks (num_threads=" << num_threads << ") - " );
+    void test(int num_threads) {
+        INFO("Testing limit execution to priority tasks (num_threads=" << num_threads << ") - ");
 
-    tbb::task_arena arena( num_threads );
-	arena.execute(
-        [&]() {
+        tbb::task_arena arena(num_threads);
+        arena.execute([&]() {
             const int nodes_num = 100;
             const int priority_node_position_part = 10;
             const int pivot = nodes_num / priority_node_position_part;
@@ -519,261 +510,238 @@ void test( int num_threads ) {
 
             graph g;
             nodes_container_t nodes;
-            create_nodes( nodes, g, pivot, large_problem_size );
-            nodes.push_back(
-                std::unique_ptr<continue_node<continue_msg>>(
-                    new continue_node<continue_msg>(
-                        g, CommonBody<PRIORITIZED_WORK>(small_problem_size), node_priority_t(1)
-                    )
-                )
-            );
-            create_nodes( nodes, g, nodes_num - pivot - 1, large_problem_size );
+            create_nodes(nodes, g, pivot, large_problem_size);
+            nodes.push_back(std::unique_ptr<continue_node<continue_msg>>(new continue_node<continue_msg>(
+                    g, CommonBody<PRIORITIZED_WORK>(small_problem_size), node_priority_t(1))));
+            create_nodes(nodes, g, nodes_num - pivot - 1, large_problem_size);
 
             broadcast_node<continue_msg> bn(g);
-            for( int i = 0; i < nodes_num; ++i )
-                if( i % nodes_in_lane == 0 )
-                    make_edge( bn, *nodes[i] );
+            for (int i = 0; i < nodes_num; ++i)
+                if (i % nodes_in_lane == 0) make_edge(bn, *nodes[i]);
                 else
-                    make_edge( *nodes[i-1], *nodes[i] );
+                    make_edge(*nodes[i - 1], *nodes[i]);
             exec_tracker.reset();
-            bn.try_put( continue_msg() );
+            bn.try_put(continue_msg());
             g.wait_for_all();
-        }
-	);
+        });
 
-    INFO( "done\n" );
-}
+        INFO("done\n");
+    }
 
 } /* namespace LimitingExecutionToPriorityTask */
 
 namespace NestedCase {
 
-using tbb::task_arena;
+    using tbb::task_arena;
 
-struct InnerBody {
-    continue_msg operator()( const continue_msg& ) const {
-        return continue_msg();
-    }
-};
+    struct InnerBody {
+        continue_msg operator()(const continue_msg&) const { return continue_msg(); }
+    };
 
-struct OuterBody {
-    int my_max_threads;
-    task_arena** my_inner_arena;
-    OuterBody( int max_threads, task_arena** inner_arena )
-        : my_max_threads(max_threads), my_inner_arena(inner_arena) {}
-    // copy constructor to please some old compilers
-    OuterBody( const OuterBody& rhs )
-        : my_max_threads(rhs.my_max_threads), my_inner_arena(rhs.my_inner_arena) {}
-    int operator()( const int& ) {
-        graph inner_graph;
-        continue_node<continue_msg> start_node(inner_graph, InnerBody());
-        continue_node<continue_msg> mid_node1(inner_graph, InnerBody(), node_priority_t(5));
-        continue_node<continue_msg> mid_node2(inner_graph, InnerBody());
-        continue_node<continue_msg> end_node(inner_graph, InnerBody(), node_priority_t(15));
-        make_edge( start_node, mid_node1 );
-        make_edge( mid_node1, end_node );
-        make_edge( start_node, mid_node2 );
-        make_edge( mid_node2, end_node );
-        (*my_inner_arena)->execute( [&inner_graph]{ inner_graph.reset(); } );
-        start_node.try_put( continue_msg() );
-        inner_graph.wait_for_all();
-        return 13;
-    }
-};
+    struct OuterBody {
+        int my_max_threads;
+        task_arena** my_inner_arena;
+        OuterBody(int max_threads, task_arena** inner_arena)
+            : my_max_threads(max_threads), my_inner_arena(inner_arena) {}
+        // copy constructor to please some old compilers
+        OuterBody(const OuterBody& rhs)
+            : my_max_threads(rhs.my_max_threads), my_inner_arena(rhs.my_inner_arena) {}
+        int operator()(const int&) {
+            graph inner_graph;
+            continue_node<continue_msg> start_node(inner_graph, InnerBody());
+            continue_node<continue_msg> mid_node1(inner_graph, InnerBody(), node_priority_t(5));
+            continue_node<continue_msg> mid_node2(inner_graph, InnerBody());
+            continue_node<continue_msg> end_node(inner_graph, InnerBody(), node_priority_t(15));
+            make_edge(start_node, mid_node1);
+            make_edge(mid_node1, end_node);
+            make_edge(start_node, mid_node2);
+            make_edge(mid_node2, end_node);
+            (*my_inner_arena)->execute([&inner_graph] { inner_graph.reset(); });
+            start_node.try_put(continue_msg());
+            inner_graph.wait_for_all();
+            return 13;
+        }
+    };
 
-void execute_outer_graph( bool same_arena, task_arena& inner_arena, int max_threads,
-                          graph& outer_graph, function_node<int,int>& start_node ) {
-    if( same_arena ) {
-        start_node.try_put( 42 );
-        outer_graph.wait_for_all();
-        return;
-    }
+    void execute_outer_graph(bool same_arena, task_arena& inner_arena, int max_threads, graph& outer_graph,
+                             function_node<int, int>& start_node) {
+        if (same_arena) {
+            start_node.try_put(42);
+            outer_graph.wait_for_all();
+            return;
+        }
 
-    auto threads_range = utils::concurrency_range(max_threads);
-    for( auto num_threads : threads_range ) {
-        inner_arena.initialize( static_cast<int>(num_threads) );
-        start_node.try_put( 42 );
-        outer_graph.wait_for_all();
-        inner_arena.terminate();
+        auto threads_range = utils::concurrency_range(max_threads);
+        for (auto num_threads : threads_range) {
+            inner_arena.initialize(static_cast<int>(num_threads));
+            start_node.try_put(42);
+            outer_graph.wait_for_all();
+            inner_arena.terminate();
+        }
     }
-}
 
-void test_in_arena( int max_threads, task_arena& outer_arena, task_arena& inner_arena,
-                    graph& outer_graph, function_node<int, int>& start_node ) {
-    bool same_arena = &outer_arena == &inner_arena;
-    auto threads_range = utils::concurrency_range(max_threads);
-    for( auto num_threads : threads_range ) {
-        INFO( "Testing nested nodes with specified priority in " << (same_arena? "same" : "different")
-              << " arenas, num_threads=" << num_threads << ") - " );
-        outer_arena.initialize( static_cast<int>(num_threads) );
-        outer_arena.execute( [&outer_graph]{ outer_graph.reset(); } );
-        execute_outer_graph( same_arena, inner_arena, max_threads, outer_graph, start_node );
-        outer_arena.terminate();
-        INFO( "done\n" );
+    void test_in_arena(int max_threads, task_arena& outer_arena, task_arena& inner_arena, graph& outer_graph,
+                       function_node<int, int>& start_node) {
+        bool same_arena = &outer_arena == &inner_arena;
+        auto threads_range = utils::concurrency_range(max_threads);
+        for (auto num_threads : threads_range) {
+            INFO("Testing nested nodes with specified priority in "
+                 << (same_arena ? "same" : "different") << " arenas, num_threads=" << num_threads << ") - ");
+            outer_arena.initialize(static_cast<int>(num_threads));
+            outer_arena.execute([&outer_graph] { outer_graph.reset(); });
+            execute_outer_graph(same_arena, inner_arena, max_threads, outer_graph, start_node);
+            outer_arena.terminate();
+            INFO("done\n");
+        }
     }
-}
 
-void test( int max_threads ) {
-    task_arena outer_arena; task_arena inner_arena;
-    task_arena* inner_arena_pointer = &outer_arena; // make it same as outer arena in the beginning
-
-    graph outer_graph;
-    const unsigned num_outer_nodes = 10;
-    const size_t concurrency = unlimited;
-    std::vector< std::unique_ptr<function_node<int,int>> > outer_nodes;
-    for( unsigned node_index = 0; node_index < num_outer_nodes; ++node_index ) {
-        node_priority_t priority = no_priority;
-        if( node_index == num_outer_nodes / 2 )
-            priority = 10;
-
-        outer_nodes.push_back(
-            std::unique_ptr< function_node<int, int> >(
-                new function_node<int,int>(
-                    outer_graph, concurrency, OuterBody(max_threads, &inner_arena_pointer), priority
-                )
-            )
-        );
-    }
+    void test(int max_threads) {
+        task_arena outer_arena;
+        task_arena inner_arena;
+        task_arena* inner_arena_pointer = &outer_arena;// make it same as outer arena in the beginning
 
-    for( unsigned node_index1 = 0; node_index1 < num_outer_nodes; ++node_index1 )
-        for( unsigned node_index2 = node_index1+1; node_index2 < num_outer_nodes; ++node_index2 )
-            make_edge( *outer_nodes[node_index1], *outer_nodes[node_index2] );
+        graph outer_graph;
+        const unsigned num_outer_nodes = 10;
+        const size_t concurrency = unlimited;
+        std::vector<std::unique_ptr<function_node<int, int>>> outer_nodes;
+        for (unsigned node_index = 0; node_index < num_outer_nodes; ++node_index) {
+            node_priority_t priority = no_priority;
+            if (node_index == num_outer_nodes / 2) priority = 10;
 
-    test_in_arena( max_threads, outer_arena, outer_arena, outer_graph, *outer_nodes[0] );
+            outer_nodes.push_back(std::unique_ptr<function_node<int, int>>(new function_node<int, int>(
+                    outer_graph, concurrency, OuterBody(max_threads, &inner_arena_pointer), priority)));
+        }
 
-    inner_arena_pointer = &inner_arena;
+        for (unsigned node_index1 = 0; node_index1 < num_outer_nodes; ++node_index1)
+            for (unsigned node_index2 = node_index1 + 1; node_index2 < num_outer_nodes; ++node_index2)
+                make_edge(*outer_nodes[node_index1], *outer_nodes[node_index2]);
 
-    test_in_arena( max_threads, outer_arena, inner_arena, outer_graph, *outer_nodes[0] );
-}
-} // namespace NestedCase
+        test_in_arena(max_threads, outer_arena, outer_arena, outer_graph, *outer_nodes[0]);
 
+        inner_arena_pointer = &inner_arena;
 
-namespace BypassPrioritizedTask {
+        test_in_arena(max_threads, outer_arena, inner_arena, outer_graph, *outer_nodes[0]);
+    }
+}// namespace NestedCase
 
-void common_body( int priority ) {
-    int current_task_index = g_task_num++;
-    g_task_info.push_back( TaskInfo( priority, current_task_index ) );
-}
+namespace BypassPrioritizedTask {
 
-struct Body {
-    Body( int priority ) : my_priority( priority ) {}
-    continue_msg operator()(const continue_msg&) {
-        common_body( my_priority );
-        return continue_msg();
+    void common_body(int priority) {
+        int current_task_index = g_task_num++;
+        g_task_info.push_back(TaskInfo(priority, current_task_index));
     }
-    int my_priority;
-};
 
-struct InputNodeBody {
-    continue_msg operator()( tbb::flow_control& fc ){
-        static bool is_source_executed = false;
+    struct Body {
+        Body(int priority) : my_priority(priority) {}
+        continue_msg operator()(const continue_msg&) {
+            common_body(my_priority);
+            return continue_msg();
+        }
+        int my_priority;
+    };
+
+    struct InputNodeBody {
+        continue_msg operator()(tbb::flow_control& fc) {
+            static bool is_source_executed = false;
+
+            if (is_source_executed) {
+                fc.stop();
+                return continue_msg();
+            }
+
+            common_body(0);
+            is_source_executed = true;
 
-        if( is_source_executed ) {
-            fc.stop();
             return continue_msg();
         }
+    };
 
-        common_body( 0 );
-        is_source_executed = true;
+    template <typename StarterNodeType>
+    StarterNodeType create_starter_node(graph& g) {
+        return continue_node<continue_msg>(g, Body(0));
+    }
 
-        return continue_msg();
+    template <>
+    input_node<continue_msg> create_starter_node<input_node<continue_msg>>(graph& g) {
+        return input_node<continue_msg>(g, InputNodeBody());
     }
-};
 
-template<typename StarterNodeType>
-StarterNodeType create_starter_node(graph& g) {
-    return continue_node<continue_msg>( g, Body(0) );
-}
+    template <typename StarterNodeType>
+    void start_graph(StarterNodeType& starter) {
+        starter.try_put(continue_msg());
+    }
 
-template<>
-input_node<continue_msg> create_starter_node<input_node<continue_msg>>(graph& g) {
-    return input_node<continue_msg>( g, InputNodeBody() );
-}
+    template <>
+    void start_graph<input_node<continue_msg>>(input_node<continue_msg>& starter) {
+        starter.activate();
+    }
 
-template<typename StarterNodeType>
-void start_graph( StarterNodeType& starter ) {
-    starter.try_put( continue_msg() );
-}
+    template <typename StarterNodeType>
+    void test_use_case() {
+        g_task_info.clear();
+        g_task_num = 0;
+        graph g;
+        StarterNodeType starter = create_starter_node<StarterNodeType>(g);
+        continue_node<continue_msg> spawn_successor(g, Body(1), node_priority_t(1));
+        continue_node<continue_msg> bypass_successor(g, Body(2), node_priority_t(2));
 
-template<>
-void start_graph<input_node<continue_msg>>( input_node<continue_msg>& starter ) {
-    starter.activate();
-}
+        make_edge(starter, spawn_successor);
+        make_edge(starter, bypass_successor);
 
-template<typename StarterNodeType>
-void test_use_case() {
-    g_task_info.clear();
-    g_task_num = 0;
-    graph g;
-    StarterNodeType starter = create_starter_node<StarterNodeType>(g);
-    continue_node<continue_msg> spawn_successor( g, Body(1), node_priority_t(1) );
-    continue_node<continue_msg> bypass_successor( g, Body(2), node_priority_t(2) );
-
-    make_edge( starter, spawn_successor );
-    make_edge( starter, bypass_successor );
-
-    start_graph<StarterNodeType>( starter );
-    g.wait_for_all();
-
-    CHECK_MESSAGE( g_task_info.size() == 3, "" );
-    CHECK_MESSAGE( g_task_info[0].my_task_index == 0, "" );
-    CHECK_MESSAGE( g_task_info[1].my_task_index == 1, "" );
-    CHECK_MESSAGE( g_task_info[2].my_task_index == 2, "" );
-
-    CHECK_MESSAGE( g_task_info[0].my_priority == 0, "" );
-    CHECK_MESSAGE( g_task_info[1].my_priority == 2, "Bypassed task with higher priority executed in wrong order." );
-    CHECK_MESSAGE( g_task_info[2].my_priority == 1, "" );
-}
+        start_graph<StarterNodeType>(starter);
+        g.wait_for_all();
 
-//! The test checks that the task from the node with higher priority, which task gets bypassed, is
-//! executed first than the one spawned with lower priority.
-void test() {
-    test_use_case<continue_node<continue_msg>>();
-    test_use_case<input_node<continue_msg>>();
-}
+        CHECK_MESSAGE(g_task_info.size() == 3, "");
+        CHECK_MESSAGE(g_task_info[0].my_task_index == 0, "");
+        CHECK_MESSAGE(g_task_info[1].my_task_index == 1, "");
+        CHECK_MESSAGE(g_task_info[2].my_task_index == 2, "");
+
+        CHECK_MESSAGE(g_task_info[0].my_priority == 0, "");
+        CHECK_MESSAGE(g_task_info[1].my_priority == 2,
+                      "Bypassed task with higher priority executed in wrong order.");
+        CHECK_MESSAGE(g_task_info[2].my_priority == 1, "");
+    }
+
+    //! The test checks that the task from the node with higher priority, which task gets bypassed, is
+    //! executed first than the one spawned with lower priority.
+    void test() {
+        test_use_case<continue_node<continue_msg>>();
+        test_use_case<input_node<continue_msg>>();
+    }
 
-} // namespace BypassPrioritizedTask
+}// namespace BypassPrioritizedTask
 
 namespace ManySuccessors {
 
-struct no_priority_node_body {
-    void operator()(continue_msg) {
-        CHECK_MESSAGE(
-            barrier == 0, "Non-priority successor has to be executed after all priority successors"
-        );
-    }
-    std::atomic<int>& barrier;
-};
+    struct no_priority_node_body {
+        void operator()(continue_msg) {
+            CHECK_MESSAGE(barrier == 0,
+                          "Non-priority successor has to be executed after all priority successors");
+        }
+        std::atomic<int>& barrier;
+    };
 
-struct priority_node_body {
-    void operator()(continue_msg) {
-        --barrier;
-        while (barrier)
-            tbb::detail::d0::yield();
-    }
-    std::atomic<int>& barrier;
-};
+    struct priority_node_body {
+        void operator()(continue_msg) {
+            --barrier;
+            while (barrier) tbb::detail::d0::yield();
+        }
+        std::atomic<int>& barrier;
+    };
 
-void test(int num_threads) {
-    tbb::task_arena arena( num_threads );
-    arena.execute(
-        [&]() {
+    void test(int num_threads) {
+        tbb::task_arena arena(num_threads);
+        arena.execute([&]() {
             graph g;
             broadcast_node<continue_msg> bn(g);
-            std::vector< std::unique_ptr<continue_node<continue_msg>> > nodes;
+            std::vector<std::unique_ptr<continue_node<continue_msg>>> nodes;
             std::atomic<int> barrier;
             for (int i = 0; i < 2 * num_threads; ++i)
-                nodes.push_back(
-                    std::unique_ptr<continue_node<continue_msg>>(
-                        new continue_node<continue_msg>(g, no_priority_node_body{ barrier })
-                    )
-                );
+                nodes.push_back(std::unique_ptr<continue_node<continue_msg>>(
+                        new continue_node<continue_msg>(g, no_priority_node_body {barrier})));
             for (int i = 0; i < num_threads; ++i)
-                nodes.push_back(
-                    std::unique_ptr<continue_node<continue_msg>>(
-                        new continue_node<continue_msg>(g, priority_node_body{ barrier }, /*priority*/1)
-                    )
-                );
+                nodes.push_back(std::unique_ptr<continue_node<continue_msg>>(
+                        new continue_node<continue_msg>(g, priority_node_body {barrier}, /*priority*/ 1)));
 
             std::random_device rd;
             std::mt19937 gen(rd());
@@ -781,18 +749,15 @@ void test(int num_threads) {
             for (int trial = 0; trial < 10; ++trial) {
                 barrier = num_threads;
                 std::shuffle(nodes.begin(), nodes.end(), gen);
-                for (auto& n : nodes)
-                    make_edge(bn, *n);
+                for (auto& n : nodes) make_edge(bn, *n);
                 bn.try_put(continue_msg());
                 g.wait_for_all();
-                for (auto& n : nodes)
-                    remove_edge(bn, *n);
+                for (auto& n : nodes) remove_edge(bn, *n);
             }
-        }
-    );
-}
+        });
+    }
 
-} // namespace ManySuccessors
+}// namespace ManySuccessors
 
 #if TBB_USE_EXCEPTIONS
 namespace Exceptions {
@@ -803,61 +768,52 @@ namespace Exceptions {
         const unsigned num_messages = 50;
         std::vector<unsigned> throwing_msgs;
         std::atomic<unsigned> msg_count(0);
-        continue_node<unsigned> c(g, [&msg_count](continue_msg) {
-            return ++msg_count;
-        }, 2);
-        function_node<unsigned> f(g, unlimited, [&throwing_msgs](unsigned v) {
-            for( auto i : throwing_msgs ) {
-                if( i == v )
-                    throw std::runtime_error("Exception::test");
-            }
-        }, 1);
+        continue_node<unsigned> c(
+                g, [&msg_count](continue_msg) { return ++msg_count; }, 2);
+        function_node<unsigned> f(
+                g, unlimited,
+                [&throwing_msgs](unsigned v) {
+                    for (auto i : throwing_msgs) {
+                        if (i == v) throw std::runtime_error("Exception::test");
+                    }
+                },
+                1);
         make_edge(c, f);
         for (int i = 0; i < 10; ++i) {
             msg_count = 0;
             g.reset();
             throwing_msgs.push_back(std::rand() % num_messages);
             try {
-                for (unsigned j = 0; j < num_messages; ++j) {
-                    c.try_put(continue_msg());
-                }
+                for (unsigned j = 0; j < num_messages; ++j) { c.try_put(continue_msg()); }
                 g.wait_for_all();
                 FAIL("Unreachable code. The exception is expected");
             } catch (std::runtime_error&) {
                 CHECK(g.is_cancelled());
                 CHECK(g.exception_thrown());
-            } catch (...) {
-                FAIL("Unexpected exception");
-            }
+            } catch (...) { FAIL("Unexpected exception"); }
         }
     }
-} // namespace Exceptions
+}// namespace Exceptions
 #endif
 
 //! Test node prioritization
 //! \brief \ref requirement
-TEST_CASE("Priority nodes take precedence"){
-    for( auto p : utils::concurrency_range() ) {
-        PriorityNodesTakePrecedence::test( static_cast<int>(p) );
-    }
+TEST_CASE("Priority nodes take precedence") {
+    for (auto p : utils::concurrency_range()) { PriorityNodesTakePrecedence::test(static_cast<int>(p)); }
 }
 
 #if !EMSCRIPTEN
 //! Test thread eager reaction
 //! \brief \ref error_guessing
-TEST_CASE("Thread eager reaction"){
-    for( auto p : utils::concurrency_range() ) {
-        ThreadsEagerReaction::test( static_cast<int>(p) );
-    }
+TEST_CASE("Thread eager reaction") {
+    for (auto p : utils::concurrency_range()) { ThreadsEagerReaction::test(static_cast<int>(p)); }
 }
 #endif
 
 //! Test prioritization under concurrency limits
 //! \brief \ref error_guessing
 TEST_CASE("Limiting execution to prioritized work") {
-    for( auto p : utils::concurrency_range() ) {
-        LimitingExecutionToPriorityTask::test( static_cast<int>(p) );
-    }
+    for (auto p : utils::concurrency_range()) { LimitingExecutionToPriorityTask::test(static_cast<int>(p)); }
 }
 
 //! Test nested graphs
@@ -865,29 +821,24 @@ TEST_CASE("Limiting execution to prioritized work") {
 TEST_CASE("Nested test case") {
     std::size_t max_threads = utils::get_platform_max_threads();
     // The stepping for the threads is done inside.
-    NestedCase::test( static_cast<int>(max_threads) );
+    NestedCase::test(static_cast<int>(max_threads));
 }
 
 //! Test bypassed task with higher priority
 //! \brief \ref error_guessing
-TEST_CASE("Bypass prioritized task"){
-    tbb::global_control gc( tbb::global_control::max_allowed_parallelism, 1 );
+TEST_CASE("Bypass prioritized task") {
+    tbb::global_control gc(tbb::global_control::max_allowed_parallelism, 1);
     BypassPrioritizedTask::test();
 }
 
 //! Test mixing prioritized and ordinary successors
 //! \brief \ref error_guessing
 TEST_CASE("Many successors") {
-    for( auto p : utils::concurrency_range() ) {
-        ManySuccessors::test( static_cast<int>(p) );
-    }
+    for (auto p : utils::concurrency_range()) { ManySuccessors::test(static_cast<int>(p)); }
 }
 
 #if TBB_USE_EXCEPTIONS
 //! Test for exceptions
 //! \brief \ref error_guessing
-TEST_CASE("Exceptions") {
-    Exceptions::test();
-}
+TEST_CASE("Exceptions") { Exceptions::test(); }
 #endif
-
diff --git a/external/tbb/test/tbb/test_flow_graph_whitebox.cpp b/external/tbb/test/tbb/test_flow_graph_whitebox.cpp
index 88365d89..85274afb 100644
--- a/external/tbb/test/tbb/test_flow_graph_whitebox.cpp
+++ b/external/tbb/test/tbb/test_flow_graph_whitebox.cpp
@@ -17,11 +17,11 @@
 #include "common/config.h"
 
 #if _MSC_VER
-    #pragma warning (disable: 4503) // Suppress "decorated name length exceeded, name was truncated" warning
-    #if _MSC_VER==1700 && !defined(__INTEL_COMPILER)
-        // Suppress "unreachable code" warning by VC++ 17.0 (VS 2012)
-        #pragma warning (disable: 4702)
-    #endif
+#pragma warning(disable : 4503)// Suppress "decorated name length exceeded, name was truncated" warning
+#if _MSC_VER == 1700 && !defined(__INTEL_COMPILER)
+// Suppress "unreachable code" warning by VC++ 17.0 (VS 2012)
+#pragma warning(disable : 4702)
+#endif
 #endif
 
 // need these to get proper external names for private methods in library.
@@ -36,109 +36,113 @@
 #undef protected
 #undef private
 
+#include "common/graph_utils.h"
+#include "common/spin_barrier.h"
 #include "common/test.h"
 #include "common/utils.h"
-#include "common/spin_barrier.h"
-#include "common/graph_utils.h"
 
-#include <string> // merely prevents LNK2001 error to happen (on ICL+VC9 configurations)
+#include <string>// merely prevents LNK2001 error to happen (on ICL+VC9 configurations)
 
 //! \file test_flow_graph_whitebox.cpp
 //! \brief Test for [flow_graph.broadcast_node flow_graph.priority_queue_node flow_graph.indexer_node flow_graph.sequencer_node flow_graph.remove_edge flow_graph.join_node flow_graph.split_node flow_graph.limiter_node flow_graph.write_once_node flow_graph.overwrite_node flow_graph.make_edge flow_graph.graph flow_graph.buffer_node flow_graph.function_node flow_graph.multifunction_node flow_graph.continue_node flow_graph.input_node] specification
 
-template<typename T>
+template <typename T>
 struct receiverBody {
-    tbb::flow::continue_msg operator()(const T &/*in*/) {
-        return tbb::flow::continue_msg();
-    }
+    tbb::flow::continue_msg operator()(const T& /*in*/) { return tbb::flow::continue_msg(); }
 };
 
 // split_nodes cannot have predecessors
 // they do not reject messages and always forward.
 // they reject edge reversals from successors.
 void TestSplitNode() {
-    typedef tbb::flow::split_node<std::tuple<int> > snode_type;
+    typedef tbb::flow::split_node<std::tuple<int>> snode_type;
     tbb::flow::graph g;
     snode_type snode(g);
-    tbb::flow::function_node<int> rcvr(g,tbb::flow::unlimited, receiverBody<int>());
+    tbb::flow::function_node<int> rcvr(g, tbb::flow::unlimited, receiverBody<int>());
     INFO("Testing split_node\n");
-    CHECK_MESSAGE( (tbb::flow::output_port<0>(snode).my_successors.empty()), "Constructed split_node has successors");
+    CHECK_MESSAGE((tbb::flow::output_port<0>(snode).my_successors.empty()),
+                  "Constructed split_node has successors");
     // tbb::flow::output_port<0>(snode)
     tbb::flow::make_edge(tbb::flow::output_port<0>(snode), rcvr);
-    CHECK_MESSAGE( (!(tbb::flow::output_port<0>(snode).my_successors.empty())), "after make_edge, split_node has no successor.");
+    CHECK_MESSAGE((!(tbb::flow::output_port<0>(snode).my_successors.empty())),
+                  "after make_edge, split_node has no successor.");
     snode.try_put(std::tuple<int>(1));
     g.wait_for_all();
     g.reset();
-    CHECK_MESSAGE( (!(tbb::flow::output_port<0>(snode).my_successors.empty())), "after reset(), split_node has no successor.");
+    CHECK_MESSAGE((!(tbb::flow::output_port<0>(snode).my_successors.empty())),
+                  "after reset(), split_node has no successor.");
     g.reset(tbb::flow::rf_clear_edges);
-    CHECK_MESSAGE( (tbb::flow::output_port<0>(snode).my_successors.empty()), "after reset(rf_clear_edges), split_node has a successor.");
+    CHECK_MESSAGE((tbb::flow::output_port<0>(snode).my_successors.empty()),
+                  "after reset(rf_clear_edges), split_node has a successor.");
 }
 
 // buffering nodes cannot have predecessors
 // they do not reject messages and always save or forward
 // they allow edge reversals from successors
-template< typename B >
-void TestBufferingNode(const char * name) {
+template <typename B>
+void TestBufferingNode(const char* name) {
     tbb::flow::graph g;
     B bnode(g);
-    tbb::flow::function_node<int,int,tbb::flow::rejecting> fnode(g, tbb::flow::serial, serial_fn_body<int>(serial_fn_state0));
+    tbb::flow::function_node<int, int, tbb::flow::rejecting> fnode(g, tbb::flow::serial,
+                                                                   serial_fn_body<int>(serial_fn_state0));
     INFO("Testing " << name << ":");
-    for(int icnt = 0; icnt < 2; icnt++) {
+    for (int icnt = 0; icnt < 2; icnt++) {
         bool reverse_edge = (icnt & 0x2) != 0;
-        serial_fn_state0 = 0;  // reset to waiting state.
+        serial_fn_state0 = 0;// reset to waiting state.
         INFO(" make_edge");
         tbb::flow::make_edge(bnode, fnode);
-        CHECK_MESSAGE( (!bnode.my_successors.empty()), "buffering node has no successor after make_edge");
+        CHECK_MESSAGE((!bnode.my_successors.empty()), "buffering node has no successor after make_edge");
         std::thread t([&] {
             INFO(" try_put");
-            bnode.try_put(1);  // will forward to the fnode
+            bnode.try_put(1);// will forward to the fnode
             g.wait_for_all();
         });
         utils::SpinWaitWhileEq(serial_fn_state0, 0);
-        if(reverse_edge) {
+        if (reverse_edge) {
             INFO(" try_put2");
-            bnode.try_put(2);  // should reverse the edge
+            bnode.try_put(2);// should reverse the edge
             // waiting for the edge to reverse
             utils::SpinWaitWhile([&] { return !bnode.my_successors.empty(); });
+        } else {
+            CHECK_MESSAGE((!bnode.my_successors.empty()),
+                          "buffering node has no successor after forwarding message");
         }
-        else {
-            CHECK_MESSAGE( (!bnode.my_successors.empty()), "buffering node has no successor after forwarding message");
-        }
-        serial_fn_state0 = 0;  // release the function_node.
-        if(reverse_edge) {
+        serial_fn_state0 = 0;// release the function_node.
+        if (reverse_edge) {
             // have to do a second release because the function_node will get the 2nd item
             utils::SpinWaitWhileEq(serial_fn_state0, 0);
-            serial_fn_state0 = 0;  // release the function_node.
+            serial_fn_state0 = 0;// release the function_node.
         }
         t.join();
         INFO(" remove_edge");
         tbb::flow::remove_edge(bnode, fnode);
-        CHECK_MESSAGE( (bnode.my_successors.empty()), "buffering node has a successor after remove_edge");
+        CHECK_MESSAGE((bnode.my_successors.empty()), "buffering node has a successor after remove_edge");
     }
-    tbb::flow::join_node<std::tuple<int,int>,tbb::flow::reserving> jnode(g);
-    tbb::flow::make_edge(bnode, tbb::flow::input_port<0>(jnode));  // will spawn a task
+    tbb::flow::join_node<std::tuple<int, int>, tbb::flow::reserving> jnode(g);
+    tbb::flow::make_edge(bnode, tbb::flow::input_port<0>(jnode));// will spawn a task
     g.wait_for_all();
-    CHECK_MESSAGE( (!bnode.my_successors.empty()), "buffering node has no successor after attaching to join");
+    CHECK_MESSAGE((!bnode.my_successors.empty()), "buffering node has no successor after attaching to join");
     INFO(" reverse");
-    bnode.try_put(1);  // the edge should reverse
+    bnode.try_put(1);// the edge should reverse
     g.wait_for_all();
-    CHECK_MESSAGE( (bnode.my_successors.empty()), "buffering node has a successor after reserving");
+    CHECK_MESSAGE((bnode.my_successors.empty()), "buffering node has a successor after reserving");
     INFO(" reset()");
     g.wait_for_all();
-    g.reset();  // should be in forward direction again
-    CHECK_MESSAGE( (!bnode.my_successors.empty()), "buffering node has no successor after reset()");
+    g.reset();// should be in forward direction again
+    CHECK_MESSAGE((!bnode.my_successors.empty()), "buffering node has no successor after reset()");
     INFO(" remove_edge");
     g.reset(tbb::flow::rf_clear_edges);
-    CHECK_MESSAGE( (bnode.my_successors.empty()), "buffering node has a successor after reset(rf_clear_edges)");
-    tbb::flow::make_edge(bnode, tbb::flow::input_port<0>(jnode));  // add edge again
+    CHECK_MESSAGE((bnode.my_successors.empty()),
+                  "buffering node has a successor after reset(rf_clear_edges)");
+    tbb::flow::make_edge(bnode, tbb::flow::input_port<0>(jnode));// add edge again
     // reverse edge by adding to buffer.
-    bnode.try_put(1);  // the edge should reverse
+    bnode.try_put(1);// the edge should reverse
     g.wait_for_all();
-    CHECK_MESSAGE( (bnode.my_successors.empty()), "buffering node has a successor after reserving");
+    CHECK_MESSAGE((bnode.my_successors.empty()), "buffering node has a successor after reserving");
     INFO(" remove_edge(reversed)");
     g.reset(tbb::flow::rf_clear_edges);
-    CHECK_MESSAGE( (bnode.my_successors.empty()), "buffering node has no successor after reset()");
-    CHECK_MESSAGE( (tbb::flow::input_port<0>(jnode).my_predecessors.empty()), "predecessor not reset");
+    CHECK_MESSAGE((bnode.my_successors.empty()), "buffering node has no successor after reset()");
+    CHECK_MESSAGE((tbb::flow::input_port<0>(jnode).my_predecessors.empty()), "predecessor not reset");
     INFO("  done\n");
     g.wait_for_all();
 }
@@ -155,76 +159,83 @@ void TestContinueNode() {
     tbb::flow::make_edge(fnode0, cnode);
     tbb::flow::make_edge(cnode, fnode1);
     INFO("Testing continue_node:");
-    for( int icnt = 0; icnt < 2; ++icnt ) {
-        INFO( " initial" << icnt);
-        CHECK_MESSAGE( (cnode.my_predecessor_count == 2), "predecessor addition didn't increment count");
-        CHECK_MESSAGE( (!cnode.successors().empty()), "successors empty though we added one");
-        CHECK_MESSAGE( (cnode.my_current_count == 0), "state of continue_receiver incorrect");
+    for (int icnt = 0; icnt < 2; ++icnt) {
+        INFO(" initial" << icnt);
+        CHECK_MESSAGE((cnode.my_predecessor_count == 2), "predecessor addition didn't increment count");
+        CHECK_MESSAGE((!cnode.successors().empty()), "successors empty though we added one");
+        CHECK_MESSAGE((cnode.my_current_count == 0), "state of continue_receiver incorrect");
         serial_continue_state0 = 0;
         serial_fn_state0 = 0;
         serial_fn_state1 = 0;
 
         std::thread t([&] {
-            fnode0.try_put(1);  // start the first function node.
-            if(icnt == 0) {  // first time through, let the continue_node fire
+            fnode0.try_put(1);// start the first function node.
+            if (icnt == 0) {  // first time through, let the continue_node fire
                 INFO(" firing");
-                fnode0.try_put(1);  // second message
+                fnode0.try_put(1);// second message
                 g.wait_for_all();
 
                 // try a try_get()
                 {
                     int i;
-                    CHECK_MESSAGE( (!cnode.try_get(i)), "try_get not rejected");
+                    CHECK_MESSAGE((!cnode.try_get(i)), "try_get not rejected");
                 }
 
                 INFO(" reset");
-                CHECK_MESSAGE( (!cnode.my_successors.empty()), "Empty successors in built graph (before reset)");
-                CHECK_MESSAGE( (cnode.my_predecessor_count == 2), "predecessor_count reset (before reset)");
-                g.reset();  // should still be the same
-                CHECK_MESSAGE( (!cnode.my_successors.empty()), "Empty successors in built graph (after reset)" );
-                CHECK_MESSAGE( (cnode.my_predecessor_count == 2), "predecessor_count reset (after reset)");
-            }
-            else {  // we're going to see if the rf_clear_edges resets things.
+                CHECK_MESSAGE((!cnode.my_successors.empty()),
+                              "Empty successors in built graph (before reset)");
+                CHECK_MESSAGE((cnode.my_predecessor_count == 2), "predecessor_count reset (before reset)");
+                g.reset();// should still be the same
+                CHECK_MESSAGE((!cnode.my_successors.empty()),
+                              "Empty successors in built graph (after reset)");
+                CHECK_MESSAGE((cnode.my_predecessor_count == 2), "predecessor_count reset (after reset)");
+            } else {// we're going to see if the rf_clear_edges resets things.
                 g.wait_for_all();
                 INFO(" reset(rf_clear_edges)");
-                CHECK_MESSAGE( (!cnode.my_successors.empty()), "Empty successors in built graph (before reset)" );
-                CHECK_MESSAGE( (cnode.my_predecessor_count == 2), "predecessor_count reset (before reset)" );
-                g.reset(tbb::flow::rf_clear_edges);  // should be in forward direction again
-                CHECK_MESSAGE( (cnode.my_current_count == 0), "state of continue_receiver incorrect after reset(rf_clear_edges)" );
-                CHECK_MESSAGE( (cnode.my_successors.empty()), "buffering node has a successor after reset(rf_clear_edges)" );
-                CHECK_MESSAGE( (cnode.my_predecessor_count == cnode.my_initial_predecessor_count), "predecessor count not reset" );
+                CHECK_MESSAGE((!cnode.my_successors.empty()),
+                              "Empty successors in built graph (before reset)");
+                CHECK_MESSAGE((cnode.my_predecessor_count == 2), "predecessor_count reset (before reset)");
+                g.reset(tbb::flow::rf_clear_edges);// should be in forward direction again
+                CHECK_MESSAGE((cnode.my_current_count == 0),
+                              "state of continue_receiver incorrect after reset(rf_clear_edges)");
+                CHECK_MESSAGE((cnode.my_successors.empty()),
+                              "buffering node has a successor after reset(rf_clear_edges)");
+                CHECK_MESSAGE((cnode.my_predecessor_count == cnode.my_initial_predecessor_count),
+                              "predecessor count not reset");
             }
         });
 
-        utils::SpinWaitWhileEq(serial_fn_state0, 0); // waiting for the first message to arrive in function_node
+        utils::SpinWaitWhileEq(serial_fn_state0,
+                               0);// waiting for the first message to arrive in function_node
         // Now the body of function_node 0 is executing.
-        serial_fn_state0 = 0;  // release the node
+        serial_fn_state0 = 0;// release the node
         if (icnt == 0) {
             // wait for node to count the message (or for the node body to execute, which would be wrong)
             utils::SpinWaitWhile([&] {
                 tbb::spin_mutex::scoped_lock l(cnode.my_mutex);
                 return serial_continue_state0 == 0 && cnode.my_current_count == 0;
             });
-            CHECK_MESSAGE( (serial_continue_state0 == 0), "Improperly released continue_node");
-            CHECK_MESSAGE( (cnode.my_current_count == 1), "state of continue_receiver incorrect");
+            CHECK_MESSAGE((serial_continue_state0 == 0), "Improperly released continue_node");
+            CHECK_MESSAGE((cnode.my_current_count == 1), "state of continue_receiver incorrect");
 
-            utils::SpinWaitWhileEq(serial_fn_state0, 0); // waiting for the second message to arrive in function_node
+            utils::SpinWaitWhileEq(serial_fn_state0,
+                                   0);// waiting for the second message to arrive in function_node
             // Now the body of function_node 0 is executing.
-            serial_fn_state0 = 0;  // release the node
+            serial_fn_state0 = 0;// release the node
 
-            utils::SpinWaitWhileEq(serial_continue_state0, 0); // waiting for continue_node to start
-            CHECK_MESSAGE( (cnode.my_current_count == 0), " my_current_count not reset before body of continue_node started");
-            serial_continue_state0 = 0;  // release the continue_node
+            utils::SpinWaitWhileEq(serial_continue_state0, 0);// waiting for continue_node to start
+            CHECK_MESSAGE((cnode.my_current_count == 0),
+                          " my_current_count not reset before body of continue_node started");
+            serial_continue_state0 = 0;// release the continue_node
 
-            utils::SpinWaitWhileEq(serial_fn_state1, 0); // wait for the successor function_node to enter body
-            serial_fn_state1 = 0;  // release successor function_node.
+            utils::SpinWaitWhileEq(serial_fn_state1, 0);// wait for the successor function_node to enter body
+            serial_fn_state1 = 0;                       // release successor function_node.
         }
 
         t.join();
     }
 
     INFO(" done\n");
-
 }
 
 // function_node has predecessors and successors
@@ -234,59 +245,61 @@ void TestContinueNode() {
 void TestFunctionNode() {
     tbb::flow::graph g;
     tbb::flow::queue_node<int> qnode0(g);
-    tbb::flow::function_node<int,int,   tbb::flow::rejecting > fnode0(g, tbb::flow::serial, serial_fn_body<int>(serial_fn_state0));
-    tbb::flow::function_node<int,int/*, tbb::flow::queueing*/> fnode1(g, tbb::flow::serial, serial_fn_body<int>(serial_fn_state0));
+    tbb::flow::function_node<int, int, tbb::flow::rejecting> fnode0(g, tbb::flow::serial,
+                                                                    serial_fn_body<int>(serial_fn_state0));
+    tbb::flow::function_node<int, int /*, tbb::flow::queueing*/> fnode1(
+            g, tbb::flow::serial, serial_fn_body<int>(serial_fn_state0));
 
     tbb::flow::queue_node<int> qnode1(g);
 
     tbb::flow::make_edge(fnode0, qnode1);
     tbb::flow::make_edge(qnode0, fnode0);
 
-    serial_fn_state0 = 2;  // just let it go
+    serial_fn_state0 = 2;// just let it go
     qnode0.try_put(1);
     g.wait_for_all();
     int ii;
-    CHECK_MESSAGE( (qnode1.try_get(ii) && ii == 1), "output not passed" );
+    CHECK_MESSAGE((qnode1.try_get(ii) && ii == 1), "output not passed");
     tbb::flow::remove_edge(qnode0, fnode0);
     tbb::flow::remove_edge(fnode0, qnode1);
 
     tbb::flow::make_edge(fnode1, qnode1);
     tbb::flow::make_edge(qnode0, fnode1);
 
-    serial_fn_state0 = 2;  // just let it go
+    serial_fn_state0 = 2;// just let it go
     qnode0.try_put(1);
     g.wait_for_all();
-    CHECK_MESSAGE( (qnode1.try_get(ii) && ii == 1), "output not passed" );
+    CHECK_MESSAGE((qnode1.try_get(ii) && ii == 1), "output not passed");
     tbb::flow::remove_edge(qnode0, fnode1);
     tbb::flow::remove_edge(fnode1, qnode1);
 
     // rejecting
     serial_fn_state0 = 0;
-    std::atomic<bool> rejected{ false };
+    std::atomic<bool> rejected {false};
     std::thread t([&] {
-        g.reset(); // attach to the current arena
+        g.reset();// attach to the current arena
         tbb::flow::make_edge(fnode0, qnode1);
-        tbb::flow::make_edge(qnode0, fnode0); // TODO: invesigate why it always creates a forwarding task
+        tbb::flow::make_edge(qnode0, fnode0);// TODO: invesigate why it always creates a forwarding task
         INFO("Testing rejecting function_node:");
-        CHECK_MESSAGE( (!fnode0.my_queue), "node should have no queue");
-        CHECK_MESSAGE( (!fnode0.my_successors.empty()), "successor edge not added");
+        CHECK_MESSAGE((!fnode0.my_queue), "node should have no queue");
+        CHECK_MESSAGE((!fnode0.my_successors.empty()), "successor edge not added");
         qnode0.try_put(1);
-        qnode0.try_put(2);   // rejecting node should reject, reverse.
+        qnode0.try_put(2);// rejecting node should reject, reverse.
         rejected = true;
         g.wait_for_all();
     });
-    utils::SpinWaitWhileEq(serial_fn_state0, 0); // waiting rejecting node to start
+    utils::SpinWaitWhileEq(serial_fn_state0, 0);// waiting rejecting node to start
     utils::SpinWaitWhileEq(rejected, false);
     // TODO: the assest below is not stable due to the logical race between try_put(1)
     // try_put(2) and wait_for_all.
     // Additionally, empty() cannot be called concurrently due to null_mutex used in implementation
     // CHECK(fnode0.my_predecessors.empty() == false);
-    serial_fn_state0 = 2;   // release function_node body.
+    serial_fn_state0 = 2;// release function_node body.
     t.join();
     INFO(" reset");
-    g.reset();  // should reverse the edge from the input to the function node.
-    CHECK_MESSAGE( (!qnode0.my_successors.empty()), "empty successors after reset()");
-    CHECK_MESSAGE( (fnode0.my_predecessors.empty()), "predecessor not reversed");
+    g.reset();// should reverse the edge from the input to the function node.
+    CHECK_MESSAGE((!qnode0.my_successors.empty()), "empty successors after reset()");
+    CHECK_MESSAGE((fnode0.my_predecessors.empty()), "predecessor not reversed");
     tbb::flow::remove_edge(qnode0, fnode0);
     tbb::flow::remove_edge(fnode0, qnode1);
     INFO("\n");
@@ -294,36 +307,36 @@ void TestFunctionNode() {
     // queueing
     tbb::flow::make_edge(fnode1, qnode1);
     INFO("Testing queueing function_node:");
-    CHECK_MESSAGE( (fnode1.my_queue), "node should have no queue");
-    CHECK_MESSAGE( (!fnode1.my_successors.empty()), "successor edge not added");
+    CHECK_MESSAGE((fnode1.my_queue), "node should have no queue");
+    CHECK_MESSAGE((!fnode1.my_successors.empty()), "successor edge not added");
     INFO(" add_pred");
-    CHECK_MESSAGE( (fnode1.register_predecessor(qnode0)), "Cannot register as predecessor");
-    CHECK_MESSAGE( (!fnode1.my_predecessors.empty()), "Missing predecessor");
+    CHECK_MESSAGE((fnode1.register_predecessor(qnode0)), "Cannot register as predecessor");
+    CHECK_MESSAGE((!fnode1.my_predecessors.empty()), "Missing predecessor");
     INFO(" reset");
     g.wait_for_all();
-    g.reset();  // should reverse the edge from the input to the function node.
-    CHECK_MESSAGE( (!qnode0.my_successors.empty()), "empty successors after reset()");
-    CHECK_MESSAGE( (fnode1.my_predecessors.empty()), "predecessor not reversed");
+    g.reset();// should reverse the edge from the input to the function node.
+    CHECK_MESSAGE((!qnode0.my_successors.empty()), "empty successors after reset()");
+    CHECK_MESSAGE((fnode1.my_predecessors.empty()), "predecessor not reversed");
     tbb::flow::remove_edge(qnode0, fnode1);
     tbb::flow::remove_edge(fnode1, qnode1);
     INFO("\n");
 
-    serial_fn_state0 = 0;  // make the function_node wait
+    serial_fn_state0 = 0;// make the function_node wait
     rejected = false;
     std::thread t2([&] {
-        g.reset(); // attach to the current arena
+        g.reset();// attach to the current arena
 
-        tbb::flow::make_edge(qnode0, fnode0); // TODO: invesigate why it always creates a forwarding task
+        tbb::flow::make_edge(qnode0, fnode0);// TODO: invesigate why it always creates a forwarding task
 
         INFO(" start_func");
         qnode0.try_put(1);
         // now if we put an item to the queues the edges to the function_node will reverse.
         INFO(" put_node(2)");
-        qnode0.try_put(2);   // start queue node.
+        qnode0.try_put(2);// start queue node.
         rejected = true;
         g.wait_for_all();
     });
-    utils::SpinWaitWhileEq(serial_fn_state0, 0); // waiting rejecting node to start
+    utils::SpinWaitWhileEq(serial_fn_state0, 0);// waiting rejecting node to start
     // wait for the edges to reverse
     utils::SpinWaitWhileEq(rejected, false);
     // TODO: the assest below is not stable due to the logical race between try_put(1)
@@ -335,63 +348,59 @@ void TestFunctionNode() {
     serial_fn_state0 = 2;
     t2.join();
     g.reset(tbb::flow::rf_clear_edges);
-    CHECK_MESSAGE( (fnode0.my_predecessors.empty() && qnode0.my_successors.empty()), "function_node edge not removed");
-    CHECK_MESSAGE( (fnode0.my_successors.empty()), "successor to fnode not removed");
+    CHECK_MESSAGE((fnode0.my_predecessors.empty() && qnode0.my_successors.empty()),
+                  "function_node edge not removed");
+    CHECK_MESSAGE((fnode0.my_successors.empty()), "successor to fnode not removed");
     INFO(" done\n");
 }
 
-template<typename TT>
+template <typename TT>
 class tag_func {
     TT my_mult;
+
 public:
-    tag_func(TT multiplier) : my_mult(multiplier) { }
+    tag_func(TT multiplier) : my_mult(multiplier) {}
     // operator() will return [0 .. Count)
-    tbb::flow::tag_value operator()( TT v) {
+    tbb::flow::tag_value operator()(TT v) {
         tbb::flow::tag_value t = tbb::flow::tag_value(v / my_mult);
         return t;
     }
 };
 
-template<typename JNODE_TYPE>
-void
-TestSimpleSuccessorArc(const char *name) {
+template <typename JNODE_TYPE>
+void TestSimpleSuccessorArc(const char* name) {
     tbb::flow::graph g;
     {
         INFO("Join<" << name << "> successor test ");
         tbb::flow::join_node<std::tuple<int>, JNODE_TYPE> qj(g);
-        tbb::flow::broadcast_node<std::tuple<int> > bnode(g);
+        tbb::flow::broadcast_node<std::tuple<int>> bnode(g);
         tbb::flow::make_edge(qj, bnode);
-        CHECK_MESSAGE( (!qj.my_successors.empty()),"successor missing after linking");
+        CHECK_MESSAGE((!qj.my_successors.empty()), "successor missing after linking");
         g.reset();
-        CHECK_MESSAGE( (!qj.my_successors.empty()),"successor missing after reset()");
+        CHECK_MESSAGE((!qj.my_successors.empty()), "successor missing after reset()");
         g.reset(tbb::flow::rf_clear_edges);
-        CHECK_MESSAGE( (qj.my_successors.empty()), "successors not removed after reset(rf_clear_edges)");
+        CHECK_MESSAGE((qj.my_successors.empty()), "successors not removed after reset(rf_clear_edges)");
     }
 }
 
-template<>
-void
-TestSimpleSuccessorArc<tbb::flow::tag_matching>(const char *name) {
+template <>
+void TestSimpleSuccessorArc<tbb::flow::tag_matching>(const char* name) {
     tbb::flow::graph g;
     {
         INFO("Join<" << name << "> successor test ");
-        typedef std::tuple<int,int> my_tuple;
-        tbb::flow::join_node<my_tuple, tbb::flow::tag_matching> qj(g,
-                                                                   tag_func<int>(1),
-                                                                   tag_func<int>(1)
-        );
-        tbb::flow::broadcast_node<my_tuple > bnode(g);
+        typedef std::tuple<int, int> my_tuple;
+        tbb::flow::join_node<my_tuple, tbb::flow::tag_matching> qj(g, tag_func<int>(1), tag_func<int>(1));
+        tbb::flow::broadcast_node<my_tuple> bnode(g);
         tbb::flow::make_edge(qj, bnode);
-        CHECK_MESSAGE( (!qj.my_successors.empty()),"successor missing after linking");
+        CHECK_MESSAGE((!qj.my_successors.empty()), "successor missing after linking");
         g.reset();
-        CHECK_MESSAGE( (!qj.my_successors.empty()),"successor missing after reset()");
+        CHECK_MESSAGE((!qj.my_successors.empty()), "successor missing after reset()");
         g.reset(tbb::flow::rf_clear_edges);
-        CHECK_MESSAGE( (qj.my_successors.empty()), "successors not removed after reset(rf_clear_edges)");
+        CHECK_MESSAGE((qj.my_successors.empty()), "successors not removed after reset(rf_clear_edges)");
     }
 }
 
-void
-TestJoinNode() {
+void TestJoinNode() {
     tbb::flow::graph g;
 
     TestSimpleSuccessorArc<tbb::flow::queueing>("queueing");
@@ -401,35 +410,44 @@ TestJoinNode() {
     // queueing and tagging join nodes have input queues, so the input ports do not reverse.
     INFO(" reserving preds");
     {
-        tbb::flow::join_node<std::tuple<int,int>, tbb::flow::reserving> rj(g);
+        tbb::flow::join_node<std::tuple<int, int>, tbb::flow::reserving> rj(g);
         tbb::flow::queue_node<int> q0(g);
         tbb::flow::queue_node<int> q1(g);
-        tbb::flow::make_edge(q0,tbb::flow::input_port<0>(rj));
-        tbb::flow::make_edge(q1,tbb::flow::input_port<1>(rj));
+        tbb::flow::make_edge(q0, tbb::flow::input_port<0>(rj));
+        tbb::flow::make_edge(q1, tbb::flow::input_port<1>(rj));
         q0.try_put(1);
-        g.wait_for_all();  // quiesce
-        CHECK_MESSAGE( (!(tbb::flow::input_port<0>(rj).my_predecessors.empty())),"reversed port missing predecessor");
-        CHECK_MESSAGE( ((tbb::flow::input_port<1>(rj).my_predecessors.empty())),"non-reversed port has pred");
+        g.wait_for_all();// quiesce
+        CHECK_MESSAGE((!(tbb::flow::input_port<0>(rj).my_predecessors.empty())),
+                      "reversed port missing predecessor");
+        CHECK_MESSAGE(((tbb::flow::input_port<1>(rj).my_predecessors.empty())), "non-reversed port has pred");
         g.reset();
-        CHECK_MESSAGE( ((tbb::flow::input_port<0>(rj).my_predecessors.empty())),"reversed port has pred after reset()");
-        CHECK_MESSAGE( ((tbb::flow::input_port<1>(rj).my_predecessors.empty())),"non-reversed port has pred after reset()");
+        CHECK_MESSAGE(((tbb::flow::input_port<0>(rj).my_predecessors.empty())),
+                      "reversed port has pred after reset()");
+        CHECK_MESSAGE(((tbb::flow::input_port<1>(rj).my_predecessors.empty())),
+                      "non-reversed port has pred after reset()");
         q1.try_put(2);
-        g.wait_for_all();  // quiesce
-        CHECK_MESSAGE( (!(tbb::flow::input_port<1>(rj).my_predecessors.empty())),"reversed port missing predecessor");
-        CHECK_MESSAGE( ((tbb::flow::input_port<0>(rj).my_predecessors.empty())),"non-reversed port has pred");
+        g.wait_for_all();// quiesce
+        CHECK_MESSAGE((!(tbb::flow::input_port<1>(rj).my_predecessors.empty())),
+                      "reversed port missing predecessor");
+        CHECK_MESSAGE(((tbb::flow::input_port<0>(rj).my_predecessors.empty())), "non-reversed port has pred");
         g.reset();
-        CHECK_MESSAGE( ((tbb::flow::input_port<1>(rj).my_predecessors.empty())),"reversed port has pred after reset()");
-        CHECK_MESSAGE( ((tbb::flow::input_port<0>(rj).my_predecessors.empty())),"non-reversed port has pred after reset()");
+        CHECK_MESSAGE(((tbb::flow::input_port<1>(rj).my_predecessors.empty())),
+                      "reversed port has pred after reset()");
+        CHECK_MESSAGE(((tbb::flow::input_port<0>(rj).my_predecessors.empty())),
+                      "non-reversed port has pred after reset()");
         // should reset predecessors just as regular reset.
         q1.try_put(3);
-        g.wait_for_all();  // quiesce
-        CHECK_MESSAGE( (!(tbb::flow::input_port<1>(rj).my_predecessors.empty())),"reversed port missing predecessor");
-        CHECK_MESSAGE( ((tbb::flow::input_port<0>(rj).my_predecessors.empty())),"non-reversed port has pred");
+        g.wait_for_all();// quiesce
+        CHECK_MESSAGE((!(tbb::flow::input_port<1>(rj).my_predecessors.empty())),
+                      "reversed port missing predecessor");
+        CHECK_MESSAGE(((tbb::flow::input_port<0>(rj).my_predecessors.empty())), "non-reversed port has pred");
         g.reset(tbb::flow::rf_clear_edges);
-        CHECK_MESSAGE( ((tbb::flow::input_port<1>(rj).my_predecessors.empty())),"reversed port has pred after reset()");
-        CHECK_MESSAGE( ((tbb::flow::input_port<0>(rj).my_predecessors.empty())),"non-reversed port has pred after reset()");
-        CHECK_MESSAGE( (q0.my_successors.empty()), "edge not removed by reset(rf_clear_edges)");
-        CHECK_MESSAGE( (q1.my_successors.empty()), "edge not removed by reset(rf_clear_edges)");
+        CHECK_MESSAGE(((tbb::flow::input_port<1>(rj).my_predecessors.empty())),
+                      "reversed port has pred after reset()");
+        CHECK_MESSAGE(((tbb::flow::input_port<0>(rj).my_predecessors.empty())),
+                      "non-reversed port has pred after reset()");
+        CHECK_MESSAGE((q0.my_successors.empty()), "edge not removed by reset(rf_clear_edges)");
+        CHECK_MESSAGE((q1.my_successors.empty()), "edge not removed by reset(rf_clear_edges)");
     }
     INFO(" done\n");
 }
@@ -450,9 +468,7 @@ template <typename DType>
 struct DecrementerHelper {
     template <typename Decrementer>
     static void check(Decrementer&) {}
-    static DType makeDType() {
-        return DType(1);
-    }
+    static DType makeDType() { return DType(1); }
 };
 
 template <>
@@ -464,127 +480,124 @@ struct DecrementerHelper<tbb::flow::continue_msg> {
         CHECK_MESSAGE(d.my_initial_predecessor_count == 0, "error in initial pred count");
         CHECK_MESSAGE(d.my_current_count == 0, "error in current count");
     }
-    static tbb::flow::continue_msg makeDType() {
-        return tbb::flow::continue_msg();
-    }
+    static tbb::flow::continue_msg makeDType() { return tbb::flow::continue_msg(); }
 };
 
 template <typename DecrementerType>
 void TestLimiterNode() {
-    int out_int{};
+    int out_int {};
     tbb::flow::graph g;
     using dtype = typename limiter_node_type<DecrementerType>::dtype;
-    typename limiter_node_type<DecrementerType>::type ln(g,1);
+    typename limiter_node_type<DecrementerType>::type ln(g, 1);
     INFO("Testing limiter_node: preds and succs");
     DecrementerHelper<dtype>::check(ln.decrementer());
-    CHECK_MESSAGE( (ln.my_threshold == 1), "error in my_threshold");
+    CHECK_MESSAGE((ln.my_threshold == 1), "error in my_threshold");
     tbb::flow::queue_node<int> inq(g);
     tbb::flow::queue_node<int> outq(g);
     tbb::flow::broadcast_node<dtype> bn(g);
 
-    tbb::flow::make_edge(inq,ln);
-    tbb::flow::make_edge(ln,outq);
-    tbb::flow::make_edge(bn,ln.decrementer());
+    tbb::flow::make_edge(inq, ln);
+    tbb::flow::make_edge(ln, outq);
+    tbb::flow::make_edge(bn, ln.decrementer());
 
     g.wait_for_all();
-    CHECK_MESSAGE( (!(ln.my_successors.empty())),"successors empty after make_edge");
-    CHECK_MESSAGE( (ln.my_predecessors.empty()), "input edge reversed");
+    CHECK_MESSAGE((!(ln.my_successors.empty())), "successors empty after make_edge");
+    CHECK_MESSAGE((ln.my_predecessors.empty()), "input edge reversed");
     inq.try_put(1);
     g.wait_for_all();
-    CHECK_MESSAGE( (outq.try_get(out_int) && out_int == 1), "limiter_node didn't pass first value");
-    CHECK_MESSAGE( (ln.my_predecessors.empty()), "input edge reversed");
+    CHECK_MESSAGE((outq.try_get(out_int) && out_int == 1), "limiter_node didn't pass first value");
+    CHECK_MESSAGE((ln.my_predecessors.empty()), "input edge reversed");
     inq.try_put(2);
     g.wait_for_all();
-    CHECK_MESSAGE( (!outq.try_get(out_int)), "limiter_node incorrectly passed second input");
-    CHECK_MESSAGE( (!ln.my_predecessors.empty()), "input edge to limiter_node not reversed");
+    CHECK_MESSAGE((!outq.try_get(out_int)), "limiter_node incorrectly passed second input");
+    CHECK_MESSAGE((!ln.my_predecessors.empty()), "input edge to limiter_node not reversed");
     bn.try_put(DecrementerHelper<dtype>::makeDType());
     g.wait_for_all();
-    CHECK_MESSAGE( (outq.try_get(out_int) && out_int == 2), "limiter_node didn't pass second value");
+    CHECK_MESSAGE((outq.try_get(out_int) && out_int == 2), "limiter_node didn't pass second value");
     g.wait_for_all();
-    CHECK_MESSAGE( (!ln.my_predecessors.empty()), "input edge was reversed(after try_get())");
+    CHECK_MESSAGE((!ln.my_predecessors.empty()), "input edge was reversed(after try_get())");
     g.reset();
-    CHECK_MESSAGE( (ln.my_predecessors.empty()), "input edge not reset");
+    CHECK_MESSAGE((ln.my_predecessors.empty()), "input edge not reset");
     inq.try_put(3);
     g.wait_for_all();
-    CHECK_MESSAGE( (outq.try_get(out_int) && out_int == 3), "limiter_node didn't pass third value");
+    CHECK_MESSAGE((outq.try_get(out_int) && out_int == 3), "limiter_node didn't pass third value");
 
     INFO(" rf_clear_edges");
     // currently the limiter_node will not pass another message
     g.reset(tbb::flow::rf_clear_edges);
     DecrementerHelper<dtype>::check(ln.decrementer());
-    CHECK_MESSAGE( (ln.my_threshold == 1), "error in my_threshold");
-    CHECK_MESSAGE( (ln.my_predecessors.empty()), "preds not reset(rf_clear_edges)");
-    CHECK_MESSAGE( (ln.my_successors.empty()), "preds not reset(rf_clear_edges)");
-    CHECK_MESSAGE( (inq.my_successors.empty()), "Arc not removed on reset(rf_clear_edges)");
-    CHECK_MESSAGE( (inq.my_successors.empty()), "Arc not removed on reset(rf_clear_edges)");
-    CHECK_MESSAGE( (bn.my_successors.empty()), "control edge not removed on reset(rf_clear_edges)");
-    tbb::flow::make_edge(inq,ln);
-    tbb::flow::make_edge(ln,outq);
+    CHECK_MESSAGE((ln.my_threshold == 1), "error in my_threshold");
+    CHECK_MESSAGE((ln.my_predecessors.empty()), "preds not reset(rf_clear_edges)");
+    CHECK_MESSAGE((ln.my_successors.empty()), "preds not reset(rf_clear_edges)");
+    CHECK_MESSAGE((inq.my_successors.empty()), "Arc not removed on reset(rf_clear_edges)");
+    CHECK_MESSAGE((inq.my_successors.empty()), "Arc not removed on reset(rf_clear_edges)");
+    CHECK_MESSAGE((bn.my_successors.empty()), "control edge not removed on reset(rf_clear_edges)");
+    tbb::flow::make_edge(inq, ln);
+    tbb::flow::make_edge(ln, outq);
     inq.try_put(4);
     inq.try_put(5);
     g.wait_for_all();
-    CHECK_MESSAGE( (outq.try_get(out_int)),"missing output after reset(rf_clear_edges)");
-    CHECK_MESSAGE( (out_int == 4), "input incorrect (4)");
+    CHECK_MESSAGE((outq.try_get(out_int)), "missing output after reset(rf_clear_edges)");
+    CHECK_MESSAGE((out_int == 4), "input incorrect (4)");
     bn.try_put(DecrementerHelper<dtype>::makeDType());
     g.wait_for_all();
-    CHECK_MESSAGE( (!outq.try_get(out_int)),"second output incorrectly passed (rf_clear_edges)");
+    CHECK_MESSAGE((!outq.try_get(out_int)), "second output incorrectly passed (rf_clear_edges)");
     INFO(" done\n");
 }
 
-template<typename MF_TYPE>
+template <typename MF_TYPE>
 struct mf_body {
     std::atomic<int>& my_flag;
-    mf_body(std::atomic<int>& flag) : my_flag(flag) { }
+    mf_body(std::atomic<int>& flag) : my_flag(flag) {}
     void operator()(const int& in, typename MF_TYPE::output_ports_type& outports) {
-        if(my_flag == 0) {
+        if (my_flag == 0) {
             my_flag = 1;
 
             utils::SpinWaitWhileEq(my_flag, 1);
         }
 
-        if (in & 0x1)
-            std::get<1>(outports).try_put(in);
+        if (in & 0x1) std::get<1>(outports).try_put(in);
         else
             std::get<0>(outports).try_put(in);
     }
 };
 
-template<typename P, typename T>
+template <typename P, typename T>
 struct test_reversal;
-template<typename T>
+template <typename T>
 struct test_reversal<tbb::flow::queueing, T> {
     test_reversal() { INFO("<queueing>"); }
     // queueing node will not reverse.
     bool operator()(T& node) const { return node.my_predecessors.empty(); }
 };
 
-template<typename T>
+template <typename T>
 struct test_reversal<tbb::flow::rejecting, T> {
     test_reversal() { INFO("<rejecting>"); }
     bool operator()(T& node) const { return !node.my_predecessors.empty(); }
 };
 
-template<typename P>
+template <typename P>
 void TestMultifunctionNode() {
     typedef tbb::flow::multifunction_node<int, std::tuple<int, int>, P> multinode_type;
     INFO("Testing multifunction_node");
-    test_reversal<P,multinode_type> my_test;
+    test_reversal<P, multinode_type> my_test;
     INFO(":");
     tbb::flow::graph g;
     multinode_type mf(g, tbb::flow::serial, mf_body<multinode_type>(serial_fn_state0));
     tbb::flow::queue_node<int> qin(g);
     tbb::flow::queue_node<int> qodd_out(g);
     tbb::flow::queue_node<int> qeven_out(g);
-    tbb::flow::make_edge(qin,mf);
+    tbb::flow::make_edge(qin, mf);
     tbb::flow::make_edge(tbb::flow::output_port<0>(mf), qeven_out);
     tbb::flow::make_edge(tbb::flow::output_port<1>(mf), qodd_out);
     g.wait_for_all();
-    for (int ii = 0; ii < 2 ; ++ii) {
-        std::atomic<bool> submitted{ false };
+    for (int ii = 0; ii < 2; ++ii) {
+        std::atomic<bool> submitted {false};
         serial_fn_state0 = 0;
         /* if(ii == 0) REMARK(" reset preds"); else REMARK(" 2nd");*/
         std::thread t([&] {
-            g.reset(); // attach to the current arena
+            g.reset();// attach to the current arena
             qin.try_put(0);
             qin.try_put(1);
             submitted = true;
@@ -601,62 +614,60 @@ void TestMultifunctionNode() {
         if (!std::is_same<P, tbb::flow::rejecting>::value) {
             CHECK_MESSAGE((my_test(mf)), "fail cancel group test");
         }
-        if( ii == 1) {
+        if (ii == 1) {
             INFO(" rf_clear_edges");
             g.reset(tbb::flow::rf_clear_edges);
-            CHECK_MESSAGE( (tbb::flow::output_port<0>(mf).my_successors.empty()), "output_port<0> not reset (rf_clear_edges)");
-            CHECK_MESSAGE( (tbb::flow::output_port<1>(mf).my_successors.empty()), "output_port<1> not reset (rf_clear_edges)");
-        }
-        else
-        {
+            CHECK_MESSAGE((tbb::flow::output_port<0>(mf).my_successors.empty()),
+                          "output_port<0> not reset (rf_clear_edges)");
+            CHECK_MESSAGE((tbb::flow::output_port<1>(mf).my_successors.empty()),
+                          "output_port<1> not reset (rf_clear_edges)");
+        } else {
             g.reset();
         }
-        CHECK_MESSAGE( (mf.my_predecessors.empty()), "edge didn't reset");
-        CHECK_MESSAGE( ((ii == 0 && !qin.my_successors.empty()) || (ii == 1 && qin.my_successors.empty())), "edge didn't reset");
+        CHECK_MESSAGE((mf.my_predecessors.empty()), "edge didn't reset");
+        CHECK_MESSAGE(((ii == 0 && !qin.my_successors.empty()) || (ii == 1 && qin.my_successors.empty())),
+                      "edge didn't reset");
     }
     INFO(" done\n");
 }
 
 // indexer_node is like a broadcast_node, in that none of its inputs reverse, and it
 // never allows a successor to reverse its edge, so we only need test the successors.
-void
-TestIndexerNode() {
+void TestIndexerNode() {
     tbb::flow::graph g;
-    typedef tbb::flow::indexer_node< int, int > indexernode_type;
+    typedef tbb::flow::indexer_node<int, int> indexernode_type;
     indexernode_type inode(g);
     INFO("Testing indexer_node:");
     tbb::flow::queue_node<indexernode_type::output_type> qout(g);
-    tbb::flow::make_edge(inode,qout);
+    tbb::flow::make_edge(inode, qout);
     g.wait_for_all();
-    CHECK_MESSAGE( (!inode.my_successors.empty()), "successor of indexer_node missing");
+    CHECK_MESSAGE((!inode.my_successors.empty()), "successor of indexer_node missing");
     g.reset();
-    CHECK_MESSAGE( (!inode.my_successors.empty()), "successor of indexer_node missing after reset");
+    CHECK_MESSAGE((!inode.my_successors.empty()), "successor of indexer_node missing after reset");
     g.reset(tbb::flow::rf_clear_edges);
-    CHECK_MESSAGE( (inode.my_successors.empty()), "successor of indexer_node not removed by reset(rf_clear_edges)");
+    CHECK_MESSAGE((inode.my_successors.empty()),
+                  "successor of indexer_node not removed by reset(rf_clear_edges)");
     INFO(" done\n");
 }
 
-template<typename Node>
-void
-TestScalarNode(const char *name) {
+template <typename Node>
+void TestScalarNode(const char* name) {
     tbb::flow::graph g;
     Node on(g);
     tbb::flow::queue_node<int> qout(g);
     INFO("Testing " << name << ":");
-    tbb::flow::make_edge(on,qout);
+    tbb::flow::make_edge(on, qout);
     g.wait_for_all();
-    CHECK_MESSAGE( (!on.my_successors.empty()), "edge not added");
+    CHECK_MESSAGE((!on.my_successors.empty()), "edge not added");
     g.reset();
-    CHECK_MESSAGE( (!on.my_successors.empty()), "edge improperly removed");
+    CHECK_MESSAGE((!on.my_successors.empty()), "edge improperly removed");
     g.reset(tbb::flow::rf_clear_edges);
-    CHECK_MESSAGE( (on.my_successors.empty()), "edge not removed by reset(rf_clear_edges)");
+    CHECK_MESSAGE((on.my_successors.empty()), "edge not removed by reset(rf_clear_edges)");
     INFO(" done\n");
 }
 
 struct seq_body {
-    size_t operator()(const int &in) {
-        return size_t(in / 3);
-    }
+    size_t operator()(const int& in) { return size_t(in / 3); }
 };
 
 // sequencer_node behaves like a queueing node, but requires a different constructor.
@@ -666,40 +677,41 @@ void TestSequencerNode() {
     INFO("Testing sequencer_node:");
     tbb::flow::function_node<int> fnode(g, tbb::flow::serial, serial_fn_body<int>(serial_fn_state0));
     INFO("Testing sequencer_node:");
-    serial_fn_state0 = 0;  // reset to waiting state.
+    serial_fn_state0 = 0;// reset to waiting state.
     INFO(" make_edge");
     tbb::flow::make_edge(bnode, fnode);
-    CHECK_MESSAGE( (!bnode.my_successors.empty()), "buffering node has no successor after make_edge" );
+    CHECK_MESSAGE((!bnode.my_successors.empty()), "buffering node has no successor after make_edge");
     INFO(" try_put");
-    std::thread t([&]{
-        bnode.try_put(0);  // will forward to the fnode
+    std::thread t([&] {
+        bnode.try_put(0);// will forward to the fnode
         g.wait_for_all();
     });
     // wait for the function_node to fire up
     utils::SpinWaitWhileEq(serial_fn_state0, 0);
-    CHECK_MESSAGE( (!bnode.my_successors.empty()), "buffering node has no successor after forwarding message" );
-    serial_fn_state0 = 0;       // release the function node
+    CHECK_MESSAGE((!bnode.my_successors.empty()), "buffering node has no successor after forwarding message");
+    serial_fn_state0 = 0;// release the function node
     t.join();
 
     INFO(" remove_edge");
     tbb::flow::remove_edge(bnode, fnode);
-    CHECK_MESSAGE( (bnode.my_successors.empty()), "buffering node has a successor after remove_edge");
-    tbb::flow::join_node<std::tuple<int,int>,tbb::flow::reserving> jnode(g);
-    tbb::flow::make_edge(bnode, tbb::flow::input_port<0>(jnode));  // will spawn a task
+    CHECK_MESSAGE((bnode.my_successors.empty()), "buffering node has a successor after remove_edge");
+    tbb::flow::join_node<std::tuple<int, int>, tbb::flow::reserving> jnode(g);
+    tbb::flow::make_edge(bnode, tbb::flow::input_port<0>(jnode));// will spawn a task
     g.wait_for_all();
-    CHECK_MESSAGE( (!bnode.my_successors.empty()), "buffering node has no successor after attaching to join");
+    CHECK_MESSAGE((!bnode.my_successors.empty()), "buffering node has no successor after attaching to join");
     INFO(" reverse");
-    bnode.try_put(3);  // the edge should reverse
+    bnode.try_put(3);// the edge should reverse
     g.wait_for_all();
-    CHECK_MESSAGE( (bnode.my_successors.empty()), "buffering node has a successor after reserving");
+    CHECK_MESSAGE((bnode.my_successors.empty()), "buffering node has a successor after reserving");
     INFO(" reset()");
     g.wait_for_all();
-    g.reset();  // should be in forward direction again
-    CHECK_MESSAGE( (!bnode.my_successors.empty()), "buffering node has no successor after reset()");
+    g.reset();// should be in forward direction again
+    CHECK_MESSAGE((!bnode.my_successors.empty()), "buffering node has no successor after reset()");
     INFO(" remove_edge");
-    g.reset(tbb::flow::rf_clear_edges);  // should be in forward direction again
-    CHECK_MESSAGE( (bnode.my_successors.empty()), "buffering node has a successor after reset(rf_clear_edges)");
-    CHECK_MESSAGE( (fnode.my_predecessors.empty()), "buffering node reversed after reset(rf_clear_edges)");
+    g.reset(tbb::flow::rf_clear_edges);// should be in forward direction again
+    CHECK_MESSAGE((bnode.my_successors.empty()),
+                  "buffering node has a successor after reset(rf_clear_edges)");
+    CHECK_MESSAGE((fnode.my_predecessors.empty()), "buffering node reversed after reset(rf_clear_edges)");
     INFO("  done\n");
     g.wait_for_all();
 }
@@ -722,98 +734,83 @@ void TestInputNode() {
     tbb::flow::input_node<int> in(g, snode_body(4));
     INFO("Testing input_node:");
     tbb::flow::queue_node<int> qin(g);
-    tbb::flow::join_node<std::tuple<int,int>, tbb::flow::reserving> jn(g);
-    tbb::flow::queue_node<std::tuple<int,int> > qout(g);
+    tbb::flow::join_node<std::tuple<int, int>, tbb::flow::reserving> jn(g);
+    tbb::flow::queue_node<std::tuple<int, int>> qout(g);
 
     INFO(" make_edges");
     tbb::flow::make_edge(in, tbb::flow::input_port<0>(jn));
     tbb::flow::make_edge(qin, tbb::flow::input_port<1>(jn));
-    tbb::flow::make_edge(jn,qout);
-    CHECK_MESSAGE( (!in.my_successors.empty()), "input node has no successor after make_edge");
+    tbb::flow::make_edge(jn, qout);
+    CHECK_MESSAGE((!in.my_successors.empty()), "input node has no successor after make_edge");
     g.wait_for_all();
     g.reset();
-    CHECK_MESSAGE( (!in.my_successors.empty()), "input node has no successor after reset");
+    CHECK_MESSAGE((!in.my_successors.empty()), "input node has no successor after reset");
     g.wait_for_all();
     g.reset(tbb::flow::rf_clear_edges);
-    CHECK_MESSAGE( (in.my_successors.empty()), "input node has successor after reset(rf_clear_edges)");
+    CHECK_MESSAGE((in.my_successors.empty()), "input node has successor after reset(rf_clear_edges)");
     tbb::flow::make_edge(in, tbb::flow::input_port<0>(jn));
     tbb::flow::make_edge(qin, tbb::flow::input_port<1>(jn));
-    tbb::flow::make_edge(jn,qout);
+    tbb::flow::make_edge(jn, qout);
     g.wait_for_all();
     INFO(" activate");
-    in.activate();  // will forward to the fnode
+    in.activate();// will forward to the fnode
     INFO(" wait1");
     g.wait_for_all();
-    CHECK_MESSAGE( (in.my_successors.empty()), "input node has no successor after forwarding message");
+    CHECK_MESSAGE((in.my_successors.empty()), "input node has no successor after forwarding message");
     g.reset();
-    CHECK_MESSAGE( (!in.my_successors.empty()), "input_node has no successors after reset");
-    CHECK_MESSAGE( (tbb::flow::input_port<0>(jn).my_predecessors.empty()), "successor of input_node has pred after reset.");
+    CHECK_MESSAGE((!in.my_successors.empty()), "input_node has no successors after reset");
+    CHECK_MESSAGE((tbb::flow::input_port<0>(jn).my_predecessors.empty()),
+                  "successor of input_node has pred after reset.");
     INFO(" done\n");
 }
 
 //! Test buffering nodes
 //! \brief \ref error_guessing
-TEST_CASE("Test buffering nodes"){
+TEST_CASE("Test buffering nodes") {
     unsigned int MinThread = utils::MinThread;
-    if(MinThread < 3) MinThread = 3;
+    if (MinThread < 3) MinThread = 3;
     tbb::task_arena arena(MinThread);
-	arena.execute(
-        [&]() {
-            // tests presume at least three threads
-            TestBufferingNode< tbb::flow::buffer_node<int> >("buffer_node");
-            TestBufferingNode< tbb::flow::priority_queue_node<int> >("priority_queue_node");
-            TestBufferingNode< tbb::flow::queue_node<int> >("queue_node");
-        }
-	);
+    arena.execute([&]() {
+        // tests presume at least three threads
+        TestBufferingNode<tbb::flow::buffer_node<int>>("buffer_node");
+        TestBufferingNode<tbb::flow::priority_queue_node<int>>("priority_queue_node");
+        TestBufferingNode<tbb::flow::queue_node<int>>("queue_node");
+    });
 }
 
 //! Test sequencer_node
 //! \brief \ref error_guessing
-TEST_CASE("Test sequencer node"){
-    TestSequencerNode();
-}
+TEST_CASE("Test sequencer node") { TestSequencerNode(); }
 
 TEST_SUITE("Test multifunction node") {
     //! Test multifunction_node with rejecting policy
     //! \brief \ref error_guessing
-    TEST_CASE("with rejecting policy"){
-        TestMultifunctionNode<tbb::flow::rejecting>();
-    }
+    TEST_CASE("with rejecting policy") { TestMultifunctionNode<tbb::flow::rejecting>(); }
 
     //! Test multifunction_node with queueing policy
     //! \brief \ref error_guessing
-    TEST_CASE("with queueing policy") {
-        TestMultifunctionNode<tbb::flow::queueing>();
-    }
+    TEST_CASE("with queueing policy") { TestMultifunctionNode<tbb::flow::queueing>(); }
 }
 
 //! Test input_node
 //! \brief \ref error_guessing
-TEST_CASE("Test input node"){
-    TestInputNode();
-}
+TEST_CASE("Test input node") { TestInputNode(); }
 
 //! Test continue_node
 //! \brief \ref error_guessing
-TEST_CASE("Test continue node"){
-    TestContinueNode();
-}
+TEST_CASE("Test continue node") { TestContinueNode(); }
 
 //! Test function_node
 //! \brief \ref error_guessing
-TEST_CASE("Test function node" * doctest::may_fail()){
-    TestFunctionNode();
-}
+TEST_CASE("Test function node" * doctest::may_fail()) { TestFunctionNode(); }
 
 //! Test join_node
 //! \brief \ref error_guessing
-TEST_CASE("Test join node"){
-    TestJoinNode();
-}
+TEST_CASE("Test join node") { TestJoinNode(); }
 
 //! Test limiter_node
 //! \brief \ref error_guessing
-TEST_CASE("Test limiter node"){
+TEST_CASE("Test limiter node") {
     TestLimiterNode<void>();
     TestLimiterNode<int>();
     TestLimiterNode<tbb::flow::continue_msg>();
@@ -821,30 +818,29 @@ TEST_CASE("Test limiter node"){
 
 //! Test indexer_node
 //! \brief \ref error_guessing
-TEST_CASE("Test indexer node"){
-    TestIndexerNode();
-}
+TEST_CASE("Test indexer node") { TestIndexerNode(); }
 
 //! Test split_node
 //! \brief \ref error_guessing
-TEST_CASE("Test split node"){
-    TestSplitNode();
-}
+TEST_CASE("Test split node") { TestSplitNode(); }
 
 //! Test broadcast, overwrite, write_once nodes
 //! \brief \ref error_guessing
-TEST_CASE("Test scalar node"){
-    TestScalarNode<tbb::flow::broadcast_node<int> >("broadcast_node");
-    TestScalarNode<tbb::flow::overwrite_node<int> >("overwrite_node");
-    TestScalarNode<tbb::flow::write_once_node<int> >("write_once_node");
+TEST_CASE("Test scalar node") {
+    TestScalarNode<tbb::flow::broadcast_node<int>>("broadcast_node");
+    TestScalarNode<tbb::flow::overwrite_node<int>>("overwrite_node");
+    TestScalarNode<tbb::flow::write_once_node<int>>("write_once_node");
 }
 
 //! try_get in inactive graph
 //! \brief \ref error_guessing
-TEST_CASE("try_get in inactive graph"){
+TEST_CASE("try_get in inactive graph") {
     tbb::flow::graph g;
 
-    tbb::flow::input_node<int> src(g, [&](tbb::flow_control& fc) { fc.stop(); return 0;});
+    tbb::flow::input_node<int> src(g, [&](tbb::flow_control& fc) {
+        fc.stop();
+        return 0;
+    });
     deactivate_graph(g);
 
     int tmp = -1;
@@ -857,10 +853,10 @@ TEST_CASE("try_get in inactive graph"){
 
 //! Test make_edge in inactive graph
 //! \brief \ref error_guessing
-TEST_CASE("Test make_edge in inactive graph"){
+TEST_CASE("Test make_edge in inactive graph") {
     tbb::flow::graph g;
 
-    tbb::flow::continue_node<int> c(g, [](const tbb::flow::continue_msg&){ return 1; });
+    tbb::flow::continue_node<int> c(g, [](const tbb::flow::continue_msg&) { return 1; });
 
     tbb::flow::function_node<int, int> f(g, tbb::flow::serial, serial_fn_body<int>(serial_fn_state0));
 
@@ -874,7 +870,7 @@ TEST_CASE("Test make_edge in inactive graph"){
 
 //! Test make_edge from overwrite_node in inactive graph
 //! \brief \ref error_guessing
-TEST_CASE("Test make_edge from overwrite_node in inactive graph"){
+TEST_CASE("Test make_edge from overwrite_node in inactive graph") {
     tbb::flow::graph g;
 
     tbb::flow::queue_node<int> q(g);
@@ -894,7 +890,7 @@ TEST_CASE("Test make_edge from overwrite_node in inactive graph"){
 
 //! Test iterators directly
 //! \brief \ref error_guessing
-TEST_CASE("graph_iterator details"){
+TEST_CASE("graph_iterator details") {
     tbb::flow::graph g;
     const tbb::flow::graph cg;
 
@@ -910,7 +906,7 @@ TEST_CASE("graph_iterator details"){
 
 //! const graph
 //! \brief \ref error_guessing
-TEST_CASE("const graph"){
+TEST_CASE("const graph") {
     using namespace tbb::flow;
 
     const graph g;
@@ -928,7 +924,7 @@ TEST_CASE("Send message to continue_node while graph is inactive") {
 
     graph g;
 
-    continue_node<int> c(g, [](const continue_msg&){ return 1; });
+    continue_node<int> c(g, [](const continue_msg&) { return 1; });
     buffer_node<int> b(g);
 
     make_edge(c, b);
@@ -943,7 +939,6 @@ TEST_CASE("Send message to continue_node while graph is inactive") {
     CHECK_MESSAGE((tmp == -1), "Value should not be altered");
 }
 
-
 //! Bypass of a successor's message in a node with lightweight policy
 //! \brief \ref error_guessing
 TEST_CASE("Bypass of a successor's message in a node with lightweight policy") {
@@ -951,10 +946,10 @@ TEST_CASE("Bypass of a successor's message in a node with lightweight policy") {
 
     graph g;
 
-    auto body = [](const int&v)->int { return v * 2; };
+    auto body = [](const int& v) -> int { return v * 2; };
     function_node<int, int, lightweight> f1(g, unlimited, body);
 
-    auto body2 = [](const int&v)->int {return v / 2;};
+    auto body2 = [](const int& v) -> int { return v / 2; };
     function_node<int, int> f2(g, unlimited, body2);
 
     buffer_node<int> b(g);
diff --git a/external/tbb/test/tbb/test_function_node.cpp b/external/tbb/test/tbb/test_function_node.cpp
index 40b76664..5ac6ff50 100644
--- a/external/tbb/test/tbb/test_function_node.cpp
+++ b/external/tbb/test/tbb/test_function_node.cpp
@@ -15,26 +15,24 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
 #endif
 
 #include "common/config.h"
 
 #include "tbb/flow_graph.h"
-#include "tbb/spin_rw_mutex.h"
 #include "tbb/global_control.h"
+#include "tbb/spin_rw_mutex.h"
 
-#include "common/test.h"
-#include "common/utils.h"
+#include "common/concepts_common.h"
 #include "common/graph_utils.h"
+#include "common/test.h"
 #include "common/test_follows_and_precedes_api.h"
-#include "common/concepts_common.h"
-
+#include "common/utils.h"
 
 //! \file test_function_node.cpp
 //! \brief Test for [flow_graph.function_node] specification
 
-
 #define N 100
 #define MAX_NODES 4
 
@@ -46,96 +44,96 @@
     and 4) all of this happens even if there are multiple predecessors and successors
 */
 
-template<typename IO>
+template <typename IO>
 struct pass_through {
     IO operator()(const IO& i) { return i; }
 };
 
-template< typename InputType, typename OutputType, typename Body >
-void buffered_levels( size_t concurrency, Body body ) {
-
-   // Do for lc = 1 to concurrency level
-   for ( size_t lc = 1; lc <= concurrency; ++lc ) {
-   tbb::flow::graph g;
-
-   // Set the execute_counter back to zero in the harness
-   harness_graph_executor<InputType, OutputType>::execute_count = 0;
-   // Set the number of current executors to zero.
-   harness_graph_executor<InputType, OutputType>::current_executors = 0;
-   // Set the max allowed executors to lc.  There is a check in the functor to make sure this is never exceeded.
-   harness_graph_executor<InputType, OutputType>::max_executors = lc;
-
-   // Create the function_node with the appropriate concurrency level, and use default buffering
-   tbb::flow::function_node< InputType, OutputType > exe_node( g, lc, body );
-   tbb::flow::function_node<InputType, InputType> pass_thru( g, tbb::flow::unlimited, pass_through<InputType>());
-
-   // Create a vector of identical exe_nodes and pass_thrus
-   std::vector< tbb::flow::function_node< InputType, OutputType > > exe_vec(2, exe_node);
-   std::vector< tbb::flow::function_node< InputType, InputType > > pass_thru_vec(2, pass_thru);
-   // Attach each pass_thru to its corresponding exe_node
-   for (size_t node_idx=0; node_idx<exe_vec.size(); ++node_idx) {
-       tbb::flow::make_edge(pass_thru_vec[node_idx], exe_vec[node_idx]);
-   }
-
-   // TODO: why the test is executed serially for the node pairs, not concurrently?
-   for (size_t node_idx=0; node_idx<exe_vec.size(); ++node_idx) {
-   // For num_receivers = 1 to MAX_NODES
-       for (size_t num_receivers = 1; num_receivers <= MAX_NODES; ++num_receivers ) {
-           // Create num_receivers counting receivers and connect the exe_vec[node_idx] to them.
-           std::vector< std::shared_ptr<harness_mapped_receiver<OutputType>> > receivers;
-           for (size_t i = 0; i < num_receivers; i++) {
-               receivers.push_back( std::make_shared<harness_mapped_receiver<OutputType>>(g) );
-           }
-
-           for (size_t r = 0; r < num_receivers; ++r ) {
-               tbb::flow::make_edge( exe_vec[node_idx], *receivers[r] );
-           }
-
-           // Do the test with varying numbers of senders
-           std::vector< std::shared_ptr<harness_counting_sender<InputType>> > senders;
-           for (size_t num_senders = 1; num_senders <= MAX_NODES; ++num_senders ) {
-               // Create num_senders senders, set there message limit each to N, and connect them to
-               // pass_thru_vec[node_idx]
-               senders.clear();
-               for (size_t s = 0; s < num_senders; ++s ) {
-                   senders.push_back( std::make_shared<harness_counting_sender<InputType>>() );
-                   senders.back()->my_limit = N;
-                   senders.back()->register_successor(pass_thru_vec[node_idx] );
-               }
-
-               // Initialize the receivers so they know how many senders and messages to check for
-               for (size_t r = 0; r < num_receivers; ++r ) {
-                   receivers[r]->initialize_map( N, num_senders );
-               }
-
-               // Do the test
-               utils::NativeParallelFor( (int)num_senders, parallel_put_until_limit<InputType>(senders) );
-               g.wait_for_all();
-
-               // confirm that each sender was requested from N times
-               for (size_t s = 0; s < num_senders; ++s ) {
-                   size_t n = senders[s]->my_received;
-                   CHECK( n == N );
-                   CHECK( senders[s]->my_receiver.load(std::memory_order_relaxed) == &pass_thru_vec[node_idx] );
-               }
-               // validate the receivers
-               for (size_t r = 0; r < num_receivers; ++r ) {
-                   receivers[r]->validate();
-               }
-           }
-           for (size_t r = 0; r < num_receivers; ++r ) {
-               tbb::flow::remove_edge( exe_vec[node_idx], *receivers[r] );
-           }
-           CHECK( exe_vec[node_idx].try_put( InputType() ) == true );
-           g.wait_for_all();
-           for (size_t r = 0; r < num_receivers; ++r ) {
-               // since it's detached, nothing should have changed
-               receivers[r]->validate();
-           }
-
-       } // for num_receivers
-    } // for node_idx
-    } // for concurrency level lc
+template <typename InputType, typename OutputType, typename Body>
+void buffered_levels(size_t concurrency, Body body) {
+
+    // Do for lc = 1 to concurrency level
+    for (size_t lc = 1; lc <= concurrency; ++lc) {
+        tbb::flow::graph g;
+
+        // Set the execute_counter back to zero in the harness
+        harness_graph_executor<InputType, OutputType>::execute_count = 0;
+        // Set the number of current executors to zero.
+        harness_graph_executor<InputType, OutputType>::current_executors = 0;
+        // Set the max allowed executors to lc.  There is a check in the functor to make sure this is never exceeded.
+        harness_graph_executor<InputType, OutputType>::max_executors = lc;
+
+        // Create the function_node with the appropriate concurrency level, and use default buffering
+        tbb::flow::function_node<InputType, OutputType> exe_node(g, lc, body);
+        tbb::flow::function_node<InputType, InputType> pass_thru(g, tbb::flow::unlimited,
+                                                                 pass_through<InputType>());
+
+        // Create a vector of identical exe_nodes and pass_thrus
+        std::vector<tbb::flow::function_node<InputType, OutputType>> exe_vec(2, exe_node);
+        std::vector<tbb::flow::function_node<InputType, InputType>> pass_thru_vec(2, pass_thru);
+        // Attach each pass_thru to its corresponding exe_node
+        for (size_t node_idx = 0; node_idx < exe_vec.size(); ++node_idx) {
+            tbb::flow::make_edge(pass_thru_vec[node_idx], exe_vec[node_idx]);
+        }
+
+        // TODO: why the test is executed serially for the node pairs, not concurrently?
+        for (size_t node_idx = 0; node_idx < exe_vec.size(); ++node_idx) {
+            // For num_receivers = 1 to MAX_NODES
+            for (size_t num_receivers = 1; num_receivers <= MAX_NODES; ++num_receivers) {
+                // Create num_receivers counting receivers and connect the exe_vec[node_idx] to them.
+                std::vector<std::shared_ptr<harness_mapped_receiver<OutputType>>> receivers;
+                for (size_t i = 0; i < num_receivers; i++) {
+                    receivers.push_back(std::make_shared<harness_mapped_receiver<OutputType>>(g));
+                }
+
+                for (size_t r = 0; r < num_receivers; ++r) {
+                    tbb::flow::make_edge(exe_vec[node_idx], *receivers[r]);
+                }
+
+                // Do the test with varying numbers of senders
+                std::vector<std::shared_ptr<harness_counting_sender<InputType>>> senders;
+                for (size_t num_senders = 1; num_senders <= MAX_NODES; ++num_senders) {
+                    // Create num_senders senders, set there message limit each to N, and connect them to
+                    // pass_thru_vec[node_idx]
+                    senders.clear();
+                    for (size_t s = 0; s < num_senders; ++s) {
+                        senders.push_back(std::make_shared<harness_counting_sender<InputType>>());
+                        senders.back()->my_limit = N;
+                        senders.back()->register_successor(pass_thru_vec[node_idx]);
+                    }
+
+                    // Initialize the receivers so they know how many senders and messages to check for
+                    for (size_t r = 0; r < num_receivers; ++r) {
+                        receivers[r]->initialize_map(N, num_senders);
+                    }
+
+                    // Do the test
+                    utils::NativeParallelFor((int) num_senders, parallel_put_until_limit<InputType>(senders));
+                    g.wait_for_all();
+
+                    // confirm that each sender was requested from N times
+                    for (size_t s = 0; s < num_senders; ++s) {
+                        size_t n = senders[s]->my_received;
+                        CHECK(n == N);
+                        CHECK(senders[s]->my_receiver.load(std::memory_order_relaxed)
+                              == &pass_thru_vec[node_idx]);
+                    }
+                    // validate the receivers
+                    for (size_t r = 0; r < num_receivers; ++r) { receivers[r]->validate(); }
+                }
+                for (size_t r = 0; r < num_receivers; ++r) {
+                    tbb::flow::remove_edge(exe_vec[node_idx], *receivers[r]);
+                }
+                CHECK(exe_vec[node_idx].try_put(InputType()) == true);
+                g.wait_for_all();
+                for (size_t r = 0; r < num_receivers; ++r) {
+                    // since it's detached, nothing should have changed
+                    receivers[r]->validate();
+                }
+
+            }// for num_receivers
+        }    // for node_idx
+    }        // for concurrency level lc
 }
 
 const size_t Offset = 123;
@@ -144,100 +142,91 @@ std::atomic<size_t> global_execute_count;
 struct inc_functor {
 
     std::atomic<size_t> local_execute_count;
-    inc_functor( ) { local_execute_count = 0; }
-    inc_functor( const inc_functor &f ) { local_execute_count = size_t(f.local_execute_count); }
-    void operator=( const inc_functor &f ) { local_execute_count = size_t(f.local_execute_count); }
-
-    int operator()( int i ) {
-       ++global_execute_count;
-       ++local_execute_count;
-       return i;
+    inc_functor() { local_execute_count = 0; }
+    inc_functor(const inc_functor& f) { local_execute_count = size_t(f.local_execute_count); }
+    void operator=(const inc_functor& f) { local_execute_count = size_t(f.local_execute_count); }
+
+    int operator()(int i) {
+        ++global_execute_count;
+        ++local_execute_count;
+        return i;
     }
-
 };
 
-template< typename InputType, typename OutputType >
-void buffered_levels_with_copy( size_t concurrency ) {
+template <typename InputType, typename OutputType>
+void buffered_levels_with_copy(size_t concurrency) {
 
     // Do for lc = 1 to concurrency level
-    for ( size_t lc = 1; lc <= concurrency; ++lc ) {
+    for (size_t lc = 1; lc <= concurrency; ++lc) {
         tbb::flow::graph g;
 
         inc_functor cf;
         cf.local_execute_count = Offset;
         global_execute_count = Offset;
 
-        tbb::flow::function_node< InputType, OutputType > exe_node( g, lc, cf );
+        tbb::flow::function_node<InputType, OutputType> exe_node(g, lc, cf);
 
-        for (size_t num_receivers = 1; num_receivers <= MAX_NODES; ++num_receivers ) {
+        for (size_t num_receivers = 1; num_receivers <= MAX_NODES; ++num_receivers) {
 
-            std::vector< std::shared_ptr<harness_mapped_receiver<OutputType>> > receivers;
+            std::vector<std::shared_ptr<harness_mapped_receiver<OutputType>>> receivers;
             for (size_t i = 0; i < num_receivers; i++) {
-                receivers.push_back( std::make_shared<harness_mapped_receiver<OutputType>>(g) );
+                receivers.push_back(std::make_shared<harness_mapped_receiver<OutputType>>(g));
             }
 
-            for (size_t r = 0; r < num_receivers; ++r ) {
-                tbb::flow::make_edge( exe_node, *receivers[r] );
-            }
+            for (size_t r = 0; r < num_receivers; ++r) { tbb::flow::make_edge(exe_node, *receivers[r]); }
 
-            std::vector< std::shared_ptr<harness_counting_sender<InputType>> > senders;
-            for (size_t num_senders = 1; num_senders <= MAX_NODES; ++num_senders ) {
+            std::vector<std::shared_ptr<harness_counting_sender<InputType>>> senders;
+            for (size_t num_senders = 1; num_senders <= MAX_NODES; ++num_senders) {
                 senders.clear();
-                for (size_t s = 0; s < num_senders; ++s ) {
-                    senders.push_back( std::make_shared<harness_counting_sender<InputType>>() );
+                for (size_t s = 0; s < num_senders; ++s) {
+                    senders.push_back(std::make_shared<harness_counting_sender<InputType>>());
                     senders.back()->my_limit = N;
-                    tbb::flow::make_edge( *senders.back(), exe_node );
+                    tbb::flow::make_edge(*senders.back(), exe_node);
                 }
 
-                for (size_t r = 0; r < num_receivers; ++r ) {
-                    receivers[r]->initialize_map( N, num_senders );
-                }
+                for (size_t r = 0; r < num_receivers; ++r) { receivers[r]->initialize_map(N, num_senders); }
 
-                utils::NativeParallelFor( (int)num_senders, parallel_put_until_limit<InputType>(senders) );
+                utils::NativeParallelFor((int) num_senders, parallel_put_until_limit<InputType>(senders));
                 g.wait_for_all();
 
-                for (size_t s = 0; s < num_senders; ++s ) {
+                for (size_t s = 0; s < num_senders; ++s) {
                     size_t n = senders[s]->my_received;
-                    CHECK( n == N );
-                    CHECK( senders[s]->my_receiver.load(std::memory_order_relaxed) == &exe_node );
-                }
-                for (size_t r = 0; r < num_receivers; ++r ) {
-                    receivers[r]->validate();
+                    CHECK(n == N);
+                    CHECK(senders[s]->my_receiver.load(std::memory_order_relaxed) == &exe_node);
                 }
+                for (size_t r = 0; r < num_receivers; ++r) { receivers[r]->validate(); }
             }
-            for (size_t r = 0; r < num_receivers; ++r ) {
-                tbb::flow::remove_edge( exe_node, *receivers[r] );
-            }
-            CHECK( exe_node.try_put( InputType() ) == true );
+            for (size_t r = 0; r < num_receivers; ++r) { tbb::flow::remove_edge(exe_node, *receivers[r]); }
+            CHECK(exe_node.try_put(InputType()) == true);
             g.wait_for_all();
-            for (size_t r = 0; r < num_receivers; ++r ) {
-                receivers[r]->validate();
-            }
+            for (size_t r = 0; r < num_receivers; ++r) { receivers[r]->validate(); }
         }
 
         // validate that the local body matches the global execute_count and both are correct
-        inc_functor body_copy = tbb::flow::copy_body<inc_functor>( exe_node );
-        const size_t expected_count = N/2 * MAX_NODES * MAX_NODES * ( MAX_NODES + 1 ) + MAX_NODES + Offset;
+        inc_functor body_copy = tbb::flow::copy_body<inc_functor>(exe_node);
+        const size_t expected_count = N / 2 * MAX_NODES * MAX_NODES * (MAX_NODES + 1) + MAX_NODES + Offset;
         size_t global_count = global_execute_count;
         size_t inc_count = body_copy.local_execute_count;
         CHECK(global_count == expected_count);
-        CHECK(global_count == inc_count );
+        CHECK(global_count == inc_count);
         g.reset(tbb::flow::rf_reset_bodies);
-        body_copy = tbb::flow::copy_body<inc_functor>( exe_node );
+        body_copy = tbb::flow::copy_body<inc_functor>(exe_node);
         inc_count = body_copy.local_execute_count;
-        CHECK_MESSAGE( Offset == inc_count, "reset(rf_reset_bodies) did not reset functor" );
+        CHECK_MESSAGE(Offset == inc_count, "reset(rf_reset_bodies) did not reset functor");
     }
 }
 
-template< typename InputType, typename OutputType >
-void run_buffered_levels( int c ) {
-    buffered_levels<InputType,OutputType>( c, []( InputType i ) -> OutputType { return harness_graph_executor<InputType, OutputType>::func(i); } );
-    buffered_levels<InputType,OutputType>( c, &harness_graph_executor<InputType, OutputType>::func );
-    buffered_levels<InputType,OutputType>( c, typename harness_graph_executor<InputType, OutputType>::functor() );
-    buffered_levels_with_copy<InputType,OutputType>( c );
+template <typename InputType, typename OutputType>
+void run_buffered_levels(int c) {
+    buffered_levels<InputType, OutputType>(c, [](InputType i) -> OutputType {
+        return harness_graph_executor<InputType, OutputType>::func(i);
+    });
+    buffered_levels<InputType, OutputType>(c, &harness_graph_executor<InputType, OutputType>::func);
+    buffered_levels<InputType, OutputType>(c,
+                                           typename harness_graph_executor<InputType, OutputType>::functor());
+    buffered_levels_with_copy<InputType, OutputType>(c);
 }
 
-
 //! Performs test on executable nodes with limited concurrency
 /** These tests check:
     1) that the nodes will accepts puts up to the concurrency limit,
@@ -247,10 +236,10 @@ void run_buffered_levels( int c ) {
     There is no checking of the contents of the messages for corruption.
 */
 
-template< typename InputType, typename OutputType, typename Body >
-void concurrency_levels( size_t concurrency, Body body ) {
+template <typename InputType, typename OutputType, typename Body>
+void concurrency_levels(size_t concurrency, Body body) {
 
-    for ( size_t lc = 1; lc <= concurrency; ++lc ) {
+    for (size_t lc = 1; lc <= concurrency; ++lc) {
         tbb::flow::graph g;
 
         // Set the execute_counter back to zero in the harness
@@ -260,102 +249,96 @@ void concurrency_levels( size_t concurrency, Body body ) {
         // Set the max allowed executors to lc. There is a check in the functor to make sure this is never exceeded.
         harness_graph_executor<InputType, OutputType>::max_executors = lc;
 
-        typedef tbb::flow::function_node< InputType, OutputType, tbb::flow::rejecting > fnode_type;
-        fnode_type exe_node( g, lc, body );
+        typedef tbb::flow::function_node<InputType, OutputType, tbb::flow::rejecting> fnode_type;
+        fnode_type exe_node(g, lc, body);
 
-        for (size_t num_receivers = 1; num_receivers <= MAX_NODES; ++num_receivers ) {
+        for (size_t num_receivers = 1; num_receivers <= MAX_NODES; ++num_receivers) {
 
-            std::vector< std::shared_ptr<harness_counting_receiver<OutputType>> > receivers;
+            std::vector<std::shared_ptr<harness_counting_receiver<OutputType>>> receivers;
             for (size_t i = 0; i < num_receivers; ++i) {
-                receivers.push_back( std::make_shared<harness_counting_receiver<OutputType>>(g) );
+                receivers.push_back(std::make_shared<harness_counting_receiver<OutputType>>(g));
             }
 
-            for (size_t r = 0; r < num_receivers; ++r ) {
-                tbb::flow::make_edge( exe_node, *receivers[r] );
-            }
+            for (size_t r = 0; r < num_receivers; ++r) { tbb::flow::make_edge(exe_node, *receivers[r]); }
 
-            std::vector< std::shared_ptr<harness_counting_sender<InputType>> > senders;
+            std::vector<std::shared_ptr<harness_counting_sender<InputType>>> senders;
 
-            for (size_t num_senders = 1; num_senders <= MAX_NODES; ++num_senders ) {
+            for (size_t num_senders = 1; num_senders <= MAX_NODES; ++num_senders) {
                 senders.clear();
                 {
                     // Exclusively lock m to prevent exe_node from finishing
                     tbb::spin_rw_mutex::scoped_lock l(
-                        harness_graph_executor<InputType, OutputType>::template mutex_holder<tbb::spin_rw_mutex>::mutex
-                    );
+                            harness_graph_executor<InputType, OutputType>::template mutex_holder<
+                                    tbb::spin_rw_mutex>::mutex);
 
                     // put to lc level, it will accept and then block at m
-                    for ( size_t c = 0 ; c < lc ; ++c ) {
-                        CHECK( exe_node.try_put( InputType() ) == true );
-                    }
+                    for (size_t c = 0; c < lc; ++c) { CHECK(exe_node.try_put(InputType()) == true); }
                     // it only accepts to lc level
-                    CHECK( exe_node.try_put( InputType() ) == false );
+                    CHECK(exe_node.try_put(InputType()) == false);
 
-                    for (size_t s = 0; s < num_senders; ++s ) {
-                        senders.push_back( std::make_shared<harness_counting_sender<InputType>>() );
+                    for (size_t s = 0; s < num_senders; ++s) {
+                        senders.push_back(std::make_shared<harness_counting_sender<InputType>>());
                         // register a sender
                         senders.back()->my_limit = N;
-                        exe_node.register_predecessor( *senders.back() );
+                        exe_node.register_predecessor(*senders.back());
                     }
 
-                } // release lock at end of scope, setting the exe node free to continue
+                }// release lock at end of scope, setting the exe node free to continue
                 // wait for graph to settle down
                 g.wait_for_all();
 
                 // confirm that each sender was requested from N times
-                for (size_t s = 0; s < num_senders; ++s ) {
+                for (size_t s = 0; s < num_senders; ++s) {
                     size_t n = senders[s]->my_received;
-                    CHECK( n == N );
-                    CHECK( senders[s]->my_receiver.load(std::memory_order_relaxed) == &exe_node );
+                    CHECK(n == N);
+                    CHECK(senders[s]->my_receiver.load(std::memory_order_relaxed) == &exe_node);
                 }
                 // confirm that each receivers got N * num_senders + the initial lc puts
-                for (size_t r = 0; r < num_receivers; ++r ) {
+                for (size_t r = 0; r < num_receivers; ++r) {
                     size_t n = receivers[r]->my_count;
-                    CHECK( n == num_senders*N+lc );
+                    CHECK(n == num_senders * N + lc);
                     receivers[r]->my_count = 0;
                 }
             }
-            for (size_t r = 0; r < num_receivers; ++r ) {
-                tbb::flow::remove_edge( exe_node, *receivers[r] );
-            }
-            CHECK( exe_node.try_put( InputType() ) == true );
+            for (size_t r = 0; r < num_receivers; ++r) { tbb::flow::remove_edge(exe_node, *receivers[r]); }
+            CHECK(exe_node.try_put(InputType()) == true);
             g.wait_for_all();
-            for (size_t r = 0; r < num_receivers; ++r ) {
-                CHECK( int(receivers[r]->my_count) == 0 );
-            }
+            for (size_t r = 0; r < num_receivers; ++r) { CHECK(int(receivers[r]->my_count) == 0); }
         }
     }
 }
 
-
-template< typename InputType, typename OutputType >
-void run_concurrency_levels( int c ) {
-    concurrency_levels<InputType,OutputType>( c, []( InputType i ) -> OutputType { return harness_graph_executor<InputType, OutputType>::template tfunc<tbb::spin_rw_mutex>(i); } );
-    concurrency_levels<InputType,OutputType>( c, &harness_graph_executor<InputType, OutputType>::template tfunc<tbb::spin_rw_mutex> );
-    concurrency_levels<InputType,OutputType>( c, typename harness_graph_executor<InputType, OutputType>::template tfunctor<tbb::spin_rw_mutex>() );
+template <typename InputType, typename OutputType>
+void run_concurrency_levels(int c) {
+    concurrency_levels<InputType, OutputType>(c, [](InputType i) -> OutputType {
+        return harness_graph_executor<InputType, OutputType>::template tfunc<tbb::spin_rw_mutex>(i);
+    });
+    concurrency_levels<InputType, OutputType>(
+            c, &harness_graph_executor<InputType, OutputType>::template tfunc<tbb::spin_rw_mutex>);
+    concurrency_levels<InputType, OutputType>(
+            c,
+            typename harness_graph_executor<InputType, OutputType>::template tfunctor<tbb::spin_rw_mutex>());
 }
 
-
 struct empty_no_assign {
-   empty_no_assign() {}
-   empty_no_assign( int ) {}
-   operator int() { return 0; }
+    empty_no_assign() {}
+    empty_no_assign(int) {}
+    operator int() { return 0; }
 };
 
-template< typename InputType >
+template <typename InputType>
 struct parallel_puts : private utils::NoAssign {
 
-    tbb::flow::receiver< InputType > * const my_exe_node;
+    tbb::flow::receiver<InputType>* const my_exe_node;
 
-    parallel_puts( tbb::flow::receiver< InputType > &exe_node ) : my_exe_node(&exe_node) {}
+    parallel_puts(tbb::flow::receiver<InputType>& exe_node) : my_exe_node(&exe_node) {}
 
-    void operator()( int ) const  {
-        for ( int i = 0; i < N; ++i ) {
+    void operator()(int) const {
+        for (int i = 0; i < N; ++i) {
             // the nodes will accept all puts
-            CHECK( my_exe_node->try_put( InputType() ) == true );
+            CHECK(my_exe_node->try_put(InputType()) == true);
         }
     }
-
 };
 
 //! Performs test on executable nodes with unlimited concurrency
@@ -366,50 +349,49 @@ struct parallel_puts : private utils::NoAssign {
     There is no checking of the contents of the messages for corruption.
 */
 
-template< typename InputType, typename OutputType, typename Body >
-void unlimited_concurrency( Body body ) {
+template <typename InputType, typename OutputType, typename Body>
+void unlimited_concurrency(Body body) {
 
-    for (unsigned p = 1; p < 2*utils::MaxThread; ++p) {
+    for (unsigned p = 1; p < 2 * utils::MaxThread; ++p) {
         tbb::flow::graph g;
-        tbb::flow::function_node< InputType, OutputType, tbb::flow::rejecting > exe_node( g, tbb::flow::unlimited, body );
+        tbb::flow::function_node<InputType, OutputType, tbb::flow::rejecting> exe_node(
+                g, tbb::flow::unlimited, body);
 
-        for (size_t num_receivers = 1; num_receivers <= MAX_NODES; ++num_receivers ) {
+        for (size_t num_receivers = 1; num_receivers <= MAX_NODES; ++num_receivers) {
 
-            std::vector< std::shared_ptr<harness_counting_receiver<OutputType>> > receivers;
+            std::vector<std::shared_ptr<harness_counting_receiver<OutputType>>> receivers;
             for (size_t i = 0; i < num_receivers; ++i) {
-                receivers.push_back( std::make_shared<harness_counting_receiver<OutputType>>(g) );
+                receivers.push_back(std::make_shared<harness_counting_receiver<OutputType>>(g));
             }
 
             harness_graph_executor<InputType, OutputType>::execute_count = 0;
 
-            for (size_t r = 0; r < num_receivers; ++r ) {
-                tbb::flow::make_edge( exe_node, *receivers[r] );
-            }
+            for (size_t r = 0; r < num_receivers; ++r) { tbb::flow::make_edge(exe_node, *receivers[r]); }
 
-            utils::NativeParallelFor( p, parallel_puts<InputType>(exe_node) );
+            utils::NativeParallelFor(p, parallel_puts<InputType>(exe_node));
             g.wait_for_all();
 
             // 2) the nodes will receive puts from multiple predecessors simultaneously,
             size_t ec = harness_graph_executor<InputType, OutputType>::execute_count;
-            CHECK( ec == p*N );
-            for (size_t r = 0; r < num_receivers; ++r ) {
+            CHECK(ec == p * N);
+            for (size_t r = 0; r < num_receivers; ++r) {
                 size_t c = receivers[r]->my_count;
                 // 3) the nodes will send to multiple successors.
-                CHECK( c == p*N );
-            }
-            for (size_t r = 0; r < num_receivers; ++r ) {
-                tbb::flow::remove_edge( exe_node, *receivers[r] );
-            }
+                CHECK(c == p * N);
             }
+            for (size_t r = 0; r < num_receivers; ++r) { tbb::flow::remove_edge(exe_node, *receivers[r]); }
         }
     }
+}
 
-template< typename InputType, typename OutputType >
+template <typename InputType, typename OutputType>
 void run_unlimited_concurrency() {
     harness_graph_executor<InputType, OutputType>::max_executors = 0;
-    unlimited_concurrency<InputType,OutputType>( []( InputType i ) -> OutputType { return harness_graph_executor<InputType, OutputType>::func(i); } );
-    unlimited_concurrency<InputType,OutputType>( &harness_graph_executor<InputType, OutputType>::func );
-    unlimited_concurrency<InputType,OutputType>( typename harness_graph_executor<InputType, OutputType>::functor() );
+    unlimited_concurrency<InputType, OutputType>(
+            [](InputType i) -> OutputType { return harness_graph_executor<InputType, OutputType>::func(i); });
+    unlimited_concurrency<InputType, OutputType>(&harness_graph_executor<InputType, OutputType>::func);
+    unlimited_concurrency<InputType, OutputType>(
+            typename harness_graph_executor<InputType, OutputType>::functor());
 }
 
 struct continue_msg_to_int {
@@ -424,28 +406,30 @@ void test_function_node_with_continue_msg_as_input() {
 
     tbb::flow::broadcast_node<tbb::flow::continue_msg> Start(g);
 
-    tbb::flow::function_node<tbb::flow::continue_msg, int, tbb::flow::rejecting> FN1( g, tbb::flow::serial, continue_msg_to_int(42));
-    tbb::flow::function_node<tbb::flow::continue_msg, int, tbb::flow::rejecting> FN2( g, tbb::flow::serial, continue_msg_to_int(43));
+    tbb::flow::function_node<tbb::flow::continue_msg, int, tbb::flow::rejecting> FN1(g, tbb::flow::serial,
+                                                                                     continue_msg_to_int(42));
+    tbb::flow::function_node<tbb::flow::continue_msg, int, tbb::flow::rejecting> FN2(g, tbb::flow::serial,
+                                                                                     continue_msg_to_int(43));
 
-    tbb::flow::make_edge( Start, FN1 );
-    tbb::flow::make_edge( Start, FN2 );
+    tbb::flow::make_edge(Start, FN1);
+    tbb::flow::make_edge(Start, FN2);
 
-    Start.try_put( tbb::flow::continue_msg() );
+    Start.try_put(tbb::flow::continue_msg());
     g.wait_for_all();
 }
 
 //! Tests limited concurrency cases for nodes that accept data messages
 void test_concurrency(int num_threads) {
     tbb::global_control thread_limit(tbb::global_control::max_allowed_parallelism, num_threads);
-    run_concurrency_levels<int,int>(num_threads);
-    run_concurrency_levels<int,tbb::flow::continue_msg>(num_threads);
+    run_concurrency_levels<int, int>(num_threads);
+    run_concurrency_levels<int, tbb::flow::continue_msg>(num_threads);
     run_buffered_levels<int, int>(num_threads);
-    run_unlimited_concurrency<int,int>();
-    run_unlimited_concurrency<int,empty_no_assign>();
-    run_unlimited_concurrency<empty_no_assign,int>();
-    run_unlimited_concurrency<empty_no_assign,empty_no_assign>();
-    run_unlimited_concurrency<int,tbb::flow::continue_msg>();
-    run_unlimited_concurrency<empty_no_assign,tbb::flow::continue_msg>();
+    run_unlimited_concurrency<int, int>();
+    run_unlimited_concurrency<int, empty_no_assign>();
+    run_unlimited_concurrency<empty_no_assign, int>();
+    run_unlimited_concurrency<empty_no_assign, empty_no_assign>();
+    run_unlimited_concurrency<int, tbb::flow::continue_msg>();
+    run_unlimited_concurrency<empty_no_assign, tbb::flow::continue_msg>();
     test_function_node_with_continue_msg_as_input();
 }
 
@@ -455,17 +439,15 @@ void test_concurrency(int num_threads) {
 void test_follows_and_precedes_api() {
     using msg_t = tbb::flow::continue_msg;
 
-    std::array<msg_t, 3> messages_for_follows = { {msg_t(), msg_t(), msg_t()} };
-    std::vector<msg_t> messages_for_precedes = { msg_t() };
+    std::array<msg_t, 3> messages_for_follows = {{msg_t(), msg_t(), msg_t()}};
+    std::vector<msg_t> messages_for_precedes = {msg_t()};
 
     pass_through<msg_t> pass_msg;
 
-    follows_and_precedes_testing::test_follows
-        <msg_t, tbb::flow::function_node<msg_t, msg_t>>
-        (messages_for_follows, tbb::flow::unlimited, pass_msg);
-    follows_and_precedes_testing::test_precedes
-        <msg_t, tbb::flow::function_node<msg_t, msg_t>>
-        (messages_for_precedes, tbb::flow::unlimited, pass_msg, tbb::flow::node_priority_t(1));
+    follows_and_precedes_testing::test_follows<msg_t, tbb::flow::function_node<msg_t, msg_t>>(
+            messages_for_follows, tbb::flow::unlimited, pass_msg);
+    follows_and_precedes_testing::test_precedes<msg_t, tbb::flow::function_node<msg_t, msg_t>>(
+            messages_for_precedes, tbb::flow::unlimited, pass_msg, tbb::flow::node_priority_t(1));
 }
 #endif
 
@@ -480,7 +462,7 @@ void test_follows_and_precedes_api() {
 void test_try_put_and_wait_lightweight(std::size_t concurrency_limit) {
     tbb::task_arena arena(1);
 
-    arena.execute([&]{
+    arena.execute([&] {
         tbb::flow::graph g;
 
         std::vector<int> start_work_items;
@@ -497,29 +479,23 @@ void test_try_put_and_wait_lightweight(std::size_t concurrency_limit) {
         using function_node_type = tbb::flow::function_node<int, int, tbb::flow::lightweight>;
         function_node_type* start_node = nullptr;
 
-        function_node_type function(g, concurrency_limit,
-            [&](int input) noexcept {
-                if (input == wait_message) {
-                    for (int item : new_work_items) {
-                        start_node->try_put(item);
-                    }
-                }
-                return input;
-            });
+        function_node_type function(g, concurrency_limit, [&](int input) noexcept {
+            if (input == wait_message) {
+                for (int item : new_work_items) { start_node->try_put(item); }
+            }
+            return input;
+        });
 
         start_node = &function;
 
-        function_node_type writer(g, concurrency_limit,
-            [&](int input) noexcept {
-                processed_items.emplace_back(input);
-                return 0;
-            });
+        function_node_type writer(g, concurrency_limit, [&](int input) noexcept {
+            processed_items.emplace_back(input);
+            return 0;
+        });
 
         tbb::flow::make_edge(function, writer);
 
-        for (int i = 0; i < wait_message; ++i) {
-            function.try_put(i);
-        }
+        for (int i = 0; i < wait_message; ++i) { function.try_put(i); }
 
         function.try_put_and_wait(wait_message);
 
@@ -534,7 +510,8 @@ void test_try_put_and_wait_lightweight(std::size_t concurrency_limit) {
         if (concurrency_limit == tbb::flow::serial) {
             // If the lightweight function_node is serial, it should process the wait_message but add items from new_work_items
             // into the queue since the concurrency limit is occupied.
-            CHECK_MESSAGE(processed_items.size() == start_work_items.size() + 1, "Unexpected number of elements processed");
+            CHECK_MESSAGE(processed_items.size() == start_work_items.size() + 1,
+                          "Unexpected number of elements processed");
             CHECK_MESSAGE(processed_items[check_index++] == wait_message, "Unexpected items processing");
         } else {
             // If the node is unlimited, it should process new_work_items immediately while processing the wait_message
@@ -563,7 +540,7 @@ void test_try_put_and_wait_lightweight(std::size_t concurrency_limit) {
 
 void test_try_put_and_wait_queueing(std::size_t concurrency_limit) {
     tbb::task_arena arena(1);
-    arena.execute([&]{
+    arena.execute([&] {
         tbb::flow::graph g;
 
         std::vector<int> start_work_items;
@@ -580,29 +557,23 @@ void test_try_put_and_wait_queueing(std::size_t concurrency_limit) {
         using function_node_type = tbb::flow::function_node<int, int, tbb::flow::queueing>;
         function_node_type* start_node = nullptr;
 
-        function_node_type function(g, concurrency_limit,
-            [&](int input) noexcept {
-                if (input == wait_message) {
-                    for (int item : new_work_items) {
-                        start_node->try_put(item);
-                    }
-                }
-                return input;
-            });
+        function_node_type function(g, concurrency_limit, [&](int input) noexcept {
+            if (input == wait_message) {
+                for (int item : new_work_items) { start_node->try_put(item); }
+            }
+            return input;
+        });
 
         start_node = &function;
 
-        function_node_type writer(g, concurrency_limit,
-            [&](int input) noexcept {
-                processed_items.emplace_back(input);
-                return 0;
-            });
+        function_node_type writer(g, concurrency_limit, [&](int input) noexcept {
+            processed_items.emplace_back(input);
+            return 0;
+        });
 
         tbb::flow::make_edge(function, writer);
 
-        for (int i = 0; i < wait_message; ++i) {
-            function.try_put(i);
-        }
+        for (int i = 0; i < wait_message; ++i) { function.try_put(i); }
 
         function.try_put_and_wait(wait_message);
 
@@ -612,7 +583,8 @@ void test_try_put_and_wait_queueing(std::size_t concurrency_limit) {
             // Serial queueing function_node should add all start_work_items except the first one into the queue
             // and then process them in FIFO order.
             // wait_message would also be added to the queue, but would be processed later
-            CHECK_MESSAGE(processed_items.size() == start_work_items.size() + 1, "Unexpected number of elements processed");
+            CHECK_MESSAGE(processed_items.size() == start_work_items.size() + 1,
+                          "Unexpected number of elements processed");
             for (auto item : start_work_items) {
                 CHECK_MESSAGE(processed_items[check_index++] == item, "Unexpected items processing");
             }
@@ -638,10 +610,12 @@ void test_try_put_and_wait_queueing(std::size_t concurrency_limit) {
             // They would be processed in LIFO order. Hence it is expected that new_work_items would be processed first in reverse order
             // After them, start_work_items would be processed also in reverse order
             for (std::size_t i = new_work_items.size(); i != 0; --i) {
-                CHECK_MESSAGE(processed_items[check_index++] == new_work_items[i - 1], "Unexpected items processing");
+                CHECK_MESSAGE(processed_items[check_index++] == new_work_items[i - 1],
+                              "Unexpected items processing");
             }
             for (std::size_t i = start_work_items.size(); i != 0; --i) {
-                CHECK_MESSAGE(processed_items[check_index++] == start_work_items[i - 1], "Unexpected items processing");
+                CHECK_MESSAGE(processed_items[check_index++] == start_work_items[i - 1],
+                              "Unexpected items processing");
             }
         }
         CHECK(check_index == processed_items.size());
@@ -651,7 +625,7 @@ void test_try_put_and_wait_queueing(std::size_t concurrency_limit) {
 void test_try_put_and_wait_rejecting(size_t concurrency_limit) {
     tbb::task_arena arena(1);
 
-    arena.execute([&]{
+    arena.execute([&] {
         tbb::flow::graph g;
 
         std::vector<int> processed_items;
@@ -659,30 +633,24 @@ void test_try_put_and_wait_rejecting(size_t concurrency_limit) {
 
         int wait_message = 0;
 
-        for (int i = 1; i < wait_message; ++i) {
-            new_work_items.emplace_back(i);
-        }
+        for (int i = 1; i < wait_message; ++i) { new_work_items.emplace_back(i); }
 
         using function_node_type = tbb::flow::function_node<int, int, tbb::flow::rejecting>;
         function_node_type* start_node = nullptr;
 
-        function_node_type function(g, concurrency_limit,
-            [&](int input) noexcept {
-                if (input == wait_message) {
-                    for (int item : new_work_items) {
-                        start_node->try_put(item);
-                    }
-                }
-                return input;
-            });
+        function_node_type function(g, concurrency_limit, [&](int input) noexcept {
+            if (input == wait_message) {
+                for (int item : new_work_items) { start_node->try_put(item); }
+            }
+            return input;
+        });
 
         start_node = &function;
 
-        function_node_type writer(g, concurrency_limit,
-            [&](int input) noexcept {
-                processed_items.emplace_back(input);
-                return 0;
-            });
+        function_node_type writer(g, concurrency_limit, [&](int input) noexcept {
+            processed_items.emplace_back(input);
+            return 0;
+        });
 
         tbb::flow::make_edge(function, writer);
 
@@ -723,39 +691,33 @@ void test_try_put_and_wait() {
 
     test_try_put_and_wait_rejecting(tbb::flow::serial);
 }
-#endif // __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+#endif// __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
 
 //! Test various node bodies with concurrency
 //! \brief \ref error_guessing
 TEST_CASE("Concurrency test") {
-    for(unsigned int p = utils::MinThread; p <= utils::MaxThread; ++p ) {
-        test_concurrency(p);
-    }
+    for (unsigned int p = utils::MinThread; p <= utils::MaxThread; ++p) { test_concurrency(p); }
 }
 
 //! NativeParallelFor testing with various concurrency settings
 //! \brief \ref error_guessing
-TEST_CASE("Lightweight testing"){
-   lightweight_testing::test<tbb::flow::function_node>(10);
-}
+TEST_CASE("Lightweight testing") { lightweight_testing::test<tbb::flow::function_node>(10); }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 //! Test follows and precedes API
 //! \brief \ref error_guessing
-TEST_CASE("Flowgraph node set test"){
-     test_follows_and_precedes_api();
-}
+TEST_CASE("Flowgraph node set test") { test_follows_and_precedes_api(); }
 #endif
 
 //! try_release and try_consume test
 //! \brief \ref error_guessing
-TEST_CASE("try_release try_consume"){
+TEST_CASE("try_release try_consume") {
     tbb::flow::graph g;
 
-    tbb::flow::function_node<int, int> fn(g, tbb::flow::unlimited, [](const int&v){return v;});
+    tbb::flow::function_node<int, int> fn(g, tbb::flow::unlimited, [](const int& v) { return v; });
 
-    CHECK_MESSAGE((fn.try_release()==false), "try_release should initially return false on a node");
-    CHECK_MESSAGE((fn.try_consume()==false), "try_consume should initially return false on a node");
+    CHECK_MESSAGE((fn.try_release() == false), "try_release should initially return false on a node");
+    CHECK_MESSAGE((fn.try_consume() == false), "try_consume should initially return false on a node");
 }
 
 #if __TBB_CPP20_CONCEPTS_PRESENT
@@ -763,20 +725,24 @@ TEST_CASE("try_release try_consume"){
 TEST_CASE("constraints for function_node input and output") {
     struct InputObject {
         InputObject() = default;
-        InputObject( const InputObject& ) = default;
+        InputObject(const InputObject&) = default;
     };
     struct OutputObject : test_concepts::Copyable {};
 
     static_assert(utils::well_formed_instantiation<tbb::flow::function_node, InputObject, OutputObject>);
     static_assert(utils::well_formed_instantiation<tbb::flow::function_node, int, int>);
-    static_assert(!utils::well_formed_instantiation<tbb::flow::function_node, test_concepts::NonCopyable, OutputObject>);
-    static_assert(!utils::well_formed_instantiation<tbb::flow::function_node, test_concepts::NonDefaultInitializable, OutputObject>);
-    static_assert(!utils::well_formed_instantiation<tbb::flow::function_node, InputObject, test_concepts::NonCopyable>);
+    static_assert(!utils::well_formed_instantiation<tbb::flow::function_node, test_concepts::NonCopyable,
+                                                    OutputObject>);
+    static_assert(!utils::well_formed_instantiation<tbb::flow::function_node,
+                                                    test_concepts::NonDefaultInitializable, OutputObject>);
+    static_assert(!utils::well_formed_instantiation<tbb::flow::function_node, InputObject,
+                                                    test_concepts::NonCopyable>);
 }
 
 template <typename Input, typename Output, typename Body>
-concept can_call_function_node_ctor = requires( tbb::flow::graph& graph, std::size_t concurrency, Body body,
-                                                tbb::flow::node_priority_t priority, tbb::flow::buffer_node<int>& f ) {
+concept can_call_function_node_ctor
+        = requires(tbb::flow::graph& graph, std::size_t concurrency, Body body,
+                   tbb::flow::node_priority_t priority, tbb::flow::buffer_node<int>& f) {
     tbb::flow::function_node<Input, Output>(graph, concurrency, body);
     tbb::flow::function_node<Input, Output>(graph, concurrency, body, priority);
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
@@ -792,19 +758,22 @@ TEST_CASE("constraints for function_node body") {
     using namespace test_concepts::function_node_body;
 
     static_assert(can_call_function_node_ctor<input_type, output_type, Correct<input_type, output_type>>);
-    static_assert(!can_call_function_node_ctor<input_type, output_type, NonCopyable<input_type, output_type>>);
-    static_assert(!can_call_function_node_ctor<input_type, output_type, NonDestructible<input_type, output_type>>);
-    static_assert(!can_call_function_node_ctor<input_type, output_type, NoOperatorRoundBrackets<input_type, output_type>>);
-    static_assert(!can_call_function_node_ctor<input_type, output_type, WrongInputRoundBrackets<input_type, output_type>>);
-    static_assert(!can_call_function_node_ctor<input_type, output_type, WrongReturnRoundBrackets<input_type, output_type>>);
+    static_assert(
+            !can_call_function_node_ctor<input_type, output_type, NonCopyable<input_type, output_type>>);
+    static_assert(
+            !can_call_function_node_ctor<input_type, output_type, NonDestructible<input_type, output_type>>);
+    static_assert(!can_call_function_node_ctor<input_type, output_type,
+                                               NoOperatorRoundBrackets<input_type, output_type>>);
+    static_assert(!can_call_function_node_ctor<input_type, output_type,
+                                               WrongInputRoundBrackets<input_type, output_type>>);
+    static_assert(!can_call_function_node_ctor<input_type, output_type,
+                                               WrongReturnRoundBrackets<input_type, output_type>>);
 }
-#endif // __TBB_CPP20_CONCEPTS_PRESENT
+#endif// __TBB_CPP20_CONCEPTS_PRESENT
 
 #if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
 //! \brief \ref error_guessing
-TEST_CASE("test function_node try_put_and_wait") {
-    test_try_put_and_wait();
-}
+TEST_CASE("test function_node try_put_and_wait") { test_try_put_and_wait(); }
 #endif
 
 // It was an issue when the critical task wrapper was allocated using the small object pool
@@ -819,11 +788,9 @@ TEST_CASE("test critical tasks memory pool correctness") {
     auto node_body = [&](int) { ++num_calls; };
 
     tbb::flow::graph g;
-    node_type node(g, tbb::flow::serial, node_body, tbb::flow::node_priority_t{1});
+    node_type node(g, tbb::flow::serial, node_body, tbb::flow::node_priority_t {1});
 
-    for (int i = 0; i < num_iterations; ++i) {
-        node.try_put(i);
-    }
+    for (int i = 0; i < num_iterations; ++i) { node.try_put(i); }
 
     g.wait_for_all();
     REQUIRE_MESSAGE(num_calls == num_iterations, "Incorrect number of body executions");
diff --git a/external/tbb/test/tbb/test_fuzzing.cpp b/external/tbb/test/tbb/test_fuzzing.cpp
index 38cd7f8a..87bbb6dd 100644
--- a/external/tbb/test/tbb/test_fuzzing.cpp
+++ b/external/tbb/test/tbb/test_fuzzing.cpp
@@ -20,22 +20,20 @@
 #include <fuzzer/FuzzedDataProvider.h>
 
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
-  FuzzedDataProvider provider(data, size);
-  for (auto var : {"INTEL_ITTNOTIFY_GROUPS", "INTEL_LIBITTNOTIFY32",
-                   "INTEL_LIBITTNOTIFY64", "KMP_FOR_TCHECK", "KMP_FOR_TPROFILE",
-                   "TBB_ENABLE_SANITIZERS", "TBB_MALLOC_DISABLE_REPLACEMENT",
-                   "TBB_MALLOC_SET_HUGE_SIZE_THRESHOLD",
-                   "TBB_MALLOC_USE_HUGE_PAGES", "TBB_VERSION"}) {
-    std::string val = provider.ConsumeRandomLengthString();
+    FuzzedDataProvider provider(data, size);
+    for (auto var :
+         {"INTEL_ITTNOTIFY_GROUPS", "INTEL_LIBITTNOTIFY32", "INTEL_LIBITTNOTIFY64", "KMP_FOR_TCHECK",
+          "KMP_FOR_TPROFILE", "TBB_ENABLE_SANITIZERS", "TBB_MALLOC_DISABLE_REPLACEMENT",
+          "TBB_MALLOC_SET_HUGE_SIZE_THRESHOLD", "TBB_MALLOC_USE_HUGE_PAGES", "TBB_VERSION"}) {
+        std::string val = provider.ConsumeRandomLengthString();
 #if _WIN32
-    _putenv_s(var, val.c_str());
+        _putenv_s(var, val.c_str());
 #else
-    setenv(var, val.c_str(), 1);
+        setenv(var, val.c_str(), 1);
 #endif
-  }
+    }
 
-  if (std::system(CMD) != 0)
-    __builtin_trap();
+    if (std::system(CMD) != 0) __builtin_trap();
 
-  return 0;
+    return 0;
 }
diff --git a/external/tbb/test/tbb/test_global_control.cpp b/external/tbb/test/tbb/test_global_control.cpp
index fddbbaf6..3920a010 100644
--- a/external/tbb/test/tbb/test_global_control.cpp
+++ b/external/tbb/test/tbb/test_global_control.cpp
@@ -19,39 +19,31 @@
 
 #include "common/test.h"
 
-#include "common/utils.h"
 #include "common/spin_barrier.h"
+#include "common/utils.h"
 #include "common/utils_concurrency_limit.h"
 
 #include "tbb/global_control.h"
 #include "tbb/parallel_for.h"
-#include "tbb/task_group.h"
 #include "tbb/task_arena.h"
+#include "tbb/task_group.h"
 
 #include <cstring>
 
 struct task_scheduler_handle_guard {
-    tbb::task_scheduler_handle m_handle{};
+    tbb::task_scheduler_handle m_handle {};
 
-    task_scheduler_handle_guard() {
-        m_handle = tbb::task_scheduler_handle{tbb::attach{}};
-    }
+    task_scheduler_handle_guard() { m_handle = tbb::task_scheduler_handle {tbb::attach {}}; }
 
-    ~task_scheduler_handle_guard() {
-        m_handle.release();
-    }
+    ~task_scheduler_handle_guard() { m_handle.release(); }
 
-    tbb::task_scheduler_handle& get() {
-        return m_handle;
-    }
+    tbb::task_scheduler_handle& get() { return m_handle; }
 };
 
 namespace TestBlockingTerminateNS {
 
     struct TestAutoInitBody {
-        void operator()( int ) const {
-            tbb::parallel_for( 0, 100, utils::DummyBody() );
-        }
+        void operator()(int) const { tbb::parallel_for(0, 100, utils::DummyBody()); }
     };
 
     static std::atomic<int> gSeed;
@@ -59,51 +51,47 @@ namespace TestBlockingTerminateNS {
 
     class TestMultpleWaitBody {
         bool myAutoInit;
+
     public:
-        TestMultpleWaitBody( bool autoInit = false ) : myAutoInit( autoInit ) {}
-        void operator()( int ) const {
+        TestMultpleWaitBody(bool autoInit = false) : myAutoInit(autoInit) {}
+        void operator()(int) const {
             task_scheduler_handle_guard init;
-            if ( !myAutoInit ) {
-                tbb::parallel_for(0, 10, utils::DummyBody());
-            }
-            utils::FastRandom<> rnd( ++gSeed );
+            if (!myAutoInit) { tbb::parallel_for(0, 10, utils::DummyBody()); }
+            utils::FastRandom<> rnd(++gSeed);
             // In case of auto init sub-tests we skip
             //  - case #4 to avoid recursion
             //  - case #5 because it is explicit initialization
             const int numCases = myAutoInit ? 4 : 6;
-            switch ( rnd.get() % numCases ) {
-            case 0: {
-                tbb::task_arena a;
-                a.enqueue(utils::DummyBody() );
-                break;
-            }
-            case 1: {
-                tbb::task_group tg;
-                utils::DummyBody eb;
-                tg.run( eb );
-                tg.wait();
-                break;
-            }
-            case 2:
-                tbb::parallel_for( 0, 100, utils::DummyBody() );
-                break;
-            case 3:
-                /* do nothing */
-                break;
-            case 4:
-                // Create and join several threads with auto initialized scheduler.
-                utils::NativeParallelFor( rnd.get() % 5 + 1, TestMultpleWaitBody( true ) );
-                break;
-            case 5:
-                {
-                    task_scheduler_handle_guard init2;
-                    bool res = tbb::finalize( init2.get(), std::nothrow );
-                    REQUIRE( !res );
+            switch (rnd.get() % numCases) {
+                case 0: {
+                    tbb::task_arena a;
+                    a.enqueue(utils::DummyBody());
+                    break;
+                }
+                case 1: {
+                    tbb::task_group tg;
+                    utils::DummyBody eb;
+                    tg.run(eb);
+                    tg.wait();
+                    break;
                 }
-                break;
+                case 2:
+                    tbb::parallel_for(0, 100, utils::DummyBody());
+                    break;
+                case 3:
+                    /* do nothing */
+                    break;
+                case 4:
+                    // Create and join several threads with auto initialized scheduler.
+                    utils::NativeParallelFor(rnd.get() % 5 + 1, TestMultpleWaitBody(true));
+                    break;
+                case 5: {
+                    task_scheduler_handle_guard init2;
+                    bool res = tbb::finalize(init2.get(), std::nothrow);
+                    REQUIRE(!res);
+                } break;
             }
-            if ( !myAutoInit && tbb::finalize( init.get(), std::nothrow ) )
-                ++gNumSuccesses;
+            if (!myAutoInit && tbb::finalize(init.get(), std::nothrow)) ++gNumSuccesses;
         }
     };
 
@@ -113,33 +101,29 @@ namespace TestBlockingTerminateNS {
         const int numRepeats = 5;
         // Initialize seed with different values on different machines.
         gSeed = tbb::this_task_arena::max_concurrency();
-        for ( int repeats = 0; repeats<numRepeats; ++repeats ) {
-            for ( int threads = minThreads; threads<maxThreads; ++threads ) {
+        for (int repeats = 0; repeats < numRepeats; ++repeats) {
+            for (int threads = minThreads; threads < maxThreads; ++threads) {
                 gNumSuccesses = 0;
-                utils::NativeParallelFor( threads, TestMultpleWaitBody() );
-                REQUIRE_MESSAGE( gNumSuccesses > 0, "At least one blocking terminate must return 'true'" );
+                utils::NativeParallelFor(threads, TestMultpleWaitBody());
+                REQUIRE_MESSAGE(gNumSuccesses > 0, "At least one blocking terminate must return 'true'");
             }
         }
     }
 
 #if TBB_USE_EXCEPTIONS
     template <typename F>
-    void TestException( F &f ) {
-        utils::suppress_unused_warning( f );
+    void TestException(F& f) {
+        utils::suppress_unused_warning(f);
         bool caught = false;
         try {
             f();
-            REQUIRE( false );
-        }
-        catch ( const tbb::unsafe_wait& e) {
+            REQUIRE(false);
+        } catch (const tbb::unsafe_wait& e) {
             const char* msg = e.what();
             REQUIRE((msg && std::strlen(msg) != 0));
             caught = true;
-        }
-        catch ( ... ) {
-            REQUIRE( false );
-        }
-        REQUIRE( caught );
+        } catch (...) { REQUIRE(false); }
+        REQUIRE(caught);
     }
 
     class ExceptionTest1 {
@@ -147,26 +131,28 @@ namespace TestBlockingTerminateNS {
         int myIndex;
 
     public:
-        ExceptionTest1( int index ) : myIndex( index ) {}
+        ExceptionTest1(int index) : myIndex(index) {}
 
         void operator()() {
             task_scheduler_handle_guard tsi2;
-            tbb::parallel_for(0, 2, utils::DummyBody()); // auto-init
+            tbb::parallel_for(0, 2, utils::DummyBody());// auto-init
             tbb::finalize((myIndex == 0 ? tsi1.get() : tsi2.get()));
-            REQUIRE_MESSAGE( false, "Blocking terminate did not throw the exception" );
+            REQUIRE_MESSAGE(false, "Blocking terminate did not throw the exception");
         }
     };
 
     struct ExceptionTest2 {
         class Body {
             utils::SpinBarrier& myBarrier;
+
         public:
-            Body( utils::SpinBarrier& barrier ) : myBarrier( barrier ) {}
-            void operator()( int ) const {
+            Body(utils::SpinBarrier& barrier) : myBarrier(barrier) {}
+            void operator()(int) const {
                 myBarrier.wait();
                 task_scheduler_handle_guard init;
-                tbb::finalize( init.get() );
-                REQUIRE_MESSAGE( false, "Blocking terminate did not throw the exception inside the parallel region" );
+                tbb::finalize(init.get());
+                REQUIRE_MESSAGE(false,
+                                "Blocking terminate did not throw the exception inside the parallel region");
             }
         };
         void operator()() {
@@ -183,9 +169,9 @@ namespace TestBlockingTerminateNS {
 
     void TestExceptions() {
         ExceptionTest1 Test1(0);
-        TestException( Test1 );
+        TestException(Test1);
         ExceptionTest1 Test2(1);
-        TestException( Test2 );
+        TestException(Test2);
         if (utils::get_platform_max_threads() > 1) {
             // TODO: Fix the arena leak issue on single threaded machine
             // (see https://github.com/oneapi-src/oneTBB/issues/396)
@@ -196,15 +182,13 @@ namespace TestBlockingTerminateNS {
 
 #endif /* TBB_USE_EXCEPTIONS */
 
-} // namespace TestBlockingTerminateNS
+}// namespace TestBlockingTerminateNS
 
 void TestTerminationAndAutoinit(bool autoinit) {
     task_scheduler_handle_guard ctl1;
     task_scheduler_handle_guard ctl2;
 
-    if (autoinit) {
-        tbb::parallel_for(0, 10, utils::DummyBody());
-    }
+    if (autoinit) { tbb::parallel_for(0, 10, utils::DummyBody()); }
     bool res1 = tbb::finalize(ctl1.get(), std::nothrow);
     if (autoinit) {
         REQUIRE(!res1);
@@ -218,9 +202,9 @@ void TestTerminationAndAutoinit(bool autoinit) {
 //! Check no reference leak for an external thread
 //! \brief \ref regression \ref error_guessing
 TEST_CASE("test decrease reference") {
-    tbb::task_scheduler_handle handle = tbb::task_scheduler_handle{tbb::attach{}};
+    tbb::task_scheduler_handle handle = tbb::task_scheduler_handle {tbb::attach {}};
 
-    std::thread thr([] { tbb::parallel_for(0, 1, [](int) {}); } );
+    std::thread thr([] { tbb::parallel_for(0, 1, [](int) {}); });
     thr.join();
 
     REQUIRE(tbb::finalize(handle, std::nothrow));
@@ -240,33 +224,28 @@ TEST_CASE("prolong lifetime advanced") {
     // Exceptions test leaves auto-initialized scheduler after,
     // because all blocking terminate calls are inside the parallel region,
     // thus resulting in false termination result.
-    utils::NativeParallelFor(1,
-        [&](int) { TestBlockingTerminateNS::TestExceptions(); });
+    utils::NativeParallelFor(1, [&](int) { TestBlockingTerminateNS::TestExceptions(); });
 }
 #endif
 
 #if !EMSCRIPTEN
 //! Testing multiple wait
 //! \brief \ref error_guessing
-TEST_CASE("prolong lifetime multiple wait") {
-    TestBlockingTerminateNS::TestMultpleWait();
-}
+TEST_CASE("prolong lifetime multiple wait") { TestBlockingTerminateNS::TestMultpleWait(); }
 #endif
 
 //! \brief \ref regression
 TEST_CASE("test concurrent task_scheduler_handle destruction") {
-    std::atomic<bool> stop{ false };
+    std::atomic<bool> stop {false};
     std::thread thr1([&] {
         while (!stop) {
-            auto h = tbb::task_scheduler_handle{ tbb::attach{} };
-            tbb::finalize(h, std::nothrow_t{});
+            auto h = tbb::task_scheduler_handle {tbb::attach {}};
+            tbb::finalize(h, std::nothrow_t {});
         }
     });
 
     for (int i = 0; i < 1000; ++i) {
-        std::thread thr2([] {
-            tbb::parallel_for(0, 1, [](int) {});
-        });
+        std::thread thr2([] { tbb::parallel_for(0, 1, [](int) {}); });
         thr2.join();
     }
     stop = true;
diff --git a/external/tbb/test/tbb/test_handle_perror.cpp b/external/tbb/test/tbb/test_handle_perror.cpp
index ef869a5f..ee396c89 100644
--- a/external/tbb/test/tbb/test_handle_perror.cpp
+++ b/external/tbb/test/tbb/test_handle_perror.cpp
@@ -23,23 +23,21 @@
 
 #define __TBB_NO_IMPLICIT_LINKAGE 1
 
-#include "../../src/tbb/assert_impl.h" // Out-of-line TBB assertion handling routines are instantiated here.
+#include "../../src/tbb/assert_impl.h"// Out-of-line TBB assertion handling routines are instantiated here.
+#include "../../src/tbb/exception.cpp"
 #include "common/test.h"
 #include "oneapi/tbb/detail/_exception.h"
-#include "../../src/tbb/exception.cpp"
-#include <stdexcept>
 #include <cerrno>
 #include <iostream>
+#include <stdexcept>
 
 namespace tbb {
-namespace detail {
-namespace r1 {
-bool terminate_on_exception() {
-    return false;
-}
-}
-}
-}
+    namespace detail {
+        namespace r1 {
+            bool terminate_on_exception() { return false; }
+        }// namespace r1
+    }    // namespace detail
+}// namespace tbb
 
 #if TBB_USE_EXCEPTIONS
 
@@ -49,7 +47,7 @@ TEST_CASE("test tbb::detail::r1::handle_perror") {
 
     try {
         tbb::detail::r1::handle_perror(EAGAIN, "apple");
-    } catch( std::runtime_error& e ) {
+    } catch (std::runtime_error& e) {
         REQUIRE(std::memcmp(e.what(), "apple: ", 7) == 0);
         REQUIRE_MESSAGE(std::strlen(std::strstr(e.what(), std::strerror(EAGAIN))), "Bad error message");
         caught = true;
@@ -57,4 +55,4 @@ TEST_CASE("test tbb::detail::r1::handle_perror") {
     REQUIRE(caught);
 }
 
-#endif // TBB_USE_EXCEPTIONS
+#endif// TBB_USE_EXCEPTIONS
diff --git a/external/tbb/test/tbb/test_hw_concurrency.cpp b/external/tbb/test/tbb/test_hw_concurrency.cpp
index 115a8f34..1ce9ae7a 100644
--- a/external/tbb/test/tbb/test_hw_concurrency.cpp
+++ b/external/tbb/test/tbb/test_hw_concurrency.cpp
@@ -22,32 +22,32 @@
 #include "common/utils.h"
 #if !__TBB_TEST_SKIP_AFFINITY
 #include "common/utils_concurrency_limit.h"
-#include "tbb/global_control.h"
-#include "tbb/enumerable_thread_specific.h"
-#include "tbb/task_arena.h"
-#include "tbb/concurrent_vector.h"
-#include "tbb/concurrent_queue.h"
-#include "tbb/concurrent_priority_queue.h"
+#include "tbb/blocked_nd_range.h"
+#include "tbb/blocked_range.h"
+#include "tbb/blocked_range2d.h"
+#include "tbb/blocked_range3d.h"
+#include "tbb/cache_aligned_allocator.h"
+#include "tbb/combinable.h"
 #include "tbb/concurrent_hash_map.h"
-#include "tbb/concurrent_unordered_map.h"
-#include "tbb/concurrent_unordered_set.h"
 #include "tbb/concurrent_map.h"
+#include "tbb/concurrent_priority_queue.h"
+#include "tbb/concurrent_queue.h"
 #include "tbb/concurrent_set.h"
-#include "tbb/cache_aligned_allocator.h"
-#include "tbb/scalable_allocator.h"
-#include "tbb/tbb_allocator.h"
+#include "tbb/concurrent_unordered_map.h"
+#include "tbb/concurrent_unordered_set.h"
+#include "tbb/concurrent_vector.h"
+#include "tbb/enumerable_thread_specific.h"
+#include "tbb/global_control.h"
 #include "tbb/null_mutex.h"
 #include "tbb/null_rw_mutex.h"
 #include "tbb/queuing_mutex.h"
 #include "tbb/queuing_rw_mutex.h"
+#include "tbb/scalable_allocator.h"
 #include "tbb/spin_mutex.h"
 #include "tbb/spin_rw_mutex.h"
+#include "tbb/task_arena.h"
+#include "tbb/tbb_allocator.h"
 #include "tbb/tick_count.h"
-#include "tbb/combinable.h"
-#include "tbb/blocked_range.h"
-#include "tbb/blocked_range2d.h"
-#include "tbb/blocked_range3d.h"
-#include "tbb/blocked_nd_range.h"
 
 // Declaration of global objects are needed to check that
 // it does not initialize the task scheduler, and in particular
@@ -94,9 +94,10 @@ TEST_CASE("Check absence of scheduler initialization") {
 
     if (maxProcs >= 2) {
         int availableProcs = maxProcs / 2;
-        REQUIRE_MESSAGE(utils::limit_number_of_threads(availableProcs) == availableProcs, "limit_number_of_threads has not set the requested limitation");
+        REQUIRE_MESSAGE(utils::limit_number_of_threads(availableProcs) == availableProcs,
+                        "limit_number_of_threads has not set the requested limitation");
         REQUIRE(tbb::this_task_arena::max_concurrency() == availableProcs);
     }
 }
 
-#endif // !__TBB_TEST_SKIP_AFFINITY
+#endif// !__TBB_TEST_SKIP_AFFINITY
diff --git a/external/tbb/test/tbb/test_implicit_linkage_on_windows.cpp b/external/tbb/test/tbb/test_implicit_linkage_on_windows.cpp
index 250259d6..fa4f926e 100644
--- a/external/tbb/test/tbb/test_implicit_linkage_on_windows.cpp
+++ b/external/tbb/test/tbb/test_implicit_linkage_on_windows.cpp
@@ -25,8 +25,6 @@
 //! \brief \ref error_guessing \ref interface
 TEST_CASE("Test implicit linkage") {
     // Pulling something from the library so that it is indeed required during the linkage
-    REQUIRE_MESSAGE(
-        TBB_runtime_interface_version()==TBB_INTERFACE_VERSION,
-        "Running with the library of different version than the test was compiled against."
-    );
+    REQUIRE_MESSAGE(TBB_runtime_interface_version() == TBB_INTERFACE_VERSION,
+                    "Running with the library of different version than the test was compiled against.");
 }
diff --git a/external/tbb/test/tbb/test_indexer_node.cpp b/external/tbb/test/tbb/test_indexer_node.cpp
index c47a8cad..a54c493f 100644
--- a/external/tbb/test/tbb/test_indexer_node.cpp
+++ b/external/tbb/test/tbb/test_indexer_node.cpp
@@ -15,7 +15,7 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
 #endif
 
 #include "common/config.h"
@@ -23,85 +23,78 @@
 #include "tbb/flow_graph.h"
 
 #include "common/test.h"
+#include "common/test_follows_and_precedes_api.h"
 #include "common/utils.h"
 #include "common/utils_assert.h"
-#include "common/test_follows_and_precedes_api.h"
-
 
 //! \file test_indexer_node.cpp
 //! \brief Test for [flow_graph.indexer_node] specification
 
-
 #if defined(_MSC_VER) && _MSC_VER < 1600
-    #pragma warning (disable : 4503) //disabling the "decorated name length exceeded" warning for VS2008 and earlier
+#pragma warning(disable : 4503)//disabling the "decorated name length exceeded" warning for VS2008 and earlier
 #endif
 
 const int Count = 150;
 const int MaxPorts = 10;
-const int MaxNInputs = 5; // max # of input_nodes to register for each indexer_node input in parallel test
-bool outputCheck[MaxPorts][Count];  // for checking output
-
-void
-check_outputCheck( int nUsed, int maxCnt) {
-    for(int i=0; i < nUsed; ++i) {
-        for( int j = 0; j < maxCnt; ++j) {
-            CHECK_MESSAGE(outputCheck[i][j], "");
-        }
+const int MaxNInputs = 5;// max # of input_nodes to register for each indexer_node input in parallel test
+bool outputCheck[MaxPorts][Count];// for checking output
+
+void check_outputCheck(int nUsed, int maxCnt) {
+    for (int i = 0; i < nUsed; ++i) {
+        for (int j = 0; j < maxCnt; ++j) { CHECK_MESSAGE(outputCheck[i][j], ""); }
     }
 }
 
-void
-reset_outputCheck( int nUsed, int maxCnt) {
-    for(int i=0; i < nUsed; ++i) {
-        for( int j = 0; j < maxCnt; ++j) {
-            outputCheck[i][j] = false;
-        }
+void reset_outputCheck(int nUsed, int maxCnt) {
+    for (int i = 0; i < nUsed; ++i) {
+        for (int j = 0; j < maxCnt; ++j) { outputCheck[i][j] = false; }
     }
 }
 
 class test_class {
-    public:
-        test_class() { my_val = 0; }
-        test_class(int i) { my_val = i; }
-        operator int() { return my_val; }
-    private:
-        int my_val;
+public:
+    test_class() { my_val = 0; }
+    test_class(int i) { my_val = i; }
+    operator int() { return my_val; }
+
+private:
+    int my_val;
 };
 
-template<typename T>
+template <typename T>
 class name_of {
 public:
-    static const char* name() { return  "Unknown"; }
+    static const char *name() { return "Unknown"; }
 };
-template<>
+template <>
 class name_of<int> {
 public:
-    static const char* name() { return  "int"; }
+    static const char *name() { return "int"; }
 };
-template<>
+template <>
 class name_of<float> {
 public:
-    static const char* name() { return  "float"; }
+    static const char *name() { return "float"; }
 };
-template<>
+template <>
 class name_of<double> {
 public:
-    static const char* name() { return  "double"; }
+    static const char *name() { return "double"; }
 };
-template<>
+template <>
 class name_of<long> {
 public:
-    static const char* name() { return  "long"; }
+    static const char *name() { return "long"; }
 };
-template<>
+template <>
 class name_of<short> {
 public:
-    static const char* name() { return  "short"; }
+    static const char *name() { return "short"; }
 };
-template<>
+template <>
 class name_of<test_class> {
 public:
-    static const char* name() { return  "test_class"; }
+    static const char *name() { return "test_class"; }
 };
 
 // TT must be arithmetic, and shouldn't wrap around for reasonable sizes of Count (which is now 150, and maxPorts is 10,
@@ -111,20 +104,22 @@ class name_of<test_class> {
 // to receive.  If there is only one input node, the series order will be maintained; if more than one,
 // this is not guaranteed.
 // The manual specifies bodies can be assigned, so we can't hide the operator=.
-template<typename TT>
+template <typename TT>
 class my_input_body {
     TT my_mult;
     int my_count;
     int addend;
+
 public:
-    my_input_body(TT multiplier, int init_val, int addto) : my_mult(multiplier), my_count(init_val), addend(addto) { }
-    TT operator()( tbb::flow_control& fc) {
+    my_input_body(TT multiplier, int init_val, int addto)
+        : my_mult(multiplier), my_count(init_val), addend(addto) {}
+    TT operator()(tbb::flow_control &fc) {
         int lc = my_count;
-        TT ret = my_mult * (TT)my_count;
+        TT ret = my_mult * (TT) my_count;
         my_count += addend;
-        if ( lc < Count){
+        if (lc < Count) {
             return ret;
-        }else{
+        } else {
             fc.stop();
             return TT();
         }
@@ -133,7 +128,7 @@ class my_input_body {
 
 // allocator for indexer_node.
 
-template<typename IType>
+template <typename IType>
 class makeIndexer {
 public:
     static IType *create() {
@@ -143,96 +138,95 @@ class makeIndexer {
     static void destroy(IType *p) { delete p; }
 };
 
-template<int ELEM, typename INT>
+template <int ELEM, typename INT>
 struct getval_helper {
 
     typedef typename INT::output_type OT;
-    typedef typename std::tuple_element<ELEM-1, typename INT::tuple_types>::type stored_type;
+    typedef typename std::tuple_element<ELEM - 1, typename INT::tuple_types>::type stored_type;
 
     static int get_integer_val(OT const &o) {
         stored_type res = tbb::flow::cast_to<stored_type>(o);
-        return (int)res;
+        return (int) res;
     }
 };
 
 // holder for input_node pointers for eventual deletion
 
-static void* all_input_nodes[MaxPorts][MaxNInputs];
+static void *all_input_nodes[MaxPorts][MaxNInputs];
 
-template<int ELEM, typename INT>
+template <int ELEM, typename INT>
 class input_node_helper {
 public:
     typedef INT indexer_node_type;
     typedef typename indexer_node_type::output_type TT;
-    typedef typename std::tuple_element<ELEM-1,typename INT::tuple_types>::type IT;
+    typedef typename std::tuple_element<ELEM - 1, typename INT::tuple_types>::type IT;
     typedef typename tbb::flow::input_node<IT> my_input_node_type;
     static void print_remark() {
-        input_node_helper<ELEM-1,INT>::print_remark();
+        input_node_helper<ELEM - 1, INT>::print_remark();
         INFO(", " << name_of<IT>::name());
     }
     static void add_input_nodes(indexer_node_type &my_indexer, tbb::flow::graph &g, int nInputs) {
-        for(int i=0; i < nInputs; ++i) {
-            my_input_node_type *new_node = new my_input_node_type(g, my_input_body<IT>((IT)(ELEM+1), i, nInputs));
-            tbb::flow::make_edge(*new_node, tbb::flow::input_port<ELEM-1>(my_indexer));
+        for (int i = 0; i < nInputs; ++i) {
+            my_input_node_type *new_node
+                    = new my_input_node_type(g, my_input_body<IT>((IT)(ELEM + 1), i, nInputs));
+            tbb::flow::make_edge(*new_node, tbb::flow::input_port<ELEM - 1>(my_indexer));
 
-            all_input_nodes[ELEM-1][i] = (void *)new_node;
+            all_input_nodes[ELEM - 1][i] = (void *) new_node;
             new_node->activate();
         }
 
         // add the next input_node
-        input_node_helper<ELEM-1, INT>::add_input_nodes(my_indexer, g, nInputs);
+        input_node_helper<ELEM - 1, INT>::add_input_nodes(my_indexer, g, nInputs);
     }
     static void check_value(TT &v) {
-        if(v.tag() == ELEM-1) {
-            int ival = getval_helper<ELEM,INT>::get_integer_val(v);
-            CHECK_MESSAGE(!(ival%(ELEM+1)), "");
-            ival /= (ELEM+1);
-            CHECK_MESSAGE(!outputCheck[ELEM-1][ival], "");
-            outputCheck[ELEM-1][ival] = true;
-        }
-        else {
-            input_node_helper<ELEM-1,INT>::check_value(v);
+        if (v.tag() == ELEM - 1) {
+            int ival = getval_helper<ELEM, INT>::get_integer_val(v);
+            CHECK_MESSAGE(!(ival % (ELEM + 1)), "");
+            ival /= (ELEM + 1);
+            CHECK_MESSAGE(!outputCheck[ELEM - 1][ival], "");
+            outputCheck[ELEM - 1][ival] = true;
+        } else {
+            input_node_helper<ELEM - 1, INT>::check_value(v);
         }
     }
 
-    static void remove_input_nodes(indexer_node_type& my_indexer, int nInputs) {
-        for(int i=0; i< nInputs; ++i) {
-            my_input_node_type *dp = reinterpret_cast<my_input_node_type *>(all_input_nodes[ELEM-1][i]);
-            tbb::flow::remove_edge(*dp, tbb::flow::input_port<ELEM-1>(my_indexer));
+    static void remove_input_nodes(indexer_node_type &my_indexer, int nInputs) {
+        for (int i = 0; i < nInputs; ++i) {
+            my_input_node_type *dp = reinterpret_cast<my_input_node_type *>(all_input_nodes[ELEM - 1][i]);
+            tbb::flow::remove_edge(*dp, tbb::flow::input_port<ELEM - 1>(my_indexer));
             delete dp;
         }
-        input_node_helper<ELEM-1, INT>::remove_input_nodes(my_indexer, nInputs);
+        input_node_helper<ELEM - 1, INT>::remove_input_nodes(my_indexer, nInputs);
     }
 };
 
-template<typename INT>
+template <typename INT>
 class input_node_helper<1, INT> {
     typedef INT indexer_node_type;
     typedef typename indexer_node_type::output_type TT;
 
     typedef typename std::tuple_element<0, typename INT::tuple_types>::type IT;
     typedef typename tbb::flow::input_node<IT> my_input_node_type;
+
 public:
-    static void print_remark() {
-        INFO("Parallel test of indexer_node< " << name_of<IT>::name());
-    }
+    static void print_remark() { INFO("Parallel test of indexer_node< " << name_of<IT>::name()); }
     static void add_input_nodes(indexer_node_type &my_indexer, tbb::flow::graph &g, int nInputs) {
-        for(int i=0; i < nInputs; ++i) {
-            my_input_node_type *new_node = new my_input_node_type(g, my_input_body<IT>((IT)2, i, nInputs));
+        for (int i = 0; i < nInputs; ++i) {
+            my_input_node_type *new_node = new my_input_node_type(g, my_input_body<IT>((IT) 2, i, nInputs));
             tbb::flow::make_edge(*new_node, tbb::flow::input_port<0>(my_indexer));
-            all_input_nodes[0][i] = (void *)new_node;
+            all_input_nodes[0][i] = (void *) new_node;
             new_node->activate();
         }
     }
     static void check_value(TT &v) {
-        int ival = getval_helper<1,INT>::get_integer_val(v);
-        CHECK_MESSAGE(!(ival%2), "");
+        int ival = getval_helper<1, INT>::get_integer_val(v);
+        CHECK_MESSAGE(!(ival % 2), "");
         ival /= 2;
         CHECK_MESSAGE(!outputCheck[0][ival], "");
         outputCheck[0][ival] = true;
     }
-    static void remove_input_nodes(indexer_node_type& my_indexer, int nInputs) {
-        for(int i=0; i < nInputs; ++i) {
+    static void remove_input_nodes(indexer_node_type &my_indexer, int nInputs) {
+        for (int i = 0; i < nInputs; ++i) {
             my_input_node_type *dp = reinterpret_cast<my_input_node_type *>(all_input_nodes[0][i]);
             tbb::flow::remove_edge(*dp, tbb::flow::input_port<0>(my_indexer));
             delete dp;
@@ -240,7 +234,7 @@ class input_node_helper<1, INT> {
     }
 };
 
-template<typename IType>
+template <typename IType>
 class parallel_test {
 public:
     typedef typename IType::output_type TType;
@@ -248,16 +242,14 @@ class parallel_test {
     static const int SIZE = std::tuple_size<union_types>::value;
     static void test() {
         TType v;
-        input_node_helper<SIZE,IType>::print_remark();
+        input_node_helper<SIZE, IType>::print_remark();
         INFO(" >\n");
-        for(int i=0; i < MaxPorts; ++i) {
-            for(int j=0; j < MaxNInputs; ++j) {
-                all_input_nodes[i][j] = nullptr;
-            }
+        for (int i = 0; i < MaxPorts; ++i) {
+            for (int j = 0; j < MaxNInputs; ++j) { all_input_nodes[i][j] = nullptr; }
         }
-        for(int nInputs = 1; nInputs <= MaxNInputs; ++nInputs) {
+        for (int nInputs = 1; nInputs <= MaxNInputs; ++nInputs) {
             tbb::flow::graph g;
-            IType* my_indexer_ptr = new IType(g); //makeIndexer<IType>::create();
+            IType *my_indexer_ptr = new IType(g);//makeIndexer<IType>::create();
             IType my_indexer = *my_indexer_ptr;
             tbb::flow::queue_node<TType> outq1(g);
             tbb::flow::queue_node<TType> outq2(g);
@@ -271,7 +263,7 @@ class parallel_test {
             makeIndexer<IType>::destroy(my_indexer_ptr);
 
             reset_outputCheck(SIZE, Count);
-            for(int i=0; i < Count*SIZE; ++i) {
+            for (int i = 0; i < Count * SIZE; ++i) {
                 CHECK_MESSAGE(outq1.try_get(v), "");
                 input_node_helper<SIZE, IType>::check_value(v);
             }
@@ -279,7 +271,7 @@ class parallel_test {
             check_outputCheck(SIZE, Count);
             reset_outputCheck(SIZE, Count);
 
-            for(int i=0; i < Count*SIZE; i++) {
+            for (int i = 0; i < Count * SIZE; i++) {
                 CHECK_MESSAGE(outq2.try_get(v), "");
                 input_node_helper<SIZE, IType>::check_value(v);
             }
@@ -297,277 +289,228 @@ class parallel_test {
 
 std::vector<int> last_index_seen;
 
-template<int ELEM, typename IType>
+template <int ELEM, typename IType>
 class serial_queue_helper {
 public:
     typedef typename IType::output_type OT;
     typedef typename IType::tuple_types TT;
-    typedef typename std::tuple_element<ELEM-1,TT>::type IT;
+    typedef typename std::tuple_element<ELEM - 1, TT>::type IT;
     static void print_remark() {
-        serial_queue_helper<ELEM-1,IType>::print_remark();
+        serial_queue_helper<ELEM - 1, IType>::print_remark();
         INFO("," << name_of<IT>::name());
     }
     static void fill_one_queue(int maxVal, IType &my_indexer) {
         // fill queue to "left" of me
-        serial_queue_helper<ELEM-1,IType>::fill_one_queue(maxVal,my_indexer);
-        for(int i = 0; i < maxVal; ++i) {
-            CHECK_MESSAGE(tbb::flow::input_port<ELEM-1>(my_indexer).try_put((IT)(i*(ELEM+1))), "");
+        serial_queue_helper<ELEM - 1, IType>::fill_one_queue(maxVal, my_indexer);
+        for (int i = 0; i < maxVal; ++i) {
+            CHECK_MESSAGE(tbb::flow::input_port<ELEM - 1>(my_indexer).try_put((IT)(i * (ELEM + 1))), "");
         }
     }
     static void put_one_queue_val(int myVal, IType &my_indexer) {
         // put this val to my "left".
-        serial_queue_helper<ELEM-1,IType>::put_one_queue_val(myVal, my_indexer);
-        CHECK_MESSAGE(tbb::flow::input_port<ELEM-1>(my_indexer).try_put((IT)(myVal*(ELEM+1))), "");
+        serial_queue_helper<ELEM - 1, IType>::put_one_queue_val(myVal, my_indexer);
+        CHECK_MESSAGE(tbb::flow::input_port<ELEM - 1>(my_indexer).try_put((IT)(myVal * (ELEM + 1))), "");
     }
     static void check_queue_value(OT &v) {
-        if(ELEM - 1 == v.tag()) {
+        if (ELEM - 1 == v.tag()) {
             // this assumes each or node input is queueing.
-            int rval = getval_helper<ELEM,IType>::get_integer_val(v);
-            CHECK_MESSAGE( rval == (last_index_seen[ELEM-1]+1)*(ELEM+1), "");
-            last_index_seen[ELEM-1] = rval / (ELEM+1);
-        }
-        else {
-            serial_queue_helper<ELEM-1,IType>::check_queue_value(v);
+            int rval = getval_helper<ELEM, IType>::get_integer_val(v);
+            CHECK_MESSAGE(rval == (last_index_seen[ELEM - 1] + 1) * (ELEM + 1), "");
+            last_index_seen[ELEM - 1] = rval / (ELEM + 1);
+        } else {
+            serial_queue_helper<ELEM - 1, IType>::check_queue_value(v);
         }
     }
 };
 
-template<typename IType>
+template <typename IType>
 class serial_queue_helper<1, IType> {
 public:
     typedef typename IType::output_type OT;
     typedef typename IType::tuple_types TT;
-    typedef typename std::tuple_element<0,TT>::type IT;
-    static void print_remark() {
-        INFO("Serial test of indexer_node< " << name_of<IT>::name());
-    }
+    typedef typename std::tuple_element<0, TT>::type IT;
+    static void print_remark() { INFO("Serial test of indexer_node< " << name_of<IT>::name()); }
     static void fill_one_queue(int maxVal, IType &my_indexer) {
-        for(int i = 0; i < maxVal; ++i) {
-            CHECK_MESSAGE(tbb::flow::input_port<0>(my_indexer).try_put((IT)(i*2)), "");
+        for (int i = 0; i < maxVal; ++i) {
+            CHECK_MESSAGE(tbb::flow::input_port<0>(my_indexer).try_put((IT)(i * 2)), "");
         }
     }
     static void put_one_queue_val(int myVal, IType &my_indexer) {
-        CHECK_MESSAGE(tbb::flow::input_port<0>(my_indexer).try_put((IT)(myVal*2)), "");
+        CHECK_MESSAGE(tbb::flow::input_port<0>(my_indexer).try_put((IT)(myVal * 2)), "");
     }
     static void check_queue_value(OT &v) {
-        CHECK_MESSAGE(v.tag() == 0, "");  // won't get here unless true
-        int rval = getval_helper<1,IType>::get_integer_val(v);
-        CHECK_MESSAGE( rval == (last_index_seen[0]+1)*2, "");
+        CHECK_MESSAGE(v.tag() == 0, "");// won't get here unless true
+        int rval = getval_helper<1, IType>::get_integer_val(v);
+        CHECK_MESSAGE(rval == (last_index_seen[0] + 1) * 2, "");
         last_index_seen[0] = rval / 2;
     }
 };
 
-template<typename IType, typename TType, int SIZE>
-void test_one_serial( IType &my_indexer, tbb::flow::graph &g) {
+template <typename IType, typename TType, int SIZE>
+void test_one_serial(IType &my_indexer, tbb::flow::graph &g) {
     last_index_seen.clear();
-    for(int ii=0; ii < SIZE; ++ii) last_index_seen.push_back(-1);
+    for (int ii = 0; ii < SIZE; ++ii) last_index_seen.push_back(-1);
 
     typedef TType q3_input_type;
-    tbb::flow::queue_node< q3_input_type >  q3(g);
+    tbb::flow::queue_node<q3_input_type> q3(g);
     q3_input_type v;
 
     tbb::flow::make_edge(my_indexer, q3);
 
     // fill each queue with its value one-at-a-time
-    for (int i = 0; i < Count; ++i ) {
-        serial_queue_helper<SIZE,IType>::put_one_queue_val(i,my_indexer);
-    }
+    for (int i = 0; i < Count; ++i) { serial_queue_helper<SIZE, IType>::put_one_queue_val(i, my_indexer); }
 
     g.wait_for_all();
-    for (int i = 0; i < Count * SIZE; ++i ) {
+    for (int i = 0; i < Count * SIZE; ++i) {
         g.wait_for_all();
-        CHECK_MESSAGE( (q3.try_get( v )), "Error in try_get()");
-        {
-            serial_queue_helper<SIZE,IType>::check_queue_value(v);
-        }
+        CHECK_MESSAGE((q3.try_get(v)), "Error in try_get()");
+        { serial_queue_helper<SIZE, IType>::check_queue_value(v); }
     }
-    CHECK_MESSAGE( (!q3.try_get( v )), "extra values in output queue");
-    for(int ii=0; ii < SIZE; ++ii) last_index_seen[ii] = -1;
+    CHECK_MESSAGE((!q3.try_get(v)), "extra values in output queue");
+    for (int ii = 0; ii < SIZE; ++ii) last_index_seen[ii] = -1;
 
     // fill each queue completely before filling the next.
-    serial_queue_helper<SIZE, IType>::fill_one_queue(Count,my_indexer);
+    serial_queue_helper<SIZE, IType>::fill_one_queue(Count, my_indexer);
 
     g.wait_for_all();
-    for (int i = 0; i < Count*SIZE; ++i ) {
+    for (int i = 0; i < Count * SIZE; ++i) {
         g.wait_for_all();
-        CHECK_MESSAGE( (q3.try_get( v )), "Error in try_get()");
-        {
-            serial_queue_helper<SIZE,IType>::check_queue_value(v);
-        }
+        CHECK_MESSAGE((q3.try_get(v)), "Error in try_get()");
+        { serial_queue_helper<SIZE, IType>::check_queue_value(v); }
     }
-    CHECK_MESSAGE( (!q3.try_get( v )), "extra values in output queue");
+    CHECK_MESSAGE((!q3.try_get(v)), "extra values in output queue");
 }
 
 //
-template<typename NodeType>
-void test_input_ports_return_ref(NodeType& mip_node) {
-    typename NodeType::input_ports_type& input_ports1 = mip_node.input_ports();
-    typename NodeType::input_ports_type& input_ports2 = mip_node.input_ports();
-    CHECK_MESSAGE( (&input_ports1 == &input_ports2), "input_ports() should return reference");
+template <typename NodeType>
+void test_input_ports_return_ref(NodeType &mip_node) {
+    typename NodeType::input_ports_type &input_ports1 = mip_node.input_ports();
+    typename NodeType::input_ports_type &input_ports2 = mip_node.input_ports();
+    CHECK_MESSAGE((&input_ports1 == &input_ports2), "input_ports() should return reference");
 }
 
 // Single predecessor at each port, single accepting successor
 //   * put to buffer before port0, then put to buffer before port1, ...
 //   * fill buffer before port0 then fill buffer before port1, ...
 
-template<typename IType>
+template <typename IType>
 class serial_test {
-    typedef typename IType::output_type TType;  // this is the union
+    typedef typename IType::output_type TType;// this is the union
     typedef typename IType::tuple_types union_types;
     static const int SIZE = std::tuple_size<union_types>::value;
+
 public:
-static void test() {
-    tbb::flow::graph g;
-    static const int ELEMS = 3;
-    IType* my_indexer = new IType(g); //makeIndexer<IType>::create(g);
+    static void test() {
+        tbb::flow::graph g;
+        static const int ELEMS = 3;
+        IType *my_indexer = new IType(g);//makeIndexer<IType>::create(g);
 
-    test_input_ports_return_ref(*my_indexer);
+        test_input_ports_return_ref(*my_indexer);
 
-    serial_queue_helper<SIZE, IType>::print_remark(); INFO(" >\n");
+        serial_queue_helper<SIZE, IType>::print_remark();
+        INFO(" >\n");
 
-    test_one_serial<IType,TType,SIZE>(*my_indexer, g);
+        test_one_serial<IType, TType, SIZE>(*my_indexer, g);
 
-    std::vector<IType> indexer_vector(ELEMS,*my_indexer);
+        std::vector<IType> indexer_vector(ELEMS, *my_indexer);
 
-    makeIndexer<IType>::destroy(my_indexer);
+        makeIndexer<IType>::destroy(my_indexer);
 
-    for(int e = 0; e < ELEMS; ++e) {
-        test_one_serial<IType,TType,SIZE>(indexer_vector[e], g);
+        for (int e = 0; e < ELEMS; ++e) { test_one_serial<IType, TType, SIZE>(indexer_vector[e], g); }
     }
-}
 
-}; // serial_test
+};// serial_test
 
-template<
-      template<typename> class TestType,  // serial_test or parallel_test
-      typename T0, typename T1=void, typename T2=void, typename T3=void, typename T4=void,
-      typename T5=void, typename T6=void, typename T7=void, typename T8=void, typename T9=void> // type of the inputs to the indexer_node
+template <template <typename> class TestType,// serial_test or parallel_test
+          typename T0, typename T1 = void, typename T2 = void, typename T3 = void, typename T4 = void,
+          typename T5 = void, typename T6 = void, typename T7 = void, typename T8 = void,
+          typename T9 = void>// type of the inputs to the indexer_node
 class generate_test {
 public:
-    typedef tbb::flow::indexer_node<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>  indexer_node_type;
-    static void do_test() {
-        TestType<indexer_node_type>::test();
-    }
+    typedef tbb::flow::indexer_node<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> indexer_node_type;
+    static void do_test() { TestType<indexer_node_type>::test(); }
 };
 
 //specializations for indexer node inputs
-template<
-      template<typename> class TestType,
-      typename T0, typename T1, typename T2, typename T3, typename T4,
-      typename T5, typename T6, typename T7, typename T8>
+template <template <typename> class TestType, typename T0, typename T1, typename T2, typename T3, typename T4,
+          typename T5, typename T6, typename T7, typename T8>
 class generate_test<TestType, T0, T1, T2, T3, T4, T5, T6, T7, T8> {
 public:
-    typedef tbb::flow::indexer_node<T0, T1, T2, T3, T4, T5, T6, T7, T8>  indexer_node_type;
-    static void do_test() {
-        TestType<indexer_node_type>::test();
-    }
+    typedef tbb::flow::indexer_node<T0, T1, T2, T3, T4, T5, T6, T7, T8> indexer_node_type;
+    static void do_test() { TestType<indexer_node_type>::test(); }
 };
 
-template<
-      template<typename> class TestType,
-      typename T0, typename T1, typename T2, typename T3, typename T4,
-      typename T5, typename T6, typename T7>
+template <template <typename> class TestType, typename T0, typename T1, typename T2, typename T3, typename T4,
+          typename T5, typename T6, typename T7>
 class generate_test<TestType, T0, T1, T2, T3, T4, T5, T6, T7> {
 public:
-    typedef tbb::flow::indexer_node<T0, T1, T2, T3, T4, T5, T6, T7>  indexer_node_type;
-    static void do_test() {
-        TestType<indexer_node_type>::test();
-    }
+    typedef tbb::flow::indexer_node<T0, T1, T2, T3, T4, T5, T6, T7> indexer_node_type;
+    static void do_test() { TestType<indexer_node_type>::test(); }
 };
 
-template<
-      template<typename> class TestType,
-      typename T0, typename T1, typename T2, typename T3, typename T4,
-      typename T5, typename T6>
+template <template <typename> class TestType, typename T0, typename T1, typename T2, typename T3, typename T4,
+          typename T5, typename T6>
 class generate_test<TestType, T0, T1, T2, T3, T4, T5, T6> {
 public:
-    typedef tbb::flow::indexer_node<T0, T1, T2, T3, T4, T5, T6>  indexer_node_type;
-    static void do_test() {
-        TestType<indexer_node_type>::test();
-    }
+    typedef tbb::flow::indexer_node<T0, T1, T2, T3, T4, T5, T6> indexer_node_type;
+    static void do_test() { TestType<indexer_node_type>::test(); }
 };
 
-template<
-      template<typename> class TestType,
-      typename T0, typename T1, typename T2, typename T3, typename T4,
-      typename T5>
-class generate_test<TestType, T0, T1, T2, T3, T4, T5>  {
+template <template <typename> class TestType, typename T0, typename T1, typename T2, typename T3, typename T4,
+          typename T5>
+class generate_test<TestType, T0, T1, T2, T3, T4, T5> {
 public:
-    typedef tbb::flow::indexer_node<T0, T1, T2, T3, T4, T5>  indexer_node_type;
-    static void do_test() {
-        TestType<indexer_node_type>::test();
-    }
+    typedef tbb::flow::indexer_node<T0, T1, T2, T3, T4, T5> indexer_node_type;
+    static void do_test() { TestType<indexer_node_type>::test(); }
 };
 
-template<
-      template<typename> class TestType,
-      typename T0, typename T1, typename T2, typename T3, typename T4>
-class generate_test<TestType, T0, T1, T2, T3, T4>  {
+template <template <typename> class TestType, typename T0, typename T1, typename T2, typename T3, typename T4>
+class generate_test<TestType, T0, T1, T2, T3, T4> {
 public:
-    typedef tbb::flow::indexer_node<T0, T1, T2, T3, T4>  indexer_node_type;
-    static void do_test() {
-        TestType<indexer_node_type>::test();
-    }
+    typedef tbb::flow::indexer_node<T0, T1, T2, T3, T4> indexer_node_type;
+    static void do_test() { TestType<indexer_node_type>::test(); }
 };
 
-template<
-      template<typename> class TestType,
-      typename T0, typename T1, typename T2, typename T3>
+template <template <typename> class TestType, typename T0, typename T1, typename T2, typename T3>
 class generate_test<TestType, T0, T1, T2, T3> {
 public:
-    typedef tbb::flow::indexer_node<T0, T1, T2, T3>  indexer_node_type;
-    static void do_test() {
-        TestType<indexer_node_type>::test();
-    }
+    typedef tbb::flow::indexer_node<T0, T1, T2, T3> indexer_node_type;
+    static void do_test() { TestType<indexer_node_type>::test(); }
 };
 
-template<
-      template<typename> class TestType,
-      typename T0, typename T1, typename T2>
+template <template <typename> class TestType, typename T0, typename T1, typename T2>
 class generate_test<TestType, T0, T1, T2> {
 public:
-    typedef tbb::flow::indexer_node<T0, T1, T2>  indexer_node_type;
-    static void do_test() {
-        TestType<indexer_node_type>::test();
-    }
+    typedef tbb::flow::indexer_node<T0, T1, T2> indexer_node_type;
+    static void do_test() { TestType<indexer_node_type>::test(); }
 };
 
-template<
-      template<typename> class TestType,
-      typename T0, typename T1>
+template <template <typename> class TestType, typename T0, typename T1>
 class generate_test<TestType, T0, T1> {
 public:
-    typedef tbb::flow::indexer_node<T0, T1>  indexer_node_type;
-    static void do_test() {
-        TestType<indexer_node_type>::test();
-    }
+    typedef tbb::flow::indexer_node<T0, T1> indexer_node_type;
+    static void do_test() { TestType<indexer_node_type>::test(); }
 };
 
-template<
-      template<typename> class TestType,
-      typename T0>
+template <template <typename> class TestType, typename T0>
 class generate_test<TestType, T0> {
 public:
-    typedef tbb::flow::indexer_node<T0>  indexer_node_type;
-    static void do_test() {
-        TestType<indexer_node_type>::test();
-    }
+    typedef tbb::flow::indexer_node<T0> indexer_node_type;
+    static void do_test() { TestType<indexer_node_type>::test(); }
 };
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
-template<typename tagged_msg_t, typename input_t>
-bool check_edge(tbb::flow::graph& g,
-                tbb::flow::broadcast_node<input_t>& start,
-                tbb::flow::buffer_node<tagged_msg_t>& buf,
-                input_t input_value) {
+template <typename tagged_msg_t, typename input_t>
+bool check_edge(tbb::flow::graph &g, tbb::flow::broadcast_node<input_t> &start,
+                tbb::flow::buffer_node<tagged_msg_t> &buf, input_t input_value) {
     start.try_put(input_value);
     g.wait_for_all();
 
     tagged_msg_t msg;
     bool is_get_succeeded = buf.try_get(msg);
 
-    CHECK_MESSAGE( ((is_get_succeeded)), "There is no item in the buffer");
-    CHECK_MESSAGE( ((tbb::flow::cast_to<input_t>(msg) == input_value)), "Wrong item value");
+    CHECK_MESSAGE(((is_get_succeeded)), "There is no item in the buffer");
+    CHECK_MESSAGE(((tbb::flow::cast_to<input_t>(msg) == input_value)), "Wrong item value");
     return true;
 }
 
@@ -575,8 +518,10 @@ template <typename... T>
 void sink(T...) {}
 
 template <typename indexer_output_t, typename Type, typename BN, std::size_t... Seq>
-void check_edge(tbb::flow::graph& g, BN& bn, tbb::flow::buffer_node<indexer_output_t>& buf, Type, tbb::detail::index_sequence<Seq...>) {
-    sink(check_edge<indexer_output_t>(g, std::get<Seq>(bn), buf, typename std::tuple_element<Seq, Type>::type(Seq))...);
+void check_edge(tbb::flow::graph &g, BN &bn, tbb::flow::buffer_node<indexer_output_t> &buf, Type,
+                tbb::detail::index_sequence<Seq...>) {
+    sink(check_edge<indexer_output_t>(g, std::get<Seq>(bn), buf,
+                                      typename std::tuple_element<Seq, Type>::type(Seq))...);
 }
 
 template <typename... Args, std::size_t... Seq>
@@ -639,7 +584,7 @@ void test_follows_and_precedes_api() {
     test_follows<float, double, int, double, double, float, long, int, float, long>();
     test_precedes();
 }
-#endif // __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+#endif// __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 void test_deduction_guides() {
@@ -682,22 +627,22 @@ void test_try_put_and_wait() {
         tbb::flow::indexer_node<int, float> indexer(g);
         using output_type = decltype(indexer)::output_type;
 
-        tbb::flow::function_node<output_type, int> function(g, tbb::flow::serial,
-            [&](output_type tag_msg) noexcept {
-                if (tag_msg.tag() == 0) {
-                    int input = tag_msg.cast_to<int>();
-                    if (input == wait_message) {
-                        for (auto item : new_work_items) {
-                            tbb::flow::input_port<0>(indexer).try_put(item);
-                            tbb::flow::input_port<1>(indexer).try_put(float(item));
+        tbb::flow::function_node<output_type, int> function(
+                g, tbb::flow::serial, [&](output_type tag_msg) noexcept {
+                    if (tag_msg.tag() == 0) {
+                        int input = tag_msg.cast_to<int>();
+                        if (input == wait_message) {
+                            for (auto item : new_work_items) {
+                                tbb::flow::input_port<0>(indexer).try_put(item);
+                                tbb::flow::input_port<1>(indexer).try_put(float(item));
+                            }
                         }
+                        processed_items1.emplace_back(input);
+                    } else {
+                        processed_items2.emplace_back(tag_msg.cast_to<float>());
                     }
-                    processed_items1.emplace_back(input);
-                } else {
-                    processed_items2.emplace_back(tag_msg.cast_to<float>());
-                }
-                return 0;
-            });
+                    return 0;
+                });
 
         tbb::flow::make_edge(indexer, function);
 
@@ -729,67 +674,63 @@ void test_try_put_and_wait() {
 
         for (auto item : new_work_items) {
             CHECK_MESSAGE(processed_items1[check_index1++] == item, "Unexpected new_work_items processing");
-            CHECK_MESSAGE(processed_items2[check_index2++] == float(item), "Unexpected new_work_items processing");
+            CHECK_MESSAGE(processed_items2[check_index2++] == float(item),
+                          "Unexpected new_work_items processing");
         }
         CHECK((check_index1 == processed_items1.size() && check_index2 == processed_items2.size()));
     });
 }
-#endif // __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+#endif// __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
 
 //! Serial and parallel test on various tuple sizes
 //! \brief \ref error_guessing
 TEST_CASE("Serial and parallel test") {
     INFO("Testing indexer_node, ");
 
-   for (int p = 0; p < 2; ++p) {
-       generate_test<serial_test, float>::do_test();
+    for (int p = 0; p < 2; ++p) {
+        generate_test<serial_test, float>::do_test();
 #if MAX_TUPLE_TEST_SIZE >= 4
-       generate_test<serial_test, float, double, int, short>::do_test();
+        generate_test<serial_test, float, double, int, short>::do_test();
 #endif
 #if MAX_TUPLE_TEST_SIZE >= 6
-       generate_test<serial_test, double, double, int, long, int, short>::do_test();
+        generate_test<serial_test, double, double, int, long, int, short>::do_test();
 #endif
 #if MAX_TUPLE_TEST_SIZE >= 8
-       generate_test<serial_test, float, double, double, double, float, int, float, long>::do_test();
+        generate_test<serial_test, float, double, double, double, float, int, float, long>::do_test();
 #endif
 #if MAX_TUPLE_TEST_SIZE >= 10
-       generate_test<serial_test, float, double, int, double, double, float, long, int, float, long>::do_test();
+        generate_test<serial_test, float, double, int, double, double, float, long, int, float,
+                      long>::do_test();
 #endif
-       generate_test<parallel_test, float, double>::do_test();
+        generate_test<parallel_test, float, double>::do_test();
 #if MAX_TUPLE_TEST_SIZE >= 3
-       generate_test<parallel_test, float, int, long>::do_test();
+        generate_test<parallel_test, float, int, long>::do_test();
 #endif
 #if MAX_TUPLE_TEST_SIZE >= 5
-       generate_test<parallel_test, double, double, int, int, short>::do_test();
+        generate_test<parallel_test, double, double, int, int, short>::do_test();
 #endif
 #if MAX_TUPLE_TEST_SIZE >= 7
-       generate_test<parallel_test, float, int, double, float, long, float, long>::do_test();
+        generate_test<parallel_test, float, int, double, float, long, float, long>::do_test();
 #endif
 #if MAX_TUPLE_TEST_SIZE >= 9
-       generate_test<parallel_test, float, double, int, double, double, long, int, float, long>::do_test();
+        generate_test<parallel_test, float, double, int, double, double, long, int, float, long>::do_test();
 #endif
-   }
+    }
 }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 //! Test follows and precedes API
 //! \brief \ref error_guessing
-TEST_CASE("Follows and precedes API") {
-    test_follows_and_precedes_api();
-}
+TEST_CASE("Follows and precedes API") { test_follows_and_precedes_api(); }
 #endif
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 //! Test deduction guides
 //! \brief \ref requirement
-TEST_CASE("Deduction guides") {
-    test_deduction_guides();
-}
+TEST_CASE("Deduction guides") { test_deduction_guides(); }
 #endif
 
 #if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
 //! \brief \ref error_guessing
-TEST_CASE("test indexer_node try_put_and_wait") {
-    test_try_put_and_wait();
-}
+TEST_CASE("test indexer_node try_put_and_wait") { test_try_put_and_wait(); }
 #endif
diff --git a/external/tbb/test/tbb/test_input_node.cpp b/external/tbb/test/tbb/test_input_node.cpp
index 94426939..3e2e31cf 100644
--- a/external/tbb/test/tbb/test_input_node.cpp
+++ b/external/tbb/test/tbb/test_input_node.cpp
@@ -20,151 +20,136 @@
 
 #include "tbb/flow_graph.h"
 
+#include "common/concepts_common.h"
 #include "common/test.h"
 #include "common/utils.h"
 #include "common/utils_assert.h"
-#include "common/concepts_common.h"
-
 
 //! \file test_input_node.cpp
 //! \brief Test for [flow_graph.input_node] specification
 
-
 using tbb::detail::d2::graph_task;
 using tbb::detail::d2::SUCCESSFULLY_ENQUEUED;
 
 const int N = 1000;
 
-template< typename T >
+template <typename T>
 class test_push_receiver : public tbb::flow::receiver<T>, utils::NoAssign {
 
     std::atomic<int> my_counters[N];
     tbb::flow::graph& my_graph;
 
 public:
-
     test_push_receiver(tbb::flow::graph& g) : my_graph(g) {
-        for (int i = 0; i < N; ++i )
-            my_counters[i] = 0;
+        for (int i = 0; i < N; ++i) my_counters[i] = 0;
     }
 
-    int get_count( int i ) {
+    int get_count(int i) {
         int v = my_counters[i];
         return v;
     }
 
     typedef typename tbb::flow::receiver<T>::predecessor_type predecessor_type;
 
-    graph_task* try_put_task( const T &v ) override {
-        int i = (int)v;
+    graph_task* try_put_task(const T& v) override {
+        int i = (int) v;
         ++my_counters[i];
         return const_cast<graph_task*>(SUCCESSFULLY_ENQUEUED);
     }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
-    graph_task* try_put_task( const T& v, const tbb::detail::d2::message_metainfo& ) override {
+    graph_task* try_put_task(const T& v, const tbb::detail::d2::message_metainfo&) override {
         return try_put_task(v);
     }
 #endif
 
-    tbb::flow::graph& graph_reference() const override {
-        return my_graph;
-    }
+    tbb::flow::graph& graph_reference() const override { return my_graph; }
 };
 
-template< typename T >
+template <typename T>
 class my_input_body {
 
     unsigned my_count;
-    int *ninvocations;
+    int* ninvocations;
 
 public:
-
     my_input_body() : ninvocations(nullptr) { my_count = 0; }
-    my_input_body(int &_inv) : ninvocations(&_inv)  { my_count = 0; }
+    my_input_body(int& _inv) : ninvocations(&_inv) { my_count = 0; }
 
-    T operator()( tbb::flow_control& fc ) {
-        T v = (T)my_count++;
-        if(ninvocations) ++(*ninvocations);
-        if ( (int)v < N ){
+    T operator()(tbb::flow_control& fc) {
+        T v = (T) my_count++;
+        if (ninvocations) ++(*ninvocations);
+        if ((int) v < N) {
             return v;
-        }else{
+        } else {
             fc.stop();
             return T();
         }
     }
-
 };
 
-template< typename T >
+template <typename T>
 class function_body {
 
-    std::atomic<int> *my_counters;
+    std::atomic<int>* my_counters;
 
 public:
-
-    function_body( std::atomic<int> *counters ) : my_counters(counters) {
-        for (int i = 0; i < N; ++i )
-            my_counters[i] = 0;
+    function_body(std::atomic<int>* counters) : my_counters(counters) {
+        for (int i = 0; i < N; ++i) my_counters[i] = 0;
     }
 
-    bool operator()( T v ) {
-        ++my_counters[(int)v];
+    bool operator()(T v) {
+        ++my_counters[(int) v];
         return true;
     }
-
 };
 
-template< typename T >
+template <typename T>
 void test_single_dest() {
     // push only
     tbb::flow::graph g;
-    tbb::flow::input_node<T> src(g, my_input_body<T>() );
+    tbb::flow::input_node<T> src(g, my_input_body<T>());
     test_push_receiver<T> dest(g);
-    tbb::flow::make_edge( src, dest );
+    tbb::flow::make_edge(src, dest);
     src.activate();
     g.wait_for_all();
-    for (int i = 0; i < N; ++i ) {
-        CHECK_MESSAGE( dest.get_count(i) == 1, "" );
-    }
+    for (int i = 0; i < N; ++i) { CHECK_MESSAGE(dest.get_count(i) == 1, ""); }
 
     // push only
     std::atomic<int> counters3[N];
-    tbb::flow::input_node<T> src3(g, my_input_body<T>() );
+    tbb::flow::input_node<T> src3(g, my_input_body<T>());
     src3.activate();
 
-    function_body<T> b3( counters3 );
-    tbb::flow::function_node<T,bool> dest3(g, tbb::flow::unlimited, b3 );
-    tbb::flow::make_edge( src3, dest3 );
+    function_body<T> b3(counters3);
+    tbb::flow::function_node<T, bool> dest3(g, tbb::flow::unlimited, b3);
+    tbb::flow::make_edge(src3, dest3);
     g.wait_for_all();
-    for (int i = 0; i < N; ++i ) {
+    for (int i = 0; i < N; ++i) {
         int v = counters3[i];
-        CHECK_MESSAGE( v == 1, "" );
+        CHECK_MESSAGE(v == 1, "");
     }
 
     // push & pull
-    tbb::flow::input_node<T> src2(g, my_input_body<T>() );
+    tbb::flow::input_node<T> src2(g, my_input_body<T>());
     src2.activate();
     std::atomic<int> counters2[N];
 
-    function_body<T> b2( counters2 );
-    tbb::flow::function_node<T,bool,tbb::flow::rejecting> dest2(g, tbb::flow::serial, b2 );
-    tbb::flow::make_edge( src2, dest2 );
+    function_body<T> b2(counters2);
+    tbb::flow::function_node<T, bool, tbb::flow::rejecting> dest2(g, tbb::flow::serial, b2);
+    tbb::flow::make_edge(src2, dest2);
     g.wait_for_all();
-    for (int i = 0; i < N; ++i ) {
+    for (int i = 0; i < N; ++i) {
         int v = counters2[i];
-        CHECK_MESSAGE( v == 1, "" );
+        CHECK_MESSAGE(v == 1, "");
     }
 
     // test copy constructor
     tbb::flow::input_node<T> src_copy(src);
     src_copy.activate();
     test_push_receiver<T> dest_c(g);
-    CHECK_MESSAGE( src_copy.register_successor(dest_c), "" );
+    CHECK_MESSAGE(src_copy.register_successor(dest_c), "");
     g.wait_for_all();
-    for (int i = 0; i < N; ++i ) {
-        CHECK_MESSAGE( dest_c.get_count(i) == 1, "" );
-    }
+    for (int i = 0; i < N; ++i) { CHECK_MESSAGE(dest_c.get_count(i) == 1, ""); }
 }
 
 void test_reset() {
@@ -174,37 +159,37 @@ void test_reset() {
     tbb::flow::input_node<int> src3(g, my_input_body<int>());
     src3.activate();
     tbb::flow::input_node<int> src_inactive(g, my_input_body<int>());
-    function_body<int> b3( counters3 );
-    tbb::flow::function_node<int,bool> dest3(g, tbb::flow::unlimited, b3);
-    tbb::flow::make_edge( src3, dest3 );
+    function_body<int> b3(counters3);
+    tbb::flow::function_node<int, bool> dest3(g, tbb::flow::unlimited, b3);
+    tbb::flow::make_edge(src3, dest3);
     //    source_node already in active state.  Let the graph run,
     g.wait_for_all();
     //    check the array for each value.
-    for (int i = 0; i < N; ++i ) {
+    for (int i = 0; i < N; ++i) {
         int v = counters3[i];
-        CHECK_MESSAGE( v == 1, "" );
+        CHECK_MESSAGE(v == 1, "");
         counters3[i] = 0;
     }
 
-    g.reset(tbb::flow::rf_reset_bodies);  // <-- re-initializes the counts.
+    g.reset(tbb::flow::rf_reset_bodies);// <-- re-initializes the counts.
     // and spawns task to run input
     src3.activate();
 
     g.wait_for_all();
     //    check output queue again.  Should be the same contents.
-    for (int i = 0; i < N; ++i ) {
+    for (int i = 0; i < N; ++i) {
         int v = counters3[i];
-        CHECK_MESSAGE( v == 1, "" );
+        CHECK_MESSAGE(v == 1, "");
         counters3[i] = 0;
     }
-    g.reset();  // doesn't reset the input_node_body to initial state, but does spawn a task
-                // to run the input_node.
+    g.reset();// doesn't reset the input_node_body to initial state, but does spawn a task
+              // to run the input_node.
 
     g.wait_for_all();
     // array should be all zero
-    for (int i = 0; i < N; ++i ) {
+    for (int i = 0; i < N; ++i) {
         int v = counters3[i];
-        CHECK_MESSAGE( v == 0, "" );
+        CHECK_MESSAGE(v == 0, "");
     }
 
     remove_edge(src3, dest3);
@@ -212,51 +197,51 @@ void test_reset() {
 
     // src_inactive doesn't run
     g.wait_for_all();
-    for (int i = 0; i < N; ++i ) {
+    for (int i = 0; i < N; ++i) {
         int v = counters3[i];
-        CHECK_MESSAGE( v == 0, "" );
+        CHECK_MESSAGE(v == 0, "");
     }
 
     // run graph
     src_inactive.activate();
     g.wait_for_all();
     // check output
-    for (int i = 0; i < N; ++i ) {
+    for (int i = 0; i < N; ++i) {
         int v = counters3[i];
-        CHECK_MESSAGE( v == 1, "" );
+        CHECK_MESSAGE(v == 1, "");
         counters3[i] = 0;
     }
-    g.reset(tbb::flow::rf_reset_bodies);  // <-- reinitializes the counts
+    g.reset(tbb::flow::rf_reset_bodies);// <-- reinitializes the counts
     // src_inactive doesn't run
     g.wait_for_all();
-    for (int i = 0; i < N; ++i ) {
+    for (int i = 0; i < N; ++i) {
         int v = counters3[i];
-        CHECK_MESSAGE( v == 0, "" );
+        CHECK_MESSAGE(v == 0, "");
     }
 
     // start it up
     src_inactive.activate();
     g.wait_for_all();
-    for (int i = 0; i < N; ++i ) {
+    for (int i = 0; i < N; ++i) {
         int v = counters3[i];
-        CHECK_MESSAGE( v == 1, "" );
+        CHECK_MESSAGE(v == 1, "");
         counters3[i] = 0;
     }
-    g.reset();  // doesn't reset the input_node_body to initial state, and doesn't
-                // spawn a task to run the input_node.
+    g.reset();// doesn't reset the input_node_body to initial state, and doesn't
+              // spawn a task to run the input_node.
 
     g.wait_for_all();
     // array should be all zero
-    for (int i = 0; i < N; ++i ) {
+    for (int i = 0; i < N; ++i) {
         int v = counters3[i];
-        CHECK_MESSAGE( v == 0, "" );
+        CHECK_MESSAGE(v == 0, "");
     }
     src_inactive.activate();
     // input_node_body is already in final state, so input_node will not forward a message.
     g.wait_for_all();
-    for (int i = 0; i < N; ++i ) {
+    for (int i = 0; i < N; ++i) {
         int v = counters3[i];
-        CHECK_MESSAGE( v == 0, "" );
+        CHECK_MESSAGE(v == 0, "");
     }
 }
 
@@ -267,67 +252,58 @@ void test_follows_and_precedes_api() {
 
     graph g;
 
-    std::array<buffer_node<bool>, 3> successors {{
-                                                  buffer_node<bool>(g),
-                                                  buffer_node<bool>(g),
-                                                  buffer_node<bool>(g)
-        }};
+    std::array<buffer_node<bool>, 3> successors {
+            {buffer_node<bool>(g), buffer_node<bool>(g), buffer_node<bool>(g)}};
 
     bool do_try_put = true;
-    input_node<bool> src(
-        precedes(successors[0], successors[1], successors[2]),
-        [&](tbb::flow_control& fc) -> bool {
-            if(!do_try_put)
-                fc.stop();
-            do_try_put = !do_try_put;
-            return true;
-        }
-    );
+    input_node<bool> src(precedes(successors[0], successors[1], successors[2]),
+                         [&](tbb::flow_control& fc) -> bool {
+                             if (!do_try_put) fc.stop();
+                             do_try_put = !do_try_put;
+                             return true;
+                         });
 
     src.activate();
     g.wait_for_all();
 
     bool storage;
-    for(auto& successor: successors) {
+    for (auto& successor : successors) {
         CHECK_MESSAGE((successor.try_get(storage) && !successor.try_get(storage)),
                       "Not exact edge quantity was made");
     }
 }
-#endif // __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+#endif// __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 
 //! Test push, push-pull behavior and copy constructor
 //! \brief \ref error_guessing \ref requirement
-TEST_CASE("Single destination tests"){
-    for ( unsigned int p = utils::MinThread; p < utils::MaxThread; ++p ) {
+TEST_CASE("Single destination tests") {
+    for (unsigned int p = utils::MinThread; p < utils::MaxThread; ++p) {
         tbb::task_arena arena(p);
-        arena.execute(
-            [&]() {
-                test_single_dest<int>();
-                test_single_dest<float>();
-            }
-        );
-	}
+        arena.execute([&]() {
+            test_single_dest<int>();
+            test_single_dest<float>();
+        });
+    }
 }
 
 //! Test reset variants
 //! \brief \ref error_guessing
-TEST_CASE("Reset test"){
-    test_reset();
-}
+TEST_CASE("Reset test") { test_reset(); }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 //! Test follows and precedes API
 //! \brief \ref error_guessing
-TEST_CASE("Follows and precedes API"){
-    test_follows_and_precedes_api();
-}
+TEST_CASE("Follows and precedes API") { test_follows_and_precedes_api(); }
 #endif
 
 //! Test try_get before activation
 //! \brief \ref error_guessing
-TEST_CASE("try_get before activation"){
+TEST_CASE("try_get before activation") {
     tbb::flow::graph g;
-    tbb::flow::input_node<int> in(g, [&](tbb::flow_control& fc) { fc.stop(); return 0;});
+    tbb::flow::input_node<int> in(g, [&](tbb::flow_control& fc) {
+        fc.stop();
+        return 0;
+    });
 
     int tmp = -1;
     CHECK_MESSAGE((in.try_get(tmp) == false), "try_get before activation should not succeed");
@@ -345,7 +321,8 @@ TEST_CASE("constraints for input_node output") {
 }
 
 template <typename Output, typename Body>
-concept can_call_input_node_ctor = requires( tbb::flow::graph& graph, Body body, tbb::flow::buffer_node<int> f ) {
+concept can_call_input_node_ctor
+        = requires(tbb::flow::graph& graph, Body body, tbb::flow::buffer_node<int> f) {
     tbb::flow::input_node<Output>(graph, body);
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
     tbb::flow::input_node<Output>(tbb::flow::precedes(f), body);
@@ -364,4 +341,4 @@ TEST_CASE("constraints for input_node body") {
     static_assert(!can_call_input_node_ctor<output_type, WrongInputOperatorRoundBrackets<output_type>>);
     static_assert(!can_call_input_node_ctor<output_type, WrongReturnOperatorRoundBrackets<output_type>>);
 }
-#endif // __TBB_CPP20_CONCEPTS_PRESENT
+#endif// __TBB_CPP20_CONCEPTS_PRESENT
diff --git a/external/tbb/test/tbb/test_intrusive_list.cpp b/external/tbb/test/tbb/test_intrusive_list.cpp
index bfa45d06..5ff94920 100644
--- a/external/tbb/test/tbb/test_intrusive_list.cpp
+++ b/external/tbb/test/tbb/test_intrusive_list.cpp
@@ -17,33 +17,33 @@
 //! \file test_intrusive_list.cpp
 //! \brief Test for [internal] functionality
 
+#include "../../src/tbb/intrusive_list.h"
 #include "common/test.h"
 #include "common/utils.h"
-#include "../../src/tbb/intrusive_list.h"
 
 using tbb::detail::r1::intrusive_list_node;
 
 // Machine word filled with repeated pattern of FC bits
-const uintptr_t NoliMeTangere = ~uintptr_t(0)/0xFF*0xFC;
+const uintptr_t NoliMeTangere = ~uintptr_t(0) / 0xFF * 0xFC;
 
 struct VerificationBase : utils::NoAfterlife {
     uintptr_t m_Canary;
     VerificationBase() : m_Canary(NoliMeTangere) {}
-}; // struct VerificationBase
+};// struct VerificationBase
 
 struct DataItemWithInheritedNodeBase : intrusive_list_node {
     int m_Data;
 
-    DataItemWithInheritedNodeBase( int value ) : m_Data(value) {}
+    DataItemWithInheritedNodeBase(int value) : m_Data(value) {}
 
     int Data() const { return m_Data; }
-}; // struct DataItemWithInheritedNodeBase
+};// struct DataItemWithInheritedNodeBase
 
 struct DataItemWithInheritedNode : VerificationBase, DataItemWithInheritedNodeBase {
     friend class tbb::detail::r1::intrusive_list<DataItemWithInheritedNode>;
 
-    DataItemWithInheritedNode( int value ) : DataItemWithInheritedNodeBase(value) {}
-}; // struct DataItemWithInheritedNode
+    DataItemWithInheritedNode(int value) : DataItemWithInheritedNodeBase(value) {}
+};// struct DataItemWithInheritedNode
 
 struct DataItemWithMemberNodeBase {
     int m_Data;
@@ -51,31 +51,31 @@ struct DataItemWithMemberNodeBase {
     // Cannot be used be member_intrusive_list to form lists of objects derived from DataItemBase
     intrusive_list_node m_BaseNode;
 
-    DataItemWithMemberNodeBase( int value ) : m_Data(value) {}
+    DataItemWithMemberNodeBase(int value) : m_Data(value) {}
 
     int Data() const { return m_Data; }
-}; // struct DataItemWithMemberNodeBase
+};// struct DataItemWithMemberNodeBase
 
 struct DataItemWithMemberNodes : VerificationBase, DataItemWithMemberNodeBase {
     intrusive_list_node m_Node;
 
-    DataItemWithMemberNodes( int value ) : DataItemWithMemberNodeBase(value) {}
-}; // struct DataItemWithMemberNodes
+    DataItemWithMemberNodes(int value) : DataItemWithMemberNodeBase(value) {}
+};// struct DataItemWithMemberNodes
 
 using intrusive_list1 = tbb::detail::r1::intrusive_list<DataItemWithInheritedNode>;
-using intrusive_list2 = tbb::detail::r1::memptr_intrusive_list<DataItemWithMemberNodes,
-                                                               DataItemWithMemberNodeBase,
-                                                               &DataItemWithMemberNodeBase::m_BaseNode>;
+using intrusive_list2
+        = tbb::detail::r1::memptr_intrusive_list<DataItemWithMemberNodes, DataItemWithMemberNodeBase,
+                                                 &DataItemWithMemberNodeBase::m_BaseNode>;
 
-using intrusive_list3 = tbb::detail::r1::memptr_intrusive_list<DataItemWithMemberNodes,
-                                                               DataItemWithMemberNodes,
-                                                               &DataItemWithMemberNodes::m_Node>;
+using intrusive_list3
+        = tbb::detail::r1::memptr_intrusive_list<DataItemWithMemberNodes, DataItemWithMemberNodes,
+                                                 &DataItemWithMemberNodes::m_Node>;
 
 const int NumElements = 256 * 1024;
 
 // Iterates through the list forward and backward checking the validity of values stored by the list nodes
 template <typename List, typename Iterator>
-void check_list_nodes( List& il, int value_step ) {
+void check_list_nodes(List& il, int value_step) {
     REQUIRE_MESSAGE(il.size() == unsigned(NumElements / value_step), "Wrong size of the list");
     REQUIRE_MESSAGE(!il.empty(), "Incorrect result of empty() or the list is corrupted");
 
@@ -85,15 +85,16 @@ void check_list_nodes( List& il, int value_step ) {
     Iterator it_default;
     REQUIRE_MESSAGE(it_default != it, "Incorrect default constructed intrusive_list::iterator");
 
-    for ( i = value_step - 1; it != il.end(); ++it, i += value_step ) {
+    for (i = value_step - 1; it != il.end(); ++it, i += value_step) {
         REQUIRE_MESSAGE(it->Data() == i, "Unexpected node value while iterating forward");
         REQUIRE_MESSAGE(it->m_Canary == NoliMeTangere, "Memory corruption");
     }
 
-    REQUIRE_MESSAGE(i == NumElements + value_step - 1, "Wrong number of list elements while iterating forward");
+    REQUIRE_MESSAGE(i == NumElements + value_step - 1,
+                    "Wrong number of list elements while iterating forward");
     it = il.end();
 
-    for ( i = NumElements - 1, it--; it != il.end(); --it, i -= value_step ) {
+    for (i = NumElements - 1, it--; it != il.end(); --it, i -= value_step) {
         REQUIRE_MESSAGE(it->Data() == i, "Unexpected node value while iterating backward");
         REQUIRE_MESSAGE(it->m_Canary == NoliMeTangere, "Memory corruption");
     }
@@ -106,28 +107,26 @@ void test_list_operations() {
 
     List il;
 
-    for (int i = NumElements - 1; i >= 0; --i) {
-        il.push_front(*new Item(i));
-    }
+    for (int i = NumElements - 1; i >= 0; --i) { il.push_front(*new Item(i)); }
     check_list_nodes<const List, typename List::const_iterator>(il, 1);
     iterator it = il.begin();
 
-    for (;it != il.end(); ++it) {
+    for (; it != il.end(); ++it) {
         Item& item = *it;
-        it = il.erase(it); // also advances the iterator
+        it = il.erase(it);// also advances the iterator
         delete &item;
     }
 
     check_list_nodes<List, iterator>(il, 2);
     for (it = il.begin(); it != il.end(); ++it) {
         Item& item = *it;
-        il.remove(*it++); // extra advance here as well
+        il.remove(*it++);// extra advance here as well
         delete &item;
     }
 
     check_list_nodes<List, iterator>(il, 4);
     for (it = il.begin(); it != il.end();) {
-        Item& item = *it++; // the iterator advances only here
+        Item& item = *it++;// the iterator advances only here
         il.remove(item);
         delete &item;
     }
diff --git a/external/tbb/test/tbb/test_join_node.cpp b/external/tbb/test/tbb/test_join_node.cpp
index 7f1721e0..5c260b67 100644
--- a/external/tbb/test/tbb/test_join_node.cpp
+++ b/external/tbb/test/tbb/test_join_node.cpp
@@ -15,14 +15,14 @@
 */
 
 #ifdef TBB_TEST_LOW_WORKLOAD
-    #undef MAX_TUPLE_TEST_SIZE
-    #define MAX_TUPLE_TEST_SIZE 3
+#undef MAX_TUPLE_TEST_SIZE
+#define MAX_TUPLE_TEST_SIZE 3
 #endif
 
 #include "common/config.h"
 
-#include "test_join_node.h"
 #include "common/test_join_node_multiple_predecessors.h"
+#include "test_join_node.h"
 
 //! \file test_join_node.cpp
 //! \brief Test for [flow_graph.join_node] specification
@@ -31,21 +31,21 @@ static std::atomic<int> output_count;
 
 // get the tag from the output tuple and emit it.
 // the first tuple component is tag * 2 cast to the type
-template<typename OutputTupleType>
+template <typename OutputTupleType>
 class recirc_output_func_body {
 public:
     // we only need this to use input_node_helper
     typedef typename tbb::flow::join_node<OutputTupleType, tbb::flow::tag_matching> join_node_type;
     static const int N = std::tuple_size<OutputTupleType>::value;
-    int operator()(const OutputTupleType &v) {
-        int out = int(std::get<0>(v))/2;
+    int operator()(const OutputTupleType& v) {
+        int out = int(std::get<0>(v)) / 2;
         input_node_helper<N, join_node_type>::only_check_value(out, v);
         ++output_count;
         return out;
     }
 };
 
-template<typename JType>
+template <typename JType>
 class tag_recirculation_test {
 public:
     typedef typename JType::output_type TType;
@@ -55,16 +55,16 @@ class tag_recirculation_test {
     static void test() {
         input_node_helper<N, JType>::print_remark("Recirculation test of tag-matching join");
         INFO(" >\n");
-        for(int maxTag = 1; maxTag <10; maxTag *= 3) {
-            for(int i = 0; i < N; ++i) all_input_nodes[i][0] = nullptr;
+        for (int maxTag = 1; maxTag < 10; maxTag *= 3) {
+            for (int i = 0; i < N; ++i) all_input_nodes[i][0] = nullptr;
 
             tbb::flow::graph g;
             // this is the tag-matching join we're testing
-            JType * my_join = makeJoin<N, JType, tbb::flow::tag_matching>::create(g);
+            JType* my_join = makeJoin<N, JType, tbb::flow::tag_matching>::create(g);
             // input_node for continue messages
             tbb::flow::input_node<tbb::flow::continue_msg> snode(g, recirc_input_node_body());
             // reserving join that matches recirculating tags with continue messages.
-            input_join_type * my_input_join = makeJoin<2, input_join_type, tbb::flow::reserving>::create(g);
+            input_join_type* my_input_join = makeJoin<2, input_join_type, tbb::flow::reserving>::create(g);
             // tbb::flow::make_edge(snode, tbb::flow::input_port<1>(*my_input_join));
             tbb::flow::make_edge(snode, std::get<1>(my_input_join->input_ports()));
             // queue to hold the tags
@@ -73,13 +73,14 @@ class tag_recirculation_test {
             // add all the function_nodes that are inputs to the tag-matching join
             input_node_helper<N, JType>::add_recirc_func_nodes(*my_join, *my_input_join, g);
             // add the function_node that accepts the output of the join and emits the int tag it was based on
-            tbb::flow::function_node<TType, int> recreate_tag(g, tbb::flow::unlimited, recirc_output_func_body<TType>());
+            tbb::flow::function_node<TType, int> recreate_tag(g, tbb::flow::unlimited,
+                                                              recirc_output_func_body<TType>());
             tbb::flow::make_edge(*my_join, recreate_tag);
             // now the recirculating part (output back to the queue)
             tbb::flow::make_edge(recreate_tag, tag_queue);
 
             // put the tags into the queue
-            for(int t = 1; t<=maxTag; ++t) tag_queue.try_put(t);
+            for (int t = 1; t <= maxTag; ++t) tag_queue.try_put(t);
 
             input_count = Recirc_count;
             output_count = 0;
@@ -90,17 +91,17 @@ class tag_recirculation_test {
             // wait for everything to stop
             g.wait_for_all();
 
-            CHECK_MESSAGE( (output_count==Recirc_count), "not all instances were received");
+            CHECK_MESSAGE((output_count == Recirc_count), "not all instances were received");
 
-            int j{};
+            int j {};
             // grab the tags from the queue, record them
             std::vector<bool> out_tally(maxTag, false);
-            for(int i = 0; i < maxTag; ++i) {
-                CHECK_MESSAGE( (tag_queue.try_get(j)), "not enough tags in queue");
-                CHECK_MESSAGE( (!out_tally.at(j-1)), "duplicate tag from queue");
-                out_tally[j-1] = true;
+            for (int i = 0; i < maxTag; ++i) {
+                CHECK_MESSAGE((tag_queue.try_get(j)), "not enough tags in queue");
+                CHECK_MESSAGE((!out_tally.at(j - 1)), "duplicate tag from queue");
+                out_tally[j - 1] = true;
             }
-            CHECK_MESSAGE( (!tag_queue.try_get(j)), "Extra tags in recirculation queue");
+            CHECK_MESSAGE((!tag_queue.try_get(j)), "Extra tags in recirculation queue");
 
             // deconstruct graph
             input_node_helper<N, JType>::remove_recirc_func_nodes(*my_join, *my_input_join);
@@ -113,24 +114,20 @@ class tag_recirculation_test {
     }
 };
 
-template<typename JType>
+template <typename JType>
 class generate_recirc_test {
 public:
     typedef tbb::flow::join_node<JType, tbb::flow::tag_matching> join_node_type;
-    static void do_test() {
-        tag_recirculation_test<join_node_type>::test();
-    }
+    static void do_test() { tag_recirculation_test<join_node_type>::test(); }
 };
 
 //! Test hash buffers behavior
 //! \brief \ref error_guessing
-TEST_CASE("Tagged buffers test"){
-    TestTaggedBuffers();
-}
+TEST_CASE("Tagged buffers test") { TestTaggedBuffers(); }
 
 //! Test with various policies and tuple sizes
 //! \brief \ref error_guessing
-TEST_CASE("Main test"){
+TEST_CASE("Main test") {
     test_main<tbb::flow::queueing>();
     test_main<tbb::flow::reserving>();
     test_main<tbb::flow::tag_matching>();
@@ -138,9 +135,7 @@ TEST_CASE("Main test"){
 
 //! Test with recirculating tags
 //! \brief \ref error_guessing
-TEST_CASE("Recirculation test"){
-    generate_recirc_test<std::tuple<int,float> >::do_test();
-}
+TEST_CASE("Recirculation test") { generate_recirc_test<std::tuple<int, float>>::do_test(); }
 
 // TODO: Look deeper into this test to see if it has the right name
 // and if it actually tests some kind of regression. It is possible
diff --git a/external/tbb/test/tbb/test_join_node_key_matching.cpp b/external/tbb/test/tbb/test_join_node_key_matching.cpp
index c930f69d..12d993d2 100644
--- a/external/tbb/test/tbb/test_join_node_key_matching.cpp
+++ b/external/tbb/test/tbb/test_join_node_key_matching.cpp
@@ -29,8 +29,8 @@ void test_deduction_guides() {
     using tuple_type = std::tuple<int, int, double>;
 
     graph g;
-    auto body_int = [](const int&)->int { return 1; };
-    auto body_double = [](const double&)->int { return 1; };
+    auto body_int = [](const int&) -> int { return 1; };
+    auto body_double = [](const double&) -> int { return 1; };
 
     join_node j1(g, body_int, body_int, body_double);
     static_assert(std::is_same_v<decltype(j1), join_node<tuple_type, key_matching<int>>>);
@@ -56,31 +56,38 @@ void test_deduction_guides() {
 //! \brief \ref error_guessing
 TEST_CASE("Serial test on tuples") {
     INFO("key_matching\n");
-    generate_test<serial_test, std::tuple<MyKeyFirst<int, double>, MyKeySecond<int, float> >, tbb::flow::key_matching<int> >::do_test();
-    generate_test<serial_test, std::tuple<MyKeyFirst<std::string, double>, MyKeySecond<std::string, float> >, tbb::flow::key_matching<std::string> >::do_test();
-    generate_test<serial_test, std::tuple<MyKeyFirst<std::string, double>, MyKeySecond<std::string, float>, MyKeyWithBrokenMessageKey<std::string, int> >, tbb::flow::key_matching<std::string&> >::do_test();
+    generate_test<serial_test, std::tuple<MyKeyFirst<int, double>, MyKeySecond<int, float>>,
+                  tbb::flow::key_matching<int>>::do_test();
+    generate_test<serial_test, std::tuple<MyKeyFirst<std::string, double>, MyKeySecond<std::string, float>>,
+                  tbb::flow::key_matching<std::string>>::do_test();
+    generate_test<serial_test,
+                  std::tuple<MyKeyFirst<std::string, double>, MyKeySecond<std::string, float>,
+                             MyKeyWithBrokenMessageKey<std::string, int>>,
+                  tbb::flow::key_matching<std::string&>>::do_test();
 }
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 //! Test deduction guides
 //! \brief \ref requirement
-TEST_CASE("Test deduction guides"){
-    test_deduction_guides();
-}
+TEST_CASE("Test deduction guides") { test_deduction_guides(); }
 #endif
 
 //! Test parallel key matching on special input types
 //! \brief \ref error_guessing
-TEST_CASE("Parallel test on tuples"){
-    generate_test<parallel_test, std::tuple<MyKeyFirst<int, double>, MyKeySecond<int, float> >, tbb::flow::key_matching<int> >::do_test();
-    generate_test<parallel_test, std::tuple<MyKeyFirst<int, double>, MyKeySecond<int, float> >, tbb::flow::key_matching<int&> >::do_test();
-    generate_test<parallel_test, std::tuple<MyKeyFirst<std::string, double>, MyKeySecond<std::string, float> >, tbb::flow::key_matching<std::string&> >::do_test();
+TEST_CASE("Parallel test on tuples") {
+    generate_test<parallel_test, std::tuple<MyKeyFirst<int, double>, MyKeySecond<int, float>>,
+                  tbb::flow::key_matching<int>>::do_test();
+    generate_test<parallel_test, std::tuple<MyKeyFirst<int, double>, MyKeySecond<int, float>>,
+                  tbb::flow::key_matching<int&>>::do_test();
+    generate_test<parallel_test, std::tuple<MyKeyFirst<std::string, double>, MyKeySecond<std::string, float>>,
+                  tbb::flow::key_matching<std::string&>>::do_test();
 }
 
 #if __TBB_CPP20_CONCEPTS_PRESENT
 template <std::size_t Count>
 struct tuple_helper {
-    using type = decltype(std::tuple_cat(std::declval<std::tuple<int>>(), std::declval<typename tuple_helper<Count - 1>::type>()));
+    using type = decltype(std::tuple_cat(std::declval<std::tuple<int>>(),
+                                         std::declval<typename tuple_helper<Count - 1>::type>()));
 };
 
 template <>
@@ -90,25 +97,30 @@ struct tuple_helper<1> {
 
 template <typename... Args>
 concept can_initialize_join_node = requires(tbb::flow::graph& g, Args... args) {
-    tbb::flow::join_node<typename tuple_helper<sizeof...(Args)>::type,
-                         tbb::flow::key_matching<int>>(g, args...);
+    tbb::flow::join_node<typename tuple_helper<sizeof...(Args)>::type, tbb::flow::key_matching<int>>(g,
+                                                                                                     args...);
 };
 
 // Helper for the concepts which checks if key_matching join_node cannot be instantiated if
 // one of its constructor arguments do not satisfy join_node_function_object concept
 // This structure substitutes IncorrectT to the sequence of arguments on IncorrectArgIndex position
 // The remaining arguments in the sequence are CorrectT
-template <std::size_t ArgCount, std::size_t IncorrectArgIndex, typename CorrectT, typename IncorrectT, typename... Args>
+template <std::size_t ArgCount, std::size_t IncorrectArgIndex, typename CorrectT, typename IncorrectT,
+          typename... Args>
 struct multiple_arguments_initialization_helper {
     // Current index is not equal to IncorrectArgIndex - substitute CorrectT at the end of the arguments sequence and continue
-    static constexpr bool value = multiple_arguments_initialization_helper<ArgCount - 1, IncorrectArgIndex - 1, CorrectT, IncorrectT, Args..., CorrectT>::value;
+    static constexpr bool value
+            = multiple_arguments_initialization_helper<ArgCount - 1, IncorrectArgIndex - 1, CorrectT,
+                                                       IncorrectT, Args..., CorrectT>::value;
 };
 
 template <std::size_t ArgCount, typename CorrectT, typename IncorrectT, typename... Args>
 struct multiple_arguments_initialization_helper<ArgCount, 0, CorrectT, IncorrectT, Args...> {
     // Current index is equal to IncorrectArgIndex - substitute IncorrectT at the end of the sequence and continue
     // No more incorrect indices would be added - continue with MAX_TUPLE_TEST_SIZE variable as current incorrect index
-    static constexpr bool value = multiple_arguments_initialization_helper<ArgCount - 1, MAX_TUPLE_TEST_SIZE, CorrectT, IncorrectT, Args..., IncorrectT>::value;
+    static constexpr bool value
+            = multiple_arguments_initialization_helper<ArgCount - 1, MAX_TUPLE_TEST_SIZE, CorrectT,
+                                                       IncorrectT, Args..., IncorrectT>::value;
 };
 
 template <std::size_t IncorrectArgIndex, typename CorrectT, typename IncorrectT, typename... Args>
@@ -122,37 +134,46 @@ struct multiple_arguments_initialization_helper<0, IncorrectArgIndex, CorrectT,
 template <std::size_t ArgCount, std::size_t CurrentIncorrectIndex, typename CorrectT, typename IncorrectT>
 struct incorrect_arg_index_iteration_helper {
     // CurrentIncorrectIndex is not equal to max - check with current and continue
-    static constexpr bool value = multiple_arguments_initialization_helper<ArgCount, CurrentIncorrectIndex, CorrectT, IncorrectT>::value ||
-                                  incorrect_arg_index_iteration_helper<ArgCount, CurrentIncorrectIndex + 1, CorrectT, IncorrectT>::value;
+    static constexpr bool value = multiple_arguments_initialization_helper<ArgCount, CurrentIncorrectIndex,
+                                                                           CorrectT, IncorrectT>::value
+                                  || incorrect_arg_index_iteration_helper<ArgCount, CurrentIncorrectIndex + 1,
+                                                                          CorrectT, IncorrectT>::value;
 };
 
 template <std::size_t ArgCount, std::size_t CurrentIncorrectIndex, typename CorrectT, typename IncorrectT>
-requires (ArgCount == CurrentIncorrectIndex + 1)
-struct incorrect_arg_index_iteration_helper<ArgCount, CurrentIncorrectIndex, CorrectT, IncorrectT> {
+requires(ArgCount == CurrentIncorrectIndex + 1) struct incorrect_arg_index_iteration_helper<
+        ArgCount, CurrentIncorrectIndex, CorrectT, IncorrectT> {
     // CurrentIncorrectIndex is equal to max - check and stop
-    static constexpr bool value = multiple_arguments_initialization_helper<ArgCount, CurrentIncorrectIndex, CorrectT, IncorrectT>::value;
+    static constexpr bool value = multiple_arguments_initialization_helper<ArgCount, CurrentIncorrectIndex,
+                                                                           CorrectT, IncorrectT>::value;
 };
 
 // Helper which iterates over argument count. value is true if initialization (with all possible incorrect indices) is successful for at least one ArgCount
 template <std::size_t CurrentArgCount, typename CorrectT, typename IncorrectT>
 struct arg_count_iteration_helper {
     // CurrentArgCount is not equal to max - check and continue
-    static constexpr bool value = incorrect_arg_index_iteration_helper<CurrentArgCount, /*StartIncorrectIndex = */0, CorrectT, IncorrectT>::value ||
-                                  arg_count_iteration_helper<CurrentArgCount + 1, CorrectT, IncorrectT>::value;
+    static constexpr bool value
+            = incorrect_arg_index_iteration_helper<CurrentArgCount, /*StartIncorrectIndex = */ 0, CorrectT,
+                                                   IncorrectT>::value
+              || arg_count_iteration_helper<CurrentArgCount + 1, CorrectT, IncorrectT>::value;
 };
 
 template <typename CorrectT, typename IncorrectT>
 struct arg_count_iteration_helper<MAX_TUPLE_TEST_SIZE, CorrectT, IncorrectT> {
     // CurrentArgCount is equal to max - check and stop
-    static constexpr bool value = incorrect_arg_index_iteration_helper<MAX_TUPLE_TEST_SIZE, /*StartIncorrectIndex = */0, CorrectT, IncorrectT>::value;
+    static constexpr bool value
+            = incorrect_arg_index_iteration_helper<MAX_TUPLE_TEST_SIZE, /*StartIncorrectIndex = */ 0,
+                                                   CorrectT, IncorrectT>::value;
 };
 
 template <typename CorrectT, typename IncorrectT>
-concept can_initialize_join_node_with_incorrect_argument = arg_count_iteration_helper</*StartArgCount = */2, CorrectT, IncorrectT>::value;
+concept can_initialize_join_node_with_incorrect_argument
+        = arg_count_iteration_helper</*StartArgCount = */ 2, CorrectT, IncorrectT>::value;
 
 template <std::size_t CurrentArgCount, typename CorrectT, typename... Args>
 struct join_node_correct_initialization_helper {
-    static constexpr bool value = join_node_correct_initialization_helper<CurrentArgCount - 1, CorrectT, Args..., CorrectT>::value;
+    static constexpr bool value = join_node_correct_initialization_helper<CurrentArgCount - 1, CorrectT,
+                                                                          Args..., CorrectT>::value;
 };
 
 template <typename CorrectT, typename... Args>
@@ -162,26 +183,36 @@ struct join_node_correct_initialization_helper<0, CorrectT, Args...> {
 
 template <std::size_t CurrentArgCount, typename CorrectT>
 struct arg_count_correct_initialization_helper {
-    static constexpr bool value = join_node_correct_initialization_helper<CurrentArgCount, CorrectT>::value &&
-                                  arg_count_correct_initialization_helper<CurrentArgCount + 1, CorrectT>::value;
+    static constexpr bool value
+            = join_node_correct_initialization_helper<CurrentArgCount, CorrectT>::value
+              && arg_count_correct_initialization_helper<CurrentArgCount + 1, CorrectT>::value;
 };
 
 template <typename CorrectT>
 struct arg_count_correct_initialization_helper<MAX_TUPLE_TEST_SIZE, CorrectT> {
-    static constexpr bool value = join_node_correct_initialization_helper<MAX_TUPLE_TEST_SIZE, CorrectT>::value;
+    static constexpr bool value
+            = join_node_correct_initialization_helper<MAX_TUPLE_TEST_SIZE, CorrectT>::value;
 };
 
 template <typename CorrectT>
-concept can_initialize_join_node_with_correct_argument = arg_count_correct_initialization_helper</*Start = */2, CorrectT>::value;
+concept can_initialize_join_node_with_correct_argument
+        = arg_count_correct_initialization_helper</*Start = */ 2, CorrectT>::value;
 
 //! \brief \ref error_guessing
 TEST_CASE("join_node constraints") {
     using namespace test_concepts::join_node_function_object;
     static_assert(can_initialize_join_node_with_correct_argument<Correct<int, int>>);
-    static_assert(!can_initialize_join_node_with_incorrect_argument<Correct<int, int>, NonCopyable<int, int>>);
-    static_assert(!can_initialize_join_node_with_incorrect_argument<Correct<int, int>, NonDestructible<int, int>>);
-    static_assert(!can_initialize_join_node_with_incorrect_argument<Correct<int, int>, NoOperatorRoundBrackets<int, int>>);
-    static_assert(!can_initialize_join_node_with_incorrect_argument<Correct<int, int>, WrongInputOperatorRoundBrackets<int, int>>);
-    static_assert(!can_initialize_join_node_with_incorrect_argument<Correct<int, int>, WrongReturnOperatorRoundBrackets<int, int>>);
+    static_assert(
+            !can_initialize_join_node_with_incorrect_argument<Correct<int, int>, NonCopyable<int, int>>);
+    static_assert(
+            !can_initialize_join_node_with_incorrect_argument<Correct<int, int>, NonDestructible<int, int>>);
+    static_assert(!can_initialize_join_node_with_incorrect_argument<Correct<int, int>,
+                                                                    NoOperatorRoundBrackets<int, int>>);
+    static_assert(
+            !can_initialize_join_node_with_incorrect_argument<Correct<int, int>,
+                                                              WrongInputOperatorRoundBrackets<int, int>>);
+    static_assert(
+            !can_initialize_join_node_with_incorrect_argument<Correct<int, int>,
+                                                              WrongReturnOperatorRoundBrackets<int, int>>);
 }
-#endif // __TBB_CPP20_CONCEPTS_PRESENT
+#endif// __TBB_CPP20_CONCEPTS_PRESENT
diff --git a/external/tbb/test/tbb/test_join_node_key_matching_n_args.cpp b/external/tbb/test/tbb/test_join_node_key_matching_n_args.cpp
index 7479dba0..9baa0cd3 100644
--- a/external/tbb/test/tbb/test_join_node_key_matching_n_args.cpp
+++ b/external/tbb/test/tbb/test_join_node_key_matching_n_args.cpp
@@ -44,7 +44,7 @@ using T10 = make_tuple<T9, MyKeyWithBrokenMessageKey<std::string, size_t>>;
 //! Serial test with different tuple sizes
 //! \brief \ref error_guessing
 TEST_CASE_TEMPLATE_N_ARGS("Serial N tests on tuples") {
-     generate_test<serial_test, T, tbb::flow::key_matching<std::string&>>::do_test();
+    generate_test<serial_test, T, tbb::flow::key_matching<std::string&>>::do_test();
 }
 
 //! Parallel test with different tuple sizes
diff --git a/external/tbb/test/tbb/test_join_node_msg_key_matching.cpp b/external/tbb/test/tbb/test_join_node_msg_key_matching.cpp
index 4ad91c65..05c00dc7 100644
--- a/external/tbb/test/tbb/test_join_node_msg_key_matching.cpp
+++ b/external/tbb/test/tbb/test_join_node_msg_key_matching.cpp
@@ -43,7 +43,7 @@ void test_deduction_guides() {
     graph g;
     broadcast_node<message_key> bm1(g), bm2(g);
     broadcast_node<tuple_type> bm3(g);
-    join_node<tuple_type, key_matching<int> > j0(g);
+    join_node<tuple_type, key_matching<int>> j0(g);
     join_node j3(j0);
     static_assert(std::is_same_v<decltype(j3), join_node<tuple_type, key_matching<int>>>);
 }
@@ -52,22 +52,33 @@ void test_deduction_guides() {
 //! Serial test with matching policies
 //! \brief \ref error_guessing
 TEST_CASE("Serial test") {
-    generate_test<serial_test, std::tuple<MyMessageKeyWithBrokenKey<int, double>, MyMessageKeyWithoutKey<int, float> >, message_based_key_matching<int> >::do_test();
-    generate_test<serial_test, std::tuple<MyMessageKeyWithoutKeyMethod<std::string, double>, MyMessageKeyWithBrokenKey<std::string, float> >, message_based_key_matching<std::string> >::do_test();
+    generate_test<serial_test,
+                  std::tuple<MyMessageKeyWithBrokenKey<int, double>, MyMessageKeyWithoutKey<int, float>>,
+                  message_based_key_matching<int>>::do_test();
+    generate_test<serial_test,
+                  std::tuple<MyMessageKeyWithoutKeyMethod<std::string, double>,
+                             MyMessageKeyWithBrokenKey<std::string, float>>,
+                  message_based_key_matching<std::string>>::do_test();
 }
 
 //! Parallel test with special key types
 //! \brief \ref error_guessing
-TEST_CASE("Parallel test"){
-    generate_test<parallel_test, std::tuple<MyMessageKeyWithBrokenKey<int, double>, MyMessageKeyWithoutKey<int, float> >, message_based_key_matching<int> >::do_test();
-    generate_test<parallel_test, std::tuple<MyMessageKeyWithoutKeyMethod<int, double>, MyMessageKeyWithBrokenKey<int, float> >, message_based_key_matching<int&> >::do_test();
-    generate_test<parallel_test, std::tuple<MyMessageKeyWithoutKey<std::string, double>, MyMessageKeyWithoutKeyMethod<std::string, float> >, message_based_key_matching<std::string&> >::do_test();
+TEST_CASE("Parallel test") {
+    generate_test<parallel_test,
+                  std::tuple<MyMessageKeyWithBrokenKey<int, double>, MyMessageKeyWithoutKey<int, float>>,
+                  message_based_key_matching<int>>::do_test();
+    generate_test<
+            parallel_test,
+            std::tuple<MyMessageKeyWithoutKeyMethod<int, double>, MyMessageKeyWithBrokenKey<int, float>>,
+            message_based_key_matching<int&>>::do_test();
+    generate_test<parallel_test,
+                  std::tuple<MyMessageKeyWithoutKey<std::string, double>,
+                             MyMessageKeyWithoutKeyMethod<std::string, float>>,
+                  message_based_key_matching<std::string&>>::do_test();
 }
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 //! Test deduction guides
 //! \brief \ref requirement
-TEST_CASE("Deduction guides test"){
-    test_deduction_guides();
-}
+TEST_CASE("Deduction guides test") { test_deduction_guides(); }
 #endif
diff --git a/external/tbb/test/tbb/test_join_node_msg_key_matching_n_args.cpp b/external/tbb/test/tbb/test_join_node_msg_key_matching_n_args.cpp
index 05097d8b..b504c3d5 100644
--- a/external/tbb/test/tbb/test_join_node_msg_key_matching_n_args.cpp
+++ b/external/tbb/test/tbb/test_join_node_msg_key_matching_n_args.cpp
@@ -28,14 +28,14 @@ template <typename T1, typename T2>
 using make_tuple = decltype(std::tuple_cat(T1(), std::tuple<T2>()));
 using T1 = std::tuple<MyMessageKeyWithoutKeyMethod<std::string, double>>;
 using T2 = make_tuple<T1, MyMessageKeyWithBrokenKey<std::string, int>>;
-using T3 = make_tuple < T2, MyMessageKeyWithoutKey<std::string, int>>;
-using T4 = make_tuple < T3, MyMessageKeyWithoutKeyMethod<std::string, size_t>>;
-using T5 = make_tuple < T4, MyMessageKeyWithBrokenKey<std::string, int>>;
-using T6 = make_tuple < T5, MyMessageKeyWithoutKeyMethod<std::string, short>>;
-using T7 = make_tuple < T6, MyMessageKeyWithoutKeyMethod<std::string, threebyte>>;
-using T8 = make_tuple < T7, MyMessageKeyWithBrokenKey<std::string, int>>;
-using T9 = make_tuple < T8, MyMessageKeyWithoutKeyMethod<std::string, threebyte>>;
-using T10 = make_tuple < T9, MyMessageKeyWithBrokenKey<std::string, size_t>>;
+using T3 = make_tuple<T2, MyMessageKeyWithoutKey<std::string, int>>;
+using T4 = make_tuple<T3, MyMessageKeyWithoutKeyMethod<std::string, size_t>>;
+using T5 = make_tuple<T4, MyMessageKeyWithBrokenKey<std::string, int>>;
+using T6 = make_tuple<T5, MyMessageKeyWithoutKeyMethod<std::string, short>>;
+using T7 = make_tuple<T6, MyMessageKeyWithoutKeyMethod<std::string, threebyte>>;
+using T8 = make_tuple<T7, MyMessageKeyWithBrokenKey<std::string, int>>;
+using T9 = make_tuple<T8, MyMessageKeyWithoutKeyMethod<std::string, threebyte>>;
+using T10 = make_tuple<T9, MyMessageKeyWithBrokenKey<std::string, size_t>>;
 
 #if TBB_TEST_LOW_WORKLOAD && TBB_USE_DEBUG
 // the compiler might generate huge object file in debug (>64M)
@@ -47,11 +47,11 @@ using T10 = make_tuple < T9, MyMessageKeyWithBrokenKey<std::string, size_t>>;
 //! Serial test with different tuple sizes
 //! \brief \ref error_guessing
 TEST_CASE_TEMPLATE_N_ARGS("Serial N tests") {
-    generate_test<serial_test, T, message_based_key_matching<std::string&> >::do_test();
+    generate_test<serial_test, T, message_based_key_matching<std::string&>>::do_test();
 }
 
 //! Parallel test with different tuple sizes
 //! \brief \ref error_guessing
 TEST_CASE_TEMPLATE_N_ARGS("Parallel N tests") {
-    generate_test<parallel_test, T, message_based_key_matching<std::string&> >::do_test();
+    generate_test<parallel_test, T, message_based_key_matching<std::string&>>::do_test();
 }
diff --git a/external/tbb/test/tbb/test_join_node_preview.cpp b/external/tbb/test/tbb/test_join_node_preview.cpp
index 3ee40757..8d030fbc 100644
--- a/external/tbb/test/tbb/test_join_node_preview.cpp
+++ b/external/tbb/test/tbb/test_join_node_preview.cpp
@@ -18,9 +18,9 @@
 
 #include "common/config.h"
 
-#include "test_join_node.h"
-#include "common/test_join_node_multiple_predecessors.h"
 #include "common/test_follows_and_precedes_api.h"
+#include "common/test_join_node_multiple_predecessors.h"
+#include "test_join_node.h"
 
 #include <array>
 #include <vector>
@@ -32,49 +32,53 @@ void jn_follows_and_precedes() {
     using msg_t = tbb::flow::continue_msg;
     using JoinOutputType = std::tuple<msg_t, msg_t, msg_t>;
 
-    std::array<msg_t, 3> messages_for_follows = { {msg_t(), msg_t(), msg_t()} };
+    std::array<msg_t, 3> messages_for_follows = {{msg_t(), msg_t(), msg_t()}};
     std::vector<msg_t> messages_for_precedes = {msg_t(), msg_t(), msg_t()};
 
-    follows_and_precedes_testing::test_follows
-        <msg_t, tbb::flow::join_node<JoinOutputType>, tbb::flow::buffer_node<msg_t>>(messages_for_follows);
-    follows_and_precedes_testing::test_follows
-        <msg_t, tbb::flow::join_node<JoinOutputType, tbb::flow::queueing>>(messages_for_follows);
-    follows_and_precedes_testing::test_follows
-        <msg_t, tbb::flow::join_node<JoinOutputType, tbb::flow::reserving>, tbb::flow::buffer_node<msg_t>>(messages_for_follows);
+    follows_and_precedes_testing::test_follows<msg_t, tbb::flow::join_node<JoinOutputType>,
+                                               tbb::flow::buffer_node<msg_t>>(messages_for_follows);
+    follows_and_precedes_testing::test_follows<msg_t,
+                                               tbb::flow::join_node<JoinOutputType, tbb::flow::queueing>>(
+            messages_for_follows);
+    follows_and_precedes_testing::test_follows<
+            msg_t, tbb::flow::join_node<JoinOutputType, tbb::flow::reserving>, tbb::flow::buffer_node<msg_t>>(
+            messages_for_follows);
     auto b = [](msg_t) { return msg_t(); };
     class hash_compare {
     public:
         std::size_t hash(msg_t) const { return 0; }
         bool equal(msg_t, msg_t) const { return true; }
     };
-    follows_and_precedes_testing::test_follows
-        <msg_t, tbb::flow::join_node<JoinOutputType, tbb::flow::key_matching<msg_t, hash_compare>>, tbb::flow::buffer_node<msg_t>>
-        (messages_for_follows, b, b, b);
-
-    follows_and_precedes_testing::test_precedes
-        <msg_t, tbb::flow::join_node<JoinOutputType>>(messages_for_precedes);
-    follows_and_precedes_testing::test_precedes
-        <msg_t, tbb::flow::join_node<JoinOutputType, tbb::flow::queueing>>(messages_for_precedes);
-    follows_and_precedes_testing::test_precedes
-        <msg_t, tbb::flow::join_node<JoinOutputType, tbb::flow::reserving>>(messages_for_precedes);
-    follows_and_precedes_testing::test_precedes
-        <msg_t, tbb::flow::join_node<JoinOutputType, tbb::flow::key_matching<msg_t, hash_compare>>>
-        (messages_for_precedes, b, b, b);
+    follows_and_precedes_testing::test_follows<
+            msg_t, tbb::flow::join_node<JoinOutputType, tbb::flow::key_matching<msg_t, hash_compare>>,
+            tbb::flow::buffer_node<msg_t>>(messages_for_follows, b, b, b);
+
+    follows_and_precedes_testing::test_precedes<msg_t, tbb::flow::join_node<JoinOutputType>>(
+            messages_for_precedes);
+    follows_and_precedes_testing::test_precedes<msg_t,
+                                                tbb::flow::join_node<JoinOutputType, tbb::flow::queueing>>(
+            messages_for_precedes);
+    follows_and_precedes_testing::test_precedes<msg_t,
+                                                tbb::flow::join_node<JoinOutputType, tbb::flow::reserving>>(
+            messages_for_precedes);
+    follows_and_precedes_testing::test_precedes<
+            msg_t, tbb::flow::join_node<JoinOutputType, tbb::flow::key_matching<msg_t, hash_compare>>>(
+            messages_for_precedes, b, b, b);
 }
 
 void jn_msg_key_matching_follows_and_precedes() {
     using msg_t = MyMessageKeyWithoutKey<int, int>;
     using JoinOutputType = std::tuple<msg_t, msg_t, msg_t>;
 
-    std::array<msg_t, 3> messages_for_follows = { {msg_t(), msg_t(), msg_t()} };
-    std::vector<msg_t> messages_for_precedes = { msg_t(), msg_t(), msg_t() };
+    std::array<msg_t, 3> messages_for_follows = {{msg_t(), msg_t(), msg_t()}};
+    std::vector<msg_t> messages_for_precedes = {msg_t(), msg_t(), msg_t()};
 
-    follows_and_precedes_testing::test_follows
-        <msg_t, tbb::flow::join_node<JoinOutputType, tbb::flow::key_matching<std::size_t>>, tbb::flow::buffer_node<msg_t>>
-        (messages_for_follows);
-    follows_and_precedes_testing::test_precedes
-        <msg_t, tbb::flow::join_node<JoinOutputType, tbb::flow::key_matching<std::size_t>>>
-        (messages_for_precedes);
+    follows_and_precedes_testing::test_follows<
+            msg_t, tbb::flow::join_node<JoinOutputType, tbb::flow::key_matching<std::size_t>>,
+            tbb::flow::buffer_node<msg_t>>(messages_for_follows);
+    follows_and_precedes_testing::test_precedes<
+            msg_t, tbb::flow::join_node<JoinOutputType, tbb::flow::key_matching<std::size_t>>>(
+            messages_for_precedes);
 }
 
 void test_follows_and_precedes_api() {
@@ -101,23 +105,23 @@ void test_try_put_and_wait_queueing() {
         using tuple_type = std::tuple<int, int, int>;
         tbb::flow::join_node<tuple_type, tbb::flow::queueing> join(g);
 
-        tbb::flow::function_node<tuple_type, int, tbb::flow::rejecting> function(g, tbb::flow::serial,
-            [&](tuple_type tuple) noexcept {
-                CHECK(std::get<0>(tuple) == std::get<1>(tuple));
-                CHECK(std::get<1>(tuple) == std::get<2>(tuple));
+        tbb::flow::function_node<tuple_type, int, tbb::flow::rejecting> function(
+                g, tbb::flow::serial, [&](tuple_type tuple) noexcept {
+                    CHECK(std::get<0>(tuple) == std::get<1>(tuple));
+                    CHECK(std::get<1>(tuple) == std::get<2>(tuple));
 
-                auto input = std::get<0>(tuple);
+                    auto input = std::get<0>(tuple);
 
-                if (input == wait_message) {
-                    for (auto item : new_work_items) {
-                        tbb::flow::input_port<0>(join).try_put(item);
-                        tbb::flow::input_port<1>(join).try_put(item);
-                        tbb::flow::input_port<2>(join).try_put(item);
+                    if (input == wait_message) {
+                        for (auto item : new_work_items) {
+                            tbb::flow::input_port<0>(join).try_put(item);
+                            tbb::flow::input_port<1>(join).try_put(item);
+                            tbb::flow::input_port<2>(join).try_put(item);
+                        }
                     }
-                }
-                processed_items.emplace_back(input);
-                return 0;
-            });
+                    processed_items.emplace_back(input);
+                    return 0;
+                });
 
         tbb::flow::make_edge(join, function);
 
@@ -154,7 +158,7 @@ void test_try_put_and_wait_queueing() {
 void test_try_put_and_wait_reserving() {
     tbb::task_arena arena(1);
 
-    arena.execute([]{
+    arena.execute([] {
         tbb::flow::graph g;
 
         std::vector<int> start_work_items;
@@ -174,23 +178,23 @@ void test_try_put_and_wait_reserving() {
 
         tbb::flow::join_node<tuple_type, tbb::flow::reserving> join(g);
 
-        tbb::flow::function_node<tuple_type, int, tbb::flow::rejecting> function(g, tbb::flow::serial,
-            [&](tuple_type tuple) noexcept {
-                CHECK(std::get<0>(tuple) == std::get<1>(tuple));
-                CHECK(std::get<1>(tuple) == std::get<2>(tuple));
+        tbb::flow::function_node<tuple_type, int, tbb::flow::rejecting> function(
+                g, tbb::flow::serial, [&](tuple_type tuple) noexcept {
+                    CHECK(std::get<0>(tuple) == std::get<1>(tuple));
+                    CHECK(std::get<1>(tuple) == std::get<2>(tuple));
 
-                auto input = std::get<0>(tuple);
+                    auto input = std::get<0>(tuple);
 
-                if (input == wait_message) {
-                    for (auto item : new_work_items) {
-                        buffer1.try_put(item);
-                        buffer2.try_put(item);
-                        buffer3.try_put(item);
+                    if (input == wait_message) {
+                        for (auto item : new_work_items) {
+                            buffer1.try_put(item);
+                            buffer2.try_put(item);
+                            buffer3.try_put(item);
+                        }
                     }
-                }
-                processed_items.emplace_back(input);
-                return 0;
-            });
+                    processed_items.emplace_back(input);
+                    return 0;
+                });
 
         tbb::flow::make_edge(buffer1, tbb::flow::input_port<0>(join));
         tbb::flow::make_edge(buffer2, tbb::flow::input_port<1>(join));
@@ -236,13 +240,9 @@ struct int_wrapper {
         return *this;
     }
 
-    int key() const {
-        return i;
-    }
+    int key() const { return i; }
 
-    friend bool operator==(const int_wrapper& lhs, const int_wrapper& rhs) {
-        return lhs.i == rhs.i;
-    }
+    friend bool operator==(const int_wrapper& lhs, const int_wrapper& rhs) { return lhs.i == rhs.i; }
 };
 
 template <typename... Body>
@@ -268,23 +268,23 @@ void test_try_put_and_wait_key_matching(Body... body) {
         using tuple_type = std::tuple<int_wrapper, int_wrapper, int_wrapper>;
         tbb::flow::join_node<tuple_type, tbb::flow::key_matching<int>> join(g, body..., body..., body...);
 
-        tbb::flow::function_node<tuple_type, int, tbb::flow::rejecting> function(g, tbb::flow::serial,
-            [&](tuple_type tuple) noexcept {
-                CHECK(std::get<0>(tuple) == std::get<1>(tuple));
-                CHECK(std::get<1>(tuple) == std::get<2>(tuple));
+        tbb::flow::function_node<tuple_type, int, tbb::flow::rejecting> function(
+                g, tbb::flow::serial, [&](tuple_type tuple) noexcept {
+                    CHECK(std::get<0>(tuple) == std::get<1>(tuple));
+                    CHECK(std::get<1>(tuple) == std::get<2>(tuple));
 
-                auto input = std::get<0>(tuple);
+                    auto input = std::get<0>(tuple);
 
-                if (input == wait_message) {
-                    for (auto item : new_work_items) {
-                        tbb::flow::input_port<0>(join).try_put(item);
-                        tbb::flow::input_port<1>(join).try_put(item);
-                        tbb::flow::input_port<2>(join).try_put(item);
+                    if (input == wait_message) {
+                        for (auto item : new_work_items) {
+                            tbb::flow::input_port<0>(join).try_put(item);
+                            tbb::flow::input_port<1>(join).try_put(item);
+                            tbb::flow::input_port<2>(join).try_put(item);
+                        }
                     }
-                }
-                processed_items.emplace_back(input);
-                return 0;
-            });
+                    processed_items.emplace_back(input);
+                    return 0;
+                });
 
         tbb::flow::make_edge(join, function);
 
@@ -327,9 +327,7 @@ void test_try_put_and_wait_key_matching(Body... body) {
 
 //! Test follows and precedes API
 //! \brief \ref error_guessing
-TEST_CASE("Test follows and precedes API"){
-    test_follows_and_precedes_api();
-}
+TEST_CASE("Test follows and precedes API") { test_follows_and_precedes_api(); }
 
 // TODO: Look deeper into this test to see if it has the right name
 // and if it actually tests some kind of regression. It is possible
diff --git a/external/tbb/test/tbb/test_limiter_node.cpp b/external/tbb/test/tbb/test_limiter_node.cpp
index 0bf4912f..1e6b5376 100644
--- a/external/tbb/test/tbb/test_limiter_node.cpp
+++ b/external/tbb/test/tbb/test_limiter_node.cpp
@@ -15,7 +15,7 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
 #endif
 
 #include "common/config.h"
@@ -23,135 +23,126 @@
 #include "tbb/flow_graph.h"
 
 #include "common/test.h"
+#include "common/test_follows_and_precedes_api.h"
 #include "common/utils.h"
 #include "common/utils_assert.h"
-#include "common/test_follows_and_precedes_api.h"
 #include "tbb/global_control.h"
 
 #include <atomic>
 
-
 //! \file test_limiter_node.cpp
 //! \brief Test for [flow_graph.limiter_node] specification
 
-
 const int L = 10;
 const int N = 1000;
 
-using tbb::detail::d2::SUCCESSFULLY_ENQUEUED;
 using tbb::detail::d2::graph_task;
+using tbb::detail::d2::SUCCESSFULLY_ENQUEUED;
 
-template< typename T >
+template <typename T>
 struct serial_receiver : public tbb::flow::receiver<T>, utils::NoAssign {
-   T next_value;
-   tbb::flow::graph& my_graph;
+    T next_value;
+    tbb::flow::graph &my_graph;
 
-   serial_receiver(tbb::flow::graph& g) : next_value(T(0)), my_graph(g) {}
+    serial_receiver(tbb::flow::graph &g) : next_value(T(0)), my_graph(g) {}
 
-   graph_task* try_put_task( const T &v ) override {
-       CHECK_MESSAGE( next_value++  == v, "" );
-       return const_cast<graph_task*>(SUCCESSFULLY_ENQUEUED);
-   }
+    graph_task *try_put_task(const T &v) override {
+        CHECK_MESSAGE(next_value++ == v, "");
+        return const_cast<graph_task *>(SUCCESSFULLY_ENQUEUED);
+    }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
-    graph_task * try_put_task( const T &v, const tbb::detail::d2::message_metainfo& ) override {
+    graph_task *try_put_task(const T &v, const tbb::detail::d2::message_metainfo &) override {
         return try_put_task(v);
     }
 #endif
 
-    tbb::flow::graph& graph_reference() const override {
-        return my_graph;
-    }
+    tbb::flow::graph &graph_reference() const override { return my_graph; }
 };
 
-template< typename T >
+template <typename T>
 struct parallel_receiver : public tbb::flow::receiver<T>, utils::NoAssign {
 
     std::atomic<int> my_count;
-    tbb::flow::graph& my_graph;
+    tbb::flow::graph &my_graph;
 
-    parallel_receiver(tbb::flow::graph& g) : my_graph(g) { my_count = 0; }
+    parallel_receiver(tbb::flow::graph &g) : my_graph(g) { my_count = 0; }
 
-    graph_task* try_put_task( const T &/*v*/ ) override {
-       ++my_count;
-       return const_cast<graph_task*>(SUCCESSFULLY_ENQUEUED);
+    graph_task *try_put_task(const T & /*v*/) override {
+        ++my_count;
+        return const_cast<graph_task *>(SUCCESSFULLY_ENQUEUED);
     }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
-    graph_task * try_put_task( const T &v, const tbb::detail::d2::message_metainfo& ) override {
+    graph_task *try_put_task(const T &v, const tbb::detail::d2::message_metainfo &) override {
         return try_put_task(v);
     }
 #endif
 
-    tbb::flow::graph& graph_reference() const override {
-        return my_graph;
-    }
+    tbb::flow::graph &graph_reference() const override { return my_graph; }
 };
 
-template< typename T >
+template <typename T>
 struct empty_sender : public tbb::flow::sender<T> {
-        typedef typename tbb::flow::sender<T>::successor_type successor_type;
+    typedef typename tbb::flow::sender<T>::successor_type successor_type;
 
-        bool register_successor( successor_type & ) override { return false; }
-        bool remove_successor( successor_type & ) override { return false; }
+    bool register_successor(successor_type &) override { return false; }
+    bool remove_successor(successor_type &) override { return false; }
 };
 
-
-template< typename T >
+template <typename T>
 struct put_body : utils::NoAssign {
 
     tbb::flow::limiter_node<T> &my_lim;
     std::atomic<int> &my_accept_count;
 
-    put_body( tbb::flow::limiter_node<T> &lim, std::atomic<int> &accept_count ) :
-        my_lim(lim), my_accept_count(accept_count) {}
+    put_body(tbb::flow::limiter_node<T> &lim, std::atomic<int> &accept_count)
+        : my_lim(lim), my_accept_count(accept_count) {}
 
-    void operator()( int ) const {
-        for ( int i = 0; i < L; ++i ) {
-            bool msg = my_lim.try_put( T(i) );
-            if ( msg == true )
-               ++my_accept_count;
+    void operator()(int) const {
+        for (int i = 0; i < L; ++i) {
+            bool msg = my_lim.try_put(T(i));
+            if (msg == true) ++my_accept_count;
         }
     }
 };
 
-template< typename T >
+template <typename T>
 struct put_dec_body : utils::NoAssign {
 
     tbb::flow::limiter_node<T> &my_lim;
     std::atomic<int> &my_accept_count;
 
-    put_dec_body( tbb::flow::limiter_node<T> &lim, std::atomic<int> &accept_count ) :
-        my_lim(lim), my_accept_count(accept_count) {}
+    put_dec_body(tbb::flow::limiter_node<T> &lim, std::atomic<int> &accept_count)
+        : my_lim(lim), my_accept_count(accept_count) {}
 
-    void operator()( int ) const {
+    void operator()(int) const {
         int local_accept_count = 0;
-        while ( local_accept_count < N ) {
-            bool msg = my_lim.try_put( T(local_accept_count) );
-            if ( msg == true ) {
+        while (local_accept_count < N) {
+            bool msg = my_lim.try_put(T(local_accept_count));
+            if (msg == true) {
                 ++local_accept_count;
                 ++my_accept_count;
-                my_lim.decrementer().try_put( tbb::flow::continue_msg() );
+                my_lim.decrementer().try_put(tbb::flow::continue_msg());
             }
         }
     }
-
 };
 
-template< typename T >
-void test_puts_with_decrements( int num_threads, tbb::flow::limiter_node< T >& lim , tbb::flow::graph& g) {
+template <typename T>
+void test_puts_with_decrements(int num_threads, tbb::flow::limiter_node<T> &lim, tbb::flow::graph &g) {
     parallel_receiver<T> r(g);
-    empty_sender< tbb::flow::continue_msg > s;
+    empty_sender<tbb::flow::continue_msg> s;
     std::atomic<int> accept_count;
     accept_count = 0;
-    tbb::flow::make_edge( lim, r );
+    tbb::flow::make_edge(lim, r);
     tbb::flow::make_edge(s, lim.decrementer());
 
     // test puts with decrements
-    utils::NativeParallelFor( num_threads, put_dec_body<T>(lim, accept_count) );
+    utils::NativeParallelFor(num_threads, put_dec_body<T>(lim, accept_count));
     int c = accept_count;
-    CHECK_MESSAGE( c == N*num_threads, "" );
-    CHECK_MESSAGE( r.my_count == N*num_threads, "" );
+    CHECK_MESSAGE(c == N * num_threads, "");
+    CHECK_MESSAGE(r.my_count == N * num_threads, "");
 }
 
 //
@@ -161,34 +152,34 @@ void test_puts_with_decrements( int num_threads, tbb::flow::limiter_node< T >& l
 // multiple parallel senders that put to decrement at each accept, limiter accepts new messages
 //
 //
-template< typename T >
+template <typename T>
 int test_parallel(int num_threads) {
 
-   // test puts with no decrements
-   for ( int i = 0; i < L; ++i ) {
-       tbb::flow::graph g;
-       tbb::flow::limiter_node< T > lim(g, i);
-       parallel_receiver<T> r(g);
-       std::atomic<int> accept_count;
-       accept_count = 0;
-       tbb::flow::make_edge( lim, r );
-       // test puts with no decrements
-       utils::NativeParallelFor( num_threads, put_body<T>(lim, accept_count) );
-       g.wait_for_all();
-       int c = accept_count;
-       CHECK_MESSAGE( c == i, "" );
-   }
-
-   // test puts with decrements
-   for ( int i = 1; i < L; ++i ) {
-       tbb::flow::graph g;
-       tbb::flow::limiter_node< T > lim(g, i);
-       test_puts_with_decrements(num_threads, lim, g);
-       tbb::flow::limiter_node< T > lim_copy( lim );
-       test_puts_with_decrements(num_threads, lim_copy, g);
-   }
-
-   return 0;
+    // test puts with no decrements
+    for (int i = 0; i < L; ++i) {
+        tbb::flow::graph g;
+        tbb::flow::limiter_node<T> lim(g, i);
+        parallel_receiver<T> r(g);
+        std::atomic<int> accept_count;
+        accept_count = 0;
+        tbb::flow::make_edge(lim, r);
+        // test puts with no decrements
+        utils::NativeParallelFor(num_threads, put_body<T>(lim, accept_count));
+        g.wait_for_all();
+        int c = accept_count;
+        CHECK_MESSAGE(c == i, "");
+    }
+
+    // test puts with decrements
+    for (int i = 1; i < L; ++i) {
+        tbb::flow::graph g;
+        tbb::flow::limiter_node<T> lim(g, i);
+        test_puts_with_decrements(num_threads, lim, g);
+        tbb::flow::limiter_node<T> lim_copy(lim);
+        test_puts_with_decrements(num_threads, lim_copy, g);
+    }
+
+    return 0;
 }
 
 //
@@ -197,48 +188,48 @@ int test_parallel(int num_threads) {
 // limiter only forwards below the limit, single sender / single receiver
 // at reject, a put to decrement, will cause next message to be accepted
 //
-template< typename T >
+template <typename T>
 int test_serial() {
 
-   // test puts with no decrements
-   for ( int i = 0; i < L; ++i ) {
-       tbb::flow::graph g;
-       tbb::flow::limiter_node< T > lim(g, i);
-       serial_receiver<T> r(g);
-       tbb::flow::make_edge( lim, r );
-       for ( int j = 0; j < L; ++j ) {
-           bool msg = lim.try_put( T(j) );
-           CHECK_MESSAGE( (( j < i && msg == true ) || ( j >= i && msg == false )), "" );
-       }
-       g.wait_for_all();
-   }
-
-   // test puts with decrements
-   for ( int i = 1; i < L; ++i ) {
-       tbb::flow::graph g;
-       tbb::flow::limiter_node< T > lim(g, i);
-       serial_receiver<T> r(g);
-       empty_sender< tbb::flow::continue_msg > s;
-       tbb::flow::make_edge( lim, r );
-       tbb::flow::make_edge(s, lim.decrementer());
-       for ( int j = 0; j < N; ++j ) {
-           bool msg = lim.try_put( T(j) );
-           CHECK_MESSAGE( (( j < i && msg == true ) || ( j >= i && msg == false )), "" );
-           if ( msg == false ) {
-               lim.decrementer().try_put( tbb::flow::continue_msg() );
-               msg = lim.try_put( T(j) );
-               CHECK_MESSAGE( msg == true, "" );
-           }
-       }
-   }
-   return 0;
+    // test puts with no decrements
+    for (int i = 0; i < L; ++i) {
+        tbb::flow::graph g;
+        tbb::flow::limiter_node<T> lim(g, i);
+        serial_receiver<T> r(g);
+        tbb::flow::make_edge(lim, r);
+        for (int j = 0; j < L; ++j) {
+            bool msg = lim.try_put(T(j));
+            CHECK_MESSAGE(((j < i && msg == true) || (j >= i && msg == false)), "");
+        }
+        g.wait_for_all();
+    }
+
+    // test puts with decrements
+    for (int i = 1; i < L; ++i) {
+        tbb::flow::graph g;
+        tbb::flow::limiter_node<T> lim(g, i);
+        serial_receiver<T> r(g);
+        empty_sender<tbb::flow::continue_msg> s;
+        tbb::flow::make_edge(lim, r);
+        tbb::flow::make_edge(s, lim.decrementer());
+        for (int j = 0; j < N; ++j) {
+            bool msg = lim.try_put(T(j));
+            CHECK_MESSAGE(((j < i && msg == true) || (j >= i && msg == false)), "");
+            if (msg == false) {
+                lim.decrementer().try_put(tbb::flow::continue_msg());
+                msg = lim.try_put(T(j));
+                CHECK_MESSAGE(msg == true, "");
+            }
+        }
+    }
+    return 0;
 }
 
 // reported bug in limiter (https://community.intel.com/t5/Intel-oneAPI-Threading-Building/multifun-node-try-put-several-messages-to-one-successor-crashes/m-p/922844)
-#define DECREMENT_OUTPUT 1  // the port number of the decrement output of the multifunction_node
-#define LIMITER_OUTPUT 0    // port number of the integer output
+#define DECREMENT_OUTPUT 1// the port number of the decrement output of the multifunction_node
+#define LIMITER_OUTPUT 0  // port number of the integer output
 
-typedef tbb::flow::multifunction_node<int, std::tuple<int,tbb::flow::continue_msg> > mfnode_type;
+typedef tbb::flow::multifunction_node<int, std::tuple<int, tbb::flow::continue_msg>> mfnode_type;
 
 std::atomic<size_t> emit_count;
 std::atomic<size_t> emit_sum;
@@ -247,20 +238,18 @@ std::atomic<size_t> receive_sum;
 
 struct mfnode_body {
     int max_cnt;
-    std::atomic<int>* my_cnt;
-    mfnode_body(const int& _max, std::atomic<int> &_my) : max_cnt(_max), my_cnt(&_my)  { }
-    void operator()(const int &/*in*/, mfnode_type::output_ports_type &out) {
+    std::atomic<int> *my_cnt;
+    mfnode_body(const int &_max, std::atomic<int> &_my) : max_cnt(_max), my_cnt(&_my) {}
+    void operator()(const int & /*in*/, mfnode_type::output_ports_type &out) {
         int lcnt = ++(*my_cnt);
-        if(lcnt > max_cnt) {
-            return;
-        }
+        if (lcnt > max_cnt) { return; }
         // put one continue_msg to the decrement of the limiter.
-        if(!std::get<DECREMENT_OUTPUT>(out).try_put(tbb::flow::continue_msg())) {
-            CHECK_MESSAGE( (false),"Unexpected rejection of decrement");
+        if (!std::get<DECREMENT_OUTPUT>(out).try_put(tbb::flow::continue_msg())) {
+            CHECK_MESSAGE((false), "Unexpected rejection of decrement");
         }
         {
             // put messages to the input of the limiter_node until it rejects.
-            while( std::get<LIMITER_OUTPUT>(out).try_put(lcnt) ) {
+            while (std::get<LIMITER_OUTPUT>(out).try_put(lcnt)) {
                 emit_sum += lcnt;
                 ++emit_count;
             }
@@ -285,8 +274,7 @@ struct fn_body {
 // |                                                             |
 // +-------------------------------------------------------------+
 //
-void
-test_multifunction_to_limiter(int _max, int _nparallel) {
+void test_multifunction_to_limiter(int _max, int _nparallel) {
     tbb::flow::graph g;
     emit_count = 0;
     emit_sum = 0;
@@ -304,8 +292,8 @@ test_multifunction_to_limiter(int _max, int _nparallel) {
 
     mf_node.try_put(1);
     g.wait_for_all();
-    CHECK_MESSAGE( (emit_count == receive_count), "counts do not match");
-    CHECK_MESSAGE( (emit_sum == receive_sum), "sums do not match");
+    CHECK_MESSAGE((emit_count == receive_count), "counts do not match");
+    CHECK_MESSAGE((emit_sum == receive_sum), "sums do not match");
 
     // reset, test again
     g.reset();
@@ -316,25 +304,22 @@ test_multifunction_to_limiter(int _max, int _nparallel) {
     local_cnt = 0;
     mf_node.try_put(1);
     g.wait_for_all();
-    CHECK_MESSAGE( (emit_count == receive_count), "counts do not match");
-    CHECK_MESSAGE( (emit_sum == receive_sum), "sums do not match");
+    CHECK_MESSAGE((emit_count == receive_count), "counts do not match");
+    CHECK_MESSAGE((emit_sum == receive_sum), "sums do not match");
 }
 
-
-void
-test_continue_msg_reception() {
+void test_continue_msg_reception() {
     tbb::flow::graph g;
-    tbb::flow::limiter_node<int> ln(g,2);
-    tbb::flow::queue_node<int>   qn(g);
+    tbb::flow::limiter_node<int> ln(g, 2);
+    tbb::flow::queue_node<int> qn(g);
     tbb::flow::make_edge(ln, qn);
     ln.decrementer().try_put(tbb::flow::continue_msg());
     ln.try_put(42);
     g.wait_for_all();
     int outint;
-    CHECK_MESSAGE( (qn.try_get(outint) && outint == 42), "initial put to decrement stops node");
+    CHECK_MESSAGE((qn.try_get(outint) && outint == 42), "initial put to decrement stops node");
 }
 
-
 //
 // This test ascertains that if a message is not successfully put
 // to a successor, the message is not dropped but released.
@@ -348,38 +333,38 @@ void test_reserve_release_messages() {
     queue_node<int> input_queue(g);
     queue_node<int> output_queue(g);
     broadcast_node<int> broad(g);
-    limiter_node<int, int> limit(g,2); //threshold of 2
+    limiter_node<int, int> limit(g, 2);//threshold of 2
 
     //edges
     make_edge(input_queue, limit);
     make_edge(limit, output_queue);
-    make_edge(broad,limit.decrementer());
+    make_edge(broad, limit.decrementer());
 
-    int list[4] = {19, 33, 72, 98}; //list to be put to the input queue
+    int list[4] = {19, 33, 72, 98};//list to be put to the input queue
 
-    input_queue.try_put(list[0]); // succeeds
-    input_queue.try_put(list[1]); // succeeds
-    input_queue.try_put(list[2]); // fails, stored in upstream buffer
+    input_queue.try_put(list[0]);// succeeds
+    input_queue.try_put(list[1]);// succeeds
+    input_queue.try_put(list[2]);// fails, stored in upstream buffer
     g.wait_for_all();
 
-    remove_edge(limit, output_queue); //remove successor
+    remove_edge(limit, output_queue);//remove successor
 
     //sending message to the decrement port of the limiter
-    broad.try_put(1); //failed message retrieved.
+    broad.try_put(1);//failed message retrieved.
     g.wait_for_all();
 
-    tbb::flow::make_edge(limit, output_queue); //putting the successor back
+    tbb::flow::make_edge(limit, output_queue);//putting the successor back
 
-    broad.try_put(1);  //drop the count
+    broad.try_put(1);//drop the count
 
-    input_queue.try_put(list[3]);  //success
+    input_queue.try_put(list[3]);//success
     g.wait_for_all();
 
-    int var=0;
+    int var = 0;
 
-    for (int i=0; i<4; i++) {
+    for (int i = 0; i < 4; i++) {
         output_queue.try_get(var);
-        CHECK_MESSAGE( (var==list[i]), "some data dropped, input does not match output");
+        CHECK_MESSAGE((var == list[i]), "some data dropped, input does not match output");
         g.wait_for_all();
     }
 }
@@ -391,80 +376,76 @@ void test_decrementer() {
     tbb::flow::queue_node<int> queue(g);
     make_edge(limit, queue);
     int m = 0;
-    CHECK_MESSAGE( ( limit.try_put( m++ )), "Newly constructed limiter node does not accept message." );
-    CHECK_MESSAGE( limit.decrementer().try_put( -threshold ), // close limiter's gate
-                   "Limiter node decrementer's port does not accept message." );
-    CHECK_MESSAGE( ( !limit.try_put( m++ )), "Closed limiter node's accepts message." );
-    CHECK_MESSAGE( limit.decrementer().try_put( threshold + 5 ),  // open limiter's gate
-                   "Limiter node decrementer's port does not accept message." );
-    for( int i = 0; i < threshold; ++i )
-        CHECK_MESSAGE( ( limit.try_put( m++ )), "Limiter node does not accept message while open." );
-    CHECK_MESSAGE( ( !limit.try_put( m )), "Limiter node's gate is not closed." );
+    CHECK_MESSAGE((limit.try_put(m++)), "Newly constructed limiter node does not accept message.");
+    CHECK_MESSAGE(limit.decrementer().try_put(-threshold),// close limiter's gate
+                  "Limiter node decrementer's port does not accept message.");
+    CHECK_MESSAGE((!limit.try_put(m++)), "Closed limiter node's accepts message.");
+    CHECK_MESSAGE(limit.decrementer().try_put(threshold + 5),// open limiter's gate
+                  "Limiter node decrementer's port does not accept message.");
+    for (int i = 0; i < threshold; ++i)
+        CHECK_MESSAGE((limit.try_put(m++)), "Limiter node does not accept message while open.");
+    CHECK_MESSAGE((!limit.try_put(m)), "Limiter node's gate is not closed.");
     g.wait_for_all();
     int expected[] = {0, 2, 3, 4, 5, 6};
-    int actual = -1; m = 0;
-    while( queue.try_get(actual) )
-        CHECK_MESSAGE( actual == expected[m++], "" );
-    CHECK_MESSAGE( ( sizeof(expected) / sizeof(expected[0]) == m), "Not all messages have been processed." );
+    int actual = -1;
+    m = 0;
+    while (queue.try_get(actual)) CHECK_MESSAGE(actual == expected[m++], "");
+    CHECK_MESSAGE((sizeof(expected) / sizeof(expected[0]) == m), "Not all messages have been processed.");
     g.wait_for_all();
 
     const size_t threshold2 = size_t(-1);
     tbb::flow::limiter_node<int, long long> limit2(g, threshold2);
     make_edge(limit2, queue);
-    CHECK_MESSAGE( ( limit2.try_put( 1 )), "Newly constructed limiter node does not accept message." );
-    long long decrement_value = (long long)( size_t(-1)/2 );
-    CHECK_MESSAGE( limit2.decrementer().try_put( -decrement_value ),
-                   "Limiter node decrementer's port does not accept message" );
-    CHECK_MESSAGE( ( limit2.try_put( 2 )), "Limiter's gate should not be closed yet." );
-    CHECK_MESSAGE( limit2.decrementer().try_put( -decrement_value ),
-                   "Limiter node decrementer's port does not accept message" );
-    CHECK_MESSAGE( ( !limit2.try_put( 3 )), "Overflow happened for internal counter." );
+    CHECK_MESSAGE((limit2.try_put(1)), "Newly constructed limiter node does not accept message.");
+    long long decrement_value = (long long) (size_t(-1) / 2);
+    CHECK_MESSAGE(limit2.decrementer().try_put(-decrement_value),
+                  "Limiter node decrementer's port does not accept message");
+    CHECK_MESSAGE((limit2.try_put(2)), "Limiter's gate should not be closed yet.");
+    CHECK_MESSAGE(limit2.decrementer().try_put(-decrement_value),
+                  "Limiter node decrementer's port does not accept message");
+    CHECK_MESSAGE((!limit2.try_put(3)), "Overflow happened for internal counter.");
     int expected2[] = {1, 2};
-    actual = -1; m = 0;
-    while( queue.try_get(actual) )
-        CHECK_MESSAGE( actual == expected2[m++], "" );
-    CHECK_MESSAGE( ( sizeof(expected2) / sizeof(expected2[0]) == m), "Not all messages have been processed." );
+    actual = -1;
+    m = 0;
+    while (queue.try_get(actual)) CHECK_MESSAGE(actual == expected2[m++], "");
+    CHECK_MESSAGE((sizeof(expected2) / sizeof(expected2[0]) == m), "Not all messages have been processed.");
     g.wait_for_all();
 
     const size_t threshold3 = 10;
     tbb::flow::limiter_node<int, long long> limit3(g, threshold3);
     make_edge(limit3, queue);
     long long decrement_value3 = 3;
-    CHECK_MESSAGE( limit3.decrementer().try_put( -decrement_value3 ),
-                   "Limiter node decrementer's port does not accept message" );
+    CHECK_MESSAGE(limit3.decrementer().try_put(-decrement_value3),
+                  "Limiter node decrementer's port does not accept message");
 
     m = 0;
-    while( limit3.try_put( m ) ){ m++; };
-    CHECK_MESSAGE( m == threshold3 - decrement_value3, "Not all messages have been accepted." );
+    while (limit3.try_put(m)) { m++; };
+    CHECK_MESSAGE(m == threshold3 - decrement_value3, "Not all messages have been accepted.");
 
-    actual = -1; m = 0;
-    while( queue.try_get(actual) ){
-        CHECK_MESSAGE( actual == m++, "Not all messages have been processed." );
-    }
+    actual = -1;
+    m = 0;
+    while (queue.try_get(actual)) { CHECK_MESSAGE(actual == m++, "Not all messages have been processed."); }
 
     g.wait_for_all();
-    CHECK_MESSAGE( m == threshold3 - decrement_value3, "Not all messages have been processed." );
+    CHECK_MESSAGE(m == threshold3 - decrement_value3, "Not all messages have been processed.");
 }
 
 void test_try_put_without_successors() {
     tbb::flow::graph g;
-    int try_put_num{3};
+    int try_put_num {3};
     tbb::flow::buffer_node<int> bn(g);
     tbb::flow::limiter_node<int> ln(g, try_put_num);
 
     tbb::flow::make_edge(bn, ln);
 
     int i = 1;
-    for (; i <= try_put_num; i++)
-        bn.try_put(i);
-
-    std::atomic<int> counter{0};
-    tbb::flow::function_node<int, int> fn(g, tbb::flow::unlimited,
-        [&](int input) {
-            counter += input;
-            return int{};
-        }
-    );
+    for (; i <= try_put_num; i++) bn.try_put(i);
+
+    std::atomic<int> counter {0};
+    tbb::flow::function_node<int, int> fn(g, tbb::flow::unlimited, [&](int input) {
+        counter += input;
+        return int {};
+    });
 
     tbb::flow::make_edge(ln, fn);
 
@@ -477,7 +458,6 @@ void test_try_put_without_successors() {
     bn.try_put(try_put_num + 1);
     g.wait_for_all();
     CHECK((counter == i * try_put_num / 2));
-
 }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
@@ -486,14 +466,13 @@ void test_try_put_without_successors() {
 void test_follows_and_precedes_api() {
     using msg_t = tbb::flow::continue_msg;
 
-    std::array<msg_t, 3> messages_for_follows= { {msg_t(), msg_t(), msg_t()} };
+    std::array<msg_t, 3> messages_for_follows = {{msg_t(), msg_t(), msg_t()}};
     std::vector<msg_t> messages_for_precedes = {msg_t()};
 
-    follows_and_precedes_testing::test_follows
-        <msg_t, tbb::flow::limiter_node<msg_t, msg_t>>(messages_for_follows, 1000);
-    follows_and_precedes_testing::test_precedes
-        <msg_t, tbb::flow::limiter_node<msg_t, msg_t>>(messages_for_precedes, 1000);
-
+    follows_and_precedes_testing::test_follows<msg_t, tbb::flow::limiter_node<msg_t, msg_t>>(
+            messages_for_follows, 1000);
+    follows_and_precedes_testing::test_precedes<msg_t, tbb::flow::limiter_node<msg_t, msg_t>>(
+            messages_for_precedes, 1000);
 }
 #endif
 
@@ -521,20 +500,20 @@ void test_deduction_guides() {
 void test_decrement_while_try_put_task() {
     constexpr int threshold = 50000;
 
-    tbb::flow::graph graph{};
+    tbb::flow::graph graph {};
     std::atomic<int> processed;
-    tbb::flow::input_node<int> input{ graph, [&](tbb::flow_control & fc) -> int {
-        static int i = {};
-        if (i++ >= threshold) fc.stop();
-        return i;
-    }};
-    tbb::flow::limiter_node<int, int> blockingNode{ graph, 1 };
-    tbb::flow::multifunction_node<int, std::tuple<int>> processing{ graph, tbb::flow::serial,
-        [&](const int & value, typename decltype(processing)::output_ports_type & out) {
-            if (value != threshold)
-                std::get<0>(out).try_put(1);
-            processed.store(value);
-        }};
+    tbb::flow::input_node<int> input {graph, [&](tbb::flow_control &fc) -> int {
+                                          static int i = {};
+                                          if (i++ >= threshold) fc.stop();
+                                          return i;
+                                      }};
+    tbb::flow::limiter_node<int, int> blockingNode {graph, 1};
+    tbb::flow::multifunction_node<int, std::tuple<int>> processing {
+            graph, tbb::flow::serial,
+            [&](const int &value, typename decltype(processing)::output_ports_type &out) {
+                if (value != threshold) std::get<0>(out).try_put(1);
+                processed.store(value);
+            }};
 
     tbb::flow::make_edge(input, blockingNode);
     tbb::flow::make_edge(blockingNode, processing);
@@ -567,22 +546,17 @@ void test_try_put_and_wait() {
         CHECK_MESSAGE(new_work_items.size() < threshold, "Incorrect test setup");
 
         tbb::flow::limiter_node<int> limiter(g, threshold);
-        tbb::flow::function_node<int, tbb::flow::continue_msg> function(g, tbb::flow::serial,
-            [&](int input) {
-                if (input == wait_message) {
-                    for (auto item : new_work_items) {
-                        limiter.try_put(item);
-                    }
-                }
-                processed_items.emplace_back(input);
-            });
+        tbb::flow::function_node<int, tbb::flow::continue_msg> function(g, tbb::flow::serial, [&](int input) {
+            if (input == wait_message) {
+                for (auto item : new_work_items) { limiter.try_put(item); }
+            }
+            processed_items.emplace_back(input);
+        });
 
         tbb::flow::make_edge(limiter, function);
         tbb::flow::make_edge(function, limiter.decrementer());
 
-        for (auto item : start_work_items) {
-            limiter.try_put(item);
-        }
+        for (auto item : start_work_items) { limiter.try_put(item); }
 
         limiter.try_put_and_wait(wait_message);
 
@@ -613,20 +587,16 @@ void test_try_put_and_wait() {
 TEST_CASE("Serial and parallel tests") {
     for (unsigned i = 1; i <= 2 * utils::MaxThread; ++i) {
         tbb::task_arena arena(i);
-        arena.execute(
-            [i]() {
-                test_serial<int>();
-                test_parallel<int>(i);
-            }
-        );
+        arena.execute([i]() {
+            test_serial<int>();
+            test_parallel<int>(i);
+        });
     }
 }
 
 //! Test initial put of continue_msg on decrementer port does not stop message flow
 //! \brief \ref error_guessing
-TEST_CASE("Test continue_msg reception") {
-    test_continue_msg_reception();
-}
+TEST_CASE("Test continue_msg reception") { test_continue_msg_reception(); }
 
 //! Test put message on decrementer port does not stop message flow
 //! \brief \ref error_guessing
@@ -637,47 +607,37 @@ TEST_CASE("Test try_put to decrementer while try_put to limiter_node") {
 //! Test multifunction_node connected to limiter_node
 //! \brief \ref error_guessing
 TEST_CASE("Multifunction connected to limiter") {
-    test_multifunction_to_limiter(30,3);
-    test_multifunction_to_limiter(300,13);
-    test_multifunction_to_limiter(3000,1);
+    test_multifunction_to_limiter(30, 3);
+    test_multifunction_to_limiter(300, 13);
+    test_multifunction_to_limiter(3000, 1);
 }
 
 //! Test message release if successor doesn't accept
 //! \brief \ref requirement
-TEST_CASE("Message is released if successor does not accept") {
-    test_reserve_release_messages();
-}
+TEST_CASE("Message is released if successor does not accept") { test_reserve_release_messages(); }
 
 //! Test decrementer
 //! \brief \ref requirement \ref error_guessing
-TEST_CASE("Decrementer") {
-    test_decrementer();
-}
+TEST_CASE("Decrementer") { test_decrementer(); }
 
 //! Test try_put() without successor
 //! \brief \ref error_guessing
-TEST_CASE("Test try_put() without successors") {
-    test_try_put_without_successors();
-}
+TEST_CASE("Test try_put() without successors") { test_try_put_without_successors(); }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 //! Test follows and precedes API
 //! \brief \ref error_guessing
-TEST_CASE( "Support for follows and precedes API" ) {
-    test_follows_and_precedes_api();
-}
+TEST_CASE("Support for follows and precedes API") { test_follows_and_precedes_api(); }
 #endif
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 //! Test deduction guides
 //! \brief \ref requirement
-TEST_CASE( "Deduction guides" ) {
-    test_deduction_guides();
-}
+TEST_CASE("Deduction guides") { test_deduction_guides(); }
 #endif
 
 struct TestLargeStruct {
-    char bytes[512]{ 0 };
+    char bytes[512] {0};
 };
 
 //! Test correct node deallocation while using small_object_pool.
@@ -685,21 +645,19 @@ struct TestLargeStruct {
 //! \brief \ref error_guessing
 TEST_CASE("Test correct node deallocation while using small_object_pool") {
     tbb::flow::graph graph;
-    tbb::flow::queue_node<TestLargeStruct> input_node( graph );
-    tbb::flow::function_node<TestLargeStruct> func( graph, tbb::flow::serial,
-        [](const TestLargeStruct& input) { return input; } );
+    tbb::flow::queue_node<TestLargeStruct> input_node(graph);
+    tbb::flow::function_node<TestLargeStruct> func(graph, tbb::flow::serial,
+                                                   [](const TestLargeStruct &input) { return input; });
 
-    tbb::flow::make_edge( input_node, func );
-    CHECK( input_node.try_put( TestLargeStruct{} ) );
+    tbb::flow::make_edge(input_node, func);
+    CHECK(input_node.try_put(TestLargeStruct {}));
     graph.wait_for_all();
 
-    tbb::task_scheduler_handle handle{ tbb::attach{} };
-    tbb::finalize( handle, std::nothrow );
+    tbb::task_scheduler_handle handle {tbb::attach {}};
+    tbb::finalize(handle, std::nothrow);
 }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
 //! \brief \ref error_guessing
-TEST_CASE("test limiter_node try_put_and_wait") {
-    test_try_put_and_wait();
-}
+TEST_CASE("test limiter_node try_put_and_wait") { test_try_put_and_wait(); }
 #endif
diff --git a/external/tbb/test/tbb/test_multifunction_node.cpp b/external/tbb/test/tbb/test_multifunction_node.cpp
index bfebbbe9..ea09d64b 100644
--- a/external/tbb/test/tbb/test_multifunction_node.cpp
+++ b/external/tbb/test/tbb/test_multifunction_node.cpp
@@ -15,7 +15,7 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
 #endif
 
 #include "common/config.h"
@@ -23,17 +23,15 @@
 #include "tbb/flow_graph.h"
 #include "tbb/spin_rw_mutex.h"
 
-#include "common/test.h"
-#include "common/utils.h"
+#include "common/concepts_common.h"
 #include "common/graph_utils.h"
+#include "common/test.h"
 #include "common/test_follows_and_precedes_api.h"
-#include "common/concepts_common.h"
-
+#include "common/utils.h"
 
 //! \file test_multifunction_node.cpp
 //! \brief Test for [flow_graph.multifunction_node] specification
 
-
 #if TBB_USE_DEBUG
 #define N 16
 #else
@@ -50,11 +48,11 @@
 */
 
 //! exercise buffered multifunction_node.
-template< typename InputType, typename OutputTuple, typename Body >
-void buffered_levels( size_t concurrency, Body body ) {
-    typedef typename std::tuple_element<0,OutputTuple>::type OutputType;
+template <typename InputType, typename OutputTuple, typename Body>
+void buffered_levels(size_t concurrency, Body body) {
+    typedef typename std::tuple_element<0, OutputTuple>::type OutputType;
     // Do for lc = 1 to concurrency level
-    for ( size_t lc = 1; lc <= concurrency; ++lc ) {
+    for (size_t lc = 1; lc <= concurrency; ++lc) {
         tbb::flow::graph g;
 
         // Set the execute_counter back to zero in the harness
@@ -65,62 +63,62 @@ void buffered_levels( size_t concurrency, Body body ) {
         harness_graph_multifunction_executor<InputType, OutputTuple>::max_executors = lc;
 
         // Create the function_node with the appropriate concurrency level, and use default buffering
-        tbb::flow::multifunction_node< InputType, OutputTuple > exe_node( g, lc, body );
+        tbb::flow::multifunction_node<InputType, OutputTuple> exe_node(g, lc, body);
 
         //Create a vector of identical exe_nodes
-        std::vector< tbb::flow::multifunction_node< InputType, OutputTuple > > exe_vec(2, exe_node);
+        std::vector<tbb::flow::multifunction_node<InputType, OutputTuple>> exe_vec(2, exe_node);
 
         // exercise each of the copied nodes
-        for (size_t node_idx=0; node_idx<exe_vec.size(); ++node_idx) {
-            for (size_t num_receivers = 1; num_receivers <= MAX_NODES; ++num_receivers ) {
+        for (size_t node_idx = 0; node_idx < exe_vec.size(); ++node_idx) {
+            for (size_t num_receivers = 1; num_receivers <= MAX_NODES; ++num_receivers) {
                 // Create num_receivers counting receivers and connect the exe_vec[node_idx] to them.
-                std::vector< std::shared_ptr<harness_mapped_receiver<OutputType>> > receivers;
+                std::vector<std::shared_ptr<harness_mapped_receiver<OutputType>>> receivers;
                 for (size_t i = 0; i < num_receivers; i++) {
-                    receivers.push_back( std::make_shared<harness_mapped_receiver<OutputType>>(g) );
+                    receivers.push_back(std::make_shared<harness_mapped_receiver<OutputType>>(g));
                 }
 
-                for (size_t r = 0; r < num_receivers; ++r ) {
-                    tbb::flow::make_edge( tbb::flow::output_port<0>(exe_vec[node_idx]), *receivers[r] );
+                for (size_t r = 0; r < num_receivers; ++r) {
+                    tbb::flow::make_edge(tbb::flow::output_port<0>(exe_vec[node_idx]), *receivers[r]);
                 }
 
                 // Do the test with varying numbers of senders
-                std::vector< std::shared_ptr<harness_counting_sender<InputType>> > senders;
-                for (size_t num_senders = 1; num_senders <= MAX_NODES; ++num_senders ) {
+                std::vector<std::shared_ptr<harness_counting_sender<InputType>>> senders;
+                for (size_t num_senders = 1; num_senders <= MAX_NODES; ++num_senders) {
                     // Create num_senders senders, set their message limit each to N, and connect
                     // them to the exe_vec[node_idx]
                     senders.clear();
-                    for (size_t s = 0; s < num_senders; ++s ) {
-                        senders.push_back( std::make_shared<harness_counting_sender<InputType>>() );
+                    for (size_t s = 0; s < num_senders; ++s) {
+                        senders.push_back(std::make_shared<harness_counting_sender<InputType>>());
                         senders.back()->my_limit = N;
-                        tbb::flow::make_edge( *senders.back(), exe_vec[node_idx] );
+                        tbb::flow::make_edge(*senders.back(), exe_vec[node_idx]);
                     }
 
                     // Initialize the receivers so they know how many senders and messages to check for
-                    for (size_t r = 0; r < num_receivers; ++r ) {
-                        receivers[r]->initialize_map( N, num_senders );
+                    for (size_t r = 0; r < num_receivers; ++r) {
+                        receivers[r]->initialize_map(N, num_senders);
                     }
 
                     // Do the test
-                    utils::NativeParallelFor( (int)num_senders, parallel_put_until_limit<InputType>(senders) );
+                    utils::NativeParallelFor((int) num_senders, parallel_put_until_limit<InputType>(senders));
                     g.wait_for_all();
 
                     // confirm that each sender was requested from N times
-                    for (size_t s = 0; s < num_senders; ++s ) {
+                    for (size_t s = 0; s < num_senders; ++s) {
                         size_t n = senders[s]->my_received;
-                        CHECK_MESSAGE( n == N, "" );
-                        CHECK_MESSAGE( senders[s]->my_receiver.load(std::memory_order_relaxed) == &exe_vec[node_idx], "" );
+                        CHECK_MESSAGE(n == N, "");
+                        CHECK_MESSAGE(senders[s]->my_receiver.load(std::memory_order_relaxed)
+                                              == &exe_vec[node_idx],
+                                      "");
                     }
                     // validate the receivers
-                    for (size_t r = 0; r < num_receivers; ++r ) {
-                        receivers[r]->validate();
-                    }
+                    for (size_t r = 0; r < num_receivers; ++r) { receivers[r]->validate(); }
                 }
-                for (size_t r = 0; r < num_receivers; ++r ) {
-                    tbb::flow::remove_edge( tbb::flow::output_port<0>(exe_vec[node_idx]), *receivers[r] );
+                for (size_t r = 0; r < num_receivers; ++r) {
+                    tbb::flow::remove_edge(tbb::flow::output_port<0>(exe_vec[node_idx]), *receivers[r]);
                 }
-                CHECK_MESSAGE( exe_vec[node_idx].try_put( InputType() ) == true, "" );
+                CHECK_MESSAGE(exe_vec[node_idx].try_put(InputType()) == true, "");
                 g.wait_for_all();
-                for (size_t r = 0; r < num_receivers; ++r ) {
+                for (size_t r = 0; r < num_receivers; ++r) {
                     // since it's detached, nothing should have changed
                     receivers[r]->validate();
                 }
@@ -135,96 +133,93 @@ std::atomic<size_t> global_execute_count;
 struct inc_functor {
 
     std::atomic<size_t> local_execute_count;
-    inc_functor( ) { local_execute_count = 0; }
-    inc_functor( const inc_functor &f ) { local_execute_count = size_t(f.local_execute_count); }
-
-    template<typename output_ports_type>
-    void operator()( int i, output_ports_type &p ) {
-       ++global_execute_count;
-       ++local_execute_count;
-       (void)std::get<0>(p).try_put(i);
+    inc_functor() { local_execute_count = 0; }
+    inc_functor(const inc_functor& f) { local_execute_count = size_t(f.local_execute_count); }
+
+    template <typename output_ports_type>
+    void operator()(int i, output_ports_type& p) {
+        ++global_execute_count;
+        ++local_execute_count;
+        (void) std::get<0>(p).try_put(i);
     }
-
 };
 
-template< typename InputType, typename OutputTuple >
-void buffered_levels_with_copy( size_t concurrency ) {
-    typedef typename std::tuple_element<0,OutputTuple>::type OutputType;
+template <typename InputType, typename OutputTuple>
+void buffered_levels_with_copy(size_t concurrency) {
+    typedef typename std::tuple_element<0, OutputTuple>::type OutputType;
     // Do for lc = 1 to concurrency level
-    for ( size_t lc = 1; lc <= concurrency; ++lc ) {
+    for (size_t lc = 1; lc <= concurrency; ++lc) {
         tbb::flow::graph g;
 
         inc_functor cf;
         cf.local_execute_count = Offset;
         global_execute_count = Offset;
 
-        tbb::flow::multifunction_node< InputType, OutputTuple > exe_node( g, lc, cf );
+        tbb::flow::multifunction_node<InputType, OutputTuple> exe_node(g, lc, cf);
 
-        for (size_t num_receivers = 1; num_receivers <= MAX_NODES; ++num_receivers ) {
+        for (size_t num_receivers = 1; num_receivers <= MAX_NODES; ++num_receivers) {
 
-            std::vector< std::shared_ptr<harness_mapped_receiver<OutputType>> > receivers;
+            std::vector<std::shared_ptr<harness_mapped_receiver<OutputType>>> receivers;
             for (size_t i = 0; i < num_receivers; i++) {
-                receivers.push_back( std::make_shared<harness_mapped_receiver<OutputType>>(g) );
+                receivers.push_back(std::make_shared<harness_mapped_receiver<OutputType>>(g));
             }
 
-            for (size_t r = 0; r < num_receivers; ++r ) {
-               tbb::flow::make_edge( tbb::flow::output_port<0>(exe_node), *receivers[r] );
+            for (size_t r = 0; r < num_receivers; ++r) {
+                tbb::flow::make_edge(tbb::flow::output_port<0>(exe_node), *receivers[r]);
             }
 
-            std::vector< std::shared_ptr<harness_counting_sender<InputType>> > senders;
-            for (size_t num_senders = 1; num_senders <= MAX_NODES; ++num_senders ) {
+            std::vector<std::shared_ptr<harness_counting_sender<InputType>>> senders;
+            for (size_t num_senders = 1; num_senders <= MAX_NODES; ++num_senders) {
                 senders.clear();
-                for (size_t s = 0; s < num_senders; ++s ) {
-                    senders.push_back( std::make_shared<harness_counting_sender<InputType>>() );
+                for (size_t s = 0; s < num_senders; ++s) {
+                    senders.push_back(std::make_shared<harness_counting_sender<InputType>>());
                     senders.back()->my_limit = N;
-                    tbb::flow::make_edge( *senders.back(), exe_node );
+                    tbb::flow::make_edge(*senders.back(), exe_node);
                 }
 
-                for (size_t r = 0; r < num_receivers; ++r ) {
-                    receivers[r]->initialize_map( N, num_senders );
-                }
+                for (size_t r = 0; r < num_receivers; ++r) { receivers[r]->initialize_map(N, num_senders); }
 
-                utils::NativeParallelFor( (int)num_senders, parallel_put_until_limit<InputType>(senders) );
+                utils::NativeParallelFor((int) num_senders, parallel_put_until_limit<InputType>(senders));
                 g.wait_for_all();
 
-                for (size_t s = 0; s < num_senders; ++s ) {
+                for (size_t s = 0; s < num_senders; ++s) {
                     size_t n = senders[s]->my_received;
-                    CHECK_MESSAGE( n == N, "" );
-                    CHECK_MESSAGE( senders[s]->my_receiver.load(std::memory_order_relaxed) == &exe_node, "" );
-                }
-                for (size_t r = 0; r < num_receivers; ++r ) {
-                    receivers[r]->validate();
+                    CHECK_MESSAGE(n == N, "");
+                    CHECK_MESSAGE(senders[s]->my_receiver.load(std::memory_order_relaxed) == &exe_node, "");
                 }
+                for (size_t r = 0; r < num_receivers; ++r) { receivers[r]->validate(); }
             }
-            for (size_t r = 0; r < num_receivers; ++r ) {
-                tbb::flow::remove_edge( tbb::flow::output_port<0>(exe_node), *receivers[r] );
+            for (size_t r = 0; r < num_receivers; ++r) {
+                tbb::flow::remove_edge(tbb::flow::output_port<0>(exe_node), *receivers[r]);
             }
-            CHECK_MESSAGE( exe_node.try_put( InputType() ) == true, "" );
+            CHECK_MESSAGE(exe_node.try_put(InputType()) == true, "");
             g.wait_for_all();
-            for (size_t r = 0; r < num_receivers; ++r ) {
-                receivers[r]->validate();
-            }
+            for (size_t r = 0; r < num_receivers; ++r) { receivers[r]->validate(); }
         }
 
         // validate that the local body matches the global execute_count and both are correct
-        inc_functor body_copy = tbb::flow::copy_body<inc_functor>( exe_node );
-        const size_t expected_count = N/2 * MAX_NODES * MAX_NODES * ( MAX_NODES + 1 ) + MAX_NODES + Offset;
+        inc_functor body_copy = tbb::flow::copy_body<inc_functor>(exe_node);
+        const size_t expected_count = N / 2 * MAX_NODES * MAX_NODES * (MAX_NODES + 1) + MAX_NODES + Offset;
         size_t global_count = global_execute_count;
         size_t inc_count = body_copy.local_execute_count;
-        CHECK_MESSAGE( (global_count == expected_count && global_count == inc_count), "" );
+        CHECK_MESSAGE((global_count == expected_count && global_count == inc_count), "");
     }
 }
 
-template< typename InputType, typename OutputTuple >
-void run_buffered_levels( int c ) {
-    typedef typename tbb::flow::multifunction_node<InputType,OutputTuple>::output_ports_type output_ports_type;
-    buffered_levels<InputType,OutputTuple>( c, []( InputType i, output_ports_type &p ) { harness_graph_multifunction_executor<InputType, OutputTuple>::func(i,p); } );
-    buffered_levels<InputType,OutputTuple>( c, &harness_graph_multifunction_executor<InputType, OutputTuple>::func );
-    buffered_levels<InputType,OutputTuple>( c, typename harness_graph_multifunction_executor<InputType, OutputTuple>::functor() );
-    buffered_levels_with_copy<InputType,OutputTuple>( c );
+template <typename InputType, typename OutputTuple>
+void run_buffered_levels(int c) {
+    typedef typename tbb::flow::multifunction_node<InputType, OutputTuple>::output_ports_type
+            output_ports_type;
+    buffered_levels<InputType, OutputTuple>(c, [](InputType i, output_ports_type& p) {
+        harness_graph_multifunction_executor<InputType, OutputTuple>::func(i, p);
+    });
+    buffered_levels<InputType, OutputTuple>(
+            c, &harness_graph_multifunction_executor<InputType, OutputTuple>::func);
+    buffered_levels<InputType, OutputTuple>(
+            c, typename harness_graph_multifunction_executor<InputType, OutputTuple>::functor());
+    buffered_levels_with_copy<InputType, OutputTuple>(c);
 }
 
-
 //! Performs test on executable nodes with limited concurrency
 /** These tests check:
     1) that the nodes will accepts puts up to the concurrency limit,
@@ -234,10 +229,10 @@ void run_buffered_levels( int c ) {
     There is no checking of the contents of the messages for corruption.
 */
 
-template< typename InputType, typename OutputTuple, typename Body >
-void concurrency_levels( size_t concurrency, Body body ) {
-    typedef typename std::tuple_element<0,OutputTuple>::type OutputType;
-    for ( size_t lc = 1; lc <= concurrency; ++lc ) {
+template <typename InputType, typename OutputTuple, typename Body>
+void concurrency_levels(size_t concurrency, Body body) {
+    typedef typename std::tuple_element<0, OutputTuple>::type OutputType;
+    for (size_t lc = 1; lc <= concurrency; ++lc) {
         tbb::flow::graph g;
 
         // Set the execute_counter back to zero in the harness
@@ -247,102 +242,107 @@ void concurrency_levels( size_t concurrency, Body body ) {
         // Set the max allowed executors to lc.  There is a check in the functor to make sure this is never exceeded.
         harness_graph_multifunction_executor<InputType, OutputTuple>::max_executors = lc;
 
+        tbb::flow::multifunction_node<InputType, OutputTuple, tbb::flow::rejecting> exe_node(g, lc, body);
 
-        tbb::flow::multifunction_node< InputType, OutputTuple, tbb::flow::rejecting > exe_node( g, lc, body );
+        for (size_t num_receivers = 1; num_receivers <= MAX_NODES; ++num_receivers) {
 
-        for (size_t num_receivers = 1; num_receivers <= MAX_NODES; ++num_receivers ) {
-
-            std::vector< std::shared_ptr<harness_counting_receiver<OutputType>> > receivers;
+            std::vector<std::shared_ptr<harness_counting_receiver<OutputType>>> receivers;
             for (size_t i = 0; i < num_receivers; ++i) {
-                receivers.push_back( std::make_shared<harness_counting_receiver<OutputType>>(g) );
+                receivers.push_back(std::make_shared<harness_counting_receiver<OutputType>>(g));
             }
 
-            for (size_t r = 0; r < num_receivers; ++r ) {
-                tbb::flow::make_edge( tbb::flow::output_port<0>(exe_node), *receivers[r] );
+            for (size_t r = 0; r < num_receivers; ++r) {
+                tbb::flow::make_edge(tbb::flow::output_port<0>(exe_node), *receivers[r]);
             }
 
-            std::vector< std::shared_ptr<harness_counting_sender<InputType>> > senders;
+            std::vector<std::shared_ptr<harness_counting_sender<InputType>>> senders;
 
-            for (size_t num_senders = 1; num_senders <= MAX_NODES; ++num_senders ) {
+            for (size_t num_senders = 1; num_senders <= MAX_NODES; ++num_senders) {
                 {
                     // Exclusively lock m to prevent exe_node from finishing
                     tbb::spin_rw_mutex::scoped_lock l(
-                        harness_graph_multifunction_executor< InputType, OutputTuple>::template mutex_holder<tbb::spin_rw_mutex>::mutex
-                    );
+                            harness_graph_multifunction_executor<InputType, OutputTuple>::
+                                    template mutex_holder<tbb::spin_rw_mutex>::mutex);
 
                     // put to lc level, it will accept and then block at m
-                    for ( size_t c = 0 ; c < lc ; ++c ) {
-                        CHECK_MESSAGE( exe_node.try_put( InputType() ) == true, "" );
+                    for (size_t c = 0; c < lc; ++c) {
+                        CHECK_MESSAGE(exe_node.try_put(InputType()) == true, "");
                     }
                     // it only accepts to lc level
-                    CHECK_MESSAGE( exe_node.try_put( InputType() ) == false, "" );
+                    CHECK_MESSAGE(exe_node.try_put(InputType()) == false, "");
 
                     senders.clear();
-                    for (size_t s = 0; s < num_senders; ++s ) {
-                        senders.push_back( std::make_shared<harness_counting_sender<InputType>>() );
+                    for (size_t s = 0; s < num_senders; ++s) {
+                        senders.push_back(std::make_shared<harness_counting_sender<InputType>>());
                         senders.back()->my_limit = N;
-                        exe_node.register_predecessor( *senders.back() );
+                        exe_node.register_predecessor(*senders.back());
                     }
 
-                } // release lock at end of scope, setting the exe node free to continue
+                }// release lock at end of scope, setting the exe node free to continue
                 // wait for graph to settle down
                 g.wait_for_all();
 
                 // confirm that each sender was requested from N times
-                for (size_t s = 0; s < num_senders; ++s ) {
+                for (size_t s = 0; s < num_senders; ++s) {
                     size_t n = senders[s]->my_received;
-                    CHECK_MESSAGE( n == N, "" );
-                    CHECK_MESSAGE( senders[s]->my_receiver.load(std::memory_order_relaxed) == &exe_node, "" );
+                    CHECK_MESSAGE(n == N, "");
+                    CHECK_MESSAGE(senders[s]->my_receiver.load(std::memory_order_relaxed) == &exe_node, "");
                 }
                 // confirm that each receivers got N * num_senders + the initial lc puts
-                for (size_t r = 0; r < num_receivers; ++r ) {
+                for (size_t r = 0; r < num_receivers; ++r) {
                     size_t n = receivers[r]->my_count;
-                    CHECK_MESSAGE( n == num_senders*N+lc, "" );
+                    CHECK_MESSAGE(n == num_senders * N + lc, "");
                     receivers[r]->my_count = 0;
                 }
             }
-            for (size_t r = 0; r < num_receivers; ++r ) {
-                tbb::flow::remove_edge( tbb::flow::output_port<0>(exe_node), *receivers[r] );
+            for (size_t r = 0; r < num_receivers; ++r) {
+                tbb::flow::remove_edge(tbb::flow::output_port<0>(exe_node), *receivers[r]);
             }
-            CHECK_MESSAGE( exe_node.try_put( InputType() ) == true, "" );
+            CHECK_MESSAGE(exe_node.try_put(InputType()) == true, "");
             g.wait_for_all();
-            for (size_t r = 0; r < num_receivers; ++r ) {
-                CHECK_MESSAGE( int(receivers[r]->my_count) == 0, "" );
+            for (size_t r = 0; r < num_receivers; ++r) {
+                CHECK_MESSAGE(int(receivers[r]->my_count) == 0, "");
             }
         }
     }
 }
 
-template< typename InputType, typename OutputTuple >
-void run_concurrency_levels( int c ) {
-    typedef typename tbb::flow::multifunction_node<InputType,OutputTuple>::output_ports_type output_ports_type;
-    concurrency_levels<InputType,OutputTuple>( c, []( InputType i, output_ports_type &p ) { harness_graph_multifunction_executor<InputType, OutputTuple>::template tfunc<tbb::spin_rw_mutex>(i,p); } );
-    concurrency_levels<InputType,OutputTuple>( c, &harness_graph_multifunction_executor<InputType, OutputTuple>::template tfunc<tbb::spin_rw_mutex> );
-    concurrency_levels<InputType,OutputTuple>( c, typename harness_graph_multifunction_executor<InputType, OutputTuple>::template tfunctor<tbb::spin_rw_mutex>() );
+template <typename InputType, typename OutputTuple>
+void run_concurrency_levels(int c) {
+    typedef typename tbb::flow::multifunction_node<InputType, OutputTuple>::output_ports_type
+            output_ports_type;
+    concurrency_levels<InputType, OutputTuple>(c, [](InputType i, output_ports_type& p) {
+        harness_graph_multifunction_executor<InputType, OutputTuple>::template tfunc<tbb::spin_rw_mutex>(i,
+                                                                                                         p);
+    });
+    concurrency_levels<InputType, OutputTuple>(
+            c, &harness_graph_multifunction_executor<InputType,
+                                                     OutputTuple>::template tfunc<tbb::spin_rw_mutex>);
+    concurrency_levels<InputType, OutputTuple>(
+            c, typename harness_graph_multifunction_executor<InputType, OutputTuple>::template tfunctor<
+                       tbb::spin_rw_mutex>());
 }
 
-
 struct empty_no_assign {
-   empty_no_assign() {}
-   empty_no_assign( int ) {}
-   operator int() { return 0; }
-   operator int() const { return 0; }
+    empty_no_assign() {}
+    empty_no_assign(int) {}
+    operator int() { return 0; }
+    operator int() const { return 0; }
 };
 
-template< typename InputType >
+template <typename InputType>
 struct parallel_puts : private utils::NoAssign {
 
-    tbb::flow::receiver< InputType > * const my_exe_node;
+    tbb::flow::receiver<InputType>* const my_exe_node;
 
-    parallel_puts( tbb::flow::receiver< InputType > &exe_node ) : my_exe_node(&exe_node) {}
+    parallel_puts(tbb::flow::receiver<InputType>& exe_node) : my_exe_node(&exe_node) {}
 
-    void operator()( int ) const  {
-        for ( int i = 0; i < N; ++i ) {
+    void operator()(int) const {
+        for (int i = 0; i < N; ++i) {
             // the nodes will accept all puts
-            CHECK_MESSAGE( my_exe_node->try_put( InputType() ) == true, "" );
+            CHECK_MESSAGE(my_exe_node->try_put(InputType()) == true, "");
         }
     }
-
 };
 
 //! Performs test on executable nodes with unlimited concurrency
@@ -353,130 +353,130 @@ struct parallel_puts : private utils::NoAssign {
     There is no checking of the contents of the messages for corruption.
 */
 
-template< typename InputType, typename OutputTuple, typename Body >
-void unlimited_concurrency( Body body ) {
-    typedef typename std::tuple_element<0,OutputTuple>::type OutputType;
+template <typename InputType, typename OutputTuple, typename Body>
+void unlimited_concurrency(Body body) {
+    typedef typename std::tuple_element<0, OutputTuple>::type OutputType;
 
-    for (unsigned int p = 1; p < 2*utils::MaxThread; ++p) {
+    for (unsigned int p = 1; p < 2 * utils::MaxThread; ++p) {
         tbb::flow::graph g;
-        tbb::flow::multifunction_node< InputType, OutputTuple, tbb::flow::rejecting > exe_node( g, tbb::flow::unlimited, body );
+        tbb::flow::multifunction_node<InputType, OutputTuple, tbb::flow::rejecting> exe_node(
+                g, tbb::flow::unlimited, body);
 
-        for (size_t num_receivers = 1; num_receivers <= MAX_NODES; ++num_receivers ) {
-            std::vector< std::shared_ptr<harness_counting_receiver<OutputType>> > receivers;
+        for (size_t num_receivers = 1; num_receivers <= MAX_NODES; ++num_receivers) {
+            std::vector<std::shared_ptr<harness_counting_receiver<OutputType>>> receivers;
             for (size_t i = 0; i < num_receivers; ++i) {
-                receivers.push_back( std::make_shared<harness_counting_receiver<OutputType>>(g) );
+                receivers.push_back(std::make_shared<harness_counting_receiver<OutputType>>(g));
             }
 
             harness_graph_multifunction_executor<InputType, OutputTuple>::execute_count = 0;
 
-            for (size_t r = 0; r < num_receivers; ++r ) {
-                tbb::flow::make_edge( tbb::flow::output_port<0>(exe_node), *receivers[r] );
+            for (size_t r = 0; r < num_receivers; ++r) {
+                tbb::flow::make_edge(tbb::flow::output_port<0>(exe_node), *receivers[r]);
             }
 
-            utils::NativeParallelFor( p, parallel_puts<InputType>(exe_node) );
+            utils::NativeParallelFor(p, parallel_puts<InputType>(exe_node));
             g.wait_for_all();
 
             // 2) the nodes will receive puts from multiple predecessors simultaneously,
             size_t ec = harness_graph_multifunction_executor<InputType, OutputTuple>::execute_count;
-            CHECK_MESSAGE( (unsigned int)ec == p*N, "" );
-            for (size_t r = 0; r < num_receivers; ++r ) {
+            CHECK_MESSAGE((unsigned int) ec == p * N, "");
+            for (size_t r = 0; r < num_receivers; ++r) {
                 size_t c = receivers[r]->my_count;
                 // 3) the nodes will send to multiple successors.
-                CHECK_MESSAGE( (unsigned int)c == p*N, "" );
+                CHECK_MESSAGE((unsigned int) c == p * N, "");
             }
-            for (size_t r = 0; r < num_receivers; ++r ) {
-                tbb::flow::remove_edge( tbb::flow::output_port<0>(exe_node), *receivers[r] );
+            for (size_t r = 0; r < num_receivers; ++r) {
+                tbb::flow::remove_edge(tbb::flow::output_port<0>(exe_node), *receivers[r]);
             }
         }
     }
 }
 
-template< typename InputType, typename OutputTuple >
+template <typename InputType, typename OutputTuple>
 void run_unlimited_concurrency() {
     harness_graph_multifunction_executor<InputType, OutputTuple>::max_executors = 0;
-    typedef typename tbb::flow::multifunction_node<InputType,OutputTuple>::output_ports_type output_ports_type;
-    unlimited_concurrency<InputType,OutputTuple>( []( InputType i, output_ports_type &p ) { harness_graph_multifunction_executor<InputType, OutputTuple>::func(i,p); } );
-    unlimited_concurrency<InputType,OutputTuple>( &harness_graph_multifunction_executor<InputType, OutputTuple>::func );
-    unlimited_concurrency<InputType,OutputTuple>( typename harness_graph_multifunction_executor<InputType, OutputTuple>::functor() );
+    typedef typename tbb::flow::multifunction_node<InputType, OutputTuple>::output_ports_type
+            output_ports_type;
+    unlimited_concurrency<InputType, OutputTuple>([](InputType i, output_ports_type& p) {
+        harness_graph_multifunction_executor<InputType, OutputTuple>::func(i, p);
+    });
+    unlimited_concurrency<InputType, OutputTuple>(
+            &harness_graph_multifunction_executor<InputType, OutputTuple>::func);
+    unlimited_concurrency<InputType, OutputTuple>(
+            typename harness_graph_multifunction_executor<InputType, OutputTuple>::functor());
 }
 
-template<typename InputType, typename OutputTuple>
+template <typename InputType, typename OutputTuple>
 struct oddEvenBody {
-    typedef typename tbb::flow::multifunction_node<InputType,OutputTuple>::output_ports_type output_ports_type;
-    typedef typename std::tuple_element<0,OutputTuple>::type EvenType;
-    typedef typename std::tuple_element<1,OutputTuple>::type OddType;
-    void operator() (const InputType &i, output_ports_type &p) {
-        if((int)i % 2) {
-            (void)std::get<1>(p).try_put(OddType(i));
-        }
-        else {
-            (void)std::get<0>(p).try_put(EvenType(i));
+    typedef typename tbb::flow::multifunction_node<InputType, OutputTuple>::output_ports_type
+            output_ports_type;
+    typedef typename std::tuple_element<0, OutputTuple>::type EvenType;
+    typedef typename std::tuple_element<1, OutputTuple>::type OddType;
+    void operator()(const InputType& i, output_ports_type& p) {
+        if ((int) i % 2) {
+            (void) std::get<1>(p).try_put(OddType(i));
+        } else {
+            (void) std::get<0>(p).try_put(EvenType(i));
         }
     }
 };
 
-template<typename InputType, typename OutputTuple >
+template <typename InputType, typename OutputTuple>
 void run_multiport_test(int num_threads) {
     typedef typename tbb::flow::multifunction_node<InputType, OutputTuple> mo_node_type;
-    typedef typename std::tuple_element<0,OutputTuple>::type EvenType;
-    typedef typename std::tuple_element<1,OutputTuple>::type OddType;
+    typedef typename std::tuple_element<0, OutputTuple>::type EvenType;
+    typedef typename std::tuple_element<1, OutputTuple>::type OddType;
     tbb::task_arena arena(num_threads);
-    arena.execute(
-        [&] () {
-            tbb::flow::graph g;
-            mo_node_type mo_node(g, tbb::flow::unlimited, oddEvenBody<InputType, OutputTuple>() );
+    arena.execute([&]() {
+        tbb::flow::graph g;
+        mo_node_type mo_node(g, tbb::flow::unlimited, oddEvenBody<InputType, OutputTuple>());
 
-            tbb::flow::queue_node<EvenType> q0(g);
-            tbb::flow::queue_node<OddType> q1(g);
+        tbb::flow::queue_node<EvenType> q0(g);
+        tbb::flow::queue_node<OddType> q1(g);
 
-            tbb::flow::make_edge(tbb::flow::output_port<0>(mo_node), q0);
-            tbb::flow::make_edge(tbb::flow::output_port<1>(mo_node), q1);
+        tbb::flow::make_edge(tbb::flow::output_port<0>(mo_node), q0);
+        tbb::flow::make_edge(tbb::flow::output_port<1>(mo_node), q1);
 
-            for(InputType i = 0; i < N; ++i) {
-                mo_node.try_put(i);
-            }
+        for (InputType i = 0; i < N; ++i) { mo_node.try_put(i); }
 
-            g.wait_for_all();
-            for(int i = 0; i < N/2; ++i) {
-                EvenType e{};
-                OddType o{};
-                CHECK_MESSAGE( q0.try_get(e), "" );
-                CHECK_MESSAGE( (int)e % 2 == 0, "" );
-                CHECK_MESSAGE( q1.try_get(o), "" );
-                CHECK_MESSAGE( (int)o % 2 == 1, "" );
-            }
+        g.wait_for_all();
+        for (int i = 0; i < N / 2; ++i) {
+            EvenType e {};
+            OddType o {};
+            CHECK_MESSAGE(q0.try_get(e), "");
+            CHECK_MESSAGE((int) e % 2 == 0, "");
+            CHECK_MESSAGE(q1.try_get(o), "");
+            CHECK_MESSAGE((int) o % 2 == 1, "");
         }
-    );
+    });
 }
 
 //! Tests limited concurrency cases for nodes that accept data messages
 void test_concurrency(int num_threads) {
     tbb::task_arena arena(num_threads);
-    arena.execute(
-        [&] () {
-            run_concurrency_levels<int,std::tuple<int> >(num_threads);
-            run_concurrency_levels<int,std::tuple<tbb::flow::continue_msg> >(num_threads);
-            run_buffered_levels<int, std::tuple<int> >(num_threads);
-            run_unlimited_concurrency<int, std::tuple<int> >();
-            run_unlimited_concurrency<int,std::tuple<empty_no_assign> >();
-            run_unlimited_concurrency<empty_no_assign,std::tuple<int> >();
-            run_unlimited_concurrency<empty_no_assign,std::tuple<empty_no_assign> >();
-            run_unlimited_concurrency<int,std::tuple<tbb::flow::continue_msg> >();
-            run_unlimited_concurrency<empty_no_assign,std::tuple<tbb::flow::continue_msg> >();
-            run_multiport_test<int, std::tuple<int, int> >(num_threads);
-            run_multiport_test<float, std::tuple<int, double> >(num_threads);
-        }
-    );
+    arena.execute([&]() {
+        run_concurrency_levels<int, std::tuple<int>>(num_threads);
+        run_concurrency_levels<int, std::tuple<tbb::flow::continue_msg>>(num_threads);
+        run_buffered_levels<int, std::tuple<int>>(num_threads);
+        run_unlimited_concurrency<int, std::tuple<int>>();
+        run_unlimited_concurrency<int, std::tuple<empty_no_assign>>();
+        run_unlimited_concurrency<empty_no_assign, std::tuple<int>>();
+        run_unlimited_concurrency<empty_no_assign, std::tuple<empty_no_assign>>();
+        run_unlimited_concurrency<int, std::tuple<tbb::flow::continue_msg>>();
+        run_unlimited_concurrency<empty_no_assign, std::tuple<tbb::flow::continue_msg>>();
+        run_multiport_test<int, std::tuple<int, int>>(num_threads);
+        run_multiport_test<float, std::tuple<int, double>>(num_threads);
+    });
 }
 
-template<typename Policy>
+template <typename Policy>
 void test_ports_return_references() {
     tbb::flow::graph g;
     typedef int InputType;
     typedef std::tuple<int> OutputTuple;
     tbb::flow::multifunction_node<InputType, OutputTuple, Policy> mf_node(
-        g, tbb::flow::unlimited,
-        &harness_graph_multifunction_executor<InputType, OutputTuple>::empty_func );
+            g, tbb::flow::unlimited,
+            &harness_graph_multifunction_executor<InputType, OutputTuple>::empty_func);
     test_output_ports_return_ref(mf_node);
 }
 
@@ -495,67 +495,59 @@ void test_precedes() {
     buffer_node<int> b2(g);
 
     multinode node(precedes(b1, b2), unlimited, [](const int& i, multinode::output_ports_type& op) -> void {
-            if (i % 2)
-                std::get<0>(op).try_put(i);
-            else
-                std::get<1>(op).try_put(i);
-        }
-    );
+        if (i % 2) std::get<0>(op).try_put(i);
+        else
+            std::get<1>(op).try_put(i);
+    });
 
     node.try_put(0);
     node.try_put(1);
     g.wait_for_all();
 
     int storage;
-    CHECK_MESSAGE((b1.try_get(storage) && !b1.try_get(storage) && b2.try_get(storage) && !b2.try_get(storage)),
+    CHECK_MESSAGE(
+            (b1.try_get(storage) && !b1.try_get(storage) && b2.try_get(storage) && !b2.try_get(storage)),
             "Not exact edge quantity was made");
 }
 
 void test_follows_and_precedes_api() {
     using multinode = tbb::flow::multifunction_node<int, std::tuple<int, int, int>>;
 
-    std::array<int, 3> messages_for_follows = { {0, 1, 2} };
+    std::array<int, 3> messages_for_follows = {{0, 1, 2}};
 
-    follows_and_precedes_testing::test_follows
-        <int, tbb::flow::multifunction_node<int, std::tuple<int, int, int>>>
-        (messages_for_follows, tbb::flow::unlimited, [](const int& i, multinode::output_ports_type& op) -> void {
-            std::get<0>(op).try_put(i);
-        });
+    follows_and_precedes_testing::test_follows<int,
+                                               tbb::flow::multifunction_node<int, std::tuple<int, int, int>>>(
+            messages_for_follows, tbb::flow::unlimited,
+            [](const int& i, multinode::output_ports_type& op) -> void { std::get<0>(op).try_put(i); });
 
     test_precedes();
 }
-#endif // __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+#endif// __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 
 //! Test various node bodies with concurrency
 //! \brief \ref error_guessing
-TEST_CASE("Concurrency test"){
-    for( unsigned int p=utils::MinThread; p<=utils::MaxThread; ++p ) {
-       test_concurrency(p);
-    }
+TEST_CASE("Concurrency test") {
+    for (unsigned int p = utils::MinThread; p <= utils::MaxThread; ++p) { test_concurrency(p); }
 }
 
 //! Test return types of ports
 //! \brief \ref error_guessing
-TEST_CASE("Test ports retrurn references"){
+TEST_CASE("Test ports retrurn references") {
     test_ports_return_references<tbb::flow::queueing>();
     test_ports_return_references<tbb::flow::rejecting>();
 }
 
 //! NativeParallelFor testing with various concurrency settings
 //! \brief \ref error_guessing
-TEST_CASE("Lightweight testing"){
-    lightweight_testing::test<tbb::flow::multifunction_node>(10);
-}
+TEST_CASE("Lightweight testing") { lightweight_testing::test<tbb::flow::multifunction_node>(10); }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 //! Test follows and precedes API
 //! \brief \ref error_guessing
-TEST_CASE("Test follows-precedes API"){
-    test_follows_and_precedes_api();
-}
+TEST_CASE("Test follows-precedes API") { test_follows_and_precedes_api(); }
 //! Test priority constructor with follows and precedes API
 //! \brief \ref error_guessing
-TEST_CASE("Test priority with follows and precedes"){
+TEST_CASE("Test priority with follows and precedes") {
     using namespace tbb::flow;
 
     using multinode = multifunction_node<int, std::tuple<int, int>>;
@@ -565,20 +557,22 @@ TEST_CASE("Test priority with follows and precedes"){
     buffer_node<int> b1(g);
     buffer_node<int> b2(g);
 
-    multinode node(precedes(b1, b2), unlimited, [](const int& i, multinode::output_ports_type& op) -> void {
-            if (i % 2)
-                std::get<0>(op).try_put(i);
-            else
-                std::get<1>(op).try_put(i);
-        }
-        , node_priority_t(0));
+    multinode node(
+            precedes(b1, b2), unlimited,
+            [](const int& i, multinode::output_ports_type& op) -> void {
+                if (i % 2) std::get<0>(op).try_put(i);
+                else
+                    std::get<1>(op).try_put(i);
+            },
+            node_priority_t(0));
 
     node.try_put(0);
     node.try_put(1);
     g.wait_for_all();
 
     int storage;
-    CHECK_MESSAGE((b1.try_get(storage) && !b1.try_get(storage) && b2.try_get(storage) && !b2.try_get(storage)),
+    CHECK_MESSAGE(
+            (b1.try_get(storage) && !b1.try_get(storage) && b2.try_get(storage) && !b2.try_get(storage)),
             "Not exact edge quantity was made");
 }
 
@@ -589,24 +583,27 @@ TEST_CASE("Test priority with follows and precedes"){
 TEST_CASE("constraints for multifunction_node input") {
     struct InputObject {
         InputObject() = default;
-        InputObject( const InputObject& ) = default;
+        InputObject(const InputObject&) = default;
     };
 
     static_assert(utils::well_formed_instantiation<tbb::flow::multifunction_node, InputObject, int>);
     static_assert(utils::well_formed_instantiation<tbb::flow::multifunction_node, int, int>);
-    static_assert(!utils::well_formed_instantiation<tbb::flow::multifunction_node, test_concepts::NonCopyable, int>);
-    static_assert(!utils::well_formed_instantiation<tbb::flow::multifunction_node, test_concepts::NonDefaultInitializable, int>);
+    static_assert(!utils::well_formed_instantiation<tbb::flow::multifunction_node, test_concepts::NonCopyable,
+                                                    int>);
+    static_assert(!utils::well_formed_instantiation<tbb::flow::multifunction_node,
+                                                    test_concepts::NonDefaultInitializable, int>);
 }
 
 template <typename Input, typename Output, typename Body>
-concept can_call_multifunction_node_ctor = requires( tbb::flow::graph& graph, std::size_t concurrency, Body body,
-                                                     tbb::flow::node_priority_t priority, tbb::flow::buffer_node<int>& f ) {
+concept can_call_multifunction_node_ctor
+        = requires(tbb::flow::graph& graph, std::size_t concurrency, Body body,
+                   tbb::flow::node_priority_t priority, tbb::flow::buffer_node<int>& f) {
     tbb::flow::multifunction_node<Input, Output>(graph, concurrency, body);
     tbb::flow::multifunction_node<Input, Output>(graph, concurrency, body, priority);
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
     tbb::flow::multifunction_node<Input, Output>(tbb::flow::follows(f), concurrency, body);
     tbb::flow::multifunction_node<Input, Output>(tbb::flow::follows(f), concurrency, body, priority);
-#endif // __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+#endif// __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 };
 
 //! \brief \ref error_guessing
@@ -615,11 +612,18 @@ TEST_CASE("constraints for multifunction_node body") {
     using output_type = std::tuple<int>;
     using namespace test_concepts::multifunction_node_body;
 
-    static_assert(can_call_multifunction_node_ctor<input_type, output_type, Correct<input_type, output_type>>);
-    static_assert(!can_call_multifunction_node_ctor<input_type, output_type, NonCopyable<input_type, output_type>>);
-    static_assert(!can_call_multifunction_node_ctor<input_type, output_type, NonDestructible<input_type, output_type>>);
-    static_assert(!can_call_multifunction_node_ctor<input_type, output_type, NoOperatorRoundBrackets<input_type, output_type>>);
-    static_assert(!can_call_multifunction_node_ctor<input_type, output_type, WrongFirstInputOperatorRoundBrackets<input_type, output_type>>);
-    static_assert(!can_call_multifunction_node_ctor<input_type, output_type, WrongSecondInputOperatorRoundBrackets<input_type, output_type>>);
+    static_assert(
+            can_call_multifunction_node_ctor<input_type, output_type, Correct<input_type, output_type>>);
+    static_assert(
+            !can_call_multifunction_node_ctor<input_type, output_type, NonCopyable<input_type, output_type>>);
+    static_assert(!can_call_multifunction_node_ctor<input_type, output_type,
+                                                    NonDestructible<input_type, output_type>>);
+    static_assert(!can_call_multifunction_node_ctor<input_type, output_type,
+                                                    NoOperatorRoundBrackets<input_type, output_type>>);
+    static_assert(
+            !can_call_multifunction_node_ctor<input_type, output_type,
+                                              WrongFirstInputOperatorRoundBrackets<input_type, output_type>>);
+    static_assert(!can_call_multifunction_node_ctor<
+                  input_type, output_type, WrongSecondInputOperatorRoundBrackets<input_type, output_type>>);
 }
-#endif // __TBB_CPP20_CONCEPTS_PRESENT
+#endif// __TBB_CPP20_CONCEPTS_PRESENT
diff --git a/external/tbb/test/tbb/test_mutex.cpp b/external/tbb/test/tbb/test_mutex.cpp
index 5b78f173..6085bb64 100644
--- a/external/tbb/test/tbb/test_mutex.cpp
+++ b/external/tbb/test/tbb/test_mutex.cpp
@@ -16,17 +16,17 @@
 
 #include "test_mutex.h"
 
-#include <tbb/spin_mutex.h>
 #include "oneapi/tbb/mutex.h"
-#include <tbb/spin_rw_mutex.h>
 #include "oneapi/tbb/rw_mutex.h"
-#include <tbb/queuing_mutex.h>
-#include <tbb/queuing_rw_mutex.h>
+#include <oneapi/tbb/detail/_machine.h>
+#include <oneapi/tbb/detail/_utils.h>
 #include <tbb/null_mutex.h>
 #include <tbb/null_rw_mutex.h>
 #include <tbb/parallel_for.h>
-#include <oneapi/tbb/detail/_utils.h>
-#include <oneapi/tbb/detail/_machine.h>
+#include <tbb/queuing_mutex.h>
+#include <tbb/queuing_rw_mutex.h>
+#include <tbb/spin_mutex.h>
+#include <tbb/spin_rw_mutex.h>
 
 //! \file test_mutex.cpp
 //! \brief Test for [mutex.spin_mutex mutex.spin_rw_mutex mutex.queuing_mutex mutex.queuing_rw_mutex mutex.mutex mutex.rw_mutex mutex.speculative_spin_mutex mutex.speculative_spin_rw_mutex] specifications
@@ -36,15 +36,13 @@
 // considered as races by Thread Sanitizer)
 #if __TBB_TSX_INTRINSICS_PRESENT && !__APPLE__ && !__TBB_USE_THREAD_SANITIZER
 
-inline static bool IsInsideTx() {
-    return _xtest() != 0;
-}
+inline static bool IsInsideTx() { return _xtest() != 0; }
 
 bool have_TSX() {
     bool result = false;
     const int rtm_ebx_mask = 1 << 11;
 #if _MSC_VER
-    int info[4] = { 0,0,0,0 };
+    int info[4] = {0, 0, 0, 0};
     const int reg_ebx = 1;
     __cpuidex(info, 7, 0);
     result = (info[reg_ebx] & rtm_ebx_mask) != 0;
@@ -53,15 +51,16 @@ bool have_TSX() {
     int32_t reg_eax = 7;
     int32_t reg_ecx = 0;
     __asm__ __volatile__("movl %%ebx, %%esi\n"
-        "cpuid\n"
-        "movl %%ebx, %0\n"
-        "movl %%esi, %%ebx\n"
-        : "=a"(reg_ebx) : "0" (reg_eax), "c" (reg_ecx) : "esi",
+                         "cpuid\n"
+                         "movl %%ebx, %0\n"
+                         "movl %%esi, %%ebx\n"
+                         : "=a"(reg_ebx)
+                         : "0"(reg_eax), "c"(reg_ecx)
+                         : "esi",
 #if __TBB_x86_64
-        "ebx",
+                           "ebx",
 #endif
-        "edx"
-    );
+                           "edx");
     result = (reg_ebx & rtm_ebx_mask) != 0;
 #endif
     return result;
@@ -69,7 +68,7 @@ bool have_TSX() {
 
 //! Function object for use with parallel_for.h to see if a transaction is actually attempted.
 std::atomic<std::size_t> n_transactions_attempted;
-template<typename C>
+template <typename C>
 struct AddOne_CheckTransaction {
 
     AddOne_CheckTransaction& operator=(const AddOne_CheckTransaction&) = delete;
@@ -94,19 +93,20 @@ struct AddOne_CheckTransaction {
 };
 
 /* TestTransaction() checks if a speculative mutex actually uses transactions. */
-template<typename M>
-void TestTransaction(const char* name)
-{
+template <typename M>
+void TestTransaction(const char* name) {
     utils::Counter<M> counter;
     constexpr int n = 550;
 
     n_transactions_attempted = 0;
     for (int i = 0; i < 5 && n_transactions_attempted.load(std::memory_order_relaxed) == 0; ++i) {
         counter.value = 0;
-        tbb::parallel_for(tbb::blocked_range<std::size_t>(0, n, 2), AddOne_CheckTransaction<utils::Counter<M>>(counter));
+        tbb::parallel_for(tbb::blocked_range<std::size_t>(0, n, 2),
+                          AddOne_CheckTransaction<utils::Counter<M>>(counter));
         REQUIRE(counter.value == n);
     }
-    REQUIRE_MESSAGE(n_transactions_attempted.load(std::memory_order_relaxed), "ERROR for " << name << ": transactions were never attempted");
+    REQUIRE_MESSAGE(n_transactions_attempted.load(std::memory_order_relaxed),
+                    "ERROR for " << name << ": transactions were never attempted");
 }
 
 //! \brief \ref error_guessing
@@ -118,11 +118,8 @@ TEST_CASE("Transaction test") {
 }
 #endif /* __TBB_TSX_TESTING_ENABLED_FOR_THIS_COMPILER */
 
-
 //! \brief \ref error_guessing
-TEST_CASE("test upgrade/downgrade with spin_rw_mutex") {
-    test_rwm_upgrade_downgrade<tbb::spin_rw_mutex>();
-}
+TEST_CASE("test upgrade/downgrade with spin_rw_mutex") { test_rwm_upgrade_downgrade<tbb::spin_rw_mutex>(); }
 
 //! \brief \ref error_guessing
 TEST_CASE("test upgrade/downgrade with queueing_rw_mutex") {
@@ -130,9 +127,7 @@ TEST_CASE("test upgrade/downgrade with queueing_rw_mutex") {
 }
 
 //! \brief \ref error_guessing
-TEST_CASE("test upgrade/downgrade with rw_mutex") {
-    test_rwm_upgrade_downgrade<tbb::rw_mutex>();
-}
+TEST_CASE("test upgrade/downgrade with rw_mutex") { test_rwm_upgrade_downgrade<tbb::rw_mutex>(); }
 
 //! \brief \ref error_guessing
 TEST_CASE("test upgrade/downgrade with speculative_spin_rw_mutex") {
@@ -140,21 +135,15 @@ TEST_CASE("test upgrade/downgrade with speculative_spin_rw_mutex") {
 }
 
 //! \brief \ref error_guessing
-TEST_CASE("test spin_mutex with native threads") {
-    test_with_native_threads::test<tbb::spin_mutex>();
-}
+TEST_CASE("test spin_mutex with native threads") { test_with_native_threads::test<tbb::spin_mutex>(); }
 
 #if !EMSCRIPTEN
 //! \brief \ref error_guessing
-TEST_CASE("test queuing_mutex with native threads") {
-    test_with_native_threads::test<tbb::queuing_mutex>();
-}
+TEST_CASE("test queuing_mutex with native threads") { test_with_native_threads::test<tbb::queuing_mutex>(); }
 #endif
 
 //! \brief \ref error_guessing
-TEST_CASE("test mutex with native threads") {
-    test_with_native_threads::test<tbb::mutex>();
-}
+TEST_CASE("test mutex with native threads") { test_with_native_threads::test<tbb::mutex>(); }
 
 //! \brief \ref error_guessing
 TEST_CASE("test spin_rw_mutex with native threads") {
@@ -195,10 +184,10 @@ concept rw_mutexes = (... && tbb::detail::rw_scoped_lockable<Args>);
 
 //! \brief \ref error_guessing
 TEST_CASE("internal mutex concepts") {
-    static_assert(mutexes<tbb::spin_mutex, oneapi::tbb::mutex, tbb::speculative_spin_mutex, tbb::null_mutex, tbb::queuing_mutex,
-                          tbb::spin_rw_mutex, oneapi::tbb::rw_mutex, tbb::speculative_spin_rw_mutex, tbb::null_rw_mutex, tbb::queuing_rw_mutex>);
+    static_assert(mutexes<tbb::spin_mutex, oneapi::tbb::mutex, tbb::speculative_spin_mutex, tbb::null_mutex,
+                          tbb::queuing_mutex, tbb::spin_rw_mutex, oneapi::tbb::rw_mutex,
+                          tbb::speculative_spin_rw_mutex, tbb::null_rw_mutex, tbb::queuing_rw_mutex>);
     static_assert(rw_mutexes<tbb::spin_rw_mutex, oneapi::tbb::rw_mutex, tbb::speculative_spin_rw_mutex,
                              tbb::null_rw_mutex, tbb::queuing_rw_mutex>);
 }
-#endif // __TBB_CPP20_CONCEPTS_PRESENT
-
+#endif// __TBB_CPP20_CONCEPTS_PRESENT
diff --git a/external/tbb/test/tbb/test_numa_dist.cpp b/external/tbb/test/tbb/test_numa_dist.cpp
index 666e7182..10ff9ace 100644
--- a/external/tbb/test/tbb/test_numa_dist.cpp
+++ b/external/tbb/test/tbb/test_numa_dist.cpp
@@ -18,20 +18,20 @@
 
 #if !__TBB_WIN8UI_SUPPORT
 
-#include <stdio.h>
-#include "tbb/parallel_for.h"
-#include "tbb/global_control.h"
 #include "tbb/enumerable_thread_specific.h"
+#include "tbb/global_control.h"
+#include "tbb/parallel_for.h"
+#include <stdio.h>
 
+#include "common/concepts_common.h"
 #include "common/config.h"
+#include "common/cpu_usertime.h"
+#include "common/exception_handling.h"
+#include "common/spin_barrier.h"
 #include "common/utils.h"
 #include "common/utils_concurrency_limit.h"
 #include "common/utils_report.h"
 #include "common/vector_types.h"
-#include "common/cpu_usertime.h"
-#include "common/spin_barrier.h"
-#include "common/exception_handling.h"
-#include "common/concepts_common.h"
 #include "test_partitioner.h"
 
 #include <cstddef>
@@ -40,68 +40,64 @@
 //! \file test_numa_dist.cpp
 //! \brief Test for [internal] functionality
 #if _MSC_VER
-#pragma warning (push)
+#pragma warning(push)
 // Suppress conditional expression is constant
-#pragma warning (disable: 4127)
+#pragma warning(disable : 4127)
 #if __TBB_MSVC_UNREACHABLE_CODE_IGNORED
-    // Suppress pointless "unreachable code" warning.
-    #pragma warning (disable: 4702)
+// Suppress pointless "unreachable code" warning.
+#pragma warning(disable : 4702)
 #endif
 #if defined(_Wp64)
-    // Workaround for overzealous compiler warnings in /Wp64 mode
-    #pragma warning (disable: 4267)
+// Workaround for overzealous compiler warnings in /Wp64 mode
+#pragma warning(disable : 4267)
 #endif
 #define _SCL_SECURE_NO_WARNINGS
-#endif //#if _MSC_VER
-
+#endif//#if _MSC_VER
 
 struct numa {
     WORD processorGroupCount;
     std::vector<DWORD> numaProcessors;
     DWORD maxProcessors;
-    numa() : processorGroupCount(GetMaximumProcessorGroupCount()), maxProcessors(GetActiveProcessorCount(ALL_PROCESSOR_GROUPS)){   
+    numa()
+        : processorGroupCount(GetMaximumProcessorGroupCount()),
+          maxProcessors(GetActiveProcessorCount(ALL_PROCESSOR_GROUPS)) {
         numaProcessors.resize(processorGroupCount);
-       for (WORD i = 0; i < processorGroupCount; i++) {
+        for (WORD i = 0; i < processorGroupCount; i++) {
             this->numaProcessors[i] = GetActiveProcessorCount((i));
-        }        
+        }
     }
 };
 
-
-int TestNumaDistribution(std::vector<DWORD> &validateProcgrp, int additionalParallelism, bool allThreads){
+int TestNumaDistribution(std::vector<DWORD>& validateProcgrp, int additionalParallelism, bool allThreads) {
     validateProcgrp.resize(GetMaximumProcessorGroupCount());
     PROCESSOR_NUMBER proc;
     struct numa nodes;
     GetThreadIdealProcessorEx(GetCurrentThread(), &proc);
     int master_thread_proc_grp = proc.Group;
     int requested_parallelism;
-    if (allThreads) 
-        requested_parallelism = additionalParallelism;
-    else 
+    if (allThreads) requested_parallelism = additionalParallelism;
+    else
         requested_parallelism = nodes.numaProcessors.at(master_thread_proc_grp) + additionalParallelism;
     tbb::global_control global_limit(oneapi::tbb::global_control::max_allowed_parallelism, 1024);
-    tbb::enumerable_thread_specific< std::pair<int, int> > tls;
-    tbb::enumerable_thread_specific< double > tls_dummy;
+    tbb::enumerable_thread_specific<std::pair<int, int>> tls;
+    tbb::enumerable_thread_specific<double> tls_dummy;
     tbb::static_partitioner s;
-  
+
     utils::SpinBarrier sb(requested_parallelism);
     oneapi::tbb::task_arena limited(requested_parallelism);
     limited.execute([&]() {
-
-        tbb::parallel_for(0, requested_parallelism, [&](int)
-            {                    
-                PROCESSOR_NUMBER proc;
-                if (GetThreadIdealProcessorEx(GetCurrentThread(), &proc))
-                {
-                    tls.local() = std::pair<int, int>(proc.Group, proc.Number);
-                    sb.wait();
-                }
-            }, s);
-        for (const auto& it : tls) {
-           validateProcgrp[it.first]++;
-        }
-      });
-    
+        tbb::parallel_for(
+                0, requested_parallelism,
+                [&](int) {
+                    PROCESSOR_NUMBER proc;
+                    if (GetThreadIdealProcessorEx(GetCurrentThread(), &proc)) {
+                        tls.local() = std::pair<int, int>(proc.Group, proc.Number);
+                        sb.wait();
+                    }
+                },
+                s);
+        for (const auto& it : tls) { validateProcgrp[it.first]++; }
+    });
 
     return master_thread_proc_grp;
 }
@@ -111,8 +107,8 @@ int TestNumaDistribution(std::vector<DWORD> &validateProcgrp, int additionalPara
 TEST_CASE("Numa stability for the same node") {
     numa example;
     std::vector<DWORD> validateProcgrp;
-    
-    int numaGrp = TestNumaDistribution(validateProcgrp,0, 0);
+
+    int numaGrp = TestNumaDistribution(validateProcgrp, 0, 0);
     std::vector<DWORD> result(GetMaximumProcessorGroupCount(), 0);
     result[numaGrp] = example.numaProcessors[numaGrp];
     REQUIRE(validateProcgrp == result);
@@ -123,14 +119,14 @@ TEST_CASE("Numa stability for the same node") {
 TEST_CASE("Numa overflow") {
     numa example;
     std::vector<DWORD> validateProcgrp;
-    
+
     int numaGrp = TestNumaDistribution(validateProcgrp, 1, 0);
     std::vector<DWORD> result(GetMaximumProcessorGroupCount(), 0);
-    if (example.processorGroupCount <= 1) { // for single Numa node
-       result[numaGrp] = example.numaProcessors[numaGrp] + 1;
+    if (example.processorGroupCount <= 1) {// for single Numa node
+        result[numaGrp] = example.numaProcessors[numaGrp] + 1;
     } else {
-       result[numaGrp] = example.numaProcessors[numaGrp];
-       result[(numaGrp+1)% GetMaximumProcessorGroupCount()] = 1;
+        result[numaGrp] = example.numaProcessors[numaGrp];
+        result[(numaGrp + 1) % GetMaximumProcessorGroupCount()] = 1;
     }
     REQUIRE(validateProcgrp == result);
 }
@@ -156,7 +152,7 @@ TEST_CASE("Double threads") {
 }
 
 #if _MSC_VER
-#pragma warning (pop)
+#pragma warning(pop)
 #endif
 
-#endif // !__TBB_WIN8UI_SUPPORT
+#endif// !__TBB_WIN8UI_SUPPORT
diff --git a/external/tbb/test/tbb/test_openmp.cpp b/external/tbb/test/tbb/test_openmp.cpp
index 495be1c7..77b08913 100644
--- a/external/tbb/test/tbb/test_openmp.cpp
+++ b/external/tbb/test/tbb/test_openmp.cpp
@@ -24,8 +24,8 @@
 #include "common/test.h"
 #include "common/utils.h"
 #include "common/utils_env.h"
-#include "tbb/global_control.h"
 #include "tbb/blocked_range.h"
+#include "tbb/global_control.h"
 #include "tbb/parallel_for.h"
 #include "tbb/parallel_reduce.h"
 
@@ -34,49 +34,44 @@
 
 using data_type = short;
 
-void SerialConvolve( data_type c[], const data_type a[], int m, const data_type b[], int n ) {
+void SerialConvolve(data_type c[], const data_type a[], int m, const data_type b[], int n) {
     for (int i = 0; i < m + n - 1; ++i) {
         int start = i < n ? 0 : i - n + 1;
         int finish = i < m ? i + 1 : m;
         data_type sum = 0;
-        for (int j = start; j < finish; ++j)
-            sum += a[j] * b[i - j];
+        for (int j = start; j < finish; ++j) sum += a[j] * b[i - j];
         c[i] = sum;
     }
 }
 
 #if _MSC_VER && !defined(__INTEL_COMPILER)
-    // Suppress overzealous warning about short+=short
-    #pragma warning( push )
-    #pragma warning( disable: 4244 )
+// Suppress overzealous warning about short+=short
+#pragma warning(push)
+#pragma warning(disable : 4244)
 #endif
 
-class InnerBody: utils::NoAssign {
+class InnerBody : utils::NoAssign {
     const data_type* my_a;
     const data_type* my_b;
     const int i;
+
 public:
     data_type sum;
-    InnerBody( data_type /*c*/[], const data_type a[], const data_type b[], int ii ) :
-        my_a(a), my_b(b), i(ii), sum(0)
-    {}
-    InnerBody( InnerBody& x, tbb::split ) :
-        my_a(x.my_a), my_b(x.my_b), i(x.i), sum(0)
-    {
-    }
-    void join( InnerBody& x ) { sum += x.sum; }
-    void operator()( const tbb::blocked_range<int>& range ) {
-        for (int j = range.begin(); j != range.end(); ++j)
-            sum += my_a[j] * my_b[i - j];
+    InnerBody(data_type /*c*/[], const data_type a[], const data_type b[], int ii)
+        : my_a(a), my_b(b), i(ii), sum(0) {}
+    InnerBody(InnerBody& x, tbb::split) : my_a(x.my_a), my_b(x.my_b), i(x.i), sum(0) {}
+    void join(InnerBody& x) { sum += x.sum; }
+    void operator()(const tbb::blocked_range<int>& range) {
+        for (int j = range.begin(); j != range.end(); ++j) sum += my_a[j] * my_b[i - j];
     }
 };
 
 #if _MSC_VER && !defined(__INTEL_COMPILER)
-    #pragma warning( pop )
+#pragma warning(pop)
 #endif
 
 //! Test OpenMP loop around TBB loop
-void OpenMP_TBB_Convolve( data_type c[], const data_type a[], int m, const data_type b[], int n, int p ) {
+void OpenMP_TBB_Convolve(data_type c[], const data_type a[], int m, const data_type b[], int n, int p) {
     utils::suppress_unused_warning(p);
 #pragma omp parallel num_threads(p)
     {
@@ -91,39 +86,37 @@ void OpenMP_TBB_Convolve( data_type c[], const data_type a[], int m, const data_
     }
 }
 
-class OuterBody: utils::NoAssign {
+class OuterBody : utils::NoAssign {
     const data_type* my_a;
     const data_type* my_b;
     data_type* my_c;
     const int m;
     const int n;
 #if __clang__ && !__INTEL_COMPILER
-    #pragma clang diagnostic push
-    #pragma clang diagnostic ignored "-Wunused-private-field"
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-private-field"
 #endif
     const int p;
 #if __clang__ && !__INTEL_COMPILER
-    #pragma clang diagnostic pop // "-Wunused-private-field"
+#pragma clang diagnostic pop// "-Wunused-private-field"
 #endif
 public:
-    OuterBody( data_type c[], const data_type a[], int m_, const data_type b[], int n_, int p_ ) :
-        my_a(a), my_b(b), my_c(c), m(m_), n(n_), p(p_)
-    {}
-    void operator()( const tbb::blocked_range<int>& range ) const {
+    OuterBody(data_type c[], const data_type a[], int m_, const data_type b[], int n_, int p_)
+        : my_a(a), my_b(b), my_c(c), m(m_), n(n_), p(p_) {}
+    void operator()(const tbb::blocked_range<int>& range) const {
         for (int i = range.begin(); i != range.end(); ++i) {
             int start = i < n ? 0 : i - n + 1;
             int finish = i < m ? i + 1 : m;
             data_type sum = 0;
-#pragma omp parallel for reduction(+:sum) num_threads(p)
-            for (int j = start; j < finish; ++j)
-                sum += my_a[j] * my_b[i - j];
+#pragma omp parallel for reduction(+ : sum) num_threads(p)
+            for (int j = start; j < finish; ++j) sum += my_a[j] * my_b[i - j];
             my_c[i] = sum;
         }
     }
 };
 
 //! Test TBB loop around OpenMP loop
-void TBB_OpenMP_Convolve( data_type c[], const data_type a[], int m, const data_type b[], int n, int p ) {
+void TBB_OpenMP_Convolve(data_type c[], const data_type a[], int m, const data_type b[], int n, int p) {
     tbb::parallel_for(tbb::blocked_range<int>(0, m + n - 1, 10), OuterBody(c, a, m, b, n, p));
 }
 
@@ -132,22 +125,22 @@ void TestNumThreads() {
     utils::SetEnv("KMP_AFFINITY", "compact");
     // Make an OpenMP call before initializing TBB
     int omp_nthreads = omp_get_max_threads();
-    #pragma omp parallel
+#pragma omp parallel
     {}
     int tbb_nthreads = tbb::this_task_arena::max_concurrency();
     // For the purpose of testing, assume that OpenMP and TBB should utilize the same # of threads.
     // If it's not true on some platforms, the test will need to be adjusted.
     REQUIRE_MESSAGE(tbb_nthreads == omp_nthreads, "Initialization of TBB is possibly affected by OpenMP");
 }
-#endif // __INTEL_COMPILER
+#endif// __INTEL_COMPILER
 
 const int M = 17 * 17;
 const int N = 13 * 13;
 data_type A[M], B[N];
-data_type expected[M+N], actual[M+N];
+data_type expected[M + N], actual[M + N];
 
 template <class Func>
-void RunTest( Func F, int m, int n, int p) {
+void RunTest(Func F, int m, int n, int p) {
     tbb::global_control limit(tbb::global_control::max_allowed_parallelism, p);
     memset(actual, -1, (m + n) * sizeof(data_type));
     F(actual, A, m, B, n, p);
@@ -159,16 +152,16 @@ void RunTest( Func F, int m, int n, int p) {
 //! \brief \ref error_guessing
 TEST_CASE("Testing oneTBB with OpenMP") {
 #if __INTEL_COMPILER
-    TestNumThreads(); // Testing initialization-related behavior; must be the first
-#endif // __INTEL_COMPILER
+    TestNumThreads();// Testing initialization-related behavior; must be the first
+#endif               // __INTEL_COMPILER
     for (int p = static_cast<int>(utils::MinThread); p <= static_cast<int>(utils::MaxThread); ++p) {
         for (int m = 1; m <= M; m *= 17) {
             for (int n = 1; n <= N; n *= 13) {
                 for (int i = 0; i < m; ++i) A[i] = data_type(1 + i / 5);
                 for (int i = 0; i < n; ++i) B[i] = data_type(1 + i / 7);
-                SerialConvolve( expected, A, m, B, n );
-                RunTest( OpenMP_TBB_Convolve, m, n, p );
-                RunTest( TBB_OpenMP_Convolve, m, n, p );
+                SerialConvolve(expected, A, m, B, n);
+                RunTest(OpenMP_TBB_Convolve, m, n, p);
+                RunTest(TBB_OpenMP_Convolve, m, n, p);
             }
         }
     }
diff --git a/external/tbb/test/tbb/test_overwrite_node.cpp b/external/tbb/test/tbb/test_overwrite_node.cpp
index 3f5ed8fe..5dc6abec 100644
--- a/external/tbb/test/tbb/test_overwrite_node.cpp
+++ b/external/tbb/test/tbb/test_overwrite_node.cpp
@@ -18,133 +18,119 @@
 
 #include "tbb/flow_graph.h"
 
+#include "common/graph_utils.h"
 #include "common/test.h"
+#include "common/test_follows_and_precedes_api.h"
 #include "common/utils.h"
 #include "common/utils_assert.h"
-#include "common/graph_utils.h"
-#include "common/test_follows_and_precedes_api.h"
 
 #include "test_buffering_try_put_and_wait.h"
 
 //! \file test_overwrite_node.cpp
 //! \brief Test for [flow_graph.overwrite_node] specification
 
-
 #define N 300
 #define T 4
 #define M 5
 
-template< typename R >
+template <typename R>
 void simple_read_write_tests() {
     tbb::flow::graph g;
     tbb::flow::overwrite_node<R> n(g);
 
-    for ( int t = 0; t < T; ++t ) {
-        R v0(N+1);
-        std::vector< std::shared_ptr<harness_counting_receiver<R>> > r;
-        for (size_t i = 0; i < M; ++i) {
-            r.push_back( std::make_shared<harness_counting_receiver<R>>(g) );
+    for (int t = 0; t < T; ++t) {
+        R v0(N + 1);
+        std::vector<std::shared_ptr<harness_counting_receiver<R>>> r;
+        for (size_t i = 0; i < M; ++i) { r.push_back(std::make_shared<harness_counting_receiver<R>>(g)); }
+
+        CHECK_MESSAGE(n.is_valid() == false, "");
+        CHECK_MESSAGE(n.try_get(v0) == false, "");
+        if (t % 2) {
+            CHECK_MESSAGE(n.try_put(static_cast<R>(N)), "");
+            CHECK_MESSAGE(n.is_valid() == true, "");
+            CHECK_MESSAGE(n.try_get(v0) == true, "");
+            CHECK_MESSAGE(v0 == R(N), "");
         }
 
-        CHECK_MESSAGE( n.is_valid() == false, "" );
-        CHECK_MESSAGE( n.try_get( v0 ) == false, "" );
-        if ( t % 2 ) {
-            CHECK_MESSAGE( n.try_put( static_cast<R>(N) ), "" );
-            CHECK_MESSAGE( n.is_valid() == true, "" );
-            CHECK_MESSAGE( n.try_get( v0 ) == true, "" );
-            CHECK_MESSAGE( v0 == R(N), "" );
-        }
-
-        for (int i = 0; i < M; ++i) {
-            tbb::flow::make_edge( n, *r[i] );
-        }
+        for (int i = 0; i < M; ++i) { tbb::flow::make_edge(n, *r[i]); }
 
-        for (int i = 0; i < N; ++i ) {
+        for (int i = 0; i < N; ++i) {
             R v1(static_cast<R>(i));
-            CHECK_MESSAGE( n.try_put( v1 ), "" );
-            CHECK_MESSAGE( n.is_valid() == true, "" );
-            for (int j = 0; j < N; ++j ) {
+            CHECK_MESSAGE(n.try_put(v1), "");
+            CHECK_MESSAGE(n.is_valid() == true, "");
+            for (int j = 0; j < N; ++j) {
                 R v2(0);
-                CHECK_MESSAGE( n.try_get( v2 ), "" );
-                CHECK_MESSAGE( v1 == v2, "" );
+                CHECK_MESSAGE(n.try_get(v2), "");
+                CHECK_MESSAGE(v1 == v2, "");
             }
         }
         for (int i = 0; i < M; ++i) {
             size_t c = r[i]->my_count;
-            CHECK_MESSAGE( int(c) == N+t%2, "" );
+            CHECK_MESSAGE(int(c) == N + t % 2, "");
         }
-        for (int i = 0; i < M; ++i) {
-            tbb::flow::remove_edge( n, *r[i] );
-        }
-        CHECK_MESSAGE( n.try_put( R(0) ), "" );
+        for (int i = 0; i < M; ++i) { tbb::flow::remove_edge(n, *r[i]); }
+        CHECK_MESSAGE(n.try_put(R(0)), "");
         for (int i = 0; i < M; ++i) {
             size_t c = r[i]->my_count;
-            CHECK_MESSAGE( int(c) == N+t%2, "" );
+            CHECK_MESSAGE(int(c) == N + t % 2, "");
         }
         n.clear();
-        CHECK_MESSAGE( n.is_valid() == false, "" );
-        CHECK_MESSAGE( n.try_get( v0 ) == false, "" );
+        CHECK_MESSAGE(n.is_valid() == false, "");
+        CHECK_MESSAGE(n.try_get(v0) == false, "");
     }
 }
 
-template< typename R >
+template <typename R>
 class native_body : utils::NoAssign {
     tbb::flow::overwrite_node<R> &my_node;
 
 public:
+    native_body(tbb::flow::overwrite_node<R> &n) : my_node(n) {}
 
-    native_body( tbb::flow::overwrite_node<R> &n ) : my_node(n) {}
-
-    void operator()( int i ) const {
+    void operator()(int i) const {
         R v1(static_cast<R>(i));
-        CHECK_MESSAGE( my_node.try_put( v1 ), "" );
-        CHECK_MESSAGE( my_node.is_valid() == true, "" );
+        CHECK_MESSAGE(my_node.try_put(v1), "");
+        CHECK_MESSAGE(my_node.is_valid() == true, "");
     }
 };
 
-template< typename R >
+template <typename R>
 void parallel_read_write_tests() {
     tbb::flow::graph g;
     tbb::flow::overwrite_node<R> n(g);
     //Create a vector of identical nodes
-    std::vector< tbb::flow::overwrite_node<R> > ow_vec(2, n);
+    std::vector<tbb::flow::overwrite_node<R>> ow_vec(2, n);
 
-    for (size_t node_idx=0; node_idx<ow_vec.size(); ++node_idx) {
-        for ( int t = 0; t < T; ++t ) {
-            std::vector< std::shared_ptr<harness_counting_receiver<R>> > r;
-            for (size_t i = 0; i < M; ++i) {
-                r.push_back( std::make_shared<harness_counting_receiver<R>>(g) );
-            }
+    for (size_t node_idx = 0; node_idx < ow_vec.size(); ++node_idx) {
+        for (int t = 0; t < T; ++t) {
+            std::vector<std::shared_ptr<harness_counting_receiver<R>>> r;
+            for (size_t i = 0; i < M; ++i) { r.push_back(std::make_shared<harness_counting_receiver<R>>(g)); }
 
-            for (int i = 0; i < M; ++i) {
-                tbb::flow::make_edge( ow_vec[node_idx], *r[i] );
-            }
+            for (int i = 0; i < M; ++i) { tbb::flow::make_edge(ow_vec[node_idx], *r[i]); }
             R v0;
-            CHECK_MESSAGE( ow_vec[node_idx].is_valid() == false, "" );
-            CHECK_MESSAGE( ow_vec[node_idx].try_get( v0 ) == false, "" );
+            CHECK_MESSAGE(ow_vec[node_idx].is_valid() == false, "");
+            CHECK_MESSAGE(ow_vec[node_idx].try_get(v0) == false, "");
 
 #if TBB_TEST_LOW_WORKLOAD
             const int nthreads = 30;
 #else
             const int nthreads = N;
 #endif
-            utils::NativeParallelFor( nthreads, native_body<R>( ow_vec[node_idx] ) );
+            utils::NativeParallelFor(nthreads, native_body<R>(ow_vec[node_idx]));
 
             for (int i = 0; i < M; ++i) {
                 size_t c = r[i]->my_count;
-                CHECK_MESSAGE( int(c) == nthreads, "" );
-            }
-            for (int i = 0; i < M; ++i) {
-                tbb::flow::remove_edge( ow_vec[node_idx], *r[i] );
+                CHECK_MESSAGE(int(c) == nthreads, "");
             }
-            CHECK_MESSAGE( ow_vec[node_idx].try_put( R(0) ), "" );
+            for (int i = 0; i < M; ++i) { tbb::flow::remove_edge(ow_vec[node_idx], *r[i]); }
+            CHECK_MESSAGE(ow_vec[node_idx].try_put(R(0)), "");
             for (int i = 0; i < M; ++i) {
                 size_t c = r[i]->my_count;
-                CHECK_MESSAGE( int(c) == nthreads, "" );
+                CHECK_MESSAGE(int(c) == nthreads, "");
             }
             ow_vec[node_idx].clear();
-            CHECK_MESSAGE( ow_vec[node_idx].is_valid() == false, "" );
-            CHECK_MESSAGE( ow_vec[node_idx].try_get( v0 ) == false, "" );
+            CHECK_MESSAGE(ow_vec[node_idx].is_valid() == false, "");
+            CHECK_MESSAGE(ow_vec[node_idx].try_get(v0) == false, "");
         }
     }
 }
@@ -155,11 +141,12 @@ void parallel_read_write_tests() {
 void test_follows_and_precedes_api() {
     using msg_t = tbb::flow::continue_msg;
 
-    std::array<msg_t, 3> messages_for_follows = { {msg_t(), msg_t(), msg_t()} };
+    std::array<msg_t, 3> messages_for_follows = {{msg_t(), msg_t(), msg_t()}};
     std::vector<msg_t> messages_for_precedes = {msg_t()};
 
     follows_and_precedes_testing::test_follows<msg_t, tbb::flow::overwrite_node<msg_t>>(messages_for_follows);
-    follows_and_precedes_testing::test_precedes<msg_t, tbb::flow::overwrite_node<msg_t>>(messages_for_precedes);
+    follows_and_precedes_testing::test_precedes<msg_t, tbb::flow::overwrite_node<msg_t>>(
+            messages_for_precedes);
 }
 #endif
 
@@ -202,8 +189,8 @@ void test_overwrite_node_try_put_and_wait() {
         std::vector<int> processed_items;
 
         // Returns the index from which wait_for_all processing started
-        std::size_t after_start = test_buffer_push<tbb::flow::overwrite_node<int>>(start_work_items, wait_message,
-                                                                                   new_work_items, processed_items);
+        std::size_t after_start = test_buffer_push<tbb::flow::overwrite_node<int>>(
+                start_work_items, wait_message, new_work_items, processed_items);
 
         // It is expected that try_put_and_wait would process start_work_items (FIFO) and the wait_message
         // and new_work_items (FIFO) would be processed in wait_for_all
@@ -233,31 +220,29 @@ void test_overwrite_node_try_put_and_wait() {
 
             using function_node_type = tbb::flow::function_node<int, int, tbb::flow::rejecting>;
 
-            function_node_type function(g, tbb::flow::serial,
-                [&](int input) {
-                    if (input == wait_message) {
-                        buffer.try_put(new_message);
-                    }
+            function_node_type function(g, tbb::flow::serial, [&](int input) {
+                if (input == wait_message) { buffer.try_put(new_message); }
 
-                    // Explicitly clean the buffer to prevent infinite try_get by the function_node
-                    if (input == new_message) {
-                        buffer.clear();
-                    }
+                // Explicitly clean the buffer to prevent infinite try_get by the function_node
+                if (input == new_message) { buffer.clear(); }
 
-                    processed_items.emplace_back(input);
-                    return 0;
-                });
+                processed_items.emplace_back(input);
+                return 0;
+            });
 
             tbb::flow::make_edge(buffer, function);
 
-            buffer.try_put(start_message); // Occupies concurrency of function
+            buffer.try_put(start_message);// Occupies concurrency of function
 
             buffer.try_put_and_wait(wait_message);
 
-            CHECK_MESSAGE(processed_items.size() == 2, "only the start_message and wait_message should be processed");
+            CHECK_MESSAGE(processed_items.size() == 2,
+                          "only the start_message and wait_message should be processed");
             std::size_t check_index = 0;
-            CHECK_MESSAGE(processed_items[check_index++] == start_message, "unexpected start_message processing");
-            CHECK_MESSAGE(processed_items[check_index++] == wait_message, "unexpected wait_message processing");
+            CHECK_MESSAGE(processed_items[check_index++] == start_message,
+                          "unexpected start_message processing");
+            CHECK_MESSAGE(processed_items[check_index++] == wait_message,
+                          "unexpected wait_message processing");
 
             g.wait_for_all();
 
@@ -280,33 +265,31 @@ void test_overwrite_node_try_put_and_wait() {
 
             using function_node_type = tbb::flow::function_node<int, int, tbb::flow::rejecting>;
 
-            function_node_type function(g, tbb::flow::serial,
-                [&](int input) {
-                    if (input == wait_message) {
-                        buffer.try_put(new_message);
-                    }
+            function_node_type function(g, tbb::flow::serial, [&](int input) {
+                if (input == wait_message) { buffer.try_put(new_message); }
 
-                    // Explicitly clean the buffer to prevent infinite try_get by the function_node
-                    if (input == new_message) {
-                        buffer.clear();
-                    }
+                // Explicitly clean the buffer to prevent infinite try_get by the function_node
+                if (input == new_message) { buffer.clear(); }
 
-                    processed_items.emplace_back(input);
-                    limiter.decrementer().try_put(1);
-                    return 0;
-                });
+                processed_items.emplace_back(input);
+                limiter.decrementer().try_put(1);
+                return 0;
+            });
 
             tbb::flow::make_edge(buffer, limiter);
             tbb::flow::make_edge(limiter, function);
 
-            buffer.try_put(start_message); // Occupies concurrency of function
+            buffer.try_put(start_message);// Occupies concurrency of function
 
             buffer.try_put_and_wait(wait_message);
 
-            CHECK_MESSAGE(processed_items.size() == 2, "only the start_message and wait_message should be processed");
+            CHECK_MESSAGE(processed_items.size() == 2,
+                          "only the start_message and wait_message should be processed");
             std::size_t check_index = 0;
-            CHECK_MESSAGE(processed_items[check_index++] == start_message, "unexpected start_message processing");
-            CHECK_MESSAGE(processed_items[check_index++] == wait_message, "unexpected wait_message processing");
+            CHECK_MESSAGE(processed_items[check_index++] == start_message,
+                          "unexpected start_message processing");
+            CHECK_MESSAGE(processed_items[check_index++] == wait_message,
+                          "unexpected wait_message processing");
 
             g.wait_for_all();
 
@@ -321,12 +304,11 @@ void test_overwrite_node_try_put_and_wait() {
 
         std::vector<int> processed_items;
 
-        tbb::flow::function_node<int, int> f(g, tbb::flow::serial,
-            [&](int input) {
-                processed_items.emplace_back(input);
-                buffer.clear();
-                return 0;
-            });
+        tbb::flow::function_node<int, int> f(g, tbb::flow::serial, [&](int input) {
+            processed_items.emplace_back(input);
+            buffer.clear();
+            return 0;
+        });
 
         tbb::flow::make_edge(buffer, f);
 
@@ -345,50 +327,44 @@ void test_overwrite_node_try_put_and_wait() {
 
 //! Test read-write properties
 //! \brief \ref requirement \ref error_guessing
-TEST_CASE("Read-write"){
+TEST_CASE("Read-write") {
     simple_read_write_tests<int>();
     simple_read_write_tests<float>();
 }
 
 //! Read-write and ParallelFor tests under limited parallelism
 //! \brief \ref error_guessing
-TEST_CASE("Limited parallelism"){
-    for( unsigned int p=utils::MinThread; p<=utils::MaxThread; ++p ) {
+TEST_CASE("Limited parallelism") {
+    for (unsigned int p = utils::MinThread; p <= utils::MaxThread; ++p) {
         tbb::task_arena arena(p);
-        arena.execute(
-            [&]() {
-                parallel_read_write_tests<int>();
-                parallel_read_write_tests<float>();
-                test_reserving_nodes<tbb::flow::overwrite_node, size_t>();
-            }
-        );
-	}
+        arena.execute([&]() {
+            parallel_read_write_tests<int>();
+            parallel_read_write_tests<float>();
+            test_reserving_nodes<tbb::flow::overwrite_node, size_t>();
+        });
+    }
 }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 //! Test follows and precedes API
 //! \brief \ref error_guessing
-TEST_CASE("Follows and precedes API"){
-    test_follows_and_precedes_api();
-}
+TEST_CASE("Follows and precedes API") { test_follows_and_precedes_api(); }
 #endif
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 //! Test decution guides
 //! \brief \ref requirement
-TEST_CASE("Deduction guides"){
-    test_deduction_guides();
-}
+TEST_CASE("Deduction guides") { test_deduction_guides(); }
 #endif
 
 //! Test try_release
 //! \brief \ref error_guessing
-TEST_CASE("try_release"){
+TEST_CASE("try_release") {
     tbb::flow::graph g;
 
     tbb::flow::overwrite_node<int> on(g);
 
-    CHECK_MESSAGE ((on.try_release()== true), "try_release should return true");
+    CHECK_MESSAGE((on.try_release() == true), "try_release should return true");
 }
 
 //! Test for cancel register_predecessor_task
@@ -419,7 +395,5 @@ TEST_CASE("Cancel register_predecessor_task") {
 
 #if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
 //! \brief \ref error_guessing
-TEST_CASE("test overwrite_node try_put_and_wait") {
-    test_overwrite_node_try_put_and_wait();
-}
+TEST_CASE("test overwrite_node try_put_and_wait") { test_overwrite_node_try_put_and_wait(); }
 #endif
diff --git a/external/tbb/test/tbb/test_parallel_for.cpp b/external/tbb/test/tbb/test_parallel_for.cpp
index c9548c3b..68c306bd 100644
--- a/external/tbb/test/tbb/test_parallel_for.cpp
+++ b/external/tbb/test/tbb/test_parallel_for.cpp
@@ -18,15 +18,15 @@
 
 #include "tbb/parallel_for.h"
 
+#include "common/concepts_common.h"
 #include "common/config.h"
+#include "common/cpu_usertime.h"
+#include "common/exception_handling.h"
+#include "common/spin_barrier.h"
 #include "common/utils.h"
 #include "common/utils_concurrency_limit.h"
 #include "common/utils_report.h"
 #include "common/vector_types.h"
-#include "common/cpu_usertime.h"
-#include "common/spin_barrier.h"
-#include "common/exception_handling.h"
-#include "common/concepts_common.h"
 #include "test_partitioner.h"
 
 #include <cstddef>
@@ -36,297 +36,288 @@
 //! \brief Test for [algorithms.parallel_for] specification
 
 #if _MSC_VER
-#pragma warning (push)
+#pragma warning(push)
 // Suppress conditional expression is constant
-#pragma warning (disable: 4127)
+#pragma warning(disable : 4127)
 #if __TBB_MSVC_UNREACHABLE_CODE_IGNORED
-    // Suppress pointless "unreachable code" warning.
-    #pragma warning (disable: 4702)
+// Suppress pointless "unreachable code" warning.
+#pragma warning(disable : 4702)
 #endif
 #if defined(_Wp64)
-    // Workaround for overzealous compiler warnings in /Wp64 mode
-    #pragma warning (disable: 4267)
+// Workaround for overzealous compiler warnings in /Wp64 mode
+#pragma warning(disable : 4267)
 #endif
 #define _SCL_SECURE_NO_WARNINGS
-#endif //#if _MSC_VER
-
+#endif//#if _MSC_VER
 
 #if (HAVE_m128 || HAVE_m256)
-template<typename ClassWithVectorType>
+template <typename ClassWithVectorType>
 struct SSE_Functor {
-    ClassWithVectorType* Src, * Dst;
-    SSE_Functor( ClassWithVectorType* src, ClassWithVectorType* dst ) : Src(src), Dst(dst) {}
+    ClassWithVectorType *Src, *Dst;
+    SSE_Functor(ClassWithVectorType* src, ClassWithVectorType* dst) : Src(src), Dst(dst) {}
 
-    void operator()( tbb::blocked_range<int>& r ) const {
-        for( int i=r.begin(); i!=r.end(); ++i )
-            Dst[i] = Src[i];
+    void operator()(tbb::blocked_range<int>& r) const {
+        for (int i = r.begin(); i != r.end(); ++i) Dst[i] = Src[i];
     }
 };
 
 //! Test that parallel_for works with stack-allocated __m128
-template<typename ClassWithVectorType>
+template <typename ClassWithVectorType>
 void TestVectorTypes() {
     const int aSize = 300;
     ClassWithVectorType Array1[aSize], Array2[aSize];
-    for( int i=0; i<aSize; ++i ) {
+    for (int i = 0; i < aSize; ++i) {
         // VC8 does not properly align a temporary value; to work around, use explicit variable
         ClassWithVectorType foo(i);
         Array1[i] = foo;
     }
-    tbb::parallel_for( tbb::blocked_range<int>(0,aSize), SSE_Functor<ClassWithVectorType>(Array1, Array2) );
-    for( int i=0; i<aSize; ++i ) {
+    tbb::parallel_for(tbb::blocked_range<int>(0, aSize), SSE_Functor<ClassWithVectorType>(Array1, Array2));
+    for (int i = 0; i < aSize; ++i) {
         ClassWithVectorType foo(i);
-        CHECK( Array2[i]==foo ) ;
+        CHECK(Array2[i] == foo);
     }
 }
 #endif /* HAVE_m128 || HAVE_m256 */
 
 struct TestSimplePartitionerStabilityFunctor {
-  std::vector<int> & ranges;
-  TestSimplePartitionerStabilityFunctor(std::vector<int> & theRanges):ranges(theRanges){}
-  void operator()(tbb::blocked_range<size_t>& r)const{
-      ranges.at(r.begin()) = 1;
-  }
+    std::vector<int>& ranges;
+    TestSimplePartitionerStabilityFunctor(std::vector<int>& theRanges) : ranges(theRanges) {}
+    void operator()(tbb::blocked_range<size_t>& r) const { ranges.at(r.begin()) = 1; }
 };
-void TestSimplePartitionerStability(){
-    const std::size_t repeat_count= 10;
-    const std::size_t rangeToSplitSize=1000000;
-    const std::size_t grainsizeStep=rangeToSplitSize/repeat_count;
+void TestSimplePartitionerStability() {
+    const std::size_t repeat_count = 10;
+    const std::size_t rangeToSplitSize = 1000000;
+    const std::size_t grainsizeStep = rangeToSplitSize / repeat_count;
     typedef TestSimplePartitionerStabilityFunctor FunctorType;
 
-    for (std::size_t i=0 , grainsize=grainsizeStep; i<repeat_count;i++, grainsize+=grainsizeStep){
-        std::vector<int> firstSeries(rangeToSplitSize,0);
-        std::vector<int> secondSeries(rangeToSplitSize,0);
+    for (std::size_t i = 0, grainsize = grainsizeStep; i < repeat_count; i++, grainsize += grainsizeStep) {
+        std::vector<int> firstSeries(rangeToSplitSize, 0);
+        std::vector<int> secondSeries(rangeToSplitSize, 0);
 
-        tbb::parallel_for(tbb::blocked_range<size_t>(0,rangeToSplitSize,grainsize),FunctorType(firstSeries),tbb::simple_partitioner());
-        tbb::parallel_for(tbb::blocked_range<size_t>(0,rangeToSplitSize,grainsize),FunctorType(secondSeries),tbb::simple_partitioner());
+        tbb::parallel_for(tbb::blocked_range<size_t>(0, rangeToSplitSize, grainsize),
+                          FunctorType(firstSeries), tbb::simple_partitioner());
+        tbb::parallel_for(tbb::blocked_range<size_t>(0, rangeToSplitSize, grainsize),
+                          FunctorType(secondSeries), tbb::simple_partitioner());
 
-        CHECK_MESSAGE(
-            firstSeries == secondSeries,
-            "Splitting range with tbb::simple_partitioner must be reproducible; i = " << i
-        );
+        CHECK_MESSAGE(firstSeries == secondSeries,
+                      "Splitting range with tbb::simple_partitioner must be reproducible; i = " << i);
     }
 }
 
 namespace various_range_implementations {
 
-using namespace test_partitioner_utils;
-using namespace test_partitioner_utils::TestRanges;
+    using namespace test_partitioner_utils;
+    using namespace test_partitioner_utils::TestRanges;
 
-// Body ensures that initial work distribution is done uniformly through affinity mechanism and not through work stealing
-class Body {
-    utils::SpinBarrier &m_sb;
-public:
-    Body(utils::SpinBarrier& sb) : m_sb(sb) { }
-    Body(Body& b, tbb::split) : m_sb(b.m_sb) { }
+    // Body ensures that initial work distribution is done uniformly through affinity mechanism and not through work stealing
+    class Body {
+        utils::SpinBarrier& m_sb;
 
-    template <typename Range>
-    void operator()(Range& r) const {
-        INFO("Executing range [" << r.begin() << ", " << r.end() << "]");
-        m_sb.wait(); // waiting for all threads
-    }
-};
+    public:
+        Body(utils::SpinBarrier& sb) : m_sb(sb) {}
+        Body(Body& b, tbb::split) : m_sb(b.m_sb) {}
 
-namespace correctness {
+        template <typename Range>
+        void operator()(Range& r) const {
+            INFO("Executing range [" << r.begin() << ", " << r.end() << "]");
+            m_sb.wait();// waiting for all threads
+        }
+    };
 
-/* Testing only correctness (that is parallel_for does not hang) */
-template <typename RangeType, bool /* feedback */, bool ensure_non_emptiness>
-void test() {
-    RangeType range( 0, utils::get_platform_max_threads(), nullptr, false, ensure_non_emptiness );
-    tbb::affinity_partitioner ap;
-    tbb::parallel_for( range, SimpleBody(), ap );
-}
+    namespace correctness {
 
-} // namespace correctness
+        /* Testing only correctness (that is parallel_for does not hang) */
+        template <typename RangeType, bool /* feedback */, bool ensure_non_emptiness>
+        void test() {
+            RangeType range(0, utils::get_platform_max_threads(), nullptr, false, ensure_non_emptiness);
+            tbb::affinity_partitioner ap;
+            tbb::parallel_for(range, SimpleBody(), ap);
+        }
 
-namespace uniform_distribution {
+    }// namespace correctness
 
-/* Body of parallel_for algorithm would hang if non-uniform work distribution happened  */
-template <typename RangeType, bool feedback, bool ensure_non_emptiness>
-void test() {
-    static const std::size_t thread_num = utils::get_platform_max_threads();
-    utils::SpinBarrier sb( thread_num );
-    RangeType range(0, thread_num, nullptr, feedback, ensure_non_emptiness);
-    const Body sync_body( sb );
-    tbb::affinity_partitioner ap;
-    tbb::parallel_for( range, sync_body, ap );
-    tbb::parallel_for( range, sync_body, tbb::static_partitioner() );
-}
+    namespace uniform_distribution {
 
-} // namespace uniform_distribution
+        /* Body of parallel_for algorithm would hang if non-uniform work distribution happened  */
+        template <typename RangeType, bool feedback, bool ensure_non_emptiness>
+        void test() {
+            static const std::size_t thread_num = utils::get_platform_max_threads();
+            utils::SpinBarrier sb(thread_num);
+            RangeType range(0, thread_num, nullptr, feedback, ensure_non_emptiness);
+            const Body sync_body(sb);
+            tbb::affinity_partitioner ap;
+            tbb::parallel_for(range, sync_body, ap);
+            tbb::parallel_for(range, sync_body, tbb::static_partitioner());
+        }
 
-void test() {
-    const bool provide_feedback = false;
-    const bool ensure_non_empty_range = true;
+    }// namespace uniform_distribution
 
-    // BlockedRange does not take into account feedback and non-emptiness settings but uses the
-    // tbb::blocked_range implementation
-    uniform_distribution::test<BlockedRange, !provide_feedback, !ensure_non_empty_range>();
-    using correctness::test;
+    void test() {
+        const bool provide_feedback = false;
+        const bool ensure_non_empty_range = true;
 
-    {
-        test<RoundedDownRange, provide_feedback, ensure_non_empty_range>();
-        test<RoundedDownRange, provide_feedback, !ensure_non_empty_range>();
-    }
+        // BlockedRange does not take into account feedback and non-emptiness settings but uses the
+        // tbb::blocked_range implementation
+        uniform_distribution::test<BlockedRange, !provide_feedback, !ensure_non_empty_range>();
+        using correctness::test;
 
-    {
-        test<RoundedUpRange, provide_feedback, ensure_non_empty_range>();
-        test<RoundedUpRange, provide_feedback, !ensure_non_empty_range>();
-    }
+        {
+            test<RoundedDownRange, provide_feedback, ensure_non_empty_range>();
+            test<RoundedDownRange, provide_feedback, !ensure_non_empty_range>();
+        }
 
-    // Testing that parallel_for algorithm works with such weird ranges
-    correctness::test<Range1_2, /* provide_feedback= */ false, !ensure_non_empty_range>();
-    correctness::test<Range1_999, /* provide_feedback= */ false, !ensure_non_empty_range>();
-    correctness::test<Range999_1, /* provide_feedback= */ false, !ensure_non_empty_range>();
-
-    // The following ranges do not comply with the proportion suggested by partitioner. Therefore
-    // they have to provide the proportion in which they were actually split back to partitioner and
-    // ensure theirs non-emptiness
-    test<Range1_2, provide_feedback, ensure_non_empty_range>();
-    test<Range1_999, provide_feedback, ensure_non_empty_range>();
-    test<Range999_1, provide_feedback, ensure_non_empty_range>();
-}
+        {
+            test<RoundedUpRange, provide_feedback, ensure_non_empty_range>();
+            test<RoundedUpRange, provide_feedback, !ensure_non_empty_range>();
+        }
+
+        // Testing that parallel_for algorithm works with such weird ranges
+        correctness::test<Range1_2, /* provide_feedback= */ false, !ensure_non_empty_range>();
+        correctness::test<Range1_999, /* provide_feedback= */ false, !ensure_non_empty_range>();
+        correctness::test<Range999_1, /* provide_feedback= */ false, !ensure_non_empty_range>();
+
+        // The following ranges do not comply with the proportion suggested by partitioner. Therefore
+        // they have to provide the proportion in which they were actually split back to partitioner and
+        // ensure theirs non-emptiness
+        test<Range1_2, provide_feedback, ensure_non_empty_range>();
+        test<Range1_999, provide_feedback, ensure_non_empty_range>();
+        test<Range999_1, provide_feedback, ensure_non_empty_range>();
+    }
 
-} // namespace various_range_implementations
+}// namespace various_range_implementations
 
 namespace test_cancellation {
 
-struct FunctorToCancel {
-    static std::atomic<bool> need_to_wait;
+    struct FunctorToCancel {
+        static std::atomic<bool> need_to_wait;
 
-    void operator()( std::size_t ) const {
-        ++g_CurExecuted;
-        if (need_to_wait) {
-            need_to_wait = Cancellator::WaitUntilReady();
+        void operator()(std::size_t) const {
+            ++g_CurExecuted;
+            if (need_to_wait) { need_to_wait = Cancellator::WaitUntilReady(); }
         }
-    }
-
-    void operator()( const tbb::blocked_range<std::size_t>& ) const {
-        ++g_CurExecuted;
-        Cancellator::WaitUntilReady();
-    }
 
-    static void reset() { need_to_wait = true; }
-}; // struct FunctorToCancel
+        void operator()(const tbb::blocked_range<std::size_t>&) const {
+            ++g_CurExecuted;
+            Cancellator::WaitUntilReady();
+        }
 
-std::atomic<bool> FunctorToCancel::need_to_wait(true);
+        static void reset() { need_to_wait = true; }
+    };// struct FunctorToCancel
 
-static constexpr std::size_t buffer_test_size = 1024;
-static constexpr std::size_t maxParallelForRunnerMode = 14;
+    std::atomic<bool> FunctorToCancel::need_to_wait(true);
 
-template <std::size_t Mode>
-class ParallelForRunner {
-    tbb::task_group_context& my_ctx;
-    const std::size_t worker_task_step = 1;
+    static constexpr std::size_t buffer_test_size = 1024;
+    static constexpr std::size_t maxParallelForRunnerMode = 14;
 
-    static_assert(Mode >= 0 && Mode <= maxParallelForRunnerMode, "Incorrect mode for ParallelForRunner");
+    template <std::size_t Mode>
+    class ParallelForRunner {
+        tbb::task_group_context& my_ctx;
+        const std::size_t worker_task_step = 1;
 
-    template <typename Partitioner, typename... Args>
-    void run_parallel_for( Args&&... args ) const {
-        Partitioner part;
-        tbb::parallel_for(std::forward<Args>(args)..., part, my_ctx);
-    }
+        static_assert(Mode >= 0 && Mode <= maxParallelForRunnerMode, "Incorrect mode for ParallelForRunner");
 
-    template <typename... Args>
-    void run_overload( Args&&... args ) const {
+        template <typename Partitioner, typename... Args>
+        void run_parallel_for(Args&&... args) const {
+            Partitioner part;
+            tbb::parallel_for(std::forward<Args>(args)..., part, my_ctx);
+        }
 
-        switch(Mode % 5) {
-            case 0 : {
-                tbb::parallel_for(std::forward<Args>(args)..., my_ctx);
-                break;
-            }
-            case 1 : {
-                run_parallel_for<tbb::simple_partitioner>(std::forward<Args>(args)...);
-                break;
-            }
-            case 2 : {
-                run_parallel_for<tbb::auto_partitioner>(std::forward<Args>(args)...);
-                break;
-            }
-            case 3 : {
-                run_parallel_for<tbb::static_partitioner>(std::forward<Args>(args)...);
-                break;
-            }
-            case 4 : {
-                run_parallel_for<tbb::affinity_partitioner>(std::forward<Args>(args)...);
-                break;
+        template <typename... Args>
+        void run_overload(Args&&... args) const {
+
+            switch (Mode % 5) {
+                case 0: {
+                    tbb::parallel_for(std::forward<Args>(args)..., my_ctx);
+                    break;
+                }
+                case 1: {
+                    run_parallel_for<tbb::simple_partitioner>(std::forward<Args>(args)...);
+                    break;
+                }
+                case 2: {
+                    run_parallel_for<tbb::auto_partitioner>(std::forward<Args>(args)...);
+                    break;
+                }
+                case 3: {
+                    run_parallel_for<tbb::static_partitioner>(std::forward<Args>(args)...);
+                    break;
+                }
+                case 4: {
+                    run_parallel_for<tbb::affinity_partitioner>(std::forward<Args>(args)...);
+                    break;
+                }
             }
         }
-    }
 
-public:
-    ParallelForRunner( tbb::task_group_context& ctx )
-        : my_ctx(ctx) {}
-
-    ~ParallelForRunner() { FunctorToCancel::reset(); }
-
-    void operator()() const {
-        if (Mode < 5) {
-            // Overload with blocked range
-            tbb::blocked_range<std::size_t> br(0, buffer_test_size);
-            run_overload(br, FunctorToCancel{});
-        } else if (Mode < 10) {
-            // Overload with two indexes
-            run_overload(std::size_t(0), buffer_test_size, FunctorToCancel{});
-        } else {
-            // Overload with two indexes and step
-            run_overload(std::size_t(0), buffer_test_size, worker_task_step, FunctorToCancel{});
+    public:
+        ParallelForRunner(tbb::task_group_context& ctx) : my_ctx(ctx) {}
+
+        ~ParallelForRunner() { FunctorToCancel::reset(); }
+
+        void operator()() const {
+            if (Mode < 5) {
+                // Overload with blocked range
+                tbb::blocked_range<std::size_t> br(0, buffer_test_size);
+                run_overload(br, FunctorToCancel {});
+            } else if (Mode < 10) {
+                // Overload with two indexes
+                run_overload(std::size_t(0), buffer_test_size, FunctorToCancel {});
+            } else {
+                // Overload with two indexes and step
+                run_overload(std::size_t(0), buffer_test_size, worker_task_step, FunctorToCancel {});
+            }
         }
+    };// class ParallelForRunner
+
+    template <std::size_t Mode>
+    void run_parallel_for_cancellation_test() {
+        // TODO: enable concurrency_range
+        if (utils::get_platform_max_threads() < 2) {
+            // The test requires at least one worker thread to request cancellation
+            return;
+        }
+        ResetEhGlobals();
+        RunCancellationTest<ParallelForRunner<Mode>, Cancellator>();
     }
-}; // class ParallelForRunner
-
-template <std::size_t Mode>
-void run_parallel_for_cancellation_test() {
-    // TODO: enable concurrency_range
-    if (utils::get_platform_max_threads() < 2) {
-        // The test requires at least one worker thread to request cancellation
-        return;
-    }
-    ResetEhGlobals();
-    RunCancellationTest<ParallelForRunner<Mode>, Cancellator>();
-}
 
-template <std::size_t Mode>
-struct ParallelForTestRunner {
-    static void run() {
-        run_parallel_for_cancellation_test<Mode>();
-        ParallelForTestRunner<Mode + 1>::run();
-    }
-}; // struct ParallelForTestRunner
+    template <std::size_t Mode>
+    struct ParallelForTestRunner {
+        static void run() {
+            run_parallel_for_cancellation_test<Mode>();
+            ParallelForTestRunner<Mode + 1>::run();
+        }
+    };// struct ParallelForTestRunner
 
-template <>
-struct ParallelForTestRunner<maxParallelForRunnerMode> {
-    static void run() {
-        run_parallel_for_cancellation_test<maxParallelForRunnerMode>();
-    }
-}; // struct ParallelForTestRunner<maxParallelForRunnerMode>
+    template <>
+    struct ParallelForTestRunner<maxParallelForRunnerMode> {
+        static void run() { run_parallel_for_cancellation_test<maxParallelForRunnerMode>(); }
+    };// struct ParallelForTestRunner<maxParallelForRunnerMode>
 
-} // namespace test_cancellation
+}// namespace test_cancellation
 
 #if __TBB_CPP20_CONCEPTS_PRESENT
 template <typename... Args>
-concept can_call_parallel_for_basic = requires( Args&&... args ) {
+concept can_call_parallel_for_basic = requires(Args&&... args) {
     tbb::parallel_for(std::forward<Args>(args)...);
 };
 
 template <typename... Args>
-concept can_call_parallel_for_helper = can_call_parallel_for_basic<Args...> &&
-                                       can_call_parallel_for_basic<Args..., tbb::task_group_context&>;
+concept can_call_parallel_for_helper = can_call_parallel_for_basic<Args...>&&
+        can_call_parallel_for_basic<Args..., tbb::task_group_context&>;
 
 template <typename... Args>
-concept can_call_parallel_for_with_partitioner = can_call_parallel_for_helper<Args...> &&
-                                                 can_call_parallel_for_helper<Args..., const tbb::simple_partitioner&> &&
-                                                 can_call_parallel_for_helper<Args..., const tbb::auto_partitioner&> &&
-                                                 can_call_parallel_for_helper<Args..., const tbb::static_partitioner> &&
-                                                 can_call_parallel_for_helper<Args..., tbb::affinity_partitioner&>;
+concept can_call_parallel_for_with_partitioner = can_call_parallel_for_helper<Args...>&&
+        can_call_parallel_for_helper<Args..., const tbb::simple_partitioner&>&&
+                can_call_parallel_for_helper<Args..., const tbb::auto_partitioner&>&&
+                        can_call_parallel_for_helper<Args..., const tbb::static_partitioner>&&
+                                can_call_parallel_for_helper<Args..., tbb::affinity_partitioner&>;
 
 template <typename Range, typename Body>
 concept can_call_range_pfor = can_call_parallel_for_with_partitioner<const Range&, const Body&>;
 
 template <typename Index, typename Function>
-concept can_call_index_pfor = can_call_parallel_for_with_partitioner<Index, Index, const Function&> &&
-                              can_call_parallel_for_with_partitioner<Index, Index, Index, const Function&>;
-
+concept can_call_index_pfor = can_call_parallel_for_with_partitioner<Index, Index, const Function&>&&
+        can_call_parallel_for_with_partitioner<Index, Index, Index, const Function&>;
 
 template <typename Range>
 using CorrectBody = test_concepts::parallel_for_body::Correct<Range>;
@@ -390,15 +381,15 @@ void test_pfor_index_constraints() {
     static_assert(!can_call_index_pfor<WrongInputOperatorPlus, CorrectFunc<WrongInputOperatorPlus>>);
     static_assert(!can_call_index_pfor<WrongReturnOperatorPlus, CorrectFunc<WrongReturnOperatorPlus>>);
 }
-#endif // __TBB_CPP20_CONCEPTS_PRESENT
+#endif// __TBB_CPP20_CONCEPTS_PRESENT
 
 #if TBB_USE_EXCEPTIONS && !__TBB_THROW_ACROSS_MODULE_BOUNDARY_BROKEN && TBB_REVAMP_TODO
 #include "tbb/global_control.h"
 //! Testing exceptions
 //! \brief \ref requirement
 TEST_CASE("Exceptions support") {
-    for ( int p = MinThread; p <= MaxThread; ++p ) {
-        if ( p > 0 ) {
+    for (int p = MinThread; p <= MaxThread; ++p) {
+        if (p > 0) {
             tbb::global_control control(tbb::global_control::max_allowed_parallelism, p);
             TestExceptionsSupport();
         }
@@ -421,32 +412,29 @@ TEST_CASE("Vector types") {
 //! \brief \ref resource_usage
 TEST_CASE("That all workers sleep when no work") {
     const std::size_t N = 100000;
-    std::atomic<int> counter{};
-
-    tbb::parallel_for(std::size_t(0), N, [&](std::size_t) {
-        for (int i = 0; i < 1000; ++i) {
-            ++counter;
-        }
-    }, tbb::simple_partitioner());
+    std::atomic<int> counter {};
+
+    tbb::parallel_for(
+            std::size_t(0), N,
+            [&](std::size_t) {
+                for (int i = 0; i < 1000; ++i) { ++counter; }
+            },
+            tbb::simple_partitioner());
     TestCPUUserTime(utils::get_platform_max_threads());
 }
 
 //! Testing simple partitioner stability
 //! \brief \ref error_guessing
-TEST_CASE("Simple partitioner stability") {
-    TestSimplePartitionerStability();
-}
+TEST_CASE("Simple partitioner stability") { TestSimplePartitionerStability(); }
 
 //! Testing various range implementations
 //! \brief \ref requirement
-TEST_CASE("Various range implementations") {
-    various_range_implementations::test();
-}
+TEST_CASE("Various range implementations") { various_range_implementations::test(); }
 
 //! Testing parallel_for with explicit task_group_context
 //! \brief \ref interface \ref error_guessing
 TEST_CASE("Cancellation test for tbb::parallel_for") {
-    test_cancellation::ParallelForTestRunner</*FirstMode = */0>::run();
+    test_cancellation::ParallelForTestRunner</*FirstMode = */ 0>::run();
 }
 
 #if __TBB_CPP20_CONCEPTS_PRESENT
@@ -457,8 +445,8 @@ TEST_CASE("parallel_for constraints") {
     test_pfor_func_constraints();
     test_pfor_index_constraints();
 }
-#endif // __TBB_CPP20_CONCEPTS_PRESENT
+#endif// __TBB_CPP20_CONCEPTS_PRESENT
 
 #if _MSC_VER
-#pragma warning (pop)
+#pragma warning(pop)
 #endif
diff --git a/external/tbb/test/tbb/test_parallel_for_each.cpp b/external/tbb/test/tbb/test_parallel_for_each.cpp
index 67a8a048..fe189ace 100644
--- a/external/tbb/test/tbb/test_parallel_for_each.cpp
+++ b/external/tbb/test/tbb/test_parallel_for_each.cpp
@@ -14,10 +14,10 @@
     limitations under the License.
 */
 
-#include "common/parallel_for_each_common.h"
 #include "common/concepts_common.h"
-#include <vector>
+#include "common/parallel_for_each_common.h"
 #include <iterator>
+#include <vector>
 
 //! \file test_parallel_for_each.cpp
 //! \brief Test for [algorithms.parallel_for_each]
@@ -55,81 +55,74 @@ struct cpp20_iterator {
         return it;
     }
 
-    cpp20_iterator& operator--()
-        requires std::derived_from<Category, std::bidirectional_iterator_tag>
-    {
+    cpp20_iterator& operator--() requires std::derived_from<Category, std::bidirectional_iterator_tag> {
         --my_ptr;
         return *this;
     }
 
-    cpp20_iterator operator--(int)
-        requires std::derived_from<Category, std::bidirectional_iterator_tag>
-    {
+    cpp20_iterator operator--(int) requires std::derived_from<Category, std::bidirectional_iterator_tag> {
         auto it = *this;
         --*this;
         return it;
     }
 
-    cpp20_iterator& operator+=(difference_type n)
-        requires std::derived_from<Category, std::random_access_iterator_tag>
-    {
+    cpp20_iterator&
+    operator+=(difference_type n) requires std::derived_from<Category, std::random_access_iterator_tag> {
         my_ptr += n;
         return *this;
     }
 
-    cpp20_iterator& operator-=(difference_type n)
-        requires std::derived_from<Category, std::random_access_iterator_tag>
-    {
+    cpp20_iterator&
+    operator-=(difference_type n) requires std::derived_from<Category, std::random_access_iterator_tag> {
         my_ptr -= n;
         return *this;
     }
 
     T& operator[](difference_type n) const
-        requires std::derived_from<Category, std::random_access_iterator_tag>
-    {
+            requires std::derived_from<Category, std::random_access_iterator_tag> {
         return my_ptr[n];
     }
 
     friend bool operator==(const cpp20_iterator&, const cpp20_iterator&) = default;
 
-    friend auto operator<=>(const cpp20_iterator&, const cpp20_iterator&)
-        requires std::derived_from<Category, std::random_access_iterator_tag> = default;
+    friend auto operator<=>(const cpp20_iterator&, const cpp20_iterator&) requires std::derived_from<
+            Category, std::random_access_iterator_tag> = default;
 
-    friend cpp20_iterator operator+(cpp20_iterator i, difference_type n)
-        requires std::derived_from<Category, std::random_access_iterator_tag>
-    {
+    friend cpp20_iterator
+    operator+(cpp20_iterator i,
+              difference_type n) requires std::derived_from<Category, std::random_access_iterator_tag> {
         return cpp20_iterator(i.my_ptr + n);
     }
 
-    friend cpp20_iterator operator+(difference_type n, cpp20_iterator i)
-        requires std::derived_from<Category, std::random_access_iterator_tag>
-    {
+    friend cpp20_iterator
+    operator+(difference_type n,
+              cpp20_iterator i) requires std::derived_from<Category, std::random_access_iterator_tag> {
         return i + n;
     }
 
-    friend cpp20_iterator operator-(cpp20_iterator i, difference_type n)
-        requires std::derived_from<Category, std::random_access_iterator_tag>
-    {
+    friend cpp20_iterator
+    operator-(cpp20_iterator i,
+              difference_type n) requires std::derived_from<Category, std::random_access_iterator_tag> {
         return cpp20_iterator(i.my_ptr - n);
     }
 
     friend difference_type operator-(const cpp20_iterator& x, const cpp20_iterator& y) {
         return x.my_ptr - y.my_ptr;
     }
+
 private:
     T* my_ptr = nullptr;
-}; // class cpp20_iterator
-#endif // __TBB_CPP20_CONCEPTS_PRESENT
+};    // class cpp20_iterator
+#endif// __TBB_CPP20_CONCEPTS_PRESENT
 
 //! Test forward access iterator support
 //! \brief \ref error_guessing \ref interface
 TEST_CASE("Forward iterator support") {
-    for ( auto concurrency_level : utils::concurrency_range() ) {
+    for (auto concurrency_level : utils::concurrency_range()) {
         tbb::global_control control(tbb::global_control::max_allowed_parallelism, concurrency_level);
-        for(size_t depth = 0; depth <= depths_nubmer; ++depth) {
+        for (size_t depth = 0; depth <= depths_nubmer; ++depth) {
             g_tasks_expected = 0;
-            for (size_t i=0; i < depth; ++i)
-                g_tasks_expected += FindNumOfTasks(g_depths[i].value());
+            for (size_t i = 0; i < depth; ++i) g_tasks_expected += FindNumOfTasks(g_depths[i].value());
             TestIterator_Modifiable<utils::ForwardIterator<value_t>>(depth);
         }
     }
@@ -138,12 +131,11 @@ TEST_CASE("Forward iterator support") {
 //! Test random access iterator support
 //! \brief \ref error_guessing \ref interface
 TEST_CASE("Random access iterator support") {
-    for ( auto concurrency_level : utils::concurrency_range() ) {
+    for (auto concurrency_level : utils::concurrency_range()) {
         tbb::global_control control(tbb::global_control::max_allowed_parallelism, concurrency_level);
-        for(size_t depth = 0; depth <= depths_nubmer; ++depth) {
+        for (size_t depth = 0; depth <= depths_nubmer; ++depth) {
             g_tasks_expected = 0;
-            for (size_t i=0; i < depth; ++i)
-                g_tasks_expected += FindNumOfTasks(g_depths[i].value());
+            for (size_t i = 0; i < depth; ++i) g_tasks_expected += FindNumOfTasks(g_depths[i].value());
             TestIterator_Modifiable<value_t*>(depth);
         }
     }
@@ -152,40 +144,37 @@ TEST_CASE("Random access iterator support") {
 //! Test const random access iterator support
 //! \brief \ref error_guessing \ref interface
 TEST_CASE("Const random access iterator support") {
-    for ( auto concurrency_level : utils::concurrency_range() ) {
+    for (auto concurrency_level : utils::concurrency_range()) {
         tbb::global_control control(tbb::global_control::max_allowed_parallelism, concurrency_level);
-        for(size_t depth = 0; depth <= depths_nubmer; ++depth) {
+        for (size_t depth = 0; depth <= depths_nubmer; ++depth) {
             g_tasks_expected = 0;
-            for (size_t i=0; i < depth; ++i)
-                g_tasks_expected += FindNumOfTasks(g_depths[i].value());
+            for (size_t i = 0; i < depth; ++i) g_tasks_expected += FindNumOfTasks(g_depths[i].value());
             TestIterator_Const<utils::ConstRandomIterator<value_t>>(depth);
         }
     }
-
 }
 
 //! Test container based overload
 //! \brief \ref error_guessing \ref interface
 TEST_CASE("Container based overload - forward iterator based container") {
-    container_based_overload_test_case<utils::ForwardIterator>(/*expected_value*/1);
+    container_based_overload_test_case<utils::ForwardIterator>(/*expected_value*/ 1);
 }
 
 //! Test container based overload
 //! \brief \ref error_guessing \ref interface
 TEST_CASE("Container based overload - random access iterator based container") {
-    container_based_overload_test_case<utils::RandomIterator>(/*expected_value*/1);
+    container_based_overload_test_case<utils::RandomIterator>(/*expected_value*/ 1);
 }
 
 // Test for iterators over values convertible to work item type
 //! \brief \ref error_guessing \ref interface
 TEST_CASE("Using with values convertible to work item type") {
-    for ( auto concurrency_level : utils::concurrency_range() ) {
+    for (auto concurrency_level : utils::concurrency_range()) {
         tbb::global_control control(tbb::global_control::max_allowed_parallelism, concurrency_level);
         using Iterator = size_t*;
-        for(size_t depth = 0; depth <= depths_nubmer; ++depth) {
+        for (size_t depth = 0; depth <= depths_nubmer; ++depth) {
             g_tasks_expected = 0;
-            for (size_t i=0; i < depth; ++i)
-                g_tasks_expected += FindNumOfTasks(g_depths[i].value());
+            for (size_t i = 0; i < depth; ++i) g_tasks_expected += FindNumOfTasks(g_depths[i].value());
             // Test for iterators over values convertible to work item type
             TestIterator_Common<Iterator>(depth);
             TestBody<FakeTaskGeneratorBody_RvalueRefVersion, Iterator>(depth);
@@ -201,9 +190,7 @@ TEST_CASE("That all workers sleep when no work") {
     std::vector<std::size_t> vec(N, 0);
 
     tbb::parallel_for_each(vec.begin(), vec.end(), [&](std::size_t& in) {
-        for (int i = 0; i < 1000; ++i) {
-            ++in;
-        }
+        for (int i = 0; i < 1000; ++i) { ++in; }
     });
     TestCPUUserTime(utils::get_platform_max_threads());
 }
@@ -211,15 +198,16 @@ TEST_CASE("That all workers sleep when no work") {
 #if __TBB_CPP20_CONCEPTS_PRESENT
 
 template <typename Iterator, typename Body>
-concept can_call_parallel_for_each_with_iterator = requires( Iterator it, const Body& body, tbb::task_group_context ctx ) {
+concept can_call_parallel_for_each_with_iterator
+        = requires(Iterator it, const Body& body, tbb::task_group_context ctx) {
     tbb::parallel_for_each(it, it, body);
     tbb::parallel_for_each(it, it, body, ctx);
 };
 
 template <typename ContainerBasedSequence, typename Body>
-concept can_call_parallel_for_each_with_cbs = requires( ContainerBasedSequence cbs,
-                                                        const ContainerBasedSequence const_cbs,
-                                                        const Body& body, tbb::task_group_context ctx ) {
+concept can_call_parallel_for_each_with_cbs
+        = requires(ContainerBasedSequence cbs, const ContainerBasedSequence const_cbs, const Body& body,
+                   tbb::task_group_context ctx) {
     tbb::parallel_for_each(cbs, body);
     tbb::parallel_for_each(cbs, body, ctx);
     tbb::parallel_for_each(const_cbs, body);
@@ -229,18 +217,18 @@ concept can_call_parallel_for_each_with_cbs = requires( ContainerBasedSequence c
 using CorrectCBS = test_concepts::container_based_sequence::Correct;
 
 template <typename Body>
-concept can_call_parallel_for_each =
-    can_call_parallel_for_each_with_iterator<CorrectCBS::iterator, Body> &&
-    can_call_parallel_for_each_with_cbs<CorrectCBS, Body>;
+concept can_call_parallel_for_each = can_call_parallel_for_each_with_iterator<CorrectCBS::iterator, Body>&&
+        can_call_parallel_for_each_with_cbs<CorrectCBS, Body>;
 
 template <typename Iterator>
 using CorrectBody = test_concepts::parallel_for_each_body::Correct<decltype(*std::declval<Iterator>())>;
 
 void test_pfor_each_iterator_constraints() {
-    using CorrectIterator = typename std::vector<int>::iterator; // random_access_iterator
-    using IncorrectIterator = std::ostream_iterator<int>; // output_iterator
+    using CorrectIterator = typename std::vector<int>::iterator;// random_access_iterator
+    using IncorrectIterator = std::ostream_iterator<int>;       // output_iterator
     static_assert(can_call_parallel_for_each_with_iterator<CorrectIterator, CorrectBody<CorrectIterator>>);
-    static_assert(!can_call_parallel_for_each_with_iterator<IncorrectIterator, CorrectBody<IncorrectIterator>>);
+    static_assert(
+            !can_call_parallel_for_each_with_iterator<IncorrectIterator, CorrectBody<IncorrectIterator>>);
 }
 
 void test_pfor_each_container_based_sequence_constraints() {
@@ -291,13 +279,9 @@ void test_with_cpp20_iterator() {
     cpp20_iterator<no_copy_move, Category> begin(elements.data());
     cpp20_iterator<no_copy_move, Category> end(elements.data() + n);
 
-    oneapi::tbb::parallel_for_each(begin, end, [](no_copy_move& element) {
-        element.item = 42;
-    });
+    oneapi::tbb::parallel_for_each(begin, end, [](no_copy_move& element) { element.item = 42; });
 
-    for (std::size_t index = 0; index < n; ++index) {
-        CHECK(elements[index].item == 42);
-    }
+    for (std::size_t index = 0; index < n; ++index) { CHECK(elements[index].item == 42); }
 }
 
 //! \brief \ref error_guessing \ref regression
@@ -328,4 +312,4 @@ TEST_CASE("parallel_for_each with cpp20 iterator") {
     test_with_cpp20_iterator<std::random_access_iterator_tag>();
 }
 
-#endif // __TBB_CPP20_CONCEPTS_PRESENT
+#endif// __TBB_CPP20_CONCEPTS_PRESENT
diff --git a/external/tbb/test/tbb/test_parallel_invoke.cpp b/external/tbb/test/tbb/test_parallel_invoke.cpp
index 6c94e3bc..2631f32f 100644
--- a/external/tbb/test/tbb/test_parallel_invoke.cpp
+++ b/external/tbb/test/tbb/test_parallel_invoke.cpp
@@ -14,15 +14,15 @@
     limitations under the License.
 */
 
+#include "common/cpu_usertime.h"
+#include "common/memory_usage.h"
+#include "common/parallel_invoke_common.h"
 #include "common/test.h"
 #include "common/utils.h"
-#include "common/cpu_usertime.h"
 #include "common/utils_concurrency_limit.h"
-#include "common/parallel_invoke_common.h"
-#include "common/memory_usage.h"
 
-#include <cstddef>
 #include <atomic>
+#include <cstddef>
 
 //! \file test_parallel_invoke.cpp
 //! \brief Test for [algorithms.parallel_invoke]
@@ -33,7 +33,7 @@
 //! \brief \ref resource_usage \ref stress
 TEST_CASE("Test memory leaks") {
     std::size_t number_of_measurements = 500;
-    std::size_t current_memory_usage = 0, max_memory_usage = 0, stability_counter=0;
+    std::size_t current_memory_usage = 0, max_memory_usage = 0, stability_counter = 0;
 
     // Limit concurrency to prevent extra allocations not dependent on algorithm behavior
     auto concurrency_limit = utils::get_platform_max_threads() < 8 ? utils::get_platform_max_threads() : 8;
@@ -42,7 +42,7 @@ TEST_CASE("Test memory leaks") {
     for (std::size_t i = 0; i < number_of_measurements; i++) {
         {
             // ~45000 workload tasks
-            invoke_tree</*LevelTaskCount*/6, /*Depth*/6, /*WorkSize*/10>::generate_and_run();
+            invoke_tree</*LevelTaskCount*/ 6, /*Depth*/ 6, /*WorkSize*/ 10>::generate_and_run();
         }
 
         current_memory_usage = utils::GetMemoryUsage();
@@ -60,7 +60,7 @@ TEST_CASE("Test memory leaks") {
 }
 #endif
 
-template<typename Body>
+template <typename Body>
 void test_from_2_to_10_arguments(const Body& body, const std::atomic<std::size_t>& counter) {
     tbb::parallel_invoke(body, body);
     tbb::parallel_invoke(body, body, body);
@@ -73,19 +73,19 @@ void test_from_2_to_10_arguments(const Body& body, const std::atomic<std::size_t
     tbb::parallel_invoke(body, body, body, body, body, body, body, body, body, body);
 
     REQUIRE_MESSAGE(counter == (2 + 10) * 9 / 2,
-        "Parallel invoke correctness was broken during lambda support test execution.");
+                    "Parallel invoke correctness was broken during lambda support test execution.");
 }
 
 //! Testing lambdas support
 //! \brief \ref error_guessing
 TEST_CASE("Test lambda support") {
-    std::atomic<std::size_t> lambda_counter{0};
-    auto body = [&]{ lambda_counter++; };
+    std::atomic<std::size_t> lambda_counter {0};
+    auto body = [&] { lambda_counter++; };
 
     test_from_2_to_10_arguments(body, lambda_counter);
 }
 
-std::atomic<std::size_t> func_counter{0};
+std::atomic<std::size_t> func_counter {0};
 void func() { func_counter++; };
 
 //! Testing function pointers support
@@ -98,6 +98,6 @@ TEST_CASE("Test function pointers support") {
 //! Testing workers going to sleep
 //! \brief \ref error_guessing
 TEST_CASE("Test that all workers sleep when no work") {
-    invoke_tree</*LevelTaskCount*/9, /*Depth*/6, /*WorkSize*/10>::generate_and_run();
+    invoke_tree</*LevelTaskCount*/ 9, /*Depth*/ 6, /*WorkSize*/ 10>::generate_and_run();
     TestCPUUserTime(utils::get_platform_max_threads());
 }
diff --git a/external/tbb/test/tbb/test_parallel_phase.cpp b/external/tbb/test/tbb/test_parallel_phase.cpp
index d242c5b3..8b676b0c 100644
--- a/external/tbb/test/tbb/test_parallel_phase.cpp
+++ b/external/tbb/test/tbb/test_parallel_phase.cpp
@@ -21,29 +21,27 @@
 
 #include <chrono>
 
+#include "common/spin_barrier.h"
 #include "common/test.h"
 #include "common/utils.h"
 #include "common/utils_concurrency_limit.h"
-#include "common/spin_barrier.h"
 
 #include "tbb/task_arena.h"
 
 void active_wait_for(std::chrono::microseconds duration) {
     for (auto t1 = std::chrono::steady_clock::now(), t2 = t1;
-        std::chrono::duration_cast<std::chrono::microseconds>(t2 - t1) < duration;
-        t2 = std::chrono::steady_clock::now())
-    {
+         std::chrono::duration_cast<std::chrono::microseconds>(t2 - t1) < duration;
+         t2 = std::chrono::steady_clock::now()) {
         utils::doDummyWork(100);
     }
 }
 
 struct dummy_func {
-    void operator()() const {
-    }
+    void operator()() const {}
 };
 
 template <typename F1 = dummy_func, typename F2 = dummy_func>
-std::size_t measure_median_start_time(tbb::task_arena* ta, const F1& start = F1{}, const F2& end = F2{}) {
+std::size_t measure_median_start_time(tbb::task_arena* ta, const F1& start = F1 {}, const F2& end = F2 {}) {
     std::size_t num_threads = ta ? ta->max_concurrency() : tbb::this_task_arena::max_concurrency();
     std::size_t num_runs = 500;
     std::vector<std::size_t> longest_start_times;
@@ -56,7 +54,7 @@ std::size_t measure_median_start_time(tbb::task_arena* ta, const F1& start = F1{
         barrier.wait();
     };
 
-    auto get_longest_start = [&] (std::chrono::steady_clock::time_point start_time) {
+    auto get_longest_start = [&](std::chrono::steady_clock::time_point start_time) {
         std::size_t longest_time = 0;
         for (auto& time : start_times) {
             auto diff = std::chrono::duration_cast<std::chrono::microseconds>(time - start_time);
@@ -68,7 +66,7 @@ std::size_t measure_median_start_time(tbb::task_arena* ta, const F1& start = F1{
     auto work = [&] {
         auto start_time = std::chrono::steady_clock::now();
         start();
-        for(std::size_t thr = 0; thr < num_threads-1; ++thr) {
+        for (std::size_t thr = 0; thr < num_threads - 1; ++thr) {
             tbb::this_task_arena::enqueue(measure_start_time);
         }
         start_times[tbb::this_task_arena::current_thread_index()] = std::chrono::steady_clock::now();
@@ -83,7 +81,7 @@ std::size_t measure_median_start_time(tbb::task_arena* ta, const F1& start = F1{
         } else {
             work();
         }
-        active_wait_for(std::chrono::microseconds(i*2));
+        active_wait_for(std::chrono::microseconds(i * 2));
     }
     return utils::median(longest_start_times.begin(), longest_start_times.end());
 }
@@ -91,12 +89,13 @@ std::size_t measure_median_start_time(tbb::task_arena* ta, const F1& start = F1{
 template <typename Impl>
 class start_time_collection_base {
     friend Impl;
+
 public:
-    start_time_collection_base(tbb::task_arena& ta, std::size_t ntrials) :
-        arena(&ta), num_trials(ntrials), start_times(ntrials) {}
+    start_time_collection_base(tbb::task_arena& ta, std::size_t ntrials)
+        : arena(&ta), num_trials(ntrials), start_times(ntrials) {}
 
-    explicit start_time_collection_base(std::size_t ntrials) :
-        arena(nullptr), num_trials(ntrials), start_times(ntrials) {}
+    explicit start_time_collection_base(std::size_t ntrials)
+        : arena(nullptr), num_trials(ntrials), start_times(ntrials) {}
 
     std::vector<std::size_t> measure() {
         for (std::size_t i = 0; i < num_trials; ++i) {
@@ -105,6 +104,7 @@ class start_time_collection_base {
         }
         return start_times;
     }
+
 protected:
     tbb::task_arena* arena;
     std::size_t num_trials;
@@ -116,14 +116,11 @@ class start_time_collection : public start_time_collection_base<start_time_colle
     using base::base;
     friend base;
 
-    std::size_t measure_impl() {
-        return measure_median_start_time(arena);
-    }
+    std::size_t measure_impl() { return measure_median_start_time(arena); }
 };
 
 class start_time_collection_phase_wrapped
-    : public start_time_collection_base<start_time_collection_phase_wrapped>
-{
+    : public start_time_collection_base<start_time_collection_phase_wrapped> {
     using base = start_time_collection_base<start_time_collection_phase_wrapped>;
     using base::base;
     friend base;
@@ -131,28 +128,26 @@ class start_time_collection_phase_wrapped
     std::size_t measure_impl() {
         arena->start_parallel_phase();
         auto median_start_time = measure_median_start_time(arena);
-        arena->end_parallel_phase(/*with_fast_leave*/true);
+        arena->end_parallel_phase(/*with_fast_leave*/ true);
         return median_start_time;
     }
 };
 
 class start_time_collection_scoped_phase_wrapped
-    : public start_time_collection_base<start_time_collection_scoped_phase_wrapped>
-{
+    : public start_time_collection_base<start_time_collection_scoped_phase_wrapped> {
     using base = start_time_collection_base<start_time_collection_scoped_phase_wrapped>;
     using base::base;
     friend base;
 
     std::size_t measure_impl() {
-        tbb::task_arena::scoped_parallel_phase phase{*arena};
+        tbb::task_arena::scoped_parallel_phase phase {*arena};
         auto median_start_time = measure_median_start_time(arena);
         return median_start_time;
     }
 };
 
 class start_time_collection_sequenced_phases
-    : public start_time_collection_base<start_time_collection_sequenced_phases>
-{
+    : public start_time_collection_base<start_time_collection_sequenced_phases> {
     using base = start_time_collection_base<start_time_collection_sequenced_phases>;
     friend base;
 
@@ -161,110 +156,88 @@ class start_time_collection_sequenced_phases
     std::size_t measure_impl() {
         std::size_t median_start_time;
         utils::SpinBarrier barrier;
-        auto body = [&] {
-            barrier.wait();
-        };
+        auto body = [&] { barrier.wait(); };
         if (arena) {
             barrier.initialize(arena->max_concurrency());
-            median_start_time = measure_median_start_time(arena,
-                [&] {
-                    std::size_t num_threads = arena->max_concurrency();
-                    arena->start_parallel_phase();
-                    arena->execute([&] {
-                        for(std::size_t thr = 0; thr < num_threads-1; ++thr) {
-                            tbb::this_task_arena::enqueue(body);
-                        }
-                        barrier.wait();
-                    });
-                    arena->end_parallel_phase(with_fast_leave);
-                }
-            );
-        } else {
-            barrier.initialize(tbb::this_task_arena::max_concurrency());
-            median_start_time = measure_median_start_time(arena,
-                [&] {
-                    std::size_t num_threads = tbb::this_task_arena::max_concurrency();
-                    tbb::this_task_arena::start_parallel_phase();
-                    for(std::size_t thr = 0; thr < num_threads-1; ++thr) {
+            median_start_time = measure_median_start_time(arena, [&] {
+                std::size_t num_threads = arena->max_concurrency();
+                arena->start_parallel_phase();
+                arena->execute([&] {
+                    for (std::size_t thr = 0; thr < num_threads - 1; ++thr) {
                         tbb::this_task_arena::enqueue(body);
                     }
                     barrier.wait();
-                    tbb::this_task_arena::end_parallel_phase(with_fast_leave); 
+                });
+                arena->end_parallel_phase(with_fast_leave);
+            });
+        } else {
+            barrier.initialize(tbb::this_task_arena::max_concurrency());
+            median_start_time = measure_median_start_time(arena, [&] {
+                std::size_t num_threads = tbb::this_task_arena::max_concurrency();
+                tbb::this_task_arena::start_parallel_phase();
+                for (std::size_t thr = 0; thr < num_threads - 1; ++thr) {
+                    tbb::this_task_arena::enqueue(body);
                 }
-            );
+                barrier.wait();
+                tbb::this_task_arena::end_parallel_phase(with_fast_leave);
+            });
         }
         return median_start_time;
     }
 
 public:
-    start_time_collection_sequenced_phases(tbb::task_arena& ta, std::size_t ntrials, bool fast_leave = false) :
-        base(ta, ntrials), with_fast_leave(fast_leave)
-    {}
+    start_time_collection_sequenced_phases(tbb::task_arena& ta, std::size_t ntrials, bool fast_leave = false)
+        : base(ta, ntrials), with_fast_leave(fast_leave) {}
 
-    explicit start_time_collection_sequenced_phases(std::size_t ntrials, bool fast_leave = false) :
-        base(ntrials), with_fast_leave(fast_leave)
-    {}
+    explicit start_time_collection_sequenced_phases(std::size_t ntrials, bool fast_leave = false)
+        : base(ntrials), with_fast_leave(fast_leave) {}
 };
 
 class start_time_collection_sequenced_scoped_phases
-    : public start_time_collection_base<start_time_collection_sequenced_scoped_phases>
-{
+    : public start_time_collection_base<start_time_collection_sequenced_scoped_phases> {
     using base = start_time_collection_base<start_time_collection_sequenced_scoped_phases>;
     friend base;
 
     bool with_fast_leave;
 
     std::size_t measure_impl() {
-        utils::SpinBarrier barrier{static_cast<std::size_t>(arena->max_concurrency())};
-        auto body = [&] {
-            barrier.wait();
-        };
-        auto median_start_time = measure_median_start_time(arena,
-            [&] {
-                std::size_t num_threads = arena->max_concurrency();
-                {
-                    tbb::task_arena::scoped_parallel_phase phase{*arena, with_fast_leave};
-                    arena->execute([&] {
-                        for(std::size_t thr = 0; thr < num_threads-1; ++thr) {
-                            tbb::this_task_arena::enqueue(body);
-                        }
-                        barrier.wait();
-                    });
-                }
+        utils::SpinBarrier barrier {static_cast<std::size_t>(arena->max_concurrency())};
+        auto body = [&] { barrier.wait(); };
+        auto median_start_time = measure_median_start_time(arena, [&] {
+            std::size_t num_threads = arena->max_concurrency();
+            {
+                tbb::task_arena::scoped_parallel_phase phase {*arena, with_fast_leave};
+                arena->execute([&] {
+                    for (std::size_t thr = 0; thr < num_threads - 1; ++thr) {
+                        tbb::this_task_arena::enqueue(body);
+                    }
+                    barrier.wait();
+                });
             }
-        );
+        });
         return median_start_time;
     }
 
 public:
-    start_time_collection_sequenced_scoped_phases(tbb::task_arena& ta, std::size_t ntrials, bool fast_leave = false) :
-        base(ta, ntrials), with_fast_leave(fast_leave)
-    {}
+    start_time_collection_sequenced_scoped_phases(tbb::task_arena& ta, std::size_t ntrials,
+                                                  bool fast_leave = false)
+        : base(ta, ntrials), with_fast_leave(fast_leave) {}
 
-    explicit start_time_collection_sequenced_scoped_phases(std::size_t ntrials, bool fast_leave = false) :
-        base(ntrials), with_fast_leave(fast_leave)
-    {}
+    explicit start_time_collection_sequenced_scoped_phases(std::size_t ntrials, bool fast_leave = false)
+        : base(ntrials), with_fast_leave(fast_leave) {}
 };
 
 //! \brief \ref interface \ref requirement
 TEST_CASE("Check that workers leave faster with leave_policy::fast") {
     // Test measures workers start time, so no there is no point to
     // measure it with workerless arena
-    if (utils::get_platform_max_threads() < 2) {
-        return;
-    }
-    tbb::task_arena ta_automatic_leave {
-        tbb::task_arena::automatic, 1,
-        tbb::task_arena::priority::normal,
-        tbb::task_arena::leave_policy::automatic
-    };
-    tbb::task_arena ta_fast_leave { 
-        tbb::task_arena::automatic, 1,
-        tbb::task_arena::priority::normal,
-        tbb::task_arena::leave_policy::fast
-    };
-    start_time_collection st_collector1{ta_automatic_leave, /*num_trials=*/5};
-    start_time_collection st_collector2{ta_fast_leave, /*num_trials=*/5};
+    if (utils::get_platform_max_threads() < 2) { return; }
+    tbb::task_arena ta_automatic_leave {tbb::task_arena::automatic, 1, tbb::task_arena::priority::normal,
+                                        tbb::task_arena::leave_policy::automatic};
+    tbb::task_arena ta_fast_leave {tbb::task_arena::automatic, 1, tbb::task_arena::priority::normal,
+                                   tbb::task_arena::leave_policy::fast};
+    start_time_collection st_collector1 {ta_automatic_leave, /*num_trials=*/5};
+    start_time_collection st_collector2 {ta_fast_leave, /*num_trials=*/5};
 
     auto times_automatic = st_collector1.measure();
     auto times_fast = st_collector2.measure();
@@ -273,27 +246,19 @@ TEST_CASE("Check that workers leave faster with leave_policy::fast") {
     auto median_fast = utils::median(times_fast.begin(), times_fast.end());
 
     WARN_MESSAGE(median_automatic < median_fast,
-        "Expected workers to start new work slower with fast leave policy");
+                 "Expected workers to start new work slower with fast leave policy");
 }
 
 //! \brief \ref interface \ref requirement
 TEST_CASE("Parallel Phase retains workers in task_arena") {
-    if (utils::get_platform_max_threads() < 2) {
-        return;
-    }
-    tbb::task_arena ta_fast1 {
-        tbb::task_arena::automatic, 1,
-        tbb::task_arena::priority::normal,
-        tbb::task_arena::leave_policy::fast
-    };
-    tbb::task_arena ta_fast2 { 
-        tbb::task_arena::automatic, 1,
-        tbb::task_arena::priority::normal,
-        tbb::task_arena::leave_policy::fast
-    };
-    start_time_collection_phase_wrapped st_collector1{ta_fast1, /*num_trials=*/5};
-    start_time_collection_scoped_phase_wrapped st_collector_scoped{ta_fast1, /*num_trials=*/5};
-    start_time_collection st_collector2{ta_fast2, /*num_trials=*/5};
+    if (utils::get_platform_max_threads() < 2) { return; }
+    tbb::task_arena ta_fast1 {tbb::task_arena::automatic, 1, tbb::task_arena::priority::normal,
+                              tbb::task_arena::leave_policy::fast};
+    tbb::task_arena ta_fast2 {tbb::task_arena::automatic, 1, tbb::task_arena::priority::normal,
+                              tbb::task_arena::leave_policy::fast};
+    start_time_collection_phase_wrapped st_collector1 {ta_fast1, /*num_trials=*/5};
+    start_time_collection_scoped_phase_wrapped st_collector_scoped {ta_fast1, /*num_trials=*/5};
+    start_time_collection st_collector2 {ta_fast2, /*num_trials=*/5};
 
     auto times1 = st_collector1.measure();
     auto times2 = st_collector2.measure();
@@ -303,23 +268,21 @@ TEST_CASE("Parallel Phase retains workers in task_arena") {
     auto median2 = utils::median(times2.begin(), times2.end());
     auto median_scoped = utils::median(times_scoped.begin(), times_scoped.end());
 
-    WARN_MESSAGE(median1 < median2,
-        "Expected workers start new work faster when using parallel_phase");
+    WARN_MESSAGE(median1 < median2, "Expected workers start new work faster when using parallel_phase");
 
     WARN_MESSAGE(median_scoped < median2,
-        "Expected workers start new work faster when using scoped parallel_phase");
+                 "Expected workers start new work faster when using scoped parallel_phase");
 }
 
 //! \brief \ref interface \ref requirement
 TEST_CASE("Test one-time fast leave") {
-    if (utils::get_platform_max_threads() < 2) {
-        return;
-    }
-    tbb::task_arena ta1{};
-    tbb::task_arena ta2{};
-    start_time_collection_sequenced_phases st_collector1{ta1, /*num_trials=*/10};
-    start_time_collection_sequenced_phases st_collector2{ta2, /*num_trials=*/10, /*fast_leave*/true};
-    start_time_collection_sequenced_scoped_phases st_collector_scoped{ta2, /*num_trials=*/10, /*fast_leave*/true};
+    if (utils::get_platform_max_threads() < 2) { return; }
+    tbb::task_arena ta1 {};
+    tbb::task_arena ta2 {};
+    start_time_collection_sequenced_phases st_collector1 {ta1, /*num_trials=*/10};
+    start_time_collection_sequenced_phases st_collector2 {ta2, /*num_trials=*/10, /*fast_leave*/ true};
+    start_time_collection_sequenced_scoped_phases st_collector_scoped {ta2, /*num_trials=*/10,
+                                                                       /*fast_leave*/ true};
 
     auto times1 = st_collector1.measure();
     auto times2 = st_collector2.measure();
@@ -329,20 +292,17 @@ TEST_CASE("Test one-time fast leave") {
     auto median2 = utils::median(times2.begin(), times2.end());
     auto median_scoped = utils::median(times_scoped.begin(), times_scoped.end());
 
-    WARN_MESSAGE(median1 < median2,
-        "Expected one-time fast leave setting to slow workers to start new work");
+    WARN_MESSAGE(median1 < median2, "Expected one-time fast leave setting to slow workers to start new work");
 
     WARN_MESSAGE(median1 < median_scoped,
-        "Expected one-time fast leave setting to slow workers to start new work");
+                 "Expected one-time fast leave setting to slow workers to start new work");
 }
 
 //! \brief \ref interface \ref requirement
 TEST_CASE("Test parallel phase with this_task_arena") {
-    if (utils::get_platform_max_threads() < 2) {
-        return;
-    }
-    start_time_collection_sequenced_phases st_collector1{/*num_trials=*/10};
-    start_time_collection_sequenced_phases st_collector2{/*num_trials=*/10, /*fast_leave*/true};
+    if (utils::get_platform_max_threads() < 2) { return; }
+    start_time_collection_sequenced_phases st_collector1 {/*num_trials=*/10};
+    start_time_collection_sequenced_phases st_collector2 {/*num_trials=*/10, /*fast_leave*/ true};
 
     auto times1 = st_collector1.measure();
     auto times2 = st_collector2.measure();
@@ -350,6 +310,5 @@ TEST_CASE("Test parallel phase with this_task_arena") {
     auto median1 = utils::median(times1.begin(), times1.end());
     auto median2 = utils::median(times2.begin(), times2.end());
 
-    WARN_MESSAGE(median1 < median2,
-        "Expected one-time fast leave setting to slow workers to start new work");
+    WARN_MESSAGE(median1 < median2, "Expected one-time fast leave setting to slow workers to start new work");
 }
diff --git a/external/tbb/test/tbb/test_parallel_pipeline.cpp b/external/tbb/test/tbb/test_parallel_pipeline.cpp
index e389412e..0a27773a 100644
--- a/external/tbb/test/tbb/test_parallel_pipeline.cpp
+++ b/external/tbb/test/tbb/test_parallel_pipeline.cpp
@@ -16,20 +16,20 @@
 
 // Before including parallel_pipeline.h, set up the variable to count heap allocated
 // filter_node objects, and make it known for the header.
+#include "common/checktype.h"
 #include "common/test.h"
 #include "common/utils.h"
-#include "common/checktype.h"
 
 int filter_node_count = 0;
 #define __TBB_TEST_FILTER_NODE_COUNT filter_node_count
-#include "tbb/parallel_pipeline.h"
 #include "tbb/global_control.h"
+#include "tbb/parallel_pipeline.h"
 #include "tbb/spin_mutex.h"
 #include "tbb/task_group.h"
 
 #include <atomic>
+#include <memory>// std::unique_ptr
 #include <string.h>
-#include <memory> // std::unique_ptr
 
 //! \file test_parallel_pipeline.cpp
 //! \brief Test for [algorithms.parallel_pipeline algorithms.parallel_pipeline.flow_control] specification
@@ -37,7 +37,7 @@ int filter_node_count = 0;
 const unsigned n_tokens = 8;
 // we can conceivably have two buffers used in the middle filter for every token in flight, so
 // we must allocate two buffers for every token.  Unlikely, but possible.
-const unsigned n_buffers = 2*n_tokens;
+const unsigned n_buffers = 2 * n_tokens;
 const int max_counter = 16;
 
 static std::size_t concurrency = 0;
@@ -49,24 +49,22 @@ static std::atomic<int> pointer_specialized_calls;
 static std::atomic<int> first_pointer_specialized_calls;
 static std::atomic<int> second_pointer_specialized_calls;
 
-static int intbuffer[max_counter];  // store results for <int,int> parallel pipeline test
+static int intbuffer[max_counter];// store results for <int,int> parallel pipeline test
 static bool check_intbuffer;
 
 static void* buffers[n_buffers];
 static std::atomic_flag buf_in_use[n_buffers] = {ATOMIC_FLAG_INIT};
 
-void *fetchNextBuffer() {
-    for(size_t icnt = 0; icnt < n_buffers; ++icnt) {
-        if(!buf_in_use[icnt].test_and_set()) {
-            return buffers[icnt];
-        }
+void* fetchNextBuffer() {
+    for (size_t icnt = 0; icnt < n_buffers; ++icnt) {
+        if (!buf_in_use[icnt].test_and_set()) { return buffers[icnt]; }
     }
-    CHECK_MESSAGE(false, "Ran out of buffers, p:"<< concurrency);
+    CHECK_MESSAGE(false, "Ran out of buffers, p:" << concurrency);
     return nullptr;
 }
-void freeBuffer(void *buf) {
-    for(size_t i=0; i < n_buffers;++i) {
-        if(buffers[i] == buf) {
+void freeBuffer(void* buf) {
+    for (size_t i = 0; i < n_buffers; ++i) {
+        if (buffers[i] == buf) {
             buf_in_use[i].clear();
             return;
         }
@@ -74,79 +72,102 @@ void freeBuffer(void *buf) {
     CHECK_MESSAGE(false, "Tried to free a buffer not in our list, p:" << concurrency);
 }
 
-template<typename T>
+template <typename T>
 class free_on_scope_exit {
 public:
-    free_on_scope_exit(T *p) : my_p(p) {}
-    ~free_on_scope_exit() { if(!my_p) return; my_p->~T(); freeBuffer(my_p); }
+    free_on_scope_exit(T* p) : my_p(p) {}
+    ~free_on_scope_exit() {
+        if (!my_p) return;
+        my_p->~T();
+        freeBuffer(my_p);
+    }
+
 private:
-    T *my_p;
+    T* my_p;
 };
 
 // methods for testing CheckType< >, that return okay values for other types.
-template<typename T>
-bool middle_is_ready(T &/*p*/) { return false; }
+template <typename T>
+bool middle_is_ready(T& /*p*/) {
+    return false;
+}
 
-template<typename U>
-bool middle_is_ready(CheckType<U> &p) { return p.is_ready(); }
+template <typename U>
+bool middle_is_ready(CheckType<U>& p) {
+    return p.is_ready();
+}
 
-template<typename T>
-bool output_is_ready(T &/*p*/) { return true; }
+template <typename T>
+bool output_is_ready(T& /*p*/) {
+    return true;
+}
 
-template<typename U>
-bool output_is_ready(CheckType<U> &p) { return p.is_ready(); }
+template <typename U>
+bool output_is_ready(CheckType<U>& p) {
+    return p.is_ready();
+}
 
-template<typename T>
-int middle_my_id( T &/*p*/) { return 0; }
+template <typename T>
+int middle_my_id(T& /*p*/) {
+    return 0;
+}
 
-template<typename U>
-int middle_my_id(CheckType<U> &p) { return p.id(); }
+template <typename U>
+int middle_my_id(CheckType<U>& p) {
+    return p.id();
+}
 
-template<typename T>
-int output_my_id( T &/*p*/) { return 1; }
+template <typename T>
+int output_my_id(T& /*p*/) {
+    return 1;
+}
 
-template<typename U>
-int output_my_id(CheckType<U> &p) { return p.id(); }
+template <typename U>
+int output_my_id(CheckType<U>& p) {
+    return p.id();
+}
 
-template<typename T>
-void my_function(T &p) { p = 0; }
+template <typename T>
+void my_function(T& p) {
+    p = 0;
+}
 
-template<typename U>
-void my_function(CheckType<U> &p) { p.get_ready(); }
+template <typename U>
+void my_function(CheckType<U>& p) {
+    p.get_ready();
+}
 
 // Filters must be copy-constructible, and be const-qualifiable.
-template<typename U>
+template <typename U>
 class input_filter : DestroyedTracker {
 public:
-    U operator()( tbb::flow_control& control ) const {
+    U operator()(tbb::flow_control& control) const {
         CHECK(is_alive());
-        if( --input_counter < 0 ) {
+        if (--input_counter < 0) {
             control.stop();
-        }
-        else  // only count successful reads
+        } else// only count successful reads
             ++non_pointer_specialized_calls;
-        return U();  // default constructed
+        return U();// default constructed
     }
-
 };
 
 // specialization for pointer
-template<typename U>
+template <typename U>
 class input_filter<U*> : DestroyedTracker {
 public:
     U* operator()(tbb::flow_control& control) const {
         CHECK(is_alive());
         int ival = --input_counter;
-        if(ival < 0) {
+        if (ival < 0) {
             control.stop();
             return nullptr;
         }
         ++pointer_specialized_calls;
-        if(ival == max_counter / 2) {
-            return nullptr;  // non-stop nullptr
+        if (ival == max_counter / 2) {
+            return nullptr;// non-stop nullptr
         }
-        U* myReturn = new(fetchNextBuffer()) U();
-        if (myReturn) {  // may have been passed in a nullptr
+        U* myReturn = new (fetchNextBuffer()) U();
+        if (myReturn) {// may have been passed in a nullptr
             CHECK_MESSAGE(!middle_my_id(*myReturn), "bad id value, p:" << concurrency);
             CHECK_MESSAGE(!middle_is_ready(*myReturn), "Already ready, p:" << concurrency);
         }
@@ -154,44 +175,40 @@ class input_filter<U*> : DestroyedTracker {
     }
 };
 
-template<>
+template <>
 class input_filter<void> : DestroyedTracker {
 public:
-    void operator()( tbb::flow_control& control ) const {
+    void operator()(tbb::flow_control& control) const {
         CHECK(is_alive());
-        if( --input_counter < 0 ) {
+        if (--input_counter < 0) {
             control.stop();
-        }
-        else
+        } else
             ++non_pointer_specialized_calls;
     }
-
 };
 
 // specialization for int that passes back a sequence of integers
-template<>
+template <>
 class input_filter<int> : DestroyedTracker {
 public:
-    int
-    operator()(tbb::flow_control& control ) const {
+    int operator()(tbb::flow_control& control) const {
         CHECK(is_alive());
         int oldval = --input_counter;
-        if( oldval < 0 ) {
+        if (oldval < 0) {
             control.stop();
-        }
-        else
+        } else
             ++non_pointer_specialized_calls;
-        return oldval+1;
+        return oldval + 1;
     }
 };
 
-template<typename T, typename U>
+template <typename T, typename U>
 class middle_filter : DestroyedTracker {
 public:
     U operator()(T t) const {
         CHECK(is_alive());
         CHECK_MESSAGE(!middle_my_id(t), "bad id value, p:" << concurrency);
-        CHECK_MESSAGE(!middle_is_ready(t), "Already ready, p:" << concurrency );
+        CHECK_MESSAGE(!middle_is_ready(t), "Already ready, p:" << concurrency);
         U out;
         my_function(out);
         ++non_pointer_specialized_calls;
@@ -199,15 +216,15 @@ class middle_filter : DestroyedTracker {
     }
 };
 
-template<typename T, typename U>
-class middle_filter<T*,U> : DestroyedTracker {
+template <typename T, typename U>
+class middle_filter<T*, U> : DestroyedTracker {
 public:
     U operator()(T* my_storage) const {
-        free_on_scope_exit<T> my_ptr(my_storage);  // free_on_scope_exit marks the buffer available
+        free_on_scope_exit<T> my_ptr(my_storage);// free_on_scope_exit marks the buffer available
         CHECK(is_alive());
-        if(my_storage) {  // may have been passed in a nullptr
+        if (my_storage) {// may have been passed in a nullptr
             CHECK_MESSAGE(!middle_my_id(*my_storage), "bad id value, p:" << concurrency);
-            CHECK_MESSAGE(!middle_is_ready(*my_storage), "Already ready, p:" << concurrency );
+            CHECK_MESSAGE(!middle_is_ready(*my_storage), "Already ready, p:" << concurrency);
         }
         ++first_pointer_specialized_calls;
         U out;
@@ -216,55 +233,55 @@ class middle_filter<T*,U> : DestroyedTracker {
     }
 };
 
-template<typename T, typename U>
-class middle_filter<T,U*> : DestroyedTracker {
+template <typename T, typename U>
+class middle_filter<T, U*> : DestroyedTracker {
 public:
     U* operator()(T my_storage) const {
         CHECK(is_alive());
         CHECK_MESSAGE(!middle_my_id(my_storage), "bad id value, p:" << concurrency);
-        CHECK_MESSAGE(!middle_is_ready(my_storage), "Already ready, p:" << concurrency );
+        CHECK_MESSAGE(!middle_is_ready(my_storage), "Already ready, p:" << concurrency);
         // allocate new space from buffers
-        U* my_return = new(fetchNextBuffer()) U();
+        U* my_return = new (fetchNextBuffer()) U();
         my_function(*my_return);
         ++second_pointer_specialized_calls;
         return my_return;
     }
 };
 
-template<typename T, typename U>
-class middle_filter<T*,U*> : DestroyedTracker {
+template <typename T, typename U>
+class middle_filter<T*, U*> : DestroyedTracker {
 public:
     U* operator()(T* my_storage) const {
-        free_on_scope_exit<T> my_ptr(my_storage);  // free_on_scope_exit marks the buffer available
+        free_on_scope_exit<T> my_ptr(my_storage);// free_on_scope_exit marks the buffer available
         CHECK(is_alive());
-        if(my_storage) {
+        if (my_storage) {
             CHECK_MESSAGE(!middle_my_id(*my_storage), "bad id value, p:" << concurrency);
-            CHECK_MESSAGE(!middle_is_ready(*my_storage), "Already ready, p:" << concurrency );
+            CHECK_MESSAGE(!middle_is_ready(*my_storage), "Already ready, p:" << concurrency);
         }
         // may have been passed a nullptr
         ++pointer_specialized_calls;
-        if(!my_storage) return nullptr;
+        if (!my_storage) return nullptr;
         CHECK_MESSAGE(!middle_my_id(*my_storage), "bad id value, p:" << concurrency);
-        CHECK_MESSAGE(!middle_is_ready(*my_storage), "Already ready, p:" << concurrency );
-        U* my_return = new(fetchNextBuffer()) U();
+        CHECK_MESSAGE(!middle_is_ready(*my_storage), "Already ready, p:" << concurrency);
+        U* my_return = new (fetchNextBuffer()) U();
         my_function(*my_return);
         return my_return;
     }
 };
 
 // specialization for int that squares the input and returns that.
-template<>
-class middle_filter<int,int> : DestroyedTracker {
+template <>
+class middle_filter<int, int> : DestroyedTracker {
 public:
     int operator()(int my_input) const {
         CHECK(is_alive());
         ++non_pointer_specialized_calls;
-        return my_input*my_input;
+        return my_input * my_input;
     }
 };
 
 // ---------------------------------
-template<typename T>
+template <typename T>
 class output_filter : DestroyedTracker {
 public:
     void operator()(T c) const {
@@ -277,7 +294,7 @@ class output_filter : DestroyedTracker {
 };
 
 // specialization for int that puts the received value in an array
-template<>
+template <>
 class output_filter<int> : DestroyedTracker {
 public:
     void operator()(int my_input) const {
@@ -288,13 +305,13 @@ class output_filter<int> : DestroyedTracker {
     }
 };
 
-template<typename T>
+template <typename T>
 class output_filter<T*> : DestroyedTracker {
 public:
     void operator()(T* c) const {
         free_on_scope_exit<T> my_ptr(c);
         CHECK(is_alive());
-        if(c) {
+        if (c) {
             CHECK_MESSAGE(output_my_id(*c), "unset id value, p:" << concurrency);
             CHECK_MESSAGE(output_is_ready(*c), "not yet ready, p:" << concurrency);
         }
@@ -320,282 +337,271 @@ void resetCounters() {
     second_pointer_specialized_calls = 0;
     // we have to reset the buffer flags because our input filters return allocated space on end-of-input,
     // (on eof a default-constructed object is returned) and they do not pass through the filter further.
-    for(size_t i = 0; i < n_buffers; ++i)
-        buf_in_use[i].clear();
+    for (size_t i = 0; i < n_buffers; ++i) buf_in_use[i].clear();
 }
 
 void checkCounters(final_assert_type my_t) {
     CHECK_MESSAGE(output_counter == max_counter, "Ran out of buffers, p:" << concurrency);
-    switch(my_t) {
+    switch (my_t) {
         case assert_nonpointer:
-            CHECK_MESSAGE(pointer_specialized_calls+first_pointer_specialized_calls+second_pointer_specialized_calls == 0, "non-pointer filters specialized to pointer, p:" << concurrency);
-            CHECK_MESSAGE(non_pointer_specialized_calls == 3*max_counter, "bad count for non-pointer filters, p:" << concurrency);
-            if(check_intbuffer) {
-                for(int i = 1; i <= max_counter; ++i) {
-                    int j = i*i;
+            CHECK_MESSAGE(pointer_specialized_calls + first_pointer_specialized_calls
+                                          + second_pointer_specialized_calls
+                                  == 0,
+                          "non-pointer filters specialized to pointer, p:" << concurrency);
+            CHECK_MESSAGE(non_pointer_specialized_calls == 3 * max_counter,
+                          "bad count for non-pointer filters, p:" << concurrency);
+            if (check_intbuffer) {
+                for (int i = 1; i <= max_counter; ++i) {
+                    int j = i * i;
                     bool found_val = false;
-                    for(int k = 0; k < max_counter; ++k) {
-                        if(intbuffer[k] == j) {
+                    for (int k = 0; k < max_counter; ++k) {
+                        if (intbuffer[k] == j) {
                             found_val = true;
                             break;
                         }
                     }
-                    CHECK_MESSAGE(found_val, "Missing value in output array, p:" << concurrency );
+                    CHECK_MESSAGE(found_val, "Missing value in output array, p:" << concurrency);
                 }
             }
             break;
-        case assert_firstpointer:
-            {
-                bool check = pointer_specialized_calls == max_counter &&  // input filter extra invocation
-                    first_pointer_specialized_calls == max_counter &&
-                    non_pointer_specialized_calls == max_counter &&
-                    second_pointer_specialized_calls == 0;
-                CHECK_MESSAGE(check, "incorrect specialization for firstpointer, p:" << concurrency);
-            }
-            break;
-        case assert_secondpointer:
-            {
-                bool check = pointer_specialized_calls == max_counter &&
-                    first_pointer_specialized_calls == 0 &&
-                    non_pointer_specialized_calls == max_counter &&  // input filter
-                    second_pointer_specialized_calls == max_counter;
-                CHECK_MESSAGE(check, "incorrect specialization for firstpointer, p:" << concurrency);
-            }
-            break;
+        case assert_firstpointer: {
+            bool check = pointer_specialized_calls == max_counter &&// input filter extra invocation
+                         first_pointer_specialized_calls == max_counter
+                         && non_pointer_specialized_calls == max_counter
+                         && second_pointer_specialized_calls == 0;
+            CHECK_MESSAGE(check, "incorrect specialization for firstpointer, p:" << concurrency);
+        } break;
+        case assert_secondpointer: {
+            bool check = pointer_specialized_calls == max_counter && first_pointer_specialized_calls == 0
+                         && non_pointer_specialized_calls == max_counter &&// input filter
+                         second_pointer_specialized_calls == max_counter;
+            CHECK_MESSAGE(check, "incorrect specialization for firstpointer, p:" << concurrency);
+        } break;
         case assert_allpointer:
-            CHECK_MESSAGE(non_pointer_specialized_calls+first_pointer_specialized_calls+second_pointer_specialized_calls == 0, "pointer filters specialized to non-pointer, p:" << concurrency);
-            CHECK_MESSAGE(pointer_specialized_calls == 3*max_counter, "bad count for pointer filters, p:" << concurrency);
+            CHECK_MESSAGE(non_pointer_specialized_calls + first_pointer_specialized_calls
+                                          + second_pointer_specialized_calls
+                                  == 0,
+                          "pointer filters specialized to non-pointer, p:" << concurrency);
+            CHECK_MESSAGE(pointer_specialized_calls == 3 * max_counter,
+                          "bad count for pointer filters, p:" << concurrency);
             break;
         case no_pointer_counts:
             break;
     }
 }
 
-static const tbb::filter_mode filter_table[] = { tbb::filter_mode::parallel, tbb::filter_mode::serial_in_order, tbb::filter_mode::serial_out_of_order};
-const unsigned number_of_filter_types = sizeof(filter_table)/sizeof(filter_table[0]);
+static const tbb::filter_mode filter_table[] = {tbb::filter_mode::parallel, tbb::filter_mode::serial_in_order,
+                                                tbb::filter_mode::serial_out_of_order};
+const unsigned number_of_filter_types = sizeof(filter_table) / sizeof(filter_table[0]);
 
 using filter_chain = tbb::filter<void, void>;
-using mode_array =tbb::filter_mode;
+using mode_array = tbb::filter_mode;
 
 // The filters are passed by value, which forces a temporary copy to be created.  This is
 // to reproduce the bug where a filter_chain uses refs to filters, which after a call
 // would be references to destructed temporaries.
-template<typename type1, typename type2>
-void fill_chain( filter_chain &my_chain, mode_array *filter_type, input_filter<type1> i_filter,
-         middle_filter<type1, type2> m_filter, output_filter<type2> o_filter ) {
-    my_chain = tbb::filter<void, type1>(filter_type[0], i_filter) &
-        tbb::filter<type1, type2>(filter_type[1], m_filter) &
-        tbb::filter<type2, void>(filter_type[2], o_filter);
+template <typename type1, typename type2>
+void fill_chain(filter_chain& my_chain, mode_array* filter_type, input_filter<type1> i_filter,
+                middle_filter<type1, type2> m_filter, output_filter<type2> o_filter) {
+    my_chain = tbb::filter<void, type1>(filter_type[0], i_filter)
+               & tbb::filter<type1, type2>(filter_type[1], m_filter)
+               & tbb::filter<type2, void>(filter_type[2], o_filter);
 }
 
-template<typename... Context>
+template <typename... Context>
 void run_function_spec(Context&... context) {
     CHECK_MESSAGE(!filter_node_count, "invalid filter_node counter");
     input_filter<void> i_filter;
     // Test pipeline that contains only one filter
-    for( unsigned i = 0; i<number_of_filter_types; i++) {
-        tbb::filter<void, void> one_filter( filter_table[i], i_filter );
-        CHECK_MESSAGE(filter_node_count==1, "some filter nodes left after previous iteration?");
+    for (unsigned i = 0; i < number_of_filter_types; i++) {
+        tbb::filter<void, void> one_filter(filter_table[i], i_filter);
+        CHECK_MESSAGE(filter_node_count == 1, "some filter nodes left after previous iteration?");
         resetCounters();
-        tbb::parallel_pipeline( n_tokens, one_filter, context... );
+        tbb::parallel_pipeline(n_tokens, one_filter, context...);
         // no need to check counters
         std::atomic<int> counter;
         counter = max_counter;
         // Construct filter using lambda-syntax when parallel_pipeline() is being run;
-        tbb::parallel_pipeline( n_tokens,
-            tbb::filter<void, void>(filter_table[i], [&counter]( tbb::flow_control& control ) {
-                    if( counter-- == 0 )
-                        control.stop();
-                    }
-            ),
-            context...
-        );
+        tbb::parallel_pipeline(n_tokens,
+                               tbb::filter<void, void>(filter_table[i],
+                                                       [&counter](tbb::flow_control& control) {
+                                                           if (counter-- == 0) control.stop();
+                                                       }),
+                               context...);
     }
     CHECK_MESSAGE(!filter_node_count, "filter_node objects leaked");
 }
 
-template<typename t1, typename t2, typename... Context>
-void run_filter_set(
-        input_filter<t1>& i_filter,
-        middle_filter<t1,t2>& m_filter,
-        output_filter<t2>& o_filter,
-        mode_array *filter_type,
-        final_assert_type my_t,
-        Context&... context) {
-    tbb::filter<void, t1> filter1( filter_type[0], i_filter );
-    tbb::filter<t1, t2> filter2( filter_type[1], m_filter );
-    tbb::filter<t2, void> filter3( filter_type[2], o_filter );
-
-    CHECK_MESSAGE(filter_node_count==3, "some filter nodes left after previous iteration?");
+template <typename t1, typename t2, typename... Context>
+void run_filter_set(input_filter<t1>& i_filter, middle_filter<t1, t2>& m_filter, output_filter<t2>& o_filter,
+                    mode_array* filter_type, final_assert_type my_t, Context&... context) {
+    tbb::filter<void, t1> filter1(filter_type[0], i_filter);
+    tbb::filter<t1, t2> filter2(filter_type[1], m_filter);
+    tbb::filter<t2, void> filter3(filter_type[2], o_filter);
+
+    CHECK_MESSAGE(filter_node_count == 3, "some filter nodes left after previous iteration?");
     resetCounters();
     // Create filters sequence when parallel_pipeline() is being run
-    tbb::parallel_pipeline( n_tokens, filter1, filter2, filter3, context...  );
+    tbb::parallel_pipeline(n_tokens, filter1, filter2, filter3, context...);
     checkCounters(my_t);
 
     // Create filters sequence partially outside parallel_pipeline() and also when parallel_pipeline() is being run
     tbb::filter<void, t2> filter12;
     filter12 = filter1 & filter2;
-    for( int i = 0; i<3; i++)
-    {
-        filter12 &= tbb::filter<t2,t2>(filter_type[i], [](t2 x) -> t2 { return x;});
+    for (int i = 0; i < 3; i++) {
+        filter12 &= tbb::filter<t2, t2>(filter_type[i], [](t2 x) -> t2 { return x; });
     }
     resetCounters();
-    tbb::parallel_pipeline( n_tokens, filter12, filter3, context...  );
+    tbb::parallel_pipeline(n_tokens, filter12, filter3, context...);
     checkCounters(my_t);
 
     tbb::filter<void, void> filter123 = filter12 & filter3;
     // Run pipeline twice with the same filter sequence
-    for( unsigned i = 0; i<2; i++ ) {
+    for (unsigned i = 0; i < 2; i++) {
         resetCounters();
-        tbb::parallel_pipeline( n_tokens, filter123, context...  );
+        tbb::parallel_pipeline(n_tokens, filter123, context...);
         checkCounters(my_t);
     }
 
     // Now copy-and-move-construct another filter instance, and use it to run pipeline
     {
-        tbb::filter<void, void> copy123( filter123 );
+        tbb::filter<void, void> copy123(filter123);
         resetCounters();
-        tbb::parallel_pipeline( n_tokens, copy123, context...  );
+        tbb::parallel_pipeline(n_tokens, copy123, context...);
         checkCounters(my_t);
-        tbb::filter<void, void> move123( std::move(filter123) );
+        tbb::filter<void, void> move123(std::move(filter123));
         resetCounters();
-        tbb::parallel_pipeline( n_tokens, move123, context...  );
+        tbb::parallel_pipeline(n_tokens, move123, context...);
         checkCounters(my_t);
     }
 
     // Construct filters and create the sequence when parallel_pipeline() is being run
     resetCounters();
-    tbb::parallel_pipeline( n_tokens,
-               tbb::filter<void, t1>(filter_type[0], i_filter),
-               tbb::filter<t1, t2>(filter_type[1], m_filter),
-               tbb::filter<t2, void>(filter_type[2], o_filter),
-               context...  );
+    tbb::parallel_pipeline(n_tokens, tbb::filter<void, t1>(filter_type[0], i_filter),
+                           tbb::filter<t1, t2>(filter_type[1], m_filter),
+                           tbb::filter<t2, void>(filter_type[2], o_filter), context...);
     checkCounters(my_t);
 
     // Construct filters, make a copy, destroy the original filters, and run with the copy
     int cnt = filter_node_count;
     {
-        tbb::filter<void, void>* p123 = new tbb::filter<void,void> (
-               tbb::filter<void, t1>(filter_type[0], i_filter)&
-               tbb::filter<t1, t2>(filter_type[1], m_filter)&
-               tbb::filter<t2, void>(filter_type[2], o_filter) );
-        CHECK_MESSAGE(filter_node_count==cnt+5, "filter node accounting error?");
-        tbb::filter<void, void> copy123( *p123 );
+        tbb::filter<void, void>* p123
+                = new tbb::filter<void, void>(tbb::filter<void, t1>(filter_type[0], i_filter)
+                                              & tbb::filter<t1, t2>(filter_type[1], m_filter)
+                                              & tbb::filter<t2, void>(filter_type[2], o_filter));
+        CHECK_MESSAGE(filter_node_count == cnt + 5, "filter node accounting error?");
+        tbb::filter<void, void> copy123(*p123);
         delete p123;
-        CHECK_MESSAGE(filter_node_count==cnt+5, "filter nodes deleted prematurely?");
+        CHECK_MESSAGE(filter_node_count == cnt + 5, "filter nodes deleted prematurely?");
         resetCounters();
-        tbb::parallel_pipeline( n_tokens, copy123, context...  );
+        tbb::parallel_pipeline(n_tokens, copy123, context...);
         checkCounters(my_t);
     }
 
     // construct a filter with temporaries
     {
         tbb::filter<void, void> my_filter;
-        fill_chain<t1,t2>( my_filter, filter_type, i_filter, m_filter, o_filter );
+        fill_chain<t1, t2>(my_filter, filter_type, i_filter, m_filter, o_filter);
         resetCounters();
-        tbb::parallel_pipeline( n_tokens, my_filter, context...  );
+        tbb::parallel_pipeline(n_tokens, my_filter, context...);
         checkCounters(my_t);
     }
-    CHECK_MESSAGE(filter_node_count==cnt, "scope ended but filter nodes not deleted?");
+    CHECK_MESSAGE(filter_node_count == cnt, "scope ended but filter nodes not deleted?");
 }
 
 template <typename t1, typename t2, typename... Context>
-void run_lambdas_test( mode_array *filter_type, Context&... context ) {
+void run_lambdas_test(mode_array* filter_type, Context&... context) {
     std::atomic<int> counter;
     counter = max_counter;
     // Construct filters using lambda-syntax and create the sequence when parallel_pipeline() is being run;
-    resetCounters();  // only need the output_counter reset.
-    tbb::parallel_pipeline( n_tokens,
-        tbb::make_filter<void, t1>(filter_type[0], [&counter]( tbb::flow_control& control ) -> t1 {
-                if( --counter < 0 )
-                    control.stop();
-                return t1(); }
-        ),
-        tbb::make_filter<t1, t2>(filter_type[1], []( t1 /*my_storage*/ ) -> t2 {
-                return t2(); }
-        ),
-        tbb::make_filter<t2,void>(filter_type[2], [] ( t2 ) -> void {
-                output_counter++; }
-        ),
-        context...
-    );
-    checkCounters(no_pointer_counts);  // don't have to worry about specializations
+    resetCounters();// only need the output_counter reset.
+    tbb::parallel_pipeline(
+            n_tokens,
+            tbb::make_filter<void, t1>(filter_type[0],
+                                       [&counter](tbb::flow_control& control) -> t1 {
+                                           if (--counter < 0) control.stop();
+                                           return t1();
+                                       }),
+            tbb::make_filter<t1, t2>(filter_type[1], [](t1 /*my_storage*/) -> t2 { return t2(); }),
+            tbb::make_filter<t2, void>(filter_type[2], [](t2) -> void { output_counter++; }), context...);
+    checkCounters(no_pointer_counts);// don't have to worry about specializations
     counter = max_counter;
     // pointer filters
     resetCounters();
-    tbb::parallel_pipeline( n_tokens,
-        tbb::filter<void,t1*>(filter_type[0], [&counter]( tbb::flow_control& control ) -> t1* {
-                if( --counter < 0 ) {
-                    control.stop();
-                    return nullptr;
-                }
-                return new(fetchNextBuffer()) t1(); }
-        ),
-		tbb::filter<t1*, t2*>(filter_type[1], []( t1* my_storage ) -> t2* {
-                my_storage->~t1();
-                return new(my_storage) t2(); }
-        ),
-		tbb::filter<t2*, void>(filter_type[2], [] ( t2* my_storage ) -> void {
-                my_storage->~t2();
-                freeBuffer(my_storage);
-                output_counter++; }
-        ),
-        context...
-    );
+    tbb::parallel_pipeline(n_tokens,
+                           tbb::filter<void, t1*>(filter_type[0],
+                                                  [&counter](tbb::flow_control& control) -> t1* {
+                                                      if (--counter < 0) {
+                                                          control.stop();
+                                                          return nullptr;
+                                                      }
+                                                      return new (fetchNextBuffer()) t1();
+                                                  }),
+                           tbb::filter<t1*, t2*>(filter_type[1],
+                                                 [](t1* my_storage) -> t2* {
+                                                     my_storage->~t1();
+                                                     return new (my_storage) t2();
+                                                 }),
+                           tbb::filter<t2*, void>(filter_type[2],
+                                                  [](t2* my_storage) -> void {
+                                                      my_storage->~t2();
+                                                      freeBuffer(my_storage);
+                                                      output_counter++;
+                                                  }),
+                           context...);
     checkCounters(no_pointer_counts);
     // first filter outputs pointer
     counter = max_counter;
     resetCounters();
-    tbb::parallel_pipeline( n_tokens,
-        tbb::make_filter(filter_type[0], [&counter]( tbb::flow_control& control ) -> t1* {
-                if( --counter < 0 ) {
-                    control.stop();
-                    return nullptr;
-                }
-                return new(fetchNextBuffer()) t1(); }
-        )&
-        tbb::make_filter(filter_type[1], []( t1* my_storage ) -> t2 {
-                my_storage->~t1();
-                freeBuffer(my_storage);
-                return t2(); }
-        ),
-        tbb::make_filter(filter_type[2], [] ( t2 /*my_storage*/) -> void {
-                output_counter++; }
-        ),
-        context...
-    );
+    tbb::parallel_pipeline(
+            n_tokens,
+            tbb::make_filter(filter_type[0],
+                             [&counter](tbb::flow_control& control) -> t1* {
+                                 if (--counter < 0) {
+                                     control.stop();
+                                     return nullptr;
+                                 }
+                                 return new (fetchNextBuffer()) t1();
+                             })
+                    & tbb::make_filter(filter_type[1],
+                                       [](t1* my_storage) -> t2 {
+                                           my_storage->~t1();
+                                           freeBuffer(my_storage);
+                                           return t2();
+                                       }),
+            tbb::make_filter(filter_type[2], [](t2 /*my_storage*/) -> void { output_counter++; }),
+            context...);
     checkCounters(no_pointer_counts);
     // second filter outputs pointer
     counter = max_counter;
     resetCounters();
-    tbb::parallel_pipeline( n_tokens,
-        tbb::make_filter(filter_type[0], [&counter]( tbb::flow_control& control ) -> t1 {
-                if( --counter < 0 ) {
-                    control.stop();
-                }
-                return t1(); }
-        ),
-        tbb::filter<t1, t2*>(filter_type[1], []( t1 /*my_storage*/ ) -> t2* {
-                return new(fetchNextBuffer()) t2(); }
-        )&
-        tbb::make_filter<t2*, void>(filter_type[2], [] ( t2* my_storage) -> void {
-                my_storage->~t2();
-                freeBuffer(my_storage);
-                output_counter++; }
-        ),
-        context...
-    );
+    tbb::parallel_pipeline(
+            n_tokens,
+            tbb::make_filter(filter_type[0],
+                             [&counter](tbb::flow_control& control) -> t1 {
+                                 if (--counter < 0) { control.stop(); }
+                                 return t1();
+                             }),
+            tbb::filter<t1, t2*>(filter_type[1],
+                                 [](t1 /*my_storage*/) -> t2* { return new (fetchNextBuffer()) t2(); })
+                    & tbb::make_filter<t2*, void>(filter_type[2],
+                                                  [](t2* my_storage) -> void {
+                                                      my_storage->~t2();
+                                                      freeBuffer(my_storage);
+                                                      output_counter++;
+                                                  }),
+            context...);
     checkCounters(no_pointer_counts);
 }
 
-template<typename type1, typename type2>
-void run_function(const char *l1, const char *l2) {
+template <typename type1, typename type2>
+void run_function(const char* l1, const char* l2) {
     CHECK_MESSAGE(!filter_node_count, "invalid filter_node counter");
 
-    check_intbuffer = (!strcmp(l1,"int") && !strcmp(l2,"int"));
+    check_intbuffer = (!strcmp(l1, "int") && !strcmp(l2, "int"));
 
-    Checker<type1> check1;  // check constructions/destructions
-    Checker<type2> check2;  // for type1 or type2 === CheckType<T>
+    Checker<type1> check1;// check constructions/destructions
+    Checker<type2> check2;// for type1 or type2 === CheckType<T>
 
     const size_t number_of_filters = 3;
 
@@ -611,41 +617,41 @@ void run_function(const char *l1, const char *l2) {
     output_filter<type2*> p_o_filter;
 
     // allocate the buffers for the filters
-    unsigned max_size = (sizeof(type1) > sizeof(type2) ) ? sizeof(type1) : sizeof(type2);
-    for(unsigned i = 0; i < (unsigned)n_buffers; ++i) {
+    unsigned max_size = (sizeof(type1) > sizeof(type2)) ? sizeof(type1) : sizeof(type2);
+    for (unsigned i = 0; i < (unsigned) n_buffers; ++i) {
         buffers[i] = malloc(max_size);
         buf_in_use[i].clear();
     }
 
     unsigned limit = 1;
     // Test pipeline that contains number_of_filters filters
-    for( unsigned i=0; i<number_of_filters; ++i)
-        limit *= number_of_filter_types;
+    for (unsigned i = 0; i < number_of_filters; ++i) limit *= number_of_filter_types;
     // Iterate over possible filter sequences
-    for( unsigned numeral=0; numeral<limit; ++numeral ) {
+    for (unsigned numeral = 0; numeral < limit; ++numeral) {
         unsigned temp = numeral;
         tbb::filter_mode filter_type[number_of_filter_types];
-        for( unsigned i=0; i<number_of_filters; ++i, temp/=number_of_filter_types )
-            filter_type[i] = filter_table[temp%number_of_filter_types];
+        for (unsigned i = 0; i < number_of_filters; ++i, temp /= number_of_filter_types)
+            filter_type[i] = filter_table[temp % number_of_filter_types];
 
         tbb::task_group_context context;
-        run_filter_set<type1,type2>(i_filter, m_filter, o_filter, filter_type, assert_nonpointer);
-        run_filter_set<type1,type2>(i_filter, m_filter, o_filter, filter_type, assert_nonpointer, context);
-        run_filter_set<type1*,type2>(p_i_filter, pr_m_filter, o_filter, filter_type, assert_firstpointer);
-        run_filter_set<type1*,type2>(p_i_filter, pr_m_filter, o_filter, filter_type, assert_firstpointer, context);
-        run_filter_set<type1,type2*>(i_filter, rp_m_filter, p_o_filter, filter_type, assert_secondpointer);
-        run_filter_set<type1,type2*>(i_filter, rp_m_filter, p_o_filter, filter_type, assert_secondpointer, context);
-        run_filter_set<type1*,type2*>(p_i_filter, pp_m_filter, p_o_filter, filter_type, assert_allpointer);
-        run_filter_set<type1*,type2*>(p_i_filter, pp_m_filter, p_o_filter, filter_type, assert_allpointer, context);
-
-        run_lambdas_test<type1,type2>(filter_type);
-        run_lambdas_test<type1,type2>(filter_type, context);
+        run_filter_set<type1, type2>(i_filter, m_filter, o_filter, filter_type, assert_nonpointer);
+        run_filter_set<type1, type2>(i_filter, m_filter, o_filter, filter_type, assert_nonpointer, context);
+        run_filter_set<type1*, type2>(p_i_filter, pr_m_filter, o_filter, filter_type, assert_firstpointer);
+        run_filter_set<type1*, type2>(p_i_filter, pr_m_filter, o_filter, filter_type, assert_firstpointer,
+                                      context);
+        run_filter_set<type1, type2*>(i_filter, rp_m_filter, p_o_filter, filter_type, assert_secondpointer);
+        run_filter_set<type1, type2*>(i_filter, rp_m_filter, p_o_filter, filter_type, assert_secondpointer,
+                                      context);
+        run_filter_set<type1*, type2*>(p_i_filter, pp_m_filter, p_o_filter, filter_type, assert_allpointer);
+        run_filter_set<type1*, type2*>(p_i_filter, pp_m_filter, p_o_filter, filter_type, assert_allpointer,
+                                       context);
+
+        run_lambdas_test<type1, type2>(filter_type);
+        run_lambdas_test<type1, type2>(filter_type, context);
     }
     CHECK_MESSAGE(!filter_node_count, "filter_node objects leaked");
 
-    for(unsigned i = 0; i < (unsigned)n_buffers; ++i) {
-        free(buffers[i]);
-    }
+    for (unsigned i = 0; i < (unsigned) n_buffers; ++i) { free(buffers[i]); }
 }
 
 //! Testing single filter pipeline
@@ -656,15 +662,17 @@ TEST_CASE("Pipeline testing for single filter") {
     run_function_spec(context);
 }
 
-#define RUN_TYPED_TEST_CASE(type1, type2) TEST_CASE("Pipeline testing with "#type1" and "#type2) { \
-                                                for ( std::size_t concurrency_level : {1, 2, 4, 5, 7, 8} ) { \
-                                                    if ( concurrency_level > tbb::global_control::active_value(tbb::global_control::max_allowed_parallelism) ) \
-                                                        break; \
-                                                    concurrency = concurrency_level; \
-                                                    tbb::global_control control(tbb::global_control::max_allowed_parallelism, concurrency_level); \
-                                                    run_function<type1, type2>(#type1, #type2); \
-                                                } \
-                                            }
+#define RUN_TYPED_TEST_CASE(type1, type2)                                                                    \
+    TEST_CASE("Pipeline testing with " #type1 " and " #type2) {                                              \
+        for (std::size_t concurrency_level : {1, 2, 4, 5, 7, 8}) {                                           \
+            if (concurrency_level                                                                            \
+                > tbb::global_control::active_value(tbb::global_control::max_allowed_parallelism))           \
+                break;                                                                                       \
+            concurrency = concurrency_level;                                                                 \
+            tbb::global_control control(tbb::global_control::max_allowed_parallelism, concurrency_level);    \
+            run_function<type1, type2>(#type1, #type2);                                                      \
+        }                                                                                                    \
+    }
 // Run test several times with different types
 RUN_TYPED_TEST_CASE(std::size_t, int)
 RUN_TYPED_TEST_CASE(int, double)
@@ -677,6 +685,6 @@ RUN_TYPED_TEST_CASE(CheckType<unsigned int>, CheckType<unsigned int>)
 RUN_TYPED_TEST_CASE(CheckType<unsigned int>, CheckType<unsigned short>)
 RUN_TYPED_TEST_CASE(CheckType<unsigned short>, CheckType<unsigned short>)
 RUN_TYPED_TEST_CASE(double, CheckType<unsigned short>)
-RUN_TYPED_TEST_CASE(std::unique_ptr<int>, std::unique_ptr<int>) // move-only type
+RUN_TYPED_TEST_CASE(std::unique_ptr<int>, std::unique_ptr<int>)// move-only type
 
 #undef RUN_TYPED_TEST_CASE
diff --git a/external/tbb/test/tbb/test_parallel_reduce.cpp b/external/tbb/test/tbb/test_parallel_reduce.cpp
index e1c08947..b121a084 100644
--- a/external/tbb/test/tbb/test_parallel_reduce.cpp
+++ b/external/tbb/test/tbb/test_parallel_reduce.cpp
@@ -16,66 +16,63 @@
 
 #include <atomic>
 
-#include "common/parallel_reduce_common.h"
+#include "common/concepts_common.h"
 #include "common/cpu_usertime.h"
 #include "common/exception_handling.h"
-#include "common/concepts_common.h"
+#include "common/parallel_reduce_common.h"
 
 //! \file test_parallel_reduce.cpp
 //! \brief Test for [algorithms.parallel_reduce algorithms.parallel_deterministic_reduce] specification
 
 #if _MSC_VER
-#pragma warning (push)
+#pragma warning(push)
 // Suppress conditional expression is constant
-#pragma warning (disable: 4127)
-#endif //#if _MSC_VER
+#pragma warning(disable : 4127)
+#endif//#if _MSC_VER
 
 using ValueType = uint64_t;
 
 struct Sum {
-    template<typename T>
-    T operator() ( const T& v1, const T& v2 ) const {
+    template <typename T>
+    T operator()(const T& v1, const T& v2) const {
         return v1 + v2;
     }
 };
 
 struct Accumulator {
-    ValueType operator() ( const tbb::blocked_range<ValueType*>& r, ValueType value ) const {
-        for ( ValueType* pv = r.begin(); pv != r.end(); ++pv )
-            value += *pv;
+    ValueType operator()(const tbb::blocked_range<ValueType*>& r, ValueType value) const {
+        for (ValueType* pv = r.begin(); pv != r.end(); ++pv) value += *pv;
         return value;
     }
 };
 
 class ParallelSumTester {
 public:
-    ParallelSumTester( const ParallelSumTester& ) = default;
-    void operator=( const ParallelSumTester& ) = delete;
+    ParallelSumTester(const ParallelSumTester&) = default;
+    void operator=(const ParallelSumTester&) = delete;
 
     ParallelSumTester() : m_range(nullptr, nullptr) {
         m_array = new ValueType[unsigned(count)];
-        for ( ValueType i = 0; i < count; ++i )
-            m_array[i] = i + 1;
-        m_range = tbb::blocked_range<ValueType*>( m_array, m_array + count );
+        for (ValueType i = 0; i < count; ++i) m_array[i] = i + 1;
+        m_range = tbb::blocked_range<ValueType*>(m_array, m_array + count);
     }
     ~ParallelSumTester() { delete[] m_array; }
 
-    template<typename Partitioner>
+    template <typename Partitioner>
     void CheckParallelReduce() {
         Partitioner partitioner;
-        ValueType result1 = reduce_invoker<ValueType>( m_range, Accumulator(), Sum(), partitioner );
-        REQUIRE_MESSAGE( result1 == expected, "Wrong parallel summation result" );
-        ValueType result2 = reduce_invoker<ValueType>( m_range,
-            [](const tbb::blocked_range<ValueType*>& r, ValueType value) -> ValueType {
-                for ( const ValueType* pv = r.begin(); pv != r.end(); ++pv )
-                    value += *pv;
-                return value;
-            },
-            Sum(),
-            partitioner
-        );
-        REQUIRE_MESSAGE( result2 == expected, "Wrong parallel summation result" );
+        ValueType result1 = reduce_invoker<ValueType>(m_range, Accumulator(), Sum(), partitioner);
+        REQUIRE_MESSAGE(result1 == expected, "Wrong parallel summation result");
+        ValueType result2 = reduce_invoker<ValueType>(
+                m_range,
+                [](const tbb::blocked_range<ValueType*>& r, ValueType value) -> ValueType {
+                    for (const ValueType* pv = r.begin(); pv != r.end(); ++pv) value += *pv;
+                    return value;
+                },
+                Sum(), partitioner);
+        REQUIRE_MESSAGE(result2 == expected, "Wrong parallel summation result");
     }
+
 private:
     ValueType* m_array;
     tbb::blocked_range<ValueType*> m_range;
@@ -87,214 +84,210 @@ const ValueType ParallelSumTester::expected = count * (count + 1) / 2;
 
 namespace test_cancellation {
 
-struct ReduceToCancel {
-    std::size_t operator()( const tbb::blocked_range<std::size_t>&, std::size_t ) const {
-        ++g_CurExecuted;
-        Cancellator::WaitUntilReady();
-        return 1;
-    }
-}; // struct ReduceToCancel
-
-struct JoinToCancel {
-    std::size_t operator()( std::size_t, std::size_t ) const {
-        ++g_CurExecuted;
-        Cancellator::WaitUntilReady();
-        return 1;
-    }
-}; // struct Join
-
-struct ReduceFunctorToCancel {
-    std::size_t result;
-
-    ReduceFunctorToCancel() : result(0) {}
-    ReduceFunctorToCancel( ReduceFunctorToCancel&, tbb::split ) : result(0) {}
-
-    void operator()( const tbb::blocked_range<std::size_t>& br ) {
-        result = ReduceToCancel{}(br, result);
-    }
-
-    void join( ReduceFunctorToCancel& rhs ) {
-        result = JoinToCancel{}(result, rhs.result);
-    }
-}; // struct ReduceFunctorToCancel
-
-static constexpr std::size_t buffer_test_size = 1024;
-static constexpr std::size_t maxParallelReduceRunnerMode = 9;
-
-template <std::size_t Mode>
-class ParallelReduceRunner {
-    tbb::task_group_context& my_ctx;
-
-    static_assert(Mode >= 0 && Mode <= maxParallelReduceRunnerMode, "Incorrect mode for ParallelReduceTask");
-
-    template <typename... Args>
-    void run_parallel_reduce( Args&&... args ) const {
-        switch(Mode % 5) {
-            case 0 : {
-                tbb::parallel_reduce(std::forward<Args>(args)..., my_ctx);
-                break;
-            }
-            case 1 : {
-                tbb::parallel_reduce(std::forward<Args>(args)..., tbb::simple_partitioner{}, my_ctx);
-                break;
-            }
-            case 2 : {
-                tbb::parallel_reduce(std::forward<Args>(args)..., tbb::auto_partitioner{}, my_ctx);
-                break;
-            }
-            case 3 : {
-                tbb::parallel_reduce(std::forward<Args>(args)..., tbb::static_partitioner{}, my_ctx);
-                break;
-            }
-            case 4 : {
-                tbb::affinity_partitioner aff;
-                tbb::parallel_reduce(std::forward<Args>(args)..., aff, my_ctx);
-                break;
-            }
+    struct ReduceToCancel {
+        std::size_t operator()(const tbb::blocked_range<std::size_t>&, std::size_t) const {
+            ++g_CurExecuted;
+            Cancellator::WaitUntilReady();
+            return 1;
         }
-    }
+    };// struct ReduceToCancel
 
-public:
-    ParallelReduceRunner( tbb::task_group_context& ctx )
-        : my_ctx(ctx) {}
-
-    void operator()() const {
-        tbb::blocked_range<std::size_t> br(0, buffer_test_size);
-        if (Mode < 5) {
-            ReduceFunctorToCancel functor;
-            run_parallel_reduce(br, functor);
-        } else {
-            run_parallel_reduce(br, std::size_t(0), ReduceToCancel{}, JoinToCancel{});
+    struct JoinToCancel {
+        std::size_t operator()(std::size_t, std::size_t) const {
+            ++g_CurExecuted;
+            Cancellator::WaitUntilReady();
+            return 1;
+        }
+    };// struct Join
+
+    struct ReduceFunctorToCancel {
+        std::size_t result;
+
+        ReduceFunctorToCancel() : result(0) {}
+        ReduceFunctorToCancel(ReduceFunctorToCancel&, tbb::split) : result(0) {}
+
+        void operator()(const tbb::blocked_range<std::size_t>& br) { result = ReduceToCancel {}(br, result); }
+
+        void join(ReduceFunctorToCancel& rhs) { result = JoinToCancel {}(result, rhs.result); }
+    };// struct ReduceFunctorToCancel
+
+    static constexpr std::size_t buffer_test_size = 1024;
+    static constexpr std::size_t maxParallelReduceRunnerMode = 9;
+
+    template <std::size_t Mode>
+    class ParallelReduceRunner {
+        tbb::task_group_context& my_ctx;
+
+        static_assert(Mode >= 0 && Mode <= maxParallelReduceRunnerMode,
+                      "Incorrect mode for ParallelReduceTask");
+
+        template <typename... Args>
+        void run_parallel_reduce(Args&&... args) const {
+            switch (Mode % 5) {
+                case 0: {
+                    tbb::parallel_reduce(std::forward<Args>(args)..., my_ctx);
+                    break;
+                }
+                case 1: {
+                    tbb::parallel_reduce(std::forward<Args>(args)..., tbb::simple_partitioner {}, my_ctx);
+                    break;
+                }
+                case 2: {
+                    tbb::parallel_reduce(std::forward<Args>(args)..., tbb::auto_partitioner {}, my_ctx);
+                    break;
+                }
+                case 3: {
+                    tbb::parallel_reduce(std::forward<Args>(args)..., tbb::static_partitioner {}, my_ctx);
+                    break;
+                }
+                case 4: {
+                    tbb::affinity_partitioner aff;
+                    tbb::parallel_reduce(std::forward<Args>(args)..., aff, my_ctx);
+                    break;
+                }
+            }
         }
-    }
-}; // class ParallelReduceRunner
-
-static constexpr std::size_t maxParallelDeterministicReduceRunnerMode = 5;
-
-// TODO: unify with ParallelReduceRunner
-template <std::size_t Mode>
-class ParallelDeterministicReduceRunner {
-    tbb::task_group_context& my_ctx;
 
-    static_assert(Mode >= 0 && Mode <= maxParallelDeterministicReduceRunnerMode, "Incorrect Mode for deterministic_reduce task");
+    public:
+        ParallelReduceRunner(tbb::task_group_context& ctx) : my_ctx(ctx) {}
 
-    template <typename... Args>
-    void run_parallel_deterministic_reduce( Args&&... args ) const {
-        switch(Mode % 3) {
-            case 0 : {
-                tbb::parallel_deterministic_reduce(std::forward<Args>(args)..., my_ctx);
-                break;
+        void operator()() const {
+            tbb::blocked_range<std::size_t> br(0, buffer_test_size);
+            if (Mode < 5) {
+                ReduceFunctorToCancel functor;
+                run_parallel_reduce(br, functor);
+            } else {
+                run_parallel_reduce(br, std::size_t(0), ReduceToCancel {}, JoinToCancel {});
             }
-            case 1 : {
-                tbb::parallel_deterministic_reduce(std::forward<Args>(args)..., tbb::simple_partitioner{}, my_ctx);
-                break;
-            }
-            case 2 : {
-                tbb::parallel_deterministic_reduce(std::forward<Args>(args)..., tbb::static_partitioner{}, my_ctx);
-                break;
+        }
+    };// class ParallelReduceRunner
+
+    static constexpr std::size_t maxParallelDeterministicReduceRunnerMode = 5;
+
+    // TODO: unify with ParallelReduceRunner
+    template <std::size_t Mode>
+    class ParallelDeterministicReduceRunner {
+        tbb::task_group_context& my_ctx;
+
+        static_assert(Mode >= 0 && Mode <= maxParallelDeterministicReduceRunnerMode,
+                      "Incorrect Mode for deterministic_reduce task");
+
+        template <typename... Args>
+        void run_parallel_deterministic_reduce(Args&&... args) const {
+            switch (Mode % 3) {
+                case 0: {
+                    tbb::parallel_deterministic_reduce(std::forward<Args>(args)..., my_ctx);
+                    break;
+                }
+                case 1: {
+                    tbb::parallel_deterministic_reduce(std::forward<Args>(args)...,
+                                                       tbb::simple_partitioner {}, my_ctx);
+                    break;
+                }
+                case 2: {
+                    tbb::parallel_deterministic_reduce(std::forward<Args>(args)...,
+                                                       tbb::static_partitioner {}, my_ctx);
+                    break;
+                }
             }
         }
-    }
 
-public:
-    ParallelDeterministicReduceRunner( tbb::task_group_context& ctx )
-        : my_ctx(ctx) {}
-
-    void operator()() const {
-        tbb::blocked_range<std::size_t> br(0, buffer_test_size);
-        if (Mode < 3) {
-            ReduceFunctorToCancel functor;
-            run_parallel_deterministic_reduce(br, functor);
-        } else {
-            run_parallel_deterministic_reduce(br, std::size_t(0), ReduceToCancel{}, JoinToCancel{});
+    public:
+        ParallelDeterministicReduceRunner(tbb::task_group_context& ctx) : my_ctx(ctx) {}
+
+        void operator()() const {
+            tbb::blocked_range<std::size_t> br(0, buffer_test_size);
+            if (Mode < 3) {
+                ReduceFunctorToCancel functor;
+                run_parallel_deterministic_reduce(br, functor);
+            } else {
+                run_parallel_deterministic_reduce(br, std::size_t(0), ReduceToCancel {}, JoinToCancel {});
+            }
         }
-    }
-}; // class ParallelDeterministicReduceRunner
+    };// class ParallelDeterministicReduceRunner
 
-template <std::size_t Mode>
-void run_parallel_reduce_cancellation_test() {
-    for ( auto concurrency_level : utils::concurrency_range() ) {
-        if (concurrency_level < 2) continue;
+    template <std::size_t Mode>
+    void run_parallel_reduce_cancellation_test() {
+        for (auto concurrency_level : utils::concurrency_range()) {
+            if (concurrency_level < 2) continue;
 
-        tbb::global_control gc(tbb::global_control::max_allowed_parallelism, concurrency_level);
-        ResetEhGlobals();
-        RunCancellationTest<ParallelReduceRunner<Mode>, Cancellator>();
+            tbb::global_control gc(tbb::global_control::max_allowed_parallelism, concurrency_level);
+            ResetEhGlobals();
+            RunCancellationTest<ParallelReduceRunner<Mode>, Cancellator>();
+        }
     }
-}
 
-template <std::size_t Mode>
-void run_parallel_deterministic_reduce_cancellation_test() {
-    for ( auto concurrency_level : utils::concurrency_range() ) {
-        if (concurrency_level < 2) continue;
-
-        tbb::global_control gc(tbb::global_control::max_allowed_parallelism, concurrency_level);
-        ResetEhGlobals();
-        RunCancellationTest<ParallelDeterministicReduceRunner<Mode>, Cancellator>();
-    }
-}
+    template <std::size_t Mode>
+    void run_parallel_deterministic_reduce_cancellation_test() {
+        for (auto concurrency_level : utils::concurrency_range()) {
+            if (concurrency_level < 2) continue;
 
-template <std::size_t Mode>
-struct ParallelReduceTestRunner {
-    static void run() {
-        run_parallel_reduce_cancellation_test<Mode>();
-        ParallelReduceTestRunner<Mode + 1>::run();
-    }
-}; // struct ParallelReduceTestRunner
-
-template <>
-struct ParallelReduceTestRunner<maxParallelReduceRunnerMode> {
-    static void run() {
-        run_parallel_reduce_cancellation_test<maxParallelReduceRunnerMode>();
+            tbb::global_control gc(tbb::global_control::max_allowed_parallelism, concurrency_level);
+            ResetEhGlobals();
+            RunCancellationTest<ParallelDeterministicReduceRunner<Mode>, Cancellator>();
+        }
     }
-}; // struct ParallelReduceTestRunner<maxParallelReduceRunnerMode>
 
-template <std::size_t Mode>
-struct ParallelDeterministicReduceTestRunner {
-    static void run() {
-        run_parallel_deterministic_reduce_cancellation_test<Mode>();
-        ParallelDeterministicReduceTestRunner<Mode + 1>::run();
-    }
-}; // struct ParallelDeterministicReduceTestRunner
+    template <std::size_t Mode>
+    struct ParallelReduceTestRunner {
+        static void run() {
+            run_parallel_reduce_cancellation_test<Mode>();
+            ParallelReduceTestRunner<Mode + 1>::run();
+        }
+    };// struct ParallelReduceTestRunner
+
+    template <>
+    struct ParallelReduceTestRunner<maxParallelReduceRunnerMode> {
+        static void run() { run_parallel_reduce_cancellation_test<maxParallelReduceRunnerMode>(); }
+    };// struct ParallelReduceTestRunner<maxParallelReduceRunnerMode>
+
+    template <std::size_t Mode>
+    struct ParallelDeterministicReduceTestRunner {
+        static void run() {
+            run_parallel_deterministic_reduce_cancellation_test<Mode>();
+            ParallelDeterministicReduceTestRunner<Mode + 1>::run();
+        }
+    };// struct ParallelDeterministicReduceTestRunner
 
-template <>
-struct ParallelDeterministicReduceTestRunner<maxParallelDeterministicReduceRunnerMode> {
-    static void run() {
-        run_parallel_deterministic_reduce_cancellation_test<maxParallelDeterministicReduceRunnerMode>();
-    }
-}; // struct ParallelDeterministicReduceTestRunner<maxParallelDeterministicReduceRunnerMode>
+    template <>
+    struct ParallelDeterministicReduceTestRunner<maxParallelDeterministicReduceRunnerMode> {
+        static void run() {
+            run_parallel_deterministic_reduce_cancellation_test<maxParallelDeterministicReduceRunnerMode>();
+        }
+    };// struct ParallelDeterministicReduceTestRunner<maxParallelDeterministicReduceRunnerMode>
 
-} // namespace test_cancellation
+}// namespace test_cancellation
 
 #if __TBB_CPP20_CONCEPTS_PRESENT
 template <typename... Args>
-concept can_call_parallel_reduce_basic = requires( Args&&... args ) {
+concept can_call_parallel_reduce_basic = requires(Args&&... args) {
     tbb::parallel_reduce(std::forward<Args>(args)...);
 };
 
 template <typename... Args>
-concept can_call_parallel_deterministic_reduce_basic = requires ( Args&&... args ) {
+concept can_call_parallel_deterministic_reduce_basic = requires(Args&&... args) {
     tbb::parallel_deterministic_reduce(std::forward<Args>(args)...);
 };
 
 template <typename... Args>
-concept can_call_preduce_helper = can_call_parallel_reduce_basic<Args...> &&
-                                  can_call_parallel_reduce_basic<Args..., tbb::task_group_context&>;
+concept can_call_preduce_helper = can_call_parallel_reduce_basic<Args...>&&
+        can_call_parallel_reduce_basic<Args..., tbb::task_group_context&>;
 
 template <typename... Args>
-concept can_call_pdet_reduce_helper = can_call_parallel_deterministic_reduce_basic<Args...> &&
-                                      can_call_parallel_deterministic_reduce_basic<Args..., tbb::task_group_context&>;
+concept can_call_pdet_reduce_helper = can_call_parallel_deterministic_reduce_basic<Args...>&&
+        can_call_parallel_deterministic_reduce_basic<Args..., tbb::task_group_context&>;
 
 template <typename... Args>
-concept can_call_preduce_with_partitioner = can_call_preduce_helper<Args...> &&
-                                            can_call_preduce_helper<Args..., const tbb::simple_partitioner&> &&
-                                            can_call_preduce_helper<Args..., const tbb::auto_partitioner&> &&
-                                            can_call_preduce_helper<Args..., const tbb::static_partitioner&> &&
-                                            can_call_preduce_helper<Args..., tbb::affinity_partitioner&>;
+concept can_call_preduce_with_partitioner = can_call_preduce_helper<Args...>&&
+        can_call_preduce_helper<Args..., const tbb::simple_partitioner&>&&
+                can_call_preduce_helper<Args..., const tbb::auto_partitioner&>&&
+                        can_call_preduce_helper<Args..., const tbb::static_partitioner&>&&
+                                can_call_preduce_helper<Args..., tbb::affinity_partitioner&>;
 
 template <typename... Args>
-concept can_call_pdet_reduce_with_partitioner = can_call_pdet_reduce_helper<Args...> &&
-                                                can_call_pdet_reduce_helper<Args..., const tbb::simple_partitioner&> &&
-                                                can_call_pdet_reduce_helper<Args..., const tbb::static_partitioner&>;
+concept can_call_pdet_reduce_with_partitioner = can_call_pdet_reduce_helper<Args...>&&
+        can_call_pdet_reduce_helper<Args..., const tbb::simple_partitioner&>&&
+                can_call_pdet_reduce_helper<Args..., const tbb::static_partitioner&>;
 
 template <typename Range, typename Body>
 concept can_call_imperative_preduce = can_call_preduce_with_partitioner<const Range&, Body&>;
@@ -303,12 +296,13 @@ template <typename Range, typename Body>
 concept can_call_imperative_pdet_reduce = can_call_pdet_reduce_with_partitioner<const Range&, Body&>;
 
 template <typename Range, typename Value, typename RealBody, typename Reduction>
-concept can_call_functional_preduce = can_call_preduce_with_partitioner<const Range&, const Value&,
-                                                                        const RealBody&, const Reduction&>;
+concept can_call_functional_preduce
+        = can_call_preduce_with_partitioner<const Range&, const Value&, const RealBody&, const Reduction&>;
 
 template <typename Range, typename Value, typename RealBody, typename Reduction>
-concept can_call_functional_pdet_reduce = can_call_pdet_reduce_with_partitioner<const Range&, const Value&,
-                                                                                const RealBody&, const Reduction&>;
+concept can_call_functional_pdet_reduce
+        = can_call_pdet_reduce_with_partitioner<const Range&, const Value&, const RealBody&,
+                                                const Reduction&>;
 
 template <typename Range>
 using CorrectBody = test_concepts::parallel_reduce_body::Correct<Range>;
@@ -334,14 +328,21 @@ void test_preduce_range_constraints() {
 
     static_assert(can_call_functional_preduce<Correct, int, CorrectFunc<Correct>, CorrectReduction>);
     static_assert(!can_call_functional_preduce<NonCopyable, int, CorrectFunc<NonCopyable>, CorrectReduction>);
-    static_assert(!can_call_functional_preduce<NonDestructible, int, CorrectFunc<NonDestructible>, CorrectReduction>);
-    static_assert(!can_call_functional_preduce<NonSplittable, int, CorrectFunc<NonSplittable>, CorrectReduction>);
+    static_assert(!can_call_functional_preduce<NonDestructible, int, CorrectFunc<NonDestructible>,
+                                               CorrectReduction>);
+    static_assert(
+            !can_call_functional_preduce<NonSplittable, int, CorrectFunc<NonSplittable>, CorrectReduction>);
     static_assert(!can_call_functional_preduce<NoEmpty, int, CorrectFunc<NoEmpty>, CorrectReduction>);
-    static_assert(!can_call_functional_preduce<EmptyNonConst, int, CorrectFunc<EmptyNonConst>, CorrectReduction>);
-    static_assert(!can_call_functional_preduce<WrongReturnEmpty, int, CorrectFunc<WrongReturnEmpty>, CorrectReduction>);
-    static_assert(!can_call_functional_preduce<NoIsDivisible, int, CorrectFunc<NoIsDivisible>, CorrectReduction>);
-    static_assert(!can_call_functional_preduce<IsDivisibleNonConst, int, CorrectFunc<IsDivisibleNonConst>, CorrectReduction>);
-    static_assert(!can_call_functional_preduce<WrongReturnIsDivisible, int, CorrectFunc<WrongReturnIsDivisible>, CorrectReduction>);
+    static_assert(
+            !can_call_functional_preduce<EmptyNonConst, int, CorrectFunc<EmptyNonConst>, CorrectReduction>);
+    static_assert(!can_call_functional_preduce<WrongReturnEmpty, int, CorrectFunc<WrongReturnEmpty>,
+                                               CorrectReduction>);
+    static_assert(
+            !can_call_functional_preduce<NoIsDivisible, int, CorrectFunc<NoIsDivisible>, CorrectReduction>);
+    static_assert(!can_call_functional_preduce<IsDivisibleNonConst, int, CorrectFunc<IsDivisibleNonConst>,
+                                               CorrectReduction>);
+    static_assert(!can_call_functional_preduce<WrongReturnIsDivisible, int,
+                                               CorrectFunc<WrongReturnIsDivisible>, CorrectReduction>);
 }
 
 void test_preduce_body_constraints() {
@@ -358,21 +359,32 @@ void test_preduce_body_constraints() {
 void test_preduce_func_constraints() {
     using namespace test_concepts::parallel_reduce_function;
     static_assert(can_call_functional_preduce<CorrectRange, int, Correct<CorrectRange>, CorrectReduction>);
-    static_assert(!can_call_functional_preduce<CorrectRange, int, NoOperatorRoundBrackets<CorrectRange>, CorrectReduction>);
-    static_assert(!can_call_functional_preduce<CorrectRange, int, OperatorRoundBracketsNonConst<CorrectRange>, CorrectReduction>);
-    static_assert(!can_call_functional_preduce<CorrectRange, int, WrongFirstInputOperatorRoundBrackets<CorrectRange>, CorrectReduction>);
-    static_assert(!can_call_functional_preduce<CorrectRange, int, WrongSecondInputOperatorRoundBrackets<CorrectRange>, CorrectReduction>);
-    static_assert(!can_call_functional_preduce<CorrectRange, int, WrongReturnOperatorRoundBrackets<CorrectRange>, CorrectReduction>);
+    static_assert(!can_call_functional_preduce<CorrectRange, int, NoOperatorRoundBrackets<CorrectRange>,
+                                               CorrectReduction>);
+    static_assert(!can_call_functional_preduce<CorrectRange, int, OperatorRoundBracketsNonConst<CorrectRange>,
+                                               CorrectReduction>);
+    static_assert(!can_call_functional_preduce<
+                  CorrectRange, int, WrongFirstInputOperatorRoundBrackets<CorrectRange>, CorrectReduction>);
+    static_assert(!can_call_functional_preduce<
+                  CorrectRange, int, WrongSecondInputOperatorRoundBrackets<CorrectRange>, CorrectReduction>);
+    static_assert(
+            !can_call_functional_preduce<CorrectRange, int, WrongReturnOperatorRoundBrackets<CorrectRange>,
+                                         CorrectReduction>);
 }
 
 void test_preduce_combine_constraints() {
     using namespace test_concepts::parallel_reduce_combine;
     static_assert(can_call_functional_preduce<CorrectRange, int, CorrectFunc<CorrectRange>, Correct<int>>);
-    static_assert(!can_call_functional_preduce<CorrectRange, int, CorrectFunc<CorrectRange>, NoOperatorRoundBrackets<int>>);
-    static_assert(!can_call_functional_preduce<CorrectRange, int, CorrectFunc<CorrectRange>, OperatorRoundBracketsNonConst<int>>);
-    static_assert(!can_call_functional_preduce<CorrectRange, int, CorrectFunc<CorrectRange>, WrongFirstInputOperatorRoundBrackets<int>>);
-    static_assert(!can_call_functional_preduce<CorrectRange, int, CorrectFunc<CorrectRange>, WrongSecondInputOperatorRoundBrackets<int>>);
-    static_assert(!can_call_functional_preduce<CorrectRange, int, CorrectFunc<CorrectRange>, WrongReturnOperatorRoundBrackets<int>>);
+    static_assert(!can_call_functional_preduce<CorrectRange, int, CorrectFunc<CorrectRange>,
+                                               NoOperatorRoundBrackets<int>>);
+    static_assert(!can_call_functional_preduce<CorrectRange, int, CorrectFunc<CorrectRange>,
+                                               OperatorRoundBracketsNonConst<int>>);
+    static_assert(!can_call_functional_preduce<CorrectRange, int, CorrectFunc<CorrectRange>,
+                                               WrongFirstInputOperatorRoundBrackets<int>>);
+    static_assert(!can_call_functional_preduce<CorrectRange, int, CorrectFunc<CorrectRange>,
+                                               WrongSecondInputOperatorRoundBrackets<int>>);
+    static_assert(!can_call_functional_preduce<CorrectRange, int, CorrectFunc<CorrectRange>,
+                                               WrongReturnOperatorRoundBrackets<int>>);
 }
 
 void test_pdet_reduce_range_constraints() {
@@ -386,18 +398,27 @@ void test_pdet_reduce_range_constraints() {
     static_assert(!can_call_imperative_pdet_reduce<WrongReturnEmpty, CorrectBody<WrongReturnEmpty>>);
     static_assert(!can_call_imperative_pdet_reduce<NoIsDivisible, CorrectBody<NoIsDivisible>>);
     static_assert(!can_call_imperative_pdet_reduce<IsDivisibleNonConst, CorrectBody<NoIsDivisible>>);
-    static_assert(!can_call_imperative_pdet_reduce<WrongReturnIsDivisible, CorrectBody<WrongReturnIsDivisible>>);
+    static_assert(
+            !can_call_imperative_pdet_reduce<WrongReturnIsDivisible, CorrectBody<WrongReturnIsDivisible>>);
 
     static_assert(can_call_functional_pdet_reduce<Correct, int, CorrectFunc<Correct>, CorrectReduction>);
-    static_assert(!can_call_functional_pdet_reduce<NonCopyable, int, CorrectFunc<NonCopyable>, CorrectReduction>);
-    static_assert(!can_call_functional_pdet_reduce<NonDestructible, int, CorrectFunc<NonDestructible>, CorrectReduction>);
-    static_assert(!can_call_functional_pdet_reduce<NonSplittable, int, CorrectFunc<NonSplittable>, CorrectReduction>);
+    static_assert(
+            !can_call_functional_pdet_reduce<NonCopyable, int, CorrectFunc<NonCopyable>, CorrectReduction>);
+    static_assert(!can_call_functional_pdet_reduce<NonDestructible, int, CorrectFunc<NonDestructible>,
+                                                   CorrectReduction>);
+    static_assert(!can_call_functional_pdet_reduce<NonSplittable, int, CorrectFunc<NonSplittable>,
+                                                   CorrectReduction>);
     static_assert(!can_call_functional_pdet_reduce<NoEmpty, int, CorrectFunc<NoEmpty>, CorrectReduction>);
-    static_assert(!can_call_functional_pdet_reduce<EmptyNonConst, int, CorrectFunc<EmptyNonConst>, CorrectReduction>);
-    static_assert(!can_call_functional_pdet_reduce<WrongReturnEmpty, int, CorrectFunc<WrongReturnEmpty>, CorrectReduction>);
-    static_assert(!can_call_functional_pdet_reduce<NoIsDivisible, int, CorrectFunc<NoIsDivisible>, CorrectReduction>);
-    static_assert(!can_call_functional_pdet_reduce<IsDivisibleNonConst, int, CorrectFunc<IsDivisibleNonConst>, CorrectReduction>);
-    static_assert(!can_call_functional_pdet_reduce<WrongReturnIsDivisible, int, CorrectFunc<WrongReturnIsDivisible>, CorrectReduction>);
+    static_assert(!can_call_functional_pdet_reduce<EmptyNonConst, int, CorrectFunc<EmptyNonConst>,
+                                                   CorrectReduction>);
+    static_assert(!can_call_functional_pdet_reduce<WrongReturnEmpty, int, CorrectFunc<WrongReturnEmpty>,
+                                                   CorrectReduction>);
+    static_assert(!can_call_functional_pdet_reduce<NoIsDivisible, int, CorrectFunc<NoIsDivisible>,
+                                                   CorrectReduction>);
+    static_assert(!can_call_functional_pdet_reduce<IsDivisibleNonConst, int, CorrectFunc<IsDivisibleNonConst>,
+                                                   CorrectReduction>);
+    static_assert(!can_call_functional_pdet_reduce<WrongReturnIsDivisible, int,
+                                                   CorrectFunc<WrongReturnIsDivisible>, CorrectReduction>);
 }
 
 void test_pdet_reduce_body_constraints() {
@@ -406,31 +427,45 @@ void test_pdet_reduce_body_constraints() {
     static_assert(!can_call_imperative_pdet_reduce<CorrectRange, NonSplittable<CorrectRange>>);
     static_assert(!can_call_imperative_pdet_reduce<CorrectRange, NonDestructible<CorrectRange>>);
     static_assert(!can_call_imperative_pdet_reduce<CorrectRange, NoOperatorRoundBrackets<CorrectRange>>);
-    static_assert(!can_call_imperative_pdet_reduce<CorrectRange, WrongInputOperatorRoundBrackets<CorrectRange>>);
+    static_assert(
+            !can_call_imperative_pdet_reduce<CorrectRange, WrongInputOperatorRoundBrackets<CorrectRange>>);
     static_assert(!can_call_imperative_pdet_reduce<CorrectRange, NoJoin<CorrectRange>>);
     static_assert(!can_call_imperative_pdet_reduce<CorrectRange, WrongInputJoin<CorrectRange>>);
 }
 
 void test_pdet_reduce_func_constraints() {
     using namespace test_concepts::parallel_reduce_function;
-    static_assert(can_call_functional_pdet_reduce<CorrectRange, int, Correct<CorrectRange>, CorrectReduction>);
-    static_assert(!can_call_functional_pdet_reduce<CorrectRange, int, NoOperatorRoundBrackets<CorrectRange>, CorrectReduction>);
-    static_assert(!can_call_functional_pdet_reduce<CorrectRange, int, OperatorRoundBracketsNonConst<CorrectRange>, CorrectReduction>);
-    static_assert(!can_call_functional_pdet_reduce<CorrectRange, int, WrongFirstInputOperatorRoundBrackets<CorrectRange>, CorrectReduction>);
-    static_assert(!can_call_functional_pdet_reduce<CorrectRange, int, WrongSecondInputOperatorRoundBrackets<CorrectRange>, CorrectReduction>);
-    static_assert(!can_call_functional_pdet_reduce<CorrectRange, int, WrongReturnOperatorRoundBrackets<CorrectRange>, CorrectReduction>);
+    static_assert(
+            can_call_functional_pdet_reduce<CorrectRange, int, Correct<CorrectRange>, CorrectReduction>);
+    static_assert(!can_call_functional_pdet_reduce<CorrectRange, int, NoOperatorRoundBrackets<CorrectRange>,
+                                                   CorrectReduction>);
+    static_assert(
+            !can_call_functional_pdet_reduce<CorrectRange, int, OperatorRoundBracketsNonConst<CorrectRange>,
+                                             CorrectReduction>);
+    static_assert(!can_call_functional_pdet_reduce<
+                  CorrectRange, int, WrongFirstInputOperatorRoundBrackets<CorrectRange>, CorrectReduction>);
+    static_assert(!can_call_functional_pdet_reduce<
+                  CorrectRange, int, WrongSecondInputOperatorRoundBrackets<CorrectRange>, CorrectReduction>);
+    static_assert(!can_call_functional_pdet_reduce<
+                  CorrectRange, int, WrongReturnOperatorRoundBrackets<CorrectRange>, CorrectReduction>);
 }
 
 void test_pdet_reduce_combine_constraints() {
     using namespace test_concepts::parallel_reduce_combine;
-    static_assert(can_call_functional_pdet_reduce<CorrectRange, int, CorrectFunc<CorrectRange>, Correct<int>>);
-    static_assert(!can_call_functional_pdet_reduce<CorrectRange, int, CorrectFunc<CorrectRange>, NoOperatorRoundBrackets<int>>);
-    static_assert(!can_call_functional_pdet_reduce<CorrectRange, int, CorrectFunc<CorrectRange>, OperatorRoundBracketsNonConst<int>>);
-    static_assert(!can_call_functional_pdet_reduce<CorrectRange, int, CorrectFunc<CorrectRange>, WrongFirstInputOperatorRoundBrackets<int>>);
-    static_assert(!can_call_functional_pdet_reduce<CorrectRange, int, CorrectFunc<CorrectRange>, WrongSecondInputOperatorRoundBrackets<int>>);
-    static_assert(!can_call_functional_pdet_reduce<CorrectRange, int, CorrectFunc<CorrectRange>, WrongReturnOperatorRoundBrackets<int>>);
+    static_assert(
+            can_call_functional_pdet_reduce<CorrectRange, int, CorrectFunc<CorrectRange>, Correct<int>>);
+    static_assert(!can_call_functional_pdet_reduce<CorrectRange, int, CorrectFunc<CorrectRange>,
+                                                   NoOperatorRoundBrackets<int>>);
+    static_assert(!can_call_functional_pdet_reduce<CorrectRange, int, CorrectFunc<CorrectRange>,
+                                                   OperatorRoundBracketsNonConst<int>>);
+    static_assert(!can_call_functional_pdet_reduce<CorrectRange, int, CorrectFunc<CorrectRange>,
+                                                   WrongFirstInputOperatorRoundBrackets<int>>);
+    static_assert(!can_call_functional_pdet_reduce<CorrectRange, int, CorrectFunc<CorrectRange>,
+                                                   WrongSecondInputOperatorRoundBrackets<int>>);
+    static_assert(!can_call_functional_pdet_reduce<CorrectRange, int, CorrectFunc<CorrectRange>,
+                                                   WrongReturnOperatorRoundBrackets<int>>);
 }
-#endif // __TBB_CPP20_CONCEPTS_PRESENT
+#endif// __TBB_CPP20_CONCEPTS_PRESENT
 
 //! Test parallel summation correctness
 //! \brief \ref stress
@@ -450,22 +485,23 @@ static std::atomic<long> FooBodyCount;
 class MinimalRange {
     size_t begin, end;
     friend class FooBody;
-    explicit MinimalRange( size_t i ) : begin(0), end(i) {}
-    template <typename Partitioner_> friend void TestSplitting( std::size_t nthread );
+    explicit MinimalRange(size_t i) : begin(0), end(i) {}
+    template <typename Partitioner_>
+    friend void TestSplitting(std::size_t nthread);
+
 public:
-    MinimalRange( MinimalRange& r, tbb::split ) : end(r.end) {
-        begin = r.end = (r.begin+r.end)/2;
-    }
-    bool is_divisible() const {return end-begin>=2;}
-    bool empty() const {return begin==end;}
+    MinimalRange(MinimalRange& r, tbb::split) : end(r.end) { begin = r.end = (r.begin + r.end) / 2; }
+    bool is_divisible() const { return end - begin >= 2; }
+    bool empty() const { return begin == end; }
 };
 
 //! Class with public interface that is exactly minimal requirements for Body of a parallel_reduce
 class FooBody {
 private:
-    FooBody( const FooBody& );          // Deny access
-    void operator=( const FooBody& );   // Deny access
-    template <typename Partitioner_> friend void TestSplitting( std::size_t nthread );
+    FooBody(const FooBody&);       // Deny access
+    void operator=(const FooBody&);// Deny access
+    template <typename Partitioner_>
+    friend void TestSplitting(std::size_t nthread);
     //! Parent that created this body via split operation.  nullptr if original body.
     FooBody* parent;
     //! Total number of index values processed by body and its children.
@@ -476,14 +512,15 @@ class FooBody {
     bool is_new;
     //! 1 if body was created by split; 0 if original body.
     int forked;
-    FooBody() {++FooBodyCount;}
+    FooBody() { ++FooBodyCount; }
+
 public:
     ~FooBody() {
         forked = 0xDEADBEEF;
-        sum=0xDEADBEEF;
+        sum = 0xDEADBEEF;
         --FooBodyCount;
     }
-    FooBody( FooBody& other, tbb::split ) {
+    FooBody(FooBody& other, tbb::split) {
         ++FooBodyCount;
         ++ForkCount;
         sum = 0;
@@ -501,50 +538,49 @@ class FooBody {
         end = ~size_t(0);
     }
 
-    void join( FooBody& s ) {
-        REQUIRE( s.forked==1 );
-        REQUIRE( this!=&s );
-        REQUIRE( this==s.parent );
-        REQUIRE( end==s.begin );
+    void join(FooBody& s) {
+        REQUIRE(s.forked == 1);
+        REQUIRE(this != &s);
+        REQUIRE(this == s.parent);
+        REQUIRE(end == s.begin);
         end = s.end;
         sum += s.sum;
         s.forked = 2;
     }
-    void operator()( const MinimalRange& r ) {
-        for( size_t k=r.begin; k<r.end; ++k )
-            ++sum;
-        if( is_new ) {
+    void operator()(const MinimalRange& r) {
+        for (size_t k = r.begin; k < r.end; ++k) ++sum;
+        if (is_new) {
             is_new = false;
             begin = r.begin;
         } else
-            REQUIRE( end==r.begin );
+            REQUIRE(end == r.begin);
         end = r.end;
     }
 };
 
-template<typename Partitioner>
-void TestSplitting( std::size_t nthread ) {
+template <typename Partitioner>
+void TestSplitting(std::size_t nthread) {
     ForkCount = 0;
     Partitioner partitioner;
-    for( size_t i=0; i<=1000; ++i ) {
+    for (size_t i = 0; i <= 1000; ++i) {
         FooBody f;
         f.init();
-        REQUIRE_MESSAGE( FooBodyCount==1, "Wrong initial BodyCount value" );
+        REQUIRE_MESSAGE(FooBodyCount == 1, "Wrong initial BodyCount value");
         reduce_invoker(MinimalRange(i), f, partitioner);
 
-        if (nthread == 1) REQUIRE_MESSAGE(ForkCount==0, "Body was split during 1 thread execution");
+        if (nthread == 1) REQUIRE_MESSAGE(ForkCount == 0, "Body was split during 1 thread execution");
 
-        REQUIRE_MESSAGE( FooBodyCount==1, "Some copies of FooBody was not removed after reduction");
-        REQUIRE_MESSAGE( f.sum==i, "Incorrect reduction" );
-        REQUIRE_MESSAGE( f.begin==(i==0 ? ~size_t(0) : 0), "Incorrect range borders" );
-        REQUIRE_MESSAGE( f.end==(i==0 ? ~size_t(0) : i), "Incorrect range borders" );
+        REQUIRE_MESSAGE(FooBodyCount == 1, "Some copies of FooBody was not removed after reduction");
+        REQUIRE_MESSAGE(f.sum == i, "Incorrect reduction");
+        REQUIRE_MESSAGE(f.begin == (i == 0 ? ~size_t(0) : 0), "Incorrect range borders");
+        REQUIRE_MESSAGE(f.end == (i == 0 ? ~size_t(0) : i), "Incorrect range borders");
     }
 }
 
 //! Test splitting range and body during reduction, test that all workers sleep when no work
 //! \brief \ref resource_usage \ref error_guessing
 TEST_CASE("Test splitting range and body during reduction, test that all workers sleep when no work") {
-    for ( auto concurrency_level : utils::concurrency_range() ) {
+    for (auto concurrency_level : utils::concurrency_range()) {
         tbb::global_control control(tbb::global_control::max_allowed_parallelism, concurrency_level);
 
         TestSplitting<tbb::simple_partitioner>(concurrency_level);
@@ -560,20 +596,22 @@ TEST_CASE("Test splitting range and body during reduction, test that all workers
 
 //! Define overloads of parallel_deterministic_reduce that accept "undesired" types of partitioners
 namespace unsupported {
-    template<typename Range, typename Body>
-    void parallel_deterministic_reduce(const Range&, Body&, const tbb::auto_partitioner&) { }
-    template<typename Range, typename Body>
-    void parallel_deterministic_reduce(const Range&, Body&, tbb::affinity_partitioner&) { }
-
-    template<typename Range, typename Value, typename RealBody, typename Reduction>
-    Value parallel_deterministic_reduce(const Range& , const Value& identity, const RealBody& , const Reduction& , const tbb::auto_partitioner&) {
+    template <typename Range, typename Body>
+    void parallel_deterministic_reduce(const Range&, Body&, const tbb::auto_partitioner&) {}
+    template <typename Range, typename Body>
+    void parallel_deterministic_reduce(const Range&, Body&, tbb::affinity_partitioner&) {}
+
+    template <typename Range, typename Value, typename RealBody, typename Reduction>
+    Value parallel_deterministic_reduce(const Range&, const Value& identity, const RealBody&,
+                                        const Reduction&, const tbb::auto_partitioner&) {
         return identity;
     }
-    template<typename Range, typename Value, typename RealBody, typename Reduction>
-    Value parallel_deterministic_reduce(const Range& , const Value& identity, const RealBody& , const Reduction& , tbb::affinity_partitioner&) {
+    template <typename Range, typename Value, typename RealBody, typename Reduction>
+    Value parallel_deterministic_reduce(const Range&, const Value& identity, const RealBody&,
+                                        const Reduction&, tbb::affinity_partitioner&) {
         return identity;
     }
-}
+}// namespace unsupported
 
 struct Body {
     float value;
@@ -597,39 +635,23 @@ TEST_CASE("Test Unsupported Partitioners") {
     parallel_deterministic_reduce(blocked_range<int>(0, 10), body, ap);
 
     parallel_deterministic_reduce(
-        blocked_range<int>(0, 10),
-        0,
-        [](const blocked_range<int>&, int init)->int {
-            return init;
-        },
-        [](int x, int y)->int {
-            return x + y;
-        },
-        tbb::auto_partitioner()
-    );
+            blocked_range<int>(0, 10), 0, [](const blocked_range<int>&, int init) -> int { return init; },
+            [](int x, int y) -> int { return x + y; }, tbb::auto_partitioner());
     parallel_deterministic_reduce(
-        blocked_range<int>(0, 10),
-        0,
-        [](const blocked_range<int>&, int init)->int {
-            return init;
-        },
-        [](int x, int y)->int {
-            return x + y;
-        },
-        ap
-    );
+            blocked_range<int>(0, 10), 0, [](const blocked_range<int>&, int init) -> int { return init; },
+            [](int x, int y) -> int { return x + y; }, ap);
 }
 
 //! Testing tbb::parallel_reduce with tbb::task_group_context
 //! \brief \ref interface \ref error_guessing
 TEST_CASE("cancellation test for tbb::parallel_reduce") {
-    test_cancellation::ParallelReduceTestRunner</*First mode = */0>::run();
+    test_cancellation::ParallelReduceTestRunner</*First mode = */ 0>::run();
 }
 
 //! Testing tbb::parallel_deterministic_reduce with tbb::task_group_context
 //! \brief \ref interface \ref error_guessing
 TEST_CASE("cancellation test for tbb::parallel_deterministic_reduce") {
-    test_cancellation::ParallelDeterministicReduceTestRunner</*First mode = */0>::run();
+    test_cancellation::ParallelDeterministicReduceTestRunner</*First mode = */ 0>::run();
 }
 
 #if __TBB_CPP20_CONCEPTS_PRESENT
@@ -651,5 +673,5 @@ TEST_CASE("parallel_deterministic_reduce constraints") {
 #endif
 
 #if _MSC_VER
-#pragma warning (pop)
+#pragma warning(pop)
 #endif
diff --git a/external/tbb/test/tbb/test_parallel_scan.cpp b/external/tbb/test/tbb/test_parallel_scan.cpp
index f21b8912..bcff8017 100644
--- a/external/tbb/test/tbb/test_parallel_scan.cpp
+++ b/external/tbb/test/tbb/test_parallel_scan.cpp
@@ -15,21 +15,21 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
 #endif
 
-#include "common/test.h"
+#include "common/concepts_common.h"
 #include "common/config.h"
-#include "common/utils_concurrency_limit.h"
 #include "common/cpu_usertime.h"
-#include "common/concepts_common.h"
+#include "common/test.h"
+#include "common/utils_concurrency_limit.h"
 
+#include "tbb/blocked_range.h"
 #include "tbb/global_control.h"
 #include "tbb/parallel_scan.h"
-#include "tbb/blocked_range.h"
 #include "tbb/tick_count.h"
-#include <vector>
 #include <atomic>
+#include <vector>
 
 //! \file test_parallel_scan.cpp
 //! \brief Test for [algorithms.parallel_scan] specification
@@ -39,24 +39,19 @@ using Range = tbb::blocked_range<long>;
 static volatile bool ScanIsRunning = false;
 
 //! Sum of 0..i with wrap around on overflow.
-inline int TriangularSum( int i ) {
-    return i&1 ? ((i>>1)+1)*i : (i>>1)*(i+1);
-}
+inline int TriangularSum(int i) { return i & 1 ? ((i >> 1) + 1) * i : (i >> 1) * (i + 1); }
 
 //! Verify that sum is init plus sum of integers in closed interval [0..finish_index].
 /** line should be the source line of the caller */
-void VerifySum( int init, long finish_index, int sum, int line ) {
+void VerifySum(int init, long finish_index, int sum, int line) {
     int expected = init + TriangularSum(finish_index);
-    CHECK_MESSAGE(expected == sum, "line " << line << ": sum[0.." << finish_index << "] should be = " << expected << ", but was computed as " << sum << "\n");
+    CHECK_MESSAGE(expected == sum, "line " << line << ": sum[0.." << finish_index << "] should be = "
+                                           << expected << ", but was computed as " << sum << "\n");
 }
 
 const int MAXN = 20000;
 
-enum AddendFlag {
-    UNUSED=0,
-    USED_NONFINAL=1,
-    USED_FINAL=2
-};
+enum AddendFlag { UNUSED = 0, USED_NONFINAL = 1, USED_FINAL = 2 };
 
 //! Array recording how each addend was used.
 /** 'unsigned char' instead of AddendFlag for sake of compactness. */
@@ -64,29 +59,21 @@ static unsigned char AddendHistory[MAXN];
 
 std::atomic<long> NumberOfLiveStorage;
 
-template<typename T>
+template <typename T>
 struct Storage {
     T my_total;
     Range my_range;
-    Storage(T init) :
-        my_total(init), my_range(-1, -1, 1) {
-        ++NumberOfLiveStorage;
-    }
-    ~Storage() {
-        --NumberOfLiveStorage;
-    }
-    Storage(const Storage& strg) :
-        my_total(strg.my_total), my_range(strg.my_range) {
-        ++NumberOfLiveStorage;
-    }
-    Storage & operator=(const Storage& strg) {
+    Storage(T init) : my_total(init), my_range(-1, -1, 1) { ++NumberOfLiveStorage; }
+    ~Storage() { --NumberOfLiveStorage; }
+    Storage(const Storage& strg) : my_total(strg.my_total), my_range(strg.my_range) { ++NumberOfLiveStorage; }
+    Storage& operator=(const Storage& strg) {
         my_total = strg.my_total;
         my_range = strg.my_range;
         return *this;
     }
 };
 
-template<typename T>
+template <typename T>
 Storage<T> JoinStorages(const Storage<T>& left, const Storage<T>& right) {
     Storage<T> result = right;
     CHECK(ScanIsRunning);
@@ -97,9 +84,11 @@ Storage<T> JoinStorages(const Storage<T>& left, const Storage<T>& right) {
     return result;
 }
 
-template<typename T>
-void Scan(const Range & r, bool is_final, Storage<T> & storage, std::vector<T> & sum, const std::vector<T> & addend) {
-    CHECK((!is_final || (storage.my_range.begin() == 0 && storage.my_range.end() == r.begin()) || (storage.my_range.empty() && r.begin() == 0)));
+template <typename T>
+void Scan(const Range& r, bool is_final, Storage<T>& storage, std::vector<T>& sum,
+          const std::vector<T>& addend) {
+    CHECK((!is_final || (storage.my_range.begin() == 0 && storage.my_range.end() == r.begin())
+           || (storage.my_range.empty() && r.begin() == 0)));
     for (long i = r.begin(); i < r.end(); ++i) {
         storage.my_total += addend[i];
         if (is_final) {
@@ -107,60 +96,58 @@ void Scan(const Range & r, bool is_final, Storage<T> & storage, std::vector<T> &
             AddendHistory[i] |= USED_FINAL;
             sum[i] = storage.my_total;
             VerifySum(42, i, int(sum[i]), __LINE__);
-        }
-        else {
+        } else {
             CHECK_MESSAGE(AddendHistory[i] == UNUSED, "addend used too many times");
             AddendHistory[i] |= USED_NONFINAL;
         }
     }
-    if (storage.my_range.empty())
-        storage.my_range = r;
+    if (storage.my_range.empty()) storage.my_range = r;
     else
         storage.my_range = Range(storage.my_range.begin(), r.end(), 1);
 }
 
-template<typename T>
-Storage<T> ScanWithInit(const Range & r, T init, bool is_final, Storage<T> & storage, std::vector<T> & sum, const std::vector<T> & addend) {
-    if (r.begin() == 0)
-        storage.my_total = init;
+template <typename T>
+Storage<T> ScanWithInit(const Range& r, T init, bool is_final, Storage<T>& storage, std::vector<T>& sum,
+                        const std::vector<T>& addend) {
+    if (r.begin() == 0) storage.my_total = init;
     Scan(r, is_final, storage, sum, addend);
     return storage;
 }
 
-template<typename T>
+template <typename T>
 class Accumulator {
-    const  std::vector<T> &my_array;
-    std::vector<T> & my_sum;
+    const std::vector<T>& my_array;
+    std::vector<T>& my_sum;
     Storage<T> storage;
     enum state_type {
-        full,       // Accumulator has sufficient information for final scan,
-                    // i.e. has seen all iterations to its left.
-                    // It's either the original Accumulator provided by the user
-                    // or a Accumulator constructed by a splitting constructor *and* subsequently
-                    // subjected to a reverse_join with a full accumulator.
+        full,// Accumulator has sufficient information for final scan,
+             // i.e. has seen all iterations to its left.
+             // It's either the original Accumulator provided by the user
+             // or a Accumulator constructed by a splitting constructor *and* subsequently
+             // subjected to a reverse_join with a full accumulator.
 
-        partial,    // Accumulator has only enough information for pre_scan.
-                    // i.e. has not seen all iterations to its left.
-                    // It's an Accumulator created by a splitting constructor that
-                    // has not yet been subjected to a reverse_join with a full accumulator.
+        partial,// Accumulator has only enough information for pre_scan.
+                // i.e. has not seen all iterations to its left.
+                // It's an Accumulator created by a splitting constructor that
+                // has not yet been subjected to a reverse_join with a full accumulator.
 
-        summary,    // Accumulator has summary of iterations processed, but not necessarily
-                    // the information required for a final_scan or pre_scan.
-                    // It's the result of "assign".
+        summary,// Accumulator has summary of iterations processed, but not necessarily
+                // the information required for a final_scan or pre_scan.
+                // It's the result of "assign".
 
-        trash       // Accumulator with possibly no useful information.
-                    // It was the source for "assign".
+        trash// Accumulator with possibly no useful information.
+             // It was the source for "assign".
 
     };
     mutable state_type my_state;
     //! Equals this while object is fully constructed, nullptr otherwise.
     /** Used to detect premature destruction and accidental bitwise copy. */
     Accumulator* self;
-    Accumulator& operator= (const Accumulator& other);
+    Accumulator& operator=(const Accumulator& other);
+
 public:
-    Accumulator( T init, const std::vector<T> & array, std::vector<T> & sum ) :
-        my_array(array), my_sum(sum), storage(init), my_state(full)
-    {
+    Accumulator(T init, const std::vector<T>& array, std::vector<T>& sum)
+        : my_array(array), my_sum(sum), storage(init), my_state(full) {
         // Set self as last action of constructor, to indicate that object is fully constructed.
         self = this;
     }
@@ -168,76 +155,72 @@ class Accumulator {
         // Clear self as first action of destructor, to indicate that object is not fully constructed.
         self = nullptr;
     }
-    Accumulator( Accumulator& a, tbb::split ) :
-        my_array(a.my_array), my_sum(a.my_sum), storage(0), my_state(partial)
-    {
-        if (!(a.my_state == partial))
-            CHECK(a.my_state == full);
-        if (!(a.my_state == full))
-            CHECK(a.my_state == partial);
+    Accumulator(Accumulator& a, tbb::split)
+        : my_array(a.my_array), my_sum(a.my_sum), storage(0), my_state(partial) {
+        if (!(a.my_state == partial)) CHECK(a.my_state == full);
+        if (!(a.my_state == full)) CHECK(a.my_state == partial);
         CHECK(ScanIsRunning);
         // Set self as last action of constructor, to indicate that object is fully constructed.
         self = this;
     }
-    template<typename Tag>
-    void operator()( const Range& r, Tag /*tag*/ ) {
-        if(Tag::is_final_scan())
-            CHECK(my_state == full);
+    template <typename Tag>
+    void operator()(const Range& r, Tag /*tag*/) {
+        if (Tag::is_final_scan()) CHECK(my_state == full);
         else
             CHECK(my_state == partial);
         Scan(r, Tag::is_final_scan(), storage, my_sum, my_array);
-        CHECK_MESSAGE(self==this, "this Accumulator corrupted or prematurely destroyed");
+        CHECK_MESSAGE(self == this, "this Accumulator corrupted or prematurely destroyed");
     }
-    void reverse_join( const Accumulator& left_body) {
-        const Storage<T> & left = left_body.storage;
-        Storage<T> & right = storage;
+    void reverse_join(const Accumulator& left_body) {
+        const Storage<T>& left = left_body.storage;
+        Storage<T>& right = storage;
         CHECK(my_state == partial);
-        CHECK( ((left_body.my_state == full) || (left_body.my_state==partial)) );
+        CHECK(((left_body.my_state == full) || (left_body.my_state == partial)));
 
         right = JoinStorages(left, right);
 
         CHECK(left_body.self == &left_body);
         my_state = left_body.my_state;
     }
-    void assign( const Accumulator& other ) {
+    void assign(const Accumulator& other) {
         CHECK(other.my_state == full);
         CHECK(my_state == full);
         storage.my_total = other.storage.my_total;
         storage.my_range = other.storage.my_range;
         CHECK(self == this);
-        CHECK_MESSAGE(other.self==&other, "other Accumulator corrupted or prematurely destroyed");
+        CHECK_MESSAGE(other.self == &other, "other Accumulator corrupted or prematurely destroyed");
         my_state = summary;
         other.my_state = trash;
     }
-    T get_total() {
-        return storage.my_total;
-    }
+    T get_total() { return storage.my_total; }
 };
 
-
-template<typename T, typename Scan, typename ReverseJoin>
-T ParallelScanFunctionalInvoker(const Range& range, T idx, const Scan& scan, const ReverseJoin& reverse_join, int mode) {
-    switch (mode%3) {
-    case 0:
-        return tbb::parallel_scan(range, idx, scan, reverse_join);
-        break;
-    case 1:
-        return tbb::parallel_scan(range, idx, scan, reverse_join, tbb::simple_partitioner());
-        break;
-    default:
-        return tbb::parallel_scan(range, idx, scan, reverse_join, tbb::auto_partitioner());
+template <typename T, typename Scan, typename ReverseJoin>
+T ParallelScanFunctionalInvoker(const Range& range, T idx, const Scan& scan, const ReverseJoin& reverse_join,
+                                int mode) {
+    switch (mode % 3) {
+        case 0:
+            return tbb::parallel_scan(range, idx, scan, reverse_join);
+            break;
+        case 1:
+            return tbb::parallel_scan(range, idx, scan, reverse_join, tbb::simple_partitioner());
+            break;
+        default:
+            return tbb::parallel_scan(range, idx, scan, reverse_join, tbb::auto_partitioner());
     }
 }
 
-template<typename T>
+template <typename T>
 class ScanBody {
-    const std::vector<T> &my_addend;
-    std::vector<T> &my_sum;
+    const std::vector<T>& my_addend;
+    std::vector<T>& my_sum;
     const T my_init;
-    ScanBody& operator= (const ScanBody&);
+    ScanBody& operator=(const ScanBody&);
+
 public:
-    ScanBody(T init, const std::vector<T> &addend, std::vector<T> &sum) :my_addend(addend), my_sum(sum), my_init(init) {}
-    template<typename S, typename Tag>
+    ScanBody(T init, const std::vector<T>& addend, std::vector<T>& sum)
+        : my_addend(addend), my_sum(sum), my_init(init) {}
+    template <typename S, typename Tag>
     Storage<S> operator()(const Range& r, Storage<S> storage, Tag) const {
         return ScanWithInit(r, my_init, Tag::is_final_scan(), storage, my_sum, my_addend);
     }
@@ -245,113 +228,106 @@ class ScanBody {
 
 class JoinBody {
 public:
-    template<typename T>
+    template <typename T>
     Storage<T> operator()(const Storage<T>& left, const Storage<T>& right) const {
         return JoinStorages(left, right);
     }
 };
 
 struct ParallelScanTemplateFunctor {
-    template<typename T>
-    T operator()(Range range, T init, const std::vector<T> &addend, std::vector<T> &sum, int mode) {
-        for (long i = 0; i<MAXN; ++i) {
-            AddendHistory[i] = UNUSED;
-        }
+    template <typename T>
+    T operator()(Range range, T init, const std::vector<T>& addend, std::vector<T>& sum, int mode) {
+        for (long i = 0; i < MAXN; ++i) { AddendHistory[i] = UNUSED; }
         ScanIsRunning = true;
         ScanBody<T> sb(init, addend, sum);
         JoinBody jb;
         Storage<T> res = ParallelScanFunctionalInvoker(range, Storage<T>(0), sb, jb, mode);
         ScanIsRunning = false;
-        if (range.empty())
-            res.my_total = init;
+        if (range.empty()) res.my_total = init;
         return res.my_total;
     }
 };
 
 struct ParallelScanLambda {
-    template<typename T>
-    T operator()(Range range, T init, const std::vector<T> &addend, std::vector<T> &sum, int mode) {
-        for (long i = 0; i<MAXN; ++i) {
-            AddendHistory[i] = UNUSED;
-        }
+    template <typename T>
+    T operator()(Range range, T init, const std::vector<T>& addend, std::vector<T>& sum, int mode) {
+        for (long i = 0; i < MAXN; ++i) { AddendHistory[i] = UNUSED; }
         ScanIsRunning = true;
-        Storage<T> res = ParallelScanFunctionalInvoker(range, Storage<T>(0),
-            [&addend, &sum, init](const Range& r, Storage<T> storage, bool is_final_scan /*tag*/) -> Storage<T> {
-                return ScanWithInit(r, init, is_final_scan, storage, sum, addend);
-            },
-            [](const Storage<T>& left, const Storage<T>& right) -> Storage<T> {
-                return JoinStorages(left, right);
-            },
-            mode);
+        Storage<T> res = ParallelScanFunctionalInvoker(
+                range, Storage<T>(0),
+                [&addend, &sum, init](const Range& r, Storage<T> storage, bool is_final_scan /*tag*/)
+                        -> Storage<T> { return ScanWithInit(r, init, is_final_scan, storage, sum, addend); },
+                [](const Storage<T>& left, const Storage<T>& right) -> Storage<T> {
+                    return JoinStorages(left, right);
+                },
+                mode);
         ScanIsRunning = false;
-        if (range.empty())
-            res.my_total = init;
+        if (range.empty()) res.my_total = init;
         return res.my_total;
     }
 };
 
-void TestAccumulator( int mode ) {
+void TestAccumulator(int mode) {
     typedef int T;
     std::vector<T> addend(MAXN);
     std::vector<T> sum(MAXN);
     std::vector<T> control_sum(MAXN);
     T control_total;
-    for( int n=0; n<=MAXN; n = n <=128? n+1: n*3) {
-        for( int gs : {1, 2, 100, 511, 12345, n/ 111, n/17, n-1, n}) {
-            if(gs<=0 || gs > n)
-                continue;
+    for (int n = 0; n <= MAXN; n = n <= 128 ? n + 1 : n * 3) {
+        for (int gs : {1, 2, 100, 511, 12345, n / 111, n / 17, n - 1, n}) {
+            if (gs <= 0 || gs > n) continue;
             control_total = 42;
-            for( long i=0; i<MAXN; ++i ) {
+            for (long i = 0; i < MAXN; ++i) {
                 addend[i] = -1;
                 sum[i] = -2;
                 control_sum[i] = -2;
                 AddendHistory[i] = UNUSED;
             }
-            for (long i = 0; i<n; ++i) {
+            for (long i = 0; i < n; ++i) {
                 addend[i] = i;
                 control_total += addend[i];
                 control_sum[i] = control_total;
             }
 
-            Accumulator<T> acc( 42, addend, sum);
+            Accumulator<T> acc(42, addend, sum);
             ScanIsRunning = true;
 
             switch (mode) {
                 case 0:
-                    tbb::parallel_scan( Range( 0, n,  gs ), acc );
-                break;
+                    tbb::parallel_scan(Range(0, n, gs), acc);
+                    break;
                 case 1:
-                    tbb::parallel_scan( Range( 0, n, gs ), acc, tbb::simple_partitioner() );
-                break;
+                    tbb::parallel_scan(Range(0, n, gs), acc, tbb::simple_partitioner());
+                    break;
                 case 2:
-                    tbb::parallel_scan( Range( 0, n, gs ), acc, tbb::auto_partitioner() );
-                break;
+                    tbb::parallel_scan(Range(0, n, gs), acc, tbb::auto_partitioner());
+                    break;
             }
 
             ScanIsRunning = false;
 
-            for( long i=0; i<n; ++i )
-                CHECK_MESSAGE((AddendHistory[i]&USED_FINAL), "failed to use addend[" << i << "] " << (AddendHistory[i] & USED_NONFINAL ? "(but used nonfinal)\n" : "\n"));
-            for( long i=0; i<n; ++i ) {
-                VerifySum( 42, i, sum[i], __LINE__ );
-            }
-            if( n )
-                CHECK(acc.get_total()==sum[n-1]);
+            for (long i = 0; i < n; ++i)
+                CHECK_MESSAGE((AddendHistory[i] & USED_FINAL),
+                              "failed to use addend["
+                                      << i << "] "
+                                      << (AddendHistory[i] & USED_NONFINAL ? "(but used nonfinal)\n" : "\n"));
+            for (long i = 0; i < n; ++i) { VerifySum(42, i, sum[i], __LINE__); }
+            if (n) CHECK(acc.get_total() == sum[n - 1]);
             else
-                CHECK(acc.get_total()==42);
-            CHECK(control_total ==acc.get_total());
-            CHECK(control_sum==sum);
+                CHECK(acc.get_total() == 42);
+            CHECK(control_total == acc.get_total());
+            CHECK(control_sum == sum);
         }
     }
 }
 
-template<typename ParallelScanWrapper>
-void TestInterface( int mode, ParallelScanWrapper parallel_scan_wrapper ) {
+template <typename ParallelScanWrapper>
+void TestInterface(int mode, ParallelScanWrapper parallel_scan_wrapper) {
     using T = int;
     std::vector<T> addend(MAXN);
     std::vector<T> control_sum(MAXN);
     T control_total(42);
-    for( long i=0; i<MAXN; ++i ) {
+    for (long i = 0; i < MAXN; ++i) {
         addend[i] = i;
         control_total += addend[i];
         control_sum[i] = control_total;
@@ -359,36 +335,29 @@ void TestInterface( int mode, ParallelScanWrapper parallel_scan_wrapper ) {
     }
 
     std::vector<T> sum(MAXN);
-    for (long i = 0; i<MAXN; ++i)
-        sum[i] = -2;
+    for (long i = 0; i < MAXN; ++i) sum[i] = -2;
     ScanIsRunning = true;
     T total = parallel_scan_wrapper(Range(0, MAXN, 1), 42, addend, sum, mode);
     ScanIsRunning = false;
 
-    CHECK_MESSAGE(control_total==total, "Parallel prefix sum is not equal to serial");
-    CHECK_MESSAGE(control_sum==sum, "Parallel prefix vector is not equal to serial");
+    CHECK_MESSAGE(control_total == total, "Parallel prefix sum is not equal to serial");
+    CHECK_MESSAGE(control_sum == sum, "Parallel prefix vector is not equal to serial");
 }
 
-
 #if __TBB_CPP14_GENERIC_LAMBDAS_PRESENT
 struct ParallelScanGenericLambda {
-    template<typename T>
-    T operator()(Range range, T init, const std::vector<T> &addend, std::vector<T> &sum, int mode) {
-        for (long i = 0; i<MAXN; ++i) {
-            AddendHistory[i] = UNUSED;
-        }
+    template <typename T>
+    T operator()(Range range, T init, const std::vector<T>& addend, std::vector<T>& sum, int mode) {
+        for (long i = 0; i < MAXN; ++i) { AddendHistory[i] = UNUSED; }
         ScanIsRunning = true;
-        Storage<T> res = ParallelScanFunctionalInvoker(range, Storage<T>(0),
-            [&addend, &sum, init](const auto& rng, auto storage, bool is_final_scan) {
-                return ScanWithInit(rng, init, is_final_scan, storage, sum, addend);
-            },
-            [](const auto& left, const auto& right) {
-                return JoinStorages(left, right);
-            },
-            mode);
+        Storage<T> res = ParallelScanFunctionalInvoker(
+                range, Storage<T>(0),
+                [&addend, &sum, init](const auto& rng, auto storage, bool is_final_scan) {
+                    return ScanWithInit(rng, init, is_final_scan, storage, sum, addend);
+                },
+                [](const auto& left, const auto& right) { return JoinStorages(left, right); }, mode);
         ScanIsRunning = false;
-        if (range.empty())
-            res.my_total = init;
+        if (range.empty()) res.my_total = init;
         return res.my_total;
     }
 };
@@ -396,19 +365,22 @@ struct ParallelScanGenericLambda {
 
 #if __TBB_CPP20_CONCEPTS_PRESENT
 template <typename... Args>
-concept can_call_parallel_scan_basic = requires( Args&&... args ) {
+concept can_call_parallel_scan_basic = requires(Args&&... args) {
     tbb::parallel_scan(std::forward<Args>(args)...);
 };
 
 template <typename Range, typename Body>
-concept can_call_imperative_pscan = can_call_parallel_scan_basic<const Range&, Body&> &&
-                                    can_call_parallel_scan_basic<const Range&, Body&, const tbb::simple_partitioner&> &&
-                                    can_call_parallel_scan_basic<const Range&, Body&, const tbb::auto_partitioner&>;
+concept can_call_imperative_pscan = can_call_parallel_scan_basic<const Range&, Body&>&&
+        can_call_parallel_scan_basic<const Range&, Body&, const tbb::simple_partitioner&>&&
+                can_call_parallel_scan_basic<const Range&, Body&, const tbb::auto_partitioner&>;
 
 template <typename Range, typename Value, typename Func, typename Combine>
-concept can_call_functional_pscan = can_call_parallel_scan_basic<const Range&, const Value&, const Func&, const Combine&> &&
-                                    can_call_parallel_scan_basic<const Range&, const Value&, const Func&, const Combine&, const tbb::simple_partitioner&> &&
-                                    can_call_parallel_scan_basic<const Range&, const Value&, const Func&, const Combine&, const tbb::auto_partitioner&>;
+concept can_call_functional_pscan
+        = can_call_parallel_scan_basic<const Range&, const Value&, const Func&, const Combine&>&&
+                can_call_parallel_scan_basic<const Range&, const Value&, const Func&, const Combine&,
+                                             const tbb::simple_partitioner&>&&
+                        can_call_parallel_scan_basic<const Range&, const Value&, const Func&, const Combine&,
+                                                     const tbb::auto_partitioner&>;
 
 using CorrectRange = test_concepts::range::Correct;
 
@@ -435,15 +407,23 @@ void test_pscan_range_constraints() {
     static_assert(!can_call_imperative_pscan<WrongReturnIsDivisible, CorrectBody<WrongReturnIsDivisible>>);
 
     static_assert(can_call_functional_pscan<Correct, int, CorrectFunc<Correct, int>, CorrectCombine<int>>);
-    static_assert(!can_call_functional_pscan<NonCopyable, int, CorrectFunc<NonCopyable, int>, CorrectCombine<int>>);
-    static_assert(!can_call_functional_pscan<NonDestructible, int, CorrectFunc<NonDestructible, int>, CorrectCombine<int>>);
-    static_assert(!can_call_functional_pscan<NonSplittable, int, CorrectFunc<NonSplittable, int>, CorrectCombine<int>>);
+    static_assert(
+            !can_call_functional_pscan<NonCopyable, int, CorrectFunc<NonCopyable, int>, CorrectCombine<int>>);
+    static_assert(!can_call_functional_pscan<NonDestructible, int, CorrectFunc<NonDestructible, int>,
+                                             CorrectCombine<int>>);
+    static_assert(!can_call_functional_pscan<NonSplittable, int, CorrectFunc<NonSplittable, int>,
+                                             CorrectCombine<int>>);
     static_assert(!can_call_functional_pscan<NoEmpty, int, CorrectFunc<NoEmpty, int>, CorrectCombine<int>>);
-    static_assert(!can_call_functional_pscan<EmptyNonConst, int, CorrectFunc<EmptyNonConst, int>, CorrectCombine<int>>);
-    static_assert(!can_call_functional_pscan<WrongReturnEmpty, int, CorrectFunc<WrongReturnEmpty, int>, CorrectCombine<int>>);
-    static_assert(!can_call_functional_pscan<NoIsDivisible, int, CorrectFunc<NoIsDivisible, int>, CorrectCombine<int>>);
-    static_assert(!can_call_functional_pscan<IsDivisibleNonConst, int, CorrectFunc<IsDivisibleNonConst, int>, CorrectCombine<int>>);
-    static_assert(!can_call_functional_pscan<WrongReturnIsDivisible, int, CorrectFunc<WrongReturnIsDivisible, int>, CorrectCombine<int>>);
+    static_assert(!can_call_functional_pscan<EmptyNonConst, int, CorrectFunc<EmptyNonConst, int>,
+                                             CorrectCombine<int>>);
+    static_assert(!can_call_functional_pscan<WrongReturnEmpty, int, CorrectFunc<WrongReturnEmpty, int>,
+                                             CorrectCombine<int>>);
+    static_assert(!can_call_functional_pscan<NoIsDivisible, int, CorrectFunc<NoIsDivisible, int>,
+                                             CorrectCombine<int>>);
+    static_assert(!can_call_functional_pscan<IsDivisibleNonConst, int, CorrectFunc<IsDivisibleNonConst, int>,
+                                             CorrectCombine<int>>);
+    static_assert(!can_call_functional_pscan<WrongReturnIsDivisible, int,
+                                             CorrectFunc<WrongReturnIsDivisible, int>, CorrectCombine<int>>);
 }
 
 void test_pscan_body_constraints() {
@@ -451,11 +431,15 @@ void test_pscan_body_constraints() {
     static_assert(can_call_imperative_pscan<CorrectRange, Correct<CorrectRange>>);
     static_assert(!can_call_imperative_pscan<CorrectRange, NonSplittable<CorrectRange>>);
     static_assert(!can_call_imperative_pscan<CorrectRange, NoPreScanOperatorRoundBrackets<CorrectRange>>);
-    static_assert(!can_call_imperative_pscan<CorrectRange, WrongFirstInputPreScanOperatorRoundBrackets<CorrectRange>>);
-    static_assert(!can_call_imperative_pscan<CorrectRange, WrongSecondInputPreScanOperatorRoundBrackets<CorrectRange>>);
+    static_assert(!can_call_imperative_pscan<CorrectRange,
+                                             WrongFirstInputPreScanOperatorRoundBrackets<CorrectRange>>);
+    static_assert(!can_call_imperative_pscan<CorrectRange,
+                                             WrongSecondInputPreScanOperatorRoundBrackets<CorrectRange>>);
     static_assert(!can_call_imperative_pscan<CorrectRange, NoFinalScanOperatorRoundBrackets<CorrectRange>>);
-    static_assert(!can_call_imperative_pscan<CorrectRange, WrongFirstInputFinalScanOperatorRoundBrackets<CorrectRange>>);
-    static_assert(!can_call_imperative_pscan<CorrectRange, WrongSecondInputFinalScanOperatorRoundBrackets<CorrectRange>>);
+    static_assert(!can_call_imperative_pscan<CorrectRange,
+                                             WrongFirstInputFinalScanOperatorRoundBrackets<CorrectRange>>);
+    static_assert(!can_call_imperative_pscan<CorrectRange,
+                                             WrongSecondInputFinalScanOperatorRoundBrackets<CorrectRange>>);
     static_assert(!can_call_imperative_pscan<CorrectRange, NoReverseJoin<CorrectRange>>);
     static_assert(!can_call_imperative_pscan<CorrectRange, WrongInputReverseJoin<CorrectRange>>);
     static_assert(!can_call_imperative_pscan<CorrectRange, NoAssign<CorrectRange>>);
@@ -464,25 +448,40 @@ void test_pscan_body_constraints() {
 
 void test_pscan_func_constraints() {
     using namespace test_concepts::parallel_scan_function;
-    static_assert(can_call_functional_pscan<CorrectRange, int, Correct<CorrectRange, int>, CorrectCombine<int>>);
-    static_assert(!can_call_functional_pscan<CorrectRange, int, NoOperatorRoundBrackets<CorrectRange, int>, CorrectCombine<int>>);
-    static_assert(!can_call_functional_pscan<CorrectRange, int, OperatorRoundBracketsNonConst<CorrectRange, int>, CorrectCombine<int>>);
-    static_assert(!can_call_functional_pscan<CorrectRange, int, WrongFirstInputOperatorRoundBrackets<CorrectRange, int>, CorrectCombine<int>>);
-    static_assert(!can_call_functional_pscan<CorrectRange, int, WrongSecondInputOperatorRoundBrackets<CorrectRange, int>, CorrectCombine<int>>);
-    static_assert(!can_call_functional_pscan<CorrectRange, int, WrongReturnOperatorRoundBrackets<CorrectRange, int>, CorrectCombine<int>>);
+    static_assert(
+            can_call_functional_pscan<CorrectRange, int, Correct<CorrectRange, int>, CorrectCombine<int>>);
+    static_assert(!can_call_functional_pscan<CorrectRange, int, NoOperatorRoundBrackets<CorrectRange, int>,
+                                             CorrectCombine<int>>);
+    static_assert(
+            !can_call_functional_pscan<CorrectRange, int, OperatorRoundBracketsNonConst<CorrectRange, int>,
+                                       CorrectCombine<int>>);
+    static_assert(!can_call_functional_pscan<CorrectRange, int,
+                                             WrongFirstInputOperatorRoundBrackets<CorrectRange, int>,
+                                             CorrectCombine<int>>);
+    static_assert(!can_call_functional_pscan<CorrectRange, int,
+                                             WrongSecondInputOperatorRoundBrackets<CorrectRange, int>,
+                                             CorrectCombine<int>>);
+    static_assert(
+            !can_call_functional_pscan<CorrectRange, int, WrongReturnOperatorRoundBrackets<CorrectRange, int>,
+                                       CorrectCombine<int>>);
 }
 
 void test_pscan_combine_constraints() {
     using namespace test_concepts::parallel_scan_combine;
     static_assert(can_call_functional_pscan<CorrectRange, int, CorrectFunc<CorrectRange, int>, Correct<int>>);
-    static_assert(!can_call_functional_pscan<CorrectRange, int, CorrectFunc<CorrectRange, int>, NoOperatorRoundBrackets<int>>);
-    static_assert(!can_call_functional_pscan<CorrectRange, int, CorrectFunc<CorrectRange, int>, OperatorRoundBracketsNonConst<int>>);
-    static_assert(!can_call_functional_pscan<CorrectRange, int, CorrectFunc<CorrectRange, int>, WrongFirstInputOperatorRoundBrackets<int>>);
-    static_assert(!can_call_functional_pscan<CorrectRange, int, CorrectFunc<CorrectRange, int>, WrongSecondInputOperatorRoundBrackets<int>>);
-    static_assert(!can_call_functional_pscan<CorrectRange, int, CorrectFunc<CorrectRange, int>, WrongReturnOperatorRoundBrackets<int>>);
+    static_assert(!can_call_functional_pscan<CorrectRange, int, CorrectFunc<CorrectRange, int>,
+                                             NoOperatorRoundBrackets<int>>);
+    static_assert(!can_call_functional_pscan<CorrectRange, int, CorrectFunc<CorrectRange, int>,
+                                             OperatorRoundBracketsNonConst<int>>);
+    static_assert(!can_call_functional_pscan<CorrectRange, int, CorrectFunc<CorrectRange, int>,
+                                             WrongFirstInputOperatorRoundBrackets<int>>);
+    static_assert(!can_call_functional_pscan<CorrectRange, int, CorrectFunc<CorrectRange, int>,
+                                             WrongSecondInputOperatorRoundBrackets<int>>);
+    static_assert(!can_call_functional_pscan<CorrectRange, int, CorrectFunc<CorrectRange, int>,
+                                             WrongReturnOperatorRoundBrackets<int>>);
 }
 
-#endif // __TBB_CPP20_CONCEPTS_PRESENT
+#endif// __TBB_CPP20_CONCEPTS_PRESENT
 
 // Test for parallel_scan with with different partitioners
 //! \brief \ref error_guessing \ref resource_usage
@@ -510,7 +509,7 @@ TEST_CASE("parallel_scan testing with template functor") {
         tbb::global_control control(tbb::global_control::max_allowed_parallelism, concurrency_level);
         for (int mode = 0; mode < 3; mode++) {
             NumberOfLiveStorage = 0;
-            TestInterface(mode,  ParallelScanTemplateFunctor());
+            TestInterface(mode, ParallelScanTemplateFunctor());
             // Test that all workers sleep when no work
             TestCPUUserTime(concurrency_level);
 
@@ -529,7 +528,7 @@ TEST_CASE("parallel_scan testing with lambdas") {
         tbb::global_control control(tbb::global_control::max_allowed_parallelism, concurrency_level);
         for (int mode = 0; mode < 3; mode++) {
             NumberOfLiveStorage = 0;
-            TestInterface(mode,  ParallelScanLambda());
+            TestInterface(mode, ParallelScanLambda());
 
             // Test that all workers sleep when no work
             TestCPUUserTime(concurrency_level);
@@ -550,7 +549,7 @@ TEST_CASE("parallel_scan testing with generic lambdas") {
         tbb::global_control control(tbb::global_control::max_allowed_parallelism, concurrency_level);
         for (int mode = 0; mode < 3; mode++) {
             NumberOfLiveStorage = 0;
-            TestInterface(mode,  ParallelScanGenericLambda());
+            TestInterface(mode, ParallelScanGenericLambda());
             // Test that all workers sleep when no work
             TestCPUUserTime(concurrency_level);
 
@@ -571,4 +570,4 @@ TEST_CASE("parallel_scan constraints") {
     test_pscan_func_constraints();
     test_pscan_combine_constraints();
 }
-#endif // __TBB_CPP20_CONCEPTS_PRESENT
+#endif// __TBB_CPP20_CONCEPTS_PRESENT
diff --git a/external/tbb/test/tbb/test_parallel_sort.cpp b/external/tbb/test/tbb/test_parallel_sort.cpp
index 595e0dee..3ac06295 100644
--- a/external/tbb/test/tbb/test_parallel_sort.cpp
+++ b/external/tbb/test/tbb/test_parallel_sort.cpp
@@ -14,24 +14,24 @@
     limitations under the License.
 */
 
-#include "common/test.h"
-#include "common/utils_concurrency_limit.h"
-#include "common/cpu_usertime.h"
 #include "common/concepts_common.h"
+#include "common/cpu_usertime.h"
 #include "common/iterator.h"
+#include "common/test.h"
+#include "common/utils_concurrency_limit.h"
 
-#include "tbb/parallel_sort.h"
 #include "tbb/concurrent_vector.h"
 #include "tbb/global_control.h"
+#include "tbb/parallel_sort.h"
 
-#include <math.h>
-#include <vector>
-#include <functional>
-#include <string>
-#include <cstring>
 #include <cstddef>
+#include <cstring>
+#include <functional>
 #include <iterator>
+#include <math.h>
+#include <string>
 #include <type_traits>
+#include <vector>
 
 //! \file test_parallel_sort.cpp
 //! \brief Test for [algorithms.parallel_sort]
@@ -40,43 +40,33 @@
     that parallel_sort uses only the required interface. */
 class Minimal {
     int val;
+
 public:
     void set_val(int i) { val = i; }
-    static bool Less (const Minimal &a, const Minimal &b) {
-        return (a.val < b.val);
-    }
-    static bool AreEqual( const Minimal &a, const Minimal &b) {
-       return a.val == b.val;
-    }
+    static bool Less(const Minimal& a, const Minimal& b) { return (a.val < b.val); }
+    static bool AreEqual(const Minimal& a, const Minimal& b) { return a.val == b.val; }
 };
 
 //! Defines a comparison function object for Minimal
 class MinimalLessCompare {
 public:
-    bool operator() (const Minimal &a, const Minimal &b) const {
-        return Minimal::Less(a,b);
-    }
+    bool operator()(const Minimal& a, const Minimal& b) const { return Minimal::Less(a, b); }
 };
 
-template<typename Value>
+template <typename Value>
 bool compare(const Value& lhs, const Value& rhs) {
     return lhs == rhs;
 }
 
-bool compare(const Minimal& lhs, const Minimal& rhs) {
-    return Minimal::AreEqual(lhs, rhs);
-}
+bool compare(const Minimal& lhs, const Minimal& rhs) { return Minimal::AreEqual(lhs, rhs); }
 
-template<typename Range>
+template <typename Range>
 void validate(Range test_range, Range sorted_range) {
     using value_type = typename std::iterator_traits<decltype(std::begin(test_range))>::value_type;
-    REQUIRE(
-        std::equal(std::begin(test_range), std::end(test_range), std::begin(sorted_range),
-            [](const value_type& tested, const value_type& reference) {
-                return compare(tested, reference);
-            }
-        )
-    );
+    REQUIRE(std::equal(std::begin(test_range), std::end(test_range), std::begin(sorted_range),
+                       [](const value_type& tested, const value_type& reference) {
+                           return compare(tested, reference);
+                       }));
 }
 
 //! The default initialization routine.
@@ -101,17 +91,16 @@ void set(std::string& string_ref, KeyType key) {
     string_ref = std::to_string(static_cast<float>(key));
 }
 
-
 template <typename RandomAccessIterator, typename Compare>
 bool fill_ranges(RandomAccessIterator test_range_begin, RandomAccessIterator sorted_range_begin,
-    std::size_t size, const Compare &compare) {
+                 std::size_t size, const Compare& compare) {
 
     static char test_case = 0;
     const char num_cases = 3;
 
     if (test_case < num_cases) {
         // switch on the current test case, filling the test_list and sorted_list appropriately
-        switch(test_case) {
+        switch (test_case) {
             case 0:
                 /* use sin to generate the values */
                 for (std::size_t i = 0; i < size; i++) {
@@ -149,7 +138,7 @@ bool fill_ranges(RandomAccessIterator test_range_begin, RandomAccessIterator sor
     all possible interfaces to parallel_sort depending on whether a scratch space and
     compare have been provided.
 */
-template<typename ContainerType, std::size_t Size>
+template <typename ContainerType, std::size_t Size>
 struct parallel_sort_test {
     static void run() {
         std::less<typename ContainerType::value_type> default_comp;
@@ -162,7 +151,7 @@ struct parallel_sort_test {
         }
     }
 
-    template<typename Comparator>
+    template <typename Comparator>
     static void run(Comparator& comp) {
         ContainerType range(Size);
         ContainerType sorted_range(Size);
@@ -174,49 +163,50 @@ struct parallel_sort_test {
     }
 };
 
-template<typename ContainerType, typename Comparator>
+template <typename ContainerType, typename Comparator>
 void parallel_sort_test_suite() {
     Comparator comp;
     for (auto concurrency_level : utils::concurrency_range()) {
         tbb::global_control control(tbb::global_control::max_allowed_parallelism, concurrency_level);
-        parallel_sort_test<ContainerType, /*Size*/0    >::run(comp);
-        parallel_sort_test<ContainerType, /*Size*/1    >::run(comp);
-        parallel_sort_test<ContainerType, /*Size*/10   >::run(comp);
-        parallel_sort_test<ContainerType, /*Size*/9999 >::run(comp);
-        parallel_sort_test<ContainerType, /*Size*/50000>::run(comp);
+        parallel_sort_test<ContainerType, /*Size*/ 0>::run(comp);
+        parallel_sort_test<ContainerType, /*Size*/ 1>::run(comp);
+        parallel_sort_test<ContainerType, /*Size*/ 10>::run(comp);
+        parallel_sort_test<ContainerType, /*Size*/ 9999>::run(comp);
+        parallel_sort_test<ContainerType, /*Size*/ 50000>::run(comp);
     }
 }
 
-template<typename ContainerType>
+template <typename ContainerType>
 void parallel_sort_test_suite() {
     for (auto concurrency_level : utils::concurrency_range()) {
         tbb::global_control control(tbb::global_control::max_allowed_parallelism, concurrency_level);
-        parallel_sort_test<ContainerType, /*Size*/0    >::run();
-        parallel_sort_test<ContainerType, /*Size*/1    >::run();
-        parallel_sort_test<ContainerType, /*Size*/10   >::run();
-        parallel_sort_test<ContainerType, /*Size*/9999 >::run();
-        parallel_sort_test<ContainerType, /*Size*/50000>::run();
+        parallel_sort_test<ContainerType, /*Size*/ 0>::run();
+        parallel_sort_test<ContainerType, /*Size*/ 1>::run();
+        parallel_sort_test<ContainerType, /*Size*/ 10>::run();
+        parallel_sort_test<ContainerType, /*Size*/ 9999>::run();
+        parallel_sort_test<ContainerType, /*Size*/ 50000>::run();
     }
 }
 
 #if __TBB_CPP20_CONCEPTS_PRESENT
 template <typename RandomAccessIterator>
-concept can_call_parallel_sort_with_iterator = requires( RandomAccessIterator it ) {
+concept can_call_parallel_sort_with_iterator = requires(RandomAccessIterator it) {
     tbb::parallel_sort(it, it);
 };
 
 template <typename RandomAccessIterator, typename Compare>
-concept can_call_parallel_sort_with_iterator_and_compare = requires( RandomAccessIterator it, const Compare& compare ) {
+concept can_call_parallel_sort_with_iterator_and_compare
+        = requires(RandomAccessIterator it, const Compare& compare) {
     tbb::parallel_sort(it, it, compare);
 };
 
 template <typename CBS>
-concept can_call_parallel_sort_with_cbs = requires( CBS& cbs ) {
+concept can_call_parallel_sort_with_cbs = requires(CBS& cbs) {
     tbb::parallel_sort(cbs);
 };
 
 template <typename CBS, typename Compare>
-concept can_call_parallel_sort_with_cbs_and_compare = requires( CBS& cbs, const Compare& compare ) {
+concept can_call_parallel_sort_with_cbs_and_compare = requires(CBS& cbs, const Compare& compare) {
     tbb::parallel_sort(cbs, compare);
 };
 
@@ -235,13 +225,21 @@ void test_psort_iterator_constraints() {
     static_assert(!can_call_parallel_sort_with_iterator<utils::RandomIterator<NonComparableValue>>);
     static_assert(!can_call_parallel_sort_with_iterator<test_concepts::ConstantIT<int>>);
 
-    static_assert(can_call_parallel_sort_with_iterator_and_compare<utils::RandomIterator<int>, CorrectCompare<int>>);
-    static_assert(can_call_parallel_sort_with_iterator_and_compare<typename std::vector<int>::iterator, CorrectCompare<int>>);
-    static_assert(!can_call_parallel_sort_with_iterator_and_compare<utils::ForwardIterator<int>, CorrectCompare<int>>);
-    static_assert(!can_call_parallel_sort_with_iterator_and_compare<utils::InputIterator<int>, CorrectCompare<int>>);
-    static_assert(!can_call_parallel_sort_with_iterator_and_compare<utils::RandomIterator<NonMovableValue>, CorrectCompare<NonMovableValue>>);
-    static_assert(!can_call_parallel_sort_with_iterator_and_compare<utils::RandomIterator<NonMoveAssignableValue>, CorrectCompare<NonMoveAssignableValue>>);
-    static_assert(!can_call_parallel_sort_with_iterator_and_compare<test_concepts::ConstantIT<int>, CorrectCompare<const int>>);
+    static_assert(can_call_parallel_sort_with_iterator_and_compare<utils::RandomIterator<int>,
+                                                                   CorrectCompare<int>>);
+    static_assert(can_call_parallel_sort_with_iterator_and_compare<typename std::vector<int>::iterator,
+                                                                   CorrectCompare<int>>);
+    static_assert(!can_call_parallel_sort_with_iterator_and_compare<utils::ForwardIterator<int>,
+                                                                    CorrectCompare<int>>);
+    static_assert(!can_call_parallel_sort_with_iterator_and_compare<utils::InputIterator<int>,
+                                                                    CorrectCompare<int>>);
+    static_assert(!can_call_parallel_sort_with_iterator_and_compare<utils::RandomIterator<NonMovableValue>,
+                                                                    CorrectCompare<NonMovableValue>>);
+    static_assert(
+            !can_call_parallel_sort_with_iterator_and_compare<utils::RandomIterator<NonMoveAssignableValue>,
+                                                              CorrectCompare<NonMoveAssignableValue>>);
+    static_assert(!can_call_parallel_sort_with_iterator_and_compare<test_concepts::ConstantIT<int>,
+                                                                    CorrectCompare<const int>>);
 }
 
 void test_psort_compare_constraints() {
@@ -250,16 +248,25 @@ void test_psort_compare_constraints() {
     using CorrectCBS = test_concepts::container_based_sequence::Correct;
     using CorrectIterator = CorrectCBS::iterator;
     static_assert(can_call_parallel_sort_with_iterator_and_compare<CorrectIterator, Correct<int>>);
-    static_assert(!can_call_parallel_sort_with_iterator_and_compare<CorrectIterator, NoOperatorRoundBrackets<int>>);
-    static_assert(!can_call_parallel_sort_with_iterator_and_compare<CorrectIterator, WrongFirstInputOperatorRoundBrackets<int>>);
-    static_assert(!can_call_parallel_sort_with_iterator_and_compare<CorrectIterator, WrongSecondInputOperatorRoundBrackets<int>>);
-    static_assert(!can_call_parallel_sort_with_iterator_and_compare<CorrectIterator, WrongReturnOperatorRoundBrackets<int>>);
+    static_assert(
+            !can_call_parallel_sort_with_iterator_and_compare<CorrectIterator, NoOperatorRoundBrackets<int>>);
+    static_assert(
+            !can_call_parallel_sort_with_iterator_and_compare<CorrectIterator,
+                                                              WrongFirstInputOperatorRoundBrackets<int>>);
+    static_assert(
+            !can_call_parallel_sort_with_iterator_and_compare<CorrectIterator,
+                                                              WrongSecondInputOperatorRoundBrackets<int>>);
+    static_assert(!can_call_parallel_sort_with_iterator_and_compare<CorrectIterator,
+                                                                    WrongReturnOperatorRoundBrackets<int>>);
 
     static_assert(can_call_parallel_sort_with_cbs_and_compare<CorrectCBS, Correct<int>>);
     static_assert(!can_call_parallel_sort_with_cbs_and_compare<CorrectCBS, NoOperatorRoundBrackets<int>>);
-    static_assert(!can_call_parallel_sort_with_cbs_and_compare<CorrectCBS, WrongFirstInputOperatorRoundBrackets<int>>);
-    static_assert(!can_call_parallel_sort_with_cbs_and_compare<CorrectCBS, WrongSecondInputOperatorRoundBrackets<int>>);
-    static_assert(!can_call_parallel_sort_with_cbs_and_compare<CorrectCBS, WrongReturnOperatorRoundBrackets<int>>);
+    static_assert(!can_call_parallel_sort_with_cbs_and_compare<CorrectCBS,
+                                                               WrongFirstInputOperatorRoundBrackets<int>>);
+    static_assert(!can_call_parallel_sort_with_cbs_and_compare<CorrectCBS,
+                                                               WrongSecondInputOperatorRoundBrackets<int>>);
+    static_assert(
+            !can_call_parallel_sort_with_cbs_and_compare<CorrectCBS, WrongReturnOperatorRoundBrackets<int>>);
 }
 
 void test_psort_cbs_constraints() {
@@ -275,7 +282,7 @@ void test_psort_cbs_constraints() {
     static_assert(can_call_parallel_sort_with_cbs<CustomValueCBS<CorrectValue>>);
     static_assert(!can_call_parallel_sort_with_cbs<CustomValueCBS<NonMovableValue>>);
     static_assert(!can_call_parallel_sort_with_cbs<CustomValueCBS<NonMoveAssignableValue>>);
-    static_assert(!can_call_parallel_sort_with_cbs<CustomValueCBS<NonComparableValue>>);\
+    static_assert(!can_call_parallel_sort_with_cbs<CustomValueCBS<NonComparableValue>>);
 
     using CorrectCompare = test_concepts::compare::Correct<int>;
     using NonMovableCompare = test_concepts::compare::Correct<NonMovableValue>;
@@ -285,25 +292,21 @@ void test_psort_cbs_constraints() {
     static_assert(!can_call_parallel_sort_with_cbs_and_compare<NoEnd, CorrectCompare>);
     static_assert(!can_call_parallel_sort_with_cbs_and_compare<ForwardIteratorCBS, CorrectCompare>);
     static_assert(!can_call_parallel_sort_with_cbs_and_compare<ConstantCBS, CorrectCompare>);
-    static_assert(!can_call_parallel_sort_with_cbs_and_compare<CustomValueCBS<NonMovableValue>, NonMovableCompare>);
-    static_assert(!can_call_parallel_sort_with_cbs_and_compare<CustomValueCBS<NonMoveAssignableValue>, NonMoveAssignableCompare>);
+    static_assert(
+            !can_call_parallel_sort_with_cbs_and_compare<CustomValueCBS<NonMovableValue>, NonMovableCompare>);
+    static_assert(!can_call_parallel_sort_with_cbs_and_compare<CustomValueCBS<NonMoveAssignableValue>,
+                                                               NonMoveAssignableCompare>);
 }
 
-#endif // __TBB_CPP20_CONCEPTS_PRESENT
+#endif// __TBB_CPP20_CONCEPTS_PRESENT
 
-template<typename T>
+template <typename T>
 struct minimal_span {
-    minimal_span(T* input_data, std::size_t input_size)
-     : data{input_data}
-     , size{input_size}
-    {}
+    minimal_span(T* input_data, std::size_t input_size) : data {input_data}, size {input_size} {}
+
+    T* begin() const { return data; }
+    T* end() const { return data + size; }
 
-    T* begin() const {
-        return data;
-    }
-    T* end() const {
-        return data + size;
-    }
 private:
     T* data;
     std::size_t size;
@@ -317,9 +320,7 @@ TEST_CASE("Minimal array sorting test (less comparator)") {
 
 //! Float array sorting test (default comparator)
 //! \brief \ref error_guessing
-TEST_CASE("Float array sorting test (default comparator)") {
-    parallel_sort_test_suite<std::vector<float>>();
-}
+TEST_CASE("Float array sorting test (default comparator)") { parallel_sort_test_suite<std::vector<float>>(); }
 
 //! tbb::concurrent_vector<float> sorting test (less comparator)
 //! \brief \ref error_guessing
@@ -353,11 +354,10 @@ TEST_CASE("tbb::concurrent_vector<Minimal> sorting test (less comparator)") {
 
 constexpr std::size_t array_size = 10000;
 
-template<typename SortFunctor>
+template <typename SortFunctor>
 void sort_array_test(const SortFunctor& sort_functor) {
     int test_array[array_size];
-    for (std::size_t i = 0; i < array_size; ++i)
-        test_array[i] = rand() % array_size;
+    for (std::size_t i = 0; i < array_size; ++i) test_array[i] = rand() % array_size;
 
     sort_functor(test_array);
 
@@ -368,26 +368,24 @@ void sort_array_test(const SortFunctor& sort_functor) {
 //! Array sorting test (default comparator)
 //! \brief \ref error_guessing
 TEST_CASE("Array sorting test (default comparator)") {
-    for ( auto concurrency_level : utils::concurrency_range() ) {
+    for (auto concurrency_level : utils::concurrency_range()) {
         tbb::global_control control(tbb::global_control::max_allowed_parallelism, concurrency_level);
-        sort_array_test([](int (&array)[array_size]) {
-            tbb::parallel_sort(array);
-        });
+        sort_array_test([](int(&array)[array_size]) { tbb::parallel_sort(array); });
     }
 }
 
 //! Test array sorting via rvalue span (default comparator)
 //! \brief \ref error_guessing
 TEST_CASE("Test array sorting via rvalue span (default comparator)") {
-    sort_array_test([](int (&array)[array_size]) {
-        tbb::parallel_sort(minimal_span<int>{array, array_size});
+    sort_array_test([](int(&array)[array_size]) {
+        tbb::parallel_sort(minimal_span<int> {array, array_size});
     });
 }
 
 //! Test array sorting via const span (default comparator)
 //! \brief \ref error_guessing
 TEST_CASE("Test array sorting via const span (default comparator)") {
-    sort_array_test([](int (&array)[array_size]) {
+    sort_array_test([](int(&array)[array_size]) {
         const minimal_span<int> span(array, array_size);
         tbb::parallel_sort(span);
     });
@@ -398,10 +396,9 @@ TEST_CASE("Test array sorting via const span (default comparator)") {
 TEST_CASE("Test rvalue container with stateful comparator") {
     // Create sorted range
     std::vector<std::size_t> test_vector(array_size);
-    for (std::size_t i = 0; i < array_size; ++i)
-        test_vector[i] = i;
+    for (std::size_t i = 0; i < array_size; ++i) test_vector[i] = i;
 
-    std::atomic<std::size_t> count{0};
+    std::atomic<std::size_t> count {0};
     tbb::parallel_sort(std::move(test_vector), [&](std::size_t lhs, std::size_t rhs) {
         ++count;
         return lhs < rhs;
@@ -415,8 +412,7 @@ TEST_CASE("Test rvalue container with stateful comparator") {
 //! \brief \ref resource_usage
 TEST_CASE("That all workers sleep when no work") {
     int test_array[array_size];
-    for (std::size_t i = 0; i < array_size; ++i)
-        test_array[i] = rand() % array_size;
+    for (std::size_t i = 0; i < array_size; ++i) test_array[i] = rand() % array_size;
 
     tbb::parallel_sort(test_array);
     TestCPUUserTime(utils::get_platform_max_threads());
@@ -429,4 +425,4 @@ TEST_CASE("parallel_sort constraints") {
     test_psort_compare_constraints();
     test_psort_cbs_constraints();
 }
-#endif // __TBB_CPP20_CONCEPTS_PRESENT
+#endif// __TBB_CPP20_CONCEPTS_PRESENT
diff --git a/external/tbb/test/tbb/test_partitioner.cpp b/external/tbb/test/tbb/test_partitioner.cpp
index e0fb98fc..31e4e9dc 100644
--- a/external/tbb/test/tbb/test_partitioner.cpp
+++ b/external/tbb/test/tbb/test_partitioner.cpp
@@ -16,157 +16,143 @@
 
 #include "common/test.h"
 
+#include "oneapi/tbb/mutex.h"
+#include "tbb/global_control.h"
 #include "tbb/parallel_for.h"
 #include "tbb/task_arena.h"
 #include "tbb/task_scheduler_observer.h"
-#include "tbb/global_control.h"
-#include "oneapi/tbb/mutex.h"
 
-#include "common/utils.h"
-#include "common/utils_concurrency_limit.h"
 #include "common/dummy_body.h"
 #include "common/spin_barrier.h"
+#include "common/utils.h"
+#include "common/utils_concurrency_limit.h"
 
+#include <algorithm>// std::min_element
 #include <cstddef>
 #include <utility>
 #include <vector>
-#include <algorithm> // std::min_element
 
 //! \file test_partitioner.cpp
 //! \brief Test for [internal] functionality
 
 namespace task_affinity_retention {
 
-class leaving_observer : public tbb::task_scheduler_observer {
-    std::atomic<int> my_thread_count{};
-public:
-    leaving_observer(tbb::task_arena& a) : tbb::task_scheduler_observer(a) {
-        observe(true);
-    }
+    class leaving_observer : public tbb::task_scheduler_observer {
+        std::atomic<int> my_thread_count {};
 
-    void on_scheduler_entry(bool) override {
-        ++my_thread_count;
-    }
+    public:
+        leaving_observer(tbb::task_arena& a) : tbb::task_scheduler_observer(a) { observe(true); }
 
-    void on_scheduler_exit(bool) override {
-        --my_thread_count;
-    }
+        void on_scheduler_entry(bool) override { ++my_thread_count; }
+
+        void on_scheduler_exit(bool) override { --my_thread_count; }
 
-    void wait_leave() {
-        while (my_thread_count.load() != 0) {
-            std::this_thread::yield();
+        void wait_leave() {
+            while (my_thread_count.load() != 0) { std::this_thread::yield(); }
         }
-    }
-};
+    };
 
-template <typename PerBodyFunc> float test(PerBodyFunc&& body) {
-    const std::size_t num_threads = 2 * utils::get_platform_max_threads();
-    tbb::global_control concurrency(tbb::global_control::max_allowed_parallelism, num_threads);
-    tbb::task_arena big_arena(static_cast<int>(num_threads));
-    leaving_observer observer(big_arena);
+    template <typename PerBodyFunc>
+    float test(PerBodyFunc&& body) {
+        const std::size_t num_threads = 2 * utils::get_platform_max_threads();
+        tbb::global_control concurrency(tbb::global_control::max_allowed_parallelism, num_threads);
+        tbb::task_arena big_arena(static_cast<int>(num_threads));
+        leaving_observer observer(big_arena);
 
 #if __TBB_USE_THREAD_SANITIZER
-    // Reduce execution time under Thread Sanitizer
-    const std::size_t repeats = 50;
+        // Reduce execution time under Thread Sanitizer
+        const std::size_t repeats = 50;
 #elif EMSCRIPTEN
-    // Reduce execution time for emscripten
-    const std::size_t repeats = 10;
+        // Reduce execution time for emscripten
+        const std::size_t repeats = 10;
 #else
-    const std::size_t repeats = 100;
+        const std::size_t repeats = 100;
 #endif
-    const std::size_t per_thread_iters = 1000;
-
-    using range = std::pair<std::size_t, std::size_t>;
-    using execution_trace = std::vector< std::vector<range> >;
-
-    execution_trace trace(num_threads);
-    for (auto& v : trace)
-        v.reserve(repeats);
-
-    for (std::size_t repeat = 0; repeat < repeats; ++repeat) {
-        big_arena.execute([&] {
-            tbb::parallel_for(
-                tbb::blocked_range<std::size_t>(0, per_thread_iters * num_threads),
-                [&](const tbb::blocked_range<std::size_t>& r) {
-                    int thread_id = tbb::this_task_arena::current_thread_index();
-                    trace[thread_id].emplace_back(r.begin(), r.end());
-
-                    const bool is_uniform_split = r.size() == per_thread_iters;
-                    CHECK_MESSAGE(is_uniform_split, "static partitioner split the range incorrectly.");
-
-                    std::this_thread::yield();
-
-                    std::forward<PerBodyFunc>(body)();
-                },
-                tbb::static_partitioner()
-            );
-        });
-        // To avoid tasks stealing in the beginning of the parallel algorithm, the test waits for
-        // the threads to leave the arena, so that on the next iteration they have tasks assigned
-        // in their mailboxes and, thus, don't need to search for work to do in other task pools.
-        observer.wait_leave();
-    }
-
-    std::size_t range_shifts = 0;
-    for (std::size_t thread_id = 0; thread_id < num_threads; ++thread_id) {
-        auto trace_size = trace[thread_id].size();
-        if (trace_size > 1) {
-            auto previous_call_range = trace[thread_id][1];
-
-            for (std::size_t invocation = 2; invocation < trace_size; ++invocation) {
-                const auto& current_call_range = trace[thread_id][invocation];
+        const std::size_t per_thread_iters = 1000;
+
+        using range = std::pair<std::size_t, std::size_t>;
+        using execution_trace = std::vector<std::vector<range>>;
+
+        execution_trace trace(num_threads);
+        for (auto& v : trace) v.reserve(repeats);
+
+        for (std::size_t repeat = 0; repeat < repeats; ++repeat) {
+            big_arena.execute([&] {
+                tbb::parallel_for(
+                        tbb::blocked_range<std::size_t>(0, per_thread_iters * num_threads),
+                        [&](const tbb::blocked_range<std::size_t>& r) {
+                            int thread_id = tbb::this_task_arena::current_thread_index();
+                            trace[thread_id].emplace_back(r.begin(), r.end());
+
+                            const bool is_uniform_split = r.size() == per_thread_iters;
+                            CHECK_MESSAGE(is_uniform_split,
+                                          "static partitioner split the range incorrectly.");
+
+                            std::this_thread::yield();
+
+                            std::forward<PerBodyFunc>(body)();
+                        },
+                        tbb::static_partitioner());
+            });
+            // To avoid tasks stealing in the beginning of the parallel algorithm, the test waits for
+            // the threads to leave the arena, so that on the next iteration they have tasks assigned
+            // in their mailboxes and, thus, don't need to search for work to do in other task pools.
+            observer.wait_leave();
+        }
 
-                const bool is_range_changed = previous_call_range != current_call_range;
-                if (is_range_changed) {
-                    previous_call_range = current_call_range;
-                    // count thread changes its execution strategy
-                    ++range_shifts;
+        std::size_t range_shifts = 0;
+        for (std::size_t thread_id = 0; thread_id < num_threads; ++thread_id) {
+            auto trace_size = trace[thread_id].size();
+            if (trace_size > 1) {
+                auto previous_call_range = trace[thread_id][1];
+
+                for (std::size_t invocation = 2; invocation < trace_size; ++invocation) {
+                    const auto& current_call_range = trace[thread_id][invocation];
+
+                    const bool is_range_changed = previous_call_range != current_call_range;
+                    if (is_range_changed) {
+                        previous_call_range = current_call_range;
+                        // count thread changes its execution strategy
+                        ++range_shifts;
+                    }
                 }
             }
-        }
 
 #if TBB_USE_DEBUG
-        WARN_MESSAGE(
-            trace_size <= repeats,
-            "Thread " << thread_id << " executed extra " << trace_size - repeats
-            << " ranges assigned to other threads."
-        );
-        WARN_MESSAGE(
-            trace_size >= repeats,
-            "Thread " << thread_id << " executed " << repeats - trace_size
-            << " fewer ranges than expected."
-        );
+            WARN_MESSAGE(trace_size <= repeats, "Thread " << thread_id << " executed extra "
+                                                          << trace_size - repeats
+                                                          << " ranges assigned to other threads.");
+            WARN_MESSAGE(trace_size >= repeats, "Thread " << thread_id << " executed " << repeats - trace_size
+                                                          << " fewer ranges than expected.");
 #endif
-    }
+        }
 
 #if TBB_USE_DEBUG
-    WARN_MESSAGE(
-        range_shifts == 0,
-        "Threads change subranges " << range_shifts << " times out of "
-        << num_threads * repeats - num_threads << " possible."
-    );
+        WARN_MESSAGE(range_shifts == 0, "Threads change subranges " << range_shifts << " times out of "
+                                                                    << num_threads * repeats - num_threads
+                                                                    << " possible.");
 #endif
 
-    return float(range_shifts) / float(repeats * num_threads);
-}
+        return float(range_shifts) / float(repeats * num_threads);
+    }
 
-void relaxed_test() {
-    float range_shifts_part = test(/*per body invocation call*/[]{});
-    const float require_tolerance = 0.5f;
-    // TODO: investigate why switching could happen in more than half of the cases
-    WARN_MESSAGE(
-        (0 <= range_shifts_part && range_shifts_part <= require_tolerance),
-        "Tasks affinitization was not respected in " << range_shifts_part * 100 << "% of the cases."
-    );
-}
+    void relaxed_test() {
+        float range_shifts_part = test(/*per body invocation call*/ [] {});
+        const float require_tolerance = 0.5f;
+        // TODO: investigate why switching could happen in more than half of the cases
+        WARN_MESSAGE((0 <= range_shifts_part && range_shifts_part <= require_tolerance),
+                     "Tasks affinitization was not respected in " << range_shifts_part * 100
+                                                                  << "% of the cases.");
+    }
 
-void strict_test() {
-    utils::SpinBarrier barrier(2 * utils::get_platform_max_threads());
-    const float tolerance = 1e-5f;
-    while (test(/*per body invocation call*/[&barrier] { barrier.wait(); }) > tolerance);
-}
+    void strict_test() {
+        utils::SpinBarrier barrier(2 * utils::get_platform_max_threads());
+        const float tolerance = 1e-5f;
+        while (test(/*per body invocation call*/ [&barrier] { barrier.wait(); }) > tolerance)
+            ;
+    }
 
-} // namespace task_affinity_retention
+}// namespace task_affinity_retention
 
 // global_control::max_allowed_parallelism functionality is not covered by TCM
 #if !__TBB_TCM_TESTING_ENABLED
@@ -186,19 +172,20 @@ void test_custom_range(int diff_mult) {
     oneapi::tbb::mutex results_mutex;
 
     for (int i = 0; i < num_trials; ++i) {
-        oneapi::tbb::parallel_for(Range(0, int(100 * utils::get_platform_max_threads()), 1), [&] (const Range& r) {
-            oneapi::tbb::mutex::scoped_lock lock(results_mutex);
-            results[i].push_back(r.size());
-        }, oneapi::tbb::static_partitioner{});
+        oneapi::tbb::parallel_for(
+                Range(0, int(100 * utils::get_platform_max_threads()), 1),
+                [&](const Range& r) {
+                    oneapi::tbb::mutex::scoped_lock lock(results_mutex);
+                    results[i].push_back(r.size());
+                },
+                oneapi::tbb::static_partitioner {});
     }
 
     for (auto& res : results) {
         REQUIRE(res.size() == utils::get_platform_max_threads());
 
         std::size_t min_size = *std::min_element(res.begin(), res.end());
-        for (auto elem : res) {
-            REQUIRE(min_size * diff_mult + 2 >= elem);
-        }
+        for (auto elem : res) { REQUIRE(min_size * diff_mult + 2 >= elem); }
     }
 }
 
@@ -206,6 +193,7 @@ void test_custom_range(int diff_mult) {
 TEST_CASE("Test partitioned tasks count and size for static_partitioner") {
     class custom_range : public oneapi::tbb::blocked_range<int> {
         using base_type = oneapi::tbb::blocked_range<int>;
+
     public:
         custom_range(int l, int r, int g) : base_type(l, r, g) {}
         custom_range(const custom_range& r) : base_type(r) {}
@@ -217,6 +205,7 @@ TEST_CASE("Test partitioned tasks count and size for static_partitioner") {
 
     class custom_range_with_psplit : public oneapi::tbb::blocked_range<int> {
         using base_type = oneapi::tbb::blocked_range<int>;
+
     public:
         custom_range_with_psplit(int l, int r, int g) : base_type(l, r, g) {}
         custom_range_with_psplit(const custom_range_with_psplit& r) : base_type(r) {}
diff --git a/external/tbb/test/tbb/test_priority_queue_node.cpp b/external/tbb/test/tbb/test_priority_queue_node.cpp
index 18a60eb9..2ab5c7f1 100644
--- a/external/tbb/test/tbb/test_priority_queue_node.cpp
+++ b/external/tbb/test/tbb/test_priority_queue_node.cpp
@@ -21,12 +21,12 @@
 #include "tbb/flow_graph.h"
 #include "tbb/global_control.h"
 
-#include "common/test.h"
-#include "common/utils.h"
-#include "common/utils_assert.h"
 #include "common/checktype.h"
 #include "common/graph_utils.h"
+#include "common/test.h"
 #include "common/test_follows_and_precedes_api.h"
+#include "common/utils.h"
+#include "common/utils_assert.h"
 
 #include <cstdio>
 
@@ -35,65 +35,63 @@
 //! \file test_priority_queue_node.cpp
 //! \brief Test for [flow_graph.priority_queue_node] specification
 
-
 #define N 10
 #define C 10
 
-template< typename T >
-void spin_try_get( tbb::flow::priority_queue_node<T> &q, T &value ) {
-    while ( q.try_get(value) != true ) ;
+template <typename T>
+void spin_try_get(tbb::flow::priority_queue_node<T> &q, T &value) {
+    while (q.try_get(value) != true)
+        ;
 }
 
-template< typename T >
-void check_item( T* next_value, T &value ) {
+template <typename T>
+void check_item(T *next_value, T &value) {
     int tid = value / N;
     int offset = value % N;
-    CHECK_MESSAGE( next_value[tid] == T(offset), "" );
+    CHECK_MESSAGE(next_value[tid] == T(offset), "");
     ++next_value[tid];
 }
 
-template< typename T >
+template <typename T>
 struct parallel_puts : utils::NoAssign {
     tbb::flow::priority_queue_node<T> &my_q;
-    parallel_puts( tbb::flow::priority_queue_node<T> &q ) : my_q(q) {}
+    parallel_puts(tbb::flow::priority_queue_node<T> &q) : my_q(q) {}
     void operator()(int i) const {
         for (int j = 0; j < N; ++j) {
-            bool msg = my_q.try_put( T(N*i + j) );
-            CHECK_MESSAGE( msg == true, "" );
+            bool msg = my_q.try_put(T(N * i + j));
+            CHECK_MESSAGE(msg == true, "");
         }
     }
 };
 
-template< typename T >
+template <typename T>
 struct parallel_gets : utils::NoAssign {
     tbb::flow::priority_queue_node<T> &my_q;
-    parallel_gets( tbb::flow::priority_queue_node<T> &q) : my_q(q) {}
+    parallel_gets(tbb::flow::priority_queue_node<T> &q) : my_q(q) {}
     void operator()(int) const {
         T prev;
-        spin_try_get( my_q, prev );
-        for (int j = 0; j < N-1; ++j) {
+        spin_try_get(my_q, prev);
+        for (int j = 0; j < N - 1; ++j) {
             T v;
-            spin_try_get( my_q, v );
+            spin_try_get(my_q, v);
             CHECK_MESSAGE(v < prev, "");
         }
     }
 };
 
-template< typename T >
+template <typename T>
 struct parallel_put_get : utils::NoAssign {
     tbb::flow::priority_queue_node<T> &my_q;
-    parallel_put_get( tbb::flow::priority_queue_node<T> &q ) : my_q(q) {}
+    parallel_put_get(tbb::flow::priority_queue_node<T> &q) : my_q(q) {}
     void operator()(int tid) const {
-        for ( int i = 0; i < N; i+=C ) {
-            int j_end = ( N < i + C ) ? N : i + C;
+        for (int i = 0; i < N; i += C) {
+            int j_end = (N < i + C) ? N : i + C;
             // dump about C values into the Q
-            for ( int j = i; j < j_end; ++j ) {
-                CHECK_MESSAGE( my_q.try_put( T (N*tid + j ) ) == true, "" );
-            }
+            for (int j = i; j < j_end; ++j) { CHECK_MESSAGE(my_q.try_put(T(N * tid + j)) == true, ""); }
             // receive about C values from the Q
-            for ( int j = i; j < j_end; ++j ) {
+            for (int j = i; j < j_end; ++j) {
                 T v;
-                spin_try_get( my_q, v );
+                spin_try_get(my_q, v);
             }
         }
     }
@@ -104,7 +102,7 @@ struct parallel_put_get : utils::NoAssign {
 //
 // Item can be reserved, released, consumed ( single serial receiver )
 //
-template< typename T >
+template <typename T>
 int test_reservation(int) {
     tbb::flow::graph g;
 
@@ -120,38 +118,38 @@ int test_reservation(int) {
         q.try_put(T(3));
         g.wait_for_all();
 
-        T v=bogus_value, w=bogus_value;
-        CHECK_MESSAGE( q.try_reserve(v) == true, "" );
-        CHECK_MESSAGE( v == T(3), "" );
-        CHECK_MESSAGE( q.try_release() == true, "" );
+        T v = bogus_value, w = bogus_value;
+        CHECK_MESSAGE(q.try_reserve(v) == true, "");
+        CHECK_MESSAGE(v == T(3), "");
+        CHECK_MESSAGE(q.try_release() == true, "");
         v = bogus_value;
         g.wait_for_all();
-        CHECK_MESSAGE( q.try_reserve(v) == true, "" );
-        CHECK_MESSAGE( v == T(3), "" );
-        CHECK_MESSAGE( q.try_consume() == true, "" );
+        CHECK_MESSAGE(q.try_reserve(v) == true, "");
+        CHECK_MESSAGE(v == T(3), "");
+        CHECK_MESSAGE(q.try_consume() == true, "");
         v = bogus_value;
         g.wait_for_all();
 
-        CHECK_MESSAGE( q.try_get(v) == true, "" );
-        CHECK_MESSAGE( v == T(2), "" );
+        CHECK_MESSAGE(q.try_get(v) == true, "");
+        CHECK_MESSAGE(v == T(2), "");
         v = bogus_value;
         g.wait_for_all();
 
-        CHECK_MESSAGE( q.try_reserve(v) == true, "" );
-        CHECK_MESSAGE( v == T(1), "" );
-        CHECK_MESSAGE( q.try_reserve(w) == false, "" );
-        CHECK_MESSAGE( w == bogus_value, "" );
-        CHECK_MESSAGE( q.try_get(w) == false, "" );
-        CHECK_MESSAGE( w == bogus_value, "" );
-        CHECK_MESSAGE( q.try_release() == true, "" );
+        CHECK_MESSAGE(q.try_reserve(v) == true, "");
+        CHECK_MESSAGE(v == T(1), "");
+        CHECK_MESSAGE(q.try_reserve(w) == false, "");
+        CHECK_MESSAGE(w == bogus_value, "");
+        CHECK_MESSAGE(q.try_get(w) == false, "");
+        CHECK_MESSAGE(w == bogus_value, "");
+        CHECK_MESSAGE(q.try_release() == true, "");
         v = bogus_value;
         g.wait_for_all();
-        CHECK_MESSAGE( q.try_reserve(v) == true, "" );
-        CHECK_MESSAGE( v == T(1), "" );
-        CHECK_MESSAGE( q.try_consume() == true, "" );
+        CHECK_MESSAGE(q.try_reserve(v) == true, "");
+        CHECK_MESSAGE(v == T(1), "");
+        CHECK_MESSAGE(q.try_consume() == true, "");
         v = bogus_value;
         g.wait_for_all();
-        CHECK_MESSAGE( q.try_get(v) == false, "" );
+        CHECK_MESSAGE(q.try_get(v) == false, "");
     }
     return 0;
 }
@@ -164,7 +162,7 @@ int test_reservation(int) {
 //   * overlapped puts / gets
 //   * all puts finished before any getS
 //
-template< typename T >
+template <typename T>
 int test_parallel(int num_threads) {
     tbb::flow::graph g;
     tbb::flow::priority_queue_node<T> q(g);
@@ -173,62 +171,62 @@ int test_parallel(int num_threads) {
     T bogus_value(-1);
     T j = bogus_value;
 
-    NativeParallelFor( num_threads, parallel_puts<T>(q) );
-    for (int i = num_threads*N -1; i>=0; --i) {
-        spin_try_get( q, j );
+    NativeParallelFor(num_threads, parallel_puts<T>(q));
+    for (int i = num_threads * N - 1; i >= 0; --i) {
+        spin_try_get(q, j);
         CHECK_MESSAGE(j == i, "");
         j = bogus_value;
     }
     g.wait_for_all();
-    CHECK_MESSAGE( q.try_get( j ) == false, "" );
-    CHECK_MESSAGE( j == bogus_value, "" );
+    CHECK_MESSAGE(q.try_get(j) == false, "");
+    CHECK_MESSAGE(j == bogus_value, "");
 
-    NativeParallelFor( num_threads, parallel_puts<T>(q) );
+    NativeParallelFor(num_threads, parallel_puts<T>(q));
     g.wait_for_all();
-    NativeParallelFor( num_threads, parallel_gets<T>(q) );
+    NativeParallelFor(num_threads, parallel_gets<T>(q));
     g.wait_for_all();
     j = bogus_value;
-    CHECK_MESSAGE( q.try_get( j ) == false, "" );
-    CHECK_MESSAGE( j == bogus_value, "" );
+    CHECK_MESSAGE(q.try_get(j) == false, "");
+    CHECK_MESSAGE(j == bogus_value, "");
 
-    NativeParallelFor( num_threads, parallel_put_get<T>(q) );
+    NativeParallelFor(num_threads, parallel_put_get<T>(q));
     g.wait_for_all();
     j = bogus_value;
-    CHECK_MESSAGE( q.try_get( j ) == false, "" );
-    CHECK_MESSAGE( j == bogus_value, "" );
+    CHECK_MESSAGE(q.try_get(j) == false, "");
+    CHECK_MESSAGE(j == bogus_value, "");
 
-    tbb::flow::make_edge( q, q2 );
-    tbb::flow::make_edge( q2, q3 );
-    NativeParallelFor( num_threads, parallel_puts<T>(q) );
+    tbb::flow::make_edge(q, q2);
+    tbb::flow::make_edge(q2, q3);
+    NativeParallelFor(num_threads, parallel_puts<T>(q));
     g.wait_for_all();
-    NativeParallelFor( num_threads, parallel_gets<T>(q3) );
+    NativeParallelFor(num_threads, parallel_gets<T>(q3));
     g.wait_for_all();
     j = bogus_value;
-    CHECK_MESSAGE( q.try_get( j ) == false, "" );
-    CHECK_MESSAGE( j == bogus_value, "" );
-    CHECK_MESSAGE( q2.try_get( j ) == false, "" );
-    CHECK_MESSAGE( j == bogus_value, "" );
-    CHECK_MESSAGE( q3.try_get( j ) == false, "" );
-    CHECK_MESSAGE( j == bogus_value, "" );
+    CHECK_MESSAGE(q.try_get(j) == false, "");
+    CHECK_MESSAGE(j == bogus_value, "");
+    CHECK_MESSAGE(q2.try_get(j) == false, "");
+    CHECK_MESSAGE(j == bogus_value, "");
+    CHECK_MESSAGE(q3.try_get(j) == false, "");
+    CHECK_MESSAGE(j == bogus_value, "");
 
     // test copy constructor
-    CHECK_MESSAGE( remove_successor(q, q2) == true, "" );
-    NativeParallelFor( num_threads, parallel_puts<T>(q) );
+    CHECK_MESSAGE(remove_successor(q, q2) == true, "");
+    NativeParallelFor(num_threads, parallel_puts<T>(q));
     tbb::flow::priority_queue_node<T> q_copy(q);
     g.wait_for_all();
     j = bogus_value;
-    CHECK_MESSAGE( q_copy.try_get( j ) == false, "" );
-    CHECK_MESSAGE( register_successor(q, q_copy) == true, "" );
-    for (int i = num_threads*N -1; i>=0; --i) {
-        spin_try_get( q_copy, j );
+    CHECK_MESSAGE(q_copy.try_get(j) == false, "");
+    CHECK_MESSAGE(register_successor(q, q_copy) == true, "");
+    for (int i = num_threads * N - 1; i >= 0; --i) {
+        spin_try_get(q_copy, j);
         CHECK_MESSAGE(j == i, "");
         j = bogus_value;
     }
     g.wait_for_all();
-    CHECK_MESSAGE( q.try_get( j ) == false, "" );
-    CHECK_MESSAGE( j == bogus_value, "" );
-    CHECK_MESSAGE( q_copy.try_get( j ) == false, "" );
-    CHECK_MESSAGE( j == bogus_value, "" );
+    CHECK_MESSAGE(q.try_get(j) == false, "");
+    CHECK_MESSAGE(j == bogus_value, "");
+    CHECK_MESSAGE(q_copy.try_get(j) == false, "");
+    CHECK_MESSAGE(j == bogus_value, "");
 
     return 0;
 }
@@ -242,7 +240,7 @@ int test_parallel(int num_threads) {
 // Chained Qs ( 2 & 3 ), single sender, items at last Q in FIFO order
 //
 
-template< typename T >
+template <typename T>
 int test_serial() {
     tbb::flow::graph g;
     T bogus_value(-1);
@@ -255,85 +253,82 @@ int test_serial() {
     // Rejects attempts to add / remove predecessor
     // Rejects request from empty Q
     //
-    CHECK_MESSAGE( register_predecessor(q, q2) == false, "" );
-    CHECK_MESSAGE( remove_predecessor(q, q2) == false, "" );
-    CHECK_MESSAGE( q.try_get( j ) == false, "" );
-    CHECK_MESSAGE( j == bogus_value, "" );
+    CHECK_MESSAGE(register_predecessor(q, q2) == false, "");
+    CHECK_MESSAGE(remove_predecessor(q, q2) == false, "");
+    CHECK_MESSAGE(q.try_get(j) == false, "");
+    CHECK_MESSAGE(j == bogus_value, "");
 
     //
     // Simple puts and gets
     //
 
-    for (int i = 0; i < N; ++i)
-        CHECK_MESSAGE( q.try_put( T(i) ), "" );
-    for (int i = N-1; i >=0; --i) {
+    for (int i = 0; i < N; ++i) CHECK_MESSAGE(q.try_put(T(i)), "");
+    for (int i = N - 1; i >= 0; --i) {
         j = bogus_value;
-        spin_try_get( q, j );
-        CHECK_MESSAGE( i == j, "" );
+        spin_try_get(q, j);
+        CHECK_MESSAGE(i == j, "");
     }
     j = bogus_value;
     g.wait_for_all();
-    CHECK_MESSAGE( q.try_get( j ) == false, "" );
-    CHECK_MESSAGE( j == bogus_value, "" );
+    CHECK_MESSAGE(q.try_get(j) == false, "");
+    CHECK_MESSAGE(j == bogus_value, "");
 
-    tbb::flow::make_edge( q, q2 );
+    tbb::flow::make_edge(q, q2);
 
-    for (int i = 0; i < N; ++i)
-        CHECK_MESSAGE( q.try_put( T(i) ), "" );
+    for (int i = 0; i < N; ++i) CHECK_MESSAGE(q.try_put(T(i)), "");
     g.wait_for_all();
-    for (int i = N-1; i >= 0; --i) {
+    for (int i = N - 1; i >= 0; --i) {
         j = bogus_value;
-        spin_try_get( q2, j );
-        CHECK_MESSAGE( i == j, "" );
+        spin_try_get(q2, j);
+        CHECK_MESSAGE(i == j, "");
     }
     j = bogus_value;
     g.wait_for_all();
-    CHECK_MESSAGE( q.try_get( j ) == false, "" );
+    CHECK_MESSAGE(q.try_get(j) == false, "");
     g.wait_for_all();
-    CHECK_MESSAGE( q2.try_get( j ) == false, "" );
-    CHECK_MESSAGE( j == bogus_value, "" );
+    CHECK_MESSAGE(q2.try_get(j) == false, "");
+    CHECK_MESSAGE(j == bogus_value, "");
 
-    tbb::flow::remove_edge( q, q2 );
-    CHECK_MESSAGE( q.try_put( 1 ) == true, "" );
+    tbb::flow::remove_edge(q, q2);
+    CHECK_MESSAGE(q.try_put(1) == true, "");
     g.wait_for_all();
-    CHECK_MESSAGE( q2.try_get( j ) == false, "" );
-    CHECK_MESSAGE( j == bogus_value, "" );
+    CHECK_MESSAGE(q2.try_get(j) == false, "");
+    CHECK_MESSAGE(j == bogus_value, "");
     g.wait_for_all();
-    CHECK_MESSAGE( q.try_get( j ) == true, "" );
-    CHECK_MESSAGE( j == 1, "" );
+    CHECK_MESSAGE(q.try_get(j) == true, "");
+    CHECK_MESSAGE(j == 1, "");
 
     tbb::flow::priority_queue_node<T> q3(g);
-    tbb::flow::make_edge( q, q2 );
-    tbb::flow::make_edge( q2, q3 );
+    tbb::flow::make_edge(q, q2);
+    tbb::flow::make_edge(q2, q3);
 
-    for (int i = 0; i < N; ++i)
-        CHECK_MESSAGE(  q.try_put( T(i) ), "" );
+    for (int i = 0; i < N; ++i) CHECK_MESSAGE(q.try_put(T(i)), "");
     g.wait_for_all();
-    for (int i = N-1; i >= 0; --i) {
+    for (int i = N - 1; i >= 0; --i) {
         j = bogus_value;
-        spin_try_get( q3, j );
-        CHECK_MESSAGE( i == j, "" );
+        spin_try_get(q3, j);
+        CHECK_MESSAGE(i == j, "");
     }
     j = bogus_value;
     g.wait_for_all();
-    CHECK_MESSAGE( q.try_get( j ) == false, "" );
+    CHECK_MESSAGE(q.try_get(j) == false, "");
     g.wait_for_all();
-    CHECK_MESSAGE( q2.try_get( j ) == false, "" );
+    CHECK_MESSAGE(q2.try_get(j) == false, "");
     g.wait_for_all();
-    CHECK_MESSAGE( q3.try_get( j ) == false, "" );
-    CHECK_MESSAGE( j == bogus_value, "" );
+    CHECK_MESSAGE(q3.try_get(j) == false, "");
+    CHECK_MESSAGE(j == bogus_value, "");
 
-    tbb::flow::remove_edge( q,  q2 );
-    CHECK_MESSAGE( q.try_put( 1 ) == true, "" );
+    tbb::flow::remove_edge(q, q2);
+    CHECK_MESSAGE(q.try_put(1) == true, "");
     g.wait_for_all();
-    CHECK_MESSAGE( q2.try_get( j ) == false, "" );
-    CHECK_MESSAGE( j == bogus_value, "" );
+    CHECK_MESSAGE(q2.try_get(j) == false, "");
+    CHECK_MESSAGE(j == bogus_value, "");
     g.wait_for_all();
-    CHECK_MESSAGE( q3.try_get( j ) == false, "" );
-    CHECK_MESSAGE( j == bogus_value, "" );
+    CHECK_MESSAGE(q3.try_get(j) == false, "");
+    CHECK_MESSAGE(j == bogus_value, "");
     g.wait_for_all();
-    CHECK_MESSAGE( q.try_get( j ) == true, "" );
-    CHECK_MESSAGE( j == 1, "" );
+    CHECK_MESSAGE(q.try_get(j) == true, "");
+    CHECK_MESSAGE(j == 1, "");
 
     return 0;
 }
@@ -342,11 +337,13 @@ int test_serial() {
 #include <array>
 #include <vector>
 void test_follows_and_precedes_api() {
-    std::array<int, 3> messages_for_follows = { {0, 1, 2} };
+    std::array<int, 3> messages_for_follows = {{0, 1, 2}};
     std::vector<int> messages_for_precedes = {0, 1, 2};
 
-    follows_and_precedes_testing::test_follows <int, tbb::flow::priority_queue_node<int>>(messages_for_follows);
-    follows_and_precedes_testing::test_precedes <int, tbb::flow::priority_queue_node<int>>(messages_for_precedes);
+    follows_and_precedes_testing::test_follows<int, tbb::flow::priority_queue_node<int>>(
+            messages_for_follows);
+    follows_and_precedes_testing::test_precedes<int, tbb::flow::priority_queue_node<int>>(
+            messages_for_precedes);
 }
 #endif
 
@@ -405,8 +402,8 @@ void test_pqueue_node_try_put_and_wait() {
     {
         std::vector<int> processed_items;
 
-        std::size_t after_start = test_buffer_push<tbb::flow::priority_queue_node<int>>(start_work_items, wait_message,
-                                                                                        new_work_items, processed_items);
+        std::size_t after_start = test_buffer_push<tbb::flow::priority_queue_node<int>>(
+                start_work_items, wait_message, new_work_items, processed_items);
 
         // Expected effect:
         // During buffer1.try_put_and_wait()
@@ -438,7 +435,7 @@ void test_pqueue_node_try_put_and_wait() {
                           "wait_for_all should process new_work_items in LIFO order");
         }
         CHECK(check_index == processed_items.size());
-    } // Test push
+    }// Test push
 
     // Test pull
     // test_buffer_pull tests the graph
@@ -456,8 +453,8 @@ void test_pqueue_node_try_put_and_wait() {
         std::vector<int> processed_items;
         int occupier = 42;
 
-        std::size_t after_start = test_buffer_pull<tbb::flow::priority_queue_node<int>>(start_work_items, wait_message, occupier,
-                                                                                        new_work_items, processed_items);
+        std::size_t after_start = test_buffer_pull<tbb::flow::priority_queue_node<int>>(
+                start_work_items, wait_message, occupier, new_work_items, processed_items);
 
         // Expected effect
         // 0. task for occupier processing would be spawned by the function
@@ -477,7 +474,8 @@ void test_pqueue_node_try_put_and_wait() {
         std::size_t check_index = 0;
         CHECK_MESSAGE(after_start == start_work_items.size() + 2,
                       "try_put_and_wait should process start_work_items, occupier and the wait_message");
-        CHECK_MESSAGE(processed_items[check_index++] == occupier, "try_put_and_wait should process the occupier");
+        CHECK_MESSAGE(processed_items[check_index++] == occupier,
+                      "try_put_and_wait should process the occupier");
         for (std::size_t i = start_work_items.size(); i != 0; --i) {
             CHECK_MESSAGE(processed_items[check_index++] == start_work_items[i - 1],
                           "try_put_and_wait should process start_work_items in LIFO order");
@@ -494,7 +492,7 @@ void test_pqueue_node_try_put_and_wait() {
 
     // Test reserve
     {
-        int thresholds[] = { 1, 2 };
+        int thresholds[] = {1, 2};
 
         for (int threshold : thresholds) {
             std::vector<int> processed_items;
@@ -504,8 +502,8 @@ void test_pqueue_node_try_put_and_wait() {
             //  function is a rejecting serial function_node that puts an item to the decrementer port
             //  of the limiter inside of the body
 
-            std::size_t after_start = test_buffer_reserve<tbb::flow::priority_queue_node<int>>(threshold,
-                start_work_items, wait_message, new_work_items, processed_items);
+            std::size_t after_start = test_buffer_reserve<tbb::flow::priority_queue_node<int>>(
+                    threshold, start_work_items, wait_message, new_work_items, processed_items);
 
             // Expected effect:
             // 1. start_work_items would be pushed to the buffer
@@ -528,7 +526,8 @@ void test_pqueue_node_try_put_and_wait() {
                               "Unexpected start_work_items processing");
             }
 
-            CHECK_MESSAGE(processed_items[check_index++] == wait_message, "Unexpected wait_message processing");
+            CHECK_MESSAGE(processed_items[check_index++] == wait_message,
+                          "Unexpected wait_message processing");
 
             for (std::size_t index = new_work_items.size(); index != 0; --index) {
                 CHECK_MESSAGE(processed_items[check_index++] == new_work_items[index - 1],
@@ -537,52 +536,44 @@ void test_pqueue_node_try_put_and_wait() {
         }
     }
 }
-#endif // __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+#endif// __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
 
 //! Test serial, parallel behavior and reservation under parallelism
 //! \brief \ref requirement \ref error_guessing
-TEST_CASE("Serial, parallel and reservation tests"){
+TEST_CASE("Serial, parallel and reservation tests") {
     for (int p = 2; p <= 4; ++p) {
         tbb::global_control thread_limit(tbb::global_control::max_allowed_parallelism, p);
         tbb::task_arena arena(p);
-        arena.execute(
-            [&]() {
-                test_serial<int>();
-                test_reservation<int>(p);
-                test_reservation<CheckType<int> >(p);
-                test_parallel<int>(p);
-            }
-        );
-	}
+        arena.execute([&]() {
+            test_serial<int>();
+            test_reservation<int>(p);
+            test_reservation<CheckType<int>>(p);
+            test_parallel<int>(p);
+        });
+    }
 }
 
 //! Test reset and cancellation
 //! \brief \ref error_guessing
-TEST_CASE("Reset tests"){
+TEST_CASE("Reset tests") {
     INFO("Testing resets\n");
-    test_resets<int,tbb::flow::priority_queue_node<int> >();
-    test_resets<float,tbb::flow::priority_queue_node<float> >();
+    test_resets<int, tbb::flow::priority_queue_node<int>>();
+    test_resets<float, tbb::flow::priority_queue_node<float>>();
 }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 //! Test follows and precedes API
 //! \brief \ref error_guessing
-TEST_CASE("Test follows and precedes API"){
-    test_follows_and_precedes_api();
-}
+TEST_CASE("Test follows and precedes API") { test_follows_and_precedes_api(); }
 #endif
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 //! Test decution guides
 //! \brief \ref requirement
-TEST_CASE("Test deduction guides"){
-    test_deduction_guides();
-}
+TEST_CASE("Test deduction guides") { test_deduction_guides(); }
 #endif
 
 #if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
 //! \brief \ref error_guessing
-TEST_CASE("test priority_queue_node try_put_and_wait") {
-    test_pqueue_node_try_put_and_wait();
-}
+TEST_CASE("test priority_queue_node try_put_and_wait") { test_pqueue_node_try_put_and_wait(); }
 #endif
diff --git a/external/tbb/test/tbb/test_profiling.cpp b/external/tbb/test/tbb/test_profiling.cpp
index 7f14d6a8..0394ce3c 100644
--- a/external/tbb/test/tbb/test_profiling.cpp
+++ b/external/tbb/test/tbb/test_profiling.cpp
@@ -15,52 +15,47 @@
 */
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
 #endif
 
 #define DOCTEST_CONFIG_SUPER_FAST_ASSERTS
 #include "common/test.h"
 
-#include "tbb/spin_mutex.h"
-#include "tbb/spin_rw_mutex.h"
 #include "tbb/queuing_mutex.h"
 #include "tbb/queuing_rw_mutex.h"
+#include "tbb/spin_mutex.h"
+#include "tbb/spin_rw_mutex.h"
 
 //! \file test_profiling.cpp
 //! \brief Test for [internal] functionality
 
 //! Test for mutexes set_name
 //! \brief \ref interface
-TEST_CASE_TEMPLATE("Mutexes set_name", Mutex, tbb::spin_mutex,
-                                              tbb::spin_rw_mutex,
-                                              tbb::speculative_spin_mutex,
-                                              tbb::speculative_spin_rw_mutex,
-                                              tbb::queuing_mutex,
-                                              tbb::queuing_rw_mutex) {
+TEST_CASE_TEMPLATE("Mutexes set_name", Mutex, tbb::spin_mutex, tbb::spin_rw_mutex,
+                   tbb::speculative_spin_mutex, tbb::speculative_spin_rw_mutex, tbb::queuing_mutex,
+                   tbb::queuing_rw_mutex) {
     Mutex mutex;
     tbb::profiling::set_name(mutex, "mutex");
 }
 
-
-#if (_WIN32||_WIN64)
+#if (_WIN32 || _WIN64)
 //! Test for mutexes set_name with wchar
 //! \brief \ref interface
-TEST_CASE_TEMPLATE("Mutexes set_name wchar", Mutex, tbb::spin_mutex,
-                                              tbb::spin_rw_mutex,
-                                              tbb::speculative_spin_mutex,
-                                              tbb::speculative_spin_rw_mutex,
-                                              tbb::queuing_mutex,
-                                              tbb::queuing_rw_mutex) {
+TEST_CASE_TEMPLATE("Mutexes set_name wchar", Mutex, tbb::spin_mutex, tbb::spin_rw_mutex,
+                   tbb::speculative_spin_mutex, tbb::speculative_spin_rw_mutex, tbb::queuing_mutex,
+                   tbb::queuing_rw_mutex) {
     Mutex mutex;
     tbb::profiling::set_name(mutex, L"mutex");
 }
-#endif //WIN
+#endif//WIN
 
 #include "tbb/flow_graph.h"
 
 struct Body {
-    template<typename... Args>
-    int operator()(Args...) { return 0; }
+    template <typename... Args>
+    int operator()(Args...) {
+        return 0;
+    }
 };
 
 //! Test for flow graph set_name
@@ -70,9 +65,8 @@ TEST_CASE("Flow Graph set_name") {
     tbb::profiling::set_name(g, "graph");
 }
 
-struct async_body
-{
-    template<typename T>
+struct async_body {
+    template <typename T>
     void operator()(int, T&) {};
 };
 
@@ -80,7 +74,7 @@ struct async_body
 //! \brief \ref interface
 TEST_CASE("async_node set_name") {
     tbb::flow::graph g;
-    tbb::flow::async_node<int, int> node(g, 1, async_body{});
+    tbb::flow::async_node<int, int> node(g, 1, async_body {});
     tbb::profiling::set_name(node, "async_node");
 }
 
@@ -112,11 +106,8 @@ TEST_CASE("composite_node set_name") {
 //! \brief \ref interface
 TEST_CASE("continue_node set_name") {
     tbb::flow::graph g;
-    tbb::flow::continue_node<tbb::flow::continue_msg> node(g,
-        [](const tbb::flow::continue_msg& val) -> const tbb::flow::continue_msg&
-        {
-            return val;
-        });
+    tbb::flow::continue_node<tbb::flow::continue_msg> node(
+            g, [](const tbb::flow::continue_msg& val) -> const tbb::flow::continue_msg& { return val; });
     tbb::profiling::set_name(node, "continue_node");
 }
 
@@ -124,7 +115,7 @@ TEST_CASE("continue_node set_name") {
 //! \brief \ref interface
 TEST_CASE("function_node set_name") {
     tbb::flow::graph g;
-    tbb::flow::function_node<int, int> node(g, 1, [](const int& val) -> int {return val; });
+    tbb::flow::function_node<int, int> node(g, 1, [](const int& val) -> int { return val; });
     tbb::profiling::set_name(node, "function_node");
 }
 
@@ -158,7 +149,7 @@ TEST_CASE("indexer_node set_name") {
 //! \brief \ref interface
 TEST_CASE("input_node set_name") {
     tbb::flow::graph g;
-    tbb::flow::input_node<int> node(g, [](tbb::flow_control& ) -> int { return 0;});
+    tbb::flow::input_node<int> node(g, [](tbb::flow_control&) -> int { return 0; });
     tbb::profiling::set_name(node, "input_node");
 }
 
@@ -178,9 +169,8 @@ TEST_CASE("limiter_node set_name") {
     tbb::profiling::set_name(node, "limiter_node");
 }
 
-struct mf_body
-{
-    template<typename T>
+struct mf_body {
+    template <typename T>
     void operator()(int, T&) {};
 };
 
@@ -188,7 +178,7 @@ struct mf_body
 //! \brief \ref interface
 TEST_CASE("multifunction_node set_name") {
     tbb::flow::graph g;
-    tbb::flow::multifunction_node<int, std::tuple<int>> node(g, 1, mf_body{});
+    tbb::flow::multifunction_node<int, std::tuple<int>> node(g, 1, mf_body {});
     tbb::profiling::set_name(node, "multifunction_node");
 }
 
@@ -224,7 +214,7 @@ struct seq_inspector {
 //! \brief \ref interface
 TEST_CASE("sequencer_node set_name") {
     tbb::flow::graph g;
-    tbb::flow::sequencer_node<int> node(g, seq_inspector{});
+    tbb::flow::sequencer_node<int> node(g, seq_inspector {});
     tbb::profiling::set_name(node, "sequencer_node");
 }
 
diff --git a/external/tbb/test/tbb/test_queue_node.cpp b/external/tbb/test/tbb/test_queue_node.cpp
index 546b47ed..60ac5536 100644
--- a/external/tbb/test/tbb/test_queue_node.cpp
+++ b/external/tbb/test/tbb/test_queue_node.cpp
@@ -21,12 +21,12 @@
 #include "tbb/flow_graph.h"
 #include "tbb/global_control.h"
 
-#include "common/test.h"
-#include "common/utils.h"
-#include "common/utils_assert.h"
 #include "common/checktype.h"
 #include "common/graph_utils.h"
+#include "common/test.h"
 #include "common/test_follows_and_precedes_api.h"
+#include "common/utils.h"
+#include "common/utils_assert.h"
 
 #include <cstdio>
 
@@ -35,87 +35,81 @@
 //! \file test_queue_node.cpp
 //! \brief Test for [flow_graph.queue_node] specification
 
-
 #define N 1000
 #define C 10
 
-template< typename T >
-void spin_try_get( tbb::flow::queue_node<T> &q, T &value ) {
+template <typename T>
+void spin_try_get(tbb::flow::queue_node<T> &q, T &value) {
     int count = 0;
-    while ( q.try_get(value) != true ) {
-        if (count < 1000000) {
-            ++count;
-        }
+    while (q.try_get(value) != true) {
+        if (count < 1000000) { ++count; }
         if (count == 1000000) {
             // Perhaps, we observe the missed wakeup. Enqueue a task to wake up threads.
-            tbb::task_arena a(tbb::task_arena::attach{});
-            a.enqueue([]{});
+            tbb::task_arena a(tbb::task_arena::attach {});
+            a.enqueue([] {});
             ++count;
         }
     }
 }
 
-template< typename T >
-void check_item( T* next_value, T &value ) {
+template <typename T>
+void check_item(T *next_value, T &value) {
     int tid = value / N;
     int offset = value % N;
-    CHECK_MESSAGE( next_value[tid] == T(offset), "" );
+    CHECK_MESSAGE(next_value[tid] == T(offset), "");
     ++next_value[tid];
 }
 
-template< typename T >
+template <typename T>
 struct parallel_puts : utils::NoAssign {
 
     tbb::flow::queue_node<T> &my_q;
 
-    parallel_puts( tbb::flow::queue_node<T> &q ) : my_q(q) {}
+    parallel_puts(tbb::flow::queue_node<T> &q) : my_q(q) {}
 
     void operator()(int i) const {
         for (int j = 0; j < N; ++j) {
-            bool msg = my_q.try_put( T(N*i + j) );
-            CHECK_MESSAGE( msg == true, "" );
+            bool msg = my_q.try_put(T(N * i + j));
+            CHECK_MESSAGE(msg == true, "");
         }
     }
-
 };
 
-template< typename T >
+template <typename T>
 struct touches {
 
     bool **my_touches;
     T **my_last_touch;
     int my_num_threads;
 
-    touches( int num_threads ) : my_num_threads(num_threads) {
-        my_last_touch = new T* [my_num_threads];
-        my_touches = new bool* [my_num_threads];
-        for ( int p = 0; p < my_num_threads; ++p) {
+    touches(int num_threads) : my_num_threads(num_threads) {
+        my_last_touch = new T *[my_num_threads];
+        my_touches = new bool *[my_num_threads];
+        for (int p = 0; p < my_num_threads; ++p) {
             my_last_touch[p] = new T[my_num_threads];
-            for ( int p2 = 0; p2 < my_num_threads; ++p2)
-                my_last_touch[p][p2] = -1;
+            for (int p2 = 0; p2 < my_num_threads; ++p2) my_last_touch[p][p2] = -1;
 
-            my_touches[p] = new bool[N*my_num_threads];
-            for ( int n = 0; n < N*my_num_threads; ++n)
-                my_touches[p][n] = false;
+            my_touches[p] = new bool[N * my_num_threads];
+            for (int n = 0; n < N * my_num_threads; ++n) my_touches[p][n] = false;
         }
     }
 
     ~touches() {
-        for ( int p = 0; p < my_num_threads; ++p) {
-            delete [] my_touches[p];
-            delete [] my_last_touch[p];
+        for (int p = 0; p < my_num_threads; ++p) {
+            delete[] my_touches[p];
+            delete[] my_last_touch[p];
         }
-        delete [] my_touches;
-        delete [] my_last_touch;
+        delete[] my_touches;
+        delete[] my_last_touch;
     }
 
-    bool check( int tid, T v ) {
+    bool check(int tid, T v) {
         int v_tid = v / N;
-        if ( my_touches[tid][v] != false ) {
+        if (my_touches[tid][v] != false) {
             printf("Error: value seen twice by local thread\n");
             return false;
         }
-        if ( v <= my_last_touch[tid][v_tid] ) {
+        if (v <= my_last_touch[tid][v_tid]) {
             printf("Error: value seen in wrong order by local thread\n");
             return false;
         }
@@ -125,72 +119,65 @@ struct touches {
     }
 
     bool validate_touches() {
-        bool *all_touches = new bool[N*my_num_threads];
-        for ( int n = 0; n < N*my_num_threads; ++n)
-            all_touches[n] = false;
-
-        for ( int p = 0; p < my_num_threads; ++p) {
-            for ( int n = 0; n < N*my_num_threads; ++n) {
-                if ( my_touches[p][n] == true ) {
-                    CHECK_MESSAGE( ( all_touches[n] == false), "value see by more than one thread\n" );
+        bool *all_touches = new bool[N * my_num_threads];
+        for (int n = 0; n < N * my_num_threads; ++n) all_touches[n] = false;
+
+        for (int p = 0; p < my_num_threads; ++p) {
+            for (int n = 0; n < N * my_num_threads; ++n) {
+                if (my_touches[p][n] == true) {
+                    CHECK_MESSAGE((all_touches[n] == false), "value see by more than one thread\n");
                     all_touches[n] = true;
                 }
             }
         }
-        for ( int n = 0; n < N*my_num_threads; ++n) {
-            if ( !all_touches[n] )
-                printf("No touch at %d, my_num_threads = %d\n", n, my_num_threads);
+        for (int n = 0; n < N * my_num_threads; ++n) {
+            if (!all_touches[n]) printf("No touch at %d, my_num_threads = %d\n", n, my_num_threads);
             //CHECK_MESSAGE( ( all_touches[n] == true), "value not seen by any thread\n" );
         }
-        delete [] all_touches;
+        delete[] all_touches;
         return true;
     }
-
 };
 
-template< typename T >
+template <typename T>
 struct parallel_gets : utils::NoAssign {
 
     tbb::flow::queue_node<T> &my_q;
     touches<T> &my_touches;
 
-    parallel_gets( tbb::flow::queue_node<T> &q, touches<T> &t) : my_q(q), my_touches(t) {}
+    parallel_gets(tbb::flow::queue_node<T> &q, touches<T> &t) : my_q(q), my_touches(t) {}
 
     void operator()(int tid) const {
         for (int j = 0; j < N; ++j) {
             T v;
-            spin_try_get( my_q, v );
-            my_touches.check( tid, v );
+            spin_try_get(my_q, v);
+            my_touches.check(tid, v);
         }
     }
-
 };
 
-template< typename T >
+template <typename T>
 struct parallel_put_get : utils::NoAssign {
 
     tbb::flow::queue_node<T> &my_q;
     touches<T> &my_touches;
 
-    parallel_put_get( tbb::flow::queue_node<T> &q, touches<T> &t ) : my_q(q), my_touches(t) {}
+    parallel_put_get(tbb::flow::queue_node<T> &q, touches<T> &t) : my_q(q), my_touches(t) {}
 
     void operator()(int tid) const {
 
-        for ( int i = 0; i < N; i+=C ) {
-            int j_end = ( N < i + C ) ? N : i + C;
+        for (int i = 0; i < N; i += C) {
+            int j_end = (N < i + C) ? N : i + C;
             // dump about C values into the Q
-            for ( int j = i; j < j_end; ++j ) {
-                CHECK_MESSAGE( my_q.try_put( T (N*tid + j ) ) == true, "" );
-            }
+            for (int j = i; j < j_end; ++j) { CHECK_MESSAGE(my_q.try_put(T(N * tid + j)) == true, ""); }
             // receiver about C values from the Q
-            for ( int j = i; j < j_end; ++j ) {
+            for (int j = i; j < j_end; ++j) {
                 T v;
-                spin_try_get( my_q, v );
-                my_touches.check( tid, v );
+                spin_try_get(my_q, v);
+                my_touches.check(tid, v);
             }
         }
     }
-
 };
 
 //
@@ -198,7 +185,7 @@ struct parallel_put_get : utils::NoAssign {
 //
 // Item can be reserved, released, consumed ( single serial receiver )
 //
-template< typename T >
+template <typename T>
 int test_reservation() {
     tbb::flow::graph g;
     T bogus_value(-1);
@@ -211,30 +198,30 @@ int test_reservation() {
     q.try_put(T(3));
 
     T v;
-    CHECK_MESSAGE( q.reserve_item(v) == true, "" );
-    CHECK_MESSAGE( v == T(1), "" );
-    CHECK_MESSAGE( q.release_reservation() == true, "" );
+    CHECK_MESSAGE(q.reserve_item(v) == true, "");
+    CHECK_MESSAGE(v == T(1), "");
+    CHECK_MESSAGE(q.release_reservation() == true, "");
     v = bogus_value;
     g.wait_for_all();
-    CHECK_MESSAGE( q.reserve_item(v) == true, "" );
-    CHECK_MESSAGE( v == T(1), "" );
-    CHECK_MESSAGE( q.consume_reservation() == true, "" );
+    CHECK_MESSAGE(q.reserve_item(v) == true, "");
+    CHECK_MESSAGE(v == T(1), "");
+    CHECK_MESSAGE(q.consume_reservation() == true, "");
     v = bogus_value;
     g.wait_for_all();
 
-    CHECK_MESSAGE( q.try_get(v) == true, "" );
-    CHECK_MESSAGE( v == T(2), "" );
+    CHECK_MESSAGE(q.try_get(v) == true, "");
+    CHECK_MESSAGE(v == T(2), "");
     v = bogus_value;
     g.wait_for_all();
 
-    CHECK_MESSAGE( q.reserve_item(v) == true, "" );
-    CHECK_MESSAGE( v == T(3), "" );
-    CHECK_MESSAGE( q.release_reservation() == true, "" );
+    CHECK_MESSAGE(q.reserve_item(v) == true, "");
+    CHECK_MESSAGE(v == T(3), "");
+    CHECK_MESSAGE(q.release_reservation() == true, "");
     v = bogus_value;
     g.wait_for_all();
-    CHECK_MESSAGE( q.reserve_item(v) == true, "" );
-    CHECK_MESSAGE( v == T(3), "" );
-    CHECK_MESSAGE( q.consume_reservation() == true, "" );
+    CHECK_MESSAGE(q.reserve_item(v) == true, "");
+    CHECK_MESSAGE(v == T(3), "");
+    CHECK_MESSAGE(q.consume_reservation() == true, "");
     v = bogus_value;
     g.wait_for_all();
 
@@ -249,97 +236,95 @@ int test_reservation() {
 //   * overlapped puts / gets
 //   * all puts finished before any getS
 //
-template< typename T >
+template <typename T>
 int test_parallel(int num_threads) {
     tbb::flow::graph g;
     tbb::flow::queue_node<T> q(g);
     tbb::flow::queue_node<T> q2(g);
     tbb::flow::queue_node<T> q3(g);
     {
-        Checker< T > my_check;
+        Checker<T> my_check;
         T bogus_value(-1);
         T j = bogus_value;
-        utils::NativeParallelFor( num_threads, parallel_puts<T>(q) );
+        utils::NativeParallelFor(num_threads, parallel_puts<T>(q));
 
         T *next_value = new T[num_threads];
         for (int tid = 0; tid < num_threads; ++tid) next_value[tid] = T(0);
 
-        for (int i = 0; i < num_threads * N; ++i ) {
-            spin_try_get( q, j );
-            check_item( next_value, j );
+        for (int i = 0; i < num_threads * N; ++i) {
+            spin_try_get(q, j);
+            check_item(next_value, j);
             j = bogus_value;
         }
-        for (int tid = 0; tid < num_threads; ++tid)  {
-            CHECK_MESSAGE( next_value[tid] == T(N), "" );
-        }
+        for (int tid = 0; tid < num_threads; ++tid) { CHECK_MESSAGE(next_value[tid] == T(N), ""); }
         delete[] next_value;
 
         j = bogus_value;
         g.wait_for_all();
-        CHECK_MESSAGE( q.try_get( j ) == false, "" );
-        CHECK_MESSAGE( j == bogus_value, "" );
+        CHECK_MESSAGE(q.try_get(j) == false, "");
+        CHECK_MESSAGE(j == bogus_value, "");
 
-        utils::NativeParallelFor( num_threads, parallel_puts<T>(q) );
+        utils::NativeParallelFor(num_threads, parallel_puts<T>(q));
 
         {
-            touches< T > t( num_threads );
-            utils::NativeParallelFor( num_threads, parallel_gets<T>(q, t) );
+            touches<T> t(num_threads);
+            utils::NativeParallelFor(num_threads, parallel_gets<T>(q, t));
             g.wait_for_all();
-            CHECK_MESSAGE( t.validate_touches(), "" );
+            CHECK_MESSAGE(t.validate_touches(), "");
         }
         j = bogus_value;
-        CHECK_MESSAGE( q.try_get( j ) == false, "" );
-        CHECK_MESSAGE( j == bogus_value, "" );
+        CHECK_MESSAGE(q.try_get(j) == false, "");
+        CHECK_MESSAGE(j == bogus_value, "");
 
         g.wait_for_all();
         {
-            touches< T > t2( num_threads );
-            utils::NativeParallelFor( num_threads, parallel_put_get<T>(q, t2) );
+            touches<T> t2(num_threads);
+            utils::NativeParallelFor(num_threads, parallel_put_get<T>(q, t2));
             g.wait_for_all();
-            CHECK_MESSAGE( t2.validate_touches(), "" );
+            CHECK_MESSAGE(t2.validate_touches(), "");
         }
         j = bogus_value;
-        CHECK_MESSAGE( q.try_get( j ) == false, "" );
-        CHECK_MESSAGE( j == bogus_value, "" );
+        CHECK_MESSAGE(q.try_get(j) == false, "");
+        CHECK_MESSAGE(j == bogus_value, "");
 
-        tbb::flow::make_edge( q, q2 );
-        tbb::flow::make_edge( q2, q3 );
+        tbb::flow::make_edge(q, q2);
+        tbb::flow::make_edge(q2, q3);
 
-        utils::NativeParallelFor( num_threads, parallel_puts<T>(q) );
+        utils::NativeParallelFor(num_threads, parallel_puts<T>(q));
         {
-            touches< T > t3( num_threads );
-            utils::NativeParallelFor( num_threads, parallel_gets<T>(q3, t3) );
+            touches<T> t3(num_threads);
+            utils::NativeParallelFor(num_threads, parallel_gets<T>(q3, t3));
             g.wait_for_all();
-            CHECK_MESSAGE( t3.validate_touches(), "" );
+            CHECK_MESSAGE(t3.validate_touches(), "");
         }
         j = bogus_value;
         g.wait_for_all();
-        CHECK_MESSAGE( q.try_get( j ) == false, "" );
+        CHECK_MESSAGE(q.try_get(j) == false, "");
         g.wait_for_all();
-        CHECK_MESSAGE( q2.try_get( j ) == false, "" );
+        CHECK_MESSAGE(q2.try_get(j) == false, "");
         g.wait_for_all();
-        CHECK_MESSAGE( q3.try_get( j ) == false, "" );
-        CHECK_MESSAGE( j == bogus_value, "" );
+        CHECK_MESSAGE(q3.try_get(j) == false, "");
+        CHECK_MESSAGE(j == bogus_value, "");
 
         // test copy constructor
-        CHECK_MESSAGE( remove_successor( q, q2 ), "" );
-        utils::NativeParallelFor( num_threads, parallel_puts<T>(q) );
+        CHECK_MESSAGE(remove_successor(q, q2), "");
+        utils::NativeParallelFor(num_threads, parallel_puts<T>(q));
         tbb::flow::queue_node<T> q_copy(q);
         j = bogus_value;
         g.wait_for_all();
-        CHECK_MESSAGE( q_copy.try_get( j ) == false, "" );
-        CHECK_MESSAGE( register_successor( q, q_copy ) == true, "" );
+        CHECK_MESSAGE(q_copy.try_get(j) == false, "");
+        CHECK_MESSAGE(register_successor(q, q_copy) == true, "");
         {
-            touches< T > t( num_threads );
-            utils::NativeParallelFor( num_threads, parallel_gets<T>(q_copy, t) );
+            touches<T> t(num_threads);
+            utils::NativeParallelFor(num_threads, parallel_gets<T>(q_copy, t));
             g.wait_for_all();
-            CHECK_MESSAGE( t.validate_touches(), "" );
+            CHECK_MESSAGE(t.validate_touches(), "");
         }
         j = bogus_value;
-        CHECK_MESSAGE( q.try_get( j ) == false, "" );
-        CHECK_MESSAGE( j == bogus_value, "" );
-        CHECK_MESSAGE( q_copy.try_get( j ) == false, "" );
-        CHECK_MESSAGE( j == bogus_value, "" );
+        CHECK_MESSAGE(q.try_get(j) == false, "");
+        CHECK_MESSAGE(j == bogus_value, "");
+        CHECK_MESSAGE(q_copy.try_get(j) == false, "");
+        CHECK_MESSAGE(j == bogus_value, "");
     }
 
     return 0;
@@ -354,14 +339,14 @@ int test_parallel(int num_threads) {
 // Chained Qs ( 2 & 3 ), single sender, items at last Q in FIFO order
 //
 
-template< typename T >
+template <typename T>
 int test_serial() {
     tbb::flow::graph g;
     tbb::flow::queue_node<T> q(g);
     tbb::flow::queue_node<T> q2(g);
-    {   // destroy the graph after manipulating it, and see if all the items in the buffers
+    {// destroy the graph after manipulating it, and see if all the items in the buffers
         // have been destroyed before the graph
-        Checker<T> my_check;  // if CheckType< U > count constructions and destructions
+        Checker<T> my_check;// if CheckType< U > count constructions and destructions
         T bogus_value(-1);
         T j = bogus_value;
 
@@ -369,94 +354,92 @@ int test_serial() {
         // Rejects attempts to add / remove predecessor
         // Rejects request from empty Q
         //
-        CHECK_MESSAGE( register_predecessor( q, q2 ) == false, "" );
-        CHECK_MESSAGE( remove_predecessor( q, q2 ) == false, "" );
-        CHECK_MESSAGE( q.try_get( j ) == false, "" );
-        CHECK_MESSAGE( j == bogus_value, "" );
+        CHECK_MESSAGE(register_predecessor(q, q2) == false, "");
+        CHECK_MESSAGE(remove_predecessor(q, q2) == false, "");
+        CHECK_MESSAGE(q.try_get(j) == false, "");
+        CHECK_MESSAGE(j == bogus_value, "");
 
         //
         // Simple puts and gets
         //
 
         for (int i = 0; i < N; ++i) {
-            bool msg = q.try_put( T(i) );
-            CHECK_MESSAGE( msg == true, "" );
+            bool msg = q.try_put(T(i));
+            CHECK_MESSAGE(msg == true, "");
         }
 
-
         for (int i = 0; i < N; ++i) {
             j = bogus_value;
-            spin_try_get( q, j );
-            CHECK_MESSAGE( i == j, "" );
+            spin_try_get(q, j);
+            CHECK_MESSAGE(i == j, "");
         }
         j = bogus_value;
         g.wait_for_all();
-        CHECK_MESSAGE( q.try_get( j ) == false, "" );
-        CHECK_MESSAGE( j == bogus_value, "" );
+        CHECK_MESSAGE(q.try_get(j) == false, "");
+        CHECK_MESSAGE(j == bogus_value, "");
 
-        tbb::flow::make_edge( q, q2 );
+        tbb::flow::make_edge(q, q2);
 
         for (int i = 0; i < N; ++i) {
-            bool msg = q.try_put( T(i) );
-            CHECK_MESSAGE( msg == true, "" );
+            bool msg = q.try_put(T(i));
+            CHECK_MESSAGE(msg == true, "");
         }
 
-
         for (int i = 0; i < N; ++i) {
             j = bogus_value;
-            spin_try_get( q2, j );
-            CHECK_MESSAGE( i == j, "" );
+            spin_try_get(q2, j);
+            CHECK_MESSAGE(i == j, "");
         }
         j = bogus_value;
         g.wait_for_all();
-        CHECK_MESSAGE( q.try_get( j ) == false, "" );
+        CHECK_MESSAGE(q.try_get(j) == false, "");
         g.wait_for_all();
-        CHECK_MESSAGE( q2.try_get( j ) == false, "" );
-        CHECK_MESSAGE( j == bogus_value, "" );
+        CHECK_MESSAGE(q2.try_get(j) == false, "");
+        CHECK_MESSAGE(j == bogus_value, "");
 
-        tbb::flow::remove_edge( q, q2 );
-        CHECK_MESSAGE( q.try_put( 1 ) == true, "" );
+        tbb::flow::remove_edge(q, q2);
+        CHECK_MESSAGE(q.try_put(1) == true, "");
         g.wait_for_all();
-        CHECK_MESSAGE( q2.try_get( j ) == false, "" );
-        CHECK_MESSAGE( j == bogus_value, "" );
+        CHECK_MESSAGE(q2.try_get(j) == false, "");
+        CHECK_MESSAGE(j == bogus_value, "");
         g.wait_for_all();
-        CHECK_MESSAGE( q.try_get( j ) == true, "" );
-        CHECK_MESSAGE( j == 1, "" );
+        CHECK_MESSAGE(q.try_get(j) == true, "");
+        CHECK_MESSAGE(j == 1, "");
 
         tbb::flow::queue_node<T> q3(g);
-        tbb::flow::make_edge( q, q2 );
-        tbb::flow::make_edge( q2, q3 );
+        tbb::flow::make_edge(q, q2);
+        tbb::flow::make_edge(q2, q3);
 
         for (int i = 0; i < N; ++i) {
-            bool msg = q.try_put( T(i) );
-            CHECK_MESSAGE( msg == true, "" );
+            bool msg = q.try_put(T(i));
+            CHECK_MESSAGE(msg == true, "");
         }
 
         for (int i = 0; i < N; ++i) {
             j = bogus_value;
-            spin_try_get( q3, j );
-            CHECK_MESSAGE( i == j, "" );
+            spin_try_get(q3, j);
+            CHECK_MESSAGE(i == j, "");
         }
         j = bogus_value;
         g.wait_for_all();
-        CHECK_MESSAGE( q.try_get( j ) == false, "" );
+        CHECK_MESSAGE(q.try_get(j) == false, "");
         g.wait_for_all();
-        CHECK_MESSAGE( q2.try_get( j ) == false, "" );
+        CHECK_MESSAGE(q2.try_get(j) == false, "");
         g.wait_for_all();
-        CHECK_MESSAGE( q3.try_get( j ) == false, "" );
-        CHECK_MESSAGE( j == bogus_value, "" );
+        CHECK_MESSAGE(q3.try_get(j) == false, "");
+        CHECK_MESSAGE(j == bogus_value, "");
 
-        tbb::flow::remove_edge( q,  q2 );
-        CHECK_MESSAGE( q.try_put( 1 ) == true, "" );
+        tbb::flow::remove_edge(q, q2);
+        CHECK_MESSAGE(q.try_put(1) == true, "");
         g.wait_for_all();
-        CHECK_MESSAGE( q2.try_get( j ) == false, "" );
-        CHECK_MESSAGE( j == bogus_value, "" );
+        CHECK_MESSAGE(q2.try_get(j) == false, "");
+        CHECK_MESSAGE(j == bogus_value, "");
         g.wait_for_all();
-        CHECK_MESSAGE( q3.try_get( j ) == false, "" );
-        CHECK_MESSAGE( j == bogus_value, "" );
+        CHECK_MESSAGE(q3.try_get(j) == false, "");
+        CHECK_MESSAGE(j == bogus_value, "");
         g.wait_for_all();
-        CHECK_MESSAGE( q.try_get( j ) == true, "" );
-        CHECK_MESSAGE( j == 1, "" );
+        CHECK_MESSAGE(q.try_get(j) == true, "");
+        CHECK_MESSAGE(j == 1, "");
     }
 
     return 0;
@@ -466,11 +449,11 @@ int test_serial() {
 #include <array>
 #include <vector>
 void test_follows_and_precedes_api() {
-    std::array<int, 3> messages_for_follows = { {0, 1, 2} };
+    std::array<int, 3> messages_for_follows = {{0, 1, 2}};
     std::vector<int> messages_for_precedes = {0, 1, 2};
 
-    follows_and_precedes_testing::test_follows <int, tbb::flow::queue_node<int>>(messages_for_follows);
-    follows_and_precedes_testing::test_precedes <int, tbb::flow::queue_node<int>>(messages_for_precedes);
+    follows_and_precedes_testing::test_follows<int, tbb::flow::queue_node<int>>(messages_for_follows);
+    follows_and_precedes_testing::test_precedes<int, tbb::flow::queue_node<int>>(messages_for_precedes);
 }
 #endif
 
@@ -521,8 +504,8 @@ void test_queue_node_try_put_and_wait() {
     {
         std::vector<int> processed_items;
 
-        std::size_t after_start = test_buffer_push<tbb::flow::queue_node<int>>(start_work_items, wait_message,
-                                                                               new_work_items, processed_items);
+        std::size_t after_start = test_buffer_push<tbb::flow::queue_node<int>>(
+                start_work_items, wait_message, new_work_items, processed_items);
 
         // Expected effect:
         // During buffer1.try_put_and_wait()
@@ -555,7 +538,7 @@ void test_queue_node_try_put_and_wait() {
                           "wait_for_all should process new_work_items FIFO");
         }
         CHECK(check_index == processed_items.size());
-    } // Test push
+    }// Test push
 
     // Test pull
     // test_buffer_pull tests the graph
@@ -573,8 +556,8 @@ void test_queue_node_try_put_and_wait() {
         std::vector<int> processed_items;
         int occupier = 42;
 
-        std::size_t after_start = test_buffer_pull<tbb::flow::queue_node<int>>(start_work_items, wait_message, occupier,
-                                                                               new_work_items, processed_items);
+        std::size_t after_start = test_buffer_pull<tbb::flow::queue_node<int>>(
+                start_work_items, wait_message, occupier, new_work_items, processed_items);
 
         // Expected effect
         // 0. task for occupier processing would be spawned by the function
@@ -594,12 +577,14 @@ void test_queue_node_try_put_and_wait() {
 
         CHECK_MESSAGE(after_start == start_work_items.size() + 2,
                       "start_work_items, occupier and wait_message should be processed by try_put_and_wait");
-        CHECK_MESSAGE(processed_items[check_index++] == occupier, "Unexpected items processing by try_put_and_wait");
+        CHECK_MESSAGE(processed_items[check_index++] == occupier,
+                      "Unexpected items processing by try_put_and_wait");
         for (auto item : start_work_items) {
             CHECK_MESSAGE(processed_items[check_index++] == item,
                           "try_put_and_wait should process start_work_items FIFO");
         }
-        CHECK_MESSAGE(processed_items[check_index++] == wait_message, "Unexpected items processing by try_put_and_wait");
+        CHECK_MESSAGE(processed_items[check_index++] == wait_message,
+                      "Unexpected items processing by try_put_and_wait");
 
         for (auto item : new_work_items) {
             CHECK_MESSAGE(processed_items[check_index++] == item,
@@ -610,7 +595,7 @@ void test_queue_node_try_put_and_wait() {
 
     // Test reserve
     {
-        int thresholds[] = { 1, 2 };
+        int thresholds[] = {1, 2};
 
         for (int threshold : thresholds) {
             std::vector<int> processed_items;
@@ -620,8 +605,8 @@ void test_queue_node_try_put_and_wait() {
             //  function is a rejecting serial function_node that puts an item to the decrementer port
             //  of the limiter inside of the body
 
-            std::size_t after_start = test_buffer_reserve<tbb::flow::queue_node<int>>(threshold,
-                start_work_items, wait_message, new_work_items, processed_items);
+            std::size_t after_start = test_buffer_reserve<tbb::flow::queue_node<int>>(
+                    threshold, start_work_items, wait_message, new_work_items, processed_items);
 
             // Expected effect:
             // 1. start_work_items would be pushed to the buffer
@@ -639,73 +624,70 @@ void test_queue_node_try_put_and_wait() {
             CHECK_MESSAGE(after_start == start_work_items.size() + 1,
                           "try_put_and_wait should start_work_items and wait_message");
             for (auto item : start_work_items) {
-                CHECK_MESSAGE(processed_items[check_index++] == item, "Unexpected start_work_items processing");
+                CHECK_MESSAGE(processed_items[check_index++] == item,
+                              "Unexpected start_work_items processing");
             }
-            CHECK_MESSAGE(processed_items[check_index++] == wait_message, "Unexpected wait_message processing");
+            CHECK_MESSAGE(processed_items[check_index++] == wait_message,
+                          "Unexpected wait_message processing");
 
             for (auto item : new_work_items) {
-                CHECK_MESSAGE(processed_items[check_index++] == item, "Unexpected start_work_items processing");
+                CHECK_MESSAGE(processed_items[check_index++] == item,
+                              "Unexpected start_work_items processing");
             }
         }
     }
 }
-#endif // __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+#endif// __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
 
 //! Test serial, parallel behavior and reservation under parallelism
 //! \brief \ref requirement \ref error_guessing
-TEST_CASE("Parallel, serial test"){
+TEST_CASE("Parallel, serial test") {
     for (int p = 2; p <= 4; ++p) {
         tbb::global_control thread_limit(tbb::global_control::max_allowed_parallelism, p);
         tbb::task_arena arena(p);
-        arena.execute(
-            [&]() {
-                test_serial<int>();
-                test_serial<CheckType<int> >();
-                test_parallel<int>(p);
-                test_parallel<CheckType<int> >(p);
-            }
-        );
-	}
+        arena.execute([&]() {
+            test_serial<int>();
+            test_serial<CheckType<int>>();
+            test_parallel<int>(p);
+            test_parallel<CheckType<int>>(p);
+        });
+    }
 }
 
 //! Test reset and cancellation
 //! \brief \ref error_guessing
-TEST_CASE("Resets test"){
+TEST_CASE("Resets test") {
     INFO("Testing resets\n");
-    test_resets<int, tbb::flow::queue_node<int> >();
-    test_resets<float, tbb::flow::queue_node<float> >();
+    test_resets<int, tbb::flow::queue_node<int>>();
+    test_resets<float, tbb::flow::queue_node<float>>();
 }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 //! Test follows and precedes API
 //! \brief \ref error_guessing
-TEST_CASE("Test follows and precedes API"){
-    test_follows_and_precedes_api();
-}
+TEST_CASE("Test follows and precedes API") { test_follows_and_precedes_api(); }
 #endif
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 //! Test decution guides
 //! \brief \ref requirement
-TEST_CASE("Deduction guides"){
-    test_deduction_guides();
-}
+TEST_CASE("Deduction guides") { test_deduction_guides(); }
 #endif
 
 //! Test operations on a reserved queue_node
 //! \brief \ref error_guessing
-TEST_CASE("queue_node with reservation"){
+TEST_CASE("queue_node with reservation") {
     tbb::flow::graph g;
 
     tbb::flow::queue_node<int> q(g);
 
     bool res = q.try_put(42);
-    CHECK_MESSAGE( res, "queue_node must accept input." );
+    CHECK_MESSAGE(res, "queue_node must accept input.");
 
     int val = 1;
     res = q.try_reserve(val);
-    CHECK_MESSAGE( res, "queue_node must reserve as it has an item." );
-    CHECK_MESSAGE( (val == 42), "queue_node must reserve once passed item." );
+    CHECK_MESSAGE(res, "queue_node must reserve as it has an item.");
+    CHECK_MESSAGE((val == 42), "queue_node must reserve once passed item.");
 
     int out_arg = -1;
     CHECK_MESSAGE((q.try_reserve(out_arg) == false), "Reserving a reserved node should fail.");
@@ -719,7 +701,5 @@ TEST_CASE("queue_node with reservation"){
 
 #if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
 //! \brief \ref error_guessing
-TEST_CASE("test queue_node try_put_and_wait") {
-    test_queue_node_try_put_and_wait();
-}
+TEST_CASE("test queue_node try_put_and_wait") { test_queue_node_try_put_and_wait(); }
 #endif
diff --git a/external/tbb/test/tbb/test_resumable_tasks.cpp b/external/tbb/test/tbb/test_resumable_tasks.cpp
index 0cba9772..18ea2796 100644
--- a/external/tbb/test/tbb/test_resumable_tasks.cpp
+++ b/external/tbb/test/tbb/test_resumable_tasks.cpp
@@ -25,15 +25,15 @@
 #if __TBB_RESUMABLE_TASKS
 
 #include "tbb/global_control.h"
-#include "tbb/task_arena.h"
 #include "tbb/parallel_for.h"
-#include "tbb/task_scheduler_observer.h"
+#include "tbb/task_arena.h"
 #include "tbb/task_group.h"
+#include "tbb/task_scheduler_observer.h"
 
 #include <algorithm>
-#include <thread>
-#include <queue>
 #include <condition_variable>
+#include <queue>
+#include <thread>
 
 const int N = 10;
 
@@ -41,16 +41,14 @@ const int N = 10;
 class AsyncActivity {
 public:
     AsyncActivity(int num_) : m_numAsyncThreads(num_) {
-        for (int i = 0; i < m_numAsyncThreads ; ++i) {
-            m_asyncThreads.push_back( new std::thread(AsyncActivity::asyncLoop, this) );
+        for (int i = 0; i < m_numAsyncThreads; ++i) {
+            m_asyncThreads.push_back(new std::thread(AsyncActivity::asyncLoop, this));
         }
     }
     ~AsyncActivity() {
         {
             std::lock_guard<std::mutex> lock(m_mutex);
-            for (int i = 0; i < m_numAsyncThreads; ++i) {
-                m_tagQueue.push(nullptr);
-            }
+            for (int i = 0; i < m_numAsyncThreads; ++i) { m_tagQueue.push(nullptr); }
             m_condvar.notify_all();
         }
         for (int i = 0; i < m_numAsyncThreads; ++i) {
@@ -71,13 +69,11 @@ class AsyncActivity {
         for (;;) {
             {
                 std::unique_lock<std::mutex> lock(async->m_mutex);
-                async->m_condvar.wait(lock, [async] {return !async->m_tagQueue.empty(); });
+                async->m_condvar.wait(lock, [async] { return !async->m_tagQueue.empty(); });
                 tag = async->m_tagQueue.front();
                 async->m_tagQueue.pop();
             }
-            if (!tag) {
-                break;
-            }
+            if (!tag) { break; }
             tbb::task::resume(tag);
         };
     }
@@ -90,8 +86,7 @@ class AsyncActivity {
 };
 
 struct SuspendBody {
-    SuspendBody(AsyncActivity& a_, std::thread::id id) :
-        m_asyncActivity(a_), thread_id(id) {}
+    SuspendBody(AsyncActivity& a_, std::thread::id id) : m_asyncActivity(a_), thread_id(id) {}
     void operator()(tbb::task::suspend_point tag) {
         CHECK(thread_id == std::this_thread::get_id());
         m_asyncActivity.submit(tag);
@@ -108,7 +103,7 @@ class InnermostArenaBody {
 
     void operator()() {
         InnermostOuterParFor inner_outer_body(m_asyncActivity);
-        tbb::parallel_for(0, N, inner_outer_body );
+        tbb::parallel_for(0, N, inner_outer_body);
     }
 
 private:
@@ -135,19 +130,18 @@ class InnermostArenaBody {
 
 class OutermostArenaBody {
 public:
-    OutermostArenaBody(AsyncActivity& a_, tbb::task_arena& o_, tbb::task_arena& i_
-            , tbb::task_arena& id_, tbb::enumerable_thread_specific<int>& ets) :
-        m_asyncActivity(a_), m_outermostArena(o_), m_innermostArena(i_), m_innermostArenaDefault(id_), m_local(ets) {}
+    OutermostArenaBody(AsyncActivity& a_, tbb::task_arena& o_, tbb::task_arena& i_, tbb::task_arena& id_,
+                       tbb::enumerable_thread_specific<int>& ets)
+        : m_asyncActivity(a_), m_outermostArena(o_), m_innermostArena(i_), m_innermostArenaDefault(id_),
+          m_local(ets) {}
 
-    void operator()() {
-        tbb::parallel_for(0, 32, *this);
-    }
+    void operator()() { tbb::parallel_for(0, 32, *this); }
 
     void operator()(int i) const {
-        tbb::task::suspend([&] (tbb::task::suspend_point sp) { m_asyncActivity.submit(sp); });
+        tbb::task::suspend([&](tbb::task::suspend_point sp) { m_asyncActivity.submit(sp); });
 
-        tbb::task_arena& nested_arena = (i % 3 == 0) ?
-            m_outermostArena : (i % 3 == 1 ? m_innermostArena : m_innermostArenaDefault);
+        tbb::task_arena& nested_arena
+                = (i % 3 == 0) ? m_outermostArena : (i % 3 == 1 ? m_innermostArena : m_innermostArenaDefault);
 
         if (i % 3 != 0) {
             // We can only guarantee recall coorectness for "not-same" nested arenas entry
@@ -156,7 +150,8 @@ class OutermostArenaBody {
         InnermostArenaBody innermost_arena_body(m_asyncActivity);
         nested_arena.execute(innermost_arena_body);
         if (i % 3 != 0) {
-            CHECK_MESSAGE(i == m_local.local(), "Original thread wasn't recalled for innermost nested arena.");
+            CHECK_MESSAGE(i == m_local.local(),
+                          "Original thread wasn't recalled for innermost nested arena.");
         }
     }
 
@@ -172,7 +167,7 @@ void TestNestedArena() {
     AsyncActivity asyncActivity(4);
 
     tbb::task_arena outermost_arena;
-    tbb::task_arena innermost_arena(2,2);
+    tbb::task_arena innermost_arena(2, 2);
     tbb::task_arena innermost_arena_default;
 
     outermost_arena.initialize();
@@ -181,7 +176,8 @@ void TestNestedArena() {
 
     tbb::enumerable_thread_specific<int> ets;
 
-    OutermostArenaBody outer_arena_body(asyncActivity, outermost_arena, innermost_arena, innermost_arena_default, ets);
+    OutermostArenaBody outer_arena_body(asyncActivity, outermost_arena, innermost_arena,
+                                        innermost_arena_default, ets);
     outermost_arena.execute(outer_arena_body);
 }
 
@@ -189,16 +185,14 @@ void TestNestedArena() {
 class EpochAsyncActivity {
 public:
     EpochAsyncActivity(int num_, std::atomic<int>& e_) : m_numAsyncThreads(num_), m_globalEpoch(e_) {
-        for (int i = 0; i < m_numAsyncThreads ; ++i) {
-            m_asyncThreads.push_back( new std::thread(EpochAsyncActivity::asyncLoop, this) );
+        for (int i = 0; i < m_numAsyncThreads; ++i) {
+            m_asyncThreads.push_back(new std::thread(EpochAsyncActivity::asyncLoop, this));
         }
     }
     ~EpochAsyncActivity() {
         {
             std::lock_guard<std::mutex> lock(m_mutex);
-            for (int i = 0; i < m_numAsyncThreads; ++i) {
-                m_tagQueue.push(nullptr);
-            }
+            for (int i = 0; i < m_numAsyncThreads; ++i) { m_tagQueue.push(nullptr); }
             m_condvar.notify_all();
         }
         for (int i = 0; i < m_numAsyncThreads; ++i) {
@@ -219,13 +213,11 @@ class EpochAsyncActivity {
         for (;;) {
             {
                 std::unique_lock<std::mutex> lock(async->m_mutex);
-                async->m_condvar.wait(lock, [async] {return !async->m_tagQueue.empty(); });
+                async->m_condvar.wait(lock, [async] { return !async->m_tagQueue.empty(); });
                 tag = async->m_tagQueue.front();
                 async->m_tagQueue.pop();
             }
-            if (!tag) {
-                break;
-            }
+            if (!tag) { break; }
             // Track the global epoch
             async->m_globalEpoch++;
             tbb::task::resume(tag);
@@ -241,8 +233,8 @@ class EpochAsyncActivity {
 };
 
 struct EpochSuspendBody {
-    EpochSuspendBody(EpochAsyncActivity& a_, std::atomic<int>& e_, int& le_) :
-        m_asyncActivity(a_), m_globalEpoch(e_), m_localEpoch(le_) {}
+    EpochSuspendBody(EpochAsyncActivity& a_, std::atomic<int>& e_, int& le_)
+        : m_asyncActivity(a_), m_globalEpoch(e_), m_localEpoch(le_) {}
 
     void operator()(tbb::task::suspend_point ctx) {
         m_localEpoch = m_globalEpoch;
@@ -263,7 +255,8 @@ void TestSuspendResume() {
     constexpr int iter_size = 50000;
 #endif
 
-    std::atomic<int> global_epoch; global_epoch = 0;
+    std::atomic<int> global_epoch;
+    global_epoch = 0;
     EpochAsyncActivity async(4, global_epoch);
 
     tbb::enumerable_thread_specific<int, tbb::cache_aligned_allocator<int>, tbb::ets_suspend_aware> ets_fiber;
@@ -294,7 +287,7 @@ void TestSuspendResume() {
         ++outer_par_iters;
     });
     CHECK(outer_par_iters == N);
-    CHECK(inner_par_iters == N*N*iter_size);
+    CHECK(inner_par_iters == N * N * iter_size);
 }
 
 // During cleanup external thread's local task pool may
@@ -314,7 +307,7 @@ void TestCleanupMaster() {
         iter_executed = 0;
 
         utils::NativeParallelFor(N, [&asyncActivity, &tg, &iter_spawned, &iter_executed](int j) {
-            for (int k = 0; k < j*10 + 1; ++k) {
+            for (int k = 0; k < j * 10 + 1; ++k) {
                 tg.run([&asyncActivity, j, &iter_executed] {
                     utils::doDummyWork(j * 10);
                     tbb::task::suspend(SuspendBody(asyncActivity, std::this_thread::get_id()));
@@ -331,6 +324,7 @@ void TestCleanupMaster() {
 class ParForSuspendBody {
     AsyncActivity& asyncActivity;
     int m_numIters;
+
 public:
     ParForSuspendBody(AsyncActivity& a_, int iters) : asyncActivity(a_), m_numIters(iters) {}
     void operator()(int) const {
@@ -344,7 +338,7 @@ void TestNativeThread() {
 
     tbb::task_arena arena;
     tbb::task_group tg;
-    std::atomic<int> iter{};
+    std::atomic<int> iter {};
     utils::NativeParallelFor(arena.max_concurrency() / 2, [&arena, &tg, &asyncActivity, &iter](int) {
         for (int i = 0; i < 10; i++) {
             arena.execute([&tg, &asyncActivity, &iter]() {
@@ -357,13 +351,12 @@ void TestNativeThread() {
     });
 
     CHECK(iter == (arena.max_concurrency() / 2 * 10));
-    arena.execute([&tg](){
-        tg.wait();
-    });
+    arena.execute([&tg]() { tg.wait(); });
 }
 
 class ObserverTracker : public tbb::task_scheduler_observer {
     static thread_local bool is_in_arena;
+
 public:
     std::atomic<int> counter;
 
@@ -391,13 +384,16 @@ void TestObservers() {
     ObserverTracker tracker(arena);
     do {
         arena.execute([] {
-            tbb::parallel_for(0, 10, [](int) {
-                auto thread_id = std::this_thread::get_id();
-                tbb::task::suspend([thread_id](tbb::task::suspend_point tag) {
-                    CHECK(thread_id == std::this_thread::get_id());
-                    tbb::task::resume(tag);
-                });
-            }, tbb::simple_partitioner());
+            tbb::parallel_for(
+                    0, 10,
+                    [](int) {
+                        auto thread_id = std::this_thread::get_id();
+                        tbb::task::suspend([thread_id](tbb::task::suspend_point tag) {
+                            CHECK(thread_id == std::this_thread::get_id());
+                            tbb::task::resume(tag);
+                        });
+                    },
+                    tbb::simple_partitioner());
         });
     } while (tracker.counter < 100);
     tracker.observe(false);
@@ -407,11 +403,12 @@ class TestCaseGuard {
     static thread_local bool m_local;
     tbb::global_control m_threadLimit;
     tbb::global_control m_stackLimit;
+
 public:
     TestCaseGuard()
-        : m_threadLimit(tbb::global_control::max_allowed_parallelism, std::max(tbb::this_task_arena::max_concurrency(), 16))
-        , m_stackLimit(tbb::global_control::thread_stack_size, 128*1024)
-    {
+        : m_threadLimit(tbb::global_control::max_allowed_parallelism,
+                        std::max(tbb::this_task_arena::max_concurrency(), 16)),
+          m_stackLimit(tbb::global_control::thread_stack_size, 128 * 1024) {
         CHECK(m_local == false);
         m_local = true;
     }
@@ -441,21 +438,15 @@ TEST_CASE("Nested arena") {
 
 //! Test with external threads
 //! \brief \ref error_guessing
-TEST_CASE("External threads") {
-    TestNativeThread();
-}
+TEST_CASE("External threads") { TestNativeThread(); }
 
 #if !EMSCRIPTEN
 //! Stress test with external threads
 //! \brief \ref stress
-TEST_CASE("Stress test with external threads") {
-    TestCleanupMaster();
-}
+TEST_CASE("Stress test with external threads") { TestCleanupMaster(); }
 #endif
 
 //! Test with an arena observer
 //! \brief \ref error_guessing
-TEST_CASE("Arena observer") {
-    TestObservers();
-}
+TEST_CASE("Arena observer") { TestObservers(); }
 #endif /* __TBB_RESUMABLE_TASKS */
diff --git a/external/tbb/test/tbb/test_scheduler_mix.cpp b/external/tbb/test/tbb/test_scheduler_mix.cpp
index 8d8e0e37..1720a62f 100644
--- a/external/tbb/test/tbb/test_scheduler_mix.cpp
+++ b/external/tbb/test/tbb/test_scheduler_mix.cpp
@@ -16,28 +16,27 @@
 
 #include "common/config.h"
 
-#include <oneapi/tbb/task_arena.h>
 #include <oneapi/tbb/concurrent_vector.h>
+#include <oneapi/tbb/parallel_for.h>
 #include <oneapi/tbb/rw_mutex.h>
+#include <oneapi/tbb/task_arena.h>
 #include <oneapi/tbb/task_group.h>
-#include <oneapi/tbb/parallel_for.h>
 
 #include <oneapi/tbb/global_control.h>
 
+#include "common/spin_barrier.h"
 #include "common/test.h"
 #include "common/utils.h"
 #include "common/utils_concurrency_limit.h"
-#include "common/spin_barrier.h"
 
-#include <stdlib.h> // C11/POSIX aligned_alloc
 #include <random>
-
+#include <stdlib.h>// C11/POSIX aligned_alloc
 
 //! \file test_scheduler_mix.cpp
 //! \brief Test for [scheduler.task_arena scheduler.task_scheduler_observer] specification
 
 const std::uint64_t maxNumActions = 1 * 100 * 1000;
-static std::atomic<std::uint64_t> globalNumActions{};
+static std::atomic<std::uint64_t> globalNumActions {};
 
 //using Random = utils::FastRandom<>;
 class Random {
@@ -48,17 +47,14 @@ class Random {
 
         State() : gen(rd()), dist(0, std::numeric_limits<unsigned short>::max()) {}
 
-        int get() {
-            return dist(gen);
-        }
+        int get() { return dist(gen); }
     };
     static thread_local State* mState;
     tbb::concurrent_vector<State*> mStateList;
+
 public:
     ~Random() {
-        for (auto s : mStateList) {
-            delete s;
-        }
+        for (auto s : mStateList) { delete s; }
     }
 
     int get() {
@@ -73,12 +69,11 @@ class Random {
 
 thread_local Random::State* Random::mState = nullptr;
 
-
 void* aligned_malloc(std::size_t alignment, std::size_t size) {
 #if _WIN32
     return _aligned_malloc(size, alignment);
 #elif __unix__ || __APPLE__
-    void* ptr{};
+    void* ptr {};
     int res = posix_memalign(&ptr, alignment, size);
     CHECK(res == 0);
     return ptr;
@@ -98,20 +93,16 @@ void aligned_free(void* ptr) {
 template <typename T, std::size_t Alignment>
 class PtrRWMutex {
     static const std::size_t maxThreads = (Alignment >> 1) - 1;
-    static const std::uintptr_t READER_MASK = maxThreads;       // 7F..
-    static const std::uintptr_t LOCKED = Alignment - 1;         // FF..
-    static const std::uintptr_t LOCKED_MASK = LOCKED;           // FF..
-    static const std::uintptr_t LOCK_PENDING = READER_MASK + 1; // 80..
+    static const std::uintptr_t READER_MASK = maxThreads;      // 7F..
+    static const std::uintptr_t LOCKED = Alignment - 1;        // FF..
+    static const std::uintptr_t LOCKED_MASK = LOCKED;          // FF..
+    static const std::uintptr_t LOCK_PENDING = READER_MASK + 1;// 80..
 
     std::atomic<std::uintptr_t> mState;
 
-    T* pointer() {
-        return reinterpret_cast<T*>(state() & ~LOCKED_MASK);
-    }
+    T* pointer() { return reinterpret_cast<T*>(state() & ~LOCKED_MASK); }
 
-    std::uintptr_t state() {
-        return mState.load(std::memory_order_relaxed);
-    }
+    std::uintptr_t state() { return mState.load(std::memory_order_relaxed); }
 
 public:
     class ScopedLock {
@@ -124,9 +115,7 @@ class PtrRWMutex {
         }
         //! Release lock (if lock is held).
         ~ScopedLock() {
-            if (mMutex) {
-                release();
-            }
+            if (mMutex) { release(); }
         }
         //! No Copy
         ScopedLock(const ScopedLock&) = delete;
@@ -166,14 +155,14 @@ class PtrRWMutex {
 
             if (mIsWriter) {
                 m->unlock();
-            }
-            else {
+            } else {
                 m->unlockShared();
             }
         }
+
     protected:
-        PtrRWMutex* mMutex{};
-        bool mIsWriter{};
+        PtrRWMutex* mMutex {};
+        bool mIsWriter {};
     };
 
     bool trySet(T* ptr) {
@@ -181,9 +170,7 @@ class PtrRWMutex {
         CHECK_FAST((p & (Alignment - 1)) == 0);
         if (!state()) {
             std::uintptr_t expected = 0;
-            if (mState.compare_exchange_strong(expected, p)) {
-                return true;
-            }
+            if (mState.compare_exchange_strong(expected, p)) { return true; }
         }
         return false;
     }
@@ -195,28 +182,20 @@ class PtrRWMutex {
 
     bool tryLock() {
         auto v = state();
-        if (v == 0) {
-            return false;
-        }
+        if (v == 0) { return false; }
         CHECK_FAST((v & LOCKED_MASK) == LOCKED || (v & READER_MASK) < maxThreads);
         if ((v & READER_MASK) == 0) {
-            if (mState.compare_exchange_strong(v, v | LOCKED)) {
-                return true;
-            }
+            if (mState.compare_exchange_strong(v, v | LOCKED)) { return true; }
         }
         return false;
     }
 
     bool tryLockShared() {
         auto v = state();
-        if (v == 0) {
-            return false;
-        }
+        if (v == 0) { return false; }
         CHECK_FAST((v & LOCKED_MASK) == LOCKED || (v & READER_MASK) < maxThreads);
         if ((v & LOCKED_MASK) != LOCKED && (v & LOCK_PENDING) == 0) {
-            if (mState.compare_exchange_strong(v, v + 1)) {
-                return true;
-            }
+            if (mState.compare_exchange_strong(v, v + 1)) { return true; }
         }
         return false;
     }
@@ -224,9 +203,7 @@ class PtrRWMutex {
     void lock() {
         auto v = state();
         mState.compare_exchange_strong(v, v | LOCK_PENDING);
-        while (!tryLock()) {
-            utils::yield();
-        }
+        while (!tryLock()) { utils::yield(); }
     }
 
     void unlock() {
@@ -242,13 +219,9 @@ class PtrRWMutex {
         mState -= 1;
     }
 
-    operator bool() const {
-        return pointer() != 0;
-    }
+    operator bool() const { return pointer() != 0; }
 
-    T* get() {
-        return pointer();
-    }
+    T* get() { return pointer(); }
 };
 
 class Statistics {
@@ -267,6 +240,7 @@ class Statistics {
     };
 
     static const char* const mStatNames[numActions];
+
 private:
     struct StatType {
         StatType() : mCounters() {}
@@ -284,23 +258,18 @@ class Statistics {
         }
         return *s;
     }
+
 public:
     ~Statistics() {
-        for (auto s : mStatsList) {
-            delete s;
-        }
+        for (auto s : mStatsList) { delete s; }
     }
 
-    void notify(ACTION a) {
-        ++get().mCounters[a];
-    }
+    void notify(ACTION a) { ++get().mCounters[a]; }
 
     void report() {
         StatType summary;
         for (auto& s : mStatsList) {
-            for (int i = 0; i < numActions; ++i) {
-                summary.mCounters[i] += s->mCounters[i];
-            }
+            for (int i = 0; i < numActions; ++i) { summary.mCounters[i] += s->mCounters[i]; }
         }
         std::cout << std::endl << "Statistics:" << std::endl;
         std::cout << "Total actions: " << globalNumActions << std::endl;
@@ -310,12 +279,10 @@ class Statistics {
     }
 };
 
-
-const char* const Statistics::mStatNames[Statistics::numActions] = {
-    "Arena create", "Arena destroy", "Arena acquire",
-    "Skipped arena create", "Skipped arena destroy", "Skipped arena acquire",
-    "Parallel algorithm", "Arena enqueue", "Arena execute"
-};
+const char* const Statistics::mStatNames[Statistics::numActions]
+        = {"Arena create",         "Arena destroy",         "Arena acquire",
+           "Skipped arena create", "Skipped arena destroy", "Skipped arena acquire",
+           "Parallel algorithm",   "Arena enqueue",         "Arena execute"};
 thread_local Statistics::StatType* Statistics::mStats;
 
 static Statistics gStats;
@@ -336,41 +303,29 @@ class LifetimeTracker {
             }
         }
 
-        Guard(Guard&& ing) : mObj(ing.mObj) {
-            ing.mObj = nullptr;
-        }
+        Guard(Guard&& ing) : mObj(ing.mObj) { ing.mObj = nullptr; }
 
         ~Guard() {
-            if (mObj != nullptr) {
-                mObj->mReferences.fetch_sub(REFERENCE_FLAG);
-            }
+            if (mObj != nullptr) { mObj->mReferences.fetch_sub(REFERENCE_FLAG); }
         }
 
-        bool continue_execution() {
-            return mObj != nullptr;
-        }
+        bool continue_execution() { return mObj != nullptr; }
 
     private:
-        LifetimeTracker* mObj{nullptr};
+        LifetimeTracker* mObj {nullptr};
     };
 
-    Guard makeGuard() {
-        return Guard(this);
-    }
+    Guard makeGuard() { return Guard(this); }
 
-    void signalShutdown() {
-        mReferences.fetch_add(SHUTDOWN_FLAG);
-    }
+    void signalShutdown() { mReferences.fetch_add(SHUTDOWN_FLAG); }
 
-    void waitCompletion() {
-        utils::SpinWaitUntilEq(mReferences, SHUTDOWN_FLAG);
-    }
+    void waitCompletion() { utils::SpinWaitUntilEq(mReferences, SHUTDOWN_FLAG); }
 
 private:
     friend class Guard;
     static constexpr std::uintptr_t SHUTDOWN_FLAG = 1;
     static constexpr std::uintptr_t REFERENCE_FLAG = 1 << 1;
-    std::atomic<std::uintptr_t> mReferences{};
+    std::atomic<std::uintptr_t> mReferences {};
 };
 
 class ArenaTable {
@@ -382,21 +337,19 @@ class ArenaTable {
     std::array<ArenaPtrRWMutex, maxArenas> mArenaTable;
 
     struct ThreadState {
-        bool lockedArenas[maxArenas]{};
+        bool lockedArenas[maxArenas] {};
         int arenaIdxStack[maxArenas];
-        int level{};
+        int level {};
     };
 
-    LifetimeTracker mLifetimeTracker{};
+    LifetimeTracker mLifetimeTracker {};
     static thread_local ThreadState mThreadState;
 
     template <typename F>
-    auto find_arena(std::size_t start, F f) -> decltype(f(std::declval<ArenaPtrRWMutex&>(), std::size_t{})) {
+    auto find_arena(std::size_t start, F f) -> decltype(f(std::declval<ArenaPtrRWMutex&>(), std::size_t {})) {
         for (std::size_t idx = start, i = 0; i < maxArenas; ++i, idx = (idx + 1) % maxArenas) {
             auto res = f(mArenaTable[idx], idx);
-            if (res) {
-                return res;
-            }
+            if (res) { return res; }
         }
         return {};
     }
@@ -409,18 +362,18 @@ class ArenaTable {
         if (guard.continue_execution()) {
             int num_threads = rnd.get() % utils::get_platform_max_threads() + 1;
             unsigned int num_reserved = rnd.get() % num_threads;
-            tbb::task_arena::priority priorities[] = { tbb::task_arena::priority::low , tbb::task_arena::priority::normal, tbb::task_arena::priority::high };
+            tbb::task_arena::priority priorities[]
+                    = {tbb::task_arena::priority::low, tbb::task_arena::priority::normal,
+                       tbb::task_arena::priority::high};
             tbb::task_arena::priority priority = priorities[rnd.get() % 3];
 
-            tbb::task_arena* a = new (aligned_malloc(arenaAligment, arenaAligment)) tbb::task_arena{ num_threads , num_reserved , priority };
+            tbb::task_arena* a = new (aligned_malloc(arenaAligment, arenaAligment))
+                    tbb::task_arena {num_threads, num_reserved, priority};
 
             if (!find_arena(rnd.get() % maxArenas, [a](ArenaPtrRWMutex& arena, std::size_t) -> bool {
-                    if (arena.trySet(a)) {
-                        return true;
-                    }
+                    if (arena.trySet(a)) { return true; }
                     return false;
-                }))
-            {
+                })) {
                 gStats.notify(Statistics::skippedArenaCreate);
                 a->~task_arena();
                 aligned_free(a);
@@ -444,8 +397,7 @@ class ArenaTable {
                         }
                     }
                     return false;
-                }))
-            {
+                })) {
                 gStats.notify(Statistics::skippedArenaDestroy);
             }
         }
@@ -456,7 +408,7 @@ class ArenaTable {
         mLifetimeTracker.waitCompletion();
         find_arena(0, [](ArenaPtrRWMutex& arena, std::size_t) {
             if (arena.get()) {
-                ScopedLock lock{ arena, true };
+                ScopedLock lock {arena, true};
                 auto a = arena.get();
                 lock.clear();
                 a->~task_arena();
@@ -469,27 +421,26 @@ class ArenaTable {
     std::pair<tbb::task_arena*, std::size_t> acquire(Random& rnd, ScopedLock& lock) {
         auto guard = mLifetimeTracker.makeGuard();
 
-        tbb::task_arena* a{nullptr};
-        std::size_t resIdx{};
+        tbb::task_arena* a {nullptr};
+        std::size_t resIdx {};
         if (guard.continue_execution()) {
             auto& ts = mThreadState;
-            a = find_arena(rnd.get() % maxArenas,
-                [&ts, &lock, &resIdx](ArenaPtrRWMutex& arena, std::size_t idx) -> tbb::task_arena* {
-                    if (!ts.lockedArenas[idx]) {
-                        if (lock.tryAcquire(arena, false)) {
-                            ts.lockedArenas[idx] = true;
-                            ts.arenaIdxStack[ts.level++] = int(idx);
-                            resIdx = idx;
-                            return arena.get();
+            a = find_arena(
+                    rnd.get() % maxArenas,
+                    [&ts, &lock, &resIdx](ArenaPtrRWMutex& arena, std::size_t idx) -> tbb::task_arena* {
+                        if (!ts.lockedArenas[idx]) {
+                            if (lock.tryAcquire(arena, false)) {
+                                ts.lockedArenas[idx] = true;
+                                ts.arenaIdxStack[ts.level++] = int(idx);
+                                resIdx = idx;
+                                return arena.get();
+                            }
                         }
-                    }
-                    return nullptr;
-                });
-            if (!a) {
-                gStats.notify(Statistics::skippedArenaAcquire);
-            }
+                        return nullptr;
+                    });
+            if (!a) { gStats.notify(Statistics::skippedArenaAcquire); }
         }
-        return { a, resIdx };
+        return {a, resIdx};
     }
 
     void release(ScopedLock& lock) {
@@ -529,16 +480,12 @@ struct actor;
 
 template <>
 struct actor<arena_create> {
-    static void do_it(Random& r) {
-        arenaTable.create(r);
-    }
+    static void do_it(Random& r) { arenaTable.create(r); }
 };
 
 template <>
 struct actor<arena_destroy> {
-    static void do_it(Random& r) {
-        arenaTable.destroy(r);
-    }
+    static void do_it(Random& r) { arenaTable.destroy(r); }
 };
 
 template <>
@@ -553,15 +500,11 @@ struct actor<arena_action> {
         ArenaTable::ScopedLock lock;
         auto entry = arenaTable.acquire(r, lock);
         if (entry.first) {
-            enum arena_actions {
-                arena_execute,
-                arena_enqueue,
-                num_arena_actions
-            };
+            enum arena_actions { arena_execute, arena_enqueue, num_arena_actions };
             auto process = r.get() % 2;
             auto body = [process] {
                 if (process) {
-                    tbb::detail::d1::wait_context wctx{ 1 };
+                    tbb::detail::d1::wait_context wctx {1};
                     tbb::task_group_context ctx;
                     tbb::this_task_arena::enqueue([&wctx] { wctx.release(); });
                     tbb::detail::d1::wait(wctx, ctx);
@@ -569,27 +512,27 @@ struct actor<arena_action> {
                     global_actor(0);
                 }
             };
-            switch (r.get() % (16*num_arena_actions)) {
-            case arena_execute:
-                // to prevent deadlock, potentially blocking operation
-                // may be called only for arenas with larger index
-                if (entry.second > arenaLevel) {
-                    gStats.notify(Statistics::ArenaExecute);
-                    auto oldArenaLevel = arenaLevel;
-                    arenaLevel = entry.second;
-                    entry.first->execute(body);
-                    arenaLevel = oldArenaLevel;
+            switch (r.get() % (16 * num_arena_actions)) {
+                case arena_execute:
+                    // to prevent deadlock, potentially blocking operation
+                    // may be called only for arenas with larger index
+                    if (entry.second > arenaLevel) {
+                        gStats.notify(Statistics::ArenaExecute);
+                        auto oldArenaLevel = arenaLevel;
+                        arenaLevel = entry.second;
+                        entry.first->execute(body);
+                        arenaLevel = oldArenaLevel;
+                        break;
+                    }
+                    utils_fallthrough;
+                case arena_enqueue:
+                    utils_fallthrough;
+                default:
+                    gStats.notify(Statistics::ArenaEnqueue);
+                    // after stealing by a worker, the task will run in arena
+                    // with index entry.second
+                    entry.first->enqueue([entry] { global_actor(entry.second); });
                     break;
-                }
-                utils_fallthrough;
-            case arena_enqueue:
-                utils_fallthrough;
-            default:
-                gStats.notify(Statistics::ArenaEnqueue);
-                // after stealing by a worker, the task will run in arena
-                // with index entry.second
-                entry.first->enqueue([ entry ] { global_actor(entry.second); });
-                break;
             }
             arenaTable.release(lock);
         }
@@ -599,47 +542,54 @@ struct actor<arena_action> {
 template <>
 struct actor<parallel_algorithm> {
     static void do_it(Random& rnd) {
-        enum PARTITIONERS {
-            simpl_part,
-            auto_part,
-            aff_part,
-            static_part,
-            num_parts
-        };
+        enum PARTITIONERS { simpl_part, auto_part, aff_part, static_part, num_parts };
         int sz = rnd.get() % 10000;
         auto doGlbAction = rnd.get() % 1000 == 42;
         auto body = [doGlbAction, sz](int i) {
-            if (i == sz / 2 && doGlbAction) {
-                global_actor(0);
-            }
+            if (i == sz / 2 && doGlbAction) { global_actor(0); }
         };
 
         switch (rnd.get() % num_parts) {
-        case simpl_part:
-            tbb::parallel_for(0, sz, body, tbb::simple_partitioner{}); break;
-        case auto_part:
-            tbb::parallel_for(0, sz, body, tbb::auto_partitioner{}); break;
-        case aff_part:
-        {
-            tbb::affinity_partitioner aff;
-            tbb::parallel_for(0, sz, body, aff); break;
-        }
-        case static_part:
-            tbb::parallel_for(0, sz, body, tbb::static_partitioner{}); break;
+            case simpl_part:
+                tbb::parallel_for(0, sz, body, tbb::simple_partitioner {});
+                break;
+            case auto_part:
+                tbb::parallel_for(0, sz, body, tbb::auto_partitioner {});
+                break;
+            case aff_part: {
+                tbb::affinity_partitioner aff;
+                tbb::parallel_for(0, sz, body, aff);
+                break;
+            }
+            case static_part:
+                tbb::parallel_for(0, sz, body, tbb::static_partitioner {});
+                break;
         }
     }
 };
 
 void global_actor(size_t arenaAfterStealing) {
-    static thread_local std::uint64_t localNumActions{};
+    static thread_local std::uint64_t localNumActions {};
 
     while (globalNumActions < maxNumActions) {
         auto& rnd = threadRandom;
         switch (rnd.get() % num_actions) {
-        case arena_create:  gStats.notify(Statistics::ArenaCreate); actor<arena_create>::do_it(rnd);  break;
-        case arena_destroy: gStats.notify(Statistics::ArenaDestroy); actor<arena_destroy>::do_it(rnd); break;
-        case arena_action:  gStats.notify(Statistics::ArenaAcquire); actor<arena_action>::do_it(rnd, arenaAfterStealing);  break;
-        case parallel_algorithm: gStats.notify(Statistics::ParallelAlgorithm); actor<parallel_algorithm>::do_it(rnd);  break;
+            case arena_create:
+                gStats.notify(Statistics::ArenaCreate);
+                actor<arena_create>::do_it(rnd);
+                break;
+            case arena_destroy:
+                gStats.notify(Statistics::ArenaDestroy);
+                actor<arena_destroy>::do_it(rnd);
+                break;
+            case arena_action:
+                gStats.notify(Statistics::ArenaAcquire);
+                actor<arena_action>::do_it(rnd, arenaAfterStealing);
+                break;
+            case parallel_algorithm:
+                gStats.notify(Statistics::ParallelAlgorithm);
+                actor<parallel_algorithm>::do_it(rnd);
+                break;
         }
 
         if (++localNumActions == 100) {
@@ -659,10 +609,10 @@ void global_actor(size_t arenaAfterStealing) {
 TEST_CASE("Stress test with mixing functionality") {
     // TODO add thread recreation
     // TODO: Enable statistics
-    tbb::task_scheduler_handle handle{ tbb::attach{} };
+    tbb::task_scheduler_handle handle {tbb::attach {}};
 
     const std::size_t numExtraThreads = 16;
-    utils::SpinBarrier startBarrier{numExtraThreads};
+    utils::SpinBarrier startBarrier {numExtraThreads};
     utils::NativeParallelFor(numExtraThreads, [&startBarrier](std::size_t) {
         startBarrier.wait();
         global_actor(0);
diff --git a/external/tbb/test/tbb/test_semaphore.cpp b/external/tbb/test/tbb/test_semaphore.cpp
index a00cab09..153bff08 100644
--- a/external/tbb/test/tbb/test_semaphore.cpp
+++ b/external/tbb/test/tbb/test_semaphore.cpp
@@ -22,12 +22,12 @@
 #endif
 
 // Test for counting semaphore
+#include "../../src/tbb/semaphore.h"
+#include "common/spin_barrier.h"
 #include "common/test.h"
 #include "common/utils.h"
-#include "common/spin_barrier.h"
 #include "tbb/blocked_range.h"
 #include "tbb/tick_count.h"
-#include "../../src/tbb/semaphore.h"
 #include <atomic>
 #include <vector>
 
@@ -45,18 +45,16 @@ class Body : utils::NoAssign {
     std::vector<int>& ourCounts;
     std::vector<double>& tottime;
 
-    static constexpr int tickCounts = 1; // millisecond
+    static constexpr int tickCounts = 1;// millisecond
     static constexpr int innerWait = 5; // millisecond
 public:
-    Body( int nThread, int nIter, semaphore& sem,
-          std::vector<int>& our_counts, std::vector<double>& tot_time )
-        : nIters(nIter), mySem(sem), ourCounts(our_counts), tottime(tot_time)
-    {
+    Body(int nThread, int nIter, semaphore& sem, std::vector<int>& our_counts, std::vector<double>& tot_time)
+        : nIters(nIter), mySem(sem), ourCounts(our_counts), tottime(tot_time) {
         sBarrier.initialize(nThread);
         pCount = 0;
     }
 
-    void operator()( const int tid ) const {
+    void operator()(const int tid) const {
         sBarrier.wait();
 
         for (int i = 0; i < nIters; ++i) {
@@ -67,18 +65,16 @@ class Body : utils::NoAssign {
             tottime[tid] += (t1 - t0).seconds();
 
             int curval = ++pCount;
-            if (curval > ourCounts[tid]) {
-                ourCounts[tid] = curval;
-            }
+            if (curval > ourCounts[tid]) { ourCounts[tid] = curval; }
             utils::Sleep(innerWait);
             --pCount;
             REQUIRE(int(pCount) >= 0);
             mySem.V();
         }
     }
-}; // class Body
+};// class Body
 
-void test_semaphore( int sem_init_cnt, int extra_threads ) {
+void test_semaphore(int sem_init_cnt, int extra_threads) {
     semaphore my_sem(sem_init_cnt);
     int n_threads = sem_init_cnt + extra_threads;
 
@@ -93,9 +89,7 @@ void test_semaphore( int sem_init_cnt, int extra_threads ) {
     REQUIRE_MESSAGE(!pCount, "not all threads decremented pCount");
 
     int max_count = -1;
-    for (auto item : max_vals) {
-        max_count = utils::max(max_count, item);
-    }
+    for (auto item : max_vals) { max_count = utils::max(max_count, item); }
     REQUIRE_MESSAGE(max_count <= sem_init_cnt, "Too many threads in semaphore-protected increment");
 }
 
@@ -111,7 +105,7 @@ struct Counter {
     std::atomic<long> value;
     S my_sem;
     Counter() : value(0) {}
-}; // struct Counter
+};// struct Counter
 
 // Function object for use with parallel_for.h
 template <typename C>
@@ -119,7 +113,7 @@ struct AddOne : utils::NoAssign {
     C& my_counter;
 
     // Increments counter once for each iteration in the iteration space
-    void operator()( int ) const {
+    void operator()(int) const {
         for (std::size_t i = 0; i < N_TIMES; ++i) {
             my_counter.my_sem.P();
             ++my_counter.value;
@@ -127,12 +121,10 @@ struct AddOne : utils::NoAssign {
         }
     }
 
-    AddOne( C& c ) : my_counter(c) {
-        my_counter.my_sem.V();
-    }
-}; // struct AddOne
+    AddOne(C& c) : my_counter(c) { my_counter.my_sem.V(); }
+};// struct AddOne
 
-void test_binary_semaphore( int n_threads ) {
+void test_binary_semaphore(int n_threads) {
     Counter<tbb::detail::r1::binary_semaphore> counter;
     AddOne<decltype(counter)> AddOneBody(counter);
     utils::NativeParallelFor(n_threads, AddOneBody);
@@ -146,7 +138,7 @@ enum FilterType { imaProducer, imaConsumer };
 class FilterBase : utils::NoAssign {
 protected:
     FilterType ima;
-    unsigned totTokens; // total number of tokens to be emitted, only used by producer
+    unsigned totTokens;// total number of tokens to be emitted, only used by producer
     std::atomic<unsigned>& myTokens;
     std::atomic<unsigned>& otherTokens;
 
@@ -157,54 +149,44 @@ class FilterBase : utils::NoAssign {
     unsigned* myBuffer;
     unsigned* nextBuffer;
     unsigned curToken;
+
 public:
-    FilterBase( FilterType filter,
-                unsigned tot_tokens,
-                std::atomic<unsigned>& my_tokens,
-                std::atomic<unsigned>& other_tokens,
-                unsigned my_wait,
-                semaphore& m_sem,
-                semaphore& n_sem,
-                unsigned* buf,
-                unsigned* n_buf )
-        : ima(filter), totTokens(tot_tokens), myTokens(my_tokens),
-          otherTokens(other_tokens), myWait(my_wait), my_sem(m_sem),
-          next_sem(n_sem), myBuffer(buf), nextBuffer(n_buf)
-    {
+    FilterBase(FilterType filter, unsigned tot_tokens, std::atomic<unsigned>& my_tokens,
+               std::atomic<unsigned>& other_tokens, unsigned my_wait, semaphore& m_sem, semaphore& n_sem,
+               unsigned* buf, unsigned* n_buf)
+        : ima(filter), totTokens(tot_tokens), myTokens(my_tokens), otherTokens(other_tokens), myWait(my_wait),
+          my_sem(m_sem), next_sem(n_sem), myBuffer(buf), nextBuffer(n_buf) {
         curToken = 0;
     }
 
-    void Produce( const int );
-    void Consume( const int );
-    void operator()( const int tid ) {
+    void Produce(const int);
+    void Consume(const int);
+    void operator()(const int tid) {
         if (ima == imaConsumer) {
             Consume(tid);
         } else {
             Produce(tid);
         }
     }
-}; // class FilterBase
+};// class FilterBase
 
 class ProduceConsumeBody {
     FilterBase** my_filters;
+
 public:
-    ProduceConsumeBody( FilterBase** filters ) : my_filters(filters) {}
+    ProduceConsumeBody(FilterBase** filters) : my_filters(filters) {}
 
-    void operator()( const int tid ) const {
-        my_filters[tid]->operator()(tid);
-    }
-}; // class ProduceConsumeBody
+    void operator()(const int tid) const { my_filters[tid]->operator()(tid); }
+};// class ProduceConsumeBody
 
 // send a bunch of non-null "tokens" to consumer, then a nullptr
-void FilterBase::Produce( const int ) {
-    nextBuffer[0] = 0; // just in case we provide no tokens
+void FilterBase::Produce(const int) {
+    nextBuffer[0] = 0;// just in case we provide no tokens
     sBarrier.wait();
-    while(totTokens) {
-        while(!myTokens) {
-            my_sem.P();
-        }
+    while (totTokens) {
+        while (!myTokens) { my_sem.P(); }
         // we have a slot available
-        --myTokens; // moving this down reduces spurious wakeups
+        --myTokens;// moving this down reduces spurious wakeups
         --totTokens;
         if (totTokens) {
             nextBuffer[curToken & (MAX_TOKENS - 1)] = curToken * 3 + 1;
@@ -215,20 +197,16 @@ void FilterBase::Produce( const int ) {
 
         utils::Sleep(myWait);
         unsigned temp = ++otherTokens;
-        if (temp == 1) {
-            next_sem.V();
-        }
+        if (temp == 1) { next_sem.V(); }
     }
-    next_sem.V(); // final wakeup
+    next_sem.V();// final wakeup
 }
 
-void FilterBase::Consume( const int ) {
+void FilterBase::Consume(const int) {
     unsigned myToken;
     sBarrier.wait();
     do {
-        while( !myTokens ) {
-            my_sem.P();
-        }
+        while (!myTokens) { my_sem.P(); }
         // we have a slot available
         --myTokens;
         myToken = myBuffer[curToken & (MAX_TOKENS - 1)];
@@ -237,11 +215,9 @@ void FilterBase::Consume( const int ) {
             ++curToken;
             utils::Sleep(myWait);
             unsigned temp = ++otherTokens;
-            if (temp == 1) {
-                next_sem.V();
-            }
+            if (temp == 1) { next_sem.V(); }
         }
-    } while(myToken);
+    } while (myToken);
     // end of processing
     REQUIRE_MESSAGE(curToken + 1 == totTokens, "Didn't receive enough tokens");
 }
@@ -250,19 +226,21 @@ void FilterBase::Consume( const int ) {
 // nTokens are total number of tokens through the pipe
 // pWait is the wait time for the producer
 // cWait is the wait time for the consumer
-void test_producer_consumer( unsigned totTokens, unsigned nTokens, unsigned pWait, unsigned cWait ) {
+void test_producer_consumer(unsigned totTokens, unsigned nTokens, unsigned pWait, unsigned cWait) {
     semaphore p_sem;
     semaphore c_sem;
     std::atomic<unsigned> p_tokens;
     std::atomic<unsigned> c_tokens(0);
 
     unsigned c_buffer[MAX_TOKENS];
-    FilterBase* my_filters[2]; // one producer, one concumer
+    FilterBase* my_filters[2];// one producer, one concumer
 
     REQUIRE_MESSAGE(nTokens <= MAX_TOKENS, "Not enough slots for tokens");
 
-    my_filters[0] = new FilterBase(imaProducer, totTokens, p_tokens, c_tokens, pWait, c_sem, p_sem, nullptr, &(c_buffer[0]));
-    my_filters[1] = new FilterBase(imaConsumer, totTokens, c_tokens, p_tokens, cWait, p_sem, c_sem, c_buffer, nullptr);
+    my_filters[0] = new FilterBase(imaProducer, totTokens, p_tokens, c_tokens, pWait, c_sem, p_sem, nullptr,
+                                   &(c_buffer[0]));
+    my_filters[1] = new FilterBase(imaConsumer, totTokens, c_tokens, p_tokens, cWait, p_sem, c_sem, c_buffer,
+                                   nullptr);
 
     p_tokens = nTokens;
     ProduceConsumeBody body(my_filters);
@@ -273,9 +251,7 @@ void test_producer_consumer( unsigned totTokens, unsigned nTokens, unsigned pWai
 }
 
 //! \brief \ref error_guessing
-TEST_CASE("test binary semaphore") {
-    test_binary_semaphore(utils::MaxThread);
-}
+TEST_CASE("test binary semaphore") { test_binary_semaphore(utils::MaxThread); }
 
 //! \brief \ref error_guessing
 TEST_CASE("test semaphore") {
diff --git a/external/tbb/test/tbb/test_sequencer_node.cpp b/external/tbb/test/tbb/test_sequencer_node.cpp
index 1e6494d6..4075268f 100644
--- a/external/tbb/test/tbb/test_sequencer_node.cpp
+++ b/external/tbb/test/tbb/test_sequencer_node.cpp
@@ -19,89 +19,85 @@
 #include "tbb/flow_graph.h"
 #include "tbb/global_control.h"
 
+#include "common/concepts_common.h"
 #include "common/test.h"
+#include "common/test_follows_and_precedes_api.h"
 #include "common/utils.h"
 #include "common/utils_assert.h"
-#include "common/test_follows_and_precedes_api.h"
-#include "common/concepts_common.h"
 
-#include <cstdio>
 #include <atomic>
+#include <cstdio>
 
 #include "test_buffering_try_put_and_wait.h"
 
 //! \file test_sequencer_node.cpp
 //! \brief Test for [flow_graph.sequencer_node] specification
 
-
 #define N 1000
 #define C 10
 
-template< typename T >
+template <typename T>
 struct seq_inspector {
     size_t operator()(const T &v) const { return size_t(v); }
 };
 
-template< typename T >
-bool wait_try_get( tbb::flow::graph &g, tbb::flow::sequencer_node<T> &q, T &value ) {
+template <typename T>
+bool wait_try_get(tbb::flow::graph &g, tbb::flow::sequencer_node<T> &q, T &value) {
     g.wait_for_all();
     return q.try_get(value);
 }
 
-template< typename T >
-void spin_try_get( tbb::flow::queue_node<T> &q, T &value ) {
-    while ( q.try_get(value) != true ) ;
+template <typename T>
+void spin_try_get(tbb::flow::queue_node<T> &q, T &value) {
+    while (q.try_get(value) != true)
+        ;
 }
 
-template< typename T >
+template <typename T>
 struct parallel_puts : utils::NoAssign {
 
     tbb::flow::sequencer_node<T> &my_q;
     int my_num_threads;
 
-    parallel_puts( tbb::flow::sequencer_node<T> &q, int num_threads ) : my_q(q), my_num_threads(num_threads) {}
+    parallel_puts(tbb::flow::sequencer_node<T> &q, int num_threads) : my_q(q), my_num_threads(num_threads) {}
 
     void operator()(int tid) const {
-        for (int j = tid; j < N; j+=my_num_threads) {
-            bool msg = my_q.try_put( T(j) );
-            CHECK_MESSAGE( msg == true, "" );
+        for (int j = tid; j < N; j += my_num_threads) {
+            bool msg = my_q.try_put(T(j));
+            CHECK_MESSAGE(msg == true, "");
         }
     }
-
 };
 
-template< typename T >
+template <typename T>
 struct touches {
 
     bool **my_touches;
     T *my_last_touch;
     int my_num_threads;
 
-    touches( int num_threads ) : my_num_threads(num_threads) {
+    touches(int num_threads) : my_num_threads(num_threads) {
         my_last_touch = new T[my_num_threads];
-        my_touches = new bool* [my_num_threads];
-        for ( int p = 0; p < my_num_threads; ++p) {
+        my_touches = new bool *[my_num_threads];
+        for (int p = 0; p < my_num_threads; ++p) {
             my_last_touch[p] = T(-1);
             my_touches[p] = new bool[N];
-            for ( int n = 0; n < N; ++n)
-                my_touches[p][n] = false;
+            for (int n = 0; n < N; ++n) my_touches[p][n] = false;
         }
     }
 
     ~touches() {
-        for ( int p = 0; p < my_num_threads; ++p) {
-            delete [] my_touches[p];
-        }
-        delete [] my_touches;
-        delete [] my_last_touch;
+        for (int p = 0; p < my_num_threads; ++p) { delete[] my_touches[p]; }
+        delete[] my_touches;
+        delete[] my_last_touch;
     }
 
-    bool check( int tid, T v ) {
-        if ( my_touches[tid][v] != false ) {
+    bool check(int tid, T v) {
+        if (my_touches[tid][v] != false) {
             printf("Error: value seen twice by local thread\n");
             return false;
         }
-        if ( v <= my_last_touch[tid] ) {
+        if (v <= my_last_touch[tid]) {
             printf("Error: value seen in wrong order by local thread\n");
             return false;
         }
@@ -112,77 +108,74 @@ struct touches {
 
     bool validate_touches() {
         bool *all_touches = new bool[N];
-        for ( int n = 0; n < N; ++n)
-            all_touches[n] = false;
+        for (int n = 0; n < N; ++n) all_touches[n] = false;
 
-        for ( int p = 0; p < my_num_threads; ++p) {
-            for ( int n = 0; n < N; ++n) {
-                if ( my_touches[p][n] == true ) {
-                    CHECK_MESSAGE( ( all_touches[n] == false), "value see by more than one thread\n" );
+        for (int p = 0; p < my_num_threads; ++p) {
+            for (int n = 0; n < N; ++n) {
+                if (my_touches[p][n] == true) {
+                    CHECK_MESSAGE((all_touches[n] == false), "value see by more than one thread\n");
                     all_touches[n] = true;
                 }
             }
         }
-        for ( int n = 0; n < N; ++n) {
-            if ( !all_touches[n] )
-                printf("No touch at %d, my_num_threads = %d\n", n, my_num_threads);
+        for (int n = 0; n < N; ++n) {
+            if (!all_touches[n]) printf("No touch at %d, my_num_threads = %d\n", n, my_num_threads);
             //CHECK_MESSAGE( ( all_touches[n] == true), "value not seen by any thread\n" );
         }
-        delete [] all_touches;
+        delete[] all_touches;
         return true;
     }
-
 };
 
-template< typename T >
+template <typename T>
 struct parallel_gets : utils::NoAssign {
 
     tbb::flow::sequencer_node<T> &my_q;
     int my_num_threads;
     touches<T> &my_touches;
 
-    parallel_gets( tbb::flow::sequencer_node<T> &q, int num_threads, touches<T> &t ) : my_q(q), my_num_threads(num_threads), my_touches(t) {}
+    parallel_gets(tbb::flow::sequencer_node<T> &q, int num_threads, touches<T> &t)
+        : my_q(q), my_num_threads(num_threads), my_touches(t) {}
 
     void operator()(int tid) const {
-        for (int j = tid; j < N; j+=my_num_threads) {
+        for (int j = tid; j < N; j += my_num_threads) {
             T v;
-            spin_try_get( my_q, v );
-            my_touches.check( tid, v );
+            spin_try_get(my_q, v);
+            my_touches.check(tid, v);
         }
     }
-
 };
 
-template< typename T >
+template <typename T>
 struct parallel_put_get : utils::NoAssign {
 
     tbb::flow::sequencer_node<T> &my_s1;
     tbb::flow::sequencer_node<T> &my_s2;
     int my_num_threads;
-    std::atomic< int > &my_counter;
+    std::atomic<int> &my_counter;
     touches<T> &my_touches;
 
-    parallel_put_get( tbb::flow::sequencer_node<T> &s1, tbb::flow::sequencer_node<T> &s2, int num_threads,
-                      std::atomic<int> &counter, touches<T> &t ) : my_s1(s1), my_s2(s2), my_num_threads(num_threads), my_counter(counter), my_touches(t) {}
+    parallel_put_get(tbb::flow::sequencer_node<T> &s1, tbb::flow::sequencer_node<T> &s2, int num_threads,
+                     std::atomic<int> &counter, touches<T> &t)
+        : my_s1(s1), my_s2(s2), my_num_threads(num_threads), my_counter(counter), my_touches(t) {}
 
     void operator()(int tid) const {
         int i_start = 0;
 
-        while ( (i_start = my_counter.fetch_add(C)) < N ) {
-            int i_end = ( N < i_start + C ) ? N : i_start + C;
+        while ((i_start = my_counter.fetch_add(C)) < N) {
+            int i_end = (N < i_start + C) ? N : i_start + C;
             for (int i = i_start; i < i_end; ++i) {
-                bool msg = my_s1.try_put( T(i) );
-                CHECK_MESSAGE( msg == true, "" );
+                bool msg = my_s1.try_put(T(i));
+                CHECK_MESSAGE(msg == true, "");
             }
 
             for (int i = i_start; i < i_end; ++i) {
                 T v;
-                spin_try_get( my_s2, v );
-                my_touches.check( tid, v );
+                spin_try_get(my_s2, v);
+                my_touches.check(tid, v);
             }
         }
     }
-
 };
 
 //
@@ -192,63 +185,62 @@ struct parallel_put_get : utils::NoAssign {
 // chained sequencers, multiple parallel senders, multiple receivers, properly sequenced (relative to receiver) at output
 //
 
-template< typename T >
+template <typename T>
 int test_parallel(int num_threads) {
     tbb::flow::graph g;
 
     tbb::flow::sequencer_node<T> s(g, seq_inspector<T>());
-    utils::NativeParallelFor( num_threads, parallel_puts<T>(s, num_threads) );
+    utils::NativeParallelFor(num_threads, parallel_puts<T>(s, num_threads));
     {
-        touches<T> t( num_threads );
-        utils::NativeParallelFor( num_threads, parallel_gets<T>(s, num_threads, t) );
+        touches<T> t(num_threads);
+        utils::NativeParallelFor(num_threads, parallel_gets<T>(s, num_threads, t));
         g.wait_for_all();
-        CHECK_MESSAGE( t.validate_touches(), "" );
+        CHECK_MESSAGE(t.validate_touches(), "");
     }
     T bogus_value(-1);
     T j = bogus_value;
-    CHECK_MESSAGE( s.try_get( j ) == false, "" );
-    CHECK_MESSAGE( j == bogus_value, "" );
+    CHECK_MESSAGE(s.try_get(j) == false, "");
+    CHECK_MESSAGE(j == bogus_value, "");
     g.wait_for_all();
 
     tbb::flow::sequencer_node<T> s1(g, seq_inspector<T>());
     tbb::flow::sequencer_node<T> s2(g, seq_inspector<T>());
     tbb::flow::sequencer_node<T> s3(g, seq_inspector<T>());
-    tbb::flow::make_edge( s1, s2 );
-    tbb::flow::make_edge( s2, s3 );
+    tbb::flow::make_edge(s1, s2);
+    tbb::flow::make_edge(s2, s3);
 
     {
-        touches<T> t( num_threads );
+        touches<T> t(num_threads);
         std::atomic<int> counter;
         counter = 0;
-        utils::NativeParallelFor( num_threads, parallel_put_get<T>(s1, s3, num_threads, counter, t) );
+        utils::NativeParallelFor(num_threads, parallel_put_get<T>(s1, s3, num_threads, counter, t));
         g.wait_for_all();
         t.validate_touches();
     }
     g.wait_for_all();
-    CHECK_MESSAGE( s1.try_get( j ) == false, "" );
+    CHECK_MESSAGE(s1.try_get(j) == false, "");
     g.wait_for_all();
-    CHECK_MESSAGE( s2.try_get( j ) == false, "" );
+    CHECK_MESSAGE(s2.try_get(j) == false, "");
     g.wait_for_all();
-    CHECK_MESSAGE( s3.try_get( j ) == false, "" );
-    CHECK_MESSAGE( j == bogus_value, "" );
+    CHECK_MESSAGE(s3.try_get(j) == false, "");
+    CHECK_MESSAGE(j == bogus_value, "");
 
     // test copy constructor
     tbb::flow::sequencer_node<T> s_copy(s);
-    utils::NativeParallelFor( num_threads, parallel_puts<T>(s_copy, num_threads) );
+    utils::NativeParallelFor(num_threads, parallel_puts<T>(s_copy, num_threads));
     for (int i = 0; i < N; ++i) {
         j = bogus_value;
-        spin_try_get( s_copy, j );
-        CHECK_MESSAGE( i == j, "" );
+        spin_try_get(s_copy, j);
+        CHECK_MESSAGE(i == j, "");
     }
     j = bogus_value;
     g.wait_for_all();
-    CHECK_MESSAGE( s_copy.try_get( j ) == false, "" );
-    CHECK_MESSAGE( j == bogus_value, "" );
+    CHECK_MESSAGE(s_copy.try_get(j) == false, "");
+    CHECK_MESSAGE(j == bogus_value, "");
 
     return 0;
 }
 
-
 //
 // Tests
 //
@@ -259,7 +251,7 @@ int test_parallel(int num_threads) {
 // Chained sequencers (3), in-order and reverse-order tests, properly sequenced at output
 //
 
-template< typename T >
+template <typename T>
 int test_serial() {
     tbb::flow::graph g;
     T bogus_value(-1);
@@ -272,51 +264,50 @@ int test_serial() {
     // Rejects attempts to add / remove predecessor
     // Rejects request from empty Q
     //
-    CHECK_MESSAGE( register_predecessor( s, s2 ) == false, "" );
-    CHECK_MESSAGE( remove_predecessor( s, s2 ) == false, "" );
-    CHECK_MESSAGE( s.try_get( j ) == false, "" );
-    CHECK_MESSAGE( j == bogus_value, "" );
+    CHECK_MESSAGE(register_predecessor(s, s2) == false, "");
+    CHECK_MESSAGE(remove_predecessor(s, s2) == false, "");
+    CHECK_MESSAGE(s.try_get(j) == false, "");
+    CHECK_MESSAGE(j == bogus_value, "");
 
     //
     // In-order simple puts and gets
     //
 
     for (int i = 0; i < N; ++i) {
-        bool msg = s.try_put( T(i) );
-        CHECK_MESSAGE( msg == true, "" );
-        CHECK_MESSAGE(!s.try_put( T(i) ), "");  // second attempt to put should reject
+        bool msg = s.try_put(T(i));
+        CHECK_MESSAGE(msg == true, "");
+        CHECK_MESSAGE(!s.try_put(T(i)), "");// second attempt to put should reject
     }
 
-
     for (int i = 0; i < N; ++i) {
         j = bogus_value;
-        CHECK_MESSAGE(wait_try_get( g, s, j ) == true, "");
-        CHECK_MESSAGE( i == j, "" );
-        CHECK_MESSAGE(!s.try_put( T(i) ),"" );  // after retrieving value, subsequent put should fail
+        CHECK_MESSAGE(wait_try_get(g, s, j) == true, "");
+        CHECK_MESSAGE(i == j, "");
+        CHECK_MESSAGE(!s.try_put(T(i)), "");// after retrieving value, subsequent put should fail
     }
     j = bogus_value;
     g.wait_for_all();
-    CHECK_MESSAGE( s.try_get( j ) == false, "" );
-    CHECK_MESSAGE( j == bogus_value, "" );
+    CHECK_MESSAGE(s.try_get(j) == false, "");
+    CHECK_MESSAGE(j == bogus_value, "");
 
     //
     // Reverse-order simple puts and gets
     //
 
-    for (int i = N-1; i >= 0; --i) {
-        bool msg = s2.try_put( T(i) );
-        CHECK_MESSAGE( msg == true, "" );
+    for (int i = N - 1; i >= 0; --i) {
+        bool msg = s2.try_put(T(i));
+        CHECK_MESSAGE(msg == true, "");
     }
 
     for (int i = 0; i < N; ++i) {
         j = bogus_value;
-        CHECK_MESSAGE(wait_try_get( g, s2, j ) == true, "");
-        CHECK_MESSAGE( i == j, "" );
+        CHECK_MESSAGE(wait_try_get(g, s2, j) == true, "");
+        CHECK_MESSAGE(i == j, "");
     }
     j = bogus_value;
     g.wait_for_all();
-    CHECK_MESSAGE( s2.try_get( j ) == false, "" );
-    CHECK_MESSAGE( j == bogus_value, "" );
+    CHECK_MESSAGE(s2.try_get(j) == false, "");
+    CHECK_MESSAGE(j == bogus_value, "");
 
     //
     // Chained in-order simple puts and gets
@@ -325,34 +316,34 @@ int test_serial() {
     tbb::flow::sequencer_node<T> s3(g, seq_inspector<T>());
     tbb::flow::sequencer_node<T> s4(g, seq_inspector<T>());
     tbb::flow::sequencer_node<T> s5(g, seq_inspector<T>());
-    tbb::flow::make_edge( s3, s4 );
-    tbb::flow::make_edge( s4, s5 );
+    tbb::flow::make_edge(s3, s4);
+    tbb::flow::make_edge(s4, s5);
 
     for (int i = 0; i < N; ++i) {
-        bool msg = s3.try_put( T(i) );
-        CHECK_MESSAGE( msg == true, "" );
+        bool msg = s3.try_put(T(i));
+        CHECK_MESSAGE(msg == true, "");
     }
 
     for (int i = 0; i < N; ++i) {
         j = bogus_value;
-        CHECK_MESSAGE(wait_try_get( g, s5, j ) == true, "");
-        CHECK_MESSAGE( i == j, "" );
+        CHECK_MESSAGE(wait_try_get(g, s5, j) == true, "");
+        CHECK_MESSAGE(i == j, "");
     }
     j = bogus_value;
-    CHECK_MESSAGE( wait_try_get( g, s3, j ) == false, "" );
-    CHECK_MESSAGE( wait_try_get( g, s4, j ) == false, "" );
-    CHECK_MESSAGE( wait_try_get( g, s5, j ) == false, "" );
-    CHECK_MESSAGE( j == bogus_value, "" );
+    CHECK_MESSAGE(wait_try_get(g, s3, j) == false, "");
+    CHECK_MESSAGE(wait_try_get(g, s4, j) == false, "");
+    CHECK_MESSAGE(wait_try_get(g, s5, j) == false, "");
+    CHECK_MESSAGE(j == bogus_value, "");
 
     g.wait_for_all();
-    tbb::flow::remove_edge( s3, s4 );
-    CHECK_MESSAGE( s3.try_put( N ) == true, "" );
-    CHECK_MESSAGE( wait_try_get( g, s4, j ) == false, "" );
-    CHECK_MESSAGE( j == bogus_value, "" );
-    CHECK_MESSAGE( wait_try_get( g, s5, j ) == false, "" );
-    CHECK_MESSAGE( j == bogus_value, "" );
-    CHECK_MESSAGE( wait_try_get( g, s3, j ) == true, "" );
-    CHECK_MESSAGE( j == N, "" );
+    tbb::flow::remove_edge(s3, s4);
+    CHECK_MESSAGE(s3.try_put(N) == true, "");
+    CHECK_MESSAGE(wait_try_get(g, s4, j) == false, "");
+    CHECK_MESSAGE(j == bogus_value, "");
+    CHECK_MESSAGE(wait_try_get(g, s5, j) == false, "");
+    CHECK_MESSAGE(j == bogus_value, "");
+    CHECK_MESSAGE(wait_try_get(g, s3, j) == true, "");
+    CHECK_MESSAGE(j == N, "");
 
     //
     // Chained reverse-order simple puts and gets
@@ -361,34 +352,34 @@ int test_serial() {
     tbb::flow::sequencer_node<T> s6(g, seq_inspector<T>());
     tbb::flow::sequencer_node<T> s7(g, seq_inspector<T>());
     tbb::flow::sequencer_node<T> s8(g, seq_inspector<T>());
-    tbb::flow::make_edge( s6, s7 );
-    tbb::flow::make_edge( s7, s8 );
+    tbb::flow::make_edge(s6, s7);
+    tbb::flow::make_edge(s7, s8);
 
-    for (int i = N-1; i >= 0; --i) {
-        bool msg = s6.try_put( T(i) );
-        CHECK_MESSAGE( msg == true, "" );
+    for (int i = N - 1; i >= 0; --i) {
+        bool msg = s6.try_put(T(i));
+        CHECK_MESSAGE(msg == true, "");
     }
 
     for (int i = 0; i < N; ++i) {
         j = bogus_value;
-        CHECK_MESSAGE( wait_try_get( g, s8, j ) == true, "" );
-        CHECK_MESSAGE( i == j, "" );
+        CHECK_MESSAGE(wait_try_get(g, s8, j) == true, "");
+        CHECK_MESSAGE(i == j, "");
     }
     j = bogus_value;
-    CHECK_MESSAGE( wait_try_get( g, s6, j ) == false, "" );
-    CHECK_MESSAGE( wait_try_get( g, s7, j ) == false, "" );
-    CHECK_MESSAGE( wait_try_get( g, s8, j ) == false, "" );
-    CHECK_MESSAGE( j == bogus_value, "" );
+    CHECK_MESSAGE(wait_try_get(g, s6, j) == false, "");
+    CHECK_MESSAGE(wait_try_get(g, s7, j) == false, "");
+    CHECK_MESSAGE(wait_try_get(g, s8, j) == false, "");
+    CHECK_MESSAGE(j == bogus_value, "");
 
     g.wait_for_all();
-    tbb::flow::remove_edge( s6, s7 );
-    CHECK_MESSAGE( s6.try_put( N ) == true, "" );
-    CHECK_MESSAGE( wait_try_get( g, s7, j ) == false, "" );
-    CHECK_MESSAGE( j == bogus_value, "" );
-    CHECK_MESSAGE( wait_try_get( g, s8, j ) == false, "" );
-    CHECK_MESSAGE( j == bogus_value, "" );
-    CHECK_MESSAGE( wait_try_get( g, s6, j ) == true, "" );
-    CHECK_MESSAGE( j == N, "" );
+    tbb::flow::remove_edge(s6, s7);
+    CHECK_MESSAGE(s6.try_put(N) == true, "");
+    CHECK_MESSAGE(wait_try_get(g, s7, j) == false, "");
+    CHECK_MESSAGE(j == bogus_value, "");
+    CHECK_MESSAGE(wait_try_get(g, s8, j) == false, "");
+    CHECK_MESSAGE(j == bogus_value, "");
+    CHECK_MESSAGE(wait_try_get(g, s6, j) == true, "");
+    CHECK_MESSAGE(j == N, "");
 
     return 0;
 }
@@ -397,16 +388,14 @@ int test_serial() {
 #include <array>
 #include <vector>
 void test_follows_and_precedes_api() {
-    std::array<int, 3> messages_for_follows = { {0, 1, 2} };
+    std::array<int, 3> messages_for_follows = {{0, 1, 2}};
     std::vector<int> messages_for_precedes = {0, 1, 2};
 
-    follows_and_precedes_testing::test_follows
-        <int, tbb::flow::sequencer_node<int>>
-        (messages_for_follows, [](const int& i) -> std::size_t { return i; });
+    follows_and_precedes_testing::test_follows<int, tbb::flow::sequencer_node<int>>(
+            messages_for_follows, [](const int &i) -> std::size_t { return i; });
 
-    follows_and_precedes_testing::test_precedes
-        <int, tbb::flow::sequencer_node<int>>
-        (messages_for_precedes, [](const int& i) -> std::size_t { return i; });
+    follows_and_precedes_testing::test_precedes<int, tbb::flow::sequencer_node<int>>(
+            messages_for_precedes, [](const int &i) -> std::size_t { return i; });
 }
 #endif
 
@@ -429,11 +418,11 @@ void test_deduction_guides_common(Body body) {
     static_assert(std::is_same_v<decltype(s3), sequencer_node<int>>);
 }
 
-std::size_t sequencer_body_f(const int&) { return 1; }
+std::size_t sequencer_body_f(const int &) { return 1; }
 
 void test_deduction_guides() {
-    test_deduction_guides_common([](const int&)->std::size_t { return 1; });
-    test_deduction_guides_common([](const int&) mutable ->std::size_t { return 1; });
+    test_deduction_guides_common([](const int &) -> std::size_t { return 1; });
+    test_deduction_guides_common([](const int &) mutable -> std::size_t { return 1; });
     test_deduction_guides_common(sequencer_body_f);
 }
 #endif
@@ -466,9 +455,8 @@ void test_seq_node_try_put_and_wait() {
     {
         std::vector<int> processed_items;
 
-        std::size_t after_start = test_buffer_push<tbb::flow::sequencer_node<int>>(start_work_items, wait_message,
-                                                                                   new_work_items, processed_items,
-                                                                                   simple_sequencer);
+        std::size_t after_start = test_buffer_push<tbb::flow::sequencer_node<int>>(
+                start_work_items, wait_message, new_work_items, processed_items, simple_sequencer);
 
         // Expected effect:
         // During buffer1.try_put_and_wait()
@@ -501,7 +489,7 @@ void test_seq_node_try_put_and_wait() {
                           "wait_for_all should process new_work_items FIFO");
         }
         CHECK(check_index == processed_items.size());
-    } // Test push
+    }// Test push
 
     // Test pull
     // test_buffer_pull tests the graph
@@ -519,9 +507,8 @@ void test_seq_node_try_put_and_wait() {
         std::vector<int> processed_items;
         int occupier = 42;
 
-        std::size_t after_start = test_buffer_pull<tbb::flow::sequencer_node<int>>(start_work_items, wait_message, occupier,
-                                                                                   new_work_items, processed_items,
-                                                                                   simple_sequencer);
+        std::size_t after_start = test_buffer_pull<tbb::flow::sequencer_node<int>>(
+                start_work_items, wait_message, occupier, new_work_items, processed_items, simple_sequencer);
 
         // Expected effect
         // 0. task for occupier processing would be spawned by the function
@@ -541,12 +528,14 @@ void test_seq_node_try_put_and_wait() {
 
         CHECK_MESSAGE(after_start == start_work_items.size() + 2,
                       "start_work_items, occupier and wait_message should be processed by try_put_and_wait");
-        CHECK_MESSAGE(processed_items[check_index++] == occupier, "Unexpected items processing by try_put_and_wait");
+        CHECK_MESSAGE(processed_items[check_index++] == occupier,
+                      "Unexpected items processing by try_put_and_wait");
         for (auto item : start_work_items) {
             CHECK_MESSAGE(processed_items[check_index++] == item,
                           "try_put_and_wait should process start_work_items FIFO");
         }
-        CHECK_MESSAGE(processed_items[check_index++] == wait_message, "Unexpected items processing by try_put_and_wait");
+        CHECK_MESSAGE(processed_items[check_index++] == wait_message,
+                      "Unexpected items processing by try_put_and_wait");
 
         for (auto item : new_work_items) {
             CHECK_MESSAGE(processed_items[check_index++] == item,
@@ -557,7 +546,7 @@ void test_seq_node_try_put_and_wait() {
 
     // Test reserve
     {
-        int thresholds[] = { 1, 2 };
+        int thresholds[] = {1, 2};
 
         for (int threshold : thresholds) {
             std::vector<int> processed_items;
@@ -567,8 +556,9 @@ void test_seq_node_try_put_and_wait() {
             //  function is a rejecting serial function_node that puts an item to the decrementer port
             //  of the limiter inside of the body
 
-            std::size_t after_start = test_buffer_reserve<tbb::flow::sequencer_node<int>>(threshold,
-                start_work_items, wait_message, new_work_items, processed_items, simple_sequencer);
+            std::size_t after_start = test_buffer_reserve<tbb::flow::sequencer_node<int>>(
+                    threshold, start_work_items, wait_message, new_work_items, processed_items,
+                    simple_sequencer);
 
             // Expected effect:
             // 1. start_work_items would be pushed to the buffer
@@ -583,53 +573,49 @@ void test_seq_node_try_put_and_wait() {
 
             std::size_t check_index = 0;
 
-            CHECK_MESSAGE(after_start == start_work_items.size() + 1,
-                      "start_work_items, occupier and wait_message should be processed by try_put_and_wait");
+            CHECK_MESSAGE(
+                    after_start == start_work_items.size() + 1,
+                    "start_work_items, occupier and wait_message should be processed by try_put_and_wait");
             for (auto item : start_work_items) {
                 CHECK_MESSAGE(processed_items[check_index++] == item,
-                            "try_put_and_wait should process start_work_items FIFO");
+                              "try_put_and_wait should process start_work_items FIFO");
             }
-            CHECK_MESSAGE(processed_items[check_index++] == wait_message, "Unexpected items processing by try_put_and_wait");
+            CHECK_MESSAGE(processed_items[check_index++] == wait_message,
+                          "Unexpected items processing by try_put_and_wait");
 
             for (auto item : new_work_items) {
                 CHECK_MESSAGE(processed_items[check_index++] == item,
-                            "try_put_and_wait should process new_work_items FIFO");
+                              "try_put_and_wait should process new_work_items FIFO");
             }
             CHECK(check_index == processed_items.size());
         }
     }
 }
-#endif // __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+#endif// __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
 
 //! Test sequencer with various request orders and parallelism levels
 //! \brief \ref requirement \ref error_guessing
-TEST_CASE("Serial and parallel test"){
+TEST_CASE("Serial and parallel test") {
     for (int p = 2; p <= 4; ++p) {
         tbb::global_control thread_limit(tbb::global_control::max_allowed_parallelism, p);
         tbb::task_arena arena(p);
-        arena.execute(
-            [&]() {
-                test_serial<int>();
-                test_parallel<int>(p);
-            }
-        );
-	}
+        arena.execute([&]() {
+            test_serial<int>();
+            test_parallel<int>(p);
+        });
+    }
 }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 //! Test decution guides
 //! \brief \ref requirement
-TEST_CASE("Test follows and precedes API"){
-    test_follows_and_precedes_api();
-}
+TEST_CASE("Test follows and precedes API") { test_follows_and_precedes_api(); }
 #endif
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 //! Test decution guides
 //! \brief \ref requirement
-TEST_CASE("Test deduction guides"){
-    test_deduction_guides();
-}
+TEST_CASE("Test deduction guides") { test_deduction_guides(); }
 #endif
 
 #if __TBB_CPP20_CONCEPTS_PRESENT
@@ -640,12 +626,13 @@ TEST_CASE("constraints for sequencer_node object") {
     static_assert(utils::well_formed_instantiation<tbb::flow::sequencer_node, Object>);
     static_assert(utils::well_formed_instantiation<tbb::flow::sequencer_node, int>);
     static_assert(!utils::well_formed_instantiation<tbb::flow::sequencer_node, test_concepts::NonCopyable>);
-    static_assert(!utils::well_formed_instantiation<tbb::flow::sequencer_node, test_concepts::NonCopyAssignable>);
+    static_assert(
+            !utils::well_formed_instantiation<tbb::flow::sequencer_node, test_concepts::NonCopyAssignable>);
 }
 
 template <typename T, typename Sequencer>
-concept can_call_sequencer_node_ctor = requires( tbb::flow::graph& graph, Sequencer seq,
-                                                 tbb::flow::buffer_node<int>& f ) {
+concept can_call_sequencer_node_ctor
+        = requires(tbb::flow::graph &graph, Sequencer seq, tbb::flow::buffer_node<int> &f) {
     tbb::flow::sequencer_node<T>(graph, seq);
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
     tbb::flow::sequencer_node<T>(tbb::flow::follows(f), seq);
@@ -664,11 +651,9 @@ TEST_CASE("constraints for sequencer_node sequencer") {
     static_assert(!can_call_sequencer_node_ctor<type, WrongInputOperatorRoundBrackets<type>>);
     static_assert(!can_call_sequencer_node_ctor<type, WrongReturnOperatorRoundBrackets<type>>);
 }
-#endif // __TBB_CPP20_CONCEPTS_PRESENT
+#endif// __TBB_CPP20_CONCEPTS_PRESENT
 
 #if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
 //! \brief \ref error_guessing
-TEST_CASE("test sequencer_node try_put_and_wait") {
-    test_seq_node_try_put_and_wait();
-}
+TEST_CASE("test sequencer_node try_put_and_wait") { test_seq_node_try_put_and_wait(); }
 #endif
diff --git a/external/tbb/test/tbb/test_split_node.cpp b/external/tbb/test/tbb/test_split_node.cpp
index 1e03be0d..be47e192 100644
--- a/external/tbb/test/tbb/test_split_node.cpp
+++ b/external/tbb/test/tbb/test_split_node.cpp
@@ -18,18 +18,16 @@
 
 #include "tbb/flow_graph.h"
 
+#include "common/graph_utils.h"
 #include "common/test.h"
 #include "common/utils.h"
 #include "common/utils_assert.h"
-#include "common/graph_utils.h"
-
 
 //! \file test_split_node.cpp
 //! \brief Test for [flow_graph.split_node] specification
 
-
 #if defined(_MSC_VER) && _MSC_VER < 1600
-    #pragma warning (disable : 4503) //disabling the "decorated name length exceeded" warning for VS2008 and earlier
+#pragma warning(disable : 4503)//disabling the "decorated name length exceeded" warning for VS2008 and earlier
 #endif
 
 //
@@ -38,39 +36,39 @@
 
 const int Count = 300;
 const int MaxPorts = 10;
-const int MaxNInputs = 5; // max # of input_nodes to register for each split_node input in parallel test
+const int MaxNInputs = 5;// max # of input_nodes to register for each split_node input in parallel test
 
-std::vector<bool> flags;   // for checking output
+std::vector<bool> flags;// for checking output
 
-template<typename T>
+template <typename T>
 class name_of {
 public:
-    static const char* name() { return  "Unknown"; }
+    static const char *name() { return "Unknown"; }
 };
-template<>
+template <>
 class name_of<int> {
 public:
-    static const char* name() { return  "int"; }
+    static const char *name() { return "int"; }
 };
-template<>
+template <>
 class name_of<float> {
 public:
-    static const char* name() { return  "float"; }
+    static const char *name() { return "float"; }
 };
-template<>
+template <>
 class name_of<double> {
 public:
-    static const char* name() { return  "double"; }
+    static const char *name() { return "double"; }
 };
-template<>
+template <>
 class name_of<long> {
 public:
-    static const char* name() { return  "long"; }
+    static const char *name() { return "long"; }
 };
-template<>
+template <>
 class name_of<short> {
 public:
-    static const char* name() { return  "short"; }
+    static const char *name() { return "short"; }
 };
 
 // T must be arithmetic, and shouldn't wrap around for reasonable sizes of Count (which is now 150, and maxPorts is 10,
@@ -80,35 +78,36 @@ class name_of<short> {
 // to receive.  If there is only one input node, the series order will be maintained; if more than one,
 // this is not guaranteed.
 
-template<int N>
+template <int N>
 struct tuple_helper {
-    template<typename TupleType>
-    static void set_element( TupleType &t, int i) {
-        std::get<N-1>(t) = (typename std::tuple_element<N-1,TupleType>::type)(i * (N+1));
-        tuple_helper<N-1>::set_element(t, i);
+    template <typename TupleType>
+    static void set_element(TupleType &t, int i) {
+        std::get<N - 1>(t) = (typename std::tuple_element<N - 1, TupleType>::type)(i * (N + 1));
+        tuple_helper<N - 1>::set_element(t, i);
     }
 };
 
-template<>
+template <>
 struct tuple_helper<1> {
-    template<typename TupleType>
+    template <typename TupleType>
     static void set_element(TupleType &t, int i) {
-        std::get<0>(t) = (typename std::tuple_element<0,TupleType>::type)(i * 2);
+        std::get<0>(t) = (typename std::tuple_element<0, TupleType>::type)(i * 2);
     }
 };
 
 // if we start N input_bodys they will all have the addend N, and my_count should be initialized to 0 .. N-1.
 // the output tuples should have all the sequence, but the order will in general vary.
-template<typename TupleType>
+template <typename TupleType>
 class my_input_body {
     typedef TupleType TT;
     static const int N = std::tuple_size<TT>::value;
     int my_count;
     int addend;
+
 public:
-    my_input_body(int init_val, int addto) : my_count(init_val), addend(addto) { }
-    TT operator()( tbb::flow_control &fc) {
-        if(my_count >= Count){
+    my_input_body(int init_val, int addto) : my_count(init_val), addend(addto) {}
+    TT operator()(tbb::flow_control &fc) {
+        if (my_count >= Count) {
             fc.stop();
             return TT();
         }
@@ -121,10 +120,10 @@ class my_input_body {
 
 // allocator for split_node.
 
-template<int N, typename SType>
+template <int N, typename SType>
 class makeSplit {
 public:
-    static SType *create(tbb::flow::graph& g) {
+    static SType *create(tbb::flow::graph &g) {
         SType *temp = new SType(g);
         return temp;
     }
@@ -133,90 +132,86 @@ class makeSplit {
 
 // holder for sink_node pointers for eventual deletion
 
-static void* all_sink_nodes[MaxPorts];
-
+static void *all_sink_nodes[MaxPorts];
 
-template<int ELEM, typename SType>
+template <int ELEM, typename SType>
 class sink_node_helper {
 public:
     typedef typename SType::input_type TT;
-    typedef typename std::tuple_element<ELEM-1,TT>::type IT;
+    typedef typename std::tuple_element<ELEM - 1, TT>::type IT;
     typedef typename tbb::flow::queue_node<IT> my_sink_node_type;
     static void print_parallel_remark() {
-        sink_node_helper<ELEM-1,SType>::print_parallel_remark();
+        sink_node_helper<ELEM - 1, SType>::print_parallel_remark();
         INFO(", " << name_of<IT>::name());
     }
     static void print_serial_remark() {
-        sink_node_helper<ELEM-1,SType>::print_serial_remark();
+        sink_node_helper<ELEM - 1, SType>::print_serial_remark();
         INFO(", " << name_of<IT>::name());
     }
     static void add_sink_nodes(SType &my_split, tbb::flow::graph &g) {
         my_sink_node_type *new_node = new my_sink_node_type(g);
-        tbb::flow::make_edge( tbb::flow::output_port<ELEM-1>(my_split) , *new_node);
-        all_sink_nodes[ELEM-1] = (void *)new_node;
-        sink_node_helper<ELEM-1, SType>::add_sink_nodes(my_split, g);
+        tbb::flow::make_edge(tbb::flow::output_port<ELEM - 1>(my_split), *new_node);
+        all_sink_nodes[ELEM - 1] = (void *) new_node;
+        sink_node_helper<ELEM - 1, SType>::add_sink_nodes(my_split, g);
     }
 
     static void check_sink_values() {
-        my_sink_node_type *dp = reinterpret_cast<my_sink_node_type *>(all_sink_nodes[ELEM-1]);
-        for(int i = 0; i < Count; ++i) {
-            IT v{};
+        my_sink_node_type *dp = reinterpret_cast<my_sink_node_type *>(all_sink_nodes[ELEM - 1]);
+        for (int i = 0; i < Count; ++i) {
+            IT v {};
             CHECK_MESSAGE(dp->try_get(v), "");
-            flags[((int)v) / (ELEM+1)] = true;
+            flags[((int) v) / (ELEM + 1)] = true;
         }
-        for(int i = 0; i < Count; ++i) {
+        for (int i = 0; i < Count; ++i) {
             CHECK_MESSAGE(flags[i], "");
-            flags[i] = false;  // reset for next test
+            flags[i] = false;// reset for next test
         }
-        sink_node_helper<ELEM-1,SType>::check_sink_values();
+        sink_node_helper<ELEM - 1, SType>::check_sink_values();
     }
-    static void remove_sink_nodes(SType& my_split) {
-        my_sink_node_type *dp = reinterpret_cast<my_sink_node_type *>(all_sink_nodes[ELEM-1]);
-        tbb::flow::remove_edge( tbb::flow::output_port<ELEM-1>(my_split) , *dp);
+    static void remove_sink_nodes(SType &my_split) {
+        my_sink_node_type *dp = reinterpret_cast<my_sink_node_type *>(all_sink_nodes[ELEM - 1]);
+        tbb::flow::remove_edge(tbb::flow::output_port<ELEM - 1>(my_split), *dp);
         delete dp;
-        sink_node_helper<ELEM-1, SType>::remove_sink_nodes(my_split);
+        sink_node_helper<ELEM - 1, SType>::remove_sink_nodes(my_split);
     }
 };
 
-template<typename SType>
+template <typename SType>
 class sink_node_helper<1, SType> {
     typedef typename SType::input_type TT;
-    typedef typename std::tuple_element<0,TT>::type IT;
+    typedef typename std::tuple_element<0, TT>::type IT;
     typedef typename tbb::flow::queue_node<IT> my_sink_node_type;
+
 public:
-    static void print_parallel_remark() {
-        INFO("Parallel test of split_node< " << name_of<IT>::name());
-    }
-    static void print_serial_remark() {
-        INFO("Serial test of split_node< " << name_of<IT>::name());
-    }
+    static void print_parallel_remark() { INFO("Parallel test of split_node< " << name_of<IT>::name()); }
+    static void print_serial_remark() { INFO("Serial test of split_node< " << name_of<IT>::name()); }
     static void add_sink_nodes(SType &my_split, tbb::flow::graph &g) {
         my_sink_node_type *new_node = new my_sink_node_type(g);
-        tbb::flow::make_edge( tbb::flow::output_port<0>(my_split) , *new_node);
-        all_sink_nodes[0] = (void *)new_node;
+        tbb::flow::make_edge(tbb::flow::output_port<0>(my_split), *new_node);
+        all_sink_nodes[0] = (void *) new_node;
     }
     static void check_sink_values() {
         my_sink_node_type *dp = reinterpret_cast<my_sink_node_type *>(all_sink_nodes[0]);
-        for(int i = 0; i < Count; ++i) {
-            IT v{};
+        for (int i = 0; i < Count; ++i) {
+            IT v {};
             CHECK_MESSAGE(dp->try_get(v), "");
-            flags[((int)v) / 2] = true;
+            flags[((int) v) / 2] = true;
         }
-        for(int i = 0; i < Count; ++i) {
+        for (int i = 0; i < Count; ++i) {
             CHECK_MESSAGE(flags[i], "");
-            flags[i] = false;  // reset for next test
+            flags[i] = false;// reset for next test
         }
     }
-    static void remove_sink_nodes(SType& my_split) {
+    static void remove_sink_nodes(SType &my_split) {
         my_sink_node_type *dp = reinterpret_cast<my_sink_node_type *>(all_sink_nodes[0]);
-        tbb::flow::remove_edge( tbb::flow::output_port<0>(my_split) , *dp);
+        tbb::flow::remove_edge(tbb::flow::output_port<0>(my_split), *dp);
         delete dp;
     }
 };
 
 // parallel_test: create input_nodes that feed tuples into the split node
 //    and queue_nodes that receive the output.
-template<typename SType>
+template <typename SType>
 class parallel_test {
 public:
     typedef typename SType::input_type TType;
@@ -224,25 +219,23 @@ class parallel_test {
     static const int N = std::tuple_size<TType>::value;
 
     static void test() {
-        input_type* all_input_nodes[MaxNInputs];
-        sink_node_helper<N,SType>::print_parallel_remark();
+        input_type *all_input_nodes[MaxNInputs];
+        sink_node_helper<N, SType>::print_parallel_remark();
         INFO(" >\n");
-        for(int i=0; i < MaxPorts; ++i) {
-            all_sink_nodes[i] = nullptr;
-        }
+        for (int i = 0; i < MaxPorts; ++i) { all_sink_nodes[i] = nullptr; }
         // try test for # inputs 1 .. MaxNInputs
-        for(int nInputs = 1; nInputs <= MaxNInputs; ++nInputs) {
+        for (int nInputs = 1; nInputs <= MaxNInputs; ++nInputs) {
             tbb::flow::graph g;
-            SType* my_split = makeSplit<N,SType>::create(g);
+            SType *my_split = makeSplit<N, SType>::create(g);
 
             // add sinks first so when inputs start spitting out values they are there to catch them
             sink_node_helper<N, SType>::add_sink_nodes((*my_split), g);
 
             // now create nInputs input_nodes, each spitting out i, i+nInputs, i+2*nInputs ...
             // each element of the tuple is i*(n+1), where n is the tuple element index (1-N)
-            for(int i = 0; i < nInputs; ++i) {
+            for (int i = 0; i < nInputs; ++i) {
                 // create input node
-                input_type *s = new input_type(g, my_input_body<TType>(i, nInputs) );
+                input_type *s = new input_type(g, my_input_body<TType>(i, nInputs));
                 tbb::flow::make_edge(*s, *my_split);
                 all_input_nodes[i] = s;
                 s->activate();
@@ -255,10 +248,8 @@ class parallel_test {
             sink_node_helper<N, SType>::check_sink_values();
 
             sink_node_helper<N, SType>::remove_sink_nodes(*my_split);
-            for(int i = 0; i < nInputs; ++i) {
-                delete all_input_nodes[i];
-            }
-            makeSplit<N,SType>::destroy(my_split);
+            for (int i = 0; i < nInputs; ++i) { delete all_input_nodes[i]; }
+            makeSplit<N, SType>::destroy(my_split);
         }
     }
 };
@@ -266,19 +257,19 @@ class parallel_test {
 //
 // Single predecessor, single accepting successor at each port
 
-template<typename SType>
-void test_one_serial( SType &my_split, tbb::flow::graph &g) {
+template <typename SType>
+void test_one_serial(SType &my_split, tbb::flow::graph &g) {
     typedef typename SType::input_type TType;
     static const int TUPLE_SIZE = std::tuple_size<TType>::value;
-    sink_node_helper<TUPLE_SIZE, SType>::add_sink_nodes(my_split,g);
+    sink_node_helper<TUPLE_SIZE, SType>::add_sink_nodes(my_split, g);
     typedef TType q3_input_type;
-    tbb::flow::queue_node< q3_input_type >  q3(g);
+    tbb::flow::queue_node<q3_input_type> q3(g);
 
-    tbb::flow::make_edge( q3, my_split );
+    tbb::flow::make_edge(q3, my_split);
 
     // fill the  queue with its value one-at-a-time
     flags.clear();
-    for (int i = 0; i < Count; ++i ) {
+    for (int i = 0; i < Count; ++i) {
         TType v;
         tuple_helper<TUPLE_SIZE>::set_element(v, i);
         CHECK_MESSAGE(my_split.try_put(v), "");
@@ -287,10 +278,9 @@ void test_one_serial( SType &my_split, tbb::flow::graph &g) {
 
     g.wait_for_all();
 
-    sink_node_helper<TUPLE_SIZE,SType>::check_sink_values();
+    sink_node_helper<TUPLE_SIZE, SType>::check_sink_values();
 
     sink_node_helper<TUPLE_SIZE, SType>::remove_sink_nodes(my_split);
-
 }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
@@ -300,16 +290,25 @@ void test_follows_and_precedes_api() {
 
     graph g;
 
-    function_node<msg_t, msg_t> f1(g, unlimited, [](msg_t msg) { return msg; } );
+    function_node<msg_t, msg_t> f1(g, unlimited, [](msg_t msg) { return msg; });
     auto f2(f1);
     auto f3(f1);
 
     std::atomic<int> body_calls;
     body_calls = 0;
 
-    function_node<int, int> f4(g, unlimited, [&](int val) { ++body_calls; return val; } );
-    function_node<float, float> f5(g, unlimited, [&](float val) { ++body_calls; return val; } );
-    function_node<double, double> f6(g, unlimited, [&](double val) { ++body_calls; return val; } );
+    function_node<int, int> f4(g, unlimited, [&](int val) {
+        ++body_calls;
+        return val;
+    });
+    function_node<float, float> f5(g, unlimited, [&](float val) {
+        ++body_calls;
+        return val;
+    });
+    function_node<double, double> f6(g, unlimited, [&](double val) {
+        ++body_calls;
+        return val;
+    });
 
     split_node<msg_t> following_node(follows(f1, f2, f3));
     make_edge(output_port<0>(following_node), f4);
@@ -329,47 +328,45 @@ void test_follows_and_precedes_api() {
     g.wait_for_all();
 
     // <number of try puts> * <number of splits by a input node> * <number of input nodes>
-    CHECK_MESSAGE( ((body_calls == 3*3*2)), "Not exact edge quantity was made");
+    CHECK_MESSAGE(((body_calls == 3 * 3 * 2)), "Not exact edge quantity was made");
 }
-#endif // __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+#endif// __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 
-template<typename SType>
+template <typename SType>
 class serial_test {
     typedef typename SType::input_type TType;
     static const int TUPLE_SIZE = std::tuple_size<TType>::value;
     static const int ELEMS = 3;
-public:
-static void test() {
-    tbb::flow::graph g;
-    flags.reserve(Count);
-    SType* my_split = makeSplit<TUPLE_SIZE,SType>::create(g);
-    sink_node_helper<TUPLE_SIZE, SType>::print_serial_remark(); INFO(" >\n");
 
-    test_output_ports_return_ref(*my_split);
+public:
+    static void test() {
+        tbb::flow::graph g;
+        flags.reserve(Count);
+        SType *my_split = makeSplit<TUPLE_SIZE, SType>::create(g);
+        sink_node_helper<TUPLE_SIZE, SType>::print_serial_remark();
+        INFO(" >\n");
 
-    test_one_serial<SType>(*my_split, g);
-    // build the vector with copy construction from the used split node.
-    std::vector<SType>split_vector(ELEMS, *my_split);
-    // destroy the tired old split_node in case we're accidentally reusing pieces of it.
-    makeSplit<TUPLE_SIZE,SType>::destroy(my_split);
+        test_output_ports_return_ref(*my_split);
 
+        test_one_serial<SType>(*my_split, g);
+        // build the vector with copy construction from the used split node.
+        std::vector<SType> split_vector(ELEMS, *my_split);
+        // destroy the tired old split_node in case we're accidentally reusing pieces of it.
+        makeSplit<TUPLE_SIZE, SType>::destroy(my_split);
 
-    for(int e = 0; e < ELEMS; ++e) {  // exercise each of the vector elements
-        test_one_serial<SType>(split_vector[e], g);
+        for (int e = 0; e < ELEMS; ++e) {// exercise each of the vector elements
+            test_one_serial<SType>(split_vector[e], g);
+        }
     }
-}
 
-}; // serial_test
+};// serial_test
 
-template<
-      template<typename> class TestType,  // serial_test or parallel_test
-      typename TupleType >                               // type of the input of the split
+template <template <typename> class TestType,// serial_test or parallel_test
+          typename TupleType>                // type of the input of the split
 struct generate_test {
     typedef tbb::flow::split_node<TupleType> split_node_type;
-    static void do_test() {
-        TestType<split_node_type>::test();
-    }
-}; // generate_test
+    static void do_test() { TestType<split_node_type>::test(); }
+};// generate_test
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 
@@ -418,31 +415,25 @@ void test_try_put_and_wait() {
         using tuple_type = std::tuple<int, int>;
         tbb::flow::split_node<tuple_type> split(g);
 
-        tbb::flow::function_node<int, int> function1(g, tbb::flow::unlimited,
-            [&](int input) noexcept {
-                if (input == wait_message) {
-                    for (int item : new_work_items) {
-                        split.try_put(tuple_type{item, item});
-                    }
-                }
-                processed_items1.emplace_back(input);
-                return 0;
-            });
-
-        tbb::flow::function_node<int, int> function2(g, tbb::flow::unlimited,
-            [&](int input) noexcept {
-                processed_items2.emplace_back(input);
-                return 0;
-            });
+        tbb::flow::function_node<int, int> function1(g, tbb::flow::unlimited, [&](int input) noexcept {
+            if (input == wait_message) {
+                for (int item : new_work_items) { split.try_put(tuple_type {item, item}); }
+            }
+            processed_items1.emplace_back(input);
+            return 0;
+        });
+
+        tbb::flow::function_node<int, int> function2(g, tbb::flow::unlimited, [&](int input) noexcept {
+            processed_items2.emplace_back(input);
+            return 0;
+        });
 
         tbb::flow::make_edge(tbb::flow::output_port<0>(split), function1);
         tbb::flow::make_edge(tbb::flow::output_port<1>(split), function2);
 
-        for (int i = 0; i < wait_message; ++i) {
-            split.try_put(tuple_type{i, i});
-        }
+        for (int i = 0; i < wait_message; ++i) { split.try_put(tuple_type {i, i}); }
 
-        split.try_put_and_wait(tuple_type{wait_message, wait_message});
+        split.try_put_and_wait(tuple_type {wait_message, wait_message});
 
         std::size_t check_index1 = 0;
         std::size_t check_index2 = 0;
@@ -458,8 +449,10 @@ void test_try_put_and_wait() {
         CHECK_MESSAGE(processed_items1[check_index1++] == wait_message, "Unexpected items processing");
 
         for (std::size_t i = new_work_items.size(); i != 0; --i) {
-            CHECK_MESSAGE(processed_items1[check_index1++] == new_work_items[i - 1], "Unexpected items processing");
-            CHECK_MESSAGE(processed_items2[check_index2++] == new_work_items[i - 1], "Unexpected items processing");
+            CHECK_MESSAGE(processed_items1[check_index1++] == new_work_items[i - 1],
+                          "Unexpected items processing");
+            CHECK_MESSAGE(processed_items2[check_index2++] == new_work_items[i - 1],
+                          "Unexpected items processing");
         }
 
         CHECK_MESSAGE(processed_items2[check_index2++] == wait_message, "Unexpected items processing");
@@ -467,42 +460,47 @@ void test_try_put_and_wait() {
         g.wait_for_all();
 
         for (std::size_t i = start_work_items.size(); i != 0; --i) {
-            CHECK_MESSAGE(processed_items1[check_index1++] == start_work_items[i - 1], "Unexpected items processing");
-            CHECK_MESSAGE(processed_items2[check_index2++] == start_work_items[i - 1], "Unexpected items processing");
+            CHECK_MESSAGE(processed_items1[check_index1++] == start_work_items[i - 1],
+                          "Unexpected items processing");
+            CHECK_MESSAGE(processed_items2[check_index2++] == start_work_items[i - 1],
+                          "Unexpected items processing");
         }
     });
 }
-#endif // __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
+#endif// __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
 
 //! Test output ports and message passing with different input tuples
 //! \brief \ref requirement \ref error_guessing
-TEST_CASE("Tuple tests"){
+TEST_CASE("Tuple tests") {
     for (int p = 0; p < 2; ++p) {
-        generate_test<serial_test, std::tuple<float, double> >::do_test();
+        generate_test<serial_test, std::tuple<float, double>>::do_test();
 #if MAX_TUPLE_TEST_SIZE >= 4
-        generate_test<serial_test, std::tuple<float, double, int, long> >::do_test();
+        generate_test<serial_test, std::tuple<float, double, int, long>>::do_test();
 #endif
 #if MAX_TUPLE_TEST_SIZE >= 6
-        generate_test<serial_test, std::tuple<double, double, int, long, int, short> >::do_test();
+        generate_test<serial_test, std::tuple<double, double, int, long, int, short>>::do_test();
 #endif
 #if MAX_TUPLE_TEST_SIZE >= 8
-        generate_test<serial_test, std::tuple<float, double, double, double, float, int, float, long> >::do_test();
+        generate_test<serial_test,
+                      std::tuple<float, double, double, double, float, int, float, long>>::do_test();
 #endif
 #if MAX_TUPLE_TEST_SIZE >= 10
-        generate_test<serial_test, std::tuple<float, double, int, double, double, float, long, int, float, long> >::do_test();
+        generate_test<serial_test, std::tuple<float, double, int, double, double, float, long, int, float,
+                                              long>>::do_test();
 #endif
-        generate_test<parallel_test, std::tuple<float, double> >::do_test();
+        generate_test<parallel_test, std::tuple<float, double>>::do_test();
 #if MAX_TUPLE_TEST_SIZE >= 3
-        generate_test<parallel_test, std::tuple<float, int, long> >::do_test();
+        generate_test<parallel_test, std::tuple<float, int, long>>::do_test();
 #endif
 #if MAX_TUPLE_TEST_SIZE >= 5
-        generate_test<parallel_test, std::tuple<double, double, int, int, short> >::do_test();
+        generate_test<parallel_test, std::tuple<double, double, int, int, short>>::do_test();
 #endif
 #if MAX_TUPLE_TEST_SIZE >= 7
-        generate_test<parallel_test, std::tuple<float, int, double, float, long, float, long> >::do_test();
+        generate_test<parallel_test, std::tuple<float, int, double, float, long, float, long>>::do_test();
 #endif
 #if MAX_TUPLE_TEST_SIZE >= 9
-        generate_test<parallel_test, std::tuple<float, double, int, double, double, long, int, float, long> >::do_test();
+        generate_test<parallel_test,
+                      std::tuple<float, double, int, double, double, long, int, float, long>>::do_test();
 #endif
     }
 }
@@ -510,22 +508,16 @@ TEST_CASE("Tuple tests"){
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 //! Test decution guides
 //! \brief \ref requirement
-TEST_CASE("Test follows and precedes API"){
-    test_follows_and_precedes_api();
-}
+TEST_CASE("Test follows and precedes API") { test_follows_and_precedes_api(); }
 #endif
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 //! Test decution guides
 //! \brief \ref requirement
-TEST_CASE("Deduction guides"){
-    test_deduction_guides();
-}
+TEST_CASE("Deduction guides") { test_deduction_guides(); }
 #endif
 
 #if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
 //! \brief \ref error_guessing
-TEST_CASE("test split_node try_put_and_wait") {
-    test_try_put_and_wait();
-}
+TEST_CASE("test split_node try_put_and_wait") { test_try_put_and_wait(); }
 #endif
diff --git a/external/tbb/test/tbb/test_tagged_msg.cpp b/external/tbb/test/tbb/test_tagged_msg.cpp
index 520ecda9..9fbc795b 100644
--- a/external/tbb/test/tbb/test_tagged_msg.cpp
+++ b/external/tbb/test/tbb/test_tagged_msg.cpp
@@ -14,26 +14,23 @@
     limitations under the License.
 */
 
-
-#define _VARIADIC_MAX 10   // Visual Studio 2012
+#define _VARIADIC_MAX 10// Visual Studio 2012
 #include "common/config.h"
 
 #include "tbb/flow_graph.h"
 
-#include "common/test.h"
 #include "common/checktype.h"
+#include "common/test.h"
 
-#include <cstdio>
 #include <atomic>
-#include <tuple>
+#include <cstdio>
 #include <stdexcept>
+#include <tuple>
 #include <vector>
 
-
 //! \file test_tagged_msg.cpp
 //! \brief Test for [flow_graph.tagged_msg] specification
 
-
 // given a tuple, return the type of the element that has the maximum alignment requirement.
 // Given a tuple and that type, return the number of elements of the object with the max
 // alignment requirement that is at least as big as the largest object in the tuple.
@@ -50,7 +47,9 @@ typedef CheckType<int> counted_array_type[12];
 typedef std::vector<double> d_vector;
 typedef std::vector<int> i_vector;
 typedef i_vector i_vector_array[2];
-typedef tbb::flow::tagged_msg<size_t, int, char, double, odd_array_type, odder_array, d_vector, CheckType<int>, counted_array_type, i_vector_array> tagged_msg_type;
+typedef tbb::flow::tagged_msg<size_t, int, char, double, odd_array_type, odder_array, d_vector,
+                              CheckType<int>, counted_array_type, i_vector_array>
+        tagged_msg_type;
 
 // test base of tagged_msg
 void TestWrapper() {
@@ -63,23 +62,24 @@ void TestWrapper() {
     // pointer-type creation
     int point_to_me = 23;
     Wrapper<int_ptr> wip(&point_to_me);
-    CHECK_MESSAGE( (*(wip.value()) == 23), "Error in wip value");
+    CHECK_MESSAGE((*(wip.value()) == 23), "Error in wip value");
 
     odd_array_type ww;
-    for(int ii = 0; ii < 15; ++ii) { ww[ii] = char('0' + ii); } ww[14] = 0;
+    for (int ii = 0; ii < 15; ++ii) { ww[ii] = char('0' + ii); }
+    ww[14] = 0;
 
     Wrapper<odd_array_type> ci(ww);
-    CHECK_MESSAGE( (!strncmp(ci.value(), ww, 14)), "odd_array_type ci not properly-constructed" );
+    CHECK_MESSAGE((!strncmp(ci.value(), ww, 14)), "odd_array_type ci not properly-constructed");
 
     Wrapper<odd_array_type> ci2(ci);
 
-    CHECK_MESSAGE( (!strncmp(ci2.value(), ww, 14)), "odd_array_type ci2 not properly-constructed" );
+    CHECK_MESSAGE((!strncmp(ci2.value(), ww, 14)), "odd_array_type ci2 not properly-constructed");
 
     d_vector di;
     di.clear();
     di.push_back(2.0);
     Wrapper<d_vector> dvec(di);
-    CHECK_MESSAGE( (dvec.value()[0] == 2.0), "incorrect value in vector");
+    CHECK_MESSAGE((dvec.value()[0] == 2.0), "incorrect value in vector");
 
     // test array of non-PODs.
     i_vector_array oia;
@@ -88,184 +88,173 @@ void TestWrapper() {
     oia[0].push_back(3);
     oia[1].push_back(2);
     Wrapper<i_vector_array> ia(oia);
-    CHECK_MESSAGE( ((ia.value()[1])[0] == 2), "integer vector array element[1] misbehaved");
-    CHECK_MESSAGE( ((ia.value()[0])[0] == 3), "integer vector array element[0] misbehaved");
+    CHECK_MESSAGE(((ia.value()[1])[0] == 2), "integer vector array element[1] misbehaved");
+    CHECK_MESSAGE(((ia.value()[0])[0] == 3), "integer vector array element[0] misbehaved");
     Wrapper<i_vector_array> iac(ia);
-    CHECK_MESSAGE( ((iac.value()[1])[0] == 2), "integer vector array element[1] misbehaved");
-    CHECK_MESSAGE( ((iac.value()[0])[0] == 3), "integer vector array element[0] misbehaved");
+    CHECK_MESSAGE(((iac.value()[1])[0] == 2), "integer vector array element[1] misbehaved");
+    CHECK_MESSAGE(((iac.value()[0])[0] == 3), "integer vector array element[0] misbehaved");
 
     // counted_array
     counted_array_type cat_orig;
-    for(int i = 0; i < 12; ++i) cat_orig[i] = i + 1;
+    for (int i = 0; i < 12; ++i) cat_orig[i] = i + 1;
     Wrapper<counted_array_type> cat(cat_orig);
-    for(int j = 0; j < 12; ++j)
-        CHECK_MESSAGE( (1 + j == cat.value()[j]), "Error in cat array");
+    for (int j = 0; j < 12; ++j) CHECK_MESSAGE((1 + j == cat.value()[j]), "Error in cat array");
 
     int i = wi.value();
-    CHECK_MESSAGE( (i == 42), "Assignment to i failed");
-    CHECK_MESSAGE( (wi.value() == 42), "Assignment to wi failed");
+    CHECK_MESSAGE((i == 42), "Assignment to i failed");
+    CHECK_MESSAGE((wi.value() == 42), "Assignment to wi failed");
     double d = wi.value();
-    CHECK_MESSAGE( (d == 42), "Implicit cast in assign to double failed");
+    CHECK_MESSAGE((d == 42), "Implicit cast in assign to double failed");
     int_ptr ip = wip.value();
-    CHECK_MESSAGE( (ip == &(point_to_me)), "Error in assignment of pointer");
+    CHECK_MESSAGE((ip == &(point_to_me)), "Error in assignment of pointer");
 }
 
 void RunTests() {
     tagged_msg_type def;
-    tagged_msg_type i(1,3);
+    tagged_msg_type i(1, 3);
     CheckType<int>::check_type_counter = 0;
     int z;
-    #if TBB_USE_EXCEPTIONS
+#if TBB_USE_EXCEPTIONS
     try {
-        z = cast_to<int>(def); // disallowed (non-array returning int)
-        CHECK_MESSAGE( (false), "should not allow cast to int of non-array");
-    }
-    catch(...) {
-        INFO("cast of non-array to int disallowed (okay)\n");
-    }
-    #endif
+        z = cast_to<int>(def);// disallowed (non-array returning int)
+        CHECK_MESSAGE((false), "should not allow cast to int of non-array");
+    } catch (...) { INFO("cast of non-array to int disallowed (okay)\n"); }
+#endif
     z = cast_to<int>(i);
-    CHECK_MESSAGE( (is_a<int>(i)), "wrong type for i ( == int)");
-    CHECK_MESSAGE( (!(is_a<double>(i))), "Wrong type for i ( != double)");
+    CHECK_MESSAGE((is_a<int>(i)), "wrong type for i ( == int)");
+    CHECK_MESSAGE((!(is_a<double>(i))), "Wrong type for i ( != double)");
     z = 5;
     z = cast_to<int>(i);
 
     const int &ref_i(cast_to<int>(i));
-    CHECK_MESSAGE( (ref_i == 3), "ref_i got wrong value");
-    tagged_msg_type j(2,4);
+    CHECK_MESSAGE((ref_i == 3), "ref_i got wrong value");
+    tagged_msg_type j(2, 4);
     i = j;
-    CHECK_MESSAGE( (ref_i == 4), "assign to i did not affect ref_i");
+    CHECK_MESSAGE((ref_i == 4), "assign to i did not affect ref_i");
 
-    CHECK_MESSAGE( ( z == 3), "Error retrieving value from i");
+    CHECK_MESSAGE((z == 3), "Error retrieving value from i");
 
     //updating and retrieving tags
-    CHECK_MESSAGE( (j.tag() == 2), "Error retrieving tag for j");
+    CHECK_MESSAGE((j.tag() == 2), "Error retrieving tag for j");
     j.set_tag(10);
-    CHECK_MESSAGE( (j.tag() == 10), "Error updating tag for j");
+    CHECK_MESSAGE((j.tag() == 10), "Error updating tag for j");
 
     tbb::flow::tagged_msg<char, int, char, double> k('a', 4);
     k.set_tag('b');
-    CHECK_MESSAGE( (k.tag() == 'b'), "Error updating char tag");
+    CHECK_MESSAGE((k.tag() == 'b'), "Error updating char tag");
 
     tagged_msg_type double_tagged_msg(3, 8.0);
-    CHECK_MESSAGE( (is_a<double>(double_tagged_msg)), "Wrong type for double_tagged_msg (== double)");
-    CHECK_MESSAGE( (!is_a<char>(double_tagged_msg)), "Wrong type for double_tagged_msg (!= char)");
-    CHECK_MESSAGE( (!is_a<int>(double_tagged_msg)), "Wrong type for double_tagged_msg (!= int)");
+    CHECK_MESSAGE((is_a<double>(double_tagged_msg)), "Wrong type for double_tagged_msg (== double)");
+    CHECK_MESSAGE((!is_a<char>(double_tagged_msg)), "Wrong type for double_tagged_msg (!= char)");
+    CHECK_MESSAGE((!is_a<int>(double_tagged_msg)), "Wrong type for double_tagged_msg (!= int)");
     tagged_msg_type copytype(double_tagged_msg);
-    CHECK_MESSAGE( (is_a<double>(copytype)), "Wrong type for double_tagged_msg (== double)");
-    CHECK_MESSAGE( (!is_a<char>(copytype)), "Wrong type for double_tagged_msg (!= char)");
-    CHECK_MESSAGE( (!is_a<int>(copytype)), "Wrong type for double_tagged_msg (!= int)");
+    CHECK_MESSAGE((is_a<double>(copytype)), "Wrong type for double_tagged_msg (== double)");
+    CHECK_MESSAGE((!is_a<char>(copytype)), "Wrong type for double_tagged_msg (!= char)");
+    CHECK_MESSAGE((!is_a<int>(copytype)), "Wrong type for double_tagged_msg (!= int)");
     tagged_msg_type default_tagged_msg;
-    CHECK_MESSAGE( (!(is_a<double>(default_tagged_msg))), "wrong type for default ( != double)");
-    CHECK_MESSAGE( (!(is_a<int>(default_tagged_msg))), "wrong type for default ( != int)");
-    CHECK_MESSAGE( (!(is_a<bool>(default_tagged_msg))), "wrong type for default ( != bool)");
+    CHECK_MESSAGE((!(is_a<double>(default_tagged_msg))), "wrong type for default ( != double)");
+    CHECK_MESSAGE((!(is_a<int>(default_tagged_msg))), "wrong type for default ( != int)");
+    CHECK_MESSAGE((!(is_a<bool>(default_tagged_msg))), "wrong type for default ( != bool)");
     CheckType<int> c;
-    CHECK_MESSAGE( (CheckType<int>::check_type_counter == 1), "Incorrect number of CheckType<int>s created");
+    CHECK_MESSAGE((CheckType<int>::check_type_counter == 1), "Incorrect number of CheckType<int>s created");
     tagged_msg_type cnt_type(4, c);
-    CHECK_MESSAGE( (CheckType<int>::check_type_counter == 2), "Incorrect number of CheckType<int>s created");
-    CHECK_MESSAGE( (is_a<CheckType<int> >(cnt_type)), "Incorrect type for cnt_type");
+    CHECK_MESSAGE((CheckType<int>::check_type_counter == 2), "Incorrect number of CheckType<int>s created");
+    CHECK_MESSAGE((is_a<CheckType<int>>(cnt_type)), "Incorrect type for cnt_type");
     cnt_type = default_tagged_msg;
-    CHECK_MESSAGE( (CheckType<int>::check_type_counter == 1), "Incorrect number of CheckType<int>s after reassignment");
-    CHECK_MESSAGE( (cnt_type.is_default_constructed()), "Assigned CheckType<int>s is not default-constructed");
+    CHECK_MESSAGE((CheckType<int>::check_type_counter == 1),
+                  "Incorrect number of CheckType<int>s after reassignment");
+    CHECK_MESSAGE((cnt_type.is_default_constructed()), "Assigned CheckType<int>s is not default-constructed");
     // having problem with init on gcc 3.4.6 (fxeolin16)  constructor for elements of array not called
     // for this version.
     // counted_array_type counted_array;
-    CheckType<int> counted_array[12];  // this is okay
-    CHECK_MESSAGE( (CheckType<int>::check_type_counter == 13), "Incorrect number of CheckType<int>s after counted_array construction");
+    CheckType<int> counted_array[12];// this is okay
+    CHECK_MESSAGE((CheckType<int>::check_type_counter == 13),
+                  "Incorrect number of CheckType<int>s after counted_array construction");
     tagged_msg_type counted_array_tagged_msg(5, counted_array);
     // the is_a<>() should return exact type matches.
-    CHECK_MESSAGE( (!is_a<CheckType<int> *>(counted_array_tagged_msg)), "Test of is_a for counted_array_tagged_msg fails");
-    #if TBB_USE_EXCEPTIONS
+    CHECK_MESSAGE((!is_a<CheckType<int> *>(counted_array_tagged_msg)),
+                  "Test of is_a for counted_array_tagged_msg fails");
+#if TBB_USE_EXCEPTIONS
     try {
         int *iip = cast_to<int *>(counted_array_tagged_msg);
-        CHECK_MESSAGE( (false), "did not throw on invalid cast");
-        *iip = 2;  // avoids "iip set but not used" warning
-    }
-    catch(std::runtime_error &re) {
-        INFO("attempt to cast to invalid type caught " << re.what() << "\n");
-    }
-    CHECK_MESSAGE( (is_a<counted_array_type>(counted_array_tagged_msg)), "testing");
+        CHECK_MESSAGE((false), "did not throw on invalid cast");
+        *iip = 2;// avoids "iip set but not used" warning
+    } catch (std::runtime_error &re) { INFO("attempt to cast to invalid type caught " << re.what() << "\n"); }
+    CHECK_MESSAGE((is_a<counted_array_type>(counted_array_tagged_msg)), "testing");
     const CheckType<int> *ctip = cast_to<counted_array_type>(counted_array_tagged_msg);
 
-    CHECK_MESSAGE( ((int)(*ctip) == 0), "ctip incorrect");
+    CHECK_MESSAGE(((int) (*ctip) == 0), "ctip incorrect");
 
-    CHECK_MESSAGE( (CheckType<int>::check_type_counter == 25), "Incorrect number of CheckType<int>s after counted_array_tagged_msg construction");
+    CHECK_MESSAGE((CheckType<int>::check_type_counter == 25),
+                  "Incorrect number of CheckType<int>s after counted_array_tagged_msg construction");
     counted_array_tagged_msg = default_tagged_msg;
-    CHECK_MESSAGE( (CheckType<int>::check_type_counter == 13), "Incorrect number of CheckType<int>s after counted_array_tagged_msg destruction");
-    CHECK_MESSAGE( (counted_array_tagged_msg.is_default_constructed()), "Assigned counted_array_type is not default-constructed");
+    CHECK_MESSAGE((CheckType<int>::check_type_counter == 13),
+                  "Incorrect number of CheckType<int>s after counted_array_tagged_msg destruction");
+    CHECK_MESSAGE((counted_array_tagged_msg.is_default_constructed()),
+                  "Assigned counted_array_type is not default-constructed");
 
     default_tagged_msg = double_tagged_msg;
     const double my_dval = cast_to<double>(default_tagged_msg);
-    CHECK_MESSAGE( (my_dval == 8.0), "did not retrieve correct value from assigned default_tagged_msg");
+    CHECK_MESSAGE((my_dval == 8.0), "did not retrieve correct value from assigned default_tagged_msg");
 
     {
         odd_array_type my_b;
-        for(size_t ii=0; ii < 14;++ii) {
-            my_b[ii] = (char)('0' + ii);
-        }
+        for (size_t ii = 0; ii < 14; ++ii) { my_b[ii] = (char) ('0' + ii); }
         my_b[14] = 0;
         {
             tagged_msg_type odd_array_tagged_msg(6, my_b);
             const char *my_copy = cast_to<odd_array_type>(odd_array_tagged_msg);
-            CHECK_MESSAGE( (!strncmp(my_b, my_copy, 14)), "copied char array not correct value");
+            CHECK_MESSAGE((!strncmp(my_b, my_copy, 14)), "copied char array not correct value");
             default_tagged_msg = odd_array_tagged_msg;
             try {
                 const char *my_copy2 = cast_to<odd_array_type>(default_tagged_msg);
-                CHECK_MESSAGE( (!strncmp(my_b, my_copy2, 14)), "char array from default tagged_msg assign not correct value");
-            }
-            catch(...) {
-                CHECK_MESSAGE( (false), "Bad cast");
-            }
+                CHECK_MESSAGE((!strncmp(my_b, my_copy2, 14)),
+                              "char array from default tagged_msg assign not correct value");
+            } catch (...) { CHECK_MESSAGE((false), "Bad cast"); }
         }
     }
 
-    CHECK_MESSAGE( (!is_a<double>(i)), "bad type for i");
+    CHECK_MESSAGE((!is_a<double>(i)), "bad type for i");
     try {
         double y = cast_to<double>(i);
         // use '&' to force eval of RHS (fixes "initialized but not referenced" vs2012 warnings)
-        CHECK_MESSAGE( (false & (0 != y)), "Error: cast to type in tuple did not get exception");
-    }
-    catch(std::runtime_error &bc) {
-        CHECK_MESSAGE( (0 == strcmp(bc.what(), "Illegal tagged_msg cast")), "Incorrect std:runtime_error");
-    }
-    catch(...) {
-        CHECK_MESSAGE( (false & cast_to<int>(i)), "Error: improper exception thrown");
-    }
+        CHECK_MESSAGE((false & (0 != y)), "Error: cast to type in tuple did not get exception");
+    } catch (std::runtime_error &bc) {
+        CHECK_MESSAGE((0 == strcmp(bc.what(), "Illegal tagged_msg cast")), "Incorrect std:runtime_error");
+    } catch (...) { CHECK_MESSAGE((false & cast_to<int>(i)), "Error: improper exception thrown"); }
 
     try {
         int *ip = cast_to<int *>(i);
-        CHECK_MESSAGE( (false & (nullptr!=ip)), "Error: non-array cast to pointer type.");
-    }
-    catch(std::runtime_error &bc) {
-        CHECK_MESSAGE( (0 == strcmp(bc.what(), "Illegal tagged_msg cast")), "Incorrect std:runtime_error");
-    }
-    catch(...) {
-        CHECK_MESSAGE( (false), "did not get runtime_error exception in casting non-array to pointer");
+        CHECK_MESSAGE((false & (nullptr != ip)), "Error: non-array cast to pointer type.");
+    } catch (std::runtime_error &bc) {
+        CHECK_MESSAGE((0 == strcmp(bc.what(), "Illegal tagged_msg cast")), "Incorrect std:runtime_error");
+    } catch (...) {
+        CHECK_MESSAGE((false), "did not get runtime_error exception in casting non-array to pointer");
     }
 
     try {
         bool b = cast_to<bool>(i);
-        CHECK_MESSAGE( (false & b), "Error: cast against type did not get exception");
-    }
-    catch(std::runtime_error &bc) {
-        CHECK_MESSAGE( (0 == strcmp(bc.what(), "Illegal tagged_msg cast")), "Incorrect std:runtime_error");
-    }
-    catch(...) {
-        CHECK_MESSAGE( (false), "did not get runtime_error exception casting to disparate types");
+        CHECK_MESSAGE((false & b), "Error: cast against type did not get exception");
+    } catch (std::runtime_error &bc) {
+        CHECK_MESSAGE((0 == strcmp(bc.what(), "Illegal tagged_msg cast")), "Incorrect std:runtime_error");
+    } catch (...) {
+        CHECK_MESSAGE((false), "did not get runtime_error exception casting to disparate types");
     }
-    #endif //TBB_USE_EXCEPTIONS
+#endif//TBB_USE_EXCEPTIONS
 }
 
 //! Test tagged_msg for specific types
 //! \brief \ref error_guessing
 TEST_CASE("Test base of tagged_msg") {
     TestWrapper();
-    CHECK_MESSAGE( (CheckType<int>::check_type_counter == 0), "After TestWrapper return not all CheckType<int>s were destroyed");
+    CHECK_MESSAGE((CheckType<int>::check_type_counter == 0),
+                  "After TestWrapper return not all CheckType<int>s were destroyed");
 }
 
 //! Test tagged_msg functions and exceptional behavior
 //! \brief \ref requirement \ref error_guessing
 TEST_CASE("Test tagged_msg") {
     RunTests();
-    CHECK_MESSAGE( (CheckType<int>::check_type_counter == 0), "After RunTests return not all CheckType<int>s were destroyed");
+    CHECK_MESSAGE((CheckType<int>::check_type_counter == 0),
+                  "After RunTests return not all CheckType<int>s were destroyed");
 }
diff --git a/external/tbb/test/tbb/test_task.cpp b/external/tbb/test/tbb/test_task.cpp
index 6c2060a6..f9784689 100644
--- a/external/tbb/test/tbb/test_task.cpp
+++ b/external/tbb/test/tbb/test_task.cpp
@@ -14,23 +14,23 @@
     limitations under the License.
 */
 
-#include "common/test.h"
-#include "common/utils.h"
+#include "common/cpu_usertime.h"
 #include "common/dummy_body.h"
 #include "common/spin_barrier.h"
+#include "common/test.h"
+#include "common/utils.h"
 #include "common/utils_concurrency_limit.h"
-#include "common/cpu_usertime.h"
 
-#include "tbb/task.h"
-#include "tbb/task_group.h"
-#include "tbb/parallel_for.h"
 #include "tbb/cache_aligned_allocator.h"
-#include "tbb/global_control.h"
 #include "tbb/concurrent_vector.h"
+#include "tbb/global_control.h"
+#include "tbb/parallel_for.h"
+#include "tbb/task.h"
+#include "tbb/task_group.h"
 
 #include <atomic>
-#include <thread>
 #include <deque>
+#include <thread>
 
 //! \file test_task.cpp
 //! \brief Test for [internal] functionality
@@ -40,25 +40,25 @@ struct EmptyBody {
 
 #if _MSC_VER && !defined(__INTEL_COMPILER)
 // unreachable code
-#pragma warning( push )
-#pragma warning( disable: 4702 )
+#pragma warning(push)
+#pragma warning(disable : 4702)
 #endif
 
 template <typename Body = EmptyBody>
 class CountingTask : public tbb::detail::d1::task {
 public:
-    CountingTask( Body body, tbb::detail::d1::wait_context& wait ) : my_body(body), my_wait(wait) {}
+    CountingTask(Body body, tbb::detail::d1::wait_context& wait) : my_body(body), my_wait(wait) {}
 
-    CountingTask( tbb::detail::d1::wait_context& wait ) : my_wait(wait) {}
+    CountingTask(tbb::detail::d1::wait_context& wait) : my_wait(wait) {}
 
-    task* execute( tbb::detail::d1::execution_data& ) override {
+    task* execute(tbb::detail::d1::execution_data&) override {
         ++my_execute_counter;
         my_body();
         my_wait.release();
         return nullptr;
     }
 
-    task* cancel( tbb::detail::d1::execution_data& ) override {
+    task* cancel(tbb::detail::d1::execution_data&) override {
         ++my_cancel_counter;
         my_wait.release();
         return nullptr;
@@ -78,12 +78,11 @@ class CountingTask : public tbb::detail::d1::task {
 
     static std::atomic<std::size_t> my_execute_counter;
     static std::atomic<std::size_t> my_cancel_counter;
-}; // struct CountingTask
-
+};// struct CountingTask
 
 #if _MSC_VER && !defined(__INTEL_COMPILER)
-#pragma warning( pop )
-#endif // warning 4702 is back
+#pragma warning(pop)
+#endif// warning 4702 is back
 
 template <typename Body>
 std::atomic<std::size_t> CountingTask<Body>::my_execute_counter(0);
@@ -92,33 +91,28 @@ template <typename Body>
 std::atomic<std::size_t> CountingTask<Body>::my_cancel_counter(0);
 
 #if TBB_USE_EXCEPTIONS
-void test_cancellation_on_exception( bool reset_ctx ) {
+void test_cancellation_on_exception(bool reset_ctx) {
     tbb::detail::d1::wait_context wait(1);
     tbb::task_group_context test_context;
-    auto throw_body = [] {
-        throw 1;
-    };
+    auto throw_body = [] { throw 1; };
     CountingTask<decltype(throw_body)> task(throw_body, wait);
 
     constexpr std::size_t iter_counter = 1000;
     for (std::size_t i = 0; i < iter_counter; ++i) {
         try {
             tbb::detail::d1::execute_and_wait(task, test_context, wait, test_context);
-        } catch(int ex) {
-            REQUIRE(ex == 1);
-        }
-        if (reset_ctx) {
-            test_context.reset();
-        }
+        } catch (int ex) { REQUIRE(ex == 1); }
+        if (reset_ctx) { test_context.reset(); }
         wait.reserve(1);
     }
     wait.release(1);
 
     REQUIRE_MESSAGE(task.execute_counter() == (reset_ctx ? iter_counter : 1), "Some task was not executed");
-    REQUIRE_MESSAGE(task.cancel_counter() == iter_counter, "Some task was not canceled after the exception occurs");
+    REQUIRE_MESSAGE(task.cancel_counter() == iter_counter,
+                    "Some task was not canceled after the exception occurs");
     task.reset();
 }
-#endif // TBB_USE_EXCEPTIONS
+#endif// TBB_USE_EXCEPTIONS
 
 //! \brief \ref error_guessing
 TEST_CASE("External threads sleep") {
@@ -151,7 +145,8 @@ TEST_CASE("Test that task was executed p times") {
 
     wait.release(1);
 
-    REQUIRE_MESSAGE(CountingTask<>::execute_counter() == iter_counter, "The task was not executed necessary times");
+    REQUIRE_MESSAGE(CountingTask<>::execute_counter() == iter_counter,
+                    "The task was not executed necessary times");
     REQUIRE_MESSAGE(CountingTask<>::cancel_counter() == 0, "Some instance of the task was canceled");
     CountingTask<>::reset();
 }
@@ -159,25 +154,24 @@ TEST_CASE("Test that task was executed p times") {
 #if TBB_USE_EXCEPTIONS
 //! \brief \ref error_guessing
 TEST_CASE("Test cancellation on exception") {
-    test_cancellation_on_exception(/*reset_ctx = */true);
-    test_cancellation_on_exception(/*reset_ctx = */false);
+    test_cancellation_on_exception(/*reset_ctx = */ true);
+    test_cancellation_on_exception(/*reset_ctx = */ false);
 }
-#endif // TBB_USE_EXCEPTIONS
+#endif// TBB_USE_EXCEPTIONS
 
 //! \brief \ref error_guessing
 TEST_CASE("Simple test parallelism usage") {
     std::uint32_t threads_num = static_cast<std::uint32_t>(utils::get_platform_max_threads());
     utils::SpinBarrier barrier(threads_num);
 
-    auto barrier_wait = [&barrier] {
-        barrier.wait();
-    };
+    auto barrier_wait = [&barrier] { barrier.wait(); };
 
     tbb::detail::d1::wait_context wait(threads_num);
     tbb::detail::d1::task_group_context test_context;
     using task_type = CountingTask<decltype(barrier_wait)>;
 
-    std::vector<task_type, tbb::cache_aligned_allocator<task_type>> vector_test_task(threads_num, task_type(barrier_wait, wait));
+    std::vector<task_type, tbb::cache_aligned_allocator<task_type>> vector_test_task(
+            threads_num, task_type(barrier_wait, wait));
 
     constexpr std::size_t iter_counter = 100;
     for (std::size_t i = 0; i < iter_counter; ++i) {
@@ -199,27 +193,23 @@ TEST_CASE("Test parallelism usage with parallel_for") {
     std::uint32_t task_threads_num = static_cast<std::uint32_t>(utils::get_platform_max_threads());
     utils::SpinBarrier barrier(task_threads_num);
 
-    auto barrier_wait = [&barrier] {
-        barrier.wait();
-    };
+    auto barrier_wait = [&barrier] { barrier.wait(); };
 
     std::size_t pfor_iter_count = 10000;
     std::atomic<std::size_t> pfor_counter(0);
 
     auto parallel_for_func = [&pfor_counter, pfor_iter_count] {
         tbb::parallel_for(tbb::blocked_range<std::size_t>(0, pfor_iter_count),
-                          [&pfor_counter] (tbb::blocked_range<std::size_t>& range) {
-                              for (auto it = range.begin(); it != range.end(); ++it) {
-                                  ++pfor_counter;
-                              }
-                           }
-        );
+                          [&pfor_counter](tbb::blocked_range<std::size_t>& range) {
+                              for (auto it = range.begin(); it != range.end(); ++it) { ++pfor_counter; }
+                          });
     };
 
     tbb::detail::d1::wait_context wait(task_threads_num);
     tbb::detail::d1::task_group_context test_context;
     using task_type = CountingTask<decltype(barrier_wait)>;
-    std::vector<task_type, tbb::cache_aligned_allocator<task_type>> vector_test_task(task_threads_num, task_type(barrier_wait, wait));
+    std::vector<task_type, tbb::cache_aligned_allocator<task_type>> vector_test_task(
+            task_threads_num, task_type(barrier_wait, wait));
 
     constexpr std::size_t iter_count = 10;
     constexpr std::size_t pfor_threads_num = 4;
@@ -230,25 +220,23 @@ TEST_CASE("Test parallelism usage with parallel_for") {
             tbb::detail::d1::spawn(vector_test_task[j], test_context);
         }
 
-        for (std::size_t k = 0; k < pfor_threads_num; ++k) {
-            pfor_threads.emplace_back(parallel_for_func);
-        }
+        for (std::size_t k = 0; k < pfor_threads_num; ++k) { pfor_threads.emplace_back(parallel_for_func); }
 
         tbb::detail::d1::wait(wait, test_context);
 
         for (auto& thread : pfor_threads) {
-            if (thread.joinable()) {
-                thread.join();
-            }
+            if (thread.joinable()) { thread.join(); }
         }
 
         wait.reserve(task_threads_num);
     }
     wait.release(task_threads_num);
 
-    REQUIRE_MESSAGE(task_type::execute_counter() == task_threads_num * iter_count, "Some task was not executed");
+    REQUIRE_MESSAGE(task_type::execute_counter() == task_threads_num * iter_count,
+                    "Some task was not executed");
     REQUIRE_MESSAGE(task_type::cancel_counter() == 0, "Some task was canceled");
-    REQUIRE_MESSAGE(pfor_counter == iter_count * pfor_threads_num * pfor_iter_count, "Some parallel_for thread was not finished");
+    REQUIRE_MESSAGE(pfor_counter == iter_count * pfor_threads_num * pfor_iter_count,
+                    "Some parallel_for thread was not finished");
     task_type::reset();
 }
 
@@ -257,16 +245,15 @@ TEST_CASE("Test parallelism usage with spawn tasks in different threads") {
     std::uint32_t threads_num = static_cast<std::uint32_t>(utils::get_platform_max_threads());
     utils::SpinBarrier barrier(threads_num);
 
-    auto barrier_wait = [&barrier] {
-        barrier.wait();
-    };
+    auto barrier_wait = [&barrier] { barrier.wait(); };
 
     tbb::detail::d1::wait_context wait(threads_num);
     tbb::detail::d1::task_group_context test_context;
     using task_type = CountingTask<decltype(barrier_wait)>;
-    std::vector<task_type, tbb::cache_aligned_allocator<task_type>> vector_test_task(threads_num, task_type(barrier_wait, wait));
+    std::vector<task_type, tbb::cache_aligned_allocator<task_type>> vector_test_task(
+            threads_num, task_type(barrier_wait, wait));
 
-    auto thread_func = [&vector_test_task, &test_context] ( std::size_t idx ) {
+    auto thread_func = [&vector_test_task, &test_context](std::size_t idx) {
         tbb::detail::d1::spawn(vector_test_task[idx], test_context);
     };
 
@@ -274,17 +261,14 @@ TEST_CASE("Test parallelism usage with spawn tasks in different threads") {
     for (std::size_t i = 0; i < iter_count; ++i) {
         std::vector<std::thread> threads;
 
-        for (std::size_t k = 0; k < threads_num - 1; ++k) {
-            threads.emplace_back(thread_func, k);
-        }
+        for (std::size_t k = 0; k < threads_num - 1; ++k) { threads.emplace_back(thread_func, k); }
 
         for (auto& thread : threads) {
-            if (thread.joinable()) {
-                thread.join();
-            }
+            if (thread.joinable()) { thread.join(); }
         }
 
-        tbb::detail::d1::execute_and_wait(vector_test_task[threads_num - 1], test_context, wait, test_context);
+        tbb::detail::d1::execute_and_wait(vector_test_task[threads_num - 1], test_context, wait,
+                                          test_context);
         wait.reserve(threads_num);
     }
     wait.release(threads_num);
@@ -302,7 +286,7 @@ class SpawningTaskBody {
 public:
     using task_pool_type = std::vector<SpawningTask, tbb::cache_aligned_allocator<SpawningTask>>;
 
-    SpawningTaskBody( task_pool_type& task_pool, tbb::task_group_context& test_ctx )
+    SpawningTaskBody(task_pool_type& task_pool, tbb::task_group_context& test_ctx)
         : my_task_pool(task_pool), my_test_ctx(test_ctx) {}
 
     void operator()() const {
@@ -310,16 +294,18 @@ class SpawningTaskBody {
         std::size_t start_idx = my_current_task.fetch_add(delta);
 
         if (start_idx < my_task_pool.size()) {
-            for (std::size_t idx = start_idx; idx != std::min(my_task_pool.size(), start_idx + delta); ++idx) {
+            for (std::size_t idx = start_idx; idx != std::min(my_task_pool.size(), start_idx + delta);
+                 ++idx) {
                 tbb::detail::d1::spawn(my_task_pool[idx], my_test_ctx);
             }
         }
     }
+
 private:
     task_pool_type& my_task_pool;
     tbb::task_group_context& my_test_ctx;
     static std::atomic<std::size_t> my_current_task;
-}; // class SpawningTaskBody
+};// class SpawningTaskBody
 
 std::atomic<std::size_t> SpawningTaskBody::my_current_task(0);
 
@@ -332,15 +318,14 @@ TEST_CASE("Actively adding tasks") {
 
     SpawningTaskBody::task_pool_type task_pool;
 
-    SpawningTaskBody task_body{task_pool, test_context};
-    for (std::size_t i = 0; i < task_number; ++i) {
-        task_pool.emplace_back(task_body, wait);
-    }
+    SpawningTaskBody task_body {task_pool, test_context};
+    for (std::size_t i = 0; i < task_number; ++i) { task_pool.emplace_back(task_body, wait); }
 
     SpawningTask first_task(task_body, wait);
     tbb::detail::d1::execute_and_wait(first_task, test_context, wait, test_context);
 
-    REQUIRE_MESSAGE(SpawningTask::execute_counter() == task_number + 1, "Some tasks were not executed"); // Is it right?
+    REQUIRE_MESSAGE(SpawningTask::execute_counter() == task_number + 1,
+                    "Some tasks were not executed");// Is it right?
     REQUIRE_MESSAGE(SpawningTask::cancel_counter() == 0, "Some tasks were canceled");
 }
 
@@ -348,20 +333,17 @@ TEST_CASE("Actively adding tasks") {
 struct suspended_task : public tbb::detail::d1::task {
 
     suspended_task(tbb::task::suspend_point tag, tbb::detail::d1::wait_context& wait)
-        : my_suspend_tag(tag), my_wait(wait)
-    {}
+        : my_suspend_tag(tag), my_wait(wait) {}
 
     task* execute(tbb::detail::d1::execution_data&) override {
-        tbb::parallel_for(tbb::blocked_range<std::size_t>(0, 100000),
-            [] (const tbb::blocked_range<std::size_t>& range) {
-                // Make some heavy work
-                std::atomic<int> sum{};
-                for (auto it = range.begin(); it != range.end(); ++it) {
-                    ++sum;
-                }
-            },
-            tbb::static_partitioner{}
-        );
+        tbb::parallel_for(
+                tbb::blocked_range<std::size_t>(0, 100000),
+                [](const tbb::blocked_range<std::size_t>& range) {
+                    // Make some heavy work
+                    std::atomic<int> sum {};
+                    for (auto it = range.begin(); it != range.end(); ++it) { ++sum; }
+                },
+                tbb::static_partitioner {});
 
         my_wait.release();
         tbb::task::resume(my_suspend_tag);
@@ -379,37 +361,36 @@ struct suspended_task : public tbb::detail::d1::task {
 
 //! \brief \ref error_guessing
 TEST_CASE("Isolation + resumable tasks") {
-    std::atomic<int> suspend_flag{};
+    std::atomic<int> suspend_flag {};
     tbb::task_group_context test_context;
 
-    std::atomic<int> suspend_count{};
-    std::atomic<int> resume_count{};
-
-    tbb::parallel_for(tbb::blocked_range<std::size_t>(0, 100000),
-        [&suspend_flag, &test_context, &suspend_count, &resume_count] (const tbb::blocked_range<std::size_t>& range) {
-            int ticket = 0;
-            for (auto it = range.begin(); it != range.end(); ++it) {
-                ticket = suspend_flag++;
-            }
-
-            if (ticket % 5 == 0) {
-                std::vector<suspended_task, tbb::cache_aligned_allocator<suspended_task>> test_task;
-                tbb::detail::d1::wait_context wait(1);
-                ++suspend_count;
-                tbb::this_task_arena::isolate([&wait, &test_context, &test_task] {
-                    auto thread_id = std::this_thread::get_id();
-                    tbb::task::suspend([&wait, &test_context, &test_task, thread_id] (tbb::task::suspend_point tag) {
-                        CHECK(thread_id == std::this_thread::get_id());
-                        test_task.emplace_back(tag, wait);
-                        tbb::detail::d1::spawn(test_task[0], test_context);
+    std::atomic<int> suspend_count {};
+    std::atomic<int> resume_count {};
+
+    tbb::parallel_for(
+            tbb::blocked_range<std::size_t>(0, 100000),
+            [&suspend_flag, &test_context, &suspend_count,
+             &resume_count](const tbb::blocked_range<std::size_t>& range) {
+                int ticket = 0;
+                for (auto it = range.begin(); it != range.end(); ++it) { ticket = suspend_flag++; }
+
+                if (ticket % 5 == 0) {
+                    std::vector<suspended_task, tbb::cache_aligned_allocator<suspended_task>> test_task;
+                    tbb::detail::d1::wait_context wait(1);
+                    ++suspend_count;
+                    tbb::this_task_arena::isolate([&wait, &test_context, &test_task] {
+                        auto thread_id = std::this_thread::get_id();
+                        tbb::task::suspend(
+                                [&wait, &test_context, &test_task, thread_id](tbb::task::suspend_point tag) {
+                                    CHECK(thread_id == std::this_thread::get_id());
+                                    test_task.emplace_back(tag, wait);
+                                    tbb::detail::d1::spawn(test_task[0], test_context);
+                                });
                     });
-                    }
-                );
-                tbb::detail::d1::wait(wait, test_context);
-                ++resume_count;
-            }
-        }
-    );
+                    tbb::detail::d1::wait(wait, test_context);
+                    ++resume_count;
+                }
+            });
 
     CHECK(suspend_count == resume_count);
 }
@@ -417,18 +398,15 @@ TEST_CASE("Isolation + resumable tasks") {
 struct bypass_task : public tbb::detail::d1::task {
     using task_pool_type = std::vector<bypass_task, tbb::cache_aligned_allocator<bypass_task>>;
 
-    bypass_task(tbb::detail::d1::wait_context& wait, task_pool_type& task_pool,
-                std::atomic<int>& resume_flag, tbb::task::suspend_point& suspend_tag)
-        : my_wait(wait), my_task_pool(task_pool), my_resume_flag(resume_flag), my_suspend_tag(suspend_tag)
-    {}
+    bypass_task(tbb::detail::d1::wait_context& wait, task_pool_type& task_pool, std::atomic<int>& resume_flag,
+                tbb::task::suspend_point& suspend_tag)
+        : my_wait(wait), my_task_pool(task_pool), my_resume_flag(resume_flag), my_suspend_tag(suspend_tag) {}
 
     task* execute(tbb::detail::d1::execution_data&) override {
         utils::doDummyWork(10000);
 
         int expected = 1;
-        if (my_resume_flag.compare_exchange_strong(expected, 2)) {
-            tbb::task::resume(my_suspend_tag);
-        }
+        if (my_resume_flag.compare_exchange_strong(expected, 2)) { tbb::task::resume(my_suspend_tag); }
 
         std::size_t ticket = my_current_task++;
         task* next = ticket < my_task_pool.size() ? &my_task_pool[ticket] : nullptr;
@@ -438,9 +416,7 @@ struct bypass_task : public tbb::detail::d1::task {
             // So, wait for the suspend before leaving.
             utils::SpinWaitWhileEq(my_resume_flag, 0);
             expected = 1;
-            if (my_resume_flag.compare_exchange_strong(expected, 2)) {
-                tbb::task::resume(my_suspend_tag);
-            }
+            if (my_resume_flag.compare_exchange_strong(expected, 2)) { tbb::task::resume(my_suspend_tag); }
         }
 
         my_wait.release();
@@ -471,7 +447,7 @@ TEST_CASE("Bypass suspended by resume") {
 
     test_tls = 1;
 
-    std::atomic<int> resume_flag{0};
+    std::atomic<int> resume_flag {0};
     tbb::task::suspend_point test_suspend_tag;
 
     std::vector<bypass_task, tbb::cache_aligned_allocator<bypass_task>> test_task_pool;
@@ -482,14 +458,12 @@ TEST_CASE("Bypass suspended by resume") {
 
     for (std::size_t i = 0; i < utils::get_platform_max_threads(); ++i) {
         std::size_t ticket = bypass_task::my_current_task++;
-        if (ticket < test_task_pool.size()) {
-            tbb::detail::d1::spawn(test_task_pool[ticket], test_context);
-        }
+        if (ticket < test_task_pool.size()) { tbb::detail::d1::spawn(test_task_pool[ticket], test_context); }
     }
 
     auto suspend_func = [&resume_flag, &test_suspend_tag] {
         auto thread_id = std::this_thread::get_id();
-        tbb::task::suspend([&resume_flag, &test_suspend_tag, thread_id] (tbb::task::suspend_point tag) {
+        tbb::task::suspend([&resume_flag, &test_suspend_tag, thread_id](tbb::task::suspend_point tag) {
             CHECK(thread_id == std::this_thread::get_id());
             test_suspend_tag = tag;
             resume_flag = 1;
@@ -508,7 +482,7 @@ TEST_CASE("Critical tasks + resume") {
     std::uint32_t task_number = 500 * static_cast<std::uint32_t>(utils::get_platform_max_threads());
 
     tbb::task_group_context test_context;
-    tbb::detail::d1::wait_context wait{ 0 };
+    tbb::detail::d1::wait_context wait {0};
 
     // The test expects at least one thread in test_arena
     int num_threads_in_test_arena = std::max(2, int(utils::get_platform_max_threads()));
@@ -517,7 +491,7 @@ TEST_CASE("Critical tasks + resume") {
 
     test_arena.initialize();
 
-    std::atomic<bool> resume_flag{}, resumed{};
+    std::atomic<bool> resume_flag {}, resumed {};
     tbb::task::suspend_point test_suspend_tag;
 
     auto task_body = [&resume_flag, &resumed, &test_suspend_tag] {
@@ -533,9 +507,7 @@ TEST_CASE("Critical tasks + resume") {
     using task_type = CountingTask<decltype(task_body)>;
     std::vector<task_type, tbb::cache_aligned_allocator<task_type>> test_tasks;
 
-    for (std::size_t i = 0; i < task_number; ++i) {
-        test_tasks.emplace_back(task_body, wait);
-    }
+    for (std::size_t i = 0; i < task_number; ++i) { test_tasks.emplace_back(task_body, wait); }
 
     wait.reserve(task_number / 2);
     for (std::size_t i = 0; i < task_number / 2; ++i) {
@@ -544,7 +516,7 @@ TEST_CASE("Critical tasks + resume") {
 
     auto suspend_func = [&resume_flag, &test_suspend_tag] {
         auto thread_id = std::this_thread::get_id();
-        tbb::task::suspend([&resume_flag, &test_suspend_tag, thread_id] (tbb::task::suspend_point tag) {
+        tbb::task::suspend([&resume_flag, &test_suspend_tag, thread_id](tbb::task::suspend_point tag) {
             CHECK(thread_id == std::this_thread::get_id());
             test_suspend_tag = tag;
             resume_flag.store(true, std::memory_order_release);
@@ -557,23 +529,22 @@ TEST_CASE("Critical tasks + resume") {
     submit(suspend_task, test_arena, test_context, true);
 
     test_arena.execute([&wait, &test_tasks, &test_arena, &test_context, &resumed, task_number] {
-        tbb::this_task_arena::isolate([&wait, &test_tasks, &test_arena, &test_context, &resumed, task_number] {
-            do {
-                wait.reserve(task_number / 2);
-                tbb::parallel_for(tbb::blocked_range<std::size_t>(task_number / 2, task_number),
-                    [&test_tasks, &test_arena, &test_context] (tbb::blocked_range<std::size_t>& range) {
-                        for (std::size_t i = range.begin(); i != range.end(); ++i) {
-                            submit(test_tasks[i], test_arena, test_context, true);
-                        }
-                    }
-                );
-            } while (!resumed);
-        });
+        tbb::this_task_arena::isolate(
+                [&wait, &test_tasks, &test_arena, &test_context, &resumed, task_number] {
+                    do {
+                        wait.reserve(task_number / 2);
+                        tbb::parallel_for(tbb::blocked_range<std::size_t>(task_number / 2, task_number),
+                                          [&test_tasks, &test_arena,
+                                           &test_context](tbb::blocked_range<std::size_t>& range) {
+                                              for (std::size_t i = range.begin(); i != range.end(); ++i) {
+                                                  submit(test_tasks[i], test_arena, test_context, true);
+                                              }
+                                          });
+                    } while (!resumed);
+                });
     });
 
-    test_arena.execute([&wait, &test_context] {
-        tbb::detail::d1::wait(wait, test_context);
-    });
+    test_arena.execute([&wait, &test_context] { tbb::detail::d1::wait(wait, test_context); });
 }
 
 //! \brief \ref error_guessing
@@ -588,9 +559,8 @@ TEST_CASE("Stress testing") {
     test_arena.initialize();
 
     auto task_body = [] {
-        tbb::parallel_for(tbb::blocked_range<std::size_t>(0, 1000), [] (tbb::blocked_range<std::size_t>&) {
-            utils::doDummyWork(100);
-        });
+        tbb::parallel_for(tbb::blocked_range<std::size_t>(0, 1000),
+                          [](tbb::blocked_range<std::size_t>&) { utils::doDummyWork(100); });
     };
     using task_type = CountingTask<decltype(task_body)>;
 
@@ -598,31 +568,27 @@ TEST_CASE("Stress testing") {
 
     std::vector<task_type, tbb::cache_aligned_allocator<task_type>> test_tasks;
 
-    for (std::size_t j = 0; j < task_number; ++j) {
-        test_tasks.emplace_back(task_body, wait);
-    }
+    for (std::size_t j = 0; j < task_number; ++j) { test_tasks.emplace_back(task_body, wait); }
 
-    test_arena.execute([&test_tasks, &task_body, &wait, &test_context, &test_arena, iter_counter, task_number] {
-        for (std::size_t i = 0; i < iter_counter; ++i) {
+    test_arena.execute(
+            [&test_tasks, &task_body, &wait, &test_context, &test_arena, iter_counter, task_number] {
+                for (std::size_t i = 0; i < iter_counter; ++i) {
 
-            for (std::size_t j = 0; j < task_number; ++j) {
-                test_arena.enqueue(task_body);
-            }
+                    for (std::size_t j = 0; j < task_number; ++j) { test_arena.enqueue(task_body); }
 
-            for (std::size_t j = 0; j < task_number / 2; ++j) {
-                tbb::detail::d1::spawn(test_tasks[j], test_context);
-            }
-
-            for (std::size_t j = task_number / 2; j < task_number; ++j) {
-                submit(test_tasks[j], test_arena, test_context, true);
-            }
+                    for (std::size_t j = 0; j < task_number / 2; ++j) {
+                        tbb::detail::d1::spawn(test_tasks[j], test_context);
+                    }
 
-            tbb::detail::d1::wait(wait, test_context);
-            wait.reserve(task_number);
-        }
-        wait.release(task_number);
-    });
+                    for (std::size_t j = task_number / 2; j < task_number; ++j) {
+                        submit(test_tasks[j], test_arena, test_context, true);
+                    }
 
+                    tbb::detail::d1::wait(wait, test_context);
+                    wait.reserve(task_number);
+                }
+                wait.release(task_number);
+            });
 
     REQUIRE_MESSAGE(task_type::execute_counter() == task_number * iter_counter, "Some task was not executed");
     REQUIRE_MESSAGE(task_type::cancel_counter() == 0, "Some task was canceled");
@@ -639,27 +605,24 @@ TEST_CASE("All workers sleep") {
     auto resumble_task = [&] {
         barrier.wait();
         auto thread_id = std::this_thread::get_id();
-        tbb::task::suspend([&] (tbb::task::suspend_point sp) {
+        tbb::task::suspend([&](tbb::task::suspend_point sp) {
             CHECK(thread_id == std::this_thread::get_id());
             suspend_points.push_back(sp);
             barrier.wait();
         });
     };
 
-    for (std::size_t i = 0; i < thread_number - 1; ++i) {
-        test_gr.run(resumble_task);
-    }
+    for (std::size_t i = 0; i < thread_number - 1; ++i) { test_gr.run(resumble_task); }
 
     barrier.wait();
     barrier.wait();
     TestCPUUserTime(thread_number);
 
-    for (auto sp : suspend_points)
-        tbb::task::resume(sp);
+    for (auto sp : suspend_points) tbb::task::resume(sp);
     test_gr.wait();
 }
 
-#endif // __TBB_RESUMABLE_TASKS
+#endif// __TBB_RESUMABLE_TASKS
 
 //! \brief \ref error_guessing
 TEST_CASE("Enqueue with exception") {
@@ -668,32 +631,26 @@ TEST_CASE("Enqueue with exception") {
     tbb::task_group_context test_context;
     tbb::detail::d1::wait_context wait(task_number);
 
-    tbb::task_arena test_arena{int(std::thread::hardware_concurrency() + 1)};
+    tbb::task_arena test_arena {int(std::thread::hardware_concurrency() + 1)};
 
     test_arena.initialize();
 
-    auto task_body = [] {
-        utils::doDummyWork(100);
-    };
+    auto task_body = [] { utils::doDummyWork(100); };
 
-    std::atomic<bool> end_flag{false};
-    auto check_body = [&end_flag] {
-        end_flag.store(true, std::memory_order_relaxed);
-    };
+    std::atomic<bool> end_flag {false};
+    auto check_body = [&end_flag] { end_flag.store(true, std::memory_order_relaxed); };
 
     using task_type = CountingTask<decltype(task_body)>;
     std::vector<task_type, tbb::cache_aligned_allocator<task_type>> test_tasks;
 
-    for (std::size_t j = 0; j < task_number; ++j) {
-        test_tasks.emplace_back(task_body, wait);
-    }
+    for (std::size_t j = 0; j < task_number; ++j) { test_tasks.emplace_back(task_body, wait); }
 
     {
         tbb::global_control gc(tbb::global_control::max_allowed_parallelism, 1);
         test_arena.enqueue(task_body);
         // Initialize implicit arena
-        tbb::parallel_for(0, 1, [] (int) {});
-        tbb::task_arena test_arena2(tbb::task_arena::attach{});
+        tbb::parallel_for(0, 1, [](int) {});
+        tbb::task_arena test_arena2(tbb::task_arena::attach {});
         test_arena2.enqueue(task_body);
     }
 
@@ -702,7 +659,8 @@ TEST_CASE("Enqueue with exception") {
         tbb::global_control gc(tbb::global_control::max_allowed_parallelism, 1);
         test_arena.enqueue(check_body);
 
-        while (!end_flag.load(std::memory_order_relaxed)) ;
+        while (!end_flag.load(std::memory_order_relaxed))
+            ;
 
         utils::Sleep(1);
         end_flag.store(false, std::memory_order_relaxed);
@@ -718,7 +676,6 @@ TEST_CASE("Enqueue with exception") {
     }
     wait.release(task_number);
 
-
     REQUIRE_MESSAGE(task_type::execute_counter() == task_number * iter_count, "Some task was not executed");
     REQUIRE_MESSAGE(task_type::cancel_counter() == 0, "Some task was canceled");
 }
@@ -726,19 +683,16 @@ TEST_CASE("Enqueue with exception") {
 struct resubmitting_task : public tbb::detail::d1::task {
     tbb::task_arena& my_arena;
     tbb::task_group_context& my_ctx;
-    std::atomic<int> counter{100000};
+    std::atomic<int> counter {100000};
 
-    resubmitting_task(tbb::task_arena& arena, tbb::task_group_context& ctx) : my_arena(arena), my_ctx(ctx)
-    {}
+    resubmitting_task(tbb::task_arena& arena, tbb::task_group_context& ctx) : my_arena(arena), my_ctx(ctx) {}
 
-    tbb::detail::d1::task* execute(tbb::detail::d1::execution_data& ) override {
-        if (counter-- > 0) {
-            submit(*this, my_arena, my_ctx, true);
-        }
+    tbb::detail::d1::task* execute(tbb::detail::d1::execution_data&) override {
+        if (counter-- > 0) { submit(*this, my_arena, my_ctx, true); }
         return nullptr;
     }
 
-    tbb::detail::d1::task* cancel( tbb::detail::d1::execution_data& ) override {
+    tbb::detail::d1::task* cancel(tbb::detail::d1::execution_data&) override {
         FAIL("The function should never be called.");
         return nullptr;
     }
@@ -756,25 +710,23 @@ TEST_CASE("Test with priority inversion") {
     utils::pinning_observer obsr(test_arena);
     CHECK_MESSAGE(obsr.is_observing(), "Arena observer has not been activated");
 
-    std::uint32_t  critical_task_counter = 1000 * thread_number;
-    std::atomic<std::size_t> task_counter{0};
+    std::uint32_t critical_task_counter = 1000 * thread_number;
+    std::atomic<std::size_t> task_counter {0};
 
     tbb::task_group_context test_context;
     tbb::detail::d1::wait_context wait(critical_task_counter);
 
-    auto critical_work = [&] {
-        utils::doDummyWork(10);
-    };
+    auto critical_work = [&] { utils::doDummyWork(10); };
 
     using suspend_task_type = CountingTask<decltype(critical_work)>;
     suspend_task_type critical_task(critical_work, wait);
 
     auto high_priority_thread_func = [&] {
         // Increase external threads priority
-        utils::increased_priority_guard guard{};
+        utils::increased_priority_guard guard {};
         utils::suppress_unused_warning(guard);
         // pin external threads
-        test_arena.execute([]{});
+        test_arena.execute([] {});
         while (task_counter++ < critical_task_counter) {
             submit(critical_task, test_arena, test_context, true);
             std::this_thread::sleep_for(std::chrono::milliseconds(1));
@@ -786,7 +738,7 @@ TEST_CASE("Test with priority inversion") {
     // take first core on execute
     utils::SpinBarrier barrier(thread_number + 1);
     test_arena.execute([&] {
-        tbb::parallel_for(std::uint32_t(0), thread_number + 1, [&] (std::uint32_t) {
+        tbb::parallel_for(std::uint32_t(0), thread_number + 1, [&](std::uint32_t) {
             barrier.wait();
             submit(worker_task, test_arena, test_context, true);
         });
@@ -797,7 +749,7 @@ TEST_CASE("Test with priority inversion") {
         high_priority_threads.emplace_back(high_priority_thread_func);
     }
 
-    utils::increased_priority_guard guard{};
+    utils::increased_priority_guard guard {};
     utils::suppress_unused_warning(guard);
     while (task_counter++ < critical_task_counter) {
         submit(critical_task, test_arena, test_context, true);
@@ -806,16 +758,14 @@ TEST_CASE("Test with priority inversion") {
 
     tbb::detail::d1::wait(wait, test_context);
 
-    for (std::size_t i = 0; i < thread_number - 1; ++i) {
-        high_priority_threads[i].join();
-    }
+    for (std::size_t i = 0; i < thread_number - 1; ++i) { high_priority_threads[i].join(); }
 }
 
 // Explicit test for raii_guard move ctor because of copy elision optimization
 // TODO: consider better test file for the test case
 //! \brief \ref interface
 TEST_CASE("raii_guard move ctor") {
-    int count{0};
+    int count {0};
     auto func = [&count] {
         count++;
         CHECK(count == 1);
@@ -828,16 +778,17 @@ TEST_CASE("raii_guard move ctor") {
 //! \brief \ref error_guessing
 TEST_CASE("Check correct arena destruction with enqueue") {
     for (int i = 0; i < 100; ++i) {
-        tbb::task_scheduler_handle handle{ tbb::attach{} };
+        tbb::task_scheduler_handle handle {tbb::attach {}};
         {
             tbb::task_arena a(2, 0);
 
             a.enqueue([] {
-                tbb::parallel_for(0, 100, [] (int) { std::this_thread::sleep_for(std::chrono::nanoseconds(10)); });
+                tbb::parallel_for(0, 100,
+                                  [](int) { std::this_thread::sleep_for(std::chrono::nanoseconds(10)); });
             });
             std::this_thread::sleep_for(std::chrono::microseconds(1));
         }
-        tbb::finalize(handle, std::nothrow_t{});
+        tbb::finalize(handle, std::nothrow_t {});
     }
 }
 
@@ -847,19 +798,11 @@ TEST_CASE("Try to force Leaked proxy observers warning") {
     tbb::global_control gc(tbb::global_control::max_allowed_parallelism, num_threads);
     tbb::task_arena arena(num_threads, 0);
     std::deque<tbb::task_scheduler_observer> observers;
-    for (int i = 0; i < 1000; ++i) {
-        observers.emplace_back(arena);
-    }
+    for (int i = 0; i < 1000; ++i) { observers.emplace_back(arena); }
 
-    for (auto& observer : observers) {
-        observer.observe(true);
-    }
+    for (auto& observer : observers) { observer.observe(true); }
 
-    arena.enqueue([] {
-        tbb::parallel_for(0, 100000, [] (int) {
-            utils::doDummyWork(1000);
-        });
-    });
+    arena.enqueue([] { tbb::parallel_for(0, 100000, [](int) { utils::doDummyWork(1000); }); });
 }
 
 //! \brief \ref error_guessing
@@ -869,17 +812,20 @@ TEST_CASE("Force thread limit on per-thread reference_vertex") {
 
     // Force thread limit on per-thread reference_vertex
     std::vector<tbb::task_group> groups(num_groups);
-    tbb::parallel_for(0, num_threads, [&] (int) {
-        std::vector<tbb::task_group> local_groups(num_groups);
-        for (int i = 0; i < num_groups; ++i) {
-            groups[i].run([] {});
-            local_groups[i].run([] {});
-            local_groups[i].wait();
-        }
-    }, tbb::static_partitioner{});
+    tbb::parallel_for(
+            0, num_threads,
+            [&](int) {
+                std::vector<tbb::task_group> local_groups(num_groups);
+                for (int i = 0; i < num_groups; ++i) {
+                    groups[i].run([] {});
+                    local_groups[i].run([] {});
+                    local_groups[i].wait();
+                }
+            },
+            tbb::static_partitioner {});
 
     // Enforce extra reference on each task_group
-    std::deque<tbb::task_handle> handles{};
+    std::deque<tbb::task_handle> handles {};
     for (int i = 0; i < num_groups; ++i) {
         handles.emplace_back(groups[i].defer([] {}));
     }
@@ -887,18 +833,14 @@ TEST_CASE("Force thread limit on per-thread reference_vertex") {
     // Check correctness of the execution
     tbb::task_group group;
 
-    std::atomic<int> final_sum{};
+    std::atomic<int> final_sum {};
     for (int i = 0; i < num_groups; ++i) {
         group.run([&] { ++final_sum; });
     }
     group.wait();
     REQUIRE_MESSAGE(final_sum == num_groups, "Some tasks were not executed");
 
-    for (int i = 0; i < num_groups; ++i) {
-        groups[i].run(std::move(handles[i]));
-    }
+    for (int i = 0; i < num_groups; ++i) { groups[i].run(std::move(handles[i])); }
 
-    for (int i = 0; i < num_groups; ++i) {
-        groups[i].wait();
-    }
+    for (int i = 0; i < num_groups; ++i) { groups[i].wait(); }
 }
diff --git a/external/tbb/test/tbb/test_task_arena.cpp b/external/tbb/test/tbb/test_task_arena.cpp
index 6bd93d4c..aa431940 100644
--- a/external/tbb/test/tbb/test_task_arena.cpp
+++ b/external/tbb/test/tbb/test_task_arena.cpp
@@ -21,18 +21,18 @@
 #include "common/cpu_usertime.h"
 #include "common/spin_barrier.h"
 #include "common/utils.h"
-#include "common/utils_report.h"
 #include "common/utils_concurrency_limit.h"
+#include "common/utils_report.h"
 
-#include "tbb/task_arena.h"
-#include "tbb/task_scheduler_observer.h"
+#include "tbb/concurrent_set.h"
 #include "tbb/enumerable_thread_specific.h"
-#include "tbb/parallel_for.h"
 #include "tbb/global_control.h"
-#include "tbb/concurrent_set.h"
+#include "tbb/parallel_for.h"
 #include "tbb/spin_mutex.h"
 #include "tbb/spin_rw_mutex.h"
+#include "tbb/task_arena.h"
 #include "tbb/task_group.h"
+#include "tbb/task_scheduler_observer.h"
 
 #include <atomic>
 #include <condition_variable>
@@ -50,15 +50,15 @@
 //--------------------------------------------------//
 // Test that task_arena::initialize and task_arena::terminate work when doing nothing else.
 /* maxthread is treated as the biggest possible concurrency level. */
-void InitializeAndTerminate( int maxthread ) {
-    for( int i=0; i<200; ++i ) {
-        switch( i&3 ) {
+void InitializeAndTerminate(int maxthread) {
+    for (int i = 0; i < 200; ++i) {
+        switch (i & 3) {
             // Arena is created inactive, initialization is always explicit. Lazy initialization is covered by other test functions.
             // Explicit initialization can either keep the original values or change those.
             // Arena termination can be explicit or implicit (in the destructor).
             // TODO: extend with concurrency level checks if such a method is added.
             default: {
-                tbb::task_arena arena( std::rand() % maxthread + 1 );
+                tbb::task_arena arena(std::rand() % maxthread + 1);
                 CHECK_MESSAGE(!arena.is_active(), "arena should not be active until initialized");
                 arena.initialize();
                 CHECK(arena.is_active());
@@ -67,14 +67,14 @@ void InitializeAndTerminate( int maxthread ) {
                 break;
             }
             case 0: {
-                tbb::task_arena arena( 1 );
+                tbb::task_arena arena(1);
                 CHECK_MESSAGE(!arena.is_active(), "arena should not be active until initialized");
-                arena.initialize( std::rand() % maxthread + 1 ); // change the parameters
+                arena.initialize(std::rand() % maxthread + 1);// change the parameters
                 CHECK(arena.is_active());
                 break;
             }
             case 1: {
-                tbb::task_arena arena( tbb::task_arena::automatic );
+                tbb::task_arena arena(tbb::task_arena::automatic);
                 CHECK(!arena.is_active());
                 arena.initialize();
                 CHECK(arena.is_active());
@@ -83,7 +83,7 @@ void InitializeAndTerminate( int maxthread ) {
             case 2: {
                 tbb::task_arena arena;
                 CHECK_MESSAGE(!arena.is_active(), "arena should not be active until initialized");
-                arena.initialize( std::rand() % maxthread + 1 );
+                arena.initialize(std::rand() % maxthread + 1);
                 CHECK(arena.is_active());
                 arena.terminate();
                 CHECK_MESSAGE(!arena.is_active(), "arena should not be active; it was terminated");
@@ -108,60 +108,58 @@ void ResetTLS() {
 }
 
 class ArenaObserver : public tbb::task_scheduler_observer {
-    int myId;               // unique observer/arena id within a test
-    int myMaxConcurrency;   // concurrency of the associated arena
-    int myNumReservedSlots; // reserved slots in the associated arena
-    void on_scheduler_entry( bool is_worker ) override {
+    int myId;              // unique observer/arena id within a test
+    int myMaxConcurrency;  // concurrency of the associated arena
+    int myNumReservedSlots;// reserved slots in the associated arena
+    void on_scheduler_entry(bool is_worker) override {
         int current_index = tbb::this_task_arena::current_thread_index();
         CHECK(current_index < (myMaxConcurrency > 1 ? myMaxConcurrency : 2));
-        if (is_worker) {
-            CHECK(current_index >= myNumReservedSlots);
-        }
+        if (is_worker) { CHECK(current_index >= myNumReservedSlots); }
         CHECK_MESSAGE(!old_id.local(), "double call to on_scheduler_entry");
         old_id.local() = local_id.local();
         CHECK_MESSAGE(old_id.local() != myId, "double entry to the same arena");
         local_id.local() = myId;
         slot_id.local() = current_index;
     }
-    void on_scheduler_exit( bool /*is_worker*/ ) override {
+    void on_scheduler_exit(bool /*is_worker*/) override {
         CHECK_MESSAGE(local_id.local() == myId, "nesting of arenas is broken");
         CHECK(slot_id.local() == tbb::this_task_arena::current_thread_index());
         slot_id.local() = -2;
         local_id.local() = old_id.local();
         old_id.local() = 0;
     }
+
 public:
-    ArenaObserver(tbb::task_arena &a, int maxConcurrency, int numReservedSlots, int id)
-        : tbb::task_scheduler_observer(a)
-        , myId(id)
-        , myMaxConcurrency(maxConcurrency)
-        , myNumReservedSlots(numReservedSlots) {
+    ArenaObserver(tbb::task_arena& a, int maxConcurrency, int numReservedSlots, int id)
+        : tbb::task_scheduler_observer(a), myId(id), myMaxConcurrency(maxConcurrency),
+          myNumReservedSlots(numReservedSlots) {
         CHECK(myId);
         observe(true);
     }
-    ~ArenaObserver () {
+    ~ArenaObserver() {
         observe(false);
         CHECK_MESSAGE(!old_id.local(), "inconsistent observer state");
     }
 };
 
-struct IndexTrackingBody { // Must be used together with ArenaObserver
-    void operator() ( const Range& ) const {
+struct IndexTrackingBody {// Must be used together with ArenaObserver
+    void operator()(const Range&) const {
         CHECK(slot_id.local() == tbb::this_task_arena::current_thread_index());
         utils::doDummyWork(50000);
     }
 };
 
 struct AsynchronousWork {
-    utils::SpinBarrier &my_barrier;
+    utils::SpinBarrier& my_barrier;
     bool my_is_blocking;
-    AsynchronousWork(utils::SpinBarrier &a_barrier, bool blocking = true)
-    : my_barrier(a_barrier), my_is_blocking(blocking) {}
+    AsynchronousWork(utils::SpinBarrier& a_barrier, bool blocking = true)
+        : my_barrier(a_barrier), my_is_blocking(blocking) {}
     void operator()() const {
         CHECK_MESSAGE(local_id.local() != 0, "not in explicit arena");
-        tbb::parallel_for(Range(0,500), IndexTrackingBody(), tbb::simple_partitioner());
-        if(my_is_blocking) my_barrier.wait(); // must be asynchronous to an external thread
-        else my_barrier.signalNoWait();
+        tbb::parallel_for(Range(0, 500), IndexTrackingBody(), tbb::simple_partitioner());
+        if (my_is_blocking) my_barrier.wait();// must be asynchronous to an external thread
+        else
+            my_barrier.signalNoWait();
     }
 };
 
@@ -174,21 +172,17 @@ void TestConcurrentArenasFunc(int idx) {
     // check that arena observer can be activated before local observer
     struct LocalObserver : public tbb::task_scheduler_observer {
         LocalObserver() : tbb::task_scheduler_observer() { observe(true); }
-        LocalObserver(tbb::task_arena& a) : tbb::task_scheduler_observer(a) {
-            observe(true);
-        }
-        ~LocalObserver() {
-            observe(false);
-        }
+        LocalObserver(tbb::task_arena& a) : tbb::task_scheduler_observer(a) { observe(true); }
+        ~LocalObserver() { observe(false); }
     };
 
     tbb::task_arena a1;
-    a1.initialize(1,0);
-    ArenaObserver o1(a1, 1, 0, idx*2+1); // the last argument is a "unique" observer/arena id for the test
+    a1.initialize(1, 0);
+    ArenaObserver o1(a1, 1, 0, idx * 2 + 1);// the last argument is a "unique" observer/arena id for the test
     CHECK_MESSAGE(o1.is_observing(), "Arena observer has not been activated");
 
-    tbb::task_arena a2(2,1);
-    ArenaObserver o2(a2, 2, 1, idx*2+2);
+    tbb::task_arena a2(2, 1);
+    ArenaObserver o2(a2, 2, 1, idx * 2 + 2);
     CHECK_MESSAGE(o2.is_observing(), "Arena observer has not been activated");
 
     LocalObserver lo1;
@@ -201,15 +195,13 @@ void TestConcurrentArenasFunc(int idx) {
     utils::SpinBarrier barrier(2);
     AsynchronousWork work(barrier);
 
-    a1.enqueue(work); // put async work
+    a1.enqueue(work);// put async work
     barrier.wait();
 
-    a2.enqueue(work); // another work
+    a2.enqueue(work);// another work
     a2.execute(work);
 
-    a3.execute([] {
-        utils::doDummyWork(100);
-    });
+    a3.execute([] { utils::doDummyWork(100); });
 
     a1.debug_wait_until_empty();
     a2.debug_wait_until_empty();
@@ -218,15 +210,16 @@ void TestConcurrentArenasFunc(int idx) {
 void TestConcurrentArenas(int p) {
     // TODO REVAMP fix with global control
     ResetTLS();
-    utils::NativeParallelFor( p, &TestConcurrentArenasFunc );
+    utils::NativeParallelFor(p, &TestConcurrentArenasFunc);
 }
 //--------------------------------------------------//
 // Test multiple application threads working with a single arena at the same time.
 class MultipleMastersPart1 : utils::NoAssign {
-    tbb::task_arena &my_a;
+    tbb::task_arena& my_a;
     utils::SpinBarrier &my_b1, &my_b2;
+
 public:
-    MultipleMastersPart1( tbb::task_arena &a, utils::SpinBarrier &b1, utils::SpinBarrier &b2)
+    MultipleMastersPart1(tbb::task_arena& a, utils::SpinBarrier& b1, utils::SpinBarrier& b2)
         : my_a(a), my_b1(b1), my_b2(b2) {}
     void operator()(int) const {
         my_a.execute(AsynchronousWork(my_b2, /*blocking=*/false));
@@ -237,18 +230,17 @@ class MultipleMastersPart1 : utils::NoAssign {
 };
 
 class MultipleMastersPart2 : utils::NoAssign {
-    tbb::task_arena &my_a;
-    utils::SpinBarrier &my_b;
+    tbb::task_arena& my_a;
+    utils::SpinBarrier& my_b;
+
 public:
-    MultipleMastersPart2( tbb::task_arena &a, utils::SpinBarrier &b) : my_a(a), my_b(b) {}
-    void operator()(int) const {
-        my_a.execute(AsynchronousWork(my_b, /*blocking=*/false));
-    }
+    MultipleMastersPart2(tbb::task_arena& a, utils::SpinBarrier& b) : my_a(a), my_b(b) {}
+    void operator()(int) const { my_a.execute(AsynchronousWork(my_b, /*blocking=*/false)); }
 };
 
 class MultipleMastersPart3 : utils::NoAssign {
-    tbb::task_arena &my_a;
-    utils::SpinBarrier &my_b;
+    tbb::task_arena& my_a;
+    utils::SpinBarrier& my_b;
     using wait_context = tbb::detail::d1::wait_context;
 
     struct Runner : NoAssign {
@@ -270,12 +262,11 @@ class MultipleMastersPart3 : utils::NoAssign {
     };
 
 public:
-    MultipleMastersPart3(tbb::task_arena &a, utils::SpinBarrier &b)
-        : my_a(a), my_b(b) {}
+    MultipleMastersPart3(tbb::task_arena& a, utils::SpinBarrier& b) : my_a(a), my_b(b) {}
     void operator()(int) const {
         wait_context wait(0);
-        my_b.wait(); // increases chances for task_arena initialization contention
-        for( int i=0; i<100; ++i) {
+        my_b.wait();// increases chances for task_arena initialization contention
+        for (int i = 0; i < 100; ++i) {
             wait.reserve();
             my_a.enqueue(Runner(wait));
             my_a.execute(Waiter(wait));
@@ -287,116 +278,117 @@ class MultipleMastersPart3 : utils::NoAssign {
 void TestMultipleMasters(int p) {
     {
         ResetTLS();
-        tbb::task_arena a(1,0);
+        tbb::task_arena a(1, 0);
         a.initialize();
         ArenaObserver o(a, 1, 0, 1);
-        utils::SpinBarrier barrier1(p), barrier2(2*p+1); // each of p threads will submit two tasks signaling the barrier
-        NativeParallelFor( p, MultipleMastersPart1(a, barrier1, barrier2) );
+        utils::SpinBarrier barrier1(p),
+                barrier2(2 * p + 1);// each of p threads will submit two tasks signaling the barrier
+        NativeParallelFor(p, MultipleMastersPart1(a, barrier1, barrier2));
         barrier2.wait();
         a.debug_wait_until_empty();
-    } {
+    }
+    {
         ResetTLS();
-        tbb::task_arena a(2,1);
+        tbb::task_arena a(2, 1);
         ArenaObserver o(a, 2, 1, 2);
-        utils::SpinBarrier barrier(p+2);
-        a.enqueue(AsynchronousWork(barrier, /*blocking=*/true)); // occupy the worker, a regression test for bug 1981
+        utils::SpinBarrier barrier(p + 2);
+        a.enqueue(AsynchronousWork(barrier,
+                                   /*blocking=*/true));// occupy the worker, a regression test for bug 1981
         // TODO: buggy test. A worker threads need time to occupy the slot to prevent an external thread from taking an enqueue task.
         utils::Sleep(10);
-        NativeParallelFor( p, MultipleMastersPart2(a, barrier) );
+        NativeParallelFor(p, MultipleMastersPart2(a, barrier));
         barrier.wait();
         a.debug_wait_until_empty();
-    } {
+    }
+    {
         // Regression test for the bug 1981 part 2 (task_arena::execute() with wait_for_all for an enqueued task)
-        tbb::task_arena a(p,1);
-        utils::SpinBarrier barrier(p+1); // for external threads to avoid endless waiting at least in some runs
+        tbb::task_arena a(p, 1);
+        utils::SpinBarrier barrier(p
+                                   + 1);// for external threads to avoid endless waiting at least in some runs
         // "Oversubscribe" the arena by 1 external thread
-        NativeParallelFor( p+1, MultipleMastersPart3(a, barrier) );
+        NativeParallelFor(p + 1, MultipleMastersPart3(a, barrier));
         a.debug_wait_until_empty();
     }
 }
 
 //--------------------------------------------------//
 // TODO: explain what TestArenaEntryConsistency does
+#include "common/fp_control.h"
+#include "oneapi/tbb/detail/_exception.h"
 #include <sstream>
 #include <stdexcept>
-#include "oneapi/tbb/detail/_exception.h"
-#include "common/fp_control.h"
 
 struct TestArenaEntryBody : FPModeContext {
-    std::atomic<int> &my_stage; // each execute increases it
+    std::atomic<int>& my_stage;// each execute increases it
     std::stringstream my_id;
     bool is_caught, is_expected;
     enum { arenaFPMode = 1 };
 
-    TestArenaEntryBody(std::atomic<int> &s, int idx, int i)  // init thread-specific instance
-    :   FPModeContext(idx+i)
-    ,   my_stage(s)
-    ,   is_caught(false)
+    TestArenaEntryBody(std::atomic<int>& s, int idx, int i)// init thread-specific instance
+        : FPModeContext(idx + i), my_stage(s), is_caught(false)
 #if TBB_USE_EXCEPTIONS
-    ,   is_expected( (idx&(1<<i)) != 0 )
+          ,
+          is_expected((idx & (1 << i)) != 0)
 #else
-    , is_expected(false)
+          ,
+          is_expected(false)
 #endif
     {
         my_id << idx << ':' << i << '@';
     }
-    void operator()() { // inside task_arena::execute()
+    void operator()() {// inside task_arena::execute()
         // synchronize with other stages
         int stage = my_stage++;
         int slot = tbb::this_task_arena::current_thread_index();
         CHECK(slot >= 0);
         CHECK(slot <= 1);
         // wait until the third stage is delegated and then starts on slot 0
-        while(my_stage < 2+slot) utils::yield();
+        while (my_stage < 2 + slot) utils::yield();
         // deduct its entry type and put it into id, it helps to find source of a problem
-        my_id << (stage < 3 ? (tbb::this_task_arena::current_thread_index()?
-                              "delegated_to_worker" : stage < 2? "direct" : "delegated_to_master")
-                            : stage == 3? "nested_same_ctx" : "nested_alien_ctx");
+        my_id << (stage < 3 ? (tbb::this_task_arena::current_thread_index()
+                                       ? "delegated_to_worker"
+                                       : stage < 2 ? "direct" : "delegated_to_master")
+                            : stage == 3 ? "nested_same_ctx" : "nested_alien_ctx");
         AssertFPMode(arenaFPMode);
-        if (is_expected) {
-            TBB_TEST_THROW(std::logic_error(my_id.str()));
-        }
+        if (is_expected) { TBB_TEST_THROW(std::logic_error(my_id.str())); }
         // no code can be put here since exceptions can be thrown
     }
-    void on_exception(const char *e) { // outside arena, in catch block
+    void on_exception(const char* e) {// outside arena, in catch block
         is_caught = true;
         CHECK(my_id.str() == e);
         assertFPMode();
     }
-    void after_execute() { // outside arena and catch block
+    void after_execute() {// outside arena and catch block
         CHECK(is_caught == is_expected);
         assertFPMode();
     }
 };
 
 class ForEachArenaEntryBody : utils::NoAssign {
-    tbb::task_arena &my_a; // expected task_arena(2,1)
-    std::atomic<int> &my_stage; // each execute increases it
+    tbb::task_arena& my_a;     // expected task_arena(2,1)
+    std::atomic<int>& my_stage;// each execute increases it
     int my_idx;
 
 public:
-    ForEachArenaEntryBody(tbb::task_arena &a, std::atomic<int> &c)
-    : my_a(a), my_stage(c), my_idx(0) {}
+    ForEachArenaEntryBody(tbb::task_arena& a, std::atomic<int>& c) : my_a(a), my_stage(c), my_idx(0) {}
 
     void test(int idx) {
         my_idx = idx;
         my_stage = 0;
-        NativeParallelFor(3, *this); // test cross-arena calls
+        NativeParallelFor(3, *this);// test cross-arena calls
         CHECK(my_stage == 3);
-        my_a.execute(*this); // test nested calls
+        my_a.execute(*this);// test nested calls
         CHECK(my_stage == 5);
     }
 
     // task_arena functor for nested tests
     void operator()() const {
-        test_arena_entry(3); // in current task group context
-        tbb::parallel_for(4, 5, *this); // in different context
+        test_arena_entry(3);           // in current task group context
+        tbb::parallel_for(4, 5, *this);// in different context
     }
 
     // NativeParallelFor & parallel_for functor
-    void operator()(int i) const {
-        test_arena_entry(i);
-    }
+    void operator()(int i) const { test_arena_entry(i); }
 
 private:
     void test_arena_entry(int i) const {
@@ -406,9 +398,9 @@ class ForEachArenaEntryBody : utils::NoAssign {
 #if TBB_USE_EXCEPTIONS
         try {
             my_a.execute(scoped_functor);
-        } catch(std::logic_error &e) {
-            scoped_functor.on_exception(e.what());
-        } catch(...) { CHECK_MESSAGE(false, "Unexpected exception type"); }
+        } catch (std::logic_error& e) { scoped_functor.on_exception(e.what()); } catch (...) {
+            CHECK_MESSAGE(false, "Unexpected exception type");
+        }
 #else
         my_a.execute(scoped_functor);
 #endif
@@ -422,87 +414,93 @@ void TestArenaEntryConsistency() {
     ForEachArenaEntryBody body(a, c);
 
     FPModeContext fp_scope(TestArenaEntryBody::arenaFPMode);
-    a.initialize(); // capture FP settings to arena
+    a.initialize();// capture FP settings to arena
     fp_scope.setNextFPMode();
 
-    for (int i = 0; i < 100; i++) // not less than 32 = 2^5 of entry types
+    for (int i = 0; i < 100; i++)// not less than 32 = 2^5 of entry types
         body.test(i);
 }
 //--------------------------------------------------
 // Test that the requested degree of concurrency for task_arena is achieved in various conditions
 class TestArenaConcurrencyBody : utils::NoAssign {
-    tbb::task_arena &my_a;
+    tbb::task_arena& my_a;
     int my_max_concurrency;
     int my_reserved_slots;
-    utils::SpinBarrier *my_barrier;
-    utils::SpinBarrier *my_worker_barrier;
+    utils::SpinBarrier* my_barrier;
+    utils::SpinBarrier* my_worker_barrier;
+
 public:
-    TestArenaConcurrencyBody( tbb::task_arena &a, int max_concurrency, int reserved_slots, utils::SpinBarrier *b = nullptr, utils::SpinBarrier *wb = nullptr )
-    : my_a(a), my_max_concurrency(max_concurrency), my_reserved_slots(reserved_slots), my_barrier(b), my_worker_barrier(wb) {}
+    TestArenaConcurrencyBody(tbb::task_arena& a, int max_concurrency, int reserved_slots,
+                             utils::SpinBarrier* b = nullptr, utils::SpinBarrier* wb = nullptr)
+        : my_a(a), my_max_concurrency(max_concurrency), my_reserved_slots(reserved_slots), my_barrier(b),
+          my_worker_barrier(wb) {}
     // NativeParallelFor's functor
-    void operator()( int ) const {
-        CHECK_MESSAGE( local_id.local() == 0, "TLS was not cleaned?" );
+    void operator()(int) const {
+        CHECK_MESSAGE(local_id.local() == 0, "TLS was not cleaned?");
         local_id.local() = 1;
-        my_a.execute( *this );
+        my_a.execute(*this);
     }
     // Arena's functor
     void operator()() const {
         int idx = tbb::this_task_arena::current_thread_index();
-        REQUIRE( idx < (my_max_concurrency > 1 ? my_max_concurrency : 2) );
-        REQUIRE( my_a.max_concurrency() == tbb::this_task_arena::max_concurrency() );
+        REQUIRE(idx < (my_max_concurrency > 1 ? my_max_concurrency : 2));
+        REQUIRE(my_a.max_concurrency() == tbb::this_task_arena::max_concurrency());
         int max_arena_concurrency = tbb::this_task_arena::max_concurrency();
-        REQUIRE( max_arena_concurrency == my_max_concurrency );
-        if ( my_worker_barrier ) {
-            if ( local_id.local() == 1 ) {
+        REQUIRE(max_arena_concurrency == my_max_concurrency);
+        if (my_worker_barrier) {
+            if (local_id.local() == 1) {
                 // External thread in a reserved slot
-                CHECK_MESSAGE( idx < my_reserved_slots, "External threads are supposed to use only reserved slots in this test" );
+                CHECK_MESSAGE(idx < my_reserved_slots,
+                              "External threads are supposed to use only reserved slots in this test");
             } else {
                 // Worker thread
-                CHECK( idx >= my_reserved_slots );
+                CHECK(idx >= my_reserved_slots);
                 my_worker_barrier->wait();
             }
-        } else if ( my_barrier )
-            CHECK_MESSAGE( local_id.local() == 1, "Workers are not supposed to enter the arena in this test" );
-        if ( my_barrier ) my_barrier->wait();
-        else utils::Sleep( 1 );
+        } else if (my_barrier)
+            CHECK_MESSAGE(local_id.local() == 1, "Workers are not supposed to enter the arena in this test");
+        if (my_barrier) my_barrier->wait();
+        else
+            utils::Sleep(1);
     }
 };
 
-void TestArenaConcurrency( int p, int reserved = 0, int step = 1) {
+void TestArenaConcurrency(int p, int reserved = 0, int step = 1) {
     for (; reserved <= p; reserved += step) {
-        tbb::task_arena a( p, reserved );
+        tbb::task_arena a(p, reserved);
         if (p - reserved < tbb::this_task_arena::max_concurrency()) {
             // Check concurrency with worker & reserved external threads.
             ResetTLS();
-            utils::SpinBarrier b( p );
-            utils::SpinBarrier wb( p-reserved );
-            TestArenaConcurrencyBody test( a, p, reserved, &b, &wb );
-            for ( int i = reserved; i < p; ++i ) // requests p-reserved worker threads
-                a.enqueue( test );
-            if ( reserved==1 )
-                test( 0 ); // calls execute()
+            utils::SpinBarrier b(p);
+            utils::SpinBarrier wb(p - reserved);
+            TestArenaConcurrencyBody test(a, p, reserved, &b, &wb);
+            for (int i = reserved; i < p; ++i)// requests p-reserved worker threads
+                a.enqueue(test);
+            if (reserved == 1) test(0);// calls execute()
             else
-                utils::NativeParallelFor( reserved, test );
+                utils::NativeParallelFor(reserved, test);
             a.debug_wait_until_empty();
-        } { // Check if multiple external threads alone can achieve maximum concurrency.
+        }
+        {// Check if multiple external threads alone can achieve maximum concurrency.
             ResetTLS();
-            utils::SpinBarrier b( p );
-            utils::NativeParallelFor( p, TestArenaConcurrencyBody( a, p, reserved, &b ) );
+            utils::SpinBarrier b(p);
+            utils::NativeParallelFor(p, TestArenaConcurrencyBody(a, p, reserved, &b));
             a.debug_wait_until_empty();
-        } { // Check oversubscription by external threads.
+        }
+        {// Check oversubscription by external threads.
 #if !_WIN32 || !_WIN64
             // Some C++ implementations allocate 8MB stacks for std::thread on 32 bit platforms
             // that makes impossible to create more than ~500 threads.
-            if ( !(sizeof(std::size_t) == 4 && p > 200) )
+            if (!(sizeof(std::size_t) == 4 && p > 200))
 #endif
 #if TBB_TEST_LOW_WORKLOAD
-            if ( p <= 16 )
+                if (p <= 16)
 #endif
-            {
-                ResetTLS();
-                utils::NativeParallelFor(2 * p, TestArenaConcurrencyBody(a, p, reserved));
-                a.debug_wait_until_empty();
-            }
+                {
+                    ResetTLS();
+                    utils::NativeParallelFor(2 * p, TestArenaConcurrencyBody(a, p, reserved));
+                    a.debug_wait_until_empty();
+                }
         }
     }
 }
@@ -514,13 +512,9 @@ struct TestMandatoryConcurrencyObserver : public tbb::task_scheduler_observer {
         : tbb::task_scheduler_observer(a), m_barrier(barrier) {
         observe(true);
     }
-    ~TestMandatoryConcurrencyObserver() {
-        observe(false);
-    }
+    ~TestMandatoryConcurrencyObserver() { observe(false); }
     void on_scheduler_exit(bool worker) override {
-        if (worker) {
-            m_barrier.wait();
-        }
+        if (worker) { m_barrier.wait(); }
     }
 };
 
@@ -532,7 +526,7 @@ void TestMandatoryConcurrency() {
         TestMandatoryConcurrencyObserver observer(a, exit_barrier);
         for (int j = 0; j < 5; ++j) {
             utils::ExactConcurrencyLevel::check(1);
-            std::atomic<int> num_tasks{ 0 }, curr_tasks{ 0 };
+            std::atomic<int> num_tasks {0}, curr_tasks {0};
             utils::SpinBarrier barrier(n_threads);
             utils::NativeParallelFor(n_threads, [&](int) {
                 for (int i = 0; i < 5; ++i) {
@@ -550,9 +544,7 @@ void TestMandatoryConcurrency() {
                     barrier.wait();
                 }
             });
-            do {
-                exit_barrier.wait();
-            } while (num_tasks < n_threads * 5);
+            do { exit_barrier.wait(); } while (num_tasks < n_threads * 5);
         }
     });
 }
@@ -574,10 +566,8 @@ void TestConcurrentFunctionality(int min_thread_num = 1, int max_thread_num = 3)
 struct TaskArenaValidator {
     int my_slot_at_construction;
     const tbb::task_arena& my_arena;
-    TaskArenaValidator( const tbb::task_arena& other )
-        : my_slot_at_construction(tbb::this_task_arena::current_thread_index())
-        , my_arena(other)
-    {}
+    TaskArenaValidator(const tbb::task_arena& other)
+        : my_slot_at_construction(tbb::this_task_arena::current_thread_index()), my_arena(other) {}
     // Inspect the internal state
     int concurrency() { return my_arena.debug_max_concurrency(); }
     int reserved_for_masters() { return my_arena.debug_reserved_slots(); }
@@ -585,23 +575,23 @@ struct TaskArenaValidator {
     // This method should be called in task_arena::execute() for a captured arena
     // by the same thread that created the validator.
     void operator()() {
-        CHECK_MESSAGE( tbb::this_task_arena::current_thread_index()==my_slot_at_construction,
-                "Current thread index has changed since the validator construction" );
+        CHECK_MESSAGE(tbb::this_task_arena::current_thread_index() == my_slot_at_construction,
+                      "Current thread index has changed since the validator construction");
     }
 };
 
-void ValidateAttachedArena( tbb::task_arena& arena, bool expect_activated,
-                            int expect_concurrency, int expect_masters ) {
-    CHECK_MESSAGE( arena.is_active()==expect_activated, "Unexpected activation state" );
-    if( arena.is_active() ) {
-        TaskArenaValidator validator( arena );
-        CHECK_MESSAGE( validator.concurrency()==expect_concurrency, "Unexpected arena size" );
-        CHECK_MESSAGE( validator.reserved_for_masters()==expect_masters, "Unexpected # of reserved slots" );
-        if ( tbb::this_task_arena::current_thread_index() != tbb::task_arena::not_initialized ) {
+void ValidateAttachedArena(tbb::task_arena& arena, bool expect_activated, int expect_concurrency,
+                           int expect_masters) {
+    CHECK_MESSAGE(arena.is_active() == expect_activated, "Unexpected activation state");
+    if (arena.is_active()) {
+        TaskArenaValidator validator(arena);
+        CHECK_MESSAGE(validator.concurrency() == expect_concurrency, "Unexpected arena size");
+        CHECK_MESSAGE(validator.reserved_for_masters() == expect_masters, "Unexpected # of reserved slots");
+        if (tbb::this_task_arena::current_thread_index() != tbb::task_arena::not_initialized) {
             CHECK(tbb::this_task_arena::current_thread_index() >= 0);
             // for threads already in arena, check that the thread index remains the same
-            arena.execute( validator );
-        } else { // not_initialized
+            arena.execute(validator);
+        } else {// not_initialized
             // Test the deprecated method
             CHECK(tbb::this_task_arena::current_thread_index() == -1);
         }
@@ -612,60 +602,59 @@ void ValidateAttachedArena( tbb::task_arena& arena, bool expect_activated,
 }
 
 struct TestAttachBody : utils::NoAssign {
-    static thread_local int my_idx; // safe to modify and use within the NativeParallelFor functor
+    static thread_local int my_idx;// safe to modify and use within the NativeParallelFor functor
     const int maxthread;
-    TestAttachBody( int max_thr ) : maxthread(max_thr) {}
+    TestAttachBody(int max_thr) : maxthread(max_thr) {}
 
     // The functor body for NativeParallelFor
-    void operator()( int idx ) const {
+    void operator()(int idx) const {
         my_idx = idx;
 
         int default_threads = tbb::this_task_arena::max_concurrency();
 
-        tbb::task_arena arena{tbb::task_arena::attach()};
-        ValidateAttachedArena( arena, false, -1, -1 ); // Nothing yet to attach to
+        tbb::task_arena arena {tbb::task_arena::attach()};
+        ValidateAttachedArena(arena, false, -1, -1);// Nothing yet to attach to
 
         arena.terminate();
-        ValidateAttachedArena( arena, false, -1, -1 );
+        ValidateAttachedArena(arena, false, -1, -1);
 
         // attach to an auto-initialized arena
         tbb::parallel_for(0, 1, [](int) {});
 
-        tbb::task_arena arena2{tbb::task_arena::attach()};
-        ValidateAttachedArena( arena2, true, default_threads, 1 );
+        tbb::task_arena arena2 {tbb::task_arena::attach()};
+        ValidateAttachedArena(arena2, true, default_threads, 1);
 
         tbb::task_arena arena3;
         arena3.initialize(tbb::attach());
-        ValidateAttachedArena( arena3, true, default_threads, 1 );
-
+        ValidateAttachedArena(arena3, true, default_threads, 1);
 
         // attach to another task_arena
-        arena.initialize( maxthread, std::min(maxthread,idx) );
-        arena.execute( *this );
+        arena.initialize(maxthread, std::min(maxthread, idx));
+        arena.execute(*this);
     }
 
     // The functor body for task_arena::execute above
     void operator()() const {
-        tbb::task_arena arena2{tbb::task_arena::attach()};
-        ValidateAttachedArena( arena2, true, maxthread, std::min(maxthread,my_idx) );
+        tbb::task_arena arena2 {tbb::task_arena::attach()};
+        ValidateAttachedArena(arena2, true, maxthread, std::min(maxthread, my_idx));
     }
 
     // The functor body for tbb::parallel_for
-    void operator()( const Range& r ) const {
-        for( int i = r.begin(); i<r.end(); ++i ) {
-            tbb::task_arena arena2{tbb::task_arena::attach()};
-            ValidateAttachedArena( arena2, true, tbb::this_task_arena::max_concurrency(), 1 );
+    void operator()(const Range& r) const {
+        for (int i = r.begin(); i < r.end(); ++i) {
+            tbb::task_arena arena2 {tbb::task_arena::attach()};
+            ValidateAttachedArena(arena2, true, tbb::this_task_arena::max_concurrency(), 1);
         }
     }
 };
 
 thread_local int TestAttachBody::my_idx;
 
-void TestAttach( int maxthread ) {
+void TestAttach(int maxthread) {
     // Externally concurrent, but no concurrency within a thread
-    utils::NativeParallelFor( std::max(maxthread,4), TestAttachBody( maxthread ) );
+    utils::NativeParallelFor(std::max(maxthread, 4), TestAttachBody(maxthread));
     // Concurrent within the current arena; may also serve as a stress test
-    tbb::parallel_for( Range(0,10000*maxthread), TestAttachBody( maxthread ) );
+    tbb::parallel_for(Range(0, 10000 * maxthread), TestAttachBody(maxthread));
 }
 
 //--------------------------------------------------//
@@ -673,20 +662,21 @@ void TestAttach( int maxthread ) {
 // Test that task_arena::enqueue does not tolerate a non-const functor.
 // TODO: can it be reworked as SFINAE-based compile-time check?
 struct TestFunctor {
-    void operator()() { CHECK_MESSAGE( false, "Non-const operator called" ); }
-    void operator()() const { /* library requires this overload only */ }
+    void operator()() { CHECK_MESSAGE(false, "Non-const operator called"); }
+    void operator()() const { /* library requires this overload only */
+    }
 };
 
 void TestConstantFunctorRequirement() {
     tbb::task_arena a;
     TestFunctor tf;
-    a.enqueue( tf );
+    a.enqueue(tf);
 }
 
 //--------------------------------------------------//
 
-#include "tbb/parallel_reduce.h"
 #include "tbb/parallel_invoke.h"
+#include "tbb/parallel_reduce.h"
 
 // Test this_task_arena::isolate
 namespace TestIsolatedExecuteNS {
@@ -696,25 +686,26 @@ namespace TestIsolatedExecuteNS {
         NestedParFor() {}
         void operator()() const {
             NestedPartitioner p;
-            tbb::parallel_for( 0, 10, utils::DummyBody( 10 ), p );
+            tbb::parallel_for(0, 10, utils::DummyBody(10), p);
         }
     };
 
     template <typename NestedPartitioner>
     class ParForBody : utils::NoAssign {
         bool myOuterIsolation;
-        tbb::enumerable_thread_specific<int> &myEts;
-        std::atomic<bool> &myIsStolen;
+        tbb::enumerable_thread_specific<int>& myEts;
+        std::atomic<bool>& myIsStolen;
+
     public:
-        ParForBody( bool outer_isolation, tbb::enumerable_thread_specific<int> &ets, std::atomic<bool> &is_stolen )
-            : myOuterIsolation( outer_isolation ), myEts( ets ), myIsStolen( is_stolen ) {}
-        void operator()( int ) const {
-            int &e = myEts.local();
-            if ( e++ > 0 ) myIsStolen = true;
-            if ( myOuterIsolation )
-                NestedParFor<NestedPartitioner>()();
+        ParForBody(bool outer_isolation, tbb::enumerable_thread_specific<int>& ets,
+                   std::atomic<bool>& is_stolen)
+            : myOuterIsolation(outer_isolation), myEts(ets), myIsStolen(is_stolen) {}
+        void operator()(int) const {
+            int& e = myEts.local();
+            if (e++ > 0) myIsStolen = true;
+            if (myOuterIsolation) NestedParFor<NestedPartitioner>()();
             else
-                tbb::this_task_arena::isolate( NestedParFor<NestedPartitioner>() );
+                tbb::this_task_arena::isolate(NestedParFor<NestedPartitioner>());
             --e;
         }
     };
@@ -722,48 +713,52 @@ namespace TestIsolatedExecuteNS {
     template <typename OuterPartitioner, typename NestedPartitioner>
     class OuterParFor : utils::NoAssign {
         bool myOuterIsolation;
-        std::atomic<bool> &myIsStolen;
+        std::atomic<bool>& myIsStolen;
+
     public:
-        OuterParFor( bool outer_isolation, std::atomic<bool> &is_stolen ) : myOuterIsolation( outer_isolation ), myIsStolen( is_stolen ) {}
+        OuterParFor(bool outer_isolation, std::atomic<bool>& is_stolen)
+            : myOuterIsolation(outer_isolation), myIsStolen(is_stolen) {}
         void operator()() const {
-            tbb::enumerable_thread_specific<int> ets( 0 );
+            tbb::enumerable_thread_specific<int> ets(0);
             OuterPartitioner p;
-            tbb::parallel_for( 0, 1000, ParForBody<NestedPartitioner>( myOuterIsolation, ets, myIsStolen ), p );
+            tbb::parallel_for(0, 1000, ParForBody<NestedPartitioner>(myOuterIsolation, ets, myIsStolen), p);
         }
     };
 
     template <typename OuterPartitioner, typename NestedPartitioner>
-    void TwoLoopsTest( bool outer_isolation ) {
+    void TwoLoopsTest(bool outer_isolation) {
         std::atomic<bool> is_stolen;
         is_stolen = false;
         const int max_repeats = 100;
-        if ( outer_isolation ) {
-            for ( int i = 0; i <= max_repeats; ++i ) {
-                tbb::this_task_arena::isolate( OuterParFor<OuterPartitioner, NestedPartitioner>( outer_isolation, is_stolen ) );
-                if ( is_stolen ) break;
+        if (outer_isolation) {
+            for (int i = 0; i <= max_repeats; ++i) {
+                tbb::this_task_arena::isolate(
+                        OuterParFor<OuterPartitioner, NestedPartitioner>(outer_isolation, is_stolen));
+                if (is_stolen) break;
             }
             // TODO: was ASSERT_WARNING
             if (!is_stolen) {
                 REPORT("Warning: isolate() should not block stealing on nested levels without isolation\n");
             }
         } else {
-            for ( int i = 0; i <= max_repeats; ++i ) {
-                OuterParFor<OuterPartitioner, NestedPartitioner>( outer_isolation, is_stolen )();
+            for (int i = 0; i <= max_repeats; ++i) {
+                OuterParFor<OuterPartitioner, NestedPartitioner>(outer_isolation, is_stolen)();
             }
-            REQUIRE_MESSAGE( !is_stolen, "isolate() on nested levels should prevent stealing from outer levels" );
+            REQUIRE_MESSAGE(!is_stolen,
+                            "isolate() on nested levels should prevent stealing from outer levels");
         }
     }
 
-    void TwoLoopsTest( bool outer_isolation ) {
-        TwoLoopsTest<tbb::simple_partitioner, tbb::simple_partitioner>( outer_isolation );
-        TwoLoopsTest<tbb::simple_partitioner, tbb::affinity_partitioner>( outer_isolation );
-        TwoLoopsTest<tbb::affinity_partitioner, tbb::simple_partitioner>( outer_isolation );
-        TwoLoopsTest<tbb::affinity_partitioner, tbb::affinity_partitioner>( outer_isolation );
+    void TwoLoopsTest(bool outer_isolation) {
+        TwoLoopsTest<tbb::simple_partitioner, tbb::simple_partitioner>(outer_isolation);
+        TwoLoopsTest<tbb::simple_partitioner, tbb::affinity_partitioner>(outer_isolation);
+        TwoLoopsTest<tbb::affinity_partitioner, tbb::simple_partitioner>(outer_isolation);
+        TwoLoopsTest<tbb::affinity_partitioner, tbb::affinity_partitioner>(outer_isolation);
     }
 
     void TwoLoopsTest() {
-        TwoLoopsTest( true );
-        TwoLoopsTest( false );
+        TwoLoopsTest(true);
+        TwoLoopsTest(false);
     }
     //--------------------------------------------------//
     class HeavyMixTestBody : utils::NoAssign {
@@ -772,90 +767,91 @@ namespace TestIsolatedExecuteNS {
         int myNestedLevel;
 
         template <typename Partitioner, typename Body>
-        static void RunTwoBodies( utils::FastRandom<>& rnd, const Body &body, Partitioner& p, tbb::task_group_context* ctx = nullptr ) {
-            if ( rnd.get() % 2 ) {
-                if  (ctx )
-                    tbb::parallel_for( 0, 2, body, p, *ctx );
+        static void RunTwoBodies(utils::FastRandom<>& rnd, const Body& body, Partitioner& p,
+                                 tbb::task_group_context* ctx = nullptr) {
+            if (rnd.get() % 2) {
+                if (ctx) tbb::parallel_for(0, 2, body, p, *ctx);
                 else
-                    tbb::parallel_for( 0, 2, body, p );
+                    tbb::parallel_for(0, 2, body, p);
             } else {
-                tbb::parallel_invoke( body, body );
+                tbb::parallel_invoke(body, body);
             }
         }
 
         template <typename Partitioner>
         class IsolatedBody : utils::NoAssign {
-            const HeavyMixTestBody &myHeavyMixTestBody;
-            Partitioner &myPartitioner;
+            const HeavyMixTestBody& myHeavyMixTestBody;
+            Partitioner& myPartitioner;
+
         public:
-            IsolatedBody( const HeavyMixTestBody &body, Partitioner &partitioner )
-                : myHeavyMixTestBody( body ), myPartitioner( partitioner ) {}
+            IsolatedBody(const HeavyMixTestBody& body, Partitioner& partitioner)
+                : myHeavyMixTestBody(body), myPartitioner(partitioner) {}
             void operator()() const {
-                RunTwoBodies( myHeavyMixTestBody.myRandom.local(),
-                    HeavyMixTestBody( myHeavyMixTestBody.myRandom, myHeavyMixTestBody.myIsolatedLevel,
-                        myHeavyMixTestBody.myNestedLevel + 1 ),
-                    myPartitioner );
+                RunTwoBodies(myHeavyMixTestBody.myRandom.local(),
+                             HeavyMixTestBody(myHeavyMixTestBody.myRandom, myHeavyMixTestBody.myIsolatedLevel,
+                                              myHeavyMixTestBody.myNestedLevel + 1),
+                             myPartitioner);
             }
         };
 
         template <typename Partitioner>
-        void RunNextLevel( utils::FastRandom<>& rnd, int &isolated_level ) const {
+        void RunNextLevel(utils::FastRandom<>& rnd, int& isolated_level) const {
             Partitioner p;
-            switch ( rnd.get() % 2 ) {
+            switch (rnd.get() % 2) {
                 case 0: {
                     // No features
                     tbb::task_group_context ctx;
-                    RunTwoBodies( rnd, HeavyMixTestBody(myRandom, myIsolatedLevel, myNestedLevel + 1), p, &ctx );
+                    RunTwoBodies(rnd, HeavyMixTestBody(myRandom, myIsolatedLevel, myNestedLevel + 1), p,
+                                 &ctx);
                     break;
                 }
                 case 1: {
                     // Isolation
                     int previous_isolation = isolated_level;
                     isolated_level = myNestedLevel;
-                    tbb::this_task_arena::isolate( IsolatedBody<Partitioner>( *this, p ) );
+                    tbb::this_task_arena::isolate(IsolatedBody<Partitioner>(*this, p));
                     isolated_level = previous_isolation;
                     break;
                 }
             }
         }
+
     public:
-        HeavyMixTestBody( tbb::enumerable_thread_specific<utils::FastRandom<>>& random,
-            tbb::enumerable_thread_specific<int>& isolated_level, int nested_level )
-            : myRandom( random ), myIsolatedLevel( isolated_level )
-            , myNestedLevel( nested_level ) {}
+        HeavyMixTestBody(tbb::enumerable_thread_specific<utils::FastRandom<>>& random,
+                         tbb::enumerable_thread_specific<int>& isolated_level, int nested_level)
+            : myRandom(random), myIsolatedLevel(isolated_level), myNestedLevel(nested_level) {}
         void operator()() const {
-            int &isolated_level = myIsolatedLevel.local();
-            CHECK_FAST_MESSAGE( myNestedLevel > isolated_level, "The outer-level task should not be stolen on isolated level" );
-            if ( myNestedLevel == 20 )
-                return;
+            int& isolated_level = myIsolatedLevel.local();
+            CHECK_FAST_MESSAGE(myNestedLevel > isolated_level,
+                               "The outer-level task should not be stolen on isolated level");
+            if (myNestedLevel == 20) return;
             utils::FastRandom<>& rnd = myRandom.local();
-            if ( rnd.get() % 2 == 1 ) {
-                RunNextLevel<tbb::auto_partitioner>( rnd, isolated_level );
+            if (rnd.get() % 2 == 1) {
+                RunNextLevel<tbb::auto_partitioner>(rnd, isolated_level);
             } else {
-                RunNextLevel<tbb::affinity_partitioner>( rnd, isolated_level );
+                RunNextLevel<tbb::affinity_partitioner>(rnd, isolated_level);
             }
         }
-        void operator()(int) const {
-            this->operator()();
-        }
+        void operator()(int) const { this->operator()(); }
     };
 
     struct RandomInitializer {
         utils::FastRandom<> operator()() {
-            return utils::FastRandom<>( tbb::this_task_arena::current_thread_index() );
+            return utils::FastRandom<>(tbb::this_task_arena::current_thread_index());
         }
     };
 
     void HeavyMixTest() {
-        std::size_t num_threads = tbb::this_task_arena::max_concurrency() < 3 ? 3 : tbb::this_task_arena::max_concurrency();
+        std::size_t num_threads
+                = tbb::this_task_arena::max_concurrency() < 3 ? 3 : tbb::this_task_arena::max_concurrency();
         tbb::global_control ctl(tbb::global_control::max_allowed_parallelism, num_threads);
 
         RandomInitializer init_random;
-        tbb::enumerable_thread_specific<utils::FastRandom<>> random( init_random );
-        tbb::enumerable_thread_specific<int> isolated_level( 0 );
-        for ( int i = 0; i < 5; ++i ) {
-            HeavyMixTestBody b( random, isolated_level, 1 );
-            b( 0 );
+        tbb::enumerable_thread_specific<utils::FastRandom<>> random(init_random);
+        tbb::enumerable_thread_specific<int> isolated_level(0);
+        for (int i = 0; i < 5; ++i) {
+            HeavyMixTestBody b(random, isolated_level, 1);
+            b(0);
         }
     }
 
@@ -877,22 +873,19 @@ namespace TestIsolatedExecuteNS {
     struct ExceptionTestBody : utils::NoAssign {
         tbb::enumerable_thread_specific<int>& myEts;
         std::atomic<bool>& myIsStolen;
-        ExceptionTestBody( tbb::enumerable_thread_specific<int>& ets, std::atomic<bool>& is_stolen )
-            : myEts( ets ), myIsStolen( is_stolen ) {}
-        void operator()( int i ) const {
+        ExceptionTestBody(tbb::enumerable_thread_specific<int>& ets, std::atomic<bool>& is_stolen)
+            : myEts(ets), myIsStolen(is_stolen) {}
+        void operator()(int i) const {
             try {
-                tbb::this_task_arena::isolate( IsolatedBodyThrowsException() );
-                REQUIRE_MESSAGE( false, "The exception has been lost" );
-            }
-            catch ( MyException ) {}
-            catch ( ... ) {
-                REQUIRE_MESSAGE( false, "Unexpected exception" );
-            }
+                tbb::this_task_arena::isolate(IsolatedBodyThrowsException());
+                REQUIRE_MESSAGE(false, "The exception has been lost");
+            } catch (MyException) {
+            } catch (...) { REQUIRE_MESSAGE(false, "Unexpected exception"); }
             // Check that nested algorithms can steal outer-level tasks
-            int &e = myEts.local();
-            if ( e++ > 0 ) myIsStolen = true;
+            int& e = myEts.local();
+            if (e++ > 0) myIsStolen = true;
             // work imbalance increases chances for stealing
-            tbb::parallel_for( 0, 10+i, utils::DummyBody( 100 ) );
+            tbb::parallel_for(0, 10 + i, utils::DummyBody(100));
             --e;
         }
     };
@@ -903,19 +896,17 @@ namespace TestIsolatedExecuteNS {
         tbb::enumerable_thread_specific<int> ets;
         std::atomic<bool> is_stolen;
         is_stolen = false;
-        for ( ;; ) {
-            tbb::parallel_for( 0, 1000, ExceptionTestBody( ets, is_stolen ) );
-            if ( is_stolen ) break;
+        for (;;) {
+            tbb::parallel_for(0, 1000, ExceptionTestBody(ets, is_stolen));
+            if (is_stolen) break;
         }
-        REQUIRE_MESSAGE( is_stolen, "isolate should not affect non-isolated work" );
+        REQUIRE_MESSAGE(is_stolen, "isolate should not affect non-isolated work");
 #endif /* TBB_USE_EXCEPTIONS */
     }
 
     struct NonConstBody {
         unsigned int state;
-        void operator()() {
-            state ^= ~0u;
-        }
+        void operator()() { state ^= ~0u; }
     };
 
     void TestNonConstBody() {
@@ -937,7 +928,8 @@ namespace TestIsolatedExecuteNS {
         tbb::task_arena& arena;
         static const int N = 100;
 
-        TestEnqueueTask(tbb::enumerable_thread_specific<bool>& exe, std::atomic<int>& c, wait_context& w, tbb::task_arena& a)
+        TestEnqueueTask(tbb::enumerable_thread_specific<bool>& exe, std::atomic<int>& c, wait_context& w,
+                        tbb::task_arena& a)
             : executed(exe), completed(c), waiter(w), arena(a) {}
 
         tbb::detail::d1::task* execute(tbb::detail::d1::execution_data&) override {
@@ -958,10 +950,12 @@ namespace TestIsolatedExecuteNS {
         tbb::enumerable_thread_specific<bool>& executed;
         std::atomic<int>& completed;
         tbb::task_arena& arena;
+
     public:
         static const int N = 100;
 
-        TestEnqueueIsolateBody(tbb::enumerable_thread_specific<bool>& exe, std::atomic<int>& c, tbb::task_arena& a)
+        TestEnqueueIsolateBody(tbb::enumerable_thread_specific<bool>& exe, std::atomic<int>& c,
+                               tbb::task_arena& a)
             : executed(exe), completed(c), arena(a) {}
         void operator()() {
             tbb::task_group_context ctx;
@@ -975,16 +969,14 @@ namespace TestIsolatedExecuteNS {
     void TestEnqueue() {
         tbb::enumerable_thread_specific<bool> executed(false);
         std::atomic<int> completed;
-        tbb::task_arena arena{tbb::task_arena::attach()};
+        tbb::task_arena arena {tbb::task_arena::attach()};
 
         // Check that the main thread can process enqueued tasks.
         completed = 0;
         TestEnqueueIsolateBody b1(executed, completed, arena);
         b1();
 
-        if (!executed.local()) {
-            REPORT("Warning: No one enqueued task has executed by the main thread.\n");
-        }
+        if (!executed.local()) { REPORT("Warning: No one enqueued task has executed by the main thread.\n"); }
 
         executed.local() = false;
         completed = 0;
@@ -1008,14 +1000,14 @@ namespace TestIsolatedExecuteNS {
         tbb::detail::d1::wait(waiter, ctx);
         // while (completed < TestEnqueueTask::N + N) utils::yield();
     }
-}
+}// namespace TestIsolatedExecuteNS
 
 void TestIsolatedExecute() {
     // At least 3 threads (owner + 2 thieves) are required to reproduce a situation when the owner steals outer
     // level task on a nested level. If we have only one thief then it will execute outer level tasks first and
     // the owner will not have a possibility to steal outer level tasks.
     int platform_max_thread = tbb::this_task_arena::max_concurrency();
-    int num_threads = utils::min( platform_max_thread, 3 );
+    int num_threads = utils::min(platform_max_thread, 3);
     {
         // Too many threads require too many work to reproduce the stealing from outer level.
         tbb::global_control ctl(tbb::global_control::max_allowed_parallelism, utils::max(num_threads, 7));
@@ -1032,26 +1024,27 @@ void TestIsolatedExecute() {
 //-----------------------------------------------------------------------------------------//
 
 class TestDelegatedSpawnWaitBody : utils::NoAssign {
-    tbb::task_arena &my_a;
+    tbb::task_arena& my_a;
     utils::SpinBarrier &my_b1, &my_b2;
+
 public:
-    TestDelegatedSpawnWaitBody( tbb::task_arena &a, utils::SpinBarrier &b1, utils::SpinBarrier &b2)
+    TestDelegatedSpawnWaitBody(tbb::task_arena& a, utils::SpinBarrier& b1, utils::SpinBarrier& b2)
         : my_a(a), my_b1(b1), my_b2(b2) {}
     // NativeParallelFor's functor
     void operator()(int idx) const {
-        if ( idx==0 ) { // thread 0 works in the arena, thread 1 waits for it (to prevent test hang)
+        if (idx == 0) {// thread 0 works in the arena, thread 1 waits for it (to prevent test hang)
             for (int i = 0; i < 2; ++i) {
-                my_a.enqueue([this] { my_b1.wait(); }); // tasks to sync with workers
+                my_a.enqueue([this] { my_b1.wait(); });// tasks to sync with workers
             }
             tbb::task_group tg;
-            my_b1.wait(); // sync with the workers
-            for( int i=0; i<100000; ++i) {
+            my_b1.wait();// sync with the workers
+            for (int i = 0; i < 100000; ++i) {
                 my_a.execute([&tg] { tg.run([] {}); });
             }
-            my_a.execute([&tg] {tg.wait(); });
+            my_a.execute([&tg] { tg.wait(); });
         }
 
-        my_b2.wait(); // sync both threads
+        my_b2.wait();// sync both threads
     }
 };
 
@@ -1061,10 +1054,10 @@ void TestDelegatedSpawnWait() {
         return;
     }
     // Regression test for a bug with missed wakeup notification from a delegated task
-    tbb::task_arena a(2,0);
+    tbb::task_arena a(2, 0);
     a.initialize();
     utils::SpinBarrier barrier1(3), barrier2(2);
-    utils::NativeParallelFor( 2, TestDelegatedSpawnWaitBody(a, barrier1, barrier2) );
+    utils::NativeParallelFor(2, TestDelegatedSpawnWaitBody(a, barrier1, barrier2));
     a.debug_wait_until_empty();
 }
 
@@ -1072,20 +1065,20 @@ void TestDelegatedSpawnWait() {
 
 class TestMultipleWaitsArenaWait : utils::NoAssign {
     using wait_context = tbb::detail::d1::wait_context;
+
 public:
-    TestMultipleWaitsArenaWait( int idx, int bunch_size, int num_tasks, std::vector<wait_context*>& waiters, std::atomic<int>& processed, tbb::task_group_context& tgc )
-        : my_idx( idx ), my_bunch_size( bunch_size ), my_num_tasks(num_tasks), my_waiters( waiters ), my_processed( processed ), my_context(tgc) {}
+    TestMultipleWaitsArenaWait(int idx, int bunch_size, int num_tasks, std::vector<wait_context*>& waiters,
+                               std::atomic<int>& processed, tbb::task_group_context& tgc)
+        : my_idx(idx), my_bunch_size(bunch_size), my_num_tasks(num_tasks), my_waiters(waiters),
+          my_processed(processed), my_context(tgc) {}
     void operator()() const {
         ++my_processed;
         // Wait for all tasks
-        if ( my_idx < my_num_tasks ) {
-            tbb::detail::d1::wait(*my_waiters[my_idx], my_context);
-        }
+        if (my_idx < my_num_tasks) { tbb::detail::d1::wait(*my_waiters[my_idx], my_context); }
         // Signal waiting tasks
-        if ( my_idx >= my_bunch_size ) {
-            my_waiters[my_idx-my_bunch_size]->release();
-        }
+        if (my_idx >= my_bunch_size) { my_waiters[my_idx - my_bunch_size]->release(); }
     }
+
 private:
     int my_idx;
     int my_bunch_size;
@@ -1097,13 +1090,19 @@ class TestMultipleWaitsArenaWait : utils::NoAssign {
 
 class TestMultipleWaitsThreadBody : utils::NoAssign {
     using wait_context = tbb::detail::d1::wait_context;
+
 public:
-    TestMultipleWaitsThreadBody( int bunch_size, int num_tasks, tbb::task_arena& a, std::vector<wait_context*>& waiters, std::atomic<int>& processed, tbb::task_group_context& tgc )
-        : my_bunch_size( bunch_size ), my_num_tasks( num_tasks ), my_arena( a ), my_waiters( waiters ), my_processed( processed ), my_context(tgc) {}
-    void operator()( int idx ) const {
-        my_arena.execute( TestMultipleWaitsArenaWait( idx, my_bunch_size, my_num_tasks, my_waiters, my_processed, my_context ) );
+    TestMultipleWaitsThreadBody(int bunch_size, int num_tasks, tbb::task_arena& a,
+                                std::vector<wait_context*>& waiters, std::atomic<int>& processed,
+                                tbb::task_group_context& tgc)
+        : my_bunch_size(bunch_size), my_num_tasks(num_tasks), my_arena(a), my_waiters(waiters),
+          my_processed(processed), my_context(tgc) {}
+    void operator()(int idx) const {
+        my_arena.execute(TestMultipleWaitsArenaWait(idx, my_bunch_size, my_num_tasks, my_waiters,
+                                                    my_processed, my_context));
         --my_processed;
     }
+
 private:
     int my_bunch_size;
     int my_num_tasks;
@@ -1113,31 +1112,34 @@ class TestMultipleWaitsThreadBody : utils::NoAssign {
     tbb::task_group_context& my_context;
 };
 
-void TestMultipleWaits( int num_threads, int num_bunches, int bunch_size ) {
-    tbb::task_arena a( num_threads );
-    const int num_tasks = (num_bunches-1)*bunch_size;
+void TestMultipleWaits(int num_threads, int num_bunches, int bunch_size) {
+    tbb::task_arena a(num_threads);
+    const int num_tasks = (num_bunches - 1) * bunch_size;
 
     tbb::task_group_context tgc;
     std::vector<tbb::detail::d1::wait_context*> waiters(num_tasks);
     for (auto& w : waiters) w = new tbb::detail::d1::wait_context(0);
 
     std::atomic<int> processed(0);
-    for ( int repeats = 0; repeats<10; ++repeats ) {
+    for (int repeats = 0; repeats < 10; ++repeats) {
         int idx = 0;
-        for ( int bunch = 0; bunch < num_bunches-1; ++bunch ) {
+        for (int bunch = 0; bunch < num_bunches - 1; ++bunch) {
             // Sync with the previous bunch of waiters to prevent "false" nested dependencies (when a nested task waits for an outer task).
-            while ( processed < bunch*bunch_size ) utils::yield();
+            while (processed < bunch * bunch_size) utils::yield();
             // Run the bunch of threads/waiters that depend on the next bunch of threads/waiters.
-            for ( int i = 0; i<bunch_size; ++i ) {
+            for (int i = 0; i < bunch_size; ++i) {
                 waiters[idx]->reserve();
-                std::thread( TestMultipleWaitsThreadBody( bunch_size, num_tasks, a, waiters, processed, tgc ), idx++ ).detach();
+                std::thread(TestMultipleWaitsThreadBody(bunch_size, num_tasks, a, waiters, processed, tgc),
+                            idx++)
+                        .detach();
             }
         }
         // No sync because the threads of the last bunch do not call wait_for_all.
         // Run the last bunch of threads.
-        for ( int i = 0; i<bunch_size; ++i )
-            std::thread( TestMultipleWaitsThreadBody( bunch_size, num_tasks, a, waiters, processed, tgc ), idx++ ).detach();
-        while ( processed ) utils::yield();
+        for (int i = 0; i < bunch_size; ++i)
+            std::thread(TestMultipleWaitsThreadBody(bunch_size, num_tasks, a, waiters, processed, tgc), idx++)
+                    .detach();
+        while (processed) utils::yield();
     }
     for (auto w : waiters) delete w;
 }
@@ -1145,17 +1147,17 @@ void TestMultipleWaits( int num_threads, int num_bunches, int bunch_size ) {
 void TestMultipleWaits() {
     // Limit the number of threads to prevent heavy oversubscription.
 #if TBB_TEST_LOW_WORKLOAD
-    const int max_threads = std::min( 4, tbb::this_task_arena::max_concurrency() );
+    const int max_threads = std::min(4, tbb::this_task_arena::max_concurrency());
 #else
-    const int max_threads = std::min( 16, tbb::this_task_arena::max_concurrency() );
+    const int max_threads = std::min(16, tbb::this_task_arena::max_concurrency());
 #endif
 
     utils::FastRandom<> rnd(1234);
-    for ( int threads = 1; threads <= max_threads; threads += utils::max( threads/2, 1 ) ) {
-        for ( int i = 0; i<3; ++i ) {
-            const int num_bunches = 3 + rnd.get()%3;
-            const int bunch_size = max_threads + rnd.get()%max_threads;
-            TestMultipleWaits( threads, num_bunches, bunch_size );
+    for (int threads = 1; threads <= max_threads; threads += utils::max(threads / 2, 1)) {
+        for (int i = 0; i < 3; ++i) {
+            const int num_bunches = 3 + rnd.get() % 3;
+            const int bunch_size = max_threads + rnd.get() % max_threads;
+            TestMultipleWaits(threads, num_bunches, bunch_size);
         }
     }
 }
@@ -1164,7 +1166,7 @@ void TestMultipleWaits() {
 
 void TestSmallStackSize() {
     tbb::global_control gc(tbb::global_control::thread_stack_size,
-            tbb::global_control::active_value(tbb::global_control::thread_stack_size) / 2 );
+                           tbb::global_control::active_value(tbb::global_control::thread_stack_size) / 2);
     // The test produces the warning (not a error) if fails. So the test is run many times
     // to make the log annoying (to force to consider it as an error).
     for (int i = 0; i < 100; ++i) {
@@ -1187,7 +1189,7 @@ namespace TestMoveSemanticsNS {
 
     struct MovePreferableFunctor : utils::Movable, TestFunctor {
         MovePreferableFunctor() : utils::Movable() {};
-        MovePreferableFunctor(MovePreferableFunctor&& other) : utils::Movable( std::move(other) ) {};
+        MovePreferableFunctor(MovePreferableFunctor&& other) : utils::Movable(std::move(other)) {};
         MovePreferableFunctor(const MovePreferableFunctor& other) : utils::Movable(other) {};
     };
 
@@ -1202,21 +1204,19 @@ namespace TestMoveSemanticsNS {
         tbb::task_arena ta;
         MovePreferableFunctor mpf;
         // execute() doesn't have any copies or moves of arguments inside the impl
-        ta.execute( NoMoveNoCopyFunctor() );
+        ta.execute(NoMoveNoCopyFunctor());
 
-        ta.enqueue( MoveOnlyFunctor() );
-        ta.enqueue( mpf );
+        ta.enqueue(MoveOnlyFunctor());
+        ta.enqueue(mpf);
         REQUIRE_MESSAGE(mpf.alive, "object was moved when was passed by lval");
         mpf.Reset();
-        ta.enqueue( std::move(mpf) );
+        ta.enqueue(std::move(mpf));
         REQUIRE_MESSAGE(!mpf.alive, "object was copied when was passed by rval");
         mpf.Reset();
     }
-}
+}// namespace TestMoveSemanticsNS
 
-void TestMoveSemantics() {
-    TestMoveSemanticsNS::TestFunctors();
-}
+void TestMoveSemantics() { TestMoveSemanticsNS::TestFunctors(); }
 
 //--------------------------------------------------//
 
@@ -1229,6 +1229,7 @@ namespace TestReturnValueNS {
     class ReturnType : public StateTrackable<> {
         static const int SIZE = 42;
         std::vector<int> data;
+
     public:
         ReturnType(noDefaultTag) : StateTrackable<>(0) {}
         // Define copy constructor to test that it is never called
@@ -1236,13 +1237,11 @@ namespace TestReturnValueNS {
         ReturnType(ReturnType&& r) : StateTrackable<>(std::move(r)), data(std::move(r.data)) {}
 
         void fill() {
-            for (int i = 0; i < SIZE; ++i)
-                data.push_back(i);
+            for (int i = 0; i < SIZE; ++i) data.push_back(i);
         }
         void check() {
             REQUIRE(data.size() == unsigned(SIZE));
-            for (int i = 0; i < SIZE; ++i)
-                REQUIRE(data[i] == i);
+            for (int i = 0; i < SIZE; ++i) REQUIRE(data[i] == i);
             StateTrackableCounters::counters_type& cnts = StateTrackableCounters::counters;
             REQUIRE(cnts[StateTrackableBase::DefaultInitialized] == 0);
             REQUIRE(cnts[StateTrackableBase::DirectInitialized] == 1);
@@ -1253,10 +1252,10 @@ namespace TestReturnValueNS {
             // function return, store to an internal storage, acquire internal storage.
             // For compilation, without copy elision, this number may be grown up to 7.
             REQUIRE((copied == 0 && moved <= 7));
-            WARN_MESSAGE(moved <= 3,
-                "Warning: The number of copies/moves should not exceed 3 if copy elision takes a place."
-                "Take an attention to this warning only if copy elision is enabled."
-            );
+            WARN_MESSAGE(
+                    moved <= 3,
+                    "Warning: The number of copies/moves should not exceed 3 if copy elision takes a place."
+                    "Take an attention to this warning only if copy elision is enabled.");
         }
     };
 
@@ -1273,9 +1272,7 @@ namespace TestReturnValueNS {
 
     template <typename R>
     struct Functor {
-        R operator()() const {
-            return function<R>();
-        }
+        R operator()() const { return function<R>(); }
     };
 
     tbb::task_arena& arena() {
@@ -1284,29 +1281,29 @@ namespace TestReturnValueNS {
     }
 
     template <typename F>
-    void TestExecute(F &f) {
+    void TestExecute(F& f) {
         StateTrackableCounters::reset();
-        ReturnType r{arena().execute(f)};
+        ReturnType r {arena().execute(f)};
         r.check();
     }
 
     template <typename F>
-    void TestExecute(const F &f) {
+    void TestExecute(const F& f) {
         StateTrackableCounters::reset();
-        ReturnType r{arena().execute(f)};
+        ReturnType r {arena().execute(f)};
         r.check();
     }
     template <typename F>
-    void TestIsolate(F &f) {
+    void TestIsolate(F& f) {
         StateTrackableCounters::reset();
-        ReturnType r{tbb::this_task_arena::isolate(f)};
+        ReturnType r {tbb::this_task_arena::isolate(f)};
         r.check();
     }
 
     template <typename F>
-    void TestIsolate(const F &f) {
+    void TestIsolate(const F& f) {
         StateTrackableCounters::reset();
-        ReturnType r{tbb::this_task_arena::isolate(f)};
+        ReturnType r {tbb::this_task_arena::isolate(f)};
         r.check();
     }
 
@@ -1327,61 +1324,50 @@ namespace TestReturnValueNS {
         tbb::this_task_arena::isolate(f2);
         tbb::this_task_arena::isolate(function<void>);
     }
-}
+}// namespace TestReturnValueNS
 
-void TestReturnValue() {
-    TestReturnValueNS::Test();
-}
+void TestReturnValue() { TestReturnValueNS::Test(); }
 
 //--------------------------------------------------//
 
 // MyObserver checks if threads join to the same arena
-struct MyObserver: public tbb::task_scheduler_observer {
+struct MyObserver : public tbb::task_scheduler_observer {
     tbb::enumerable_thread_specific<tbb::task_arena*>& my_tls;
     tbb::task_arena& my_arena;
     std::atomic<int>& my_failure_counter;
     std::atomic<int>& my_counter;
     utils::SpinBarrier& m_barrier;
 
-    MyObserver(tbb::task_arena& a,
-        tbb::enumerable_thread_specific<tbb::task_arena*>& tls,
-        std::atomic<int>& failure_counter,
-        std::atomic<int>& counter,
-        utils::SpinBarrier& barrier)
-        : tbb::task_scheduler_observer(a), my_tls(tls), my_arena(a),
-        my_failure_counter(failure_counter), my_counter(counter), m_barrier(barrier) {
+    MyObserver(tbb::task_arena& a, tbb::enumerable_thread_specific<tbb::task_arena*>& tls,
+               std::atomic<int>& failure_counter, std::atomic<int>& counter, utils::SpinBarrier& barrier)
+        : tbb::task_scheduler_observer(a), my_tls(tls), my_arena(a), my_failure_counter(failure_counter),
+          my_counter(counter), m_barrier(barrier) {
         observe(true);
     }
-    ~MyObserver(){
-        observe(false);
-    }
+    ~MyObserver() { observe(false); }
     void on_scheduler_entry(bool worker) override {
         if (worker) {
             ++my_counter;
             tbb::task_arena*& cur_arena = my_tls.local();
-            if (cur_arena != nullptr && cur_arena != &my_arena) {
-                ++my_failure_counter;
-            }
+            if (cur_arena != nullptr && cur_arena != &my_arena) { ++my_failure_counter; }
             cur_arena = &my_arena;
             m_barrier.wait();
         }
     }
     void on_scheduler_exit(bool worker) override {
         if (worker) {
-            m_barrier.wait(); // before wakeup
-            m_barrier.wait(); // after wakeup
+            m_barrier.wait();// before wakeup
+            m_barrier.wait();// after wakeup
         }
     }
 };
 
 void TestArenaWorkersMigrationWithNumThreads(int n_threads = 0) {
-    if (n_threads == 0) {
-        n_threads = tbb::this_task_arena::max_concurrency();
-    }
+    if (n_threads == 0) { n_threads = tbb::this_task_arena::max_concurrency(); }
 
     const int max_n_arenas = 8;
     int n_arenas = 2;
-    if(n_threads > 16) {
+    if (n_threads > 16) {
         n_arenas = max_n_arenas;
     } else if (n_threads > 8) {
         n_arenas = 4;
@@ -1389,16 +1375,14 @@ void TestArenaWorkersMigrationWithNumThreads(int n_threads = 0) {
 
     int n_workers = n_threads - 1;
     n_workers = n_arenas * (n_workers / n_arenas);
-    if (n_workers == 0) {
-        return;
-    }
+    if (n_workers == 0) { return; }
 
     n_threads = n_workers + 1;
     tbb::global_control control(tbb::global_control::max_allowed_parallelism, n_threads);
 
     const int n_repetitions = 20;
     const int n_outer_repetitions = 100;
-    std::multiset<float> failure_ratio; // for median calculating
+    std::multiset<float> failure_ratio;// for median calculating
     utils::SpinBarrier barrier(n_threads);
     utils::SpinBarrier worker_barrier(n_workers);
     MyObserver* observer[max_n_arenas];
@@ -1408,7 +1392,7 @@ void TestArenaWorkersMigrationWithNumThreads(int n_threads = 0) {
     tbb::enumerable_thread_specific<tbb::task_arena*> tls;
 
     for (int i = 0; i < n_arenas; ++i) {
-        arenas[i].initialize(n_workers / n_arenas + 1); // +1 for master
+        arenas[i].initialize(n_workers / n_arenas + 1);// +1 for master
         observer[i] = new MyObserver(arenas[i], tls, failure_counter, counter, barrier);
     }
 
@@ -1418,17 +1402,19 @@ void TestArenaWorkersMigrationWithNumThreads(int n_threads = 0) {
         counter = 0;
 
         // Main code
-        auto wakeup = [&arenas] { for (auto& a : arenas) a.enqueue([]{}); };
+        auto wakeup = [&arenas] {
+            for (auto& a : arenas) a.enqueue([] {});
+        };
         wakeup();
         for (int j = 0; j < n_repetitions; ++j) {
-            barrier.wait(); // entry
-            barrier.wait(); // exit1
+            barrier.wait();// entry
+            barrier.wait();// exit1
             wakeup();
-            barrier.wait(); // exit2
+            barrier.wait();// exit2
         }
-        barrier.wait(); // entry
-        barrier.wait(); // exit1
-        barrier.wait(); // exit2
+        barrier.wait();// entry
+        barrier.wait();// exit1
+        barrier.wait();// exit2
 
         failure_ratio.insert(float(failure_counter) / counter);
         tls.clear();
@@ -1436,13 +1422,10 @@ void TestArenaWorkersMigrationWithNumThreads(int n_threads = 0) {
         if (ii > 1) {
             std::multiset<float>::iterator it = failure_ratio.begin();
             std::advance(it, failure_ratio.size() / 2);
-            if (*it < 0.02)
-                break;
+            if (*it < 0.02) break;
         }
     }
-    for (int i = 0; i < n_arenas; ++i) {
-        delete observer[i];
-    }
+    for (int i = 0; i < n_arenas; ++i) { delete observer[i]; }
     // check if median is so big
     std::multiset<float>::iterator it = failure_ratio.begin();
     std::advance(it, failure_ratio.size() / 2);
@@ -1455,9 +1438,7 @@ void TestArenaWorkersMigrationWithNumThreads(int n_threads = 0) {
 
 void TestArenaWorkersMigration() {
     TestArenaWorkersMigrationWithNumThreads(4);
-    if (tbb::this_task_arena::max_concurrency() != 4) {
-        TestArenaWorkersMigrationWithNumThreads();
-    }
+    if (tbb::this_task_arena::max_concurrency() != 4) { TestArenaWorkersMigrationWithNumThreads(); }
 }
 
 //--------------------------------------------------//
@@ -1467,21 +1448,29 @@ void TestDefaultCreatedWorkersAmount() {
         REQUIRE_MESSAGE(idx == 0, "more than 1 thread is going to reset TLS");
         utils::SpinBarrier barrier(threads);
         ResetTLS();
-        for (auto blocked : { false, true }) {
+        for (auto blocked : {false, true}) {
             for (int trail = 0; trail < (blocked ? 10 : 10000); ++trail) {
-                tbb::parallel_for(0, threads, [threads, blocked, &barrier](int) {
-                    CHECK_FAST_MESSAGE(threads == tbb::this_task_arena::max_concurrency(), "concurrency level is not equal specified threadnum");
-                    CHECK_FAST_MESSAGE(tbb::this_task_arena::current_thread_index() < tbb::this_task_arena::max_concurrency(), "amount of created threads is more than specified by default");
-                    local_id.local() = 1;
-                    if (blocked) {
-                        // If there is more threads than expected, 'sleep' gives a chance to join unexpected threads.
-                        utils::Sleep(1);
-                        barrier.wait();
-                    }
-                }, tbb::simple_partitioner());
-                REQUIRE_MESSAGE(local_id.size() <= size_t(threads), "amount of created threads is not equal to default num");
+                tbb::parallel_for(
+                        0, threads,
+                        [threads, blocked, &barrier](int) {
+                            CHECK_FAST_MESSAGE(threads == tbb::this_task_arena::max_concurrency(),
+                                               "concurrency level is not equal specified threadnum");
+                            CHECK_FAST_MESSAGE(tbb::this_task_arena::current_thread_index()
+                                                       < tbb::this_task_arena::max_concurrency(),
+                                               "amount of created threads is more than specified by default");
+                            local_id.local() = 1;
+                            if (blocked) {
+                                // If there is more threads than expected, 'sleep' gives a chance to join unexpected threads.
+                                utils::Sleep(1);
+                                barrier.wait();
+                            }
+                        },
+                        tbb::simple_partitioner());
+                REQUIRE_MESSAGE(local_id.size() <= size_t(threads),
+                                "amount of created threads is not equal to default num");
                 if (blocked) {
-                    REQUIRE_MESSAGE(local_id.size() == size_t(threads), "amount of created threads is not equal to default num");
+                    REQUIRE_MESSAGE(local_id.size() == size_t(threads),
+                                    "amount of created threads is not equal to default num");
                 }
             }
         }
@@ -1514,21 +1503,17 @@ void ExceptionInExecute() {
     int arena_concurrency = static_cast<int>(thread_number) / 2;
     tbb::task_arena test_arena(arena_concurrency, arena_concurrency);
 
-    std::atomic<int> canceled_task{};
+    std::atomic<int> canceled_task {};
 
-    auto parallel_func = [&test_arena, &canceled_task] (std::size_t) {
+    auto parallel_func = [&test_arena, &canceled_task](std::size_t) {
         for (std::size_t i = 0; i < 1000; ++i) {
             try {
                 test_arena.execute([] {
                     volatile bool suppress_unreachable_code_warning = true;
-                    if (suppress_unreachable_code_warning) {
-                        throw -1;
-                    }
+                    if (suppress_unreachable_code_warning) { throw - 1; }
                 });
                 FAIL("An exception should have thrown.");
-            } catch (int) {
-                ++canceled_task;
-            } catch (...) {
+            } catch (int) { ++canceled_task; } catch (...) {
                 FAIL("Wrong type of exception.");
             }
         }
@@ -1538,57 +1523,47 @@ void ExceptionInExecute() {
     CHECK(canceled_task == thread_number * 1000);
 }
 
-#endif // TBB_USE_EXCEPTIONS
+#endif// TBB_USE_EXCEPTIONS
 
 class simple_observer : public tbb::task_scheduler_observer {
     static std::atomic<int> idx_counter;
     int my_idx;
-    int myMaxConcurrency;   // concurrency of the associated arena
-    int myNumReservedSlots; // reserved slots in the associated arena
-    void on_scheduler_entry( bool is_worker ) override {
+    int myMaxConcurrency;  // concurrency of the associated arena
+    int myNumReservedSlots;// reserved slots in the associated arena
+    void on_scheduler_entry(bool is_worker) override {
         int current_index = tbb::this_task_arena::current_thread_index();
         CHECK(current_index < (myMaxConcurrency > 1 ? myMaxConcurrency : 2));
-        if (is_worker) {
-            CHECK(current_index >= myNumReservedSlots);
-        }
+        if (is_worker) { CHECK(current_index >= myNumReservedSlots); }
     }
-    void on_scheduler_exit( bool /*is_worker*/ ) override
-    {}
+    void on_scheduler_exit(bool /*is_worker*/) override {}
+
 public:
-    simple_observer(tbb::task_arena &a, int maxConcurrency, int numReservedSlots)
-        : tbb::task_scheduler_observer(a), my_idx(idx_counter++)
-        , myMaxConcurrency(maxConcurrency)
-        , myNumReservedSlots(numReservedSlots) {
+    simple_observer(tbb::task_arena& a, int maxConcurrency, int numReservedSlots)
+        : tbb::task_scheduler_observer(a), my_idx(idx_counter++), myMaxConcurrency(maxConcurrency),
+          myNumReservedSlots(numReservedSlots) {
         observe(true);
     }
 
-    ~simple_observer(){
-        observe(false);
-    }
+    ~simple_observer() { observe(false); }
 
     friend bool operator<(const simple_observer& lhs, const simple_observer& rhs) {
         return lhs.my_idx < rhs.my_idx;
     }
 };
 
-std::atomic<int> simple_observer::idx_counter{};
+std::atomic<int> simple_observer::idx_counter {};
 
 struct arena_handler {
-    enum arena_status {
-        alive,
-        deleting,
-        deleted
-    };
+    enum arena_status { alive, deleting, deleted };
 
     tbb::task_arena* arena;
 
-    std::atomic<arena_status> status{alive};
-    tbb::spin_rw_mutex arena_in_use{};
+    std::atomic<arena_status> status {alive};
+    tbb::spin_rw_mutex arena_in_use {};
 
     tbb::concurrent_set<simple_observer> observers;
 
-    arena_handler(tbb::task_arena* ptr) : arena(ptr)
-    {}
+    arena_handler(tbb::task_arena* ptr) : arena(ptr) {}
 
     friend bool operator<(const arena_handler& lhs, const arena_handler& rhs) {
         return lhs.arena < rhs.arena;
@@ -1612,14 +1587,14 @@ void StressTestMixFunctionality() {
     utils::FastRandom<> operation_rnd(42);
     tbb::spin_mutex random_operation_guard;
 
-    auto get_random_operation = [&operation_rnd, &random_operation_guard, operations_number] () {
+    auto get_random_operation = [&operation_rnd, &random_operation_guard, operations_number]() {
         tbb::spin_mutex::scoped_lock lock(random_operation_guard);
         return static_cast<operation_type>(operation_rnd.get() % operations_number);
     };
 
     utils::FastRandom<> arena_rnd(42);
     tbb::spin_mutex random_arena_guard;
-    auto get_random_arena = [&arena_rnd, &random_arena_guard] () {
+    auto get_random_arena = [&arena_rnd, &random_arena_guard]() {
         tbb::spin_mutex::scoped_lock lock(random_arena_guard);
         return arena_rnd.get();
     };
@@ -1630,15 +1605,14 @@ void StressTestMixFunctionality() {
 
     utils::SpinBarrier thread_barrier(thread_number);
     std::size_t max_operations = 20000;
-    std::atomic<std::size_t> curr_operation{};
+    std::atomic<std::size_t> curr_operation {};
 
     auto find_arena = [&arenas_pool](tbb::spin_rw_mutex::scoped_lock& lock) -> decltype(arenas_pool.begin()) {
         for (auto curr_arena = arenas_pool.begin(); curr_arena != arenas_pool.end(); ++curr_arena) {
             if (lock.try_acquire(curr_arena->arena_in_use, /*writer*/ false)) {
                 if (curr_arena->status == arena_handler::alive) {
                     return curr_arena;
-                }
-                else {
+                } else {
                     lock.release();
                 }
             }
@@ -1646,22 +1620,21 @@ void StressTestMixFunctionality() {
         return arenas_pool.end();
     };
 
-    auto thread_func = [&] () {
+    auto thread_func = [&]() {
         arenas_pool.emplace(new tbb::task_arena());
         thread_barrier.wait();
         while (curr_operation++ < max_operations) {
             switch (get_random_operation()) {
-                case create_arena :
-                {
+                case create_arena: {
                     arenas_pool.emplace(new tbb::task_arena());
                     break;
                 }
-                case delete_arena :
-                {
+                case delete_arena: {
                     auto curr_arena = arenas_pool.begin();
                     for (; curr_arena != arenas_pool.end(); ++curr_arena) {
                         arena_handler::arena_status curr_status = arena_handler::alive;
-                        if (curr_arena->status.compare_exchange_strong(curr_status, arena_handler::deleting)) {
+                        if (curr_arena->status.compare_exchange_strong(curr_status,
+                                                                       arena_handler::deleting)) {
                             break;
                         }
                     }
@@ -1675,9 +1648,8 @@ void StressTestMixFunctionality() {
 
                     break;
                 }
-                case attach_observer :
-                {
-                    tbb::spin_rw_mutex::scoped_lock lock{};
+                case attach_observer: {
+                    tbb::spin_rw_mutex::scoped_lock lock {};
 
                     auto curr_arena = find_arena(lock);
                     if (curr_arena != arenas_pool.end()) {
@@ -1685,8 +1657,7 @@ void StressTestMixFunctionality() {
                     }
                     break;
                 }
-                case detach_observer:
-                {
+                case detach_observer: {
                     auto arena_number = get_random_arena() % arenas_pool.size();
                     auto curr_arena = arenas_pool.begin();
                     std::advance(curr_arena, arena_number);
@@ -1700,24 +1671,22 @@ void StressTestMixFunctionality() {
 
                     break;
                 }
-                case arena_execute:
-                {
-                    tbb::spin_rw_mutex::scoped_lock lock{};
+                case arena_execute: {
+                    tbb::spin_rw_mutex::scoped_lock lock {};
                     auto curr_arena = find_arena(lock);
 
                     if (curr_arena != arenas_pool.end()) {
                         curr_arena->arena->execute([]() {
                             tbb::affinity_partitioner aff;
-                            tbb::parallel_for(0, 10000, utils::DummyBody(10), tbb::auto_partitioner{});
+                            tbb::parallel_for(0, 10000, utils::DummyBody(10), tbb::auto_partitioner {});
                             tbb::parallel_for(0, 10000, utils::DummyBody(10), aff);
                         });
                     }
 
                     break;
                 }
-                case enqueue_task:
-                {
-                    tbb::spin_rw_mutex::scoped_lock lock{};
+                case enqueue_task: {
+                    tbb::spin_rw_mutex::scoped_lock lock {};
                     auto curr_arena = find_arena(lock);
 
                     if (curr_arena != arenas_pool.end()) {
@@ -1726,15 +1695,13 @@ void StressTestMixFunctionality() {
 
                     break;
                 }
-                case last_operation_marker :
-                break;
+                case last_operation_marker:
+                    break;
             }
         }
     };
 
-    for (std::size_t i = 0; i < thread_number - 1; ++i) {
-        thread_pool.emplace_back(thread_func);
-    }
+    for (std::size_t i = 0; i < thread_number - 1; ++i) { thread_pool.emplace_back(thread_func); }
 
     thread_func();
 
@@ -1748,16 +1715,17 @@ void StressTestMixFunctionality() {
 }
 
 struct enqueue_test_helper {
-    enqueue_test_helper(tbb::task_arena& arena, tbb::enumerable_thread_specific<bool>& ets , std::atomic<std::size_t>& task_counter)
-        : my_arena(arena), my_ets(ets), my_task_counter(task_counter)
-    {}
+    enqueue_test_helper(tbb::task_arena& arena, tbb::enumerable_thread_specific<bool>& ets,
+                        std::atomic<std::size_t>& task_counter)
+        : my_arena(arena), my_ets(ets), my_task_counter(task_counter) {}
 
-    enqueue_test_helper(const enqueue_test_helper& ef) : my_arena(ef.my_arena), my_ets(ef.my_ets), my_task_counter(ef.my_task_counter)
-    {}
+    enqueue_test_helper(const enqueue_test_helper& ef)
+        : my_arena(ef.my_arena), my_ets(ef.my_ets), my_task_counter(ef.my_task_counter) {}
 
-    void operator() () const {
+    void operator()() const {
         CHECK(my_ets.local());
-        if (my_task_counter++ < 100000) my_arena.enqueue(enqueue_test_helper(my_arena, my_ets, my_task_counter));
+        if (my_task_counter++ < 100000)
+            my_arena.enqueue(enqueue_test_helper(my_arena, my_ets, my_task_counter));
         utils::yield();
     }
 
@@ -1770,8 +1738,8 @@ void test_threads_sleep(int concurrency, int reserved_slots, int num_external_th
     tbb::task_arena a(concurrency, reserved_slots);
     std::mutex m;
     std::condition_variable cond_var;
-    bool completed{ false };
-    utils::SpinBarrier barrier( concurrency - reserved_slots + 1 );
+    bool completed {false};
+    utils::SpinBarrier barrier(concurrency - reserved_slots + 1);
 
     auto body = [&] {
         std::unique_lock<std::mutex> lock(m);
@@ -1795,9 +1763,7 @@ void test_threads_sleep(int concurrency, int reserved_slots, int num_external_th
         completed = true;
         cond_var.notify_all();
     }
-    for (auto& t : threads) {
-        t.join();
-    }
+    for (auto& t : threads) { t.join(); }
     barrier.wait();
 }
 
@@ -1811,64 +1777,51 @@ void test_threads_sleep(int concurrency, int reserved_slots) {
 // This test requires TBB in an uninitialized state
 //! \brief \ref requirement
 TEST_CASE("task_arena initialize soft limit ignoring affinity mask") {
-    REQUIRE_MESSAGE((tbb::this_task_arena::current_thread_index() == tbb::task_arena::not_initialized), "TBB was initialized state");
+    REQUIRE_MESSAGE((tbb::this_task_arena::current_thread_index() == tbb::task_arena::not_initialized),
+                    "TBB was initialized state");
     tbb::enumerable_thread_specific<int> ets;
 
     tbb::task_arena arena(int(utils::get_platform_max_threads() * 2));
     arena.execute([&ets] {
-        tbb::parallel_for(0, 10000000, [&ets](int){
+        tbb::parallel_for(0, 10000000, [&ets](int) {
             ets.local() = 1;
             utils::doDummyWork(100);
         });
     });
 
-    CHECK(ets.combine(std::plus<int>{}) <= int(utils::get_platform_max_threads()));
+    CHECK(ets.combine(std::plus<int> {}) <= int(utils::get_platform_max_threads()));
 }
 
 //! Test for task arena in concurrent cases
 //! \brief \ref requirement
-TEST_CASE("Test for concurrent functionality") {
-    TestConcurrentFunctionality();
-}
+TEST_CASE("Test for concurrent functionality") { TestConcurrentFunctionality(); }
 
 #if !EMSCRIPTEN
 //! For emscripten, FPU control state has not been set correctly
 //! Test for arena entry consistency
 //! \brief \ref requirement \ref error_guessing
-TEST_CASE("Test for task arena entry consistency") {
-    TestArenaEntryConsistency();
-}
+TEST_CASE("Test for task arena entry consistency") { TestArenaEntryConsistency(); }
 #endif
 
 //! Test for task arena attach functionality
 //! \brief \ref requirement \ref interface
-TEST_CASE("Test for the attach functionality") {
-    TestAttach(4);
-}
+TEST_CASE("Test for the attach functionality") { TestAttach(4); }
 
 //! Test for constant functor requirements
 //! \brief \ref requirement \ref interface
-TEST_CASE("Test for constant functor requirement") {
-    TestConstantFunctorRequirement();
-}
+TEST_CASE("Test for constant functor requirement") { TestConstantFunctorRequirement(); }
 
 //! Test for move semantics support
 //! \brief \ref requirement \ref interface
-TEST_CASE("Move semantics support") {
-    TestMoveSemantics();
-}
+TEST_CASE("Move semantics support") { TestMoveSemantics(); }
 
 //! Test for different return value types
 //! \brief \ref requirement \ref interface
-TEST_CASE("Return value test") {
-    TestReturnValue();
-}
+TEST_CASE("Return value test") { TestReturnValue(); }
 
 //! Test for delegated task spawn in case of unsuccessful slot attach
 //! \brief \ref error_guessing
-TEST_CASE("Delegated spawn wait") {
-    TestDelegatedSpawnWait();
-}
+TEST_CASE("Delegated spawn wait") { TestDelegatedSpawnWait(); }
 
 #if !EMSCRIPTEN
 //! For emscripten, FPU control state has not been set correctly
@@ -1876,51 +1829,39 @@ TEST_CASE("Delegated spawn wait") {
 //! \brief \ref requirement \ref interface
 TEST_CASE("Isolated execute") {
     // Isolation tests cases is valid only for more then 2 threads
-    if (tbb::this_task_arena::max_concurrency() > 2) {
-        TestIsolatedExecute();
-    }
+    if (tbb::this_task_arena::max_concurrency() > 2) { TestIsolatedExecute(); }
 }
 #endif
 
 //! Test for TBB Workers creation limits
 //! \brief \ref requirement
-TEST_CASE("Default workers limit") {
-    TestDefaultWorkersLimit();
-}
+TEST_CASE("Default workers limit") { TestDefaultWorkersLimit(); }
 
 //! Test for workers migration between arenas
 //! \brief \ref error_guessing \ref stress
-TEST_CASE("Arena workers migration") {
-    TestArenaWorkersMigration();
-}
+TEST_CASE("Arena workers migration") { TestArenaWorkersMigration(); }
 
 #if !EMSCRIPTEN
 //! For emscripten, FPU control state has not been set correctly
 //! Test for multiple waits, threads should not block each other
 //! \brief \ref requirement
-TEST_CASE("Multiple waits") {
-    TestMultipleWaits();
-}
+TEST_CASE("Multiple waits") { TestMultipleWaits(); }
 #endif
 
 //! Test for small stack size settings and arena initialization
 //! \brief \ref error_guessing
-TEST_CASE("Small stack size") {
-    TestSmallStackSize();
-}
+TEST_CASE("Small stack size") { TestSmallStackSize(); }
 
 #if TBB_USE_EXCEPTIONS
 //! \brief \ref requirement \ref stress
-TEST_CASE("Test for exceptions during execute.") {
-    ExceptionInExecute();
-}
+TEST_CASE("Test for exceptions during execute.") { ExceptionInExecute(); }
 
 //! \brief \ref error_guessing
 TEST_CASE("Exception thrown during tbb::task_arena::execute call") {
     struct throwing_obj {
         throwing_obj() {
             volatile bool flag = true;
-            if (flag) throw std::exception{};
+            if (flag) throw std::exception {};
         }
         throwing_obj(const throwing_obj&) = default;
         ~throwing_obj() { FAIL("An destructor was called."); }
@@ -1928,18 +1869,12 @@ TEST_CASE("Exception thrown during tbb::task_arena::execute call") {
 
     tbb::task_arena arena;
 
-    REQUIRE_THROWS_AS( [&] {
-        arena.execute([] {
-            return throwing_obj{};
-        });
-    }(), std::exception );
+    REQUIRE_THROWS_AS([&] { arena.execute([] { return throwing_obj {}; }); }(), std::exception);
 }
-#endif // TBB_USE_EXCEPTIONS
+#endif// TBB_USE_EXCEPTIONS
 
 //! \brief \ref stress
-TEST_CASE("Stress test with mixing functionality") {
-    StressTestMixFunctionality();
-}
+TEST_CASE("Stress test with mixing functionality") { StressTestMixFunctionality(); }
 
 // global_control::max_allowed_parallelism functionality is not covered by TCM
 #if !__TBB_TCM_TESTING_ENABLED
@@ -1953,17 +1888,15 @@ TEST_CASE("Workers oversubscription") {
     utils::SpinBarrier barrier(num_threads * 2);
 
     arena.execute([&] {
-        tbb::parallel_for(std::size_t(0), num_threads * 2,
-            [&] (const std::size_t&) {
-                ets.local() = true;
-                barrier.wait();
-            }
-        );
+        tbb::parallel_for(std::size_t(0), num_threads * 2, [&](const std::size_t&) {
+            ets.local() = true;
+            barrier.wait();
+        });
     });
 
     utils::yield();
 
-    std::atomic<std::size_t> task_counter{0};
+    std::atomic<std::size_t> task_counter {0};
     for (std::size_t i = 0; i < num_threads / 4 + 1; ++i) {
         arena.enqueue(enqueue_test_helper(arena, ets, task_counter));
     }
@@ -1971,12 +1904,10 @@ TEST_CASE("Workers oversubscription") {
     while (task_counter < 100000) utils::yield();
 
     arena.execute([&] {
-        tbb::parallel_for(std::size_t(0), num_threads * 2,
-            [&] (const std::size_t&) {
-                CHECK(ets.local());
-                barrier.wait();
-            }
-        );
+        tbb::parallel_for(std::size_t(0), num_threads * 2, [&](const std::size_t&) {
+            CHECK(ets.local());
+            barrier.wait();
+        });
     });
 }
 #endif
@@ -1985,13 +1916,16 @@ TEST_CASE("Workers oversubscription") {
 //! The test for error in scheduling empty task_handle
 //! \brief \ref requirement
 TEST_CASE("Empty task_handle cannot be scheduled"
-        * doctest::should_fail()    //Test needs to revised as implementation uses assertions instead of exceptions
-        * doctest::skip()           //skip the test for now, to not pollute the test log
-){
+          * doctest::
+                  should_fail()//Test needs to revised as implementation uses assertions instead of exceptions
+          * doctest::skip()    //skip the test for now, to not pollute the test log
+) {
     tbb::task_arena ta;
 
-    CHECK_THROWS_WITH_AS(ta.enqueue(tbb::task_handle{}),                    "Attempt to schedule empty task_handle", std::runtime_error);
-    CHECK_THROWS_WITH_AS(tbb::this_task_arena::enqueue(tbb::task_handle{}), "Attempt to schedule empty task_handle", std::runtime_error);
+    CHECK_THROWS_WITH_AS(ta.enqueue(tbb::task_handle {}), "Attempt to schedule empty task_handle",
+                         std::runtime_error);
+    CHECK_THROWS_WITH_AS(tbb::this_task_arena::enqueue(tbb::task_handle {}),
+                         "Attempt to schedule empty task_handle", std::runtime_error);
 }
 #endif
 
@@ -2003,7 +1937,7 @@ TEST_CASE("Test threads sleep") {
         int conc = int(concurrency_level);
         test_threads_sleep(conc, 0);
         test_threads_sleep(conc, 1);
-        test_threads_sleep(conc, conc/2);
+        test_threads_sleep(conc, conc / 2);
         test_threads_sleep(conc, conc);
     }
 }
@@ -2013,25 +1947,23 @@ TEST_CASE("Test threads sleep") {
 
 //! Basic test for is_inside_task in task_group
 //! \brief \ref interface \ref requirement
-TEST_CASE("is_inside_task in task_group"){
-    CHECK( false == tbb::is_inside_task());
+TEST_CASE("is_inside_task in task_group") {
+    CHECK(false == tbb::is_inside_task());
 
     tbb::task_group tg;
-    tg.run_and_wait([&]{
-        CHECK( true == tbb::is_inside_task());
-    });
+    tg.run_and_wait([&] { CHECK(true == tbb::is_inside_task()); });
 }
 
 //! Basic test for is_inside_task in arena::execute
 //! \brief \ref interface \ref requirement
-TEST_CASE("is_inside_task in arena::execute"){
-    CHECK( false == tbb::is_inside_task());
+TEST_CASE("is_inside_task in arena::execute") {
+    CHECK(false == tbb::is_inside_task());
 
     tbb::task_arena arena;
 
-    arena.execute([&]{
+    arena.execute([&] {
         // The execute method is processed outside of any task
-        CHECK( false == tbb::is_inside_task());
+        CHECK(false == tbb::is_inside_task());
     });
 }
 
@@ -2049,16 +1981,14 @@ TEST_CASE("is_inside_task in arena::execute") {
         });
     });
 }
-#endif //__TBB_PREVIEW_TASK_GROUP_EXTENSIONS
+#endif//__TBB_PREVIEW_TASK_GROUP_EXTENSIONS
 
 //! \brief \ref interface \ref requirement \ref regression
 TEST_CASE("worker threads occupy slots in correct range") {
     std::vector<tbb::task_arena> arenas(42);
-    for (auto& arena : arenas) {
-        arena.initialize(1, 0);
-    }
+    for (auto& arena : arenas) { arena.initialize(1, 0); }
 
-    std::atomic<int> counter{0};
+    std::atomic<int> counter {0};
     for (auto& arena : arenas) {
         arena.enqueue([&] {
             CHECK(tbb::this_task_arena::current_thread_index() == 0);
diff --git a/external/tbb/test/tbb/test_task_group.cpp b/external/tbb/test/tbb/test_task_group.cpp
index 5ad8355a..7f077998 100644
--- a/external/tbb/test/tbb/test_task_group.cpp
+++ b/external/tbb/test/tbb/test_task_group.cpp
@@ -40,32 +40,26 @@ unsigned MaxThread = 4;
 
 #include "common/spin_barrier.h"
 
-enum SharingMode {
-    VagabondGroup = 1,
-    ParallelWait = 2
-};
+enum SharingMode { VagabondGroup = 1, ParallelWait = 2 };
 
-template<typename task_group_type>
+template <typename task_group_type>
 class SharedGroupBodyImpl : utils::NoCopy, utils::NoAfterlife {
-    static const std::uintptr_t c_numTasks0 = 4096,
-                        c_numTasks1 = 1024;
+    static const std::uintptr_t c_numTasks0 = 4096, c_numTasks1 = 1024;
 
     const std::uintptr_t m_numThreads;
     const std::uintptr_t m_sharingMode;
 
-    task_group_type *m_taskGroup;
-    atomic_t m_tasksSpawned,
-             m_threadsReady;
+    task_group_type* m_taskGroup;
+    atomic_t m_tasksSpawned, m_threadsReady;
     utils::SpinBarrier m_barrier;
 
     static atomic_t s_tasksExecuted;
 
     struct TaskFunctor {
-        SharedGroupBodyImpl *m_pOwner;
-        void operator () () const {
-            if ( m_pOwner->m_sharingMode & ParallelWait ) {
-                while ( utils::ConcurrencyTracker::PeakParallelism() < m_pOwner->m_numThreads )
-                    utils::yield();
+        SharedGroupBodyImpl* m_pOwner;
+        void operator()() const {
+            if (m_pOwner->m_sharingMode & ParallelWait) {
+                while (utils::ConcurrencyTracker::PeakParallelism() < m_pOwner->m_numThreads) utils::yield();
             }
             ++s_tasksExecuted;
         }
@@ -73,52 +67,48 @@ class SharedGroupBodyImpl : utils::NoCopy, utils::NoAfterlife {
 
     TaskFunctor m_taskFunctor;
 
-    void Spawn ( std::uintptr_t numTasks ) {
-        for ( std::uintptr_t i = 0; i < numTasks; ++i ) {
+    void Spawn(std::uintptr_t numTasks) {
+        for (std::uintptr_t i = 0; i < numTasks; ++i) {
             ++m_tasksSpawned;
             utils::ConcurrencyTracker ct;
-            m_taskGroup->run( m_taskFunctor );
+            m_taskGroup->run(m_taskFunctor);
         }
         ++m_threadsReady;
     }
 
-    void DeleteTaskGroup () {
+    void DeleteTaskGroup() {
         delete m_taskGroup;
         m_taskGroup = nullptr;
     }
 
-    void Wait () {
-        while ( m_threadsReady != m_numThreads )
-            utils::yield();
+    void Wait() {
+        while (m_threadsReady != m_numThreads) utils::yield();
         const std::uintptr_t numSpawned = c_numTasks0 + c_numTasks1 * (m_numThreads - 1);
-        CHECK_MESSAGE( m_tasksSpawned == numSpawned, "Wrong number of spawned tasks. The test is broken" );
-        INFO("Max spawning parallelism is " << utils::ConcurrencyTracker::PeakParallelism() << "out of " << g_MaxConcurrency);
-        if ( m_sharingMode & ParallelWait ) {
-            m_barrier.wait( &utils::ConcurrencyTracker::Reset );
+        CHECK_MESSAGE(m_tasksSpawned == numSpawned, "Wrong number of spawned tasks. The test is broken");
+        INFO("Max spawning parallelism is " << utils::ConcurrencyTracker::PeakParallelism() << "out of "
+                                            << g_MaxConcurrency);
+        if (m_sharingMode & ParallelWait) {
+            m_barrier.wait(&utils::ConcurrencyTracker::Reset);
             {
                 utils::ConcurrencyTracker ct;
                 m_taskGroup->wait();
             }
-            if ( utils::ConcurrencyTracker::PeakParallelism() == 1 ) {
+            if (utils::ConcurrencyTracker::PeakParallelism() == 1) {
                 const char* msg = "Warning: No parallel waiting detected in TestParallelWait";
-                WARN( msg );
+                WARN(msg);
             }
             m_barrier.wait();
-        }
-        else
+        } else
             m_taskGroup->wait();
-        CHECK_MESSAGE( m_tasksSpawned == numSpawned, "No tasks should be spawned after wait starts. The test is broken" );
-        CHECK_MESSAGE( s_tasksExecuted == numSpawned, "Not all spawned tasks were executed" );
+        CHECK_MESSAGE(m_tasksSpawned == numSpawned,
+                      "No tasks should be spawned after wait starts. The test is broken");
+        CHECK_MESSAGE(s_tasksExecuted == numSpawned, "Not all spawned tasks were executed");
     }
 
 public:
-    SharedGroupBodyImpl ( std::uintptr_t numThreads, std::uintptr_t sharingMode = 0 )
-        : m_numThreads(numThreads)
-        , m_sharingMode(sharingMode)
-        , m_taskGroup(nullptr)
-        , m_barrier(numThreads)
-    {
-        CHECK_MESSAGE( m_numThreads > 1, "SharedGroupBody tests require concurrency" );
+    SharedGroupBodyImpl(std::uintptr_t numThreads, std::uintptr_t sharingMode = 0)
+        : m_numThreads(numThreads), m_sharingMode(sharingMode), m_taskGroup(nullptr), m_barrier(numThreads) {
+        CHECK_MESSAGE(m_numThreads > 1, "SharedGroupBody tests require concurrency");
         if ((m_sharingMode & VagabondGroup) && m_numThreads != 2) {
             CHECK_MESSAGE(false, "In vagabond mode SharedGroupBody must be used with 2 threads only");
         }
@@ -129,29 +119,25 @@ class SharedGroupBodyImpl : utils::NoCopy, utils::NoAfterlife {
         m_taskFunctor.m_pOwner = this;
     }
 
-    void Run ( std::uintptr_t idx ) {
+    void Run(std::uintptr_t idx) {
         AssertLive();
-        if ( idx == 0 ) {
+        if (idx == 0) {
             if (m_taskGroup || m_tasksSpawned) {
                 CHECK_MESSAGE(false, "SharedGroupBody must be reset before reuse");
             }
             m_taskGroup = new task_group_type;
-            Spawn( c_numTasks0 );
+            Spawn(c_numTasks0);
             Wait();
-            if ( m_sharingMode & VagabondGroup )
-                m_barrier.wait();
+            if (m_sharingMode & VagabondGroup) m_barrier.wait();
             else
                 DeleteTaskGroup();
-        }
-        else {
-            while ( m_tasksSpawned == 0 )
-                utils::yield();
-            CHECK_MESSAGE ( m_taskGroup, "Task group is not initialized");
-            Spawn (c_numTasks1);
-            if ( m_sharingMode & ParallelWait )
-                Wait();
-            if ( m_sharingMode & VagabondGroup ) {
-                CHECK_MESSAGE ( idx == 1, "In vagabond mode SharedGroupBody must be used with 2 threads only" );
+        } else {
+            while (m_tasksSpawned == 0) utils::yield();
+            CHECK_MESSAGE(m_taskGroup, "Task group is not initialized");
+            Spawn(c_numTasks1);
+            if (m_sharingMode & ParallelWait) Wait();
+            if (m_sharingMode & VagabondGroup) {
+                CHECK_MESSAGE(idx == 1, "In vagabond mode SharedGroupBody must be used with 2 threads only");
                 m_barrier.wait();
                 DeleteTaskGroup();
             }
@@ -160,44 +146,39 @@ class SharedGroupBodyImpl : utils::NoCopy, utils::NoAfterlife {
     }
 };
 
-template<typename task_group_type>
+template <typename task_group_type>
 atomic_t SharedGroupBodyImpl<task_group_type>::s_tasksExecuted;
 
-template<typename task_group_type>
-class  SharedGroupBody : utils::NoAssign, utils::NoAfterlife {
+template <typename task_group_type>
+class SharedGroupBody : utils::NoAssign, utils::NoAfterlife {
     bool m_bOwner;
-    SharedGroupBodyImpl<task_group_type> *m_pImpl;
+    SharedGroupBodyImpl<task_group_type>* m_pImpl;
+
 public:
-    SharedGroupBody ( std::uintptr_t numThreads, std::uintptr_t sharingMode = 0 )
-        : utils::NoAssign()
-        , utils::NoAfterlife()
-        , m_bOwner(true)
-        , m_pImpl( new SharedGroupBodyImpl<task_group_type>(numThreads, sharingMode) )
-    {}
-    SharedGroupBody ( const SharedGroupBody& src )
-        : utils::NoAssign()
-        , utils::NoAfterlife()
-        , m_bOwner(false)
-        , m_pImpl(src.m_pImpl)
-    {}
-    ~SharedGroupBody () {
-        if ( m_bOwner )
-            delete m_pImpl;
+    SharedGroupBody(std::uintptr_t numThreads, std::uintptr_t sharingMode = 0)
+        : utils::NoAssign(), utils::NoAfterlife(), m_bOwner(true),
+          m_pImpl(new SharedGroupBodyImpl<task_group_type>(numThreads, sharingMode)) {}
+    SharedGroupBody(const SharedGroupBody& src)
+        : utils::NoAssign(), utils::NoAfterlife(), m_bOwner(false), m_pImpl(src.m_pImpl) {}
+    ~SharedGroupBody() {
+        if (m_bOwner) delete m_pImpl;
     }
-    void operator() ( std::uintptr_t idx ) const {
+    void operator()(std::uintptr_t idx) const {
         // Wrap the functior into additional task group to enforce bounding.
         task_group_type tg;
         tg.run_and_wait([&] { m_pImpl->Run(idx); });
     }
 };
 
-template<typename task_group_type>
+template <typename task_group_type>
 class RunAndWaitSyncronizationTestBody : utils::NoAssign {
     utils::SpinBarrier& m_barrier;
     std::atomic<bool>& m_completed;
     task_group_type& m_tg;
+
 public:
-    RunAndWaitSyncronizationTestBody(utils::SpinBarrier& barrier, std::atomic<bool>& completed, task_group_type& tg)
+    RunAndWaitSyncronizationTestBody(utils::SpinBarrier& barrier, std::atomic<bool>& completed,
+                                     task_group_type& tg)
         : m_barrier(barrier), m_completed(completed), m_tg(tg) {}
 
     void operator()() const {
@@ -212,37 +193,38 @@ class RunAndWaitSyncronizationTestBody : utils::NoAssign {
         } else {
             m_barrier.wait();
             m_tg.wait();
-            CHECK_MESSAGE(m_completed, "A concurrent waiter has left the wait method earlier than work has finished");
+            CHECK_MESSAGE(m_completed,
+                          "A concurrent waiter has left the wait method earlier than work has finished");
         }
     }
 };
 
-template<typename task_group_type>
-void TestParallelSpawn () {
-    NativeParallelFor( g_MaxConcurrency, SharedGroupBody<task_group_type>(g_MaxConcurrency) );
+template <typename task_group_type>
+void TestParallelSpawn() {
+    NativeParallelFor(g_MaxConcurrency, SharedGroupBody<task_group_type>(g_MaxConcurrency));
 }
 
-template<typename task_group_type>
-void TestParallelWait () {
-    NativeParallelFor( g_MaxConcurrency, SharedGroupBody<task_group_type>(g_MaxConcurrency, ParallelWait) );
+template <typename task_group_type>
+void TestParallelWait() {
+    NativeParallelFor(g_MaxConcurrency, SharedGroupBody<task_group_type>(g_MaxConcurrency, ParallelWait));
 
     utils::SpinBarrier barrier(g_MaxConcurrency);
     std::atomic<bool> completed;
     completed = false;
     task_group_type tg;
     RunAndWaitSyncronizationTestBody<task_group_type> b(barrier, completed, tg);
-    NativeParallelFor( g_MaxConcurrency, b );
+    NativeParallelFor(g_MaxConcurrency, b);
 }
 
 // Tests non-stack-bound task group (the group that is allocated by one thread and destroyed by the other)
-template<typename task_group_type>
-void TestVagabondGroup () {
-    NativeParallelFor( 2, SharedGroupBody<task_group_type>(2, VagabondGroup) );
+template <typename task_group_type>
+void TestVagabondGroup() {
+    NativeParallelFor(2, SharedGroupBody<task_group_type>(2, VagabondGroup));
 }
 
 #include "common/memory_usage.h"
 
-template<typename task_group_type>
+template <typename task_group_type>
 void TestThreadSafety() {
     auto tests = [] {
         for (int trail = 0; trail < 10; ++trail) {
@@ -260,9 +242,7 @@ void TestThreadSafety() {
     for (;;) {
         tests();
         std::size_t current = utils::GetMemoryUsage();
-        if (current <= initial) {
-            return;
-        }
+        if (current <= initial) { return; }
         initial = current;
     }
 }
@@ -275,28 +255,28 @@ const std::uintptr_t F = 6765;
 
 atomic_t g_Sum;
 
-#define FIB_TEST_PROLOGUE() \
-    const unsigned numRepeats = g_MaxConcurrency * 4;    \
+#define FIB_TEST_PROLOGUE()                                                                                  \
+    const unsigned numRepeats = g_MaxConcurrency * 4;                                                        \
     utils::ConcurrencyTracker::Reset()
 
-#define FIB_TEST_EPILOGUE(sum) \
-    CHECK(utils::ConcurrencyTracker::PeakParallelism() <= g_MaxConcurrency); \
-    CHECK( sum == numRepeats * F );
-
+#define FIB_TEST_EPILOGUE(sum)                                                                               \
+    CHECK(utils::ConcurrencyTracker::PeakParallelism() <= g_MaxConcurrency);                                 \
+    CHECK(sum == numRepeats * F);
 
 // Fibonacci tasks specified as functors
-template<class task_group_type>
+template <class task_group_type>
 class FibTaskBase : utils::NoAssign, utils::NoAfterlife {
 protected:
     std::uintptr_t* m_pRes;
     mutable std::uintptr_t m_Num;
     virtual void impl() const = 0;
+
 public:
-    FibTaskBase( std::uintptr_t* y, std::uintptr_t n ) : m_pRes(y), m_Num(n) {}
+    FibTaskBase(std::uintptr_t* y, std::uintptr_t n) : m_pRes(y), m_Num(n) {}
     void operator()() const {
         utils::ConcurrencyTracker ct;
         AssertLive();
-        if( m_Num < 2 ) {
+        if (m_Num < 2) {
             *m_pRes = m_Num;
         } else {
             impl();
@@ -305,97 +285,98 @@ class FibTaskBase : utils::NoAssign, utils::NoAfterlife {
     virtual ~FibTaskBase() {}
 };
 
-template<class task_group_type>
+template <class task_group_type>
 class FibTaskAsymmetricTreeWithFunctor : public FibTaskBase<task_group_type> {
 public:
-    FibTaskAsymmetricTreeWithFunctor( std::uintptr_t* y, std::uintptr_t n ) : FibTaskBase<task_group_type>(y, n) {}
+    FibTaskAsymmetricTreeWithFunctor(std::uintptr_t* y, std::uintptr_t n)
+        : FibTaskBase<task_group_type>(y, n) {}
     virtual void impl() const override {
         std::uintptr_t x = ~0u;
         task_group_type tg;
-        tg.run( FibTaskAsymmetricTreeWithFunctor(&x, this->m_Num-1) );
-        this->m_Num -= 2; tg.run_and_wait( *this );
+        tg.run(FibTaskAsymmetricTreeWithFunctor(&x, this->m_Num - 1));
+        this->m_Num -= 2;
+        tg.run_and_wait(*this);
         *(this->m_pRes) += x;
     }
 };
 
-template<class task_group_type>
+template <class task_group_type>
 class FibTaskSymmetricTreeWithFunctor : public FibTaskBase<task_group_type> {
 public:
-    FibTaskSymmetricTreeWithFunctor( std::uintptr_t* y, std::uintptr_t n ) : FibTaskBase<task_group_type>(y, n) {}
+    FibTaskSymmetricTreeWithFunctor(std::uintptr_t* y, std::uintptr_t n)
+        : FibTaskBase<task_group_type>(y, n) {}
     virtual void impl() const override {
-        std::uintptr_t x = ~0u,
-               y = ~0u;
+        std::uintptr_t x = ~0u, y = ~0u;
         task_group_type tg;
-        tg.run( FibTaskSymmetricTreeWithFunctor(&x, this->m_Num-1) );
-        tg.run( FibTaskSymmetricTreeWithFunctor(&y, this->m_Num-2) );
+        tg.run(FibTaskSymmetricTreeWithFunctor(&x, this->m_Num - 1));
+        tg.run(FibTaskSymmetricTreeWithFunctor(&y, this->m_Num - 2));
         tg.wait();
         *(this->m_pRes) = x + y;
     }
 };
 
 // Helper functions
-template<class fib_task>
+template <class fib_task>
 std::uintptr_t RunFibTask(std::uintptr_t n) {
     std::uintptr_t res = ~0u;
     fib_task(&res, n)();
     return res;
 }
 
-template<typename fib_task>
+template <typename fib_task>
 void RunFibTest() {
     FIB_TEST_PROLOGUE();
     std::uintptr_t sum = 0;
-    for( unsigned i = 0; i < numRepeats; ++i )
-        sum += RunFibTask<fib_task>(N);
+    for (unsigned i = 0; i < numRepeats; ++i) sum += RunFibTask<fib_task>(N);
     FIB_TEST_EPILOGUE(sum);
 }
 
-template<typename fib_task>
+template <typename fib_task>
 void FibFunctionNoArgs() {
     g_Sum += RunFibTask<fib_task>(N);
 }
 
-template<typename task_group_type>
+template <typename task_group_type>
 void TestFibWithLambdas() {
     FIB_TEST_PROLOGUE();
     atomic_t sum;
     sum = 0;
     task_group_type tg;
-    for( unsigned i = 0; i < numRepeats; ++i )
-        tg.run( [&](){sum += RunFibTask<FibTaskSymmetricTreeWithFunctor<task_group_type> >(N);} );
+    for (unsigned i = 0; i < numRepeats; ++i)
+        tg.run([&]() { sum += RunFibTask<FibTaskSymmetricTreeWithFunctor<task_group_type>>(N); });
     tg.wait();
     FIB_TEST_EPILOGUE(sum);
 }
 
-template<typename task_group_type>
+template <typename task_group_type>
 void TestFibWithFunctor() {
-    RunFibTest<FibTaskAsymmetricTreeWithFunctor<task_group_type> >();
-    RunFibTest< FibTaskSymmetricTreeWithFunctor<task_group_type> >();
+    RunFibTest<FibTaskAsymmetricTreeWithFunctor<task_group_type>>();
+    RunFibTest<FibTaskSymmetricTreeWithFunctor<task_group_type>>();
 }
 
-template<typename task_group_type>
+template <typename task_group_type>
 void TestFibWithFunctionPtr() {
     FIB_TEST_PROLOGUE();
     g_Sum = 0;
     task_group_type tg;
-    for( unsigned i = 0; i < numRepeats; ++i )
-        tg.run( &FibFunctionNoArgs<FibTaskSymmetricTreeWithFunctor<task_group_type> > );
+    for (unsigned i = 0; i < numRepeats; ++i)
+        tg.run(&FibFunctionNoArgs<FibTaskSymmetricTreeWithFunctor<task_group_type>>);
     tg.wait();
     FIB_TEST_EPILOGUE(g_Sum);
 }
 
-template<typename task_group_type>
+template <typename task_group_type>
 void RunFibonacciTests() {
     TestFibWithLambdas<task_group_type>();
     TestFibWithFunctor<task_group_type>();
     TestFibWithFunctionPtr<task_group_type>();
 }
 
-class test_exception : public std::exception
-{
+class test_exception : public std::exception {
     const char* m_strDescription;
+
 public:
-    test_exception ( const char* descr ) : m_strDescription(descr) {}
+    test_exception(const char* descr) : m_strDescription(descr) {}
 
     const char* what() const noexcept override { return m_strDescription; }
 };
@@ -404,10 +385,10 @@ using TestException = test_exception;
 
 #include <string.h>
 
-#define NUM_CHORES      512
-#define NUM_GROUPS      64
-#define SKIP_CHORES     (NUM_CHORES/4)
-#define SKIP_GROUPS     (NUM_GROUPS/4)
+#define NUM_CHORES 512
+#define NUM_GROUPS 64
+#define SKIP_CHORES (NUM_CHORES / 4)
+#define SKIP_GROUPS (NUM_GROUPS / 4)
 #define EXCEPTION_DESCR1 "Test exception 1"
 #define EXCEPTION_DESCR2 "Test exception 2"
 
@@ -418,26 +399,24 @@ bool g_Rethrow;
 bool g_Throw;
 
 class ThrowingTask : utils::NoAssign, utils::NoAfterlife {
-    atomic_t &m_TaskCount;
+    atomic_t& m_TaskCount;
+
 public:
-    ThrowingTask( atomic_t& counter ) : m_TaskCount(counter) {}
-    void operator() () const {
+    ThrowingTask(atomic_t& counter) : m_TaskCount(counter) {}
+    void operator()() const {
         utils::ConcurrencyTracker ct;
         AssertLive();
-        if ( g_Throw ) {
-            if ( ++m_TaskCount == SKIP_CHORES )
-                TBB_TEST_THROW(test_exception(EXCEPTION_DESCR1));
+        if (g_Throw) {
+            if (++m_TaskCount == SKIP_CHORES) TBB_TEST_THROW(test_exception(EXCEPTION_DESCR1));
             utils::yield();
-        }
-        else {
+        } else {
             ++g_TaskCount;
-            while( !tbb::is_current_task_group_canceling() )
-                utils::yield();
+            while (!tbb::is_current_task_group_canceling()) utils::yield();
         }
     }
 };
 
-inline void ResetGlobals ( bool bThrow, bool bRethrow ) {
+inline void ResetGlobals(bool bThrow, bool bRethrow) {
     g_Throw = bThrow;
     g_Rethrow = bRethrow;
     g_ExceptionCount = 0;
@@ -445,16 +424,15 @@ inline void ResetGlobals ( bool bThrow, bool bRethrow ) {
     utils::ConcurrencyTracker::Reset();
 }
 
-template<typename task_group_type>
-void LaunchChildrenWithFunctor () {
+template <typename task_group_type>
+void LaunchChildrenWithFunctor() {
     atomic_t count;
     count = 0;
     task_group_type g;
     for (unsigned i = 0; i < NUM_CHORES; ++i) {
         if (i % 2 == 1) {
             g.run(g.defer(ThrowingTask(count)));
-        } else
-        {
+        } else {
             g.run(ThrowingTask(count));
         }
     }
@@ -463,87 +441,86 @@ void LaunchChildrenWithFunctor () {
     bool exceptionCaught = false;
     try {
         status = g.wait();
-    } catch ( TestException& e ) {
-        CHECK_MESSAGE( e.what(), "Empty what() string" );
-        CHECK_MESSAGE( strcmp(e.what(), EXCEPTION_DESCR1) == 0, "Unknown exception" );
+    } catch (TestException& e) {
+        CHECK_MESSAGE(e.what(), "Empty what() string");
+        CHECK_MESSAGE(strcmp(e.what(), EXCEPTION_DESCR1) == 0, "Unknown exception");
         exceptionCaught = true;
         ++g_ExceptionCount;
-    } catch( ... ) { CHECK_MESSAGE( false, "Unknown exception" ); }
+    } catch (...) { CHECK_MESSAGE(false, "Unknown exception"); }
     if (g_Throw && !exceptionCaught && status != tbb::canceled) {
         CHECK_MESSAGE(false, "No exception in the child task group");
     }
-    if ( g_Rethrow && g_ExceptionCount > SKIP_GROUPS ) {
-        throw test_exception(EXCEPTION_DESCR2);
-    }
+    if (g_Rethrow && g_ExceptionCount > SKIP_GROUPS) { throw test_exception(EXCEPTION_DESCR2); }
 #else
     g.wait();
 #endif
 }
 
 // Tests for cancellation and exception handling behavior
-template<typename task_group_type>
-void TestManualCancellationWithFunctor () {
-    ResetGlobals( false, false );
+template <typename task_group_type>
+void TestManualCancellationWithFunctor() {
+    ResetGlobals(false, false);
     task_group_type tg;
     for (unsigned i = 0; i < NUM_GROUPS; ++i) {
         // TBB version does not require taking function address
         if (i % 2 == 0) {
             auto h = tg.defer(&LaunchChildrenWithFunctor<task_group_type>);
             tg.run(std::move(h));
-        } else
-        {
+        } else {
             tg.run(&LaunchChildrenWithFunctor<task_group_type>);
         }
     }
-    CHECK_MESSAGE ( !tbb::is_current_task_group_canceling(), "Unexpected cancellation" );
-    while ( g_MaxConcurrency > 1 && g_TaskCount == 0 )
-        utils::yield();
+    CHECK_MESSAGE(!tbb::is_current_task_group_canceling(), "Unexpected cancellation");
+    while (g_MaxConcurrency > 1 && g_TaskCount == 0) utils::yield();
     tg.cancel();
     g_ExecutedAtCancellation = int(g_TaskCount);
     tbb::task_group_status status = tg.wait();
-    CHECK_MESSAGE( status == tbb::canceled, "Task group reported invalid status." );
-    CHECK_MESSAGE( g_TaskCount <= NUM_GROUPS * NUM_CHORES, "Too many tasks reported. The test is broken" );
-    CHECK_MESSAGE( g_TaskCount < NUM_GROUPS * NUM_CHORES, "No tasks were cancelled. Cancellation model changed?" );
-    CHECK_MESSAGE( g_TaskCount <= g_ExecutedAtCancellation + utils::ConcurrencyTracker::PeakParallelism(), "Too many tasks survived cancellation" );
+    CHECK_MESSAGE(status == tbb::canceled, "Task group reported invalid status.");
+    CHECK_MESSAGE(g_TaskCount <= NUM_GROUPS * NUM_CHORES, "Too many tasks reported. The test is broken");
+    CHECK_MESSAGE(g_TaskCount < NUM_GROUPS * NUM_CHORES,
+                  "No tasks were cancelled. Cancellation model changed?");
+    CHECK_MESSAGE(g_TaskCount <= g_ExecutedAtCancellation + utils::ConcurrencyTracker::PeakParallelism(),
+                  "Too many tasks survived cancellation");
 }
 
 #if TBB_USE_EXCEPTIONS
-template<typename task_group_type>
-void TestExceptionHandling1 () {
-    ResetGlobals( true, false );
+template <typename task_group_type>
+void TestExceptionHandling1() {
+    ResetGlobals(true, false);
     task_group_type tg;
-    for( unsigned i = 0; i < NUM_GROUPS; ++i )
+    for (unsigned i = 0; i < NUM_GROUPS; ++i)
         // TBB version does not require taking function address
-        tg.run( &LaunchChildrenWithFunctor<task_group_type> );
+        tg.run(&LaunchChildrenWithFunctor<task_group_type>);
     try {
         tg.wait();
-    } catch ( ... ) {
-        CHECK_MESSAGE( false, "Unexpected exception" );
-    }
-    CHECK_MESSAGE( g_ExceptionCount <= NUM_GROUPS, "Too many exceptions from the child groups. The test is broken" );
-    CHECK_MESSAGE( g_ExceptionCount == NUM_GROUPS, "Not all child groups threw the exception" );
+    } catch (...) { CHECK_MESSAGE(false, "Unexpected exception"); }
+    CHECK_MESSAGE(g_ExceptionCount <= NUM_GROUPS,
+                  "Too many exceptions from the child groups. The test is broken");
+    CHECK_MESSAGE(g_ExceptionCount == NUM_GROUPS, "Not all child groups threw the exception");
 }
 
-template<typename task_group_type>
-void TestExceptionHandling2 () {
-    ResetGlobals( true, true );
+template <typename task_group_type>
+void TestExceptionHandling2() {
+    ResetGlobals(true, true);
     task_group_type tg;
     bool exceptionCaught = false;
-    for( unsigned i = 0; i < NUM_GROUPS; ++i ) {
+    for (unsigned i = 0; i < NUM_GROUPS; ++i) {
         // TBB version does not require taking function address
-        tg.run( &LaunchChildrenWithFunctor<task_group_type> );
+        tg.run(&LaunchChildrenWithFunctor<task_group_type>);
     }
     try {
         tg.wait();
-    } catch ( TestException& e ) {
-        CHECK_MESSAGE( e.what(), "Empty what() string" );
-        CHECK_MESSAGE( strcmp(e.what(), EXCEPTION_DESCR2) == 0, "Unknown exception" );
+    } catch (TestException& e) {
+        CHECK_MESSAGE(e.what(), "Empty what() string");
+        CHECK_MESSAGE(strcmp(e.what(), EXCEPTION_DESCR2) == 0, "Unknown exception");
         exceptionCaught = true;
-    } catch( ... ) { CHECK_MESSAGE( false, "Unknown exception" ); }
-    CHECK_MESSAGE( exceptionCaught, "No exception thrown from the root task group" );
-    CHECK_MESSAGE( g_ExceptionCount >= SKIP_GROUPS, "Too few exceptions from the child groups. The test is broken" );
-    CHECK_MESSAGE( g_ExceptionCount <= NUM_GROUPS - SKIP_GROUPS, "Too many exceptions from the child groups. The test is broken" );
-    CHECK_MESSAGE( g_ExceptionCount < NUM_GROUPS - SKIP_GROUPS, "None of the child groups was cancelled" );
+    } catch (...) { CHECK_MESSAGE(false, "Unknown exception"); }
+    CHECK_MESSAGE(exceptionCaught, "No exception thrown from the root task group");
+    CHECK_MESSAGE(g_ExceptionCount >= SKIP_GROUPS,
+                  "Too few exceptions from the child groups. The test is broken");
+    CHECK_MESSAGE(g_ExceptionCount <= NUM_GROUPS - SKIP_GROUPS,
+                  "Too many exceptions from the child groups. The test is broken");
+    CHECK_MESSAGE(g_ExceptionCount < NUM_GROUPS - SKIP_GROUPS, "None of the child groups was cancelled");
 }
 
 template <typename task_group_type>
@@ -552,69 +529,58 @@ void TestExceptionHandling3() {
     try {
         tg.run_and_wait([]() {
             volatile bool suppress_unreachable_code_warning = true;
-            if (suppress_unreachable_code_warning) {
-                throw 1;
-            }
+            if (suppress_unreachable_code_warning) { throw 1; }
         });
-    } catch (int error) {
-        CHECK(error == 1);
-    } catch ( ... ) {
-        CHECK_MESSAGE( false, "Unexpected exception" );
+    } catch (int error) { CHECK(error == 1); } catch (...) {
+        CHECK_MESSAGE(false, "Unexpected exception");
     }
 }
 
-template<typename task_group_type>
+template <typename task_group_type>
 class LaunchChildrenDriver {
 public:
     void Launch(task_group_type& tg) {
         ResetGlobals(false, false);
-        for (unsigned i = 0; i < NUM_GROUPS; ++i) {
-            tg.run(LaunchChildrenWithFunctor<task_group_type>);
-        }
+        for (unsigned i = 0; i < NUM_GROUPS; ++i) { tg.run(LaunchChildrenWithFunctor<task_group_type>); }
         CHECK_MESSAGE(!tbb::is_current_task_group_canceling(), "Unexpected cancellation");
-        while (g_MaxConcurrency > 1 && g_TaskCount == 0)
-            utils::yield();
+        while (g_MaxConcurrency > 1 && g_TaskCount == 0) utils::yield();
     }
 
     void Finish() {
         CHECK_MESSAGE(g_TaskCount <= NUM_GROUPS * NUM_CHORES, "Too many tasks reported. The test is broken");
-        CHECK_MESSAGE(g_TaskCount < NUM_GROUPS * NUM_CHORES, "No tasks were cancelled. Cancellation model changed?");
-        CHECK_MESSAGE(g_TaskCount <= g_ExecutedAtCancellation + g_MaxConcurrency, "Too many tasks survived cancellation");
+        CHECK_MESSAGE(g_TaskCount < NUM_GROUPS * NUM_CHORES,
+                      "No tasks were cancelled. Cancellation model changed?");
+        CHECK_MESSAGE(g_TaskCount <= g_ExecutedAtCancellation + g_MaxConcurrency,
+                      "Too many tasks survived cancellation");
     }
-}; // LaunchChildrenWithTaskHandleDriver
+};// LaunchChildrenWithTaskHandleDriver
 
-template<typename task_group_type, bool Throw>
-void TestMissingWait () {
-    bool exception_occurred = false,
-         unexpected_exception = false;
+template <typename task_group_type, bool Throw>
+void TestMissingWait() {
+    bool exception_occurred = false, unexpected_exception = false;
     LaunchChildrenDriver<task_group_type> driver;
     try {
         task_group_type tg;
-        driver.Launch( tg );
+        driver.Launch(tg);
         volatile bool suppress_unreachable_code_warning = Throw;
         if (suppress_unreachable_code_warning) {
-            throw int(); // Initiate stack unwinding
+            throw int();// Initiate stack unwinding
         }
-    }
-    catch ( const tbb::missing_wait& e ) {
-        CHECK_MESSAGE( e.what(), "Error message is absent" );
+    } catch (const tbb::missing_wait& e) {
+        CHECK_MESSAGE(e.what(), "Error message is absent");
         exception_occurred = true;
         unexpected_exception = Throw;
-    }
-    catch ( int ) {
+    } catch (int) {
         exception_occurred = true;
         unexpected_exception = !Throw;
-    }
-    catch ( ... ) {
-        exception_occurred = unexpected_exception = true;
-    }
-    CHECK( exception_occurred );
-    CHECK( !unexpected_exception );
+    } catch (...) { exception_occurred = unexpected_exception = true; }
+    CHECK(exception_occurred);
+    CHECK(!unexpected_exception);
     driver.Finish();
 }
 #endif
 
-template<typename task_group_type>
+template <typename task_group_type>
 void RunCancellationAndExceptionHandlingTests() {
     TestManualCancellationWithFunctor<task_group_type>();
 #if TBB_USE_EXCEPTIONS
@@ -626,19 +592,21 @@ void RunCancellationAndExceptionHandlingTests() {
 #endif
 }
 
-void EmptyFunction () {}
+void EmptyFunction() {}
 
 struct TestFunctor {
-    void operator()() { CHECK_MESSAGE( false, "Non-const operator called" ); }
-    void operator()() const { /* library requires this overload only */ }
+    void operator()() { CHECK_MESSAGE(false, "Non-const operator called"); }
+    void operator()() const { /* library requires this overload only */
+    }
 };
 
-template<typename task_group_type>
+template <typename task_group_type>
 void TestConstantFunctorRequirement() {
     task_group_type g;
     TestFunctor tf;
-    g.run( tf ); g.wait();
-    g.run_and_wait( tf );
+    g.run(tf);
+    g.wait();
+    g.run_and_wait(tf);
 }
 
 //------------------------------------------------------------------------
@@ -665,29 +633,29 @@ namespace TestMoveSemanticsNS {
         NoMoveNoCopyFunctor(NoMoveNoCopyFunctor&&);
     };
 
-     template<typename task_group_type>
+    template <typename task_group_type>
     void TestBareFunctors() {
         task_group_type tg;
         MovePreferableFunctor mpf;
         // run_and_wait() doesn't have any copies or moves of arguments inside the impl
-        tg.run_and_wait( NoMoveNoCopyFunctor() );
+        tg.run_and_wait(NoMoveNoCopyFunctor());
 
-        tg.run( MoveOnlyFunctor() );
+        tg.run(MoveOnlyFunctor());
         tg.wait();
 
-        tg.run( mpf );
+        tg.run(mpf);
         tg.wait();
         CHECK_MESSAGE(mpf.alive, "object was moved when was passed by lval");
         mpf.Reset();
 
-        tg.run( std::move(mpf) );
+        tg.run(std::move(mpf));
         tg.wait();
         CHECK_MESSAGE(!mpf.alive, "object was copied when was passed by rval");
         mpf.Reset();
     }
-}
+}// namespace TestMoveSemanticsNS
 
-template<typename task_group_type>
+template <typename task_group_type>
 void TestMoveSemantics() {
     TestMoveSemanticsNS::TestBareFunctors<task_group_type>();
 }
@@ -700,27 +668,25 @@ namespace TestIsolationNS {
     public:
         DummyFunctor() {}
         void operator()() const {
-            for ( volatile int j = 0; j < 10; ++j ) {}
+            for (volatile int j = 0; j < 10; ++j) {}
         }
     };
 
-    template<typename task_group_type>
+    template <typename task_group_type>
     class ParForBody {
         task_group_type& m_tg;
         std::atomic<bool>& m_preserved;
         tbb::enumerable_thread_specific<int>& m_ets;
+
     public:
-        ParForBody(
-            task_group_type& tg,
-            std::atomic<bool>& preserved,
-            tbb::enumerable_thread_specific<int>& ets
-        ) : m_tg(tg), m_preserved(preserved), m_ets(ets) {}
+        ParForBody(task_group_type& tg, std::atomic<bool>& preserved,
+                   tbb::enumerable_thread_specific<int>& ets)
+            : m_tg(tg), m_preserved(preserved), m_ets(ets) {}
 
         void operator()(int) const {
             if (++m_ets.local() > 1) m_preserved = false;
 
-            for (int i = 0; i < 1000; ++i)
-                m_tg.run(DummyFunctor());
+            for (int i = 0; i < 1000; ++i) m_tg.run(DummyFunctor());
             m_tg.wait();
             m_tg.run_and_wait(DummyFunctor());
 
@@ -728,7 +694,7 @@ namespace TestIsolationNS {
         }
     };
 
-    template<typename task_group_type>
+    template <typename task_group_type>
     void CheckIsolation(bool isolation_is_expected) {
         task_group_type tg;
         std::atomic<bool> isolation_is_preserved;
@@ -737,10 +703,8 @@ namespace TestIsolationNS {
 
         tbb::parallel_for(0, 100, ParForBody<task_group_type>(tg, isolation_is_preserved, ets));
 
-        ASSERT(
-            isolation_is_expected == isolation_is_preserved,
-            "Actual and expected isolation-related behaviours are different"
-        );
+        ASSERT(isolation_is_expected == isolation_is_preserved,
+               "Actual and expected isolation-related behaviours are different");
     }
 
     // Should be called only when > 1 thread is used, because otherwise isolation is guaranteed to take place
@@ -748,7 +712,7 @@ namespace TestIsolationNS {
         CheckIsolation<tbb::task_group>(false);
         CheckIsolation<tbb::isolated_task_group>(true);
     }
-}
+}// namespace TestIsolationNS
 #endif
 
 #if __TBB_USE_ADDRESS_SANITIZER
@@ -764,10 +728,8 @@ TEST_CASE("Thread safety test for the task group") {
         // The test requires more than one thread to check thread safety
         return;
     }
-    for (unsigned p=MinThread; p <= MaxThread; ++p) {
-        if (p < 2) {
-            continue;
-        }
+    for (unsigned p = MinThread; p <= MaxThread; ++p) {
+        if (p < 2) { continue; }
         tbb::global_control limit(tbb::global_control::max_allowed_parallelism, p);
         g_MaxConcurrency = p;
         TestThreadSafety<tbb::task_group>();
@@ -778,13 +740,11 @@ TEST_CASE("Thread safety test for the task group") {
 //! Fibonacci test for task group
 //! \brief \ref interface \ref requirement
 TEST_CASE("Fibonacci test for the task group") {
-    for (unsigned p=MinThread; p <= MaxThread; ++p) {
+    for (unsigned p = MinThread; p <= MaxThread; ++p) {
         tbb::global_control limit(tbb::global_control::max_allowed_parallelism, p);
         tbb::task_arena a(p);
         g_MaxConcurrency = p;
-        a.execute([] {
-            RunFibonacciTests<tbb::task_group>();
-        });
+        a.execute([] { RunFibonacciTests<tbb::task_group>(); });
     }
 }
 
@@ -795,16 +755,14 @@ TEST_CASE("Cancellation and exception test for the task group") {
         tbb::global_control limit(tbb::global_control::max_allowed_parallelism, p);
         tbb::task_arena a(p);
         g_MaxConcurrency = p;
-        a.execute([] {
-            RunCancellationAndExceptionHandlingTests<tbb::task_group>();
-        });
+        a.execute([] { RunCancellationAndExceptionHandlingTests<tbb::task_group>(); });
     }
 }
 
 //! Constant functor test for the task group
 //! \brief \ref interface \ref negative
 TEST_CASE("Constant functor test for the task group") {
-    for (unsigned p=MinThread; p <= MaxThread; ++p) {
+    for (unsigned p = MinThread; p <= MaxThread; ++p) {
         tbb::global_control limit(tbb::global_control::max_allowed_parallelism, p);
         g_MaxConcurrency = p;
         TestConstantFunctorRequirement<tbb::task_group>();
@@ -814,7 +772,7 @@ TEST_CASE("Constant functor test for the task group") {
 //! Move semantics test for the task group
 //! \brief \ref interface \ref requirement
 TEST_CASE("Move semantics test for the task group") {
-    for (unsigned p=MinThread; p <= MaxThread; ++p) {
+    for (unsigned p = MinThread; p <= MaxThread; ++p) {
         tbb::global_control limit(tbb::global_control::max_allowed_parallelism, p);
         g_MaxConcurrency = p;
         TestMoveSemantics<tbb::task_group>();
@@ -835,16 +793,12 @@ TEST_CASE("Thread safety test for the isolated task group") {
         // The test requires more than one thread to check thread safety
         return;
     }
-    for (unsigned p=MinThread; p <= MaxThread; ++p) {
-        if (p < 2) {
-            continue;
-        }
+    for (unsigned p = MinThread; p <= MaxThread; ++p) {
+        if (p < 2) { continue; }
         tbb::global_control limit(tbb::global_control::max_allowed_parallelism, p);
         g_MaxConcurrency = p;
         tbb::task_arena a(p);
-        a.execute([] {
-            TestThreadSafety<tbb::isolated_task_group>();
-        });
+        a.execute([] { TestThreadSafety<tbb::isolated_task_group>(); });
     }
 }
 #endif
@@ -852,62 +806,55 @@ TEST_CASE("Thread safety test for the isolated task group") {
 //! Cancellation and exception test for the isolated task group
 //! \brief \ref interface \ref requirement
 TEST_CASE("Fibonacci test for the isolated task group") {
-    for (unsigned p=MinThread; p <= MaxThread; ++p) {
+    for (unsigned p = MinThread; p <= MaxThread; ++p) {
         tbb::global_control limit(tbb::global_control::max_allowed_parallelism, p);
         g_MaxConcurrency = p;
         tbb::task_arena a(p);
-        a.execute([] {
-            RunFibonacciTests<tbb::isolated_task_group>();
-        });
+        a.execute([] { RunFibonacciTests<tbb::isolated_task_group>(); });
     }
 }
 
 //! Cancellation and exception test for the isolated task group
 //! \brief \ref interface \ref requirement
 TEST_CASE("Cancellation and exception test for the isolated task group") {
-    for (unsigned p=MinThread; p <= MaxThread; ++p) {
+    for (unsigned p = MinThread; p <= MaxThread; ++p) {
         tbb::global_control limit(tbb::global_control::max_allowed_parallelism, p);
         g_MaxConcurrency = p;
         tbb::task_arena a(p);
-        a.execute([] {
-            RunCancellationAndExceptionHandlingTests<tbb::isolated_task_group>();
-        });
+        a.execute([] { RunCancellationAndExceptionHandlingTests<tbb::isolated_task_group>(); });
     }
 }
 
 //! Constant functor test for the isolated task group.
 //! \brief \ref interface \ref negative
 TEST_CASE("Constant functor test for the isolated task group") {
-    for (unsigned p=MinThread; p <= MaxThread; ++p) {
+    for (unsigned p = MinThread; p <= MaxThread; ++p) {
         tbb::global_control limit(tbb::global_control::max_allowed_parallelism, p);
         g_MaxConcurrency = p;
         tbb::task_arena a(p);
-        a.execute([] {
-            TestConstantFunctorRequirement<tbb::isolated_task_group>();
-        });
+        a.execute([] { TestConstantFunctorRequirement<tbb::isolated_task_group>(); });
     }
 }
 
 //! Move semantics test for the isolated task group.
 //! \brief \ref interface \ref requirement
 TEST_CASE("Move semantics test for the isolated task group") {
-    for (unsigned p=MinThread; p <= MaxThread; ++p) {
+    for (unsigned p = MinThread; p <= MaxThread; ++p) {
         tbb::global_control limit(tbb::global_control::max_allowed_parallelism, p);
         g_MaxConcurrency = p;
         tbb::task_arena a(p);
-        a.execute([] {
-            TestMoveSemantics<tbb::isolated_task_group>();
-        });
+        a.execute([] { TestMoveSemantics<tbb::isolated_task_group>(); });
     }
 }
 
 //TODO: add test void isolated_task_group::run(d2::task_handle&& h) and isolated_task_group::::run_and_wait(d2::task_handle&& h)
 #endif /* TBB_PREVIEW_ISOLATED_TASK_GROUP */
 
-void run_deep_stealing(tbb::task_group& tg1, tbb::task_group& tg2, int num_tasks, std::atomic<int>& tasks_executed) {
+void run_deep_stealing(tbb::task_group& tg1, tbb::task_group& tg2, int num_tasks,
+                       std::atomic<int>& tasks_executed) {
     for (int i = 0; i < num_tasks; ++i) {
         tg2.run([&tg1, &tasks_executed] {
-            volatile char consume_stack[1000]{};
+            volatile char consume_stack[1000] {};
             ++tasks_executed;
             tg1.wait();
             utils::suppress_unused_warning(consume_stack);
@@ -919,14 +866,12 @@ void run_deep_stealing(tbb::task_group& tg1, tbb::task_group& tg2, int num_tasks
 //! Test for stack overflow avoidance mechanism.
 //! \brief \ref requirement
 TEST_CASE("Test for stack overflow avoidance mechanism") {
-    if (tbb::this_task_arena::max_concurrency() < 2) {
-        return;
-    }
+    if (tbb::this_task_arena::max_concurrency() < 2) { return; }
 
     tbb::global_control thread_limit(tbb::global_control::max_allowed_parallelism, 2);
     tbb::task_group tg1;
     tbb::task_group tg2;
-    std::atomic<int> tasks_executed{};
+    std::atomic<int> tasks_executed {};
     tg1.run_and_wait([&tg1, &tg2, &tasks_executed] {
         run_deep_stealing(tg1, tg2, 10000, tasks_executed);
         while (tasks_executed < 100) {
@@ -942,18 +887,16 @@ TEST_CASE("Test for stack overflow avoidance mechanism") {
 //! Test for stack overflow avoidance mechanism.
 //! \brief \ref error_guessing
 TEST_CASE("Test for stack overflow avoidance mechanism within arena") {
-    if (tbb::this_task_arena::max_concurrency() < 2) {
-        return;
-    }
+    if (tbb::this_task_arena::max_concurrency() < 2) { return; }
 
     tbb::task_arena a1(2, 1);
     a1.execute([] {
         tbb::task_group tg1;
         tbb::task_group tg2;
-        std::atomic<int> tasks_executed{};
+        std::atomic<int> tasks_executed {};
 
         // Determine nested task execution limit.
-        int second_thread_executed{};
+        int second_thread_executed {};
         tg1.run_and_wait([&tg1, &tg2, &tasks_executed, &second_thread_executed] {
             run_deep_stealing(tg1, tg2, 10000, tasks_executed);
             do {
@@ -975,7 +918,7 @@ TEST_CASE("Test for stack overflow avoidance mechanism within arena") {
             }
             tg2.run([&a2, &tg1, &tasks_executed] {
                 a2.execute([&tg1, &tasks_executed] {
-                    volatile char consume_stack[1000]{};
+                    volatile char consume_stack[1000] {};
                     ++tasks_executed;
                     tg1.wait();
                     utils::suppress_unused_warning(consume_stack);
@@ -985,19 +928,15 @@ TEST_CASE("Test for stack overflow avoidance mechanism within arena") {
                 // Wait until the second joins the arena.
                 utils::yield();
             }
-            a2.execute([&tg1, &tg2, &tasks_executed] {
-                run_deep_stealing(tg1, tg2, 10000, tasks_executed);
-            });
-            int currently_executed{};
+            a2.execute([&tg1, &tg2, &tasks_executed] { run_deep_stealing(tg1, tg2, 10000, tasks_executed); });
+            int currently_executed {};
             do {
                 currently_executed = tasks_executed;
                 utils::Sleep(10);
             } while (currently_executed != tasks_executed);
             CHECK(tasks_executed < 10000 + second_thread_executed);
         });
-        a2.execute([&tg2] {
-            tg2.wait();
-        });
+        a2.execute([&tg2] { tg2.wait(); });
         CHECK(tasks_executed == 10000 + second_thread_executed);
     });
 }
@@ -1010,11 +949,12 @@ TEST_CASE("Async task group") {
         // The test requires at least 2 worker threads
         return;
     }
-    tbb::task_arena a(2*num_threads, num_threads);
+    tbb::task_arena a(2 * num_threads, num_threads);
     utils::SpinBarrier barrier(num_threads + 2);
     tbb::task_group tg[2];
-    std::atomic<bool> finished[2]{};
-    finished[0] = false; finished[1] = false;
+    std::atomic<bool> finished[2] {};
+    finished[0] = false;
+    finished[1] = false;
     for (int i = 0; i < 2; ++i) {
         a.enqueue([i, &tg, &finished, &barrier] {
             barrier.wait();
@@ -1028,12 +968,12 @@ TEST_CASE("Async task group") {
     utils::NativeParallelFor(num_threads, [&](int idx) {
         barrier.wait();
         a.execute([idx, &tg, &finished] {
-            std::size_t counter{};
-            while (!finished[idx%2]) {
-                tg[idx%2].wait();
+            std::size_t counter {};
+            while (!finished[idx % 2]) {
+                tg[idx % 2].wait();
                 if (counter++ % 16 == 0) utils::yield();
             }
-            tg[idx%2].wait();
+            tg[idx % 2].wait();
         });
     });
 }
@@ -1043,8 +983,7 @@ struct SelfRunner {
     std::atomic<unsigned>& count;
     void operator()() const {
         unsigned previous_count = count.fetch_sub(1);
-        if (previous_count > 1)
-            m_tg.run( *this );
+        if (previous_count > 1) m_tg.run(*this);
     }
 };
 
@@ -1052,91 +991,77 @@ struct SelfRunner {
 //! \brief \ref error_guessing
 TEST_CASE("Run self using same task_group instance") {
     const unsigned num = 10;
-    std::atomic<unsigned> count{num};
+    std::atomic<unsigned> count {num};
     tbb::task_group tg;
-    SelfRunner uf{tg, count};
-    tg.run( uf );
+    SelfRunner uf {tg, count};
+    tg.run(uf);
     tg.wait();
-    CHECK_MESSAGE(
-        count == 0,
-        "Not all tasks were spawned from inside the functor running within task_group."
-    );
+    CHECK_MESSAGE(count == 0,
+                  "Not all tasks were spawned from inside the functor running within task_group.");
 }
 
 //TODO: move to some common place to share with conformance tests
 namespace accept_task_group_context {
 
-template <typename TaskGroup, typename CancelF, typename WaitF>
-void run_cancellation_use_case(CancelF&& cancel, WaitF&& wait) {
-    std::atomic<bool> outer_cancelled{false};
-    std::atomic<unsigned> count{13};
+    template <typename TaskGroup, typename CancelF, typename WaitF>
+    void run_cancellation_use_case(CancelF&& cancel, WaitF&& wait) {
+        std::atomic<bool> outer_cancelled {false};
+        std::atomic<unsigned> count {13};
 
-    tbb::task_group_context inner_ctx(tbb::task_group_context::isolated);
-    TaskGroup inner_tg(inner_ctx);
+        tbb::task_group_context inner_ctx(tbb::task_group_context::isolated);
+        TaskGroup inner_tg(inner_ctx);
 
-    tbb::task_group outer_tg;
-    auto outer_tg_task = [&] {
-        inner_tg.run([&] {
-            utils::SpinWaitUntilEq(outer_cancelled, true);
-            inner_tg.run( SelfRunner{inner_tg, count} );
-        });
+        tbb::task_group outer_tg;
+        auto outer_tg_task = [&] {
+            inner_tg.run([&] {
+                utils::SpinWaitUntilEq(outer_cancelled, true);
+                inner_tg.run(SelfRunner {inner_tg, count});
+            });
 
-        utils::try_call([&] {
-            std::forward<CancelF>(cancel)(outer_tg);
-        }).on_completion([&] {
-            outer_cancelled = true;
-        });
-    };
+            utils::try_call([&] { std::forward<CancelF>(cancel)(outer_tg); }).on_completion([&] {
+                outer_cancelled = true;
+            });
+        };
 
-    auto check = [&] {
-        tbb::task_group_status outer_status = tbb::task_group_status::not_complete;
-        outer_status = std::forward<WaitF>(wait)(outer_tg);
-        CHECK_MESSAGE(
-            outer_status == tbb::task_group_status::canceled,
-            "Outer task group should have been cancelled."
-        );
-
-        tbb::task_group_status inner_status = inner_tg.wait();
-        CHECK_MESSAGE(
-            inner_status == tbb::task_group_status::complete,
-            "Inner task group should have completed despite the cancellation of the outer one."
-        );
-
-        CHECK_MESSAGE(0 == count, "Some of the inner group tasks were not executed.");
-    };
+        auto check = [&] {
+            tbb::task_group_status outer_status = tbb::task_group_status::not_complete;
+            outer_status = std::forward<WaitF>(wait)(outer_tg);
+            CHECK_MESSAGE(outer_status == tbb::task_group_status::canceled,
+                          "Outer task group should have been cancelled.");
 
-    outer_tg.run(outer_tg_task);
-    check();
-}
+            tbb::task_group_status inner_status = inner_tg.wait();
+            CHECK_MESSAGE(
+                    inner_status == tbb::task_group_status::complete,
+                    "Inner task group should have completed despite the cancellation of the outer one.");
+
+            CHECK_MESSAGE(0 == count, "Some of the inner group tasks were not executed.");
+        };
 
-template <typename TaskGroup>
-void test() {
-    run_cancellation_use_case<TaskGroup>(
-        [](tbb::task_group& outer) { outer.cancel(); },
-        [](tbb::task_group& outer) { return outer.wait(); }
-    );
+        outer_tg.run(outer_tg_task);
+        check();
+    }
+
+    template <typename TaskGroup>
+    void test() {
+        run_cancellation_use_case<TaskGroup>([](tbb::task_group& outer) { outer.cancel(); },
+                                             [](tbb::task_group& outer) { return outer.wait(); });
 
 #if TBB_USE_EXCEPTIONS
-    run_cancellation_use_case<TaskGroup>(
-        [](tbb::task_group& /*outer*/) {
-            volatile bool suppress_unreachable_code_warning = true;
-            if (suppress_unreachable_code_warning) {
-                throw int();
-            }
-        },
-        [](tbb::task_group& outer) {
-            try {
-                outer.wait();
-                return tbb::task_group_status::complete;
-            } catch(const int&) {
-                return tbb::task_group_status::canceled;
-            }
-        }
-    );
+        run_cancellation_use_case<TaskGroup>(
+                [](tbb::task_group& /*outer*/) {
+                    volatile bool suppress_unreachable_code_warning = true;
+                    if (suppress_unreachable_code_warning) { throw int(); }
+                },
+                [](tbb::task_group& outer) {
+                    try {
+                        outer.wait();
+                        return tbb::task_group_status::complete;
+                    } catch (const int&) { return tbb::task_group_status::canceled; }
+                });
 #endif
-}
+    }
 
-} // namespace accept_task_group_context
+}// namespace accept_task_group_context
 
 //! Respect task_group_context passed from outside
 //! \brief \ref interface \ref requirement
@@ -1149,15 +1074,11 @@ TEST_CASE("Respect task_group_context passed from outside") {
 #if __TBB_PREVIEW_TASK_GROUP_EXTENSIONS
 //! The test for task_handle inside other task waiting with run
 //! \brief \ref requirement
-TEST_CASE("Task handle for scheduler bypass"){
+TEST_CASE("Task handle for scheduler bypass") {
     tbb::task_group tg;
     std::atomic<bool> run {false};
 
-    tg.run([&]{
-        return tg.defer([&]{
-            run = true;
-        });
-    });
+    tg.run([&] { return tg.defer([&] { run = true; }); });
 
     tg.wait();
     CHECK_MESSAGE(run == true, "task handle returned by user lambda (bypassed) should be run");
@@ -1165,19 +1086,15 @@ TEST_CASE("Task handle for scheduler bypass"){
 
 //! The test for task_handle inside other task waiting with run_and_wait
 //! \brief \ref requirement
-TEST_CASE("Task handle for scheduler bypass via run_and_wait"){
+TEST_CASE("Task handle for scheduler bypass via run_and_wait") {
     tbb::task_group tg;
     std::atomic<bool> run {false};
 
-    tg.run_and_wait([&]{
-        return tg.defer([&]{
-            run = true;
-        });
-    });
+    tg.run_and_wait([&] { return tg.defer([&] { run = true; }); });
 
     CHECK_MESSAGE(run == true, "task handle returned by user lambda (bypassed) should be run");
 }
-#endif //__TBB_PREVIEW_TASK_GROUP_EXTENSIONS
+#endif//__TBB_PREVIEW_TASK_GROUP_EXTENSIONS
 
 #if TBB_USE_EXCEPTIONS
 //As these tests are against behavior marked by spec as undefined, they can not be put into conformance tests
@@ -1185,40 +1102,46 @@ TEST_CASE("Task handle for scheduler bypass via run_and_wait"){
 //! The test for error in scheduling empty task_handle
 //! \brief \ref requirement
 TEST_CASE("Empty task_handle cannot be scheduled"
-        * doctest::should_fail()    //Test needs to revised as implementation uses assertions instead of exceptions
-        * doctest::skip()           //skip the test for now, to not pollute the test log
-){
+          * doctest::
+                  should_fail()//Test needs to revised as implementation uses assertions instead of exceptions
+          * doctest::skip()    //skip the test for now, to not pollute the test log
+) {
     tbb::task_group tg;
 
-    CHECK_THROWS_WITH_AS(tg.run(tbb::task_handle{}), "Attempt to schedule empty task_handle", std::runtime_error);
+    CHECK_THROWS_WITH_AS(tg.run(tbb::task_handle {}), "Attempt to schedule empty task_handle",
+                         std::runtime_error);
 }
 
 //! The test for error in task_handle being scheduled into task_group different from one it was created from
 //! \brief \ref requirement
 TEST_CASE("task_handle cannot be scheduled into different task_group"
-        * doctest::should_fail()    //Test needs to revised as implementation uses assertions instead of exceptions
-        * doctest::skip()           //skip the test for now, to not pollute the test log
-){
+          * doctest::
+                  should_fail()//Test needs to revised as implementation uses assertions instead of exceptions
+          * doctest::skip()    //skip the test for now, to not pollute the test log
+) {
     tbb::task_group tg;
     tbb::task_group tg1;
 
-    CHECK_THROWS_WITH_AS(tg1.run(tg.defer([]{})), "Attempt to schedule task_handle into different task_group", std::runtime_error);
+    CHECK_THROWS_WITH_AS(tg1.run(tg.defer([] {})),
+                         "Attempt to schedule task_handle into different task_group", std::runtime_error);
 }
 
 //! The test for error in task_handle being scheduled into task_group different from one it was created from
 //! \brief \ref requirement
-TEST_CASE("task_handle cannot be scheduled into other task_group of the same context"
-        * doctest::should_fail()    //Implementation is no there yet, as it is not clear that is the expected behavior
-        * doctest::skip()           //skip the test for now, to not pollute the test log
-)
-{
+TEST_CASE(
+        "task_handle cannot be scheduled into other task_group of the same context"
+        * doctest::
+                should_fail()//Implementation is no there yet, as it is not clear that is the expected behavior
+        * doctest::skip()    //skip the test for now, to not pollute the test log
+) {
     tbb::task_group_context ctx;
 
     tbb::task_group tg(ctx);
     tbb::task_group tg1(ctx);
 
-    CHECK_NOTHROW(tg.run(tg.defer([]{})));
-    CHECK_THROWS_WITH_AS(tg1.run(tg.defer([]{})), "Attempt to schedule task_handle into different task_group", std::runtime_error);
+    CHECK_NOTHROW(tg.run(tg.defer([] {})));
+    CHECK_THROWS_WITH_AS(tg1.run(tg.defer([] {})),
+                         "Attempt to schedule task_handle into different task_group", std::runtime_error);
 }
 
-#endif // TBB_USE_EXCEPTIONS
+#endif// TBB_USE_EXCEPTIONS
diff --git a/external/tbb/test/tbb/test_tbb_fork.cpp b/external/tbb/test/tbb/test_tbb_fork.cpp
index 95ab3d9c..aa482546 100644
--- a/external/tbb/test/tbb/test_tbb_fork.cpp
+++ b/external/tbb/test/tbb/test_tbb_fork.cpp
@@ -17,9 +17,9 @@
 //! \file test_tbb_fork.cpp
 //! \brief Test for [sched.global_control] specification
 
-#include "tbb/global_control.h"
 #include "tbb/blocked_range.h"
 #include "tbb/cache_aligned_allocator.h"
+#include "tbb/global_control.h"
 #include "tbb/parallel_for.h"
 
 static const int MinThread = 1;
@@ -32,22 +32,20 @@ static const int MaxThread = 4;
 #include "common/utils.h"
 #include "common/utils_assert.h"
 
-#if _WIN32||_WIN64
+#if _WIN32 || _WIN64
 #include "tbb/concurrent_hash_map.h"
 
-HANDLE getCurrentThreadHandle()
-{
+HANDLE getCurrentThreadHandle() {
     HANDLE hProc = GetCurrentProcess(), hThr = INVALID_HANDLE_VALUE;
 #if TBB_USE_ASSERT
     BOOL res =
 #endif
-    DuplicateHandle( hProc, GetCurrentThread(), hProc, &hThr, 0, FALSE, DUPLICATE_SAME_ACCESS );
-    __TBB_ASSERT( res, "Retrieving current thread handle failed" );
+            DuplicateHandle(hProc, GetCurrentThread(), hProc, &hThr, 0, FALSE, DUPLICATE_SAME_ACCESS);
+    __TBB_ASSERT(res, "Retrieving current thread handle failed");
     return hThr;
 }
 
-bool threadTerminated(HANDLE h)
-{
+bool threadTerminated(HANDLE h) {
     DWORD ret = WaitForSingleObjectEx(h, 0, FALSE);
     return WAIT_OBJECT_0 == ret;
 }
@@ -63,31 +61,29 @@ static TidTableType tidTable;
 #else
 
 #if __sun || __SUNPRO_CC
-#define _POSIX_PTHREAD_SEMANTICS 1 // to get standard-conforming sigwait(2)
+#define _POSIX_PTHREAD_SEMANTICS 1// to get standard-conforming sigwait(2)
 #endif
+#include <sched.h>
 #include <signal.h>
 #include <sys/types.h>
-#include <unistd.h>
 #include <sys/wait.h>
-#include <sched.h>
+#include <unistd.h>
 
 #include "tbb/tick_count.h"
 
-void SigHandler(int) { }
+void SigHandler(int) {}
 
-#endif // _WIN32||_WIN64
+#endif// _WIN32||_WIN64
 
 class AllocTask {
 public:
-    void operator() (const tbb::blocked_range<int> &r) const {
-#if _WIN32||_WIN64
+    void operator()(const tbb::blocked_range<int> &r) const {
+#if _WIN32 || _WIN64
         HANDLE h = getCurrentThreadHandle();
         DWORD tid = GetCurrentThreadId();
         {
             TidTableType::accessor acc;
-            if (tidTable.insert(acc, tid)) {
-                acc->second.h = h;
-            }
+            if (tidTable.insert(acc, tid)) { acc->second.h = h; }
         }
 #endif
         for (int y = r.begin(); y != r.end(); ++y) {
@@ -98,20 +94,19 @@ class AllocTask {
     AllocTask() {}
 };
 
-void CallParallelFor()
-{
-    tbb::parallel_for(tbb::blocked_range<int>(0, 10000, 1), AllocTask(),
-                      tbb::simple_partitioner());
+void CallParallelFor() {
+    tbb::parallel_for(tbb::blocked_range<int>(0, 10000, 1), AllocTask(), tbb::simple_partitioner());
 }
 
 /* Regression test against data race between termination of workers
    and setting blocking termination mode in main thread. */
 class RunWorkersBody : utils::NoAssign {
     bool wait_workers;
+
 public:
     RunWorkersBody(bool waitWorkers) : wait_workers(waitWorkers) {}
     void operator()(const int /*threadID*/) const {
-        tbb::task_scheduler_handle tsi{tbb::attach{}};
+        tbb::task_scheduler_handle tsi {tbb::attach {}};
         CallParallelFor();
         if (wait_workers) {
             bool ok = tbb::finalize(tsi, std::nothrow);
@@ -122,9 +117,8 @@ class RunWorkersBody : utils::NoAssign {
     }
 };
 
-void TestBlockNonblock()
-{
-    for (int i=0; i<100; i++) {
+void TestBlockNonblock() {
+    for (int i = 0; i < 100; i++) {
         utils::NativeParallelFor(4, RunWorkersBody(/*wait_workers=*/false));
         RunWorkersBody(/*wait_workers=*/true)(0);
     }
@@ -136,7 +130,7 @@ class RunInNativeThread : utils::NoAssign {
 public:
     RunInNativeThread(bool blocking_) : blocking(blocking_) {}
     void operator()(const int /*threadID*/) const {
-        tbb::task_scheduler_handle tsi = tbb::task_scheduler_handle{tbb::attach{}};
+        tbb::task_scheduler_handle tsi = tbb::task_scheduler_handle {tbb::attach {}};
         CallParallelFor();
         if (blocking) {
             bool ok = tbb::finalize(tsi, std::nothrow);
@@ -147,9 +141,8 @@ class RunInNativeThread : utils::NoAssign {
     }
 };
 
-void TestTasksInThread()
-{
-    tbb::task_scheduler_handle sch{tbb::attach{}};
+void TestTasksInThread() {
+    tbb::task_scheduler_handle sch {tbb::attach {}};
     CallParallelFor();
     utils::NativeParallelFor(2, RunInNativeThread(/*blocking=*/false));
     bool ok = tbb::finalize(sch, std::nothrow);
@@ -162,26 +155,26 @@ void TestTasksInThread()
 
 // check for memory leak during TBB task scheduler init/terminate life cycle
 // TODO: move to test_task_scheduler_init after workers waiting productization
-void TestSchedulerMemLeaks()
-{
+void TestSchedulerMemLeaks() {
     const int ITERS = 10;
     int it;
 
-    for (it=0; it<ITERS; it++) {
+    for (it = 0; it < ITERS; it++) {
         size_t memBefore = utils::GetMemoryUsage();
 #if _MSC_VER && _DEBUG
         // _CrtMemCheckpoint() and _CrtMemDifference are non-empty only in _DEBUG
         _CrtMemState stateBefore, stateAfter, diffState;
         _CrtMemCheckpoint(&stateBefore);
 #endif
-        for (int i=0; i<100; i++) {
-            tbb::task_arena arena(1, 1); arena.initialize(); // right approach?
+        for (int i = 0; i < 100; i++) {
+            tbb::task_arena arena(1, 1);
+            arena.initialize();// right approach?
             // tbb::task_scheduler_init sch(1);
             tbb::task_scheduler_handle sch = tbb::task_scheduler_handle::get();
-            for (int k=0; k<10; k++) {
+            for (int k = 0; k < 10; k++) {
                 // tbb::empty_task *t = new( tbb::task::allocate_root() ) tbb::empty_task();
                 // tbb::task::enqueue(*t);
-                arena.enqueue([&]{});
+                arena.enqueue([&] {});
             }
             bool ok = tbb::finalize(sch, std::nothrow);
             ASSERT(ok, nullptr);
@@ -191,22 +184,20 @@ void TestSchedulerMemLeaks()
         int ret = _CrtMemDifference(&diffState, &stateBefore, &stateAfter);
         ASSERT(!ret, "It must be no memory leaks at this point.");
 #endif
-        if (utils::GetMemoryUsage() <= memBefore)
-            break;
+        if (utils::GetMemoryUsage() <= memBefore) break;
     }
     ASSERT(it < ITERS, "Memory consumption has not stabilized. Memory Leak?");
 }
 
-#endif // TBB_REVAMP_TODO
+#endif// TBB_REVAMP_TODO
 
-void TestNestingTSI()
-{
+void TestNestingTSI() {
     // nesting with and without blocking is possible
-    for (int i=0; i<2; i++) {
-        tbb::task_scheduler_handle schBlock = tbb::task_scheduler_handle{tbb::attach{}};
+    for (int i = 0; i < 2; i++) {
+        tbb::task_scheduler_handle schBlock = tbb::task_scheduler_handle {tbb::attach {}};
         CallParallelFor();
         tbb::task_scheduler_handle schBlock1;
-        schBlock1 = tbb::task_scheduler_handle{tbb::attach{}};
+        schBlock1 = tbb::task_scheduler_handle {tbb::attach {}};
         CallParallelFor();
         if (i) {
             schBlock1.release();
@@ -218,22 +209,20 @@ void TestNestingTSI()
         ASSERT(ok, nullptr);
     }
     {
-        tbb::task_scheduler_handle schBlock{tbb::attach{}};
+        tbb::task_scheduler_handle schBlock {tbb::attach {}};
         utils::NativeParallelFor(1, RunInNativeThread(/*blocking=*/true));
         bool ok = tbb::finalize(schBlock, std::nothrow);
         ASSERT(ok, nullptr);
     }
 }
 
-void TestAutoInit()
-{
-    CallParallelFor(); // autoinit
+void TestAutoInit() {
+    CallParallelFor();// autoinit
     // creation of blocking scheduler is possible, but one is not block
     utils::NativeParallelFor(1, RunInNativeThread(/*blocking=*/true));
 }
 
-int main()
-{
+int main() {
     TestNestingTSI();
     TestBlockNonblock();
     TestTasksInThread();
@@ -243,7 +232,7 @@ int main()
 #endif
 
     bool child = false;
-#if _WIN32||_WIN64
+#if _WIN32 || _WIN64
     DWORD masterTid = GetCurrentThreadId();
 #else
     struct sigaction sa;
@@ -252,42 +241,35 @@ int main()
     sigemptyset(&sa.sa_mask);
     sa.sa_flags = 0;
     sa.sa_handler = SigHandler;
-    if (sigaction(SIGCHLD, &sa, nullptr))
-        ASSERT(0, "sigaction failed");
-    if (sigaction(SIGALRM, &sa, nullptr))
-        ASSERT(0, "sigaction failed");
+    if (sigaction(SIGCHLD, &sa, nullptr)) ASSERT(0, "sigaction failed");
+    if (sigaction(SIGALRM, &sa, nullptr)) ASSERT(0, "sigaction failed");
     // block SIGCHLD and SIGALRM, the mask is inherited by worker threads
     sigemptyset(&sig_set);
     sigaddset(&sig_set, SIGCHLD);
     sigaddset(&sig_set, SIGALRM);
-    if (pthread_sigmask(SIG_BLOCK, &sig_set, nullptr))
-        ASSERT(0, "pthread_sigmask failed");
+    if (pthread_sigmask(SIG_BLOCK, &sig_set, nullptr)) ASSERT(0, "pthread_sigmask failed");
 #endif
     utils::suppress_unused_warning(child);
-    for (int threads=MinThread; threads<=MaxThread; threads+=MinThread) {
-        for (int i=0; i<20; i++) {
+    for (int threads = MinThread; threads <= MaxThread; threads += MinThread) {
+        for (int i = 0; i < 20; i++) {
             tbb::global_control ctl(tbb::global_control::max_allowed_parallelism, threads);
             {
-                tbb::task_scheduler_handle sch{tbb::attach{}};
-                bool ok = tbb::finalize( sch, std::nothrow );
+                tbb::task_scheduler_handle sch {tbb::attach {}};
+                bool ok = tbb::finalize(sch, std::nothrow);
                 ASSERT(ok, nullptr);
             }
-            tbb::task_scheduler_handle sch{tbb::attach{}};
+            tbb::task_scheduler_handle sch {tbb::attach {}};
             CallParallelFor();
-            bool ok = tbb::finalize( sch, std::nothrow );
+            bool ok = tbb::finalize(sch, std::nothrow);
             ASSERT(ok, nullptr);
-#if _WIN32||_WIN64
+#if _WIN32 || _WIN64
             // check that there is no alive threads after terminate()
-            for (TidTableType::const_iterator it = tidTable.begin();
-                it != tidTable.end(); ++it) {
-                if (masterTid != it->first) {
-                    ASSERT(threadTerminated(it->second.h), nullptr);
-                }
+            for (TidTableType::const_iterator it = tidTable.begin(); it != tidTable.end(); ++it) {
+                if (masterTid != it->first) { ASSERT(threadTerminated(it->second.h), nullptr); }
             }
             tidTable.clear();
 #else // _WIN32||_WIN64
-            if (child)
-                exit(0);
+            if (child) exit(0);
             else {
                 pid_t pid = fork();
                 if (!pid) {
@@ -298,15 +280,14 @@ int main()
                     pid_t w_ret = 0;
                     // wait for SIGCHLD up to timeout
                     alarm(30);
-                    if (0 != sigwait(&sig_set, &sig))
-                        ASSERT(0, "sigwait failed");
+                    if (0 != sigwait(&sig_set, &sig)) ASSERT(0, "sigwait failed");
                     alarm(0);
                     w_ret = waitpid(pid, nullptr, WNOHANG);
-                    ASSERT(w_ret>=0, "waitpid failed");
+                    ASSERT(w_ret >= 0, "waitpid failed");
                     if (!w_ret) {
                         ASSERT(!kill(pid, SIGKILL), nullptr);
                         w_ret = waitpid(pid, nullptr, 0);
-                        ASSERT(w_ret!=-1, "waitpid failed");
+                        ASSERT(w_ret != -1, "waitpid failed");
 
                         ASSERT(0, "Hang after fork");
                     }
@@ -315,16 +296,14 @@ int main()
                     for (;;) {
                         sigemptyset(&p_mask);
                         sigpending(&p_mask);
-                        if (sigismember(&p_mask, SIGALRM)
-                            || sigismember(&p_mask, SIGCHLD)) {
-                            if (0 != sigwait(&p_mask, &sig))
-                                ASSERT(0, "sigwait failed");
+                        if (sigismember(&p_mask, SIGALRM) || sigismember(&p_mask, SIGCHLD)) {
+                            if (0 != sigwait(&p_mask, &sig)) ASSERT(0, "sigwait failed");
                         } else
                             break;
                     }
                 }
             }
-#endif // _WIN32||_WIN64
+#endif// _WIN32||_WIN64
         }
     }
     // auto initialization at this point
diff --git a/external/tbb/test/tbb/test_tbb_header.cpp b/external/tbb/test/tbb/test_tbb_header.cpp
index 122af5ec..6c620262 100644
--- a/external/tbb/test/tbb/test_tbb_header.cpp
+++ b/external/tbb/test/tbb/test_tbb_header.cpp
@@ -25,48 +25,47 @@
 **/
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
 #endif
 
 #ifndef NOMINMAX
 #define NOMINMAX
-#endif // NOMINMAX
+#endif// NOMINMAX
 
 #define __TBB_NO_IMPLICIT_LINKAGE 1
 
-
 #if __TBB_TEST_SECONDARY
-    // Test _DEBUG macro custom definitions.
-    #if TBB_USE_DEBUG
-        #ifdef _DEBUG
-            #undef _DEBUG
-        #endif /* _DEBUG */
-        // Check that empty value successfully enables the debug mode.
-        #define _DEBUG
-        static bool isDebugExpected = true;
-    #else
-        // Check that zero value does not enable the debug mode.
-        #define _DEBUG 0x0
-        static bool isDebugExpected = false;
-    #endif /* TBB_USE_DEBUG */
-    #define DO_TEST_DEBUG_MACRO 1
+// Test _DEBUG macro custom definitions.
+#if TBB_USE_DEBUG
+#ifdef _DEBUG
+#undef _DEBUG
+#endif /* _DEBUG */
+// Check that empty value successfully enables the debug mode.
+#define _DEBUG
+static bool isDebugExpected = true;
 #else
-    // Test default definitions of _DEBUG.
-    #if _DEBUG
-        static bool isDebugExpected = true;
-        #define DO_TEST_DEBUG_MACRO 1
-    #elif _MSC_VER
-        // for MSVC, _DEBUG not defined indicates a release mode.
-        static bool isDebugExpected = false;
-        #define DO_TEST_DEBUG_MACRO 1
-    #endif /* _DEBUG */
+// Check that zero value does not enable the debug mode.
+#define _DEBUG 0x0
+static bool isDebugExpected = false;
+#endif /* TBB_USE_DEBUG */
+#define DO_TEST_DEBUG_MACRO 1
+#else
+// Test default definitions of _DEBUG.
+#if _DEBUG
+static bool isDebugExpected = true;
+#define DO_TEST_DEBUG_MACRO 1
+#elif _MSC_VER
+// for MSVC, _DEBUG not defined indicates a release mode.
+static bool isDebugExpected = false;
+#define DO_TEST_DEBUG_MACRO 1
+#endif /* _DEBUG */
 #endif /* __TBB_TEST_SECONDARY */
 
 #if DO_TEST_DEBUG_MACRO
 // Reset TBB_USE_DEBUG defined in makefiles.
 #undef TBB_USE_DEBUG
-#endif /* DO_TEST_DEBUG_MACRO */
-#define __TBB_CONFIG_PREPROC_ONLY _MSC_VER // For MSVC, prevent including standard headers in tbb_config.h
+#endif                                    /* DO_TEST_DEBUG_MACRO */
+#define __TBB_CONFIG_PREPROC_ONLY _MSC_VER// For MSVC, prevent including standard headers in tbb_config.h
 #include "common/config.h"
 
 #include "oneapi/tbb/detail/_config.h"
@@ -85,45 +84,50 @@
 
 static volatile size_t g_sink;
 
-#define TestTypeDefinitionPresence( Type ) g_sink = sizeof(tbb::Type);
-#define TestTypeDefinitionPresence2(TypeStart, TypeEnd) g_sink = sizeof(tbb::TypeStart,TypeEnd);
-#define TestTypeDefinitionPresence3(TypeStart, TypeMid, TypeEnd) g_sink = sizeof(tbb::TypeStart,TypeMid,TypeEnd);
-#define TestFuncDefinitionPresence(Fn, Args, ReturnType) { ReturnType (*pfn)Args = &tbb::Fn; (void)pfn; }
+#define TestTypeDefinitionPresence(Type) g_sink = sizeof(tbb::Type);
+#define TestTypeDefinitionPresence2(TypeStart, TypeEnd) g_sink = sizeof(tbb::TypeStart, TypeEnd);
+#define TestTypeDefinitionPresence3(TypeStart, TypeMid, TypeEnd)                                             \
+    g_sink = sizeof(tbb::TypeStart, TypeMid, TypeEnd);
+#define TestFuncDefinitionPresence(Fn, Args, ReturnType)                                                     \
+    {                                                                                                        \
+        ReturnType(*pfn) Args = &tbb::Fn;                                                                    \
+        (void) pfn;                                                                                          \
+    }
 
 struct Body {
-    void operator() () const {}
+    void operator()() const {}
 };
 struct Body1 {
-    void operator() ( int ) const {}
+    void operator()(int) const {}
 };
-struct Body1a { // feeder body for parallel_do
-    void operator() ( int, tbb::feeder<int>& ) const {}
+struct Body1a {// feeder body for parallel_do
+    void operator()(int, tbb::feeder<int>&) const {}
 };
-struct Body1b { // binary operator for reduction
-    int operator() ( const int, const int ) const { return 0; }
+struct Body1b {// binary operator for reduction
+    int operator()(const int, const int) const { return 0; }
 };
-struct Body1bc { // binary operator for comparison
-    bool operator() (const int, const int) const { return false; }
+struct Body1bc {// binary operator for comparison
+    bool operator()(const int, const int) const { return false; }
 };
 struct Body2 {
-    Body2 () {}
-    Body2 ( const Body2&, tbb::split ) {}
-    void operator() ( const tbb::blocked_range<int>& ) const {}
-    void join( const Body2& ) {}
+    Body2() {}
+    Body2(const Body2&, tbb::split) {}
+    void operator()(const tbb::blocked_range<int>&) const {}
+    void join(const Body2&) {}
 };
-struct Body2a { // for lambda-friendly parallel_reduce
-    int operator() ( const tbb::blocked_range<int>&, const int ) const { return 0; }
+struct Body2a {// for lambda-friendly parallel_reduce
+    int operator()(const tbb::blocked_range<int>&, const int) const { return 0; }
 };
-struct Body3 { // for parallel_scan
-    Body3 () {}
-    Body3 ( const Body3&, tbb::split ) {}
-    void operator() ( const tbb::blocked_range2d<int>&, tbb::pre_scan_tag ) const {}
-    void operator() ( const tbb::blocked_range2d<int>&, tbb::final_scan_tag ) const {}
-    void reverse_join( Body3& ) {}
-    void assign( const Body3& ) {}
+struct Body3 {// for parallel_scan
+    Body3() {}
+    Body3(const Body3&, tbb::split) {}
+    void operator()(const tbb::blocked_range2d<int>&, tbb::pre_scan_tag) const {}
+    void operator()(const tbb::blocked_range2d<int>&, tbb::final_scan_tag) const {}
+    void reverse_join(Body3&) {}
+    void assign(const Body3&) {}
 };
-struct Body3a { // for lambda-friednly parallel_scan
-    int operator() ( const tbb::blocked_range<int>&, const int, bool ) const { return 0; }
+struct Body3a {// for lambda-friednly parallel_scan
+    int operator()(const tbb::blocked_range<int>&, const int, bool) const { return 0; }
 };
 struct Msg {};
 
@@ -132,157 +136,173 @@ struct Msg {};
 #include <stdexcept>
 
 template <typename E>
-void TestExceptionClassExports ( const E& exc, tbb::detail::exception_id eid ) {
-    CHECK( eid < tbb::detail::exception_id::last_entry );
+void TestExceptionClassExports(const E& exc, tbb::detail::exception_id eid) {
+    CHECK(eid < tbb::detail::exception_id::last_entry);
 #if TBB_USE_EXCEPTIONS
-    for ( int i = 0; i < 2; ++i ) {
+    for (int i = 0; i < 2; ++i) {
         try {
-            if ( i == 0 )
-                throw exc;
+            if (i == 0) throw exc;
             else
-                tbb::detail::throw_exception( eid );
-        }
-        catch ( E& e ) {
-            CHECK_MESSAGE( e.what(), "Missing what() string" );
-        }
-        catch ( ... ) {
-            CHECK_MESSAGE( false, "Unrecognized exception. Likely RTTI related exports are missing" );
+                tbb::detail::throw_exception(eid);
+        } catch (E& e) { CHECK_MESSAGE(e.what(), "Missing what() string"); } catch (...) {
+            CHECK_MESSAGE(false, "Unrecognized exception. Likely RTTI related exports are missing");
         }
     }
-#else /* TBB_USE_EXCEPTIONS */
-    (void)exc;
+#else  /* TBB_USE_EXCEPTIONS */
+    (void) exc;
 #endif /* TBB_USE_EXCEPTIONS */
 }
 
-static void TestExceptionClassesExports () {
-    TestExceptionClassExports( std::bad_alloc(), tbb::detail::exception_id::bad_alloc );
-    TestExceptionClassExports( tbb::bad_last_alloc(), tbb::detail::exception_id::bad_last_alloc );
-    TestExceptionClassExports( std::invalid_argument("test"), tbb::detail::exception_id::nonpositive_step );
-    TestExceptionClassExports( std::out_of_range("test"), tbb::detail::exception_id::out_of_range );
-    TestExceptionClassExports( tbb::missing_wait(), tbb::detail::exception_id::missing_wait );
-    TestExceptionClassExports( std::out_of_range("test"), tbb::detail::exception_id::invalid_load_factor );
-    TestExceptionClassExports( std::length_error("test"), tbb::detail::exception_id::reservation_length_error );
-    TestExceptionClassExports( std::out_of_range("test"), tbb::detail::exception_id::invalid_key );
-    TestExceptionClassExports( tbb::user_abort(), tbb::detail::exception_id::user_abort );
-    TestExceptionClassExports( std::runtime_error("test"), tbb::detail::exception_id::bad_tagged_msg_cast );
-    TestExceptionClassExports( tbb::unsafe_wait("test"), tbb::detail::exception_id::unsafe_wait );
+static void TestExceptionClassesExports() {
+    TestExceptionClassExports(std::bad_alloc(), tbb::detail::exception_id::bad_alloc);
+    TestExceptionClassExports(tbb::bad_last_alloc(), tbb::detail::exception_id::bad_last_alloc);
+    TestExceptionClassExports(std::invalid_argument("test"), tbb::detail::exception_id::nonpositive_step);
+    TestExceptionClassExports(std::out_of_range("test"), tbb::detail::exception_id::out_of_range);
+    TestExceptionClassExports(tbb::missing_wait(), tbb::detail::exception_id::missing_wait);
+    TestExceptionClassExports(std::out_of_range("test"), tbb::detail::exception_id::invalid_load_factor);
+    TestExceptionClassExports(std::length_error("test"), tbb::detail::exception_id::reservation_length_error);
+    TestExceptionClassExports(std::out_of_range("test"), tbb::detail::exception_id::invalid_key);
+    TestExceptionClassExports(tbb::user_abort(), tbb::detail::exception_id::user_abort);
+    TestExceptionClassExports(std::runtime_error("test"), tbb::detail::exception_id::bad_tagged_msg_cast);
+    TestExceptionClassExports(tbb::unsafe_wait("test"), tbb::detail::exception_id::unsafe_wait);
 }
 
 #if __TBB_CPF_BUILD
 // These names are only tested in "preview" configuration
 // When a feature becomes fully supported, its names should be moved to the main test
 static void TestPreviewNames() {
-    TestTypeDefinitionPresence2( concurrent_lru_cache<int, int> );
-    TestTypeDefinitionPresence( isolated_task_group );
+    TestTypeDefinitionPresence2(concurrent_lru_cache<int, int>);
+    TestTypeDefinitionPresence(isolated_task_group);
 }
 #endif
 
 static void DefinitionPresence() {
-    TestTypeDefinitionPresence( cache_aligned_allocator<int> );
-    TestTypeDefinitionPresence( tbb_hash_compare<int> );
-    TestTypeDefinitionPresence2( concurrent_hash_map<int, int> );
-    TestTypeDefinitionPresence2( concurrent_unordered_map<int, int> );
-    TestTypeDefinitionPresence2( concurrent_unordered_multimap<int, int> );
-    TestTypeDefinitionPresence( concurrent_unordered_set<int> );
-    TestTypeDefinitionPresence( concurrent_unordered_multiset<int> );
-    TestTypeDefinitionPresence2( concurrent_map<int, int> );
-    TestTypeDefinitionPresence2( concurrent_multimap<int, int> );
-    TestTypeDefinitionPresence( concurrent_set<int> );
-    TestTypeDefinitionPresence( concurrent_multiset<int> );
-    TestTypeDefinitionPresence( concurrent_bounded_queue<int> );
-    TestTypeDefinitionPresence( concurrent_queue<int> );
-    TestTypeDefinitionPresence( concurrent_priority_queue<int> );
-    TestTypeDefinitionPresence( concurrent_vector<int> );
-    TestTypeDefinitionPresence( combinable<int> );
-    TestTypeDefinitionPresence( enumerable_thread_specific<int> );
+    TestTypeDefinitionPresence(cache_aligned_allocator<int>);
+    TestTypeDefinitionPresence(tbb_hash_compare<int>);
+    TestTypeDefinitionPresence2(concurrent_hash_map<int, int>);
+    TestTypeDefinitionPresence2(concurrent_unordered_map<int, int>);
+    TestTypeDefinitionPresence2(concurrent_unordered_multimap<int, int>);
+    TestTypeDefinitionPresence(concurrent_unordered_set<int>);
+    TestTypeDefinitionPresence(concurrent_unordered_multiset<int>);
+    TestTypeDefinitionPresence2(concurrent_map<int, int>);
+    TestTypeDefinitionPresence2(concurrent_multimap<int, int>);
+    TestTypeDefinitionPresence(concurrent_set<int>);
+    TestTypeDefinitionPresence(concurrent_multiset<int>);
+    TestTypeDefinitionPresence(concurrent_bounded_queue<int>);
+    TestTypeDefinitionPresence(concurrent_queue<int>);
+    TestTypeDefinitionPresence(concurrent_priority_queue<int>);
+    TestTypeDefinitionPresence(concurrent_vector<int>);
+    TestTypeDefinitionPresence(combinable<int>);
+    TestTypeDefinitionPresence(enumerable_thread_specific<int>);
     /* Flow graph names */
-    TestTypeDefinitionPresence( flow::graph );
-    TestTypeDefinitionPresence( flow::continue_msg );
-    TestTypeDefinitionPresence2(flow::tagged_msg<int, int> );
-    TestFuncDefinitionPresence( flow::make_edge, (tbb::flow::sender<Msg>&, tbb::flow::receiver<Msg>&), void );
-    TestFuncDefinitionPresence( flow::remove_edge, (tbb::flow::sender<Msg>&, tbb::flow::receiver<Msg>&), void );
+    TestTypeDefinitionPresence(flow::graph);
+    TestTypeDefinitionPresence(flow::continue_msg);
+    TestTypeDefinitionPresence2(flow::tagged_msg<int, int>);
+    TestFuncDefinitionPresence(flow::make_edge, (tbb::flow::sender<Msg>&, tbb::flow::receiver<Msg>&), void);
+    TestFuncDefinitionPresence(flow::remove_edge, (tbb::flow::sender<Msg>&, tbb::flow::receiver<Msg>&), void);
     typedef std::tuple<int, int> intpair;
-    TestTypeDefinitionPresence( flow::input_node<int> );
-    TestTypeDefinitionPresence3(flow::function_node<int, int, tbb::flow::rejecting> );
-    TestTypeDefinitionPresence3(flow::multifunction_node<int, intpair, tbb::flow::queueing> );
-    TestTypeDefinitionPresence3(flow::async_node<int, int, tbb::flow::queueing_lightweight> );
-    TestTypeDefinitionPresence2(flow::continue_node<int, tbb::flow::lightweight> );
-    TestTypeDefinitionPresence2(flow::join_node<intpair, tbb::flow::reserving> );
-    TestTypeDefinitionPresence2(flow::join_node<intpair, tbb::flow::key_matching<int> > );
-    TestTypeDefinitionPresence( flow::split_node<intpair> );
-    TestTypeDefinitionPresence( flow::overwrite_node<int> );
-    TestTypeDefinitionPresence( flow::write_once_node<int> );
-    TestTypeDefinitionPresence( flow::broadcast_node<int> );
-    TestTypeDefinitionPresence( flow::buffer_node<int> );
-    TestTypeDefinitionPresence( flow::queue_node<int> );
-    TestTypeDefinitionPresence( flow::sequencer_node<int> );
-    TestTypeDefinitionPresence( flow::priority_queue_node<int> );
-    TestTypeDefinitionPresence( flow::limiter_node<int> );
-    TestTypeDefinitionPresence2(flow::indexer_node<int, int> );
-    TestTypeDefinitionPresence2(flow::composite_node<std::tuple<int>, std::tuple<int> > );
+    TestTypeDefinitionPresence(flow::input_node<int>);
+    TestTypeDefinitionPresence3(flow::function_node<int, int, tbb::flow::rejecting>);
+    TestTypeDefinitionPresence3(flow::multifunction_node<int, intpair, tbb::flow::queueing>);
+    TestTypeDefinitionPresence3(flow::async_node<int, int, tbb::flow::queueing_lightweight>);
+    TestTypeDefinitionPresence2(flow::continue_node<int, tbb::flow::lightweight>);
+    TestTypeDefinitionPresence2(flow::join_node<intpair, tbb::flow::reserving>);
+    TestTypeDefinitionPresence2(flow::join_node<intpair, tbb::flow::key_matching<int>>);
+    TestTypeDefinitionPresence(flow::split_node<intpair>);
+    TestTypeDefinitionPresence(flow::overwrite_node<int>);
+    TestTypeDefinitionPresence(flow::write_once_node<int>);
+    TestTypeDefinitionPresence(flow::broadcast_node<int>);
+    TestTypeDefinitionPresence(flow::buffer_node<int>);
+    TestTypeDefinitionPresence(flow::queue_node<int>);
+    TestTypeDefinitionPresence(flow::sequencer_node<int>);
+    TestTypeDefinitionPresence(flow::priority_queue_node<int>);
+    TestTypeDefinitionPresence(flow::limiter_node<int>);
+    TestTypeDefinitionPresence2(flow::indexer_node<int, int>);
+    TestTypeDefinitionPresence2(flow::composite_node<std::tuple<int>, std::tuple<int>>);
     /* Mutex names */
-    TestTypeDefinitionPresence( null_mutex );
-    TestTypeDefinitionPresence( null_rw_mutex );
-    TestTypeDefinitionPresence( queuing_mutex );
-    TestTypeDefinitionPresence( queuing_rw_mutex );
-    TestTypeDefinitionPresence( spin_mutex );
-    TestTypeDefinitionPresence( spin_rw_mutex );
-    TestTypeDefinitionPresence( mutex );
-    TestTypeDefinitionPresence( rw_mutex );
-    TestTypeDefinitionPresence( speculative_spin_mutex );
-    TestTypeDefinitionPresence( speculative_spin_rw_mutex );
-    TestTypeDefinitionPresence( task_group_context );
-    TestTypeDefinitionPresence( task_group );
+    TestTypeDefinitionPresence(null_mutex);
+    TestTypeDefinitionPresence(null_rw_mutex);
+    TestTypeDefinitionPresence(queuing_mutex);
+    TestTypeDefinitionPresence(queuing_rw_mutex);
+    TestTypeDefinitionPresence(spin_mutex);
+    TestTypeDefinitionPresence(spin_rw_mutex);
+    TestTypeDefinitionPresence(mutex);
+    TestTypeDefinitionPresence(rw_mutex);
+    TestTypeDefinitionPresence(speculative_spin_mutex);
+    TestTypeDefinitionPresence(speculative_spin_rw_mutex);
+    TestTypeDefinitionPresence(task_group_context);
+    TestTypeDefinitionPresence(task_group);
     /* Algorithm related names */
-    TestTypeDefinitionPresence( blocked_range<int> );
-    TestTypeDefinitionPresence( blocked_range2d<int> );
-    TestTypeDefinitionPresence( blocked_range3d<int> );
-    TestTypeDefinitionPresence2( blocked_nd_range<int,4> );
-    TestTypeDefinitionPresence( collaborative_once_flag );
-    TestFuncDefinitionPresence( collaborative_call_once, (tbb::collaborative_once_flag&, const Body&), void );
-    TestFuncDefinitionPresence( parallel_invoke, (const Body&, const Body&, const Body&), void );
-    TestFuncDefinitionPresence( parallel_for_each, (int*, int*, const Body1&), void );
-    TestFuncDefinitionPresence( parallel_for, (int, int, int, const Body1&), void );
-    TestFuncDefinitionPresence( parallel_for, (const tbb::blocked_range<int>&, const Body2&, const tbb::simple_partitioner&), void );
-    TestFuncDefinitionPresence( parallel_reduce, (const tbb::blocked_range<int>&, const int&, const Body2a&, const Body1b&), int );
-    TestFuncDefinitionPresence( parallel_reduce, (const tbb::blocked_range<int>&, Body2&, tbb::affinity_partitioner&), void );
-    TestFuncDefinitionPresence( parallel_deterministic_reduce, (const tbb::blocked_range<int>&, const int&, const Body2a&, const Body1b&), int );
-    TestFuncDefinitionPresence( parallel_deterministic_reduce, (const tbb::blocked_range<int>&, Body2&, const tbb::static_partitioner&), void );
-    TestFuncDefinitionPresence( parallel_scan, (const tbb::blocked_range2d<int>&, Body3&, const tbb::auto_partitioner&), void );
-    TestFuncDefinitionPresence( parallel_scan, (const tbb::blocked_range<int>&, const int&, const Body3a&, const Body1b&), int );
+    TestTypeDefinitionPresence(blocked_range<int>);
+    TestTypeDefinitionPresence(blocked_range2d<int>);
+    TestTypeDefinitionPresence(blocked_range3d<int>);
+    TestTypeDefinitionPresence2(blocked_nd_range<int, 4>);
+    TestTypeDefinitionPresence(collaborative_once_flag);
+    TestFuncDefinitionPresence(collaborative_call_once, (tbb::collaborative_once_flag&, const Body&), void);
+    TestFuncDefinitionPresence(parallel_invoke, (const Body&, const Body&, const Body&), void);
+    TestFuncDefinitionPresence(parallel_for_each, (int*, int*, const Body1&), void);
+    TestFuncDefinitionPresence(parallel_for, (int, int, int, const Body1&), void);
+    TestFuncDefinitionPresence(parallel_for,
+                               (const tbb::blocked_range<int>&, const Body2&, const tbb::simple_partitioner&),
+                               void);
+    TestFuncDefinitionPresence(
+            parallel_reduce, (const tbb::blocked_range<int>&, const int&, const Body2a&, const Body1b&), int);
+    TestFuncDefinitionPresence(parallel_reduce,
+                               (const tbb::blocked_range<int>&, Body2&, tbb::affinity_partitioner&), void);
+    TestFuncDefinitionPresence(parallel_deterministic_reduce,
+                               (const tbb::blocked_range<int>&, const int&, const Body2a&, const Body1b&),
+                               int);
+    TestFuncDefinitionPresence(parallel_deterministic_reduce,
+                               (const tbb::blocked_range<int>&, Body2&, const tbb::static_partitioner&),
+                               void);
+    TestFuncDefinitionPresence(
+            parallel_scan, (const tbb::blocked_range2d<int>&, Body3&, const tbb::auto_partitioner&), void);
+    TestFuncDefinitionPresence(
+            parallel_scan, (const tbb::blocked_range<int>&, const int&, const Body3a&, const Body1b&), int);
     typedef int intarray[10];
 
-    TestFuncDefinitionPresence( parallel_sort, (int*, int*), void );
-    TestFuncDefinitionPresence( parallel_sort, (intarray&, const Body1bc&), void );
-    TestFuncDefinitionPresence( parallel_pipeline, (size_t, const tbb::filter<void,void>&), void );
-    TestFuncDefinitionPresence( parallel_invoke, (const Body&, const Body&, tbb::task_group_context&), void );
-    TestFuncDefinitionPresence( parallel_for_each, (const intarray&, const Body1a&, tbb::task_group_context&), void );
-    TestFuncDefinitionPresence( parallel_for, (int, int, const Body1&, const tbb::auto_partitioner&, tbb::task_group_context&), void );
-    TestFuncDefinitionPresence( parallel_for, (int, int, const Body1&, tbb::task_group_context&), void );
-    TestFuncDefinitionPresence( parallel_reduce, (const tbb::blocked_range<int>&, Body2&, const tbb::auto_partitioner&, tbb::task_group_context&), void );
-    TestFuncDefinitionPresence( parallel_reduce, (const tbb::blocked_range<int>&, Body2&, tbb::task_group_context&), void );
-    TestFuncDefinitionPresence( parallel_deterministic_reduce, (const tbb::blocked_range<int>&, Body2&, const tbb::simple_partitioner&, tbb::task_group_context&), void );
-    TestFuncDefinitionPresence( parallel_deterministic_reduce, (const tbb::blocked_range<int>&, Body2&, tbb::task_group_context&), void );
-    TestTypeDefinitionPresence( proportional_split );
+    TestFuncDefinitionPresence(parallel_sort, (int*, int*), void);
+    TestFuncDefinitionPresence(parallel_sort, (intarray&, const Body1bc&), void);
+    TestFuncDefinitionPresence(parallel_pipeline, (size_t, const tbb::filter<void, void>&), void);
+    TestFuncDefinitionPresence(parallel_invoke, (const Body&, const Body&, tbb::task_group_context&), void);
+    TestFuncDefinitionPresence(parallel_for_each, (const intarray&, const Body1a&, tbb::task_group_context&),
+                               void);
+    TestFuncDefinitionPresence(
+            parallel_for, (int, int, const Body1&, const tbb::auto_partitioner&, tbb::task_group_context&),
+            void);
+    TestFuncDefinitionPresence(parallel_for, (int, int, const Body1&, tbb::task_group_context&), void);
+    TestFuncDefinitionPresence(
+            parallel_reduce,
+            (const tbb::blocked_range<int>&, Body2&, const tbb::auto_partitioner&, tbb::task_group_context&),
+            void);
+    TestFuncDefinitionPresence(parallel_reduce,
+                               (const tbb::blocked_range<int>&, Body2&, tbb::task_group_context&), void);
+    TestFuncDefinitionPresence(parallel_deterministic_reduce,
+                               (const tbb::blocked_range<int>&, Body2&, const tbb::simple_partitioner&,
+                                tbb::task_group_context&),
+                               void);
+    TestFuncDefinitionPresence(parallel_deterministic_reduce,
+                               (const tbb::blocked_range<int>&, Body2&, tbb::task_group_context&), void);
+    TestTypeDefinitionPresence(proportional_split);
 
-    TestTypeDefinitionPresence( task_arena );
-    TestFuncDefinitionPresence( this_task_arena::current_thread_index, (), int );
-    TestFuncDefinitionPresence( this_task_arena::max_concurrency, (), int );
-    TestFuncDefinitionPresence( info::numa_nodes, (), std::vector<tbb::numa_node_id> );
-    TestFuncDefinitionPresence( info::default_concurrency, (tbb::numa_node_id), int );
-    TestTypeDefinitionPresence( task_scheduler_observer );
-    TestTypeDefinitionPresence( tbb_allocator<int> );
-    TestTypeDefinitionPresence( tick_count );
-    TestTypeDefinitionPresence( global_control );
+    TestTypeDefinitionPresence(task_arena);
+    TestFuncDefinitionPresence(this_task_arena::current_thread_index, (), int);
+    TestFuncDefinitionPresence(this_task_arena::max_concurrency, (), int);
+    TestFuncDefinitionPresence(info::numa_nodes, (), std::vector<tbb::numa_node_id>);
+    TestFuncDefinitionPresence(info::default_concurrency, (tbb::numa_node_id), int);
+    TestTypeDefinitionPresence(task_scheduler_observer);
+    TestTypeDefinitionPresence(tbb_allocator<int>);
+    TestTypeDefinitionPresence(tick_count);
+    TestTypeDefinitionPresence(global_control);
 
 #if __TBB_CPF_BUILD
     TestPreviewNames();
 #endif
 #ifdef DO_TEST_DEBUG_MACRO
 #if TBB_USE_DEBUG
-    CHECK_MESSAGE( isDebugExpected, "Debug mode is observed while release mode is expected." );
+    CHECK_MESSAGE(isDebugExpected, "Debug mode is observed while release mode is expected.");
 #else
-    CHECK_MESSAGE( !isDebugExpected, "Release mode is observed while debug mode is expected." );
+    CHECK_MESSAGE(!isDebugExpected, "Release mode is observed while debug mode is expected.");
 #endif /* TBB_USE_DEBUG */
 #endif /* DO_TEST_DEBUG_MACRO */
     TestExceptionClassesExports();
@@ -292,20 +312,14 @@ static void DefinitionPresence() {
 /* This mode is used to produce a secondary object file that is linked with
    the main one in order to detect "multiple definition" linker error.
 */
-void Secondary() {
-    DefinitionPresence();
-}
+void Secondary() { DefinitionPresence(); }
 #else
 //! Test for deifinition presence
 //! \brief \ref interface
-TEST_CASE("Test for deifinition presence") {
-    DefinitionPresence();
-}
+TEST_CASE("Test for deifinition presence") { DefinitionPresence(); }
 
 void Secondary();
 //! Test for "multiple definition" linker error
 //! \brief \ref error_guessing
-TEST_CASE("Test for multiple definition linker error") {
-    Secondary();
-}
+TEST_CASE("Test for multiple definition linker error") { Secondary(); }
 #endif
diff --git a/external/tbb/test/tbb/test_tbb_header_secondary.cpp b/external/tbb/test/tbb/test_tbb_header_secondary.cpp
index e65245ab..1e020210 100644
--- a/external/tbb/test/tbb/test_tbb_header_secondary.cpp
+++ b/external/tbb/test/tbb/test_tbb_header_secondary.cpp
@@ -18,12 +18,12 @@
 //! \brief Test for [all] specification
 
 #if __INTEL_COMPILER && _MSC_VER
-#pragma warning(disable : 2586) // decorated name length exceeded, name was truncated
+#pragma warning(disable : 2586)// decorated name length exceeded, name was truncated
 #endif
 
 #ifndef NOMINMAX
 #define NOMINMAX
-#endif // NOMINMAX
+#endif// NOMINMAX
 
 #if _MSC_VER && TBB_USE_DEBUG
 // Check that there is no conflict with _CRTDBG_MAP_ALLOC
@@ -33,7 +33,10 @@
 
 #include <exception>
 
-#define CHECK(x) do { if (!(x)) { std::terminate(); } } while (false)
+#define CHECK(x)                                                                                             \
+    do {                                                                                                     \
+        if (!(x)) { std::terminate(); }                                                                      \
+    } while (false)
 #define CHECK_MESSAGE(x, y) CHECK(x);
 
 #define __TBB_TEST_SECONDARY 1
diff --git a/external/tbb/test/tbb/test_tick_count.cpp b/external/tbb/test/tbb/test_tick_count.cpp
index 3bf2bfe8..8fd19c00 100644
--- a/external/tbb/test/tbb/test_tick_count.cpp
+++ b/external/tbb/test/tbb/test_tick_count.cpp
@@ -14,10 +14,10 @@
     limitations under the License.
 */
 
+#include "common/spin_barrier.h"
 #include "common/test.h"
 #include "common/utils.h"
 #include "common/utils_concurrency_limit.h"
-#include "common/spin_barrier.h"
 
 #include <tbb/tick_count.h>
 #include <thread>
@@ -50,18 +50,14 @@ TEST_CASE("Test for subtracting calls to tick_count from different threads") {
     utils::SpinBarrier thread_barrier(num_of_threads);
     tbb::tick_count start_time;
 
-    auto diff_func = [&thread_barrier, &start_time] (std::size_t ) {
+    auto diff_func = [&thread_barrier, &start_time](std::size_t) {
         thread_barrier.wait([&start_time] { start_time = tbb::tick_count::now(); });
 
         tbb::tick_count end_time(tbb::tick_count::now());
-        while ((end_time - start_time).seconds() == 0) {
-            end_time = tbb::tick_count::now();
-        }
+        while ((end_time - start_time).seconds() == 0) { end_time = tbb::tick_count::now(); }
 
         CHECK_GT((end_time - start_time).seconds(), 0);
     };
 
-    for (std::size_t i = 0; i < 10; ++i) {
-        utils::NativeParallelFor(num_of_threads, diff_func);
-    }
+    for (std::size_t i = 0; i < 10; ++i) { utils::NativeParallelFor(num_of_threads, diff_func); }
 }
diff --git a/external/tbb/test/tbb/test_write_once_node.cpp b/external/tbb/test/tbb/test_write_once_node.cpp
index 6fb716ba..99dad825 100644
--- a/external/tbb/test/tbb/test_write_once_node.cpp
+++ b/external/tbb/test/tbb/test_write_once_node.cpp
@@ -14,160 +14,140 @@
     limitations under the License.
 */
 
-
 #include "common/config.h"
 
 #include "tbb/flow_graph.h"
 
+#include "common/graph_utils.h"
 #include "common/test.h"
+#include "common/test_follows_and_precedes_api.h"
 #include "common/utils.h"
 #include "common/utils_assert.h"
-#include "common/graph_utils.h"
-#include "common/test_follows_and_precedes_api.h"
 
 #define N 300
 #define T 4
 #define M 4
 
-
 //! \file test_write_once_node.cpp
 //! \brief Test for [flow_graph.write_once_node] specification
 
-
-template< typename R >
+template <typename R>
 void simple_read_write_tests() {
     tbb::flow::graph g;
     tbb::flow::write_once_node<R> n(g);
 
-    for ( int t = 0; t < T; ++t ) {
+    for (int t = 0; t < T; ++t) {
         R v0(0);
-        std::vector< std::shared_ptr<harness_counting_receiver<R>> > r;
-        for (size_t i = 0; i < M; ++i) {
-            r.push_back( std::make_shared<harness_counting_receiver<R>>(g) );
-        }
+        std::vector<std::shared_ptr<harness_counting_receiver<R>>> r;
+        for (size_t i = 0; i < M; ++i) { r.push_back(std::make_shared<harness_counting_receiver<R>>(g)); }
 
+        CHECK_MESSAGE(n.is_valid() == false, "");
+        CHECK_MESSAGE(n.try_get(v0) == false, "");
 
-        CHECK_MESSAGE( n.is_valid() == false, "" );
-        CHECK_MESSAGE( n.try_get( v0 ) == false, "" );
-
-        if ( t % 2 ) {
-            CHECK_MESSAGE( n.try_put( static_cast<R>(N+1) ), "" );
-            CHECK_MESSAGE( n.is_valid() == true, "" );
-            CHECK_MESSAGE( n.try_get( v0 ) == true, "" );
-            CHECK_MESSAGE( v0 == R(N+1), "" );
+        if (t % 2) {
+            CHECK_MESSAGE(n.try_put(static_cast<R>(N + 1)), "");
+            CHECK_MESSAGE(n.is_valid() == true, "");
+            CHECK_MESSAGE(n.try_get(v0) == true, "");
+            CHECK_MESSAGE(v0 == R(N + 1), "");
         }
 
-        for (int i = 0; i < M; ++i) {
-            tbb::flow::make_edge( n, *r[i] );
-        }
+        for (int i = 0; i < M; ++i) { tbb::flow::make_edge(n, *r[i]); }
 
-        if ( t%2 ) {
+        if (t % 2) {
             for (int i = 0; i < M; ++i) {
                 size_t c = r[i]->my_count;
-                CHECK_MESSAGE( int(c) == 1, "" );
+                CHECK_MESSAGE(int(c) == 1, "");
             }
         }
 
-        for (int i = 1; i <= N; ++i ) {
+        for (int i = 1; i <= N; ++i) {
             R v1(static_cast<R>(i));
 
-            bool result = n.try_put( v1 );
-            if ( !(t%2) && i == 1 )
-                CHECK_MESSAGE( result == true, "" );
+            bool result = n.try_put(v1);
+            if (!(t % 2) && i == 1) CHECK_MESSAGE(result == true, "");
             else
-                CHECK_MESSAGE( result == false, "" );
+                CHECK_MESSAGE(result == false, "");
 
-            CHECK_MESSAGE( n.is_valid() == true, "" );
+            CHECK_MESSAGE(n.is_valid() == true, "");
 
-            for (int j = 0; j < N; ++j ) {
+            for (int j = 0; j < N; ++j) {
                 R v2(0);
-                CHECK_MESSAGE( n.try_get( v2 ), "" );
-                if ( t%2 )
-                    CHECK_MESSAGE( R(N+1) == v2, "" );
+                CHECK_MESSAGE(n.try_get(v2), "");
+                if (t % 2) CHECK_MESSAGE(R(N + 1) == v2, "");
                 else
-                    CHECK_MESSAGE( R(1) == v2, "" );
+                    CHECK_MESSAGE(R(1) == v2, "");
             }
         }
         for (int i = 0; i < M; ++i) {
             size_t c = r[i]->my_count;
-            CHECK_MESSAGE( int(c) == 1, "" );
-        }
-        for (int i = 0; i < M; ++i) {
-            tbb::flow::remove_edge( n, *r[i] );
+            CHECK_MESSAGE(int(c) == 1, "");
         }
-        CHECK_MESSAGE( n.try_put( R(0) ) == false, "" );
+        for (int i = 0; i < M; ++i) { tbb::flow::remove_edge(n, *r[i]); }
+        CHECK_MESSAGE(n.try_put(R(0)) == false, "");
         for (int i = 0; i < M; ++i) {
             size_t c = r[i]->my_count;
-            CHECK_MESSAGE( int(c) == 1, "" );
+            CHECK_MESSAGE(int(c) == 1, "");
         }
         n.clear();
-        CHECK_MESSAGE( n.is_valid() == false, "" );
-        CHECK_MESSAGE( n.try_get( v0 ) == false, "" );
+        CHECK_MESSAGE(n.is_valid() == false, "");
+        CHECK_MESSAGE(n.try_get(v0) == false, "");
     }
 }
 
-template< typename R >
+template <typename R>
 class native_body : utils::NoAssign {
     tbb::flow::write_once_node<R> &my_node;
 
 public:
+    native_body(tbb::flow::write_once_node<R> &n) : my_node(n) {}
 
-    native_body( tbb::flow::write_once_node<R> &n ) : my_node(n) {}
-
-    void operator()( int i ) const {
+    void operator()(int i) const {
         R v1(static_cast<R>(i));
-        CHECK_MESSAGE( my_node.try_put( v1 ) == false, "" );
-        CHECK_MESSAGE( my_node.is_valid() == true, "" );
-        CHECK_MESSAGE( my_node.try_get( v1 ) == true, "" );
-        CHECK_MESSAGE( v1 == R(-1), "" );
+        CHECK_MESSAGE(my_node.try_put(v1) == false, "");
+        CHECK_MESSAGE(my_node.is_valid() == true, "");
+        CHECK_MESSAGE(my_node.try_get(v1) == true, "");
+        CHECK_MESSAGE(v1 == R(-1), "");
     }
 };
 
-template< typename R >
+template <typename R>
 void parallel_read_write_tests() {
     tbb::flow::graph g;
     tbb::flow::write_once_node<R> n(g);
     //Create a vector of identical nodes
-    std::vector< tbb::flow::write_once_node<R> > wo_vec(2, n);
-
-    for (size_t node_idx=0; node_idx<wo_vec.size(); ++node_idx) {
-        for ( int t = 0; t < T; ++t ) {
-            std::vector< std::shared_ptr<harness_counting_receiver<R>> > r;
-            for (size_t i = 0; i < M; ++i) {
-                r.push_back( std::make_shared<harness_counting_receiver<R>>(g) );
-            }
+    std::vector<tbb::flow::write_once_node<R>> wo_vec(2, n);
 
+    for (size_t node_idx = 0; node_idx < wo_vec.size(); ++node_idx) {
+        for (int t = 0; t < T; ++t) {
+            std::vector<std::shared_ptr<harness_counting_receiver<R>>> r;
+            for (size_t i = 0; i < M; ++i) { r.push_back(std::make_shared<harness_counting_receiver<R>>(g)); }
 
-            for (int i = 0; i < M; ++i) {
-                tbb::flow::make_edge( wo_vec[node_idx], *r[i] );
-            }
+            for (int i = 0; i < M; ++i) { tbb::flow::make_edge(wo_vec[node_idx], *r[i]); }
             R v0;
-            CHECK_MESSAGE( wo_vec[node_idx].is_valid() == false, "" );
-            CHECK_MESSAGE( wo_vec[node_idx].try_get( v0 ) == false, "" );
+            CHECK_MESSAGE(wo_vec[node_idx].is_valid() == false, "");
+            CHECK_MESSAGE(wo_vec[node_idx].try_get(v0) == false, "");
 
-            CHECK_MESSAGE( wo_vec[node_idx].try_put( R(-1) ), "" );
+            CHECK_MESSAGE(wo_vec[node_idx].try_put(R(-1)), "");
 #if TBB_TEST_LOW_WORKLOAD
             const int nthreads = 30;
 #else
             const int nthreads = N;
 #endif
-            utils::NativeParallelFor( nthreads, native_body<R>( wo_vec[node_idx] ) );
+            utils::NativeParallelFor(nthreads, native_body<R>(wo_vec[node_idx]));
 
             for (int i = 0; i < M; ++i) {
                 size_t c = r[i]->my_count;
-                CHECK_MESSAGE( int(c) == 1, "" );
-            }
-            for (int i = 0; i < M; ++i) {
-                tbb::flow::remove_edge( wo_vec[node_idx], *r[i] );
+                CHECK_MESSAGE(int(c) == 1, "");
             }
-            CHECK_MESSAGE( wo_vec[node_idx].try_put( R(0) ) == false, "" );
+            for (int i = 0; i < M; ++i) { tbb::flow::remove_edge(wo_vec[node_idx], *r[i]); }
+            CHECK_MESSAGE(wo_vec[node_idx].try_put(R(0)) == false, "");
             for (int i = 0; i < M; ++i) {
                 size_t c = r[i]->my_count;
-                CHECK_MESSAGE( int(c) == 1, "" );
+                CHECK_MESSAGE(int(c) == 1, "");
             }
             wo_vec[node_idx].clear();
-            CHECK_MESSAGE( wo_vec[node_idx].is_valid() == false, "" );
-            CHECK_MESSAGE( wo_vec[node_idx].try_get( v0 ) == false, "" );
+            CHECK_MESSAGE(wo_vec[node_idx].is_valid() == false, "");
+            CHECK_MESSAGE(wo_vec[node_idx].try_get(v0) == false, "");
         }
     }
 }
@@ -178,13 +158,15 @@ void parallel_read_write_tests() {
 void test_follows_and_precedes_api() {
     using msg_t = tbb::flow::continue_msg;
 
-    std::array<msg_t, 3> messages_for_follows= {msg_t(), msg_t(), msg_t()};
+    std::array<msg_t, 3> messages_for_follows = {msg_t(), msg_t(), msg_t()};
     std::vector<msg_t> messages_for_precedes = {msg_t()};
 
-    follows_and_precedes_testing::test_follows<msg_t, tbb::flow::write_once_node<msg_t>>(messages_for_follows);
-    follows_and_precedes_testing::test_precedes<msg_t, tbb::flow::write_once_node<msg_t>>(messages_for_precedes);
+    follows_and_precedes_testing::test_follows<msg_t, tbb::flow::write_once_node<msg_t>>(
+            messages_for_follows);
+    follows_and_precedes_testing::test_precedes<msg_t, tbb::flow::write_once_node<msg_t>>(
+            messages_for_precedes);
 }
-#endif // __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
+#endif// __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 void test_deduction_guides() {
@@ -223,15 +205,14 @@ void test_try_put_and_wait() {
             tbb::flow::graph g;
 
             tbb::flow::write_once_node<int> wo_buffer(g);
-            tbb::flow::function_node<int, int> function(g, tbb::flow::serial,
-                [&](int input) {
-                    if (input == wait_message) {
-                        wo_buffer.clear();
-                        wo_buffer.try_put(new_message);
-                    }
-                    processed_items.emplace_back(input);
-                    return 0;
-                });
+            tbb::flow::function_node<int, int> function(g, tbb::flow::serial, [&](int input) {
+                if (input == wait_message) {
+                    wo_buffer.clear();
+                    wo_buffer.try_put(new_message);
+                }
+                processed_items.emplace_back(input);
+                return 0;
+            });
 
             tbb::flow::make_edge(wo_buffer, function);
 
@@ -239,7 +220,8 @@ void test_try_put_and_wait() {
 
             std::size_t check_index = 0;
             CHECK_MESSAGE(processed_items.size() == 1, "Only the wait_message should be processed");
-            CHECK_MESSAGE(processed_items[check_index++] == wait_message, "Only the wait_message should be processed");
+            CHECK_MESSAGE(processed_items[check_index++] == wait_message,
+                          "Only the wait_message should be processed");
 
             g.wait_for_all();
 
@@ -257,18 +239,14 @@ void test_try_put_and_wait() {
             tbb::flow::graph g;
 
             tbb::flow::write_once_node<int> wo_buffer(g);
-            tbb::flow::function_node<int, int, tbb::flow::rejecting> function(g, tbb::flow::serial,
-                [&](int input) {
-                    if (input == new_message || input == wait_message) {
-                        wo_buffer.clear();
-                    }
-
-                    if (input == wait_message) {
-                        wo_buffer.try_put(new_message);
-                    }
-                    processed_items.emplace_back(input);
-                    return 0;
-                });
+            tbb::flow::function_node<int, int, tbb::flow::rejecting> function(
+                    g, tbb::flow::serial, [&](int input) {
+                        if (input == new_message || input == wait_message) { wo_buffer.clear(); }
+
+                        if (input == wait_message) { wo_buffer.try_put(new_message); }
+                        processed_items.emplace_back(input);
+                        return 0;
+                    });
 
             tbb::flow::make_edge(wo_buffer, function);
 
@@ -279,8 +257,7 @@ void test_try_put_and_wait() {
             CHECK_MESSAGE(processed_items.size() == 2, "unexpected message processing for try_put_and_wait");
             CHECK_MESSAGE(processed_items[check_index++] == occupy_concurrency_message,
                           "occupy_concurrency_message should be processed first");
-            CHECK_MESSAGE(processed_items[check_index++] == wait_message,
-                          "wait_message was not processed");
+            CHECK_MESSAGE(processed_items[check_index++] == wait_message, "wait_message was not processed");
 
             g.wait_for_all();
 
@@ -299,19 +276,15 @@ void test_try_put_and_wait() {
 
             tbb::flow::write_once_node<int> wo_buffer(g);
             tbb::flow::limiter_node<int, int> limiter(g, 1);
-            tbb::flow::function_node<int, int, tbb::flow::rejecting> function(g, tbb::flow::serial,
-                [&](int input) {
-                    if (input == new_message || input == wait_message) {
-                        wo_buffer.clear();
-                    }
-
-                    if (input == wait_message) {
-                        wo_buffer.try_put(new_message);
-                    }
-                    processed_items.emplace_back(input);
-                    limiter.decrementer().try_put(1);
-                    return 0;
-                });
+            tbb::flow::function_node<int, int, tbb::flow::rejecting> function(
+                    g, tbb::flow::serial, [&](int input) {
+                        if (input == new_message || input == wait_message) { wo_buffer.clear(); }
+
+                        if (input == wait_message) { wo_buffer.try_put(new_message); }
+                        processed_items.emplace_back(input);
+                        limiter.decrementer().try_put(1);
+                        return 0;
+                    });
 
             tbb::flow::make_edge(wo_buffer, limiter);
             tbb::flow::make_edge(limiter, function);
@@ -323,8 +296,7 @@ void test_try_put_and_wait() {
             CHECK_MESSAGE(processed_items.size() == 2, "unexpected message processing for try_put_and_wait");
             CHECK_MESSAGE(processed_items[check_index++] == occupy_concurrency_message,
                           "occupy_concurrency_message should be processed first");
-            CHECK_MESSAGE(processed_items[check_index++] == wait_message,
-                          "wait_message was not processed");
+            CHECK_MESSAGE(processed_items[check_index++] == wait_message, "wait_message was not processed");
 
             g.wait_for_all();
 
@@ -338,45 +310,37 @@ void test_try_put_and_wait() {
 
 //! Test read-write properties
 //! \brief \ref requirement \ref error_guessing
-TEST_CASE("Read-write tests"){
+TEST_CASE("Read-write tests") {
     simple_read_write_tests<int>();
     simple_read_write_tests<float>();
 }
 
 //! Test read-write properties under parallelism
 //! \brief \ref requirement \ref error_guessing \ref stress
-TEST_CASE("Parallel read-write tests"){
-    for( unsigned int p=utils::MinThread; p<=utils::MaxThread; ++p ) {
+TEST_CASE("Parallel read-write tests") {
+    for (unsigned int p = utils::MinThread; p <= utils::MaxThread; ++p) {
         tbb::task_arena arena(p);
-        arena.execute(
-            [&]() {
-                parallel_read_write_tests<int>();
-                parallel_read_write_tests<float>();
-                test_reserving_nodes<tbb::flow::write_once_node, size_t>();
-            }
-        );
-	}
+        arena.execute([&]() {
+            parallel_read_write_tests<int>();
+            parallel_read_write_tests<float>();
+            test_reserving_nodes<tbb::flow::write_once_node, size_t>();
+        });
+    }
 }
 
 #if __TBB_PREVIEW_FLOW_GRAPH_NODE_SET
 //! Test deprecated follows and precedes API
 //! \brief \ref error_guessing
-TEST_CASE("Test follows and precedes API"){
-    test_follows_and_precedes_api();
-}
+TEST_CASE("Test follows and precedes API") { test_follows_and_precedes_api(); }
 #endif
 
 #if __TBB_CPP17_DEDUCTION_GUIDES_PRESENT
 //! Test deduction guides
 //! \brief \ref requirement
-TEST_CASE("Deduction guides"){
-    test_deduction_guides();
-}
+TEST_CASE("Deduction guides") { test_deduction_guides(); }
 #endif
 
 #if __TBB_PREVIEW_FLOW_GRAPH_TRY_PUT_AND_WAIT
 //! \brief \ref error_guessing
-TEST_CASE("test write_once_node try_put_and_wait") {
-    test_try_put_and_wait();
-}
+TEST_CASE("test write_once_node try_put_and_wait") { test_try_put_and_wait(); }
 #endif
diff --git a/external/tbb/test/tbbmalloc/test_malloc_atexit.cpp b/external/tbb/test/tbbmalloc/test_malloc_atexit.cpp
index 19ccc4d6..3b4770a8 100644
--- a/external/tbb/test/tbbmalloc/test_malloc_atexit.cpp
+++ b/external/tbb/test/tbbmalloc/test_malloc_atexit.cpp
@@ -31,12 +31,12 @@
 // __TBB_malloc_safer_msize() returns 0 for unknown objects,
 // thus we can detect ownership
 #if _USRDLL
-#if _WIN32||_WIN64
+#if _WIN32 || _WIN64
 extern __declspec(dllexport)
 #else
 __TBB_EXPORT
 #endif
-bool dll_isMallocOverloaded()
+        bool dll_isMallocOverloaded()
 #else
 bool exe_isMallocOverloaded()
 #endif
@@ -68,19 +68,13 @@ void __libc_free(void *ptr);
 void *__libc_realloc(void *ptr, size_t size);
 
 // check that such kind of free/realloc overload works correctly
-void free(void *ptr)
-{
-    __libc_free(ptr);
-}
+void free(void *ptr) { __libc_free(ptr); }
 
-void *realloc(void *ptr, size_t size)
-{
-    return __libc_realloc(ptr, size);
-}
-} // extern "C"
-#endif // __unix__ && !__ANDROID__
+void *realloc(void *ptr, size_t size) { return __libc_realloc(ptr, size); }
+}// extern "C"
+#endif// __unix__ && !__ANDROID__
 
-#endif // MALLOC_UNIXLIKE_OVERLOAD_ENABLED || MALLOC_ZONE_OVERLOAD_ENABLED
+#endif// MALLOC_UNIXLIKE_OVERLOAD_ENABLED || MALLOC_ZONE_OVERLOAD_ENABLED
 
 // Even when the test is skipped, dll source must not be empty to generate .lib to link with.
 
@@ -91,8 +85,7 @@ void dummyFunction() {}
 #if (MALLOC_UNIXLIKE_OVERLOAD_ENABLED || MALLOC_ZONE_OVERLOAD_ENABLED) && !__ANDROID__
 typedef void *(malloc_type)(size_t);
 
-static void SigSegv(int)
-{
+static void SigSegv(int) {
     REPORT("Known issue: SIGSEGV during work with memory allocated by replaced allocator.\n"
            "skip\n");
     exit(0);
@@ -100,53 +93,49 @@ static void SigSegv(int)
 
 // TODO: Using of SIGSEGV can be eliminated via parsing /proc/self/maps
 // and series of system malloc calls.
-void TestReplacedAllocFunc()
-{
+void TestReplacedAllocFunc() {
     struct sigaction sa, sa_default;
-    malloc_type *orig_malloc = (malloc_type*)dlsym(RTLD_NEXT, "malloc");
+    malloc_type *orig_malloc = (malloc_type *) dlsym(RTLD_NEXT, "malloc");
     void *p = (*orig_malloc)(16);
 
     // protect potentially unsafe actions
     sigemptyset(&sa.sa_mask);
     sa.sa_flags = 0;
     sa.sa_handler = SigSegv;
-    if (sigaction(SIGSEGV, &sa, &sa_default))
-        ASSERT(0, "sigaction failed");
+    if (sigaction(SIGSEGV, &sa, &sa_default)) ASSERT(0, "sigaction failed");
 
     ASSERT(malloc_usable_size(p) >= 16, nullptr);
     free(p);
     // no more unsafe actions, restore SIGSEGV
-    if (sigaction(SIGSEGV, &sa_default, nullptr))
-        ASSERT(0, "sigaction failed");
+    if (sigaction(SIGSEGV, &sa_default, nullptr)) ASSERT(0, "sigaction failed");
 }
 #else
-void TestReplacedAllocFunc() { }
+void TestReplacedAllocFunc() {}
 #endif
 
 class Foo {
 public:
     Foo() {
         // add a lot of exit handlers to cause memory allocation
-        for (int i=0; i<1024; i++)
-            atexit(dummyFunction);
+        for (int i = 0; i < 1024; i++) atexit(dummyFunction);
         TestReplacedAllocFunc();
     }
 };
 
 static Foo f;
-#endif // !defined(_PGO_INSTRUMENT) && !__TBB_USE_ADDRESS_SANITIZER
+#endif// !defined(_PGO_INSTRUMENT) && !__TBB_USE_ADDRESS_SANITIZER
 
 int main() {}
 
-#else // _USRDLL
+#else// _USRDLL
 #include "common/test.h"
 
-#if _WIN32||_WIN64
+#if _WIN32 || _WIN64
 #include "tbb/tbbmalloc_proxy.h"
 
 extern __declspec(dllimport)
 #endif
-bool dll_isMallocOverloaded();
+        bool dll_isMallocOverloaded();
 
 #ifdef _PGO_INSTRUMENT
 //! \brief \ref error_guessing
@@ -159,11 +148,11 @@ TEST_CASE("Known issue: test_malloc_atexit is not applicable under ASAN\n" * doc
 #if !HARNESS_SKIP_TEST
 //! \brief \ref error_guessing
 TEST_CASE("test malloc atexit") {
-    REQUIRE_MESSAGE( dll_isMallocOverloaded(), "malloc was not replaced" );
-    REQUIRE_MESSAGE( exe_isMallocOverloaded(), "malloc was not replaced" );
+    REQUIRE_MESSAGE(dll_isMallocOverloaded(), "malloc was not replaced");
+    REQUIRE_MESSAGE(exe_isMallocOverloaded(), "malloc was not replaced");
 }
-#endif // HARNESS_SKIP_TEST
+#endif// HARNESS_SKIP_TEST
 
-#endif // _PGO_INSTRUMENT
+#endif// _PGO_INSTRUMENT
 
-#endif // _USRDLL
+#endif// _USRDLL
diff --git a/external/tbb/test/tbbmalloc/test_malloc_compliance.cpp b/external/tbb/test/tbbmalloc/test_malloc_compliance.cpp
index 1a85ed58..d4e8a931 100644
--- a/external/tbb/test/tbbmalloc/test_malloc_compliance.cpp
+++ b/external/tbb/test/tbbmalloc/test_malloc_compliance.cpp
@@ -19,14 +19,14 @@
 
 #define __TBB_NO_IMPLICIT_LINKAGE 1
 
-#define __STDC_LIMIT_MACROS 1 // to get SIZE_MAX from stdint.h
+#define __STDC_LIMIT_MACROS 1// to get SIZE_MAX from stdint.h
 
 #include "common/test.h"
 
+#include "common/memory_usage.h"
+#include "common/spin_barrier.h"
 #include "common/utils.h"
 #include "common/utils_report.h"
-#include "common/spin_barrier.h"
-#include "common/memory_usage.h"
 
 #include "oneapi/tbb/detail/_config.h"
 
@@ -46,20 +46,19 @@
  **/
 #undef _WIN32_WINNT
 #define _WIN32_WINNT 0x0501
-#include <windows.h>
 #include <stdio.h>
+#include <windows.h>
 
 #if _MSC_VER && defined(_MT) && defined(_DLL)
-    #pragma comment(lib, "version.lib")  // to use GetFileVersionInfo*
+#pragma comment(lib, "version.lib")// to use GetFileVersionInfo*
 #endif
 
-void limitMem( size_t limit )
-{
+void limitMem(size_t limit) {
     static HANDLE hJob = nullptr;
     JOBOBJECT_EXTENDED_LIMIT_INFORMATION jobInfo;
 
     jobInfo.BasicLimitInformation.LimitFlags = JOB_OBJECT_LIMIT_PROCESS_MEMORY;
-    jobInfo.ProcessMemoryLimit = limit? limit*MByte : 2*MByte*1024;
+    jobInfo.ProcessMemoryLimit = limit ? limit * MByte : 2 * MByte * 1024;
     if (nullptr == hJob) {
         if (nullptr == (hJob = CreateJobObject(nullptr, nullptr))) {
             REPORT("Can't assign create job object: %ld\n", GetLastError());
@@ -70,62 +69,61 @@ void limitMem( size_t limit )
             exit(1);
         }
     }
-    if (0 == SetInformationJobObject(hJob, JobObjectExtendedLimitInformation,
-                                     &jobInfo, sizeof(jobInfo))) {
+    if (0 == SetInformationJobObject(hJob, JobObjectExtendedLimitInformation, &jobInfo, sizeof(jobInfo))) {
         REPORT("Can't set limits: %ld\n", GetLastError());
         exit(1);
     }
 }
 // Do not test errno with static VC runtime
-#else // _WIN32 || _WIN64
-#include <sys/resource.h>
-#include <stdlib.h>
-#include <stdio.h>
+#else// _WIN32 || _WIN64
 #include <errno.h>
-#include <sys/types.h>  // uint64_t on FreeBSD, needed for rlim_t
-#include <stdint.h>     // SIZE_MAX
+#include <stdint.h>// SIZE_MAX
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/resource.h>
+#include <sys/types.h>// uint64_t on FreeBSD, needed for rlim_t
 
-void limitMem( size_t limit )
-{
+void limitMem(size_t limit) {
     rlimit rlim;
-    int ret = getrlimit(RLIMIT_AS,&rlim);
+    int ret = getrlimit(RLIMIT_AS, &rlim);
     if (0 != ret) {
         REPORT("getrlimit() returned an error: errno %d\n", errno);
         exit(1);
     }
-    if (rlim.rlim_max==(rlim_t)RLIM_INFINITY)
-        rlim.rlim_cur = (limit > 0) ? limit*MByte : rlim.rlim_max;
-    else rlim.rlim_cur = (limit > 0 && static_cast<rlim_t>(limit)<rlim.rlim_max) ? limit*MByte : rlim.rlim_max;
-    ret = setrlimit(RLIMIT_AS,&rlim);
+    if (rlim.rlim_max == (rlim_t) RLIM_INFINITY) rlim.rlim_cur = (limit > 0) ? limit * MByte : rlim.rlim_max;
+    else
+        rlim.rlim_cur
+                = (limit > 0 && static_cast<rlim_t>(limit) < rlim.rlim_max) ? limit * MByte : rlim.rlim_max;
+    ret = setrlimit(RLIMIT_AS, &rlim);
     if (0 != ret) {
         REPORT("Can't set limits: errno %d\n", errno);
         exit(1);
     }
 }
-#endif  // _WIN32 || _WIN64
+#endif                // _WIN32 || _WIN64
 
 bool __tbb_test_errno = false;
 
-#define ASSERT_ERRNO(cond, msg)  REQUIRE_MESSAGE( (!__tbb_test_errno || (cond)), msg )
+#define ASSERT_ERRNO(cond, msg) REQUIRE_MESSAGE((!__tbb_test_errno || (cond)), msg)
 #define CHECK_ERRNO(cond) (__tbb_test_errno && (cond))
 
 static const int MinThread = 1;
 static const int MaxThread = 4;
 static bool Verbose = false;
 
-#include <time.h>
 #include <errno.h>
-#include <limits.h> // for CHAR_BIT
+#include <limits.h>// for CHAR_BIT
+#include <time.h>
 
 #if __unix__
-#include <stdint.h> // uintptr_t
+#include <stdint.h>// uintptr_t
 #endif
 #if _WIN32 || _WIN64
-#include <malloc.h> // _aligned_(malloc|free|realloc)
+#include <malloc.h>// _aligned_(malloc|free|realloc)
 #if __MINGW64__
 // Workaround a bug in MinGW64 headers with _aligned_(malloc|free) not declared by default
 extern "C" void __cdecl __declspec(dllimport) _aligned_free(void *);
-extern "C" void *__cdecl __declspec(dllimport) _aligned_malloc(size_t,size_t);
+extern "C" void *__cdecl __declspec(dllimport) _aligned_malloc(size_t, size_t);
 #endif
 #endif
 
@@ -135,42 +133,42 @@ const int COUNT_ELEM = 25000;
 const size_t MAX_SIZE = 1000;
 const int COUNTEXPERIMENT = 10000;
 
-const char strError[]="failed";
-const char strOk[]="done";
+const char strError[] = "failed";
+const char strOk[] = "done";
 
 typedef unsigned int UINT;
 typedef unsigned char UCHAR;
 typedef unsigned long DWORD;
 typedef unsigned char BYTE;
 
-typedef void* TestMalloc(size_t size);
-typedef void* TestCalloc(size_t num, size_t size);
-typedef void* TestRealloc(void* memblock, size_t size);
-typedef void  TestFree(void* memblock);
-typedef int   TestPosixMemalign(void **memptr, size_t alignment, size_t size);
-typedef void* TestAlignedMalloc(size_t size, size_t alignment);
-typedef void* TestAlignedRealloc(void* memblock, size_t size, size_t alignment);
-typedef void  TestAlignedFree(void* memblock);
+typedef void *TestMalloc(size_t size);
+typedef void *TestCalloc(size_t num, size_t size);
+typedef void *TestRealloc(void *memblock, size_t size);
+typedef void TestFree(void *memblock);
+typedef int TestPosixMemalign(void **memptr, size_t alignment, size_t size);
+typedef void *TestAlignedMalloc(size_t size, size_t alignment);
+typedef void *TestAlignedRealloc(void *memblock, size_t size, size_t alignment);
+typedef void TestAlignedFree(void *memblock);
 
 // pointers to tested functions
-TestMalloc*  Rmalloc;
-TestCalloc*  Rcalloc;
-TestRealloc* Rrealloc;
-TestFree*    Tfree;
-TestPosixMemalign*  Rposix_memalign;
-TestAlignedMalloc*  Raligned_malloc;
-TestAlignedRealloc* Raligned_realloc;
-TestAlignedFree* Taligned_free;
+TestMalloc *Rmalloc;
+TestCalloc *Rcalloc;
+TestRealloc *Rrealloc;
+TestFree *Tfree;
+TestPosixMemalign *Rposix_memalign;
+TestAlignedMalloc *Raligned_malloc;
+TestAlignedRealloc *Raligned_realloc;
+TestAlignedFree *Taligned_free;
 
 // call functions via pointer and check result's alignment
-void* Tmalloc(size_t size);
-void* Tcalloc(size_t num, size_t size);
-void* Trealloc(void* memblock, size_t size);
-int   Tposix_memalign(void **memptr, size_t alignment, size_t size);
-void* Taligned_malloc(size_t size, size_t alignment);
-void* Taligned_realloc(void* memblock, size_t size, size_t alignment);
+void *Tmalloc(size_t size);
+void *Tcalloc(size_t num, size_t size);
+void *Trealloc(void *memblock, size_t size);
+int Tposix_memalign(void **memptr, size_t alignment, size_t size);
+void *Taligned_malloc(size_t size, size_t alignment);
+void *Taligned_realloc(void *memblock, size_t size, size_t alignment);
 
-std::atomic<bool> error_occurred{ false };
+std::atomic<bool> error_occurred {false};
 
 #if __APPLE__
 // Tests that use the variables are skipped on macOS*
@@ -182,33 +180,30 @@ static bool perProcessLimits = true;
 
 const size_t POWERS_OF_2 = 20;
 
-struct MemStruct
-{
-    void* Pointer;
+struct MemStruct {
+    void *Pointer;
     UINT Size;
 
     MemStruct() : Pointer(nullptr), Size(0) {}
-    MemStruct(void* ptr, UINT sz) : Pointer(ptr), Size(sz) {}
+    MemStruct(void *ptr, UINT sz) : Pointer(ptr), Size(sz) {}
 };
 
-class CMemTest: utils::NoAssign
-{
+class CMemTest : utils::NoAssign {
     bool FullLog;
     utils::SpinBarrier *limitBarrier;
     static bool firstTime;
 
 public:
-    CMemTest(utils::SpinBarrier *barrier, bool isVerbose=false) : limitBarrier(barrier)
-        {
-            srand((UINT)time(nullptr));
-            FullLog=isVerbose;
-        }
-    void NULLReturn(UINT MinSize, UINT MaxSize, int total_threads); // nullptr pointer + check errno
-    void UniquePointer(); // unique pointer - check with padding
-    void AddrArifm(); // unique pointer - check with pointer arithmetic
+    CMemTest(utils::SpinBarrier *barrier, bool isVerbose = false) : limitBarrier(barrier) {
+        srand((UINT) time(nullptr));
+        FullLog = isVerbose;
+    }
+    void NULLReturn(UINT MinSize, UINT MaxSize, int total_threads);// nullptr pointer + check errno
+    void UniquePointer();                                          // unique pointer - check with padding
+    void AddrArifm();// unique pointer - check with pointer arithmetic
     bool ShouldReportError();
-    void Free_NULL(); //
-    void Zerofilling(); // check if arrays are zero-filled
+    void Free_NULL();  //
+    void Zerofilling();// check if arrays are zero-filled
     void TestAlignedParameters();
     void RunAllTests(int total_threads);
     ~CMemTest() {}
@@ -216,407 +211,355 @@ class CMemTest: utils::NoAssign
 
 class Limit {
     size_t limit;
+
 public:
     Limit(size_t a_limit) : limit(a_limit) {}
-    void operator() () const {
-        limitMem(limit);
-    }
+    void operator()() const { limitMem(limit); }
 };
 
 int argC;
-char** argV;
+char **argV;
 
-struct RoundRobin: utils::NoAssign {
+struct RoundRobin : utils::NoAssign {
     const long number_of_threads;
     mutable CMemTest test;
 
-    RoundRobin( long p, utils::SpinBarrier *limitBarrier, bool verbose ) :
-        number_of_threads(p), test(limitBarrier, verbose) {}
-    void operator()( int /*id*/ ) const
-        {
-            test.RunAllTests(number_of_threads);
-        }
+    RoundRobin(long p, utils::SpinBarrier *limitBarrier, bool verbose)
+        : number_of_threads(p), test(limitBarrier, verbose) {}
+    void operator()(int /*id*/) const { test.RunAllTests(number_of_threads); }
 };
 
 bool CMemTest::firstTime = true;
 
-inline size_t choose_random_alignment() {
-    return sizeof(void*)<<(rand() % POWERS_OF_2);
-}
+inline size_t choose_random_alignment() { return sizeof(void *) << (rand() % POWERS_OF_2); }
 
 #if TBB_REVAMP_TODO
 // TODO: enable this test mode
-static void setSystemAllocs()
-{
-    Rmalloc=malloc;
-    Rrealloc=realloc;
-    Rcalloc=calloc;
-    Tfree=free;
+static void setSystemAllocs() {
+    Rmalloc = malloc;
+    Rrealloc = realloc;
+    Rcalloc = calloc;
+    Tfree = free;
 #if _WIN32 || _WIN64
-    Raligned_malloc=_aligned_malloc;
-    Raligned_realloc=_aligned_realloc;
-    Taligned_free=_aligned_free;
-    Rposix_memalign=0;
-#elif  __APPLE__ || __sun || __ANDROID__
-// macOS, Solaris*, and Android* don't have posix_memalign
-    Raligned_malloc=0;
-    Raligned_realloc=0;
-    Taligned_free=0;
-    Rposix_memalign=0;
+    Raligned_malloc = _aligned_malloc;
+    Raligned_realloc = _aligned_realloc;
+    Taligned_free = _aligned_free;
+    Rposix_memalign = 0;
+#elif __APPLE__ || __sun || __ANDROID__
+    // macOS, Solaris*, and Android* don't have posix_memalign
+    Raligned_malloc = 0;
+    Raligned_realloc = 0;
+    Taligned_free = 0;
+    Rposix_memalign = 0;
 #else
-    Raligned_malloc=0;
-    Raligned_realloc=0;
-    Taligned_free=0;
-    Rposix_memalign=posix_memalign;
+    Raligned_malloc = 0;
+    Raligned_realloc = 0;
+    Taligned_free = 0;
+    Rposix_memalign = posix_memalign;
 #endif
 }
 #endif
 
 // check that realloc works as free and as malloc
-void ReallocParam()
-{
+void ReallocParam() {
     const int ITERS = 1000;
     int i;
     void *bufs[ITERS];
 
-    bufs[0] = Trealloc(nullptr, 30*MByte);
+    bufs[0] = Trealloc(nullptr, 30 * MByte);
     REQUIRE_MESSAGE(bufs[0], "Can't get memory to start the test.");
 
-    for (i=1; i<ITERS; i++)
-    {
-        bufs[i] = Trealloc(nullptr, 30*MByte);
-        if (nullptr == bufs[i])
-            break;
+    for (i = 1; i < ITERS; i++) {
+        bufs[i] = Trealloc(nullptr, 30 * MByte);
+        if (nullptr == bufs[i]) break;
     }
-    REQUIRE_MESSAGE(i<ITERS, "Limits should be decreased for the test to work.");
+    REQUIRE_MESSAGE(i < ITERS, "Limits should be decreased for the test to work.");
 
     Trealloc(bufs[0], 0);
     /* There is a race for the free space between different threads at
        this point. So, have to run the test sequentially.
     */
-    bufs[0] = Trealloc(nullptr, 30*MByte);
+    bufs[0] = Trealloc(nullptr, 30 * MByte);
     REQUIRE(bufs[0]);
 
-    for (int j=0; j<i; j++)
-        Trealloc(bufs[j], 0);
+    for (int j = 0; j < i; j++) Trealloc(bufs[j], 0);
 }
 
-void CheckArgumentsOverflow()
-{
+void CheckArgumentsOverflow() {
     void *p;
-    const size_t params[] = {SIZE_MAX, SIZE_MAX-16};
+    const size_t params[] = {SIZE_MAX, SIZE_MAX - 16};
 
-    for (unsigned i=0; i<utils::array_length(params); i++) {
+    for (unsigned i = 0; i < utils::array_length(params); i++) {
         p = Tmalloc(params[i]);
         REQUIRE(!p);
-        ASSERT_ERRNO(errno==ENOMEM, nullptr);
+        ASSERT_ERRNO(errno == ENOMEM, nullptr);
         p = Trealloc(nullptr, params[i]);
         REQUIRE(!p);
-        ASSERT_ERRNO(errno==ENOMEM, nullptr);
+        ASSERT_ERRNO(errno == ENOMEM, nullptr);
         p = Tcalloc(1, params[i]);
         REQUIRE(!p);
-        ASSERT_ERRNO(errno==ENOMEM, nullptr);
+        ASSERT_ERRNO(errno == ENOMEM, nullptr);
         p = Tcalloc(params[i], 1);
         REQUIRE(!p);
-        ASSERT_ERRNO(errno==ENOMEM, nullptr);
+        ASSERT_ERRNO(errno == ENOMEM, nullptr);
     }
-    const size_t max_alignment = size_t(1) << (sizeof(size_t)*CHAR_BIT - 1);
+    const size_t max_alignment = size_t(1) << (sizeof(size_t) * CHAR_BIT - 1);
     if (Rposix_memalign) {
         int ret = Rposix_memalign(&p, max_alignment, ~max_alignment);
         REQUIRE(ret == ENOMEM);
-        for (unsigned i=0; i<utils::array_length(params); i++) {
+        for (unsigned i = 0; i < utils::array_length(params); i++) {
             ret = Rposix_memalign(&p, max_alignment, params[i]);
             REQUIRE(ret == ENOMEM);
-            ret = Rposix_memalign(&p, sizeof(void*), params[i]);
+            ret = Rposix_memalign(&p, sizeof(void *), params[i]);
             REQUIRE(ret == ENOMEM);
         }
     }
     if (Raligned_malloc) {
         p = Raligned_malloc(~max_alignment, max_alignment);
         REQUIRE(!p);
-        for (unsigned i=0; i<utils::array_length(params); i++) {
+        for (unsigned i = 0; i < utils::array_length(params); i++) {
             p = Raligned_malloc(params[i], max_alignment);
             REQUIRE(!p);
-            ASSERT_ERRNO(errno==ENOMEM, nullptr);
-            p = Raligned_malloc(params[i], sizeof(void*));
+            ASSERT_ERRNO(errno == ENOMEM, nullptr);
+            p = Raligned_malloc(params[i], sizeof(void *));
             REQUIRE(!p);
-            ASSERT_ERRNO(errno==ENOMEM, nullptr);
+            ASSERT_ERRNO(errno == ENOMEM, nullptr);
         }
     }
 
-    p = Tcalloc(SIZE_MAX/2-16, SIZE_MAX/2-16);
+    p = Tcalloc(SIZE_MAX / 2 - 16, SIZE_MAX / 2 - 16);
     REQUIRE(!p);
-    ASSERT_ERRNO(errno==ENOMEM, nullptr);
-    p = Tcalloc(SIZE_MAX/2, SIZE_MAX/2);
+    ASSERT_ERRNO(errno == ENOMEM, nullptr);
+    p = Tcalloc(SIZE_MAX / 2, SIZE_MAX / 2);
     REQUIRE(!p);
-    ASSERT_ERRNO(errno==ENOMEM, nullptr);
+    ASSERT_ERRNO(errno == ENOMEM, nullptr);
 }
 
-void InvariantDataRealloc(bool aligned, size_t maxAllocSize, bool checkData)
-{
+void InvariantDataRealloc(bool aligned, size_t maxAllocSize, bool checkData) {
     utils::FastRandom<> fastRandom(1);
     size_t size = 0, start = 0;
     char *ptr = nullptr,
-        // external thread to create copies and compare ralloc result against it
-        *base = (char*)Tmalloc(2*maxAllocSize);
+         // external thread to create copies and compare ralloc result against it
+            *base = (char *) Tmalloc(2 * maxAllocSize);
 
     REQUIRE(base);
-    REQUIRE_MESSAGE(!(2*maxAllocSize%sizeof(unsigned short)),
-           "The loop below expects that 2*maxAllocSize contains sizeof(unsigned short)");
-    for (size_t k = 0; k<2*maxAllocSize; k+=sizeof(unsigned short))
-        *(unsigned short*)(base+k) = fastRandom.get();
+    REQUIRE_MESSAGE(!(2 * maxAllocSize % sizeof(unsigned short)),
+                    "The loop below expects that 2*maxAllocSize contains sizeof(unsigned short)");
+    for (size_t k = 0; k < 2 * maxAllocSize; k += sizeof(unsigned short))
+        *(unsigned short *) (base + k) = fastRandom.get();
 
-    for (int i=0; i<100; i++) {
+    for (int i = 0; i < 100; i++) {
         // don't want sizeNew==0 here
-        const size_t sizeNew = fastRandom.get() % (maxAllocSize-1) + 1;
-        char *ptrNew = aligned?
-            (char*)Taligned_realloc(ptr, sizeNew, choose_random_alignment())
-            : (char*)Trealloc(ptr, sizeNew);
+        const size_t sizeNew = fastRandom.get() % (maxAllocSize - 1) + 1;
+        char *ptrNew = aligned ? (char *) Taligned_realloc(ptr, sizeNew, choose_random_alignment())
+                               : (char *) Trealloc(ptr, sizeNew);
         REQUIRE(ptrNew);
         // check that old data not changed
         if (checkData)
-            REQUIRE_MESSAGE(!memcmp(ptrNew, base+start, utils::min(size, sizeNew)), "broken data");
+            REQUIRE_MESSAGE(!memcmp(ptrNew, base + start, utils::min(size, sizeNew)), "broken data");
 
         // prepare fresh data, copying them from random position in external
         size = sizeNew;
         ptr = ptrNew;
         if (checkData) {
             start = fastRandom.get() % maxAllocSize;
-            memcpy(ptr, base+start, size);
+            memcpy(ptr, base + start, size);
         }
     }
-    if (aligned)
-        Taligned_realloc(ptr, 0, choose_random_alignment());
+    if (aligned) Taligned_realloc(ptr, 0, choose_random_alignment());
     else
         Trealloc(ptr, 0);
     Tfree(base);
 }
 
-void CheckReallocLeak()
-{
+void CheckReallocLeak() {
     int i;
     const int ITER_TO_STABILITY = 10;
     // do bootstrap
-    for (int k=0; k<3; k++)
-        InvariantDataRealloc(/*aligned=*/false, 128*MByte, /*checkData=*/false);
+    for (int k = 0; k < 3; k++) InvariantDataRealloc(/*aligned=*/false, 128 * MByte, /*checkData=*/false);
     size_t prev = utils::GetMemoryUsage(utils::peakUsage);
     // expect realloc to not increase peak memory consumption after ITER_TO_STABILITY-1 iterations
-    for (i=0; i<ITER_TO_STABILITY; i++) {
-        for (int k=0; k<3; k++)
-            InvariantDataRealloc(/*aligned=*/false, 128*MByte, /*checkData=*/false);
+    for (i = 0; i < ITER_TO_STABILITY; i++) {
+        for (int k = 0; k < 3; k++) InvariantDataRealloc(/*aligned=*/false, 128 * MByte, /*checkData=*/false);
         size_t curr = utils::GetMemoryUsage(utils::peakUsage);
-        if (prev == curr)
-            break;
+        if (prev == curr) break;
         prev = curr;
     }
     REQUIRE_MESSAGE(i < ITER_TO_STABILITY, "Can't stabilize memory consumption.");
 }
 
 // if non-zero byte found, returns bad value address plus 1
-size_t NonZero(void *ptr, size_t size)
-{
+size_t NonZero(void *ptr, size_t size) {
     size_t words = size / sizeof(intptr_t);
     size_t tailSz = size % sizeof(intptr_t);
-    intptr_t *buf =(intptr_t*)ptr;
-    char *bufTail =(char*)(buf+words);
+    intptr_t *buf = (intptr_t *) ptr;
+    char *bufTail = (char *) (buf + words);
 
-    for (size_t i=0; i<words; i++)
+    for (size_t i = 0; i < words; i++)
         if (buf[i]) {
-            for (unsigned b=0; b<sizeof(intptr_t); b++)
-                if (((char*)(buf+i))[b])
-                    return sizeof(intptr_t)*i + b + 1;
-        }
-    for (size_t i=0; i<tailSz; i++)
-        if (bufTail[i]) {
-            return words*sizeof(intptr_t)+i+1;
+            for (unsigned b = 0; b < sizeof(intptr_t); b++)
+                if (((char *) (buf + i))[b]) return sizeof(intptr_t) * i + b + 1;
         }
+    for (size_t i = 0; i < tailSz; i++)
+        if (bufTail[i]) { return words * sizeof(intptr_t) + i + 1; }
     return 0;
 }
 
-struct TestStruct
-{
-    DWORD field1:2;
-    DWORD field2:6;
+struct TestStruct {
+    DWORD field1 : 2;
+    DWORD field2 : 6;
     double field3;
     UCHAR field4[100];
-    TestStruct* field5;
+    TestStruct *field5;
     std::vector<int> field7;
     double field8;
 };
 
-void* Tmalloc(size_t size)
-{
+void *Tmalloc(size_t size) {
     // For compatibility, on 64-bit systems malloc should align to 16 bytes
-    size_t alignment = (sizeof(intptr_t)>4 && size>8) ? 16 : 8;
+    size_t alignment = (sizeof(intptr_t) > 4 && size > 8) ? 16 : 8;
     void *ret = Rmalloc(size);
     if (nullptr != ret)
-        CHECK_FAST_MESSAGE(0==((uintptr_t)ret & (alignment-1)),
-               "allocation result should be properly aligned");
+        CHECK_FAST_MESSAGE(0 == ((uintptr_t) ret & (alignment - 1)),
+                           "allocation result should be properly aligned");
     return ret;
 }
-void* Tcalloc(size_t num, size_t size)
-{
+void *Tcalloc(size_t num, size_t size) {
     // For compatibility, on 64-bit systems calloc should align to 16 bytes
-    size_t alignment = (sizeof(intptr_t)>4 && num && size>8) ? 16 : 8;
+    size_t alignment = (sizeof(intptr_t) > 4 && num && size > 8) ? 16 : 8;
     void *ret = Rcalloc(num, size);
     if (nullptr != ret)
-        CHECK_FAST_MESSAGE(0==((uintptr_t)ret & (alignment-1)),
-               "allocation result should be properly aligned");
+        CHECK_FAST_MESSAGE(0 == ((uintptr_t) ret & (alignment - 1)),
+                           "allocation result should be properly aligned");
     return ret;
 }
-void* Trealloc(void* memblock, size_t size)
-{
+void *Trealloc(void *memblock, size_t size) {
     // For compatibility, on 64-bit systems realloc should align to 16 bytes
-    size_t alignment = (sizeof(intptr_t)>4 && size>8) ? 16 : 8;
+    size_t alignment = (sizeof(intptr_t) > 4 && size > 8) ? 16 : 8;
     void *ret = Rrealloc(memblock, size);
     if (nullptr != ret)
-        CHECK_FAST_MESSAGE(0==((uintptr_t)ret & (alignment-1)),
-               "allocation result should be properly aligned");
+        CHECK_FAST_MESSAGE(0 == ((uintptr_t) ret & (alignment - 1)),
+                           "allocation result should be properly aligned");
     return ret;
 }
-int Tposix_memalign(void **memptr, size_t alignment, size_t size)
-{
+int Tposix_memalign(void **memptr, size_t alignment, size_t size) {
     int ret = Rposix_memalign(memptr, alignment, size);
     if (0 == ret)
-        CHECK_FAST_MESSAGE(0==((uintptr_t)*memptr & (alignment-1)),
-               "allocation result should be aligned");
+        CHECK_FAST_MESSAGE(0 == ((uintptr_t) *memptr & (alignment - 1)),
+                           "allocation result should be aligned");
     return ret;
 }
-void* Taligned_malloc(size_t size, size_t alignment)
-{
+void *Taligned_malloc(size_t size, size_t alignment) {
     void *ret = Raligned_malloc(size, alignment);
     if (nullptr != ret)
-        CHECK_FAST_MESSAGE(0==((uintptr_t)ret & (alignment-1)),
-               "allocation result should be aligned");
+        CHECK_FAST_MESSAGE(0 == ((uintptr_t) ret & (alignment - 1)), "allocation result should be aligned");
     return ret;
 }
-void* Taligned_realloc(void* memblock, size_t size, size_t alignment)
-{
+void *Taligned_realloc(void *memblock, size_t size, size_t alignment) {
     void *ret = Raligned_realloc(memblock, size, alignment);
     if (nullptr != ret)
-        CHECK_FAST_MESSAGE(0==((uintptr_t)ret & (alignment-1)),
-               "allocation result should be aligned");
+        CHECK_FAST_MESSAGE(0 == ((uintptr_t) ret & (alignment - 1)), "allocation result should be aligned");
     return ret;
 }
 
 struct PtrSize {
-    void  *ptr;
+    void *ptr;
     size_t size;
 };
 
-static int cmpAddrs(const void *p1, const void *p2)
-{
-    const PtrSize *a = (const PtrSize *)p1;
-    const PtrSize *b = (const PtrSize *)p2;
+static int cmpAddrs(const void *p1, const void *p2) {
+    const PtrSize *a = (const PtrSize *) p1;
+    const PtrSize *b = (const PtrSize *) p2;
 
-    return a->ptr < b->ptr ? -1 : ( a->ptr == b->ptr ? 0 : 1);
+    return a->ptr < b->ptr ? -1 : (a->ptr == b->ptr ? 0 : 1);
 }
 
-void CMemTest::AddrArifm()
-{
-    PtrSize *arr = (PtrSize*)Tmalloc(COUNT_ELEM*sizeof(PtrSize));
+void CMemTest::AddrArifm() {
+    PtrSize *arr = (PtrSize *) Tmalloc(COUNT_ELEM * sizeof(PtrSize));
 
     if (FullLog) REPORT("\nUnique pointer using Address arithmetic\n");
     if (FullLog) REPORT("malloc....");
     REQUIRE(arr);
-    for (int i=0; i<COUNT_ELEM; i++)
-    {
-        arr[i].size=rand()%MAX_SIZE;
-        arr[i].ptr=Tmalloc(arr[i].size);
+    for (int i = 0; i < COUNT_ELEM; i++) {
+        arr[i].size = rand() % MAX_SIZE;
+        arr[i].ptr = Tmalloc(arr[i].size);
     }
     qsort(arr, COUNT_ELEM, sizeof(PtrSize), cmpAddrs);
 
-    for (int i=0; i<COUNT_ELEM-1; i++)
-    {
-        if (nullptr!=arr[i].ptr && nullptr!=arr[i+1].ptr)
-            REQUIRE_MESSAGE((uintptr_t)arr[i].ptr+arr[i].size <= (uintptr_t)arr[i+1].ptr,
-                   "intersection detected");
+    for (int i = 0; i < COUNT_ELEM - 1; i++) {
+        if (nullptr != arr[i].ptr && nullptr != arr[i + 1].ptr)
+            REQUIRE_MESSAGE((uintptr_t) arr[i].ptr + arr[i].size <= (uintptr_t) arr[i + 1].ptr,
+                            "intersection detected");
     }
     //----------------------------------------------------------------
     if (FullLog) REPORT("realloc....");
-    for (int i=0; i<COUNT_ELEM; i++)
-    {
-        size_t count=arr[i].size*2;
-        void *tmpAddr=Trealloc(arr[i].ptr,count);
-        if (nullptr!=tmpAddr) {
+    for (int i = 0; i < COUNT_ELEM; i++) {
+        size_t count = arr[i].size * 2;
+        void *tmpAddr = Trealloc(arr[i].ptr, count);
+        if (nullptr != tmpAddr) {
             arr[i].ptr = tmpAddr;
             arr[i].size = count;
-        } else if (count==0) { // because realloc(..., 0) works as free
+        } else if (count == 0) {// because realloc(..., 0) works as free
             arr[i].ptr = nullptr;
             arr[i].size = 0;
         }
     }
     qsort(arr, COUNT_ELEM, sizeof(PtrSize), cmpAddrs);
 
-    for (int i=0; i<COUNT_ELEM-1; i++)
-    {
-        if (nullptr!=arr[i].ptr && nullptr!=arr[i+1].ptr)
-            REQUIRE_MESSAGE((uintptr_t)arr[i].ptr+arr[i].size <= (uintptr_t)arr[i+1].ptr,
-                   "intersection detected");
-    }
-    for (int i=0; i<COUNT_ELEM; i++)
-    {
-        Tfree(arr[i].ptr);
+    for (int i = 0; i < COUNT_ELEM - 1; i++) {
+        if (nullptr != arr[i].ptr && nullptr != arr[i + 1].ptr)
+            REQUIRE_MESSAGE((uintptr_t) arr[i].ptr + arr[i].size <= (uintptr_t) arr[i + 1].ptr,
+                            "intersection detected");
     }
+    for (int i = 0; i < COUNT_ELEM; i++) { Tfree(arr[i].ptr); }
     //-------------------------------------------
     if (FullLog) REPORT("calloc....");
-    for (int i=0; i<COUNT_ELEM; i++)
-    {
-        arr[i].size=rand()%MAX_SIZE;
-        arr[i].ptr=Tcalloc(arr[i].size,1);
+    for (int i = 0; i < COUNT_ELEM; i++) {
+        arr[i].size = rand() % MAX_SIZE;
+        arr[i].ptr = Tcalloc(arr[i].size, 1);
     }
     qsort(arr, COUNT_ELEM, sizeof(PtrSize), cmpAddrs);
 
-    for (int i=0; i<COUNT_ELEM-1; i++)
-    {
-        if (nullptr!=arr[i].ptr && nullptr!=arr[i+1].ptr)
-            REQUIRE_MESSAGE((uintptr_t)arr[i].ptr+arr[i].size <= (uintptr_t)arr[i+1].ptr,
-                   "intersection detected");
-    }
-    for (int i=0; i<COUNT_ELEM; i++)
-    {
-        Tfree(arr[i].ptr);
+    for (int i = 0; i < COUNT_ELEM - 1; i++) {
+        if (nullptr != arr[i].ptr && nullptr != arr[i + 1].ptr)
+            REQUIRE_MESSAGE((uintptr_t) arr[i].ptr + arr[i].size <= (uintptr_t) arr[i + 1].ptr,
+                            "intersection detected");
     }
+    for (int i = 0; i < COUNT_ELEM; i++) { Tfree(arr[i].ptr); }
     Tfree(arr);
 }
 
-void CMemTest::Zerofilling()
-{
-    TestStruct* TSMas;
+void CMemTest::Zerofilling() {
+    TestStruct *TSMas;
     size_t CountElement;
-    static std::atomic<int> CountErrors{0};
+    static std::atomic<int> CountErrors {0};
     if (FullLog) REPORT("\nzeroings elements of array....");
     //test struct
-    for (int i=0; i<COUNTEXPERIMENT; i++)
-    {
-        CountElement=rand()%MAX_SIZE;
-        TSMas=(TestStruct*)Tcalloc(CountElement,sizeof(TestStruct));
-        if (nullptr == TSMas)
-            continue;
-        for (size_t j=0; j<CountElement; j++)
-        {
-            if (NonZero(TSMas+j, sizeof(TestStruct)))
-            {
+    for (int i = 0; i < COUNTEXPERIMENT; i++) {
+        CountElement = rand() % MAX_SIZE;
+        TSMas = (TestStruct *) Tcalloc(CountElement, sizeof(TestStruct));
+        if (nullptr == TSMas) continue;
+        for (size_t j = 0; j < CountElement; j++) {
+            if (NonZero(TSMas + j, sizeof(TestStruct))) {
                 CountErrors++;
                 if (ShouldReportError()) REPORT("detect nonzero element at TestStruct\n");
             }
         }
         Tfree(TSMas);
     }
-    if (CountErrors) REPORT("%s\n",strError);
-    else if (FullLog) REPORT("%s\n",strOk);
+    if (CountErrors) REPORT("%s\n", strError);
+    else if (FullLog)
+        REPORT("%s\n", strOk);
     if (CountErrors) error_occurred = true;
 }
 
 #if !__APPLE__
 
-void myMemset(void *ptr, int c, size_t n)
-{
-#if  __unix__ &&  __i386__
-// memset in Fedora 13 not always correctly sets memory to required values.
-    char *p = (char*)ptr;
-    for (size_t i=0; i<n; i++)
-        p[i] = c;
+void myMemset(void *ptr, int c, size_t n) {
+#if __unix__ && __i386__
+    // memset in Fedora 13 not always correctly sets memory to required values.
+    char *p = (char *) ptr;
+    for (size_t i = 0; i < n; i++) p[i] = c;
 #else
     memset(ptr, c, n);
 #endif
@@ -625,65 +568,61 @@ void myMemset(void *ptr, int c, size_t n)
 // This test requires more than TOTAL_MB_ALLOC MB of RAM.
 #if __ANDROID__
 // Android requires lower limit due to lack of virtual memory.
-#define TOTAL_MB_ALLOC	200
+#define TOTAL_MB_ALLOC 200
 #else
-#define TOTAL_MB_ALLOC  800
+#define TOTAL_MB_ALLOC 800
 #endif
-void CMemTest::NULLReturn(UINT MinSize, UINT MaxSize, int total_threads)
-{
+void CMemTest::NULLReturn(UINT MinSize, UINT MaxSize, int total_threads) {
     const int MB_PER_THREAD = TOTAL_MB_ALLOC / total_threads;
     // find size to guarantee getting nullptr for 1024 B allocations
-    const int MAXNUM_1024 = (MB_PER_THREAD + (MB_PER_THREAD>>2)) * 1024;
+    const int MAXNUM_1024 = (MB_PER_THREAD + (MB_PER_THREAD >> 2)) * 1024;
 
     std::vector<MemStruct> PointerList;
     void *tmp;
-    static std::atomic<int> CountErrors{0};
+    static std::atomic<int> CountErrors {0};
     int CountNULL, num_1024;
     if (FullLog) REPORT("\nNULL return & check errno:\n");
     UINT Size;
     Limit limit_total(TOTAL_MB_ALLOC), no_limit(0);
-    void **buf_1024 = (void**)Tmalloc(MAXNUM_1024*sizeof(void*));
+    void **buf_1024 = (void **) Tmalloc(MAXNUM_1024 * sizeof(void *));
 
     REQUIRE(buf_1024);
     /* We must have space for pointers when memory limit is hit.
        Reserve enough for the worst case, taking into account race for
        limited space between threads.
     */
-    PointerList.reserve(TOTAL_MB_ALLOC*MByte/MinSize);
+    PointerList.reserve(TOTAL_MB_ALLOC * MByte / MinSize);
 
     /* There is a bug in the specific version of GLIBC (2.5-12) shipped
        with RHEL5 that leads to erroneous working of the test
        on Intel(R) 64 and Itanium(R) architecture when setrlimit-related part is enabled.
        Switching to GLIBC 2.5-18 from RHEL5.1 resolved the issue.
      */
-    if (perProcessLimits)
-        limitBarrier->wait(limit_total);
+    if (perProcessLimits) limitBarrier->wait(limit_total);
     else
         limitMem(MB_PER_THREAD);
 
     /* regression test against the bug in allocator when it dereference nullptr
        while lack of memory
     */
-    for (num_1024=0; num_1024<MAXNUM_1024; num_1024++) {
+    for (num_1024 = 0; num_1024 < MAXNUM_1024; num_1024++) {
         buf_1024[num_1024] = Tcalloc(1024, 1);
-        if (! buf_1024[num_1024]) {
+        if (!buf_1024[num_1024]) {
             ASSERT_ERRNO(errno == ENOMEM, nullptr);
             break;
         }
     }
-    for (int i=0; i<num_1024; i++)
-        Tfree(buf_1024[i]);
+    for (int i = 0; i < num_1024; i++) Tfree(buf_1024[i]);
     Tfree(buf_1024);
 
     do {
-        Size=rand()%(MaxSize-MinSize)+MinSize;
-        tmp=Tmalloc(Size);
-        if (tmp != nullptr)
-        {
+        Size = rand() % (MaxSize - MinSize) + MinSize;
+        tmp = Tmalloc(Size);
+        if (tmp != nullptr) {
             myMemset(tmp, 0, Size);
             PointerList.push_back(MemStruct(tmp, Size));
         }
-    } while(tmp != nullptr);
+    } while (tmp != nullptr);
     ASSERT_ERRNO(errno == ENOMEM, nullptr);
     if (FullLog) REPORT("\n");
 
@@ -691,105 +630,100 @@ void CMemTest::NULLReturn(UINT MinSize, UINT MaxSize, int total_threads)
     // malloc
     if (FullLog) REPORT("malloc....");
     CountNULL = 0;
-    while (CountNULL==0)
-        for (int j=0; j<COUNT_TESTS; j++)
-        {
-            Size=rand()%(MaxSize-MinSize)+MinSize;
-            errno = ENOMEM+j+1;
-            tmp=Tmalloc(Size);
-            if (tmp == nullptr)
-            {
+    while (CountNULL == 0)
+        for (int j = 0; j < COUNT_TESTS; j++) {
+            Size = rand() % (MaxSize - MinSize) + MinSize;
+            errno = ENOMEM + j + 1;
+            tmp = Tmalloc(Size);
+            if (tmp == nullptr) {
                 CountNULL++;
-                if ( CHECK_ERRNO(errno != ENOMEM) ) {
+                if (CHECK_ERRNO(errno != ENOMEM)) {
                     CountErrors++;
                     if (ShouldReportError()) REPORT("nullptr returned, error: errno (%d) != ENOMEM\n", errno);
                 }
-            }
-            else
-            {
+            } else {
                 // Technically, if malloc returns a non-null pointer, it is allowed to set errno anyway.
                 // However, on most systems it does not set errno.
                 bool known_issue = false;
 #if __unix__ || __ANDROID__
-                if( CHECK_ERRNO(errno==ENOMEM) ) known_issue = true;
+                if (CHECK_ERRNO(errno == ENOMEM)) known_issue = true;
 #endif /* __unix__ */
-                if ( CHECK_ERRNO(errno != ENOMEM+j+1) && !known_issue) {
+                if (CHECK_ERRNO(errno != ENOMEM + j + 1) && !known_issue) {
                     CountErrors++;
-                    if (ShouldReportError()) REPORT("error: errno changed to %d though valid pointer was returned\n", errno);
+                    if (ShouldReportError())
+                        REPORT("error: errno changed to %d though valid pointer was returned\n", errno);
                 }
                 myMemset(tmp, 0, Size);
                 PointerList.push_back(MemStruct(tmp, Size));
             }
         }
     if (FullLog) REPORT("end malloc\n");
-    if (CountErrors) REPORT("%s\n",strError);
-    else if (FullLog) REPORT("%s\n",strOk);
+    if (CountErrors) REPORT("%s\n", strError);
+    else if (FullLog)
+        REPORT("%s\n", strOk);
     if (CountErrors) error_occurred = true;
 
     //calloc
     if (FullLog) REPORT("calloc....");
     CountNULL = 0;
-    while (CountNULL==0)
-        for (int j=0; j<COUNT_TESTS; j++)
-        {
-            Size=rand()%(MaxSize-MinSize)+MinSize;
-            errno = ENOMEM+j+1;
-            tmp=Tcalloc(COUNT_ELEM_CALLOC,Size);
-            if (tmp == nullptr)
-            {
+    while (CountNULL == 0)
+        for (int j = 0; j < COUNT_TESTS; j++) {
+            Size = rand() % (MaxSize - MinSize) + MinSize;
+            errno = ENOMEM + j + 1;
+            tmp = Tcalloc(COUNT_ELEM_CALLOC, Size);
+            if (tmp == nullptr) {
                 CountNULL++;
-                if ( CHECK_ERRNO(errno != ENOMEM) ){
+                if (CHECK_ERRNO(errno != ENOMEM)) {
                     CountErrors++;
                     if (ShouldReportError()) REPORT("nullptr returned, error: errno(%d) != ENOMEM\n", errno);
                 }
-            }
-            else
-            {
+            } else {
                 // Technically, if calloc returns a non-null pointer, it is allowed to set errno anyway.
                 // However, on most systems it does not set errno.
                 bool known_issue = false;
 #if __unix__
-                if( CHECK_ERRNO(errno==ENOMEM) ) known_issue = true;
+                if (CHECK_ERRNO(errno == ENOMEM)) known_issue = true;
 #endif /* __unix__ */
-                if ( CHECK_ERRNO(errno != ENOMEM+j+1) && !known_issue ) {
+                if (CHECK_ERRNO(errno != ENOMEM + j + 1) && !known_issue) {
                     CountErrors++;
-                    if (ShouldReportError()) REPORT("error: errno changed to %d though valid pointer was returned\n", errno);
+                    if (ShouldReportError())
+                        REPORT("error: errno changed to %d though valid pointer was returned\n", errno);
                 }
                 PointerList.push_back(MemStruct(tmp, Size));
             }
         }
     if (FullLog) REPORT("end calloc\n");
-    if (CountErrors) REPORT("%s\n",strError);
-    else if (FullLog) REPORT("%s\n",strOk);
+    if (CountErrors) REPORT("%s\n", strError);
+    else if (FullLog)
+        REPORT("%s\n", strOk);
     if (CountErrors) error_occurred = true;
     if (FullLog) REPORT("realloc....");
     CountNULL = 0;
     if (PointerList.size() > 0)
-        while (CountNULL==0)
-            for (size_t i=0; i<(size_t)COUNT_TESTS && i<PointerList.size(); i++)
-            {
+        while (CountNULL == 0)
+            for (size_t i = 0; i < (size_t) COUNT_TESTS && i < PointerList.size(); i++) {
                 errno = 0;
-                tmp=Trealloc(PointerList[i].Pointer,PointerList[i].Size*2);
-                if (tmp != nullptr) // same or another place
+                tmp = Trealloc(PointerList[i].Pointer, PointerList[i].Size * 2);
+                if (tmp != nullptr)// same or another place
                 {
                     bool known_issue = false;
 #if __unix__
-                    if( errno==ENOMEM ) known_issue = true;
+                    if (errno == ENOMEM) known_issue = true;
 #endif /* __unix__ */
                     if (errno != 0 && !known_issue) {
                         CountErrors++;
                         if (ShouldReportError()) REPORT("valid pointer returned, error: errno not kept\n");
                     }
                     // newly allocated area have to be zeroed
-                    myMemset((char*)tmp + PointerList[i].Size, 0, PointerList[i].Size);
+                    myMemset((char *) tmp + PointerList[i].Size, 0, PointerList[i].Size);
                     PointerList[i].Pointer = tmp;
                     PointerList[i].Size *= 2;
                 } else {
                     CountNULL++;
-                    if ( CHECK_ERRNO(errno != ENOMEM) )
-                    {
+                    if (CHECK_ERRNO(errno != ENOMEM)) {
                         CountErrors++;
-                        if (ShouldReportError()) REPORT("nullptr returned, error: errno(%d) != ENOMEM\n", errno);
+                        if (ShouldReportError())
+                            REPORT("nullptr returned, error: errno(%d) != ENOMEM\n", errno);
                     }
                     // check data integrity
                     if (NonZero(PointerList[i].Pointer, PointerList[i].Size)) {
@@ -799,170 +733,149 @@ void CMemTest::NULLReturn(UINT MinSize, UINT MaxSize, int total_threads)
                 }
             }
     if (FullLog) REPORT("realloc end\n");
-    if (CountErrors) REPORT("%s\n",strError);
-    else if (FullLog) REPORT("%s\n",strOk);
+    if (CountErrors) REPORT("%s\n", strError);
+    else if (FullLog)
+        REPORT("%s\n", strOk);
     if (CountErrors) error_occurred = true;
-    for (UINT i=0; i<PointerList.size(); i++)
-    {
-        Tfree(PointerList[i].Pointer);
-    }
+    for (UINT i = 0; i < PointerList.size(); i++) { Tfree(PointerList[i].Pointer); }
 
-    if (perProcessLimits)
-        limitBarrier->wait(no_limit);
+    if (perProcessLimits) limitBarrier->wait(no_limit);
     else
         limitMem(0);
 }
 #endif /* #if !__APPLE__ */
 
-void CMemTest::UniquePointer()
-{
-    static std::atomic<int> CountErrors{0};
-    int **MasPointer = (int **)Tmalloc(sizeof(int*)*COUNT_ELEM);
-    size_t *MasCountElem = (size_t*)Tmalloc(sizeof(size_t)*COUNT_ELEM);
+void CMemTest::UniquePointer() {
+    static std::atomic<int> CountErrors {0};
+    int **MasPointer = (int **) Tmalloc(sizeof(int *) * COUNT_ELEM);
+    size_t *MasCountElem = (size_t *) Tmalloc(sizeof(size_t) * COUNT_ELEM);
     if (FullLog) REPORT("\nUnique pointer using 0\n");
     REQUIRE((MasCountElem && MasPointer));
     //
     //-------------------------------------------------------
     //malloc
-    for (int i=0; i<COUNT_ELEM; i++)
-    {
-        MasCountElem[i]=rand()%MAX_SIZE;
-        MasPointer[i]=(int*)Tmalloc(MasCountElem[i]*sizeof(int));
-        if (nullptr == MasPointer[i])
-            MasCountElem[i]=0;
-        memset(MasPointer[i], 0, sizeof(int)*MasCountElem[i]);
+    for (int i = 0; i < COUNT_ELEM; i++) {
+        MasCountElem[i] = rand() % MAX_SIZE;
+        MasPointer[i] = (int *) Tmalloc(MasCountElem[i] * sizeof(int));
+        if (nullptr == MasPointer[i]) MasCountElem[i] = 0;
+        memset(MasPointer[i], 0, sizeof(int) * MasCountElem[i]);
     }
     if (FullLog) REPORT("malloc....");
-    for (UINT i=0; i<COUNT_ELEM-1; i++)
-    {
-        if (size_t badOff = NonZero(MasPointer[i], sizeof(int)*MasCountElem[i])) {
+    for (UINT i = 0; i < COUNT_ELEM - 1; i++) {
+        if (size_t badOff = NonZero(MasPointer[i], sizeof(int) * MasCountElem[i])) {
             CountErrors++;
             if (ShouldReportError())
-                REPORT("error, detect non-zero at %p\n", (char*)MasPointer[i]+badOff-1);
+                REPORT("error, detect non-zero at %p\n", (char *) MasPointer[i] + badOff - 1);
         }
-        memset(MasPointer[i], 1, sizeof(int)*MasCountElem[i]);
+        memset(MasPointer[i], 1, sizeof(int) * MasCountElem[i]);
     }
-    if (CountErrors) REPORT("%s\n",strError);
-    else if (FullLog) REPORT("%s\n",strOk);
+    if (CountErrors) REPORT("%s\n", strError);
+    else if (FullLog)
+        REPORT("%s\n", strOk);
     if (CountErrors) error_occurred = true;
     //----------------------------------------------------------
     //calloc
-    for (int i=0; i<COUNT_ELEM; i++)
-        Tfree(MasPointer[i]);
-    for (long i=0; i<COUNT_ELEM; i++)
-    {
-        MasPointer[i]=(int*)Tcalloc(MasCountElem[i]*sizeof(int),2);
-        if (nullptr == MasPointer[i])
-            MasCountElem[i]=0;
+    for (int i = 0; i < COUNT_ELEM; i++) Tfree(MasPointer[i]);
+    for (long i = 0; i < COUNT_ELEM; i++) {
+        MasPointer[i] = (int *) Tcalloc(MasCountElem[i] * sizeof(int), 2);
+        if (nullptr == MasPointer[i]) MasCountElem[i] = 0;
     }
     if (FullLog) REPORT("calloc....");
-    for (int i=0; i<COUNT_ELEM-1; i++)
-    {
-        if (size_t badOff = NonZero(MasPointer[i], sizeof(int)*MasCountElem[i])) {
+    for (int i = 0; i < COUNT_ELEM - 1; i++) {
+        if (size_t badOff = NonZero(MasPointer[i], sizeof(int) * MasCountElem[i])) {
             CountErrors++;
             if (ShouldReportError())
-                REPORT("error, detect non-zero at %p\n", (char*)MasPointer[i]+badOff-1);
+                REPORT("error, detect non-zero at %p\n", (char *) MasPointer[i] + badOff - 1);
         }
-        memset(MasPointer[i], 1, sizeof(int)*MasCountElem[i]);
+        memset(MasPointer[i], 1, sizeof(int) * MasCountElem[i]);
     }
-    if (CountErrors) REPORT("%s\n",strError);
-    else if (FullLog) REPORT("%s\n",strOk);
+    if (CountErrors) REPORT("%s\n", strError);
+    else if (FullLog)
+        REPORT("%s\n", strOk);
     if (CountErrors) error_occurred = true;
     //---------------------------------------------------------
     //realloc
-    for (int i=0; i<COUNT_ELEM; i++)
-    {
-        MasCountElem[i]*=2;
-        *(MasPointer+i)=
-            (int*)Trealloc(*(MasPointer+i),MasCountElem[i]*sizeof(int));
-        if (nullptr == MasPointer[i])
-            MasCountElem[i]=0;
-        memset(MasPointer[i], 0, sizeof(int)*MasCountElem[i]);
+    for (int i = 0; i < COUNT_ELEM; i++) {
+        MasCountElem[i] *= 2;
+        *(MasPointer + i) = (int *) Trealloc(*(MasPointer + i), MasCountElem[i] * sizeof(int));
+        if (nullptr == MasPointer[i]) MasCountElem[i] = 0;
+        memset(MasPointer[i], 0, sizeof(int) * MasCountElem[i]);
     }
     if (FullLog) REPORT("realloc....");
-    for (int i=0; i<COUNT_ELEM-1; i++)
-    {
-        if (NonZero(MasPointer[i], sizeof(int)*MasCountElem[i]))
-            CountErrors++;
-        memset(MasPointer[i], 1, sizeof(int)*MasCountElem[i]);
+    for (int i = 0; i < COUNT_ELEM - 1; i++) {
+        if (NonZero(MasPointer[i], sizeof(int) * MasCountElem[i])) CountErrors++;
+        memset(MasPointer[i], 1, sizeof(int) * MasCountElem[i]);
     }
-    if (CountErrors) REPORT("%s\n",strError);
-    else if (FullLog) REPORT("%s\n",strOk);
+    if (CountErrors) REPORT("%s\n", strError);
+    else if (FullLog)
+        REPORT("%s\n", strOk);
     if (CountErrors) error_occurred = true;
-    for (int i=0; i<COUNT_ELEM; i++)
-        Tfree(MasPointer[i]);
+    for (int i = 0; i < COUNT_ELEM; i++) Tfree(MasPointer[i]);
     Tfree(MasCountElem);
     Tfree(MasPointer);
 }
 
-bool CMemTest::ShouldReportError()
-{
-    if (FullLog)
+bool CMemTest::ShouldReportError() {
+    if (FullLog) return true;
+    else if (firstTime) {
+        firstTime = false;
         return true;
-    else
-        if (firstTime) {
-            firstTime = false;
-            return true;
-        } else
-            return false;
+    } else
+        return false;
 }
 
-void CMemTest::Free_NULL()
-{
-    static std::atomic<int> CountErrors{0};
+void CMemTest::Free_NULL() {
+    static std::atomic<int> CountErrors {0};
     if (FullLog) REPORT("\ncall free with parameter nullptr....");
     errno = 0;
-    for (int i=0; i<COUNTEXPERIMENT; i++)
-    {
+    for (int i = 0; i < COUNTEXPERIMENT; i++) {
         Tfree(nullptr);
-        if (CHECK_ERRNO(errno))
-        {
+        if (CHECK_ERRNO(errno)) {
             CountErrors++;
             if (ShouldReportError()) REPORT("error is found by a call free with parameter nullptr\n");
         }
     }
-    if (CountErrors) REPORT("%s\n",strError);
-    else if (FullLog) REPORT("%s\n",strOk);
+    if (CountErrors) REPORT("%s\n", strError);
+    else if (FullLog)
+        REPORT("%s\n", strOk);
     if (CountErrors) error_occurred = true;
 }
 
-void CMemTest::TestAlignedParameters()
-{
+void CMemTest::TestAlignedParameters() {
     void *memptr;
     int ret;
 
     if (Rposix_memalign) {
         // alignment isn't power of 2
-        for (int bad_align=3; bad_align<16; bad_align++)
-            if (bad_align&(bad_align-1)) {
+        for (int bad_align = 3; bad_align < 16; bad_align++)
+            if (bad_align & (bad_align - 1)) {
                 ret = Tposix_memalign(nullptr, bad_align, 100);
-                REQUIRE(EINVAL==ret);
+                REQUIRE(EINVAL == ret);
             }
 
         memptr = &ret;
-        ret = Tposix_memalign(&memptr, 5*sizeof(void*), 100);
-        REQUIRE_MESSAGE(memptr == &ret,
-               "memptr should not be changed after unsuccessful call");
-        REQUIRE(EINVAL==ret);
+        ret = Tposix_memalign(&memptr, 5 * sizeof(void *), 100);
+        REQUIRE_MESSAGE(memptr == &ret, "memptr should not be changed after unsuccessful call");
+        REQUIRE(EINVAL == ret);
 
         // alignment is power of 2, but not a multiple of sizeof(void *),
         // we expect that sizeof(void*) > 2
         ret = Tposix_memalign(nullptr, 2, 100);
-        REQUIRE(EINVAL==ret);
+        REQUIRE(EINVAL == ret);
     }
     if (Raligned_malloc) {
         // alignment isn't power of 2
-        for (int bad_align=3; bad_align<16; bad_align++)
-            if (bad_align&(bad_align-1)) {
+        for (int bad_align = 3; bad_align < 16; bad_align++)
+            if (bad_align & (bad_align - 1)) {
                 memptr = Taligned_malloc(100, bad_align);
                 REQUIRE(memptr == nullptr);
-                ASSERT_ERRNO(EINVAL==errno, nullptr);
+                ASSERT_ERRNO(EINVAL == errno, nullptr);
             }
 
         // size is zero
         memptr = Taligned_malloc(0, 16);
         REQUIRE_MESSAGE(memptr == nullptr, "size is zero, so must return nullptr");
-        ASSERT_ERRNO(EINVAL==errno, nullptr);
+        ASSERT_ERRNO(EINVAL == errno, nullptr);
     }
     if (Taligned_free) {
         // nullptr pointer is OK to free
@@ -971,39 +884,37 @@ void CMemTest::TestAlignedParameters()
         /* As there is no return value for free, strictly speaking we can't
            check errno here. But checked implementations obey the assertion.
         */
-        ASSERT_ERRNO(0==errno, nullptr);
+        ASSERT_ERRNO(0 == errno, nullptr);
     }
     if (Raligned_realloc) {
-        for (int i=1; i<20; i++) {
+        for (int i = 1; i < 20; i++) {
             // checks that calls work correctly in presence of non-zero errno
             errno = i;
-            void *ptr = Taligned_malloc(i*10, 128);
+            void *ptr = Taligned_malloc(i * 10, 128);
             REQUIRE(ptr != nullptr);
-            ASSERT_ERRNO(0!=errno, nullptr);
+            ASSERT_ERRNO(0 != errno, nullptr);
             // if size is zero and pointer is not nullptr, works like free
             memptr = Taligned_realloc(ptr, 0, 64);
             REQUIRE(memptr == nullptr);
-            ASSERT_ERRNO(0!=errno, nullptr);
+            ASSERT_ERRNO(0 != errno, nullptr);
         }
         // alignment isn't power of 2
-        for (int bad_align=3; bad_align<16; bad_align++)
-            if (bad_align&(bad_align-1)) {
+        for (int bad_align = 3; bad_align < 16; bad_align++)
+            if (bad_align & (bad_align - 1)) {
                 void *ptr = &bad_align;
                 memptr = Taligned_realloc(&ptr, 100, bad_align);
                 REQUIRE(memptr == nullptr);
-                REQUIRE(&bad_align==ptr);
-                ASSERT_ERRNO(EINVAL==errno, nullptr);
+                REQUIRE(&bad_align == ptr);
+                ASSERT_ERRNO(EINVAL == errno, nullptr);
             }
     }
 }
 
-void CMemTest::RunAllTests(int total_threads)
-{
+void CMemTest::RunAllTests(int total_threads) {
     Zerofilling();
     Free_NULL();
-    InvariantDataRealloc(/*aligned=*/false, 8*MByte, /*checkData=*/true);
-    if (Raligned_realloc)
-        InvariantDataRealloc(/*aligned=*/true, 8*MByte, /*checkData=*/true);
+    InvariantDataRealloc(/*aligned=*/false, 8 * MByte, /*checkData=*/true);
+    if (Raligned_realloc) InvariantDataRealloc(/*aligned=*/true, 8 * MByte, /*checkData=*/true);
     TestAlignedParameters();
     UniquePointer();
     AddrArifm();
@@ -1011,7 +922,7 @@ void CMemTest::RunAllTests(int total_threads)
     REPORT("Known issue: some tests are skipped on macOS\n");
 #else
     // TODO: enable
-    NULLReturn(1*MByte,100*MByte,total_threads);
+    NULLReturn(1 * MByte, 100 * MByte, total_threads);
 #endif
     if (FullLog) REPORT("Tests for %d threads ended\n", total_threads);
 }
@@ -1020,14 +931,14 @@ void CMemTest::RunAllTests(int total_threads)
 #if !__TBB_WIN8UI_SUPPORT
 
 TEST_CASE("MAIN TEST") {
-    Rmalloc=scalable_malloc;
-    Rrealloc=scalable_realloc;
-    Rcalloc=scalable_calloc;
-    Tfree=scalable_free;
-    Rposix_memalign=scalable_posix_memalign;
-    Raligned_malloc=scalable_aligned_malloc;
-    Raligned_realloc=scalable_aligned_realloc;
-    Taligned_free=scalable_aligned_free;
+    Rmalloc = scalable_malloc;
+    Rrealloc = scalable_realloc;
+    Rcalloc = scalable_calloc;
+    Tfree = scalable_free;
+    Rposix_memalign = scalable_posix_memalign;
+    Raligned_malloc = scalable_aligned_malloc;
+    Raligned_realloc = scalable_aligned_realloc;
+    Taligned_free = scalable_aligned_free;
 
     // Check if we were called to test standard behavior
     // TODO: enable this mode
@@ -1037,13 +948,12 @@ TEST_CASE("MAIN TEST") {
        "NPTL threads do not share resource limits (fixed in kernel 2.6.10)".
        Use per-threads limits for affected systems.
      */
-    if ( utils::LinuxKernelVersion() < 2*1000000 + 6*1000 + 10)
-        perProcessLimits = false;
+    if (utils::LinuxKernelVersion() < 2 * 1000000 + 6 * 1000 + 10) perProcessLimits = false;
 #endif
-    //-------------------------------------
+        //-------------------------------------
 #if __APPLE__ || __TBB_USE_SANITIZERS
-    /* Skip due to lack of memory limit enforcing under macOS. */
-    //Skip this test under ASAN , as OOM condition breaks the ASAN as well
+        /* Skip due to lack of memory limit enforcing under macOS. */
+        //Skip this test under ASAN , as OOM condition breaks the ASAN as well
 #else
     limitMem(200);
     ReallocParam();
@@ -1053,44 +963,44 @@ TEST_CASE("MAIN TEST") {
 //for linux and dynamic runtime errno is used to check allocator functions
 //check if library compiled with /MD(d) and we can use errno
 #if _MSC_VER
-#if defined(_MT) && defined(_DLL) //check errno if test itself compiled with /MD(d) only
-    char*  version_info_block = nullptr;
+#if defined(_MT) && defined(_DLL)//check errno if test itself compiled with /MD(d) only
+    char *version_info_block = nullptr;
     int version_info_block_size;
     LPVOID comments_block = nullptr;
     UINT comments_block_size;
 #ifdef _DEBUG
 #define __TBBMALLOCDLL "tbbmalloc_debug.dll"
-#else  //_DEBUG
+#else//_DEBUG
 #define __TBBMALLOCDLL "tbbmalloc.dll"
-#endif //_DEBUG
-    version_info_block_size = GetFileVersionInfoSize( __TBBMALLOCDLL, (LPDWORD)&version_info_block_size );
-    if( version_info_block_size
-        && ((version_info_block = (char*)malloc(version_info_block_size)) != nullptr)
-        && GetFileVersionInfo(  __TBBMALLOCDLL, NULL, version_info_block_size, version_info_block )
-        && VerQueryValue( version_info_block, "\\StringFileInfo\\000004b0\\Comments", &comments_block, &comments_block_size )
-        && strstr( (char*)comments_block, "/MD" )
-        ){
-            __tbb_test_errno = true;
-     }
-     if( version_info_block ) free( version_info_block );
-#endif // defined(_MT) && defined(_DLL)
-#else  // _MSC_VER
+#endif//_DEBUG
+    version_info_block_size = GetFileVersionInfoSize(__TBBMALLOCDLL, (LPDWORD) &version_info_block_size);
+    if (version_info_block_size
+        && ((version_info_block = (char *) malloc(version_info_block_size)) != nullptr)
+        && GetFileVersionInfo(__TBBMALLOCDLL, NULL, version_info_block_size, version_info_block)
+        && VerQueryValue(version_info_block, "\\StringFileInfo\\000004b0\\Comments", &comments_block,
+                         &comments_block_size)
+        && strstr((char *) comments_block, "/MD")) {
+        __tbb_test_errno = true;
+    }
+    if (version_info_block) free(version_info_block);
+#endif// defined(_MT) && defined(_DLL)
+#else // _MSC_VER
     __tbb_test_errno = true;
-#endif // _MSC_VER
+#endif// _MSC_VER
 
     CheckArgumentsOverflow();
     CheckReallocLeak();
-    for( int p=MaxThread; p>=MinThread; --p ) {
-        for (int limit=0; limit<2; limit++) {
-            int ret = scalable_allocation_mode(TBBMALLOC_SET_SOFT_HEAP_LIMIT, 16*1024*limit);
-            REQUIRE(ret==TBBMALLOC_OK);
+    for (int p = MaxThread; p >= MinThread; --p) {
+        for (int limit = 0; limit < 2; limit++) {
+            int ret = scalable_allocation_mode(TBBMALLOC_SET_SOFT_HEAP_LIMIT, 16 * 1024 * limit);
+            REQUIRE(ret == TBBMALLOC_OK);
             utils::SpinBarrier *barrier = new utils::SpinBarrier(p);
-            utils::NativeParallelFor( p, RoundRobin(p, barrier, Verbose) );
+            utils::NativeParallelFor(p, RoundRobin(p, barrier, Verbose));
             delete barrier;
         }
     }
     int ret = scalable_allocation_mode(TBBMALLOC_SET_SOFT_HEAP_LIMIT, 0);
-    REQUIRE(ret==TBBMALLOC_OK);
+    REQUIRE(ret == TBBMALLOC_OK);
     REQUIRE(!error_occurred);
 }
 
diff --git a/external/tbb/test/tbbmalloc/test_malloc_init_shutdown.cpp b/external/tbb/test/tbbmalloc/test_malloc_init_shutdown.cpp
index d205cb7a..619bcf05 100644
--- a/external/tbb/test/tbbmalloc/test_malloc_init_shutdown.cpp
+++ b/external/tbb/test/tbbmalloc/test_malloc_init_shutdown.cpp
@@ -16,9 +16,9 @@
 
 #define __TBB_NO_IMPLICIT_LINKAGE 1
 
+#include "common/spin_barrier.h"
 #include "common/test.h"
 #include "common/utils.h"
-#include "common/spin_barrier.h"
 #include "oneapi/tbb/detail/_utils.h"
 #include "tbb/scalable_allocator.h"
 #include <thread>
@@ -34,26 +34,25 @@ static constexpr std::size_t MaxThread = 4;
 // Windows dynamic loader lock and allocator initialization/termination lock
 // were taken in different order.
 
-
-
 class TestFunc1 {
     utils::SpinBarrier* my_barr;
+
 public:
-    TestFunc1 (utils::SpinBarrier& barr) : my_barr(&barr) {}
-    void operator() (bool do_malloc) const {
+    TestFunc1(utils::SpinBarrier& barr) : my_barr(&barr) {}
+    void operator()(bool do_malloc) const {
         my_barr->wait();
         if (do_malloc) scalable_malloc(10);
         ++FinishedTasks;
     }
 };
 
-void Test1 () {
+void Test1() {
     std::size_t NTasks = utils::min(MaxTasks, utils::max(std::size_t(2), MaxThread));
     utils::SpinBarrier barr(NTasks);
     TestFunc1 tf(barr);
     FinishedTasks = 0;
 
-    utils::NativeParallelFor(NTasks, [&] (std::size_t thread_idx) {
+    utils::NativeParallelFor(NTasks, [&](std::size_t thread_idx) {
         tf(thread_idx % 2 == 0);
         while (FinishedTasks != NTasks) utils::yield();
     });
@@ -67,9 +66,10 @@ std::atomic<void*> gPtr(nullptr);
 
 class TestFunc2a {
     utils::SpinBarrier* my_barr;
+
 public:
-    TestFunc2a (utils::SpinBarrier& barr) : my_barr(&barr) {}
-    void operator() (std::size_t) const {
+    TestFunc2a(utils::SpinBarrier& barr) : my_barr(&barr) {}
+    void operator()(std::size_t) const {
         gPtr = scalable_malloc(8);
         my_barr->wait();
         ++FinishedTasks;
@@ -79,10 +79,11 @@ class TestFunc2a {
 class TestFunc2b {
     utils::SpinBarrier* my_barr;
     std::thread& my_ward;
+
 public:
-    TestFunc2b (utils::SpinBarrier& barr, std::thread& t) : my_barr(&barr), my_ward(t) {}
-    void operator() (std::size_t) const {
-        utils::SpinWaitWhileEq(gPtr, (void*)nullptr);
+    TestFunc2b(utils::SpinBarrier& barr, std::thread& t) : my_barr(&barr), my_ward(t) {}
+    void operator()(std::size_t) const {
+        utils::SpinWaitWhileEq(gPtr, (void*) nullptr);
         scalable_free(gPtr);
         my_barr->wait();
         my_ward.join();
@@ -100,12 +101,12 @@ void Test2() {
 
     while (FinishedTasks != 2) utils::yield();
 
-    t2b.join(); // t2a is monitored by t2b
+    t2b.join();// t2a is monitored by t2b
 
     if (t2a.joinable()) t2a.join();
 }
 
-#if _WIN32||_WIN64
+#if _WIN32 || _WIN64
 
 void TestKeyDtor() {}
 
@@ -125,24 +126,24 @@ extern "C" void threadDtor(void*) {
     scalable_free(scalable_malloc(8));
 }
 
-inline bool intersectingObjects(const void *p1, const void *p2, size_t n)
-{
-    return p1>p2 ? ((uintptr_t)p1-(uintptr_t)p2)<n : ((uintptr_t)p2-(uintptr_t)p1)<n;
+inline bool intersectingObjects(const void* p1, const void* p2, size_t n) {
+    return p1 > p2 ? ((uintptr_t) p1 - (uintptr_t) p2) < n : ((uintptr_t) p2 - (uintptr_t) p1) < n;
 }
 
-struct TestThread: utils::NoAssign {
-    TestThread(int ) {}
+struct TestThread : utils::NoAssign {
+    TestThread(int) {}
 
-    void operator()( std::size_t /*id*/ ) const {
+    void operator()(std::size_t /*id*/) const {
         pthread_key_t key;
 
         currSmall = scalable_malloc(8);
-        REQUIRE_MESSAGE((!prevSmall || currSmall==prevSmall), "Possible memory leak");
-        currLarge = scalable_malloc(32*1024);
+        REQUIRE_MESSAGE((!prevSmall || currSmall == prevSmall), "Possible memory leak");
+        currLarge = scalable_malloc(32 * 1024);
         // intersectingObjects takes into account object shuffle
-        REQUIRE_MESSAGE((!prevLarge || intersectingObjects(currLarge, prevLarge, 32*1024)), "Possible memory leak");
-        pthread_key_create( &key, &threadDtor );
-        pthread_setspecific(key, (const void*)this);
+        REQUIRE_MESSAGE((!prevLarge || intersectingObjects(currLarge, prevLarge, 32 * 1024)),
+                        "Possible memory leak");
+        pthread_key_create(&key, &threadDtor);
+        pthread_setspecific(key, (const void*) this);
     }
 };
 
@@ -150,26 +151,20 @@ struct TestThread: utils::NoAssign {
 void TestKeyDtor() {
     // Allocate region for large objects to prevent whole region release
     // on scalable_free(currLarge) call, which result in wrong assert inside intersectingObjects check
-    void* preventLargeRelease = scalable_malloc(32*1024);
-    for (int i=0; i<4; i++)
-        utils::NativeParallelFor( 1, TestThread(1) );
+    void* preventLargeRelease = scalable_malloc(32 * 1024);
+    for (int i = 0; i < 4; i++) utils::NativeParallelFor(1, TestThread(1));
     scalable_free(preventLargeRelease);
 }
 
-#endif // _WIN32||_WIN64
-
+#endif// _WIN32||_WIN64
 
 //! \brief \ref error_guessing
 TEST_CASE("test1") {
-    Test1(); // requires malloc initialization so should be first
+    Test1();// requires malloc initialization so should be first
 }
 
 //! \brief \ref error_guessing
-TEST_CASE("test2") {
-    Test2();
-}
+TEST_CASE("test2") { Test2(); }
 
 //! \brief \ref error_guessing
-TEST_CASE("test key dtor") {
-    TestKeyDtor();
-}
+TEST_CASE("test key dtor") { TestKeyDtor(); }
diff --git a/external/tbb/test/tbbmalloc/test_malloc_lib_unload.cpp b/external/tbb/test/tbbmalloc/test_malloc_lib_unload.cpp
index 441a221d..68de0316 100644
--- a/external/tbb/test/tbbmalloc/test_malloc_lib_unload.cpp
+++ b/external/tbb/test/tbbmalloc/test_malloc_lib_unload.cpp
@@ -14,7 +14,6 @@
     limitations under the License.
 */
 
-
 #define __TBB_NO_IMPLICIT_LINKAGE 1
 
 #if _USRDLL
@@ -22,137 +21,117 @@
 
 const char *globalCallMsg = "A TBB allocator function call is resolved into wrong implementation.";
 
-#if _WIN32||_WIN64
-    #define TEST_EXPORT __declspec(dllexport)
+#if _WIN32 || _WIN64
+#define TEST_EXPORT __declspec(dllexport)
 #else
-    #define TEST_EXPORT __TBB_EXPORT
+#define TEST_EXPORT __TBB_EXPORT
 #endif
 
 // must be defined in DLL for linker to not drop the dependency on the DLL.
 extern "C" {
-    extern TEST_EXPORT void *scalable_malloc(size_t);
-    extern TEST_EXPORT void scalable_free (void *);
-    extern TEST_EXPORT void safer_scalable_free (void *, void (*)(void*));
-    extern TEST_EXPORT void *scalable_realloc(void *, size_t);
-    extern TEST_EXPORT void *safer_scalable_realloc(void *, size_t, void *);
-    extern TEST_EXPORT void *scalable_calloc(size_t, size_t);
-    extern TEST_EXPORT int scalable_posix_memalign(void **, size_t, size_t);
-    extern TEST_EXPORT void *scalable_aligned_malloc(size_t, size_t);
-    extern TEST_EXPORT void *scalable_aligned_realloc(void *, size_t, size_t);
-    extern TEST_EXPORT void *safer_scalable_aligned_realloc(void *, size_t, size_t, void *);
-    extern TEST_EXPORT void scalable_aligned_free(void *);
-    extern TEST_EXPORT size_t scalable_msize(void *);
-    extern TEST_EXPORT size_t safer_scalable_msize (void *, size_t (*)(void*));
-    extern TEST_EXPORT int anchor();
-}
-
-extern "C" int anchor() {
-    return 42;
-}
+extern TEST_EXPORT void *scalable_malloc(size_t);
+extern TEST_EXPORT void scalable_free(void *);
+extern TEST_EXPORT void safer_scalable_free(void *, void (*)(void *));
+extern TEST_EXPORT void *scalable_realloc(void *, size_t);
+extern TEST_EXPORT void *safer_scalable_realloc(void *, size_t, void *);
+extern TEST_EXPORT void *scalable_calloc(size_t, size_t);
+extern TEST_EXPORT int scalable_posix_memalign(void **, size_t, size_t);
+extern TEST_EXPORT void *scalable_aligned_malloc(size_t, size_t);
+extern TEST_EXPORT void *scalable_aligned_realloc(void *, size_t, size_t);
+extern TEST_EXPORT void *safer_scalable_aligned_realloc(void *, size_t, size_t, void *);
+extern TEST_EXPORT void scalable_aligned_free(void *);
+extern TEST_EXPORT size_t scalable_msize(void *);
+extern TEST_EXPORT size_t safer_scalable_msize(void *, size_t (*)(void *));
+extern TEST_EXPORT int anchor();
+}
+
+extern "C" int anchor() { return 42; }
 
 // Those functions must not be called instead of presented in dynamic library.
-extern "C" void *scalable_malloc(size_t)
-{
+extern "C" void *scalable_malloc(size_t) {
     ASSERT(0, globalCallMsg);
     return nullptr;
 }
-extern "C" void scalable_free (void *)
-{
-    ASSERT(0, globalCallMsg);
-}
-extern "C" void safer_scalable_free (void *, void (*)(void*))
-{
-    ASSERT(0, globalCallMsg);
-}
-extern "C" void *scalable_realloc(void *, size_t)
-{
+extern "C" void scalable_free(void *) { ASSERT(0, globalCallMsg); }
+extern "C" void safer_scalable_free(void *, void (*)(void *)) { ASSERT(0, globalCallMsg); }
+extern "C" void *scalable_realloc(void *, size_t) {
     ASSERT(0, globalCallMsg);
     return nullptr;
 }
-extern "C" void *safer_scalable_realloc(void *, size_t, void *)
-{
+extern "C" void *safer_scalable_realloc(void *, size_t, void *) {
     ASSERT(0, globalCallMsg);
     return nullptr;
 }
-extern "C" void *scalable_calloc(size_t, size_t)
-{
+extern "C" void *scalable_calloc(size_t, size_t) {
     ASSERT(0, globalCallMsg);
     return nullptr;
 }
-extern "C" int scalable_posix_memalign(void **, size_t, size_t)
-{
+extern "C" int scalable_posix_memalign(void **, size_t, size_t) {
     ASSERT(0, globalCallMsg);
     return 0;
 }
-extern "C" void *scalable_aligned_malloc(size_t, size_t)
-{
+extern "C" void *scalable_aligned_malloc(size_t, size_t) {
     ASSERT(0, globalCallMsg);
     return nullptr;
 }
-extern "C" void *scalable_aligned_realloc(void *, size_t, size_t)
-{
+extern "C" void *scalable_aligned_realloc(void *, size_t, size_t) {
     ASSERT(0, globalCallMsg);
     return nullptr;
 }
-extern "C" void *safer_scalable_aligned_realloc(void *, size_t, size_t, void *)
-{
+extern "C" void *safer_scalable_aligned_realloc(void *, size_t, size_t, void *) {
     ASSERT(0, globalCallMsg);
     return nullptr;
 }
-extern "C" void scalable_aligned_free(void *)
-{
-    ASSERT(0, globalCallMsg);
-}
-extern "C" size_t scalable_msize(void *)
-{
+extern "C" void scalable_aligned_free(void *) { ASSERT(0, globalCallMsg); }
+extern "C" size_t scalable_msize(void *) {
     ASSERT(0, globalCallMsg);
     return 0;
 }
-extern "C" size_t safer_scalable_msize (void *, size_t (*)(void*))
-{
+extern "C" size_t safer_scalable_msize(void *, size_t (*)(void *)) {
     ASSERT(0, globalCallMsg);
     return 0;
 }
 
 int main() {}
 
-#else  // _USRDLL
+#else// _USRDLL
 
 #include "common/config.h"
 // harness_defs.h must be included before tbb_stddef.h to overcome exception-dependent
 // system headers that come from tbb_stddef.h
-#if __TBB_WIN8UI_SUPPORT || __TBB_MIC_OFFLOAD || (__GNUC__ && __GNUC__ < 10 && __TBB_USE_SANITIZERS) || __TBB_SOURCE_DIRECTLY_INCLUDED
+#if __TBB_WIN8UI_SUPPORT || __TBB_MIC_OFFLOAD || (__GNUC__ && __GNUC__ < 10 && __TBB_USE_SANITIZERS)         \
+        || __TBB_SOURCE_DIRECTLY_INCLUDED
 // The test does not work if dynamic load is unavailable.
 // For MIC offload, it fails because liboffload brings libiomp which observes and uses the fake scalable_* calls.
 // For sanitizers, it fails because RUNPATH is lost: https://github.com/google/sanitizers/issues/1219
 #else
-#include "common/test.h"
 #include "common/memory_usage.h"
-#include "common/utils_dynamic_libs.h"
+#include "common/test.h"
 #include "common/utils_assert.h"
+#include "common/utils_dynamic_libs.h"
 #include "common/utils_report.h"
-#include <cstring> // memset
+#include <cstring>// memset
 
 extern "C" {
-#if _WIN32||_WIN64
-    extern __declspec(dllimport)
+#if _WIN32 || _WIN64
+extern __declspec(dllimport)
 #endif
-    void *scalable_malloc(size_t);
+        void* scalable_malloc(size_t);
 
-#if _WIN32||_WIN64
-    extern __declspec(dllimport)
+#if _WIN32 || _WIN64
+extern __declspec(dllimport)
 #endif
-    int anchor();
+        int anchor();
 }
 
 struct Run {
-    void operator()( std::size_t /*id*/ ) const {
+    void operator()(std::size_t /*id*/) const {
 
         void* (*malloc_ptr)(std::size_t);
         void (*free_ptr)(void*);
 
         void* (*aligned_malloc_ptr)(size_t size, size_t alignment);
-        void  (*aligned_free_ptr)(void*);
+        void (*aligned_free_ptr)(void*);
 
         const char* actual_name;
         utils::LIBRARY_HANDLE lib = utils::OpenLibrary(actual_name = MALLOCLIB_NAME1);
@@ -166,23 +145,21 @@ struct Run {
         utils::GetAddress(lib, "scalable_aligned_malloc", aligned_malloc_ptr);
         utils::GetAddress(lib, "scalable_aligned_free", aligned_free_ptr);
 
-        for (size_t sz = 1024; sz <= 10*1024 ; sz*=10) {
-            void *p1 = aligned_malloc_ptr(sz, 16);
+        for (size_t sz = 1024; sz <= 10 * 1024; sz *= 10) {
+            void* p1 = aligned_malloc_ptr(sz, 16);
             std::memset(p1, 0, sz);
             aligned_free_ptr(p1);
         }
 
-        void *p = malloc_ptr(100);
+        void* p = malloc_ptr(100);
         std::memset(p, 1, 100);
         free_ptr(p);
 
         utils::CloseLibrary(lib);
 #if _WIN32 || _WIN64
-        ASSERT(GetModuleHandle(actual_name),
-               "allocator library must not be unloaded");
+        ASSERT(GetModuleHandle(actual_name), "allocator library must not be unloaded");
 #else
-        ASSERT(dlsym(RTLD_DEFAULT, "scalable_malloc"),
-               "allocator library must not be unloaded");
+        ASSERT(dlsym(RTLD_DEFAULT, "scalable_malloc"), "allocator library must not be unloaded");
 #endif
     }
 };
@@ -192,7 +169,7 @@ TEST_CASE("test unload lib") {
     CHECK(anchor() == 42);
 
     // warm-up run
-    utils::NativeParallelFor( 1, Run() );
+    utils::NativeParallelFor(1, Run());
 
     // It seems Thread Sanitizer remembers some history information about destroyed threads,
     // so memory consumption cannot be stabilized
@@ -205,22 +182,20 @@ TEST_CASE("test unload lib") {
         std::size_t memory_in_use = utils::GetMemoryUsage();
         std::size_t memory_check = utils::GetMemoryUsage();
         REQUIRE_MESSAGE(memory_in_use == memory_check,
-            "Memory consumption should not increase after 1st GetMemoryUsage() call");
+                        "Memory consumption should not increase after 1st GetMemoryUsage() call");
     }
 
     {
         // expect that memory consumption stabilized after several runs
         for (;;) {
             std::size_t memory_in_use = utils::GetMemoryUsage();
-            for (int j=0; j<10; j++)
-                utils::NativeParallelFor( 1, Run() );
+            for (int j = 0; j < 10; j++) utils::NativeParallelFor(1, Run());
             memory_leak = utils::GetMemoryUsage() - memory_in_use;
-            if (memory_leak == 0)
-                return;
+            if (memory_leak == 0) return;
         }
     }
 }
 
 #endif /* Unsupported configurations */
 
-#endif // _USRDLL
+#endif// _USRDLL
diff --git a/external/tbb/test/tbbmalloc/test_malloc_new_handler.cpp b/external/tbb/test/tbbmalloc/test_malloc_new_handler.cpp
index d3c0db16..40300f24 100644
--- a/external/tbb/test/tbbmalloc/test_malloc_new_handler.cpp
+++ b/external/tbb/test/tbbmalloc/test_malloc_new_handler.cpp
@@ -28,10 +28,10 @@
 #if !HARNESS_SKIP_TEST && TBB_USE_EXCEPTIONS && !__TBB_USE_ADDRESS_SANITIZER
 
 #if _MSC_VER
-#pragma warning (push)
+#pragma warning(push)
 // Forcing value to bool 'true' or 'false' (occurred inside tls.h)
-#pragma warning (disable: 4800)
-#endif //#if _MSC_VER
+#pragma warning(disable : 4800)
+#endif//#if _MSC_VER
 
 thread_local bool new_handler_called = false;
 void customNewHandler() {
@@ -46,9 +46,7 @@ bool allocateWithException(size_t big_mem) {
         // Allocate big array (should throw exception)
         char* volatile big_array = new char[big_mem];
         // If succeeded, double the size (unless it overflows) and recursively retry
-        if (big_mem * 2 > big_mem) {
-            exception_caught = allocateWithException(big_mem * 2);
-        }
+        if (big_mem * 2 > big_mem) { exception_caught = allocateWithException(big_mem * 2); }
         delete[] big_array;
     } catch (const std::bad_alloc&) {
         bool is_called = new_handler_called;
@@ -82,7 +80,7 @@ TEST_CASE("New handler callback") {
 }
 
 #if _MSC_VER
-#pragma warning (pop)
+#pragma warning(pop)
 #endif
 
-#endif // !HARNESS_SKIP_TEST && TBB_USE_EXCEPTIONS
+#endif// !HARNESS_SKIP_TEST && TBB_USE_EXCEPTIONS
diff --git a/external/tbb/test/tbbmalloc/test_malloc_overload.cpp b/external/tbb/test/tbbmalloc/test_malloc_overload.cpp
index 7f8c3489..2311137b 100644
--- a/external/tbb/test/tbbmalloc/test_malloc_overload.cpp
+++ b/external/tbb/test/tbbmalloc/test_malloc_overload.cpp
@@ -27,14 +27,14 @@
 /* ICC 10.1 and 11.0 generates code that uses std::_Raise_handler,
    but it's only defined in libcpmt(d), which the test doesn't linked with.
  */
-#undef  _HAS_EXCEPTIONS
+#undef _HAS_EXCEPTIONS
 #define _HAS_EXCEPTIONS _CPPUNWIND
 #endif
 // to use strdup w/o warnings
 #define _CRT_NONSTDC_NO_DEPRECATE 1
-#endif // _WIN32 || _WIN64
+#endif// _WIN32 || _WIN64
 
-#define _ISOC11_SOURCE 1 // to get C11 declarations for GLIBC
+#define _ISOC11_SOURCE 1// to get C11 declarations for GLIBC
 
 #include "common/allocator_overload.h"
 
@@ -48,38 +48,38 @@
 #if !HARNESS_SKIP_TEST && !__TBB_USE_ADDRESS_SANITIZER
 
 #if __ANDROID__
-  #include <android/api-level.h> // for __ANDROID_API__
+#include <android/api-level.h>// for __ANDROID_API__
 #endif
 
 #define __TBB_POSIX_MEMALIGN_PRESENT (__unix__ && !__ANDROID__) || __APPLE__
 #define __TBB_PVALLOC_PRESENT __unix__ && !__ANDROID__
 #if __GLIBC__
-  // aligned_alloc available since GLIBC 2.16
-  #define __TBB_ALIGNED_ALLOC_PRESENT __GLIBC_PREREQ(2, 16)
-#endif // __GLIBC__
- // later Android doesn't have valloc or dlmalloc_usable_size
-#define __TBB_VALLOC_PRESENT (__unix__ && __ANDROID_API__<21) || __APPLE__
-#define __TBB_DLMALLOC_USABLE_SIZE_PRESENT  __ANDROID__ && __ANDROID_API__<21
+// aligned_alloc available since GLIBC 2.16
+#define __TBB_ALIGNED_ALLOC_PRESENT __GLIBC_PREREQ(2, 16)
+#endif// __GLIBC__
+      // later Android doesn't have valloc or dlmalloc_usable_size
+#define __TBB_VALLOC_PRESENT (__unix__ && __ANDROID_API__ < 21) || __APPLE__
+#define __TBB_DLMALLOC_USABLE_SIZE_PRESENT __ANDROID__ &&__ANDROID_API__ < 21
 
 #include "common/utils.h"
-#include "common/utils_report.h"
 #include "common/utils_assert.h"
 #include "common/utils_env.h"
+#include "common/utils_report.h"
 
 #include <stdlib.h>
 #include <string.h>
 #if !__APPLE__
 #include <malloc.h>
 #endif
-#include <stdio.h>
 #include <new>
+#include <stdio.h>
 #if MALLOC_UNIXLIKE_OVERLOAD_ENABLED || MALLOC_ZONE_OVERLOAD_ENABLED
-#include <unistd.h> // for sysconf
 #include <dlfcn.h>
+#include <unistd.h>// for sysconf
 #endif
 
 #if __unix__
-#include <stdint.h> // for uintptr_t
+#include <stdint.h>// for uintptr_t
 
 extern "C" {
 void *__libc_malloc(size_t size);
@@ -123,24 +123,24 @@ typedef unsigned __int64 uint64_t;
 */
 using namespace std;
 #endif
-#include <string>
 #include <set>
 #include <sstream>
+#include <string>
 #endif
 
 #include "oneapi/tbb/detail/_utils.h"  // tbb::detail::is_aligned
-#include "src/tbbmalloc/shared_utils.h"  // alignDown, alignUp, estimatedCacheLineSize
+#include "src/tbbmalloc/shared_utils.h"// alignDown, alignUp, estimatedCacheLineSize
 
 /* start of code replicated from src/tbbmalloc */
 
-class BackRefIdx { // composite index to backreference array
+class BackRefIdx {// composite index to backreference array
 private:
-    uint16_t main;      // index in BackRefMain
-    uint16_t largeObj:1;  // is this object "large"?
-    uint16_t offset  :15; // offset from beginning of BackRefBlock
+    uint16_t main;        // index in BackRefMain
+    uint16_t largeObj : 1;// is this object "large"?
+    uint16_t offset : 15; // offset from beginning of BackRefBlock
 public:
-    BackRefIdx() : main((uint16_t)-1) {}
-    bool isInvalid() { return main == (uint16_t)-1; }
+    BackRefIdx() : main((uint16_t) -1) {}
+    bool isInvalid() { return main == (uint16_t) -1; }
     bool isLargeObject() const { return largeObj; }
     uint16_t getMain() const { return main; }
     uint16_t getOffset() const { return offset; }
@@ -153,20 +153,20 @@ class MemoryPool;
 class ExtMemoryPool;
 
 struct BlockI {
-    intptr_t     blockState[2];
+    intptr_t blockState[2];
 };
 
 struct LargeMemoryBlock : public BlockI {
-    MemoryPool       *pool;          // owner pool
-    LargeMemoryBlock *next,          // ptrs in list of cached blocks
-                     *prev,
-                     *gPrev,         // in pool's global list
-                     *gNext;
-    uintptr_t         age;           // age of block while in cache
-    size_t            objectSize;    // the size requested by a client
-    size_t            unalignedSize; // the size requested from getMemory
-    bool              fromMapMemory;
-    BackRefIdx        backRefIdx;    // cached here, used copy is in LargeObjectHdr
+    MemoryPool *pool;      // owner pool
+    LargeMemoryBlock *next,// ptrs in list of cached blocks
+            *prev,
+            *gPrev,// in pool's global list
+            *gNext;
+    uintptr_t age;       // age of block while in cache
+    size_t objectSize;   // the size requested by a client
+    size_t unalignedSize;// the size requested from getMemory
+    bool fromMapMemory;
+    BackRefIdx backRefIdx;// cached here, used copy is in LargeObjectHdr
     void registerInPool(ExtMemoryPool *extMemPool);
     void unregisterFromPool(ExtMemoryPool *extMemPool);
 };
@@ -176,23 +176,23 @@ struct LargeObjectHdr {
     /* Have to duplicate it here from CachedObjectHdr,
        as backreference must be checked without further pointer dereference.
        Points to LargeObjectHdr. */
-    BackRefIdx       backRefIdx;
+    BackRefIdx backRefIdx;
 };
 
 /*
  * Objects of size minLargeObjectSize and larger are considered large objects.
  */
-const uintptr_t blockSize = 16*1024;
+const uintptr_t blockSize = 16 * 1024;
 const uint32_t fittingAlignment = rml::internal::estimatedCacheLineSize;
-#define SET_FITTING_SIZE(N) ( (blockSize-2*rml::internal::estimatedCacheLineSize)/N ) & ~(fittingAlignment-1)
-const uint32_t fittingSize5 = SET_FITTING_SIZE(2); // 8128/8064
+#define SET_FITTING_SIZE(N)                                                                                  \
+    ((blockSize - 2 * rml::internal::estimatedCacheLineSize) / N) & ~(fittingAlignment - 1)
+const uint32_t fittingSize5 = SET_FITTING_SIZE(2);// 8128/8064
 #undef SET_FITTING_SIZE
 const uint32_t minLargeObjectSize = fittingSize5 + 1;
 
 /* end of code replicated from src/tbbmalloc */
 
-static void scalableMallocCheckSize(void *object, size_t size)
-{
+static void scalableMallocCheckSize(void *object, size_t size) {
 #if __clang__
     // This prevents Clang from throwing out the calls to new & delete in CheckNewDeleteOverload().
     static void *v = object;
@@ -200,75 +200,70 @@ static void scalableMallocCheckSize(void *object, size_t size)
 #endif
     REQUIRE(object);
     if (size >= minLargeObjectSize) {
-        LargeMemoryBlock *lmb = ((LargeObjectHdr*)object-1)->memoryBlock;
-        REQUIRE((uintptr_t(lmb)<uintptr_t(((LargeObjectHdr*)object-1)) && lmb->objectSize >= size));
+        LargeMemoryBlock *lmb = ((LargeObjectHdr *) object - 1)->memoryBlock;
+        REQUIRE((uintptr_t(lmb) < uintptr_t(((LargeObjectHdr *) object - 1)) && lmb->objectSize >= size));
     }
 #if MALLOC_UNIXLIKE_OVERLOAD_ENABLED || MALLOC_ZONE_OVERLOAD_ENABLED
     REQUIRE(malloc_usable_size(object) >= size);
 #elif MALLOC_WINDOWS_OVERLOAD_ENABLED
     // Check that _msize works correctly
     REQUIRE(_msize(object) >= size);
-    REQUIRE((size < 8 || _aligned_msize(object,8,0) >= size));
+    REQUIRE((size < 8 || _aligned_msize(object, 8, 0) >= size));
 #endif
 }
 
 void CheckStdFuncOverload(void *(*malloc_p)(size_t), void *(*calloc_p)(size_t, size_t),
-                          void *(*realloc_p)(void *, size_t), void (*free_p)(void *))
-{
+                          void *(*realloc_p)(void *, size_t), void (*free_p)(void *)) {
     void *ptr = malloc_p(minLargeObjectSize);
     scalableMallocCheckSize(ptr, minLargeObjectSize);
     free(ptr);
 
     ptr = calloc_p(minLargeObjectSize, 2);
-    scalableMallocCheckSize(ptr, 2*minLargeObjectSize);
-    void *ptr1 = realloc_p(ptr, 10*minLargeObjectSize);
-    scalableMallocCheckSize(ptr1, 10*minLargeObjectSize);
+    scalableMallocCheckSize(ptr, 2 * minLargeObjectSize);
+    void *ptr1 = realloc_p(ptr, 10 * minLargeObjectSize);
+    scalableMallocCheckSize(ptr1, 10 * minLargeObjectSize);
     free_p(ptr1);
 }
 
 #if MALLOC_UNIXLIKE_OVERLOAD_ENABLED || MALLOC_ZONE_OVERLOAD_ENABLED
 
-void CheckMemalignFuncOverload(void *(*memalign_p)(size_t, size_t),
-                               void (*free_p)(void*))
-{
-    void *ptr = memalign_p(128, 4*minLargeObjectSize);
-    scalableMallocCheckSize(ptr, 4*minLargeObjectSize);
+void CheckMemalignFuncOverload(void *(*memalign_p)(size_t, size_t), void (*free_p)(void *)) {
+    void *ptr = memalign_p(128, 4 * minLargeObjectSize);
+    scalableMallocCheckSize(ptr, 4 * minLargeObjectSize);
     REQUIRE(tbb::detail::is_aligned(ptr, 128));
     free_p(ptr);
 }
 
-void CheckVallocFuncOverload(void *(*valloc_p)(size_t), void (*free_p)(void*))
-{
+void CheckVallocFuncOverload(void *(*valloc_p)(size_t), void (*free_p)(void *)) {
     void *ptr = valloc_p(minLargeObjectSize);
     scalableMallocCheckSize(ptr, minLargeObjectSize);
     REQUIRE(tbb::detail::is_aligned(ptr, sysconf(_SC_PAGESIZE)));
     free_p(ptr);
 }
 
-void CheckPvalloc(void *(*pvalloc_p)(size_t), void (*free_p)(void*))
-{
+void CheckPvalloc(void *(*pvalloc_p)(size_t), void (*free_p)(void *)) {
     const long memoryPageSize = sysconf(_SC_PAGESIZE);
     // request large object with not power-of-2 size
-    const size_t largeSz = alignUp(minLargeObjectSize, 16*1024) + 1;
+    const size_t largeSz = alignUp(minLargeObjectSize, 16 * 1024) + 1;
 
-    for (size_t sz = 0; sz<=largeSz; sz+=largeSz) {
+    for (size_t sz = 0; sz <= largeSz; sz += largeSz) {
         void *ptr = pvalloc_p(sz);
-        scalableMallocCheckSize(ptr, sz? alignUp(sz, memoryPageSize) : memoryPageSize);
+        scalableMallocCheckSize(ptr, sz ? alignUp(sz, memoryPageSize) : memoryPageSize);
         REQUIRE(tbb::detail::is_aligned(ptr, memoryPageSize));
         free_p(ptr);
     }
 }
 
-#endif // MALLOC_UNIXLIKE_OVERLOAD_ENABLED || MALLOC_ZONE_OVERLOAD_ENABLED
+#endif// MALLOC_UNIXLIKE_OVERLOAD_ENABLED || MALLOC_ZONE_OVERLOAD_ENABLED
 
 // regression test: on macOS scalable_free() treated small aligned object,
 // placed in large block, as small block
 void CheckFreeAligned() {
-    size_t sz[] = {8, 4*1024, 16*1024, 0};
-    size_t align[] = {8, 4*1024, 16*1024, 0};
+    size_t sz[] = {8, 4 * 1024, 16 * 1024, 0};
+    size_t align[] = {8, 4 * 1024, 16 * 1024, 0};
 
-    for (int s=0; sz[s]; s++)
-        for (int a=0; align[a]; a++) {
+    for (int s = 0; sz[s]; s++)
+        for (int a = 0; align[a]; a++) {
             void *ptr = nullptr;
 #if __TBB_POSIX_MEMALIGN_PRESENT
             int ret = posix_memalign(&ptr, align[a], sz[s]);
@@ -284,8 +279,8 @@ void CheckFreeAligned() {
 #if __ANDROID__
 // Workaround for an issue with strdup somehow bypassing our malloc replacement on Android.
 char *strdup(const char *str) {
-    REPORT( "Known issue: malloc replacement does not work for strdup on Android.\n" );
-    size_t len = strlen(str)+1;
+    REPORT("Known issue: malloc replacement does not work for strdup on Android.\n");
+    size_t len = strlen(str) + 1;
     void *new_str = malloc(len);
     return new_str ? reinterpret_cast<char *>(memcpy(new_str, str, len)) : 0;
 }
@@ -303,9 +298,10 @@ void TestZoneOverload() {
     unsigned zones_num;
 
     kern_return_t ret = malloc_get_all_zones(mach_task_self(), nullptr, &zones, &zones_num);
-    REQUIRE((!ret && zones_num>1));
-    malloc_zone_t *sys_zone = (malloc_zone_t*)zones[1];
-    REQUIRE_MESSAGE(strcmp("tbbmalloc", malloc_get_zone_name(sys_zone)), "zone 1 expected to be not tbbmalloc");
+    REQUIRE((!ret && zones_num > 1));
+    malloc_zone_t *sys_zone = (malloc_zone_t *) zones[1];
+    REQUIRE_MESSAGE(strcmp("tbbmalloc", malloc_get_zone_name(sys_zone)),
+                    "zone 1 expected to be not tbbmalloc");
     void *p = malloc_zone_malloc(sys_zone, 16);
     free(p);
 }
@@ -316,9 +312,7 @@ void TestZoneOverload() {
 #if _WIN32
 // regression test: certain MSVC runtime functions use "public" allocation functions
 // but internal free routines, causing crashes if tbbmalloc_proxy does not intercept the latter.
-void TestRuntimeRoutines() {
-    system("rem should be a safe command to call");
-}
+void TestRuntimeRoutines() { system("rem should be a safe command to call"); }
 #else
 #define TestRuntimeRoutines()
 #endif
@@ -335,25 +329,24 @@ void CheckNewDeleteOverload() {
     delete s1;
 
     s2 = new BigStruct[10];
-    scalableMallocCheckSize(s2, 10*sizeof(BigStruct));
-    delete []s2;
+    scalableMallocCheckSize(s2, 10 * sizeof(BigStruct));
+    delete[] s2;
 
-    s3 = new(std::nothrow) BigStruct;
+    s3 = new (std::nothrow) BigStruct;
     scalableMallocCheckSize(s3, sizeof(BigStruct));
     delete s3;
 
-    s4 = new(std::nothrow) BigStruct[2];
-    scalableMallocCheckSize(s4, 2*sizeof(BigStruct));
-    delete []s4;
+    s4 = new (std::nothrow) BigStruct[2];
+    scalableMallocCheckSize(s4, 2 * sizeof(BigStruct));
+    delete[] s4;
 
     s5 = new BigStruct;
     scalableMallocCheckSize(s5, sizeof(BigStruct));
     operator delete(s5, std::nothrow);
 
     s6 = new BigStruct[5];
-    scalableMallocCheckSize(s6, 5*sizeof(BigStruct));
+    scalableMallocCheckSize(s6, 5 * sizeof(BigStruct));
     operator delete[](s6, std::nothrow);
-
 }
 
 #if MALLOC_WINDOWS_OVERLOAD_ENABLED
@@ -368,46 +361,49 @@ void FuncReplacementInfoCheck() {
     functions.insert("_aligned_msize");
 
     int status_check = 0;
-    for (char** log_string = func_replacement_log; *log_string != 0; log_string++) {
+    for (char **log_string = func_replacement_log; *log_string != 0; log_string++) {
         std::stringstream s(*log_string);
         std::string status, function_name;
         s >> status >> function_name;
 
-        if (status.find("Fail:") != status.npos) {
-            status_check = -1;
-        }
+        if (status.find("Fail:") != status.npos) { status_check = -1; }
 
         functions.erase(function_name);
     }
 
-    REQUIRE_MESSAGE(functions.empty(), "Changed opcodes log must contain all required functions with \"Success\" changed status");
-    REQUIRE_MESSAGE(func_replacement_status == status_check, "replacement_opcodes_log() function return wrong status");
+    REQUIRE_MESSAGE(
+            functions.empty(),
+            "Changed opcodes log must contain all required functions with \"Success\" changed status");
+    REQUIRE_MESSAGE(func_replacement_status == status_check,
+                    "replacement_opcodes_log() function return wrong status");
 
     func_replacement_status = TBB_malloc_replacement_log(nullptr);
-    REQUIRE_MESSAGE(func_replacement_status == status_check, "replacement_opcodes_log() function return wrong status");
+    REQUIRE_MESSAGE(func_replacement_status == status_check,
+                    "replacement_opcodes_log() function return wrong status");
 
     // TODO: was ASSERT_WARNING
     if (func_replacement_status != 0) {
         REPORT("Some standard allocation functions was not replaced to tbb_malloc functions.\n");
     }
 }
-#endif // MALLOC_WINDOWS_OVERLOAD_ENABLED
+#endif// MALLOC_WINDOWS_OVERLOAD_ENABLED
 
 //! Testing tbbmalloc_proxy overload capabilities
 //! \brief \ref error_guessing
 TEST_CASE("Main set of tests") {
 #if __unix__
-    REQUIRE(mallopt(0, 0)); // add dummy mallopt call for coverage
-#endif // __unix__
+    REQUIRE(mallopt(0, 0));// add dummy mallopt call for coverage
+#endif                     // __unix__
 
     void *ptr = nullptr;
-    utils::suppress_unused_warning(ptr); // for android
+    utils::suppress_unused_warning(ptr);// for android
 
 #if MALLOC_UNIXLIKE_OVERLOAD_ENABLED || MALLOC_ZONE_OVERLOAD_ENABLED
-    REQUIRE_MESSAGE(dlsym(RTLD_DEFAULT, "scalable_malloc"), "Lost dependency on malloc_proxy or LD_PRELOAD was not set?");
+    REQUIRE_MESSAGE(dlsym(RTLD_DEFAULT, "scalable_malloc"),
+                    "Lost dependency on malloc_proxy or LD_PRELOAD was not set?");
 #endif
 
-/* On Windows, memory block size returned by _msize() is sometimes used
+    /* On Windows, memory block size returned by _msize() is sometimes used
    to calculate the size for an extended block. Substituting _msize,
    scalable_msize initially returned 0 for regions not allocated by the scalable
    allocator, which led to incorrect memory reallocation and subsequent crashes.
@@ -416,23 +412,23 @@ TEST_CASE("Main set of tests") {
     REQUIRE_MESSAGE(getenv("PATH"), "We assume that PATH is set everywhere.");
     char *pathCopy = strdup(getenv("PATH"));
 #if __ANDROID__
-    REQUIRE_MESSAGE(strcmp(pathCopy,getenv("PATH")) == 0, "strdup workaround does not work as expected.");
+    REQUIRE_MESSAGE(strcmp(pathCopy, getenv("PATH")) == 0, "strdup workaround does not work as expected.");
 #endif
     const char *newEnvName = "__TBBMALLOC_OVERLOAD_REGRESSION_TEST_FOR_REALLOC_AND_MSIZE";
     REQUIRE_MESSAGE(!getenv(newEnvName), "Environment variable should not be used before.");
-    int r = utils::SetEnv(newEnvName,"1");
+    int r = utils::SetEnv(newEnvName, "1");
     REQUIRE(!r);
     char *path = getenv("PATH");
-    REQUIRE_MESSAGE((path && 0==strcmp(path, pathCopy)), "Environment was changed erroneously.");
+    REQUIRE_MESSAGE((path && 0 == strcmp(path, pathCopy)), "Environment was changed erroneously.");
     free(pathCopy);
 
     CheckStdFuncOverload(malloc, calloc, realloc, free);
 #if MALLOC_UNIXLIKE_OVERLOAD_ENABLED || MALLOC_ZONE_OVERLOAD_ENABLED
 
 #if __TBB_POSIX_MEMALIGN_PRESENT
-    int ret = posix_memalign(&ptr, 1024, 3*minLargeObjectSize);
+    int ret = posix_memalign(&ptr, 1024, 3 * minLargeObjectSize);
     REQUIRE(0 == ret);
-    scalableMallocCheckSize(ptr, 3*minLargeObjectSize);
+    scalableMallocCheckSize(ptr, 3 * minLargeObjectSize);
     REQUIRE(tbb::detail::is_aligned(ptr, 1024));
     free(ptr);
 #endif
@@ -450,24 +446,23 @@ TEST_CASE("Main set of tests") {
 #endif
 
 #if __INTEL_COMPILER
-   #pragma warning(push)
-   #pragma warning(disable: 1478)
+#pragma warning(push)
+#pragma warning(disable : 1478)
 #elif __GNUC__
-   #pragma GCC diagnostic push
-   #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
     struct mallinfo info = mallinfo();
 #if __INTEL_COMPILER
-    #pragma warning(pop)
+#pragma warning(pop)
 #elif __GNUC__
-    #pragma GCC diagnostic pop
+#pragma GCC diagnostic pop
 #endif
     // right now mallinfo initialized by zero
-    REQUIRE((!info.arena && !info.ordblks && !info.smblks && !info.hblks
-           && !info.hblkhd && !info.usmblks && !info.fsmblks
-           && !info.uordblks && !info.fordblks && !info.keepcost));
+    REQUIRE((!info.arena && !info.ordblks && !info.smblks && !info.hblks && !info.hblkhd && !info.usmblks
+             && !info.fsmblks && !info.uordblks && !info.fordblks && !info.keepcost));
 
- #if !__ANDROID__
+#if !__ANDROID__
     // These non-standard functions are exported by GLIBC, and might be used
     // in conjunction with standard malloc/free. Test that we overload them as well.
     // Bionic doesn't have them.
@@ -475,23 +470,23 @@ TEST_CASE("Main set of tests") {
     CheckMemalignFuncOverload(__libc_memalign, __libc_free);
     CheckVallocFuncOverload(__libc_valloc, __libc_free);
     CheckPvalloc(__libc_pvalloc, __libc_free);
- #endif
-#endif // __unix__
+#endif
+#endif// __unix__
 
-#else // MALLOC_WINDOWS_OVERLOAD_ENABLED
+#else// MALLOC_WINDOWS_OVERLOAD_ENABLED
 
     ptr = _aligned_malloc(minLargeObjectSize, 16);
     scalableMallocCheckSize(ptr, minLargeObjectSize);
     REQUIRE(tbb::detail::is_aligned(ptr, 16));
 
     // Testing of workaround for vs "is power of 2 pow N" bug that accepts zeros
-    void* ptr1 = _aligned_malloc(minLargeObjectSize, 0);
+    void *ptr1 = _aligned_malloc(minLargeObjectSize, 0);
     scalableMallocCheckSize(ptr, minLargeObjectSize);
-    REQUIRE(tbb::detail::is_aligned(ptr, sizeof(void*)));
+    REQUIRE(tbb::detail::is_aligned(ptr, sizeof(void *)));
     _aligned_free(ptr1);
 
-    ptr1 = _aligned_realloc(ptr, minLargeObjectSize*10, 16);
-    scalableMallocCheckSize(ptr1, minLargeObjectSize*10);
+    ptr1 = _aligned_realloc(ptr, minLargeObjectSize * 10, 16);
+    scalableMallocCheckSize(ptr1, minLargeObjectSize * 10);
     REQUIRE(tbb::detail::is_aligned(ptr, 16));
     _aligned_free(ptr1);
 
@@ -519,11 +514,9 @@ TEST_CASE("Address range tracker regression test") {
     utils::NativeParallelFor(numThreads, [](int) {
         void *ptr = nullptr;
         for (int i = 0; i < 1000; ++i) {
-            for (int j = 0; j < 100; ++j) {
-                ptr = realloc(ptr, 1024*1024 + 4096*j);
-            }
+            for (int j = 0; j < 100; ++j) { ptr = realloc(ptr, 1024 * 1024 + 4096 * j); }
         }
         free(ptr);
     });
 }
-#endif // !HARNESS_SKIP_TEST
+#endif// !HARNESS_SKIP_TEST
diff --git a/external/tbb/test/tbbmalloc/test_malloc_overload_disable.cpp b/external/tbb/test/tbbmalloc/test_malloc_overload_disable.cpp
index 98cb6b73..26e37147 100644
--- a/external/tbb/test/tbbmalloc/test_malloc_overload_disable.cpp
+++ b/external/tbb/test/tbbmalloc/test_malloc_overload_disable.cpp
@@ -23,8 +23,8 @@
 #include "common/test.h"
 
 #include "common/allocator_overload.h"
-#include "common/utils_report.h"
 #include "common/utils_env.h"
+#include "common/utils_report.h"
 
 // Disabling malloc proxy via env variable is available only on Windows for now
 #if MALLOC_WINDOWS_OVERLOAD_ENABLED
@@ -36,32 +36,29 @@
 #include "src/tbb/environment.h"
 
 const size_t SmallObjectSize = 16;
-const size_t LargeObjectSize = 2*8*1024;
-const size_t HugeObjectSize = 2*1024*1024;
+const size_t LargeObjectSize = 2 * 8 * 1024;
+const size_t HugeObjectSize = 2 * 1024 * 1024;
 
-void CheckWindowsProxyDisablingViaMemSize( size_t ObjectSize ) {
+void CheckWindowsProxyDisablingViaMemSize(size_t ObjectSize) {
     void* ptr = malloc(ObjectSize);
     /*
      * If msize returns 0 - tbbmalloc doesn't contain this object in it`s memory
      * Also msize check that proxy lib is linked
      */
-    REQUIRE_MESSAGE(!__TBB_malloc_safer_msize(ptr,nullptr), "Malloc replacement is not deactivated");
+    REQUIRE_MESSAGE(!__TBB_malloc_safer_msize(ptr, nullptr), "Malloc replacement is not deactivated");
     free(ptr);
 }
 
 TEST_CASE("Disabling malloc overload") {
-    if (!tbb::detail::r1::GetBoolEnvironmentVariable("TBB_MALLOC_DISABLE_REPLACEMENT"))
-    {
-        utils::SetEnv("TBB_MALLOC_DISABLE_REPLACEMENT","1");
+    if (!tbb::detail::r1::GetBoolEnvironmentVariable("TBB_MALLOC_DISABLE_REPLACEMENT")) {
+        utils::SetEnv("TBB_MALLOC_DISABLE_REPLACEMENT", "1");
         if ((system(TEST_SYSTEM_COMMAND)) != 0) {
             REPORT("Test error: unable to run the command: %s", TEST_SYSTEM_COMMAND);
             exit(-1);
         }
         // We must execute exit(0) to avoid duplicate "Done" printing.
         exit(0);
-    }
-    else
-    {
+    } else {
         // Check SMALL objects replacement disable
         CheckWindowsProxyDisablingViaMemSize(SmallObjectSize);
         // Check LARGE objects replacement disable
@@ -70,4 +67,4 @@ TEST_CASE("Disabling malloc overload") {
         CheckWindowsProxyDisablingViaMemSize(HugeObjectSize);
     }
 }
-#endif // MALLOC_WINDOWS_OVERLOAD_ENABLED
+#endif// MALLOC_WINDOWS_OVERLOAD_ENABLED
diff --git a/external/tbb/test/tbbmalloc/test_malloc_pools.cpp b/external/tbb/test/tbbmalloc/test_malloc_pools.cpp
index f73c28ec..f92cbb5c 100644
--- a/external/tbb/test/tbbmalloc/test_malloc_pools.cpp
+++ b/external/tbb/test/tbbmalloc/test_malloc_pools.cpp
@@ -23,56 +23,50 @@
 
 #define HARNESS_TBBMALLOC_THREAD_SHUTDOWN 1
 
-#include "common/utils.h"
-#include "common/utils_assert.h"
 #include "common/spin_barrier.h"
 #include "common/tls_limit.h"
+#include "common/utils.h"
+#include "common/utils_assert.h"
 
 #include "tbb/scalable_allocator.h"
 
 #include <atomic>
 
-template<typename T>
-static inline T alignUp  (T arg, uintptr_t alignment) {
-    return T(((uintptr_t)arg+(alignment-1)) & ~(alignment-1));
+template <typename T>
+static inline T alignUp(T arg, uintptr_t alignment) {
+    return T(((uintptr_t) arg + (alignment - 1)) & ~(alignment - 1));
 }
 
-struct PoolSpace: utils::NoCopy {
+struct PoolSpace : utils::NoCopy {
     size_t pos;
-    int    regions;
+    int regions;
     size_t bufSize;
-    char  *space;
+    char *space;
 
-    static const size_t BUF_SIZE = 8*1024*1024;
+    static const size_t BUF_SIZE = 8 * 1024 * 1024;
 
-    PoolSpace(size_t bufSz = BUF_SIZE) :
-        pos(0), regions(0),
-        bufSize(bufSz), space(new char[bufSize]) {
+    PoolSpace(size_t bufSz = BUF_SIZE) : pos(0), regions(0), bufSize(bufSz), space(new char[bufSize]) {
         memset(space, 0, bufSize);
     }
-    ~PoolSpace() {
-        delete []space;
-    }
+    ~PoolSpace() { delete[] space; }
 };
 
 static PoolSpace *poolSpace;
 
 struct MallocPoolHeader {
-    void  *rawPtr;
+    void *rawPtr;
     size_t userSize;
 };
 
 static std::atomic<int> liveRegions;
 
-static void *getMallocMem(intptr_t /*pool_id*/, size_t &bytes)
-{
-    void *rawPtr = malloc(bytes+sizeof(MallocPoolHeader)+1);
-    if (!rawPtr)
-        return nullptr;
+static void *getMallocMem(intptr_t /*pool_id*/, size_t &bytes) {
+    void *rawPtr = malloc(bytes + sizeof(MallocPoolHeader) + 1);
+    if (!rawPtr) return nullptr;
     // +1 to check working with unaligned space
-    void *ret = (void *)((uintptr_t)rawPtr+sizeof(MallocPoolHeader)+1);
+    void *ret = (void *) ((uintptr_t) rawPtr + sizeof(MallocPoolHeader) + 1);
 
-    MallocPoolHeader *hdr = (MallocPoolHeader*)ret-1;
+    MallocPoolHeader *hdr = (MallocPoolHeader *) ret - 1;
     hdr->rawPtr = rawPtr;
     hdr->userSize = bytes;
 
@@ -81,9 +75,8 @@ static void *getMallocMem(intptr_t /*pool_id*/, size_t &bytes)
     return ret;
 }
 
-static int putMallocMem(intptr_t /*pool_id*/, void *ptr, size_t bytes)
-{
-    MallocPoolHeader *hdr = (MallocPoolHeader*)ptr-1;
+static int putMallocMem(intptr_t /*pool_id*/, void *ptr, size_t bytes) {
+    MallocPoolHeader *hdr = (MallocPoolHeader *) ptr - 1;
     ASSERT(bytes == hdr->userSize, "Invalid size in pool callback.");
     free(hdr->rawPtr);
 
@@ -92,37 +85,35 @@ static int putMallocMem(intptr_t /*pool_id*/, void *ptr, size_t bytes)
     return 0;
 }
 
-void TestPoolReset()
-{
+void TestPoolReset() {
     rml::MemPoolPolicy pol(getMallocMem, putMallocMem);
     rml::MemoryPool *pool;
 
     pool_create_v1(0, &pol, &pool);
-    for (int i=0; i<100; i++) {
+    for (int i = 0; i < 100; i++) {
         REQUIRE(pool_malloc(pool, 8));
-        REQUIRE(pool_malloc(pool, 50*1024));
+        REQUIRE(pool_malloc(pool, 50 * 1024));
     }
     int regionsBeforeReset = liveRegions.load(std::memory_order_acquire);
     bool ok = pool_reset(pool);
     REQUIRE(ok);
-    for (int i=0; i<100; i++) {
+    for (int i = 0; i < 100; i++) {
         REQUIRE(pool_malloc(pool, 8));
-        REQUIRE(pool_malloc(pool, 50*1024));
+        REQUIRE(pool_malloc(pool, 50 * 1024));
     }
     REQUIRE_MESSAGE(regionsBeforeReset == liveRegions.load(std::memory_order_relaxed),
-           "Expected no new regions allocation.");
+                    "Expected no new regions allocation.");
     ok = pool_destroy(pool);
     REQUIRE(ok);
     REQUIRE_MESSAGE(!liveRegions.load(std::memory_order_relaxed), "Expected all regions were released.");
 }
 
-class SharedPoolRun: utils::NoAssign {
-    static long                 threadNum;
-    static utils::SpinBarrier startB,
-                                mallocDone;
-    static rml::MemoryPool     *pool;
-    static void               **crossThread,
-                              **afterTerm;
+class SharedPoolRun : utils::NoAssign {
+    static long threadNum;
+    static utils::SpinBarrier startB, mallocDone;
+    static rml::MemoryPool *pool;
+    static void **crossThread, **afterTerm;
+
 public:
     static const int OBJ_CNT = 100;
 
@@ -135,75 +126,67 @@ class SharedPoolRun: utils::NoAssign {
         mallocDone.initialize(threadNum);
     }
 
-    void operator()( int id ) const {
+    void operator()(int id) const {
         const int ITERS = 1000;
         void *local[ITERS];
 
         startB.wait();
-        for (int i=id*OBJ_CNT; i<(id+1)*OBJ_CNT; i++) {
-            afterTerm[i] = pool_malloc(pool, i%2? 8*1024 : 9*1024);
-            memset(afterTerm[i], i, i%2? 8*1024 : 9*1024);
-            crossThread[i] = pool_malloc(pool, i%2? 9*1024 : 8*1024);
-            memset(crossThread[i], i, i%2? 9*1024 : 8*1024);
+        for (int i = id * OBJ_CNT; i < (id + 1) * OBJ_CNT; i++) {
+            afterTerm[i] = pool_malloc(pool, i % 2 ? 8 * 1024 : 9 * 1024);
+            memset(afterTerm[i], i, i % 2 ? 8 * 1024 : 9 * 1024);
+            crossThread[i] = pool_malloc(pool, i % 2 ? 9 * 1024 : 8 * 1024);
+            memset(crossThread[i], i, i % 2 ? 9 * 1024 : 8 * 1024);
         }
 
-        for (int i=1; i<ITERS; i+=2) {
-            local[i-1] = pool_malloc(pool, 6*1024);
-            memset(local[i-1], i, 6*1024);
-            local[i] = pool_malloc(pool, 16*1024);
-            memset(local[i], i, 16*1024);
+        for (int i = 1; i < ITERS; i += 2) {
+            local[i - 1] = pool_malloc(pool, 6 * 1024);
+            memset(local[i - 1], i, 6 * 1024);
+            local[i] = pool_malloc(pool, 16 * 1024);
+            memset(local[i], i, 16 * 1024);
         }
         mallocDone.wait();
-        int myVictim = threadNum-id-1;
-        for (int i=myVictim*OBJ_CNT; i<(myVictim+1)*OBJ_CNT; i++)
-            pool_free(pool, crossThread[i]);
-        for (int i=0; i<ITERS; i++)
-            pool_free(pool, local[i]);
+        int myVictim = threadNum - id - 1;
+        for (int i = myVictim * OBJ_CNT; i < (myVictim + 1) * OBJ_CNT; i++) pool_free(pool, crossThread[i]);
+        for (int i = 0; i < ITERS; i++) pool_free(pool, local[i]);
     }
 };
 
-long                 SharedPoolRun::threadNum;
-utils::SpinBarrier SharedPoolRun::startB,
-                     SharedPoolRun::mallocDone;
-rml::MemoryPool     *SharedPoolRun::pool;
-void               **SharedPoolRun::crossThread,
-                   **SharedPoolRun::afterTerm;
+long SharedPoolRun::threadNum;
+utils::SpinBarrier SharedPoolRun::startB, SharedPoolRun::mallocDone;
+rml::MemoryPool *SharedPoolRun::pool;
+void **SharedPoolRun::crossThread, **SharedPoolRun::afterTerm;
 
 // single pool shared by different threads
-void TestSharedPool()
-{
+void TestSharedPool() {
     rml::MemPoolPolicy pol(getMallocMem, putMallocMem);
     rml::MemoryPool *pool;
 
     pool_create_v1(0, &pol, &pool);
-    void **crossThread = new void*[utils::MaxThread * SharedPoolRun::OBJ_CNT];
-    void **afterTerm = new void*[utils::MaxThread * SharedPoolRun::OBJ_CNT];
+    void **crossThread = new void *[utils::MaxThread * SharedPoolRun::OBJ_CNT];
+    void **afterTerm = new void *[utils::MaxThread * SharedPoolRun::OBJ_CNT];
 
-    for (int p=utils::MinThread; p<=utils::MaxThread; p++) {
+    for (int p = utils::MinThread; p <= utils::MaxThread; p++) {
         SharedPoolRun::init(p, pool, crossThread, afterTerm);
         SharedPoolRun thr;
 
-        void *hugeObj = pool_malloc(pool, 10*1024*1024);
+        void *hugeObj = pool_malloc(pool, 10 * 1024 * 1024);
         REQUIRE(hugeObj);
 
-        utils::NativeParallelFor( p, thr );
+        utils::NativeParallelFor(p, thr);
 
         pool_free(pool, hugeObj);
-        for (int i=0; i<p*SharedPoolRun::OBJ_CNT; i++)
-            pool_free(pool, afterTerm[i]);
+        for (int i = 0; i < p * SharedPoolRun::OBJ_CNT; i++) pool_free(pool, afterTerm[i]);
     }
-    delete []afterTerm;
-    delete []crossThread;
+    delete[] afterTerm;
+    delete[] crossThread;
 
     bool ok = pool_destroy(pool);
     REQUIRE(ok);
     REQUIRE_MESSAGE(!liveRegions.load(std::memory_order_relaxed), "Expected all regions were released.");
 }
 
-void *CrossThreadGetMem(intptr_t pool_id, size_t &bytes)
-{
-    if (poolSpace[pool_id].pos + bytes > poolSpace[pool_id].bufSize)
-        return nullptr;
+void *CrossThreadGetMem(intptr_t pool_id, size_t &bytes) {
+    if (poolSpace[pool_id].pos + bytes > poolSpace[pool_id].bufSize) return nullptr;
 
     void *ret = poolSpace[pool_id].space + poolSpace[pool_id].pos;
     poolSpace[pool_id].pos += bytes;
@@ -212,59 +195,59 @@ void *CrossThreadGetMem(intptr_t pool_id, size_t &bytes)
     return ret;
 }
 
-int CrossThreadPutMem(intptr_t pool_id, void* /*raw_ptr*/, size_t /*raw_bytes*/)
-{
+int CrossThreadPutMem(intptr_t pool_id, void * /*raw_ptr*/, size_t /*raw_bytes*/) {
     poolSpace[pool_id].regions--;
     return 0;
 }
 
-class CrossThreadRun: utils::NoAssign {
+class CrossThreadRun : utils::NoAssign {
     static long number_of_threads;
     static utils::SpinBarrier barrier;
     static rml::MemoryPool **pool;
     static char **obj;
+
 public:
     static void initBarrier(unsigned thrds) { barrier.initialize(thrds); }
     static void init(long num) {
         number_of_threads = num;
-        pool = new rml::MemoryPool*[number_of_threads];
+        pool = new rml::MemoryPool *[number_of_threads];
         poolSpace = new PoolSpace[number_of_threads];
-        obj = new char*[number_of_threads];
+        obj = new char *[number_of_threads];
     }
     static void destroy() {
-        for (long i=0; i<number_of_threads; i++)
+        for (long i = 0; i < number_of_threads; i++)
             REQUIRE_MESSAGE(!poolSpace[i].regions, "Memory leak detected");
-        delete []pool;
-        delete []poolSpace;
-        delete []obj;
+        delete[] pool;
+        delete[] poolSpace;
+        delete[] obj;
     }
     CrossThreadRun() {}
-    void operator()( int id ) const {
+    void operator()(int id) const {
         rml::MemPoolPolicy pol(CrossThreadGetMem, CrossThreadPutMem);
-        const int objLen = 10*id;
+        const int objLen = 10 * id;
 
         pool_create_v1(id, &pol, &pool[id]);
-        obj[id] = (char*)pool_malloc(pool[id], objLen);
+        obj[id] = (char *) pool_malloc(pool[id], objLen);
         REQUIRE(obj[id]);
         memset(obj[id], id, objLen);
 
         {
-            const size_t lrgSz = 2*16*1024;
+            const size_t lrgSz = 2 * 16 * 1024;
             void *ptrLarge = pool_malloc(pool[id], lrgSz);
             REQUIRE(ptrLarge);
             memset(ptrLarge, 1, lrgSz);
             // consume all small objects
-            while (pool_malloc(pool[id], 5 * 1024));
+            while (pool_malloc(pool[id], 5 * 1024))
+                ;
             // releasing of large object will not give a chance to allocate more
             // since only fixed pool can look at other bins aligned/notAligned
             pool_free(pool[id], ptrLarge);
-            CHECK(!pool_malloc(pool[id], 5*1024));
+            CHECK(!pool_malloc(pool[id], 5 * 1024));
         }
 
         barrier.wait();
-        int myPool = number_of_threads-id-1;
-        for (int i=0; i<10*myPool; i++)
-            REQUIRE(myPool==obj[myPool][i]);
+        int myPool = number_of_threads - id - 1;
+        for (int i = 0; i < 10 * myPool; i++) REQUIRE(myPool == obj[myPool][i]);
         pool_free(pool[myPool], obj[myPool]);
         bool ok = pool_destroy(pool[myPool]);
         REQUIRE(ok);
@@ -277,22 +260,19 @@ rml::MemoryPool **CrossThreadRun::pool;
 char **CrossThreadRun::obj;
 
 // pools created, used and destroyed by different threads
-void TestCrossThreadPools()
-{
-    for (int p=utils::MinThread; p<=utils::MaxThread; p++) {
+void TestCrossThreadPools() {
+    for (int p = utils::MinThread; p <= utils::MaxThread; p++) {
         CrossThreadRun::initBarrier(p);
         CrossThreadRun::init(p);
-        utils::NativeParallelFor( p, CrossThreadRun() );
-        for (int i=0; i<p; i++)
-            REQUIRE_MESSAGE(!poolSpace[i].regions, "Region leak detected");
+        utils::NativeParallelFor(p, CrossThreadRun());
+        for (int i = 0; i < p; i++) REQUIRE_MESSAGE(!poolSpace[i].regions, "Region leak detected");
         CrossThreadRun::destroy();
     }
 }
 
 // buffer is too small to pool be created, but must not leak resources
-void TestTooSmallBuffer()
-{
-    poolSpace = new PoolSpace(8*1024);
+void TestTooSmallBuffer() {
+    poolSpace = new PoolSpace(8 * 1024);
 
     rml::MemPoolPolicy pol(CrossThreadGetMem, CrossThreadPutMem);
     rml::MemoryPool *pool;
@@ -307,46 +287,42 @@ void TestTooSmallBuffer()
 class FixedPoolHeadBase : utils::NoAssign {
     size_t size;
     std::atomic<bool> used;
-    char* data;
+    char *data;
+
 public:
-    FixedPoolHeadBase(size_t s) : size(s), used(false) {
-        data = new char[size];
-    }
+    FixedPoolHeadBase(size_t s) : size(s), used(false) { data = new char[size]; }
     void *useData(size_t &bytes) {
         bool wasUsed = used.exchange(true);
         REQUIRE_MESSAGE(!wasUsed, "The buffer must not be used twice.");
         bytes = size;
         return data;
     }
-    ~FixedPoolHeadBase() {
-        delete []data;
-    }
+    ~FixedPoolHeadBase() { delete[] data; }
 };
 
-template<size_t SIZE>
+template <size_t SIZE>
 class FixedPoolHead : FixedPoolHeadBase {
 public:
-    FixedPoolHead() : FixedPoolHeadBase(SIZE) { }
+    FixedPoolHead() : FixedPoolHeadBase(SIZE) {}
 };
 
-static void *fixedBufGetMem(intptr_t pool_id, size_t &bytes)
-{
-    return ((FixedPoolHeadBase*)pool_id)->useData(bytes);
+static void *fixedBufGetMem(intptr_t pool_id, size_t &bytes) {
+    return ((FixedPoolHeadBase *) pool_id)->useData(bytes);
 }
 
-class FixedPoolUse: utils::NoAssign {
+class FixedPoolUse : utils::NoAssign {
     static utils::SpinBarrier startB;
     rml::MemoryPool *pool;
     size_t reqSize;
     int iters;
+
 public:
-    FixedPoolUse(unsigned threads, rml::MemoryPool *p, size_t sz, int it) :
-        pool(p), reqSize(sz), iters(it) {
+    FixedPoolUse(unsigned threads, rml::MemoryPool *p, size_t sz, int it) : pool(p), reqSize(sz), iters(it) {
         startB.initialize(threads);
     }
-    void operator()( int /*id*/ ) const {
+    void operator()(int /*id*/) const {
         startB.wait();
-        for (int i=0; i<iters; i++) {
+        for (int i = 0; i < iters; i++) {
             void *o = pool_malloc(pool, reqSize);
             ASSERT(o, "Invalid object");
             pool_free(pool, o);
@@ -356,36 +332,35 @@ class FixedPoolUse: utils::NoAssign {
 
 utils::SpinBarrier FixedPoolUse::startB;
 
-class FixedPoolNomem: utils::NoAssign {
+class FixedPoolNomem : utils::NoAssign {
     utils::SpinBarrier *startB;
     rml::MemoryPool *pool;
+
 public:
-    FixedPoolNomem(utils::SpinBarrier *b, rml::MemoryPool *p) :
-        startB(b), pool(p) {}
+    FixedPoolNomem(utils::SpinBarrier *b, rml::MemoryPool *p) : startB(b), pool(p) {}
     void operator()(int id) const {
         startB->wait();
-        void *o = pool_malloc(pool, id%2? 64 : 128*1024);
+        void *o = pool_malloc(pool, id % 2 ? 64 : 128 * 1024);
         ASSERT(!o, "All memory must be consumed.");
     }
 };
 
-class FixedPoolSomeMem: utils::NoAssign {
+class FixedPoolSomeMem : utils::NoAssign {
     utils::SpinBarrier *barrier;
     rml::MemoryPool *pool;
+
 public:
-    FixedPoolSomeMem(utils::SpinBarrier *b, rml::MemoryPool *p) :
-        barrier(b), pool(p) {}
+    FixedPoolSomeMem(utils::SpinBarrier *b, rml::MemoryPool *p) : barrier(b), pool(p) {}
     void operator()(int id) const {
         barrier->wait();
-        utils::Sleep(2*id);
-        void *o = pool_malloc(pool, id%2? 64 : 128*1024);
+        utils::Sleep(2 * id);
+        void *o = pool_malloc(pool, id % 2 ? 64 : 128 * 1024);
         barrier->wait();
         pool_free(pool, o);
     }
 };
 
-bool haveEnoughSpace(rml::MemoryPool *pool, size_t sz)
-{
+bool haveEnoughSpace(rml::MemoryPool *pool, size_t sz) {
     if (void *p = pool_malloc(pool, sz)) {
         pool_free(pool, p);
         return true;
@@ -393,38 +368,36 @@ bool haveEnoughSpace(rml::MemoryPool *pool, size_t sz)
     return false;
 }
 
-void TestFixedBufferPool()
-{
+void TestFixedBufferPool() {
     const int ITERS = 7;
-    const size_t MAX_OBJECT = 7*1024*1024;
+    const size_t MAX_OBJECT = 7 * 1024 * 1024;
     void *ptrs[ITERS];
     rml::MemPoolPolicy pol(fixedBufGetMem, nullptr, 0, /*fixedSizePool=*/true,
                            /*keepMemTillDestroy=*/false);
     rml::MemoryPool *pool;
     {
-        FixedPoolHead<MAX_OBJECT + 1024*1024> head;
+        FixedPoolHead<MAX_OBJECT + 1024 * 1024> head;
 
-        pool_create_v1((intptr_t)&head, &pol, &pool);
+        pool_create_v1((intptr_t) &head, &pol, &pool);
         {
-            utils::NativeParallelFor( 1, FixedPoolUse(1, pool, MAX_OBJECT, 2) );
+            utils::NativeParallelFor(1, FixedPoolUse(1, pool, MAX_OBJECT, 2));
 
-            for (int i=0; i<ITERS; i++) {
-                ptrs[i] = pool_malloc(pool, MAX_OBJECT/ITERS);
+            for (int i = 0; i < ITERS; i++) {
+                ptrs[i] = pool_malloc(pool, MAX_OBJECT / ITERS);
                 REQUIRE(ptrs[i]);
             }
-            for (int i=0; i<ITERS; i++)
-                pool_free(pool, ptrs[i]);
+            for (int i = 0; i < ITERS; i++) pool_free(pool, ptrs[i]);
 
-            utils::NativeParallelFor( 1, FixedPoolUse(1, pool, MAX_OBJECT, 1) );
+            utils::NativeParallelFor(1, FixedPoolUse(1, pool, MAX_OBJECT, 1));
         }
         // each thread asks for an MAX_OBJECT/p/2 object,
         // /2 is to cover fragmentation
-        for (int p=utils::MinThread; p<=utils::MaxThread; p++) {
-            utils::NativeParallelFor( p, FixedPoolUse(p, pool, MAX_OBJECT/p/2, 10000) );
+        for (int p = utils::MinThread; p <= utils::MaxThread; p++) {
+            utils::NativeParallelFor(p, FixedPoolUse(p, pool, MAX_OBJECT / p / 2, 10000));
         }
         {
             const int p = 128;
-            utils::NativeParallelFor( p, FixedPoolUse(p, pool, MAX_OBJECT/p/2, 1) );
+            utils::NativeParallelFor(p, FixedPoolUse(p, pool, MAX_OBJECT / p / 2, 1));
         }
         {
             size_t maxSz;
@@ -435,29 +408,28 @@ void TestFixedBufferPool()
             // as the pool might be fragmented by BootStrapBlocks consumed during
             // FixedPoolRun.
             size_t l, r;
-            REQUIRE(haveEnoughSpace(pool, MAX_OBJECT/2));
-            for (l = MAX_OBJECT/2, r = MAX_OBJECT + 1024*1024; l < r-1; ) {
-                size_t mid = (l+r)/2;
-                if (haveEnoughSpace(pool, mid))
-                    l = mid;
+            REQUIRE(haveEnoughSpace(pool, MAX_OBJECT / 2));
+            for (l = MAX_OBJECT / 2, r = MAX_OBJECT + 1024 * 1024; l < r - 1;) {
+                size_t mid = (l + r) / 2;
+                if (haveEnoughSpace(pool, mid)) l = mid;
                 else
                     r = mid;
             }
             maxSz = l;
-            REQUIRE_MESSAGE(!haveEnoughSpace(pool, maxSz+1), "Expect to find boundary value.");
+            REQUIRE_MESSAGE(!haveEnoughSpace(pool, maxSz + 1), "Expect to find boundary value.");
             // consume all available memory
             void *largeObj = pool_malloc(pool, maxSz);
             REQUIRE(largeObj);
             void *o = pool_malloc(pool, 64);
-            if (o) // pool fragmented, skip FixedPoolNomem
+            if (o)// pool fragmented, skip FixedPoolNomem
                 pool_free(pool, o);
             else
-                utils::NativeParallelFor( p, FixedPoolNomem(&barrier, pool) );
+                utils::NativeParallelFor(p, FixedPoolNomem(&barrier, pool));
             pool_free(pool, largeObj);
             // keep some space unoccupied
-            largeObj = pool_malloc(pool, maxSz-512*1024);
+            largeObj = pool_malloc(pool, maxSz - 512 * 1024);
             REQUIRE(largeObj);
-            utils::NativeParallelFor( p, FixedPoolSomeMem(&barrier, pool) );
+            utils::NativeParallelFor(p, FixedPoolSomeMem(&barrier, pool));
             pool_free(pool, largeObj);
         }
         bool ok = pool_destroy(pool);
@@ -465,10 +437,10 @@ void TestFixedBufferPool()
     }
     // check that fresh untouched pool can successfully fulfil requests from 128 threads
     {
-        FixedPoolHead<MAX_OBJECT + 1024*1024> head;
-        pool_create_v1((intptr_t)&head, &pol, &pool);
-        int p=128;
-        utils::NativeParallelFor( p, FixedPoolUse(p, pool, MAX_OBJECT/p/2, 1) );
+        FixedPoolHead<MAX_OBJECT + 1024 * 1024> head;
+        pool_create_v1((intptr_t) &head, &pol, &pool);
+        int p = 128;
+        utils::NativeParallelFor(p, FixedPoolUse(p, pool, MAX_OBJECT / p / 2, 1));
         bool ok = pool_destroy(pool);
         REQUIRE(ok);
     }
@@ -476,30 +448,27 @@ void TestFixedBufferPool()
 
 static size_t currGranularity;
 
-static void *getGranMem(intptr_t /*pool_id*/, size_t &bytes)
-{
-    REQUIRE_MESSAGE(!(bytes%currGranularity), "Region size mismatch granularity.");
+static void *getGranMem(intptr_t /*pool_id*/, size_t &bytes) {
+    REQUIRE_MESSAGE(!(bytes % currGranularity), "Region size mismatch granularity.");
     return malloc(bytes);
 }
 
-static int putGranMem(intptr_t /*pool_id*/, void *ptr, size_t bytes)
-{
-    REQUIRE_MESSAGE(!(bytes%currGranularity), "Region size mismatch granularity.");
+static int putGranMem(intptr_t /*pool_id*/, void *ptr, size_t bytes) {
+    REQUIRE_MESSAGE(!(bytes % currGranularity), "Region size mismatch granularity.");
     free(ptr);
     return 0;
 }
 
-void TestPoolGranularity()
-{
+void TestPoolGranularity() {
     rml::MemPoolPolicy pol(getGranMem, putGranMem);
-    const size_t grans[] = {4*1024, 2*1024*1024, 6*1024*1024, 10*1024*1024};
+    const size_t grans[] = {4 * 1024, 2 * 1024 * 1024, 6 * 1024 * 1024, 10 * 1024 * 1024};
 
-    for (unsigned i=0; i<sizeof(grans)/sizeof(grans[0]); i++) {
+    for (unsigned i = 0; i < sizeof(grans) / sizeof(grans[0]); i++) {
         pol.granularity = currGranularity = grans[i];
         rml::MemoryPool *pool;
 
         pool_create_v1(0, &pol, &pool);
-        for (int sz=500*1024; sz<16*1024*1024; sz+=101*1024) {
+        for (int sz = 500 * 1024; sz < 16 * 1024 * 1024; sz += 101 * 1024) {
             void *p = pool_malloc(pool, sz);
             REQUIRE_MESSAGE(p, "Can't allocate memory in pool.");
             pool_free(pool, p);
@@ -511,57 +480,49 @@ void TestPoolGranularity()
 
 static size_t putMemAll, getMemAll, getMemSuccessful;
 
-static void *getMemMalloc(intptr_t /*pool_id*/, size_t &bytes)
-{
+static void *getMemMalloc(intptr_t /*pool_id*/, size_t &bytes) {
     getMemAll++;
     void *p = malloc(bytes);
-    if (p)
-        getMemSuccessful++;
+    if (p) getMemSuccessful++;
     return p;
 }
 
-static int putMemFree(intptr_t /*pool_id*/, void *ptr, size_t /*bytes*/)
-{
+static int putMemFree(intptr_t /*pool_id*/, void *ptr, size_t /*bytes*/) {
     putMemAll++;
     free(ptr);
     return 0;
 }
 
-void TestPoolKeepTillDestroy()
-{
-    const int ITERS = 50*1024;
-    void *ptrs[2*ITERS+1];
+void TestPoolKeepTillDestroy() {
+    const int ITERS = 50 * 1024;
+    void *ptrs[2 * ITERS + 1];
     rml::MemPoolPolicy pol(getMemMalloc, putMemFree);
     rml::MemoryPool *pool;
 
     // 1st create default pool that returns memory back to callback,
     // then use keepMemTillDestroy policy
-    for (int keep=0; keep<2; keep++) {
+    for (int keep = 0; keep < 2; keep++) {
         getMemAll = putMemAll = 0;
-        if (keep)
-            pol.keepAllMemory = 1;
+        if (keep) pol.keepAllMemory = 1;
         pool_create_v1(0, &pol, &pool);
-        for (int i=0; i<2*ITERS; i+=2) {
-            ptrs[i] = pool_malloc(pool, 7*1024);
-            ptrs[i+1] = pool_malloc(pool, 10*1024);
+        for (int i = 0; i < 2 * ITERS; i += 2) {
+            ptrs[i] = pool_malloc(pool, 7 * 1024);
+            ptrs[i + 1] = pool_malloc(pool, 10 * 1024);
         }
-        ptrs[2*ITERS] = pool_malloc(pool, 8*1024*1024);
+        ptrs[2 * ITERS] = pool_malloc(pool, 8 * 1024 * 1024);
         REQUIRE(!putMemAll);
-        for (int i=0; i<2*ITERS; i++)
-            pool_free(pool, ptrs[i]);
-        pool_free(pool, ptrs[2*ITERS]);
+        for (int i = 0; i < 2 * ITERS; i++) pool_free(pool, ptrs[i]);
+        pool_free(pool, ptrs[2 * ITERS]);
         size_t totalPutMemCalls = putMemAll;
-        if (keep)
-            REQUIRE(!putMemAll);
+        if (keep) REQUIRE(!putMemAll);
         else {
             REQUIRE(putMemAll);
             putMemAll = 0;
         }
         size_t getCallsBefore = getMemAll;
-        void *p = pool_malloc(pool, 8*1024*1024);
+        void *p = pool_malloc(pool, 8 * 1024 * 1024);
         REQUIRE(p);
-        if (keep)
-            REQUIRE_MESSAGE(getCallsBefore == getMemAll, "Must not lead to new getMem call");
+        if (keep) REQUIRE_MESSAGE(getCallsBefore == getMemAll, "Must not lead to new getMem call");
         size_t putCallsBefore = putMemAll;
         bool ok = pool_reset(pool);
         REQUIRE(ok);
@@ -572,47 +533,43 @@ void TestPoolKeepTillDestroy()
         totalPutMemCalls += putMemAll;
         REQUIRE_MESSAGE(getMemAll == totalPutMemCalls, "Memory leak detected.");
     }
-
 }
 
-static bool memEqual(char *buf, size_t size, int val)
-{
+static bool memEqual(char *buf, size_t size, int val) {
     bool memEq = true;
-    for (size_t k=0; k<size; k++)
-        if (buf[k] != val)
-             memEq = false;
+    for (size_t k = 0; k < size; k++)
+        if (buf[k] != val) memEq = false;
     return memEq;
 }
 
-void TestEntries()
-{
+void TestEntries() {
     const int SZ = 4;
     const int ALGN = 4;
-    size_t size[SZ] = {8, 8000, 9000, 100*1024};
-    size_t algn[ALGN] = {8, 64, 4*1024, 8*1024*1024};
+    size_t size[SZ] = {8, 8000, 9000, 100 * 1024};
+    size_t algn[ALGN] = {8, 64, 4 * 1024, 8 * 1024 * 1024};
 
     rml::MemPoolPolicy pol(getGranMem, putGranMem);
-    currGranularity = 1; // not check granularity in the test
+    currGranularity = 1;// not check granularity in the test
     rml::MemoryPool *pool;
 
     pool_create_v1(0, &pol, &pool);
-    for (int i=0; i<SZ; i++)
-        for (int j=0; j<ALGN; j++) {
-            char *p = (char*)pool_aligned_malloc(pool, size[i], algn[j]);
-            REQUIRE((p && 0==((uintptr_t)p & (algn[j]-1))));
+    for (int i = 0; i < SZ; i++)
+        for (int j = 0; j < ALGN; j++) {
+            char *p = (char *) pool_aligned_malloc(pool, size[i], algn[j]);
+            REQUIRE((p && 0 == ((uintptr_t) p & (algn[j] - 1))));
             memset(p, j, size[i]);
 
             size_t curr_algn = algn[rand() % ALGN];
             size_t curr_sz = size[rand() % SZ];
-            char *p1 = (char*)pool_aligned_realloc(pool, p, curr_sz, curr_algn);
-            REQUIRE((p1 && 0==((uintptr_t)p1 & (curr_algn-1))));
+            char *p1 = (char *) pool_aligned_realloc(pool, p, curr_sz, curr_algn);
+            REQUIRE((p1 && 0 == ((uintptr_t) p1 & (curr_algn - 1))));
             REQUIRE(memEqual(p1, utils::min(size[i], curr_sz), j));
 
-            memset(p1, j+1, curr_sz);
+            memset(p1, j + 1, curr_sz);
             size_t curr_sz1 = size[rand() % SZ];
-            char *p2 = (char*)pool_realloc(pool, p1, curr_sz1);
+            char *p2 = (char *) pool_realloc(pool, p1, curr_sz1);
             REQUIRE(p2);
-            REQUIRE(memEqual(p2, utils::min(curr_sz1, curr_sz), j+1));
+            REQUIRE(memEqual(p2, utils::min(curr_sz1, curr_sz), j + 1));
 
             pool_free(pool, p2);
         }
@@ -626,8 +583,7 @@ void TestEntries()
     REQUIRE(!fail);
 }
 
-rml::MemoryPool *CreateUsablePool(size_t size)
-{
+rml::MemoryPool *CreateUsablePool(size_t size) {
     rml::MemoryPool *pool;
     rml::MemPoolPolicy okPolicy(getMemMalloc, putMemFree);
 
@@ -645,16 +601,16 @@ rml::MemoryPool *CreateUsablePool(size_t size)
     }
     REQUIRE_MESSAGE(o, "Created pool must be useful.");
     REQUIRE_MESSAGE((getMemSuccessful == 1 || getMemSuccessful == 5 || getMemAll > getMemSuccessful),
-           "Multiple requests are allowed when unsuccessful request occurred or cannot search in bootstrap memory. ");
+                    "Multiple requests are allowed when unsuccessful request occurred or cannot search in "
+                    "bootstrap memory. ");
     REQUIRE(!putMemAll);
     pool_free(pool, o);
 
     return pool;
 }
 
-void CheckPoolLeaks(size_t poolsAlwaysAvailable)
-{
-    const size_t MAX_POOLS = 16*1000;
+void CheckPoolLeaks(size_t poolsAlwaysAvailable) {
+    const size_t MAX_POOLS = 16 * 1000;
     const int ITERS = 20, CREATED_STABLE = 3;
     rml::MemoryPool *pools[MAX_POOLS];
     size_t created, maxCreated = MAX_POOLS;
@@ -662,16 +618,15 @@ void CheckPoolLeaks(size_t poolsAlwaysAvailable)
 
     // expecting that for ITERS runs, max number of pools that can be created
     // can be stabilized and still stable CREATED_STABLE times
-    for (int j=0; j<ITERS && maxNotChangedCnt<CREATED_STABLE; j++) {
-        for (created=0; created<maxCreated; created++) {
+    for (int j = 0; j < ITERS && maxNotChangedCnt < CREATED_STABLE; j++) {
+        for (created = 0; created < maxCreated; created++) {
             rml::MemoryPool *p = CreateUsablePool(1024);
-            if (!p)
-                break;
+            if (!p) break;
             pools[created] = p;
         }
-        REQUIRE_MESSAGE(created>=poolsAlwaysAvailable,
-               "Expect that the reasonable number of pools can be always created.");
-        for (size_t i=0; i<created; i++) {
+        REQUIRE_MESSAGE(created >= poolsAlwaysAvailable,
+                        "Expect that the reasonable number of pools can be always created.");
+        for (size_t i = 0; i < created; i++) {
             bool ok = pool_destroy(pools[i]);
             REQUIRE(ok);
         }
@@ -684,22 +639,20 @@ void CheckPoolLeaks(size_t poolsAlwaysAvailable)
     REQUIRE_MESSAGE(maxNotChangedCnt == CREATED_STABLE, "The number of created pools must be stabilized.");
 }
 
-void TestPoolCreation()
-{
+void TestPoolCreation() {
     putMemAll = getMemAll = getMemSuccessful = 0;
 
-    rml::MemPoolPolicy nullPolicy(nullptr, putMemFree),
-        emptyFreePolicy(getMemMalloc, nullptr),
-        okPolicy(getMemMalloc, putMemFree);
+    rml::MemPoolPolicy nullPolicy(nullptr, putMemFree), emptyFreePolicy(getMemMalloc, nullptr),
+            okPolicy(getMemMalloc, putMemFree);
     rml::MemoryPool *pool;
 
     rml::MemPoolError res = pool_create_v1(0, &nullPolicy, &pool);
-    REQUIRE_MESSAGE(res==rml::INVALID_POLICY, "pool with empty pAlloc can't be created");
+    REQUIRE_MESSAGE(res == rml::INVALID_POLICY, "pool with empty pAlloc can't be created");
     res = pool_create_v1(0, &emptyFreePolicy, &pool);
-    REQUIRE_MESSAGE(res==rml::INVALID_POLICY, "pool with empty pFree can't be created");
+    REQUIRE_MESSAGE(res == rml::INVALID_POLICY, "pool with empty pFree can't be created");
     REQUIRE_MESSAGE((!putMemAll && !getMemAll), "no callback calls are expected");
     res = pool_create_v1(0, &okPolicy, &pool);
-    REQUIRE(res==rml::POOL_OK);
+    REQUIRE(res == rml::POOL_OK);
     bool ok = pool_destroy(pool);
     REQUIRE(ok);
     REQUIRE_MESSAGE(putMemAll == getMemSuccessful, "no leaks after pool_destroy");
@@ -716,73 +669,70 @@ struct AllocatedObject {
     rml::MemoryPool *pool;
 };
 
-const size_t BUF_SIZE = 1024*1024;
+const size_t BUF_SIZE = 1024 * 1024;
 
 class PoolIdentityCheck : utils::NoAssign {
-    rml::MemoryPool** const pools;
-    AllocatedObject** const objs;
+    rml::MemoryPool **const pools;
+    AllocatedObject **const objs;
+
 public:
-    PoolIdentityCheck(rml::MemoryPool** p, AllocatedObject** o) : pools(p), objs(o) {}
+    PoolIdentityCheck(rml::MemoryPool **p, AllocatedObject **o) : pools(p), objs(o) {}
     void operator()(int id) const {
-        objs[id] = (AllocatedObject*)pool_malloc(pools[id], BUF_SIZE/2);
+        objs[id] = (AllocatedObject *) pool_malloc(pools[id], BUF_SIZE / 2);
         REQUIRE(objs[id]);
         rml::MemoryPool *act_pool = rml::pool_identify(objs[id]);
         REQUIRE(act_pool == pools[id]);
 
-        for (size_t total=0; total<2*BUF_SIZE; total+=256) {
-            AllocatedObject *o = (AllocatedObject*)pool_malloc(pools[id], 256);
+        for (size_t total = 0; total < 2 * BUF_SIZE; total += 256) {
+            AllocatedObject *o = (AllocatedObject *) pool_malloc(pools[id], 256);
             REQUIRE(o);
             act_pool = rml::pool_identify(o);
             REQUIRE(act_pool == pools[id]);
             pool_free(act_pool, o);
         }
-        if( id&1 ) { // make every second returned object "small"
+        if (id & 1) {// make every second returned object "small"
             pool_free(act_pool, objs[id]);
-            objs[id] = (AllocatedObject*)pool_malloc(pools[id], 16);
+            objs[id] = (AllocatedObject *) pool_malloc(pools[id], 16);
             REQUIRE(objs[id]);
         }
         objs[id]->pool = act_pool;
     }
 };
 
-void TestPoolDetection()
-{
+void TestPoolDetection() {
     const int POOLS = 4;
     rml::MemPoolPolicy pol(fixedBufGetMem, nullptr, 0, /*fixedSizePool=*/true,
                            /*keepMemTillDestroy=*/false);
     rml::MemoryPool *pools[POOLS];
-    FixedPoolHead<BUF_SIZE*POOLS> head[POOLS];
+    FixedPoolHead<BUF_SIZE * POOLS> head[POOLS];
     AllocatedObject *objs[POOLS];
 
-    for (int i=0; i<POOLS; i++)
-        pool_create_v1((intptr_t)(head+i), &pol, &pools[i]);
+    for (int i = 0; i < POOLS; i++) pool_create_v1((intptr_t)(head + i), &pol, &pools[i]);
     // if object somehow released to different pools, subsequent allocation
     // from affected pools became impossible
-    for (int k=0; k<10; k++) {
+    for (int k = 0; k < 10; k++) {
         PoolIdentityCheck check(pools, objs);
-        if( k&1 )
-            utils::NativeParallelFor( POOLS, check);
+        if (k & 1) utils::NativeParallelFor(POOLS, check);
         else
-            for (int i=0; i<POOLS; i++) check(i);
+            for (int i = 0; i < POOLS; i++) check(i);
 
-        for (int i=0; i<POOLS; i++) {
+        for (int i = 0; i < POOLS; i++) {
             rml::MemoryPool *p = rml::pool_identify(objs[i]);
             REQUIRE(p == objs[i]->pool);
             pool_free(p, objs[i]);
         }
     }
-    for (int i=0; i<POOLS; i++) {
+    for (int i = 0; i < POOLS; i++) {
         bool ok = pool_destroy(pools[i]);
         REQUIRE(ok);
     }
 }
 
-void TestLazyBootstrap()
-{
+void TestLazyBootstrap() {
     rml::MemPoolPolicy pol(getMemMalloc, putMemFree);
-    const size_t sizes[] = {8, 9*1024, 0};
+    const size_t sizes[] = {8, 9 * 1024, 0};
 
-    for (int i=0; sizes[i]; i++) {
+    for (int i = 0; sizes[i]; i++) {
         rml::MemoryPool *pool = CreateUsablePool(sizes[i]);
         bool ok = pool_destroy(pool);
         REQUIRE(ok);
@@ -790,19 +740,21 @@ void TestLazyBootstrap()
     }
 }
 
-class NoLeakOnDestroyRun: utils::NoAssign {
-    rml::MemoryPool      *pool;
+class NoLeakOnDestroyRun : utils::NoAssign {
+    rml::MemoryPool *pool;
     utils::SpinBarrier *barrier;
+
 public:
     NoLeakOnDestroyRun(rml::MemoryPool *p, utils::SpinBarrier *b) : pool(p), barrier(b) {}
     void operator()(int id) const {
-        void *p = pool_malloc(pool, id%2? 8 : 9000);
+        void *p = pool_malloc(pool, id % 2 ? 8 : 9000);
         REQUIRE((p && liveRegions.load(std::memory_order_relaxed)));
         barrier->wait();
         if (!id) {
             bool ok = pool_destroy(pool);
             REQUIRE(ok);
-            REQUIRE_MESSAGE(!liveRegions.load(std::memory_order_relaxed), "Expected all regions were released.");
+            REQUIRE_MESSAGE(!liveRegions.load(std::memory_order_relaxed),
+                            "Expected all regions were released.");
         }
         // other threads must wait till pool destruction,
         // to not call thread destruction cleanup before this
@@ -810,10 +762,9 @@ class NoLeakOnDestroyRun: utils::NoAssign {
     }
 };
 
-void TestNoLeakOnDestroy()
-{
+void TestNoLeakOnDestroy() {
     liveRegions.store(0, std::memory_order_release);
-    for (int p=utils::MinThread; p<=utils::MaxThread; p++) {
+    for (int p = utils::MinThread; p <= utils::MaxThread; p++) {
         rml::MemPoolPolicy pol(getMallocMem, putMallocMem);
         utils::SpinBarrier barrier(p);
         rml::MemoryPool *pool;
@@ -823,9 +774,8 @@ void TestNoLeakOnDestroy()
     }
 }
 
-static int putMallocMemError(intptr_t /*pool_id*/, void *ptr, size_t bytes)
-{
-    MallocPoolHeader *hdr = (MallocPoolHeader*)ptr-1;
+static int putMallocMemError(intptr_t /*pool_id*/, void *ptr, size_t bytes) {
+    MallocPoolHeader *hdr = (MallocPoolHeader *) ptr - 1;
     REQUIRE_MESSAGE(bytes == hdr->userSize, "Invalid size in pool callback.");
     free(hdr->rawPtr);
 
@@ -834,16 +784,15 @@ static int putMallocMemError(intptr_t /*pool_id*/, void *ptr, size_t bytes)
     return -1;
 }
 
-void TestDestroyFailed()
-{
+void TestDestroyFailed() {
     rml::MemPoolPolicy pol(getMallocMem, putMallocMemError);
     rml::MemoryPool *pool;
     pool_create_v1(0, &pol, &pool);
     void *ptr = pool_malloc(pool, 16);
     REQUIRE(ptr);
     bool fail = pool_destroy(pool);
-    REQUIRE_MESSAGE(fail==false, "putMemPolicyError callback returns error, "
-           "expect pool_destroy() failure");
+    REQUIRE_MESSAGE(fail == false, "putMemPolicyError callback returns error, "
+                                   "expect pool_destroy() failure");
 }
 
 void TestPoolMSize() {
@@ -851,18 +800,18 @@ void TestPoolMSize() {
 
     const int SZ = 10;
     // Original allocation requests, random numbers from small to large
-    size_t requestedSz[SZ] = {8, 16, 500, 1000, 2000, 4000, 8000, 1024*1024, 4242+4242, 8484+8484};
+    size_t requestedSz[SZ] = {8, 16, 500, 1000, 2000, 4000, 8000, 1024 * 1024, 4242 + 4242, 8484 + 8484};
 
     // Unlike large objects, small objects do not store its original size along with the object itself
     // On Power architecture TLS bins are divided differently.
     size_t allocatedSz[SZ] =
 #if __powerpc64__ || __ppc64__ || __bgp__
-        {8, 16, 512, 1024, 2688, 5376, 8064, 1024*1024, 4242+4242, 8484+8484};
+            {8, 16, 512, 1024, 2688, 5376, 8064, 1024 * 1024, 4242 + 4242, 8484 + 8484};
 #else
-        {8, 16, 512, 1024, 2688, 4032, 8128, 1024*1024, 4242+4242, 8484+8484};
+            {8, 16, 512, 1024, 2688, 4032, 8128, 1024 * 1024, 4242 + 4242, 8484 + 8484};
 #endif
     for (int i = 0; i < SZ; i++) {
-        void* obj = pool_malloc(pool, requestedSz[i]);
+        void *obj = pool_malloc(pool, requestedSz[i]);
         size_t objSize = pool_msize(pool, obj);
         REQUIRE_MESSAGE(objSize == allocatedSz[i], "pool_msize returned the wrong value");
         pool_free(pool, obj);
@@ -872,69 +821,41 @@ void TestPoolMSize() {
 }
 
 //! \brief \ref error_guessing
-TEST_CASE("Too small buffer") {
-    TestTooSmallBuffer();
-}
+TEST_CASE("Too small buffer") { TestTooSmallBuffer(); }
 
 //! \brief \ref error_guessing
-TEST_CASE("Pool reset") {
-    TestPoolReset();
-}
-TEST_CASE("Shared pool") {
-    TestSharedPool();
-}
+TEST_CASE("Pool reset") { TestPoolReset(); }
+TEST_CASE("Shared pool") { TestSharedPool(); }
 
 //! \brief \ref error_guessing
-TEST_CASE("Cross thread pools") {
-    TestCrossThreadPools();
-}
+TEST_CASE("Cross thread pools") { TestCrossThreadPools(); }
 
 //! \brief \ref interface
-TEST_CASE("Fixed buffer pool") {
-    TestFixedBufferPool();
-}
+TEST_CASE("Fixed buffer pool") { TestFixedBufferPool(); }
 
 //! \brief \ref interface
-TEST_CASE("Pool granularity") {
-    TestPoolGranularity();
-}
+TEST_CASE("Pool granularity") { TestPoolGranularity(); }
 
 //! \brief \ref error_guessing
-TEST_CASE("Keep pool till destroy") {
-    TestPoolKeepTillDestroy();
-}
+TEST_CASE("Keep pool till destroy") { TestPoolKeepTillDestroy(); }
 
 //! \brief \ref error_guessing
-TEST_CASE("Entries") {
-    TestEntries();
-}
+TEST_CASE("Entries") { TestEntries(); }
 
 //! \brief \ref interface
-TEST_CASE("Pool creation") {
-    TestPoolCreation();
-}
+TEST_CASE("Pool creation") { TestPoolCreation(); }
 
 //! \brief \ref error_guessing
-TEST_CASE("Pool detection") {
-    TestPoolDetection();
-}
+TEST_CASE("Pool detection") { TestPoolDetection(); }
 
 //! \brief \ref error_guessing
-TEST_CASE("Lazy bootstrap") {
-    TestLazyBootstrap();
-}
+TEST_CASE("Lazy bootstrap") { TestLazyBootstrap(); }
 
 //! \brief \ref error_guessing
-TEST_CASE("No leak on destroy") {
-    TestNoLeakOnDestroy();
-}
+TEST_CASE("No leak on destroy") { TestNoLeakOnDestroy(); }
 
 //! \brief \ref error_guessing
-TEST_CASE("Destroy failed") {
-    TestDestroyFailed();
-}
+TEST_CASE("Destroy failed") { TestDestroyFailed(); }
 
 //! \brief \ref interface
-TEST_CASE("Pool msize") {
-    TestPoolMSize();
-}
+TEST_CASE("Pool msize") { TestPoolMSize(); }
diff --git a/external/tbb/test/tbbmalloc/test_malloc_regression.cpp b/external/tbb/test/tbbmalloc/test_malloc_regression.cpp
index 532f85e4..50e01d8d 100644
--- a/external/tbb/test/tbbmalloc/test_malloc_regression.cpp
+++ b/external/tbb/test/tbbmalloc/test_malloc_regression.cpp
@@ -16,10 +16,10 @@
 
 #define __TBB_NO_IMPLICIT_LINKAGE 1
 
+#include "common/memory_usage.h"
 #include "common/test.h"
 #include "common/utils.h"
 #include "common/utils_report.h"
-#include "common/memory_usage.h"
 #include "oneapi/tbb/detail/_utils.h"
 #include "tbb/scalable_allocator.h"
 #include "thread"
@@ -29,13 +29,12 @@ class minimalAllocFree {
 public:
     void operator()(int size) const {
         tbb::scalable_allocator<char> a;
-        char* str = a.allocate( size );
-        a.deallocate( str, size );
+        char* str = a.allocate(size);
+        a.deallocate(str, size);
     }
 };
 
-
-template<typename Body, typename Arg>
+template <typename Body, typename Arg>
 void RunThread(const Body& body, const Arg& arg) {
     std::thread job(body, arg);
     job.join();
@@ -51,18 +50,17 @@ bool TestBootstrapLeak() {
        should be reserved for the test body. 62 blocks left, each can serve 15 objects of 1024 bytes.
     */
     const int alloc_size = 1024;
-    const int take_out_count = 15*62;
+    const int take_out_count = 15 * 62;
 
     tbb::scalable_allocator<char> a;
     char* array[take_out_count];
-    for( int i=0; i<take_out_count; ++i )
-        array[i] = a.allocate( alloc_size );
+    for (int i = 0; i < take_out_count; ++i) array[i] = a.allocate(alloc_size);
 
-    RunThread( minimalAllocFree(), alloc_size ); // for threading library to take some memory
+    RunThread(minimalAllocFree(), alloc_size);// for threading library to take some memory
     size_t memory_in_use = utils::GetMemoryUsage();
     // Wait for memory usage data to "stabilize". The test number (1000) has nothing underneath.
-    for( int i=0; i<1000; i++) {
-        if( utils::GetMemoryUsage()!=memory_in_use ) {
+    for (int i = 0; i < 1000; i++) {
+        if (utils::GetMemoryUsage() != memory_in_use) {
             memory_in_use = utils::GetMemoryUsage();
             i = -1;
         }
@@ -73,21 +71,18 @@ bool TestBootstrapLeak() {
     const int num_thread_runs = 200;
     for (;;) {
         memory_in_use = utils::GetMemoryUsage();
-        for( int i=0; i<num_thread_runs; ++i )
-            RunThread( minimalAllocFree(), alloc_size );
+        for (int i = 0; i < num_thread_runs; ++i) RunThread(minimalAllocFree(), alloc_size);
 
         memory_leak = utils::GetMemoryUsage() - memory_in_use;
-        if (!memory_leak)
-            break;
+        if (!memory_leak) break;
     }
-    if( memory_leak>0 ) { // possibly too strong?
-        REPORT( "Error: memory leak of up to %ld bytes\n", static_cast<long>(memory_leak));
+    if (memory_leak > 0) {// possibly too strong?
+        REPORT("Error: memory leak of up to %ld bytes\n", static_cast<long>(memory_leak));
     }
 
-    for( int i=0; i<take_out_count; ++i )
-        a.deallocate( array[i], alloc_size );
+    for (int i = 0; i < take_out_count; ++i) a.deallocate(array[i], alloc_size);
 
-    return memory_leak<=0;
+    return memory_leak <= 0;
 }
 
 /*--------------------------------------------------------------------*/
@@ -96,18 +91,19 @@ bool TestBootstrapLeak() {
 bool TestReallocMsize(size_t startSz) {
     bool passed = true;
 
-    char *buf = (char*)scalable_malloc(startSz);
+    char* buf = (char*) scalable_malloc(startSz);
     REQUIRE_MESSAGE(buf, "");
     size_t realSz = scalable_msize(buf);
-    REQUIRE_MESSAGE(realSz>=startSz, "scalable_msize must be not less then allocated size");
-    memset(buf, 'a', realSz-1);
-    buf[realSz-1] = 0;
-    char *buf1 = (char*)scalable_realloc(buf, 2*realSz);
+    REQUIRE_MESSAGE(realSz >= startSz, "scalable_msize must be not less then allocated size");
+    memset(buf, 'a', realSz - 1);
+    buf[realSz - 1] = 0;
+    char* buf1 = (char*) scalable_realloc(buf, 2 * realSz);
     REQUIRE_MESSAGE(buf1, "");
-    REQUIRE_MESSAGE((scalable_msize(buf1)>=2*realSz), "scalable_msize must be not less then allocated size");
-    buf1[2*realSz-1] = 0;
-    if ( strspn(buf1, "a") < realSz-1 ) {
-        REPORT( "Error: data broken for %d Bytes object.\n", startSz);
+    REQUIRE_MESSAGE((scalable_msize(buf1) >= 2 * realSz),
+                    "scalable_msize must be not less then allocated size");
+    buf1[2 * realSz - 1] = 0;
+    if (strspn(buf1, "a") < realSz - 1) {
+        REPORT("Error: data broken for %d Bytes object.\n", startSz);
         passed = false;
     }
     scalable_free(buf1);
@@ -117,44 +113,43 @@ bool TestReallocMsize(size_t startSz) {
 
 // regression test against incorrect work of msize/realloc
 // for aligned objects
-void TestAlignedMsize()
-{
+void TestAlignedMsize() {
     const int NUM = 4;
-    char *p[NUM];
+    char* p[NUM];
     size_t objSizes[NUM];
-    size_t allocSz[] = {4, 8, 512, 2*1024, 4*1024, 8*1024, 16*1024, 0};
-    size_t align[] = {8, 512, 2*1024, 4*1024, 8*1024, 16*1024, 0};
+    size_t allocSz[] = {4, 8, 512, 2 * 1024, 4 * 1024, 8 * 1024, 16 * 1024, 0};
+    size_t align[] = {8, 512, 2 * 1024, 4 * 1024, 8 * 1024, 16 * 1024, 0};
 
-    for (int a=0; align[a]; a++)
-        for (int s=0; allocSz[s]; s++) {
-            for (int i=0; i<NUM; i++) {
-                p[i] = (char*)scalable_aligned_malloc(allocSz[s], align[a]);
+    for (int a = 0; align[a]; a++)
+        for (int s = 0; allocSz[s]; s++) {
+            for (int i = 0; i < NUM; i++) {
+                p[i] = (char*) scalable_aligned_malloc(allocSz[s], align[a]);
                 CHECK_FAST(tbb::detail::is_aligned(p[i], align[a]));
             }
 
-            for (int i=0; i<NUM; i++) {
+            for (int i = 0; i < NUM; i++) {
                 objSizes[i] = scalable_msize(p[i]);
-                CHECK_FAST_MESSAGE(objSizes[i] >= allocSz[s], "allocated size must be not less than requested");
+                CHECK_FAST_MESSAGE(objSizes[i] >= allocSz[s],
+                                   "allocated size must be not less than requested");
                 memset(p[i], i, objSizes[i]);
             }
-            for (int i=0; i<NUM; i++) {
-                for (unsigned j=0; j<objSizes[i]; j++)
-                    CHECK_FAST_MESSAGE((((char*)p[i])[j] == i), "Error: data broken");
+            for (int i = 0; i < NUM; i++) {
+                for (unsigned j = 0; j < objSizes[i]; j++)
+                    CHECK_FAST_MESSAGE((((char*) p[i])[j] == i), "Error: data broken");
             }
 
-            for (int i=0; i<NUM; i++) {
-                p[i] = (char*)scalable_aligned_realloc(p[i], 2*allocSz[s], align[a]);
+            for (int i = 0; i < NUM; i++) {
+                p[i] = (char*) scalable_aligned_realloc(p[i], 2 * allocSz[s], align[a]);
                 CHECK(tbb::detail::is_aligned(p[i], align[a]));
-                memset((char*)p[i]+allocSz[s], i+1, allocSz[s]);
+                memset((char*) p[i] + allocSz[s], i + 1, allocSz[s]);
             }
-            for (int i=0; i<NUM; i++) {
-                for (unsigned j=0; j<allocSz[s]; j++)
-                    CHECK_FAST_MESSAGE((((char*)p[i])[j] == i), "Error: data broken");
-                for (size_t j=allocSz[s]; j<2*allocSz[s]; j++)
-                    CHECK_FAST_MESSAGE((((char*)p[i])[j] == i+1), "Error: data broken");
+            for (int i = 0; i < NUM; i++) {
+                for (unsigned j = 0; j < allocSz[s]; j++)
+                    CHECK_FAST_MESSAGE((((char*) p[i])[j] == i), "Error: data broken");
+                for (size_t j = allocSz[s]; j < 2 * allocSz[s]; j++)
+                    CHECK_FAST_MESSAGE((((char*) p[i])[j] == i + 1), "Error: data broken");
             }
-            for (int i=0; i<NUM; i++)
-                scalable_free(p[i]);
+            for (int i = 0; i < NUM; i++) scalable_free(p[i]);
         }
 }
 
@@ -165,29 +160,23 @@ TEST_CASE("Memory leaks test is not applicable under ASAN\n" * doctest::skip(tru
 //! \brief \ref error_guessing
 TEST_CASE("testing leaks") {
     // Check whether memory usage data can be obtained; if not, skip test_bootstrap_leak.
-    if (utils::GetMemoryUsage()) {
-        REQUIRE_MESSAGE(TestBootstrapLeak(), "Test failed");
-    }
+    if (utils::GetMemoryUsage()) { REQUIRE_MESSAGE(TestBootstrapLeak(), "Test failed"); }
 }
-#endif // __TBB_USE_ADDRESS_SANITIZER
+#endif// __TBB_USE_ADDRESS_SANITIZER
 
 //! \brief \ref error_guessing
 TEST_CASE("testing realloc mem size") {
     bool passed = true;
     // TestReallocMsize runs for each power of 2 and each Fibonacci number below 64K
-    for (size_t a=1, b=1, sum=1; sum<=64*1024; ) {
+    for (size_t a = 1, b = 1, sum = 1; sum <= 64 * 1024;) {
         passed &= TestReallocMsize(sum);
         a = b;
         b = sum;
-        sum = a+b;
-    }
-    for (size_t a=2; a<=64*1024; a*=2) {
-        passed &= TestReallocMsize(a);
+        sum = a + b;
     }
-    REQUIRE_MESSAGE( passed, "Test failed" );
+    for (size_t a = 2; a <= 64 * 1024; a *= 2) { passed &= TestReallocMsize(a); }
+    REQUIRE_MESSAGE(passed, "Test failed");
 }
 
 //! \brief \ref error_guessing
-TEST_CASE("testing memory align") {
-    TestAlignedMsize();
-}
+TEST_CASE("testing memory align") { TestAlignedMsize(); }
diff --git a/external/tbb/test/tbbmalloc/test_malloc_shutdown_hang.cpp b/external/tbb/test/tbbmalloc/test_malloc_shutdown_hang.cpp
index 8b46afa6..bce767cb 100644
--- a/external/tbb/test/tbbmalloc/test_malloc_shutdown_hang.cpp
+++ b/external/tbb/test/tbbmalloc/test_malloc_shutdown_hang.cpp
@@ -21,16 +21,13 @@
 #include "common/utils_report.h"
 
 #include "tbb/global_control.h"
-#include "tbb/task_arena.h"
 #include "tbb/scalable_allocator.h"
-
+#include "tbb/task_arena.h"
 
 // Lets slow down the main thread on exit
 static constexpr int MAX_DELAY = 5;
 struct GlobalObject {
-    ~GlobalObject() {
-        utils::Sleep(rand( ) % MAX_DELAY);
-    }
+    ~GlobalObject() { utils::Sleep(rand() % MAX_DELAY); }
 } go;
 
 void allocatorRandomThrashing() {
@@ -38,12 +35,10 @@ void allocatorRandomThrashing() {
     const int MAX_ITER = 10000;
     const int MAX_ALLOC = 10 * 1024 * 1024;
 
-    void *arr[ARRAY_SIZE] = {nullptr};
+    void* arr[ARRAY_SIZE] = {nullptr};
     for (int i = 0; i < rand() % MAX_ITER; ++i) {
         // Random allocation size for random arrays
-        for (int j = 0; j < rand() % ARRAY_SIZE; ++j) {
-            arr[j] = scalable_malloc(rand() % MAX_ALLOC);
-        }
+        for (int j = 0; j < rand() % ARRAY_SIZE; ++j) { arr[j] = scalable_malloc(rand() % MAX_ALLOC); }
         // Deallocate everything
         for (int j = 0; j < ARRAY_SIZE; ++j) {
             scalable_free(arr[j]);
@@ -55,28 +50,24 @@ void allocatorRandomThrashing() {
 void hangOnExitReproducer() {
     const int P = tbb::global_control::max_allowed_parallelism;
     tbb::task_arena test_arena;
-    for (int i = 0; i < P-1; i++) {
-        test_arena.enqueue(allocatorRandomThrashing);
-    }
+    for (int i = 0; i < P - 1; i++) { test_arena.enqueue(allocatorRandomThrashing); }
 }
 
 #if (_WIN32 || _WIN64) && !__TBB_WIN8UI_SUPPORT
-#include <process.h> // _spawnl
-void processSpawn(const char* self) {
-    _spawnl(_P_WAIT, self, self, "1", nullptr);
-}
+#include <process.h>// _spawnl
+void processSpawn(const char* self) { _spawnl(_P_WAIT, self, self, "1", nullptr); }
 #elif __unix__ || __APPLE__
-#include <unistd.h> // fork/exec
-#include <sys/wait.h> // waitpid
+#include <sys/wait.h>// waitpid
+#include <unistd.h>  // fork/exec
 void processSpawn(const char* self) {
     pid_t pid = fork();
     if (pid == -1) {
         REPORT("ERROR: fork failed.\n");
-    } else if (pid == 0) { // child
+    } else if (pid == 0) {// child
         execl(self, self, "1", nullptr);
         REPORT("ERROR: exec never returns\n");
         exit(1);
-    } else { // parent
+    } else {// parent
         int status;
         waitpid(pid, &status, 0);
     }
@@ -90,34 +81,30 @@ void processSpawn(const char* /*self*/) {
 #endif
 
 #if _MSC_VER && !__INTEL_COMPILER
-#pragma warning (push)
-#pragma warning (disable: 4702)  /* Unreachable code */
+#pragma warning(push)
+#pragma warning(disable : 4702) /* Unreachable code */
 #endif
 
 //! \brief \ref error_guessing
 TEST_CASE("testing shutdown hang") {
     hangOnExitReproducer();
-    CHECK(true); // just to notify that test has assertions
+    CHECK(true);// just to notify that test has assertions
 }
 
-DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(4007) // 'function' : must be 'attribute' - see issue #182
+DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(4007)// 'function' : must be 'attribute' - see issue #182
 DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(4447)
 int main(int argc, char* argv[]) {
     // Executed from child processes
-    if (argc == 2 && strcmp(argv[1],"1") == 0) {
-        return doctest::Context(argc, argv).run();
-    }
+    if (argc == 2 && strcmp(argv[1], "1") == 0) { return doctest::Context(argc, argv).run(); }
 
     // The number of executions is a tradeoff
     // between execution time and NBTS statistics
     const int EXEC_TIMES = 100;
     const char* self = argv[0];
-    for (int i = 0; i < EXEC_TIMES; i++) {
-        processSpawn(self);
-    }
+    for (int i = 0; i < EXEC_TIMES; i++) { processSpawn(self); }
 
 #if _MSC_VER && !__INTEL_COMPILER
-#pragma warning (pop)
+#pragma warning(pop)
 #endif
 }
 DOCTEST_MSVC_SUPPRESS_WARNING_POP
diff --git a/external/tbb/test/tbbmalloc/test_malloc_used_by_lib.cpp b/external/tbb/test/tbbmalloc/test_malloc_used_by_lib.cpp
index dccddd7e..32074bda 100644
--- a/external/tbb/test/tbbmalloc/test_malloc_used_by_lib.cpp
+++ b/external/tbb/test/tbbmalloc/test_malloc_used_by_lib.cpp
@@ -18,63 +18,57 @@
 
 #if _USRDLL
 
-#include <stdlib.h>
 #include "common/config.h"
 #include "common/utils_assert.h"
 #include "tbb/scalable_allocator.h"
+#include <stdlib.h>
 
 extern "C" {
-#if _WIN32||_WIN64
-    extern __declspec(dllexport) void callDll();
+#if _WIN32 || _WIN64
+extern __declspec(dllexport) void callDll();
 #else
-    extern __TBB_EXPORT void callDll();
+extern __TBB_EXPORT void callDll();
 #endif
 }
 
-extern "C" void callDll()
-{
+extern "C" void callDll() {
     static const int NUM = 20;
     void *ptrs[NUM];
 
-    for (int i=0; i<NUM; i++) {
-        ptrs[i] = scalable_malloc(i*1024);
+    for (int i = 0; i < NUM; i++) {
+        ptrs[i] = scalable_malloc(i * 1024);
         ASSERT(ptrs[i], nullptr);
     }
-    for (int i=0; i<NUM; i++)
-        scalable_free(ptrs[i]);
+    for (int i = 0; i < NUM; i++) scalable_free(ptrs[i]);
 }
 
 int main() {}
 
-
-#else // _USRDLL
+#else// _USRDLL
 #include "common/config.h"
 // FIXME: fix the test to support Windows* 8 Store Apps mode.
 // For sanitizers, it fails because RUNPATH is lost: https://github.com/google/sanitizers/issues/1219
-#if !__TBB_WIN8UI_SUPPORT && !(__GNUC__ && __GNUC__ < 10 && __TBB_USE_SANITIZERS) && __TBB_DYNAMIC_LOAD_ENABLED
+#if !__TBB_WIN8UI_SUPPORT && !(__GNUC__ && __GNUC__ < 10 && __TBB_USE_SANITIZERS)                            \
+        && __TBB_DYNAMIC_LOAD_ENABLED
 
 #define __TBB_NO_IMPLICIT_LINKAGE 1
+#include "common/memory_usage.h"
+#include "common/spin_barrier.h"
 #include "common/test.h"
 #include "common/utils.h"
 #include "common/utils_dynamic_libs.h"
 #include "common/utils_report.h"
-#include "common/memory_usage.h"
-#include "common/spin_barrier.h"
-
 
 class UseDll {
     utils::FunctionAddress run;
+
 public:
-    UseDll(utils::FunctionAddress runPtr) : run(runPtr) { }
-    void operator()( std::size_t /*id*/ ) const {
-        (*run)();
-    }
+    UseDll(utils::FunctionAddress runPtr) : run(runPtr) {}
+    void operator()(std::size_t /*id*/) const { (*run)(); }
 };
 
-void LoadThreadsUnload()
-{
-    utils::LIBRARY_HANDLE lib =
-        utils::OpenLibrary(TEST_LIBRARY_NAME("_test_malloc_used_by_lib"));
+void LoadThreadsUnload() {
+    utils::LIBRARY_HANDLE lib = utils::OpenLibrary(TEST_LIBRARY_NAME("_test_malloc_used_by_lib"));
     ASSERT(lib, "Can't load " TEST_LIBRARY_NAME("_test_malloc_used_by_lib"));
     utils::NativeParallelFor(std::size_t(4), UseDll(utils::GetAddress(lib, "callDll")));
     utils::CloseLibrary(lib);
@@ -83,9 +77,7 @@ void LoadThreadsUnload()
 struct UnloadCallback {
     utils::LIBRARY_HANDLE lib;
 
-    void operator() () const {
-        utils::CloseLibrary(lib);
-    }
+    void operator()() const { utils::CloseLibrary(lib); }
 };
 
 struct RunWithLoad {
@@ -95,8 +87,7 @@ struct RunWithLoad {
 
     void operator()(std::size_t id) const {
         if (!id) {
-            utils::LIBRARY_HANDLE lib =
-                utils::OpenLibrary(TEST_LIBRARY_NAME("_test_malloc_used_by_lib"));
+            utils::LIBRARY_HANDLE lib = utils::OpenLibrary(TEST_LIBRARY_NAME("_test_malloc_used_by_lib"));
             ASSERT(lib, "Can't load " TEST_LIBRARY_NAME("_test_malloc_used_by_lib"));
             runPtr = utils::GetAddress(lib, "callDll");
             unloadCallback.lib = lib;
@@ -107,7 +98,7 @@ struct RunWithLoad {
     }
 };
 
-utils::SpinBarrier RunWithLoad::startBarr{}, RunWithLoad::endBarr{};
+utils::SpinBarrier RunWithLoad::startBarr {}, RunWithLoad::endBarr {};
 UnloadCallback RunWithLoad::unloadCallback;
 utils::FunctionAddress RunWithLoad::runPtr;
 
@@ -116,7 +107,7 @@ void ThreadsLoadUnload() {
 
     RunWithLoad::startBarr.initialize(threads);
     RunWithLoad::endBarr.initialize(threads);
-    RunWithLoad body{};
+    RunWithLoad body {};
     utils::NativeParallelFor(threads, body);
 }
 
@@ -138,12 +129,12 @@ TEST_CASE("use test as lib") {
                 ThreadsLoadUnload();
             }
             memory_leak = utils::GetMemoryUsage() - memory_in_use;
-            if (memory_leak == 0)  // possibly too strong?
+            if (memory_leak == 0)// possibly too strong?
                 break;
         }
-        if(i==ITERS) {
+        if (i == ITERS) {
             // not stabilized, could be leak
-            REPORT( "Error: memory leak of up to %ld bytes\n", static_cast<long>(memory_leak));
+            REPORT("Error: memory leak of up to %ld bytes\n", static_cast<long>(memory_leak));
             WARN(false);
         }
     }
diff --git a/external/tbb/test/tbbmalloc/test_malloc_whitebox.cpp b/external/tbb/test/tbbmalloc/test_malloc_whitebox.cpp
index 9de151e0..16e304e7 100644
--- a/external/tbb/test/tbbmalloc/test_malloc_whitebox.cpp
+++ b/external/tbb/test/tbbmalloc/test_malloc_whitebox.cpp
@@ -36,23 +36,24 @@
 
 #include "common/test.h"
 
+#include "common/spin_barrier.h"
 #include "common/utils.h"
 #include "common/utils_assert.h"
 #include "common/utils_env.h"
-#include "common/spin_barrier.h"
 
 #include "oneapi/tbb/detail/_machine.h"
 
-#define __TBB_MALLOC_WHITEBOX_TEST 1 // to get access to allocator internals
+#define __TBB_MALLOC_WHITEBOX_TEST 1// to get access to allocator internals
 // help trigger rare race condition
-#define WhiteboxTestingYield() (tbb::detail::yield(), tbb::detail::yield(), tbb::detail::yield(), tbb::detail::yield())
+#define WhiteboxTestingYield()                                                                               \
+    (tbb::detail::yield(), tbb::detail::yield(), tbb::detail::yield(), tbb::detail::yield())
 
 #if __INTEL_COMPILER && __TBB_MIC_OFFLOAD
 // 2571 is variable has not been declared with compatible "target" attribute
 // 3218 is class/struct may fail when offloaded because this field is misaligned
 //         or contains data that is misaligned
-    #pragma warning(push)
-    #pragma warning(disable:2571 3218)
+#pragma warning(push)
+#pragma warning(disable : 2571 3218)
 #endif
 #define protected public
 #define private public
@@ -60,15 +61,15 @@
 #undef protected
 #undef private
 #if __INTEL_COMPILER && __TBB_MIC_OFFLOAD
-    #pragma warning(pop)
+#pragma warning(pop)
 #endif
 #include "../../src/tbbmalloc/backend.cpp"
 #include "../../src/tbbmalloc/backref.cpp"
 
 namespace tbbmalloc_whitebox {
-    std::atomic<size_t> locGetProcessed{};
-    std::atomic<size_t> locPutProcessed{};
-}
+    std::atomic<size_t> locGetProcessed {};
+    std::atomic<size_t> locPutProcessed {};
+}// namespace tbbmalloc_whitebox
 #include "../../src/tbbmalloc/large_objects.cpp"
 #include "../../src/tbbmalloc/tbbmalloc.cpp"
 
@@ -80,64 +81,60 @@ class AllocInfo {
     int *p;
     int val;
     int size;
+
 public:
     AllocInfo() : p(nullptr), val(0), size(0) {}
-    explicit AllocInfo(int sz) : p((int*)scalable_malloc(sz*sizeof(int))),
-                                   val(rand()), size(sz) {
+    explicit AllocInfo(int sz) : p((int *) scalable_malloc(sz * sizeof(int))), val(rand()), size(sz) {
         REQUIRE(p);
-        for (int k=0; k<size; k++)
-            p[k] = val;
+        for (int k = 0; k < size; k++) p[k] = val;
     }
     void check() const {
-        for (int k=0; k<size; k++)
-            ASSERT(p[k] == val, nullptr);
-    }
-    void clear() {
-        scalable_free(p);
+        for (int k = 0; k < size; k++) ASSERT(p[k] == val, nullptr);
     }
+    void clear() { scalable_free(p); }
 };
 
 // Test struct to call ProcessShutdown after all tests
 struct ShutdownTest {
     ~ShutdownTest() {
-    #if _WIN32 || _WIN64
+#if _WIN32 || _WIN64
         __TBB_mallocProcessShutdownNotification(true);
-    #else
+#else
         __TBB_mallocProcessShutdownNotification(false);
-    #endif
+#endif
     }
 };
 
 static ShutdownTest shutdownTest;
 
-class SimpleBarrier: utils::NoAssign {
+class SimpleBarrier : utils::NoAssign {
 protected:
     static utils::SpinBarrier barrier;
+
 public:
     static void initBarrier(unsigned thrds) { barrier.initialize(thrds); }
 };
 
 utils::SpinBarrier SimpleBarrier::barrier;
 
-class TestLargeObjCache: public SimpleBarrier {
+class TestLargeObjCache : public SimpleBarrier {
 public:
     static int largeMemSizes[LARGE_MEM_SIZES_NUM];
 
-    TestLargeObjCache( ) {}
+    TestLargeObjCache() {}
 
-    void operator()( int /*mynum*/ ) const {
+    void operator()(int /*mynum*/) const {
         AllocInfo allocs[LARGE_MEM_SIZES_NUM];
 
         // push to maximal cache limit
-        for (int i=0; i<2; i++) {
-            const int sizes[] = { MByte/sizeof(int),
-                                  (MByte-2*LargeObjectCache::LargeBSProps::CacheStep)/sizeof(int) };
-            for (int q=0; q<2; q++) {
+        for (int i = 0; i < 2; i++) {
+            const int sizes[] = {MByte / sizeof(int),
+                                 (MByte - 2 * LargeObjectCache::LargeBSProps::CacheStep) / sizeof(int)};
+            for (int q = 0; q < 2; q++) {
                 size_t curr = 0;
-                for (int j=0; j<LARGE_MEM_SIZES_NUM; j++, curr++)
-                    new (allocs+curr) AllocInfo(sizes[q]);
+                for (int j = 0; j < LARGE_MEM_SIZES_NUM; j++, curr++) new (allocs + curr) AllocInfo(sizes[q]);
 
-                for (size_t j=0; j<curr; j++) {
+                for (size_t j = 0; j < curr; j++) {
                     allocs[j].check();
                     allocs[j].clear();
                 }
@@ -147,17 +144,16 @@ class TestLargeObjCache: public SimpleBarrier {
         barrier.wait();
 
         // check caching correctness
-        for (int i=0; i<1000; i++) {
+        for (int i = 0; i < 1000; i++) {
             size_t curr = 0;
-            for (int j=0; j<LARGE_MEM_SIZES_NUM-1; j++, curr++)
-                new (allocs+curr) AllocInfo(largeMemSizes[j]);
+            for (int j = 0; j < LARGE_MEM_SIZES_NUM - 1; j++, curr++)
+                new (allocs + curr) AllocInfo(largeMemSizes[j]);
 
-            new (allocs+curr)
-                AllocInfo((int)(4*minLargeObjectSize +
-                                2*minLargeObjectSize*(1.*rand()/RAND_MAX)));
+            new (allocs + curr) AllocInfo(
+                    (int) (4 * minLargeObjectSize + 2 * minLargeObjectSize * (1. * rand() / RAND_MAX)));
             curr++;
 
-            for (size_t j=0; j<curr; j++) {
+            for (size_t j = 0; j < curr; j++) {
                 allocs[j].check();
                 allocs[j].clear();
             }
@@ -167,26 +163,26 @@ class TestLargeObjCache: public SimpleBarrier {
 
 int TestLargeObjCache::largeMemSizes[LARGE_MEM_SIZES_NUM];
 
-void TestLargeObjectCache()
-{
-    for (int i=0; i<LARGE_MEM_SIZES_NUM; i++)
-        TestLargeObjCache::largeMemSizes[i] =
-            (int)(minLargeObjectSize + 2*minLargeObjectSize*(1.*rand()/RAND_MAX));
+void TestLargeObjectCache() {
+    for (int i = 0; i < LARGE_MEM_SIZES_NUM; i++)
+        TestLargeObjCache::largeMemSizes[i]
+                = (int) (minLargeObjectSize + 2 * minLargeObjectSize * (1. * rand() / RAND_MAX));
 
-    for( int p=MaxThread; p>=MinThread; --p ) {
-        TestLargeObjCache::initBarrier( p );
-        utils::NativeParallelFor( p, TestLargeObjCache() );
+    for (int p = MaxThread; p >= MinThread; --p) {
+        TestLargeObjCache::initBarrier(p);
+        utils::NativeParallelFor(p, TestLargeObjCache());
     }
 }
 
 #if MALLOC_CHECK_RECURSION
 
-class TestStartupAlloc: public SimpleBarrier {
+class TestStartupAlloc : public SimpleBarrier {
     struct TestBlock {
         void *ptr;
         size_t sz;
     };
     static const int ITERS = 100;
+
 public:
     TestStartupAlloc() {}
     void operator()(int) const {
@@ -194,30 +190,28 @@ class TestStartupAlloc: public SimpleBarrier {
 
         barrier.wait();
 
-        for (int i=0; i<ITERS; i++) {
+        for (int i = 0; i < ITERS; i++) {
             blocks1[i].sz = rand() % minLargeObjectSize;
             blocks1[i].ptr = StartupBlock::allocate(blocks1[i].sz);
-            REQUIRE((blocks1[i].ptr && StartupBlock::msize(blocks1[i].ptr)>=blocks1[i].sz
-                   && 0==(uintptr_t)blocks1[i].ptr % sizeof(void*)));
+            REQUIRE((blocks1[i].ptr && StartupBlock::msize(blocks1[i].ptr) >= blocks1[i].sz
+                     && 0 == (uintptr_t) blocks1[i].ptr % sizeof(void *)));
             memset(blocks1[i].ptr, i, blocks1[i].sz);
         }
-        for (int i=0; i<ITERS; i++) {
+        for (int i = 0; i < ITERS; i++) {
             blocks2[i].sz = rand() % minLargeObjectSize;
             blocks2[i].ptr = StartupBlock::allocate(blocks2[i].sz);
-            REQUIRE((blocks2[i].ptr && StartupBlock::msize(blocks2[i].ptr)>=blocks2[i].sz
-                   && 0==(uintptr_t)blocks2[i].ptr % sizeof(void*)));
+            REQUIRE((blocks2[i].ptr && StartupBlock::msize(blocks2[i].ptr) >= blocks2[i].sz
+                     && 0 == (uintptr_t) blocks2[i].ptr % sizeof(void *)));
             memset(blocks2[i].ptr, i, blocks2[i].sz);
 
-            for (size_t j=0; j<blocks1[i].sz; j++)
-                REQUIRE(*((char*)blocks1[i].ptr+j) == i);
-            Block *block = (Block *)alignDown(blocks1[i].ptr, slabSize);
-            ((StartupBlock *)block)->free(blocks1[i].ptr);
+            for (size_t j = 0; j < blocks1[i].sz; j++) REQUIRE(*((char *) blocks1[i].ptr + j) == i);
+            Block *block = (Block *) alignDown(blocks1[i].ptr, slabSize);
+            ((StartupBlock *) block)->free(blocks1[i].ptr);
         }
-        for (int i=ITERS-1; i>=0; i--) {
-            for (size_t j=0; j<blocks2[i].sz; j++)
-                REQUIRE(*((char*)blocks2[i].ptr+j) == i);
-            Block *block = (Block *)alignDown(blocks2[i].ptr, slabSize);
-            ((StartupBlock *)block)->free(blocks2[i].ptr);
+        for (int i = ITERS - 1; i >= 0; i--) {
+            for (size_t j = 0; j < blocks2[i].sz; j++) REQUIRE(*((char *) blocks2[i].ptr + j) == i);
+            Block *block = (Block *) alignDown(blocks2[i].ptr, slabSize);
+            ((StartupBlock *) block)->free(blocks2[i].ptr);
         }
     }
 };
@@ -226,13 +220,14 @@ class TestStartupAlloc: public SimpleBarrier {
 
 #include <deque>
 
-template<int ITERS>
-class BackRefWork: utils::NoAssign {
+template <int ITERS>
+class BackRefWork : utils::NoAssign {
     struct TestBlock {
         BackRefIdx idx;
-        char       data;
+        char data;
         TestBlock(BackRefIdx idx_) : idx(idx_) {}
     };
+
 public:
     BackRefWork() {}
     void operator()(int) const {
@@ -241,59 +236,57 @@ class BackRefWork: utils::NoAssign {
         std::deque<TestBlock> blocks;
 
         // for ITERS==0 consume all available backrefs
-        for (cnt=0; !ITERS || cnt<ITERS; cnt++) {
+        for (cnt = 0; !ITERS || cnt < ITERS; cnt++) {
             BackRefIdx idx = BackRefIdx::newBackRef(/*largeObj=*/false);
-            if (idx.isInvalid())
-                break;
+            if (idx.isInvalid()) break;
             blocks.push_back(TestBlock(idx));
             setBackRef(blocks.back().idx, &blocks.back().data);
         }
-        for (size_t i=0; i<cnt; i++)
-            REQUIRE((Block*)&blocks[i].data == getBackRef(blocks[i].idx));
-        for (size_t i=cnt; i>0; i--)
-            removeBackRef(blocks[i-1].idx);
+        for (size_t i = 0; i < cnt; i++) REQUIRE((Block *) &blocks[i].data == getBackRef(blocks[i].idx));
+        for (size_t i = cnt; i > 0; i--) removeBackRef(blocks[i - 1].idx);
     }
 };
 
-class LocalCachesHit: utils::NoAssign {
+class LocalCachesHit : utils::NoAssign {
     // set ITERS to trigger possible leak of backreferences
     // during cleanup on cache overflow and on thread termination
-    static const int ITERS = 2*(FreeBlockPool::POOL_HIGH_MARK +
-                                LocalLOC::LOC_HIGH_MARK);
+    static const int ITERS = 2 * (FreeBlockPool::POOL_HIGH_MARK + LocalLOC::LOC_HIGH_MARK);
+
 public:
     LocalCachesHit() {}
     void operator()(int) const {
         void *objsSmall[ITERS], *objsLarge[ITERS];
 
-        for (int i=0; i<ITERS; i++) {
-            objsSmall[i] = scalable_malloc(minLargeObjectSize-1);
+        for (int i = 0; i < ITERS; i++) {
+            objsSmall[i] = scalable_malloc(minLargeObjectSize - 1);
             objsLarge[i] = scalable_malloc(minLargeObjectSize);
         }
-        for (int i=0; i<ITERS; i++) {
+        for (int i = 0; i < ITERS; i++) {
             scalable_free(objsSmall[i]);
             scalable_free(objsLarge[i]);
         }
     }
 };
 
-static size_t allocatedBackRefCount()
-{
+static size_t allocatedBackRefCount() {
     size_t cnt = 0;
-    for (int i=0; i<=backRefMain.load(std::memory_order_relaxed)->lastUsed.load(std::memory_order_relaxed); i++)
+    for (int i = 0;
+         i <= backRefMain.load(std::memory_order_relaxed)->lastUsed.load(std::memory_order_relaxed); i++)
         cnt += backRefMain.load(std::memory_order_relaxed)->backRefBl[i]->allocatedCount;
     return cnt;
 }
 
-class TestInvalidBackrefs: public SimpleBarrier {
+class TestInvalidBackrefs : public SimpleBarrier {
 #if __ANDROID__
     // Android requires lower iters due to lack of virtual memory.
-    static const int BACKREF_GROWTH_ITERS = 50*1024;
+    static const int BACKREF_GROWTH_ITERS = 50 * 1024;
 #else
-    static const int BACKREF_GROWTH_ITERS = 200*1024;
+    static const int BACKREF_GROWTH_ITERS = 200 * 1024;
 #endif
 
     static std::atomic<bool> backrefGrowthDone;
     static void *ptrs[BACKREF_GROWTH_ITERS];
+
 public:
     TestInvalidBackrefs() {}
     void operator()(int id) const {
@@ -302,16 +295,13 @@ class TestInvalidBackrefs: public SimpleBarrier {
             backrefGrowthDone = false;
             barrier.wait();
 
-            for (int i=0; i<BACKREF_GROWTH_ITERS; i++)
-                ptrs[i] = scalable_malloc(minLargeObjectSize);
+            for (int i = 0; i < BACKREF_GROWTH_ITERS; i++) ptrs[i] = scalable_malloc(minLargeObjectSize);
             backrefGrowthDone = true;
-            for (int i=0; i<BACKREF_GROWTH_ITERS; i++)
-                scalable_free(ptrs[i]);
+            for (int i = 0; i < BACKREF_GROWTH_ITERS; i++) scalable_free(ptrs[i]);
         } else {
-            void *p2 = scalable_malloc(minLargeObjectSize-1);
-            char *p1 = (char*)scalable_malloc(minLargeObjectSize-1);
-            LargeObjectHdr *hdr =
-                (LargeObjectHdr*)(p1+minLargeObjectSize-1 - sizeof(LargeObjectHdr));
+            void *p2 = scalable_malloc(minLargeObjectSize - 1);
+            char *p1 = (char *) scalable_malloc(minLargeObjectSize - 1);
+            LargeObjectHdr *hdr = (LargeObjectHdr *) (p1 + minLargeObjectSize - 1 - sizeof(LargeObjectHdr));
             hdr->backRefIdx.main = 7;
             hdr->backRefIdx.largeObj = 1;
             hdr->backRefIdx.offset = 2000;
@@ -321,7 +311,7 @@ class TestInvalidBackrefs: public SimpleBarrier {
             int yield_count = 0;
             while (!backrefGrowthDone) {
                 scalable_free(p2);
-                p2 = scalable_malloc(minLargeObjectSize-1);
+                p2 = scalable_malloc(minLargeObjectSize - 1);
                 if (yield_count++ == 100) {
                     yield_count = 0;
                     std::this_thread::yield();
@@ -340,24 +330,27 @@ void TestBackRef() {
     size_t beforeNumBackRef, afterNumBackRef;
 
     beforeNumBackRef = allocatedBackRefCount();
-    for( int p=MaxThread; p>=MinThread; --p )
-        utils::NativeParallelFor( p, BackRefWork<2*BR_MAX_CNT+2>() );
+    for (int p = MaxThread; p >= MinThread; --p)
+        utils::NativeParallelFor(p, BackRefWork<2 * BR_MAX_CNT + 2>());
     afterNumBackRef = allocatedBackRefCount();
-    REQUIRE_MESSAGE(beforeNumBackRef==afterNumBackRef, "backreference leak detected");
+    REQUIRE_MESSAGE(beforeNumBackRef == afterNumBackRef, "backreference leak detected");
     // lastUsed marks peak resource consumption. As we allocate below the mark,
     // it must not move up, otherwise there is a resource leak.
     int sustLastUsed = backRefMain.load(std::memory_order_relaxed)->lastUsed.load(std::memory_order_relaxed);
-    utils::NativeParallelFor( 1, BackRefWork<2*BR_MAX_CNT+2>() );
-    REQUIRE_MESSAGE(sustLastUsed == backRefMain.load(std::memory_order_relaxed)->lastUsed.load(std::memory_order_relaxed), "backreference leak detected");
+    utils::NativeParallelFor(1, BackRefWork<2 * BR_MAX_CNT + 2>());
+    REQUIRE_MESSAGE(
+            sustLastUsed
+                    == backRefMain.load(std::memory_order_relaxed)->lastUsed.load(std::memory_order_relaxed),
+            "backreference leak detected");
     // check leak of back references while per-thread caches are in use
     // warm up needed to cover bootStrapMalloc call
-    utils::NativeParallelFor( 1, LocalCachesHit() );
+    utils::NativeParallelFor(1, LocalCachesHit());
     beforeNumBackRef = allocatedBackRefCount();
-    utils::NativeParallelFor( 2, LocalCachesHit() );
+    utils::NativeParallelFor(2, LocalCachesHit());
     int res = scalable_allocation_command(TBBMALLOC_CLEAN_ALL_BUFFERS, nullptr);
     REQUIRE(res == TBBMALLOC_OK);
     afterNumBackRef = allocatedBackRefCount();
-    REQUIRE_MESSAGE(beforeNumBackRef>=afterNumBackRef, "backreference leak detected");
+    REQUIRE_MESSAGE(beforeNumBackRef >= afterNumBackRef, "backreference leak detected");
 
     // This is a regression test against race condition between backreference
     // extension and checking invalid BackRefIdx.
@@ -365,21 +358,18 @@ void TestBackRef() {
     // large objects, so there is a chance to prepend small object with
     // seems valid BackRefIdx for large objects, and thus trigger the bug.
     TestInvalidBackrefs::initBarrier(MaxThread);
-    utils::NativeParallelFor( MaxThread, TestInvalidBackrefs() );
+    utils::NativeParallelFor(MaxThread, TestInvalidBackrefs());
     // Consume all available backrefs and check they work correctly.
     // For now test 32-bit machines only, because for 64-bit memory consumption is too high.
-    if (sizeof(uintptr_t) == 4)
-        utils::NativeParallelFor( MaxThread, BackRefWork<0>() );
+    if (sizeof(uintptr_t) == 4) utils::NativeParallelFor(MaxThread, BackRefWork<0>());
 }
 
-void *getMem(intptr_t /*pool_id*/, size_t &bytes)
-{
-    const size_t BUF_SIZE = 8*1024*1024;
+void *getMem(intptr_t /*pool_id*/, size_t &bytes) {
+    const size_t BUF_SIZE = 8 * 1024 * 1024;
     static char space[BUF_SIZE];
     static size_t pos;
 
-    if (pos + bytes > BUF_SIZE)
-        return nullptr;
+    if (pos + bytes > BUF_SIZE) return nullptr;
 
     void *ret = space + pos;
     pos += bytes;
@@ -387,44 +377,40 @@ void *getMem(intptr_t /*pool_id*/, size_t &bytes)
     return ret;
 }
 
-int putMem(intptr_t /*pool_id*/, void* /*raw_ptr*/, size_t /*raw_bytes*/)
-{
-    return 0;
-}
+int putMem(intptr_t /*pool_id*/, void * /*raw_ptr*/, size_t /*raw_bytes*/) { return 0; }
 
 struct MallocPoolHeader {
-    void  *rawPtr;
+    void *rawPtr;
     size_t userSize;
 };
 
-void *getMallocMem(intptr_t /*pool_id*/, size_t &bytes)
-{
-    void *rawPtr = malloc(bytes+sizeof(MallocPoolHeader));
-    void *ret = (void *)((uintptr_t)rawPtr+sizeof(MallocPoolHeader));
+void *getMallocMem(intptr_t /*pool_id*/, size_t &bytes) {
+    void *rawPtr = malloc(bytes + sizeof(MallocPoolHeader));
+    void *ret = (void *) ((uintptr_t) rawPtr + sizeof(MallocPoolHeader));
 
-    MallocPoolHeader *hdr = (MallocPoolHeader*)ret-1;
+    MallocPoolHeader *hdr = (MallocPoolHeader *) ret - 1;
     hdr->rawPtr = rawPtr;
     hdr->userSize = bytes;
 
     return ret;
 }
 
-int putMallocMem(intptr_t /*pool_id*/, void *ptr, size_t bytes)
-{
-    MallocPoolHeader *hdr = (MallocPoolHeader*)ptr-1;
+int putMallocMem(intptr_t /*pool_id*/, void *ptr, size_t bytes) {
+    MallocPoolHeader *hdr = (MallocPoolHeader *) ptr - 1;
     ASSERT(bytes == hdr->userSize, "Invalid size in pool callback.");
     free(hdr->rawPtr);
 
     return 0;
 }
 
-class StressLOCacheWork: utils::NoAssign {
+class StressLOCacheWork : utils::NoAssign {
     rml::MemoryPool *my_mallocPool;
+
 public:
     StressLOCacheWork(rml::MemoryPool *mallocPool) : my_mallocPool(mallocPool) {}
     void operator()(int) const {
-        for (size_t sz=minLargeObjectSize; sz<1*1024*1024;
-             sz+=LargeObjectCache::LargeBSProps::CacheStep) {
+        for (size_t sz = minLargeObjectSize; sz < 1 * 1024 * 1024;
+             sz += LargeObjectCache::LargeBSProps::CacheStep) {
             void *ptr = pool_malloc(my_mallocPool, sz);
             REQUIRE_MESSAGE(ptr, "Memory was not allocated");
             memset(ptr, sz, sz);
@@ -455,7 +441,7 @@ void TestPools() {
     rml::MemoryPool *mallocPool;
 
     pool_create_v1(0, &pol, &mallocPool);
-/* check that large object cache (LOC) returns correct size for cached objects
+    /* check that large object cache (LOC) returns correct size for cached objects
    passBackendSz Byte objects are cached in LOC, but bypassed the backend, so
    memory requested directly from allocation callback.
    nextPassBackendSz Byte objects must fit to another LOC bin,
@@ -464,22 +450,21 @@ void TestPools() {
    from LOC during LOC cleanup, and putMallocMem checks that returned size
    is correct.
 */
-    const size_t passBackendSz = Backend::maxBinned_HugePage+1,
-        anotherLOCBinSz = minLargeObjectSize+1;
-    for (int i=0; i<10; i++) { // run long enough to be cached
+    const size_t passBackendSz = Backend::maxBinned_HugePage + 1, anotherLOCBinSz = minLargeObjectSize + 1;
+    for (int i = 0; i < 10; i++) {// run long enough to be cached
         void *p = pool_malloc(mallocPool, passBackendSz);
         REQUIRE_MESSAGE(p, "Memory was not allocated");
         pool_free(mallocPool, p);
     }
     // run long enough to passBackendSz allocation was cleaned from cache
     // and returned back to putMallocMem for size checking
-    for (int i=0; i<1000; i++) {
+    for (int i = 0; i < 1000; i++) {
         void *p = pool_malloc(mallocPool, anotherLOCBinSz);
         REQUIRE_MESSAGE(p, "Memory was not allocated");
         pool_free(mallocPool, p);
     }
 
-    void *smallObj =  pool_malloc(fixedPool, 10);
+    void *smallObj = pool_malloc(fixedPool, 10);
     REQUIRE_MESSAGE(smallObj, "Memory was not allocated");
     memset(smallObj, 1, 10);
     void *ptr = pool_malloc(fixedPool, 1024);
@@ -491,46 +476,44 @@ void TestPools() {
     ptr = pool_malloc(fixedPool, minLargeObjectSize);
     REQUIRE_MESSAGE(ptr, "Memory was not allocated");
     memset(ptr, minLargeObjectSize, minLargeObjectSize);
-    pool_malloc(fixedPool, 10*minLargeObjectSize); // no leak for unsuccessful allocations
+    pool_malloc(fixedPool, 10 * minLargeObjectSize);// no leak for unsuccessful allocations
     pool_free(fixedPool, smallObj);
     pool_free(fixedPool, largeObj);
 
     // provoke large object cache cleanup and hope no leaks occurs
-    for( int p=MaxThread; p>=MinThread; --p )
-        utils::NativeParallelFor( p, StressLOCacheWork(mallocPool) );
+    for (int p = MaxThread; p >= MinThread; --p) utils::NativeParallelFor(p, StressLOCacheWork(mallocPool));
     pool_destroy(mallocPool);
     pool_destroy(fixedPool);
 
     scalable_allocation_command(TBBMALLOC_CLEAN_ALL_BUFFERS, nullptr);
     afterNumBackRef = allocatedBackRefCount();
-    REQUIRE_MESSAGE(beforeNumBackRef==afterNumBackRef, "backreference leak detected");
+    REQUIRE_MESSAGE(beforeNumBackRef == afterNumBackRef, "backreference leak detected");
 
     {
         // test usedSize/cachedSize and LOC bitmask correctness
         void *p[5];
         pool_create_v1(0, &pol, &mallocPool);
-        const LargeObjectCache *loc = &((rml::internal::MemoryPool*)mallocPool)->extMemPool.loc;
+        const LargeObjectCache *loc = &((rml::internal::MemoryPool *) mallocPool)->extMemPool.loc;
         const int LargeCacheStep = LargeObjectCache::LargeBSProps::CacheStep;
-        p[3] = pool_malloc(mallocPool, minLargeObjectSize+2*LargeCacheStep);
-        for (int i=0; i<10; i++) {
+        p[3] = pool_malloc(mallocPool, minLargeObjectSize + 2 * LargeCacheStep);
+        for (int i = 0; i < 10; i++) {
             p[0] = pool_malloc(mallocPool, minLargeObjectSize);
-            p[1] = pool_malloc(mallocPool, minLargeObjectSize+LargeCacheStep);
+            p[1] = pool_malloc(mallocPool, minLargeObjectSize + LargeCacheStep);
             pool_free(mallocPool, p[0]);
             pool_free(mallocPool, p[1]);
         }
         REQUIRE(loc->getUsedSize());
         pool_free(mallocPool, p[3]);
-        REQUIRE(loc->getLOCSize() < 3*(minLargeObjectSize+LargeCacheStep));
-        const size_t maxLocalLOCSize = LocalLOCImpl<3,30>::getMaxSize();
+        REQUIRE(loc->getLOCSize() < 3 * (minLargeObjectSize + LargeCacheStep));
+        const size_t maxLocalLOCSize = LocalLOCImpl<3, 30>::getMaxSize();
         REQUIRE(loc->getUsedSize() <= maxLocalLOCSize);
-        for (int i=0; i<3; i++)
-            p[i] = pool_malloc(mallocPool, minLargeObjectSize+i*LargeCacheStep);
+        for (int i = 0; i < 3; i++) p[i] = pool_malloc(mallocPool, minLargeObjectSize + i * LargeCacheStep);
         size_t currUser = loc->getUsedSize();
-        REQUIRE((!loc->getLOCSize() && currUser >= 3*(minLargeObjectSize+LargeCacheStep)));
-        p[4] = pool_malloc(mallocPool, minLargeObjectSize+3*LargeCacheStep);
-        REQUIRE(loc->getUsedSize() - currUser >= minLargeObjectSize+3*LargeCacheStep);
+        REQUIRE((!loc->getLOCSize() && currUser >= 3 * (minLargeObjectSize + LargeCacheStep)));
+        p[4] = pool_malloc(mallocPool, minLargeObjectSize + 3 * LargeCacheStep);
+        REQUIRE(loc->getUsedSize() - currUser >= minLargeObjectSize + 3 * LargeCacheStep);
         pool_free(mallocPool, p[4]);
-        REQUIRE(loc->getUsedSize() <= currUser+maxLocalLOCSize);
+        REQUIRE(loc->getUsedSize() <= currUser + maxLocalLOCSize);
         pool_reset(mallocPool);
         REQUIRE((!loc->getLOCSize() && !loc->getUsedSize()));
         pool_destroy(mallocPool);
@@ -540,16 +523,16 @@ void TestPools() {
     {
         LocalLOCImpl<2, 20> lLOC;
         pool_create_v1(0, &pol, &mallocPool);
-        rml::internal::ExtMemoryPool *mPool = &((rml::internal::MemoryPool*)mallocPool)->extMemPool;
-        const LargeObjectCache *loc = &((rml::internal::MemoryPool*)mallocPool)->extMemPool.loc;
+        rml::internal::ExtMemoryPool *mPool = &((rml::internal::MemoryPool *) mallocPool)->extMemPool;
+        const LargeObjectCache *loc = &((rml::internal::MemoryPool *) mallocPool)->extMemPool.loc;
         const int LargeCacheStep = LargeObjectCache::LargeBSProps::CacheStep;
-        for (int i=0; i<22; i++) {
-            void *o = pool_malloc(mallocPool, minLargeObjectSize+i*LargeCacheStep);
-            bool ret = lLOC.put(((LargeObjectHdr*)o - 1)->memoryBlock, mPool);
+        for (int i = 0; i < 22; i++) {
+            void *o = pool_malloc(mallocPool, minLargeObjectSize + i * LargeCacheStep);
+            bool ret = lLOC.put(((LargeObjectHdr *) o - 1)->memoryBlock, mPool);
             REQUIRE(ret);
 
-            o = pool_malloc(mallocPool, minLargeObjectSize+i*LargeCacheStep);
-            ret = lLOC.put(((LargeObjectHdr*)o - 1)->memoryBlock, mPool);
+            o = pool_malloc(mallocPool, minLargeObjectSize + i * LargeCacheStep);
+            ret = lLOC.put(((LargeObjectHdr *) o - 1)->memoryBlock, mPool);
             REQUIRE(ret);
         }
         lLOC.externalCleanup(mPool);
@@ -560,114 +543,114 @@ void TestPools() {
 }
 
 void TestObjectRecognition() {
-    size_t headersSize = sizeof(LargeMemoryBlock)+sizeof(LargeObjectHdr);
-    unsigned falseObjectSize = 113; // unsigned is the type expected by getObjectSize
+    size_t headersSize = sizeof(LargeMemoryBlock) + sizeof(LargeObjectHdr);
+    unsigned falseObjectSize = 113;// unsigned is the type expected by getObjectSize
     size_t obtainedSize;
 
-    REQUIRE_MESSAGE(sizeof(BackRefIdx)==sizeof(uintptr_t), "Unexpected size of BackRefIdx");
-    REQUIRE_MESSAGE(getObjectSize(falseObjectSize)!=falseObjectSize, "Error in test: bad choice for false object size");
+    REQUIRE_MESSAGE(sizeof(BackRefIdx) == sizeof(uintptr_t), "Unexpected size of BackRefIdx");
+    REQUIRE_MESSAGE(getObjectSize(falseObjectSize) != falseObjectSize,
+                    "Error in test: bad choice for false object size");
 
-    void* mem = scalable_malloc(2*slabSize);
+    void *mem = scalable_malloc(2 * slabSize);
     REQUIRE_MESSAGE(mem, "Memory was not allocated");
-    Block* falseBlock = (Block*)alignUp((uintptr_t)mem, slabSize);
+    Block *falseBlock = (Block *) alignUp((uintptr_t) mem, slabSize);
     falseBlock->objectSize = falseObjectSize;
-    char* falseSO = (char*)falseBlock + falseObjectSize*7;
-    REQUIRE_MESSAGE(alignDown(falseSO, slabSize)==(void*)falseBlock, "Error in test: false object offset is too big");
+    char *falseSO = (char *) falseBlock + falseObjectSize * 7;
+    REQUIRE_MESSAGE(alignDown(falseSO, slabSize) == (void *) falseBlock,
+                    "Error in test: false object offset is too big");
 
-    void* bufferLOH = scalable_malloc(2*slabSize + headersSize);
+    void *bufferLOH = scalable_malloc(2 * slabSize + headersSize);
     REQUIRE_MESSAGE(bufferLOH, "Memory was not allocated");
-    LargeObjectHdr* falseLO =
-        (LargeObjectHdr*)alignUp((uintptr_t)bufferLOH + headersSize, slabSize);
-    LargeObjectHdr* headerLO = (LargeObjectHdr*)falseLO-1;
-    headerLO->memoryBlock = (LargeMemoryBlock*)bufferLOH;
-    headerLO->memoryBlock->unalignedSize = 2*slabSize + headersSize;
+    LargeObjectHdr *falseLO = (LargeObjectHdr *) alignUp((uintptr_t) bufferLOH + headersSize, slabSize);
+    LargeObjectHdr *headerLO = (LargeObjectHdr *) falseLO - 1;
+    headerLO->memoryBlock = (LargeMemoryBlock *) bufferLOH;
+    headerLO->memoryBlock->unalignedSize = 2 * slabSize + headersSize;
     headerLO->memoryBlock->objectSize = slabSize + headersSize;
     headerLO->backRefIdx = BackRefIdx::newBackRef(/*largeObj=*/true);
     setBackRef(headerLO->backRefIdx, headerLO);
     REQUIRE_MESSAGE(scalable_msize(falseLO) == slabSize + headersSize,
-           "Error in test: LOH falsification failed");
+                    "Error in test: LOH falsification failed");
     removeBackRef(headerLO->backRefIdx);
 
-    const int NUM_OF_IDX = BR_MAX_CNT+2;
+    const int NUM_OF_IDX = BR_MAX_CNT + 2;
     BackRefIdx idxs[NUM_OF_IDX];
-    for (int cnt=0; cnt<2; cnt++) {
-        for (int main = -10; main<10; main++) {
-            falseBlock->backRefIdx.main = (uint16_t)main;
-            headerLO->backRefIdx.main = (uint16_t)main;
+    for (int cnt = 0; cnt < 2; cnt++) {
+        for (int main = -10; main < 10; main++) {
+            falseBlock->backRefIdx.main = (uint16_t) main;
+            headerLO->backRefIdx.main = (uint16_t) main;
 
-            for (int bl = -10; bl<BR_MAX_CNT+10; bl++) {
-                falseBlock->backRefIdx.offset = (uint16_t)bl;
-                headerLO->backRefIdx.offset = (uint16_t)bl;
+            for (int bl = -10; bl < BR_MAX_CNT + 10; bl++) {
+                falseBlock->backRefIdx.offset = (uint16_t) bl;
+                headerLO->backRefIdx.offset = (uint16_t) bl;
 
-                for (int largeObj = 0; largeObj<2; largeObj++) {
+                for (int largeObj = 0; largeObj < 2; largeObj++) {
                     falseBlock->backRefIdx.largeObj = largeObj;
                     headerLO->backRefIdx.largeObj = largeObj;
 
                     obtainedSize = __TBB_malloc_safer_msize(falseSO, nullptr);
-                    REQUIRE_MESSAGE(obtainedSize==0, "Incorrect pointer accepted");
+                    REQUIRE_MESSAGE(obtainedSize == 0, "Incorrect pointer accepted");
                     obtainedSize = __TBB_malloc_safer_msize(falseLO, nullptr);
-                    REQUIRE_MESSAGE(obtainedSize==0, "Incorrect pointer accepted");
+                    REQUIRE_MESSAGE(obtainedSize == 0, "Incorrect pointer accepted");
                 }
             }
         }
         if (cnt == 1) {
-            for (int i=0; i<NUM_OF_IDX; i++)
-                removeBackRef(idxs[i]);
+            for (int i = 0; i < NUM_OF_IDX; i++) removeBackRef(idxs[i]);
             break;
         }
-        for (int i=0; i<NUM_OF_IDX; i++) {
+        for (int i = 0; i < NUM_OF_IDX; i++) {
             idxs[i] = BackRefIdx::newBackRef(/*largeObj=*/false);
             setBackRef(idxs[i], nullptr);
         }
     }
-    char *smallPtr = (char*)scalable_malloc(falseObjectSize);
+    char *smallPtr = (char *) scalable_malloc(falseObjectSize);
     obtainedSize = __TBB_malloc_safer_msize(smallPtr, nullptr);
-    REQUIRE_MESSAGE(obtainedSize==getObjectSize(falseObjectSize), "Correct pointer not accepted?");
+    REQUIRE_MESSAGE(obtainedSize == getObjectSize(falseObjectSize), "Correct pointer not accepted?");
     scalable_free(smallPtr);
 
     obtainedSize = __TBB_malloc_safer_msize(mem, nullptr);
-    REQUIRE_MESSAGE(obtainedSize>=2*slabSize, "Correct pointer not accepted?");
+    REQUIRE_MESSAGE(obtainedSize >= 2 * slabSize, "Correct pointer not accepted?");
     scalable_free(mem);
     scalable_free(bufferLOH);
 }
 
-class TestBackendWork: public SimpleBarrier {
+class TestBackendWork : public SimpleBarrier {
     struct TestBlock {
-        intptr_t   data;
+        intptr_t data;
         BackRefIdx idx;
     };
     static const int ITERS = 20;
 
     rml::internal::Backend *backend;
+
 public:
     TestBackendWork(rml::internal::Backend *bknd) : backend(bknd) {}
     void operator()(int) const {
         barrier.wait();
 
-        for (int i=0; i<ITERS; i++) {
+        for (int i = 0; i < ITERS; i++) {
             BlockI *slabBlock = backend->getSlabBlock(1);
             REQUIRE_MESSAGE(slabBlock, "Memory was not allocated");
-            uintptr_t prevBlock = (uintptr_t)slabBlock;
+            uintptr_t prevBlock = (uintptr_t) slabBlock;
             backend->putSlabBlock(slabBlock);
 
-            LargeMemoryBlock *largeBlock = backend->getLargeBlock(16*1024);
+            LargeMemoryBlock *largeBlock = backend->getLargeBlock(16 * 1024);
             REQUIRE_MESSAGE(largeBlock, "Memory was not allocated");
-            REQUIRE_MESSAGE((uintptr_t)largeBlock != prevBlock,
-                    "Large block cannot be reused from slab memory, only in fixed_pool case.");
+            REQUIRE_MESSAGE((uintptr_t) largeBlock != prevBlock,
+                            "Large block cannot be reused from slab memory, only in fixed_pool case.");
             backend->putLargeBlock(largeBlock);
         }
     }
 };
 
-void TestBackend()
-{
+void TestBackend() {
     rml::MemPoolPolicy pol(getMallocMem, putMallocMem);
     rml::MemoryPool *mPool;
     pool_create_v1(0, &pol, &mPool);
-    rml::internal::ExtMemoryPool *ePool = &((rml::internal::MemoryPool*)mPool)->extMemPool;
+    rml::internal::ExtMemoryPool *ePool = &((rml::internal::MemoryPool *) mPool)->extMemPool;
     rml::internal::Backend *backend = &ePool->backend;
 
-    for( int p=MaxThread; p>=MinThread; --p ) {
+    for (int p = MaxThread; p >= MinThread; --p) {
         // regression test against an race condition in backend synchronization,
         // triggered only when WhiteboxTestingYield() call yields
 #if TBB_USE_DEBUG
@@ -677,7 +660,7 @@ void TestBackend()
 #endif
         for (int i = 0; i < num_iters; i++) {
             TestBackendWork::initBarrier(p);
-            utils::NativeParallelFor( p, TestBackendWork(backend) );
+            utils::NativeParallelFor(p, TestBackendWork(backend));
         }
     }
 
@@ -687,21 +670,21 @@ void TestBackend()
 
     // Checks if the backend increases and decreases the amount of allocated memory when memory is allocated.
     const size_t memSize0 = backend->getTotalMemSize();
-    LargeMemoryBlock *lmb = backend->getLargeBlock(4*MByte);
-    REQUIRE( lmb );
+    LargeMemoryBlock *lmb = backend->getLargeBlock(4 * MByte);
+    REQUIRE(lmb);
 
     const size_t memSize1 = backend->getTotalMemSize();
-    REQUIRE_MESSAGE( (intptr_t)(memSize1-memSize0) >= 4*MByte, "The backend has not increased the amount of using memory." );
+    REQUIRE_MESSAGE((intptr_t)(memSize1 - memSize0) >= 4 * MByte,
+                    "The backend has not increased the amount of using memory.");
 
     backend->putLargeBlock(lmb);
     const size_t memSize2 = backend->getTotalMemSize();
-    REQUIRE_MESSAGE( memSize2 == memSize0, "The backend has not decreased the amount of using memory." );
+    REQUIRE_MESSAGE(memSize2 == memSize0, "The backend has not decreased the amount of using memory.");
 
     pool_destroy(mPool);
 }
 
-void TestBitMask()
-{
+void TestBitMask() {
     BitMaskMin<256> mask;
 
     mask.reset();
@@ -726,31 +709,29 @@ void TestBitMask()
     REQUIRE(mask.getMinTrue(201) == -1);
 }
 
-size_t getMemSize()
-{
-    return defaultMemPool->extMemPool.backend.getTotalMemSize();
-}
+size_t getMemSize() { return defaultMemPool->extMemPool.backend.getTotalMemSize(); }
 
 class CheckNotCached {
     static size_t memSize;
+
 public:
-    void operator() () const {
+    void operator()() const {
         int res = scalable_allocation_mode(TBBMALLOC_SET_SOFT_HEAP_LIMIT, 1);
         REQUIRE(res == TBBMALLOC_OK);
-        if (memSize==(size_t)-1) {
+        if (memSize == (size_t) -1) {
             memSize = getMemSize();
         } else {
             REQUIRE(getMemSize() == memSize);
-            memSize=(size_t)-1;
+            memSize = (size_t) -1;
         }
     }
 };
 
-size_t CheckNotCached::memSize = (size_t)-1;
+size_t CheckNotCached::memSize = (size_t) -1;
 
-class RunTestHeapLimit: public SimpleBarrier {
+class RunTestHeapLimit : public SimpleBarrier {
 public:
-    void operator()( int /*mynum*/ ) const {
+    void operator()(int /*mynum*/) const {
         // Provoke bootstrap heap initialization before recording memory size.
         // NOTE: The initialization should be processed only with a "large"
         // object. Since the "small" object allocation lead to blocking of a
@@ -758,39 +739,37 @@ class RunTestHeapLimit: public SimpleBarrier {
         // foreign thread.
         scalable_free(scalable_malloc(minLargeObjectSize));
         barrier.wait(CheckNotCached());
-        for (size_t n = minLargeObjectSize; n < 5*1024*1024; n += 128*1024)
+        for (size_t n = minLargeObjectSize; n < 5 * 1024 * 1024; n += 128 * 1024)
             scalable_free(scalable_malloc(n));
         barrier.wait(CheckNotCached());
     }
 };
 
-void TestHeapLimit()
-{
-    if(!isMallocInitialized()) doInitialization();
+void TestHeapLimit() {
+    if (!isMallocInitialized()) doInitialization();
     // tiny limit to stop caching
     int res = scalable_allocation_mode(TBBMALLOC_SET_SOFT_HEAP_LIMIT, 1);
     REQUIRE(res == TBBMALLOC_OK);
-     // Provoke bootstrap heap initialization before recording memory size.
+    // Provoke bootstrap heap initialization before recording memory size.
     scalable_free(scalable_malloc(8));
     size_t n, sizeBefore = getMemSize();
 
     // Try to provoke call to OS for memory to check that
     // requests are not fulfilled from caches.
     // Single call is not enough here because of backend fragmentation.
-    for (n = minLargeObjectSize; n < 10*1024*1024; n += 16*1024) {
+    for (n = minLargeObjectSize; n < 10 * 1024 * 1024; n += 16 * 1024) {
         void *p = scalable_malloc(n);
         bool leave = (sizeBefore != getMemSize());
         scalable_free(p);
-        if (leave)
-            break;
+        if (leave) break;
         REQUIRE_MESSAGE(sizeBefore == getMemSize(), "No caching expected");
     }
-    REQUIRE_MESSAGE(n < 10*1024*1024, "scalable_malloc doesn't provoke OS request for memory, "
-           "is some internal cache still used?");
+    REQUIRE_MESSAGE(n < 10 * 1024 * 1024, "scalable_malloc doesn't provoke OS request for memory, "
+                                          "is some internal cache still used?");
 
-    for( int p=MaxThread; p>=MinThread; --p ) {
-        RunTestHeapLimit::initBarrier( p );
-        utils::NativeParallelFor( p, RunTestHeapLimit() );
+    for (int p = MaxThread; p >= MinThread; --p) {
+        RunTestHeapLimit::initBarrier(p);
+        utils::NativeParallelFor(p, RunTestHeapLimit());
     }
     // it's try to match limit as well as set limit, so call here
     res = scalable_allocation_mode(TBBMALLOC_SET_SOFT_HEAP_LIMIT, 1);
@@ -802,10 +781,9 @@ void TestHeapLimit()
     REQUIRE(res == TBBMALLOC_OK);
 }
 
-void checkNoHugePages()
-{
+void checkNoHugePages() {
     REQUIRE_MESSAGE(!hugePages.isEnabled, "scalable_allocation_mode "
-           "must have priority over environment variable");
+                                          "must have priority over environment variable");
 }
 
 /*---------------------------------------------------------------------------*/
@@ -816,20 +794,20 @@ void checkNoHugePages()
 // Global cleanup should process orphaned slabs and the queue of postponed coalescing
 // requests, otherwise it will not be able to unmap all unused memory.
 
-const int num_allocs = 10*1024;
+const int num_allocs = 10 * 1024;
 void *ptrs[num_allocs];
 std::atomic<int> alloc_counter;
 static thread_local bool free_was_called = false;
 
 inline void multiThreadAlloc(size_t alloc_size) {
-    for( int i = alloc_counter++; i < num_allocs; i = alloc_counter++ ) {
-       ptrs[i] = scalable_malloc( alloc_size );
-       REQUIRE_MESSAGE( ptrs[i] != nullptr, "scalable_malloc returned zero." );
+    for (int i = alloc_counter++; i < num_allocs; i = alloc_counter++) {
+        ptrs[i] = scalable_malloc(alloc_size);
+        REQUIRE_MESSAGE(ptrs[i] != nullptr, "scalable_malloc returned zero.");
     }
 }
 inline void crossThreadDealloc() {
     free_was_called = false;
-    for( int i = --alloc_counter; i >= 0; i = --alloc_counter ) {
+    for (int i = --alloc_counter; i >= 0; i = --alloc_counter) {
         if (i < num_allocs) {
             scalable_free(ptrs[i]);
             free_was_called = true;
@@ -837,9 +815,9 @@ inline void crossThreadDealloc() {
     }
 }
 
-template<int AllocSize>
+template <int AllocSize>
 struct TestCleanAllBuffersBody : public SimpleBarrier {
-    void operator() ( int ) const {
+    void operator()(int) const {
         barrier.wait();
         multiThreadAlloc(AllocSize);
         barrier.wait();
@@ -847,11 +825,11 @@ struct TestCleanAllBuffersBody : public SimpleBarrier {
     }
 };
 
-template<int AllocSize>
+template <int AllocSize>
 void TestCleanAllBuffers() {
     const int num_threads = 8;
     // Clean up if something was allocated before the test
-    scalable_allocation_command(TBBMALLOC_CLEAN_ALL_BUFFERS,nullptr);
+    scalable_allocation_command(TBBMALLOC_CLEAN_ALL_BUFFERS, nullptr);
 
     size_t memory_in_use_before = getMemSize();
     alloc_counter = 0;
@@ -859,29 +837,30 @@ void TestCleanAllBuffers() {
 
     utils::NativeParallelFor(num_threads, TestCleanAllBuffersBody<AllocSize>());
     // TODO: reproduce the bug conditions more reliably
-    if ( defaultMemPool->extMemPool.backend.coalescQ.blocksToFree.load(std::memory_order_relaxed) == nullptr ) {
-        INFO( "Warning: The queue of postponed coalescing requests is empty. ");
-        INFO( "Unable to create the condition for bug reproduction.\n" );
+    if (defaultMemPool->extMemPool.backend.coalescQ.blocksToFree.load(std::memory_order_relaxed) == nullptr) {
+        INFO("Warning: The queue of postponed coalescing requests is empty. ");
+        INFO("Unable to create the condition for bug reproduction.\n");
     }
-    int result = scalable_allocation_command(TBBMALLOC_CLEAN_ALL_BUFFERS,nullptr);
-    REQUIRE_MESSAGE( result == TBBMALLOC_OK, "The cleanup request has not cleaned anything." );
+    int result = scalable_allocation_command(TBBMALLOC_CLEAN_ALL_BUFFERS, nullptr);
+    REQUIRE_MESSAGE(result == TBBMALLOC_OK, "The cleanup request has not cleaned anything.");
     size_t memory_in_use_after = getMemSize();
 
     size_t memory_leak = memory_in_use_after - memory_in_use_before;
-    INFO( "memory_in_use_before = " <<  memory_in_use_before << ", memory_in_use_after = " << memory_in_use_after << "\n" );
-    REQUIRE_MESSAGE( memory_leak == 0, "Cleanup was unable to release all allocated memory." );
+    INFO("memory_in_use_before = " << memory_in_use_before
+                                   << ", memory_in_use_after = " << memory_in_use_after << "\n");
+    REQUIRE_MESSAGE(memory_leak == 0, "Cleanup was unable to release all allocated memory.");
 }
 
 //! Force cross thread deallocation of small objects to create a set of privatizable slab blocks.
 //! TBBMALLOC_CLEAN_THREAD_BUFFERS command have to privatize all the block.
 struct TestCleanThreadBuffersBody : public SimpleBarrier {
-    void operator() ( int ) const {
+    void operator()(int) const {
         barrier.wait();
-        multiThreadAlloc(2*1024);
+        multiThreadAlloc(2 * 1024);
         barrier.wait();
         crossThreadDealloc();
         barrier.wait();
-        int result = scalable_allocation_command(TBBMALLOC_CLEAN_THREAD_BUFFERS,nullptr);
+        int result = scalable_allocation_command(TBBMALLOC_CLEAN_THREAD_BUFFERS, nullptr);
         if (result != TBBMALLOC_OK && free_was_called) {
             REPORT("Warning: clean-up request for this particular thread has not cleaned anything.");
         }
@@ -892,8 +871,10 @@ struct TestCleanThreadBuffersBody : public SimpleBarrier {
             for (int i = 0; i < numBlockBinLimit; i++) {
                 REQUIRE_MESSAGE(!(tlsCurr->bin[i].activeBlk), "Some bin was not cleaned.");
             }
-            REQUIRE_MESSAGE(!(tlsCurr->lloc.head.load(std::memory_order_relaxed)), "Local LOC was not cleaned.");
-            REQUIRE_MESSAGE(!(tlsCurr->freeSlabBlocks.head.load(std::memory_order_relaxed)), "Free Block pool was not cleaned.");
+            REQUIRE_MESSAGE(!(tlsCurr->lloc.head.load(std::memory_order_relaxed)),
+                            "Local LOC was not cleaned.");
+            REQUIRE_MESSAGE(!(tlsCurr->freeSlabBlocks.head.load(std::memory_order_relaxed)),
+                            "Free Block pool was not cleaned.");
         }
     }
 };
@@ -901,7 +882,7 @@ struct TestCleanThreadBuffersBody : public SimpleBarrier {
 void TestCleanThreadBuffers() {
     const int num_threads = 8;
     // Clean up if something was allocated before the test
-    scalable_allocation_command(TBBMALLOC_CLEAN_ALL_BUFFERS,nullptr);
+    scalable_allocation_command(TBBMALLOC_CLEAN_ALL_BUFFERS, nullptr);
 
     alloc_counter = 0;
     TestCleanThreadBuffersBody::initBarrier(num_threads);
@@ -910,19 +891,19 @@ void TestCleanThreadBuffers() {
 
 /*---------------------------------------------------------------------------*/
 /*------------------------- Large Object Cache tests ------------------------*/
-#if _MSC_VER==1600 || _MSC_VER==1500
-    // ignore C4275: non dll-interface class 'stdext::exception' used as
-    // base for dll-interface class 'std::bad_cast'
-    #pragma warning (disable: 4275)
+#if _MSC_VER == 1600 || _MSC_VER == 1500
+// ignore C4275: non dll-interface class 'stdext::exception' used as
+// base for dll-interface class 'std::bad_cast'
+#pragma warning(disable : 4275)
 #endif
-#include <vector>
 #include <list>
+#include <vector>
 
 // default constructor of CacheBin
-template<typename Props>
+template <typename Props>
 rml::internal::LargeObjectCacheImpl<Props>::CacheBin::CacheBin() {}
 
-template<typename Props>
+template <typename Props>
 class CacheBinModel {
 
     typedef typename rml::internal::LargeObjectCacheImpl<Props>::CacheBin CacheBinType;
@@ -938,9 +919,11 @@ class CacheBinModel {
     std::list<uintptr_t> objects;
 
     void doCleanup() {
-        if ( cacheBinModel.cachedSize.load(std::memory_order_relaxed) >
-            Props::TooLargeFactor*cacheBinModel.usedSize.load(std::memory_order_relaxed)) tooLargeLOC++;
-        else tooLargeLOC = 0;
+        if (cacheBinModel.cachedSize.load(std::memory_order_relaxed)
+            > Props::TooLargeFactor * cacheBinModel.usedSize.load(std::memory_order_relaxed))
+            tooLargeLOC++;
+        else
+            tooLargeLOC = 0;
 
         intptr_t threshold = cacheBinModel.ageThreshold.load(std::memory_order_relaxed);
         if (tooLargeLOC > 3 && threshold) {
@@ -950,7 +933,8 @@ class CacheBinModel {
 
         uintptr_t currTime = cacheCurrTime;
         while (!objects.empty() && (intptr_t)(currTime - objects.front()) > threshold) {
-            cacheBinModel.cachedSize.store(cacheBinModel.cachedSize.load(std::memory_order_relaxed) - size, std::memory_order_relaxed);
+            cacheBinModel.cachedSize.store(cacheBinModel.cachedSize.load(std::memory_order_relaxed) - size,
+                                           std::memory_order_relaxed);
             cacheBinModel.lastCleanedAge = objects.front();
             objects.pop_front();
         }
@@ -960,28 +944,37 @@ class CacheBinModel {
 
 public:
     CacheBinModel(CacheBinType &_cacheBin, size_t allocSize) : cacheBin(_cacheBin), size(allocSize) {
-        cacheBinModel.oldest.store(cacheBin.oldest.load(std::memory_order_relaxed), std::memory_order_relaxed);
+        cacheBinModel.oldest.store(cacheBin.oldest.load(std::memory_order_relaxed),
+                                   std::memory_order_relaxed);
         cacheBinModel.lastCleanedAge = cacheBin.lastCleanedAge;
-        cacheBinModel.ageThreshold.store(cacheBin.ageThreshold.load(std::memory_order_relaxed), std::memory_order_relaxed);
-        cacheBinModel.usedSize.store(cacheBin.usedSize.load(std::memory_order_relaxed), std::memory_order_relaxed);
-        cacheBinModel.cachedSize.store(cacheBin.cachedSize.load(std::memory_order_relaxed), std::memory_order_relaxed);
-        cacheBinModel.meanHitRange.store(cacheBin.meanHitRange.load(std::memory_order_relaxed), std::memory_order_relaxed);
+        cacheBinModel.ageThreshold.store(cacheBin.ageThreshold.load(std::memory_order_relaxed),
+                                         std::memory_order_relaxed);
+        cacheBinModel.usedSize.store(cacheBin.usedSize.load(std::memory_order_relaxed),
+                                     std::memory_order_relaxed);
+        cacheBinModel.cachedSize.store(cacheBin.cachedSize.load(std::memory_order_relaxed),
+                                       std::memory_order_relaxed);
+        cacheBinModel.meanHitRange.store(cacheBin.meanHitRange.load(std::memory_order_relaxed),
+                                         std::memory_order_relaxed);
         cacheBinModel.lastGet = cacheBin.lastGet;
     }
     void get() {
         uintptr_t currTime = ++cacheCurrTime;
 
-        if ( objects.empty() ) {
+        if (objects.empty()) {
             const uintptr_t sinceLastGet = currTime - cacheBinModel.lastGet;
             intptr_t threshold = cacheBinModel.ageThreshold.load(std::memory_order_relaxed);
-            if ((threshold && sinceLastGet > Props::LongWaitFactor * threshold) ||
-                (cacheBinModel.lastCleanedAge && sinceLastGet > Props::LongWaitFactor * (cacheBinModel.lastCleanedAge - cacheBinModel.lastGet))) {
+            if ((threshold && sinceLastGet > Props::LongWaitFactor * threshold)
+                || (cacheBinModel.lastCleanedAge
+                    && sinceLastGet > Props::LongWaitFactor
+                                              * (cacheBinModel.lastCleanedAge - cacheBinModel.lastGet))) {
                 cacheBinModel.lastCleanedAge = 0;
                 cacheBinModel.ageThreshold.store(0, std::memory_order_relaxed);
             }
 
             if (cacheBinModel.lastCleanedAge)
-                cacheBinModel.ageThreshold.store(Props::OnMissFactor * (currTime - cacheBinModel.lastCleanedAge), std::memory_order_relaxed);
+                cacheBinModel.ageThreshold.store(Props::OnMissFactor
+                                                         * (currTime - cacheBinModel.lastCleanedAge),
+                                                 std::memory_order_relaxed);
         } else {
             uintptr_t obj_age = objects.back();
             objects.pop_back();
@@ -992,48 +985,56 @@ class CacheBinModel {
             mean = mean ? (mean + hitRange) / 2 : hitRange;
             cacheBinModel.meanHitRange.store(mean, std::memory_order_relaxed);
 
-            cacheBinModel.cachedSize.store(cacheBinModel.cachedSize.load(std::memory_order_relaxed) - size, std::memory_order_relaxed);
+            cacheBinModel.cachedSize.store(cacheBinModel.cachedSize.load(std::memory_order_relaxed) - size,
+                                           std::memory_order_relaxed);
         }
 
-        cacheBinModel.usedSize.store(cacheBinModel.usedSize.load(std::memory_order_relaxed) + size, std::memory_order_relaxed);
+        cacheBinModel.usedSize.store(cacheBinModel.usedSize.load(std::memory_order_relaxed) + size,
+                                     std::memory_order_relaxed);
         cacheBinModel.lastGet = currTime;
 
-        if ( currTime % rml::internal::cacheCleanupFreq == 0 ) doCleanup();
+        if (currTime % rml::internal::cacheCleanupFreq == 0) doCleanup();
     }
 
-    void putList( int num ) {
+    void putList(int num) {
         uintptr_t currTime = cacheCurrTime;
         cacheCurrTime += num;
 
-        cacheBinModel.usedSize.store(cacheBinModel.usedSize.load(std::memory_order_relaxed) - num * size, std::memory_order_relaxed);
+        cacheBinModel.usedSize.store(cacheBinModel.usedSize.load(std::memory_order_relaxed) - num * size,
+                                     std::memory_order_relaxed);
 
         bool cleanUpNeeded = false;
-        if ( !cacheBinModel.lastCleanedAge ) {
+        if (!cacheBinModel.lastCleanedAge) {
             cacheBinModel.lastCleanedAge = ++currTime;
             cleanUpNeeded |= currTime % rml::internal::cacheCleanupFreq == 0;
             num--;
         }
 
-        for ( int i=1; i<=num; ++i ) {
-            currTime+=1;
+        for (int i = 1; i <= num; ++i) {
+            currTime += 1;
             cleanUpNeeded |= currTime % rml::internal::cacheCleanupFreq == 0;
-            if (objects.empty())
-                cacheBinModel.oldest.store(currTime, std::memory_order_relaxed);
+            if (objects.empty()) cacheBinModel.oldest.store(currTime, std::memory_order_relaxed);
             objects.push_back(currTime);
         }
 
-        cacheBinModel.cachedSize.store(cacheBinModel.cachedSize.load(std::memory_order_relaxed) + num * size, std::memory_order_relaxed);
+        cacheBinModel.cachedSize.store(cacheBinModel.cachedSize.load(std::memory_order_relaxed) + num * size,
+                                       std::memory_order_relaxed);
 
-        if ( cleanUpNeeded ) doCleanup();
+        if (cleanUpNeeded) doCleanup();
     }
 
     void check() {
-        CHECK_FAST(cacheBinModel.oldest.load(std::memory_order_relaxed) == cacheBin.oldest.load(std::memory_order_relaxed));
+        CHECK_FAST(cacheBinModel.oldest.load(std::memory_order_relaxed)
+                   == cacheBin.oldest.load(std::memory_order_relaxed));
         CHECK_FAST(cacheBinModel.lastCleanedAge == cacheBin.lastCleanedAge);
-        CHECK_FAST(cacheBinModel.ageThreshold.load(std::memory_order_relaxed) == cacheBin.ageThreshold.load(std::memory_order_relaxed));
-        CHECK_FAST(cacheBinModel.usedSize.load(std::memory_order_relaxed) == cacheBin.usedSize.load(std::memory_order_relaxed));
-        CHECK_FAST(cacheBinModel.cachedSize.load(std::memory_order_relaxed) == cacheBin.cachedSize.load(std::memory_order_relaxed));
-        CHECK_FAST(cacheBinModel.meanHitRange.load(std::memory_order_relaxed) == cacheBin.meanHitRange.load(std::memory_order_relaxed));
+        CHECK_FAST(cacheBinModel.ageThreshold.load(std::memory_order_relaxed)
+                   == cacheBin.ageThreshold.load(std::memory_order_relaxed));
+        CHECK_FAST(cacheBinModel.usedSize.load(std::memory_order_relaxed)
+                   == cacheBin.usedSize.load(std::memory_order_relaxed));
+        CHECK_FAST(cacheBinModel.cachedSize.load(std::memory_order_relaxed)
+                   == cacheBin.cachedSize.load(std::memory_order_relaxed));
+        CHECK_FAST(cacheBinModel.meanHitRange.load(std::memory_order_relaxed)
+                   == cacheBin.meanHitRange.load(std::memory_order_relaxed));
         CHECK_FAST(cacheBinModel.lastGet == cacheBin.lastGet);
     }
 
@@ -1041,8 +1042,10 @@ class CacheBinModel {
     static intptr_t tooLargeLOC;
 };
 
-template<typename Props> uintptr_t CacheBinModel<Props>::cacheCurrTime;
-template<typename Props> intptr_t CacheBinModel<Props>::tooLargeLOC;
+template <typename Props>
+uintptr_t CacheBinModel<Props>::cacheCurrTime;
+template <typename Props>
+intptr_t CacheBinModel<Props>::tooLargeLOC;
 
 template <typename Scenario>
 void LOCModelTester() {
@@ -1050,19 +1053,25 @@ void LOCModelTester() {
     defaultMemPool->extMemPool.loc.reset();
 
     const size_t size = 16 * 1024;
-    const size_t headersSize = sizeof(rml::internal::LargeMemoryBlock)+sizeof(rml::internal::LargeObjectHdr);
-    const size_t allocationSize = LargeObjectCache::alignToBin(size+headersSize+rml::internal::largeObjectAlignment);
-    const int binIdx = defaultMemPool->extMemPool.loc.largeCache.sizeToIdx( allocationSize );
-
-    CacheBinModel<rml::internal::LargeObjectCache::LargeCacheTypeProps>::cacheCurrTime = defaultMemPool->extMemPool.loc.cacheCurrTime;
-    CacheBinModel<rml::internal::LargeObjectCache::LargeCacheTypeProps>::tooLargeLOC = defaultMemPool->extMemPool.loc.largeCache.tooLargeLOC;
-    CacheBinModel<rml::internal::LargeObjectCache::LargeCacheTypeProps> cacheBinModel(defaultMemPool->extMemPool.loc.largeCache.bin[binIdx], allocationSize);
+    const size_t headersSize
+            = sizeof(rml::internal::LargeMemoryBlock) + sizeof(rml::internal::LargeObjectHdr);
+    const size_t allocationSize
+            = LargeObjectCache::alignToBin(size + headersSize + rml::internal::largeObjectAlignment);
+    const int binIdx = defaultMemPool->extMemPool.loc.largeCache.sizeToIdx(allocationSize);
+
+    CacheBinModel<rml::internal::LargeObjectCache::LargeCacheTypeProps>::cacheCurrTime
+            = defaultMemPool->extMemPool.loc.cacheCurrTime;
+    CacheBinModel<rml::internal::LargeObjectCache::LargeCacheTypeProps>::tooLargeLOC
+            = defaultMemPool->extMemPool.loc.largeCache.tooLargeLOC;
+    CacheBinModel<rml::internal::LargeObjectCache::LargeCacheTypeProps> cacheBinModel(
+            defaultMemPool->extMemPool.loc.largeCache.bin[binIdx], allocationSize);
 
     Scenario scen;
-    for (rml::internal::LargeMemoryBlock *lmb = scen.next(); (intptr_t)lmb != (intptr_t)-1; lmb = scen.next()) {
-        if ( lmb ) {
-            int num=1;
-            for (rml::internal::LargeMemoryBlock *curr = lmb; curr->next; curr=curr->next) num+=1;
+    for (rml::internal::LargeMemoryBlock *lmb = scen.next(); (intptr_t) lmb != (intptr_t) -1;
+         lmb = scen.next()) {
+        if (lmb) {
+            int num = 1;
+            for (rml::internal::LargeMemoryBlock *curr = lmb; curr->next; curr = curr->next) num += 1;
             defaultMemPool->extMemPool.freeLargeObject(lmb);
             cacheBinModel.putList(num);
         } else {
@@ -1076,50 +1085,48 @@ void LOCModelTester() {
 
 class TestBootstrap {
     bool allocating;
-    std::vector<rml::internal::LargeMemoryBlock*> lmbArray;
+    std::vector<rml::internal::LargeMemoryBlock *> lmbArray;
+
 public:
     TestBootstrap() : allocating(true) {}
 
-    rml::internal::LargeMemoryBlock* next() {
-        if ( allocating )
-            return nullptr;
-        if ( !lmbArray.empty() ) {
+    rml::internal::LargeMemoryBlock *next() {
+        if (allocating) return nullptr;
+        if (!lmbArray.empty()) {
             rml::internal::LargeMemoryBlock *ret = lmbArray.back();
             lmbArray.pop_back();
             return ret;
         }
-        return (rml::internal::LargeMemoryBlock*)-1;
+        return (rml::internal::LargeMemoryBlock *) -1;
     }
 
-    void saveLmb( rml::internal::LargeMemoryBlock *lmb ) {
+    void saveLmb(rml::internal::LargeMemoryBlock *lmb) {
         lmb->next = nullptr;
         lmbArray.push_back(lmb);
-        if ( lmbArray.size() == 1000 ) allocating = false;
+        if (lmbArray.size() == 1000) allocating = false;
     }
 };
 
 class TestRandom {
-    std::vector<rml::internal::LargeMemoryBlock*> lmbArray;
+    std::vector<rml::internal::LargeMemoryBlock *> lmbArray;
     int numOps;
+
 public:
-    TestRandom() : numOps(100000) {
-        srand(1234);
-    }
+    TestRandom() : numOps(100000) { srand(1234); }
 
-    rml::internal::LargeMemoryBlock* next() {
-        if ( numOps-- ) {
-            if ( lmbArray.empty() || rand() / (RAND_MAX>>1) == 0 )
-                return nullptr;
-            size_t ind = rand()%lmbArray.size();
-            if ( ind != lmbArray.size()-1 ) std::swap(lmbArray[ind],lmbArray[lmbArray.size()-1]);
+    rml::internal::LargeMemoryBlock *next() {
+        if (numOps--) {
+            if (lmbArray.empty() || rand() / (RAND_MAX >> 1) == 0) return nullptr;
+            size_t ind = rand() % lmbArray.size();
+            if (ind != lmbArray.size() - 1) std::swap(lmbArray[ind], lmbArray[lmbArray.size() - 1]);
             rml::internal::LargeMemoryBlock *lmb = lmbArray.back();
             lmbArray.pop_back();
             return lmb;
         }
-        return (rml::internal::LargeMemoryBlock*)-1;
+        return (rml::internal::LargeMemoryBlock *) -1;
     }
 
-    void saveLmb( rml::internal::LargeMemoryBlock *lmb ) {
+    void saveLmb(rml::internal::LargeMemoryBlock *lmb) {
         lmb->next = nullptr;
         lmbArray.push_back(lmb);
     }
@@ -1130,69 +1137,70 @@ class TestCollapsingMallocFree : public SimpleBarrier {
     static const int NUM_ALLOCS = 100000;
     const int num_threads;
 
-    TestCollapsingMallocFree( int _num_threads ) : num_threads(_num_threads) {
-        initBarrier( num_threads );
-    }
+    TestCollapsingMallocFree(int _num_threads) : num_threads(_num_threads) { initBarrier(num_threads); }
 
-    void operator() ( int ) const {
+    void operator()(int) const {
         const size_t size = 16 * 1024;
-        const size_t headersSize = sizeof(rml::internal::LargeMemoryBlock)+sizeof(rml::internal::LargeObjectHdr);
-        const size_t allocationSize = LargeObjectCache::alignToBin(size+headersSize+rml::internal::largeObjectAlignment);
+        const size_t headersSize
+                = sizeof(rml::internal::LargeMemoryBlock) + sizeof(rml::internal::LargeObjectHdr);
+        const size_t allocationSize
+                = LargeObjectCache::alignToBin(size + headersSize + rml::internal::largeObjectAlignment);
 
         barrier.wait();
-        for ( int i=0; i<NUM_ALLOCS; ++i ) {
+        for (int i = 0; i < NUM_ALLOCS; ++i) {
             defaultMemPool->extMemPool.freeLargeObject(
-                defaultMemPool->extMemPool.mallocLargeObject(defaultMemPool, allocationSize) );
+                    defaultMemPool->extMemPool.mallocLargeObject(defaultMemPool, allocationSize));
         }
     }
 
     void check() {
-        REQUIRE( tbbmalloc_whitebox::locGetProcessed == tbbmalloc_whitebox::locPutProcessed);
-        REQUIRE_MESSAGE( tbbmalloc_whitebox::locGetProcessed < num_threads*NUM_ALLOCS, "No one Malloc/Free pair was collapsed." );
+        REQUIRE(tbbmalloc_whitebox::locGetProcessed == tbbmalloc_whitebox::locPutProcessed);
+        REQUIRE_MESSAGE(tbbmalloc_whitebox::locGetProcessed < num_threads * NUM_ALLOCS,
+                        "No one Malloc/Free pair was collapsed.");
     }
 };
 
 class TestCollapsingBootstrap : public SimpleBarrier {
     class CheckNumAllocs {
         const int num_threads;
+
     public:
-        CheckNumAllocs( int _num_threads ) : num_threads(_num_threads) {}
+        CheckNumAllocs(int _num_threads) : num_threads(_num_threads) {}
         void operator()() const {
-            REQUIRE( tbbmalloc_whitebox::locGetProcessed == num_threads*NUM_ALLOCS );
-            REQUIRE( tbbmalloc_whitebox::locPutProcessed == 0 );
+            REQUIRE(tbbmalloc_whitebox::locGetProcessed == num_threads * NUM_ALLOCS);
+            REQUIRE(tbbmalloc_whitebox::locPutProcessed == 0);
         }
     };
+
 public:
     static const int NUM_ALLOCS = 1000;
     const int num_threads;
 
-    TestCollapsingBootstrap( int _num_threads ) : num_threads(_num_threads) {
-        initBarrier( num_threads );
-    }
+    TestCollapsingBootstrap(int _num_threads) : num_threads(_num_threads) { initBarrier(num_threads); }
 
-    void operator() ( int ) const {
+    void operator()(int) const {
         const size_t size = 16 * 1024;
-        size_t headersSize = sizeof(rml::internal::LargeMemoryBlock)+sizeof(rml::internal::LargeObjectHdr);
-        size_t allocationSize = LargeObjectCache::alignToBin(size+headersSize+rml::internal::largeObjectAlignment);
+        size_t headersSize = sizeof(rml::internal::LargeMemoryBlock) + sizeof(rml::internal::LargeObjectHdr);
+        size_t allocationSize
+                = LargeObjectCache::alignToBin(size + headersSize + rml::internal::largeObjectAlignment);
 
         barrier.wait();
         rml::internal::LargeMemoryBlock *lmbArray[NUM_ALLOCS];
-        for ( int i=0; i<NUM_ALLOCS; ++i )
+        for (int i = 0; i < NUM_ALLOCS; ++i)
             lmbArray[i] = defaultMemPool->extMemPool.mallocLargeObject(defaultMemPool, allocationSize);
 
         barrier.wait(CheckNumAllocs(num_threads));
-        for ( int i=0; i<NUM_ALLOCS; ++i )
-            defaultMemPool->extMemPool.freeLargeObject( lmbArray[i] );
+        for (int i = 0; i < NUM_ALLOCS; ++i) defaultMemPool->extMemPool.freeLargeObject(lmbArray[i]);
     }
 
     void check() {
-        REQUIRE( tbbmalloc_whitebox::locGetProcessed == tbbmalloc_whitebox::locPutProcessed );
-        REQUIRE( tbbmalloc_whitebox::locGetProcessed == num_threads*NUM_ALLOCS );
+        REQUIRE(tbbmalloc_whitebox::locGetProcessed == tbbmalloc_whitebox::locPutProcessed);
+        REQUIRE(tbbmalloc_whitebox::locGetProcessed == num_threads * NUM_ALLOCS);
     }
 };
 
 template <typename Scenario>
-void LOCCollapsingTester( int num_threads ) {
+void LOCCollapsingTester(int num_threads) {
     tbbmalloc_whitebox::locGetProcessed = 0;
     tbbmalloc_whitebox::locPutProcessed = 0;
     defaultMemPool->extMemPool.loc.cleanAll();
@@ -1209,37 +1217,35 @@ void TestLOC() {
     LOCModelTester<TestRandom>();
 
     const int num_threads = 16;
-    LOCCollapsingTester<TestCollapsingBootstrap>( num_threads );
-    if ( num_threads > 1 ) {
-        INFO( "num_threads = " << num_threads );
-        LOCCollapsingTester<TestCollapsingMallocFree>( num_threads );
+    LOCCollapsingTester<TestCollapsingBootstrap>(num_threads);
+    if (num_threads > 1) {
+        INFO("num_threads = " << num_threads);
+        LOCCollapsingTester<TestCollapsingMallocFree>(num_threads);
     } else {
-        REPORT( "Warning: concurrency is too low for TestMallocFreeCollapsing ( num_threads = %d )\n", num_threads );
+        REPORT("Warning: concurrency is too low for TestMallocFreeCollapsing ( num_threads = %d )\n",
+               num_threads);
     }
 }
 /*---------------------------------------------------------------------------*/
 
-void *findCacheLine(void *p) {
-    return (void*)alignDown((uintptr_t)p, estimatedCacheLineSize);
-}
+void *findCacheLine(void *p) { return (void *) alignDown((uintptr_t) p, estimatedCacheLineSize); }
 
 // test that internals of Block are at expected cache lines
 void TestSlabAlignment() {
     const size_t min_sz = 8;
-    const int space = 2*16*1024; // fill at least 2 slabs
-    void *pointers[space / min_sz];  // the worst case is min_sz byte object
+    const int space = 2 * 16 * 1024;// fill at least 2 slabs
+    void *pointers[space / min_sz]; // the worst case is min_sz byte object
 
     for (size_t sz = min_sz; sz <= 64; sz *= 2) {
-        for (size_t i = 0; i < space/sz; i++) {
+        for (size_t i = 0; i < space / sz; i++) {
             pointers[i] = scalable_malloc(sz);
-            Block *block = (Block *)alignDown(pointers[i], slabSize);
+            Block *block = (Block *) alignDown(pointers[i], slabSize);
             REQUIRE_MESSAGE(findCacheLine(&block->isFull) != findCacheLine(pointers[i]),
-                          "A user object must not share a cache line with slab control structures.");
+                            "A user object must not share a cache line with slab control structures.");
             REQUIRE_MESSAGE(findCacheLine(&block->next) != findCacheLine(&block->nextPrivatizable),
-                          "GlobalBlockFields and LocalBlockFields must be on different cache lines.");
+                            "GlobalBlockFields and LocalBlockFields must be on different cache lines.");
         }
-        for (size_t i = 0; i < space/sz; i++)
-            scalable_free(pointers[i]);
+        for (size_t i = 0; i < space / sz; i++) scalable_free(pointers[i]);
     }
 }
 
@@ -1268,7 +1274,7 @@ void TestTHP() {
 
     // Allocate huge page aligned memory regions to track system
     // counters for transparent huge pages
-    void*  allocPtrs[allocCount];
+    void *allocPtrs[allocCount];
 
     // Wait for the system to update process memory info files after other tests
     utils::Sleep(4000);
@@ -1286,13 +1292,13 @@ void TestTHP() {
 
         REQUIRE_MESSAGE(allocPtrs[i], "Allocation not succeeded.");
         REQUIRE_MESSAGE(allocSize == HUGE_PAGE_SIZE,
-            "Allocation size have to be aligned on Huge Page size internally.");
+                        "Allocation size have to be aligned on Huge Page size internally.");
 
         // First touch policy - no real pages allocated by OS without accessing the region
         memset(allocPtrs[i], 1, allocSize);
 
         REQUIRE_MESSAGE(isAligned(allocPtrs[i], HUGE_PAGE_SIZE),
-            "The pointer returned by scalable_malloc is not aligned on huge page size.");
+                        "The pointer returned by scalable_malloc is not aligned on huge page size.");
     }
 
     // Wait for the system to update process memory info files after allocations
@@ -1304,31 +1310,33 @@ void TestTHP() {
     size_t newSystemTHPCount = utils::getSystemTHPCount();
     size_t newSystemTHPAllocatedSize = utils::getSystemTHPAllocatedSize();
     if ((newSystemTHPCount - currentSystemTHPCount) < allocCount
-            && (newSystemTHPAllocatedSize - currentSystemTHPAllocatedSize) / (2 * 1024) < allocCount) {
-        REPORT( "Warning: the system didn't allocate needed amount of THPs.\n" );
+        && (newSystemTHPAllocatedSize - currentSystemTHPAllocatedSize) / (2 * 1024) < allocCount) {
+        REPORT("Warning: the system didn't allocate needed amount of THPs.\n");
     }
 
     // Test memory unmap
     for (int i = 0; i < allocCount; i++) {
         REQUIRE_MESSAGE(backend->freeRawMem(allocPtrs[i], HUGE_PAGE_SIZE),
-                "Something went wrong during raw memory free");
+                        "Something went wrong during raw memory free");
     }
 }
-#endif // __unix__
+#endif// __unix__
 
 inline size_t getStabilizedMemUsage() {
     for (int i = 0; i < 3; i++) utils::GetMemoryUsage();
     return utils::GetMemoryUsage();
 }
 
-inline void* reallocAndRetrieve(void* origPtr, size_t reallocSize, size_t& origBlockSize, size_t& reallocBlockSize) {
-    rml::internal::LargeMemoryBlock* origLmb = ((rml::internal::LargeObjectHdr *)origPtr - 1)->memoryBlock;
+inline void *reallocAndRetrieve(void *origPtr, size_t reallocSize, size_t &origBlockSize,
+                                size_t &reallocBlockSize) {
+    rml::internal::LargeMemoryBlock *origLmb = ((rml::internal::LargeObjectHdr *) origPtr - 1)->memoryBlock;
     origBlockSize = origLmb->unalignedSize;
 
-    void* reallocPtr = rml::internal::reallocAligned(defaultMemPool, origPtr, reallocSize, 0);
+    void *reallocPtr = rml::internal::reallocAligned(defaultMemPool, origPtr, reallocSize, 0);
 
     // Retrieved reallocated block information
-    rml::internal::LargeMemoryBlock* reallocLmb = ((rml::internal::LargeObjectHdr *)reallocPtr - 1)->memoryBlock;
+    rml::internal::LargeMemoryBlock *reallocLmb
+            = ((rml::internal::LargeObjectHdr *) reallocPtr - 1)->memoryBlock;
     reallocBlockSize = reallocLmb->unalignedSize;
 
     return reallocPtr;
@@ -1341,8 +1349,8 @@ void TestReallocDecreasing() {
 
     size_t startSize = 100 * 1024 * 1024;
     size_t maxBinnedSize = defaultMemPool->extMemPool.backend.getMaxBinnedSize();
-    void*  origPtr = scalable_malloc(startSize);
-    void*  reallocPtr = nullptr;
+    void *origPtr = scalable_malloc(startSize);
+    void *reallocPtr = nullptr;
 
     // Realloc on 1MB less size
     size_t origBlockSize = 42;
@@ -1352,8 +1360,8 @@ void TestReallocDecreasing() {
     REQUIRE_MESSAGE(reallocPtr == origPtr, "Original pointer shouldn't change");
 
     // Repeated decreasing reallocation while max cache bin size reached
-    size_t reallocSize = (startSize / 2) - 1000; // exact realloc
-    while(reallocSize > maxBinnedSize) {
+    size_t reallocSize = (startSize / 2) - 1000;// exact realloc
+    while (reallocSize > maxBinnedSize) {
 
         // Prevent huge/large objects caching
         defaultMemPool->extMemPool.loc.cleanAll();
@@ -1377,7 +1385,7 @@ void TestReallocDecreasing() {
         }
 
         origPtr = reallocPtr;
-        reallocSize = (reallocSize / 2) - 1000; // exact realloc
+        reallocSize = (reallocSize / 2) - 1000;// exact realloc
     }
     scalable_free(reallocPtr);
 
@@ -1389,18 +1397,14 @@ void TestReallocDecreasing() {
 #include "../../src/tbbmalloc_proxy/function_replacement.cpp"
 #include <string>
 namespace FunctionReplacement {
-    FunctionInfo funcInfo = { "funcname","dllname" };
+    FunctionInfo funcInfo = {"funcname", "dllname"};
     char **func_replacement_log;
     int status;
 
     void LogCleanup() {
         // Free all allocated memory
-        for (unsigned i = 0; i < Log::record_number; i++){
-            HeapFree(GetProcessHeap(), 0, Log::records[i]);
-        }
-        for (unsigned i = 0; i < Log::RECORDS_COUNT + 1; i++){
-            Log::records[i] = nullptr;
-        }
+        for (unsigned i = 0; i < Log::record_number; i++) { HeapFree(GetProcessHeap(), 0, Log::records[i]); }
+        for (unsigned i = 0; i < Log::RECORDS_COUNT + 1; i++) { Log::records[i] = nullptr; }
         Log::replacement_status = true;
         Log::record_number = 0;
     }
@@ -1413,8 +1417,7 @@ namespace FunctionReplacement {
     }
 
     void TestLogOverload() {
-        for (int i = 0; i < 1000; i++)
-            Log::record(funcInfo, "opcode string", true);
+        for (int i = 0; i < 1000; i++) Log::record(funcInfo, "opcode string", true);
 
         status = TBB_malloc_replacement_log(&func_replacement_log);
         // Find last record
@@ -1434,8 +1437,8 @@ namespace FunctionReplacement {
 
     void TestFalseSearchCase() {
         Log::record(funcInfo, "opcode string", false);
-        std::string expected_line = "Fail: "+ std::string(funcInfo.funcName) + " (" +
-                         std::string(funcInfo.dllName) + "), byte pattern: <opcode string>";
+        std::string expected_line = "Fail: " + std::string(funcInfo.funcName) + " ("
+                                    + std::string(funcInfo.dllName) + "), byte pattern: <opcode string>";
 
         status = TBB_malloc_replacement_log(&func_replacement_log);
 
@@ -1444,7 +1447,7 @@ namespace FunctionReplacement {
         LogCleanup();
     }
 
-    void TestWrongFunctionInDll(){
+    void TestWrongFunctionInDll() {
         HMODULE ucrtbase_handle = GetModuleHandle("ucrtbase.dll");
         if (ucrtbase_handle) {
             IsPrologueKnown("ucrtbase.dll", "fake_function", nullptr, ucrtbase_handle);
@@ -1459,7 +1462,7 @@ namespace FunctionReplacement {
             INFO("Cannot found ucrtbase.dll on system, test skipped!\n");
         }
     }
-}
+}// namespace FunctionReplacement
 
 void TesFunctionReplacementLog() {
     using namespace FunctionReplacement;
@@ -1472,19 +1475,20 @@ void TesFunctionReplacementLog() {
 
 #endif /*!__TBB_WIN8UI_SUPPORT && defined(_WIN32)*/
 
-#include <cmath> // pow function
+#include <cmath>// pow function
 
 // Huge objects cache: Size = MinSize * (2 ^ (Index / StepFactor) formula gives value for the bin size,
 // but it is not matched with our sizeToIdx approximation algorithm, where step sizes between major
 // (power of 2) sizes are equal. Used internally for the test. Static cast to avoid warnings.
 inline size_t hocIdxToSizeFormula(int idx) {
-    return static_cast<size_t>(float(rml::internal::LargeObjectCache::maxLargeSize) *
-        pow(2, float(idx) / float(rml::internal::LargeObjectCache::HugeBSProps::StepFactor)));
+    return static_cast<size_t>(
+            float(rml::internal::LargeObjectCache::maxLargeSize)
+            * pow(2, float(idx) / float(rml::internal::LargeObjectCache::HugeBSProps::StepFactor)));
 }
 // Large objects cache arithmetic progression
 inline size_t locIdxToSizeFormula(int idx) {
-    return rml::internal::LargeObjectCache::LargeBSProps::MinSize +
-        (idx * rml::internal::LargeObjectCache::LargeBSProps::CacheStep);
+    return rml::internal::LargeObjectCache::LargeBSProps::MinSize
+           + (idx * rml::internal::LargeObjectCache::LargeBSProps::CacheStep);
 }
 
 template <typename CacheType>
@@ -1495,7 +1499,7 @@ void TestLOCacheBinsConverterImpl(int idx, size_t checkingSize) {
     REQUIRE_MESSAGE(calcIdx == idx, "Index from size calculated not correctly");
 }
 
-void TestLOCacheBinsConverter(){
+void TestLOCacheBinsConverter() {
     typedef rml::internal::LargeObjectCache::LargeCacheType LargeCacheType;
     typedef rml::internal::LargeObjectCache::HugeCacheType HugeCacheType;
 
@@ -1511,7 +1515,7 @@ void TestLOCacheBinsConverter(){
 }
 
 struct HOThresholdTester {
-    LargeObjectCache* loc;
+    LargeObjectCache *loc;
     size_t hugeSize;
 
     static const size_t sieveSize = LargeObjectCache::defaultMaxHugeSize;
@@ -1520,14 +1524,10 @@ struct HOThresholdTester {
     static const int MIN_BIN_IDX = 21;
     static const int MAX_BIN_IDX = 27;
 
-    enum CleanupType {
-        NO_CLEANUP,
-        REGULAR_CLEANUP,
-        HARD_CLEANUP
-    };
+    enum CleanupType { NO_CLEANUP, REGULAR_CLEANUP, HARD_CLEANUP };
 
     void populateCache() {
-        LargeMemoryBlock* loArray[MAX_BIN_IDX - MIN_BIN_IDX];
+        LargeMemoryBlock *loArray[MAX_BIN_IDX - MIN_BIN_IDX];
         // To avoid backend::softCacheCleanup consequences (cleanup by isLOCToolarge),
         // firstly allocate all objects and then cache them at once.
         // Morevover, just because first cache item will still be dropped from cache because of the lack of history,
@@ -1540,9 +1540,7 @@ struct HOThresholdTester {
             loc->put(loArray[localIdx]);
             loArray[localIdx] = defaultMemPool->extMemPool.mallocLargeObject(defaultMemPool, allocationSize);
         }
-        for (int idx = MIN_BIN_IDX; idx < MAX_BIN_IDX; ++idx) {
-            loc->put(loArray[idx - MIN_BIN_IDX]);
-        }
+        for (int idx = MIN_BIN_IDX; idx < MAX_BIN_IDX; ++idx) { loc->put(loArray[idx - MIN_BIN_IDX]); }
     }
     void clean(bool all) {
         if (all) {
@@ -1561,10 +1559,12 @@ struct HOThresholdTester {
             // Cache object below sieve threshold and above huge object threshold should be cached
             // (other should be sieved). Unless all cache is dropped. Regular cleanup drops object only below sieve size.
             if (type == NO_CLEANUP && sizeInCacheRange(objectSize)) {
-                REQUIRE_MESSAGE(objectInCacheBin(idx, objectSize), "Object was released from cache, it shouldn't.");
+                REQUIRE_MESSAGE(objectInCacheBin(idx, objectSize),
+                                "Object was released from cache, it shouldn't.");
             } else if (type == REGULAR_CLEANUP && (objectSize >= hugeSize)) {
-                REQUIRE_MESSAGE(objectInCacheBin(idx, objectSize), "Object was released from cache, it shouldn't.");
-            } else { // HARD_CLEANUP
+                REQUIRE_MESSAGE(objectInCacheBin(idx, objectSize),
+                                "Object was released from cache, it shouldn't.");
+            } else {// HARD_CLEANUP
                 REQUIRE_MESSAGE(cacheBinEmpty(idx), "Object is still cached.");
             }
         }
@@ -1572,15 +1572,14 @@ struct HOThresholdTester {
 
 private:
     bool cacheBinEmpty(int idx) {
-        return (loc->hugeCache.bin[idx].cachedSize.load(std::memory_order_relaxed) == 0 && loc->hugeCache.bin[idx].get() == nullptr);
+        return (loc->hugeCache.bin[idx].cachedSize.load(std::memory_order_relaxed) == 0
+                && loc->hugeCache.bin[idx].get() == nullptr);
     }
     bool objectInCacheBin(int idx, size_t size) {
-        return (loc->hugeCache.bin[idx].cachedSize.load(std::memory_order_relaxed) != 0 &&
-            loc->hugeCache.bin[idx].cachedSize.load(std::memory_order_relaxed) % size == 0);
-    }
-    bool sizeInCacheRange(size_t size) {
-        return size <= sieveSize || size >= hugeSize;
+        return (loc->hugeCache.bin[idx].cachedSize.load(std::memory_order_relaxed) != 0
+                && loc->hugeCache.bin[idx].cachedSize.load(std::memory_order_relaxed) % size == 0);
     }
+    bool sizeInCacheRange(size_t size) { return size <= sieveSize || size >= hugeSize; }
     size_t alignedSizeFromIdx(int idx) {
         return rml::internal::LargeObjectCache::alignToBin(hocIdxToSizeFormula(idx));
     }
@@ -1588,19 +1587,19 @@ struct HOThresholdTester {
 
 // TBBMALLOC_SET_HUGE_OBJECT_THRESHOLD value should be set before the test,
 // through scalable API or env variable
-void TestHugeSizeThresholdImpl(LargeObjectCache* loc, size_t hugeSize, bool fullTesting) {
+void TestHugeSizeThresholdImpl(LargeObjectCache *loc, size_t hugeSize, bool fullTesting) {
     HOThresholdTester test = {loc, hugeSize};
     test.populateCache();
     // Check the default sieve value
     test.check(HOThresholdTester::NO_CLEANUP);
 
-    if(fullTesting) {
+    if (fullTesting) {
         // Check that objects above threshold stay in cache after regular cleanup
-        test.clean(/*all*/false);
+        test.clean(/*all*/ false);
         test.check(HOThresholdTester::REGULAR_CLEANUP);
     }
     // Check that all objects dropped from cache after hard cleanup (ignore huge obects threshold)
-    test.clean(/*all*/true);
+    test.clean(/*all*/ true);
     test.check(HOThresholdTester::HARD_CLEANUP);
     // Restore previous settings
     loc->setHugeSizeThreshold(LargeObjectCache::maxHugeSize);
@@ -1613,7 +1612,7 @@ void TestHugeSizeThresholdImpl(LargeObjectCache* loc, size_t hugeSize, bool full
 void TestHugeSizeThreshold() {
     // Clean up if something was allocated before the test and reset cache state
     scalable_allocation_command(TBBMALLOC_CLEAN_ALL_BUFFERS, nullptr);
-    LargeObjectCache* loc = &defaultMemPool->extMemPool.loc;
+    LargeObjectCache *loc = &defaultMemPool->extMemPool.loc;
     // Restore default settings just in case
     loc->setHugeSizeThreshold(LargeObjectCache::maxHugeSize);
     loc->reset();
@@ -1624,7 +1623,7 @@ void TestHugeSizeThreshold() {
     // All objects with sizes after threshold will be released only after the hard cleanup.
 #if !__TBB_WIN8UI_SUPPORT
     // Unit testing for environment variable
-    utils::SetEnv("TBB_MALLOC_SET_HUGE_SIZE_THRESHOLD","67108864");
+    utils::SetEnv("TBB_MALLOC_SET_HUGE_SIZE_THRESHOLD", "67108864");
     // Large object cache reads threshold environment during initialization.
     // Reset the value before the test.
     loc->hugeSizeThreshold = 0;
@@ -1648,24 +1647,24 @@ void TestHugeSizeThreshold() {
 TEST_CASE("Main test case") {
     scalable_allocation_mode(USE_HUGE_PAGES, 0);
 #if !__TBB_WIN8UI_SUPPORT
-    utils::SetEnv("TBB_MALLOC_USE_HUGE_PAGES","yes");
+    utils::SetEnv("TBB_MALLOC_USE_HUGE_PAGES", "yes");
 #endif
     checkNoHugePages();
     // backreference requires that initialization was done
-    if(!isMallocInitialized()) doInitialization();
+    if (!isMallocInitialized()) doInitialization();
     checkNoHugePages();
     // to succeed, leak detection must be the 1st memory-intensive test
     TestBackRef();
-    TestCleanAllBuffers<4*1024>();
-    TestCleanAllBuffers<16*1024>();
+    TestCleanAllBuffers<4 * 1024>();
+    TestCleanAllBuffers<16 * 1024>();
     TestCleanThreadBuffers();
     TestPools();
     TestBackend();
 
 #if MALLOC_CHECK_RECURSION
-    for( int p=MaxThread; p>=MinThread; --p ) {
-        TestStartupAlloc::initBarrier( p );
-        utils::NativeParallelFor( p, TestStartupAlloc() );
+    for (int p = MaxThread; p >= MinThread; --p) {
+        TestStartupAlloc::initBarrier(p);
+        utils::NativeParallelFor(p, TestStartupAlloc());
         REQUIRE_MESSAGE(!firstStartupBlock, "Startup heap memory leak detected");
     }
 #endif
@@ -1709,7 +1708,5 @@ TEST_CASE("Transparent huge pages") {
 
 #if !__TBB_WIN8UI_SUPPORT && defined(_WIN32)
 //! \brief \ref error_guessing
-TEST_CASE("Function replacement log") {
-    TesFunctionReplacementLog();
-}
+TEST_CASE("Function replacement log") { TesFunctionReplacementLog(); }
 #endif
diff --git a/external/tbb/test/tbbmalloc/test_scalable_allocator.cpp b/external/tbb/test/tbbmalloc/test_scalable_allocator.cpp
index f53e1c2e..5d015020 100644
--- a/external/tbb/test/tbbmalloc/test_scalable_allocator.cpp
+++ b/external/tbb/test/tbbmalloc/test_scalable_allocator.cpp
@@ -14,7 +14,6 @@
     limitations under the License.
 */
 
-
 //! \file test_scalable_allocator.cpp
 //! \brief Test for [memory_allocation.scalable_allocator] functionality
 
@@ -26,22 +25,21 @@
 #define _CRT_SECURE_NO_WARNINGS
 #endif
 
-#define __TBB_EXTRA_DEBUG 1 // enables additional checks
+#define __TBB_EXTRA_DEBUG 1// enables additional checks
 #define TBB_PREVIEW_MEMORY_POOL 1
 #define HARNESS_TBBMALLOC_THREAD_SHUTDOWN 1
 
+#include "common/custom_allocators.h"
 #include "common/test.h"
 #include "common/utils.h"
 #include "common/utils_assert.h"
-#include "common/custom_allocators.h"
-
 
 #include "tbb/memory_pool.h"
 #include "tbb/scalable_allocator.h"
 
 // The actual body of the tests
-#include "common/allocator_test_common.h"
 #include "common/allocator_stl_test_common.h"
+#include "common/allocator_test_common.h"
 
 // #include "harness_allocator.h"
 
@@ -50,7 +48,7 @@
 #endif /* _MSC_VER */
 
 typedef StaticCountingAllocator<tbb::memory_pool_allocator<char>> cnt_alloc_t;
-typedef LocalCountingAllocator<std::allocator<char> > cnt_provider_t;
+typedef LocalCountingAllocator<std::allocator<char>> cnt_provider_t;
 
 class MinimalAllocator : cnt_provider_t {
 public:
@@ -58,16 +56,16 @@ class MinimalAllocator : cnt_provider_t {
     MinimalAllocator() {
         // REMARK("%p::ctor\n", this);
     }
-    MinimalAllocator(const MinimalAllocator&s) : cnt_provider_t(s) {
+    MinimalAllocator(const MinimalAllocator &s) : cnt_provider_t(s) {
         // REMARK("%p::ctor(%p)\n", this, &s);
     }
     ~MinimalAllocator() {
         /* REMARK("%p::dtor: alloc=%u/%u free=%u/%u\n", this, unsigned(items_allocated),unsigned(allocations),
             unsigned(items_freed), unsigned(frees) ); */
-        REQUIRE((allocations==frees && items_allocated==items_freed));
-        if( allocations ) { // non-temporal copy
+        REQUIRE((allocations == frees && items_allocated == items_freed));
+        if (allocations) {// non-temporal copy
             // TODO: describe consumption requirements
-            REQUIRE(items_allocated>cnt_alloc_t::items_allocated);
+            REQUIRE(items_allocated > cnt_alloc_t::items_allocated);
         }
     }
     void *allocate(size_t sz) {
@@ -76,7 +74,7 @@ class MinimalAllocator : cnt_provider_t {
         return p;
     }
     void deallocate(void *p, size_t sz) {
-        REQUIRE(allocations>frees);
+        REQUIRE(allocations > frees);
         // REMARK("%p::deallocate(%p, %u)\n", this, p, unsigned(sz));
         cnt_provider_t::deallocate(std::allocator_traits<cnt_provider_t>::pointer(p), sz);
     }
@@ -85,63 +83,57 @@ class MinimalAllocator : cnt_provider_t {
 class NullAllocator {
 public:
     typedef char value_type;
-    NullAllocator() { }
-    NullAllocator(const NullAllocator&) { }
-    ~NullAllocator() { }
+    NullAllocator() {}
+    NullAllocator(const NullAllocator &) {}
+    ~NullAllocator() {}
     void *allocate(size_t) { return nullptr; }
     void deallocate(void *, size_t) { REQUIRE(false); }
 };
 
-void TestZeroSpaceMemoryPool()
-{
+void TestZeroSpaceMemoryPool() {
     tbb::memory_pool<NullAllocator> pool;
-    bool allocated = pool.malloc(16) || pool.malloc(9*1024);
+    bool allocated = pool.malloc(16) || pool.malloc(9 * 1024);
     REQUIRE_MESSAGE(!allocated, "Allocator with no memory must not allocate anything.");
 }
 
 #if !TBB_USE_EXCEPTIONS
 struct FixedPool {
-    void  *buf;
+    void *buf;
     size_t size;
-    bool   used;
+    bool used;
     FixedPool(void *a_buf, size_t a_size) : buf(a_buf), size(a_size), used(false) {}
 };
 
-static void *fixedBufGetMem(intptr_t pool_id, size_t &bytes)
-{
-    if (((FixedPool*)pool_id)->used)
-        return nullptr;
+static void *fixedBufGetMem(intptr_t pool_id, size_t &bytes) {
+    if (((FixedPool *) pool_id)->used) return nullptr;
 
-    ((FixedPool*)pool_id)->used = true;
-    bytes = ((FixedPool*)pool_id)->size;
-    return bytes? ((FixedPool*)pool_id)->buf : nullptr;
+    ((FixedPool *) pool_id)->used = true;
+    bytes = ((FixedPool *) pool_id)->size;
+    return bytes ? ((FixedPool *) pool_id)->buf : nullptr;
 }
 #endif
 
 /* test that pools in small space are either usable or not created
    (i.e., exception raised) */
-void TestSmallFixedSizePool()
-{
+void TestSmallFixedSizePool() {
     char *buf;
     bool allocated = false;
 
-    for (size_t sz = 0; sz < 64*1024; sz = sz? 3*sz : 3) {
-        buf = (char*)malloc(sz);
+    for (size_t sz = 0; sz < 64 * 1024; sz = sz ? 3 * sz : 3) {
+        buf = (char *) malloc(sz);
 #if TBB_USE_EXCEPTIONS
         try {
             tbb::fixed_pool pool(buf, sz);
-/* Check that pool is usable, i.e. such an allocation exists,
+            /* Check that pool is usable, i.e. such an allocation exists,
    that can be fulfilled from the pool. 16B allocation fits in 16KB slabs,
    so it requires at least 16KB. Requirement of 9KB allocation is more modest.
 */
-            allocated = pool.malloc( 16 ) || pool.malloc( 9*1024 );
-        } catch (std::invalid_argument&) {
+            allocated = pool.malloc(16) || pool.malloc(9 * 1024);
+        } catch (std::invalid_argument &) {
             REQUIRE_MESSAGE(!sz, "expect std::invalid_argument for zero-sized pool only");
-        } catch (...) {
-            REQUIRE_MESSAGE(false, "wrong exception type;");
-        }
+        } catch (...) { REQUIRE_MESSAGE(false, "wrong exception type;"); }
 #else
-/* Do not test high-level pool interface because pool ctor emit exception
+        /* Do not test high-level pool interface because pool ctor emit exception
    on creation failure. Instead test same functionality via low-level interface.
    TODO: add support for configuration with disabled exceptions to pools.
 */
@@ -150,25 +142,24 @@ void TestSmallFixedSizePool()
         rml::MemoryPool *pool;
         FixedPool fixedPool(buf, sz);
 
-        rml::MemPoolError ret = pool_create_v1((intptr_t)&fixedPool, &pol, &pool);
+        rml::MemPoolError ret = pool_create_v1((intptr_t) &fixedPool, &pol, &pool);
 
         if (ret == rml::POOL_OK) {
-            allocated = pool_malloc(pool, 16) || pool_malloc(pool, 9*1024);
+            allocated = pool_malloc(pool, 16) || pool_malloc(pool, 9 * 1024);
             pool_destroy(pool);
         } else
-            REQUIRE_MESSAGE(ret == rml::NO_MEMORY, "Expected that pool either valid or have no memory to be created");
+            REQUIRE_MESSAGE(ret == rml::NO_MEMORY,
+                            "Expected that pool either valid or have no memory to be created");
 #endif
         free(buf);
     }
     REQUIRE_MESSAGE(allocated, "Maximal buf size should be enough to create working fixed_pool");
 #if TBB_USE_EXCEPTIONS
     try {
-        tbb::fixed_pool pool(nullptr, 10*1024*1024);
+        tbb::fixed_pool pool(nullptr, 10 * 1024 * 1024);
         REQUIRE_MESSAGE(false, "Useless allocator with no memory must not be created");
-    } catch (std::invalid_argument&) {
-    } catch (...) {
-        REQUIRE_MESSAGE(false, "wrong exception type; expected invalid_argument");
-    }
+    } catch (std::invalid_argument &) {
+    } catch (...) { REQUIRE_MESSAGE(false, "wrong exception type; expected invalid_argument"); }
 #endif
 }
 
@@ -178,49 +169,51 @@ TEST_CASE("Allocator concept") {
 #if _MSC_VER && !__TBBMALLOC_NO_IMPLICIT_LINKAGE && !__TBB_WIN8UI_SUPPORT
 #ifdef _DEBUG
     REQUIRE_MESSAGE((!GetModuleHandle("tbbmalloc.dll") && GetModuleHandle("tbbmalloc_debug.dll")),
-        "test linked with wrong (non-debug) tbbmalloc library");
+                    "test linked with wrong (non-debug) tbbmalloc library");
 #else
     REQUIRE_MESSAGE((!GetModuleHandle("tbbmalloc_debug.dll") && GetModuleHandle("tbbmalloc.dll")),
-        "test linked with wrong (debug) tbbmalloc library");
-#endif // _DEBUG
-#endif // _MSC_VER && !__TBBMALLOC_NO_IMPLICIT_LINKAGE
+                    "test linked with wrong (debug) tbbmalloc library");
+#endif// _DEBUG
+#endif// _MSC_VER && !__TBBMALLOC_NO_IMPLICIT_LINKAGE
     // allocate/deallocate
     TestAllocator<tbb::scalable_allocator<void>>(Concept);
     {
         tbb::memory_pool<tbb::scalable_allocator<int>> pool;
         TestAllocator(Concept, tbb::memory_pool_allocator<void>(pool));
-    }{
-        // tbb::memory_pool<MinimalAllocator> pool;
-        // cnt_alloc_t alloc( tbb::memory_pool_allocator<char>(pool) ); // double parentheses to avoid function declaration
-        // TestAllocator(Concept, alloc);
-    }{
-        static char buf[1024*1024*4];
+    }
+    {
+            // tbb::memory_pool<MinimalAllocator> pool;
+            // cnt_alloc_t alloc( tbb::memory_pool_allocator<char>(pool) ); // double parentheses to avoid function declaration
+            // TestAllocator(Concept, alloc);
+    } {
+        static char buf[1024 * 1024 * 4];
         tbb::fixed_pool pool(buf, sizeof(buf));
         const char *text = "this is a test";// 15 bytes
-        char *p1 = (char*)pool.malloc( 16 );
+        char *p1 = (char *) pool.malloc(16);
         REQUIRE(p1);
         strcpy(p1, text);
-        char *p2 = (char*)pool.realloc( p1, 15 );
-        REQUIRE_MESSAGE( (p2 && !strcmp(p2, text)), "realloc broke memory" );
+        char *p2 = (char *) pool.realloc(p1, 15);
+        REQUIRE_MESSAGE((p2 && !strcmp(p2, text)), "realloc broke memory");
 
-        TestAllocator(Concept, tbb::memory_pool_allocator<void>(pool) );
+        TestAllocator(Concept, tbb::memory_pool_allocator<void>(pool));
 
         // try allocate almost entire buf keeping some reasonable space for internals
-        char *p3 = (char*)pool.realloc( p2, sizeof(buf)-128*1024 );
-        REQUIRE_MESSAGE( p3, "defragmentation failed" );
-        REQUIRE_MESSAGE( !strcmp(p3, text), "realloc broke memory" );
-        for( size_t sz = 10; sz < sizeof(buf); sz *= 2) {
-            REQUIRE( pool.malloc( sz ) );
+        char *p3 = (char *) pool.realloc(p2, sizeof(buf) - 128 * 1024);
+        REQUIRE_MESSAGE(p3, "defragmentation failed");
+        REQUIRE_MESSAGE(!strcmp(p3, text), "realloc broke memory");
+        for (size_t sz = 10; sz < sizeof(buf); sz *= 2) {
+            REQUIRE(pool.malloc(sz));
             pool.recycle();
         }
 
-        TestAllocator(Concept, tbb::memory_pool_allocator<void>(pool) );
-    }{
+        TestAllocator(Concept, tbb::memory_pool_allocator<void>(pool));
+    }
+    {
         // Two nested level allocators case with fixed pool allocator as an underlying layer
         // serving allocRawMem requests for the top level scalable allocator
-        typedef tbb::memory_pool<tbb::memory_pool_allocator<char, tbb::fixed_pool> > NestedPool;
+        typedef tbb::memory_pool<tbb::memory_pool_allocator<char, tbb::fixed_pool>> NestedPool;
 
-        static char buffer[8*1024*1024];
+        static char buffer[8 * 1024 * 1024];
         tbb::fixed_pool fixedPool(buffer, sizeof(buffer));
         // Underlying fixed pool allocator
         tbb::memory_pool_allocator<char, tbb::fixed_pool> fixedPoolAllocator(fixedPool);
@@ -248,50 +241,41 @@ TEST_CASE("Allocator concept") {
 #if TBB_USE_EXCEPTIONS
 //! Testing exception guarantees
 //! \brief \ref requirement
-TEST_CASE("Exceptions") {
-    TestAllocator<tbb::scalable_allocator<void>>(Exceptions);
-}
+TEST_CASE("Exceptions") { TestAllocator<tbb::scalable_allocator<void>>(Exceptions); }
 #endif /* TBB_USE_EXCEPTIONS */
 
 //! Testing allocators thread safety (should not introduce data races)
 //! \brief \ref requirements
-TEST_CASE("Thread safety") {
-    TestAllocator<tbb::scalable_allocator<void>>(ThreadSafety);
-}
+TEST_CASE("Thread safety") { TestAllocator<tbb::scalable_allocator<void>>(ThreadSafety); }
 
 //! Test that pools in small space are either usable or not created (i.e., exception raised)
 //! \brief \ref error_guessing
-TEST_CASE("Small fixed pool") {
-    TestSmallFixedSizePool();
-}
+TEST_CASE("Small fixed pool") { TestSmallFixedSizePool(); }
 
 //! Test that allocator with no memory must not allocate anything.
 //! \brief \ref error_guessing
-TEST_CASE("Zero space pool") {
-    TestZeroSpaceMemoryPool();
-}
+TEST_CASE("Zero space pool") { TestZeroSpaceMemoryPool(); }
 
 #if TBB_ALLOCATOR_TRAITS_BROKEN
 //! Testing allocator traits is broken
 //! \brief \ref error_guessing
 TEST_CASE("Broken allocator concept") {
     TestAllocator<tbb::scalable_allocator<void>>(Broken);
-    
-    tbb::memory_pool<tbb::scalable_allocator<int>> mpool; 
+
+    tbb::memory_pool<tbb::scalable_allocator<int>> mpool;
     TestAllocator<tbb::memory_pool_allocator<void>>(Broken, tbb::memory_pool_allocator<void>(mpool));
 }
 #endif
 
-
 //! Testing allocators compatibility with STL containers
 //! \brief \ref interface
 TEST_CASE("Integration with STL containers") {
-    TestAllocatorWithSTL<tbb::scalable_allocator<void> >();
-    tbb::memory_pool<tbb::scalable_allocator<int> > mpool;
-    TestAllocatorWithSTL(tbb::memory_pool_allocator<void>(mpool) );
-    static char buf[1024*1024*4];
+    TestAllocatorWithSTL<tbb::scalable_allocator<void>>();
+    tbb::memory_pool<tbb::scalable_allocator<int>> mpool;
+    TestAllocatorWithSTL(tbb::memory_pool_allocator<void>(mpool));
+    static char buf[1024 * 1024 * 4];
     tbb::fixed_pool fpool(buf, sizeof(buf));
-    TestAllocatorWithSTL(tbb::memory_pool_allocator<void>(fpool) );
+    TestAllocatorWithSTL(tbb::memory_pool_allocator<void>(fpool));
 }
 
 #if __TBB_CPP17_MEMORY_RESOURCE_PRESENT
@@ -299,12 +283,12 @@ TEST_CASE("Integration with STL containers") {
 //! \brief \ref interface
 TEST_CASE("polymorphic_allocator test") {
     REQUIRE_MESSAGE(!tbb::scalable_memory_resource()->is_equal(*std::pmr::get_default_resource()),
-            "Scalable resource shouldn't be equal to standard resource." );
+                    "Scalable resource shouldn't be equal to standard resource.");
     REQUIRE_MESSAGE(tbb::scalable_memory_resource()->is_equal(*tbb::scalable_memory_resource()),
-            "Memory that was allocated by one scalable resource should be deallocated by any other instance.");
+                    "Memory that was allocated by one scalable resource should be deallocated by any other "
+                    "instance.");
 
     typedef std::pmr::polymorphic_allocator<void> pmr_alloc_t;
     TestAllocatorWithSTL(pmr_alloc_t(tbb::scalable_memory_resource()));
 }
 #endif
-
diff --git a/scripts/update_copyright.sh b/scripts/update_copyright.sh
index 8f4894a0..91c25c0f 100644
--- a/scripts/update_copyright.sh
+++ b/scripts/update_copyright.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 ## ---------------------------------------------------------------------
 ##
-## Copyright (c) 2019 - 2023 by the OpFlow developers
+## Copyright (c) 2019 - 2025 by the OpFlow developers
 ## All rights reserved.
 ##
 ## This file is part of OpFlow.
diff --git a/src/Core/AMR/AMRGen.hpp b/src/Core/AMR/AMRGen.hpp
index 1918ff74..229bd8a8 100644
--- a/src/Core/AMR/AMRGen.hpp
+++ b/src/Core/AMR/AMRGen.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/Core/BC/BCBase.hpp b/src/Core/BC/BCBase.hpp
index 7b0fca8e..3a288ed1 100644
--- a/src/Core/BC/BCBase.hpp
+++ b/src/Core/BC/BCBase.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/src/Core/BC/DircBC.hpp b/src/Core/BC/DircBC.hpp
index 55f6ad1a..6dfb4fbc 100644
--- a/src/Core/BC/DircBC.hpp
+++ b/src/Core/BC/DircBC.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
@@ -29,9 +29,9 @@ OPFLOW_MODULE_EXPORT namespace OpFlow {
         using BCBase<F>::operator=;
         [[nodiscard]] BCType getBCType() const override { return type; }
 
-        [[nodiscard]] virtual std::unique_ptr<BCBase<F>> getFunctorBC(
-                std::function<typename BCBase<F>::elem_type(const typename BCBase<F>::index_type&)> f) const
-                = 0;
+        [[nodiscard]] virtual std::unique_ptr<BCBase<F>>
+        getFunctorBC(std::function<typename BCBase<F>::elem_type(const typename BCBase<F>::index_type&)> f)
+                const = 0;
     };
 
     template <MeshBasedFieldExprType F>
diff --git a/src/Core/BC/InternalBC.hpp b/src/Core/BC/InternalBC.hpp
index 165342ab..6525d20e 100644
--- a/src/Core/BC/InternalBC.hpp
+++ b/src/Core/BC/InternalBC.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/src/Core/BC/LogicalBC.hpp b/src/Core/BC/LogicalBC.hpp
index a0c7edba..f1828462 100644
--- a/src/Core/BC/LogicalBC.hpp
+++ b/src/Core/BC/LogicalBC.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/src/Core/BC/NeumBC.hpp b/src/Core/BC/NeumBC.hpp
index 76e93d36..fa9c7243 100644
--- a/src/Core/BC/NeumBC.hpp
+++ b/src/Core/BC/NeumBC.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
@@ -28,9 +28,9 @@ OPFLOW_MODULE_EXPORT namespace OpFlow {
         using BCBase<F>::operator=;
         [[nodiscard]] BCType getBCType() const override { return type; }
 
-        [[nodiscard]] virtual std::unique_ptr<BCBase<F>> getFunctorBC(
-                std::function<typename BCBase<F>::elem_type(const typename BCBase<F>::index_type&)> f) const
-                = 0;
+        [[nodiscard]] virtual std::unique_ptr<BCBase<F>>
+        getFunctorBC(std::function<typename BCBase<F>::elem_type(const typename BCBase<F>::index_type&)> f)
+                const = 0;
     };
 
     template <MeshBasedFieldExprType F>
diff --git a/src/Core/BC/ProxyBC.hpp b/src/Core/BC/ProxyBC.hpp
index 54d98e67..60976f80 100644
--- a/src/Core/BC/ProxyBC.hpp
+++ b/src/Core/BC/ProxyBC.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow
 //
diff --git a/src/Core/BasicDataTypes.hpp b/src/Core/BasicDataTypes.hpp
index 06491e7d..1358c9a0 100644
--- a/src/Core/BasicDataTypes.hpp
+++ b/src/Core/BasicDataTypes.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/Core/Constants.hpp b/src/Core/Constants.hpp
index bc76f059..0e11281d 100644
--- a/src/Core/Constants.hpp
+++ b/src/Core/Constants.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/Core/Environment.hpp b/src/Core/Environment.hpp
index 53747624..879d8b70 100644
--- a/src/Core/Environment.hpp
+++ b/src/Core/Environment.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
@@ -17,8 +17,8 @@
 #ifdef OPFLOW_WITH_MPI
 #include <mpi.h>
 #endif
-#include <print>
 #include <omp.h>
+#include <print>
 #endif
 #include "Version.hpp"// generated by CMake
 
@@ -52,9 +52,7 @@ OPFLOW_MODULE_EXPORT namespace OpFlow {
 
     inline auto& getGlobalParallelPlan() { return internal::GLOBAL_PARALLELPLAN; }
 
-    inline void setGlobalParallelInfo(const ParallelInfo& info) {
-        internal::GLOBAL_PARALLELINFO = info;
-    }
+    inline void setGlobalParallelInfo(const ParallelInfo& info) { internal::GLOBAL_PARALLELINFO = info; }
 
     inline void setGlobalParallelPlan(const ParallelPlan& plan) {
         internal::GLOBAL_PARALLELPLAN = plan;
@@ -91,9 +89,7 @@ OPFLOW_MODULE_EXPORT namespace OpFlow {
 #endif
     }
 
-    inline void printVersion() {
-        std::print("OpFlow version: {}\n", internal::OPFLOW_VERSION_STRING);
-    }
+    inline void printVersion() { std::print("OpFlow version: {}\n", internal::OPFLOW_VERSION_STRING); }
 
     inline auto getVersionStr() { return std::string {internal::OPFLOW_VERSION_STRING}; }
 }// namespace OpFlow
diff --git a/src/Core/Equation/AMGCLBackend.hpp b/src/Core/Equation/AMGCLBackend.hpp
index d2f4214b..6b04e183 100644
--- a/src/Core/Equation/AMGCLBackend.hpp
+++ b/src/Core/Equation/AMGCLBackend.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/Core/Equation/AMGCLEqnSolveHandler.hpp b/src/Core/Equation/AMGCLEqnSolveHandler.hpp
index 8c962a16..8a68e96b 100644
--- a/src/Core/Equation/AMGCLEqnSolveHandler.hpp
+++ b/src/Core/Equation/AMGCLEqnSolveHandler.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
@@ -52,8 +52,8 @@ OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <typename... Fs, typename... Ts, typename M, typename S>
     struct AMGCLEqnSolveHandler<std::tuple<Fs...>, std::tuple<Ts...>, M, S> : virtual public EqnSolveHandler {
     public:
-        using eqn_holder_type = decltype(makeEqnHolder(std::declval<std::tuple<Fs...>&>(),
-                                                       std::declval<std::tuple<Ts...>&>()));
+        using eqn_holder_type = decltype(
+                makeEqnHolder(std::declval<std::tuple<Fs...>&>(), std::declval<std::tuple<Ts...>&>()));
         using st_holder_type = decltype(makeStencilHolder(std::declval<eqn_holder_type&>()));
         constexpr static int size = sizeof...(Ts);
 
@@ -171,7 +171,7 @@ OPFLOW_MODULE_EXPORT namespace OpFlow {
     };
 
     template <typename S, typename F, typename T, typename M>
-    std::unique_ptr<EqnSolveHandler> makeEqnSolveHandler(F&& f, T&& t, M&& mapper,
+    std::unique_ptr<EqnSolveHandler> makeEqnSolveHandler(F && f, T && t, M && mapper,
                                                          IJSolverParams<S> params = IJSolverParams<S> {}) {
         auto getters = std::forward_as_tuple(OP_PERFECT_FOWD(f));
         auto targets = std::forward_as_tuple(OP_PERFECT_FOWD(t));
@@ -183,9 +183,7 @@ OPFLOW_MODULE_EXPORT namespace OpFlow {
     }
 
     template <typename S>
-    std::unique_ptr<EqnSolveHandler> makeEqnSolveHandler(auto&&... fs)
-        requires(sizeof...(fs) >= 6)
-    {
+    std::unique_ptr<EqnSolveHandler> makeEqnSolveHandler(auto&&... fs) requires(sizeof...(fs) >= 6) {
         auto t = std::forward_as_tuple(OP_PERFECT_FOWD(fs)...);
         auto&& [getters, rest1] = Meta::tuple_split<sizeof...(fs) / 2 - 1>(t);
         auto&& [targets, rest2] = Meta::tuple_split<sizeof...(fs) / 2 - 1>(rest1);
diff --git a/src/Core/Equation/CSRMatrixGenerator.hpp b/src/Core/Equation/CSRMatrixGenerator.hpp
index e7bb5592..f393c1ae 100644
--- a/src/Core/Equation/CSRMatrixGenerator.hpp
+++ b/src/Core/Equation/CSRMatrixGenerator.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/Core/Equation/EqnSolveHandler.hpp b/src/Core/Equation/EqnSolveHandler.hpp
index fc5d4314..025103f1 100644
--- a/src/Core/Equation/EqnSolveHandler.hpp
+++ b/src/Core/Equation/EqnSolveHandler.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/Core/Equation/Equation.hpp b/src/Core/Equation/Equation.hpp
index 8fb18de3..52d32104 100644
--- a/src/Core/Equation/Equation.hpp
+++ b/src/Core/Equation/Equation.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/src/Core/Equation/EquationHolder.hpp b/src/Core/Equation/EquationHolder.hpp
index ae42382d..54d4ec4e 100644
--- a/src/Core/Equation/EquationHolder.hpp
+++ b/src/Core/Equation/EquationHolder.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
@@ -99,7 +99,7 @@ OPFLOW_MODULE_EXPORT namespace OpFlow {
     };
 
     template <typename... Fs, typename... Ts, std::size_t... Ints>
-    auto makeEqnHolder_impl(std::tuple<Fs...>&& getters, std::tuple<Ts&...>&& targets,
+    auto makeEqnHolder_impl(std::tuple<Fs...> && getters, std::tuple<Ts&...> && targets,
                             std::index_sequence<Ints...>) {
         if constexpr (sizeof...(Ts) == 1)
             return EqnHolder<EquationSet<decltype(std::declval<Meta::RealType<Fs>>()(
@@ -113,7 +113,7 @@ OPFLOW_MODULE_EXPORT namespace OpFlow {
                              TargetSet<Meta::RealType<Ts>...>>(getters, targets);
     }
     template <typename... Fs, typename... Ts, std::size_t... Ints>
-    auto makeEqnHolder_impl(std::tuple<Fs...>& getters, std::tuple<Ts&...>& targets,
+    auto makeEqnHolder_impl(std::tuple<Fs...> & getters, std::tuple<Ts&...> & targets,
                             std::index_sequence<Ints...>) {
         if constexpr (sizeof...(Ts) == 1)
             return EqnHolder<EquationSet<decltype(std::declval<Meta::RealType<Fs>>()(
@@ -128,12 +128,12 @@ OPFLOW_MODULE_EXPORT namespace OpFlow {
     }
 
     template <typename... Fs, typename... Ts>
-    auto makeEqnHolder(std::tuple<Fs...>& getters, std::tuple<Ts&...>& targets) {
+    auto makeEqnHolder(std::tuple<Fs...> & getters, std::tuple<Ts&...> & targets) {
         return makeEqnHolder_impl(OP_PERFECT_FOWD(getters), OP_PERFECT_FOWD(targets),
                                   std::make_index_sequence<sizeof...(Fs)>());
     }
     template <typename... Fs, typename... Ts>
-    auto makeEqnHolder(std::tuple<Fs...>&& getters, std::tuple<Ts&...>&& targets) {
+    auto makeEqnHolder(std::tuple<Fs...> && getters, std::tuple<Ts&...> && targets) {
         return makeEqnHolder_impl(OP_PERFECT_FOWD(getters), OP_PERFECT_FOWD(targets),
                                   std::make_index_sequence<sizeof...(Fs)>());
     }
diff --git a/src/Core/Equation/HYPREEqnSolveHandler.hpp b/src/Core/Equation/HYPREEqnSolveHandler.hpp
index fb0b7be1..ce129253 100644
--- a/src/Core/Equation/HYPREEqnSolveHandler.hpp
+++ b/src/Core/Equation/HYPREEqnSolveHandler.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
@@ -42,7 +42,7 @@ OPFLOW_MODULE_EXPORT namespace OpFlow {
     struct HYPREEqnSolveHandler;
 
     template <typename F, typename T, typename S>
-    std::unique_ptr<EqnSolveHandler> makeEqnSolveHandler(F&& f, T&& t, S&& s) {
+    std::unique_ptr<EqnSolveHandler> makeEqnSolveHandler(F && f, T && t, S && s) {
         return std::make_unique<HYPREEqnSolveHandler<F, Meta::RealType<T>, Meta::RealType<S>>>(
                 OP_PERFECT_FOWD(f), OP_PERFECT_FOWD(t), OP_PERFECT_FOWD(s));
     }
diff --git a/src/Core/Equation/StencilHolder.hpp b/src/Core/Equation/StencilHolder.hpp
index 6e012659..349f3145 100644
--- a/src/Core/Equation/StencilHolder.hpp
+++ b/src/Core/Equation/StencilHolder.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
@@ -78,7 +78,7 @@ OPFLOW_MODULE_EXPORT namespace OpFlow {
     };
 
     template <typename... Es, typename... Ts>
-    auto makeStencilHolder(EqnHolder<EquationSet<Es...>, TargetSet<Ts...>>& eqnHolder) {
+    auto makeStencilHolder(EqnHolder<EquationSet<Es...>, TargetSet<Ts...>> & eqnHolder) {
         return StencilHolder<EquationSet<Es...>, TargetSet<Ts...>>(eqnHolder);
     }
 }// namespace OpFlow
diff --git a/src/Core/Equation/UnifiedSolve.hpp b/src/Core/Equation/UnifiedSolve.hpp
index 0260a180..c46ec2d1 100644
--- a/src/Core/Equation/UnifiedSolve.hpp
+++ b/src/Core/Equation/UnifiedSolve.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
@@ -61,7 +61,7 @@ OPFLOW_MODULE_EXPORT namespace OpFlow {
     }
 
     template <typename S, typename F, FieldExprType T>
-    auto Solve(F&& func, T&& target, auto&& indexer, IJSolverParams<S> params = IJSolverParams<S> {}) {
+    auto Solve(F && func, T && target, auto&& indexer, IJSolverParams<S> params = IJSolverParams<S> {}) {
         auto handler = makeEqnSolveHandler(func, target, indexer, params);
         return handler->solve();
     }
diff --git a/src/Core/Expr/Expr.hpp b/src/Core/Expr/Expr.hpp
index ef979ee2..ec068695 100644
--- a/src/Core/Expr/Expr.hpp
+++ b/src/Core/Expr/Expr.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
@@ -51,78 +51,67 @@ OPFLOW_MODULE_EXPORT namespace OpFlow {
         }
 
         template <typename Other>
-            requires ExprType<Other> || Meta::Numerical<Other>
-        auto& operator=(Other&& other) {
+                requires ExprType<Other> || Meta::Numerical<Other> auto& operator=(Other&& other) {
             this->derived().template assignImpl_final<BasicArithOp::Eq>(std::forward<Other>(other));
             return *this;
         }
 
         template <typename Other>
-            requires ExprType<Other> || Meta::Numerical<Other>
-        auto& operator+=(Other&& other) {
+                requires ExprType<Other> || Meta::Numerical<Other> auto& operator+=(Other&& other) {
             this->derived().template assignImpl_final<BasicArithOp::Add>(OP_PERFECT_FOWD(other));
             return *this;
         }
 
         template <typename Other>
-            requires ExprType<Other> || Meta::Numerical<Other>
-        auto& operator-=(Other&& other) {
+                requires ExprType<Other> || Meta::Numerical<Other> auto& operator-=(Other&& other) {
             this->derived().template assignImpl_final<BasicArithOp::Minus>(OP_PERFECT_FOWD(other));
             return *this;
         }
 
         template <typename Other>
-            requires ExprType<Other> || Meta::Numerical<Other>
-        auto& operator*=(Other&& other) {
+                requires ExprType<Other> || Meta::Numerical<Other> auto& operator*=(Other&& other) {
             this->derived().template assignImpl_final<BasicArithOp::Mul>(OP_PERFECT_FOWD(other));
             return *this;
         }
 
         template <typename Other>
-            requires ExprType<Other> || Meta::Numerical<Other>
-        auto& operator/=(Other&& other) {
+                requires ExprType<Other> || Meta::Numerical<Other> auto& operator/=(Other&& other) {
             this->derived().template assignImpl_final<BasicArithOp::Div>(OP_PERFECT_FOWD(other));
             return *this;
         }
 
         template <typename Other>
-            requires ExprType<Other>
-        auto& operator%=(Other&& other) {
+        requires ExprType<Other> auto& operator%=(Other&& other) {
             this->derived().template assignImpl_final<BasicArithOp::Mod>(OP_PERFECT_FOWD(other));
             return *this;
         }
 
         template <typename Other>
-            requires ExprType<Other>
-        auto& operator&=(Other&& other) {
+        requires ExprType<Other> auto& operator&=(Other&& other) {
             this->derived().template assignImpl_final<BasicArithOp::And>(OP_PERFECT_FOWD(other));
             return *this;
         }
 
         template <typename Other>
-            requires ExprType<Other>
-        auto& operator|=(Other&& other) {
+        requires ExprType<Other> auto& operator|=(Other&& other) {
             this->derived().template assignImpl_final<BasicArithOp::Or>(OP_PERFECT_FOWD(other));
             return *this;
         }
 
         template <typename Other>
-            requires ExprType<Other>
-        auto& operator^=(Other&& other) {
+        requires ExprType<Other> auto& operator^=(Other&& other) {
             this->derived().template assignImpl_final<BasicArithOp::Xor>(OP_PERFECT_FOWD(other));
             return *this;
         }
 
         template <typename Other>
-            requires ExprType<Other>
-        auto& operator<<=(Other&& other) {
+        requires ExprType<Other> auto& operator<<=(Other&& other) {
             this->derived().template assignImpl_final<BasicArithOp::LShift>(OP_PERFECT_FOWD(other));
             return *this;
         }
 
         template <typename Other>
-            requires ExprType<Other>
-        auto& operator>>=(Other&& other) {
+        requires ExprType<Other> auto& operator>>=(Other&& other) {
             this->derived().template assignImpl_final<BasicArithOp::RShift>(OP_PERFECT_FOWD(other));
             return *this;
         }
@@ -175,78 +164,67 @@ OPFLOW_MODULE_EXPORT namespace OpFlow {
         }
 
         template <typename Other>
-            requires ExprType<Other> || Meta::Numerical<Other>
-        auto& operator=(Other&& other) {
+                requires ExprType<Other> || Meta::Numerical<Other> auto& operator=(Other&& other) {
             this->derived().template assignImpl_final<BasicArithOp::Eq>(std::forward<Other>(other));
             return *this;
         }
 
         template <typename Other>
-            requires ExprType<Other> || Meta::Numerical<Other>
-        auto& operator+=(Other&& other) {
+                requires ExprType<Other> || Meta::Numerical<Other> auto& operator+=(Other&& other) {
             this->derived().template assignImpl_final<BasicArithOp::Add>(OP_PERFECT_FOWD(other));
             return *this;
         }
 
         template <typename Other>
-            requires ExprType<Other> || Meta::Numerical<Other>
-        auto& operator-=(Other&& other) {
+                requires ExprType<Other> || Meta::Numerical<Other> auto& operator-=(Other&& other) {
             this->derived().template assignImpl_final<BasicArithOp::Minus>(OP_PERFECT_FOWD(other));
             return *this;
         }
 
         template <typename Other>
-            requires ExprType<Other> || Meta::Numerical<Other>
-        auto& operator*=(Other&& other) {
+                requires ExprType<Other> || Meta::Numerical<Other> auto& operator*=(Other&& other) {
             this->derived().template assignImpl_final<BasicArithOp::Mul>(OP_PERFECT_FOWD(other));
             return *this;
         }
 
         template <typename Other>
-            requires ExprType<Other> || Meta::Numerical<Other>
-        auto& operator/=(Other&& other) {
+                requires ExprType<Other> || Meta::Numerical<Other> auto& operator/=(Other&& other) {
             this->derived().template assignImpl_final<BasicArithOp::Div>(OP_PERFECT_FOWD(other));
             return *this;
         }
 
         template <typename Other>
-            requires ExprType<Other>
-        auto& operator%=(Other&& other) {
+        requires ExprType<Other> auto& operator%=(Other&& other) {
             this->derived().template assignImpl_final<BasicArithOp::Mod>(OP_PERFECT_FOWD(other));
             return *this;
         }
 
         template <typename Other>
-            requires ExprType<Other>
-        auto& operator&=(Other&& other) {
+        requires ExprType<Other> auto& operator&=(Other&& other) {
             this->derived().template assignImpl_final<BasicArithOp::And>(OP_PERFECT_FOWD(other));
             return *this;
         }
 
         template <typename Other>
-            requires ExprType<Other>
-        auto& operator|=(Other&& other) {
+        requires ExprType<Other> auto& operator|=(Other&& other) {
             this->derived().template assignImpl_final<BasicArithOp::Or>(OP_PERFECT_FOWD(other));
             return *this;
         }
 
         template <typename Other>
-            requires ExprType<Other>
-        auto& operator^=(Other&& other) {
+        requires ExprType<Other> auto& operator^=(Other&& other) {
             this->derived().template assignImpl_final<BasicArithOp::Xor>(OP_PERFECT_FOWD(other));
             return *this;
         }
 
         template <typename Other>
-            requires ExprType<Other>
-        auto& operator<<=(Other&& other) {
+        requires ExprType<Other> auto& operator<<=(Other&& other) {
             this->derived().template assignImpl_final<BasicArithOp::LShift>(OP_PERFECT_FOWD(other));
             return *this;
         }
 
         template <typename Other>
-            requires ExprType<Other>
-        auto& operator>>=(Other&& other) {
+        requires ExprType<Other> auto& operator>>=(Other&& other) {
             this->derived().template assignImpl_final<BasicArithOp::RShift>(OP_PERFECT_FOWD(other));
             return *this;
         }
diff --git a/src/Core/Expr/ExprTrait.hpp b/src/Core/Expr/ExprTrait.hpp
index 32ed887d..2ddc2430 100644
--- a/src/Core/Expr/ExprTrait.hpp
+++ b/src/Core/Expr/ExprTrait.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/src/Core/Expr/Expression.hpp b/src/Core/Expr/Expression.hpp
index a2c03c84..9c327b56 100644
--- a/src/Core/Expr/Expression.hpp
+++ b/src/Core/Expr/Expression.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
@@ -1235,7 +1235,7 @@ OPFLOW_MODULE_EXPORT namespace OpFlow {
 
     // general exprs
     template <typename Op, typename... Args>
-    requires(sizeof...(Args) > 0) auto makeExpression(Args&&... args) {
+    requires(sizeof...(Args) > 0) auto makeExpression(Args && ... args) {
         return Expression<Op, Meta::RealType<Args>...>(std::forward<Args>(args)...);
     }
 
diff --git a/src/Core/Expr/ScalarExpr.hpp b/src/Core/Expr/ScalarExpr.hpp
index 61299f03..f42c6f22 100644
--- a/src/Core/Expr/ScalarExpr.hpp
+++ b/src/Core/Expr/ScalarExpr.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
@@ -52,8 +52,7 @@ OPFLOW_MODULE_EXPORT namespace OpFlow {
         static constexpr bool isConcrete() { return true; }
         void prepareImpl_final() const {}
         template <typename O>
-            requires(!std::same_as<O, ScalarExpr>)
-        bool containsImpl_final(const O&) const {
+        requires(!std::same_as<O, ScalarExpr>) bool containsImpl_final(const O&) const {
             return false;
         }
 
diff --git a/src/Core/Expr/ScalarExprTrait.hpp b/src/Core/Expr/ScalarExprTrait.hpp
index 4c2c3f08..7aa55ce0 100644
--- a/src/Core/Expr/ScalarExprTrait.hpp
+++ b/src/Core/Expr/ScalarExprTrait.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/src/Core/Field/Analytical/AnalyticalFieldExpr.hpp b/src/Core/Field/Analytical/AnalyticalFieldExpr.hpp
index 974089cf..3be9ce22 100644
--- a/src/Core/Field/Analytical/AnalyticalFieldExpr.hpp
+++ b/src/Core/Field/Analytical/AnalyticalFieldExpr.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/src/Core/Field/FieldExpr.hpp b/src/Core/Field/FieldExpr.hpp
index f1e2d79c..5c9ca1e3 100644
--- a/src/Core/Field/FieldExpr.hpp
+++ b/src/Core/Field/FieldExpr.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/src/Core/Field/FieldExprTrait.hpp b/src/Core/Field/FieldExprTrait.hpp
index e45cb250..03be3fcd 100644
--- a/src/Core/Field/FieldExprTrait.hpp
+++ b/src/Core/Field/FieldExprTrait.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/src/Core/Field/MeshBased/MeshBasedFieldExpr.hpp b/src/Core/Field/MeshBased/MeshBasedFieldExpr.hpp
index f4b8d862..32af36b0 100644
--- a/src/Core/Field/MeshBased/MeshBasedFieldExpr.hpp
+++ b/src/Core/Field/MeshBased/MeshBasedFieldExpr.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/src/Core/Field/MeshBased/MeshBasedFieldExprTrait.hpp b/src/Core/Field/MeshBased/MeshBasedFieldExprTrait.hpp
index d6623428..69713e92 100644
--- a/src/Core/Field/MeshBased/MeshBasedFieldExprTrait.hpp
+++ b/src/Core/Field/MeshBased/MeshBasedFieldExprTrait.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/src/Core/Field/MeshBased/SemiStructured/CartAMRField.hpp b/src/Core/Field/MeshBased/SemiStructured/CartAMRField.hpp
index 82843581..7e48510e 100644
--- a/src/Core/Field/MeshBased/SemiStructured/CartAMRField.hpp
+++ b/src/Core/Field/MeshBased/SemiStructured/CartAMRField.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/Core/Field/MeshBased/SemiStructured/CartAMRFieldExpr.hpp b/src/Core/Field/MeshBased/SemiStructured/CartAMRFieldExpr.hpp
index c789d6bc..cccce868 100644
--- a/src/Core/Field/MeshBased/SemiStructured/CartAMRFieldExpr.hpp
+++ b/src/Core/Field/MeshBased/SemiStructured/CartAMRFieldExpr.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/Core/Field/MeshBased/SemiStructured/CartAMRFieldExprTrait.hpp b/src/Core/Field/MeshBased/SemiStructured/CartAMRFieldExprTrait.hpp
index 593f6396..f7ca6117 100644
--- a/src/Core/Field/MeshBased/SemiStructured/CartAMRFieldExprTrait.hpp
+++ b/src/Core/Field/MeshBased/SemiStructured/CartAMRFieldExprTrait.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/Core/Field/MeshBased/SemiStructured/CartAMRFieldTrait.hpp b/src/Core/Field/MeshBased/SemiStructured/CartAMRFieldTrait.hpp
index 5a21b2dd..e1854ba7 100644
--- a/src/Core/Field/MeshBased/SemiStructured/CartAMRFieldTrait.hpp
+++ b/src/Core/Field/MeshBased/SemiStructured/CartAMRFieldTrait.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/Core/Field/MeshBased/SemiStructured/SemiStructuredFieldExpr.hpp b/src/Core/Field/MeshBased/SemiStructured/SemiStructuredFieldExpr.hpp
index a6eafb01..43c9aa79 100644
--- a/src/Core/Field/MeshBased/SemiStructured/SemiStructuredFieldExpr.hpp
+++ b/src/Core/Field/MeshBased/SemiStructured/SemiStructuredFieldExpr.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/src/Core/Field/MeshBased/SemiStructured/SemiStructuredFieldExprTrait.hpp b/src/Core/Field/MeshBased/SemiStructured/SemiStructuredFieldExprTrait.hpp
index 053d8832..c98aff07 100644
--- a/src/Core/Field/MeshBased/SemiStructured/SemiStructuredFieldExprTrait.hpp
+++ b/src/Core/Field/MeshBased/SemiStructured/SemiStructuredFieldExprTrait.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/src/Core/Field/MeshBased/StencilField.hpp b/src/Core/Field/MeshBased/StencilField.hpp
index 7b81b390..869fcc3f 100644
--- a/src/Core/Field/MeshBased/StencilField.hpp
+++ b/src/Core/Field/MeshBased/StencilField.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
@@ -124,15 +124,16 @@ OPFLOW_MODULE_EXPORT namespace OpFlow {
             OP_ASSERT_MSG(base, "base ptr of stencil field is nullptr");
             // inner case, return a stencil pad
             if (DS::inRange(this->assignableRange, index)) [[likely]] {
-                auto ret = typename internal::ExprTrait<StencilField>::elem_type {0};
-                // note: here solution is pinned at base->assignableRange.start
-                // rather than this->assignableRange.start; This is because
-                // for periodic case the assignableRange of this will be changed
-                // to logicalRange for HYPRE solver to get exact offset.
-                if (!(pinned && index == index_type(base->assignableRange.start))) [[likely]]
-                    ret.pad[colored_index_type {index, color}] = 1.0;
-                return ret;
-            } else if (!DS::inRange(this->logicalRange, index)) {// corner case, error & abort
+                    auto ret = typename internal::ExprTrait<StencilField>::elem_type {0};
+                    // note: here solution is pinned at base->assignableRange.start
+                    // rather than this->assignableRange.start; This is because
+                    // for periodic case the assignableRange of this will be changed
+                    // to logicalRange for HYPRE solver to get exact offset.
+                    if (!(pinned && index == index_type(base->assignableRange.start)))
+                        [[likely]] ret.pad[colored_index_type {index, color}] = 1.0;
+                    return ret;
+                }
+            else if (!DS::inRange(this->logicalRange, index)) {// corner case, error & abort
                 OP_ERROR("Index {} out of range {}", index, this->logicalRange.toString());
                 OP_ABORT;
             } else {// needs boundary condition info to continue
@@ -350,8 +351,7 @@ OPFLOW_MODULE_EXPORT namespace OpFlow {
         void prepareImpl_final() const {}
 
         template <typename Other>
-            requires(!std::same_as<Other, StencilField>)
-        bool containsImpl_final(const Other& o) const {
+        requires(!std::same_as<Other, StencilField>) bool containsImpl_final(const Other& o) const {
             return false;
         }
         bool containsImpl_final(const StencilField& o) const { return this == &o; }
@@ -535,8 +535,7 @@ OPFLOW_MODULE_EXPORT namespace OpFlow {
         const auto& blocked(const index_type& i) const { return block_mark[i.l][i.p][i - offset[i.l][i.p]]; }
 
         template <typename Other>
-            requires(!std::same_as<Other, StencilField>)
-        bool containsImpl_final(const Other& o) const {
+        requires(!std::same_as<Other, StencilField>) bool containsImpl_final(const Other& o) const {
             return false;
         }
         bool containsImpl_final(const StencilField& o) const { return this == &o; }
diff --git a/src/Core/Field/MeshBased/StencilFieldTrait.hpp b/src/Core/Field/MeshBased/StencilFieldTrait.hpp
index 81d27cae..4e9e77dc 100644
--- a/src/Core/Field/MeshBased/StencilFieldTrait.hpp
+++ b/src/Core/Field/MeshBased/StencilFieldTrait.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/src/Core/Field/MeshBased/Structured/CartesianField.hpp b/src/Core/Field/MeshBased/Structured/CartesianField.hpp
index 0e5ca16d..606a9b2b 100644
--- a/src/Core/Field/MeshBased/Structured/CartesianField.hpp
+++ b/src/Core/Field/MeshBased/Structured/CartesianField.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
@@ -81,8 +81,8 @@ OPFLOW_MODULE_EXPORT namespace OpFlow {
         }
 
         template <typename T>
-            requires std::same_as<T, CartesianField>
-        void resplitWithStrategy(AbstractSplitStrategy<T>* strategy) {
+        requires std::same_as<T, CartesianField> void
+        resplitWithStrategy(AbstractSplitStrategy<T>* strategy) {
             // this method only acts when MPI is enabled
 #if defined(OPFLOW_WITH_MPI) && defined(OPFLOW_DISTRIBUTE_MODEL_MPI)
             if (!strategy) return;
@@ -367,10 +367,14 @@ OPFLOW_MODULE_EXPORT namespace OpFlow {
             // the latter padding op pads the outer range of the former padding zone
             std::array<int, dim> start, end;
             if constexpr (requires(D v) {
-                              { v + v } -> std::same_as<D>;
-                              { v - v } -> std::same_as<D>;
-                              { v * 1.0 } -> std::same_as<D>;
-                              { v / 1.0 } -> std::same_as<D>;
+                              { v + v }
+                              ->std::same_as<D>;
+                              { v - v }
+                              ->std::same_as<D>;
+                              { v * 1.0 }
+                              ->std::same_as<D>;
+                              { v / 1.0 }
+                              ->std::same_as<D>;
                           }) {
                 for (int i = 0; i < dim; ++i) {
                     // lower side
@@ -782,8 +786,7 @@ OPFLOW_MODULE_EXPORT namespace OpFlow {
         }
 
         template <typename Other>
-            requires(!std::same_as<Other, CartesianField>)
-        bool containsImpl_final(const Other& o) const {
+        requires(!std::same_as<Other, CartesianField>) bool containsImpl_final(const Other& o) const {
             return false;
         }
 
@@ -866,11 +869,10 @@ OPFLOW_MODULE_EXPORT namespace OpFlow {
 
         // set a functor bc
         template <typename F>
-            requires requires(F f) {
-                {
-                    f(std::declval<typename internal::ExprTrait<CartesianField<D, M, C>>::index_type>())
-                } -> std::convertible_to<typename internal::ExprTrait<CartesianField<D, M, C>>::elem_type>;
-            }
+        requires requires(F f) {
+            { f(std::declval<typename internal::ExprTrait<CartesianField<D, M, C>>::index_type>()) }
+            ->std::convertible_to<typename internal::ExprTrait<CartesianField<D, M, C>>::elem_type>;
+        }
         auto& setBC(int d, DimPos pos, BCType type, F&& functor) {
             OP_ASSERT(d < dim);
             auto& targetBC = pos == DimPos::start ? f.bc[d].start : f.bc[d].end;
diff --git a/src/Core/Field/MeshBased/Structured/CartesianFieldExpr.hpp b/src/Core/Field/MeshBased/Structured/CartesianFieldExpr.hpp
index c7a8b21d..e9f3e470 100644
--- a/src/Core/Field/MeshBased/Structured/CartesianFieldExpr.hpp
+++ b/src/Core/Field/MeshBased/Structured/CartesianFieldExpr.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/src/Core/Field/MeshBased/Structured/CartesianFieldExprTrait.hpp b/src/Core/Field/MeshBased/Structured/CartesianFieldExprTrait.hpp
index b7d03c25..e0379101 100644
--- a/src/Core/Field/MeshBased/Structured/CartesianFieldExprTrait.hpp
+++ b/src/Core/Field/MeshBased/Structured/CartesianFieldExprTrait.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/src/Core/Field/MeshBased/Structured/CartesianFieldTrait.hpp b/src/Core/Field/MeshBased/Structured/CartesianFieldTrait.hpp
index dcb8b76e..dc21c1a1 100644
--- a/src/Core/Field/MeshBased/Structured/CartesianFieldTrait.hpp
+++ b/src/Core/Field/MeshBased/Structured/CartesianFieldTrait.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/src/Core/Field/MeshBased/Structured/StructuredFieldExpr.hpp b/src/Core/Field/MeshBased/Structured/StructuredFieldExpr.hpp
index c6b85392..794b9dc9 100644
--- a/src/Core/Field/MeshBased/Structured/StructuredFieldExpr.hpp
+++ b/src/Core/Field/MeshBased/Structured/StructuredFieldExpr.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/src/Core/Field/MeshBased/Structured/StructuredFieldExprTrait.hpp b/src/Core/Field/MeshBased/Structured/StructuredFieldExprTrait.hpp
index 4b1f060e..68cdfb5a 100644
--- a/src/Core/Field/MeshBased/Structured/StructuredFieldExprTrait.hpp
+++ b/src/Core/Field/MeshBased/Structured/StructuredFieldExprTrait.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/src/Core/Field/MeshBased/UnStructured/UnStructMBFieldExpr.hpp b/src/Core/Field/MeshBased/UnStructured/UnStructMBFieldExpr.hpp
index d89aaea7..d0947f2e 100644
--- a/src/Core/Field/MeshBased/UnStructured/UnStructMBFieldExpr.hpp
+++ b/src/Core/Field/MeshBased/UnStructured/UnStructMBFieldExpr.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/src/Core/Field/ParticleBased/ParticleFieldExpr.hpp b/src/Core/Field/ParticleBased/ParticleFieldExpr.hpp
index 19257f40..466ed243 100644
--- a/src/Core/Field/ParticleBased/ParticleFieldExpr.hpp
+++ b/src/Core/Field/ParticleBased/ParticleFieldExpr.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/src/Core/Interfaces/MDIndexable.hpp b/src/Core/Interfaces/MDIndexable.hpp
index 36913e61..c16c0067 100644
--- a/src/Core/Interfaces/MDIndexable.hpp
+++ b/src/Core/Interfaces/MDIndexable.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/src/Core/Interfaces/Serializable.hpp b/src/Core/Interfaces/Serializable.hpp
index 182384c5..8fb25b6f 100644
--- a/src/Core/Interfaces/Serializable.hpp
+++ b/src/Core/Interfaces/Serializable.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
@@ -30,9 +30,10 @@ OPFLOW_MODULE_EXPORT namespace OpFlow {
 
     template <typename T>
     concept Serializable = std::is_base_of_v<SerializableObj, T> || requires(T t) {
-        { t.serialize() } -> std::same_as<std::vector<std::byte>>;
-        { t.deserialize(std::vector<std::byte> {}) };
-        { t.deserialize(std::declval<const std::byte*>(), std::size_t(0)) };
+        { t.serialize() }
+        ->std::same_as<std::vector<std::byte>>;
+        {t.deserialize(std::vector<std::byte> {})};
+        {t.deserialize(std::declval<const std::byte*>(), std::size_t(0))};
     };
 }// namespace OpFlow
 
diff --git a/src/Core/Interfaces/Stringifiable.hpp b/src/Core/Interfaces/Stringifiable.hpp
index 1114fce5..d5e0dfb6 100644
--- a/src/Core/Interfaces/Stringifiable.hpp
+++ b/src/Core/Interfaces/Stringifiable.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
@@ -38,8 +38,8 @@ OPFLOW_MODULE_EXPORT namespace OpFlow {
 
 OPFLOW_MODULE_EXPORT
 template <typename T>
-    requires std::derived_from<T, OpFlow::StringifiableObj>
-struct std::formatter<T> : std::formatter<std::string> {
+requires std::derived_from<T, OpFlow::StringifiableObj> struct std::formatter<T>
+    : std::formatter<std::string> {
     auto format(const OpFlow::StringifiableObj& a, auto& ctx) const {
         return std::formatter<std::string>::format(a.toString(), ctx);
     }
diff --git a/src/Core/Loops/FieldAssigner.hpp b/src/Core/Loops/FieldAssigner.hpp
index 75dcb73e..8109969c 100644
--- a/src/Core/Loops/FieldAssigner.hpp
+++ b/src/Core/Loops/FieldAssigner.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/src/Core/Loops/RangeFor.hpp b/src/Core/Loops/RangeFor.hpp
index 2aaa8d40..647f064c 100644
--- a/src/Core/Loops/RangeFor.hpp
+++ b/src/Core/Loops/RangeFor.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
@@ -126,8 +126,8 @@ OPFLOW_MODULE_EXPORT namespace OpFlow {
         auto local_result = rangeReduce(range, op, func);
         std::vector<decltype(local_result)> results(getWorkerCount());
         results[getWorkerId()] = local_result;
-        static_assert(std::is_standard_layout_v<decltype(local_result)>
-                              && std::is_trivial_v<decltype(local_result)>,
+        static_assert(std::is_standard_layout_v<decltype(
+                                      local_result)> && std::is_trivial_v<decltype(local_result)>,
                       "local_result must be pod type");
         MPI_Allgather(MPI_IN_PLACE, sizeof(decltype(local_result)), MPI_BYTE, results.data(),
                       sizeof(decltype(local_result)), MPI_BYTE, MPI_COMM_WORLD);
diff --git a/src/Core/Loops/StructFor.hpp b/src/Core/Loops/StructFor.hpp
index 5223f7ff..0f4c2ab9 100644
--- a/src/Core/Loops/StructFor.hpp
+++ b/src/Core/Loops/StructFor.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
@@ -21,13 +21,13 @@
 
 OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <FieldExprType E, typename Func>
-    requires std::invocable<Func, DS::MDIndex<internal::FieldExprTrait<E>::dim>> auto structFor(E& expr,
-                                                                                                Func&& func) {
+    requires std::invocable<Func, DS::MDIndex<internal::FieldExprTrait<E>::dim>> auto structFor(
+            E & expr, Func && func) {
         return structFor(expr, expr.accessibleRange, std::forward<Func>(func));
     }
 
     template <FieldExprType E, typename R, typename Func>
-    Func structFor(E& expr, R&& range, Func&& func) {
+    Func structFor(E & expr, R && range, Func && func) {
         constexpr auto dim = internal::FieldExprTrait<E>::dim;
         std::array<int, dim> dims = expr.accessibleRange.getExtends();
         auto g_range = expr.accessibleRange;
@@ -36,14 +36,14 @@ OPFLOW_MODULE_EXPORT namespace OpFlow {
     }
 
     template <FieldExprType E, typename Func>
-    requires std::invocable<Func, DS::MDIndex<internal::FieldExprTrait<E>::dim>> auto
-    structFor_s(E& expr, Func&& func) {
+    requires std::invocable<Func, DS::MDIndex<internal::FieldExprTrait<E>::dim>> auto structFor_s(
+            E & expr, Func && func) {
         return structFor_s(expr, expr.accessibleRange, std::forward<Func>(func));
     }
 
     template <FieldExprType E, typename R, typename Func>
-    requires std::invocable<Func, DS::MDIndex<internal::FieldExprTrait<E>::dim>> auto
-    structFor_s(E& expr, R&& range, Func&& func) {
+    requires std::invocable<Func, DS::MDIndex<internal::FieldExprTrait<E>::dim>> auto structFor_s(
+            E & expr, R && range, Func && func) {
         constexpr auto dim = internal::FieldExprTrait<E>::dim;
         std::array<int, dim> dims = expr.accessibleRange.getExtends();
         auto g_range = expr.accessibleRange;
diff --git a/src/Core/Loops/StructReduce.hpp b/src/Core/Loops/StructReduce.hpp
index de9038b8..950e04e6 100644
--- a/src/Core/Loops/StructReduce.hpp
+++ b/src/Core/Loops/StructReduce.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
@@ -24,13 +24,13 @@
 
 OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <FieldExprType E, typename Func, typename ReOp>
-    auto structReduce(E& expr, ReOp&& op, Func&& func) {
+    auto structReduce(E & expr, ReOp && op, Func && func) {
         return structReduce(expr, expr.props.accessibleRange, std::forward<ReOp>(op),
                             std::forward<Func>(func));
     }
 
     template <FieldExprType E, typename R, typename Func, typename ReOp>
-    auto structReduce(E& expr, R&& range, ReOp&& op, Func&& func) {
+    auto structReduce(E & expr, R && range, ReOp && op, Func && func) {
         constexpr auto dim = internal::FieldExprTrait<E>::dim;
         std::array<int, dim> dims = expr.props.accessibleRange.getExtends();
         auto g_range = expr.props.accessibleRange;
diff --git a/src/Core/Macros.hpp b/src/Core/Macros.hpp
index 0848d10b..2f3c7b4f 100644
--- a/src/Core/Macros.hpp
+++ b/src/Core/Macros.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
@@ -62,24 +62,24 @@
 #ifndef OPFLOW_INSIDE_MODULE
 #include <mpi.h>
 #endif
-OPFLOW_MODULE_EXPORT namespace OpFlow {
-    inline static int getWorkerId(MPI_Comm comm);
-}
+OPFLOW_MODULE_EXPORT namespace OpFlow { inline static int getWorkerId(MPI_Comm comm); }
 #define SPD_AUGMENTED_LOG(X, ...)                                                                            \
     do {                                                                                                     \
-        if consteval {                                                                                       \
-            spdlog::X(std::format("[{}:{}@{}][Rank{}] ", __FILENAME__, __FUNCTION__, __LINE__,               \
-                                  OpFlow::getWorkerId(MPI_COMM_WORLD))                                       \
-                      + std::format(__VA_ARGS__));                                                           \
-        }                                                                                                    \
+        if                                                                                                   \
+            consteval {                                                                                      \
+                spdlog::X(std::format("[{}:{}@{}][Rank{}] ", __FILENAME__, __FUNCTION__, __LINE__,           \
+                                      OpFlow::getWorkerId(MPI_COMM_WORLD))                                   \
+                          + std::format(__VA_ARGS__));                                                       \
+            }                                                                                                \
     } while (0)
 #else
 #define SPD_AUGMENTED_LOG(X, ...)                                                                            \
     do {                                                                                                     \
-        if consteval {                                                                                       \
-            spdlog::X(std::format("[{}:{}@{}] ", __FILENAME__, __FUNCTION__, __LINE__)                       \
-                      + std::format(__VA_ARGS__));                                                           \
-        }                                                                                                    \
+        if                                                                                                   \
+            consteval {                                                                                      \
+                spdlog::X(std::format("[{}:{}@{}] ", __FILENAME__, __FUNCTION__, __LINE__)                   \
+                          + std::format(__VA_ARGS__));                                                       \
+            }                                                                                                \
     } while (0)
 #endif
 
@@ -118,9 +118,7 @@ OPFLOW_MODULE_EXPORT namespace OpFlow {
 #if !defined(NDEBUG) && defined(OPFLOW_ENABLE_STACK_TRACE)
 #include "Utils/StackTracer.hpp"
 // global stack tracer
-OPFLOW_MODULE_EXPORT namespace OpFlow {
-    inline static Utils::StackTracer stackTracer;
-}
+OPFLOW_MODULE_EXPORT namespace OpFlow { inline static Utils::StackTracer stackTracer; }
 
 #define OP_STACK_PUSH(...)                                                                                   \
     do {                                                                                                     \
diff --git a/src/Core/Mesh/MeshBase.hpp b/src/Core/Mesh/MeshBase.hpp
index 1641e09f..ff801406 100644
--- a/src/Core/Mesh/MeshBase.hpp
+++ b/src/Core/Mesh/MeshBase.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/src/Core/Mesh/MeshTrait.hpp b/src/Core/Mesh/MeshTrait.hpp
index 9f9cea8a..90f85e0f 100644
--- a/src/Core/Mesh/MeshTrait.hpp
+++ b/src/Core/Mesh/MeshTrait.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/src/Core/Mesh/SemiStructured/CartesianAMRMesh.hpp b/src/Core/Mesh/SemiStructured/CartesianAMRMesh.hpp
index d6b0a19b..35d911fc 100644
--- a/src/Core/Mesh/SemiStructured/CartesianAMRMesh.hpp
+++ b/src/Core/Mesh/SemiStructured/CartesianAMRMesh.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/Core/Mesh/SemiStructured/CartesianAMRMeshBase.hpp b/src/Core/Mesh/SemiStructured/CartesianAMRMeshBase.hpp
index ce15b52f..422d49e2 100644
--- a/src/Core/Mesh/SemiStructured/CartesianAMRMeshBase.hpp
+++ b/src/Core/Mesh/SemiStructured/CartesianAMRMeshBase.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/Core/Mesh/SemiStructured/CartesianAMRMeshTrait.hpp b/src/Core/Mesh/SemiStructured/CartesianAMRMeshTrait.hpp
index d3367cf3..d5b4dd6a 100644
--- a/src/Core/Mesh/SemiStructured/CartesianAMRMeshTrait.hpp
+++ b/src/Core/Mesh/SemiStructured/CartesianAMRMeshTrait.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/Core/Mesh/SemiStructured/CartesianAMRMeshView.hpp b/src/Core/Mesh/SemiStructured/CartesianAMRMeshView.hpp
index 4e4ed1cb..aa987cbc 100644
--- a/src/Core/Mesh/SemiStructured/CartesianAMRMeshView.hpp
+++ b/src/Core/Mesh/SemiStructured/CartesianAMRMeshView.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
@@ -22,8 +22,9 @@
 
 OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <typename T>
-        requires CartesianAMRMeshType<T> && Meta::isTemplateInstance<CartesianAMRMesh, T>::value
-    struct CartesianAMRMeshView : CartesianAMRMeshBase<CartesianAMRMeshView<T>> {
+    requires CartesianAMRMeshType<T>&&
+            Meta::isTemplateInstance<CartesianAMRMesh, T>::value struct CartesianAMRMeshView
+        : CartesianAMRMeshBase<CartesianAMRMeshView<T>> {
     private:
         std::add_pointer_t<typename std::add_const<T>::type> base = nullptr;
         static constexpr auto dim = internal::MeshTrait<T>::dim;
diff --git a/src/Core/Mesh/SemiStructured/CartesianAMRMeshViewTrait.hpp b/src/Core/Mesh/SemiStructured/CartesianAMRMeshViewTrait.hpp
index 607bd5fe..9d0df674 100644
--- a/src/Core/Mesh/SemiStructured/CartesianAMRMeshViewTrait.hpp
+++ b/src/Core/Mesh/SemiStructured/CartesianAMRMeshViewTrait.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/Core/Mesh/SemiStructured/SemiStructuredMesh.hpp b/src/Core/Mesh/SemiStructured/SemiStructuredMesh.hpp
index ba582b91..c83910b7 100644
--- a/src/Core/Mesh/SemiStructured/SemiStructuredMesh.hpp
+++ b/src/Core/Mesh/SemiStructured/SemiStructuredMesh.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/Core/Mesh/SemiStructured/SemiStructuredMeshTrait.hpp b/src/Core/Mesh/SemiStructured/SemiStructuredMeshTrait.hpp
index 3f77acfb..6004906f 100644
--- a/src/Core/Mesh/SemiStructured/SemiStructuredMeshTrait.hpp
+++ b/src/Core/Mesh/SemiStructured/SemiStructuredMeshTrait.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/Core/Mesh/Structured/CartesianMesh.hpp b/src/Core/Mesh/Structured/CartesianMesh.hpp
index daf4c167..d564084e 100644
--- a/src/Core/Mesh/Structured/CartesianMesh.hpp
+++ b/src/Core/Mesh/Structured/CartesianMesh.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
@@ -74,8 +74,8 @@ OPFLOW_MODULE_EXPORT namespace OpFlow {
         }
 
         template <typename Other>
-            requires(internal::MeshTrait<Other>::dim == dim)
-        auto& operator=(const CartesianMeshView<Other>& view) {
+        requires(internal::MeshTrait<Other>::dim == dim) auto&
+        operator=(const CartesianMeshView<Other>& view) {
             _dims = view.getDims();
             _range = view.getRange();
             _ext_range = view.getExtRange();
diff --git a/src/Core/Mesh/Structured/CartesianMeshBase.hpp b/src/Core/Mesh/Structured/CartesianMeshBase.hpp
index 0eb15174..a2db7a6c 100644
--- a/src/Core/Mesh/Structured/CartesianMeshBase.hpp
+++ b/src/Core/Mesh/Structured/CartesianMeshBase.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/src/Core/Mesh/Structured/CartesianMeshTrait.hpp b/src/Core/Mesh/Structured/CartesianMeshTrait.hpp
index 3536a530..ec3d9788 100644
--- a/src/Core/Mesh/Structured/CartesianMeshTrait.hpp
+++ b/src/Core/Mesh/Structured/CartesianMeshTrait.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/src/Core/Mesh/Structured/CartesianMeshView.hpp b/src/Core/Mesh/Structured/CartesianMeshView.hpp
index e5ebff5d..4453d656 100644
--- a/src/Core/Mesh/Structured/CartesianMeshView.hpp
+++ b/src/Core/Mesh/Structured/CartesianMeshView.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
@@ -21,8 +21,8 @@
 
 OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <typename T>
-        requires CartesianMeshType<T> && Meta::isTemplateInstance<CartesianMesh, T>::value
-    struct CartesianMeshView : CartesianMeshBase<CartesianMeshView<T>> {
+    requires CartesianMeshType<T>&& Meta::isTemplateInstance<CartesianMesh, T>::value struct CartesianMeshView
+        : CartesianMeshBase<CartesianMeshView<T>> {
     private:
         std::add_pointer_t<typename std::add_const<T>::type> base = nullptr;
         static constexpr auto dim = internal::MeshTrait<T>::dim;
diff --git a/src/Core/Mesh/Structured/CartesianMeshViewTrait.hpp b/src/Core/Mesh/Structured/CartesianMeshViewTrait.hpp
index 7d616134..a11d88d1 100644
--- a/src/Core/Mesh/Structured/CartesianMeshViewTrait.hpp
+++ b/src/Core/Mesh/Structured/CartesianMeshViewTrait.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/src/Core/Mesh/Structured/StructuredMeshBase.hpp b/src/Core/Mesh/Structured/StructuredMeshBase.hpp
index 21dfdfda..cd50eabc 100644
--- a/src/Core/Mesh/Structured/StructuredMeshBase.hpp
+++ b/src/Core/Mesh/Structured/StructuredMeshBase.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/src/Core/Mesh/Structured/StructuredMeshTrait.hpp b/src/Core/Mesh/Structured/StructuredMeshTrait.hpp
index be73a288..0da4398d 100644
--- a/src/Core/Mesh/Structured/StructuredMeshTrait.hpp
+++ b/src/Core/Mesh/Structured/StructuredMeshTrait.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/src/Core/Meta.hpp b/src/Core/Meta.hpp
index 1158083b..06850b6e 100644
--- a/src/Core/Meta.hpp
+++ b/src/Core/Meta.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
@@ -101,8 +101,10 @@ OPFLOW_MODULE_EXPORT namespace OpFlow::Meta {
 
     template <typename T>
     concept StdRatio = requires {
-        { T::num } -> std::convertible_to<int>;
-        { T::den } -> std::convertible_to<int>;
+        { T::num }
+        ->std::convertible_to<int>;
+        { T::den }
+        ->std::convertible_to<int>;
         typename T::type;
     };
 
@@ -112,7 +114,9 @@ OPFLOW_MODULE_EXPORT namespace OpFlow::Meta {
     };
 
     template <typename T>
-    concept BracketIndexable = requires(T t) { t[0]; };
+    concept BracketIndexable = requires(T t) {
+        t[0];
+    };
 
     template <bool b>
     struct bool_type : std::false_type {};
@@ -124,12 +128,12 @@ OPFLOW_MODULE_EXPORT namespace OpFlow::Meta {
     struct TypeName;
 
     template <typename F, int... Is>
-    void static_for(F&& func, std::integer_sequence<int, Is...>) {
+    void static_for(F && func, std::integer_sequence<int, Is...>) {
         (func(int_<Is> {}), ...);
     }
 
     template <std::size_t N, typename F>
-    void static_for(F&& func) {
+    void static_for(F && func) {
         static_for(std::forward<F>(func), std::make_integer_sequence<int, N>());
     }
 
@@ -145,16 +149,16 @@ OPFLOW_MODULE_EXPORT namespace OpFlow::Meta {
     struct make_integer_seq_impl;
 
     template <typename T, T start, T end, T step>
-        requires(step > 0 && start < end) || (step<0 && start> end)
-    struct make_integer_seq_impl<T, start, end, step> {
+            requires(step > 0 && start < end)
+            || (step<0 && start> end) struct make_integer_seq_impl<T, start, end, step> {
         using type = typename integer_seq_cat<
                 T, std::integer_sequence<T, start>,
                 typename make_integer_seq_impl<T, start + step, end, step>::type>::type;
     };
 
     template <typename T, T start, T end, T step>
-        requires(step > 0 && start >= end) || (step < 0 && start <= end)
-    struct make_integer_seq_impl<T, start, end, step> {
+            requires(step > 0 && start >= end)
+            || (step < 0 && start <= end) struct make_integer_seq_impl<T, start, end, step> {
         using type = std::integer_sequence<T>;
     };
 
@@ -162,55 +166,55 @@ OPFLOW_MODULE_EXPORT namespace OpFlow::Meta {
     using make_integer_sequence = typename make_integer_seq_impl<T, start, end, step>::type;
 
     template <int start, int end, typename F>
-    void static_for(F&& func) {
+    void static_for(F && func) {
         static_for(std::forward<F>(func), make_integer_sequence<int, start, end>());
     }
 
     template <int start, int end, int step, typename F>
-    void static_for(F&& func) {
+    void static_for(F && func) {
         static_for(std::forward<F>(func), make_integer_sequence<int, start, end, step>());
     }
 
     template <std::size_t... Ints, std::size_t... IntsRemain, typename... Ts>
     auto tuple_split_impl(std::index_sequence<Ints...>, std::index_sequence<IntsRemain...>,
-                          std::tuple<Ts...>& t) {
+                          std::tuple<Ts...> & t) {
         return std::make_tuple(std::forward_as_tuple(std::get<Ints>(t)...),
                                std::forward_as_tuple(std::get<IntsRemain>(t)...));
     }
 
     template <std::size_t Nsplit, typename... Ts>
-    inline auto tuple_split(std::tuple<Ts...>& t) {
+    inline auto tuple_split(std::tuple<Ts...> & t) {
         static_assert(Nsplit < sizeof...(Ts));
         return tuple_split_impl(std::make_index_sequence<Nsplit>(),
                                 make_integer_sequence<std::size_t, Nsplit, sizeof...(Ts)>(), t);
     }
 
     template <typename F, typename G, typename... Ts>
-    constexpr decltype(auto) custom_invoke(F&& func, G&& getter, Ts&&... ts) {
+    constexpr decltype(auto) custom_invoke(F && func, G && getter, Ts && ... ts) {
         return std::invoke(std::forward<F>(func), getter(std::forward<Ts>(ts))...);
     }
 
     template <typename F, typename G, typename Tuple, std::size_t... Ints>
-    constexpr decltype(auto) custom_apply_impl(F&& func, G&& getter, Tuple&& tuple,
+    constexpr decltype(auto) custom_apply_impl(F && func, G && getter, Tuple && tuple,
                                                std::index_sequence<Ints...>) {
         return custom_invoke(std::forward<F>(func), std::forward<G>(getter),
                              std::get<Ints>(std::forward<Tuple>(tuple))...);
     }
 
     template <typename F, typename G, typename Tuple>
-    constexpr decltype(auto) custom_apply(F&& func, G&& getter, Tuple&& tuple) {
+    constexpr decltype(auto) custom_apply(F && func, G && getter, Tuple && tuple) {
         return custom_apply_impl(std::forward<F>(func), std::forward<G>(getter), std::forward<Tuple>(tuple),
                                  std::make_index_sequence<std::tuple_size_v<std::remove_cvref_t<Tuple>>>());
     }
 
     template <typename F, typename G, typename C, std::size_t... Ints>
-    constexpr decltype(auto) custom_apply_container_impl(F&& func, G&& getter, C&& container,
+    constexpr decltype(auto) custom_apply_container_impl(F && func, G && getter, C && container,
                                                          std::index_sequence<Ints...>) {
         return std::invoke(std::forward<F>(func), getter(container[Ints], Meta::int_<Ints>())...);
     }
 
     template <std::size_t n, typename F, typename G, typename C>
-    constexpr decltype(auto) custom_apply_container(F&& func, G&& getter, C&& container) {
+    constexpr decltype(auto) custom_apply_container(F && func, G && getter, C && container) {
         return custom_apply_container_impl(std::forward<F>(func), std::forward<G>(getter),
                                            std::forward<C>(container), std::make_index_sequence<n>());
     }
diff --git a/src/Core/Operator/Arithmetic/AMDS.hpp b/src/Core/Operator/Arithmetic/AMDS.hpp
index dfeda638..5369efba 100644
--- a/src/Core/Operator/Arithmetic/AMDS.hpp
+++ b/src/Core/Operator/Arithmetic/AMDS.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/src/Core/Operator/Arithmetic/MinMax.hpp b/src/Core/Operator/Arithmetic/MinMax.hpp
index 34154f23..6655334a 100644
--- a/src/Core/Operator/Arithmetic/MinMax.hpp
+++ b/src/Core/Operator/Arithmetic/MinMax.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/src/Core/Operator/Conditional.hpp b/src/Core/Operator/Conditional.hpp
index 3f17be6f..fc633523 100644
--- a/src/Core/Operator/Conditional.hpp
+++ b/src/Core/Operator/Conditional.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
@@ -43,8 +43,8 @@ OPFLOW_MODULE_EXPORT namespace OpFlow {
         static void prepare(const Expression<CondOp, C, T1, T2>& expr) {
             expr.initPropsFrom(expr.arg2);
             expr.name = std::format("{} ? {} : {}", expr.arg1.name, expr.arg2.name, expr.arg3.name);
-            if constexpr (MeshBasedFieldExprType<T1> && MeshBasedFieldExprType<T2>
-                          && MeshBasedFieldExprType<C>) {
+            if constexpr (MeshBasedFieldExprType<
+                                  T1> && MeshBasedFieldExprType<T2> && MeshBasedFieldExprType<C>) {
                 OP_ASSERT(expr.arg1.mesh == expr.arg2.mesh);
                 OP_ASSERT(expr.arg1.mesh == expr.arg3.mesh);
                 if constexpr (StructuredFieldExprType<T1> || SemiStructuredFieldExprType<T1>) {
@@ -178,7 +178,7 @@ OPFLOW_MODULE_EXPORT namespace OpFlow {
     }// namespace internal
 
     template <GeneralExprType C, GeneralExprType T, GeneralExprType U>
-    auto conditional(C&& c, T&& t, U&& u) {
+    auto conditional(C && c, T && t, U && u) {
         return makeExpression<CondOp>(Meta::forward_unless_scalar(OP_PERFECT_FOWD(c)),
                                       Meta::forward_unless_scalar(OP_PERFECT_FOWD(t)),
                                       Meta::forward_unless_scalar(OP_PERFECT_FOWD(u)));
diff --git a/src/Core/Operator/Convolution/Convolution.hpp b/src/Core/Operator/Convolution/Convolution.hpp
index 8c8dee73..3b7104aa 100644
--- a/src/Core/Operator/Convolution/Convolution.hpp
+++ b/src/Core/Operator/Convolution/Convolution.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
@@ -44,9 +44,8 @@ OPFLOW_MODULE_EXPORT namespace OpFlow {
         }
 
         template <StructuredFieldExprType E, typename T, typename I>
-            requires(internal::ExprTrait<E>::dim == d)
-        OPFLOW_STRONG_INLINE static auto
-        eval(const E& e, const ScalarExpr<DS::FixedSizeTensor<T, ns...>>& kernel, I&& i) {
+        requires(internal::ExprTrait<E>::dim == d) OPFLOW_STRONG_INLINE
+                static auto eval(const E& e, const ScalarExpr<DS::FixedSizeTensor<T, ns...>>& kernel, I&& i) {
             DS::Range<d> range;
             for (auto j = 0; j < d; ++j) {
                 range.start[j] = i[j] - dims[j] / 2;
@@ -63,9 +62,8 @@ OPFLOW_MODULE_EXPORT namespace OpFlow {
         }
 
         template <CartAMRFieldExprType E, typename T, typename I>
-            requires(internal::ExprTrait<E>::dim == d)
-        OPFLOW_STRONG_INLINE static auto
-        eval(const E& e, const ScalarExpr<DS::FixedSizeTensor<T, ns...>>& kernel, I&& i) {
+        requires(internal::ExprTrait<E>::dim == d) OPFLOW_STRONG_INLINE
+                static auto eval(const E& e, const ScalarExpr<DS::FixedSizeTensor<T, ns...>>& kernel, I&& i) {
             DS::LevelRange<d> range;
             for (auto j = 0; j < d; ++j) {
                 range.start[j] = i[j] - dims[j] / 2;
@@ -84,9 +82,8 @@ OPFLOW_MODULE_EXPORT namespace OpFlow {
         }
 
         template <StructuredFieldExprType E, typename T>
-            requires(internal::ExprTrait<E>::dim == d)
-        static void
-        prepare(const Expression<Convolution, E, ScalarExpr<DS::FixedSizeTensor<T, ns...>>>& expr) {
+        requires(internal::ExprTrait<E>::dim == d) static void prepare(
+                const Expression<Convolution, E, ScalarExpr<DS::FixedSizeTensor<T, ns...>>>& expr) {
             expr.initPropsFrom(expr.arg1);
 
             // name
@@ -105,9 +102,8 @@ OPFLOW_MODULE_EXPORT namespace OpFlow {
         }
 
         template <CartAMRFieldExprType E, typename T>
-            requires(internal::ExprTrait<E>::dim == d)
-        static void
-        prepare(const Expression<Convolution, E, ScalarExpr<DS::FixedSizeTensor<T, ns...>>>& expr) {
+        requires(internal::ExprTrait<E>::dim == d) static void prepare(
+                const Expression<Convolution, E, ScalarExpr<DS::FixedSizeTensor<T, ns...>>>& expr) {
             expr.initPropsFrom(expr.arg1);
 
             // name
@@ -166,8 +162,7 @@ OPFLOW_MODULE_EXPORT namespace OpFlow {
     }// namespace internal
 
     template <std::integral auto... ns, typename E, typename D>
-        requires StructuredFieldExprType<E> || CartAMRFieldExprType<E>
-    auto conv(E&& expr, const DS::FixedSizeTensor<D, ns...>& kernel) {
+            requires StructuredFieldExprType<E> || CartAMRFieldExprType<E> auto conv(E && expr, const DS::FixedSizeTensor<D, ns...>& kernel) {
         static_assert(((ns % 2 == 1) && ...), "Only odd sized conv kernel is allowed.");
         return makeExpression<Convolution<ns...>>(expr, ScalarExpr(kernel));
     }
diff --git a/src/Core/Operator/FDMOperators/D1FirstOrderBiasedDownwind.hpp b/src/Core/Operator/FDMOperators/D1FirstOrderBiasedDownwind.hpp
index 1fb2b2ef..230ef277 100644
--- a/src/Core/Operator/FDMOperators/D1FirstOrderBiasedDownwind.hpp
+++ b/src/Core/Operator/FDMOperators/D1FirstOrderBiasedDownwind.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/src/Core/Operator/FDMOperators/D1FirstOrderBiasedUpwind.hpp b/src/Core/Operator/FDMOperators/D1FirstOrderBiasedUpwind.hpp
index 3df32bd8..115f9342 100644
--- a/src/Core/Operator/FDMOperators/D1FirstOrderBiasedUpwind.hpp
+++ b/src/Core/Operator/FDMOperators/D1FirstOrderBiasedUpwind.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/src/Core/Operator/FDMOperators/D1FirstOrderCentered.hpp b/src/Core/Operator/FDMOperators/D1FirstOrderCentered.hpp
index afe6aadc..55ae00c0 100644
--- a/src/Core/Operator/FDMOperators/D1FirstOrderCentered.hpp
+++ b/src/Core/Operator/FDMOperators/D1FirstOrderCentered.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/src/Core/Operator/FDMOperators/D1WENO53Downwind.hpp b/src/Core/Operator/FDMOperators/D1WENO53Downwind.hpp
index 4546dade..847022a8 100644
--- a/src/Core/Operator/FDMOperators/D1WENO53Downwind.hpp
+++ b/src/Core/Operator/FDMOperators/D1WENO53Downwind.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/Core/Operator/FDMOperators/D1WENO53Upwind.hpp b/src/Core/Operator/FDMOperators/D1WENO53Upwind.hpp
index d3df6276..fbf4fe05 100644
--- a/src/Core/Operator/FDMOperators/D1WENO53Upwind.hpp
+++ b/src/Core/Operator/FDMOperators/D1WENO53Upwind.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/Core/Operator/FDMOperators/D2SecondOrderCentered.hpp b/src/Core/Operator/FDMOperators/D2SecondOrderCentered.hpp
index cc5430d2..d550ee34 100644
--- a/src/Core/Operator/FDMOperators/D2SecondOrderCentered.hpp
+++ b/src/Core/Operator/FDMOperators/D2SecondOrderCentered.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/src/Core/Operator/FDMOperators/DiffsInterface.hpp b/src/Core/Operator/FDMOperators/DiffsInterface.hpp
index d822fab0..3166e867 100644
--- a/src/Core/Operator/FDMOperators/DiffsInterface.hpp
+++ b/src/Core/Operator/FDMOperators/DiffsInterface.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/src/Core/Operator/IdentityOp.hpp b/src/Core/Operator/IdentityOp.hpp
index 8dbe9f4b..c3505e0f 100644
--- a/src/Core/Operator/IdentityOp.hpp
+++ b/src/Core/Operator/IdentityOp.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
@@ -25,8 +25,7 @@ OPFLOW_MODULE_EXPORT namespace OpFlow {
         constexpr static auto bc_width = 0;
 
         template <typename E>
-            requires FieldExprType<E> || ScalarExprType<E>
-        OPFLOW_STRONG_INLINE static auto eval(const E& e, auto&& i) {
+                requires FieldExprType<E> || ScalarExprType<E> OPFLOW_STRONG_INLINE static auto eval(const E& e, auto&& i) {
             return e.evalAt(OP_PERFECT_FOWD(i));
         }
 
diff --git a/src/Core/Operator/Interpolator/D1FluxLimiter.hpp b/src/Core/Operator/Interpolator/D1FluxLimiter.hpp
index 3b58ed8a..9f53344b 100644
--- a/src/Core/Operator/Interpolator/D1FluxLimiter.hpp
+++ b/src/Core/Operator/Interpolator/D1FluxLimiter.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
@@ -23,17 +23,20 @@
 OPFLOW_MODULE_EXPORT namespace OpFlow {
     template <typename K>
     concept FluxLimiterKernel = requires(double r) {
-        { K::eval(r) } -> std::same_as<double>;
+        { K::eval(r) }
+        ->std::same_as<double>;
     };
 
     template <typename K>
     concept LinearFluxLimiterKernel
-            = FluxLimiterKernel<K> && requires(DS::StencilPad<DS::MDIndex<2>> pad, double r) {
-                  // should take slop_u & slop_f in a type only support + and * to a number
-                  { K::eval(pad, pad) } -> std::same_as<DS::StencilPad<DS::MDIndex<2>>>;
-                  // should take normal separate slops instead of ratio
-                  { K::eval(r, r) } -> std::same_as<double>;
-              };
+            = FluxLimiterKernel<K>&& requires(DS::StencilPad<DS::MDIndex<2>> pad, double r) {
+        // should take slop_u & slop_f in a type only support + and * to a number
+        { K::eval(pad, pad) }
+        ->std::same_as<DS::StencilPad<DS::MDIndex<2>>>;
+        // should take normal separate slops instead of ratio
+        { K::eval(r, r) }
+        ->std::same_as<double>;
+    };
 
     namespace internal {
         template <FluxLimiterKernel Kernel, std::size_t d, IntpDirection dir>
diff --git a/src/Core/Operator/Interpolator/D1FluxLimiterBasedIntpOp.hpp b/src/Core/Operator/Interpolator/D1FluxLimiterBasedIntpOp.hpp
index 269c4475..5e84dfdd 100644
--- a/src/Core/Operator/Interpolator/D1FluxLimiterBasedIntpOp.hpp
+++ b/src/Core/Operator/Interpolator/D1FluxLimiterBasedIntpOp.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/src/Core/Operator/Interpolator/D1Linear.hpp b/src/Core/Operator/Interpolator/D1Linear.hpp
index 2288b060..3ace5f80 100644
--- a/src/Core/Operator/Interpolator/D1Linear.hpp
+++ b/src/Core/Operator/Interpolator/D1Linear.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/Core/Operator/Interpolator/FluxLimiterKernels.hpp b/src/Core/Operator/Interpolator/FluxLimiterKernels.hpp
index 2e612563..85699dd5 100644
--- a/src/Core/Operator/Interpolator/FluxLimiterKernels.hpp
+++ b/src/Core/Operator/Interpolator/FluxLimiterKernels.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/src/Core/Operator/Interpolator/IntpInterface.hpp b/src/Core/Operator/Interpolator/IntpInterface.hpp
index f771bdb2..8e37ac35 100644
--- a/src/Core/Operator/Interpolator/IntpInterface.hpp
+++ b/src/Core/Operator/Interpolator/IntpInterface.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/Core/Operator/Logical/Boolean.hpp b/src/Core/Operator/Logical/Boolean.hpp
index 3fa25e86..f6cbb0fd 100644
--- a/src/Core/Operator/Logical/Boolean.hpp
+++ b/src/Core/Operator/Logical/Boolean.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/src/Core/Operator/Logical/Classify.hpp b/src/Core/Operator/Logical/Classify.hpp
index d524e889..6b3d588a 100644
--- a/src/Core/Operator/Logical/Classify.hpp
+++ b/src/Core/Operator/Logical/Classify.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/Core/Operator/Logical/Compare.hpp b/src/Core/Operator/Logical/Compare.hpp
index fe5d93cd..ec4d4908 100644
--- a/src/Core/Operator/Logical/Compare.hpp
+++ b/src/Core/Operator/Logical/Compare.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/src/Core/Operator/Operator.hpp b/src/Core/Operator/Operator.hpp
index 72809685..fc0edd8b 100644
--- a/src/Core/Operator/Operator.hpp
+++ b/src/Core/Operator/Operator.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/src/Core/Operator/PerElemOpAdaptor.hpp b/src/Core/Operator/PerElemOpAdaptor.hpp
index 20b1aa9c..e0ea9aeb 100644
--- a/src/Core/Operator/PerElemOpAdaptor.hpp
+++ b/src/Core/Operator/PerElemOpAdaptor.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/src/Core/Parallel/AbstractSplitStrategy.hpp b/src/Core/Parallel/AbstractSplitStrategy.hpp
index ecd7b735..28835c53 100644
--- a/src/Core/Parallel/AbstractSplitStrategy.hpp
+++ b/src/Core/Parallel/AbstractSplitStrategy.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/Core/Parallel/EvenSplitStrategy.hpp b/src/Core/Parallel/EvenSplitStrategy.hpp
index 9a219a9f..ef4533b0 100644
--- a/src/Core/Parallel/EvenSplitStrategy.hpp
+++ b/src/Core/Parallel/EvenSplitStrategy.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/Core/Parallel/ManualSplitStrategy.hpp b/src/Core/Parallel/ManualSplitStrategy.hpp
index 4fad7f66..5bae5f24 100644
--- a/src/Core/Parallel/ManualSplitStrategy.hpp
+++ b/src/Core/Parallel/ManualSplitStrategy.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/Core/Parallel/ParallelInfo.hpp b/src/Core/Parallel/ParallelInfo.hpp
index 4f69449e..f3dc2660 100644
--- a/src/Core/Parallel/ParallelInfo.hpp
+++ b/src/Core/Parallel/ParallelInfo.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/Core/Parallel/ParallelPlan.hpp b/src/Core/Parallel/ParallelPlan.hpp
index a4bba135..e6175f84 100644
--- a/src/Core/Parallel/ParallelPlan.hpp
+++ b/src/Core/Parallel/ParallelPlan.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/src/Core/Parallel/ParallelType.hpp b/src/Core/Parallel/ParallelType.hpp
index 8e5a080b..5508f783 100644
--- a/src/Core/Parallel/ParallelType.hpp
+++ b/src/Core/Parallel/ParallelType.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/Core/Parallel/ParticleGuidedSplitStrategy.hpp b/src/Core/Parallel/ParticleGuidedSplitStrategy.hpp
index d120a1f6..7425cafb 100644
--- a/src/Core/Parallel/ParticleGuidedSplitStrategy.hpp
+++ b/src/Core/Parallel/ParticleGuidedSplitStrategy.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/Core/Solvers/IJ/IJSolver.hpp b/src/Core/Solvers/IJ/IJSolver.hpp
index f0eea80c..61a256ac 100644
--- a/src/Core/Solvers/IJ/IJSolver.hpp
+++ b/src/Core/Solvers/IJ/IJSolver.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/Core/Solvers/SemiStruct/SemiStructSolver.hpp b/src/Core/Solvers/SemiStruct/SemiStructSolver.hpp
index b3efe930..199344a8 100644
--- a/src/Core/Solvers/SemiStruct/SemiStructSolver.hpp
+++ b/src/Core/Solvers/SemiStruct/SemiStructSolver.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/Core/Solvers/SemiStruct/SemiStructSolverFAC.hpp b/src/Core/Solvers/SemiStruct/SemiStructSolverFAC.hpp
index 4c54bdf1..677f130e 100644
--- a/src/Core/Solvers/SemiStruct/SemiStructSolverFAC.hpp
+++ b/src/Core/Solvers/SemiStruct/SemiStructSolverFAC.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/Core/Solvers/SemiStruct/SemiStructSolverNone.hpp b/src/Core/Solvers/SemiStruct/SemiStructSolverNone.hpp
index 8c5e5038..42fa03e4 100644
--- a/src/Core/Solvers/SemiStruct/SemiStructSolverNone.hpp
+++ b/src/Core/Solvers/SemiStruct/SemiStructSolverNone.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/Core/Solvers/Struct/StructSolver.hpp b/src/Core/Solvers/Struct/StructSolver.hpp
index 67fe580e..61204244 100644
--- a/src/Core/Solvers/Struct/StructSolver.hpp
+++ b/src/Core/Solvers/Struct/StructSolver.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/Core/Solvers/Struct/StructSolverBiCGSTAB.hpp b/src/Core/Solvers/Struct/StructSolverBiCGSTAB.hpp
index 8df6cb91..d0ecbbab 100644
--- a/src/Core/Solvers/Struct/StructSolverBiCGSTAB.hpp
+++ b/src/Core/Solvers/Struct/StructSolverBiCGSTAB.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/Core/Solvers/Struct/StructSolverCycRed.hpp b/src/Core/Solvers/Struct/StructSolverCycRed.hpp
index c14e6247..6181e30d 100644
--- a/src/Core/Solvers/Struct/StructSolverCycRed.hpp
+++ b/src/Core/Solvers/Struct/StructSolverCycRed.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/Core/Solvers/Struct/StructSolverFGMRES.hpp b/src/Core/Solvers/Struct/StructSolverFGMRES.hpp
index 00583b73..9b80e86d 100644
--- a/src/Core/Solvers/Struct/StructSolverFGMRES.hpp
+++ b/src/Core/Solvers/Struct/StructSolverFGMRES.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/Core/Solvers/Struct/StructSolverGMRES.hpp b/src/Core/Solvers/Struct/StructSolverGMRES.hpp
index 7da1ad4b..7636b433 100644
--- a/src/Core/Solvers/Struct/StructSolverGMRES.hpp
+++ b/src/Core/Solvers/Struct/StructSolverGMRES.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/Core/Solvers/Struct/StructSolverJacobi.hpp b/src/Core/Solvers/Struct/StructSolverJacobi.hpp
index 9a5df866..af18b272 100644
--- a/src/Core/Solvers/Struct/StructSolverJacobi.hpp
+++ b/src/Core/Solvers/Struct/StructSolverJacobi.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/Core/Solvers/Struct/StructSolverLGMRES.hpp b/src/Core/Solvers/Struct/StructSolverLGMRES.hpp
index 8c09868b..86ae6cc1 100644
--- a/src/Core/Solvers/Struct/StructSolverLGMRES.hpp
+++ b/src/Core/Solvers/Struct/StructSolverLGMRES.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/Core/Solvers/Struct/StructSolverNone.hpp b/src/Core/Solvers/Struct/StructSolverNone.hpp
index 6194dbdb..c4544aff 100644
--- a/src/Core/Solvers/Struct/StructSolverNone.hpp
+++ b/src/Core/Solvers/Struct/StructSolverNone.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/Core/Solvers/Struct/StructSolverPCG.hpp b/src/Core/Solvers/Struct/StructSolverPCG.hpp
index 9926ffcd..67825a5a 100644
--- a/src/Core/Solvers/Struct/StructSolverPCG.hpp
+++ b/src/Core/Solvers/Struct/StructSolverPCG.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/Core/Solvers/Struct/StructSolverPFMG.hpp b/src/Core/Solvers/Struct/StructSolverPFMG.hpp
index 444fb513..066a39a0 100644
--- a/src/Core/Solvers/Struct/StructSolverPFMG.hpp
+++ b/src/Core/Solvers/Struct/StructSolverPFMG.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/Core/Solvers/Struct/StructSolverPrecond.hpp b/src/Core/Solvers/Struct/StructSolverPrecond.hpp
index 1f068961..ac93a15a 100644
--- a/src/Core/Solvers/Struct/StructSolverPrecond.hpp
+++ b/src/Core/Solvers/Struct/StructSolverPrecond.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/Core/Solvers/Struct/StructSolverSMG.hpp b/src/Core/Solvers/Struct/StructSolverSMG.hpp
index 2d39bea3..8612f715 100644
--- a/src/Core/Solvers/Struct/StructSolverSMG.hpp
+++ b/src/Core/Solvers/Struct/StructSolverSMG.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/DataStructures/Arrays/Arrays.hpp b/src/DataStructures/Arrays/Arrays.hpp
index ed690a38..f87c778a 100644
--- a/src/DataStructures/Arrays/Arrays.hpp
+++ b/src/DataStructures/Arrays/Arrays.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/src/DataStructures/Arrays/CoordVector.hpp b/src/DataStructures/Arrays/CoordVector.hpp
index 61cd8be0..5890ee08 100644
--- a/src/DataStructures/Arrays/CoordVector.hpp
+++ b/src/DataStructures/Arrays/CoordVector.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/src/DataStructures/Arrays/OffsetVector.hpp b/src/DataStructures/Arrays/OffsetVector.hpp
index 494bbdc4..001c5f15 100644
--- a/src/DataStructures/Arrays/OffsetVector.hpp
+++ b/src/DataStructures/Arrays/OffsetVector.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/src/DataStructures/Arrays/Tensor/FixedSizeTensor.hpp b/src/DataStructures/Arrays/Tensor/FixedSizeTensor.hpp
index 125b8e8c..54a2b61f 100644
--- a/src/DataStructures/Arrays/Tensor/FixedSizeTensor.hpp
+++ b/src/DataStructures/Arrays/Tensor/FixedSizeTensor.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
@@ -34,12 +34,10 @@ OPFLOW_MODULE_EXPORT namespace OpFlow::DS {
 
     }// namespace internal
     template <Meta::Numerical T, auto... n>
-        requires(std::integral<decltype(n)> && ...)
-    struct FixedSizeTensor;
+    requires(std::integral<decltype(n)> && ...) struct FixedSizeTensor;
     namespace internal {
         template <Meta::Numerical T, auto... n>
-            requires(std::integral<decltype(n)> && ...)
-        struct TensorTrait<FixedSizeTensor<T, n...>> {
+        requires(std::integral<decltype(n)>&&...) struct TensorTrait<FixedSizeTensor<T, n...>> {
             using scalar_type = T;
             static constexpr auto dim = sizeof...(n);
         };
@@ -48,16 +46,15 @@ OPFLOW_MODULE_EXPORT namespace OpFlow::DS {
         struct is_fixed_size_tensor : std::false_type {};
 
         template <Meta::Numerical T, auto... n>
-            requires(std::integral<decltype(n)> && ...)
-        struct is_fixed_size_tensor<FixedSizeTensor<T, n...>> : std::true_type {};
+        requires(std::integral<decltype(n)>&&...) struct is_fixed_size_tensor<FixedSizeTensor<T, n...>>
+            : std::true_type {};
     }// namespace internal
 
     template <typename T>
     concept FixedSizeTensorType = internal::is_fixed_size_tensor<Meta::RealType<T>>::value;
 
     template <Meta::Numerical T, auto... n>
-        requires(std::integral<decltype(n)> && ...)
-    struct FixedSizeTensor : Tensor<FixedSizeTensor<T, n...>> {
+    requires(std::integral<decltype(n)> && ...) struct FixedSizeTensor : Tensor<FixedSizeTensor<T, n...>> {
         constexpr static auto N = sizeof...(n);
         constexpr FixedSizeTensor() = default;
         constexpr explicit FixedSizeTensor(T val) { _val.fill(val); }
diff --git a/src/DataStructures/Arrays/Tensor/PlainTensor.hpp b/src/DataStructures/Arrays/Tensor/PlainTensor.hpp
index f4344c2a..b3b054f1 100644
--- a/src/DataStructures/Arrays/Tensor/PlainTensor.hpp
+++ b/src/DataStructures/Arrays/Tensor/PlainTensor.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
@@ -29,13 +29,12 @@
 
 OPFLOW_MODULE_EXPORT namespace OpFlow::DS {
     template <typename ScalarType, int d, typename Allocator>
-        requires Utils::StaticAllocatorType<ScalarType, Allocator>
-    struct PlainTensor;
+    requires Utils::StaticAllocatorType<ScalarType, Allocator> struct PlainTensor;
 
     namespace internal {
         template <typename ScalarType, int d, typename Allocator>
-            requires Utils::StaticAllocatorType<ScalarType, Allocator>
-        struct TensorTrait<PlainTensor<ScalarType, d, Allocator>> {
+        requires Utils::StaticAllocatorType<ScalarType, Allocator> struct TensorTrait<
+                PlainTensor<ScalarType, d, Allocator>> {
             using scalar_type = ScalarType;
             static constexpr auto dim = d;
             using allocator_type = Allocator;
@@ -50,8 +49,8 @@ OPFLOW_MODULE_EXPORT namespace OpFlow::DS {
     }// namespace internal
 
     template <typename ScalarType, int d, typename Allocator = Utils::AlignedAllocator<ScalarType>>
-        requires Utils::StaticAllocatorType<ScalarType, Allocator>
-    struct PlainTensor : public Tensor<PlainTensor<ScalarType, d, Allocator>> {
+    requires Utils::StaticAllocatorType<ScalarType, Allocator> struct PlainTensor
+        : public Tensor<PlainTensor<ScalarType, d, Allocator>> {
     private:
         ScalarType* data = nullptr;
 
@@ -138,8 +137,8 @@ OPFLOW_MODULE_EXPORT namespace OpFlow::DS {
 
         // operator= is simply treated as assignment
         template <typename OtherScalar>
-            requires(!std::is_same_v<Scalar, OtherScalar>)
-        auto& operator=(const PlainTensor<OtherScalar, d>& other) {
+        requires(!std::is_same_v<Scalar, OtherScalar>) auto&
+        operator=(const PlainTensor<OtherScalar, d>& other) {
             OP_ASSERT(other.raw());// assign to an empty tensor is an error
             if (!data) {
                 reShape(other);
@@ -215,8 +214,8 @@ OPFLOW_MODULE_EXPORT namespace OpFlow::DS {
         auto getOffset(int index) const { return index; }
 
         template <typename... I>
-            requires(std::integral<Meta::RealType<I>> && ...) && (sizeof...(I) > 1)
-        auto getOffset(I&&... i) const {
+                requires(std::integral<Meta::RealType<I>>&&...)
+                && (sizeof...(I) > 1) auto getOffset(I&&... i) const {
             return getOffset(DS::MDIndex<d> {i...});
         }
 
@@ -285,7 +284,7 @@ OPFLOW_MODULE_EXPORT namespace OpFlow::DS {
             return *this;
         }
 
-        auto& operator=(const PlainTensor& other) { return this->template operator= <Scalar>(other); }
+        auto& operator=(const PlainTensor& other) { return this->template operator=<Scalar>(other); }
 
         auto& operator==(const PlainTensor& other) const { return this->val == other.val; }
 
diff --git a/src/DataStructures/Arrays/Tensor/TensorBase.hpp b/src/DataStructures/Arrays/Tensor/TensorBase.hpp
index a0a9e623..2fb348e4 100644
--- a/src/DataStructures/Arrays/Tensor/TensorBase.hpp
+++ b/src/DataStructures/Arrays/Tensor/TensorBase.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/src/DataStructures/Arrays/Tensor/TensorTrait.hpp b/src/DataStructures/Arrays/Tensor/TensorTrait.hpp
index 3688f098..5cfd10d1 100644
--- a/src/DataStructures/Arrays/Tensor/TensorTrait.hpp
+++ b/src/DataStructures/Arrays/Tensor/TensorTrait.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/src/DataStructures/Geometry/2DGeometry.hpp b/src/DataStructures/Geometry/2DGeometry.hpp
index 788aa8ff..af6a3533 100644
--- a/src/DataStructures/Geometry/2DGeometry.hpp
+++ b/src/DataStructures/Geometry/2DGeometry.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/src/DataStructures/Geometry/3DGeometry.hpp b/src/DataStructures/Geometry/3DGeometry.hpp
index 95ce569b..8ca0803f 100644
--- a/src/DataStructures/Geometry/3DGeometry.hpp
+++ b/src/DataStructures/Geometry/3DGeometry.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/src/DataStructures/Geometry/BasicElements.hpp b/src/DataStructures/Geometry/BasicElements.hpp
index a0d9fd78..078c5cf3 100644
--- a/src/DataStructures/Geometry/BasicElements.hpp
+++ b/src/DataStructures/Geometry/BasicElements.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
@@ -111,8 +111,7 @@ OPFLOW_MODULE_EXPORT namespace OpFlow::DS {
     }
 
     template <typename T>
-        requires Meta::BracketIndexable<T>
-    auto boxMerge(const T &boxes) {
+    requires Meta::BracketIndexable<T> auto boxMerge(const T &boxes) {
         OP_ASSERT(boxes.size() > 0);
         auto ret = boxes[0];
         constexpr static auto dim = decltype(ret)::dim;
diff --git a/src/DataStructures/Geometry/KdTree.hpp b/src/DataStructures/Geometry/KdTree.hpp
index 94f8ed97..32ed579a 100644
--- a/src/DataStructures/Geometry/KdTree.hpp
+++ b/src/DataStructures/Geometry/KdTree.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/src/DataStructures/Index/ColoredIndex.hpp b/src/DataStructures/Index/ColoredIndex.hpp
index 799090f3..b4e4612a 100644
--- a/src/DataStructures/Index/ColoredIndex.hpp
+++ b/src/DataStructures/Index/ColoredIndex.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
@@ -106,7 +106,9 @@ OPFLOW_MODULE_EXPORT namespace OpFlow::DS {
         constexpr auto copy() const { return *this; }
 
         template <std::size_t dim = 0>
-            requires requires { dim < d; }
+        requires requires {
+            dim < d;
+        }
         constexpr auto next(int steps = 1) const {
             auto c = copy();
             c.idx[dim] += steps;
@@ -114,7 +116,9 @@ OPFLOW_MODULE_EXPORT namespace OpFlow::DS {
         }
 
         template <std::size_t dim = 0>
-            requires requires { dim < d; }
+        requires requires {
+            dim < d;
+        }
         constexpr auto prev(int steps = 1) const {
             auto c = copy();
             c.idx[dim] -= steps;
@@ -273,8 +277,8 @@ namespace std {
 
     template <std::size_t d>
     struct hash<OpFlow::DS::ColoredIndex<OpFlow::DS::LevelMDIndex<d>>> {
-        std::size_t
-        operator()(const OpFlow::DS::ColoredIndex<OpFlow::DS::LevelMDIndex<d>>& i) const noexcept {
+        std::size_t operator()(const OpFlow::DS::ColoredIndex<OpFlow::DS::LevelMDIndex<d>>& i) const
+                noexcept {
             auto idx = i.get();
             return XXHash64::hash(idx.data(), idx.size() * sizeof(int), 0);
         }
diff --git a/src/DataStructures/Index/LevelMDIndex.hpp b/src/DataStructures/Index/LevelMDIndex.hpp
index 9816acef..97bbba02 100644
--- a/src/DataStructures/Index/LevelMDIndex.hpp
+++ b/src/DataStructures/Index/LevelMDIndex.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/DataStructures/Index/LevelRangedIndex.hpp b/src/DataStructures/Index/LevelRangedIndex.hpp
index 901c9560..bed5fac4 100644
--- a/src/DataStructures/Index/LevelRangedIndex.hpp
+++ b/src/DataStructures/Index/LevelRangedIndex.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/DataStructures/Index/LinearMapper/BlockedMDRangeMapper.hpp b/src/DataStructures/Index/LinearMapper/BlockedMDRangeMapper.hpp
index 066d1c90..d28bbf4c 100644
--- a/src/DataStructures/Index/LinearMapper/BlockedMDRangeMapper.hpp
+++ b/src/DataStructures/Index/LinearMapper/BlockedMDRangeMapper.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/DataStructures/Index/LinearMapper/ColoredBlockedMDRangeMapper.hpp b/src/DataStructures/Index/LinearMapper/ColoredBlockedMDRangeMapper.hpp
index b269ef21..9e07be67 100644
--- a/src/DataStructures/Index/LinearMapper/ColoredBlockedMDRangeMapper.hpp
+++ b/src/DataStructures/Index/LinearMapper/ColoredBlockedMDRangeMapper.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/DataStructures/Index/LinearMapper/ColoredMDRangeMapper.hpp b/src/DataStructures/Index/LinearMapper/ColoredMDRangeMapper.hpp
index 1bc0ca9e..e04f4a0c 100644
--- a/src/DataStructures/Index/LinearMapper/ColoredMDRangeMapper.hpp
+++ b/src/DataStructures/Index/LinearMapper/ColoredMDRangeMapper.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/DataStructures/Index/LinearMapper/GeneralBlockedMDRangeMapper.hpp b/src/DataStructures/Index/LinearMapper/GeneralBlockedMDRangeMapper.hpp
index f0e8a7cc..4a466197 100644
--- a/src/DataStructures/Index/LinearMapper/GeneralBlockedMDRangeMapper.hpp
+++ b/src/DataStructures/Index/LinearMapper/GeneralBlockedMDRangeMapper.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/DataStructures/Index/LinearMapper/LevelMDRangeMapper.hpp b/src/DataStructures/Index/LinearMapper/LevelMDRangeMapper.hpp
index c826629f..e804505d 100644
--- a/src/DataStructures/Index/LinearMapper/LevelMDRangeMapper.hpp
+++ b/src/DataStructures/Index/LinearMapper/LevelMDRangeMapper.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/DataStructures/Index/LinearMapper/MDRangeMapper.hpp b/src/DataStructures/Index/LinearMapper/MDRangeMapper.hpp
index 13b5032e..b7cb3596 100644
--- a/src/DataStructures/Index/LinearMapper/MDRangeMapper.hpp
+++ b/src/DataStructures/Index/LinearMapper/MDRangeMapper.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/DataStructures/Index/MDIndex.hpp b/src/DataStructures/Index/MDIndex.hpp
index 077f89bf..da7ba8b3 100644
--- a/src/DataStructures/Index/MDIndex.hpp
+++ b/src/DataStructures/Index/MDIndex.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
@@ -103,7 +103,9 @@ OPFLOW_MODULE_EXPORT namespace OpFlow::DS {
         constexpr auto copy() const { return *this; }
 
         template <std::size_t dim = 0>
-            requires requires { dim < d; }
+        requires requires {
+            dim < d;
+        }
         constexpr auto next(int steps = 1) const {
             auto c = copy();
             c.idx[dim] += steps;
@@ -111,7 +113,9 @@ OPFLOW_MODULE_EXPORT namespace OpFlow::DS {
         }
 
         template <std::size_t dim = 0>
-            requires requires { dim < d; }
+        requires requires {
+            dim < d;
+        }
         constexpr auto prev(int steps = 1) const {
             auto c = copy();
             c.idx[dim] -= steps;
diff --git a/src/DataStructures/Index/RangedIndex.hpp b/src/DataStructures/Index/RangedIndex.hpp
index 12afb758..40c38967 100644
--- a/src/DataStructures/Index/RangedIndex.hpp
+++ b/src/DataStructures/Index/RangedIndex.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/DataStructures/Matrix/COOMatrix.hpp b/src/DataStructures/Matrix/COOMatrix.hpp
index c2347a1d..3ae0bb9f 100644
--- a/src/DataStructures/Matrix/COOMatrix.hpp
+++ b/src/DataStructures/Matrix/COOMatrix.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/DataStructures/Matrix/CSRMatrix.hpp b/src/DataStructures/Matrix/CSRMatrix.hpp
index f219dcb5..ead33dd0 100644
--- a/src/DataStructures/Matrix/CSRMatrix.hpp
+++ b/src/DataStructures/Matrix/CSRMatrix.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
@@ -124,8 +124,9 @@ OPFLOW_MODULE_EXPORT namespace OpFlow::DS {
                     // ret += std::string(std::formatted_size("[{:>{}}, {:> {}.4E}] ", 0, max_col_width, 1.0,
                     //                                        max_val_width),
                     //                    ' ');
-                    ret += std::string(std::formatted_size("[{:>{}}, {:>}] ", 0, max_col_width, 1.0, max_val_width),
-                                       ' ');
+                    ret += std::string(
+                            std::formatted_size("[{:>{}}, {:>}] ", 0, max_col_width, 1.0, max_val_width),
+                            ' ');
                 }
                 // ret += std::format("rhs: {:> {}.4E}\n", rhs[irow], max_val_width);
                 ret += std::format("rhs: {:>}\n", rhs[irow]);
diff --git a/src/DataStructures/Pair.hpp b/src/DataStructures/Pair.hpp
index 8703871d..61c3f38a 100644
--- a/src/DataStructures/Pair.hpp
+++ b/src/DataStructures/Pair.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/src/DataStructures/Range/LevelRanges.hpp b/src/DataStructures/Range/LevelRanges.hpp
index 99c622d7..cfc86387 100644
--- a/src/DataStructures/Range/LevelRanges.hpp
+++ b/src/DataStructures/Range/LevelRanges.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/DataStructures/Range/Ranges.hpp b/src/DataStructures/Range/Ranges.hpp
index 2eafdc38..5d1459b8 100644
--- a/src/DataStructures/Range/Ranges.hpp
+++ b/src/DataStructures/Range/Ranges.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
@@ -225,7 +225,10 @@ OPFLOW_MODULE_EXPORT namespace OpFlow::DS {
     };
 
     template <typename T>
-    concept isRange = requires { T::dim; } && std::is_same_v<std::remove_cvref_t<T>, Range<T::dim>>;
+    concept isRange = requires {
+        T::dim;
+    }
+    &&std::is_same_v<std::remove_cvref_t<T>, Range<T::dim>>;
 
     template <std::size_t dim1, std::size_t dim2>
     constexpr auto commonRange(const Range<dim1>& a, const Range<dim2>& b) {
diff --git a/src/DataStructures/StencilPad.hpp b/src/DataStructures/StencilPad.hpp
index 57ee92a1..72d9fc0a 100644
--- a/src/DataStructures/StencilPad.hpp
+++ b/src/DataStructures/StencilPad.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/src/Math/Function/Integral.hpp b/src/Math/Function/Integral.hpp
index 17dac89a..7db3b934 100644
--- a/src/Math/Function/Integral.hpp
+++ b/src/Math/Function/Integral.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/Math/Function/Numeric.hpp b/src/Math/Function/Numeric.hpp
index ff554fb2..dee630a0 100644
--- a/src/Math/Function/Numeric.hpp
+++ b/src/Math/Function/Numeric.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
@@ -39,12 +39,12 @@ OPFLOW_MODULE_EXPORT namespace OpFlow::Math {
     }
 
     template <typename T>
-    inline constexpr auto norm2(T x, T y) -> T {
+    inline constexpr auto norm2(T x, T y)->T {
         return std::sqrt(x * x + y * y);
     }
 
     template <typename T>
-    inline constexpr auto norm2(T x, T y, T z) -> T {
+    inline constexpr auto norm2(T x, T y, T z)->T {
         return std::sqrt(x * x + y * y + z * z);
     }
 
diff --git a/src/Math/Interpolator/Interpolator.hpp b/src/Math/Interpolator/Interpolator.hpp
index 3d82f1c2..1c4a57c4 100644
--- a/src/Math/Interpolator/Interpolator.hpp
+++ b/src/Math/Interpolator/Interpolator.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/src/Utils/Allocator/AlignedAllocator.hpp b/src/Utils/Allocator/AlignedAllocator.hpp
index 2a89d0f8..95d3ea8f 100644
--- a/src/Utils/Allocator/AlignedAllocator.hpp
+++ b/src/Utils/Allocator/AlignedAllocator.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/Utils/Allocator/AllocatorTrait.hpp b/src/Utils/Allocator/AllocatorTrait.hpp
index 70295c0e..54001026 100644
--- a/src/Utils/Allocator/AllocatorTrait.hpp
+++ b/src/Utils/Allocator/AllocatorTrait.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/Utils/Allocator/StaticAllocator.hpp b/src/Utils/Allocator/StaticAllocator.hpp
index 9c3d455d..e20b1452 100644
--- a/src/Utils/Allocator/StaticAllocator.hpp
+++ b/src/Utils/Allocator/StaticAllocator.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
@@ -22,7 +22,8 @@
 OPFLOW_MODULE_EXPORT namespace OpFlow::Utils {
     template <typename D, typename T>
     concept StaticAllocatorType = requires(std::size_t s) {
-        { T::allocate(s) } -> std::same_as<D*>;
+        { T::allocate(s) }
+        ->std::same_as<D*>;
         T::deallocate(std::declval<D*>(), s);
     };
 }// namespace OpFlow::Utils
diff --git a/src/Utils/Allocator/VirtualMemAllocator.hpp b/src/Utils/Allocator/VirtualMemAllocator.hpp
index f47d342d..4e116229 100644
--- a/src/Utils/Allocator/VirtualMemAllocator.hpp
+++ b/src/Utils/Allocator/VirtualMemAllocator.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/Utils/ConstexprString.hpp b/src/Utils/ConstexprString.hpp
index 46af35e2..5e7a9c3f 100644
--- a/src/Utils/ConstexprString.hpp
+++ b/src/Utils/ConstexprString.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
@@ -34,8 +34,7 @@ OPFLOW_MODULE_EXPORT namespace OpFlow::Utils {
         constexpr bool operator==(const CXprString& other) const { return _str == other._str; }
 
         template <std::size_t NN>
-            requires(NN != N)
-        constexpr bool operator==(const CXprString<NN>& other) const {
+        requires(NN != N) constexpr bool operator==(const CXprString<NN>& other) const {
             return false;
         }
 
@@ -60,7 +59,7 @@ OPFLOW_MODULE_EXPORT namespace OpFlow::Utils {
     concept CXprStringType = internal::is_cxpr_string<T>::value;
 
     template <std::size_t N>
-    constexpr auto makeCXprString(const char (&str)[N]) {
+    constexpr auto makeCXprString(const char(&str)[N]) {
         return CXprString<N>(str);
     }
 }// namespace OpFlow::Utils
diff --git a/src/Utils/NamedFunctor.hpp b/src/Utils/NamedFunctor.hpp
index 279e9a66..4a9a9f7f 100644
--- a/src/Utils/NamedFunctor.hpp
+++ b/src/Utils/NamedFunctor.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
@@ -21,11 +21,10 @@
 
 OPFLOW_MODULE_EXPORT namespace OpFlow::Utils {
     template <auto Functor, auto Name, typename... Args>
-    // Invokable check. Omit Args to mute this check
-        requires((sizeof...(Args) == 0) || std::invocable<Meta::RealType<decltype(Functor)>, Args...>)
-                // Name type check. Must be a valid constexpr string
-                && (CXprStringType<Meta::RealType<decltype(Name)>>)
-    struct NamedFunctor {
+            // Invokable check. Omit Args to mute this check
+            requires((sizeof...(Args) == 0) || std::invocable<Meta::RealType<decltype(Functor)>, Args...>)
+            // Name type check. Must be a valid constexpr string
+            && (CXprStringType<Meta::RealType<decltype(Name)>>) struct NamedFunctor {
         constexpr NamedFunctor() = default;
 
         constexpr static auto getFunc() { return _func; }
diff --git a/src/Utils/RandomStringGenerator.hpp b/src/Utils/RandomStringGenerator.hpp
index c7d27f1f..14617b8b 100644
--- a/src/Utils/RandomStringGenerator.hpp
+++ b/src/Utils/RandomStringGenerator.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
@@ -25,7 +25,7 @@
 OPFLOW_MODULE_EXPORT namespace OpFlow::Utils {
     // copied from https://stackoverflow.com/a/444614
     template <typename T = std::mt19937>
-    inline auto random_generator() -> T {
+    inline auto random_generator()->T {
         auto constexpr seed_bytes = sizeof(typename T::result_type) * T::state_size;
         auto constexpr seed_len = seed_bytes / sizeof(std::seed_seq::result_type);
         auto seed = std::array<std::seed_seq::result_type, seed_len>();
@@ -36,7 +36,7 @@ OPFLOW_MODULE_EXPORT namespace OpFlow::Utils {
     }
 
     // copied from https://stackoverflow.com/a/444614
-    inline auto generate_random_alphanumeric_string(std::size_t len) -> std::string {
+    inline auto generate_random_alphanumeric_string(std::size_t len)->std::string {
         static constexpr auto chars = "0123456789"
                                       "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
                                       "abcdefghijklmnopqrstuvwxyz";
diff --git a/src/Utils/Serializer/EnumTypes.hpp b/src/Utils/Serializer/EnumTypes.hpp
index d3bc3106..fb40cdb2 100644
--- a/src/Utils/Serializer/EnumTypes.hpp
+++ b/src/Utils/Serializer/EnumTypes.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/Utils/Serializer/STDContainers.hpp b/src/Utils/Serializer/STDContainers.hpp
index a8e0861c..df3b53fa 100644
--- a/src/Utils/Serializer/STDContainers.hpp
+++ b/src/Utils/Serializer/STDContainers.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
@@ -21,10 +21,12 @@
 
 OPFLOW_MODULE_EXPORT namespace OpFlow::Utils::Serializer {
     template <typename T>
-        requires Meta::BracketIndexable<T> && requires(T t) {
-            { t.empty() } -> std::same_as<bool>;
-            { t.size() } -> std::same_as<std::size_t>;
-        }
+    requires Meta::BracketIndexable<T>&& requires(T t) {
+        { t.empty() }
+        ->std::same_as<bool>;
+        { t.size() }
+        ->std::same_as<std::size_t>;
+    }
     auto serialize_impl(const T& arr, const std::string& prefix, const std::string& postfix,
                         const std::string& splitter) {
         std::string ret = prefix;
@@ -36,7 +38,7 @@ OPFLOW_MODULE_EXPORT namespace OpFlow::Utils::Serializer {
     }
 
     template <typename T, std::size_t N>
-    auto serialize_impl(const T (&arr)[N], const std::string& prefix, const std::string& postfix,
+    auto serialize_impl(const T(&arr)[N], const std::string& prefix, const std::string& postfix,
                         const std::string& splitter) {
         std::string ret = prefix;
         if (N == 0) return ret + postfix;
diff --git a/src/Utils/StackTracer.hpp b/src/Utils/StackTracer.hpp
index 178af322..d1f840fa 100644
--- a/src/Utils/StackTracer.hpp
+++ b/src/Utils/StackTracer.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/Utils/Writers/FieldStream.hpp b/src/Utils/Writers/FieldStream.hpp
index 14df9457..9c5c079a 100644
--- a/src/Utils/Writers/FieldStream.hpp
+++ b/src/Utils/Writers/FieldStream.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/src/Utils/Writers/FieldWriter.hpp b/src/Utils/Writers/FieldWriter.hpp
index 94403edf..a4a1a420 100644
--- a/src/Utils/Writers/FieldWriter.hpp
+++ b/src/Utils/Writers/FieldWriter.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/Utils/Writers/HDF5Stream.hpp b/src/Utils/Writers/HDF5Stream.hpp
index f57e1675..205a6ca4 100644
--- a/src/Utils/Writers/HDF5Stream.hpp
+++ b/src/Utils/Writers/HDF5Stream.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/Utils/Writers/IOGroup.hpp b/src/Utils/Writers/IOGroup.hpp
index 92a81489..4778fe8f 100644
--- a/src/Utils/Writers/IOGroup.hpp
+++ b/src/Utils/Writers/IOGroup.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
@@ -93,7 +93,8 @@ OPFLOW_MODULE_EXPORT namespace OpFlow::Utils {
                     streams.back() << t;
                     [&, this]<int... Is>(std::integer_sequence<int, Is...>) {
                         streams.back().dumpMultiple(std::get<Is>(exprs)...);
-                    }(std::make_integer_sequence<int, sizeof...(Exprs)>());
+                    }
+                    (std::make_integer_sequence<int, sizeof...(Exprs)>());
                 } else {
                     Meta::static_for<sizeof...(Exprs)>(
                             [&]<int k>(Meta::int_<k>) { streams[k] << t << std::get<k>(exprs); });
diff --git a/src/Utils/Writers/RawBinaryStream.hpp b/src/Utils/Writers/RawBinaryStream.hpp
index 88def76d..b0734e11 100644
--- a/src/Utils/Writers/RawBinaryStream.hpp
+++ b/src/Utils/Writers/RawBinaryStream.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/Utils/Writers/StreamTrait.hpp b/src/Utils/Writers/StreamTrait.hpp
index 3b7a4d0e..7032919b 100644
--- a/src/Utils/Writers/StreamTrait.hpp
+++ b/src/Utils/Writers/StreamTrait.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/src/Utils/Writers/Streams.hpp b/src/Utils/Writers/Streams.hpp
index c7a28ff7..33fa5bd9 100644
--- a/src/Utils/Writers/Streams.hpp
+++ b/src/Utils/Writers/Streams.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
@@ -91,8 +91,8 @@ OPFLOW_MODULE_EXPORT namespace OpFlow::Utils {
     enum class NumberingType { ByStep, ByTime };
 
     template <typename Derived>
-    struct Stream : internal::StreamImpl<Derived, bool(internal::StreamTrait<Derived>::mode_flag& StreamIn),
-                                         bool(internal::StreamTrait<Derived>::mode_flag& StreamOut)> {
+    struct Stream : internal::StreamImpl<Derived, bool(internal::StreamTrait<Derived>::mode_flag & StreamIn),
+                                         bool(internal::StreamTrait<Derived>::mode_flag & StreamOut)> {
         void setNumberingType(NumberingType type) { this->derived().setNumberingTypeImpl(type); }
     };
 }// namespace OpFlow::Utils
diff --git a/src/Utils/Writers/TecplotASCIIStream.hpp b/src/Utils/Writers/TecplotASCIIStream.hpp
index a889fea6..f79e25c2 100644
--- a/src/Utils/Writers/TecplotASCIIStream.hpp
+++ b/src/Utils/Writers/TecplotASCIIStream.hpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/src/Utils/Writers/TecplotBinaryStream.hpp b/src/Utils/Writers/TecplotBinaryStream.hpp
index cd02a3c8..c53594cf 100644
--- a/src/Utils/Writers/TecplotBinaryStream.hpp
+++ b/src/Utils/Writers/TecplotBinaryStream.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/Utils/Writers/TecplotSZPLTStream.hpp b/src/Utils/Writers/TecplotSZPLTStream.hpp
index 71cddaf5..04b5a4d6 100644
--- a/src/Utils/Writers/TecplotSZPLTStream.hpp
+++ b/src/Utils/Writers/TecplotSZPLTStream.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/src/Utils/Writers/VTKAMRStream.hpp b/src/Utils/Writers/VTKAMRStream.hpp
index 90919c12..e162d078 100644
--- a/src/Utils/Writers/VTKAMRStream.hpp
+++ b/src/Utils/Writers/VTKAMRStream.hpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 947a6b5d..9b01c8de 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,6 +1,6 @@
 # ----------------------------------------------------------------------------
 #
-# Copyright (c) 2019 - 2023 by the OpFlow developers
+# Copyright (c) 2019 - 2025 by the OpFlow developers
 #
 # This file is part of OpFlow.
 # 
diff --git a/test/Core/BC/DircBCTest.cpp b/test/Core/BC/DircBCTest.cpp
index d1bb72c5..5d6dcb74 100644
--- a/test/Core/BC/DircBCTest.cpp
+++ b/test/Core/BC/DircBCTest.cpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/test/Core/BC/NeumBCTest.cpp b/test/Core/BC/NeumBCTest.cpp
index 41780439..6f863ef8 100644
--- a/test/Core/BC/NeumBCTest.cpp
+++ b/test/Core/BC/NeumBCTest.cpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/test/Core/BC/PeriodicBCTest.cpp b/test/Core/BC/PeriodicBCTest.cpp
index 87c8cdf3..3f045abd 100644
--- a/test/Core/BC/PeriodicBCTest.cpp
+++ b/test/Core/BC/PeriodicBCTest.cpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/test/Core/CMakeLists.txt b/test/Core/CMakeLists.txt
index 54ce041f..964be59a 100644
--- a/test/Core/CMakeLists.txt
+++ b/test/Core/CMakeLists.txt
@@ -1,6 +1,6 @@
 # ----------------------------------------------------------------------------
 #
-# Copyright (c) 2019 - 2023 by the OpFlow developers
+# Copyright (c) 2019 - 2025 by the OpFlow developers
 #
 # This file is part of OpFlow.
 # 
diff --git a/test/Core/Equation/AMGCLMPITest.cpp b/test/Core/Equation/AMGCLMPITest.cpp
index dfea50ed..5f13f201 100644
--- a/test/Core/Equation/AMGCLMPITest.cpp
+++ b/test/Core/Equation/AMGCLMPITest.cpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
@@ -73,11 +73,11 @@ class AMGCLMPITest : public testing::Test {
             auto p_ref = p_true.evalAt(i);
             auto rel_res = std::abs(c_res) / std::abs(p_ref);
             if (std::isnan(c_res)) {
-                std::print(std::cerr,"Check fail: res = nan @ {}", i);
+                std::print(std::cerr, "Check fail: res = nan @ {}", i);
                 ret = false;
             }
             if (rel_res > rel) {
-                std::print(std::cerr,"Check fail: res = {} / {} @ {}", c_res, rel_res, i);
+                std::print(std::cerr, "Check fail: res = {} / {} @ {}", c_res, rel_res, i);
                 ret = false;
             }
         });
@@ -196,11 +196,11 @@ class AMGCLManualSplitMPITest : public virtual testing::Test {
             auto p_ref = p_true.evalAt(i);
             auto rel_res = std::abs(c_res) / std::abs(p_ref);
             if (std::isnan(c_res)) {
-                std::print(std::cerr,"Check fail: res = nan @ {}", i);
+                std::print(std::cerr, "Check fail: res = nan @ {}", i);
                 ret = false;
             }
             if (rel_res > rel) {
-                std::print(std::cerr,"Check fail: res = {} / {} @ {}", c_res, rel_res, i);
+                std::print(std::cerr, "Check fail: res = {} / {} @ {}", c_res, rel_res, i);
                 ret = false;
             }
         });
diff --git a/test/Core/Equation/AMGCLTest.cpp b/test/Core/Equation/AMGCLTest.cpp
index 38b86a20..b2501dc1 100644
--- a/test/Core/Equation/AMGCLTest.cpp
+++ b/test/Core/Equation/AMGCLTest.cpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/test/Core/Equation/CSRMatrixGeneratorMPITest.cpp b/test/Core/Equation/CSRMatrixGeneratorMPITest.cpp
index 448609b2..340a2979 100644
--- a/test/Core/Equation/CSRMatrixGeneratorMPITest.cpp
+++ b/test/Core/Equation/CSRMatrixGeneratorMPITest.cpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/test/Core/Equation/CSRMatrixGeneratorTest.cpp b/test/Core/Equation/CSRMatrixGeneratorTest.cpp
index 94b9ee15..cb7d210a 100644
--- a/test/Core/Equation/CSRMatrixGeneratorTest.cpp
+++ b/test/Core/Equation/CSRMatrixGeneratorTest.cpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/test/Core/Equation/DircEqnTest.cpp b/test/Core/Equation/DircEqnTest.cpp
index 31f71850..6d589502 100644
--- a/test/Core/Equation/DircEqnTest.cpp
+++ b/test/Core/Equation/DircEqnTest.cpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
@@ -83,11 +83,11 @@ class DircEqnTest : public Test {
             auto p_ref = p_true.evalAt(i);
             auto rel_res = std::abs(c_res) / std::abs(p_ref);
             if (std::isnan(c_res)) {
-                std::print(std::cerr,"Check fail: res = nan @ {}", i);
+                std::print(std::cerr, "Check fail: res = nan @ {}", i);
                 ret = false;
             }
             if (rel_res > rel) {
-                std::print(std::cerr,"Check fail: res = {} / {} @ {}", c_res, rel_res, i);
+                std::print(std::cerr, "Check fail: res = {} / {} @ {}", c_res, rel_res, i);
                 ret = false;
             }
         });
diff --git a/test/Core/Equation/EqnHolderTest.cpp b/test/Core/Equation/EqnHolderTest.cpp
index 40c4d4c3..7f207926 100644
--- a/test/Core/Equation/EqnHolderTest.cpp
+++ b/test/Core/Equation/EqnHolderTest.cpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
@@ -83,11 +83,11 @@ class EqnHolderTest : public Test {
             auto p_ref = p_true.evalAt(i);
             auto rel_res = std::abs(c_res) / std::abs(p_ref);
             if (std::isnan(c_res)) {
-                std::print(std::cerr,"Check fail: res = nan @ {}", i);
+                std::print(std::cerr, "Check fail: res = nan @ {}", i);
                 ret = false;
             }
             if (rel_res > rel) {
-                std::print(std::cerr,"Check fail: res = {} / {} @ {}", c_res, rel_res, i);
+                std::print(std::cerr, "Check fail: res = {} / {} @ {}", c_res, rel_res, i);
                 ret = false;
             }
         });
diff --git a/test/Core/Equation/EqnSetMPITest.cpp b/test/Core/Equation/EqnSetMPITest.cpp
index 0690042b..d8e11293 100644
--- a/test/Core/Equation/EqnSetMPITest.cpp
+++ b/test/Core/Equation/EqnSetMPITest.cpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/test/Core/Equation/EqnSetTest.cpp b/test/Core/Equation/EqnSetTest.cpp
index cf13fe39..b3d17ddb 100644
--- a/test/Core/Equation/EqnSetTest.cpp
+++ b/test/Core/Equation/EqnSetTest.cpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/test/Core/Equation/NeumEqnTest.cpp b/test/Core/Equation/NeumEqnTest.cpp
index 28ecf41a..a3039095 100644
--- a/test/Core/Equation/NeumEqnTest.cpp
+++ b/test/Core/Equation/NeumEqnTest.cpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
@@ -85,11 +85,11 @@ class NeumEqnTest : public Test {
             auto p_ref = p_true.evalAt(i);
             auto rel_res = std::abs(c_res) / std::abs(p_ref);
             if (std::isnan(c_res)) {
-                std::print(std::cerr,"Check fail: res = nan @ {}", i);
+                std::print(std::cerr, "Check fail: res = nan @ {}", i);
                 ret = false;
             }
             if (rel_res > rel) {
-                std::print(std::cerr,"Check fail: res = {} / {} @ {}", c_res, rel_res, i);
+                std::print(std::cerr, "Check fail: res = {} / {} @ {}", c_res, rel_res, i);
                 ret = false;
             }
         });
diff --git a/test/Core/Equation/PeriodicEqnTest.cpp b/test/Core/Equation/PeriodicEqnTest.cpp
index 8baa01b6..924ff6e2 100644
--- a/test/Core/Equation/PeriodicEqnTest.cpp
+++ b/test/Core/Equation/PeriodicEqnTest.cpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
@@ -81,11 +81,11 @@ class PeriodicEqnTest : public Test {
             auto p_ref = p_true.evalAt(i);
             auto rel_res = std::abs(c_res) / std::abs(p_ref);
             if (std::isnan(c_res)) {
-                std::print(std::cerr,"Check fail: res = nan @ {}", i);
+                std::print(std::cerr, "Check fail: res = nan @ {}", i);
                 ret = false;
             }
             if (rel_res > rel) {
-                std::print(std::cerr,"Check fail: res = {} / {} @ {}", c_res, rel_res, i);
+                std::print(std::cerr, "Check fail: res = {} / {} @ {}", c_res, rel_res, i);
                 ret = false;
             }
         });
diff --git a/test/Core/Field/CartesianFieldMPITest.cpp b/test/Core/Field/CartesianFieldMPITest.cpp
index 99f906f0..451e6d6d 100644
--- a/test/Core/Field/CartesianFieldMPITest.cpp
+++ b/test/Core/Field/CartesianFieldMPITest.cpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
@@ -11,8 +11,8 @@
 //  ----------------------------------------------------------------------------
 
 #include <gmock/gmock.h>
-#include <tuple>
 #include <print>
+#include <tuple>
 import opflow;
 
 using namespace OpFlow;
diff --git a/test/Core/Field/CartesianFieldTest.cpp b/test/Core/Field/CartesianFieldTest.cpp
index 8873e041..5dd7346c 100644
--- a/test/Core/Field/CartesianFieldTest.cpp
+++ b/test/Core/Field/CartesianFieldTest.cpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
@@ -171,7 +171,7 @@ TEST_F(CartesianFieldTest, CenterPeriodicValueCheck) {
     rangeFor_s(u.getLocalWritableRange(), [&](auto&& i) { u[i] = i[1] * 10 + i[0]; });
     u.updatePadding();
     rangeFor_s(u.getLocalReadableRange(), [&](auto&& i) {
-        if (u[i] != (i[1] + 10) % 10 * 10 + (i[0] + 10) % 10) std::print(std::cerr,"Not equal at {}", i);
+        if (u[i] != (i[1] + 10) % 10 * 10 + (i[0] + 10) % 10) std::print(std::cerr, "Not equal at {}", i);
         ASSERT_DOUBLE_EQ(u[i], (i[1] + 10) % 10 * 10 + (i[0] + 10) % 10);
     });
 }
\ No newline at end of file
diff --git a/test/Core/Loops/RangeForTest.cpp b/test/Core/Loops/RangeForTest.cpp
index e223785f..eb0b8fcb 100644
--- a/test/Core/Loops/RangeForTest.cpp
+++ b/test/Core/Loops/RangeForTest.cpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/test/Core/Loops/RangeReduceTest.cpp b/test/Core/Loops/RangeReduceTest.cpp
index 962a5d43..383165d1 100644
--- a/test/Core/Loops/RangeReduceTest.cpp
+++ b/test/Core/Loops/RangeReduceTest.cpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/test/Core/Mesh/CartesianMeshTest.cpp b/test/Core/Mesh/CartesianMeshTest.cpp
index f8ac56d7..252e9f65 100644
--- a/test/Core/Mesh/CartesianMeshTest.cpp
+++ b/test/Core/Mesh/CartesianMeshTest.cpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/test/Core/MetaTest.cpp b/test/Core/MetaTest.cpp
index 2f7ca618..33a57a9b 100644
--- a/test/Core/MetaTest.cpp
+++ b/test/Core/MetaTest.cpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
@@ -39,10 +39,10 @@ TEST(MetaTest, StaticForStep2) {
 
 TEST(MetaTest, TupleSplit) {
     struct A {
-        A() { }
-        A(const A&) { }
-        A(A&&) { }
-        ~A() { }
+        A() {}
+        A(const A&) {}
+        A(A&&) {}
+        ~A() {}
     };
     A a;
     auto t = std::forward_as_tuple(a, A(), a);
diff --git a/test/Core/Operator/ConditionalTest.cpp b/test/Core/Operator/ConditionalTest.cpp
index 6c15bfa9..6b34f2e2 100644
--- a/test/Core/Operator/ConditionalTest.cpp
+++ b/test/Core/Operator/ConditionalTest.cpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/test/Core/Operator/ConvolutionTest.cpp b/test/Core/Operator/ConvolutionTest.cpp
index 6c726995..b71ecc04 100644
--- a/test/Core/Operator/ConvolutionTest.cpp
+++ b/test/Core/Operator/ConvolutionTest.cpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/test/Core/Operator/InterpolatorTest.cpp b/test/Core/Operator/InterpolatorTest.cpp
index fd8d703b..cd872ea9 100644
--- a/test/Core/Operator/InterpolatorTest.cpp
+++ b/test/Core/Operator/InterpolatorTest.cpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/test/Core/Parallel/EvenSplitStrategyTest.cpp b/test/Core/Parallel/EvenSplitStrategyTest.cpp
index 9c176cf0..b2a7b1be 100644
--- a/test/Core/Parallel/EvenSplitStrategyTest.cpp
+++ b/test/Core/Parallel/EvenSplitStrategyTest.cpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/test/Core/Parallel/ParticleGuidedSplitStrategyTest.cpp b/test/Core/Parallel/ParticleGuidedSplitStrategyTest.cpp
index 12282265..5cde7a2d 100644
--- a/test/Core/Parallel/ParticleGuidedSplitStrategyTest.cpp
+++ b/test/Core/Parallel/ParticleGuidedSplitStrategyTest.cpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/test/DataStructures/Arrays/PlainTensorTest.cpp b/test/DataStructures/Arrays/PlainTensorTest.cpp
index c0b2ad7d..db285cc3 100644
--- a/test/DataStructures/Arrays/PlainTensorTest.cpp
+++ b/test/DataStructures/Arrays/PlainTensorTest.cpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/test/DataStructures/CMakeLists.txt b/test/DataStructures/CMakeLists.txt
index 755b62c2..d7af1578 100644
--- a/test/DataStructures/CMakeLists.txt
+++ b/test/DataStructures/CMakeLists.txt
@@ -1,6 +1,6 @@
 # ----------------------------------------------------------------------------
 #
-# Copyright (c) 2019 - 2023 by the OpFlow developers
+# Copyright (c) 2019 - 2025 by the OpFlow developers
 #
 # This file is part of OpFlow.
 # 
diff --git a/test/DataStructures/Index/BlockedMDRangeMapperTest.cpp b/test/DataStructures/Index/BlockedMDRangeMapperTest.cpp
index b4cea23e..95ba1046 100644
--- a/test/DataStructures/Index/BlockedMDRangeMapperTest.cpp
+++ b/test/DataStructures/Index/BlockedMDRangeMapperTest.cpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/test/DataStructures/Index/ColoredBlockedMDRangeMapperTest.cpp b/test/DataStructures/Index/ColoredBlockedMDRangeMapperTest.cpp
index b1beff7d..944c498c 100644
--- a/test/DataStructures/Index/ColoredBlockedMDRangeMapperTest.cpp
+++ b/test/DataStructures/Index/ColoredBlockedMDRangeMapperTest.cpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/test/DataStructures/Index/MDIndexTest.cpp b/test/DataStructures/Index/MDIndexTest.cpp
index a6d6cfef..4e439242 100644
--- a/test/DataStructures/Index/MDIndexTest.cpp
+++ b/test/DataStructures/Index/MDIndexTest.cpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/test/DataStructures/StencilPadTest.cpp b/test/DataStructures/StencilPadTest.cpp
index cdfe0b2e..e5db909d 100644
--- a/test/DataStructures/StencilPadTest.cpp
+++ b/test/DataStructures/StencilPadTest.cpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/test/Utils/CMakeLists.txt b/test/Utils/CMakeLists.txt
index e26f8502..fd7eafc2 100644
--- a/test/Utils/CMakeLists.txt
+++ b/test/Utils/CMakeLists.txt
@@ -1,6 +1,6 @@
 # ----------------------------------------------------------------------------
 #
-# Copyright (c) 2019 - 2023 by the OpFlow developers
+# Copyright (c) 2019 - 2025 by the OpFlow developers
 #
 # This file is part of OpFlow.
 # 
diff --git a/test/Utils/Cpp20CompatibilityTest.cpp b/test/Utils/Cpp20CompatibilityTest.cpp
index 48cf4904..b6b7361a 100644
--- a/test/Utils/Cpp20CompatibilityTest.cpp
+++ b/test/Utils/Cpp20CompatibilityTest.cpp
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
 //
-// Copyright (c) 2019 - 2023 by the OpFlow developers
+// Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 // This file is part of OpFlow.
 //
diff --git a/test/Utils/HDF5StreamMPITest.cpp b/test/Utils/HDF5StreamMPITest.cpp
index d7e65678..4be7319c 100644
--- a/test/Utils/HDF5StreamMPITest.cpp
+++ b/test/Utils/HDF5StreamMPITest.cpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
@@ -80,7 +80,7 @@ TEST_F(H5RWMPITest, ReadAfterWrite) {
     Utils::H5Stream istream(filename, StreamIn);
     istream >> v;
     rangeFor_s(u.getLocalReadableRange(), [&](auto i) {
-        if (u[i] != v[i]) std::print(std::cerr,"NOT EQUAL AT {}", i);
+        if (u[i] != v[i]) std::print(std::cerr, "NOT EQUAL AT {}", i);
         ASSERT_EQ(u[i], v[i]);
     });
 }
diff --git a/test/Utils/HDF5StreamTest.cpp b/test/Utils/HDF5StreamTest.cpp
index 12228e12..6291b09d 100644
--- a/test/Utils/HDF5StreamTest.cpp
+++ b/test/Utils/HDF5StreamTest.cpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/test/Utils/IOGroupTest.cpp b/test/Utils/IOGroupTest.cpp
index 0063d017..ce3fa125 100644
--- a/test/Utils/IOGroupTest.cpp
+++ b/test/Utils/IOGroupTest.cpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/test/Utils/TecplotStreamMPITest.cpp b/test/Utils/TecplotStreamMPITest.cpp
index 22c931f4..daee0dc1 100644
--- a/test/Utils/TecplotStreamMPITest.cpp
+++ b/test/Utils/TecplotStreamMPITest.cpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/test/Utils/TecplotStreamTest.cpp b/test/Utils/TecplotStreamTest.cpp
index 17be151a..8197af39 100644
--- a/test/Utils/TecplotStreamTest.cpp
+++ b/test/Utils/TecplotStreamTest.cpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/test/test_main.cpp b/test/test_main.cpp
index 51b012d0..a4bce062 100644
--- a/test/test_main.cpp
+++ b/test/test_main.cpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //
diff --git a/test/test_main_mpi.cpp b/test/test_main_mpi.cpp
index d430daf8..ed74ed90 100644
--- a/test/test_main_mpi.cpp
+++ b/test/test_main_mpi.cpp
@@ -1,6 +1,6 @@
 //  ----------------------------------------------------------------------------
 //
-//  Copyright (c) 2019 - 2023 by the OpFlow developers
+//  Copyright (c) 2019 - 2025 by the OpFlow developers
 //
 //  This file is part of OpFlow.
 //